diff --git a/AssetProcessorPlatformConfig.setreg b/AssetProcessorPlatformConfig.setreg
deleted file mode 100644
index d3cf6d6272..0000000000
--- a/AssetProcessorPlatformConfig.setreg
+++ /dev/null
@@ -1,611 +0,0 @@
-{
-    // ---- Enable/Disable platforms for the entire project. AssetProcessor will automatically add the current platform by default. 
-
-    // PLATFORM DEFINITIONS
-    // [Platform (unique identifier)]
-    // tags=(comma-seperated-tags)
-    //
-    // note:  the 'identifier' of a platform is the word(s) following the "Platform" keyword (so [Platform pc] means identifier
-    //        is 'pc' for example.  This is used to name its assets folder in the cache and should be used in your bootstrap.cfg
-    //        or your main.cpp to choose what assets to load for that particular platform.
-    //        Its primary use is to enable additional non-host platforms (Ios, android...) that are not the current platform.
-    // note:  'tags' is a comma-seperated list of tags to tag the platform with that builders can inspect to decide what to do.
-
-    // while builders can accept any tags you add in order to make decisions, common tags are
-    // tools - this platform can host the tools and editor and such
-    // renderer - this platform runs the client engine and renders on a GPU.  If missing we could be on a server-only platform
-    // mobile - a mobile platform such as a set top box or phone with limited resources
-    // console - a console platform
-    // server - a server platform of some kind, usually headless, no renderer.
-
-    "Amazon": {
-        "AssetProcessor": {
-            "Settings": {
-                "Platform pc": {
-                    "tags": "tools,renderer,dx12,vulkan,null"
-                },
-                "Platform es3": {
-                    "tags": "android,mobile,renderer,vulkan"
-                },
-                "Platform ios": {
-                    "tags": "mobile,renderer,metal"
-                },
-                "Platform osx_gl": {
-                    "tags": "tools,renderer,metal,null"
-                },
-                // this is an example of a headless platform that has no renderer.   
-                // To use this you would still need to make sure 'assetplatform' in your startup params in your main() chooses this 'server' platform as your server 'assets' flavor
-                "Platform server": {
-                    "tags": "server,dx12,vulkan"
-                },
-                // this section allows you to turn on various platforms in addition to the host platform you're running on
-                // 'enabled' is AUTOMATICALLY TRUE for the current platform that you are running on, so it is not necessary to force it to true for that platform
-                // To enable any additional platform, just uncomment the appropriate line below.
-                "Platforms": {
-                    //"pc": "enabled",
-                    //"es3": "enabled",
-                    //"ios": "enabled",
-                    //"osx_gl": "enabled",
-                    //"server": "enabled"
-                },
-                // ---- The number of worker jobs, 0 means use the number of Logical Cores
-                "Jobs": {
-                    "minJobs": 1,
-                    "maxJobs": 0
-                },
-                // cacheServerAddress is the location of the asset server cache.
-                // Currently for a network share server this would be the absolute file path to the network share folder.
-                "Server": {
-                    //"cacheServerAddress": ""
-                },
-
-                // ---- add any metadata file type here that needs to be monitored by the AssetProcessor.
-                // Modifying these meta file will cause the source asset to re-compile again.
-                // They are specified in the following format
-                // metadata extension=original extension to replace
-                // if the metadata extension does not replace the original, then the original can be blank
-                // so for example if your normal file is blah.tif and your metafile for that file is blah.tif.exportsettings
-                // then your declaration would be exportsettings=   ; ie, it would be blank
-                // however if your metafile REPLACES the extension (for example, if you have the file blah.i_caf and its metafile is blah.exportsettings)
-                // then you specify the original extension here to narrow the scope.
-                // If a relative path to a specific file is provided instead of an extension, a change to the file will change all files
-                // with the associated extension (e.g. Animations/SkeletonList.xml=i_caf will cause all i_caf files to recompile when 
-                // Animations/SkeletonList.xml within the current game project changes)
-
-                "MetaDataTypes": {
-                    "animsettings": "i_caf",
-                    "Animations/SkeletonList.xml": "i_caf",
-                    "cbc": "abc",
-                    "fbx.assetinfo": "fbx"
-                },
-
-                // ---- add any folders to scan here.  The priority order is the order they appear here
-                // available macros are 
-                // @ROOT@ - the location of asset root
-                // @PROJECTROOT@ - the location of the project root, for example 'Q:\MyProjects\RPGSample' 
-                // note that they are sorted by their 'order' value, and the lower the order the more important an asset is
-                // lower order numbers override higher ones.
-                // If specified, output will be prepended to every path found in that recognizer's watch folder.
-                // Note that you can also make the scan folder platform specific by using the keywords include and exclude.
-                // Both include and exclude can contain either platform tags, platform identifiers or both.
-                // if no include is specified, all currently enabled platforms are included by default.
-                // If includes ARE specified, it will be filtered down by the list of currently enabled platforms. 
-                // "ScanFolder (unique identifier)": {
-                //  "include": "(comma seperated platform tags or identifiers)",
-                //  "exclude": "(comma seperated platform tags or identifiers)"
-                // }
-                // For example if you want to include a scan folder only for platforms that have the platform tags tools and renderer 
-                // but omit it for platform osx_gl, you will have a scanfolder rule like
-                // "ScanFolder (unique identifier)": {
-                // "watch": "@ROOT@/foo",
-                // "include": "tools, renderer",
-                // "exclude": "osx_gl"
-                // }
-
-                "ScanFolder Game": {
-                    "watch": "@PROJECTROOT@",
-                    "display": "@PROJECTNAME@",
-                    "recursive": 1,
-                    "order": 0
-                },
-                // gems will be auto-added from 100 onwards
-                "ScanFolder Root": {
-                    "watch": "@ROOT@",
-                    "recursive": 0,
-                    "order": 10000
-                },
-                "ScanFolder Engine": {
-                    "watch": "@ENGINEROOT@/Engine",
-                    "recursive": 1,
-                    "order": 20000
-                },
-                "ScanFolder Editor": {
-                    "watch": "@ENGINEROOT@/Editor",
-                    "output": "editor",
-                    "recursive": 1,
-                    "order": 30000,
-                    "include": "tools,renderer"
-                },
-
-                // Excludes files that match the pattern or glob 
-                // if you use a pattern, remember to escape your backslashes (\\)
-                "Exclude _LevelBackups": {
-                    "pattern": ".*\\\\/Levels\\\\/.*\\\\/_savebackup\\\\/.*"
-                },
-                "Exclude _LevelAutoBackups": {
-                    "pattern": ".*\\\\/Levels\\\\/.*\\\\/_autobackup\\\\/.*"
-                },
-                "Exclude HoldFiles": {
-                    "pattern": ".*\\\\/Levels\\\\/.*_hold\\\\/.*"
-                },
-                // note that $ has meaning to regex, so we escape it.
-                "Exclude TempFiles": {
-                    "pattern": ".*\\\\/\\\\$tmp[0-9]*_.*"
-                },
-                "Exclude AlembicCompressionTemplates": {
-                    "pattern": ".*\\\\/Presets\\\\/GeomCache\\\\/.*"
-                },
-                "Exclude TmpAnimationCompression": {
-                    "pattern": ".*\\\\/Editor\\\\/Tmp\\\\/AnimationCompression\\\\/.*"
-                },
-                "Exclude EventLog": {
-                    "pattern": ".*\\\\/Editor\\\\/.*eventlog\\\\.xml"
-                },
-                "Exclude GameGemsCode": {
-                    "pattern": ".*\\\\/Gem\\\\/Code\\\\/.*"
-                },
-                "Exclude GameGemsResources": {
-                    "pattern": ".*\\\\/Gem\\\\/Resources\\\\/.*"
-                },
-                "Exclude Private Certs": {
-                    "pattern": ".*\\DynamicContent\\\\/Certificates\\\\/Private\\\\/.*"
-                },
-                "Exclude CMakeLists": {
-                    "pattern": ".*\\\\/CMakeLists.txt"
-                },
-                "Exclude CMakeFiles": {
-                    "pattern": ".*\\\\/.*\\\\.cmake"
-                },
-                "Exclude User": {
-                    "pattern": ".*/[Uu]ser/.*"
-                },
-                "Exclude Build": {
-                    "pattern": ".*/[Bb]uild/.*"
-                },
-                "Exclude UserSettings": {
-                    "pattern": ".*/UserSettings.xml"
-                },
-
-                // ------------------------------------------------------------------------------
-                // Large Worlds Test
-                // ------------------------------------------------------------------------------
-                "Exclude Work In Progress Folders": {
-                    "pattern": ".*\\\\/WIP\\\\/.*"
-                },
-                "Exclude Content Source Folders": {
-                    "pattern": ".*\\\\/CONTENT_SOURCE\\\\/.*"
-                },
-                "Exclude Art Source Folders": {
-                    "pattern": ".*\\\\/ArtSource\\\\/.*"
-                },
-                //------------------------------------------------------------------------------
-                // RC params mapping examples
-                //------------------------------------------------------------------------------
-
-                // note that productAssetType is a means of setting the output asset Type (as in AZ::Data::AssetType) of a simple job
-                // and is the recommended way to specify that a certain kind of file (such as '*.myextension') becomes registered as the
-                // actual UUID of that type in the engine itself.
-
-                // Use a regex for matching files, same params for all platforms
-                // "RC TGAs": {
-                //  "pattern": ".+\\\\.tga$",
-                //  "params": "/tga /texture"
-                //}
-
-                // Use a glob, have special params for es3 platform
-                // "RC TIFFs": {
-                //  "glob": "*.tif",
-                //  "params": "/texture",
-                //  "es3": "/pvrt"
-                //}
-
-                // You can also modify a version to compile all matching files again
-                // By default the version is empty
-                // "RC tif": {
-                //  "glob": "*.tif",
-                //  "params": "\\someparams",
-                //  "version": 1.0
-                //}
-                // This will make the AssetProcessor compile all the .tif files again
-
-                // you can also optionally supply a priority.
-                // this is used to sort jobs when no other external circumstance sorts them
-                // for example, copy jobs will be higher in priority than other jobs that are not copy jobs
-                // however if they're both copy jobs or both not, and no other circumstances apply, then priority will be used.
-                // default priority is zero if not specified
-
-                // you can specify an option to skip processing for a file type based on the platform.
-                // for example, if you dont want to process tif files for ios, you can make tif files
-                // process on any platform except for ios:
-                // "RC tif": {
-                //  "glob": "*.tif",
-                //  "params": "\\someparams",
-                //  "ios": "skip"
-                //}
-
-                // you can specify an option to output product dependencies for a copy job.
-                // please note that you only need to set this option when cry code is required to parse the asset.
-                // otherwise product dependencies will be output automatically by the CopyDependencyBuilder.
-                // for example, if you want to output the product dependencies for font assets:
-                // "RC font": {
-                //  "glob": "*.font",
-                //  "params": "copy",
-                //  "outputProductDependencies": true
-                //}
-
-                // you can also specify an option to make all jobs critical that matches some pattern/glob.
-                // for example, if you want to make all png files critical than set critical to true.
-                // Note that by default all copy jobs are critical.
-                // Critical jobs are processed before non critical jobs and also prevent the runtime or editor from starting until they are all complete.
-                // "RC png": {
-                //  "glob": "*.png",
-                //  "params": "\\someparams",
-                //  "critical": true
-                //}
-
-                // you can also specify an option to make all the job store in the asset server cache location if you are running AP in server mode. 
-                // For example, if you want to store all png jobs in the asset server cache location including their logs, you can set checkServer = true.
-                // The client(i.e if you are running AP in non-server mode) will also check for this flag to know which jobs to fetch from the asset server cache location.
-                // if unsucessful, it will process the job locally as usual.
-                // "RC png": {
-                //  "glob": "*.png",
-                //  "params": "\\someparams",
-                //  "critical": true,
-                //  "checkServer": true
-                //}
-
-                // note that the FULL PATH to the file will be used as the match, not the relative path
-                // so ensure start your patterns with .* or as appropriate.
-                // Also, any rules which match will apply - so if you have two rules which both apply to PNG files for example
-                // but you only want one, you might want to use exclusion patterns:
-                 
-                //Example: process everything EXCEPT the ones in the libs/ui folder with these params
-                // "RC png-normal": {
-                //  "pattern": "(?!.*libs\\\\/ui\\\\/).*\\.png",
-                //  "params": "/imagecompressor=CTSquish /streaming=0",
-                //  "lockSource": true
-                //}
-
-                //Example:  Process everything in the libs/ui folder with linear color space
-                // "RC png-ui": {
-                //  "pattern": "(.*libs\\\\/ui\\\\/).*\\.png",
-                //  "params": "/imagecompressor=CTSquish /streaming=0 /colorspace=linear,linear",
-                //  "lockSource": true
-                //}
-
-                // More example Regexes:
-                // "pattern": "(?!(.*libs\\\\/ui\\\\/)|(.*editor\\\\/).*\\\\.png"
-                // This pattern will not match anything with editor/ or libs/ui/ in it
-                // "pattern": "((.*libs\\\\/ui\\\\/)|(.*editor\\\\/).*\\\\.png"
-                // This pattern will only match anything with editor/ or libs/ui/ in it
-
-                // Give every [Section Name] its own unique Name or else they will overwrite each other!
-                "RC i_caf": {
-                    "glob": "*.i_caf",
-                    "params": "/cafAlignTracks=1 /animConfigFolder=Animations /skipdba=1 /refresh=1",
-                    // force server to send the 'pc' platform to RC.EXE so it compiles the same as PC.
-                    "server": "/cafAlignTracks=1 /animConfigFolder=Animations /skipdba=1 /refresh=1 /p=pc",
-                    "priority": 5,
-                    "productAssetType": "{6023CFF8-FCBA-4528-A8BF-6E0E10B9AB9C}"
-                },
-                "RC caf": {
-                    "glob": "*.caf",
-                    "params": "copy",
-                    "productAssetType": "{6023CFF8-FCBA-4528-A8BF-6E0E10B9AB9C}"
-                },
-                "RC mp4": {
-                    "glob": "*.mp4",
-                    "params": "copy",
-                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
-                },
-                "RC mkv": {
-                    "glob": "*.mkv",
-                    "params": "copy",
-                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
-                },
-                "RC webm": {
-                    "glob": "*.webm",
-                    "params": "copy",
-                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
-                },
-                "RC mov": {
-                    "glob": "*.mov",
-                    "params": "copy",
-                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
-                },
-                "RC bk2": {
-                    "glob": "*.bk2",
-                    "params": "copy",
-                    "productAssetType": "{BF4879B9-B893-41D2-80E9-24A7BDCD2B50}"
-                },
-                "RC img": {
-                    "glob": "*.img",
-                    "params": "copy"
-                },
-                "RC dba": {
-                    "glob": "*.dba",
-                    "params": "copy",
-                    "productAssetType": "{511562BE-65A5-4538-A5F1-AC685366243E}",
-                    "version": 2
-                },
-                "RC cgf": {
-                    "glob": "*.cgf",
-                    "params": "/VertexPositionFormat=exporter /VertexIndexFormat=u32",
-                    // on server, feed rc.exe the param /p=pc to force it to compile assets for server platform in pc format.
-                    "server": "/VertexPositionFormat=exporter /VertexIndexFormat=u32 /p=pc",
-                    "lockSource": true,
-                    "priority": 10
-                    // allow CGF files to compile first, so untextured models appear before their textures for faster startup
-                    // other available params: /SplitLODs=1
-                },
-                "RC surfaceTagNameList": {
-                    "glob": "*.surfaceTagNameList",
-                    "params": "copy",
-                    "productAssetType": "{A471B2A9-85FC-4993-842D-1881CBC03A2B}"
-                },
-                "RC gradImageSettings": {
-                    "glob": "*.gradimagesettings",
-                    "params": "copy",
-                    "productAssetType": "{B36FEB5C-41B6-4B58-A212-21EF5AEF523C}"
-                },
-                "RC fbx": {
-                    "glob": "*.fbx",
-                    // Priority set to 9 so its "before" things like materials but after things like actors and motions (which build using a proper AssetBuilderSDK builder and thus are not in this file)
-                    "priority": 9,
-                    "version": 5
-                },
-                "RC chr": {
-                    "glob": "*.chr",
-                    "params": "copy",
-                    "productAssetType": "{60161B46-21F0-4396-A4F0-F2CCF0664CDE}",
-                    "version": 2
-                },
-                "RC skin": {
-                    "glob": "*.skin",
-                    "params": "copy"
-                },
-                "RC cfi": {
-                    "glob": "*.cfi",
-                    "params": "copy"
-                },
-                "RC cfx": {
-                    "glob": "*.cfx",
-                    "params": "copy"
-                },
-                "RC cfr": {
-                    "glob": "*.cfr",
-                    "params": "copy"
-                },
-                // Warning: If you change the VertexIndexFormat, make sure you update the vtx_idx typedef in Code\CryEngine\CryCommon\ProjectDefines.h
-                "RC abc": {
-                    "glob": "*.abc",
-                    "params": "/SkipFilesWithoutBuildConfig=0 /VertexIndexFormat=u32",
-                    "console": "/SkipFilesWithoutBuildConfig=0 /VertexIndexFormat=u32",
-                    "mobile": "/SkipFilesWithoutBuildConfig=0 /VertexIndexFormat=u16",
-                    "version": 3,
-                    "server": "skip"
-                },
-                "RC png-entityicon": {
-                    "pattern": "(.*EntityIcons\\\\/).*\\\\.png",
-                    "productAssetType": "{3436C30E-E2C5-4C3B-A7B9-66C94A28701B}",
-                    "params": "skip",
-                    "tools": "copy"
-                },
-                "RC usm": {
-                    "glob": "*.usm",
-                    "params": "copy",
-                    "server": "skip"
-                },
-                "RC animevents": {
-                    "glob": "*.animevents",
-                    "params": "copy",
-                    "productAssetType": "{C1D209C1-F81A-4586-A34E-1615995F9F3F}",
-                    "version": 2
-                },
-                "RC adb": {
-                    "glob": "*.adb",
-                    "params": "copy",
-                    "productAssetType": "{50908273-CA36-4668-9828-15DD5092F973}"
-                },
-                "RC bspace": {
-                    "glob": "*.bspace",
-                    "params": "copy"
-                },
-                "RC cdf": {
-                    "glob": "*.cdf",
-                    "params": "copy",
-                    "productAssetType": "{DF036C63-9AE6-4AC3-A6AC-8A1D76126C01}"
-                },
-                // note - this used to be skinnedMeshAsset but its now Character Definition File specific.
-                // .skin has its own type.
-
-                "RC chrparams": {
-                    "glob": "*.chrparams",
-                    "params": "copy",
-                    "productAssetType": "{4BBB785A-6824-4803-A607-F9323E7BEEF1}",
-                    "version": 2
-                },
-                "RC comb": {
-                    "glob": "*.comb",
-                    "params": "copy"
-                },
-                "RC dlg": {
-                    "glob": "*.dlg",
-                    "params": "copy"
-                },
-                "RC csv": {
-                    "glob": "*.csv",
-                    "params": "copy"
-                },
-                "RC json": {
-                    "glob": "*.json",
-                    "params": "copy"
-                },
-                "RC lmg": {
-                    "glob": "*.lmg",
-                    "params": "copy"
-                },
-                "RC smtl": {
-                    "glob": "*.smtl",
-                    "params": "copy"
-                },
-                "RC sub": {
-                    "glob": "*.sub",
-                    "params": "copy",
-                    "productAssetType": "{71F9D30E-13F7-40D6-A3C9-E5358004B31F}",
-                    "version": 2
-                },
-                "RC sbsar": {
-                    "glob": "*.sbsar",
-                    "params": "copy"
-                },
-                "RC loc.agsxml": {
-                    "glob": "*.loc.agsxml",
-                    "params": "copy",
-                    "version": 1
-                },
-                "RC node": {
-                    "glob": "*.node",
-                    "params": "copy"
-                },
-                "RC veg": {
-                    "glob": "*.veg",
-                    "params": "copy"
-                },
-                "RC dat": {
-                    "glob": "*.dat",
-                    "params": "copy"
-                },
-                "RC lut": {
-                    "glob": "*.lut",
-                    "params": "copy"
-                },
-                "RC txt": {
-                    "pattern": "^(?!.*PreloadLibs.txt).*\\\\.txt",
-                    "params": "copy"
-                },
-                "RC cal": {
-                    "glob": "*.cal",
-                    "params": "copy"
-                },
-                "RC grp": {
-                    "glob": "*.grp",
-                    "params": "copy",
-                    "productAssetType": "{7629EDD3-A361-49A2-B271-252127097D81}",
-                    "version": 2
-                },
-                "RC xls": {
-                    "glob": "*.xls",
-                    "params": "copy"
-                },
-                "RC ini": {
-                    "glob": "*.ini",
-                    "params": "copy"
-                },
-                "RC ttf": {
-                    "glob": "*.ttf",
-                    "params": "copy"
-                },
-                "RC otf": {
-                    "glob": "*.otf",
-                    "params": "copy"
-                },
-                "RC ext": {
-                    "glob": "*.ext",
-                    "params": "copy"
-                },
-                // Copy all pak files except level.pak, level.pak has its own builder.
-                "RC pak": {
-                    "pattern": "^((?!\\\\/level\\\\.pak).)*\\\\.pak$",
-                    "params": "copy"
-                },
-                "RC ctc": {
-                    "glob": "*.ctc",
-                    "params": "copy"
-                },
-                "RC uiprefab": {
-                    "glob": "*.uiprefab",
-                    "params": "copy",
-                    "server": "skip"
-                },
-                "RC sprite": {
-                    "glob": "*.sprite",
-                    "params": "copy",
-                    "server": "skip"
-                },
-                "RC bin": {
-                    "glob": "*.bin",
-                    "params": "copy"
-                },
-                "RC inputbindings": {
-                    "glob": "*.inputbindings",
-                    "params": "copy",
-                    "productAssetType": "{25971C7A-26E2-4D08-A146-2EFCC1C36B0C}"
-                },
-                "RC physmaterial": {
-                    "glob": "*.physmaterial",
-                    "params": "copy",
-                    "productAssetType": "{9E366D8C-33BB-4825-9A1F-FA3ADBE11D0F}"
-                },
-                "RC ocm": {
-                    "glob": "*.ocm",
-                    "params": "copy"
-                },
-                // Feature tests use the raw .tif files for the golden image comparison
-                "RC goldenimages": {
-                    "pattern": ".*GoldenImages\\\\/.*\\\\.tif",
-                    "params": "copy",
-                    "server": "skip"
-                },
-                // Copy over certificates for use with FileDataSource
-                "RC CertificatePEM": {
-                    "glob": "*.pem",
-                    "params": "copy"
-                },
-                // Copy over certificates for use with Dynamic Content
-                "RC CertificateDER": {
-                    "glob": "*.der",
-                    "params": "copy"
-                },
-                "RC PhysXMeshAsset": {
-                    "glob": "*.pxmesh",
-                    "params": "copy",
-                    "productAssetType": "{7A2871B9-5EAB-4DE0-A901-B0D2C6920DDB}"
-                },
-                // Copy over cooked PhysX heightfield
-                "RC PhysX HeightField": {
-                    "glob": "*.pxheightfield",
-                    "params": "copy",
-                    "productAssetType": "{B61189FE-B2D7-4AF1-8951-CB5C0F7834FC}"
-                },
-                "RC filetag": {
-                    "glob": "*.filetag",
-                    "params": "copy",
-                    "productAssetType": "{F3BE5CAB-85B7-44B7-9495-863863F6B267}"
-                },
-                // Precompiled shader srg
-                "RC azsrg": {
-                    "glob": "*.azsrg",
-                    "params": "copy",
-                    "productAssetType": "{F8C9F4AE-3F6A-45AD-B4FB-0CA415FCC2E1}"
-                },
-                // Precompiled shader variant
-                "RC azshadervariant": {
-                    "glob": "*.azshadervariant",
-                    "params": "copy",
-                    "productAssetType": "{9F4D654B-4439-4C61-8DCD-F1C7C5560768}"
-                }
-            }
-        }
-    }
-}
diff --git a/Editor/CryDesigner_TimeOfDay.xml b/Assets/Editor/CryDesigner_TimeOfDay.xml
similarity index 100%
rename from Editor/CryDesigner_TimeOfDay.xml
rename to Assets/Editor/CryDesigner_TimeOfDay.xml
diff --git a/Editor/Editor.tip b/Assets/Editor/Editor.tip
similarity index 100%
rename from Editor/Editor.tip
rename to Assets/Editor/Editor.tip
diff --git a/Gems/ScriptCanvas/Assets/Editor/Icons/AssetBrowser/ScriptCanvas_16.png b/Assets/Editor/Editor/Icons/AssetBrowser/ScriptCanvas_16.png
similarity index 100%
rename from Gems/ScriptCanvas/Assets/Editor/Icons/AssetBrowser/ScriptCanvas_16.png
rename to Assets/Editor/Editor/Icons/AssetBrowser/ScriptCanvas_16.png
diff --git a/Editor/EditorParticlePanels.xml b/Assets/Editor/EditorParticlePanels.xml
similarity index 100%
rename from Editor/EditorParticlePanels.xml
rename to Assets/Editor/EditorParticlePanels.xml
diff --git a/Editor/EditorParticlePanelsDefault.xml b/Assets/Editor/EditorParticlePanelsDefault.xml
similarity index 100%
rename from Editor/EditorParticlePanelsDefault.xml
rename to Assets/Editor/EditorParticlePanelsDefault.xml
diff --git a/Editor/Fonts/Open_Sans/LICENSE.txt b/Assets/Editor/Fonts/Open_Sans/LICENSE.txt
similarity index 100%
rename from Editor/Fonts/Open_Sans/LICENSE.txt
rename to Assets/Editor/Fonts/Open_Sans/LICENSE.txt
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Bold.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Bold.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Bold.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Bold.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Italic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Italic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Italic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Italic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Light.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Light.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Light.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Light.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Regular.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Regular.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Regular.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Regular.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf
diff --git a/Editor/Icons/AssetBrowser/ABC_16.svg b/Assets/Editor/Icons/AssetBrowser/ABC_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/ABC_16.svg
rename to Assets/Editor/Icons/AssetBrowser/ABC_16.svg
diff --git a/Editor/Icons/AssetBrowser/Audio_16.svg b/Assets/Editor/Icons/AssetBrowser/Audio_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Audio_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Audio_16.svg
diff --git a/Editor/Icons/AssetBrowser/CaretClosed_16.svg b/Assets/Editor/Icons/AssetBrowser/CaretClosed_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/CaretClosed_16.svg
rename to Assets/Editor/Icons/AssetBrowser/CaretClosed_16.svg
diff --git a/Editor/Icons/AssetBrowser/CaretOpen_16.svg b/Assets/Editor/Icons/AssetBrowser/CaretOpen_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/CaretOpen_16.svg
rename to Assets/Editor/Icons/AssetBrowser/CaretOpen_16.svg
diff --git a/Editor/Icons/AssetBrowser/DefaultProduct_16.svg b/Assets/Editor/Icons/AssetBrowser/DefaultProduct_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/DefaultProduct_16.svg
rename to Assets/Editor/Icons/AssetBrowser/DefaultProduct_16.svg
diff --git a/Editor/Icons/AssetBrowser/Default_16.svg b/Assets/Editor/Icons/AssetBrowser/Default_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Default_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Default_16.svg
diff --git a/Editor/Icons/AssetBrowser/FBX_16.svg b/Assets/Editor/Icons/AssetBrowser/FBX_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/FBX_16.svg
rename to Assets/Editor/Icons/AssetBrowser/FBX_16.svg
diff --git a/Editor/Icons/AssetBrowser/Folder_16.svg b/Assets/Editor/Icons/AssetBrowser/Folder_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Folder_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Folder_16.svg
diff --git a/Editor/Icons/AssetBrowser/Font_16.svg b/Assets/Editor/Icons/AssetBrowser/Font_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Font_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Font_16.svg
diff --git a/Editor/Icons/AssetBrowser/GemFolder_16.svg b/Assets/Editor/Icons/AssetBrowser/GemFolder_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/GemFolder_16.svg
rename to Assets/Editor/Icons/AssetBrowser/GemFolder_16.svg
diff --git a/Editor/Icons/AssetBrowser/Image_16.svg b/Assets/Editor/Icons/AssetBrowser/Image_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Image_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Image_16.svg
diff --git a/Editor/Icons/AssetBrowser/InputBindings_16.svg b/Assets/Editor/Icons/AssetBrowser/InputBindings_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/InputBindings_16.svg
rename to Assets/Editor/Icons/AssetBrowser/InputBindings_16.svg
diff --git a/Editor/Icons/AssetBrowser/LegacyAnimation_16.svg b/Assets/Editor/Icons/AssetBrowser/LegacyAnimation_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LegacyAnimation_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LegacyAnimation_16.svg
diff --git a/Editor/Icons/AssetBrowser/LegacyMesh_16.svg b/Assets/Editor/Icons/AssetBrowser/LegacyMesh_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LegacyMesh_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LegacyMesh_16.svg
diff --git a/Editor/Icons/AssetBrowser/LegacySkin_16.svg b/Assets/Editor/Icons/AssetBrowser/LegacySkin_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LegacySkin_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LegacySkin_16.svg
diff --git a/Editor/Icons/AssetBrowser/LensFlare_16.svg b/Assets/Editor/Icons/AssetBrowser/LensFlare_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LensFlare_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LensFlare_16.svg
diff --git a/Editor/Icons/AssetBrowser/Lua_16.svg b/Assets/Editor/Icons/AssetBrowser/Lua_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Lua_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Lua_16.svg
diff --git a/Editor/Icons/AssetBrowser/Material_16.svg b/Assets/Editor/Icons/AssetBrowser/Material_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Material_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Material_16.svg
diff --git a/Editor/Icons/AssetBrowser/NonWritable_16.svg b/Assets/Editor/Icons/AssetBrowser/NonWritable_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/NonWritable_16.svg
rename to Assets/Editor/Icons/AssetBrowser/NonWritable_16.svg
diff --git a/Editor/Icons/AssetBrowser/Particle_16.svg b/Assets/Editor/Icons/AssetBrowser/Particle_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Particle_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Particle_16.svg
diff --git a/Editor/Icons/AssetBrowser/Slice_16.svg b/Assets/Editor/Icons/AssetBrowser/Slice_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Slice_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Slice_16.svg
diff --git a/Editor/Icons/AssetBrowser/Writable_16.svg b/Assets/Editor/Icons/AssetBrowser/Writable_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Writable_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Writable_16.svg
diff --git a/Editor/Icons/AssetBrowser/XML_16.svg b/Assets/Editor/Icons/AssetBrowser/XML_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/XML_16.svg
rename to Assets/Editor/Icons/AssetBrowser/XML_16.svg
diff --git a/Editor/Icons/AssetBrowser/in_progress.gif b/Assets/Editor/Icons/AssetBrowser/in_progress.gif
similarity index 100%
rename from Editor/Icons/AssetBrowser/in_progress.gif
rename to Assets/Editor/Icons/AssetBrowser/in_progress.gif
diff --git a/Editor/Icons/AssetImporter/animation.png b/Assets/Editor/Icons/AssetImporter/animation.png
similarity index 100%
rename from Editor/Icons/AssetImporter/animation.png
rename to Assets/Editor/Icons/AssetImporter/animation.png
diff --git a/Editor/Icons/AssetImporter/animation_on.png b/Assets/Editor/Icons/AssetImporter/animation_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/animation_on.png
rename to Assets/Editor/Icons/AssetImporter/animation_on.png
diff --git a/Editor/Icons/AssetImporter/group_icon.png b/Assets/Editor/Icons/AssetImporter/group_icon.png
similarity index 100%
rename from Editor/Icons/AssetImporter/group_icon.png
rename to Assets/Editor/Icons/AssetImporter/group_icon.png
diff --git a/Editor/Icons/AssetImporter/mesh.png b/Assets/Editor/Icons/AssetImporter/mesh.png
similarity index 100%
rename from Editor/Icons/AssetImporter/mesh.png
rename to Assets/Editor/Icons/AssetImporter/mesh.png
diff --git a/Editor/Icons/AssetImporter/mesh_on.png b/Assets/Editor/Icons/AssetImporter/mesh_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/mesh_on.png
rename to Assets/Editor/Icons/AssetImporter/mesh_on.png
diff --git a/Editor/Icons/AssetImporter/skeleton.png b/Assets/Editor/Icons/AssetImporter/skeleton.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skeleton.png
rename to Assets/Editor/Icons/AssetImporter/skeleton.png
diff --git a/Editor/Icons/AssetImporter/skeleton_on.png b/Assets/Editor/Icons/AssetImporter/skeleton_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skeleton_on.png
rename to Assets/Editor/Icons/AssetImporter/skeleton_on.png
diff --git a/Editor/Icons/AssetImporter/skin.png b/Assets/Editor/Icons/AssetImporter/skin.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skin.png
rename to Assets/Editor/Icons/AssetImporter/skin.png
diff --git a/Editor/Icons/AssetImporter/skin_on.png b/Assets/Editor/Icons/AssetImporter/skin_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skin_on.png
rename to Assets/Editor/Icons/AssetImporter/skin_on.png
diff --git a/Editor/Icons/AssetImporter/tree.png b/Assets/Editor/Icons/AssetImporter/tree.png
similarity index 100%
rename from Editor/Icons/AssetImporter/tree.png
rename to Assets/Editor/Icons/AssetImporter/tree.png
diff --git a/Editor/Icons/Assets/InputBindings.png b/Assets/Editor/Icons/Assets/InputBindings.png
similarity index 100%
rename from Editor/Icons/Assets/InputBindings.png
rename to Assets/Editor/Icons/Assets/InputBindings.png
diff --git a/Editor/Icons/Assets/Lua.png b/Assets/Editor/Icons/Assets/Lua.png
similarity index 100%
rename from Editor/Icons/Assets/Lua.png
rename to Assets/Editor/Icons/Assets/Lua.png
diff --git a/Editor/Icons/Assets/PhysicsMaterial.png b/Assets/Editor/Icons/Assets/PhysicsMaterial.png
similarity index 100%
rename from Editor/Icons/Assets/PhysicsMaterial.png
rename to Assets/Editor/Icons/Assets/PhysicsMaterial.png
diff --git a/Editor/Icons/Components/AreaLight.svg b/Assets/Editor/Icons/Components/AreaLight.svg
similarity index 100%
rename from Editor/Icons/Components/AreaLight.svg
rename to Assets/Editor/Icons/Components/AreaLight.svg
diff --git a/Editor/Icons/Components/Attachment.svg b/Assets/Editor/Icons/Components/Attachment.svg
similarity index 100%
rename from Editor/Icons/Components/Attachment.svg
rename to Assets/Editor/Icons/Components/Attachment.svg
diff --git a/Editor/Icons/Components/AudioAnimation.svg b/Assets/Editor/Icons/Components/AudioAnimation.svg
similarity index 100%
rename from Editor/Icons/Components/AudioAnimation.svg
rename to Assets/Editor/Icons/Components/AudioAnimation.svg
diff --git a/Editor/Icons/Components/AudioAnimationEventsProxy.svg b/Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg
similarity index 100%
rename from Editor/Icons/Components/AudioAnimationEventsProxy.svg
rename to Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg
diff --git a/Editor/Icons/Components/AudioArea.png b/Assets/Editor/Icons/Components/AudioArea.png
similarity index 100%
rename from Editor/Icons/Components/AudioArea.png
rename to Assets/Editor/Icons/Components/AudioArea.png
diff --git a/Editor/Icons/Components/AudioAreaEnvironment.svg b/Assets/Editor/Icons/Components/AudioAreaEnvironment.svg
similarity index 100%
rename from Editor/Icons/Components/AudioAreaEnvironment.svg
rename to Assets/Editor/Icons/Components/AudioAreaEnvironment.svg
diff --git a/Editor/Icons/Components/AudioEnvironment.svg b/Assets/Editor/Icons/Components/AudioEnvironment.svg
similarity index 100%
rename from Editor/Icons/Components/AudioEnvironment.svg
rename to Assets/Editor/Icons/Components/AudioEnvironment.svg
diff --git a/Editor/Icons/Components/AudioListener.svg b/Assets/Editor/Icons/Components/AudioListener.svg
similarity index 100%
rename from Editor/Icons/Components/AudioListener.svg
rename to Assets/Editor/Icons/Components/AudioListener.svg
diff --git a/Editor/Icons/Components/AudioMultiPosition.png b/Assets/Editor/Icons/Components/AudioMultiPosition.png
similarity index 100%
rename from Editor/Icons/Components/AudioMultiPosition.png
rename to Assets/Editor/Icons/Components/AudioMultiPosition.png
diff --git a/Editor/Icons/Components/AudioPreload.svg b/Assets/Editor/Icons/Components/AudioPreload.svg
similarity index 100%
rename from Editor/Icons/Components/AudioPreload.svg
rename to Assets/Editor/Icons/Components/AudioPreload.svg
diff --git a/Editor/Icons/Components/AudioProxy.svg b/Assets/Editor/Icons/Components/AudioProxy.svg
similarity index 100%
rename from Editor/Icons/Components/AudioProxy.svg
rename to Assets/Editor/Icons/Components/AudioProxy.svg
diff --git a/Editor/Icons/Components/AudioRtpc.svg b/Assets/Editor/Icons/Components/AudioRtpc.svg
similarity index 100%
rename from Editor/Icons/Components/AudioRtpc.svg
rename to Assets/Editor/Icons/Components/AudioRtpc.svg
diff --git a/Editor/Icons/Components/AudioSwitch.svg b/Assets/Editor/Icons/Components/AudioSwitch.svg
similarity index 100%
rename from Editor/Icons/Components/AudioSwitch.svg
rename to Assets/Editor/Icons/Components/AudioSwitch.svg
diff --git a/Editor/Icons/Components/AudioTrigger.svg b/Assets/Editor/Icons/Components/AudioTrigger.svg
similarity index 100%
rename from Editor/Icons/Components/AudioTrigger.svg
rename to Assets/Editor/Icons/Components/AudioTrigger.svg
diff --git a/Editor/Icons/Components/BehaviorTree.svg b/Assets/Editor/Icons/Components/BehaviorTree.svg
similarity index 100%
rename from Editor/Icons/Components/BehaviorTree.svg
rename to Assets/Editor/Icons/Components/BehaviorTree.svg
diff --git a/Editor/Icons/Components/Box.png b/Assets/Editor/Icons/Components/Box.png
similarity index 100%
rename from Editor/Icons/Components/Box.png
rename to Assets/Editor/Icons/Components/Box.png
diff --git a/Editor/Icons/Components/Box_Shape.svg b/Assets/Editor/Icons/Components/Box_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Box_Shape.svg
rename to Assets/Editor/Icons/Components/Box_Shape.svg
diff --git a/Editor/Icons/Components/Capsule_Shape.svg b/Assets/Editor/Icons/Components/Capsule_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Capsule_Shape.svg
rename to Assets/Editor/Icons/Components/Capsule_Shape.svg
diff --git a/Editor/Icons/Components/CharacterPhysics.svg b/Assets/Editor/Icons/Components/CharacterPhysics.svg
similarity index 100%
rename from Editor/Icons/Components/CharacterPhysics.svg
rename to Assets/Editor/Icons/Components/CharacterPhysics.svg
diff --git a/Editor/Icons/Components/Cloth.svg b/Assets/Editor/Icons/Components/Cloth.svg
similarity index 100%
rename from Editor/Icons/Components/Cloth.svg
rename to Assets/Editor/Icons/Components/Cloth.svg
diff --git a/Editor/Icons/Components/CloudGemMessageOfTheDay.svg b/Assets/Editor/Icons/Components/CloudGemMessageOfTheDay.svg
similarity index 100%
rename from Editor/Icons/Components/CloudGemMessageOfTheDay.svg
rename to Assets/Editor/Icons/Components/CloudGemMessageOfTheDay.svg
diff --git a/Editor/Icons/Components/ColliderBox.png b/Assets/Editor/Icons/Components/ColliderBox.png
similarity index 100%
rename from Editor/Icons/Components/ColliderBox.png
rename to Assets/Editor/Icons/Components/ColliderBox.png
diff --git a/Editor/Icons/Components/ColliderCapsule.png b/Assets/Editor/Icons/Components/ColliderCapsule.png
similarity index 100%
rename from Editor/Icons/Components/ColliderCapsule.png
rename to Assets/Editor/Icons/Components/ColliderCapsule.png
diff --git a/Editor/Icons/Components/ColliderCylinder.png b/Assets/Editor/Icons/Components/ColliderCylinder.png
similarity index 100%
rename from Editor/Icons/Components/ColliderCylinder.png
rename to Assets/Editor/Icons/Components/ColliderCylinder.png
diff --git a/Editor/Icons/Components/ColliderMesh.svg b/Assets/Editor/Icons/Components/ColliderMesh.svg
similarity index 100%
rename from Editor/Icons/Components/ColliderMesh.svg
rename to Assets/Editor/Icons/Components/ColliderMesh.svg
diff --git a/Editor/Icons/Components/ColliderSphere.png b/Assets/Editor/Icons/Components/ColliderSphere.png
similarity index 100%
rename from Editor/Icons/Components/ColliderSphere.png
rename to Assets/Editor/Icons/Components/ColliderSphere.png
diff --git a/Editor/Icons/Components/Comment.svg b/Assets/Editor/Icons/Components/Comment.svg
similarity index 100%
rename from Editor/Icons/Components/Comment.svg
rename to Assets/Editor/Icons/Components/Comment.svg
diff --git a/Editor/Icons/Components/Component_Placeholder.svg b/Assets/Editor/Icons/Components/Component_Placeholder.svg
similarity index 100%
rename from Editor/Icons/Components/Component_Placeholder.svg
rename to Assets/Editor/Icons/Components/Component_Placeholder.svg
diff --git a/Editor/Icons/Components/Compound_Shape.svg b/Assets/Editor/Icons/Components/Compound_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Compound_Shape.svg
rename to Assets/Editor/Icons/Components/Compound_Shape.svg
diff --git a/Editor/Icons/Components/Cylinder.png b/Assets/Editor/Icons/Components/Cylinder.png
similarity index 100%
rename from Editor/Icons/Components/Cylinder.png
rename to Assets/Editor/Icons/Components/Cylinder.png
diff --git a/Editor/Icons/Components/Cylinder_Shape.svg b/Assets/Editor/Icons/Components/Cylinder_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Cylinder_Shape.svg
rename to Assets/Editor/Icons/Components/Cylinder_Shape.svg
diff --git a/Editor/Icons/Components/DebugDrawLine.svg b/Assets/Editor/Icons/Components/DebugDrawLine.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawLine.svg
rename to Assets/Editor/Icons/Components/DebugDrawLine.svg
diff --git a/Editor/Icons/Components/DebugDrawObb.svg b/Assets/Editor/Icons/Components/DebugDrawObb.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawObb.svg
rename to Assets/Editor/Icons/Components/DebugDrawObb.svg
diff --git a/Editor/Icons/Components/DebugDrawRay.svg b/Assets/Editor/Icons/Components/DebugDrawRay.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawRay.svg
rename to Assets/Editor/Icons/Components/DebugDrawRay.svg
diff --git a/Editor/Icons/Components/DebugDrawSphere.svg b/Assets/Editor/Icons/Components/DebugDrawSphere.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawSphere.svg
rename to Assets/Editor/Icons/Components/DebugDrawSphere.svg
diff --git a/Editor/Icons/Components/DebugDrawText.svg b/Assets/Editor/Icons/Components/DebugDrawText.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawText.svg
rename to Assets/Editor/Icons/Components/DebugDrawText.svg
diff --git a/Editor/Icons/Components/Decal.svg b/Assets/Editor/Icons/Components/Decal.svg
similarity index 100%
rename from Editor/Icons/Components/Decal.svg
rename to Assets/Editor/Icons/Components/Decal.svg
diff --git a/Editor/Icons/Components/Disabled/Animation_white.png b/Assets/Editor/Icons/Components/Disabled/Animation_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Animation_white.png
rename to Assets/Editor/Icons/Components/Disabled/Animation_white.png
diff --git a/Editor/Icons/Components/Disabled/Attachment_white.png b/Assets/Editor/Icons/Components/Disabled/Attachment_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Attachment_white.png
rename to Assets/Editor/Icons/Components/Disabled/Attachment_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png b/Assets/Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioArea_white.png b/Assets/Editor/Icons/Components/Disabled/AudioArea_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioArea_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioArea_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioEnvironment_white.png b/Assets/Editor/Icons/Components/Disabled/AudioEnvironment_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioEnvironment_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioEnvironment_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioListener_white.png b/Assets/Editor/Icons/Components/Disabled/AudioListener_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioListener_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioListener_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioRtpc_white.png b/Assets/Editor/Icons/Components/Disabled/AudioRtpc_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioRtpc_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioRtpc_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioSwitch_white.png b/Assets/Editor/Icons/Components/Disabled/AudioSwitch_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioSwitch_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioSwitch_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioTrigger_white.png b/Assets/Editor/Icons/Components/Disabled/AudioTrigger_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioTrigger_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioTrigger_white.png
diff --git a/Editor/Icons/Components/Disabled/BehaviorTree_white.png b/Assets/Editor/Icons/Components/Disabled/BehaviorTree_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/BehaviorTree_white.png
rename to Assets/Editor/Icons/Components/Disabled/BehaviorTree_white.png
diff --git a/Editor/Icons/Components/Disabled/Box_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Box_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Box_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Box_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Box_collider_white.png b/Assets/Editor/Icons/Components/Disabled/Box_collider_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Box_collider_white.png
rename to Assets/Editor/Icons/Components/Disabled/Box_collider_white.png
diff --git a/Editor/Icons/Components/Disabled/Box_white.png b/Assets/Editor/Icons/Components/Disabled/Box_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Box_white.png
rename to Assets/Editor/Icons/Components/Disabled/Box_white.png
diff --git a/Editor/Icons/Components/Disabled/Capsule_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Capsule_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Capsule_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Capsule_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Capsule_white.png b/Assets/Editor/Icons/Components/Disabled/Capsule_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Capsule_white.png
rename to Assets/Editor/Icons/Components/Disabled/Capsule_white.png
diff --git a/Editor/Icons/Components/Disabled/CharacterPhysics_white.png b/Assets/Editor/Icons/Components/Disabled/CharacterPhysics_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/CharacterPhysics_white.png
rename to Assets/Editor/Icons/Components/Disabled/CharacterPhysics_white.png
diff --git a/Editor/Icons/Components/Disabled/Comment.png b/Assets/Editor/Icons/Components/Disabled/Comment.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Comment.png
rename to Assets/Editor/Icons/Components/Disabled/Comment.png
diff --git a/Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png b/Assets/Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png
rename to Assets/Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png
diff --git a/Editor/Icons/Components/Disabled/Component_Placeholder_white.png b/Assets/Editor/Icons/Components/Disabled/Component_Placeholder_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Component_Placeholder_white.png
rename to Assets/Editor/Icons/Components/Disabled/Component_Placeholder_white.png
diff --git a/Editor/Icons/Components/Disabled/Cylinder_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Cylinder_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Cylinder_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Cylinder_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Cylinder_white.png b/Assets/Editor/Icons/Components/Disabled/Cylinder_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Cylinder_white.png
rename to Assets/Editor/Icons/Components/Disabled/Cylinder_white.png
diff --git a/Editor/Icons/Components/Disabled/Decal_white.png b/Assets/Editor/Icons/Components/Disabled/Decal_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Decal_white.png
rename to Assets/Editor/Icons/Components/Disabled/Decal_white.png
diff --git a/Editor/Icons/Components/Disabled/DynamicContent_white.png b/Assets/Editor/Icons/Components/Disabled/DynamicContent_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/DynamicContent_white.png
rename to Assets/Editor/Icons/Components/Disabled/DynamicContent_white.png
diff --git a/Editor/Icons/Components/Disabled/DynamicMesh_white.png b/Assets/Editor/Icons/Components/Disabled/DynamicMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/DynamicMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/DynamicMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/EntityInSlice_white.png b/Assets/Editor/Icons/Components/Disabled/EntityInSlice_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/EntityInSlice_white.png
rename to Assets/Editor/Icons/Components/Disabled/EntityInSlice_white.png
diff --git a/Editor/Icons/Components/Disabled/Entity_white.png b/Assets/Editor/Icons/Components/Disabled/Entity_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Entity_white.png
rename to Assets/Editor/Icons/Components/Disabled/Entity_white.png
diff --git a/Editor/Icons/Components/Disabled/FogVolume_white.png b/Assets/Editor/Icons/Components/Disabled/FogVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/FogVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/FogVolume_white.png
diff --git a/Editor/Icons/Components/Disabled/ForceVolume_white.png b/Assets/Editor/Icons/Components/Disabled/ForceVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/ForceVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/ForceVolume_white.png
diff --git a/Editor/Icons/Components/Disabled/GeometryCache_white.png b/Assets/Editor/Icons/Components/Disabled/GeometryCache_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/GeometryCache_white.png
rename to Assets/Editor/Icons/Components/Disabled/GeometryCache_white.png
diff --git a/Editor/Icons/Components/Disabled/HttpClientComponent_white.png b/Assets/Editor/Icons/Components/Disabled/HttpClientComponent_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/HttpClientComponent_white.png
rename to Assets/Editor/Icons/Components/Disabled/HttpClientComponent_white.png
diff --git a/Editor/Icons/Components/Disabled/LensFlare_white.png b/Assets/Editor/Icons/Components/Disabled/LensFlare_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/LensFlare_white.png
rename to Assets/Editor/Icons/Components/Disabled/LensFlare_white.png
diff --git a/Editor/Icons/Components/Disabled/Light_white.png b/Assets/Editor/Icons/Components/Disabled/Light_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Light_white.png
rename to Assets/Editor/Icons/Components/Disabled/Light_white.png
diff --git a/Editor/Icons/Components/Disabled/LightningArc_white.png b/Assets/Editor/Icons/Components/Disabled/LightningArc_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/LightningArc_white.png
rename to Assets/Editor/Icons/Components/Disabled/LightningArc_white.png
diff --git a/Editor/Icons/Components/Disabled/Lightning_white.png b/Assets/Editor/Icons/Components/Disabled/Lightning_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Lightning_white.png
rename to Assets/Editor/Icons/Components/Disabled/Lightning_white.png
diff --git a/Editor/Icons/Components/Disabled/LookAt_white.png b/Assets/Editor/Icons/Components/Disabled/LookAt_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/LookAt_white.png
rename to Assets/Editor/Icons/Components/Disabled/LookAt_white.png
diff --git a/Editor/Icons/Components/Disabled/MannequinScopeContext_white.png b/Assets/Editor/Icons/Components/Disabled/MannequinScopeContext_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/MannequinScopeContext_white.png
rename to Assets/Editor/Icons/Components/Disabled/MannequinScopeContext_white.png
diff --git a/Editor/Icons/Components/Disabled/Mannequin_white.png b/Assets/Editor/Icons/Components/Disabled/Mannequin_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Mannequin_white.png
rename to Assets/Editor/Icons/Components/Disabled/Mannequin_white.png
diff --git a/Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png b/Assets/Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png
rename to Assets/Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png
diff --git a/Editor/Icons/Components/Disabled/NavigationArea_white.png b/Assets/Editor/Icons/Components/Disabled/NavigationArea_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/NavigationArea_white.png
rename to Assets/Editor/Icons/Components/Disabled/NavigationArea_white.png
diff --git a/Editor/Icons/Components/Disabled/NavigationSeed_white.png b/Assets/Editor/Icons/Components/Disabled/NavigationSeed_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/NavigationSeed_white.png
rename to Assets/Editor/Icons/Components/Disabled/NavigationSeed_white.png
diff --git a/Editor/Icons/Components/Disabled/Navigation_white.png b/Assets/Editor/Icons/Components/Disabled/Navigation_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Navigation_white.png
rename to Assets/Editor/Icons/Components/Disabled/Navigation_white.png
diff --git a/Editor/Icons/Components/Disabled/NetBinding_white.png b/Assets/Editor/Icons/Components/Disabled/NetBinding_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/NetBinding_white.png
rename to Assets/Editor/Icons/Components/Disabled/NetBinding_white.png
diff --git a/Editor/Icons/Components/Disabled/ObjectAvoidance_white.png b/Assets/Editor/Icons/Components/Disabled/ObjectAvoidance_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/ObjectAvoidance_white.png
rename to Assets/Editor/Icons/Components/Disabled/ObjectAvoidance_white.png
diff --git a/Editor/Icons/Components/Disabled/Particle_white.png b/Assets/Editor/Icons/Components/Disabled/Particle_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Particle_white.png
rename to Assets/Editor/Icons/Components/Disabled/Particle_white.png
diff --git a/Editor/Icons/Components/Disabled/PhysicsConstraint_white.png b/Assets/Editor/Icons/Components/Disabled/PhysicsConstraint_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/PhysicsConstraint_white.png
rename to Assets/Editor/Icons/Components/Disabled/PhysicsConstraint_white.png
diff --git a/Editor/Icons/Components/Disabled/PolygonPrism_white.png b/Assets/Editor/Icons/Components/Disabled/PolygonPrism_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/PolygonPrism_white.png
rename to Assets/Editor/Icons/Components/Disabled/PolygonPrism_white.png
diff --git a/Editor/Icons/Components/Disabled/PrimitiveCollider_white.png b/Assets/Editor/Icons/Components/Disabled/PrimitiveCollider_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/PrimitiveCollider_white.png
rename to Assets/Editor/Icons/Components/Disabled/PrimitiveCollider_white.png
diff --git a/Editor/Icons/Components/Disabled/Ragdoll.png b/Assets/Editor/Icons/Components/Disabled/Ragdoll.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Ragdoll.png
rename to Assets/Editor/Icons/Components/Disabled/Ragdoll.png
diff --git a/Editor/Icons/Components/Disabled/Ragdoll_white.png b/Assets/Editor/Icons/Components/Disabled/Ragdoll_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Ragdoll_white.png
rename to Assets/Editor/Icons/Components/Disabled/Ragdoll_white.png
diff --git a/Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png b/Assets/Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png
rename to Assets/Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png
diff --git a/Editor/Icons/Components/Disabled/RigidPhysics_white.png b/Assets/Editor/Icons/Components/Disabled/RigidPhysics_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/RigidPhysics_white.png
rename to Assets/Editor/Icons/Components/Disabled/RigidPhysics_white.png
diff --git a/Editor/Icons/Components/Disabled/Script_white.png b/Assets/Editor/Icons/Components/Disabled/Script_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Script_white.png
rename to Assets/Editor/Icons/Components/Disabled/Script_white.png
diff --git a/Editor/Icons/Components/Disabled/SequenceAgent_white.png b/Assets/Editor/Icons/Components/Disabled/SequenceAgent_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SequenceAgent_white.png
rename to Assets/Editor/Icons/Components/Disabled/SequenceAgent_white.png
diff --git a/Editor/Icons/Components/Disabled/Sequence_white.png b/Assets/Editor/Icons/Components/Disabled/Sequence_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Sequence_white.png
rename to Assets/Editor/Icons/Components/Disabled/Sequence_white.png
diff --git a/Editor/Icons/Components/Disabled/Shadow.png b/Assets/Editor/Icons/Components/Disabled/Shadow.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Shadow.png
rename to Assets/Editor/Icons/Components/Disabled/Shadow.png
diff --git a/Editor/Icons/Components/Disabled/SimpleState_white.png b/Assets/Editor/Icons/Components/Disabled/SimpleState_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SimpleState_white.png
rename to Assets/Editor/Icons/Components/Disabled/SimpleState_white.png
diff --git a/Editor/Icons/Components/Disabled/SkinnedMesh_white.png b/Assets/Editor/Icons/Components/Disabled/SkinnedMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SkinnedMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/SkinnedMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/SkyHighlight_white.png b/Assets/Editor/Icons/Components/Disabled/SkyHighlight_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SkyHighlight_white.png
rename to Assets/Editor/Icons/Components/Disabled/SkyHighlight_white.png
diff --git a/Editor/Icons/Components/Disabled/Snow_white.png b/Assets/Editor/Icons/Components/Disabled/Snow_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Snow_white.png
rename to Assets/Editor/Icons/Components/Disabled/Snow_white.png
diff --git a/Editor/Icons/Components/Disabled/Spawner_white.png b/Assets/Editor/Icons/Components/Disabled/Spawner_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Spawner_white.png
rename to Assets/Editor/Icons/Components/Disabled/Spawner_white.png
diff --git a/Editor/Icons/Components/Disabled/Sphere_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Sphere_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Sphere_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Sphere_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Sphere_white.png b/Assets/Editor/Icons/Components/Disabled/Sphere_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Sphere_white.png
rename to Assets/Editor/Icons/Components/Disabled/Sphere_white.png
diff --git a/Editor/Icons/Components/Disabled/Spline_white.png b/Assets/Editor/Icons/Components/Disabled/Spline_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Spline_white.png
rename to Assets/Editor/Icons/Components/Disabled/Spline_white.png
diff --git a/Editor/Icons/Components/Disabled/StaticData_white.png b/Assets/Editor/Icons/Components/Disabled/StaticData_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/StaticData_white.png
rename to Assets/Editor/Icons/Components/Disabled/StaticData_white.png
diff --git a/Editor/Icons/Components/Disabled/StaticMesh_white.png b/Assets/Editor/Icons/Components/Disabled/StaticMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/StaticMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/StaticMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/StaticPhysics_white.png b/Assets/Editor/Icons/Components/Disabled/StaticPhysics_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/StaticPhysics_white.png
rename to Assets/Editor/Icons/Components/Disabled/StaticPhysics_white.png
diff --git a/Editor/Icons/Components/Disabled/Tag_white.png b/Assets/Editor/Icons/Components/Disabled/Tag_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Tag_white.png
rename to Assets/Editor/Icons/Components/Disabled/Tag_white.png
diff --git a/Editor/Icons/Components/Disabled/Transform_white.png b/Assets/Editor/Icons/Components/Disabled/Transform_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Transform_white.png
rename to Assets/Editor/Icons/Components/Disabled/Transform_white.png
diff --git a/Editor/Icons/Components/Disabled/Trigger_white.png b/Assets/Editor/Icons/Components/Disabled/Trigger_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Trigger_white.png
rename to Assets/Editor/Icons/Components/Disabled/Trigger_white.png
diff --git a/Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png b/Assets/Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/UiCanvasRef_white.png b/Assets/Editor/Icons/Components/Disabled/UiCanvasRef_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/UiCanvasRef_white.png
rename to Assets/Editor/Icons/Components/Disabled/UiCanvasRef_white.png
diff --git a/Editor/Icons/Components/Disabled/WaterVolume_white.png b/Assets/Editor/Icons/Components/Disabled/WaterVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/WaterVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/WaterVolume_white.png
diff --git a/Editor/Icons/Components/Disabled/WindVolume_white.png b/Assets/Editor/Icons/Components/Disabled/WindVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/WindVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/WindVolume_white.png
diff --git a/Editor/Icons/Components/Disk_Shape.svg b/Assets/Editor/Icons/Components/Disk_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Disk_Shape.svg
rename to Assets/Editor/Icons/Components/Disk_Shape.svg
diff --git a/Editor/Icons/Components/DynamicContent.png b/Assets/Editor/Icons/Components/DynamicContent.png
similarity index 100%
rename from Editor/Icons/Components/DynamicContent.png
rename to Assets/Editor/Icons/Components/DynamicContent.png
diff --git a/Editor/Icons/Components/DynamicMesh.png b/Assets/Editor/Icons/Components/DynamicMesh.png
similarity index 100%
rename from Editor/Icons/Components/DynamicMesh.png
rename to Assets/Editor/Icons/Components/DynamicMesh.png
diff --git a/Editor/Icons/Components/Entity.png b/Assets/Editor/Icons/Components/Entity.png
similarity index 100%
rename from Editor/Icons/Components/Entity.png
rename to Assets/Editor/Icons/Components/Entity.png
diff --git a/Editor/Icons/Components/EntityInSlice.png b/Assets/Editor/Icons/Components/EntityInSlice.png
similarity index 100%
rename from Editor/Icons/Components/EntityInSlice.png
rename to Assets/Editor/Icons/Components/EntityInSlice.png
diff --git a/Editor/Icons/Components/EnvironmentProbe.svg b/Assets/Editor/Icons/Components/EnvironmentProbe.svg
similarity index 100%
rename from Editor/Icons/Components/EnvironmentProbe.svg
rename to Assets/Editor/Icons/Components/EnvironmentProbe.svg
diff --git a/Editor/Icons/Components/Flipbook.png b/Assets/Editor/Icons/Components/Flipbook.png
similarity index 100%
rename from Editor/Icons/Components/Flipbook.png
rename to Assets/Editor/Icons/Components/Flipbook.png
diff --git a/Editor/Icons/Components/FogVolume.svg b/Assets/Editor/Icons/Components/FogVolume.svg
similarity index 100%
rename from Editor/Icons/Components/FogVolume.svg
rename to Assets/Editor/Icons/Components/FogVolume.svg
diff --git a/Editor/Icons/Components/Footstep1.svg b/Assets/Editor/Icons/Components/Footstep1.svg
similarity index 100%
rename from Editor/Icons/Components/Footstep1.svg
rename to Assets/Editor/Icons/Components/Footstep1.svg
diff --git a/Editor/Icons/Components/ForceRegion.png b/Assets/Editor/Icons/Components/ForceRegion.png
similarity index 100%
rename from Editor/Icons/Components/ForceRegion.png
rename to Assets/Editor/Icons/Components/ForceRegion.png
diff --git a/Editor/Icons/Components/ForceVolume.svg b/Assets/Editor/Icons/Components/ForceVolume.svg
similarity index 100%
rename from Editor/Icons/Components/ForceVolume.svg
rename to Assets/Editor/Icons/Components/ForceVolume.svg
diff --git a/Editor/Icons/Components/GeometryCache.svg b/Assets/Editor/Icons/Components/GeometryCache.svg
similarity index 100%
rename from Editor/Icons/Components/GeometryCache.svg
rename to Assets/Editor/Icons/Components/GeometryCache.svg
diff --git a/Editor/Icons/Components/HttpClientComponent.png b/Assets/Editor/Icons/Components/HttpClientComponent.png
similarity index 100%
rename from Editor/Icons/Components/HttpClientComponent.png
rename to Assets/Editor/Icons/Components/HttpClientComponent.png
diff --git a/Editor/Icons/Components/Layers.svg b/Assets/Editor/Icons/Components/Layers.svg
similarity index 100%
rename from Editor/Icons/Components/Layers.svg
rename to Assets/Editor/Icons/Components/Layers.svg
diff --git a/Editor/Icons/Components/LegacyTerrain.svg b/Assets/Editor/Icons/Components/LegacyTerrain.svg
similarity index 100%
rename from Editor/Icons/Components/LegacyTerrain.svg
rename to Assets/Editor/Icons/Components/LegacyTerrain.svg
diff --git a/Editor/Icons/Components/LensFlare.svg b/Assets/Editor/Icons/Components/LensFlare.svg
similarity index 100%
rename from Editor/Icons/Components/LensFlare.svg
rename to Assets/Editor/Icons/Components/LensFlare.svg
diff --git a/Editor/Icons/Components/Light.png b/Assets/Editor/Icons/Components/Light.png
similarity index 100%
rename from Editor/Icons/Components/Light.png
rename to Assets/Editor/Icons/Components/Light.png
diff --git a/Editor/Icons/Components/Lightning.svg b/Assets/Editor/Icons/Components/Lightning.svg
similarity index 100%
rename from Editor/Icons/Components/Lightning.svg
rename to Assets/Editor/Icons/Components/Lightning.svg
diff --git a/Editor/Icons/Components/LightningArc.svg b/Assets/Editor/Icons/Components/LightningArc.svg
similarity index 100%
rename from Editor/Icons/Components/LightningArc.svg
rename to Assets/Editor/Icons/Components/LightningArc.svg
diff --git a/Editor/Icons/Components/LookAt.png b/Assets/Editor/Icons/Components/LookAt.png
similarity index 100%
rename from Editor/Icons/Components/LookAt.png
rename to Assets/Editor/Icons/Components/LookAt.png
diff --git a/Editor/Icons/Components/LuaScript.svg b/Assets/Editor/Icons/Components/LuaScript.svg
similarity index 100%
rename from Editor/Icons/Components/LuaScript.svg
rename to Assets/Editor/Icons/Components/LuaScript.svg
diff --git a/Editor/Icons/Components/Mannequin.svg b/Assets/Editor/Icons/Components/Mannequin.svg
similarity index 100%
rename from Editor/Icons/Components/Mannequin.svg
rename to Assets/Editor/Icons/Components/Mannequin.svg
diff --git a/Editor/Icons/Components/MannequinScopeContext.svg b/Assets/Editor/Icons/Components/MannequinScopeContext.svg
similarity index 100%
rename from Editor/Icons/Components/MannequinScopeContext.svg
rename to Assets/Editor/Icons/Components/MannequinScopeContext.svg
diff --git a/Editor/Icons/Components/MotionParameterSmoothing.svg b/Assets/Editor/Icons/Components/MotionParameterSmoothing.svg
similarity index 100%
rename from Editor/Icons/Components/MotionParameterSmoothing.svg
rename to Assets/Editor/Icons/Components/MotionParameterSmoothing.svg
diff --git a/Editor/Icons/Components/Navigation.svg b/Assets/Editor/Icons/Components/Navigation.svg
similarity index 100%
rename from Editor/Icons/Components/Navigation.svg
rename to Assets/Editor/Icons/Components/Navigation.svg
diff --git a/Editor/Icons/Components/NavigationArea.svg b/Assets/Editor/Icons/Components/NavigationArea.svg
similarity index 100%
rename from Editor/Icons/Components/NavigationArea.svg
rename to Assets/Editor/Icons/Components/NavigationArea.svg
diff --git a/Editor/Icons/Components/NavigationSeed.svg b/Assets/Editor/Icons/Components/NavigationSeed.svg
similarity index 100%
rename from Editor/Icons/Components/NavigationSeed.svg
rename to Assets/Editor/Icons/Components/NavigationSeed.svg
diff --git a/Editor/Icons/Components/NetBinding.svg b/Assets/Editor/Icons/Components/NetBinding.svg
similarity index 100%
rename from Editor/Icons/Components/NetBinding.svg
rename to Assets/Editor/Icons/Components/NetBinding.svg
diff --git a/Editor/Icons/Components/ObjectAvoidance.png b/Assets/Editor/Icons/Components/ObjectAvoidance.png
similarity index 100%
rename from Editor/Icons/Components/ObjectAvoidance.png
rename to Assets/Editor/Icons/Components/ObjectAvoidance.png
diff --git a/Editor/Icons/Components/Particle.svg b/Assets/Editor/Icons/Components/Particle.svg
similarity index 100%
rename from Editor/Icons/Components/Particle.svg
rename to Assets/Editor/Icons/Components/Particle.svg
diff --git a/Editor/Icons/Components/PhysXCharacter.svg b/Assets/Editor/Icons/Components/PhysXCharacter.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXCharacter.svg
rename to Assets/Editor/Icons/Components/PhysXCharacter.svg
diff --git a/Editor/Icons/Components/PhysXCollider.svg b/Assets/Editor/Icons/Components/PhysXCollider.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXCollider.svg
rename to Assets/Editor/Icons/Components/PhysXCollider.svg
diff --git a/Editor/Icons/Components/PhysXRagdoll.svg b/Assets/Editor/Icons/Components/PhysXRagdoll.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXRagdoll.svg
rename to Assets/Editor/Icons/Components/PhysXRagdoll.svg
diff --git a/Editor/Icons/Components/PhysXRigidBody.svg b/Assets/Editor/Icons/Components/PhysXRigidBody.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXRigidBody.svg
rename to Assets/Editor/Icons/Components/PhysXRigidBody.svg
diff --git a/Editor/Icons/Components/PhysXTerrain.svg b/Assets/Editor/Icons/Components/PhysXTerrain.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXTerrain.svg
rename to Assets/Editor/Icons/Components/PhysXTerrain.svg
diff --git a/Editor/Icons/Components/Physics.png b/Assets/Editor/Icons/Components/Physics.png
similarity index 100%
rename from Editor/Icons/Components/Physics.png
rename to Assets/Editor/Icons/Components/Physics.png
diff --git a/Editor/Icons/Components/PhysicsConstraint.svg b/Assets/Editor/Icons/Components/PhysicsConstraint.svg
similarity index 100%
rename from Editor/Icons/Components/PhysicsConstraint.svg
rename to Assets/Editor/Icons/Components/PhysicsConstraint.svg
diff --git a/Editor/Icons/Components/PointLight.svg b/Assets/Editor/Icons/Components/PointLight.svg
similarity index 100%
rename from Editor/Icons/Components/PointLight.svg
rename to Assets/Editor/Icons/Components/PointLight.svg
diff --git a/Editor/Icons/Components/PolygonPrism.svg b/Assets/Editor/Icons/Components/PolygonPrism.svg
similarity index 100%
rename from Editor/Icons/Components/PolygonPrism.svg
rename to Assets/Editor/Icons/Components/PolygonPrism.svg
diff --git a/Editor/Icons/Components/PrimitiveCollider.svg b/Assets/Editor/Icons/Components/PrimitiveCollider.svg
similarity index 100%
rename from Editor/Icons/Components/PrimitiveCollider.svg
rename to Assets/Editor/Icons/Components/PrimitiveCollider.svg
diff --git a/Editor/Icons/Components/ProjectorLight.svg b/Assets/Editor/Icons/Components/ProjectorLight.svg
similarity index 100%
rename from Editor/Icons/Components/ProjectorLight.svg
rename to Assets/Editor/Icons/Components/ProjectorLight.svg
diff --git a/Editor/Icons/Components/Quad_Shape.svg b/Assets/Editor/Icons/Components/Quad_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Quad_Shape.svg
rename to Assets/Editor/Icons/Components/Quad_Shape.svg
diff --git a/Editor/Icons/Components/Ragdoll.png b/Assets/Editor/Icons/Components/Ragdoll.png
similarity index 100%
rename from Editor/Icons/Components/Ragdoll.png
rename to Assets/Editor/Icons/Components/Ragdoll.png
diff --git a/Editor/Icons/Components/RandomTimedSpawner.svg b/Assets/Editor/Icons/Components/RandomTimedSpawner.svg
similarity index 100%
rename from Editor/Icons/Components/RandomTimedSpawner.svg
rename to Assets/Editor/Icons/Components/RandomTimedSpawner.svg
diff --git a/Editor/Icons/Components/RigidPhysics.svg b/Assets/Editor/Icons/Components/RigidPhysics.svg
similarity index 100%
rename from Editor/Icons/Components/RigidPhysics.svg
rename to Assets/Editor/Icons/Components/RigidPhysics.svg
diff --git a/Editor/Icons/Components/ScriptEventAssetReference.png b/Assets/Editor/Icons/Components/ScriptEventAssetReference.png
similarity index 100%
rename from Editor/Icons/Components/ScriptEventAssetReference.png
rename to Assets/Editor/Icons/Components/ScriptEventAssetReference.png
diff --git a/Editor/Icons/Components/Sequence.png b/Assets/Editor/Icons/Components/Sequence.png
similarity index 100%
rename from Editor/Icons/Components/Sequence.png
rename to Assets/Editor/Icons/Components/Sequence.png
diff --git a/Editor/Icons/Components/SequenceAgent.png b/Assets/Editor/Icons/Components/SequenceAgent.png
similarity index 100%
rename from Editor/Icons/Components/SequenceAgent.png
rename to Assets/Editor/Icons/Components/SequenceAgent.png
diff --git a/Editor/Icons/Components/Shadow.svg b/Assets/Editor/Icons/Components/Shadow.svg
similarity index 100%
rename from Editor/Icons/Components/Shadow.svg
rename to Assets/Editor/Icons/Components/Shadow.svg
diff --git a/Editor/Icons/Components/SimpleAnimation.svg b/Assets/Editor/Icons/Components/SimpleAnimation.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleAnimation.svg
rename to Assets/Editor/Icons/Components/SimpleAnimation.svg
diff --git a/Editor/Icons/Components/SimpleLODDistance.svg b/Assets/Editor/Icons/Components/SimpleLODDistance.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleLODDistance.svg
rename to Assets/Editor/Icons/Components/SimpleLODDistance.svg
diff --git a/Editor/Icons/Components/SimpleMotion.svg b/Assets/Editor/Icons/Components/SimpleMotion.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleMotion.svg
rename to Assets/Editor/Icons/Components/SimpleMotion.svg
diff --git a/Editor/Icons/Components/SimpleState.svg b/Assets/Editor/Icons/Components/SimpleState.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleState.svg
rename to Assets/Editor/Icons/Components/SimpleState.svg
diff --git a/Editor/Icons/Components/SkinnedMesh.svg b/Assets/Editor/Icons/Components/SkinnedMesh.svg
similarity index 100%
rename from Editor/Icons/Components/SkinnedMesh.svg
rename to Assets/Editor/Icons/Components/SkinnedMesh.svg
diff --git a/Editor/Icons/Components/SkyHighlight.svg b/Assets/Editor/Icons/Components/SkyHighlight.svg
similarity index 100%
rename from Editor/Icons/Components/SkyHighlight.svg
rename to Assets/Editor/Icons/Components/SkyHighlight.svg
diff --git a/Editor/Icons/Components/Snow.svg b/Assets/Editor/Icons/Components/Snow.svg
similarity index 100%
rename from Editor/Icons/Components/Snow.svg
rename to Assets/Editor/Icons/Components/Snow.svg
diff --git a/Editor/Icons/Components/Spawner.svg b/Assets/Editor/Icons/Components/Spawner.svg
similarity index 100%
rename from Editor/Icons/Components/Spawner.svg
rename to Assets/Editor/Icons/Components/Spawner.svg
diff --git a/Editor/Icons/Components/Sphere.png b/Assets/Editor/Icons/Components/Sphere.png
similarity index 100%
rename from Editor/Icons/Components/Sphere.png
rename to Assets/Editor/Icons/Components/Sphere.png
diff --git a/Editor/Icons/Components/Sphere_Shape.svg b/Assets/Editor/Icons/Components/Sphere_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Sphere_Shape.svg
rename to Assets/Editor/Icons/Components/Sphere_Shape.svg
diff --git a/Editor/Icons/Components/Spline.svg b/Assets/Editor/Icons/Components/Spline.svg
similarity index 100%
rename from Editor/Icons/Components/Spline.svg
rename to Assets/Editor/Icons/Components/Spline.svg
diff --git a/Editor/Icons/Components/StaticData.png b/Assets/Editor/Icons/Components/StaticData.png
similarity index 100%
rename from Editor/Icons/Components/StaticData.png
rename to Assets/Editor/Icons/Components/StaticData.png
diff --git a/Editor/Icons/Components/StaticMesh.svg b/Assets/Editor/Icons/Components/StaticMesh.svg
similarity index 100%
rename from Editor/Icons/Components/StaticMesh.svg
rename to Assets/Editor/Icons/Components/StaticMesh.svg
diff --git a/Editor/Icons/Components/StaticPhysics.svg b/Assets/Editor/Icons/Components/StaticPhysics.svg
similarity index 100%
rename from Editor/Icons/Components/StaticPhysics.svg
rename to Assets/Editor/Icons/Components/StaticPhysics.svg
diff --git a/Editor/Icons/Components/Tag.svg b/Assets/Editor/Icons/Components/Tag.svg
similarity index 100%
rename from Editor/Icons/Components/Tag.svg
rename to Assets/Editor/Icons/Components/Tag.svg
diff --git a/Editor/Icons/Components/Transform.svg b/Assets/Editor/Icons/Components/Transform.svg
similarity index 100%
rename from Editor/Icons/Components/Transform.svg
rename to Assets/Editor/Icons/Components/Transform.svg
diff --git a/Editor/Icons/Components/TriggerArea.svg b/Assets/Editor/Icons/Components/TriggerArea.svg
similarity index 100%
rename from Editor/Icons/Components/TriggerArea.svg
rename to Assets/Editor/Icons/Components/TriggerArea.svg
diff --git a/Editor/Icons/Components/Tube_Shape.svg b/Assets/Editor/Icons/Components/Tube_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Tube_Shape.svg
rename to Assets/Editor/Icons/Components/Tube_Shape.svg
diff --git a/Editor/Icons/Components/UICanvasAssetRef.svg b/Assets/Editor/Icons/Components/UICanvasAssetRef.svg
similarity index 100%
rename from Editor/Icons/Components/UICanvasAssetRef.svg
rename to Assets/Editor/Icons/Components/UICanvasAssetRef.svg
diff --git a/Editor/Icons/Components/UICanvasOnMesh.svg b/Assets/Editor/Icons/Components/UICanvasOnMesh.svg
similarity index 100%
rename from Editor/Icons/Components/UICanvasOnMesh.svg
rename to Assets/Editor/Icons/Components/UICanvasOnMesh.svg
diff --git a/Editor/Icons/Components/UICanvasProxyRef.svg b/Assets/Editor/Icons/Components/UICanvasProxyRef.svg
similarity index 100%
rename from Editor/Icons/Components/UICanvasProxyRef.svg
rename to Assets/Editor/Icons/Components/UICanvasProxyRef.svg
diff --git a/Editor/Icons/Components/VRPreview.svg b/Assets/Editor/Icons/Components/VRPreview.svg
similarity index 100%
rename from Editor/Icons/Components/VRPreview.svg
rename to Assets/Editor/Icons/Components/VRPreview.svg
diff --git a/Editor/Icons/Components/Viewport/Animation.png b/Assets/Editor/Icons/Components/Viewport/Animation.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Animation.png
rename to Assets/Editor/Icons/Components/Viewport/Animation.png
diff --git a/Editor/Icons/Components/Viewport/AreaLight.png b/Assets/Editor/Icons/Components/Viewport/AreaLight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AreaLight.png
rename to Assets/Editor/Icons/Components/Viewport/AreaLight.png
diff --git a/Editor/Icons/Components/Viewport/Attachment.png b/Assets/Editor/Icons/Components/Viewport/Attachment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Attachment.png
rename to Assets/Editor/Icons/Components/Viewport/Attachment.png
diff --git a/Editor/Icons/Components/Viewport/AudioArea.png b/Assets/Editor/Icons/Components/Viewport/AudioArea.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioArea.png
rename to Assets/Editor/Icons/Components/Viewport/AudioArea.png
diff --git a/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png b/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
rename to Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
diff --git a/Editor/Icons/Components/Viewport/AudioEnvironment.png b/Assets/Editor/Icons/Components/Viewport/AudioEnvironment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioEnvironment.png
rename to Assets/Editor/Icons/Components/Viewport/AudioEnvironment.png
diff --git a/Editor/Icons/Components/Viewport/AudioListener.png b/Assets/Editor/Icons/Components/Viewport/AudioListener.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioListener.png
rename to Assets/Editor/Icons/Components/Viewport/AudioListener.png
diff --git a/Editor/Icons/Components/Viewport/AudioMultiPosition.png b/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioMultiPosition.png
rename to Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.png
diff --git a/Editor/Icons/Components/Viewport/AudioRtpc.png b/Assets/Editor/Icons/Components/Viewport/AudioRtpc.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioRtpc.png
rename to Assets/Editor/Icons/Components/Viewport/AudioRtpc.png
diff --git a/Editor/Icons/Components/Viewport/AudioSwitch.png b/Assets/Editor/Icons/Components/Viewport/AudioSwitch.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioSwitch.png
rename to Assets/Editor/Icons/Components/Viewport/AudioSwitch.png
diff --git a/Editor/Icons/Components/Viewport/AudioTrigger.png b/Assets/Editor/Icons/Components/Viewport/AudioTrigger.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioTrigger.png
rename to Assets/Editor/Icons/Components/Viewport/AudioTrigger.png
diff --git a/Editor/Icons/Components/Viewport/BehaviorTree.png b/Assets/Editor/Icons/Components/Viewport/BehaviorTree.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/BehaviorTree.png
rename to Assets/Editor/Icons/Components/Viewport/BehaviorTree.png
diff --git a/Editor/Icons/Components/Viewport/Box.png b/Assets/Editor/Icons/Components/Viewport/Box.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Box.png
rename to Assets/Editor/Icons/Components/Viewport/Box.png
diff --git a/Editor/Icons/Components/Viewport/Box_Shape.png b/Assets/Editor/Icons/Components/Viewport/Box_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Box_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Box_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Capsule.png b/Assets/Editor/Icons/Components/Viewport/Capsule.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Capsule.png
rename to Assets/Editor/Icons/Components/Viewport/Capsule.png
diff --git a/Editor/Icons/Components/Viewport/Capsule_Shape.png b/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Capsule_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Capsule_Shape.png
diff --git a/Editor/Icons/Components/Viewport/CharacterPhysics.png b/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/CharacterPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/CharacterPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Comment.png b/Assets/Editor/Icons/Components/Viewport/Comment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Comment.png
rename to Assets/Editor/Icons/Components/Viewport/Comment.png
diff --git a/Editor/Icons/Components/Viewport/ComponentPlaceholder.png b/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ComponentPlaceholder.png
rename to Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.png
diff --git a/Editor/Icons/Components/Viewport/Component_Placeholder.png b/Assets/Editor/Icons/Components/Viewport/Component_Placeholder.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Component_Placeholder.png
rename to Assets/Editor/Icons/Components/Viewport/Component_Placeholder.png
diff --git a/Editor/Icons/Components/Viewport/Cylinder.png b/Assets/Editor/Icons/Components/Viewport/Cylinder.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Cylinder.png
rename to Assets/Editor/Icons/Components/Viewport/Cylinder.png
diff --git a/Editor/Icons/Components/Viewport/Cylinder_Shape.png b/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Cylinder_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Decal.png b/Assets/Editor/Icons/Components/Viewport/Decal.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Decal.png
rename to Assets/Editor/Icons/Components/Viewport/Decal.png
diff --git a/Editor/Icons/Components/Viewport/Disk_Shape.png b/Assets/Editor/Icons/Components/Viewport/Disk_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Disk_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Disk_Shape.png
diff --git a/Editor/Icons/Components/Viewport/DynamicContent.png b/Assets/Editor/Icons/Components/Viewport/DynamicContent.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/DynamicContent.png
rename to Assets/Editor/Icons/Components/Viewport/DynamicContent.png
diff --git a/Editor/Icons/Components/Viewport/DynamicMesh.png b/Assets/Editor/Icons/Components/Viewport/DynamicMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/DynamicMesh.png
rename to Assets/Editor/Icons/Components/Viewport/DynamicMesh.png
diff --git a/Editor/Icons/Components/Viewport/Entity.png b/Assets/Editor/Icons/Components/Viewport/Entity.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Entity.png
rename to Assets/Editor/Icons/Components/Viewport/Entity.png
diff --git a/Editor/Icons/Components/Viewport/EntityInSlice.png b/Assets/Editor/Icons/Components/Viewport/EntityInSlice.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/EntityInSlice.png
rename to Assets/Editor/Icons/Components/Viewport/EntityInSlice.png
diff --git a/Editor/Icons/Components/Viewport/EnvironmentProbe.png b/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/EnvironmentProbe.png
rename to Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.png
diff --git a/Editor/Icons/Components/Viewport/Flipbook.png b/Assets/Editor/Icons/Components/Viewport/Flipbook.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Flipbook.png
rename to Assets/Editor/Icons/Components/Viewport/Flipbook.png
diff --git a/Editor/Icons/Components/Viewport/FogVolume.png b/Assets/Editor/Icons/Components/Viewport/FogVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/FogVolume.png
rename to Assets/Editor/Icons/Components/Viewport/FogVolume.png
diff --git a/Editor/Icons/Components/Viewport/ForceVolume.png b/Assets/Editor/Icons/Components/Viewport/ForceVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ForceVolume.png
rename to Assets/Editor/Icons/Components/Viewport/ForceVolume.png
diff --git a/Editor/Icons/Components/Viewport/GeometryCache.png b/Assets/Editor/Icons/Components/Viewport/GeometryCache.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/GeometryCache.png
rename to Assets/Editor/Icons/Components/Viewport/GeometryCache.png
diff --git a/Editor/Icons/Components/Viewport/HttpClientComponent.png b/Assets/Editor/Icons/Components/Viewport/HttpClientComponent.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/HttpClientComponent.png
rename to Assets/Editor/Icons/Components/Viewport/HttpClientComponent.png
diff --git a/Editor/Icons/Components/Viewport/LensFlare.png b/Assets/Editor/Icons/Components/Viewport/LensFlare.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/LensFlare.png
rename to Assets/Editor/Icons/Components/Viewport/LensFlare.png
diff --git a/Editor/Icons/Components/Viewport/Light.png b/Assets/Editor/Icons/Components/Viewport/Light.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Light.png
rename to Assets/Editor/Icons/Components/Viewport/Light.png
diff --git a/Editor/Icons/Components/Viewport/Lightning.png b/Assets/Editor/Icons/Components/Viewport/Lightning.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Lightning.png
rename to Assets/Editor/Icons/Components/Viewport/Lightning.png
diff --git a/Editor/Icons/Components/Viewport/LightningArc.png b/Assets/Editor/Icons/Components/Viewport/LightningArc.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/LightningArc.png
rename to Assets/Editor/Icons/Components/Viewport/LightningArc.png
diff --git a/Editor/Icons/Components/Viewport/LookAt.png b/Assets/Editor/Icons/Components/Viewport/LookAt.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/LookAt.png
rename to Assets/Editor/Icons/Components/Viewport/LookAt.png
diff --git a/Editor/Icons/Components/Viewport/Mannequin.png b/Assets/Editor/Icons/Components/Viewport/Mannequin.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Mannequin.png
rename to Assets/Editor/Icons/Components/Viewport/Mannequin.png
diff --git a/Editor/Icons/Components/Viewport/MannequinScopeContext.png b/Assets/Editor/Icons/Components/Viewport/MannequinScopeContext.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/MannequinScopeContext.png
rename to Assets/Editor/Icons/Components/Viewport/MannequinScopeContext.png
diff --git a/Editor/Icons/Components/Viewport/MeshCollider.png b/Assets/Editor/Icons/Components/Viewport/MeshCollider.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/MeshCollider.png
rename to Assets/Editor/Icons/Components/Viewport/MeshCollider.png
diff --git a/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png b/Assets/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
rename to Assets/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
diff --git a/Editor/Icons/Components/Viewport/Navigation.png b/Assets/Editor/Icons/Components/Viewport/Navigation.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Navigation.png
rename to Assets/Editor/Icons/Components/Viewport/Navigation.png
diff --git a/Editor/Icons/Components/Viewport/NavigationArea.png b/Assets/Editor/Icons/Components/Viewport/NavigationArea.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/NavigationArea.png
rename to Assets/Editor/Icons/Components/Viewport/NavigationArea.png
diff --git a/Editor/Icons/Components/Viewport/NavigationSeed.png b/Assets/Editor/Icons/Components/Viewport/NavigationSeed.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/NavigationSeed.png
rename to Assets/Editor/Icons/Components/Viewport/NavigationSeed.png
diff --git a/Editor/Icons/Components/Viewport/NetBinding.png b/Assets/Editor/Icons/Components/Viewport/NetBinding.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/NetBinding.png
rename to Assets/Editor/Icons/Components/Viewport/NetBinding.png
diff --git a/Editor/Icons/Components/Viewport/Nova.png b/Assets/Editor/Icons/Components/Viewport/Nova.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Nova.png
rename to Assets/Editor/Icons/Components/Viewport/Nova.png
diff --git a/Editor/Icons/Components/Viewport/ObjectAvoidance.png b/Assets/Editor/Icons/Components/Viewport/ObjectAvoidance.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ObjectAvoidance.png
rename to Assets/Editor/Icons/Components/Viewport/ObjectAvoidance.png
diff --git a/Editor/Icons/Components/Viewport/Particle.png b/Assets/Editor/Icons/Components/Viewport/Particle.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Particle.png
rename to Assets/Editor/Icons/Components/Viewport/Particle.png
diff --git a/Editor/Icons/Components/Viewport/Physics.png b/Assets/Editor/Icons/Components/Viewport/Physics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Physics.png
rename to Assets/Editor/Icons/Components/Viewport/Physics.png
diff --git a/Editor/Icons/Components/Viewport/PhysicsConstraint.png b/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PhysicsConstraint.png
rename to Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.png
diff --git a/Editor/Icons/Components/Viewport/PointLight.png b/Assets/Editor/Icons/Components/Viewport/PointLight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PointLight.png
rename to Assets/Editor/Icons/Components/Viewport/PointLight.png
diff --git a/Editor/Icons/Components/Viewport/PolygonPrism.png b/Assets/Editor/Icons/Components/Viewport/PolygonPrism.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PolygonPrism.png
rename to Assets/Editor/Icons/Components/Viewport/PolygonPrism.png
diff --git a/Editor/Icons/Components/Viewport/Primitive Collider.png b/Assets/Editor/Icons/Components/Viewport/Primitive Collider.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Primitive Collider.png
rename to Assets/Editor/Icons/Components/Viewport/Primitive Collider.png
diff --git a/Editor/Icons/Components/Viewport/PrimitiveCollider.png b/Assets/Editor/Icons/Components/Viewport/PrimitiveCollider.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PrimitiveCollider.png
rename to Assets/Editor/Icons/Components/Viewport/PrimitiveCollider.png
diff --git a/Editor/Icons/Components/Viewport/ProjectorLight.png b/Assets/Editor/Icons/Components/Viewport/ProjectorLight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ProjectorLight.png
rename to Assets/Editor/Icons/Components/Viewport/ProjectorLight.png
diff --git a/Editor/Icons/Components/Viewport/Quad_Shape.png b/Assets/Editor/Icons/Components/Viewport/Quad_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Quad_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Quad_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Ragdoll.png b/Assets/Editor/Icons/Components/Viewport/Ragdoll.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Ragdoll.png
rename to Assets/Editor/Icons/Components/Viewport/Ragdoll.png
diff --git a/Editor/Icons/Components/Viewport/RandomTimedSpawner.png b/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/RandomTimedSpawner.png
rename to Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.png
diff --git a/Editor/Icons/Components/Viewport/RigidPhysics.png b/Assets/Editor/Icons/Components/Viewport/RigidPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/RigidPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/RigidPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Script.png b/Assets/Editor/Icons/Components/Viewport/Script.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Script.png
rename to Assets/Editor/Icons/Components/Viewport/Script.png
diff --git a/Editor/Icons/Components/Viewport/ScriptEventAssetReference.png b/Assets/Editor/Icons/Components/Viewport/ScriptEventAssetReference.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ScriptEventAssetReference.png
rename to Assets/Editor/Icons/Components/Viewport/ScriptEventAssetReference.png
diff --git a/Editor/Icons/Components/Viewport/Sequence.png b/Assets/Editor/Icons/Components/Viewport/Sequence.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Sequence.png
rename to Assets/Editor/Icons/Components/Viewport/Sequence.png
diff --git a/Editor/Icons/Components/Viewport/SequenceAgent.png b/Assets/Editor/Icons/Components/Viewport/SequenceAgent.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SequenceAgent.png
rename to Assets/Editor/Icons/Components/Viewport/SequenceAgent.png
diff --git a/Editor/Icons/Components/Viewport/Shadow.png b/Assets/Editor/Icons/Components/Viewport/Shadow.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Shadow.png
rename to Assets/Editor/Icons/Components/Viewport/Shadow.png
diff --git a/Editor/Icons/Components/Viewport/SimpleState.png b/Assets/Editor/Icons/Components/Viewport/SimpleState.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SimpleState.png
rename to Assets/Editor/Icons/Components/Viewport/SimpleState.png
diff --git a/Editor/Icons/Components/Viewport/SkinnedMesh.png b/Assets/Editor/Icons/Components/Viewport/SkinnedMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SkinnedMesh.png
rename to Assets/Editor/Icons/Components/Viewport/SkinnedMesh.png
diff --git a/Editor/Icons/Components/Viewport/SkyHighlight.png b/Assets/Editor/Icons/Components/Viewport/SkyHighlight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SkyHighlight.png
rename to Assets/Editor/Icons/Components/Viewport/SkyHighlight.png
diff --git a/Editor/Icons/Components/Viewport/Snow.png b/Assets/Editor/Icons/Components/Viewport/Snow.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Snow.png
rename to Assets/Editor/Icons/Components/Viewport/Snow.png
diff --git a/Editor/Icons/Components/Viewport/Spawner.png b/Assets/Editor/Icons/Components/Viewport/Spawner.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Spawner.png
rename to Assets/Editor/Icons/Components/Viewport/Spawner.png
diff --git a/Editor/Icons/Components/Viewport/Sphere.png b/Assets/Editor/Icons/Components/Viewport/Sphere.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Sphere.png
rename to Assets/Editor/Icons/Components/Viewport/Sphere.png
diff --git a/Editor/Icons/Components/Viewport/Sphere_Shape.png b/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Sphere_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Sphere_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Spline.png b/Assets/Editor/Icons/Components/Viewport/Spline.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Spline.png
rename to Assets/Editor/Icons/Components/Viewport/Spline.png
diff --git a/Editor/Icons/Components/Viewport/StaticData.png b/Assets/Editor/Icons/Components/Viewport/StaticData.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/StaticData.png
rename to Assets/Editor/Icons/Components/Viewport/StaticData.png
diff --git a/Editor/Icons/Components/Viewport/StaticMesh.png b/Assets/Editor/Icons/Components/Viewport/StaticMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/StaticMesh.png
rename to Assets/Editor/Icons/Components/Viewport/StaticMesh.png
diff --git a/Editor/Icons/Components/Viewport/StaticPhysics.png b/Assets/Editor/Icons/Components/Viewport/StaticPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/StaticPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/StaticPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Tag.png b/Assets/Editor/Icons/Components/Viewport/Tag.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Tag.png
rename to Assets/Editor/Icons/Components/Viewport/Tag.png
diff --git a/Editor/Icons/Components/Viewport/TerrainPhysics.png b/Assets/Editor/Icons/Components/Viewport/TerrainPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/TerrainPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/TerrainPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Transform.png b/Assets/Editor/Icons/Components/Viewport/Transform.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Transform.png
rename to Assets/Editor/Icons/Components/Viewport/Transform.png
diff --git a/Editor/Icons/Components/Viewport/Trigger.png b/Assets/Editor/Icons/Components/Viewport/Trigger.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Trigger.png
rename to Assets/Editor/Icons/Components/Viewport/Trigger.png
diff --git a/Editor/Icons/Components/Viewport/Tube_Shape.png b/Assets/Editor/Icons/Components/Viewport/Tube_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Tube_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Tube_Shape.png
diff --git a/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png b/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
rename to Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
diff --git a/Editor/Icons/Components/Viewport/UiCanvasRef.png b/Assets/Editor/Icons/Components/Viewport/UiCanvasRef.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/UiCanvasRef.png
rename to Assets/Editor/Icons/Components/Viewport/UiCanvasRef.png
diff --git a/Editor/Icons/Components/Viewport/VRPreview.png b/Assets/Editor/Icons/Components/Viewport/VRPreview.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/VRPreview.png
rename to Assets/Editor/Icons/Components/Viewport/VRPreview.png
diff --git a/Editor/Icons/Components/Viewport/WaterVolume.png b/Assets/Editor/Icons/Components/Viewport/WaterVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/WaterVolume.png
rename to Assets/Editor/Icons/Components/Viewport/WaterVolume.png
diff --git a/Editor/Icons/Components/Viewport/WindVolume.png b/Assets/Editor/Icons/Components/Viewport/WindVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/WindVolume.png
rename to Assets/Editor/Icons/Components/Viewport/WindVolume.png
diff --git a/Editor/Icons/Components/WaterRippleGenerator.svg b/Assets/Editor/Icons/Components/WaterRippleGenerator.svg
similarity index 100%
rename from Editor/Icons/Components/WaterRippleGenerator.svg
rename to Assets/Editor/Icons/Components/WaterRippleGenerator.svg
diff --git a/Editor/Icons/Components/WaterVolume.svg b/Assets/Editor/Icons/Components/WaterVolume.svg
similarity index 100%
rename from Editor/Icons/Components/WaterVolume.svg
rename to Assets/Editor/Icons/Components/WaterVolume.svg
diff --git a/Editor/Icons/Components/WindVolume.svg b/Assets/Editor/Icons/Components/WindVolume.svg
similarity index 100%
rename from Editor/Icons/Components/WindVolume.svg
rename to Assets/Editor/Icons/Components/WindVolume.svg
diff --git a/Editor/Icons/PhysX/Move.svg b/Assets/Editor/Icons/PhysX/Move.svg
similarity index 100%
rename from Editor/Icons/PhysX/Move.svg
rename to Assets/Editor/Icons/PhysX/Move.svg
diff --git a/Editor/Icons/PhysX/Rotate.svg b/Assets/Editor/Icons/PhysX/Rotate.svg
similarity index 100%
rename from Editor/Icons/PhysX/Rotate.svg
rename to Assets/Editor/Icons/PhysX/Rotate.svg
diff --git a/Editor/Icons/PhysX/Scale.svg b/Assets/Editor/Icons/PhysX/Scale.svg
similarity index 100%
rename from Editor/Icons/PhysX/Scale.svg
rename to Assets/Editor/Icons/PhysX/Scale.svg
diff --git a/Editor/Icons/PropertyEditor/Browse.png b/Assets/Editor/Icons/PropertyEditor/Browse.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/Browse.png
rename to Assets/Editor/Icons/PropertyEditor/Browse.png
diff --git a/Editor/Icons/PropertyEditor/Browse_on.png b/Assets/Editor/Icons/PropertyEditor/Browse_on.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/Browse_on.png
rename to Assets/Editor/Icons/PropertyEditor/Browse_on.png
diff --git a/Editor/Icons/PropertyEditor/add.png b/Assets/Editor/Icons/PropertyEditor/add.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/add.png
rename to Assets/Editor/Icons/PropertyEditor/add.png
diff --git a/Editor/Icons/PropertyEditor/cross-circle-small.png b/Assets/Editor/Icons/PropertyEditor/cross-circle-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/cross-circle-small.png
rename to Assets/Editor/Icons/PropertyEditor/cross-circle-small.png
diff --git a/Editor/Icons/PropertyEditor/cross-small.png b/Assets/Editor/Icons/PropertyEditor/cross-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/cross-small.png
rename to Assets/Editor/Icons/PropertyEditor/cross-small.png
diff --git a/Editor/Icons/PropertyEditor/error_icon.png b/Assets/Editor/Icons/PropertyEditor/error_icon.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/error_icon.png
rename to Assets/Editor/Icons/PropertyEditor/error_icon.png
diff --git a/Editor/Icons/PropertyEditor/group_closed.png b/Assets/Editor/Icons/PropertyEditor/group_closed.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/group_closed.png
rename to Assets/Editor/Icons/PropertyEditor/group_closed.png
diff --git a/Editor/Icons/PropertyEditor/group_open.png b/Assets/Editor/Icons/PropertyEditor/group_open.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/group_open.png
rename to Assets/Editor/Icons/PropertyEditor/group_open.png
diff --git a/Editor/Icons/PropertyEditor/image_icon.svg b/Assets/Editor/Icons/PropertyEditor/image_icon.svg
similarity index 100%
rename from Editor/Icons/PropertyEditor/image_icon.svg
rename to Assets/Editor/Icons/PropertyEditor/image_icon.svg
diff --git a/Editor/Icons/PropertyEditor/list-add-small.png b/Assets/Editor/Icons/PropertyEditor/list-add-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/list-add-small.png
rename to Assets/Editor/Icons/PropertyEditor/list-add-small.png
diff --git a/Editor/Icons/PropertyEditor/open_in.png b/Assets/Editor/Icons/PropertyEditor/open_in.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/open_in.png
rename to Assets/Editor/Icons/PropertyEditor/open_in.png
diff --git a/Editor/Icons/PropertyEditor/point_hand.png b/Assets/Editor/Icons/PropertyEditor/point_hand.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/point_hand.png
rename to Assets/Editor/Icons/PropertyEditor/point_hand.png
diff --git a/Editor/Icons/PropertyEditor/remove.png b/Assets/Editor/Icons/PropertyEditor/remove.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/remove.png
rename to Assets/Editor/Icons/PropertyEditor/remove.png
diff --git a/Editor/Icons/PropertyEditor/reset_icon.png b/Assets/Editor/Icons/PropertyEditor/reset_icon.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/reset_icon.png
rename to Assets/Editor/Icons/PropertyEditor/reset_icon.png
diff --git a/Editor/Icons/PropertyEditor/tool_cancel.png b/Assets/Editor/Icons/PropertyEditor/tool_cancel.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tool_cancel.png
rename to Assets/Editor/Icons/PropertyEditor/tool_cancel.png
diff --git a/Editor/Icons/PropertyEditor/tool_cancel_highlight.png b/Assets/Editor/Icons/PropertyEditor/tool_cancel_highlight.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tool_cancel_highlight.png
rename to Assets/Editor/Icons/PropertyEditor/tool_cancel_highlight.png
diff --git a/Editor/Icons/PropertyEditor/tool_cancel_hover.png b/Assets/Editor/Icons/PropertyEditor/tool_cancel_hover.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tool_cancel_hover.png
rename to Assets/Editor/Icons/PropertyEditor/tool_cancel_hover.png
diff --git a/Editor/Icons/PropertyEditor/trash-small.png b/Assets/Editor/Icons/PropertyEditor/trash-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/trash-small.png
rename to Assets/Editor/Icons/PropertyEditor/trash-small.png
diff --git a/Editor/Icons/PropertyEditor/tree_closed.png b/Assets/Editor/Icons/PropertyEditor/tree_closed.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tree_closed.png
rename to Assets/Editor/Icons/PropertyEditor/tree_closed.png
diff --git a/Editor/Icons/PropertyEditor/tree_open.png b/Assets/Editor/Icons/PropertyEditor/tree_open.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tree_open.png
rename to Assets/Editor/Icons/PropertyEditor/tree_open.png
diff --git a/Editor/Icons/RotationWarning.png b/Assets/Editor/Icons/RotationWarning.png
similarity index 100%
rename from Editor/Icons/RotationWarning.png
rename to Assets/Editor/Icons/RotationWarning.png
diff --git a/Editor/Icons/ScaleWarning.png b/Assets/Editor/Icons/ScaleWarning.png
similarity index 100%
rename from Editor/Icons/ScaleWarning.png
rename to Assets/Editor/Icons/ScaleWarning.png
diff --git a/Editor/Icons/ScriptCanvas/Add.png b/Assets/Editor/Icons/ScriptCanvas/Add.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Add.png
rename to Assets/Editor/Icons/ScriptCanvas/Add.png
diff --git a/Editor/Icons/ScriptCanvas/And.png b/Assets/Editor/Icons/ScriptCanvas/And.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/And.png
rename to Assets/Editor/Icons/ScriptCanvas/And.png
diff --git a/Editor/Icons/ScriptCanvas/Boolean.png b/Assets/Editor/Icons/ScriptCanvas/Boolean.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Boolean.png
rename to Assets/Editor/Icons/ScriptCanvas/Boolean.png
diff --git a/Editor/Icons/ScriptCanvas/Breakpoint.png b/Assets/Editor/Icons/ScriptCanvas/Breakpoint.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Breakpoint.png
rename to Assets/Editor/Icons/ScriptCanvas/Breakpoint.png
diff --git a/Editor/Icons/ScriptCanvas/Bus.png b/Assets/Editor/Icons/ScriptCanvas/Bus.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Bus.png
rename to Assets/Editor/Icons/ScriptCanvas/Bus.png
diff --git a/Editor/Icons/ScriptCanvas/Connect.png b/Assets/Editor/Icons/ScriptCanvas/Connect.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Connect.png
rename to Assets/Editor/Icons/ScriptCanvas/Connect.png
diff --git a/Editor/Icons/ScriptCanvas/Delay.png b/Assets/Editor/Icons/ScriptCanvas/Delay.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Delay.png
rename to Assets/Editor/Icons/ScriptCanvas/Delay.png
diff --git a/Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png b/Assets/Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png
rename to Assets/Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png
diff --git a/Editor/Icons/ScriptCanvas/Disconnect.png b/Assets/Editor/Icons/ScriptCanvas/Disconnect.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Disconnect.png
rename to Assets/Editor/Icons/ScriptCanvas/Disconnect.png
diff --git a/Editor/Icons/ScriptCanvas/Divide.png b/Assets/Editor/Icons/ScriptCanvas/Divide.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Divide.png
rename to Assets/Editor/Icons/ScriptCanvas/Divide.png
diff --git a/Editor/Icons/ScriptCanvas/EntityRef.png b/Assets/Editor/Icons/ScriptCanvas/EntityRef.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/EntityRef.png
rename to Assets/Editor/Icons/ScriptCanvas/EntityRef.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/All.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/All.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/All.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/All.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Core.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Core.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Core.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Core.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Entity.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Entity.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Entity.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Entity.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Logic.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Logic.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Logic.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Logic.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Math.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Math.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Math.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Math.png
diff --git a/Editor/Icons/ScriptCanvas/Multiply.png b/Assets/Editor/Icons/ScriptCanvas/Multiply.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Multiply.png
rename to Assets/Editor/Icons/ScriptCanvas/Multiply.png
diff --git a/Editor/Icons/ScriptCanvas/Not.png b/Assets/Editor/Icons/ScriptCanvas/Not.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Not.png
rename to Assets/Editor/Icons/ScriptCanvas/Not.png
diff --git a/Editor/Icons/ScriptCanvas/Number.png b/Assets/Editor/Icons/ScriptCanvas/Number.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Number.png
rename to Assets/Editor/Icons/ScriptCanvas/Number.png
diff --git a/Editor/Icons/ScriptCanvas/Or.png b/Assets/Editor/Icons/ScriptCanvas/Or.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Or.png
rename to Assets/Editor/Icons/ScriptCanvas/Or.png
diff --git a/Editor/Icons/ScriptCanvas/Placeholder.png b/Assets/Editor/Icons/ScriptCanvas/Placeholder.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Placeholder.png
rename to Assets/Editor/Icons/ScriptCanvas/Placeholder.png
diff --git a/Editor/Icons/ScriptCanvas/Print.png b/Assets/Editor/Icons/ScriptCanvas/Print.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Print.png
rename to Assets/Editor/Icons/ScriptCanvas/Print.png
diff --git a/Editor/Icons/ScriptCanvas/Random.png b/Assets/Editor/Icons/ScriptCanvas/Random.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Random.png
rename to Assets/Editor/Icons/ScriptCanvas/Random.png
diff --git a/Editor/Icons/ScriptCanvas/Rotate.png b/Assets/Editor/Icons/ScriptCanvas/Rotate.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Rotate.png
rename to Assets/Editor/Icons/ScriptCanvas/Rotate.png
diff --git a/Editor/Icons/ScriptCanvas/ScriptCanvas.svg b/Assets/Editor/Icons/ScriptCanvas/ScriptCanvas.svg
similarity index 100%
rename from Editor/Icons/ScriptCanvas/ScriptCanvas.svg
rename to Assets/Editor/Icons/ScriptCanvas/ScriptCanvas.svg
diff --git a/Editor/Icons/ScriptCanvas/Start.png b/Assets/Editor/Icons/ScriptCanvas/Start.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Start.png
rename to Assets/Editor/Icons/ScriptCanvas/Start.png
diff --git a/Editor/Icons/ScriptCanvas/Step In.png b/Assets/Editor/Icons/ScriptCanvas/Step In.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Step In.png
rename to Assets/Editor/Icons/ScriptCanvas/Step In.png
diff --git a/Editor/Icons/ScriptCanvas/Step Over.png b/Assets/Editor/Icons/ScriptCanvas/Step Over.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Step Over.png
rename to Assets/Editor/Icons/ScriptCanvas/Step Over.png
diff --git a/Editor/Icons/ScriptCanvas/String.png b/Assets/Editor/Icons/ScriptCanvas/String.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/String.png
rename to Assets/Editor/Icons/ScriptCanvas/String.png
diff --git a/Editor/Icons/ScriptCanvas/Subtract.png b/Assets/Editor/Icons/ScriptCanvas/Subtract.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Subtract.png
rename to Assets/Editor/Icons/ScriptCanvas/Subtract.png
diff --git a/Editor/Icons/ScriptCanvas/Sum.png b/Assets/Editor/Icons/ScriptCanvas/Sum.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Sum.png
rename to Assets/Editor/Icons/ScriptCanvas/Sum.png
diff --git a/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png b/Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png
rename to Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png
diff --git a/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png b/Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png
rename to Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png
diff --git a/Editor/Icons/ScriptCanvas/Xor.png b/Assets/Editor/Icons/ScriptCanvas/Xor.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Xor.png
rename to Assets/Editor/Icons/ScriptCanvas/Xor.png
diff --git a/Editor/Icons/ScriptCanvas/settings.png b/Assets/Editor/Icons/ScriptCanvas/settings.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/settings.png
rename to Assets/Editor/Icons/ScriptCanvas/settings.png
diff --git a/Editor/Icons/WhiteBox/Move.svg b/Assets/Editor/Icons/WhiteBox/Move.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/Move.svg
rename to Assets/Editor/Icons/WhiteBox/Move.svg
diff --git a/Editor/Icons/WhiteBox/RestoreMode.svg b/Assets/Editor/Icons/WhiteBox/RestoreMode.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/RestoreMode.svg
rename to Assets/Editor/Icons/WhiteBox/RestoreMode.svg
diff --git a/Editor/Icons/WhiteBox/Rotate.svg b/Assets/Editor/Icons/WhiteBox/Rotate.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/Rotate.svg
rename to Assets/Editor/Icons/WhiteBox/Rotate.svg
diff --git a/Editor/Icons/WhiteBox/Scale.svg b/Assets/Editor/Icons/WhiteBox/Scale.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/Scale.svg
rename to Assets/Editor/Icons/WhiteBox/Scale.svg
diff --git a/Editor/Icons/WhiteBox/SketchMode.svg b/Assets/Editor/Icons/WhiteBox/SketchMode.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/SketchMode.svg
rename to Assets/Editor/Icons/WhiteBox/SketchMode.svg
diff --git a/Editor/Icons/animation/add.png b/Assets/Editor/Icons/animation/add.png
similarity index 100%
rename from Editor/Icons/animation/add.png
rename to Assets/Editor/Icons/animation/add.png
diff --git a/Editor/Icons/animation/animation.png b/Assets/Editor/Icons/animation/animation.png
similarity index 100%
rename from Editor/Icons/animation/animation.png
rename to Assets/Editor/Icons/animation/animation.png
diff --git a/Editor/Icons/animation/animation_additive.png b/Assets/Editor/Icons/animation/animation_additive.png
similarity index 100%
rename from Editor/Icons/animation/animation_additive.png
rename to Assets/Editor/Icons/animation/animation_additive.png
diff --git a/Editor/Icons/animation/animation_aimpose.png b/Assets/Editor/Icons/animation/animation_aimpose.png
similarity index 100%
rename from Editor/Icons/animation/animation_aimpose.png
rename to Assets/Editor/Icons/animation/animation_aimpose.png
diff --git a/Editor/Icons/animation/animation_bspace.png b/Assets/Editor/Icons/animation/animation_bspace.png
similarity index 100%
rename from Editor/Icons/animation/animation_bspace.png
rename to Assets/Editor/Icons/animation/animation_bspace.png
diff --git a/Editor/Icons/animation/animation_comb.png b/Assets/Editor/Icons/animation/animation_comb.png
similarity index 100%
rename from Editor/Icons/animation/animation_comb.png
rename to Assets/Editor/Icons/animation/animation_comb.png
diff --git a/Editor/Icons/animation/animation_lookpose.png b/Assets/Editor/Icons/animation/animation_lookpose.png
similarity index 100%
rename from Editor/Icons/animation/animation_lookpose.png
rename to Assets/Editor/Icons/animation/animation_lookpose.png
diff --git a/Editor/Icons/animation/animation_offline.png b/Assets/Editor/Icons/animation/animation_offline.png
similarity index 100%
rename from Editor/Icons/animation/animation_offline.png
rename to Assets/Editor/Icons/animation/animation_offline.png
diff --git a/Editor/Icons/animation/attachment.png b/Assets/Editor/Icons/animation/attachment.png
similarity index 100%
rename from Editor/Icons/animation/attachment.png
rename to Assets/Editor/Icons/animation/attachment.png
diff --git a/Editor/Icons/animation/audio_event_16.png b/Assets/Editor/Icons/animation/audio_event_16.png
similarity index 100%
rename from Editor/Icons/animation/audio_event_16.png
rename to Assets/Editor/Icons/animation/audio_event_16.png
diff --git a/Editor/Icons/animation/back_16.png b/Assets/Editor/Icons/animation/back_16.png
similarity index 100%
rename from Editor/Icons/animation/back_16.png
rename to Assets/Editor/Icons/animation/back_16.png
diff --git a/Editor/Icons/animation/bind_pose.png b/Assets/Editor/Icons/animation/bind_pose.png
similarity index 100%
rename from Editor/Icons/animation/bind_pose.png
rename to Assets/Editor/Icons/animation/bind_pose.png
diff --git a/Editor/Icons/animation/bone.png b/Assets/Editor/Icons/animation/bone.png
similarity index 100%
rename from Editor/Icons/animation/bone.png
rename to Assets/Editor/Icons/animation/bone.png
diff --git a/Editor/Icons/animation/build.png b/Assets/Editor/Icons/animation/build.png
similarity index 100%
rename from Editor/Icons/animation/build.png
rename to Assets/Editor/Icons/animation/build.png
diff --git a/Editor/Icons/animation/character.png b/Assets/Editor/Icons/animation/character.png
similarity index 100%
rename from Editor/Icons/animation/character.png
rename to Assets/Editor/Icons/animation/character.png
diff --git a/Editor/Icons/animation/close.png b/Assets/Editor/Icons/animation/close.png
similarity index 100%
rename from Editor/Icons/animation/close.png
rename to Assets/Editor/Icons/animation/close.png
diff --git a/Editor/Icons/animation/close_highlight.png b/Assets/Editor/Icons/animation/close_highlight.png
similarity index 100%
rename from Editor/Icons/animation/close_highlight.png
rename to Assets/Editor/Icons/animation/close_highlight.png
diff --git a/Editor/Icons/animation/create_cdf.png b/Assets/Editor/Icons/animation/create_cdf.png
similarity index 100%
rename from Editor/Icons/animation/create_cdf.png
rename to Assets/Editor/Icons/animation/create_cdf.png
diff --git a/Editor/Icons/animation/display_options.png b/Assets/Editor/Icons/animation/display_options.png
similarity index 100%
rename from Editor/Icons/animation/display_options.png
rename to Assets/Editor/Icons/animation/display_options.png
diff --git a/Editor/Icons/animation/filter_16.png b/Assets/Editor/Icons/animation/filter_16.png
similarity index 100%
rename from Editor/Icons/animation/filter_16.png
rename to Assets/Editor/Icons/animation/filter_16.png
diff --git a/Editor/Icons/animation/footsteps.png b/Assets/Editor/Icons/animation/footsteps.png
similarity index 100%
rename from Editor/Icons/animation/footsteps.png
rename to Assets/Editor/Icons/animation/footsteps.png
diff --git a/Editor/Icons/animation/force_recompile.png b/Assets/Editor/Icons/animation/force_recompile.png
similarity index 100%
rename from Editor/Icons/animation/force_recompile.png
rename to Assets/Editor/Icons/animation/force_recompile.png
diff --git a/Editor/Icons/animation/forward_16.png b/Assets/Editor/Icons/animation/forward_16.png
similarity index 100%
rename from Editor/Icons/animation/forward_16.png
rename to Assets/Editor/Icons/animation/forward_16.png
diff --git a/Editor/Icons/animation/gizmo_location.png b/Assets/Editor/Icons/animation/gizmo_location.png
similarity index 100%
rename from Editor/Icons/animation/gizmo_location.png
rename to Assets/Editor/Icons/animation/gizmo_location.png
diff --git a/Editor/Icons/animation/grid.png b/Assets/Editor/Icons/animation/grid.png
similarity index 100%
rename from Editor/Icons/animation/grid.png
rename to Assets/Editor/Icons/animation/grid.png
diff --git a/Editor/Icons/animation/group.png b/Assets/Editor/Icons/animation/group.png
similarity index 100%
rename from Editor/Icons/animation/group.png
rename to Assets/Editor/Icons/animation/group.png
diff --git a/Editor/Icons/animation/import.png b/Assets/Editor/Icons/animation/import.png
similarity index 100%
rename from Editor/Icons/animation/import.png
rename to Assets/Editor/Icons/animation/import.png
diff --git a/Editor/Icons/animation/in_folder_16.png b/Assets/Editor/Icons/animation/in_folder_16.png
similarity index 100%
rename from Editor/Icons/animation/in_folder_16.png
rename to Assets/Editor/Icons/animation/in_folder_16.png
diff --git a/Editor/Icons/animation/in_folder_and_pak_16.png b/Assets/Editor/Icons/animation/in_folder_and_pak_16.png
similarity index 100%
rename from Editor/Icons/animation/in_folder_and_pak_16.png
rename to Assets/Editor/Icons/animation/in_folder_and_pak_16.png
diff --git a/Editor/Icons/animation/in_pak_16.png b/Assets/Editor/Icons/animation/in_pak_16.png
similarity index 100%
rename from Editor/Icons/animation/in_pak_16.png
rename to Assets/Editor/Icons/animation/in_pak_16.png
diff --git a/Editor/Icons/animation/lock_16.png b/Assets/Editor/Icons/animation/lock_16.png
similarity index 100%
rename from Editor/Icons/animation/lock_16.png
rename to Assets/Editor/Icons/animation/lock_16.png
diff --git a/Editor/Icons/animation/new_animation.png b/Assets/Editor/Icons/animation/new_animation.png
similarity index 100%
rename from Editor/Icons/animation/new_animation.png
rename to Assets/Editor/Icons/animation/new_animation.png
diff --git a/Editor/Icons/animation/physics.png b/Assets/Editor/Icons/animation/physics.png
similarity index 100%
rename from Editor/Icons/animation/physics.png
rename to Assets/Editor/Icons/animation/physics.png
diff --git a/Editor/Icons/animation/playback_options.png b/Assets/Editor/Icons/animation/playback_options.png
similarity index 100%
rename from Editor/Icons/animation/playback_options.png
rename to Assets/Editor/Icons/animation/playback_options.png
diff --git a/Editor/Icons/animation/redo.png b/Assets/Editor/Icons/animation/redo.png
similarity index 100%
rename from Editor/Icons/animation/redo.png
rename to Assets/Editor/Icons/animation/redo.png
diff --git a/Editor/Icons/animation/revert.png b/Assets/Editor/Icons/animation/revert.png
similarity index 100%
rename from Editor/Icons/animation/revert.png
rename to Assets/Editor/Icons/animation/revert.png
diff --git a/Editor/Icons/animation/rig.png b/Assets/Editor/Icons/animation/rig.png
similarity index 100%
rename from Editor/Icons/animation/rig.png
rename to Assets/Editor/Icons/animation/rig.png
diff --git a/Editor/Icons/animation/save.png b/Assets/Editor/Icons/animation/save.png
similarity index 100%
rename from Editor/Icons/animation/save.png
rename to Assets/Editor/Icons/animation/save.png
diff --git a/Editor/Icons/animation/selection_16.png b/Assets/Editor/Icons/animation/selection_16.png
similarity index 100%
rename from Editor/Icons/animation/selection_16.png
rename to Assets/Editor/Icons/animation/selection_16.png
diff --git a/Editor/Icons/animation/show_in_explorer.png b/Assets/Editor/Icons/animation/show_in_explorer.png
similarity index 100%
rename from Editor/Icons/animation/show_in_explorer.png
rename to Assets/Editor/Icons/animation/show_in_explorer.png
diff --git a/Editor/Icons/animation/skeleton.png b/Assets/Editor/Icons/animation/skeleton.png
similarity index 100%
rename from Editor/Icons/animation/skeleton.png
rename to Assets/Editor/Icons/animation/skeleton.png
diff --git a/Editor/Icons/animation/skin.png b/Assets/Editor/Icons/animation/skin.png
similarity index 100%
rename from Editor/Icons/animation/skin.png
rename to Assets/Editor/Icons/animation/skin.png
diff --git a/Editor/Icons/animation/source_asset_16.png b/Assets/Editor/Icons/animation/source_asset_16.png
similarity index 100%
rename from Editor/Icons/animation/source_asset_16.png
rename to Assets/Editor/Icons/animation/source_asset_16.png
diff --git a/Editor/Icons/animation/tool_move.png b/Assets/Editor/Icons/animation/tool_move.png
similarity index 100%
rename from Editor/Icons/animation/tool_move.png
rename to Assets/Editor/Icons/animation/tool_move.png
diff --git a/Editor/Icons/animation/tool_rotate.png b/Assets/Editor/Icons/animation/tool_rotate.png
similarity index 100%
rename from Editor/Icons/animation/tool_rotate.png
rename to Assets/Editor/Icons/animation/tool_rotate.png
diff --git a/Editor/Icons/animation/tool_scale.png b/Assets/Editor/Icons/animation/tool_scale.png
similarity index 100%
rename from Editor/Icons/animation/tool_scale.png
rename to Assets/Editor/Icons/animation/tool_scale.png
diff --git a/Editor/Icons/animation/tool_select.png b/Assets/Editor/Icons/animation/tool_select.png
similarity index 100%
rename from Editor/Icons/animation/tool_select.png
rename to Assets/Editor/Icons/animation/tool_select.png
diff --git a/Editor/Icons/animation/undo.png b/Assets/Editor/Icons/animation/undo.png
similarity index 100%
rename from Editor/Icons/animation/undo.png
rename to Assets/Editor/Icons/animation/undo.png
diff --git a/Editor/Icons/checkmark_checked.png b/Assets/Editor/Icons/checkmark_checked.png
similarity index 100%
rename from Editor/Icons/checkmark_checked.png
rename to Assets/Editor/Icons/checkmark_checked.png
diff --git a/Editor/Icons/checkmark_checked_hover.png b/Assets/Editor/Icons/checkmark_checked_hover.png
similarity index 100%
rename from Editor/Icons/checkmark_checked_hover.png
rename to Assets/Editor/Icons/checkmark_checked_hover.png
diff --git a/Editor/Icons/checkmark_unchecked_hover.png b/Assets/Editor/Icons/checkmark_unchecked_hover.png
similarity index 100%
rename from Editor/Icons/checkmark_unchecked_hover.png
rename to Assets/Editor/Icons/checkmark_unchecked_hover.png
diff --git a/Editor/Icons/close.png b/Assets/Editor/Icons/close.png
similarity index 100%
rename from Editor/Icons/close.png
rename to Assets/Editor/Icons/close.png
diff --git a/Editor/Icons/float.png b/Assets/Editor/Icons/float.png
similarity index 100%
rename from Editor/Icons/float.png
rename to Assets/Editor/Icons/float.png
diff --git a/Editor/Icons/lc_camera.png b/Assets/Editor/Icons/lc_camera.png
similarity index 100%
rename from Editor/Icons/lc_camera.png
rename to Assets/Editor/Icons/lc_camera.png
diff --git a/Editor/Icons/lc_exportandlaunch.png b/Assets/Editor/Icons/lc_exportandlaunch.png
similarity index 100%
rename from Editor/Icons/lc_exportandlaunch.png
rename to Assets/Editor/Icons/lc_exportandlaunch.png
diff --git a/Editor/Icons/lc_pc.png b/Assets/Editor/Icons/lc_pc.png
similarity index 100%
rename from Editor/Icons/lc_pc.png
rename to Assets/Editor/Icons/lc_pc.png
diff --git a/Editor/Icons/lc_power.png b/Assets/Editor/Icons/lc_power.png
similarity index 100%
rename from Editor/Icons/lc_power.png
rename to Assets/Editor/Icons/lc_power.png
diff --git a/Editor/Icons/lc_sshot.png b/Assets/Editor/Icons/lc_sshot.png
similarity index 100%
rename from Editor/Icons/lc_sshot.png
rename to Assets/Editor/Icons/lc_sshot.png
diff --git a/Editor/Icons/lc_sync.png b/Assets/Editor/Icons/lc_sync.png
similarity index 100%
rename from Editor/Icons/lc_sync.png
rename to Assets/Editor/Icons/lc_sync.png
diff --git a/Editor/Icons/reset.png b/Assets/Editor/Icons/reset.png
similarity index 100%
rename from Editor/Icons/reset.png
rename to Assets/Editor/Icons/reset.png
diff --git a/Editor/Icons/split.png b/Assets/Editor/Icons/split.png
similarity index 100%
rename from Editor/Icons/split.png
rename to Assets/Editor/Icons/split.png
diff --git a/Editor/LambdaFunctions/LwALambdaFunction.js b/Assets/Editor/LambdaFunctions/LwALambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwALambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwALambdaFunction.js
diff --git a/Editor/LambdaFunctions/LwFacebookLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwFacebookLambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js
diff --git a/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
diff --git a/Editor/LambdaFunctions/LwGoogleLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwGoogleLambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js
diff --git a/Editor/LevelTemplates.xml b/Assets/Editor/LevelTemplates.xml
similarity index 100%
rename from Editor/LevelTemplates.xml
rename to Assets/Editor/LevelTemplates.xml
diff --git a/Editor/MapScreenshotSettings.xml b/Assets/Editor/MapScreenshotSettings.xml
similarity index 100%
rename from Editor/MapScreenshotSettings.xml
rename to Assets/Editor/MapScreenshotSettings.xml
diff --git a/Editor/Materials/ShaderList.xml b/Assets/Editor/Materials/ShaderList.xml
similarity index 100%
rename from Editor/Materials/ShaderList.xml
rename to Assets/Editor/Materials/ShaderList.xml
diff --git a/Editor/Materials/Stripes.tif b/Assets/Editor/Materials/Stripes.tif
similarity index 100%
rename from Editor/Materials/Stripes.tif
rename to Assets/Editor/Materials/Stripes.tif
diff --git a/Editor/Materials/Stripes.tif.exportsettings b/Assets/Editor/Materials/Stripes.tif.exportsettings
similarity index 100%
rename from Editor/Materials/Stripes.tif.exportsettings
rename to Assets/Editor/Materials/Stripes.tif.exportsettings
diff --git a/Editor/Materials/areasolid.dds b/Assets/Editor/Materials/areasolid.dds
similarity index 100%
rename from Editor/Materials/areasolid.dds
rename to Assets/Editor/Materials/areasolid.dds
diff --git a/Editor/Materials/areasolid.mtl b/Assets/Editor/Materials/areasolid.mtl
similarity index 100%
rename from Editor/Materials/areasolid.mtl
rename to Assets/Editor/Materials/areasolid.mtl
diff --git a/Editor/Materials/crydesigner_selection.mtl b/Assets/Editor/Materials/crydesigner_selection.mtl
similarity index 100%
rename from Editor/Materials/crydesigner_selection.mtl
rename to Assets/Editor/Materials/crydesigner_selection.mtl
diff --git a/Editor/Materials/default_rope.mtl b/Assets/Editor/Materials/default_rope.mtl
similarity index 100%
rename from Editor/Materials/default_rope.mtl
rename to Assets/Editor/Materials/default_rope.mtl
diff --git a/Assets/Editor/Materials/lodgen_template.mtl b/Assets/Editor/Materials/lodgen_template.mtl
new file mode 100644
index 0000000000..761eff9154
--- /dev/null
+++ b/Assets/Editor/Materials/lodgen_template.mtl
@@ -0,0 +1,8 @@
+<Material MtlFlags="524416" Shader="Illum" GenMask="C0000081" StringGenMask="%ALLOW_SILHOUETTE_POM%BUMP_MAP%SPEC_MAP%SUBSURFACE_SCATTERING" SurfaceType="" MatTemplate="" Diffuse="1,1,1" Specular="0.035,0.035,0.035" Emissive="0,0,0" Shininess="255" Opacity="1" LayerAct="1">
+ <Textures>
+  <Texture Map="Diffuse" File="EngineAssets/TextureMsg/ReplaceMe.tif" IsTileU="0" IsTileV="0"/>
+  <Texture Map="Specular" File="EngineAssets/TextureMsg/ReplaceMe.tif" IsTileU="0" IsTileV="0"/>
+  <Texture Map="Bumpmap" File="EngineAssets/TextureMsg/ReplaceMe.tif" IsTileU="0" IsTileV="0"/>
+ </Textures>
+ <PublicParams SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
+</Material>
diff --git a/Editor/Materials/refpicture.mtl b/Assets/Editor/Materials/refpicture.mtl
similarity index 100%
rename from Editor/Materials/refpicture.mtl
rename to Assets/Editor/Materials/refpicture.mtl
diff --git a/Editor/Materials/voxel_editor.mtl b/Assets/Editor/Materials/voxel_editor.mtl
similarity index 100%
rename from Editor/Materials/voxel_editor.mtl
rename to Assets/Editor/Materials/voxel_editor.mtl
diff --git a/Editor/Materials/voxel_editor.png b/Assets/Editor/Materials/voxel_editor.png
similarity index 100%
rename from Editor/Materials/voxel_editor.png
rename to Assets/Editor/Materials/voxel_editor.png
diff --git a/Editor/Materials/voxel_editor.png.exportsettings b/Assets/Editor/Materials/voxel_editor.png.exportsettings
similarity index 100%
rename from Editor/Materials/voxel_editor.png.exportsettings
rename to Assets/Editor/Materials/voxel_editor.png.exportsettings
diff --git a/Editor/MissionTemplate.lua b/Assets/Editor/MissionTemplate.lua
similarity index 100%
rename from Editor/MissionTemplate.lua
rename to Assets/Editor/MissionTemplate.lua
diff --git a/Editor/ModellingPanel.xml b/Assets/Editor/ModellingPanel.xml
similarity index 100%
rename from Editor/ModellingPanel.xml
rename to Assets/Editor/ModellingPanel.xml
diff --git a/Editor/NewEntityTemplate.ent_template b/Assets/Editor/NewEntityTemplate.ent_template
similarity index 100%
rename from Editor/NewEntityTemplate.ent_template
rename to Assets/Editor/NewEntityTemplate.ent_template
diff --git a/Editor/NewEntityTemplate.lua_template b/Assets/Editor/NewEntityTemplate.lua_template
similarity index 100%
rename from Editor/NewEntityTemplate.lua_template
rename to Assets/Editor/NewEntityTemplate.lua_template
diff --git a/Editor/ObjectIcons/AreaTrigger.bmp b/Assets/Editor/ObjectIcons/AreaTrigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/AreaTrigger.bmp
rename to Assets/Editor/ObjectIcons/AreaTrigger.bmp
diff --git a/Editor/ObjectIcons/AudioAreaAmbience.bmp b/Assets/Editor/ObjectIcons/AudioAreaAmbience.bmp
similarity index 100%
rename from Editor/ObjectIcons/AudioAreaAmbience.bmp
rename to Assets/Editor/ObjectIcons/AudioAreaAmbience.bmp
diff --git a/Editor/ObjectIcons/AudioAreaEntity.bmp b/Assets/Editor/ObjectIcons/AudioAreaEntity.bmp
similarity index 100%
rename from Editor/ObjectIcons/AudioAreaEntity.bmp
rename to Assets/Editor/ObjectIcons/AudioAreaEntity.bmp
diff --git a/Editor/ObjectIcons/AudioAreaRandom.bmp b/Assets/Editor/ObjectIcons/AudioAreaRandom.bmp
similarity index 100%
rename from Editor/ObjectIcons/AudioAreaRandom.bmp
rename to Assets/Editor/ObjectIcons/AudioAreaRandom.bmp
diff --git a/Editor/ObjectIcons/Camera.bmp b/Assets/Editor/ObjectIcons/Camera.bmp
similarity index 100%
rename from Editor/ObjectIcons/Camera.bmp
rename to Assets/Editor/ObjectIcons/Camera.bmp
diff --git a/Editor/ObjectIcons/Checkpoint.bmp b/Assets/Editor/ObjectIcons/Checkpoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/Checkpoint.bmp
rename to Assets/Editor/ObjectIcons/Checkpoint.bmp
diff --git a/Editor/ObjectIcons/ClipVolume.bmp b/Assets/Editor/ObjectIcons/ClipVolume.bmp
similarity index 100%
rename from Editor/ObjectIcons/ClipVolume.bmp
rename to Assets/Editor/ObjectIcons/ClipVolume.bmp
diff --git a/Editor/ObjectIcons/Clock.bmp b/Assets/Editor/ObjectIcons/Clock.bmp
similarity index 100%
rename from Editor/ObjectIcons/Clock.bmp
rename to Assets/Editor/ObjectIcons/Clock.bmp
diff --git a/Editor/ObjectIcons/Clouds.bmp b/Assets/Editor/ObjectIcons/Clouds.bmp
similarity index 100%
rename from Editor/ObjectIcons/Clouds.bmp
rename to Assets/Editor/ObjectIcons/Clouds.bmp
diff --git a/Editor/ObjectIcons/Comment.bmp b/Assets/Editor/ObjectIcons/Comment.bmp
similarity index 100%
rename from Editor/ObjectIcons/Comment.bmp
rename to Assets/Editor/ObjectIcons/Comment.bmp
diff --git a/Editor/ObjectIcons/DeadBody.bmp b/Assets/Editor/ObjectIcons/DeadBody.bmp
similarity index 100%
rename from Editor/ObjectIcons/DeadBody.bmp
rename to Assets/Editor/ObjectIcons/DeadBody.bmp
diff --git a/Editor/ObjectIcons/Decal.bmp b/Assets/Editor/ObjectIcons/Decal.bmp
similarity index 100%
rename from Editor/ObjectIcons/Decal.bmp
rename to Assets/Editor/ObjectIcons/Decal.bmp
diff --git a/Editor/ObjectIcons/Dialog.bmp b/Assets/Editor/ObjectIcons/Dialog.bmp
similarity index 100%
rename from Editor/ObjectIcons/Dialog.bmp
rename to Assets/Editor/ObjectIcons/Dialog.bmp
diff --git a/Editor/ObjectIcons/Flash.bmp b/Assets/Editor/ObjectIcons/Flash.bmp
similarity index 100%
rename from Editor/ObjectIcons/Flash.bmp
rename to Assets/Editor/ObjectIcons/Flash.bmp
diff --git a/Editor/ObjectIcons/Fog.bmp b/Assets/Editor/ObjectIcons/Fog.bmp
similarity index 100%
rename from Editor/ObjectIcons/Fog.bmp
rename to Assets/Editor/ObjectIcons/Fog.bmp
diff --git a/Editor/ObjectIcons/FogVolume.bmp b/Assets/Editor/ObjectIcons/FogVolume.bmp
similarity index 100%
rename from Editor/ObjectIcons/FogVolume.bmp
rename to Assets/Editor/ObjectIcons/FogVolume.bmp
diff --git a/Editor/ObjectIcons/GravitySphere.bmp b/Assets/Editor/ObjectIcons/GravitySphere.bmp
similarity index 100%
rename from Editor/ObjectIcons/GravitySphere.bmp
rename to Assets/Editor/ObjectIcons/GravitySphere.bmp
diff --git a/Editor/ObjectIcons/Item.bmp b/Assets/Editor/ObjectIcons/Item.bmp
similarity index 100%
rename from Editor/ObjectIcons/Item.bmp
rename to Assets/Editor/ObjectIcons/Item.bmp
diff --git a/Editor/ObjectIcons/Ladder.bmp b/Assets/Editor/ObjectIcons/Ladder.bmp
similarity index 100%
rename from Editor/ObjectIcons/Ladder.bmp
rename to Assets/Editor/ObjectIcons/Ladder.bmp
diff --git a/Editor/ObjectIcons/Light.bmp b/Assets/Editor/ObjectIcons/Light.bmp
similarity index 100%
rename from Editor/ObjectIcons/Light.bmp
rename to Assets/Editor/ObjectIcons/Light.bmp
diff --git a/Editor/ObjectIcons/LightPropagationVolume.bmp b/Assets/Editor/ObjectIcons/LightPropagationVolume.bmp
similarity index 100%
rename from Editor/ObjectIcons/LightPropagationVolume.bmp
rename to Assets/Editor/ObjectIcons/LightPropagationVolume.bmp
diff --git a/Editor/ObjectIcons/Lightning.bmp b/Assets/Editor/ObjectIcons/Lightning.bmp
similarity index 100%
rename from Editor/ObjectIcons/Lightning.bmp
rename to Assets/Editor/ObjectIcons/Lightning.bmp
diff --git a/Editor/ObjectIcons/Magnet.bmp b/Assets/Editor/ObjectIcons/Magnet.bmp
similarity index 100%
rename from Editor/ObjectIcons/Magnet.bmp
rename to Assets/Editor/ObjectIcons/Magnet.bmp
diff --git a/Editor/ObjectIcons/MultiTrigger.bmp b/Assets/Editor/ObjectIcons/MultiTrigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/MultiTrigger.bmp
rename to Assets/Editor/ObjectIcons/MultiTrigger.bmp
diff --git a/Editor/ObjectIcons/ODD.bmp b/Assets/Editor/ObjectIcons/ODD.bmp
similarity index 100%
rename from Editor/ObjectIcons/ODD.bmp
rename to Assets/Editor/ObjectIcons/ODD.bmp
diff --git a/Editor/ObjectIcons/Particles.bmp b/Assets/Editor/ObjectIcons/Particles.bmp
similarity index 100%
rename from Editor/ObjectIcons/Particles.bmp
rename to Assets/Editor/ObjectIcons/Particles.bmp
diff --git a/Editor/ObjectIcons/PrecacheCamera.bmp b/Assets/Editor/ObjectIcons/PrecacheCamera.bmp
similarity index 100%
rename from Editor/ObjectIcons/PrecacheCamera.bmp
rename to Assets/Editor/ObjectIcons/PrecacheCamera.bmp
diff --git a/Editor/ObjectIcons/Prefab.bmp b/Assets/Editor/ObjectIcons/Prefab.bmp
similarity index 100%
rename from Editor/ObjectIcons/Prefab.bmp
rename to Assets/Editor/ObjectIcons/Prefab.bmp
diff --git a/Editor/ObjectIcons/Prompt.bmp b/Assets/Editor/ObjectIcons/Prompt.bmp
similarity index 100%
rename from Editor/ObjectIcons/Prompt.bmp
rename to Assets/Editor/ObjectIcons/Prompt.bmp
diff --git a/Editor/ObjectIcons/SavePoint.bmp b/Assets/Editor/ObjectIcons/SavePoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/SavePoint.bmp
rename to Assets/Editor/ObjectIcons/SavePoint.bmp
diff --git a/Editor/ObjectIcons/Seed.bmp b/Assets/Editor/ObjectIcons/Seed.bmp
similarity index 100%
rename from Editor/ObjectIcons/Seed.bmp
rename to Assets/Editor/ObjectIcons/Seed.bmp
diff --git a/Editor/ObjectIcons/Sound.bmp b/Assets/Editor/ObjectIcons/Sound.bmp
similarity index 100%
rename from Editor/ObjectIcons/Sound.bmp
rename to Assets/Editor/ObjectIcons/Sound.bmp
diff --git a/Editor/ObjectIcons/SpawnPoint.bmp b/Assets/Editor/ObjectIcons/SpawnPoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/SpawnPoint.bmp
rename to Assets/Editor/ObjectIcons/SpawnPoint.bmp
diff --git a/Editor/ObjectIcons/T.bmp b/Assets/Editor/ObjectIcons/T.bmp
similarity index 100%
rename from Editor/ObjectIcons/T.bmp
rename to Assets/Editor/ObjectIcons/T.bmp
diff --git a/Editor/ObjectIcons/TagPoint.bmp b/Assets/Editor/ObjectIcons/TagPoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/TagPoint.bmp
rename to Assets/Editor/ObjectIcons/TagPoint.bmp
diff --git a/Editor/ObjectIcons/Trigger.bmp b/Assets/Editor/ObjectIcons/Trigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/Trigger.bmp
rename to Assets/Editor/ObjectIcons/Trigger.bmp
diff --git a/Editor/ObjectIcons/UiCanvasRefEntity.bmp b/Assets/Editor/ObjectIcons/UiCanvasRefEntity.bmp
similarity index 100%
rename from Editor/ObjectIcons/UiCanvasRefEntity.bmp
rename to Assets/Editor/ObjectIcons/UiCanvasRefEntity.bmp
diff --git a/Editor/ObjectIcons/User.bmp b/Assets/Editor/ObjectIcons/User.bmp
similarity index 100%
rename from Editor/ObjectIcons/User.bmp
rename to Assets/Editor/ObjectIcons/User.bmp
diff --git a/Editor/ObjectIcons/VVVArea.bmp b/Assets/Editor/ObjectIcons/VVVArea.bmp
similarity index 100%
rename from Editor/ObjectIcons/VVVArea.bmp
rename to Assets/Editor/ObjectIcons/VVVArea.bmp
diff --git a/Editor/ObjectIcons/W.bmp b/Assets/Editor/ObjectIcons/W.bmp
similarity index 100%
rename from Editor/ObjectIcons/W.bmp
rename to Assets/Editor/ObjectIcons/W.bmp
diff --git a/Editor/ObjectIcons/Water.bmp b/Assets/Editor/ObjectIcons/Water.bmp
similarity index 100%
rename from Editor/ObjectIcons/Water.bmp
rename to Assets/Editor/ObjectIcons/Water.bmp
diff --git a/Editor/ObjectIcons/animobject.bmp b/Assets/Editor/ObjectIcons/animobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/animobject.bmp
rename to Assets/Editor/ObjectIcons/animobject.bmp
diff --git a/Editor/ObjectIcons/bird.bmp b/Assets/Editor/ObjectIcons/bird.bmp
similarity index 100%
rename from Editor/ObjectIcons/bird.bmp
rename to Assets/Editor/ObjectIcons/bird.bmp
diff --git a/Editor/ObjectIcons/bug.bmp b/Assets/Editor/ObjectIcons/bug.bmp
similarity index 100%
rename from Editor/ObjectIcons/bug.bmp
rename to Assets/Editor/ObjectIcons/bug.bmp
diff --git a/Editor/ObjectIcons/character.bmp b/Assets/Editor/ObjectIcons/character.bmp
similarity index 100%
rename from Editor/ObjectIcons/character.bmp
rename to Assets/Editor/ObjectIcons/character.bmp
diff --git a/Editor/ObjectIcons/death.bmp b/Assets/Editor/ObjectIcons/death.bmp
similarity index 100%
rename from Editor/ObjectIcons/death.bmp
rename to Assets/Editor/ObjectIcons/death.bmp
diff --git a/Editor/ObjectIcons/door.bmp b/Assets/Editor/ObjectIcons/door.bmp
similarity index 100%
rename from Editor/ObjectIcons/door.bmp
rename to Assets/Editor/ObjectIcons/door.bmp
diff --git a/Editor/ObjectIcons/elevator.bmp b/Assets/Editor/ObjectIcons/elevator.bmp
similarity index 100%
rename from Editor/ObjectIcons/elevator.bmp
rename to Assets/Editor/ObjectIcons/elevator.bmp
diff --git a/Editor/ObjectIcons/environmentProbe.bmp b/Assets/Editor/ObjectIcons/environmentProbe.bmp
similarity index 100%
rename from Editor/ObjectIcons/environmentProbe.bmp
rename to Assets/Editor/ObjectIcons/environmentProbe.bmp
diff --git a/Editor/ObjectIcons/explosion.bmp b/Assets/Editor/ObjectIcons/explosion.bmp
similarity index 100%
rename from Editor/ObjectIcons/explosion.bmp
rename to Assets/Editor/ObjectIcons/explosion.bmp
diff --git a/Editor/ObjectIcons/fish.bmp b/Assets/Editor/ObjectIcons/fish.bmp
similarity index 100%
rename from Editor/ObjectIcons/fish.bmp
rename to Assets/Editor/ObjectIcons/fish.bmp
diff --git a/Editor/ObjectIcons/forbiddenarea.bmp b/Assets/Editor/ObjectIcons/forbiddenarea.bmp
similarity index 100%
rename from Editor/ObjectIcons/forbiddenarea.bmp
rename to Assets/Editor/ObjectIcons/forbiddenarea.bmp
diff --git a/Editor/ObjectIcons/hazard.bmp b/Assets/Editor/ObjectIcons/hazard.bmp
similarity index 100%
rename from Editor/ObjectIcons/hazard.bmp
rename to Assets/Editor/ObjectIcons/hazard.bmp
diff --git a/Editor/ObjectIcons/health.bmp b/Assets/Editor/ObjectIcons/health.bmp
similarity index 100%
rename from Editor/ObjectIcons/health.bmp
rename to Assets/Editor/ObjectIcons/health.bmp
diff --git a/Editor/ObjectIcons/ledge.bmp b/Assets/Editor/ObjectIcons/ledge.bmp
similarity index 100%
rename from Editor/ObjectIcons/ledge.bmp
rename to Assets/Editor/ObjectIcons/ledge.bmp
diff --git a/Editor/ObjectIcons/mine.bmp b/Assets/Editor/ObjectIcons/mine.bmp
similarity index 100%
rename from Editor/ObjectIcons/mine.bmp
rename to Assets/Editor/ObjectIcons/mine.bmp
diff --git a/Editor/ObjectIcons/physicsobject.bmp b/Assets/Editor/ObjectIcons/physicsobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/physicsobject.bmp
rename to Assets/Editor/ObjectIcons/physicsobject.bmp
diff --git a/Editor/ObjectIcons/prefabbuilding.bmp b/Assets/Editor/ObjectIcons/prefabbuilding.bmp
similarity index 100%
rename from Editor/ObjectIcons/prefabbuilding.bmp
rename to Assets/Editor/ObjectIcons/prefabbuilding.bmp
diff --git a/Editor/ObjectIcons/proceduralbuilding.bmp b/Assets/Editor/ObjectIcons/proceduralbuilding.bmp
similarity index 100%
rename from Editor/ObjectIcons/proceduralbuilding.bmp
rename to Assets/Editor/ObjectIcons/proceduralbuilding.bmp
diff --git a/Editor/ObjectIcons/proceduralobject.bmp b/Assets/Editor/ObjectIcons/proceduralobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/proceduralobject.bmp
rename to Assets/Editor/ObjectIcons/proceduralobject.bmp
diff --git a/Editor/ObjectIcons/proximitytrigger.bmp b/Assets/Editor/ObjectIcons/proximitytrigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/proximitytrigger.bmp
rename to Assets/Editor/ObjectIcons/proximitytrigger.bmp
diff --git a/Editor/ObjectIcons/river.bmp b/Assets/Editor/ObjectIcons/river.bmp
similarity index 100%
rename from Editor/ObjectIcons/river.bmp
rename to Assets/Editor/ObjectIcons/river.bmp
diff --git a/Editor/ObjectIcons/road.bmp b/Assets/Editor/ObjectIcons/road.bmp
similarity index 100%
rename from Editor/ObjectIcons/road.bmp
rename to Assets/Editor/ObjectIcons/road.bmp
diff --git a/Editor/ObjectIcons/rope.bmp b/Assets/Editor/ObjectIcons/rope.bmp
similarity index 100%
rename from Editor/ObjectIcons/rope.bmp
rename to Assets/Editor/ObjectIcons/rope.bmp
diff --git a/Editor/ObjectIcons/sequence.bmp b/Assets/Editor/ObjectIcons/sequence.bmp
similarity index 100%
rename from Editor/ObjectIcons/sequence.bmp
rename to Assets/Editor/ObjectIcons/sequence.bmp
diff --git a/Editor/ObjectIcons/shake.bmp b/Assets/Editor/ObjectIcons/shake.bmp
similarity index 100%
rename from Editor/ObjectIcons/shake.bmp
rename to Assets/Editor/ObjectIcons/shake.bmp
diff --git a/Editor/ObjectIcons/smartobject.bmp b/Assets/Editor/ObjectIcons/smartobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/smartobject.bmp
rename to Assets/Editor/ObjectIcons/smartobject.bmp
diff --git a/Editor/ObjectIcons/spawngroup.bmp b/Assets/Editor/ObjectIcons/spawngroup.bmp
similarity index 100%
rename from Editor/ObjectIcons/spawngroup.bmp
rename to Assets/Editor/ObjectIcons/spawngroup.bmp
diff --git a/Editor/ObjectIcons/spectator.bmp b/Assets/Editor/ObjectIcons/spectator.bmp
similarity index 100%
rename from Editor/ObjectIcons/spectator.bmp
rename to Assets/Editor/ObjectIcons/spectator.bmp
diff --git a/Editor/ObjectIcons/switch.bmp b/Assets/Editor/ObjectIcons/switch.bmp
similarity index 100%
rename from Editor/ObjectIcons/switch.bmp
rename to Assets/Editor/ObjectIcons/switch.bmp
diff --git a/Editor/ObjectIcons/territory.bmp b/Assets/Editor/ObjectIcons/territory.bmp
similarity index 100%
rename from Editor/ObjectIcons/territory.bmp
rename to Assets/Editor/ObjectIcons/territory.bmp
diff --git a/Editor/ObjectIcons/tornado.bmp b/Assets/Editor/ObjectIcons/tornado.bmp
similarity index 100%
rename from Editor/ObjectIcons/tornado.bmp
rename to Assets/Editor/ObjectIcons/tornado.bmp
diff --git a/Editor/ObjectIcons/vehicle.bmp b/Assets/Editor/ObjectIcons/vehicle.bmp
similarity index 100%
rename from Editor/ObjectIcons/vehicle.bmp
rename to Assets/Editor/ObjectIcons/vehicle.bmp
diff --git a/Editor/ObjectIcons/voxel.bmp b/Assets/Editor/ObjectIcons/voxel.bmp
similarity index 100%
rename from Editor/ObjectIcons/voxel.bmp
rename to Assets/Editor/ObjectIcons/voxel.bmp
diff --git a/Editor/ObjectIcons/wave.bmp b/Assets/Editor/ObjectIcons/wave.bmp
similarity index 100%
rename from Editor/ObjectIcons/wave.bmp
rename to Assets/Editor/ObjectIcons/wave.bmp
diff --git a/Editor/ObjectTemplates.xml b/Assets/Editor/ObjectTemplates.xml
similarity index 100%
rename from Editor/ObjectTemplates.xml
rename to Assets/Editor/ObjectTemplates.xml
diff --git a/Editor/Objects/Arrow.cgf b/Assets/Editor/Objects/Arrow.cgf
similarity index 100%
rename from Editor/Objects/Arrow.cgf
rename to Assets/Editor/Objects/Arrow.cgf
diff --git a/Editor/Objects/Axis.cgf b/Assets/Editor/Objects/Axis.cgf
similarity index 100%
rename from Editor/Objects/Axis.cgf
rename to Assets/Editor/Objects/Axis.cgf
diff --git a/Editor/Objects/Clock.cgf b/Assets/Editor/Objects/Clock.cgf
similarity index 100%
rename from Editor/Objects/Clock.cgf
rename to Assets/Editor/Objects/Clock.cgf
diff --git a/Editor/Objects/Comment.cgf b/Assets/Editor/Objects/Comment.cgf
similarity index 100%
rename from Editor/Objects/Comment.cgf
rename to Assets/Editor/Objects/Comment.cgf
diff --git a/Editor/Objects/CryDesigner_camera.grp b/Assets/Editor/Objects/CryDesigner_camera.grp
similarity index 100%
rename from Editor/Objects/CryDesigner_camera.grp
rename to Assets/Editor/Objects/CryDesigner_camera.grp
diff --git a/Editor/Objects/M.cgf b/Assets/Editor/Objects/M.cgf
similarity index 100%
rename from Editor/Objects/M.cgf
rename to Assets/Editor/Objects/M.cgf
diff --git a/Editor/Objects/MtlBox.cgf b/Assets/Editor/Objects/MtlBox.cgf
similarity index 100%
rename from Editor/Objects/MtlBox.cgf
rename to Assets/Editor/Objects/MtlBox.cgf
diff --git a/Editor/Objects/MtlObjects.max b/Assets/Editor/Objects/MtlObjects.max
similarity index 100%
rename from Editor/Objects/MtlObjects.max
rename to Assets/Editor/Objects/MtlObjects.max
diff --git a/Editor/Objects/MtlPlane.cgf b/Assets/Editor/Objects/MtlPlane.cgf
similarity index 100%
rename from Editor/Objects/MtlPlane.cgf
rename to Assets/Editor/Objects/MtlPlane.cgf
diff --git a/Editor/Objects/MtlSphere.cgf b/Assets/Editor/Objects/MtlSphere.cgf
similarity index 100%
rename from Editor/Objects/MtlSphere.cgf
rename to Assets/Editor/Objects/MtlSphere.cgf
diff --git a/Editor/Objects/MtlSwatch.cgf b/Assets/Editor/Objects/MtlSwatch.cgf
similarity index 100%
rename from Editor/Objects/MtlSwatch.cgf
rename to Assets/Editor/Objects/MtlSwatch.cgf
diff --git a/Editor/Objects/MtlTeapot.cgf b/Assets/Editor/Objects/MtlTeapot.cgf
similarity index 100%
rename from Editor/Objects/MtlTeapot.cgf
rename to Assets/Editor/Objects/MtlTeapot.cgf
diff --git a/Editor/Objects/MusicTheme.cgf b/Assets/Editor/Objects/MusicTheme.cgf
similarity index 100%
rename from Editor/Objects/MusicTheme.cgf
rename to Assets/Editor/Objects/MusicTheme.cgf
diff --git a/Editor/Objects/Particles.cgf b/Assets/Editor/Objects/Particles.cgf
similarity index 100%
rename from Editor/Objects/Particles.cgf
rename to Assets/Editor/Objects/Particles.cgf
diff --git a/Editor/Objects/Pyramid.cgf b/Assets/Editor/Objects/Pyramid.cgf
similarity index 100%
rename from Editor/Objects/Pyramid.cgf
rename to Assets/Editor/Objects/Pyramid.cgf
diff --git a/Editor/Objects/S.cgf b/Assets/Editor/Objects/S.cgf
similarity index 100%
rename from Editor/Objects/S.cgf
rename to Assets/Editor/Objects/S.cgf
diff --git a/Editor/Objects/Sound.cgf b/Assets/Editor/Objects/Sound.cgf
similarity index 100%
rename from Editor/Objects/Sound.cgf
rename to Assets/Editor/Objects/Sound.cgf
diff --git a/Editor/Objects/Sphere.cgf b/Assets/Editor/Objects/Sphere.cgf
similarity index 100%
rename from Editor/Objects/Sphere.cgf
rename to Assets/Editor/Objects/Sphere.cgf
diff --git a/Editor/Objects/T.cgf b/Assets/Editor/Objects/T.cgf
similarity index 100%
rename from Editor/Objects/T.cgf
rename to Assets/Editor/Objects/T.cgf
diff --git a/Editor/Objects/Vis.cgf b/Assets/Editor/Objects/Vis.cgf
similarity index 100%
rename from Editor/Objects/Vis.cgf
rename to Assets/Editor/Objects/Vis.cgf
diff --git a/Editor/Objects/W.cgf b/Assets/Editor/Objects/W.cgf
similarity index 100%
rename from Editor/Objects/W.cgf
rename to Assets/Editor/Objects/W.cgf
diff --git a/Editor/Objects/ai_hide_point.cgf b/Assets/Editor/Objects/ai_hide_point.cgf
similarity index 100%
rename from Editor/Objects/ai_hide_point.cgf
rename to Assets/Editor/Objects/ai_hide_point.cgf
diff --git a/Editor/Objects/anchor.cgf b/Assets/Editor/Objects/anchor.cgf
similarity index 100%
rename from Editor/Objects/anchor.cgf
rename to Assets/Editor/Objects/anchor.cgf
diff --git a/Editor/Objects/assaultspawn.cgf b/Assets/Editor/Objects/assaultspawn.cgf
similarity index 100%
rename from Editor/Objects/assaultspawn.cgf
rename to Assets/Editor/Objects/assaultspawn.cgf
diff --git a/Editor/Objects/border.cgf b/Assets/Editor/Objects/border.cgf
similarity index 100%
rename from Editor/Objects/border.cgf
rename to Assets/Editor/Objects/border.cgf
diff --git a/Editor/Objects/box.cgf b/Assets/Editor/Objects/box.cgf
similarity index 100%
rename from Editor/Objects/box.cgf
rename to Assets/Editor/Objects/box.cgf
diff --git a/Editor/Objects/box_nodraw.cgf b/Assets/Editor/Objects/box_nodraw.cgf
similarity index 100%
rename from Editor/Objects/box_nodraw.cgf
rename to Assets/Editor/Objects/box_nodraw.cgf
diff --git a/Editor/Objects/buyzone.cgf b/Assets/Editor/Objects/buyzone.cgf
similarity index 100%
rename from Editor/Objects/buyzone.cgf
rename to Assets/Editor/Objects/buyzone.cgf
diff --git a/Editor/Objects/c2_car_jump_cross.cgf b/Assets/Editor/Objects/c2_car_jump_cross.cgf
similarity index 100%
rename from Editor/Objects/c2_car_jump_cross.cgf
rename to Assets/Editor/Objects/c2_car_jump_cross.cgf
diff --git a/Editor/Objects/c2_crawl_h150.cgf b/Assets/Editor/Objects/c2_crawl_h150.cgf
similarity index 100%
rename from Editor/Objects/c2_crawl_h150.cgf
rename to Assets/Editor/Objects/c2_crawl_h150.cgf
diff --git a/Editor/Objects/c2_duck_v125.cgf b/Assets/Editor/Objects/c2_duck_v125.cgf
similarity index 100%
rename from Editor/Objects/c2_duck_v125.cgf
rename to Assets/Editor/Objects/c2_duck_v125.cgf
diff --git a/Editor/Objects/c2_jump_h1200.cgf b/Assets/Editor/Objects/c2_jump_h1200.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h1200.cgf
rename to Assets/Editor/Objects/c2_jump_h1200.cgf
diff --git a/Editor/Objects/c2_jump_h500.cgf b/Assets/Editor/Objects/c2_jump_h500.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h500.cgf
rename to Assets/Editor/Objects/c2_jump_h500.cgf
diff --git a/Editor/Objects/c2_jump_h900.cgf b/Assets/Editor/Objects/c2_jump_h900.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h900.cgf
rename to Assets/Editor/Objects/c2_jump_h900.cgf
diff --git a/Editor/Objects/c2_jump_h900_v150.cgf b/Assets/Editor/Objects/c2_jump_h900_v150.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h900_v150.cgf
rename to Assets/Editor/Objects/c2_jump_h900_v150.cgf
diff --git a/Editor/Objects/c2_jump_v150.cgf b/Assets/Editor/Objects/c2_jump_v150.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_v150.cgf
rename to Assets/Editor/Objects/c2_jump_v150.cgf
diff --git a/Editor/Objects/c2_jump_v300.cgf b/Assets/Editor/Objects/c2_jump_v300.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_v300.cgf
rename to Assets/Editor/Objects/c2_jump_v300.cgf
diff --git a/Editor/Objects/c2_jump_v450.cgf b/Assets/Editor/Objects/c2_jump_v450.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_v450.cgf
rename to Assets/Editor/Objects/c2_jump_v450.cgf
diff --git a/Editor/Objects/c2_jumpdown_v900.cgf b/Assets/Editor/Objects/c2_jumpdown_v900.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpdown_v900.cgf
rename to Assets/Editor/Objects/c2_jumpdown_v900.cgf
diff --git a/Editor/Objects/c2_jumpwindow_combo_v550.cgf b/Assets/Editor/Objects/c2_jumpwindow_combo_v550.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpwindow_combo_v550.cgf
rename to Assets/Editor/Objects/c2_jumpwindow_combo_v550.cgf
diff --git a/Editor/Objects/c2_jumpwindow_v550.cgf b/Assets/Editor/Objects/c2_jumpwindow_v550.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpwindow_v550.cgf
rename to Assets/Editor/Objects/c2_jumpwindow_v550.cgf
diff --git a/Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf b/Assets/Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf
rename to Assets/Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf
diff --git a/Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf b/Assets/Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf
rename to Assets/Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf
diff --git a/Editor/Objects/c2_slide_h400.cgf b/Assets/Editor/Objects/c2_slide_h400.cgf
similarity index 100%
rename from Editor/Objects/c2_slide_h400.cgf
rename to Assets/Editor/Objects/c2_slide_h400.cgf
diff --git a/Editor/Objects/c2_slidedown_v1800.cgf b/Assets/Editor/Objects/c2_slidedown_v1800.cgf
similarity index 100%
rename from Editor/Objects/c2_slidedown_v1800.cgf
rename to Assets/Editor/Objects/c2_slidedown_v1800.cgf
diff --git a/Editor/Objects/c2_vault_v125.cgf b/Assets/Editor/Objects/c2_vault_v125.cgf
similarity index 100%
rename from Editor/Objects/c2_vault_v125.cgf
rename to Assets/Editor/Objects/c2_vault_v125.cgf
diff --git a/Editor/Objects/c2_vault_v800.cgf b/Assets/Editor/Objects/c2_vault_v800.cgf
similarity index 100%
rename from Editor/Objects/c2_vault_v800.cgf
rename to Assets/Editor/Objects/c2_vault_v800.cgf
diff --git a/Editor/Objects/c2_wall_jump_h900_v450.cgf b/Assets/Editor/Objects/c2_wall_jump_h900_v450.cgf
similarity index 100%
rename from Editor/Objects/c2_wall_jump_h900_v450.cgf
rename to Assets/Editor/Objects/c2_wall_jump_h900_v450.cgf
diff --git a/Editor/Objects/c2_wall_run_h900_v300.cgf b/Assets/Editor/Objects/c2_wall_run_h900_v300.cgf
similarity index 100%
rename from Editor/Objects/c2_wall_run_h900_v300.cgf
rename to Assets/Editor/Objects/c2_wall_run_h900_v300.cgf
diff --git a/Editor/Objects/c3_dive_h900.cgf b/Assets/Editor/Objects/c3_dive_h900.cgf
similarity index 100%
rename from Editor/Objects/c3_dive_h900.cgf
rename to Assets/Editor/Objects/c3_dive_h900.cgf
diff --git a/Editor/Objects/c3_doorbreak_human.cgf b/Assets/Editor/Objects/c3_doorbreak_human.cgf
similarity index 100%
rename from Editor/Objects/c3_doorbreak_human.cgf
rename to Assets/Editor/Objects/c3_doorbreak_human.cgf
diff --git a/Editor/Objects/c3_doorframe.cgf b/Assets/Editor/Objects/c3_doorframe.cgf
similarity index 100%
rename from Editor/Objects/c3_doorframe.cgf
rename to Assets/Editor/Objects/c3_doorframe.cgf
diff --git a/Editor/Objects/c3_jump_v150_large.cgf b/Assets/Editor/Objects/c3_jump_v150_large.cgf
similarity index 100%
rename from Editor/Objects/c3_jump_v150_large.cgf
rename to Assets/Editor/Objects/c3_jump_v150_large.cgf
diff --git a/Editor/Objects/c3_jump_v300_large.cgf b/Assets/Editor/Objects/c3_jump_v300_large.cgf
similarity index 100%
rename from Editor/Objects/c3_jump_v300_large.cgf
rename to Assets/Editor/Objects/c3_jump_v300_large.cgf
diff --git a/Editor/Objects/c3_jump_v450_large.cgf b/Assets/Editor/Objects/c3_jump_v450_large.cgf
similarity index 100%
rename from Editor/Objects/c3_jump_v450_large.cgf
rename to Assets/Editor/Objects/c3_jump_v450_large.cgf
diff --git a/Editor/Objects/c3_repeldown_v2600.cgf b/Assets/Editor/Objects/c3_repeldown_v2600.cgf
similarity index 100%
rename from Editor/Objects/c3_repeldown_v2600.cgf
rename to Assets/Editor/Objects/c3_repeldown_v2600.cgf
diff --git a/Editor/Objects/c3_repeldown_v900.cgf b/Assets/Editor/Objects/c3_repeldown_v900.cgf
similarity index 100%
rename from Editor/Objects/c3_repeldown_v900.cgf
rename to Assets/Editor/Objects/c3_repeldown_v900.cgf
diff --git a/Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf b/Assets/Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf
similarity index 100%
rename from Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf
rename to Assets/Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf
diff --git a/Editor/Objects/c3_so_cornerPopOutSearchRight.cgf b/Assets/Editor/Objects/c3_so_cornerPopOutSearchRight.cgf
similarity index 100%
rename from Editor/Objects/c3_so_cornerPopOutSearchRight.cgf
rename to Assets/Editor/Objects/c3_so_cornerPopOutSearchRight.cgf
diff --git a/Editor/Objects/c3_vault_v125_large.cgf b/Assets/Editor/Objects/c3_vault_v125_large.cgf
similarity index 100%
rename from Editor/Objects/c3_vault_v125_large.cgf
rename to Assets/Editor/Objects/c3_vault_v125_large.cgf
diff --git a/Editor/Objects/c3_zipline_7500_15.cgf b/Assets/Editor/Objects/c3_zipline_7500_15.cgf
similarity index 100%
rename from Editor/Objects/c3_zipline_7500_15.cgf
rename to Assets/Editor/Objects/c3_zipline_7500_15.cgf
diff --git a/Editor/Objects/collision_dummy_100x50.cgf b/Assets/Editor/Objects/collision_dummy_100x50.cgf
similarity index 100%
rename from Editor/Objects/collision_dummy_100x50.cgf
rename to Assets/Editor/Objects/collision_dummy_100x50.cgf
diff --git a/Editor/Objects/collision_dummy_25x50.cgf b/Assets/Editor/Objects/collision_dummy_25x50.cgf
similarity index 100%
rename from Editor/Objects/collision_dummy_25x50.cgf
rename to Assets/Editor/Objects/collision_dummy_25x50.cgf
diff --git a/Editor/Objects/collision_dummy_50x50.cgf b/Assets/Editor/Objects/collision_dummy_50x50.cgf
similarity index 100%
rename from Editor/Objects/collision_dummy_50x50.cgf
rename to Assets/Editor/Objects/collision_dummy_50x50.cgf
diff --git a/Editor/Objects/corner270.cgf b/Assets/Editor/Objects/corner270.cgf
similarity index 100%
rename from Editor/Objects/corner270.cgf
rename to Assets/Editor/Objects/corner270.cgf
diff --git a/Editor/Objects/editor_helpers.max b/Assets/Editor/Objects/editor_helpers.max
similarity index 100%
rename from Editor/Objects/editor_helpers.max
rename to Assets/Editor/Objects/editor_helpers.max
diff --git a/Editor/Objects/energypoint.cgf b/Assets/Editor/Objects/energypoint.cgf
similarity index 100%
rename from Editor/Objects/energypoint.cgf
rename to Assets/Editor/Objects/energypoint.cgf
diff --git a/Editor/Objects/entrypoint.cgf b/Assets/Editor/Objects/entrypoint.cgf
similarity index 100%
rename from Editor/Objects/entrypoint.cgf
rename to Assets/Editor/Objects/entrypoint.cgf
diff --git a/Editor/Objects/envcube.cgf b/Assets/Editor/Objects/envcube.cgf
similarity index 100%
rename from Editor/Objects/envcube.cgf
rename to Assets/Editor/Objects/envcube.cgf
diff --git a/Editor/Objects/envcube.max b/Assets/Editor/Objects/envcube.max
similarity index 100%
rename from Editor/Objects/envcube.max
rename to Assets/Editor/Objects/envcube.max
diff --git a/Editor/Objects/envcube.mtl b/Assets/Editor/Objects/envcube.mtl
similarity index 100%
rename from Editor/Objects/envcube.mtl
rename to Assets/Editor/Objects/envcube.mtl
diff --git a/Editor/Objects/factory.cgf b/Assets/Editor/Objects/factory.cgf
similarity index 100%
rename from Editor/Objects/factory.cgf
rename to Assets/Editor/Objects/factory.cgf
diff --git a/Editor/Objects/flock.cgf b/Assets/Editor/Objects/flock.cgf
similarity index 100%
rename from Editor/Objects/flock.cgf
rename to Assets/Editor/Objects/flock.cgf
diff --git a/Editor/Objects/forbiddenarea.cgf b/Assets/Editor/Objects/forbiddenarea.cgf
similarity index 100%
rename from Editor/Objects/forbiddenarea.cgf
rename to Assets/Editor/Objects/forbiddenarea.cgf
diff --git a/Editor/Objects/gradb.dds b/Assets/Editor/Objects/gradb.dds
similarity index 100%
rename from Editor/Objects/gradb.dds
rename to Assets/Editor/Objects/gradb.dds
diff --git a/Editor/Objects/gradf.dds b/Assets/Editor/Objects/gradf.dds
similarity index 100%
rename from Editor/Objects/gradf.dds
rename to Assets/Editor/Objects/gradf.dds
diff --git a/Editor/Objects/helper.mtl b/Assets/Editor/Objects/helper.mtl
similarity index 100%
rename from Editor/Objects/helper.mtl
rename to Assets/Editor/Objects/helper.mtl
diff --git a/Editor/Objects/helper_illum.mtl b/Assets/Editor/Objects/helper_illum.mtl
similarity index 100%
rename from Editor/Objects/helper_illum.mtl
rename to Assets/Editor/Objects/helper_illum.mtl
diff --git a/Editor/Objects/hidepoint.cgf b/Assets/Editor/Objects/hidepoint.cgf
similarity index 100%
rename from Editor/Objects/hidepoint.cgf
rename to Assets/Editor/Objects/hidepoint.cgf
diff --git a/Editor/Objects/hidepoint_sec.cgf b/Assets/Editor/Objects/hidepoint_sec.cgf
similarity index 100%
rename from Editor/Objects/hidepoint_sec.cgf
rename to Assets/Editor/Objects/hidepoint_sec.cgf
diff --git a/Editor/Objects/highvault.cgf b/Assets/Editor/Objects/highvault.cgf
similarity index 100%
rename from Editor/Objects/highvault.cgf
rename to Assets/Editor/Objects/highvault.cgf
diff --git a/Editor/Objects/hq.cgf b/Assets/Editor/Objects/hq.cgf
similarity index 100%
rename from Editor/Objects/hq.cgf
rename to Assets/Editor/Objects/hq.cgf
diff --git a/Editor/Objects/invisiblebox.cgf b/Assets/Editor/Objects/invisiblebox.cgf
similarity index 100%
rename from Editor/Objects/invisiblebox.cgf
rename to Assets/Editor/Objects/invisiblebox.cgf
diff --git a/Editor/Objects/invisibleobstruct.cgf b/Assets/Editor/Objects/invisibleobstruct.cgf
similarity index 100%
rename from Editor/Objects/invisibleobstruct.cgf
rename to Assets/Editor/Objects/invisibleobstruct.cgf
diff --git a/Editor/Objects/invisibleocclude.cgf b/Assets/Editor/Objects/invisibleocclude.cgf
similarity index 100%
rename from Editor/Objects/invisibleocclude.cgf
rename to Assets/Editor/Objects/invisibleocclude.cgf
diff --git a/Editor/Objects/invisiblewall.cgf b/Assets/Editor/Objects/invisiblewall.cgf
similarity index 100%
rename from Editor/Objects/invisiblewall.cgf
rename to Assets/Editor/Objects/invisiblewall.cgf
diff --git a/Editor/Objects/jump_150.cgf b/Assets/Editor/Objects/jump_150.cgf
similarity index 100%
rename from Editor/Objects/jump_150.cgf
rename to Assets/Editor/Objects/jump_150.cgf
diff --git a/Editor/Objects/jump_300.cgf b/Assets/Editor/Objects/jump_300.cgf
similarity index 100%
rename from Editor/Objects/jump_300.cgf
rename to Assets/Editor/Objects/jump_300.cgf
diff --git a/Editor/Objects/jump_450.cgf b/Assets/Editor/Objects/jump_450.cgf
similarity index 100%
rename from Editor/Objects/jump_450.cgf
rename to Assets/Editor/Objects/jump_450.cgf
diff --git a/Editor/Objects/leap_1000.cgf b/Assets/Editor/Objects/leap_1000.cgf
similarity index 100%
rename from Editor/Objects/leap_1000.cgf
rename to Assets/Editor/Objects/leap_1000.cgf
diff --git a/Editor/Objects/leap_500.cgf b/Assets/Editor/Objects/leap_500.cgf
similarity index 100%
rename from Editor/Objects/leap_500.cgf
rename to Assets/Editor/Objects/leap_500.cgf
diff --git a/Editor/Objects/light_omni.cgf b/Assets/Editor/Objects/light_omni.cgf
similarity index 100%
rename from Editor/Objects/light_omni.cgf
rename to Assets/Editor/Objects/light_omni.cgf
diff --git a/Editor/Objects/light_spot.cgf b/Assets/Editor/Objects/light_spot.cgf
similarity index 100%
rename from Editor/Objects/light_spot.cgf
rename to Assets/Editor/Objects/light_spot.cgf
diff --git a/Editor/Objects/lightsphere.cgf b/Assets/Editor/Objects/lightsphere.cgf
similarity index 100%
rename from Editor/Objects/lightsphere.cgf
rename to Assets/Editor/Objects/lightsphere.cgf
diff --git a/Editor/Objects/measurehelper_A.cgf b/Assets/Editor/Objects/measurehelper_A.cgf
similarity index 100%
rename from Editor/Objects/measurehelper_A.cgf
rename to Assets/Editor/Objects/measurehelper_A.cgf
diff --git a/Editor/Objects/measurehelper_B.cgf b/Assets/Editor/Objects/measurehelper_B.cgf
similarity index 100%
rename from Editor/Objects/measurehelper_B.cgf
rename to Assets/Editor/Objects/measurehelper_B.cgf
diff --git a/Editor/Objects/mtlbox.mtl b/Assets/Editor/Objects/mtlbox.mtl
similarity index 100%
rename from Editor/Objects/mtlbox.mtl
rename to Assets/Editor/Objects/mtlbox.mtl
diff --git a/Editor/Objects/mtlobjects.mtl b/Assets/Editor/Objects/mtlobjects.mtl
similarity index 100%
rename from Editor/Objects/mtlobjects.mtl
rename to Assets/Editor/Objects/mtlobjects.mtl
diff --git a/Editor/Objects/objective.cgf b/Assets/Editor/Objects/objective.cgf
similarity index 100%
rename from Editor/Objects/objective.cgf
rename to Assets/Editor/Objects/objective.cgf
diff --git a/Editor/Objects/phoenix.cgf b/Assets/Editor/Objects/phoenix.cgf
similarity index 100%
rename from Editor/Objects/phoenix.cgf
rename to Assets/Editor/Objects/phoenix.cgf
diff --git a/Editor/Objects/refpicture.cgf b/Assets/Editor/Objects/refpicture.cgf
similarity index 100%
rename from Editor/Objects/refpicture.cgf
rename to Assets/Editor/Objects/refpicture.cgf
diff --git a/Editor/Objects/refpicture.max b/Assets/Editor/Objects/refpicture.max
similarity index 100%
rename from Editor/Objects/refpicture.max
rename to Assets/Editor/Objects/refpicture.max
diff --git a/Editor/Objects/reinforcement_point.cgf b/Assets/Editor/Objects/reinforcement_point.cgf
similarity index 100%
rename from Editor/Objects/reinforcement_point.cgf
rename to Assets/Editor/Objects/reinforcement_point.cgf
diff --git a/Editor/Objects/smartobject_helper.max b/Assets/Editor/Objects/smartobject_helper.max
similarity index 100%
rename from Editor/Objects/smartobject_helper.max
rename to Assets/Editor/Objects/smartobject_helper.max
diff --git a/Editor/Objects/spawngroup.cgf b/Assets/Editor/Objects/spawngroup.cgf
similarity index 100%
rename from Editor/Objects/spawngroup.cgf
rename to Assets/Editor/Objects/spawngroup.cgf
diff --git a/Editor/Objects/spawnpointhelper.cgf b/Assets/Editor/Objects/spawnpointhelper.cgf
similarity index 100%
rename from Editor/Objects/spawnpointhelper.cgf
rename to Assets/Editor/Objects/spawnpointhelper.cgf
diff --git a/Editor/Objects/spawnpointhelper.mtl b/Assets/Editor/Objects/spawnpointhelper.mtl
similarity index 100%
rename from Editor/Objects/spawnpointhelper.mtl
rename to Assets/Editor/Objects/spawnpointhelper.mtl
diff --git a/Editor/Objects/stayOnWallFire_left.cgf b/Assets/Editor/Objects/stayOnWallFire_left.cgf
similarity index 100%
rename from Editor/Objects/stayOnWallFire_left.cgf
rename to Assets/Editor/Objects/stayOnWallFire_left.cgf
diff --git a/Editor/Objects/suit_jump_300.cgf b/Assets/Editor/Objects/suit_jump_300.cgf
similarity index 100%
rename from Editor/Objects/suit_jump_300.cgf
rename to Assets/Editor/Objects/suit_jump_300.cgf
diff --git a/Editor/Objects/suit_jump_800.cgf b/Assets/Editor/Objects/suit_jump_800.cgf
similarity index 100%
rename from Editor/Objects/suit_jump_800.cgf
rename to Assets/Editor/Objects/suit_jump_800.cgf
diff --git a/Editor/Objects/suit_leap_800.cgf b/Assets/Editor/Objects/suit_leap_800.cgf
similarity index 100%
rename from Editor/Objects/suit_leap_800.cgf
rename to Assets/Editor/Objects/suit_leap_800.cgf
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif
diff --git a/Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml b/Assets/Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml
rename to Assets/Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif
diff --git a/Editor/Presets/GeomCache/game.cbc b/Assets/Editor/Presets/GeomCache/game.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/game.cbc
rename to Assets/Editor/Presets/GeomCache/game.cbc
diff --git a/Editor/Presets/GeomCache/game_lz4hc.cbc b/Assets/Editor/Presets/GeomCache/game_lz4hc.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/game_lz4hc.cbc
rename to Assets/Editor/Presets/GeomCache/game_lz4hc.cbc
diff --git a/Editor/Presets/GeomCache/game_z_up.cbc b/Assets/Editor/Presets/GeomCache/game_z_up.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/game_z_up.cbc
rename to Assets/Editor/Presets/GeomCache/game_z_up.cbc
diff --git a/Editor/Presets/GeomCache/game_z_up_lz4hc.cbc b/Assets/Editor/Presets/GeomCache/game_z_up_lz4hc.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/game_z_up_lz4hc.cbc
rename to Assets/Editor/Presets/GeomCache/game_z_up_lz4hc.cbc
diff --git a/Editor/Presets/GeomCache/prerendered.cbc b/Assets/Editor/Presets/GeomCache/prerendered.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/prerendered.cbc
rename to Assets/Editor/Presets/GeomCache/prerendered.cbc
diff --git a/Editor/Presets/GeomCache/prerendered_z_up.cbc b/Assets/Editor/Presets/GeomCache/prerendered_z_up.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/prerendered_z_up.cbc
rename to Assets/Editor/Presets/GeomCache/prerendered_z_up.cbc
diff --git a/Editor/Presets/GeomCache/rigids_only.cbc b/Assets/Editor/Presets/GeomCache/rigids_only.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/rigids_only.cbc
rename to Assets/Editor/Presets/GeomCache/rigids_only.cbc
diff --git a/Editor/Presets/GeomCache/rigids_only_z_up.cbc b/Assets/Editor/Presets/GeomCache/rigids_only_z_up.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/rigids_only_z_up.cbc
rename to Assets/Editor/Presets/GeomCache/rigids_only_z_up.cbc
diff --git a/Editor/Presets/GeomCache/uncompressed.cbc b/Assets/Editor/Presets/GeomCache/uncompressed.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/uncompressed.cbc
rename to Assets/Editor/Presets/GeomCache/uncompressed.cbc
diff --git a/Editor/Presets/GeomCache/uncompressed_z_up.cbc b/Assets/Editor/Presets/GeomCache/uncompressed_z_up.cbc
similarity index 100%
rename from Editor/Presets/GeomCache/uncompressed_z_up.cbc
rename to Assets/Editor/Presets/GeomCache/uncompressed_z_up.cbc
diff --git a/Editor/Presets/MobileSettings/GPUAndDriverLists.json b/Assets/Editor/Presets/MobileSettings/GPUAndDriverLists.json
similarity index 100%
rename from Editor/Presets/MobileSettings/GPUAndDriverLists.json
rename to Assets/Editor/Presets/MobileSettings/GPUAndDriverLists.json
diff --git a/Editor/Presets/MobileSettings/IPhone7.lms b/Assets/Editor/Presets/MobileSettings/IPhone7.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/IPhone7.lms
rename to Assets/Editor/Presets/MobileSettings/IPhone7.lms
diff --git a/Editor/Presets/MobileSettings/IpadPro.lms b/Assets/Editor/Presets/MobileSettings/IpadPro.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/IpadPro.lms
rename to Assets/Editor/Presets/MobileSettings/IpadPro.lms
diff --git a/Editor/Presets/MobileSettings/MobileFeatureBlackList.json b/Assets/Editor/Presets/MobileSettings/MobileFeatureBlackList.json
similarity index 100%
rename from Editor/Presets/MobileSettings/MobileFeatureBlackList.json
rename to Assets/Editor/Presets/MobileSettings/MobileFeatureBlackList.json
diff --git a/Editor/Presets/MobileSettings/Nexus9.lms b/Assets/Editor/Presets/MobileSettings/Nexus9.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/Nexus9.lms
rename to Assets/Editor/Presets/MobileSettings/Nexus9.lms
diff --git a/Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms b/Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms
rename to Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms
diff --git a/Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms b/Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms
rename to Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms
diff --git a/Editor/PropertyEnumerations.xml b/Assets/Editor/PropertyEnumerations.xml
similarity index 100%
rename from Editor/PropertyEnumerations.xml
rename to Assets/Editor/PropertyEnumerations.xml
diff --git a/Editor/Scripts/Shelves/icons/Albedo.png b/Assets/Editor/Scripts/Shelves/icons/Albedo.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Albedo.png
rename to Assets/Editor/Scripts/Shelves/icons/Albedo.png
diff --git a/Editor/Scripts/Shelves/icons/Diffuse_Lighting.png b/Assets/Editor/Scripts/Shelves/icons/Diffuse_Lighting.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Diffuse_Lighting.png
rename to Assets/Editor/Scripts/Shelves/icons/Diffuse_Lighting.png
diff --git a/Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png b/Assets/Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png
rename to Assets/Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png
diff --git a/Editor/Scripts/Shelves/icons/Empty_Wireframe.png b/Assets/Editor/Scripts/Shelves/icons/Empty_Wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Empty_Wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/Empty_Wireframe.png
diff --git a/Editor/Scripts/Shelves/icons/Exit.png b/Assets/Editor/Scripts/Shelves/icons/Exit.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Exit.png
rename to Assets/Editor/Scripts/Shelves/icons/Exit.png
diff --git a/Editor/Scripts/Shelves/icons/Fuzziness.png b/Assets/Editor/Scripts/Shelves/icons/Fuzziness.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Fuzziness.png
rename to Assets/Editor/Scripts/Shelves/icons/Fuzziness.png
diff --git a/Editor/Scripts/Shelves/icons/Gloss.png b/Assets/Editor/Scripts/Shelves/icons/Gloss.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Gloss.png
rename to Assets/Editor/Scripts/Shelves/icons/Gloss.png
diff --git a/Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png b/Assets/Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png
rename to Assets/Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabAddLibrary.png b/Assets/Editor/Scripts/Shelves/icons/PrefabAddLibrary.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabAddLibrary.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabAddLibrary.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabAddSelection.png b/Assets/Editor/Scripts/Shelves/icons/PrefabAddSelection.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabAddSelection.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabAddSelection.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabBreak.png b/Assets/Editor/Scripts/Shelves/icons/PrefabBreak.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabBreak.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabBreak.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabConvert.png b/Assets/Editor/Scripts/Shelves/icons/PrefabConvert.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabConvert.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabConvert.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabCreate.png b/Assets/Editor/Scripts/Shelves/icons/PrefabCreate.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabCreate.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabCreate.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabIsolate.png b/Assets/Editor/Scripts/Shelves/icons/PrefabIsolate.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabIsolate.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabIsolate.png
diff --git a/Editor/Scripts/Shelves/icons/Scattering.png b/Assets/Editor/Scripts/Shelves/icons/Scattering.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Scattering.png
rename to Assets/Editor/Scripts/Shelves/icons/Scattering.png
diff --git a/Editor/Scripts/Shelves/icons/Solid_Wireframe.png b/Assets/Editor/Scripts/Shelves/icons/Solid_Wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Solid_Wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/Solid_Wireframe.png
diff --git a/Editor/Scripts/Shelves/icons/Spec_Amount.png b/Assets/Editor/Scripts/Shelves/icons/Spec_Amount.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Spec_Amount.png
rename to Assets/Editor/Scripts/Shelves/icons/Spec_Amount.png
diff --git a/Editor/Scripts/Shelves/icons/Spec_Lighting.png b/Assets/Editor/Scripts/Shelves/icons/Spec_Lighting.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Spec_Lighting.png
rename to Assets/Editor/Scripts/Shelves/icons/Spec_Lighting.png
diff --git a/Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png b/Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png
rename to Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png
diff --git a/Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png b/Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png
rename to Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png
diff --git a/Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png b/Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png
rename to Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png
diff --git a/Editor/Scripts/Shelves/icons/all.png b/Assets/Editor/Scripts/Shelves/icons/all.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/all.png
rename to Assets/Editor/Scripts/Shelves/icons/all.png
diff --git a/Editor/Scripts/Shelves/icons/beams.png b/Assets/Editor/Scripts/Shelves/icons/beams.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/beams.png
rename to Assets/Editor/Scripts/Shelves/icons/beams.png
diff --git a/Editor/Scripts/Shelves/icons/blanker.png b/Assets/Editor/Scripts/Shelves/icons/blanker.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/blanker.png
rename to Assets/Editor/Scripts/Shelves/icons/blanker.png
diff --git a/Editor/Scripts/Shelves/icons/bounding_box.png b/Assets/Editor/Scripts/Shelves/icons/bounding_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/bounding_box.png
rename to Assets/Editor/Scripts/Shelves/icons/bounding_box.png
diff --git a/Editor/Scripts/Shelves/icons/brushes.png b/Assets/Editor/Scripts/Shelves/icons/brushes.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/brushes.png
rename to Assets/Editor/Scripts/Shelves/icons/brushes.png
diff --git a/Editor/Scripts/Shelves/icons/cloud.png b/Assets/Editor/Scripts/Shelves/icons/cloud.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cloud.png
rename to Assets/Editor/Scripts/Shelves/icons/cloud.png
diff --git a/Editor/Scripts/Shelves/icons/cloud_dark.png b/Assets/Editor/Scripts/Shelves/icons/cloud_dark.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cloud_dark.png
rename to Assets/Editor/Scripts/Shelves/icons/cloud_dark.png
diff --git a/Editor/Scripts/Shelves/icons/cloud_dark_rain.png b/Assets/Editor/Scripts/Shelves/icons/cloud_dark_rain.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cloud_dark_rain.png
rename to Assets/Editor/Scripts/Shelves/icons/cloud_dark_rain.png
diff --git a/Editor/Scripts/Shelves/icons/collisions.png b/Assets/Editor/Scripts/Shelves/icons/collisions.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/collisions.png
rename to Assets/Editor/Scripts/Shelves/icons/collisions.png
diff --git a/Editor/Scripts/Shelves/icons/create_ao_volume_box.png b/Assets/Editor/Scripts/Shelves/icons/create_ao_volume_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_ao_volume_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_ao_volume_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png b/Assets/Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png
rename to Assets/Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png
diff --git a/Editor/Scripts/Shelves/icons/create_envprobe.png b/Assets/Editor/Scripts/Shelves/icons/create_envprobe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_envprobe.png
rename to Assets/Editor/Scripts/Shelves/icons/create_envprobe.png
diff --git a/Editor/Scripts/Shelves/icons/create_portal_box.png b/Assets/Editor/Scripts/Shelves/icons/create_portal_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_portal_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_portal_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_vis_box.png b/Assets/Editor/Scripts/Shelves/icons/create_vis_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_vis_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_vis_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png b/Assets/Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png b/Assets/Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png
rename to Assets/Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png
diff --git a/Editor/Scripts/Shelves/icons/cubemap.png b/Assets/Editor/Scripts/Shelves/icons/cubemap.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cubemap.png
rename to Assets/Editor/Scripts/Shelves/icons/cubemap.png
diff --git a/Editor/Scripts/Shelves/icons/decals.png b/Assets/Editor/Scripts/Shelves/icons/decals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/decals.png
rename to Assets/Editor/Scripts/Shelves/icons/decals.png
diff --git a/Editor/Scripts/Shelves/icons/default_material.png b/Assets/Editor/Scripts/Shelves/icons/default_material.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/default_material.png
rename to Assets/Editor/Scripts/Shelves/icons/default_material.png
diff --git a/Editor/Scripts/Shelves/icons/default_material_with_normals.png b/Assets/Editor/Scripts/Shelves/icons/default_material_with_normals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/default_material_with_normals.png
rename to Assets/Editor/Scripts/Shelves/icons/default_material_with_normals.png
diff --git a/Editor/Scripts/Shelves/icons/designer.png b/Assets/Editor/Scripts/Shelves/icons/designer.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/designer.png
rename to Assets/Editor/Scripts/Shelves/icons/designer.png
diff --git a/Editor/Scripts/Shelves/icons/diff_acc.png b/Assets/Editor/Scripts/Shelves/icons/diff_acc.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/diff_acc.png
rename to Assets/Editor/Scripts/Shelves/icons/diff_acc.png
diff --git a/Editor/Scripts/Shelves/icons/display_info.png b/Assets/Editor/Scripts/Shelves/icons/display_info.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/display_info.png
rename to Assets/Editor/Scripts/Shelves/icons/display_info.png
diff --git a/Editor/Scripts/Shelves/icons/dual_layer_mask.png b/Assets/Editor/Scripts/Shelves/icons/dual_layer_mask.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/dual_layer_mask.png
rename to Assets/Editor/Scripts/Shelves/icons/dual_layer_mask.png
diff --git a/Editor/Scripts/Shelves/icons/dynamiclights.png b/Assets/Editor/Scripts/Shelves/icons/dynamiclights.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/dynamiclights.png
rename to Assets/Editor/Scripts/Shelves/icons/dynamiclights.png
diff --git a/Editor/Scripts/Shelves/icons/entities.png b/Assets/Editor/Scripts/Shelves/icons/entities.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/entities.png
rename to Assets/Editor/Scripts/Shelves/icons/entities.png
diff --git a/Editor/Scripts/Shelves/icons/eye_adaptation_speed.png b/Assets/Editor/Scripts/Shelves/icons/eye_adaptation_speed.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/eye_adaptation_speed.png
rename to Assets/Editor/Scripts/Shelves/icons/eye_adaptation_speed.png
diff --git a/Editor/Scripts/Shelves/icons/fog.png b/Assets/Editor/Scripts/Shelves/icons/fog.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/fog.png
rename to Assets/Editor/Scripts/Shelves/icons/fog.png
diff --git a/Editor/Scripts/Shelves/icons/fogvolumes.png b/Assets/Editor/Scripts/Shelves/icons/fogvolumes.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/fogvolumes.png
rename to Assets/Editor/Scripts/Shelves/icons/fogvolumes.png
diff --git a/Editor/Scripts/Shelves/icons/freeze_particles.png b/Assets/Editor/Scripts/Shelves/icons/freeze_particles.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/freeze_particles.png
rename to Assets/Editor/Scripts/Shelves/icons/freeze_particles.png
diff --git a/Editor/Scripts/Shelves/icons/full_shading.png b/Assets/Editor/Scripts/Shelves/icons/full_shading.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/full_shading.png
rename to Assets/Editor/Scripts/Shelves/icons/full_shading.png
diff --git a/Editor/Scripts/Shelves/icons/gamma.png b/Assets/Editor/Scripts/Shelves/icons/gamma.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/gamma.png
rename to Assets/Editor/Scripts/Shelves/icons/gamma.png
diff --git a/Editor/Scripts/Shelves/icons/gi.png b/Assets/Editor/Scripts/Shelves/icons/gi.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/gi.png
rename to Assets/Editor/Scripts/Shelves/icons/gi.png
diff --git a/Editor/Scripts/Shelves/icons/lens_flare.png b/Assets/Editor/Scripts/Shelves/icons/lens_flare.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lens_flare.png
rename to Assets/Editor/Scripts/Shelves/icons/lens_flare.png
diff --git a/Editor/Scripts/Shelves/icons/lighting_only.png b/Assets/Editor/Scripts/Shelves/icons/lighting_only.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lighting_only.png
rename to Assets/Editor/Scripts/Shelves/icons/lighting_only.png
diff --git a/Editor/Scripts/Shelves/icons/lods.png b/Assets/Editor/Scripts/Shelves/icons/lods.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lods.png
rename to Assets/Editor/Scripts/Shelves/icons/lods.png
diff --git a/Editor/Scripts/Shelves/icons/lsao.png b/Assets/Editor/Scripts/Shelves/icons/lsao.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lsao.png
rename to Assets/Editor/Scripts/Shelves/icons/lsao.png
diff --git a/Editor/Scripts/Shelves/icons/lsao_toggle.png b/Assets/Editor/Scripts/Shelves/icons/lsao_toggle.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lsao_toggle.png
rename to Assets/Editor/Scripts/Shelves/icons/lsao_toggle.png
diff --git a/Editor/Scripts/Shelves/icons/lsro.png b/Assets/Editor/Scripts/Shelves/icons/lsro.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lsro.png
rename to Assets/Editor/Scripts/Shelves/icons/lsro.png
diff --git a/Editor/Scripts/Shelves/icons/normals.png b/Assets/Editor/Scripts/Shelves/icons/normals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals.png
rename to Assets/Editor/Scripts/Shelves/icons/normals.png
diff --git a/Editor/Scripts/Shelves/icons/normals_x.png b/Assets/Editor/Scripts/Shelves/icons/normals_x.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals_x.png
rename to Assets/Editor/Scripts/Shelves/icons/normals_x.png
diff --git a/Editor/Scripts/Shelves/icons/normals_y.png b/Assets/Editor/Scripts/Shelves/icons/normals_y.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals_y.png
rename to Assets/Editor/Scripts/Shelves/icons/normals_y.png
diff --git a/Editor/Scripts/Shelves/icons/normals_z.png b/Assets/Editor/Scripts/Shelves/icons/normals_z.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals_z.png
rename to Assets/Editor/Scripts/Shelves/icons/normals_z.png
diff --git a/Editor/Scripts/Shelves/icons/ocean.png b/Assets/Editor/Scripts/Shelves/icons/ocean.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ocean.png
rename to Assets/Editor/Scripts/Shelves/icons/ocean.png
diff --git a/Editor/Scripts/Shelves/icons/particles.png b/Assets/Editor/Scripts/Shelves/icons/particles.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles.png
rename to Assets/Editor/Scripts/Shelves/icons/particles.png
diff --git a/Editor/Scripts/Shelves/icons/particles_bounds.png b/Assets/Editor/Scripts/Shelves/icons/particles_bounds.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_bounds.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_bounds.png
diff --git a/Editor/Scripts/Shelves/icons/particles_off.png b/Assets/Editor/Scripts/Shelves/icons/particles_off.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_off.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_off.png
diff --git a/Editor/Scripts/Shelves/icons/particles_overdraw.png b/Assets/Editor/Scripts/Shelves/icons/particles_overdraw.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_overdraw.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_overdraw.png
diff --git a/Editor/Scripts/Shelves/icons/particles_screen_coverage.png b/Assets/Editor/Scripts/Shelves/icons/particles_screen_coverage.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_screen_coverage.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_screen_coverage.png
diff --git a/Editor/Scripts/Shelves/icons/placeholder.png b/Assets/Editor/Scripts/Shelves/icons/placeholder.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/placeholder.png
rename to Assets/Editor/Scripts/Shelves/icons/placeholder.png
diff --git a/Editor/Scripts/Shelves/icons/prefab.png b/Assets/Editor/Scripts/Shelves/icons/prefab.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/prefab.png
rename to Assets/Editor/Scripts/Shelves/icons/prefab.png
diff --git a/Editor/Scripts/Shelves/icons/reflections.png b/Assets/Editor/Scripts/Shelves/icons/reflections.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/reflections.png
rename to Assets/Editor/Scripts/Shelves/icons/reflections.png
diff --git a/Editor/Scripts/Shelves/icons/reset.png b/Assets/Editor/Scripts/Shelves/icons/reset.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/reset.png
rename to Assets/Editor/Scripts/Shelves/icons/reset.png
diff --git a/Editor/Scripts/Shelves/icons/selfocc.png b/Assets/Editor/Scripts/Shelves/icons/selfocc.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/selfocc.png
rename to Assets/Editor/Scripts/Shelves/icons/selfocc.png
diff --git a/Editor/Scripts/Shelves/icons/shaded_wireframe.png b/Assets/Editor/Scripts/Shelves/icons/shaded_wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/shaded_wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/shaded_wireframe.png
diff --git a/Editor/Scripts/Shelves/icons/shadows.png b/Assets/Editor/Scripts/Shelves/icons/shadows.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/shadows.png
rename to Assets/Editor/Scripts/Shelves/icons/shadows.png
diff --git a/Editor/Scripts/Shelves/icons/showlines.png b/Assets/Editor/Scripts/Shelves/icons/showlines.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/showlines.png
rename to Assets/Editor/Scripts/Shelves/icons/showlines.png
diff --git a/Editor/Scripts/Shelves/icons/sky.png b/Assets/Editor/Scripts/Shelves/icons/sky.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/sky.png
rename to Assets/Editor/Scripts/Shelves/icons/sky.png
diff --git a/Editor/Scripts/Shelves/icons/spec_acc.png b/Assets/Editor/Scripts/Shelves/icons/spec_acc.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/spec_acc.png
rename to Assets/Editor/Scripts/Shelves/icons/spec_acc.png
diff --git a/Editor/Scripts/Shelves/icons/spec_lum.png b/Assets/Editor/Scripts/Shelves/icons/spec_lum.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/spec_lum.png
rename to Assets/Editor/Scripts/Shelves/icons/spec_lum.png
diff --git a/Editor/Scripts/Shelves/icons/spec_occ.png b/Assets/Editor/Scripts/Shelves/icons/spec_occ.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/spec_occ.png
rename to Assets/Editor/Scripts/Shelves/icons/spec_occ.png
diff --git a/Editor/Scripts/Shelves/icons/ssao.png b/Assets/Editor/Scripts/Shelves/icons/ssao.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ssao.png
rename to Assets/Editor/Scripts/Shelves/icons/ssao.png
diff --git a/Editor/Scripts/Shelves/icons/ssdo.png b/Assets/Editor/Scripts/Shelves/icons/ssdo.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ssdo.png
rename to Assets/Editor/Scripts/Shelves/icons/ssdo.png
diff --git a/Editor/Scripts/Shelves/icons/ssdo_toggle.png b/Assets/Editor/Scripts/Shelves/icons/ssdo_toggle.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ssdo_toggle.png
rename to Assets/Editor/Scripts/Shelves/icons/ssdo_toggle.png
diff --git a/Editor/Scripts/Shelves/icons/sun.big.png b/Assets/Editor/Scripts/Shelves/icons/sun.big.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/sun.big.png
rename to Assets/Editor/Scripts/Shelves/icons/sun.big.png
diff --git a/Editor/Scripts/Shelves/icons/tangents.png b/Assets/Editor/Scripts/Shelves/icons/tangents.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/tangents.png
rename to Assets/Editor/Scripts/Shelves/icons/tangents.png
diff --git a/Editor/Scripts/Shelves/icons/terrain.png b/Assets/Editor/Scripts/Shelves/icons/terrain.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/terrain.png
rename to Assets/Editor/Scripts/Shelves/icons/terrain.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_double.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_double.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_double.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_double.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_frozen.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_frozen.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_frozen.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_frozen.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_half.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_half.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_half.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_half.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_quarter.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_quarter.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_quarter.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_quarter.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_tenth.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_tenth.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_tenth.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_tenth.png
diff --git a/Editor/Scripts/Shelves/icons/tod.png b/Assets/Editor/Scripts/Shelves/icons/tod.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/tod.png
rename to Assets/Editor/Scripts/Shelves/icons/tod.png
diff --git a/Editor/Scripts/Shelves/icons/translucency.png b/Assets/Editor/Scripts/Shelves/icons/translucency.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/translucency.png
rename to Assets/Editor/Scripts/Shelves/icons/translucency.png
diff --git a/Editor/Scripts/Shelves/icons/transparency.png b/Assets/Editor/Scripts/Shelves/icons/transparency.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/transparency.png
rename to Assets/Editor/Scripts/Shelves/icons/transparency.png
diff --git a/Editor/Scripts/Shelves/icons/valid_albedo.png b/Assets/Editor/Scripts/Shelves/icons/valid_albedo.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/valid_albedo.png
rename to Assets/Editor/Scripts/Shelves/icons/valid_albedo.png
diff --git a/Editor/Scripts/Shelves/icons/valid_spec_lum.png b/Assets/Editor/Scripts/Shelves/icons/valid_spec_lum.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/valid_spec_lum.png
rename to Assets/Editor/Scripts/Shelves/icons/valid_spec_lum.png
diff --git a/Editor/Scripts/Shelves/icons/vegetation.png b/Assets/Editor/Scripts/Shelves/icons/vegetation.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/vegetation.png
rename to Assets/Editor/Scripts/Shelves/icons/vegetation.png
diff --git a/Editor/Scripts/Shelves/icons/vertex_normals.png b/Assets/Editor/Scripts/Shelves/icons/vertex_normals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/vertex_normals.png
rename to Assets/Editor/Scripts/Shelves/icons/vertex_normals.png
diff --git a/Editor/Scripts/Shelves/icons/vis_area.png b/Assets/Editor/Scripts/Shelves/icons/vis_area.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/vis_area.png
rename to Assets/Editor/Scripts/Shelves/icons/vis_area.png
diff --git a/Editor/Scripts/Shelves/icons/water_volume.png b/Assets/Editor/Scripts/Shelves/icons/water_volume.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/water_volume.png
rename to Assets/Editor/Scripts/Shelves/icons/water_volume.png
diff --git a/Editor/Scripts/Shelves/icons/wind.png b/Assets/Editor/Scripts/Shelves/icons/wind.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/wind.png
rename to Assets/Editor/Scripts/Shelves/icons/wind.png
diff --git a/Editor/Scripts/Shelves/icons/wireframe.png b/Assets/Editor/Scripts/Shelves/icons/wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/wireframe.png
diff --git a/Editor/Scripts/TrackView/example.py b/Assets/Editor/Scripts/TrackView/example.py
similarity index 100%
rename from Editor/Scripts/TrackView/example.py
rename to Assets/Editor/Scripts/TrackView/example.py
diff --git a/Editor/Scripts/editor_script_validation.py b/Assets/Editor/Scripts/editor_script_validation.py
similarity index 100%
rename from Editor/Scripts/editor_script_validation.py
rename to Assets/Editor/Scripts/editor_script_validation.py
diff --git a/Editor/Scripts/export_all_project_levels.py b/Assets/Editor/Scripts/export_all_project_levels.py
similarity index 100%
rename from Editor/Scripts/export_all_project_levels.py
rename to Assets/Editor/Scripts/export_all_project_levels.py
diff --git a/Editor/Scripts/generatelod.py b/Assets/Editor/Scripts/generatelod.py
similarity index 100%
rename from Editor/Scripts/generatelod.py
rename to Assets/Editor/Scripts/generatelod.py
diff --git a/Editor/Scripts/rename_cgf.py b/Assets/Editor/Scripts/rename_cgf.py
similarity index 100%
rename from Editor/Scripts/rename_cgf.py
rename to Assets/Editor/Scripts/rename_cgf.py
diff --git a/Editor/Scripts/select_story_anim_objects.py b/Assets/Editor/Scripts/select_story_anim_objects.py
similarity index 100%
rename from Editor/Scripts/select_story_anim_objects.py
rename to Assets/Editor/Scripts/select_story_anim_objects.py
diff --git a/Editor/Scripts/tools_shelf_actions.py b/Assets/Editor/Scripts/tools_shelf_actions.py
similarity index 100%
rename from Editor/Scripts/tools_shelf_actions.py
rename to Assets/Editor/Scripts/tools_shelf_actions.py
diff --git a/Editor/SoundTemplates.xml b/Assets/Editor/SoundTemplates.xml
similarity index 100%
rename from Editor/SoundTemplates.xml
rename to Assets/Editor/SoundTemplates.xml
diff --git a/Editor/Styles/AssetImporterWindow.qss b/Assets/Editor/Styles/AssetImporterWindow.qss
similarity index 100%
rename from Editor/Styles/AssetImporterWindow.qss
rename to Assets/Editor/Styles/AssetImporterWindow.qss
diff --git a/Editor/Styles/AssetProcessor.qss b/Assets/Editor/Styles/AssetProcessor.qss
similarity index 100%
rename from Editor/Styles/AssetProcessor.qss
rename to Assets/Editor/Styles/AssetProcessor.qss
diff --git a/Editor/Styles/AssetProcessorGlobalStyleSheet.qss b/Assets/Editor/Styles/AssetProcessorGlobalStyleSheet.qss
similarity index 100%
rename from Editor/Styles/AssetProcessorGlobalStyleSheet.qss
rename to Assets/Editor/Styles/AssetProcessorGlobalStyleSheet.qss
diff --git a/Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json b/Assets/Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json
similarity index 100%
rename from Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json
rename to Assets/Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json
diff --git a/Editor/Styles/CryDark.cjstyles b/Assets/Editor/Styles/CryDark.cjstyles
similarity index 100%
rename from Editor/Styles/CryDark.cjstyles
rename to Assets/Editor/Styles/CryDark.cjstyles
diff --git a/Editor/Styles/CryLight.cjstyles b/Assets/Editor/Styles/CryLight.cjstyles
similarity index 100%
rename from Editor/Styles/CryLight.cjstyles
rename to Assets/Editor/Styles/CryLight.cjstyles
diff --git a/Editor/Styles/MultiMeshSelectionPane.qss b/Assets/Editor/Styles/MultiMeshSelectionPane.qss
similarity index 100%
rename from Editor/Styles/MultiMeshSelectionPane.qss
rename to Assets/Editor/Styles/MultiMeshSelectionPane.qss
diff --git a/Editor/Styles/Office2007.dll b/Assets/Editor/Styles/Office2007.dll
similarity index 100%
rename from Editor/Styles/Office2007.dll
rename to Assets/Editor/Styles/Office2007.dll
diff --git a/Editor/Styles/Office2007Black.dll b/Assets/Editor/Styles/Office2007Black.dll
similarity index 100%
rename from Editor/Styles/Office2007Black.dll
rename to Assets/Editor/Styles/Office2007Black.dll
diff --git a/Editor/Styles/Office2007Silver.dll b/Assets/Editor/Styles/Office2007Silver.dll
similarity index 100%
rename from Editor/Styles/Office2007Silver.dll
rename to Assets/Editor/Styles/Office2007Silver.dll
diff --git a/Editor/Styles/StyleSheetImages/Validation_icon.png b/Assets/Editor/Styles/StyleSheetImages/Validation_icon.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/Validation_icon.png
rename to Assets/Editor/Styles/StyleSheetImages/Validation_icon.png
diff --git a/Editor/Styles/StyleSheetImages/about_dark.png b/Assets/Editor/Styles/StyleSheetImages/about_dark.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/about_dark.png
rename to Assets/Editor/Styles/StyleSheetImages/about_dark.png
diff --git a/Editor/Styles/StyleSheetImages/about_light.png b/Assets/Editor/Styles/StyleSheetImages/about_light.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/about_light.png
rename to Assets/Editor/Styles/StyleSheetImages/about_light.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_down_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_down_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_down_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_down_V2.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_left_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_left_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_left_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_left_V2.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_right_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_right_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_right_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_right_V2.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_up_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_up_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_up_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_up_V2.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked_hover.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked_hover.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked_hover.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked_hover.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png b/Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png
diff --git a/Editor/Styles/StyleSheetImages/dropdown_arrow.png b/Assets/Editor/Styles/StyleSheetImages/dropdown_arrow.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/dropdown_arrow.png
rename to Assets/Editor/Styles/StyleSheetImages/dropdown_arrow.png
diff --git a/Editor/Styles/StyleSheetImages/error_icon.png b/Assets/Editor/Styles/StyleSheetImages/error_icon.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/error_icon.png
rename to Assets/Editor/Styles/StyleSheetImages/error_icon.png
diff --git a/Editor/Styles/StyleSheetImages/help.png b/Assets/Editor/Styles/StyleSheetImages/help.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/help.png
rename to Assets/Editor/Styles/StyleSheetImages/help.png
diff --git a/Editor/Styles/StyleSheetImages/info_icon.png b/Assets/Editor/Styles/StyleSheetImages/info_icon.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/info_icon.png
rename to Assets/Editor/Styles/StyleSheetImages/info_icon.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_checked.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_checked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_checked.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_checked.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_unchecked.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_unchecked.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/spinbox_down.png b/Assets/Editor/Styles/StyleSheetImages/spinbox_down.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/spinbox_down.png
rename to Assets/Editor/Styles/StyleSheetImages/spinbox_down.png
diff --git a/Editor/Styles/StyleSheetImages/spinbox_up.png b/Assets/Editor/Styles/StyleSheetImages/spinbox_up.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/spinbox_up.png
rename to Assets/Editor/Styles/StyleSheetImages/spinbox_up.png
diff --git a/Editor/Styles/StyleSheetImages/treeview_arrow_down.png b/Assets/Editor/Styles/StyleSheetImages/treeview_arrow_down.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/treeview_arrow_down.png
rename to Assets/Editor/Styles/StyleSheetImages/treeview_arrow_down.png
diff --git a/Editor/Styles/StyleSheetImages/treeview_arrow_right.png b/Assets/Editor/Styles/StyleSheetImages/treeview_arrow_right.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/treeview_arrow_right.png
rename to Assets/Editor/Styles/StyleSheetImages/treeview_arrow_right.png
diff --git a/Editor/Styles/stylesheet_Dark.qss b/Assets/Editor/Styles/stylesheet_Dark.qss
similarity index 100%
rename from Editor/Styles/stylesheet_Dark.qss
rename to Assets/Editor/Styles/stylesheet_Dark.qss
diff --git a/Editor/Styles/stylesheet_Light.qss b/Assets/Editor/Styles/stylesheet_Light.qss
similarity index 100%
rename from Editor/Styles/stylesheet_Light.qss
rename to Assets/Editor/Styles/stylesheet_Light.qss
diff --git a/Editor/ToolBox.xml b/Assets/Editor/ToolBox.xml
similarity index 100%
rename from Editor/ToolBox.xml
rename to Assets/Editor/ToolBox.xml
diff --git a/Editor/Translation/scriptcanvas_en_us.ts b/Assets/Editor/Translation/scriptcanvas_en_us.ts
similarity index 100%
rename from Editor/Translation/scriptcanvas_en_us.ts
rename to Assets/Editor/Translation/scriptcanvas_en_us.ts
diff --git a/Editor/UI/AssetBrowserRibbon.xml b/Assets/Editor/UI/AssetBrowserRibbon.xml
similarity index 100%
rename from Editor/UI/AssetBrowserRibbon.xml
rename to Assets/Editor/UI/AssetBrowserRibbon.xml
diff --git a/Editor/UI/Icons/AddSel.png b/Assets/Editor/UI/Icons/AddSel.png
similarity index 100%
rename from Editor/UI/Icons/AddSel.png
rename to Assets/Editor/UI/Icons/AddSel.png
diff --git a/Editor/UI/Icons/AlObjGrid.png b/Assets/Editor/UI/Icons/AlObjGrid.png
similarity index 100%
rename from Editor/UI/Icons/AlObjGrid.png
rename to Assets/Editor/UI/Icons/AlObjGrid.png
diff --git a/Editor/UI/Icons/AlObjSurf.png b/Assets/Editor/UI/Icons/AlObjSurf.png
similarity index 100%
rename from Editor/UI/Icons/AlObjSurf.png
rename to Assets/Editor/UI/Icons/AlObjSurf.png
diff --git a/Editor/UI/Icons/AlSelect.png b/Assets/Editor/UI/Icons/AlSelect.png
similarity index 100%
rename from Editor/UI/Icons/AlSelect.png
rename to Assets/Editor/UI/Icons/AlSelect.png
diff --git a/Editor/UI/Icons/Animation Graph.png b/Assets/Editor/UI/Icons/Animation Graph.png
similarity index 100%
rename from Editor/UI/Icons/Animation Graph.png
rename to Assets/Editor/UI/Icons/Animation Graph.png
diff --git a/Editor/UI/Icons/Asset Browser.png b/Assets/Editor/UI/Icons/Asset Browser.png
similarity index 100%
rename from Editor/UI/Icons/Asset Browser.png
rename to Assets/Editor/UI/Icons/Asset Browser.png
diff --git a/Editor/UI/Icons/AssetBrowserCheckers.png b/Assets/Editor/UI/Icons/AssetBrowserCheckers.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserCheckers.png
rename to Assets/Editor/UI/Icons/AssetBrowserCheckers.png
diff --git a/Editor/UI/Icons/AssetBrowserFilterPresets.png b/Assets/Editor/UI/Icons/AssetBrowserFilterPresets.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserFilterPresets.png
rename to Assets/Editor/UI/Icons/AssetBrowserFilterPresets.png
diff --git a/Editor/UI/Icons/AssetBrowserFromViewportSel.png b/Assets/Editor/UI/Icons/AssetBrowserFromViewportSel.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserFromViewportSel.png
rename to Assets/Editor/UI/Icons/AssetBrowserFromViewportSel.png
diff --git a/Editor/UI/Icons/AssetBrowserRefresh.png b/Assets/Editor/UI/Icons/AssetBrowserRefresh.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserRefresh.png
rename to Assets/Editor/UI/Icons/AssetBrowserRefresh.png
diff --git a/Editor/UI/Icons/AssetBrowserSelectInViewport.png b/Assets/Editor/UI/Icons/AssetBrowserSelectInViewport.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserSelectInViewport.png
rename to Assets/Editor/UI/Icons/AssetBrowserSelectInViewport.png
diff --git a/Editor/UI/Icons/AssetBrowserSound.png b/Assets/Editor/UI/Icons/AssetBrowserSound.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserSound.png
rename to Assets/Editor/UI/Icons/AssetBrowserSound.png
diff --git a/Editor/UI/Icons/AssetBrowserThumbInvalid.png b/Assets/Editor/UI/Icons/AssetBrowserThumbInvalid.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserThumbInvalid.png
rename to Assets/Editor/UI/Icons/AssetBrowserThumbInvalid.png
diff --git a/Editor/UI/Icons/AssetBrowserThumbLoading.png b/Assets/Editor/UI/Icons/AssetBrowserThumbLoading.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserThumbLoading.png
rename to Assets/Editor/UI/Icons/AssetBrowserThumbLoading.png
diff --git a/Editor/UI/Icons/AssetBrowserTooltipShadow.png b/Assets/Editor/UI/Icons/AssetBrowserTooltipShadow.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserTooltipShadow.png
rename to Assets/Editor/UI/Icons/AssetBrowserTooltipShadow.png
diff --git a/Editor/UI/Icons/AssetFav.png b/Assets/Editor/UI/Icons/AssetFav.png
similarity index 100%
rename from Editor/UI/Icons/AssetFav.png
rename to Assets/Editor/UI/Icons/AssetFav.png
diff --git a/Editor/UI/Icons/AssetTag.png b/Assets/Editor/UI/Icons/AssetTag.png
similarity index 100%
rename from Editor/UI/Icons/AssetTag.png
rename to Assets/Editor/UI/Icons/AssetTag.png
diff --git a/Editor/UI/Icons/Attach.png b/Assets/Editor/UI/Icons/Attach.png
similarity index 100%
rename from Editor/UI/Icons/Attach.png
rename to Assets/Editor/UI/Icons/Attach.png
diff --git a/Editor/UI/Icons/AutoSync.png b/Assets/Editor/UI/Icons/AutoSync.png
similarity index 100%
rename from Editor/UI/Icons/AutoSync.png
rename to Assets/Editor/UI/Icons/AutoSync.png
diff --git a/Editor/UI/Icons/Character Tool.png b/Assets/Editor/UI/Icons/Character Tool.png
similarity index 100%
rename from Editor/UI/Icons/Character Tool.png
rename to Assets/Editor/UI/Icons/Character Tool.png
diff --git a/Editor/UI/Icons/Clone.png b/Assets/Editor/UI/Icons/Clone.png
similarity index 100%
rename from Editor/UI/Icons/Clone.png
rename to Assets/Editor/UI/Icons/Clone.png
diff --git a/Editor/UI/Icons/CloseGroup.png b/Assets/Editor/UI/Icons/CloseGroup.png
similarity index 100%
rename from Editor/UI/Icons/CloseGroup.png
rename to Assets/Editor/UI/Icons/CloseGroup.png
diff --git a/Editor/UI/Icons/Cloud.png b/Assets/Editor/UI/Icons/Cloud.png
similarity index 100%
rename from Editor/UI/Icons/Cloud.png
rename to Assets/Editor/UI/Icons/Cloud.png
diff --git a/Editor/UI/Icons/ConOpt.png b/Assets/Editor/UI/Icons/ConOpt.png
similarity index 100%
rename from Editor/UI/Icons/ConOpt.png
rename to Assets/Editor/UI/Icons/ConOpt.png
diff --git a/Editor/UI/Icons/ConvertSelToBrushes.png b/Assets/Editor/UI/Icons/ConvertSelToBrushes.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToBrushes.png
rename to Assets/Editor/UI/Icons/ConvertSelToBrushes.png
diff --git a/Editor/UI/Icons/ConvertSelToDesigner.png b/Assets/Editor/UI/Icons/ConvertSelToDesigner.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToDesigner.png
rename to Assets/Editor/UI/Icons/ConvertSelToDesigner.png
diff --git a/Editor/UI/Icons/ConvertSelToSimpleEntity.png b/Assets/Editor/UI/Icons/ConvertSelToSimpleEntity.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToSimpleEntity.png
rename to Assets/Editor/UI/Icons/ConvertSelToSimpleEntity.png
diff --git a/Editor/UI/Icons/ConvertSelToStaticEntity.png b/Assets/Editor/UI/Icons/ConvertSelToStaticEntity.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToStaticEntity.png
rename to Assets/Editor/UI/Icons/ConvertSelToStaticEntity.png
diff --git a/Editor/UI/Icons/Database View.png b/Assets/Editor/UI/Icons/Database View.png
similarity index 100%
rename from Editor/UI/Icons/Database View.png
rename to Assets/Editor/UI/Icons/Database View.png
diff --git a/Editor/UI/Icons/DelSel.png b/Assets/Editor/UI/Icons/DelSel.png
similarity index 100%
rename from Editor/UI/Icons/DelSel.png
rename to Assets/Editor/UI/Icons/DelSel.png
diff --git a/Editor/UI/Icons/Delete.png b/Assets/Editor/UI/Icons/Delete.png
similarity index 100%
rename from Editor/UI/Icons/Delete.png
rename to Assets/Editor/UI/Icons/Delete.png
diff --git a/Editor/UI/Icons/Detach.png b/Assets/Editor/UI/Icons/Detach.png
similarity index 100%
rename from Editor/UI/Icons/Detach.png
rename to Assets/Editor/UI/Icons/Detach.png
diff --git a/Editor/UI/Icons/Dialog Editor.png b/Assets/Editor/UI/Icons/Dialog Editor.png
similarity index 100%
rename from Editor/UI/Icons/Dialog Editor.png
rename to Assets/Editor/UI/Icons/Dialog Editor.png
diff --git a/Editor/UI/Icons/Edit Terrain Lighting.png b/Assets/Editor/UI/Icons/Edit Terrain Lighting.png
similarity index 100%
rename from Editor/UI/Icons/Edit Terrain Lighting.png
rename to Assets/Editor/UI/Icons/Edit Terrain Lighting.png
diff --git a/Editor/UI/Icons/Edit Vegetation.png b/Assets/Editor/UI/Icons/Edit Vegetation.png
similarity index 100%
rename from Editor/UI/Icons/Edit Vegetation.png
rename to Assets/Editor/UI/Icons/Edit Vegetation.png
diff --git a/Editor/UI/Icons/Editor Settings Manager.png b/Assets/Editor/UI/Icons/Editor Settings Manager.png
similarity index 100%
rename from Editor/UI/Icons/Editor Settings Manager.png
rename to Assets/Editor/UI/Icons/Editor Settings Manager.png
diff --git a/Editor/UI/Icons/Error Report.png b/Assets/Editor/UI/Icons/Error Report.png
similarity index 100%
rename from Editor/UI/Icons/Error Report.png
rename to Assets/Editor/UI/Icons/Error Report.png
diff --git a/Editor/UI/Icons/Export Block.png b/Assets/Editor/UI/Icons/Export Block.png
similarity index 100%
rename from Editor/UI/Icons/Export Block.png
rename to Assets/Editor/UI/Icons/Export Block.png
diff --git a/Editor/UI/Icons/Facial Editor.png b/Assets/Editor/UI/Icons/Facial Editor.png
similarity index 100%
rename from Editor/UI/Icons/Facial Editor.png
rename to Assets/Editor/UI/Icons/Facial Editor.png
diff --git a/Editor/UI/Icons/Fetch.png b/Assets/Editor/UI/Icons/Fetch.png
similarity index 100%
rename from Editor/UI/Icons/Fetch.png
rename to Assets/Editor/UI/Icons/Fetch.png
diff --git a/Editor/UI/Icons/Flatten Terrain.png b/Assets/Editor/UI/Icons/Flatten Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Flatten Terrain.png
rename to Assets/Editor/UI/Icons/Flatten Terrain.png
diff --git a/Editor/UI/Icons/Follow.png b/Assets/Editor/UI/Icons/Follow.png
similarity index 100%
rename from Editor/UI/Icons/Follow.png
rename to Assets/Editor/UI/Icons/Follow.png
diff --git a/Editor/UI/Icons/FollowSnap.png b/Assets/Editor/UI/Icons/FollowSnap.png
similarity index 100%
rename from Editor/UI/Icons/FollowSnap.png
rename to Assets/Editor/UI/Icons/FollowSnap.png
diff --git a/Editor/UI/Icons/ForceSyncLevelToConsole.png b/Assets/Editor/UI/Icons/ForceSyncLevelToConsole.png
similarity index 100%
rename from Editor/UI/Icons/ForceSyncLevelToConsole.png
rename to Assets/Editor/UI/Icons/ForceSyncLevelToConsole.png
diff --git a/Editor/UI/Icons/Freeze.png b/Assets/Editor/UI/Icons/Freeze.png
similarity index 100%
rename from Editor/UI/Icons/Freeze.png
rename to Assets/Editor/UI/Icons/Freeze.png
diff --git a/Editor/UI/Icons/Front.png b/Assets/Editor/UI/Icons/Front.png
similarity index 100%
rename from Editor/UI/Icons/Front.png
rename to Assets/Editor/UI/Icons/Front.png
diff --git a/Editor/UI/Icons/GetPhysics.png b/Assets/Editor/UI/Icons/GetPhysics.png
similarity index 100%
rename from Editor/UI/Icons/GetPhysics.png
rename to Assets/Editor/UI/Icons/GetPhysics.png
diff --git a/Editor/UI/Icons/GoToObj.png b/Assets/Editor/UI/Icons/GoToObj.png
similarity index 100%
rename from Editor/UI/Icons/GoToObj.png
rename to Assets/Editor/UI/Icons/GoToObj.png
diff --git a/Editor/UI/Icons/GotoTagPoint.png b/Assets/Editor/UI/Icons/GotoTagPoint.png
similarity index 100%
rename from Editor/UI/Icons/GotoTagPoint.png
rename to Assets/Editor/UI/Icons/GotoTagPoint.png
diff --git a/Editor/UI/Icons/Group.png b/Assets/Editor/UI/Icons/Group.png
similarity index 100%
rename from Editor/UI/Icons/Group.png
rename to Assets/Editor/UI/Icons/Group.png
diff --git a/Editor/UI/Icons/Hide.png b/Assets/Editor/UI/Icons/Hide.png
similarity index 100%
rename from Editor/UI/Icons/Hide.png
rename to Assets/Editor/UI/Icons/Hide.png
diff --git a/Editor/UI/Icons/Hold.png b/Assets/Editor/UI/Icons/Hold.png
similarity index 100%
rename from Editor/UI/Icons/Hold.png
rename to Assets/Editor/UI/Icons/Hold.png
diff --git a/Editor/UI/Icons/Import Block.png b/Assets/Editor/UI/Icons/Import Block.png
similarity index 100%
rename from Editor/UI/Icons/Import Block.png
rename to Assets/Editor/UI/Icons/Import Block.png
diff --git a/Editor/UI/Icons/ImportExport Terrain Texture.png b/Assets/Editor/UI/Icons/ImportExport Terrain Texture.png
similarity index 100%
rename from Editor/UI/Icons/ImportExport Terrain Texture.png
rename to Assets/Editor/UI/Icons/ImportExport Terrain Texture.png
diff --git a/Editor/UI/Icons/Invert.png b/Assets/Editor/UI/Icons/Invert.png
similarity index 100%
rename from Editor/UI/Icons/Invert.png
rename to Assets/Editor/UI/Icons/Invert.png
diff --git a/Editor/UI/Icons/LNM Editor.png b/Assets/Editor/UI/Icons/LNM Editor.png
similarity index 100%
rename from Editor/UI/Icons/LNM Editor.png
rename to Assets/Editor/UI/Icons/LNM Editor.png
diff --git a/Editor/UI/Icons/LaunchLevel.png b/Assets/Editor/UI/Icons/LaunchLevel.png
similarity index 100%
rename from Editor/UI/Icons/LaunchLevel.png
rename to Assets/Editor/UI/Icons/LaunchLevel.png
diff --git a/Editor/UI/Icons/Layer Editor.png b/Assets/Editor/UI/Icons/Layer Editor.png
similarity index 100%
rename from Editor/UI/Icons/Layer Editor.png
rename to Assets/Editor/UI/Icons/Layer Editor.png
diff --git a/Editor/UI/Icons/Layer.png b/Assets/Editor/UI/Icons/Layer.png
similarity index 100%
rename from Editor/UI/Icons/Layer.png
rename to Assets/Editor/UI/Icons/Layer.png
diff --git a/Editor/UI/Icons/Left.png b/Assets/Editor/UI/Icons/Left.png
similarity index 100%
rename from Editor/UI/Icons/Left.png
rename to Assets/Editor/UI/Icons/Left.png
diff --git a/Editor/UI/Icons/Lighting Tool.png b/Assets/Editor/UI/Icons/Lighting Tool.png
similarity index 100%
rename from Editor/UI/Icons/Lighting Tool.png
rename to Assets/Editor/UI/Icons/Lighting Tool.png
diff --git a/Editor/UI/Icons/Link.png b/Assets/Editor/UI/Icons/Link.png
similarity index 100%
rename from Editor/UI/Icons/Link.png
rename to Assets/Editor/UI/Icons/Link.png
diff --git a/Editor/UI/Icons/LoadGameLevel.png b/Assets/Editor/UI/Icons/LoadGameLevel.png
similarity index 100%
rename from Editor/UI/Icons/LoadGameLevel.png
rename to Assets/Editor/UI/Icons/LoadGameLevel.png
diff --git a/Editor/UI/Icons/LoadGameLevel_16x16.png b/Assets/Editor/UI/Icons/LoadGameLevel_16x16.png
similarity index 100%
rename from Editor/UI/Icons/LoadGameLevel_16x16.png
rename to Assets/Editor/UI/Icons/LoadGameLevel_16x16.png
diff --git a/Editor/UI/Icons/LoadLevel.png b/Assets/Editor/UI/Icons/LoadLevel.png
similarity index 100%
rename from Editor/UI/Icons/LoadLevel.png
rename to Assets/Editor/UI/Icons/LoadLevel.png
diff --git a/Editor/UI/Icons/LoadSelObj.png b/Assets/Editor/UI/Icons/LoadSelObj.png
similarity index 100%
rename from Editor/UI/Icons/LoadSelObj.png
rename to Assets/Editor/UI/Icons/LoadSelObj.png
diff --git a/Editor/UI/Icons/LoadSelObj_16x16.png b/Assets/Editor/UI/Icons/LoadSelObj_16x16.png
similarity index 100%
rename from Editor/UI/Icons/LoadSelObj_16x16.png
rename to Assets/Editor/UI/Icons/LoadSelObj_16x16.png
diff --git a/Editor/UI/Icons/MakePref.png b/Assets/Editor/UI/Icons/MakePref.png
similarity index 100%
rename from Editor/UI/Icons/MakePref.png
rename to Assets/Editor/UI/Icons/MakePref.png
diff --git a/Editor/UI/Icons/Mannequin Editor.png b/Assets/Editor/UI/Icons/Mannequin Editor.png
similarity index 100%
rename from Editor/UI/Icons/Mannequin Editor.png
rename to Assets/Editor/UI/Icons/Mannequin Editor.png
diff --git a/Editor/UI/Icons/Mannequin.png b/Assets/Editor/UI/Icons/Mannequin.png
similarity index 100%
rename from Editor/UI/Icons/Mannequin.png
rename to Assets/Editor/UI/Icons/Mannequin.png
diff --git a/Editor/UI/Icons/Map.png b/Assets/Editor/UI/Icons/Map.png
similarity index 100%
rename from Editor/UI/Icons/Map.png
rename to Assets/Editor/UI/Icons/Map.png
diff --git a/Editor/UI/Icons/Material Editor.png b/Assets/Editor/UI/Icons/Material Editor.png
similarity index 100%
rename from Editor/UI/Icons/Material Editor.png
rename to Assets/Editor/UI/Icons/Material Editor.png
diff --git a/Editor/UI/Icons/Material_Editor_16x16.png b/Assets/Editor/UI/Icons/Material_Editor_16x16.png
similarity index 100%
rename from Editor/UI/Icons/Material_Editor_16x16.png
rename to Assets/Editor/UI/Icons/Material_Editor_16x16.png
diff --git a/Editor/UI/Icons/Measurement System Tool.png b/Assets/Editor/UI/Icons/Measurement System Tool.png
similarity index 100%
rename from Editor/UI/Icons/Measurement System Tool.png
rename to Assets/Editor/UI/Icons/Measurement System Tool.png
diff --git a/Editor/UI/Icons/Missing Asset Resolver.png b/Assets/Editor/UI/Icons/Missing Asset Resolver.png
similarity index 100%
rename from Editor/UI/Icons/Missing Asset Resolver.png
rename to Assets/Editor/UI/Icons/Missing Asset Resolver.png
diff --git a/Editor/UI/Icons/Model Preview.png b/Assets/Editor/UI/Icons/Model Preview.png
similarity index 100%
rename from Editor/UI/Icons/Model Preview.png
rename to Assets/Editor/UI/Icons/Model Preview.png
diff --git a/Editor/UI/Icons/Modular Editor.png b/Assets/Editor/UI/Icons/Modular Editor.png
similarity index 100%
rename from Editor/UI/Icons/Modular Editor.png
rename to Assets/Editor/UI/Icons/Modular Editor.png
diff --git a/Editor/UI/Icons/Move.png b/Assets/Editor/UI/Icons/Move.png
similarity index 100%
rename from Editor/UI/Icons/Move.png
rename to Assets/Editor/UI/Icons/Move.png
diff --git a/Editor/UI/Icons/NavContinuousUpdate.png b/Assets/Editor/UI/Icons/NavContinuousUpdate.png
similarity index 100%
rename from Editor/UI/Icons/NavContinuousUpdate.png
rename to Assets/Editor/UI/Icons/NavContinuousUpdate.png
diff --git a/Editor/UI/Icons/NavContinuousUpdate2.png b/Assets/Editor/UI/Icons/NavContinuousUpdate2.png
similarity index 100%
rename from Editor/UI/Icons/NavContinuousUpdate2.png
rename to Assets/Editor/UI/Icons/NavContinuousUpdate2.png
diff --git a/Editor/UI/Icons/NavDebugDisplay.png b/Assets/Editor/UI/Icons/NavDebugDisplay.png
similarity index 100%
rename from Editor/UI/Icons/NavDebugDisplay.png
rename to Assets/Editor/UI/Icons/NavDebugDisplay.png
diff --git a/Editor/UI/Icons/NavNewArea.png b/Assets/Editor/UI/Icons/NavNewArea.png
similarity index 100%
rename from Editor/UI/Icons/NavNewArea.png
rename to Assets/Editor/UI/Icons/NavNewArea.png
diff --git a/Editor/UI/Icons/NavNewSeed.png b/Assets/Editor/UI/Icons/NavNewSeed.png
similarity index 100%
rename from Editor/UI/Icons/NavNewSeed.png
rename to Assets/Editor/UI/Icons/NavNewSeed.png
diff --git a/Editor/UI/Icons/NavShowAreas.png b/Assets/Editor/UI/Icons/NavShowAreas.png
similarity index 100%
rename from Editor/UI/Icons/NavShowAreas.png
rename to Assets/Editor/UI/Icons/NavShowAreas.png
diff --git a/Editor/UI/Icons/NavShowAreas2.png b/Assets/Editor/UI/Icons/NavShowAreas2.png
similarity index 100%
rename from Editor/UI/Icons/NavShowAreas2.png
rename to Assets/Editor/UI/Icons/NavShowAreas2.png
diff --git a/Editor/UI/Icons/OpenGroup.png b/Assets/Editor/UI/Icons/OpenGroup.png
similarity index 100%
rename from Editor/UI/Icons/OpenGroup.png
rename to Assets/Editor/UI/Icons/OpenGroup.png
diff --git a/Editor/UI/Icons/Perspective.png b/Assets/Editor/UI/Icons/Perspective.png
similarity index 100%
rename from Editor/UI/Icons/Perspective.png
rename to Assets/Editor/UI/Icons/Perspective.png
diff --git a/Editor/UI/Icons/QCollapsePanel/collapsed.png b/Assets/Editor/UI/Icons/QCollapsePanel/collapsed.png
similarity index 100%
rename from Editor/UI/Icons/QCollapsePanel/collapsed.png
rename to Assets/Editor/UI/Icons/QCollapsePanel/collapsed.png
diff --git a/Editor/UI/Icons/QCollapsePanel/open.png b/Assets/Editor/UI/Icons/QCollapsePanel/open.png
similarity index 100%
rename from Editor/UI/Icons/QCollapsePanel/open.png
rename to Assets/Editor/UI/Icons/QCollapsePanel/open.png
diff --git a/Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png b/Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png
similarity index 100%
rename from Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png
rename to Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png
diff --git a/Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png b/Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png
similarity index 100%
rename from Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png
rename to Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png
diff --git a/Editor/UI/Icons/Redo.png b/Assets/Editor/UI/Icons/Redo.png
similarity index 100%
rename from Editor/UI/Icons/Redo.png
rename to Assets/Editor/UI/Icons/Redo.png
diff --git a/Editor/UI/Icons/RefCoord.png b/Assets/Editor/UI/Icons/RefCoord.png
similarity index 100%
rename from Editor/UI/Icons/RefCoord.png
rename to Assets/Editor/UI/Icons/RefCoord.png
diff --git a/Editor/UI/Icons/Reload Terrain-.png b/Assets/Editor/UI/Icons/Reload Terrain-.png
similarity index 100%
rename from Editor/UI/Icons/Reload Terrain-.png
rename to Assets/Editor/UI/Icons/Reload Terrain-.png
diff --git a/Editor/UI/Icons/Reload Terrain.png b/Assets/Editor/UI/Icons/Reload Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Reload Terrain.png
rename to Assets/Editor/UI/Icons/Reload Terrain.png
diff --git a/Editor/UI/Icons/ReloadAll.png b/Assets/Editor/UI/Icons/ReloadAll.png
similarity index 100%
rename from Editor/UI/Icons/ReloadAll.png
rename to Assets/Editor/UI/Icons/ReloadAll.png
diff --git a/Editor/UI/Icons/Rename.png b/Assets/Editor/UI/Icons/Rename.png
similarity index 100%
rename from Editor/UI/Icons/Rename.png
rename to Assets/Editor/UI/Icons/Rename.png
diff --git a/Editor/UI/Icons/ResetPhysics.png b/Assets/Editor/UI/Icons/ResetPhysics.png
similarity index 100%
rename from Editor/UI/Icons/ResetPhysics.png
rename to Assets/Editor/UI/Icons/ResetPhysics.png
diff --git a/Editor/UI/Icons/Resize Terrain.png b/Assets/Editor/UI/Icons/Resize Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Resize Terrain.png
rename to Assets/Editor/UI/Icons/Resize Terrain.png
diff --git a/Editor/UI/Icons/Rotate.png b/Assets/Editor/UI/Icons/Rotate.png
similarity index 100%
rename from Editor/UI/Icons/Rotate.png
rename to Assets/Editor/UI/Icons/Rotate.png
diff --git a/Editor/UI/Icons/Ruler.png b/Assets/Editor/UI/Icons/Ruler.png
similarity index 100%
rename from Editor/UI/Icons/Ruler.png
rename to Assets/Editor/UI/Icons/Ruler.png
diff --git a/Editor/UI/Icons/Save as Geometry.png b/Assets/Editor/UI/Icons/Save as Geometry.png
similarity index 100%
rename from Editor/UI/Icons/Save as Geometry.png
rename to Assets/Editor/UI/Icons/Save as Geometry.png
diff --git a/Editor/UI/Icons/SaveGameLevel.png b/Assets/Editor/UI/Icons/SaveGameLevel.png
similarity index 100%
rename from Editor/UI/Icons/SaveGameLevel.png
rename to Assets/Editor/UI/Icons/SaveGameLevel.png
diff --git a/Editor/UI/Icons/SaveSelObj.png b/Assets/Editor/UI/Icons/SaveSelObj.png
similarity index 100%
rename from Editor/UI/Icons/SaveSelObj.png
rename to Assets/Editor/UI/Icons/SaveSelObj.png
diff --git a/Editor/UI/Icons/SaveTagPoint.png b/Assets/Editor/UI/Icons/SaveTagPoint.png
similarity index 100%
rename from Editor/UI/Icons/SaveTagPoint.png
rename to Assets/Editor/UI/Icons/SaveTagPoint.png
diff --git a/Editor/UI/Icons/Scale.png b/Assets/Editor/UI/Icons/Scale.png
similarity index 100%
rename from Editor/UI/Icons/Scale.png
rename to Assets/Editor/UI/Icons/Scale.png
diff --git a/Editor/UI/Icons/SelObjType.png b/Assets/Editor/UI/Icons/SelObjType.png
similarity index 100%
rename from Editor/UI/Icons/SelObjType.png
rename to Assets/Editor/UI/Icons/SelObjType.png
diff --git a/Editor/UI/Icons/Select Objects.png b/Assets/Editor/UI/Icons/Select Objects.png
similarity index 100%
rename from Editor/UI/Icons/Select Objects.png
rename to Assets/Editor/UI/Icons/Select Objects.png
diff --git a/Editor/UI/Icons/Select.png b/Assets/Editor/UI/Icons/Select.png
similarity index 100%
rename from Editor/UI/Icons/Select.png
rename to Assets/Editor/UI/Icons/Select.png
diff --git a/Editor/UI/Icons/SelectAll.png b/Assets/Editor/UI/Icons/SelectAll.png
similarity index 100%
rename from Editor/UI/Icons/SelectAll.png
rename to Assets/Editor/UI/Icons/SelectAll.png
diff --git a/Editor/UI/Icons/SelectNone.png b/Assets/Editor/UI/Icons/SelectNone.png
similarity index 100%
rename from Editor/UI/Icons/SelectNone.png
rename to Assets/Editor/UI/Icons/SelectNone.png
diff --git a/Editor/UI/Icons/SelectObjects.png b/Assets/Editor/UI/Icons/SelectObjects.png
similarity index 100%
rename from Editor/UI/Icons/SelectObjects.png
rename to Assets/Editor/UI/Icons/SelectObjects.png
diff --git a/Editor/UI/Icons/SelectTerrainArea.png b/Assets/Editor/UI/Icons/SelectTerrainArea.png
similarity index 100%
rename from Editor/UI/Icons/SelectTerrainArea.png
rename to Assets/Editor/UI/Icons/SelectTerrainArea.png
diff --git a/Editor/UI/Icons/SelectionMask.bmp b/Assets/Editor/UI/Icons/SelectionMask.bmp
similarity index 100%
rename from Editor/UI/Icons/SelectionMask.bmp
rename to Assets/Editor/UI/Icons/SelectionMask.bmp
diff --git a/Editor/UI/Icons/SetHeight.png b/Assets/Editor/UI/Icons/SetHeight.png
similarity index 100%
rename from Editor/UI/Icons/SetHeight.png
rename to Assets/Editor/UI/Icons/SetHeight.png
diff --git a/Editor/UI/Icons/ShowRollup.png b/Assets/Editor/UI/Icons/ShowRollup.png
similarity index 100%
rename from Editor/UI/Icons/ShowRollup.png
rename to Assets/Editor/UI/Icons/ShowRollup.png
diff --git a/Editor/UI/Icons/SimObj.png b/Assets/Editor/UI/Icons/SimObj.png
similarity index 100%
rename from Editor/UI/Icons/SimObj.png
rename to Assets/Editor/UI/Icons/SimObj.png
diff --git a/Editor/UI/Icons/Smart Objects Editor.png b/Assets/Editor/UI/Icons/Smart Objects Editor.png
similarity index 100%
rename from Editor/UI/Icons/Smart Objects Editor.png
rename to Assets/Editor/UI/Icons/Smart Objects Editor.png
diff --git a/Editor/UI/Icons/Smooth Terrain.png b/Assets/Editor/UI/Icons/Smooth Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Smooth Terrain.png
rename to Assets/Editor/UI/Icons/Smooth Terrain.png
diff --git a/Editor/UI/Icons/SnapAngle.png b/Assets/Editor/UI/Icons/SnapAngle.png
similarity index 100%
rename from Editor/UI/Icons/SnapAngle.png
rename to Assets/Editor/UI/Icons/SnapAngle.png
diff --git a/Editor/UI/Icons/SnapGrid.png b/Assets/Editor/UI/Icons/SnapGrid.png
similarity index 100%
rename from Editor/UI/Icons/SnapGrid.png
rename to Assets/Editor/UI/Icons/SnapGrid.png
diff --git a/Editor/UI/Icons/SyncCamera.png b/Assets/Editor/UI/Icons/SyncCamera.png
similarity index 100%
rename from Editor/UI/Icons/SyncCamera.png
rename to Assets/Editor/UI/Icons/SyncCamera.png
diff --git a/Editor/UI/Icons/SyncData.png b/Assets/Editor/UI/Icons/SyncData.png
similarity index 100%
rename from Editor/UI/Icons/SyncData.png
rename to Assets/Editor/UI/Icons/SyncData.png
diff --git a/Editor/UI/Icons/Terrain Editor.png b/Assets/Editor/UI/Icons/Terrain Editor.png
similarity index 100%
rename from Editor/UI/Icons/Terrain Editor.png
rename to Assets/Editor/UI/Icons/Terrain Editor.png
diff --git a/Editor/UI/Icons/Terrain Texture Layers.png b/Assets/Editor/UI/Icons/Terrain Texture Layers.png
similarity index 100%
rename from Editor/UI/Icons/Terrain Texture Layers.png
rename to Assets/Editor/UI/Icons/Terrain Texture Layers.png
diff --git a/Editor/UI/Icons/Time of Day.png b/Assets/Editor/UI/Icons/Time of Day.png
similarity index 100%
rename from Editor/UI/Icons/Time of Day.png
rename to Assets/Editor/UI/Icons/Time of Day.png
diff --git a/Editor/UI/Icons/Top.png b/Assets/Editor/UI/Icons/Top.png
similarity index 100%
rename from Editor/UI/Icons/Top.png
rename to Assets/Editor/UI/Icons/Top.png
diff --git a/Editor/UI/Icons/Track View.png b/Assets/Editor/UI/Icons/Track View.png
similarity index 100%
rename from Editor/UI/Icons/Track View.png
rename to Assets/Editor/UI/Icons/Track View.png
diff --git a/Editor/UI/Icons/UI Emulator.png b/Assets/Editor/UI/Icons/UI Emulator.png
similarity index 100%
rename from Editor/UI/Icons/UI Emulator.png
rename to Assets/Editor/UI/Icons/UI Emulator.png
diff --git a/Editor/UI/Icons/Undo.png b/Assets/Editor/UI/Icons/Undo.png
similarity index 100%
rename from Editor/UI/Icons/Undo.png
rename to Assets/Editor/UI/Icons/Undo.png
diff --git a/Editor/UI/Icons/Unfreeze.png b/Assets/Editor/UI/Icons/Unfreeze.png
similarity index 100%
rename from Editor/UI/Icons/Unfreeze.png
rename to Assets/Editor/UI/Icons/Unfreeze.png
diff --git a/Editor/UI/Icons/Ungroup.png b/Assets/Editor/UI/Icons/Ungroup.png
similarity index 100%
rename from Editor/UI/Icons/Ungroup.png
rename to Assets/Editor/UI/Icons/Ungroup.png
diff --git a/Editor/UI/Icons/UnhideAll.png b/Assets/Editor/UI/Icons/UnhideAll.png
similarity index 100%
rename from Editor/UI/Icons/UnhideAll.png
rename to Assets/Editor/UI/Icons/UnhideAll.png
diff --git a/Editor/UI/Icons/UnhideAll_32.png b/Assets/Editor/UI/Icons/UnhideAll_32.png
similarity index 100%
rename from Editor/UI/Icons/UnhideAll_32.png
rename to Assets/Editor/UI/Icons/UnhideAll_32.png
diff --git a/Editor/UI/Icons/Unlink.png b/Assets/Editor/UI/Icons/Unlink.png
similarity index 100%
rename from Editor/UI/Icons/Unlink.png
rename to Assets/Editor/UI/Icons/Unlink.png
diff --git a/Editor/UI/Icons/UploadFilesToConsole.png b/Assets/Editor/UI/Icons/UploadFilesToConsole.png
similarity index 100%
rename from Editor/UI/Icons/UploadFilesToConsole.png
rename to Assets/Editor/UI/Icons/UploadFilesToConsole.png
diff --git a/Editor/UI/Icons/Vehicle Editor.png b/Assets/Editor/UI/Icons/Vehicle Editor.png
similarity index 100%
rename from Editor/UI/Icons/Vehicle Editor.png
rename to Assets/Editor/UI/Icons/Vehicle Editor.png
diff --git a/Editor/UI/Icons/VertexSnapping.png b/Assets/Editor/UI/Icons/VertexSnapping.png
similarity index 100%
rename from Editor/UI/Icons/VertexSnapping.png
rename to Assets/Editor/UI/Icons/VertexSnapping.png
diff --git a/Editor/UI/Icons/Visual Log Viewer.png b/Assets/Editor/UI/Icons/Visual Log Viewer.png
similarity index 100%
rename from Editor/UI/Icons/Visual Log Viewer.png
rename to Assets/Editor/UI/Icons/Visual Log Viewer.png
diff --git a/Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png b/Assets/Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png
similarity index 100%
rename from Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png
rename to Assets/Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png
diff --git a/Editor/UI/Icons/VisualBudgetSystemShow.png b/Assets/Editor/UI/Icons/VisualBudgetSystemShow.png
similarity index 100%
rename from Editor/UI/Icons/VisualBudgetSystemShow.png
rename to Assets/Editor/UI/Icons/VisualBudgetSystemShow.png
diff --git a/Editor/UI/Icons/VisualizeNavigationAccessibility.png b/Assets/Editor/UI/Icons/VisualizeNavigationAccessibility.png
similarity index 100%
rename from Editor/UI/Icons/VisualizeNavigationAccessibility.png
rename to Assets/Editor/UI/Icons/VisualizeNavigationAccessibility.png
diff --git a/Editor/UI/Icons/XAxis.png b/Assets/Editor/UI/Icons/XAxis.png
similarity index 100%
rename from Editor/UI/Icons/XAxis.png
rename to Assets/Editor/UI/Icons/XAxis.png
diff --git a/Editor/UI/Icons/XYAxis.png b/Assets/Editor/UI/Icons/XYAxis.png
similarity index 100%
rename from Editor/UI/Icons/XYAxis.png
rename to Assets/Editor/UI/Icons/XYAxis.png
diff --git a/Editor/UI/Icons/YAxis.png b/Assets/Editor/UI/Icons/YAxis.png
similarity index 100%
rename from Editor/UI/Icons/YAxis.png
rename to Assets/Editor/UI/Icons/YAxis.png
diff --git a/Editor/UI/Icons/Z View.png b/Assets/Editor/UI/Icons/Z View.png
similarity index 100%
rename from Editor/UI/Icons/Z View.png
rename to Assets/Editor/UI/Icons/Z View.png
diff --git a/Editor/UI/Icons/ZAxis.png b/Assets/Editor/UI/Icons/ZAxis.png
similarity index 100%
rename from Editor/UI/Icons/ZAxis.png
rename to Assets/Editor/UI/Icons/ZAxis.png
diff --git a/Editor/UI/Icons/asset_animated_geom.png b/Assets/Editor/UI/Icons/asset_animated_geom.png
similarity index 100%
rename from Editor/UI/Icons/asset_animated_geom.png
rename to Assets/Editor/UI/Icons/asset_animated_geom.png
diff --git a/Editor/UI/Icons/asset_character.png b/Assets/Editor/UI/Icons/asset_character.png
similarity index 100%
rename from Editor/UI/Icons/asset_character.png
rename to Assets/Editor/UI/Icons/asset_character.png
diff --git a/Editor/UI/Icons/asset_material.png b/Assets/Editor/UI/Icons/asset_material.png
similarity index 100%
rename from Editor/UI/Icons/asset_material.png
rename to Assets/Editor/UI/Icons/asset_material.png
diff --git a/Editor/UI/Icons/asset_missing_thumb.png b/Assets/Editor/UI/Icons/asset_missing_thumb.png
similarity index 100%
rename from Editor/UI/Icons/asset_missing_thumb.png
rename to Assets/Editor/UI/Icons/asset_missing_thumb.png
diff --git a/Editor/UI/Icons/asset_model.png b/Assets/Editor/UI/Icons/asset_model.png
similarity index 100%
rename from Editor/UI/Icons/asset_model.png
rename to Assets/Editor/UI/Icons/asset_model.png
diff --git a/Editor/UI/Icons/asset_sound.png b/Assets/Editor/UI/Icons/asset_sound.png
similarity index 100%
rename from Editor/UI/Icons/asset_sound.png
rename to Assets/Editor/UI/Icons/asset_sound.png
diff --git a/Editor/UI/Icons/asset_texture.png b/Assets/Editor/UI/Icons/asset_texture.png
similarity index 100%
rename from Editor/UI/Icons/asset_texture.png
rename to Assets/Editor/UI/Icons/asset_texture.png
diff --git a/Editor/UI/Icons/mann_clip.png b/Assets/Editor/UI/Icons/mann_clip.png
similarity index 100%
rename from Editor/UI/Icons/mann_clip.png
rename to Assets/Editor/UI/Icons/mann_clip.png
diff --git a/Editor/UI/Icons/mann_folder.png b/Assets/Editor/UI/Icons/mann_folder.png
similarity index 100%
rename from Editor/UI/Icons/mann_folder.png
rename to Assets/Editor/UI/Icons/mann_folder.png
diff --git a/Editor/UI/Icons/mann_tag.png b/Assets/Editor/UI/Icons/mann_tag.png
similarity index 100%
rename from Editor/UI/Icons/mann_tag.png
rename to Assets/Editor/UI/Icons/mann_tag.png
diff --git a/Editor/UI/Icons/toolbar/Load_Icon.png b/Assets/Editor/UI/Icons/toolbar/Load_Icon.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/Load_Icon.png
rename to Assets/Editor/UI/Icons/toolbar/Load_Icon.png
diff --git a/Editor/UI/Icons/toolbar/itemAdd.png b/Assets/Editor/UI/Icons/toolbar/itemAdd.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemAdd.png
rename to Assets/Editor/UI/Icons/toolbar/itemAdd.png
diff --git a/Editor/UI/Icons/toolbar/itemAssign.png b/Assets/Editor/UI/Icons/toolbar/itemAssign.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemAssign.png
rename to Assets/Editor/UI/Icons/toolbar/itemAssign.png
diff --git a/Editor/UI/Icons/toolbar/itemClone.png b/Assets/Editor/UI/Icons/toolbar/itemClone.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemClone.png
rename to Assets/Editor/UI/Icons/toolbar/itemClone.png
diff --git a/Editor/UI/Icons/toolbar/itemGetProperties.png b/Assets/Editor/UI/Icons/toolbar/itemGetProperties.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemGetProperties.png
rename to Assets/Editor/UI/Icons/toolbar/itemGetProperties.png
diff --git a/Editor/UI/Icons/toolbar/itemReload.png b/Assets/Editor/UI/Icons/toolbar/itemReload.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemReload.png
rename to Assets/Editor/UI/Icons/toolbar/itemReload.png
diff --git a/Editor/UI/Icons/toolbar/itemRemove.png b/Assets/Editor/UI/Icons/toolbar/itemRemove.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemRemove.png
rename to Assets/Editor/UI/Icons/toolbar/itemRemove.png
diff --git a/Editor/UI/Icons/toolbar/libraryAdd.png b/Assets/Editor/UI/Icons/toolbar/libraryAdd.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryAdd.png
rename to Assets/Editor/UI/Icons/toolbar/libraryAdd.png
diff --git a/Editor/UI/Icons/toolbar/libraryLoad.png b/Assets/Editor/UI/Icons/toolbar/libraryLoad.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryLoad.png
rename to Assets/Editor/UI/Icons/toolbar/libraryLoad.png
diff --git a/Editor/UI/Icons/toolbar/libraryReload.png b/Assets/Editor/UI/Icons/toolbar/libraryReload.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryReload.png
rename to Assets/Editor/UI/Icons/toolbar/libraryReload.png
diff --git a/Editor/UI/Icons/toolbar/libraryRemove.png b/Assets/Editor/UI/Icons/toolbar/libraryRemove.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryRemove.png
rename to Assets/Editor/UI/Icons/toolbar/libraryRemove.png
diff --git a/Editor/UI/Icons/toolbar/librarySave.png b/Assets/Editor/UI/Icons/toolbar/librarySave.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/librarySave.png
rename to Assets/Editor/UI/Icons/toolbar/librarySave.png
diff --git a/Editor/UI/Icons/toolbar/particleSpecialActivate.png b/Assets/Editor/UI/Icons/toolbar/particleSpecialActivate.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/particleSpecialActivate.png
rename to Assets/Editor/UI/Icons/toolbar/particleSpecialActivate.png
diff --git a/Editor/UI/Icons/toolbar/particleSpecialReset.png b/Assets/Editor/UI/Icons/toolbar/particleSpecialReset.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/particleSpecialReset.png
rename to Assets/Editor/UI/Icons/toolbar/particleSpecialReset.png
diff --git a/Editor/UI/Icons/toolbar/standardCopy.png b/Assets/Editor/UI/Icons/toolbar/standardCopy.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardCopy.png
rename to Assets/Editor/UI/Icons/toolbar/standardCopy.png
diff --git a/Editor/UI/Icons/toolbar/standardPaste.png b/Assets/Editor/UI/Icons/toolbar/standardPaste.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardPaste.png
rename to Assets/Editor/UI/Icons/toolbar/standardPaste.png
diff --git a/Editor/UI/Icons/toolbar/standardRedo.png b/Assets/Editor/UI/Icons/toolbar/standardRedo.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardRedo.png
rename to Assets/Editor/UI/Icons/toolbar/standardRedo.png
diff --git a/Editor/UI/Icons/toolbar/standardUndo.png b/Assets/Editor/UI/Icons/toolbar/standardUndo.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardUndo.png
rename to Assets/Editor/UI/Icons/toolbar/standardUndo.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/group_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/group_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/group_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/group_icon.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png
diff --git a/Editor/UI/Icons/treeview/group.png b/Assets/Editor/UI/Icons/treeview/group.png
similarity index 100%
rename from Editor/UI/Icons/treeview/group.png
rename to Assets/Editor/UI/Icons/treeview/group.png
diff --git a/Editor/UI/Icons/treeview/group_inactive.png b/Assets/Editor/UI/Icons/treeview/group_inactive.png
similarity index 100%
rename from Editor/UI/Icons/treeview/group_inactive.png
rename to Assets/Editor/UI/Icons/treeview/group_inactive.png
diff --git a/Editor/UI/Icons/treeview/item.png b/Assets/Editor/UI/Icons/treeview/item.png
similarity index 100%
rename from Editor/UI/Icons/treeview/item.png
rename to Assets/Editor/UI/Icons/treeview/item.png
diff --git a/Editor/UI/Icons/treeview/item_inactive.png b/Assets/Editor/UI/Icons/treeview/item_inactive.png
similarity index 100%
rename from Editor/UI/Icons/treeview/item_inactive.png
rename to Assets/Editor/UI/Icons/treeview/item_inactive.png
diff --git a/Editor/UI/WipFeatures.xml b/Assets/Editor/UI/WipFeatures.xml
similarity index 100%
rename from Editor/UI/WipFeatures.xml
rename to Assets/Editor/UI/WipFeatures.xml
diff --git a/Editor/UI/releaseTranslations.py b/Assets/Editor/UI/releaseTranslations.py
similarity index 100%
rename from Editor/UI/releaseTranslations.py
rename to Assets/Editor/UI/releaseTranslations.py
diff --git a/Editor/UI/removeTranslationFiles.py b/Assets/Editor/UI/removeTranslationFiles.py
similarity index 100%
rename from Editor/UI/removeTranslationFiles.py
rename to Assets/Editor/UI/removeTranslationFiles.py
diff --git a/Editor/UI/updateTranslatableText.py b/Assets/Editor/UI/updateTranslatableText.py
similarity index 100%
rename from Editor/UI/updateTranslatableText.py
rename to Assets/Editor/UI/updateTranslatableText.py
diff --git a/Editor/UserTools.xml b/Assets/Editor/UserTools.xml
similarity index 100%
rename from Editor/UserTools.xml
rename to Assets/Editor/UserTools.xml
diff --git a/Editor/asset_thumbnail.tod b/Assets/Editor/asset_thumbnail.tod
similarity index 100%
rename from Editor/asset_thumbnail.tod
rename to Assets/Editor/asset_thumbnail.tod
diff --git a/Editor/default_time_of_day.xml b/Assets/Editor/default_time_of_day.xml
similarity index 100%
rename from Editor/default_time_of_day.xml
rename to Assets/Editor/default_time_of_day.xml
diff --git a/Editor/uiCanvasEditorResolutionPresets.xml b/Assets/Editor/uiCanvasEditorResolutionPresets.xml
similarity index 100%
rename from Editor/uiCanvasEditorResolutionPresets.xml
rename to Assets/Editor/uiCanvasEditorResolutionPresets.xml
diff --git a/Engine/Config/AutoTestChain.cfg b/Assets/Engine/Config/AutoTestChain.cfg
similarity index 100%
rename from Engine/Config/AutoTestChain.cfg
rename to Assets/Engine/Config/AutoTestChain.cfg
diff --git a/Engine/Config/AutoTestTimeDemo.cfg b/Assets/Engine/Config/AutoTestTimeDemo.cfg
similarity index 100%
rename from Engine/Config/AutoTestTimeDemo.cfg
rename to Assets/Engine/Config/AutoTestTimeDemo.cfg
diff --git a/Engine/Config/AutotestPlaythrough.cfg b/Assets/Engine/Config/AutotestPlaythrough.cfg
similarity index 100%
rename from Engine/Config/AutotestPlaythrough.cfg
rename to Assets/Engine/Config/AutotestPlaythrough.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Full.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Full.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Particles.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Particles.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Physics.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Physics.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Quality.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Quality.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Shading.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Shading.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Shadows.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Shadows.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Sound.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Sound.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Texture.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Texture.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Water.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Water.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg
diff --git a/Engine/Config/HDD_cache.xml b/Assets/Engine/Config/HDD_cache.xml
similarity index 100%
rename from Engine/Config/HDD_cache.xml
rename to Assets/Engine/Config/HDD_cache.xml
diff --git a/Engine/Config/PerfHud_PC.xml b/Assets/Engine/Config/PerfHud_PC.xml
similarity index 100%
rename from Engine/Config/PerfHud_PC.xml
rename to Assets/Engine/Config/PerfHud_PC.xml
diff --git a/Engine/Config/aidebug.cfg b/Assets/Engine/Config/aidebug.cfg
similarity index 100%
rename from Engine/Config/aidebug.cfg
rename to Assets/Engine/Config/aidebug.cfg
diff --git a/Engine/Config/artprof.cfg b/Assets/Engine/Config/artprof.cfg
similarity index 100%
rename from Engine/Config/artprof.cfg
rename to Assets/Engine/Config/artprof.cfg
diff --git a/Engine/Config/artprof_user.cfg b/Assets/Engine/Config/artprof_user.cfg
similarity index 100%
rename from Engine/Config/artprof_user.cfg
rename to Assets/Engine/Config/artprof_user.cfg
diff --git a/Engine/Config/benchmark_cpu.cfg b/Assets/Engine/Config/benchmark_cpu.cfg
similarity index 100%
rename from Engine/Config/benchmark_cpu.cfg
rename to Assets/Engine/Config/benchmark_cpu.cfg
diff --git a/Engine/Config/benchmark_gpu.cfg b/Assets/Engine/Config/benchmark_gpu.cfg
similarity index 100%
rename from Engine/Config/benchmark_gpu.cfg
rename to Assets/Engine/Config/benchmark_gpu.cfg
diff --git a/Engine/Config/config.dat b/Assets/Engine/Config/config.dat
similarity index 100%
rename from Engine/Config/config.dat
rename to Assets/Engine/Config/config.dat
diff --git a/Engine/Config/engine_core.thread_config b/Assets/Engine/Config/engine_core.thread_config
similarity index 100%
rename from Engine/Config/engine_core.thread_config
rename to Assets/Engine/Config/engine_core.thread_config
diff --git a/Engine/Config/engine_sandbox.thread_config b/Assets/Engine/Config/engine_sandbox.thread_config
similarity index 100%
rename from Engine/Config/engine_sandbox.thread_config
rename to Assets/Engine/Config/engine_sandbox.thread_config
diff --git a/Engine/Config/gpu/amd.txt b/Assets/Engine/Config/gpu/amd.txt
similarity index 100%
rename from Engine/Config/gpu/amd.txt
rename to Assets/Engine/Config/gpu/amd.txt
diff --git a/Engine/Config/gpu/android_gpus.xml b/Assets/Engine/Config/gpu/android_gpus.xml
similarity index 100%
rename from Engine/Config/gpu/android_gpus.xml
rename to Assets/Engine/Config/gpu/android_gpus.xml
diff --git a/Engine/Config/gpu/android_models.xml b/Assets/Engine/Config/gpu/android_models.xml
similarity index 100%
rename from Engine/Config/gpu/android_models.xml
rename to Assets/Engine/Config/gpu/android_models.xml
diff --git a/Engine/Config/gpu/intel.txt b/Assets/Engine/Config/gpu/intel.txt
similarity index 100%
rename from Engine/Config/gpu/intel.txt
rename to Assets/Engine/Config/gpu/intel.txt
diff --git a/Engine/Config/gpu/ios_models.xml b/Assets/Engine/Config/gpu/ios_models.xml
similarity index 100%
rename from Engine/Config/gpu/ios_models.xml
rename to Assets/Engine/Config/gpu/ios_models.xml
diff --git a/Engine/Config/gpu/nvidia.txt b/Assets/Engine/Config/gpu/nvidia.txt
similarity index 100%
rename from Engine/Config/gpu/nvidia.txt
rename to Assets/Engine/Config/gpu/nvidia.txt
diff --git a/Engine/Config/mgpu.cfg b/Assets/Engine/Config/mgpu.cfg
similarity index 100%
rename from Engine/Config/mgpu.cfg
rename to Assets/Engine/Config/mgpu.cfg
diff --git a/Engine/Config/multiplayer.cfg b/Assets/Engine/Config/multiplayer.cfg
similarity index 100%
rename from Engine/Config/multiplayer.cfg
rename to Assets/Engine/Config/multiplayer.cfg
diff --git a/Engine/Config/multiplayer_console.cfg b/Assets/Engine/Config/multiplayer_console.cfg
similarity index 100%
rename from Engine/Config/multiplayer_console.cfg
rename to Assets/Engine/Config/multiplayer_console.cfg
diff --git a/Engine/Config/multiplayer_pc.cfg b/Assets/Engine/Config/multiplayer_pc.cfg
similarity index 100%
rename from Engine/Config/multiplayer_pc.cfg
rename to Assets/Engine/Config/multiplayer_pc.cfg
diff --git a/Engine/Config/performance.cfg b/Assets/Engine/Config/performance.cfg
similarity index 100%
rename from Engine/Config/performance.cfg
rename to Assets/Engine/Config/performance.cfg
diff --git a/Engine/Config/recording.cfg b/Assets/Engine/Config/recording.cfg
similarity index 100%
rename from Engine/Config/recording.cfg
rename to Assets/Engine/Config/recording.cfg
diff --git a/Engine/Config/singleplayer.cfg b/Assets/Engine/Config/singleplayer.cfg
similarity index 100%
rename from Engine/Config/singleplayer.cfg
rename to Assets/Engine/Config/singleplayer.cfg
diff --git a/Engine/Config/sketch_off.cfg b/Assets/Engine/Config/sketch_off.cfg
similarity index 100%
rename from Engine/Config/sketch_off.cfg
rename to Assets/Engine/Config/sketch_off.cfg
diff --git a/Engine/Config/sketch_on.cfg b/Assets/Engine/Config/sketch_on.cfg
similarity index 100%
rename from Engine/Config/sketch_on.cfg
rename to Assets/Engine/Config/sketch_on.cfg
diff --git a/Engine/Config/spec/android_MaliT760.cfg b/Assets/Engine/Config/spec/android_MaliT760.cfg
similarity index 100%
rename from Engine/Config/spec/android_MaliT760.cfg
rename to Assets/Engine/Config/spec/android_MaliT760.cfg
diff --git a/Engine/Config/spec/android_high.cfg b/Assets/Engine/Config/spec/android_high.cfg
similarity index 100%
rename from Engine/Config/spec/android_high.cfg
rename to Assets/Engine/Config/spec/android_high.cfg
diff --git a/Engine/Config/spec/android_high_nogmem.cfg b/Assets/Engine/Config/spec/android_high_nogmem.cfg
similarity index 100%
rename from Engine/Config/spec/android_high_nogmem.cfg
rename to Assets/Engine/Config/spec/android_high_nogmem.cfg
diff --git a/Engine/Config/spec/android_low.cfg b/Assets/Engine/Config/spec/android_low.cfg
similarity index 100%
rename from Engine/Config/spec/android_low.cfg
rename to Assets/Engine/Config/spec/android_low.cfg
diff --git a/Engine/Config/spec/android_medium.cfg b/Assets/Engine/Config/spec/android_medium.cfg
similarity index 100%
rename from Engine/Config/spec/android_medium.cfg
rename to Assets/Engine/Config/spec/android_medium.cfg
diff --git a/Engine/Config/spec/android_veryhigh.cfg b/Assets/Engine/Config/spec/android_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/android_veryhigh.cfg
rename to Assets/Engine/Config/spec/android_veryhigh.cfg
diff --git a/Engine/Config/spec/ios_high.cfg b/Assets/Engine/Config/spec/ios_high.cfg
similarity index 100%
rename from Engine/Config/spec/ios_high.cfg
rename to Assets/Engine/Config/spec/ios_high.cfg
diff --git a/Engine/Config/spec/ios_low.cfg b/Assets/Engine/Config/spec/ios_low.cfg
similarity index 100%
rename from Engine/Config/spec/ios_low.cfg
rename to Assets/Engine/Config/spec/ios_low.cfg
diff --git a/Engine/Config/spec/ios_medium.cfg b/Assets/Engine/Config/spec/ios_medium.cfg
similarity index 100%
rename from Engine/Config/spec/ios_medium.cfg
rename to Assets/Engine/Config/spec/ios_medium.cfg
diff --git a/Engine/Config/spec/ios_veryhigh.cfg b/Assets/Engine/Config/spec/ios_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/ios_veryhigh.cfg
rename to Assets/Engine/Config/spec/ios_veryhigh.cfg
diff --git a/Engine/Config/spec/osx_metal_high.cfg b/Assets/Engine/Config/spec/osx_metal_high.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_high.cfg
rename to Assets/Engine/Config/spec/osx_metal_high.cfg
diff --git a/Engine/Config/spec/osx_metal_low.cfg b/Assets/Engine/Config/spec/osx_metal_low.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_low.cfg
rename to Assets/Engine/Config/spec/osx_metal_low.cfg
diff --git a/Engine/Config/spec/osx_metal_medium.cfg b/Assets/Engine/Config/spec/osx_metal_medium.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_medium.cfg
rename to Assets/Engine/Config/spec/osx_metal_medium.cfg
diff --git a/Engine/Config/spec/osx_metal_veryhigh.cfg b/Assets/Engine/Config/spec/osx_metal_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_veryhigh.cfg
rename to Assets/Engine/Config/spec/osx_metal_veryhigh.cfg
diff --git a/Engine/Config/spec/pc_high.cfg b/Assets/Engine/Config/spec/pc_high.cfg
similarity index 100%
rename from Engine/Config/spec/pc_high.cfg
rename to Assets/Engine/Config/spec/pc_high.cfg
diff --git a/Engine/Config/spec/pc_low.cfg b/Assets/Engine/Config/spec/pc_low.cfg
similarity index 100%
rename from Engine/Config/spec/pc_low.cfg
rename to Assets/Engine/Config/spec/pc_low.cfg
diff --git a/Engine/Config/spec/pc_medium.cfg b/Assets/Engine/Config/spec/pc_medium.cfg
similarity index 100%
rename from Engine/Config/spec/pc_medium.cfg
rename to Assets/Engine/Config/spec/pc_medium.cfg
diff --git a/Engine/Config/spec/pc_veryhigh.cfg b/Assets/Engine/Config/spec/pc_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/pc_veryhigh.cfg
rename to Assets/Engine/Config/spec/pc_veryhigh.cfg
diff --git a/Engine/Config/statoscope.cfg b/Assets/Engine/Config/statoscope.cfg
similarity index 100%
rename from Engine/Config/statoscope.cfg
rename to Assets/Engine/Config/statoscope.cfg
diff --git a/Engine/Config/user.cfg b/Assets/Engine/Config/user.cfg
similarity index 100%
rename from Engine/Config/user.cfg
rename to Assets/Engine/Config/user.cfg
diff --git a/Engine/Config/vid_capture_reset.cfg b/Assets/Engine/Config/vid_capture_reset.cfg
similarity index 100%
rename from Engine/Config/vid_capture_reset.cfg
rename to Assets/Engine/Config/vid_capture_reset.cfg
diff --git a/Engine/Config/vid_capture_setup.cfg b/Assets/Engine/Config/vid_capture_setup.cfg
similarity index 100%
rename from Engine/Config/vid_capture_setup.cfg
rename to Assets/Engine/Config/vid_capture_setup.cfg
diff --git a/Engine/Config/vid_capture_start.cfg b/Assets/Engine/Config/vid_capture_start.cfg
similarity index 100%
rename from Engine/Config/vid_capture_start.cfg
rename to Assets/Engine/Config/vid_capture_start.cfg
diff --git a/Engine/Config/vid_capture_stop.cfg b/Assets/Engine/Config/vid_capture_stop.cfg
similarity index 100%
rename from Engine/Config/vid_capture_stop.cfg
rename to Assets/Engine/Config/vid_capture_stop.cfg
diff --git a/Engine/Config/vr.cfg b/Assets/Engine/Config/vr.cfg
similarity index 100%
rename from Engine/Config/vr.cfg
rename to Assets/Engine/Config/vr.cfg
diff --git a/Engine/EngineAssets/Animated/WaterVolume.dds b/Assets/Engine/EngineAssets/Animated/WaterVolume.dds
similarity index 100%
rename from Engine/EngineAssets/Animated/WaterVolume.dds
rename to Assets/Engine/EngineAssets/Animated/WaterVolume.dds
diff --git a/Engine/EngineAssets/CodeCoverage/hit.tif b/Assets/Engine/EngineAssets/CodeCoverage/hit.tif
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/hit.tif
rename to Assets/Engine/EngineAssets/CodeCoverage/hit.tif
diff --git a/Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings b/Assets/Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings
rename to Assets/Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings
diff --git a/Engine/EngineAssets/CodeCoverage/pbar.tif b/Assets/Engine/EngineAssets/CodeCoverage/pbar.tif
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/pbar.tif
rename to Assets/Engine/EngineAssets/CodeCoverage/pbar.tif
diff --git a/Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings b/Assets/Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings
rename to Assets/Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings
diff --git a/Engine/EngineAssets/CodeCoverage/unexpected.tif b/Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/unexpected.tif
rename to Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif
diff --git a/Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings b/Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings
rename to Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings
diff --git a/Engine/EngineAssets/GeomCaches/defaultGeomCache.abc b/Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.abc
similarity index 100%
rename from Engine/EngineAssets/GeomCaches/defaultGeomCache.abc
rename to Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.abc
diff --git a/Engine/EngineAssets/GeomCaches/defaultGeomCache.cbc b/Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.cbc
similarity index 100%
rename from Engine/EngineAssets/GeomCaches/defaultGeomCache.cbc
rename to Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.cbc
diff --git a/Engine/EngineAssets/GeomCaches/defaultGeomCache.ma b/Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.ma
similarity index 100%
rename from Engine/EngineAssets/GeomCaches/defaultGeomCache.ma
rename to Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.ma
diff --git a/Engine/EngineAssets/GeomCaches/defaultGeomCache.mtl b/Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.mtl
similarity index 100%
rename from Engine/EngineAssets/GeomCaches/defaultGeomCache.mtl
rename to Assets/Engine/EngineAssets/GeomCaches/defaultGeomCache.mtl
diff --git a/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF b/Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/AverageMemoryUsage.TIF
rename to Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF
diff --git a/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/HighMemoryUsage.TIF b/Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/HighMemoryUsage.TIF
rename to Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF
diff --git a/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif b/Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif
rename to Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif
diff --git a/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/LivePreview.TIF b/Assets/Engine/EngineAssets/Icons/LivePreview.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/LivePreview.TIF
rename to Assets/Engine/EngineAssets/Icons/LivePreview.TIF
diff --git a/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/LowMemoryUsage.TIF b/Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/LowMemoryUsage.TIF
rename to Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF
diff --git a/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/NavigationProcessing.tif b/Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/NavigationProcessing.tif
rename to Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif
diff --git a/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/NullSoundSystem.tif b/Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/NullSoundSystem.tif
rename to Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif
diff --git a/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/ShaderCompiling.tif b/Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/ShaderCompiling.tif
rename to Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif
diff --git a/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/Streaming.tif b/Assets/Engine/EngineAssets/Icons/Streaming.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/Streaming.tif
rename to Assets/Engine/EngineAssets/Icons/Streaming.tif
diff --git a/Engine/EngineAssets/Icons/Streaming.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/Streaming.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/Streaming.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/Streaming.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/StreamingTerrain.tif b/Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/StreamingTerrain.tif
rename to Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif
diff --git a/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings
diff --git a/Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly b/Assets/Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly
diff --git a/Engine/EngineAssets/LevelForSliceEditing/filelist.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/filelist.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/filelist.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/filelist.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/level.pak b/Assets/Engine/EngineAssets/LevelForSliceEditing/level.pak
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/level.pak
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/level.pak
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat
diff --git a/Engine/EngineAssets/LevelForSliceEditing/tags.txt b/Assets/Engine/EngineAssets/LevelForSliceEditing/tags.txt
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/tags.txt
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/tags.txt
diff --git a/Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl b/Assets/Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl b/Assets/Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanInto.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanInto.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanInto.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanInto.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanOutof.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanOutof.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanOutof.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanOutof.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl b/Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl b/Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl
diff --git a/Engine/EngineAssets/Materials/PhysProxyTooBig.mtl b/Assets/Engine/EngineAssets/Materials/PhysProxyTooBig.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/PhysProxyTooBig.mtl
rename to Assets/Engine/EngineAssets/Materials/PhysProxyTooBig.mtl
diff --git a/Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl b/Assets/Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl
rename to Assets/Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl
diff --git a/Engine/EngineAssets/Materials/Water/ocean_default.mtl b/Assets/Engine/EngineAssets/Materials/Water/ocean_default.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Water/ocean_default.mtl
rename to Assets/Engine/EngineAssets/Materials/Water/ocean_default.mtl
diff --git a/Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl b/Assets/Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl
rename to Assets/Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl
diff --git a/Engine/EngineAssets/Materials/decals/default.mtl b/Assets/Engine/EngineAssets/Materials/decals/default.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/decals/default.mtl
rename to Assets/Engine/EngineAssets/Materials/decals/default.mtl
diff --git a/Engine/EngineAssets/Materials/lens_optics.mtl b/Assets/Engine/EngineAssets/Materials/lens_optics.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/lens_optics.mtl
rename to Assets/Engine/EngineAssets/Materials/lens_optics.mtl
diff --git a/Engine/EngineAssets/Materials/sky/sky.mtl b/Assets/Engine/EngineAssets/Materials/sky/sky.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/sky/sky.mtl
rename to Assets/Engine/EngineAssets/Materials/sky/sky.mtl
diff --git a/Engine/EngineAssets/Materials/test/Holotest/hologram.mtl b/Assets/Engine/EngineAssets/Materials/test/Holotest/hologram.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/hologram.mtl
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/hologram.mtl
diff --git a/Engine/EngineAssets/Materials/test/Holotest/test2.tif b/Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/test2.tif
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif
diff --git a/Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings b/Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tews1.tif b/Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tews1.tif
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings b/Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tile1.cgf b/Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.cgf
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tile1.cgf
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.cgf
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tile1.max b/Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.max
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tile1.max
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.max
diff --git a/Engine/EngineAssets/Materials/test/chromium.mtl b/Assets/Engine/EngineAssets/Materials/test/chromium.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/chromium.mtl
rename to Assets/Engine/EngineAssets/Materials/test/chromium.mtl
diff --git a/Engine/EngineAssets/Materials/test/glass2.mtl b/Assets/Engine/EngineAssets/Materials/test/glass2.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/glass2.mtl
rename to Assets/Engine/EngineAssets/Materials/test/glass2.mtl
diff --git a/Engine/EngineAssets/Materials/test/hologram.mtl b/Assets/Engine/EngineAssets/Materials/test/hologram.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/hologram.mtl
rename to Assets/Engine/EngineAssets/Materials/test/hologram.mtl
diff --git a/Engine/EngineAssets/Materials/test/lightbeam.mtl b/Assets/Engine/EngineAssets/Materials/test/lightbeam.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lightbeam.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lightbeam.mtl
diff --git a/Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl b/Assets/Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl
diff --git a/Engine/EngineAssets/Materials/test/lighthouseBeam.mtl b/Assets/Engine/EngineAssets/Materials/test/lighthouseBeam.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lighthouseBeam.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lighthouseBeam.mtl
diff --git a/Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl b/Assets/Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl
diff --git a/Engine/EngineAssets/Materials/test/nodraw.mtl b/Assets/Engine/EngineAssets/Materials/test/nodraw.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/nodraw.mtl
rename to Assets/Engine/EngineAssets/Materials/test/nodraw.mtl
diff --git a/Engine/EngineAssets/Materials/test/sky.mtl b/Assets/Engine/EngineAssets/Materials/test/sky.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/sky.mtl
rename to Assets/Engine/EngineAssets/Materials/test/sky.mtl
diff --git a/Engine/EngineAssets/Materials/test/skyHDR.mtl b/Assets/Engine/EngineAssets/Materials/test/skyHDR.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/skyHDR.mtl
rename to Assets/Engine/EngineAssets/Materials/test/skyHDR.mtl
diff --git a/Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif b/Assets/Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif
rename to Assets/Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif
diff --git a/Engine/EngineAssets/Materials/test/textures/templeBeam.tif b/Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/textures/templeBeam.tif
rename to Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif
diff --git a/Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings b/Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings
rename to Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings
diff --git a/Engine/EngineAssets/Materials/test/volumeObject.mtl b/Assets/Engine/EngineAssets/Materials/test/volumeObject.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/volumeObject.mtl
rename to Assets/Engine/EngineAssets/Materials/test/volumeObject.mtl
diff --git a/Engine/EngineAssets/Materials/test/volumeObject2.mtl b/Assets/Engine/EngineAssets/Materials/test/volumeObject2.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/volumeObject2.mtl
rename to Assets/Engine/EngineAssets/Materials/test/volumeObject2.mtl
diff --git a/Engine/EngineAssets/Objects/Default.cgf b/Assets/Engine/EngineAssets/Objects/Default.cgf
similarity index 100%
rename from Engine/EngineAssets/Objects/Default.cgf
rename to Assets/Engine/EngineAssets/Objects/Default.cgf
diff --git a/Engine/EngineAssets/Objects/helper.mtl b/Assets/Engine/EngineAssets/Objects/helper.mtl
similarity index 100%
rename from Engine/EngineAssets/Objects/helper.mtl
rename to Assets/Engine/EngineAssets/Objects/helper.mtl
diff --git a/Engine/EngineAssets/Production/MidGray.tif b/Assets/Engine/EngineAssets/Production/MidGray.tif
similarity index 100%
rename from Engine/EngineAssets/Production/MidGray.tif
rename to Assets/Engine/EngineAssets/Production/MidGray.tif
diff --git a/Engine/EngineAssets/Production/MidGray.tif.exportsettings b/Assets/Engine/EngineAssets/Production/MidGray.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Production/MidGray.tif.exportsettings
rename to Assets/Engine/EngineAssets/Production/MidGray.tif.exportsettings
diff --git a/Engine/EngineAssets/Production/TangentReference_ddn.tif b/Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Production/TangentReference_ddn.tif
rename to Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif
diff --git a/Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Production/UV.tif b/Assets/Engine/EngineAssets/Production/UV.tif
similarity index 100%
rename from Engine/EngineAssets/Production/UV.tif
rename to Assets/Engine/EngineAssets/Production/UV.tif
diff --git a/Engine/EngineAssets/Production/UV.tif.exportsettings b/Assets/Engine/EngineAssets/Production/UV.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Production/UV.tif.exportsettings
rename to Assets/Engine/EngineAssets/Production/UV.tif.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/AreaTex.dds b/Assets/Engine/EngineAssets/ScreenSpace/AreaTex.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/AreaTex.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/AreaTex.dds
diff --git a/Engine/EngineAssets/ScreenSpace/NormalsFitting.dds b/Assets/Engine/EngineAssets/ScreenSpace/NormalsFitting.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/NormalsFitting.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/NormalsFitting.dds
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/SearchTex.dds b/Assets/Engine/EngineAssets/ScreenSpace/SearchTex.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/SearchTex.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/SearchTex.dds
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_love.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_music.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_square.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_star.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/film_grain.dds b/Assets/Engine/EngineAssets/ScreenSpace/film_grain.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/film_grain.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/film_grain.dds
diff --git a/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif b/Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif
rename to Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif
diff --git a/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/SonarVisionGradient.TIF b/Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/SonarVisionGradient.TIF
rename to Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF
diff --git a/Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient.tif b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient.tif
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/WaterFoam.TIF b/Assets/Engine/EngineAssets/Shading/WaterFoam.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/WaterFoam.TIF
rename to Assets/Engine/EngineAssets/Shading/WaterFoam.TIF
diff --git a/Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds b/Assets/Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds
similarity index 100%
rename from Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds
rename to Assets/Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds
diff --git a/Engine/EngineAssets/Shading/defaultProbe_cm.tif b/Assets/Engine/EngineAssets/Shading/defaultProbe_cm.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/defaultProbe_cm.tif
rename to Assets/Engine/EngineAssets/Shading/defaultProbe_cm.tif
diff --git a/Engine/EngineAssets/Shading/environmentBRDF.tif b/Assets/Engine/EngineAssets/Shading/environmentBRDF.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/environmentBRDF.tif
rename to Assets/Engine/EngineAssets/Shading/environmentBRDF.tif
diff --git a/Engine/EngineAssets/Shading/generic_reflections.tif b/Assets/Engine/EngineAssets/Shading/generic_reflections.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/generic_reflections.tif
rename to Assets/Engine/EngineAssets/Shading/generic_reflections.tif
diff --git a/Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings b/Assets/Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings
rename to Assets/Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/layer_effect_anim_function.tif b/Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/layer_effect_anim_function.tif
rename to Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif
diff --git a/Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings b/Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings
rename to Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/nanosuit_mask.TIF b/Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_mask.TIF
rename to Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF
diff --git a/Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF b/Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF
rename to Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF
diff --git a/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/vignetting.TIF b/Assets/Engine/EngineAssets/Shading/vignetting.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/vignetting.TIF
rename to Assets/Engine/EngineAssets/Shading/vignetting.TIF
diff --git a/Engine/EngineAssets/Shading/vignetting.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/vignetting.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/vignetting.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/vignetting.TIF.exportsettings
diff --git a/Engine/EngineAssets/Sky/optical.lut b/Assets/Engine/EngineAssets/Sky/optical.lut
similarity index 100%
rename from Engine/EngineAssets/Sky/optical.lut
rename to Assets/Engine/EngineAssets/Sky/optical.lut
diff --git a/Engine/EngineAssets/Sky/stars.dat b/Assets/Engine/EngineAssets/Sky/stars.dat
similarity index 100%
rename from Engine/EngineAssets/Sky/stars.dat
rename to Assets/Engine/EngineAssets/Sky/stars.dat
diff --git a/Engine/EngineAssets/Slices/DefaultLevelSetup.slice b/Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice
similarity index 100%
rename from Engine/EngineAssets/Slices/DefaultLevelSetup.slice
rename to Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids.mtl b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids.mtl
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids.mtl
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids.mtl
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound.psd b/Assets/Engine/EngineAssets/TextureMsg/NotFound.psd
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound.psd
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound.psd
diff --git a/Engine/EngineAssets/TextureMsg/NotFound.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_a.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_a.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_a.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_a.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_cm.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_cm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_cm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_cm.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_ddna.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_ddna.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_ddna.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_ddna.tif
diff --git a/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif b/Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif
rename to Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif
diff --git a/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/RCError.psd b/Assets/Engine/EngineAssets/TextureMsg/RCError.psd
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError.psd
rename to Assets/Engine/EngineAssets/TextureMsg/RCError.psd
diff --git a/Engine/EngineAssets/TextureMsg/RCError.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_a.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_a.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/RCError_cm.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_cm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_cm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_cm.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddna.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddna.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMe.tif b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMe.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif b/Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderCompiling.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif
diff --git a/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ShaderError.tif b/Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderError.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif
diff --git a/Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/color_Black.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Black.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Black.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Black.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Blue.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Blue.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Blue.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Blue.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Cyan.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Cyan.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Cyan.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Cyan.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Green.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Green.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Green.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Green.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Magenta.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Magenta.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Magenta.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Magenta.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Orange.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Orange.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Orange.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Orange.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Purple.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Purple.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Purple.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Purple.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Red.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Red.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Red.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Red.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_White.tif b/Assets/Engine/EngineAssets/TextureMsg/color_White.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_White.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_White.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Yellow.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Yellow.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Yellow.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Yellow.tif
diff --git a/Engine/EngineAssets/TextureMsg/mipmapdebug.tif b/Assets/Engine/EngineAssets/TextureMsg/mipmapdebug.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/mipmapdebug.tif
rename to Assets/Engine/EngineAssets/TextureMsg/mipmapdebug.tif
diff --git a/Engine/EngineAssets/TextureMsg/orange_for_designer.tif b/Assets/Engine/EngineAssets/TextureMsg/orange_for_designer.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/orange_for_designer.tif
rename to Assets/Engine/EngineAssets/TextureMsg/orange_for_designer.tif
diff --git a/Engine/EngineAssets/Textures/BlackAlpha.tif b/Assets/Engine/EngineAssets/Textures/BlackAlpha.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/BlackAlpha.tif
rename to Assets/Engine/EngineAssets/Textures/BlackAlpha.tif
diff --git a/Engine/EngineAssets/Textures/BlackCM.tif b/Assets/Engine/EngineAssets/Textures/BlackCM.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/BlackCM.tif
rename to Assets/Engine/EngineAssets/Textures/BlackCM.tif
diff --git a/Engine/EngineAssets/Textures/BlackCM.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/BlackCM.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/BlackCM.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/BlackCM.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif b/Assets/Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif
rename to Assets/Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif
diff --git a/Engine/EngineAssets/Textures/Cursor_Green.tif b/Assets/Engine/EngineAssets/Textures/Cursor_Green.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Cursor_Green.tif
rename to Assets/Engine/EngineAssets/Textures/Cursor_Green.tif
diff --git a/Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/FogVolShadowJitter.tif b/Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/FogVolShadowJitter.tif
rename to Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif
diff --git a/Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Frozen/frost_noise3.dds b/Assets/Engine/EngineAssets/Textures/Frozen/frost_noise3.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Frozen/frost_noise3.dds
rename to Assets/Engine/EngineAssets/Textures/Frozen/frost_noise3.dds
diff --git a/Engine/EngineAssets/Textures/Frozen/frost_noise4.tif b/Assets/Engine/EngineAssets/Textures/Frozen/frost_noise4.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Frozen/frost_noise4.tif
rename to Assets/Engine/EngineAssets/Textures/Frozen/frost_noise4.tif
diff --git a/Engine/EngineAssets/Textures/Frozen/snow_spatter.tif b/Assets/Engine/EngineAssets/Textures/Frozen/snow_spatter.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Frozen/snow_spatter.tif
rename to Assets/Engine/EngineAssets/Textures/Frozen/snow_spatter.tif
diff --git a/Engine/EngineAssets/Textures/GreyAlpha.tif b/Assets/Engine/EngineAssets/Textures/GreyAlpha.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/GreyAlpha.tif
rename to Assets/Engine/EngineAssets/Textures/GreyAlpha.tif
diff --git a/Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_interlation.dds b/Assets/Engine/EngineAssets/Textures/Palette/cloak_interlation.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_interlation.dds
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_interlation.dds
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_palette.tif b/Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_palette.tif
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_sparks.dds b/Assets/Engine/EngineAssets/Textures/Palette/cloak_sparks.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_sparks.dds
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_sparks.dds
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_transition.dds b/Assets/Engine/EngineAssets/Textures/Palette/cloak_transition.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_transition.dds
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_transition.dds
diff --git a/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif b/Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif
rename to Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif
diff --git a/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/VolumeRaster.tif b/Assets/Engine/EngineAssets/Textures/VolumeRaster.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/VolumeRaster.tif
rename to Assets/Engine/EngineAssets/Textures/VolumeRaster.tif
diff --git a/Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/alienhud_distortionimage.tif b/Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_distortionimage.tif
rename to Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif
diff --git a/Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/alienhud_noise1.tif b/Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_noise1.tif
rename to Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif
diff --git a/Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/black.tif b/Assets/Engine/EngineAssets/Textures/black.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/black.tif
rename to Assets/Engine/EngineAssets/Textures/black.tif
diff --git a/Engine/EngineAssets/Textures/black.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/black.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/black.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/black.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/caustics_sampler.dds b/Assets/Engine/EngineAssets/Textures/caustics_sampler.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/caustics_sampler.dds
rename to Assets/Engine/EngineAssets/Textures/caustics_sampler.dds
diff --git a/Engine/EngineAssets/Textures/color.tif b/Assets/Engine/EngineAssets/Textures/color.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/color.tif
rename to Assets/Engine/EngineAssets/Textures/color.tif
diff --git a/Engine/EngineAssets/Textures/default_cch.tif b/Assets/Engine/EngineAssets/Textures/default_cch.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/default_cch.tif
rename to Assets/Engine/EngineAssets/Textures/default_cch.tif
diff --git a/Engine/EngineAssets/Textures/default_cch.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/default_cch.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/default_cch.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/default_cch.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/defaults/16_12.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_12.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_12.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_12.tif
diff --git a/Engine/EngineAssets/Textures/defaults/16_34.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_34.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_34.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_34.tif
diff --git a/Engine/EngineAssets/Textures/defaults/16_5.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_5.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_5.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_5.tif
diff --git a/Engine/EngineAssets/Textures/defaults/16_grey.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_grey.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_grey.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_grey.tif
diff --git a/Engine/EngineAssets/Textures/defaults/spot_default.tif b/Assets/Engine/EngineAssets/Textures/defaults/spot_default.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/spot_default.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/spot_default.tif
diff --git a/Engine/EngineAssets/Textures/detailDecalVariation.tif b/Assets/Engine/EngineAssets/Textures/detailDecalVariation.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/detailDecalVariation.tif
rename to Assets/Engine/EngineAssets/Textures/detailDecalVariation.tif
diff --git a/Engine/EngineAssets/Textures/dither_2.dds b/Assets/Engine/EngineAssets/Textures/dither_2.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/dither_2.dds
rename to Assets/Engine/EngineAssets/Textures/dither_2.dds
diff --git a/Engine/EngineAssets/Textures/dither_pattern_2d.dds b/Assets/Engine/EngineAssets/Textures/dither_pattern_2d.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/dither_pattern_2d.dds
rename to Assets/Engine/EngineAssets/Textures/dither_pattern_2d.dds
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Glow001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Glow001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Glow001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Glow001.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Glow002.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Glow002.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Glow002.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Glow002.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Sun001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Sun001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Sun001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Sun001.tif
diff --git a/Engine/EngineAssets/Textures/flares/flare01.tif b/Assets/Engine/EngineAssets/Textures/flares/flare01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/flare01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/flare01.tif
diff --git a/Engine/EngineAssets/Textures/flares/flare02.tif b/Assets/Engine/EngineAssets/Textures/flares/flare02.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/flare02.tif
rename to Assets/Engine/EngineAssets/Textures/flares/flare02.tif
diff --git a/Engine/EngineAssets/Textures/flares/ghost_grey.tif b/Assets/Engine/EngineAssets/Textures/flares/ghost_grey.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/ghost_grey.tif
rename to Assets/Engine/EngineAssets/Textures/flares/ghost_grey.tif
diff --git a/Engine/EngineAssets/Textures/flares/ghost_multicolor.tif b/Assets/Engine/EngineAssets/Textures/flares/ghost_multicolor.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/ghost_multicolor.tif
rename to Assets/Engine/EngineAssets/Textures/flares/ghost_multicolor.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/ghost.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ghost.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/glow.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/glow.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/orbs.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/orbs.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/ring.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ring.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/test_demo.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/test_demo.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/iris_shaft.tif b/Assets/Engine/EngineAssets/Textures/flares/iris_shaft.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/iris_shaft.tif
rename to Assets/Engine/EngineAssets/Textures/flares/iris_shaft.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_blurshape.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_blurshape.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_blurshape.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_blurshape.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_noise01.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_noise01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_noise01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_noise01.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_raindrops.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_raindrops.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_raindrops.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_raindrops.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_raindrops02.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_raindrops02.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_raindrops02.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_raindrops02.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_01.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_01.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell01.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell01.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell02.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell02.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell02.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell02.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell03.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell03.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell03.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell03.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell04.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell04.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell04.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell04.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_full.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_full.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_full.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_full.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_half.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_half.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_half.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_half.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_quater.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_quater.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_quater.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_quater.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_specs.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_specs.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_specs.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_specs.tif
diff --git a/Engine/EngineAssets/Textures/flares/streak01.tif b/Assets/Engine/EngineAssets/Textures/flares/streak01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/streak01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/streak01.tif
diff --git a/Engine/EngineAssets/Textures/flares/visor_scratch.tif b/Assets/Engine/EngineAssets/Textures/flares/visor_scratch.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/visor_scratch.tif
rename to Assets/Engine/EngineAssets/Textures/flares/visor_scratch.tif
diff --git a/Engine/EngineAssets/Textures/fresnel_sampler.dds b/Assets/Engine/EngineAssets/Textures/fresnel_sampler.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/fresnel_sampler.dds
rename to Assets/Engine/EngineAssets/Textures/fresnel_sampler.dds
diff --git a/Engine/EngineAssets/Textures/fringe_map.dds b/Assets/Engine/EngineAssets/Textures/fringe_map.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/fringe_map.dds
rename to Assets/Engine/EngineAssets/Textures/fringe_map.dds
diff --git a/Engine/EngineAssets/Textures/frost_refl2.tif b/Assets/Engine/EngineAssets/Textures/frost_refl2.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/frost_refl2.tif
rename to Assets/Engine/EngineAssets/Textures/frost_refl2.tif
diff --git a/Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds b/Assets/Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds
rename to Assets/Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_diff.tif
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/grey.dds b/Assets/Engine/EngineAssets/Textures/grey.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/grey.dds
rename to Assets/Engine/EngineAssets/Textures/grey.dds
diff --git a/Engine/EngineAssets/Textures/hex.tif b/Assets/Engine/EngineAssets/Textures/hex.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex.tif
rename to Assets/Engine/EngineAssets/Textures/hex.tif
diff --git a/Engine/EngineAssets/Textures/hex.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_ddn.tif b/Assets/Engine/EngineAssets/Textures/hex_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/hex_ddn.tif
diff --git a/Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_grad.tif b/Assets/Engine/EngineAssets/Textures/hex_grad.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_grad.tif
rename to Assets/Engine/EngineAssets/Textures/hex_grad.tif
diff --git a/Engine/EngineAssets/Textures/hex_grad.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_grad.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_grad.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_grad.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_line.tif b/Assets/Engine/EngineAssets/Textures/hex_line.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_line.tif
rename to Assets/Engine/EngineAssets/Textures/hex_line.tif
diff --git a/Engine/EngineAssets/Textures/hex_line.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_line.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_line.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_line.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_rand.tif b/Assets/Engine/EngineAssets/Textures/hex_rand.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_rand.tif
rename to Assets/Engine/EngineAssets/Textures/hex_rand.tif
diff --git a/Engine/EngineAssets/Textures/hex_rand.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_rand.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_rand.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_rand.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_areas.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_areas.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_healthgradient.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_round.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_round.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_round.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_round.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_veinsblood.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/interference.dds b/Assets/Engine/EngineAssets/Textures/interference.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/interference.dds
rename to Assets/Engine/EngineAssets/Textures/interference.dds
diff --git a/Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds b/Assets/Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds
rename to Assets/Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds
diff --git a/Engine/EngineAssets/Textures/moisturedroplets.tif b/Assets/Engine/EngineAssets/Textures/moisturedroplets.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/moisturedroplets.tif
rename to Assets/Engine/EngineAssets/Textures/moisturedroplets.tif
diff --git a/Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/nightvis_grad.tif b/Assets/Engine/EngineAssets/Textures/nightvis_grad.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/nightvis_grad.tif
rename to Assets/Engine/EngineAssets/Textures/nightvis_grad.tif
diff --git a/Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/noise.tif b/Assets/Engine/EngineAssets/Textures/noise.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/noise.tif
rename to Assets/Engine/EngineAssets/Textures/noise.tif
diff --git a/Engine/EngineAssets/Textures/noise3d.dds b/Assets/Engine/EngineAssets/Textures/noise3d.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/noise3d.dds
rename to Assets/Engine/EngineAssets/Textures/noise3d.dds
diff --git a/Engine/EngineAssets/Textures/oceanwaves_ddn.tif b/Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/oceanwaves_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif
diff --git a/Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/palletteInst.dds b/Assets/Engine/EngineAssets/Textures/palletteInst.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/palletteInst.dds
rename to Assets/Engine/EngineAssets/Textures/palletteInst.dds
diff --git a/Engine/EngineAssets/Textures/perlinNoise2d.tif b/Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise2d.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif b/Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif b/Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum.tif b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum_small.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/pixeltex.dds b/Assets/Engine/EngineAssets/Textures/pixeltex.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/pixeltex.dds
rename to Assets/Engine/EngineAssets/Textures/pixeltex.dds
diff --git a/Engine/EngineAssets/Textures/rotrandomcm.dds b/Assets/Engine/EngineAssets/Textures/rotrandomcm.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/rotrandomcm.dds
rename to Assets/Engine/EngineAssets/Textures/rotrandomcm.dds
diff --git a/Engine/EngineAssets/Textures/scratch.tif b/Assets/Engine/EngineAssets/Textures/scratch.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch.tif
rename to Assets/Engine/EngineAssets/Textures/scratch.tif
diff --git a/Engine/EngineAssets/Textures/scratch.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/scratch.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/scratch.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/scratch_ddn.tif b/Assets/Engine/EngineAssets/Textures/scratch_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/scratch_ddn.tif
diff --git a/Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/screen_noisy_bump.dds b/Assets/Engine/EngineAssets/Textures/screen_noisy_bump.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/screen_noisy_bump.dds
rename to Assets/Engine/EngineAssets/Textures/screen_noisy_bump.dds
diff --git a/Engine/EngineAssets/Textures/screenfrost_alpha.TIF b/Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_alpha.TIF
rename to Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF
diff --git a/Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings b/Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings
diff --git a/Engine/EngineAssets/Textures/screenfrost_ddn.TIF b/Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_ddn.TIF
rename to Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF
diff --git a/Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings b/Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings
diff --git a/Engine/EngineAssets/Textures/snowflakes.tif b/Assets/Engine/EngineAssets/Textures/snowflakes.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/snowflakes.tif
rename to Assets/Engine/EngineAssets/Textures/snowflakes.tif
diff --git a/Engine/EngineAssets/Textures/snowflakes.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/snowflakes.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/snowflakes.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/snowflakes.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/startscreen.tif b/Assets/Engine/EngineAssets/Textures/startscreen.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/startscreen.tif
rename to Assets/Engine/EngineAssets/Textures/startscreen.tif
diff --git a/Engine/EngineAssets/Textures/startscreen.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/startscreen.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/startscreen.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/startscreen.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/user_tex1.tif b/Assets/Engine/EngineAssets/Textures/user_tex1.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/user_tex1.tif
rename to Assets/Engine/EngineAssets/Textures/user_tex1.tif
diff --git a/Engine/EngineAssets/Textures/user_tex2.tif b/Assets/Engine/EngineAssets/Textures/user_tex2.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/user_tex2.tif
rename to Assets/Engine/EngineAssets/Textures/user_tex2.tif
diff --git a/Engine/EngineAssets/Textures/vector_noise.dds b/Assets/Engine/EngineAssets/Textures/vector_noise.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/vector_noise.dds
rename to Assets/Engine/EngineAssets/Textures/vector_noise.dds
diff --git a/Engine/EngineAssets/Textures/water_droplets.dds b/Assets/Engine/EngineAssets/Textures/water_droplets.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/water_droplets.dds
rename to Assets/Engine/EngineAssets/Textures/water_droplets.dds
diff --git a/Engine/EngineAssets/Textures/water_gloss.tif b/Assets/Engine/EngineAssets/Textures/water_gloss.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/water_gloss.tif
rename to Assets/Engine/EngineAssets/Textures/water_gloss.tif
diff --git a/Engine/EngineAssets/Textures/water_gloss.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/water_gloss.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/water_gloss.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/water_gloss.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/white.tif b/Assets/Engine/EngineAssets/Textures/white.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/white.tif
rename to Assets/Engine/EngineAssets/Textures/white.tif
diff --git a/Engine/EngineAssets/Textures/white.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/white.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/white.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/white.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/white_cm.tif b/Assets/Engine/EngineAssets/Textures/white_cm.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/white_cm.tif
rename to Assets/Engine/EngineAssets/Textures/white_cm.tif
diff --git a/Engine/EngineAssets/Textures/white_cm.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/white_cm.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/white_cm.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/white_cm.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/white_ddn.tif b/Assets/Engine/EngineAssets/Textures/white_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/white_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/white_ddn.tif
diff --git a/Engine/EngineAssets/defaulttextures.xml b/Assets/Engine/EngineAssets/defaulttextures.xml
similarity index 100%
rename from Engine/EngineAssets/defaulttextures.xml
rename to Assets/Engine/EngineAssets/defaulttextures.xml
diff --git a/Engine/Engine_Dependencies.xml b/Assets/Engine/Engine_Dependencies.xml
similarity index 100%
rename from Engine/Engine_Dependencies.xml
rename to Assets/Engine/Engine_Dependencies.xml
diff --git a/Engine/Entities/AnimObject.ent b/Assets/Engine/Entities/AnimObject.ent
similarity index 100%
rename from Engine/Entities/AnimObject.ent
rename to Assets/Engine/Entities/AnimObject.ent
diff --git a/Engine/Entities/AreaBezierVolume.ent b/Assets/Engine/Entities/AreaBezierVolume.ent
similarity index 100%
rename from Engine/Entities/AreaBezierVolume.ent
rename to Assets/Engine/Entities/AreaBezierVolume.ent
diff --git a/Engine/Entities/AreaBox.ent b/Assets/Engine/Entities/AreaBox.ent
similarity index 100%
rename from Engine/Entities/AreaBox.ent
rename to Assets/Engine/Entities/AreaBox.ent
diff --git a/Engine/Entities/AreaShape.ent b/Assets/Engine/Entities/AreaShape.ent
similarity index 100%
rename from Engine/Entities/AreaShape.ent
rename to Assets/Engine/Entities/AreaShape.ent
diff --git a/Engine/Entities/AreaSolid.ent b/Assets/Engine/Entities/AreaSolid.ent
similarity index 100%
rename from Engine/Entities/AreaSolid.ent
rename to Assets/Engine/Entities/AreaSolid.ent
diff --git a/Engine/Entities/AreaSphere.ent b/Assets/Engine/Entities/AreaSphere.ent
similarity index 100%
rename from Engine/Entities/AreaSphere.ent
rename to Assets/Engine/Entities/AreaSphere.ent
diff --git a/Engine/Entities/AreaTrigger.ent b/Assets/Engine/Entities/AreaTrigger.ent
similarity index 100%
rename from Engine/Entities/AreaTrigger.ent
rename to Assets/Engine/Entities/AreaTrigger.ent
diff --git a/Engine/Entities/AudioAreaAmbience.ent b/Assets/Engine/Entities/AudioAreaAmbience.ent
similarity index 100%
rename from Engine/Entities/AudioAreaAmbience.ent
rename to Assets/Engine/Entities/AudioAreaAmbience.ent
diff --git a/Engine/Entities/AudioAreaEntity.ent b/Assets/Engine/Entities/AudioAreaEntity.ent
similarity index 100%
rename from Engine/Entities/AudioAreaEntity.ent
rename to Assets/Engine/Entities/AudioAreaEntity.ent
diff --git a/Engine/Entities/AudioAreaRandom.ent b/Assets/Engine/Entities/AudioAreaRandom.ent
similarity index 100%
rename from Engine/Entities/AudioAreaRandom.ent
rename to Assets/Engine/Entities/AudioAreaRandom.ent
diff --git a/Engine/Entities/AudioTriggerSpot.ent b/Assets/Engine/Entities/AudioTriggerSpot.ent
similarity index 100%
rename from Engine/Entities/AudioTriggerSpot.ent
rename to Assets/Engine/Entities/AudioTriggerSpot.ent
diff --git a/Engine/Entities/BasicEntity.ent b/Assets/Engine/Entities/BasicEntity.ent
similarity index 100%
rename from Engine/Entities/BasicEntity.ent
rename to Assets/Engine/Entities/BasicEntity.ent
diff --git a/Engine/Entities/CActorWrapper.ent b/Assets/Engine/Entities/CActorWrapper.ent
similarity index 100%
rename from Engine/Entities/CActorWrapper.ent
rename to Assets/Engine/Entities/CActorWrapper.ent
diff --git a/Engine/Entities/CameraSource.ent b/Assets/Engine/Entities/CameraSource.ent
similarity index 100%
rename from Engine/Entities/CameraSource.ent
rename to Assets/Engine/Entities/CameraSource.ent
diff --git a/Engine/Entities/CameraTarget.ent b/Assets/Engine/Entities/CameraTarget.ent
similarity index 100%
rename from Engine/Entities/CameraTarget.ent
rename to Assets/Engine/Entities/CameraTarget.ent
diff --git a/Engine/Entities/Comment.ent b/Assets/Engine/Entities/Comment.ent
similarity index 100%
rename from Engine/Entities/Comment.ent
rename to Assets/Engine/Entities/Comment.ent
diff --git a/Engine/Entities/EnvironmentLight.ent b/Assets/Engine/Entities/EnvironmentLight.ent
similarity index 100%
rename from Engine/Entities/EnvironmentLight.ent
rename to Assets/Engine/Entities/EnvironmentLight.ent
diff --git a/Engine/Entities/FogVolume.ent b/Assets/Engine/Entities/FogVolume.ent
similarity index 100%
rename from Engine/Entities/FogVolume.ent
rename to Assets/Engine/Entities/FogVolume.ent
diff --git a/Engine/Entities/GeomCache.ent b/Assets/Engine/Entities/GeomCache.ent
similarity index 100%
rename from Engine/Entities/GeomCache.ent
rename to Assets/Engine/Entities/GeomCache.ent
diff --git a/Engine/Entities/Light.ent b/Assets/Engine/Entities/Light.ent
similarity index 100%
rename from Engine/Entities/Light.ent
rename to Assets/Engine/Entities/Light.ent
diff --git a/Engine/Entities/LivingEntity.ent b/Assets/Engine/Entities/LivingEntity.ent
similarity index 100%
rename from Engine/Entities/LivingEntity.ent
rename to Assets/Engine/Entities/LivingEntity.ent
diff --git a/Engine/Entities/NavigationSeedPoint.ent b/Assets/Engine/Entities/NavigationSeedPoint.ent
similarity index 100%
rename from Engine/Entities/NavigationSeedPoint.ent
rename to Assets/Engine/Entities/NavigationSeedPoint.ent
diff --git a/Engine/Entities/ParticleEffect.ent b/Assets/Engine/Entities/ParticleEffect.ent
similarity index 100%
rename from Engine/Entities/ParticleEffect.ent
rename to Assets/Engine/Entities/ParticleEffect.ent
diff --git a/Engine/Entities/ProceduralObject.ent b/Assets/Engine/Entities/ProceduralObject.ent
similarity index 100%
rename from Engine/Entities/ProceduralObject.ent
rename to Assets/Engine/Entities/ProceduralObject.ent
diff --git a/Engine/Entities/ProximityTrigger.ent b/Assets/Engine/Entities/ProximityTrigger.ent
similarity index 100%
rename from Engine/Entities/ProximityTrigger.ent
rename to Assets/Engine/Entities/ProximityTrigger.ent
diff --git a/Engine/Entities/RigidBody.ent b/Assets/Engine/Entities/RigidBody.ent
similarity index 100%
rename from Engine/Entities/RigidBody.ent
rename to Assets/Engine/Entities/RigidBody.ent
diff --git a/Engine/Entities/RigidBodyEx.ent b/Assets/Engine/Entities/RigidBodyEx.ent
similarity index 100%
rename from Engine/Entities/RigidBodyEx.ent
rename to Assets/Engine/Entities/RigidBodyEx.ent
diff --git a/Engine/Entities/SmartObject.ent b/Assets/Engine/Entities/SmartObject.ent
similarity index 100%
rename from Engine/Entities/SmartObject.ent
rename to Assets/Engine/Entities/SmartObject.ent
diff --git a/Engine/Entities/TagPoint.ent b/Assets/Engine/Entities/TagPoint.ent
similarity index 100%
rename from Engine/Entities/TagPoint.ent
rename to Assets/Engine/Entities/TagPoint.ent
diff --git a/Engine/Entities/UiCanvasRef.ent b/Assets/Engine/Entities/UiCanvasRef.ent
similarity index 100%
rename from Engine/Entities/UiCanvasRef.ent
rename to Assets/Engine/Entities/UiCanvasRef.ent
diff --git a/Engine/Fonts/Vera.ttf b/Assets/Engine/Fonts/Vera.ttf
similarity index 100%
rename from Engine/Fonts/Vera.ttf
rename to Assets/Engine/Fonts/Vera.ttf
diff --git a/Engine/Fonts/VeraMono.ttf b/Assets/Engine/Fonts/VeraMono.ttf
similarity index 100%
rename from Engine/Fonts/VeraMono.ttf
rename to Assets/Engine/Fonts/VeraMono.ttf
diff --git a/Engine/Fonts/Vera_COPYRIGHT.TXT b/Assets/Engine/Fonts/Vera_COPYRIGHT.TXT
similarity index 100%
rename from Engine/Fonts/Vera_COPYRIGHT.TXT
rename to Assets/Engine/Fonts/Vera_COPYRIGHT.TXT
diff --git a/Engine/Fonts/Vera_RELEASENOTES.TXT b/Assets/Engine/Fonts/Vera_RELEASENOTES.TXT
similarity index 100%
rename from Engine/Fonts/Vera_RELEASENOTES.TXT
rename to Assets/Engine/Fonts/Vera_RELEASENOTES.TXT
diff --git a/Engine/Fonts/console.font b/Assets/Engine/Fonts/console.font
similarity index 100%
rename from Engine/Fonts/console.font
rename to Assets/Engine/Fonts/console.font
diff --git a/Engine/Fonts/console.xml b/Assets/Engine/Fonts/console.xml
similarity index 100%
rename from Engine/Fonts/console.xml
rename to Assets/Engine/Fonts/console.xml
diff --git a/Engine/Fonts/default-ui.font b/Assets/Engine/Fonts/default-ui.font
similarity index 100%
rename from Engine/Fonts/default-ui.font
rename to Assets/Engine/Fonts/default-ui.font
diff --git a/Engine/Fonts/default-ui.xml b/Assets/Engine/Fonts/default-ui.xml
similarity index 100%
rename from Engine/Fonts/default-ui.xml
rename to Assets/Engine/Fonts/default-ui.xml
diff --git a/Engine/Fonts/default.font b/Assets/Engine/Fonts/default.font
similarity index 100%
rename from Engine/Fonts/default.font
rename to Assets/Engine/Fonts/default.font
diff --git a/Engine/Fonts/default.xml b/Assets/Engine/Fonts/default.xml
similarity index 100%
rename from Engine/Fonts/default.xml
rename to Assets/Engine/Fonts/default.xml
diff --git a/Engine/Fonts/hud.font b/Assets/Engine/Fonts/hud.font
similarity index 100%
rename from Engine/Fonts/hud.font
rename to Assets/Engine/Fonts/hud.font
diff --git a/Engine/Fonts/hud.xml b/Assets/Engine/Fonts/hud.xml
similarity index 100%
rename from Engine/Fonts/hud.xml
rename to Assets/Engine/Fonts/hud.xml
diff --git a/Engine/Libs/MaterialEffects/FXLibs/collisions.xml b/Assets/Engine/Libs/MaterialEffects/FXLibs/collisions.xml
similarity index 100%
rename from Engine/Libs/MaterialEffects/FXLibs/collisions.xml
rename to Assets/Engine/Libs/MaterialEffects/FXLibs/collisions.xml
diff --git a/Engine/Libs/MaterialEffects/materialeffects.xml b/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
similarity index 100%
rename from Engine/Libs/MaterialEffects/materialeffects.xml
rename to Assets/Engine/Libs/MaterialEffects/materialeffects.xml
diff --git a/Engine/Libs/MaterialEffects/surfacetypes.xml b/Assets/Engine/Libs/MaterialEffects/surfacetypes.xml
similarity index 100%
rename from Engine/Libs/MaterialEffects/surfacetypes.xml
rename to Assets/Engine/Libs/MaterialEffects/surfacetypes.xml
diff --git a/Engine/Libs/PostEffectGroups/Default.xml b/Assets/Engine/Libs/PostEffectGroups/Default.xml
similarity index 100%
rename from Engine/Libs/PostEffectGroups/Default.xml
rename to Assets/Engine/Libs/PostEffectGroups/Default.xml
diff --git a/Engine/Objects/default/editorprimitive.mtl b/Assets/Engine/Objects/default/editorprimitive.mtl
similarity index 100%
rename from Engine/Objects/default/editorprimitive.mtl
rename to Assets/Engine/Objects/default/editorprimitive.mtl
diff --git a/Engine/Objects/default/primitive_capsule.cgf b/Assets/Engine/Objects/default/primitive_capsule.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_capsule.cgf
rename to Assets/Engine/Objects/default/primitive_capsule.cgf
diff --git a/Engine/Objects/default/primitive_cube.cgf b/Assets/Engine/Objects/default/primitive_cube.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_cube.cgf
rename to Assets/Engine/Objects/default/primitive_cube.cgf
diff --git a/Engine/Objects/default/primitive_plane.cgf b/Assets/Engine/Objects/default/primitive_plane.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_plane.cgf
rename to Assets/Engine/Objects/default/primitive_plane.cgf
diff --git a/Engine/Objects/default/primitive_sphere.cgf b/Assets/Engine/Objects/default/primitive_sphere.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_sphere.cgf
rename to Assets/Engine/Objects/default/primitive_sphere.cgf
diff --git a/Engine/Schema/Environment.xmlschema b/Assets/Engine/Schema/Environment.xmlschema
similarity index 100%
rename from Engine/Schema/Environment.xmlschema
rename to Assets/Engine/Schema/Environment.xmlschema
diff --git a/Engine/Schema/FlaresLibrary.xmlschema b/Assets/Engine/Schema/FlaresLibrary.xmlschema
similarity index 100%
rename from Engine/Schema/FlaresLibrary.xmlschema
rename to Assets/Engine/Schema/FlaresLibrary.xmlschema
diff --git a/Engine/Schema/Font.xmlschema b/Assets/Engine/Schema/Font.xmlschema
similarity index 100%
rename from Engine/Schema/Font.xmlschema
rename to Assets/Engine/Schema/Font.xmlschema
diff --git a/Engine/Schema/ParticleLibrary.xmlschema b/Assets/Engine/Schema/ParticleLibrary.xmlschema
similarity index 100%
rename from Engine/Schema/ParticleLibrary.xmlschema
rename to Assets/Engine/Schema/ParticleLibrary.xmlschema
diff --git a/Engine/Schema/cloudlibrary.xmlschema b/Assets/Engine/Schema/cloudlibrary.xmlschema
similarity index 100%
rename from Engine/Schema/cloudlibrary.xmlschema
rename to Assets/Engine/Schema/cloudlibrary.xmlschema
diff --git a/Engine/Schema/editorappdescriptor.xmlschema b/Assets/Engine/Schema/editorappdescriptor.xmlschema
similarity index 100%
rename from Engine/Schema/editorappdescriptor.xmlschema
rename to Assets/Engine/Schema/editorappdescriptor.xmlschema
diff --git a/Engine/Schema/enginedependency.xmlschema b/Assets/Engine/Schema/enginedependency.xmlschema
similarity index 100%
rename from Engine/Schema/enginedependency.xmlschema
rename to Assets/Engine/Schema/enginedependency.xmlschema
diff --git a/Engine/Schema/ent.xmlschema b/Assets/Engine/Schema/ent.xmlschema
similarity index 100%
rename from Engine/Schema/ent.xmlschema
rename to Assets/Engine/Schema/ent.xmlschema
diff --git a/Engine/Schema/gameappdescriptor.xmlschema b/Assets/Engine/Schema/gameappdescriptor.xmlschema
similarity index 100%
rename from Engine/Schema/gameappdescriptor.xmlschema
rename to Assets/Engine/Schema/gameappdescriptor.xmlschema
diff --git a/Engine/Schema/materialeffectlibrary.xmlschema b/Assets/Engine/Schema/materialeffectlibrary.xmlschema
similarity index 100%
rename from Engine/Schema/materialeffectlibrary.xmlschema
rename to Assets/Engine/Schema/materialeffectlibrary.xmlschema
diff --git a/Engine/Schema/materialeffects.xmlschema b/Assets/Engine/Schema/materialeffects.xmlschema
similarity index 100%
rename from Engine/Schema/materialeffects.xmlschema
rename to Assets/Engine/Schema/materialeffects.xmlschema
diff --git a/Engine/Schema/rainandsnowtextures.xmlschema b/Assets/Engine/Schema/rainandsnowtextures.xmlschema
similarity index 100%
rename from Engine/Schema/rainandsnowtextures.xmlschema
rename to Assets/Engine/Schema/rainandsnowtextures.xmlschema
diff --git a/Engine/Schema/surfacetypes.xmlschema b/Assets/Engine/Schema/surfacetypes.xmlschema
similarity index 100%
rename from Engine/Schema/surfacetypes.xmlschema
rename to Assets/Engine/Schema/surfacetypes.xmlschema
diff --git a/Engine/Schema/vegdescriptorlist.xmlschema b/Assets/Engine/Schema/vegdescriptorlist.xmlschema
similarity index 100%
rename from Engine/Schema/vegdescriptorlist.xmlschema
rename to Assets/Engine/Schema/vegdescriptorlist.xmlschema
diff --git a/Engine/Scripts/EngineCommon.lua b/Assets/Engine/Scripts/EngineCommon.lua
similarity index 100%
rename from Engine/Scripts/EngineCommon.lua
rename to Assets/Engine/Scripts/EngineCommon.lua
diff --git a/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua b/Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
similarity index 100%
rename from Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
rename to Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
diff --git a/Engine/Scripts/Entities/AI/SmartObject.lua b/Assets/Engine/Scripts/Entities/AI/SmartObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/AI/SmartObject.lua
rename to Assets/Engine/Scripts/Entities/AI/SmartObject.lua
diff --git a/Engine/Scripts/Entities/AI/TagPoint.lua b/Assets/Engine/Scripts/Entities/AI/TagPoint.lua
similarity index 100%
rename from Engine/Scripts/Entities/AI/TagPoint.lua
rename to Assets/Engine/Scripts/Entities/AI/TagPoint.lua
diff --git a/Engine/Scripts/Entities/Actor/CActorWrapper.lua b/Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua
similarity index 100%
rename from Engine/Scripts/Entities/Actor/CActorWrapper.lua
rename to Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua
diff --git a/Engine/Scripts/Entities/Anim/MannequinObject.lua b/Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/Anim/MannequinObject.lua
rename to Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua
diff --git a/Engine/Scripts/Entities/Default/GeomEntity.lua b/Assets/Engine/Scripts/Entities/Default/GeomEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Default/GeomEntity.lua
rename to Assets/Engine/Scripts/Entities/Default/GeomEntity.lua
diff --git a/Engine/Scripts/Entities/Default/RopeEntity.lua b/Assets/Engine/Scripts/Entities/Default/RopeEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Default/RopeEntity.lua
rename to Assets/Engine/Scripts/Entities/Default/RopeEntity.lua
diff --git a/Engine/Scripts/Entities/Environment/WaterVolume.lua b/Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua
similarity index 100%
rename from Engine/Scripts/Entities/Environment/WaterVolume.lua
rename to Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua
diff --git a/Engine/Scripts/Entities/Lights/EnvironmentLight.lua b/Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua
similarity index 100%
rename from Engine/Scripts/Entities/Lights/EnvironmentLight.lua
rename to Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua
diff --git a/Engine/Scripts/Entities/Lights/Light.lua b/Assets/Engine/Scripts/Entities/Lights/Light.lua
similarity index 100%
rename from Engine/Scripts/Entities/Lights/Light.lua
rename to Assets/Engine/Scripts/Entities/Lights/Light.lua
diff --git a/Engine/Scripts/Entities/Others/CameraSource.lua b/Assets/Engine/Scripts/Entities/Others/CameraSource.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/CameraSource.lua
rename to Assets/Engine/Scripts/Entities/Others/CameraSource.lua
diff --git a/Engine/Scripts/Entities/Others/CameraTarget.lua b/Assets/Engine/Scripts/Entities/Others/CameraTarget.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/CameraTarget.lua
rename to Assets/Engine/Scripts/Entities/Others/CameraTarget.lua
diff --git a/Engine/Scripts/Entities/Others/Comment.lua b/Assets/Engine/Scripts/Entities/Others/Comment.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/Comment.lua
rename to Assets/Engine/Scripts/Entities/Others/Comment.lua
diff --git a/Engine/Scripts/Entities/Others/ProceduralObject.lua b/Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/ProceduralObject.lua
rename to Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua
diff --git a/Engine/Scripts/Entities/Others/RigidBody.lua b/Assets/Engine/Scripts/Entities/Others/RigidBody.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/RigidBody.lua
rename to Assets/Engine/Scripts/Entities/Others/RigidBody.lua
diff --git a/Engine/Scripts/Entities/Particle/ParticleEffect.lua b/Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua
similarity index 100%
rename from Engine/Scripts/Entities/Particle/ParticleEffect.lua
rename to Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua
diff --git a/Engine/Scripts/Entities/Physics/AnimObject.lua b/Assets/Engine/Scripts/Entities/Physics/AnimObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/AnimObject.lua
rename to Assets/Engine/Scripts/Entities/Physics/AnimObject.lua
diff --git a/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua b/Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
rename to Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
diff --git a/Engine/Scripts/Entities/Physics/BasicEntity.lua b/Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/BasicEntity.lua
rename to Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua
diff --git a/Engine/Scripts/Entities/Physics/LivingEntity.lua b/Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/LivingEntity.lua
rename to Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua
diff --git a/Engine/Scripts/Entities/Physics/RigidBodyEx.lua b/Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/RigidBodyEx.lua
rename to Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua
diff --git a/Engine/Scripts/Entities/Render/FogVolume.lua b/Assets/Engine/Scripts/Entities/Render/FogVolume.lua
similarity index 100%
rename from Engine/Scripts/Entities/Render/FogVolume.lua
rename to Assets/Engine/Scripts/Entities/Render/FogVolume.lua
diff --git a/Engine/Scripts/Entities/Render/GeomCache.lua b/Assets/Engine/Scripts/Entities/Render/GeomCache.lua
similarity index 100%
rename from Engine/Scripts/Entities/Render/GeomCache.lua
rename to Assets/Engine/Scripts/Entities/Render/GeomCache.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua b/Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
diff --git a/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua b/Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
rename to Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
diff --git a/Engine/Scripts/Entities/Triggers/AreaTrigger.lua b/Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua
similarity index 100%
rename from Engine/Scripts/Entities/Triggers/AreaTrigger.lua
rename to Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua
diff --git a/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua b/Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
similarity index 100%
rename from Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
rename to Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
diff --git a/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua b/Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
rename to Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
diff --git a/Engine/Scripts/Utils/Components/GameplayUtils.lua b/Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua
similarity index 100%
rename from Engine/Scripts/Utils/Components/GameplayUtils.lua
rename to Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua
diff --git a/Engine/Scripts/Utils/Components/InputUtils.lua b/Assets/Engine/Scripts/Utils/Components/InputUtils.lua
similarity index 100%
rename from Engine/Scripts/Utils/Components/InputUtils.lua
rename to Assets/Engine/Scripts/Utils/Components/InputUtils.lua
diff --git a/Engine/Scripts/Utils/Components/MultiHandlers.lua b/Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua
similarity index 100%
rename from Engine/Scripts/Utils/Components/MultiHandlers.lua
rename to Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua
diff --git a/Engine/Scripts/Utils/Containers.lua b/Assets/Engine/Scripts/Utils/Containers.lua
similarity index 100%
rename from Engine/Scripts/Utils/Containers.lua
rename to Assets/Engine/Scripts/Utils/Containers.lua
diff --git a/Engine/Scripts/Utils/EntityUtils.lua b/Assets/Engine/Scripts/Utils/EntityUtils.lua
similarity index 100%
rename from Engine/Scripts/Utils/EntityUtils.lua
rename to Assets/Engine/Scripts/Utils/EntityUtils.lua
diff --git a/Engine/Scripts/Utils/Math.lua b/Assets/Engine/Scripts/Utils/Math.lua
similarity index 100%
rename from Engine/Scripts/Utils/Math.lua
rename to Assets/Engine/Scripts/Utils/Math.lua
diff --git a/Engine/SeedAssetList.seed b/Assets/Engine/SeedAssetList.seed
similarity index 100%
rename from Engine/SeedAssetList.seed
rename to Assets/Engine/SeedAssetList.seed
diff --git a/Engine/Shaders/DistanceClouds.ext b/Assets/Engine/Shaders/DistanceClouds.ext
similarity index 100%
rename from Engine/Shaders/DistanceClouds.ext
rename to Assets/Engine/Shaders/DistanceClouds.ext
diff --git a/Engine/Shaders/Eye.ext b/Assets/Engine/Shaders/Eye.ext
similarity index 100%
rename from Engine/Shaders/Eye.ext
rename to Assets/Engine/Shaders/Eye.ext
diff --git a/Engine/Shaders/Fur.ext b/Assets/Engine/Shaders/Fur.ext
similarity index 100%
rename from Engine/Shaders/Fur.ext
rename to Assets/Engine/Shaders/Fur.ext
diff --git a/Engine/Shaders/GeometryBeam.ext b/Assets/Engine/Shaders/GeometryBeam.ext
similarity index 100%
rename from Engine/Shaders/GeometryBeam.ext
rename to Assets/Engine/Shaders/GeometryBeam.ext
diff --git a/Engine/Shaders/Glass.ext b/Assets/Engine/Shaders/Glass.ext
similarity index 100%
rename from Engine/Shaders/Glass.ext
rename to Assets/Engine/Shaders/Glass.ext
diff --git a/Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Clouds.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Clouds.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Clouds.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Clouds.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Common.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/Common.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Common.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/Common.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Common.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Common.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Common.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Common.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Debug.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Debug.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Debug.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Debug.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DebugLight.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DebugLight.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DebugLight.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DebugLight.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Eye.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Eye.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Eye.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Eye.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FallBack.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/FallBack.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FallBack.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/FallBack.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FogVolume.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/FogVolume.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FogVolume.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/FogVolume.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Fur.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Fur.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Fur.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Fur.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FurZPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FurZPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FurZPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FurZPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Glass.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Glass.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Glass.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Glass.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Hair.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Hair.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Hair.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Hair.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Helper.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Helper.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Helper.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Helper.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Hud3D.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Hud3D.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Hud3D.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Hud3D.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Illum.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Illum.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Illum.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Illum.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/IllumTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/IllumTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/IllumTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/IllumTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/LensOptics.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/LensOptics.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/LensOptics.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/LensOptics.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Light.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Light.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Light.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Light.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/LightBeam.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/LightBeam.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/LightBeam.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/LightBeam.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Monitor.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Monitor.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Monitor.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Monitor.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/NoDraw.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/NoDraw.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/NoDraw.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/NoDraw.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Particles.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Particles.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Particles.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Particles.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/PostAA.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/PostAA.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostAA.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostAA.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/PostEffects.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/PostEffects.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostEffects.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostEffects.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Scopes.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Scopes.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Scopes.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Scopes.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Sketch.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Sketch.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Sketch.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Sketch.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Sky.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Sky.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Sky.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Sky.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Stars.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Stars.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Stars.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Stars.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Stereo.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Stereo.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Stereo.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Stereo.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Terrain.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Terrain.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Terrain.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Terrain.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/TiledShading.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/TiledShading.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/TiledShading.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/TiledShading.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/UI.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/UI.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/UI.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/UI.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Vegetation.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Vegetation.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Vegetation.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Vegetation.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Video.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Video.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Video.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Video.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Water.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Water.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Water.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Water.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Waterfall.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Waterfall.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Waterfall.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Waterfall.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/fragLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/fragLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/fragLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/fragLib.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/shadeLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/shadeLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/shadeLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/shadeLib.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/vertexLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/vertexLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/vertexLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/vertexLib.cfi
diff --git a/Engine/Shaders/Hair.ext b/Assets/Engine/Shaders/Hair.ext
similarity index 100%
rename from Engine/Shaders/Hair.ext
rename to Assets/Engine/Shaders/Hair.ext
diff --git a/Engine/Shaders/HumanSkin.ext b/Assets/Engine/Shaders/HumanSkin.ext
similarity index 100%
rename from Engine/Shaders/HumanSkin.ext
rename to Assets/Engine/Shaders/HumanSkin.ext
diff --git a/Engine/Shaders/Illum.ext b/Assets/Engine/Shaders/Illum.ext
similarity index 100%
rename from Engine/Shaders/Illum.ext
rename to Assets/Engine/Shaders/Illum.ext
diff --git a/Engine/Shaders/LensOptics.ext b/Assets/Engine/Shaders/LensOptics.ext
similarity index 100%
rename from Engine/Shaders/LensOptics.ext
rename to Assets/Engine/Shaders/LensOptics.ext
diff --git a/Engine/Shaders/LightBeam.ext b/Assets/Engine/Shaders/LightBeam.ext
similarity index 100%
rename from Engine/Shaders/LightBeam.ext
rename to Assets/Engine/Shaders/LightBeam.ext
diff --git a/Engine/Shaders/Monitor.ext b/Assets/Engine/Shaders/Monitor.ext
similarity index 100%
rename from Engine/Shaders/Monitor.ext
rename to Assets/Engine/Shaders/Monitor.ext
diff --git a/Engine/Shaders/ParticleImposter.ext b/Assets/Engine/Shaders/ParticleImposter.ext
similarity index 100%
rename from Engine/Shaders/ParticleImposter.ext
rename to Assets/Engine/Shaders/ParticleImposter.ext
diff --git a/Engine/Shaders/Particles.ext b/Assets/Engine/Shaders/Particles.ext
similarity index 100%
rename from Engine/Shaders/Particles.ext
rename to Assets/Engine/Shaders/Particles.ext
diff --git a/Engine/Shaders/RunTime.ext b/Assets/Engine/Shaders/RunTime.ext
similarity index 100%
rename from Engine/Shaders/RunTime.ext
rename to Assets/Engine/Shaders/RunTime.ext
diff --git a/Engine/Shaders/Scopes.ext b/Assets/Engine/Shaders/Scopes.ext
similarity index 100%
rename from Engine/Shaders/Scopes.ext
rename to Assets/Engine/Shaders/Scopes.ext
diff --git a/Engine/Shaders/ShaderProfiles.txt b/Assets/Engine/Shaders/ShaderProfiles.txt
similarity index 100%
rename from Engine/Shaders/ShaderProfiles.txt
rename to Assets/Engine/Shaders/ShaderProfiles.txt
diff --git a/Engine/Shaders/ShadowMaskGen.ext b/Assets/Engine/Shaders/ShadowMaskGen.ext
similarity index 100%
rename from Engine/Shaders/ShadowMaskGen.ext
rename to Assets/Engine/Shaders/ShadowMaskGen.ext
diff --git a/Engine/Shaders/SketchTerrain.ext b/Assets/Engine/Shaders/SketchTerrain.ext
similarity index 100%
rename from Engine/Shaders/SketchTerrain.ext
rename to Assets/Engine/Shaders/SketchTerrain.ext
diff --git a/Engine/Shaders/SkyHDR.ext b/Assets/Engine/Shaders/SkyHDR.ext
similarity index 100%
rename from Engine/Shaders/SkyHDR.ext
rename to Assets/Engine/Shaders/SkyHDR.ext
diff --git a/Engine/Shaders/StarterGame_GeometryBeamScaling.ext b/Assets/Engine/Shaders/StarterGame_GeometryBeamScaling.ext
similarity index 100%
rename from Engine/Shaders/StarterGame_GeometryBeamScaling.ext
rename to Assets/Engine/Shaders/StarterGame_GeometryBeamScaling.ext
diff --git a/Engine/Shaders/Statics.ext b/Assets/Engine/Shaders/Statics.ext
similarity index 100%
rename from Engine/Shaders/Statics.ext
rename to Assets/Engine/Shaders/Statics.ext
diff --git a/Engine/Shaders/TemplBeamProc.ext b/Assets/Engine/Shaders/TemplBeamProc.ext
similarity index 100%
rename from Engine/Shaders/TemplBeamProc.ext
rename to Assets/Engine/Shaders/TemplBeamProc.ext
diff --git a/Engine/Shaders/Terrain.ext b/Assets/Engine/Shaders/Terrain.ext
similarity index 100%
rename from Engine/Shaders/Terrain.ext
rename to Assets/Engine/Shaders/Terrain.ext
diff --git a/Engine/Shaders/Vegetation.ext b/Assets/Engine/Shaders/Vegetation.ext
similarity index 100%
rename from Engine/Shaders/Vegetation.ext
rename to Assets/Engine/Shaders/Vegetation.ext
diff --git a/Engine/Shaders/VolumeObject.ext b/Assets/Engine/Shaders/VolumeObject.ext
similarity index 100%
rename from Engine/Shaders/VolumeObject.ext
rename to Assets/Engine/Shaders/VolumeObject.ext
diff --git a/Engine/Shaders/Water.ext b/Assets/Engine/Shaders/Water.ext
similarity index 100%
rename from Engine/Shaders/Water.ext
rename to Assets/Engine/Shaders/Water.ext
diff --git a/Engine/Shaders/WaterVolume.ext b/Assets/Engine/Shaders/WaterVolume.ext
similarity index 100%
rename from Engine/Shaders/WaterVolume.ext
rename to Assets/Engine/Shaders/WaterVolume.ext
diff --git a/Engine/Shaders/Waterfall.ext b/Assets/Engine/Shaders/Waterfall.ext
similarity index 100%
rename from Engine/Shaders/Waterfall.ext
rename to Assets/Engine/Shaders/Waterfall.ext
diff --git a/Engine/exclude.filetag b/Assets/Engine/exclude.filetag
similarity index 100%
rename from Engine/exclude.filetag
rename to Assets/Engine/exclude.filetag
diff --git a/Engine/include.filetag b/Assets/Engine/include.filetag
similarity index 100%
rename from Engine/include.filetag
rename to Assets/Engine/include.filetag
diff --git a/Engine/materials/material_layers_default.mtl b/Assets/Engine/materials/material_layers_default.mtl
similarity index 100%
rename from Engine/materials/material_layers_default.mtl
rename to Assets/Engine/materials/material_layers_default.mtl
diff --git a/Engine/materials/material_terrain_default.mtl b/Assets/Engine/materials/material_terrain_default.mtl
similarity index 100%
rename from Engine/materials/material_terrain_default.mtl
rename to Assets/Engine/materials/material_terrain_default.mtl
diff --git a/Engine/textures/default_icon.png b/Assets/Engine/textures/default_icon.png
similarity index 100%
rename from Engine/textures/default_icon.png
rename to Assets/Engine/textures/default_icon.png
diff --git a/Engine/textures/default_icon.png.exportsettings b/Assets/Engine/textures/default_icon.png.exportsettings
similarity index 100%
rename from Engine/textures/default_icon.png.exportsettings
rename to Assets/Engine/textures/default_icon.png.exportsettings
diff --git a/Engine/textures/defaults/defaultnouvs.tif b/Assets/Engine/textures/defaults/defaultnouvs.tif
similarity index 100%
rename from Engine/textures/defaults/defaultnouvs.tif
rename to Assets/Engine/textures/defaults/defaultnouvs.tif
diff --git a/Engine/textures/defaults/grey.tif b/Assets/Engine/textures/defaults/grey.tif
similarity index 100%
rename from Engine/textures/defaults/grey.tif
rename to Assets/Engine/textures/defaults/grey.tif
diff --git a/Engine/textures/skys/night/half_moon.tif b/Assets/Engine/textures/skys/night/half_moon.tif
similarity index 100%
rename from Engine/textures/skys/night/half_moon.tif
rename to Assets/Engine/textures/skys/night/half_moon.tif
diff --git a/AutomatedTesting/EngineFinder.cmake b/AutomatedTesting/EngineFinder.cmake
new file mode 100644
index 0000000000..1fdcef2b56
--- /dev/null
+++ b/AutomatedTesting/EngineFinder.cmake
@@ -0,0 +1,50 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+# This file is copied during engine registration. Edits to this file will be lost next
+# time a registration happens.
+
+include_guard()
+
+# Read the engine name from the project_json file
+file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json)
+string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine)
+if(json_error)
+    message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}")
+endif()
+
+# Read the list of paths from ~.o3de/o3de_manifest.json
+file(TO_CMAKE_PATH "$ENV{USERPROFILE}" home_directory) # Windows
+if((NOT home_directory) OR (NOT EXISTS ${home_directory}))
+    file(TO_CMAKE_PATH "$ENV{HOME}" home_directory)# Unix
+endif()
+
+if (NOT home_directory)
+    message(FATAL_ERROR "Cannot find user home directory, the o3de manifest cannot be found")
+endif()
+# Set manifest path to path in the user home directory
+set(manifest_path ${home_directory}/.o3de/o3de_manifest.json)
+
+if(EXISTS ${manifest_path})
+    file(READ ${manifest_path} manifest_json)
+    string(JSON engines_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines)
+    if(json_error)
+        message(FATAL_ERROR "Unable to read key 'engines' from '${manifest_path}', error: ${json_error}")
+    endif()
+
+    math(EXPR engines_count "${engines_count}-1")
+    foreach(engine_path_index RANGE ${engines_count})
+        string(JSON engine_path ERROR_VARIABLE json_error GET ${manifest_json} engines ${engine_path_index})
+        if(${json_error})
+            message(FATAL_ERROR "Unable to read engines[${engine_path_index}] '${manifest_path}', error: ${json_error}")
+        endif()
+        list(APPEND CMAKE_MODULE_PATH "${engine_path}/cmake")
+    endforeach()
+endif()
diff --git a/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
index 4d5680a30d..f9d1e60dda 100644
--- a/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
@@ -8,3 +8,8 @@
 # remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
+
+set(GEM_DEPENDENCIES
+    Gem::Atom_RHI_Metal.Private
+    Gem::Atom_RHI_Null.Private
+)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
index 4d5680a30d..ee7be9ac6d 100644
--- a/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
@@ -8,3 +8,10 @@
 # remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
+
+set(GEM_DEPENDENCIES
+    Gem::Atom_RHI_Null.Private
+    Gem::Atom_RHI_Null.Builders
+    Gem::Atom_RHI_Metal.Private
+    Gem::Atom_RHI_Metal.Builders
+)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
index d31ea6334c..6d3727195e 100644
--- a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
@@ -25,10 +25,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE main
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Main.py
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
         COMPONENT
@@ -39,10 +38,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE periodic
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Periodic.py
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
         COMPONENT
@@ -56,7 +54,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TIMEOUT 3600
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
         COMPONENT
@@ -71,10 +68,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE periodic
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/scripting/TestSuite_Active.py
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
         COMPONENT
@@ -85,10 +81,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE sandbox
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/scripting/TestSuite_Sandbox.py
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
     )
@@ -101,10 +96,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE main
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/WhiteBox/TestSuite_Active.py
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
         COMPONENT
@@ -120,10 +114,9 @@ endif()
 #        TEST_SUITE main
 #        TEST_SERIAL
 #        PATH ${CMAKE_CURRENT_LIST_DIR}/NvCloth/TestSuite_Active.py
-#        TIMEOUT 3600
+#        TIMEOUT 1500
 #        RUNTIME_DEPENDENCIES
 #            Legacy::Editor
-#            Legacy::CryRenderNULL
 #            AZ::AssetProcessor
 #            AutomatedTesting.Assets
 #    )
@@ -136,10 +129,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE sandbox
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/EditorPythonBindings
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
             Gem::EditorPythonBindings.Editor
@@ -154,10 +146,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE periodic
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/PythonAssetBuilder
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
             Gem::EditorPythonBindings.Editor
@@ -173,7 +164,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE main
         TEST_SERIAL TRUE
         PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
             AZ::AssetProcessor
@@ -196,7 +187,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         TEST_SUITE main
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
         PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
-        TIMEOUT 36000
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             Legacy::Editor
@@ -212,7 +203,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         TEST_SUITE sandbox
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
         PYTEST_MARKS "SUITE_sandbox"
-        TIMEOUT 36000
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             Legacy::Editor
@@ -228,7 +219,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         TEST_SUITE periodic
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
         PYTEST_MARKS "SUITE_periodic"
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             Legacy::Editor
@@ -244,7 +235,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         TEST_SUITE main
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
         PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
            AZ::AssetProcessor
            Legacy::Editor
@@ -259,7 +250,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         TEST_SUITE periodic
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
         PYTEST_MARKS "SUITE_periodic"
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
            AZ::AssetProcessor
            Legacy::Editor
@@ -274,7 +265,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         TEST_SERIAL
         TEST_SUITE periodic
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/gradient_signal
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             Legacy::Editor
@@ -292,10 +283,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         TEST_SUITE periodic
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/editor
-        TIMEOUT 3600
+        TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             Legacy::Editor
-            Legacy::CryRenderNULL
             AZ::AssetProcessor
             AutomatedTesting.Assets
         COMPONENT
@@ -314,7 +304,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     #        AZ::AssetProcessor
     #        AZ::AssetProcessorBatch
     #        AutomatedTesting.GameLauncher
-    #        Legacy::CryRenderNULL
     #)
 endif()
 
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test.py
deleted file mode 100755
index 41ae0608a4..0000000000
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test.py
+++ /dev/null
@@ -1,75 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-
-#
-# This is a pytest module to test the in-Editor Python API from ViewPane.h
-#
-import pytest
-pytest.importorskip('ly_test_tools')
-
-import sys
-import os
-sys.path.append(os.path.dirname(__file__))
-from hydra_utils import launch_test_case
-
-
-@pytest.mark.SUITE_sandbox
-@pytest.mark.parametrize('launcher_platform', ['windows_editor'])
-@pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('level', ['auto_test'])
-class TestLegacyCryMaterialsCommandsAutomation(object):
-
-    def test_Legacy_CryMaterials(self, request, editor, level, launcher_platform):
-
-        unexpected_lines=[]
-        expected_lines = [
-            # "Material Settings/Shader updated correctly", # Disabled, SPEC-3590
-            # "Material Settings/Surface Type updated correctly", # Disabled, SPEC-3590
-            "Texture Maps/Diffuse/Tiling/IsTileU updated correctly",           
-            "Texture Maps/Diffuse/Tiling/TileU updated correctly",
-            "Texture Maps/Diffuse/Rotator/Type updated correctly",
-            "Texture Maps/Diffuse/Rotator/Amplitude updated correctly",
-            "Texture Maps/Diffuse/Oscillator/AmplitudeU updated correctly",
-            "Opacity Settings/Opacity updated correctly",
-            "Opacity Settings/AlphaTest updated correctly",
-            "Opacity Settings/Additive updated correctly",
-            "Lighting Settings/Diffuse Color updated correctly",
-            "Lighting Settings/Specular Color updated correctly",
-            "Lighting Settings/Emissive Intensity updated correctly",
-            "Lighting Settings/Emissive Color updated correctly",
-            "Advanced/Allow layer activation updated correctly",
-            "Advanced/2 Sided updated correctly",
-            "Advanced/No Shadow updated correctly",
-            "Advanced/Use Scattering updated correctly",
-            "Advanced/Hide After Breaking updated correctly",
-            "Advanced/Fog Volume Shading Quality High updated correctly",
-            "Advanced/Blend Terrain Color updated correctly",
-            "Advanced/Voxel Coverage updated correctly",
-            "Advanced/Propagate Opacity Settings updated correctly",
-            "Advanced/Propagate Lighting Settings updated correctly",
-            "Advanced/Propagate Advanced Settings updated correctly",
-            "Advanced/Propagate Texture Maps updated correctly",
-            "Advanced/Propagate Shader Params updated correctly",
-            "Advanced/Propagate Shader Generation updated correctly",
-            "Advanced/Propagate Vertex Deformation updated correctly",
-            # "Shader Params/Blend Factor updated correctly", # Disabled, SPEC-3590
-            # "Shader Params/Indirect bounce color updated correctly", # Disabled, SPEC-3590
-            "Vertex Deformation/Type updated correctly",
-            "Vertex Deformation/Wave Length X updated correctly",
-            "Vertex Deformation/Wave X/Level updated correctly",
-            "Vertex Deformation/Wave X/Amplitude updated correctly",
-            "Vertex Deformation/Wave X/Phase updated correctly",
-            "Vertex Deformation/Wave X/Frequency updated correctly"
-            ]
-        
-        test_case_file = os.path.join(os.path.dirname(__file__), 'CryMaterialsCommands_test_case.py')
-        launch_test_case(editor, test_case_file, expected_lines, unexpected_lines)
-
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test_case.py
deleted file mode 100755
index 913b1ace24..0000000000
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test_case.py
+++ /dev/null
@@ -1,116 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-
-# Tests the legacy Python API for CryMaterials while the Editor is running
-
-import azlmbr.bus as bus
-import azlmbr.editor as editor
-import azlmbr.legacy.material as material
-import azlmbr.math as math
-
-materialName = 'materials/ter_layer_green'
-print(f'Starting CryMaterial test case using material {materialName}')
-
-
-def MaterialPropertyTest(property, value, doReset=True):
-    try:
-        # get old value and attempt to set new value
-        oldValue = material.get_property(materialName, property)
-        if oldValue == value:
-            print(f'>>> `{property}` already set to {oldValue}')
-            return
-        material.set_property(materialName, property, value)
-    
-        # test that the set new value worked
-        newValue = material.get_property(materialName, property)
-        if oldValue != newValue:
-            print(f"{property} updated correctly")
-            
-        # reset back to old value
-        if doReset:
-            material.set_property(materialName, property, oldValue)
-    except:
-        print(f'!!! hit an exception when setting `{property}` to {value}')
-
-
-color = math.Color()
-color.r = 255.0
-color.g = 128.0
-color.b = 64.0
-color.a = 0.0
-
-# Material Settings
-# MaterialPropertyTest("Material Settings/Shader", "Geometrybeam") # Disabled, SPEC-3590
-# MaterialPropertyTest("Material Settings/Surface Type", "grass") # Disabled, SPEC-3590
-
-# Texture Maps
-MaterialPropertyTest("Texture Maps/Diffuse/Tiling/IsTileU", False)
-MaterialPropertyTest("Texture Maps/Diffuse/Tiling/IsTileV", False)
-MaterialPropertyTest("Texture Maps/Diffuse/Tiling/TileU", 0.42)
-MaterialPropertyTest("Texture Maps/Diffuse/Rotator/Type", 'Oscillated Rotation')
-MaterialPropertyTest("Texture Maps/Diffuse/Rotator/Amplitude", 42.0)
-MaterialPropertyTest("Texture Maps/Diffuse/Oscillator/TypeU", 'Fixed Moving')
-MaterialPropertyTest("Texture Maps/Diffuse/Oscillator/AmplitudeU", 42.0)
-
-# Vertex Deformation
-MaterialPropertyTest("Vertex Deformation/Type", 'Sin Wave')
-MaterialPropertyTest("Vertex Deformation/Wave Length X", 42.0)
-MaterialPropertyTest("Vertex Deformation/Type", 'Perlin 3D')
-MaterialPropertyTest("Vertex Deformation/Noise Scale", math.Vector3(1.1, 2.2, 3.3))
-
-# Opacity Settings
-MaterialPropertyTest("Opacity Settings/Opacity", 42)
-MaterialPropertyTest("Opacity Settings/AlphaTest", 2)
-MaterialPropertyTest("Opacity Settings/Additive", True)
-
-# Lighting Settings
-MaterialPropertyTest("Lighting Settings/Diffuse Color", color)
-MaterialPropertyTest("Lighting Settings/Specular Color", color)
-MaterialPropertyTest("Lighting Settings/Emissive Intensity", 42.0)
-MaterialPropertyTest("Lighting Settings/Emissive Color", color)
-MaterialPropertyTest("Lighting Settings/Specular Level", 2.0)
-
-# Advanced
-MaterialPropertyTest("Advanced/Allow layer activation", False)
-MaterialPropertyTest("Advanced/2 Sided", True)
-MaterialPropertyTest("Advanced/No Shadow", True)
-MaterialPropertyTest("Advanced/Use Scattering", True)
-MaterialPropertyTest("Advanced/Hide After Breaking", True)
-MaterialPropertyTest("Advanced/Fog Volume Shading Quality High", True)
-MaterialPropertyTest("Advanced/Blend Terrain Color", True)
-MaterialPropertyTest("Advanced/Voxel Coverage", 0.42)
-# --- MaterialPropertyTest("Advanced/Link to Material", "materials/ter_layer_blue") # Works, but clears on UI refresh
-MaterialPropertyTest("Advanced/Propagate Opacity Settings", True)
-MaterialPropertyTest("Advanced/Propagate Lighting Settings", True)
-MaterialPropertyTest("Advanced/Propagate Advanced Settings", True)
-MaterialPropertyTest("Advanced/Propagate Texture Maps", True)
-MaterialPropertyTest("Advanced/Propagate Shader Params", True)
-MaterialPropertyTest("Advanced/Propagate Shader Generation", True)
-MaterialPropertyTest("Advanced/Propagate Vertex Deformation", True)
-
-# Shader parameters vary with each Shader, just testing a couple of them...
-# MaterialPropertyTest("Shader Params/Blend Factor", 7.0, False) # Disabled, SPEC-3590
-# MaterialPropertyTest("Shader Params/Indirect bounce color", color, False) # Disabled, SPEC-3590
-
-### These values are reset to False when set. Left them here commented for reference.
-# MaterialPropertyTest("Shader Generation Params/Dust & Turbulence", True)
-# MaterialPropertyTest("Shader Generation Params/Receive Shadows", True)
-# MaterialPropertyTest("Shader Generation Params/UV Vignetting", True)
-
-# Vertex Deformation
-MaterialPropertyTest("Vertex Deformation/Type", "Sin Wave")
-MaterialPropertyTest("Vertex Deformation/Wave Length X", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Level", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Amplitude", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Phase", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Frequency", 42.0)
-
-editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'ExitNoPrompt')
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
index de3e04e67e..6a865ee690 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
@@ -100,7 +100,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
         EXCLUDE_TEST_RUN_TARGET_FROM_IDE
         TEST_SERIAL 
-        TIMEOUT 3600
+        TIMEOUT 1500
         TEST_SUITE periodic
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
@@ -123,7 +123,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         PATH ${CMAKE_CURRENT_LIST_DIR}/missing_dependency_tests.py
         EXCLUDE_TEST_RUN_TARGET_FROM_IDE
         TEST_SERIAL 
-        TIMEOUT 3600
+        TIMEOUT 1500
         TEST_SUITE periodic
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessorBatch
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
index cfd088adc0..e329846554 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
@@ -71,9 +71,9 @@ class TestsAssetProcessorBatch_DependenycyTests(object):
         env = ap_setup_fixture
         BATCH_LOG_PATH = env["ap_batch_log_file"]
         asset_processor.create_temp_asset_root()
-        asset_processor.add_relative_source_asset(os.path.join("Engine", "engine_dependencies.xml"))
-        asset_processor.add_scan_folder("Engine")
-        asset_processor.add_relative_source_asset(os.path.join("Engine", "Libs", "MaterialEffects", "surfacetypes.xml"))
+        asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "engine_dependencies.xml"))
+        asset_processor.add_scan_folder(os.path.join("Assets", "Engine"))
+        asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "Libs", "MaterialEffects", "surfacetypes.xml"))
 
         # Precondition: Assets are all processed
         asset_processor.batch_process()
@@ -103,7 +103,7 @@ class TestsAssetProcessorBatch_DependenycyTests(object):
         assert surfacetypes_missing_logline, "Surfacetypes.xml not seen in the batch log as missing."
 
         # Add the schema file which allows our xml parser to understand dependencies for our engine_dependencies file
-        asset_processor.add_relative_source_asset(os.path.join("Engine", "Schema", "enginedependency.xmlschema"))
+        asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "Schema", "enginedependency.xmlschema"))
         asset_processor.batch_process()
 
         _, output = asset_processor.batch_process(capture_output=True,
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
index 7c7b6b2452..b25ee081a1 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
@@ -205,10 +205,13 @@ class TestsAssetProcessorGUI_AllPlatforms(object):
         env = ap_setup_fixture
         # Copy test assets to new folder in dev folder
         # This new folder will be created outside the default project folder and will not be added as a scan folder
-        # by default, instead we'll modify the temporary AssetProcessorPlatformConfig.ini to add it
         test_assets_folder, cache_folder = asset_processor.prepare_test_environment(env["tests_dir"], "C4874115",
                                                                                     relative_asset_root='',
                                                                                     add_scan_folder=False)
+        # The AssetProcessor internal _cache_folder path is updated to point at the cache root in order
+        # to allow the comparison between the source asset path of "<source asset path>/C4874115" to match the cache assets
+        # in <cache-folder>
+        asset_processor._cache_folder = os.path.dirname(cache_folder)
         assert os.path.exists(test_assets_folder), f"Test assets folder was not found {test_assets_folder}"
 
         # Run AP Batch
@@ -226,7 +229,6 @@ class TestsAssetProcessorGUI_AllPlatforms(object):
 
         test_scan_folder_root_key = f"{ASSET_PROCESSOR_SETTINGS_ROOT_KEY}/ScanFolder C4874115"
         test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/watch=@ROOT@/C4874115"')
-        test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/output=C4874115"')
         test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/recursive=1"')
         test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/order=5000"')
 
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115_test_asset.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115/C4874115_test_asset.txt
similarity index 100%
rename from AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115_test_asset.txt
rename to AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115/C4874115_test_asset.txt
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
index 82a7e92c16..e701ff8d16 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
@@ -161,20 +161,6 @@ def run():
             # Deletion/Undo/Redo test
             verify_deletion_undo_redo(self.component_name, entity_obj)
 
-    # Area Light Component
-    area_light = "Area Light"
-    ComponentTests(
-        area_light, lambda entity_obj: verify_required_component_addition(
-            entity_obj, ["Capsule Shape"], area_light))
-
-    # Decal Component
-    material_asset_path = os.path.join("Materials", "basic_grey.material")
-    material_asset = asset.AssetCatalogRequestBus(
-        bus.Broadcast, "GetAssetIdByPath", material_asset_path, math.Uuid(), False)
-    ComponentTests(
-        "Decal", lambda entity_obj: verify_set_property(
-            entity_obj, "Settings|Decal Settings|Material", material_asset))
-
     # DepthOfField Component
     camera_entity = hydra.Entity("camera_entity")
     camera_entity.create_entity(math.Vector3(512.0, 512.0, 34.0), ["Camera"])
@@ -185,6 +171,14 @@ def run():
         lambda entity_obj: verify_set_property(
             entity_obj, "Controller|Configuration|Camera Entity", camera_entity.id))
 
+    # Decal Component
+    material_asset_path = os.path.join("AutomatedTesting", "Materials", "basic_grey.material")
+    material_asset = asset.AssetCatalogRequestBus(
+        bus.Broadcast, "GetAssetIdByPath", material_asset_path, math.Uuid(), False)
+    ComponentTests(
+        "Decal (Atom)", lambda entity_obj: verify_set_property(
+            entity_obj, "Controller|Configuration|Material", material_asset))
+
     # Directional Light Component
     ComponentTests(
         "Directional Light",
@@ -213,9 +207,6 @@ def run():
     # Physical Sky Component
     ComponentTests("Physical Sky")
 
-    # Point Light Component
-    ComponentTests("Point Light")
-
     # PostFX Layer Component
     ComponentTests("PostFX Layer")
 
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
index 8621fcb248..aafa2ff9b7 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
@@ -7,10 +7,12 @@ distribution (the "License"). All use of this software is governed by the Licens
 or, if provided, by the license below or the license accompanying this file. Do not
 remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
 
+Main suite tests for the Atom renderer.
+"""
 import logging
 import os
+
 import pytest
 
 import editor_python_test_tools.hydra_test_utils as hydra
@@ -23,197 +25,8 @@ TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("level", ["auto_test"])
-class TestAtomEditorComponents(object):
-
-
-    @pytest.mark.test_case_id(
-        "C32078117",  # Area Light
-        "C32078130",  # Display Mapper
-        "C32078129",  # Light
-        "C32078131",  # Radius Weight Modifier
-        "C32078127",  # PostFX Layer
-        "C32078126",  # Point Light
-        "C32078125",  # Physical Sky
-        "C32078115",  # Global Skylight (IBL)
-        "C32078121",  # Exposure Control
-        "C32078120",  # Directional Light
-        "C32078119",  # DepthOfField
-        "C32078118")  # Decal
-    def test_AtomEditorComponents_AddedToEntity(self, request, editor, level, workspace, project, launcher_platform):
-        cfg_args = [level]
-
-        expected_lines = [
-            # Area Light Component
-            "Area Light Entity successfully created",
-            "Area Light_test: Component added to the entity: True",
-            "Area Light_test: Component removed after UNDO: True",
-            "Area Light_test: Component added after REDO: True",
-            "Area Light_test: Entered game mode: True",
-            "Area Light_test: Entity enabled after adding required components: True",
-            "Area Light_test: Entity is hidden: True",
-            "Area Light_test: Entity is shown: True",
-            "Area Light_test: Entity deleted: True",
-            "Area Light_test: UNDO entity deletion works: True",
-            "Area Light_test: REDO entity deletion works: True",
-            # Decal Component
-            "Decal Entity successfully created",
-            "Decal_test: Component added to the entity: True",
-            "Decal_test: Component removed after UNDO: True",
-            "Decal_test: Component added after REDO: True",
-            "Decal_test: Entered game mode: True",
-            "Decal_test: Exit game mode: True",
-            "Decal Settings|Decal Settings|Material: SUCCESS",
-            "Decal_test: Entity is hidden: True",
-            "Decal_test: Entity is shown: True",
-            "Decal_test: Entity deleted: True",
-            "Decal_test: UNDO entity deletion works: True",
-            "Decal_test: REDO entity deletion works: True",
-            # DepthOfField Component
-            "DepthOfField Entity successfully created",
-            "DepthOfField_test: Component added to the entity: True",
-            "DepthOfField_test: Component removed after UNDO: True",
-            "DepthOfField_test: Component added after REDO: True",
-            "DepthOfField_test: Entered game mode: True",
-            "DepthOfField_test: Exit game mode: True",
-            "DepthOfField_test: Entity disabled initially: True",
-            "DepthOfField_test: Entity enabled after adding required components: True",
-            "DepthOfField Controller|Configuration|Camera Entity: SUCCESS",
-            "DepthOfField_test: Entity is hidden: True",
-            "DepthOfField_test: Entity is shown: True",
-            "DepthOfField_test: Entity deleted: True",
-            "DepthOfField_test: UNDO entity deletion works: True",
-            "DepthOfField_test: REDO entity deletion works: True",
-            # Directional Light Component
-            "Directional Light Entity successfully created",
-            "Directional Light_test: Component added to the entity: True",
-            "Directional Light_test: Component removed after UNDO: True",
-            "Directional Light_test: Component added after REDO: True",
-            "Directional Light_test: Entered game mode: True",
-            "Directional Light_test: Exit game mode: True",
-            "Directional Light Controller|Configuration|Shadow|Camera: SUCCESS",
-            "Directional Light_test: Entity is hidden: True",
-            "Directional Light_test: Entity is shown: True",
-            "Directional Light_test: Entity deleted: True",
-            "Directional Light_test: UNDO entity deletion works: True",
-            "Directional Light_test: REDO entity deletion works: True",
-            # Exposure Control Component
-            "Exposure Control Entity successfully created",
-            "Exposure Control_test: Component added to the entity: True",
-            "Exposure Control_test: Component removed after UNDO: True",
-            "Exposure Control_test: Component added after REDO: True",
-            "Exposure Control_test: Entered game mode: True",
-            "Exposure Control_test: Exit game mode: True",
-            "Exposure Control_test: Entity disabled initially: True",
-            "Exposure Control_test: Entity enabled after adding required components: True",
-            "Exposure Control_test: Entity is hidden: True",
-            "Exposure Control_test: Entity is shown: True",
-            "Exposure Control_test: Entity deleted: True",
-            "Exposure Control_test: UNDO entity deletion works: True",
-            "Exposure Control_test: REDO entity deletion works: True",
-            # Global Skylight (IBL) Component
-            "Global Skylight (IBL) Entity successfully created",
-            "Global Skylight (IBL)_test: Component added to the entity: True",
-            "Global Skylight (IBL)_test: Component removed after UNDO: True",
-            "Global Skylight (IBL)_test: Component added after REDO: True",
-            "Global Skylight (IBL)_test: Entered game mode: True",
-            "Global Skylight (IBL)_test: Exit game mode: True",
-            "Global Skylight (IBL) Controller|Configuration|Diffuse Image: SUCCESS",
-            "Global Skylight (IBL) Controller|Configuration|Specular Image: SUCCESS",
-            "Global Skylight (IBL)_test: Entity is hidden: True",
-            "Global Skylight (IBL)_test: Entity is shown: True",
-            "Global Skylight (IBL)_test: Entity deleted: True",
-            "Global Skylight (IBL)_test: UNDO entity deletion works: True",
-            "Global Skylight (IBL)_test: REDO entity deletion works: True",
-            # Physical Sky Component
-            "Physical Sky Entity successfully created",
-            "Physical Sky component was added to entity",
-            "Entity has a Physical Sky component",
-            "Physical Sky_test: Component added to the entity: True",
-            "Physical Sky_test: Component removed after UNDO: True",
-            "Physical Sky_test: Component added after REDO: True",
-            "Physical Sky_test: Entered game mode: True",
-            "Physical Sky_test: Exit game mode: True",
-            "Physical Sky_test: Entity is hidden: True",
-            "Physical Sky_test: Entity is shown: True",
-            "Physical Sky_test: Entity deleted: True",
-            "Physical Sky_test: UNDO entity deletion works: True",
-            "Physical Sky_test: REDO entity deletion works: True",
-            # Point Light Component
-            "Point Light Entity successfully created",
-            "Point Light_test: Component added to the entity: True",
-            "Point Light_test: Component removed after UNDO: True",
-            "Point Light_test: Component added after REDO: True",
-            "Point Light_test: Entered game mode: True",
-            "Point Light_test: Exit game mode: True",
-            "Point Light_test: Entity is hidden: True",
-            "Point Light_test: Entity is shown: True",
-            "Point Light_test: Entity deleted: True",
-            "Point Light_test: UNDO entity deletion works: True",
-            "Point Light_test: REDO entity deletion works: True",
-            # PostFX Layer Component
-            "PostFX Layer Entity successfully created",
-            "PostFX Layer_test: Component added to the entity: True",
-            "PostFX Layer_test: Component removed after UNDO: True",
-            "PostFX Layer_test: Component added after REDO: True",
-            "PostFX Layer_test: Entered game mode: True",
-            "PostFX Layer_test: Exit game mode: True",
-            "PostFX Layer_test: Entity is hidden: True",
-            "PostFX Layer_test: Entity is shown: True",
-            "PostFX Layer_test: Entity deleted: True",
-            "PostFX Layer_test: UNDO entity deletion works: True",
-            "PostFX Layer_test: REDO entity deletion works: True",
-            # Radius Weight Modifier Component
-            "Radius Weight Modifier Entity successfully created",
-            "Radius Weight Modifier_test: Component added to the entity: True",
-            "Radius Weight Modifier_test: Component removed after UNDO: True",
-            "Radius Weight Modifier_test: Component added after REDO: True",
-            "Radius Weight Modifier_test: Entered game mode: True",
-            "Radius Weight Modifier_test: Exit game mode: True",
-            "Radius Weight Modifier_test: Entity is hidden: True",
-            "Radius Weight Modifier_test: Entity is shown: True",
-            "Radius Weight Modifier_test: Entity deleted: True",
-            "Radius Weight Modifier_test: UNDO entity deletion works: True",
-            "Radius Weight Modifier_test: REDO entity deletion works: True",
-            # Light Component
-            "Light Entity successfully created",
-            "Light_test: Component added to the entity: True",
-            "Light_test: Component removed after UNDO: True",
-            "Light_test: Component added after REDO: True",
-            "Light_test: Entered game mode: True",
-            "Light_test: Exit game mode: True",
-            "Light_test: Entity is hidden: True",
-            "Light_test: Entity is shown: True",
-            "Light_test: Entity deleted: True",
-            "Light_test: UNDO entity deletion works: True",
-            "Light_test: REDO entity deletion works: True",
-            # Display Mapper Component
-            "Display Mapper Entity successfully created",
-            "Display Mapper_test: Component added to the entity: True",
-            "Display Mapper_test: Component removed after UNDO: True",
-            "Display Mapper_test: Component added after REDO: True",
-            "Display Mapper_test: Entered game mode: True",
-            "Display Mapper_test: Exit game mode: True",
-            "Display Mapper_test: Entity is hidden: True",
-            "Display Mapper_test: Entity is shown: True",
-            "Display Mapper_test: Entity deleted: True",
-            "Display Mapper_test: UNDO entity deletion works: True",
-            "Display Mapper_test: REDO entity deletion works: True",
-        ]
-
-        unexpected_lines = [
-            "failed to open",
-            "Traceback (most recent call last):",
-        ]
+class TestAtomEditorComponentsMain(object):
 
-        hydra.launch_and_validate_results(
-            request,
-            TEST_DIRECTORY,
-            editor,
-            "hydra_AtomEditorComponents_AddedToEntity.py",
-            timeout=EDITOR_TIMEOUT,
-            expected_lines=expected_lines,
-            unexpected_lines=unexpected_lines,
-            halt_on_unexpected=True,
-            null_renderer=True,
-            cfg_args=cfg_args,
-        )
+    # It requires at least one test
+    def test_Dummy(self, request, editor, level, workspace, project, launcher_platform):
+        pass
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
index 01474e6018..8ca5b5aa31 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
@@ -7,6 +7,8 @@ distribution (the "License"). All use of this software is governed by the Licens
 or, if provided, by the license below or the license accompanying this file. Do not
 remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Sandbox suite tests for the Atom renderer.
 """
 
 import pytest
@@ -15,8 +17,172 @@ import pytest
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("level", ["auto_test"])
-class TestAtomEditorComponents(object):
+class TestAtomEditorComponentsSandbox(object):
+
+    @pytest.mark.test_case_id(
+        "C32078117",  # Area Light
+        "C32078130",  # Display Mapper
+        "C32078129",  # Light
+        "C32078131",  # Radius Weight Modifier
+        "C32078127",  # PostFX Layer
+        "C32078126",  # Point Light
+        "C32078125",  # Physical Sky
+        "C32078115",  # Global Skylight (IBL)
+        "C32078121",  # Exposure Control
+        "C32078120",  # Directional Light
+        "C32078119",  # DepthOfField
+        "C32078118")  # Decal
+    def test_AtomEditorComponents_AddedToEntity(self, request, editor, level, workspace, project, launcher_platform):
+        cfg_args = [level]
+
+        expected_lines = [
+            # Decal Component
+            "Decal (Atom) Entity successfully created",
+            "Decal (Atom)_test: Component added to the entity: True",
+            "Decal (Atom)_test: Component removed after UNDO: True",
+            "Decal (Atom)_test: Component added after REDO: True",
+            "Decal (Atom)_test: Entered game mode: True",
+            "Decal (Atom)_test: Exit game mode: True",
+            "Decal (Atom) Controller|Configuration|Material: SUCCESS",
+            "Decal (Atom)_test: Entity is hidden: True",
+            "Decal (Atom)_test: Entity is shown: True",
+            "Decal (Atom)_test: Entity deleted: True",
+            "Decal (Atom)_test: UNDO entity deletion works: True",
+            "Decal (Atom)_test: REDO entity deletion works: True",
+            # DepthOfField Component
+            "DepthOfField Entity successfully created",
+            "DepthOfField_test: Component added to the entity: True",
+            "DepthOfField_test: Component removed after UNDO: True",
+            "DepthOfField_test: Component added after REDO: True",
+            "DepthOfField_test: Entered game mode: True",
+            "DepthOfField_test: Exit game mode: True",
+            "DepthOfField_test: Entity disabled initially: True",
+            "DepthOfField_test: Entity enabled after adding required components: True",
+            "DepthOfField Controller|Configuration|Camera Entity: SUCCESS",
+            "DepthOfField_test: Entity is hidden: True",
+            "DepthOfField_test: Entity is shown: True",
+            "DepthOfField_test: Entity deleted: True",
+            "DepthOfField_test: UNDO entity deletion works: True",
+            "DepthOfField_test: REDO entity deletion works: True",
+            # Directional Light Component
+            "Directional Light Entity successfully created",
+            "Directional Light_test: Component added to the entity: True",
+            "Directional Light_test: Component removed after UNDO: True",
+            "Directional Light_test: Component added after REDO: True",
+            "Directional Light_test: Entered game mode: True",
+            "Directional Light_test: Exit game mode: True",
+            "Directional Light Controller|Configuration|Shadow|Camera: SUCCESS",
+            "Directional Light_test: Entity is hidden: True",
+            "Directional Light_test: Entity is shown: True",
+            "Directional Light_test: Entity deleted: True",
+            "Directional Light_test: UNDO entity deletion works: True",
+            "Directional Light_test: REDO entity deletion works: True",
+            # Exposure Control Component
+            "Exposure Control Entity successfully created",
+            "Exposure Control_test: Component added to the entity: True",
+            "Exposure Control_test: Component removed after UNDO: True",
+            "Exposure Control_test: Component added after REDO: True",
+            "Exposure Control_test: Entered game mode: True",
+            "Exposure Control_test: Exit game mode: True",
+            "Exposure Control_test: Entity disabled initially: True",
+            "Exposure Control_test: Entity enabled after adding required components: True",
+            "Exposure Control_test: Entity is hidden: True",
+            "Exposure Control_test: Entity is shown: True",
+            "Exposure Control_test: Entity deleted: True",
+            "Exposure Control_test: UNDO entity deletion works: True",
+            "Exposure Control_test: REDO entity deletion works: True",
+            # Global Skylight (IBL) Component
+            "Global Skylight (IBL) Entity successfully created",
+            "Global Skylight (IBL)_test: Component added to the entity: True",
+            "Global Skylight (IBL)_test: Component removed after UNDO: True",
+            "Global Skylight (IBL)_test: Component added after REDO: True",
+            "Global Skylight (IBL)_test: Entered game mode: True",
+            "Global Skylight (IBL)_test: Exit game mode: True",
+            "Global Skylight (IBL) Controller|Configuration|Diffuse Image: SUCCESS",
+            "Global Skylight (IBL) Controller|Configuration|Specular Image: SUCCESS",
+            "Global Skylight (IBL)_test: Entity is hidden: True",
+            "Global Skylight (IBL)_test: Entity is shown: True",
+            "Global Skylight (IBL)_test: Entity deleted: True",
+            "Global Skylight (IBL)_test: UNDO entity deletion works: True",
+            "Global Skylight (IBL)_test: REDO entity deletion works: True",
+            # Physical Sky Component
+            "Physical Sky Entity successfully created",
+            "Physical Sky component was added to entity",
+            "Entity has a Physical Sky component",
+            "Physical Sky_test: Component added to the entity: True",
+            "Physical Sky_test: Component removed after UNDO: True",
+            "Physical Sky_test: Component added after REDO: True",
+            "Physical Sky_test: Entered game mode: True",
+            "Physical Sky_test: Exit game mode: True",
+            "Physical Sky_test: Entity is hidden: True",
+            "Physical Sky_test: Entity is shown: True",
+            "Physical Sky_test: Entity deleted: True",
+            "Physical Sky_test: UNDO entity deletion works: True",
+            "Physical Sky_test: REDO entity deletion works: True",
+            # PostFX Layer Component
+            "PostFX Layer Entity successfully created",
+            "PostFX Layer_test: Component added to the entity: True",
+            "PostFX Layer_test: Component removed after UNDO: True",
+            "PostFX Layer_test: Component added after REDO: True",
+            "PostFX Layer_test: Entered game mode: True",
+            "PostFX Layer_test: Exit game mode: True",
+            "PostFX Layer_test: Entity is hidden: True",
+            "PostFX Layer_test: Entity is shown: True",
+            "PostFX Layer_test: Entity deleted: True",
+            "PostFX Layer_test: UNDO entity deletion works: True",
+            "PostFX Layer_test: REDO entity deletion works: True",
+            # Radius Weight Modifier Component
+            "Radius Weight Modifier Entity successfully created",
+            "Radius Weight Modifier_test: Component added to the entity: True",
+            "Radius Weight Modifier_test: Component removed after UNDO: True",
+            "Radius Weight Modifier_test: Component added after REDO: True",
+            "Radius Weight Modifier_test: Entered game mode: True",
+            "Radius Weight Modifier_test: Exit game mode: True",
+            "Radius Weight Modifier_test: Entity is hidden: True",
+            "Radius Weight Modifier_test: Entity is shown: True",
+            "Radius Weight Modifier_test: Entity deleted: True",
+            "Radius Weight Modifier_test: UNDO entity deletion works: True",
+            "Radius Weight Modifier_test: REDO entity deletion works: True",
+            # Light Component
+            "Light Entity successfully created",
+            "Light_test: Component added to the entity: True",
+            "Light_test: Component removed after UNDO: True",
+            "Light_test: Component added after REDO: True",
+            "Light_test: Entered game mode: True",
+            "Light_test: Exit game mode: True",
+            "Light_test: Entity is hidden: True",
+            "Light_test: Entity is shown: True",
+            "Light_test: Entity deleted: True",
+            "Light_test: UNDO entity deletion works: True",
+            "Light_test: REDO entity deletion works: True",
+            # Display Mapper Component
+            "Display Mapper Entity successfully created",
+            "Display Mapper_test: Component added to the entity: True",
+            "Display Mapper_test: Component removed after UNDO: True",
+            "Display Mapper_test: Component added after REDO: True",
+            "Display Mapper_test: Entered game mode: True",
+            "Display Mapper_test: Exit game mode: True",
+            "Display Mapper_test: Entity is hidden: True",
+            "Display Mapper_test: Entity is shown: True",
+            "Display Mapper_test: Entity deleted: True",
+            "Display Mapper_test: UNDO entity deletion works: True",
+            "Display Mapper_test: REDO entity deletion works: True",
+        ]
+
+        unexpected_lines = [
+            "failed to open",
+            "Traceback (most recent call last):",
+        ]
 
-    # It requires at least one test
-    def test_Dummy(self, request, editor, level, workspace, project, launcher_platform):
-        pass
+        hydra.launch_and_validate_results(
+            request,
+            TEST_DIRECTORY,
+            editor,
+            "hydra_AtomEditorComponents_AddedToEntity.py",
+            timeout=EDITOR_TIMEOUT,
+            expected_lines=expected_lines,
+            unexpected_lines=unexpected_lines,
+            halt_on_unexpected=True,
+            null_renderer=True,
+            cfg_args=cfg_args,
+        )
diff --git a/AutomatedTesting/Registry/assets_scan_folders.setreg b/AutomatedTesting/Registry/assets_scan_folders.setreg
index 5394d381a3..91061f3337 100644
--- a/AutomatedTesting/Registry/assets_scan_folders.setreg
+++ b/AutomatedTesting/Registry/assets_scan_folders.setreg
@@ -38,6 +38,13 @@
                     "Gems/PrimitiveAssets"
                 ]
             },
+            "MaterialEditor":
+            {
+                "SourcePaths":
+                [
+                    "Gems/Atom/Tools/MaterialEditor"
+                ]
+            },
             "UiBasics":
             {
                 "SourcePaths":
diff --git a/AutomatedTesting/sounds/wwise_project/Helios.wproj b/AutomatedTesting/sounds/wwise_project/Helios.wproj
deleted file mode 100644
index 3db6efcfdf..0000000000
--- a/AutomatedTesting/sounds/wwise_project/Helios.wproj
+++ /dev/null
@@ -1,13159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WwiseDocument Type="Project" SchemaVersion="97" WwiseVersion="v2019.2.7" WwiseBuild="7402">
-	<ProjectInfo>
-		<Project Name="Helios" ID="{D7AAA377-9B18-478D-BD26-2FDA8A998548}">
-			<Platforms>
-				<Platform Name="Windows" ReferencePlatform="Windows" ID="{DB9B5E23-680E-46C7-BD5F-66BCEA764F26}"/>
-			</Platforms>
-			<LanguageList>
-				<Language Name="English(US)" ID="{E08E7BF2-B270-4F83-9E9E-25DD6FB8D09D}"/>
-				<Language Name="External" ID="{CB7EE9AC-46D7-4F62-8A15-79C34EF7EF2A}"/>
-				<Language Name="Mixed" ID="{1C6181F4-E393-4147-B3E1-F8529DC212F9}"/>
-				<Language Name="SFX" ID="{8F6C361D-474B-491F-8673-079F24CB8D36}"/>
-			</LanguageList>
-			<PropertyList>
-				<Property Name="ExternalSourcesInputPath" Type="string">
-					<ValueList>
-						<Value Platform="Windows"></Value>
-					</ValueList>
-				</Property>
-				<Property Name="ExternalSourcesOutputPath" Type="string">
-					<ValueList>
-						<Value Platform="Windows">GeneratedSoundBanks\Windows</Value>
-					</ValueList>
-				</Property>
-				<Property Name="GlobalVoiceInstancesLimit" Type="int16">
-					<ValueList>
-						<Value Platform="Windows">256</Value>
-					</ValueList>
-				</Property>
-				<Property Name="SoundBankHeaderFilePath" Type="string" Value="GeneratedSoundBanks"/>
-				<Property Name="SoundBankPaths" Type="string">
-					<ValueList>
-						<Value Platform="Windows">..\wwise\</Value>
-					</ValueList>
-				</Property>
-				<Property Name="SoundBankPostGenerateCustomCmdDescription" Type="string">
-					<ValueList>
-						<Value Platform="Windows">Copy Streamed Files and Generate Dependency Info</Value>
-					</ValueList>
-				</Property>
-				<Property Name="SoundBankPostGenerateCustomCmdLines" Type="string">
-					<ValueList>
-						<Value Platform="Windows">"$(WwiseExePath)\CopyStreamedFiles.exe" -info "$(InfoFilePath)" -outputpath "$(SoundBankPath)" -banks "$(SoundBankListAsTextFile)" -languages "$(LanguageList)"
-"$(WwiseProjectPath)\..\..\..\Tools\Python\python3.cmd" "$(WwiseProjectPath)\..\..\..\Gems\AudioEngineWwise\Tools\WwiseAuthoringScripts\bank_info_parser.py" "$(InfoFilePath)" "$(SoundBankPath)"</Value>
-					</ValueList>
-				</Property>
-				<Property Name="SoundBankPreGenerateCustomCmdDescription" Type="string">
-					<ValueList>
-						<Value Platform="Windows"></Value>
-					</ValueList>
-				</Property>
-				<Property Name="SoundBankPreGenerateCustomCmdLines" Type="string">
-					<ValueList>
-						<Value Platform="Windows"></Value>
-					</ValueList>
-				</Property>
-				<Property Name="VolumeThreshold" Type="Real64">
-					<ValueList>
-						<Value Platform="Windows">-80</Value>
-					</ValueList>
-				</Property>
-				<Property Name="WwiseVersionWhenCreated" Type="string" Value="Branch=wwise_v2018.1|Build=6807|VersionName=v2018.1.4|Config=Release"/>
-			</PropertyList>
-			<MiscSettings>
-				<MiscSettingEntry Name="Cache"><![CDATA[.cache]]></MiscSettingEntry>
-				<MiscSettingEntry Name="Originals"><![CDATA[Originals]]></MiscSettingEntry>
-			</MiscSettings>
-			<SharedValues>
-				<SharedPropertyList ClassName="AudioSource" PluginType="0" CompanyID="1" PluginID="0">
-					<PropertyList>
-						<Property Name="ChannelConfigOverride" Type="int64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CrossfadeDuration" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CrossfadeShape" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeInDuration" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeInShape" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutDuration" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutShape" Type="int16">
-							<ValueList>
-								<Value>8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelope" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoopBegin" Type="Real64">
-							<ValueList>
-								<Value>-1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoopEnd" Type="Real64">
-							<ValueList>
-								<Value>-1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerDetectionSensitivity" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerInputMode" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideWavLoop" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TrimBegin" Type="Real64">
-							<ValueList>
-								<Value>-1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TrimEnd" Type="Real64">
-							<ValueList>
-								<Value>-1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VolumeOffset" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="PCM" PluginType="1" CompanyID="0" PluginID="1"/>
-				<SharedPropertyList ClassName="Sound" PluginType="0" CompanyID="1" PluginID="1">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InitialDelay" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsLoopingEnabled" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsLoopingInfinite" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsNonCachable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsStreamingEnabled" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsZeroLantency" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoopCount" Type="int32">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiBreakOnNoteOff" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiChannelFilter" Type="int32">
-							<ValueList>
-								<Value>65535</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiPlayOnNoteType" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTrackingRootNote" Type="int32">
-							<ValueList>
-								<Value>60</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTransposition" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityOffset" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiEventsBehavior" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreFetchLength" Type="int16">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Weight" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ADPCM" PluginType="1" CompanyID="0" PluginID="2">
-					<PropertyList>
-						<Property Name="FixLoopMethod" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Folder" PluginType="0" CompanyID="1" PluginID="2">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="iZotope Hybrid Reverb" PluginType="3" CompanyID="259" PluginID="2">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayHighFrequency" Type="Real32">
-							<ValueList>
-								<Value>10000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayHighRatio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayLowFrequency" Type="Real32">
-							<ValueList>
-								<Value>400</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayLowRatio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayMidRatio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayTime" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EarlyGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrontDry" Type="Real32">
-							<ValueList>
-								<Value>-96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrontWet" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PredelayFront" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PredelayRear" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Quality" Type="int32">
-							<ValueList>
-								<Value>16</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RearDry" Type="Real32">
-							<ValueList>
-								<Value>-96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RearWet" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundEngineSampleRateDefault" Type="int32">
-							<ValueList>
-								<Value>48000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TailGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="XMA" PluginType="1" CompanyID="0" PluginID="3">
-					<PropertyList>
-						<Property Name="BlockSize" Type="int32">
-							<ValueList>
-								<Value>16</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterHigh" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FixLoopMethod" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Quality" Type="int32">
-							<ValueList>
-								<Value>75</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Project" PluginType="0" CompanyID="1" PluginID="3">
-					<PropertyList>
-						<Property Name="AlwaysSaveMediaIDsFile" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AutoDetectFFTWindowSize" Type="int16">
-							<ValueList>
-								<Value>512</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AutoDetectThresholdHigh" Type="Real64">
-							<ValueList>
-								<Value>-50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AutoDetectThresholdLow" Type="Real64">
-							<ValueList>
-								<Value>-30</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AutoDetectThresholdMedium" Type="Real64">
-							<ValueList>
-								<Value>-40</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CommPortDiscoveryBroadcast" Type="Uint16">
-							<ValueList>
-								<Value>24024</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CommPortDiscoveryResponse" Type="Uint16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CommSerialPortBase" Type="Uint16">
-							<ValueList>
-								<Value>8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DefaultLanguage" Type="string">
-							<ValueList>
-								<Value>English(US)</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventActionNamePosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventNameCaseType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventNameModifyCase" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExternalSourcesInputPath" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExternalSourcesOutputPath" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyWeighting" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateMainSoundBank" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateMultipleBanks" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateSoundBankJSON" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateSoundBankXML" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GlobalVoiceInstancesLimit" Type="int16">
-							<ValueList>
-								<Value>256</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LicenseKey" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxDangerousVirtualVoices" Type="Uint32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxMessagesPerMessageId" Type="Uint32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MediaIDsInSingleFile" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankAllowExceedingSB" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankDefinitionFileFormat" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateDefinitionFile" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateEstimatedDuration" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateHeaderFile" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateMaxAttenuationInfo" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGeneratePrintGUID" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankHeaderFilePath" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankIncludeSoundbankNamesStrings" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPaths" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPostGenerateCustomCmdDescription" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPostGenerateCustomCmdLines" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPreGenerateCustomCmdDescription" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPreGenerateCustomCmdLines" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankUpdateAudioFiles" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseActionNameForEvent" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseDefaultLanguage" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxDangerousVirtualVoices" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxMessagesPerMessageId" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VolumeThreshold" Type="Real64">
-							<ValueList>
-								<Value>-80</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WwiseVersionWhenCreated" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="iZotope Trash Distortion" PluginType="3" CompanyID="259" PluginID="3">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Vorbis" PluginType="1" CompanyID="0" PluginID="4">
-					<PropertyList>
-						<Property Name="AverageBitrate" Type="Real32">
-							<ValueList>
-								<Value>64</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AverageTrackSlewTime" Type="Real32">
-							<ValueList>
-								<Value>1.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BitReservoirTime" Type="Real32">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BitrateManagmentMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAdvancedSettings" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableMaximumBitrate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableMinimumBitrate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaximumBitrate" Type="Real32">
-							<ValueList>
-								<Value>64</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MinimumBitrate" Type="Real32">
-							<ValueList>
-								<Value>64</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QualityFactor" Type="Real32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderLineAlgo" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReservoirBiasFactor" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SeekTableGranularity" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Event" PluginType="0" CompanyID="1" PluginID="4">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="iZotope Trash Delay" PluginType="3" CompanyID="259" PluginID="4">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryOut" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Feedback" Type="Real32">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HighCutoff" Type="Real32">
-							<ValueList>
-								<Value>10000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HighQ" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LowCutoff" Type="Real32">
-							<ValueList>
-								<Value>80</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LowQ" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Time" Type="Real32">
-							<ValueList>
-								<Value>200</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Trash" Type="Real32">
-							<ValueList>
-								<Value>0.25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetOut" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Action" PluginType="0" CompanyID="1" PluginID="5">
-					<PropertyList>
-						<Property Name="AbsoluteOrRelative" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ActionType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ApplyToDynamicSequence" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ApplyToStateTransition" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassGameParameterInternalTransition" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Delay" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeInCurve" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutCurve" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameParameterValue" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MasterResume" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PauseDelayedResumeAction" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Probability" Type="Real64">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ResumeStateTransition" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Scope" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SeekPercent" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SeekTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SeekToMarker" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SeekType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="iZotope Trash Dynamics Mono" PluginType="3" CompanyID="259" PluginID="5">
-					<PropertyList>
-						<Property Name="Bypass" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CompressorAttack" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CompressorRatio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CompressorRelease" Type="Real32">
-							<ValueList>
-								<Value>200</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CompressorThreshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateAttack" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateRatio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateRelease" Type="Real32">
-							<ValueList>
-								<Value>200</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateThreshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="State" PluginType="0" CompanyID="1" PluginID="6">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="iZotope Trash Filters" PluginType="3" CompanyID="259" PluginID="6">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Frequency" Type="Real32">
-							<ValueList>
-								<Value>40</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1LFOPeriod" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1LFOTargetFreq" Type="Real32">
-							<ValueList>
-								<Value>160</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1LFOTargetGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1LFOTargetQ" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1LFOTargetRes" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1LFOType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Q" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Resonance" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Trigger" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2LFOPeriod" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2LFOTargetGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2LFOTargetRes" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2LFOType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Q" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Res" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2TargetFreq" Type="Real32">
-							<ValueList>
-								<Value>3000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2TargetQ" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Trigger" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Type" Type="int32">
-							<ValueList>
-								<Value>6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Frequency" Type="Real32">
-							<ValueList>
-								<Value>15000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3LFOPeriod" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3LFOTargetFreq" Type="Real32">
-							<ValueList>
-								<Value>20000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3LFOTargetGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3LFOTargetQ" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3LFOTargetRes" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3LFOType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Q" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Resonance" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Trigger" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Type" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="StateGroup" PluginType="0" CompanyID="1" PluginID="7">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DefaultTransitionTime" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="iZotope Trash Box Modeler" PluginType="3" CompanyID="259" PluginID="7">
-					<PropertyList>
-						<Property Name="BoxModel" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Length" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MicType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Trim" Type="Real32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ActorMixer" PluginType="0" CompanyID="1" PluginID="8">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiBreakOnNoteOff" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiChannelFilter" Type="int32">
-							<ValueList>
-								<Value>65535</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiPlayOnNoteType" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTrackingRootNote" Type="int32">
-							<ValueList>
-								<Value>60</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTransposition" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityOffset" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiEventsBehavior" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="RandomSequenceContainer" PluginType="0" CompanyID="1" PluginID="9">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GlobalOrPerObject" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InitialDelay" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiBreakOnNoteOff" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiChannelFilter" Type="int32">
-							<ValueList>
-								<Value>65535</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiPlayOnNoteType" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTrackingRootNote" Type="int32">
-							<ValueList>
-								<Value>60</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTransposition" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityOffset" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NormalOrShuffle" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiEventsBehavior" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismInfiniteOrNumberOfLoops" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismLoop" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismLoopCount" Type="int32">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismResetPlaylistEachPlay" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismSpecialTransitions" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismSpecialTransitionsType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismSpecialTransitionsValue" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismStepOrContinuous" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RandomAvoidRepeating" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RandomAvoidRepeatingCount" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RandomOrSequence" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RestartBeginningOrBackward" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Weight" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="iZotope Trash Multiband Distortion" PluginType="3" CompanyID="259" PluginID="9">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band1InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band1Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band1OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band1Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band1Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band1Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band2InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band2Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band2OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band2Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band2Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band2Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band3InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band3Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band3OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band3Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band3Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion1Band3Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band1InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band1Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band1OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band1Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band1Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band1Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band2InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band2Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band2OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band2Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band2Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band2Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band3InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band3Mix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band3OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band3Overdrive" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band3Trash" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Distortion2Band3Type" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MultibandCrossover1" Type="Real32">
-							<ValueList>
-								<Value>5000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MultibandCrossover2" Type="Real32">
-							<ValueList>
-								<Value>10000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="AAC" PluginType="1" CompanyID="0" PluginID="10">
-					<PropertyList>
-						<Property Name="EnableHighEfficiency" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EncodingMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EncodingOptions" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Quality" Type="Real32">
-							<ValueList>
-								<Value>9</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SwitchContainer" PluginType="0" CompanyID="1" PluginID="10">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InitialDelay" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiBreakOnNoteOff" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiChannelFilter" Type="int32">
-							<ValueList>
-								<Value>65535</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiPlayOnNoteType" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTrackingRootNote" Type="int32">
-							<ValueList>
-								<Value>60</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTransposition" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityOffset" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiEventsBehavior" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SwitchBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Weight" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Path" PluginType="0" CompanyID="1" PluginID="11">
-					<PropertyList>
-						<Property Name="AppendOffset" Type="Uint32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Duration" Type="Uint32">
-							<ValueList>
-								<Value>5000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Flags" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LinearTime" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RandomX" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RandomY" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RandomZ" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ATRAC9" PluginType="1" CompanyID="0" PluginID="12">
-					<PropertyList>
-						<Property Name="BitRate" Type="int32">
-							<ValueList>
-								<Value>96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EncodeBands" Type="int32">
-							<ValueList>
-								<Value>-100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IntensityStartBand" Type="int32">
-							<ValueList>
-								<Value>-100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QuantizationNoiseGradiant" Type="int32">
-							<ValueList>
-								<Value>-100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Superframes" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseVibration" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Position" PluginType="0" CompanyID="1" PluginID="12">
-					<PropertyList>
-						<Property Name="NewPathForEachSound" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PanX" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PanY" Type="Real64">
-							<ValueList>
-								<Value>35</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PanZ" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismLoop" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismRandomOrSequence" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismStepOrContinuous" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismTransitionTime" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMechanismTransitionUse" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Curve" PluginType="0" CompanyID="1" PluginID="14">
-					<PropertyList>
-						<Property Name="Flags" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Modifier" PluginType="0" CompanyID="1" PluginID="15">
-					<PropertyList>
-						<Property Name="Enabled" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Max" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Min" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="OpusNX" PluginType="1" CompanyID="0" PluginID="17">
-					<PropertyList>
-						<Property Name="EncodingMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrameSize" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Quality" Type="Real32">
-							<ValueList>
-								<Value>9</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Effect" PluginType="0" CompanyID="1" PluginID="17">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SoundBank" PluginType="0" CompanyID="1" PluginID="18">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Fill" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Maximum" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Opus" PluginType="1" CompanyID="0" PluginID="19">
-					<PropertyList>
-						<Property Name="FrameSize" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Quality" Type="int32">
-							<ValueList>
-								<Value>64</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SwitchGroup" PluginType="0" CompanyID="1" PluginID="19">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameParameter" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="WEM Opus (Experimental)" PluginType="1" CompanyID="0" PluginID="20">
-					<PropertyList>
-						<Property Name="FrameSize" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Quality" Type="int32">
-							<ValueList>
-								<Value>64</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Switch" PluginType="0" CompanyID="1" PluginID="20">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Bus" PluginType="0" CompanyID="1" PluginID="21">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BusChannelConfig" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrOutputGameParameterMax" Type="Real64">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrOutputGameParameterMin" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrRatio" Type="Real64">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrReleaseTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrReleaseTimeMode" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrThreshold" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxDuckVolume" Type="Real64">
-							<ValueList>
-								<Value>-96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RecoveryTime" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UsedForBackgroundMusic" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ParamControl" PluginType="0" CompanyID="1" PluginID="22">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="GameParameter" PluginType="0" CompanyID="1" PluginID="23">
-					<PropertyList>
-						<Property Name="BindToBuiltInParam" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterTimeDown" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterTimeUp" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InitialValue" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Max" Type="Real64">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Min" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RTPCRamping" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SimulationValue" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SlewRateDown" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SlewRateUp" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ObjectSettingAssoc" PluginType="0" CompanyID="1" PluginID="24">
-					<PropertyList>
-						<Property Name="ContinuePlay" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeInTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FirstOccurenceOnly" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OnSwitchChange" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="WorkUnit" PluginType="0" CompanyID="1" PluginID="25">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SoundcasterSession" PluginType="0" CompanyID="1" PluginID="26">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicSegment" PluginType="0" CompanyID="1" PluginID="27">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EndPosition" Type="Real64">
-							<ValueList>
-								<Value>4000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridFrequencyPreset" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridOffsetCustom" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridOffsetPreset" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTempoSource" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideClockSettings" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTarget" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTempo" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaybackSpeed" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Tempo" Type="Real64">
-							<ValueList>
-								<Value>120</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeSignatureLower" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeSignatureUpper" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicTrack" PluginType="0" CompanyID="1" PluginID="28">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsNonCachable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsStreamingEnabled" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsZeroLantency" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LookAheadTime" Type="int16">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTempoSource" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MusicTrackType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTarget" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTempo" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreFetchLength" Type="int16">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="BlendContainer" PluginType="0" CompanyID="1" PluginID="29">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BlendBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InitialDelay" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiBreakOnNoteOff" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiChannelFilter" Type="int32">
-							<ValueList>
-								<Value>65535</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiKeyFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiPlayOnNoteType" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTrackingRootNote" Type="int32">
-							<ValueList>
-								<Value>60</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTransposition" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMax" Type="int32">
-							<ValueList>
-								<Value>127</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityFilterMin" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiVelocityOffset" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiEventsBehavior" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiNoteTracking" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Weight" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="BlendTrack" PluginType="0" CompanyID="1" PluginID="30">
-					<PropertyList>
-						<Property Name="EnableCrossFading" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Query" PluginType="0" CompanyID="1" PluginID="32">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LogicalOperator" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ObjectType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Platform" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SearchCriteria" PluginType="0" CompanyID="1" PluginID="33">
-					<PropertyList>
-						<Property Name="Attenuation" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ConditionalOperator" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Conversion" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="CurveType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CurveUsage" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DefaultSwitchState" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="Effect" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="EffectClassID" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventsReferencedInOperator" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameParameter" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="HasEmptyAssignation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsChecked" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsLinked" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsSourceOfOverride" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsSpecialSearch" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsUsed" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LeftValue" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LogicalOperator" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Mode" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MusicSegment" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="NumericOperator" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ObjectReferenced" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBus" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="PropertyName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="RTPCOperator" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RightValue" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RndSeqContainerType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SRConversionQuality" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SampleRateConversionType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SourceAudioFormat" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SourceChannelsLFEOption" Type="int32">
-							<ValueList>
-								<Value>-1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SourceChannelsOthersCount" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SourceChannelsOthersOption" Type="int32">
-							<ValueList>
-								<Value>-1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SourceLanguage" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SourceType" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="State" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="StateGroup" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="StatePropertyUsage" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SwitchGroup" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SwitchingOperator" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Trigger" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="UIntValue" Type="Uint32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserString" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="UsingOperator" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicPlaylistContainer" PluginType="0" CompanyID="1" PluginID="34">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridFrequencyPreset" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridOffsetCustom" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridOffsetPreset" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTempoSource" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideClockSettings" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTarget" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTempo" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaybackSpeed" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Tempo" Type="Real64">
-							<ValueList>
-								<Value>120</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeSignatureLower" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeSignatureUpper" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicSwitchContainer" PluginType="0" CompanyID="1" PluginID="35">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BelowThresholdBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ContinuePlay" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLoudnessNormalization" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridFrequencyPreset" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridOffsetCustom" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GridOffsetPreset" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrActiveRange" Type="Real64">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnableEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HdrEnvelopeSensitivity" Type="Real64">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IgnoreParentMaxSoundInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsGlobalLimit" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MakeUpGain" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReachedBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSoundPerInstance" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiTempoSource" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Mode" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverLimitBehavior" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAnalysis" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideAttachableMixerInput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideClockSettings" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideHdrEnvelope" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTarget" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideMidiTempo" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideOutput" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePositioning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverridePriority" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideUserAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideVirtualVoice" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaybackSpeed" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Priority" Type="int16">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceFactor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PriorityDistanceOffset" Type="int16">
-							<ValueList>
-								<Value>-10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RenderEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Tempo" Type="Real64">
-							<ValueList>
-								<Value>120</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeSignatureLower" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeSignatureUpper" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseMaxSoundPerInstance" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VirtualVoiceQueueBehavior" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicPlaylistItem" PluginType="0" CompanyID="1" PluginID="36">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoopCount" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NormalOrShuffle" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayMode" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaylistItemType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RandomAvoidRepeatingCount" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Weight" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicTransition" PluginType="0" CompanyID="1" PluginID="37">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DestinationContextType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DestinationJumpPositionPreset" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DestinationPlaylistJumpTo" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDestinationFadeIn" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableSourceFadeOut" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableTransitionFadeIn" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableTransitionFadeOut" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExitSourceAt" Type="int16">
-							<ValueList>
-								<Value>7</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExitSourceCustomCueMatchName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="IsFolder" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="JumpToCustomCueMatchMode" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="JumpToCustomCueMatchName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayDestinationPreEntry" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaySourcePostExit" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayTransitionPostExit" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayTransitionPreEntry" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SourceContextType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseTransitionObject" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicStinger" PluginType="0" CompanyID="1" PluginID="38">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CustomCueMatchName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="DontPlayAgainTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NumSegmentAdvance" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaySegmentAt" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicFade" PluginType="0" CompanyID="1" PluginID="39">
-					<PropertyList>
-						<Property Name="FadeCurve" Type="int16">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOffset" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Trigger" PluginType="0" CompanyID="1" PluginID="40">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Attenuation" PluginType="0" CompanyID="1" PluginID="41">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ConeAttenuation" Type="Real64">
-							<ValueList>
-								<Value>-6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ConeHighPassFilterValue" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ConeInnerAngle" Type="int32">
-							<ValueList>
-								<Value>90</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ConeLowPassFilterValue" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ConeOuterAngle" Type="int32">
-							<ValueList>
-								<Value>245</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ConeUse" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RadiusMax" Type="Real64">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Panner" PluginType="0" CompanyID="1" PluginID="42">
-					<PropertyList>
-						<Property Name="PanX" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PanY" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="DialogueEvent" PluginType="0" CompanyID="1" PluginID="46">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Mode" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Probability" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="UserProjectSettings" PluginType="0" CompanyID="1" PluginID="51">
-					<PropertyList>
-						<Property Name="ConvertExternalSources" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DefaultSoundVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventActionNamePosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventCreationSettingsOverride" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventNameCaseType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EventNameModifyCase" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExternalSourcesInputPath" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExternalSourcesOutputPath" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExternalSourcesOverrideInputPath" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ExternalSourcesOverrideOutputPath" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateMainSoundBank" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateMultipleBanks" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateSoundBankJSON" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GenerateSoundBankXML" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostGenerateStepUserOverride" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreGenerateStepUserOverride" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SettingsUserOverride" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankAllowExceedingSB" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankDefinitionFileFormat" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateDefinitionFile" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateEstimatedDuration" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateHeaderFile" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGenerateMaxAttenuationInfo" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankGeneratePrintGUID" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankHeaderFilePath" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankIncludeSoundbankNamesStrings" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPathUserOverride" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPaths" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPostGenerateCustomCmdDescription" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPostGenerateCustomCmdLines" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPreGenerateCustomCmdDescription" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankPreGenerateCustomCmdLines" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundBankUpdateAudioFiles" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseActionNameForEvent" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MixingSession" PluginType="0" CompanyID="1" PluginID="53">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="PluginDataSource" PluginType="0" CompanyID="1" PluginID="54">
-					<PropertyList>
-						<Property Name="DataFileName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Conversion" PluginType="0" CompanyID="1" PluginID="55">
-					<PropertyList>
-						<Property Name="AllowChannelUpmix" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Channels" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LRMix" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxSampleRate" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MinSampleRate" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RemoveDCOffset" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SRConversionQuality" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SampleRate" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseDither" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseFilenameMarker" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ExternalSourceFile" PluginType="0" CompanyID="1" PluginID="56">
-					<PropertyList>
-						<Property Name="AnalysisType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideConversion" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ExternalSource" PluginType="0" CompanyID="1" PluginID="57"/>
-				<SharedPropertyList ClassName="MusicTrackSequence" PluginType="0" CompanyID="1" PluginID="58">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicCue" PluginType="0" CompanyID="1" PluginID="59">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CueType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeMs" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicClip" PluginType="0" CompanyID="1" PluginID="60">
-					<PropertyList>
-						<Property Name="BeginTrimOffset" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EndTrimOffset" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeInDuration" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeInMode" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeInShape" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutDuration" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutMode" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutShape" Type="int16">
-							<ValueList>
-								<Value>8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayAt" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="AuxBus" PluginType="0" CompanyID="1" PluginID="61">
-					<PropertyList>
-						<Property Name="3DPosition" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="3DSpatialization" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BusChannelConfig" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect0" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect1" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect2" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BypassEffect3" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPercentage" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableDiffraction" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendHPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendLPF" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameAuxSendVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Highpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldEmitterPositionOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HoldListenerOrientation" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ListenerRelativeRouting" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Lowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusHighpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusLowpass" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputBusVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReflectionsVolume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeakerPanning3DSpatializationMix" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UseGameAuxSends" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendHPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF0" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendLPF3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume0" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume1" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume2" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UserAuxSendVolume3" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Volume" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicClipMidi" PluginType="0" CompanyID="1" PluginID="62">
-					<PropertyList>
-						<Property Name="BeginTrimOffset" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EndTrimOffset" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlayAt" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MidiParameter" PluginType="0" CompanyID="1" PluginID="63">
-					<PropertyList>
-						<Property Name="SimulationValue" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ModulatorLfo" PluginType="0" CompanyID="1" PluginID="64">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LfoAttack" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LfoDepth" Type="Real64">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LfoFrequency" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LfoInitialPhase" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LfoPWM" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LfoSmoothing" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LfoWaveform" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModulatorScope" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ModulatorEnvelope" PluginType="0" CompanyID="1" PluginID="65">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeAttackCurve" Type="Real64">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeAttackTime" Type="Real64">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeAutoRelease" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeDecayTime" Type="Real64">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeReleaseTime" Type="Real64">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeStopPlayback" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeSustainLevel" Type="Real64">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeSustainTime" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeTriggerOn" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModulatorScope" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ControlSurfaceSession" PluginType="0" CompanyID="1" PluginID="66">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ControlSurfaceBinding" PluginType="0" CompanyID="1" PluginID="67">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HardwareControllerKey" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ObjectIndexInView" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TargetClassID" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TargetName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="TargetType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ControlSurfaceBindingGroup" PluginType="0" CompanyID="1" PluginID="68">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GroupType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HardwareControllerKey" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ObjectIndexInView" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TargetClassID" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TargetName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="TargetType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Platform" PluginType="0" CompanyID="1" PluginID="69"/>
-				<SharedPropertyList ClassName="AudioDevice" PluginType="0" CompanyID="1" PluginID="71">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="AcousticTexture" PluginType="0" CompanyID="1" PluginID="72">
-					<PropertyList>
-						<Property Name="AbsorptionHigh" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AbsorptionLow" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AbsorptionMidHigh" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AbsorptionMidLow" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AbsorptionOffset" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Scattering" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Language" PluginType="0" CompanyID="1" PluginID="75">
-					<PropertyList>
-						<Property Name="VolumeOffset" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ActionException" PluginType="0" CompanyID="1" PluginID="76">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MusicEventCue" PluginType="0" CompanyID="1" PluginID="77">
-					<PropertyList>
-						<Property Name="PlayAt" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ModulatorTime" PluginType="0" CompanyID="1" PluginID="78">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeStopPlayback" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeTriggerOn" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModulatorScope" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeModDuration" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeModInitialDelay" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeModLoops" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeModPlaybackRate" Type="Real64">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="CustomState" PluginType="0" CompanyID="1" PluginID="79"/>
-				<SharedPropertyList ClassName="Wwise Sine" PluginType="2" CompanyID="0" PluginID="100">
-					<PropertyList>
-						<Property Name="ChannelMask" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SineDuration" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SineFrequency" Type="Real32">
-							<ValueList>
-								<Value>440</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SineGain" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Resonance Audio Renderer" PluginType="3" CompanyID="272" PluginID="100">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Silence" PluginType="2" CompanyID="0" PluginID="101">
-					<PropertyList>
-						<Property Name="Length" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LengthMax" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LengthMin" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Tone Generator" PluginType="2" CompanyID="0" PluginID="102">
-					<PropertyList>
-						<Property Name="AttackTime" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelMask" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayTime" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FixDur" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseTime" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StartFreq" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StartFreqRandMax" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StartFreqRandMin" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StopFreq" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StopFreqRandMax" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StopFreqRandMin" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SustainLevel" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SustainTime" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SweepFreq" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SweepFreqType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WaveGain" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WaveType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="McDSP ML1" PluginType="3" CompanyID="256" PluginID="103">
-					<PropertyList>
-						<Property Name="Ceiling" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Knee" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Mode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Release" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Threshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Parametric EQ" PluginType="3" CompanyID="0" PluginID="105">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterTypeBand1" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterTypeBand2" Type="int32">
-							<ValueList>
-								<Value>6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterTypeBand3" Type="int32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyBand1" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyBand2" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyBand3" Type="Real32">
-							<ValueList>
-								<Value>12000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainBand1" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainBand2" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainBand3" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OnOffBand1" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OnOffBand2" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OnOffBand3" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorBand1" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorBand2" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorBand3" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Delay" PluginType="3" CompanyID="0" PluginID="106">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Feedback" Type="Real32">
-							<ValueList>
-								<Value>15</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FeedbackEnabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetDryMix" Type="Real32">
-							<ValueList>
-								<Value>25</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Compressor" PluginType="3" CompanyID="0" PluginID="108">
-					<PropertyList>
-						<Property Name="AttackTime" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelLink" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Ratio" Type="Real32">
-							<ValueList>
-								<Value>1.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseTime" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Threshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Expander" PluginType="3" CompanyID="0" PluginID="109">
-					<PropertyList>
-						<Property Name="AttackTime" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelLink" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Ratio" Type="Real32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseTime" Type="Real32">
-							<ValueList>
-								<Value>0.01</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Threshold" Type="Real32">
-							<ValueList>
-								<Value>-40</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Peak Limiter" PluginType="3" CompanyID="0" PluginID="110">
-					<PropertyList>
-						<Property Name="ChannelLink" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LookAhead" Type="Real32">
-							<ValueList>
-								<Value>0.01</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Ratio" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseTime" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Threshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="McDSP FutzBox" PluginType="3" CompanyID="256" PluginID="110">
-					<PropertyList>
-						<Property Name="Balance" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionAmount" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionIntensity" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionRectify" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EQEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EQFilterType" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EQFreq" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EQGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EQQ" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FiltersEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FiltersHPFFreq" Type="Real32">
-							<ValueList>
-								<Value>40</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FiltersHPFQ" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FiltersHPFSlope" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FiltersLPFFreq" Type="Real32">
-							<ValueList>
-								<Value>18000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FiltersLPFQ" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FiltersLPFSlope" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateAttackTime" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateHoldTime" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateRange" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateReleaseTime" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GateThreshold" Type="Real32">
-							<ValueList>
-								<Value>-40</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoFiBitDepthType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoFiDownSampleIndex" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoFiEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoFiFilter" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseHPFFreq" Type="Real32">
-							<ValueList>
-								<Value>40</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseLPFFreq" Type="Real32">
-							<ValueList>
-								<Value>18000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseLevel" Type="Real32">
-							<ValueList>
-								<Value>-96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseRange" Type="Real32">
-							<ValueList>
-								<Value>-20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseRecovery" Type="Real32">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseThresh" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SIMEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SIMTuning" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SIMType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Matrix Reverb" PluginType="3" CompanyID="0" PluginID="115">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayLengthsMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime1" Type="Real32">
-							<ValueList>
-								<Value>13.62</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime10" Type="Real32">
-							<ValueList>
-								<Value>26.09</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime11" Type="Real32">
-							<ValueList>
-								<Value>26.55</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime12" Type="Real32">
-							<ValueList>
-								<Value>26.91</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime13" Type="Real32">
-							<ValueList>
-								<Value>28.04</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime14" Type="Real32">
-							<ValueList>
-								<Value>29.09</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime15" Type="Real32">
-							<ValueList>
-								<Value>29.9</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime16" Type="Real32">
-							<ValueList>
-								<Value>30.86</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime2" Type="Real32">
-							<ValueList>
-								<Value>15.66</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime3" Type="Real32">
-							<ValueList>
-								<Value>17.52</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime4" Type="Real32">
-							<ValueList>
-								<Value>19.02</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime5" Type="Real32">
-							<ValueList>
-								<Value>20.83</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime6" Type="Real32">
-							<ValueList>
-								<Value>22.6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime7" Type="Real32">
-							<ValueList>
-								<Value>24.05</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime8" Type="Real32">
-							<ValueList>
-								<Value>24.78</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime9" Type="Real32">
-							<ValueList>
-								<Value>25.6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryLevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HFRatio" Type="Real32">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NumberOfDelays" Type="int32">
-							<ValueList>
-								<Value>8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreDelay" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReverbTime" Type="Real32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetLevel" Type="Real32">
-							<ValueList>
-								<Value>-35</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SoundSeed Impact" PluginType="3" CompanyID="0" PluginID="116">
-					<PropertyList>
-						<Property Name="BWAmt" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BWVar" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="BandwidthStretchEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FreqAmt" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FreqVar" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyStretchEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MagVar" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MagnitudeScalingEnable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModelQuality" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ResidualLevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise RoomVerb" PluginType="3" CompanyID="0" PluginID="118">
-					<PropertyList>
-						<Property Name="CenterLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DCFilterCutFreq" Type="Real32">
-							<ValueList>
-								<Value>40</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayTime" Type="Real32">
-							<ValueList>
-								<Value>1.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Density" Type="Real32">
-							<ValueList>
-								<Value>80</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DensityDelayMax" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DensityDelayMin" Type="Real32">
-							<ValueList>
-								<Value>8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DensityDelayRdmPerc" Type="Real32">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Diffusion" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DiffusionDelayMax" Type="Real32">
-							<ValueList>
-								<Value>15</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DiffusionDelayRdmPerc" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DiffusionDelayScalePerc" Type="Real32">
-							<ValueList>
-								<Value>66</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryLevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ERFrontBackDelay" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ERLevel" Type="Real32">
-							<ValueList>
-								<Value>-20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ERPattern" Type="int32">
-							<ValueList>
-								<Value>23</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableEarlyReflections" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableToneControls" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Curve" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Freq" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1InsertPos" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter1Q" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Curve" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Freq" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2InsertPos" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter2Q" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Curve" Type="int32">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Freq" Type="Real32">
-							<ValueList>
-								<Value>10000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3InsertPos" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Filter3Q" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrontLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HFDamping" Type="Real32">
-							<ValueList>
-								<Value>2.25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputCenterLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputLFELevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LFELevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreDelay" Type="Real32">
-							<ValueList>
-								<Value>25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Quality" Type="int32">
-							<ValueList>
-								<Value>8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RearLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReverbLevel" Type="Real32">
-							<ValueList>
-								<Value>-20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReverbUnitInputDelay" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReverbUnitInputDelayRmdPerc" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RoomShape" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RoomShapeMax" Type="Real32">
-							<ValueList>
-								<Value>0.8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RoomShapeMin" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RoomSize" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StereoWidth" Type="Real32">
-							<ValueList>
-								<Value>180</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SoundSeed Air Wind" PluginType="2" CompanyID="0" PluginID="119">
-					<PropertyList>
-						<Property Name="AttenuationRollOff" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AverageVelocity" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AverageVelocityAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AverageVelocityRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelMask" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Direction" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DirectionAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DirectionRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Duration" Type="Real64">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyScale" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyScaleAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyScaleRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainOffset" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainOffsetAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainOffsetRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Gustiness" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GustinessAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GustinessRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxDistance" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MinDistance" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaybackRate" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorScale" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorScaleAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorScaleRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Variability" Type="Real32">
-							<ValueList>
-								<Value>0.25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VariabilityAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VariabilityRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VelocityDynamicRange" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SoundSeed Air Woosh" PluginType="2" CompanyID="0" PluginID="120">
-					<PropertyList>
-						<Property Name="AttenuationRollOff" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelMask" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistanceAttenuation" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Duration" Type="Real64">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyScale" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyScaleAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyScaleRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainOffset" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainOffsetAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GainOffsetRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MinDistance" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseColor" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Oversampling" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PlaybackRate" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorScale" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorScaleAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactorScaleRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Speed" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedPointSpeedRandom" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedPointTimeRandom" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="VelocityDynamicRange" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Deflector" PluginType="0" CompanyID="0" PluginID="121">
-					<PropertyList>
-						<Property Name="Frequency" Type="Real32">
-							<ValueList>
-								<Value>440</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PanX" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PanY" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactor" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Deflector" PluginType="0" CompanyID="0" PluginID="122">
-					<PropertyList>
-						<Property Name="Anchor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Frequency" Type="Real32">
-							<ValueList>
-								<Value>440</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactor" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SectionRatio" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Flanger" PluginType="3" CompanyID="0" PluginID="125">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime" Type="Real32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryLevel" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableLFO" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FeedBackLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FeedForwardLevel" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModDepth" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModFrequency" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPWM" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPhaseMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPhaseOffset" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPhaseSpread" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModSmoothing" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModWaveform" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessCenter" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetDryMix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Guitar Distortion" PluginType="3" CompanyID="0" PluginID="126">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionDrive" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionTone" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistortionType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand1Enable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand1FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand1Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand1Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand1QFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand2Enable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand2FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand2Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand2Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand2QFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand3Enable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand3FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand3Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand3Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PostEQBand3QFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand1Enable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand1FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand1Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand1Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand1QFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand2Enable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand2FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand2Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand2Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand2QFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand3Enable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand3FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand3Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand3Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreEQBand3QFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Rectification" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetDryMix" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Convolution Reverb" PluginType="3" CompanyID="0" PluginID="127">
-					<PropertyList>
-						<Property Name="AlgoTypeSelect" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelConfigOverride" Type="int64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryLevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrontLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrontRearDelay" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HardwareAcceleration" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRChannelSelect" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRConvolutionSmooth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRConvolutionSmoothMax" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRConvolutionStart" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRConvolutionStop" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRConvolutionThreshold" Type="Real32">
-							<ValueList>
-								<Value>-75</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRGraphicEQAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRLPFAutomate" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRLPFSlope" Type="int32">
-							<ValueList>
-								<Value>6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRLRMix" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRLevelAutomate" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IRStretch" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputCenterLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputLFELevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputStereoWidth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InputThreshold" Type="Real32">
-							<ValueList>
-								<Value>-60</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LFELevel" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PreDelay" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RearLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundEngineBlockSizeDefault" Type="int32">
-							<ValueList>
-								<Value>1024</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundEngineSampleRateDefault" Type="int32">
-							<ValueList>
-								<Value>48000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundEngineSampleRateMac" Type="int32">
-							<ValueList>
-								<Value>48000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SoundEngineSampleRateiOS" Type="int32">
-							<ValueList>
-								<Value>48000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="StereoWidth" Type="Real32">
-							<ValueList>
-								<Value>180</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Meter" PluginType="3" CompanyID="0" PluginID="129">
-					<PropertyList>
-						<Property Name="ApplyDownstreamVolume" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackTime" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Hold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Max" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MeterMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MeterScope" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Min" Type="Real32">
-							<ValueList>
-								<Value>-48</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseTime" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Time Stretch" PluginType="3" CompanyID="0" PluginID="130">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeStretch" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TimeStretchRandom" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WindowSize" Type="int32">
-							<ValueList>
-								<Value>2048</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Tremolo" PluginType="3" CompanyID="0" PluginID="131">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModDepth" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModFrequency" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPWM" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPhaseMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPhaseOffset" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPhaseSpread" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModSmoothing" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModWaveform" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessCenter" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Recorder" PluginType="3" CompanyID="0" PluginID="132">
-					<PropertyList>
-						<Property Name="AmbisonicsChannelOrdering" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ApplyDownstreamVolume" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AuthoringFilename" Type="string">
-							<ValueList>
-								<Value>Recorder.wav</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Center" Type="Real32">
-							<ValueList>
-								<Value>-3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DownmixToStereo" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Format" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Front" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GameFilename" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LFE" Type="Real32">
-							<ValueList>
-								<Value>-96.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Rear" Type="Real32">
-							<ValueList>
-								<Value>-3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Surround" Type="Real32">
-							<ValueList>
-								<Value>-3</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Stereo Delay" PluginType="3" CompanyID="0" PluginID="135">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableCrossFeed" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableFeedback" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFrequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrontRearBalance" Type="Real32">
-							<ValueList>
-								<Value>-100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LeftCrossfeed" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LeftDelayTime" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LeftFeedback" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LeftInputType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RightCrossfeed" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RightDelayTime" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RightFeedback" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RightInputType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Pitch Shifter" PluginType="3" CompanyID="0" PluginID="136">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DelayTime" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryLevel" Type="Real32">
-							<ValueList>
-								<Value>-96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFrequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Input" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Pitch" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SyncDry" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Harmonizer" PluginType="3" CompanyID="0" PluginID="138">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DryLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Input" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ProcessLFE" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SyncDry" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice1Enable" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice1FilterFrequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice1FilterGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice1FilterQFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice1FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice1Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice1Pitch" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice2Enable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice2FilterFrequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice2FilterGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice2FilterQFactor" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice2FilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice2Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Voice2Pitch" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WetLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WindowSize" Type="int32">
-							<ValueList>
-								<Value>1024</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Gain" PluginType="3" CompanyID="0" PluginID="139">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FullBandGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LFEGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Synth One" PluginType="2" CompanyID="0" PluginID="148">
-					<PropertyList>
-						<Property Name="BaseFrequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FmAmount" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FrequencyMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseLevel" Type="Real32">
-							<ValueList>
-								<Value>-96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="NoiseShape" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OperationMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc1Invert" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc1Level" Type="Real32">
-							<ValueList>
-								<Value>-6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc1Pwm" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc1Transpose" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc1Waveform" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc2Invert" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc2Level" Type="Real32">
-							<ValueList>
-								<Value>-6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc2Pwm" Type="Real32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc2Transpose" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Osc2Waveform" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverSampling" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="AttachableMixerInput" PluginType="3" CompanyID="0" PluginID="150">
-					<PropertyList>
-						<Property Name="Bypass object panning" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Passthrough" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ASIO Output" PluginType="7" CompanyID="0" PluginID="168">
-					<PropertyList>
-						<Property Name="BaseChannel" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelConfig" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Microsoft Spatial Sound Platform Output" PluginType="7" CompanyID="275" PluginID="170">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Reflect" PluginType="3" CompanyID="0" PluginID="171">
-					<PropertyList>
-						<Property Name="BaseTextureFrequency" Type="Real32">
-							<ValueList>
-								<Value>250</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CenterPerc" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="CursorNameCategory" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DistanceThreshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Dry" Type="Real32">
-							<ValueList>
-								<Value>-96</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FadeOutNbFrames" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxDistance" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxReflections" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputChannelConfig" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ParamFilterCutoff" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ParamFilterType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PitchThreshold" Type="Real32">
-							<ValueList>
-								<Value>2400</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedOfSound" Type="Real32">
-							<ValueList>
-								<Value>345</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ThresholdMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Wet" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Channel Router" PluginType="6" CompanyID="0" PluginID="172">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="AttachableMixerInput" PluginType="3" CompanyID="0" PluginID="173">
-					<PropertyList>
-						<Property Name="Channel" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="System" PluginType="7" CompanyID="0" PluginID="174">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="DVR Bypass" PluginType="7" CompanyID="0" PluginID="175">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DVRRecordable" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Communication" PluginType="7" CompanyID="0" PluginID="176">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Controller Headphones" PluginType="7" CompanyID="0" PluginID="177">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Controller Speaker" PluginType="7" CompanyID="0" PluginID="179">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Auxiliary" PluginType="7" CompanyID="0" PluginID="180">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="No Output" PluginType="7" CompanyID="0" PluginID="181">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="SoundSeed Grain" PluginType="2" CompanyID="0" PluginID="183">
-					<PropertyList>
-						<Property Name="Amplitude" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AmplitudeMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Attack" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AttackMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Azimuth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="AzimuthMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Duration" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationLink" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplier" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationMultiplierMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Elevation" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ElevationMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnvelopeType" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreq" Type="Real32">
-							<ValueList>
-								<Value>20000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterFreqMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQ" Type="Real32">
-							<ValueList>
-								<Value>0.707</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterQMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterType" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRate" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainRateMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTime" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="GrainTimeMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelect" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MarkerSelectMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MaxNumGrains" Type="int32">
-							<ValueList>
-								<Value>256</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MidiMapTranspose" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModAmount1" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModAmount2" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModAmount3" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModAmount4" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPeriod1" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPeriod2" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPeriod3" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModPeriod4" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModRate1" Type="Real32">
-							<ValueList>
-								<Value>20000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModRate2" Type="Real32">
-							<ValueList>
-								<Value>20000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModRate3" Type="Real32">
-							<ValueList>
-								<Value>20000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModRate4" Type="Real32">
-							<ValueList>
-								<Value>20000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModSelect1" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModSelect2" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModSelect3" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModSelect4" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModWaveform1" Type="int32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModWaveform2" Type="int32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModWaveform3" Type="int32">
-							<ValueList>
-								<Value>9</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModWaveform4" Type="int32">
-							<ValueList>
-								<Value>9</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Offset" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OffsetMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputChannelConfig" Type="int32">
-							<ValueList>
-								<Value>16641</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OutputLevel" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PositioningSelect" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QuantizeToMarkers" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Release" Type="Real32">
-							<ValueList>
-								<Value>10</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SelectFreqTimeGrain" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Speed" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpeedMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Spread" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SpreadMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Transpose" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod1Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod1Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod2Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod2Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod3Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod3Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod4Depth" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeMod4Quantization" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="TransposeRoot" Type="int32">
-							<ValueList>
-								<Value>60</Value>
-							</ValueList>
-						</Property>
-						<Property Name="WindowMode" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ParameterModulatorAssociation" PluginType="0" CompanyID="0" PluginID="185">
-					<PropertyList>
-						<Property Name="ModDisplayName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModID" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ModName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ParamDisplayName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ParamID" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ParamName" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Mastering Suite" PluginType="3" CompanyID="0" PluginID="186">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand1Attack" Type="Real32">
-							<ValueList>
-								<Value>0.01</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand1Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand1Knee" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand1MakeupGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand1Ratio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand1Release" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand1Threshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand2Attack" Type="Real32">
-							<ValueList>
-								<Value>0.01</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand2Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand2Knee" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand2MakeupGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand2Ratio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand2Release" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand2Threshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand3Attack" Type="Real32">
-							<ValueList>
-								<Value>0.01</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand3Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand3Knee" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand3MakeupGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand3Ratio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand3Release" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand3Threshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand4Attack" Type="Real32">
-							<ValueList>
-								<Value>0.01</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand4Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand4Knee" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand4MakeupGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand4Ratio" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand4Release" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorBand4Threshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorCrossoverFrequency1" Type="Real32">
-							<ValueList>
-								<Value>150</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorCrossoverFrequency2" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorCrossoverFrequency3" Type="Real32">
-							<ValueList>
-								<Value>6000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorLinkMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorLinkStereoPairs" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorLinkStrength" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="compressorNumBands" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="limiterAttack" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="limiterLinkChannels" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="limiterMode" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="limiterOutputGain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="limiterRelease" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="limiterThreshold" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel1" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel10" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel11" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel12" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel2" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel3" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel4" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel5" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel6" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel7" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel8" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="masterVolumeChannel9" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="moduleEnableCompressor" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="moduleEnableLimiter" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="moduleEnableMasterVolume" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="moduleEnableParamEQ" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand1Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand1FilterMode" Type="int32">
-							<ValueList>
-								<Value>5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand1Frequency" Type="Real32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand1Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand1Resonance" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand2Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand2FilterMode" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand2Frequency" Type="Real32">
-							<ValueList>
-								<Value>200</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand2Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand2Resonance" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand3Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand3FilterMode" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand3Frequency" Type="Real32">
-							<ValueList>
-								<Value>500</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand3Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand3Resonance" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand4Enabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand4FilterMode" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand4Frequency" Type="Real32">
-							<ValueList>
-								<Value>1000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand4Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand4Resonance" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand5Enabled" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand5FilterMode" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand5Frequency" Type="Real32">
-							<ValueList>
-								<Value>3000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand5Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand5Resonance" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand6Enabled" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand6FilterMode" Type="int32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand6Frequency" Type="Real32">
-							<ValueList>
-								<Value>6000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand6Gain" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramBand6Resonance" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="paramEqNumBands" Type="int32">
-							<ValueList>
-								<Value>4</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Audio Input" PluginType="2" CompanyID="0" PluginID="200">
-					<PropertyList>
-						<Property Name="AudioInputGain" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Resonance Audio Room Effects" PluginType="6" CompanyID="272" PluginID="200">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="AttachableMixerInput" PluginType="3" CompanyID="272" PluginID="201">
-					<PropertyList>
-						<Property Name="Bypass" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="ASIO Input" PluginType="2" CompanyID="0" PluginID="204">
-					<PropertyList>
-						<Property Name="BaseChannel" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelConfig" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Motion Generator (Deprecated)" PluginType="2" CompanyID="0" PluginID="405">
-					<PropertyList>
-						<Property Name="AttackTime" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DecayTime" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Duration" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DurationType" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Period" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="PeriodMultiplier" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReleaseTime" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SustainLevel" Type="Real32">
-							<ValueList>
-								<Value>-12</Value>
-							</ValueList>
-						</Property>
-						<Property Name="SustainTime" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Motion Source" PluginType="2" CompanyID="0" PluginID="409">
-					<PropertyList>
-						<Property Name="Channel1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Channel2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Channel3" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Channel4" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ChannelConfig" Type="int16">
-							<ValueList>
-								<Value>6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverA" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverB" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverC" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverD" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverE" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverF" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverG" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DriverH" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="High1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="High2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LeftTrigger" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Low1" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Low2" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RightTrigger" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="CrankcaseAudio REV" PluginType="2" CompanyID="261" PluginID="416">
-					<PropertyList>
-						<Property Name="EnableShifting" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Gain" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Gear" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RPM" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RPMGameParameter" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="Throttle" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Velocity" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="EngineSimulationControlData" PluginType="0" CompanyID="261" PluginID="417">
-					<PropertyList>
-						<Property Name="ClutchRPMMergeTime" Type="Real32">
-							<ValueList>
-								<Value>0.6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ClutchRPMSpike" Type="Real32">
-							<ValueList>
-								<Value>0.6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ClutchRPMSpikeDuration" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="DownShiftDuration" Type="Real32">
-							<ValueList>
-								<Value>0.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftAttackDuration" Type="Real32">
-							<ValueList>
-								<Value>0.05</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftAttackRPM" Type="Real32">
-							<ValueList>
-								<Value>0.25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftAttackThrottleTime" Type="Real32">
-							<ValueList>
-								<Value>0.02</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftAttackVolumeSpike" Type="Real32">
-							<ValueList>
-								<Value>1.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftDuration" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftWobbleDuration" Type="Real32">
-							<ValueList>
-								<Value>0.3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftWobbleEnabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftWobblePitchAmp" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftWobblePitchFreq" Type="Real32">
-							<ValueList>
-								<Value>8</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftWobbleVolAmp" Type="Real32">
-							<ValueList>
-								<Value>0.2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="UpShiftWobbleVolFreq" Type="Real32">
-							<ValueList>
-								<Value>12</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="AccelDecelModelControlData" PluginType="0" CompanyID="261" PluginID="418">
-					<PropertyList>
-						<Property Name="CrossfadeDuration" Type="int32">
-							<ValueList>
-								<Value>20</Value>
-							</ValueList>
-						</Property>
-						<Property Name="FilterDepth" Type="Real32">
-							<ValueList>
-								<Value>0.7</Value>
-							</ValueList>
-						</Property>
-						<Property Name="HarmonicToTrack" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IdleRampIn" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IdleTechnique" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="IdleVolume" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LowPassEnabled" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MasterVolume" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="QFactor" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RPMSmoothness" Type="Real32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Version" Type="int32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="GranularModelControlData" PluginType="0" CompanyID="261" PluginID="419">
-					<PropertyList>
-						<Property Name="GrainWidth" Type="int32">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoadVolumeOff" Type="Real32">
-							<ValueList>
-								<Value>0.7</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoadVolumeOn" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LoopCrossfadeStyle" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="MasterVolume" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RampVsLoopMaxWetDry" Type="Real32">
-							<ValueList>
-								<Value>0.9</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RampVsLoopMinWetDry" Type="Real32">
-							<ValueList>
-								<Value>0.1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RampVsLoopSensitivity" Type="Real32">
-							<ValueList>
-								<Value>3</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Wwise Motion" PluginType="7" CompanyID="0" PluginID="507">
-					<PropertyList>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="BatchRenameSettings" PluginType="0" CompanyID="0" PluginID="992">
-					<PropertyList>
-						<Property Name="ApplyOn" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableInsert" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableRemove" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="EnableReplace" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InsertAtPosition" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InsertStartAt" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="InsertToInsert" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="InsertWhat" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RemoveAtPosition" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RemoveCount" Type="int32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="RemoveFrom" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReplaceEnableMatchCase" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReplaceEnableReplaceAllInstances" Type="int16">
-							<ValueList>
-								<Value>2</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReplaceEnableUseRegularExpression" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReplaceFindWhat" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="ReplaceReplaceWith" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="insertFrom" Type="int16">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Marker" PluginType="0" CompanyID="0" PluginID="993">
-					<PropertyList>
-						<Property Name="Label" Type="string">
-							<ValueList>
-								<Value></Value>
-							</ValueList>
-						</Property>
-						<Property Name="Time" Type="Real64">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="Auro Headphone" PluginType="3" CompanyID="263" PluginID="1100">
-					<PropertyList>
-						<Property Name="Bypass" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Bypass_offset" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Color" Type="int16">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ER_Delay" Type="Real32">
-							<ValueList>
-								<Value>1.4</Value>
-							</ValueList>
-						</Property>
-						<Property Name="ER_Level" Type="Real32">
-							<ValueList>
-								<Value>-6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Inclusion" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="LFE_level" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Level" Type="Real32">
-							<ValueList>
-								<Value>0</Value>
-							</ValueList>
-						</Property>
-						<Property Name="OverrideColor" Type="bool">
-							<ValueList>
-								<Value>False</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Reverb" Type="bool">
-							<ValueList>
-								<Value>True</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Reverb_alpha" Type="Real32">
-							<ValueList>
-								<Value>0.5</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Reverb_fcut" Type="Real32">
-							<ValueList>
-								<Value>10000</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Reverb_level" Type="Real32">
-							<ValueList>
-								<Value>-6</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Reverb_predelay" Type="Real32">
-							<ValueList>
-								<Value>7</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Reverb_tr60" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Src_distance" Type="Real32">
-							<ValueList>
-								<Value>1</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Wall_back" Type="Real32">
-							<ValueList>
-								<Value>7.25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Wall_bottom" Type="Real32">
-							<ValueList>
-								<Value>2.75</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Wall_front" Type="Real32">
-							<ValueList>
-								<Value>3.25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Wall_left" Type="Real32">
-							<ValueList>
-								<Value>4.25</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Wall_right" Type="Real32">
-							<ValueList>
-								<Value>4.75</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Wall_top" Type="Real32">
-							<ValueList>
-								<Value>3.75</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-				<SharedPropertyList ClassName="MultiSwitchEntry" PluginType="0" CompanyID="1" PluginID="10000">
-					<PropertyList>
-						<Property Name="Probability" Type="int32">
-							<ValueList>
-								<Value>100</Value>
-							</ValueList>
-						</Property>
-						<Property Name="Weight" Type="int32">
-							<ValueList>
-								<Value>50</Value>
-							</ValueList>
-						</Property>
-					</PropertyList>
-				</SharedPropertyList>
-			</SharedValues>
-			<EnvironmentalSettings>
-				<ObsOccCurves>
-					<Comment></Comment>
-					<ObsOccCurve CurveXType="Obstruction" CurveYType="Volume">
-						<PlatformCurve Platform="Linked" EnableCurve="true">
-							<Curve Name="" ID="{4422184D-5159-454C-9661-83983BAEA291}">
-								<PropertyList>
-									<Property Name="Flags" Type="int32" Value="3"/>
-								</PropertyList>
-								<PointList>
-									<Point>
-										<XPos>0</XPos>
-										<YPos>0</YPos>
-										<Flags>5</Flags>
-									</Point>
-									<Point>
-										<XPos>100</XPos>
-										<YPos>-200</YPos>
-										<Flags>37</Flags>
-									</Point>
-								</PointList>
-							</Curve>
-						</PlatformCurve>
-					</ObsOccCurve>
-					<ObsOccCurve CurveXType="Obstruction" CurveYType="LPF">
-						<PlatformCurve Platform="Linked" EnableCurve="true">
-							<Curve Name="" ID="{3AA1AFEB-27F2-4CB3-A5EC-7B6DCEF8F69C}">
-								<PropertyList>
-									<Property Name="Flags" Type="int32" Value="1"/>
-								</PropertyList>
-								<PointList>
-									<Point>
-										<XPos>0</XPos>
-										<YPos>0</YPos>
-										<Flags>5</Flags>
-									</Point>
-									<Point>
-										<XPos>100</XPos>
-										<YPos>100</YPos>
-										<Flags>37</Flags>
-									</Point>
-								</PointList>
-							</Curve>
-						</PlatformCurve>
-					</ObsOccCurve>
-					<ObsOccCurve CurveXType="Obstruction" CurveYType="HPF">
-						<PlatformCurve Platform="Linked" EnableCurve="false">
-							<Curve Name="" ID="{C3F059AF-B64F-4AC9-8BF2-1E803CFCC751}">
-								<PropertyList>
-									<Property Name="Flags" Type="int32" Value="1"/>
-								</PropertyList>
-								<PointList>
-									<Point>
-										<XPos>0</XPos>
-										<YPos>0</YPos>
-										<Flags>5</Flags>
-									</Point>
-									<Point>
-										<XPos>100</XPos>
-										<YPos>100</YPos>
-										<Flags>37</Flags>
-									</Point>
-								</PointList>
-							</Curve>
-						</PlatformCurve>
-					</ObsOccCurve>
-					<ObsOccCurve CurveXType="Occlusion" CurveYType="Volume">
-						<PlatformCurve Platform="Linked" EnableCurve="true">
-							<Curve Name="" ID="{F6B86693-2C5A-4BCE-9B57-E195E0561A18}">
-								<PropertyList>
-									<Property Name="Flags" Type="int32" Value="3"/>
-								</PropertyList>
-								<PointList>
-									<Point>
-										<XPos>0</XPos>
-										<YPos>0</YPos>
-										<Flags>5</Flags>
-									</Point>
-									<Point>
-										<XPos>100</XPos>
-										<YPos>-200</YPos>
-										<Flags>37</Flags>
-									</Point>
-								</PointList>
-							</Curve>
-						</PlatformCurve>
-					</ObsOccCurve>
-					<ObsOccCurve CurveXType="Occlusion" CurveYType="LPF">
-						<PlatformCurve Platform="Linked" EnableCurve="true">
-							<Curve Name="" ID="{072FD36B-820C-412F-B0D6-7E8F8184E970}">
-								<PropertyList>
-									<Property Name="Flags" Type="int32" Value="1"/>
-								</PropertyList>
-								<PointList>
-									<Point>
-										<XPos>0</XPos>
-										<YPos>0</YPos>
-										<Flags>5</Flags>
-									</Point>
-									<Point>
-										<XPos>100</XPos>
-										<YPos>100</YPos>
-										<Flags>37</Flags>
-									</Point>
-								</PointList>
-							</Curve>
-						</PlatformCurve>
-					</ObsOccCurve>
-					<ObsOccCurve CurveXType="Occlusion" CurveYType="HPF">
-						<PlatformCurve Platform="Linked" EnableCurve="false">
-							<Curve Name="" ID="{17533F42-0650-43D0-B02B-EF451F7062BF}">
-								<PropertyList>
-									<Property Name="Flags" Type="int32" Value="1"/>
-								</PropertyList>
-								<PointList>
-									<Point>
-										<XPos>0</XPos>
-										<YPos>0</YPos>
-										<Flags>5</Flags>
-									</Point>
-									<Point>
-										<XPos>100</XPos>
-										<YPos>100</YPos>
-										<Flags>37</Flags>
-									</Point>
-								</PointList>
-							</Curve>
-						</PlatformCurve>
-					</ObsOccCurve>
-				</ObsOccCurves>
-			</EnvironmentalSettings>
-			<DefaultConversion Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}"/>
-			<PhysicalFolderList>
-				<PhysicalFolder Path="Actor-Mixer Hierarchy">
-					<WorkUnit Name="Actor-Mixer Hierarchy" ID="{5EA7BBF8-64C0-4A50-8821-A07E8BE21D68}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Attenuations">
-					<WorkUnit Name="Attenuations" ID="{017BDDA0-1BB1-4CE1-8077-79594EC4585C}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Audio Devices">
-					<WorkUnit Name="Audio Devices" ID="{27092F88-225A-1154-6725-C8A34F3D4482}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Control Surface Sessions">
-					<WorkUnit Name="Control Surface Sessions" ID="{1751E4CD-8018-4E2C-9A8A-C77764D1D653}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Conversion Settings">
-					<WorkUnit Name="Conversion Settings" ID="{4AA12040-049C-400F-ABCD-6EED192EC1D7}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Dynamic Dialogue">
-					<WorkUnit Name="Dynamic Dialogue" ID="{309AF5DE-031F-4CE0-9B9B-C0A536275343}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Effects">
-					<WorkUnit Name="Effects" ID="{41093F77-829F-4D88-8601-E8B25F3D4781}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Events">
-					<WorkUnit Name="Events" ID="{A69BF0FC-D84A-487C-ABDD-56F71CB2A126}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Game Parameters">
-					<WorkUnit Name="Game Parameters" ID="{4025818E-097F-4A72-B692-B8A2E2663DCB}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Interactive Music Hierarchy">
-					<WorkUnit Name="Interactive Music Hierarchy" ID="{49FED366-B530-42A8-993B-924873AAB707}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Master-Mixer Hierarchy">
-					<WorkUnit Name="Master-Mixer Hierarchy" ID="{2388DAEA-9775-46C6-A2ED-C5222A397756}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Mixing Sessions">
-					<WorkUnit Name="Mixing Sessions" ID="{6477AAF7-E365-4990-A392-E59B824B6418}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Modulators">
-					<WorkUnit Name="Modulators" ID="{14C37342-3847-49FF-A05C-5007991BED50}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Presets">
-					<WorkUnit Name="Presets" ID="{34C55C34-79EE-4678-860F-4C7DBE71D6DF}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Queries">
-					<WorkUnit Name="Queries" ID="{23EC2DE3-3ED8-4B82-AC99-92E25F2E4C6B}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="SoundBanks">
-					<WorkUnit Name="SoundBanks" ID="{C98E673F-A24C-48A8-960F-10565FFE70A0}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Soundcaster Sessions">
-					<WorkUnit Name="Soundcaster Sessions" ID="{4C96B38B-3DB4-40C7-91C9-665510E38993}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="States">
-					<WorkUnit Name="States" ID="{59A9E7B9-61C9-461A-A96F-4997B541A59C}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Switches">
-					<WorkUnit Name="Switches" ID="{CB6175F1-6080-4A23-92EF-0807E304D0C1}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Triggers">
-					<WorkUnit Name="Triggers" ID="{6C7657FC-4758-4D41-BD4C-68B09F91DB29}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-				<PhysicalFolder Path="Virtual Acoustics">
-					<WorkUnit Name="Virtual Acoustics" ID="{32CD8547-A946-4547-BBB1-69F44E796139}" PersistMode="Standalone"/>
-				</PhysicalFolder>
-			</PhysicalFolderList>
-		</Project>
-	</ProjectInfo>
-</WwiseDocument>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad5cd9f431..ae8a7a05f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-# Cmake version 3.17 is the minimum version needed for all of Open 3D Engine's supported platforms
+# Cmake version 3.19 is the minimum version needed for all of Open 3D Engine's supported platforms
 cmake_minimum_required(VERSION 3.19)
 
 # CMP0111 introduced in 3.19 has a bug that produces the policy to warn every time there is an
@@ -75,7 +75,9 @@ foreach(restricted_platform ${PAL_RESTRICTED_PLATFORMS})
     endif()
 endforeach()
 
-add_subdirectory(scripts)
+if(NOT INSTALLED_ENGINE)
+    add_subdirectory(scripts)
+endif()
 
 # SPEC-1417 will investigate and fix this
 if(NOT PAL_PLATFORM_NAME STREQUAL "Mac")
@@ -125,5 +127,5 @@ if(NOT INSTALLED_ENGINE)
     ly_setup_o3de_install()
 
     # IMPORTANT: must be included last
-    include(cmake/CPack.cmake)
+    include(cmake/Packaging.cmake)
 endif()
diff --git a/Code/CryEngine/CMakeLists.txt b/Code/CryEngine/CMakeLists.txt
index 1735224146..96f6427268 100644
--- a/Code/CryEngine/CMakeLists.txt
+++ b/Code/CryEngine/CMakeLists.txt
@@ -9,8 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-add_subdirectory(Cry3DEngine)
 add_subdirectory(CryCommon)
-add_subdirectory(CryFont)
 add_subdirectory(CrySystem)
-add_subdirectory(RenderDll)
diff --git a/Code/CryEngine/Cry3DEngine/3DEngineLight.cpp b/Code/CryEngine/Cry3DEngine/3DEngineLight.cpp
deleted file mode 100644
index 054620003c..0000000000
--- a/Code/CryEngine/Cry3DEngine/3DEngineLight.cpp
+++ /dev/null
@@ -1,733 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Light sources manager
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "3dEngine.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "AABBSV.h"
-#include "LightEntity.h"
-#include "ObjectsTree.h"
-#include "ClipVolumeManager.h"
-
-ILightSource* C3DEngine::CreateLightSource()
-{
-    // construct new object
-    CLightEntity* pLightEntity = new CLightEntity();
-
-    m_lstStaticLights.Add(pLightEntity);
-
-    return pLightEntity;
-}
-
-void C3DEngine::DeleteLightSource(ILightSource* pLightSource)
-{
-    if (m_lstStaticLights.Delete((CLightEntity*)pLightSource) || pLightSource == m_pSun)
-    {
-        if (pLightSource == m_pSun)
-        {
-            m_pSun = NULL;
-        }
-
-        delete pLightSource;
-    }
-    else
-    {
-        assert(!"Light object not found");
-    }
-}
-
-void CLightEntity::Release(bool)
-{
-    Get3DEngine()->UnRegisterEntityDirect(this);
-    Get3DEngine()->DeleteLightSource(this);
-}
-
-void CLightEntity::SetLightProperties(const CDLight& light)
-{
-    C3DEngine* engine = Get3DEngine();
-
-    m_light = light;
-
-    m_bShadowCaster = (m_light.m_Flags & DLF_CASTSHADOW_MAPS) != 0;
-
-    m_light.m_fBaseRadius = m_light.m_fRadius;
-    m_light.m_fLightFrustumAngle = CLAMP(m_light.m_fLightFrustumAngle, 0.f, (LIGHT_PROJECTOR_MAX_FOV / 2.f));
-
-    if (!(m_light.m_Flags & (DLF_PROJECT | DLF_AREA_LIGHT)))
-    {
-        m_light.m_fLightFrustumAngle = 90.f / 2.f;
-    }
-
-    m_light.m_pOwner = this;
-
-    if (m_light.m_Flags & DLF_ATTACH_TO_SUN)
-    {
-        m_dwRndFlags |= ERF_RENDER_ALWAYS | ERF_HUD;
-    }
-
-    engine->GetLightEntities()->Delete((ILightSource*)this);
-
-    PodArray<ILightSource*>& lightEntities = *engine->GetLightEntities();
-
-    //on consoles we force all lights (except sun) to be deferred
-    if (GetCVars()->e_DynamicLightsForceDeferred && !(m_light.m_Flags & (DLF_SUN | DLF_POST_3D_RENDERER)))
-    {
-        m_light.m_Flags |= DLF_DEFERRED_LIGHT;
-    }
-
-    if (light.m_Flags & DLF_DEFERRED_LIGHT)
-    {
-        lightEntities.Add((ILightSource*)this);
-    }
-    else
-    {
-        lightEntities.InsertBefore((ILightSource*)this, 0);
-    }
-}
-
-void C3DEngine::ResetCasterCombinationsCache()
-{
-    for (int nSunInUse = 0; nSunInUse < 2; nSunInUse++)
-    {
-        // clear user counters
-        for (ShadowFrustumListsCacheUsers::iterator it = m_FrustumsCacheUsers[nSunInUse].begin(); it != m_FrustumsCacheUsers[nSunInUse].end(); ++it)
-        {
-            it->second = 0;
-        }
-    }
-}
-
-void C3DEngine::DeleteAllStaticLightSources()
-{
-    for (int i = 0; i < m_lstStaticLights.Count(); i++)
-    {
-        delete m_lstStaticLights[i];
-    }
-    m_lstStaticLights.Reset();
-
-    m_pSun = NULL;
-}
-
-void C3DEngine::InitShadowFrustums(const SRenderingPassInfo& passInfo)
-{
-    assert(passInfo.IsGeneralPass());
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    if (m_pSun)
-    {
-        CDLight* pLight = &m_pSun->GetLightProperties();
-        CLightEntity* pLightEntity = (CLightEntity*)pLight->m_pOwner;
-
-        if (passInfo.RenderShadows() && (pLight->m_Flags & DLF_CASTSHADOW_MAPS) && pLight->m_Id >= 0)
-        {
-            pLightEntity->UpdateGSMLightSourceShadowFrustum(passInfo);
-
-            if (pLightEntity->m_pShadowMapInfo)
-            {
-                pLight->m_pShadowMapFrustums = pLightEntity->m_pShadowMapInfo->pGSM;
-            }
-        }
-
-        _smart_ptr<IMaterial> pMat = pLightEntity->GetMaterial();
-        if (pMat)
-        {
-            pLight->m_Shader = pMat->GetShaderItem();
-        }
-
-        // update copy of light ion the renderer
-        if (pLight->m_Id >= 0)
-        {
-            CDLight* pRndLight = NULL;
-            GetRenderer()->EF_Query(EFQ_LightSource, pLight->m_Id, pRndLight);
-            assert(pLight->m_Id == pRndLight->m_Id);
-            pRndLight->m_pShadowMapFrustums = pLight->m_pShadowMapFrustums;
-            pRndLight->m_Shader = pLight->m_Shader;
-            pRndLight->m_Flags = pLight->m_Flags;
-        }
-
-        // add per object shadow frustums
-        m_nCustomShadowFrustumCount = 0;
-        if (passInfo.RenderShadows() &&  GetCVars()->e_ShadowsPerObject > 0)
-        {
-            const uint nFrustumCount = m_lstPerObjectShadows.size();
-            if (nFrustumCount > m_lstCustomShadowFrustums.size())
-            {
-                m_lstCustomShadowFrustums.resize(nFrustumCount);
-            }
-
-            for (uint i = 0; i < nFrustumCount; ++i)
-            {
-                if (m_lstPerObjectShadows[i].pCaster)
-                {
-                    ShadowMapFrustum* pFr = &m_lstCustomShadowFrustums[i];
-                    pFr->m_eFrustumType = ShadowMapFrustum::e_PerObject;
-
-                    CLightEntity::ProcessPerObjectFrustum(pFr, &m_lstPerObjectShadows[i], m_pSun, passInfo);
-                    ++m_nCustomShadowFrustumCount;
-                }
-            }
-        }
-    }
-
-    if (passInfo.RenderShadows())
-    {
-        ResetCasterCombinationsCache();
-    }
-}
-
-void C3DEngine::AddPerObjectShadow(IShadowCaster* pCaster, float fConstBias, float fSlopeBias, float fJitter, const Vec3& vBBoxScale, uint nTexSize)
-{
-    SPerObjectShadow* pOS = GetPerObjectShadow(pCaster);
-    if (!pOS)
-    {
-        pOS = &m_lstPerObjectShadows.AddNew();
-    }
-
-    pOS->pCaster = pCaster;
-    pOS->fConstBias = fConstBias;
-    pOS->fSlopeBias = fSlopeBias;
-    pOS->fJitter = fJitter;
-    pOS->vBBoxScale = vBBoxScale;
-    pOS->nTexSize = nTexSize;
-}
-
-void C3DEngine::RemovePerObjectShadow(IShadowCaster* pCaster)
-{
-    SPerObjectShadow* pOS = GetPerObjectShadow(pCaster);
-    if (pOS)
-    {
-        FRAME_PROFILER("C3DEngine::RemovePerObjectShadow", GetSystem(), PROFILE_3DENGINE);
-
-        size_t nIndex = (size_t)(pOS - m_lstPerObjectShadows.begin());
-        m_lstPerObjectShadows.Delete(nIndex);
-    }
-}
-
-struct SPerObjectShadow* C3DEngine::GetPerObjectShadow(IShadowCaster* pCaster)
-{
-    for (int i = 0; i < m_lstPerObjectShadows.Count(); ++i)
-    {
-        if (m_lstPerObjectShadows[i].pCaster == pCaster)
-        {
-            return &m_lstPerObjectShadows[i];
-        }
-    }
-
-    return NULL;
-}
-
-void C3DEngine::GetCustomShadowMapFrustums(ShadowMapFrustum*& arrFrustums, int& nFrustumCount)
-{
-    arrFrustums = m_lstCustomShadowFrustums.begin();
-    nFrustumCount = m_nCustomShadowFrustumCount;
-}
-
-//  delete pLight->m_pProjCamera;
-//pLight->m_pProjCamera=0;
-//if(pLight->m_pShader)
-//      SAFE_RELEASE(pLight->m_pShader);
-namespace
-{
-    static inline bool CmpCastShadowFlag(const CDLight* p1, const CDLight* p2)
-    {
-        // move sun first
-        if ((p1->m_Flags & DLF_SUN) > (p2->m_Flags & DLF_SUN))
-        {
-            return true;
-        }
-        else if ((p1->m_Flags & DLF_SUN) < (p2->m_Flags & DLF_SUN))
-        {
-            return false;
-        }
-
-        // move shadow casters first
-        if ((p1->m_Flags & DLF_CASTSHADOW_MAPS) > (p2->m_Flags & DLF_CASTSHADOW_MAPS))
-        {
-            return true;
-        }
-        else if ((p1->m_Flags & DLF_CASTSHADOW_MAPS) < (p2->m_Flags & DLF_CASTSHADOW_MAPS))
-        {
-            return false;
-        }
-
-        // get some sorting consistency for shadow casters
-        if (p1->m_pOwner > p2->m_pOwner)
-        {
-            return true;
-        }
-        else if (p1->m_pOwner < p2->m_pOwner)
-        {
-            return false;
-        }
-
-        return false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void C3DEngine::SubmitSun(const SRenderingPassInfo& passInfo)
-{
-    assert(passInfo.IsGeneralPass());
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    if (m_pSun)
-    {
-        CDLight* light = &m_pSun->GetLightProperties();
-
-        GetRenderer()->EF_ADDDlight(light, passInfo);
-    }
-}
-
-void C3DEngine::RemoveEntityLightSources(IRenderNode* pEntity)
-{
-    for (int i = 0; i < m_lstStaticLights.Count(); i++)
-    {
-        if (m_lstStaticLights[i] == pEntity)
-        {
-            m_lstStaticLights.Delete(i);
-            if (pEntity == m_pSun)
-            {
-                m_pSun = NULL;
-            }
-            i--;
-        }
-    }
-}
-
-ILightSource* C3DEngine::GetSunEntity()
-{
-    return m_pSun;
-}
-
-void C3DEngine::OnCasterDeleted(IShadowCaster* pCaster)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_3DENGINE);
-    { // make sure pointer to object will not be used somewhere in the renderer
-        if (m_pSun)
-        {
-            m_pSun->OnCasterDeleted(pCaster);
-        }
-
-        if (GetRenderer()->GetActiveGPUCount() > 1)
-        {
-            if (ShadowFrustumMGPUCache* pFrustumCache = GetRenderer()->GetShadowFrustumMGPUCache())
-            {
-                pFrustumCache->DeleteFromCache(pCaster);
-            }
-        }
-
-        // remove from per object shadows list
-        RemovePerObjectShadow(pCaster);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-void CLightVolumesMgr::Init()
-{
-    m_bUpdateLightVolumes = false;
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_pLightVolumes[i].reserve(LV_MAX_COUNT);
-        m_pLightVolsInfo[i].reserve(LV_MAX_COUNT);
-    }
-    memset(m_nWorldCells, 0, sizeof(m_nWorldCells));
-    memset(m_pWorldLightCells, 0, sizeof(m_pWorldLightCells));
-}
-
-void CLightVolumesMgr::Reset()
-{
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        stl::free_container(m_pLightVolumes[i]);
-    }
-
-    m_bUpdateLightVolumes = false;
-    memset(m_nWorldCells, 0, sizeof(m_nWorldCells));
-    memset(m_pWorldLightCells, 0, sizeof(m_pWorldLightCells));
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-uint16 CLightVolumesMgr::RegisterVolume(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo)
-{
-    DynArray<SLightVolInfo*>& lightVolsInfo = m_pLightVolsInfo[passInfo.ThreadID()];
-
-    IF ((m_bUpdateLightVolumes && (lightVolsInfo.size() < LV_MAX_COUNT)) && fRadius < 256.0f, 1)
-    {
-        FUNCTION_PROFILER_3DENGINE;
-
-        int32 nPosx = (int32)(floorf(vPos.x * LV_CELL_RSIZEX));
-        int32 nPosy = (int32)(floorf(vPos.y * LV_CELL_RSIZEY));
-        int32 nPosz = (int32)(floorf(vPos.z * LV_CELL_RSIZEZ));
-
-        // Check if world cell has any light volume, else add new one
-        uint16 nHashIndex = GetWorldHashBucketKey(nPosx, nPosy, nPosz);
-        uint16* pCurrentVolumeID = &m_nWorldCells[nHashIndex];
-
-        while (*pCurrentVolumeID != 0)
-        {
-            SLightVolInfo& sVolInfo = *lightVolsInfo[*pCurrentVolumeID - 1];
-
-            int32 nVolumePosx = (int32)(floorf(sVolInfo.vVolume.x * LV_CELL_RSIZEX));
-            int32 nVolumePosy = (int32)(floorf(sVolInfo.vVolume.y * LV_CELL_RSIZEY));
-            int32 nVolumePosz = (int32)(floorf(sVolInfo.vVolume.z * LV_CELL_RSIZEZ));
-
-            if (nPosx == nVolumePosx &&
-                nPosy == nVolumePosy &&
-                nPosz == nVolumePosz &&
-                nClipVolumeRef  == sVolInfo.nClipVolumeID)
-            {
-                return (uint16) * pCurrentVolumeID;
-            }
-
-            pCurrentVolumeID = &sVolInfo.nNextVolume;
-        }
-
-        // create new volume
-        SLightVolInfo* pLightVolInfo = new SLightVolInfo(vPos, fRadius, nClipVolumeRef);
-        lightVolsInfo.push_back(pLightVolInfo);
-        *pCurrentVolumeID = lightVolsInfo.size();
-
-        return *pCurrentVolumeID;
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CLightVolumesMgr::RegisterLight(const CDLight& pDL, uint32 nLightID, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-    IF ((m_bUpdateLightVolumes && !(pDL.m_Flags & LV_DLF_LIGHTVOLUMES_MASK)), 1)
-    {
-        FUNCTION_PROFILER_3DENGINE;
-
-        const f32 fColCheck = (f32) fsel(pDL.m_Color.r + pDL.m_Color.g + pDL.m_Color.b - 0.333f, 1.0f, 0.0f);  //light color > threshold
-        const f32 fRadCheck = (f32) fsel(pDL.m_fRadius - 0.5f, 1.0f, 0.0f);  //light radius > threshold
-        if (fColCheck * fRadCheck)
-        {
-            //if the radius is large than certain value, all the the world light cells will be lighted anyway. So we just add the light to all the cells
-            //the input radius restriction will be added too
-            if(floorf(pDL.m_fRadius*LV_LIGHT_CELL_R_SIZE) > LV_LIGHTS_WORLD_BUCKET_SIZE)
-            {
-                for (int32 idx = 0; idx < LV_LIGHTS_WORLD_BUCKET_SIZE; idx++)
-                {
-                    SLightCell& lightCell = m_pWorldLightCells[idx];
-                    CryPrefetch(&lightCell);
-                    if (lightCell.nLightCount < LV_LIGHTS_MAX_COUNT)
-                    {
-                        lightCell.nLightID[lightCell.nLightCount] = nLightID;
-                        lightCell.nLightCount += 1;
-                    }
-                }
-            }
-            else
-            {
-                int32 nMiny = (int32)(floorf((pDL.m_Origin.y - pDL.m_fRadius) * LV_LIGHT_CELL_R_SIZE));
-                int32 nMaxy = (int32)(floorf((pDL.m_Origin.y + pDL.m_fRadius) * LV_LIGHT_CELL_R_SIZE));
-                int32 nMinx = (int32)(floorf((pDL.m_Origin.x - pDL.m_fRadius) * LV_LIGHT_CELL_R_SIZE));
-                int32 nMaxx = (int32)(floorf((pDL.m_Origin.x + pDL.m_fRadius) * LV_LIGHT_CELL_R_SIZE));
-
-                // Register light into all cells touched by light radius
-                for (int32 y = nMiny, ymax = nMaxy; y <= ymax; ++y)
-                {
-                    for (int32 x = nMinx, xmax = nMaxx; x <= xmax; ++x)
-                    {
-                        SLightCell& lightCell = m_pWorldLightCells[GetWorldHashBucketKey(x, y, 1, LV_LIGHTS_WORLD_BUCKET_SIZE)];
-                        CryPrefetch(&lightCell);
-                        if (lightCell.nLightCount < LV_LIGHTS_MAX_COUNT)
-                        {
-                            //only if the las light added to the cell wasn't the same light
-                            if (!(lightCell.nLightCount > 0 && lightCell.nLightID[lightCell.nLightCount - 1] == nLightID))
-                            {
-                                lightCell.nLightID[lightCell.nLightCount] = nLightID;
-                                lightCell.nLightCount += 1;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CLightVolumesMgr::AddLight(const SRenderLight& pLight, const SLightVolInfo* __restrict pVolInfo, SLightVolume& pVolume)
-{
-    // Check for clip volume
-    if (pLight.m_nStencilRef[0] == pVolInfo->nClipVolumeID || pLight.m_nStencilRef[1] == pVolInfo->nClipVolumeID ||
-        pLight.m_nStencilRef[0] == CClipVolumeManager::AffectsEverythingStencilRef)
-    {
-        const Vec4* __restrict vLight = (Vec4*) &pLight.m_Origin.x;
-        const Vec4& vVolume = pVolInfo->vVolume;
-        const f32 fDimCheck = (f32) fsel(vLight->w - vVolume.w * 0.1f, 1.0f, 0.0f);  //light radius not more than 10x smaller than volume radius
-        const f32 fOverlapCheck = (f32) fsel(sqr(vVolume.x - vLight->x) + sqr(vVolume.y - vLight->y) + sqr(vVolume.z - vLight->z) - sqr(vVolume.w + vLight->w), 0.0f, 1.0f);// touches volumes
-        if (fDimCheck * fOverlapCheck)
-        {
-            float fAttenuationBulbSize = pLight.m_fAttenuationBulbSize;
-            Vec3 lightColor =  *((Vec3*)&pLight.m_Color);
-
-            // Adjust light intensity so that the intended brightness is reached 1 meter from the light's surface
-            IF (!(pLight.m_Flags & (DLF_AREA_LIGHT | DLF_AMBIENT)), 1)
-            {
-                fAttenuationBulbSize = max(fAttenuationBulbSize, 0.001f);
-
-                // Solve I * 1 / (1 + d/lightsize)^2 = 1
-                float intensityMul = 1.0f + 1.0f / fAttenuationBulbSize;
-                intensityMul *= intensityMul;
-                lightColor *= intensityMul;
-            }
-
-            pVolume.pData.push_back();
-            SLightVolume::SLightData& lightData = pVolume.pData[pVolume.pData.size() - 1];
-            lightData.vPos = *vLight;
-            lightData.vColor = Vec4(lightColor, fAttenuationBulbSize);
-            lightData.vParams = Vec4(0.f, 0.f, 0.f, 0.f);
-
-            IF (pLight.m_Flags & DLF_PROJECT, 1)
-            {
-                lightData.vParams = Vec4(pLight.m_ObjMatrix.GetColumn0(), cos_tpl(DEG2RAD(pLight.m_fLightFrustumAngle)));
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CLightVolumesMgr::Update(const SRenderingPassInfo& passInfo)
-{
-    uint32 nThreadID = passInfo.ThreadID();
-    DynArray<SLightVolInfo*>& lightVolsInfo = m_pLightVolsInfo[nThreadID];
-
-    if (!m_bUpdateLightVolumes || lightVolsInfo.empty())
-    {
-        return;
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-    TArray<SRenderLight>* pLights = GetRenderer()->EF_GetDeferredLights(passInfo);
-    const uint32 nLightCount = pLights->size();
-
-    uint32 nLightVols = lightVolsInfo.size();
-    LightVolumeVector& lightVols = m_pLightVolumes[nThreadID];
-    uint32 existingLightVolsCount = 0;  //This is 0, that just means we will be overwriting all existing light volumes
-    
-    //If this is a recursive pass (not the first time that this is called this frame), we're just going to be adding on new light volumes to the existing collection
-    if (passInfo.IsRecursivePass())
-    {
-        existingLightVolsCount = lightVols.size();
-
-        //If no new light volumes have been added, don't bother updating
-        if (nLightVols == existingLightVolsCount)
-        {
-            return;
-        }
-    }
-
-    lightVols.resize(nLightVols);
-
-    if (!nLightCount)
-    {
-        //Start out existingLightVolsCount to avoid clearing out existing light volumes when we don't need to
-        for (uint32 v = existingLightVolsCount; v < nLightVols; ++v)
-        {
-            lightVols[v].pData.resize(0);
-        }
-
-        return;
-    }
-
-    const int MAX_NUM_LIGHTS_FOR_LIGHT_VOLUME_UPDATE = 1024;
-
-    if (nLightCount > MAX_NUM_LIGHTS_FOR_LIGHT_VOLUME_UPDATE)
-    {
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "More lights in the scene (%d) than supported by the Light Volume Update function (%d). Extra lights will be ignored.",
-            nLightCount, MAX_NUM_LIGHTS_FOR_LIGHT_VOLUME_UPDATE);
-    }
-
-    //This can be a uint8 array because nLightVols should never be greater than 256(LV_MAX_COUNT)
-    assert(LV_MAX_COUNT <= 256);
-    uint8 lightProcessedStateArray[MAX_NUM_LIGHTS_FOR_LIGHT_VOLUME_UPDATE];
-
-    //Start at the number of light volumes that already exist so that we don't end up re-updating light volumes unnecessarily. 
-    for (uint32 v = existingLightVolsCount; v < nLightVols; ++v)
-    {
-        const Vec4* __restrict vBVol = &lightVolsInfo[v]->vVolume;
-        int32 nMiny = (int32)(floorf((vBVol->y - vBVol->w) * LV_LIGHT_CELL_R_SIZE));
-        int32 nMaxy = (int32)(floorf((vBVol->y + vBVol->w) * LV_LIGHT_CELL_R_SIZE));
-        int32 nMinx = (int32)(floorf((vBVol->x - vBVol->w) * LV_LIGHT_CELL_R_SIZE));
-        int32 nMaxx = (int32)(floorf((vBVol->x + vBVol->w) * LV_LIGHT_CELL_R_SIZE));
-
-        lightVols[v].pData.resize(0);
-
-        // Loop through active light cells touching bounding volume (~avg 2 cells)
-        for (int32 y = nMiny, ymax = nMaxy; y <= ymax; ++y)
-        {
-            for (int32 x = nMinx, xmax = nMaxx; x <= xmax; ++x)
-            {
-                const SLightCell& lightCell = m_pWorldLightCells[GetWorldHashBucketKey(x, y, 1, LV_LIGHTS_WORLD_BUCKET_SIZE)];
-                CryPrefetch(&lightCell);
-
-                const SRenderLight& pFirstDL = (*pLights)[lightCell.nLightID[0]];
-                CryPrefetch(&pFirstDL);
-                CryPrefetch(&pFirstDL.m_ObjMatrix);
-                for (uint32 l = 0; (l < lightCell.nLightCount) & (lightVols[v].pData.size() < LIGHTVOLUME_MAXLIGHTS); ++l)
-                {
-                    const int32 nLightId = lightCell.nLightID[l];
-
-                    //Only allow IDs < MAX_NUM_LIGHTS_FOR_LIGHT_VOLUME_UPDATE to continue or else we'll overflow access to
-                    //lightProcessedStateArray[MAX_NUM_LIGHTS_FOR_LIGHT_VOLUME_UPDATE].  Skipping the extra lights shouldn't really matter
-                    //since A) folks won't be using that many lights, and B) for the case of light emitting particles, they tend to be grouped
-                    //so that the individual contributions tend to bleed together anyway.
-                    if (nLightId >= MAX_NUM_LIGHTS_FOR_LIGHT_VOLUME_UPDATE)
-                    {
-                        continue;
-                    }
-
-                    if (static_cast<uint32>(nLightId) < nLightCount)
-                    {
-                        const SRenderLight& pDL = (*pLights)[nLightId];
-                        const int32 nNextLightId = lightCell.nLightID[(l + 1) & (LIGHTVOLUME_MAXLIGHTS - 1)];
-                        const SRenderLight& pNextDL = (*pLights)[nNextLightId];
-                        CryPrefetch(&pNextDL);
-                        CryPrefetch(&pNextDL.m_ObjMatrix);
-
-                        IF(lightProcessedStateArray[nLightId] != v + 1, 1)
-                        {
-                            lightProcessedStateArray[nLightId] = v + 1;
-                            AddLight(pDL, &*lightVolsInfo[v], lightVols[v]);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CLightVolumesMgr::Clear(const SRenderingPassInfo& passInfo)
-{
-    DynArray<SLightVolInfo*>& lightVolsInfo = m_pLightVolsInfo[passInfo.ThreadID()];
-
-    m_bUpdateLightVolumes = false;
-    if (GetCVars()->e_LightVolumes && passInfo.IsGeneralPass() && GetCVars()->e_DynamicLights)
-    {
-        memset(m_nWorldCells, 0, sizeof(m_nWorldCells));
-        memset(m_pWorldLightCells, 0, sizeof(m_pWorldLightCells));
-
-        //Clean up volume info data
-        for (size_t i = 0; i < lightVolsInfo.size(); ++i)
-        {
-            delete lightVolsInfo[i];
-        }
-
-        m_pLightVolsInfo[passInfo.ThreadID()].clear();
-        m_bUpdateLightVolumes = (GetCVars()->e_LightVolumes == 1) ? true : false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CLightVolumesMgr::GetLightVolumes(threadID nThreadID, SLightVolume*& pLightVols, uint32& nNumVols)
-{
-    pLightVols = 0;
-    nNumVols = 0;
-    if (GetCVars()->e_LightVolumes == 1 && GetCVars()->e_DynamicLights && !m_pLightVolumes[nThreadID].empty())
-    {
-        pLightVols = &m_pLightVolumes[nThreadID][0];
-        nNumVols = m_pLightVolumes[nThreadID].size();
-    }
-}
-
-
-void C3DEngine::GetLightVolumes(threadID nThreadID, SLightVolume*& pLightVols, uint32& nNumVols)
-{
-    m_LightVolumesMgr.GetLightVolumes(nThreadID, pLightVols, nNumVols);
-}
-
-uint16 C3DEngine::RegisterVolumeForLighting(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo)
-{
-    return m_LightVolumesMgr.RegisterVolume(vPos, fRadius, nClipVolumeRef, passInfo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-#ifndef _RELEASE
-void CLightVolumesMgr::DrawDebug(const SRenderingPassInfo& passInfo)
-{
-    DynArray<SLightVolInfo*>& lightVolsInfo = m_pLightVolsInfo[passInfo.ThreadID()];
-
-    IRenderer* pRenderer = GetRenderer();
-    IRenderAuxGeom* pAuxGeom = GetRenderer()->GetIRenderAuxGeom();
-    if (!pAuxGeom || !passInfo.IsGeneralPass())
-    {
-        return;
-    }
-
-    ColorF cWhite = ColorF(1, 1, 1, 1);
-    ColorF cBad = ColorF(1.0f, 0.0, 0.0f, 1.0f);
-    ColorF cWarning = ColorF(1.0f, 1.0, 0.0f, 1.0f);
-    ColorF cGood = ColorF(0.0f, 0.5, 1.0f, 1.0f);
-    ColorF cSingleCell = ColorF(0.0f, 1.0, 0.0f, 1.0f);
-
-    const uint32 nLightVols = lightVolsInfo.size();
-    LightVolumeVector& lightVols = m_pLightVolumes[passInfo.ThreadID()];
-    const Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-
-    float fYLine = 8.0f, fYStep = 20.0f;
-    GetRenderer()->Draw2dLabel(8.0f, fYLine += fYStep, 2.0f, (float*)&cWhite.r, false, "Light Volumes Info (count %d)", nLightVols);
-
-    for (uint32 v = 0; v < nLightVols; ++v)  // draw each light volume
-    {
-        SLightVolume& lv = lightVols[v];
-        SLightVolInfo& lvInfo = *lightVolsInfo[v];
-
-        ColorF& cCol = (lv.pData.size() >= 10) ? cBad : ((lv.pData.size() >= 5) ? cWarning : cGood);
-        const Vec3 vPos = Vec3(lvInfo.vVolume.x, lvInfo.vVolume.y, lvInfo.vVolume.z);
-        const float fCamDistSq = (vPos - vCamPos).len2();
-        cCol.a = max(0.25f, min(1.0f, 1024.0f / (fCamDistSq + 1e-6f)));
-
-        pRenderer->DrawLabelEx(vPos, 1.3f, (float*)&cCol.r, true, true, "Id: %d\nPos: %.2f %.2f %.2f\nRadius: %.2f\nLights: %d\nOutLights: %d",
-            v, vPos.x, vPos.y, vPos.z, lvInfo.vVolume.w, lv.pData.size(), (*(int32*)&lvInfo.vVolume.w) & (1 << 31) ? 1 : 0);
-
-        if (GetCVars()->e_LightVolumesDebug == 2)
-        {
-            const float fSideSize = 0.707f * sqrtf(lvInfo.vVolume.w * lvInfo.vVolume.w * 2);
-            pAuxGeom->DrawAABB(AABB(vPos - Vec3(fSideSize), vPos + Vec3(fSideSize)), false, cCol, eBBD_Faceted);
-        }
-
-        if (GetCVars()->e_LightVolumesDebug == 3)
-        {
-            cBad.a = 1.0f;
-            const Vec3 vCellPos = Vec3(floorf((lvInfo.vVolume.x) * LV_CELL_RSIZEX) * LV_CELL_SIZEX,
-                    floorf((lvInfo.vVolume.y) * LV_CELL_RSIZEY) * LV_CELL_SIZEY,
-                    floorf((lvInfo.vVolume.z) * LV_CELL_RSIZEZ) * LV_CELL_SIZEZ);
-
-            const Vec3 vMin = vCellPos;
-            const Vec3 vMax = vMin + Vec3(LV_CELL_SIZEX, LV_CELL_SIZEY, LV_CELL_SIZEZ);
-            pAuxGeom->DrawAABB(AABB(vMin, vMax), false, cBad, eBBD_Faceted);
-        }
-    }
-}
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/3DEngineMemory.cpp b/Code/CryEngine/Cry3DEngine/3DEngineMemory.cpp
deleted file mode 100644
index 65cb53d0b1..0000000000
--- a/Code/CryEngine/Cry3DEngine/3DEngineMemory.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "3DEngineMemory.h"
-
-// Static CTemporaryPool instance
-CTemporaryPool* CTemporaryPool::s_Instance = NULL;
-
-namespace util
-{
-    void* pool_allocate(size_t nSize)
-    {
-        return CTemporaryPool::Get()->Allocate(nSize, 8);
-    }
-    void  pool_free(void* ptr)
-    {
-        return CTemporaryPool::Get()->Free(ptr);
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/3DEngineMemory.h b/Code/CryEngine/Cry3DEngine/3DEngineMemory.h
deleted file mode 100644
index 143aeccab2..0000000000
--- a/Code/CryEngine/Cry3DEngine/3DEngineMemory.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_3DENGINEMEMORY_H
-#define CRYINCLUDE_CRY3DENGINE_3DENGINEMEMORY_H
-#pragma once
-
-// The type of pool responsible for temporary allocations within the 3dengine
-//
-// Note: The header is included here for reasons of devirtualization. If
-// included directly from the precompiled header in 3dEngine, the gamedll will
-// fail to compile!
-#include <CryPool/PoolAlloc.h>
-#include <InplaceFactory.h>
-
-using NCryPoolAlloc::CFirstFit;        // speed of allocations are crucial, so simply use the first fitting free allocation
-using NCryPoolAlloc::CInPlace;         //
-using NCryPoolAlloc::CMemoryDynamic;   // the pool itself will be dynamically allocated
-using NCryPoolAlloc::CListItemInPlace; // use inplace items
-
-// Tempororary Pool Holder
-class CTemporaryPool
-{
-private:
-    // Access granted for 3dEngine to create, destroy and maintain the temporary
-    // pool for the 3d engine
-    friend class C3DEngine;
-
-    // The static pool instance - one pool to rule them all (temp allocations at least)
-    static CTemporaryPool* s_Instance;
-
-    // The type of the backing temporary pool
-    typedef CFirstFit<CInPlace<CMemoryDynamic>, CListItemInPlace> TTemporaryPool;
-    TTemporaryPool Pool;
-
-    // A non-recursive critical section guards the pool against concurrent access
-    typedef CryCriticalSectionNonRecursive TTemporaryPoolLock;
-    TTemporaryPoolLock Lock;
-
-    // Initialize the pool manager.
-    //
-    // Allocates the backing storage and initializes the temporary pool
-    // itself. The backing storage is aligned to 16 bytes to reduce the amount of
-    // cachelines crossed by the temporary pool
-    static bool Initialize(size_t poolSize)
-    {
-        // Create the object instance
-        s_Instance = new CTemporaryPool();
-        if (!s_Instance)
-        {
-            CryFatalError("CTemporaryPool::Init(): could not create an instance of CTemporaryPool");
-            return false;
-        }
-
-        // Allocate the backing storage
-        uint8* tempPool = reinterpret_cast<uint8*>(CryModuleMemalign(poolSize, 16));
-        if (!tempPool)
-        {
-            CryFatalError("CTemporaryPool::Init(): could not allocate %" PRISIZE_T " bytes for temportary pool", poolSize);
-            return false;
-        }
-
-        // Initialize the actual pool
-        s_Instance->Pool.InitMem(poolSize, tempPool);
-        return true;
-    }
-
-    // Shutdown the temporary pool manager.
-    //
-    // Frees the temporary pool
-    static bool Shutdown()
-    {
-        if (s_Instance == NULL)
-        {
-            CryFatalError("CTemporaryPool::Shutdown(): no temporary pool instance present");
-            return false;
-        }
-
-        bool error = false;
-        CTemporaryPool& instance = *s_Instance;
-        if (instance.Pool.Data())
-        {
-            CryModuleMemalignFree(instance.Pool.Data());
-        }
-        else
-        {
-            error = true;
-        }
-
-        delete s_Instance;
-        s_Instance = NULL;
-        return !error;
-    }
-
-    // Templated construct helper member function using an inplace factory
-    //
-    // Called from the templated New<T, Expr> function below. Returns a typed
-    // pointer to the inplace constructed object.
-    template<typename T, typename InPlaceFactory>
-    T* Construct(const InPlaceFactory& factory, void* storage)
-    {
-        return reinterpret_cast<T*>(factory.template apply<T>(storage));
-    }
-
-    // Templated destruct helper member function.
-    //
-    // Calls the object's destructor and returns a void pointer to the storage
-    template<typename T>
-    void* Destruct(T* obj)
-    {
-        obj->~T();
-        return reinterpret_cast<void*>(obj);
-    }
-
-    // Empty private constructor/destructors to prevent clients from creating and
-    // destroying instances of CTemporaryPool (there should only be one instance
-    // in the 3DEngine).
-    CTemporaryPool() {};
-    ~CTemporaryPool() {};
-
-public:
-
-    // Allocate a block of memory with the given size and alignment
-    void* Allocate(size_t size, size_t align)
-    {
-        AUTO_LOCK_T(CryCriticalSectionNonRecursive, Lock);
-        void* pData = Pool.Allocate<void*>(size, align);
-        if (pData == NULL)
-        {
-            CryFatalError("**** could not allocate %" PRISIZE_T " bytes from temporary pool", size);
-        }
-        return Pool.Resolve<void*>(pData);
-    };
-
-    // Allocates memory and constructs object of type 'T'
-    //
-    // Note: This method is respects the alignment of 'T' via C99 alignof()
-    template<typename T, typename Expr>
-    T* New(const Expr& expr)
-    {
-        AUTO_LOCK_T(CryCriticalSectionNonRecursive, Lock);
-        void* pObjStorage = Pool.Allocate<void*>(sizeof(T), alignof(T));
-        if (pObjStorage == NULL)
-        {
-            CryFatalError("**** could not allocate %d bytes from temporary pool",
-                (int)sizeof (T));
-        }
-        return Construct<T>(expr, pObjStorage);
-    };
-
-    // Allocates memory and constructs object of type 'T'
-    //
-    // Note: This method is respects the alignment of 'T' via C99 alignof()
-    template<typename T>
-    T* New()
-    {
-        AUTO_LOCK_T(CryCriticalSectionNonRecursive, Lock);
-        void* pObjStorage = Pool.Allocate<void*>(sizeof(T), alignof(T));
-        if (pObjStorage == NULL)
-        {
-            CryFatalError("**** could not allocate %d bytes from temporary pool",
-                (int)sizeof (T));
-        }
-        return Construct<T>(InplaceFactory(), pObjStorage);
-    };
-
-    // Frees a block of memory from the temporary pool
-    //
-    void Free(void* ptr)
-    {
-        AUTO_LOCK_T(CryCriticalSectionNonRecursive, Lock);
-        Pool.Free(ptr);
-    }
-
-
-    // Destroys an object of type 'T' and frees the underlying block of memory
-    template<typename T>
-    void Delete(T* ptr)
-    {
-        AUTO_LOCK_T(CryCriticalSectionNonRecursive, Lock);
-        Pool.Free(Destruct<T>(ptr));
-    }
-
-    // Static function to retrieve the static instance of CTemporaryPool
-    static CTemporaryPool* Get() { return s_Instance; };
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(Pool.Data(), Pool.MemSize());
-    }
-};
-
-// A stl compliant scratch allocator that uses the given temporary pool.
-template <class Type>
-class scratch_allocator
-{
-public:
-    typedef Type value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-
-    template <class value_type1>
-    struct rebind
-    {
-        typedef scratch_allocator<value_type1> other;
-    };
-
-    scratch_allocator() {}
-    template <class value_type1>
-    scratch_allocator(const scratch_allocator<value_type1>&) {}
-    scratch_allocator(const scratch_allocator<value_type>&) {}
-    ~scratch_allocator() {}
-
-    pointer address(reference x) const {return &x; }
-    const_pointer address(const_reference x) const { return &x; }
-
-    // Note: size can be zero - return value will be null in that case
-    value_type* allocate(size_type n, const void* = 0)
-    {
-        if (n != 0)
-        {
-            size_type buf_size = n * sizeof(value_type);
-
-            void* ret = CTemporaryPool::Get()->Allocate(
-                    buf_size,
-                    alignof(value_type));
-
-            return reinterpret_cast<value_type*>(ret);
-        }
-        return 0;
-    }
-
-    // Note: size can be zero.
-    void deallocate(pointer p, [[maybe_unused]] size_type n)
-    {
-        if (p != NULL)
-        {
-            CTemporaryPool::Get()->Free(p);
-        }
-    }
-
-    size_type max_size() const  { return size_t(-1) / sizeof(value_type); }
-
-    void construct(pointer p, const_reference val)
-    { new (reinterpret_cast<void*>(p))value_type(val); }
-
-    void destroy(pointer p) { p->~value_type(); }
-
-    void cleanup() {}
-
-    size_t get_heap_size() { return 0; }
-
-    size_t get_wasted_in_allocation() { return 0; }
-
-    size_t get_wasted_in_blocks() { return 0; }
-};
-
-
-// A scratch vector type to use the stl vector
-template<typename Type>
-class scratch_vector
-    : public std::vector<Type, scratch_allocator<Type> >
-{
-};
-
-namespace util
-{
-    extern void* pool_allocate(size_t nSize);
-    extern void  pool_free(void* ptr);
-}
-
-#endif // CRYINCLUDE_CRY3DENGINE_3DENGINEMEMORY_H
diff --git a/Code/CryEngine/Cry3DEngine/3DEngineRender.cpp b/Code/CryEngine/Cry3DEngine/3DEngineRender.cpp
deleted file mode 100644
index 26c731aca4..0000000000
--- a/Code/CryEngine/Cry3DEngine/3DEngineRender.cpp
+++ /dev/null
@@ -1,3932 +0,0 @@
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : rendering
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "3dEngine.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "Ocean.h"
-#include <Terrain/Bus/TerrainProviderBus.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-#include "DecalManager.h"
-#include "SkyLightManager.h"
-
-#include "CullBuffer.h"
-#include "LightEntity.h"
-#include "FogVolumeRenderNode.h"
-#include "ObjectsTree.h"
-#include "CloudsManager.h"
-#include "MatMan.h"
-#include "VolumeObjectRenderNode.h"
-#include "CryPath.h"
-#include "ILocalMemoryUsage.h"
-#include "BitFiddling.h"
-#include "ObjMan.h"
-#include "GeomCacheManager.h"
-#include "ClipVolumeManager.h"
-#include "ITimeOfDay.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-#include <ThermalInfo.h>
-
-
-
-#ifdef GetCharWidth
-#undef GetCharWidth
-#endif //GetCharWidth
-
-
-#ifdef WIN32
-#include <CryWindows.h>
-#endif
-
-#include <AzFramework/IO/FileOperations.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/API/AtomActiveInterface.h>
-#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
-#include <AzCore/Interface/Interface.h>
-#include "../RenderDll/Common/Memory/VRAMDrillerBus.h"
-
-////////////////////////////////////////////////////////////////////////////////////////
-// RenderScene
-////////////////////////////////////////////////////////////////////////////////////////
-#define FREE_MEMORY_YELLOW_LIMIT (30)
-#define FREE_MEMORY_RED_LIMIT    (10)
-#define DISPLAY_INFO_SCALE       (1.25f)
-#define DISPLAY_INFO_SCALE_SMALL (1.1f)
-#define STEP_SMALL_DIFF          (2.f)
-
-#if defined(WIN32) || defined(WIN64) || defined(MAC)
-// for panorama screenshots
-class CStitchedImage
-    : public Cry3DEngineBase
-{
-public:
-    CStitchedImage(C3DEngine&  rEngine,
-        const uint32            dwWidth,
-        const uint32            dwHeight,
-        const uint32            dwVirtualWidth,
-        const uint32            dwVirtualHeight,
-        const uint32            dwSliceCount,
-        const f32                   fTransitionSize,
-        const bool              bMetaData = false)
-        : m_rEngine(rEngine)
-        , m_dwWidth(dwWidth)
-        , m_dwHeight(dwHeight)
-        , m_fInvWidth(1.f / static_cast<f32>(dwWidth))
-        , m_fInvHeight(1.f / static_cast<f32>(dwHeight))
-        , m_dwVirtualWidth(dwVirtualWidth)
-        , m_dwVirtualHeight(dwVirtualHeight)
-        , m_fInvVirtualWidth(1.f / static_cast<f32>(dwVirtualWidth))
-        , m_fInvVirtualHeight(1.f / static_cast<f32>(dwVirtualHeight))
-        , m_nFileId(0)
-        , m_dwSliceCount(dwSliceCount)
-        , m_fHorizFOV(2 * gf_PI / dwSliceCount)
-        , m_bFlipY(false)
-        , m_fTransitionSize(fTransitionSize)
-        , m_bMetaData(bMetaData)
-    {
-        assert(dwWidth);
-        assert(dwHeight);
-
-        m_RGB.resize(m_dwWidth * 3 * m_dwHeight);
-
-        // ratio between width and height defines angle 1 (angle from mid to cylinder edges)
-        float fVert1Frac = (2 * gf_PI * m_dwHeight) / m_dwWidth;
-
-        // slice count defines angle 2
-        float fHorizFrac = tanf(GetHorizFOVWithBorder() * 0.5f);
-        float fVert2Frac = 2.0f * fHorizFrac / rEngine.GetRenderer()->GetWidth() * rEngine.GetRenderer()->GetHeight();
-        //      float fVert2Frac = 2.0f * fHorizFrac / rEngine.GetRenderer()->GetWidth() * rEngine.GetRenderer()->GetHeight();
-
-        // the bigger one defines the needed angle
-        float fVertFrac = max(fVert1Frac, fVert2Frac);
-
-        // planar image becomes a barrel after projection and we need to zoom in to only utilize the usable part (inner rect)
-        // this is not always needed - for quality with low slice count we could be save some quality here
-        fVertFrac /= cosf(GetHorizFOVWithBorder() * 0.5f);
-
-        // compute FOV from Frac
-        float fVertFOV = 2 * atanf(0.5f * fVertFrac);
-
-        m_fPanoramaShotVertFOV = fabsf(fVertFOV);
-
-        CryLog("RenderFov = %f degrees (%f = max(%f,%f)*fix)", RAD2DEG(m_fPanoramaShotVertFOV), fVertFrac, fVert1Frac, fVert2Frac);
-        Clear();
-    }
-
-    void Clear()
-    {
-        memset(&m_RGB[0], 0, m_dwWidth * m_dwHeight * 3);
-    }
-
-    // szDirectory + "/" + file_id + "." + extension
-    // logs errors in the case there are problems
-    bool SaveImage(const char* szDirectory)
-    {
-        assert(szDirectory);
-
-        const char* szExtension = m_rEngine.GetCVars()->e_ScreenShotFileFormat->GetString();
-
-        if (azstricmp(szExtension, "dds") != 0  &&
-            azstricmp(szExtension, "tga") != 0    &&
-            azstricmp(szExtension, "jpg") != 0)
-        {
-            gEnv->pLog->LogError("Format e_ScreenShotFileFormat='%s' not supported", szExtension);
-            return false;
-        }
-
-        const char* sRequestedName = m_rEngine.GetCVars()->e_ScreenShotFileName->GetString();
-
-        char sFileName[AZ_MAX_PATH_LEN];
-
-        if (azstricmp(sRequestedName, "") != 0)
-        {
-            AZStd::string folderPath;
-            AZStd::string fileName;
-            AzFramework::StringFunc::Path::Split(sRequestedName, nullptr, &folderPath, &fileName);
-            gEnv->pFileIO->CreatePath((AZStd::string("@user@/ScreenShots/") + folderPath).c_str());
-            azsnprintf(sFileName, sizeof(sFileName), "@user@/ScreenShots/%s.%s", sRequestedName, szExtension);
-        }
-        else
-        {
-            azsnprintf(sFileName, sizeof(sFileName), "@user@/ScreenShots/%s", szDirectory);
-            gEnv->pFileIO->CreatePath(sFileName);
-
-            // find free file id
-            for (;; )
-            {
-                azsnprintf(sFileName, sizeof(sFileName), "@user@/ScreenShots/%s/%.5d.%s", szDirectory, m_nFileId, szExtension);
-
-                AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(sFileName, "rb");
-
-                if (fileHandle == AZ::IO::InvalidHandle)
-                {
-                    break; // file doesn't exist
-                }
-
-                gEnv->pCryPak->FClose(fileHandle);
-                m_nFileId++;
-            }
-        }
-
-        bool bOk;
-
-        if (azstricmp(szExtension, "dds") == 0)
-        {
-            bOk = gEnv->pRenderer->WriteDDS((byte*)&m_RGB[0], m_dwWidth, m_dwHeight, 3, sFileName, eTF_BC3, 1);
-        }
-        else
-        if (azstricmp(szExtension, "tga") == 0)
-        {
-            bOk = gEnv->pRenderer->WriteTGA((byte*)&m_RGB[0], m_dwWidth, m_dwHeight, sFileName, 24, 24);
-        }
-        else
-        {
-            bOk = gEnv->pRenderer->WriteJPG((byte*)&m_RGB[0], m_dwWidth, m_dwHeight, sFileName, 24);
-        }
-
-        if (!bOk)
-        {
-            gEnv->pLog->LogError("Failed to write '%s' (not supported on this platform?)", sFileName);
-        }
-        else //write meta data
-        {
-            if (m_bMetaData)
-            {
-                const f32   fSizeX  =   GetCVars()->e_ScreenShotMapSizeX;
-                const f32   fSizeY  =   GetCVars()->e_ScreenShotMapSizeY;
-                const f32   fTLX    =   GetCVars()->e_ScreenShotMapCenterX - fSizeX;
-                const f32   fTLY    =   GetCVars()->e_ScreenShotMapCenterY - fSizeY;
-                const f32   fBRX    =   GetCVars()->e_ScreenShotMapCenterX + fSizeX;
-                const f32   fBRY    =   GetCVars()->e_ScreenShotMapCenterY + fSizeY;
-
-                snprintf(sFileName, sizeof(sFileName), "@user@/ScreenShots/%s/%.5d.%s", szDirectory, m_nFileId, "xml");
-
-                AZ::IO::HandleType metaFileHandle = gEnv->pCryPak->FOpen(sFileName, "wt");
-                if (metaFileHandle != AZ::IO::InvalidHandle)
-                {
-                    char sFileData[1024];
-                    snprintf(sFileData, sizeof(sFileData), "<MiniMap Filename=\"%.5d.%s\" startX=\"%f\" startY=\"%f\" endX=\"%f\" endY=\"%f\"/>",
-                        m_nFileId, szExtension, fTLX, fTLY, fBRX, fBRY);
-                    string data(sFileData);
-                    gEnv->pCryPak->FWrite(data.c_str(), data.size(), metaFileHandle);
-                    gEnv->pCryPak->FClose(metaFileHandle);
-                }
-            }
-        }
-
-        // reset filename when done so user doesn't overwrite other screen shots (unless they want to)
-        // this is done here as there is no callback for standard screenshots to allow the user to clear
-        // this when done with the screen shot, so I decided to just always clear it when done
-        m_rEngine.GetCVars()->e_ScreenShotFileName->Set("");
-
-        return bOk;
-    }
-
-    // rasterize rectangle
-    // Arguments:
-    //   x0 - <x1, including
-    //   y0 - <y1, including
-    //   x1 - >x0, excluding
-    //   y1 - >y0, excluding
-    void RasterizeRect(const uint32*   pRGBAImage,
-        const uint32    dwWidth,
-        const uint32    dwHeight,
-        const uint32    dwSliceX,
-        const uint32    dwSliceY,
-        const f32           fTransitionSize,
-        const bool      bFadeBordersX,
-        const bool      bFadeBordersY)
-    {
-        {
-            //calculate rect inside the whole image
-            const int32 OrgX0 =   static_cast<int32>(static_cast<f32>((dwSliceX * dwWidth) * m_dwWidth) * m_fInvVirtualWidth);
-            const int32 OrgY0 =   static_cast<int32>(static_cast<f32>((dwSliceY * dwHeight) * m_dwHeight) * m_fInvVirtualHeight);
-            const int32 OrgX1 =   min(static_cast<int32>(static_cast<f32>(((dwSliceX + 1) * dwWidth) * m_dwWidth) * m_fInvVirtualWidth), static_cast<int32>(m_dwWidth)) - (m_rEngine.GetCVars()->e_ScreenShotDebug == 1 ? 1 : 0);
-            const int32 OrgY1 =   min(static_cast<int32>(static_cast<f32>(((dwSliceY + 1) * dwHeight) * m_dwHeight) * m_fInvVirtualHeight), static_cast<int32>(m_dwHeight)) - (m_rEngine.GetCVars()->e_ScreenShotDebug == 1 ? 1 : 0);
-            //expand bounds for borderblending
-            const int32 CenterX   =   (OrgX0 + OrgX1) / 2;
-            const int32 CenterY   =   (OrgY0 + OrgY1) / 2;
-            const int32 X0    =   static_cast<int32>(static_cast<f32>(OrgX0 - CenterX) * (1.f + fTransitionSize)) + CenterX;
-            const int32 Y0    =   static_cast<int32>(static_cast<f32>(OrgY0 - CenterY) * (1.f + fTransitionSize)) + CenterY;
-            const int32 X1    =   static_cast<int32>(static_cast<f32>(OrgX1 - CenterX) * (1.f + fTransitionSize)) + CenterX;
-            const int32 Y1    =   static_cast<int32>(static_cast<f32>(OrgY1 - CenterY) * (1.f + fTransitionSize)) + CenterY;
-            const f32 InvBlendX   =   1.f / max(static_cast<f32>(X1 - OrgX1), 0.01f);//0.5 is here because the border is two times wider then the border of the single segment in total
-            const f32 InvBlendY   =   1.f / max(static_cast<f32>(Y1 - OrgY1), 0.01f);
-            const int32 DebugScale =   (m_rEngine.GetCVars()->e_ScreenShotDebug == 2) ? 65536 : 0;
-            for (int32 y = max(Y0, 0); y < Y1 && y < (int)m_dwHeight; y++)
-            {
-                const f32 WeightY   =   bFadeBordersY ? min(1.f, static_cast<f32>(min(y - Y0, Y1 - y)) * InvBlendY) : 1.f;
-                for (int32 x = max(X0, 0); x < X1 && x < (int)m_dwWidth; x++)
-                {
-                    uint8* pDst = &m_RGB[m_bFlipY ? 3 * (x + (m_dwHeight - y - 1) * m_dwWidth) : 3 * (x + y * m_dwWidth)];
-                    const f32 WeightX =   bFadeBordersX ? min(1.f, static_cast<f32>(min(x - X0, X1 - x)) * InvBlendX) : 1.f;
-                    GetBilinearFilteredBlend(static_cast<int32>(static_cast<f32>(x - X0) / static_cast<f32>(X1 - X0) * static_cast<f32>(dwWidth) * 16.f),
-                        static_cast<int32>(static_cast<f32>(y - Y0) / static_cast<f32>(Y1 - Y0) * static_cast<f32>(dwHeight) * 16.f),
-                        pRGBAImage, dwWidth, dwHeight,
-                        max(static_cast<int32>(WeightX * WeightY * 65536.f), DebugScale), pDst);
-                }
-            }
-        }
-    }
-
-    void RasterizeCylinder(const uint32* pRGBAImage,
-        const uint32 dwWidth,
-        const uint32 dwHeight,
-        const uint32 dwSlice,
-        const bool bFadeBorders)
-    {
-        float fSrcAngleMin = GetSliceAngle(dwSlice - 1);
-        float fFractionVert = tanf(m_fPanoramaShotVertFOV * 0.5f);
-        float fFractionHoriz = fFractionVert * gEnv->pRenderer->GetCamera().GetProjRatio();
-        float fInvFractionHoriz = 1.0f / fFractionHoriz;
-
-        // for soft transition
-        float fFadeOutFov = GetHorizFOVWithBorder();
-        float fFadeInFov = GetHorizFOV();
-
-        int x0 = 0, y0 = 0, x1 = m_dwWidth, y1 = m_dwHeight;
-
-        float fScaleX = 1.0f / m_dwWidth;
-        float fScaleY = 0.5f * fInvFractionHoriz / (m_dwWidth / (2 * gf_PI)) / dwHeight * dwWidth;                          // this value is not correctly computed yet - but using many slices reduced the problem
-
-        if (m_bFlipY)
-        {
-            fScaleY = -fScaleY;
-        }
-
-
-        // it's more efficient to process colums than lines
-        for (int x = x0; x < x1; ++x)
-        {
-            uint8* pDst = &m_RGB[3 * (x + y0 * m_dwWidth)];
-            float fSrcX = x * fScaleX - 0.5f; // -0.5 .. 0.5
-            float fSrcAngleX = fSrcAngleMin + 2 * gf_PI * fSrcX;
-
-            if (fSrcAngleX > gf_PI)
-            {
-                fSrcAngleX -= 2 * gf_PI;
-            }
-            if (fSrcAngleX < -gf_PI)
-            {
-                fSrcAngleX += 2 * gf_PI;
-            }
-
-            if (fabs(fSrcAngleX) > fFadeOutFov * 0.5f)
-            {
-                continue;                                                   // clip away curved parts of the barrel
-            }
-            float fScrPosX = (tanf(fSrcAngleX) * 0.5f * fInvFractionHoriz + 0.5f) * dwWidth;
-            //          float fInvCosSrcX = 1.0f / cos(fSrcAngleX);
-            float fInvCosSrcX = 1.0f / cosf(fSrcAngleX);
-
-            if (fScrPosX >= 0 && fScrPosX <= (float)dwWidth) // this is an optimization - but it could be done even more efficient
-            {
-                if (fInvCosSrcX > 0)                                                  // don't render the viewer opposing direction
-                {
-                    int iSrcPosX16 = (int)(fScrPosX * 16.0f);
-
-                    float fYOffset = 16 * 0.5f * dwHeight - 16 * 0.5f * m_dwHeight * fScaleY * fInvCosSrcX * dwHeight;
-                    float fYMul = 16 * fScaleY * fInvCosSrcX * dwHeight;
-
-                    float fSrcY = y0 * fYMul + fYOffset;
-
-                    uint32 dwLerp64k = 256 * 256 - 1;
-
-                    if (!bFadeBorders)
-                    {
-                        // first pass - every second image without soft borders
-                        for (int y = y0; y < y1; ++y, fSrcY += fYMul, pDst += m_dwWidth * 3)
-                        {
-                            GetBilinearFiltered(iSrcPosX16, (int)fSrcY, pRGBAImage, dwWidth, dwHeight, pDst);
-                        }
-                    }
-                    else
-                    {
-                        // second pass - do all the inbetween with soft borders
-                        float fOffSlice = fabs(fSrcAngleX / fFadeInFov) - 0.5f;
-
-                        if (fOffSlice < 0)
-                        {
-                            fOffSlice = 0; // no transition in this area
-                        }
-                        float fBorder = (fFadeOutFov - fFadeInFov) * 0.5f;
-
-                        if (fBorder < 0.001f)
-                        {
-                            fBorder = 0.001f; // we do not have border
-                        }
-                        float fFade = 1.0f - fOffSlice * fFadeInFov / fBorder;
-
-                        if (fFade < 0.0f)
-                        {
-                            fFade = 0.0f; // don't use this slice here
-                        }
-                        dwLerp64k = (uint32)(fFade * (256.0f * 256.0f - 1.0f)); // 0..64k
-
-                        if (dwLerp64k)                                              // optimization
-                        {
-                            for (int y = y0; y < y1; ++y, fSrcY += fYMul, pDst += m_dwWidth * 3)
-                            {
-                                GetBilinearFilteredBlend(iSrcPosX16, (int)fSrcY, pRGBAImage, dwWidth, dwHeight, dwLerp64k, pDst);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // fast, rgb only
-    static inline ColorB lerp(const ColorB x, const ColorB y, const uint32 a, const uint32 dwBase)
-    {
-        const int32 b = dwBase - a;
-        const int32 RC  =   dwBase / 2;//rounding correction
-
-
-        return ColorB(((int)x.r * b + (int)y.r * a + RC) / dwBase,
-            ((int)x.g * b + (int)y.g * a + RC) / dwBase,
-            ((int)x.b * b + (int)y.b * a + RC) / dwBase);
-    }
-
-    static inline ColorB Mul(const ColorB x, const int32 a, const int32 dwBase)
-    {
-        return ColorB(((int)x.r * (int)a) / dwBase,
-            ((int)x.g * (int)a) / dwBase,
-            ((int)x.b * (int)a) / dwBase);
-    }
-    static inline ColorB MadSaturate(const ColorB x, const int32 a, const int32 dwBase, const ColorB y)
-    {
-        const int32 MAX_COLOR   =   0xff;
-        const ColorB PreMuled   =   Mul(x, a, dwBase);
-        return ColorB(min((int)PreMuled.r + (int)y.r, MAX_COLOR),
-            min((int)PreMuled.g + (int)y.g, MAX_COLOR),
-            min((int)PreMuled.b + (int)y.b, MAX_COLOR));
-    }
-
-    // bilinear filtering in fixpoint,
-    // 4bit fractional part -> multiplier 16
-    // --lookup outside of the image is not defined
-    //  lookups outside the image are now clamped, needed due to some float inaccuracy while rasterizing a rect-screenshot
-    // Arguments:
-    //   iX16 - fX mul 16
-    //   iY16 - fY mul 16
-    //   result - [0]=red, [1]=green, [2]=blue
-    static inline bool GetBilinearFilteredRaw(const int iX16, const int iY16,
-        const uint32* pRGBAImage,
-        const uint32 dwWidth, const uint32 dwHeight,
-        ColorB& result)
-    {
-        int iLocalX = min(max(iX16 / 16, 0), static_cast<int>(dwWidth - 1));
-        int iLocalY = min(max(iY16 / 16, 0), static_cast<int>(dwHeight - 1));
-
-        int iLerpX = iX16 & 0xf;      // 0..15
-        int iLerpY = iY16 & 0xf;      // 0..15
-
-        ColorB colS[4];
-
-        const uint32* pRGBA = &pRGBAImage[iLocalX + iLocalY * dwWidth];
-
-        colS[0] = pRGBA[0];
-        colS[1] = pRGBA[1];
-        colS[2] = pRGBA[iLocalY + 1uL < dwHeight ? dwWidth : 0];
-        colS[3] = pRGBA[(iLocalX + 1uL < dwWidth ? 1 : 0) + (iLocalY + 1uL < dwHeight ? dwWidth : 0)];
-
-        ColorB colTop, colBottom;
-
-        colTop = lerp(colS[0], colS[1], iLerpX, 16);
-        colBottom = lerp(colS[2], colS[3], iLerpX, 16);
-
-        result = lerp(colTop, colBottom, iLerpY, 16);
-        return true;
-    }
-
-
-    // blend with background
-    static inline bool GetBilinearFiltered(const int iX16, const int iY16,
-        const uint32* pRGBAImage,
-        const uint32 dwWidth, const uint32 dwHeight,
-        uint8 result[3])
-    {
-        ColorB colFiltered;
-        if (GetBilinearFilteredRaw(iX16, iY16, pRGBAImage, dwWidth, dwHeight, colFiltered))
-        {
-            result[0] = colFiltered.r;
-            result[1] = colFiltered.g;
-            result[2] = colFiltered.b;
-            return true;
-        }
-        return false;
-    }
-
-    static inline bool GetBilinearFilteredBlend(const int iX16, const int iY16,
-        const uint32* pRGBAImage,
-        const uint32 dwWidth, const uint32 dwHeight,
-        const uint32 dwLerp64k,
-        uint8 result[3])
-    {
-        ColorB colFiltered;
-        if (GetBilinearFilteredRaw(iX16, iY16, pRGBAImage, dwWidth, dwHeight, colFiltered))
-        {
-            ColorB colRet = lerp(ColorB(result[0], result[1], result[2]), colFiltered, dwLerp64k, 256 * 256);
-
-            result[0] = colRet.r;
-            result[1] = colRet.g;
-            result[2] = colRet.b;
-            return true;
-        }
-        return false;
-    }
-
-    static inline bool GetBilinearFilteredAdd(const int iX16, const int iY16,
-        const uint32* pRGBAImage,
-        const uint32 dwWidth, const uint32 dwHeight,
-        const uint32 dwLerp64k,
-        uint8 result[3])
-    {
-        ColorB colFiltered;
-        if (GetBilinearFilteredRaw(iX16, iY16, pRGBAImage, dwWidth, dwHeight, colFiltered))
-        {
-            ColorB colRet = MadSaturate(colFiltered, dwLerp64k, 256 * 256, ColorB(result[0], result[1], result[2]));
-
-            result[0] = colRet.r;
-            result[1] = colRet.g;
-            result[2] = colRet.b;
-            return true;
-        }
-        return false;
-    }
-
-
-    float GetSliceAngle(const uint32 dwSlice) const
-    {
-        uint32 dwAlternatingSlice = (dwSlice * 2) % m_dwSliceCount;
-
-        float fAngleStep = m_fHorizFOV;
-
-        float fRet = fAngleStep * dwAlternatingSlice;
-
-        if (dwSlice * 2 >= m_dwSliceCount)
-        {
-            fRet += fAngleStep;
-        }
-
-        return fRet;
-    }
-
-    float GetHorizFOV() const
-    {
-        return m_fHorizFOV;
-    }
-
-    float GetHorizFOVWithBorder() const
-    {
-        return m_fHorizFOV * (1.0f + m_fTransitionSize);
-    }
-
-    void* GetBuffer(){ return &m_RGB[0]; }
-    uint32 GetWidth() { return m_dwWidth; }
-    uint32 GetHeight() { return m_dwHeight; }
-
-
-    //private: // -------------------------------------------------------------------
-
-    uint32                      m_dwWidth;                  // >0
-    uint32                      m_dwHeight;                 // >0
-    f32                         m_fInvWidth;                // >0
-    f32                         m_fInvHeight;               // >0
-    uint32                      m_dwVirtualWidth;           // >0
-    uint32                      m_dwVirtualHeight;          // >0
-    f32                         m_fInvVirtualWidth;         // >0
-    f32                         m_fInvVirtualHeight;        // >0
-    std::vector<uint8>          m_RGB;                      // [channel + x*3 + m_dwWidth*3*y], channel=0..2, x<m_dwWidth, y<m_dwHeight, no alpha channel to occupy less memory
-    uint32                      m_nFileId;                  // counts up until it finds free file id
-    bool                        m_bFlipY;                   // might be useful for some image formats
-    bool                        m_bMetaData;                // output additional metadata
-
-    float                       m_fPanoramaShotVertFOV;     // -1 means not set yet - in radians
-
-private:
-
-    uint32                      m_dwSliceCount;             //
-    C3DEngine&                  m_rEngine;                  //
-    float                       m_fHorizFOV;                // - in radians
-    float                       m_fTransitionSize;          // [0..1], 0=no transition, 1.0=full transition
-};
-#endif
-
-enum EScreenShotType
-{
-    ESST_NONE = 0,
-    ESST_HIGHRES = 1,
-    ESST_PANORAMA,
-    ESST_MAP_DELAYED,
-    ESST_MAP,
-    ESST_SWMAP,
-    ESST_SWMAP_DELAYED,
-};
-
-void C3DEngine::ScreenshotDispatcher([[maybe_unused]] const int nRenderFlags, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-#if defined(WIN32) || defined(WIN64) || defined(MAC)
-    CStitchedImage*   pStitchedImage = 0;
-    const uint32  dwPanWidth          = max(1, GetCVars()->e_ScreenShotWidth);
-    const uint32  dwPanHeight         = max(1, GetCVars()->e_ScreenShotHeight);
-    const f32         fTransitionSize = min(1.f, abs(GetCVars()->e_ScreenShotQuality) * 0.01f);
-
-    const uint32 widthSlices  = (dwPanWidth  + GetRenderer()->GetWidth()  - 1) / GetRenderer()->GetWidth();
-    const uint32 heightSlices = (dwPanHeight + GetRenderer()->GetHeight() - 1) / GetRenderer()->GetHeight();
-    uint32 MinSlices    = max(widthSlices, heightSlices);
-    MinSlices           = max(MinSlices, (uint32)GetCVars()->e_ScreenShotMinSlices);
-
-    const uint32  dwVirtualWidth  =   GetRenderer()->GetWidth() * MinSlices;
-    const uint32  dwVirtualHeight =   GetRenderer()->GetHeight() * MinSlices;
-
-    GetRenderer()->StartScreenShot(GetCVars()->e_ScreenShot);
-
-    switch (abs(GetCVars()->e_ScreenShot))
-    {
-    case ESST_HIGHRES:
-        GetConsole()->ShowConsole(false);
-
-        MinSlices = max(MinSlices, 1u);
-        pStitchedImage  =   new CStitchedImage(*this, dwPanWidth, dwPanHeight, dwVirtualWidth, dwVirtualHeight, MinSlices, fTransitionSize);
-
-        ScreenShotHighRes(pStitchedImage, nRenderFlags, passInfo, MinSlices, fTransitionSize);
-        pStitchedImage->SaveImage("HiRes");
-        pStitchedImage->Clear();    // good for debugging
-        delete pStitchedImage;
-        if (GetCVars()->e_ScreenShot > 0)     // <0 is used for multiple frames (videos)
-        {
-            GetCVars()->e_ScreenShot = 0;
-        }
-        break;
-    case ESST_PANORAMA:
-        GetConsole()->ShowConsole(false);
-
-        // Panorama screenshots will exhibit artifacts if insufficient slices are used to render them
-        // 20 slices yields great quality.
-        MinSlices = max(MinSlices, 20u);
-        pStitchedImage  =   new CStitchedImage(*this, dwPanWidth, dwPanHeight, dwVirtualWidth, dwVirtualHeight, MinSlices, fTransitionSize);
-        
-        ScreenShotPanorama(pStitchedImage, nRenderFlags, passInfo, MinSlices, fTransitionSize);
-        pStitchedImage->SaveImage("Panorama");
-        pStitchedImage->Clear();    // good for debugging
-        delete pStitchedImage;
-        if (GetCVars()->e_ScreenShot > 0)     // <0 is used for multiple frames (videos)
-        {
-            GetCVars()->e_ScreenShot = 0;
-        }
-        break;
-    case ESST_MAP_DELAYED:
-    {
-        GetCVars()->e_ScreenShot  =   sgn(GetCVars()->e_ScreenShot) * ESST_MAP;   // sgn() to keep sign bit , <0 is used for multiple frames (videos)
-    }
-    break;
-    case ESST_SWMAP_DELAYED:
-    {
-        GetCVars()->e_ScreenShot  =   sgn(GetCVars()->e_ScreenShot) * ESST_SWMAP;     // sgn() to keep sign bit , <0 is used for multiple frames (videos)
-    }
-    break;
-    case ESST_SWMAP:
-    case ESST_MAP:
-    {
-        static const unsigned int nMipMapSnapshotSize = 2048;
-        GetRenderer()->ChangeViewport(0, 0, nMipMapSnapshotSize, nMipMapSnapshotSize);
-        uint32 TmpHeight, TmpWidth, TmpVirtualHeight, TmpVirtualWidth;
-        TmpHeight = TmpWidth = TmpVirtualHeight = TmpVirtualWidth = 1;
-
-        while ((TmpHeight << 1) <= dwPanHeight)
-        {
-            TmpHeight <<= 1;
-        }
-        while ((TmpWidth << 1) <= dwPanWidth)
-        {
-            TmpWidth <<= 1;
-        }
-        const uint32  TmpMinSlices                =   max(max(1, GetCVars()->e_ScreenShotMinSlices),
-                max(static_cast<int>((TmpWidth + nMipMapSnapshotSize - 1) / nMipMapSnapshotSize),
-                    static_cast<int>((TmpHeight + nMipMapSnapshotSize - 1) / nMipMapSnapshotSize)));
-        while ((TmpVirtualHeight << 1) <= TmpMinSlices * nMipMapSnapshotSize)
-        {
-            TmpVirtualHeight <<= 1;
-        }
-        while ((TmpVirtualWidth << 1) <= TmpMinSlices * nMipMapSnapshotSize)
-        {
-            TmpVirtualWidth <<= 1;
-        }
-
-        GetConsole()->ShowConsole(false);
-        pStitchedImage    =   new CStitchedImage(*this, TmpWidth, TmpHeight, TmpVirtualWidth, TmpVirtualHeight, TmpMinSlices, fTransitionSize, true);
-        ScreenShotMap(pStitchedImage, nRenderFlags, passInfo, TmpMinSlices, fTransitionSize);
-        if (abs(GetCVars()->e_ScreenShot) == ESST_MAP)
-        {
-            pStitchedImage->SaveImage("Map");
-        }
-
-        if (m_pScreenshotCallback)
-        {
-            const f32   fSizeX  =   GetCVars()->e_ScreenShotMapSizeX;
-            const f32   fSizeY  =   GetCVars()->e_ScreenShotMapSizeY;
-            const f32   fTLX    =   GetCVars()->e_ScreenShotMapCenterX - fSizeX;
-            const f32   fTLY    =   GetCVars()->e_ScreenShotMapCenterY - fSizeY;
-            const f32   fBRX    =   GetCVars()->e_ScreenShotMapCenterX + fSizeX;
-            const f32   fBRY    =   GetCVars()->e_ScreenShotMapCenterY + fSizeY;
-
-            m_pScreenshotCallback->SendParameters(pStitchedImage->GetBuffer(), pStitchedImage->GetWidth(), pStitchedImage->GetHeight(), fTLX, fTLY, fBRX, fBRY);
-        }
-
-        pStitchedImage->Clear();    // good for debugging
-        delete pStitchedImage;
-    }
-        if (GetCVars()->e_ScreenShot > 0)     // <0 is used for multiple frames (videos)
-        {
-            GetCVars()->e_ScreenShot = 0;
-        }
-
-        break;
-    default:
-        GetCVars()->e_ScreenShot = 0;
-    }
-
-    GetRenderer()->EndScreenShot(GetCVars()->e_ScreenShot);
-
-#endif //#if defined(WIN32) || defined(WIN64)
-}
-
-
-
-struct SDebugFrustrum
-{
-    Vec3                      m_vPos[8];
-    const char*      m_szName;
-    CTimeValue            m_TimeStamp;
-    ColorB                    m_Color;
-    float                     m_fQuadDist;      // < 0 if not used
-};
-
-static StaticInstance<std::vector<SDebugFrustrum>> g_DebugFrustrums;
-
-void C3DEngine::DebugDraw_Draw()
-{
-#ifndef _RELEASE
-    if (m_DebugDrawListMgr.IsEnabled())
-    {
-        m_DebugDrawListMgr.Update();
-    }
-
-    CTimeValue CurrentTime = gEnv->pTimer->GetFrameStartTime();
-
-    IRenderAuxGeom* pAux = GetRenderer()->GetIRenderAuxGeom();
-
-    SAuxGeomRenderFlags   oldFlags = pAux->GetRenderFlags();
-    SAuxGeomRenderFlags   newFlags;
-    newFlags.SetAlphaBlendMode(e_AlphaBlended);
-    newFlags.SetCullMode(e_CullModeNone);
-    newFlags.SetDepthWriteFlag(e_DepthWriteOff);
-    pAux->SetRenderFlags(newFlags);
-    std::vector<SDebugFrustrum>::iterator it;
-
-    for (it = g_DebugFrustrums.begin(); it != g_DebugFrustrums.end(); )
-    {
-        SDebugFrustrum& ref = *it;
-
-        float fRatio = (CurrentTime - ref.m_TimeStamp).GetSeconds() * 2.0f;
-
-        if (fRatio > 1.0f)
-        {
-            it = g_DebugFrustrums.erase(it);
-            continue;
-        }
-
-        vtx_idx pnInd[8] = {    0, 4, 1, 5, 2, 6, 3, 7    };
-
-        float fRadius = ((ref.m_vPos[0] + ref.m_vPos[1] + ref.m_vPos[2] + ref.m_vPos[3]) - (ref.m_vPos[4] + ref.m_vPos[5] + ref.m_vPos[6] + ref.m_vPos[7])).GetLength() * 0.25f;
-        float fDistance = min(fRadius, 33.0f);  // in meters
-
-        float fRenderRatio = fRatio * fDistance / fRadius;
-
-        if (ref.m_fQuadDist > 0)
-        {
-            fRenderRatio = ref.m_fQuadDist / fRadius;
-        }
-
-        Vec3 vPos[4];
-
-        for (uint32 i = 0; i < 4; ++i)
-        {
-            vPos[i] = ref.m_vPos[i] * fRenderRatio + ref.m_vPos[i + 4] * (1.0f - fRenderRatio);
-        }
-
-        Vec3 vMid = (vPos[0] + vPos[1] + vPos[2] + vPos[3]) * 0.25f;
-
-        ColorB col = ref.m_Color;
-
-        if (ref.m_fQuadDist <= 0)
-        {
-            for (uint32 i = 0; i < 4; ++i)
-            {
-                vPos[i] = vPos[i] * 0.95f + vMid * 0.05f;
-            }
-
-            // quad
-            if (ref.m_fQuadDist != -999.f)
-            {
-                pAux->DrawTriangle(vPos[0], col, vPos[2], col, vPos[1], col);
-                pAux->DrawTriangle(vPos[2], col, vPos[0], col, vPos[3], col);
-            }
-            // projection lines
-            pAux->DrawLines(ref.m_vPos, 8, pnInd, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-            pAux->DrawLines(ref.m_vPos, 8, pnInd + 2, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-            pAux->DrawLines(ref.m_vPos, 8, pnInd + 4, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-            pAux->DrawLines(ref.m_vPos, 8, pnInd + 6, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-        }
-        else
-        {
-            // rectangle
-            pAux->DrawPolyline(vPos, 4, true, RGBA8(0xff, 0xff, 0x1f, 0xff));
-        }
-
-        ++it;
-    }
-
-    pAux->SetRenderFlags(oldFlags);
-
-
-    if (GetCVars()->e_DebugDraw == 16)
-    {
-        DebugDraw_UpdateDebugNode();
-    }
-    else
-    {
-        GetRenderer()->SetDebugRenderNode(NULL);
-    }
-
-#endif //_RELEASE
-}
-
-void C3DEngine::DebugDraw_UpdateDebugNode()
-{
-#ifndef _RELEASE
-
-
-#endif //_RELEASE
-}
-
-void C3DEngine::RenderWorld(const int nRenderFlags, const SRenderingPassInfo& passInfo, const char* szDebugName)
-{
-    AZ_TRACE_METHOD();
-
-    if (nRenderFlags & SHDF_ALLOW_AO)
-    {
-        SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::OnFrameStart, passInfo);
-    }
-
-    if (m_szLevelFolder[0] != 0)
-    {
-        m_nFramesSinceLevelStart++;
-    }
-
-    assert(szDebugName);
-
-    if (!GetCVars()->e_Render)
-    {
-        return;
-    }
-
-    IF (!m_bEditor && (m_bInShutDown || m_bInUnload) && !GetRenderer()->IsPost3DRendererEnabled(), 0)
-    {
-        // Do not render during shutdown/unloading (should never reach here, unless something wrong with game/editor code)
-        return;
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (GetCVars()->e_ScreenShot)
-    {
-        ScreenshotDispatcher(nRenderFlags, passInfo);
-        // screenshots can mess up the frame ids, be safe and recreate the rendering passinfo object after a screenshot
-        const_cast<SRenderingPassInfo&>(passInfo) = SRenderingPassInfo::CreateGeneralPassRenderingInfo(passInfo.GetCamera());
-    }
-
-    if (GetCVars()->e_DefaultMaterial)
-    {
-        _smart_ptr<IMaterial> pMat = GetMaterialManager()->LoadMaterial("Materials/material_default");
-        _smart_ptr<IMaterial> pTerrainMat = GetMaterialManager()->LoadMaterial("Materials/material_terrain_default");
-        GetRenderer()->SetDefaultMaterials(pMat, pTerrainMat);
-    }
-    else
-    {
-        GetRenderer()->SetDefaultMaterials(NULL, NULL);
-    }
-
-    // skip rendering if camera is invalid
-    if (IsCameraAnd3DEngineInvalid(passInfo, szDebugName))
-    {
-        return;
-    }
-
-    // this will also set the camera in passInfo for the General Pass (done here to support e_camerafreeze)
-    UpdateRenderingCamera(szDebugName, passInfo);
-
-    RenderInternal(nRenderFlags, passInfo, szDebugName);
-
-#if !defined(_RELEASE)
-    PrintDebugInfo(passInfo);
-#endif
-}
-
-void C3DEngine::RenderInternal(const int nRenderFlags, const SRenderingPassInfo& passInfo, [[maybe_unused]] const char* szDebugName)
-{
-    assert(m_pObjManager);
-
-
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        GetRenderer()->EF_EndEf3D(
-            IsShadersSyncLoad() ? (nRenderFlags | SHDF_NOASYNC | SHDF_STREAM_SYNC) : nRenderFlags,
-            GetObjManager()->GetUpdateStreamingPrioriryRoundId(),
-            GetObjManager()->GetUpdateStreamingPrioriryRoundIdFast(),
-            passInfo);
-    }
-    else
-    {
-        UpdatePreRender(passInfo);
-        RenderScene(nRenderFlags, passInfo);
-        UpdatePostRender(passInfo);
-    }
-}
-
-
-void C3DEngine::PreWorldStreamUpdate(const CCamera& cam)
-{
-    if (m_szLevelFolder[0] != 0)
-    {
-        m_nStreamingFramesSinceLevelStart++;
-    }
-
-    // force preload terrain data if camera was teleported more than 32 meters
-    if (!IsAreaActivationInUse() || m_bLayersActivated)
-    {
-        float fDistance = m_vPrevMainFrameCamPos.GetDistance(cam.GetPosition());
-
-        if (m_vPrevMainFrameCamPos != Vec3(-1000000.f, -1000000.f, -1000000.f))
-        {
-            m_vAverageCameraMoveDir = m_vAverageCameraMoveDir * .75f + (cam.GetPosition() - m_vPrevMainFrameCamPos) / max(0.01f, GetTimer()->GetFrameTime()) * .25f;
-            if (m_vAverageCameraMoveDir.GetLength() > 10.f)
-            {
-                m_vAverageCameraMoveDir.SetLength(10.f);
-            }
-
-            float fNewSpeed = fDistance / max(0.001f, gEnv->pTimer->GetFrameTime());
-            if (fNewSpeed > m_fAverageCameraSpeed)
-            {
-                m_fAverageCameraSpeed = fNewSpeed * .20f + m_fAverageCameraSpeed * .80f;
-            }
-            else
-            {
-                m_fAverageCameraSpeed = fNewSpeed * .02f + m_fAverageCameraSpeed * .98f;
-            }
-            m_fAverageCameraSpeed = CLAMP(m_fAverageCameraSpeed, 0, 10.f);
-        }
-
-        // Adjust streaming mip bias based on camera speed and depending on installed on HDD or not
-        bool bStreamingFromHDD = gEnv->pSystem->GetStreamEngine()->IsStreamDataOnHDD();
-        if (GetCVars()->e_StreamAutoMipFactorSpeedThreshold)
-        {
-            if (m_fAverageCameraSpeed > GetCVars()->e_StreamAutoMipFactorSpeedThreshold)
-            {
-                GetRenderer()->SetTexturesStreamingGlobalMipFactor(bStreamingFromHDD ? GetCVars()->e_StreamAutoMipFactorMax * .5f : GetCVars()->e_StreamAutoMipFactorMax);
-            }
-            else
-            {
-                GetRenderer()->SetTexturesStreamingGlobalMipFactor(bStreamingFromHDD ? GetCVars()->e_StreamAutoMipFactorMin * .5f : GetCVars()->e_StreamAutoMipFactorMin);
-            }
-        }
-        else
-        {
-            if (bStreamingFromHDD)
-            {
-                GetRenderer()->SetTexturesStreamingGlobalMipFactor(0);
-            }
-            else
-            {
-                GetRenderer()->SetTexturesStreamingGlobalMipFactor(GetCVars()->e_StreamAutoMipFactorMaxDVD);
-            }
-        }
-
-        if (GetCVars()->e_AutoPrecacheCameraJumpDist && fDistance > GetCVars()->e_AutoPrecacheCameraJumpDist)
-        {
-            m_bContentPrecacheRequested = true;
-
-            // Invalidate existing precache info
-            m_pObjManager->IncrementUpdateStreamingPrioriryRoundIdFast(8);
-            m_pObjManager->IncrementUpdateStreamingPrioriryRoundId(8);
-        }
-
-        m_vPrevMainFrameCamPos = cam.GetPosition();
-    }
-}
-
-void C3DEngine::WorldStreamUpdate()
-{
-#if defined(STREAMENGINE_ENABLE_STATS)
-    static uint32 nCurrentRequestCount = 0;
-    static uint64 nCurrentBytesRead = 0;
-    if (m_nStreamingFramesSinceLevelStart == 1)
-    {
-        // store current streaming stats
-        SStreamEngineStatistics& fullStats = gEnv->pSystem->GetStreamEngine()->GetStreamingStatistics();
-        nCurrentBytesRead = fullStats.nTotalBytesRead;
-        nCurrentRequestCount = fullStats.nTotalRequestCount;
-    }
-#endif
-
-    static float fTestStartTime = 0;
-    if (m_nStreamingFramesSinceLevelStart == 1)
-    {
-        fTestStartTime = GetCurAsyncTimeSec();
-        gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_FIRST_FRAME, 0, 0);
-    }
-
-    // Simple streaming performance test: Wait until all startup texture streaming jobs finish and print a message
-    if (!m_bEditor)
-    {
-        if (!m_bPreCacheEndEventSent)
-        {
-            IStreamEngine* pSE = gEnv->pSystem->GetStreamEngine();
-            SStreamEngineOpenStats openStats;
-            pSE->GetStreamingOpenStatistics(openStats);
-            bool bStarted =
-                (openStats.nOpenRequestCountByType[eStreamTaskTypeTexture] > 0) ||
-                (openStats.nOpenRequestCountByType[eStreamTaskTypeGeometry] > 0);
-
-            float fTime = GetCurAsyncTimeSec() - fTestStartTime;
-
-            switch (m_nStreamingFramesSinceLevelStart)
-            {
-            case 1:
-                pSE->PauseStreaming(true, (1 << eStreamTaskTypeTexture) | (1 << eStreamTaskTypeGeometry));
-                break;
-            case 4:
-                pSE->PauseStreaming(false, (1 << eStreamTaskTypeGeometry));
-                break;
-            case 8:
-                pSE->PauseStreaming(false, (1 << eStreamTaskTypeTexture));
-                break;
-            }
-
-            int nGlobalSystemState = gEnv->pSystem->GetSystemGlobalState();
-
-            if ((nGlobalSystemState != ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE && (!bStarted || fTime >= 10.0f)) && m_nStreamingFramesSinceLevelStart > 16)
-            {
-                gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE);
-
-                if (!bStarted)
-                {
-                    PrintMessage("Textures startup streaming finished in %.1f sec", fTime);
-                }
-                else
-                {
-                    PrintMessage("Textures startup streaming timed out after %.1f sec", fTime);
-                }
-
-                m_fTimeStateStarted = fTime;
-            }
-
-            if (nGlobalSystemState == ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE && (fTime - m_fTimeStateStarted) > 0.4f)
-            {
-                pSE->PauseStreaming(false, (1 << eStreamTaskTypeTexture) | (1 << eStreamTaskTypeGeometry));
-
-                m_bPreCacheEndEventSent = true;
-                gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_RUNNING);
-                gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_END, 0, 0);
-
-                fTestStartTime = 0.f;
-
-#if defined(STREAMENGINE_ENABLE_STATS)
-                SStreamEngineStatistics& fullStats = pSE->GetStreamingStatistics();
-                uint64 nBytesRead = fullStats.nTotalBytesRead - nCurrentBytesRead;
-                uint32 nRequestCount = fullStats.nTotalRequestCount - nCurrentRequestCount;
-
-                uint32 nOverallFileReadKB = (uint32)(nBytesRead / 1024);
-                uint32 nOverallFileReadNum = nRequestCount;
-                uint32 nBlockSize = (uint32)(nBytesRead / max((uint32)1, nRequestCount));
-                float fReadBandwidthMB = (float)fullStats.nTotalSessionReadBandwidth / (1024 * 1024);
-
-                PrintMessage("Average block size: %d KB, Average throughput: %.1f MB/sec, Jobs processed: %d (%.1f MB), File IO Bandwidth: %.2fMB/s",
-                    (nBlockSize) / 1024, (float)(nOverallFileReadKB / max(fTime, 1.f)) / 1024.f,
-                    nOverallFileReadNum, (float)nOverallFileReadKB / 1024.f,
-                    fReadBandwidthMB);
-
-                if (GetCVars()->e_StreamSaveStartupResultsIntoXML)
-                {
-                    const char* testResultsFile = "@usercache@/TestResults/Streaming_Level_Start_Throughput.xml";
-
-                    AZ::IO::HandleType resultsFile = gEnv->pCryPak->FOpen(testResultsFile, "wb");
-                    if (resultsFile != AZ::IO::InvalidHandle)
-                    {
-                        AZ::IO::Print(resultsFile,
-                            "<phase name=\"Streaming_Level_Start_Throughput\">\n"
-                            "<metrics name=\"Streaming\">\n"
-                            "<metric name=\"Duration_Sec\" value=\"%.1f\"/>\n"
-                            "<metric name=\"BlockSize_KB\" value=\"%d\"/>\n"
-                            "<metric name=\"Throughput_MB_Sec\" value=\"%.1f\"/>\n"
-                            "<metric name=\"Jobs_Num\" value=\"%d\"/>\n"
-                            "<metric name=\"Read_MB\" value=\"%.1f\"/>\n"
-                            "</metrics>\n"
-                            "</phase>\n",
-                            fTime,
-                            (nOverallFileReadKB / nOverallFileReadNum),
-                            (float)nOverallFileReadKB / max(fTime, 1.f) / 1024.f,
-                            nOverallFileReadNum,
-                            (float)nOverallFileReadKB / 1024.f);
-                        gEnv->pCryPak->FClose(resultsFile);
-                    }
-                }
-#endif
-                // gEnv->pCryPak->GetFileReadSequencer()->EndSection(); // STREAMING
-            }
-            else if (m_szLevelFolder[0])
-            {
-                ProposeContentPrecache();
-            }
-        }
-    }
-    else
-    {
-        if (!m_bPreCacheEndEventSent && m_nStreamingFramesSinceLevelStart == 4)
-        {
-            m_bPreCacheEndEventSent = true;
-            gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_RUNNING);
-            gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_END, 0, 0);
-        }
-    }
-}
-
-void C3DEngine::PrintDebugInfo(const SRenderingPassInfo& passInfo)
-{
-    if (GetCVars()->e_DebugDraw)
-    {
-        f32 fColor[4] = {1, 1, 0, 1};
-
-        float fYLine = 8.0f, fYStep = 20.0f;
-
-        GetRenderer()->Draw2dLabel(8.0f, fYLine += fYStep, 2.0f, fColor, false, "e_DebugDraw = %d", GetCVars()->e_DebugDraw);
-
-        const char* szMode = "";
-
-        switch (static_cast<int>(GetCVars()->e_DebugDraw))
-        {
-        case  -1:
-            szMode = "Showing bounding boxes";
-            break;
-        case  1:
-            szMode = "bounding boxes, name of the used cgf, polycount, used LOD";
-            break;
-        case  -2:
-        case  2:
-            szMode = "color coded polygon count(red,yellow,green,turqoise, blue)";
-            break;
-        case  -3:
-            szMode = "show color coded LODs count, flashing color indicates LOD.";
-            break;
-        case  3:
-            szMode = "show color coded LODs count, flashing color indicates LOD.\nFormat: (Current LOD [Min LOD; Max LOD] (LOD Ratio / Distance to camera)";
-            break;
-        case  -4:
-        case  4:
-            szMode = "object texture memory usage in KB";
-            break;
-        case  -5:
-        case  5:
-            szMode = "number of render materials (color coded)";
-            break;
-        case  6:
-            szMode = "ambient color (R,G,B,A)";
-            break;
-        case  7:
-            szMode = "triangle count, number of render materials, texture memory in KB";
-            break;
-        case  8:
-            szMode = "Free slot";
-            break;
-        case  9:
-            szMode = "Free slot";
-            break;
-        case 10:
-            szMode = "Deprecated option, use \"r_showlines 2\" instead";
-            break;
-        case 11:
-            szMode = "Free slot";
-            break;
-        case 12:
-            szMode = "Free slot";
-            break;
-        case 13:
-            szMode = "occlusion amount (used during AO computations)";
-            break;
-        //          case 14:    szMode="";break;
-        case 15:
-            szMode = "display helpers";
-            break;
-        case 16:
-            szMode = "Debug Gun";
-            break;
-        case 17:
-            szMode = "streaming: buffer sizes (black: geometry, blue: texture)";
-            if (gEnv->pLocalMemoryUsage)
-            {
-                gEnv->pLocalMemoryUsage->OnRender(GetRenderer(), &passInfo.GetCamera());
-            }
-            break;
-        case 18:
-            szMode = "Free slot";
-            break;
-        case 19:
-            szMode = "physics proxy triangle count";
-            break;
-        case 20:
-            szMode = "Character attachments texture memory usage";
-            break;
-        case 21:
-            szMode = "Display animated objects distance to camera";
-            break;
-        case -22:
-        case 22:
-            szMode = "object's current LOD vertex count";
-            break;
-        case 23:
-            szMode = "Display shadow casters in red";
-            break;
-        case 24:
-            szMode = "Objects without LODs.\n    name - (triangle count)\n    draw calls - zpass/general/transparent/shadows/misc";
-            break;
-        case 25:
-            szMode = "Objects without LODs (Red). Objects that need more LODs (Blue)\n    name - (triangle count)\n    draw calls - zpass/general/transparent/shadows/misc";
-            break;
-
-        default:
-            assert(0);
-        }
-
-        GetRenderer()->Draw2dLabel(8.0f, fYLine += fYStep, 2.0f, fColor, false, "   %s", szMode);
-
-        if (GetCVars()->e_DebugDraw == 17)
-        {
-            GetRenderer()->Draw2dLabel(8.0f, fYLine += fYStep, 2.0f, fColor, false, "   StatObj geometry used: %.2fMb / %dMb", CObjManager::s_nLastStreamingMemoryUsage / (1024.f * 1024.f), GetCVars()->e_StreamCgfPoolSize);
-
-            ICVar* cVar = GetConsole()->GetCVar("r_TexturesStreaming");
-            if (!cVar || !cVar->GetIVal())
-            {
-                GetRenderer()->Draw2dLabel(8.0f, fYLine += fYStep, 2.0f, fColor, false, "   You have to set r_TexturesStreaming = 1 to see texture information!");
-            }
-        }
-    }
-
-    float fTextPosX = 10, fTextPosY = 10, fTextStepY = 12;
-
-    // print list of streamed meshes
-    if (m_pObjManager && GetCVars()->e_StreamCgf && GetCVars()->e_StreamCgfDebug >= 3)
-    {
-        // overall status
-        {
-            static char szCGFStreaming[256] = "";
-            static SObjectsStreamingStatus objectsStreamingStatus = {0};
-
-            {
-                m_pObjManager->GetObjectsStreamingStatus(objectsStreamingStatus);
-                sprintf_s(szCGFStreaming, 256, "CgfStrm: Loaded:%d InProg:%d All:%d Act:%d MemUsed:%2.2f MemReq:%2.2f Pool:%d",
-                    objectsStreamingStatus.nReady, objectsStreamingStatus.nInProgress, objectsStreamingStatus.nTotal, objectsStreamingStatus.nActive, float(objectsStreamingStatus.nAllocatedBytes) / 1024 / 1024, float(objectsStreamingStatus.nMemRequired) / 1024 / 1024, GetCVars()->e_StreamCgfPoolSize);
-            }
-
-            bool bOutOfMem((float(objectsStreamingStatus.nMemRequired) / 1024 / 1024) > GetCVars()->e_StreamCgfPoolSize);
-            bool bCloseToOutOfMem((float(objectsStreamingStatus.nMemRequired) / 1024 / 1024) > GetCVars()->e_StreamCgfPoolSize * 90 / 100);
-
-            ColorF color = Col_White;
-            if (bOutOfMem)
-            {
-                color = Col_Red;
-            }
-            else if (bCloseToOutOfMem)
-            {
-                color = Col_Orange;
-            }
-
-            DrawTextLeftAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, color, szCGFStreaming);
-            fTextPosY += fTextStepY;
-        }
-
-        DrawTextLeftAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_White, "------------------- List of meshes bigger than %d KB -------------------", GetCVars()->e_StreamCgfDebugMinObjSize);
-
-        for (int nObjId = 0; nObjId < m_pObjManager->GetArrStreamableObjects().Count(); nObjId++)
-        {
-            CStatObj* pStatObj = (CStatObj*)m_pObjManager->GetArrStreamableObjects()[nObjId].GetStreamAbleObject();
-
-            int nKB = pStatObj->GetStreamableContentMemoryUsage() >> 10;
-            int nSel = (pStatObj->m_nSelectedFrameId >= passInfo.GetMainFrameID() - 2);
-
-            string sName;
-            pStatObj->GetStreamableName(sName);
-
-            if ((nKB >= GetCVars()->e_StreamCgfDebugMinObjSize && strstr(sName.c_str(), GetCVars()->e_StreamCgfDebugFilter->GetString())) || nSel)
-            {
-                const char* pComment = 0;
-
-                if (!pStatObj->m_bCanUnload)
-                {
-                    pComment = "NO_STRM";
-                }
-                else if (pStatObj->m_pLod0)
-                {
-                    pComment = "  LOD_X";
-                }
-                else if (!pStatObj->m_bLodsAreLoadedFromSeparateFile && pStatObj->m_nLoadedLodsNum > 1)
-                {
-                    pComment = " SINGLE";
-                }
-                else if (pStatObj->m_nLoadedLodsNum > 1)
-                {
-                    pComment = "  LOD_0";
-                }
-                else
-                {
-                    pComment = "NO_LODS";
-                }
-
-                int nDiff = SATURATEB(int(float(nKB - GetCVars()->e_StreamCgfDebugMinObjSize) / max(1, (int)GetCVars()->e_StreamCgfDebugMinObjSize) * 255));
-                ColorB col(nDiff, 255 - nDiff, 0, 255);
-                if (nSel && (1 & (int)(GetCurTimeSec() * 5.f)))
-                {
-                    col = Col_Yellow;
-                }
-                ColorF fColor(col[0] / 255.f, col[1] / 255.f, col[2] / 255.f, col[3] / 255.f);
-
-                const char* pStatusText = "Unload";
-                if (pStatObj->m_eStreamingStatus == ecss_Ready)
-                {
-                    pStatusText = "Ready ";
-                }
-                else if (pStatObj->m_eStreamingStatus == ecss_InProgress)
-                {
-                    pStatusText = "InProg";
-                }
-
-                DrawTextLeftAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, fColor, "%1.2f mb, %s, %s, %s",
-                    1.f / 1024.f * nKB, pComment, pStatusText, sName.c_str());
-
-                if (fTextPosY > (float)gEnv->pRenderer->GetHeight())
-                {
-                    break;
-                }
-            }
-        }
-    }
-
-    if (m_arrProcessStreamingLatencyTestResults.Count())
-    {
-        float fAverTime = 0;
-        for (int i = 0; i < m_arrProcessStreamingLatencyTestResults.Count(); i++)
-        {
-            fAverTime += m_arrProcessStreamingLatencyTestResults[i];
-        }
-        fAverTime /= m_arrProcessStreamingLatencyTestResults.Count();
-
-        int nAverTexNum = 0;
-        for (int i = 0; i < m_arrProcessStreamingLatencyTexNum.Count(); i++)
-        {
-            nAverTexNum += m_arrProcessStreamingLatencyTexNum[i];
-        }
-        nAverTexNum /= m_arrProcessStreamingLatencyTexNum.Count();
-
-        DrawTextLeftAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_Yellow, "------ SQT Average Time = %.1f, TexNum = %d ------",  fAverTime, nAverTexNum);
-
-        for (int i = 0; i < m_arrProcessStreamingLatencyTestResults.Count(); i++)
-        {
-            DrawTextLeftAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_Yellow, "Run %d: Time = %.1f, TexNum = %d",
-                i, m_arrProcessStreamingLatencyTestResults[i], m_arrProcessStreamingLatencyTexNum[i]);
-        }
-    }
-
-#if defined(USE_GEOM_CACHES)
-#ifndef _RELEASE
-    if (GetCVars()->e_GeomCacheDebug)
-    {
-        m_pGeomCacheManager->DrawDebugInfo();
-    }
-    else
-    {
-        m_pGeomCacheManager->ResetDebugInfo();
-    }
-#endif
-#endif
-}
-
-void C3DEngine::UpdatePreRender(const SRenderingPassInfo& passInfo)
-{
-    AZ_TRACE_METHOD();
-    FUNCTION_PROFILER(GetISystem(), PROFILE_3DENGINE);
-
-    assert(passInfo.IsGeneralPass());
-
-    // Compute global shadow cascade parameters.
-    {
-        m_fGsmRange = GetCVars()->e_GsmRange;
-        m_fGsmRangeStep = GetCVars()->e_GsmRangeStep;
-
-        //!!!also formulas for computing biases per gsm needs to be changed
-        m_fShadowsConstBias = GetCVars()->e_ShadowsConstBias;
-        m_fShadowsSlopeBias = GetCVars()->e_ShadowsSlopeBias;
-
-        if (m_eShadowMode == ESM_HIGHQUALITY)
-        {
-            m_fGsmRange = min(0.15f, GetCVars()->e_GsmRange);
-            m_fGsmRangeStep = min(2.8f, GetCVars()->e_GsmRangeStep);
-
-            m_fShadowsConstBias = min(GetCVars()->e_ShadowsConstBiasHQ, GetCVars()->e_ShadowsConstBias);
-            m_fShadowsSlopeBias = min(GetCVars()->e_ShadowsSlopeBiasHQ, GetCVars()->e_ShadowsSlopeBias);
-        }
-
-        const int nCascadeCount = Get3DEngine()->GetShadowsCascadeCount(NULL);
-        m_pObjManager->SetGSMMaxDistance(Get3DEngine()->m_fGsmRange * powf(Get3DEngine()->m_fGsmRangeStep, (float)nCascadeCount));
-    }
-
-    // (bethelz) This has to happen before particle updates.
-    m_PhysicsAreaUpdates.Update();
-
-    if (passInfo.RenderClouds())
-    {
-        if (m_pCloudsManager)
-        {
-            m_pCloudsManager->MoveClouds();
-        }
-
-        CVolumeObjectRenderNode::MoveVolumeObjects();
-    }
-
-    UpdateSun(passInfo);
-
-    // Set traceable fog volume areas
-    CFogVolumeRenderNode::SetTraceableArea(AABB(passInfo.GetCamera().GetPosition(), 1024.0f), passInfo);
-}
-
-void C3DEngine::UpdatePostRender(const SRenderingPassInfo& passInfo)
-{
-    AZ_TRACE_METHOD();
-    FUNCTION_PROFILER(GetISystem(), PROFILE_3DENGINE);
-
-    assert (m_pObjManager);
-
-    m_pObjManager->CheckTextureReadyFlag();
-    if (GetCVars()->e_StreamCgf)
-    {
-        static Array2d<int> memUsage;
-
-        int nArrayDim = 256;
-#ifndef CONSOLE_CONST_CVAR_MODE
-        if (GetCVars()->e_StreamCgfDebugHeatMap == 1)
-        {
-            memUsage.Allocate(nArrayDim);
-            CCamera camOld = passInfo.GetCamera();
-
-            PrintMessage("Computing mesh streaming heat map");
-
-            //The assumption is that this is called on Main Thread, otherwise the loop
-            //Should be wrapped inside a EnumerateHandlers lambda.
-            auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-            const float defaultTerrainHeight = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-
-            const AZ::Aabb terrainAabb = terrain ? terrain->GetTerrainAabb() : AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-            const int nTerrainSizeX = static_cast<int>(terrainAabb.GetXExtent());
-            const int nTerrainSizeY = static_cast<int>(terrainAabb.GetYExtent());
-            const int nStepX = nTerrainSizeX / nArrayDim;
-            const int nStepY = nTerrainSizeY / nArrayDim;
-
-            for (int x = 0; x < nTerrainSizeX; x += nStepX)
-            {
-                for (int y = 0; y < nTerrainSizeY; y += nStepY)
-                {
-                    CCamera camTmp = camOld;
-                    float terrainHeight = terrain ? terrain->GetHeightFromFloats((float)x, (float)y) : defaultTerrainHeight;
-                    camTmp.SetPosition(Vec3((float)x + (float)nStepX / 2.f, (float)y + (float)nStepY / 2.f, terrainHeight));
-                    //SetCamera(camTmp);
-                    m_pObjManager->ProcessObjectsStreaming(passInfo);
-
-                    SObjectsStreamingStatus objectsStreamingStatus;
-                    m_pObjManager->GetObjectsStreamingStatus(objectsStreamingStatus);
-
-                    memUsage[x / nStepX][y / nStepY] = objectsStreamingStatus.nMemRequired;
-                }
-
-                if (!((x / nStepX) & 31))
-                {
-                    PrintMessage(" working ...");
-                }
-            }
-
-            PrintMessage(" done");
-
-            GetCVars()->e_StreamCgfDebugHeatMap = 2;
-            //SetCamera(camOld);
-        }
-        else if (GetCVars()->e_StreamCgfDebugHeatMap == 2)
-        {
-            auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-            const float defaultTerrainHeight = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-
-            const AZ::Aabb terrainAabb = terrain ? terrain->GetTerrainAabb() : AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-            const float terrainSizeX = terrainAabb.GetXExtent();
-            const float terrainSizeY = terrainAabb.GetYExtent();
-            const float fStepX = terrainSizeX / nArrayDim;
-            const float fStepY = terrainSizeY / nArrayDim;
-
-            for (int x = 0; x < memUsage.GetSize(); x++)
-            {
-                for (int y = 0; y < memUsage.GetSize(); y++)
-                {
-                    float terrainHeight = terrain ? terrain->GetHeightFromFloats((float)x * fStepX, (float)y * fStepY) : defaultTerrainHeight;
-                    Vec3 v0((float)x* fStepX,       (float)y* fStepY,       terrainHeight);
-                    Vec3 v1((float)x* fStepX + fStepX, (float)y* fStepY + fStepY, v0.z + fStepX);
-                    v0 += Vec3(.25f, .25f, .25f);
-                    v1 -= Vec3(.25f, .25f, .25f);
-                    AABB box(v0, v1);
-                    if (!passInfo.GetCamera().IsAABBVisible_F(box))
-                    {
-                        continue;
-                    }
-
-                    int nMemUsageMB = memUsage[(int)(x)][(int)(y)] / 1024 / 1024;
-
-                    int nOverLoad = nMemUsageMB - GetCVars()->e_StreamCgfPoolSize;
-
-                    ColorB col = Col_Red;
-
-                    if (nOverLoad < GetCVars()->e_StreamCgfPoolSize / 2)
-                    {
-                        col = Col_Yellow;
-                    }
-
-                    if (nOverLoad < 0)
-                    {
-                        col = Col_Green;
-                    }
-
-                    DrawBBox(box, col);
-                }
-            }
-        }
-#endif //CONSOLE_CONST_CVAR_MODE
-        m_pObjManager->ProcessObjectsStreaming(passInfo);
-    }
-    else
-    {
-        m_pObjManager->GetStreamPreCacheCameras()[0].vPosition = passInfo.GetCamera().GetPosition();
-        if (Distance::Point_AABBSq(m_pObjManager->GetStreamPreCacheCameras()[0].vPosition, m_pObjManager->GetStreamPreCacheCameras()[0].bbox) > 0.0f)
-        {
-            m_pObjManager->GetStreamPreCacheCameras()[0].bbox = AABB(m_pObjManager->GetStreamPreCacheCameras()[0].vPosition, GetCVars()->e_StreamPredictionBoxRadius);
-        }
-        m_pObjManager->UpdateObjectsStreamingPriority(false, passInfo);
-    }
-
-    // (bethelz) Per-frame precache request handled by streaming systems.
-    m_bContentPrecacheRequested = false;
-}
-
-int __cdecl C3DEngine__Cmp_SRNInfo(const void* v1, const void* v2)
-{
-    SRNInfo* p1 = (SRNInfo*)v1;
-    SRNInfo* p2 = (SRNInfo*)v2;
-
-    float fViewDist1 = p1->fMaxViewDist - p1->objSphere.radius;
-    float fViewDist2 = p2->fMaxViewDist - p2->objSphere.radius;
-
-    // if same - give closest sectors higher priority
-    if (fViewDist1 > fViewDist2)
-    {
-        return 1;
-    }
-    else if (fViewDist1 < fViewDist2)
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-void C3DEngine::SetSkyMaterialPath(const string& skyMatName)
-{
-    m_skyMatName = skyMatName;
-    m_pSkyMat = nullptr;
-}
-
-void C3DEngine::SetSkyLowSpecMaterialPath(const string& skyLowSpecMatName)
-{
-    m_skyLowSpecMatName = skyLowSpecMatName;
-    m_pSkyLowSpecMat = nullptr;
-}
-
-void C3DEngine::LoadSkyMaterial()
-{
-    const int skyType = GetCVars()->e_SkyType;
-    if (skyType == 0)
-    {
-        if (!m_pSkyLowSpecMat)
-        {
-            m_pSkyLowSpecMat = m_skyLowSpecMatName.empty() ? nullptr : m_pMatMan->LoadMaterial(m_skyLowSpecMatName.c_str(), false, false, MTL_FLAG_IS_SKY);
-            AZ_Warning("3DEngine", m_pSkyLowSpecMat, "Missing low spec sky material: %s", m_skyLowSpecMatName.c_str());
-        }
-    }
-    else
-    {
-        if (!m_pSkyMat)
-        {
-            m_pSkyMat = m_skyMatName.empty() ? nullptr : m_pMatMan->LoadMaterial(m_skyMatName.c_str(), false, false, MTL_FLAG_IS_SKY);
-            AZ_Warning("3DEngine", m_pSkyMat, "Missing sky material: %s", m_skyMatName.c_str());
-        }
-    }
-    m_previousSkyType = skyType;
-}
-
-_smart_ptr<IMaterial> C3DEngine::GetSkyMaterial()
-{
-    const int skyType = GetCVars()->e_SkyType;
-
-    // If e_SkyType has changed, then we may need to load a different sky material.
-    if (skyType != m_previousSkyType)
-    {
-        LoadSkyMaterial();
-    }
-
-    return (skyType == 0) ? m_pSkyLowSpecMat : m_pSkyMat;
-}
-
-void C3DEngine::SetSkyMaterial(_smart_ptr<IMaterial> pSkyMat)
-{
-    m_pSkyMat = pSkyMat;
-}
-
-bool C3DEngine::IsHDRSkyMaterial(_smart_ptr<IMaterial> pMat) const
-{
-    return pMat && !azstricmp(pMat->GetSafeSubMtl(0)->GetShaderItem().m_pShader->GetName(), "SkyHDR");
-}
-
-void C3DEngine::RenderScene(const int nRenderFlags, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-    CRY_ASSERT(passInfo.IsGeneralPass());
-    CRY_ASSERT(m_pVisAreaManager);
-    CRY_ASSERT(m_pClipVolumeManager);
-    CRY_ASSERT(m_pDecalManager);
-
-    GetObjManager()->GetCullThread().SetActive(true);
-
-    if (GetCVars()->e_CoverageBuffer)
-    {
-        m_pCoverageBuffer->BeginFrame(passInfo);
-    }
-
-    if (m_pVisAreaManager != nullptr)
-    {
-        m_pVisAreaManager->DrawOcclusionAreasIntoCBuffer(m_pCoverageBuffer, passInfo);
-        m_pVisAreaManager->CheckVis(passInfo);
-    }
-
-    if (m_pClipVolumeManager)
-    {
-        m_pClipVolumeManager->PrepareVolumesForRendering(passInfo);
-    }
-
-    if (m_pObjManager)
-    {
-        m_pObjManager->RenderAllObjectDebugInfo();
-    }
-    SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-
-    // make sure all jobs from the previous frame have finished
-    threadID nPrevThreadID = 0;
-    gEnv->pRenderer->EF_Query(EFQ_RenderThreadList, nPrevThreadID);
-    gEnv->pRenderer->GetFinalizeRendItemJobExecutor(nPrevThreadID)->WaitForCompletion();
-    gEnv->pRenderer->GetFinalizeShadowRendItemJobExecutor(nPrevThreadID)->WaitForCompletion();
-
-    GetRenderer()->EF_ClearSkinningDataPool();
-    GetRenderer()->BeginSpawningGeneratingRendItemJobs(passInfo.ThreadID());
-
-    GetRenderer()->EF_StartEf(passInfo);
-
-    m_bIsInRenderScene = true;
-    COctreeNode::ReleaseEmptyNodes();
-
-    m_LightVolumesMgr.Clear(passInfo);
-
-    SubmitSun(passInfo);
-
-    if (GetCVars()->e_StatObjBufferRenderTasks && m_pObjManager != nullptr)
-    {
-        m_pObjManager->BeginOcclusionCulling(passInfo);
-    }
-
-    if (m_pVisAreaManager != nullptr)
-    {
-        m_pVisAreaManager->DrawVisibleSectors(passInfo, rendItemSorter);
-    }
-    m_nOceanRenderFlags &= ~OCR_OCEANVOLUME_VISIBLE;
-
-    if (IsOutdoorVisible() || GetRenderer()->IsPost3DRendererEnabled())
-    {
-        if (m_pVisAreaManager != nullptr && m_pVisAreaManager->m_lstOutdoorPortalCameras.Count()   &&
-            (m_pVisAreaManager->m_pCurArea || m_pVisAreaManager->m_pCurPortal))
-        { // enable multi-camera culling
-            const_cast<CCamera&>(passInfo.GetCamera()).m_pMultiCamera = &m_pVisAreaManager->m_lstOutdoorPortalCameras;
-        }
-
-        if (IsOutdoorVisible())
-        {
-            RenderSkyBox(GetSkyMaterial(), passInfo);
-        }
-
-        rendItemSorter.IncreaseOctreeCounter();
-        {
-            FRAME_PROFILER_LEGACYONLY("COctreeNode::Render_____", GetSystem(), PROFILE_3DENGINE);
-            AZ_TRACE_METHOD_NAME("COctreeNode::Render");
-            if (m_pObjectsTree != nullptr)
-            {
-                m_pObjectsTree->Render_Object_Nodes(false, OCTREENODE_RENDER_FLAG_OBJECTS, passInfo, rendItemSorter);
-            }
-        }
-        rendItemSorter.IncreaseGroupCounter();
-    }
-    else if (m_pVisAreaManager && m_pVisAreaManager->IsSkyVisible())
-    {
-        RenderSkyBox(GetSkyMaterial(), passInfo);
-    }
-    
-    // Outdoor is not visible, that means there is no SkyBox to render.
-    // So we want to clear the GBuffer RT/background in order to avoid artifacts.
-    GetRenderer()->SetClearBackground(!IsOutdoorVisible());
-
-    if (nRenderFlags & SHDF_ALLOW_AO)
-    {
-        SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::UpdateRenderData);
-    }
-
-    {
-        FRAME_PROFILER_LEGACYONLY("COctreeNode::Render_Object_Nodes_NEAR", GetSystem(), PROFILE_3DENGINE);
-        AZ_TRACE_METHOD_NAME("COctreeNode::Render_Object_Nodes_NEAR");
-        rendItemSorter.IncreaseOctreeCounter();
-        if (GetCVars()->e_PortalsBigEntitiesFix)
-        {
-            if (!IsOutdoorVisible() && GetVisAreaManager() != nullptr && GetVisAreaManager()->GetCurVisArea())
-            {
-                if (GetVisAreaManager()->GetCurVisArea()->IsConnectedToOutdoor())
-                {
-                    CCamera cam = passInfo.GetCamera();
-                    cam.SetFrustum(cam.GetViewSurfaceX(), cam.GetViewSurfaceZ(), cam.GetFov(), min(cam.GetNearPlane(), 1.f), 2.f, cam.GetPixelAspectRatio());
-                    m_pObjectsTree->Render_Object_Nodes(false, OCTREENODE_RENDER_FLAG_OBJECTS | OCTREENODE_RENDER_FLAG_OBJECTS_ONLY_ENTITIES,  SRenderingPassInfo::CreateTempRenderingInfo(cam, passInfo), rendItemSorter);
-                }
-            }
-        }
-    }
-    rendItemSorter.IncreaseGroupCounter();
-
-    // render special objects like laser beams intersecting entire level
-    for (int i = 0; i < m_lstAlwaysVisible.Count(); i++)
-    {
-        IRenderNode* pObj = m_lstAlwaysVisible[i];
-        const AABB& objBox = pObj->GetBBox();
-        // don't frustum cull the HUD. When e.g. zooming the FOV for this camera is very different to the
-        // fixed HUD FOV, and this can cull incorrectly.
-        const unsigned int dwRndFlags = pObj->GetRndFlags();
-        if (dwRndFlags & ERF_HUD || passInfo.GetCamera().IsAABBVisible_E(objBox))
-        {
-            FRAME_PROFILER_LEGACYONLY("C3DEngine::RenderScene_DrawAlwaysVisible", GetSystem(), PROFILE_3DENGINE);
-            AZ_TRACE_METHOD_NAME("COctreeNode::RenderScene_DrawAlwaysVisible");
-
-            Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-            float fEntDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, objBox)) * passInfo.GetZoomFactor();
-            assert(fEntDistance >= 0 && _finite(fEntDistance));
-            if (fEntDistance < pObj->m_fWSMaxViewDist && GetObjManager() != nullptr)
-            {
-                GetObjManager()->RenderObject(pObj, objBox, fEntDistance, pObj->GetRenderNodeType(), passInfo, rendItemSorter);
-            }
-        }
-    }
-    rendItemSorter.IncreaseGroupCounter();
-
-    if (m_pOcean)
-    {
-        ProcessOcean(passInfo);
-    }
-
-    if (passInfo.RenderDecals() && m_pDecalManager != nullptr)
-    {
-        m_pDecalManager->Render(passInfo);
-    }
-
-    // tell the occlusion culler that no new work will be submitted
-    if (GetCVars()->e_StatObjBufferRenderTasks == 1 && GetObjManager() != nullptr)
-    {
-        GetObjManager()->PushIntoCullQueue(SCheckOcclusionJobData::CreateQuitJobData());
-    }
-
-    // fill shadow list here to allow more time between starting and waiting for the occlusion buffer
-    InitShadowFrustums(passInfo);
-
-    gEnv->pSystem->DoWorkDuringOcclusionChecks();
-
-    if (GetCVars()->e_StatObjBufferRenderTasks && m_pObjManager != nullptr)
-    {
-        m_pObjManager->RenderBufferedRenderMeshes(passInfo);
-    }
-
-    // don't start shadow jobs if we aren't generating shadows
-    if ((nRenderFlags & SHDF_NO_SHADOWGEN) == 0)
-    {
-        GetRenderer()->EF_InvokeShadowMapRenderJobs(IsShadersSyncLoad() ? (nRenderFlags | SHDF_NOASYNC | SHDF_STREAM_SYNC) : nRenderFlags);
-    }
-
-    m_LightVolumesMgr.Update(passInfo);
-
-    SetupDistanceFog();
-
-    SetupClearColor();
-
-    {
-        FRAME_PROFILER("Renderer::EF_EndEf3D", GetSystem(), PROFILE_RENDERER);
-        // TODO: separate SHDF_NOASYNC and SHDF_STREAM_SYNC flags
-        GetRenderer()->EF_EndEf3D(IsShadersSyncLoad() ? (nRenderFlags | SHDF_NOASYNC | SHDF_STREAM_SYNC) : nRenderFlags,  GetObjManager()->GetUpdateStreamingPrioriryRoundId(), GetObjManager()->GetUpdateStreamingPrioriryRoundIdFast(), passInfo);
-    }
-
-    GetRenderer()->EnableFog(false);
-
-    bool bIsMultiThreadedRenderer = false;
-    gEnv->pRenderer->EF_Query(EFQ_RenderMultithreaded, bIsMultiThreadedRenderer);
-    if (bIsMultiThreadedRenderer)
-    {
-        gEnv->pRenderer->EndSpawningGeneratingRendItemJobs();
-    }
-
-    m_bIsInRenderScene = false;
-
-#ifndef _RELEASE
-    IF (GetCVars()->e_LightVolumesDebug, 0)
-    {
-        m_LightVolumesMgr.DrawDebug(passInfo);
-    }
-#endif
-}
-
-void C3DEngine::WaitForCullingJobsCompletion()
-{
-    const bool waitForOcclusionJobCompletion = true;
-    m_pObjManager->EndOcclusionCulling(waitForOcclusionJobCompletion);
-    COctreeNode::WaitForContentJobCompletion();
-}
-
-void C3DEngine::RenderSceneReflection(const int nRenderFlags, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-    CRY_ASSERT(passInfo.IsRecursivePass());
-    CRY_ASSERT(passInfo.GetRecursiveLevel() < MAX_RECURSION_LEVELS);
-    CRY_ASSERT(m_pVisAreaManager);
-    CRY_ASSERT(m_pClipVolumeManager);
-    CRY_ASSERT(m_pDecalManager);
-
-    if (!GetCVars()->e_Recursion)
-    {
-        return;
-    }
-
-    if (m_pVisAreaManager != nullptr)
-    {
-        m_pVisAreaManager->CheckVis(passInfo);
-    }
-
-    if (m_pClipVolumeManager != nullptr)
-    {
-        m_pClipVolumeManager->PrepareVolumesForRendering(passInfo);
-    }
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // From here we add render elements of main scene
-    ////////////////////////////////////////////////////////////////////////////////////////
-    SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-
-    GetRenderer()->EF_StartEf(passInfo);
-
-    if (m_pVisAreaManager != nullptr)
-    {
-        m_pVisAreaManager->DrawVisibleSectors(passInfo, rendItemSorter);
-    }
-
-    if (IsOutdoorVisible() || GetRenderer()->IsPost3DRendererEnabled())
-    {
-        if (m_pVisAreaManager != nullptr && m_pVisAreaManager->m_lstOutdoorPortalCameras.Count() &&
-            (m_pVisAreaManager->m_pCurArea || m_pVisAreaManager->m_pCurPortal))
-        { // enable multi-camera culling
-            const_cast<CCamera&>(passInfo.GetCamera()).m_pMultiCamera = &m_pVisAreaManager->m_lstOutdoorPortalCameras;
-        }
-
-        if (IsOutdoorVisible())
-        {
-            RenderSkyBox(GetSkyMaterial(), passInfo);
-        }
-
-        {
-            rendItemSorter.IncreaseOctreeCounter();
-            FRAME_PROFILER("COctreeNode::Render_____", GetSystem(), PROFILE_3DENGINE);
-            if (m_pObjectsTree != nullptr)
-            {
-                m_pObjectsTree->Render_Object_Nodes(false, OCTREENODE_RENDER_FLAG_OBJECTS, passInfo, rendItemSorter);
-            }
-        }
-        rendItemSorter.IncreaseGroupCounter();
-    }
-    else if (m_pVisAreaManager != nullptr && m_pVisAreaManager->IsSkyVisible())
-    {
-        RenderSkyBox(GetSkyMaterial(), passInfo);
-    }
-
-    {
-        FRAME_PROFILER("COctreeNode::Render_Object_Nodes_NEAR", GetSystem(), PROFILE_3DENGINE);
-        rendItemSorter.IncreaseOctreeCounter();
-        if (GetCVars()->e_PortalsBigEntitiesFix)
-        {
-            if (!IsOutdoorVisible() && GetVisAreaManager() != nullptr && GetVisAreaManager()->GetCurVisArea())
-            {
-                if (GetVisAreaManager()->GetCurVisArea()->IsConnectedToOutdoor())
-                {
-                    CCamera cam = passInfo.GetCamera();
-                    cam.SetFrustum(cam.GetViewSurfaceX(), cam.GetViewSurfaceZ(), cam.GetFov(), min(cam.GetNearPlane(), 1.f), 2.f, cam.GetPixelAspectRatio());
-                    if (m_pObjectsTree != nullptr)
-                    {
-                        m_pObjectsTree->Render_Object_Nodes(false, OCTREENODE_RENDER_FLAG_OBJECTS | OCTREENODE_RENDER_FLAG_OBJECTS_ONLY_ENTITIES, SRenderingPassInfo::CreateTempRenderingInfo(cam, passInfo), rendItemSorter);
-                    }
-                }
-            }
-        }
-    }
-    rendItemSorter.IncreaseGroupCounter();
-
-    // render special objects like laser beams intersecting entire level
-    for (int i = 0; i < m_lstAlwaysVisible.Count(); i++)
-    {
-        IRenderNode* pObj = m_lstAlwaysVisible[i];
-        const AABB& objBox = pObj->GetBBox();
-        // don't frustum cull the HUD. When e.g. zooming the FOV for this camera is very different to the
-        // fixed HUD FOV, and this can cull incorrectly.
-        const unsigned int dwRndFlags = pObj->GetRndFlags();
-        if (dwRndFlags & ERF_HUD || passInfo.GetCamera().IsAABBVisible_E(objBox))
-        {
-            FRAME_PROFILER("C3DEngine::RenderScene_DrawAlwaysVisible", GetSystem(), PROFILE_3DENGINE);
-
-            Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-            float fEntDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, objBox)) * passInfo.GetZoomFactor();
-            assert(fEntDistance >= 0 && _finite(fEntDistance));
-            if (fEntDistance < pObj->m_fWSMaxViewDist)
-            {
-                GetObjManager()->RenderObject(pObj, objBox, fEntDistance, pObj->GetRenderNodeType(), passInfo, rendItemSorter);
-            }
-        }
-    }
-    rendItemSorter.IncreaseGroupCounter();
-
-    if (m_pOcean)
-    {
-        ProcessOcean(passInfo);
-    }
-
-    //Update light volumes again. Processing particles may have resulted in an increase in the number of light volumes.
-    m_LightVolumesMgr.Update(passInfo);
-
-    if (passInfo.RenderDecals() && m_pDecalManager != nullptr)
-    {
-        m_pDecalManager->Render(passInfo);
-    }
-
-    {
-        FRAME_PROFILER("Renderer::EF_EndEf3D", GetSystem(), PROFILE_RENDERER);
-        GetRenderer()->EF_EndEf3D(IsShadersSyncLoad() ? (nRenderFlags | SHDF_NOASYNC | SHDF_STREAM_SYNC) : nRenderFlags,  GetObjManager()->GetUpdateStreamingPrioriryRoundId(), GetObjManager()->GetUpdateStreamingPrioriryRoundIdFast(), passInfo);
-    }
-}
-
-void C3DEngine::ProcessOcean(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    AZ_Assert(m_pOcean != nullptr, "Ocean pointer must be validated before calling ProcessOcean");
-
-    if (GetOceanRenderFlags() & OCR_NO_DRAW || !GetVisAreaManager() || GetCVars()->e_DefaultMaterial)
-    {
-        return;
-    }
-
-    bool bOceanIsForcedByVisAreaFlags = GetVisAreaManager()->IsOceanVisible();
-
-    if (!IsOutdoorVisible() && !bOceanIsForcedByVisAreaFlags)
-    {
-        return;
-    }
-
-    bool bOceanVisible = false;
-    if (OceanToggle::IsActive())
-    {
-        bOceanVisible = OceanRequest::OceanIsEnabled();
-    }
-    else
-    {
-        bOceanVisible = true;
-    }
-
-    if (bOceanVisible && passInfo.RenderWaterOcean() && m_bOcean)
-    {
-        Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-        float fWaterPlaneSize = passInfo.GetCamera().GetFarPlane();
-        const float fOceanLevel = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel():  m_pOcean->GetWaterLevel();
-
-        AABB boxOcean(Vec3(vCamPos.x - fWaterPlaneSize, vCamPos.y - fWaterPlaneSize, std::numeric_limits<float>::lowest()),
-            Vec3(vCamPos.x + fWaterPlaneSize, vCamPos.y + fWaterPlaneSize, fOceanLevel + 0.5f));
-
-        if ((!bOceanIsForcedByVisAreaFlags && passInfo.GetCamera().IsAABBVisible_EM(boxOcean)) ||
-            (bOceanIsForcedByVisAreaFlags && passInfo.GetCamera().IsAABBVisible_E (boxOcean)))
-        {
-            bool bOceanIsVisibleFromIndoor = true;
-            if (class PodArray<CCamera>* pMultiCamera = passInfo.GetCamera().m_pMultiCamera)
-            {
-                for (int i = 0; i < pMultiCamera->Count(); i++)
-                {
-                    CVisArea* pExitPortal = (CVisArea*)(pMultiCamera->Get(i))->m_pPortal;
-                    float fMinZ = pExitPortal->GetAABBox()->min.z;
-                    float fMaxZ = pExitPortal->GetAABBox()->max.z;
-
-                    if (!bOceanIsForcedByVisAreaFlags)
-                    {
-                        if (fMinZ > fOceanLevel && vCamPos.z < fMinZ)
-                        {
-                            bOceanIsVisibleFromIndoor = false;
-                        }
-
-                        if (fMaxZ < fOceanLevel && vCamPos.z > fMaxZ)
-                        {
-                            bOceanIsVisibleFromIndoor = false;
-                        }
-                    }
-                }
-            }
-
-            if (bOceanIsVisibleFromIndoor)
-            {
-                m_pOcean->Update(passInfo);
-
-                if ((GetOceanRenderFlags() & OCR_OCEANVOLUME_VISIBLE))
-                {
-                    if (passInfo.RenderWaterOcean())
-                    {
-                        m_pOcean->Render(passInfo);
-                        m_pOcean->SetLastFov(passInfo.GetCamera().GetFov());
-                    }
-                }
-            }
-        }
-    }
-
-    if (GetCVars()->e_WaterRipplesDebug > 0)
-    {
-        GetRenderer()->EF_DrawWaterSimHits();
-    }
-}
-
-void C3DEngine::RenderSkyBox(_smart_ptr<IMaterial> pMat, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    if (!Get3DEngine()->GetCoverageBuffer()->IsOutdooVisible())
-    {
-        return;
-    }
-
-    const float fForceDrawLastSortOffset = 100000.0f;
-
-    // hdr sky dome
-    // TODO: temporary workaround to force the right sky dome for the selected shader
-    if (m_pREHDRSky && IsHDRSkyMaterial(pMat))
-    {
-        if (GetCVars()->e_SkyBox)
-        {
-#ifndef CONSOLE_CONST_CVAR_MODE
-            if (GetCVars()->e_SkyQuality < 1)
-            {
-                GetCVars()->e_SkyQuality = 1;
-            }
-            else if (GetCVars()->e_SkyQuality > 2)
-            {
-                GetCVars()->e_SkyQuality = 2;
-            }
-#endif
-            m_pSkyLightManager->SetQuality(GetCVars()->e_SkyQuality);
-
-            // set sky light incremental update rate and perform update
-            if (GetCVars()->e_SkyUpdateRate <= 0.0f)
-            {
-                GetCVars()->e_SkyUpdateRate = 0.01f;
-            }
-            m_pSkyLightManager->IncrementalUpdate(GetCVars()->e_SkyUpdateRate, passInfo);
-
-            // prepare render object
-            CRenderObject* pObj = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());
-            if (!pObj)
-            {
-                return;
-            }
-            pObj->m_II.m_Matrix.SetTranslationMat(passInfo.GetCamera().GetPosition());
-            pObj->m_pRenderNode = 0;//m_pREHDRSky;
-            pObj->m_fSort = fForceDrawLastSortOffset; // force sky to draw last
-
-            /*          if( 0 == m_nRenderStackLevel )
-            {
-            // set scissor rect
-            pObj->m_nScissorX1 = GetCamera().m_ScissorInfo.x1;
-            pObj->m_nScissorY1 = GetCamera().m_ScissorInfo.y1;
-            pObj->m_nScissorX2 = GetCamera().m_ScissorInfo.x2;
-            pObj->m_nScissorY2 = GetCamera().m_ScissorInfo.y2;
-            }*/
-
-            m_pREHDRSky->m_pRenderParams = m_pSkyLightManager->GetRenderParams();
-            m_pREHDRSky->m_moonTexId = m_nNightMoonTexId;
-
-            // add sky dome to render list
-            SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-            GetRenderer()->EF_AddEf(m_pREHDRSky, pMat->GetSafeSubMtl(0)->GetShaderItem(), pObj, passInfo, EFSLIST_GENERAL, 1, rendItemSorter);
-        }
-    }
-    // skybox
-    else
-    {
-        if (pMat && m_pRESky && GetCVars()->e_SkyBox)
-        {
-            CRenderObject* pObj = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());
-            if (!pObj)
-            {
-                return;
-            }
-            pObj->m_II.m_Matrix.SetTranslationMat(passInfo.GetCamera().GetPosition());
-            pObj->m_II.m_Matrix = pObj->m_II.m_Matrix * Matrix33::CreateRotationZ(DEG2RAD(m_fSkyBoxAngle));
-            pObj->m_fSort = fForceDrawLastSortOffset; // force sky to draw last
-
-            if (OceanToggle::IsActive())
-            {
-                m_pRESky->m_fTerrainWaterLevel = OceanRequest::GetOceanLevelOrDefault(-100000.0f);
-            }
-            else
-            {
-                const float waterLevel = m_pOcean ? m_pOcean->GetWaterLevel() : 0.0f;
-                m_pRESky->m_fTerrainWaterLevel = max(0.0f, waterLevel);
-            }
-            m_pRESky->m_fSkyBoxStretching = m_fSkyBoxStretching;
-
-            SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-            GetRenderer()->EF_AddEf(m_pRESky, pMat->GetSafeSubMtl(0)->GetShaderItem(), pObj, passInfo, EFSLIST_GENERAL, 1, rendItemSorter);
-        }
-    }
-}
-
-void C3DEngine::DrawTextRightAligned(const float x, const float y, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-
-    SDrawTextInfo ti;
-    ti.flags = eDrawText_FixedSize | eDrawText_Right | eDrawText_2D | eDrawText_Monospace;
-    ti.xscale = ti.yscale = DISPLAY_INFO_SCALE;
-    GetRenderer()->DrawTextQueued(Vec3(x, y, 1.0f), ti, format, args);
-
-    va_end(args);
-}
-
-void C3DEngine::DrawTextAligned(int flags, const float x, const float y, const float scale, const ColorF& color, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-
-    SDrawTextInfo ti;
-    ti.flags = flags;
-    ti.color[0] = color[0];
-    ti.color[1] = color[1];
-    ti.color[2] = color[2];
-    ti.color[3] = color[3];
-    ti.xscale = ti.yscale = scale;
-    GetRenderer()->DrawTextQueued(Vec3(x, y, 1.0f), ti, format, args);
-
-    va_end(args);
-}
-
-void C3DEngine::DrawTextLeftAligned(const float x, const float y, const float scale, const ColorF& color, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-
-    SDrawTextInfo ti;
-    ti.flags = eDrawText_FixedSize | eDrawText_2D | eDrawText_Monospace;
-    ti.color[0] = color[0];
-    ti.color[1] = color[1];
-    ti.color[2] = color[2];
-    ti.color[3] = color[3];
-    ti.xscale = ti.yscale = scale;
-    GetRenderer()->DrawTextQueued(Vec3(x, y, 1.0f), ti, format, args);
-
-    va_end(args);
-}
-
-void C3DEngine::DrawTextRightAligned(const float x, const float y, const float scale, const ColorF& color, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-
-    SDrawTextInfo ti;
-    ti.flags = eDrawText_FixedSize | eDrawText_Right | eDrawText_2D | eDrawText_Monospace;
-    ti.color[0] = color[0];
-    ti.color[1] = color[1];
-    ti.color[2] = color[2];
-    ti.color[3] = color[3];
-    ti.xscale = ti.yscale = scale;
-    GetRenderer()->DrawTextQueued(Vec3(x, y, 1.0f), ti, format, args);
-
-    va_end(args);
-}
-
-int __cdecl C3DEngine__Cmp_FPS(const void* v1, const void* v2)
-{
-    float f1 = *(float*)v1;
-    float f2 = *(float*)v2;
-
-    if (f1 > f2)
-    {
-        return 1;
-    }
-    else if (f1 < f2)
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-inline void Blend(float& Stat, float StatCur, float fBlendCur)
-{
-    Stat = Stat * (1.f - fBlendCur) + StatCur * fBlendCur;
-}
-
-inline void Blend(float& Stat, int& StatCur, float fBlendCur)
-{
-    Blend(Stat, float(StatCur), fBlendCur);
-    StatCur = int_round(Stat);
-}
-
-#ifdef ENABLE_LW_PROFILERS
-static void AppendString(char*& szEnd, const char* szToAppend)
-{
-    assert(szToAppend);
-
-    while (*szToAppend)
-    {
-        *szEnd++ = *szToAppend++;
-    }
-
-    *szEnd++ = ' ';
-    *szEnd = 0;
-}
-#endif
-
-void C3DEngine::DisplayInfo([[maybe_unused]] float& fTextPosX, [[maybe_unused]] float& fTextPosY, [[maybe_unused]] float& fTextStepY, [[maybe_unused]] const bool bEnhanced)
-{
-#ifdef ENABLE_LW_PROFILERS
-    //  FUNCTION_PROFILER_3DENGINE; causes 0 fps in stats
-    static ICVar* pDisplayInfo = GetConsole()->GetCVar("r_DisplayInfo");
-    assert(pDisplayInfo);
-    if (pDisplayInfo && pDisplayInfo->GetIVal() == 0)
-    {
-        return;
-    }
-
-    if (gEnv->IsDedicated())
-    {
-        return;
-    }
-
-#if defined(INFO_FRAME_COUNTER)
-    static int frameCounter = 0;
-#endif
-    GetRenderer()->SetState(GS_NODEPTHTEST);
-
-    fTextPosY = -10;
-    fTextStepY = 13;
-    fTextPosX = (float)GetRenderer()->GetOverlayWidth() - 5.0f;
-
-    const char* description = GetRenderer()->GetRenderDescription();
-    if (description && description[0] != 0)
-    {
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 1.5f, ColorF(1.0f, 1.0f, 0.5f, 1.0f),
-            "%s", description);
-    }
-
-    // If stat averaging is on, compute blend amount for current stats.
-    float fFPS = GetTimer()->GetFrameRate();
-
-    // Limit the FPS history for a single level to ~1 hour.
-    // This vector is cleared on each level load, but during a soak test this continues to grow every frame
-    const AZStd::size_t maxFPSEntries = 60 * 60 * 60; // 60ms * 60s * 60min
-    if (arrFPSforSaveLevelStats.size() < maxFPSEntries)
-    {
-        arrFPSforSaveLevelStats.push_back(SATURATEB((int)fFPS));
-    }
-
-    float fBlendTime = GetTimer()->GetCurrTime();
-    int iBlendMode = 0;
-    float fBlendCur = GetTimer()->GetProfileFrameBlending(&fBlendTime, &iBlendMode);
-
-    if (pDisplayInfo && pDisplayInfo->GetIVal() == 3)
-    {
-        static float fCurrentFPS, fCurrentFrameTime;
-        Blend(fCurrentFPS, fFPS, fBlendCur);
-        Blend(fCurrentFrameTime, GetTimer()->GetRealFrameTime() * 1000.0f, fBlendCur);
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 1.5f, ColorF(1.0f, 1.0f, 0.5f, 1.0f),
-            "FPS %.1f - %.1fms", fCurrentFPS, fCurrentFrameTime);
-        return;
-    }
-
-    // make level name
-    char szLevelName[128];
-
-    *szLevelName = 0;
-    {
-        int ii;
-        for (ii = strlen(m_szLevelFolder) - 2; ii > 0; ii--)
-        {
-            if (m_szLevelFolder[ii] == '\\' || m_szLevelFolder[ii] == '/')
-            {
-                break;
-            }
-        }
-
-        if (ii >= 0)
-        {
-            cry_strcpy(szLevelName, &m_szLevelFolder[ii + 1]);
-
-            for (int i = strlen(szLevelName) - 1; i > 0; i--)
-            {
-                if (szLevelName[i] == '\\' || szLevelName[i] == '/')
-                {
-                    szLevelName[i] = 0;
-                }
-            }
-        }
-    }
-
-    Matrix33 m = Matrix33(GetRenderingCamera().GetMatrix());
-    //m.OrthonormalizeFast();       // why is that needed? is it?
-    Ang3 aAng = RAD2DEG(Ang3::GetAnglesXYZ(m));
-    Vec3 vPos = GetRenderingCamera().GetPosition();
-
-    // Time of day info
-    int hours = 0;
-    int minutes = 0;
-    ITimeOfDay* timeOfDay = GetTimeOfDay();
-    if (timeOfDay)
-    {
-        float time = timeOfDay->GetTime();
-        hours = (int)time;
-        minutes = (int)((time - hours) * 60);
-    }
-
-    // display out of memory message if an allocation failed
-    IF (gEnv->bIsOutOfMemory, 0)
-    {
-        ColorF fColor(1.0f, 0.0f, 0.0f, 1.0f);
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 4.0f, fColor, "**** Out of Memory ****");
-        fTextPosY += 40.0f;
-    }
-    // display out of memory message if an allocation failed
-    IF (gEnv->bIsOutOfVideoMemory, 0)
-    {
-        ColorF fColor(1.0f, 0.0f, 0.0f, 1.0f);
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 4.0f, fColor, "**** Out of Video Memory ****");
-        fTextPosY += 40.0f;
-    }
-
-    float fogCullDist = 0.0f;
-    Vec2 vViewportScale = Vec2(0.0f, 0.0f);
-    m_pRenderer->EF_Query(EFQ_GetFogCullDistance, fogCullDist);
-    m_pRenderer->EF_Query(EFQ_GetViewportDownscaleFactor, vViewportScale);
-
-    DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "CamPos=%.2f %.2f %.2f Angl=%3d %2d %3d ZN=%.2f ZF=%d",
-        vPos.x, vPos.y, vPos.z, (int)aAng.x, (int)aAng.y, (int)aAng.z,
-        GetRenderingCamera().GetNearPlane(), (int)GetRenderingCamera().GetFarPlane());
-
-    DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "Cam FC=%.2f VS=%.2f,%.2f Zoom=%.2f Speed=%1.2f TimeOfDay=%02d:%02d",
-        fogCullDist, vViewportScale.x, vViewportScale.y,
-        GetZoomFactor(), GetAverageCameraSpeed(), hours, minutes);
-
-    // get version
-    const SFileVersion& ver = GetSystem()->GetFileVersion();
-    //char sVersion[128];
-    //ver.ToString(sVersion);
-
-    // Get memory usage.
-    static IMemoryManager::SProcessMemInfo processMemInfo;
-    {
-        static int nGetMemInfoCount = 0;
-        if ((nGetMemInfoCount & 0x1F) == 0 && GetISystem()->GetIMemoryManager())
-        {
-            // Only get mem stats every 32 frames.
-            GetISystem()->GetIMemoryManager()->GetProcessMemInfo(processMemInfo);
-        }
-        nGetMemInfoCount++;
-    }
-
-    bool bMultiGPU;
-    m_pRenderer->EF_Query(EFQ_MultiGPUEnabled, bMultiGPU);
-
-    const char* pRenderType(0);
-
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        pRenderType = "DX11";
-    }
-    else
-    {
-        switch (gEnv->pRenderer->GetRenderType())
-        {
-        case eRT_OpenGL:
-            pRenderType = "GL";
-            break;
-        case eRT_DX11:
-            pRenderType = "DX11";
-            break;
-        case eRT_DX12:
-            pRenderType = "DX12";
-            break;
-        case eRT_Jasper: 
-            pRenderType = "Jasper";
-            break;
-        case eRT_Provo:
-            pRenderType = "Provo";
-            break;
-        case eRT_Metal:
-            pRenderType = "Metal";
-            break;
-        case eRT_Null:
-            pRenderType = "Null";
-            break;
-        case eRT_Undefined:
-        default:
-            assert(0);
-            pRenderType = "Undefined";
-            break;
-        }
-    }
-    assert(gEnv->pSystem);
-    bool bTextureStreamingEnabled = false;
-    m_pRenderer->EF_Query(EFQ_TextureStreamingEnabled, bTextureStreamingEnabled);
-    const bool bCGFStreaming = GetCVars()->e_StreamCgf && m_pObjManager;
-    const bool bTexStreaming = gEnv->pSystem->GetStreamEngine() && bTextureStreamingEnabled;
-    char szFlags[128], * szFlagsEnd = szFlags;
-
-#ifndef _RELEASE
-    ESystemConfigSpec spec = GetISystem()->GetConfigSpec();
-    switch (spec)
-    {
-    case CONFIG_AUTO_SPEC:
-        AppendString(szFlagsEnd, "Auto");
-        break;
-    case CONFIG_LOW_SPEC:
-        AppendString(szFlagsEnd, "LowSpec");
-        break;
-    case CONFIG_MEDIUM_SPEC:
-        AppendString(szFlagsEnd, "MedSpec");
-        break;
-    case CONFIG_HIGH_SPEC:
-        AppendString(szFlagsEnd, "HighSpec");
-        break;
-    case CONFIG_VERYHIGH_SPEC:
-        AppendString(szFlagsEnd, "VeryHighSpec");
-        break;
-    default:
-        assert(0);
-    }
-#endif
-#ifndef CONSOLE_CONST_CVAR_MODE
-    static ICVar* pMultiThreaded = GetConsole()->GetCVar("r_MultiThreaded");
-    if (pMultiThreaded && pMultiThreaded->GetIVal() > 0)
-#endif
-    AppendString(szFlagsEnd, "MT");
-
-    char* sAAMode = NULL;
-    m_pRenderer->EF_Query(EFQ_AAMode, sAAMode);
-    AppendString(szFlagsEnd, sAAMode);
-
-    if (IsAreaActivationInUse())
-    {
-        AppendString(szFlagsEnd, "LA");
-    }
-
-    if (bMultiGPU)
-    {
-        AppendString(szFlagsEnd, "MGPU");
-    }
-
-    if (gEnv->pSystem->IsDevMode())
-    {
-        AppendString(szFlagsEnd, gEnv->IsEditor() ? "DevMode (Editor)" : "DevMode");
-    }
-
-    if (bCGFStreaming || bTexStreaming)
-    {
-        if (bCGFStreaming && !bTexStreaming)
-        {
-            AppendString(szFlagsEnd, "StG");
-        }
-        if (bTexStreaming && !bCGFStreaming)
-        {
-            AppendString(szFlagsEnd, "StT");
-        }
-        if (bTexStreaming && bCGFStreaming)
-        {
-            AppendString(szFlagsEnd, "StGT");
-        }
-    }
-
-    // remove last space
-    if (szFlags != szFlagsEnd)
-    {
-        *(szFlagsEnd - 1) = 0;
-    }
-#ifdef _RELEASE
-    const char* mode = "Release";
-#else
-    const char* mode = "Profile";
-#endif
-
-    DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "%s %s %dbit %s %s [%d.%d]",
-        pRenderType, mode, (int)sizeof(char*) * 8, szFlags, szLevelName, ver.v[1], ver.v[0]);
-
-    // Polys in scene
-    int nPolygons, nShadowPolygons;
-    GetRenderer()->GetPolyCount(nPolygons, nShadowPolygons);
-    int nDrawCalls,  nShadowGenDrawCalls;
-    GetRenderer()->GetCurrentNumberOfDrawCalls(nDrawCalls,  nShadowGenDrawCalls);
-
-    int nGeomInstances = GetRenderer()->GetNumGeomInstances();
-    int nGeomInstanceDrawCalls = GetRenderer()->GetNumGeomInstanceDrawCalls();
-
-    if (fBlendCur != 1.f)
-    {
-        // Smooth over time.
-        static float fPolygons, fShadowVolPolys, fDrawCalls, fShadowGenDrawCalls, fGeomInstances, fGeomInstanceDrawCalls;
-        Blend(fPolygons, nPolygons, fBlendCur);
-        Blend(fShadowVolPolys, nShadowPolygons, fBlendCur);
-        Blend(fDrawCalls, nDrawCalls, fBlendCur);
-        Blend(fShadowGenDrawCalls, nShadowGenDrawCalls, fBlendCur);
-        Blend(fGeomInstances, nGeomInstances, fBlendCur);
-        Blend(fGeomInstanceDrawCalls, nGeomInstanceDrawCalls, fBlendCur);
-    }
-
-    //
-    static float m_lastAverageDPTime = -FLT_MAX;
-    float curTime = gEnv->pTimer->GetAsyncCurTime();
-    static int lastDrawCalls = 0;
-    static int lastShadowGenDrawCalls = 0;
-    static int avgPolys = 0;
-    static int avgShadowPolys = 0;
-    static int sumPolys = 0;
-    static int sumShadowPolys = 0;
-    static int nPolysFrames = 0;
-    if (curTime < m_lastAverageDPTime)
-    {
-        m_lastAverageDPTime = curTime;
-    }
-    if (curTime - m_lastAverageDPTime > 1.0f)
-    {
-        lastDrawCalls = nDrawCalls;
-        lastShadowGenDrawCalls = nShadowGenDrawCalls;
-        m_lastAverageDPTime = curTime;
-        avgPolys = nPolysFrames ? sumPolys / nPolysFrames : 0;
-        avgShadowPolys = nPolysFrames ? sumShadowPolys / nPolysFrames : 0;
-        sumPolys = nPolygons;
-        sumShadowPolys = nShadowPolygons;
-        nPolysFrames = 1;
-    }
-    else
-    {
-        nPolysFrames++;
-        sumPolys += nPolygons;
-        sumShadowPolys += nShadowPolygons;
-    }
-    //
-
-    int     nMaxDrawCalls = GetCVars()->e_MaxDrawCalls <= 0 ? 2000 : GetCVars()->e_MaxDrawCalls;
-    bool    bInRed = (nDrawCalls + nShadowGenDrawCalls) > nMaxDrawCalls;
-
-    DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, bInRed ? Col_Red : Col_White, "DP: %04d (%04d) ShadowGen:%04d (%04d) - Total: %04d Instanced: %04d",
-        nDrawCalls, lastDrawCalls, nShadowGenDrawCalls, lastShadowGenDrawCalls, nDrawCalls + nShadowGenDrawCalls, nDrawCalls + nShadowGenDrawCalls - nGeomInstances + nGeomInstanceDrawCalls);
-#if defined(MOBILE)
-    bInRed = nPolygons > 500000;
-#else
-    bInRed = nPolygons > 1500000;
-#endif
-
-    DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, bInRed ? Col_Red : Col_White, "Polys: %03d,%03d (%03d,%03d) Shadow:%03d,%03d (%03d,%03d)",
-        nPolygons / 1000, nPolygons % 1000, avgPolys / 1000, avgPolys % 1000,
-        nShadowPolygons / 1000, nShadowPolygons % 1000, avgShadowPolys / 1000, avgShadowPolys % 1000);
-
-    {
-        SShaderCacheStatistics stats;
-        m_pRenderer->EF_Query(EFQ_GetShaderCacheInfo, stats);
-        {
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_White, "ShaderCache: %d GCM | %d Async Reqs | Compile: %s",
-                (int)stats.m_nGlobalShaderCacheMisses, (int)stats.m_nNumShaderAsyncCompiles, stats.m_bShaderCompileActive ? "On" : "Off");
-        }
-    }
-
-    // print stats about CGF's streaming
-    if (bCGFStreaming)
-    {
-        static char szCGFStreaming[256] = "";
-        static SObjectsStreamingStatus objectsStreamingStatus = {0};
-
-        if (!(GetRenderer()->GetFrameID(false) & 15) || !szCGFStreaming[0] || GetCVars()->e_StreamCgfDebug)
-        {
-            m_pObjManager->GetObjectsStreamingStatus(objectsStreamingStatus);
-            sprintf_s(szCGFStreaming, 256, "CgfStrm: Loaded:%d InProg:%d All:%d Act:%d PcP:%d MemUsed:%2.2f MemReq:%2.2f Pool:%d",
-                objectsStreamingStatus.nReady, objectsStreamingStatus.nInProgress, objectsStreamingStatus.nTotal, objectsStreamingStatus.nActive,
-                (int)m_pObjManager->GetStreamPreCachePointDefs().size(),
-                float(objectsStreamingStatus.nAllocatedBytes) / 1024 / 1024, float(objectsStreamingStatus.nMemRequired) / 1024 / 1024, GetCVars()->e_StreamCgfPoolSize);
-        }
-
-        bool bOutOfMem((float(objectsStreamingStatus.nMemRequired) / 1024 / 1024) > GetCVars()->e_StreamCgfPoolSize);
-        bool bCloseToOutOfMem((float(objectsStreamingStatus.nMemRequired) / 1024 / 1024) > GetCVars()->e_StreamCgfPoolSize * 90 / 100);
-
-        ColorF color = Col_White;
-        if (bOutOfMem)
-        {
-            color = Col_Red;
-        }
-        else if (bCloseToOutOfMem)
-        {
-            color = Col_Orange;
-        }
-        //      if(bTooManyRequests)
-        //      color = Col_Magenta;
-
-        if ((pDisplayInfo->GetIVal() == 2 || GetCVars()->e_StreamCgfDebug) || bOutOfMem || bCloseToOutOfMem)
-        {
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, color, szCGFStreaming);
-        }
-    }
-
-    // print stats about textures' streaming
-    if (bTexStreaming)
-    {
-        static char szTexStreaming[256] = "";
-        static bool bCloseToOutOfMem = false;
-        static bool bOutOfMem = false;
-        static bool bTooManyRequests = false;
-        static bool bOverloadedPool = false;
-        static uint32 nTexCount = 0;
-        static uint32 nTexSize = 0;
-
-        float fTexBandwidthRequired = 0.f;
-        m_pRenderer->GetBandwidthStats(&fTexBandwidthRequired);
-
-        if (!(GetRenderer()->GetFrameID(false) % 30) || !szTexStreaming[0])
-        {
-            STextureStreamingStats stats(!(GetRenderer()->GetFrameID(false) % 120));
-            m_pRenderer->EF_Query(EFQ_GetTexStreamingInfo, stats);
-
-            if (!(GetRenderer()->GetFrameID(false) % 120))
-            {
-                bOverloadedPool = stats.bPoolOverflowTotally;
-                nTexCount = stats.nRequiredStreamedTexturesCount;
-                nTexSize = stats.nRequiredStreamedTexturesSize;
-            }
-
-            int nPlatformSize = nTexSize;
-
-            const int iPercentage = int((float)stats.nCurrentPoolSize / stats.nMaxPoolSize * 100.f);
-            const int iStaticPercentage = int((float)stats.nStaticTexturesSize / stats.nMaxPoolSize * 100.f);
-            sprintf_s(szTexStreaming, "TexStrm: TexRend: %u NumTex: %u Req:%.1fMB Mem(strm/stat/tot):%.1f/%.1f/%.1fMB(%d%%/%d%%) PoolSize:%" PRISIZE_T "MB PoolFrag:%.1f%%",
-                stats.nNumTexturesPerFrame, nTexCount, (float)nPlatformSize / 1024 / 1024,
-                (float)stats.nStreamedTexturesSize / 1024 / 1024, (float)stats.nStaticTexturesSize / 1024 / 1024, (float)stats.nCurrentPoolSize / 1024 / 1024,
-                iPercentage, iStaticPercentage, stats.nMaxPoolSize / 1024 / 1024,
-                stats.fPoolFragmentation * 100.0f
-                );
-            bOverloadedPool |= stats.bPoolOverflowTotally;
-
-            bCloseToOutOfMem = iPercentage >= 90;
-            bOutOfMem = stats.bPoolOverflow;
-        }
-
-        if (pDisplayInfo->GetIVal() == 2 || bCloseToOutOfMem || bTooManyRequests || bOverloadedPool)
-        {
-            ColorF color = Col_White;
-            if (bOutOfMem)
-            {
-                color = Col_Red;
-            }
-            else if (bCloseToOutOfMem)
-            {
-                color = Col_Orange;
-            }
-            if (bTooManyRequests)
-            {
-                color = Col_Magenta;
-            }
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, color, "%s", szTexStreaming);
-        }
-
-        if (pDisplayInfo->GetIVal() > 0 && bOverloadedPool)
-        {
-            DrawTextLeftAligned(0, 10, 2.3f, Col_Red, "Texture pool totally overloaded!");
-        }
-    }
-
-
-
-    {
-        static char szMeshPoolUse[256] = "";
-        static unsigned nFlushFrameId = 0U;
-        static unsigned nFallbackFrameId = 0U;
-        static SMeshPoolStatistics lastStats;
-        static SMeshPoolStatistics stats;
-
-        const unsigned nMainFrameId = GetRenderer()->GetFrameID(false);
-        m_pRenderer->EF_Query(EFQ_GetMeshPoolInfo, stats);
-        const int iPercentage = int((float)stats.nPoolInUse / (stats.nPoolSize ? stats.nPoolSize : 1U) * 100.f);
-        const int iVolatilePercentage = int((float)stats.nInstancePoolInUse / (stats.nInstancePoolSize ? stats.nInstancePoolSize : 1U) * 100.f);
-        nFallbackFrameId = lastStats.nFallbacks < stats.nFallbacks ? nMainFrameId : nFallbackFrameId;
-        nFlushFrameId = lastStats.nFlushes < stats.nFlushes ? nMainFrameId : nFlushFrameId;
-        const bool bOverflow = nMainFrameId - nFlushFrameId < 50;
-        const bool bFallback = nMainFrameId - nFallbackFrameId < 50;
-
-        sprintf_s(szMeshPoolUse,
-            "Mesh Pool: MemUsed:%.2fKB(%d%%%%) Peak %.fKB PoolSize:%" PRISIZE_T "KB Flushes %" PRISIZE_T " Fallbacks %.3fKB %s",
-            (float)stats.nPoolInUse / 1024,
-            iPercentage,
-            (float)stats.nPoolInUsePeak / 1024,
-            stats.nPoolSize / 1024,
-            stats.nFlushes,
-            (float)stats.nFallbacks / 1024.0f,
-            (bFallback ? "FULL!" : bOverflow ? "OVERFLOW" : ""));
-
-        if (stats.nPoolSize && (pDisplayInfo->GetIVal() == 2 || bOverflow || bFallback))
-        {
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE,
-                bFallback ? Col_Red : bOverflow ? Col_Orange : Col_White,
-                szMeshPoolUse);
-        }
-        if (stats.nPoolSize && pDisplayInfo->GetIVal() == 2)
-        {
-            char szVolatilePoolsUse[256];
-            sprintf_s(szVolatilePoolsUse,
-                "Mesh Instance Pool: MemUsed:%.2fKB(%d%%%%) Peak %.fKB PoolSize:%" PRISIZE_T "KB Fallbacks %.3fKB",
-                (float)stats.nInstancePoolInUse / 1024,
-                iVolatilePercentage,
-                (float)stats.nInstancePoolInUsePeak / 1024,
-                stats.nInstancePoolSize / 1024,
-                (float)stats.nInstanceFallbacks / 1024.0f);
-
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE,
-                Col_White, szVolatilePoolsUse);
-        }
-
-        memcpy(&lastStats, &stats, sizeof(lastStats));
-    }
-
-    // streaming info
-    {
-        IStreamEngine* pSE = gEnv->pSystem->GetStreamEngine();
-        if (pSE)
-        {
-            SStreamEngineStatistics& stats = pSE->GetStreamingStatistics();
-            SStreamEngineOpenStats openStats;
-            pSE->GetStreamingOpenStatistics(openStats);
-
-            static char szStreaming[128] = "";
-            if (!(GetRenderer()->GetFrameID(false) & 7))
-            {
-                if (pDisplayInfo->GetIVal() == 2)
-                {
-                    sprintf_s(szStreaming, "Streaming IO: ACT: %3dmsec, Jobs:%2d Total:%5d",
-                        (uint32)stats.fAverageCompletionTime, openStats.nOpenRequestCount, stats.nTotalStreamingRequestCount);
-                }
-                else
-                {
-                    sprintf_s(szStreaming, "Streaming IO: ACT: %3dmsec, Jobs:%2d",
-                        (uint32)stats.fAverageCompletionTime, openStats.nOpenRequestCount);
-                }
-            }
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, szStreaming);
-
-            if (stats.bTempMemOutOfBudget)
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 1.3f, Col_Red, "Temporary Streaming Memory Pool Out of Budget!");
-            }
-        }
-
-        if (pDisplayInfo && pDisplayInfo->GetIVal() == 2) // more streaming info
-        {
-            SStreamEngineStatistics& stats = gEnv->pSystem->GetStreamEngine()->GetStreamingStatistics();
-
-            { // HDD stats
-                static char szStreaming[512] = "";
-                sprintf_s(szStreaming, "HDD: BW:%1.2f|%1.2fMb/s (Eff:%2.1f|%2.1fMb/s) - Seek:%1.2fGB - Active:%2.1f%%%%",
-                    (float)stats.hddInfo.nCurrentReadBandwidth / (1024 * 1024), (float)stats.hddInfo.nSessionReadBandwidth / (1024 * 1024),
-                    (float)stats.hddInfo.nActualReadBandwidth / (1024 * 1024), (float)stats.hddInfo.nAverageActualReadBandwidth / (1024 * 1024),
-                    (float)stats.hddInfo.nAverageSeekOffset / (1024 * 1024), stats.hddInfo.fAverageActiveTime);
-
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, szStreaming);
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Display Info about dynamic lights.
-    //////////////////////////////////////////////////////////////////////////
-    {
-        {
-#ifndef _RELEASE
-            // Checkpoint loading information
-            if (!gEnv->bMultiplayer)
-            {
-                ISystem::ICheckpointData data;
-                gEnv->pSystem->GetCheckpointData(data);
-
-                if (data.m_loadOrigin != ISystem::eLLO_Unknown)
-                {
-                    static const char* loadStates[] =
-                    {
-                        "",
-                        "New Level",
-                        "Level to Level",
-                        "Resumed Game",
-                        "Map Command",
-                    };
-
-                    DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 1.3f, Col_White, "%s, Checkpoint loads: %i", loadStates[(int)data.m_loadOrigin], (int)data.m_totalLoads);
-                }
-            }
-#endif
-
-            int nPeakMemMB = (int)(processMemInfo.PeakPagefileUsage >> 20);
-            int nVirtMemMB = (int)(processMemInfo.PagefileUsage >> 20);
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "Mem=%d Peak=%d DLights=(%d)", nVirtMemMB, nPeakMemMB, m_nRealLightsNum + m_nDeferredLightsNum);
-
-            uint32 nShadowFrustums = 0;
-            uint32 nShadowAllocs = 0;
-            uint32 nShadowMaskChannels = 0;
-            m_pRenderer->EF_Query(EFQ_GetShadowPoolFrustumsNum, nShadowFrustums);
-            m_pRenderer->EF_Query(EFQ_GetShadowPoolAllocThisFrameNum, nShadowAllocs);
-            m_pRenderer->EF_Query(EFQ_GetShadowMaskChannelsNum, nShadowMaskChannels);
-            bool bThrash = (nShadowAllocs & 0x80000000) ? true : false;
-            nShadowAllocs &= ~0x80000000;
-            uint32 nAvailableShadowMaskChannels = nShadowMaskChannels >> 16;
-            uint32 nUsedShadowMaskChannels = nShadowMaskChannels & 0xFFFF;
-            bool bTooManyLights = nUsedShadowMaskChannels > nAvailableShadowMaskChannels ? true : false;
-
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, (nShadowFrustums || nShadowAllocs) ? Col_Yellow : Col_White, "%d Shadow Mask Channels, %3d Shadow Frustums, %3d Frustum Renders This Frame",
-                nUsedShadowMaskChannels, nShadowFrustums, nShadowAllocs);
-
-            if (bThrash)
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_Red, "SHADOW POOL THRASHING!!!");
-            }
-
-            if (bTooManyLights)
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_Red, "TOO MANY SHADOW CASTING LIGHTS (%d/%d)!!!", nUsedShadowMaskChannels, nAvailableShadowMaskChannels);
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_Red, "Consider increasing 'r_ShadowCastingLightsMaxCount'");
-            }
-
-#ifndef _RELEASE
-            uint32 numTiledShadingSkippedLights;
-            m_pRenderer->EF_Query(EFQ_GetTiledShadingSkippedLightsNum, numTiledShadingSkippedLights);
-            if (numTiledShadingSkippedLights > 0)
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, Col_Red, "TILED SHADING: SKIPPED %d LIGHTS", numTiledShadingSkippedLights);
-            }
-
-            if (GetCVars()->e_levelStartupFrameNum)
-            {
-                static float startupAvgFPS = 0.f;
-                static float levelStartupTime = 0;
-                static int levelStartupFrameEnd = GetCVars()->e_levelStartupFrameNum + GetCVars()->e_levelStartupFrameDelay;
-                int curFrameID = GetRenderer()->GetFrameID(false);
-
-                if (curFrameID >= GetCVars()->e_levelStartupFrameDelay)
-                {
-                    if (curFrameID == GetCVars()->e_levelStartupFrameDelay)
-                    {
-                        levelStartupTime = gEnv->pTimer->GetAsyncCurTime();
-                    }
-                    if (curFrameID == levelStartupFrameEnd)
-                    {
-                        startupAvgFPS = (float)GetCVars()->e_levelStartupFrameNum / (gEnv->pTimer->GetAsyncCurTime() - levelStartupTime);
-                    }
-                    if (curFrameID >= levelStartupFrameEnd)
-                    {
-                        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 2.f, Col_Red, "Startup AVG FPS: %.2f", startupAvgFPS);
-                        fTextPosY += fTextStepY;
-                    }
-                }
-            }
-#endif //_RELEASE
-        }
-
-        m_nDeferredLightsNum = 0;
-    }
-
-    assert(pDisplayInfo);
-    if (bEnhanced)
-    {
-#define CONVX(x) (((x) / (float)gUpdateTimesNum))
-#define CONVY(y) (1.f - ((y) / 720.f))
-#define TICKS_TO_MS(t)  (1000.f * gEnv->pTimer->TicksToSeconds(t))
-# define MAX_PHYS_TIME 32.f
-# define MAX_PLE_TIME 4.f
-        uint32 gUpdateTimeIdx = 0, gUpdateTimesNum = 0;
-        const sUpdateTimes* gUpdateTimes = gEnv->pSystem->GetUpdateTimeStats(gUpdateTimeIdx, gUpdateTimesNum);
-        if (pDisplayInfo->GetIVal() >= 5)
-        {
-            const SAuxGeomRenderFlags flags = gEnv->pRenderer->GetIRenderAuxGeom()->GetRenderFlags();
-            SAuxGeomRenderFlags newFlags(flags);
-            newFlags.SetAlphaBlendMode(e_AlphaNone);
-            newFlags.SetMode2D3DFlag(e_Mode2D);
-            newFlags.SetCullMode(e_CullModeNone);
-            newFlags.SetDepthWriteFlag(e_DepthWriteOff);
-            newFlags.SetDepthTestFlag(e_DepthTestOff);
-            newFlags.SetFillMode(e_FillModeSolid);
-            gEnv->pRenderer->GetIRenderAuxGeom()->SetRenderFlags(newFlags);
-            const ColorF colorPhysFull = Col_Blue;
-            const ColorF colorSysFull = Col_Green;
-            const ColorF colorRenFull = Col_Red;
-            const ColorF colorPhysHalf = colorPhysFull * 0.15f;
-            const ColorF colorSysHalf = colorSysFull * 0.15f;
-            const ColorF colorRenHalf = colorRenFull * 0.15f;
-            float phys = (TICKS_TO_MS(gUpdateTimes[0].PhysStepTime) / 66.f) * 720.f;
-            float sys = (TICKS_TO_MS(gUpdateTimes[0].SysUpdateTime) / 66.f) * 720.f;
-            float ren = (TICKS_TO_MS(gUpdateTimes[0].RenderTime) / 66.f) * 720.f;
-            float _lerp = ((float)(max((int)gUpdateTimeIdx - (int)0, 0) / (float)gUpdateTimesNum));
-            ColorB colorPhysLast;
-            colorPhysLast.lerpFloat(colorPhysFull, colorPhysHalf, _lerp);
-            ColorB colorSysLast;
-            colorSysLast.lerpFloat(colorSysFull, colorSysHalf, _lerp);
-            ColorB colorRenLast;
-            colorRenLast.lerpFloat(colorRenFull, colorRenHalf, _lerp);
-            Vec3 lastPhys(CONVX(0), CONVY(phys), 1.f);
-            Vec3 lastSys(CONVX(0), CONVY(sys), 1.f);
-            Vec3 lastRen(CONVX(0), CONVY(ren), 1.f);
-            for (uint32 i = 0; i < gUpdateTimesNum; ++i)
-            {
-                const float x = (float)i;
-                _lerp = ((float)(max((int)gUpdateTimeIdx - (int)i, 0) / (float)gUpdateTimesNum));
-                const sUpdateTimes& sample = gUpdateTimes[i];
-                phys = (TICKS_TO_MS(sample.PhysStepTime) / 66.f) * 720.f;
-                sys = (TICKS_TO_MS(sample.SysUpdateTime) / 66.f) * 720.f;
-                ren = (TICKS_TO_MS(sample.RenderTime) / 66.f) * 720.f;
-                Vec3 curPhys(CONVX(x), CONVY(phys), 1.f);
-                Vec3 curSys(CONVX(x), CONVY(sys), 1.f);
-                Vec3 curRen(CONVX(x), CONVY(ren), 1.f);
-                ColorB colorPhys;
-                colorPhys.lerpFloat(colorPhysFull, colorPhysHalf, _lerp);
-                ColorB colorSys;
-                colorSys.lerpFloat(colorSysFull, colorSysHalf, _lerp);
-                ColorB colorRen;
-                colorRen.lerpFloat(colorRenFull, colorRenHalf, _lerp);
-                gEnv->pRenderer->GetIRenderAuxGeom()->DrawLine(lastPhys, colorPhysLast, curPhys, colorPhys);
-                gEnv->pRenderer->GetIRenderAuxGeom()->DrawLine(lastSys, colorSysLast, curSys, colorSys);
-                gEnv->pRenderer->GetIRenderAuxGeom()->DrawLine(lastRen, colorRenLast, curRen, colorRen);
-                lastPhys = curPhys;
-                colorPhysLast = colorPhys;
-                lastSys = curSys;
-                colorSysLast = colorSys;
-                lastRen = curRen;
-                colorRenLast = colorRen;
-            }
-            gEnv->pRenderer->GetIRenderAuxGeom()->SetRenderFlags(flags);
-        }
-        const float curPhysTime = TICKS_TO_MS(gUpdateTimes[gUpdateTimeIdx].PhysStepTime);
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE_SMALL, curPhysTime > MAX_PHYS_TIME ? Col_Red : Col_White, "%3.1f ms      Phys", curPhysTime);
-        const float curPhysWaitTime = TICKS_TO_MS(gUpdateTimes[gUpdateTimeIdx].physWaitTime);
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE_SMALL, curPhysTime > MAX_PHYS_TIME ? Col_Red : Col_White, "%3.1f ms   WaitPhys", curPhysWaitTime);
-
-        float partTicks = 0;
-
-        //3dengine stats from RenderWorld
-        {
-#if defined(MOBILE)
-            const float maxVal = 12.f;
-#else
-            const float maxVal = 50.f;
-#endif
-            float fTimeMS = TICKS_TO_MS(m_nRenderWorldUSecs) - partTicks;
-            DrawTextRightAligned(fTextPosX, fTextPosY += (fTextStepY - STEP_SMALL_DIFF), DISPLAY_INFO_SCALE_SMALL, fTimeMS > maxVal ? Col_Red : Col_White, "%.2f ms RendWorld", fTimeMS);
-        }
-
-        {
-            SStreamEngineStatistics stat =  gEnv->pSystem->GetStreamEngine()->GetStreamingStatistics();
-
-            float fTimeMS = 1000.0f * gEnv->pTimer->TicksToSeconds(stat.nMainStreamingThreadWait);
-            DrawTextRightAligned(fTextPosX, fTextPosY += (fTextStepY - STEP_SMALL_DIFF),
-                DISPLAY_INFO_SCALE_SMALL, Col_White, "%3.1f ms     StreamFin", fTimeMS);
-        }
-    }
-
-#undef MAX_PHYS_TIME
-#undef TICKS_TO_MS
-#undef CONVY
-#undef CONVX
-
-    //////////////////////////////////////////////////////////////////////////
-    // Display Thermal information of the device (if supported)
-    //////////////////////////////////////////////////////////////////////////
-
-    if (ThermalInfoRequestsBus::GetTotalNumOfEventHandlers())
-    {
-        const int thermalSensorCount = static_cast<int>(ThermalSensorType::Count);
-        const char* sensorStrings[thermalSensorCount] = { "CPU", "GPU", "Battery" };
-        for (int i = 0; i < thermalSensorCount; ++i)
-        {
-            float temperature = 0.f;
-            ThermalSensorType sensor = static_cast<ThermalSensorType>(i);
-            EBUS_EVENT_RESULT(temperature, ThermalInfoRequestsBus, GetSensorTemp, sensor);
-            AZStd::string tempText;
-            ColorF tempColor;
-            if (temperature > 0.f)
-            {
-                float overheatingTemp = 0.f;
-                EBUS_EVENT_RESULT(overheatingTemp, ThermalInfoRequestsBus, GetSensorOverheatingTemp, sensor);
-                tempText = AZStd::string::format(" %.1f C", temperature);
-                tempColor = temperature >= overheatingTemp ? Col_Red : Col_White;
-            }
-            else
-            {
-                tempText = "N/A";
-                tempColor = Col_White;
-            }
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE, tempColor, "%s Temp %s", sensorStrings[i], tempText.c_str());
-        }       
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Display Current fps
-    //////////////////////////////////////////////////////////////////////////
-
-    if (iBlendMode)
-    {
-        // Track FPS frequency, report min/max.
-        Blend(m_fAverageFPS, fFPS, fBlendCur);
-
-        Blend(m_fMinFPSDecay, fFPS, fBlendCur);
-        if (fFPS <= m_fMinFPSDecay)
-        {
-            m_fMinFPS = m_fMinFPSDecay = fFPS;
-        }
-
-        Blend(m_fMaxFPSDecay, fFPS, fBlendCur);
-        if (fFPS >= m_fMaxFPSDecay)
-        {
-            m_fMaxFPS = m_fMaxFPSDecay = fFPS;
-        }
-
-        const char* sMode = "";
-        switch (iBlendMode)
-        {
-        case 1:
-            sMode = "frame avg";
-            break;
-        case 2:
-            sMode = "time avg";
-            break;
-        case 3:
-            sMode = "peak hold";
-            break;
-        }
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 1.5f, ColorF(1.0f, 1.0f, 0.5f, 1.0f),
-            "FPS %.1f [%.0f..%.0f], %s over %.1f s",
-            m_fAverageFPS, m_fMinFPS, m_fMaxFPS, sMode, fBlendTime);
-    }
-    else
-    {
-        const int nHistorySize = 16;
-        static float arrfFrameRateHistory[nHistorySize] = {0};
-
-        static int nFrameId = 0;
-        nFrameId++;
-        int nSlotId = nFrameId % nHistorySize;
-        assert(nSlotId >= 0 && nSlotId < nHistorySize);
-        arrfFrameRateHistory[nSlotId] = min(9999.f, GetTimer()->GetFrameRate());
-
-        float fMinFPS = 9999.0f;
-        float fMaxFPS = 0;
-        for (int i = 0; i < nHistorySize; i++)
-        {
-            if (arrfFrameRateHistory[i] < fMinFPS)
-            {
-                fMinFPS = arrfFrameRateHistory[i];
-            }
-            if (arrfFrameRateHistory[i] > fMaxFPS)
-            {
-                fMaxFPS = arrfFrameRateHistory[i];
-            }
-        }
-
-        float fFrameRate = 0;
-        float fValidFrames = 0;
-        for (int i = 0; i < nHistorySize; i++)
-        {
-            int s = (nFrameId - i) % nHistorySize;
-            fFrameRate += arrfFrameRateHistory[s];
-            fValidFrames++;
-        }
-        fFrameRate /= fValidFrames;
-
-        m_fAverageFPS = fFrameRate;
-        m_fMinFPS = m_fMinFPSDecay = fMinFPS;
-        m_fMaxFPS = m_fMaxFPSDecay = fMaxFPS;
-
-
-        //only difference to r_DisplayInfo 1, need ms for GPU time
-        float fMax = (int(GetCurTimeSec() * 2) & 1) ? 999.f : 888.f;
-        if (bEnhanced)
-        {
-            /*          DrawTextRightAligned( fTextPosX, fTextPosY+=fTextStepY, "%6.2f ~%6.2f ms (%6.2f..%6.2f) CPU",
-            GetTimer()->GetFrameTime()*1000.0f, 1000.0f/max(0.0001f,fFrameRate),
-            1000.0f/max(0.0001f,fMinFPS),
-            1000.0f/max(0.0001f,fMaxFPS));
-            */
-            const RPProfilerStats* pFrameRPPStats = GetRenderer()->GetRPPStats(eRPPSTATS_OverallFrame);
-            float gpuTime = pFrameRPPStats ? pFrameRPPStats->gpuTime : 0.0f;
-            static float sGPUTime = 0.f;
-            if (gpuTime < 1000.f && gpuTime > 0.01f)
-            {
-                sGPUTime = gpuTime;                              //catch sporadic jumps
-            }
-            if (sGPUTime > 0.01f)
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, DISPLAY_INFO_SCALE_SMALL, (gpuTime >= 40.f) ? Col_Red : Col_White, "%3.1f ms       GPU", sGPUTime);
-            }
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 1.4f, ColorF(1.0f, 1.0f, 0.2f, 1.0f), "FPS %5.1f (%3d..%3d)(%3.1f ms)",
-                min(fMax, fFrameRate), (int)min(fMax, fMinFPS), (int)min(fMax, fMaxFPS), GetTimer()->GetFrameTime() * 1000.0f);
-        }
-        else
-        {
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, 1.4f, ColorF(1.0f, 1.0f, 0.2f, 1.0f), "FPS %5.1f (%3d..%3d)",
-                min(fMax, fFrameRate), (int)min(fMax, fMinFPS), (int)min(fMax, fMaxFPS));
-        }
-    }
-
-#ifndef _RELEASE
-    if (GetCVars()->e_GsmStats)
-    {
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "--------------- GSM Stats ---------------");
-
-        if (m_pSun && m_pSun->m_pShadowMapInfo)
-        {
-            CLightEntity::ShadowMapInfo* pSMI = m_pSun->m_pShadowMapInfo;
-            int arrGSMCastersCount[MAX_GSM_LODS_NUM];
-            memset(arrGSMCastersCount, 0, sizeof(arrGSMCastersCount));
-            char szText[256] = "Objects count per shadow map: ";
-            for (int nLod = 0; nLod < Get3DEngine()->GetShadowsCascadeCount(NULL) && nLod < MAX_GSM_LODS_NUM; nLod++)
-            {
-                ShadowMapFrustum*& pLsource = pSMI->pGSM[nLod];
-                if (nLod)
-                {
-                    azstrcat(szText, AZ_ARRAY_SIZE(szText), ", ");
-                }
-
-                char* pstr = szText + strlen(szText);
-                sprintf_s(pstr, sizeof(szText) - (pstr - szText), "%d", pLsource->m_castersList.Count());
-            }
-
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, szText);
-        }
-
-        for (int nSunInUse = 0; nSunInUse < 2; nSunInUse++)
-        {
-            if (nSunInUse)
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "WithSun  ListId   FrNum UserNum");
-            }
-            else
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "NoSun    ListId   FrNum UserNum");
-            }
-
-            // TODO: For Nick, check if needed anymore
-            //for(ShadowFrustumListsCache::iterator it = m_FrustumsCache[nSunInUse].begin(); it != m_FrustumsCache[nSunInUse].end(); ++it)
-            //{
-            //  int nListId = (int)it->first;
-            //  PodArray<ShadowMapFrustum*> * pList = it->second;
-
-            //  DrawTextRightAligned( fTextPosX, fTextPosY+=fTextStepY,
-            //    "%8d %8d %8d",
-            //    nListId,
-            //    pList->Count(), m_FrustumsCacheUsers[nSunInUse][nListId]);
-            //}
-        }
-    }
-
-    // objects counter
-    if (GetCVars()->e_ObjStats)
-    {
-#define DRAW_OBJ_STATS(_var) DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "%s: %d", (#_var), GetInstCount(_var))
-
-        DRAW_OBJ_STATS(eERType_NotRenderNode);
-        DRAW_OBJ_STATS(eERType_Light);
-        DRAW_OBJ_STATS(eERType_Cloud);
-        DRAW_OBJ_STATS(eERType_FogVolume);
-        DRAW_OBJ_STATS(eERType_Decal);
-        DRAW_OBJ_STATS(eERType_WaterVolume);
-        DRAW_OBJ_STATS(eERType_DistanceCloud);
-        DRAW_OBJ_STATS(eERType_VolumeObject);
-        DRAW_OBJ_STATS(eERType_Rope);
-        DRAW_OBJ_STATS(eERType_PrismObject);
-        DRAW_OBJ_STATS(eERType_RenderComponent);
-        DRAW_OBJ_STATS(eERType_StaticMeshRenderComponent);
-        DRAW_OBJ_STATS(eERType_DynamicMeshRenderComponent);
-        DRAW_OBJ_STATS(eERType_SkinnedMeshRenderComponent);
-        DRAW_OBJ_STATS(eERType_GameEffect);
-        DRAW_OBJ_STATS(eERType_BreakableGlass);
-
-        if (IsObjectTreeReady())
-        {
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "--- By list type: ---");
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "  Main:      %d", m_pObjectsTree->GetObjectsCount(eMain));
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "Caster:      %d", m_pObjectsTree->GetObjectsCount(eCasters));
-            DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "LigAll:      %d", m_lstStaticLights.Count());
-        }
-
-        int nFree = m_LTPRootFree.Count();
-        int nUsed = m_LTPRootUsed.Count();
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "RNTmpData(Used+Free): %d + %d = %d (%d KB)",
-            nUsed, nFree, nUsed + nFree, (nUsed + nFree) * (int)sizeof(CRNTmpData) / 1024);
-
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "COctreeNode::m_arrEmptyNodes.Count() = %d", COctreeNode::m_arrEmptyNodes.Count());
-    }
-
-    CCullBuffer* pCB = GetCoverageBuffer();
-    if (pCB && GetCVars()->e_CoverageBuffer && GetCVars()->e_CoverageBufferDebug && pCB->TrisWritten())
-    {
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY,
-            "CB: Write:%3d/%2d Test:%4d/%4d/%3d ZFarM:%.2f ZNearM:%.2f Res:%d OI:%s",
-            pCB->TrisWritten(), pCB->ObjectsWritten(),
-            pCB->TrisTested(), pCB->ObjectsTested(), pCB->ObjectsTestedAndRejected(),
-            pCB->GetZFarInMeters(), pCB->GetZNearInMeters(), pCB->SelRes(),
-            pCB->IsOutdooVisible() ? "Out" : "In");
-    }
-
-#if defined(INFO_FRAME_COUNTER)
-    ++frameCounter;
-    DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "Frame #%d", frameCounter);
-#endif
-
-    ITimeOfDay* pTimeOfDay = Get3DEngine()->GetTimeOfDay();
-    if (GetCVars()->e_TimeOfDayDebug && pTimeOfDay)
-    {
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "---------------------------------------");
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "------------ Time of Day  -------------");
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, " ");
-
-        int nVarCount = pTimeOfDay->GetVariableCount();
-        for (int v = 0; v < nVarCount; ++v)
-        {
-            ITimeOfDay::SVariableInfo pVar;
-            pTimeOfDay->GetVariableInfo(v, pVar);
-
-            if (pVar.type == ITimeOfDay::TYPE_FLOAT)
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, " %s: %.9f", pVar.displayName, pVar.fValue[0]);
-            }
-            else
-            {
-                DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, " %s: %.3f %.3f %.3f", pVar.displayName, pVar.fValue[0], pVar.fValue[1], pVar.fValue[2]);
-            }
-        }
-        DrawTextRightAligned(fTextPosX, fTextPosY += fTextStepY, "---------------------------------------");
-    }
-
-#endif
-    // We only show memory usage in dev mode.
-    if (gEnv->pSystem->IsDevMode())
-    {
-        if (GetCVars()->e_DisplayMemoryUsageIcon)
-        {
-            uint64                    nAverageMemoryUsage(0);
-            uint64                    nHighMemoryUsage(0);
-            uint64                    nCurrentMemoryUsage(0);
-            const     uint64  nMegabyte(1024 * 1024);
-
-            // Copied from D3DDriver.cpp, function CD3D9Renderer::RT_EndFrame().
-            int                           nIconSize = 16;
-
-            nCurrentMemoryUsage = processMemInfo.TotalPhysicalMemory - processMemInfo.FreePhysicalMemory;
-
-#if defined(_WIN64) || defined(WIN64) || defined(MAC) || defined(LINUX64)
-            nAverageMemoryUsage = 3000;
-            nHighMemoryUsage = 6000;
-            // This is the same value as measured in the editor.
-            nCurrentMemoryUsage = processMemInfo.PagefileUsage / nMegabyte;
-#elif defined(_WIN32) || defined(LINUX32)
-            nAverageMemoryUsage = 800;
-            nHighMemoryUsage = 1200;
-            // This is the same value as measured in the editor.
-            nCurrentMemoryUsage = processMemInfo.PagefileUsage / nMegabyte;
-#endif //_WIN32
-
-            ITexture* pRenderTexture(m_ptexIconAverageMemoryUsage);
-            if (nCurrentMemoryUsage > nHighMemoryUsage)
-            {
-                pRenderTexture = m_ptexIconHighMemoryUsage;
-            }
-            else if (nCurrentMemoryUsage < nAverageMemoryUsage)
-            {
-                pRenderTexture = m_ptexIconLowMemoryUsage;
-            }
-
-            if (pRenderTexture && gEnv->pRenderer)
-            {
-                float vpWidth = (float)gEnv->pRenderer->GetOverlayWidth(), vpHeight = (float)gEnv->pRenderer->GetOverlayHeight();
-                float iconWidth = (float)nIconSize / vpWidth * 800.0f;
-                float iconHeight = (float)nIconSize / vpHeight * 600.0f;
-                gEnv->pRenderer->Push2dImage((fTextPosX / vpWidth) * 800.0f - iconWidth, ((fTextPosY += nIconSize + 3) / vpHeight) * 600.0f,
-                    iconWidth, iconHeight, pRenderTexture->GetTextureID(), 0, 1.0f, 1.0f, 0);
-            }
-        }
-    }
-#endif
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-static const float DISPLAY_MEMORY_ROW_MARGIN = 16.0f;
-static const float DISPLAY_MEMORY_ROW_HEIGHT = 32.0f;
-static const float DISPLAY_MEMORY_ROW_NUMBER_WIDTH = 128.0f;
-static const float DISPLAY_MEMORY_ROW_FONT_SCALE = 1.5f;
-static const float DISPLAY_MEMORY_COL_LABEL_FONT_SCALE = 1.0f;
-
-static inline void AdjustDisplayMemoryParameters(float& yPos, float& columnInset, float columnWidth, float screenHeight)
-{
-    int column = (int)(yPos + DISPLAY_MEMORY_ROW_HEIGHT) / (int)screenHeight;
-    columnInset += columnWidth * column;
-    yPos -= screenHeight * column;
-}
-
-static void DisplayMemoryRow(C3DEngine& engine, float columnWidth, float screenHeight, float yPos, float valueA, float valueB, const char* valueBFormat, const ColorF& color, const char* categoryName, const char* subcategoryName = nullptr)
-{
-    float columnInset = columnWidth - DISPLAY_MEMORY_ROW_MARGIN;
-    AdjustDisplayMemoryParameters(yPos, columnInset, columnWidth, screenHeight);
-    if (valueA != -1.0f)
-    {
-        engine.DrawTextRightAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH, yPos, DISPLAY_MEMORY_ROW_FONT_SCALE, color, "%.1fMB", valueA);
-    }
-    if (valueB != -1.0f)
-    {
-        engine.DrawTextRightAligned(columnInset, yPos, DISPLAY_MEMORY_ROW_FONT_SCALE, color, valueBFormat, valueB);
-    }
-
-    if (subcategoryName)
-    {
-        static const float MAIN_TEXT_SCALE = 1.5f;
-        static const float SUB_TEXT_SCALE = 1.0f;
-        static const float SUB_LINE_OFFSET_Y = 16.0f;
-
-        engine.DrawTextLeftAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH * 4, yPos, MAIN_TEXT_SCALE, color, "%s", categoryName);
-        engine.DrawTextLeftAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH * 4, yPos + SUB_LINE_OFFSET_Y, SUB_TEXT_SCALE, color, "%s", subcategoryName);
-    }
-    else
-    {
-        engine.DrawTextLeftAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH * 4, yPos, DISPLAY_MEMORY_ROW_FONT_SCALE, color, "%s", categoryName);
-    }
-}
-
-void C3DEngine::DisplayMemoryStatistics()
-{
-    const ColorF headerColor = ColorF(0.4f, 0.9f, 0.3f, 1.0f);
-    const ColorF statisticColor = ColorF(0.4f, 0.9f, 0.9f, 1.0f);
-    const ColorF subtotalColor = ColorF(0.4f, 0.3f, 0.9f, 1.0f);
-    const ColorF totalColor = ColorF(0.9f, 0.9f, 0.9f, 1.0f);
-    const ColorF labelColor = ColorF(0.4f, 0.3f, 0.3f, 1.0f);
-
-    const float screenHeight = (float)m_pRenderer->GetHeight();
-
-    if (GetCVars()->e_MemoryProfiling == 1)
-    {
-        const float columnWidth = (float)(m_pRenderer->GetWidth() / 2);
-        float columnInset = columnWidth - DISPLAY_MEMORY_ROW_MARGIN;
-
-        float memoryYPos = DISPLAY_MEMORY_ROW_HEIGHT;
-        float memoryYPosStepSize = DISPLAY_MEMORY_ROW_HEIGHT;
-
-        // Add column labels and header
-        this->DrawTextRightAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH, memoryYPos, DISPLAY_MEMORY_COL_LABEL_FONT_SCALE, labelColor, "Allocated");
-        this->DrawTextRightAligned(columnInset, memoryYPos, DISPLAY_MEMORY_COL_LABEL_FONT_SCALE, labelColor, "No. Allocations");
-        DisplayMemoryRow(*this, columnWidth, screenHeight, memoryYPos, -1.0f, -1.0f, "%.1fMB", headerColor, "VRAM Usage");
-        memoryYPos += (memoryYPosStepSize * 0.5f);
-
-        float totalTrackedGPUAlloc = 0.0f;
-
-        // Print the memory usage of each major VRAM category and each subcategory
-        for (int category = 0; category < Render::Debug::VRAM_CATEGORY_NUMBER_CATEGORIES; ++category)
-        {
-            float categorySubTotal = 0.0f;
-            AZStd::string categoryName;
-
-            for (int subcategory = 0; subcategory < Render::Debug::VRAM_SUBCATEGORY_NUMBER_SUBCATEGORIES; ++subcategory)
-            {
-                AZStd::string subcategoryName;
-                size_t numberBytesAllocated = 0;
-                size_t numberAllocations = 0;
-                EBUS_EVENT(Render::Debug::VRAMDrillerBus, GetCurrentVRAMStats, static_cast<Render::Debug::VRAMAllocationCategory>(category),
-                    static_cast<Render::Debug::VRAMAllocationSubcategory>(subcategory), categoryName, subcategoryName, numberBytesAllocated, numberAllocations);
-
-                if (numberAllocations != 0)
-                {
-                    float numMBallocated = numberBytesAllocated / (1024.0f * 1024.0f);
-                    DisplayMemoryRow(*this, columnWidth, screenHeight, memoryYPos, numMBallocated, (float)numberAllocations, "%.0f", statisticColor, categoryName.c_str(), subcategoryName.c_str());
-
-                    memoryYPos += memoryYPosStepSize;
-                    totalTrackedGPUAlloc += numMBallocated;
-                    categorySubTotal += numMBallocated;
-                }
-            }
-            if (categorySubTotal > 0.0f)
-            {
-                float yPos = memoryYPos;
-                AdjustDisplayMemoryParameters(yPos, columnInset, columnWidth, screenHeight);
-                DrawTextLeftAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH * 4, yPos, DISPLAY_MEMORY_ROW_FONT_SCALE, subtotalColor, "%s Subtotal", categoryName.c_str());
-                DrawTextRightAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH, yPos, DISPLAY_MEMORY_ROW_FONT_SCALE, subtotalColor, "%.1fMB", categorySubTotal);
-                memoryYPos += (memoryYPosStepSize * 0.5f);
-            }
-        }
-
-        float allocatedVideoMemoryMB = -1.0f, reservedVideoMemoryMB = -1.0f;
-
-#if defined(AZ_PLATFORM_PROVO)
-        size_t allocatedVideoMemoryBytes = 0, reservedVideoMemoryBytes = 0;
-        VirtualAllocator::QueryVideoMemory(allocatedVideoMemoryBytes, reservedVideoMemoryBytes);
-        allocatedVideoMemoryMB = static_cast<float>(allocatedVideoMemoryBytes) / (1024.0f * 1024.0f);
-        reservedVideoMemoryMB = static_cast<float>(reservedVideoMemoryBytes) / (1024.0f * 1024.0f);
-#else
-        // Non PROVO platforms just sum up the tracked allocations
-        allocatedVideoMemoryMB = totalTrackedGPUAlloc;
-#endif
-
-        DrawTextLeftAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH * 4, memoryYPos, DISPLAY_MEMORY_ROW_FONT_SCALE, totalColor, "Total");
-        if (reservedVideoMemoryMB != -1.0f)
-        {
-            DrawTextRightAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH * 1, memoryYPos, DISPLAY_MEMORY_ROW_FONT_SCALE, totalColor, "%.1fMB/%.1fMB", allocatedVideoMemoryMB, reservedVideoMemoryMB);
-            memoryYPos += (memoryYPosStepSize * 0.5f);
-        }
-        else
-        {
-            DrawTextRightAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH * 1, memoryYPos, DISPLAY_MEMORY_ROW_FONT_SCALE, totalColor, "%.1fMB", allocatedVideoMemoryMB);
-            memoryYPos += (memoryYPosStepSize * 0.5f);
-        }
-
-        // Spacer
-        memoryYPos += (memoryYPosStepSize * 0.5f);
-
-        // Add column labels and header
-        this->DrawTextRightAligned(columnInset - DISPLAY_MEMORY_ROW_NUMBER_WIDTH, memoryYPos, DISPLAY_MEMORY_COL_LABEL_FONT_SCALE, labelColor, "Allocated");
-        this->DrawTextRightAligned(columnInset, memoryYPos, DISPLAY_MEMORY_COL_LABEL_FONT_SCALE, labelColor, "Capacity");
-        DisplayMemoryRow(*this, columnWidth, screenHeight, memoryYPos, -1.0f, -1.0f, "%.1fMB", headerColor, "CPU Memory Usage");
-        memoryYPos += (memoryYPosStepSize * 0.5f);
-
-        float totalTrackedCPUAlloc = 0.0f;
-        float totalCapacityCPUAlloc = 0.0f;
-
-        AZ::AllocatorManager& allocatorManager = AZ::AllocatorManager::Instance();
-        const size_t allocatorCount = allocatorManager.GetNumAllocators();
-        AZStd::map<AZ::IAllocatorAllocate*, AZ::IAllocator*> existingAllocators;
-        AZStd::map<AZ::IAllocatorAllocate*, AZ::IAllocator*> sourcesToAllocators;
-
-        // Build a mapping of original allocator sources to their allocators
-        for (int i = 0; i < allocatorCount; ++i)
-        {
-            AZ::IAllocator* allocator = allocatorManager.GetAllocator(i);
-            sourcesToAllocators.emplace(allocator->GetOriginalAllocationSource(), allocator);
-        }
-
-        // Group up any allocators under this size
-        static float smallAllocatorCapacityMaxMB = 10.0f;
-        float smallAllocatorsTotalCapacityMB = 0.0f;
-        float smallAllocatorsTotalAllocatedMB = 0.0f;
-
-        for (int i = 0; i < allocatorCount; ++i)
-        {
-            AZ::IAllocator* allocator = allocatorManager.GetAllocator(i);
-            AZ::IAllocatorAllocate* source = allocator->GetAllocationSource();
-            AZ::IAllocatorAllocate* originalSource = allocator->GetOriginalAllocationSource();
-            AZ::IAllocatorAllocate* schema = allocator->GetSchema();
-            AZ::IAllocator* alias = (source != originalSource) ? sourcesToAllocators[source] : nullptr;
-
-            if (schema && !alias)
-            {
-                // Check to see if this allocator's source maps to another allocator
-                // Need to check both the schema and the allocator itself, as either one might be used as the alias depending on how it's implemented
-                AZStd::array<AZ::IAllocatorAllocate*, 2> checkAllocators = { { schema, allocator->GetAllocationSource() } };
-
-                for (AZ::IAllocatorAllocate* check : checkAllocators)
-                {
-                    auto existing = existingAllocators.emplace(check, allocator);
-
-                    if (!existing.second)
-                    {
-                        alias = existing.first->second;
-                        // Do not break out of the loop as we need to add to the map for all entries
-                    }
-                }
-            }
-
-            if (!alias)
-            {
-                static const AZ::IAllocator* OS_ALLOCATOR = &AZ::AllocatorInstance<AZ::OSAllocator>::GetAllocator();
-                float allocatedMB = (float)source->NumAllocatedBytes() / (1024.0f * 1024.0f);
-                float capacityMB = (float)source->Capacity() / (1024.0f * 1024.0f);
-
-                totalTrackedCPUAlloc += allocatedMB;
-                totalCapacityCPUAlloc += capacityMB;
-
-                // Skip over smaller allocators so the display is readable.
-                if (capacityMB < smallAllocatorCapacityMaxMB)
-                {
-                    smallAllocatorsTotalCapacityMB += capacityMB;
-                    smallAllocatorsTotalAllocatedMB += allocatedMB;
-                    continue;
-                }
-
-                if (allocator == OS_ALLOCATOR)
-                {
-                    // Need to special case the OS allocator because its capacity is a made-up number. Better to just use the allocated amount, it will hopefully be small anyway.
-                    capacityMB = allocatedMB;
-                }
-
-                DisplayMemoryRow(*this, columnWidth, screenHeight, memoryYPos, allocatedMB, capacityMB, "%.1fMB", statisticColor, allocator->GetName(), allocator->GetDescription());
-
-                memoryYPos += memoryYPosStepSize;
-            }
-        }
-
-        if (smallAllocatorCapacityMaxMB > 0.0f)
-        {
-            AZStd::string subText = AZStd::string::format("Allocators smaller than %.0f MB", smallAllocatorCapacityMaxMB);
-            DisplayMemoryRow(*this, columnWidth, screenHeight, memoryYPos, smallAllocatorsTotalAllocatedMB, smallAllocatorsTotalCapacityMB, "%.1fMB", statisticColor, "All Small Allocators", subText.c_str());
-            memoryYPos += memoryYPosStepSize;
-        }
-
-        DisplayMemoryRow(*this, columnWidth, screenHeight, memoryYPos, totalTrackedCPUAlloc, totalCapacityCPUAlloc, "%.1fMB", totalColor, "Total");
-        memoryYPos += (memoryYPosStepSize * 0.5f);
-    }
-    else if (GetCVars()->e_MemoryProfiling == 2)
-    {
-        const float columnWidth = (float)(m_pRenderer->GetWidth() / 2);
-
-        float memoryYPos = DISPLAY_MEMORY_ROW_HEIGHT;
-        float memoryYPosStepSize = DISPLAY_MEMORY_ROW_HEIGHT;
-
-        AZ::AllocatorManager& allocatorManager = AZ::AllocatorManager::Instance();
-        const size_t allocatorCount = allocatorManager.GetNumAllocators();
-        AZStd::map<AZ::IAllocatorAllocate*, AZ::IAllocator*> existingAllocators;
-        AZStd::map<AZ::IAllocatorAllocate*, AZ::IAllocator*> sourcesToAllocators;
-
-        // Build a mapping of original allocator sources to their allocators
-        for (int i = 0; i < allocatorCount; ++i)
-        {
-            AZ::IAllocator* allocator = allocatorManager.GetAllocator(i);
-            sourcesToAllocators.emplace(allocator->GetOriginalAllocationSource(), allocator);
-        }
-
-        for (int i = 0; i < allocatorCount; ++i)
-        {
-            AZ::IAllocator* allocator = allocatorManager.GetAllocator(i);
-            AZ::IAllocatorAllocate* source = allocator->GetAllocationSource();
-            AZ::IAllocatorAllocate* originalSource = allocator->GetOriginalAllocationSource();
-            AZ::IAllocatorAllocate* schema = allocator->GetSchema();
-            AZ::IAllocator* alias = (source != originalSource) ? sourcesToAllocators[source] : nullptr;
-
-            if (schema && !alias)
-            {
-                // Check to see if this allocator's source maps to another allocator
-                // Need to check both the schema and the allocator itself, as either one might be used as the alias depending on how it's implemented
-                AZStd::array<AZ::IAllocatorAllocate*, 2> checkAllocators = { { schema, allocator->GetAllocationSource() } };
-
-                for (AZ::IAllocatorAllocate* check : checkAllocators)
-                {
-                    auto existing = existingAllocators.emplace(check, allocator);
-
-                    if (!existing.second)
-                    {
-                        alias = existing.first->second;
-                        // Do not break out of the loop as we need to add to the map for all entries
-                    }
-                }
-            }
-
-            if (alias)
-            {
-                float columnInset = columnWidth - DISPLAY_MEMORY_ROW_MARGIN;
-                float yPos = memoryYPos;
-                AdjustDisplayMemoryParameters(yPos, columnInset, columnWidth, screenHeight);
-                DrawTextRightAligned(columnInset, yPos, DISPLAY_MEMORY_ROW_FONT_SCALE, statisticColor, "%s => %s", allocator->GetName(), alias->GetName());
-                memoryYPos += (memoryYPosStepSize * 0.5f);
-            }
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void C3DEngine::SetupDistanceFog()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    GetRenderer()->SetFogColor(ColorF(m_vFogColor.x, m_vFogColor.y, m_vFogColor.z, 1.0f));
-    GetRenderer()->EnableFog(GetCVars()->e_Fog > 0);
-}
-
-void C3DEngine::ScreenShotHighRes([[maybe_unused]] CStitchedImage* pStitchedImage, [[maybe_unused]] const int nRenderFlags, [[maybe_unused]] const SRenderingPassInfo& passInfo, [[maybe_unused]] uint32 SliceCount, [[maybe_unused]] f32 fTransitionSize)
-{
-#if defined(WIN32) || defined(WIN64) || defined(MAC)
-
-    //If the requested format is TGA we want the framebuffer in BGR format; otherwise we want RGB
-    const char* szExtension = GetCVars()->e_ScreenShotFileFormat->GetString();
-    bool BGRA = (azstricmp(szExtension, "tga") == 0) ? true : false;
-
-    // finish frame started by system
-    GetRenderer()->EndFrame();
-
-    // The occlusion system does not like being restarted mid-frame like this. Disable it for
-    // the screenshot system.
-    AZ::s32 statObjBufferRenderTasks = GetCVars()->e_StatObjBufferRenderTasks;
-    GetCVars()->e_StatObjBufferRenderTasks = 0;
-
-    GetConsole()->SetScrollMax(0);
-
-    const uint32  ScreenWidth =   GetRenderer()->GetWidth();
-    const uint32  ScreenHeight    =   GetRenderer()->GetHeight();
-    uint32* pImage = new uint32[ScreenWidth * ScreenHeight];
-    for (uint32 yy = 0; yy < SliceCount; yy++)
-    {
-        for (uint32 xx = 0; xx < SliceCount; xx++)
-        {
-            const int BlendX  =   (xx * 2) / SliceCount;
-            const int BlendY  =   (yy * 2) / SliceCount;
-            const int x   =   (((xx * 2) % SliceCount) & ~1) + BlendX;
-            const int y   =   (((yy * 2) % SliceCount) & ~1) + BlendY;
-            const int reverseX = SliceCount - 1 - x;
-            const int reverseY = SliceCount - 1 - y;
-
-            const float halfTransitionSize = fTransitionSize * 0.5f;
-            const float sliceCountF = static_cast<float>(SliceCount);
-
-            // start new frame and define needed tile
-            const f32 ScreenScale = 1.0f / ((1.0f / sliceCountF) * (1.0f + fTransitionSize));
-
-            GetRenderer()->BeginFrame();
-
-            // This has to happen after BeginFrame(), because BeginFrame increments the frame counter, and SRenderingPassInfo
-            // pulls from that counter in the constructor. Individual render nodes track the frame they were last rendered with
-            // and will bail if the same frame is rendered twice.
-            SRenderingPassInfo screenShotPassInfo = SRenderingPassInfo::CreateGeneralPassRenderingInfo(passInfo.GetCamera());
-            PrintMessage("Rendering tile %d of %d ... ", xx + yy * SliceCount + 1, SliceCount * SliceCount);
-
-            const float normalizedX = ((static_cast<f32>(reverseX) - halfTransitionSize) / sliceCountF);
-            const float normalizedY = ((static_cast<f32>(reverseY) - halfTransitionSize) / sliceCountF);
-
-                GetRenderer()->SetRenderTile(
-                    ScreenScale * normalizedX,
-                    ScreenScale * normalizedY,
-                    ScreenScale, ScreenScale);
-
-            UpdateRenderingCamera("ScreenShotHighRes", screenShotPassInfo);
-
-            RenderInternal(nRenderFlags, screenShotPassInfo, "ScreenShotHighRes");
-
-            // Make sure we've composited to the final back buffer.
-            GetRenderer()->SwitchToNativeResolutionBackbuffer();
-
-            GetRenderer()->EndFrame();
-
-            PrintMessagePlus("reading frame buffer ... ");
-
-            GetRenderer()->ReadFrameBufferFast(pImage, ScreenWidth, ScreenHeight, BGRA);
-            pStitchedImage->RasterizeRect(pImage, ScreenWidth, ScreenHeight, x, y, fTransitionSize,
-                fTransitionSize > 0.0001f && BlendX,
-                fTransitionSize > 0.0001f && BlendY);
-
-            PrintMessagePlus("ok");
-        }
-    }
-    delete[] pImage;
-
-    GetCVars()->e_StatObjBufferRenderTasks = statObjBufferRenderTasks;
-
-    // re-start frame so system can safely finish it
-    GetRenderer()->BeginFrame();
-
-    // restore initial state
-    GetRenderer()->SetViewport(0, 0, GetRenderer()->GetWidth(), GetRenderer()->GetHeight());
-    GetConsole()->SetScrollMax(300);
-    GetRenderer()->SetRenderTile();
-
-    PrintMessagePlus(" ok");
-#endif // #if defined(WIN32) || defined(WIN64)
-}
-
-
-
-bool C3DEngine::ScreenShotMap([[maybe_unused]] CStitchedImage* pStitchedImage,
-    [[maybe_unused]] const int                         nRenderFlags,
-    [[maybe_unused]] const SRenderingPassInfo& passInfo,
-    [[maybe_unused]] const uint32                  SliceCount,
-    [[maybe_unused]] const f32                         fTransitionSize)
-{
-#if defined(WIN32) || defined(WIN64) || defined(MAC)
-
-    const f32     fTLX   = GetCVars()->e_ScreenShotMapCenterX - GetCVars()->e_ScreenShotMapSizeX + fTransitionSize * GetRenderer()->GetWidth();
-    const f32     fTLY   = GetCVars()->e_ScreenShotMapCenterY - GetCVars()->e_ScreenShotMapSizeY + fTransitionSize * GetRenderer()->GetHeight();
-    const f32     fBRX   = GetCVars()->e_ScreenShotMapCenterX + GetCVars()->e_ScreenShotMapSizeX + fTransitionSize * GetRenderer()->GetWidth();
-    const f32     fBRY   = GetCVars()->e_ScreenShotMapCenterY + GetCVars()->e_ScreenShotMapSizeY + fTransitionSize * GetRenderer()->GetHeight();
-    const f32     Height = GetCVars()->e_ScreenShotMapCamHeight;
-    const int     Orient = GetCVars()->e_ScreenShotMapOrientation;
-
-    const char* SettingsFileName = GetLevelFilePath("ScreenshotMap.Settings");
-
-    AZ::IO::HandleType metaFileHandle = gEnv->pCryPak->FOpen(SettingsFileName, "wt");
-    if (metaFileHandle != AZ::IO::InvalidHandle)
-    {
-        char Data[1024 * 8];
-        snprintf(Data, sizeof(Data), "<Map CenterX=\"%f\" CenterY=\"%f\" SizeX=\"%f\" SizeY=\"%f\" Height=\"%f\"  Quality=\"%d\" Orientation=\"%d\" />",
-            GetCVars()->e_ScreenShotMapCenterX,
-            GetCVars()->e_ScreenShotMapCenterY,
-            GetCVars()->e_ScreenShotMapSizeX,
-            GetCVars()->e_ScreenShotMapSizeY,
-            GetCVars()->e_ScreenShotMapCamHeight,
-            GetCVars()->e_ScreenShotQuality,
-            GetCVars()->e_ScreenShotMapOrientation);
-        string data(Data);
-        gEnv->pCryPak->FWrite(data.c_str(), data.size(), metaFileHandle);
-        gEnv->pCryPak->FClose(metaFileHandle);
-    }
-
-    // This bit is necessary because we don't have a way to render the world using an orthographic projection. This is doing
-    // a hacky orthographic projection by shifting the camera up to a sufficient height to fake it. To preserve depth range
-    // we define a maximum range then then fit the near / far planes to extend [-HeightRangeMax, HeightRangeMax] along Z (which is the up axis).
-    const float HeightRangeMax = 4096;
-    const float HeightRangeMaxDiv2 = HeightRangeMax / 2.0f;
-
-    const float NearClip = max(Height - HeightRangeMaxDiv2, 1.0f);
-    const float FarClip  = max(Height + HeightRangeMaxDiv2, HeightRangeMax);
-
-    CCamera cam = passInfo.GetCamera();
-    Matrix34 tmX, tmY;
-    float xrot = -gf_PI * 0.5f;
-    float yrot = Orient == 0 ? -gf_PI * 0.5f : -0.0f;
-    tmX.SetRotationX(xrot);
-    tmY.SetRotationY(yrot);
-    Matrix34 tm   =   tmX * tmY;
-    tm.SetTranslation(Vec3((fTLX + fBRX) * 0.5f, (fTLY + fBRY) * 0.5f, Height));
-    cam.SetMatrix(tm);
-
-    const f32 AngleX  =   atanf(((fBRX - fTLX) * 0.5f) / Height);
-    const f32 AngleY  =   atanf(((fBRY - fTLY) * 0.5f) / Height);
-
-    ICVar* r_drawnearfov = GetConsole()->GetCVar("r_DrawNearFoV");
-    assert(r_drawnearfov);
-    const f32 drawnearfov_backup = r_drawnearfov->GetFVal();
-    const f32 ViewingSize =   (float)min(cam.GetViewSurfaceX(), cam.GetViewSurfaceZ());
-    if (max(AngleX, AngleY) <= 0)
-    {
-        return false;
-    }
-    cam.SetFrustum((int)ViewingSize, (int)ViewingSize, max(0.001f, max(AngleX, AngleY) * 2.f), NearClip, FarClip);
-    r_drawnearfov->Set(-1);
-    ScreenShotHighRes(pStitchedImage, nRenderFlags, SRenderingPassInfo::CreateTempRenderingInfo(cam, passInfo), SliceCount, fTransitionSize);
-    r_drawnearfov->Set(drawnearfov_backup);
-
-    return true;
-#else       // #if defined(WIN32) || defined(WIN64)
-    return false;
-#endif  // #if defined(WIN32) || defined(WIN64)
-}
-
-
-bool C3DEngine::ScreenShotPanorama([[maybe_unused]] CStitchedImage* pStitchedImage, [[maybe_unused]] const int nRenderFlags, [[maybe_unused]] const SRenderingPassInfo& passInfo, [[maybe_unused]] uint32 SliceCount, [[maybe_unused]] f32 fTransitionSize)
-{
-#if defined(WIN32) || defined(WIN64) || defined(MAC)
-
-    //If the requested format is TGA we want the framebuffer in BGR format; otherwise we want RGB
-    const char* szExtension = GetCVars()->e_ScreenShotFileFormat->GetString();
-    bool BGRA = (azstricmp(szExtension, "tga") == 0) ? true : false;
-
-    // finish frame started by system
-    GetRenderer()->EndFrame();
-
-    float r_drawnearfov_backup = -1;
-    ICVar* r_drawnearfov = GetConsole()->GetCVar("r_DrawNearFoV");
-    assert(r_drawnearfov);
-
-    r_drawnearfov_backup = r_drawnearfov->GetFVal();
-    r_drawnearfov->Set(-1);     // means the fov override should be switched off
-
-    // The occlusion system does not like being restarted mid-frame like this. Disable it for
-    // the screenshot system.
-    AZ::s32 statObjBufferRenderTasks = GetCVars()->e_StatObjBufferRenderTasks;
-    GetCVars()->e_StatObjBufferRenderTasks = 0;
-
-    GetTimer()->EnableTimer(false);
-
-    uint32* pImage = new uint32[GetRenderer()->GetWidth() * GetRenderer()->GetHeight()];
-
-    for (int iSlice = SliceCount - 1; iSlice >= 0; --iSlice)
-    {
-        if (iSlice == 0)                                          // the last one should do eye adaption
-        {
-            GetTimer()->EnableTimer(true);
-        }
-
-        GetRenderer()->BeginFrame();
-
-        Matrix33 rot;
-        rot.SetIdentity();
-
-        float fAngle = pStitchedImage->GetSliceAngle(iSlice);
-
-        rot.SetRotationZ(fAngle);
-
-        CCamera cam = passInfo.GetCamera();
-
-        Matrix34 tm = cam.GetMatrix();
-        tm = tm * rot;
-        tm.SetTranslation(passInfo.GetCamera().GetPosition());
-        cam.SetMatrix(tm);
-
-        cam.SetFrustum(cam.GetViewSurfaceX(), cam.GetViewSurfaceZ(), pStitchedImage->m_fPanoramaShotVertFOV, cam.GetNearPlane(), cam.GetFarPlane(), cam.GetPixelAspectRatio());
-
-        SRenderingPassInfo screenShotPassInfo = SRenderingPassInfo::CreateGeneralPassRenderingInfo(cam);
-
-        UpdateRenderingCamera("ScreenShotPanorama", screenShotPassInfo);
-
-        // render scene
-        RenderInternal(nRenderFlags, screenShotPassInfo, "ScreenShotPanorama");
-
-        // Make sure we've composited to the final back buffer.
-        GetRenderer()->SwitchToNativeResolutionBackbuffer();
-
-        GetRenderer()->ReadFrameBufferFast(pImage, GetRenderer()->GetWidth(), GetRenderer()->GetHeight(), BGRA);
-
-        GetRenderer()->EndFrame();                          // show last frame (from direction)
-
-        const bool bFadeBorders = (iSlice + 1) * 2 <= (int)SliceCount;
-
-        PrintMessage("PanoramaScreenShot %d/%d FadeBorders:%c (id: %d/%d)", iSlice + 1, SliceCount, bFadeBorders ? 't' : 'f', GetRenderer()->GetFrameID(false), GetRenderer()->GetFrameID(true));
-
-        pStitchedImage->RasterizeCylinder(pImage, GetRenderer()->GetWidth(), GetRenderer()->GetHeight(), iSlice + 1, bFadeBorders);
-
-        if (GetCVars()->e_ScreenShotQuality < 0)  // to debug FadeBorders
-        {
-            if (iSlice * 2 == SliceCount)
-            {
-                pStitchedImage->Clear();
-                PrintMessage("PanoramaScreenShot clear");
-            }
-        }
-    }
-    delete [] pImage;
-
-    r_drawnearfov->Set(r_drawnearfov_backup);
-    GetCVars()->e_StatObjBufferRenderTasks = statObjBufferRenderTasks;
-
-    // re-start frame so system can safely finish it
-    GetRenderer()->BeginFrame();
-
-    return true;
-#else       // #if defined(WIN32) || defined(WIN64)
-    return false;
-#endif  // #if defined(WIN32) || defined(WIN64)
-}
-
-
-
-void C3DEngine::SetupClearColor()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    bool bCameraInOutdoors = m_pVisAreaManager && !m_pVisAreaManager->m_pCurArea && !(m_pVisAreaManager->m_pCurPortal && m_pVisAreaManager->m_pCurPortal->m_lstConnections.Count() > 1);
-    GetRenderer()->SetClearColor(bCameraInOutdoors ? m_vFogColor : Vec3(0, 0, 0));
-}
-
-void C3DEngine::FillDebugFPSInfo(SDebugFPSInfo& info)
-{
-    size_t c = 0;
-    float average = 0.0f, min = 0.0f, max = 0.0f;
-    const float clampFPS = 200.0f;
-    for (size_t i = 0, end = arrFPSforSaveLevelStats.size(); i < end; ++i)
-    {
-        if (arrFPSforSaveLevelStats[i] > 1.0f && arrFPSforSaveLevelStats[i] < clampFPS)
-        {
-            ++c;
-            average += arrFPSforSaveLevelStats[i];
-        }
-    }
-
-    if (c)
-    {
-        average /= (float)c;
-    }
-
-    int minc = 0, maxc = 0;
-    for (size_t i = 0, end = arrFPSforSaveLevelStats.size(); i < end; ++i)
-    {
-        if (arrFPSforSaveLevelStats[i] > average && arrFPSforSaveLevelStats[i] < clampFPS)
-        {
-            ++maxc;
-            max += arrFPSforSaveLevelStats[i];
-        }
-
-        if (arrFPSforSaveLevelStats[i] < average && arrFPSforSaveLevelStats[i] < clampFPS)
-        {
-            ++minc;
-            min += arrFPSforSaveLevelStats[i];
-        }
-    }
-
-    if (minc == 0)
-    {
-        minc = 1;
-    }
-    if (maxc == 0)
-    {
-        maxc = 1;
-    }
-
-    info.fAverageFPS = average;
-    info.fMinFPS = min / (float)minc;
-    info.fMaxFPS = max / (float)maxc;
-}
diff --git a/Code/CryEngine/Cry3DEngine/3DEngine_Jobs.cpp b/Code/CryEngine/Cry3DEngine/3DEngine_Jobs.cpp
deleted file mode 100644
index a6beb77dda..0000000000
--- a/Code/CryEngine/Cry3DEngine/3DEngine_Jobs.cpp
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of I3DEngine interface methods
-
-
-#include "Cry3DEngine_precompiled.h"
-#include <MathConversion.h>
-
-#include "3dEngine.h"
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-#include "VisAreas.h"
-#include "ObjMan.h"
-#include "Ocean.h"
-
-#include "DecalManager.h"
-#include "IndexedMesh.h"
-#include "AABBSV.h"
-
-#include "MatMan.h"
-
-#include "CullBuffer.h"
-#include "CGF/CGFLoader.h"
-#include "CGF/ReadOnlyChunkFile.h"
-
-#include "CloudRenderNode.h"
-#include "CloudsManager.h"
-#include "SkyLightManager.h"
-#include "FogVolumeRenderNode.h"
-#include "DecalRenderNode.h"
-#include "TimeOfDay.h"
-#include "LightEntity.h"
-#include "FogVolumeRenderNode.h"
-#include "ObjectsTree.h"
-#include "WaterVolumeRenderNode.h"
-#include "DistanceCloudRenderNode.h"
-#include "VolumeObjectRenderNode.h"
-#include "RenderMeshMerger.h"
-#include "DeferredCollisionEvent.h"
-#include "OpticsManager.h"
-#include "ClipVolumeManager.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-#include "PrismRenderNode.h"
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-//Platform specific includes
-#if defined(WIN32) || defined(WIN64)
-#include "CryWindows.h"
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-void C3DEngine::CheckAddLight(CDLight* pLight, const SRenderingPassInfo& passInfo)
-{
-    if (pLight->m_Id < 0)
-    {
-        GetRenderer()->EF_ADDDlight(pLight, passInfo);
-        assert(pLight->m_Id >= 0);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float C3DEngine::GetLightAmount(CDLight* pLight, const AABB& objBox)
-{
-    // find amount of light
-    float fDist = sqrt_tpl(Distance::Point_AABBSq(pLight->m_Origin, objBox));
-    float fLightAttenuation = (pLight->m_Flags & DLF_DIRECTIONAL) ? 1.f : 1.f - (fDist) / (pLight->m_fRadius);
-    if (fLightAttenuation < 0)
-    {
-        fLightAttenuation = 0;
-    }
-
-    float fLightAmount =
-        (pLight->m_Color.r + pLight->m_Color.g + pLight->m_Color.b) * 0.233f +
-        (pLight->GetSpecularMult()) * 0.1f;
-
-    return fLightAmount * fLightAttenuation;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float C3DEngine::GetWaterLevel()
-{
-    if (OceanToggle::IsActive())
-    {
-        return OceanRequest::GetOceanLevel();
-    }
-    return m_pOcean ? m_pOcean->GetWaterLevel() : WATER_LEVEL_UNKNOWN;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool C3DEngine::IsTessellationAllowed(const CRenderObject* pObj, const SRenderingPassInfo& passInfo, bool bIgnoreShadowPass) const
-{
-#ifdef MESH_TESSELLATION_ENGINE
-    assert(pObj && GetCVars());
-    bool rendererTessellation;
-    GetRenderer()->EF_Query(EFQ_MeshTessellation, rendererTessellation);
-    if (pObj->m_fDistance < GetCVars()->e_TessellationMaxDistance
-        && GetCVars()->e_Tessellation
-        && rendererTessellation
-        && !(pObj->m_ObjFlags & FOB_DISSOLVE)) // dissolve is not working with tessellation for now
-    {
-        bool bAllowTessellation = true;
-
-        // Check if rendering into shadow map and enable tessellation only if allowed
-        if (!bIgnoreShadowPass && passInfo.IsShadowPass())
-        {
-            if (IsTessellationAllowedForShadowMap(passInfo))
-            {
-                // NOTE: This might be useful for game projects
-                // Use tessellation only for objects visible in main view
-                // Shadows will switch to non-tessellated when caster gets out of view
-                IRenderNode* pRN = (IRenderNode*)pObj->m_pRenderNode;
-                if (pRN)
-                {
-                    bAllowTessellation = (pRN->IsRenderNode() && (pRN->GetDrawFrame() > passInfo.GetFrameID() - 10));
-                }
-            }
-            else
-            {
-                bAllowTessellation = false;
-            }
-        }
-
-        return bAllowTessellation;
-    }
-#endif //#ifdef MESH_TESSELLATION_ENGINE
-
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void C3DEngine::CreateRNTmpData(CRNTmpData** ppInfo, IRenderNode* pRNode, const SRenderingPassInfo& passInfo)
-{
-    // m_checkCreateRNTmpData lock scope
-    {
-        AUTO_LOCK(m_checkCreateRNTmpData);
-        FUNCTION_PROFILER_3DENGINE;
-
-        if (*ppInfo)
-        {
-            return; // check if another thread already intialized ppInfo
-        }
-        // make sure element is allocated
-        if (m_LTPRootFree.pNext == &m_LTPRootFree)
-        {
-            CRNTmpData* pNew = new CRNTmpData; //m_RNTmpDataPools.GetNewElement();
-            pNew->Link(&m_LTPRootFree);
-        }
-
-        // move element from m_LTPRootFree to m_LTPRootUsed
-        CRNTmpData* pElem = m_LTPRootFree.pNext;
-        pElem->Unlink();
-        pElem->Link(&m_LTPRootUsed);
-
-        pElem->pOwnerRef = ppInfo;
-        pElem->nFrameInfoId = GetFrameInfoId(ppInfo, passInfo.GetMainFrameID());
-
-        assert(!pElem->pOwnerRef || !(*pElem->pOwnerRef));
-        memset(&pElem->userData, 0, sizeof(pElem->userData));
-
-
-        // Add a memory barrier that the write to nFrameInfoID is visible
-        // before *ppInfo is written, else we have a race condtition in
-        // CheckCreateRNTmpData as we don't use a lock there
-        // for performance reasons
-        MemoryBarrier();
-
-        *ppInfo = pElem;
-    }
-
-    if (pRNode)
-    {
-        pRNode->OnRenderNodeBecomeVisible(passInfo); // Internally uses the just assigned RNTmpData pointer i.e IRenderNode::m_pRNTmpData ...
-
-        if (IVisArea* pVisArea = pRNode->GetEntityVisArea())
-        {
-            pRNode->m_pRNTmpData->userData.m_pClipVolume = pVisArea;
-        }
-        else if (GetClipVolumeManager()->IsClipVolumeRequired(pRNode))
-        {
-            GetClipVolumeManager()->UpdateEntityClipVolume(pRNode->GetPos(), pRNode);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void C3DEngine::RenderRenderNode_ShadowPass(IShadowCaster* pShadowCaster, const SRenderingPassInfo& passInfo, [[maybe_unused]] AZ::LegacyJobExecutor* pJobExecutor)
-{
-    assert(passInfo.IsShadowPass());
-
-    SRendItemSorter rendItemSorter = SRendItemSorter::CreateShadowPassRendItemSorter(passInfo);
-
-    if (!pShadowCaster->IsRenderNode())
-    {
-        const Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-        const AABB objBox = pShadowCaster->GetBBoxVirtual();
-
-        SRendParams rParams;
-        rParams.fDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, objBox)) * passInfo.GetZoomFactor();
-        rParams.lodValue = pShadowCaster->ComputeLod(0, passInfo);
-        rParams.rendItemSorter = rendItemSorter.GetValue();
-
-        pShadowCaster->Render(rParams, passInfo);
-        return;
-    }
-
-    IRenderNode* pRenderNode = static_cast<IRenderNode*>(pShadowCaster);
-    if ((pRenderNode->m_dwRndFlags & ERF_HIDDEN) != 0)
-    {
-        return;
-    }
-
-    int nStaticObjectLod = -1;
-    if (passInfo.GetShadowMapType() == SRenderingPassInfo::SHADOW_MAP_CACHED)
-    {
-        nStaticObjectLod = GetCVars()->e_ShadowsCacheObjectLod;
-    }
-    else if (passInfo.GetShadowMapType() == SRenderingPassInfo::SHADOW_MAP_CACHED_MGPU_COPY)
-    {
-        nStaticObjectLod = pRenderNode->m_cStaticShadowLod;
-    }
-
-    Get3DEngine()->CheckCreateRNTmpData(&pRenderNode->m_pRNTmpData, pRenderNode, passInfo);
-
-    int wantedLod = pRenderNode->m_pRNTmpData->userData.nWantedLod;
-
-    if (GetCVars()->e_LodForceUpdate && m_pObjManager)
-    {
-        const Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-        const AABB objBox = pRenderNode->GetBBoxVirtual();
-        float fDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, objBox)) * passInfo.GetZoomFactor();
-        wantedLod = m_pObjManager->GetObjectLOD(pRenderNode, fDistance);
-    }
-
-    if (pRenderNode->GetShadowLodBias() != IRenderNode::SHADOW_LODBIAS_DISABLE)
-    {
-        if (passInfo.IsShadowPass() && (pRenderNode->GetDrawFrame(0) < (passInfo.GetFrameID() - 10)))
-        {
-            wantedLod += GetCVars()->e_ShadowsLodBiasInvis;
-        }
-        wantedLod += GetCVars()->e_ShadowsLodBiasFixed;
-        wantedLod += pRenderNode->GetShadowLodBias();
-    }
-
-    if (nStaticObjectLod >= 0)
-    {
-        wantedLod = nStaticObjectLod;
-    }
-
-    {
-        const Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-        const AABB objBox = pRenderNode->GetBBoxVirtual();
-        SRendParams rParams;
-        rParams.fDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, objBox)) * passInfo.GetZoomFactor();
-        rParams.lodValue = pRenderNode->ComputeLod(wantedLod, passInfo);
-        rParams.rendItemSorter = rendItemSorter.GetValue();
-        rParams.pRenderNode = pRenderNode;
-        pRenderNode->Render(rParams, passInfo);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-ITimeOfDay* C3DEngine::GetTimeOfDay()
-{
-    CTimeOfDay* tod = m_pTimeOfDay;
-
-    if (!tod)
-    {
-        tod = new CTimeOfDay;
-        m_pTimeOfDay = tod;
-    }
-
-    return tod;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void C3DEngine::TraceFogVolumes(const Vec3& vPos, const AABB& objBBox, SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo, bool fogVolumeShadingQuality)
-{
-    CFogVolumeRenderNode::TraceFogVolumes(vPos, objBBox, fogVolData, passInfo, fogVolumeShadingQuality);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void C3DEngine::AsyncOctreeUpdate(IRenderNode* pEnt, int nSID, [[maybe_unused]] int nSIDConsideredSafe, uint32 nFrameID, bool bUnRegisterOnly)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-#ifdef _DEBUG // crash test basically
-    const char* szClass = pEnt->GetEntityClassName();
-    const char* szName = pEnt->GetName();
-    if (!szName[0] && !szClass[0])
-    {
-        Warning("I3DEngine::RegisterEntity: Entity undefined"); // do not register undefined objects
-    }
-    //  if(strstr(szName,"Dude"))
-    //  int y=0;
-#endif
-
-    IF (bUnRegisterOnly, 0)
-    {
-        UnRegisterEntityImpl(pEnt);
-        return;
-    }
-    ;
-
-    AABB aabb;
-    pEnt->FillBBox(aabb);
-    float fObjRadiusSqr = aabb.GetRadiusSqr();
-    EERType eERType = pEnt->GetRenderNodeType();
-
-#ifdef SUPP_HMAP_OCCL
-    if (pEnt->m_pRNTmpData)
-    {
-        pEnt->m_pRNTmpData->userData.m_OcclState.vLastVisPoint.Set(0, 0, 0);
-    }
-#endif
-
-
-    const unsigned int dwRndFlags = pEnt->GetRndFlags();
-
-    if (!(dwRndFlags & ERF_RENDER_ALWAYS) && !(dwRndFlags & ERF_CASTSHADOWMAPS))
-    {
-        if (GetCVars()->e_ObjFastRegister && pEnt->m_pOcNode && ((COctreeNode*)pEnt->m_pOcNode)->IsRightNode(aabb, fObjRadiusSqr, pEnt->m_fWSMaxViewDist))
-        { // same octree node
-            Vec3 vEntCenter = GetEntityRegisterPoint(pEnt);
-
-            IVisArea* pVisArea = pEnt->GetEntityVisArea();
-            if (pVisArea && pVisArea->IsPointInsideVisArea(vEntCenter))
-            {
-                return; // same visarea
-            }
-            IVisArea* pVisAreaFromPos = (!m_pVisAreaManager || dwRndFlags & ERF_OUTDOORONLY) ? NULL : GetVisAreaManager()->GetVisAreaFromPos(vEntCenter);
-            if (pVisAreaFromPos == pVisArea)
-            {
-                // NOTE: can only get here when pVisArea==NULL due to 'same visarea' check above. So check for changed clip volume
-                if (GetClipVolumeManager()->IsClipVolumeRequired(pEnt))
-                {
-                    GetClipVolumeManager()->UpdateEntityClipVolume(vEntCenter, pEnt);
-                }
-
-                return; // same visarea or same outdoor
-            }
-        }
-    }
-
-    if (pEnt->m_pOcNode)
-    {
-        UnRegisterEntityImpl(pEnt);
-    }
-    else if (GetCVars()->e_StreamCgf && (eERType == eERType_RenderComponent || eERType == eERType_DynamicMeshRenderComponent || eERType == eERType_GeomCache))
-    { //  Temporary solution: Force streaming priority update for objects that was not registered before
-      //  and was not visible before since usual prediction system was not able to detect them
-
-        if ((uint32)pEnt->GetDrawFrame(0) < nFrameID - 16)
-        {
-            // defer the render node streaming priority update still we have a correct 3D Engine camera
-            int nElementID = m_deferredRenderComponentStreamingPriorityUpdates.Find(pEnt);
-            if (nElementID == -1)  // only add elements once
-            {
-                m_deferredRenderComponentStreamingPriorityUpdates.push_back(pEnt);
-            }
-        }
-    }
-
-    pEnt->m_fWSMaxViewDist = pEnt->GetMaxViewDist();
-
-    bool useVisAreas = true;
-
-    if (eERType != eERType_Light)
-    {
-        if (fObjRadiusSqr > sqr(MAX_VALID_OBJECT_VOLUME) || !_finite(fObjRadiusSqr))
-        {
-            Warning("I3DEngine::RegisterEntity: Object has invalid bbox: name: %s, class name: %s, GetRadius() = %.2f",
-                pEnt->GetName(), pEnt->GetEntityClassName(), fObjRadiusSqr);
-            return; // skip invalid objects - usually only objects with invalid very big scale will reach this point
-        }
-
-        if (dwRndFlags & ERF_RENDER_ALWAYS)
-        {
-            if (m_lstAlwaysVisible.Find(pEnt) < 0)
-            {
-                m_lstAlwaysVisible.Add(pEnt);
-            }
-
-            if (dwRndFlags & ERF_HUD)
-            {
-                return;
-            }
-        }
-
-        if (pEnt->m_dwRndFlags & ERF_OUTDOORONLY)
-        {
-            useVisAreas = false;
-        }
-    }
-    else
-    {
-        CLightEntity* pLight = (CLightEntity*)pEnt;
-        uint32 lightFlag = pLight->m_light.m_Flags;
-        if ((lightFlag & DLF_ATTACH_TO_SUN) || //If the light is attached to the sun, we need to make sure it renders even the entity is not in view port
-            (lightFlag & (DLF_IGNORES_VISAREAS | DLF_DEFERRED_LIGHT | DLF_THIS_AREA_ONLY)) == (DLF_IGNORES_VISAREAS | DLF_DEFERRED_LIGHT)
-            )
-        {
-            if (m_lstAlwaysVisible.Find(pEnt) < 0)
-            {
-                m_lstAlwaysVisible.Add(pEnt);
-            }
-        }
-
-        if (lightFlag & DLF_IGNORES_VISAREAS)
-        {
-            useVisAreas = false;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check for occlusion proxy.
-    {
-        CStatObj* pStatObj = (CStatObj*)pEnt->GetEntityStatObj();
-        if (pStatObj)
-        {
-            if (pStatObj->m_bHaveOcclusionProxy)
-            {
-                pEnt->m_dwRndFlags |=   ERF_GOOD_OCCLUDER;
-                pEnt->m_nInternalFlags |=   IRenderNode::HAS_OCCLUSION_PROXY;
-            }
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-    if (!useVisAreas || !(m_pVisAreaManager && m_pVisAreaManager->SetEntityArea(pEnt, aabb, fObjRadiusSqr)))
-    {
-        if (m_pObjectsTree == nullptr)
-        {
-            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-            m_pObjectsTree = COctreeNode::Create(nSID, AABB(Vec3(0, 0, 0), Vec3(terrainAabb.GetXExtent(), terrainAabb.GetYExtent(), terrainAabb.GetZExtent())), NULL);
-        }
-
-        m_pObjectsTree->InsertObject(pEnt, aabb, fObjRadiusSqr, aabb.GetCenter());
-    }
-
-    // update clip volume: use vis area if we have one, otherwise check if we're in the same volume as before. check other volumes as last resort only
-    if (pEnt->m_pRNTmpData)
-    {
-        Vec3 vEntCenter = GetEntityRegisterPoint(pEnt);
-        CRNTmpData::SRNUserData& userData = pEnt->m_pRNTmpData->userData;
-
-        if (IVisArea* pVisArea = pEnt->GetEntityVisArea())
-        {
-            userData.m_pClipVolume = pVisArea;
-        }
-        else if (GetClipVolumeManager()->IsClipVolumeRequired(pEnt))
-        {
-            GetClipVolumeManager()->UpdateEntityClipVolume(vEntCenter, pEnt);
-        }
-    }
-
-    // register decals, to clean up longer not renderes decals and their render meshes
-    if (eERType == eERType_Decal)
-    {
-        m_decalRenderNodes.push_back((IDecalRenderNode*)pEnt);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool C3DEngine::UnRegisterEntityImpl(IRenderNode* pEnt)
-{
-    // make sure we don't try to update the streaming priority if an object
-    // was added and removed in the same frame
-    int nElementID = m_deferredRenderComponentStreamingPriorityUpdates.Find(pEnt);
-    if (nElementID != -1)
-    {
-        m_deferredRenderComponentStreamingPriorityUpdates.DeleteFastUnsorted(nElementID);
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-
-#ifdef _DEBUG // crash test basically
-    const char* szClass = pEnt->GetEntityClassName();
-    const char* szName = pEnt->GetName();
-    if (!szName[0] && !szClass[0])
-    {
-        Warning("C3DEngine::RegisterEntity: Entity undefined");
-    }
-#endif
-
-    EERType eRenderNodeType = pEnt->GetRenderNodeType();
-
-    bool bFound = false;
-
-    if (pEnt->m_pOcNode)
-    {
-        bFound = ((COctreeNode*)pEnt->m_pOcNode)->DeleteObject(pEnt);
-    }
-
-    if (pEnt->m_dwRndFlags & ERF_RENDER_ALWAYS || (eRenderNodeType == eERType_Light) || (eRenderNodeType == eERType_FogVolume))
-    {
-        m_lstAlwaysVisible.Delete(pEnt);
-    }
-
-    if (eRenderNodeType == eERType_Decal)
-    {
-        std::vector<IDecalRenderNode*>::iterator it = std::find(m_decalRenderNodes.begin(), m_decalRenderNodes.end(), (IDecalRenderNode*)pEnt);
-        if (it != m_decalRenderNodes.end())
-        {
-            m_decalRenderNodes.erase(it);
-        }
-    }
-
-    if (CClipVolumeManager* pClipVolumeManager = GetClipVolumeManager())
-    {
-        pClipVolumeManager->UnregisterRenderNode(pEnt);
-    }
-
-    return bFound;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 C3DEngine::GetEntityRegisterPoint(IRenderNode* pEnt)
-{
-    AABB aabb;
-    pEnt->FillBBox(aabb);
-
-    Vec3 vPoint;
-
-    if (pEnt->m_dwRndFlags & ERF_REGISTER_BY_POSITION)
-    {
-        vPoint = pEnt->GetPos();
-
-        if (pEnt->GetRenderNodeType() != eERType_Light)
-        {
-            // check for valid position
-            if (aabb.GetDistanceSqr(vPoint) > sqr(128.f))
-            {
-                Warning("I3DEngine::RegisterEntity: invalid entity position: Name: %s, Class: %s, Pos=(%.1f,%.1f,%.1f), BoxMin=(%.1f,%.1f,%.1f), BoxMax=(%.1f,%.1f,%.1f)",
-                    pEnt->GetName(), pEnt->GetEntityClassName(),
-                    pEnt->GetPos().x, pEnt->GetPos().y, pEnt->GetPos().z,
-                    pEnt->GetBBox().min.x, pEnt->GetBBox().min.y, pEnt->GetBBox().min.z,
-                    pEnt->GetBBox().max.x, pEnt->GetBBox().max.y, pEnt->GetBBox().max.z
-                    );
-            }
-            // clamp by bbox
-            vPoint.CheckMin(aabb.max);
-            vPoint.CheckMax(aabb.min + Vec3(0, 0, .5f));
-        }
-    }
-    else
-    {
-        vPoint = aabb.GetCenter();
-    }
-
-    return vPoint;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 C3DEngine::GetSunDirNormalized() const
-{
-    return m_vSunDirNormalized;
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/3dEngine.cpp b/Code/CryEngine/Cry3DEngine/3dEngine.cpp
deleted file mode 100644
index 1050916423..0000000000
--- a/Code/CryEngine/Cry3DEngine/3dEngine.cpp
+++ /dev/null
@@ -1,5536 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of I3DEngine interface methods
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "3dEngine.h"
-
-#include <MathConversion.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-#include <Terrain/Bus/TerrainProviderBus.h>
-#include "VisAreas.h"
-#include "ObjMan.h"
-#include "Ocean.h"
-#include <CryPhysicsDeprecation.h>
-#include "DecalManager.h"
-#include "IndexedMesh.h"
-
-#include "MatMan.h"
-
-#include "CullBuffer.h"
-#include "CGF/CGFLoader.h"
-#include "CGF/ChunkFileWriters.h"
-#include "CGF/ReadOnlyChunkFile.h"
-
-#include "CloudRenderNode.h"
-#include "CloudsManager.h"
-#include "SkyLightManager.h"
-#include "FogVolumeRenderNode.h"
-#include "DecalRenderNode.h"
-#include "TimeOfDay.h"
-#include "LightEntity.h"
-#include "FogVolumeRenderNode.h"
-#include "ObjectsTree.h"
-#include "WaterVolumeRenderNode.h"
-#include "DistanceCloudRenderNode.h"
-#include "VolumeObjectRenderNode.h"
-#include "RenderMeshMerger.h"
-#include "DeferredCollisionEvent.h"
-#include "OpticsManager.h"
-#include "GeomCacheRenderNode.h"
-#include "GeomCacheManager.h"
-#include "ClipVolumeManager.h"
-#include <IRemoteCommand.h>
-#include "PostEffectGroup.h"
-#include "MainThreadRenderRequestBus.h"
-#include "ObjMan.h"
-#include "Environment/OceanEnvironmentBus.h"
-#include <limits>
-#include <CryPath.h>
-
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-#include "PrismRenderNode.h"
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-#include <AzFramework/IO/FileOperations.h>
-#include <AzFramework/Physics/WindBus.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/std/parallel/mutex.h>
-
-#include <MathConversion.h>
-
-// required for LARGE_INTEGER used by QueryPerformanceCounter
-#ifdef WIN32
-#include <CryWindows.h>
-#endif
-
-threadID Cry3DEngineBase::m_nMainThreadId = 0;
-bool Cry3DEngineBase::m_bRenderTypeEnabled[eERType_TypesNum];
-ISystem* Cry3DEngineBase::m_pSystem = 0;
-IRenderer* Cry3DEngineBase::m_pRenderer = 0;
-ITimer* Cry3DEngineBase::m_pTimer = 0;
-ILog* Cry3DEngineBase::m_pLog = 0;
-
-COcean* Cry3DEngineBase::m_pOcean = nullptr;
-CObjManager* Cry3DEngineBase::m_pObjManager = 0;
-IConsole* Cry3DEngineBase::m_pConsole = 0;
-C3DEngine* Cry3DEngineBase::m_p3DEngine = 0;
-CVars* Cry3DEngineBase::m_pCVars = 0;
-AZ::IO::IArchive* Cry3DEngineBase::m_pCryPak = nullptr;
-IOpticsManager* Cry3DEngineBase::m_pOpticsManager = 0;
-CDecalManager* Cry3DEngineBase::m_pDecalManager = 0;
-CSkyLightManager* Cry3DEngineBase::m_pSkyLightManager = 0;
-CCloudsManager* Cry3DEngineBase::m_pCloudsManager = 0;
-CVisAreaManager* Cry3DEngineBase::m_pVisAreaManager = 0;
-CClipVolumeManager* Cry3DEngineBase::m_pClipVolumeManager = 0;
-CRenderMeshMerger* Cry3DEngineBase::m_pRenderMeshMerger = 0;
-CMatMan* Cry3DEngineBase::m_pMatMan = 0;
-IStreamedObjectListener* Cry3DEngineBase::m_pStreamListener = 0;
-#if defined(USE_GEOM_CACHES)
-CGeomCacheManager* Cry3DEngineBase::m_pGeomCacheManager = 0;
-#endif
-
-bool Cry3DEngineBase::m_bLevelLoadingInProgress = false;
-bool Cry3DEngineBase::m_bIsInRenderScene = false;
-
-int Cry3DEngineBase::m_CpuFlags = 0;
-#if !defined(CONSOLE)
-bool Cry3DEngineBase::m_bEditor = false;
-#endif //!defined(CONSOLE)
-ESystemConfigSpec Cry3DEngineBase::m_LightConfigSpec = CONFIG_VERYHIGH_SPEC;
-int Cry3DEngineBase::m_arrInstancesCounter[eERType_TypesNum];
-
-#define LAST_POTENTIALLY_VISIBLE_TIME 2
-
-namespace
-{
-    class CLoadLogListener
-        : public ILoaderCGFListener
-    {
-    public:
-        virtual ~CLoadLogListener(){}
-        virtual void Warning(const char* format) {Cry3DEngineBase::Warning("%s", format); }
-        virtual void Error(const char* format) {Cry3DEngineBase::Error("%s", format); }
-        virtual bool IsValidationEnabled() { return Cry3DEngineBase::GetCVars()->e_StatObjValidate != 0; }
-    };
-}
-
-namespace OceanGlobals
-{
-    float g_oceanLevel = 0.0f;
-    float g_oceanStep = 1.0f; 
-    AZStd::recursive_mutex g_oceanParamsMutex;
-}
-
-//////////////////////////////////////////////////////////////////////
-C3DEngine::C3DEngine(ISystem* pSystem)
-{
-    //#if defined(_DEBUG) && defined(WIN32)
-    //  _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-    //#endif
-
-    // Level info
-    m_fSunSpecMult = 1.f;
-    m_bAreaActivationInUse = false;
-
-    Cry3DEngineBase::m_nMainThreadId = CryGetCurrentThreadId();
-    Cry3DEngineBase::m_pSystem = pSystem;
-    Cry3DEngineBase::m_pRenderer = gEnv->pRenderer;
-    Cry3DEngineBase::m_pTimer = gEnv->pTimer;
-    Cry3DEngineBase::m_pLog = gEnv->pLog;
-    Cry3DEngineBase::m_pConsole = gEnv->pConsole;
-    Cry3DEngineBase::m_p3DEngine = this;
-    Cry3DEngineBase::m_pCryPak = gEnv->pCryPak;
-    Cry3DEngineBase::m_pCVars = 0;
-    Cry3DEngineBase::m_pRenderMeshMerger = new CRenderMeshMerger;
-    Cry3DEngineBase::m_pMatMan = new CMatMan;
-    Cry3DEngineBase::m_pStreamListener = NULL;
-    Cry3DEngineBase::m_CpuFlags = pSystem->GetCPUFlags();
-
-    memset(Cry3DEngineBase::m_arrInstancesCounter, 0, sizeof(Cry3DEngineBase::m_arrInstancesCounter));
-
-#if !defined(CONSOLE)
-    m_bEditor = gEnv->IsEditor();
-#endif
-    m_pObjectsTree = nullptr;
-    m_pCVars            = new CVars();
-    Cry3DEngineBase::m_pCVars = m_pCVars;
-
-    m_pTimeOfDay = NULL;
-
-    m_postEffectGroups = std::make_unique<PostEffectGroupManager>();
-    m_postEffectBaseGroup = m_postEffectGroups->GetGroup("Base");
-    if (IPostEffectGroup* pPostEffectsDefaultGroup = m_postEffectGroups->GetGroup(m_defaultPostEffectGroup))
-    {
-        pPostEffectsDefaultGroup->SetEnable(true);
-    }
-
-    m_szLevelFolder[0] = 0;
-
-    m_pSun = 0;
-    m_nFlags = 0;
-    m_pSkyMat = 0;
-    m_pSkyLowSpecMat = 0;
-    m_pTerrainWaterMat = 0;
-    m_nWaterBottomTexId = 0;
-    m_vSunDir = Vec3(5.f, 5.f, DISTANCE_TO_THE_SUN);
-    m_vSunDirRealtime = Vec3(5.f, 5.f, DISTANCE_TO_THE_SUN).GetNormalized();
-
-    m_nBlackTexID = 0;
-
-    // create components
-    m_pObjManager = CryAlignedNew<CObjManager>();
-
-    m_pDecalManager     = 0;//new CDecalManager   (m_pSystem, this);
-    m_pCloudsManager    = new CCloudsManager;
-    m_pOpticsManager        = 0;
-    m_pVisAreaManager   = 0;
-    m_pClipVolumeManager = new CClipVolumeManager();
-    m_pSkyLightManager  = CryAlignedNew<CSkyLightManager>();
-
-    // create REs
-    m_pRESky              = 0;
-    m_pREHDRSky         = 0;
-
-    m_pPhysMaterialEnumerator = 0;
-
-    m_fMaxViewDistHighSpec = 8000;
-    m_fMaxViewDistLowSpec  = 1000;
-
-    m_fSkyBoxAngle = 0;
-    m_fSkyBoxStretching = 0;
-
-
-    m_physicsAreaUpdatesHandler = AZStd::make_unique<class PhysicsAreaUpdatesHandler>(m_PhysicsAreaUpdates);
-
-    m_bOcean = true;
-    m_nOceanRenderFlags = 0;
-
-    m_bSunShadows = true;
-    m_nSunAdditionalCascades = 0;
-    m_CachedShadowsBounds.Reset();
-    m_nCachedShadowsUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eFullUpdate;
-
-    m_fSunClipPlaneRange = 256.0f;
-    m_fSunClipPlaneRangeShift = 0.0f;
-
-    m_nRealLightsNum = m_nDeferredLightsNum = 0;
-
-    m_pCoverageBuffer = CryAlignedNew<CCullBuffer>();
-
-    m_fLightsHDRDynamicPowerFactor = 0.0f;
-
-    m_vHDRFilmCurveParams = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-    m_vHDREyeAdaptation = Vec3(0.05f, 0.8f, 0.9f);
-    m_fHDRBloomAmount = 0.0f;
-    m_vColorBalance = Vec3(1.0f, 1.0f, 1.0f);
-    m_fHDRSaturation = 1.0f;
-
-    m_vSkyHightlightPos.Set(0, 0, 0);
-    m_vSkyHightlightCol.Set(0, 0, 0);
-    m_fSkyHighlightSize = 0;
-
-    m_volFogGlobalDensity = 0.02f;
-    m_volFogGlobalDensityMultiplierLDR = 1.0f;
-    m_volFogFinalDensityClamp = 1.0f;
-
-    m_idMatLeaves = -1;
-
-    m_oceanFogColor = 0.2f * Vec3(29.0f, 102.0f, 141.0f) / 255.0f;
-    m_oceanFogColorShallow = Vec3(0, 0, 0); //0.5f * Vec3( 206.0f, 249.0f, 253.0f ) / 255.0f;
-    m_oceanFogDensity = 0; //0.2f;
-
-    m_oceanCausticsDistanceAtten = 100.0f;
-
-    m_oceanCausticDepth = 8.0f;
-    m_oceanCausticIntensity = 1.0f;
-
-    m_oceanWindDirection = 1;
-    m_oceanWindSpeed = 4.0f;
-    m_oceanWavesSpeed = 1.0f;
-    m_oceanWavesAmount = 1.5f;
-    m_oceanWavesSize = 0.75f;
-
-    m_fParticlesAmbientMultiplier = m_fParticlesLightMultiplier = 1.f;
-    m_fRefreshSceneDataCVarsSumm = -1;
-    m_nRenderTypeEnableCVarSum = -1;
-
-    if (!m_LTPRootFree.pNext)
-    {
-        m_LTPRootFree.pNext = &m_LTPRootFree;
-        m_LTPRootFree.pPrev = &m_LTPRootFree;
-    }
-
-    if (!m_LTPRootUsed.pNext)
-    {
-        m_LTPRootUsed.pNext = &m_LTPRootUsed;
-        m_LTPRootUsed.pPrev = &m_LTPRootUsed;
-    }
-    m_bResetRNTmpDataPool = false;
-
-    m_fSunDirUpdateTime = 0;
-    m_vSunDirNormalized.zero();
-
-    m_volFogRamp = Vec3(0, 100.0f, 0);
-    m_volFogShadowRange = Vec3(0.1f, 0, 0);
-    m_volFogShadowDarkening = Vec3(0.25f, 1, 1);
-    m_volFogShadowEnable = Vec3(0, 0, 0);
-    m_volFog2CtrlParams = Vec3(64.0f, 0.0f, 1.0f);
-    m_volFog2ScatteringParams = Vec3(1.0f, 0.3f, 0.6f);
-    m_volFog2Ramp = Vec3(0.0f, 0.0f, 0.0f);
-    m_volFog2Color = Vec3(1.0f, 1.0f, 1.0f);
-    m_volFog2GlobalDensity = Vec3(0.1f, 1.0f, 0.4f);
-    m_volFog2HeightDensity = Vec3(0.0f, 1.0f, 0.1f);
-    m_volFog2HeightDensity2 = Vec3(4000.0f, 0.0001f, 0.95f);
-    m_volFog2Color1 = Vec3(1.0f, 1.0f, 1.0f);
-    m_volFog2Color2 = Vec3(1.0f, 1.0f, 1.0f);
-    m_nightSkyHorizonCol = Vec3(0, 0, 0);
-    m_nightSkyZenithCol = Vec3(0, 0, 0);
-    m_nightSkyZenithColShift = 0;
-    m_nightSkyStarIntensity = 0;
-    m_moonDirection = Vec3(0, 0, 0);
-    m_nightMoonCol = Vec3(0, 0, 0);
-    m_nightMoonSize = 0;
-    m_nightMoonInnerCoronaCol = Vec3(0, 0, 0);
-    m_nightMoonInnerCoronaScale = 1.0f;
-    m_nightMoonOuterCoronaCol = Vec3(0, 0, 0);
-    m_nightMoonOuterCoronaScale = 1.0f;
-    m_moonRotationLatitude = 0;
-    m_moonRotationLongitude = 0;
-    m_skyboxMultiplier = 1.0f;
-    m_dayNightIndicator = 1.0f;
-    m_fogColor2 = Vec3(0, 0, 0);
-    m_fogColorRadial = Vec3(0, 0, 0);
-    m_volFogHeightDensity = Vec3(0, 1, 0);
-    m_volFogHeightDensity2 = Vec3(4000.0f, 0, 0);
-    m_volFogGradientCtrl = Vec3(1, 1, 1);
-
-    m_vFogColor = Vec3(1.0f, 1.0f, 1.0f);
-    m_vAmbGroundCol = Vec3(0.0f, 0.0f, 0.0f);
-
-    m_dawnStart = 350.0f / 60.0f;
-    m_dawnEnd = 360.0f / 60.0f;
-    m_duskStart = 12.0f + 360.0f / 60.0f;
-    m_duskEnd = 12.0f + 370.0f / 60.0f;
-
-    m_fCloudShadingSunLightMultiplier = 0;
-    m_fCloudShadingSkyLightMultiplier = 0;
-    m_vCloudShadingCustomSunColor = Vec3(0, 0, 0);
-    m_vCloudShadingCustomSkyColor = Vec3(0, 0, 0);
-
-    m_vPrevMainFrameCamPos.Set(-1000000.f, -1000000.f, -1000000.f);
-    m_fAverageCameraSpeed = 0;
-    m_vAverageCameraMoveDir = Vec3(0);
-    m_bContentPrecacheRequested = false;
-    m_bTerrainTextureStreamingInProgress = false;
-    m_bLayersActivated = false;
-    m_eShadowMode = ESM_NORMAL;
-
-    ClearDebugFPSInfo();
-
-    m_fMaxViewDistScale = 1.f;
-
-    m_ptexIconLowMemoryUsage = NULL;
-    m_ptexIconAverageMemoryUsage = NULL;
-    m_ptexIconHighMemoryUsage = NULL;
-    m_ptexIconEditorConnectedToConsole = NULL;
-    m_pScreenshotCallback = 0;
-    m_bInShutDown = false;
-    m_bInUnload = false;
-    m_bInLoad = false;
-
-    m_nCloudShadowTexId = 0;
-
-    m_nNightMoonTexId = 0;
-
-    m_pDeferredPhysicsEventManager = new CDeferredPhysicsEventManager();
-
-#if defined(USE_GEOM_CACHES)
-    m_pGeomCacheManager = new CGeomCacheManager();
-#endif
-
-    m_LightVolumesMgr.Init();
-
-    m_pBreakableBrushHeap = NULL;
-
-    m_nWindSamplePositions = 0;
-    m_pWindSamplePositions = NULL;
-
-    m_fZoomFactor = 0.0f;
-
-    m_fAmbMaxHeight = 0.0f;
-    m_fAmbMinHeight = 0.0f;
-
-    m_pLightQuality = NULL;
-    m_fSaturation = 0.0f;
-
-    m_fGsmRange = 0.0f;
-    m_fGsmRangeStep = 0.0f;
-    m_fShadowsConstBias = 0.0f;
-    m_fShadowsSlopeBias = 0.0f;
-    m_nCustomShadowFrustumCount = 0;
-    m_bHeightMapAoEnabled = false;
-
-    m_bendingPoolIdx = 0;
-    m_levelLoaded = false;
-}
-
-//////////////////////////////////////////////////////////////////////
-C3DEngine::~C3DEngine()
-{
-    m_bInShutDown = true;
-    m_bInUnload = true;
-    m_bInLoad = false;
-
-    CheckMemoryHeap();
-
-    ShutDown();
-
-    delete m_pTimeOfDay;
-    delete m_pDecalManager;
-    delete m_pVisAreaManager;
-    SAFE_DELETE(m_pClipVolumeManager);
-
-    CryAlignedDelete(m_pCoverageBuffer);
-    m_pCoverageBuffer = 0;
-    CryAlignedDelete(m_pSkyLightManager);
-    m_pSkyLightManager = 0;
-    SAFE_DELETE(m_pObjectsTree);
-    //  delete m_pSceneTree;
-    delete m_pRenderMeshMerger;
-    delete m_pMatMan;
-    m_pMatMan = 0;
-    delete m_pCloudsManager;
-
-    delete m_pCVars;
-
-    delete m_pDeferredPhysicsEventManager;
-}
-
-bool C3DEngine::CheckMinSpec(uint32 nMinSpec)
-{
-    return Cry3DEngineBase::CheckMinSpec(nMinSpec);
-}
-
-bool C3DEngine::Init()
-{
-    m_pOpticsManager = new COpticsManager;
-    m_pSystem->SetIOpticsManager(m_pOpticsManager);
-
-    for (int i = 0; i < eERType_TypesNum; i++)
-    {
-        m_bRenderTypeEnabled[i] = true;
-    }
-
-    UpdateRenderTypeEnableLookup();
-
-    // Allocate the temporary pool used for allocations during streaming and loading
-    const size_t tempPoolSize = static_cast<size_t>(GetCVars()->e_3dEngineTempPoolSize) << 10;
-    AZ_Assert(tempPoolSize != 0, "Temp pool size should not be 0.");
-
-    {
-        if (!CTemporaryPool::Initialize(tempPoolSize))
-        {
-            AZ_Assert(false, "Could not initialize initialize temporary pool for 3D Engine startup.");
-            return false;
-        }
-    }
-
-    SFrameLodInfo frameLodInfo;
-    frameLodInfo.fLodRatio = GetCVars()->e_LodRatio;
-
-    frameLodInfo.fTargetSize = GetCVars()->e_LodFaceAreaTargetSize;
-    AZ_Assert(frameLodInfo.fTargetSize > 0.f, "FrameLodInfo target size should be greater than 0.");
-    if (frameLodInfo.fTargetSize <= 0.f)
-    {
-        frameLodInfo.fTargetSize = 1.f;
-    }
-
-    frameLodInfo.nMinLod = GetCVars()->e_LodMin;
-    frameLodInfo.nMaxLod = GetCVars()->e_LodMax;
-    if (GetCVars()->e_Lods == 0)
-    {
-        frameLodInfo.nMinLod = 0;
-        frameLodInfo.nMaxLod = 0;
-    }
-    SetFrameLodInfo(frameLodInfo);
-
-    return true;
-}
-
-bool C3DEngine::IsCameraAnd3DEngineInvalid(const SRenderingPassInfo& passInfo, const char* szCaller)
-{
-    const CCamera& rCamera = passInfo.GetCamera();
-    const float MAX_M23_REPORTED = 3000000.f; // MAT => upped from 100,000 which spammed this message on spear and cityhall. Really should stop editor generating
-    // water levels that trigger this message.
-
-    if (!_finite(rCamera.GetMatrix().m03) || !_finite(rCamera.GetMatrix().m13) || !_finite(rCamera.GetMatrix().m23) || GetMaxViewDistance() <= 0 ||
-        rCamera.GetMatrix().m23 < -MAX_M23_REPORTED || rCamera.GetMatrix().m23 > MAX_M23_REPORTED || rCamera.GetFov() < 0.0001f || rCamera.GetFov() > gf_PI)
-    {
-        Error("Bad camera passed to 3DEngine from %s: Pos=(%.1f, %.1f, %.1f), Fov=%.1f, MaxViewDist=%.1f. Maybe the water level is too extreme.",
-            szCaller,
-            rCamera.GetMatrix().m03, rCamera.GetMatrix().m13, rCamera.GetMatrix().m23,
-            rCamera.GetFov(), _finite(rCamera.GetMatrix().m03) ? GetMaxViewDistance() : 0);
-        return true;
-    }
-
-    return false;
-}
-
-void C3DEngine::OnFrameStart()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    m_nRenderWorldUSecs = 0;
-    m_pDeferredPhysicsEventManager->Update();
-
-    m_bendingPoolIdx = (m_bendingPoolIdx + 1) % NUM_BENDING_POOLS;
-    m_bendingPool[m_bendingPoolIdx].resize(0);
-
-#if defined(USE_GEOM_CACHES)
-    if (!gEnv->IsDedicated())
-    {
-        if (m_pGeomCacheManager)
-        {
-            m_pGeomCacheManager->StreamingUpdate();
-        }
-    }
-#endif
-    //update texture load handlers
-    for (TTextureLoadHandlers::iterator iter = m_textureLoadHandlers.begin(); iter != m_textureLoadHandlers.end(); iter++)
-    {
-        (*iter)->Update();
-    }
-}
-
-float GetOceanLevelCallback(int ix, int iy)
-{
-    using namespace OceanGlobals;
-    return OceanToggle::IsActive() ? OceanRequest::GetAccurateOceanHeight(Vec3(ix * g_oceanStep, iy * g_oceanStep, g_oceanLevel)) : gEnv->p3DEngine->GetAccurateOceanHeight(Vec3(ix * g_oceanStep, iy * g_oceanStep, g_oceanLevel));
-}
-
-unsigned char GetOceanSurfTypeCallback([[maybe_unused]] int ix, [[maybe_unused]] int iy)
-{
-    return 0;
-}
-
-void C3DEngine::Update()
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    ProcessAsyncStaticObjectLoadRequests();
-
-    m_LightConfigSpec = (ESystemConfigSpec)GetCurrentLightSpec();
-
-    if (GetObjManager())
-    {
-        GetObjManager()->ClearStatObjGarbage();
-    }
-
-    if (m_pDecalManager)
-    {
-        m_pDecalManager->Update(GetTimer()->GetFrameTime());
-    }
-
-    if (GetCVars()->e_PrecacheLevel == 3)
-    {
-        PrecacheLevel(true, 0, 0);
-    }
-
-    DebugDraw_Draw();
-
-    ProcessCVarsChange();
-
-    {
-        using namespace OceanGlobals;
-        AZStd::lock_guard<decltype(g_oceanParamsMutex)> lock(g_oceanParamsMutex);
-
-        g_oceanLevel = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : GetWaterLevel();
-    }
-
-    CRenderMeshUtils::ClearHitCache();
-
-    CleanUpOldDecals();
-
-    CDecalRenderNode::ResetDecalUpdatesCounter();
-
-
-    if (m_pBreakableBrushHeap)
-    {
-        m_pBreakableBrushHeap->Cleanup();
-    }
-
-    // make sure all jobs from the previous frame have finished
-    threadID nThreadID;
-    gEnv->pRenderer->EF_Query(EFQ_RenderThreadList, nThreadID);
-    gEnv->pRenderer->GetFinalizeRendItemJobExecutor(nThreadID)->WaitForCompletion();
-    gEnv->pRenderer->GetFinalizeShadowRendItemJobExecutor(nThreadID)->WaitForCompletion();
-
-    UpdateRNTmpDataPool(m_bResetRNTmpDataPool);
-    m_bResetRNTmpDataPool = false;
-
-    m_PhysicsAreaUpdates.GarbageCollect();
-}
-
-void C3DEngine::Tick()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::System);
-
-    // make sure all jobs from the previous frame have finished (also in Tick since Update is not called during loading)
-    threadID nThreadID = 0;
-    gEnv->pRenderer->EF_Query(EFQ_RenderThreadList, nThreadID);
-    gEnv->pRenderer->GetFinalizeRendItemJobExecutor(nThreadID)->WaitForCompletion();
-    gEnv->pRenderer->GetFinalizeShadowRendItemJobExecutor(nThreadID)->WaitForCompletion();
-
-    AZ::MainThreadRenderRequestBus::ExecuteQueuedEvents();
-
-    AZ::MaterialNotificationEventBus::ExecuteQueuedEvents();
-
-    // clear stored cameras from last frame
-    m_RenderingPassCameras[nThreadID].resize(0);
-}
-
-
-void C3DEngine::ProcessCVarsChange()
-{
-    static int nObjectLayersActivation = -1;
-
-    if (nObjectLayersActivation != GetCVars()->e_ObjectLayersActivation)
-    {
-        if (GetCVars()->e_ObjectLayersActivation == 2)
-        {
-            ActivateObjectsLayer(~0, true, true, true, true, "ALL_OBJECTS");
-        }
-        if (GetCVars()->e_ObjectLayersActivation == 3)
-        {
-            ActivateObjectsLayer(~0, false, true, true, true, "ALL_OBJECTS");
-        }
-
-        nObjectLayersActivation = GetCVars()->e_ObjectLayersActivation;
-    }
-
-    float fNewCVarsSumm =
-        GetCVars()->e_ShadowsCastViewDistRatio +
-        GetCVars()->e_Dissolve +
-        GetFloatCVar(e_DissolveDistMin) +
-        GetFloatCVar(e_DissolveDistMax) +
-        GetFloatCVar(e_DissolveDistband) +
-        GetCVars()->e_ViewDistRatio +
-        GetCVars()->e_ViewDistMin +
-        GetCVars()->e_ViewDistRatioDetail +
-        GetCVars()->e_DefaultMaterial +
-        GetGeomDetailScreenRes() +
-        GetCVars()->e_Portals +
-        GetCVars()->e_DebugDraw +
-        GetFloatCVar(e_ViewDistCompMaxSize) +
-        GetCVars()->e_DecalsDefferedStatic +
-        GetRenderer()->GetWidth();
-
-    if (m_fRefreshSceneDataCVarsSumm != -1 && m_fRefreshSceneDataCVarsSumm != fNewCVarsSumm)
-    {
-        UpdateStatInstGroups();
-
-        AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-        AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-        float terrainSize = AZ::GetMax(terrainAabb.GetXExtent(), terrainAabb.GetYExtent());
-
-        // re-register every instance in level
-        constexpr float UNREASONABLY_SMALL_TERRAIN_SIZE = 1.0f;
-        constexpr float VERY_LARGE_TERRAIN_SIZE = 16.0f * 1024.0f;
-        if (terrainSize < UNREASONABLY_SMALL_TERRAIN_SIZE)
-        {
-            //Only happens when the runtime terrain system was excluded from this build.
-            terrainSize = VERY_LARGE_TERRAIN_SIZE;
-        }
-        GetObjManager()->ReregisterEntitiesInArea(
-            Vec3(-terrainSize, -terrainSize, -terrainSize),
-            Vec3(terrainSize * 2.f, terrainSize * 2.f, terrainSize * 2.f));
-
-        // refresh vegetation properties
-        UpdateStatInstGroups();
-
-        // force refresh of temporary data associated with visible objects
-        MarkRNTmpDataPoolForReset();
-    }
-
-    m_fRefreshSceneDataCVarsSumm = fNewCVarsSumm;
-
-    int nRenderTypeEnableCVarSum    =
-        (GetCVars()->e_Entities     << 2);
-
-    if (m_nRenderTypeEnableCVarSum != nRenderTypeEnableCVarSum)
-    {
-        m_nRenderTypeEnableCVarSum = nRenderTypeEnableCVarSum;
-
-        UpdateRenderTypeEnableLookup();
-    }
-
-    {
-        float fNewCVarsSumm2 =
-            GetCVars()->e_LodRatio;
-
-        static float fCVarsSumm2 = fNewCVarsSumm2;
-
-        if (fCVarsSumm2 != fNewCVarsSumm2)
-        {
-            MarkRNTmpDataPoolForReset();
-
-            fCVarsSumm2 = fNewCVarsSumm2;
-        }
-    }
-
-    SFrameLodInfo frameLodInfo;
-    frameLodInfo.fLodRatio = GetCVars()->e_LodRatio;
-
-    frameLodInfo.fTargetSize = GetCVars()->e_LodFaceAreaTargetSize;
-    CRY_ASSERT(frameLodInfo.fTargetSize > 0.f);
-    if (frameLodInfo.fTargetSize <= 0.f)
-    {
-        frameLodInfo.fTargetSize = 1.f;
-    }
-
-    frameLodInfo.nMinLod = GetCVars()->e_LodMin;
-    frameLodInfo.nMaxLod = GetCVars()->e_LodMax;
-    if (GetCVars()->e_Lods == 0)
-    {
-        frameLodInfo.nMinLod = 0;
-        frameLodInfo.nMaxLod = 0;
-    }
-    SetFrameLodInfo(frameLodInfo);
-}
-
-//////////////////////////////////////////////////////////////////////
-void C3DEngine::ShutDown()
-{
-    if (GetRenderer() != GetSystem()->GetIRenderer())
-    {
-        CryFatalError("Renderer was deallocated before I3DEngine::ShutDown() call");
-    }
-
-    UnlockCGFResources();
-
-    UnloadLevel();
-
-#if defined(USE_GEOM_CACHES)
-    delete m_pGeomCacheManager;
-    m_pGeomCacheManager = 0;
-#endif
-
-    if (m_pOpticsManager)
-    {
-        delete m_pOpticsManager;
-        m_pOpticsManager = 0;
-        m_pSystem->SetIOpticsManager(m_pOpticsManager);
-    }
-
-    CryAlignedDelete(m_pObjManager);
-    m_pObjManager = 0;
-
-
-    // Free the temporary pool's underlying storage
-    // and reset the pool
-    if (!CTemporaryPool::Shutdown())
-    {
-        CryFatalError("C3DEngine::Shutdown() could not shutdown temporary pool");
-    }
-
-    COctreeNode::Shutdown();
-}
-
-#ifndef _RELEASE
-void C3DEngine::ProcessStreamingLatencyTest(const CCamera& camIn, CCamera& camOut, const SRenderingPassInfo& passInfo)
-{
-    static float fSQTestOffset = 0;
-    static PodArray<ITexture*> arrTestTextures;
-    static ITexture* pTestTexture = 0;
-    static ITexture* pLastNotReadyTexture = 0;
-    static float fStartTime = 0;
-    static float fDelayStartTime = 0;
-    static size_t nMaxTexUsage = 0;
-
-    static int nOpenRequestCount = 0;
-    SStreamEngineOpenStats stats;
-    gEnv->pSystem->GetStreamEngine()->GetStreamingOpenStatistics(stats);
-    if (stats.nOpenRequestCount > nOpenRequestCount)
-    {
-        nOpenRequestCount = stats.nOpenRequestCount;
-    }
-    else
-    {
-        nOpenRequestCount = max(0, nOpenRequestCount + stats.nOpenRequestCount) / 2;
-    }
-
-    ICVar* pTSFlush = GetConsole()->GetCVar("r_TexturesStreamingDebug");
-
-    if (GetCVars()->e_SQTestBegin == 1)
-    { // Init waiting few seconds until streaming is stabilized and all required textures are loaded
-        PrintMessage("======== Starting streaming latency test ========");
-        fDelayStartTime = GetCurTimeSec();
-        nMaxTexUsage = 0;
-        GetCVars()->e_SQTestBegin = 2;
-        PrintMessage("Waiting %.1f seconds and zero requests and no camera movement", GetCVars()->e_SQTestDelay);
-
-        if (ICVar* pPart = GetConsole()->GetCVar("e_Particles"))
-        {
-            pPart->Set(0);
-        }
-        if (ICVar* pAI = GetConsole()->GetCVar("sys_AI"))
-        {
-            pAI->Set(0);
-        }
-    }
-    else if (GetCVars()->e_SQTestBegin == 2)
-    { // Perform waiting
-        if (GetCurTimeSec() - fDelayStartTime > GetCVars()->e_SQTestDelay && !nOpenRequestCount && m_fAverageCameraSpeed < .01f)
-        {
-            pTSFlush->Set(0);
-            GetCVars()->e_SQTestBegin = 3;
-        }
-        else
-        {
-            pTSFlush->Set(3);
-        }
-    }
-    else if (GetCVars()->e_SQTestBegin == 3)
-    { // Build a list of all important loaded textures
-        PrintMessage("Collect information about loaded textures");
-
-        fSQTestOffset = (float)GetCVars()->e_SQTestDistance;
-
-        arrTestTextures.Clear();
-        SRendererQueryGetAllTexturesParam param;
-
-        GetRenderer()->EF_Query(EFQ_GetAllTextures, param);
-        if (param.pTextures)
-        {
-            for (uint32 i = 0; i < param.numTextures; i++)
-            {
-                ITexture* pTexture = param.pTextures[i];
-                if (pTexture->GetAccessFrameId() > (int)(passInfo.GetMainFrameID() - 4))
-                {
-                    if (pTexture->GetMinLoadedMip() <= GetCVars()->e_SQTestMip)
-                    {
-                        if (pTexture->IsStreamable())
-                        {
-                            if (pTexture->GetWidth() * pTexture->GetHeight() >= 256 * 256)
-                            {
-                                arrTestTextures.Add(pTexture);
-
-                                if (strstr(pTexture->GetName(), GetCVars()->e_SQTestTextureName->GetString()))
-                                {
-                                    pTestTexture = pTexture;
-                                    PrintMessage("Test texture name: %s", pTexture->GetName());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        GetRenderer()->EF_Query(EFQ_GetAllTexturesRelease, param);
-
-        PrintMessage("%d test textures found", arrTestTextures.Count());
-
-        PrintMessage("Teleporting camera to offset position");
-
-        GetCVars()->e_SQTestBegin = 4;
-    }
-    else if (GetCVars()->e_SQTestBegin == 4)
-    { // Init waiting few seconds until streaming is stabilized and all required textures are loaded
-        fDelayStartTime = GetCurTimeSec();
-        GetCVars()->e_SQTestBegin = 5;
-        PrintMessage("Waiting %.1f seconds and zero requests and no camera movement", GetCVars()->e_SQTestDelay);
-    }
-    else if (GetCVars()->e_SQTestBegin == 5)
-    { // Move camera to offset position and perform waiting
-        Matrix34 mat = camIn.GetMatrix();
-        Vec3 vPos = camIn.GetPosition() - camIn.GetViewdir() * fSQTestOffset;
-        mat.SetTranslation(vPos);
-        camOut.SetMatrix(mat);
-
-        if (GetCurTimeSec() - fDelayStartTime > GetCVars()->e_SQTestDelay && !nOpenRequestCount && m_fAverageCameraSpeed < .01f)
-        {
-            PrintMessage("Begin camera movement");
-            GetCVars()->e_SQTestBegin = 6;
-            pTSFlush->Set(0);
-        }
-        else
-        {
-            pTSFlush->Set(3);
-        }
-    }
-    else if (GetCVars()->e_SQTestBegin == 6)
-    { // Process camera movement from offset position to test point
-        Matrix34 mat = camIn.GetMatrix();
-        Vec3 vPos = camIn.GetPosition() - camIn.GetViewdir() * fSQTestOffset;
-        mat.SetTranslation(vPos);
-        camOut.SetMatrix(mat);
-
-        fSQTestOffset -= GetTimer()->GetFrameTime() * (float)GetCVars()->e_SQTestMoveSpeed;
-
-        STextureStreamingStats statsTex(true);
-        m_pRenderer->EF_Query(EFQ_GetTexStreamingInfo, statsTex);
-        nMaxTexUsage = max(nMaxTexUsage, statsTex.nRequiredStreamedTexturesSize);
-
-        if (fSQTestOffset <= 0)
-        {
-            PrintMessage("Finished camera movement");
-            fStartTime = GetCurTimeSec();
-            PrintMessage("Waiting for %d textures to stream in ...", arrTestTextures.Count());
-
-            GetCVars()->e_SQTestBegin = 7;
-            pLastNotReadyTexture = 0;
-        }
-    }
-    else if (GetCVars()->e_SQTestBegin == 7)
-    { // Wait until test all needed textures are loaded again
-        STextureStreamingStats statsTex(true);
-        m_pRenderer->EF_Query(EFQ_GetTexStreamingInfo, statsTex);
-        nMaxTexUsage = max(nMaxTexUsage, statsTex.nRequiredStreamedTexturesSize);
-
-        if (pTestTexture)
-        {
-            if (pTestTexture->GetMinLoadedMip() <= GetCVars()->e_SQTestMip)
-            {
-                PrintMessage("BINGO: Selected test texture loaded in %.1f sec", GetCurTimeSec() - fStartTime);
-                pTestTexture = NULL;
-                if (!arrTestTextures.Count())
-                {
-                    GetCVars()->e_SQTestBegin = 0;
-                    GetConsole()->GetCVar("e_SQTestBegin")->Set(0);
-                }
-            }
-        }
-
-        if (arrTestTextures.Count())
-        {
-            int nFinishedNum = 0;
-            for (int i = 0; i < arrTestTextures.Count(); i++)
-            {
-                if (arrTestTextures[i]->GetMinLoadedMip() <= GetCVars()->e_SQTestMip)
-                {
-                    nFinishedNum++;
-                }
-                else
-                {
-                    pLastNotReadyTexture = arrTestTextures[i];
-                }
-            }
-
-            if (nFinishedNum == arrTestTextures.Count())
-            {
-                PrintMessage("BINGO: %d of %d test texture loaded in %.1f sec", nFinishedNum, arrTestTextures.Count(), GetCurTimeSec() - fStartTime);
-                if (pLastNotReadyTexture)
-                {
-                    PrintMessage("LastNotReadyTexture: %s [%d x %d]", pLastNotReadyTexture->GetName(), pLastNotReadyTexture->GetWidth(), pLastNotReadyTexture->GetHeight());
-                }
-                PrintMessage("MaxTexUsage: %" PRISIZE_T " MB", nMaxTexUsage / 1024 / 1024);
-                arrTestTextures.Clear();
-
-                GetCVars()->e_SQTestBegin = 0;
-                GetConsole()->GetCVar("e_SQTestBegin")->Set(0);
-
-                m_arrProcessStreamingLatencyTestResults.Add(GetCurTimeSec() - fStartTime);
-                m_arrProcessStreamingLatencyTexNum.Add(nFinishedNum);
-
-                if (GetCVars()->e_SQTestCount == 0)
-                {
-                    const char* testResultsFile = "@usercache@/TestResults/Streaming_Latency_Test.xml";
-
-                    AZ::IO::HandleType resultsFile = gEnv->pCryPak->FOpen(testResultsFile, "wb");
-                    if (resultsFile != AZ::IO::InvalidHandle)
-                    {
-                        float fAverTime = 0;
-                        for (int i = 0; i < m_arrProcessStreamingLatencyTestResults.Count(); i++)
-                        {
-                            fAverTime += m_arrProcessStreamingLatencyTestResults[i];
-                        }
-                        fAverTime /= m_arrProcessStreamingLatencyTestResults.Count();
-
-                        int nAverTexNum = 0;
-                        for (int i = 0; i < m_arrProcessStreamingLatencyTexNum.Count(); i++)
-                        {
-                            nAverTexNum += m_arrProcessStreamingLatencyTexNum[i];
-                        }
-                        nAverTexNum /= m_arrProcessStreamingLatencyTexNum.Count();
-
-                        AZ::IO::Print(resultsFile, "<phase name=\"Streaming_Latency_Test\">\n"
-                            "<metrics name=\"Streaming\">\n"
-                            "<metric name=\"AvrLatency\" value=\"%.1f\"/>\n"
-                            "<metric name=\"AvrTexNum\" value=\"%d\"/>\n"
-                            "</metrics>\n"
-                            "</phase>\n",
-                            fAverTime,
-                            nAverTexNum);
-                        gEnv->pCryPak->FClose(resultsFile);
-                    }
-
-                    if (GetCVars()->e_SQTestExitOnFinish)
-                    {
-                        GetSystem()->Quit();
-                    }
-                }
-            }
-            else if ((passInfo.GetMainFrameID() & 31) == 0)
-            {
-                PrintMessage("Waiting: %d of %d test texture loaded in %.1f sec", nFinishedNum, arrTestTextures.Count(), GetCurTimeSec() - fStartTime);
-            }
-        }
-    }
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////
-void C3DEngine::UpdateRenderingCamera([[maybe_unused]] const char* szCallerName, const SRenderingPassInfo& passInfo)
-{
-    CCamera newCam = passInfo.GetCamera();
-
-    if (passInfo.IsGeneralPass())
-    {
-        SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::UpdateVoxelData);
-    }
-
-    if IsCVarConstAccess(constexpr) (bool(GetFloatCVar(e_CameraRotationSpeed)))
-    {
-        Matrix34 mat = passInfo.GetCamera().GetMatrix();
-        Matrix33 matRot;
-        matRot.SetRotationZ(-GetCurTimeSec() * GetFloatCVar(e_CameraRotationSpeed));
-        newCam.SetMatrix(mat * matRot);
-    }
-
-#if !defined(_RELEASE)
-
-    {
-        //this feature move the camera along with the player to a certain position and sets the angle accordingly
-        //  (does not work via goto)
-        //u can switch it off again via e_CameraGoto 0
-        const char* const pCamGoto = GetCVars()->e_CameraGoto->GetString();
-        assert(pCamGoto);
-        if (strlen(pCamGoto) > 1)
-        {
-            Ang3 aAngDeg;
-            Vec3 vPos;
-            int args = azsscanf(pCamGoto, "%f %f %f %f %f %f", &vPos.x, &vPos.y, &vPos.z, &aAngDeg.x, &aAngDeg.y, &aAngDeg.z);
-            if (args >= 3)
-            {
-                Vec3 curPos = newCam.GetPosition();
-                if (fabs(vPos.x - curPos.x) > 10.f || fabs(vPos.y - curPos.y) > 10.f || fabs(vPos.z - curPos.z) > 10.f)
-                {
-                    char buf[128];
-                    sprintf_s(buf, "goto %f %f %f", vPos.x, vPos.y, vPos.z);
-                    gEnv->pConsole->ExecuteString(buf);
-                }
-                if (args >= 6)
-                {
-                    Matrix34 mat = passInfo.GetCamera().GetMatrix();
-                    mat.SetTranslation(vPos);
-                    mat.SetRotation33(Matrix33::CreateRotationXYZ(DEG2RAD(aAngDeg)));
-                    newCam.SetMatrix(mat);
-                }
-            }
-        }
-    }
-
-    // Streaming latency test
-    if (GetCVars()->e_SQTestCount && !GetCVars()->e_SQTestBegin)
-    {
-        GetConsole()->GetCVar("e_SQTestBegin")->Set(1);
-        GetConsole()->GetCVar("e_SQTestCount")->Set(GetCVars()->e_SQTestCount - 1);
-    }
-    if (GetCVars()->e_SQTestBegin)
-    {
-        ProcessStreamingLatencyTest(passInfo.GetCamera(), newCam, passInfo);
-    }
-
-#endif
-
-    // set the camera if e_cameraFreeze is not set
-    if (GetCVars()->e_CameraFreeze || GetCVars()->e_CoverageBufferDebugFreeze)
-    {
-        DrawSphere(GetRenderingCamera().GetPosition(), .05f);
-
-        // always set camera to request position for the renderer, allows debugging with e_camerafreeze
-        GetRenderer()->SetCamera(gEnv->pSystem->GetViewCamera());
-    }
-    else
-    {
-        m_RenderingCamera = newCam;
-        // always set camera to request position for the renderer, allows debugging with e_camerafreeze
-        GetRenderer()->SetCamera(newCam);
-    }
-
-    // now we have a valid camera, we can start generation of the occlusion buffer
-    // only needed for editor here, in game we spawn the job more early
-    if (passInfo.IsGeneralPass() && GetCVars()->e_StatObjBufferRenderTasks)
-    {
-        if (gEnv->IsEditor())
-        {
-            GetObjManager()->PrepareCullbufferAsync(passInfo.GetCamera());
-        }
-        else
-        {
-            assert(IsEquivalent(passInfo.GetCamera().GetViewdir(), GetObjManager()->GetCullThread().GetViewDir())); // early set camera differs from current main camera - will cause occlusion errors
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////////////////
-    // update streaming priority of newly seen CComponentRenders (fix for streaming system issue)
-    for (int i = 0, nSize = m_deferredRenderComponentStreamingPriorityUpdates.size(); i <  nSize; ++i)
-    {
-        IRenderNode* pRenderNode = m_deferredRenderComponentStreamingPriorityUpdates[i];
-        AABB aabb = pRenderNode->GetBBox();
-        const Vec3& vCamPos = GetRenderingCamera().GetPosition();
-        float fEntDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, aabb)) * passInfo.GetZoomFactor();
-
-        GetObjManager()->UpdateRenderNodeStreamingPriority(pRenderNode, fEntDistance, 1.0f, false, passInfo);
-        if (GetCVars()->e_StreamCgfDebug == 2)
-        {
-            PrintMessage("C3DEngine::RegisterEntity__GetObjManager()->UpdateRenderNodeStreamingPriority %s", pRenderNode->GetName());
-        }
-    }
-    m_deferredRenderComponentStreamingPriorityUpdates.resize(0);
-}
-
-void C3DEngine::GetSvoStaticTextures(I3DEngine::SSvoStaticTexInfo& svoInfo, PodArray<I3DEngine::SLightTI>* pLightsTI_S, PodArray<I3DEngine::SLightTI>* pLightsTI_D)
-{
-    SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::GetSvoStaticTextures, svoInfo, pLightsTI_S, pLightsTI_D);
-}
-
-void C3DEngine::GetSvoBricksForUpdate(PodArray<SSvoNodeInfo>& arrNodeInfo, bool getDynamic)
-{
-    SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::GetSvoBricksForUpdate, arrNodeInfo, getDynamic);
-}
-
-#if defined(FEATURE_SVO_GI)
-void C3DEngine::LoadTISettings(XmlNodeRef pInputNode)
-{
-    const char* szXmlNodeName = "Total_Illumination_v2";
-    if (gEnv->pConsole->GetCVar("e_svoTI_Active"))
-    {
-        gEnv->pConsole->GetCVar("e_svoTI_Active")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "Active", "0"));
-
-        gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "InjectionMultiplier", "0"));
-
-        gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "NumberOfBounces", "0"));
-
-        gEnv->pConsole->GetCVar("e_svoTI_Saturation")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "Saturation", "0"));
-
-        gEnv->pConsole->GetCVar("e_svoTI_ConeMaxLength")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "ConeMaxLength", "0"));
-
-        gEnv->pConsole->GetCVar("e_svoTI_DiffuseConeWidth")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "DiffuseConeWidth", "0"));
-
-        gEnv->pConsole->GetCVar("e_svoTI_SSAOAmount")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "SSAOAmount", "0"));
-        gEnv->pConsole->GetCVar("e_svoTI_UseLightProbes")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "UseLightProbes", "0"));
-        gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetRed")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "AmbientOffsetRed", "1"));
-        gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetGreen")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "AmbientOffsetGreen", "1"));
-        gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetBlue")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "AmbientOffsetBlue", "1"));
-        gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetBias")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "AmbientOffsetBias", ".1"));
-
-        gEnv->pConsole->GetCVar("e_svoTI_IntegrationMode")->Set(GetXMLAttribText(pInputNode, szXmlNodeName, "IntegrationMode", "0"));
-
-        if (gEnv->pConsole->GetCVar("e_svoTI_IntegrationMode")->GetIVal() < 1) // AO
-        {
-            gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->Set("1");
-        }
-    }
-}
-#endif
-void C3DEngine::PrepareOcclusion(const CCamera& rCamera)
-{
-    if (!gEnv->IsEditor() && GetCVars()->e_StatObjBufferRenderTasks && !gEnv->IsFMVPlaying() && (!IsEquivalent(rCamera.GetPosition(), Vec3(0, 0, 0), VEC_EPSILON) || GetRenderer()->IsPost3DRendererEnabled()))
-    {
-        GetObjManager()->PrepareCullbufferAsync(rCamera);
-    }
-}
-
-void C3DEngine::EndOcclusion()
-{
-    GetObjManager()->EndOcclusionCulling();
-}
-
-IStatObj* C3DEngine::LoadStatObjUnsafeManualRef(const char* fileName, const char* geomName, IStatObj::SSubObject** subObject,
-    bool useStreaming, unsigned long loadingFlags, const void* data, int dataSize)
-{
-    return LoadStatObjInternal(fileName, geomName, subObject, useStreaming, loadingFlags, &CObjManager::LoadStatObjUnsafeManualRef, data, dataSize);
-}
-
-_smart_ptr<IStatObj> C3DEngine::LoadStatObjAutoRef(const char* fileName, const char* geomName, IStatObj::SSubObject** subObject,
-    bool useStreaming, unsigned long loadingFlags, const void* data, int dataSize)
-{
-    return LoadStatObjInternal(fileName, geomName, subObject, useStreaming, loadingFlags, &CObjManager::LoadStatObjAutoRef, data, dataSize);
-}
-
-template<typename TReturn>
-TReturn C3DEngine::LoadStatObjInternal(const char* fileName, const char* geomName, IStatObj::SSubObject** subObject, bool useStreaming,
-    unsigned long loadingFlags, LoadStatObjFunc<TReturn> loadStatObjFunc, const void* data, int dataSize)
-{
-    if (!fileName || !fileName[0])
-    {
-        m_pSystem->Warning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, 0, 0, "I3DEngine::LoadStatObj: filename is not specified");
-        return nullptr;
-    }
-
-    if (!m_pObjManager)
-    {
-        m_pObjManager = CryAlignedNew<CObjManager>();
-    }
-
-    CObjManager* pObjManager = static_cast<CObjManager*>(m_pObjManager);
-    return (pObjManager->*loadStatObjFunc)(fileName, geomName, subObject, useStreaming, loadingFlags, data, dataSize, nullptr);
-}
-
-void C3DEngine::LoadStatObjAsync(I3DEngine::LoadStaticObjectAsyncResult resultCallback, const char* szFileName, const char* szGeomName, bool bUseStreaming, unsigned long nLoadingFlags)
-{
-    CRY_ASSERT_MESSAGE(szFileName && szFileName[0], "LoadStatObjAsync: Invalid filename");
-    CRY_ASSERT_MESSAGE(m_pObjManager, "Object manager is not ready.");
-
-    StaticObjectAsyncLoadRequest request;
-    request.m_callback = resultCallback;
-    request.m_filename = szFileName;
-    request.m_geomName = szGeomName;
-    request.m_useStreaming = bUseStreaming;
-    request.m_loadingFlags = nLoadingFlags;
-
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_statObjQueueLock);
-        m_statObjLoadRequests.push(std::move(request));
-    }
-}
-
-void C3DEngine::ProcessAsyncStaticObjectLoadRequests()
-{
-    // Same scheme as skinned meshes: CharacterManager::ProcessAsyncLoadRequests.
-
-    enum
-    {
-        kMaxLoadsPerFrame = 20
-    };
-    size_t loadsThisFrame = 0;
-
-    while (loadsThisFrame < kMaxLoadsPerFrame)
-    {
-        StaticObjectAsyncLoadRequest request;
-        {
-            AZStd::lock_guard<AZStd::mutex> lock(m_statObjQueueLock);
-            if (m_statObjLoadRequests.empty())
-            {
-                break;
-            }
-            request = std::move(m_statObjLoadRequests.front());
-            m_statObjLoadRequests.pop();
-        }
-
-        _smart_ptr<IStatObj> object = LoadStatObjAutoRef(request.m_filename.c_str(), request.m_geomName.c_str(), nullptr, request.m_useStreaming, request.m_loadingFlags);
-        request.m_callback(object);
-
-        ++loadsThisFrame;
-    }
-}
-
-IStatObj* C3DEngine::FindStatObjectByFilename(const char* filename)
-{
-    if (filename ==  NULL)
-    {
-        return NULL;
-    }
-
-    if (filename[0] == 0)
-    {
-        return NULL;
-    }
-
-    return m_pObjManager->FindStaticObjectByFilename(filename);
-}
-
-void C3DEngine::RegisterEntity(IRenderNode* pEnt, int nSID, int nSIDConsideredSafe)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    if (gEnv->mMainThreadId != CryGetCurrentThreadId())
-    {
-        CryFatalError("C3DEngine::RegisterEntity should only be called on main thread.");
-    }
-
-    uint32 nFrameID = GetRenderer()->GetFrameID();
-    AsyncOctreeUpdate(pEnt, nSID, nSIDConsideredSafe, nFrameID, false);
-}
-
-void C3DEngine::UnRegisterEntityDirect(IRenderNode* pEnt)
-{
-    UnRegisterEntityImpl(pEnt);
-}
-
-void C3DEngine::UnRegisterEntityAsJob(IRenderNode* pEnt)
-{
-    AsyncOctreeUpdate(pEnt, (int)0, (int)0, (int)0, true);
-}
-
-bool C3DEngine::CreateDecalInstance(const CryEngineDecalInfo& decal, CDecal* pCallerManagedDecal)
-{
-    if (!GetCVars()->e_Decals && !pCallerManagedDecal)
-    {
-        return false;
-    }
-
-    return m_pDecalManager->Spawn(decal, pCallerManagedDecal);
-}
-
-void C3DEngine::SelectEntity(IRenderNode* pEntity)
-{
-    static IRenderNode* pSelectedNode;
-    static float fLastTime;
-    if (pEntity && GetCVars()->e_Decals == 3)
-    {
-        float fCurTime = gEnv->pTimer->GetAsyncCurTime();
-        if (fCurTime - fLastTime < 1.0f)
-        {
-            return;
-        }
-        fLastTime = fCurTime;
-        if (pSelectedNode)
-        {
-            pSelectedNode->SetRndFlags(ERF_SELECTED, false);
-        }
-        pEntity->SetRndFlags(ERF_SELECTED, true);
-        pSelectedNode = pEntity;
-    }
-}
-
-void C3DEngine::CreateDecal(const struct CryEngineDecalInfo& decal)
-{
-    IF (!GetCVars()->e_DecalsAllowGameDecals, 0)
-    {
-        return;
-    }
-
-    if (GetCVars()->e_Decals == 2)
-    {
-        IRenderNode* pRN = decal.ownerInfo.pRenderNode;
-        PrintMessage("Debug: C3DEngine::CreateDecal: Pos=(%.1f,%.1f,%.1f) Size=%.2f DecalMaterial=%s HitObjectName=%s(%s)",
-            decal.vPos.x, decal.vPos.y, decal.vPos.z, decal.fSize, decal.szMaterialName,
-            pRN ? pRN->GetName() : "NULL", pRN ? pRN->GetEntityClassName() : "NULL");
-    }
-
-    assert(!decal.pExplicitRightUpFront); // only game-play decals come here
-
-    static uint32 nGroupId = 0;
-    nGroupId++;
-
-    if ((GetCVars()->e_DecalsDefferedStatic == 1 && decal.pExplicitRightUpFront) ||
-        (GetCVars()->e_DecalsDefferedDynamic == 1 && !decal.pExplicitRightUpFront &&
-         (!decal.ownerInfo.pRenderNode || 
-             decal.ownerInfo.pRenderNode->GetRenderNodeType() == eERType_StaticMeshRenderComponent ||
-             decal.fGrowTimeAlpha || decal.fSize > GetFloatCVar(e_DecalsDefferedDynamicMinSize)))
-        && !decal.bForceSingleOwner)
-    {
-        CryEngineDecalInfo decal_adjusted = decal;
-        decal_adjusted.nGroupId = nGroupId;
-        decal_adjusted.bDeferred = true;
-        m_pDecalManager->SpawnHierarchical(decal_adjusted, NULL);
-        return;
-    }
-
-    if (decal.ownerInfo.pRenderNode && decal.fSize > 0.5f && !decal.bForceSingleOwner)
-    {
-        PodArray<SRNInfo> lstEntities;
-        Vec3 vRadius(decal.fSize, decal.fSize, decal.fSize);
-        const AABB cExplosionBox(decal.vPos - vRadius, decal.vPos + vRadius);
-
-        if (CVisArea* pArea = (CVisArea*)decal.ownerInfo.pRenderNode->GetEntityVisArea())
-        {
-            if (pArea->m_pObjectsTree)
-            {
-                pArea->m_pObjectsTree->MoveObjectsIntoList(&lstEntities, &cExplosionBox, false, true, true, true);
-            }
-        }
-        else
-        {
-            Get3DEngine()->MoveObjectsIntoListGlobal(&lstEntities, &cExplosionBox, false, true, true, true);
-        }
-
-        for (int i = 0; i < lstEntities.Count(); i++)
-        {
-            // decals on statobj's of render node
-            CryEngineDecalInfo decalOnRenderNode = decal;
-            decalOnRenderNode.ownerInfo.pRenderNode = lstEntities[i].pNode;
-            decalOnRenderNode.nGroupId = nGroupId;
-
-            //      if(decalOnRenderNode.ownerInfo.pRenderNode->GetRenderNodeType() != decal.ownerInfo.pRenderNode->GetRenderNodeType())
-            //      continue;
-
-            if (decalOnRenderNode.ownerInfo.pRenderNode->GetRndFlags() & ERF_HIDDEN)
-            {
-                continue;
-            }
-
-            m_pDecalManager->SpawnHierarchical(decalOnRenderNode, NULL);
-        }
-    }
-    else
-    {
-        CryEngineDecalInfo decalStatic = decal;
-        decalStatic.nGroupId = nGroupId;
-        m_pDecalManager->SpawnHierarchical(decalStatic, NULL);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::SetSunColor(Vec3 vColor)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetSunColor(vColor);
-        m_pObjManager->SetSunAnimColor(vColor);
-    }
-}
-
-Vec3 C3DEngine::GetSunAnimColor()
-{
-    if (m_pObjManager)
-    {
-        return m_pObjManager->GetSunAnimColor();
-    }
-
-    return Vec3();
-}
-
-void C3DEngine::SetSunAnimColor(const Vec3& sunAnimColor)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetSunAnimColor(sunAnimColor);
-    }
-}
-
-float C3DEngine::GetSunAnimSpeed()
-{
-    if (m_pObjManager)
-    {
-        return m_pObjManager->GetSunAnimSpeed();
-    }
-
-    return 0.0f;
-}
-
-void C3DEngine::SetSunAnimSpeed(float sunAnimSpeed)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetSunAnimSpeed(sunAnimSpeed);
-    }
-}
-
-AZ::u8 C3DEngine::GetSunAnimPhase()
-{
-    if (m_pObjManager)
-    {
-        return m_pObjManager->GetSunAnimPhase();
-    }
-
-    return 0;
-}
-
-void C3DEngine::SetSunAnimPhase(AZ::u8 sunAnimPhase)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetSunAnimPhase(sunAnimPhase);
-    }
-}
-
-AZ::u8 C3DEngine::GetSunAnimIndex()
-{
-    if (m_pObjManager)
-    {
-        return m_pObjManager->GetSunAnimIndex();
-    }
-
-    return 0;
-}
-
-void C3DEngine::SetSunAnimIndex(AZ::u8 sunAnimIndex)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetSunAnimIndex(sunAnimIndex);
-    }
-}
-
-void C3DEngine::SetSSAOAmount(float fMul)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetSSAOAmount(fMul);
-    }
-}
-
-void C3DEngine::SetSSAOContrast(float fMul)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetSSAOContrast(fMul);
-    }
-}
-
-void C3DEngine::RemoveAllStaticObjects([[maybe_unused]] int nSID)
-{
-    if (!IsObjectTreeReady())
-    {
-        return;
-    }
-
-    PodArray<SRNInfo> lstObjects;
-
-    // Don't remove objects from the octree, since our query will return more objects than just the ones we're looking for.
-    const bool removeObjectsFromOctree = false;
-
-    // Skip gathering decals, since we're only looking for vegetation.
-    const bool skipDecals = true;
-    const bool skipERFNoDecalNodeDecals = true;
-
-    // Skip dynamic vegetation, since we're only looking to remove static vegetation.
-    const bool skipDynamicObjects = true;
-
-    GetObjectTree()->MoveObjectsIntoList(&lstObjects, nullptr, removeObjectsFromOctree, skipDecals, skipERFNoDecalNodeDecals, skipDynamicObjects);
-}
-
-void C3DEngine::OnExplosion(Vec3 vPos, float fRadius, [[maybe_unused]] bool bDeformTerrain)
-{
-    if (GetCVars()->e_Decals == 2)
-    {
-        PrintMessage("Debug: C3DEngine::OnExplosion: Pos=(%.1f,%.1f,%.1f) fRadius=%.2f", vPos.x, vPos.y, vPos.z, fRadius);
-    }
-
-    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-    if (!terrain)
-    {
-        return;
-    }
-
-    AZ::Aabb terrainAabb = terrain->GetTerrainAabb();
-    if (!terrainAabb.Contains(LYVec3ToAZVec3(vPos)) || fRadius <= 0)
-    {
-        return; // out of terrain
-    }
-
-    const AZ::Vector2 terrainGridResolution = terrain->GetTerrainGridResolution();
-    const float unitSizeX = terrainGridResolution.GetX();
-    const float unitSizeY = terrainGridResolution.GetY();
-
-    // do not create decals near the terrain holes
-    {
-        for (float x = vPos.x - fRadius; x <= vPos.x + fRadius + 1.0f; x += unitSizeX)
-        {
-            for (float y = vPos.y - fRadius; y <= vPos.y + fRadius + 1.0f; y += unitSizeY)
-            {
-                if (terrain->GetIsHoleFromFloats(x, y))
-                {
-                    return;
-                }
-            }
-        }
-    }
-
-    // reduce ground decals size depending on distance to the ground
-
-    // delete decals what can not be correctly updated
-    Vec3 vRadius(fRadius, fRadius, fRadius);
-    AABB areaBox(vPos - vRadius, vPos + vRadius);
-    Get3DEngine()->DeleteDecalsInRange(&areaBox, NULL);
-}
-
-float C3DEngine::GetMaxViewDistance(bool bScaled)
-{
-    // lerp between specs
-    float fMaxViewDist;
-
-    // camera height lerp factor
-    if (OceanToggle::IsActive() && !OceanRequest::OceanIsEnabled())
-    {
-        fMaxViewDist = m_fMaxViewDistHighSpec;
-    }
-    else
-    {
-        // spec lerp factor
-        float lerpSpec = clamp_tpl(GetCVars()->e_MaxViewDistSpecLerp, 0.0f, 1.0f);
-
-        // lerp between specs
-        fMaxViewDist = m_fMaxViewDistLowSpec * (1.f - lerpSpec) + m_fMaxViewDistHighSpec * lerpSpec;
-
-        const float waterLevel = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : GetWaterLevel();
-        float lerpHeight = clamp_tpl(max(0.f, GetSystem()->GetViewCamera().GetPosition().z - waterLevel) / GetFloatCVar(e_MaxViewDistFullDistCamHeight), 0.0f, 1.0f);
-
-        // lerp between prev result and high spec
-        fMaxViewDist = fMaxViewDist * (1.f - lerpHeight) + m_fMaxViewDistHighSpec * lerpHeight;
-    }
-
-    if (bScaled)
-    {
-        fMaxViewDist *= m_fMaxViewDistScale;
-    }
-
-    // for debugging
-    const float fMaxViewDistCVar = GetFloatCVar(e_MaxViewDistance);
-    fMaxViewDist = (float)fsel(fMaxViewDistCVar, fMaxViewDistCVar, fMaxViewDist);
-
-    fMaxViewDist = (float)fsel(fabsf(fMaxViewDist) - 0.100001f, fMaxViewDist, 0.100001f);
-
-    // eliminate some floating point inconsistency here, there's no point in nitpicking 7999.9995 view distance vs 8000
-    fMaxViewDist = AZ::ClampIfCloseMag<float>(fMaxViewDist, float(round(fMaxViewDist)), 0.01f);
-
-    return fMaxViewDist;
-}
-
-void C3DEngine::SetFrameLodInfo(const SFrameLodInfo& frameLodInfo)
-{
-    if (frameLodInfo.fLodRatio != m_frameLodInfo.fLodRatio || frameLodInfo.fTargetSize != m_frameLodInfo.fTargetSize)
-    {
-        ++m_frameLodInfo.nID;
-        m_frameLodInfo.fLodRatio = frameLodInfo.fLodRatio;
-        m_frameLodInfo.fTargetSize = frameLodInfo.fTargetSize;
-    }
-    m_frameLodInfo.nMinLod = frameLodInfo.nMinLod;
-    m_frameLodInfo.nMaxLod = frameLodInfo.nMaxLod;
-}
-
-void C3DEngine::SetFogColor(const Vec3& vFogColor)
-{
-    m_vFogColor    = vFogColor;
-    GetRenderer()->SetClearColor(m_vFogColor);
-}
-
-Vec3 C3DEngine::GetFogColor()
-{
-    return m_vFogColor;
-}
-
-void C3DEngine::GetSkyLightParameters(Vec3& sunDir, Vec3& sunIntensity, float& Km, float& Kr, float& g, Vec3& rgbWaveLengths)
-{
-    CSkyLightManager::SSkyDomeCondition skyCond;
-    m_pSkyLightManager->GetCurSkyDomeCondition(skyCond);
-
-    g = skyCond.m_g;
-    Km = skyCond.m_Km;
-    Kr = skyCond.m_Kr;
-    sunIntensity = skyCond.m_sunIntensity;
-    rgbWaveLengths = skyCond.m_rgbWaveLengths;
-    sunDir = skyCond.m_sunDirection;
-}
-
-void C3DEngine::SetSkyLightParameters(const Vec3& sunDir, const Vec3& sunIntensity, float Km, float Kr, float g, const Vec3& rgbWaveLengths, bool forceImmediateUpdate)
-{
-    CSkyLightManager::SSkyDomeCondition skyCond;
-
-    skyCond.m_g = g;
-    skyCond.m_Km = Km;
-    skyCond.m_Kr = Kr;
-    skyCond.m_sunIntensity = sunIntensity;
-    skyCond.m_rgbWaveLengths = rgbWaveLengths;
-    skyCond.m_sunDirection = sunDir;
-
-    m_pSkyLightManager->SetSkyDomeCondition(skyCond);
-    if (forceImmediateUpdate && IsHDRSkyMaterial(GetSkyMaterial()))
-    {
-        m_pSkyLightManager->FullUpdate();
-    }
-}
-
-void C3DEngine::SetLightsHDRDynamicPowerFactor(const float value)
-{
-    m_fLightsHDRDynamicPowerFactor = value;
-}
-
-float C3DEngine::GetLightsHDRDynamicPowerFactor() const
-{
-    return m_fLightsHDRDynamicPowerFactor;
-}
-
-bool C3DEngine::IsTessellationAllowedForShadowMap(const SRenderingPassInfo& passInfo) const
-{
-#ifdef MESH_TESSELLATION_ENGINE
-    SRenderingPassInfo::EShadowMapType shadowType = passInfo.GetShadowMapType();
-    switch (shadowType)
-    {
-    case SRenderingPassInfo::SHADOW_MAP_GSM:
-        return passInfo.ShadowFrustumLod() < GetCVars()->e_ShadowsTessellateCascades;
-    case SRenderingPassInfo::SHADOW_MAP_LOCAL:
-        return GetCVars()->e_ShadowsTessellateDLights != 0;
-    case SRenderingPassInfo::SHADOW_MAP_NONE:
-    default:
-        return false;
-    }
-#else
-
-    return false;
-
-#endif //#ifdef MESH_TESSELLATION_ENGINE
-}
-
-void C3DEngine::SetPhysMaterialEnumerator(IPhysMaterialEnumerator* pPhysMaterialEnumerator)
-{
-    m_pPhysMaterialEnumerator = pPhysMaterialEnumerator;
-}
-
-IPhysMaterialEnumerator* C3DEngine::GetPhysMaterialEnumerator()
-{
-    return m_pPhysMaterialEnumerator;
-}
-
-float C3DEngine::GetDistanceToSectorWithWater()
-{
-    const Vec3 camPosition = GetRenderingCamera().GetPosition();
-    const float minDistance = 0.1f;
-    const bool oceanActive = OceanToggle::IsActive();
-    const bool oceanEnabled = OceanRequest::OceanIsEnabled();
-    float distance = minDistance;
-
-    if (oceanActive && !oceanEnabled)
-    {
-        distance = std::numeric_limits<float>::infinity();
-    }
-    else
-    {
-        if (oceanActive && oceanEnabled)
-        {
-            distance = camPosition.z - OceanRequest::GetOceanLevel();
-        }
-        else
-        {
-            distance = std::numeric_limits<float>::infinity();
-        }
-    }
-
-    return max(distance, minDistance);
-}
-
-Vec3 C3DEngine::GetSunColor() const
-{
-    return m_pObjManager ? m_pObjManager->GetSunColor() : Vec3(0, 0, 0);
-}
-
-float C3DEngine::GetSSAOAmount() const
-{
-    return m_pObjManager ? m_pObjManager->GetSSAOAmount() : 1.0f;
-}
-
-float C3DEngine::GetSSAOContrast() const
-{
-    return m_pObjManager ? m_pObjManager->GetSSAOContrast() : 1.0f;
-}
-
-void C3DEngine::SetRainParams(const SRainParams& rainParams)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->GetRainParams().bIgnoreVisareas = rainParams.bIgnoreVisareas;
-        m_pObjManager->GetRainParams().bDisableOcclusion = rainParams.bDisableOcclusion;
-        m_pObjManager->GetRainParams().qRainRotation = rainParams.qRainRotation;
-        m_pObjManager->GetRainParams().vWorldPos = rainParams.vWorldPos;
-        m_pObjManager->GetRainParams().vColor = rainParams.vColor;
-        m_pObjManager->GetRainParams().fAmount = rainParams.fAmount;
-        m_pObjManager->GetRainParams().fCurrentAmount = rainParams.fCurrentAmount;
-        m_pObjManager->GetRainParams().fRadius = rainParams.fRadius;
-        m_pObjManager->GetRainParams().fFakeGlossiness = rainParams.fFakeGlossiness;
-        m_pObjManager->GetRainParams().fFakeReflectionAmount = rainParams.fFakeReflectionAmount;
-        m_pObjManager->GetRainParams().fDiffuseDarkening = rainParams.fDiffuseDarkening;
-        m_pObjManager->GetRainParams().fRainDropsAmount = rainParams.fRainDropsAmount;
-        m_pObjManager->GetRainParams().fRainDropsSpeed = rainParams.fRainDropsSpeed;
-        m_pObjManager->GetRainParams().fRainDropsLighting = rainParams.fRainDropsLighting;
-        m_pObjManager->GetRainParams().fMistAmount = rainParams.fMistAmount;
-        m_pObjManager->GetRainParams().fMistHeight = rainParams.fMistHeight;
-        m_pObjManager->GetRainParams().fPuddlesAmount = rainParams.fPuddlesAmount;
-        m_pObjManager->GetRainParams().fPuddlesMaskAmount = rainParams.fPuddlesMaskAmount;
-        m_pObjManager->GetRainParams().fPuddlesRippleAmount = rainParams.fPuddlesRippleAmount;
-        m_pObjManager->GetRainParams().fSplashesAmount = rainParams.fSplashesAmount;
-
-        m_pObjManager->GetRainParams().nUpdateFrameID = GetRenderer()->GetFrameID();
-    }
-}
-
-bool C3DEngine::GetRainParams(SRainParams& rainParams)
-{
-    bool bRet = false;
-    const int nFrmID = GetRenderer()->GetFrameID();
-    if (m_pObjManager)
-    {
-        // Copy shared rain data only
-        rainParams.bIgnoreVisareas = m_pObjManager->GetRainParams().bIgnoreVisareas;
-        rainParams.bDisableOcclusion = m_pObjManager->GetRainParams().bDisableOcclusion;
-        rainParams.qRainRotation = m_pObjManager->GetRainParams().qRainRotation;
-        rainParams.vWorldPos = m_pObjManager->GetRainParams().vWorldPos;
-        rainParams.vColor = m_pObjManager->GetRainParams().vColor;
-        rainParams.fAmount = m_pObjManager->GetRainParams().fAmount;
-        rainParams.fCurrentAmount = m_pObjManager->GetRainParams().fCurrentAmount;
-        rainParams.fRadius = m_pObjManager->GetRainParams().fRadius;
-        rainParams.fFakeGlossiness = m_pObjManager->GetRainParams().fFakeGlossiness;
-        rainParams.fFakeReflectionAmount = m_pObjManager->GetRainParams().fFakeReflectionAmount;
-        rainParams.fDiffuseDarkening = m_pObjManager->GetRainParams().fDiffuseDarkening;
-        rainParams.fRainDropsAmount = m_pObjManager->GetRainParams().fRainDropsAmount;
-        rainParams.fRainDropsSpeed = m_pObjManager->GetRainParams().fRainDropsSpeed;
-        rainParams.fRainDropsLighting = m_pObjManager->GetRainParams().fRainDropsLighting;
-        rainParams.fMistAmount = m_pObjManager->GetRainParams().fMistAmount;
-        rainParams.fMistHeight = m_pObjManager->GetRainParams().fMistHeight;
-        rainParams.fPuddlesAmount = m_pObjManager->GetRainParams().fPuddlesAmount;
-        rainParams.fPuddlesMaskAmount = m_pObjManager->GetRainParams().fPuddlesMaskAmount;
-        rainParams.fPuddlesRippleAmount = m_pObjManager->GetRainParams().fPuddlesRippleAmount;
-        rainParams.fSplashesAmount = m_pObjManager->GetRainParams().fSplashesAmount;
-
-        if (!IsOutdoorVisible() && !rainParams.bIgnoreVisareas)
-        {
-            rainParams.fAmount = 0.f;
-        }
-
-        bRet = m_pObjManager->GetRainParams().nUpdateFrameID == nFrmID;
-    }
-    return bRet;
-}
-
-void C3DEngine::SetSnowSurfaceParams(const Vec3& vCenter, float fRadius, float fSnowAmount, float fFrostAmount, float fSurfaceFreezing)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->GetSnowParams().m_vWorldPos = vCenter;
-        m_pObjManager->GetSnowParams().m_fRadius = fRadius;
-        m_pObjManager->GetSnowParams().m_fSnowAmount = fSnowAmount;
-        m_pObjManager->GetSnowParams().m_fFrostAmount = fFrostAmount;
-        m_pObjManager->GetSnowParams().m_fSurfaceFreezing = fSurfaceFreezing;
-    }
-}
-
-bool C3DEngine::GetSnowSurfaceParams(Vec3& vCenter, float& fRadius, float& fSnowAmount, float& fFrostAmount, float& fSurfaceFreezing)
-{
-    bool bRet = false;
-    if (m_pObjManager)
-    {
-        vCenter = m_pObjManager->GetSnowParams().m_vWorldPos;
-        fRadius = m_pObjManager->GetSnowParams().m_fRadius;
-        fSnowAmount = 0.f;
-        fFrostAmount = 0.f;
-        fSurfaceFreezing = 0.f;
-        if (IsOutdoorVisible())
-        {
-            fSnowAmount = m_pObjManager->GetSnowParams().m_fSnowAmount;
-            fFrostAmount = m_pObjManager->GetSnowParams().m_fFrostAmount;
-            fSurfaceFreezing = m_pObjManager->GetSnowParams().m_fSurfaceFreezing;
-        }
-        bRet = true;
-    }
-    return bRet;
-}
-
-void C3DEngine::SetSnowFallParams(int nSnowFlakeCount, float fSnowFlakeSize, float fSnowFallBrightness, float fSnowFallGravityScale, float fSnowFallWindScale, float fSnowFallTurbulence, float fSnowFallTurbulenceFreq)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->GetSnowParams().m_nSnowFlakeCount = nSnowFlakeCount;
-        m_pObjManager->GetSnowParams().m_fSnowFlakeSize = fSnowFlakeSize;
-        m_pObjManager->GetSnowParams().m_fSnowFallBrightness = fSnowFallBrightness;
-        m_pObjManager->GetSnowParams().m_fSnowFallGravityScale = fSnowFallGravityScale;
-        m_pObjManager->GetSnowParams().m_fSnowFallWindScale = fSnowFallWindScale;
-        m_pObjManager->GetSnowParams().m_fSnowFallTurbulence = fSnowFallTurbulence;
-        m_pObjManager->GetSnowParams().m_fSnowFallTurbulenceFreq = fSnowFallTurbulenceFreq;
-    }
-}
-
-bool C3DEngine::GetSnowFallParams(int& nSnowFlakeCount, float& fSnowFlakeSize, float& fSnowFallBrightness, float& fSnowFallGravityScale, float& fSnowFallWindScale, float& fSnowFallTurbulence, float& fSnowFallTurbulenceFreq)
-{
-    bool bRet = false;
-    if (m_pObjManager)
-    {
-        nSnowFlakeCount = 0;
-        fSnowFlakeSize = 0.f;
-        fSnowFallBrightness = 0.f;
-        fSnowFallGravityScale = 0.f;
-        fSnowFallWindScale = 0.f;
-        fSnowFallTurbulence = 0.f;
-        fSnowFallTurbulenceFreq = 0.f;
-        if (IsOutdoorVisible())
-        {
-            nSnowFlakeCount = m_pObjManager->GetSnowParams().m_nSnowFlakeCount;
-            fSnowFlakeSize = m_pObjManager->GetSnowParams().m_fSnowFlakeSize;
-            fSnowFallBrightness = m_pObjManager->GetSnowParams().m_fSnowFallBrightness;
-            fSnowFallGravityScale = m_pObjManager->GetSnowParams().m_fSnowFallGravityScale;
-            fSnowFallWindScale = m_pObjManager->GetSnowParams().m_fSnowFallWindScale;
-            fSnowFallTurbulence = m_pObjManager->GetSnowParams().m_fSnowFallTurbulence;
-            fSnowFallTurbulenceFreq = m_pObjManager->GetSnowParams().m_fSnowFallTurbulenceFreq;
-        }
-        bRet = true;
-    }
-    return bRet;
-}
-
-void C3DEngine::SetSunDir(const Vec3& newSunDir)
-{
-    Vec3 vSunDirNormalized = newSunDir.normalized();
-    m_vSunDirRealtime = vSunDirNormalized;
-    if (vSunDirNormalized.Dot(m_vSunDirNormalized) < GetFloatCVar(e_SunAngleSnapDot) ||
-        GetCurTimeSec() - m_fSunDirUpdateTime > GetFloatCVar(e_SunAngleSnapSec))
-    {
-        m_vSunDirNormalized = vSunDirNormalized;
-        m_vSunDir = m_vSunDirNormalized * DISTANCE_TO_THE_SUN;
-
-        m_fSunDirUpdateTime = GetCurTimeSec();
-    }
-}
-
-Vec3 C3DEngine::GetSunDir()  const
-{
-    return m_vSunDir;
-}
-
-Vec3 C3DEngine::GetRealtimeSunDirNormalized() const
-{
-    return m_vSunDirRealtime;
-}
-
-void C3DEngine::FreeRenderNodeState(IRenderNode* pEnt)
-{
-    // make sure we don't try to update the streaming priority if an object
-    // was added and removed in the same frame
-    int nElementID = m_deferredRenderComponentStreamingPriorityUpdates.Find(pEnt);
-    if (nElementID != -1)
-    {
-        m_deferredRenderComponentStreamingPriorityUpdates.DeleteFastUnsorted(nElementID);
-    }
-
-    m_pObjManager->RemoveFromRenderAllObjectDebugInfo(pEnt);
-
-
-#if !defined(_RELEASE)
-    if (!gEnv->IsDedicated())
-    {
-        //As render nodes can be deleted in many places, it's possible that the map of render nodes used by stats gathering (r_stats 6, perfHUD, debug gun) could get aliased.
-        //Ensure that this node is removed from the map to prevent a dereference after deletion.
-        gEnv->pRenderer->ForceRemoveNodeFromDrawCallsMap(pEnt);
-    }
-#endif
-
-    m_lstAlwaysVisible.Delete(pEnt);
-
-    if (m_pDecalManager && (pEnt->m_nInternalFlags & IRenderNode::DECAL_OWNER))
-    {
-        m_pDecalManager->OnEntityDeleted(pEnt);
-    }
-
-    if (pEnt->GetRenderNodeType() == eERType_Light)
-    {
-        GetRenderer()->OnEntityDeleted(pEnt);
-    }
-
-    if (pEnt->GetRndFlags() & (ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS))
-    { // make sure pointer to object will not be used somewhere in the renderer
-#if !defined(_RELEASE)
-        if (!(pEnt->GetRndFlags() & ERF_HAS_CASTSHADOWMAPS))
-        {
-            Warning("IRenderNode has ERF_CASTSHADOWMAPS set but not ERF_HAS_CASTSHADOWMAPS, name: '%s', class: '%s'.", pEnt->GetName(), pEnt->GetEntityClassName());
-        }
-#endif
-        Get3DEngine()->OnCasterDeleted(pEnt);
-    }
-
-    UnRegisterEntityImpl(pEnt);
-
-    if (pEnt->m_pRNTmpData)
-    {
-        Get3DEngine()->FreeRNTmpData(&pEnt->m_pRNTmpData);
-        assert(!pEnt->m_pRNTmpData);
-    }
-}
-
-const char* C3DEngine::GetLevelFilePath(const char* szFileName)
-{
-    cry_strcpy(m_sGetLevelFilePathTmpBuff, m_szLevelFolder);
-    if (*szFileName && (*szFileName == '/' || *szFileName == '\\'))
-    {
-        cry_strcat(m_sGetLevelFilePathTmpBuff, szFileName + 1);
-    }
-    else
-    {
-        cry_strcat(m_sGetLevelFilePathTmpBuff, szFileName);
-    }
-    return m_sGetLevelFilePathTmpBuff;
-}
-
-void C3DEngine::ActivatePortal(const Vec3& vPos, bool bActivate, const char* szEntityName)
-{
-    if (m_pVisAreaManager)
-    {
-        m_pVisAreaManager->ActivatePortal(vPos, bActivate, szEntityName);
-    }
-}
-
-bool C3DEngine::SetStatInstGroup(int nGroupId, const IStatInstGroup& siGroup, int nSID)
-{
-    if (m_pObjManager->GetListStaticTypes().Count() == 0)
-    {
-        AZ_Warning("C3DEngine", false, "Trying to set a Stat instance without an initialized Object manager.  This might be caused by using the vegetation system without terrain.");
-        return false;
-    }
-    if ((nSID < 0) || (nSID >= m_pObjManager->GetListStaticTypes().Count()))
-    {
-        AZ_Assert(false, "Invalid StatInst ID: %d (should be > 0 and < %d)", nSID, m_pObjManager->GetListStaticTypes().Count());
-        return false;
-    }
-
-    m_fRefreshSceneDataCVarsSumm = -100;
-
-    m_pObjManager->GetListStaticTypes()[nSID].resize(max(nGroupId + 1, m_pObjManager->GetListStaticTypes()[nSID].Count()));
-
-    if (nGroupId < 0 || nGroupId >= m_pObjManager->GetListStaticTypes()[nSID].Count())
-    {
-        return false;
-    }
-
-    StatInstGroup& rGroup = m_pObjManager->GetListStaticTypes()[nSID][nGroupId];
-
-    // If the object was changed in the editor, ResetActiveNodes will need to be called later
-    // Keep track of the previous object so we can check for this later
-    _smart_ptr<IStatObj> pPreviousObject = rGroup.pStatObj;
-    rGroup.pStatObj = siGroup.pStatObj;
-
-    if (rGroup.pStatObj)
-    {
-        cry_strcpy(rGroup.szFileName, siGroup.pStatObj->GetFilePath());
-    }
-    else
-    {
-        rGroup.szFileName[0] = 0;
-    }
-
-    rGroup.bHideability = siGroup.bHideability;
-    rGroup.bHideabilitySecondary = siGroup.bHideabilitySecondary;
-    rGroup.nPlayerHideable = siGroup.nPlayerHideable;
-    rGroup.fBending = siGroup.fBending;
-    rGroup.nCastShadowMinSpec = siGroup.nCastShadowMinSpec;
-    rGroup.bRecvShadow = siGroup.bRecvShadow;
-    rGroup.bDynamicDistanceShadows = siGroup.bDynamicDistanceShadows;
-
-    rGroup.bUseAlphaBlending = siGroup.bUseAlphaBlending;
-    rGroup.fSpriteDistRatio = siGroup.fSpriteDistRatio;
-    rGroup.fLodDistRatio = siGroup.fLodDistRatio;
-    rGroup.fShadowDistRatio = siGroup.fShadowDistRatio;
-    rGroup.fMaxViewDistRatio = siGroup.fMaxViewDistRatio;
-
-    rGroup.fBrightness = siGroup.fBrightness;
-
-    _smart_ptr<IMaterial> pPreviousGroupMaterial = rGroup.pMaterial;
-    rGroup.pMaterial = siGroup.pMaterial;
-
-    rGroup.fDensity = siGroup.fDensity;
-    rGroup.fElevationMax = siGroup.fElevationMax;
-    rGroup.fElevationMin = siGroup.fElevationMin;
-    rGroup.fSize = siGroup.fSize;
-    rGroup.fSizeVar = siGroup.fSizeVar;
-    rGroup.fSlopeMax = siGroup.fSlopeMax;
-    rGroup.fSlopeMin = siGroup.fSlopeMin;
-    rGroup.fStiffness = siGroup.fStiffness;
-    rGroup.fDamping = siGroup.fDamping;
-    rGroup.fVariance = siGroup.fVariance;
-    rGroup.fAirResistance = siGroup.fAirResistance;
-
-    rGroup.bRandomRotation = siGroup.bRandomRotation;
-    rGroup.nRotationRangeToTerrainNormal = siGroup.nRotationRangeToTerrainNormal;
-    rGroup.nMaterialLayers = siGroup.nMaterialLayers;
-
-    rGroup.bAllowIndoor = siGroup.bAllowIndoor;
-    rGroup.fAlignToTerrainCoefficient = siGroup.fAlignToTerrainCoefficient;
-
-    rGroup.bAutoMerged = siGroup.bAutoMerged;
-    rGroup.minConfigSpec = siGroup.minConfigSpec;
-
-    rGroup.nID = siGroup.nID;
-
-    rGroup.Update(GetCVars(), Get3DEngine()->GetGeomDetailScreenRes());
-
-    MarkRNTmpDataPoolForReset();
-
-    return true;
-}
-
-bool C3DEngine::GetStatInstGroup(int nGroupId, IStatInstGroup& siGroup, int nSID)
-{
-    assert(nSID >= 0 && nSID < m_pObjManager->GetListStaticTypes().Count());
-
-    if (nGroupId < 0 || nGroupId >= m_pObjManager->GetListStaticTypes()[nSID].Count())
-    {
-        return false;
-    }
-
-    StatInstGroup& rGroup = m_pObjManager->GetListStaticTypes()[nSID][nGroupId];
-
-    siGroup.pStatObj            = rGroup.pStatObj;
-    if (siGroup.pStatObj)
-    {
-        cry_strcpy(siGroup.szFileName, rGroup.pStatObj->GetFilePath());
-    }
-
-    siGroup.bHideability    = rGroup.bHideability;
-    siGroup.bHideabilitySecondary   = rGroup.bHideabilitySecondary;
-    siGroup.nPlayerHideable = rGroup.nPlayerHideable;
-    siGroup.fBending            = rGroup.fBending;
-    siGroup.nCastShadowMinSpec   = rGroup.nCastShadowMinSpec;
-    siGroup.bRecvShadow   = rGroup.bRecvShadow;
-    siGroup.bDynamicDistanceShadows   = rGroup.bDynamicDistanceShadows;
-
-    siGroup.bUseAlphaBlending                       = rGroup.bUseAlphaBlending;
-    siGroup.fSpriteDistRatio                        = rGroup.fSpriteDistRatio;
-    siGroup.fLodDistRatio               = rGroup.fLodDistRatio;
-    siGroup.fShadowDistRatio                        = rGroup.fShadowDistRatio;
-    siGroup.fMaxViewDistRatio                       = rGroup.fMaxViewDistRatio;
-
-    siGroup.fBrightness                                 = rGroup.fBrightness;
-    siGroup.pMaterial                                       = rGroup.pMaterial;
-
-    siGroup.fDensity                                        = rGroup.fDensity;
-    siGroup.fElevationMax                               = rGroup.fElevationMax;
-    siGroup.fElevationMin                               = rGroup.fElevationMin;
-    siGroup.fSize                                               = rGroup.fSize;
-    siGroup.fSizeVar                                        = rGroup.fSizeVar;
-    siGroup.fSlopeMax                                       = rGroup.fSlopeMax;
-    siGroup.fSlopeMin                                       = rGroup.fSlopeMin;
-    siGroup.bAutoMerged       = rGroup.bAutoMerged;
-
-    siGroup.fStiffness = rGroup.fStiffness;
-    siGroup.fDamping = rGroup.fDamping;
-    siGroup.fVariance = rGroup.fVariance;
-    siGroup.fAirResistance = rGroup.fAirResistance;
-
-    siGroup.nID = rGroup.nID;
-
-    return true;
-}
-
-void C3DEngine::UpdateStatInstGroups()
-{
-    if (!m_pObjManager)
-    {
-        return;
-    }
-
-    for (uint32 nSID = 0; nSID < m_pObjManager->GetListStaticTypes().size(); nSID++)
-    {
-        PodArray<StatInstGroup>& rGroupTable = m_pObjManager->GetListStaticTypes()[nSID];
-        for (uint32 nGroupId = 0; nGroupId < rGroupTable.size(); nGroupId++)
-        {
-            StatInstGroup& rGroup = rGroupTable[nGroupId];
-            rGroup.Update(GetCVars(), Get3DEngine()->GetGeomDetailScreenRes());
-        }
-    }
-}
-
-void C3DEngine::GetMemoryUsage(class ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this) + (GetCVars()->e_StreamCgfDebug ? 100 * 1024 * 1024 : 0));
-    pSizer->AddObject(m_pCVars);
-
-    pSizer->AddObject(m_lstStaticLights);
-    pSizer->AddObject(m_arrLightProjFrustums);
-
-    pSizer->AddObject(arrFPSforSaveLevelStats);
-    pSizer->AddObject(m_lstAlwaysVisible);
-
-    if (CTemporaryPool* pPool = CTemporaryPool::Get())
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Temporary Pool");
-        pPool->GetMemoryUsage(pSizer);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "RenderMeshMerger");
-        m_pRenderMeshMerger->GetMemoryUsage(pSizer);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Optics");
-        pSizer->AddObject(m_pOpticsManager);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "SkyLightManager");
-        pSizer->AddObject(m_pSkyLightManager);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "DecalManager");
-        pSizer->AddObject(m_pDecalManager);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "OutdoorObjectsTree");
-        pSizer->AddObject(m_pObjectsTree);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "ObjManager");
-        pSizer->AddObject(m_pObjManager);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Ocean");
-        pSizer->AddObject(m_pOcean);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "VisAreas");
-        pSizer->AddObject(m_pVisAreaManager);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "ClipVolumes");
-        pSizer->AddObject(m_pClipVolumeManager);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "CoverageBuffer");
-        pSizer->AddObject(m_pCoverageBuffer);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "RNTmpDataPool");
-
-        CRNTmpData* pNext = NULL;
-
-        for (CRNTmpData* pElem = m_LTPRootFree.pNext; pElem != &m_LTPRootFree; pElem = pNext)
-        {
-            pSizer->AddObject(pElem, sizeof(*pElem));
-            pNext = pElem->pNext;
-        }
-
-        for (CRNTmpData* pElem = m_LTPRootUsed.pNext; pElem != &m_LTPRootUsed; pElem = pNext)
-        {
-            pSizer->AddObject(pElem, sizeof(*pElem));
-            pNext = pElem->pNext;
-        }
-    }
-}
-
-void C3DEngine::GetResourceMemoryUsage(ICrySizer* pSizer, const AABB& cstAABB)
-{
-    //////////////////////////////////////////////////////////////////////////
-    std::vector<IRenderNode*>   cFoundRenderNodes;
-    unsigned int                            nFoundObjects(0);
-
-    nFoundObjects = GetObjectsInBox(cstAABB);
-    cFoundRenderNodes.resize(nFoundObjects, NULL);
-    GetObjectsInBox(cstAABB, &cFoundRenderNodes.front());
-
-    size_t nCurrentRenderNode(0);
-    size_t nTotalNumberOfRenderNodes(0);
-
-    nTotalNumberOfRenderNodes = cFoundRenderNodes.size();
-    for (nCurrentRenderNode = 0; nCurrentRenderNode < nTotalNumberOfRenderNodes; ++nCurrentRenderNode)
-    {
-        IRenderNode*& piRenderNode = cFoundRenderNodes[nCurrentRenderNode];
-
-        _smart_ptr<IMaterial>  piMaterial(piRenderNode->GetMaterialOverride());
-        if (!piMaterial)
-        {
-            piMaterial = piRenderNode->GetMaterial();
-        }
-
-        if (piMaterial)
-        {
-            piMaterial->GetResourceMemoryUsage(pSizer);
-        }
-
-        {
-            IRenderMesh*    piMesh(NULL);
-            size_t              nCount(0);
-
-            piMesh = piRenderNode->GetRenderMesh(nCount);
-            for (; piMesh; ++nCount, piMesh = piRenderNode->GetRenderMesh(nCount))
-            {
-                // Timur, RenderMesh may not be loaded due to streaming!
-                piMesh->GetMemoryUsage(pSizer, IRenderMesh::MEM_USAGE_COMBINED);
-            }
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-}
-
-bool C3DEngine::IsUnderWater(const Vec3& vPos) const
-{
-    bool bUnderWater = false;
-    // Check underwater
-    AZ_UNUSED(vPos)
-    CRY_PHYSICS_REPLACEMENT_ASSERT();
-    return bUnderWater;
-}
-
-void C3DEngine::SetOceanRenderFlags(uint8 nFlags)
-{
-    m_nOceanRenderFlags = nFlags;
-}
-
-uint32 C3DEngine::GetOceanVisiblePixelsCount() const
-{
-    return COcean::GetVisiblePixelsCount();
-}
-
-float C3DEngine::GetBottomLevel(const Vec3& referencePos, float maxRelevantDepth, [[maybe_unused]] int objflags)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    float terrainWorldZ = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainWorldZ
-        , &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats
-        , referencePos.x, referencePos.y, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, nullptr);
-
-    const float padding = 0.2f;
-    float rayLength;
-
-    // NOTE: Terrain is above referencePos, so referencePos is probably inside a voxel or something.
-    if (terrainWorldZ <= referencePos.z)
-    {
-        rayLength = min(maxRelevantDepth, (referencePos.z - terrainWorldZ));
-    }
-    else
-    {
-        rayLength = maxRelevantDepth;
-    }
-
-    rayLength += padding * 2.0f;
-
-    // Get bottom level
-    CRY_PHYSICS_REPLACEMENT_ASSERT();
-
-    // Terrain was above or too far below referencePos, and no solid object was close enough.
-    return BOTTOM_LEVEL_UNKNOWN;
-}
-
-float C3DEngine::GetBottomLevel(const Vec3& referencePos, float maxRelevantDepth /* = 10.0f */)
-{
-    return GetBottomLevel (referencePos, maxRelevantDepth, ent_terrain | ent_static | ent_sleeping_rigid | ent_rigid);
-}
-
-float C3DEngine::GetBottomLevel(const Vec3& referencePos, int objflags)
-{
-    return GetBottomLevel (referencePos, 10.0f, objflags);
-}
-
-#if defined(USE_GEOM_CACHES)
-IGeomCache* C3DEngine::LoadGeomCache(const char* szFileName)
-{
-    if (!szFileName || !szFileName[0])
-    {
-        m_pSystem->Warning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, 0, 0, "I3DEngine::LoadGeomCache: filename is not specified");
-        return 0;
-    }
-
-    return m_pGeomCacheManager->LoadGeomCache(szFileName);
-}
-
-IGeomCache* C3DEngine::FindGeomCacheByFilename(const char* szFileName)
-{
-    if (!szFileName || szFileName[0] == 0)
-    {
-        return NULL;
-    }
-
-    return m_pGeomCacheManager->FindGeomCacheByFilename(szFileName);
-}
-#endif
-
-namespace
-{
-    // The return value is the next position of the source buffer.
-    int ReadFromBuffer(const char* pSource, int nSourceSize, int nSourcePos, void* pDest, int nDestSize)
-    {
-        if (pDest == 0 || nDestSize == 0)
-        {
-            return 0;
-        }
-
-        if (nSourcePos < 0 || nSourcePos >= nSourceSize)
-        {
-            return 0;
-        }
-
-        memcpy(pDest, &pSource[nSourcePos], nDestSize);
-
-        return nSourcePos + nDestSize;
-    }
-}
-
-IStatObj* C3DEngine::LoadDesignerObject(int nVersion, const char* szBinaryStream, int size)
-{
-    if (nVersion < 0 || nVersion > 2)
-    {
-        return NULL;
-    }
-
-    int nBufferPos = 0;
-    int32 nSubObjectCount = 0;
-    nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nSubObjectCount, sizeof(int32));
-
-    IStatObj* pStatObj = gEnv->p3DEngine->CreateStatObj();
-    if (!pStatObj)
-    {
-        return NULL;
-    }
-
-    std::vector<IStatObj*> statObjList;
-    if (nSubObjectCount == 2)
-    {
-        pStatObj->AddSubObject(gEnv->p3DEngine->CreateStatObj());
-        pStatObj->AddSubObject(gEnv->p3DEngine->CreateStatObj());
-        pStatObj->GetIndexedMesh()->FreeStreams();
-        statObjList.push_back(pStatObj->GetSubObject(0)->pStatObj);
-        statObjList.push_back(pStatObj->GetSubObject(1)->pStatObj);
-    }
-    else
-    {
-        statObjList.push_back(pStatObj);
-    }
-
-    if (nVersion == 2)
-    {
-        int32 nStaticObjFlags = 0;
-        nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nStaticObjFlags, sizeof(int32));
-        pStatObj->SetFlags(nStaticObjFlags);
-    }
-
-    for (int k = 0, iCount(statObjList.size()); k < iCount; ++k)
-    {
-        int32 nPositionCount = 0;
-        int32 nTexCoordCount = 0;
-        int32 nFaceCount = 0;
-        int32 nIndexCount = 0;
-        int32 nTangentCount = 0;
-        int32 nSubsetCount = 0;
-
-        nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nPositionCount, sizeof(int32));
-        nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nTexCoordCount, sizeof(int32));
-        if (nPositionCount <= 0 || nTexCoordCount <= 0)
-        {
-            return NULL;
-        }
-
-        if (nVersion == 0)
-        {
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nFaceCount, sizeof(int32));
-            if (nFaceCount <= 0)
-            {
-                return NULL;
-            }
-        }
-        else if (nVersion >= 1)
-        {
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nIndexCount, sizeof(int32));
-            if (nIndexCount <= 0)
-            {
-                return NULL;
-            }
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nTangentCount, sizeof(int32));
-        }
-        nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nSubsetCount, sizeof(int32));
-        IIndexedMesh* pMesh = statObjList[k]->GetIndexedMesh();
-        if (!pMesh)
-        {
-            return NULL;
-        }
-
-        pMesh->FreeStreams();
-        pMesh->SetVertexCount((int)nPositionCount);
-        pMesh->SetFaceCount((int)nFaceCount);
-        pMesh->SetIndexCount((int)nIndexCount);
-        pMesh->SetTexCoordCount((int)nTexCoordCount);
-
-        Vec3* const positions = pMesh->GetMesh()->GetStreamPtr<Vec3>(CMesh::POSITIONS);
-        Vec3* const normals = pMesh->GetMesh()->GetStreamPtr<Vec3>(CMesh::NORMALS);
-        SMeshTexCoord* const texcoords = pMesh->GetMesh()->GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS);
-
-        nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, positions, sizeof(Vec3) * nPositionCount);
-        nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, normals, sizeof(Vec3) * nPositionCount);
-        nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, texcoords, sizeof(SMeshTexCoord) * nTexCoordCount);
-        if (nVersion == 0)
-        {
-            SMeshFace* const faces = pMesh->GetMesh()->GetStreamPtr<SMeshFace>(CMesh::FACES);
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, faces, sizeof(SMeshFace) * nFaceCount);
-        }
-        else if (nVersion >= 1)
-        {
-            vtx_idx* const indices = pMesh->GetMesh()->GetStreamPtr<vtx_idx>(CMesh::INDICES);
-            if constexpr (sizeof(vtx_idx) == sizeof(uint16))
-            {
-                nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, indices, sizeof(uint16) * nIndexCount);
-            }
-            else
-            {
-                uint16* indices16 = new uint16[nIndexCount];
-                nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, indices16, sizeof(uint16) * nIndexCount);
-                for (int32 i = 0; i < nIndexCount; ++i)
-                {
-                    indices[i] = (vtx_idx)indices16[i];
-                }
-                delete [] indices16;
-            }
-            pMesh->SetTangentCount((int)nTangentCount);
-            if (nTangentCount > 0)
-            {
-                SMeshTangents* const tangents = pMesh->GetMesh()->GetStreamPtr<SMeshTangents>(CMesh::TANGENTS);
-                nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, tangents, sizeof(SMeshTangents) * nTangentCount);
-            }
-        }
-
-        pMesh->SetSubSetCount(nSubsetCount);
-        for (int i = 0; i < nSubsetCount; ++i)
-        {
-            SMeshSubset subset;
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &subset.vCenter, sizeof(Vec3));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &subset.fRadius, sizeof(float));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &subset.fTexelDensity, sizeof(float));
-
-            int32 nFirstIndexId = 0;
-            int32 nNumIndices = 0;
-            int32 nFirstVertId = 0;
-            int32 nNumVerts = 0;
-            int32 nMatID = 0;
-            int32 nMatFlags = 0;
-            int32 nPhysicalizeType = 0;
-
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nFirstIndexId, sizeof(int32));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nNumIndices, sizeof(int32));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nFirstVertId, sizeof(int32));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nNumVerts, sizeof(int32));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nMatID, sizeof(int32));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nMatFlags, sizeof(int32));
-            nBufferPos = ReadFromBuffer(szBinaryStream, size, nBufferPos, &nPhysicalizeType, sizeof(int32));
-
-            pMesh->SetSubsetBounds(i, subset.vCenter, subset.fRadius);
-            pMesh->SetSubsetIndexVertexRanges(i, (int)nFirstIndexId, (int)nNumIndices, (int)nFirstVertId, (int)nNumVerts);
-            pMesh->SetSubsetMaterialId(i, nMatID == -1 ? 0 : (int)nMatID);
-            pMesh->SetSubsetMaterialProperties(i, (int)nMatFlags, (int)nPhysicalizeType, eVF_P3F_C4B_T2F);
-        }
-
-        if (nVersion == 0)
-        {
-#if defined(WIN32) || defined(WIN64)
-            pMesh->Optimize();
-#endif
-        }
-
-        statObjList[k]->Invalidate(true);
-    }
-
-    return pStatObj;
-}
-
-float C3DEngine::GetWaterLevel(const Vec3* pvPos, IPhysicalEntity* pent, bool bAccurate)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    if (!OceanGlobals::g_oceanParamsMutex.try_lock())
-    {
-        return OceanGlobals::g_oceanLevel;
-    }
-
-    bool bInVisarea = m_pVisAreaManager && m_pVisAreaManager->GetVisAreaFromPos(*pvPos) != 0;
-
-
-    AZ_UNUSED(pent);
-
-    float max_level = (!bInVisarea) ? (bAccurate ? GetAccurateOceanHeight(*pvPos) : GetWaterLevel()) : WATER_LEVEL_UNKNOWN;
-
-
-    OceanGlobals::g_oceanParamsMutex.unlock();
-    return max(WATER_LEVEL_UNKNOWN, max_level);
-}
-
-void C3DEngine::SetShadowsGSMCache(bool bCache)
-{
-    if (bCache)
-    {
-        m_nGsmCache = m_pConsole->GetCVar("r_ShadowsCache")->GetIVal();
-    }
-    else
-    {
-        m_nGsmCache = 0;
-    }
-}
-
-float C3DEngine::GetAccurateOceanHeight(const Vec3& pCurrPos) const
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    static int nFrameID = -1;
-    const int nEngineFrameID = GetRenderer()->GetFrameID();
-    static float fWaterLevel = 0;
-    if (nFrameID != nEngineFrameID && m_pOcean)
-    {
-        fWaterLevel = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : m_pOcean->GetWaterLevel();
-        nFrameID = nEngineFrameID;
-    }
-
-    const float waterLevel = fWaterLevel + COcean::GetWave(pCurrPos, GetRenderer()->GetFrameID());
-    return waterLevel;
-}
-
-I3DEngine::CausticsParams C3DEngine::GetCausticsParams() const
-{
-    I3DEngine::CausticsParams params;
-    if (OceanToggle::IsActive())
-    {
-        params.tiling = OceanRequest::GetCausticsTiling();
-        params.distanceAttenuation = OceanRequest::GetCausticsDistanceAttenuation();
-        params.depth = OceanRequest::GetCausticsDepth();
-        params.intensity = OceanRequest::GetCausticsIntensity();
-    }
-    else
-    {
-        params.tiling = m_oceanCausticsTiling;
-        params.distanceAttenuation = m_oceanCausticsDistanceAtten;
-        params.depth = m_oceanCausticDepth;
-        params.intensity = m_oceanCausticIntensity;
-    }
-    params.height = 0.0f; // @TODO: (@pruiksma) Parameter not currently accessible, need to decide whether to rip out or start using. [LY-62048]
-    return params;
-}
-
-void C3DEngine::GetHDRSetupParams(Vec4 pParams[5]) const
-{
-    float hdrBloomAmount;
-    GetPostEffectParam("Global_User_HDRBloom", hdrBloomAmount);
-    pParams[0] = m_vHDRFilmCurveParams;
-    pParams[1] = Vec4(hdrBloomAmount * 0.3f, hdrBloomAmount * 0.3f, hdrBloomAmount * 0.3f, m_fGrainAmount);
-    pParams[2] = Vec4(m_vColorBalance, m_fHDRSaturation);
-    pParams[3] = Vec4(m_vHDREyeAdaptation, 1.0f);
-    pParams[4] = Vec4(m_vHDREyeAdaptationLegacy, 1.0f);
-};
-
-
-I3DEngine::OceanAnimationData C3DEngine::GetOceanAnimationParams() const
-{
-    I3DEngine::OceanAnimationData data;
-    if (OceanToggle::IsActive())
-    {
-        data.fWavesAmount = OceanRequest::GetWavesAmount();
-        data.fWavesSize = OceanRequest::GetWavesSize();
-        data.fWavesSpeed = OceanRequest::GetWavesSpeed();
-        data.fWindDirection = OceanRequest::GetWindDirection();
-        data.fWindSpeed = OceanRequest::GetWindSpeed();
-    }
-    else
-    {
-        data.fWavesAmount = m_oceanWavesAmount;
-        data.fWavesSize = m_oceanWavesSize;
-        data.fWavesSpeed = m_oceanWavesSpeed;
-        data.fWindDirection = m_oceanWindDirection;
-        data.fWindSpeed = m_oceanWindSpeed;
-    }
-
-    sincos_tpl(data.fWindDirection, &data.fWindDirectionU, &data.fWindDirectionV);
-    return data;
-}
-
-IVisArea* C3DEngine::CreateVisArea(uint64 visGUID)
-{
-    return m_pObjManager ? m_pVisAreaManager->CreateVisArea(visGUID) : 0;
-}
-
-void C3DEngine::DeleteVisArea(IVisArea* pVisArea)
-{
-    if (!m_pVisAreaManager->IsValidVisAreaPointer((CVisArea*)pVisArea))
-    {
-        Warning("I3DEngine::DeleteVisArea: Invalid VisArea pointer");
-        return;
-    }
-    if (m_pObjManager)
-    {
-        CVisArea* pArea = (CVisArea*)pVisArea;
-
-        PodArray<SRNInfo> lstEntitiesInArea;
-        if (pArea->m_pObjectsTree)
-        {
-            pArea->m_pObjectsTree->MoveObjectsIntoList(&lstEntitiesInArea, NULL);
-        }
-
-        // unregister from indoor
-        for (int i = 0; i < lstEntitiesInArea.Count(); i++)
-        {
-            Get3DEngine()->UnRegisterEntityDirect(lstEntitiesInArea[i].pNode);
-        }
-
-        if (pArea->m_pObjectsTree)
-        {
-            assert(pArea->m_pObjectsTree->GetObjectsCount(eMain) == 0);
-        }
-
-        m_pVisAreaManager->DeleteVisArea((CVisArea*)pVisArea);
-
-        for (int i = 0; i < lstEntitiesInArea.Count(); i++)
-        {
-            Get3DEngine()->RegisterEntity(lstEntitiesInArea[i].pNode);
-        }
-    }
-}
-
-void C3DEngine::UpdateVisArea(IVisArea* pVisArea, const Vec3* pPoints, int nCount, const char* szName,
-    const SVisAreaInfo& info, bool bReregisterObjects)
-{
-    if (!m_pObjManager)
-    {
-        return;
-    }
-
-    CVisArea* pArea = (CVisArea*)pVisArea;
-
-    //  PrintMessage("C3DEngine::UpdateVisArea: %s", szName);
-
-    Vec3 vTotalBoxMin = pArea->m_boxArea.min;
-    Vec3 vTotalBoxMax = pArea->m_boxArea.max;
-
-    m_pVisAreaManager->UpdateVisArea((CVisArea*)pVisArea, pPoints, nCount, szName, info);
-
-    if (((CVisArea*)pVisArea)->m_pObjectsTree && ((CVisArea*)pVisArea)->m_pObjectsTree->GetObjectsCount(eMain))
-    {
-        // merge old and new bboxes
-        vTotalBoxMin.CheckMin(pArea->m_boxArea.min);
-        vTotalBoxMax.CheckMax(pArea->m_boxArea.max);
-    }
-    else
-    {
-        vTotalBoxMin = pArea->m_boxArea.min;
-        vTotalBoxMax = pArea->m_boxArea.max;
-    }
-
-    if (bReregisterObjects)
-    {
-        m_pObjManager->ReregisterEntitiesInArea(vTotalBoxMin - Vec3(8, 8, 8), vTotalBoxMax + Vec3(8, 8, 8));
-    }
-}
-
-IClipVolume* C3DEngine::CreateClipVolume()
-{
-    return m_pClipVolumeManager->CreateClipVolume();
-}
-
-void C3DEngine::DeleteClipVolume(IClipVolume* pClipVolume)
-{
-    m_pClipVolumeManager->DeleteClipVolume(pClipVolume);
-}
-
-void C3DEngine::UpdateClipVolume(IClipVolume* pClipVolume, _smart_ptr<IRenderMesh> pRenderMesh, IBSPTree3D* pBspTree, const Matrix34& worldTM, bool bActive, uint32 flags, const char* szName)
-{
-    m_pClipVolumeManager->UpdateClipVolume(pClipVolume, pRenderMesh, pBspTree, worldTM, bActive, flags, szName);
-}
-
-void C3DEngine::ResetParticlesAndDecals()
-{
-    if (m_pDecalManager)
-    {
-        m_pDecalManager->Reset();
-    }
-}
-
-IRenderNode* C3DEngine::CreateRenderNode(EERType type)
-{
-    switch (type)
-    {
-    case eERType_Cloud:
-    {
-        CCloudRenderNode* pCloud = new CCloudRenderNode();
-        return pCloud;
-    }
-    case eERType_FogVolume:
-    {
-        CFogVolumeRenderNode* pFogVolume = new CFogVolumeRenderNode();
-        return pFogVolume;
-    }
-    case eERType_Decal:
-    {
-        CDecalRenderNode* pDecal = new CDecalRenderNode();
-        return pDecal;
-    }
-    case eERType_WaterVolume:
-    {
-        CWaterVolumeRenderNode* pWaterVolume = new CWaterVolumeRenderNode();
-        return pWaterVolume;
-    }
-    case eERType_DistanceCloud:
-    {
-        CDistanceCloudRenderNode* pRenderNode = new CDistanceCloudRenderNode();
-        return pRenderNode;
-    }
-    case eERType_VolumeObject:
-    {
-        IVolumeObjectRenderNode* pRenderNode = new CVolumeObjectRenderNode();
-        return pRenderNode;
-    }
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-    case eERType_PrismObject:
-    {
-        IPrismRenderNode* pRenderNode = new CPrismRenderNode();
-        return pRenderNode;
-    }
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-#if defined(USE_GEOM_CACHES)
-    case eERType_GeomCache:
-    {
-        IRenderNode* pRenderNode = new CGeomCacheRenderNode();
-        return pRenderNode;
-    }
-#endif
-    }
-    assert(!"C3DEngine::CreateRenderNode: Specified node type is not supported.");
-    return 0;
-}
-
-void C3DEngine::DeleteRenderNode(IRenderNode* pRenderNode)
-{
-    UnRegisterEntityDirect(pRenderNode);
-    delete pRenderNode;
-}
-
-
-Vec3 C3DEngine::GetWind(const AABB& box, bool bIndoors) const
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-#if defined(CONSOLE_CONST_CVAR_MODE)
-    if constexpr (!CVars::e_Wind)
-#else
-    if (!m_pCVars->e_Wind)
-#endif
-    {
-        return Vec3_Zero;
-    }
-
-    // Start with global wind.
-    Vec3 vWind = GetGlobalWind(bIndoors);
-
-#if defined(CONSOLE_CONST_CVAR_MODE)
-    if constexpr (CVars::e_WindAreas)
-#else
-    if (m_pCVars->e_WindAreas)
-#endif
-    {
-        const Physics::WindRequests* windRequests = AZ::Interface<Physics::WindRequests>::Get();
-        if (windRequests)
-        {
-            const AZ::Aabb aabb = LyAABBToAZAabb(box);
-            const AZ::Vector3 wind = windRequests->GetWind(aabb);
-            vWind += AZVec3ToLYVec3(wind);
-        }
-    }
-
-    return vWind;
-}
-
-Vec3 C3DEngine::GetGlobalWind(bool bIndoors) const
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // We assume indoor wind is zero.
-    if (!m_pCVars->e_Wind || bIndoors)
-    {
-        return Vec3_Zero;
-    }
-
-    const Physics::WindRequests* windRequests = AZ::Interface<Physics::WindRequests>::Get();
-    if (windRequests)
-    {
-        const AZ::Vector3 wind = windRequests->GetGlobalWind();
-        return AZVec3ToLYVec3(wind);
-    }
-    return Vec3_Zero;
-}
-
-bool C3DEngine::SampleWind(Vec3* pSamples, int nSamples, const AABB& volume, bool bIndoors) const
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pCVars->e_Wind || nSamples == 0)
-    {
-        return false;
-    }
-
-    IF (m_nWindSamplePositions < (size_t)nSamples, 0)
-    {
-        if (m_pWindSamplePositions)
-        {
-            CryModuleMemalignFree(m_pWindSamplePositions);
-        }
-        m_nWindSamplePositions = nSamples;
-        m_pWindSamplePositions = (Vec3*)CryModuleMemalign(m_nWindSamplePositions * sizeof(Vec3), 128u);
-    }
-
-    Vec3* pPositions = m_pWindSamplePositions;
-    memcpy(pPositions, pSamples, sizeof(Vec3) * nSamples);
-
-    // Start with global wind.
-    Vec3 vWind = GetGlobalWind(bIndoors);
-
-    for (int i = 0; i < nSamples; ++i)
-    {
-        pSamples[i] = vWind;
-    }
-
-#if defined(CONSOLE_CONST_CVAR_MODE)
-    if constexpr (CVars::e_WindAreas)
-#else
-    if (m_pCVars->e_WindAreas)
-#endif
-    {
-        const Physics::WindRequests* windRequests = AZ::Interface<Physics::WindRequests>::Get();
-        if (windRequests)
-        {
-            for (int i = 0; i < nSamples; ++i)
-            {
-                const AZ::Vector3 position = LYVec3ToAZVec3(pPositions[i]);
-                const AZ::Vector3 wind = windRequests->GetWind(position);
-                pSamples[i] += AZVec3ToLYVec3(wind);
-            }
-        }
-    }
-    AZ_UNUSED(volume);
-    return true;
-}
-
-void C3DEngine::SetupBending(CRenderObject*& pObj, const IRenderNode* pNode, const float fRadiusVert, const SRenderingPassInfo& passInfo, bool alreadyDuplicated)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    if (!GetCVars()->e_VegetationBending)
-    {
-        return;
-    }
-
-    if (!pNode->m_pRNTmpData)
-    {
-        return;
-    }
-
-    // Get/Update PhysAreaChanged Proxy
-    {
-        // Lock to avoid a situation where two threads simultaneously find that nProxId is ~0,
-        // which would result in two physics proxies for the same render node which eventually leads to a crash
-        AUTO_LOCK(m_PhysicsAreaUpdates.m_Mutex);
-        const uint32 nProxyId = pNode->m_pRNTmpData->nPhysAreaChangedProxyId;
-        if (nProxyId != ~0)
-        {
-            m_PhysicsAreaUpdates.UpdateProxy(pNode, nProxyId);
-        }
-        else
-        {
-            pNode->m_pRNTmpData->nPhysAreaChangedProxyId = m_PhysicsAreaUpdates.CreateProxy(pNode, Area_Air);
-        }
-    }
-
-    CRNTmpData::SRNUserData& userData = pNode->m_pRNTmpData->userData;
-    const bool needsUpdate = userData.nBendingLastFrame != (passInfo.GetMainFrameID() & ~(3 << 29));
-    const bool isFirstFrame = userData.nBendingLastFrame == 0;
-
-    const Vec3& vObjPos = pObj->GetTranslation();
-    const float fMaxViewDist = const_cast<IRenderNode*>(pNode)->GetMaxViewDist();
-    const float fBendingAttenuation = 1.f - (pObj->m_fDistance / (fMaxViewDist * GetFloatCVar(e_WindBendingDistRatio)));
-    uint32 bendingMaskOr = 0u;
-    uint32 bendingMaskAnd = ~FOB_BENDED;
-
-    if (fBendingAttenuation > 0.f && userData.m_Bending.m_fMainBendingScale > 0.f)
-    {
-        bendingMaskOr = FOB_BENDED;
-        bendingMaskAnd = ~0u;
-
-        userData.m_BendingPrev = userData.m_Bending;
-
-        if (needsUpdate)
-        {
-            userData.nBendingLastFrame = passInfo.GetMainFrameID();
-
-            static const float fBEND_RESPONSE = 0.25f;
-            static const float fMAX_BENDING = 2.f;
-            static const float fWAVE_PARALLEL = 0.008f;
-            static const float fWAVE_TRANSVERSE = 0.002f;
-
-            if (!userData.bWindCurrent)
-            {
-                userData.vCurrentWind = m_p3DEngine->GetWind(pNode->GetBBox(), !!pNode->GetEntityVisArea());
-                userData.bWindCurrent = true;
-            }
-
-            // Soft clamp bending from wind amplitude.
-            Vec2 vBending = Vec2(userData.vCurrentWind) * fBEND_RESPONSE;
-            vBending *= fMAX_BENDING / (fMAX_BENDING + vBending.GetLength());
-            vBending *= fBendingAttenuation;
-
-            SBending* pBending = &userData.m_Bending;
-
-            float fWaveFreq = 0.4f / (fRadiusVert + 1.f) + 0.2f;
-
-            if (!userData.bBendingSet)
-            {
-                // First time shown, set full bending.
-                pBending->m_vBending = vBending;
-                userData.bBendingSet = true;
-            }
-            else
-            {
-                // Already visible, fade toward current value.
-                float fInterp = min(gEnv->pTimer->GetFrameTime() * fWaveFreq * 0.5f, 1.f);
-                pBending->m_vBending += (vBending - pBending->m_vBending) * fInterp;
-            }
-
-            pBending->m_Waves[0].m_Level  = 0.000f;
-            pBending->m_Waves[0].m_Freq   = fWaveFreq;
-            pBending->m_Waves[0].m_Phase  = vObjPos.x * 0.125f;
-            pBending->m_Waves[0].m_Amp    = pBending->m_vBending.x * fWAVE_PARALLEL + pBending->m_vBending.y * fWAVE_TRANSVERSE;
-            pBending->m_Waves[0].m_eWFType = eWF_Sin;
-
-            pBending->m_Waves[1].m_Level  = 0.000f;
-            pBending->m_Waves[1].m_Freq   = fWaveFreq * 1.125f;
-            pBending->m_Waves[1].m_Phase  = vObjPos.y * 0.125f;
-            pBending->m_Waves[1].m_Amp    = pBending->m_vBending.y * fWAVE_PARALLEL - pBending->m_vBending.x * fWAVE_TRANSVERSE;
-            pBending->m_Waves[1].m_eWFType = eWF_Sin;
-        }
-
-        // When starting fresh, we use the same bend info for previous so
-        // that we don't get crazy motion changes.
-        if (isFirstFrame)
-        {
-            userData.m_BendingPrev = userData.m_Bending;
-        }
-    }
-
-    if (!alreadyDuplicated)
-    {
-        pObj = GetRenderer()->EF_DuplicateRO(pObj, passInfo);
-    }
-    SRenderObjData* pOD = GetRenderer()->EF_GetObjData(pObj, true, passInfo.ThreadID());
-    if (!pOD)
-    {
-        return;
-    }
-
-    pObj->m_ObjFlags |= bendingMaskOr | FOB_DYNAMIC_OBJECT | FOB_MOTION_BLUR;
-    pObj->m_ObjFlags &= bendingMaskAnd;
-    pOD->m_pBending = Get3DEngine()->GetBendingEntry(&userData.m_Bending, passInfo);
-    pOD->m_BendingPrev = Get3DEngine()->GetBendingEntry(&userData.m_BendingPrev, passInfo);
-}
-
-IVisArea* C3DEngine::GetVisAreaFromPos(const Vec3& vPos)
-{
-    if (m_pObjManager && m_pVisAreaManager)
-    {
-        return m_pVisAreaManager->GetVisAreaFromPos(vPos);
-    }
-
-    return 0;
-}
-
-bool C3DEngine::IntersectsVisAreas(const AABB& box, void** pNodeCache)
-{
-    if (m_pObjManager && m_pVisAreaManager)
-    {
-        return m_pVisAreaManager->IntersectsVisAreas(box, pNodeCache);
-    }
-    return false;
-}
-
-bool C3DEngine::ClipToVisAreas(IVisArea* pInside, Sphere& sphere, Vec3 const& vNormal, void* pNodeCache)
-{
-    if (pInside)
-    {
-        return pInside->ClipToVisArea(true, sphere, vNormal);
-    }
-    else if (m_pVisAreaManager)
-    {
-        return m_pVisAreaManager->ClipOutsideVisAreas(sphere, vNormal, pNodeCache);
-    }
-    return false;
-}
-
-bool C3DEngine::IsVisAreasConnected(IVisArea* pArea1, IVisArea* pArea2, int nMaxRecursion, bool bSkipDisabledPortals)
-{
-    if (pArea1 == pArea2)
-    {
-        return (true);  // includes the case when both pArea1 & pArea2 are NULL (totally outside)
-    }
-    // not considered by the other checks
-    if (!pArea1 || !pArea2)
-    {
-        return (false); // avoid a crash - better to put this check only
-    }
-    // here in one place than in all the places where this function is called
-
-    nMaxRecursion *= 2; // include portals since portals are the areas
-
-    if (m_pObjManager && m_pVisAreaManager)
-    {
-        return ((CVisArea*)pArea1)->FindVisArea((CVisArea*)pArea2, nMaxRecursion, bSkipDisabledPortals);
-    }
-
-    return false;
-}
-
-bool C3DEngine::IsOutdoorVisible()
-{
-    if (m_pObjManager && m_pVisAreaManager)
-    {
-        return m_pVisAreaManager->IsOutdoorAreasVisible();
-    }
-
-    return false;
-}
-
-void C3DEngine::EnableOceanRendering(bool bOcean)
-{
-    m_bOcean = bOcean;
-}
-
-IObjManager* C3DEngine::GetObjManager()
-{
-    return Cry3DEngineBase::GetObjManager();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IMaterialHelpers& C3DEngine::GetMaterialHelpers()
-{
-    return Cry3DEngineBase::GetMatMan()->s_materialHelpers;
-}
-
-IMaterialManager* C3DEngine::GetMaterialManager()
-{
-    return Cry3DEngineBase::GetMatMan();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::AddTextureLoadHandler(ITextureLoadHandler* pHandler)
-{
-    stl::push_back_unique(m_textureLoadHandlers, pHandler);
-}
-
-void C3DEngine::RemoveTextureLoadHandler(ITextureLoadHandler* pHandler)
-{
-    stl::find_and_erase(m_textureLoadHandlers, pHandler);
-}
-
-ITextureLoadHandler* C3DEngine::GetTextureLoadHandlerForImage(const char* path)
-{
-    const char* ext = PathUtil::GetExt(path);
-
-    for (TTextureLoadHandlers::iterator iter = m_textureLoadHandlers.begin(); iter != m_textureLoadHandlers.end(); iter++)
-    {
-        if ((*iter)->SupportsExtension(ext))
-        {
-            return *iter;
-        }
-    }
-
-    return nullptr;
-}
-
-void C3DEngine::CheckMemoryHeap()
-{
-    assert (CryMemory::IsHeapValid());
-}
-
-//////////////////////////////////////////////////////////////////////////
-int C3DEngine::GetLoadedObjectCount()
-{
-    int nObjectsLoaded = m_pObjManager ? m_pObjManager->GetLoadedObjectCount() : 0;
-    return nObjectsLoaded;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::GetLoadedStatObjArray(IStatObj** pObjectsArray, int& nCount)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->GetLoadedStatObjArray(pObjectsArray, nCount);
-    }
-    else
-    {
-        nCount = 0;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::GetObjectsStreamingStatus(SObjectsStreamingStatus& outStatus)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->GetObjectsStreamingStatus(outStatus);
-    }
-    else
-    {
-        memset(&outStatus, 0, sizeof(outStatus));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::GetStreamingSubsystemData(int subsystem, SStremaingBandwidthData& outData)
-{
-    switch (subsystem)
-    {
-    case eStreamTaskTypeSound:
-        // Audio: bandwidth stats
-        break;
-    case eStreamTaskTypeGeometry:
-        m_pObjManager->GetBandwidthStats(&outData.fBandwidthRequested);
-        break;
-    case eStreamTaskTypeTexture:
-        gEnv->pRenderer->GetBandwidthStats(&outData.fBandwidthRequested);
-        break;
-    }
-
-#if defined(STREAMENGINE_ENABLE_STATS)
-    gEnv->pSystem->GetStreamEngine()->GetBandwidthStats((EStreamTaskType)subsystem, &outData.fBandwidthActual);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::DeleteEntityDecals(IRenderNode* pEntity)
-{
-    if (m_pDecalManager && pEntity && (pEntity->m_nInternalFlags & IRenderNode::DECAL_OWNER))
-    {
-        m_pDecalManager->OnEntityDeleted(pEntity);
-    }
-}
-
-void C3DEngine::DeleteDecalsInRange(AABB* pAreaBox, IRenderNode* pEntity)
-{
-    if (m_pDecalManager)
-    {
-        m_pDecalManager->DeleteDecalsInRange(pAreaBox, pEntity);
-    }
-}
-
-void C3DEngine::LockCGFResources()
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->SetLockCGFResources(true);
-    }
-}
-
-void C3DEngine::UnlockCGFResources()
-{
-    if (m_pObjManager)
-    {
-        bool bNeedToFreeCGFs = m_pObjManager->IsLockCGFResources();
-        m_pObjManager->SetLockCGFResources(false);
-        if (bNeedToFreeCGFs)
-        {
-            m_pObjManager->FreeNotUsedCGFs();
-        }
-    }
-}
-
-void C3DEngine::FreeUnusedCGFResources()
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->FreeNotUsedCGFs();
-    }
-}
-
-void CLightEntity::ShadowMapInfo::Release([[maybe_unused]] struct IRenderer* pRenderer)
-{
-    delete this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IIndexedMesh* C3DEngine::CreateIndexedMesh()
-{
-    return new CIndexedMesh();
-}
-
-void C3DEngine::SerializeState(TSerialize ser)
-{
-    ser.Value("m_bOcean", m_bOcean);
-    ser.Value("m_moonRotationLatitude", m_moonRotationLatitude);
-    ser.Value("m_moonRotationLongitude", m_moonRotationLongitude);
-    ser.Value("m_eShadowMode", *(alias_cast<int*>(&m_eShadowMode)));
-    if (ser.IsReading())
-    {
-        UpdateMoonDirection();
-    }
-
-    if (m_pDecalManager)
-    {
-        m_pDecalManager->Serialize(ser);
-    }
-
-    m_pTimeOfDay->Serialize(ser);
-}
-
-void C3DEngine::PostSerialize(bool /*bReading*/)
-{
-}
-
-void C3DEngine::InitMaterialDefautMappingAxis(_smart_ptr<IMaterial> pMat)
-{
-    uint8 arrProj[3] = {'X', 'Y', 'Z'};
-    pMat->m_ucDefautMappingAxis = 'Z';
-    pMat->m_fDefautMappingScale = 1.f;
-    for (int c = 0; c < 3 && c < pMat->GetSubMtlCount(); c++)
-    {
-        _smart_ptr<IMaterial> pSubMat = (_smart_ptr<IMaterial>)pMat->GetSubMtl(c);
-        pSubMat->m_ucDefautMappingAxis = arrProj[c];
-        pSubMat->m_fDefautMappingScale = pMat->m_fDefautMappingScale;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CContentCGF* C3DEngine::CreateChunkfileContent(const char* filename)
-{
-    return new CContentCGF(filename);
-}
-void C3DEngine::ReleaseChunkfileContent(CContentCGF* pCGF)
-{
-    delete pCGF;
-}
-
-bool C3DEngine::LoadChunkFileContent(CContentCGF* pCGF, const char* filename, bool bNoWarningMode, bool bCopyChunkFile)
-{
-    CLoadLogListener listener;
-
-    if (!pCGF)
-    {
-        FileWarning(0, filename, "CGF Loading Failed: no content instance passed");
-    }
-    else
-    {
-        CLoaderCGF cgf;
-
-        CReadOnlyChunkFile* pChunkFile = new CReadOnlyChunkFile(bCopyChunkFile, bNoWarningMode);
-
-        if (cgf.LoadCGF(pCGF, filename, *pChunkFile, &listener))
-        {
-            pCGF->SetChunkFile(pChunkFile);
-            return true;
-        }
-
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "%s: Failed to load chunk file: '%s'", __FUNCTION__, cgf.GetLastError());
-        delete pChunkFile;
-    }
-
-    return false;
-}
-
-bool C3DEngine::LoadChunkFileContentFromMem(CContentCGF* pCGF, const void* pData, size_t nDataLen, uint32 nLoadingFlags, bool bNoWarningMode, bool bCopyChunkFile)
-{
-    if (!pCGF)
-    {
-        FileWarning(0, "<memory>", "CGF Loading Failed: no content instance passed");
-    }
-    else
-    {
-        CLoadLogListener listener;
-
-        CLoaderCGF cgf;
-        CReadOnlyChunkFile* pChunkFile = new CReadOnlyChunkFile(bCopyChunkFile, bNoWarningMode);
-
-        if (cgf.LoadCGFFromMem(pCGF, pData, nDataLen, *pChunkFile, &listener, nLoadingFlags))
-        {
-            pCGF->SetChunkFile(pChunkFile);
-            return true;
-        }
-
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "%s: Failed to load chunk file: '%s'", __FUNCTION__, cgf.GetLastError());
-        delete pChunkFile;
-    }
-
-    return false;
-}
-
-IChunkFile* C3DEngine::CreateChunkFile(bool bReadOnly)
-{
-    if (bReadOnly)
-    {
-        return new CReadOnlyChunkFile(false);
-    }
-    else
-    {
-        return new CChunkFile;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-ChunkFile::IChunkFileWriter* C3DEngine::CreateChunkFileWriter(EChunkFileFormat eFormat, AZ::IO::IArchive* pPak, const char* filename) const
-{
-    ChunkFile::CryPakFileWriter* const p = new ChunkFile::CryPakFileWriter();
-
-    if (!p)
-    {
-        return 0;
-    }
-
-    if (!p->Create(pPak, filename))
-    {
-        delete p;
-        return 0;
-    }
-
-    const ChunkFile::MemorylessChunkFileWriter::EChunkFileFormat fmt =
-        (eFormat == I3DEngine::eChunkFileFormat_0x745)
-        ? ChunkFile::MemorylessChunkFileWriter::eChunkFileFormat_0x745
-        : ChunkFile::MemorylessChunkFileWriter::eChunkFileFormat_0x746;
-
-    return new ChunkFile::MemorylessChunkFileWriter(fmt, p);
-}
-
-void C3DEngine::ReleaseChunkFileWriter(ChunkFile::IChunkFileWriter* p) const
-{
-    if (p)
-    {
-        delete p->GetWriter();
-        delete p;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-bool C3DEngine::CreateOcean(_smart_ptr<IMaterial> pTerrainWaterMat, float waterLevel)
-{
-    // make ocean surface
-    SAFE_DELETE(m_pOcean);
-
-    if (pTerrainWaterMat == nullptr)
-    {
-        if (!m_pTerrainWaterMat)
-        {
-            return false;
-        }
-
-        pTerrainWaterMat = m_pTerrainWaterMat;
-    }
-
-    if (OceanToggle::IsActive() ? OceanRequest::OceanIsEnabled() : (waterLevel > 0))
-    {
-        m_pOcean = new COcean(pTerrainWaterMat, waterLevel);
-    }
-    return m_pOcean != nullptr;
-}
-
-void C3DEngine::DeleteOcean()
-{
-    SAFE_DELETE(m_pOcean);
-}
-
-void C3DEngine::ChangeOceanMaterial(_smart_ptr<IMaterial> pMat)
-{
-    if (m_pOcean)
-    {
-        m_pOcean->SetMaterial(pMat);
-    }
-}
-
-void C3DEngine::ChangeOceanWaterLevel(float fWaterLevel)
-{
-    COcean::SetWaterLevelInfo(fWaterLevel);
-
-    if (m_pOcean)
-    {
-        m_pOcean->SetWaterLevel(fWaterLevel);
-    }
-}
-
-void C3DEngine::SetStreamableListener(IStreamedObjectListener* pListener)
-{
-    m_pStreamListener = pListener;
-}
-
-void C3DEngine::PrecacheLevel(bool bPrecacheAllVisAreas, Vec3* pPrecachePoints, int nPrecachePointsNum)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (GetVisAreaManager())
-    {
-        GetVisAreaManager()->PrecacheLevel(bPrecacheAllVisAreas, pPrecachePoints, nPrecachePointsNum);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::SetGlobalParameter(E3DEngineParameter param, const Vec3& v)
-{
-    float fValue = v.x;
-    switch (param)
-    {
-    case E3DPARAM_SUN_COLOR:
-        SetSunColor(v);
-        break;
-
-    case E3DPARAM_SUN_SPECULAR_MULTIPLIER:
-        m_fSunSpecMult = v.x;
-        break;
-
-    case E3DPARAM_AMBIENT_GROUND_COLOR:
-        m_vAmbGroundCol = v;
-        break;
-    case E3DPARAM_AMBIENT_MIN_HEIGHT:
-        m_fAmbMaxHeight = v.x;
-        break;
-    case E3DPARAM_AMBIENT_MAX_HEIGHT:
-        m_fAmbMinHeight = v.x;
-        break;
-
-    case E3DPARAM_SKY_HIGHLIGHT_POS:
-        m_vSkyHightlightPos = v;
-        break;
-    case E3DPARAM_SKY_HIGHLIGHT_COLOR:
-        m_vSkyHightlightCol = v;
-        break;
-    case E3DPARAM_SKY_HIGHLIGHT_SIZE:
-        m_fSkyHighlightSize = fValue > 0.0f ? fValue : 0.0f;
-        break;
-    case E3DPARAM_VOLFOG_RAMP:
-        m_volFogRamp = v;
-        break;
-    case E3DPARAM_VOLFOG_SHADOW_RANGE:
-        m_volFogShadowRange = v;
-        break;
-    case E3DPARAM_VOLFOG_SHADOW_DARKENING:
-        m_volFogShadowDarkening = v;
-        break;
-    case E3DPARAM_VOLFOG_SHADOW_ENABLE:
-        m_volFogShadowEnable = v;
-        break;
-    case E3DPARAM_VOLFOG2_CTRL_PARAMS:
-        m_volFog2CtrlParams = v;
-        break;
-    case E3DPARAM_VOLFOG2_SCATTERING_PARAMS:
-        m_volFog2ScatteringParams = v;
-        break;
-    case E3DPARAM_VOLFOG2_RAMP:
-        m_volFog2Ramp = v;
-        break;
-    case E3DPARAM_VOLFOG2_COLOR:
-        m_volFog2Color = v;
-        break;
-    case E3DPARAM_VOLFOG2_GLOBAL_DENSITY:
-        m_volFog2GlobalDensity = v;
-        break;
-    case E3DPARAM_VOLFOG2_HEIGHT_DENSITY:
-        m_volFog2HeightDensity = v;
-        break;
-    case E3DPARAM_VOLFOG2_HEIGHT_DENSITY2:
-        m_volFog2HeightDensity2 = v;
-        break;
-    case E3DPARAM_VOLFOG2_COLOR1:
-        m_volFog2Color1 = v;
-        break;
-    case E3DPARAM_VOLFOG2_COLOR2:
-        m_volFog2Color2 = v;
-        break;
-    case E3DPARAM_NIGHSKY_HORIZON_COLOR:
-        m_nightSkyHorizonCol = v;
-        break;
-    case E3DPARAM_NIGHSKY_ZENITH_COLOR:
-        m_nightSkyZenithCol = v;
-        break;
-    case E3DPARAM_NIGHSKY_ZENITH_SHIFT:
-        m_nightSkyZenithColShift = v.x;
-        break;
-    case E3DPARAM_NIGHSKY_STAR_INTENSITY:
-        m_nightSkyStarIntensity = v.x;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_COLOR:
-        m_nightMoonCol = v;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_SIZE:
-        m_nightMoonSize = v.x;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_INNERCORONA_COLOR:
-        m_nightMoonInnerCoronaCol = v;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_INNERCORONA_SCALE:
-        m_nightMoonInnerCoronaScale = v.x;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_OUTERCORONA_COLOR:
-        m_nightMoonOuterCoronaCol = v;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_OUTERCORONA_SCALE:
-        m_nightMoonOuterCoronaScale = v.x;
-        break;
-    case E3DPARAM_OCEANFOG_COLOR:
-        m_oceanFogColor = v;
-        break;
-    case E3DPARAM_OCEANFOG_DENSITY:
-        m_oceanFogDensity = v.x;
-        break;
-    case E3DPARAM_SKY_MOONROTATION:
-        m_moonRotationLatitude = v.x;
-        m_moonRotationLongitude = v.y;
-        UpdateMoonDirection();
-        break;
-    case E3DPARAM_SKYBOX_MULTIPLIER:
-        m_skyboxMultiplier = v.x;
-        break;
-    case E3DPARAM_DAY_NIGHT_INDICATOR:
-        m_dayNightIndicator = v.x;
-        // Audio: Set daylight parameter
-        break;
-    case E3DPARAM_FOG_COLOR2:
-        m_fogColor2 = v;
-        break;
-    case E3DPARAM_FOG_RADIAL_COLOR:
-        m_fogColorRadial = v;
-        break;
-    case E3DPARAM_VOLFOG_HEIGHT_DENSITY:
-        m_volFogHeightDensity = Vec3(v.x, v.y, 0);
-        break;
-    case E3DPARAM_VOLFOG_HEIGHT_DENSITY2:
-        m_volFogHeightDensity2 = Vec3(v.x, v.y, 0);
-        break;
-    case E3DPARAM_VOLFOG_GRADIENT_CTRL:
-        m_volFogGradientCtrl = v;
-        break;
-    case E3DPARAM_VOLFOG_GLOBAL_DENSITY:
-        m_volFogGlobalDensity = v.x;
-        m_volFogFinalDensityClamp = v.z;
-        break;
-    case E3DPARAM_COLORGRADING_FILTERS_PHOTOFILTER_COLOR:
-        m_pPhotoFilterColor = Vec4(v.x, v.y, v.z, 1);
-        GetPostEffectBaseGroup()->SetParam("clr_ColorGrading_PhotoFilterColor", m_pPhotoFilterColor);
-        break;
-    case E3DPARAM_COLORGRADING_FILTERS_PHOTOFILTER_DENSITY:
-        m_fPhotoFilterColorDensity = fValue;
-        GetPostEffectBaseGroup()->SetParam("ColorGrading_PhotoFilterColorDensity", m_fPhotoFilterColorDensity);
-        break;
-    case E3DPARAM_COLORGRADING_FILTERS_GRAIN:
-        m_fGrainAmount = fValue;
-        GetPostEffectBaseGroup()->SetParam("ColorGrading_GrainAmount", m_fGrainAmount);
-        break;
-    case E3DPARAM_SKY_SKYBOX_ANGLE: // sky box rotation
-        m_fSkyBoxAngle = fValue;
-        break;
-    case E3DPARAM_SKY_SKYBOX_STRETCHING: // sky box stretching
-        m_fSkyBoxStretching = fValue;
-        break;
-    case E3DPARAM_HDR_FILMCURVE_SHOULDER_SCALE:
-        m_vHDRFilmCurveParams.x = v.x;
-        break;
-    case E3DPARAM_HDR_FILMCURVE_LINEAR_SCALE:
-        m_vHDRFilmCurveParams.y = v.x;
-        break;
-    case E3DPARAM_HDR_FILMCURVE_TOE_SCALE:
-        m_vHDRFilmCurveParams.z = v.x;
-        break;
-    case E3DPARAM_HDR_FILMCURVE_WHITEPOINT:
-        m_vHDRFilmCurveParams.w = v.x;
-        break;
-    case E3DPARAM_HDR_EYEADAPTATION_PARAMS:
-        m_vHDREyeAdaptation = v;
-        break;
-    case E3DPARAM_HDR_EYEADAPTATION_PARAMS_LEGACY:
-        m_vHDREyeAdaptationLegacy = v;
-        break;
-    case E3DPARAM_HDR_BLOOM_AMOUNT:
-        m_fHDRBloomAmount = v.x;
-        break;
-    case E3DPARAM_HDR_COLORGRADING_COLOR_SATURATION:
-        m_fHDRSaturation = v.x;
-        break;
-    case E3DPARAM_HDR_COLORGRADING_COLOR_BALANCE:
-        m_vColorBalance = v;
-        break;
-    case E3DPARAM_CLOUDSHADING_MULTIPLIERS:
-        m_fCloudShadingSunLightMultiplier = (v.x >= 0) ? v.x : 0;
-        m_fCloudShadingSkyLightMultiplier = (v.y >= 0) ? v.y : 0;
-        break;
-    case E3DPARAM_CLOUDSHADING_SUNCOLOR:
-        m_vCloudShadingCustomSunColor = v;
-        break;
-    case E3DPARAM_CLOUDSHADING_SKYCOLOR:
-        m_vCloudShadingCustomSkyColor = v;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_DIRECTION: // moon direction is fixed per level or updated via FG node (E3DPARAM_SKY_MOONROTATION)
-    default:
-        assert(0);
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::GetGlobalParameter(E3DEngineParameter param, Vec3& v)
-{
-    switch (param)
-    {
-    case E3DPARAM_SUN_COLOR:
-        v = GetSunColor();
-        break;
-
-    case E3DPARAM_SUN_SPECULAR_MULTIPLIER:
-        v = Vec3(m_fSunSpecMult, 0, 0);
-        break;
-
-    case E3DPARAM_AMBIENT_GROUND_COLOR:
-        v = m_vAmbGroundCol;
-        break;
-    case E3DPARAM_AMBIENT_MIN_HEIGHT:
-        v = Vec3(m_fAmbMaxHeight, 0, 0);
-        break;
-    case E3DPARAM_AMBIENT_MAX_HEIGHT:
-        v = Vec3(m_fAmbMinHeight, 0, 0);
-        break;
-    case E3DPARAM_SKY_HIGHLIGHT_POS:
-        v = m_vSkyHightlightPos;
-        break;
-    case E3DPARAM_SKY_HIGHLIGHT_COLOR:
-        v = m_vSkyHightlightCol;
-        break;
-    case E3DPARAM_SKY_HIGHLIGHT_SIZE:
-        v = Vec3(m_fSkyHighlightSize, 0, 0);
-        break;
-    case E3DPARAM_VOLFOG_RAMP:
-        v = m_volFogRamp;
-        break;
-    case E3DPARAM_VOLFOG_SHADOW_RANGE:
-        v = m_volFogShadowRange;
-        break;
-    case E3DPARAM_VOLFOG_SHADOW_DARKENING:
-        v = m_volFogShadowDarkening;
-        break;
-    case E3DPARAM_VOLFOG_SHADOW_ENABLE:
-        v = m_volFogShadowEnable;
-        break;
-    case E3DPARAM_VOLFOG2_CTRL_PARAMS:
-        v = m_volFog2CtrlParams;
-        break;
-    case E3DPARAM_VOLFOG2_SCATTERING_PARAMS:
-        v = m_volFog2ScatteringParams;
-        break;
-    case E3DPARAM_VOLFOG2_RAMP:
-        v = m_volFog2Ramp;
-        break;
-    case E3DPARAM_VOLFOG2_COLOR:
-        v = m_volFog2Color;
-        break;
-    case E3DPARAM_VOLFOG2_GLOBAL_DENSITY:
-        v = m_volFog2GlobalDensity;
-        break;
-    case E3DPARAM_VOLFOG2_HEIGHT_DENSITY:
-        v = m_volFog2HeightDensity;
-        break;
-    case E3DPARAM_VOLFOG2_HEIGHT_DENSITY2:
-        v = m_volFog2HeightDensity2;
-        break;
-    case E3DPARAM_VOLFOG2_COLOR1:
-        v = m_volFog2Color1;
-        break;
-    case E3DPARAM_VOLFOG2_COLOR2:
-        v = m_volFog2Color2;
-        break;
-    case E3DPARAM_NIGHSKY_HORIZON_COLOR:
-        v = m_nightSkyHorizonCol;
-        break;
-    case E3DPARAM_NIGHSKY_ZENITH_COLOR:
-        v = m_nightSkyZenithCol;
-        break;
-    case E3DPARAM_NIGHSKY_ZENITH_SHIFT:
-        v = Vec3(m_nightSkyZenithColShift, 0, 0);
-        break;
-    case E3DPARAM_NIGHSKY_STAR_INTENSITY:
-        v = Vec3(m_nightSkyStarIntensity, 0, 0);
-        break;
-    case E3DPARAM_NIGHSKY_MOON_DIRECTION:
-        v = m_moonDirection;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_COLOR:
-        v = m_nightMoonCol;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_SIZE:
-        v = Vec3(m_nightMoonSize, 0, 0);
-        break;
-    case E3DPARAM_NIGHSKY_MOON_INNERCORONA_COLOR:
-        v = m_nightMoonInnerCoronaCol;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_INNERCORONA_SCALE:
-        v = Vec3(m_nightMoonInnerCoronaScale, 0, 0);
-        break;
-    case E3DPARAM_NIGHSKY_MOON_OUTERCORONA_COLOR:
-        v = m_nightMoonOuterCoronaCol;
-        break;
-    case E3DPARAM_NIGHSKY_MOON_OUTERCORONA_SCALE:
-        v = Vec3(m_nightMoonOuterCoronaScale, 0, 0);
-        break;
-    case E3DPARAM_SKY_MOONROTATION:
-        v = Vec3(m_moonRotationLatitude, m_moonRotationLongitude, 0);
-        break;
-    case E3DPARAM_OCEANFOG_COLOR:
-        v = m_oceanFogColor;
-        break;
-    case E3DPARAM_OCEANFOG_DENSITY:
-        v = Vec3(m_oceanFogDensity, 0, 0);
-        break;
-    case E3DPARAM_SKYBOX_MULTIPLIER:
-        v = Vec3(m_skyboxMultiplier, 0, 0);
-        break;
-    case E3DPARAM_DAY_NIGHT_INDICATOR:
-        v = Vec3(m_dayNightIndicator, 0, 0);
-        break;
-    case E3DPARAM_FOG_COLOR2:
-        v = m_fogColor2;
-        break;
-    case E3DPARAM_FOG_RADIAL_COLOR:
-        v = m_fogColorRadial;
-        break;
-    case E3DPARAM_VOLFOG_HEIGHT_DENSITY:
-        v = m_volFogHeightDensity;
-        break;
-    case E3DPARAM_VOLFOG_HEIGHT_DENSITY2:
-        v = m_volFogHeightDensity2;
-        break;
-    case E3DPARAM_VOLFOG_GRADIENT_CTRL:
-        v = m_volFogGradientCtrl;
-        break;
-    case E3DPARAM_VOLFOG_GLOBAL_DENSITY:
-        v = Vec3(m_volFogGlobalDensity, m_volFogGlobalDensityMultiplierLDR, m_volFogFinalDensityClamp);
-        break;
-    case E3DPARAM_COLORGRADING_FILTERS_PHOTOFILTER_COLOR:
-        v = Vec3(m_pPhotoFilterColor.x, m_pPhotoFilterColor.y, m_pPhotoFilterColor.z);
-        break;
-    case E3DPARAM_COLORGRADING_FILTERS_PHOTOFILTER_DENSITY:
-        v = Vec3(m_fPhotoFilterColorDensity, 0, 0);
-        break;
-    case E3DPARAM_COLORGRADING_FILTERS_GRAIN:
-        v = Vec3(m_fGrainAmount, 0, 0);
-        break;
-    case E3DPARAM_HDR_FILMCURVE_SHOULDER_SCALE:
-        v = Vec3(m_vHDRFilmCurveParams.x, 0, 0);
-        break;
-    case E3DPARAM_HDR_FILMCURVE_LINEAR_SCALE:
-        v = Vec3(m_vHDRFilmCurveParams.y, 0, 0);
-        break;
-    case E3DPARAM_HDR_FILMCURVE_TOE_SCALE:
-        v = Vec3(m_vHDRFilmCurveParams.z, 0, 0);
-        break;
-    case E3DPARAM_HDR_FILMCURVE_WHITEPOINT:
-        v = Vec3(m_vHDRFilmCurveParams.w, 0, 0);
-        break;
-    case E3DPARAM_HDR_EYEADAPTATION_PARAMS:
-        v = m_vHDREyeAdaptation;
-        break;
-    case E3DPARAM_HDR_EYEADAPTATION_PARAMS_LEGACY:
-        v = m_vHDREyeAdaptationLegacy;
-        break;
-    case E3DPARAM_HDR_BLOOM_AMOUNT:
-        v = Vec3(m_fHDRBloomAmount, 0, 0);
-        break;
-    case E3DPARAM_HDR_COLORGRADING_COLOR_SATURATION:
-        v = Vec3(m_fHDRSaturation, 0, 0);
-        break;
-    case E3DPARAM_HDR_COLORGRADING_COLOR_BALANCE:
-        v = m_vColorBalance;
-        break;
-    case E3DPARAM_CLOUDSHADING_MULTIPLIERS:
-        v = Vec3(m_fCloudShadingSunLightMultiplier, m_fCloudShadingSkyLightMultiplier, 0);
-        break;
-    case E3DPARAM_CLOUDSHADING_SUNCOLOR:
-        v = m_vCloudShadingCustomSunColor;
-        break;
-    case E3DPARAM_CLOUDSHADING_SKYCOLOR:
-        v = m_vCloudShadingCustomSkyColor;
-        break;
-    default:
-        assert(0);
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void C3DEngine::SetCachedShadowBounds(const AABB& shadowBounds, float fAdditionalCascadesScale)
-{
-    const Vec3 boxSize = shadowBounds.GetSize();
-    const bool isValid = boxSize.x > 0 && boxSize.y > 0 && boxSize.z > 0;
-
-    m_CachedShadowsBounds = isValid ? shadowBounds : AABB(AABB::RESET);
-    m_fCachedShadowsCascadeScale = fAdditionalCascadesScale;
-
-    m_nCachedShadowsUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eFullUpdate;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void C3DEngine::SetRecomputeCachedShadows(uint nUpdateStrategy)
-{
-    m_nCachedShadowsUpdateStrategy = nUpdateStrategy;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::SetShadowsCascadesBias(const float* pCascadeConstBias, const float* pCascadeSlopeBias)
-{
-    memcpy(m_pShadowCascadeConstBias, pCascadeConstBias, sizeof(float) * MAX_SHADOW_CASCADES_NUM);
-    memcpy(m_pShadowCascadeSlopeBias, pCascadeSlopeBias, sizeof(float) * MAX_SHADOW_CASCADES_NUM);
-}
-
-int C3DEngine::GetShadowsCascadeCount([[maybe_unused]] const CDLight* pLight) const
-{
-    int nCascadeCount = m_eShadowMode == ESM_HIGHQUALITY ? MAX_GSM_LODS_NUM : GetCVars()->e_GsmLodsNum;
-    return clamp_tpl(nCascadeCount, 0, MAX_GSM_LODS_NUM);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool C3DEngine::CheckIntersectClouds(const Vec3& p1, const Vec3& p2)
-{
-    return m_pCloudsManager->CheckIntersectClouds(p1, p2);
-}
-
-void C3DEngine::OnRenderMeshDeleted(IRenderMesh* pRenderMesh)
-{
-    if (m_pDecalManager)
-    {
-        m_pDecalManager->OnRenderMeshDeleted(pRenderMesh);
-    }
-}
-
-bool C3DEngine::RayObjectsIntersection2D([[maybe_unused]] Vec3 vStart, [[maybe_unused]] Vec3 vEnd, [[maybe_unused]] Vec3& vHitPoint, [[maybe_unused]] EERType eERType)
-{
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-
-    float fClosestHitDistance = 1000000;
-
-    AABB aabb;
-    aabb.Reset();
-    aabb.Add(vStart);
-    aabb.Add(vEnd);
-    if (IsObjectTreeReady())
-    {
-        if (Overlap::AABB_AABB2D(aabb, m_pObjectsTree->GetNodeBox())) //!!!mpeykov: 2D?
-        {
-            m_pObjectsTree->RayObjectsIntersection2D(vStart, vEnd, vHitPoint, fClosestHitDistance, eERType);
-        }
-    }
-
-    return (fClosestHitDistance < 1000000);
-
-#else
-
-    assert(!"C3DEngine::RayObjectsIntersection2D not supported on consoles");
-    return 0;
-
-#endif
-}
-
-bool C3DEngine::RenderMeshRayIntersection(IRenderMesh* pRenderMesh, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl)
-{
-    return CRenderMeshUtils::RayIntersection(pRenderMesh, hitInfo, pCustomMtl);
-}
-
-static SBending sBendRemoved;
-
-void C3DEngine::FreeRNTmpData(CRNTmpData** ppInfo)
-{
-    AUTO_LOCK(m_checkCreateRNTmpData);
-
-    CRNTmpData* pTmpRNTData = (*ppInfo);
-
-    assert(pTmpRNTData->pNext != &m_LTPRootFree);
-    assert(pTmpRNTData->pPrev != &m_LTPRootFree);
-    assert(pTmpRNTData != &m_LTPRootUsed);
-    if (gEnv->mMainThreadId != CryGetCurrentThreadId())
-    {
-        CryFatalError("CRNTmpData should only be allocated and free'd on main thread.");
-    }
-
-    if (pTmpRNTData != &m_LTPRootUsed)
-    {
-        pTmpRNTData->Unlink();
-    }
-
-    // Mark for phys area changed proxy for deletion
-    if (pTmpRNTData->nPhysAreaChangedProxyId != ~0)
-    {
-        m_PhysicsAreaUpdates.ResetProxy(pTmpRNTData->nPhysAreaChangedProxyId);
-        pTmpRNTData->nPhysAreaChangedProxyId = ~0;
-    }
-
-    if (pTmpRNTData->nFrameInfoId != ~0)
-    {
-        m_elementFrameInfo[pTmpRNTData->nFrameInfoId].Reset();
-        pTmpRNTData->nFrameInfoId = ~0;
-    }
-
-    {
-#ifdef SUPP_HWOBJ_OCCL
-        if (pTmpRNTData->userData.m_OcclState.pREOcclusionQuery)
-        {
-            pTmpRNTData->userData.m_OcclState.pREOcclusionQuery->Release(false);
-            pTmpRNTData->userData.m_OcclState.pREOcclusionQuery = NULL;
-        }
-#endif
-    }
-
-    if (pTmpRNTData != &m_LTPRootUsed)
-    {
-        pTmpRNTData->Link(&m_LTPRootFree);
-        *(pTmpRNTData->pOwnerRef) = NULL;
-    }
-}
-
-void C3DEngine::UpdateRNTmpDataPool(bool bFreeAll)
-{
-    // if we are freeing the whole pool, make sure no jobs are still running which could use the RNTmpObjects
-    if (bFreeAll)
-    {
-        threadID nThreadID;
-        gEnv->pRenderer->EF_Query(EFQ_MainThreadList, nThreadID);
-        gEnv->pRenderer->GetFinalizeRendItemJobExecutor(nThreadID)->WaitForCompletion();
-        gEnv->pRenderer->GetFinalizeShadowRendItemJobExecutor(nThreadID)->WaitForCompletion();
-    }
-    //CryLogAlways("UpdateRNTmpDataPool bFreeAll 0x%x nMainFrameID 0X%x", bFreeAll, nMainFrameID );
-    FUNCTION_PROFILER_3DENGINE;
-
-    // Ensure continues memory
-    m_elementFrameInfo.CoalesceMemory();
-
-    const uint32 nSize = m_elementFrameInfo.size();
-    if (nSize == 0)
-    {
-        return;
-    }
-
-    const uint32 nMainFrameID = GetRenderer()->GetFrameID(false);
-    const uint32 nTmpDataMaxFrames = (uint32)GetCVars()->e_RNTmpDataPoolMaxFrames;
-
-    if (!bFreeAll && nMainFrameID >= nTmpDataMaxFrames)
-    {
-        const uint32 nLastValidFrame = nMainFrameID - nTmpDataMaxFrames;
-
-        uint32 nNumItemsToDelete = 0;
-
-        SFrameInfo* pFrontIter = &m_elementFrameInfo[0];
-        SFrameInfo* pBackIter = &m_elementFrameInfo[nSize - 1];
-        SFrameInfo* pHead = pFrontIter;
-
-        // Handle single element case
-        IF (nSize == 1, 0)
-        {
-            if (pFrontIter->bIsValid && pFrontIter->nLastUsedFrameId >= nLastValidFrame)
-            {
-                if (pFrontIter->bIsValid)
-                {
-                    FreeRNTmpData(pFrontIter->ppRNTmpData);
-                }
-
-                ++nNumItemsToDelete;
-            }
-        }
-
-        // Move invalid elements to back of array and free if timed out
-        while (pFrontIter < pBackIter)
-        {
-            while (pFrontIter->bIsValid && pFrontIter->nLastUsedFrameId >= nLastValidFrame && pFrontIter < pBackIter)
-            {
-                ++pFrontIter;
-            }                                                                                                                         // Find invalid element at front
-            while (!(pBackIter->bIsValid && pBackIter->nLastUsedFrameId >= nLastValidFrame) && pFrontIter < pBackIter)      // Find valid element at back
-            {
-                // Element timed out
-                if (pBackIter->bIsValid)
-                {
-                    FreeRNTmpData(pBackIter->ppRNTmpData);
-                    pBackIter->bIsValid = false;
-                }
-
-                --pBackIter;
-                ++nNumItemsToDelete;
-            }
-
-            if (pFrontIter < pBackIter)
-            {
-                // Element timed out
-                if (pFrontIter->bIsValid)
-                {
-                    FreeRNTmpData(pFrontIter->ppRNTmpData);
-                }
-
-                // Replace invalid front element with back element
-                // Note: No need to swap because we cut the data from the array at the end anyway
-                memcpy(pFrontIter, pBackIter, sizeof(SFrameInfo));
-                (*pFrontIter->ppRNTmpData)->nFrameInfoId = (uint32)(pFrontIter - pHead);
-
-                pBackIter->bIsValid = false; // safety
-                pBackIter->ppRNTmpData = 0;
-
-                --pBackIter;
-                ++pFrontIter;
-                ++nNumItemsToDelete;
-            }
-        }
-
-        assert(nSize == m_elementFrameInfo.size());
-        m_elementFrameInfo.resize(nSize - nNumItemsToDelete);
-    }
-    else if (bFreeAll) // Free all
-    {
-        SFrameInfo* pFrontIter = &m_elementFrameInfo[0];
-        SFrameInfo* pBackIter = &m_elementFrameInfo[nSize - 1];
-        ++pBackIter; // Point to element after last element in array
-
-        // Free all
-        while (pFrontIter != pBackIter)
-        {
-            // Element timed out
-            if (pFrontIter->bIsValid)
-            {
-                FreeRNTmpData(pFrontIter->ppRNTmpData);
-            }
-
-            ++pFrontIter;
-        }
-        m_elementFrameInfo.resize(0);
-    }
-}
-
-void C3DEngine::FreeRNTmpDataPool()
-{
-    // move all into m_LTPRootFree
-    UpdateRNTmpDataPool(true);
-
-    AUTO_LOCK(m_checkCreateRNTmpData);
-    if (gEnv->mMainThreadId != CryGetCurrentThreadId())
-    {
-        CryFatalError("CRNTmpData should only be allocated and free'd on main thread.");
-    }
-
-    // delete all elements of m_LTPRootFree
-    CRNTmpData* pNext = NULL;
-    for (CRNTmpData* pElem = m_LTPRootFree.pNext; pElem != &m_LTPRootFree; pElem = pNext)
-    {
-        pNext = pElem->pNext;
-        pElem->Unlink();
-        delete pElem;
-    }
-}
-
-void C3DEngine::CopyObjectsByType(EERType objType, const AABB* pBox, PodArray<IRenderNode*>* plstObjects, ObjectTreeQueryFilterCallback filterCallback)
-{
-    GetObjectsByTypeGlobal(*plstObjects, objType, pBox, filterCallback);
-
-    if (GetVisAreaManager())
-    {
-        GetVisAreaManager()->GetObjectsByType(*plstObjects, objType, pBox, filterCallback);
-    }
-}
-
-void C3DEngine::CopyObjects(const AABB* pBox, PodArray<IRenderNode*>* plstObjects)
-{
-    if (IsObjectTreeReady())
-    {
-        m_pObjectsTree->GetObjects(*plstObjects, pBox);
-    }
-
-    if (GetVisAreaManager())
-    {
-        GetVisAreaManager()->GetObjects(*plstObjects, pBox);
-    }
-}
-
-uint32 C3DEngine::GetObjectsByType(EERType objType, IRenderNode** pObjects)
-{
-    PodArray<IRenderNode*> lstObjects;
-    CopyObjectsByType(objType, NULL, &lstObjects);
-    if (pObjects && !lstObjects.IsEmpty())
-    {
-        memcpy(pObjects, &lstObjects[0], lstObjects.GetDataSize());
-    }
-    return lstObjects.Count();
-}
-
-uint32 C3DEngine::GetObjectsByTypeInBox(EERType objType, const AABB& bbox, IRenderNode** pObjects, ObjectTreeQueryFilterCallback filterCallback)
-{
-    PodArray<IRenderNode*> lstObjects;
-    CopyObjectsByType(objType, &bbox, &lstObjects, filterCallback);
-    if (pObjects && !lstObjects.IsEmpty())
-    {
-        memcpy(pObjects, &lstObjects[0], lstObjects.GetDataSize());
-    }
-    return lstObjects.Count();
-}
-
-void C3DEngine::GetObjectsByTypeInBox(EERType objType, const AABB& bbox, PodArray<IRenderNode*>* pLstObjects, ObjectTreeQueryFilterCallback filterCallback)
-{
-    CopyObjectsByType(objType, &bbox, pLstObjects, filterCallback);
-}
-
-uint32 C3DEngine::GetObjectsInBox(const AABB& bbox, IRenderNode** pObjects)
-{
-    PodArray<IRenderNode*> lstObjects;
-    CopyObjects(&bbox, &lstObjects);
-    if (pObjects && !lstObjects.IsEmpty())
-    {
-        memcpy(pObjects, &lstObjects[0], lstObjects.GetDataSize());
-    }
-    return lstObjects.Count();
-}
-
-uint32 C3DEngine::GetObjectsByFlags(uint dwFlags, IRenderNode** pObjects /* =0 */)
-{
-    PodArray<IRenderNode*> lstObjects;
-
-    if (Get3DEngine()->IsObjectTreeReady())
-    {
-        Get3DEngine()->GetObjectTree()->GetObjectsByFlags(dwFlags, lstObjects);
-    }
-
-    if (GetVisAreaManager())
-    {
-        GetVisAreaManager()->GetObjectsByFlags(dwFlags, lstObjects);
-    }
-
-    if (pObjects && !lstObjects.IsEmpty())
-    {
-        memcpy(pObjects, &lstObjects[0], lstObjects.GetDataSize());
-    }
-    return lstObjects.Count();
-}
-
-void C3DEngine::OnObjectModified([[maybe_unused]] IRenderNode* pRenderNode, uint dwFlags)
-{
-    if ((dwFlags & (ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS)) != 0)
-    {
-        SetRecomputeCachedShadows(ShadowMapFrustum::ShadowCacheData::eFullUpdate);
-    }
-}
-
-int SImageInfo::GetMemoryUsage()
-{
-    int nSize = 0;
-    if (detailInfo.pImgMips[0])
-    {
-        nSize += (int)((float)(detailInfo.nDim * detailInfo.nDim * sizeof(ColorB)) * 1.3f);
-    }
-    if (baseInfo.pImgMips[0])
-    {
-        nSize += (int)((float)(baseInfo.nDim * baseInfo.nDim * sizeof(ColorB)) * 1.3f);
-    }
-    return nSize;
-}
-
-byte** C3DEngine::AllocateMips(byte* pImage, int nDim, byte** pImageMips)
-{
-    memset(pImageMips, 0, SImageSubInfo::nMipsNum * sizeof(pImageMips[0]));
-
-    pImageMips[0] = new byte[nDim * nDim * sizeof(ColorB)];
-    memcpy(pImageMips[0], pImage, nDim * nDim * sizeof(ColorB));
-
-    ColorB* pMipMain = (ColorB*)pImageMips[0];
-
-    for (int nMip = 1; (nDim >> nMip) && nMip < SImageSubInfo::nMipsNum; nMip++)
-    {
-        int nDimMip = nDim >> nMip;
-
-        int nSubSize = 1 << nMip;
-
-        pImageMips[nMip] = new byte[nDimMip * nDimMip * sizeof(ColorB)];
-
-        ColorB* pMipThis = (ColorB*)pImageMips[nMip];
-
-        for (int x = 0; x < nDimMip; x++)
-        {
-            for (int y = 0; y < nDimMip; y++)
-            {
-                ColorF colSumm(0, 0, 0, 0);
-                float fCount = 0;
-                for (int _x = x * nSubSize - nSubSize / 2; _x < x * nSubSize + nSubSize + nSubSize / 2; _x++)
-                {
-                    for (int _y = y * nSubSize - nSubSize / 2; _y < y * nSubSize + nSubSize + nSubSize / 2; _y++)
-                    {
-                        int nMask = nDim - 1;
-                        int id = (_x & nMask) * nDim + (_y & nMask);
-                        colSumm.r += 1.f / 255.f * pMipMain[id].r;
-                        colSumm.g += 1.f / 255.f * pMipMain[id].g;
-                        colSumm.b += 1.f / 255.f * pMipMain[id].b;
-                        colSumm.a += 1.f / 255.f * pMipMain[id].a;
-                        fCount++;
-                    }
-                }
-
-                colSumm /= fCount;
-
-                colSumm.Clamp(0, 1);
-
-                pMipThis[x * nDimMip + y] = colSumm;
-            }
-        }
-    }
-
-    return pImageMips;
-}
-
-void C3DEngine::RegisterForStreaming(IStreamable* pObj)
-{
-    if (GetObjManager())
-    {
-        GetObjManager()->RegisterForStreaming(pObj);
-    }
-}
-
-void C3DEngine::UnregisterForStreaming(IStreamable* pObj)
-{
-    if (GetObjManager())
-    {
-        GetObjManager()->UnregisterForStreaming(pObj);
-    }
-}
-
-SImageSubInfo* C3DEngine::GetImageInfo(const char* pName)
-{
-    if (m_imageInfos.find(string(pName)) != m_imageInfos.end())
-    {
-        return m_imageInfos[string(pName)];
-    }
-
-    return NULL;
-}
-
-SImageSubInfo* C3DEngine::RegisterImageInfo(byte** pMips, int nDim, const char* pName)
-{
-    if (m_imageInfos.find(string(pName)) != m_imageInfos.end())
-    {
-        return m_imageInfos[string(pName)];
-    }
-
-    assert(pMips && pMips[0]);
-
-    SImageSubInfo* pImgSubInfo = new SImageSubInfo;
-
-    pImgSubInfo->nDim = nDim;
-
-    int nMipDim = pImgSubInfo->nDim;
-
-    for (int m = 0; m < SImageSubInfo::nMipsNum && nMipDim; m++)
-    {
-        pImgSubInfo->pImgMips[m] = new byte[nMipDim * nMipDim * 4];
-
-        memcpy(pImgSubInfo->pImgMips[m], pMips[m], nMipDim * nMipDim * 4);
-
-        nMipDim /= 2;
-    }
-
-    const string strFileName = pName;
-
-    pImgSubInfo->nReady = 1;
-
-    m_imageInfos[strFileName] = pImgSubInfo;
-
-    return pImgSubInfo;
-}
-
-void C3DEngine::SyncProcessStreamingUpdate()
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->ProcessObjectsStreaming_Finish();
-    }
-}
-
-void C3DEngine::SetScreenshotCallback(IScreenshotCallback* pCallback)
-{
-    m_pScreenshotCallback = pCallback;
-}
-
-void C3DEngine::ActivateObjectsLayer(uint16 nLayerId, bool bActivate, bool bPhys, bool bObjects, bool bStaticLights, const char* pLayerName, IGeneralMemoryHeap* pHeap, bool bCheckLayerActivation /*=true*/)
-{
-    if (bCheckLayerActivation && !IsAreaActivationInUse())
-    {
-        return;
-    }
-
-    if (bActivate)
-    {
-        m_bLayersActivated = true;
-    }
-
-    if (bActivate && m_nFramesSinceLevelStart <= 1)
-    {
-        m_vPrevMainFrameCamPos.Set(-1000000.f, -1000000.f, -1000000.f);
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    PrintMessage("%s object layer %s (Id = %d) (LevelFrameId = %d)", bActivate ? "Activating" : "Deactivating", pLayerName, nLayerId, m_nFramesSinceLevelStart);
-    INDENT_LOG_DURING_SCOPE();
-
-    if (bObjects)
-    {
-        if (IsObjectTreeReady())
-        {
-            m_pObjectsTree->ActivateObjectsLayer(nLayerId, bActivate, bPhys, pHeap);
-        }
-
-        if (m_pVisAreaManager)
-        {
-            m_pVisAreaManager->ActivateObjectsLayer(nLayerId, bActivate, bPhys, pHeap);
-        }
-    }
-
-    if (bStaticLights)
-    {
-        for (size_t i = 0; i < m_lstStaticLights.size(); ++i)
-        {
-            ILightSource* pLight = m_lstStaticLights[i];
-            if (pLight->GetLayerId() == nLayerId)
-            {
-                pLight->SetRndFlags(ERF_HIDDEN, !bActivate);
-            }
-        }
-    }
-}
-
-
-void C3DEngine::GetLayerMemoryUsage(uint16 nLayerId, ICrySizer* pSizer, int* pNumBrushes, int* pNumDecals) const
-{
-    if (pNumBrushes)
-    {
-        *pNumBrushes = 0;
-    }
-    if (pNumDecals)
-    {
-        *pNumDecals = 0;
-    }
-
-    if (m_pObjectsTree != nullptr)
-    {
-        m_pObjectsTree->GetLayerMemoryUsage(nLayerId, pSizer, pNumBrushes, pNumDecals);
-    }
-}
-
-
-void C3DEngine::SkipLayerLoading(uint16 nLayerId, bool bClearList)
-{
-    if (bClearList)
-    {
-        m_skipedLayers.clear();
-    }
-    m_skipedLayers.insert(nLayerId);
-}
-
-
-bool C3DEngine::IsLayerSkipped(uint16 nLayerId)
-{
-    return m_skipedLayers.find(nLayerId) != m_skipedLayers.end() ? true : false;
-}
-
-void C3DEngine::PrecacheRenderNode(IRenderNode* pObj, float fEntDistanceReal)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    //  PrintMessage("==== PrecacheRenderNodePrecacheRenderNode: %s ====", pObj->GetName());
-
-    if (m_pObjManager)
-    {
-        int dwOldRndFlags = pObj->m_dwRndFlags;
-        pObj->m_dwRndFlags &= ~ERF_HIDDEN;
-
-        SRenderingPassInfo passInfo = SRenderingPassInfo::CreateGeneralPassRenderingInfo(gEnv->pSystem->GetViewCamera());
-
-        m_pObjManager->UpdateRenderNodeStreamingPriority(pObj, fEntDistanceReal, 1.0f, fEntDistanceReal < GetFloatCVar(e_StreamCgfFastUpdateMaxDistance), passInfo, true);
-        pObj->m_dwRndFlags = dwOldRndFlags;
-    }
-}
-
-
-void C3DEngine::CleanUpOldDecals()
-{
-    FUNCTION_PROFILER_3DENGINE;
-    static uint32 nLastIndex = 0;
-    const uint32 nDECALS_PER_FRAME = 50;
-
-    if (uint32 nNumDecalRenderNodes = m_decalRenderNodes.size())
-    {
-        for (uint32 i = 0, end = __min(nDECALS_PER_FRAME, nNumDecalRenderNodes); i < end; ++i, ++nLastIndex)
-        {
-            // wrap around at the end to restart at the beginning
-            if (nLastIndex >= nNumDecalRenderNodes)
-            {
-                nLastIndex = 0;
-            }
-
-            m_decalRenderNodes[nLastIndex]->CleanUpOldDecals();
-        }
-    }
-}
-
-void C3DEngine::UpdateRenderTypeEnableLookup()
-{
-    SetRenderNodeTypeEnabled(eERType_RenderComponent, (GetCVars()->e_Entities != 0));
-    SetRenderNodeTypeEnabled(eERType_StaticMeshRenderComponent, (GetCVars()->e_Entities != 0));
-    SetRenderNodeTypeEnabled(eERType_DynamicMeshRenderComponent, (GetCVars()->e_Entities != 0));
-    SetRenderNodeTypeEnabled(eERType_SkinnedMeshRenderComponent, (GetCVars()->e_Entities != 0));
-}
-
-void C3DEngine::SetRenderNodeMaterialAtPosition(EERType eNodeType, const Vec3& vPos, _smart_ptr<IMaterial> pMat)
-{
-    PodArray<IRenderNode*> lstObjects;
-
-    AABB aabbPos(vPos - Vec3(.1f, .1f, .1f), vPos + Vec3(.1f, .1f, .1f));
-
-    GetObjectsByTypeGlobal(lstObjects, eNodeType, &aabbPos);
-
-    if (GetVisAreaManager())
-    {
-        GetVisAreaManager()->GetObjectsByType(lstObjects, eNodeType, &aabbPos);
-    }
-
-    for (int i = 0; i < lstObjects.Count(); i++)
-    {
-        PrintMessage("Game changed render node material: %s EERType:%d pos: (%d,%d,%d)",
-            pMat ? pMat->GetName() : "NULL",
-            (int)eNodeType,
-            (int)vPos.x, (int)vPos.y, (int)vPos.z);
-
-        lstObjects[i]->SetMaterial(pMat);
-    }
-}
-
-void C3DEngine::OverrideCameraPrecachePoint(const Vec3& vPos)
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->GetStreamPreCacheCameras()[0].vPosition = vPos;
-        m_pObjManager->SetCameraPrecacheOverridden(true);
-    }
-}
-
-int C3DEngine::AddPrecachePoint(const Vec3& vPos, const Vec3& vDir, float fTimeOut, float fImportanceFactor)
-{
-    if (m_pObjManager)
-    {
-        if (m_pObjManager->GetStreamPreCachePointDefs().size() >= CObjManager::MaxPrecachePoints)
-        {
-            size_t nOldestIdx = 0;
-            int nOldestId = INT_MAX;
-            for (size_t i = 1, c = m_pObjManager->GetStreamPreCachePointDefs().size(); i < c; ++i)
-            {
-                if (m_pObjManager->GetStreamPreCachePointDefs()[i].nId < nOldestId)
-                {
-                    nOldestIdx = i;
-                    nOldestId = m_pObjManager->GetStreamPreCachePointDefs()[i].nId;
-                }
-            }
-
-            assert (nOldestIdx > 0);
-
-            CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Precache points full - evicting oldest (%f, %f, %f)",
-                m_pObjManager->GetStreamPreCacheCameras()[nOldestIdx].vPosition.x,
-                m_pObjManager->GetStreamPreCacheCameras()[nOldestIdx].vPosition.y,
-                m_pObjManager->GetStreamPreCacheCameras()[nOldestIdx].vPosition.z);
-
-            m_pObjManager->GetStreamPreCachePointDefs().DeleteFastUnsorted((int)nOldestIdx);
-            m_pObjManager->GetStreamPreCacheCameras().DeleteFastUnsorted((int)nOldestIdx);
-        }
-
-        SObjManPrecachePoint pp;
-        pp.nId = m_pObjManager->IncrementNextPrecachePointId();
-        pp.expireTime = gEnv->pTimer->GetAsyncTime() + CTimeValue(fTimeOut);
-        SObjManPrecacheCamera pc;
-        pc.vPosition = vPos;
-        pc.bbox = AABB(vPos, GetCVars()->e_StreamPredictionBoxRadius);
-        pc.vDirection = vDir;
-        pc.fImportanceFactor = fImportanceFactor;
-        m_pObjManager->GetStreamPreCachePointDefs().Add(pp);
-        m_pObjManager->GetStreamPreCacheCameras().Add(pc);
-
-        return pp.nId;
-    }
-
-    return -1;
-}
-
-void C3DEngine::ClearPrecachePoint(int id)
-{
-    if (m_pObjManager)
-    {
-        for (size_t i = 1, c = m_pObjManager->GetStreamPreCachePointDefs().size(); i < c; ++i)
-        {
-            if (m_pObjManager->GetStreamPreCachePointDefs()[i].nId == id)
-            {
-                m_pObjManager->GetStreamPreCachePointDefs().DeleteFastUnsorted((int)i);
-                m_pObjManager->GetStreamPreCacheCameras().DeleteFastUnsorted((int)i);
-                break;
-            }
-        }
-    }
-}
-
-void C3DEngine::ClearAllPrecachePoints()
-{
-    if (m_pObjManager)
-    {
-        m_pObjManager->GetStreamPreCachePointDefs().resize(1);
-        m_pObjManager->GetStreamPreCacheCameras().resize(1);
-    }
-}
-
-void C3DEngine::GetPrecacheRoundIds(int pRoundIds[MAX_STREAM_PREDICTION_ZONES])
-{
-    if (m_pObjManager)
-    {
-        pRoundIds[0] = m_pObjManager->GetUpdateStreamingPrioriryRoundIdFast();
-        pRoundIds[1] = m_pObjManager->GetUpdateStreamingPrioriryRoundId();
-    }
-}
-
-SBending* C3DEngine::GetBendingEntry(SBending* pSrc, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-    assert(pSrc);
-    SBending* pStorage = m_bendingPool[m_bendingPoolIdx].push_back_new();
-    *pStorage = *pSrc;
-    return pStorage;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-CCamera* C3DEngine::GetRenderingPassCamera(const CCamera& rCamera)
-{
-    threadID nThreadID = 0;
-    gEnv->pRenderer->EF_Query(EFQ_RenderThreadList, nThreadID);
-    CCamera* pCamera = m_RenderingPassCameras[nThreadID].push_back_new();
-    *pCamera = rCamera;
-    return pCamera;
-}
-
-void C3DEngine::GetCollisionClass(SCollisionClass& collclass, int tableIndex)
-{
-    if ((unsigned)tableIndex < m_collisionClasses.size())
-    {
-        collclass = m_collisionClasses[tableIndex];
-    }
-    else
-    {
-        collclass = SCollisionClass(0, 0);
-    }
-}
-
-class C3DEngine::PhysicsAreaUpdatesHandler
-    : private Physics::WindNotificationsBus::Handler
-{
-public:
-    explicit PhysicsAreaUpdatesHandler(C3DEngine::PhysicsAreaUpdates& physicsAreaUpdates)
-        : m_physicsAreaUpdates(physicsAreaUpdates)
-    {
-        Physics::WindNotificationsBus::Handler::BusConnect();
-    }
-
-    ~PhysicsAreaUpdatesHandler()
-    {
-        Physics::WindNotificationsBus::Handler::BusDisconnect();
-    }
-
-private:
-    // Physics::WindNotificationsBus::Handler
-    void OnGlobalWindChanged() override
-    {
-        // Using same 'global wind' area size value CryPhysics code had
-        const AZ::Vector3 globalWindHalfBound(1e7);
-        AZ::Aabb globalWindAabb = AZ::Aabb::CreateFromMinMax(-globalWindHalfBound, globalWindHalfBound);
-
-        OnWindChanged(globalWindAabb);
-    }
-
-    void OnWindChanged(const AZ::Aabb& aabb) override
-    {
-        SAreaChangeRecord record;
-        record.boxAffected = AZAabbToLyAABB(aabb);
-        record.uPhysicsMask = Area_Air;
-
-        m_physicsAreaUpdates.SetAreaDirty(record);
-    }
-
-    C3DEngine::PhysicsAreaUpdates& m_physicsAreaUpdates;
-};
-
-void C3DEngine::PhysicsAreaUpdates::SetAreaDirty(const SAreaChangeRecord& rec)
-{
-    // Merge with existing bb if close enough and same medium
-    AUTO_LOCK(m_Mutex);
-    static const float fMERGE_THRESHOLD = 2.f;
-    float fNewVolume = rec.boxAffected.GetVolume();
-    for (uint i = 0; i < m_DirtyAreas.size(); i++)
-    {
-        if (m_DirtyAreas[i].uPhysicsMask == rec.uPhysicsMask)
-        {
-            AABB bbUnion = rec.boxAffected;
-            bbUnion.Add(m_DirtyAreas[i].boxAffected);
-            if (bbUnion.GetVolume() <= (fNewVolume + m_DirtyAreas[i].boxAffected.GetVolume()) * fMERGE_THRESHOLD)
-            {
-                m_DirtyAreas[i].boxAffected = bbUnion;
-                return;
-            }
-        }
-    }
-    m_DirtyAreas.push_back(rec);
-}
-
-void C3DEngine::PhysicsAreaUpdates::Update()
-{
-    //
-    // (bethelz) This whole class is only used for CParticleEffect right now.
-    //
-
-    FUNCTION_PROFILER_3DENGINE;
-    AUTO_LOCK(m_Mutex);
-    if (m_DirtyAreas.empty())
-    {
-        return;
-    }
-
-    // Check area against registered proxies
-    int nSizeAreasChanged = (int)m_DirtyAreas.size();
-    int nSizeProxies = m_Proxies.size();
-
-    // Access elements via [i] as the thread safe list does not always safe its element in a continues array
-    for (int i = 0; i < nSizeProxies; ++i)
-    {
-        const SPhysAreaNodeProxy& proxy = m_Proxies[i];
-
-        IF (!proxy.bIsValid, 0)
-        {
-            continue;
-        }
-
-        for (int j = 0; j < nSizeAreasChanged; ++j)
-        {
-            const SAreaChangeRecord& rec = m_DirtyAreas[j];
-            if ((proxy.uPhysicsMask & rec.uPhysicsMask) && Overlap::AABB_AABB(proxy.bbox, rec.boxAffected))
-            {
-                if (rec.uPhysicsMask & Area_Air)
-                {
-                    if (proxy.pRenderNode->m_pRNTmpData)
-                    {
-                        proxy.pRenderNode->m_pRNTmpData->userData.bWindCurrent = 0;
-                    }
-                }
-
-                proxy.pRenderNode->OnPhysAreaChange();
-                break;
-            }
-        }
-    }
-
-    m_DirtyAreas.resize(0);
-}
-
-void C3DEngine::PhysicsAreaUpdates::Reset()
-{
-    stl::free_container(m_DirtyAreas);
-}
-
-uint32 C3DEngine::PhysicsAreaUpdates::CreateProxy(const IRenderNode* pRenderNode, uint16 uPhysicsMask)
-{
-    size_t nIndex = ~0;
-    SPhysAreaNodeProxy* proxy = m_Proxies.push_back_new(nIndex);
-
-    proxy->pRenderNode      = (IRenderNode*)pRenderNode;
-    proxy->uPhysicsMask     = uPhysicsMask;
-    proxy->bIsValid             = true;
-    proxy->bbox                     = pRenderNode->GetBBox();
-    return nIndex;
-}
-
-void C3DEngine::PhysicsAreaUpdates::UpdateProxy(const IRenderNode* pRenderNode, uint32 nProxyId)
-{
-    m_Proxies[nProxyId].bbox = pRenderNode->GetBBox();
-}
-
-void C3DEngine::PhysicsAreaUpdates::ResetProxy(uint32 proxyId)
-{
-    m_Proxies[proxyId].Reset();
-}
-
-void C3DEngine::PhysicsAreaUpdates::GarbageCollect()
-{
-    // Ensure list is continues in memory
-    m_Proxies.CoalesceMemory();
-
-    const uint32 nSize = m_Proxies.size();
-    if (nSize == 0)
-    {
-        return;
-    }
-
-    SPhysAreaNodeProxy* pFrontIter = &m_Proxies[0];
-    SPhysAreaNodeProxy* pBackIter = &m_Proxies[nSize - 1];
-    const SPhysAreaNodeProxy* pHead = pFrontIter;
-    uint32 nNumItemsToDelete = 0;
-
-    // Move invalid nodes to the back of the array
-    do
-    {
-        while (pFrontIter->bIsValid && pFrontIter < pBackIter)
-        {
-            ++pFrontIter;
-        }
-        while (!pBackIter->bIsValid && pFrontIter < pBackIter)
-        {
-            --pBackIter;
-            ++nNumItemsToDelete;
-        }
-
-        if (pFrontIter < pBackIter)
-        {
-            // Replace invalid front element with back element
-            // Note: No need to swap because we cut the data from the array at the end anyway
-            memcpy(pFrontIter, pBackIter, sizeof(SPhysAreaNodeProxy));
-            AZ_Assert(pFrontIter->pRenderNode && pFrontIter->pRenderNode->m_pRNTmpData, "The front iterator should have a valid m_pRNTmpData after the data from the valid back iterator has been copied to it.");
-            if (pFrontIter->pRenderNode && pFrontIter->pRenderNode->m_pRNTmpData)
-            {
-                pFrontIter->pRenderNode->m_pRNTmpData->nPhysAreaChangedProxyId = (uint32)(pFrontIter - pHead);
-            }
-            
-            pBackIter->bIsValid = false;
-
-            --pBackIter;
-            ++pFrontIter;
-            ++nNumItemsToDelete;
-        }
-    } while (pFrontIter < pBackIter);
-
-    // Cut off invalid elements
-    m_Proxies.resize(nSize - nNumItemsToDelete);
-}
-
-void C3DEngine::UpdateShaderItems()
-{
-    if (GetMatMan())
-    {
-        GetMatMan()->UpdateShaderItems();
-    }
-}
-
-void C3DEngine::OnCameraTeleport()
-{
-    MarkRNTmpDataPoolForReset();
-}
-
-IObjManager* C3DEngine::GetObjectManager()
-{
-    return m_pObjManager;
-}
-
-const IObjManager* C3DEngine::GetObjectManager() const
-{
-    return m_pObjManager;
-}
-
-bool C3DEngine::RemoveObjectsInArea(Vec3 vExploPos, float fExploRadius)
-{
-    bool bEverythingDeleted = true;
-
-    Vec3 vRadius(fExploRadius, fExploRadius, fExploRadius);
-
-    PodArray<SRNInfo> lstEntities;
-    const AABB cExplosionBox(vExploPos - vRadius, vExploPos + vRadius);
-    MoveObjectsIntoListGlobal(&lstEntities, &cExplosionBox, false, true, true, true);
-
-    // remove small objects around
-    {
-        for (int i = 0; i < lstEntities.Count(); i++)
-        {
-            IRenderNode* pRenderNode = lstEntities[i].pNode;
-            AABB entBox = pRenderNode->GetBBox();
-            float fEntRadius = entBox.GetRadius();
-            Vec3 vEntCenter = pRenderNode->GetBBox().GetCenter();
-            float fDist = vExploPos.GetDistance(vEntCenter);
-            if (fDist < fExploRadius + fEntRadius &&
-                Overlap::Sphere_AABB(Sphere(vExploPos, fExploRadius), entBox))
-            {
-                if (fDist >= fExploRadius)
-                { //
-                    Matrix34A objMat;
-                    CStatObj* pStatObj = (CStatObj*)pRenderNode->GetEntityStatObj(0, 0, &objMat);
-                    if (!pStatObj)
-                    {
-                        continue;
-                    }
-                    objMat.Invert();
-                    //assert(0);
-                    Vec3 vOSExploPos = objMat.TransformPoint(vExploPos);
-
-                    Vec3 vScaleTest(0, 0, 1.f);
-                    vScaleTest = objMat.TransformVector(vScaleTest);
-                    float fObjScaleInv = vScaleTest.len();
-
-                    if (!pStatObj->IsSphereOverlap(Sphere(vOSExploPos, fExploRadius * fObjScaleInv)))
-                    {
-                        continue;
-                    }
-                }
-            }
-        }
-    }
-
-    return bEverythingDeleted;
-}
-
-#ifndef _RELEASE
-
-//////////////////////////////////////////////////////////////////////////
-// onscreen infodebug code for e_debugDraw >= 100
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::AddObjToDebugDrawList(SObjectInfoToAddToDebugDrawList& objInfo)
-{
-    m_DebugDrawListMgr.AddObject(objInfo);
-}
-
-
-bool    CDebugDrawListMgr::m_dumpLogRequested = false;
-bool    CDebugDrawListMgr::m_freezeRequested = false;
-bool    CDebugDrawListMgr::m_unfreezeRequested = false;
-uint32 CDebugDrawListMgr::m_filter = I3DEngine::DLOT_ALL;
-
-
-//////////////////////////////////////////////////////////////////////////
-CDebugDrawListMgr::CDebugDrawListMgr()
-{
-    m_isFrozen = false;
-    ClearFrameData();
-    ClearConsoleCommandRequestVars();
-    m_assets.reserve(32);   // just a reasonable value
-    m_drawBoxes.reserve(256);   // just a reasonable value
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::ClearFrameData()
-{
-    m_counter = 0;
-    m_assetCounter = 0;
-    m_assets.clear();
-    m_drawBoxes.clear();
-    m_indexLeastValueAsset = 0;
-    CheckFilterCVar();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::ClearConsoleCommandRequestVars()
-{
-    m_dumpLogRequested      = false;
-    m_freezeRequested           = false;
-    m_unfreezeRequested     = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::AddObject(I3DEngine::SObjectInfoToAddToDebugDrawList& newObjInfo)
-{
-    if (m_isFrozen)
-    {
-        return;
-    }
-
-    m_lock.Lock();
-
-    m_counter++;
-
-    if (!ShouldFilterOutObject(newObjInfo))
-    {
-        TAssetInfo newAsset(newObjInfo);
-        TObjectDrawBoxInfo newDrawBox(newObjInfo);
-
-        TAssetInfo* pAssetDuplicated = FindDuplicate(newAsset);
-        if (pAssetDuplicated)
-        {
-            pAssetDuplicated->numInstances++;
-            newDrawBox.assetID = pAssetDuplicated->ID;
-            m_drawBoxes.push_back(newDrawBox);
-            pAssetDuplicated->drawCalls = max(pAssetDuplicated->drawCalls, newAsset.drawCalls);
-        }
-        else
-        {
-            newAsset.ID = m_assetCounter;
-            newDrawBox.assetID = newAsset.ID;
-            bool used = false;
-
-            // list not full, so we add
-            if (m_assets.size() < uint(Cry3DEngineBase::GetCVars()->e_DebugDrawListSize))
-            {
-                used = true;
-                m_assets.push_back(newAsset);
-            }
-            else // if is full, only use it if value is greater than the current minimum, and then it substitutes the lowest slot
-            {
-                const TAssetInfo& leastValueAsset = m_assets[ m_indexLeastValueAsset ];
-                if (leastValueAsset < newAsset)
-                {
-                    used = true;
-                    m_assets[ m_indexLeastValueAsset ] = newAsset;
-                }
-            }
-            if (used)
-            {
-                m_assetCounter++;
-                m_drawBoxes.push_back(newDrawBox);
-                FindNewLeastValueAsset();
-            }
-        }
-    }
-
-    m_lock.Unlock();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CDebugDrawListMgr::TAssetInfo* CDebugDrawListMgr::FindDuplicate(const TAssetInfo& asset)
-{
-    std::vector<TAssetInfo>::iterator iter = m_assets.begin();
-    std::vector<TAssetInfo>::const_iterator endArray = m_assets.end();
-
-    while (iter != endArray)
-    {
-        TAssetInfo& currAsset = *iter;
-        if (currAsset.fileName == asset.fileName)
-        {
-            return &currAsset;
-        }
-        ++iter;
-    }
-    return NULL;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CDebugDrawListMgr::ShouldFilterOutObject(const I3DEngine::SObjectInfoToAddToDebugDrawList& object)
-{
-    if (m_filter == I3DEngine::DLOT_ALL)
-    {
-        return false;
-    }
-
-    return (m_filter & object.type) == 0;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::FindNewLeastValueAsset()
-{
-    uint32 size = m_assets.size();
-    for (uint32 i = 0; i < size; ++i)
-    {
-        const TAssetInfo& currAsset = m_assets[ i ];
-        const TAssetInfo& leastValueAsset = m_assets[ m_indexLeastValueAsset ];
-
-        if (currAsset < leastValueAsset)
-        {
-            m_indexLeastValueAsset = i;
-        }
-    }
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::Update()
-{
-    m_lock.Lock();
-    if (!m_isFrozen)
-    {
-        std::sort(m_assets.begin(), m_assets.end(), CDebugDrawListMgr::SortComparison);
-    }
-    gEnv->pRenderer->CollectDrawCallsInfoPerNode(true);
-    // it displays values from the previous frame. This mean that if it is disabled, and then enabled again later on, it will display bogus values for 1 frame...but i dont care (yet)
-    float X = 10.f;
-    float Y = 100.f;
-    if (m_isFrozen)
-    {
-        PrintText(X, Y, Col_Red, "FROZEN DEBUGINFO");
-    }
-    Y += 20.f;
-    PrintText(X, Y, Col_White, "total assets: %d     Ordered by:                 Showing:", m_counter);
-    PrintText(X + 240, Y, Col_Yellow, GetStrCurrMode());
-    TMyStandardString filterStr;
-    GetStrCurrFilter(filterStr);
-    PrintText(X + 420, Y, Col_Yellow, filterStr.c_str());
-    Y += 20.f;
-    float XName = 270;
-
-    const char* pHeaderStr = "";
-    switch (Cry3DEngineBase::GetCVars()->e_DebugDraw)
-    {
-    case LM_TRI_COUNT:
-        pHeaderStr = "   tris  " " meshMem  " "rep  " " type        ";
-        break;
-    case LM_VERT_COUNT:
-        pHeaderStr = "  verts  " " meshMem  " "rep  " " type        ";
-        break;
-    case LM_DRAWCALLS:
-        pHeaderStr = "draw Calls  " "   tris  " "rep  " " type        ";
-        break;
-    case LM_TEXTMEM:
-        pHeaderStr = "  texMem  " " meshMem  " "rep  " " type        ";
-        break;
-    case LM_MESHMEM:
-        pHeaderStr = " meshMem  " "  texMem  " "rep  " " type        ";
-        break;
-    }
-
-
-    PrintText(X, Y, Col_White, pHeaderStr);
-    const int standardNameSize = 48;
-    PrintText(XName, Y, Col_White, "Entity (class)");
-    PrintText(XName + (standardNameSize + 2) * 7, Y, Col_White, "File name");
-
-    Y += 20.f;
-    for (uint32 i = 0; i < m_assets.size(); ++i)
-    {
-        ColorF colorLine = Col_Cyan;
-        if (Cry3DEngineBase::GetCVars()->e_DebugDrawListBBoxIndex - 1 == i)
-        {
-            colorLine = Col_Blue;
-        }
-        const TAssetInfo& currAsset = m_assets[ i ];
-        TMyStandardString texMemoryStr;
-        TMyStandardString meshMemoryStr;
-        MemToString(currAsset.texMemory, texMemoryStr);
-        MemToString(currAsset.meshMemory, meshMemoryStr);
-
-        switch (Cry3DEngineBase::GetCVars()->e_DebugDraw)
-        {
-        case LM_TRI_COUNT:
-            PrintText(X, Y + 20.f * i, colorLine, "%7d  " "%s  " "%3d  " "%s",
-                currAsset.numTris, meshMemoryStr.c_str(), currAsset.numInstances, GetAssetTypeName(currAsset.type));
-            break;
-        case LM_VERT_COUNT:
-            PrintText(X, Y + 20.f * i, colorLine, "%7d  " "%s  " "%3d  " "%s",
-                currAsset.numVerts, meshMemoryStr.c_str(), currAsset.numInstances, GetAssetTypeName(currAsset.type));
-            break;
-        case LM_DRAWCALLS:
-        {
-            PrintText(X, Y + 20.f * i, colorLine, "  %5d     " "%7d  " "%3d  " "%s",
-                currAsset.drawCalls, currAsset.numTris, currAsset.numInstances, GetAssetTypeName(currAsset.type));
-        }
-        break;
-        case LM_TEXTMEM:
-            PrintText(X, Y + 20.f * i, colorLine, "%s  " "%s  " "%3d  " "%s",
-                texMemoryStr.c_str(), meshMemoryStr.c_str(), currAsset.numInstances, GetAssetTypeName(currAsset.type));
-            break;
-        case LM_MESHMEM:
-            PrintText(X, Y + 20.f * i, colorLine, "%s  " "%s  " "%3d  " "%s",
-                meshMemoryStr.c_str(), texMemoryStr.c_str(), currAsset.numInstances, GetAssetTypeName(currAsset.type));
-            break;
-        }
-
-        int filenameSep = 7 * (max(standardNameSize, int(currAsset.name.length())) + 2);
-        float XFileName = XName + filenameSep;
-
-        PrintText(XName, Y + 20.f * i, colorLine, currAsset.name.c_str());
-        PrintText(XFileName, Y + 20.f * i, colorLine, currAsset.fileName.c_str());
-    }
-
-    if (Cry3DEngineBase::GetCVars()->e_DebugDrawListBBoxIndex > 0 && uint(Cry3DEngineBase::GetCVars()->e_DebugDrawListBBoxIndex - 1) < m_assets.size())
-    {
-        const TAssetInfo& assetInfo = m_assets[ Cry3DEngineBase::GetCVars()->e_DebugDrawListBBoxIndex - 1 ];
-        uint32 numBoxesDrawn = 0;
-        for (uint32 i = 0; i < m_drawBoxes.size(); ++i)
-        {
-            const TObjectDrawBoxInfo& drawBox = m_drawBoxes[ i ];
-            if (drawBox.assetID == assetInfo.ID)
-            {
-                gEnv->pRenderer->GetIRenderAuxGeom()->DrawAABB(drawBox.bbox, drawBox.mat, true, ColorB(0, 0, 255, 100), eBBD_Faceted);
-                numBoxesDrawn++;
-                if (numBoxesDrawn >= assetInfo.numInstances)
-                {
-                    break;
-                }
-            }
-        }
-    }
-
-    if (m_freezeRequested)
-    {
-        m_isFrozen = true;
-    }
-    if (m_unfreezeRequested)
-    {
-        m_isFrozen = false;
-    }
-    if (m_dumpLogRequested)
-    {
-        DumpLog();
-    }
-
-    ClearConsoleCommandRequestVars();
-
-    if (!m_isFrozen)
-    {
-        ClearFrameData();
-        m_assets.reserve(Cry3DEngineBase::GetCVars()->e_DebugDrawListSize);
-    }
-    m_lock.Unlock();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::PrintText(float x, float y, const ColorF& fColor, const char* label_text, ...)
-{
-    va_list args;
-    va_start(args, label_text);
-    SDrawTextInfo ti;
-    ti.xscale = ti.yscale = 1.2f;
-    ti.flags = eDrawText_2D | eDrawText_FixedSize | eDrawText_Monospace;
-    {
-        ti.color[0] = fColor[0];
-        ti.color[1] = fColor[1];
-        ti.color[2] = fColor[2];
-        ti.color[3] = fColor[3];
-    }
-    gEnv->pRenderer->DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
-    va_end(args);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::MemToString(uint32 memVal, TMyStandardString& outStr)
-{
-    if (memVal < 1024 * 1024)
-    {
-        outStr.Format("%5.1f kb", memVal / (1024.f));
-    }
-    else
-    {
-        outStr.Format("%5.1f MB", memVal / (1024.f * 1024.f));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CDebugDrawListMgr::TAssetInfo::operator<(const TAssetInfo& other) const
-{
-    switch (Cry3DEngineBase::GetCVars()->e_DebugDraw)
-    {
-    case LM_TRI_COUNT:
-        return (numTris < other.numTris);
-
-    case LM_VERT_COUNT:
-        return (numVerts < other.numVerts);
-
-    case LM_DRAWCALLS:
-        return (drawCalls < other.drawCalls);
-
-    case LM_TEXTMEM:
-        return (texMemory < other.texMemory);
-
-    case LM_MESHMEM:
-        return (meshMemory < other.meshMemory);
-
-    default:
-        assert(false);
-        return false;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CDebugDrawListMgr::TAssetInfo::TAssetInfo(const I3DEngine::SObjectInfoToAddToDebugDrawList& objInfo)
-{
-    type = objInfo.type;
-    if (!objInfo.pClassName)
-    {
-        // custom functions to avoid any heap allocation
-        MyString_Assign(name, objInfo.pName);
-        MyStandardString_Concatenate(name, "(");
-        MyStandardString_Concatenate(name, objInfo.pClassName);
-        MyStandardString_Concatenate(name, ")");
-    }
-
-    MyFileNameString_Assign(fileName, objInfo.pFileName);
-
-    numTris = objInfo.numTris;
-    numVerts = objInfo.numVerts;
-    texMemory = objInfo.texMemory;
-    meshMemory = objInfo.meshMemory;
-    drawCalls = gEnv->pRenderer->GetDrawCallsPerNode(objInfo.pRenderNode);
-    numInstances = 1;
-    ID = UNDEFINED_ASSET_ID;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CDebugDrawListMgr::TObjectDrawBoxInfo::TObjectDrawBoxInfo(const I3DEngine::SObjectInfoToAddToDebugDrawList& objInfo)
-{
-    mat.SetIdentity();
-    bbox.Reset();
-    if (objInfo.pMat)
-    {
-        mat = *objInfo.pMat;
-    }
-    if (objInfo.pBox)
-    {
-        bbox = *objInfo.pBox;
-    }
-    assetID = UNDEFINED_ASSET_ID;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::MyStandardString_Concatenate(TMyStandardString& outStr, const char* pStr)
-{
-    if (pStr && outStr.length() < outStr.capacity())
-    {
-        outStr._ConcatenateInPlace(pStr, min(strlen(pStr), outStr.capacity() - outStr.length()));
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::MyFileNameString_Assign(TFilenameString& outStr, const char* pStr)
-{
-    char tempBuf[ outStr.MAX_SIZE + 1 ];
-
-    uint32 outInd = 0;
-    if (pStr)
-    {
-        while (*pStr != 0 && outInd < outStr.MAX_SIZE)
-        {
-            tempBuf[outInd] = *pStr;
-            outInd++;
-            if (*pStr == '%' &&   outInd < outStr.MAX_SIZE)
-            {
-                tempBuf[outInd] = '%';
-                outInd++;
-            }
-            pStr++;
-        }
-    }
-    tempBuf[ outInd ] = 0;
-    outStr = tempBuf;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::ConsoleCommand(IConsoleCmdArgs* args)
-{
-    if (args->GetArgCount() > 1 && args->GetArg(1))
-    {
-        switch (toupper(args->GetArg(1)[0]))
-        {
-        case 'F':
-            m_freezeRequested = true;
-            break;
-        case 'C':
-            m_unfreezeRequested = true;
-            break;
-        case 'D':
-            m_dumpLogRequested = true;
-            break;
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::CheckFilterCVar()
-{
-    ICVar* pCVar = gEnv->pConsole->GetCVar("e_debugdrawlistfilter");
-
-    if (!pCVar)
-    {
-        return;
-    }
-
-    const char* pVal = pCVar->GetString();
-
-    if (pVal && azstricmp(pVal, "all") == 0)
-    {
-        m_filter = I3DEngine::DLOT_ALL;
-        return;
-    }
-
-    m_filter = 0;
-    while (pVal && pVal[0])
-    {
-        switch (toupper(pVal[0]))
-        {
-        case 'C':
-            m_filter |= I3DEngine::DLOT_CHARACTER;
-            break;
-        case 'S':
-            m_filter |= I3DEngine::DLOT_STATOBJ;
-            break;
-        }
-        ++pVal;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::DumpLog()
-{
-    TMyStandardString filterStr;
-    GetStrCurrFilter(filterStr);
-    CryLog("--------------------------------------------------------------------------------");
-    CryLog("                           DebugDrawList infodebug");
-    CryLog("--------------------------------------------------------------------------------");
-    CryLog(" total objects: %d    Ordered by: %s     Showing: %s", m_counter, GetStrCurrMode(), filterStr.c_str());
-    CryLog(PRINTF_EMPTY_FORMAT);
-    CryLog("   tris      verts   draw Calls   texMem     meshMem    type");
-    CryLog(" -------   --------  ----------  --------   --------  ----------");
-    for (uint32 i = 0; i < m_assets.size(); ++i)
-    {
-        const TAssetInfo& currAsset = m_assets[ i ];
-        TMyStandardString texMemoryStr;
-        TMyStandardString meshMemoryStr;
-        MemToString(currAsset.texMemory, texMemoryStr);
-        MemToString(currAsset.meshMemory, meshMemoryStr);
-        CryLog("%8d  %8d     %5d     %s   %s  %s      %s    %s", currAsset.numTris, currAsset.numVerts, currAsset.drawCalls,
-            texMemoryStr.c_str(), meshMemoryStr.c_str(), GetAssetTypeName(currAsset.type), currAsset.name.c_str(), currAsset.fileName.c_str());
-    }
-    CryLog("--------------------------------------------------------------------------------");
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-const char* CDebugDrawListMgr::GetStrCurrMode()
-{
-    const char* pModesNames[] =
-    {
-        "Tri count",
-        "Vert count",
-        "Draw calls",
-        "Texture memory",
-        "Mesh memory"
-    };
-
-    uint32 index = Cry3DEngineBase::GetCVars()->e_DebugDraw - LM_BASENUMBER;
-    uint32 numElems = sizeof(pModesNames) / sizeof *(pModesNames);
-    if (index < numElems)
-    {
-        return pModesNames[index];
-    }
-    else
-    {
-        return "<UNKNOWN>";
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDebugDrawListMgr::GetStrCurrFilter(TMyStandardString& strOut)
-{
-    const char* pFilterNames[] =
-    {
-        "",
-        "Characters",
-        "StatObjs"
-    };
-
-    uint32 numElems = sizeof(pFilterNames) / sizeof *(pFilterNames);
-    for (uint32 i = 1, bitVal = 1; i < numElems; ++i)
-    {
-        if ((bitVal & m_filter) != 0)
-        {
-            if (strOut.size() > 0)
-            {
-                strOut += "+";
-            }
-            strOut += pFilterNames[i];
-        }
-        bitVal *= 2;
-    }
-
-    if (strOut.size() == 0)
-    {
-        strOut = "ALL";
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-const char* CDebugDrawListMgr::GetAssetTypeName(I3DEngine::EDebugDrawListAssetTypes type)
-{
-    const char* pNames[] =
-    {
-        "",
-        "Brush     ",
-        "Vegetation",
-        "Character ",
-        "StatObj   "
-    };
-
-    uint32 numElems = sizeof(pNames) / sizeof *(pNames);
-    for (uint32 i = 1, bitVal = 1; i < numElems; ++i)
-    {
-        if (bitVal == type)
-        {
-            return pNames[i];
-        }
-        bitVal *= 2;
-    }
-
-    return "<UNKNOWN>";
-}
-
-
-
-#endif //RELEASE
-
-void C3DEngine::GetStatObjAndMatTables(DynArray<IStatObj*>* pStatObjTable, DynArray<_smart_ptr<IMaterial> >* pMatTable, DynArray<IStatInstGroup*>* pStatInstGroupTable, uint32 nObjTypeMask)
-{
-    SHotUpdateInfo exportInfo;
-    exportInfo.nObjTypeMask = nObjTypeMask;
-
-    std::vector<IStatObj*> statObjTable;
-    std::vector<_smart_ptr<IMaterial> > matTable;
-    std::vector<IStatInstGroup*> statInstGroupTable;
-
-    if (Get3DEngine() && Get3DEngine()->IsObjectTreeReady())
-    {
-        Get3DEngine()->GetObjectTree()->GenerateStatObjAndMatTables((pStatObjTable != NULL) ? &statObjTable : NULL,
-            (pMatTable != NULL) ? &matTable : NULL,
-            (pStatInstGroupTable != NULL) ? &statInstGroupTable : NULL,
-            &exportInfo);
-    }
-
-    if (GetVisAreaManager())
-    {
-        GetVisAreaManager()->GenerateStatObjAndMatTables((pStatObjTable != NULL) ? &statObjTable : NULL,
-            (pMatTable != NULL) ? &matTable : NULL,
-            (pStatInstGroupTable != NULL) ? &statInstGroupTable : NULL,
-            &exportInfo);
-    }
-
-    if (pStatObjTable)
-    {
-        pStatObjTable->resize(statObjTable.size());
-        for (size_t i = 0; i < statObjTable.size(); ++i)
-        {
-            (*pStatObjTable)[i] = statObjTable[i];
-        }
-
-        statObjTable.clear();
-    }
-
-    if (pMatTable)
-    {
-        pMatTable->resize(matTable.size());
-        for (size_t i = 0; i < matTable.size(); ++i)
-        {
-            (*pMatTable)[i] = matTable[i];
-        }
-
-        matTable.clear();
-    }
-
-    if (pStatInstGroupTable)
-    {
-        pStatInstGroupTable->resize(statInstGroupTable.size());
-        for (size_t i = 0; i < statInstGroupTable.size(); ++i)
-        {
-            (*pStatInstGroupTable)[i] = statInstGroupTable[i];
-        }
-
-        statInstGroupTable.clear();
-    }
-}
-
diff --git a/Code/CryEngine/Cry3DEngine/3dEngine.h b/Code/CryEngine/Cry3DEngine/3dEngine.h
deleted file mode 100644
index a8e46c32ae..0000000000
--- a/Code/CryEngine/Cry3DEngine/3dEngine.h
+++ /dev/null
@@ -1,1514 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_3DENGINE_H
-#define CRYINCLUDE_CRY3DENGINE_3DENGINE_H
-#pragma once
-
-#include <CryThreadSafeRendererContainer.h>
-#include <AzCore/std/parallel/mutex.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/Math/Aabb.h>
-#include <StatObjBus.h>
-
-#ifdef DrawText
-#undef DrawText
-#endif //DrawText
-
-struct IOctreeNode;
-struct IDeferredPhysicsEventManager;
-class COctreeNode;
-class CCullBuffer;
-
-struct StatInstGroup;
-
-
-namespace LegacyProceduralVegetation
-{
-    class VegetationPoolManager;
-}
-
-class CMemoryBlock
-    : public IMemoryBlock
-{
-public:
-    virtual void* GetData() { return m_pData; }
-    virtual int GetSize() { return m_nSize; }
-    virtual ~CMemoryBlock() { delete[] m_pData; }
-
-    CMemoryBlock() { m_pData = 0; m_nSize = 0; }
-    CMemoryBlock(const void* pData, int nSize)
-    {
-        m_pData = 0;
-        m_nSize = 0;
-        SetData(pData, nSize);
-    }
-    void SetData(const void* pData, int nSize)
-    {
-        delete[] m_pData;
-        m_pData = new uint8[nSize];
-        memcpy(m_pData, pData, nSize);
-        m_nSize = nSize;
-    }
-    void Free()
-    {
-        delete[] m_pData;
-        m_pData = NULL;
-        m_nSize = 0;
-    }
-    void Allocate(int nSize)
-    {
-        delete[] m_pData;
-        m_pData = new uint8[nSize];
-        memset(m_pData, 0, nSize);
-        m_nSize = nSize;
-    }
-
-    static CMemoryBlock* CompressToMemBlock(void* pData, int nSize, ISystem* pSystem)
-    {
-        CMemoryBlock* pMemBlock = NULL;
-        uint8* pTmp = new uint8[nSize + 4];
-        size_t nComprSize = nSize;
-        *(uint32*)pTmp = nSize;
-        if (pSystem->CompressDataBlock(pData, nSize, pTmp + 4, nComprSize))
-        {
-            pMemBlock = new CMemoryBlock(pTmp, nComprSize + 4);
-        }
-
-        delete[] pTmp;
-        return pMemBlock;
-    }
-
-    static CMemoryBlock* DecompressFromMemBlock(CMemoryBlock* pMemBlock, ISystem* pSystem)
-    {
-        size_t nUncompSize = *(uint32*)pMemBlock->GetData();
-        SwapEndian(nUncompSize);
-        CMemoryBlock* pResult = new CMemoryBlock;
-        pResult->Allocate(nUncompSize);
-        if (!pSystem->DecompressDataBlock((byte*)pMemBlock->GetData() + 4, pMemBlock->GetSize() - 4, pResult->GetData(), nUncompSize))
-        {
-            assert(!"CMemoryBlock::DecompressFromMemBlock failed");
-            delete pResult;
-            pResult = NULL;
-        }
-
-        return pResult;
-    }
-
-    uint8* m_pData;
-    int m_nSize;
-};
-
-// Values to combine for phys area type selection
-enum EAreaPhysics
-{
-    Area_Water = BIT(0),
-    Area_Air = BIT(1),
-    // Other physics media can be masked in as well
-
-    Area_Gravity = BIT(14),
-    Area_Other = BIT(15),
-};
-
-struct SAreaChangeRecord
-{
-    AABB boxAffected;                       // Area of change
-    uint16 uPhysicsMask;                    // Types of mediums for this area
-};
-
-struct SPhysAreaNodeProxy
-{
-    void Reset()
-    {
-        pRenderNode = (IRenderNode*)(intptr_t)-1;
-        bIsValid = false;
-        bbox.Reset();
-    }
-
-    IRenderNode* pRenderNode;       // RenderNode
-    uint16 uPhysicsMask;                // Bit mask of physics interested in
-    bool bIsValid;                              // Does the proxy carry valid data
-    AABB bbox;                                  // Bounding box of render node
-};
-
-struct SFrameInfo
-{
-    void Reset()
-    {
-        ppRNTmpData = (CRNTmpData**)(intptr_t)-1;
-        bIsValid = false;
-        nCreatedFrameId = nLastUsedFrameId = ~0;
-    }
-
-    uint32 nLastUsedFrameId;
-    uint32 nCreatedFrameId;
-    bool bIsValid;
-    CRNTmpData** ppRNTmpData;
-};
-
-struct SNodeInfo;
-class CStitchedImage;
-struct DLightAmount
-{
-    CDLight* pLight;
-    float fAmount;
-};
-
-template <class T, int nMaxElemsInChunk>
-struct CPoolAllocator
-{
-    CPoolAllocator() { m_nCounter = 0; }
-
-    ~CPoolAllocator()
-    {
-        Reset();
-    }
-
-    void Reset()
-    {
-        for (int i = 0; i < m_Pools.Count(); i++)
-        {
-            delete[](byte*)m_Pools[i];
-            m_Pools[i] = NULL;
-        }
-        m_nCounter = 0;
-    }
-
-    void ReleaseElement(T* pElem)
-    {
-        if (pElem)
-        {
-            m_FreeElements.Add(pElem);
-        }
-    }
-
-    T* GetNewElement()
-    {
-        if (m_FreeElements.Count())
-        {
-            T* pPtr = m_FreeElements.Last();
-            m_FreeElements.DeleteLast();
-            return pPtr;
-        }
-
-        int nPoolId = m_nCounter / nMaxElemsInChunk;
-        int nElemId = m_nCounter - nPoolId * nMaxElemsInChunk;
-        m_Pools.PreAllocate(nPoolId + 1, nPoolId + 1);
-        if (!m_Pools[nPoolId])
-        {
-            m_Pools[nPoolId] = (T*)new byte[nMaxElemsInChunk * sizeof(T)];
-        }
-        m_nCounter++;
-        return &m_Pools[nPoolId][nElemId];
-    }
-
-    int GetCount() { return m_nCounter - m_FreeElements.Count(); }
-    int GetCapacity() { return m_Pools.Count() * nMaxElemsInChunk; }
-    int GetCapacityBytes() { return GetCapacity() * sizeof(T); }
-
-private:
-
-    int m_nCounter;
-    PodArray<T*> m_Pools;
-    PodArray<T*> m_FreeElements;
-};
-
-struct SImageSubInfo
-{
-    SImageSubInfo() { memset(this, 0, sizeof(*this)); fTiling = fTilingIn = 1.f; }
-
-    static const int nMipsNum = 4;
-
-    union
-    {
-        byte* pImgMips[nMipsNum];
-        int pImgMipsSizeKeeper[8];
-    };
-
-    float fAmount;
-    int  nReady;
-    int nDummy[4];
-
-    _smart_ptr<IMaterial> pMat;
-    int nDim;
-    float fTilingIn;
-    float fTiling;
-    float fSpecularAmount;
-    int nSortOrder;
-    int nAlignFix;
-
-    AUTO_STRUCT_INFO
-};
-
-struct SImageInfo
-    : public Cry3DEngineBase
-{
-    SImageInfo()
-    {
-        szDetMatName[0] = szBaseTexName[0] = '\0';
-        nPhysSurfaceType = 0;
-        nLayerId = 0;
-        fUseRemeshing = 0;
-        fBr = 1.f;
-        layerFilterColor = Col_White;
-        nDetailSurfTypeId = 0;
-        ZeroStruct(arrTextureId);
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/ }
-
-    SImageSubInfo baseInfo;
-    SImageSubInfo detailInfo;
-
-    char szDetMatName[128 - 20];
-
-    int arrTextureId[4];
-    int nPhysSurfaceType;
-
-    char szBaseTexName[128];
-
-    float fUseRemeshing;
-    ColorF layerFilterColor;
-    int nLayerId;
-    float fBr;
-    int nDetailSurfTypeId;
-
-    int GetMemoryUsage();
-
-    AUTO_STRUCT_INFO
-};
-
-struct SSceneFrustum
-{
-    uint32* pRgbImage;
-    uint32  nRgbWidth, nRgbHeight;
-
-    float* pDepthImage;
-    uint32  nDepthWidth, nDepthHeight;
-
-    CCamera camera;
-
-    IRenderMesh* pRM;
-    _smart_ptr<IMaterial> pMaterial;
-
-    float fDistance;
-    int nId;
-
-    static int Compare(const void* v1, const void* v2)
-    {
-        SSceneFrustum* p[2] = { (SSceneFrustum*)v1, (SSceneFrustum*)v2 };
-
-        if (p[0]->fDistance > p[1]->fDistance)
-        {
-            return 1;
-        }
-        if (p[0]->fDistance < p[1]->fDistance)
-        {
-            return -1;
-        }
-
-        if (p[0]->nId > p[1]->nId)
-        {
-            return 1;
-        }
-        if (p[0]->nId < p[1]->nId)
-        {
-            return -1;
-        }
-
-        return 0;
-    }
-};
-
-struct SPerObjectShadow
-{
-    IShadowCaster* pCaster;
-    float fConstBias;
-    float fSlopeBias;
-    float fJitter;
-    Vec3  vBBoxScale;
-    uint nTexSize;
-};
-//////////////////////////////////////////////////////////////////////
-#define LV_MAX_COUNT 256
-#define LV_LIGHTS_MAX_COUNT 64
-
-#define LV_WORLD_BUCKET_SIZE 512
-#define LV_LIGHTS_WORLD_BUCKET_SIZE 512
-
-#define LV_WORLD_SIZEX 128
-#define LV_WORLD_SIZEY 128
-#define LV_WORLD_SIZEZ 64
-
-#define LV_CELL_SIZEX 4
-#define LV_CELL_SIZEY 4
-#define LV_CELL_SIZEZ 8
-
-#define LV_CELL_RSIZEX (1.0f / (float)LV_CELL_SIZEX)
-#define LV_CELL_RSIZEY (1.0f / (float)LV_CELL_SIZEY)
-#define LV_CELL_RSIZEZ (1.0f / (float)LV_CELL_SIZEZ)
-
-#define LV_LIGHT_CELL_SIZE 32
-#define LV_LIGHT_CELL_R_SIZE (1.0f / (float)LV_LIGHT_CELL_SIZE)
-
-#define LV_DLF_LIGHTVOLUMES_MASK (DLF_DISABLED | DLF_FAKE | DLF_AMBIENT | DLF_DEFERRED_CUBEMAPS)
-
-class CLightVolumesMgr
-    : public Cry3DEngineBase
-{
-public:
-    CLightVolumesMgr()
-    {
-        Init();
-    }
-
-    void Init();
-    void Reset();
-    uint16 RegisterVolume(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo);
-    void RegisterLight(const CDLight& pDL, uint32 nLightID, const SRenderingPassInfo& passInfo);
-    void Update(const SRenderingPassInfo& passInfo);
-    void Clear(const SRenderingPassInfo& passInfo);
-    void GetLightVolumes(threadID nThreadID, SLightVolume*& pLightVols, uint32& nNumVols);
-#ifndef _RELEASE
-    void DrawDebug(const SRenderingPassInfo& passInfo);
-#endif
-
-private:
-    struct SLightVolInfo
-    {
-        SLightVolInfo()
-            : vVolume(ZERO, 0.0f)
-            , nNextVolume(0)
-            , nClipVolumeID(0)
-        {
-        };
-        SLightVolInfo(const Vec3& pPos, float fRad, uint8 clipVolumeID)
-            : vVolume(pPos, fRad)
-            , nNextVolume(0)
-            , nClipVolumeID(clipVolumeID)
-        {
-        };
-
-        Vec4 vVolume; // xyz: position, w: radius
-        uint16 nNextVolume; // index of next light volume for this hash bucket (0 if none)
-        uint8 nClipVolumeID; // clip volume stencil ref
-    };
-
-    struct SLightCell
-    {
-        SLightCell()
-            : nLightCount(0)
-        {
-        };
-
-        uint16 nLightID[LV_LIGHTS_MAX_COUNT];
-        uint8 nLightCount;
-    };
-
-    inline int32 GetIntHash(const int32 k, [[maybe_unused]] const int32 nBucketSize = LV_WORLD_BUCKET_SIZE) const
-    {
-        static const uint32 nHashBits = 9;
-        static const uint32 nGoldenRatio32bits = 2654435761u; // (2^32) / (golden ratio)
-        return (k * nGoldenRatio32bits) >> (32 - nHashBits);  // ref: knuths integer multiplicative hash function
-    }
-
-    inline uint16 GetWorldHashBucketKey(const int32 x, const int32 y, const int32 z, const int32 nBucketSize = LV_WORLD_BUCKET_SIZE) const
-    {
-        const uint32 nPrimeNum = 101;//0xd8163841;
-        return aznumeric_caster((((GetIntHash(x) + nPrimeNum) * nPrimeNum + GetIntHash(y)) * nPrimeNum + GetIntHash(z)) & (nBucketSize - 1));
-    }
-
-    void AddLight(const SRenderLight& pLight, const SLightVolInfo* __restrict pVolInfo, SLightVolume& pVolume);
-
-    typedef DynArray<SLightVolume> LightVolumeVector;
-
-private:
-    LightVolumeVector m_pLightVolumes[RT_COMMAND_BUF_COUNT];        // Final light volume list. <todo> move light list creation to renderer to avoid double-buffering this
-    DynArray<SLightVolInfo*> m_pLightVolsInfo[RT_COMMAND_BUF_COUNT]; // World cells data
-    SLightCell m_pWorldLightCells[LV_LIGHTS_WORLD_BUCKET_SIZE];     // 2D World cell buckets for light sources ids
-    uint16 m_nWorldCells[LV_WORLD_BUCKET_SIZE];                     // World cell buckets for light volumes
-    bool m_bUpdateLightVolumes : 1;
-};
-
-// onscreen infodebug for e_debugDraw >= 100
-#ifndef _RELEASE
-class CDebugDrawListMgr
-{
-    typedef CryFixedStringT<64> TMyStandardString;
-    typedef CryFixedStringT<128> TFilenameString;
-
-public:
-
-    CDebugDrawListMgr();
-    void Update();
-    void AddObject(I3DEngine::SObjectInfoToAddToDebugDrawList& objInfo);
-    void DumpLog();
-    bool IsEnabled() const { return Cry3DEngineBase::GetCVars()->e_DebugDraw >= LM_BASENUMBER; }
-    static void ConsoleCommand(IConsoleCmdArgs* args);
-
-private:
-
-    enum
-    {
-        UNDEFINED_ASSET_ID = 0xffffffff
-    };
-
-    struct TAssetInfo
-    {
-        TMyStandardString   name;
-        TFilenameString fileName;
-        uint32      numTris;
-        uint32      numVerts;
-        uint32      texMemory;
-        uint32      meshMemory;
-        uint32      drawCalls;
-        uint32      numInstances;
-        I3DEngine::EDebugDrawListAssetTypes type;
-        uint32      ID; // to identify which drawBoxes belong to this asset
-
-        TAssetInfo(const I3DEngine::SObjectInfoToAddToDebugDrawList& objInfo);
-        bool operator<(const TAssetInfo& other) const;
-    };
-
-    struct TObjectDrawBoxInfo
-    {
-        Matrix34    mat;
-        AABB            bbox;
-        uint32      assetID;
-
-        TObjectDrawBoxInfo(const I3DEngine::SObjectInfoToAddToDebugDrawList& objInfo);
-    };
-
-    void FindNewLeastValueAsset();
-    void ClearFrameData();
-    void ClearConsoleCommandRequestVars();
-    static bool SortComparison(const TAssetInfo& A, const TAssetInfo& B) { return B < A; }
-    const char* GetStrCurrMode();
-    void GetStrCurrFilter(TMyStandardString& strOut);
-    bool ShouldFilterOutObject(const I3DEngine::SObjectInfoToAddToDebugDrawList& newObject);
-    void MemToString(uint32 memVal, TMyStandardString& outStr);
-    static void PrintText(float x, float y, const ColorF& fColor, const char* label_text, ...);
-    const char* GetAssetTypeName(I3DEngine::EDebugDrawListAssetTypes type);
-    TAssetInfo* FindDuplicate(const TAssetInfo& object);
-    void CheckFilterCVar();
-
-    // to avoid any heap allocation
-    static void MyStandardString_Concatenate(TMyStandardString& outStr, const char* str);
-    static void MyFileNameString_Assign(TFilenameString& outStr, const char* pStr);
-
-    template<class T>
-    static void MyString_Assign(T& outStr, const char* pStr)
-    {
-        if (pStr)
-        {
-            outStr._Assign(pStr, min(strlen(pStr), outStr.capacity()));
-        }
-        else
-        {
-            outStr = "";
-        }
-    }
-
-
-
-    enum EListModes
-    {
-        LM_BASENUMBER = 100,
-        LM_TRI_COUNT = LM_BASENUMBER,
-        LM_VERT_COUNT,
-        LM_DRAWCALLS,
-        LM_TEXTMEM,
-        LM_MESHMEM
-    };
-
-
-    bool                                            m_isFrozen;
-    uint32                                      m_counter;
-    uint32                                      m_assetCounter;
-    uint32                                      m_indexLeastValueAsset;
-    std::vector<TAssetInfo>     m_assets;
-    std::vector<TObjectDrawBoxInfo> m_drawBoxes;
-    CryCriticalSection              m_lock;
-
-    static bool                             m_dumpLogRequested;
-    static bool                             m_freezeRequested;
-    static bool                             m_unfreezeRequested;
-    static uint32                           m_filter;
-};
-#endif //_RELEASE
-
-//////////////////////////////////////////////////////////////////////
-class C3DEngine
-    : public I3DEngine
-    , public Cry3DEngineBase
-{
-public:
-
-    // I3DEngine interface implementation
-    virtual bool Init();
-    virtual void OnFrameStart();
-    virtual void Update();
-    virtual void RenderWorld(int nRenderFlags, const SRenderingPassInfo& passInfo, const char* szDebugName);
-    virtual void PreWorldStreamUpdate(const CCamera& cam);
-    virtual void WorldStreamUpdate();
-    virtual void ShutDown();
-    virtual void Release() { CryAlignedDelete(this); };
-    virtual void SetLevelPath(const char* szFolderName);
-    virtual bool LoadLevel(const char* szFolderName, const char* szMissionName);
-    virtual void UnloadLevel();
-    virtual void PostLoadLevel();
-    virtual bool InitLevelForEditor(const char* szFolderName, const char* szMissionName);
-    virtual bool LevelLoadingInProgress();
-    virtual void DisplayInfo(float& fTextPosX, float& fTextPosY, float& fTextStepY, bool bEnhanced);
-    virtual void DisplayMemoryStatistics();
-    virtual void SetupDistanceFog();
-    virtual IStatObj* LoadStatObjUnsafeManualRef(const char* fileName, const char* geomName = nullptr, /*[Out]*/ IStatObj::SSubObject** subObject = nullptr, 
-        bool useStreaming = true, unsigned long loadingFlags = 0, const void* data = nullptr, int dataSize = 0) override;
-    virtual _smart_ptr<IStatObj> LoadStatObjAutoRef(const char* fileName, const char* geomName = nullptr, /*[Out]*/ IStatObj::SSubObject** subObject = nullptr, 
-        bool useStreaming = true, unsigned long loadingFlags = 0, const void* data = nullptr, int dataSize = 0) override;
-    virtual const IObjManager* GetObjectManager() const;
-    virtual IObjManager* GetObjectManager();
-
-    virtual IStatObj* FindStatObjectByFilename(const char* filename);
-    virtual void RegisterEntity(IRenderNode* pEnt, int nSID = -1, int nSIDConsideredSafe = -1);
-    virtual bool IsSunShadows(){ return m_bSunShadows; };
-    virtual void SelectEntity(IRenderNode* pEnt);
-    virtual void LoadEmptyLevel() override;
-
-    virtual void LoadStatObjAsync(LoadStaticObjectAsyncResult resultCallback, const char* szFileName, const char* szGeomName = nullptr, bool bUseStreaming = true, unsigned long nLoadingFlags = 0);
-    virtual void ProcessAsyncStaticObjectLoadRequests() override;
-
-#ifndef _RELEASE
-    virtual void AddObjToDebugDrawList(SObjectInfoToAddToDebugDrawList& objInfo);
-    virtual bool IsDebugDrawListEnabled() const { return m_DebugDrawListMgr.IsEnabled(); }
-#endif
-
-    virtual void UnRegisterEntityDirect(IRenderNode* pEnt);
-    virtual void UnRegisterEntityAsJob(IRenderNode* pEnt);
-
-    virtual bool IsUnderWater(const Vec3& vPos) const;
-    virtual void SetOceanRenderFlags(uint8 nFlags);
-    virtual uint8 GetOceanRenderFlags() const { return m_nOceanRenderFlags; }
-    virtual uint32 GetOceanVisiblePixelsCount() const;
-    virtual float GetBottomLevel(const Vec3& referencePos, float maxRelevantDepth, int objtypes);
-    virtual float GetBottomLevel(const Vec3& referencePos, float maxRelevantDepth /* = 10.0f*/);
-    virtual float GetBottomLevel(const Vec3& referencePos, int objflags);
-
-#if defined(USE_GEOM_CACHES)
-    virtual IGeomCache* LoadGeomCache(const char* szFileName);
-    virtual IGeomCache* FindGeomCacheByFilename(const char* szFileName);
-#endif
-
-    virtual IStatObj* LoadDesignerObject(int nVersion, const char* szBinaryStream, int size);
-
-    void AsyncOctreeUpdate(IRenderNode* pEnt, int nSID, int nSIDConsideredSafe, uint32 nFrameID, bool bUnRegisterOnly);
-    bool UnRegisterEntityImpl(IRenderNode* pEnt);
-
-    // Fast option - use if just ocean height required
-    virtual float GetWaterLevel();
-    // This will return ocean height or water volume height, optional for accurate water height query
-    virtual float GetWaterLevel(const Vec3* pvPos, IPhysicalEntity* pent = NULL, bool bAccurate = false);
-    // Only use for Accurate query - this will return exact ocean height
-    virtual float GetAccurateOceanHeight(const Vec3& pCurrPos) const;
-
-    virtual CausticsParams GetCausticsParams() const;
-    virtual OceanAnimationData GetOceanAnimationParams() const override;
-    virtual void GetHDRSetupParams(Vec4 pParams[5]) const;
-    virtual void CreateDecal(const CryEngineDecalInfo& Decal);
-
-    virtual void SetSunDir(const Vec3& newSunOffset);
-    virtual Vec3 GetSunDir() const;
-    virtual Vec3 GetSunDirNormalized() const;
-    virtual Vec3 GetRealtimeSunDirNormalized() const;
-    virtual void SetSunColor(Vec3 vColor);
-    Vec3 GetSunAnimColor() override;
-    void SetSunAnimColor(const Vec3& sunAnimColor) override;
-    float GetSunAnimSpeed() override;
-    void SetSunAnimSpeed(float sunAnimSpeed) override;
-    AZ::u8 GetSunAnimPhase() override;
-    void SetSunAnimPhase(AZ::u8 sunAnimPhase) override;
-    AZ::u8 GetSunAnimIndex() override;
-    void SetSunAnimIndex(AZ::u8 sunAnimIndex) override;
-    virtual void SetSSAOAmount(float fMul);
-    virtual void SetSSAOContrast(float fMul);
-    virtual void SetRainParams(const SRainParams& rainParams);
-    virtual bool GetRainParams(SRainParams& rainParams);
-    virtual void SetSnowSurfaceParams(const Vec3& vCenter, float fRadius, float fSnowAmount, float fFrostAmount, float fSurfaceFreezing);
-    virtual bool GetSnowSurfaceParams(Vec3& vCenter, float& fRadius, float& fSnowAmount, float& fFrostAmount, float& fSurfaceFreezing);
-    virtual void SetSnowFallParams(int nSnowFlakeCount, float fSnowFlakeSize, float fSnowFallBrightness, float fSnowFallGravityScale, float fSnowFallWindScale, float fSnowFallTurbulence, float fSnowFallTurbulenceFreq);
-    virtual bool GetSnowFallParams(int& nSnowFlakeCount, float& fSnowFlakeSize, float& fSnowFallBrightness, float& fSnowFallGravityScale, float& fSnowFallWindScale, float& fSnowFallTurbulence, float& fSnowFallTurbulenceFreq);
-    virtual void OnExplosion(Vec3 vPos, float fRadius, bool bDeformTerrain = true);
-    //! For editor
-    virtual void RemoveAllStaticObjects(int nSID);
-
-    virtual void SetPhysMaterialEnumerator(IPhysMaterialEnumerator* pPhysMaterialEnumerator);
-    virtual IPhysMaterialEnumerator* GetPhysMaterialEnumerator();
-    virtual void LoadMissionDataFromXMLNode(const char* szMissionName);
-
-    void AddDynamicLightSource(const class CDLight& LSource, ILightSource* pEnt, int nEntityLightId, float fFadeout, const SRenderingPassInfo& passInfo);
-
-    inline void AddLightToRenderer(const CDLight& pLight, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-    {
-        const uint32 nLightID = GetRenderer()->EF_GetDeferredLightsNum();
-        GetRenderer()->EF_AddDeferredLight(pLight, fMult, passInfo, rendItemSorter);
-        Get3DEngine()->m_LightVolumesMgr.RegisterLight(pLight, nLightID, passInfo);
-        m_nDeferredLightsNum++;
-    }
-
-    virtual void SetMaxViewDistanceScale(float fScale) { m_fMaxViewDistScale = fScale; }
-    virtual float GetMaxViewDistance(bool bScaled = true);
-    virtual const SFrameLodInfo& GetFrameLodInfo() const { return m_frameLodInfo; }
-    virtual void SetFrameLodInfo(const SFrameLodInfo& frameLodInfo);
-    virtual void SetFogColor(const Vec3& vFogColor);
-    virtual Vec3 GetFogColor();
-    virtual float GetDistanceToSectorWithWater();
-
-    virtual void GetSkyLightParameters(Vec3& sunDir, Vec3& sunIntensity, float& Km, float& Kr, float& g, Vec3& rgbWaveLengths);
-    virtual void SetSkyLightParameters(const Vec3& sunDir, const Vec3& sunIntensity, float Km, float Kr, float g, const Vec3& rgbWaveLengths, bool forceImmediateUpdate = false);
-
-    void SetLightsHDRDynamicPowerFactor(const float value);
-    virtual float GetLightsHDRDynamicPowerFactor() const;
-
-    // Return true if tessellation is allowed (by cvars) into currently set shadow map LOD
-    bool IsTessellationAllowedForShadowMap(const SRenderingPassInfo& passInfo) const;
-    // Return true if tessellation is allowed for given render object
-    virtual bool IsTessellationAllowed(const CRenderObject* pObj, const SRenderingPassInfo& passInfo, bool bIgnoreShadowPass = false) const;
-
-    virtual void SetRenderNodeMaterialAtPosition(EERType eNodeType, const Vec3& vPos, _smart_ptr<IMaterial> pMat);
-    virtual void OverrideCameraPrecachePoint(const Vec3& vPos);
-    virtual int AddPrecachePoint(const Vec3& vPos, const Vec3& vDir, float fTimeOut = 3.f, float fImportanceFactor = 1.0f);
-    virtual void ClearPrecachePoint(int id);
-    virtual void ClearAllPrecachePoints();
-    virtual void GetPrecacheRoundIds(int pRoundIds[MAX_STREAM_PREDICTION_ZONES]);
-
-    virtual void TraceFogVolumes(const Vec3& vPos, const AABB& objBBox, SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo, bool fogVolumeShadingQuality);
-
-    virtual Vec3 GetSunColor() const;
-    virtual float GetSSAOAmount() const;
-    virtual float GetSSAOContrast() const;
-
-    virtual void FreeRenderNodeState(IRenderNode* pEnt);
-    virtual const char* GetLevelFilePath(const char* szFileName);
-
-    bool LoadCompiledOctreeForEditor() override;
-    virtual bool SetStatInstGroup(int nGroupId, const IStatInstGroup& siGroup, int nSID);
-    virtual bool GetStatInstGroup(int nGroupId, IStatInstGroup& siGroup, int nSID);
-    virtual void ActivatePortal(const Vec3& vPos, bool bActivate, const char* szEntityName);
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual void GetResourceMemoryUsage(ICrySizer* pSizer, const AABB& cstAABB);
-    virtual IVisArea* CreateVisArea(uint64 visGUID);
-    virtual void DeleteVisArea(IVisArea* pVisArea);
-    virtual void UpdateVisArea(IVisArea* pArea, const Vec3* pPoints, int nCount, const char* szName,
-        const SVisAreaInfo& info, bool bReregisterObjects);
-    virtual IClipVolume* CreateClipVolume();
-    virtual void DeleteClipVolume(IClipVolume* pClipVolume);
-    virtual void UpdateClipVolume(IClipVolume* pClipVolume, _smart_ptr<IRenderMesh> pRenderMesh, IBSPTree3D* pBspTree, const Matrix34& worldTM, bool bActive, uint32 flags, const char* szName);
-    virtual void ResetParticlesAndDecals();
-    virtual IRenderNode* CreateRenderNode(EERType type);
-    virtual void DeleteRenderNode(IRenderNode* pRenderNode);
-    virtual Vec3 GetWind(const AABB& box, bool bIndoors) const;
-    virtual Vec3 GetGlobalWind(bool bIndoors) const;
-    virtual bool SampleWind(Vec3* pSamples, int nSamples, const AABB& volume, bool bIndoors) const;
-    void SetupBending(CRenderObject*& pObj, const IRenderNode* pNode, const float fRadiusVert, const SRenderingPassInfo& passInfo, bool alreadyDuplicated = false);
-    virtual IVisArea* GetVisAreaFromPos(const Vec3& vPos);
-    virtual bool IntersectsVisAreas(const AABB& box, void** pNodeCache = 0);
-    virtual bool ClipToVisAreas(IVisArea* pInside, Sphere& sphere, Vec3 const& vNormal, void* pNodeCache = 0);
-    virtual bool IsVisAreasConnected(IVisArea* pArea1, IVisArea* pArea2, int nMaxReqursion, bool bSkipDisabledPortals);
-    void EnableOceanRendering(bool bOcean); // todo: remove
-
-    virtual void AddTextureLoadHandler(ITextureLoadHandler* pHandler);
-    virtual void RemoveTextureLoadHandler(ITextureLoadHandler* pHandler);
-    virtual ITextureLoadHandler* GetTextureLoadHandlerForImage(const char* ext);
-    virtual struct ILightSource* CreateLightSource();
-    virtual void DeleteLightSource(ILightSource* pLightSource);
-    virtual bool RestoreTerrainFromDisk(int nSID);
-    virtual void CheckMemoryHeap();
-
-    virtual int GetLoadedObjectCount();
-    virtual void GetLoadedStatObjArray(IStatObj** pObjectsArray, int& nCount);
-    virtual void GetObjectsStreamingStatus(SObjectsStreamingStatus& outStatus);
-    virtual void GetStreamingSubsystemData(int subsystem, SStremaingBandwidthData& outData);
-    virtual void DeleteEntityDecals(IRenderNode* pEntity);
-    virtual void DeleteDecalsInRange(AABB* pAreaBox, IRenderNode* pEntity);
-    virtual void LockCGFResources();
-    virtual void UnlockCGFResources();
-    virtual void FreeUnusedCGFResources();
-
-    virtual void SerializeState(TSerialize ser);
-    virtual void PostSerialize(bool bReading);
-
-    virtual void SetStreamableListener(IStreamedObjectListener* pListener);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Materials access.
-    virtual IMaterialHelpers& GetMaterialHelpers();
-    virtual IMaterialManager* GetMaterialManager();
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // ObjManager access.
-    virtual IObjManager* GetObjManager() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // CGF Loader.
-    //////////////////////////////////////////////////////////////////////////
-    virtual CContentCGF* CreateChunkfileContent(const char* filename);
-    virtual void ReleaseChunkfileContent(CContentCGF*);
-    virtual bool LoadChunkFileContent(CContentCGF* pCGF, const char* filename, bool bNoWarningMode = false, bool bCopyChunkFile = true);
-    virtual bool LoadChunkFileContentFromMem(CContentCGF* pCGF, const void* pData, size_t nDataLen, uint32 nLoadingFlags, bool bNoWarningMode = false, bool bCopyChunkFile = true);
-    //////////////////////////////////////////////////////////////////////////
-    virtual IChunkFile* CreateChunkFile(bool bReadOnly = false);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Chunk file writer.
-    //////////////////////////////////////////////////////////////////////////
-    virtual ChunkFile::IChunkFileWriter* CreateChunkFileWriter(EChunkFileFormat eFormat, AZ::IO::IArchive* pPak, const char* filename) const;
-    virtual void ReleaseChunkFileWriter(ChunkFile::IChunkFileWriter* p) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Post processing effects interfaces
-
-    class IPostEffectGroupManager* GetPostEffectGroups() const override { return m_postEffectGroups.get(); }
-    class IPostEffectGroup* GetPostEffectBaseGroup() const override { return m_postEffectBaseGroup; }
-
-    // Most code should use either GetPostEffectGroups() or GetPostEffectBaseGroup() instead of these
-    virtual void SetPostEffectParam(const char* pParam, float fValue, bool bForceValue = false) const;
-    virtual void SetPostEffectParamVec4(const char* pParam, const Vec4& pValue, bool bForceValue = false) const;
-    virtual void SetPostEffectParamString(const char* pParam, const char* pszArg) const;
-
-    virtual void GetPostEffectParam(const char* pParam, float& fValue) const;
-    virtual void GetPostEffectParamVec4(const char* pParam, Vec4& pValue) const;
-    virtual void GetPostEffectParamString(const char* pParam, const char*& pszArg) const;
-
-    virtual int32 GetPostEffectID(const char* pPostEffectName);
-
-    virtual void ResetPostEffects(bool bOnSpecChange = false);
-    virtual void DisablePostEffects();
-
-    virtual void SetShadowsGSMCache(bool bCache);
-    virtual void SetCachedShadowBounds(const AABB& shadowBounds, float fAdditionalCascadesScale);
-    virtual void SetRecomputeCachedShadows(uint nUpdateStrategy = 0);
-    void SetShadowsCascadesBias(const float* pCascadeConstBias, const float* pCascadeSlopeBias);
-    const float* GetShadowsCascadesConstBias() const { return m_pShadowCascadeConstBias; }
-    const float* GetShadowsCascadesSlopeBias() const { return m_pShadowCascadeSlopeBias; }
-    int GetShadowsCascadeCount(const CDLight* pLight) const;
-
-    virtual uint32 GetObjectsByType(EERType objType, IRenderNode** pObjects);
-    uint32 GetObjectsByTypeInBox(EERType objType, const AABB& bbox, IRenderNode** pObjects, ObjectTreeQueryFilterCallback filterCallback = nullptr) override;
-    virtual uint32 GetObjectsInBox(const AABB& bbox, IRenderNode** pObjects = 0);
-    void GetObjectsByTypeInBox(EERType objType, const AABB& bbox, PodArray<IRenderNode*>* pLstObjects, ObjectTreeQueryFilterCallback filterCallback = nullptr) override;
-    virtual uint32 GetObjectsByFlags(uint dwFlags, IRenderNode** pObjects = 0);
-    virtual void OnObjectModified(IRenderNode* pRenderNode, uint dwFlags);
-
-    virtual void ActivateObjectsLayer(uint16 nLayerId, bool bActivate, bool bPhys, bool bObjects, bool bStaticLights, const char* pLayerName, IGeneralMemoryHeap* pHeap = NULL, bool bCheckLayerActivation = true);
-    virtual void GetLayerMemoryUsage(uint16 nLayerId, ICrySizer* pSizer, int* pNumBrushes, int* pNumDecals) const;
-    virtual void SkipLayerLoading(uint16 nLayerId, bool bClearList);
-    bool IsLayerSkipped(uint16 nLayerId);
-
-    //////////////////////////////////////////////////////////////////////////
-
-    const char* GetLevelFolder() override { return m_szLevelFolder; }
-
-    bool SaveCGF(std::vector<IStatObj*>& pObjs);
-
-    virtual bool IsAreaActivationInUse() { return m_bAreaActivationInUse && GetCVars()->e_ObjectLayersActivation; }
-
-    int GetCurrentLightSpec()
-    {
-        return CONFIG_VERYHIGH_SPEC; // very high spec.
-    }
-
-    bool CheckMinSpec(uint32 nMinSpec) override;
-
-    void UpdateRenderingCamera(const char* szCallerName, const SRenderingPassInfo& passInfo);
-    virtual void PrepareOcclusion(const CCamera& rCamera);
-    virtual void EndOcclusion();
-#ifndef _RELEASE
-    void ProcessStreamingLatencyTest(const CCamera& camIn, CCamera& camOut, const SRenderingPassInfo& passInfo);
-#endif
-
-    void ScreenShotHighRes(CStitchedImage* pStitchedImage, const int nRenderFlags, const SRenderingPassInfo& passInfo, uint32 SliceCount, f32 fTransitionSize);
-
-    // cylindrical mapping made by multiple slices rendered and distorted
-    // Returns:
-    //   true=mode is active, stop normal rendering, false=mode is not active
-    bool ScreenShotPanorama(CStitchedImage* pStitchedImage, const int nRenderFlags, const SRenderingPassInfo& passInfo, uint32 SliceCount, f32 fTransitionSize);
-    // Render simple top-down screenshot for map overviews
-    bool ScreenShotMap(CStitchedImage* pStitchedImage, const int nRenderFlags, const SRenderingPassInfo& passInfo, uint32 SliceCount, f32 fTransitionSize);
-
-    void ScreenshotDispatcher(const int nRenderFlags, const SRenderingPassInfo& passInfo);
-
-    virtual void FillDebugFPSInfo(SDebugFPSInfo& info);
-
-    void ClearDebugFPSInfo(bool bUnload = false)
-    {
-        m_fAverageFPS = 0.0f;
-        m_fMinFPS = m_fMinFPSDecay = 999.f;
-        m_fMaxFPS = m_fMaxFPSDecay = 0.0f;
-        ClearPrecacheInfo();
-        if (bUnload)
-        {
-            stl::free_container(arrFPSforSaveLevelStats);
-        }
-        else
-        {
-            arrFPSforSaveLevelStats.clear();
-        }
-    }
-
-    void ClearPrecacheInfo()
-    {
-        m_nFramesSinceLevelStart = 0;
-        m_nStreamingFramesSinceLevelStart = 0;
-        m_bPreCacheEndEventSent = false;
-        m_fTimeStateStarted = 0.0f;
-    }
-
-    virtual const CCamera& GetRenderingCamera() const       { return m_RenderingCamera; }
-    virtual float GetZoomFactor() const                     { return m_fZoomFactor; }
-    virtual void Tick();
-
-    virtual void UpdateShaderItems();
-    void GetCollisionClass(SCollisionClass& collclass, int tableIndex);
-
-    C3DEngine(ISystem* pSystem);
-    ~C3DEngine();
-
-    const float GetGSMRange() override { return m_fGsmRange; }
-    const float GetGSMRangeStep() override { return m_fGsmRangeStep; }
-
-    void UpdatePreRender(const SRenderingPassInfo& passInfo);
-    void UpdatePostRender(const SRenderingPassInfo& passInfo);
-
-    virtual void RenderScene(const int nRenderFlags, const SRenderingPassInfo& passInfo);
-    virtual void RenderSceneReflection(int nRenderFlags, const SRenderingPassInfo& passInfo);
-    virtual void DebugDraw_UpdateDebugNode();
-
-    void DebugDraw_Draw();
-    bool IsOutdoorVisible();
-    void RenderSkyBox(_smart_ptr<IMaterial> pMat, const SRenderingPassInfo& passInfo);
-
-    int GetStreamingFramesSinceLevelStart() { return m_nStreamingFramesSinceLevelStart; }
-    int GetRenderFramesSinceLevelStart() { return m_nFramesSinceLevelStart; }
-
-    bool CreateDecalInstance(const CryEngineDecalInfo&DecalInfo, class CDecal* pCallerManagedDecal);
-    Vec3 GetTerrainSurfaceNormal(Vec3 vPos);
-    void LoadEnvironmentSettingsFromXML(XmlNodeRef pInputNode, int nSID);
-#if defined(FEATURE_SVO_GI)
-    void LoadTISettings(XmlNodeRef pInputNode);
-#endif
-    void LoadDefaultAssets();
-
-    // access to components
-    static CVars* GetCVars() { return m_pCVars; }
-    ILINE CVisAreaManager* GetVisAreaManager() { return m_pVisAreaManager; }
-    ILINE CClipVolumeManager* GetClipVolumeManager() { return m_pClipVolumeManager; }
-    ILINE PodArray<ILightSource*>* GetLightEntities() { return &m_lstStaticLights; }
-
-    ILINE IGeneralMemoryHeap* GetBreakableBrushHeap() { return m_pBreakableBrushHeap; }
-
-    virtual void OnCameraTeleport();
-
-    bool m_bAreaActivationInUse;
-
-    // Level info
-    float m_fSkyBoxAngle, m_fSkyBoxStretching;
-
-    float m_fMaxViewDistScale;
-    float m_fMaxViewDistHighSpec;
-    float m_fMaxViewDistLowSpec;
-
-    float m_volFogGlobalDensity;
-    float m_volFogGlobalDensityMultiplierLDR;
-    float m_volFogFinalDensityClamp;
-
-    float m_fCloudShadingSunLightMultiplier;
-    float m_fCloudShadingSkyLightMultiplier;
-    Vec3 m_vCloudShadingCustomSunColor;
-    Vec3 m_vCloudShadingCustomSkyColor;
-
-    Vec3 m_vFogColor;
-    Vec3 m_vDefFogColor;
-    Vec3 m_vSunDir;
-    Vec3 m_vSunDirNormalized;
-    float m_fSunDirUpdateTime;
-    Vec3 m_vSunDirRealtime;
-
-    Vec3 m_volFogRamp;
-    Vec3 m_volFogShadowRange;
-    Vec3 m_volFogShadowDarkening;
-    Vec3 m_volFogShadowEnable;
-
-    Vec3 m_volFog2CtrlParams;
-    Vec3 m_volFog2ScatteringParams;
-    Vec3 m_volFog2Ramp;
-    Vec3 m_volFog2Color;
-    Vec3 m_volFog2GlobalDensity;
-    Vec3 m_volFog2HeightDensity;
-    Vec3 m_volFog2HeightDensity2;
-    Vec3 m_volFog2Color1;
-    Vec3 m_volFog2Color2;
-
-    Vec3 m_nightSkyHorizonCol;
-    Vec3 m_nightSkyZenithCol;
-    float m_nightSkyZenithColShift;
-    float m_nightSkyStarIntensity;
-    Vec3 m_nightMoonCol;
-    float m_nightMoonSize;
-    Vec3 m_nightMoonInnerCoronaCol;
-    float m_nightMoonInnerCoronaScale;
-    Vec3 m_nightMoonOuterCoronaCol;
-    float m_nightMoonOuterCoronaScale;
-
-    float m_moonRotationLatitude;
-    float m_moonRotationLongitude;
-    Vec3 m_moonDirection;
-    int m_nWaterBottomTexId;
-    int m_nNightMoonTexId;
-    float m_fSunClipPlaneRange;
-    float m_fSunClipPlaneRangeShift;
-    bool m_bSunShadows;
-
-    int m_nCloudShadowTexId;
-
-    float m_fGsmRange;
-    float m_fGsmRangeStep;
-    float m_fShadowsConstBias;
-    float m_fShadowsSlopeBias;
-
-    int m_nSunAdditionalCascades;
-    int m_nGsmCache;
-    Vec3 m_oceanFogColor;
-    Vec3 m_oceanFogColorShallow;
-    float m_oceanFogDensity;
-    float m_skyboxMultiplier;
-    float m_dayNightIndicator;
-    bool m_bHeightMapAoEnabled;
-
-    Vec3 m_fogColor2;
-    Vec3 m_fogColorRadial;
-    Vec3 m_volFogHeightDensity;
-    Vec3 m_volFogHeightDensity2;
-    Vec3 m_volFogGradientCtrl;
-
-private:
-    float m_oceanWindDirection;
-    float m_oceanWindSpeed;
-    float m_oceanWavesSpeed;
-    float m_oceanWavesAmount;
-    float m_oceanWavesSize;
-
-public:
-    float m_dawnStart;
-    float m_dawnEnd;
-    float m_duskStart;
-    float m_duskEnd;
-
-    float m_fParticlesAmbientMultiplier;
-    float m_fParticlesLightMultiplier;
-    // film characteristic curve tweakables
-    Vec4 m_vHDRFilmCurveParams;
-    Vec3 m_vHDREyeAdaptation;
-    Vec3 m_vHDREyeAdaptationLegacy;
-    float m_fHDRBloomAmount;
-
-    // hdr color grading
-    Vec3 m_vColorBalance;
-    float m_fHDRSaturation;
-
-    // default post effect group path
-    const char* m_defaultPostEffectGroup = "Libs/PostEffectGroups/Default.xml";
-
-#ifndef _RELEASE
-    CDebugDrawListMgr m_DebugDrawListMgr;
-#endif
-
-#define MAX_SHADOW_CASCADES_NUM 20
-
-    float m_pShadowCascadeConstBias[MAX_SHADOW_CASCADES_NUM];
-    float m_pShadowCascadeSlopeBias[MAX_SHADOW_CASCADES_NUM];
-
-    AABB m_CachedShadowsBounds;
-    uint  m_nCachedShadowsUpdateStrategy;
-    float m_fCachedShadowsCascadeScale;
-
-    // special case for combat mode adjustments
-    float m_fSaturation;
-    Vec4 m_pPhotoFilterColor;
-    float m_fPhotoFilterColorDensity;
-    float m_fGrainAmount;
-    float m_fSunSpecMult;
-
-    // Level shaders
-    _smart_ptr<IMaterial> m_pTerrainWaterMat;
-    _smart_ptr<IMaterial> m_pSkyMat;
-    _smart_ptr<IMaterial> m_pSkyLowSpecMat;
-    _smart_ptr<IMaterial> m_pSunMat;
-
-    // Fog Materials
-    _smart_ptr< IMaterial > m_pMatFogVolEllipsoid;
-    _smart_ptr< IMaterial > m_pMatFogVolBox;
-
-    void CleanLevelShaders()
-    {
-        m_pTerrainWaterMat = 0;
-        m_pSkyMat = 0;
-        m_pSkyLowSpecMat = 0;
-        m_pSunMat = 0;
-
-        m_pMatFogVolEllipsoid = 0;
-        m_pMatFogVolBox = 0;
-    }
-
-    // Render elements
-    CRESky* m_pRESky;
-    CREHDRSky* m_pREHDRSky;
-
-    int m_nDeferredLightsNum;
-
-    mutable Vec3* m_pWindSamplePositions;
-    mutable size_t m_nWindSamplePositions;
-
-    // functions SRenderingPass
-    virtual CCamera* GetRenderingPassCamera(const CCamera& rCamera);
-
-    virtual void GetSvoStaticTextures(I3DEngine::SSvoStaticTexInfo& svoInfo, PodArray<I3DEngine::SLightTI>* pLightsTI_S, PodArray<I3DEngine::SLightTI>* pLightsTI_D);
-    virtual void GetSvoBricksForUpdate(PodArray<SSvoNodeInfo>& arrNodeInfo, bool getDynamic);
-
-    bool IsShadersSyncLoad() { return m_bContentPrecacheRequested && GetCVars()->e_AutoPrecacheTexturesAndShaders; }
-    bool IsStatObjSyncLoad() { return m_bContentPrecacheRequested && GetCVars()->e_AutoPrecacheCgf; }
-    float GetAverageCameraSpeed() { return m_fAverageCameraSpeed; }
-    Vec3 GetAverageCameraMoveDir() { return m_vAverageCameraMoveDir; }
-
-    typedef std::map<uint64, int> ShadowFrustumListsCacheUsers;
-    ShadowFrustumListsCacheUsers m_FrustumsCacheUsers[2];
-
-    struct ILightSource* GetSunEntity();
-
-    void OnCasterDeleted(IShadowCaster* pCaster) override;
-
-    CCullBuffer* GetCoverageBuffer() { return m_pCoverageBuffer; }
-
-    void InitShadowFrustums(const SRenderingPassInfo& passInfo);
-
-    ///////////////////////////////////////////////////////////////////////////////
-
-    virtual void GetLightVolumes(threadID nThreadID, SLightVolume*& pLightVols, uint32& nNumVols);
-    virtual uint16 RegisterVolumeForLighting(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo);
-
-    CLightVolumesMgr m_LightVolumesMgr;
-
-    ///////////////////////////////////////////////////////////////////////////////
-
-    void RemoveEntityLightSources(IRenderNode* pEntity);
-
-    int GetRealLightsNum() { return m_nRealLightsNum; }
-    void SetupClearColor();
-    void CheckAddLight(CDLight* pLight, const SRenderingPassInfo& passInfo);
-
-    void DrawTextRightAligned(const float x, const float y, const char* format, ...) PRINTF_PARAMS(4, 5);
-    void DrawTextRightAligned(const float x, const float y, const float scale, const ColorF& color, const char* format, ...) PRINTF_PARAMS(6, 7);
-    void DrawTextLeftAligned(const float x, const float y, const float scale, const ColorF& color, const char* format, ...) PRINTF_PARAMS(6, 7);
-    void DrawTextAligned(int flags, const float x, const float y, const float scale, const ColorF& color, const char* format, ...) PRINTF_PARAMS(7, 8);
-
-    void DrawBBoxHelper(const Vec3& vMin, const Vec3& vMax, ColorB col = Col_White) override { DrawBBox(vMin, vMax, col); }
-    void DrawBBoxHelper(const AABB& box, ColorB col = Col_White) override { DrawBBox(box, col); }
-
-    float GetLightAmount(CDLight* pLight, const AABB& objBox);
-
-    IStatObj* CreateStatObj();
-    virtual IStatObj* CreateStatObjOptionalIndexedMesh(bool createIndexedMesh);
-
-    // Creates a new indexed mesh.
-    IIndexedMesh* CreateIndexedMesh();
-
-    void InitMaterialDefautMappingAxis(_smart_ptr<IMaterial> pMat) override;
-    _smart_ptr<IMaterial> MakeSystemMaterialFromShaderHelper(const char* sShaderName, SInputShaderResources* Res = NULL) override
-    {
-        return MakeSystemMaterialFromShader(sShaderName, Res);
-    }
-
-    bool CheckMinSpecHelper(uint32 nMinSpec) override { return CheckMinSpec(nMinSpec); }
-
-    virtual IVisAreaManager* GetIVisAreaManager() { return (IVisAreaManager*)m_pVisAreaManager; }
-    bool CreateOcean(_smart_ptr<IMaterial> pTerrainWaterMat, float waterLevel) override;
-    void DeleteOcean() override;
-    void ChangeOceanMaterial(_smart_ptr<IMaterial> pMat) override;
-    void ChangeOceanWaterLevel(float fWaterLevel) override;
-
-    bool LoadVisAreas(std::vector<struct IStatObj*>** ppStatObjTable, std::vector<_smart_ptr<IMaterial> >** ppMatTable);
-    bool LoadUsedShadersList();
-    bool PrecreateDecals();
-    void LoadFlaresData();
-
-    void LoadCollisionClasses(XmlNodeRef node);
-
-    virtual void PrecacheLevel(bool bPrecacheAllVisAreas, Vec3* pPrecachePoints, int nPrecachePointsNum);
-    virtual void ProposeContentPrecache() { m_bContentPrecacheRequested = true; }
-    bool IsContentPrecacheRequested() { return m_bContentPrecacheRequested; }
-
-    virtual ITimeOfDay* GetTimeOfDay();
-    virtual void SetSkyMaterialPath(const string& skyMaterialPath);
-    virtual void SetSkyLowSpecMaterialPath(const string& skyMaterialPath);
-    virtual void LoadSkyMaterial();
-    virtual _smart_ptr<IMaterial> GetSkyMaterial();
-    void SetSkyMaterial(_smart_ptr<IMaterial> pSkyMat) override;
-    bool IsHDRSkyMaterial(_smart_ptr<IMaterial> pMat) const;
-
-    using I3DEngine::SetGlobalParameter;
-    virtual void SetGlobalParameter(E3DEngineParameter param, const Vec3& v);
-    using I3DEngine::GetGlobalParameter;
-    virtual void GetGlobalParameter(E3DEngineParameter param, Vec3& v);
-    virtual void SetShadowMode(EShadowMode shadowMode) { m_eShadowMode = shadowMode; }
-    virtual EShadowMode GetShadowMode() const { return m_eShadowMode; }
-    virtual void AddPerObjectShadow(IShadowCaster* pCaster, float fConstBias, float fSlopeBias, float fJitter, const Vec3& vBBoxScale, uint nTexSize);
-    virtual void RemovePerObjectShadow(IShadowCaster* pCaster);
-    virtual struct SPerObjectShadow* GetPerObjectShadow(IShadowCaster* pCaster);
-    virtual void GetCustomShadowMapFrustums(ShadowMapFrustum*& arrFrustums, int& nFrustumCount);
-    virtual int SaveStatObj(IStatObj* pStatObj, TSerialize ser);
-    virtual IStatObj* LoadStatObj(TSerialize ser);
-
-    virtual bool CheckIntersectClouds(const Vec3& p1, const Vec3& p2);
-    virtual void OnRenderMeshDeleted(IRenderMesh* pRenderMesh);
-    virtual bool RayObjectsIntersection2D(Vec3 vStart, Vec3 vEnd, Vec3& vHitPoint, EERType eERType);
-    virtual bool RenderMeshRayIntersection(IRenderMesh* pRenderMesh, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl = 0);
-
-    virtual IOpticsManager* GetOpticsManager() { return m_pOpticsManager; }
-
-    virtual void RegisterForStreaming(IStreamable* pObj);
-    virtual void UnregisterForStreaming(IStreamable* pObj);
-
-    virtual void PrecacheRenderNode(IRenderNode* pObj, float fEntDistanceReal);
-
-    void MarkRNTmpDataPoolForReset() { m_bResetRNTmpDataPool = true; }
-    SBending* GetBendingEntry(SBending*, const SRenderingPassInfo& passInfo);
-
-    static void GetObjectsByTypeGlobal(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback = nullptr);
-    static void MoveObjectsIntoListGlobal(PodArray<SRNInfo>* plstResultEntities, const AABB* pAreaBox, bool bRemoveObjects = false, bool bSkipDecals = false, bool bSkip_ERF_NO_DECALNODE_DECALS = false, bool bSkipDynamicObjects = false, EERType eRNType = eERType_TypesNum);
-
-    bool IsObjectTreeReady() override
-    {
-        return m_pObjectsTree != nullptr;
-    }
-
-    IOctreeNode* GetIObjectTree() override
-    {
-        return (IOctreeNode*)m_pObjectsTree;
-    }
-
-    inline COctreeNode* GetObjectTree()
-    {
-        return m_pObjectsTree;
-    }
-
-    inline void SetObjectTree(COctreeNode* tree)
-    {
-        m_pObjectsTree = tree;
-    }
-
-    int m_idMatLeaves; // for shooting foliages
-    bool m_bResetRNTmpDataPool;
-
-    float m_fRefreshSceneDataCVarsSumm;
-    int m_nRenderTypeEnableCVarSum;
-
-    PodArray<IRenderNode*> m_lstAlwaysVisible;
-    PodArray<SPerObjectShadow> m_lstPerObjectShadows;
-    PodArray<ShadowMapFrustum> m_lstCustomShadowFrustums;
-    int m_nCustomShadowFrustumCount;
-
-    CryCriticalSection m_checkCreateRNTmpData;
-    CThreadSafeRendererContainer<SFrameInfo> m_elementFrameInfo;
-    CRNTmpData m_LTPRootFree, m_LTPRootUsed;
-    void CreateRNTmpData(CRNTmpData** ppInfo, IRenderNode* pRNode, const SRenderingPassInfo& passInfo);
-    void CheckCreateRNTmpData(CRNTmpData** ppInfo, IRenderNode* pRNode, const SRenderingPassInfo& passInfo) override
-    {
-        // Lock to avoid a situation where two threads simultaneously find that *ppinfo is null,
-        // which would result in two CRNTmpData objects for the same owner which eventually leads to a crash
-        AUTO_LOCK(m_checkCreateRNTmpData);
-        if (CRNTmpData* tmpData = (*ppInfo))
-        {
-            m_elementFrameInfo[tmpData->nFrameInfoId].nLastUsedFrameId = passInfo.GetMainFrameID();
-        }
-        else
-        {
-            CreateRNTmpData(ppInfo, pRNode, passInfo);
-        }
-    }
-
-    uint32 GetFrameInfoId(CRNTmpData** ppRNTmpData, uint32 createdFrameID)
-    {
-        size_t index = 0;
-        SFrameInfo* pFrameInfo = m_elementFrameInfo.push_back_new(index);
-        pFrameInfo->nCreatedFrameId = createdFrameID;
-        pFrameInfo->nLastUsedFrameId = createdFrameID;
-        pFrameInfo->ppRNTmpData = ppRNTmpData;
-        pFrameInfo->bIsValid = true;
-        return index;
-    }
-
-    void FreeRNTmpData(CRNTmpData** ppInfo);
-
-    void FreeRNTmpDataPool();
-    void UpdateRNTmpDataPool(bool bFreeAll);
-
-    //  CPoolAllocator<CRNTmpData, 512> m_RNTmpDataPools;
-
-    void UpdateStatInstGroups();
-    void UpdateRenderTypeEnableLookup();
-    void ProcessOcean(const SRenderingPassInfo& passInfo);
-    Vec3 GetEntityRegisterPoint(IRenderNode* pEnt);
-
-    virtual void RenderRenderNode_ShadowPass(IShadowCaster* pRNode, const SRenderingPassInfo& passInfo, AZ::LegacyJobExecutor* pJobExecutor);
-    void ProcessCVarsChange();
-    ILINE int GetGeomDetailScreenRes()
-    {
-        return GetCVars()->e_ForceDetailLevelForScreenRes ? GetCVars()->e_ForceDetailLevelForScreenRes : GetRenderer()->GetWidth();
-    }
-
-    int GetBlackTexID() { return m_nBlackTexID; }
-    int GetBlackCMTexID() { return m_nBlackCMTexID; }
-
-    virtual void SyncProcessStreamingUpdate();
-
-    virtual void SetScreenshotCallback(IScreenshotCallback* pCallback);
-
-    virtual IDeferredPhysicsEventManager* GetDeferredPhysicsEventManager() { return m_pDeferredPhysicsEventManager; }
-
-    void PrintDebugInfo(const SRenderingPassInfo& passInfo);
-
-    SImageSubInfo* RegisterImageInfo(byte** pMips, int nDim, const char* pName);
-    SImageSubInfo* GetImageInfo(const char* pName);
-    std::map<string, SImageSubInfo*> m_imageInfos;
-    byte** AllocateMips(byte* pImage, int nDim, byte** pImageMips);
-    IScreenshotCallback* m_pScreenshotCallback;
-    OcclusionTestClient m_OceanOcclTestVar;
-    bool m_bInShutDown;
-    bool m_bInUnload;
-    bool m_bInLoad;
-
-    IDeferredPhysicsEventManager* m_pDeferredPhysicsEventManager;
-
-    std::set<uint16> m_skipedLayers;
-
-    IGeneralMemoryHeap* m_pBreakableBrushHeap;
-
-    AZStd::mutex m_statObjQueueLock;
-    std::queue<StaticObjectAsyncLoadRequest> m_statObjLoadRequests;
-
-    typedef std::list<ITextureLoadHandler*> TTextureLoadHandlers;
-    TTextureLoadHandlers m_textureLoadHandlers;
-
-    class PhysicsAreaUpdates
-    {
-    public:
-        void SetAreaDirty(const SAreaChangeRecord& rec);
-
-        uint32 CreateProxy(const IRenderNode* pRenderNode, uint16 uPhysicsMask);
-
-        void UpdateProxy(const IRenderNode* pRenderNode, uint32 nProxyId);
-
-        void ResetProxy(uint32 proxyId);
-
-        void Update();
-
-        void Reset();
-
-        void GarbageCollect();
-
-        CryCriticalSection m_Mutex;
-    private:
-        CThreadSafeRendererContainer<SPhysAreaNodeProxy> m_Proxies;
-        PodArray<SAreaChangeRecord> m_DirtyAreas;
-    };
-
-    PhysicsAreaUpdates& GetPhysicsAreaUpdates()
-    {
-        return m_PhysicsAreaUpdates;
-    }
-
-    //I3DEngine Overrides START
-    void GetStatObjAndMatTables(DynArray<IStatObj*>* pStatObjTable, DynArray<_smart_ptr<IMaterial> >* pMatTable, DynArray<IStatInstGroup*>* pStatInstGroupTable, uint32 nObjTypeMask) override;
-    void WaitForCullingJobsCompletion() override;
-    //I3DEngine Overrides END
-
-private:
-
-    // IProcess Implementation
-    void    SetFlags(int flags) { m_nFlags = flags; }
-    int     GetFlags(void) { return m_nFlags; }
-    int     m_nFlags;
-
-    COctreeNode* m_pObjectsTree;
-
-    std::vector<byte> arrFPSforSaveLevelStats;
-    PodArray<float> m_arrProcessStreamingLatencyTestResults;
-    PodArray<int> m_arrProcessStreamingLatencyTexNum;
-
-    // fields which are used by SRenderingPass to store over frame information
-    CThreadSafeRendererContainer<CCamera>                                   m_RenderingPassCameras[2]; // camera storage for SRenderingPass, the cameras cannot be stored on stack to allow job execution
-
-    float m_fZoomFactor;                                                                // zoom factor of m_RenderingCamera
-    // cameras used by 3DEngine
-    CCamera     m_RenderingCamera;                                              // Camera used for Rendering on 3DEngine Side, normally equal to the view camera, except if frozen with e_camerafreeze
-
-    PodArray<IRenderNode*>  m_deferredRenderComponentStreamingPriorityUpdates;      // deferred streaming priority updates for newly seen CComponentRenders
-
-    float m_fLightsHDRDynamicPowerFactor; // lights hdr exponent/exposure
-
-    int m_nBlackTexID;
-    int m_nBlackCMTexID;
-    char m_sGetLevelFilePathTmpBuff[AZ_MAX_PATH_LEN];
-    char m_szLevelFolder[_MAX_PATH];
-
-    bool m_bOcean; // todo: remove
-    
-    // Ocean Caustics - Should be removed once the Ocean Gem is done and the feature toggle for it is removed.
-    float m_oceanCausticsDistanceAtten;
-    float m_oceanCausticsTiling;
-    float m_oceanCausticDepth;
-    float m_oceanCausticIntensity;
-
-    Vec3 m_vSkyHightlightPos;
-    Vec3 m_vSkyHightlightCol;
-    float m_fSkyHighlightSize;
-    Vec3 m_vAmbGroundCol;
-    float m_fAmbMaxHeight;
-    float m_fAmbMinHeight;
-    uint8 m_nOceanRenderFlags;
-    Vec3  m_vPrevMainFrameCamPos;
-    float m_fAverageCameraSpeed;
-    Vec3 m_vAverageCameraMoveDir;
-    EShadowMode m_eShadowMode;
-    bool m_bLayersActivated;
-    bool m_bContentPrecacheRequested;
-    bool m_bTerrainTextureStreamingInProgress;
-    bool m_bSegmentOperationInProgress;
-
-    // interfaces
-    IPhysMaterialEnumerator* m_pPhysMaterialEnumerator;
-
-    // data containers
-    int m_nRealLightsNum;
-
-    PodArray<ILightSource*> m_lstStaticLights;
-
-    PodArray<SCollisionClass> m_collisionClasses;
-
-#define MAX_LIGHTS_NUM 32
-    PodArray<CCamera> m_arrLightProjFrustums;
-
-    class CTimeOfDay*    m_pTimeOfDay;
-
-    std::unique_ptr<class IPostEffectGroupManager> m_postEffectGroups;
-    class IPostEffectGroup* m_postEffectBaseGroup;
-
-    ICVar*                  m_pLightQuality;
-
-    // FPS for savelevelstats
-
-    float m_fAverageFPS;
-    float m_fMinFPS, m_fMinFPSDecay;
-    float m_fMaxFPS, m_fMaxFPSDecay;
-    int  m_nFramesSinceLevelStart;
-    int  m_nStreamingFramesSinceLevelStart;
-    bool m_bPreCacheEndEventSent;
-    float m_fTimeStateStarted;
-    uint32 m_nRenderWorldUSecs;
-    SFrameLodInfo m_frameLodInfo;
-
-    ITexture*   m_ptexIconLowMemoryUsage;
-    ITexture*   m_ptexIconAverageMemoryUsage;
-    ITexture*   m_ptexIconHighMemoryUsage;
-    ITexture*   m_ptexIconEditorConnectedToConsole;
-
-    std::vector<IDecalRenderNode*> m_decalRenderNodes; // list of registered decal render nodes, used to clean up longer not drawn decals
-
-    class PhysicsAreaUpdatesHandler;
-    AZStd::unique_ptr<PhysicsAreaUpdatesHandler> m_physicsAreaUpdatesHandler;
-
-    PhysicsAreaUpdates m_PhysicsAreaUpdates;
-
-    string m_skyMatName;
-    string m_skyLowSpecMatName;
-
-    // Variable to keep track if the cvar e_SkyType has changed, which may cause the engine to load a different sky material
-    int m_previousSkyType = -1;
-
-    //Bending Pools contain the per frame Vegetation, Decals, etc. structures. Each Engine-frame the next buffer is
-    // cleared and set as the current in a ring and page-allocated to fit the needs of the current frame.
-    static const int NUM_BENDING_POOLS = 4;
-    CThreadSafeRendererContainer<SBending> m_bendingPool[NUM_BENDING_POOLS];
-    int m_bendingPoolIdx;
-
-    bool m_levelLoaded;
-
-    // not sorted
-
-    void LoadTimeOfDaySettingsFromXML(XmlNodeRef node);
-    char* GetXMLAttribText(XmlNodeRef pInputNode, const char* szLevel1, const char* szLevel2, const char* szDefaultValue);
-    char* GetXMLAttribText(XmlNodeRef pInputNode, const char* szLevel1, const char* szLevel2, const char* szLevel3, const char* szDefaultValue);
-
-    // without calling high level functions like panorama screenshot
-    void RenderInternal(const int nRenderFlags, const SRenderingPassInfo& passInfo, const char* szDebugName);
-
-    bool IsCameraAnd3DEngineInvalid(const SRenderingPassInfo& passInfo, const char* szCaller);
-
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-
-    void ResetCasterCombinationsCache();
-
-    void DeleteAllStaticLightSources();
-
-    void UpdateSun(const SRenderingPassInfo& passInfo);
-    void SubmitSun(const SRenderingPassInfo& passInfo);
-
-    CCullBuffer* m_pCoverageBuffer;
-    struct CLightEntity* m_pSun;
-
-    void UpdateMoonDirection();
-
-    // Copy objects from tree
-    void CopyObjectsByType(EERType objType, const AABB* pBox, PodArray<IRenderNode*>* plistObjects, ObjectTreeQueryFilterCallback filterCallback = nullptr);
-    void CopyObjects(const AABB* pBox, PodArray<IRenderNode*>* plistObjects);
-
-    void CleanUpOldDecals();
-
-    template<typename TReturn>
-    using LoadStatObjFunc = TReturn(CObjManager::*)(const char* filename, const char* _szGeomName, IStatObj::SSubObject** ppSubObject, bool bUseStreaming, unsigned long nLoadingFlags, const void* pData, int nDataSize, const char* szBlockName);
-
-    template<typename TReturn>
-    TReturn LoadStatObjInternal(const char* fileName, const char* geomName, IStatObj::SSubObject** subObject, bool useStreaming, 
-        unsigned long loadingFlags, LoadStatObjFunc<TReturn> loadStatObjFunc, const void* data = nullptr, int dataSize = 0);
-
-    bool RemoveObjectsInArea(Vec3 vExploPos, float fExploRadius);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Octree Loading/Saving related START
-    ///////////////////////////////////////////////////////////////////////////
-
-
-    //! initialWorldSize: in Meters.
-    bool CreateOctree(float initialWorldSize);
-    
-    void DestroyOctree();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Octree Loading/Saving related END
-    ///////////////////////////////////////////////////////////////////////////
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_3DENGINE_H
diff --git a/Code/CryEngine/Cry3DEngine/3dEngineLoad.cpp b/Code/CryEngine/Cry3DEngine/3dEngineLoad.cpp
deleted file mode 100644
index 215fe602c9..0000000000
--- a/Code/CryEngine/Cry3DEngine/3dEngineLoad.cpp
+++ /dev/null
@@ -1,1285 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Level loading
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "3dEngine.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "Ocean.h"
-#include "DecalManager.h"
-#include "MatMan.h"
-#include "IndexedMesh.h"
-#include "SkyLightManager.h"
-#include "ObjectsTree.h"
-#include "LightEntity.h"
-#include "TimeOfDay.h"
-#include "LightEntity.h"
-#include "RenderMeshMerger.h"
-#include "FogVolumeRenderNode.h"
-#include "IDeferredCollisionEvent.h"
-#include <IMaterialEffects.h>
-#include "ClipVolumeManager.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-#include <I3DEngine.h>
-#include <LoadScreenBus.h>
-#include <StatObjBus.h>
-
-#include <AzCore/Component/TickBus.h>
-#include <AzFramework/API/ApplicationAPI.h>
-
-//------------------------------------------------------------------------------
-#define LEVEL_DATA_FILE "LevelData.xml"
-#define CUSTOM_MATERIALS_FILE "Materials.xml"
-#define PARTICLES_FILE "LevelParticles.xml"
-#define SHADER_LIST_FILE "ShadersList.txt"
-#define LEVEL_CONFIG_FILE "Level.cfg"
-#define LEVEL_EDITOR_CONFIG_FILE "Editor.cfg"
-//------------------------------------------------------------------------------
-const uint32    MAX_ACTIVE_BREEZE_POINTS = 99;
-//------------------------------------------------------------------------------
-
-inline Vec3 StringToVector(const char* str)
-{
-    Vec3 vTemp(0, 0, 0);
-    float x, y, z;
-    if (azsscanf(str, "%f,%f,%f", &x, &y, &z) == 3)
-    {
-        vTemp(x, y, z);
-    }
-    else
-    {
-        vTemp(0, 0, 0);
-    }
-    return vTemp;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::LoadEmptyLevel()
-{
-    CreateOctree(0.0f);
-    LoadDefaultAssets();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::SetLevelPath(const char* szFolderName)
-{
-    // make folder path
-    assert(strlen(szFolderName) < 1024);
-    azstrcpy(m_szLevelFolder, AZ_ARRAY_SIZE(m_szLevelFolder), szFolderName);
-    if (strlen(m_szLevelFolder) > 0)
-    {
-        if (m_szLevelFolder[strlen(m_szLevelFolder) - 1] != '/')
-        {
-            azstrcat(m_szLevelFolder, AZ_ARRAY_SIZE (m_szLevelFolder), "/");
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::LoadDefaultAssets()
-{
-    GetRenderer()->InitSystemResources(FRR_SYSTEM_RESOURCES);
-
-    //Add a call to refresh the loading screen and call the loading tick functions to ensure that no big gaps in coverage occur.
-    SYNCHRONOUS_LOADING_TICK();
-
-#if !defined(SYS_ENV_AS_STRUCT)
-    PREFAST_ASSUME(gEnv);
-#endif
-
-    GetMatMan()->InitDefaults();
-
-    m_nBlackTexID = GetRenderer()->EF_LoadTexture("EngineAssets/Textures/black.dds", FT_DONT_STREAM)->GetTextureID();
-    m_nBlackCMTexID = GetRenderer()->EF_LoadTexture("EngineAssets/Textures/BlackCM.dds", FT_DONT_RELEASE | FT_DONT_STREAM)->GetTextureID();
-
-    m_pMatFogVolEllipsoid = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/FogVolumeEllipsoid", false);
-    m_pMatFogVolBox = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/FogVolumeBox", false);
-
-    if (!m_pRESky)
-    {
-        m_pRESky = (CRESky*)GetRenderer()->EF_CreateRE(eDATA_Sky); //m_pRESky->m_fAlpha = 1.f;
-    }
-    if (!m_pREHDRSky)
-    {
-        m_pREHDRSky = (CREHDRSky*)GetRenderer()->EF_CreateRE(eDATA_HDRSky);
-    }
-
-    if (!m_ptexIconLowMemoryUsage)
-    {
-        m_ptexIconLowMemoryUsage = gEnv->pRenderer->EF_LoadDefaultTexture("LowMemoryUsage");
-    }
-
-    if (!m_ptexIconAverageMemoryUsage)
-    {
-        m_ptexIconAverageMemoryUsage = gEnv->pRenderer->EF_LoadDefaultTexture("AverageMemoryUsage");
-    }
-
-    if (!m_ptexIconHighMemoryUsage)
-    {
-        m_ptexIconHighMemoryUsage = gEnv->pRenderer->EF_LoadDefaultTexture("HighMemoryUsage");
-    }
-
-    if (!m_ptexIconEditorConnectedToConsole)
-    {
-        m_ptexIconEditorConnectedToConsole = gEnv->pRenderer->EF_LoadDefaultTexture("LivePreview");
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool C3DEngine::InitLevelForEditor([[maybe_unused]] const char* szFolderName, [[maybe_unused]] const char* szMissionName)
-{
-#if defined(CONSOLE)
-    CRY_ASSERT_MESSAGE(0, "InitLevelForEditor not supported on consoles yet");
-    return false;
-#else
-    LOADING_TIME_PROFILE_SECTION;
-
-    m_bEditor = true;
-    m_bAreaActivationInUse = false;
-    m_bLayersActivated = true;
-
-    ClearDebugFPSInfo();
-
-    bool usePrefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    if (!szFolderName || !szFolderName[0])
-    {
-        Warning("C3DEngine::LoadLevel: Level name is not specified");
-        return 0;
-    }
-
-    if (!usePrefabSystemEnabled && (!szMissionName || !szMissionName[0]))
-    {
-        Warning("C3DEngine::LoadLevel: Mission name is not specified");
-    }
-
-    char szMissionNameBody[256] = "NoMission";
-    if (!szMissionName)
-    {
-        szMissionName = szMissionNameBody;
-    }
-
-    SetLevelPath(szFolderName);
-
-    // Load console vars specific to this level.
-    if (GetPak()->IsFileExist(GetLevelFilePath(LEVEL_CONFIG_FILE)))
-    {
-        GetISystem()->LoadConfiguration(GetLevelFilePath(LEVEL_CONFIG_FILE));
-    }
-
-    if (GetPak()->IsFileExist(GetLevelFilePath(LEVEL_EDITOR_CONFIG_FILE)))
-    {
-        GetISystem()->LoadConfiguration(GetLevelFilePath(LEVEL_EDITOR_CONFIG_FILE));
-    }
-
-    if (!m_pObjManager)
-    {
-        m_pObjManager = CryAlignedNew<CObjManager>();
-    }
-
-    if (!m_pVisAreaManager)
-    {
-        m_pVisAreaManager = new CVisAreaManager();
-    }
-
-    CRY_ASSERT(m_pClipVolumeManager->GetClipVolumeCount() == 0);
-
-    if (m_pSkyLightManager)
-    {
-        m_pSkyLightManager->InitSkyDomeMesh();
-    }
-
-    // recreate decals
-    SAFE_DELETE(m_pDecalManager);
-    m_pDecalManager = new CDecalManager();
-
-    // restore game state
-    EnableOceanRendering(true);
-    m_pObjManager->SetLockCGFResources(0);
-
-    LoadDefaultAssets();
-
-    {
-        const char* SettingsFileName = GetLevelFilePath("ScreenshotMap.Settings");
-
-        AZ::IO::HandleType metaFileHandle = gEnv->pCryPak->FOpen(SettingsFileName, "r");
-        if (metaFileHandle != AZ::IO::InvalidHandle)
-        {
-            char Data[1024 * 8];
-            gEnv->pCryPak->FRead(Data, sizeof(Data), metaFileHandle);
-            azsscanf(Data, "<Map CenterX=\"%f\" CenterY=\"%f\" SizeX=\"%f\" SizeY=\"%f\" Height=\"%f\"  Quality=\"%d\" Orientation=\"%d\" />",
-                &GetCVars()->e_ScreenShotMapCenterX,
-                &GetCVars()->e_ScreenShotMapCenterY,
-                &GetCVars()->e_ScreenShotMapSizeX,
-                &GetCVars()->e_ScreenShotMapSizeY,
-                &GetCVars()->e_ScreenShotMapCamHeight,
-                &GetCVars()->e_ScreenShotQuality,
-                &GetCVars()->e_ScreenShotMapOrientation);
-            gEnv->pCryPak->FClose(metaFileHandle);
-        }
-    }
-
-
-    GetObjManager()->LoadOcclusionMesh(szFolderName);
-
-    //  delete m_pObjectsTree[nSID];
-    //  m_pObjectsTree[nSID] = NULL;
-    return (true);
-#endif
-}
-
-bool C3DEngine::LevelLoadingInProgress()
-{
-    return Cry3DEngineBase::m_bLevelLoadingInProgress;
-}
-
-bool C3DEngine::LoadCompiledOctreeForEditor()
-{
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    if (usePrefabSystemForLevels)
-    {
-        // Prefab levels don't use any of the legacy level data.
-        return true;
-    }
-
-
-    // Load LevelData.xml File.
-    XmlNodeRef xmlLevelData = GetSystem()->LoadXmlFromFile(GetLevelFilePath(LEVEL_DATA_FILE));
-
-    if (xmlLevelData == 0)
-    {
-        Error("C3DEngine::LoadLevel: xml file not found (files missing?)"); // files missing ?
-        return false;
-    }
-
-    LoadCollisionClasses(xmlLevelData->findChild("CollisionClasses"));
-
-    return true;
-}
-
-bool C3DEngine::LoadVisAreas(std::vector<struct IStatObj*>** ppStatObjTable, std::vector<_smart_ptr<IMaterial> >** ppMatTable)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    PrintMessage("===== Loading %s =====", COMPILED_VISAREA_MAP_FILE_NAME);
-
-    // open file
-    AZ::IO::HandleType fileHandle = GetPak()->FOpen(GetLevelFilePath(COMPILED_VISAREA_MAP_FILE_NAME), "rbx");
-    if (fileHandle == AZ::IO::InvalidHandle)
-    {
-        return false;
-    }
-
-    // read header
-    SVisAreaManChunkHeader header;
-    if (!GetPak()->FRead(&header, 1, fileHandle, false))
-    {
-        GetPak()->FClose(fileHandle);
-        return 0;
-    }
-
-    SwapEndian(header, (header.nFlags & SERIALIZATION_FLAG_BIG_ENDIAN) ? eBigEndian : eLittleEndian);
-
-    if (header.nChunkSize)
-    {
-        assert(!m_pVisAreaManager);
-        m_pVisAreaManager = new CVisAreaManager();
-        if (!m_pVisAreaManager->Load(fileHandle, header.nChunkSize, &header, *ppStatObjTable, *ppMatTable))
-        {
-            delete m_pVisAreaManager;
-            m_pVisAreaManager = NULL;
-        }
-    }
-
-    assert(GetPak()->FEof(fileHandle));
-
-    GetPak()->FClose(fileHandle);
-
-    return m_pVisAreaManager != NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::UnloadLevel()
-{
-    if (!m_levelLoaded)
-    {
-        return;
-    }
-    GetRenderer()->EnableLevelUnloading(true);
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_UNLOAD, 0, 0);
-    // Run any events that were queued against the system tick bus before we start tearing down systems and deleting things
-    // This should prevent any stale events from running when the next level is loaded
-    AZ::SystemTickBus::ExecuteQueuedEvents();
-
-    GetRenderer()->EnableLevelUnloading(false);
-
-    m_bInUnload = true;
-    m_szLevelFolder[0] = 0;
-
-    GetRenderer()->FlushRTCommands(true, true, true);
-
-    SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::ReleaseData);
-    InstanceStatObjEventBus::Broadcast(&InstanceStatObjEventBus::Events::ReleaseData);
-
-    FreeRNTmpDataPool();
-
-    if (m_pSkyLightManager)
-    {
-        m_pSkyLightManager->ReleaseSkyDomeMesh();
-    }
-
-    ResetPostEffects();
-
-    // delete decal manager
-    if (m_pDecalManager)
-    {
-        CryComment("Deleting Decals");
-        SAFE_DELETE(m_pDecalManager);
-        CryComment("done");
-    }
-
-    if (m_pOcean)
-    {
-        CryComment("Deleting Ocean");
-        SAFE_DELETE(m_pOcean);
-        CryComment("done");
-    }
-
-    // delete outdoor objects
-    CryComment("Deleting Octree");
-    DestroyOctree();
-    SAFE_DELETE(m_pObjectsTree);
-    m_pObjectsTree = nullptr;
-
-    // delete indoors
-    if (m_pVisAreaManager)
-    {
-        CryComment("Deleting VisAreas");
-        SAFE_DELETE(m_pVisAreaManager);
-        CryComment("done");
-    }
-
-    CRY_ASSERT(m_pClipVolumeManager->GetClipVolumeCount() == 0);
-
-    m_LightVolumesMgr.Reset();
-
-    m_pTerrainWaterMat = 0;
-    m_nWaterBottomTexId = 0;
-
-
-    //////////////////////////////////////////////////////////////////////////
-    CryComment("Removing Lights ...");
-    DeleteAllStaticLightSources();
-    SAFE_DELETE(m_pSun);
-    CryComment("done");
-    //////////////////////////////////////////////////////////////////////////
-
-
-    CleanLevelShaders();
-
-    if (m_pRESky)
-    {
-        m_pRESky->Release(true);
-    }
-    if (m_pREHDRSky)
-    {
-        m_pREHDRSky->Release(true);
-    }
-    m_pRESky = 0;
-    m_pREHDRSky = 0;
-    stl::free_container(m_skyMatName);
-    stl::free_container(m_skyLowSpecMatName);
-    m_previousSkyType = -1;
-
-    if (m_nCloudShadowTexId)
-    {
-        ITexture* tex = GetRenderer()->EF_GetTextureByID(m_nCloudShadowTexId);
-        if (tex)
-        {
-            tex->Release();
-        }
-
-        m_nCloudShadowTexId = 0;
-        GetRenderer()->SetCloudShadowsParams(0, Vec3(0, 0, 0), 1, false, 1);
-        SetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_ENABLE, Vec3(0, 0, 0));
-    }
-
-    if (m_nNightMoonTexId)
-    {
-        ITexture* tex = GetRenderer()->EF_GetTextureByID(m_nNightMoonTexId);
-        if (tex)
-        {
-            tex->Release();
-        }
-
-        m_nNightMoonTexId = 0;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    if (m_pObjManager)
-    {
-        bool bDeleteAll = !m_bEditor || m_bInShutDown;
-        CryComment("Deleting Static Objects");
-        m_pObjManager->UnloadObjects(bDeleteAll);
-        m_pObjManager->GetCullThread().UnloadLevel();
-        CryComment("done");
-    }
-
-    AZ_Assert(m_pObjectsTree == nullptr, "m_pObjectsTree == nullptr");
-    COctreeNode::StaticReset();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Force delete all materials.
-    //////////////////////////////////////////////////////////////////////////
-    if (GetMatMan() && !m_bEditor)
-    {
-        // Should be after deleting all meshes.
-        // We force delete all materials.
-        CryComment("Deleting Materials");
-        GetMatMan()->ShutDown();
-        CryComment("done");
-    }
-
-    //Set default icons to nullptr here, texture manager will take care of the memory release
-    m_ptexIconAverageMemoryUsage = nullptr;
-    m_ptexIconLowMemoryUsage = nullptr;
-    m_ptexIconHighMemoryUsage = nullptr;
-    m_ptexIconEditorConnectedToConsole = nullptr;
-
-    if (m_pOpticsManager && !gEnv->IsEditor())
-    {
-        m_pOpticsManager->Reset();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    stl::free_container(m_lstAlwaysVisible);
-    if (m_decalRenderNodes.empty())
-    {
-        stl::free_container(m_decalRenderNodes);
-    }
-    stl::free_container(m_lstPerObjectShadows);
-    m_nCustomShadowFrustumCount = 0;
-
-    Cry3DEngineBase::m_pRenderMeshMerger->Reset();
-
-    SAFE_DELETE(m_pTimeOfDay);
-    CLightEntity::StaticReset();
-    CVisArea::StaticReset();
-    CFogVolumeRenderNode::StaticReset();
-
-    GetRenderer()->FlushRTCommands(true, true, true);
-
-    IDeferredPhysicsEventManager* pPhysEventManager = GetDeferredPhysicsEventManager();
-    if (pPhysEventManager)
-    {
-        pPhysEventManager->ClearDeferredEvents();
-    }
-
-    m_PhysicsAreaUpdates.Reset();
-    for (size_t i = 0; i < NUM_BENDING_POOLS; stl::free_container(m_bendingPool[i++]))
-    {
-        ;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // clear data used for SRenderingPass
-    stl::free_container(m_RenderingPassCameras[0]);
-    stl::free_container(m_RenderingPassCameras[1]);
-    stl::free_container(m_deferredRenderComponentStreamingPriorityUpdates);
-
-    stl::free_container(m_lstCustomShadowFrustums);
-
-    m_nWindSamplePositions = 0;
-    if (m_pWindSamplePositions)
-    {
-        CryModuleMemalignFree(m_pWindSamplePositions);
-        m_pWindSamplePositions = NULL;
-    }
-
-    stl::free_container(m_collisionClasses);
-    m_levelLoaded = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::LoadFlaresData()
-{
-    string flareExportListPath = gEnv->p3DEngine->GetLevelFilePath(FLARE_EXPORT_FILE);
-    XmlNodeRef pFlareRootNode = gEnv->pSystem->LoadXmlFromFile(flareExportListPath);
-
-    if (pFlareRootNode == NULL)
-    {
-        return;
-    }
-
-    int nFlareExportFileVer = 0;
-    pFlareRootNode->getAttr("Version", nFlareExportFileVer);
-
-    for (int i = 0, iCount(pFlareRootNode->getChildCount()); i < iCount; ++i)
-    {
-        XmlNodeRef pFlareNode = pFlareRootNode->getChild(i);
-        if (pFlareNode == NULL)
-        {
-            continue;
-        }
-        const char* flareName = NULL;
-        if (!pFlareNode->getAttr("name", &flareName))
-        {
-            continue;
-        }
-        int nOutIndex(-1);
-
-        if (nFlareExportFileVer == 0)
-        {
-            gEnv->pOpticsManager->Load(flareName, nOutIndex);
-        }
-        else if (nFlareExportFileVer == 1)
-        {
-            if (pFlareNode->getChildCount() == 0)
-            {
-                gEnv->pOpticsManager->Load(flareName, nOutIndex);
-            }
-            else if (pFlareNode->getChildCount() > 0)
-            {
-                gEnv->pOpticsManager->Load(pFlareNode, nOutIndex);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool C3DEngine::LoadLevel(const char* szFolderName, const char* szMissionName)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    CRY_ASSERT(m_levelLoaded == false);
-
-    PREFAST_ASSUME(gEnv);
-
-    stl::scoped_set<bool> setInLoad(m_bInLoad, true);
-
-    m_bInUnload = false;
-    m_bAreaActivationInUse = false;
-    m_bLayersActivated = false;
-    m_eShadowMode = ESM_NORMAL;
-
-    m_vPrevMainFrameCamPos.Set(-1000000.f, -1000000.f, -1000000.f);
-    m_vAverageCameraMoveDir = Vec3(0);
-    m_fAverageCameraSpeed = 0;
-
-    ClearDebugFPSInfo();
-
-#if !defined(CONSOLE)
-    m_bEditor = false;
-#endif
-
-    assert(!m_bEditor);
-
-    //////////////////////////////////////////////////////////////////////////
-
-    if (!szFolderName || !szFolderName[0])
-    {
-        Warning("C3DEngine::LoadLevel: Level name is not specified");
-        return 0;
-    }
-
-    if (!szMissionName || !szMissionName[0])
-    {
-        Warning("C3DEngine::LoadLevel: Mission name is not specified");
-    }
-
-    char szMissionNameBody[256] = "NoMission";
-    if (!szMissionName)
-    {
-        szMissionName = szMissionNameBody;
-    }
-
-    SetLevelPath(szFolderName);
-
-    if (GetPak()->IsFileExist(GetLevelFilePath(LEVEL_CONFIG_FILE)))
-    {
-        GetISystem()->LoadConfiguration(GetLevelFilePath(LEVEL_CONFIG_FILE));
-    }
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    if (!usePrefabSystemForLevels)
-    { // check is LevelData.xml file exist
-        char sMapFileName[_MAX_PATH];
-        cry_strcpy(sMapFileName, m_szLevelFolder);
-        cry_strcat(sMapFileName, LEVEL_DATA_FILE);
-        if (!IsValidFile(sMapFileName))
-        {
-            PrintMessage("Error: Level not found: %s", sMapFileName);
-            return 0;
-        }
-    }
-
-    if (!m_pObjManager)
-    {
-        m_pObjManager = CryAlignedNew<CObjManager>();
-    }
-
-    CRY_ASSERT(m_pClipVolumeManager->GetClipVolumeCount() == 0);
-
-    // Load and activate all shaders used by the level before activating any shaders
-    if (!m_bEditor)
-    {
-        LoadUsedShadersList();
-    }
-
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-    // Make sure system resources are inited before displaying a load screen
-    GetRenderer()->InitSystemResources(FRR_SYSTEM_RESOURCES);
-    // IMPORTANT: This MUST be done AFTER the LoadConfiguration() above.
-    EBUS_EVENT(LoadScreenBus, LevelStart);
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-
-    LoadDefaultAssets();
-
-    if (m_pSkyLightManager)
-    {
-        m_pSkyLightManager->InitSkyDomeMesh();
-        // set default render parameters.
-        // for some reason this is not done later???
-        m_pSkyLightManager->UpdateRenderParams();
-    }
-
-    // Load LevelData.xml File.
-    XmlNodeRef xmlLevelData;
-    if (!usePrefabSystemForLevels)
-    {
-        xmlLevelData = GetSystem()->LoadXmlFromFile(GetLevelFilePath(LEVEL_DATA_FILE));
-
-        if (xmlLevelData == 0)
-        {
-            Error("C3DEngine::LoadLevel: xml file not found (files missing?)"); // files missing ?
-            return false;
-        }
-    }
-
-    // re-create decal manager
-    SAFE_DELETE(m_pDecalManager);
-    m_pDecalManager = new CDecalManager();
-
-    gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_MATERIALS);
-    if (GetCVars()->e_PreloadMaterials)
-    {
-        // Preload materials.
-        GetMatMan()->PreloadLevelMaterials();
-    }
-    if (GetCVars()->e_PreloadDecals)
-    {
-        // Preload materials.
-        GetMatMan()->PreloadDecalMaterials();
-    }
-
-    gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_OBJECTS);
-    // preload level cgfs
-    if (GetCVars()->e_StatObjPreload && !gEnv->IsEditor())
-    {
-        m_pObjManager->PreloadLevelObjects();
-    }
-
-    if (!usePrefabSystemForLevels)
-    {
-        LoadCollisionClasses(xmlLevelData->findChild("CollisionClasses"));
-    }
-
-    gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_STATIC_WORLD);
-
-    if (usePrefabSystemForLevels)
-    {
-        // When using the prefab system, just initialize a default manager instead of loading values from the indoor.dat file.
-        m_pVisAreaManager = new CVisAreaManager();
-    }
-    else
-    {
-#if defined(FEATURE_SVO_GI)
-        if (gEnv->pConsole->GetCVar("e_GI")->GetIVal())
-        {
-            // Load SVOGI settings
-            char szFileName[256];
-            azsprintf(szFileName, "mission_%s.xml", szMissionName);
-            XmlNodeRef xmlMission = GetSystem()->LoadXmlFromFile(Get3DEngine()->GetLevelFilePath(szFileName));
-            if (xmlMission)
-            {
-                LoadTISettings(xmlMission->findChild("Environment"));
-            }
-        }
-#endif
-
-        // load indoors
-        std::vector<struct IStatObj*>* pStatObjTable = NULL;
-        std::vector<_smart_ptr<IMaterial>>* pMatTable = NULL;
-
-        if (!LoadVisAreas(&pStatObjTable, &pMatTable))
-        {
-            Error("VisAreas file (%s) not found or file version error, please try to re-export the level", COMPILED_VISAREA_MAP_FILE_NAME);
-            return false;
-        }
-
-        SAFE_DELETE(pStatObjTable);
-        SAFE_DELETE(pMatTable);
-    }
-
-
-    //Update loading screen and important tick functions
-    SYNCHRONOUS_LOADING_TICK();
-
-    PrintMessage("===== Loading mission settings from XML =====");
-
-    //Update loading screen and important tick functions
-    SYNCHRONOUS_LOADING_TICK();
-
-    // load leveldata.xml
-    m_pTerrainWaterMat = 0;
-    m_nWaterBottomTexId = 0;
-
-    // This call is needed whether or not the prefab system is used for levels.  If prefabs are used, it will initialize the
-    // environment and time of day managers with default values.  With legacy levels, they will intialize from the saved xml files.
-    LoadMissionDataFromXMLNode(szMissionName);
-
-    //Update loading screen and important tick functions
-    SYNCHRONOUS_LOADING_TICK();
-
-    if (!usePrefabSystemForLevels)
-    {
-        // init water if not initialized already (if no mission was found)
-        if (!GetOcean())
-        {
-            PrintMessage("===== Creating Ocean =====");
-            CreateOcean(m_pTerrainWaterMat, COcean::GetWaterLevelInfo());
-        }
-
-        PrintMessage("===== Load level physics data =====");
-        LoadFlaresData();
-    }
-
-    // restore game state
-    EnableOceanRendering(true);
-    m_pObjManager->SetLockCGFResources(false);
-
-    if (!usePrefabSystemForLevels)
-    {
-        PrintMessage("===== loading occlusion mesh =====");
-
-        GetObjManager()->LoadOcclusionMesh(szFolderName);
-    }
-
-    PrintMessage("===== Finished loading static world =====");
-
-    m_skipedLayers.clear();
-
-    if (gEnv->pMaterialEffects)
-    {
-        gEnv->pMaterialEffects->CompleteInit();
-    }
-
-    return (true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::LoadCollisionClasses(XmlNodeRef node)
-{
-    m_collisionClasses.clear();
-    if (node)
-    {
-        int count = node->getChildCount();
-        m_collisionClasses.reserve(count);
-        for (int i = 0; i < count; i++)
-        {
-            SCollisionClass cc(0, 0);
-            XmlNodeRef xmlCC = node->getChild(i);
-            xmlCC->getAttr("type", cc.type);
-            xmlCC->getAttr("ignore", cc.ignore);
-            m_collisionClasses.push_back(cc);
-        }
-    }
-}
-
-void C3DEngine::LoadMissionDataFromXMLNode(const char* szMissionName)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    GetRenderer()->MakeMainContextActive();
-
-    // set default values
-    m_vFogColor(1, 1, 1);
-    m_fMaxViewDistHighSpec = 8000;
-    m_fMaxViewDistLowSpec = 1000;
-    m_vDefFogColor    = m_vFogColor;
-
-    // mission environment
-    if (szMissionName && szMissionName[0])
-    {
-        char szFileName[256];
-        sprintf_s(szFileName, "mission_%s.xml", szMissionName);
-        XmlNodeRef xmlMission = GetSystem()->LoadXmlFromFile(Get3DEngine()->GetLevelFilePath(szFileName));
-        if (xmlMission)
-        {
-            LoadEnvironmentSettingsFromXML(xmlMission->findChild("Environment"), GetDefSID());
-            LoadTimeOfDaySettingsFromXML(xmlMission->findChild("TimeOfDay"));
-        }
-        else
-        {
-            // XML file couldn't be found, just use the defaults for everything.
-            LoadEnvironmentSettingsFromXML(nullptr, GetDefSID());
-            LoadTimeOfDaySettingsFromXML(nullptr);
-        }
-    }
-    else
-    {
-        Error("C3DEngine::LoadMissionDataFromXMLNode: Mission name is not defined");
-    }
-}
-
-char* C3DEngine::GetXMLAttribText(XmlNodeRef pInputNode, const char* szLevel1, const char* szLevel2, const char* szDefaultValue)
-{
-    static char szResText[128];
-
-    cry_strcpy(szResText, szDefaultValue);
-
-    if (pInputNode)
-    {
-        XmlNodeRef nodeLevel = pInputNode->findChild(szLevel1);
-        if (nodeLevel && nodeLevel->haveAttr(szLevel2))
-        {
-            cry_strcpy(szResText, nodeLevel->getAttr(szLevel2));
-        }
-    }
-
-    return szResText;
-}
-
-char* C3DEngine::GetXMLAttribText(XmlNodeRef pInputNode, const char* szLevel1, const char* szLevel2, const char* szLevel3, const char* szDefaultValue)
-{
-    static char szResText[128];
-
-    cry_strcpy(szResText, szDefaultValue);
-
-    if (pInputNode)
-    {
-        XmlNodeRef nodeLevel = pInputNode->findChild(szLevel1);
-        if (nodeLevel)
-        {
-            nodeLevel = nodeLevel->findChild(szLevel2);
-            if (nodeLevel)
-            {
-                cry_strcpy(szResText, nodeLevel->getAttr(szLevel3));
-            }
-        }
-    }
-
-    return szResText;
-}
-
-void C3DEngine::UpdateMoonDirection()
-{
-    float moonLati(-gf_PI + gf_PI* m_moonRotationLatitude / 180.0f);
-    float moonLong(0.5f * gf_PI - gf_PI* m_moonRotationLongitude / 180.0f);
-
-    float sinLon(sinf(moonLong));
-    float cosLon(cosf(moonLong));
-    float sinLat(sinf(moonLati));
-    float cosLat(cosf(moonLati));
-
-    m_moonDirection = Vec3(sinLon * cosLat, sinLon * sinLat, cosLon);
-}
-
-void C3DEngine::LoadEnvironmentSettingsFromXML(XmlNodeRef pInputNode, [[maybe_unused]] int nSID)
-{
-    PrintComment("Loading environment settings from XML ...");
-
-    // set start and end time for dawn/dusk (to fade moon/sun light in and out)
-    float dawnTime = (float)atof(GetXMLAttribText(pInputNode, "Lighting", "DawnTime", "355"));
-    float dawnDuration = (float)atof(GetXMLAttribText(pInputNode, "Lighting", "DawnDuration", "10"));
-    float duskTime = (float)atof(GetXMLAttribText(pInputNode, "Lighting", "DuskTime", "365"));
-    float duskDuration = (float)atof(GetXMLAttribText(pInputNode, "Lighting", "DuskDuration", "10"));
-
-    m_dawnStart = (dawnTime - dawnDuration * 0.5f) / 60.0f;
-    m_dawnEnd = (dawnTime + dawnDuration * 0.5f) / 60.0f;
-    m_duskStart = 12.0f + (duskTime - duskDuration * 0.5f) / 60.0f;
-    m_duskEnd = 12.0f + (duskTime + duskDuration * 0.5f) / 60.0f;
-
-    if (m_dawnEnd > m_duskStart)
-    {
-        m_duskEnd += m_dawnEnd - m_duskStart;
-        m_duskStart = m_dawnEnd;
-    }
-
-
-    // get moon info
-    m_moonRotationLatitude = (float)atof(GetXMLAttribText(pInputNode, "Moon", "Latitude", "240"));
-    m_moonRotationLongitude = (float)atof(GetXMLAttribText(pInputNode, "Moon", "Longitude", "45"));
-    UpdateMoonDirection();
-
-    m_nightMoonSize = (float)atof(GetXMLAttribText(pInputNode, "Moon", "Size", "0.5"));
-
-    {
-        char moonTexture[256];
-        cry_strcpy(moonTexture, GetXMLAttribText(pInputNode, "Moon", "Texture", "Textures/Skys/Night/half_moon.dds"));
-
-        ITexture* pTex(0);
-        if (moonTexture[0] != '\0')
-        {
-            pTex = GetRenderer()->EF_LoadTexture(moonTexture, FT_DONT_STREAM);
-        }
-
-        m_nNightMoonTexId = pTex ? pTex->GetTextureID() : 0;
-    }
-
-    // max view distance
-    m_fMaxViewDistHighSpec = (float)atol(GetXMLAttribText(pInputNode, "Fog", "ViewDistance", "8000"));
-    m_fMaxViewDistLowSpec = (float)atol(GetXMLAttribText(pInputNode, "Fog", "ViewDistanceLowSpec", "1000"));
-    m_fMaxViewDistScale = 1.f;
-
-    m_volFogGlobalDensityMultiplierLDR = (float)max(atof(GetXMLAttribText(pInputNode, "Fog", "LDRGlobalDensMult", "1.0")), 0.0);
-
-    // SkyBox
-    const string skyMaterialName = GetXMLAttribText(pInputNode, "SkyBox", "Material", "EngineAssets/Materials/Sky/Sky");
-    const string skyLowSpecMaterialName = GetXMLAttribText(pInputNode, "SkyBox", "MaterialLowSpec", "EngineAssets/Materials/Sky/Sky");
-    SetSkyMaterialPath(skyMaterialName);
-    SetSkyLowSpecMaterialPath(skyLowSpecMaterialName);
-    LoadSkyMaterial();
-
-    m_fSkyBoxAngle = (float)atof(GetXMLAttribText(pInputNode, "SkyBox", "Angle", "0.0"));
-    m_fSkyBoxStretching = (float)atof(GetXMLAttribText(pInputNode, "SkyBox", "Stretching", "0.5"));
-
-    // set terrain water (aka the infinite ocean), sun road and bottom shaders
-    if (OceanToggle::IsActive())
-    {
-        AZStd::string szOceanMatName = OceanRequest::GetOceanMaterialName();
-        m_pTerrainWaterMat = GetMatMan()->LoadMaterial(szOceanMatName.c_str(), false);
-    }
-    else
-    {
-        char szTerrainWaterMatName[256];
-        cry_strcpy(szTerrainWaterMatName, GetXMLAttribText(pInputNode, "Ocean", "Material", "EngineAssets/Materials/Water/Ocean_default"));
-        m_pTerrainWaterMat = szTerrainWaterMatName[0] ? GetMatMan()->LoadMaterial(szTerrainWaterMatName, false) : nullptr;
-    }
-    CreateOcean(m_pTerrainWaterMat, COcean::GetWaterLevelInfo());
-
-    m_oceanWindDirection = (float) atof(GetXMLAttribText(pInputNode, "OceanAnimation", "WindDirection", "1.0"));
-    m_oceanWindSpeed = (float) atof(GetXMLAttribText(pInputNode, "OceanAnimation", "WindSpeed", "4.0"));
-    m_oceanWavesSpeed = (float) atof(GetXMLAttribText(pInputNode, "OceanAnimation", "WavesSpeed", "1.0"));
-    m_oceanWavesAmount = (float) atof(GetXMLAttribText(pInputNode, "OceanAnimation", "WavesAmount", "1.5"));
-    m_oceanWavesSize = (float) atof(GetXMLAttribText(pInputNode, "OceanAnimation", "WavesSize", "0.75"));
-
-    // re-scale speed based on size - the smaller the faster waves move
-    m_oceanWavesSpeed /= m_oceanWavesSize;
-
-    m_oceanCausticsDistanceAtten = (float)atof(GetXMLAttribText(pInputNode, "Ocean", "CausticsDistanceAtten", "100.0"));
-    m_oceanCausticsTiling = (float)atof(GetXMLAttribText(pInputNode, "Ocean", "CausticsTilling", "1.0"));
-    m_oceanCausticDepth = (float)atof(GetXMLAttribText(pInputNode, "Ocean", "CausticDepth", "8.0"));
-    m_oceanCausticIntensity = (float)atof(GetXMLAttribText(pInputNode, "Ocean", "CausticIntensity", "1.0"));
-
-    // update relevant time of day settings
-    ITimeOfDay* pTimeOfDay(GetTimeOfDay());
-    if (pTimeOfDay)
-    {
-        CTimeOfDay::SEnvironmentInfo envTODInfo;
-        {
-            const char* pText  = GetXMLAttribText(pInputNode, "EnvState", "SunLinkedToTOD", "true");
-            envTODInfo.bSunLinkedToTOD = !strcmp(pText, "true") || !strcmp(pText, "1");
-        }
-        // get rotation of sun around z axis (needed to define an arbitrary path over zenit for day/night cycle position calculations)
-        envTODInfo.sunRotationLatitude = (float) atof(GetXMLAttribText(pInputNode, "Lighting", "SunRotation", "240"));
-        envTODInfo.sunRotationLongitude = (float) atof(GetXMLAttribText(pInputNode, "Lighting", "Longitude", "90"));
-
-        pTimeOfDay->SetEnvironmentSettings(envTODInfo);
-        pTimeOfDay->Update(true, true);
-    }
-
-    {
-        const char* pText = GetXMLAttribText(pInputNode, "EnvState", "SunShadowsMinSpec", "1");
-        int nMinSpec = atoi(pText);
-        if (nMinSpec > 0 && CheckMinSpec(nMinSpec))
-        {
-            m_bSunShadows = true;
-        }
-        else
-        {
-            m_bSunShadows = false;
-        }
-    }
-
-    {
-        const char* pText = GetXMLAttribText(pInputNode, "EnvState", "SunShadowsAdditionalCascadeMinSpec", "0");
-        int nMinSpec = atoi(pText);
-        if (nMinSpec > 0 && CheckMinSpec(nMinSpec))
-        {
-            m_nSunAdditionalCascades = 1;
-        }
-        else
-        {
-            m_nSunAdditionalCascades = 0;
-        }
-    }
-
-    {
-        m_nGsmCache = m_pConsole->GetCVar("r_ShadowsCache")->GetIVal();
-    }
-
-    {
-        const char* pText = GetXMLAttribText(pInputNode, "Terrain", "HeightMapAO", "false");
-        m_bHeightMapAoEnabled = !strcmp(pText, "true") || !strcmp(pText, "1");
-    }
-
-    {
-        int nMinSpec = 3;//atoi(pText);
-        m_fSunClipPlaneRange = 256.0;
-        m_fSunClipPlaneRangeShift = 0.0f;
-
-        if (nMinSpec > 0 && CheckMinSpec(nMinSpec))
-        {
-            m_fSunClipPlaneRange = (float)atof(GetXMLAttribText(pInputNode, "EnvState", "SunShadowsClipPlaneRange", "256.0"));
-
-            float fSunClipPlaneRangeShift = (float)atof(GetXMLAttribText(pInputNode, "EnvState", "SunShadowsClipPlaneRangeShift", "0.0"));
-            m_fSunClipPlaneRangeShift = clamp_tpl(fSunClipPlaneRangeShift / 100.0f, 0.0f, 1.0f);
-        }
-    }
-
-    {
-        const char* pText = GetXMLAttribText(pInputNode, "EnvState", "UseLayersActivation", "false");
-        Get3DEngine()->m_bAreaActivationInUse = !strcmp(pText, "true") || !strcmp(pText, "1");
-    }
-
-    // load cloud shadow parameters
-    {
-        char cloudShadowTexture[256];
-        cry_strcpy(cloudShadowTexture, GetXMLAttribText(pInputNode, "CloudShadows", "CloudShadowTexture", ""));
-
-        ITexture* pTex = 0;
-        if (cloudShadowTexture[0] != '\0')
-        {
-            pTex = GetRenderer()->EF_LoadTexture(cloudShadowTexture, FT_DONT_STREAM);
-        }
-
-        m_nCloudShadowTexId = pTex ? pTex->GetTextureID() : 0;
-
-        // Get animation parameters
-        const Vec3 cloudShadowSpeed = StringToVector(GetXMLAttribText(pInputNode, "CloudShadows", "CloudShadowSpeed", "0,0,0"));
-
-        const float cloudShadowTiling = (float)atof(GetXMLAttribText(pInputNode, "CloudShadows", "CloudShadowTiling", "1.0"));
-        const float cloudShadowBrightness = (float)atof(GetXMLAttribText(pInputNode, "CloudShadows", "CloudShadowBrightness", "1.0"));
-
-        const char* pText = GetXMLAttribText(pInputNode, "CloudShadows", "CloudShadowInvert", "false");
-        const bool cloudShadowInvert = !strcmp(pText, "true") || !strcmp(pText, "1");
-
-        GetRenderer()->SetCloudShadowsParams(m_nCloudShadowTexId, cloudShadowSpeed, cloudShadowTiling, cloudShadowInvert, cloudShadowBrightness);
-    }
-
-    // Particle lighting params. <DEPRECATED> Remove for projects post C3, should be no particle lighting multipliers - have assets tweaked from start
-    {
-        m_fParticlesAmbientMultiplier = (float)atof(GetXMLAttribText(pInputNode, "ParticleLighting", "AmbientMul", "1.0"));
-        m_fParticlesLightMultiplier = (float)atof(GetXMLAttribText(pInputNode, "ParticleLighting", "LightsMul", "1.0"));
-    }
-
-    {
-        const char* pText = GetXMLAttribText(pInputNode, "VolFogShadows", "Enable", "false");
-        const bool enable = !strcmp(pText, "true") || !strcmp(pText, "1");
-
-        pText = GetXMLAttribText(pInputNode, "VolFogShadows", "EnableForClouds", "false");
-        const bool enableForClouds = !strcmp(pText, "true") || !strcmp(pText, "1");
-
-        SetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_ENABLE, Vec3(enable ? 1.0f : 0.0f, enableForClouds ? 1.0f : 0.0f, 0.0f));
-    }
-
-#if defined(FEATURE_SVO_GI)
-    if (gEnv->pConsole->GetCVar("e_GI")->GetIVal())
-    {
-        LoadTISettings(pInputNode);
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::LoadTimeOfDaySettingsFromXML(XmlNodeRef node)
-{
-    if (node)
-    {
-        GetTimeOfDay()->Serialize(node, true);
-        ITimeOfDay::SAdvancedInfo info;
-        GetTimeOfDay()->GetAdvancedInfo(info);
-        GetTimeOfDay()->SetTime(info.fStartTime, true);
-    }
-}
-
-//! create static object containing empty IndexedMesh
-IStatObj* C3DEngine::CreateStatObj()
-{
-    CStatObj* pStatObj = new CStatObj();
-    pStatObj->m_pIndexedMesh = new CIndexedMesh();
-    return pStatObj;
-}
-
-IStatObj* C3DEngine::CreateStatObjOptionalIndexedMesh(bool createIndexedMesh)
-{
-    CStatObj* pStatObj = new CStatObj();
-    if (createIndexedMesh)
-    {
-        pStatObj->m_pIndexedMesh = new CIndexedMesh();
-    }
-    return pStatObj;
-}
-
-bool C3DEngine::RestoreTerrainFromDisk([[maybe_unused]] int nSID)
-{
-    ResetParticlesAndDecals();
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool C3DEngine::LoadUsedShadersList()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    gEnv->pRenderer->EF_Query(EFQ_SetShaderCombinations);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool C3DEngine::PrecreateDecals()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    CObjManager::DecalsToPrecreate& decals(GetObjManager()->GetDecalsToPrecreate());
-    // pre-create ...
-    if (GetCVars()->e_DecalsPreCreate)
-    {
-        CryLog("Pre-creating %d decals...", (int)decals.size());
-
-        CObjManager::DecalsToPrecreate::iterator it(decals.begin());
-        CObjManager::DecalsToPrecreate::iterator itEnd(decals.end());
-        for (; it != itEnd; ++it)
-        {
-            IDecalRenderNode* pDecalRenderNode(*it);
-            pDecalRenderNode->Precache();
-        }
-
-        CryLog(" done.\n");
-    }
-    else
-    {
-        CryLog("Skipped pre-creation of decals.\n");
-    }
-
-    // ... and discard list (even if pre-creation was skipped!)
-    decals.resize(0);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Called by game when everything needed for level is loaded.
-//////////////////////////////////////////////////////////////////////////
-void C3DEngine::PostLoadLevel()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    CRY_ASSERT(m_levelLoaded == false);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Submit water material to physics if the ocean exists
-    //////////////////////////////////////////////////////////////////////////
-
-
-    if (GetCVars()->e_PrecacheLevel)
-    {
-        // pre-create decals
-        PrecreateDecals();
-    }
-
-    gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_TEXTURES);
-
-    GetRenderer()->PostLevelLoading();
-
-    // refresh material constants pulled in from resources (such as textures)
-    GetMatMan()->RefreshShaderResourceConstants();
-
-    if (m_nGsmCache > 0)
-    {
-        m_CachedShadowsBounds.Reset();
-        SetRecomputeCachedShadows(m_nCachedShadowsUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eFullUpdate);
-    }
-    m_levelLoaded = true;
-}
-
-
-int C3DEngine::SaveStatObj(IStatObj* pStatObj, TSerialize ser)
-{
-    if (!(pStatObj->GetFlags() & STATIC_OBJECT_GENERATED))
-    {
-        bool bVal = false;
-        ser.Value("altered", bVal);
-        ser.Value("file", pStatObj->GetFilePath());
-        ser.Value("geom", pStatObj->GetGeoName());
-    }
-    else
-    {
-        bool bVal = true;
-        ser.Value("altered", bVal);
-        ser.Value("CloneSource", pStatObj->GetCloneSourceObject() ? pStatObj->GetCloneSourceObject()->GetFilePath() : "0");
-        pStatObj->Serialize(ser);
-    }
-
-    return 1;
-}
-
-IStatObj* C3DEngine::LoadStatObj(TSerialize ser)
-{
-    bool bVal;
-    IStatObj* pStatObj;
-    ser.Value("altered", bVal);
-    if (!bVal)
-    {
-        string fileName, geomName;
-        ser.Value("file", fileName);
-        ser.Value("geom", geomName);
-        pStatObj = LoadStatObjUnsafeManualRef(fileName, geomName);
-    }
-    else
-    {
-        string srcObjName;
-        ser.Value("CloneSource", srcObjName);
-        if (*(const unsigned short*)(const char*)srcObjName != '0')
-        {
-            pStatObj = LoadStatObjUnsafeManualRef(srcObjName)->Clone(false, false, true);
-        }
-        else
-        {
-            pStatObj = CreateStatObj();
-        }
-        pStatObj->Serialize(ser);
-    }
-    return pStatObj;
-}
-
-
-
-
diff --git a/Code/CryEngine/Cry3DEngine/3dEngineOctreeCompile.cpp b/Code/CryEngine/Cry3DEngine/3dEngineOctreeCompile.cpp
deleted file mode 100644
index 7983dda0c9..0000000000
--- a/Code/CryEngine/Cry3DEngine/3dEngineOctreeCompile.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "3dEngine.h"
-#include "Ocean.h"
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "MatMan.h"
-#include "VisAreas.h"
-#include "ObjectsTree.h"
-
-#include <CryPath.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-#include <MathConversion.h>
-#include <StatObjBus.h>
-#include <PakLoadDataUtils.h>
-#include <AzCore/Console/IConsole.h>
-
-
-#define SIGC_HIDEABILITY          BIT(3)
-#define SIGC_HIDEABILITYSECONDARY BIT(4)
-#define SIGC_PROCEDURALLYANIMATED BIT(6)
-#define SIGC_CASTSHADOW           BIT(7) // Deprecated
-#define SIGC_RECVSHADOW           BIT(8)
-#define SIGC_DYNAMICDISTANCESHADOWS BIT(9)
-#define SIGC_USEALPHABLENDING     BIT(10)
-#define SIGC_RANDOMROTATION       BIT(12)
-#define SIGC_ALLOWINDOOR                    BIT(13)
-
-// Bits 13-14 reserved for player hideability
-#define SIGC_PLAYERHIDEABLE_LOWBIT (13)
-#define SIGC_PLAYERHIDEABLE_MASK   BIT(13) | BIT(14)
-
-#define SIGC_CASTSHADOW_MINSPEC_SHIFT (15)
-
-// Get the number of bits needed for the maximum spec level
-#define SIGC_CASTSHADOW_MINSPEC_MASK_NUM_BITS_NEEDED (IntegerLog2(uint32(END_CONFIG_SPEC_ENUM - 1)) + 1)
-
-// Create a mask based on the number of bits needed
-#define SIGC_CASTSHADOW_MINSPEC_MASK_BITS ((1 << SIGC_CASTSHADOW_MINSPEC_MASK_NUM_BITS_NEEDED) - 1)
-#define SIGC_CASTSHADOW_MINSPEC_MASK  (SIGC_CASTSHADOW_MINSPEC_MASK_BITS << SIGC_CASTSHADOW_MINSPEC_SHIFT)
-
-AZ_CVAR(float, bg_DefaultMaxOctreeWorldSize, 4096.0f, nullptr, AZ::ConsoleFunctorFlags::NeedsReload, "Default world size to use for the octree when terrain is not present.");
-
-bool C3DEngine::CreateOctree(float maxRootOctreeNodeSize)
-{
-    float rootOctreeNodeSize = (maxRootOctreeNodeSize > 0.0f) ? maxRootOctreeNodeSize : bg_DefaultMaxOctreeWorldSize;
-    COctreeNode* newOctreeNode = COctreeNode::Create(DEFAULT_SID, AABB(Vec3(0), Vec3(rootOctreeNodeSize)), NULL);
-    if (!newOctreeNode)
-    {
-        Error("Failed to create octree with initial world size=%f", rootOctreeNodeSize);
-        return false;
-    }
-    SetObjectTree(newOctreeNode);
-    Cry3DEngineBase::GetObjManager()->GetListStaticTypes().PreAllocate(1, 1);
-    Cry3DEngineBase::GetObjManager()->GetListStaticTypes()[DEFAULT_SID].Reset();
-    return true;
-}
-
-
-void C3DEngine::DestroyOctree()
-{
-    COctreeNode* objectTree = GetObjectTree();
-    if (objectTree)
-    {
-        delete objectTree;
-        SetObjectTree(nullptr);
-    }
-}
-
-#define RAD2BYTE(x) ((x)*255.0f / float(g_PI2))
-#define BYTE2RAD(x) ((x)* float(g_PI2) / 255.0f)
-
-#include "TypeInfo_impl.h"
-
diff --git a/Code/CryEngine/Cry3DEngine/BasicArea.cpp b/Code/CryEngine/Cry3DEngine/BasicArea.cpp
deleted file mode 100644
index 0af2e5cd7e..0000000000
--- a/Code/CryEngine/Cry3DEngine/BasicArea.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : objects container, streaming, common part for indoor and outdoor sectors
-
-
-#include "Cry3DEngine_precompiled.h"
-
-CBasicArea::~CBasicArea()
-{
-    delete m_pObjectsTree;
-    m_pObjectsTree = NULL;
-}
diff --git a/Code/CryEngine/Cry3DEngine/BasicArea.h b/Code/CryEngine/Cry3DEngine/BasicArea.h
deleted file mode 100644
index d29b605863..0000000000
--- a/Code/CryEngine/Cry3DEngine/BasicArea.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_BASICAREA_H
-#define CRYINCLUDE_CRY3DENGINE_BASICAREA_H
-#pragma once
-
-#define COPY_MEMBER_SAVE(_dst, _src, _name) { (_dst)->_name = (_src)->_name; }
-#define COPY_MEMBER_LOAD(_dst, _src, _name) { (_dst)->_name = (_src)->_name; }
-
-enum EObjList
-{
-    DYNAMIC_OBJECTS = 0,
-    STATIC_OBJECTS,
-    PROC_OBJECTS,
-    ENTITY_LISTS_NUM
-};
-
-struct SRNInfo
-{
-    SRNInfo()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    SRNInfo(IRenderNode* _pNode)
-    {
-        fMaxViewDist = _pNode->m_fWSMaxViewDist;
-        AABB aabbBox = _pNode->GetBBox();
-        objSphere.center = aabbBox.GetCenter();
-        objSphere.radius = aabbBox.GetRadius();
-        pNode = _pNode;
-        nRType = _pNode->GetRenderNodeType();
-
-        /*#ifdef _DEBUG
-                erType = _pNode->GetRenderNodeType();
-                cry_strcpy(szName, _pNode->GetName());
-        #endif*/
-    }
-
-    bool operator == (const IRenderNode* _pNode) const { return (pNode == _pNode); }
-    bool operator == (const SRNInfo& rOther) const { return (pNode == rOther.pNode); }
-
-    float fMaxViewDist;
-    Sphere objSphere;
-    IRenderNode* pNode;
-    EERType nRType;
-    /*#ifdef _DEBUG
-        EERType erType;
-        char szName[32];
-    #endif*/
-};
-
-struct SCasterInfo
-{
-    SCasterInfo()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    SCasterInfo(IRenderNode* _pNode, float fMaxDist)
-    {
-        fMaxCastingDist = fMaxDist;
-        objBox = _pNode->GetBBox();
-        objSphere.center = objBox.GetCenter();
-        objSphere.radius = objBox.GetRadius();
-        pNode = _pNode;
-        nRType = _pNode->GetRenderNodeType();
-        nRenderNodeFlags = _pNode->GetRndFlags();
-        bCanExecuteAsRenderJob = _pNode->CanExecuteRenderAsJob();
-    }
-
-    SCasterInfo(IRenderNode* _pNode, float fMaxDist, EERType renderNodeType)
-    {
-        fMaxCastingDist = fMaxDist;
-        _pNode->FillBBox(objBox);
-        objSphere.center = objBox.GetCenter();
-        objSphere.radius = objBox.GetRadius();
-        pNode = _pNode;
-        nRType = renderNodeType;
-        nRenderNodeFlags = _pNode->GetRndFlags();
-        bCanExecuteAsRenderJob = _pNode->CanExecuteRenderAsJob();
-    }
-
-    bool operator == (const IRenderNode* _pNode) const { return (pNode == _pNode); }
-    bool operator == (const SCasterInfo& rOther) const { return (pNode == rOther.pNode); }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
-
-    float fMaxCastingDist;
-    Sphere objSphere;
-    AABB objBox;
-    IRenderNode* pNode;
-    uint32 nGSMFrameId;
-    EERType nRType;
-    bool bCanExecuteAsRenderJob;
-    uint32 nRenderNodeFlags;
-};
-
-#define UPDATE_PTR_AND_SIZE(_pData, _nDataSize, _SIZE_PLUS) \
-    {                                                       \
-        _pData += (_SIZE_PLUS);                             \
-        _nDataSize -= (_SIZE_PLUS);                         \
-        assert(_nDataSize >= 0);                            \
-    }                                                       \
-
-enum EAreaType
-{
-    eAreaType_Undefined,
-    eAreaType_OcNode,
-    eAreaType_VisArea
-};
-
-struct CBasicArea
-    : public Cry3DEngineBase
-{
-    CBasicArea()
-    {
-        m_boxArea.min = m_boxArea.max = Vec3(0, 0, 0);
-        m_pObjectsTree = NULL;
-    }
-
-    ~CBasicArea();
-
-    void CompileObjects(int nListId); // optimize objects lists for rendering
-
-    class COctreeNode* m_pObjectsTree;
-
-    AABB m_boxArea; // bbox containing everything in sector including child sectors
-    AABB m_boxStatics; // bbox containing only objects in STATIC_OBJECTS list of this node and height-map
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_BASICAREA_H
diff --git a/Code/CryEngine/Cry3DEngine/CCullRenderer.cpp b/Code/CryEngine/Cry3DEngine/CCullRenderer.cpp
deleted file mode 100644
index b2de025ccb..0000000000
--- a/Code/CryEngine/Cry3DEngine/CCullRenderer.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "CCullRenderer.h"
-
-namespace NAsyncCull
-{
-}
diff --git a/Code/CryEngine/Cry3DEngine/CCullRenderer.h b/Code/CryEngine/Cry3DEngine/CCullRenderer.h
deleted file mode 100644
index a1dcdbcd6e..0000000000
--- a/Code/CryEngine/Cry3DEngine/CCullRenderer.h
+++ /dev/null
@@ -1,1566 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "VMath.hpp"
-#include <AzCore/Debug/Profiler.h>
-
-//#define CULL_RENDERER_REPROJ_DEBUG
-#define CULL_RENDERER_MINZ
-
-// enable this define to allow ingame debugging of the coverage buffer
-#define CULLING_ENABLE_DEBUG_OVERLAY
-
-extern  SHWOccZBuffer HWZBuffer;
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CCullRenderer_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN64)
-#define CULLINLINE inline
-#define CULLNOINLINE inline
-#else
-    #define CULLINLINE ILINE
-    #define CULLNOINLINE inline
-#endif
-
-namespace NAsyncCull {
-    namespace Debug {
-        inline void Draw2DBox(float fX, float fY, float fHeight, float fWidth, const ColorB& rColor, float fScreenHeight, float fScreenWidth, IRenderAuxGeom* pAuxRenderer)
-        {
-            float fPosition[4][2] = {
-                { fX,                       fY },
-                { fX,                       fY + fHeight },
-                { fX + fWidth,  fY + fHeight },
-                { fX + fWidth, fY}
-            };
-
-            // compute normalized position from absolute points
-            Vec3 vPosition[4] = {
-                Vec3(fPosition[0][0] / fScreenWidth, fPosition[0][1] / fScreenHeight, 0.0f),
-                Vec3(fPosition[1][0] / fScreenWidth, fPosition[1][1] / fScreenHeight, 0.0f),
-                Vec3(fPosition[2][0] / fScreenWidth, fPosition[2][1] / fScreenHeight, 0.0f),
-                Vec3(fPosition[3][0] / fScreenWidth, fPosition[3][1] / fScreenHeight, 0.0f)
-            };
-
-            vtx_idx const anTriangleIndices[6] = {
-                0, 1, 2,
-                0, 2, 3
-            };
-
-            pAuxRenderer->DrawTriangles(vPosition, 4, anTriangleIndices, 6, rColor);
-        }
-    } // namesapce Debug
-} //namespace NasyncCull
-
-namespace NAsyncCull
-{
-    typedef float                                           tdZexel;
-    typedef uint16                                      tdIndex;
-
-    typedef PodArray<NVMath::vec4>& tdVertexCacheArg;
-    typedef PodArray<NVMath::vec4>  tdVertexCache;
-
-    enum
-    {
-        VERTEX_CACHE_COUNT = 64 * 1024
-    };
-
-    extern const NVMath::vec4 MaskNot3;
-
-    template<uint32 SIZEX, uint32 SIZEY>
-    class CCullRenderer
-    {
-    public:
-        enum
-        {
-            RESOLUTION_X = SIZEX
-        };
-        enum
-        {
-            RESOLUTION_Y = SIZEY
-        };
-    private:
-
-        NVMath::vec4                    m_VMaxXY        _ALIGN(16);
-        static float                    m_ZBufferMainMemory[SIZEX * SIZEY]    _ALIGN(128);
-        uint32                              m_SizeX4;
-        _MS_ALIGN(16) float     m_Reproject[16] _ALIGN(16);
-        uint32                              m_nNumWorker;
-        tdZexel*                            m_ZBuffer;
-
-        tdZexel** m_ZBufferSwap;
-
-        DEFINE_ALIGNED_DATA(tdZexel, m_ZBufferSwapMerged[SIZEX * SIZEY], 128); // 128 byte for XMemSet128
-
-#ifdef CULL_RENDERER_REPROJ_DEBUG
-        tdZexel                             m_ZBufferOrig[SIZEX * SIZEY];
-#endif
-
-        uint32                              m_DrawCall;
-        uint32                              m_PolyCount;
-
-        template<bool WRITE, bool CULL, bool CULL_BACKFACES>
-        CULLINLINE  bool            Triangle(const  NVMath::vec4& rV0,
-            const  NVMath::vec4& rV1,
-            const  NVMath::vec4& rV2)
-        {
-            using namespace NVMath;
-            vec4 V0     =   rV0;
-            vec4 V1     =   rV1;
-            vec4 V2     =   rV2;
-
-            const   uint32  Idx =   SignMask(Shuffle<xzzz>(Shuffle<zzzz>(V0, V1), V2)) & (BitX | BitY | BitZ);
-            if (Idx == (BitX | BitY | BitZ))
-            {
-                return false;
-            }
-
-            bool Visible = false;
-
-            switch (Idx)
-            {
-            case 0:
-                break;
-            case BitX:
-            {
-                const vec4  F0  =   Splat<2>(V0);
-                const vec4  F1  =   Splat<2>(V1);
-                const vec4  F2  =   Splat<2>(V2);
-                const vec4  M0  =   Div(F0, Sub(F0, F2));
-                const vec4  M1  =   Div(F0, Sub(F0, F1));
-                const vec4  P0  =   Madd(Sub(V2, V0), M0, V0);
-                const vec4  P1  =   Madd(Sub(V1, V0), M1, V0);
-                Visible = Triangle2D<WRITE, CULL, true, CULL_BACKFACES>(P0, P1, V1);
-                V0  =   P0;
-            }
-            break;
-            case BitY:
-            {
-                const vec4  F0  =   Splat<2>(V0);
-                const vec4  F1  =   Splat<2>(V1);
-                const vec4  F2  =   Splat<2>(V2);
-                const vec4  M0  =   Div(F1, Sub(F1, F0));
-                const vec4  M1  =   Div(F1, Sub(F1, F2));
-                const vec4  P0  =   Madd(Sub(V0, V1), M0, V1);
-                const vec4  P1  =   Madd(Sub(V2, V1), M1, V1);
-                Visible = Triangle2D<WRITE, CULL, true, CULL_BACKFACES>(P0, P1, V2);
-                V1  =   P0;
-            }
-            break;
-            case BitX | BitY:
-            {
-                const vec4  F0  =   Splat<2>(V0);
-                const vec4  F1  =   Splat<2>(V1);
-                const vec4  F2  =   Splat<2>(V2);
-                const vec4  M0  =   Div(F0, Sub(F0, F2));
-                const vec4  M1  =   Div(F1, Sub(F1, F2));
-                V0  =   Madd(Sub(V2, V0), M0, V0);
-                V1  =   Madd(Sub(V2, V1), M1, V1);
-            }
-            break;
-            case BitZ:
-            {
-                const vec4  F0  =   Splat<2>(V0);
-                const vec4  F1  =   Splat<2>(V1);
-                const vec4  F2  =   Splat<2>(V2);
-                const vec4  M0  =   Div(F2, Sub(F2, F1));
-                const vec4  M1  =   Div(F2, Sub(F2, F0));
-                const vec4  P0  =   Madd(Sub(V1, V2), M0, V2);
-                const vec4  P1  =   Madd(Sub(V0, V2), M1, V2);
-                Visible = Triangle2D<WRITE, CULL, true, CULL_BACKFACES>(V0, P0, P1);
-                V2  =   P0;
-            }
-            break;
-            case BitX | BitZ:
-            {
-                const vec4  F0  =   Splat<2>(V0);
-                const vec4  F1  =   Splat<2>(V1);
-                const vec4  F2  =   Splat<2>(V2);
-                const vec4  M0  =   Div(F0, Sub(F0, F1));
-                const vec4  M1  =   Div(F2, Sub(F2, F1));
-                V0  =   Madd(Sub(V1, V0), M0, V0);
-                V2  =   Madd(Sub(V1, V2), M1, V2);
-            }
-            break;
-            case BitY | BitZ:
-            {
-                const vec4 F0   =   Splat<2>(V0);
-                const vec4 F1   =   Splat<2>(V1);
-                const vec4 F2   =   Splat<2>(V2);
-                const vec4  M0  =   Div(F1, Sub(F1, F0));
-                const vec4  M1  =   Div(F2, Sub(F2, F0));
-                V1  =   Madd(Sub(V0, V1), M0, V1);
-                V2  =   Madd(Sub(V0, V2), M1, V2);
-            }
-            break;
-            case BitX | BitY | BitZ:
-                break;
-#if AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE
-            default:
-                __assume(0);
-#endif
-            }
-            return Visible | Triangle2D<WRITE, CULL, true, CULL_BACKFACES>(V0, V1, V2);
-        }
-
-
-        template<bool WRITE, bool CULL, bool PROJECT, bool CULL_BACKFACES>
-#if AZ_TRAIT_COMPILER_PASS_4PLUS_VECTOR_PARAMETERS_BY_VALUE
-        CULLINLINE  bool            Triangle2D(NVMath::vec4 rV0, NVMath::vec4 rV1, NVMath::vec4 rV2, uint32 MinX = 0, uint32 MinY = 0, uint32 MaxX = 0, uint32 MaxY = 0, NVMath::vec4  VMinMax = NVMath::Vec4Zero(), NVMath::vec4 V210 = NVMath::Vec4Zero())
-#else
-        CULLINLINE  bool            Triangle2D(NVMath::vec4 rV0, NVMath::vec4 rV1, NVMath::vec4 rV2, uint32 MinX = 0, uint32 MinY = 0, uint32 MaxX = 0, uint32 MaxY = 0, NVMath::vec4& VMinMax = NVMath::Vec4Zero(), NVMath::vec4& V210 = NVMath::Vec4Zero())
-#endif
-        {
-            using namespace NVMath;
-
-            vec4 V0, V1, V2;
-            if (PROJECT)
-            {
-                const   vec4    WWW     =   Shuffle<xzww>(Shuffle<wwww>(rV0, rV1), rV2);
-                const   vec4    iWWW    =   Rcp(WWW);
-                V0  =   Mul(rV0, Splat<0>(iWWW));
-                V1  =   Mul(rV1, Splat<1>(iWWW));
-                V2  =   Mul(rV2, Splat<2>(iWWW));
-                V210 =   Sub(Shuffle<xyxy>(V1, V2), Swizzle<xyxy>(V0));
-                vec4 Det    =   Mul(V210, Swizzle<wzwz>(V210));
-                Det =   Sub(Det, Splat<1>(Det));
-                if (CULL_BACKFACES)
-                {
-                    if ((SignMask(CmpLE(Det, Vec4Epsilon())) & BitX) != 0)
-                    {
-                        return false;
-                    }
-                }
-
-                Det = Select(Det, NVMath::Vec4(-FLT_EPSILON), CmpEq(Det, Vec4Zero()));
-                V210        =   Div(V210, Swizzle<xxxx>(Det));
-
-                vec4 VMax   =   Max(Max(V0, V1), V2);
-                vec4 VMin   =   Min(Min(V0, V1), V2);
-                VMax        =   Add(VMax, Vec4One());
-                VMinMax =   Shuffle<xyxy>(VMin, VMax);
-                VMinMax =   Max(VMinMax, Vec4Zero());
-                VMinMax =   Min(VMinMax, m_VMaxXY);
-                VMinMax =   floatToint32(VMinMax);
-                const uint32* pMM       =   reinterpret_cast<uint32*>(&VMinMax);
-                MinX    =   pMM[0];
-                MinY    =   pMM[1];
-                MaxX    =   pMM[2];
-                MaxY    =   pMM[3];
-                if (MinX >= MaxX || MinY >= MaxY)
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                V0  =   rV0;
-                V1  =   rV1;
-                V2  =   rV2;
-            }
-
-
-            MinX &= ~3;
-
-            VMinMax =   And(VMinMax, MaskNot3);
-
-#ifdef CULL_RENDERER_MINZ
-            const vec4  VMinZ   =   Splat<2>(Min(Min(rV0, rV1), rV2));
-#endif
-            const vec4  V0z =   Splat<2>(rV0);
-            const vec4  Z10 =   Sub(Splat<2>(rV1), V0z);
-            const vec4  Z20 =   Sub(Splat<2>(rV2), V0z);
-
-            const vec4 X20  =   Splat<0>(V210);
-            const vec4 Y20  =   Splat<1>(V210);
-            const vec4 X10  =   Sub(Vec4Zero(), Splat<2>(V210));
-            const vec4 Y10  =   Splat<3>(V210);
-
-            VMinMax =   Sub(int32Tofloat(VMinMax), V0);
-            const vec4  dx4 =   Add(Splat<0>(VMinMax), Vec4ZeroOneTwoThree());
-            const vec4  Y1x =   Mul(Y10, dx4);
-            const vec4  Y2x =   Sub(Vec4Zero(), Mul(Y20, dx4));
-            vec4    dy4 =   Splat<1>(VMinMax);
-            const vec4  Y14 =   Mul(Y10, Vec4Four());
-            const vec4  Y24 =   Sub(Vec4Zero(), Mul(Y20, Vec4Four()));
-            const vec4  Y34 =   Add(Y14, Y24);
-            vec4 Visible    =   Vec4FFFFFFFF();
-            uint16 y = MinY;
-            do
-            {
-                vec4    Px  =   Madd(X10, dy4, Y1x);
-                vec4    Py  =   Madd(X20, dy4, Y2x);
-                vec4    Pz  =   Sub(Sub(Vec4One(), Py), Px);
-
-                vec4*   pDstZ   =   reinterpret_cast<vec4*>(&m_ZBuffer[MinX + y * (uint16)SIZEX]);
-                y++;
-                uint16 x = MinX;
-                do
-                {
-                    Prefetch<ECL_LVL1>(pDstZ);
-                    x               +=  4;
-                    vec4    Mask        =   Or(Or(Px, Py), Pz);
-                    vec4 Z,     rZ  =   *pDstZ;
-#ifdef CULL_RENDERER_MINZ
-                    if (!WRITE)                                         //compile time
-                    {
-                        Mask        =   Or(Mask, CmpLE(rZ, VMinZ));
-                    }
-                    else
-#endif
-                    {
-                        Z               =   Madd(Z10, Px, Madd(Z20, Py, V0z));
-                        Mask        =   Or(Mask, CmpLE(rZ, Z));
-                    }
-                    Px          =   Add(Px, Y14);
-                    Py          =   Add(Py, Y24);
-                    Pz          =   Sub(Pz, Y34);
-                    if (CULL)                                           //compile time
-                    {
-                        Visible =   And(Visible, Mask);
-                    }
-                    if (WRITE)                                          //compile time
-                    {
-                        *pDstZ  =   SelectSign(Z, rZ, Mask);
-                    }
-                    pDstZ++;
-                } while (x < MaxX);
-                if constexpr (!WRITE && CULL)
-                {
-                    if ((SignMask(Visible) & (BitX | BitY | BitZ | BitW)) != (BitX | BitY | BitZ | BitW))
-                    {
-                        return true;
-                    }
-                }
-                dy4 = Add(dy4, Vec4One());
-            } while (y < MaxY);
-            return CULL && (SignMask(Visible) & (BitX | BitY | BitZ | BitW)) != (BitX | BitY | BitZ | BitW);
-        }
-
-
-        CULLINLINE  bool            Quad2D(const NVMath::vec4& rV0, const NVMath::vec4& rV1, const NVMath::vec4& rV3, const NVMath::vec4& rV2)
-        {
-            using namespace NVMath;
-            const   vec4    WWW     =   Shuffle<xzxz>(Shuffle<wwww>(rV0, rV1), Shuffle<wwww>(rV2, rV3));
-            const   vec4    iWWW    =   Rcp(WWW);
-
-            vec4 V0 =   Mul(rV0, Splat<0>(iWWW));
-            vec4 V1 =   Mul(rV1, Splat<1>(iWWW));
-            vec4 V2 =   Mul(rV2, Splat<2>(iWWW));
-            vec4 V3 =   Mul(rV3, Splat<3>(iWWW));
-
-            vec4 V210   =   Sub(Shuffle<xyxy>(V1, V2), Swizzle<xyxy>(V0));
-            vec4 V213   =   Sub(Shuffle<xyxy>(V1, V2), Swizzle<xyxy>(V3));
-            vec4 Det    =   Mul(V210, Swizzle<wzwz>(V210));
-            Det             =   Sub(Det, Splat<1>(Det));
-
-            vec4 VMax   =   Max(Max(V0, V1), Max(V2, V3));
-            vec4 VMin   =   Min(Min(V0, V1), Min(V2, V3));
-            VMax        =   Add(VMax, Vec4One());
-            //saturate to 0 - ScreenSize cause it's assigned to uin16
-            VMin        =   Min(VMin, m_VMaxXY);
-            VMax        =   Min(VMax, m_VMaxXY);
-
-            vec4    VMinMax =   floatToint32(Max(Shuffle<xyxy>(VMin, VMax), Vec4Zero()));
-            uint16  MinX    =   Vec4int32(VMinMax, 0);
-            const uint16    MinY    =   Vec4int32(VMinMax, 1);
-            const uint16    MaxX    =   Vec4int32(VMinMax, 2);
-            const uint16    MaxY    =   Vec4int32(VMinMax, 3);
-            if (MinX >= MaxX || MinY >= MaxY)
-            {
-                return false;
-            }
-            MinX &= ~3;
-
-            const vec4  VMinZ   =   Splat<2>(Min(Min(rV0, rV1), Min(rV2, rV3)));
-            Det     =   Rcp(Splat<0>(Det));
-            V210    =   Mul(V210, Det);
-            V213    =   Mul(V213, Det);
-            const vec4 X20  =   Splat<0>(V210);
-            const vec4 Y20  =   Splat<1>(V210);
-            const vec4 X10  =   Splat<2>(V210);
-            const vec4 Y10  =   Splat<3>(V210);
-            const vec4 X23  =   Splat<0>(V213);
-            const vec4 Y23  =   Splat<1>(V213);
-            const vec4 X13  =   Splat<2>(V213);
-            const vec4 Y13  =   Splat<3>(V213);
-
-            const vec4  dx4 =   Sub(Add(NVMath::Vec4(static_cast<float>(MinX)), Vec4ZeroOneTwoThree()), Splat<0>(V0));
-            const vec4  Y10x    =   Mul(Y10, dx4);
-            const vec4  Y20x    =   Mul(Y20, dx4);
-            const vec4  Y13x    =   Mul(Y13, dx4);
-            const vec4  Y23x    =   Mul(Y23, dx4);
-            vec4    dy4 =   Sub(NVMath::Vec4(static_cast<float>(MinY)), Splat<1>(V0));
-            const vec4  Y104    =   Mul(Y10, Vec4Four());
-            const vec4  Y204    =   Mul(Y20, Vec4Four());
-            const vec4  Y134    =   Mul(Y13, Vec4Four());
-            const vec4  Y234    =   Mul(Y23, Vec4Four());
-            const vec4  Y304    =   Sub(Y104, Y204);
-            const vec4  Y334    =   Sub(Y134, Y234);
-            vec4 Visible    =   Vec4FFFFFFFF();
-            uint16 y = MinY;
-            do
-            {
-                vec4    P0x =   Sub(Y10x, Mul(X10, dy4));
-                vec4    P0y =   Sub(Mul(X20, dy4), Y20x);
-                vec4    P3x =   Sub(Y13x, Mul(X13, dy4));
-                vec4    P3y =   Sub(Mul(X23, dy4), Y23x);
-                uint16 x        =   MinX;
-                vec4*   pDstZ   =   reinterpret_cast<vec4*>(&m_ZBuffer[MinX + y * (uint16)SIZEX]);
-                do
-                {
-                    Prefetch<ECL_LVL1>(pDstZ);
-                    vec4 Mask   =   Or(Or(P0x, P0y), Or(P3x, P3y));
-                    vec4 rZ =   *pDstZ++;
-                    Mask        =   Or(Mask, CmpLE(rZ, VMinZ));
-                    x               += 4;
-                    Visible =   And(Visible, Mask);
-                    P0x         =   Add(P0x, Y104);
-                    P0y         =   Sub(P0y, Y204);
-                    P3x         =   Add(P3x, Y134);
-                    P3y         =   Sub(P3y, Y234);
-                } while (x < MaxX);
-                if (SignMask(Visible) != (BitX | BitY | BitZ | BitW))
-                {
-                    return true;
-                }
-                y++;
-                dy4 = Add(dy4, Vec4One());
-            } while (y < MaxY);
-            return false;
-        }
-
-
-        void                                    Show();
-    public:
-
-        CULLINLINE                      CCullRenderer()
-        {
-            m_ZBuffer = m_ZBufferMainMemory;
-            m_DebugRender   =   0;
-            m_nNumWorker = 0;
-            m_ZBufferSwap = NULL;
-        }
-
-        ~CCullRenderer()
-        {
-            for (uint32 i = 0; i < m_nNumWorker; ++i)
-            {
-                CryModuleMemalignFree(m_ZBufferSwap[i]);
-            }
-            delete[] m_ZBufferSwap;
-        }
-
-        void Prepare()
-        {
-            if (m_nNumWorker)
-            {
-                return;
-            }
-
-            m_nNumWorker = AZ::JobContext::GetGlobalContext()->GetJobManager().GetNumWorkerThreads();
-            m_ZBufferSwap = new tdZexel*[m_nNumWorker];
-            for (uint32 i = 0; i < m_nNumWorker; ++i)
-            {
-                m_ZBufferSwap[i] = (tdZexel*)CryModuleMemalign(sizeof(tdZexel) * SIZEX * SIZEY, 128);
-            }
-        }
-
-        CULLINLINE  void            Clear()
-        {
-            m_VMaxXY    =   NVMath::int32Tofloat(NVMath::Vec4(SIZEX, SIZEY, SIZEX, SIZEY));
-            for (uint32 a = 0, S = SIZEX * SIZEY; a < S; a++)
-            {
-                m_ZBuffer[a] = 9999999999.f;
-            }
-            m_DrawCall = 0;
-            m_PolyCount = 0;
-        }
-
-        bool DownLoadHWDepthBuffer([[maybe_unused]] float nearPlane, [[maybe_unused]] float farPlane, [[maybe_unused]] float nearestMax, [[maybe_unused]] float Bias)
-        {
-            Matrix44A& Reproject = *reinterpret_cast<Matrix44A*>(&m_Reproject);
-
-            m_VMaxXY    =   NVMath::int32Tofloat(NVMath::Vec4(SIZEX, SIZEY, SIZEX, SIZEY));
-
-            if (!gEnv->pRenderer->GetOcclusionBuffer((uint16*)&m_ZBuffer[0], reinterpret_cast<Matrix44*>(&Reproject)))
-            {
-                return false;
-            }
-
-            for (uint32 i = 0; i < m_nNumWorker; ++i)
-            {
-                memset(m_ZBufferSwap[i], 0, SIZEX * SIZEY * sizeof(float));
-            }
-            memset(m_ZBufferSwapMerged, 0, SIZEX * SIZEY * sizeof(float));
-
-            return true;
-        }
-
-        void ReprojectHWDepthBuffer(const Matrix44A& rCurrent, float nearPlane, float farPlane, float nearestMax, [[maybe_unused]] float Bias, int nStartLine, int nNumLines)
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-            //#define USE_W_DEPTH
-            //#define SCALE_DEPTH
-
-            const uint32 workerThreadID = AZ::JobContext::GetGlobalContext()->GetJobManager().GetWorkerThreadId();
-            CRY_ASSERT(workerThreadID != AZ::JobManager::InvalidWorkerThreadId);
-            float* pZBufferSwap = m_ZBufferSwap[workerThreadID];
-
-            int sizeX = SIZEX;
-            int sizeY = SIZEY;
-
-            float fWidth    = (float) sizeX;
-            float fHeight = (float) sizeY;
-
-            const float a = farPlane / (farPlane - nearPlane);
-            const float b = farPlane * nearPlane / (nearPlane - farPlane);
-
-            Matrix44A fromScreen;
-            fromScreen.SetIdentity();
-            fromScreen.SetTranslation(Vec3(-1.0f + 0.5f / fWidth, 1.0f - 0.5f / fHeight, 0.0f));
-            fromScreen.m00 = 2.0f / fWidth;
-            fromScreen.m11 = -2.0f / fHeight; // Y flipped
-            fromScreen.Transpose();
-
-            Matrix44A Reproject =   *reinterpret_cast<Matrix44A*>(&m_Reproject);
-            Reproject.Invert();
-            DEFINE_ALIGNED_DATA(Matrix44A, mToWorld, 16);
-            mToWorld = fromScreen  * Reproject;
-
-            {
-                int x, y;
-                float fY;
-                using namespace NVMath;
-
-#ifdef USE_W_DEPTH
-                Matrix44A  mReproject = mToWorld * rCurrent;
-                const vec4 MR0  =   reinterpret_cast<vec4*>(&mReproject)[0];
-                const vec4 MR1  =   reinterpret_cast<vec4*>(&mReproject)[1];
-                const vec4 MR2  =   reinterpret_cast<vec4*>(&mReproject)[2];
-                const vec4 MR3  =   reinterpret_cast<vec4*>(&mReproject)[3];
-
-                const vec4 vA = NVMath::Vec4(a);
-                const vec4 vB = NVMath::Vec4(b);
-#else
-                const vec4 MW0  =   reinterpret_cast<vec4*>(&mToWorld)[0];
-                const vec4 MW1  =   reinterpret_cast<vec4*>(&mToWorld)[1];
-                const vec4 MW2  =   reinterpret_cast<vec4*>(&mToWorld)[2];
-                const vec4 MW3  =   reinterpret_cast<vec4*>(&mToWorld)[3];
-
-                const vec4 MS0  =   reinterpret_cast<const vec4*>(&rCurrent)[0];
-                const vec4 MS1  =   reinterpret_cast<const vec4*>(&rCurrent)[1];
-                const vec4 MS2  =   reinterpret_cast<const vec4*>(&rCurrent)[2];
-                const vec4 MS3  =   reinterpret_cast<const vec4*>(&rCurrent)[3];
-#endif
-
-                const vec4 vXOffsets    = NVMath::Vec4(0.0f, 1.0f, 2.0f, 3.0f);
-                const vec4 vXIncrement = NVMath:: Vec4(4.0f);
-
-                const float nearestLinear = b / (nearestMax - a);
-                const vec4 vfEpsilon = NVMath::Vec4Epsilon();
-                const vec4 vfOne = NVMath::Vec4One();
-                const vec4 vZero = NVMath::Vec4Zero();
-
-                vec4* pSrcZ =   reinterpret_cast<vec4*>(&m_ZBuffer[nStartLine * sizeX]);
-
-                for (y = nStartLine, fY = static_cast<float>(nStartLine); y < nStartLine + nNumLines; y++, fY += 1.0f)
-                {
-                    const vec4 vYYYY = NVMath::Vec4(fY);
-
-                    vec4 vXCoords = vXOffsets;
-
-                    for (x = 0; x < sizeX; x += 4)
-                    {
-                        const vec4 vNonLinearDepth = *pSrcZ;
-
-                        vec4 vXXXX[4];
-                        vXXXX[0] = Splat<0>(vXCoords);
-                        vXXXX[1] = Splat<1>(vXCoords);
-                        vXXXX[2] = Splat<2>(vXCoords);
-                        vXXXX[3] = Splat<3>(vXCoords);
-
-                        vec4 vZZZZ[4];
-                        vZZZZ[0] = Splat<0>(vNonLinearDepth);
-                        vZZZZ[1] = Splat<1>(vNonLinearDepth);
-                        vZZZZ[2] = Splat<2>(vNonLinearDepth);
-                        vZZZZ[3] = Splat<3>(vNonLinearDepth);
-
-                        for (int i = 0; i < 4; i++)
-                        {
-#ifdef USE_W_DEPTH
-                            vec4 vScreenPos     = Madd(MR0, vXXXX[i], Madd(MR1, vYYYY, Madd(MR2, vZZZZ[i], MR3)));
-
-                            vec4 vScreenPosH    = Div(vScreenPos, Splat<3>(vScreenPos));
-
-                            vec4 vNewDepth      = Div(vB, Sub(Splat<2>(vScreenPosH), vA));
-
-                            float newDepth      = Vec4float<2>(vNewDepth);
-#else
-                            vec4 vWorldPos      = Madd(MW0, vXXXX[i], Madd(MW1, vYYYY, Madd(MW2, vZZZZ[i], MW3)));
-
-                            vec4 vWorldPosH     = Div(vWorldPos, Max(Splat<3>(vWorldPos), vfEpsilon));
-
-                            vec4 vScreenPos     = Madd(MS0, Splat<0>(vWorldPosH), Madd(MS1, Splat<1>(vWorldPosH), Madd(MS2, Splat<2>(vWorldPosH), MS3)));
-
-                            vec4 vNewDepth      = Splat<2>(vScreenPos);
-
-                            vec4 vScreenPosH    = Div(vScreenPos, Max(Splat<3>(vScreenPos), vfEpsilon));
-
-                            float newDepth      = Vec4float<2>(vNewDepth);
-#endif
-                            // It is faster to use simple non-vectorized code to write the depth in the buffer
-
-                            if (newDepth > 0.f)
-                            {
-                                int X;
-                                int Y;
-                                if (Vec4float<0>(vZZZZ[i]) < nearestMax)
-                                {
-                                    X = x + i;
-                                    Y = y;
-                                    newDepth = nearestLinear;
-                                }
-                                else
-                                {
-                                    vec4 vFinalScreenPosU = floatToint32(vScreenPosH);
-
-                                    X = Vec4int32<0>(vFinalScreenPosU);
-                                    Y = Vec4int32<1>(vFinalScreenPosU);
-                                }
-
-                                if (X >= 0 && Y >= 0 && X < sizeX && Y < sizeY)
-                                {
-                                    float* pDstZ = &pZBufferSwap[X + (Y * sizeX)];
-                                    float depth = *pDstZ;
-
-                                    depth = depth <= 0.f ? farPlane : depth;
-                                    *pDstZ = min(depth, newDepth);
-                                }
-                            }
-                        }
-                        vXCoords = Add(vXIncrement, vXCoords);
-
-                        pSrcZ++;
-                    }
-                }
-            }
-        }
-
-        void MergeReprojectHWDepthBuffer(int nStartLine, int nNumLines)
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-            const int sizeX = SIZEX;
-            using namespace NVMath;
-
-            const vec4 zero = Vec4Zero();
-
-            for (uint32 i = 0; i < m_nNumWorker; ++i)
-            {
-                for (int y = nStartLine; y < nStartLine + nNumLines; y++)
-                {
-                    for (int x = 0; x < sizeX; x += 4)
-                    {
-                        vec4* pDstZ = reinterpret_cast<vec4*>(&m_ZBufferSwapMerged[x + (y * sizeX)]);
-                        vec4 vDstZ = *pDstZ;
-
-                        vec4* pSrcZ = reinterpret_cast<vec4*>(&m_ZBufferSwap[i][x + (y * sizeX)]);
-                        vec4 vSrcZ = *pSrcZ;
-
-                        // remove zeros so Min doesn't select them
-                        vDstZ = Select(vDstZ, vSrcZ, CmpLE(vDstZ, zero));
-                        vSrcZ = Select(vSrcZ, vDstZ, CmpLE(vSrcZ, zero));
-
-                        const vec4 vNewDepth = Min(vSrcZ, vDstZ);
-
-                        *pDstZ = vNewDepth;
-                    }
-                }
-            }
-        }
-
-        void ReprojectHWDepthBufferAfterMerge([[maybe_unused]] const Matrix44A& rCurrent, [[maybe_unused]] float nearPlane, float farPlane, [[maybe_unused]] float nearestMax, float Bias, int nStartLine, int nNumLines)
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-            using namespace NVMath;
-            int sizeX = SIZEX;
-            int sizeY = SIZEY;
-            const vec4 vFarPlane    = NVMath::Vec4(farPlane);
-
-            float* pZBufferSwap =   m_ZBufferSwapMerged;
-            vec4*   pSwap   =   reinterpret_cast<vec4*>(&pZBufferSwap[0]);
-            vec4*   pDst    =   reinterpret_cast<vec4*>(&m_ZBuffer[nStartLine * sizeX]);
-
-            const vec4  vBiasAdd    =   NVMath::Vec4(Bias < 0.f ? -Bias : 0.f);
-            const vec4  vBiasMul    =   NVMath::Vec4(Bias > 0.f ? Bias : 0.f);
-            const int       pitchX      = SIZEX / 4;
-
-            vec4 zero = Vec4Zero();
-
-            for (int y = nStartLine; y < nStartLine + nNumLines; y++)
-            {
-                int minY = max((int)0, (int)y - 1);
-                int maxY = min((int)sizeY - 1, (int)y + 1);
-
-                int maxX = min(pitchX - 1, 0 + 1);
-
-                vec4 src[3];
-                vec4 srcMax[3];
-                vec4 srcCenter;
-
-                // left, no data available yet
-                srcMax[0] = zero;
-
-                // center
-                src[0]  = pSwap[0 + minY    * pitchX];
-                src[1]  = pSwap[0 + y           * pitchX];
-                src[2]  = pSwap[0 + maxY    * pitchX];
-                srcMax[1] = Max(Max(src[0], src[1]), src[2]);
-                srcCenter = src[1];
-
-                // right
-                src[0]  = pSwap[maxX + minY * pitchX];
-                src[1]  = pSwap[maxX + y        * pitchX];
-                src[2]  = pSwap[maxX + maxY * pitchX];
-                srcMax[2] = Max(Max(src[0], src[1]), src[2]);
-
-                int vecX = 0;
-                for (int x = 0; x < sizeX; x += 4)  //todo, fix edge cases
-                {
-                    vec4 vDst;
-
-                    vec4 vSrcIsZero = CmpLE(srcCenter, zero);
-
-                    // 0
-                    {
-                        vec4 vLeft, vCenter;
-                        vLeft = SelectStatic<0x8>(zero, srcMax[0]);
-                        vCenter = SelectStatic<0x3>(zero, srcMax[1]);
-
-                        vec4 _vMax;
-                        _vMax = Max(vLeft, vCenter);
-                        _vMax = Max(_vMax, Swizzle<zwxy>(_vMax));
-                        _vMax = Max(_vMax, Swizzle<wzyx>(_vMax));
-
-                        vDst = _vMax;
-                    }
-
-                    // 1
-                    {
-                        vec4 vCenter;
-
-                        vCenter = SelectStatic<0x7>(zero, srcMax[1]);
-
-                        vec4 _vMax;
-                        _vMax = Max(vCenter, Swizzle<zwxy>(vCenter));
-                        _vMax = Max(_vMax, Swizzle<wzyx>(_vMax));
-
-                        vDst = SelectStatic<0x2>(vDst, _vMax);
-                    }
-
-                    // 2
-                    {
-                        vec4 vCenter;
-
-                        vCenter = SelectStatic<0xE>(zero, srcMax[1]);
-
-                        vec4 _vMax;
-                        _vMax = Max(vCenter, Swizzle<zwxy>(vCenter));
-                        _vMax = Max(_vMax, Swizzle<wzyx>(_vMax));
-
-                        vDst = SelectStatic<0x4>(vDst, _vMax);
-                    }
-
-                    // 3
-                    {
-                        vec4 vRight, vCenter;
-
-                        vRight = SelectStatic<0x1>(zero, srcMax[2]);
-                        vCenter = SelectStatic<0xC>(zero, srcMax[1]);
-
-                        vec4 _vMax;
-                        _vMax = Max(vRight, vCenter);
-
-                        _vMax = Max(_vMax, Swizzle<zwxy>(_vMax));
-                        _vMax = Max(_vMax, Swizzle<wzyx>(_vMax));
-
-                        vDst = SelectStatic<0x8>(vDst, _vMax);
-                    }
-
-                    vec4 vDstIsZero = CmpLE(vDst, zero);
-                    vDst = Select(vDst, vFarPlane, vDstIsZero);
-
-                    vDst = Select(srcCenter, vDst, vSrcIsZero);
-
-                    vDst    =   Add(vDst, vBiasAdd);//linear bias
-                    vDst    =   Add(vDst, Madd(vBiasMul, vDst, vBiasMul));// none-linear bias
-#ifdef SCALE_DEPTH
-                    //*pDst = Mul(vDst, NVMath::Vec4(1.2f));
-                    *pDst = Add(vDst, NVMath::Vec4(0.5f));
-#else
-                    *pDst = vDst;
-#endif
-
-                    //next loop
-                    ++pDst;
-                    ++vecX;
-
-                    // shift to the left
-                    srcMax[0] = srcMax[1];
-                    srcMax[1] = srcMax[2];
-                    srcCenter   = src[1];
-
-                    // load right data
-                    maxX = min(pitchX - 1, vecX + 1);
-                    src[0]  = pSwap[maxX    + minY  * pitchX];
-                    src[1]  = pSwap[maxX    + y         * pitchX];
-                    src[2]  = pSwap[maxX    + maxY  * pitchX];
-                    srcMax[2] = Max(Max(src[0], src[1]), src[2]);
-                }
-            }
-
-            //for(int a=0;a<128;a+=16)
-            //  printf("%2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f %2.2f\n",
-            //  m_ZBuffer[a+0],m_ZBuffer[a+1],m_ZBuffer[a+2],m_ZBuffer[a+3],
-            //  m_ZBuffer[a+4],m_ZBuffer[a+5],m_ZBuffer[a+6],m_ZBuffer[a+7],
-            //  m_ZBuffer[a+8],m_ZBuffer[a+9],m_ZBuffer[a+10],m_ZBuffer[a+11],
-            //  m_ZBuffer[a+12],m_ZBuffer[a+13],m_ZBuffer[a+14],m_ZBuffer[a+15]);
-
-#ifdef CULL_RENDERER_REPROJ_DEBUG
-            memcpy(&pZBufferSwap[nStartLine * sizeX], &m_ZBuffer[nStartLine * sizeX], sizeX * nNumLines * sizeof(float));
-#endif
-
-
-#ifdef SCALE_DEPTH
-#undef SCALE_DEPTH
-#endif
-
-#ifdef USE_W_DEPTH
-#undef USE_W_DEPTH
-#endif
-        }
-
-        CULLNOINLINE    int         AABBInFrustum(const NVMath::vec4* pViewProj, Vec3 Min, Vec3 Max, Vec3 ViewPos)
-        {
-            using namespace NVMath;
-            const NVMath::vec4 M0   =   pViewProj[0];
-            const NVMath::vec4 M1   =   pViewProj[1];
-            const NVMath::vec4 M2   =   pViewProj[2];
-            const NVMath::vec4 M3   =   pViewProj[3];
-            const NVMath::vec4 MinX =   NVMath::Vec4(Min.x);
-            const NVMath::vec4 MinY =   NVMath::Vec4(Min.y);
-            const NVMath::vec4 MinZ =   NVMath::Vec4(Min.z);
-            const NVMath::vec4 MaxX =   NVMath::Vec4(Max.x);
-            const NVMath::vec4 MaxY =   NVMath::Vec4(Max.y);
-            const NVMath::vec4 MaxZ =   NVMath::Vec4(Max.z);
-
-            vec4    VB0     =   Madd(MinX, M0, Madd(MinY, M1, Madd(MinZ, M2, M3)));
-            vec4    VB1     =   Madd(MinX, M0, Madd(MaxY, M1, Madd(MinZ, M2, M3)));
-            vec4    VB2     =   Madd(MaxX, M0, Madd(MinY, M1, Madd(MinZ, M2, M3)));
-            vec4    VB3     =   Madd(MaxX, M0, Madd(MaxY, M1, Madd(MinZ, M2, M3)));
-            vec4    VB4     =   Madd(MinX, M0, Madd(MinY, M1, Madd(MaxZ, M2, M3)));
-            vec4    VB5     =   Madd(MinX, M0, Madd(MaxY, M1, Madd(MaxZ, M2, M3)));
-            vec4    VB6     =   Madd(MaxX, M0, Madd(MinY, M1, Madd(MaxZ, M2, M3)));
-            vec4    VB7     =   Madd(MaxX, M0, Madd(MaxY, M1, Madd(MaxZ, M2, M3)));
-            vec4 SMask  =   And(And(And(VB0, VB1), And(VB2, VB3)), And(Or(VB4, VB5), And(VB6, VB7)));
-            if (SignMask(SMask) & BitZ)
-            {
-                return 0;
-            }
-
-            int Visible = 3;
-
-            SMask   =   Or(Or(Or(VB0, VB1), Or(VB2, VB3)), Or(Or(VB4, VB5), Or(VB6, VB7)));
-            if ((SignMask(SMask) & BitZ) == 0)
-            {
-                VB0 =   Div(VB0, Splat<3>(VB0));
-                VB1 =   Div(VB1, Splat<3>(VB1));
-                VB2 =   Div(VB2, Splat<3>(VB2));
-                VB3 =   Div(VB3, Splat<3>(VB3));
-                VB4 =   Div(VB4, Splat<3>(VB4));
-                VB5 =   Div(VB5, Splat<3>(VB5));
-                VB6 =   Div(VB6, Splat<3>(VB6));
-                VB7 =   Div(VB7, Splat<3>(VB7));
-                const vec4 VC0  =   Madd(VB0, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 VC1  =   Madd(VB1, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 VC2  =   Madd(VB2, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 VC3  =   Madd(VB3, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 VC4  =   Madd(VB4, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 VC5  =   Madd(VB5, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 VC6  =   Madd(VB6, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 VC7  =   Madd(VB7, NVMath::Vec4(-1.f), m_VMaxXY);
-                const vec4 SMaskB   =   And(And(And(VB0, VB1), And(VB2, VB3)), And(And(VB4, VB5), And(VB6, VB7)));
-                const vec4 SMaskC   =   And(And(And(VC0, VC1), And(VC2, VC3)), And(And(VC4, VC5), And(VC6, VC7)));
-                if ((SignMask(SMaskB) & (BitX | BitY)) || (SignMask(SMaskC) & (BitX | BitY)))
-                {
-                    return 0;
-                }
-                Visible = 1;
-            }
-            //return true;
-            if (Max.x < ViewPos.x)
-            {
-                if (Triangle<false, true, true>(VB3, VB2, VB7))
-                {
-                    return Visible;                                                                                 //MaxX
-                }
-                if (Triangle<false, true, true>(VB7, VB2, VB6))
-                {
-                    return Visible;
-                }
-                Visible &= ~1;
-            }
-            else
-            if (Min.x > ViewPos.x)
-            {
-                if (Triangle<false, true, true>(VB0, VB1, VB4))
-                {
-                    return Visible;                                                                                 //MinX
-                }
-                if (Triangle<false, true, true>(VB4, VB1, VB5))
-                {
-                    return Visible;
-                }
-                Visible &= ~1;
-            }
-            if (Max.y < ViewPos.y)
-            {
-                if (Triangle<false, true, true>(VB1, VB3, VB5))
-                {
-                    return Visible | 1;                                                                             //MaxY
-                }
-                if (Triangle<false, true, true>(VB5, VB3, VB7))
-                {
-                    return Visible | 1;
-                }
-                Visible &= ~1;
-            }
-            else
-            if (Min.y > ViewPos.y)
-            {
-                if (Triangle<false, true, true>(VB2, VB0, VB6))
-                {
-                    return Visible | 1;                                                                             //MinY
-                }
-                if (Triangle<false, true, true>(VB6, VB0, VB4))
-                {
-                    return Visible | 1;
-                }
-                Visible &= ~1;
-            }
-            if (Max.z < ViewPos.z)
-            {
-                if (Triangle<false, true, true>(VB4, VB5, VB6))
-                {
-                    return Visible | 1;                                                                             //MaxZ
-                }
-                if (Triangle<false, true, true>(VB6, VB5, VB7))
-                {
-                    return Visible | 1;
-                }
-                Visible = 0;
-            }
-            else
-            if (Min.z > ViewPos.z)
-            {
-                if (Triangle<false, true, true>(VB1, VB0, VB3))
-                {
-                    return Visible | 1;                                                                             //MinZ
-                }
-                if (Triangle<false, true, true>(VB3, VB0, VB2))
-                {
-                    return Visible | 1;
-                }
-                Visible = 0;
-            }
-            return Visible & (Visible << 1);
-        }
-
-
-        CULLINLINE bool             TestQuad(const NVMath::vec4* pViewProj, const Vec3& vCenter, const Vec3& vAxisX, const Vec3& vAxisY)
-        {
-            const NVMath::vec4 M0   =   pViewProj[0];
-            const NVMath::vec4 M1   =   pViewProj[1];
-            const NVMath::vec4 M2   =   pViewProj[2];
-            const NVMath::vec4 M3   =   pViewProj[3];
-
-            const Vec3 v0 = vCenter - vAxisX - vAxisY;
-            const Vec3 v1 = vCenter - vAxisX + vAxisY;
-            const Vec3 v2 = vCenter + vAxisX + vAxisY;
-            const Vec3 v3 = vCenter + vAxisX - vAxisY;
-
-            const NVMath::vec4  VB0     =   NVMath::Madd(NVMath::Vec4(v0.x), M0, NVMath::Madd(NVMath::Vec4(v0.y), M1, NVMath::Madd(NVMath::Vec4(v0.z), M2, M3)));
-            const NVMath::vec4  VB1     =   NVMath::Madd(NVMath::Vec4(v1.x), M0, NVMath::Madd(NVMath::Vec4(v1.y), M1, NVMath::Madd(NVMath::Vec4(v1.z), M2, M3)));
-            const NVMath::vec4  VB2     =   NVMath::Madd(NVMath::Vec4(v2.x), M0, NVMath::Madd(NVMath::Vec4(v2.y), M1, NVMath::Madd(NVMath::Vec4(v2.z), M2, M3)));
-            const NVMath::vec4  VB3     =   NVMath::Madd(NVMath::Vec4(v3.x), M0, NVMath::Madd(NVMath::Vec4(v3.y), M1, NVMath::Madd(NVMath::Vec4(v3.z), M2, M3)));
-
-            // Note: Explicitly disabling backface culling here
-            if (Triangle<false, true, false>(VB2, VB0, VB3))
-            {
-                return true;
-            }
-            if (Triangle<false, true, false>(VB1, VB0, VB2))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        CULLNOINLINE    bool        TestAABB(const NVMath::vec4* pViewProj, Vec3 Min, Vec3 Max, Vec3 ViewPos)
-        {
-            using namespace NVMath;
-            const NVMath::vec4 M0   =   pViewProj[0];
-            const NVMath::vec4 M1   =   pViewProj[1];
-            const NVMath::vec4 M2   =   pViewProj[2];
-            const NVMath::vec4 M3   =   pViewProj[3];
-            const NVMath::vec4 MinX =   NVMath::Vec4(Min.x);
-            const NVMath::vec4 MinY =   NVMath::Vec4(Min.y);
-            const NVMath::vec4 MinZ =   NVMath::Vec4(Min.z);
-            const NVMath::vec4 MaxX =   NVMath::Vec4(Max.x);
-            const NVMath::vec4 MaxY =   NVMath::Vec4(Max.y);
-            const NVMath::vec4 MaxZ =   NVMath::Vec4(Max.z);
-
-            const vec4  VB0     =   Madd(MinX, M0, Madd(MinY, M1, Madd(MinZ, M2, M3)));
-            const vec4  VB1     =   Madd(MinX, M0, Madd(MaxY, M1, Madd(MinZ, M2, M3)));
-            const vec4  VB2     =   Madd(MaxX, M0, Madd(MinY, M1, Madd(MinZ, M2, M3)));
-            const vec4  VB3     =   Madd(MaxX, M0, Madd(MaxY, M1, Madd(MinZ, M2, M3)));
-            const vec4  VB4     =   Madd(MinX, M0, Madd(MinY, M1, Madd(MaxZ, M2, M3)));
-            const vec4  VB5     =   Madd(MinX, M0, Madd(MaxY, M1, Madd(MaxZ, M2, M3)));
-            const vec4  VB6     =   Madd(MaxX, M0, Madd(MinY, M1, Madd(MaxZ, M2, M3)));
-            const vec4  VB7     =   Madd(MaxX, M0, Madd(MaxY, M1, Madd(MaxZ, M2, M3)));
-            vec4 SMask  =   Or(Or(Or(VB0, VB1), Or(VB2, VB3)), Or(Or(VB4, VB5), Or(VB6, VB7)));
-
-            if (SignMask(SMask) & BitZ)
-            {
-                if (Max.x < ViewPos.x)
-                {
-                    if (Triangle<false, true, true>(VB3, VB2, VB7))
-                    {
-                        return true;                                                                                //MaxX
-                    }
-                    if (Triangle<false, true, true>(VB7, VB2, VB6))
-                    {
-                        return true;
-                    }
-                }
-                if (Min.x > ViewPos.x)
-                {
-                    if (Triangle<false, true, true>(VB0, VB1, VB4))
-                    {
-                        return true;                                                                                //MinX
-                    }
-                    if (Triangle<false, true, true>(VB4, VB1, VB5))
-                    {
-                        return true;
-                    }
-                }
-                if (Max.y < ViewPos.y)
-                {
-                    if (Triangle<false, true, true>(VB1, VB3, VB5))
-                    {
-                        return true;                                                                                //MaxY
-                    }
-                    if (Triangle<false, true, true>(VB5, VB3, VB7))
-                    {
-                        return true;
-                    }
-                }
-                if (Min.y > ViewPos.y)
-                {
-                    if (Triangle<false, true, true>(VB2, VB0, VB6))
-                    {
-                        return true;                                                                                //MinY
-                    }
-                    if (Triangle<false, true, true>(VB6, VB0, VB4))
-                    {
-                        return true;
-                    }
-                }
-                if (Max.z < ViewPos.z)
-                {
-                    if (Triangle<false, true, true>(VB4, VB5, VB6))
-                    {
-                        return true;                                                                                //MaxZ
-                    }
-                    if (Triangle<false, true, true>(VB6, VB5, VB7))
-                    {
-                        return true;
-                    }
-                }
-                if (Min.z > ViewPos.z)
-                {
-                    if (Triangle<false, true, true>(VB1, VB0, VB3))
-                    {
-                        return true;                                                                                //MinZ
-                    }
-                    if (Triangle<false, true, true>(VB3, VB0, VB2))
-                    {
-                        return true;
-                    }
-                }
-            }
-            else
-            {
-                if (Max.x < ViewPos.x)
-                {
-                    //if(Quad2D(VB3,VB2,VB6,VB7))return true;
-                    if (Triangle2D<false, true, true, true>(VB3, VB2, VB7))
-                    {
-                        return true;
-                    }
-                    if (Triangle2D<false, true, true, true>(VB7, VB2, VB6))
-                    {
-                        return true;
-                    }
-                }
-                if (Min.x > ViewPos.x)
-                {
-                    //if(Quad2D(VB0,VB1,VB5,VB4))return true;
-                    if (Triangle2D<false, true, true, true>(VB0, VB1, VB4))
-                    {
-                        return true;
-                    }
-                    if (Triangle2D<false, true, true, true>(VB4, VB1, VB5))
-                    {
-                        return true;
-                    }
-                }
-                if (Max.y < ViewPos.y)
-                {
-                    //if(Quad2D(VB1,VB3,VB7,VB5))return true;
-                    if (Triangle2D<false, true, true, true>(VB1, VB3, VB5))
-                    {
-                        return true;
-                    }
-                    if (Triangle2D<false, true, true, true>(VB5, VB3, VB7))
-                    {
-                        return true;
-                    }
-                }
-                if (Min.y > ViewPos.y)
-                {
-                    //if(Quad2D(VB2,VB0,VB4,VB6))return true;
-                    if (Triangle2D<false, true, true, true>(VB2, VB0, VB6))
-                    {
-                        return true;
-                    }
-                    if (Triangle2D<false, true, true, true>(VB6, VB0, VB4))
-                    {
-                        return true;
-                    }
-                }
-                if (Max.z < ViewPos.z)
-                {
-                    //if(Quad2D(VB4,VB5,VB7,VB6))return true;
-                    if (Triangle2D<false, true, true, true>(VB4, VB5, VB6))
-                    {
-                        return true;
-                    }
-                    if (Triangle2D<false, true, true, true>(VB6, VB5, VB7))
-                    {
-                        return true;
-                    }
-                }
-                if (Min.z > ViewPos.z)
-                {
-                    //if(Quad2D(VB1,VB0,VB2,VB3))return true;
-                    if (Triangle2D<false, true, true, true>(VB1, VB0, VB3))
-                    {
-                        return true;
-                    }
-                    if (Triangle2D<false, true, true, true>(VB3, VB0, VB2))
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        template<bool NEEDCLIPPING>
-        CULLNOINLINE    void        Rasterize(const NVMath::vec4* pViewProj, const NVMath::vec4*   __restrict  pTriangles, size_t   TriCount)
-        {
-            using namespace NVMath;
-            Prefetch<ECL_LVL1>(pTriangles);
-            m_DrawCall++;
-            m_PolyCount += TriCount;
-
-            const vec4 M0   =   pViewProj[0];
-            const vec4 M1   =   pViewProj[1];
-            const vec4 M2   =   pViewProj[2];
-            const vec4 M3   =   pViewProj[3];
-            const size_t VCacheCount    =   48;                                        //16x3 vertices
-            vec4 VTmp[VCacheCount];
-            vec4 DetTmp[VCacheCount * 2 / 3];
-
-
-
-            if (TriCount > 65535)
-            {
-                TriCount = 65535;
-            }
-            for (size_t a = 0, S = TriCount; a < S; a += VCacheCount)
-            {
-                vec4 ZMask  =   Vec4Zero();
-                const size_t VTmpCount  =   VCacheCount + a > TriCount ? TriCount - a : VCacheCount;
-                vec4* pVTmp =   VTmp;
-                for (size_t b = 0; b < VTmpCount; b += 3, pVTmp += 3, pTriangles += 3)
-                {
-                    Prefetch<ECL_LVL1>(pTriangles + 48);
-                    const vec4 VA   =   reinterpret_cast<const vec4*>(pTriangles)[0];
-                    const vec4 VB   =   reinterpret_cast<const vec4*>(pTriangles)[1];
-                    const vec4 VC   =   reinterpret_cast<const vec4*>(pTriangles)[2];
-
-                    const vec4 V0 =  Madd(Splat<0>(VA), M0, Madd(Splat<1>(VA), M1, Madd(Splat<2>(VA), M2, M3)));
-                    const vec4 V1 =  Madd(Splat<0>(VB), M0, Madd(Splat<1>(VB), M1, Madd(Splat<2>(VB), M2, M3)));
-                    const vec4 V2 =  Madd(Splat<0>(VC), M0, Madd(Splat<1>(VC), M1, Madd(Splat<2>(VC), M2, M3)));
-                    if (NEEDCLIPPING)
-                    {
-                        ZMask =  Or(Or(ZMask, V0), Or(V1, V2));
-                    }
-                    pVTmp[0]    =   V0;
-                    pVTmp[1]    =   V1;
-                    pVTmp[2]    =   V2;
-                }
-
-                const   uint32  Idx =   SignMask(ZMask) & BitZ;
-AZ_PUSH_DISABLE_WARNING(4127, "-Wunknown-warning-option")
-                if (NEEDCLIPPING && Idx == BitZ)
-AZ_POP_DISABLE_WARNING
-                {
-                    for (size_t b = 0; b < VTmpCount; b += 3)
-                    {
-                        Triangle<true, false, true>(VTmp[b], VTmp[b + 2], VTmp[b + 1]);
-                    }
-                }
-                else
-                {
-                    pVTmp   =   VTmp;
-                    const vec4 M    =   NVMath::Vec4(~0u, ~0u, 0u, ~0u);
-                    pVTmp   =   VTmp;
-                    vec4* pDetTmp   =   DetTmp;
-                    for (size_t b = 0; b < VTmpCount; b += 12, pVTmp += 12, pDetTmp += 8)
-                    {
-                        vec4 V0 =   pVTmp[0];
-                        vec4 V1 =   pVTmp[1];
-                        vec4 V2 =   pVTmp[2];
-                        vec4 V3 =   pVTmp[3];
-                        vec4 V4 =   pVTmp[4];
-                        vec4 V5 =   pVTmp[5];
-                        vec4 V6 =   pVTmp[6];
-                        vec4 V7 =   pVTmp[7];
-                        vec4 V8 =   pVTmp[8];
-                        vec4 V9 =   pVTmp[9];
-                        vec4 VA =   pVTmp[10];
-                        vec4 VB =   pVTmp[11];
-                        const   vec4    W0123   =   Shuffle<xzxz>(Shuffle<wwww>(V0, V1), Shuffle<wwww>(V2, V3));
-                        const   vec4    W4567   =   Shuffle<xzxz>(Shuffle<wwww>(V4, V5), Shuffle<wwww>(V6, V7));
-                        const   vec4    W89AB   =   Shuffle<xzxz>(Shuffle<wwww>(V8, V9), Shuffle<wwww>(VA, VB));
-                        const   vec4    iW0123  =   Rcp(W0123);
-                        const   vec4    iW4567  =   Rcp(W4567);
-                        const   vec4    iW89AB  =   Rcp(W89AB);
-                        const vec4 V0T  =   Mul(V0, Splat<0>(iW0123));
-                        const vec4 V1T  =   Mul(V1, Splat<1>(iW0123));
-                        const vec4 V2T  =   Mul(V2, Splat<2>(iW0123));
-                        const vec4 V3T  =   Mul(V3, Splat<3>(iW0123));
-                        const vec4 V4T  =   Mul(V4, Splat<0>(iW4567));
-                        const vec4 V5T  =   Mul(V5, Splat<1>(iW4567));
-                        const vec4 V6T  =   Mul(V6, Splat<2>(iW4567));
-                        const vec4 V7T  =   Mul(V7, Splat<3>(iW4567));
-                        const vec4 V8T  =   Mul(V8, Splat<0>(iW89AB));
-                        const vec4 V9T  =   Mul(V9, Splat<1>(iW89AB));
-                        const vec4 VAT  =   Mul(VA, Splat<2>(iW89AB));
-                        const vec4 VBT  =   Mul(VB, Splat<3>(iW89AB));
-                        V0  =   SelectBits(V0, V0T, M);
-                        V1  =   SelectBits(V1, V1T, M);
-                        V2  =   SelectBits(V2, V2T, M);
-                        V3  =   SelectBits(V3, V3T, M);
-                        V4  =   SelectBits(V4, V4T, M);
-                        V5  =   SelectBits(V5, V5T, M);
-                        V6  =   SelectBits(V6, V6T, M);
-                        V7  =   SelectBits(V7, V7T, M);
-                        V8  =   SelectBits(V8, V8T, M);
-                        V9  =   SelectBits(V9, V9T, M);
-                        VA  =   SelectBits(VA, VAT, M);
-                        VB  =   SelectBits(VB, VBT, M);
-                        vec4    V012    =   Sub(Shuffle<xyxy>(V2T, V1T), Swizzle<xyxy>(V0T));
-                        vec4    V345    =   Sub(Shuffle<xyxy>(V5T, V4T), Swizzle<xyxy>(V3T));
-                        vec4    V678    =   Sub(Shuffle<xyxy>(V8T, V7T), Swizzle<xyxy>(V6T));
-                        vec4    V9AB    =   Sub(Shuffle<xyxy>(VBT, VAT), Swizzle<xyxy>(V9T));
-                        vec4    Det012 = Mul(V012, Swizzle<wzwz>(V012));
-                        vec4    Det345 = Mul(V345, Swizzle<wzwz>(V345));
-                        vec4    Det678 = Mul(V678, Swizzle<wzwz>(V678));
-                        vec4    Det9AB = Mul(V9AB, Swizzle<wzwz>(V9AB));
-                        Det012          =   Sub(Det012, Splat<1>(Det012));
-                        Det345          =   Sub(Det345, Splat<1>(Det345));
-                        Det678          =   Sub(Det678, Splat<1>(Det678));
-                        Det9AB          =   Sub(Det9AB, Splat<1>(Det9AB));
-                        vec4    Det     =   Shuffle<xzxz>(Shuffle<xxxx>(Det012, Det345), Shuffle<xxxx>(Det678, Det9AB));
-#if !defined(LINUX) && !defined(APPLE)  //to avoid DivBy0 exception on PC
-                        Det     =   Select(Det, NVMath::Vec4(-FLT_EPSILON), CmpEq(Det, Vec4Zero()));
-#endif
-                        Det                 =   Rcp(Det);
-                        Det012          =   Splat<0>(Det);
-                        Det345          =   Splat<1>(Det);
-                        Det678          =   Splat<2>(Det);
-                        Det9AB          =   Splat<3>(Det);
-
-                        vec4 VMax012    =   Max(Max(V0T, V1T), V2T);
-                        vec4 VMax345    =   Max(Max(V3T, V4T), V5T);
-                        vec4 VMax678    =   Max(Max(V6T, V7T), V8T);
-                        vec4 VMax9AB    =   Max(Max(V9T, VAT), VBT);
-                        vec4 VMin012    =   Min(Min(V0T, V1T), V2T);
-                        vec4 VMin345    =   Min(Min(V3T, V4T), V5T);
-                        vec4 VMin678    =   Min(Min(V6T, V7T), V8T);
-                        vec4 VMin9AB    =   Min(Min(V9T, VAT), VBT);
-                        VMax012     =   Add(VMax012, Vec4One());
-                        VMax345     =   Add(VMax345, Vec4One());
-                        VMax678     =   Add(VMax678, Vec4One());
-                        VMax9AB     =   Add(VMax9AB, Vec4One());
-                        vec4 VMinMax012 =   Shuffle<xyxy>(VMin012, VMax012);
-                        vec4 VMinMax345 =   Shuffle<xyxy>(VMin345, VMax345);
-                        vec4 VMinMax678 =   Shuffle<xyxy>(VMin678, VMax678);
-                        vec4 VMinMax9AB =   Shuffle<xyxy>(VMin9AB, VMax9AB);
-                        VMinMax012  =   Max(VMinMax012, Vec4Zero());
-                        VMinMax345  =   Max(VMinMax345, Vec4Zero());
-                        VMinMax678  =   Max(VMinMax678, Vec4Zero());
-                        VMinMax9AB  =   Max(VMinMax9AB, Vec4Zero());
-                        VMinMax012  =   Min(VMinMax012, m_VMaxXY);
-                        VMinMax345  =   Min(VMinMax345, m_VMaxXY);
-                        VMinMax678  =   Min(VMinMax678, m_VMaxXY);
-                        VMinMax9AB  =   Min(VMinMax9AB, m_VMaxXY);
-                        VMinMax012  =   floatToint32(VMinMax012);
-                        VMinMax345  =   floatToint32(VMinMax345);
-                        VMinMax678  =   floatToint32(VMinMax678);
-                        VMinMax9AB  =   floatToint32(VMinMax9AB);
-                        VMinMax012  =   Or(VMinMax012, CmpLE(Det012, Vec4Zero()));                                      //backface cull
-                        VMinMax345  =   Or(VMinMax345, CmpLE(Det345, Vec4Zero()));
-                        VMinMax678  =   Or(VMinMax678, CmpLE(Det678, Vec4Zero()));
-                        VMinMax9AB  =   Or(VMinMax9AB, CmpLE(Det9AB, Vec4Zero()));
-
-                        pVTmp[0]    =   V0;
-                        pVTmp[1]    =   V1;
-                        pVTmp[2]    =   V2;
-                        pVTmp[3]    =   V3;
-                        pVTmp[4]    =   V4;
-                        pVTmp[5]    =   V5;
-                        pVTmp[6]    =   V6;
-                        pVTmp[7]    =   V7;
-                        pVTmp[8]    =   V8;
-                        pVTmp[9]    =   V9;
-                        pVTmp[10]   =   VA;
-                        pVTmp[11]   =   VB;
-                        pDetTmp[0]  =   VMinMax012;
-                        pDetTmp[1]  =   Mul(V012, Det012);
-                        pDetTmp[2]  =   VMinMax345;
-                        pDetTmp[3]  =   Mul(V345, Det345);
-                        pDetTmp[4]  =   VMinMax678;
-                        pDetTmp[5]  =   Mul(V678, Det678);
-                        pDetTmp[6]  =   VMinMax9AB;
-                        pDetTmp[7]  =   Mul(V9AB, Det9AB);
-                    }
-
-                    pDetTmp =   DetTmp;
-                    for (size_t b = 0; b < VTmpCount; b += 3, pDetTmp += 2)
-                    {
-                        const uint32* pMM       =   reinterpret_cast<uint32*>(pDetTmp);
-                        const   uint16  MinX    =   pMM[0];
-                        const uint16    MinY    =   pMM[1];
-                        const uint16    MaxX    =   pMM[2];
-                        const uint16    MaxY    =   pMM[3];
-                        if (MinX < MaxX && MinY < MaxY)
-                        {
-                            Triangle2D<true, false, false, true>(VTmp[b], VTmp[b + 2], VTmp[b + 1], MinX, MinY, MaxX, MaxY, pDetTmp[0], pDetTmp[1]);
-                        }
-                    }
-                }
-            }
-        }
-        template<bool WRITE>
-        CULLNOINLINE    bool        Rasterize(const NVMath::vec4* pViewProj, tdVertexCacheArg vertexCache,
-            const tdIndex*  __restrict pIndices, const uint32 ICount,
-            const uint8*        __restrict pVertices, const uint32 VertexSize, const uint32 VCount)
-        {
-            using namespace NVMath;
-            if (!VCount || !ICount)
-            {
-                return false;
-            }
-
-            m_DrawCall++;
-            m_PolyCount += VCount / 3;
-
-            const vec4 M0   =   pViewProj[0];
-            const vec4 M1   =   pViewProj[1];
-            const vec4 M2   =   pViewProj[2];
-            const vec4 M3   =   pViewProj[3];
-
-            if (VCount + 1 > vertexCache.size())
-            {
-                vertexCache.resize(VCount + 1);
-            }
-            vec4* pVCache   =   &vertexCache[0];
-            pVCache =   reinterpret_cast<vec4*>(((reinterpret_cast<size_t>(pVCache) + 15) & ~15));
-
-            vec4 SMask  =   Vec4Zero();
-            for (uint32 a = 0, S = VCount & ~3; a < S; a += 4)
-            {
-                const float* pV0    =   reinterpret_cast<const float*>(pVertices + a * VertexSize);
-                const float* pV1    =   reinterpret_cast<const float*>(pVertices + (a + 1) * VertexSize);
-                const float* pV2    =   reinterpret_cast<const float*>(pVertices + (a + 2) * VertexSize);
-                const float* pV3    =   reinterpret_cast<const float*>(pVertices + (a + 3) * VertexSize);
-                const vec4 V0   =   Madd(NVMath::Vec4(pV0[0]), M0, Madd(NVMath::Vec4(pV0[1]), M1, Madd(NVMath::Vec4(pV0[2]), M2, M3)));
-                const vec4 V1   =   Madd(NVMath::Vec4(pV1[0]), M0, Madd(NVMath::Vec4(pV1[1]), M1, Madd(NVMath::Vec4(pV1[2]), M2, M3)));
-                const vec4 V2   =   Madd(NVMath::Vec4(pV2[0]), M0, Madd(NVMath::Vec4(pV2[1]), M1, Madd(NVMath::Vec4(pV2[2]), M2, M3)));
-                const vec4 V3   =   Madd(NVMath::Vec4(pV3[0]), M0, Madd(NVMath::Vec4(pV3[1]), M1, Madd(NVMath::Vec4(pV3[2]), M2, M3)));
-                SMask   =   Or(SMask, V0);
-                SMask   =   Or(SMask, V1);
-                SMask   =   Or(SMask, V2);
-                SMask   =   Or(SMask, V3);
-                pVCache[a  ]    =   V0;
-                pVCache[a + 1]    =   V1;
-                pVCache[a + 2]    =   V2;
-                pVCache[a + 3]    =   V3;
-            }
-            for (uint32 a = VCount & ~3, S = VCount; a < S; a++)
-            {
-                const float* pV =   reinterpret_cast<const float*>(pVertices + a * VertexSize);
-                const vec4 V    =   Madd(NVMath::Vec4(pV[0]), M0, Madd(NVMath::Vec4(pV[1]), M1, Madd(NVMath::Vec4(pV[2]), M2, M3)));
-                SMask   =   Or(SMask, V);
-                pVCache[a]      =   V;
-            }
-
-            bool Visible = false;
-            if (SignMask(SMask) & BitZ)
-            {
-                for (uint32 a = 0; a < ICount; a += 3)
-                {
-                    vec4 Pos0   =   pVCache[pIndices[a]];
-                    vec4 Pos2   =   pVCache[pIndices[a + 1]];
-                    vec4 Pos1   =   pVCache[pIndices[a + 2]];
-                    Visible |= Triangle<WRITE, true>(Pos0, Pos1, Pos2);
-                    if (!WRITE && Visible)
-                    {
-                        return true;
-                    }
-                }
-            }
-            else
-            {
-                for (uint32 a = 0; a < ICount; a += 3)
-                {
-                    vec4 Pos0   =   pVCache[pIndices[a]];
-                    vec4 Pos2   =   pVCache[pIndices[a + 1]];
-                    vec4 Pos1   =   pVCache[pIndices[a + 2]];
-                    Visible |= Triangle2D<WRITE, true>(Pos0, Pos1, Pos2);
-                    if (!WRITE && Visible)
-                    {
-                        return true;
-                    }
-                }
-            }
-            return Visible;
-        }
-
-        int m_DebugRender;
-
-        void                                    DrawDebug(IRenderer* pRenderer, int32 nStep)
-        {                                         // project buffer to the screen
-#if defined(CULLING_ENABLE_DEBUG_OVERLAY)
-            nStep   %=  32;
-            if (!nStep)
-            {
-                return;
-            }
-
-            //if(!m_DebugRender)
-            //  return;
-
-            const float FarPlaneInv =   255.f / pRenderer->GetCamera().GetFarPlane();
-
-            SAuxGeomRenderFlags oFlags(e_Def2DPublicRenderflags);
-            oFlags.SetDepthTestFlag(e_DepthTestOff);
-            oFlags.SetDepthWriteFlag(e_DepthWriteOff);
-            oFlags.SetCullMode(e_CullModeNone);
-            oFlags.SetAlphaBlendMode(e_AlphaNone);
-            pRenderer->GetIRenderAuxGeom()->SetRenderFlags(oFlags);
-
-            int nScreenHeight = gEnv->pRenderer->GetHeight();
-            int nScreenWidth = gEnv->pRenderer->GetWidth();
-
-            float fScreenHeight = (float)nScreenHeight;
-            float fScreenWidth = (float)nScreenWidth;
-
-            float fTopOffSet = 35.0f;
-            float fSideOffSet = 35.0f;
-
-            // draw z-buffer after reprojection (unknown parts are red)
-            fTopOffSet += 200.0f;
-            for (uint32 y = 0; y < SIZEY; y += 1)
-            {
-                const float* __restrict pVMemZ  =   alias_cast<float*>(&m_ZBuffer[y * SIZEX]);
-                float fY = fTopOffSet + (y * 3);
-                for (uint32 x = 0; x < SIZEX; x += 4)
-                {
-                    float fX0 = fSideOffSet + ((x + 0) * 3);
-                    float fX1 = fSideOffSet + ((x + 1) * 3);
-                    float fX2 = fSideOffSet + ((x + 2) * 3);
-                    float fX3 = fSideOffSet + ((x + 3) * 3);
-
-                    //ColorB ValueColor0  = ((ColorB*)pVMemZ)[x+0];
-                    //ColorB ValueColor1  = ((ColorB*)pVMemZ)[x+1];
-                    //ColorB ValueColor2  = ((ColorB*)pVMemZ)[x+2];
-                    //ColorB ValueColor3  = ((ColorB*)pVMemZ)[x+3];
-                    ////ColorB color0=ColorB(ValueColor0,ValueColor0,ValueColor0,222);
-                    ////ColorB color1=ColorB(ValueColor1,ValueColor1,ValueColor1,222);
-                    ////ColorB color2=ColorB(ValueColor2,ValueColor2,ValueColor2,222);
-                    ////ColorB color3=ColorB(ValueColor3,ValueColor3,ValueColor3,222);
-                    //
-                    //NAsyncCull::Debug::Draw2DBox(fX0,fY,3.0f,3.0f,ValueColor0, fScreenHeight,fScreenWidth,pRenderer->GetIRenderAuxGeom());
-                    //NAsyncCull::Debug::Draw2DBox(fX1,fY,3.0f,3.0f,ValueColor1, fScreenHeight,fScreenWidth,pRenderer->GetIRenderAuxGeom());
-                    //NAsyncCull::Debug::Draw2DBox(fX2,fY,3.0f,3.0f,ValueColor2, fScreenHeight,fScreenWidth,pRenderer->GetIRenderAuxGeom());
-                    //NAsyncCull::Debug::Draw2DBox(fX3,fY,3.0f,3.0f,ValueColor3, fScreenHeight,fScreenWidth,pRenderer->GetIRenderAuxGeom());
-                    uint32 ValueColor0  = (uint32)(pVMemZ[x + 0]);
-                    uint32 ValueColor1  = (uint32)(pVMemZ[x + 1]);
-                    uint32 ValueColor2  = (uint32)(pVMemZ[x + 2]);
-                    uint32 ValueColor3  = (uint32)(pVMemZ[x + 3]);
-                    ColorB Color0(ValueColor0, ValueColor0 * 16, ValueColor0 * 256, 222);
-                    ColorB Color1(ValueColor1, ValueColor1 * 16, ValueColor1 * 256, 222);
-                    ColorB Color2(ValueColor2, ValueColor2 * 16, ValueColor2 * 256, 222);
-                    ColorB Color3(ValueColor3, ValueColor3 * 16, ValueColor3 * 256, 222);
-
-                    NAsyncCull::Debug::Draw2DBox(fX0, fY, 3.0f, 3.0f, Color0, fScreenHeight, fScreenWidth, pRenderer->GetIRenderAuxGeom());
-                    NAsyncCull::Debug::Draw2DBox(fX1, fY, 3.0f, 3.0f, Color1, fScreenHeight, fScreenWidth, pRenderer->GetIRenderAuxGeom());
-                    NAsyncCull::Debug::Draw2DBox(fX2, fY, 3.0f, 3.0f, Color2, fScreenHeight, fScreenWidth, pRenderer->GetIRenderAuxGeom());
-                    NAsyncCull::Debug::Draw2DBox(fX3, fY, 3.0f, 3.0f, Color3, fScreenHeight, fScreenWidth, pRenderer->GetIRenderAuxGeom());
-                }
-            }
-#endif
-        }
-
-        CULLINLINE  uint32      SizeX() const{return SIZEX; }
-        CULLINLINE  uint32      SizeY() const{return SIZEY; }
-    };
-}
-
-template<uint32 SIZEX, uint32 SIZEY>
-_MS_ALIGN(128) float NAsyncCull::CCullRenderer<SIZEX, SIZEY>::m_ZBufferMainMemory[SIZEX * SIZEY] _ALIGN(128);
diff --git a/Code/CryEngine/Cry3DEngine/CCullThread.cpp b/Code/CryEngine/Cry3DEngine/CCullThread.cpp
deleted file mode 100644
index dfc4caf82c..0000000000
--- a/Code/CryEngine/Cry3DEngine/CCullThread.cpp
+++ /dev/null
@@ -1,818 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "CCullThread.h"
-#include "ObjMan.h"
-#include "CCullRenderer.h"
-#include <AzCore/Jobs/Job.h>
-#include <AzCore/Jobs/JobFunction.h>
-
-typedef NAsyncCull::CCullRenderer<CULL_SIZEX, CULL_SIZEY>    tdCullRasterizer;
-
-volatile static                     NAsyncCull::tdVertexCache g_VertexCache;
-uint8                           g_RasterizerBuffer[sizeof(tdCullRasterizer) + 16];
-tdCullRasterizer*   g_Rasterizer;
-#define RASTERIZER (*g_Rasterizer)
-
-namespace NAsyncCull
-{
-    const NVMath::vec4 MaskNot3 =   NVMath::Vec4(~3u, ~0u, ~0u, ~0u);
-
-    CCullThread::CCullThread()
-        : m_Enabled(false)
-        , m_Active(false)
-        , m_nPrepareState(IDLE)
-        , m_OCMMeshCount(0)
-        , m_OCMInstCount(0)
-        , m_OCMOffsetInstances(0)
-    {
-        size_t Buffer   =   reinterpret_cast<size_t>(g_RasterizerBuffer);
-        Buffer  +=  127;
-        Buffer  &=  ~127;
-        g_Rasterizer        =   new(reinterpret_cast<void*>(Buffer))tdCullRasterizer();
-
-        m_NearPlane = 0;
-        m_FarPlane = 0;
-        m_NearestMax = 0;
-    }
-
-    bool CCullThread::LoadLevel(const char* pFolderName)
-    {
-        m_OCMBuffer.resize(0);
-        AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen((string(pFolderName) + "/occluder.ocm").c_str(), "rbx");
-        if (fileHandle == AZ::IO::InvalidHandle)
-        {
-            //__debugbreak();
-            return false;
-        }
-        gEnv->pCryPak->FSeek(fileHandle, 0, SEEK_END);
-        const size_t Size = gEnv->pCryPak->FTell(fileHandle);
-        gEnv->pCryPak->FSeek(fileHandle, 0L, SEEK_SET);
-        m_OCMBuffer.reserve(Size + 144 * 3 + 16); //48tri*9byte padding for unrolled loop in rasterization without special case (not 144 algined poly count)
-        //16 for alignment
-        m_OCMBuffer.resize(Size);
-        size_t  BufferOffset    =   reinterpret_cast<size_t>(&m_OCMBuffer[0]);
-        BufferOffset    =   (BufferOffset + 15) & ~15;
-        m_pOCMBufferAligned     =   reinterpret_cast<uint8*>(BufferOffset);
-
-        gEnv->pCryPak->FRead(m_pOCMBufferAligned, Size, fileHandle, false);
-        gEnv->pCryPak->FClose(fileHandle);
-
-        const uint32 Version    =   Swap(*reinterpret_cast<uint32*>(&m_pOCMBufferAligned[0]));
-        m_OCMMeshCount              =   *reinterpret_cast<uint32*>(&m_pOCMBufferAligned[4]);
-        m_OCMInstCount              =   *reinterpret_cast<uint32*>(&m_pOCMBufferAligned[8]);
-        m_OCMOffsetInstances    =   *reinterpret_cast<uint32*>(&m_pOCMBufferAligned[12]);
-
-        if (Version != ~3u && Version != ~4u)
-        {
-            CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "Unsupported occlusion mesh format version. Please reexport the occluder mesh.");
-            stl::free_container(m_OCMBuffer);
-            return false;
-        }
-
-        if (m_OCMOffsetInstances & 3)
-        {
-            CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "The occluder mesh contains invalid data. Please reexport the occluder mesh.");
-            stl::free_container(m_OCMBuffer);
-            return false;
-        }
-
-        if (Version == ~3u) //bump to version ~4
-        {
-            m_OCMMeshCount              =   Swap(m_OCMMeshCount);
-            m_OCMInstCount              =   Swap(m_OCMInstCount);
-            m_OCMOffsetInstances    =   Swap(m_OCMOffsetInstances);
-            PodArray<uint8> OCMBufferOut(Size * 8, Size * 8);
-            uint8* pOut = &OCMBufferOut[0];
-            *reinterpret_cast<uint32*>(&pOut[0])    =   ~4u;//version
-            *reinterpret_cast<uint32*>(&pOut[4])    =   m_OCMMeshCount;
-            *reinterpret_cast<uint32*>(&pOut[8])    =   m_OCMInstCount;
-            *reinterpret_cast<uint32*>(&pOut[12])   =   m_OCMOffsetInstances;//needs to be patched at the end
-            pOut += 16;
-            uint8* pMeshes  =   &m_pOCMBufferAligned[0];//actually starts at 16, but MeshOffset is zero based
-            uint8* pInstances   =   &m_pOCMBufferAligned[m_OCMOffsetInstances];
-            std::map<uint32, uint32>  Offsets;//<old Offset, new Offset>
-            for (size_t a = 0; a < m_OCMInstCount; a++)
-            {
-                Matrix44 World(IDENTITY);
-                uint8*  pInstance   =   pInstances + a * (sizeof(int) + 12 * sizeof(float));//meshoffset+worldmatrix43
-                uint32& MeshOffset = *reinterpret_cast<uint32*>(&pInstance[0]);
-                float*  pWorldMat   =   reinterpret_cast<float*>(&pInstance[4]);
-                Swap(MeshOffset);
-                Swap(pWorldMat[0x0]);
-                Swap(pWorldMat[0x1]);
-                Swap(pWorldMat[0x2]);
-                Swap(pWorldMat[0x3]);
-                Swap(pWorldMat[0x4]);
-                Swap(pWorldMat[0x5]);
-                Swap(pWorldMat[0x6]);
-                Swap(pWorldMat[0x7]);
-                Swap(pWorldMat[0x8]);
-                Swap(pWorldMat[0x9]);
-                Swap(pWorldMat[0xA]);
-                Swap(pWorldMat[0xB]);
-
-                if (Offsets.find(MeshOffset) != Offsets.end())//already endian swapped?
-                {
-                    continue;
-                }
-                Offsets[MeshOffset] =   static_cast<uint32>(pOut - &OCMBufferOut[0]);//zero based offset
-
-                uint8*  pMesh           =   pMeshes + MeshOffset;
-                uint16& QuadCount   =   *reinterpret_cast<uint16*>(pMesh);
-                uint16& TriCount    =   *reinterpret_cast<uint16*>(pMesh + 2);
-                Swap(QuadCount);
-                Swap(TriCount);
-                *reinterpret_cast<uint32*>(pOut)    =   TriCount + QuadCount / 4 * 6;
-                pOut += 16;//to keep 16byte alignment
-
-                const size_t    Quads16     =   (reinterpret_cast<size_t>(pMesh + 4) + 15) & ~15;
-                const size_t    Tris16      =   (Quads16 + QuadCount * 3 + 15) & ~15;
-                const int8* pQuads          =   reinterpret_cast<const int8*>(Quads16);
-                const int8* pTris               =   reinterpret_cast<const int8*>(Tris16);
-
-                for (size_t b = 0, S = QuadCount; b < S; b += 4)
-                {
-                    const float x0 = *pQuads++;
-                    const float y0 = *pQuads++;
-                    const float z0 = *pQuads++;
-                    const float x1 = *pQuads++;
-                    const float y1 = *pQuads++;
-                    const float z1 = *pQuads++;
-                    const float x2 = *pQuads++;
-                    const float y2 = *pQuads++;
-                    const float z2 = *pQuads++;
-                    const float x3 = *pQuads++;
-                    const float y3 = *pQuads++;
-                    const float z3 = *pQuads++;
-                    reinterpret_cast<float*>(pOut)[0x00]    =   x0;
-                    reinterpret_cast<float*>(pOut)[0x01]    =   y0;
-                    reinterpret_cast<float*>(pOut)[0x02]    =   z0;
-                    reinterpret_cast<float*>(pOut)[0x03]    =   1.f;
-                    reinterpret_cast<float*>(pOut)[0x04]    =   x2;
-                    reinterpret_cast<float*>(pOut)[0x05]    =   y2;
-                    reinterpret_cast<float*>(pOut)[0x06]    =   z2;
-                    reinterpret_cast<float*>(pOut)[0x07]    =   1.f;
-                    reinterpret_cast<float*>(pOut)[0x08]    =   x3;
-                    reinterpret_cast<float*>(pOut)[0x09]    =   y3;
-                    reinterpret_cast<float*>(pOut)[0x0a]    =   z3;
-                    reinterpret_cast<float*>(pOut)[0x0b]    =   1.f;
-
-                    reinterpret_cast<float*>(pOut)[0x0c]    =   x2;
-                    reinterpret_cast<float*>(pOut)[0x0d]    =   y2;
-                    reinterpret_cast<float*>(pOut)[0x0e]    =   z2;
-                    reinterpret_cast<float*>(pOut)[0x0f]    =   1.f;
-                    reinterpret_cast<float*>(pOut)[0x10]    =   x0;
-                    reinterpret_cast<float*>(pOut)[0x11]    =   y0;
-                    reinterpret_cast<float*>(pOut)[0x12]    =   z0;
-                    reinterpret_cast<float*>(pOut)[0x13]    =   1.f;
-                    reinterpret_cast<float*>(pOut)[0x14]    =   x1;
-                    reinterpret_cast<float*>(pOut)[0x15]    =   y1;
-                    reinterpret_cast<float*>(pOut)[0x16]    =   z1;
-                    reinterpret_cast<float*>(pOut)[0x17]    =   1.f;
-                    pOut += 0x18 * sizeof(float);
-                }
-                for (size_t c = 0, S = TriCount; c < S; c++)
-                {
-                    const float x = *pTris++;
-                    const float y = *pTris++;
-                    const float z = *pTris++;
-                    reinterpret_cast<float*>(pOut)[0x00]    =   x;
-                    reinterpret_cast<float*>(pOut)[0x01]    =   y;
-                    reinterpret_cast<float*>(pOut)[0x02]    =   z;
-                    reinterpret_cast<float*>(pOut)[0x03]    =   1.f;
-                    pOut += 4 * sizeof(float);
-                }
-            }
-            m_OCMOffsetInstances    =   static_cast<uint32>(pOut - &OCMBufferOut[0]);
-            const size_t InstanceSize   =   m_OCMInstCount * (sizeof(int) + 12 * sizeof(float));
-            memcpy(pOut, pInstances, InstanceSize);
-            for (size_t a = 0; a < m_OCMInstCount; a++)
-            {
-                uint8*  pInstance   =   pOut + a * (sizeof(int) + 12 * sizeof(float));//meshoffset+worldmatrix43
-                uint32& MeshOffset = *reinterpret_cast<uint32*>(&pInstance[0]);
-                MeshOffset  =   Offsets[MeshOffset];
-            }
-            pOut += InstanceSize;
-
-            m_OCMBuffer.resize(pOut - &OCMBufferOut[0]);
-            size_t  bufferOffset    =   reinterpret_cast<size_t>(&m_OCMBuffer[0]);
-            bufferOffset    =   (bufferOffset + 15) & ~15;
-            m_pOCMBufferAligned     =   reinterpret_cast<uint8*>(bufferOffset);
-            memcpy(m_pOCMBufferAligned, &OCMBufferOut[0], m_OCMBuffer.size());
-        }
-
-        // Integrity check: each mesh data must be aligned to 4 bytes
-        uint8* pInstances   =   &m_pOCMBufferAligned[m_OCMOffsetInstances];
-        for (size_t a = 0; a < m_OCMInstCount; a++)
-        {
-            uint8*  pInstance   =   pInstances + a * (sizeof(int) + 12 * sizeof(float));//meshoffset+worldmatrix43
-            uint32  MeshOffset = *reinterpret_cast<uint32*>(&pInstance[0]);
-            if (MeshOffset & 3)
-            {
-                CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "The occluder mesh contains invalid data. Please reexport the occluder mesh.");
-                stl::free_container(m_OCMBuffer);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    void CCullThread::UnloadLevel()
-    {
-        stl::free_container(m_OCMBuffer);
-        m_pOCMBufferAligned     =   NULL;
-
-        m_OCMMeshCount              =   0;
-        m_OCMInstCount              =   0;
-        m_OCMOffsetInstances    =   0;
-    }
-
-    void CCullThread::PrepareCullbufferAsync(const CCamera& rCamera)
-    {
-        Matrix44                                    MatProj;
-        Matrix44                                    MatView;
-        Matrix44                                    MatViewProj;
-
-#if !defined(_RELEASE) // debug code to catch double invocations of the prepare occlusion buffer job per frame
-        static int _debug = -1;
-        if (_debug == -1)
-        {
-            _debug = gEnv->pRenderer->GetFrameID(false);
-        }
-        else if (_debug == gEnv->pRenderer->GetFrameID(false))
-        {
-            __debugbreak();
-        }
-        else
-        {
-            _debug = gEnv->pRenderer->GetFrameID(false);
-        }
-#endif
-
-        const CCamera& rCam = rCamera;
-
-        CCamera tmp_cam = m_pRenderer->GetCamera();
-        m_pRenderer->SetCamera(rCam);
-        m_pRenderer->GetModelViewMatrix(reinterpret_cast<f32*>(&MatView));
-        m_pRenderer->GetProjectionMatrix(reinterpret_cast<f32*>(&MatProj));
-        m_pRenderer->SetCamera(tmp_cam);
-
-        uint32 nReverseDepthEnabled = 0;
-        m_pRenderer->EF_Query(EFQ_ReverseDepthEnabled, nReverseDepthEnabled);
-
-        if (nReverseDepthEnabled) // Convert to regular depth again. TODO: make occlusion culler work with reverse depth
-        {
-            MatProj.m22 = -MatProj.m22 + MatProj.m23;
-            MatProj.m32 = -MatProj.m32 + MatProj.m33;
-        }
-
-        m_ViewDir   =   rCam.GetViewdir();
-        MatViewProj = MatView * MatProj;
-
-        MatViewProj.Transpose();
-
-        const float SCALEX      =   static_cast<float>(CULL_SIZEX / 2);
-        const float SCALEY      =   static_cast<float>(CULL_SIZEY / 2);
-        const Matrix44A MatScreen(SCALEX, 0.f, 0.f, SCALEX,
-            0.f, -SCALEY, 0.f, SCALEY,
-            0.f, 0.f, 1.f, 0.f,
-            0.f, 0.f, 0.f, 1.f);
-        m_MatScreenViewProj =   MatScreen * MatViewProj;
-        m_MatScreenViewProjTransposed = m_MatScreenViewProj.GetTransposed();
-        m_NearPlane =  rCam.GetNearPlane();
-        m_FarPlane =  rCam.GetFarPlane();
-        m_NearestMax = m_pRenderer->GetNearestRangeMax();
-
-        m_Position  =   rCam.GetPosition();
-
-        HWZBuffer.ZBufferSizeX  =   CULL_SIZEX;
-        HWZBuffer.ZBufferSizeY    =   CULL_SIZEY;
-
-        GetObjManager()->BeginCulling();
-
-        m_nPrepareState = PREPARE_STARTED;
-        m_Enabled = false;
-        m_bCheckOcclusionRequested = 0;
-
-        RASTERIZER.Prepare();
-
-        m_PrepareBufferSync.PushCompletionFence();
-        m_OcclusionJobExecutor.StartJob([this]()
-        {
-            this->PrepareOcclusion();
-        }); // legacy: job.SetPriorityLevel(JobManager::eHighPriority); job.SetBlocking();
-    }
-
-    void CCullThread::CullStart(const SRenderingPassInfo& passInfo)
-    {
-        FUNCTION_PROFILER_3DENGINE;
-
-        // signal rasterizer that it should stop
-        m_bCheckOcclusionRequested = 1;
-
-        // tell the job that the PPU is ready for occlusion culling, this call will
-        // start the check occlusion job if the prepare step has finished, if not
-        // the prepare job itself will start the culling job
-        bool bNeedJobStart = false;
-        {
-            AUTO_LOCK(m_FollowUpLock);
-            if (m_nPrepareState == PREPARE_DONE)
-            {
-                m_nPrepareState = CHECK_STARTED;
-                bNeedJobStart = true;
-            }
-            else
-            {
-                m_nPrepareState = CHECK_REQUESTED;
-                *((SRenderingPassInfo*)m_passInfoForCheckOcclusion) = passInfo;
-            }
-        }
-
-        if (bNeedJobStart)
-        {
-            m_OcclusionJobExecutor.StartJob([this, passInfo]()
-            {
-                this->CheckOcclusion(passInfo);
-            }); // legacy: job.SetPriorityLevel(JobManager::eHighPriority);
-        }
-    }
-
-    void CCullThread::CullEnd(bool waitForOcclusionJobCompletion)
-    {
-        // If no frame was rendered, we need to remove the producer added in BeginCulling
-        m_PrepareBufferSync.WaitForCompletion();
-
-        bool bNeedRemoveProducer = false;
-        {
-            if (m_nPrepareState != CHECK_STARTED && m_nPrepareState != IDLE)
-            {
-                bNeedRemoveProducer = true;
-            }
-        }
-
-        if (bNeedRemoveProducer)
-        {
-            GetObjManager()->RemoveCullJobProducer();
-            m_nPrepareState = IDLE; // No producer so mark us as idle
-        }
-
-        if (waitForOcclusionJobCompletion)
-        {
-            m_OcclusionJobExecutor.WaitForCompletion();
-        }
-
-    }
-
-    void CCullThread::OutputMeshList()
-    {
-    }
-
-
-    float DistToBox(Vec3 Center, Vec3 Extends, Vec3 ViewPos)
-    {
-        Vec3 Delta  =   (ViewPos - Center).abs();
-        Delta   =   (Delta - Extends);
-        Delta.x =    max(Delta.x, 0.f);
-        Delta.y =    max(Delta.y, 0.f);
-        Delta.z =    max(Delta.z, 0.f);
-        return Delta.x * Delta.x + Delta.y * Delta.y + Delta.z * Delta.z;
-    }
-
-    void CCullThread::RasterizeZBuffer(uint32 PolyLimit)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-        if (m_OCMInstCount == 0)
-        {
-            float fRed[4] = {1, 0, 0, 1};
-            gEnv->pRenderer->Draw2dLabel(1.0f, 5.0f, 1.6f, fRed, false, "OCM file failed to load -> no occlusion checking possible!");
-            return;
-        }
-
-        uint Tmp[16 * sizeof(float) * 2 + 16];
-        const uint8* pMeshes    =   m_pOCMBufferAligned;//actually starts at 16, but MeshOffset is zero based
-        uint8* pInstances   =   &m_pOCMBufferAligned[m_OCMOffsetInstances];
-
-        Matrix44A& rTmp0    =   *reinterpret_cast<Matrix44A*>((reinterpret_cast<size_t>(Tmp) + 15) & ~15);
-        Matrix44A& rTmp1    =   *reinterpret_cast<Matrix44A*>((reinterpret_cast<size_t>(Tmp) + 15 + 64) & ~15);
-        rTmp0   =   m_MatScreenViewProj.GetTransposed();
-
-        int Visible = 0;
-        int Invisible = 0;
-        uint32 Poly = 0;
-        float LastDist;
-        uint8*  pLastInstance = 0;
-
-        bool    Swapped = true;
-        for (size_t c = 0; c < 20 && Swapped; c++)//incrementally (max 20 rounds) bubblesort instances front to back
-        {
-            Swapped = false;
-            LastDist = -1.f;
-            for (size_t a = 0; a < m_OCMInstCount; a++)
-            {
-                Matrix44 World(IDENTITY);
-                uint8*  pInstance   =   pInstances + a * (sizeof(int) + 12 * sizeof(float));//meshoffset+worldmatrix43
-                const uint32    MeshOffset = *reinterpret_cast<const uint32*>(&pInstance[0]);
-                const float*    pWorldMat   =   reinterpret_cast<const float*>(&pInstance[4]);
-                memcpy(&World, (void*)pWorldMat, 12 * sizeof(float));
-
-                //simple incremental bubblesort
-                const float Dist    =   (World.GetTranslation() - m_Position).GetLength();
-                if (Dist < LastDist)
-                {
-                    PREFAST_ASSUME(pLastInstance);
-                    Swapped = true;
-                    for (size_t b = 0; b < 13; b++)
-                    {
-                        std::swap(reinterpret_cast<uint32*>(pLastInstance)[b], reinterpret_cast<uint32*>(pInstance)[b]);
-                    }
-                }
-
-                LastDist = Dist;
-                pLastInstance = pInstance;
-            }
-        }
-
-        const bool EarlyOut = GetCVars()->e_CoverageBufferEarlyOut == 1;
-        const int64 MaxEarlyOutDelay = (int64)(GetCVars()->e_CoverageBufferEarlyOutDelay * 1000.0f);
-        LastDist = -1.f;
-
-        ITimer* pTimer = gEnv->pTimer;
-        int64 StartTime = -1;
-
-        for (size_t a = 0; a < m_OCMInstCount && (PolyLimit == 0 || Poly < PolyLimit); a++)
-        {
-            // stop if MT need to run check occlusion
-            if (EarlyOut && *const_cast<volatile int*>(&m_bCheckOcclusionRequested))
-            {
-                if (StartTime < 0)
-                {
-                    StartTime = pTimer->GetAsyncTime().GetMicroSecondsAsInt64();
-                }
-
-                int64 CurTime = pTimer->GetAsyncTime().GetMicroSecondsAsInt64();
-                if (CurTime - StartTime > MaxEarlyOutDelay)
-                {
-                    break;
-                }
-            }
-
-            Matrix44 World(IDENTITY);
-            uint8*  pInstance   =   pInstances + a * (sizeof(int) + 12 * sizeof(float));//meshoffset+worldmatrix43
-            const uint32    MeshOffset = *reinterpret_cast<volatile const uint32*>(&pInstance[0]);
-            const float*    pWorldMat   =   reinterpret_cast<const float*>(&pInstance[4]);
-            memcpy(&World, (void*)pWorldMat, 12 * sizeof(float));
-
-            Vec3 Pos    =       World.GetTranslation(), Extend;
-            Extend.x = (fabsf(World.m00) + fabsf(World.m01) + fabsf(World.m02)) * (127.f);
-            Extend.y = (fabsf(World.m10) + fabsf(World.m11) + fabsf(World.m12)) * (127.f);
-            Extend.z = (fabsf(World.m20) + fabsf(World.m21) + fabsf(World.m22)) * (127.f);
-
-            const int InFrustum =   RASTERIZER.AABBInFrustum(reinterpret_cast<NVMath::vec4*>(&rTmp0), Pos - Extend, Pos + Extend, m_Position);
-            if (!InFrustum)
-            {
-                Invisible++;
-                continue;
-            }
-            else
-            {
-                Visible++;
-            }
-
-            rTmp1   =   (m_MatScreenViewProj * World).GetTransposed();
-            const uint8*    pMesh           =   pMeshes + MeshOffset;
-            const size_t    TriCount    =   *reinterpret_cast<const uint32*>(pMesh);
-            const size_t    Tris16      =   (reinterpret_cast<size_t>(pMesh + 4) + 15) & ~15;
-            const int8* pTris               =   reinterpret_cast<const int8*>(Tris16);
-            if (InFrustum & 2)
-            {
-                RASTERIZER.Rasterize<true>(reinterpret_cast<NVMath::vec4*>(&rTmp1), reinterpret_cast<const NVMath::vec4*>(pTris), TriCount);
-            }
-            else
-            {
-                RASTERIZER.Rasterize<false>(reinterpret_cast<NVMath::vec4*>(&rTmp1), reinterpret_cast<const NVMath::vec4*>(pTris), TriCount);
-            }
-            Poly += TriCount;
-        }
-    }
-
-#if !defined(_RELEASE)
-    void CCullThread::CoverageBufferDebugDraw()
-    {
-        RASTERIZER.DrawDebug(m_pRenderer, 1);
-    }
-#endif
-
-
-    void CCullThread::PrepareOcclusion()
-    {
-        if (!GetCVars()->e_CameraFreeze)
-        {
-            FUNCTION_PROFILER_3DENGINE;
-            using namespace NVMath;
-
-            int bHWZBuffer  =   GetCVars()->e_CoverageBufferReproj;
-
-            if (bHWZBuffer > 3 && m_OCMBuffer.empty())
-            {
-                bHWZBuffer  =   2;
-            }
-
-            if ((bHWZBuffer & 3) > 0)
-            {
-                m_Enabled = RASTERIZER.DownLoadHWDepthBuffer(m_NearPlane, m_FarPlane, m_NearestMax, GetCVars()->e_CoverageBufferBias);
-            }
-            else
-            {
-                RASTERIZER.Clear();
-            }
-        }
-
-        m_OcclusionJobExecutor.StartJob([this]()
-        {
-            this->PrepareOcclusion_ReprojectZBuffer();
-        }); // legacy: job.SetPriorityLevel(JobManager::eHighPriority);
-    }
-
-    void CCullThread::PrepareOcclusion_ReprojectZBuffer()
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-        int bHWZBuffer  =   GetCVars()->e_CoverageBufferReproj;
-
-        if (bHWZBuffer > 3 && m_OCMBuffer.empty())
-        {
-            bHWZBuffer  =   2;
-        }
-
-        if (!GetCVars()->e_CameraFreeze && (bHWZBuffer & 3) > 0 && m_Enabled)
-        {
-            enum
-            {
-                nLinesPerJob = 8
-            };
-            m_nRunningReprojJobs = tdCullRasterizer::RESOLUTION_Y / nLinesPerJob;
-            m_nRunningReprojJobsAfterMerge = tdCullRasterizer::RESOLUTION_Y / nLinesPerJob;
-            for (int i = 0; i < tdCullRasterizer::RESOLUTION_Y; i += nLinesPerJob)
-            {
-                m_OcclusionJobExecutor.StartJob([this, i]()
-                {
-                    this->PrepareOcclusion_ReprojectZBufferLine(i, nLinesPerJob);
-                }); // legacy: job.SetPriorityLevel(JobManager::eHighPriority);
-            }
-        }
-        else
-        {
-            m_OcclusionJobExecutor.StartJob([this]()
-            {
-                this->PrepareOcclusion_RasterizeZBuffer();
-            }); // job.SetPriorityLevel(JobManager::eHighPriority);
-        }
-    }
-
-    void CCullThread::PrepareOcclusion_ReprojectZBufferLine(int nStartLine, int nNumLines)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-        if (!GetCVars()->e_CameraFreeze)
-        {
-            uint Tmp[80];
-            Matrix44A& rTmp =   *reinterpret_cast<Matrix44A*>((reinterpret_cast<size_t>(Tmp) + 15) & ~15);
-            rTmp    =   m_MatScreenViewProjTransposed;
-            RASTERIZER.ReprojectHWDepthBuffer(rTmp, m_NearPlane, m_FarPlane, m_NearestMax, GetCVars()->e_CoverageBufferBias, nStartLine, nNumLines);
-        }
-
-        uint32 nRemainingJobs = CryInterlockedDecrement((volatile int*)&m_nRunningReprojJobs);
-        if (nRemainingJobs == 0)
-        {
-            enum
-            {
-                nLinesPerJob = 8
-            };
-            for (int i = 0; i < tdCullRasterizer::RESOLUTION_Y; i += nLinesPerJob)
-            {
-                m_OcclusionJobExecutor.StartJob([this, i]()
-                {
-                    this->PrepareOcclusion_ReprojectZBufferLineAfterMerge(i, nLinesPerJob);
-                }); // job.SetPriorityLevel(JobManager::eHighPriority);
-            }
-        }
-    }
-
-    void CCullThread::PrepareOcclusion_ReprojectZBufferLineAfterMerge(int nStartLine, int nNumLines)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-        // merge the reprojected buffer bevore new jobs are started on it
-        RASTERIZER.MergeReprojectHWDepthBuffer(nStartLine, nNumLines);
-
-        if (!GetCVars()->e_CameraFreeze)
-        {
-            uint Tmp[80];
-            Matrix44A& rTmp =   *reinterpret_cast<Matrix44A*>((reinterpret_cast<size_t>(Tmp) + 15) & ~15);
-            rTmp    =   m_MatScreenViewProjTransposed;
-            RASTERIZER.ReprojectHWDepthBufferAfterMerge(rTmp, m_NearPlane, m_FarPlane, m_NearestMax, GetCVars()->e_CoverageBufferBias, nStartLine, nNumLines);
-        }
-
-        uint32 nRemainingJobs = CryInterlockedDecrement((volatile int*)&m_nRunningReprojJobsAfterMerge);
-        if (nRemainingJobs == 0)
-        {
-            m_OcclusionJobExecutor.StartJob([this]()
-            {
-                this->PrepareOcclusion_RasterizeZBuffer();
-            }); //job.SetPriorityLevel(JobManager::eHighPriority);
-        }
-    }
-
-
-    void CCullThread::PrepareOcclusion_RasterizeZBuffer()
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-        m_Enabled = true;
-        if (!GetCVars()->e_CameraFreeze)
-        {
-            int bHWZBuffer  =   GetCVars()->e_CoverageBufferReproj;
-            int PolyLimit       =   GetCVars()->e_CoverageBufferRastPolyLimit;
-
-            if (bHWZBuffer > 3 && m_OCMBuffer.empty())
-            {
-                bHWZBuffer  =   2;
-            }
-
-            bool rast_z_buff = (bHWZBuffer & 4) ? true : false;
-            if (rast_z_buff)
-            {
-                m_Enabled   =   true;
-                RasterizeZBuffer((uint32)PolyLimit);
-            }
-        }
-
-        bool bNeedJobStart = false;
-        {
-            AUTO_LOCK(m_FollowUpLock);
-            if (m_nPrepareState == CHECK_REQUESTED)
-            {
-                m_nPrepareState = CHECK_STARTED;
-                bNeedJobStart = true;
-            }
-            else
-            {
-                m_nPrepareState = PREPARE_DONE;
-            }
-        }
-
-        m_PrepareBufferSync.PopCompletionFence();
-        if (bNeedJobStart)
-        {
-            m_OcclusionJobExecutor.StartJob([this]()
-            {
-                this->CheckOcclusion(*reinterpret_cast<SRenderingPassInfo*>(m_passInfoForCheckOcclusion));
-            }); // legacy: job.SetPriorityLevel(JobManager::eHighPriority)
-        }
-    }
-
-    void CCullThread::CheckOcclusion(SRenderingPassInfo passInfo)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-        uint8 AlignBuffer[2 * sizeof(Matrix44A) + 16];
-        size_t pBuffer  =   (reinterpret_cast<size_t>(AlignBuffer) + 15) & ~15;
-        Matrix44A& RESTRICT_REFERENCE rMatFinalT    =   reinterpret_cast<Matrix44A*>(pBuffer)[1];
-
-
-        Vec3 localPostion;
-        memcpy(&localPostion, &m_Position, sizeof(Vec3));
-
-        const AABB PosAABB  =   AABB(m_Position, 0.5f);
-        const float Bias    =   GetCVars()->e_CoverageBufferAABBExpand;
-        rMatFinalT  =   m_MatScreenViewProj.GetTransposed();
-
-        // Debugging stats in green to screen here with how many octree nodes pass/fail and how many terrain nodes pass/fail
-        unsigned int octreeNodesCulled = 0;
-        unsigned int octreeNodesVisible = 0;
-        while (1)
-        {
-            SCheckOcclusionJobData jobData;
-            GetObjManager()->PopFromCullQueue(&jobData);
-
-            // stop processing when beeing told so
-            if (jobData.type == SCheckOcclusionJobData::QUIT)
-            {
-                break;
-            }
-
-            if (jobData.type == SCheckOcclusionJobData::OCTREE_NODE)
-            {
-                AABB    rAABB;
-                COctreeNode* pOctTreeNode = (COctreeNode*)jobData.octTreeData.pOctTreeNode;
-
-                memcpy(&rAABB, &pOctTreeNode->GetObjectsBBox(), sizeof(AABB));
-                float fDistance = sqrtf(Distance::Point_AABBSq(passInfo.GetCamera().GetPosition(), rAABB));
-
-                // Test OctTree BoundingBox
-                if (TestAABB(rAABB, fDistance))
-                {
-                    pOctTreeNode->COctreeNode::RenderContent(jobData.octTreeData.nRenderMask, passInfo, jobData.rendItemSorter, jobData.pCam);
-                    octreeNodesVisible++;
-                }
-                else
-                {
-                    octreeNodesCulled++;
-                }
-            }
-            else
-            {
-                __debugbreak(); // unknown culler job type
-            }
-        }
-
-        if (GetCVars()->e_CoverageBufferDebug)
-        {
-            float fGreen[4] = {0, 1, 0, 1};
-            gEnv->pRenderer->Draw2dLabel(16.0f, 32.0f, 1.6f, fGreen, false, AZStd::string::format("Octree Nodes Culled %i, Octree Nodes Visible %i",octreeNodesCulled, octreeNodesVisible).c_str());
-        }
-
-        GetObjManager()->RemoveCullJobProducer();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    bool CCullThread::TestAABB(const AABB& rAABB, float fEntDistance, float fVerticalExpand)
-    {
-        IF (GetCVars()->e_CheckOcclusion == 0, 0)
-        {
-            return true;
-        }
-
-        const AABB PosAABB  =   AABB(m_Position, 0.5f);
-        const float Bias    =   GetCVars()->e_CoverageBufferAABBExpand;
-        DEFINE_ALIGNED_DATA(Matrix44A, rMatFinalT(m_MatScreenViewProj.GetTransposed()), 16);
-        AABB bbox(rAABB);
-
-        if (Bias < 0.f)
-        {
-            bbox.Expand((bbox.max - bbox.min) * -Bias - Vec3(Bias, Bias, Bias));
-        }
-        else
-        {
-            bbox.Expand(Vec3(Bias * fEntDistance));
-        }
-
-        float fVerticalExpandScaled = fVerticalExpand * fEntDistance;
-        bbox.min.z -= fVerticalExpandScaled;
-        bbox.max.z += fVerticalExpandScaled;
-
-        if (!m_Enabled)
-        {
-            return true;
-        }
-
-        if (bbox.IsIntersectBox(PosAABB))
-        {
-            return true;
-        }
-
-        if (RASTERIZER.TestAABB(reinterpret_cast<const NVMath::vec4*>(&rMatFinalT), bbox.min, bbox.max, m_Position))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    bool CCullThread::TestQuad(const Vec3& vCenter, const Vec3& vAxisX, const Vec3& vAxisY)
-    {
-        IF (GetCVars()->e_CheckOcclusion == 0, 0)
-        {
-            return true;
-        }
-
-        if (!m_Enabled)
-        {
-            return true;
-        }
-
-        DEFINE_ALIGNED_DATA(Matrix44A, rMatFinalT(m_MatScreenViewProj.GetTransposed()), 16);
-        if (RASTERIZER.TestQuad(reinterpret_cast<const NVMath::vec4*>(&rMatFinalT), vCenter, vAxisX, vAxisY))
-        {
-            return true;
-        }
-
-        return false;
-    }
-} // namespace NAsyncCull
-
-
diff --git a/Code/CryEngine/Cry3DEngine/CCullThread.h b/Code/CryEngine/Cry3DEngine/CCullThread.h
deleted file mode 100644
index a1eaee7dc9..0000000000
--- a/Code/CryEngine/Cry3DEngine/CCullThread.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CCULLTHREAD_H
-#define CRYINCLUDE_CRY3DENGINE_CCULLTHREAD_H
-#pragma once
-
-#include "CryThread.h"
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-namespace NAsyncCull
-{
-    class CCullThread
-        : public Cry3DEngineBase
-    {
-        bool m_Enabled;
-        bool m_Active; // used to verify that the cull job is running and no new jobs are added after the job has finished
-
-    public:
-        enum PrepareStateT
-        {
-            IDLE, PREPARE_STARTED, PREPARE_DONE, CHECK_REQUESTED, CHECK_STARTED
-        };
-
-        PrepareStateT         m_nPrepareState;
-        CryCriticalSection    m_FollowUpLock;
-        char                  m_passInfoForCheckOcclusion[sizeof(SRenderingPassInfo)];
-        uint32                m_nRunningReprojJobs;
-        uint32                m_nRunningReprojJobsAfterMerge;
-        int                   m_bCheckOcclusionRequested;
-
-    private:
-        AZ::LegacyJobExecutor m_OcclusionJobExecutor; // All jobs pushed against this instance to gurantee a wait on all jobs before exiting ~CCullThread
-        AZ::LegacyJobExecutor m_PrepareBufferSync;
-        Matrix44A             m_MatScreenViewProj _ALIGN(16);
-        Matrix44A             m_MatScreenViewProjTransposed;
-        Vec3                  m_ViewDir;
-        Vec3                  m_Position;
-        float                 m_NearPlane;
-        float                 m_FarPlane;
-        float                 m_NearestMax;
-
-        PodArray<uint8>       m_OCMBuffer;
-        uint8*                m_pOCMBufferAligned;
-        uint32                m_OCMMeshCount;
-        uint32                m_OCMInstCount;
-        uint32                m_OCMOffsetInstances;
-
-        template<class T>
-        T Swap(T& rData)
-        {
-            // #if IS_LOCAL_MACHINE_BIG_ENDIAN
-            PREFAST_SUPPRESS_WARNING(6326)
-            switch (sizeof(T))
-            {
-            case 1:
-                break;
-            case 2:
-                SwapEndianBase(reinterpret_cast<uint16*>(&rData));
-                break;
-            case 4:
-                SwapEndianBase(reinterpret_cast<uint32*>(&rData));
-                break;
-            case 8:
-                SwapEndianBase(reinterpret_cast<uint64*>(&rData));
-                break;
-            default:
-#if defined(__clang__) || defined(__GNUC__)
-                __builtin_unreachable();
-#else
-                __assume(0);
-#endif
-            }
-            //#endif
-            return rData;
-        }
-
-        void RasterizeZBuffer(uint32 PolyLimit);
-        void OutputMeshList();
-
-    public:
-
-        void CheckOcclusion(SRenderingPassInfo passInfo);
-        void PrepareOcclusion();
-
-        void PrepareOcclusion_RasterizeZBuffer();
-        void PrepareOcclusion_ReprojectZBuffer();
-        void PrepareOcclusion_ReprojectZBufferLine(int nStartLine, int nNumLines);
-        void PrepareOcclusion_ReprojectZBufferLineAfterMerge(int nStartLine, int nNumLines);
-        void Init();
-
-        bool LoadLevel(const char* pFolderName);
-        void UnloadLevel();
-
-        bool TestAABB(const AABB& rAABB, float fEntDistance, float fVerticalExpand = 0.0f);
-        bool TestQuad(const Vec3& vCenter, const Vec3& vAxisX, const Vec3& vAxisY);
-
-        CCullThread();
-        ~CCullThread() = default;
-
-
-#ifndef _RELEASE
-        void CoverageBufferDebugDraw();
-#endif
-
-        void PrepareCullbufferAsync(const CCamera& rCamera);
-        void CullStart(const SRenderingPassInfo& passInfo);
-        void CullEnd(bool waitForOcclusionJobCompletion = false);
-
-        bool IsActive() const { return m_Active; }
-        void SetActive(bool bActive) { m_Active = bActive; }
-
-        Vec3 GetViewDir() { return m_ViewDir; };
-    } _ALIGN(128);
-}
-
-#endif // CRYINCLUDE_CRY3DENGINE_CCULLTHREAD_H
-
diff --git a/Code/CryEngine/Cry3DEngine/CGF/CGFLoader.cpp b/Code/CryEngine/Cry3DEngine/CGF/CGFLoader.cpp
deleted file mode 100644
index f8f7d8df04..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/CGFLoader.cpp
+++ /dev/null
@@ -1,4336 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include <platform.h>
-#include "CGFLoader.h"
-
-#include <StringUtils.h>
-#include <InplaceFactory.h>
-#include "CryPath.h"
-#include "ReadOnlyChunkFile.h"
-#include "IStatObj.h"
-
-// #define DEBUG_DUMP_RBATCHES
-#define VERTEX_SCALE (0.01f)
-#define PHYSICS_PROXY_NODE "PhysicsProxy"
-#define PHYSICS_PROXY_NODE2 "$collision"
-#define PHYSICS_PROXY_NODE3 "$physics_proxy"
-enum
-{
-    MAX_NUMBER_OF_BONES = 65534
-};
-
-#if !defined(FUNCTION_PROFILER_3DENGINE)
-#define FUNCTION_PROFILER_3DENGINE
-#endif
-
-#if !defined(LOADING_TIME_PROFILE_SECTION)
-#define LOADING_TIME_PROFILE_SECTION
-#endif
-
-#ifndef ARRAY_LENGTH
-#   define ARRAY_LENGTH(arr) (sizeof(arr) / sizeof(arr[0]))
-#endif
-
-
-namespace
-{
-    // Templated construct helper function using an inplace factory
-    //
-    // Called from the templated New<T, Expr> function below. Returns a typed
-    // pointer to the inplace constructed object.
-    template<typename T, typename InPlaceFactory>
-    T* Construct(
-        const InPlaceFactory& factory,
-        void* (*pAllocFnc)(size_t))
-    {
-        return reinterpret_cast<T*>(factory.template apply<T>(pAllocFnc(sizeof(T))));
-    }
-
-    // Templated construct helper function using an inplace factory
-    //
-    // Called from the templated New<T, Expr> function below. Returns a typed
-    // pointer to the inplace constructed object.
-    template<typename T>
-    T* Construct(void* (*pAllocFnc)(size_t))
-    {
-        return new (pAllocFnc(sizeof(T)))T;
-    }
-
-    // Templated destruct helper function
-    //
-    // Calls the object's destructor and returns a void pointer to the storage
-    template<typename T>
-    void Destruct(T* obj, void(*pDestructFnc)(void*))
-    {
-        obj->~T();
-        pDestructFnc(reinterpret_cast<void*>(obj));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CLoaderCGF::CLoaderCGF(
-    AllocFncPtr pAllocFnc,
-    DestructFncPtr pDestructFnc,
-    bool bAllowStreamSharing)
-    : m_pAllocFnc(pAllocFnc)
-    , m_pDestructFnc(pDestructFnc)
-{
-    m_pChunkFile = NULL;
-
-    //////////////////////////////////////////////////////////////////////////
-    // To find really used materials
-    memset(MatIdToSubset, 0, sizeof(MatIdToSubset));
-    nLastChunkId = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    m_bUseReadOnlyMesh = false;
-
-    m_bAllowStreamSharing = bAllowStreamSharing;
-
-    m_pCompiledCGF = 0;
-
-    m_maxWeightsPerVertex = 4;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CLoaderCGF::~CLoaderCGF()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CContentCGF* CLoaderCGF::LoadCGF(const char* filename, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags)
-{
-    CContentCGF* const pContentCGF = new CContentCGF(filename);
-    if (!pContentCGF)
-    {
-        return NULL;
-    }
-    if (!LoadCGF(pContentCGF, filename, chunkFile, pListener, nLoadingFlags))
-    {
-        delete pContentCGF;
-        return NULL;
-    }
-    return pContentCGF;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadCGF(CContentCGF* pContentCGF, const char* filename, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (!chunkFile.IsLoaded())
-    {
-        if (!chunkFile.Read(filename))
-        {
-            m_LastError = chunkFile.GetLastError();
-            return false;
-        }
-    }
-
-    if (gEnv)
-    {
-        //Update loading screen and important tick functions
-        SYNCHRONOUS_LOADING_TICK();
-    }
-
-    return LoadCGFWork(pContentCGF, filename, chunkFile, pListener, nLoadingFlags);
-}
-
-bool CLoaderCGF::LoadCGFFromMem(CContentCGF* pContentCGF, const void* pData, size_t nDataLen, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (!chunkFile.IsLoaded())
-    {
-        if (!chunkFile.ReadFromMemory(pData, (int)nDataLen))
-        {
-            m_LastError = chunkFile.GetLastError();
-            return false;
-        }
-    }
-
-    if (gEnv)
-    {
-        //Update loading screen and important tick functions
-        SYNCHRONOUS_LOADING_TICK();
-    }
-
-    return LoadCGFWork(pContentCGF, pContentCGF->GetFilename(), chunkFile, pListener, nLoadingFlags);
-}
-
-bool CLoaderCGF::LoadCGFWork(CContentCGF* pContentCGF, const char* filename, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags)
-{
-    m_pListener = pListener;
-    m_bUseReadOnlyMesh = chunkFile.IsReadOnly();
-
-    cry_strcpy(m_filename, filename);
-    m_pChunkFile = &chunkFile;
-
-    // Load mesh from chunk file.
-
-    if (!pContentCGF)
-    {
-        m_LastError.Format("no valid CContentCGF instance for cgf file: %s", m_filename);
-        return false;
-    }
-    m_pCGF = pContentCGF;
-
-    {
-        const char* const pExt = PathUtil::GetExt(filename);
-        m_IsCHR =
-            !azstricmp(pExt, "chr") ||
-            !azstricmp(pExt, "chrp") ||
-            !azstricmp(pExt, "chrm") ||
-            !azstricmp(pExt, "skin") ||
-            !azstricmp(pExt, "skinp") ||
-            !azstricmp(pExt, "skinm") ||
-            !azstricmp(pExt, "skel");
-    }
-
-    const bool bJustGeometry = (nLoadingFlags& IStatObj::ELoadingFlagsJustGeometry) != 0;
-
-    if (!LoadChunks(bJustGeometry))
-    {
-        return false;
-    }
-
-    for (int i = 0; i < m_pChunkFile->NumChunks(); i++)
-    {
-        if (m_pChunkFile->GetChunk(i)->bSwapEndian)
-        {
-            m_pCGF->m_bConsoleFormat = true;
-            break;
-        }
-    }
-
-    if (!bJustGeometry)
-    {
-        if (m_pCGF->GetMaterialCount() > 0)
-        {
-            m_pCGF->SetCommonMaterial(m_pCGF->GetMaterial(0));
-        }
-    }
-
-    ProcessNodes();
-
-    if (gEnv)
-    {
-        SYNCHRONOUS_LOADING_TICK();
-    }
-
-    if (!bJustGeometry)
-    {
-        if (!ProcessSkinning())
-        {
-            return false;
-        }
-    }
-
-    if (pListener && pListener->IsValidationEnabled())
-    {
-        const char* pErrorDescription = 0;
-        if (!m_pCGF->ValidateMeshes(&pErrorDescription))
-        {
-            Warning(
-                "!Invalid meshes (%s) found in file: %s\n"
-                "The file is corrupt (possibly generated with old/buggy RC) -- please re-export it with newest RC",
-                pErrorDescription, m_filename);
-        }
-    }
-
-    m_pListener = 0;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadChunks(bool bJustGeometry)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    m_CompiledBones = false;
-    m_CompiledMesh = 0;
-    m_CompiledBonesBoxes = false;
-
-    m_numBonenameList = 0;
-    m_numBoneInitialPos = 0;
-    m_numMorphTargets = 0;
-    m_numBoneHierarchy = 0;
-
-    // Load Nodes.
-    const uint32 numChunk = m_pChunkFile->NumChunks();
-    m_pCGF->GetSkinningInfo()->m_arrPhyBoneMeshes.clear();
-    m_pCGF->GetSkinningInfo()->m_numChunks = numChunk;
-
-    for (uint32 i = 0; i < numChunk; i++)
-    {
-        IChunkFile::ChunkDesc* const pChunkDesc = m_pChunkFile->GetChunk(i);
-
-        if (!bJustGeometry)
-        {
-            if (m_IsCHR)
-            {
-                switch (pChunkDesc->chunkType)
-                {
-                case ChunkType_BoneNameList:
-                    m_numBonenameList++;
-                    if (!ReadBoneNameList(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_BoneInitialPos:
-                    m_numBoneInitialPos++;
-                    if (!ReadBoneInitialPos(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_BoneAnim:
-                    m_numBoneHierarchy++;
-                    if (!ReadBoneHierarchy(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_BoneMesh:
-                    if (!ReadBoneMesh(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_MeshMorphTarget:
-                    m_numMorphTargets++;
-                    if (!ReadMorphTargets(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                    //---------------------------------------------------------
-                    //---       chunks for compiled characters             ----
-                    //---------------------------------------------------------
-
-                case ChunkType_CompiledBones:
-                    if (!ReadCompiledBones(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_CompiledPhysicalBones:
-                    if (!ReadCompiledPhysicalBones(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_CompiledPhysicalProxies:
-                    if (!ReadCompiledPhysicalProxies(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_CompiledMorphTargets:
-                    if (!ReadCompiledMorphTargets(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-
-                case ChunkType_CompiledIntFaces:
-                    if (!ReadCompiledIntFaces(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_CompiledIntSkinVertices:
-                    if (!ReadCompiledIntSkinVertice(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_CompiledExt2IntMap:
-                    if (!ReadCompiledExt2IntMap(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-
-                case ChunkType_BonesBoxes:
-                    if (!ReadCompiledBonesBoxes(pChunkDesc))
-                    {
-                        return false;
-                    }
-                    break;
-                }
-            }
-
-            switch (pChunkDesc->chunkType)
-            {
-                //---------------------------------------------------------
-                //---       chunks for CGA-objects  -----------------------
-                //---------------------------------------------------------
-
-            case ChunkType_ExportFlags:
-                if (!LoadExportFlagsChunk(pChunkDesc))
-                {
-                    return false;
-                }
-                break;
-
-            case ChunkType_Node:
-                if (!LoadNodeChunk(pChunkDesc, false))
-                {
-                    return false;
-                }
-                break;
-
-            case ChunkType_MtlName:
-                if (!LoadMaterialFromChunk(pChunkDesc->chunkId))
-                {
-                    return false;
-                }
-                break;
-
-            case ChunkType_BreakablePhysics:
-                if (!ReadCompiledBreakablePhysics(pChunkDesc))
-                {
-                    return false;
-                }
-                break;
-
-            case ChunkType_FoliageInfo:
-                if (!LoadFoliageInfoChunk(pChunkDesc))
-                {
-                    return false;
-                }
-                break;
-            }
-        }
-        else
-        {
-            switch (pChunkDesc->chunkType)
-            {
-            case ChunkType_Node:
-                if (!LoadNodeChunk(pChunkDesc, true))
-                {
-                    return false;
-                }
-                break;
-            }
-        }
-    }
-
-    return true;
-}
-
-
-
-bool CLoaderCGF::ReadBoneInitialPos(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (pChunkDesc->chunkVersion != BONEINITIALPOS_CHUNK_DESC_0001::VERSION)
-    {
-        m_LastError.Format("BoneInitialPos chunk is of unknown version %d", pChunkDesc->chunkVersion);
-        return false;
-    }
-
-    BONEINITIALPOS_CHUNK_DESC_0001* const pBIPChunk = (BONEINITIALPOS_CHUNK_DESC_0001*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pBIPChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    const uint32 numBones = pBIPChunk->numBones;
-
-    SBoneInitPosMatrix* const pDefMatrix = (SBoneInitPosMatrix*)(pBIPChunk + 1);
-    SwapEndian(pDefMatrix, numBones, bSwapEndianness);
-
-    m_arrInitPose34.resize(numBones, IDENTITY);
-    for (uint32 nBone = 0; nBone < numBones; ++nBone)
-    {
-        m_arrInitPose34[nBone].m00 = pDefMatrix[nBone].mx[0][0];
-        m_arrInitPose34[nBone].m01 = pDefMatrix[nBone].mx[1][0];
-        m_arrInitPose34[nBone].m02 = pDefMatrix[nBone].mx[2][0];
-        m_arrInitPose34[nBone].m03 = pDefMatrix[nBone].mx[3][0] * VERTEX_SCALE;
-        m_arrInitPose34[nBone].m10 = pDefMatrix[nBone].mx[0][1];
-        m_arrInitPose34[nBone].m11 = pDefMatrix[nBone].mx[1][1];
-        m_arrInitPose34[nBone].m12 = pDefMatrix[nBone].mx[2][1];
-        m_arrInitPose34[nBone].m13 = pDefMatrix[nBone].mx[3][1] * VERTEX_SCALE;
-        m_arrInitPose34[nBone].m20 = pDefMatrix[nBone].mx[0][2];
-        m_arrInitPose34[nBone].m21 = pDefMatrix[nBone].mx[1][2];
-        m_arrInitPose34[nBone].m22 = pDefMatrix[nBone].mx[2][2];
-        m_arrInitPose34[nBone].m23 = pDefMatrix[nBone].mx[3][2] * VERTEX_SCALE;
-        m_arrInitPose34[nBone].OrthonormalizeFast(); // for some reason Max supplies unnormalized matrices.
-    }
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-
-bool CLoaderCGF::ReadMorphTargets(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-#if !defined(RESOURCE_COMPILER)
-    m_LastError.Format("%s tried to load a noncompiled MeshMorphTarget chunk %i", __FUNCTION__, (int)pChunkDesc->chunkId);
-    return false;
-#else
-    if (pChunkDesc->chunkVersion != MESHMORPHTARGET_CHUNK_DESC_0001::VERSION)
-    {
-        m_LastError.Format("MeshMorphTarget chunk %i is of unknown version %i", (int)pChunkDesc->chunkId, (int)pChunkDesc->chunkVersion);
-        return false;
-    }
-
-    // the chunk must at least contain its header and the name (min 2 bytes)
-    if (pChunkDesc->size <= sizeof(MESHMORPHTARGET_CHUNK_DESC_0001))
-    {
-        m_LastError.Format("MeshMorphTarget chunk %i: Bad size: %i", (int)pChunkDesc->chunkId, (int)pChunkDesc->size);
-        return false;
-    }
-
-    if (m_vertexOldToNew.empty())
-    {
-        m_LastError.Format("MeshMorphTarget chunk %i: main mesh was not loaded yet or its type is not Skin.", (int)pChunkDesc->chunkId);
-        return false;
-    }
-
-    MESHMORPHTARGET_CHUNK_DESC_0001* const pMeshMorphTarget = (MESHMORPHTARGET_CHUNK_DESC_0001*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pMeshMorphTarget, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    const uint32 oldVertexCount = pMeshMorphTarget->numMorphVertices;
-    if (oldVertexCount <= 0)
-    {
-        m_LastError.Format("MeshMorphTarget chunk %i: Bad # of vertices: %i", (int)pChunkDesc->chunkId, (int)oldVertexCount);
-        return false;
-    }
-
-    if (oldVertexCount > m_vertexOldToNew.size())
-    {
-        m_LastError.Format("MeshMorphTarget chunk %i: bad # of morph target vertices: %i (# of entries in the remapping table is %i).", (int)pChunkDesc->chunkId, (int)oldVertexCount, (int)m_vertexOldToNew.size());
-        return false;
-    }
-
-    SMeshMorphTargetVertex* const pSrcVertices = (SMeshMorphTargetVertex*)(pMeshMorphTarget + 1);
-    SwapEndian(pSrcVertices, (size_t)oldVertexCount, bSwapEndianness);
-
-    // Remap vertices to match main mesh's remapping
-
-    for (uint32 i = 0; i < oldVertexCount; ++i)
-    {
-        const unsigned oldIdx = pSrcVertices[i].nVertexId;
-        if (oldIdx >= m_vertexOldToNew.size())
-        {
-            m_LastError.Format("MeshMorphTarget chunk %i: bad vertex index (%u) at element %u", (int)pChunkDesc->chunkId, oldIdx, (unsigned)i);
-            return false;
-        }
-
-        const int newIdx = m_vertexOldToNew[oldIdx];
-        if (newIdx < 0)
-        {
-            m_LastError.Format("MeshMorphTarget chunk %i: bad remapping value (%i) at element %u", (int)pChunkDesc->chunkId, (int)newIdx, (unsigned)i);
-            return false;
-        }
-
-        pSrcVertices[i].nVertexId = (unsigned)newIdx;
-    }
-
-    // Get rid of duplicated entries and also sort in ascending order of vertex indices
-
-    struct CompareByVertexIndex
-    {
-        static bool less(const SMeshMorphTargetVertex& left, const SMeshMorphTargetVertex& right)
-        {
-            return left.nVertexId < right.nVertexId;
-        }
-    };
-
-    std::sort(&pSrcVertices[0], &pSrcVertices[oldVertexCount], CompareByVertexIndex::less);
-
-    uint32 newVertexCount = 0;
-    for (uint32 i = 0; i < oldVertexCount; ++i)
-    {
-        if (i == 0 || CompareByVertexIndex::less(pSrcVertices[i - 1], pSrcVertices[i]))
-        {
-            pSrcVertices[newVertexCount++] = pSrcVertices[i];
-        }
-    }
-
-    // Form results
-
-    MorphTargets* const pMT = new MorphTargets;
-
-    //store the mesh ID
-    pMT->MeshID = pMeshMorphTarget->nChunkIdMesh;
-    //store the name of morph-target
-    const char* pName = (const char*)(pSrcVertices + oldVertexCount);
-    pMT->m_strName = "#" + string(pName);
-    //store the vertices&indices of morph-target
-    pMT->m_arrIntMorph.resize(newVertexCount);
-    memcpy(&pMT->m_arrIntMorph[0], pSrcVertices, sizeof(SMeshMorphTargetVertex) * newVertexCount);
-
-    CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-    pSkinningInfo->m_arrMorphTargets.push_back(pMT);
-
-    return true;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadBoneNameList(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (pChunkDesc->chunkVersion != BONENAMELIST_CHUNK_DESC_0745::VERSION)
-    {
-        m_LastError.Format("Unknown version of bone name list chunk");
-        return false;
-    }
-
-    // the chunk contains variable-length packed strings following tightly each other
-    BONENAMELIST_CHUNK_DESC_0745* pNameChunk = (BONENAMELIST_CHUNK_DESC_0745*)(pChunkDesc->data);
-    SwapEndian(*pNameChunk, pChunkDesc->bSwapEndian);
-    pChunkDesc->bSwapEndian = false;
-
-    const uint32 nGeomBones = pNameChunk->numEntities;
-
-    // we know how many strings there are there; note that the whole bunch
-    // of strings may be followed by padding zeros
-    m_arrBoneNameTable.resize(nGeomBones, "");
-
-    // scan through all the strings (strings are zero-terminated)
-    const char* const pNameListEnd = ((const char*)pNameChunk) + pChunkDesc->size;
-    const char* pName = (const char*)(pNameChunk + 1);
-    uint32 numNames = 0;
-    while (*pName && pName < pNameListEnd && numNames < nGeomBones)
-    {
-        m_arrBoneNameTable[numNames] = pName;
-        pName += m_arrBoneNameTable[numNames].size() + 1;
-        numNames++;
-    }
-    if (numNames < nGeomBones)
-    {
-        m_LastError.Format("inconsistent bone name list chunk: only %d out of %d bone names have been read.", numNames, nGeomBones);
-        return false;
-    }
-
-    return true;
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-// loads the root bone (and the hierarchy) and returns true if loaded successfully
-// this gets called only for LOD 0
-/////////////////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadBoneHierarchy(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    if (pChunkDesc->chunkVersion != BONEANIM_CHUNK_DESC_0290::VERSION)
-    {
-        m_LastError.Format("Unknown version of bone hierarchy chunk");
-        return false;
-    }
-
-    CSkinningInfo* pSkinningInfo = m_pCGF->GetSkinningInfo();
-
-    BONEANIM_CHUNK_DESC_0290* pChunk = (BONEANIM_CHUNK_DESC_0290*)(pChunkDesc->data);
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    m_pBoneAnimRawData = 0;
-
-    if (pChunk->nBones <= 0)
-    {
-        m_LastError = "There must be at least one bone.";
-        return false;
-    }
-
-    if (pChunkDesc->size < sizeof(*pChunk) ||
-        pChunk->nBones != (pChunkDesc->size - sizeof(*pChunk)) / sizeof(BONE_ENTITY))
-    {
-        m_LastError = "Corrupted bone hierarchy chunk data.";
-    }
-
-    m_pBoneAnimRawData = pChunk + 1;
-    m_pBoneAnimRawDataEnd = ((const char*)pChunk) + pChunkDesc->size;
-
-    BONE_ENTITY* const pBones = (BONE_ENTITY*)m_pBoneAnimRawData;
-
-    for (int i = 0; i < pChunk->nBones; ++i)
-    {
-        SwapEndian(pBones[i], bSwapEndianness);
-    }
-
-    if (pBones[0].ParentID != -1)
-    {
-        m_LastError = "The first bone in the hierarchy has a parent, but the first none expected to be the root bone.";
-        return false;
-    }
-
-    /*
-    for (int i = 1; i < pChunk->nBones; ++i)
-    {
-    if (pBones[i].ParentID == -1)
-    {
-    m_LastError = "The skeleton has multiple roots. Only single-rooted skeletons are supported in this version.");
-    return false;
-    }
-    }
-    */
-
-    pSkinningInfo->m_arrBonesDesc.resize(pChunk->nBones);
-    CryBoneDescData zeroBone;
-    memset(&zeroBone, 0, sizeof(zeroBone));
-    std::fill(pSkinningInfo->m_arrBonesDesc.begin(), pSkinningInfo->m_arrBonesDesc.end(), zeroBone);
-    m_arrIndexToId.resize(pChunk->nBones, ~0);
-    m_arrIdToIndex.resize(pChunk->nBones, ~0);
-
-    m_nNextBone = 1;
-    assert(m_nNextBone <= pChunk->nBones);
-
-    m_numBones = 0;
-
-    for (int i = 0; i < pChunk->nBones; ++i)
-    {
-        if (pBones[i].ParentID == -1)
-        {
-            const int nRootBoneIndex = i;
-            m_nNextBone = nRootBoneIndex + 1;
-            RecursiveBoneLoader(nRootBoneIndex, nRootBoneIndex);
-        }
-    }
-    assert(pChunk->nBones == m_numBones);
-
-    //-----------------------------------------------------------------------------
-    //---                  read physical information                            ---
-    //-----------------------------------------------------------------------------
-    pSkinningInfo->m_arrBoneEntities.resize(pChunk->nBones);
-
-    int32 test = 0;
-    for (int i = 0; i < pChunk->nBones; ++i)
-    {
-        pSkinningInfo->m_arrBoneEntities[i] = pBones[i];
-        test |= pBones[i].phys.nPhysGeom;
-    }
-    return true;
-}
-
-
-
-
-// loads the whole hierarchy of bones, using the state machine
-// when this function is called, the bone is already allocated
-uint32 CLoaderCGF::RecursiveBoneLoader(int nBoneParentIndex, int nBoneIndex)
-{
-    m_numBones++;
-    CSkinningInfo* pSkinningInfo = m_pCGF->GetSkinningInfo();
-
-    BONE_ENTITY* pEntity = (BONE_ENTITY*)m_pBoneAnimRawData;
-    SwapEndian(*pEntity);
-    m_pBoneAnimRawData = ((uint8*)m_pBoneAnimRawData) + sizeof(BONE_ENTITY);
-
-    // initialize the next bone
-    CryBoneDescData& rBoneDesc = pSkinningInfo->m_arrBonesDesc[nBoneIndex];
-    //read  bone info
-
-    CopyPhysInfo(rBoneDesc.m_PhysInfo[0], pEntity->phys);
-    int nFlags = 0;
-    if (pEntity->prop[0])
-    {
-        nFlags = joint_no_gravity | joint_isolated_accelerations;
-    }
-    else
-    {
-        if (!CryStringUtils::strnstr(pEntity->prop, "gravity", sizeof(pEntity->prop)))
-        {
-            nFlags |= joint_no_gravity;
-        }
-        if (!CryStringUtils::strnstr(pEntity->prop, "active_phys", sizeof(pEntity->prop)))
-        {
-            nFlags |= joint_isolated_accelerations;
-        }
-    }
-    (rBoneDesc.m_PhysInfo[0].flags &= ~(joint_no_gravity | joint_isolated_accelerations)) |= nFlags;
-
-    //get bone info
-    rBoneDesc.m_nControllerID = pEntity->ControllerID;
-
-    // set the mapping entries
-    m_arrIndexToId[nBoneIndex] = pEntity->BoneID;
-    m_arrIdToIndex[pEntity->BoneID] = nBoneIndex;
-
-    rBoneDesc.m_nOffsetParent = nBoneParentIndex - nBoneIndex;
-
-    // load children
-    if (pEntity->nChildren)
-    {
-        int  nChildrenIndexBase = m_nNextBone;
-        m_nNextBone += pEntity->nChildren;
-        if (nChildrenIndexBase < 0)
-        {
-            return 0;
-        }
-        // load the children
-        rBoneDesc.m_numChildren = pEntity->nChildren;
-        rBoneDesc.m_nOffsetChildren = nChildrenIndexBase - nBoneIndex;
-        for (int nChild = 0; nChild < pEntity->nChildren; ++nChild)
-        {
-            if (!RecursiveBoneLoader(nBoneIndex, nChildrenIndexBase + nChild))
-            {
-                return 0;
-            }
-        }
-    }
-    else
-    {
-        rBoneDesc.m_numChildren = 0;
-        rBoneDesc.m_nOffsetChildren = 0;
-    }
-    return m_numBones;
-}
-
-
-namespace
-{
-    struct BoneVertex
-    {
-        Vec3 pos;
-        int matId;
-        int faceIndex;
-        int cornerIndex;
-    };
-
-    struct BoneVertexComparator
-    {
-        bool operator()(const BoneVertex& v0, const BoneVertex& v1) const
-        {
-            int res = memcmp(&v0.pos, &v1.pos, sizeof(v0.pos));
-            // The 'if' block below prevents sharing vertices between faces with different materials.
-            // Note: you can comment the block out to enable sharing and decreases # of resulting
-            // vertices in case of multi-material geometry.
-            if (res == 0)
-            {
-                res = v0.matId - v1.matId;
-            }
-            return res < 0;
-        }
-    };
-}
-
-
-static bool CompactBoneVertices(
-    DynArray<Vec3>& outArrPositions,
-    DynArray<char>& outArrMaterials,
-    DynArray<uint16>& outArrIndices,
-    const int inVertexCount,
-    const CryVertex* const inVertices,
-    const int inFaceCount,
-    const CryFace* const inFaces)
-{
-    outArrPositions.clear();
-    outArrMaterials.clear();
-    outArrIndices.clear();
-
-    DynArray<BoneVertex> verts;
-    verts.reserve(inFaceCount * 3);
-
-    outArrMaterials.reserve(inFaceCount);
-
-    for (int i = 0; i < inFaceCount; ++i)
-    {
-        outArrMaterials.push_back(inFaces[i].MatID);
-
-        for (int j = 0; j < 3; ++j)
-        {
-            const int vIdx = inFaces[i][j];
-            if (vIdx < 0 || vIdx >= inVertexCount)
-            {
-                return false;
-            }
-            BoneVertex v;
-            v.pos = inVertices[vIdx].p;
-            v.matId = inFaces[i].MatID;
-            v.faceIndex = i;
-            v.cornerIndex = j;
-            verts.push_back(v);
-        }
-    }
-
-    std::sort(verts.begin(), verts.end(), BoneVertexComparator());
-
-    outArrPositions.reserve(inVertexCount);   // preallocating by using a good enough guess
-    outArrIndices.resize(3 * inFaceCount, -1);
-
-    int outVertexCount = 0;
-    for (int i = 0; i < verts.size(); ++i)
-    {
-        if (i == 0 || BoneVertexComparator()(verts[i - 1], verts[i]))
-        {
-            outArrPositions.push_back(verts[i].pos);
-            ++outVertexCount;
-            if (outVertexCount > (1 << 16))
-            {
-                return false;
-            }
-        }
-        outArrIndices[verts[i].faceIndex * 3 + verts[i].cornerIndex] = outVertexCount - 1;
-    }
-
-    // Making sure that the code above has no bugs
-    for (int i = 0; i < outArrIndices.size(); ++i)
-    {
-        if (outArrIndices[i] < 0)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadBoneMesh(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    if (pChunkDesc->chunkVersion != MESH_CHUNK_DESC_0745::VERSION &&
-        pChunkDesc->chunkVersion != MESH_CHUNK_DESC_0745::COMPATIBLE_OLD_VERSION)
-    {
-        m_LastError.Format(
-            "Unknown version (0x%x) of BoneMesh chunk. The only supported versions are 0x%x and 0x%x.",
-            (uint)pChunkDesc->chunkVersion,
-            (uint)MESH_CHUNK_DESC_0745::VERSION,
-            (uint)MESH_CHUNK_DESC_0745::COMPATIBLE_OLD_VERSION);
-        return false;
-    }
-
-    if (pChunkDesc->size < sizeof(MESH_CHUNK_DESC_0745))
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Bad chunk size");
-        return false;
-    }
-
-    MESH_CHUNK_DESC_0745* const pMeshChunk = (MESH_CHUNK_DESC_0745*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pMeshChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    if (pMeshChunk->nVerts <= 0)
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Bad vertex count (%d)", pMeshChunk->nVerts);
-        return false;
-    }
-    if (pMeshChunk->nFaces <= 0)
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Bad face count (%d)", pMeshChunk->nFaces);
-        return false;
-    }
-    if (pMeshChunk->nTVerts != 0)
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Texture coordinates found (%d)", pMeshChunk->nTVerts);
-        return false;
-    }
-    if (pMeshChunk->flags1 != 0 || pMeshChunk->flags2 != 0)
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Flags are not 0 (0x%x, 0x%x)", (int)pMeshChunk->flags1, (int)pMeshChunk->flags2);
-        return false;
-    }
-
-    // prepare vertices
-    void* pRawData = pMeshChunk + 1;
-    CryVertex* const pSrcVertices = (CryVertex*)pRawData;
-    SwapEndian(pSrcVertices, pMeshChunk->nVerts, bSwapEndianness);
-    if ((const char*)(pSrcVertices + pMeshChunk->nVerts) > (const char*)pRawData + (pChunkDesc->size - sizeof(*pMeshChunk)))
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Vertex data are truncated");
-        return false;
-    }
-    pRawData = pSrcVertices + pMeshChunk->nVerts;
-
-    // prepare indices and MatIDs
-    CryFace* const pSrcFaces = (CryFace*)pRawData;
-    SwapEndian(pSrcFaces, pMeshChunk->nFaces, bSwapEndianness);
-    if ((const char*)(pSrcFaces + pMeshChunk->nFaces) > (const char*)pRawData + (pChunkDesc->size - sizeof(*pMeshChunk)))
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Vertex data are truncated");
-        return false;
-    }
-
-    PhysicalProxy pbm;
-
-    pbm.ChunkID = pChunkDesc->chunkId;
-
-    // Bone meshes may contain many vertices sharing positions, so we
-    // call CompactBoneVertices() to get vertices with unique positions only
-    if (!CompactBoneVertices(
-        pbm.m_arrPoints,
-        pbm.m_arrMaterials,
-        pbm.m_arrIndices,
-        pMeshChunk->nVerts,
-        pSrcVertices,
-        pMeshChunk->nFaces,
-        pSrcFaces))
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Bad geometry (indices are out range or too many vertices in mesh)");
-        return false;
-    }
-
-    // SS: I have no idea why we used this magic number of vertices (60000). I just keep it as is.
-    if (pbm.m_arrPoints.size() > 60000)
-    {
-        m_LastError.Format("CLoaderCGF::ReadBoneMesh: Bad vertex count (%d)", pbm.m_arrPoints.size());
-        return false;
-    }
-
-    for (int i = 0, n = pbm.m_arrPoints.size(); i < n; ++i)
-    {
-        pbm.m_arrPoints[i] *= VERTEX_SCALE;
-    }
-
-    CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-    pSkinningInfo->m_arrPhyBoneMeshes.push_back(pbm);
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledBones(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    COMPILED_BONE_CHUNK_DESC_0800* const pBIPChunk = (COMPILED_BONE_CHUNK_DESC_0800*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pBIPChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    if (pChunkDesc->chunkVersion == pBIPChunk->VERSION)
-    {
-        CryBoneDescData_Comp* const pSrcVertices = (CryBoneDescData_Comp*)(pBIPChunk + 1);
-        const uint32 nDataSize = pChunkDesc->size - sizeof(COMPILED_BONE_CHUNK_DESC_0800);
-        const uint32 numBones = nDataSize / sizeof(CryBoneDescData_Comp);
-        CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-        pSkinningInfo->m_arrBonesDesc.resize(numBones);
-        SwapEndian(pSrcVertices, (size_t)numBones, bSwapEndianness);
-
-        for (uint32 i = 0; i < numBones; i++)
-        {
-            pSkinningInfo->m_arrBonesDesc[i].m_nControllerID = pSrcVertices[i].m_nControllerID;
-            memcpy(
-                &pSkinningInfo->m_arrBonesDesc[i].m_fMass,
-                &pSrcVertices[i].m_fMass,
-                (INT_PTR)&pSrcVertices[i + 1] - (INT_PTR)&pSrcVertices[i].m_fMass);
-            for (uint32 j = 0; j < 2; j++)
-            {
-                pSkinningInfo->m_arrBonesDesc[i].m_PhysInfo[j].pPhysGeom = (phys_geometry*)(INT_PTR)pSrcVertices[i].m_PhysInfo[j].nPhysGeom;
-                memcpy(
-                    &pSkinningInfo->m_arrBonesDesc[i].m_PhysInfo[j].flags,
-                    &pSrcVertices[i].m_PhysInfo[j].flags,
-                    (INT_PTR)&pSrcVertices[i].m_PhysInfo[j + 1] - (INT_PTR)&pSrcVertices[i].m_PhysInfo[j].flags);
-            }
-        }
-
-        m_CompiledBones = true;
-        return true;
-    }
-
-    m_LastError.Format("Unknown version of compiled bone chunk");
-    return false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledPhysicalBones(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    COMPILED_PHYSICALBONE_CHUNK_DESC_0800* const pChunk = (COMPILED_PHYSICALBONE_CHUNK_DESC_0800*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    if (pChunkDesc->chunkVersion == pChunk->VERSION)
-    {
-        BONE_ENTITY* pSrcVertices = (BONE_ENTITY*)(pChunk + 1);
-        const uint32 nDataSize = pChunkDesc->size - sizeof(COMPILED_PHYSICALBONE_CHUNK_DESC_0800);
-        const uint32 numBones = nDataSize / sizeof(BONE_ENTITY);
-        CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-        pSkinningInfo->m_arrBoneEntities.resize(numBones);
-        SwapEndian(pSrcVertices, (size_t)numBones, bSwapEndianness);
-        for (uint32 i = 0; i < numBones; i++)
-        {
-            pSkinningInfo->m_arrBoneEntities[i] = pSrcVertices[i];
-        }
-
-        m_CompiledBones = true;
-        return true;
-    }
-
-    m_LastError.Format("Unknown version of compiled physical bone chunk");
-    return false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledPhysicalProxies(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    CSkinningInfo* pSkinningInfo = m_pCGF->GetSkinningInfo();
-    COMPILED_PHYSICALPROXY_CHUNK_DESC_0800* const pIMTChunk = (COMPILED_PHYSICALPROXY_CHUNK_DESC_0800*)pChunkDesc->data;
-
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pIMTChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    if (pIMTChunk->numPhysicalProxies > 0xffff)
-    {
-        // Fixing bug of old format: numPhysicalProxies was stored in little-endian
-        // format when chunk header had 'big-endian' flag set.
-        SwapEndianBase(&pIMTChunk->numPhysicalProxies, 1);
-    }
-
-    if (pChunkDesc->chunkVersion == pIMTChunk->VERSION)
-    {
-        PhysicalProxy sm;
-        const uint8* rawdata = (const uint8*)(pIMTChunk + 1);
-        const uint32 numPhysicalProxies = pIMTChunk->numPhysicalProxies;
-
-        for (uint32 i = 0; i < numPhysicalProxies; i++)
-        {
-            SMeshPhysicalProxyHeader* header = (SMeshPhysicalProxyHeader*)rawdata;
-            rawdata += sizeof(SMeshPhysicalProxyHeader);
-
-            SwapEndian(*header, bSwapEndianness);
-
-            sm.ChunkID = header->ChunkID;
-            if (sm.ChunkID > 0xFFFF)
-            {
-                SwapEndian(sm.ChunkID, true);
-            }
-
-            //store the vertices
-            COMPILE_TIME_ASSERT(sizeof(sm.m_arrPoints[0]) == sizeof(Vec3));
-            SwapEndian((Vec3*)rawdata, (size_t)header->numPoints, bSwapEndianness);
-            sm.m_arrPoints.resize(header->numPoints);
-            memcpy(sm.m_arrPoints.begin(), rawdata, sizeof(sm.m_arrPoints[0]) * header->numPoints);
-            rawdata += sizeof(sm.m_arrPoints[0]) * header->numPoints;
-
-            //store the indices
-            COMPILE_TIME_ASSERT(sizeof(sm.m_arrIndices[0]) == sizeof(uint16));
-            SwapEndian((uint16*)rawdata, (size_t)header->numIndices, bSwapEndianness);
-            sm.m_arrIndices.resize(header->numIndices);
-            memcpy(sm.m_arrIndices.begin(), rawdata, sizeof(sm.m_arrIndices[0]) * header->numIndices);
-            rawdata += sizeof(sm.m_arrIndices[0]) * header->numIndices;
-
-            //store the materials
-            COMPILE_TIME_ASSERT(sizeof(sm.m_arrMaterials[0]) == sizeof(uint8));
-            SwapEndian((uint8*)rawdata, (size_t)header->numMaterials, bSwapEndianness);
-            sm.m_arrMaterials.resize(header->numMaterials);
-            memcpy(sm.m_arrMaterials.begin(), rawdata, sizeof(sm.m_arrMaterials[0]) * header->numMaterials);
-            rawdata += sizeof(sm.m_arrMaterials[0]) * header->numMaterials;
-
-            pSkinningInfo->m_arrPhyBoneMeshes.push_back(sm);
-        }
-        return true;
-    }
-
-    m_LastError.Format("Unknown version of compiled physical proxies chunk");
-    return false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledMorphTargets(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    // Note that this chunk type often contains non-aligned data. Because of that
-    // we use chunk's data only after memcpy()'ing them.
-
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-
-    COMPILED_MORPHTARGETS_CHUNK_DESC_0800 chunk;
-    memcpy(&chunk, pChunkDesc->data, sizeof(chunk));
-    SwapEndian(chunk, bSwapEndianness);
-
-    const uint8* rawdata = ((const uint8*)pChunkDesc->data) + sizeof(chunk);
-
-    if (pChunkDesc->chunkVersion == chunk.VERSION || pChunkDesc->chunkVersion == chunk.VERSION1)
-    {
-        CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-        if (pChunkDesc->chunkVersion == chunk.VERSION1)
-        {
-            pSkinningInfo->m_bRotatedMorphTargets = true;
-        }
-
-
-        for (uint32 i = 0; i < chunk.numMorphTargets; ++i)
-        {
-            MorphTargetsPtr pSm = new MorphTargets;
-
-            SMeshMorphTargetHeader header;
-
-            memcpy(&header, rawdata, sizeof(header));
-            SwapEndian(header, bSwapEndianness);
-            rawdata += sizeof(header);
-
-            pSm->MeshID = header.MeshID;
-
-            pSm->m_strName = string((const char*)rawdata);
-            rawdata += header.NameLength;
-
-            // store the internal vertices&indices of morph-target
-            COMPILE_TIME_ASSERT(sizeof(pSm->m_arrIntMorph[0]) == sizeof(SMeshMorphTargetVertex));
-            pSm->m_arrIntMorph.resize(header.numIntVertices);
-            size_t size = sizeof(pSm->m_arrIntMorph[0]) * header.numIntVertices;
-            if (size > 0)
-            {
-                memcpy(pSm->m_arrIntMorph.begin(), rawdata, size);
-                SwapEndian(pSm->m_arrIntMorph.begin(), (size_t)header.numIntVertices, bSwapEndianness);
-                rawdata += size;
-            }
-
-            // store the external vertices&indices of morph-target
-            COMPILE_TIME_ASSERT(sizeof(pSm->m_arrExtMorph[0]) == sizeof(SMeshMorphTargetVertex));
-            pSm->m_arrExtMorph.resize(header.numExtVertices);
-            size = sizeof(pSm->m_arrExtMorph[0]) * header.numExtVertices;
-            if (size > 0)
-            {
-                memcpy(pSm->m_arrExtMorph.begin(), rawdata, size);
-                SwapEndian(pSm->m_arrExtMorph.begin(), (size_t)header.numExtVertices, bSwapEndianness);
-                rawdata += size;
-            }
-
-            pSkinningInfo->m_arrMorphTargets.push_back(pSm);
-        }
-        return true;
-    }
-
-    m_LastError.Format("Unknown version of compiled morph targets chunk");
-    return false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledIntFaces(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    pChunkDesc->bSwapEndian = false;
-
-    if (pChunkDesc->chunkVersion == COMPILED_INTFACES_CHUNK_DESC_0800::VERSION)
-    {
-        TFace* const pSrc = (TFace*)pChunkDesc->data;
-        const uint32 numIntFaces = pChunkDesc->size / sizeof(pSrc[0]);
-        CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-        pSkinningInfo->m_arrIntFaces.resize(numIntFaces);
-        SwapEndian(pSrc, (size_t)numIntFaces, bSwapEndianness);
-        for (uint32 i = 0; i < numIntFaces; ++i)
-        {
-            pSkinningInfo->m_arrIntFaces[i] = pSrc[i];
-        }
-        m_CompiledMesh |= 2;
-        return true;
-    }
-
-    m_LastError.Format("Unknown version of compiled int faces chunk");
-    return false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledIntSkinVertice(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    COMPILED_INTSKINVERTICES_CHUNK_DESC_0800* const pBIPChunk = (COMPILED_INTSKINVERTICES_CHUNK_DESC_0800*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pBIPChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    if (pChunkDesc->chunkVersion == pBIPChunk->VERSION)
-    {
-        IntSkinVertex* const pSrcVertices = (IntSkinVertex*)(pBIPChunk + 1);
-        const uint32 nDataSize = pChunkDesc->size - sizeof(COMPILED_INTSKINVERTICES_CHUNK_DESC_0800);
-        const uint32 numIntVertices = nDataSize / sizeof(pSrcVertices[0]);
-        CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-        pSkinningInfo->m_arrIntVertices.resize(numIntVertices);
-        SwapEndian(pSrcVertices, (size_t)numIntVertices, bSwapEndianness);
-        for (uint32 i = 0; i < numIntVertices; ++i)
-        {
-            pSkinningInfo->m_arrIntVertices[i] = pSrcVertices[i];
-        }
-        m_CompiledMesh |= 1;
-        return true;
-    }
-
-    m_LastError.Format("Unknown version of compiled skin vertices chunk");
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledBonesBoxes(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    pChunkDesc->bSwapEndian = false;
-
-    if (pChunkDesc->chunkVersion == COMPILED_BONEBOXES_CHUNK_DESC_0800::VERSION ||
-        pChunkDesc->chunkVersion == COMPILED_BONEBOXES_CHUNK_DESC_0800::VERSION1)
-    {
-        CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-
-        if (pChunkDesc->chunkVersion == COMPILED_BONEBOXES_CHUNK_DESC_0800::VERSION1)
-        {
-            pSkinningInfo->m_bProperBBoxes = false;
-            if (pSkinningInfo->m_arrCollisions.empty())
-            {
-                pSkinningInfo->m_bProperBBoxes = true;
-            }
-            else
-            {
-                // CHECK FOR AT LEAST 1 EMPTY
-                for (int n = 0; n < pSkinningInfo->m_arrCollisions.size(); ++n)
-                {
-                    const bool bValid = !pSkinningInfo->m_arrCollisions[n].m_aABB.IsReset();
-                    if (bValid)
-                    {
-                        pSkinningInfo->m_bProperBBoxes = true;
-                        break;
-                    }
-                }
-            }
-
-            /* Ivo: this warning is not needed. It happens always if a character has no physics-proxy, and many simple characters don't have one
-            if (!pSkinningInfo->m_bProperBBoxes)
-            {
-            CryWarning(VALIDATOR_MODULE_3DENGINE,VALIDATOR_WARNING,"%s: Invalid bones bounds", m_filename);
-            }*/
-
-            pSkinningInfo->m_bProperBBoxes = false;
-        }
-
-        char* pSrc = (char*)pChunkDesc->data;
-
-        pSkinningInfo->m_arrCollisions.push_back(MeshCollisionInfo());
-        MeshCollisionInfo& info = pSkinningInfo->m_arrCollisions[pSkinningInfo->m_arrCollisions.size() - 1];
-
-        COMPILE_TIME_ASSERT(sizeof(info.m_iBoneId) == sizeof(int32));
-        SwapEndian((int32*)pSrc, 1, bSwapEndianness);
-        memcpy(&info.m_iBoneId, pSrc, sizeof(info.m_iBoneId));
-        pSrc += sizeof(info.m_iBoneId);
-
-        COMPILE_TIME_ASSERT(sizeof(info.m_aABB) == sizeof(AABB));
-        SwapEndian((AABB*)pSrc, 1, bSwapEndianness);
-        memcpy(&info.m_aABB, pSrc, sizeof(info.m_aABB));
-        pSrc += sizeof(info.m_aABB);
-
-        int32 size;
-        COMPILE_TIME_ASSERT(sizeof(size) == sizeof(int32));
-        SwapEndian((int32*)pSrc, 1, bSwapEndianness);
-        memcpy(&size, pSrc, sizeof(size));
-        pSrc += sizeof(size);
-
-        if (size > 0)
-        {
-            COMPILE_TIME_ASSERT(sizeof(info.m_arrIndexes[0]) == sizeof(int16));
-            SwapEndian((int16*)pSrc, size, bSwapEndianness);
-            info.m_arrIndexes.resize(size);
-            memcpy(info.m_arrIndexes.begin(), pSrc, size * sizeof(info.m_arrIndexes[0]));
-        }
-
-        m_CompiledBonesBoxes = true;
-        return true;
-    }
-
-    m_LastError.Format("Unknown version of compiled bone boxes chunk");
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledExt2IntMap(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    pChunkDesc->bSwapEndian = false;
-
-    if (pChunkDesc->chunkVersion == COMPILED_EXT2INTMAP_CHUNK_DESC_0800::VERSION)
-    {
-        uint16* const pSrc = (uint16*)pChunkDesc->data;
-        const uint32 numExtVertices = pChunkDesc->size / sizeof(pSrc[0]);
-        CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-        pSkinningInfo->m_arrExt2IntMap.resize(numExtVertices);
-        SwapEndian(pSrc, (size_t)numExtVertices, bSwapEndianness);
-        for (uint32 i = 0; i < numExtVertices; ++i)
-        {
-            assert(pSrc[i] != 0xffff);
-            pSkinningInfo->m_arrExt2IntMap[i] = pSrc[i];
-        }
-        m_CompiledMesh |= 4;
-        return true;
-    }
-    m_LastError.Format("Unknown version of compiled Ext2Int map chunk");
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::ReadCompiledBreakablePhysics(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (pChunkDesc->chunkVersion != BREAKABLE_PHYSICS_CHUNK_DESC::VERSION)
-    {
-        m_LastError.Format("Unknown version of breakable physics chunk");
-        return false;
-    }
-
-    BREAKABLE_PHYSICS_CHUNK_DESC* const pChunk = (BREAKABLE_PHYSICS_CHUNK_DESC*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(*pChunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    CPhysicalizeInfoCGF* const pPi = m_pCGF->GetPhysicalizeInfo();
-
-    pPi->nGranularity = pChunk->granularity;
-    pPi->nMode = pChunk->nMode;
-    pPi->nRetVtx = pChunk->nRetVtx;
-    pPi->nRetTets = pChunk->nRetTets;
-    if (pPi->nRetVtx > 0)
-    {
-        char* pData = ((char*)pChunk) + sizeof(BREAKABLE_PHYSICS_CHUNK_DESC);
-        SwapEndian((Vec3*)pData, pPi->nRetVtx, bSwapEndianness);
-        memcpy(pPi->pRetVtx, pData, pPi->nRetVtx * sizeof(Vec3));
-    }
-    if (pPi->nRetTets > 0)
-    {
-        char* pData = ((char*)pChunk) + sizeof(BREAKABLE_PHYSICS_CHUNK_DESC) + pPi->nRetVtx * sizeof(Vec3);
-        SwapEndian((int*)pData, pPi->nRetTets * 4, bSwapEndianness);
-        memcpy(pPi->pRetTets, pData, pPi->nRetTets * sizeof(int) * 4);
-    }
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(RESOURCE_COMPILER)
-
-namespace ProcessSkinningHelpers
-{
-    struct RBatch
-    {
-        uint32 startFace;
-        uint32 numFaces;
-        uint32 MaterialID;
-    };
-
-    bool SplitIntoRBatches(
-        std::vector<SMeshSubset>& arrSubsets,
-        std::vector<TFace>& arrExtFaces,
-        string& lastError,
-        const CMesh* const pMesh)
-    {
-        arrSubsets.clear();
-        arrExtFaces.clear();
-
-        const int numSubsets = pMesh->m_subsets.size();
-
-        //--------------------------------------------------------------------------
-        //---         sort render-batches for hardware skinning                  ---
-        //--------------------------------------------------------------------------
-
-        std::vector<RBatch> arrBatches;
-        for (uint32 m = 0; m < numSubsets; m++)
-        {
-            const int numFacesTotal = pMesh->GetIndexCount() / 3;
-            const int firstFace = pMesh->m_subsets[m].nFirstIndexId / 3;
-            const int numFaces = pMesh->m_subsets[m].nNumIndices / 3;
-            if (firstFace >= numFacesTotal)
-            {
-                lastError.Format("Wrong first face id index (%i out of %i)", (int)firstFace, (int)numFacesTotal);
-                return false;
-            }
-            if (numFaces <= 0 || firstFace + numFaces > numFacesTotal)
-            {
-                lastError.Format("Bad # of faces (%i)", (int)numFaces);
-                return false;
-            }
-
-            {
-                RBatch rbatch;
-                rbatch.MaterialID = pMesh->m_subsets[m].nMatID;
-                rbatch.startFace = arrExtFaces.size();
-                rbatch.numFaces = numFaces;
-
-                arrBatches.push_back(rbatch);
-            }
-
-            vtx_idx* const pIndices = &pMesh->m_pIndices[firstFace * 3];
-
-            for (int i = 0; i < numFaces * 3; i += 3)
-            {
-                arrExtFaces.push_back(TFace(pIndices[i + 0], pIndices[i + 1], pIndices[i + 2]));
-            }
-        }
-
-        //-------------------------------------------------------------------------
-        //---                 check if material batches overlap                 ---
-        //-------------------------------------------------------------------------
-        {
-            for (uint32 m = 0; m < numSubsets; m++)
-            {
-                uint32 vmin = 0xffffffff;
-                uint32 vmax = 0x00000000;
-
-                uint32 nFirstFaceId = pMesh->m_subsets[m].nFirstIndexId / 3;
-                uint32 numFaces = pMesh->m_subsets[m].nNumIndices / 3;
-                for (uint32 f = 0; f < numFaces; f++)
-                {
-                    uint32 i0 = arrExtFaces[nFirstFaceId + f].i0;
-                    uint32 i1 = arrExtFaces[nFirstFaceId + f].i1;
-                    uint32 i2 = arrExtFaces[nFirstFaceId + f].i2;
-                    if (vmin > i0)
-                    {
-                        vmin = i0;
-                    }
-                    if (vmin > i1)
-                    {
-                        vmin = i1;
-                    }
-                    if (vmin > i2)
-                    {
-                        vmin = i2;
-                    }
-                    if (vmax < i0)
-                    {
-                        vmax = i0;
-                    }
-                    if (vmax < i1)
-                    {
-                        vmax = i1;
-                    }
-                    if (vmax < i2)
-                    {
-                        vmax = i2;
-                    }
-                }
-                if (pMesh->m_subsets[m].nFirstVertId != vmin ||
-                    pMesh->m_subsets[m].nNumVerts != vmax - vmin + 1)
-                {
-                    lastError = "Overlapping material batches";
-                    return false;
-                }
-            }
-
-            for (uint32 a = 0; a < numSubsets; a++)
-            {
-                for (uint32 b = 0; b < numSubsets; b++)
-                {
-                    if (a == b)
-                    {
-                        continue;
-                    }
-                    uint32 amin = pMesh->m_subsets[a].nFirstVertId;
-                    uint32 amax = pMesh->m_subsets[a].nNumVerts + amin - 1;
-                    uint32 bmin = pMesh->m_subsets[b].nFirstVertId;
-                    uint32 bmax = pMesh->m_subsets[b].nNumVerts + bmin - 1;
-                    if (amax >= bmin && amin <= bmax)
-                    {
-                        lastError = "Overlapping material batches";
-                        return false;
-                    }
-                }
-            }
-        }
-
-        arrSubsets.resize(arrBatches.size());     //subsets of the mesh as they appear in video-mem
-        for (uint32 m = 0; m < arrBatches.size(); m++)
-        {
-            uint32 mat = arrBatches[m].MaterialID;
-            //  assert(mat<testcheck);
-            uint32 r = 0;
-            bool found = false;
-            const uint32 numSubsets2 = pMesh->m_subsets.size();
-            for (r = 0; r < numSubsets2; r++)
-            {
-                if (mat == pMesh->m_subsets[r].nMatID)
-                {
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found)
-            {
-                lastError.Format("Mesh subset for material %i was not found.", (int)mat);
-                return false;
-            }
-
-            arrSubsets[m] = pMesh->m_subsets[r];
-            arrSubsets[m].nMatID = arrBatches[m].MaterialID;
-            arrSubsets[m].nFirstIndexId = arrBatches[m].startFace * 3;
-            arrSubsets[m].nNumIndices = arrBatches[m].numFaces * 3;
-
-            //Make sure the all vertices are in range if indices. This is important for ATI-kards
-            uint32 sml_index = 0xffffffff;
-            uint32 big_index = 0x00000000;
-            uint32 sface = arrBatches[m].startFace;
-            uint32 eface = arrBatches[m].numFaces + sface;
-            for (uint32 i = sface; i < eface; i++)
-            {
-                uint32 i0 = arrExtFaces[i].i0;
-                uint32 i1 = arrExtFaces[i].i1;
-                uint32 i2 = arrExtFaces[i].i2;
-                if (sml_index > i0)
-                {
-                    sml_index = i0;
-                }
-                if (sml_index > i1)
-                {
-                    sml_index = i1;
-                }
-                if (sml_index > i2)
-                {
-                    sml_index = i2;
-                }
-                if (big_index < i0)
-                {
-                    big_index = i0;
-                }
-                if (big_index < i1)
-                {
-                    big_index = i1;
-                }
-                if (big_index < i2)
-                {
-                    big_index = i2;
-                }
-            }
-            arrSubsets[m].nFirstVertId = sml_index;
-            arrSubsets[m].nNumVerts = big_index - sml_index + 1;
-        }
-
-        return true;
-    }
-}
-#endif
-
-
-bool CLoaderCGF::ProcessSkinning()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    CSkinningInfo* const pSkinningInfo = m_pCGF->GetSkinningInfo();
-
-    const uint32 numBones = pSkinningInfo->m_arrBonesDesc.size();
-
-    //do we have an initialized skeleton?
-    if (numBones == 0)
-    {
-        return true;
-    }
-
-    if (numBones > MAX_NUMBER_OF_BONES)
-    {
-        m_LastError.Format("Too many bones: %i. Reached limit of %i bones.", int(numBones), int(MAX_NUMBER_OF_BONES));
-        return false;
-    }
-
-#if !defined(RESOURCE_COMPILER)
-
-    if (m_CompiledMesh != 7 && m_CompiledBones != 1)
-    {
-        CryFatalError("%s tried to load a noncompiled mesh: %s", __FUNCTION__, m_filename);
-        m_LastError.Format("noncompiled mesh");
-        return false;
-    }
-    return true;
-
-#else
-    using namespace ProcessSkinningHelpers;
-
-    if (m_CompiledBones == 0)
-    {
-        //process raw bone-data
-        assert(m_numBonenameList < 2);
-        assert(m_numBoneInitialPos < 2);
-        assert(m_numBoneHierarchy < 2);
-
-        const uint32 numIPos = m_arrInitPose34.size();
-        if (numBones != numIPos)
-        {
-            m_LastError.Format("Skeleton-Initial-Positions are missing.");
-            return false;
-        }
-
-        const uint32 numBonenames = m_arrBoneNameTable.size();
-        if (numBones != numBonenames)
-        {
-            m_LastError.Format("Number of bones does not match in the bone hierarchy chunk (%d) and the bone name chunk (%d)", numBones, numBonenames);
-            return false;
-        }
-
-        //------------------------------------------------------------------------------------------
-        //----     use the old chunks to initialize the bone structure  ----------------------------
-        //------------------------------------------------------------------------------------------
-        static const char* const arrLimbNames[] =
-        {
-            "L UpperArm",
-            "R UpperArm",
-            "L Thigh",
-            "R Thigh"
-        };
-        static const int limbNamesCount = sizeof(arrLimbNames) / sizeof(arrLimbNames[0]);
-        const uint32 numBonesDesc = pSkinningInfo->m_arrBonesDesc.size();
-        for (uint32 nBone = 0; nBone < numBonesDesc; ++nBone)
-        {
-            uint32 nBoneID = m_arrIndexToId[nBone];
-            if (nBoneID == ~0)
-            {
-                continue;
-            }
-
-            pSkinningInfo->m_arrBonesDesc[nBone].m_DefaultW2B = m_arrInitPose34[nBoneID].GetInvertedFast();
-            pSkinningInfo->m_arrBonesDesc[nBone].m_DefaultB2W = m_arrInitPose34[nBoneID];
-
-            memset(pSkinningInfo->m_arrBonesDesc[nBone].m_arrBoneName, 0, sizeof(pSkinningInfo->m_arrBonesDesc[nBone].m_arrBoneName));
-            azstrcpy(pSkinningInfo->m_arrBonesDesc[nBone].m_arrBoneName, sizeof(pSkinningInfo->m_arrBonesDesc[nBone].m_arrBoneName), m_arrBoneNameTable[nBoneID].c_str());
-
-            //fill in names of the bones and the limb IDs              ---
-            uint32 nBoneId = m_arrIndexToId[nBone];
-            pSkinningInfo->m_arrBonesDesc[nBone].m_nLimbId = -1;
-            for (int j = 0; j < limbNamesCount; ++j)
-            {
-                if (strstr(m_arrBoneNameTable[nBoneId], arrLimbNames[j]))
-                {
-                    pSkinningInfo->m_arrBonesDesc[nBone].m_nLimbId = j;
-                    break;
-                }
-            }
-        }
-    }
-
-    if (m_CompiledMesh != 0 && m_CompiledMesh != 7)
-    {
-        m_LastError.Format("Found mix of new and old chunks");
-        return false;
-    }
-
-    if (m_CompiledMesh)
-    {
-        return true;
-    }
-
-    //------------------------------------------------------------------------------------------
-    //----     get the mesh    -----------------------------------------------------------------
-    //------------------------------------------------------------------------------------------
-
-    CNodeCGF* pNode = 0;
-    for (int i = 0; i < m_pCGF->GetNodeCount(); ++i)
-    {
-        if (m_pCGF->GetNode(i)->type == CNodeCGF::NODE_MESH && m_pCGF->GetNode(i)->pMesh)
-        {
-            pNode = m_pCGF->GetNode(i);
-            break;
-        }
-    }
-    if (!pNode)
-    {
-        return true;
-    }
-
-    CMesh* const pMesh = pNode->pMesh;
-
-    if (!pMesh)
-    {
-        m_LastError = "No mesh found";
-        return false;
-    }
-
-    if (pMesh->m_pPositionsF16)
-    {
-        m_LastError.Format("Unexpected format of vertex positions: f16");
-        return false;
-    }
-
-    const uint32 numIntVertices = pMesh->GetVertexCount();
-
-    /* -----------------------------------------------------------------------------
-    // NOTE: Related to commented out code below!
-    // Color0 is copied into two distinct streams in the Engine:
-    // as Color in the Base stream and as indices in the Shape
-    // Deformation stream. The latter needs for the values to be
-    // snapped while the former doesn't.
-    // Snapping used to happen here at compiling/loading time, however
-    // this will destroy the Color information that might be needed in
-    // the Base stream.
-    // We are now snapping the values when copying this data into the
-    // Shape Deformation stream, while leaving the data copied in the
-    // Base stream untouched. A properer solution would be to create an
-    // additional chunk in the file and completely decouple the two
-    // datasets.
-
-    if (pMesh->m_pColor0)
-    {
-        //-----------------------------------------------------------------
-        //--- do a color-snap on all vcolors and calculate index        ---
-        //-----------------------------------------------------------------
-        for (uint32 i=0; i<numIntVertices; ++i)
-        {
-            pMesh->m_pColor0[i].r = (pMesh->m_pColor0[i].r>0x80) ? 0xff : 0x00;
-            pMesh->m_pColor0[i].g = (pMesh->m_pColor0[i].g>0x80) ? 0xff : 0x00;
-            pMesh->m_pColor0[i].b = (pMesh->m_pColor0[i].b>0x80) ? 0xff : 0x00;
-            pMesh->m_pColor0[i].a = 0;
-            //calculate the index (this is the only value we need in the vertex-shader)
-            if (pMesh->m_pColor0[i].r) pMesh->m_pColor0[i].a|=1;
-            if (pMesh->m_pColor0[i].g) pMesh->m_pColor0[i].a|=2;
-            if (pMesh->m_pColor0[i].b) pMesh->m_pColor0[i].a|=4;
-        }
-    }
-    ----------------------------------------------------------------------------- */
-
-    //--------------------------------------------------------------
-    //---        copy the links into geometry info               ---
-    //--------------------------------------------------------------
-    {
-        const uint32 numLinks = m_arrLinksTmp.size();
-        if (numIntVertices != numLinks)
-        {
-            m_LastError.Format("Different number of vertices (%i) and vertex links (%i)", (int)numIntVertices, (int)numLinks);
-            return false;
-        }
-        assert(!m_arrIdToIndex.empty());
-
-        for (uint32 i = 0; i < numIntVertices; ++i)
-        {
-            MeshUtils::VertexLinks& links = m_arrLinksTmp[i];
-
-            for (int j = 0; j < (int)links.links.size(); ++j)
-            {
-                MeshUtils::VertexLinks::Link& cl = links.links[j];
-                if (cl.boneId >= 0 && cl.boneId < (int)m_arrIdToIndex.size())
-                {
-                    cl.boneId = m_arrIdToIndex[cl.boneId];
-                }
-                else
-                {
-                    // bone index is out of range
-                    // if you get this assert, most probably there is desynchronization between different LODs of the same model
-                    // - all of them must be exported with exactly the same skeletons.
-                    assert(0);
-                    cl.boneId = 0;
-                }
-            }
-
-            const char* const err = links.Normalize(MeshUtils::VertexLinks::eSort_ByWeight, 0.0f, (int)links.links.size());
-            if (err)
-            {
-                m_LastError.Format("Internal error in skin compiler: %s", err);
-                return false;
-            }
-
-            // Paranoid checks
-            {
-                float w = 0;
-                for (int j = 0; j < (int)links.links.size(); ++j)
-                {
-                    w += links.links[j].weight;
-                }
-                if (fabsf(w - 1.0f) > 0.005f)
-                {
-                    m_LastError.Format("Internal error in skin compiler: %s", "sum of weights is not 1.0");
-                    return false;
-                }
-
-                for (int j = 1; j < (int)links.links.size(); ++j)
-                {
-                    if (links.links[j - 1].weight < links.links[j].weight)
-                    {
-                        m_LastError.Format("Internal error in skin compiler: %s", "links are not sorted by weight");
-                        return false;
-                    }
-                }
-            }
-        }
-    }
-
-    //---------------------------------------------------------------------
-    // create internal SkinBuffer
-    //---------------------------------------------------------------------
-    bool bHasExtraBoneMappings = false;
-    pSkinningInfo->m_arrIntVertices.resize(numIntVertices);
-    for (uint32 nVert = 0; nVert < numIntVertices; ++nVert)
-    {
-        const MeshUtils::VertexLinks& rLinks_base = m_arrLinksTmp[nVert];
-
-        const int numVertexLinks = (int)rLinks_base.links.size();
-        assert(numVertexLinks > 0 && numVertexLinks <= 8);
-
-        bHasExtraBoneMappings = bHasExtraBoneMappings || numVertexLinks > 4;
-
-        IntSkinVertex v;
-
-        if (pMesh->m_pColor0)
-        {
-            v.color = pMesh->m_pColor0[nVert].GetRGBA();
-        }
-        else
-        {
-            v.color = ColorB(0xff, 0xff, 0xff, 1 | 2 | 4);
-        }
-
-        v.__obsolete0 = Vec3(ZERO);
-        v.__obsolete2 = Vec3(ZERO);
-
-        const int n = std::min(numVertexLinks, (int)ARRAY_LENGTH(v.weights));
-        for (int j = 0; j < n; ++j)
-        {
-            v.boneIDs[j] = rLinks_base.links[j].boneId;
-            v.weights[j] = rLinks_base.links[j].weight;
-        }
-        for (int j = n; j < ARRAY_LENGTH(v.weights); ++j)
-        {
-            v.boneIDs[j] = 0;
-            v.weights[j] = 0;
-        }
-
-        // transform position from bone-space to world-space
-        v.pos = Vec3(ZERO);
-        for (int j = 0; j < numVertexLinks; ++j)
-        {
-            v.pos +=
-                pSkinningInfo->m_arrBonesDesc[rLinks_base.links[j].boneId].m_DefaultB2W *
-                rLinks_base.links[j].offset *
-                rLinks_base.links[j].weight;
-        }
-
-        pSkinningInfo->m_arrIntVertices[nVert] = v;
-    }
-
-    //--------------------------------------------------------------------------
-    // sort faces by subsets
-    //--------------------------------------------------------------------------
-    // for each subset, construct an array of faces and keep the faces (in the original order) in there
-    typedef std::map<uint8, std::vector<TFace> > SubsetFacesMap;
-    SubsetFacesMap mapSubsetFaces;
-
-    if (numIntVertices > (1 << 16))
-    {
-        m_LastError.Format("Too many vertices in skin geometry: %i (max possible is %i)", numIntVertices, (1 << 16));
-        return false;
-    }
-
-    // put each face into its subset group;
-    // the corresponding groups will be created by the map automatically
-    // upon the first request of that group
-    const uint32 numIntFaces = pMesh->GetFaceCount();
-
-    for (uint32 i = 0; i < numIntFaces; ++i)
-    {
-        const int subsetIdx = pMesh->m_pFaces[i].nSubset;
-        if (subsetIdx < 0 || subsetIdx > pMesh->m_subsets.size())
-        {
-            m_LastError.Format("Invalid subset index detected: %i (# of subsets: %i)", subsetIdx, (int)pMesh->m_subsets.size());
-            return false;
-        }
-        if (pMesh->m_subsets[subsetIdx].nMatID >= MAX_SUB_MATERIALS)
-        {
-            m_LastError.Format("Maximum number of submaterials reached (%i)", (int)MAX_SUB_MATERIALS);
-            return false;
-        }
-
-        int vIdx[3];
-        for (int j = 0; j < 3; ++j)
-        {
-            vIdx[j] = pMesh->m_pFaces[i].v[j];
-            if (vIdx[j] < 0)
-            {
-                m_LastError.Format("Internal vertex index %i is negative (# of vertices is %i)", vIdx[j], numIntVertices);
-                return false;
-            }
-            if (vIdx[j] >= numIntVertices)
-            {
-                m_LastError.Format("Internal vertex index %i is out of range (# of vertices is %i)", vIdx[j], numIntVertices);
-                return false;
-            }
-        }
-        mapSubsetFaces[subsetIdx].push_back(TFace(vIdx[0], vIdx[1], vIdx[2]));
-    }
-
-    if (pMesh->GetSubSetCount() != mapSubsetFaces.size())
-    {
-        m_LastError.Format("Number of referenced subsets (%d) is not equal to number of stored subsets (%i)", (int)mapSubsetFaces.size(), pMesh->GetSubSetCount());
-        return false;
-    }
-
-    //--------------------------------------------------------------------------
-    // create array with internal faces (sorted by subsets)
-    //--------------------------------------------------------------------------
-    {
-        pSkinningInfo->m_arrIntFaces.resize(numIntFaces);
-
-        int newFaceCount = 0;
-        for (SubsetFacesMap::iterator itMtl = mapSubsetFaces.begin(); itMtl != mapSubsetFaces.end(); ++itMtl)
-        {
-            const size_t faceCount = itMtl->second.size();
-            for (size_t f = 0; f < faceCount; ++f, ++newFaceCount)
-            {
-                pSkinningInfo->m_arrIntFaces[newFaceCount] = itMtl->second[f];
-            }
-        }
-        assert(newFaceCount == numIntFaces);
-    }
-
-    // Compile contents.
-    // These map from internal (original) to external (optimized) indices/vertices
-    std::vector<int> arrVRemapping;
-    std::vector<int> arrIRemapping;
-
-    m_pCompiledCGF = MakeCompiledSkinCGF(m_pCGF, &arrVRemapping, &arrIRemapping);
-    if (!m_pCompiledCGF)
-    {
-        return false;
-    }
-    const uint32 numVRemapping = arrVRemapping.size();
-    if (numVRemapping == 0)
-    {
-        m_LastError = "Empty vertex remapping";
-        return false;
-    }
-    if (arrIRemapping.size() != numIntFaces * 3)
-    {
-        m_LastError.Format("Wrong # of indices for remapping");
-        return false;
-    }
-
-    //allocates the external to internal map entries
-    // (m_arrExt2IntMap[]: for each final vertex contains its index in initial vertex buffer)
-    // TODO: in theory arrVRemapping.size() is not necessarily equals to the number of final vertices.
-    // It could be bigger if a face is not referenced from any of the subsets.
-    pSkinningInfo->m_arrExt2IntMap.resize(numVRemapping, ~0);
-    for (uint32 i = 0; i < numIntFaces; ++i)
-    {
-        const uint32 idx0 = arrVRemapping[arrIRemapping[i * 3 + 0]];
-        const uint32 idx1 = arrVRemapping[arrIRemapping[i * 3 + 1]];
-        const uint32 idx2 = arrVRemapping[arrIRemapping[i * 3 + 2]];
-        if (idx0 >= numVRemapping || idx1 >= numVRemapping || idx2 >= numVRemapping)
-        {
-            m_LastError.Format("Indices out of range");
-            return false;
-        }
-        pSkinningInfo->m_arrExt2IntMap[idx0] = pSkinningInfo->m_arrIntFaces[i].i0;
-        pSkinningInfo->m_arrExt2IntMap[idx1] = pSkinningInfo->m_arrIntFaces[i].i1;
-        pSkinningInfo->m_arrExt2IntMap[idx2] = pSkinningInfo->m_arrIntFaces[i].i2;
-    }
-
-    {
-        int brokenCount = 0;
-        for (uint32 i = 0; i < numVRemapping; i++)
-        {
-            if (pSkinningInfo->m_arrExt2IntMap[i] >= numIntVertices)
-            {
-                ++brokenCount;
-                // "Fixing" mapping allows us to comment out "return false" below (in case of an urgent need)
-                pSkinningInfo->m_arrExt2IntMap[i] = 0;
-            }
-        }
-        if (brokenCount > 0)
-        {
-            m_LastError.Format("Remapping-table is broken. %i of %i vertices are not remapped", brokenCount, numVRemapping);
-            return false;
-        }
-    }
-
-    //-------------------------------------------------------------------------
-
-    std::vector<SMeshSubset> arrSubsets;
-    std::vector<TFace> arrExtFaces;
-
-    if (!SplitIntoRBatches(arrSubsets, arrExtFaces, m_LastError, pMesh))
-    {
-        return false;
-    }
-
-    //--------------------------------------------------------------------------
-    //---              copy compiled-data back into CMesh                    ---
-    //--------------------------------------------------------------------------
-    for (size_t f = 0, n = arrExtFaces.size(); f < n; ++f)
-    {
-        pMesh->m_pIndices[f * 3 + 0] = arrExtFaces[f].i0;
-        pMesh->m_pIndices[f * 3 + 1] = arrExtFaces[f].i1;
-        pMesh->m_pIndices[f * 3 + 2] = arrExtFaces[f].i2;
-    }
-
-    pMesh->m_subsets.clear();
-    pMesh->m_subsets.reserve(arrSubsets.size());
-    for (size_t i = 0; i < arrSubsets.size(); ++i)
-    {
-        pMesh->m_subsets.push_back(arrSubsets[i]);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Create and fill bone-mapping streams.
-    //////////////////////////////////////////////////////////////////////////
-    {
-        pMesh->ReallocStream(CMesh::BONEMAPPING, 0, numVRemapping);
-        if (bHasExtraBoneMappings)
-        {
-            pMesh->ReallocStream(CMesh::EXTRABONEMAPPING, 0, numVRemapping);
-        }
-
-        for (uint32 i = 0; i < numVRemapping; ++i)
-        {
-            const uint32 index = pSkinningInfo->m_arrExt2IntMap[i];
-            const MeshUtils::VertexLinks& links = m_arrLinksTmp[index];
-            const int linkCount = (int)links.links.size();
-
-            // Convert floating point weights to integer [0;255] weights
-            int w[8];
-            {
-                assert(linkCount <= 8);
-
-                int wSum = 0;
-                for (int j = 0; j < linkCount; ++j)
-                {
-                    w[j] = (int)(links.links[j].weight * 255.0f + 0.5f);
-                    wSum += w[j];
-                }
-
-                // Ensure that the sum of weights is exactly 255.
-                // Note that the code below preserves sorting by
-                // weight in descending order.
-                if (wSum < 255)
-                {
-                    w[0] += 255 - wSum;
-                }
-                else if (wSum > 255)
-                {
-                    for (int j = 0;; ++j)
-                    {
-                        if (j >= linkCount - 1 || w[j] > w[j + 1])
-                        {
-                            --w[j];
-                            if (--wSum == 255)
-                            {
-                                break;
-                            }
-                            j = std::max(j - 1, 0) - 1;
-                        }
-                    }
-                }
-
-                // TODO: quantization to integer values might produce zero weight links, so
-                // it might be a good idea to delete such links. Warning: m_arrIntVertices[]
-                // also stores (up to) four links, so we should delete matching zero-weight
-                // links in m_arrIntVertices[] as well.
-            }
-
-            // Fill CMesh::BONEMAPPING stream
-            {
-                const int n = std::min(linkCount, 4);
-                for (int j = 0; j < n; ++j)
-                {
-                    pMesh->m_pBoneMapping[i].boneIds[j] = links.links[j].boneId;
-                    pMesh->m_pBoneMapping[i].weights[j] = (uint8)w[j];
-                }
-                for (int j = n; j < 4; ++j)
-                {
-                    pMesh->m_pBoneMapping[i].boneIds[j] = 0;
-                    pMesh->m_pBoneMapping[i].weights[j] = 0;
-                }
-            }
-
-            // Fill CMesh::EXTRABONEMAPPING stream
-            if (bHasExtraBoneMappings)
-            {
-                const int n = std::max(linkCount - 4, 0);
-                for (int j = 0; j < n; ++j)
-                {
-                    pMesh->m_pExtraBoneMapping[i].boneIds[j] = links.links[4 + j].boneId;
-                    pMesh->m_pExtraBoneMapping[i].weights[j] = (uint8)w[4 + j];
-                }
-                for (int j = n; j < 4; ++j)
-                {
-                    pMesh->m_pExtraBoneMapping[i].boneIds[j] = 0;
-                    pMesh->m_pExtraBoneMapping[i].weights[j] = 0;
-                }
-            }
-        }
-    }
-
-    // Keep original transform for morph targets
-    Matrix34 mat34 = pNode->localTM * Diag33(VERTEX_SCALE, VERTEX_SCALE, VERTEX_SCALE);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Copy shape-deformation and positions.
-    //////////////////////////////////////////////////////////////////////////
-    {
-        // Modify orientation, but keep translation.
-        // We need to keep translation to be able to use pivot of the node.
-        // It allows us to control coordinate origin for FP16 meshes.
-        // The translation is applied later before skinning.
-        const Matrix34 oldWorldTM = pNode->worldTM;
-        const Vec3 translation = oldWorldTM.GetTranslation();
-        pNode->worldTM = Matrix34(Matrix33(IDENTITY), translation);
-        // Reconstruct localTM out of new worldTM
-        if (pNode->pParent)
-        {
-            Matrix34 parentWorldInverted = pNode->pParent->worldTM;
-            parentWorldInverted.Invert();
-            pNode->localTM = parentWorldInverted * pNode->worldTM;
-        }
-        else
-        {
-            pNode->localTM = pNode->worldTM;
-        }
-
-        for (uint32 e = 0; e < numVRemapping; ++e)
-        {
-            const uint32 i = pSkinningInfo->m_arrExt2IntMap[e];
-            const IntSkinVertex& intVertex = pSkinningInfo->m_arrIntVertices[i];
-            pMesh->m_pPositions[e] = intVertex.pos - translation;
-        }
-
-        // The exporting pipeline is expected to produce pNode->worldTM
-        // with identity orientation only, but let's be paranoid and handle
-        // non-identity orientations properly as well.
-
-        const float eps = 0.001f;
-        const bool bIdentity =
-            oldWorldTM.GetColumn0().IsEquivalent(Vec3(1, 0, 0), eps) &&
-            oldWorldTM.GetColumn1().IsEquivalent(Vec3(0, 1, 0), eps) &&
-            oldWorldTM.GetColumn2().IsEquivalent(Vec3(0, 0, 1), eps);
-
-        if (!bIdentity)
-        {
-            for (uint32 e = 0; e < numVRemapping; ++e)
-            {
-                const uint32 i = pSkinningInfo->m_arrExt2IntMap[e];
-
-                pMesh->m_pNorms[e].RotateSafelyBy(oldWorldTM);
-                pMesh->m_pTangents[i].RotateSafelyBy(oldWorldTM);
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    //---              prepare morph-targets                                 ---
-    //--------------------------------------------------------------------------
-    uint32 numMorphTargets = pSkinningInfo->m_arrMorphTargets.size();
-    for (uint32 it = 0; it < numMorphTargets; ++it)
-    {
-        //init internal morph-targets
-        MorphTargets* pMorphtarget = pSkinningInfo->m_arrMorphTargets[it];
-        uint32 numMorphVerts = pMorphtarget->m_arrIntMorph.size();
-#if !defined(NDEBUG)
-        uint32 intVertexCount = pSkinningInfo->m_arrIntVertices.size();
-#endif
-        for (uint32 i = 0; i < numMorphVerts; i++)
-        {
-            uint32 idx = pMorphtarget->m_arrIntMorph[i].nVertexId;
-            assert(idx < intVertexCount);
-            Vec3 mvertex = (mat34 * pMorphtarget->m_arrIntMorph[i].ptVertex) - pSkinningInfo->m_arrIntVertices[idx].pos;
-            pMorphtarget->m_arrIntMorph[i].ptVertex = mvertex;
-        }
-
-        //init external morph-targets
-        for (uint32 v = 0; v < numMorphVerts; v++)
-        {
-            uint32 idx = pMorphtarget->m_arrIntMorph[v].nVertexId;
-            Vec3 mvertex = pMorphtarget->m_arrIntMorph[v].ptVertex;
-
-            const uint16* pExtToIntMap = &pSkinningInfo->m_arrExt2IntMap[0];
-            uint32 numExtVertices = numVRemapping;
-            assert(numExtVertices);
-            for (uint32 i = 0; i < numExtVertices; ++i)
-            {
-                uint32 index = pExtToIntMap[i];
-                if (index == idx)
-                {
-                    SMeshMorphTargetVertex mp;
-                    mp.nVertexId = i;
-                    mp.ptVertex = mvertex;
-                    pMorphtarget->m_arrExtMorph.push_back(mp);
-                }
-            }
-        }
-    }
-
-    pMesh->m_bbox.Reset();
-    for (size_t v = 0; v < numVRemapping; ++v)
-    {
-        pMesh->m_bbox.Add(pMesh->m_pPositions[v]);
-    }
-
-    return true;
-#endif
-}
-
-
-
-
-//------------------------------------------------------------------------------------------------------------------------
-//------------------------------------------------------------------------------------------------------------------------
-//------------------------------------------------------------------------------------------------------------------------
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(RESOURCE_COMPILER)
-
-CContentCGF* CLoaderCGF::MakeCompiledSkinCGF(
-    CContentCGF* pCGF, std::vector<int>* pVertexRemapping, std::vector<int>* pIndexRemapping) PREFAST_SUPPRESS_WARNING(6262) //function uses > 32k stack space
-{
-    CContentCGF* const pCompiledCGF = new CContentCGF(pCGF->GetFilename());
-    *pCompiledCGF->GetExportInfo() = *pCGF->GetExportInfo(); // Copy export info.
-
-    // Compile mesh.
-    // Note that this function cannot fill/return mapping arrays properly in case of
-    // multiple meshes (because mapping is per-mesh), so we will treat multiple
-    // meshes as error.
-    bool bMeshFound = false;
-    for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-    {
-        CNodeCGF* const pNodeCGF = pCGF->GetNode(i);
-        if (!pNodeCGF->pMesh || pNodeCGF->type != CNodeCGF::NODE_MESH || pNodeCGF->bPhysicsProxy)
-        {
-            continue;
-        }
-
-        if (bMeshFound)
-        {
-            m_LastError.Format("Failed to compile skinned geometry file %s - %s", pCGF->GetFilename(), "*multiple* mesh nodes aren't supported");
-            delete pCompiledCGF;
-            return 0;
-        }
-
-        bMeshFound = true;
-
-        mesh_compiler::CMeshCompiler meshCompiler;
-
-        meshCompiler.SetIndexRemapping(pIndexRemapping);
-        meshCompiler.SetVertexRemapping(pVertexRemapping);
-
-        int flags = mesh_compiler::MESH_COMPILE_TANGENTS | mesh_compiler::MESH_COMPILE_OPTIMIZE;
-        if (pCompiledCGF->GetExportInfo()->bUseCustomNormals)
-        {
-            flags |= mesh_compiler::MESH_COMPILE_USECUSTOMNORMALS;
-        }
-
-        if (!meshCompiler.Compile(*pNodeCGF->pMesh, flags))
-        {
-            m_LastError.Format("Failed to compile skinned geometry file %s - %s", pCGF->GetFilename(), meshCompiler.GetLastError());
-            delete pCompiledCGF;
-            return 0;
-        }
-
-        pCompiledCGF->AddNode(pNodeCGF);
-
-        // We continue scanning just to detect if we have multiple mesh nodes (to throw an error)
-    }
-
-    // Compile physics proxy nodes.
-    if (pCGF->GetExportInfo()->bHavePhysicsProxy)
-    {
-        for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-        {
-            CNodeCGF* pNodeCGF = pCGF->GetNode(i);
-            if (pNodeCGF->pMesh && pNodeCGF->bPhysicsProxy)
-            {
-                // Compile physics proxy mesh.
-                mesh_compiler::CMeshCompiler meshCompiler;
-                if (!meshCompiler.Compile(*pNodeCGF->pMesh, mesh_compiler::MESH_COMPILE_OPTIMIZE))
-                {
-                    m_LastError.Format("Failed to compile skinned geometry in node %s in file %s - %s", pNodeCGF->name, pCGF->GetFilename(), meshCompiler.GetLastError());
-                    delete pCompiledCGF;
-                    return 0;
-                }
-            }
-            pCompiledCGF->AddNode(pNodeCGF);
-        }
-    }
-
-    return pCompiledCGF;
-}
-
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadExportFlagsChunk(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    if (pChunkDesc->chunkVersion != EXPORT_FLAGS_CHUNK_DESC::VERSION)
-    {
-        m_LastError.Format("Unknown version of export flags chunk");
-        return false;
-    }
-
-    EXPORT_FLAGS_CHUNK_DESC& chunk = *(EXPORT_FLAGS_CHUNK_DESC*)pChunkDesc->data;
-    SwapEndian(chunk, pChunkDesc->bSwapEndian);
-    pChunkDesc->bSwapEndian = false;
-
-    CExportInfoCGF* pExportInfo = m_pCGF->GetExportInfo();
-    if (chunk.flags & EXPORT_FLAGS_CHUNK_DESC::MERGE_ALL_NODES)
-    {
-        pExportInfo->bMergeAllNodes = true;
-    }
-    else
-    {
-        pExportInfo->bMergeAllNodes = false;
-    }
-
-    if (chunk.flags & EXPORT_FLAGS_CHUNK_DESC::HAVE_AUTO_LODS)
-    {
-        pExportInfo->bHaveAutoLods = true;
-    }
-    else
-    {
-        pExportInfo->bHaveAutoLods = false;
-    }
-
-    if (chunk.flags & EXPORT_FLAGS_CHUNK_DESC::USE_CUSTOM_NORMALS)
-    {
-        pExportInfo->bUseCustomNormals = true;
-    }
-    else
-    {
-        pExportInfo->bUseCustomNormals = false;
-    }
-
-    if (chunk.flags & EXPORT_FLAGS_CHUNK_DESC::WANT_F32_VERTICES)
-    {
-        pExportInfo->bWantF32Vertices = true;
-    }
-    else
-    {
-        pExportInfo->bWantF32Vertices = false;
-    }
-
-    if (chunk.flags & EXPORT_FLAGS_CHUNK_DESC::EIGHT_WEIGHTS_PER_VERTEX)
-    {
-        pExportInfo->b8WeightsPerVertex = true;
-    }
-    else
-    {
-        pExportInfo->b8WeightsPerVertex = false;
-    }
-    if (chunk.flags & EXPORT_FLAGS_CHUNK_DESC::SKINNED_CGF)
-    {
-        pExportInfo->bSkinnedCGF = true;
-    }
-    else
-    {
-        pExportInfo->bSkinnedCGF = false;
-    }
-
-    return true;
-}
-
-inline const char* stristr2(const char* szString, const char* szSubstring)
-{
-    int nSuperstringLength = (int)strlen(szString);
-    int nSubstringLength = (int)strlen(szSubstring);
-
-    for (int nSubstringPos = 0; nSubstringPos <= nSuperstringLength - nSubstringLength; ++nSubstringPos)
-    {
-        if (_strnicmp(szString + nSubstringPos, szSubstring, nSubstringLength) == 0)
-        {
-            return szString + nSubstringPos;
-        }
-    }
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadNodeChunk(IChunkFile::ChunkDesc* pChunkDesc, bool bJustGeometry)
-{
-    if (pChunkDesc->chunkVersion != NODE_CHUNK_DESC_0824::VERSION &&
-        pChunkDesc->chunkVersion != NODE_CHUNK_DESC_0824::COMPATIBLE_OLD_VERSION)
-    {
-        m_LastError.Format(
-            "Unknown version (0x%x) of Node chunk. The only supported versions are 0x%x and 0x%x.",
-            (uint)pChunkDesc->chunkVersion,
-            (uint)NODE_CHUNK_DESC_0824::VERSION,
-            (uint)NODE_CHUNK_DESC_0824::COMPATIBLE_OLD_VERSION);
-        return false;
-    }
-
-    NODE_CHUNK_DESC_0824* nodeChunk = (NODE_CHUNK_DESC_0824*)pChunkDesc->data;
-    assert(nodeChunk);
-    SwapEndian(*nodeChunk, pChunkDesc->bSwapEndian);
-    pChunkDesc->bSwapEndian = false;
-
-    CNodeCGF* pNodeCGF = Construct<CNodeCGF>(InplaceFactory(m_pDestructFnc), m_pAllocFnc);
-    m_pCGF->AddNode(pNodeCGF);
-
-    cry_strcpy(pNodeCGF->name, nodeChunk->name);
-
-    // Fill node object.
-    pNodeCGF->nChunkId = pChunkDesc->chunkId;
-    pNodeCGF->nParentChunkId = nodeChunk->ParentID;
-    pNodeCGF->nObjectChunkId = nodeChunk->ObjectID;
-    pNodeCGF->pParent = 0;
-    pNodeCGF->pMesh = 0;
-
-    pNodeCGF->pos_cont_id = nodeChunk->pos_cont_id;
-    pNodeCGF->rot_cont_id = nodeChunk->rot_cont_id;
-    pNodeCGF->scl_cont_id = nodeChunk->scl_cont_id;
-
-    pNodeCGF->pMaterial = 0;
-    if (nodeChunk->MatID > 0)
-    {
-        pNodeCGF->pMaterial = LoadMaterialFromChunk(nodeChunk->MatID);
-        if (!pNodeCGF->pMaterial)
-        {
-            return false;
-        }
-    }
-
-    {
-        const float* const pMat = &nodeChunk->tm[0][0];
-
-        pNodeCGF->localTM.SetFromVectors(
-            Vec3(pMat[0], pMat[1], pMat[2]),
-            Vec3(pMat[4], pMat[5], pMat[6]),
-            Vec3(pMat[8], pMat[9], pMat[10]),
-            Vec3(pMat[12] * VERTEX_SCALE, pMat[13] * VERTEX_SCALE, pMat[14] * VERTEX_SCALE));
-    }
-
-    if (pNodeCGF->nParentChunkId > 1)
-    {
-        pNodeCGF->bIdentityMatrix = false;
-    }
-    else
-    {
-        // FIXME: 1) Other code in CryEngine sets bIdentityMatrix by analyzing worldTM instead of localTM. What is the right choice?
-        // FIXME: 2) bIdentityMatrix is re-computed in CLoaderCGF::ProcessNodes(). What is the point of computing it here as well?
-        pNodeCGF->bIdentityMatrix = pNodeCGF->localTM.IsIdentity();
-    }
-
-    if (nodeChunk->PropStrLen > 0)
-    {
-        pNodeCGF->properties.Format("%.*s", nodeChunk->PropStrLen, ((const char*)nodeChunk) + sizeof(*nodeChunk));
-    }
-
-    // By default node type is mesh.
-    pNodeCGF->type = CNodeCGF::NODE_MESH;
-
-    pNodeCGF->bPhysicsProxy = false;
-    if (stristr2(nodeChunk->name, PHYSICS_PROXY_NODE) || stristr2(nodeChunk->name, PHYSICS_PROXY_NODE2) || stristr2(nodeChunk->name, PHYSICS_PROXY_NODE3))
-    {
-        pNodeCGF->type = CNodeCGF::NODE_HELPER;
-        pNodeCGF->bPhysicsProxy = true;
-        m_pCGF->GetExportInfo()->bHavePhysicsProxy = true;
-    }
-    else if (nodeChunk->name[0] == '$')
-    {
-        pNodeCGF->type = CNodeCGF::NODE_HELPER;
-    }
-
-    // Check if valid object node.
-    if (nodeChunk->ObjectID > 0)
-    {
-        IChunkFile::ChunkDesc* const pObjChunkDesc = m_pChunkFile->FindChunkById(nodeChunk->ObjectID);
-        if (!pObjChunkDesc)
-        {
-            assert(pObjChunkDesc);
-            m_LastError.Format("Failed to find chunk with id %d", nodeChunk->ObjectID);
-            return false;
-        }
-        if (pObjChunkDesc->chunkType == ChunkType_Mesh)
-        {
-            if (pNodeCGF->type == CNodeCGF::NODE_HELPER)
-            {
-                pNodeCGF->helperType = HP_GEOMETRY;
-            }
-            if (!LoadGeomChunk(pNodeCGF, pObjChunkDesc))
-            {
-                return false;
-            }
-        }
-        else if (!bJustGeometry)
-        {
-            if (pObjChunkDesc->chunkType == ChunkType_Helper)
-            {
-                pNodeCGF->type = CNodeCGF::NODE_HELPER;
-                if (!LoadHelperChunk(pNodeCGF, pObjChunkDesc))
-                {
-                    return false;
-                }
-            }
-        }
-    }
-    else
-    {
-        //  pNodeCGF->type = CNodeCGF::NODE_HELPER;
-        //  pNodeCGF->helperType = HP_POINT;
-        //  pNodeCGF->helperSize = Vec3(0.01f,0.01f,0.01f);
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadHelperChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (pChunkDesc->chunkVersion != HELPER_CHUNK_DESC::VERSION)
-    {
-        m_LastError.Format("Unknown version of Helper chunk");
-        return false;
-    }
-
-    HELPER_CHUNK_DESC& chunk = *(HELPER_CHUNK_DESC*)pChunkDesc->data;
-    assert(&chunk);
-
-    SwapEndian(chunk, pChunkDesc->bSwapEndian);
-    pChunkDesc->bSwapEndian = false;
-
-    // Fill node object.
-    pNode->helperType = chunk.type;
-    pNode->helperSize = chunk.size;
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLoaderCGF::ProcessNodes()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Bind Nodes parents.
-    //////////////////////////////////////////////////////////////////////////
-    for (int i = 0; i < m_pCGF->GetNodeCount(); i++)
-    {
-        if (m_pCGF->GetNode(i)->nParentChunkId > 0)
-        {
-            for (int j = 0; j < m_pCGF->GetNodeCount(); j++)
-            {
-                if (m_pCGF->GetNode(i)->nParentChunkId == m_pCGF->GetNode(j)->nChunkId)
-                {
-                    m_pCGF->GetNode(i)->pParent = m_pCGF->GetNode(j);
-                    break;
-                }
-            }
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Calculate Node world matrices.
-    //////////////////////////////////////////////////////////////////////////
-    for (int i = 0; i < m_pCGF->GetNodeCount(); i++)
-    {
-        CNodeCGF* pNode = m_pCGF->GetNode(i);
-        Matrix34 tm = pNode->localTM;
-        for (CNodeCGF* pCurNode = pNode->pParent; pCurNode; pCurNode = pCurNode->pParent)
-        {
-            tm = pCurNode->localTM * tm;
-        }
-        pNode->worldTM = tm;
-        pNode->bIdentityMatrix = pNode->worldTM.IsIdentity();
-
-        if (pNode->pMesh)
-        {
-            SetupMeshSubsets(*pNode->pMesh, pNode->pMaterial);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLoaderCGF::SetupMeshSubsets(CMesh& mesh, CMaterialCGF* pMaterialCGF)
-{
-    if (!m_pCGF->GetExportInfo()->bCompiledCGF)
-    {
-        const DynArray<int>& usedMaterialIds = m_pCGF->GetUsedMaterialIDs();
-
-        if (mesh.m_subsets.empty())
-        {
-            //////////////////////////////////////////////////////////////////////////
-            // Setup mesh subsets.
-            //////////////////////////////////////////////////////////////////////////
-            for (int i = 0; i < usedMaterialIds.size(); i++)
-            {
-                SMeshSubset meshSubset;
-                int nMatID = usedMaterialIds[i];
-                meshSubset.nMatID = nMatID;
-                meshSubset.nPhysicalizeType = PHYS_GEOM_TYPE_NONE;
-                mesh.m_subsets.push_back(meshSubset);
-            }
-        }
-    }
-
-    if (pMaterialCGF)
-    {
-        for (int i = 0; i < mesh.m_subsets.size(); i++)
-        {
-            SMeshSubset& meshSubset = mesh.m_subsets[i];
-            if (pMaterialCGF->subMaterials.size() > 0)
-            {
-                int id = meshSubset.nMatID;
-                if (id >= (int)pMaterialCGF->subMaterials.size())
-                {
-                    // Let's use 3dsMax's approach of handling material ids out of range
-                    id %= (int)pMaterialCGF->subMaterials.size();
-                }
-
-                if (id >= 0 && pMaterialCGF->subMaterials[id] != NULL)
-                {
-                    meshSubset.nPhysicalizeType = pMaterialCGF->subMaterials[id]->nPhysicalizeType;
-                }
-                else
-                {
-                    Warning("Submaterial %d is not available for subset %d in %s", meshSubset.nMatID, i, m_filename);
-                }
-            }
-            else
-            {
-                meshSubset.nPhysicalizeType = pMaterialCGF->nPhysicalizeType;
-            }
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadGeomChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    // First check if this geometry chunk was already loaded by some node.
-    int nNumNodes = m_pCGF->GetNodeCount();
-    for (int i = 0; i < nNumNodes; i++)
-    {
-        CNodeCGF* pOldNode = m_pCGF->GetNode(i);
-        if (pOldNode != pNode && pOldNode->nObjectChunkId == pChunkDesc->chunkId)
-        {
-            pNode->pMesh = pOldNode->pMesh;
-            pNode->pSharedMesh = pOldNode;
-            return true;
-        }
-    }
-
-    assert(pChunkDesc && pChunkDesc->chunkType == ChunkType_Mesh);
-
-    if (pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0801::VERSION ||
-        pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0801::COMPATIBLE_OLD_VERSION ||
-        pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0802::VERSION)
-    {
-        m_pCGF->GetExportInfo()->bCompiledCGF = true;
-        return LoadCompiledMeshChunk(pNode, pChunkDesc);
-    }
-
-    // Uncompiled format
-    if (pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0745::VERSION ||
-        pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0745::COMPATIBLE_OLD_VERSION)
-    {
-#if !defined(RESOURCE_COMPILER) && !defined(ENABLE_NON_COMPILED_CGF)
-        m_LastError.Format("%s: non-compiled geometry chunk in %s", __FUNCTION__, m_filename);
-        return false;
-#else
-        m_pCGF->GetExportInfo()->bCompiledCGF = false;
-
-        const int maxLinkCount =
-            m_pCGF->GetExportInfo()->b8WeightsPerVertex
-            ? 8
-            : ((m_maxWeightsPerVertex <= 8) ? m_maxWeightsPerVertex : 8);  // CMesh doesn't support more than 8 weights
-
-        const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-        pChunkDesc->bSwapEndian = false;
-
-        uint8* pMeshChunkData = (uint8*)pChunkDesc->data;
-
-        MESH_CHUNK_DESC_0745* chunk;
-        StepData(chunk, pMeshChunkData, 1, bSwapEndianness);
-
-        if (!(chunk->flags2 & MESH_CHUNK_DESC_0745::FLAG2_HAS_TOPOLOGY_IDS))
-        {
-            m_LastError.Format("%s: obsolete non-compiled geometry chunk format in %s", __FUNCTION__, m_filename);
-            return false;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Preparing source mesh data (may contain duplicate vertices)
-        //////////////////////////////////////////////////////////////////////////
-
-        MeshUtils::Mesh mesh;
-        const char* err = 0;
-
-        if (chunk->nVerts <= 0)
-        {
-            m_LastError.Format("%s: missing vertices in %s", __FUNCTION__, m_filename);
-            return false;
-        }
-        if (chunk->nFaces <= 0)
-        {
-            m_LastError.Format("%s: missing faces in %s", __FUNCTION__, m_filename);
-            return false;
-        }
-        if (chunk->nTVerts != 0 && chunk->nTVerts != chunk->nVerts)
-        {
-            m_LastError.Format("%s: Number of texture coordinates doesn't match number of vertices", __FUNCTION__);
-            return false;
-        }
-
-        // Preparing positions and normals
-        {
-            CryVertex* p;
-            StepData(p, pMeshChunkData, chunk->nVerts, bSwapEndianness);
-
-            err = mesh.SetPositions(&p->p.x, chunk->nVerts, sizeof(*p), VERTEX_SCALE);  // VERTEX_SCALE - to convert from centimeters to meters
-            if (!err)
-            {
-                err = mesh.SetNormals(&p->n.x, chunk->nVerts, sizeof(*p));
-            }
-
-            if (err)
-            {
-                m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                return false;
-            }
-        }
-
-        // Preparing faces and face material IDs
-        {
-            CryFace* p;
-            StepData(p, pMeshChunkData, chunk->nFaces, bSwapEndianness);
-            err = mesh.SetFaces(&p->v0, chunk->nFaces, sizeof(*p));
-            if (!err)
-            {
-                err = mesh.SetFaceMatIds(&p->MatID, chunk->nFaces, sizeof(*p), MAX_SUB_MATERIALS - 1);
-            }
-            if (err)
-            {
-                m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                return false;
-            }
-            mesh.RemoveDegradedFaces();
-        }
-
-        // Preparing topology IDs
-        {
-            int* p;
-            StepData(p, pMeshChunkData, chunk->nVerts, bSwapEndianness);
-            err = mesh.SetTopologyIds(p, chunk->nVerts, sizeof(*p));
-            if (err)
-            {
-                m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                return false;
-            }
-        }
-
-        // Preparing texture coordinates
-        if (chunk->nTVerts > 0)
-        {
-            CryUV* p;
-            StepData(p, pMeshChunkData, chunk->nVerts, bSwapEndianness);
-            err = mesh.SetTexCoords(&p->u, chunk->nVerts, sizeof(*p), true, 0);
-            if (err)
-            {
-                m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                return false;
-            }
-        }
-
-        // Preparing vertex-bone links
-        if (chunk->flags1 & MESH_CHUNK_DESC_0745::FLAG1_BONE_INFO)
-        {
-            mesh.m_links.resize(chunk->nVerts);
-
-            for (int i = 0; i < chunk->nVerts; ++i)
-            {
-                MeshUtils::VertexLinks& linksDst = mesh.m_links[i];
-
-                int32* pNumLinks;
-                StepData(pNumLinks, pMeshChunkData, 1, bSwapEndianness);
-
-                if (pNumLinks == nullptr)
-                {
-                    return false;
-                }
-
-                if (*pNumLinks <= 0)
-                {
-                    m_LastError.Format("%s: Number of links for vertex is invalid: %i", __FUNCTION__, *pNumLinks);
-                    return false;
-                }
-
-                linksDst.links.resize(*pNumLinks);
-
-                CryLink* pLinksSrc;
-                StepData(pLinksSrc, pMeshChunkData, *pNumLinks, bSwapEndianness);
-                for (int j = 0; j < *pNumLinks; ++j)
-                {
-                    linksDst.links[j].boneId = pLinksSrc[j].BoneID;
-                    linksDst.links[j].weight = pLinksSrc[j].Blending;
-                    linksDst.links[j].offset = pLinksSrc[j].offset * VERTEX_SCALE;
-                }
-
-                err = linksDst.Normalize(MeshUtils::VertexLinks::eSort_ByWeight, 0.0f, maxLinkCount);
-
-                if (err)
-                {
-                    m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                    return false;
-                }
-            }
-        }
-
-        // Preparing colors
-        if (chunk->flags2 & MESH_CHUNK_DESC_0745::FLAG2_HAS_VERTEX_COLOR)
-        {
-            CryIRGB* p;
-            StepData(p, pMeshChunkData, chunk->nVerts, bSwapEndianness);
-            assert(&p->r < &p->b);
-            err = mesh.SetColors(&p->r, chunk->nVerts, sizeof(*p));
-            if (err)
-            {
-                m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                return false;
-            }
-        }
-
-        // Preparing alphas
-        if (chunk->flags2 & MESH_CHUNK_DESC_0745::FLAG2_HAS_VERTEX_ALPHA)
-        {
-            uint8* p;
-            StepData(p, pMeshChunkData, chunk->nVerts, bSwapEndianness);
-            err = mesh.SetAlphas(p, chunk->nVerts, sizeof(*p));
-            if (err)
-            {
-                m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                return false;
-            }
-        }
-
-        // Prevent sharing materials by vertices (this call might create new vertices)
-        mesh.SetVertexMaterialIdsFromFaceMaterialIds();
-
-        // Validation
-        {
-            err = mesh.Validate();
-            if (err)
-            {
-                m_LastError.Format("%s: Failed: %s", __FUNCTION__, err);
-                return false;
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Compute vertex remapping
-        //////////////////////////////////////////////////////////////////////////
-
-        mesh.ComputeVertexRemapping();
-
-        //////////////////////////////////////////////////////////////////////////
-        // Creating resulting mesh
-        //////////////////////////////////////////////////////////////////////////
-
-        CMesh* const pMesh = new CMesh();
-
-        const int nVerts = mesh.m_vertexOldToNew.size();
-        const int nVertsNew = mesh.m_vertexNewToOld.size();
-
-        // Filling positions, normals, topology IDs, texture coordinates, colors
-        {
-            pMesh->SetVertexCount(nVertsNew);
-            pMesh->ReallocStream(CMesh::TOPOLOGY_IDS, 0, nVertsNew);
-            pMesh->ReallocStream(CMesh::TEXCOORDS, 0, nVertsNew);
-            if (!mesh.m_colors.empty() || !mesh.m_alphas.empty())
-            {
-                pMesh->ReallocStream(CMesh::COLORS, 0, nVertsNew);
-            }
-
-            for (uint32 uvSet = 0; uvSet < mesh.m_texCoords.size(); ++uvSet)
-            {
-                if (!mesh.m_texCoords[uvSet].empty())
-                {
-                    SMeshTexCoord* texCoords = pMesh->GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, uvSet);
-                    for (int i = 0; i < nVertsNew; ++i)
-                    {
-                        const int origVertex = mesh.m_vertexNewToOld[i];
-                        texCoords[i] = SMeshTexCoord(mesh.m_texCoords[uvSet][origVertex].x, mesh.m_texCoords[uvSet][origVertex].y);
-                    }
-                }
-            }
-
-            for (int i = 0; i < nVertsNew; ++i)
-            {
-                const int origVertex = mesh.m_vertexNewToOld[i];
-
-                pMesh->m_pPositions[i] = mesh.m_positions[origVertex];
-
-                pMesh->m_pNorms[i] = SMeshNormal(mesh.m_normals[origVertex]);
-
-                pMesh->m_pTopologyIds[i] = mesh.m_topologyIds[origVertex];
-
-                if (pMesh->m_pColor0)
-                {
-                    uint8 r = 0xFF;
-                    uint8 g = 0xFF;
-                    uint8 b = 0xFF;
-                    uint8 a = 0xFF;
-                    if (!mesh.m_colors.empty())
-                    {
-                        r = mesh.m_colors[origVertex].r;
-                        g = mesh.m_colors[origVertex].g;
-                        b = mesh.m_colors[origVertex].b;
-                    }
-                    if (!mesh.m_alphas.empty())
-                    {
-                        a = mesh.m_alphas[origVertex];
-                    }
-
-                    pMesh->m_pColor0[i] = SMeshColor(r, g, b, a);
-                }
-            }
-        }
-
-        // Filling vertex-bone links
-        {
-            m_arrLinksTmp.clear();
-            if (!mesh.m_links.empty())
-            {
-                m_arrLinksTmp.reserve(nVertsNew);
-                for (int i = 0; i < nVertsNew; ++i)
-                {
-                    const int origVertex = mesh.m_vertexNewToOld[i];
-                    m_arrLinksTmp.push_back(mesh.m_links[origVertex]);
-                }
-
-                // Remember the mapping table for future re-mapping of uncompiled Morph Target vertices (if any)
-                m_vertexOldToNew = mesh.m_vertexOldToNew;
-            }
-        }
-
-        // Filling faces
-        {
-            const int nFaces = mesh.GetFaceCount();
-            pMesh->SetFaceCount(nFaces);
-
-            DynArray<int>& usedMaterialIds = m_pCGF->GetUsedMaterialIDs();
-
-            for (int i = 0; i < nFaces; ++i)
-            {
-                const MeshUtils::Face& cf = mesh.m_faces[i];
-                const int matId = mesh.m_faceMatIds[i];
-
-                SMeshFace& face = pMesh->m_pFaces[i];
-
-                face.v[0] = mesh.m_vertexOldToNew[cf.vertexIndex[0]];
-                face.v[1] = mesh.m_vertexOldToNew[cf.vertexIndex[1]];
-                face.v[2] = mesh.m_vertexOldToNew[cf.vertexIndex[2]];
-
-                // Map material ID to index of subset
-                if (!MatIdToSubset[matId])
-                {
-                    MatIdToSubset[matId] = 1 + nLastChunkId++;
-                    // Order of material ids in usedMaterialIds correspond to the indices of chunks.
-                    usedMaterialIds.push_back(matId);
-                }
-                face.nSubset = MatIdToSubset[matId] - 1;
-            }
-        }
-
-        // Computing AABB
-        pMesh->m_bbox.Reset();
-        for (int i = 0; i < nVertsNew; ++i)
-        {
-            pMesh->m_bbox.Add(pMesh->m_pPositions[i]);
-        }
-
-        // Saving results
-        pNode->pMesh = pMesh;
-
-        return true;
-#endif
-    }
-
-    m_LastError.Format("%s: unknown geometry chunk version in %s", __FUNCTION__, m_filename);
-    return false;
-}
-
-template<class T, class MESH_CHUNK_DESC>
-bool CLoaderCGF::LoadStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk, ECgfStreamType Type, int streamIndex, CMesh::EStream MStream)
-{
-    if (chunk.GetStreamChunkID(Type, streamIndex) <= 0)
-    {
-        return true;
-    }
-
-    void* pStreamData;
-    int nStreamType;
-    int nStreamIndex;
-    int nElemCount;
-    int nElemSize;
-    bool bSwapEndianness;
-    if (!LoadStreamDataChunk(chunk.GetStreamChunkID(Type, streamIndex), pStreamData, nStreamType, nStreamIndex, nElemCount, nElemSize, bSwapEndianness))
-    {
-        return false;
-    }
-    if (nStreamType != Type)
-    {
-        m_LastError.Format("Mesh stream type %d stream number %d has unknown type (%d instead of %d)", (int)MStream, streamIndex, (int)nStreamType, (int)Type);
-        return false;
-    }
-    if (nStreamIndex != streamIndex)
-    {
-        m_LastError.Format("Mesh stream index for type %d did not match what was expected (%d instead of %d)", (int)Type, nStreamIndex, streamIndex);
-        return false;
-    }
-    if (nElemSize != sizeof(T))
-    {
-        m_LastError.Format("Mesh stream type %d stream number %d has damaged data (elemSize:%u)", (int)MStream, streamIndex, (uint)nElemSize);
-        return false;
-    }
-
-    SwapEndian((T*)pStreamData, nElemCount, bSwapEndianness);
-
-    void* pMeshElements = 0;
-    {
-        const bool bSourceAligned = (((UINT_PTR)pStreamData & 0x3) == 0);
-        const bool bShare = (m_bUseReadOnlyMesh && bSourceAligned && m_bAllowStreamSharing);
-
-        if (bShare)
-        {
-            mesh.SetSharedStream(MStream, streamIndex, pStreamData, nElemCount);
-        }
-        else
-        {
-            mesh.ReallocStream(MStream, streamIndex, nElemCount);
-        }
-
-        int nMeshElemSize = 0;
-        mesh.GetStreamInfo(MStream, streamIndex, pMeshElements, nMeshElemSize);
-        if (nMeshElemSize != nElemSize || nMeshElemSize != sizeof(T))
-        {
-            m_LastError.Format("Mesh stream type %d stream number %d has damaged data (elemCount:%u, elemSize:%u)",
-                (int)MStream, streamIndex, (uint)nElemCount, (uint)nMeshElemSize);
-
-            return false;
-        }
-
-        if (!bShare)
-        {
-            memcpy(pMeshElements, pStreamData, nElemCount * nElemSize);
-        }
-    }
-
-    return true;
-}
-
-template<class TA, class TB, class MESH_CHUNK_DESC>
-bool CLoaderCGF::LoadStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk, ECgfStreamType Type, int streamIndex, CMesh::EStream MStreamA, CMesh::EStream MStreamB)
-{
-    if (chunk.GetStreamChunkID(Type, streamIndex) <= 0)
-    {
-        return true;
-    }
-
-    void* pStreamData;
-    int nStreamType;
-    int nStreamIndex;
-    int nElemCount;
-    int nElemSize;
-    bool bSwapEndianness;
-    if (!LoadStreamDataChunk(chunk.GetStreamChunkID(Type, streamIndex), pStreamData, nStreamType, nStreamIndex, nElemCount, nElemSize, bSwapEndianness))
-    {
-        return false;
-    }
-    if (nStreamType != Type)
-    {
-        m_LastError.Format("Mesh stream type %d/%d stream number %d/%d has unknown type (%d instead of %d)", (int)MStreamA, (int)MStreamB, streamIndex, streamIndex, (int)nStreamType, (int)Type);
-        return false;
-    }
-    if (nStreamIndex != streamIndex)
-    {
-        m_LastError.Format("Mesh stream index for type %d did not match what was expected (%d instead of %d)", (int)Type, nStreamIndex, streamIndex);
-        return false;
-    }
-    if ((nElemSize != sizeof(TA) && nElemSize != sizeof(TB)))
-    {
-        m_LastError.Format("Mesh stream type %d/%d stream number %d/%d has unsupported element size (%u instead of %u or %u)", (int)MStreamA, (int)MStreamB, streamIndex, streamIndex, (uint)nElemSize, (uint)sizeof(TA), (uint)sizeof(TB));
-        return false;
-    }
-
-    const bool bUseA = (nElemSize == sizeof(TA));
-
-    if (bUseA)
-    {
-        SwapEndian((TA*)pStreamData, nElemCount, bSwapEndianness);
-    }
-    else
-    {
-        SwapEndian((TB*)pStreamData, nElemCount, bSwapEndianness);
-    }
-
-    void* pMeshElements = 0;
-    {
-        const bool bSourceAligned = (((UINT_PTR)pStreamData & 0x3) == 0);
-        const bool bShare = (m_bUseReadOnlyMesh && bSourceAligned && m_bAllowStreamSharing);
-
-        if (bShare)
-        {
-            mesh.SetSharedStream((bUseA ? MStreamA : MStreamB), streamIndex, pStreamData, nElemCount);
-        }
-        else
-        {
-            mesh.ReallocStream((bUseA ? MStreamA : MStreamB), streamIndex, nElemCount);
-        }
-
-        int nMeshElemSize = 0;
-        mesh.GetStreamInfo((bUseA ? MStreamA : MStreamB), streamIndex, pMeshElements, nMeshElemSize);
-        if (nMeshElemSize != nElemSize || nMeshElemSize != (bUseA ? sizeof(TA) : sizeof(TB)))
-        {
-            m_LastError.Format("Mesh stream type %d stream number %d has damaged data (elemCount:%u, elemSize:%u)",
-                (int)(bUseA ? MStreamA : MStreamB), streamIndex, (uint)nElemCount, (uint)nMeshElemSize);
-            return false;
-        }
-
-        if (!bShare)
-        {
-            memcpy(pMeshElements, pStreamData, nElemCount * nElemSize);
-        }
-    }
-
-    return true;
-}
-
-template <class MESH_CHUNK_DESC>
-bool CLoaderCGF::LoadBoneMappingStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk, const std::vector<std::vector<uint16> >& globalBonesPerSubset)
-{
-    const ECgfStreamType Type = CGF_STREAM_BONEMAPPING;
-    CMesh::EStream MStream = CMesh::BONEMAPPING;
-    // There is only one index stream per mesh, so get index stream 0
-    int streamIndex = 0;
-    if (chunk.GetStreamChunkID(Type, streamIndex) <= 0)
-    {
-        return true;
-    }
-
-    void* pStreamData;
-    int nStreamType;
-    int nStreamIndex;
-    int nElemCount;
-    int nStreamElemSize;
-    bool bSwapEndianness;
-    if (!LoadStreamDataChunk(chunk.GetStreamChunkID(Type, streamIndex), pStreamData, nStreamType, nStreamIndex, nElemCount, nStreamElemSize, bSwapEndianness))
-    {
-        return false;
-    }
-    if (nStreamType != Type)
-    {
-        m_LastError.Format("Bone mapping stream %d has unknown type (%d instead of %d)", (int)MStream, (int)nStreamType, (int)Type);
-        return false;
-    }
-
-    if (nElemCount != mesh.GetVertexCount() && nElemCount != 2 * mesh.GetVertexCount())
-    {
-        m_LastError.Format("Bone mapping stream %d has wrong # vertices %d (expected %d or %d)", (int)MStream, nElemCount, mesh.GetVertexCount(), 2 * mesh.GetVertexCount());
-        return false;
-    }
-
-    COMPILE_TIME_ASSERT(sizeof(mesh.m_pBoneMapping[0]) == sizeof(SMeshBoneMapping_uint16));
-
-    if (nStreamElemSize == sizeof(SMeshBoneMapping_uint8))
-    {
-        // Obsolete format. We support it just because many existing asset files use it.
-
-        if (globalBonesPerSubset.size() != mesh.m_subsets.size())
-        {
-            m_LastError.Format("Bad or missing bone remapping tables. Contact an RC programmer.");
-            return false;
-        }
-
-        SwapEndian((SMeshBoneMapping_uint8*)pStreamData, nElemCount, bSwapEndianness);
-
-        // Converting local (per-preset) uint8 bone indices to global bone uint16 indices
-
-        mesh.ReallocStream(MStream, nStreamIndex, nElemCount);
-
-        SMeshBoneMapping_uint16* const pMeshElements = mesh.GetStreamPtr<SMeshBoneMapping_uint16>(MStream, nStreamIndex);
-        if (!pMeshElements)
-        {
-            // Should never happen because we did check it by COMPILE_TIME_ASSERT() above.
-            m_LastError.Format("Bone mapping has invalid size. Contact an RC programmer.");
-            return false;
-        }
-
-        // Filling bone indices with 0xFFFF allows us to perform input data
-        // validation (see code with '== 0xFFFF' below)
-        memset(pMeshElements, 0xFF, nElemCount * sizeof(pMeshElements[0]));
-
-        const SMeshBoneMapping_uint8* const pSrcBoneMapping = (const SMeshBoneMapping_uint8*)pStreamData;
-
-        const int vertexCount = mesh.GetVertexCount();
-        const int indexCount = mesh.GetIndexCount();
-
-        for (int subset = 0; subset < mesh.m_subsets.size(); ++subset)
-        {
-            SMeshSubset& meshSubset = mesh.m_subsets[subset];
-
-            const std::vector<uint16>& globalBones = globalBonesPerSubset[subset];
-
-            if (meshSubset.nNumIndices == 0)
-            {
-                continue;
-            }
-
-            for (int extra = 0; extra < nElemCount; extra += vertexCount)
-            {
-                for (int j = meshSubset.nFirstIndexId; j < meshSubset.nFirstIndexId + meshSubset.nNumIndices; ++j)
-                {
-                    const int vIdx = mesh.m_pIndices[j];
-
-                    if (vIdx < meshSubset.nFirstVertId || vIdx >= meshSubset.nFirstVertId + meshSubset.nNumVerts)
-                    {
-                        m_LastError.Format("Index stream contains invalid vertex index.");
-                        return false;
-                    }
-
-                    for (int k = 0; k < 4; ++k)
-                    {
-                        const uint8 weight = pSrcBoneMapping[vIdx + extra].weights[k];
-                        if (weight <= 0)
-                        {
-                            if (pMeshElements[vIdx + extra].boneIds[k] == 0xFFFF)
-                            {
-                                pMeshElements[vIdx + extra].weights[k] = 0;
-                                pMeshElements[vIdx + extra].boneIds[k] = 0;
-                            }
-                            else if (pMeshElements[vIdx + extra].weights[k] != 0 ||
-                                pMeshElements[vIdx + extra].boneIds[k] != 0)
-                            {
-                                m_LastError.Format("Conflicting vertex-bone references.");
-                                return false;
-                            }
-                            continue;
-                        }
-
-                        const uint8 boneIdx = pSrcBoneMapping[vIdx + extra].boneIds[k];
-                        if (boneIdx < 0 || (size_t)boneIdx >= globalBones.size())
-                        {
-                            m_LastError.Format(
-                                "Bad bone mapping found in subset %d, vertex %d: boneIdx %d, # bones in subset %d.",
-                                subset, vIdx, boneIdx, (int)globalBones.size());
-                            return false;
-                        }
-
-                        const uint16 globalBoneIdx = globalBones[boneIdx];
-
-                        if (pMeshElements[vIdx + extra].boneIds[k] == 0xFFFF)
-                        {
-                            pMeshElements[vIdx + extra].weights[k] = weight;
-                            pMeshElements[vIdx + extra].boneIds[k] = globalBoneIdx;
-                        }
-                        else if (pMeshElements[vIdx + extra].weights[k] != weight ||
-                            pMeshElements[vIdx + extra].boneIds[k] != globalBoneIdx)
-                        {
-                            m_LastError.Format("Conflicting vertex-bone references.");
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        int orphanVertexCount = 0;
-        for (int i = 0; i < nElemCount; ++i)
-        {
-            for (int k = 0; k < 4; ++k)
-            {
-                const uint boneIdx = pMeshElements[i].boneIds[k];
-                if (boneIdx >= 0xFFFF)
-                {
-                    ++orphanVertexCount;
-                    pMeshElements[i].weights[k] = 0;
-                    pMeshElements[i].boneIds[k] = 0;
-                }
-            }
-        }
-
-        if (orphanVertexCount)
-        {
-            orphanVertexCount /= 4 * (nElemCount / vertexCount);
-            CryWarning(
-                VALIDATOR_MODULE_ASSETS, VALIDATOR_WARNING,
-                "Found %d orphan vertices", orphanVertexCount);
-        }
-    }
-    else if (nStreamElemSize == sizeof(SMeshBoneMapping_uint16))
-    {
-        SwapEndian((SMeshBoneMapping_uint16*)pStreamData, nElemCount, bSwapEndianness);
-
-        const bool bSourceAligned = (((UINT_PTR)pStreamData & 0x3) == 0);
-        const bool bShare = (m_bUseReadOnlyMesh && bSourceAligned && m_bAllowStreamSharing);
-
-        if (bShare)
-        {
-            mesh.SetSharedStream(MStream, nStreamIndex, pStreamData, nElemCount);
-        }
-        else
-        {
-            mesh.ReallocStream(MStream, nStreamIndex, nElemCount);
-        }
-
-        SMeshBoneMapping_uint16* const pMeshElements = mesh.GetStreamPtr<SMeshBoneMapping_uint16>(MStream, nStreamIndex);
-        if (!pMeshElements)
-        {
-            // Should never happen because we did check it by COMPILE_TIME_ASSERT() above.
-            m_LastError.Format("Bone mapping has invalid size. Contact an RC programmer.");
-            return false;
-        }
-
-        if (!bShare)
-        {
-            memcpy(pMeshElements, pStreamData, nElemCount * sizeof(pMeshElements[0]));
-        }
-    }
-    else
-    {
-        m_LastError.Format("Bone mapping stream %d has damaged data (elemSize:%u)", (int)MStream, (uint)nStreamElemSize);
-        return false;
-    }
-
-    // Validation
-    {
-        SMeshBoneMapping_uint16* const pMeshElements = mesh.GetStreamPtr<SMeshBoneMapping_uint16>(MStream, nStreamIndex);
-
-        for (int i = 0; i < nElemCount; ++i)
-        {
-            for (int k = 0; k < 4; ++k)
-            {
-                const uint boneIdx = pMeshElements[i].boneIds[k];
-                if (boneIdx >= MAX_NUMBER_OF_BONES)
-                {
-                    m_LastError.Format("Bad bone index detected: %u.", (uint)boneIdx);
-                    return false;
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-template <class MESH_CHUNK_DESC>
-bool CLoaderCGF::LoadIndexStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk)
-{
-    const ECgfStreamType Type = CGF_STREAM_INDICES;
-    CMesh::EStream MStream = CMesh::INDICES;
-    // There is only one index stream per mesh
-    int streamIndex = 0;
-
-    if (chunk.GetStreamChunkID(Type, streamIndex) <= 0)
-    {
-        return true;
-    }
-
-    void* pStreamData;
-    int nStreamType;
-    int nStreamIndex;
-    int nElemCount;
-    int nStreamElemSize;
-    bool bSwapEndianness;
-    if (!LoadStreamDataChunk(chunk.GetStreamChunkID(Type, streamIndex), pStreamData, nStreamType, nStreamIndex, nElemCount, nStreamElemSize, bSwapEndianness))
-    {
-        return false;
-    }
-    if (nStreamType != Type)
-    {
-        m_LastError.Format("Index stream %d has unknown type (%d instead of %d)", (int)MStream, (int)nStreamType, (int)Type);
-        return false;
-    }
-
-    if (nStreamElemSize == sizeof(uint16))
-    {
-        SwapEndian((uint16*)pStreamData, nElemCount, bSwapEndianness);
-    }
-    else if (nStreamElemSize == sizeof(uint32))
-    {
-        SwapEndian((uint32*)pStreamData, nElemCount, bSwapEndianness);
-    }
-    else
-    {
-        m_LastError.Format("Index stream %d has damaged data (elemSize:%u)", (int)MStream, (uint)nStreamElemSize);
-        return false;
-    }
-
-    const bool bSourceAligned = (((UINT_PTR)pStreamData & 0x3) == 0);
-    const bool bShare = (m_bUseReadOnlyMesh && bSourceAligned && m_bAllowStreamSharing);
-
-    COMPILE_TIME_ASSERT(sizeof(mesh.m_pIndices[0]) == sizeof(vtx_idx));
-    COMPILE_TIME_ASSERT(sizeof(vtx_idx) == 2 || sizeof(vtx_idx) == 4);
-
-    if (nStreamElemSize == sizeof(vtx_idx))
-    {
-        if (bShare)
-        {
-            mesh.SetSharedStream(MStream, nStreamIndex, pStreamData, nElemCount);
-        }
-        else
-        {
-            mesh.ReallocStream(MStream, nStreamIndex, nElemCount);
-        }
-
-        void* pMeshIndices = 0;
-        int nMeshIndexSize = 0;
-        mesh.GetStreamInfo(MStream, nStreamIndex, pMeshIndices, nMeshIndexSize);
-        if (nMeshIndexSize != sizeof(vtx_idx))
-        {
-            // Should never happen - we already did COMPILE_TIME_ASSERT(sizeof(mesh.m_pIndices[0]) == sizeof(vtx_idx))
-            m_LastError.Format("Vertex index has invalid size. Contact an RC programmer.");
-            return false;
-        }
-
-        if (!bShare)
-        {
-            memcpy(pMeshIndices, pStreamData, nElemCount * nStreamElemSize);
-        }
-    }
-    else
-    {
-        // Converting index format uint16 <--> uint32
-
-#if !defined(RESOURCE_COMPILER)
-#if 0 // Sokov: commented out the warning because it was confusing users. We will uncomment it after implementing converting files to proper index format during asset exporting.
-        CryWarning(
-            VALIDATOR_MODULE_ASSETS, VALIDATOR_WARNING,
-            "%s: This asset contains vertex indices in incorrect format (%u-bit instead of %u-bit). "
-            "Probably it didn't go through build process yet. "
-            "Disregard this message if this asset was just exported.",
-            m_filename, (uint)nStreamElemSize * 8, (uint)sizeof(vtx_idx) * 8);
-#endif
-#endif
-
-        mesh.ReallocStream(MStream, nStreamIndex, nElemCount);
-
-        void* pMeshIndices = 0;
-        int nMeshIndexSizeCheck = 0;
-        mesh.GetStreamInfo(MStream, nStreamIndex, pMeshIndices, nMeshIndexSizeCheck);
-        if (nMeshIndexSizeCheck != sizeof(vtx_idx))
-        {
-            // Should never happen - we already did COMPILE_TIME_ASSERT(sizeof(mesh.m_pIndices[0]) == sizeof(vtx_idx))
-            m_LastError.Format("Vertex index has invalid size. Contact an RC programmer.");
-            return false;
-        }
-
-        if (nStreamElemSize == sizeof(uint16))
-        {
-            const uint16* const pSrc = (const uint16*)pStreamData;
-            for (int i = 0; i < nElemCount; ++i)
-            {
-                ((uint32*)pMeshIndices)[i] = (uint32)pSrc[i];
-            }
-        }
-        else
-        {
-            const uint32* const pSrc = (const uint32*)pStreamData;
-            for (int i = 0; i < nElemCount; ++i)
-            {
-                const uint32 idx = pSrc[i];
-                if (idx >= 0xffff)   // ">=": index 0xffff is reserved (the engine uses it to mark invalid indices etc)
-                {
-                    m_LastError.Format("Cannot convert index stream %d from %u-bit to %u-bit format because it contains index %u", (int)MStream, (uint)nStreamElemSize * 8, (uint)sizeof(vtx_idx) * 8, (uint)pSrc[i]);
-                    return false;
-                }
-                ((uint16*)pMeshIndices)[i] = (uint16)idx;
-            }
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadCompiledMeshChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc)
-{
-    if (!pChunkDesc || pChunkDesc->chunkType != ChunkType_Mesh)
-    {
-        m_LastError.Format("Corrupted compiled mesh chunk");
-        return false;
-    }
-
-    if (pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0802::VERSION)
-    {
-        MESH_CHUNK_DESC_0802& chunk = *(MESH_CHUNK_DESC_0802*)pChunkDesc->data;
-        return LoadCompiledMeshChunk(pNode, pChunkDesc, chunk);
-    }
-
-    if (pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0801::VERSION || pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0801::COMPATIBLE_OLD_VERSION)
-    {
-        MESH_CHUNK_DESC_0801& chunk = *(MESH_CHUNK_DESC_0801*)pChunkDesc->data;
-        return LoadCompiledMeshChunk(pNode, pChunkDesc, chunk);
-    }
-
-    m_LastError.Format("Unknown version of compiled mesh chunk");
-    return false;
-}
-
-template<class MESH_CHUNK_DESC>
-bool CLoaderCGF::LoadCompiledMeshChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc, MESH_CHUNK_DESC chunk)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (pChunkDesc->bSwapEndian)
-    {
-        SwapEndian(chunk, true);
-        pChunkDesc->bSwapEndian = false;
-    }
-
-    Vec3 bboxMin, bboxMax;
-    memcpy(&bboxMin, &chunk.bboxMin, sizeof(bboxMin));
-    memcpy(&bboxMax, &chunk.bboxMax, sizeof(bboxMax));
-
-    pNode->meshInfo.nVerts = chunk.nVerts;
-    pNode->meshInfo.nIndices = chunk.nIndices;
-    pNode->meshInfo.nSubsets = chunk.nSubsets;
-    pNode->meshInfo.bboxMin = bboxMin;
-    pNode->meshInfo.bboxMax = bboxMax;
-    pNode->meshInfo.fGeometricMean = chunk.geometricMeanFaceArea;
-    pNode->nPhysicalizeFlags = chunk.nFlags2;
-
-    for (int nPhysGeomType = 0; nPhysGeomType < 4; nPhysGeomType++)
-    {
-        if (chunk.nPhysicsDataChunkId[nPhysGeomType] > 0)
-        {
-            LoadPhysicsDataChunk(pNode, nPhysGeomType, chunk.nPhysicsDataChunkId[nPhysGeomType]);
-        }
-    }
-
-    if (chunk.nFlags & MESH_CHUNK_DESC::MESH_IS_EMPTY)
-    {
-        // This is an empty mesh.
-        if (pNode->type == CNodeCGF::NODE_MESH)
-        {
-            // Do not create CMesh for it.
-            m_pCGF->GetExportInfo()->bNoMesh = true;
-        }
-        return true;
-    }
-
-    std::unique_ptr<CMesh> pMesh(new CMesh());
-    CMesh& mesh = *(pMesh.get());
-
-    if (!m_bUseReadOnlyMesh)
-    {
-        mesh.SetVertexCount(chunk.nVerts);
-        mesh.SetIndexCount(chunk.nIndices);
-
-        if (chunk.GetStreamChunkID(CGF_STREAM_TEXCOORDS, 0) > 0)
-        {
-            mesh.ReallocStream(CMesh::TEXCOORDS, 0, chunk.nVerts);
-        }
-    }
-
-    mesh.m_bbox = AABB(bboxMin, bboxMax);
-
-    std::vector<std::vector<uint16> > globalBonesPerSubset;
-
-    if (chunk.nSubsets > 0 && chunk.nSubsetsChunkId > 0)
-    {
-        IChunkFile::ChunkDesc* pSubsetChunkDesc = m_pChunkFile->FindChunkById(chunk.nSubsetsChunkId);
-        if (!pSubsetChunkDesc || pSubsetChunkDesc->chunkType != ChunkType_MeshSubsets)
-        {
-            m_LastError.Format("MeshSubsets Chunk not found in CGF file %s", m_filename);
-            return false;
-        }
-        if (!LoadMeshSubsetsChunk(mesh, pSubsetChunkDesc, globalBonesPerSubset))
-        {
-            return false;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Read streams
-    //////////////////////////////////////////////////////////////////////////
-
-    COMPILE_TIME_ASSERT(sizeof(Vec3f16) == 8);
-
-    bool ok = true;
-
-    // Read position stream.
-    ok = ok && LoadStreamChunk<Vec3, Vec3f16>(mesh, chunk, CGF_STREAM_POSITIONS, 0, CMesh::POSITIONS, CMesh::POSITIONSF16);
-    if (mesh.m_streamSize[CMesh::POSITIONSF16][0] > 0 && !m_bUseReadOnlyMesh)
-    {
-        const int count = mesh.m_streamSize[CMesh::POSITIONSF16][0];
-        mesh.ReallocStream(CMesh::POSITIONS, 0, count);
-
-        void* pSrc = 0;
-        int nSrcElementSize = 0;
-        mesh.GetStreamInfo(CMesh::POSITIONSF16, 0, pSrc, nSrcElementSize);
-        assert(pSrc);
-
-        void* pDst = 0;
-        int nDstElementSize = 0;
-        mesh.GetStreamInfo(CMesh::POSITIONS, 0, pDst, nDstElementSize);
-
-        if (pDst)
-        {
-            const Vec3f16* const pS = (const Vec3f16*)pSrc;
-            Vec3* const pD = (Vec3*)pDst;
-            for (int i = 0; i < count; ++i)
-            {
-                pD[i] = pS[i].ToVec3();
-            }
-            mesh.ReallocStream(CMesh::POSITIONSF16, 0, 0);
-        }
-    }
-
-    // Read normals stream.
-    ok = ok && LoadStreamChunk<Vec3>(mesh, chunk, CGF_STREAM_NORMALS, 0, CMesh::NORMALS);
-
-    // Read Texture coordinates stream.
-    ok = ok && LoadStreamChunk<SMeshTexCoord>(mesh, chunk, CGF_STREAM_TEXCOORDS, 0, CMesh::TEXCOORDS);
-    if (pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0802::VERSION)
-    {
-        ok = ok && LoadStreamChunk<SMeshTexCoord>(mesh, chunk, CGF_STREAM_TEXCOORDS, 1, CMesh::TEXCOORDS);
-    }
-    // Read indices stream.
-    ok = ok && LoadIndexStreamChunk(mesh, chunk);
-
-    // Read colors stream.
-    ok = ok && LoadStreamChunk<SMeshColor>(mesh, chunk, CGF_STREAM_COLORS, 0, CMesh::COLORS);
-
-    // Read 2nd colors stream
-    // For 0801 and prior compatable versions, a second color stream would have a stream type of CGF_STREAM_COLORS2, since only one stream per type was allowed
-    if (pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0801::VERSION || pChunkDesc->chunkVersion == MESH_CHUNK_DESC_0801::COMPATIBLE_OLD_VERSION)
-    {
-        ok = ok && LoadStreamChunk<SMeshColor>(mesh, chunk, CGF_STREAM_COLORS2, 0, CMesh::COLORS);
-    }
-    // For 0802 (which coincides with multiple-uv sets implementation) and beyond, a 2nd color stream would have a type of CGF_STREAM_COLORS with an index of 1
-    else
-    {
-        ok = ok && LoadStreamChunk<SMeshColor>(mesh, chunk, CGF_STREAM_COLORS, 1, CMesh::COLORS);
-    }
-
-    // Read Vertex Mapping.
-    ok = ok && LoadStreamChunk<int>(mesh, chunk, CGF_STREAM_VERT_MATS, 0, CMesh::VERT_MATS);
-
-    // Read Tangent Streams.
-    ok = ok && LoadStreamChunk<SMeshTangents>(mesh, chunk, CGF_STREAM_TANGENTS, 0, CMesh::TANGENTS);
-    ok = ok && LoadStreamChunk<SMeshQTangents>(mesh, chunk, CGF_STREAM_QTANGENTS, 0, CMesh::QTANGENTS);
-
-    // Read interleaved stream.
-    ok = ok && LoadStreamChunk<SVF_P3S_C4B_T2S>(mesh, chunk, CGF_STREAM_P3S_C4B_T2S, 0, CMesh::P3S_C4B_T2S);
-
-    ok = ok && LoadBoneMappingStreamChunk(mesh, chunk, globalBonesPerSubset);
-
-    if (!ok)
-    {
-        return false;
-    }
-
-    if (chunk.nFlags & MESH_CHUNK_DESC::HAS_EXTRA_WEIGHTS)
-    {
-        // The memory being used by the extraWeight array has been allocated in the LoadBoneMappingStreamChunk.
-        mesh.m_pExtraBoneMapping = &mesh.m_pBoneMapping[mesh.GetVertexCount()];
-    }
-
-    if (chunk.nFlags & MESH_CHUNK_DESC::HAS_TEX_MAPPING_DENSITY)
-    {
-        mesh.m_texMappingDensity = chunk.texMappingDensity;
-    }
-    else
-    {
-        mesh.RecomputeTexMappingDensity();
-    }
-
-
-    if (chunk.nFlags & MESH_CHUNK_DESC::HAS_FACE_AREA)
-    {
-        mesh.m_geometricMeanFaceArea = chunk.geometricMeanFaceArea;
-    }
-    else
-    {
-        //if the chunk does not have face area than try computing it
-        mesh.RecomputeGeometricMeanFaceArea();
-    }
-
-    if (mesh.m_geometricMeanFaceArea <= 0.0f)
-    {
-        Warning("Invalid geometric mean face area for node %s on file %s", pNode->name, this->m_filename);
-    }
-
-    pNode->pMesh = pMesh.release();
-
-    if (chunk.GetStreamChunkID(CGF_STREAM_SKINDATA, 0) > 0)
-    {
-        int nStreamType, nStreamIndex, nStreamCount, nElemSize;
-        void* pStreamData;
-        bool bSwapEndianness;
-        if (!LoadStreamDataChunk(chunk.GetStreamChunkID(CGF_STREAM_SKINDATA, 0), pStreamData, nStreamType, nStreamIndex, nStreamCount, nElemSize, bSwapEndianness))
-        {
-            return false;
-        }
-        SwapEndian((CrySkinVtx*)pStreamData, nStreamCount, bSwapEndianness);
-        memcpy(pNode->pSkinInfo = new CrySkinVtx[nStreamCount], pStreamData, nStreamCount * nElemSize);
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadMeshSubsetsChunk(CMesh& mesh, IChunkFile::ChunkDesc* pChunkDesc, std::vector<std::vector<uint16> >& globalBonesPerSubset)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    globalBonesPerSubset.clear();
-
-    if (pChunkDesc->chunkType != ChunkType_MeshSubsets)
-    {
-        m_LastError.Format("Unknown type in mesh subset chunk");
-        return false;
-    }
-
-    if (pChunkDesc->chunkVersion != MESH_SUBSETS_CHUNK_DESC_0800::VERSION)
-    {
-        m_LastError.Format("Unknown version of mesh subset chunk");
-        return false;
-    }
-
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    pChunkDesc->bSwapEndian = false;
-
-    uint8* pCurDataLoc = (uint8*)pChunkDesc->data;
-
-    MESH_SUBSETS_CHUNK_DESC_0800& chunk = *StepData<MESH_SUBSETS_CHUNK_DESC_0800>(pCurDataLoc, bSwapEndianness);
-
-    const bool cbBoneIDs = (chunk.nFlags & MESH_SUBSETS_CHUNK_DESC_0800::BONEINDICES) != 0;
-    const bool cbSubsetTexelDensities = (chunk.nFlags & MESH_SUBSETS_CHUNK_DESC_0800::HAS_SUBSET_TEXEL_DENSITY) != 0;
-
-    for (int i = 0; i < chunk.nCount; i++)
-    {
-        MESH_SUBSETS_CHUNK_DESC_0800::MeshSubset& meshSubset = *StepData<MESH_SUBSETS_CHUNK_DESC_0800::MeshSubset>(pCurDataLoc, bSwapEndianness);
-
-        SMeshSubset subset;
-
-        subset.nFirstIndexId = meshSubset.nFirstIndexId;
-        subset.nNumIndices = meshSubset.nNumIndices;
-        subset.nFirstVertId = meshSubset.nFirstVertId;
-        subset.nNumVerts = meshSubset.nNumVerts;
-        subset.nMatID = meshSubset.nMatID;
-        subset.fRadius = meshSubset.fRadius;
-        subset.vCenter = meshSubset.vCenter;
-        mesh.m_subsets.push_back(subset);
-    }
-
-    //------------------------------------------------------------------
-    if (cbBoneIDs)
-    {
-        globalBonesPerSubset.resize(chunk.nCount);
-
-        for (int i = 0; i < chunk.nCount; i++)
-        {
-            MESH_SUBSETS_CHUNK_DESC_0800::MeshBoneIDs& meshSubset = *StepData<MESH_SUBSETS_CHUNK_DESC_0800::MeshBoneIDs>(pCurDataLoc, bSwapEndianness);
-
-            globalBonesPerSubset[i].resize(meshSubset.numBoneIDs);
-
-            for (uint32 b = 0; b < meshSubset.numBoneIDs; ++b)
-            {
-                globalBonesPerSubset[i][b] = meshSubset.arrBoneIDs[b];
-            }
-        }
-    }
-
-    if (cbSubsetTexelDensities)
-    {
-        for (int i = 0; i < chunk.nCount; i++)
-        {
-            MESH_SUBSETS_CHUNK_DESC_0800::MeshSubsetTexelDensity& meshSubset = *StepData<MESH_SUBSETS_CHUNK_DESC_0800::MeshSubsetTexelDensity>(pCurDataLoc, bSwapEndianness);
-            mesh.m_subsets[i].fTexelDensity = meshSubset.texelDensity;
-        }
-    }
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadStreamDataChunk(int nChunkId, void*& pStreamData, int& nStreamType, int& nStreamIndex, int& nCount, int& nElemSize, bool& bSwapEndianness)
-{
-    IChunkFile::ChunkDesc* pChunkDesc = m_pChunkFile->FindChunkById(nChunkId);
-    if (!pChunkDesc)
-    {
-        m_LastError.Format("Failed to find chunk with id %d", nChunkId);
-        return false;
-    }
-
-    if (pChunkDesc->chunkType != ChunkType_DataStream)
-    {
-        m_LastError.Format("Unknown type of stream data chunk");
-        return false;
-    }
-
-    if (pChunkDesc->chunkVersion != STREAM_DATA_CHUNK_DESC_0800::VERSION && pChunkDesc->chunkVersion != STREAM_DATA_CHUNK_DESC_0801::VERSION)
-    {
-        m_LastError.Format("Unknown version of stream data chunk");
-        return false;
-    }
-
-    LOADING_TIME_PROFILE_SECTION;
-    if (pChunkDesc->chunkVersion == STREAM_DATA_CHUNK_DESC_0800::VERSION)
-    {
-        // Convert legacy .cgf file to the new version
-        STREAM_DATA_CHUNK_DESC_0800& chunk = *(STREAM_DATA_CHUNK_DESC_0800*)pChunkDesc->data;
-        bSwapEndianness = pChunkDesc->bSwapEndian;
-        SwapEndian(chunk, pChunkDesc->bSwapEndian);
-        pChunkDesc->bSwapEndian = false;
-
-        nStreamType = chunk.nStreamType;
-        nStreamIndex = 0; // Since version 0800 didn't have a streamIndex, set the streamIndex to 0
-        nCount = chunk.nCount;
-        nElemSize = chunk.nElementSize;
-        pStreamData = (char*)pChunkDesc->data + sizeof(chunk);
-
-        return true;
-    }
-    else
-    {
-        STREAM_DATA_CHUNK_DESC_0801& chunk = *(STREAM_DATA_CHUNK_DESC_0801*)pChunkDesc->data;
-        bSwapEndianness = pChunkDesc->bSwapEndian;
-        SwapEndian(chunk, pChunkDesc->bSwapEndian);
-        pChunkDesc->bSwapEndian = false;
-
-        nStreamType = chunk.nStreamType;
-        nStreamIndex = chunk.nStreamIndex;
-        nCount = chunk.nCount;
-        nElemSize = chunk.nElementSize;
-        pStreamData = (char*)pChunkDesc->data + sizeof(chunk);
-
-        return true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadPhysicsDataChunk(CNodeCGF* pNode, int nPhysGeomType, int nChunkId)
-{
-    IChunkFile::ChunkDesc* const pChunkDesc = m_pChunkFile->FindChunkById(nChunkId);
-    if (!pChunkDesc)
-    {
-        return false;
-    }
-
-    if (pChunkDesc->chunkType != ChunkType_MeshPhysicsData)
-    {
-        return false;
-    }
-
-    if (pChunkDesc->chunkVersion != MESH_PHYSICS_DATA_CHUNK_DESC_0800::VERSION)
-    {
-        return false;
-    }
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    MESH_PHYSICS_DATA_CHUNK_DESC_0800& chunk = *(MESH_PHYSICS_DATA_CHUNK_DESC_0800*)pChunkDesc->data;
-    SwapEndian(chunk, pChunkDesc->bSwapEndian);
-    pChunkDesc->bSwapEndian = false;
-
-    assert(nPhysGeomType >= 0 && nPhysGeomType < 4);
-
-    pNode->physicalGeomData[nPhysGeomType].resize(chunk.nDataSize);
-    void* const pDst = &(pNode->physicalGeomData[nPhysGeomType][0]);
-    const void* const pSrc = (char*)pChunkDesc->data + sizeof(chunk);
-    memcpy(pDst, pSrc, chunk.nDataSize);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLoaderCGF::LoadFoliageInfoChunk(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    if (pChunkDesc->chunkVersion != FOLIAGE_INFO_CHUNK_DESC::VERSION &&
-        pChunkDesc->chunkVersion != FOLIAGE_INFO_CHUNK_DESC::VERSION2)
-    {
-        m_LastError.Format("Unknown version of FoliageInfo chunk");
-        return false;
-    }
-
-    FOLIAGE_INFO_CHUNK_DESC& chunk = *(FOLIAGE_INFO_CHUNK_DESC*)pChunkDesc->data;
-    const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-    SwapEndian(chunk, bSwapEndianness);
-    pChunkDesc->bSwapEndian = false;
-
-    SFoliageInfoCGF& fi = *m_pCGF->GetFoliageInfo();
-    bool isSkinned = m_pCGF->GetExportInfo()->bSkinnedCGF;
-    fi.nSpines = chunk.nSpines;
-    if (fi.nSpines)
-    {
-        fi.nSkinnedVtx = chunk.nSkinnedVtx;
-
-        FOLIAGE_SPINE_SUB_CHUNK* const pSpineSrc = (FOLIAGE_SPINE_SUB_CHUNK*)(&chunk + 1);
-        Vec3* const pSpineVtxSrc = (Vec3*)(&pSpineSrc[chunk.nSpines]);
-        Vec4* const pSpineSegDimSrc = (Vec4*)(&pSpineVtxSrc[chunk.nSpineVtx]);
-        //START: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
-        float* pStiffness = new float[chunk.nSpineVtx];
-        float* pDamping = new float[chunk.nSpineVtx];
-        float* pThickness = new float[chunk.nSpineVtx];
-        SMeshBoneMapping_uint8* pBoneMappingSrc = nullptr;
-
-        if (pChunkDesc->chunkVersion == FOLIAGE_INFO_CHUNK_DESC::VERSION)
-        {
-            for (int i = 0; i < chunk.nSpineVtx; i++)
-            {
-                pStiffness[i] = SSpineRC::GetDefaultStiffness();
-                pDamping[i] = SSpineRC::GetDefaultDamping();
-                pThickness[i] = SSpineRC::GetDefaultThickness();
-            }
-            pBoneMappingSrc = (SMeshBoneMapping_uint8*)&pSpineSegDimSrc[chunk.nSpineVtx];
-        }
-        else
-        {
-            float* pStiffnessSrc = (float*)(&pSpineSegDimSrc[chunk.nSpineVtx]);
-            float* pDampingSrc = (float*)(&pStiffnessSrc[chunk.nSpineVtx]);
-            float* pThicknessSrc = (float*)(&pDampingSrc[chunk.nSpineVtx]);
-
-            if (bSwapEndianness)
-            {
-                SwapEndian(pStiffnessSrc, chunk.nSpineVtx, true);
-                SwapEndian(pDampingSrc, chunk.nSpineVtx, true);
-                SwapEndian(pThicknessSrc, chunk.nSpineVtx, true);
-            }
-
-            memcpy(pStiffness, pStiffnessSrc, sizeof(pStiffness[0]) * chunk.nSpineVtx);
-            memcpy(pDamping, pDampingSrc, sizeof(pStiffness[0]) * chunk.nSpineVtx);
-            memcpy(pThickness, pThicknessSrc, sizeof(pStiffness[0]) * chunk.nSpineVtx);
-
-            pBoneMappingSrc = (SMeshBoneMapping_uint8*)&pThicknessSrc[chunk.nSpineVtx];
-        }
-
-        //Add LOD support for touch bending vegetation
-        //Load bone mapping. Skinned CGF doesn't have chunkBoneIds because it doesn't need bone index remapping to mesh bone id.
-        if (isSkinned && chunk.nBoneIds == 0)
-        {
-            const char* pStart = (const char*)pBoneMappingSrc;
-            {
-                int numBoneMapping = *pStart;
-                pStart += sizeof(int);
-                int vertexCount = 0;
-
-                for (int i = 0; i < numBoneMapping; i++)
-                {
-                    const char* pCGFNodeName = pStart;
-                    pStart += CGF_NODE_NAME_LENGTH;
-                    memcpy(&vertexCount, pStart, sizeof(int));
-                    SMeshBoneMappingInfo_uint8* pBoneMappingEntry = new SMeshBoneMappingInfo_uint8(vertexCount);
-                    pStart += sizeof(int);
-                    memcpy(pBoneMappingEntry->pBoneMapping, pStart, sizeof(SMeshBoneMapping_uint8)*vertexCount);
-                    pStart += sizeof(SMeshBoneMapping_uint8)*vertexCount;
-
-                    if (bSwapEndianness)
-                    {
-                        SwapEndian(&pBoneMappingEntry->nVertexCount, 1, true);
-                        SwapEndian(pBoneMappingEntry->pBoneMapping, pBoneMappingEntry->nVertexCount, true);
-                    }
-                    fi.boneMappings[pCGFNodeName] = pBoneMappingEntry;
-                }
-            }
-        }
-        else
-        {
-            uint16* const pBoneIdsSrc = (uint16*)(&pBoneMappingSrc[chunk.nSkinnedVtx]);
-            if (bSwapEndianness)
-            {
-                SwapEndian(pBoneMappingSrc, chunk.nSkinnedVtx, true);
-                SwapEndian(pBoneIdsSrc, chunk.nBoneIds, true);
-            }
-            fi.pBoneMapping = new SMeshBoneMapping_uint8[chunk.nSkinnedVtx];
-            memcpy(fi.pBoneMapping, pBoneMappingSrc, sizeof(pBoneMappingSrc[0]) * chunk.nSkinnedVtx);
-            fi.chunkBoneIds.resize(chunk.nBoneIds);
-            memcpy(&fi.chunkBoneIds[0], pBoneIdsSrc, sizeof(fi.chunkBoneIds[0]) * chunk.nBoneIds);
-            COMPILE_TIME_ASSERT(sizeof(fi.chunkBoneIds[0]) == sizeof(pBoneIdsSrc[0]));
-        }
-
-        if (bSwapEndianness)
-        {
-            SwapEndian(pSpineSrc, chunk.nSpines, true);
-            SwapEndian(pSpineVtxSrc, chunk.nSpineVtx, true);
-            SwapEndian(pSpineSegDimSrc, chunk.nSpineVtx, true);
-        }
-
-        Vec3* const pSpineVtx = new Vec3[chunk.nSpineVtx];
-        Vec4* const pSpineSegDim = new Vec4[chunk.nSpineVtx];
-        memcpy(pSpineVtx, pSpineVtxSrc, sizeof(pSpineVtx[0]) * chunk.nSpineVtx);
-        memcpy(pSpineSegDim, pSpineSegDimSrc, sizeof(pSpineSegDim[0]) * chunk.nSpineVtx);
-
-        fi.pSpines = new SSpineRC[chunk.nSpines];
-        int i, j;
-        for (i = j = 0; i < chunk.nSpines; j += fi.pSpines[i++].nVtx)
-        {
-            fi.pSpines[i].nVtx = pSpineSrc[i].nVtx;
-            fi.pSpines[i].len = pSpineSrc[i].len;
-            fi.pSpines[i].navg = pSpineSrc[i].navg;
-            fi.pSpines[i].iAttachSpine = pSpineSrc[i].iAttachSpine - 1;
-            fi.pSpines[i].iAttachSeg = pSpineSrc[i].iAttachSeg - 1;
-            fi.pSpines[i].pVtx = pSpineVtx + j;
-            fi.pSpines[i].pSegDim = pSpineSegDim + j;
-
-            // Per bone data for stiffness, damping and thickness for touch bending vegetation
-            fi.pSpines[i].pStiffness = pStiffness + j;
-            fi.pSpines[i].pDamping = pDamping + j;
-            fi.pSpines[i].pThickness = pThickness + j;
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterialCGF* CLoaderCGF::LoadMaterialFromChunk(int nChunkId)
-{
-    for (int i = 0; i < m_pCGF->GetMaterialCount(); i++)
-    {
-        if (m_pCGF->GetMaterial(i)->nChunkId == nChunkId)
-        {
-            return m_pCGF->GetMaterial(i);
-        }
-    }
-
-    IChunkFile::ChunkDesc* const pChunkDesc = m_pChunkFile->FindChunkById(nChunkId);
-    if (!pChunkDesc)
-    {
-        m_LastError.Format("Can't find material chunk with id %d in file %s", nChunkId, m_filename);
-        return 0;
-    }
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (pChunkDesc->chunkType != ChunkType_MtlName)
-    {
-        m_LastError.Format(
-            "Invalid chunk type (0x%08x instead of expected material chunk type 0x%08x) in chunk %d in file %s",
-            (int)pChunkDesc->chunkType, (int)ChunkType_MtlName, nChunkId, m_filename);
-        return 0;
-    }
-
-    return LoadMaterialNameChunk(pChunkDesc);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-static const char* GetNextAsciizString(const char*& pCurrent, const char* const pEnd)
-{
-    const char* const result = pCurrent;
-
-    while (pCurrent < pEnd && *pCurrent >= ' ')
-    {
-        ++pCurrent;
-    }
-
-    if (pCurrent >= pEnd || *pCurrent != 0)
-    {
-        // If we found that the data are damaged (*pCurrent != 0) then it's
-        // better to stop using the data. We move pCurrent to the end
-        // for that - it guarantees that all future calls return "".
-        pCurrent = pEnd;
-        return "";
-    }
-
-    ++pCurrent;
-
-    return result;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CMaterialCGF* CLoaderCGF::LoadMaterialNameChunk(IChunkFile::ChunkDesc* pChunkDesc)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (pChunkDesc->chunkVersion == MTL_NAME_CHUNK_DESC_0802::VERSION)
-    {
-        MTL_NAME_CHUNK_DESC_0802 chunk;
-
-        const bool bSwapEndianness = pChunkDesc->bSwapEndian;
-
-        memcpy(&chunk, pChunkDesc->data, sizeof(chunk));
-        SwapEndian(chunk, bSwapEndianness);
-
-        CMaterialCGF* pMtlCGF = Construct<CMaterialCGF>(InplaceFactory(m_pDestructFnc), m_pAllocFnc);
-        pMtlCGF->nChunkId = pChunkDesc->chunkId;
-        m_pCGF->AddMaterial(pMtlCGF);
-
-        for (size_t i = 0; i < sizeof(chunk.name); ++i)
-        {
-            if (chunk.name[i] == '\\')
-            {
-                chunk.name[i] = '/';
-            }
-        }
-        cry_strcpy(pMtlCGF->name, chunk.name);
-
-        const int32 slotCount = (chunk.nSubMaterials <= 0) ? 1 : chunk.nSubMaterials;
-        const int nPhysicalizeTypeMaxCount = (pChunkDesc->size - sizeof(MTL_NAME_CHUNK_DESC_0802)) / sizeof(int32);
-
-        if (slotCount > nPhysicalizeTypeMaxCount)
-        {
-            m_LastError.Format("Corrupted MTL_NAME_CHUNK_DESC_0802 chunk");
-            return NULL;
-        }
-
-        const int32* const pPhysicalizeTypes = (const int32*)((const char*)pChunkDesc->data + sizeof(MTL_NAME_CHUNK_DESC_0802));
-
-        if (chunk.nSubMaterials <= 0)
-        {
-            int nPhysicalizeType = pPhysicalizeTypes[0];
-            SwapEndian(nPhysicalizeType, bSwapEndianness);
-            pMtlCGF->nPhysicalizeType = nPhysicalizeType;
-        }
-        else if (chunk.nSubMaterials <= MAX_SUB_MATERIALS)
-        {
-            const char* pNames = (const char*)&pPhysicalizeTypes[slotCount];
-            const char* const pNamesEnd = (const char*)pChunkDesc->data + pChunkDesc->size;
-
-            for (int i = 0; i < chunk.nSubMaterials; ++i)
-            {
-                CMaterialCGF* const pSubMaterial = new CMaterialCGF;
-
-                cry_strcpy(pSubMaterial->name, GetNextAsciizString(pNames, pNamesEnd));
-
-                int nPhysicalizeType = pPhysicalizeTypes[i];
-                SwapEndian(nPhysicalizeType, bSwapEndianness);
-
-                if (nPhysicalizeType != PHYS_GEOM_TYPE_NONE &&
-                    (nPhysicalizeType < PHYS_GEOM_TYPE_DEFAULT || nPhysicalizeType > PHYS_GEOM_TYPE_DEFAULT_PROXY))
-                {
-                    m_LastError.Format("Invalid physicalize type in material name chunk (0x%08x) in %s, %s", nPhysicalizeType, pMtlCGF->name, m_filename);
-                    return NULL;
-                }
-
-                pSubMaterial->nPhysicalizeType = nPhysicalizeType;
-                pMtlCGF->subMaterials.push_back(pSubMaterial);
-                m_pCGF->AddMaterial(pSubMaterial);
-            }
-        }
-        else
-        {
-            m_LastError.Format("Material name chunk: too many submaterials (0x%08x) in %s, %s", chunk.nSubMaterials, pMtlCGF->name, m_filename);
-            return NULL;
-        }
-
-        return pMtlCGF;
-    }
-
-    if (pChunkDesc->chunkVersion == MTL_NAME_CHUNK_DESC_0800::VERSION)
-    {
-        if (pChunkDesc->size > sizeof(MTL_NAME_CHUNK_DESC_0800))
-        {
-            m_LastError.Format("Illegal material name chunk size %s (%d should be %d)", m_filename, (int)pChunkDesc->size, (int)sizeof(MTL_NAME_CHUNK_DESC_0800));
-            return NULL;
-        }
-
-        MTL_NAME_CHUNK_DESC_0800& chunk = *(MTL_NAME_CHUNK_DESC_0800*)pChunkDesc->data;
-        SwapEndian(chunk, pChunkDesc->bSwapEndian);
-        pChunkDesc->bSwapEndian = false;
-
-        for (size_t i = 0; i < sizeof(chunk.name); ++i)
-        {
-            if (chunk.name[i] == '\\')
-            {
-                chunk.name[i] = '/';
-            }
-        }
-
-        CMaterialCGF* pMtlCGF = Construct<CMaterialCGF>(InplaceFactory(m_pDestructFnc), m_pAllocFnc);
-        pMtlCGF->nChunkId = pChunkDesc->chunkId;
-        m_pCGF->AddMaterial(pMtlCGF);
-        cry_strcpy(pMtlCGF->name, chunk.name);
-
-        // hack for old broken assets
-        if (size_t(chunk.nSubMaterials) > 0xffff || chunk.nPhysicalizeType > 0xffff)
-        {
-            Warning("Fixing material name chunk with wrong endianness: %s, %s", pMtlCGF->name, m_filename);
-            Warning(" nSubMaterials=0x%08x, nPhysicalizeType=0x%08x, nFlags=0x%08x",
-                int(chunk.nSubMaterials), int(chunk.nPhysicalizeType), int(chunk.nFlags));
-            SwapEndian(chunk, true);
-        }
-
-        pMtlCGF->nPhysicalizeType = chunk.nPhysicalizeType;
-        if ((unsigned int)pMtlCGF->nPhysicalizeType <= (PHYS_GEOM_TYPE_DEFAULT_PROXY - PHYS_GEOM_TYPE_DEFAULT))
-        {
-            pMtlCGF->nPhysicalizeType += PHYS_GEOM_TYPE_DEFAULT; // fixup if was exported with PHYS_GEOM_TYPE_DEFAULT==0
-        }
-
-        if (pMtlCGF->nPhysicalizeType != PHYS_GEOM_TYPE_NONE &&
-            (pMtlCGF->nPhysicalizeType < PHYS_GEOM_TYPE_DEFAULT ||
-                pMtlCGF->nPhysicalizeType > PHYS_GEOM_TYPE_DEFAULT_PROXY))
-        {
-            m_LastError.Format("Invalid physicalize type in material name chunk (0x%08x) in %s, %s", pMtlCGF->nPhysicalizeType, pMtlCGF->name, m_filename);
-            return NULL;
-        }
-
-        if (size_t(chunk.nSubMaterials) <= MTL_NAME_CHUNK_DESC_0800_MAX_SUB_MATERIALS)
-        {
-            pMtlCGF->subMaterials.resize(chunk.nSubMaterials, NULL);
-            for (int i = 0; i < chunk.nSubMaterials; i++)
-            {
-                if (chunk.nSubMatChunkId[i] > 0)
-                {
-                    CMaterialCGF* const pMtl = LoadMaterialFromChunk(chunk.nSubMatChunkId[i]);
-                    if (!pMtl)
-                    {
-                        return NULL;
-                    }
-                    if (!pMtl->subMaterials.empty())
-                    {
-                        m_LastError.Format("Multi-material used as sub-material from file %s", m_filename);
-                        return NULL;
-                    }
-                    pMtlCGF->subMaterials[i] = pMtl;
-                }
-            }
-        }
-        else
-        {
-            m_LastError.Format("Material name chunk: too many submaterials (0x%08x) in %s, %s", chunk.nSubMaterials, pMtlCGF->name, m_filename);
-            return NULL;
-        }
-        return pMtlCGF;
-    }
-
-    m_LastError.Format("Illegal material name chunk %s", m_filename);
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLoaderCGF::Warning(const char* szFormat, ...)
-{
-    if (m_pListener)
-    {
-        char szBuffer[1024];
-        va_list args;
-        va_start(args, szFormat);
-        azvsprintf(szBuffer, szFormat, args);
-        m_pListener->Warning(szBuffer);
-        va_end(args);
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/CGF/CGFLoader.h b/Code/CryEngine/Cry3DEngine/CGF/CGFLoader.h
deleted file mode 100644
index 6377f71d84..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/CGFLoader.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_CGFLOADER_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_CGFLOADER_H
-#pragma once
-
-#include "../MeshCompiler/MeshCompiler.h"
-#include "ChunkFile.h"
-#include "CGFContent.h"
-
-#if defined(RESOURCE_COMPILER) || defined(ENABLE_NON_COMPILED_CGF)
-#include "../../../Tools/CryCommonTools/Export/MeshUtils.h"
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-class ILoaderCGFListener
-{
-public:
-    virtual ~ILoaderCGFListener(){}
-    virtual void Warning(const char* format) = 0;
-    virtual void Error(const char* format) = 0;
-    virtual bool IsValidationEnabled() { return true; }
-};
-
-class CLoaderCGF
-{
-public:
-    typedef void* (* AllocFncPtr)(size_t);
-    typedef void (* DestructFncPtr)(void*);
-
-    CLoaderCGF(AllocFncPtr pAlloc = operator new, DestructFncPtr pDestruct = operator delete, bool bAllowStreamSharing = true);
-    ~CLoaderCGF();
-
-    CContentCGF* LoadCGF(const char* filename, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags = 0);
-    bool LoadCGF(CContentCGF* pContentCGF, const char* filename, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags = 0);
-    bool LoadCGFFromMem(CContentCGF* pContentCGF, const void* pData, size_t nDataLen, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags = 0);
-    bool LoadCGFWork(CContentCGF* pContentCGF, const char* filename, IChunkFile& chunkFile, ILoaderCGFListener* pListener, unsigned long nLoadingFlags);
-
-    const char* GetLastError() { return m_LastError; }
-    CContentCGF* GetCContentCGF() { return m_pCompiledCGF; }
-
-    void SetMaxWeightsPerVertex(int maxWeightsPerVertex) { m_maxWeightsPerVertex = maxWeightsPerVertex; }
-
-private:
-    bool LoadChunks(bool bJustGeometry);
-    bool LoadExportFlagsChunk(IChunkFile::ChunkDesc* pChunkDesc);
-    bool LoadNodeChunk(IChunkFile::ChunkDesc* pChunkDesc, bool bJustGeometry);
-
-    bool LoadHelperChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc);
-    bool LoadGeomChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc);
-    bool LoadCompiledMeshChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc);
-    template<class MESH_CHUNK_DESC>
-    bool LoadCompiledMeshChunk(CNodeCGF* pNode, IChunkFile::ChunkDesc* pChunkDesc, MESH_CHUNK_DESC chunk);
-    bool LoadMeshSubsetsChunk(CMesh& mesh, IChunkFile::ChunkDesc* pChunkDesc, std::vector<std::vector<uint16> >& globalBonesPerSubset);
-    bool LoadStreamDataChunk(int nChunkId, void*& pStreamData, int& nStreamType, int& nStreamIndex, int& nCount, int& nElemSize, bool& bSwapEndianness);
-    template<class T, class MESH_CHUNK_DESC>
-    bool LoadStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk, ECgfStreamType Type, int streamIndex, CMesh::EStream MStream);
-    //! Used to load data into one of two potential destination streams in CMesh determined by the element size of the data stored in the .cgf. e.g. load into either CMesh::POSITIONS or CMesh::POSITIONS16
-    template<class TA, class TB, class MESH_CHUNK_DESC>
-    bool LoadStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk, ECgfStreamType Type, int streamIndex, CMesh::EStream MStreamA, CMesh::EStream MStreamB);
-    template<class MESH_CHUNK_DESC>
-    bool LoadBoneMappingStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk, const std::vector<std::vector<uint16> >& globalBonesPerSubset);
-    template<class MESH_CHUNK_DESC>
-    bool LoadIndexStreamChunk(CMesh& mesh, const MESH_CHUNK_DESC& chunk);
-
-    bool LoadPhysicsDataChunk(CNodeCGF* pNode, int nPhysGeomType, int nChunkId);
-
-    bool LoadFoliageInfoChunk(IChunkFile::ChunkDesc* pChunkDesc);
-
-    CMaterialCGF* LoadMaterialFromChunk(int nChunkId);
-
-    CMaterialCGF* LoadMaterialNameChunk(IChunkFile::ChunkDesc* pChunkDesc);
-
-    void ProcessNodes();
-    void SetupMeshSubsets(CMesh& mesh, CMaterialCGF* pMaterialCGF);
-
-    //////////////////////////////////////////////////////////////////////////
-    // loading of skinned meshes
-    //////////////////////////////////////////////////////////////////////////
-    bool ProcessSkinning();
-    CContentCGF* MakeCompiledSkinCGF(CContentCGF* pCGF, std::vector<int>* pVertexRemapping, std::vector<int>* pIndexRemapping);
-
-    //old chunks
-    bool ReadBoneNameList(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadMorphTargets(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadBoneInitialPos(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadBoneHierarchy(IChunkFile::ChunkDesc* pChunkDesc);
-    uint32 RecursiveBoneLoader(int nBoneParentIndex, int nBoneIndex);
-    bool ReadBoneMesh(IChunkFile::ChunkDesc* pChunkDesc);
-
-    //new chunks
-    bool ReadCompiledBones(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadCompiledPhysicalBones(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadCompiledPhysicalProxies(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadCompiledMorphTargets(IChunkFile::ChunkDesc* pChunkDesc);
-
-    bool ReadCompiledIntFaces(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadCompiledIntSkinVertice(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadCompiledExt2IntMap(IChunkFile::ChunkDesc* pChunkDesc);
-    bool ReadCompiledBonesBoxes(IChunkFile::ChunkDesc* pChunkDesc);
-
-    bool ReadCompiledBreakablePhysics(IChunkFile::ChunkDesc* pChunkDesc);
-
-    void Warning(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-
-private:
-    uint32 m_IsCHR;
-    uint32 m_CompiledBones;
-    uint32 m_CompiledBonesBoxes;
-    uint32 m_CompiledMesh;
-
-    uint32 m_numBonenameList;
-    uint32 m_numBoneInitialPos;
-    uint32 m_numMorphTargets;
-    uint32 m_numBoneHierarchy;
-
-    std::vector<uint32> m_arrIndexToId;     // the mapping BoneIndex -> BoneID
-    std::vector<uint32> m_arrIdToIndex;     // the mapping BoneID -> BineIndex
-    std::vector<string> m_arrBoneNameTable; // names of bones
-    std::vector<Matrix34> m_arrInitPose34;
-#if defined(RESOURCE_COMPILER) || defined(ENABLE_NON_COMPILED_CGF)
-    std::vector<MeshUtils::VertexLinks> m_arrLinksTmp;
-    std::vector<int> m_vertexOldToNew;      // used to re-map uncompiled Morph Target vertices right after reading them
-#endif
-
-    CContentCGF* m_pCompiledCGF;
-    const void* m_pBoneAnimRawData, * m_pBoneAnimRawDataEnd;
-    uint32 m_numBones;
-    int m_nNextBone;
-
-    //////////////////////////////////////////////////////////////////////////
-
-    string m_LastError;
-
-    char m_filename[260];
-
-    IChunkFile* m_pChunkFile;
-    CContentCGF* m_pCGF;
-
-    // To find really used materials
-    uint16 MatIdToSubset[MAX_SUB_MATERIALS];
-    int nLastChunkId;
-
-    ILoaderCGFListener* m_pListener;
-
-    bool m_bUseReadOnlyMesh;
-    bool m_bAllowStreamSharing;
-
-    int m_maxWeightsPerVertex;
-
-    AllocFncPtr m_pAllocFnc;
-    DestructFncPtr m_pDestructFnc;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_CGFLOADER_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/CGFSaver.cpp b/Code/CryEngine/Cry3DEngine/CGF/CGFSaver.cpp
deleted file mode 100644
index f3dfc60696..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/CGFSaver.cpp
+++ /dev/null
@@ -1,1603 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include <platform.h>
-
-#if !defined(CONSOLE)
-#   define INCLUDE_SAVECGF
-#endif
-
-#if defined(RESOURCE_COMPILER) || defined(INCLUDE_SAVECGF)
-
-#include "CGFSaver.h"
-#include "ChunkData.h"
-#include "ChunkFile.h"
-#include "QTangent.h"
-
-#if defined(RESOURCE_COMPILER)
-
-#include "SwapEndianness.h"
-#include "CompileTimeAssert.h"
-
-// If RESOURCE_COMPILER is defined, then this library must be linked to a target that has the following RCLog methods implemented
-extern void RCLog(const char* szFormat, ...);
-extern void RCLogWarning(const char* szFormat, ...);
-extern void RCLogError(const char* szFormat, ...);
-
-
-#endif
-
-#include "QTangent.h"
-
-#define SCALE_TO_CGF 100.0f
-
-//////////////////////////////////////////////////////////////////////////
-CSaverCGF::CSaverCGF(CChunkFile& chunkFile)
-{
-    assert(&chunkFile);
-    m_pChunkFile = &chunkFile;
-    m_bDoNotSaveMeshData = false;
-    m_bDoNotSaveNonMeshData = false;
-    m_bSavePhysicsMeshes = true;
-    m_bCompactVertexStreams = false;
-    m_bComputeSubsetTexelDensity = false;
-    m_pCGF = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSaverCGF::SetMeshDataSaving(bool bEnable)
-{
-    m_bDoNotSaveMeshData = !bEnable;
-}
-
-void CSaverCGF::SetNonMeshDataSaving(bool bEnable)
-{
-    m_bDoNotSaveNonMeshData = !bEnable;
-}
-
-void CSaverCGF::SetSavePhysicsMeshes(bool bEnable)
-{
-    m_bSavePhysicsMeshes = bEnable;
-}
-
-void CSaverCGF::SetVertexStreamCompacting(bool bEnable)
-{
-    m_bCompactVertexStreams = bEnable;
-}
-
-void CSaverCGF::SetSubsetTexelDensityComputing(bool bEnable)
-{
-    m_bComputeSubsetTexelDensity = bEnable;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSaverCGF::SaveContent(
-    CContentCGF* pCGF,
-    bool bSwapEndian,
-    bool bStorePositionsAsF16,
-    bool bUseQtangents,
-    bool bStoreIndicesAsU16)
-{
-    SetContent(pCGF);
-
-    SaveExportFlags(bSwapEndian);
-    SaveMaterials(bSwapEndian);
-    SaveNodes(bSwapEndian, bStorePositionsAsF16, bUseQtangents, bStoreIndicesAsU16);
-    SaveBreakablePhysics(bSwapEndian);
-    SaveFoliage();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSaverCGF::SetContent(CContentCGF* pCGF)
-{
-    m_pCGF = pCGF;
-}
-
-
-const CContentCGF* CSaverCGF::GetContent() const
-{
-    return m_pCGF;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledBones(bool bSwapEndian, void* pData, int nSize, int version)
-{
-    COMPILED_BONE_CHUNK_DESC_0800 chunk;
-    ZeroStruct(chunk);
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_CompiledBones,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledPhysicalBones(bool bSwapEndian, void* pData, int nSize, int version)
-{
-    COMPILED_PHYSICALBONE_CHUNK_DESC_0800 chunk;
-    ZeroStruct(chunk);
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_CompiledPhysicalBones,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledPhysicalProxis(bool bSwapEndian, void* pData, int nSize, uint32 numPhysicalProxies, int version)
-{
-    COMPILED_PHYSICALPROXY_CHUNK_DESC_0800 chunk;
-    ZeroStruct(chunk);
-    chunk.numPhysicalProxies = numPhysicalProxies;
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_CompiledPhysicalProxies,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledMorphTargets(bool bSwapEndian, void* pData, int nSize, uint32 numMorphTargets, int version)
-{
-    COMPILED_MORPHTARGETS_CHUNK_DESC_0800 chunk;
-    ZeroStruct(chunk);
-    chunk.numMorphTargets = numMorphTargets;
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_CompiledMorphTargets,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledIntSkinVertices(bool bSwapEndian, void* pData, int nSize, int version)
-{
-    COMPILED_INTSKINVERTICES_CHUNK_DESC_0800 chunk;
-    ZeroStruct(chunk);
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_CompiledIntSkinVertices,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledIntFaces(bool bSwapEndian, void* pData, int nSize, int version)
-{
-    CChunkData chunkData;
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_CompiledIntFaces,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledBoneBox(bool bSwapEndian, void* pData, int nSize, int version)
-{
-    CChunkData chunkData;
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_BonesBoxes,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveCompiledExt2IntMap(bool bSwapEndian, void* pData, int nSize, int version)
-{
-    CChunkData chunkData;
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_CompiledExt2IntMap,
-        version,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveBones(bool bSwapEndian, void* pData, int numBones, int nSize)
-{
-    BONEANIM_CHUNK_DESC_0290 chunk;
-    ZeroStruct(chunk);
-    chunk.nBones = numBones;
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_BoneAnim,
-        BONEANIM_CHUNK_DESC_0290::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveBoneNames(bool bSwapEndian, char* boneList, int numBones, int listSize)
-{
-    BONENAMELIST_CHUNK_DESC_0745 chunk;
-    ZeroStruct(chunk);
-    chunk.numEntities = numBones;
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(boneList, listSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_BoneNameList,
-        BONENAMELIST_CHUNK_DESC_0745::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveBoneInitialMatrices(bool bSwapEndian, SBoneInitPosMatrix* matrices, int numBones, int nSize)
-{
-    BONEINITIALPOS_CHUNK_DESC_0001 chunk;
-    ZeroStruct(chunk);
-    chunk.numBones = numBones;
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(matrices, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_BoneInitialPos,
-        BONEINITIALPOS_CHUNK_DESC_0001::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveBoneMesh([[maybe_unused]] bool bSwapEndian, PhysicalProxy& proxy)
-{
-    // uncompiled mesh chunk
-    MESH_CHUNK_DESC_0745 chunk;
-    ZeroStruct(chunk);
-
-    int numVertices = proxy.m_arrPoints.size();
-    int numFaces = proxy.m_arrMaterials.size();
-
-    chunk.nFaces = numFaces;
-    chunk.nTVerts = 0;
-    chunk.nVerts = numVertices;
-    chunk.VertAnimID = -1;
-
-    // add chunk members
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-
-    // copy positions and vertices to a CryVertex array -----------------------------------
-    CryVertex* vertices = new CryVertex[numVertices];
-    for (int i = 0; i < numVertices; i++)
-    {
-        vertices[i].p = proxy.m_arrPoints[i] * 100.0f;
-        vertices[i].n = Vec3(ZERO);
-    }
-    chunkData.AddData(vertices, numVertices * sizeof(CryVertex));
-    SAFE_DELETE_ARRAY(vertices);
-
-    // copy faces to a CryFace array ------------------------------------------------------
-    CryFace* faces = new CryFace[numFaces];
-    for (int i = 0; i < numFaces; i++)
-    {
-        faces[i].v0 = proxy.m_arrIndices[i * 3 + 0];
-        faces[i].v1 = proxy.m_arrIndices[i * 3 + 1];
-        faces[i].v2 = proxy.m_arrIndices[i * 3 + 2];
-        faces[i].MatID = proxy.m_arrMaterials[i];
-    }
-    chunkData.AddData(faces, numFaces * sizeof(CryFace));
-    SAFE_DELETE_ARRAY(faces);
-
-    int nMeshChunkId = m_pChunkFile->AddChunk(
-        ChunkType_BoneMesh,
-        MESH_CHUNK_DESC_0745::VERSION,
-        eEndianness_Native,
-        chunkData.data, chunkData.size);
-
-    return nMeshChunkId;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSaverCGF::SaveNodes(
-    bool bSwapEndian,
-    bool bStorePositionsAsF16,
-    bool bUseQtangents,
-    bool bStoreIndicesAsU16
-    )
-{
-    m_savedNodes.clear();
-    uint32 numNodes = m_pCGF->GetNodeCount();
-    for (uint i = 0; i < numNodes; i++)
-    {
-        CNodeCGF* pNode = m_pCGF->GetNode(i);
-        SaveNode(pNode, bSwapEndian, bStorePositionsAsF16, bUseQtangents, bStoreIndicesAsU16);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(RESOURCE_COMPILER)
-void CSaverCGF::SaveUncompiledNodes()
-{
-    m_savedNodes.clear();
-    uint32 numNodes = m_pCGF->GetNodeCount();
-    for (int i = 0; i < numNodes; i++)
-    {
-        CNodeCGF* pNode = m_pCGF->GetNode(i);
-        SaveUncompiledNode(pNode);
-    }
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveNode(
-    CNodeCGF* const pNode,
-    const bool bSwapEndian,
-    const bool bStorePositionsAsF16,
-    const bool bUseQtangents,
-    const bool bStoreIndicesAsU16
-    )
-{
-    if (m_savedNodes.find(pNode) != m_savedNodes.end())
-    {
-        return pNode->nChunkId;
-    }
-
-    if (m_bDoNotSaveNonMeshData && (pNode->bPhysicsProxy || !pNode->pMesh))
-    {
-        return -1;
-    }
-
-    m_savedNodes.insert(pNode);
-
-    NODE_CHUNK_DESC_0824 chunk;
-    ZeroStruct(chunk);
-
-    for (int i = 0; i < m_pCGF->GetNodeCount(); ++i)
-    {
-        CNodeCGF* const pOtherNode = m_pCGF->GetNode(i);
-        if (pOtherNode->pParent == pNode)
-        {
-            chunk.nChildren++;
-        }
-    }
-
-    cry_strcpy(chunk.name, pNode->name);
-    azstrncpy(chunk.name, sizeof(chunk.name), pNode->name, sizeof(pNode->name));
-    chunk.name[sizeof(chunk.name) - 1] = 0;
-
-    // Set matrix to node chunk.
-    float* pMat = (float*)&chunk.tm;
-    pMat[0] = pNode->localTM(0, 0);
-    pMat[1] = pNode->localTM(1, 0);
-    pMat[2] = pNode->localTM(2, 0);
-    pMat[4] = pNode->localTM(0, 1);
-    pMat[5] = pNode->localTM(1, 1);
-    pMat[6] = pNode->localTM(2, 1);
-    pMat[8] = pNode->localTM(0, 2);
-    pMat[9] = pNode->localTM(1, 2);
-    pMat[10] = pNode->localTM(2, 2);
-    pMat[12] = pNode->localTM.GetTranslation().x * SCALE_TO_CGF;
-    pMat[13] = pNode->localTM.GetTranslation().y * SCALE_TO_CGF;
-    pMat[14] = pNode->localTM.GetTranslation().z * SCALE_TO_CGF;
-
-    if (pNode->pMaterial)
-    {
-        chunk.MatID = pNode->pMaterial->nChunkId;
-    }
-
-    chunk.ObjectID = -1;
-    chunk.ParentID = -1;
-
-    if (pNode->pParent)
-    {
-        pNode->nParentChunkId = SaveNode(pNode->pParent, bSwapEndian, bStorePositionsAsF16, bUseQtangents, bStoreIndicesAsU16);
-        chunk.ParentID = pNode->nParentChunkId;
-    }
-
-    if (pNode->type == CNodeCGF::NODE_MESH ||
-        (pNode->type == CNodeCGF::NODE_HELPER && pNode->helperType == HP_GEOMETRY))
-    {
-        pNode->nObjectChunkId = SaveNodeMesh(pNode, bSwapEndian, bStorePositionsAsF16, bUseQtangents, bStoreIndicesAsU16);
-    }
-    else if (pNode->type == CNodeCGF::NODE_HELPER)
-    {
-        pNode->nObjectChunkId = (pNode->helperType == HP_GEOMETRY)
-            ? SaveNodeMesh(pNode, bSwapEndian, bStorePositionsAsF16, bUseQtangents, bStoreIndicesAsU16)
-            : SaveHelperChunk(pNode, bSwapEndian);
-    }
-
-    int positionIndex = pNode->pos_cont_id;
-    int rotationIndex = pNode->rot_cont_id;
-    int scaleIndex = pNode->scl_cont_id;
-
-    chunk.pos_cont_id = positionIndex;
-    chunk.rot_cont_id = rotationIndex;
-    chunk.scl_cont_id = scaleIndex;
-
-    chunk.ObjectID = pNode->nObjectChunkId;
-    chunk.PropStrLen = pNode->properties.length();
-
-    const int PropLen = chunk.PropStrLen;
-
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    // Copy property string
-    chunkData.AddData(pNode->properties.c_str(), PropLen);
-
-    pNode->nChunkId = m_pChunkFile->AddChunk(
-        ChunkType_Node,
-        NODE_CHUNK_DESC_0824::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-
-    return pNode->nChunkId;
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(RESOURCE_COMPILER)
-int CSaverCGF::SaveUncompiledNode(CNodeCGF* pNode)
-{
-    if (m_savedNodes.find(pNode) != m_savedNodes.end())
-    {
-        return pNode->nChunkId;
-    }
-
-    m_savedNodes.insert(pNode);
-
-    NODE_CHUNK_DESC_0824 chunk;
-    ZeroStruct(chunk);
-
-    for (int i = 0; i < m_pCGF->GetNodeCount(); i++)
-    {
-        CNodeCGF* pOtherNode = m_pCGF->GetNode(i);
-        if (pOtherNode->pParent == pNode)
-        {
-            chunk.nChildren++;
-        }
-    }
-
-    azstrncpy(chunk.name, sizeof(chunk.name), pNode->name, sizeof(pNode->name));
-    chunk.name[sizeof(chunk.name) - 1] = 0;
-
-    chunk.pos_cont_id = pNode->pos_cont_id;
-    chunk.rot_cont_id = pNode->rot_cont_id;
-    chunk.scl_cont_id = pNode->scl_cont_id;
-
-    // Set matrix to node chunk.
-    float* pMat = (float*)&chunk.tm;
-    pMat[0] = pNode->localTM(0, 0);
-    pMat[1] = pNode->localTM(1, 0);
-    pMat[2] = pNode->localTM(2, 0);
-    pMat[4] = pNode->localTM(0, 1);
-    pMat[5] = pNode->localTM(1, 1);
-    pMat[6] = pNode->localTM(2, 1);
-    pMat[8] = pNode->localTM(0, 2);
-    pMat[9] = pNode->localTM(1, 2);
-    pMat[10] = pNode->localTM(2, 2);
-    pMat[12] = pNode->localTM.GetTranslation().x * SCALE_TO_CGF;
-    pMat[13] = pNode->localTM.GetTranslation().y * SCALE_TO_CGF;
-    pMat[14] = pNode->localTM.GetTranslation().z * SCALE_TO_CGF;
-
-    if (pNode->pMaterial)
-    {
-        chunk.MatID = pNode->pMaterial->nChunkId;
-    }
-
-    chunk.ObjectID = -1;
-    chunk.ParentID = -1;
-    if (pNode->pParent)
-    {
-        pNode->nParentChunkId = SaveUncompiledNode(pNode->pParent);
-        chunk.ParentID = pNode->nParentChunkId;
-    }
-    if (pNode->type == CNodeCGF::NODE_MESH && pNode->pMesh && pNode->pMesh->GetFaceCount() > 0)
-    {
-        pNode->nObjectChunkId = SaveUncompiledNodeMesh(pNode);
-    }
-    if (pNode->type == CNodeCGF::NODE_HELPER && pNode->helperType == HP_GEOMETRY && pNode->pMesh)
-    {
-        pNode->nObjectChunkId = SaveUncompiledNodeMesh(pNode);
-    }
-    else if (pNode->type == CNodeCGF::NODE_HELPER)
-    {
-        pNode->nObjectChunkId = SaveUncompiledHelperChunk(pNode);
-    }
-    else if (pNode->type == CNodeCGF::NODE_LIGHT)
-    {
-        // Save Light chunk
-    }
-
-    chunk.ObjectID = pNode->nObjectChunkId;
-    chunk.PropStrLen = pNode->properties.length();
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    // Copy property string
-    chunkData.AddData(pNode->properties.c_str(), chunk.PropStrLen);
-
-    pNode->nChunkId = m_pChunkFile->AddChunk(
-        ChunkType_Node,
-        NODE_CHUNK_DESC_0824::VERSION,
-        eEndianness_Native,
-        chunkData.data, chunkData.size);
-
-    return pNode->nChunkId;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(RESOURCE_COMPILER)
-void CSaverCGF::SaveUncompiledMorphTargets()
-{
-    CSkinningInfo* skinningInfo = (m_pCGF ? m_pCGF->GetSkinningInfo() : 0);
-    for (int morphIndex = 0, morphCount = int(skinningInfo ? skinningInfo->m_arrMorphTargets.size() : 0); morphIndex < morphCount; ++morphIndex)
-    {
-        MorphTargets* morph = skinningInfo->m_arrMorphTargets[morphIndex];
-
-        MESHMORPHTARGET_CHUNK_DESC_0001 chunk;
-        ZeroStruct(chunk);
-        chunk.nChunkIdMesh = -1; // TODO: Save this properly!
-        chunk.numMorphVertices = (skinningInfo ? int(morph->m_arrIntMorph.size()) : 0);
-
-        CChunkData chunkData;
-        chunkData.Add(chunk);
-        if (morph->m_arrIntMorph.size())
-        {
-            chunkData.AddData(&morph->m_arrIntMorph[0], int(morph->m_arrIntMorph.size() * sizeof(SMeshMorphTargetVertex)));
-        }
-        chunkData.AddData(morph->m_strName.c_str(), int(morph->m_strName.size() + 1));
-
-        m_pChunkFile->AddChunk(
-            ChunkType_MeshMorphTarget,
-            MESHMORPHTARGET_CHUNK_DESC_0001::VERSION,
-            eEndianness_Native,
-            chunkData.data, chunkData.size);
-    }
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveNodeMesh(
-    CNodeCGF* pNode,
-    bool bSwapEndian,
-    bool bStorePositionsAsF16,
-    bool bUseQTangents,
-    bool bStoreIndicesAsU16)
-{
-    if (pNode->pMesh)
-    {
-        if (m_mapMeshToChunk.find(pNode->pMesh) != m_mapMeshToChunk.end())
-        {
-            // This mesh already saved.
-            return m_mapMeshToChunk.find(pNode->pMesh)->second;
-        }
-    }
-
-    MESH_CHUNK_DESC_0802 chunk;
-    ZeroStruct(chunk);
-
-    if (pNode->pMesh)
-    {
-        const CMesh& mesh = *pNode->pMesh;
-
-        const int nVerts = mesh.GetVertexCount();
-        const int nIndices = mesh.GetIndexCount();
-
-        chunk.nVerts = nVerts;
-        chunk.nIndices = nIndices;
-        chunk.nSubsets = mesh.GetSubSetCount();
-        chunk.bboxMin = mesh.m_bbox.min;
-        chunk.bboxMax = mesh.m_bbox.max;
-    }
-    else
-    {
-        chunk.nVerts = pNode->meshInfo.nVerts;
-        chunk.nIndices = pNode->meshInfo.nIndices;
-        chunk.nSubsets = pNode->meshInfo.nSubsets;
-        chunk.bboxMax = pNode->meshInfo.bboxMin;
-        chunk.bboxMax = pNode->meshInfo.bboxMax;
-    }
-
-    const bool bEmptyMesh = m_bDoNotSaveMeshData || pNode->bPhysicsProxy || !pNode->pMesh;
-
-    if (bEmptyMesh)
-    {
-        chunk.nFlags |= MESH_CHUNK_DESC_0802::MESH_IS_EMPTY;
-    }
-    chunk.nFlags2 = pNode->nPhysicalizeFlags;
-
-    if (m_bSavePhysicsMeshes)
-    {
-        for (int i = 0; i < 4; ++i)
-        {
-            if (!pNode->physicalGeomData[i].empty())
-            {
-                chunk.nPhysicsDataChunkId[i] = SavePhysicalDataChunk(&pNode->physicalGeomData[i][0], pNode->physicalGeomData[i].size(), bSwapEndian);
-            }
-        }
-    }
-
-    if (!bEmptyMesh)
-    {
-        CMesh& mesh = *pNode->pMesh;
-
-        mesh.RecomputeTexMappingDensity();
-        chunk.texMappingDensity = mesh.m_texMappingDensity;
-        chunk.nFlags |= MESH_CHUNK_DESC_0802::HAS_TEX_MAPPING_DENSITY;
-
-        chunk.nSubsetsChunkId = SaveMeshSubsetsChunk(mesh, bSwapEndian);
-
-        const int vertexCount = mesh.GetVertexCount();
-        bool bInterleaved = false;
-
-        if (m_bCompactVertexStreams && mesh.m_pPositions && mesh.m_pColor0 && mesh.m_pTexCoord)
-        {
-            std::vector<SVF_P3S_C4B_T2S> interleavedVertices(vertexCount);
-            memset(&interleavedVertices[0], 0, sizeof(interleavedVertices[0]) * interleavedVertices.size());
-
-            const Vec3* const pPositions = mesh.m_pPositions;
-            const SMeshColor* const pColors = mesh.m_pColor0;
-            const SMeshTexCoord* const pTexCoords = mesh.m_pTexCoord;
-
-            for (int vi = 0; vi < vertexCount; ++vi)
-            {
-                SVF_P3S_C4B_T2S& vert = interleavedVertices[vi];
-                const ColorB clr = pColors[vi].GetRGBA();
-                const Vec2 uv = pTexCoords[vi].GetUV();
-
-                vert.xyz = Vec3f16(pPositions[vi].x, pPositions[vi].y, pPositions[vi].z);
-                vert.color.dcolor = clr.pack_abgr8888();
-                vert.st = Vec2f16(uv.x, uv.y);
-
-                SwapEndian(vert.xyz, bSwapEndian);
-                SwapEndian(vert.color.dcolor, bSwapEndian);
-                SwapEndian(vert.st, bSwapEndian);
-            }
-
-            chunk.nStreamChunkID[CGF_STREAM_P3S_C4B_T2S][0] = SaveStreamDataChunk(&interleavedVertices[0], CGF_STREAM_P3S_C4B_T2S, 0, vertexCount, sizeof(interleavedVertices[0]), bSwapEndian);
-
-            bInterleaved = true;
-        }
-
-        // We don't support writing m_pPositionsF16 (although we can)
-        if (mesh.m_pPositionsF16)
-        {
-            assert(0);
-        }
-
-        if (mesh.m_pPositions && !bInterleaved)
-        {
-            COMPILE_TIME_ASSERT(sizeof(mesh.m_pPositions[0]) == sizeof(Vec3));
-            if (bStorePositionsAsF16)
-            {
-                const Vec3* pRealData = mesh.m_pPositions;
-                std::vector<Vec3f16> tmpVec(vertexCount);
-                for (int i = 0; i < vertexCount; ++i, ++pRealData)
-                {
-                    tmpVec[i] = Vec3f16(pRealData->x, pRealData->y, pRealData->z);
-                    SwapEndian(tmpVec[i], bSwapEndian);
-                }
-                chunk.nStreamChunkID[CGF_STREAM_POSITIONS][0] = SaveStreamDataChunk(&tmpVec[0], CGF_STREAM_POSITIONS, 0, vertexCount, sizeof(tmpVec[0]), bSwapEndian);
-            }
-            else
-            {
-                SwapEndian(mesh.m_pPositions, vertexCount, bSwapEndian);
-                chunk.nStreamChunkID[CGF_STREAM_POSITIONS][0] = SaveStreamDataChunk(mesh.m_pPositions, CGF_STREAM_POSITIONS, 0, vertexCount, sizeof(mesh.m_pPositions[0]), bSwapEndian);
-                SwapEndian(mesh.m_pPositions, vertexCount, bSwapEndian);
-            }
-        }
-
-        if (mesh.m_pNorms && !m_bCompactVertexStreams)
-        {
-            SwapEndian(mesh.m_pNorms, vertexCount, bSwapEndian);
-            chunk.nStreamChunkID[CGF_STREAM_NORMALS][0] = SaveStreamDataChunk(mesh.m_pNorms, CGF_STREAM_NORMALS, 0, vertexCount, sizeof(Vec3), bSwapEndian);
-            SwapEndian(mesh.m_pNorms, vertexCount, bSwapEndian);
-        }
-
-        for (int i = 0; i < mesh.GetNumberOfStreamsByType(CMesh::TEXCOORDS); ++i)
-        {
-            SMeshTexCoord* textureCoordinates = mesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, i);
-            if (textureCoordinates && !bInterleaved)
-            {
-                SwapEndian(textureCoordinates, mesh.GetTexCoordCount(), bSwapEndian);
-                chunk.nStreamChunkID[CGF_STREAM_TEXCOORDS][i] = SaveStreamDataChunk(textureCoordinates, CGF_STREAM_TEXCOORDS, i, mesh.GetTexCoordCount(), sizeof(CryUV), bSwapEndian);
-                SwapEndian(textureCoordinates, mesh.GetTexCoordCount(), bSwapEndian);
-            }
-        }
-
-        if (mesh.m_pColor0 && !bInterleaved)
-        {
-            SwapEndian(mesh.m_pColor0, vertexCount, bSwapEndian);
-            chunk.nStreamChunkID[CGF_STREAM_COLORS][0] = SaveStreamDataChunk(mesh.m_pColor0, CGF_STREAM_COLORS, 0, vertexCount, sizeof(SMeshColor), bSwapEndian);
-            SwapEndian(mesh.m_pColor0, vertexCount, bSwapEndian);
-        }
-
-        if (mesh.m_pColor1)
-        {
-            SwapEndian(mesh.m_pColor1, vertexCount, bSwapEndian);
-            chunk.nStreamChunkID[CGF_STREAM_COLORS][1] = SaveStreamDataChunk(mesh.m_pColor1, CGF_STREAM_COLORS, 1, vertexCount, sizeof(SMeshColor), bSwapEndian);
-            SwapEndian(mesh.m_pColor1, vertexCount, bSwapEndian);
-        }
-
-        if (mesh.m_pVertMats)
-        {
-            SwapEndian(mesh.m_pVertMats, vertexCount, bSwapEndian);
-            chunk.nStreamChunkID[CGF_STREAM_VERT_MATS][0] = SaveStreamDataChunk(mesh.m_pVertMats, CGF_STREAM_VERT_MATS, 0, vertexCount, sizeof(mesh.m_pVertMats[0]), bSwapEndian);
-            SwapEndian(mesh.m_pVertMats, vertexCount, bSwapEndian);
-        }
-
-        if (mesh.m_pIndices)
-        {
-            const int indexCount = mesh.GetIndexCount();
-
-            COMPILE_TIME_ASSERT(sizeof(mesh.m_pIndices[0]) == sizeof(vtx_idx));
-            COMPILE_TIME_ASSERT(sizeof(vtx_idx) == 2 || sizeof(vtx_idx) == 4);
-
-            if (sizeof(mesh.m_pIndices[0]) == (bStoreIndicesAsU16 ? 2 : 4))
-            {
-                SwapEndian(mesh.m_pIndices, indexCount, bSwapEndian);
-                chunk.nStreamChunkID[CGF_STREAM_INDICES][0] = SaveStreamDataChunk(mesh.m_pIndices, CGF_STREAM_INDICES, 0, indexCount, sizeof(mesh.m_pIndices[0]), bSwapEndian);
-                SwapEndian(mesh.m_pIndices, indexCount, bSwapEndian);
-            }
-            else if (bStoreIndicesAsU16)
-            {
-                if (vertexCount > 0xffff)     // 0xffff is used instead of 0x10000 to reserve index 0xffff for special cases
-                {
-#if defined(RESOURCE_COMPILER)
-                    RCLogError("Saving mesh with 16-bit vertex indices is impossible - 16-bit indices cannot address %i vertices", vertexCount);
-#endif
-                    return -1;
-                }
-                std::vector<uint16> tmp(indexCount);
-                for (int i = 0; i < indexCount; ++i)
-                {
-                    tmp[i] = (uint16)mesh.m_pIndices[i];
-                    SwapEndian(tmp[i], bSwapEndian);
-                }
-                chunk.nStreamChunkID[CGF_STREAM_INDICES][0] = SaveStreamDataChunk(&tmp[0], CGF_STREAM_INDICES, 0, indexCount, sizeof(uint16), bSwapEndian);
-            }
-            else
-            {
-                std::vector<uint32> tmp(indexCount);
-                for (int i = 0; i < indexCount; ++i)
-                {
-                    tmp[i] = mesh.m_pIndices[i];
-                    SwapEndian(tmp[i], bSwapEndian);
-                }
-                chunk.nStreamChunkID[CGF_STREAM_INDICES][0] = SaveStreamDataChunk(&tmp[0], CGF_STREAM_INDICES, 0, indexCount, sizeof(uint32), bSwapEndian);
-            }
-        }
-
-        if (mesh.m_pTangents)
-        {
-            if (bUseQTangents)
-            {
-                std::vector<SMeshQTangents> qTangents(vertexCount);
-                MeshTangentsFrameToQTangents(
-                    &mesh.m_pTangents[0], sizeof(mesh.m_pTangents[0]), vertexCount,
-                    &qTangents[0], sizeof(qTangents[0]));
-                SwapEndian(&qTangents[0], vertexCount, bSwapEndian);
-                chunk.nStreamChunkID[CGF_STREAM_QTANGENTS][0] = SaveStreamDataChunk(&qTangents[0], CGF_STREAM_QTANGENTS, 0, vertexCount, sizeof(SMeshQTangents), bSwapEndian);
-            }
-            else
-            {
-                SwapEndian(mesh.m_pTangents, vertexCount, bSwapEndian);
-                chunk.nStreamChunkID[CGF_STREAM_TANGENTS][0] = SaveStreamDataChunk(mesh.m_pTangents, CGF_STREAM_TANGENTS, 0, vertexCount, sizeof(SMeshTangents), bSwapEndian);
-                SwapEndian(mesh.m_pTangents, vertexCount, bSwapEndian);
-            }
-        }
-
-        if (mesh.m_pBoneMapping)
-        {
-            if (mesh.m_pExtraBoneMapping)
-            {
-                chunk.nFlags |= MESH_CHUNK_DESC_0802::HAS_EXTRA_WEIGHTS;
-
-                std::vector<SMeshBoneMapping_uint16> tempBoneMapping;
-                COMPILE_TIME_ASSERT(sizeof(tempBoneMapping[0]) == sizeof(mesh.m_pBoneMapping[0]));
-                tempBoneMapping.resize(vertexCount * 2);
-                memcpy(&tempBoneMapping[0], mesh.m_pBoneMapping, sizeof(tempBoneMapping[0]) * vertexCount);
-                memcpy(&tempBoneMapping[vertexCount], mesh.m_pExtraBoneMapping, sizeof(tempBoneMapping[0]) * vertexCount);
-                SwapEndian(&tempBoneMapping[0], vertexCount * 2, bSwapEndian);
-                chunk.nStreamChunkID[CGF_STREAM_BONEMAPPING][0] = SaveStreamDataChunk(&tempBoneMapping[0], CGF_STREAM_BONEMAPPING, 0, vertexCount * 2, sizeof(tempBoneMapping[0]), bSwapEndian);
-            }
-            else
-            {
-                SwapEndian(mesh.m_pBoneMapping, vertexCount, bSwapEndian);
-                chunk.nStreamChunkID[CGF_STREAM_BONEMAPPING][0] = SaveStreamDataChunk(mesh.m_pBoneMapping, CGF_STREAM_BONEMAPPING, 0, vertexCount, sizeof(mesh.m_pBoneMapping[0]), bSwapEndian);
-                SwapEndian(mesh.m_pBoneMapping, vertexCount, bSwapEndian);
-            }
-        }
-
-        if (pNode->pSkinInfo)
-        {
-            SwapEndian(pNode->pSkinInfo, vertexCount + 1, bSwapEndian);
-            chunk.nStreamChunkID[CGF_STREAM_SKINDATA][0] = SaveStreamDataChunk(pNode->pSkinInfo, CGF_STREAM_SKINDATA, 0, vertexCount + 1, sizeof(pNode->pSkinInfo[0]), bSwapEndian);
-            SwapEndian(pNode->pSkinInfo, vertexCount + 1, bSwapEndian);
-        }
-    }
-
-    SwapEndian(chunk, bSwapEndian);
-
-    const int nMeshChunkId = m_pChunkFile->AddChunk(
-        ChunkType_Mesh,
-        MESH_CHUNK_DESC_0802::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        &chunk, sizeof(chunk));
-
-    m_mapMeshToChunk[pNode->pMesh] = nMeshChunkId;
-
-    return nMeshChunkId;
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(RESOURCE_COMPILER)
-int CSaverCGF::SaveUncompiledNodeMesh(CNodeCGF* pNode)
-{
-    if (m_mapMeshToChunk.find(pNode->pMesh) != m_mapMeshToChunk.end())
-    {
-        // This mesh already saved.
-        return m_mapMeshToChunk.find(pNode->pMesh)->second;
-    }
-
-    const CMesh* const mesh = pNode->pMesh;
-
-    const bool HasBoneInfo = (mesh->m_pBoneMapping != 0);
-    const bool HasVertexColors = (mesh->m_pColor0 != 0);
-    const bool HasVertexAlphas = HasVertexColors;
-    const bool WriteVCol = true;
-
-    // uncompiled mesh chunk
-    MESH_CHUNK_DESC_0745 chunk;
-    ZeroStruct(chunk);
-
-    const int numVertices = mesh->GetVertexCount();
-    const int numFaces = mesh->GetFaceCount();
-    const int numUVs = mesh->GetTexCoordCount();
-
-    if (numUVs != 0 && numUVs != numVertices)
-    {
-        RCLogError("Mesh for node \"%s\" has mismatching number of vertices and texture coordinates", pNode->name);
-        return -1;
-    }
-
-    if (!mesh->m_pTopologyIds)
-    {
-        RCLogError("Mesh for node \"%s\" has no topology info. Contact an RC programmer.", pNode->name);
-        return -1;
-    }
-
-    assert(mesh->m_pPositions);
-    assert(mesh->m_pNorms);
-    assert(mesh->m_pFaces);
-
-    chunk.flags1 = 0;
-    chunk.flags2 = MESH_CHUNK_DESC_0745::FLAG2_HAS_TOPOLOGY_IDS;
-    chunk.flags1 |= HasBoneInfo ? MESH_CHUNK_DESC_0745::FLAG1_BONE_INFO : 0;
-    chunk.flags2 |= (WriteVCol && HasVertexColors) ? MESH_CHUNK_DESC_0745::FLAG2_HAS_VERTEX_COLOR : 0;
-    chunk.flags2 |= (WriteVCol && HasVertexAlphas) ? MESH_CHUNK_DESC_0745::FLAG2_HAS_VERTEX_ALPHA : 0;
-    chunk.nFaces = numFaces;
-    chunk.nTVerts = numUVs;
-    chunk.nVerts = numVertices;
-    chunk.VertAnimID = -1;       // nVertexAnimChunkID;
-
-    // add chunk members
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-
-    // copy positions and vertices to a CryVertex array -----------------------------------
-    {
-        CryVertex* vertices = new CryVertex[numVertices];
-        for (int i = 0; i < numVertices; i++)
-        {
-            vertices[i].p = mesh->m_pPositions[i];
-            vertices[i].n = mesh->m_pNorms[i].GetN();
-        }
-        chunkData.AddData(vertices, numVertices * sizeof(CryVertex));
-        SAFE_DELETE_ARRAY(vertices);
-    }
-
-    // copy faces to a CryFace array ------------------------------------------------------
-    {
-        CryFace* faces = new CryFace[numFaces];
-        for (int i = 0; i < numFaces; i++)
-        {
-            faces[i].v0 = mesh->m_pFaces[i].v[0];
-            faces[i].v1 = mesh->m_pFaces[i].v[1];
-            faces[i].v2 = mesh->m_pFaces[i].v[2];
-            faces[i].MatID = mesh->m_subsets[mesh->m_pFaces[i].nSubset].nMatID;
-        }
-        chunkData.AddData(faces, numFaces * sizeof(CryFace));
-        SAFE_DELETE_ARRAY(faces);
-    }
-
-    // topology info ----------------------------------------------------------------------
-    {
-        chunkData.AddData(mesh->m_pTopologyIds, numVertices * sizeof(mesh->m_pTopologyIds[0]));
-    }
-
-    // copy texture coordinates to a CryUV array ------------------------------------------
-    if (numUVs)
-    {
-        assert(numUVs == numVertices);
-
-        CryUV* uvs = new CryUV[numUVs];
-        for (int i = 0; i < numUVs; i++)
-        {
-            mesh->m_pTexCoord[i].ExportTo(uvs[i].u, uvs[i].v);
-        }
-        chunkData.AddData(uvs, numUVs * sizeof(CryUV));
-        SAFE_DELETE_ARRAY(uvs);
-    }
-
-    if (HasBoneInfo)
-    {
-        CSkinningInfo* skinningInfo = m_pCGF->GetSkinningInfo();
-        Matrix34 objectTransform = pNode->worldTM;
-
-        typedef std::map<int, std::set<int> > BadBoneIDs;
-        BadBoneIDs badBoneIDs;
-
-        std::vector<CryLink> arrLinks;
-
-        for (int k = 0; k < numVertices; k++)
-        {
-            Vec3 point = mesh->m_pPositions[k];
-            Vec3 worldVertex = objectTransform.TransformPoint(point);
-
-            arrLinks.clear();
-
-            float totalweight = 0.0f;
-
-            for (int j = 0; j < 8; j++)
-            {
-                int boneID = -1;
-                float blending = 0.0f;
-
-                if (j < 4)
-                {
-                    boneID = mesh->m_pBoneMapping[k].boneIds[j];
-                    blending = (float)(mesh->m_pBoneMapping[k].weights[j]) / 255.0f;
-                }
-                else if (mesh->m_pExtraBoneMapping)
-                {
-                    boneID = mesh->m_pExtraBoneMapping[k].boneIds[j - 4];
-                    blending = (float)(mesh->m_pExtraBoneMapping[k].weights[j - 4]) / 255.0f;
-                }
-
-                if (blending < 0.01f)
-                {
-                    continue;
-                }
-
-                if (boneID >= skinningInfo->m_arrBonesDesc.size())
-                {
-                    badBoneIDs[boneID].insert(k);
-                    continue;
-                }
-
-                totalweight += blending;
-
-                const Matrix34& boneTransform = skinningInfo->m_arrBonesDesc[boneID].m_DefaultW2B;
-                const Vec3 offset = boneTransform.TransformPoint(worldVertex);
-
-                static float const metersToCentimeters = 100.0f;
-
-                CryLink link;
-                link.BoneID = boneID;
-                link.Blending = blending;
-                link.offset = offset * metersToCentimeters;
-
-                arrLinks.push_back(link);
-            }
-
-            const int nLinks = arrLinks.size();
-
-            for (int j = 0; j < nLinks; j++)
-            {
-                arrLinks[j].Blending /= totalweight;
-            }
-
-            chunkData.AddData(&nLinks, sizeof(int));
-            if (!arrLinks.empty())
-            {
-                chunkData.AddData(&arrLinks[0], nLinks * sizeof(CryLink));
-            }
-            else
-            {
-                RCLogError("Mesh indicated it has bones, but no valid bones were found.");
-            }
-        }
-
-        if (!badBoneIDs.empty())
-        {
-            RCLogError("Skinned mesh for node \"%s\" contains references to missing bones:", pNode->name);
-            BadBoneIDs::iterator it;
-            string message;
-            string vertexStr;
-            for (it = badBoneIDs.begin(); it != badBoneIDs.end(); ++it)
-            {
-                const std::set<int>& vertexIndices = it->second;
-                message.Format("  Bone %i, vertices:", it->first);
-                for (std::set<int>::const_iterator vit = vertexIndices.begin(); vit != vertexIndices.end(); ++vit)
-                {
-                    vertexStr.Format(" %i", *vit);
-                    message += vertexStr;
-                }
-                RCLogError("%s", message.c_str());
-            }
-        }
-    }
-
-    if (WriteVCol)
-    {
-        if (HasVertexColors)
-        {
-            CryIRGB* vertexcolors = new CryIRGB[numVertices];
-            for (int i = 0; i < numVertices; i++)
-            {
-                const ColorB clr = mesh->m_pColor0[i].GetRGBA();
-
-                vertexcolors[i].r = clr.r;
-                vertexcolors[i].g = clr.g;
-                vertexcolors[i].b = clr.b;
-            }
-            chunkData.AddData(vertexcolors, numVertices * sizeof(CryIRGB));
-            SAFE_DELETE_ARRAY(vertexcolors);
-        }
-
-        if (HasVertexAlphas)
-        {
-            unsigned char* vertexalphas = new unsigned char[numVertices];
-            for (int i = 0; i < numVertices; i++)
-            {
-                const ColorB clr = mesh->m_pColor0[i].GetRGBA();
-
-                vertexalphas[i] = clr.a;
-            }
-            chunkData.AddData(vertexalphas, numVertices * sizeof(unsigned char));
-            SAFE_DELETE_ARRAY(vertexalphas);
-        }
-    }
-
-    if (0)      // save morph targets - the loader load this?
-    {
-    }
-
-    if (0)      // save bone initial pose - the loader load this?
-    {
-    }
-
-    int nMeshChunkId = m_pChunkFile->AddChunk(
-        ChunkType_Mesh,
-        MESH_CHUNK_DESC_0745::VERSION,
-        eEndianness_Native,
-        chunkData.data, chunkData.size);
-
-    m_mapMeshToChunk[pNode->pMesh] = nMeshChunkId;
-
-    return nMeshChunkId;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveHelperChunk(CNodeCGF* pNode, bool bSwapEndian)
-{
-    HELPER_CHUNK_DESC chunk;
-    ZeroStruct(chunk);
-
-    chunk.type = pNode->helperType;
-    chunk.size = pNode->helperSize;
-
-    SwapEndian(chunk, bSwapEndian);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_Helper,
-        HELPER_CHUNK_DESC::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        &chunk, sizeof(chunk));
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(RESOURCE_COMPILER)
-int CSaverCGF::SaveUncompiledHelperChunk(CNodeCGF* pNode)
-{
-    HELPER_CHUNK_DESC chunk;
-    ZeroStruct(chunk);
-
-    chunk.type = pNode->helperType;
-    chunk.size = pNode->helperSize;
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_Helper,
-        HELPER_CHUNK_DESC::VERSION,
-        eEndianness_Native,
-        &chunk, sizeof(chunk));
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// TODO:!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-int CSaverCGF::SaveBreakablePhysics(bool bSwapEndian)
-{
-    const CPhysicalizeInfoCGF* const pPi = m_pCGF->GetPhysicalizeInfo();
-
-    if (!pPi || pPi->nGranularity == -1)
-    {
-        return 0;
-    }
-
-    BREAKABLE_PHYSICS_CHUNK_DESC chunk;
-    ZeroStruct(chunk);
-
-    chunk.granularity = pPi->nGranularity;
-    chunk.nMode = pPi->nMode;
-    chunk.nRetVtx = pPi->nRetVtx;
-    chunk.nRetTets = pPi->nRetTets;
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    if (pPi->pRetVtx)
-    {
-        chunkData.AddData(pPi->pRetVtx, pPi->nRetVtx * sizeof(Vec3));
-    }
-    if (pPi->pRetTets)
-    {
-        chunkData.AddData(pPi->pRetTets, pPi->nRetTets * sizeof(int) * 4);
-    }
-
-    SwapEndian(chunk, bSwapEndian);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_BreakablePhysics,
-        BREAKABLE_PHYSICS_CHUNK_DESC::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveMeshSubsetsChunk(CMesh& mesh, bool bSwapEndian)
-{
-    MESH_SUBSETS_CHUNK_DESC_0800 chunk;
-    ZeroStruct(chunk);
-
-    chunk.nCount = mesh.GetSubSetCount();
-
-    if (m_bComputeSubsetTexelDensity)
-    {
-        chunk.nFlags |= MESH_SUBSETS_CHUNK_DESC_0800::HAS_SUBSET_TEXEL_DENSITY;
-    }
-
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-
-    for (int i = 0; i < mesh.GetSubSetCount(); i++)
-    {
-        const SMeshSubset& srcSubset = mesh.m_subsets[i];
-
-        MESH_SUBSETS_CHUNK_DESC_0800::MeshSubset subset;
-        memset(&subset, 0, sizeof(subset));
-        subset.nFirstIndexId = srcSubset.nFirstIndexId;
-        subset.nNumIndices = srcSubset.nNumIndices;
-        subset.nFirstVertId = srcSubset.nFirstVertId;
-        subset.nNumVerts = srcSubset.nNumVerts;
-        subset.nMatID = srcSubset.nMatID;
-        subset.fRadius = srcSubset.fRadius;
-        subset.vCenter = srcSubset.vCenter;
-        SwapEndian(subset, bSwapEndian);
-        chunkData.Add(subset);
-    }
-
-    // add subset texel densities
-    if (m_bComputeSubsetTexelDensity)
-    {
-        for (int i = 0; i < mesh.GetSubSetCount(); ++i)
-        {
-            MESH_SUBSETS_CHUNK_DESC_0800::MeshSubsetTexelDensity subset;
-
-            const char* err;
-            float posArea, texArea;
-            if (!mesh.ComputeSubsetTexMappingAreas((size_t)i, posArea, texArea, err))
-            {
-#if defined(RESOURCE_COMPILER)
-                RCLog("ComputeSubsetTexMappingAreas: %s", err);
-#endif
-                subset.texelDensity = 0.0f;
-            }
-            else
-            {
-                subset.texelDensity = texArea / posArea;
-            }
-
-            SwapEndian(subset, bSwapEndian);
-            chunkData.AddData(&subset, sizeof(subset));
-        }
-    }
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_MeshSubsets,
-        MESH_SUBSETS_CHUNK_DESC_0800::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveStreamDataChunk(const void* pStreamData, int nStreamType, int nIndex, int nCount, int nElemSize, bool bSwapEndian)
-{
-    STREAM_DATA_CHUNK_DESC_0801 chunk;
-    ZeroStruct(chunk);
-
-    chunk.nStreamType = nStreamType;
-    chunk.nStreamIndex = nIndex;
-    chunk.nCount = nCount;
-    chunk.nElementSize = nElemSize;
-
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pStreamData, nCount * nElemSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_DataStream,
-        STREAM_DATA_CHUNK_DESC_0801::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SavePhysicalDataChunk(const void* pData, int nSize, bool bSwapEndian)
-{
-    MESH_PHYSICS_DATA_CHUNK_DESC_0800 chunk;
-    ZeroStruct(chunk);
-
-    chunk.nDataSize = nSize;
-
-    SwapEndian(chunk, bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_MeshPhysicsData,
-        MESH_PHYSICS_DATA_CHUNK_DESC_0800::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveExportFlags(bool bSwapEndian)
-{
-    if (m_bDoNotSaveNonMeshData)
-    {
-        return -1;
-    }
-
-    EXPORT_FLAGS_CHUNK_DESC chunk;
-    ZeroStruct(chunk);
-
-    CExportInfoCGF* pExpInfo = m_pCGF->GetExportInfo();
-    if (pExpInfo->bMergeAllNodes)
-    {
-        chunk.flags |= EXPORT_FLAGS_CHUNK_DESC::MERGE_ALL_NODES;
-    }
-    if (pExpInfo->bUseCustomNormals)
-    {
-        chunk.flags |= EXPORT_FLAGS_CHUNK_DESC::USE_CUSTOM_NORMALS;
-    }
-    if (pExpInfo->bHaveAutoLods)
-    {
-        chunk.flags |= EXPORT_FLAGS_CHUNK_DESC::HAVE_AUTO_LODS;
-    }
-    if (pExpInfo->bWantF32Vertices)
-    {
-        chunk.flags |= EXPORT_FLAGS_CHUNK_DESC::WANT_F32_VERTICES;
-    }
-    if (pExpInfo->b8WeightsPerVertex)
-    {
-        chunk.flags |= EXPORT_FLAGS_CHUNK_DESC::EIGHT_WEIGHTS_PER_VERTEX;
-    }
-    if (pExpInfo->bSkinnedCGF)
-    {
-        chunk.flags |= EXPORT_FLAGS_CHUNK_DESC::SKINNED_CGF;
-    }
-
-    if (pExpInfo->bFromColladaXSI)
-    {
-        chunk.assetAuthorTool |= EXPORT_FLAGS_CHUNK_DESC::FROM_COLLADA_XSI;
-    }
-    if (pExpInfo->bFromColladaMAX)
-    {
-        chunk.assetAuthorTool |= EXPORT_FLAGS_CHUNK_DESC::FROM_COLLADA_MAX;
-    }
-    if (pExpInfo->bFromColladaMAYA)
-    {
-        chunk.assetAuthorTool |= EXPORT_FLAGS_CHUNK_DESC::FROM_COLLADA_MAYA;
-    }
-
-    chunk.authorToolVersion = pExpInfo->authorToolVersion;
-
-    static const size_t rcVersionElementCount = sizeof(pExpInfo->rc_version) / sizeof(pExpInfo->rc_version[0]);
-    std::copy(pExpInfo->rc_version, pExpInfo->rc_version + rcVersionElementCount, chunk.rc_version);
-    cry_strcpy(chunk.rc_version_string, sizeof(chunk.rc_version_string), pExpInfo->rc_version_string);
-
-    SwapEndian(chunk, bSwapEndian);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_ExportFlags,
-        EXPORT_FLAGS_CHUNK_DESC::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        &chunk, sizeof(chunk));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSaverCGF::SaveMaterials(bool bSwapEndian)
-{
-    for (int i = 0; i < m_pCGF->GetNodeCount(); ++i)
-    {
-        CMaterialCGF* const pMaterialCGF = m_pCGF->GetNode(i)->pMaterial;
-        if (pMaterialCGF)
-        {
-            SaveMaterial(pMaterialCGF, bSwapEndian);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveMaterial(CMaterialCGF* pMtl, bool bSwapEndian)
-{
-    // Check whether the material has already been saved.
-    if (m_savedMaterials.find(pMtl) != m_savedMaterials.end())
-    {
-        return pMtl->nChunkId;
-    }
-
-    m_savedMaterials.insert(pMtl);
-
-    MTL_NAME_CHUNK_DESC_0802 chunk;
-    ZeroStruct(chunk);
-
-    cry_strcpy(chunk.name, sizeof(chunk.name), pMtl->name);
-
-    DynArray<int32> nPhysicalizeTypeArray;
-    DynArray<char> names;
-
-    int nSubMaterials = int(pMtl->subMaterials.size());
-
-    if (nSubMaterials == 0)
-    {
-        nPhysicalizeTypeArray.push_back(pMtl->nPhysicalizeType);
-    }
-    else
-    {
-        if (nSubMaterials > MAX_SUB_MATERIALS)
-        {
-#if defined(RESOURCE_COMPILER)
-            RCLogError("Material %s uses %d sub-materials but maximum allowed is %d.", pMtl->name, nSubMaterials, MAX_SUB_MATERIALS);
-#else
-            CryWarning(
-                VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR,
-                "Material %s uses %d sub-materials but maximum allowed is %d.", pMtl->name, nSubMaterials, MAX_SUB_MATERIALS);
-#endif
-            nSubMaterials = MAX_SUB_MATERIALS;
-        }
-        nPhysicalizeTypeArray.resize(nSubMaterials, PHYS_GEOM_TYPE_DEFAULT);
-
-        for (int childIndex = 0; childIndex < nSubMaterials; ++childIndex)
-        {
-            CMaterialCGF* childMaterial = pMtl->subMaterials[childIndex];
-            if (childMaterial)
-            {
-                nPhysicalizeTypeArray[childIndex] = childMaterial->nPhysicalizeType;
-                for (int i = 0; childMaterial->name[i] != 0; ++i)
-                {
-                    names.push_back(childMaterial->name[i]);
-                }
-            }
-            names.push_back(0);
-        }
-    }
-
-    chunk.nSubMaterials = nSubMaterials;
-
-    SwapEndian(chunk, bSwapEndian);
-    SwapEndian(&nPhysicalizeTypeArray[0], nPhysicalizeTypeArray.size(), bSwapEndian);
-
-    CChunkData chunkData;
-    chunkData.Add(chunk);
-    chunkData.AddData(&nPhysicalizeTypeArray[0], nPhysicalizeTypeArray.size() * sizeof(nPhysicalizeTypeArray[0]));
-    if (!names.empty())
-    {
-        chunkData.AddData(&names[0], names.size() * sizeof(names[0]));
-    }
-
-    pMtl->nChunkId = m_pChunkFile->AddChunk(
-        ChunkType_MtlName,
-        MTL_NAME_CHUNK_DESC_0802::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-
-    return pMtl->nChunkId;
-}
-
-int CSaverCGF::SaveController831(bool bSwapEndian, const CONTROLLER_CHUNK_DESC_0831& ctrlChunk, void* pData, int nSize)
-{
-    CChunkData chunkData;
-    chunkData.Add(ctrlChunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_Controller,
-        CONTROLLER_CHUNK_DESC_0831::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-int CSaverCGF::SaveControllerDB905(bool bSwapEndian, const CONTROLLER_CHUNK_DESC_0905& ctrlChunk, void* pData, int nSize)
-{
-    CChunkData chunkData;
-    chunkData.Add(ctrlChunk);
-    chunkData.AddData(pData, nSize);
-
-    return m_pChunkFile->AddChunk(
-        ChunkType_Controller,
-        CONTROLLER_CHUNK_DESC_0905::VERSION,
-        (bSwapEndian ? eEndianness_NonNative : eEndianness_Native),
-        chunkData.data, chunkData.size);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int CSaverCGF::SaveFoliage()
-{
-    FOLIAGE_INFO_CHUNK_DESC chunk;
-    ZeroStruct(chunk);
-
-    bool isSkinned = m_pCGF->GetExportInfo()->bSkinnedCGF;
-
-    SFoliageInfoCGF& fi = *m_pCGF->GetFoliageInfo();
-
-    if (fi.nSpines > 0)
-    {
-        int i, j;
-        chunk.nSpines = fi.nSpines;
-        chunk.nSkinnedVtx = fi.nSkinnedVtx;
-        chunk.nBoneIds = fi.chunkBoneIds.size();
-        chunk.nSpineVtx = 0;
-
-        for (i = 0; i < fi.nSpines; chunk.nSpineVtx += fi.pSpines[i++].nVtx)
-        {
-            ;
-        }
-
-        FOLIAGE_SPINE_SUB_CHUNK* const pSpineBuf = new FOLIAGE_SPINE_SUB_CHUNK[fi.nSpines];
-        Vec3* const pSpineVtx = new Vec3[chunk.nSpineVtx];
-        Vec4* const pSpineSegDim = new Vec4[chunk.nSpineVtx];
-        float* const pStiffness = new float[chunk.nSpineVtx];
-        float* const pDamping = new float[chunk.nSpineVtx];
-        float* const pThickness = new float[chunk.nSpineVtx];
-
-        memset(pSpineBuf, 0, sizeof(pSpineBuf[0]) * fi.nSpines);
-
-        for (i = j = 0; i < fi.nSpines; j += fi.pSpines[i++].nVtx)
-        {
-            pSpineBuf[i].nVtx = fi.pSpines[i].nVtx;
-            pSpineBuf[i].len = fi.pSpines[i].len;
-            pSpineBuf[i].navg = fi.pSpines[i].navg;
-            pSpineBuf[i].iAttachSpine = fi.pSpines[i].iAttachSpine + 1;
-            pSpineBuf[i].iAttachSeg = fi.pSpines[i].iAttachSeg + 1;
-            memcpy(pSpineVtx + j, fi.pSpines[i].pVtx, fi.pSpines[i].nVtx * sizeof(Vec3));
-            memcpy(pSpineSegDim + j, fi.pSpines[i].pSegDim, fi.pSpines[i].nVtx * sizeof(Vec4));
-            memcpy(pStiffness + j, fi.pSpines[i].pStiffness, fi.pSpines[i].nVtx * sizeof(float));
-            memcpy(pDamping + j, fi.pSpines[i].pDamping, fi.pSpines[i].nVtx * sizeof(float));
-            memcpy(pThickness + j, fi.pSpines[i].pThickness, fi.pSpines[i].nVtx * sizeof(float));
-        }
-
-        CChunkData chunkData;
-        chunkData.Add(chunk);
-        chunkData.AddData(pSpineBuf, sizeof(pSpineBuf[0]) * fi.nSpines);
-        chunkData.AddData(pSpineVtx, sizeof(pSpineVtx[0]) * chunk.nSpineVtx);
-        chunkData.AddData(pSpineSegDim, sizeof(pSpineSegDim[0]) * chunk.nSpineVtx);
-        chunkData.AddData(pStiffness, sizeof(pStiffness[0]) * chunk.nSpineVtx);
-        chunkData.AddData(pDamping, sizeof(pDamping[0]) * chunk.nSpineVtx);
-        chunkData.AddData(pThickness, sizeof(pThickness[0]) * chunk.nSpineVtx);
-        //Add bone mapping(s)
-        if (isSkinned && chunk.nBoneIds == 0)
-        {
-            int numBoneMapping = fi.boneMappings.size();
-            chunkData.AddData(&numBoneMapping, sizeof(numBoneMapping));
-
-            AZStd::unordered_map<AZStd::string, SMeshBoneMappingInfo_uint8*>::iterator iter = fi.boneMappings.begin();
-            while (iter != fi.boneMappings.end())
-            {
-                const SMeshBoneMappingInfo_uint8* pBoneMappingEntry = iter->second;
-                chunkData.AddData(iter->first.c_str(), CGF_NODE_NAME_LENGTH);
-                chunkData.AddData(&pBoneMappingEntry->nVertexCount, sizeof(int));
-                chunkData.AddData(pBoneMappingEntry->pBoneMapping, sizeof(pBoneMappingEntry->pBoneMapping[0]) * pBoneMappingEntry->nVertexCount);
-                iter++;
-            }
-        }
-        else
-        {
-            chunkData.AddData(fi.pBoneMapping, sizeof(fi.pBoneMapping[0]) * fi.nSkinnedVtx);
-            chunkData.AddData(&fi.chunkBoneIds[0], sizeof(fi.chunkBoneIds[0]) * fi.chunkBoneIds.size());
-        }
-        delete[] pSpineSegDim;
-        delete[] pSpineVtx;
-        delete[] pSpineBuf;
-        delete[] pStiffness;
-        delete[] pDamping;
-        delete[] pThickness;
-
-        return m_pChunkFile->AddChunk(
-            ChunkType_FoliageInfo,
-            FOLIAGE_INFO_CHUNK_DESC::VERSION2,
-            eEndianness_Native,
-            chunkData.data, chunkData.size);
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/CGF/CGFSaver.h b/Code/CryEngine/Cry3DEngine/CGF/CGFSaver.h
deleted file mode 100644
index 0084e40680..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/CGFSaver.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_CGFSAVER_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_CGFSAVER_H
-#pragma once
-
-#if defined(RESOURCE_COMPILER) || defined(INCLUDE_SAVECGF)
-
-#include "CGFContent.h"
-
-class CChunkFile;
-
-//////////////////////////////////////////////////////////////////////////
-class CSaverCGF
-{
-public:
-    CSaverCGF(CChunkFile& chunkFile);
-
-    void SaveContent(CContentCGF* pCGF, bool bSwapEndian, bool bStorePositionsAsF16, bool bUseQtangents, bool bStoreIndicesAsU16);
-
-    void SetContent(CContentCGF* pCGF);
-
-    const CContentCGF* GetContent() const;
-
-    // Enable/Disable saving of the node mesh.
-    void SetMeshDataSaving(bool bEnable);
-
-    // Enable/Disable saving of non-mesh related data.
-    void SetNonMeshDataSaving(bool bEnable);
-
-    // Enable/disable saving of physics meshes.
-    void SetSavePhysicsMeshes(bool bEnable);
-
-    // Enable compaction of vertex streams (for optimised streaming)
-    void SetVertexStreamCompacting(bool bEnable);
-
-    // Enable computation of subset texel density
-    void SetSubsetTexelDensityComputing(bool bEnable);
-
-    void SaveNodes(bool bSwapEndian, bool bStorePositionsAsF16, bool bUseQtangents, bool bStoreIndicesAsU16);
-    int SaveNode(CNodeCGF* pNode, bool bSwapEndian, bool bStorePositionsAsF16, bool bUseQtangents, bool bStoreIndicesAsU16);
-
-    void SaveMaterials(bool bSwapEndian);
-    int SaveMaterial(CMaterialCGF* pMtl, bool bNeedSwap);
-    int SaveExportFlags(bool bSwapEndian);
-
-    // Compiled chunks for characters
-    int SaveCompiledBones(bool bSwapEndian, void* pData, int nSize, int version);
-    int SaveCompiledPhysicalBones(bool bSwapEndian, void* pData, int nSize, int version);
-    int SaveCompiledPhysicalProxis(bool bSwapEndian, void* pData, int nSize, uint32 numIntMorphTargets, int version);
-    int SaveCompiledMorphTargets(bool bSwapEndian, void* pData, int nSize, uint32 numIntMorphTargets, int version);
-    int SaveCompiledIntFaces(bool bSwapEndian, void* pData, int nSize, int version);
-    int SaveCompiledIntSkinVertices(bool bSwapEndian, void* pData, int nSize, int version);
-    int SaveCompiledExt2IntMap(bool bSwapEndian, void* pData, int nSize, int version);
-    int SaveCompiledBoneBox(bool bSwapEndian, void* pData, int nSize, int version);
-
-    // Chunks for characters (for Collada->cgf export)
-    int SaveBones(bool bSwapEndian, void* pData, int numBones, int nSize);
-    int SaveBoneNames(bool bSwapEndian, char* boneList, int numBones, int listSize);
-    int SaveBoneInitialMatrices(bool bSwapEndian, SBoneInitPosMatrix* matrices, int numBones, int nSize);
-    int SaveBoneMesh(bool bSwapEndian, PhysicalProxy& proxy);
-#if defined(RESOURCE_COMPILER)
-    void SaveUncompiledNodes();
-    int SaveUncompiledNode(CNodeCGF* pNode);
-    void SaveUncompiledMorphTargets();
-    int SaveUncompiledNodeMesh(CNodeCGF* pNode);
-    int SaveUncompiledHelperChunk(CNodeCGF* pNode);
-#endif
-
-    int SaveBreakablePhysics(bool bNeedEndianSwap);
-
-    int SaveController831(bool bSwapEndian, const CONTROLLER_CHUNK_DESC_0831& ctrlChunk, void* pData, int nSize);
-    int SaveControllerDB905(bool bSwapEndian, const CONTROLLER_CHUNK_DESC_0905& ctrlChunk, void* pData, int nSize);
-
-    int SaveFoliage();
-
-private:
-    // Return mesh chunk id
-    int SaveNodeMesh(CNodeCGF* pNode, bool bSwapEndian, bool bStorePositionsAsF16, bool bUseQTangents, bool bStoreIndicesAsU16);
-    int SaveHelperChunk(CNodeCGF* pNode, bool bSwapEndian);
-    int SaveMeshSubsetsChunk(CMesh& mesh, bool bSwapEndian);
-    int SaveStreamDataChunk(const void* pStreamData, int nStreamType, int nStreamIndex, int nCount, int nElemSize, bool bSwapEndian);
-    int SavePhysicalDataChunk(const void* pData, int nSize, bool bSwapEndian);
-
-private:
-    CChunkFile* m_pChunkFile;
-    CContentCGF* m_pCGF;
-    std::set<CNodeCGF*> m_savedNodes;
-    std::set<CMaterialCGF*> m_savedMaterials;
-    std::map<CMesh*, int> m_mapMeshToChunk;
-    bool m_bDoNotSaveMeshData;
-    bool m_bDoNotSaveNonMeshData;
-    bool m_bSavePhysicsMeshes;
-    bool m_bCompactVertexStreams;
-    bool m_bComputeSubsetTexelDensity;
-};
-
-#endif
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_CGFSAVER_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/CMakeLists.txt b/Code/CryEngine/Cry3DEngine/CGF/CMakeLists.txt
deleted file mode 100644
index 9fb55c6c5c..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_target(
-    NAME Cry3DEngine.CGF.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        cry3dengine_cgf_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::CryCommon
-)
-
-ly_add_target(
-    NAME Cry3DEngine.CGF.RC.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        cry3dengine_cgf_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    COMPILE_DEFINITIONS
-        PRIVATE
-            RESOURCE_COMPILER
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::CryCommon
-)
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkData.h b/Code/CryEngine/Cry3DEngine/CGF/ChunkData.h
deleted file mode 100644
index beacfa1ed7..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkData.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_CHUNKDATA_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_CHUNKDATA_H
-#pragma once
-
-struct CChunkData
-{
-    char* data;
-    int size;
-
-    CChunkData() { data = 0; size = 0; }
-    ~CChunkData() { free(data); }
-
-    template <class T>
-    void Add(const T& object)
-    {
-        AddData(&object, sizeof(object));
-    }
-    void AddData(const void* pSrcData, int nSrcDataSize)
-    {
-        data = (char*)realloc(data, size + nSrcDataSize);
-        memcpy(data + size, pSrcData, nSrcDataSize);
-        size += nSrcDataSize;
-    }
-};
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_CHUNKDATA_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkFile.cpp b/Code/CryEngine/Cry3DEngine/CGF/ChunkFile.cpp
deleted file mode 100644
index beca3fd6f5..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkFile.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include <platform.h>
-#include "ChunkFile.h"
-#include "ChunkFileReaders.h"
-#include "ChunkFileWriters.h"
-
-#if !defined(FUNCTION_PROFILER_3DENGINE)
-  #define FUNCTION_PROFILER_3DENGINE
-#endif
-
-#if !defined(LOADING_TIME_PROFILE_SECTION)
-  #define LOADING_TIME_PROFILE_SECTION
-#endif
-
-namespace
-{
-    inline bool ChunkLessOffset(const IChunkFile::ChunkDesc* const p0, const IChunkFile::ChunkDesc* const p1)
-    {
-        return IChunkFile::ChunkDesc::LessOffset(*p0, *p1);
-    }
-}
-
-
-CChunkFile::CChunkFile()
-    : m_pInternalData(NULL)
-{
-    Clear();
-}
-
-CChunkFile::~CChunkFile()
-{
-    Clear();
-}
-
-void CChunkFile::Clear()
-{
-    ReleaseMemoryBuffer();
-    ReleaseChunks();
-
-    m_nLastChunkId = 0;
-    m_pInternalData = NULL;
-    m_bLoaded = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CChunkFile::ChunkDesc* CChunkFile::GetChunk(int nChunkIdx)
-{
-    assert(nChunkIdx >= 0 && nChunkIdx < (int)m_chunks.size());
-    return m_chunks[nChunkIdx];
-}
-
-const CChunkFile::ChunkDesc* CChunkFile::GetChunk(int nChunkIdx) const
-{
-    assert(nChunkIdx >= 0 && nChunkIdx < (int)m_chunks.size());
-    return m_chunks[nChunkIdx];
-}
-
-// number of chunks
-int CChunkFile::NumChunks() const
-{
-    return (int)m_chunks.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CChunkFile::AddChunk(ChunkTypes chunkType, int chunkVersion, EEndianness eEndianness, const void* chunkData, int chunkSize)
-{
-    ChunkDesc* const pChunk = new ChunkDesc;
-
-    pChunk->bSwapEndian = (eEndianness == eEndianness_NonNative);
-
-    // This block of code is used for debugging only
-    if (false)
-    {
-        for (size_t i = 0, n = m_chunks.size(); i < n; ++i)
-        {
-            if (m_chunks[i]->bSwapEndian != pChunk->bSwapEndian)
-            {
-                break;
-            }
-        }
-    }
-
-    pChunk->chunkType = chunkType;
-    pChunk->chunkVersion = chunkVersion;
-
-    const int chunkId = ++m_nLastChunkId;
-    pChunk->chunkId = chunkId;
-
-    pChunk->data = new char[chunkSize];
-    pChunk->size = chunkSize;
-    memcpy(pChunk->data, chunkData, chunkSize);
-
-    m_chunks.push_back(pChunk);
-    m_chunkIdMap[chunkId] = pChunk;
-
-    return chunkId;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CChunkFile::DeleteChunkById(int nChunkId)
-{
-    for (size_t i = 0, n = m_chunks.size(); i < n; ++i)
-    {
-        if (m_chunks[i]->chunkId == nChunkId)
-        {
-            m_chunkIdMap.erase(nChunkId);
-            if (m_chunks[i]->data)
-            {
-                delete [] (char*)m_chunks[i]->data;
-                m_chunks[i]->data = 0;
-            }
-            delete m_chunks[i];
-            m_chunks.erase(m_chunks.begin() + i);
-            return;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CChunkFile::DeleteChunksByType(ChunkTypes nChunkType)
-{
-    size_t j = 0;
-    for (size_t i = 0, n = m_chunks.size(); i < n; ++i)
-    {
-        if (m_chunks[i]->chunkType == nChunkType)
-        {
-            m_chunkIdMap.erase(m_chunks[i]->chunkId);
-            if (m_chunks[i]->data)
-            {
-                delete [] (char*)m_chunks[i]->data;
-                m_chunks[i]->data = 0;
-            }
-            delete m_chunks[i];
-        }
-        else
-        {
-            m_chunks[j] = m_chunks[i];
-            ++j;
-        }
-    }
-    m_chunks.resize(j);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CChunkFile::ReleaseChunks()
-{
-    m_bLoaded = false;
-    for (size_t i = 0; i < m_chunks.size(); ++i)
-    {
-        if (m_chunks[i]->data)
-        {
-            delete [] (char*) m_chunks[i]->data;
-        }
-        delete m_chunks[i];
-    }
-    m_chunks.clear();
-    m_chunkIdMap.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CChunkFile::ChunkDesc* CChunkFile::FindChunkByType(ChunkTypes nChunkType)
-{
-    for (size_t i = 0; i < m_chunks.size(); ++i)
-    {
-        if (m_chunks[i]->chunkType == nChunkType)
-        {
-            return m_chunks[i];
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CChunkFile::ChunkDesc* CChunkFile::FindChunkById(int nChunkId)
-{
-    ChunkIdMap::iterator it = m_chunkIdMap.find(nChunkId);
-    if (it != m_chunkIdMap.end())
-    {
-        return it->second;
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CChunkFile::Write(const char* filename)
-{
-    if (m_chunks.empty())
-    {
-        m_LastError.Format("Writing *empty* chunk files is not supported (file '%s')", filename);
-        return false;
-    }
-
-    // Validate requested endianness. Kept here for debug.
-    if (false)
-    {
-        bool bHasSwapEndianTrue = false;
-        bool bHasSwapEndianFalse = false;
-        for (size_t i = 0; i < m_chunks.size(); ++i)
-        {
-            const ChunkDesc& cd = *m_chunks[i];
-            if (cd.bSwapEndian)
-            {
-                bHasSwapEndianTrue = true;
-            }
-            else
-            {
-                bHasSwapEndianFalse = true;
-            }
-        }
-        if (bHasSwapEndianTrue && bHasSwapEndianFalse)
-        {
-            //Warning("Writing chunk files with *mixed* endianness is not supported (file '%s')", filename);
-        }
-    }
-
-    ChunkFile::OsFileWriter writer;
-
-    if (!writer.Create(filename))
-    {
-        m_LastError.Format("Failed to open '%s' for writing", filename);
-        return false;
-    }
-
-    ChunkFile::MemorylessChunkFileWriter wr(ChunkFile::MemorylessChunkFileWriter::eChunkFileFormat_0x746, &writer);
-    wr.SetAlignment(4);
-
-    while (wr.StartPass())
-    {
-        for (size_t i = 0; i < m_chunks.size(); ++i)
-        {
-            const ChunkDesc& cd = *m_chunks[i];
-            wr.StartChunk((cd.bSwapEndian ? eEndianness_NonNative : eEndianness_Native), cd.chunkType, cd.chunkVersion, cd.chunkId);
-            wr.AddChunkData(cd.data, cd.size);
-        }
-    }
-
-    if (!wr.HasWrittenSuccessfully())
-    {
-        m_LastError.Format("Failed to write '%s'", filename);
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CChunkFile::WriteToMemoryBuffer(void** pData, int* nSize)
-{
-    ReleaseMemoryBuffer();
-    *pData = 0;
-
-    if (m_chunks.empty())
-    {
-        m_LastError.Format("Writing *empty* chunk files is not supported");
-        return false;
-    }
-
-    // Do writing in *two* stages:
-    //  1) computing required size (see sizeWriter below)
-    //  2) allocating and writing data (see memoryWriter below)
-
-    ChunkFile::SizeWriter sizeWriter;
-    ChunkFile::MemoryWriter memoryWriter;
-
-    for (int stage = 0; stage < 2; ++stage)
-    {
-        ChunkFile::IWriter* pWriter;
-        if (stage == 0)
-        {
-            sizeWriter.Start();
-            pWriter = &sizeWriter;
-        }
-        else
-        {
-            assert(m_pInternalData == 0);
-            *nSize = sizeWriter.GetPos();
-            assert(*nSize > 0);
-
-            m_pInternalData = (char*)malloc(*nSize);
-            if (m_pInternalData == 0)
-            {
-                m_LastError.Format("Failed to allocate %u bytes", uint(*nSize));
-                return false;
-            }
-
-            if (!memoryWriter.Start(m_pInternalData, *nSize))
-            {
-                assert(0);
-                m_LastError.Format("Internal error");
-                ReleaseMemoryBuffer();
-                return false;
-            }
-            pWriter = &memoryWriter;
-        }
-
-        ChunkFile::MemorylessChunkFileWriter wr(ChunkFile::MemorylessChunkFileWriter::eChunkFileFormat_0x746, pWriter);
-        wr.SetAlignment(4);
-
-        while (wr.StartPass())
-        {
-            for (size_t i = 0; i < m_chunks.size(); ++i)
-            {
-                const ChunkDesc& cd = *m_chunks[i];
-                wr.StartChunk((cd.bSwapEndian ? eEndianness_NonNative : eEndianness_Native), cd.chunkType, cd.chunkVersion, cd.chunkId);
-                wr.AddChunkData(cd.data, cd.size);
-            }
-        }
-
-        if (!wr.HasWrittenSuccessfully())
-        {
-            m_LastError.Format("Failed to write");
-            ReleaseMemoryBuffer();
-            return false;
-        }
-
-        assert(stage != 2 || memoryWriter.GetPos() == *nSize);
-    }
-
-    *pData = m_pInternalData;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CChunkFile::ReleaseMemoryBuffer()
-{
-    if (m_pInternalData)
-    {
-        free(m_pInternalData);
-        m_pInternalData = 0;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CChunkFile::Read(const char* filename)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    ReleaseChunks();
-
-    // Loading chunks
-    {
-        ChunkFile::CryFileReader f;
-
-        if (!f.Open(filename))
-        {
-            m_LastError.Format("File %s failed to open for reading", filename);
-            return false;
-        }
-
-        {
-            const char* err = 0;
-
-            err = ChunkFile::GetChunkTableEntries_0x746(&f, m_chunks);
-            if (err)
-            {
-                err = ChunkFile::GetChunkTableEntries_0x744_0x745(&f, m_chunks);
-                if (!err)
-                {
-                    err = ChunkFile::StripChunkHeaders_0x744_0x745(&f, m_chunks);
-                }
-            }
-
-            if (err)
-            {
-                m_LastError = err;
-                return false;
-            }
-        }
-
-        for (size_t i = 0; i < m_chunks.size(); ++i)
-        {
-            ChunkDesc& cd = *m_chunks[i];
-
-            assert(cd.data == 0);
-
-            cd.data = new char[cd.size];
-
-            if (!f.SetPos(cd.fileOffset) ||
-                !f.Read(cd.data, cd.size))
-            {
-                m_LastError.Format(
-                    "Failed to read chunk data (offset:%u, size:%u) from file %s",
-                    cd.fileOffset, cd.size, filename);
-                return false;
-            }
-        }
-    }
-
-    m_nLastChunkId = 0;
-
-    for (size_t i = 0; i < m_chunks.size(); ++i)
-    {
-        // Add chunk to chunk map.
-        m_chunkIdMap[m_chunks[i]->chunkId] = m_chunks[i];
-
-        // Update last chunk ID.
-        if (m_chunks[i]->chunkId > m_nLastChunkId)
-        {
-            m_nLastChunkId = m_chunks[i]->chunkId;
-        }
-    }
-
-    if (m_chunks.size() != m_chunkIdMap.size())
-    {
-        const int duplicateCount = (int)(m_chunks.size() - m_chunkIdMap.size());
-        m_LastError.Format(
-            "%d duplicate chunk ID%s found in file %s",
-            duplicateCount, ((duplicateCount > 1) ? "s" : ""), filename);
-        return false;
-    }
-
-    m_bLoaded = true;
-
-    return true;
-}
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkFile.h b/Code/CryEngine/Cry3DEngine/CGF/ChunkFile.h
deleted file mode 100644
index bfe1d36a0c..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkFile.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILE_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILE_H
-#pragma once
-
-#include <CrySizer.h>
-#include <CryHeaders.h>
-#include <smartptr.h>
-#include <IChunkFile.h>
-
-////////////////////////////////////////////////////////////////////////
-// Chunk file reader.
-// Accesses a chunked file structure through file mapping object.
-// Opens a chunk file and checks for its validity.
-// If it's invalid, closes it as if there was no open operation.
-// Error handling is performed through the return value of Read():
-// it must be true for successfully open files
-////////////////////////////////////////////////////////////////////////
-
-class CChunkFile
-    : public IChunkFile
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    CChunkFile();
-    virtual ~CChunkFile();
-
-    // interface IChunkFile --------------------------------------------------
-
-    virtual void Release() { delete this; }
-
-    void Clear();
-
-    virtual bool IsReadOnly() const { return false; }
-    virtual bool IsLoaded() const { return m_bLoaded; }
-
-    virtual bool Read(const char* filename);
-    virtual bool ReadFromMemory([[maybe_unused]] const void* pData, [[maybe_unused]] int nDataSize) { return false; }
-
-    virtual bool Write(const char* filename);
-    virtual bool WriteToMemoryBuffer(void** pData, int* nSize);
-    virtual void ReleaseMemoryBuffer();
-
-    virtual int AddChunk(ChunkTypes chunkType, int chunkVersion, EEndianness eEndianness, const void* chunkData, int chunkSize);
-    virtual void DeleteChunkById(int nChunkId);
-    virtual void DeleteChunksByType(ChunkTypes nChunkType);
-
-    virtual ChunkDesc* FindChunkByType(ChunkTypes nChunkType);
-    virtual ChunkDesc* FindChunkById(int nChunkId);
-
-    virtual int NumChunks() const;
-
-    virtual ChunkDesc* GetChunk(int nIndex);
-    virtual const ChunkDesc* GetChunk(int nIndex) const;
-
-    virtual const char* GetLastError() const { return m_LastError; }
-
-    // -----------------------------------------------------------------------
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_LastError);
-        pSizer->AddObject(m_chunks);
-        pSizer->AddObject(m_chunkIdMap);
-    }
-
-private:
-    void ReleaseChunks();
-
-private:
-    // this variable contains the last error occurred in this class
-    string m_LastError;
-
-    int m_nLastChunkId;
-    std::vector<ChunkDesc*> m_chunks;
-    typedef std::map<int, ChunkDesc*> ChunkIdMap;
-    ChunkIdMap m_chunkIdMap;
-    char* m_pInternalData;
-    bool m_bLoaded;
-};
-
-TYPEDEF_AUTOPTR(CChunkFile);
-
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILE_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileComponents.h b/Code/CryEngine/Cry3DEngine/CGF/ChunkFileComponents.h
deleted file mode 100644
index 88ebfd44ea..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileComponents.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILECOMPONENTS_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILECOMPONENTS_H
-#pragma once
-
-#include "CryHeaders.h"
-
-namespace ChunkFile
-{
-    // All chunk files use *little-endian* format to store file header and chunk.
-    // Chunk data are stored in either little-endian or big-endian format,
-    // see kBigEndianVersionFlag.
-
-    struct FileHeader_0x744_0x745
-    {
-        char signature[7];
-        char _pad_[1];
-        uint32 fileType;
-        uint32 version;
-        uint32 chunkTableOffset;
-
-        enum EFileType
-        {
-            eFileType_Geom = 0xFFFF0000U,
-            eFileType_Anim,
-        };
-
-        static const char* GetExpectedSignature()
-        {
-            return "CryTek";
-        }
-
-        bool HasValidSignature() const
-        {
-            return memcmp(GetExpectedSignature(), signature, sizeof(signature)) == 0;
-        }
-
-        void Set(uint32 a_chunkTableOffset)
-        {
-            memcpy(signature, GetExpectedSignature(), sizeof(signature));
-            _pad_[0] = 0;
-            // We need to set eFileType_Geom or eFileType_Anim, but asking
-            // the caller to provide us the type will complicate the code, so we
-            // set eFileType_Geom only. It's ok because all our readers
-            // don't differentiate between eFileType_Geom and eFileType_Anim.
-            fileType = eFileType_Geom;
-            version = 0x745;
-            chunkTableOffset = a_chunkTableOffset;
-        }
-
-        void SwapEndianness()
-        {
-            SwapEndianBase(&fileType, 1);
-            SwapEndianBase(&version, 1);
-            SwapEndianBase(&chunkTableOffset, 1);
-        }
-    };
-
-
-    struct FileHeader_0x746
-    {
-        char signature[4];
-        uint32 version;
-        uint32 chunkCount;
-        uint32 chunkTableOffset;
-
-        static const char* GetExpectedSignature()
-        {
-            return "CrCh";
-        }
-
-        static const char* GetExpectedSpeedTreeSignature()
-        {
-            return "STCh";
-        }
-
-        bool HasValidSignature() const
-        {
-            return (memcmp(GetExpectedSignature(), signature, sizeof(signature)) == 0) ||
-                (memcmp(GetExpectedSpeedTreeSignature(), signature, sizeof(signature)) == 0);
-        }
-
-        void Set(int32 a_chunkCount, uint32 a_chunkTableOffset)
-        {
-            memcpy(signature, GetExpectedSignature(), sizeof(signature));
-            version = 0x746;
-            chunkCount = a_chunkCount;
-            chunkTableOffset = a_chunkTableOffset;
-        }
-
-        void SwapEndianness()
-        {
-            SwapEndianBase(&version, 1);
-            SwapEndianBase(&chunkCount, 1);
-            SwapEndianBase(&chunkTableOffset, 1);
-        }
-    };
-
-
-    struct ChunkHeader_0x744_0x745
-    {
-        uint32 type;
-        uint32 version;
-        uint32 offsetInFile;
-        uint32 id;
-
-        enum
-        {
-            kBigEndianVersionFlag = 0x80000000U
-        };
-
-        void SwapEndianness()
-        {
-            SwapEndianBase(&type, 1);
-            SwapEndianBase(&version, 1);
-            SwapEndianBase(&offsetInFile, 1);
-            SwapEndianBase(&id, 1);
-        }
-    };
-
-
-    struct ChunkTableEntry_0x744
-        : public ChunkHeader_0x744_0x745
-    {
-        void SwapEndianness()
-        {
-            ChunkHeader_0x744_0x745::SwapEndianness();
-        }
-    };
-
-
-    struct ChunkTableEntry_0x745
-        : public ChunkHeader_0x744_0x745
-    {
-        uint32 size;
-
-        void SwapEndianness()
-        {
-            ChunkHeader_0x744_0x745::SwapEndianness();
-            SwapEndianBase(&size, 1);
-        }
-    };
-
-
-    struct ChunkTableEntry_0x746
-    {
-        uint16 type;
-        uint16 version;
-        uint32 id;
-        uint32 size;
-        uint32 offsetInFile;
-
-        enum
-        {
-            kBigEndianVersionFlag = 0x8000U
-        };
-
-        void SwapEndianness()
-        {
-            SwapEndianBase(&type, 1);
-            SwapEndianBase(&version, 1);
-            SwapEndianBase(&id, 1);
-            SwapEndianBase(&size, 1);
-            SwapEndianBase(&offsetInFile, 1);
-        }
-    };
-
-
-    // We need this function to strip 0x744 & 0x745 chunk headers
-    // from chunk data properly: some chunks in 0x744 and 0x745 formats
-    // don't have chunk headers in their data.
-    // 'chunkType' is expected to be provided in the 0x746 format.
-    inline bool ChunkContainsHeader_0x744_0x745(const uint16 chunkType, const uint16 chunkVersion)
-    {
-        switch (chunkType)
-        {
-        case ChunkType_SourceInfo:
-            return false;
-        case ChunkType_Controller:
-            return (chunkVersion != CONTROLLER_CHUNK_DESC_0827::VERSION && chunkVersion != CONTROLLER_CHUNK_DESC_0830::VERSION);
-        case ChunkType_BoneNameList:
-            return (chunkVersion != BONENAMELIST_CHUNK_DESC_0745::VERSION);
-        case ChunkType_MeshMorphTarget:
-            return (chunkVersion != MESHMORPHTARGET_CHUNK_DESC_0001::VERSION);
-        case ChunkType_BoneInitialPos:
-            return (chunkVersion != BONEINITIALPOS_CHUNK_DESC_0001::VERSION);
-        default:
-            return true;
-        }
-    }
-
-
-    static inline uint16 ConvertChunkTypeTo0x746(uint32 type)
-    {
-        if (type <= 0xFFFF)
-        {
-            // Input type seems to be already in 0x746 format (or it's 0)
-            return type;
-        }
-
-        // Input type seems to be in 0x745 format
-
-        if ((type & 0xFFFF) >= 0xF000)
-        {
-            // Cannot fit into resulting 0x746 type (uint16)
-            return 0;
-        }
-        if ((type & 0xFFFF0000U) == 0xCCCC0000U)
-        {
-            return 0x1000 + (type & 0x0FFF);
-        }
-        if ((type & 0xFFFF0000U) == 0xACDC0000U)
-        {
-            return 0x2000 + (type & 0x0FFF);
-        }
-        if ((type & 0xFFFF0000U) == 0xAAFC0000U)
-        {
-            return 0x3000 + (type & 0x0FFF);
-        }
-
-        // Unknown 0x745 chunk type
-        return 0;
-    }
-
-    static inline uint32 ConvertChunkTypeTo0x745(uint32 type)
-    {
-        if (type > 0xFFFF)
-        {
-            // Input type seems to be already in 0x745 format
-            return type;
-        }
-
-        // Input type seems to be in 0x746 format
-
-        if ((type & 0xF000) == 0x1000)
-        {
-            return 0xCCCC0000U + (type & 0x0FFF);
-        }
-        if ((type & 0xF000) == 0x2000)
-        {
-            return 0xACDC0000U + (type & 0x0FFF);
-        }
-        if ((type & 0xF000) == 0x3000)
-        {
-            return 0xAAFC0000U + (type & 0x0FFF);
-        }
-
-        // Unknown 0x746 chunk type (or it's 0)
-        return 0;
-    }
-} // namespace ChunkFile
-
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILECOMPONENTS_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileReaders.cpp b/Code/CryEngine/Cry3DEngine/CGF/ChunkFileReaders.cpp
deleted file mode 100644
index afdd4cbec2..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileReaders.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include <platform.h>
-#include <CryFile.h>
-#include <CryHeaders.h>
-#include "ChunkFileReaders.h"
-#include "CryPath.h"
-
-namespace ChunkFile
-{
-    //////////////////////////////////////////////////////////////////////////
-
-    CryFileReader::CryFileReader()
-    {
-    }
-
-    CryFileReader::~CryFileReader()
-    {
-        Close();
-    }
-
-    bool CryFileReader::Open(const char* filename)
-    {
-        Close();
-
-        if (filename == 0 || filename[0] == 0)
-        {
-            return false;
-        }
-
-        if (!m_f.Open(filename, "rb"))
-        {
-            return false;
-        }
-
-        m_offset = 0;
-
-        return true;
-    }
-
-    void CryFileReader::Close()
-    {
-        m_f.Close();
-    }
-
-    int32 CryFileReader::GetSize()
-    {
-        return m_f.GetLength();
-    }
-
-    bool CryFileReader::SetPos(int32 pos)
-    {
-        if (pos < 0)
-        {
-            return false;
-        }
-        m_offset = pos;
-        return m_f.Seek(m_offset, SEEK_SET) == 0;
-    }
-
-    bool CryFileReader::Read(void* buffer, size_t size)
-    {
-        return m_f.ReadRaw(buffer, size) == size;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    MemoryReader::MemoryReader()
-        : m_ptr(0)
-        , m_size(0)
-    {
-    }
-
-    MemoryReader::~MemoryReader()
-    {
-    }
-
-    bool MemoryReader::Start(void* ptr, int32 size)
-    {
-        if (ptr == 0 || size <= 0)
-        {
-            return false;
-        }
-
-        m_ptr = (char*)ptr;
-        m_size = size;
-        m_offset = 0;
-
-        return true;
-    }
-
-    void MemoryReader::Close()
-    {
-    }
-
-    int32 MemoryReader::GetSize()
-    {
-        return m_size;
-    }
-
-    bool MemoryReader::SetPos(int32 pos)
-    {
-        if (pos < 0 || pos > m_size)
-        {
-            return false;
-        }
-        m_offset = pos;
-        return true;
-    }
-
-    bool MemoryReader::Read(void* buffer, size_t size)
-    {
-        if (!m_ptr)
-        {
-            return false;
-        }
-
-        if (size <= 0)
-        {
-            return true;
-        }
-
-        if ((size_t)m_offset + size > (size_t)m_size)
-        {
-            return false;
-        }
-
-        memcpy(buffer, &m_ptr[m_offset], size);
-        m_offset += size;
-
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    namespace
-    {
-        class ChunkListRef
-        {
-            std::vector<IChunkFile::ChunkDesc>& m_chunks;
-
-        public:
-            ChunkListRef(std::vector<IChunkFile::ChunkDesc>& chunks)
-                : m_chunks(chunks)
-            {
-            }
-
-            void Clear()
-            {
-                for (size_t i = 0; i < m_chunks.size(); ++i)
-                {
-                    if (m_chunks[i].data)
-                    {
-                        delete [] (char*)m_chunks[i].data;
-                        m_chunks[i].data = 0;
-                    }
-                }
-                m_chunks.clear();
-            }
-
-            void Create(size_t count)
-            {
-                Clear();
-                m_chunks.resize(count);
-                for (size_t i = 0; i < count; ++i)
-                {
-                    m_chunks[i].data = 0;
-                    m_chunks[i].size = 0;
-                }
-            }
-
-            void Sort()
-            {
-                std::sort(m_chunks.begin(), m_chunks.end(), IChunkFile::ChunkDesc::LessOffset);
-            }
-
-            size_t GetCount() const
-            {
-                return m_chunks.size();
-            }
-
-            IChunkFile::ChunkDesc& Get(size_t index)
-            {
-                return m_chunks[index];
-            }
-        };
-
-        class ChunkPtrListRef
-        {
-            std::vector<IChunkFile::ChunkDesc*>& m_chunks;
-
-        public:
-            ChunkPtrListRef(std::vector<IChunkFile::ChunkDesc*>& chunks)
-                : m_chunks(chunks)
-            {
-            }
-
-            void Clear()
-            {
-                for (size_t i = 0; i < m_chunks.size(); ++i)
-                {
-                    if (m_chunks[i])
-                    {
-                        if (m_chunks[i]->data)
-                        {
-                            delete [] (char*)(m_chunks[i]->data);
-                            m_chunks[i]->data = 0;
-                        }
-                        delete m_chunks[i];
-                    }
-                }
-                m_chunks.clear();
-            }
-
-            void Create(size_t count)
-            {
-                Clear();
-                m_chunks.resize(count, 0);
-                for (size_t i = 0; i < count; ++i)
-                {
-                    m_chunks[i] = new IChunkFile::ChunkDesc;
-                    m_chunks[i]->data = 0;
-                    m_chunks[i]->size = 0;
-                }
-            }
-
-            void Sort()
-            {
-                std::sort(m_chunks.begin(), m_chunks.end(), IChunkFile::ChunkDesc::LessOffsetByPtr);
-            }
-
-            size_t GetCount() const
-            {
-                return m_chunks.size();
-            }
-
-            IChunkFile::ChunkDesc& Get(size_t index)
-            {
-                return *m_chunks[index];
-            }
-        };
-    } // namespace
-
-
-    //////////////////////////////////////////////////////////////////////////
-
-    template <class TListRef>
-    static const char* GetChunkTableEntries_0x744_0x745_Tpl(IReader* pReader, TListRef& chunks)
-    {
-        chunks.Clear();
-
-        ChunkFile::FileHeader_0x744_0x745 header;
-
-        if (!pReader->SetPos(0) ||
-            !pReader->Read(&header, sizeof(header)))
-        {
-            return "Cannot read header of chunk file";
-        }
-
-        if (!header.HasValidSignature())
-        {
-            return "Unknown signature in chunk file";
-        }
-
-        if (SYSTEM_IS_BIG_ENDIAN)
-        {
-            header.SwapEndianness();
-        }
-
-        if (header.version != 0x744 && header.version != 0x745)
-        {
-            return "Version of chunk file is neither 0x744 nor 0x745";
-        }
-
-        if (header.fileType != header.eFileType_Geom && header.fileType != header.eFileType_Anim)
-        {
-            return "Type of chunk file is neither FileType_Geom nor FileType_Anim";
-        }
-
-        uint32 chunkCount = 0;
-        {
-            if (!pReader->SetPos(header.chunkTableOffset) ||
-                !pReader->Read(&chunkCount, sizeof(chunkCount)))
-            {
-                return "Failed to read # of chunks";
-            }
-
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                SwapEndianBase(&chunkCount, 1);
-            }
-
-            if (chunkCount < 0 || chunkCount > 1000000)
-            {
-                return "Invalid # of chunks in file";
-            }
-        }
-
-        if (chunkCount <= 0)
-        {
-            return 0;
-        }
-
-        chunks.Create(chunkCount);
-
-        if (header.version == 0x744)
-        {
-            std::vector<ChunkFile::ChunkTableEntry_0x744> srcChunks;
-            srcChunks.resize(chunkCount);
-
-            if (!pReader->Read(&srcChunks[0], sizeof(srcChunks[0]) * srcChunks.size()))
-            {
-                return "Failed to read chunk entries from file";
-            }
-
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                for (uint32 i = 0; i < chunkCount; ++i)
-                {
-                    srcChunks[i].SwapEndianness();
-                }
-            }
-
-            for (uint32 i = 0; i < chunkCount; ++i)
-            {
-                IChunkFile::ChunkDesc& cd = chunks.Get(i);
-
-                cd.chunkType = (ChunkTypes)ConvertChunkTypeTo0x746(srcChunks[i].type);
-                cd.chunkVersion = srcChunks[i].version & ~ChunkFile::ChunkHeader_0x744_0x745::kBigEndianVersionFlag;
-                cd.chunkId = srcChunks[i].id;
-                cd.fileOffset = srcChunks[i].offsetInFile;
-                cd.bSwapEndian = (srcChunks[i].version & ChunkFile::ChunkHeader_0x744_0x745::kBigEndianVersionFlag) ? SYSTEM_IS_LITTLE_ENDIAN : SYSTEM_IS_BIG_ENDIAN;
-            }
-
-            chunks.Sort();
-
-            const uint32 endOfChunkData = (header.chunkTableOffset < chunks.Get(0).fileOffset)
-                ? (uint32)pReader->GetSize()
-                : header.chunkTableOffset;
-
-            for (uint32 i = 0; i < chunkCount; ++i)
-            {
-                // calculate chunk size based on the next (by offset in file) chunk or
-                // on the end of the chunk data portion of the file
-
-                const size_t nextOffsetInFile = (i + 1 < chunkCount)
-                    ? chunks.Get(i + 1).fileOffset
-                    : endOfChunkData;
-
-                chunks.Get(i).size = nextOffsetInFile - chunks.Get(i).fileOffset;
-            }
-        }
-        else // header.version == 0x745
-        {
-            std::vector<ChunkFile::ChunkTableEntry_0x745> srcChunks;
-            srcChunks.resize(chunkCount);
-
-            if (!pReader->Read(&srcChunks[0], sizeof(srcChunks[0]) * srcChunks.size()))
-            {
-                return "Failed to read chunk entries from file.";
-            }
-
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                for (uint32 i = 0; i < chunkCount; ++i)
-                {
-                    srcChunks[i].SwapEndianness();
-                }
-            }
-
-            for (uint32 i = 0; i < chunkCount; ++i)
-            {
-                IChunkFile::ChunkDesc& cd = chunks.Get(i);
-
-                cd.chunkType = (ChunkTypes)ConvertChunkTypeTo0x746(srcChunks[i].type);
-                cd.chunkVersion = srcChunks[i].version & ~ChunkFile::ChunkHeader_0x744_0x745::kBigEndianVersionFlag;
-                cd.chunkId = srcChunks[i].id;
-                cd.fileOffset = srcChunks[i].offsetInFile;
-                cd.size = srcChunks[i].size;
-                cd.bSwapEndian = (srcChunks[i].version & ChunkFile::ChunkHeader_0x744_0x745::kBigEndianVersionFlag) ? SYSTEM_IS_LITTLE_ENDIAN : SYSTEM_IS_BIG_ENDIAN;
-            }
-        }
-
-        const uint32 fileSize = (uint32)pReader->GetSize();
-
-        for (uint32 i = 0; i < chunkCount; ++i)
-        {
-            const IChunkFile::ChunkDesc& cd = chunks.Get(i);
-
-            if (cd.size + cd.fileOffset > fileSize)
-            {
-                return "Data in chunk file are corrupted";
-            }
-        }
-
-        return 0;
-    }
-
-
-    template <class TListRef>
-    static const char* GetChunkTableEntries_0x746_Tpl(IReader* pReader, TListRef& chunks)
-    {
-        chunks.Clear();
-
-        ChunkFile::FileHeader_0x746 header;
-
-        if (!pReader->SetPos(0) ||
-            !pReader->Read(&header, sizeof(header)))
-        {
-            return "Cannot read header from file.";
-        }
-
-        if (!header.HasValidSignature())
-        {
-            return "Unknown signature in chunk file";
-        }
-
-        if (SYSTEM_IS_BIG_ENDIAN)
-        {
-            header.SwapEndianness();
-        }
-
-        if (header.version != 0x746)
-        {
-            return "Version of chunk file is not 0x746";
-        }
-
-        if (header.chunkCount < 0 || header.chunkCount > 10000000)
-        {
-            return "Invalid # of chunks in file.";
-        }
-
-        if (header.chunkCount <= 0)
-        {
-            return 0;
-        }
-
-        chunks.Create(header.chunkCount);
-
-        std::vector<ChunkFile::ChunkTableEntry_0x746> srcChunks;
-        srcChunks.resize(header.chunkCount);
-
-        if (!pReader->SetPos(header.chunkTableOffset) ||
-            !pReader->Read(&srcChunks[0], sizeof(srcChunks[0]) * srcChunks.size()))
-        {
-            return "Failed to read chunk entries from file";
-        }
-
-        if (SYSTEM_IS_BIG_ENDIAN)
-        {
-            for (uint32 i = 0; i < header.chunkCount; ++i)
-            {
-                srcChunks[i].SwapEndianness();
-            }
-        }
-
-        for (size_t i = 0, n = chunks.GetCount(); i < n; ++i)
-        {
-            IChunkFile::ChunkDesc& cd = chunks.Get(i);
-
-            cd.chunkType = (ChunkTypes)srcChunks[i].type;
-            cd.chunkVersion = srcChunks[i].version & ~ChunkFile::ChunkTableEntry_0x746::kBigEndianVersionFlag;
-            cd.chunkId = srcChunks[i].id;
-            cd.size = srcChunks[i].size;
-            cd.fileOffset = srcChunks[i].offsetInFile;
-            cd.bSwapEndian = (srcChunks[i].version & ChunkFile::ChunkTableEntry_0x746::kBigEndianVersionFlag) ? SYSTEM_IS_LITTLE_ENDIAN : SYSTEM_IS_BIG_ENDIAN;
-        }
-
-        return 0;
-    }
-
-
-    template <class TListRef>
-    static const char* StripChunkHeaders_0x744_0x745_Tpl(IReader* pReader, TListRef& chunks)
-    {
-        for (size_t i = 0, n = chunks.GetCount(); i < n; ++i)
-        {
-            IChunkFile::ChunkDesc& ct = chunks.Get(i);
-
-            if (ChunkFile::ChunkContainsHeader_0x744_0x745(ct.chunkType, ct.chunkVersion))
-            {
-                ChunkFile::ChunkHeader_0x744_0x745 ch;
-                if (ct.size < sizeof(ch))
-                {
-                    return "Damaged data: reported size of chunk data is less that size of the chunk header";
-                }
-
-                // Validation
-                {
-                    if (!pReader->SetPos(ct.fileOffset) ||
-                        !pReader->Read(&ch, sizeof(ch)))
-                    {
-                        return "Failed to read chunk header from file";
-                    }
-
-                    if (SYSTEM_IS_BIG_ENDIAN)
-                    {
-                        ch.SwapEndianness();
-                    }
-
-                    ch.version &= ~ChunkFile::ChunkHeader_0x744_0x745::kBigEndianVersionFlag;
-
-                    if (ConvertChunkTypeTo0x746(ch.type) != ct.chunkType ||
-                        ch.version != ct.chunkVersion ||
-                        ch.id != ct.chunkId)
-                    {
-                        return "Data in a chunk header don't match data in the chunk table";
-                    }
-
-                    // The following check is commented out because we have (on 2013/11/25)
-                    // big number of .cgf files in Crysis 3 that fail to pass the check.
-                    //if (ch.offsetInFile != ct.fileOffset)
-                    //{
-                    //  return "File offset data in a chunk header don't match data in the chunk table";
-                    //}
-                }
-
-                ct.fileOffset += sizeof(ch);
-                ct.size -= sizeof(ch);
-
-                if (ct.data)
-                {
-                    ct.data = ((char*)ct.data) + sizeof(ch);
-                }
-            }
-
-            if (ct.size < 0)
-            {
-                return "A negative-length chunk found in file";
-            }
-        }
-
-        return 0;
-    }
-
-
-    const char* GetChunkTableEntries_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc>& chunks)
-    {
-        ChunkListRef c(chunks);
-        return GetChunkTableEntries_0x744_0x745_Tpl(pReader, c);
-    }
-
-    const char* GetChunkTableEntries_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc*>& chunks)
-    {
-        ChunkPtrListRef c(chunks);
-        return GetChunkTableEntries_0x744_0x745_Tpl(pReader, c);
-    }
-
-
-    const char* GetChunkTableEntries_0x746(IReader* pReader, std::vector<IChunkFile::ChunkDesc>& chunks)
-    {
-        ChunkListRef c(chunks);
-        return GetChunkTableEntries_0x746_Tpl(pReader, c);
-    }
-
-    const char* GetChunkTableEntries_0x746(IReader* pReader, std::vector<IChunkFile::ChunkDesc*>& chunks)
-    {
-        ChunkPtrListRef c(chunks);
-        return GetChunkTableEntries_0x746_Tpl(pReader, c);
-    }
-
-
-    const char* StripChunkHeaders_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc>& chunks)
-    {
-        ChunkListRef c(chunks);
-        return StripChunkHeaders_0x744_0x745_Tpl(pReader, c);
-    }
-
-    const char* StripChunkHeaders_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc*>& chunks)
-    {
-        ChunkPtrListRef c(chunks);
-        return StripChunkHeaders_0x744_0x745_Tpl(pReader, c);
-    }
-}  // namespace ChunkFile
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileReaders.h b/Code/CryEngine/Cry3DEngine/CGF/ChunkFileReaders.h
deleted file mode 100644
index fa916f8cce..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileReaders.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILEREADERS_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILEREADERS_H
-#pragma once
-
-#include <CryFile.h>        // for CCryFile
-#include "ChunkFileComponents.h"
-#include <CryFile.h>
-#include "IChunkFile.h"
-
-namespace ChunkFile
-{
-    struct IReader
-    {
-        virtual ~IReader()
-        {
-        }
-
-        virtual void Close() = 0;
-        virtual int32 GetSize() = 0;
-        virtual bool SetPos(int32 pos) = 0;
-        virtual bool Read(void* buffer, size_t size) = 0;
-    };
-
-
-    class CryFileReader
-        : public IReader
-    {
-    public:
-        CryFileReader();
-        virtual ~CryFileReader();
-
-        bool Open(const char* filename);
-
-        //-------------------------------------------------------
-        // IReader interface
-        virtual void Close();
-        virtual int32 GetSize();
-        virtual bool SetPos(int32 pos);
-        virtual bool Read(void* buffer, size_t size);
-        //-------------------------------------------------------
-
-    private:
-        CCryFile m_f;
-        int32 m_offset;
-    };
-
-
-    class MemoryReader
-        : public IReader
-    {
-    public:
-        MemoryReader();
-        virtual ~MemoryReader();
-
-        bool Start(void* ptr, int32 size);
-
-        //-------------------------------------------------------
-        // IReader interface
-        virtual void Close();
-        virtual int32 GetSize();
-        virtual bool SetPos(int32 pos);
-        virtual bool Read(void* buffer, size_t size);
-        //-------------------------------------------------------
-
-    private:
-        char* m_ptr;
-        int32 m_size;
-        int32 m_offset;
-    };
-
-
-    const char* GetChunkTableEntries_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc>& chunks);
-    const char* GetChunkTableEntries_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc*>& chunks);
-
-    const char* GetChunkTableEntries_0x746(IReader* pReader, std::vector<IChunkFile::ChunkDesc>& chunks);
-    const char* GetChunkTableEntries_0x746(IReader* pReader, std::vector<IChunkFile::ChunkDesc*>& chunks);
-
-    const char* StripChunkHeaders_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc>& chunks);
-    const char* StripChunkHeaders_0x744_0x745(IReader* pReader, std::vector<IChunkFile::ChunkDesc*>& chunks);
-}  // namespace ChunkFile
-
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILEREADERS_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileWriters.cpp b/Code/CryEngine/Cry3DEngine/CGF/ChunkFileWriters.cpp
deleted file mode 100644
index 006854366d..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileWriters.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include <platform.h>
-#include "ChunkFileWriters.h"
-#include <AzFramework/Archive/IArchive.h>
-
-static inline size_t ComputeSizeOfAlignment(size_t pos, size_t alignment)
-{
-    if (alignment <= 1 || (alignment & (alignment - 1)))
-    {
-        return 0;
-    }
-    const size_t mask = alignment - 1;
-    return (alignment - (pos & mask)) & mask;
-}
-
-
-namespace ChunkFile
-{
-    //////////////////////////////////////////////////////////////////////////
-
-    bool IWriter::WriteZeros(size_t size)
-    {
-        if (size <= 0)
-        {
-            return true;
-        }
-
-        char bf[1024];
-        memset(bf, 0, (sizeof(bf) < size ? sizeof(bf) : size));
-
-        while (size > 0)
-        {
-            const uint32 sz = (sizeof(bf) < size ? sizeof(bf) : size);
-            size -= sz;
-            if (!Write(bf, sz))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    OsFileWriter::OsFileWriter()
-        : m_f(0)
-    {
-    }
-
-    OsFileWriter::~OsFileWriter()
-    {
-        Erase();
-    }
-
-    bool OsFileWriter::Create(const char* filename)
-    {
-        Erase();
-
-        if (filename == 0 || filename[0] == 0)
-        {
-            // RCLogError("Filename is empty");
-            return false;
-        }
-
-        m_filename = filename;
-
-        m_f = nullptr;
-        azfopen(&m_f, filename, "wb");
-        if (!m_f)
-        {
-            // RCLogError("Failed to create file %s.", m_filename.c_str());
-            return false;
-        }
-
-        m_offset = 0;
-
-        return true;
-    }
-
-    void OsFileWriter::Erase()
-    {
-        if (m_f)
-        {
-            Close();
-            ::remove(m_filename.c_str());
-        }
-    }
-
-    void OsFileWriter::Close()
-    {
-        if (m_f)
-        {
-            fclose(m_f);
-            m_f = 0;
-        }
-    }
-
-    int32 OsFileWriter::GetPos() const
-    {
-        return m_offset;
-    }
-
-    bool OsFileWriter::Write(const void* buffer, size_t size)
-    {
-        if (!m_f)
-        {
-            return false;
-        }
-
-        if (size <= 0)
-        {
-            return true;
-        }
-
-        if (fwrite(buffer, size, 1, m_f) != 1)
-        {
-            // RCLogError("Failed to write %u byte(s) to file %s.", (uint)size, m_filename.c_str());
-            Erase();
-            return false;
-        }
-
-        m_offset += size;
-
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-#if !defined(RESOURCE_COMPILER)
-
-    CryPakFileWriter::CryPakFileWriter()
-        : m_pPak(0)
-        , m_fileHandle(AZ::IO::InvalidHandle)
-    {
-    }
-
-    CryPakFileWriter::~CryPakFileWriter()
-    {
-        Erase();
-    }
-
-    bool CryPakFileWriter::Create(AZ::IO::IArchive* pPak, const char* filename)
-    {
-        Erase();
-
-        if (pPak == 0 || filename == 0 || filename[0] == 0)
-        {
-            return false;
-        }
-
-        m_pPak = pPak;
-        m_filename = filename;
-
-        m_fileHandle = m_pPak->FOpen(m_filename.c_str(), "w+b");
-
-        if (m_fileHandle == AZ::IO::InvalidHandle)
-        {
-            return false;
-        }
-
-        m_offset = 0;
-
-        return true;
-    }
-
-    void CryPakFileWriter::Erase()
-    {
-        if (m_fileHandle != AZ::IO::InvalidHandle)
-        {
-            Close();
-            m_pPak->RemoveFile(m_filename.c_str());
-        }
-    }
-
-    void CryPakFileWriter::Close()
-    {
-        if (m_fileHandle != AZ::IO::InvalidHandle)
-        {
-            m_pPak->FClose(m_fileHandle);
-            m_fileHandle = AZ::IO::InvalidHandle;
-        }
-    }
-
-    int32 CryPakFileWriter::GetPos() const
-    {
-        return m_offset;
-    }
-
-    bool CryPakFileWriter::Write(const void* buffer, size_t size)
-    {
-        if (m_fileHandle == AZ::IO::InvalidHandle)
-        {
-            return false;
-        }
-
-        if (size <= 0)
-        {
-            return true;
-        }
-
-        if (m_pPak->FWrite(buffer, 1, size, m_fileHandle) != size)
-        {
-            Erase();
-            return false;
-        }
-
-        m_offset += size;
-
-        return true;
-    }
-
-#endif
-    //////////////////////////////////////////////////////////////////////////
-
-    MemoryWriter::MemoryWriter()
-        : m_ptr(0)
-        , m_size(0)
-    {
-    }
-
-    MemoryWriter::~MemoryWriter()
-    {
-    }
-
-    bool MemoryWriter::Start(void* ptr, int32 size)
-    {
-        Erase();
-
-        if (ptr == 0 || size <= 0)
-        {
-            return false;
-        }
-
-        m_ptr = (char*)ptr;
-        m_size = size;
-        m_offset = 0;
-
-        return true;
-    }
-
-    void MemoryWriter::Erase()
-    {
-        m_ptr = 0;
-        m_size = 0;
-    }
-
-    void MemoryWriter::Close()
-    {
-        m_ptr = 0;
-        m_size = 0;
-    }
-
-    int32 MemoryWriter::GetPos() const
-    {
-        return m_offset;
-    }
-
-    bool MemoryWriter::Write(const void* buffer, size_t size)
-    {
-        if (!m_ptr)
-        {
-            return false;
-        }
-
-        if (size <= 0)
-        {
-            return true;
-        }
-
-        if ((size_t)m_offset + size > (size_t)m_size)
-        {
-            Erase();
-            return false;
-        }
-
-        memcpy(&m_ptr[m_offset], buffer, size);
-        m_offset += size;
-
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    MemorylessChunkFileWriter::MemorylessChunkFileWriter(
-        EChunkFileFormat eFormat,
-        IWriter* pWriter)
-        : m_eChunkFileFormat(eFormat)
-        , m_pWriter(pWriter)
-        , m_alignment(4)
-        , m_chunkCount(0)
-        , m_eState(eState_Init)
-    {
-        if (!m_pWriter)
-        {
-            m_eState = eState_Fail;
-        }
-    }
-
-    MemorylessChunkFileWriter::~MemorylessChunkFileWriter()
-    {
-        if (m_eState != eState_Success)
-        {
-            Fail();
-        }
-    }
-
-    void MemorylessChunkFileWriter::SetAlignment(size_t alignment)
-    {
-        m_alignment = (alignment < 1) ? 1 : alignment;
-    }
-
-    bool MemorylessChunkFileWriter::StartPass()
-    {
-        switch (m_eState)
-        {
-        case eState_Init:
-            m_eState = eState_CountingChunks;
-            m_chunkIndex = -1;
-            break;
-        case eState_CountingChunks:
-            WriteFileHeader(m_chunkIndex + 1, GetSizeOfHeader());
-            m_eState = eState_WritingChunkTable;
-            WriteChunkTableHeader(m_chunkIndex + 1);
-            m_dataOffsetInFile = GetSizeOfHeader() + GetSizeOfChunkTable(m_chunkIndex + 1);
-            m_chunkIndex = -1;
-            break;
-        case eState_WritingChunkTable:
-            if (m_chunkIndex >= 0)
-            {
-                WriteChunkEntry();
-            }
-            m_eState = eState_WritingData;
-            m_dataOffsetInFile = GetSizeOfHeader() + GetSizeOfChunkTable(m_chunkIndex + 1);
-            m_chunkIndex = -1;
-            break;
-        case eState_WritingData:
-            m_eState = eState_Success;
-            m_pWriter->Close();
-            return false;
-        case eState_Fail:
-            return false;
-        default:
-            assert(0);
-            Fail();
-            return false;
-        }
-        return true;
-    }
-
-    void MemorylessChunkFileWriter::StartChunk(EEndianness eEndianness, uint32 type, uint32 version, uint32 id)
-    {
-        if (type != 0)
-        {
-            type = ConvertChunkTypeTo0x746(type);
-            if (type == 0)
-            {
-                Fail();
-                return;
-            }
-        }
-
-        if (version >= ChunkFile::ChunkTableEntry_0x746::kBigEndianVersionFlag)
-        {
-            Fail();
-            return;
-        }
-
-        switch (m_eState)
-        {
-        case eState_CountingChunks:
-            ++m_chunkIndex;
-            break;
-        case eState_WritingChunkTable:
-            if (m_chunkIndex >= 0)
-            {
-                WriteChunkEntry();
-            }
-        /* fall through */
-        case eState_WritingData:
-        {
-            size_t size = ComputeSizeOfAlignment(m_dataOffsetInFile, m_alignment);
-
-            // Make sure that zero-length chunks have distinct positions in file
-            if (size == 0 && m_chunkIndex > 0 && m_chunkSize == 0)
-            {
-                size = m_alignment;
-            }
-
-            m_dataOffsetInFile += size;
-            m_chunkOffsetInFile = m_dataOffsetInFile;
-            if (m_eState == eState_WritingData && !m_pWriter->WriteZeros(size))
-            {
-                Fail();
-                return;
-            }
-        }
-
-            ++m_chunkIndex;
-            m_chunkEndianness = eEndianness;
-            m_chunkType = type;
-            m_chunkVersion = version;
-            m_chunkId = id;
-            m_chunkSize = 0;
-
-            if (m_eChunkFileFormat == eChunkFileFormat_0x745 &&
-                ChunkContainsHeader_0x744_0x745(m_chunkType, m_chunkVersion))
-            {
-                ChunkHeader_0x744_0x745 c;
-
-                c.type = ConvertChunkTypeTo0x745(m_chunkType);
-                c.version = m_chunkVersion | (m_chunkEndianness == eEndianness_Big ? ChunkFile::ChunkHeader_0x744_0x745::kBigEndianVersionFlag : 0);
-                c.id = m_chunkId;
-                c.offsetInFile = m_chunkOffsetInFile;
-
-                if (SYSTEM_IS_BIG_ENDIAN)
-                {
-                    c.SwapEndianness();
-                }
-
-                AddChunkData(&c, sizeof(c));
-            }
-            break;
-        default:
-            Fail();
-            break;
-        }
-    }
-
-    void MemorylessChunkFileWriter::AddChunkData(void* ptr, size_t size)
-    {
-        if (m_chunkIndex < 0)
-        {
-            Fail();
-            return;
-        }
-
-        switch (m_eState)
-        {
-        case eState_CountingChunks:
-            break;
-        case eState_WritingChunkTable:
-        case eState_WritingData:
-            m_chunkSize += size;
-            m_dataOffsetInFile += size;
-            if (m_eState == eState_WritingData && !m_pWriter->Write(ptr, size))
-            {
-                Fail();
-            }
-            break;
-        default:
-            Fail();
-            break;
-        }
-    }
-
-    void MemorylessChunkFileWriter::AddChunkDataZeros(size_t size)
-    {
-        if (m_chunkIndex < 0)
-        {
-            Fail();
-            return;
-        }
-
-        switch (m_eState)
-        {
-        case eState_CountingChunks:
-            break;
-        case eState_WritingChunkTable:
-        case eState_WritingData:
-            m_chunkSize += size;
-            m_dataOffsetInFile += size;
-            if (m_eState == eState_WritingData && !m_pWriter->WriteZeros(size))
-            {
-                Fail();
-            }
-            break;
-        default:
-            Fail();
-            break;
-        }
-    }
-
-    void MemorylessChunkFileWriter::AddChunkDataAlignment(size_t alignment)
-    {
-        const size_t size = ComputeSizeOfAlignment(m_chunkSize, alignment);
-        return AddChunkDataZeros(size);
-    }
-
-    bool MemorylessChunkFileWriter::HasWrittenSuccessfully() const
-    {
-        return m_eState == eState_Success;
-    }
-
-    IWriter* MemorylessChunkFileWriter::GetWriter() const
-    {
-        return m_pWriter;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void MemorylessChunkFileWriter::Fail()
-    {
-        m_eState = eState_Fail;
-        if (m_pWriter)
-        {
-            m_pWriter->Erase();
-        }
-    }
-
-    size_t MemorylessChunkFileWriter::GetSizeOfHeader() const
-    {
-        return (m_eChunkFileFormat == eChunkFileFormat_0x745)
-               ? sizeof(FileHeader_0x744_0x745)
-               : sizeof(FileHeader_0x746);
-    }
-
-    void MemorylessChunkFileWriter::WriteFileHeader(int32 chunkCount, uint32 chunkTableOffsetInFile)
-    {
-        if (m_eChunkFileFormat == eChunkFileFormat_0x745)
-        {
-            FileHeader_0x744_0x745 h;
-            h.Set(chunkTableOffsetInFile);
-
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                h.SwapEndianness();
-            }
-
-            if (!m_pWriter->Write(&h, sizeof(h)))
-            {
-                Fail();
-            }
-        }
-        else
-        {
-            FileHeader_0x746 h;
-            h.Set(chunkCount, chunkTableOffsetInFile);
-
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                h.SwapEndianness();
-            }
-
-            if (!m_pWriter->Write(&h, sizeof(h)))
-            {
-                Fail();
-            }
-        }
-    }
-
-    size_t MemorylessChunkFileWriter::GetSizeOfChunkTable(int32 chunkCount) const
-    {
-        if (m_eChunkFileFormat == eChunkFileFormat_0x745)
-        {
-            return sizeof(uint32) + chunkCount * sizeof(ChunkTableEntry_0x745);
-        }
-        else
-        {
-            return chunkCount * sizeof(ChunkTableEntry_0x746);
-        }
-    }
-
-    void MemorylessChunkFileWriter::WriteChunkTableHeader(int32 chunkCount)
-    {
-        if (m_eChunkFileFormat == eChunkFileFormat_0x745)
-        {
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                SwapEndianBase(&chunkCount, 1);
-            }
-
-            if (!m_pWriter->Write(&chunkCount, sizeof(chunkCount)))
-            {
-                Fail();
-            }
-        }
-    }
-
-    void MemorylessChunkFileWriter::WriteChunkEntry()
-    {
-        if (m_chunkIndex < 0)
-        {
-            assert(0);
-            Fail();
-            return;
-        }
-
-        if (m_eChunkFileFormat == eChunkFileFormat_0x745)
-        {
-            ChunkTableEntry_0x745 c;
-
-            c.type = ConvertChunkTypeTo0x745(m_chunkType);
-            c.version = m_chunkVersion | (m_chunkEndianness == eEndianness_Big ? ChunkFile::ChunkHeader_0x744_0x745::kBigEndianVersionFlag : 0);
-            c.id = m_chunkId;
-            c.size = m_chunkSize;
-            c.offsetInFile = m_chunkOffsetInFile;
-
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                c.SwapEndianness();
-            }
-
-            if (!m_pWriter->Write(&c, sizeof(c)))
-            {
-                Fail();
-            }
-        }
-        else
-        {
-            ChunkTableEntry_0x746 c;
-
-            c.type = m_chunkType;
-            c.version = m_chunkVersion | (m_chunkEndianness == eEndianness_Big ? ChunkFile::ChunkTableEntry_0x746::kBigEndianVersionFlag : 0);
-            c.id = m_chunkId;
-            c.size = m_chunkSize;
-            c.offsetInFile = m_chunkOffsetInFile;
-
-            if (SYSTEM_IS_BIG_ENDIAN)
-            {
-                c.SwapEndianness();
-            }
-
-            if (!m_pWriter->Write(&c, sizeof(c)))
-            {
-                Fail();
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-}  // namespace ChunkFile
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileWriters.h b/Code/CryEngine/Cry3DEngine/CGF/ChunkFileWriters.h
deleted file mode 100644
index 4bf632efeb..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ChunkFileWriters.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILEWRITERS_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILEWRITERS_H
-#pragma once
-
-#include "ChunkFileComponents.h"
-
-// RESOURCE_COMPIELR is defined by max plugin, too, and the max plugin MAY NOT include any of azcore
-// or anything else which uses modern C++
-#if !defined(RESOURCE_COMPILER)
-#include <AzCore/IO/FileIO.h>
-#endif
-
-namespace AZ::IO
-{
-    struct IArchive;
-}
-namespace ChunkFile
-{
-    struct IWriter
-    {
-        virtual ~IWriter()
-        {
-        }
-
-        virtual void Erase() = 0;
-        virtual void Close() = 0; // if Close() is not called then the file should be deleted in destructor
-
-        virtual int32 GetPos() const = 0;
-
-        virtual bool Write(const void* buffer, size_t size) = 0;
-
-        // non-virtual helper function
-        bool WriteZeros(size_t size);
-    };
-
-
-    class OsFileWriter
-        : public IWriter
-    {
-    public:
-        OsFileWriter();
-        virtual ~OsFileWriter();
-
-        bool Create(const char* filename);
-
-        //-------------------------------------------------------
-        // IWriter interface
-        virtual void Erase();
-        virtual void Close();
-
-        virtual int32 GetPos() const;
-
-        virtual bool Write(const void* buffer, size_t size);
-        //-------------------------------------------------------
-
-    private:
-        string m_filename;
-        FILE* m_f;
-        int32 m_offset;
-    };
-
-
-#if !defined(RESOURCE_COMPILER)
-    class CryPakFileWriter
-        : public IWriter
-    {
-    public:
-        CryPakFileWriter();
-        virtual ~CryPakFileWriter();
-
-        bool Create(AZ::IO::IArchive* pPak, const char* filename);
-
-        //-------------------------------------------------------
-        // IWriter interface
-        virtual void Erase();
-        virtual void Close();
-
-        virtual int32 GetPos() const;
-
-        virtual bool Write(const void* buffer, size_t size);
-        //-------------------------------------------------------
-
-    private:
-        string m_filename;
-        AZ::IO::IArchive* m_pPak;
-        AZ::IO::HandleType m_fileHandle;
-        int32 m_offset;
-    };
-#endif
-
-
-    // Doesn't write any data, just computes the size
-    class SizeWriter
-        : public IWriter
-    {
-    public:
-        SizeWriter()
-        {
-        }
-        virtual ~SizeWriter()
-        {
-        }
-
-        void Start()
-        {
-            m_offset = 0;
-        }
-
-        //-------------------------------------------------------
-        // IWriter interface
-        virtual void Erase()
-        {
-        }
-
-        virtual void Close()
-        {
-        }
-
-        virtual int32 GetPos() const
-        {
-            return m_offset;
-        }
-
-        virtual bool Write([[maybe_unused]] const void* buffer, size_t size)
-        {
-            m_offset += size;
-            return true;
-        }
-        //-------------------------------------------------------
-
-    private:
-        int32 m_offset;
-    };
-
-
-    class MemoryWriter
-        : public IWriter
-    {
-    public:
-        MemoryWriter();
-        virtual ~MemoryWriter();
-
-        bool Start(void* ptr, int32 size);
-
-        //-------------------------------------------------------
-        // IWriter interface
-        virtual void Erase();
-        virtual void Close();
-
-        virtual int32 GetPos() const;
-
-        virtual bool Write(const void* buffer, size_t size);
-        //-------------------------------------------------------
-
-    private:
-        char* m_ptr;
-        int32 m_size;
-        int32 m_offset;
-    };
-
-
-    // Memoryless chunk file writer
-    //
-    // Usage example:
-    //
-    //  OsFileWriter writer;
-    //  if (!writer.Create(filename))
-    //  {
-    //      showAnErrorMessage();
-    //  }
-    //  else
-    //  {
-    //      MemorylessChunkFileWriter wr(eChunFileFormat, writer);
-    //      while (wr.StartPass())
-    //      {
-    //          // default alignment of chunk data in file is 4, but you may change it by calling wr.SetAlignment(xxx)
-    //
-    //          wr.StartChunk(eEndianness_Native, chunkA_type, chunkA_version, chunkA_id);
-    //          wr.AddChunkData(data_ptr0, data_size0);  // make sure that data have endianness specified by bLittleEdndian
-    //          wr.AddChunkData(data_ptr1, data_size1);
-    //          ...
-    //          wr.StartChunk(eEndianness_Native, chunkB_type, chunkB_version, chunkB_id);
-    //          wr.AddChunkData(data_ptrN, data_sizeN);
-    //          ...
-    //      }
-    //      if (!wr.HasWrittenSuccessfully())
-    //      {
-    //          showAnErrorMessage();
-    //      }
-    //  }
-    //
-    // Usage example (interface way): see
-    //
-    //  OsFileWriter writer;
-    //  if (!writer.Create(filename))
-    //  {
-    //      showAnErrorMessage();
-    //  }
-    //  else
-    //  {
-    //      MemorylessChunkFileWriter wr(eChunFileFormat, writer);
-    //      while (wr.StartPass())
-    //      {
-    //          // default alignment of chunk data in file is 4, but you may change it by calling wr.SetAlignment(xxx)
-    //
-    //          wr.StartChunk(eEndianness_Native, chunkA_type, chunkA_version, chunkA_id);
-    //          wr.AddChunkData(data_ptr0, data_size0);  // make sure that data have endianness specified by bLittleEdndian
-    //          wr.AddChunkData(data_ptr1, data_size1);
-    //          ...
-    //          wr.StartChunk(eEndianness_Native, chunkB_type, chunkB_version, chunkB_id);
-    //          wr.AddChunkData(data_ptrN, data_sizeN);
-    //          ...
-    //      }
-    //      if (!wr.HasWrittenSuccessfully())
-    //      {
-    //          showAnErrorMessage();
-    //      }
-    //  }
-    //
-
-
-    struct IChunkFileWriter
-    {
-        virtual ~IChunkFileWriter()
-        {
-        }
-
-
-        // Sets alignment for *beginning* of chunk data.
-        // Allowed to be called at any time, influences all future
-        // StartChunk() calls (until a new SetAlignment() call).
-        virtual void SetAlignment(size_t alignment) = 0;
-
-        // Returns false when there is no more passes left.
-        virtual bool StartPass() = 0;
-
-        // eEndianness specifies endianness of the data user is
-        // going to provide via AddChunkData*(). The data will be
-        // sent to the low-level writer as is, without any re-coding.
-        virtual void StartChunk(EEndianness eEndianness, uint32 type, uint32 version, uint32 id) = 0;
-        virtual void AddChunkData(void* ptr, size_t size) = 0;
-        virtual void AddChunkDataZeros(size_t size) = 0;
-        virtual void AddChunkDataAlignment(size_t alignment) = 0;
-
-        virtual bool HasWrittenSuccessfully() const = 0;
-
-        virtual IWriter* GetWriter() const = 0;
-    };
-
-
-
-    class MemorylessChunkFileWriter
-        : public IChunkFileWriter
-    {
-    public:
-        enum EChunkFileFormat
-        {
-            eChunkFileFormat_0x745,
-            eChunkFileFormat_0x746,
-        };
-
-        MemorylessChunkFileWriter(EChunkFileFormat eFormat, IWriter* pWriter);
-
-        //-------------------------------------------------------
-        // IChunkFileWriter interface
-        virtual ~MemorylessChunkFileWriter();
-
-        virtual void SetAlignment(size_t alignment);
-
-        virtual bool StartPass();
-
-        virtual void StartChunk(EEndianness eEndianness, uint32 type, uint32 version, uint32 id);
-        virtual void AddChunkData(void* ptr, size_t size);
-        virtual void AddChunkDataZeros(size_t size);
-        virtual void AddChunkDataAlignment(size_t alignment);
-
-        virtual bool HasWrittenSuccessfully() const;
-
-        virtual IWriter* GetWriter() const;
-        //-------------------------------------------------------
-
-    private:
-        void Fail();
-
-        static size_t ComputeSizeOfAlignmentArea(size_t pos, size_t alignment);
-
-        size_t GetSizeOfHeader() const;
-        void WriteFileHeader(int32 chunkCount, uint32 chunkTableOffsetInFile);
-
-        size_t GetSizeOfChunkTable(int32 chunkCount) const;
-        void WriteChunkTableHeader(int32 chunkCount);
-        void WriteChunkEntry();
-
-    private:
-        IWriter* const m_pWriter;
-
-        EChunkFileFormat m_eChunkFileFormat;
-
-        size_t m_alignment;
-
-        int32 m_chunkCount;
-
-        int32 m_chunkIndex;
-        uint16 m_chunkType;
-        uint16 m_chunkVersion;
-        uint32 m_chunkId;
-        uint32 m_chunkSize;
-        uint32 m_chunkOffsetInFile;
-        EEndianness m_chunkEndianness;
-
-        uint32 m_dataOffsetInFile;
-
-        enum EState
-        {
-            eState_Init,
-
-            eState_CountingChunks,
-            eState_WritingChunkTable,
-            eState_WritingData,
-
-            eState_Success,
-            eState_Fail,
-        };
-        EState m_eState;
-    };
-}  // namespace ChunkFile
-
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_CHUNKFILEWRITERS_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ReadOnlyChunkFile.cpp b/Code/CryEngine/Cry3DEngine/CGF/ReadOnlyChunkFile.cpp
deleted file mode 100644
index 1aa1f3101b..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ReadOnlyChunkFile.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include <platform.h>
-#include "ReadOnlyChunkFile.h"
-#include "ChunkFileComponents.h"
-#include "ChunkFileReaders.h"
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/IO/FileIO.h>
-
-#define MAX_CHUNKS_NUM 10000000
-
-#if !defined(FUNCTION_PROFILER_3DENGINE)
-#   define FUNCTION_PROFILER_3DENGINE
-#endif
-
-#if !defined(LOADING_TIME_PROFILE_SECTION)
-#   define LOADING_TIME_PROFILE_SECTION
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-CReadOnlyChunkFile::CReadOnlyChunkFile(bool bCopyFileData, bool bNoWarningMode)
-{
-    m_pFileBuffer = 0;
-    m_nBufferSize = 0;
-
-    m_bNoWarningMode = bNoWarningMode;
-
-    m_bOwnFileBuffer = false;
-    m_bLoaded = false;
-    m_bCopyFileData = bCopyFileData;
-}
-
-CReadOnlyChunkFile::~CReadOnlyChunkFile()
-{
-    FreeBuffer();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CReadOnlyChunkFile::FreeBuffer()
-{
-    if (m_pFileBuffer && m_bOwnFileBuffer)
-    {
-        delete [] m_pFileBuffer;
-    }
-    m_pFileBuffer = 0;
-    m_nBufferSize = 0;
-    m_bOwnFileBuffer = false;
-    m_bLoaded = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CReadOnlyChunkFile::ChunkDesc* CReadOnlyChunkFile::GetChunk(int nIndex)
-{
-    assert(size_t(nIndex) < m_chunks.size());
-    return &m_chunks[nIndex];
-}
-
-//////////////////////////////////////////////////////////////////////////
-const CReadOnlyChunkFile::ChunkDesc* CReadOnlyChunkFile::GetChunk(int nIndex) const
-{
-    assert(size_t(nIndex) < m_chunks.size());
-    return &m_chunks[nIndex];
-}
-
-// number of chunks
-int CReadOnlyChunkFile::NumChunks() const
-{
-    return (int)m_chunks.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CReadOnlyChunkFile::ChunkDesc* CReadOnlyChunkFile::FindChunkByType(ChunkTypes nChunkType)
-{
-    for (size_t i = 0, count = m_chunks.size(); i < count; ++i)
-    {
-        if (m_chunks[i].chunkType == nChunkType)
-        {
-            return &m_chunks[i];
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CReadOnlyChunkFile::ChunkDesc* CReadOnlyChunkFile::FindChunkById(int id)
-{
-    ChunkDesc chunkToFind;
-    chunkToFind.chunkId = id;
-
-    std::vector<ChunkDesc>::iterator it = std::lower_bound(m_chunks.begin(), m_chunks.end(), chunkToFind, IChunkFile::ChunkDesc::LessId);
-    if (it != m_chunks.end() && id == (*it).chunkId)
-    {
-        return &(*it);
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CReadOnlyChunkFile::ReadChunkTableFromBuffer()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (m_pFileBuffer == 0)
-    {
-        m_LastError.Format("Unexpected empty buffer");
-        return false;
-    }
-
-    {
-        ChunkFile::MemoryReader f;
-
-        if (!f.Start(m_pFileBuffer, m_nBufferSize))
-        {
-            m_LastError.Format("Empty memory chunk file");
-            return false;
-        }
-
-        bool bStripHeaders = false;
-        const char* err = 0;
-
-        err = ChunkFile::GetChunkTableEntries_0x746(&f, m_chunks);
-        if (err)
-        {
-            err = ChunkFile::GetChunkTableEntries_0x744_0x745(&f, m_chunks);
-            bStripHeaders  = true;
-        }
-
-        if (!err)
-        {
-            for (size_t i = 0; i < m_chunks.size(); ++i)
-            {
-                ChunkDesc& cd = m_chunks[i];
-                cd.data = m_pFileBuffer + cd.fileOffset;
-            }
-            if (bStripHeaders)
-            {
-                err = ChunkFile::StripChunkHeaders_0x744_0x745(&f, m_chunks);
-            }
-        }
-
-        if (err)
-        {
-            m_LastError = err;
-            return false;
-        }
-    }
-
-    // Sort chunks by Id, for faster queries later (see FindChunkById()).
-    std::sort(m_chunks.begin(), m_chunks.end(), IChunkFile::ChunkDesc::LessId);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CReadOnlyChunkFile::Read(const char* filename)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    FreeBuffer();
-
-    if (!AZ::IO::FileIOBase::GetInstance())
-    {
-        m_LastError = "File system not ready yet.";
-        return false;
-    }
-
-    if (!AZ::IO::FileIOBase::GetInstance()->Exists(filename))
-    {
-        m_LastError.Format("File '%s' not found", filename);
-        return false;
-    }
-
-    AZ::u64 fileSize;
-    if (!AZ::IO::FileIOBase::GetInstance()->Size(filename, fileSize))
-    {
-        m_LastError.Format("Failed to retrieve file size for '%s'", filename);
-        return false;
-    }
-
-    m_pFileBuffer = new char[fileSize];
-    m_bOwnFileBuffer = true;
-
-    AZ::IO::FileIOStream stream(filename, AZ::IO::OpenMode::ModeRead);
-    if (stream.Read(fileSize, m_pFileBuffer) != fileSize)
-    {
-        m_LastError.Format("Failed to read %u bytes from file '%s'", fileSize, filename);
-        return false;
-    }
-
-    m_nBufferSize = aznumeric_caster(fileSize);
-
-    if (!ReadChunkTableFromBuffer())
-    {
-        return false;
-    }
-
-    m_bLoaded = true;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CReadOnlyChunkFile::ReadFromMemory(const void* pData, int nDataSize)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    FreeBuffer();
-
-    m_pFileBuffer = (char*)pData;
-    m_bOwnFileBuffer = false;
-    m_nBufferSize = nDataSize;
-
-    if (!ReadChunkTableFromBuffer())
-    {
-        return false;
-    }
-    m_bLoaded = true;
-    return true;
-}
diff --git a/Code/CryEngine/Cry3DEngine/CGF/ReadOnlyChunkFile.h b/Code/CryEngine/Cry3DEngine/CGF/ReadOnlyChunkFile.h
deleted file mode 100644
index 9f0be6481a..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/ReadOnlyChunkFile.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CGF_READONLYCHUNKFILE_H
-#define CRYINCLUDE_CRY3DENGINE_CGF_READONLYCHUNKFILE_H
-#pragma once
-
-#include <CrySizer.h>
-#include <CryHeaders.h>
-#include <smartptr.h>
-#include <IChunkFile.h>
-
-////////////////////////////////////////////////////////////////////////
-// Chunk file reader.
-// Accesses a chunked file structure through file mapping object.
-// Opens a chunk file and checks for its validity.
-// If it's invalid, closes it as if there was no open operation.
-// Error handling is performed through the return value of Read: it must
-// be true for successfully open files
-////////////////////////////////////////////////////////////////////////
-
-class CReadOnlyChunkFile
-    : public IChunkFile
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    CReadOnlyChunkFile(bool bCopyFileData, bool bNoWarningMode = false);
-    virtual ~CReadOnlyChunkFile();
-
-    // interface IChunkFile --------------------------------------------------
-
-    virtual void Release() { delete this; }
-
-    virtual bool IsReadOnly() const { return true; }
-    virtual bool IsLoaded() const { return m_bLoaded; }
-
-    virtual bool Read(const char* filename);
-    virtual bool ReadFromMemory(const void* pData, int nDataSize);
-
-    virtual bool Write([[maybe_unused]] const char* filename) { return false; }
-    virtual bool WriteToMemoryBuffer([[maybe_unused]] void** pData, [[maybe_unused]] int* nSize) { return false; }
-    virtual void ReleaseMemoryBuffer() {}
-
-    virtual int AddChunk([[maybe_unused]] ChunkTypes chunkType, [[maybe_unused]] int chunkVersion, [[maybe_unused]] EEndianness eEndianness, [[maybe_unused]] const void* chunkData, [[maybe_unused]] int chunkSize) { return -1; }
-    virtual void DeleteChunkById([[maybe_unused]] int nChunkId) {}
-    virtual void DeleteChunksByType([[maybe_unused]] ChunkTypes nChunkType) {}
-
-    virtual ChunkDesc* FindChunkByType(ChunkTypes nChunkType);
-    virtual ChunkDesc* FindChunkById(int nChunkId);
-
-    virtual int NumChunks() const;
-
-    virtual ChunkDesc* GetChunk(int nIndex);
-    virtual const ChunkDesc* GetChunk(int nIndex) const;
-
-    virtual const char* GetLastError() const { return m_LastError; }
-
-    // -----------------------------------------------------------------------
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_LastError);
-        pSizer->AddObject(m_chunks);
-    }
-private:
-    bool ReadChunkTableFromBuffer();
-    void FreeBuffer();
-
-private:
-    // this variable contains the last error occurred in this class
-    string m_LastError;
-
-    std::vector<ChunkDesc> m_chunks;
-
-    char* m_pFileBuffer;
-    int m_nBufferSize;
-    bool m_bOwnFileBuffer;
-    bool m_bNoWarningMode;
-    bool m_bLoaded;
-    bool m_bCopyFileData;
-};
-
-TYPEDEF_AUTOPTR(CReadOnlyChunkFile);
-
-#endif // CRYINCLUDE_CRY3DENGINE_CGF_READONLYCHUNKFILE_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/SwapEndianness.h b/Code/CryEngine/Cry3DEngine/CGF/SwapEndianness.h
deleted file mode 100644
index d61c611d59..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/SwapEndianness.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_SWAPENDIANNESS_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_SWAPENDIANNESS_H
-#pragma once
-
-
-
-inline void SwapEndians_(void* pData, size_t nCount, size_t nSizeCheck)
-{
-    // Primitive type.
-    switch (nSizeCheck)
-    {
-    case 1:
-        break;
-    case 2:
-    {
-        while (nCount--)
-        {
-            uint16& i = *((uint16*&)pData)++;
-            i = ((i >> 8) + (i << 8)) & 0xFFFF;
-        }
-        break;
-    }
-    case 4:
-    {
-        while (nCount--)
-        {
-            uint32& i = *((uint32*&)pData)++;
-            i = (i >> 24) + ((i >> 8) & 0xFF00) + ((i & 0xFF00) << 8) + (i << 24);
-        }
-        break;
-    }
-    case 8:
-    {
-        while (nCount--)
-        {
-            uint64& i = *((uint64*&)pData)++;
-            i = (i >> 56) + ((i >> 40) & 0xFF00) + ((i >> 24) & 0xFF0000) + ((i >> 8) & 0xFF000000)
-                + ((i & 0xFF000000) << 8) + ((i & 0xFF0000) << 24) + ((i & 0xFF00) << 40) + (i << 56);
-        }
-        break;
-    }
-    default:
-        assert(0);
-    }
-}
-
-
-template<class T>
-void SwapEndianness(T* t, std::size_t count)
-{
-    SwapEndians_(t, count, sizeof(T));
-}
-
-
-template<class T>
-void SwapEndianness(T& t)
-{
-    SwapEndianness(&t, 1);
-}
-
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_SWAPENDIANNESS_H
diff --git a/Code/CryEngine/Cry3DEngine/CGF/cry3dengine_cgf_files.cmake b/Code/CryEngine/Cry3DEngine/CGF/cry3dengine_cgf_files.cmake
deleted file mode 100644
index 754cc58b3e..0000000000
--- a/Code/CryEngine/Cry3DEngine/CGF/cry3dengine_cgf_files.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    CGFLoader.cpp
-    CGFSaver.cpp
-    ChunkFile.cpp
-    ReadOnlyChunkFile.cpp
-    CGFLoader.h
-    CGFSaver.h
-    ChunkData.h
-    ChunkFile.h
-    ReadOnlyChunkFile.h
-    ChunkFileReaders.cpp
-    ChunkFileReaders.h
-    ChunkFileWriters.cpp
-    ChunkFileWriters.h
-    SwapEndianness.h
-)
diff --git a/Code/CryEngine/Cry3DEngine/CMakeLists.txt b/Code/CryEngine/Cry3DEngine/CMakeLists.txt
deleted file mode 100644
index 89d7e09e30..0000000000
--- a/Code/CryEngine/Cry3DEngine/CMakeLists.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-add_subdirectory(CGF)
-add_subdirectory(MeshCompiler)
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-ly_get_pal_tool_dirs(pal_tool_dirs ${CMAKE_CURRENT_LIST_DIR}/Platform)
-
-ly_add_target(
-    NAME Cry3DEngine.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        cry3dengine_files.cmake
-        ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    PLATFORM_INCLUDE_FILES
-        ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-            ${pal_dir}
-        PRIVATE
-            ${pal_tool_dirs}
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::mikkelsen
-            Legacy::CryCommon
-            Legacy::CryRender.Headers
-)
-
-ly_add_target(
-    NAME Cry3DEngine ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-    NAMESPACE Legacy
-    FILES_CMAKE
-        cry3dengine_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-            ..
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::Cry3DEngine.Static
-            Legacy::Cry3DEngine.MeshCompiler.Static
-            Legacy::Cry3DEngine.CGF.Static
-            Legacy::CryCommon
-)
-
-################################################################################
-# Tests
-################################################################################
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-    ly_add_target(
-        NAME Cry3DEngine.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            cry3dengine_test_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                Legacy::CryCommon
-                Legacy::Cry3DEngine.Static
-                Legacy::Cry3DEngine.MeshCompiler.Static
-                Legacy::Cry3DEngine.CGF.Static
-    )
-    ly_add_googletest(
-        NAME Legacy::Cry3DEngine.Tests
-    )
-endif()
diff --git a/Code/CryEngine/Cry3DEngine/CZBufferCuller.cpp b/Code/CryEngine/Cry3DEngine/CZBufferCuller.cpp
deleted file mode 100644
index 381c6b8058..0000000000
--- a/Code/CryEngine/Cry3DEngine/CZBufferCuller.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Occlusion buffer
-
-
-#include "Cry3DEngine_precompiled.h"
-#include "CZBufferCuller.h"
-
-SHWOccZBuffer HWZBuffer;
-
-void CZBufferCuller::BeginFrame(const SRenderingPassInfo& passInfo)
-{
-    if (!GetCVars()->e_CoverageBuffer)
-    {
-        return;
-    }
-    const CCamera& rCam = passInfo.GetCamera();
-    m_AccurateTest  =   GetCVars()->e_CoverageBufferAccurateOBBTest;
-
-    m_Treshold          =   GetCVars()->e_CoverageBufferTolerance;
-
-
-    FUNCTION_PROFILER_3DENGINE;
-    if (GetCVars()->e_CoverageBufferDebugFreeze || GetCVars()->e_CameraFreeze)
-    {
-        return;
-    }
-
-    m_ObjectsTested =
-        m_ObjectsTestedAndRejected =    0;
-    //to enable statistics
-    m_Camera        =   rCam;
-    m_Position  =   rCam.GetPosition();
-    uint32 oldSizeX = m_SizeX;
-
-    const uint32 sizeX = min(max(1, GetCVars()->e_CoverageBufferResolution), 1024);
-    const uint32 sizeY = sizeX;
-
-    m_SizeX                 =   sizeX;
-    m_SizeY                 = sizeY;
-    m_fSizeX                =   static_cast<f32>(sizeX);
-    m_fSizeY                =   static_cast<f32>(sizeY);
-    m_fSizeZ                =   static_cast<f32>(TZB_MAXDEPTH);
-
-
-    if (oldSizeX != sizeX)
-    {
-        CryModuleMemalignFree(m_ZBuffer);
-        //64-byte buffer to avoid memory page issues when vector loading
-        m_ZBuffer = (TZBZexel*)CryModuleMemalign((sizeof(TZBZexel) * sizeX * sizeY) + 64, 128);
-    }
-
-    m_MatViewProj.Transpose();
-
-    m_RotationSafe  =   GetCVars()->e_CoverageBufferRotationSafeCheck;
-
-    m_DebugFreez        =   GetCVars()->e_CoverageBufferDebugFreeze != 0;
-}
-
-void CZBufferCuller::ReloadBuffer(const uint32 BufferID)
-{
-    if (m_DebugFreez)
-    {
-        return;
-    }
-    m_Bias              =   BufferID == 0 ? static_cast<int32>(GetCVars()->e_CoverageBufferBias) : 0;
-}
-
-
-CZBufferCuller::CZBufferCuller()
-    : m_OutdoorVisible(1)
-    , m_MatViewProj(IDENTITY)
-{
-    m_SizeX =
-        m_SizeY = min(max(1, GetCVars()->e_CoverageBufferResolution), 1024);
-    m_ZBuffer = (TZBZexel*)CryModuleMemalign((sizeof(TZBZexel) * m_SizeX * m_SizeY) + 64, 128);
-
-    m_ObjectsTested =
-        m_ObjectsTestedAndRejected  =   0;
-}
-
-bool CZBufferCuller::IsBoxVisible(const AABB& objBox, [[maybe_unused]] uint32* const __restrict pResDest)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    m_ObjectsTested++;
-    Vec4 Verts[8] =
-    {
-        m_MatViewProj* Vec4(objBox.min.x, objBox.min.y, objBox.min.z, 1.f),//0
-        m_MatViewProj * Vec4(objBox.min.x, objBox.max.y, objBox.min.z, 1.f),//1
-        m_MatViewProj * Vec4(objBox.max.x, objBox.min.y, objBox.min.z, 1.f),//2
-        m_MatViewProj * Vec4(objBox.max.x, objBox.max.y, objBox.min.z, 1.f),//3
-        m_MatViewProj * Vec4(objBox.min.x, objBox.min.y, objBox.max.z, 1.f),//4
-        m_MatViewProj * Vec4(objBox.min.x, objBox.max.y, objBox.max.z, 1.f),//5
-        m_MatViewProj * Vec4(objBox.max.x, objBox.min.y, objBox.max.z, 1.f),//6
-        m_MatViewProj * Vec4(objBox.max.x, objBox.max.y, objBox.max.z, 1.f)//7
-    };
-    bool CutNearPlane = Verts[0].w <= 0.f;
-    CutNearPlane    |=  Verts[1].w <= 0.f;
-    CutNearPlane    |=  Verts[2].w <= 0.f;
-    CutNearPlane    |=  Verts[3].w <= 0.f;
-    CutNearPlane    |=  Verts[4].w <= 0.f;
-    CutNearPlane    |=  Verts[5].w <= 0.f;
-    CutNearPlane    |=  Verts[6].w <= 0.f;
-    CutNearPlane    |=  Verts[7].w <= 0.f;
-    if (CutNearPlane)
-    {
-        return true;
-    }
-
-    IF (m_RotationSafe == 1, 0)
-    {
-        return Rasterize<1>(Verts, 8);
-    }
-    IF (m_RotationSafe == 2, 1)
-    {
-        return Rasterize<2>(Verts, 8);
-    }
-    return Rasterize<0>(Verts, 8);
-}
-
-static int sh   =   8;
-void CZBufferCuller::DrawDebug(int32 nStep)
-{ // project buffer to the screen
-    nStep   %=  32;
-    if (!nStep)
-    {
-        return;
-    }
-
-    const CCamera& rCam = GetCamera();
-    float farPlane = rCam.GetFarPlane();
-    float nearPlane = rCam.GetNearPlane();
-
-    float a = farPlane / (farPlane - nearPlane);
-    float b = farPlane * nearPlane / (nearPlane - farPlane);
-
-    const float scale = 10.0f;
-
-    TransformationMatrices backupSceneMatrices;
-
-    m_pRenderer->Set2DMode(m_SizeX, m_SizeY, backupSceneMatrices);
-    SAuxGeomRenderFlags Flags   =   e_Def3DPublicRenderflags;
-    Flags.SetDepthWriteFlag(e_DepthWriteOff);
-    Flags.SetAlphaBlendMode(e_AlphaBlended);
-    m_pRenderer->GetIRenderAuxGeom()->SetRenderFlags(Flags);
-    Vec3 vSize(.4f, .4f, .4f);
-    if (nStep == 1)
-    {
-        vSize = Vec3(.5f, .5f, .5f);
-    }
-    for (uint32 y = 0; y < m_SizeY; y += nStep)
-    {
-        for (uint32 x = 0; x < m_SizeX; x += nStep)
-        {
-            Vec3 vPos((float)x, (float)(m_SizeY - y - 1), 0);
-            vPos += Vec3(0.5f, -0.5f, 0);
-            const uint32 Value  =   m_ZBuffer[x + y * m_SizeX];
-            //Value>>=sh;
-
-            float w = Value / (65535.0f);
-
-            float z = b / (w - a);
-
-            uint32 ValueC =  255u - min(255u, (uint32)(z * scale));
-            ColorB col;
-
-            col = ColorB(ValueC, ValueC, ValueC, 200);
-
-
-            if (Value != 0xffff)
-            {
-                //ColorB col((Value&31)<<3,((Value>>5)&31)<<3,((Value>>10)&63)<<2,200);
-                GetRenderer()->GetIRenderAuxGeom()->DrawAABB(AABB(vPos - vSize, vPos + vSize), nStep <= 2, col, eBBD_Faceted);
-            }
-        }
-    }
-    //m_pRenderer->GetIRenderAuxGeom()->Flush();
-    m_pRenderer->Unset2DMode(backupSceneMatrices);
-}
-
-void CZBufferCuller::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "CoverageBuffer");
-    pSizer->AddObject(m_ZBuffer, sizeof(TZBZexel) * m_SizeX * m_SizeY);
-}
diff --git a/Code/CryEngine/Cry3DEngine/CZBufferCuller.h b/Code/CryEngine/Cry3DEngine/CZBufferCuller.h
deleted file mode 100644
index f5e01abc68..0000000000
--- a/Code/CryEngine/Cry3DEngine/CZBufferCuller.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Occlusion Culler using hardware generated ZBuffer
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CZBUFFERCULLER_H
-#define CRYINCLUDE_CRY3DENGINE_CZBUFFERCULLER_H
-#pragma once
-
-#include <Cry_Math.h>
-struct IRenderMesh;
-
-typedef uint16          TZBZexel;
-const uint64                TZB_MAXDEPTH    =   (1 << (sizeof(TZBZexel) * 8)) - 1;
-
-class CZBufferCuller
-    : public Cry3DEngineBase
-{
-protected:
-    bool           m_DebugFreez;
-    uint32         m_SizeX;
-    uint32         m_SizeY;
-    f32            m_fSizeX;
-    f32            m_fSizeY;
-    f32            m_fSizeZ;
-    TZBZexel*      m_ZBuffer;
-
-    Matrix44       m_MatProj;
-    Matrix44       m_MatView;
-    Matrix44       m_MatViewProj;
-    Matrix44A      m_MatViewProjT;
-    Vec3           m_Position;
-
-    int32          m_Bias;
-    uint32         m_RotationSafe;
-    uint32         m_AccurateTest;
-    uint32         m_Treshold;
-
-    f32            m_FixedZFar;
-    uint32         m_ObjectsTested;
-    uint32         m_ObjectsTestedAndRejected;
-    CCamera        m_Camera;
-    int            m_OutdoorVisible;
-
-    template<uint32 ROTATE, class T>
-    bool                                            Rasterize(const T rVertices, const uint32    VCount)
-    {
-        int64   MinX = m_SizeX;
-        int64   MaxX = 0;
-        int64   MinY = m_SizeY;
-        int64   MaxY = 0;
-        int64 MinZ = TZB_MAXDEPTH;
-        for (uint32 a = 0; a < VCount; a++)
-        {
-            Vec4    V   =   rVertices[a];
-            const f32 InvW  =   1.f / V.w;
-            int64   X   =   static_cast<int64>((V.x * InvW * 0.5f + 0.5f) * m_fSizeX + 0.5f);
-            int64   Y   =   static_cast<int64>((V.y * InvW * 0.5f + 0.5f) * m_fSizeY + 0.5f);
-            int64 Z =   static_cast<int64>(V.z * InvW * m_fSizeZ);
-            if (X < MinX)
-            {
-                MinX = X;
-            }
-            else
-            if (X > MaxX)
-            {
-                MaxX = X;
-            }
-            if (Y < MinY)
-            {
-                MinY = Y;
-            }
-            else
-            if (Y > MaxY)
-            {
-                MaxY = Y;
-            }
-            if (Z < MinZ)
-            {
-                MinZ = Z;
-            }
-        }
-        if (MinX < 0)
-        {
-            if constexpr (ROTATE == 1)
-            {
-                return true;
-            }
-            else
-            {
-                MinX = 0;
-            }
-        }
-        if (MaxX > m_SizeX)
-        {
-            if constexpr (ROTATE == 1)
-            {
-                return true;
-            }
-            else
-            {
-                MaxX = m_SizeX;
-            }
-        }
-        if (MinY < 0)
-        {
-            if constexpr (ROTATE == 1)
-            {
-                return true;
-            }
-            else
-            {
-                MinY = 0;
-            }
-        }
-        if (MaxY > m_SizeY)
-        {
-            if constexpr (ROTATE == 1)
-            {
-                return true;
-            }
-            else
-            {
-                MaxY = m_SizeY;
-            }
-        }
-        if constexpr (ROTATE == 2)
-        {
-            if (MinX >= m_SizeX || MinY >= m_SizeY || MaxX < 0 ||  MaxX < 0)
-            {
-                return true;
-            }
-        }
-        for (int64 y = MinY; y < MaxY; y++)
-        {
-            for (int64 x = MinX; x < MaxX; x++)
-            {
-                if (static_cast<int64>(m_ZBuffer[static_cast<int32>(x) + static_cast<int32>(y) * m_SizeX]) > MinZ)
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-
-    bool IsBoxVisible_OCCLUDER(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible_OCEAN(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible_OCCELL(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible_OCCELL_OCCLUDER(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible_OBJECT(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible_OBJECT_TO_LIGHT(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible_TERRAIN_NODE(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible_PORTAL(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-    bool IsBoxVisible(const AABB& objBox, uint32* const __restrict pResDest = NULL);
-
-
-public:
-    CZBufferCuller();
-    ~CZBufferCuller(){CryModuleMemalignFree(m_ZBuffer); }
-
-    // start new frame
-    void BeginFrame(const SRenderingPassInfo& passInfo);
-    void                                            ReloadBuffer(const uint32 BufferID);
-
-    // render into buffer
-    ILINE void                              AddRenderMesh([[maybe_unused]] IRenderMesh* pRM, [[maybe_unused]] Matrix34A* pTranRotMatrix, _smart_ptr<IMaterial> pMaterial, [[maybe_unused]] bool bOutdoorOnly, [[maybe_unused]] bool bCompletelyInFrustum, [[maybe_unused]] bool bNoCull){}
-
-
-    ILINE bool IsObjectVisible(const AABB& objBox, EOcclusionObjectType eOcclusionObjectType, [[maybe_unused]] float fDistance, uint32* pRetVal = NULL)
-    {
-        switch (eOcclusionObjectType)
-        {
-        case eoot_OCCLUDER:
-            return IsBoxVisible_OCCLUDER(objBox, pRetVal);
-        case eoot_OCEAN:
-            return IsBoxVisible_OCEAN(objBox, pRetVal);
-        case eoot_OCCELL:
-            return IsBoxVisible_OCCELL(objBox, pRetVal);
-        case eoot_OCCELL_OCCLUDER:
-            return IsBoxVisible_OCCELL_OCCLUDER(objBox, pRetVal);
-        case eoot_OBJECT:
-            return IsBoxVisible_OBJECT(objBox, pRetVal);
-        case eoot_OBJECT_TO_LIGHT:
-            return IsBoxVisible_OBJECT_TO_LIGHT(objBox, pRetVal);
-        case eoot_TERRAIN_NODE:
-            return IsBoxVisible_TERRAIN_NODE(objBox, pRetVal);
-        case eoot_PORTAL:
-            return IsBoxVisible_PORTAL(objBox, pRetVal);
-        }
-        assert(!"Undefined occluder type");
-
-        return true;
-    }
-
-    // draw content to the screen for debug
-    void                                            DrawDebug(int32 nStep);
-
-    // return current camera
-    const CCamera&                      GetCamera() const {return m_Camera; }
-
-    void                                            GetMemoryUsage(ICrySizer* pSizer) const;
-
-    bool                                            IsOutdooVisible(){return m_OutdoorVisible == 1; }
-    int32                                           TrisWritten() const{return 0; }
-    int32                                           ObjectsWritten() const{return 0; }
-    int32                                           TrisTested() const{return 0; }
-    int32                                           ObjectsTested() const{return m_ObjectsTested; }
-    int32                                           ObjectsTestedAndRejected() const{return m_ObjectsTestedAndRejected; }
-    int32                                           SelRes() const{return m_SizeX; }
-    float                                           FixedZFar() const{return m_FixedZFar; }
-    float                                           GetZNearInMeters() const{return 0.f; }
-    float                                           GetZFarInMeters() const{return 1024; }
-} _ALIGN(128);
-
-ILINE bool CZBufferCuller::IsBoxVisible_TERRAIN_NODE(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    return IsBoxVisible(objBox, pResDest);
-}
-
-ILINE bool CZBufferCuller::IsBoxVisible_OCCELL_OCCLUDER(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    return IsBoxVisible(objBox, pResDest);
-}
-
-ILINE bool CZBufferCuller::IsBoxVisible_OCCLUDER(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    return IsBoxVisible(objBox, pResDest);
-}
-
-ILINE bool CZBufferCuller::IsBoxVisible_OCEAN(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    return IsBoxVisible(objBox, pResDest);
-}
-
-ILINE bool CZBufferCuller::IsBoxVisible_OCCELL(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    if (GetCVars()->e_CoverageBufferDebugFreeze)
-    {
-        return true;
-    }
-    return IsBoxVisible(objBox, pResDest);
-}
-
-ILINE bool CZBufferCuller::IsBoxVisible_OBJECT(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    return IsBoxVisible(objBox, pResDest);
-}
-
-ILINE bool CZBufferCuller::IsBoxVisible_OBJECT_TO_LIGHT(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    return IsBoxVisible(objBox, pResDest);
-}
-
-ILINE bool CZBufferCuller::IsBoxVisible_PORTAL(const AABB& objBox, uint32* const __restrict pResDest)
-{
-    return IsBoxVisible(objBox, pResDest);
-}
-
-#endif // CRYINCLUDE_CRY3DENGINE_CZBUFFERCULLER_H
diff --git a/Code/CryEngine/Cry3DEngine/ClipVolume.cpp b/Code/CryEngine/Cry3DEngine/ClipVolume.cpp
deleted file mode 100644
index 841e8c983b..0000000000
--- a/Code/CryEngine/Cry3DEngine/ClipVolume.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "ClipVolume.h"
-
-CClipVolume::CClipVolume()
-    : m_nStencilRef(0)
-    , m_WorldTM(IDENTITY)
-    , m_InverseWorldTM(IDENTITY)
-    , m_BBoxWS(AABB::RESET)
-    , m_BBoxLS(AABB::RESET)
-    , m_pBspTree(NULL)
-{
-    memset(m_sName, 0x0, sizeof(m_sName));
-}
-
-CClipVolume::~CClipVolume()
-{
-    m_pRenderMesh = NULL;
-
-    for (size_t i = 0; i < m_lstRenderNodes.size(); ++i)
-    {
-        if (m_lstRenderNodes[i]->m_pRNTmpData)
-        {
-            m_lstRenderNodes[i]->m_pRNTmpData->userData.m_pClipVolume = NULL;
-        }
-    }
-}
-
-void CClipVolume::SetName(const char* szName)
-{
-    cry_strcpy(m_sName, szName);
-}
-
-void CClipVolume::GetClipVolumeMesh(_smart_ptr<IRenderMesh>& renderMesh, Matrix34& worldTM) const
-{
-    renderMesh = m_pRenderMesh;
-    worldTM = m_WorldTM;
-}
-
-AABB CClipVolume::GetClipVolumeBBox() const
-{
-    return m_BBoxWS;
-}
-
-void CClipVolume::Update(_smart_ptr<IRenderMesh> pRenderMesh, IBSPTree3D* pBspTree, const Matrix34& worldTM, uint32 flags)
-{
-    const bool bMeshUpdated = m_pRenderMesh != pRenderMesh;
-
-    m_pRenderMesh = pRenderMesh;
-    m_pBspTree = pBspTree;
-    m_WorldTM = worldTM;
-    m_InverseWorldTM = worldTM.GetInverted();
-    m_BBoxWS.Reset();
-    m_BBoxLS.Reset();
-    m_nFlags = flags;
-
-    if (m_pRenderMesh)
-    {
-        pRenderMesh->GetBBox(m_BBoxLS.min, m_BBoxLS.max);
-        m_BBoxWS.SetTransformedAABB(worldTM, m_BBoxLS);
-    }
-}
-
-bool CClipVolume::IsPointInsideClipVolume(const Vec3& point) const
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pRenderMesh || !m_pBspTree || !m_BBoxWS.IsContainPoint(point))
-    {
-        return false;
-    }
-
-    Vec3 pt = m_InverseWorldTM.TransformPoint(point);
-    return m_BBoxLS.IsContainPoint(pt) && m_pBspTree->IsInside(pt);
-}
-
-void CClipVolume::RegisterRenderNode(IRenderNode* pRenderNode)
-{
-    if (m_lstRenderNodes.Find(pRenderNode) < 0)
-    {
-        m_lstRenderNodes.Add(pRenderNode);
-
-        if (pRenderNode->m_pRNTmpData)
-        {
-            pRenderNode->m_pRNTmpData->userData.m_pClipVolume = this;
-        }
-    }
-}
-void CClipVolume::UnregisterRenderNode(IRenderNode* pRenderNode)
-{
-    if (m_lstRenderNodes.Delete(pRenderNode) && pRenderNode->m_pRNTmpData)
-    {
-        pRenderNode->m_pRNTmpData->userData.m_pClipVolume = NULL;
-    }
-}
-
-void CClipVolume::GetMemoryUsage(class ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-}
diff --git a/Code/CryEngine/Cry3DEngine/ClipVolume.h b/Code/CryEngine/Cry3DEngine/ClipVolume.h
deleted file mode 100644
index 8f3d4d1d44..0000000000
--- a/Code/CryEngine/Cry3DEngine/ClipVolume.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __INCLUDE_CRY3DENGINE_CLIPVOLUME_H
-#define __INCLUDE_CRY3DENGINE_CLIPVOLUME_H
-
-struct IBSPTree3D;
-
-class CClipVolume
-    : public IClipVolume
-{
-public:
-    CClipVolume();
-    virtual ~CClipVolume();
-
-    ////////////// IClipVolume implementation //////////////
-    virtual void GetClipVolumeMesh(_smart_ptr<IRenderMesh>& renderMesh, Matrix34& worldTM) const;
-    virtual AABB GetClipVolumeBBox() const;
-
-    virtual uint8 GetStencilRef() const { return m_nStencilRef; }
-    virtual uint GetClipVolumeFlags() const { return m_nFlags; }
-    virtual bool IsPointInsideClipVolume(const Vec3& vPos) const;
-    ////////////////////////////
-
-    void SetName(const char* szName);
-    void SetStencilRef(int nStencilRef) { m_nStencilRef = nStencilRef; }
-
-    void Update(_smart_ptr<IRenderMesh> pRenderMesh, IBSPTree3D* pBspTree, const Matrix34& worldTM, uint32 flags);
-
-    void RegisterRenderNode(IRenderNode* pRenderNode);
-    void UnregisterRenderNode(IRenderNode* pRenderNode);
-
-    void GetMemoryUsage(class ICrySizer* pSizer) const;
-
-private:
-    uint8 m_nStencilRef;
-    uint32 m_nFlags;
-    Matrix34 m_WorldTM;
-    Matrix34 m_InverseWorldTM;
-    AABB m_BBoxWS;
-    AABB m_BBoxLS;
-
-    _smart_ptr<IRenderMesh> m_pRenderMesh;
-    IBSPTree3D* m_pBspTree;
-
-    PodArray<IRenderNode*> m_lstRenderNodes;
-    char m_sName[64];
-};
-
-#endif //__INCLUDE_CRY3DENGINE_CLIPVOLUME_H
diff --git a/Code/CryEngine/Cry3DEngine/ClipVolumeManager.cpp b/Code/CryEngine/Cry3DEngine/ClipVolumeManager.cpp
deleted file mode 100644
index 26e0b5c238..0000000000
--- a/Code/CryEngine/Cry3DEngine/ClipVolumeManager.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "ClipVolume.h"
-#include "ClipVolumeManager.h"
-#include "LightEntity.h"
-#include "FogVolumeRenderNode.h"
-#include "ObjMan.h"
-
-CClipVolumeManager::~CClipVolumeManager()
-{
-    assert(m_ClipVolumes.empty());
-}
-
-IClipVolume* CClipVolumeManager::CreateClipVolume()
-{
-    SClipVolumeInfo volumeInfo(new CClipVolume());
-    m_ClipVolumes.push_back(volumeInfo);
-
-    return m_ClipVolumes.back().m_pVolume;
-}
-
-bool CClipVolumeManager::DeleteClipVolume(IClipVolume* pClipVolume)
-{
-    if (m_ClipVolumes.Delete(static_cast<CClipVolume*>(pClipVolume)))
-    {
-        delete pClipVolume;
-        return true;
-    }
-    return false;
-}
-
-bool CClipVolumeManager::UpdateClipVolume(IClipVolume* pClipVolume, _smart_ptr<IRenderMesh> pRenderMesh, IBSPTree3D* pBspTree, const Matrix34& worldTM, bool bActive, uint32 flags, const char* szName)
-{
-    int nVolumeIndex = m_ClipVolumes.Find((CClipVolume*)pClipVolume);
-    if (nVolumeIndex >= 0)
-    {
-        SClipVolumeInfo& volumeInfo = m_ClipVolumes[nVolumeIndex];
-        volumeInfo.m_pVolume->Update(pRenderMesh, pBspTree, worldTM, flags);
-        volumeInfo.m_pVolume->SetName(szName);
-        volumeInfo.m_bActive = bActive;
-
-        AABB volumeBBox = pClipVolume->GetClipVolumeBBox();
-        Get3DEngine()->GetObjManager()->ReregisterEntitiesInArea(volumeBBox.min, volumeBBox.max);
-        return true;
-    }
-
-    return false;
-}
-
-void CClipVolumeManager::PrepareVolumesForRendering(const SRenderingPassInfo& passInfo)
-{
-    for (size_t i = 0; i < m_ClipVolumes.size(); ++i)
-    {
-        SClipVolumeInfo& volInfo = m_ClipVolumes[i];
-        volInfo.m_pVolume->SetStencilRef(InactiveVolumeStencilRef);
-
-        if (volInfo.m_bActive && passInfo.GetCamera().IsAABBVisible_F(volInfo.m_pVolume->GetClipVolumeBBox()))
-        {
-            uint8 nStencilRef = GetRenderer()->EF_AddDeferredClipVolume(volInfo.m_pVolume);
-            volInfo.m_pVolume->SetStencilRef(nStencilRef);
-        }
-    }
-}
-
-void CClipVolumeManager::UpdateEntityClipVolume(const Vec3& pos, IRenderNode* pRenderNode)
-{
-    FRAME_PROFILER("CClipVolumeManager::UpdateEntityClipVolume", GetSystem(), PROFILE_3DENGINE);
-
-    if (!pRenderNode || !pRenderNode->m_pRNTmpData)
-    {
-        return;
-    }
-
-    IClipVolume* pPreviousVolume = pRenderNode->m_pRNTmpData->userData.m_pClipVolume;
-    UnregisterRenderNode(pRenderNode);
-
-    // user assigned clip volume
-    CLightEntity* pLight = static_cast<CLightEntity*>(pRenderNode);
-    if (pRenderNode->GetRenderNodeType() == eERType_Light && (pLight->m_light.m_Flags & DLF_HAS_CLIP_VOLUME) != 0)
-    {
-        for (int i = 1; i >= 0; --i)
-        {
-            if (CClipVolume* pVolume = static_cast<CClipVolume*>(pLight->m_light.m_pClipVolumes[i]))
-            {
-                pVolume->RegisterRenderNode(pRenderNode);
-            }
-        }
-    }
-    else // assign by position
-    {
-        // Check if entity is in same clip volume as before
-        if (pPreviousVolume && (pPreviousVolume->GetClipVolumeFlags() & IClipVolume::eClipVolumeIsVisArea) == 0)
-        {
-            CClipVolume* pVolume = static_cast<CClipVolume*>(pPreviousVolume);
-            if (pVolume->IsPointInsideClipVolume(pos))
-            {
-                pVolume->RegisterRenderNode(pRenderNode);
-                return;
-            }
-        }
-
-        if (CClipVolume* pVolume = GetClipVolumeByPos(pos, pPreviousVolume))
-        {
-            pVolume->RegisterRenderNode(pRenderNode);
-        }
-    }
-}
-
-void CClipVolumeManager::UnregisterRenderNode(IRenderNode* pRenderNode)
-{
-    if (!pRenderNode)
-    {
-        return;
-    }
-
-    for (size_t i = 0; i < m_ClipVolumes.size(); ++i)
-    {
-        m_ClipVolumes[i].m_pVolume->UnregisterRenderNode(pRenderNode);
-    }
-
-    if (pRenderNode->m_pRNTmpData)
-    {
-        pRenderNode->m_pRNTmpData->userData.m_pClipVolume = NULL;
-    }
-}
-
-bool CClipVolumeManager::IsClipVolumeRequired(IRenderNode* pRenderNode) const
-{
-    const uint32 NoClipVolumeLights = DLF_SUN | DLF_ATTACH_TO_SUN;
-
-    const bool bForwardObject = (pRenderNode->m_nInternalFlags & IRenderNode::REQUIRES_FORWARD_RENDERING) != 0;
-    const EERType ertype = pRenderNode->GetRenderNodeType();
-    const bool bIsValidLight = ertype == eERType_Light &&
-        (static_cast<CLightEntity*>(pRenderNode)->m_light.m_Flags & NoClipVolumeLights) == 0;
-    const bool bIsValidFogVolume = (ertype == eERType_FogVolume) &&
-        static_cast<CFogVolumeRenderNode*>(pRenderNode)->IsAffectsThisAreaOnly();
-
-    return bIsValidLight || bForwardObject || bIsValidFogVolume;
-}
-
-CClipVolume* CClipVolumeManager::GetClipVolumeByPos(const Vec3& pos, const IClipVolume* pIgnoreVolume) const
-{
-    for (size_t i = 0; i < m_ClipVolumes.size(); ++i)
-    {
-        const SClipVolumeInfo& volInfo = m_ClipVolumes[i];
-
-        if (volInfo.m_bActive && volInfo.m_pVolume != pIgnoreVolume && volInfo.m_pVolume->IsPointInsideClipVolume(pos))
-        {
-            return m_ClipVolumes[i].m_pVolume;
-        }
-    }
-
-    return NULL;
-}
-
-void CClipVolumeManager::GetMemoryUsage(class ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(this));
-    for (size_t i = 0; i < m_ClipVolumes.size(); ++i)
-    {
-        pSizer->AddObject(m_ClipVolumes[i].m_pVolume);
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/ClipVolumeManager.h b/Code/CryEngine/Cry3DEngine/ClipVolumeManager.h
deleted file mode 100644
index 46a4bf27fe..0000000000
--- a/Code/CryEngine/Cry3DEngine/ClipVolumeManager.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __INCLUDE_CRY3DENGINE_CLIPVOLUMEMANAGER_H
-#define __INCLUDE_CRY3DENGINE_CLIPVOLUMEMANAGER_H
-
-class CClipVolume;
-
-class CClipVolumeManager
-    : public Cry3DEngineBase
-{
-    struct SClipVolumeInfo
-    {
-        CClipVolume* m_pVolume;
-        bool m_bActive;
-
-        SClipVolumeInfo()
-            : m_bActive(false) {}
-        SClipVolumeInfo(CClipVolume* pVolume)
-            : m_pVolume(pVolume)
-            , m_bActive(false)
-        {}
-
-        bool operator==(const SClipVolumeInfo& other) const { return m_pVolume == other.m_pVolume; }
-    };
-
-public:
-    static const uint8 InactiveVolumeStencilRef    = 0xFD;
-    static const uint8 AffectsEverythingStencilRef = 0xFE;
-
-    virtual ~CClipVolumeManager();
-
-    virtual IClipVolume* CreateClipVolume();
-    virtual bool DeleteClipVolume(IClipVolume* pClipVolume);
-    virtual bool UpdateClipVolume(IClipVolume* pClipVolume, _smart_ptr<IRenderMesh> pRenderMesh, IBSPTree3D* pBspTree, const Matrix34& worldTM, bool bActive, uint32 flags, const char* szName);
-
-    void PrepareVolumesForRendering(const SRenderingPassInfo& passInfo);
-
-    void UpdateEntityClipVolume(const Vec3& pos, IRenderNode* pRenderNode);
-    void UnregisterRenderNode(IRenderNode* pRenderNode);
-
-    bool IsClipVolumeRequired(IRenderNode* pRenderNode) const;
-    CClipVolume* GetClipVolumeByPos(const Vec3& pos, const IClipVolume* pIgnoreVolume = NULL) const;
-
-    void GetMemoryUsage(class ICrySizer* pSizer) const;
-    size_t GetClipVolumeCount() const { return m_ClipVolumes.size(); }
-
-private:
-    PodArray<SClipVolumeInfo> m_ClipVolumes;
-};
-
-
-#endif //__INCLUDE_CRY3DENGINE_CLIPVOLUMEMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/CloudRenderNode.cpp b/Code/CryEngine/Cry3DEngine/CloudRenderNode.cpp
deleted file mode 100644
index 344617622e..0000000000
--- a/Code/CryEngine/Cry3DEngine/CloudRenderNode.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "CloudRenderNode.h"
-#include "CloudsManager.h"
-#include "VisAreas.h"
-#include "ObjMan.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-//////////////////////////////////////////////////////////////////////////
-CCloudRenderNode::CCloudRenderNode()
-{
-    m_bounds.min = Vec3(-1, -1, -1);
-    m_bounds.max = Vec3(1, 1, 1);
-    m_fScale = 1.0f;
-    m_offsetedMatrix.SetIdentity();
-    m_matrix.SetIdentity();
-    m_vOffset.Set(0, 0, 0);
-    m_alpha = 1.f;
-
-    m_pCloudRenderElement = (CREBaseCloud*)GetRenderer()->EF_CreateRE(eDATA_Cloud);
-    m_pREImposter         = (CREImposter*) GetRenderer()->EF_CreateRE(eDATA_Imposter);
-
-    GetCloudsManager()->AddCloudRenderNode(this);
-
-    m_origin = Vec3(0, 0, 0);
-    m_moveProps.m_autoMove = false;
-    m_moveProps.m_speed = Vec3(0, 0, 0);
-    m_moveProps.m_spaceLoopBox = Vec3(2000.0f, 2000.0f, 2000.0f);
-    m_moveProps.m_fadeDistance = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CCloudRenderNode::~CCloudRenderNode()
-{
-    GetCloudsManager()->RemoveCloudRenderNode(this);
-    m_pCloudRenderElement->Release(false);
-    m_pREImposter->Release(false);
-
-    Get3DEngine()->FreeRenderNodeState(this);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CCloudRenderNode::LoadCloudFromXml(XmlNodeRef root)
-{
-    m_pCloudDesc = new SCloudDescription;
-    GetCloudsManager()->ParseCloudFromXml(root, m_pCloudDesc);
-
-    SetCloudDesc(m_pCloudDesc);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CCloudRenderNode::LoadCloud(const char* sCloudFilename)
-{
-    m_bounds.min = Vec3(-1, -1, -1);
-    m_bounds.max = Vec3(1, 1, 1);
-
-    SetCloudDesc(GetCloudsManager()->LoadCloud(sCloudFilename));
-
-    return m_pCloudDesc != 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudRenderNode::SetMovementProperties(const SCloudMovementProperties& properties)
-{
-    m_moveProps = properties;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudRenderNode::SetCloudDesc(SCloudDescription* pCloud)
-{
-    m_pCloudDesc = pCloud;
-    if (m_pCloudDesc != NULL && m_pCloudDesc->m_particles.size() > 0)
-    {
-        m_vOffset = m_pCloudDesc->m_offset;
-        m_bounds.min = m_pCloudDesc->m_bounds.min - m_pCloudDesc->m_offset;
-        m_bounds.max = m_pCloudDesc->m_bounds.max - m_pCloudDesc->m_offset;
-        if (m_pCloudDesc->m_pMaterial)
-        {
-            m_pMaterial = m_pCloudDesc->m_pMaterial;
-        }
-        m_pCloudRenderElement->SetParticles(&m_pCloudDesc->m_particles[0], m_pCloudDesc->m_particles.size());
-
-        m_WSBBox.SetTransformedAABB(m_matrix, m_bounds);
-        m_fScale = m_matrix.GetColumn(0).GetLength();
-        // Offset matrix by the cloud bounds offset.
-        m_offsetedMatrix = m_matrix * Matrix34::CreateTranslationMat(-m_vOffset);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudRenderNode::SetMatrix(const Matrix34& mat)
-{
-    SetMatrixInternal(mat, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudRenderNode::SetMatrixInternal(const Matrix34& mat, bool updateOrigin)
-{
-    m_dwRndFlags |= ERF_OUTDOORONLY;
-
-    if (updateOrigin)
-    {
-        m_origin = mat.GetTranslation();
-    }
-
-    m_matrix = mat;
-    m_pos = mat.GetTranslation();
-    //  m_WSBBox.SetTransformedAABB( m_matrix,m_bounds );
-    m_fScale = mat.GetColumn(0).GetLength();
-    m_WSBBox.SetTransformedAABB(Matrix34::CreateTranslationMat(m_pos), AABB(m_bounds.min * m_fScale, m_bounds.max * m_fScale));
-
-    // Offset matrix by the cloud bounds offset.
-    //  m_offsetedMatrix = m_matrix * Matrix34::CreateTranslationMat(-m_vOffset);
-    m_offsetedMatrix = Matrix34::CreateTranslationMat(m_pos - m_vOffset * m_fScale);
-    m_offsetedMatrix.ScaleColumn(Vec3(m_fScale, m_fScale, m_fScale));
-    Get3DEngine()->RegisterEntity(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudRenderNode::MoveCloud()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    Vec3 pos(m_matrix.GetTranslation());
-
-    ITimer* pTimer(gEnv->pTimer);
-    if (m_moveProps.m_autoMove)
-    {
-        // update position
-        float deltaTime = pTimer->GetFrameTime();
-
-        assert(deltaTime >= 0);
-
-        pos += deltaTime * m_moveProps.m_speed;
-
-        // constrain movement to specified loop box
-        Vec3 loopBoxMin(m_origin - m_moveProps.m_spaceLoopBox);
-        Vec3 loopBoxMax(m_origin + m_moveProps.m_spaceLoopBox);
-
-        if (pos.x < loopBoxMin.x)
-        {
-            pos.x = loopBoxMax.x;
-        }
-        if (pos.y < loopBoxMin.y)
-        {
-            pos.y = loopBoxMax.y;
-        }
-        if (pos.z < loopBoxMin.z)
-        {
-            pos.z = loopBoxMax.z;
-        }
-
-        if (pos.x > loopBoxMax.x)
-        {
-            pos.x = loopBoxMin.x;
-        }
-        if (pos.y > loopBoxMax.y)
-        {
-            pos.y = loopBoxMin.y;
-        }
-        if (pos.z > loopBoxMax.z)
-        {
-            pos.z = loopBoxMin.z;
-        }
-
-        // set new position
-        Matrix34 mat(m_matrix);
-        mat.SetTranslation(pos);
-        SetMatrixInternal(mat, false);
-
-        // fade out clouds at the borders of the loop box
-        if (m_moveProps.m_fadeDistance > 0)
-        {
-            Vec3 fade(max(m_moveProps.m_spaceLoopBox.x, m_moveProps.m_fadeDistance),
-                max(m_moveProps.m_spaceLoopBox.y, m_moveProps.m_fadeDistance),
-                max(m_moveProps.m_spaceLoopBox.z, m_moveProps.m_fadeDistance));
-
-            fade -= Vec3(fabs(pos.x - m_origin.x), fabs(pos.y - m_origin.y), fabs(pos.z - m_origin.z));
-
-            m_alpha = clamp_tpl(min(min(fade.x, fade.y), fade.z) / m_moveProps.m_fadeDistance, 0.0f, 1.0f);
-        }
-    }
-    else
-    {
-        if ((m_origin - pos).GetLengthSquared() > 1e-4f)
-        {
-            Matrix34 mat(m_matrix);
-            mat.SetTranslation(m_origin);
-            SetMatrixInternal(mat, false);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudRenderNode::Render(const SRendParams& rParams, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pMaterial || !passInfo.RenderClouds())
-    {
-        return;
-    }
-
-    IRenderer* pRenderer(GetRenderer());
-
-    // get render objects
-    CRenderObject* pRO = pRenderer->EF_GetObject_Temp(passInfo.ThreadID());
-    if (!pRO)
-    {
-        return;
-    }
-
-    SShaderItem& shaderItem = (rParams.pMaterial) ? rParams.pMaterial->GetShaderItem(0) : m_pMaterial->GetShaderItem(0);
-
-    pRO->m_II.m_Matrix = m_offsetedMatrix;
-    SRenderObjData* pOD = pRenderer->EF_GetObjData(pRO, true, passInfo.ThreadID());
-    pOD->m_fTempVars[0] = m_fScale;
-    pRO->m_fSort = 0;
-    pRO->m_fDistance = rParams.fDistance;
-    int nAfterWater = GetObjManager()->IsAfterWater(m_offsetedMatrix.GetTranslation(), passInfo) ? 1 : 0;
-    pRO->m_II.m_AmbColor = rParams.AmbientColor;
-    pRO->m_fAlpha = rParams.fAlpha * m_alpha;
-
-    float mvd(GetMaxViewDist());
-    float d((passInfo.GetCamera().GetPosition() - m_offsetedMatrix.GetTranslation()).GetLength());
-    if (d > 0.9f * mvd)
-    {
-        float s(clamp_tpl(1.0f - (d - 0.9f * mvd) / (0.1f * mvd), 0.0f, 1.0f));
-        pRO->m_fAlpha *= s;
-    }
-
-    pRenderer->EF_AddEf(m_pCloudRenderElement, shaderItem, pRO, passInfo, EFSLIST_TRANSP, nAfterWater, SRendItemSorter(rParams.rendItemSorter));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CCloudRenderNode::CheckIntersection(const Vec3& p1, const Vec3& p2)
-{
-    if (p1 == p2)
-    {
-        return false;
-    }
-    if (m_pCloudDesc && m_pCloudDesc->m_pCloudTree)
-    {
-        Vec3 outp;
-        if (Intersect::Lineseg_AABB(Lineseg(p1, p2), m_WSBBox, outp))
-        {
-            Matrix34 pInv = m_offsetedMatrix.GetInverted();
-            return m_pCloudDesc->m_pCloudTree->CheckIntersection(pInv * p1, pInv * p2);
-        }
-    }
-    return false;
-}
-
-void CCloudRenderNode::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_pos += delta;
-    m_origin += delta;
-    m_matrix.SetTranslation(m_matrix.GetTranslation() + delta);
-    m_offsetedMatrix.SetTranslation(m_offsetedMatrix.GetTranslation() + delta);
-    m_WSBBox.Move(delta);
-}
diff --git a/Code/CryEngine/Cry3DEngine/CloudRenderNode.h b/Code/CryEngine/Cry3DEngine/CloudRenderNode.h
deleted file mode 100644
index c82dc1ebcc..0000000000
--- a/Code/CryEngine/Cry3DEngine/CloudRenderNode.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CLOUDRENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_CLOUDRENDERNODE_H
-#pragma once
-
-struct SCloudDescription;
-
-//////////////////////////////////////////////////////////////////////////
-// RenderNode for rendering single cloud object.
-//////////////////////////////////////////////////////////////////////////
-class CCloudRenderNode
-    : public ICloudRenderNode
-    , public Cry3DEngineBase
-{
-public:
-
-    CCloudRenderNode();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implements ICloudRenderNode
-    //////////////////////////////////////////////////////////////////////////
-    virtual bool LoadCloud(const char* sCloudFilename);
-    virtual bool LoadCloudFromXml(XmlNodeRef cloudNode);
-    virtual void SetMovementProperties(const SCloudMovementProperties& properties);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implements IRenderNode
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GetLocalBounds(AABB& bbox) { bbox = m_bounds; };
-    virtual void SetMatrix(const Matrix34& mat);
-
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName() const { return "Cloud"; }
-    virtual const char* GetName() const { return "Cloud"; }
-    virtual Vec3 GetPos(bool bWorldOnly = true) const;
-    virtual void Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo);
-    void SetMaterial(_smart_ptr<IMaterial> pMat) override { m_pMaterial = pMat; }
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = NULL);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist();
-    virtual const AABB GetBBox() const { return m_WSBBox; }
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-    //////////////////////////////////////////////////////////////////////////
-
-    bool CheckIntersection(const Vec3& p1, const Vec3& p2);
-    void MoveCloud();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-private:
-    void SetCloudDesc(SCloudDescription* pCloud);
-    ~CCloudRenderNode();
-    virtual void SetMatrixInternal(const Matrix34& mat, bool updateOrigin);
-
-private:
-    Vec3 m_pos;
-    float m_fScale;
-    _smart_ptr<IMaterial> m_pMaterial;
-    _smart_ptr<SCloudDescription> m_pCloudDesc;
-    Matrix34 m_matrix;
-    Matrix34 m_offsetedMatrix;
-    Vec3 m_vOffset;
-    AABB m_bounds;
-
-    CREBaseCloud* m_pCloudRenderElement;
-    CREImposter* m_pREImposter;
-    float m_alpha;
-
-    Vec3 m_origin;
-    SCloudMovementProperties m_moveProps;
-
-    AABB m_WSBBox;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_CLOUDRENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/CloudsManager.cpp b/Code/CryEngine/Cry3DEngine/CloudsManager.cpp
deleted file mode 100644
index 9c1a52b921..0000000000
--- a/Code/CryEngine/Cry3DEngine/CloudsManager.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "CloudRenderNode.h"
-#include "CloudsManager.h"
-#include <CryPath.h>
-#include "MatMan.h"
-
-//////////////////////////////////////////////////////////////////////////
-SCloudDescription::~SCloudDescription()
-{
-    delete m_pCloudTree;
-    m_pCloudTree = 0;
-    // Unregister itself from clouds manager.
-    if (!filename.empty())
-    {
-        Get3DEngine()->GetCloudsManager()->Unregister(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-SCloudDescription* CCloudsManager::LoadCloud(const char* sFilename)
-{
-    string filename = PathUtil::ToUnixPath(sFilename);
-
-    SCloudDescription* pCloud = stl::find_in_map(m_cloudsMap, filename, NULL);
-    if (!pCloud)
-    {
-        XmlNodeRef root = GetISystem()->LoadXmlFromFile(filename);
-        if (root)
-        {
-            pCloud = new SCloudDescription;
-            pCloud->filename = filename;
-            ParseCloudFromXml(root, pCloud);
-
-            CloudParticles particles;
-            particles.resize(pCloud->m_particles.size());
-            for (uint32 i = 0; i < particles.size(); i++)
-            {
-                particles[i] = &pCloud->m_particles[i];
-            }
-            pCloud->m_pCloudTree = new SCloudQuadTree();
-            pCloud->m_pCloudTree->Init(pCloud->m_bounds, particles);
-
-            Register(pCloud);
-        }
-    }
-
-    return pCloud;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudsManager::ParseCloudFromXml(XmlNodeRef root, SCloudDescription* pCloud)
-{
-    assert(pCloud);
-
-    pCloud->m_bounds.min = Vec3(0, 0, 0);
-    pCloud->m_bounds.max = Vec3(0, 0, 0);
-    pCloud->m_pMaterial = 0;
-    const char* sMtlName = root->getAttr("Material");
-    if (sMtlName && sMtlName[0] != '\0')
-    {
-        pCloud->m_pMaterial = GetMatMan()->LoadMaterial(sMtlName);
-
-        if (!pCloud->m_pMaterial)
-        {
-            CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "Error: Failed to load cloud material" /*,sMtlName*/);
-        }
-    }
-
-    int numRows = 1;
-    int numCols = 1;
-    root->getAttr("TextureNumRows", numRows);
-    root->getAttr("TextureNumCols", numCols);
-    if (numRows < 1)
-    {
-        numRows = 1;
-    }
-    if (numCols < 1)
-    {
-        numCols = 1;
-    }
-
-    pCloud->m_textureRows = numRows;
-    pCloud->m_textureCols = numCols;
-
-    pCloud->m_numSprites = root->getChildCount();
-    pCloud->m_particles.reserve(pCloud->m_numSprites);
-    pCloud->m_particles.clear();
-
-    float xTextureStep = 1.0f / numCols;
-    float yTextureStep = 1.0f / numRows;
-
-    Vec3 pos(0, 0, 0);
-    int texID = 0;
-    float angle = 0;
-    float radius = 0;
-    Vec2 uv[2];
-    if (pCloud->m_numSprites > 0)
-    {
-        pCloud->m_bounds.Reset();
-    }
-    for (int i = 0; i < root->getChildCount(); i++)
-    {
-        XmlNodeRef child = root->getChild(i);
-        child->getAttr("Pos", pos);
-        child->getAttr("texID", texID);
-        child->getAttr("Radius", radius);
-        if (!child->getAttr("Angle", angle))
-        {
-            angle = 0;
-        }
-
-        int x = texID % numCols;
-        int y = texID / numCols;
-
-        uv[0].x = x * xTextureStep;
-        uv[0].y = y * yTextureStep;
-        uv[1].x = (x + 1) * xTextureStep;
-        uv[1].y = (y + 1) * yTextureStep;
-
-        SCloudParticle sprite(pos, radius, radius, 0, 0, uv);
-        pCloud->m_particles.push_back(sprite);
-
-        pCloud->m_bounds.Add(pos - Vec3(radius, radius, radius));
-        pCloud->m_bounds.Add(pos + Vec3(radius, radius, radius));
-    }
-
-    // Offset particles so that bounding box is centered at origin.
-    pCloud->m_offset = -pCloud->m_bounds.GetCenter();
-    pCloud->m_bounds.min += pCloud->m_offset;
-    pCloud->m_bounds.max += pCloud->m_offset;
-
-    for (uint32 i = 0; i < pCloud->m_particles.size(); i++)
-    {
-        pCloud->m_particles[i].SetPosition(pCloud->m_particles[i].GetPosition() + pCloud->m_offset);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudsManager::Register(SCloudDescription* desc)
-{
-    assert(desc);
-    m_cloudsMap[desc->filename] = desc;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudsManager::Unregister(SCloudDescription* desc)
-{
-    assert(desc);
-    m_cloudsMap.erase(desc->filename);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudsManager::AddCloudRenderNode(CCloudRenderNode* pNode)
-{
-    m_cloudNodes.push_back(pNode);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudsManager::RemoveCloudRenderNode(CCloudRenderNode* pNode)
-{
-    int size = m_cloudNodes.size();
-    for (int i = 0; i < size; i++)
-    {
-        if (m_cloudNodes[i] == pNode)
-        {
-            if (i < size - 1)
-            {
-                m_cloudNodes[i] = m_cloudNodes[size - 1];
-            }
-            m_cloudNodes.resize(size - 1);
-            break;
-        }
-    }
-}
-
-//!!! WARNING
-//bool Sp_IsDraw = false;
-//Matrix34 Sp_Mat;
-//Vec3 Sp_Pos;
-//float Sp_Rad;
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CCloudsManager::CheckIntersectClouds(const Vec3& p1, const Vec3& p2)
-{
-    for (std::vector<CCloudRenderNode*>::iterator it = m_cloudNodes.begin(); it != m_cloudNodes.end(); ++it)
-    {
-        //Sp_IsDraw = false;
-        if ((*it)->CheckIntersection(p1, p2))
-        {
-            //Sp_Mat = (*it)->m_offsetedMatrix;
-            //Sp_IsDraw = true;
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCloudsManager::MoveClouds()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    std::vector<CCloudRenderNode*>::iterator it(m_cloudNodes.begin());
-    std::vector<CCloudRenderNode*>::iterator itEnd(m_cloudNodes.end());
-    for (; it != itEnd; ++it)
-    {
-        (*it)->MoveCloud();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SCloudQuadTree::Init(const AABB& bounds, const CloudParticles& particles, int maxlevel)
-{
-    m_bounds = bounds;
-
-    if (m_level >= maxlevel)
-    {
-        m_particles.resize(particles.size());
-        memcpy(&m_particles[0], &particles[0], particles.size() * sizeof(SCloudParticle*));
-        return;
-    }
-
-    CloudParticles parts;
-    for (int k = 0; k < 4; k++)
-    {
-        AABB bnds;
-        parts.resize(0);
-
-        Vec3 centr = (bounds.min + bounds.max) / 2;
-
-        if (k == 0)
-        {
-            bnds = AABB(bounds.min, Vec3(centr.x, centr.y, bounds.max.z));
-        }
-        else if (k == 1)
-        {
-            bnds = AABB(Vec3(bounds.min.x, centr.y, bounds.min.z), Vec3(centr.x, bounds.max.y, bounds.max.z));
-        }
-        else if (k == 2)
-        {
-            bnds = AABB(Vec3(centr.x, bounds.min.y, bounds.min.z), Vec3(bounds.max.x, centr.y, bounds.max.z));
-        }
-        else if (k == 3)
-        {
-            bnds = AABB(Vec3(centr.x, centr.y, bounds.min.z), bounds.max);
-        }
-        for (uint32 i = 0; i < particles.size(); i++)
-        {
-            SCloudParticle* pPtcl = particles[i];
-            if (bnds.IsOverlapSphereBounds(pPtcl->GetPosition(), pPtcl->GetRadiusX()) ||
-                bnds.IsContainSphere(pPtcl->GetPosition(), pPtcl->GetRadiusX()))
-            {
-                parts.push_back(pPtcl);
-            }
-        }
-        if (!parts.empty())
-        {
-            m_pQuads[k] = new SCloudQuadTree(m_level + 1);
-            m_pQuads[k]->Init(bnds, parts, maxlevel);
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool SCloudQuadTree::CheckIntersection(const Vec3& p1, const Vec3& p2)
-{
-    Vec3 outp, outp2;
-    if (Intersect::Lineseg_AABB(Lineseg(p1, p2), m_bounds, outp))
-    {
-        if (m_pQuads[0] && m_pQuads[0]->CheckIntersection(p1, p2))
-        {
-            return true;
-        }
-        if (m_pQuads[1] && m_pQuads[1]->CheckIntersection(p1, p2))
-        {
-            return true;
-        }
-        if (m_pQuads[2] && m_pQuads[2]->CheckIntersection(p1, p2))
-        {
-            return true;
-        }
-        if (m_pQuads[3] && m_pQuads[3]->CheckIntersection(p1, p2))
-        {
-            return true;
-        }
-        if (!m_particles.empty())
-        {
-            for (uint32 i = 0; i < m_particles.size(); i++)
-            {
-                //if(Intersect::Lineseg_Sphere(Lineseg(p1, p2), Sphere (m_particles[i]->GetPosition(), m_particles[i]->GetRadiusX()*(2.0f/3)), outp, outp2))
-                if (Intersect::Lineseg_Sphere(Lineseg(p1, p2), Sphere (m_particles[i]->GetPosition(), m_particles[i]->GetRadiusX()), outp, outp2))
-                {
-                    //Sp_Pos = m_particles[i]->GetPosition();
-                    //Sp_Rad = m_particles[i]->GetRadiusX()/2;
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
-/*
-//!!! WARNING
-extern bool Sp_IsDraw;
-extern Matrix34 Sp_Mat;
-extern Vec3 Sp_Pos;
-extern float Sp_Rad;
-
-
-void C3DEngine::Hack_GetSprite(bool & IsDraw, Matrix34 & Mat, Vec3 & Pos, float & Rad)
-{
-    IsDraw = Sp_IsDraw;
-    Mat = Sp_Mat;
-    Pos = Sp_Pos;
-    Rad = Sp_Rad;
-}
-*/
diff --git a/Code/CryEngine/Cry3DEngine/CloudsManager.h b/Code/CryEngine/Cry3DEngine/CloudsManager.h
deleted file mode 100644
index 38c5aac911..0000000000
--- a/Code/CryEngine/Cry3DEngine/CloudsManager.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CLOUDSMANAGER_H
-#define CRYINCLUDE_CRY3DENGINE_CLOUDSMANAGER_H
-#pragma once
-
-class CCloudRenderNode;
-
-typedef std::vector<SCloudParticle*> CloudParticles;
-
-struct SCloudQuadTree
-{
-    CloudParticles m_particles;
-    AABB m_bounds;
-    SCloudQuadTree* m_pQuads[4];
-    int m_level;
-    SCloudQuadTree(int level = 0)
-    {
-        m_pQuads[0] = 0;
-        m_pQuads[1] = 0;
-        m_pQuads[2] = 0;
-        m_pQuads[3] = 0;
-        m_level = level;
-    }
-    ~SCloudQuadTree()
-    {
-        delete m_pQuads[0];
-        delete m_pQuads[1];
-        delete m_pQuads[2];
-        delete m_pQuads[3];
-        m_pQuads[0] = m_pQuads[1] = m_pQuads[2] = m_pQuads[3] = 0;
-    }
-    void Init(const AABB& bounds, const CloudParticles& particles, int maxlevel = 2);
-    bool CheckIntersection(const Vec3& p1, const Vec3& p2);
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// SCloudDescription contains cached representation of the cloud description file.
-//////////////////////////////////////////////////////////////////////////
-struct SCloudDescription
-    : public _reference_target_t
-    , public Cry3DEngineBase
-{
-    string filename;
-    int m_textureRows;
-    int m_textureCols;
-    int m_numSprites;
-
-    AABB m_bounds;
-    Vec3 m_offset;
-
-    _smart_ptr<IMaterial> m_pMaterial;
-    std::vector<SCloudParticle> m_particles;
-    SCloudQuadTree* m_pCloudTree;
-
-    SCloudDescription()
-    {
-        m_textureRows = 0;
-        m_textureCols = 0;
-        m_numSprites = 0;
-        m_pCloudTree = 0;
-    };
-    ~SCloudDescription();
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// CloudsManager is used to manage cloud descriptions loaded from the files.
-// When cloud file is once loaded it caches its content and next time the same
-// cloud file is request, Clients will get the cached content.
-//////////////////////////////////////////////////////////////////////////
-class CCloudsManager
-    : public Cry3DEngineBase
-{
-public:
-    CCloudsManager() {};
-    ~CCloudsManager() {};
-
-    // Loads cloud file and returns cloud description.
-    // If cloud was already loaded cached instance is returned.
-    // Reference count of the cloud description is incremented,Client must call Release on returned pointer to free cloud description.
-    SCloudDescription* LoadCloud(const char* sFilename);
-
-    // Used to parse xml node and create a cloud description from it.
-    void ParseCloudFromXml(XmlNodeRef node, SCloudDescription* pCloud);
-
-    void AddCloudRenderNode(CCloudRenderNode* pNode);
-    void RemoveCloudRenderNode(CCloudRenderNode* pNode);
-    bool CheckIntersectClouds(const Vec3& p1, const Vec3& p2);
-    void MoveClouds();
-
-private:
-    friend struct SCloudDescription;
-    void Register(SCloudDescription* desc);
-    void Unregister(SCloudDescription* desc);
-
-private:
-    typedef std::map<string, SCloudDescription*, stl::less_stricmp<string> > CloudsMaps;
-
-    CloudsMaps m_cloudsMap;
-    std::vector<CCloudRenderNode*> m_cloudNodes;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_CLOUDSMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/Cry3DEngine.cpp b/Code/CryEngine/Cry3DEngine/Cry3DEngine.cpp
deleted file mode 100644
index 01b5b053c3..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry3DEngine.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Defines the DLL entry point, implements access to other modules
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "MatMan.h"
-
-#include <IEngineModule.h>
-#include <CryExtension/Impl/ClassWeaver.h>
-
-#include "I3DEngine_info.h"
-
-//////////////////////////////////////////////////////////////////////
-
-struct CSystemEventListner_3DEngine
-    : public ISystemEventListener
-{
-public:
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-    {
-        switch (event)
-        {
-        case ESYSTEM_EVENT_LEVEL_PRECACHE_START:
-            if (Cry3DEngineBase::Get3DEngine())
-            {
-                Cry3DEngineBase::Get3DEngine()->ClearPrecacheInfo();
-            }
-            break;
-        case ESYSTEM_EVENT_RANDOM_SEED:
-            cry_random_seed(gEnv->bNoRandomSeed ? 0 : (uint32)wparam);
-            break;
-        case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
-        {
-            STLALLOCATOR_CLEANUP;
-            if (Cry3DEngineBase::Get3DEngine())
-            {
-                Cry3DEngineBase::Get3DEngine()->ClearDebugFPSInfo(true);
-            }
-            break;
-        }
-        case ESYSTEM_EVENT_LEVEL_LOAD_END:
-        {
-            if (Cry3DEngineBase::Get3DEngine())
-            {
-                Cry3DEngineBase::Get3DEngine()->ClearDebugFPSInfo();
-            }
-            if (Cry3DEngineBase::GetObjManager())
-            {
-                Cry3DEngineBase::GetObjManager()->FreeNotUsedCGFs();
-            }
-            Cry3DEngineBase::m_bLevelLoadingInProgress = false;
-            break;
-        }
-        case ESYSTEM_EVENT_LEVEL_LOAD_START:
-        {
-            Cry3DEngineBase::m_bLevelLoadingInProgress = true;
-            break;
-        }
-        case ESYSTEM_EVENT_LEVEL_UNLOAD:
-        {
-            Cry3DEngineBase::m_bLevelLoadingInProgress = true;
-            break;
-        }
-        case ESYSTEM_EVENT_3D_POST_RENDERING_START:
-        {
-            Cry3DEngineBase::GetMatMan()->DoLoadSurfaceTypesInInit(false);
-            break;
-        }
-        case ESYSTEM_EVENT_3D_POST_RENDERING_END:
-        {
-            if (Cry3DEngineBase::Get3DEngine()->GetObjectTree())
-            {
-                delete Cry3DEngineBase::Get3DEngine()->GetObjectTree();
-                Cry3DEngineBase::Get3DEngine()->SetObjectTree(nullptr);
-            }
-
-            if (IObjManager* pObjManager = Cry3DEngineBase::GetObjManager())
-            {
-                pObjManager->UnloadObjects(true);
-            }
-
-
-            if (Cry3DEngineBase::GetMatMan())
-            {
-                Cry3DEngineBase::GetMatMan()->ShutDown();
-                Cry3DEngineBase::GetMatMan()->DoLoadSurfaceTypesInInit(true);
-            }
-
-            break;
-        }
-        }
-    }
-};
-static CSystemEventListner_3DEngine g_system_event_listener_engine;
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-class CEngineModule_Cry3DEngine
-    : public IEngineModule
-{
-    CRYINTERFACE_SIMPLE(IEngineModule)
-    CRYGENERATE_SINGLETONCLASS(CEngineModule_Cry3DEngine, "EngineModule_Cry3DEngine", 0x2d38f12a521d43cf, 0xba18fd1fa7ea5020)
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual const char* GetName() const {
-        return "Cry3DEngine";
-    };
-    virtual const char* GetCategory() const { return "CryEngine"; };
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual bool Initialize(SSystemGlobalEnvironment& env, [[maybe_unused]] const SSystemInitParams& initParams)
-    {
-        ISystem* pSystem = env.pSystem;
-
-        ModuleInitISystem(pSystem, "Cry3DEngine");
-        pSystem->GetISystemEventDispatcher()->RegisterListener(&g_system_event_listener_engine);
-
-        C3DEngine* p3DEngine = CryAlignedNew<C3DEngine>(pSystem);
-        env.p3DEngine = p3DEngine;
-        return true;
-    }
-};
-
-CRYREGISTER_SINGLETON_CLASS(CEngineModule_Cry3DEngine)
-
-CEngineModule_Cry3DEngine::CEngineModule_Cry3DEngine()
-{
-};
-
-CEngineModule_Cry3DEngine::~CEngineModule_Cry3DEngine()
-{
-};
-
-#if !defined(AZ_MONOLITHIC_BUILD)
-    #include <CrtDebugStats.h>
-#endif
-
-#include "TypeInfo_impl.h"
-
-// 3DEngine types
-#include "SkyLightNishita_info.h"
-
-STRUCT_INFO_BEGIN(SImageSubInfo)
-VAR_INFO(nDummy)
-VAR_INFO(nDim)
-VAR_INFO(fTilingIn)
-VAR_INFO(fTiling)
-VAR_INFO(fSpecularAmount)
-VAR_INFO(nSortOrder)
-STRUCT_INFO_END(SImageSubInfo)
-
-STRUCT_INFO_BEGIN(SImageInfo)
-VAR_INFO(baseInfo)
-VAR_INFO(detailInfo)
-VAR_INFO(szDetMatName)
-VAR_INFO(arrTextureId)
-VAR_INFO(nPhysSurfaceType)
-VAR_INFO(szBaseTexName)
-VAR_INFO(fUseRemeshing)
-VAR_INFO(layerFilterColor)
-VAR_INFO(nLayerId)
-VAR_INFO(fBr)
-STRUCT_INFO_END(SImageInfo)
diff --git a/Code/CryEngine/Cry3DEngine/Cry3DEngine.rc b/Code/CryEngine/Cry3DEngine/Cry3DEngine.rc
deleted file mode 100644
index 5730d0a537..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry3DEngine.rc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000904b0"
-        BEGIN
-            VALUE "CompanyName", "Amazon.com, Inc."
-            VALUE "FileVersion", "1, 0, 0, 1"
-            VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
-            VALUE "ProductName", "Lumberyard"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x9, 1200
-    END
-END
-
-#endif    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Code/CryEngine/Cry3DEngine/Cry3DEngineBase.cpp b/Code/CryEngine/Cry3DEngine/Cry3DEngineBase.cpp
deleted file mode 100644
index 9ff585b716..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry3DEngineBase.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Cry3DEngine_precompiled.h"
-#include <Cry3DEngineBase.h>
-
-#define MAX_ERROR_STRING MAX_WARNING_LENGTH
-
-//////////////////////////////////////////////////////////////////////////
-void Cry3DEngineBase::PrintComment(const char* szText, ...)
-{
-    if (!szText)
-    {
-        return;
-    }
-
-    va_list args;
-    va_start(args, szText);
-    GetLog()->LogV(IMiniLog::eComment, szText, args);
-    va_end(args);
-}
-
-void Cry3DEngineBase::PrintMessage(const char* szText, ...)
-{
-    if (!szText)
-    {
-        return;
-    }
-
-    va_list args;
-    va_start(args, szText);
-    GetLog()->LogV(GetCVars()->e_3dEngineLogAlways ? IMiniLog::eAlways : IMiniLog::eMessage, szText, args);
-    va_end(args);
-
-    GetLog()->UpdateLoadingScreen(0);
-}
-
-void Cry3DEngineBase::PrintMessagePlus(const char* szText, ...)
-{
-    if (!szText)
-    {
-        return;
-    }
-
-    va_list arglist;
-    char buf[MAX_ERROR_STRING];
-    va_start(arglist, szText);
-    int count = azvsnprintf(buf, sizeof(buf), szText, arglist);
-    if (count == -1 || count >= sizeof(buf))
-    {
-        buf[sizeof(buf) - 1] = '\0';
-    }
-    va_end(arglist);
-    GetLog()->LogPlus(buf);
-
-    GetLog()->UpdateLoadingScreen(0);
-}
-
-float Cry3DEngineBase::GetCurTimeSec()
-{
-    return (gEnv->pTimer->GetCurrTime());
-}
-
-float Cry3DEngineBase::GetCurAsyncTimeSec()
-{
-    return (gEnv->pTimer->GetAsyncTime().GetSeconds());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Cry3DEngineBase::Warning(const char* format, ...)
-{
-    if (!format)
-    {
-        return;
-    }
-
-    va_list args;
-    va_start(args, format);
-    // Call to validating warning of system.
-    m_pSystem->WarningV(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, 0, 0, format, args);
-    va_end(args);
-
-    GetLog()->UpdateLoadingScreen(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Cry3DEngineBase::Error(const char* format, ...)
-{
-    //  assert(!"Cry3DEngineBase::Error");
-    if (format)
-    {
-        va_list args;
-        va_start(args, format);
-        // Call to validating warning of system.
-        m_pSystem->WarningV(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, 0, 0, format, args);
-        va_end(args);
-    }
-
-    GetLog()->UpdateLoadingScreen(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Cry3DEngineBase::FileWarning(int flags, const char* file, const char* format, ...)
-{
-    if (format)
-    {
-        va_list args;
-        va_start(args, format);
-        // Call to validating warning of system.
-        m_pSystem->WarningV(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, flags | VALIDATOR_FLAG_FILE, file, format, args);
-        va_end(args);
-    }
-
-    GetLog()->UpdateLoadingScreen(0);
-}
-
-_smart_ptr<IMaterial> Cry3DEngineBase::MakeSystemMaterialFromShader(const char* sShaderName, SInputShaderResources* Res)
-{
-    _smart_ptr<IMaterial> pMat = Get3DEngine()->GetMaterialManager()->CreateMaterial(sShaderName);
-    //pMat->AddRef();
-    SShaderItem si;
-
-    si = GetRenderer()->EF_LoadShaderItem(sShaderName, true, 0, Res);
-
-    pMat->AssignShaderItem(si);
-    return pMat;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Cry3DEngineBase::IsValidFile(const char* sFilename)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    return gEnv->pCryPak->IsFileExist(sFilename);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Cry3DEngineBase::IsResourceLocked(const char* sFilename)
-{
-    auto pResList = GetPak()->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel);
-    if (pResList)
-    {
-        return pResList->IsExist(sFilename);
-    }
-    return false;
-}
-
-void Cry3DEngineBase::DrawBBoxLabeled(const AABB& aabb, const Matrix34& m34, const ColorB& col, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    char szText[256];
-    vsnprintf_s(szText, sizeof(szText), sizeof(szText) - 1, format, args);
-    float fColor[4] = { col[0] / 255.f, col[1] / 255.f, col[2] / 255.f, col[3] / 255.f };
-    GetRenderer()->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    GetRenderer()->DrawLabelEx(m34.TransformPoint(aabb.GetCenter()), 1.3f, fColor, true, true, szText);
-    GetRenderer()->GetIRenderAuxGeom()->DrawAABB(aabb, m34, false, col, eBBD_Faceted);
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Cry3DEngineBase::DrawBBox(const Vec3& vMin, const Vec3& vMax, ColorB col)
-{
-    GetRenderer()->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    GetRenderer()->GetIRenderAuxGeom()->DrawAABB(AABB(vMin, vMax), false, col, eBBD_Faceted);
-}
-
-void Cry3DEngineBase::DrawBBox(const AABB& box, ColorB col)
-{
-    GetRenderer()->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    GetRenderer()->GetIRenderAuxGeom()->DrawAABB(box, false, col, eBBD_Faceted);
-}
-
-void Cry3DEngineBase::DrawLine(const Vec3& vMin, const Vec3& vMax, ColorB col)
-{
-    GetRenderer()->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    GetRenderer()->GetIRenderAuxGeom()->DrawLine(vMin, col, vMax, col);
-}
-
-void Cry3DEngineBase::DrawSphere(const Vec3& vPos, float fRadius, ColorB color)
-{
-    GetRenderer()->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    GetRenderer()->GetIRenderAuxGeom()->DrawSphere(vPos, fRadius, color);
-}
-
-void Cry3DEngineBase::DrawQuad(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, ColorB color)
-{
-    GetRenderer()->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    GetRenderer()->GetIRenderAuxGeom()->DrawTriangle(v0, color, v2, color, v3, color);
-    GetRenderer()->GetIRenderAuxGeom()->DrawTriangle(v0, color, v1, color, v2, color);
-}
-
-// Check if preloading is enabled.
-bool Cry3DEngineBase::IsPreloadEnabled()
-{
-    bool bPreload = false;
-    ICVar* pSysPreload = GetConsole()->GetCVar("sys_preload");
-    if (pSysPreload && pSysPreload->GetIVal() != 0)
-    {
-        bPreload = true;
-    }
-
-    return bPreload;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Cry3DEngineBase::CheckMinSpec(uint32 nMinSpec)
-{
-    if ((int)nMinSpec != 0 && GetCVars()->e_ObjQuality != 0 && (int)nMinSpec > GetCVars()->e_ObjQuality)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool Cry3DEngineBase::IsEscapePressed()
-{
-#ifdef WIN32
-    if (Cry3DEngineBase::m_bEditor && (CryGetAsyncKeyState(0x03) & 1)) // Ctrl+Break
-    {
-        Get3DEngine()->PrintMessage("*** Ctrl-Break was pressed - operation aborted ***");
-        return true;
-    }
-#endif
-    return false;
-}
diff --git a/Code/CryEngine/Cry3DEngine/Cry3DEngineBase.h b/Code/CryEngine/Cry3DEngine/Cry3DEngineBase.h
deleted file mode 100644
index 9ce248f642..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry3DEngineBase.h
+++ /dev/null
@@ -1,202 +0,0 @@
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Access to external stuff used by 3d engine. Most 3d engine classes
-//               are derived from this base class to access other interfaces
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CRY3DENGINEBASE_H
-#define CRYINCLUDE_CRY3DENGINE_CRY3DENGINEBASE_H
-#pragma once
-
-#include "3DEngineMemory.h"
-
-struct ISystem;
-struct IRenderer;
-struct ILog;
-struct ITimer;
-struct IConsole;
-struct I3DEngine;
-struct IObjManager;
-struct CVars;
-struct CVisAreaManager;
-
-class COcean;
-class C3DEngine;
-class CParticleManager;
-class CDecalManager;
-class CRainManager;
-class CCloudsManager;
-class CSkyLightManager;
-class CRenderMeshMerger;
-class CMergedMeshesManager;
-class CGeomCacheManager;
-class CBreezeGenerator;
-class CMatMan;
-class CClipVolumeManager;
-
-namespace AZ::IO
-{
-    struct IArchive;
-}
-
-#define DISTANCE_TO_THE_SUN 1000000
-
-#if !defined(_RELEASE)
-#define OBJMAN_STREAM_STATS
-#endif
-
-struct Cry3DEngineBase
-{
-    static ISystem* m_pSystem;
-    static IRenderer* m_pRenderer;
-    static ITimer* m_pTimer;
-    static ILog* m_pLog;
-    static ::IConsole* m_pConsole;
-    static C3DEngine* m_p3DEngine;
-    static CVars* m_pCVars;
-    static AZ::IO::IArchive* m_pCryPak;
-    static CObjManager* m_pObjManager;
-    static COcean* m_pOcean;
-    static IOpticsManager* m_pOpticsManager;
-    static CDecalManager* m_pDecalManager;
-    static CCloudsManager* m_pCloudsManager;
-    static CVisAreaManager* m_pVisAreaManager;
-    static CClipVolumeManager* m_pClipVolumeManager;
-    static CMatMan* m_pMatMan;
-    static CSkyLightManager* m_pSkyLightManager;
-    static CRenderMeshMerger* m_pRenderMeshMerger;
-    static IStreamedObjectListener* m_pStreamListener;
-#if defined(USE_GEOM_CACHES)
-    static CGeomCacheManager* m_pGeomCacheManager;
-#endif
-
-    static float m_fInvDissolveDistBand;
-    static threadID m_nMainThreadId;
-    static bool m_bLevelLoadingInProgress;
-    static bool m_bIsInRenderScene;
-    static bool m_bAsyncOctreeUpdates;
-    static bool m_bRenderTypeEnabled[eERType_TypesNum];
-
-    static int m_CpuFlags;
-    static ESystemConfigSpec m_LightConfigSpec;
-#if defined(CONSOLE)
-    static const bool m_bEditor = false;
-#else
-    static bool m_bEditor;
-#endif
-    static int m_arrInstancesCounter[eERType_TypesNum];
-
-    // components access
-    ILINE static ISystem* GetSystem() { return m_pSystem; }
-    ILINE static IRenderer* GetRenderer() { return m_pRenderer; }
-    ILINE static ITimer* GetTimer() { return m_pTimer; }
-    ILINE static ILog* GetLog() { return m_pLog; }
-
-    inline static ::IConsole* GetConsole() { return m_pConsole; }
-    inline static C3DEngine* Get3DEngine() { return m_p3DEngine; }
-    inline static CObjManager* GetObjManager() { return m_pObjManager; };
-
-    inline static COcean* GetOcean() { return m_pOcean; };
-    inline static CVars* GetCVars() { return m_pCVars; }
-    inline static CVisAreaManager* GetVisAreaManager() { return m_pVisAreaManager; }
-    inline static AZ::IO::IArchive* GetPak() { return m_pCryPak; }
-    inline static CMatMan* GetMatMan() { return m_pMatMan; }
-    inline static CCloudsManager* GetCloudsManager() { return m_pCloudsManager; }
-    inline static CRenderMeshMerger* GetSharedRenderMeshMerger() { return m_pRenderMeshMerger; };
-    inline static CTemporaryPool* GetTemporaryPool() { return CTemporaryPool::Get(); };
-
-#if defined(USE_GEOM_CACHES)
-    inline static CGeomCacheManager* GetGeomCacheManager() { return m_pGeomCacheManager; };
-#endif
-
-    ILINE static bool                               IsRenderNodeTypeEnabled(EERType rnType) { return m_bRenderTypeEnabled[(int)rnType]; }
-    ILINE static void                               SetRenderNodeTypeEnabled(EERType rnType, bool bEnabled) {m_bRenderTypeEnabled[(int)rnType] = bEnabled; }
-
-    inline static int GetDefSID() { return DEFAULT_SID; };
-
-    float GetCurTimeSec();
-    float GetCurAsyncTimeSec();
-
-    static void PrintMessage(const char* szText, ...) PRINTF_PARAMS(1, 2);
-    static void PrintMessagePlus(const char* szText, ...) PRINTF_PARAMS(1, 2);
-    static void PrintComment(const char* szText, ...) PRINTF_PARAMS(1, 2);
-
-    // Validator warning.
-    static void Warning(const char* format, ...) PRINTF_PARAMS(1, 2);
-    static void Error(const char* format, ...) PRINTF_PARAMS(1, 2);
-    static void FileWarning(int flags, const char* file, const char* format, ...)
-    PRINTF_PARAMS(3, 4);
-
-    CRenderObject* GetIdentityCRenderObject(int nThreadID)
-    {
-        CRenderObject* pCRenderObject = GetRenderer()->EF_GetObject_Temp(nThreadID);
-        if (!pCRenderObject)
-        {
-            return NULL;
-        }
-        pCRenderObject->m_II.m_Matrix.SetIdentity();
-        return pCRenderObject;
-    }
-
-    static bool IsValidFile(const char* sFilename);
-    static bool IsResourceLocked(const char* sFilename);
-
-    static bool IsPreloadEnabled();
-
-    _smart_ptr<IMaterial> MakeSystemMaterialFromShader(const char* sShaderName, SInputShaderResources* Res = NULL);
-    void DrawBBoxLabeled(const AABB& aabb, const Matrix34& m34, const ColorB& col, const char* format, ...) PRINTF_PARAMS(5, 6);
-    void DrawBBox(const Vec3& vMin, const Vec3& vMax, ColorB col = Col_White);
-    void DrawBBox(const AABB& box, ColorB col = Col_White);
-    void DrawLine(const Vec3& vMin, const Vec3& vMax, ColorB col = Col_White);
-    void DrawSphere(const Vec3& vPos, float fRadius, ColorB color = ColorB(255, 255, 255, 255));
-    void DrawQuad(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, ColorB color);
-
-    int& GetInstCount(EERType eType) { return m_arrInstancesCounter[eType]; }
-
-    uint32 GetMinSpecFromRenderNodeFlags(uint32 dwRndFlags) const { return (dwRndFlags & ERF_SPEC_BITS_MASK) >> ERF_SPEC_BITS_SHIFT; }
-    static bool CheckMinSpec(uint32 nMinSpec);
-
-    static bool IsEscapePressed();
-
-    size_t fread(
-        void* buffer,
-        size_t elementSize,
-        size_t count,
-        FILE* stream)
-    {
-        size_t res = ::fread(buffer, elementSize, count, stream);
-        if (res != count)
-        {
-            Error("fread() failed");
-        }
-        return res;
-    }
-
-    int fseek (
-        FILE* stream,
-        long offset,
-        int whence
-        )
-    {
-        int res = ::fseek(stream, offset, whence);
-        if (res != 0)
-        {
-            Error("fseek() failed");
-        }
-        return res;
-    }
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_CRY3DENGINEBASE_H
diff --git a/Code/CryEngine/Cry3DEngine/Cry3DEngineTraits.h b/Code/CryEngine/Cry3DEngine/Cry3DEngineTraits.h
deleted file mode 100644
index ed7563b572..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry3DEngineTraits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include "ProjectDefines.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(Cry3DEngineTraits_h)
-#else
-#if defined(WIN32) || defined(WIN64)
-#define AZ_LEGACY_3DENGINE_TRAIT_DEFINE_MM_MULLO_EPI32_EMU 1
-#endif
-#if defined(WIN32) || defined(WIN64)
-#define AZ_LEGACY_3DENGINE_TRAIT_DO_EXTRA_GEOMCACHE_PROCESSING 1 // probably needs a better name
-#endif
-#define AZ_LEGACY_3DENGINE_TRAIT_HAS_MM_CVTEPI16_EPI32 0
-#define AZ_LEGACY_3DENGINE_TRAIT_HAS_MM_MULLO_EPI32 0
-#define AZ_LEGACY_3DENGINE_TRAIT_HAS_MM_PACKUS_EPI32 0
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(MAC)
-#define AZ_LEGACY_3DENGINE_TRAIT_HAS_SSE 1
-#endif
-#define AZ_LEGACY_3DENGINE_TRAIT_UNROLL_GEOMETRY_BACKING_LOOPS 1
-#if defined(APPLE) || defined(LINUX)
-#define AZ_LEGACY_3DENGINE_TRAIT_DISABLE_MMRM_SSE_INSTRUCTIONS 1
-#endif
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/Cry3DEngine_precompiled.cpp b/Code/CryEngine/Cry3DEngine/Cry3DEngine_precompiled.cpp
deleted file mode 100644
index f238d8963e..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry3DEngine_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
diff --git a/Code/CryEngine/Cry3DEngine/Cry3DEngine_precompiled.h b/Code/CryEngine/Cry3DEngine/Cry3DEngine_precompiled.h
deleted file mode 100644
index 42226bb513..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry3DEngine_precompiled.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-const int nThreadsNum = 3;
-
-#include <platform.h>
-
-#include <vector>
-//#define DEFINE_MODULE_NAME "Cry3DEngine"
-//#define FORCE_STANDARD_ASSERT // fix edit and continue
-
-#if defined(WIN64)
-#define CRY_INTEGRATE_DX12
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-// Highlevel defines
-
-// deferred cull queue handling - currently disabled
-// #define USE_CULL_QUEUE
-
-// Compilation (Export to Engine) not needed on consoles
-#if defined(CONSOLE)
-# define ENGINE_ENABLE_COMPILATION 0
-#else
-# define ENGINE_ENABLE_COMPILATION 1
-#endif
-
-#include <stdio.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Casting/lossy_cast.h>
-
-#define MAX_PATH_LENGTH 512
-
-#include <ITimer.h>
-#include <IProcess.h>
-#include <Cry_Math.h>
-#include <Cry_Camera.h>
-#include <Cry_XOptimise.h>
-#include <Cry_Geo.h>
-#include <ILog.h>
-#include <ISystem.h>
-#include <IConsole.h>
-#include <IPhysics.h>
-#include <IRenderer.h>
-#include <IRenderAuxGeom.h>
-#include <IEntityRenderState.h>
-#include <StackContainer.h>
-#include <I3DEngine.h>
-#include <CryFile.h>
-#include <smartptr.h>
-#include <CryArray.h>
-#include <CryHeaders.h>
-#include "Cry3DEngineBase.h"
-#include <float.h>
-#include "CryArray.h"
-#include "cvars.h"
-#include <CrySizer.h>
-#include <StlUtils.h>
-#include <CryArray2d.h>
-#include "Material.h"
-#include "3dEngine.h"
-#include "ObjMan.h"
-
-#include <ISerialize.h>
-#include "BasicArea.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-#include "ObjectsTree.h"
-
-inline int snprintf(char* buf, int size, const char* format, ...)
-{
-    va_list arglist;
-    va_start(arglist, format);
-    int res = azvsnprintf(buf, size, format, arglist);
-    va_end(arglist);
-    return res;
-}
-
-template <class T>
-void AddToPtr(byte*& pPtr, T& rObj, EEndian eEndian)
-{
-    PREFAST_SUPPRESS_WARNING(6326) COMPILE_TIME_ASSERT(((sizeof(T) % 4) == 0));
-    assert(!((INT_PTR)pPtr & 3));
-    memcpy(pPtr, &rObj, sizeof(rObj));
-    SwapEndian(*(T*)pPtr, eEndian);
-    pPtr += sizeof(rObj);
-    assert(!((INT_PTR)pPtr & 3));
-}
-
-template <class T>
-void AddToPtr(byte*& pPtr, int& nDataSize, T& rObj, EEndian eEndian)
-{
-    PREFAST_SUPPRESS_WARNING(6326) COMPILE_TIME_ASSERT(((sizeof(T) % 4) == 0));
-    assert(!((INT_PTR)pPtr & 3));
-    memcpy(pPtr, &rObj, sizeof(rObj));
-    SwapEndian(*(T*)pPtr, eEndian);
-    pPtr += sizeof(rObj);
-    nDataSize -= sizeof(rObj);
-    assert(nDataSize >= 0);
-    assert(!((INT_PTR)pPtr & 3));
-}
-
-
-inline void FixAlignment(byte*& pPtr, int& nDataSize)
-{
-    while ((UINT_PTR)pPtr & 3)
-    {
-        *pPtr = 222;
-        pPtr++;
-        nDataSize--;
-    }
-}
-
-inline void FixAlignment(byte*& pPtr)
-{
-    while ((UINT_PTR)pPtr & 3)
-    {
-        *pPtr = 222;
-        pPtr++;
-    }
-}
-
-template <class T>
-void AddToPtr(byte*& pPtr, int& nDataSize, const T* pArray, int nElemNum, EEndian eEndian, bool bFixAlignment = false)
-{
-    assert(!((INT_PTR)pPtr & 3));
-    memcpy(pPtr, pArray, nElemNum * sizeof(T));
-    SwapEndian((T*)pPtr, nElemNum, eEndian);
-    pPtr += nElemNum * sizeof(T);
-    nDataSize -= nElemNum * sizeof(T);
-    assert(nDataSize >= 0);
-
-    if (bFixAlignment)
-    {
-        FixAlignment(pPtr, nDataSize);
-    }
-    else
-    {
-        assert(!((INT_PTR)pPtr & 3));
-    }
-}
-
-template <class T>
-void AddToPtr(byte*& pPtr, const T* pArray, int nElemNum, EEndian eEndian, bool bFixAlignment = false)
-{
-    assert(!((INT_PTR)pPtr & 3));
-    memcpy(pPtr, pArray, nElemNum * sizeof(T));
-    SwapEndian((T*)pPtr, nElemNum, eEndian);
-    pPtr += nElemNum * sizeof(T);
-
-    if (bFixAlignment)
-    {
-        FixAlignment(pPtr);
-    }
-    else
-    {
-        assert(!((INT_PTR)pPtr & 3));
-    }
-}
-
-struct TriangleIndex
-{
-    TriangleIndex() { ZeroStruct(*this); }
-    uint16& operator [] (const int& n) { assert(n >= 0 && n < 3); return idx[n]; }
-    const uint16& operator [] (const int& n) const { assert(n >= 0 && n < 3); return idx[n]; }
-    uint16 idx[3];
-    uint16 nCull;
-};
-
-    #define FUNCTION_PROFILER_3DENGINE FUNCTION_PROFILER(gEnv->pSystem, PROFILE_3DENGINE)
-    #define FUNCTION_PROFILER_3DENGINE_LEGACYONLY FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_3DENGINE)
-
-
diff --git a/Code/CryEngine/Cry3DEngine/Cry_LegacyPhysUtils.cpp b/Code/CryEngine/Cry3DEngine/Cry_LegacyPhysUtils.cpp
deleted file mode 100644
index 7a85244397..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry_LegacyPhysUtils.cpp
+++ /dev/null
@@ -1,990 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry3DEngine/Cry_LegacyPhysUtils.h>
-
-namespace LegacyCryPhysicsUtils
-{
-    namespace qhull_IMPL
-    {
-        static int __qhullcalled = 0;
-
-        int qhull(strided_pointer<Vec3> _pts, int npts, index_t*& pTris, qhullmalloc qmalloc)
-        {
-#if defined(PLATFORM_64BIT)
-            static ptitem ptbuf[4096];
-            static qhtritem trbuf[4096];
-            static qhtritem* tmparr_ptr_buf[2048];
-            static int tmparr_idx_buf[2048];
-#else
-            static ptitem ptbuf[1024];
-            static qhtritem trbuf[1024];
-            static qhtritem* tmparr_ptr_buf[512];
-            static int tmparr_idx_buf[512];
-#endif
-            static volatile int g_lockQhull;
-            int iter = 0, maxiter = 0;
-            __qhullcalled++;
-            strided_pointer<Vec3mem> pts = strided_pointer<Vec3mem>((Vec3mem*)_pts.data, _pts.iStride);
-
-            ptitem* pt, * ptmax, * ptdeleted, * ptlist = npts > sizeof(ptbuf) / sizeof(ptbuf[0]) ? new ptitem[npts] : ptbuf;
-            qhtritem* tr, * trnext, * trend, * trnew, * trdata = trbuf, * trstart = 0, * trlast, * trbest = nullptr;
-            int i, j, k, ti, trdatasz = sizeof(trbuf) / sizeof(trbuf[0]), bidx[6], n, next_iter, delbuds;
-            qhtritem** tmparr_ptr = tmparr_ptr_buf;
-            int* tmparr_idx = tmparr_idx_buf, tmparr_sz = 512;
-            float dist, maxdist /*,e*/;
-            Vec3 pmin(VMAX), pmax(VMIN);
-            WriteLock lock(g_lockQhull);
-
-            // select points for initial tetrahedron
-            // first, find 6 points corresponding to min and max coordinates
-            for (i = 1; i < npts; i++)
-            {
-                if (pts[i].x > pmax.x)
-                {
-                    pmax.x = pts[i].x;
-                    bidx[0] = i;
-                }
-                if (pts[i].x < pmin.x)
-                {
-                    pmin.x = pts[i].x;
-                    bidx[1] = i;
-                }
-                if (pts[i].y > pmax.y)
-                {
-                    pmax.y = pts[i].y;
-                    bidx[2] = i;
-                }
-                if (pts[i].y < pmin.y)
-                {
-                    pmin.y = pts[i].y;
-                    bidx[3] = i;
-                }
-                if (pts[i].z > pmax.z)
-                {
-                    pmax.z = pts[i].z;
-                    bidx[4] = i;
-                }
-                if (pts[i].z < pmin.z)
-                {
-                    pmin.z = pts[i].z;
-                    bidx[5] = i;
-                }
-            }
-            //  e = max(max(pmax.x-pmin.x,pmax.y-pmin.y),pmax.z-pmin.z)*0.01f;
-
-            for (bidx[0] = 0, i = 1; i < npts; i++)
-            {
-                bidx[0] += i - bidx[0] & -isneg(pts[i].x - pts[bidx[0]].x);
-            }
-            for (bidx[1] = 0, i = 1; i < npts; i++)
-            {
-                bidx[1] += i - bidx[1] & -isneg((pts[bidx[1]] - pts[bidx[0]]).len2() - (pts[i] - pts[bidx[0]]).len2());
-            }
-            Vec3 norm = pts[bidx[1]] - pts[bidx[0]];
-            for (bidx[2] = 0, i = 1; i < npts; i++)
-            {
-                bidx[2] += i - bidx[2] & -isneg((norm ^ pts[bidx[2]] - pts[bidx[0]]).len2() - (norm ^ pts[i] - pts[bidx[0]]).len2());
-            }
-            norm = pts[bidx[1]] - pts[bidx[0]] ^ pts[bidx[2]] - pts[bidx[0]];
-            for (bidx[3] = 0, i = 1; i < npts; i++)
-            {
-                bidx[3] += i - bidx[3] & -isneg(fabs_tpl((pts[bidx[3]] - pts[bidx[0]]) * norm) - fabs_tpl((pts[i] - pts[bidx[0]]) * norm));
-            }
-            if ((pts[bidx[3]] - pts[bidx[0]]) * norm > 0)
-            {
-                i = bidx[1];
-                bidx[1] = bidx[2];
-                bidx[2] = i;
-            }
-
-            // build a double linked list from all points
-            for (i = 0; i < npts; i++)
-            {
-                ptlist[i].prev = ptlist + i - 1;
-                ptlist[i].next = ptlist + i + 1;
-            }
-            ptlist[0].prev = ptlist + npts - 1;
-            ptlist[npts - 1].next = ptlist;
-            // remove selected points from the list
-            for (i = 0; i < 4; i++)
-            {
-                delete_item_from_list(ptlist + bidx[i]);
-            }
-            // assign 3 points to each of 4 initial triangles
-            for (i = 0; i < 4; i++)
-            {
-                for (j = k = 0; j < 4; j++)
-                {
-                    if (j != i)
-                    {
-                        trbuf[i].idx[k++] = bidx[j];     // skip i.th point in i.th triangle
-                    }
-                }
-                trbuf[i].n = pts[trbuf[i].idx[1]] - pts[trbuf[i].idx[0]] ^ pts[trbuf[i].idx[2]] - pts[trbuf[i].idx[0]];
-                trbuf[i].pt0 = pts[trbuf[i].idx[0]];
-                if (e_cansee(pts[bidx[i]] - trbuf[i].pt0, trbuf[i].n, 0)) // flip the orientation so that ccw normal points outwards
-                {
-                    ti = trbuf[i].idx[0];
-                    trbuf[i].idx[0] = trbuf[i].idx[2];
-                    trbuf[i].idx[2] = ti;
-                    trbuf[i].n = -trbuf[i].n;
-                }
-                trbuf[i].ptassoc = 0;
-                trbuf[i].deleted = 0;
-                add_item_to_list(trstart, trbuf + i);
-            }
-            // fill buddy links for each triangle
-            for (i = 0; i < 4; i++)
-            {
-                for (j = 0; j < 4; j++)
-                {
-                    if (j != i)
-                    {
-                        for (k = 0; k < 3; k++)
-                        {
-                            for (ti = 0; ti < 3; ti++)
-                            {
-                                if (trbuf[i].idx[k] == trbuf[j].idx[ti] && trbuf[i].idx[k == 2 ? 0 : k + 1] == trbuf[j].idx[ti == 0 ? 2 : ti - 1])
-                                {
-                                    trbuf[i].buddy[k] = trbuf + j;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            trend = trstart + 4;
-            for (i = 0; i < 4; i++)
-            {
-                if (trbuf[i].n.len2() < 1E-6f)
-                {
-#ifdef _DEBUG
-                    //OutputDebugString("WARNING: convex hull not computed because of degenerate initial triangles\n");
-#endif
-                    n = 0;
-                    goto endqhull;  // some degenerate case, don't party with it
-                }
-            }
-            // associate points with one of the initial triangles
-            for (i = 0; i < npts; i++)
-            {
-                if (ptlist[i].next)
-                {
-                    break;
-                }
-            }
-            associate_ptlist_with_trilist(ptlist + i, trstart, ptlist, pts);
-
-#define DELETE_TRI(ptri) {                                \
-        merge_lists(ptdeleted, (ptri)->ptassoc);          \
-        if ((ptri) == trstart) {trstart = (ptri)->next; } \
-        if ((ptri) == trnext) {trnext = (ptri)->next; }   \
-        delete_item_from_list(ptri); (ptri)->deleted = 1; }
-
-
-            // main loop
-            iter = 0;
-            maxiter = npts * npts * 2;
-            ptmax = trstart->ptassoc;
-            tr = trstart;
-            do
-            {
-                trnext = tr->next;
-                pt = tr->ptassoc;
-                if (pt)
-                {
-                    // find the fartherst of the associated with the triangle points
-                    maxdist = -1E37f;
-                    do
-                    {
-                        if ((dist = pts[(int)(pt - ptlist)] * tr->n) > maxdist)
-                        {
-                            maxdist = dist;
-                            ptmax = pt;
-                        }
-                        pt = pt->next;
-                    } while (pt != tr->ptassoc);
-                    ptdeleted = 0;
-                    if (tr->ptassoc == ptmax)
-                    {
-                        tr->ptassoc = ptmax->next;
-                    }
-                    delete_item_from_list(ptmax);
-                    if (tr->ptassoc == ptmax)
-                    {
-                        tr->ptassoc = 0;
-                    }
-
-                    // find the triangle that the point can see "most confidently"
-                    tr = trstart;
-                    trlast = tr->prev;
-                    ti = static_cast<int>(ptmax - ptlist);
-                    maxdist = -1E37f;
-                    do
-                    {
-                        trnext = tr->next;
-                        if ((pts[ti] - tr->pt0) * tr->n > maxdist)
-                        {
-                            maxdist = (pts[ti] - tr->pt0) * tr->n;
-                            trbest = tr;
-                        }
-                        if (tr == trlast)
-                        {
-                            break;
-                        }
-                        tr = trnext;
-                    } while (true);
-
-                    // "flood fill" triangles that the point can see around that one
-                    DELETE_TRI(trbest)
-                        tr = trbest->next = trbest->prev = trbest;
-                    do
-                    {
-                        if (tr->buddy[0] && !tr->buddy[0]->deleted && e_cansee(pts[ti] - tr->buddy[0]->pt0, tr->buddy[0]->n, 0))
-                        {
-                            DELETE_TRI(tr->buddy[0])
-                                add_item_to_list(tr, tr->buddy[0]);
-                        }
-                        if (tr->buddy[1] && !tr->buddy[1]->deleted && e_cansee(pts[ti] - tr->buddy[1]->pt0, tr->buddy[1]->n, 0))
-                        {
-                            DELETE_TRI(tr->buddy[1])
-                                add_item_to_list(tr, tr->buddy[1]);
-                        }
-                        if (tr->buddy[2] && !tr->buddy[2]->deleted && e_cansee(pts[ti] - tr->buddy[2]->pt0, tr->buddy[2]->n, 0))
-                        {
-                            DELETE_TRI(tr->buddy[2])
-                                add_item_to_list(tr, tr->buddy[2]);
-                        }
-                        tr = tr->next;
-                    } while (tr != trbest);
-
-                    // delete near-visible triangles around deleted area edges to preserve hole convexity
-                    // do as many iterations as needed
-                    do
-                    {
-                        tr = trstart;
-                        trlast = tr->prev;
-                        next_iter = 0;
-                        do
-                        {
-                            trnext = tr->next;
-                            if (e_cansee(pts[ti] - tr->pt0, tr->n, -0.001f))
-                            {
-                                delbuds = tr->buddy[0]->deleted + tr->buddy[1]->deleted + tr->buddy[2]->deleted;
-                                if (delbuds >= 2)   // delete triangles that have 2+ buddies deleted
-                                {
-                                    if (tr == trlast)
-                                    {
-                                        trlast = tr->next;
-                                    }
-                                    DELETE_TRI(tr);
-                                    next_iter = 1;
-                                }
-                                else if (delbuds == 1)   // follow triangle fan around both shared edge ends
-                                {
-                                    int bi, bi0, bi1, nfantris, fandir;
-                                    qhtritem* fantris[64], * tr1;
-
-                                    for (bi0 = 0; bi0 < 3 && !tr->buddy[bi0]->deleted; bi0++)
-                                    {
-                                        ;                                                 // bi0 - deleted buddy index
-                                    }
-                                    for (fandir = -1; fandir <= 1; fandir += 2) // follow fans in 2 possible directions
-                                    {
-                                        tr1 = tr;
-                                        bi1 = bi0;
-                                        nfantris = 0;
-                                        do
-                                        {
-                                            if (nfantris == 64)
-                                            {
-                                                break;
-                                            }
-                                            bi = bi1 + fandir;
-                                            if (bi > 2)
-                                            {
-                                                bi -= 3;
-                                            }
-                                            if (bi < 0)
-                                            {
-                                                bi += 3;
-                                            }
-                                            for (bi1 = 0; bi1 < 3 && tr1->buddy[bi]->buddy[bi1] != tr1; bi1++)
-                                            {
-                                                ;
-                                            }
-                                            fantris[nfantris++] = tr1; // store this triangle in a temporary fan list
-                                            tr1 = tr1->buddy[bi];
-                                            bi = bi1;                   // go to the next fan triangle
-                                            if (!e_cansee(pts[ti] - tr1->pt0, tr1->n, -0.002f))
-                                            {
-                                                break; // discard this fan
-                                            }
-                                            if (tr1->deleted)
-                                            {
-                                                if (tr1 != tr->buddy[bi0])
-                                                {
-                                                    // delete fan only if it ended on _another_ deleted triangle
-                                                    for (--nfantris; nfantris >= 0; nfantris--)
-                                                    {
-                                                        if (fantris[nfantris] == trlast)
-                                                        {
-                                                            trlast = fantris[nfantris]->next;
-                                                        }
-                                                        DELETE_TRI(fantris[nfantris])
-                                                    }
-                                                    next_iter = 1;
-                                                }
-                                                break;     // fan end
-                                            }
-                                        } while (true);
-                                    }
-                                }
-                            }
-                            if (tr == trlast)
-                            {
-                                break;
-                            }
-                            tr = trnext;
-                        } while (tr);
-                    } while (next_iter && trstart);
-
-                    if (!trstart || trstart->deleted)
-                    {
-                        n = 0;
-                        goto endqhull;
-                    }
-
-                    // find triangles that shared an edge with deleted triangles
-                    trnew = 0;
-                    tr = trstart;
-                    do
-                    {
-                        for (i = 0; i < 3; i++)
-                        {
-                            if (tr->buddy[i]->deleted)
-                            {
-                                // create a new triangle
-                                if (trend >= trdata + trdatasz)
-                                {
-                                    qhtritem* trdata_new = new qhtritem[trdatasz += 256];
-                                    memcpy(trdata_new, trdata, (trend - trdata) * sizeof(qhtritem));
-                                    intptr_t diff = (intptr_t)trdata_new - (intptr_t)trdata;
-                                    for (n = 0; n < trdatasz - 256; n++)
-                                    {
-                                        relocate_tritem(trdata_new + n, diff);
-                                    }
-                                    relocate_ptritem(trend, diff);
-                                    relocate_ptritem(trstart, diff);
-                                    relocate_ptritem(trnext, diff);
-                                    relocate_ptritem(tr, diff);
-                                    relocate_ptritem(trbest, diff);
-                                    relocate_ptritem(trnew, diff);
-                                    if (trdata != trbuf)
-                                    {
-                                        delete[] trdata;
-                                    }
-                                    trdata = trdata_new;
-                                }
-                                trend->idx[0] = static_cast<int>(ptmax - ptlist);
-                                trend->idx[1] = tr->idx[i == 2 ? 0 : i + 1];
-                                trend->idx[2] = tr->idx[i];
-                                trend->ptassoc = 0;
-                                trend->deleted = 0;
-                                trend->n = pts[trend->idx[1]] - pts[trend->idx[0]] ^ pts[trend->idx[2]] - pts[trend->idx[0]];
-                                trend->pt0 = pts[trend->idx[0]];
-                                trend->buddy[1] = tr;
-                                tr->buddy[i] = trend;
-                                trend->buddy[0] = trend->buddy[2] = 0;
-                                add_item_to_list(trnew, trend++);
-                            }
-                        }
-                        tr = tr->next;
-                    } while (tr != trstart);
-
-                    // sort pointers to the new triangles by their 2nd vertex index
-                    n = static_cast<int>(trend - trnew);
-                    if (tmparr_sz < n)
-                    {
-                        if (tmparr_idx != tmparr_idx_buf)
-                        {
-                            delete[] tmparr_idx;
-                        }
-                        if (tmparr_ptr != tmparr_ptr_buf)
-                        {
-                            delete[] tmparr_ptr;
-                        }
-                        tmparr_idx = new int[n];
-                        tmparr_ptr = new qhtritem * [n];
-                    }
-                    for (tr = trnew, i = 0; tr < trend; tr++, i++)
-                    {
-                        tmparr_idx[i] = tr->idx[2];
-                        tmparr_ptr[i] = tr;
-                    }
-                    qsort(tmparr_idx, (void**)tmparr_ptr, 0, static_cast<int>(trend - trnew - 1));
-
-                    // find 0th buddy for each new triangle (i.e. the triangle, which has its idx[2]==tr->idx[1]
-                    for (tr = trnew; tr < trend; tr++)
-                    {
-                        i = bin_search(tmparr_idx, n, tr->idx[1]);
-                        tr->buddy[0] = tmparr_ptr[i];
-                        tmparr_ptr[i]->buddy[2] = tr;
-                    }
-                    for (tr = trnew; tr < trend; tr++)
-                    {
-                        if (!tr->buddy[0] || !tr->buddy[2])
-                        {
-                            goto endqh;
-                        }
-                    }
-
-                    // assign all points from the deleted triangles to the new triangles
-                    associate_ptlist_with_trilist(ptdeleted, trnew, ptlist, pts);
-                    // add new triangles to the list
-                    merge_lists(trnext, trnew);
-                }
-                else if (trnext == trstart)
-                {
-                    break; // all triangles in queue have no associated vertices
-                }
-                tr = trnext;
-            } while (++iter < maxiter);
-
-        endqh:
-
-            // build the final triangle list
-            for (tr = trstart, n = 1; tr->next != trstart; tr = tr->next, n++)
-            {
-                ;
-            }
-            if (!pTris)
-            {
-                pTris = !qmalloc ? new index_t[n * 3] : (index_t*)qmalloc(sizeof(index_t) * n * 3);
-            }
-            i = 0;
-            tr = trstart;
-            do
-            {
-                pTris[i] = tr->idx[0];
-                pTris[i + 1] = tr->idx[1];
-                pTris[i + 2] = tr->idx[2];
-                tr = tr->next;
-                i += 3;
-            } while (tr != trstart);
-
-        endqhull:
-            if (ptlist != ptbuf)
-            {
-                delete[] ptlist;
-            }
-            if (tmparr_idx != tmparr_idx_buf)
-            {
-                delete[] tmparr_idx;
-            }
-            if (tmparr_ptr != tmparr_ptr_buf)
-            {
-                delete[] tmparr_ptr;
-            }
-            if (trdata != trbuf)
-            {
-                delete[] trdata;
-            }
-
-            return n;
-        }
-#undef DELETE_TRI
-
-        void associate_ptlist_with_trilist(ptitem* ptlist, qhtritem* trilist, ptitem* pt0, strided_pointer<Vec3mem> pvtx)
-        {
-            if (!ptlist)
-            {
-                return;
-            }
-            ptitem* pt = ptlist, * ptnext, * ptlast = ptlist->prev;
-            qhtritem* tr;
-            int i;
-            do
-            {
-                ptnext = pt->next;
-                delete_item_from_list(pt);
-                tr = trilist;
-                i = static_cast<int>(pt - pt0);
-                do
-                {
-                    if (e_cansee(pvtx[i] - tr->pt0, tr->n))
-                    {
-                        add_item_to_list(tr->ptassoc, pt);
-                        break;
-                    }
-                    tr = tr->next;
-                } while (tr != trilist);
-                if (pt == ptlast)
-                {
-                    break;
-                }
-                pt = ptnext;
-            } while (true);
-        }
-
-        void qsort(int* v, void** p, int left, int right)
-        {
-            if (left >= right)
-            {
-                return;
-            }
-            int i, last;
-            swap(v, p, left, (left + right) >> 1);
-            for (last = left, i = left + 1; i <= right; i++)
-            {
-                if (v[i] < v[left])
-                {
-                    swap(v, p, ++last, i);
-                }
-            }
-            swap(v, p, left, last);
-
-            qsort(v, p, left, last - 1);
-            qsort(v, p, last + 1, right);
-        }
-
-        int bin_search(int* v, int n, int idx)
-        {
-            int left = 0, right = n, m;
-            do
-            {
-                m = (left + right) >> 1;
-                if (v[m] == idx)
-                {
-                    return m;
-                }
-                if (v[m] < idx)
-                {
-                    left = m;
-                }
-                else
-                {
-                    right = m;
-                }
-            } while (left < right - 1);
-            return left;
-        }
-    }
-
-    int qhull(strided_pointer<Vec3> _pts, int npts, index_t*& pTris, qhullmalloc qmalloc)
-    {
-        return qhull_IMPL::qhull(_pts, npts, pTris, qmalloc);
-    }
-
-    int TriangulatePoly(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf)
-    {
-        return TriangulatePoly_IMPL::TriangulatePoly(pVtx, nVtx, pTris, szTriBuf);
-    }
-
-    namespace TriangulatePoly_IMPL
-    {
-        int TriangulatePolyBruteforce(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf)
-        {
-            int i, nThunks, nNonEars, nTris = 0;
-            vtxthunk* ptr, * ptr0, bufThunks[32], * pThunks = nVtx <= 31 ? bufThunks : new vtxthunk[nVtx + 1];
-
-            ptr = ptr0 = pThunks;
-            for (i = nThunks = 0; i < nVtx; i++)
-            {
-                if (!is_unused(pVtx[i].x))
-                {
-                    pThunks[nThunks].next[0] = pThunks + nThunks - 1;
-                    pThunks[nThunks].next[1] = pThunks + nThunks + 1;
-                    pThunks[nThunks].pt = pVtx + i;
-                    ptr = pThunks + nThunks++;
-                }
-            }
-            if (nThunks < 3)
-            {
-                return 0;
-            }
-            ptr->next[1] = ptr0;
-            ptr0->next[0] = ptr;
-            for (i = 0; i < nThunks; i++)
-            {
-                pThunks[i].bProcessed = (*pThunks[i].next[1]->pt - *pThunks[i].pt ^ *pThunks[i].next[0]->pt - *pThunks[i].pt) > 0;
-            }
-
-            for (nNonEars = 0; nNonEars < nThunks && nTris < szTriBuf; ptr0 = ptr0->next[1])
-            {
-                if (nThunks == 3)
-                {
-                    pTris[nTris * 3] = static_cast<int>(ptr0->pt - pVtx);
-                    pTris[nTris * 3 + 1] = static_cast<int>(ptr0->next[1]->pt - pVtx);
-                    pTris[nTris * 3 + 2] = static_cast<int>(ptr0->next[0]->pt - pVtx);
-                    nTris++;
-                    break;
-                }
-                for (i = 0; (*ptr0->next[1]->pt - *ptr0->pt ^ *ptr0->next[0]->pt - *ptr0->pt) < 0 && i < nThunks; ptr0 = ptr0->next[1], i++)
-                {
-                    ;
-                }
-                if (i == nThunks)
-                {
-                    break;
-                }
-                for (ptr = ptr0->next[1]->next[1]; ptr != ptr0->next[0] && ptr->bProcessed; ptr = ptr->next[1])
-                {
-                    ;                                                                                       // find the 1st non-convex vertex after ptr0
-                }
-                for (; ptr != ptr0->next[0] && min(min(*ptr0->pt - *ptr0->next[0]->pt ^ *ptr->pt - *ptr0->next[0]->pt,
-                    *ptr0->next[1]->pt - *ptr0->pt ^ *ptr->pt - *ptr0->pt),
-                    *ptr0->next[0]->pt - *ptr0->next[1]->pt ^ *ptr->pt - *ptr0->next[1]->pt) < 0; ptr = ptr->next[1])
-                {
-                    ;
-                }
-                if (ptr == ptr0->next[0]) // vertex is an ear, output the corresponding triangle
-                {
-                    pTris[nTris * 3] = static_cast<int>(ptr0->pt - pVtx);
-                    pTris[nTris * 3 + 1] = static_cast<int>(ptr0->next[1]->pt - pVtx);
-                    pTris[nTris * 3 + 2] = static_cast<int>(ptr0->next[0]->pt - pVtx);
-                    nTris++;
-                    ptr0->next[1]->next[0] = ptr0->next[0];
-                    ptr0->next[0]->next[1] = ptr0->next[1];
-                    nThunks--;
-                    nNonEars = 0;
-                }
-                else
-                {
-                    nNonEars++;
-                }
-            }
-
-            if (pThunks != bufThunks)
-            {
-                delete[] pThunks;
-            }
-            return nTris;
-        }
-
-        int TriangulatePoly(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf)
-        {
-            if (nVtx < 3)
-            {
-                return 0;
-            }
-            vtxthunk* pThunks, * pPrevThunk, * pContStart, ** pSags, ** pBottoms, * pPinnacle = nullptr, * pBounds[2], * pPrevBounds[2], * ptr, * ptr_next;
-            vtxthunk bufThunks[32], * bufSags[16], * bufBottoms[16];
-            int i, nThunks, nBottoms = 0, nSags = 0, iBottom = 0, nConts = 0, j, isag, nThunks0, nTris = 0, nPrevSags, nTrisCnt, iter, nDegenTris = 0;
-            float ymax, ymin, e, area0 = 0, area1 = 0, cntarea, minCntArea;
-
-            isag = is_unused(pVtx[0].x);
-            ymin = ymax = pVtx[isag].y;
-            for (i = isag; i < nVtx; i++)
-            {
-                if (!is_unused(pVtx[i].x))
-                {
-                    ymin = min(ymin, pVtx[i].y);
-                    ymax = max(ymax, pVtx[i].y);
-                }
-            }
-            e = (ymax - ymin) * 0.0005f;
-            for (i = 1 + isag; i < nVtx; i++)
-            {
-                if (!is_unused(pVtx[i].x))
-                {
-                    j = i < nVtx - 1 && !is_unused(pVtx[i + 1].x) ? i + 1 : isag;
-                    if ((ymin = min(pVtx[j].y, pVtx[i - 1].y)) > pVtx[i].y - e)
-                    {
-                        if ((pVtx[j] - pVtx[i] ^ pVtx[i - 1] - pVtx[i]) > 0)
-                        {
-                            nBottoms++; // we have a bottom
-                        }
-                        else if (ymin > pVtx[i].y + 1E-8f)
-                        {
-                            nSags++; // we have a sag
-                        }
-                    }
-                }
-                else
-                {
-                    nConts++;
-                    isag = ++i;
-                }
-            }
-            nSags += nConts;
-            if ((nConts - 2) >> 31 & g_bBruteforceTriangulation)
-            {
-                return TriangulatePolyBruteforce(pVtx, nVtx, pTris, szTriBuf);
-            }
-            pThunks = nVtx + nSags * 2 <= sizeof(bufThunks) / sizeof(bufThunks[0]) ? bufThunks : new vtxthunk[nVtx + nSags * 2];
-
-            for (i = nThunks = 0, pContStart = pPrevThunk = pThunks; i < nVtx; i++)
-            {
-                if (!is_unused(pVtx[i].x))
-                {
-                    pThunks[nThunks].next[1] = pThunks + nThunks;
-                    pThunks[nThunks].next[1] = pPrevThunk->next[1];
-                    pPrevThunk->next[1] = pThunks + nThunks;
-                    pThunks[nThunks].next[0] = pPrevThunk;
-                    pThunks[nThunks].jump = 0;
-                    pPrevThunk = pThunks + nThunks;
-                    pThunks[nThunks].bProcessed = 0;
-                    pThunks[nThunks++].pt = &pVtx[i];
-                }
-                else
-                {
-                    pPrevThunk->next[1] = pContStart;
-                    pContStart->next[0] = pThunks + nThunks - 1;
-                    pContStart = pPrevThunk = pThunks + nThunks;
-                }
-            }
-
-            for (i = j = 0, cntarea = 0, minCntArea = 1; i < nThunks; i++)
-            {
-                cntarea += *pThunks[i].pt ^ *pThunks[i].next[1]->pt;
-                j++;
-                if (pThunks[i].next[1] != pThunks + i + 1)
-                {
-                    if (j >= 3)
-                    {
-                        area0 += cntarea;
-                        minCntArea = min(cntarea, minCntArea);
-                    }
-                    cntarea = 0;
-                    j = 0;
-                }
-            }
-            if (minCntArea > 0 && nConts > 1)
-            {
-                // if all contours are positive, triangulate them as separate (it's more safe)
-                for (i = 0; i < nThunks; i++)
-                {
-                    if (pThunks[i].next[0] != pThunks + i - 1)
-                    {
-                        nTrisCnt = TriangulatePoly(pThunks[i].pt, static_cast<int>((pThunks[i].next[0]->pt - pThunks[i].pt) + 2), pTris + nTris * 3, szTriBuf - nTris * 3);
-                        for (j = 0, isag = static_cast<int>(pThunks[i].pt - pVtx); j < nTrisCnt * 3; j++)
-                        {
-                            pTris[nTris * 3 + j] += isag;
-                        }
-                        i = static_cast<int>(pThunks[i].next[0] - pThunks);
-                        nTris += nTrisCnt;
-                    }
-                }
-                if (pThunks != bufThunks)
-                {
-                    delete[] pThunks;
-                }
-                return nTris;
-            }
-
-            pSags = nSags <= sizeof(bufSags) / sizeof(bufSags[0]) ? bufSags : new vtxthunk * [nSags];
-            pBottoms = nSags + nBottoms <= sizeof(bufBottoms) / sizeof(bufBottoms[0]) ? bufBottoms : new vtxthunk * [nSags + nBottoms];
-
-            for (i = nSags = nBottoms = 0; i < nThunks; i++)
-            {
-                if ((ymin = min(pThunks[i].next[1]->pt->y, pThunks[i].next[0]->pt->y)) > pThunks[i].pt->y - e)
-                {
-                    if ((*pThunks[i].next[1]->pt - *pThunks[i].pt ^ *pThunks[i].next[0]->pt - *pThunks[i].pt) >= 0)
-                    {
-                        pBottoms[nBottoms++] = pThunks + i; // we have a bottom
-                    }
-                    else if (ymin > pThunks[i].pt->y + e)
-                    {
-                        pSags[nSags++] = pThunks + i; // we have a sag
-                    }
-                }
-            }
-            iBottom = -1;
-            pBounds[0] = pBounds[1] = pPrevBounds[0] = pPrevBounds[1] = 0;
-            nThunks0 = nThunks;
-            nPrevSags = nSags;
-            iter = nThunks * 4;
-
-            do
-            {
-            nextiter:
-                if (!pBounds[0])   // if bounds are empty, get the next available bottom
-                {
-                    for (++iBottom; iBottom < nBottoms && !pBottoms[iBottom]->next[0]; iBottom++)
-                    {
-                        ;
-                    }
-                    if (iBottom >= nBottoms)
-                    {
-                        break;
-                    }
-                    pBounds[0] = pBounds[1] = pPinnacle = pBottoms[iBottom];
-                }
-                pBounds[0]->bProcessed = pBounds[1]->bProcessed = 1;
-                if (pBounds[0] == pPrevBounds[0] && pBounds[1] == pPrevBounds[1] && nSags == nPrevSags || !pBounds[0]->next[0] || !pBounds[1]->next[0])
-                {
-                    pBounds[0] = pBounds[1] = 0;
-                    continue;
-                }
-                pPrevBounds[0] = pBounds[0];
-                pPrevBounds[1] = pBounds[1];
-                nPrevSags = nSags;
-
-                // check if left or right is a top
-                for (i = 0; i < 2; i++)
-                {
-                    if (pBounds[i]->next[0]->pt->y < pBounds[i]->pt->y && pBounds[i]->next[1]->pt->y <= pBounds[i]->pt->y &&
-                        (*pBounds[i]->next[0]->pt - *pBounds[i]->pt ^ *pBounds[i]->next[1]->pt - *pBounds[i]->pt) > 0)
-                    {
-                        if (pBounds[i]->jump)
-                        {
-                            do
-                            {
-                                ptr = pBounds[i]->jump;
-                                pBounds[i]->jump = 0;
-                                pBounds[i] = ptr;
-                            } while (pBounds[i]->jump);
-                        }
-                        else
-                        {
-                            pBounds[i]->jump = pBounds[i ^ 1];
-                            pBounds[0] = pBounds[1] = 0;
-                            goto nextiter;
-                        }
-                        if (!pBounds[0]->next[0] || !pBounds[1]->next[0])
-                        {
-                            pBounds[0] = pBounds[1] = 0;
-                            goto nextiter;
-                        }
-                    }
-                }
-                i = isneg(pBounds[1]->next[1]->pt->y - pBounds[0]->next[0]->pt->y);
-                ymax = pBounds[i ^ 1]->next[i ^ 1]->pt->y;
-                ymin = min(pBounds[0]->pt->y, pBounds[1]->pt->y);
-
-                for (j = 0, isag = -1; j < nSags; j++)
-                {
-                    if (inrange(pSags[j]->pt->y, ymin, ymax) &&                           // find a sag in next left-left-right-next right quad
-                        pSags[j] != pBounds[0]->next[0] && pSags[j] != pBounds[1]->next[1] &&
-                        (*pBounds[0]->pt - *pBounds[0]->next[0]->pt ^ *pSags[j]->pt - *pBounds[0]->next[0]->pt) >= 0 &&
-                        (*pBounds[1]->pt - *pBounds[0]->pt ^ *pSags[j]->pt - *pBounds[0]->pt) >= 0 &&
-                        (*pBounds[1]->next[1]->pt - *pBounds[1]->pt ^ *pSags[j]->pt - *pBounds[1]->pt) >= 0 &&
-                        (*pBounds[0]->next[0]->pt - *pBounds[1]->next[1]->pt ^ *pSags[j]->pt - *pBounds[1]->next[1]->pt) >= 0)
-                    {
-                        ymax = pSags[j]->pt->y;
-                        isag = j;
-                    }
-                }
-
-                if (isag >= 0) // build a bridge between the sag and the highest active point
-                {
-                    if (pSags[isag]->next[0])
-                    {
-                        pPinnacle->next[1]->next[0] = pThunks + nThunks;
-                        pSags[isag]->next[0]->next[1] = pThunks + nThunks + 1;
-                        pThunks[nThunks].next[0] = pThunks + nThunks + 1;
-                        pThunks[nThunks].next[1] = pPinnacle->next[1];
-                        pThunks[nThunks + 1].next[1] = pThunks + nThunks;
-                        pThunks[nThunks + 1].next[0] = pSags[isag]->next[0];
-                        pPinnacle->next[1] = pSags[isag];
-                        pSags[isag]->next[0] = pPinnacle;
-                        pThunks[nThunks].pt = pPinnacle->pt;
-                        pThunks[nThunks + 1].pt = pSags[isag]->pt;
-                        pThunks[nThunks].jump = pThunks[nThunks + 1].jump = 0;
-                        pThunks[nThunks].bProcessed = pThunks[nThunks + 1].bProcessed = 0;
-                        if (pBounds[1] == pPinnacle)
-                        {
-                            pBounds[1] = pThunks + nThunks;
-                        }
-                        for (ptr = pThunks + nThunks, j = 0; ptr != pBounds[1]->next[1] && j < nThunks; ptr = ptr->next[1], j++)
-                        {
-                            if (min(ptr->next[0]->pt->y, ptr->next[1]->pt->y) > ptr->pt->y)  // ptr is a bottom
-                            {
-                                pBottoms[nBottoms++] = ptr;
-                                break;
-                            }
-                        }
-                        pBounds[1] = pPinnacle;
-                        pPinnacle = pSags[isag];
-                        nThunks += 2;
-                    }
-                    for (j = isag; j < nSags - 1; j++)
-                    {
-                        pSags[j] = pSags[j + 1];
-                    }
-                    --nSags;
-                    continue;
-                }
-
-                // create triangles featuring the new vertex
-                for (ptr = pBounds[i]; ptr != pBounds[i ^ 1] && nTris < szTriBuf; ptr = ptr_next)
-                {
-                    if ((*ptr->next[i ^ 1]->pt - *ptr->pt ^ *ptr->next[i]->pt - *ptr->pt) * (1 - i * 2) > 0 || pBounds[0]->next[0] == pBounds[1]->next[1])
-                    {
-                        // output the triangle
-                        pTris[nTris * 3] = static_cast<int>(pBounds[i]->next[i]->pt - pVtx);
-                        pTris[nTris * 3 + 1 + i] = static_cast<int>(ptr->pt - pVtx);
-                        pTris[nTris * 3 + 2 - i] = static_cast<int>(ptr->next[i ^ 1]->pt - pVtx);
-                        vector2df edge0 = pVtx[pTris[nTris * 3 + 1]] - pVtx[pTris[nTris * 3]], edge1 = pVtx[pTris[nTris * 3 + 2]] - pVtx[pTris[nTris * 3]];
-                        float darea = edge0 ^ edge1;
-                        area1 += darea;
-                        nDegenTris += isneg(sqr(darea) - sqr(0.02f) * (edge0 * edge0) * (edge1 * edge1));
-                        nTris++;
-                        ptr->next[i ^ 1]->next[i] = ptr->next[i];
-                        ptr->next[i]->next[i ^ 1] = ptr->next[i ^ 1];
-                        pBounds[i] = ptr_next = ptr->next[i ^ 1];
-                        if (pPinnacle == ptr)
-                        {
-                            pPinnacle = ptr->next[i];
-                        }
-                        ptr->next[0] = ptr->next[1] = 0;
-                        ptr->bProcessed = 1;
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-
-                if ((pBounds[i] = pBounds[i]->next[i]) == pBounds[i ^ 1]->next[i ^ 1])
-                {
-                    pBounds[0] = pBounds[1] = 0;
-                }
-                else if (pBounds[i]->pt->y > pPinnacle->pt->y)
-                {
-                    pPinnacle = pBounds[i];
-                }
-            } while (nTris < szTriBuf && --iter);
-
-            if (pThunks != bufThunks)
-            {
-                delete[] pThunks;
-            }
-            if (pBottoms != bufBottoms)
-            {
-                delete[] pBottoms;
-            }
-            if (pSags != bufSags)
-            {
-                delete[] pSags;
-            }
-
-            int bProblem = nTris<nThunks0 - nConts * 2 || fabs_tpl(area0 - area1)>area0 * 0.003f || nTris >= szTriBuf;
-            if (bProblem || nDegenTris)
-            {
-                if (nConts == 1)
-                {
-                    return TriangulatePolyBruteforce(pVtx, nVtx, pTris, szTriBuf);
-                }
-                else
-                {
-                    g_nTriangulationErrors += bProblem;
-                }
-            }
-
-            return nTris;
-        }
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/Cry_LegacyPhysUtils.h b/Code/CryEngine/Cry3DEngine/Cry_LegacyPhysUtils.h
deleted file mode 100644
index 208f21d288..0000000000
--- a/Code/CryEngine/Cry3DEngine/Cry_LegacyPhysUtils.h
+++ /dev/null
@@ -1,909 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Copied utils functions from CryPhysics that are used by non-physics systems
-// This functions will be eventually removed, DO *NOT* use these functions
-// TO-DO: Re-implement users using new code
-// LY-109806
-
-#pragma once
-
-#include "stridedptr.h"
-#include "Cry_Math.h"
-#include "Cry_Vector3.h"
-
-namespace LegacyCryPhysicsUtils
-{
-    typedef int index_t;
-
-    // Workaround for bug in GCC 4.8. The kind of access patterns here leads to an internal
-    // compiler error in GCC 4.8 when optimizing with debug symbols. Two possible solutions
-    // are available, compile in Profile mode without debug symbols or remove optimizations
-    // in the code where the bug occurs
-    // see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59776
-#if defined(_PROFILE) && !defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
-    // Cannot use #pragma GCC optimize("O0") because it causes a system crash when using
-    // the gcc compiler for another platform
-#define CRY_GCC48_AVOID_OPTIMIZE __attribute__((optimize("-O0")))
-#else
-#define CRY_GCC48_AVOID_OPTIMIZE
-#endif
-    // unused_marker deliberately fills a variable with invalid data,
-    // so that later is_unused() can check whether it was initialized
-    // (this is used in all physics params/status/action structures)
-    class unused_marker
-    {
-    public:
-        union f2i
-        {
-            float f;
-            uint32 i;
-        };
-        union d2i
-        {
-            double d;
-            uint32 i[2];
-        };
-        unused_marker() {}
-        unused_marker& operator,(float& x) CRY_GCC48_AVOID_OPTIMIZE;
-        unused_marker& operator,(double& x) CRY_GCC48_AVOID_OPTIMIZE;
-        unused_marker& operator,(int& x) CRY_GCC48_AVOID_OPTIMIZE;
-        unused_marker& operator,(unsigned int& x) CRY_GCC48_AVOID_OPTIMIZE;
-        template<class ref>
-        unused_marker& operator,(ref*& x) { x = (ref*)-1; return *this; }
-        template<class F>
-        unused_marker& operator,(Vec3_tpl<F>& x) { return *this, x.x; }
-        template<class F>
-        unused_marker& operator,(Quat_tpl<F>& x) { return *this, x.w; }
-        template<class F>
-        unused_marker& operator,(strided_pointer<F>& x) { return *this, x.data; }
-    };
-    inline unused_marker& unused_marker::operator,(float& x) { *alias_cast<int*>(&x) = 0xFFBFFFFF; return *this; }
-    inline unused_marker& unused_marker::operator,(double& x) { (alias_cast<int*>(&x))[false ? 1 : 0] = 0xFFF7FFFF; return *this; }
-    inline unused_marker& unused_marker::operator,(int& x) { x = 1 << 31; return *this; }
-    inline unused_marker& unused_marker::operator,(unsigned int& x) { x = 1u << 31; return *this; }
-
-#undef CRY_GCC48_AVOID_OPTIMIZE
-
-    inline bool is_unused(const float& x) { unused_marker::f2i u; u.f = x; return (u.i & 0xFFA00000) == 0xFFA00000; }
-
-    inline bool is_unused(int x) { return x == 1 << 31; }
-    inline bool is_unused(unsigned int x) { return x == 1u << 31; }
-    template<class ref>
-    bool is_unused(ref* x) { return x == (ref*)-1; }
-    template<class ref>
-    bool is_unused(strided_pointer<ref> x) { return is_unused(x.data); }
-    template<class F>
-    bool is_unused(const Ang3_tpl<F>& x) { return is_unused(x.x); }
-    template<class F>
-    bool is_unused(const Vec3_tpl<F>& x) { return is_unused(x.x); }
-    template<class F>
-    bool is_unused(const Quat_tpl<F>& x) { return is_unused(x.w); }
-    inline bool is_unused(const double& x) { unused_marker::d2i u; u.d = x; return (u.i[eLittleEndian ? 1 : 0] & 0xFFF40000) == 0xFFF40000; }
-#ifndef MARK_UNUSED
-#define MARK_UNUSED LegacyCryPhysicsUtils::unused_marker(),
-#endif
-    typedef void* (*qhullmalloc)(size_t);
-    namespace qhull_IMPL
-    {
-        struct ptitem
-        {
-            ptitem* next, * prev;
-        };
-
-        struct qhtritem
-        {
-            qhtritem* next, * prev;
-            ptitem* ptassoc;
-            Vec3 n, pt0;
-            int idx[3];
-            qhtritem* buddy[3];
-            int deleted;
-        };
-
-        inline bool e_cansee(const Vec3& dp, const Vec3& n, float e = 0.002f) { return sqr_signed(dp * n) > sqr_signed(e)* dp.len2()* n.len2(); }
-
-        inline void relocate_ptritem(qhtritem*& ptr, intptr_t diff)
-        {
-            ptr = (qhtritem*)((intptr_t)ptr + diff & ~- iszero((intptr_t)ptr));    // offset the pointer, but leave out 0s
-        }
-
-        inline void relocate_tritem(qhtritem* ptr, intptr_t diff)
-        {
-            relocate_ptritem(ptr->next, diff);
-            relocate_ptritem(ptr->prev, diff);
-            relocate_ptritem(ptr->buddy[0], diff);
-            relocate_ptritem(ptr->buddy[1], diff);
-            relocate_ptritem(ptr->buddy[2], diff);
-        }
-
-        template<class item>
-        void delete_item_from_list(item* p)
-        {
-            if (p->prev)
-            {
-                p->prev->next = p->next;
-            }
-            if (p->next)
-            {
-                p->next->prev = p->prev;
-            }
-            p->prev = p->next = 0;
-        }
-        template<class item>
-        void add_item_to_list(item*& pin, item* pnew)
-        {
-            if (!pin)
-            {
-                pin = pnew->next = pnew->prev = pnew;
-            }
-            else
-            {
-                pnew->next = pin->next;
-                pnew->prev = pin;
-                pin->next->prev = pnew;
-                pin->next = pnew;
-            }
-        }
-        template<class item>
-        void merge_lists(item*& plist, item* pnew)
-        {
-            if (!pnew)
-            {
-                return;
-            }
-            if (!plist)
-            {
-                plist = pnew;
-            }
-            else
-            {
-                plist->next->prev = pnew->prev;
-                pnew->prev->next = plist->next;
-                plist->next = pnew;
-                pnew->prev = plist;
-            }
-        }
-
-        struct Vec3mem
-            : Vec3
-        {
-            Vec3 operator-(const Vec3& op) const { return sub(op); }
-            float operator*(const Vec3& op) const { return dot(op); }
-            Vec3 operator^(const Vec3& op) const { return cross(op); }
-        };
-
-        void associate_ptlist_with_trilist(ptitem* ptlist, qhtritem* trilist, ptitem* pt0, strided_pointer<Vec3mem> pvtx);
-
-        inline void swap(int* v, void** p, int i1, int i2)
-        {
-            int ti = v[i1];
-            v[i1] = v[i2];
-            v[i2] = ti;
-            void* tp = p[i1];
-            p[i1] = p[i2];
-            p[i2] = tp;
-        }
-
-        void qsort(int* v, void** p, int left, int right);
-
-        int bin_search(int* v, int n, int idx);
-
-        int qhull(strided_pointer<Vec3> _pts, int npts, index_t*& pTris, qhullmalloc qmalloc);
-
-    } // namespace qhull_IMPL
-
-    int qhull(strided_pointer<Vec3> _pts, int npts, index_t*& pTris, qhullmalloc qmalloc);
-
-    namespace TriangulatePoly_IMPL
-    {
-        static int g_bSaferBooleans = 1;
-        static int g_nTriangulationErrors;
-        static int g_bBruteforceTriangulation = 0;
-
-        struct vtxthunk
-        {
-            vtxthunk* next[2];
-            vtxthunk* jump;
-            vector2df* pt;
-            int bProcessed;
-        };
-
-        int TriangulatePolyBruteforce(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf);
-
-        int TriangulatePoly(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf);
-
-    } // namespace TriangulatePoly_IMPL
-
-    int TriangulatePoly(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf);
-
-    namespace polynomial_tpl_IMPL
-    {
-        template<class ftype, int degree>
-        class polynomial_tpl
-        {
-        public:
-            explicit polynomial_tpl() { denom = (ftype)1; };
-            explicit polynomial_tpl(ftype op) { zero(); data[degree] = op; }
-            AZ_FORCE_INLINE polynomial_tpl& zero()
-            {
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] = 0;
-                }
-                denom = (ftype)1;
-                return *this;
-            }
-            polynomial_tpl(const polynomial_tpl<ftype, degree>& src) { *this = src; }
-            polynomial_tpl& operator=(const polynomial_tpl<ftype, degree>& src)
-            {
-                denom = src.denom;
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] = src.data[i];
-                }
-                return *this;
-            }
-            template<int degree1>
-            AZ_FORCE_INLINE polynomial_tpl& operator=(const polynomial_tpl<ftype, degree1>& src)
-            {
-                int i;
-                denom = src.denom;
-                for (i = 0; i <= min(degree, degree1); i++)
-                {
-                    data[i] = src.data[i];
-                }
-                for (; i < degree; i++)
-                {
-                    data[i] = 0;
-                }
-                return *this;
-            }
-            AZ_FORCE_INLINE polynomial_tpl& set(ftype* pdata)
-            {
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[degree - i] = pdata[i];
-                }
-                return *this;
-            }
-
-            AZ_FORCE_INLINE ftype& operator[](int idx) { return data[idx]; }
-
-            void calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree = degree) const;
-
-            AZ_FORCE_INLINE polynomial_tpl& fixsign()
-            {
-                ftype sg = sgnnz(denom);
-                denom *= sg;
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] *= sg;
-                }
-                return *this;
-            }
-
-            int findroots(ftype start, ftype end, ftype* proots, int nIters = 20, int curdegree = degree, bool noDegreeCheck = false) const;
-            int nroots(ftype start, ftype end) const;
-
-            AZ_FORCE_INLINE ftype eval(ftype x) const
-            {
-                ftype res = 0;
-                for (int i = degree; i >= 0; i--)
-                {
-                    res = res * x + data[i];
-                }
-                return res;
-            }
-            AZ_FORCE_INLINE ftype eval(ftype x, int subdegree) const
-            {
-                ftype res = data[subdegree];
-                for (int i = subdegree - 1; i >= 0; i--)
-                {
-                    res = res * x + data[i];
-                }
-                return res;
-            }
-
-            AZ_FORCE_INLINE polynomial_tpl& operator+=(ftype op) { data[0] += op * denom; return *this; }
-            AZ_FORCE_INLINE polynomial_tpl& operator-=(ftype op) { data[0] -= op * denom; return *this; }
-            AZ_FORCE_INLINE polynomial_tpl operator*(ftype op) const
-            {
-                polynomial_tpl<ftype, degree> res;
-                res.denom = denom;
-                for (int i = 0; i <= degree; i++)
-                {
-                    res.data[i] = data[i] * op;
-                }
-                return res;
-            }
-            AZ_FORCE_INLINE polynomial_tpl& operator*=(ftype op)
-            {
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] *= op;
-                }
-                return *this;
-            }
-            AZ_FORCE_INLINE polynomial_tpl operator/(ftype op) const
-            {
-                polynomial_tpl<ftype, degree> res = *this;
-                res.denom = denom * op;
-                return res;
-            }
-            AZ_FORCE_INLINE polynomial_tpl& operator/=(ftype op) { denom *= op;   return *this; }
-
-            AZ_FORCE_INLINE polynomial_tpl<ftype, degree * 2> sqr() const { return *this * *this; }
-
-            ftype denom;
-            ftype data[degree + 1];
-        };
-
-        template <class ftype>
-        struct tagPolyE
-        {
-            inline static ftype polye() { return (ftype)1E-10; }
-        };
-
-        template<>
-        inline float tagPolyE<float>::polye() { return 1e-6f; }
-
-        template <class ftype>
-        inline ftype polye() { return tagPolyE<ftype>::polye(); }
-
-        // Don't use this macro; use AZStd::max instead. This is only here to make the template const arguments below readable
-        // and because Visual Studio 2013 doesn't have a const_expr version of std::max
-        #define deprecated_degmax(degree1, degree2) (((degree1) > (degree2)) ? (degree1) : (degree2))
-
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(const polynomial_tpl<ftype, degree>& pn, ftype op)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] += op * res.denom;
-            return res;
-        }
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(const polynomial_tpl<ftype, degree>& pn, ftype op)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] -= op * res.denom;
-            return res;
-        }
-
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(ftype op, const polynomial_tpl<ftype, degree>& pn)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] += op * res.denom;
-            return res;
-        }
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(ftype op, const polynomial_tpl<ftype, degree>& pn)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] -= op * res.denom;
-            for (int i = 0; i <= degree; i++)
-            {
-                res.data[i] = -res.data[i];
-            }
-            return res;
-        }
-        template<class ftype, int degree>
-        polynomial_tpl<ftype, degree * 2> AZ_FORCE_INLINE psqr(const polynomial_tpl<ftype, degree>& op) { return op * op; }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator+(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
-            int i;
-            for (i = 0; i <= min(degree1, degree2); i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
-            }
-            for (; i <= degree1; i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom;
-            }
-            for (; i <= degree2; i++)
-            {
-                res.data[i] = op2.data[i] * op1.denom;
-            }
-            res.denom = op1.denom * op2.denom;
-            return res;
-        }
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator-(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
-            int i;
-            for (i = 0; i <= min(degree1, degree2); i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
-            }
-            for (; i <= degree1; i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom;
-            }
-            for (; i <= degree2; i++)
-            {
-                res.data[i] = op2.data[i] * op1.denom;
-            }
-            res.denom = op1.denom * op2.denom;
-            return res;
-        }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator+=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            for (int i = 0; i < min(degree1, degree2); i++)
-            {
-                op1.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
-            }
-            op1.denom *= op2.denom;
-            return op1;
-        }
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator-=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            for (int i = 0; i < min(degree1, degree2); i++)
-            {
-                op1.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
-            }
-            op1.denom *= op2.denom;
-            return op1;
-        }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 + degree2> operator*(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            polynomial_tpl<ftype, degree1 + degree2> res;
-            res.zero();
-            int j;
-            switch (degree1)
-            {
-            case 8:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[8 + j] += op1.data[8] * op2.data[j];
-                }
-            case 7:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[7 + j] += op1.data[7] * op2.data[j];
-                }
-            case 6:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[6 + j] += op1.data[6] * op2.data[j];
-                }
-            case 5:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[5 + j] += op1.data[5] * op2.data[j];
-                }
-            case 4:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[4 + j] += op1.data[4] * op2.data[j];
-                }
-            case 3:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[3 + j] += op1.data[3] * op2.data[j];
-                }
-            case 2:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[2 + j] += op1.data[2] * op2.data[j];
-                }
-            case 1:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[1 + j] += op1.data[1] * op2.data[j];
-                }
-            case 0:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[0 + j] += op1.data[0] * op2.data[j];
-                }
-            }
-            res.denom = op1.denom * op2.denom;
-            return res;
-        }
-
-
-        template <class ftype>
-        AZ_FORCE_INLINE void polynomial_divide(const polynomial_tpl<ftype, 8>& num, const polynomial_tpl<ftype, 8>& den, polynomial_tpl<ftype, 8>& quot,
-            polynomial_tpl<ftype, 8>& rem, int degree1, int degree2)
-        {
-            int i, j, k, l;
-            ftype maxel;
-            for (i = 0; i <= degree1; i++)
-            {
-                rem.data[i] = num.data[i];
-            }
-            for (i = 0; i <= degree1 - degree2; i++)
-            {
-                quot.data[i] = 0;
-            }
-            for (i = 1, maxel = fabs_tpl(num.data[0]); i <= degree1; i++)
-            {
-                maxel = max(maxel, num.data[i]);
-            }
-            for (maxel *= polye<ftype>(); degree1 >= 0 && fabs_tpl(num.data[degree1]) < maxel; degree1--)
-            {
-                ;
-            }
-            for (i = 1, maxel = fabs_tpl(den.data[0]); i <= degree2; i++)
-            {
-                maxel = max(maxel, den.data[i]);
-            }
-            for (maxel *= polye<ftype>(); degree2 >= 0 && fabs_tpl(den.data[degree2]) < maxel; degree2--)
-            {
-                ;
-            }
-            rem.denom = num.denom;
-            quot.denom = (ftype)1;
-            if (degree1 < 0 || degree2 < 0)
-            {
-                return;
-            }
-
-            for (k = degree1 - degree2, l = degree1; l >= degree2; l--, k--)
-            {
-                quot.data[k] = rem.data[l] * den.denom;
-                quot.denom *= den.data[degree2];
-                for (i = degree1 - degree2; i > k; i--)
-                {
-                    quot.data[i] *= den.data[degree2];
-                }
-                for (i = degree2 - 1, j = l - 1; i >= 0; i--, j--)
-                {
-                    rem.data[j] = rem.data[j] * den.data[degree2] - den.data[i] * rem.data[l];
-                }
-                for (; j >= 0; j--)
-                {
-                    rem.data[j] *= den.data[degree2];
-                }
-                rem.denom *= den.data[degree2];
-            }
-        }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 - degree2> operator/(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
-        {
-            polynomial_tpl<ftype, degree1 - degree2> quot;
-            polynomial_tpl<ftype, degree1> rem;
-            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
-                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
-            return quot;
-        }
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree2 - 1> operator%(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
-        {
-            polynomial_tpl<ftype, degree1 - degree2> quot;
-            polynomial_tpl<ftype, degree1> rem;
-            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
-                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
-            return (polynomial_tpl<ftype, degree2 - 1>&)rem;
-        }
-
-        template <class ftype, int degree>
-        AZ_FORCE_INLINE void polynomial_tpl<ftype, degree>::calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree) const
-        {
-            for (int i = 0; i < curdegree; i++)
-            {
-                deriv.data[i] = data[i + 1] * (i + 1);
-            }
-            deriv.denom = denom;
-        }
-
-        template<typename to_t, typename from_t>
-        to_t* convert_type(from_t* input)
-        {
-            typedef union
-            {
-                to_t* to;
-                from_t* from;
-            } convert_union;
-            convert_union u;
-            u.from = input;
-            return u.to;
-        }
-
-        template <class ftype, int degree>
-        AZ_FORCE_INLINE int polynomial_tpl<ftype, degree>::nroots(ftype start, ftype end) const
-        {
-            polynomial_tpl<ftype, degree> f[degree + 1];
-            int i, j, sg_a, sg_b;
-            ftype val, prevval;
-
-            calc_deriviative(f[0]);
-            polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(this), *convert_type< polynomial_tpl<ftype, 8> >(&f[0]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
-                *convert_type<polynomial_tpl<ftype, 8> >(&f[1]), degree, degree - 1);
-            f[1].denom = -f[1].denom;
-            for (i = 2; i < degree; i++)
-            {
-                polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(&f[i - 2]), *convert_type<polynomial_tpl<ftype, 8> >(&f[i - 1]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
-                    *convert_type<polynomial_tpl<ftype, 8> >(&f[i]), degree + 1 - i, degree - i);
-                f[i].denom = -f[i].denom;
-                if (fabs_tpl(f[i].denom) > (ftype)1E10)
-                {
-                    for (j = 0; j <= degree - 1 - i; j++)
-                    {
-                        f[i].data[j] *= (ftype)1E-10;
-                    }
-                    f[i].denom *= (ftype)1E-10;
-                }
-            }
-
-            prevval = eval(start) * denom;
-            for (i = sg_a = 0; i < degree; i++, prevval = val)
-            {
-                val = f[i].eval(start, degree - 1 - i) * f[i].denom;
-                sg_a += isneg(val * prevval);
-            }
-
-            prevval = eval(end) * denom;
-            for (i = sg_b = 0; i < degree; i++, prevval = val)
-            {
-                val = f[i].eval(end, degree - 1 - i) * f[i].denom;
-                sg_b += isneg(val * prevval);
-            }
-
-            return fabs_tpl(sg_a - sg_b);
-        }
-
-        template<class ftype>
-        AZ_FORCE_INLINE ftype cubert_tpl(ftype x) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * (ftype)(1.0 / 3)) * sgnnz(x) : x; }
-        template<class ftype>
-        AZ_FORCE_INLINE ftype pow_tpl(ftype x, ftype pow) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * pow) * sgnnz(x) : x; }
-        template<class ftype>
-        AZ_FORCE_INLINE void swap(ftype* ptr, int i, int j) { ftype t = ptr[i]; ptr[i] = ptr[j]; ptr[j] = t; }
-
-        template <class ftype, int maxdegree>
-        int polynomial_tpl<ftype, maxdegree>::findroots(ftype start, ftype end, ftype* proots, [[maybe_unused]] int nIters, int degree, bool noDegreeCheck) const
-        {
-            AZ_UNUSED(nIters);
-            int i, j, nRoots = 0;
-            ftype maxel;
-            if (!noDegreeCheck)
-            {
-                for (i = 1, maxel = fabs_tpl(data[0]); i <= degree; i++)
-                {
-                    maxel = max(maxel, data[i]);
-                }
-                for (maxel *= polye<ftype>(); degree > 0 && fabs_tpl(data[degree]) <= maxel; degree--)
-                {
-                    ;
-                }
-            }
-
-            if constexpr (maxdegree >= 1)
-            {
-                if (degree == 1)
-                {
-                    proots[0] = data[0] / data[1];
-                    nRoots = 1;
-                }
-            }
-
-            if constexpr (maxdegree >= 2)
-            {
-                if (degree == 2)
-                {
-                    ftype a, b, c, d, bound[2], sg;
-
-                    a = data[2];
-                    b = data[1];
-                    c = data[0];
-                    d = aznumeric_cast<ftype>(sgnnz(a));
-                    a *= d;
-                    b *= d;
-                    c *= d;
-                    d = b * b - a * c * 4;
-                    bound[0] = start * a * 2 + b;
-                    bound[1] = end * a * 2 + b;
-                    sg = aznumeric_cast<ftype>((sgnnz(bound[0] * bound[1]) + 1) >> 1);
-                    bound[0] *= bound[0];
-                    bound[1] *= bound[1];
-                    bound[isneg(fabs_tpl(bound[1]) - fabs_tpl(bound[0]))] *= sg;
-
-                    if (isnonneg(d) & inrange(d, bound[0], bound[1]))
-                    {
-                        d = sqrt_tpl(d);
-                        a = (ftype)0.5 / a;
-                        proots[nRoots] = (-b - d) * a;
-                        nRoots += inrange(proots[nRoots], start, end);
-                        proots[nRoots] = (-b + d) * a;
-                        nRoots += inrange(proots[nRoots], start, end);
-                    }
-                }
-            }
-
-            if constexpr (maxdegree >= 3)
-            {
-                if (degree == 3)
-                {
-                    ftype t, a, b, c, a3, p, q, Q, Qr, Ar, Ai, phi;
-
-                    t = (ftype)1.0 / data[3];
-                    a = data[2] * t;
-                    b = data[1] * t;
-                    c = data[0] * t;
-                    a3 = a * (ftype)(1.0 / 3);
-                    p = b - a * a3;
-                    q = (a3 * b - c) * (ftype)0.5 - cube(a3);
-                    Q = cube(p * (ftype)(1.0 / 3)) + q * q;
-                    Qr = sqrt_tpl(fabs_tpl(Q));
-
-                    if (Q > 0)
-                    {
-                        proots[0] = cubert_tpl(q + Qr) + cubert_tpl(q - Qr) - a3;
-                        nRoots = 1;
-                    }
-                    else
-                    {
-                        phi = atan2_tpl(Qr, q) * (ftype)(1.0 / 3);
-                        t = pow_tpl(Qr * Qr + q * q, (ftype)(1.0 / 6));
-                        Ar = t * cos_tpl(phi);
-                        Ai = t * sin_tpl(phi);
-                        proots[0] = 2 * Ar - a3;
-                        proots[1] = aznumeric_cast<ftype>(-Ar + Ai * sqrt3 - a3);
-                        proots[2] = aznumeric_cast<ftype>(-Ar - Ai * sqrt3 - a3);
-                        i = idxmax3(proots);
-                        swap(proots, i, 2);
-                        i = isneg(proots[0] - proots[1]);
-                        swap(proots, i, 1);
-                        nRoots = 3;
-                    }
-                }
-            }
-
-            if constexpr (maxdegree >= 4)
-            {
-                if (degree == 4)
-                {
-                    ftype t, a3, a2, a1, a0, y, R, D, E, subroots[3];
-                    const ftype e = (ftype)1E-9;
-
-                    t = (ftype)1.0 / data[4];
-                    a3 = data[3] * t;
-                    a2 = data[2] * t;
-                    a1 = data[1] * t;
-                    a0 = data[0] * t;
-                    polynomial_tpl<ftype, 3> p3aux;
-                    ftype kp3aux[] = { 1, -a2, a1 * a3 - 4 * a0, 4 * a2 * a0 - a1 * a1 - a3 * a3 * a0 };
-                    p3aux.set(kp3aux);
-                    if (!p3aux.findroots((ftype)-1E20, (ftype)1E20, subroots))
-                    {
-                        return 0;
-                    }
-                    R = a3 * a3 * (ftype)0.25 - a2 + (y = subroots[0]);
-
-                    if (R > -e)
-                    {
-                        if (R < e)
-                        {
-                            D = E = a3 * a3 * (ftype)(3.0 / 4) - 2 * a2;
-                            t = y * y - 4 * a0;
-                            if (t < -e)
-                            {
-                                return 0;
-                            }
-                            t = 2 * sqrt_tpl(max((ftype)0, t));
-                        }
-                        else
-                        {
-                            R = sqrt_tpl(max((ftype)0, R));
-                            D = E = a3 * a3 * (ftype)(3.0 / 4) - R * R - 2 * a2;
-                            t = (4 * a3 * a2 - 8 * a1 - a3 * a3 * a3) / R * (ftype)0.25;
-                        }
-                        if (D + t > -e)
-                        {
-                            D = sqrt_tpl(max((ftype)0, D + t));
-                            proots[nRoots++] = a3 * (ftype)-0.25 + (R - D) * (ftype)0.5;
-                            proots[nRoots++] = a3 * (ftype)-0.25 + (R + D) * (ftype)0.5;
-                        }
-                        if (E - t > -e)
-                        {
-                            E = sqrt_tpl(max((ftype)0, E - t));
-                            proots[nRoots++] = a3 * (ftype)-0.25 - (R + E) * (ftype)0.5;
-                            proots[nRoots++] = a3 * (ftype)-0.25 - (R - E) * (ftype)0.5;
-                        }
-                        if (nRoots == 4)
-                        {
-                            i = idxmax3(proots);
-                            if (proots[3] < proots[i])
-                            {
-                                swap(proots, i, 3);
-                            }
-                            i = idxmax3(proots);
-                            swap(proots, i, 2);
-                            i = isneg(proots[0] - proots[1]);
-                            swap(proots, i, 1);
-                        }
-                    }
-                }
-            }
-
-            if constexpr (maxdegree > 4)
-            {
-                if (degree > 4)
-                {
-                    ftype roots[maxdegree + 1], prevroot, val, prevval[2], curval, bound[2], middle;
-                    polynomial_tpl<ftype, maxdegree> deriv;
-                    int nExtremes, iter, iBound;
-                    calc_deriviative(deriv);
-
-                    // find a subset of deriviative extremes between start and end
-                    for (nExtremes = deriv.findroots(start, end, roots + 1, nIters, degree - 1) + 1; nExtremes > 1 && roots[nExtremes - 1] > end; nExtremes--)
-                    {
-                        ;
-                    }
-                    for (i = 1; i < nExtremes && roots[i] < start; i++)
-                    {
-                        ;
-                    }
-                    roots[i - 1] = start;
-                    PREFAST_ASSUME(nExtremes < maxdegree + 1);
-                    roots[nExtremes++] = end;
-
-                    for (prevroot = start, prevval[0] = eval(start, degree), nRoots = 0; i < nExtremes; prevval[0] = val, prevroot = roots[i++])
-                    {
-                        val = eval(roots[i], degree);
-                        if (val * prevval[0] < 0)
-                        {
-                            // we have exactly one root between prevroot and roots[i]
-                            bound[0] = prevroot;
-                            bound[1] = roots[i];
-                            iter = 0;
-                            do
-                            {
-                                middle = (bound[0] + bound[1]) * (ftype)0.5;
-                                curval = eval(middle, degree);
-                                iBound = isneg(prevval[0] * curval);
-                                bound[iBound] = middle;
-                                prevval[iBound] = curval;
-                            } while (++iter < nIters);
-                            proots[nRoots++] = middle;
-                        }
-                    }
-                }
-            }
-
-            for (i = 0; i < nRoots && proots[i] < start; i++)
-            {
-                ;
-            }
-            for (; nRoots > i&& proots[nRoots - 1] > end; nRoots--)
-            {
-                ;
-            }
-            for (j = i; j < nRoots; j++)
-            {
-                proots[j - i] = proots[j];
-            }
-
-            return nRoots - i;
-        }
-    } // namespace polynomial_tpl_IMPL
-    template<class ftype, int degree>
-    using polynomial_tpl = polynomial_tpl_IMPL::polynomial_tpl<ftype, degree>;
-
-    typedef polynomial_tpl<real, 3> P3;
-    typedef polynomial_tpl<real, 2> P2;
-    typedef polynomial_tpl<real, 1> P1;
-    typedef polynomial_tpl<float, 3> P3f;
-    typedef polynomial_tpl<float, 2> P2f;
-    typedef polynomial_tpl<float, 1> P1f;
-} // namespace LegacyCryPhysicsUtils
diff --git a/Code/CryEngine/Cry3DEngine/CullBuffer.cpp b/Code/CryEngine/Cry3DEngine/CullBuffer.cpp
deleted file mode 100644
index ce640ce343..0000000000
--- a/Code/CryEngine/Cry3DEngine/CullBuffer.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
diff --git a/Code/CryEngine/Cry3DEngine/CullBuffer.h b/Code/CryEngine/Cry3DEngine/CullBuffer.h
deleted file mode 100644
index 246ee6457c..0000000000
--- a/Code/CryEngine/Cry3DEngine/CullBuffer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Occlusion buffer main include
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CULLBUFFER_H
-#define CRYINCLUDE_CRY3DENGINE_CULLBUFFER_H
-#pragma once
-
-#include "ProjectDefines.h"
-#include "ObjMan.h" // EOcclusionObjectType
-#include "CZBufferCuller.h"
-
-class CCullBuffer
-    : public CZBufferCuller
-{
-};
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_CULLBUFFER_H
diff --git a/Code/CryEngine/Cry3DEngine/Decal.cpp b/Code/CryEngine/Cry3DEngine/Decal.cpp
deleted file mode 100644
index c9179459a4..0000000000
--- a/Code/CryEngine/Cry3DEngine/Decal.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : draw, create decals on the world
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "DecalManager.h"
-#include "3dEngine.h"
-#include "ObjMan.h"
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-IGeometry* CDecal::s_pSphere = 0;
-
-void CDecal::ResetStaticData()
-{
-    SAFE_RELEASE(s_pSphere);
-}
-
-int CDecal::Update(bool& active, const float fFrameTime)
-{
-    // process life time and disable decal when needed
-    m_fLifeTime -= fFrameTime;
-
-    if (m_fLifeTime < 0)
-    {
-        active = 0;
-        FreeRenderData();
-    }
-    else if (m_ownerInfo.pRenderNode && m_ownerInfo.pRenderNode->m_nInternalFlags & IRenderNode::UPDATE_DECALS)
-    {
-        active = false;
-        return 1;
-    }
-    return 0;
-}
-
-Vec3 CDecal::GetWorldPosition()
-{
-    Vec3 vPos = m_vPos;
-
-    if (m_ownerInfo.pRenderNode)
-    {
-        if (m_eDecalType == eDecalType_OS_SimpleQuad || m_eDecalType == eDecalType_OS_OwnersVerticesUsed)
-        {
-            assert(m_ownerInfo.pRenderNode);
-            if (m_ownerInfo.pRenderNode)
-            {
-                Matrix34A objMat;
-                if (IStatObj* pEntObject = m_ownerInfo.GetOwner(objMat))
-                {
-                    vPos = objMat.TransformPoint(vPos);
-                }
-            }
-        }
-    }
-
-    return vPos;
-}
-
-void CDecal::Render(const float fCurTime, int nAfterWater, float fDistanceFading, float fDistance, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pMaterial || !m_pMaterial->GetShaderItem().m_pShader || m_pMaterial->GetShaderItem().m_pShader->GetShaderType() != eST_General)
-    {
-        return; // shader not supported for decals
-    }
-    // Get decal alpha from life time
-    float fAlpha = m_fLifeTime * 2;
-
-    if (fAlpha > 1.f)
-    {
-        fAlpha = 1.f;
-    }
-    else if (fAlpha < 0)
-    {
-        return;
-    }
-
-    fAlpha *= fDistanceFading;
-
-    float fSizeK;
-    if (m_fGrowTime)
-    {
-        fSizeK = min(1.f, sqrt_tpl((fCurTime - m_fLifeBeginTime) / m_fGrowTime));
-    }
-    else
-    {
-        fSizeK = 1.f;
-    }
-
-    float fSizeAlphaK;
-    if (m_fGrowTimeAlpha)
-    {
-        fSizeAlphaK = min(1.f, sqrt_tpl((fCurTime - m_fLifeBeginTime) / m_fGrowTimeAlpha));
-    }
-    else
-    {
-        fSizeAlphaK = 1.f;
-    }
-
-    if (m_bDeferred)
-    {
-        SDeferredDecal newItem;
-        newItem.fAlpha = fAlpha;
-        newItem.pMaterial = m_pMaterial;
-        newItem.nSortOrder = m_sortPrio;
-        newItem.nFlags = 0;
-
-        Vec3 vRight, vUp, vNorm;
-        Matrix34A objMat;
-
-        if (IStatObj* pEntObject = m_ownerInfo.GetOwner(objMat))
-        {
-            vRight = objMat.TransformVector(m_vRight * m_fSize);
-            vUp    = objMat.TransformVector(m_vUp * m_fSize);
-            vNorm  = objMat.TransformVector((Vec3(m_vRight).Cross(m_vUp)) * m_fSize);
-        }
-        else
-        {
-            vRight = (m_vRight * m_fSize);
-            vUp    = (m_vUp * m_fSize);
-            vNorm  = ((Vec3(m_vRight).Cross(m_vUp)) * m_fSize);
-        }
-
-        Matrix33 matRotation;
-        matRotation.SetColumn(0, vRight);
-        matRotation.SetColumn(1, vUp);
-        matRotation.SetColumn(2, vNorm * GetFloatCVar(e_DecalsDefferedDynamicDepthScale));
-        newItem.projMatrix.SetRotation33(matRotation);
-        newItem.projMatrix.SetTranslation(m_vWSPos + vNorm * .1f * m_fWSSize);
-
-        if (m_fGrowTimeAlpha)
-        {
-            newItem.fGrowAlphaRef = max(.02f, 1.f - fSizeAlphaK);
-        }
-        else
-        {
-            newItem.fGrowAlphaRef = 0;
-        }
-
-        GetRenderer()->EF_AddDeferredDecal(newItem);
-        return;
-    }
-
-    switch (m_eDecalType)
-    {
-    case eDecalType_WS_Merged:
-    case eDecalType_OS_OwnersVerticesUsed:
-    {
-        // check if owner mesh was deleted
-        if (m_pRenderMesh && (m_pRenderMesh->GetVertexContainer() == m_pRenderMesh) && m_pRenderMesh->GetVerticesCount() < 3)
-        {
-            FreeRenderData();
-        }
-
-        if (!m_pRenderMesh)
-        {
-            break;
-        }
-
-        // setup transformation
-        CRenderObject* pObj = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());
-        if (!pObj)
-        {
-            return;
-        }
-        pObj->m_fSort = 0;
-        pObj->m_RState = 0;
-
-        Matrix34A objMat;
-        if (m_ownerInfo.pRenderNode && !m_ownerInfo.GetOwner(objMat))
-        {
-            assert(0);
-            return;
-        }
-        else
-        if (!m_ownerInfo.pRenderNode)
-        {
-            objMat.SetIdentity();
-            if (m_eDecalType == eDecalType_WS_Merged)
-            {
-                objMat.SetTranslation(m_vPos);
-            }
-        }
-
-        pObj->m_II.m_Matrix = objMat;
-
-        pObj->m_nSort = m_sortPrio;
-
-        // somehow it's need's to be twice bigger to be same as simple decals
-        float fSize2 = m_fSize * fSizeK * 2.f;    ///m_ownerInfo.pRenderNode->GetScale();
-        if (fSize2 < 0.0001f)
-        {
-            return;
-        }
-
-        // setup texgen
-        // S component
-        float correctScale(-1);
-        m_arrBigDecalRMCustomData[0] = correctScale * m_vUp.x / fSize2;
-        m_arrBigDecalRMCustomData[1] = correctScale * m_vUp.y / fSize2;
-        m_arrBigDecalRMCustomData[2] = correctScale * m_vUp.z / fSize2;
-
-        Vec3 vPosDecS = m_vPos;
-        if (m_eDecalType == eDecalType_WS_Merged)
-        {
-            vPosDecS.zero();
-        }
-
-        float D0 =
-            m_arrBigDecalRMCustomData[0] * vPosDecS.x +
-            m_arrBigDecalRMCustomData[1] * vPosDecS.y +
-            m_arrBigDecalRMCustomData[2] * vPosDecS.z;
-
-        m_arrBigDecalRMCustomData[3] = -D0 + 0.5f;
-
-        // T component
-        m_arrBigDecalRMCustomData[4] = m_vRight.x / fSize2;
-        m_arrBigDecalRMCustomData[5] = m_vRight.y / fSize2;
-        m_arrBigDecalRMCustomData[6] = m_vRight.z / fSize2;
-
-        float D1 =
-            m_arrBigDecalRMCustomData[4] * vPosDecS.x +
-            m_arrBigDecalRMCustomData[5] * vPosDecS.y +
-            m_arrBigDecalRMCustomData[6] * vPosDecS.z;
-
-        m_arrBigDecalRMCustomData[7] = -D1 + 0.5f;
-
-        // pass attenuation info
-        m_arrBigDecalRMCustomData[8] = vPosDecS.x;
-        m_arrBigDecalRMCustomData[9] = vPosDecS.y;
-        m_arrBigDecalRMCustomData[10] = vPosDecS.z;
-        m_arrBigDecalRMCustomData[11] = m_fSize;
-
-        // N component
-        Vec3 vNormal(Vec3(correctScale* m_vUp).Cross(m_vRight).GetNormalized());
-        m_arrBigDecalRMCustomData[12] = vNormal.x * (m_fSize / m_fWSSize);
-        m_arrBigDecalRMCustomData[13] = vNormal.y * (m_fSize / m_fWSSize);
-        m_arrBigDecalRMCustomData[14] = vNormal.z * (m_fSize / m_fWSSize);
-        m_arrBigDecalRMCustomData[15] = 0;
-
-
-        // draw complex decal using new indices and original object vertices
-        pObj->m_fAlpha = fAlpha;
-        pObj->m_ObjFlags |= FOB_DECAL | FOB_DECAL_TEXGEN_2D;
-        pObj->m_nTextureID = -1;
-        //pObj->m_nTextureID1 = -1;
-        pObj->m_II.m_AmbColor = m_vAmbient;
-        m_pRenderMesh->SetREUserData(m_arrBigDecalRMCustomData, 0, fAlpha);
-        m_pRenderMesh->AddRenderElements(m_pMaterial, pObj, passInfo, EFSLIST_GENERAL, nAfterWater);
-    }
-    break;
-
-    case eDecalType_OS_SimpleQuad:
-    {
-        assert(m_ownerInfo.pRenderNode);
-        if (!m_ownerInfo.pRenderNode)
-        {
-            break;
-        }
-
-        // transform decal in software from owner space into world space and render as quad
-        Matrix34A objMat;
-        IStatObj* pEntObject = m_ownerInfo.GetOwner(objMat);
-        if (!pEntObject)
-        {
-            break;
-        }
-
-        Vec3 vPos    = objMat.TransformPoint(m_vPos);
-        Vec3 vRight = objMat.TransformVector(m_vRight * m_fSize);
-        Vec3 vUp    = objMat.TransformVector(m_vUp * m_fSize);
-        UCol uCol;
-
-        uCol.dcolor = 0xffffffff;
-        uCol.bcolor[3] = fastround_positive(fAlpha * 255);
-
-        GetObjManager()->AddDecalToRenderer(fDistance, m_pMaterial, m_sortPrio, vRight * fSizeK, vUp * fSizeK, uCol,
-            OS_ALPHA_BLEND, m_vAmbient, vPos, nAfterWater, passInfo, rendItemSorter);
-    }
-    break;
-
-    case eDecalType_WS_SimpleQuad:
-    {       // draw small world space decal untransformed
-        UCol uCol;
-        uCol.dcolor = 0;
-        uCol.bcolor[3] = fastround_positive(fAlpha * 255);
-
-        GetObjManager()->AddDecalToRenderer(fDistance, m_pMaterial, m_sortPrio, m_vRight * m_fSize * fSizeK,
-            m_vUp * m_fSize * fSizeK, uCol, OS_ALPHA_BLEND, m_vAmbient, m_vPos, nAfterWater, passInfo,
-            rendItemSorter);
-    }
-    break;
-
-    case eDecalType_WS_OnTheGround:
-    {
-        RenderBigDecalOnTerrain(fAlpha, fSizeK, passInfo);
-    }
-    break;
-    }
-}
-
-void CDecal::FreeRenderData()
-{
-    // delete render mesh
-    m_pRenderMesh = NULL;
-
-    m_ownerInfo.pRenderNode = 0;
-}
-
-void CDecal::RenderBigDecalOnTerrain(float fAlpha, float fScale, const SRenderingPassInfo& passInfo)
-{
-    float fRadius = m_fSize * fScale;
-
-    // check terrain bounds
-    if (m_vPos.x < -fRadius || m_vPos.y < -fRadius)
-    {
-        return;
-    }
-    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-    if (!terrain)
-    {
-        return;
-    }
-
-    const AZ::Aabb terrainAabb = terrain->GetTerrainAabb();
-    const float terrainSizeX = terrainAabb.GetXExtent();
-    const float terrainSizeY = terrainAabb.GetYExtent();
-
-    if (m_vPos.x >= terrainSizeX + fRadius || m_vPos.y >= terrainSizeY + fRadius)
-    {
-        return;
-    }
-
-    const AZ::Vector2 terrainGridResolution = terrain->GetTerrainGridResolution();
-    const int nUsintSize = static_cast<int>(AZ::GetMax(terrainGridResolution.GetX(), terrainGridResolution.GetY()));
-    fRadius += nUsintSize;
-
-    const float terrainHeight = terrain->GetHeightFromFloats(m_vPos.x, m_vPos.y, AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP);
-    if (fabs(m_vPos.z - terrainHeight) > fRadius)
-    {
-        return; // too far from ground surface
-    }
-    // setup texgen
-    float fSize = m_fSize * fScale;
-    if (fSize < 0.05f)
-    {
-        return;
-    }
-
-    // m_vUp and m_vRight are the scaled binormal and tangent
-    // The shader projects the vertex pass position onto these to calculate UVs
-    // However binormal and tangent are only half the height and width of the decal
-    // So we need to double them
-    Vec3 uvUp = m_vUp * 2.0f;
-    Vec3 uvRight = m_vRight * 2.0f;
-
-    // Let T denote the tangent, B the binormal and P the vertex position in decal space
-    // The shader calculates UVs by projecting vertex position onto the tangent and binormal:
-    // U = dot( T, P )
-    // V = dot( B, P )
-    // UVs should range 0...1, so normalize by the length of the tangent and binormal:
-    // U = dot( normalize(T), P / length(T) )
-    // V = dot( normalize(B), P / length(B) )
-    // This is equivalent to:
-    // U = dot( T, P ) / ( length(T) * length(T) )
-    // V = dot( B, P ) / ( length(B) * length(B) )
-    // The length squared can be folded into the tangent and binormal:
-    // U = dot( T / lengthSq(T), P )
-    // V = dot( B / lengthSq(B), P )
-    // Hence:
-    uvUp /= uvUp.GetLengthSquared();
-    uvRight /= uvRight.GetLengthSquared();
-
-    // S component
-    float correctScale(-1);
-    m_arrBigDecalRMCustomData[0] = correctScale * uvUp.x / fSize;
-    m_arrBigDecalRMCustomData[1] = correctScale * uvUp.y / fSize;
-    m_arrBigDecalRMCustomData[2] = correctScale * uvUp.z / fSize;
-
-    // T component
-    m_arrBigDecalRMCustomData[4] = uvRight.x / fSize;
-    m_arrBigDecalRMCustomData[5] = uvRight.y / fSize;
-    m_arrBigDecalRMCustomData[6] = uvRight.z / fSize;
-
-    // UV centering happens in the shader
-    // See shader function _TCModifyDecal
-    m_arrBigDecalRMCustomData[3] = 0.0f;
-    m_arrBigDecalRMCustomData[7] = 0.0f;
-
-    // pass attenuation info
-    m_arrBigDecalRMCustomData[8] = 0;
-    m_arrBigDecalRMCustomData[9] = 0;
-    m_arrBigDecalRMCustomData[10] = 0;
-    m_arrBigDecalRMCustomData[11] = fSize * 2.0f;
-
-    Vec3 vNormal(Vec3(correctScale* m_vUp).Cross(m_vRight).GetNormalized());
-    m_arrBigDecalRMCustomData[12] = vNormal.x;
-    m_arrBigDecalRMCustomData[13] = vNormal.y;
-    m_arrBigDecalRMCustomData[14] = vNormal.z;
-    m_arrBigDecalRMCustomData[15] = 0;
-
-    CRenderObject* pObj = GetIdentityCRenderObject(passInfo.ThreadID());
-    if (!pObj)
-    {
-        return;
-    }
-
-    pObj->m_II.m_Matrix.SetTranslation(m_vPos);
-
-    pObj->m_fAlpha = fAlpha;
-    pObj->m_ObjFlags |= FOB_DECAL | FOB_DECAL_TEXGEN_2D;
-    pObj->m_nTextureID = -1;
-    //pObj->m_nTextureID1 = -1;
-    pObj->m_II.m_AmbColor = m_vAmbient;
-
-    pObj->m_nSort = m_sortPrio;
-
-    Plane planes[4];
-    planes[0].SetPlane(m_vRight, m_vRight * m_fSize + m_vPos);
-    planes[1].SetPlane(-m_vRight, -m_vRight * m_fSize + m_vPos);
-    planes[2].SetPlane(m_vUp,    m_vUp * m_fSize    + m_vPos);
-    planes[3].SetPlane(-m_vUp,   -m_vUp * m_fSize    + m_vPos);
-}
diff --git a/Code/CryEngine/Cry3DEngine/DecalManager.cpp b/Code/CryEngine/Cry3DEngine/DecalManager.cpp
deleted file mode 100644
index 930403a2fd..0000000000
--- a/Code/CryEngine/Cry3DEngine/DecalManager.cpp
+++ /dev/null
@@ -1,1791 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : draw, create decals on the world
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "DecalManager.h"
-#include "3dEngine.h"
-#include <IStatObj.h>
-#include "ObjMan.h"
-#include "MatMan.h"
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-#include "RenderMeshMerger.h"
-#include "RenderMeshUtils.h"
-#include "VisAreas.h"
-#include "DecalRenderNode.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-#ifndef RENDER_MESH_TEST_DISTANCE
-    #define RENDER_MESH_TEST_DISTANCE (0.2f)
-#endif
-
-static const int MAX_ASSEMBLE_SIZE = 5;
-
-CDecalManager::CDecalManager()
-{
-    m_nCurDecal = 0;
-    memset(m_arrbActiveDecals, 0, sizeof(m_arrbActiveDecals));
-}
-
-CDecalManager::~CDecalManager()
-{
-    CDecal::ResetStaticData();
-}
-
-bool CDecalManager::AdjustDecalPosition(CryEngineDecalInfo& DecalInfo, bool bMakeFatTest)
-{
-    Matrix34A objMat, objMatInv;
-    Matrix33 objRot, objRotInv;
-
-    CStatObj* pEntObject = (CStatObj*)DecalInfo.ownerInfo.GetOwner(objMat);
-    if (!pEntObject || !pEntObject->GetRenderMesh() || !pEntObject->GetRenderTrisCount())
-    {
-        return false;
-    }
-
-    objRot = Matrix33(objMat);
-    objRot.NoScale(); // No scale.
-    objRotInv = objRot;
-    objRotInv.Invert();
-
-    float fWorldScale = objMat.GetColumn(0).GetLength(); // GetScale
-    float fWorldScaleInv = 1.0f / fWorldScale;
-
-    // transform decal into object space
-    objMatInv = objMat;
-    objMatInv.Invert();
-
-    // put into normal object space hit direction of projection
-    Vec3 vOS_HitDir = objRotInv.TransformVector(DecalInfo.vHitDirection).GetNormalized();
-
-    // put into position object space hit position
-    Vec3 vOS_HitPos = objMatInv.TransformPoint(DecalInfo.vPos);
-    vOS_HitPos -= vOS_HitDir * RENDER_MESH_TEST_DISTANCE * fWorldScaleInv;
-
-    _smart_ptr<IMaterial> pMat = DecalInfo.ownerInfo.pRenderNode ? DecalInfo.ownerInfo.pRenderNode->GetMaterial() : NULL;
-
-    Vec3 vOS_OutPos(0, 0, 0), vOS_OutNormal(0, 0, 0), vTmp;
-    IRenderMesh* pRM = pEntObject->GetRenderMesh();
-
-    AABB aabbRNode;
-    pRM->GetBBox(aabbRNode.min, aabbRNode.max);
-    Vec3 vOut(0, 0, 0);
-    if (!Intersect::Ray_AABB(Ray(vOS_HitPos, vOS_HitDir), aabbRNode, vOut))
-    {
-        return false;
-    }
-
-    if (!pRM || !pRM->GetVerticesCount())
-    {
-        return false;
-    }
-
-    if (RayRenderMeshIntersection(pRM, vOS_HitPos, vOS_HitDir, vOS_OutPos, vOS_OutNormal, false, 0, pMat))
-    {
-        // now check that none of decal sides run across edges
-        Vec3 srcp = vOS_OutPos + 0.01f * fWorldScaleInv * vOS_OutNormal; /// Rise hit point a little bit above hit plane.
-        Vec3 vDecalNormal = vOS_OutNormal;
-        float fMaxHitDistance = 0.02f * fWorldScaleInv;
-
-        // get decal directions
-        Vec3 vRi(0, 0, 0), vUp(0, 0, 0);
-        if (fabs(vOS_OutNormal.Dot(Vec3(0, 0, 1))) > 0.999f)
-        { // horiz surface
-            vRi = Vec3(0, 1, 0);
-            vUp = Vec3(1, 0, 0);
-        }
-        else
-        {
-            vRi = vOS_OutNormal.Cross(Vec3(0, 0, 1));
-            vRi.Normalize();
-            vUp = vOS_OutNormal.Cross(vRi);
-            vUp.Normalize();
-        }
-
-        vRi *= DecalInfo.fSize * 0.65f;
-        vUp *= DecalInfo.fSize * 0.65f;
-
-        if (!bMakeFatTest || (
-                RayRenderMeshIntersection(pRM, srcp + vUp, -vDecalNormal, vTmp, vTmp, true, fMaxHitDistance, pMat) &&
-                RayRenderMeshIntersection(pRM, srcp - vUp, -vDecalNormal, vTmp, vTmp, true, fMaxHitDistance, pMat) &&
-                RayRenderMeshIntersection(pRM, srcp + vRi, -vDecalNormal, vTmp, vTmp, true, fMaxHitDistance, pMat) &&
-                RayRenderMeshIntersection(pRM, srcp - vRi, -vDecalNormal, vTmp, vTmp, true, fMaxHitDistance, pMat)))
-        {
-            DecalInfo.vPos = objMat.TransformPoint(vOS_OutPos + vOS_OutNormal * 0.001f * fWorldScaleInv);
-            DecalInfo.vNormal = objRot.TransformVector(vOS_OutNormal);
-            return true;
-        }
-    }
-    return false;
-}
-
-struct HitPosInfo
-{
-    HitPosInfo() { memset(this, 0, sizeof(HitPosInfo)); }
-    Vec3 vPos, vNormal;
-    float fDistance;
-};
-
-int __cdecl CDecalManager__CmpHitPos(const void* v1, const void* v2)
-{
-    HitPosInfo* p1 = (HitPosInfo*)v1;
-    HitPosInfo* p2 = (HitPosInfo*)v2;
-
-    if (p1->fDistance > p2->fDistance)
-    {
-        return 1;
-    }
-    else if (p1->fDistance < p2->fDistance)
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-bool CDecalManager::RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir,
-    Vec3& vOutPos, Vec3& vOutNormal, bool bFastTest, float fMaxHitDistance, _smart_ptr<IMaterial> pMat)
-{
-    SRayHitInfo hitInfo;
-    hitInfo.bUseCache = GetCVars()->e_DecalsHitCache != 0;
-    hitInfo.bInFirstHit = bFastTest;
-    hitInfo.inRay.origin = vInPos;
-    hitInfo.inRay.direction = vInDir.GetNormalized();
-    hitInfo.inReferencePoint = vInPos;
-    hitInfo.fMaxHitDistance = fMaxHitDistance;
-    bool bRes = CRenderMeshUtils::RayIntersection(pRenderMesh, hitInfo, pMat);
-    vOutPos = hitInfo.vHitPos;
-    vOutNormal = hitInfo.vHitNormal;
-    return bRes;
-}
-
-bool CDecalManager::SpawnHierarchical(const CryEngineDecalInfo& rootDecalInfo, CDecal* pCallerManagedDecal)
-{
-    // decal on terrain or simple decal on always static object
-    if (!rootDecalInfo.ownerInfo.pRenderNode)
-    {
-        return Spawn(rootDecalInfo, pCallerManagedDecal);
-    }
-
-    bool bSuccess = false;
-
-    AABB decalBoxWS;
-    float fSize = rootDecalInfo.fSize;
-    decalBoxWS.max = rootDecalInfo.vPos + Vec3(fSize, fSize, fSize);
-    decalBoxWS.min = rootDecalInfo.vPos - Vec3(fSize, fSize, fSize);
-
-    for (int nEntitySlotId = 0; nEntitySlotId < 16; nEntitySlotId++)
-    {
-        Matrix34A entSlotMatrix;
-        entSlotMatrix.SetIdentity();
-        CStatObj* _pStatObj = (CStatObj*)rootDecalInfo.ownerInfo.pRenderNode->GetEntityStatObj(nEntitySlotId, ~0, &entSlotMatrix, true);
-        if (_pStatObj)
-        {
-            if (_pStatObj->m_nFlags & STATIC_OBJECT_COMPOUND)
-            {
-                if (int nSubCount = _pStatObj->GetSubObjectCount())
-                { // spawn decals on stat obj sub objects
-                    CryEngineDecalInfo decalInfo = rootDecalInfo;
-                    decalInfo.ownerInfo.nRenderNodeSlotId = nEntitySlotId;
-                    if (rootDecalInfo.ownerInfo.nRenderNodeSlotSubObjectId >= 0)
-                    {
-                        decalInfo.ownerInfo.nRenderNodeSlotSubObjectId = rootDecalInfo.ownerInfo.nRenderNodeSlotSubObjectId;
-                        bSuccess |= Spawn(decalInfo, pCallerManagedDecal);
-                    }
-                    else
-                    {
-                        for (int nSubId = 0; nSubId < nSubCount; nSubId++)
-                        {
-                            IStatObj::SSubObject& subObj = _pStatObj->SubObject(nSubId);
-                            if (subObj.pStatObj && !subObj.bHidden && subObj.nType == STATIC_SUB_OBJECT_MESH)
-                            {
-                                Matrix34 subObjMatrix = entSlotMatrix * subObj.tm;
-                                AABB subObjAABB = AABB::CreateTransformedAABB(subObjMatrix, subObj.pStatObj->GetAABB());
-                                if (Overlap::AABB_AABB(subObjAABB, decalBoxWS))
-                                {
-                                    decalInfo.ownerInfo.nRenderNodeSlotSubObjectId = nSubId;
-                                    bSuccess |= Spawn(decalInfo, pCallerManagedDecal);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                AABB subObjAABB = AABB::CreateTransformedAABB(entSlotMatrix, _pStatObj->GetAABB());
-                if (Overlap::AABB_AABB(subObjAABB, decalBoxWS))
-                {
-                    CryEngineDecalInfo decalInfo = rootDecalInfo;
-                    decalInfo.ownerInfo.nRenderNodeSlotId = nEntitySlotId;
-                    decalInfo.ownerInfo.nRenderNodeSlotSubObjectId = -1; // no childs
-                    bSuccess |= Spawn(decalInfo, pCallerManagedDecal);
-                }
-            }
-        }
-    }
-
-    return bSuccess;
-}
-
-bool CDecalManager::Spawn(CryEngineDecalInfo DecalInfo, CDecal* pCallerManagedDecal)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    Vec3 vCamPos = GetSystem()->GetViewCamera().GetPosition();
-
-    // do not spawn if too far
-    float fZoom = GetObjManager() ? Get3DEngine()->GetZoomFactor() : 1.f;
-    float fDecalDistance = DecalInfo.vPos.GetDistance(vCamPos);
-    if (!pCallerManagedDecal && (fDecalDistance > Get3DEngine()->GetMaxViewDistance() || fDecalDistance * fZoom > DecalInfo.fSize * ENTITY_DECAL_DIST_FACTOR * 3.f))
-    {
-        return false;
-    }
-
-    int overlapCount(0);
-    int targetSize(0);
-    int overlapIds[MAX_ASSEMBLE_SIZE];
-
-    // do not spawn new decals if they could overlap the existing and similar ones
-    if (!pCallerManagedDecal && !GetCVars()->e_DecalsOverlapping && DecalInfo.fSize && !DecalInfo.bSkipOverlappingTest)
-    {
-        for (int i = 0; i < DECAL_COUNT; i++)
-        {
-            if (m_arrbActiveDecals[i])
-            {
-                // skip overlapping check if decals are very different in size
-                if ((m_arrDecals[i].m_iAssembleSize > 0) == DecalInfo.bAssemble)
-                {
-                    float fSizeRatio = m_arrDecals[i].m_fWSSize / DecalInfo.fSize;
-                    if (((m_arrDecals[i].m_iAssembleSize > 0) || (fSizeRatio > 0.5f && fSizeRatio < 2.f)) && m_arrDecals[i].m_nGroupId != DecalInfo.nGroupId)
-                    {
-                        float fDist = m_arrDecals[i].m_vWSPos.GetSquaredDistance(DecalInfo.vPos);
-                        if (fDist < sqr(m_arrDecals[i].m_fWSSize * 0.5f + DecalInfo.fSize * 0.5f) && (DecalInfo.vNormal.Dot(m_arrDecals[i].m_vFront) > 0.f))
-                        {
-                            if (DecalInfo.bAssemble && m_arrDecals[i].m_iAssembleSize < MAX_ASSEMBLE_SIZE)
-                            {
-                                if (overlapCount < MAX_ASSEMBLE_SIZE)
-                                {
-                                    overlapIds[overlapCount] = i;
-                                    overlapCount++;
-                                }
-                                else
-                                {
-                                    m_arrbActiveDecals[i] = false;
-                                }
-                            }
-                            else
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    float fAssembleSizeModifier(1.0f);
-    if (DecalInfo.bAssemble)
-    {
-        Vec3 avgPos(0.0f, 0.0f, 0.0f);
-        int validAssembles(0);
-        for (int i = 0; i < overlapCount; i++)
-        {
-            int id = overlapIds[i];
-
-            float fDist = m_arrDecals[id].m_vWSPos.GetSquaredDistance(DecalInfo.vPos);
-            float minDist = sqr(m_arrDecals[id].m_fWSSize * 0.4f);
-            if (fDist > minDist)
-            {
-                avgPos += m_arrDecals[id].m_vWSPos;
-                targetSize += m_arrDecals[id].m_iAssembleSize;
-                validAssembles++;
-            }
-        }
-
-        if (overlapCount && !validAssembles)
-        {
-            return true;
-        }
-
-        for (int i = 0; i < overlapCount; i++)
-        {
-            int id = overlapIds[i];
-            m_arrbActiveDecals[id] = false;
-        }
-
-        ++validAssembles;
-        ++targetSize;
-        avgPos += DecalInfo.vPos;
-
-        if (targetSize > 1)
-        {
-            avgPos /= float(validAssembles);
-            DecalInfo.vPos = avgPos;
-            targetSize = min(targetSize, MAX_ASSEMBLE_SIZE);
-
-            const float sizetable[MAX_ASSEMBLE_SIZE] = {1.0f, 1.5f, 2.3f, 3.5f, 3.5f};
-            const char sValue[2] = { aznumeric_caster('0' + targetSize), 0 };
-            cry_strcat(DecalInfo.szMaterialName, sValue);
-            fAssembleSizeModifier = sizetable[targetSize - 1];
-        }
-    }
-
-
-    if (GetCVars()->e_Decals > 1)
-    {
-        DrawSphere(DecalInfo.vPos, DecalInfo.fSize);
-    }
-
-    // update lifetime for near decals under control by the decal manager
-    if (!pCallerManagedDecal)
-    {
-        if (DecalInfo.fSize > 1 && GetCVars()->e_DecalsNeighborMaxLifeTime)
-        { // force near decals to fade faster
-            float fCurrTime = GetTimer()->GetCurrTime();
-            for (int i = 0; i < DECAL_COUNT; i++)
-            {
-                if (m_arrbActiveDecals[i] && m_arrDecals[i].m_nGroupId != DecalInfo.nGroupId)
-                {
-                    if (m_arrDecals[i].m_vWSPos.GetSquaredDistance(DecalInfo.vPos) < sqr(m_arrDecals[i].m_fWSSize / 1.5f + DecalInfo.fSize / 2.0f))
-                    {
-                        if ((m_arrDecals[i]).m_fLifeBeginTime < fCurrTime - 0.1f)
-                        {
-                            if (m_arrDecals[i].m_fLifeTime > GetCVars()->e_DecalsNeighborMaxLifeTime)
-                            {
-                                if (m_arrDecals[i].m_fLifeTime < 10000) // decals spawn by cut scenes need to stay
-                                {
-                                    m_arrDecals[i].m_fLifeTime = GetCVars()->e_DecalsNeighborMaxLifeTime;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // loop position in array
-        m_nCurDecal = (m_nCurDecal + 1) & (DECAL_COUNT - 1);
-        //if(m_nCurDecal>=DECAL_COUNT)
-        //  m_nCurDecal=0;
-    }
-
-    // create reference to decal which is to be filled
-    CDecal& newDecal(pCallerManagedDecal ? *pCallerManagedDecal : m_arrDecals[ m_nCurDecal ]);
-
-    newDecal.m_bDeferred = DecalInfo.bDeferred;
-
-    newDecal.m_iAssembleSize = targetSize;
-    // free old pRM
-    newDecal.FreeRenderData();
-
-    newDecal.m_nGroupId = DecalInfo.nGroupId;
-
-    // get material if specified
-    newDecal.m_pMaterial = 0;
-
-    if (DecalInfo.szMaterialName[0] != '\0')
-    {
-        newDecal.m_pMaterial = GetMatMan()->LoadMaterial(DecalInfo.szMaterialName, false, true);
-        if (!newDecal.m_pMaterial)
-        {
-            newDecal.m_pMaterial = GetMatMan()->LoadMaterial("EngineAssets/Materials/Decals/Default", true, true);
-            newDecal.m_pMaterial->AddRef();
-            Warning("CDecalManager::Spawn: Specified decal material \"%s\" not found!\n", DecalInfo.szMaterialName);
-        }
-    }
-
-    newDecal.m_sortPrio = DecalInfo.sortPrio;
-
-    // set up user defined decal basis if provided
-    bool useDefinedUpRight(false);
-    Vec3 userDefinedUp;
-    Vec3 userDefinedRight;
-    if (DecalInfo.pExplicitRightUpFront)
-    {
-        userDefinedRight = DecalInfo.pExplicitRightUpFront->GetColumn(0);
-        userDefinedUp = DecalInfo.pExplicitRightUpFront->GetColumn(1);
-        DecalInfo.vNormal = DecalInfo.pExplicitRightUpFront->GetColumn(2);
-        useDefinedUpRight = true;
-    }
-
-    // just in case
-    DecalInfo.vNormal.NormalizeSafe();
-
-    // remember object we need to follow
-    newDecal.m_ownerInfo.nRenderNodeSlotId = DecalInfo.ownerInfo.nRenderNodeSlotId;
-    newDecal.m_ownerInfo.nRenderNodeSlotSubObjectId = DecalInfo.ownerInfo.nRenderNodeSlotSubObjectId;
-
-    newDecal.m_vWSPos = DecalInfo.vPos;
-    newDecal.m_fWSSize = DecalInfo.fSize * fAssembleSizeModifier;
-
-    // If owner entity and object is specified - make decal use entity geometry
-    float _fObjScale = 1.f;
-
-    Matrix34A _objMat;
-    Matrix33 worldRot;
-    IStatObj* pStatObj = DecalInfo.ownerInfo.GetOwner(_objMat);
-    if (pStatObj)
-    {
-        worldRot = Matrix33(_objMat);
-        _objMat.Invert();
-    }
-
-    float fWrapMinSize = GetFloatCVar(e_DecalsDefferedDynamicMinSize);
-
-    if (DecalInfo.ownerInfo.pRenderNode && DecalInfo.ownerInfo.nRenderNodeSlotId >= 0 && (DecalInfo.fSize > fWrapMinSize || pCallerManagedDecal) && !DecalInfo.bDeferred)
-    {
-        newDecal.m_eDecalType = eDecalType_OS_OwnersVerticesUsed;
-
-        IRenderMesh* pSourceRenderMesh = NULL;
-
-        if (pStatObj)
-        {
-            pSourceRenderMesh = pStatObj->GetRenderMesh();
-        }
-
-        if (!pSourceRenderMesh)
-        {
-            return false;
-        }
-
-        // transform decal into object space
-        Matrix33 objRotInv = Matrix33(_objMat);
-        objRotInv.NoScale();
-
-        if (useDefinedUpRight)
-        {
-            userDefinedRight = objRotInv.TransformVector(userDefinedRight).GetNormalized();
-            userDefinedUp = objRotInv.TransformVector(userDefinedUp).GetNormalized();
-            assert(fabsf(DecalInfo.vNormal.Dot(-DecalInfo.vHitDirection.GetNormalized()) - 1.0f) < 1e-4f);
-        }
-
-        // make decals smaller but longer if hit direction is near perpendicular to surface normal
-        float fSizeModificator = 0.25f + 0.75f * fabs(DecalInfo.vHitDirection.GetNormalized().Dot(DecalInfo.vNormal));
-
-        // put into normal object space hit direction of projection
-        DecalInfo.vNormal = -objRotInv.TransformVector((DecalInfo.vHitDirection - DecalInfo.vNormal * 0.25f).GetNormalized());
-
-        if (!DecalInfo.vNormal.IsZero())
-        {
-            DecalInfo.vNormal.Normalize();
-        }
-
-        // put into position object space hit position
-        DecalInfo.vPos = _objMat.TransformPoint(DecalInfo.vPos);
-
-        // find object scale
-        float fObjScale = 1.f;
-        Vec3 vTest(0, 0, 1.f);
-        vTest = _objMat.TransformVector(vTest);
-        fObjScale = 1.f / vTest.len();
-
-        if (fObjScale < 0.01f)
-        {
-            return false;
-        }
-
-        // transform size into object space
-        DecalInfo.fSize /= fObjScale;
-
-        DecalInfo.fSize *= (DecalInfo.bAssemble ? fAssembleSizeModifier : fSizeModificator);
-
-        if (DecalInfo.bForceEdge)
-        {
-            SRayHitInfo hitInfo;
-            hitInfo.bUseCache = GetCVars()->e_DecalsHitCache != 0;
-            hitInfo.bInFirstHit = false;
-            hitInfo.inRay.origin = DecalInfo.vPos + DecalInfo.vNormal;
-            hitInfo.inRay.direction = -DecalInfo.vNormal;
-            hitInfo.inReferencePoint = DecalInfo.vPos + DecalInfo.vNormal;
-            hitInfo.inRetTriangle = true;
-            CRenderMeshUtils::RayIntersection(pSourceRenderMesh, hitInfo, pStatObj ? pStatObj->GetMaterial() : NULL);
-
-            MoveToEdge(pSourceRenderMesh, DecalInfo.fSize, hitInfo.vHitPos, hitInfo.vHitNormal, hitInfo.vTri0, hitInfo.vTri1, hitInfo.vTri2);
-            DecalInfo.vPos = hitInfo.vHitPos;
-            DecalInfo.vNormal = hitInfo.vHitNormal;
-        }
-
-        // make decal geometry
-        if (!newDecal.m_pMaterial)
-        {
-            // I'm not sure what consequences will be if m_pMaterial is null, so we warn about it just in case. Feel free to remove this if you hit it and all is well.
-            Warning("CDecalManager::Spawn: Decal material is null while creating BigDecalRenderMesh"); 
-        }
-        newDecal.m_pRenderMesh = MakeBigDecalRenderMesh(pSourceRenderMesh, DecalInfo.vPos, DecalInfo.fSize, DecalInfo.vNormal, newDecal.m_pMaterial, pStatObj ? pStatObj->GetMaterial() : NULL);
-
-        if (!newDecal.m_pRenderMesh)
-        {
-            return false; // no geometry found
-        }
-    }
-    else if (!DecalInfo.ownerInfo.pRenderNode && DecalInfo.ownerInfo.pDecalReceivers && (DecalInfo.fSize > fWrapMinSize || pCallerManagedDecal) && !DecalInfo.bDeferred)
-    {
-        newDecal.m_eDecalType = eDecalType_WS_Merged;
-
-        assert(!newDecal.m_pRenderMesh);
-
-        // put into normal hit direction of projection
-        DecalInfo.vNormal = -DecalInfo.vHitDirection;
-        if (!DecalInfo.vNormal.IsZero())
-        {
-            DecalInfo.vNormal.Normalize();
-        }
-
-        Vec3 vSize(DecalInfo.fSize * 1.333f, DecalInfo.fSize * 1.333f, DecalInfo.fSize * 1.333f);
-        AABB decalAABB(DecalInfo.vPos - vSize, DecalInfo.vPos + vSize);
-
-        // build list of objects
-        PodArray<SRenderMeshInfoInput> lstRMI;
-        for (int nObj = 0; nObj < DecalInfo.ownerInfo.pDecalReceivers->Count(); nObj++)
-        {
-            IRenderNode* pDecalOwner = DecalInfo.ownerInfo.pDecalReceivers->Get(nObj)->pNode;
-            Matrix34A objMat;
-            if (IStatObj* pEntObject = pDecalOwner->GetEntityStatObj(DecalInfo.ownerInfo.nRenderNodeSlotId, 0, &objMat))
-            {
-                SRenderMeshInfoInput rmi;
-                rmi.pMesh = pEntObject->GetRenderMesh();
-                rmi.pMat = pEntObject->GetMaterial();
-                rmi.mat = objMat;
-
-                if (rmi.pMesh)
-                {
-                    AABB transAABB = AABB::CreateTransformedAABB(rmi.mat, pEntObject->GetAABB());
-                    if (Overlap::AABB_AABB(decalAABB, transAABB))
-                    {
-                        lstRMI.Add(rmi);
-                    }
-                }
-                else
-                if (int nSubObjCount = pEntObject->GetSubObjectCount())
-                { // multi sub objects
-                    for (int nSubObj = 0; nSubObj < nSubObjCount; nSubObj++)
-                    {
-                        IStatObj::SSubObject* pSubObj = pEntObject->GetSubObject(nSubObj);
-                        if (pSubObj->pStatObj)
-                        {
-                            rmi.pMesh = pSubObj->pStatObj->GetRenderMesh();
-                            rmi.pMat = pSubObj->pStatObj->GetMaterial();
-                            rmi.mat = objMat * pSubObj->tm;
-                            if (rmi.pMesh)
-                            {
-                                AABB transAABB = AABB::CreateTransformedAABB(rmi.mat, pSubObj->pStatObj->GetAABB());
-                                if (Overlap::AABB_AABB(decalAABB, transAABB))
-                                {
-                                    lstRMI.Add(rmi);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!lstRMI.Count())
-        {
-            return false;
-        }
-
-        SDecalClipInfo DecalClipInfo;
-        DecalClipInfo.vPos = DecalInfo.vPos;
-        DecalClipInfo.fRadius = DecalInfo.fSize;
-        DecalClipInfo.vProjDir = DecalInfo.vNormal;
-
-        PodArray<SRenderMeshInfoOutput> outRenderMeshes;
-        CRenderMeshMerger Merger;
-        SMergeInfo info;
-        info.sMeshName = "MergedDecal";
-        info.sMeshType = "MergedDecal";
-        info.pDecalClipInfo = &DecalClipInfo;
-        info.vResultOffset = DecalInfo.vPos;
-        newDecal.m_pRenderMesh = Merger.MergeRenderMeshes(lstRMI.GetElements(), lstRMI.Count(), outRenderMeshes, info);
-
-        if (!newDecal.m_pRenderMesh)
-        {
-            return false; // no geometry found
-        }
-        assert(newDecal.m_pRenderMesh->GetChunks().size() == 1);
-    }
-    else
-    if (DecalInfo.ownerInfo.pRenderNode &&
-        (DecalInfo.ownerInfo.pRenderNode->GetRenderNodeType() == eERType_RenderComponent || 
-         DecalInfo.ownerInfo.pRenderNode->GetRenderNodeType() == eERType_StaticMeshRenderComponent ||
-         DecalInfo.ownerInfo.pRenderNode->GetRenderNodeType() == eERType_DynamicMeshRenderComponent ||
-         DecalInfo.ownerInfo.pRenderNode->GetRenderNodeType() == eERType_SkinnedMeshRenderComponent) &&
-        DecalInfo.ownerInfo.nRenderNodeSlotId >= 0)
-    {
-        newDecal.m_eDecalType = eDecalType_OS_SimpleQuad;
-
-        Matrix34A objMat;
-
-        // transform decal from world space into entity space
-        IStatObj* pEntObject = DecalInfo.ownerInfo.GetOwner(objMat);
-        if (!pEntObject)
-        {
-            return false;
-        }
-        assert(pEntObject);
-        objMat.Invert();
-
-        if (useDefinedUpRight)
-        {
-            userDefinedRight = objMat.TransformVector(userDefinedRight).GetNormalized();
-            userDefinedUp = objMat.TransformVector(userDefinedUp).GetNormalized();
-            assert(fabsf(DecalInfo.vNormal.Dot(-DecalInfo.vHitDirection.GetNormalized()) - 1.0f) < 1e-4f);
-        }
-
-        DecalInfo.vNormal = objMat.TransformVector(DecalInfo.vNormal).GetNormalized();
-        DecalInfo.vPos = objMat.TransformPoint(DecalInfo.vPos);
-
-        // find object scale
-        Vec3 vTest(0, 0, 1.f);
-        vTest = objMat.TransformVector(vTest);
-        _fObjScale = 1.f / vTest.len();
-
-        DecalInfo.fSize /= _fObjScale;
-    }
-    else
-    {
-        bool isHole = true;
-        auto enumerationCallback = [&](AzFramework::Terrain::TerrainDataRequests* terrain) -> bool
-        {
-            isHole = false;
-            if (!DecalInfo.preventDecalOnGround && DecalInfo.fSize > (fWrapMinSize * 2.f) && !DecalInfo.ownerInfo.pRenderNode &&
-                (DecalInfo.vPos.z - terrain->GetHeightFromFloats(DecalInfo.vPos.x, DecalInfo.vPos.y)) < DecalInfo.fSize && !DecalInfo.bDeferred)
-            {
-                newDecal.m_eDecalType = eDecalType_WS_OnTheGround;
-
-                const AZ::Vector2 terrainGridResolution = terrain->GetTerrainGridResolution();
-                const float unitSizeX = terrainGridResolution.GetX();
-                const float unitSizeY = terrainGridResolution.GetY();
-
-                const float x1 = (DecalInfo.vPos.x - DecalInfo.fSize) / unitSizeX * unitSizeX - unitSizeX;
-                const float x2 = (DecalInfo.vPos.x + DecalInfo.fSize) / unitSizeX * unitSizeX + unitSizeX;
-                const float y1 = (DecalInfo.vPos.y - DecalInfo.fSize) / unitSizeY * unitSizeY - unitSizeY;
-                const float y2 = (DecalInfo.vPos.y + DecalInfo.fSize) / unitSizeY * unitSizeY + unitSizeY;
-
-                for (float x = x1; x <= x2; x += unitSizeX)
-                {
-                    for (float y = y1; y <= y2; y += unitSizeY)
-                    {
-                        if (terrain->GetIsHoleFromFloats(x, y))
-                        {
-                            isHole = true;
-                            return false;
-                        }
-                    }
-                }
-            }
-            // Only one handler should exist.
-            return false;
-        };
-        AzFramework::Terrain::TerrainDataRequestBus::EnumerateHandlers(enumerationCallback);
-        if (isHole)
-        {
-            return false;
-        }
-        else
-        {
-            newDecal.m_eDecalType = eDecalType_WS_SimpleQuad;
-        }
-
-        DecalInfo.ownerInfo.pRenderNode = NULL;
-    }
-
-    // spawn
-    if (!useDefinedUpRight)
-    {
-        if (DecalInfo.vNormal.Dot(Vec3(0, 0, 1)) > 0.999f)
-        { // floor
-            newDecal.m_vRight = Vec3(0, 1, 0);
-            newDecal.m_vUp    = Vec3(-1, 0, 0);
-        }
-        else if (DecalInfo.vNormal.Dot(Vec3(0, 0, -1)) > 0.999f)
-        { // ceil
-            newDecal.m_vRight = Vec3(1, 0, 0);
-            newDecal.m_vUp    = Vec3(0, -1, 0);
-        }
-        else if (!DecalInfo.vNormal.IsZero())
-        {
-            newDecal.m_vRight = DecalInfo.vNormal.Cross(Vec3(0, 0, 1));
-            newDecal.m_vRight.Normalize();
-            newDecal.m_vUp    = DecalInfo.vNormal.Cross(newDecal.m_vRight);
-            newDecal.m_vUp.Normalize();
-        }
-
-        // rotate vectors
-        if (!DecalInfo.vNormal.IsZero())
-        {
-            AngleAxis rotation(DecalInfo.fAngle, DecalInfo.vNormal);
-            newDecal.m_vRight = rotation * newDecal.m_vRight;
-            newDecal.m_vUp      = rotation * newDecal.m_vUp;
-        }
-    }
-    else
-    {
-        newDecal.m_vRight = userDefinedRight;
-        newDecal.m_vUp = userDefinedUp;
-    }
-
-    newDecal.m_vFront       = DecalInfo.vNormal;
-
-    newDecal.m_vPos = DecalInfo.vPos;
-    newDecal.m_vPos += DecalInfo.vNormal * 0.001f / _fObjScale;
-
-    newDecal.m_fSize = DecalInfo.fSize;
-    newDecal.m_fLifeTime = DecalInfo.fLifeTime * GetCVars()->e_DecalsLifeTimeScale;
-    assert(!DecalInfo.pIStatObj); // not used -> not supported
-
-    newDecal.m_ownerInfo.pRenderNode = DecalInfo.ownerInfo.pRenderNode;
-    if (DecalInfo.ownerInfo.pRenderNode)
-    {
-        DecalInfo.ownerInfo.pRenderNode->m_nInternalFlags |= IRenderNode::DECAL_OWNER;
-    }
-
-    newDecal.m_fGrowTime = DecalInfo.fGrowTime;
-    newDecal.m_fGrowTimeAlpha = DecalInfo.fGrowTimeAlpha;
-    newDecal.m_fLifeBeginTime = GetTimer()->GetCurrTime();
-
-    if (DecalInfo.pIStatObj && !pCallerManagedDecal)
-    {
-        //assert(!"Geometry decals neede to be re-debugged");
-        DecalInfo.pIStatObj->AddRef();
-    }
-
-    if (!pCallerManagedDecal)
-    {
-        m_arrbActiveDecals[ m_nCurDecal ] = true;
-        ++m_nCurDecal;
-    }
-
-#ifdef _DEBUG
-    if (newDecal.m_ownerInfo.pRenderNode)
-    {
-        cry_strcpy(newDecal.m_decalOwnerEntityClassName, newDecal.m_ownerInfo.pRenderNode->GetEntityClassName());
-        cry_strcpy(newDecal.m_decalOwnerName, newDecal.m_ownerInfo.pRenderNode->GetName());
-        newDecal.m_decalOwnerType = newDecal.m_ownerInfo.pRenderNode->GetRenderNodeType();
-    }
-    else
-    {
-        newDecal.m_decalOwnerEntityClassName[0] = '\0';
-        newDecal.m_decalOwnerName[0] = '\0';
-        newDecal.m_decalOwnerType = eERType_NotRenderNode;
-    }
-#endif
-
-    return true;
-}
-
-void CDecalManager::Update(const float fFrameTime)
-{
-    CryPrefetch(&m_arrbActiveDecals[0]);
-    CryPrefetch(&m_arrbActiveDecals[128]);
-    CryPrefetch(&m_arrbActiveDecals[256]);
-    CryPrefetch(&m_arrbActiveDecals[384]);
-
-    for (int i = 0; i < DECAL_COUNT; i++)
-    {
-        if (m_arrbActiveDecals[i])
-        {
-            IRenderNode* pRenderNode = m_arrDecals[i].m_ownerInfo.pRenderNode;
-            if (m_arrDecals[i].Update(m_arrbActiveDecals[i], fFrameTime))
-            {
-                if (pRenderNode && m_arrTempUpdatedOwners.Find(pRenderNode) < 0)
-                {
-                    m_arrTempUpdatedOwners.Add(pRenderNode);
-                }
-            }
-        }
-    }
-
-    for (int i = 0; i < m_arrTempUpdatedOwners.Count(); i++)
-    {
-        m_arrTempUpdatedOwners[i]->m_nInternalFlags &= ~IRenderNode::UPDATE_DECALS;
-    }
-
-    m_arrTempUpdatedOwners.Clear();
-}
-
-
-void CDecalManager::Render(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!passInfo.RenderDecals() || !GetObjManager())
-    {
-        return;
-    }
-
-    float fCurrTime = GetTimer()->GetCurrTime();
-    float fZoom = passInfo.GetZoomFactor();
-
-    static int nLastUpdateStreamingPrioriryRoundId = 0;
-    bool bPrecacheMaterial = nLastUpdateStreamingPrioriryRoundId != GetObjManager()->GetUpdateStreamingPrioriryRoundId();
-    nLastUpdateStreamingPrioriryRoundId = GetObjManager()->GetUpdateStreamingPrioriryRoundId();
-
-    static int nLastUpdateStreamingPrioriryRoundIdFast = 0;
-    bool bPrecacheMaterialFast = nLastUpdateStreamingPrioriryRoundIdFast != GetObjManager()->GetUpdateStreamingPrioriryRoundIdFast();
-    nLastUpdateStreamingPrioriryRoundIdFast = GetObjManager()->GetUpdateStreamingPrioriryRoundIdFast();
-
-    const CCamera& rCamera = passInfo.GetCamera();
-
-    // draw
-    for (int i = 0; i < DECAL_COUNT; i++)
-    {
-        if (m_arrbActiveDecals[i])
-        {
-            CDecal* pDecal = &m_arrDecals[i];
-            pDecal->m_vWSPos = pDecal->GetWorldPosition();
-            float fDist = rCamera.GetPosition().GetDistance(pDecal->m_vWSPos) * fZoom;
-            float fMaxViewDist = pDecal->m_fWSSize * ENTITY_DECAL_DIST_FACTOR * 3.0f;
-            if (fDist < fMaxViewDist)
-            {
-                if (rCamera.IsSphereVisible_F(Sphere(pDecal->m_vWSPos, pDecal->m_fWSSize)))
-                {
-                    bool bAfterWater = GetObjManager()->IsAfterWater(pDecal->m_vWSPos, passInfo);
-                    if (pDecal->m_pMaterial)
-                    {
-                        if (passInfo.IsGeneralPass())
-                        {
-                            if (bPrecacheMaterialFast && (fDist < GetFloatCVar(e_StreamPredictionMinFarZoneDistance)))
-                            {
-                                if (CMatInfo* pMatInfo = (CMatInfo*)pDecal->m_pMaterial.get())
-                                {
-                                    pMatInfo->PrecacheMaterial(fDist, NULL, true);
-                                }
-                            }
-
-                            if (bPrecacheMaterial)
-                            {
-                                if (CMatInfo* pMatInfo = (CMatInfo*)pDecal->m_pMaterial.get())
-                                {
-                                    pMatInfo->PrecacheMaterial(fDist, NULL, false);
-                                }
-                            }
-                        }
-
-                        // TODO: take entity orientation into account
-                        Vec3 vSize(pDecal->m_fWSSize, pDecal->m_fWSSize, pDecal->m_fWSSize);
-                        AABB aabb(pDecal->m_vWSPos - vSize, pDecal->m_vWSPos + vSize);
-
-
-                        float fDistFading = SATURATE((1.f - fDist / fMaxViewDist) * DIST_FADING_FACTOR);
-                        SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-                        pDecal->Render(fCurrTime, bAfterWater, fDistFading, fDist, passInfo, rendItemSorter);
-
-                        if (GetCVars()->e_Decals > 1)
-                        {
-                            Vec3 vCenter = pDecal->m_vWSPos;
-                            AABB aabbCenter(vCenter - vSize * 0.05f, vCenter + vSize * 0.05f);
-
-                            DrawBBox(aabb);
-                            DrawBBox(aabbCenter, Col_Yellow);
-
-                            Vec3 vNormal(Vec3(pDecal->m_vUp).Cross(-pDecal->m_vRight).GetNormalized());
-
-                            Matrix34A objMat;
-                            IStatObj* pEntObject = pDecal->m_ownerInfo.GetOwner(objMat);
-                            if (pEntObject)
-                            {
-                                vNormal = objMat.TransformVector(vNormal).GetNormalized();
-                            }
-
-                            DrawLine(vCenter, vCenter + vNormal * pDecal->m_fWSSize);
-
-                            if (pDecal->m_pRenderMesh)
-                            {
-                                pDecal->m_pRenderMesh->GetBBox(aabb.min, aabb.max);
-                                DrawBBox(aabb, Col_Red);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDecalManager::OnEntityDeleted(IRenderNode* pRenderNode)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // remove decals of this entity
-    for (int i = 0; i < DECAL_COUNT; i++)
-    {
-        if (m_arrbActiveDecals[i])
-        {
-            if (m_arrDecals[i].m_ownerInfo.pRenderNode == pRenderNode)
-            {
-                if (GetCVars()->e_Decals == 2)
-                {
-                    CDecal& decal = m_arrDecals[i];
-                    Vec3 vPos = decal.GetWorldPosition();
-                    const char* szOwnerName = "none";
-#ifdef _DEBUG
-                    szOwnerName = decal.m_decalOwnerName;
-#endif
-                    PrintMessage("Debug: C3DEngine::OnDecalDeleted: Pos=(%.1f,%.1f,%.1f) Size=%.2f DecalMaterial=%s OwnerName=%s",
-                        vPos.x, vPos.y, vPos.z, decal.m_fSize, decal.m_pMaterial ? decal.m_pMaterial->GetName() : "none", szOwnerName);
-                }
-
-                m_arrbActiveDecals[i] = false;
-                m_arrDecals[i].FreeRenderData();
-            }
-        }
-    }
-
-    // update decal render nodes
-    PodArray<IRenderNode*> lstObjects;
-    Get3DEngine()->GetObjectsByTypeGlobal(lstObjects, eERType_Decal, NULL);
-
-    if (Get3DEngine()->GetVisAreaManager())
-    {
-        Get3DEngine()->GetVisAreaManager()->GetObjectsByType(lstObjects, eERType_Decal, NULL);
-    }
-
-    for (int i = 0; i < lstObjects.Count(); i++)
-    {
-        ((CDecalRenderNode*)lstObjects[i])->RequestUpdate();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDecalManager::OnRenderMeshDeleted(IRenderMesh* pRenderMesh)
-{
-    // remove decals of this entity
-    for (int i = 0; i < DECAL_COUNT; i++)
-    {
-        if (m_arrbActiveDecals[i])
-        {
-            if (
-                (m_arrDecals[i].m_ownerInfo.pRenderNode && (
-                     m_arrDecals[i].m_ownerInfo.pRenderNode->GetRenderMesh(0) == pRenderMesh ||
-                     m_arrDecals[i].m_ownerInfo.pRenderNode->GetRenderMesh(1) == pRenderMesh ||
-                     m_arrDecals[i].m_ownerInfo.pRenderNode->GetRenderMesh(2) == pRenderMesh))
-                ||
-                (m_arrDecals[i].m_pRenderMesh && m_arrDecals[i].m_pRenderMesh->GetVertexContainer() == pRenderMesh)
-                )
-            {
-                m_arrbActiveDecals[i] = false;
-                m_arrDecals[i].FreeRenderData();
-                //              PrintMessage("CDecalManager::OnRenderMeshDeleted succseed");
-            }
-        }
-    }
-}
-
-void CDecalManager::MoveToEdge(IRenderMesh* pRM, const float fRadius, Vec3& vOutPos, Vec3& vOutNormal, const Vec3& vTri0, const Vec3& vTri1, const Vec3& vTri2)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    AABB boxRM;
-    pRM->GetBBox(boxRM.min, boxRM.max);
-    Sphere sp(vOutPos, fRadius);
-    if (!Overlap::Sphere_AABB(sp, boxRM))
-    {
-        return;
-    }
-
-    // get position offset and stride
-    int nPosStride = 0;
-    byte* pPos  = pRM->GetPosPtr(nPosStride, FSL_READ);
-
-    vtx_idx* pInds = pRM->GetIndexPtr(FSL_READ);
-
-    if (!pPos || !pInds)
-    {
-        return;
-    }
-
-#if !defined(NDEBUG)
-    int nInds = pRM->GetIndicesCount();
-#endif
-
-    //  if(nInds>6000)
-    //  return; // skip insane objects
-
-    assert(nInds % 3 == 0);
-
-    if (!vOutNormal.IsZero())
-    {
-        vOutNormal.Normalize();
-    }
-    else
-    {
-        return;
-    }
-
-    float bestDot = 2.0f;
-    Vec3 bestNormal(ZERO);
-    Vec3 bestPoint(ZERO);
-
-    // render tris
-    TRenderChunkArray& Chunks = pRM->GetChunks();
-    for (int nChunkId = 0; nChunkId < Chunks.size(); nChunkId++)
-    {
-        CRenderChunk* pChunk = &Chunks[nChunkId];
-        if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-        {
-            continue;
-        }
-
-        int nLastIndexId = pChunk->nFirstIndexId + pChunk->nNumIndices;
-
-        for (int i = pChunk->nFirstIndexId; i < nLastIndexId; i += 3)
-        {
-            assert(pInds[i + 0] < pChunk->nFirstVertId + pChunk->nNumVerts);
-            assert(pInds[i + 1] < pChunk->nFirstVertId + pChunk->nNumVerts);
-            assert(pInds[i + 2] < pChunk->nFirstVertId + pChunk->nNumVerts);
-            assert(pInds[i + 0] >= pChunk->nFirstVertId);
-            assert(pInds[i + 1] >= pChunk->nFirstVertId);
-            assert(pInds[i + 2] >= pChunk->nFirstVertId);
-
-            // get tri vertices
-            Vec3 v0 = (*(Vec3*)&pPos[nPosStride * pInds[i + 0]]);
-            Vec3 v1 = (*(Vec3*)&pPos[nPosStride * pInds[i + 1]]);
-            Vec3 v2 = (*(Vec3*)&pPos[nPosStride * pInds[i + 2]]);
-
-            bool first = false;
-            bool second = false;
-            bool third = false;
-
-            if (v0 == vTri0 || v0 == vTri1 || v0 == vTri2)
-            {
-                first = true;
-            }
-            else if (v1 == vTri0 || v1 == vTri1 || v1 == vTri2)
-            {
-                second = true;
-            }
-            else if (v2 == vTri0 || v2 == vTri1 || v2 == vTri2)
-            {
-                third = true;
-            }
-
-            if (first || second || third)
-            {
-                // get triangle normal
-                Vec3 vNormal = (v1 - v0).Cross(v2 - v0).GetNormalized();
-
-                float testDot = vNormal.Dot(vOutNormal);
-                if (testDot < bestDot)
-                {
-                    bestDot = testDot;
-                    bestNormal = vNormal;
-                    if (first)
-                    {
-                        bestPoint = v0;
-                    }
-                    else if (second)
-                    {
-                        bestPoint = v1;
-                    }
-                    else if (third)
-                    {
-                        bestPoint = v2;
-                    }
-                }
-            }
-        }
-    }
-
-    if (bestDot < 1.0f)
-    {
-        vOutNormal = (bestNormal + vOutNormal).GetNormalized();
-        vOutPos.x = bestPoint.x;
-        vOutPos.y = bestPoint.y;
-    }
-}
-
-void CDecalManager::FillBigDecalIndices(IRenderMesh* pRM, Vec3 vPos, float fRadius, Vec3 vProjDirIn, PodArray<vtx_idx>* plstIndices, _smart_ptr<IMaterial> pMat, AABB& meshBBox, float& texelAreaDensity)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    AABB boxRM;
-    pRM->GetBBox(boxRM.min, boxRM.max);
-
-    Sphere sp(vPos, fRadius);
-    if (!Overlap::Sphere_AABB(sp, boxRM))
-    {
-        return;
-    }
-
-    IRenderMesh::ThreadAccessLock lockrm(pRM);
-    HWVSphere hwSphere(sp);
-
-    // get position offset and stride
-    int nInds = pRM->GetIndicesCount();
-
-    if (nInds > GetCVars()->e_DecalsMaxTrisInObject * 3)
-    {
-        return; // skip insane objects
-    }
-    CDecalRenderNode::m_nFillBigDecalIndicesCounter++;
-
-    int nPosStride = 0;
-    byte* pPos     = pRM->GetPosPtr(nPosStride, FSL_READ);
-    if (!pPos)
-    {
-        return;
-    }
-    vtx_idx* pInds = pRM->GetIndexPtr(FSL_READ);
-    if (!pInds)
-    {
-        return;
-    }
-
-    assert(nInds % 3 == 0);
-
-    plstIndices->Clear();
-
-    bool bPointProj(vProjDirIn.IsZeroFast());
-
-    if (!bPointProj)
-    {
-        vProjDirIn.Normalize();
-    }
-
-    if (!pMat)
-    {
-        return;
-    }
-
-    plstIndices->PreAllocate(16);
-
-    hwvec3 vProjDir = HWVLoadVecUnaligned(&vProjDirIn);
-
-    int usedTrianglesTotal = 0;
-
-    TRenderChunkArray& Chunks = pRM->GetChunks();
-
-    {
-        hwvec3 meshBBoxMin  = HWVLoadVecUnaligned(&meshBBox.min);
-        hwvec3 meshBBoxMax  = HWVLoadVecUnaligned(&meshBBox.max);
-
-        SIMDFConstant(fEpsilon, 0.001f);
-
-        const int kNumChunks = Chunks.size();
-
-        if (bPointProj)
-        {
-            hwvec3 hwvPos               = HWVLoadVecUnaligned(&vPos);
-
-            for (int nChunkId = 0; nChunkId < kNumChunks; nChunkId++)
-            {
-                CRenderChunk* pChunk = &Chunks[nChunkId];
-
-                PrefetchLine(&Chunks[nChunkId + 1], 0);
-                PrefetchLine(&pInds[pChunk->nFirstIndexId], 0);
-
-                if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-                {
-                    continue;
-                }
-
-                const SShaderItem& shaderItem = pMat->GetShaderItem(pChunk->m_nMatID);
-
-                if (!shaderItem.m_pShader || !shaderItem.m_pShaderResources)
-                {
-                    continue;
-                }
-
-                if (shaderItem.m_pShader->GetFlags() & (EF_NODRAW | EF_DECAL))
-                {
-                    continue;
-                }
-
-                PrefetchLine(plstIndices->GetElements(), 0);
-
-                int usedTriangles = 0;
-                int nLastIndexId = pChunk->nFirstIndexId + pChunk->nNumIndices;
-
-                int i = pChunk->nFirstIndexId;
-
-                int iPosIndex0 = nPosStride * pInds[i + 0];
-                int iPosIndex1 = nPosStride * pInds[i + 1];
-                int iPosIndex2 = nPosStride * pInds[i + 2];
-
-                for (; i < nLastIndexId; i += 3)
-                {
-                    assert(pInds[i + 0] < pChunk->nFirstVertId + pChunk->nNumVerts);
-                    assert(pInds[i + 1] < pChunk->nFirstVertId + pChunk->nNumVerts);
-                    assert(pInds[i + 2] < pChunk->nFirstVertId + pChunk->nNumVerts);
-                    assert(pInds[i + 0] >= pChunk->nFirstVertId);
-                    assert(pInds[i + 1] >= pChunk->nFirstVertId);
-                    assert(pInds[i + 2] >= pChunk->nFirstVertId);
-
-                    PrefetchLine(&pInds[i], 128);
-
-                    int iNextPosIndex0 = 0;
-                    int iNextPosIndex1 = 0;
-                    int iNextPosIndex2 = 0;
-
-                    if (i + 5 < nLastIndexId)
-                    {
-                        iNextPosIndex0 = nPosStride * pInds[i + 3];
-                        iNextPosIndex1 = nPosStride * pInds[i + 4];
-                        iNextPosIndex2 = nPosStride * pInds[i + 5];
-
-                        PrefetchLine(&pPos[iNextPosIndex0], 0);
-                        PrefetchLine(&pPos[iNextPosIndex1], 0);
-                        PrefetchLine(&pPos[iNextPosIndex2], 0);
-                    }
-
-
-                    // get tri vertices
-                    const hwvec3 v0 = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[iPosIndex0]));
-                    const hwvec3 v1 = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[iPosIndex1]));
-                    const hwvec3 v2 = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[iPosIndex2]));
-
-                    // test the face
-                    hwvec3 v0v1Diff     = HWVSub(v0, v1);
-                    hwvec3 v2v1Diff     = HWVSub(v2, v1);
-                    hwvec3 vPosv0Diff = HWVSub(hwvPos, v0);
-
-                    hwvec3 vCrossResult = HWVCross(v0v1Diff, v2v1Diff);
-
-                    simdf fDot = HWV3Dot(vPosv0Diff, vCrossResult);
-
-                    if (SIMDFGreaterThan(fDot, fEpsilon))
-                    {
-                        if (Overlap::HWVSphere_TriangleFromPoints(hwSphere, v0, v1, v2))
-                        {
-                            plstIndices->AddList(&pInds[i], 3);
-
-                            hwvec3 triBBoxMax1 = HWVMax(v1, v0);
-                            hwvec3 triBBoxMax2 = HWVMax(meshBBoxMax, v2);
-
-                            hwvec3 triBBoxMin1 = HWVMin(v1, v0);
-                            hwvec3 triBBoxMin2 = HWVMin(meshBBoxMin, v2);
-
-                            meshBBoxMax = HWVMax(triBBoxMax1, triBBoxMax2);
-                            meshBBoxMin = HWVMin(triBBoxMin1, triBBoxMin2);
-
-                            usedTriangles++;
-                        }
-                    }
-
-                    iPosIndex0 = iNextPosIndex0;
-                    iPosIndex1 = iNextPosIndex1;
-                    iPosIndex2 = iNextPosIndex2;
-                }
-
-                if (pChunk->m_texelAreaDensity > 0.0f && pChunk->m_texelAreaDensity != (float)UINT_MAX)
-                {
-                    texelAreaDensity += usedTriangles * pChunk->m_texelAreaDensity;
-                    usedTrianglesTotal += usedTriangles;
-                }
-            }
-        }
-        else
-        {
-            for (int nChunkId = 0; nChunkId < kNumChunks; nChunkId++)
-            {
-                CRenderChunk* pChunk = &Chunks[nChunkId];
-
-                if (nChunkId + 1 < kNumChunks)
-                {
-                    PrefetchLine(&Chunks[nChunkId + 1], 0);
-                }
-                PrefetchLine(&pInds[pChunk->nFirstIndexId], 0);
-
-                if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-                {
-                    continue;
-                }
-
-                const SShaderItem& shaderItem = pMat->GetShaderItem(pChunk->m_nMatID);
-
-                if (!shaderItem.m_pShader || !shaderItem.m_pShaderResources)
-                {
-                    continue;
-                }
-
-                if (shaderItem.m_pShader->GetFlags() & (EF_NODRAW | EF_DECAL))
-                {
-                    continue;
-                }
-
-                PrefetchLine(plstIndices->GetElements(), 0);
-
-                int usedTriangles = 0;
-                const int nLastIndexId = pChunk->nFirstIndexId + pChunk->nNumIndices;
-                const int nLastValidIndexId = nLastIndexId - 1;
-
-                int i = pChunk->nFirstIndexId;
-
-                int iNextPosIndex0 = 0;
-                int iNextPosIndex1 = 0;
-                int iNextPosIndex2 = 0;
-
-                if (i + 5 < nLastIndexId)
-                {
-                    iNextPosIndex0 = nPosStride * pInds[i + 3];
-                    iNextPosIndex1 = nPosStride * pInds[i + 4];
-                    iNextPosIndex2 = nPosStride * pInds[i + 5];
-
-                    PrefetchLine(&pPos[iNextPosIndex0], 0);
-                    PrefetchLine(&pPos[iNextPosIndex1], 0);
-                    PrefetchLine(&pPos[iNextPosIndex2], 0);
-                }
-
-                hwvec3 v0Next = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[nPosStride * pInds[i + 0]]));
-                hwvec3 v1Next = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[nPosStride * pInds[i + 1]]));
-                hwvec3 v2Next = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[nPosStride * pInds[i + 2]]));
-
-                const int nLastIndexToUse = nLastIndexId - 3;
-
-                for (; i < nLastIndexToUse; i += 3)
-                {
-                    assert(pInds[i + 0] < pChunk->nFirstVertId + pChunk->nNumVerts);
-                    assert(pInds[i + 1] < pChunk->nFirstVertId + pChunk->nNumVerts);
-                    assert(pInds[i + 2] < pChunk->nFirstVertId + pChunk->nNumVerts);
-                    assert(pInds[i + 0] >= pChunk->nFirstVertId);
-                    assert(pInds[i + 1] >= pChunk->nFirstVertId);
-                    assert(pInds[i + 2] >= pChunk->nFirstVertId);
-
-                    const int iLookaheadIdx = min_branchless(i + 8, nLastValidIndexId);
-                    const int iPrefetchIndex2 = nPosStride * pInds[iLookaheadIdx];
-
-                    // get tri vertices
-                    const hwvec3 v0 = v0Next;
-                    const hwvec3 v1 = v1Next;
-                    const hwvec3 v2 = v2Next;
-
-                    //Need to prefetch further ahead
-                    byte* pPrefetch = &pPos[iPrefetchIndex2];
-                    PrefetchLine(pPrefetch, 0);
-
-                    v0Next = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[iNextPosIndex0]));
-
-                    // get triangle normal
-                    hwvec3 v1v0Diff = HWVSub(v1, v0);
-                    hwvec3 v2v0Diff = HWVSub(v2, v0);
-
-                    v1Next = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[iNextPosIndex1]));
-
-                    hwvec3 vNormal  = HWVCross(v1v0Diff, v2v0Diff);
-                    simdf fDot = HWV3Dot(vNormal, vProjDir);
-
-                    v2Next = HWVLoadVecUnaligned(reinterpret_cast<Vec3*>(&pPos[iNextPosIndex2]));
-
-                    // test the face
-                    if (SIMDFGreaterThan(fDot, fEpsilon))
-                    {
-                        if (Overlap::HWVSphere_TriangleFromPoints(hwSphere, v0, v1, v2))
-                        {
-                            plstIndices->AddList(&pInds[i], 3);
-
-                            hwvec3 triBBoxMax1 = HWVMax(v1, v0);
-                            hwvec3 triBBoxMax2 = HWVMax(meshBBoxMax, v2);
-
-                            hwvec3 triBBoxMin1 = HWVMin(v1, v0);
-                            hwvec3 triBBoxMin2 = HWVMin(meshBBoxMin, v2);
-
-                            meshBBoxMax = HWVMax(triBBoxMax1, triBBoxMax2);
-                            meshBBoxMin = HWVMin(triBBoxMin1, triBBoxMin2);
-
-                            usedTriangles++;
-                        }
-                    }
-
-                    iNextPosIndex0 = nPosStride * pInds[iLookaheadIdx - 2];
-                    iNextPosIndex1 = nPosStride * pInds[iLookaheadIdx - 1];
-                    iNextPosIndex2 = iPrefetchIndex2;
-                }
-
-                const hwvec3 v0 = v0Next;
-                const hwvec3 v1 = v1Next;
-                const hwvec3 v2 = v2Next;
-
-                // get triangle normal
-                hwvec3 v1v0Diff = HWVSub(v1, v0);
-                hwvec3 v2v0Diff = HWVSub(v2, v0);
-                hwvec3 vNormal  = HWVCross(v1v0Diff, v2v0Diff);
-                simdf fDot = HWV3Dot(vNormal, vProjDir);
-
-                // test the face
-                if (SIMDFGreaterThan(fDot, fEpsilon))
-                {
-                    if (Overlap::HWVSphere_TriangleFromPoints(hwSphere, v0, v1, v2))
-                    {
-                        plstIndices->AddList(&pInds[i], 3);
-
-                        hwvec3 triBBoxMax1 = HWVMax(v1, v0);
-                        hwvec3 triBBoxMax2 = HWVMax(meshBBoxMax, v2);
-
-                        hwvec3 triBBoxMin1 = HWVMin(v1, v0);
-                        hwvec3 triBBoxMin2 = HWVMin(meshBBoxMin, v2);
-
-                        meshBBoxMax = HWVMax(triBBoxMax1, triBBoxMax2);
-                        meshBBoxMin = HWVMin(triBBoxMin1, triBBoxMin2);
-
-                        //                      triBBoxMax = HWVMax(triBBoxMax, v2);
-                        //                      triBBoxMin = HWVMin(triBBoxMin, v2);
-                        //
-                        //                      meshBBoxMax = HWVMax(triBBoxMax, meshBBoxMax);
-                        //                      meshBBoxMin = HWVMin(triBBoxMin, meshBBoxMin);
-
-                        usedTriangles++;
-                    }
-                }
-
-
-                if (pChunk->m_texelAreaDensity > 0.0f && pChunk->m_texelAreaDensity != (float)UINT_MAX)
-                {
-                    texelAreaDensity += usedTriangles * pChunk->m_texelAreaDensity;
-                    usedTrianglesTotal += usedTriangles;
-                }
-            }
-        }
-
-        HWVSaveVecUnaligned(&meshBBox.max, meshBBoxMax);
-        HWVSaveVecUnaligned(&meshBBox.min, meshBBoxMin);
-    }
-
-    if (usedTrianglesTotal != 0)
-    {
-        texelAreaDensity = texelAreaDensity / usedTrianglesTotal;
-    }
-}
-
-
-_smart_ptr<IRenderMesh> CDecalManager::MakeBigDecalRenderMesh(IRenderMesh* pSourceRenderMesh, Vec3 vPos, float fRadius, Vec3 vProjDir, _smart_ptr<IMaterial> pDecalMat, _smart_ptr<IMaterial> pSrcMat)
-{
-    if (!pSourceRenderMesh || pSourceRenderMesh->GetVerticesCount() == 0)
-    {
-        return 0;
-    }
-
-    // make indices of this decal
-    PodArray<vtx_idx> lstIndices;
-
-    AABB meshBBox(vPos, vPos);
-    float texelAreaDensity = 0.0f;
-
-    if (pSourceRenderMesh && pSourceRenderMesh->GetVerticesCount())
-    {
-        FillBigDecalIndices(pSourceRenderMesh, vPos, fRadius, vProjDir, &lstIndices, pSrcMat, meshBBox, texelAreaDensity);
-    }
-
-    if (!lstIndices.Count())
-    {
-        return 0;
-    }
-
-    // make fake vert buffer with one vertex // todo: remove this
-    PodArray<SVF_P3S_C4B_T2S> EmptyVertBuffer;
-    EmptyVertBuffer.Add(SVF_P3S_C4B_T2S());
-
-    _smart_ptr<IRenderMesh> pRenderMesh = 0;
-    pRenderMesh = GetRenderer()->CreateRenderMeshInitialized(EmptyVertBuffer.GetElements(), EmptyVertBuffer.Count(), eVF_P3S_C4B_T2S,
-            lstIndices.GetElements(), lstIndices.Count(), prtTriangleList, "BigDecalOnStatObj", "BigDecal", eRMT_Static, 1, 0, 0, 0, false, false, 0);
-    pRenderMesh->SetVertexContainer(pSourceRenderMesh);
-    pRenderMesh->SetChunk(pDecalMat, 0, pSourceRenderMesh->GetVerticesCount(), 0, lstIndices.Count(), texelAreaDensity, eVF_P3S_C4B_T2S);
-    pRenderMesh->SetBBox(meshBBox.min, meshBBox.max);
-
-    return pRenderMesh;
-}
-
-void CDecalManager::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->Add (*this);
-}
-
-void CDecalManager::DeleteDecalsInRange(AABB* pAreaBox, IRenderNode* pEntity)
-{
-    if (GetCVars()->e_Decals > 1 && pAreaBox)
-    {
-        DrawBBox(*pAreaBox);
-    }
-
-    for (int i = 0; i < DECAL_COUNT; i++)
-    {
-        if (!m_arrbActiveDecals[i])
-        {
-            continue;
-        }
-
-        if (pEntity && (pEntity != m_arrDecals[i].m_ownerInfo.pRenderNode))
-        {
-            continue;
-        }
-
-        if (pAreaBox)
-        {
-            Vec3 vPos = m_arrDecals[i].GetWorldPosition();
-            Vec3 vSize(m_arrDecals[i].m_fWSSize, m_arrDecals[i].m_fWSSize, m_arrDecals[i].m_fWSSize);
-            AABB decalBox(vPos - vSize, vPos + vSize);
-            if (!Overlap::AABB_AABB(*pAreaBox, decalBox))
-            {
-                continue;
-            }
-        }
-
-        if (m_arrDecals[i].m_eDecalType != eDecalType_WS_OnTheGround)
-        {
-            m_arrbActiveDecals[i] = false;
-        }
-
-        m_arrDecals[i].FreeRenderData();
-
-        if (GetCVars()->e_Decals == 2)
-        {
-            CDecal& decal = m_arrDecals[i];
-            PrintMessage("Debug: CDecalManager::DeleteDecalsInRange: Pos=(%.1f,%.1f,%.1f) Size=%.2f DecalMaterial=%s",
-                decal.m_vPos.x, decal.m_vPos.y, decal.m_vPos.z, decal.m_fSize, decal.m_pMaterial ? decal.m_pMaterial->GetName() : "none");
-        }
-    }
-}
-
-void CDecalManager::Serialize(TSerialize ser)
-{
-    ser.BeginGroup("StaticDecals");
-
-    if (ser.IsReading())
-    {
-        Reset();
-    }
-
-    uint32 dwDecalCount = 0;
-
-    for (uint32 dwI = 0; dwI < DECAL_COUNT; dwI++)
-    {
-        if (m_arrbActiveDecals[dwI])
-        {
-            dwDecalCount++;
-        }
-    }
-
-    ser.Value("DecalCount", dwDecalCount);
-
-    if (ser.IsWriting())
-    {
-        for (uint32 _dwI = 0; _dwI < DECAL_COUNT; _dwI++)
-        {
-            if (m_arrbActiveDecals[_dwI])
-            {
-                CDecal& ref = m_arrDecals[_dwI];
-
-                ser.BeginGroup("Decal");
-                ser.Value("Pos", ref.m_vPos);
-                ser.Value("Right", ref.m_vRight);
-                ser.Value("Up", ref.m_vUp);
-                ser.Value("Front", ref.m_vFront);
-                ser.Value("Size", ref.m_fSize);
-                ser.Value("WSPos", ref.m_vWSPos);
-                ser.Value("WSSize", ref.m_fWSSize);
-                ser.Value("fLifeTime", ref.m_fLifeTime);
-
-                // serialize material, handle legacy decals with textureID converted to material created at runtime
-                string matName("");
-                if (ref.m_pMaterial && ref.m_pMaterial->GetName())
-                {
-                    matName = ref.m_pMaterial->GetName();
-                }
-                ser.Value("MatName", matName);
-
-                //          TODO:  IStatObj *       m_pStatObj;                                             // only if real 3d object is used as decal ()
-                //          TODO:  IRenderNode * m_pDecalOwner;                                     // transformation parent object (0 means parent is the world)
-                ser.Value("nRenderNodeSlotId", ref.m_ownerInfo.nRenderNodeSlotId);
-                ser.Value("nRenderNodeSlotSubObjectId", ref.m_ownerInfo.nRenderNodeSlotSubObjectId);
-
-                int nDecalType = (int)ref.m_eDecalType;
-                ser.Value("eDecalType", nDecalType);
-
-                ser.Value("fGrowTime", ref.m_fGrowTime);
-                ser.Value("fGrowTimeAlpha", ref.m_fGrowTimeAlpha);
-                ser.Value("fLifeBeginTime", ref.m_fLifeBeginTime);
-
-                bool bBigDecalUsed = ref.IsBigDecalUsed();
-
-                ser.Value("bBigDecal", bBigDecalUsed);
-
-                // m_arrBigDecalRMs[] will be created on the fly so no need load/save it
-
-                if (bBigDecalUsed)
-                {
-                    for (uint32 dwI = 0; dwI < sizeof(ref.m_arrBigDecalRMCustomData) / sizeof(ref.m_arrBigDecalRMCustomData[0]); ++dwI)
-                    {
-                        char szName[16];
-
-                        sprintf_s(szName, "BDCD%d", dwI);
-                        ser.Value(szName, ref.m_arrBigDecalRMCustomData[dwI]);
-                    }
-                }
-                ser.EndGroup();
-            }
-        }
-    }
-    else
-    if (ser.IsReading())
-    {
-        m_nCurDecal = 0;
-
-        for (uint32 _dwI = 0; _dwI < dwDecalCount; _dwI++)
-        {
-            if (m_nCurDecal < DECAL_COUNT)
-            {
-                CDecal& ref = m_arrDecals[m_nCurDecal];
-
-                ref.FreeRenderData();
-
-                ser.BeginGroup("Decal");
-                ser.Value("Pos", ref.m_vPos);
-                ser.Value("Right", ref.m_vRight);
-                ser.Value("Up", ref.m_vUp);
-                ser.Value("Front", ref.m_vFront);
-                ser.Value("Size", ref.m_fSize);
-                ser.Value("WSPos", ref.m_vWSPos);
-                ser.Value("WSSize", ref.m_fWSSize);
-                ser.Value("fLifeTime", ref.m_fLifeTime);
-
-                // serialize material, handle legacy decals with textureID converted to material created at runtime
-                string matName("");
-                ser.Value("MatName", matName);
-                bool isTempMat(false);
-                ser.Value("IsTempMat", isTempMat);
-
-                ref.m_pMaterial = 0;
-                if (!matName.empty())
-                {
-                    ref.m_pMaterial = GetMatMan()->LoadMaterial(matName.c_str(), false, true);
-                    if (!ref.m_pMaterial)
-                    {
-                        Warning("Decal material \"%s\" not found!\n", matName.c_str());
-                    }
-                }
-
-                //          TODO:  IStatObj *       m_pStatObj;                                             // only if real 3d object is used as decal ()
-                //          TODO:  IRenderNode * m_pDecalOwner;                                     // transformation parent object (0 means parent is the world)
-                ser.Value("nRenderNodeSlotId", ref.m_ownerInfo.nRenderNodeSlotId);
-                ser.Value("nRenderNodeSlotSubObjectId", ref.m_ownerInfo.nRenderNodeSlotSubObjectId);
-
-                int nDecalType = eDecalType_Undefined;
-                ser.Value("eDecalType", nDecalType);
-                ref.m_eDecalType = (EDecal_Type)nDecalType;
-
-                ser.Value("fGrowTime", ref.m_fGrowTime);
-                ser.Value("fGrowTimeAlpha", ref.m_fGrowTimeAlpha);
-                ser.Value("fLifeBeginTime", ref.m_fLifeBeginTime);
-
-                // no need to to store m_arrBigDecalRMs[] as it becomes recreated
-
-                bool bBigDecalsAreaUsed = false;
-
-                ser.Value("bBigDecals", bBigDecalsAreaUsed);
-
-                if (bBigDecalsAreaUsed)
-                {
-                    for (uint32 dwI = 0; dwI < sizeof(ref.m_arrBigDecalRMCustomData) / sizeof(ref.m_arrBigDecalRMCustomData[0]); ++dwI)
-                    {
-                        char szName[16];
-
-                        sprintf_s(szName, "BDCD%d", dwI);
-                        ser.Value(szName, ref.m_arrBigDecalRMCustomData[dwI]);
-                    }
-                }
-
-                // m_arrBigDecalRMs[] will be created on the fly so no need load/save it
-
-                m_arrbActiveDecals[m_nCurDecal] = bool(nDecalType != eDecalType_Undefined);
-
-                ++m_nCurDecal;
-                ser.EndGroup();
-            }
-        }
-    }
-
-    ser.EndGroup();
-}
-
-_smart_ptr<IMaterial> CDecalManager::GetMaterialForDecalTexture(const char* pTextureName)
-{
-    if (!pTextureName || *pTextureName == 0)
-    {
-        return 0;
-    }
-
-    IMaterialManager* pMatMan = GetMatMan();
-    _smart_ptr<IMaterial> pMat = pMatMan->FindMaterial(pTextureName);
-    if (pMat)
-    {
-        return pMat;
-    }
-
-    _smart_ptr<IMaterial> pMatSrc = pMatMan->LoadMaterial("EngineAssets/Materials/Decals/Default", false, true);
-    if (pMatSrc)
-    {
-        _smart_ptr<IMaterial> pMatDst = pMatMan->CreateMaterial(pTextureName, pMatSrc->GetFlags() | MTL_FLAG_NON_REMOVABLE);
-        if (pMatDst)
-        {
-            SShaderItem& si = pMatSrc->GetShaderItem();
-            SInputShaderResources isr = si.m_pShaderResources;
-
-            // This will create texture data insertion to the table for the diffuse slot
-            isr.m_TexturesResourcesMap[EFTT_DIFFUSE].m_Name = pTextureName;
-
-            SShaderItem siDst = GetRenderer()->EF_LoadShaderItem(si.m_pShader->GetName(), true, 0, &isr, si.m_pShader->GetGenerationMask());
-
-            pMatDst->AssignShaderItem(siDst);
-
-            return pMatDst;
-        }
-    }
-
-    return 0;
-}
-
-IStatObj* SDecalOwnerInfo::GetOwner(Matrix34A& objMat)
-{
-    if (!pRenderNode)
-    {
-        return NULL;
-    }
-
-    IStatObj* pStatObj = pRenderNode->GetEntityStatObj(nRenderNodeSlotId, nRenderNodeSlotSubObjectId, &objMat, true);
-    if (pStatObj)
-    {
-        if (nRenderNodeSlotSubObjectId >= 0 && nRenderNodeSlotSubObjectId < pStatObj->GetSubObjectCount())
-        {
-            IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(nRenderNodeSlotSubObjectId);
-            pStatObj = pSubObj->pStatObj;
-            objMat = objMat * pSubObj->tm;
-        }
-    }
-
-    if (pStatObj && (pStatObj->GetFlags() & STATIC_OBJECT_HIDDEN))
-    {
-        return NULL;
-    }
-
-    if (pStatObj)
-    {
-        if (int nMinLod = ((CStatObj*)pStatObj)->GetMinUsableLod())
-        {
-            if (IStatObj* pLodObj = pStatObj->GetLodObject(nMinLod))
-            {
-                pStatObj = pLodObj;
-            }
-        }
-    }
-
-    return pStatObj;
-}
diff --git a/Code/CryEngine/Cry3DEngine/DecalManager.h b/Code/CryEngine/Cry3DEngine/DecalManager.h
deleted file mode 100644
index 304ad345cd..0000000000
--- a/Code/CryEngine/Cry3DEngine/DecalManager.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_DECALMANAGER_H
-#define CRYINCLUDE_CRY3DENGINE_DECALMANAGER_H
-#pragma once
-
-#define DECAL_COUNT (512) // must be pow2
-#define ENTITY_DECAL_DIST_FACTOR (200)
-#define DIST_FADING_FACTOR (6.f)
-
-class C3DEngine;
-
-enum EDecal_Type
-{
-    eDecalType_Undefined,
-    eDecalType_OS_OwnersVerticesUsed,
-    eDecalType_WS_Merged,
-    eDecalType_WS_OnTheGround,
-    eDecalType_WS_SimpleQuad,
-    eDecalType_OS_SimpleQuad
-};
-
-class CDecal
-    : public Cry3DEngineBase
-{
-public:
-
-    // cur state
-    Vec3                    m_vPos;
-    Vec3                    m_vRight, m_vUp, m_vFront;
-    float                   m_fSize;
-    Vec3                    m_vWSPos;                                                   // Decal position (world coordinates) from DecalInfo.vPos
-    float                   m_fWSSize;                                              // Decal size (world coordinates) from DecalInfo.fSize
-
-    // life style
-    float                   m_fLifeTime;                                            // relative time left till decal should die
-    Vec3                    m_vAmbient;                                             // ambient color
-    SDecalOwnerInfo m_ownerInfo;
-    EDecal_Type     m_eDecalType;
-    float                   m_fGrowTime, m_fGrowTimeAlpha;                                          // e.g. growing blood pools
-    float                   m_fLifeBeginTime;                                   //
-
-    uint8                   m_iAssembleSize;                                    // of how many decals has this decal be assembled, 0 if not to assemble
-    uint8                   m_sortPrio;
-    uint8                   m_bDeferred;
-
-    // render data
-    _smart_ptr<IRenderMesh>      m_pRenderMesh;             // only needed for terrain decals, 4 of them because they might cross borders
-    float                   m_arrBigDecalRMCustomData[16];      // only needed if one of m_arrBigDecalRMs[]!=0, most likely we can reduce to [12]
-
-    _smart_ptr< IMaterial > m_pMaterial;
-    uint32          m_nGroupId; // used for multi-component decals
-
-#ifdef _DEBUG
-    char m_decalOwnerEntityClassName[256];
-    char m_decalOwnerName[256];
-    EERType m_decalOwnerType;
-#endif
-
-    CDecal()
-        : m_vPos(0, 0, 0)
-        , m_vRight(0, 0, 0)
-        , m_vUp(0, 0, 0)
-        , m_vFront(0, 0, 0)
-        , m_fSize(0)
-        , m_vWSPos(0, 0, 0)
-        , m_fWSSize(0)
-        , m_fLifeTime(0)
-        , m_vAmbient(0, 0, 0)
-        , m_fGrowTime(0)
-        , m_fGrowTimeAlpha(0)
-        , m_fLifeBeginTime(0)
-        , m_sortPrio(0)
-        , m_pMaterial(0)
-        , m_nGroupId(0)
-        , m_iAssembleSize(0)
-        , m_bDeferred(0)
-    {
-        m_eDecalType = eDecalType_Undefined;
-        m_pRenderMesh = NULL;
-        memset(&m_arrBigDecalRMCustomData[0], 0, sizeof(m_arrBigDecalRMCustomData));
-
-#ifdef _DEBUG
-        m_decalOwnerEntityClassName[0] = '\0';
-        m_decalOwnerName[0] = '\0';
-        m_decalOwnerType = eERType_NotRenderNode;
-#endif
-    }
-
-    ~CDecal()
-    {
-        FreeRenderData();
-    }
-
-    void Render(const float fFrameTime, int nAfterWater, float fDistanceFading, float fDiatance, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-    int Update(bool& active, const float fFrameTime);
-    void RenderBigDecalOnTerrain(float fAlpha, float fScale, const SRenderingPassInfo& passInfo);
-    void FreeRenderData();
-    static void ResetStaticData();
-    bool IsBigDecalUsed() const { return m_pRenderMesh != 0; }
-    Vec3 GetWorldPosition();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-
-private:
-    static IGeometry* s_pSphere;
-};
-
-class CDecalManager
-    : public Cry3DEngineBase
-{
-    CDecal                      m_arrDecals[DECAL_COUNT];
-    bool                            m_arrbActiveDecals[DECAL_COUNT];
-    int                             m_nCurDecal;
-    PodArray<IRenderNode*> m_arrTempUpdatedOwners;
-
-public: // ---------------------------------------------------------------
-
-    CDecalManager();
-    ~CDecalManager();
-    bool Spawn(CryEngineDecalInfo Decal, CDecal* pCallerManagedDecal = 0);
-    // once per frame
-    void Update(const float fFrameTime);
-    // maybe multiple times per frame
-    void Render(const SRenderingPassInfo& passInfo);
-    void OnEntityDeleted(IRenderNode* pEnt);
-    void OnRenderMeshDeleted(IRenderMesh* pRenderMesh);
-
-    // complex decals
-    void FillBigDecalIndices(IRenderMesh* pRenderMesh, Vec3 vPos, float fRadius, Vec3 vProjDir, PodArray<vtx_idx>* plstIndices, _smart_ptr<IMaterial> pMat, AABB& meshBBox, float& texelAreaDensity);
-    _smart_ptr<IRenderMesh> MakeBigDecalRenderMesh(IRenderMesh* pSourceRenderMesh, Vec3 vPos, float fRadius, Vec3 vProjDir, _smart_ptr<IMaterial> pDecalMat, _smart_ptr<IMaterial> pSrcMat);
-    void MoveToEdge(IRenderMesh* pRM, const float fRadius, Vec3& vPos, Vec3& vOutNorm, const Vec3& vTri0, const Vec3& vTri1, const Vec3& vTri2);
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    void Reset() { memset(m_arrbActiveDecals, 0, sizeof(m_arrbActiveDecals)); m_nCurDecal = 0; }
-    void DeleteDecalsInRange(AABB* pAreaBox, IRenderNode* pEntity);
-    bool AdjustDecalPosition(CryEngineDecalInfo& DecalInfo, bool bMakeFatTest);
-    static bool RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal, bool bFastTest, float fMaxHitDistance, _smart_ptr<IMaterial> pMat);
-    void Serialize(TSerialize ser);
-    bool SpawnHierarchical(const CryEngineDecalInfo& rootDecalInfo, CDecal* pCallerManagedDecal);
-
-private:
-    _smart_ptr<IMaterial> GetMaterialForDecalTexture(const char* pTextureName);
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_DECALMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/DecalRenderNode.cpp b/Code/CryEngine/Cry3DEngine/DecalRenderNode.cpp
deleted file mode 100644
index 63e2912f27..0000000000
--- a/Code/CryEngine/Cry3DEngine/DecalRenderNode.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "DecalRenderNode.h"
-#include "VisAreas.h"
-#include "ObjMan.h"
-#include "MatMan.h"
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-#include "Environment/OceanEnvironmentBus.h"
-
-int CDecalRenderNode::m_nFillBigDecalIndicesCounter = 0;
-
-CDecalRenderNode::CDecalRenderNode()
-    : m_pos(0, 0, 0)
-    , m_localBounds(Vec3(-1, -1, -1), Vec3(1, 1, 1))
-    , m_pMaterial(NULL)
-    , m_updateRequested(false)
-    , m_decalProperties()
-    , m_decal(nullptr)
-    , m_nLastRenderedFrameId(0)
-    , m_nLayerId(0)
-{
-    m_Matrix.SetIdentity();
-}
-
-
-CDecalRenderNode::~CDecalRenderNode()
-{
-    DeleteDecal();
-    GetISystem()->GetI3DEngine()->FreeRenderNodeState(this);
-}
-
-
-const SDecalProperties* CDecalRenderNode::GetDecalProperties() const
-{
-    return &m_decalProperties;
-}
-
-void CDecalRenderNode::DeleteDecal()
-{
-    if (m_decal)
-    {
-        delete m_decal;
-        m_decal = nullptr;
-    }
-}
-
-void CDecalRenderNode::SetCommonProperties(CryEngineDecalInfo& decalInfo)
-{
-    decalInfo.fSize = m_decalProperties.m_radius;
-    decalInfo.pExplicitRightUpFront = &m_decalProperties.m_explicitRightUpFront;
-    decalInfo.sortPrio = m_decalProperties.m_sortPrio;
-
-    decalInfo.pIStatObj = nullptr;
-    decalInfo.ownerInfo.pRenderNode = nullptr;
-    decalInfo.fLifeTime = 1.0f; // default life time for rendering, decal won't grow older as we don't update it
-    decalInfo.fGrowTime = 0.0f;
-    decalInfo.fAngle = 0.0f;
-
-    // We don't set decalInfo.szMaterialName here because that is handled in CDecalRenderNode::CreateDecal()
-}
-
-void CDecalRenderNode::CreatePlanarDecal()
-{
-    CryEngineDecalInfo decalInfo;
-
-    SetCommonProperties(decalInfo);
-
-    // necessary params
-    decalInfo.vPos = m_decalProperties.m_pos;
-    decalInfo.vNormal = m_decalProperties.m_normal;
-
-    // default for all other
-    decalInfo.vHitDirection = Vec3(0, 0, 0);
-    decalInfo.preventDecalOnGround = true;
-
-    CreateDecal(decalInfo);
-}
-
-void CDecalRenderNode::CreateDecalOnTerrain()
-{
-    bool terrainExists = false;
-    float terrainHeight = AZ::Constants::FloatMax;
-    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainHeight
-        , &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats
-        , m_decalProperties.m_pos.x, m_decalProperties.m_pos.y, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, &terrainExists);
-    if (!terrainExists)
-    {
-        //No terrain system available, or there's a hole at the given location.
-        return;
-    }
-    float terrainDelta(m_decalProperties.m_pos.z - terrainHeight);
-    if (terrainDelta < m_decalProperties.m_radius && terrainDelta > -0.5f)
-    {
-        CryEngineDecalInfo decalInfo;
-
-        SetCommonProperties(decalInfo);
-
-        // necessary params
-        decalInfo.vPos = Vec3(m_decalProperties.m_pos.x, m_decalProperties.m_pos.y, terrainHeight);
-        decalInfo.vNormal = Vec3(0, 0, 1);
-        decalInfo.vHitDirection = Vec3(0, 0, -1);
-        decalInfo.preventDecalOnGround = false;
-
-        CreateDecal(decalInfo);
-    }
-}
-
-void CDecalRenderNode::CreateDecal(const CryEngineDecalInfo& decalInfo)
-{
-    m_decal = new CDecal();
-    if (m_p3DEngine->CreateDecalInstance(decalInfo, m_decal))
-    {
-        // Rather than setting decalInfo.szMaterialName in SetCommonProperties(), it's better to set IMaterial directly since we already have the desired material. 
-        // This is more reliable than using the material name. For example, if the material was cloned from another one it would have the same name
-        // as the original, and CreateDecalInstance() would load the original from disk rather than the clone.
-        m_decal->m_pMaterial = m_pMaterial;
-    }
-    else
-    {
-        DeleteDecal();
-    }
-}
-
-void CDecalRenderNode::CreateDecals()
-{
-    DeleteDecal();
-
-    if (m_decalProperties.m_deferred)
-    {
-        return;
-    }
-
-    _smart_ptr<IMaterial> pMaterial(GetMaterial());
-
-    assert(0 != pMaterial && "CDecalRenderNode::CreateDecals() -- Invalid Material!");
-    if (!pMaterial)
-    {
-        return;
-    }
-
-    switch (m_decalProperties.m_projectionType)
-    {
-    case SDecalProperties::ePlanar:
-    {
-        CreatePlanarDecal();
-        break;
-    }
-    case SDecalProperties::eProjectOnTerrain:
-    {
-        CreateDecalOnTerrain();
-        break;
-    }
-    default:
-    {
-        assert(!"CDecalRenderNode::CreateDecals() : Unsupported decal projection type!");
-        break;
-    }
-    }
-}
-
-
-void CDecalRenderNode::ProcessUpdateRequest()
-{
-    if (!m_updateRequested || m_nFillBigDecalIndicesCounter >= GetCVars()->e_DecalsMaxUpdatesPerFrame)
-    {
-        return;
-    }
-
-    CreateDecals();
-    m_updateRequested = false;
-}
-
-void CDecalRenderNode::UpdateAABBFromRenderMeshes()
-{
-    if (m_decalProperties.m_projectionType == SDecalProperties::eProjectOnTerrain)
-    {
-        AABB WSBBox;
-        WSBBox.Reset();
-
-        if (m_decal && m_decal->m_pRenderMesh && m_decal->m_eDecalType != eDecalType_OS_OwnersVerticesUsed)
-            {
-                AABB aabb;
-            m_decal->m_pRenderMesh->GetBBox(aabb.min, aabb.max);
-            if (m_decal->m_eDecalType == eDecalType_WS_Merged || m_decal->m_eDecalType == eDecalType_WS_OnTheGround)
-                {
-                aabb.min += m_decal->m_vPos;
-                aabb.max += m_decal->m_vPos;
-                }
-                WSBBox.Add(aabb);
-            }
-
-        if (!WSBBox.IsReset())
-        {
-            m_WSBBox = WSBBox;
-        }
-    }
-}
-
-//special check for def decals forcing
-bool CDecalRenderNode::CheckForceDeferred()
-{
-    if (m_pMaterial != NULL)
-    {
-        SShaderItem& sItem = m_pMaterial->GetShaderItem(0);
-        if (sItem.m_pShaderResources != NULL)
-        {
-            float fCosA =  m_decalProperties.m_normal.GetNormalized().Dot(Vec3(0, 0, 1));
-            if (fCosA > 0.5f)
-            {
-                return false;
-            }
-
-            if (SEfResTexture* pEnvRes0 = sItem.m_pShaderResources->GetTextureResource(EFTT_ENV))
-            {
-                if (pEnvRes0->m_Sampler.m_pITex == NULL)
-                {
-                    m_decalProperties.m_projectionType = SDecalProperties::ePlanar;
-                    m_decalProperties.m_deferred = true;
-                    return true;
-                }
-            }
-            else
-            {
-                m_decalProperties.m_projectionType = SDecalProperties::ePlanar;
-                m_decalProperties.m_deferred = true;
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-void CDecalRenderNode::SetDecalProperties(const SDecalProperties& properties)
-{
-    // update bounds
-    m_localBounds = AABB(-properties.m_radius * Vec3(1, 1, 1), properties.m_radius * Vec3(1, 1, 1));
-
-    // register material
-    m_pMaterial = GetMatMan()->LoadMaterial(properties.m_pMaterialName, false);
-
-    // copy decal properties
-    m_decalProperties = properties;
-    m_decalProperties.m_pMaterialName = 0; // reset this as it's assumed to be a temporary pointer only, refer to m_materialID to get material
-
-    // request update
-    m_updateRequested = true;
-
-    bool bForced = 0;
-
-    if (properties.m_deferred || (GetCVars()->e_DecalsDefferedStatic && (m_decalProperties.m_projectionType != SDecalProperties::ePlanar && m_decalProperties.m_projectionType != SDecalProperties::eProjectOnTerrain)))
-    {
-        m_decalProperties.m_deferred = true;
-    }
-
-    if (GetCVars()->e_DecalsForceDeferred)
-    {
-        if (CheckForceDeferred())
-        {
-            bForced = true;
-        }
-    }
-
-    // set normal just in case; normal direction will be determined by m_explicitRightUpFront
-    m_decalProperties.m_normal = properties.m_normal;
-
-    m_fWSMaxViewDist = properties.m_maxViewDist;
-
-    // set matrix
-    m_Matrix.SetRotation33(m_decalProperties.m_explicitRightUpFront);
-    Matrix33 matScale;
-    if (bForced && !properties.m_deferred)
-    {
-        matScale.SetScale(Vec3(properties.m_radius, properties.m_radius, properties.m_radius * 0.05f));
-    }
-    else
-    {
-        matScale.SetScale(Vec3(properties.m_radius, properties.m_radius, properties.m_radius * properties.m_depth));
-    }
-
-    m_Matrix = m_Matrix * matScale;
-    m_Matrix.SetTranslation(properties.m_pos);
-}
-
-IRenderNode* CDecalRenderNode::Clone() const
-{
-    CDecalRenderNode* pDestDecal = new CDecalRenderNode();
-
-    // CDecalRenderNode member vars
-    pDestDecal->m_pos = m_pos;
-    pDestDecal->m_localBounds = m_localBounds;
-    pDestDecal->m_pMaterial = m_pMaterial;
-    pDestDecal->m_updateRequested = true;
-    pDestDecal->m_decalProperties = m_decalProperties;
-    pDestDecal->m_WSBBox = m_WSBBox;
-    pDestDecal->m_Matrix = m_Matrix;
-    pDestDecal->m_nLayerId = m_nLayerId;
-
-    //IRenderNode member vars
-    //  We cannot just copy over due to issues with the linked list of IRenderNode objects
-    CopyIRenderNodeData(pDestDecal);
-
-    return pDestDecal;
-}
-
-void CDecalRenderNode::SetMatrix(const Matrix34& mat)
-{
-    m_pos = mat.GetTranslation();
-
-    if (m_decalProperties.m_projectionType == SDecalProperties::ePlanar)
-    {
-        m_WSBBox.SetTransformedAABB(m_Matrix, AABB(-Vec3(1, 1, 0.5f), Vec3(1, 1, 0.5f)));
-    }
-    else
-    {
-        m_WSBBox.SetTransformedAABB(m_Matrix, AABB(-Vec3(1, 1, 1), Vec3(1, 1, 1)));
-    }
-
-    Get3DEngine()->RegisterEntity(this);
-}
-
-void CDecalRenderNode::SetMatrixFull(const Matrix34& mat)
-{
-    m_Matrix = mat;
-    m_pos = mat.GetTranslation();
-
-    if (m_decalProperties.m_projectionType == SDecalProperties::ePlanar)
-    {
-        m_WSBBox.SetTransformedAABB(m_Matrix, AABB(-Vec3(1, 1, 0.5f), Vec3(1, 1, 0.5f)));
-    }
-    else
-    {
-        m_WSBBox.SetTransformedAABB(m_Matrix, AABB(-Vec3(1, 1, 1), Vec3(1, 1, 1)));
-    }
-}
-
-const char* CDecalRenderNode::GetEntityClassName() const
-{
-    return "Decal";
-}
-
-
-const char* CDecalRenderNode::GetName() const
-{
-    return "Decal";
-}
-
-
-void CDecalRenderNode::Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!passInfo.RenderDecals())
-    {
-        return; // false;
-    }
-
-    float distFading = SATURATE((1.f - rParam.fDistance / m_fWSMaxViewDist) * DIST_FADING_FACTOR);
-
-    if (m_decalProperties.m_deferred)
-    {
-        if (passInfo.IsShadowPass())
-        {
-            return; // otherwise causing flickering with GI
-        }
-        SDeferredDecal newItem;
-        newItem.fAlpha = m_decalProperties.m_opacity;
-        newItem.angleAttenuation = m_decalProperties.m_angleAttenuation;
-        newItem.pMaterial = m_pMaterial;
-        newItem.projMatrix = m_Matrix;
-        newItem.nSortOrder = m_decalProperties.m_sortPrio;
-        newItem.nFlags = DECAL_STATIC;
-        GetRenderer()->EF_AddDeferredDecal(newItem);
-        return;
-    }
-
-    // update last rendered frame id
-    m_nLastRenderedFrameId = passInfo.GetMainFrameID();
-
-    bool bUpdateAABB = m_updateRequested;
-
-    if (passInfo.IsGeneralPass())
-    {
-        ProcessUpdateRequest();
-    }
-
-    if (m_decal && 0 != m_decal->m_pMaterial)
-    {
-        m_decal->m_vAmbient.x = rParam.AmbientColor.r;
-        m_decal->m_vAmbient.y = rParam.AmbientColor.g;
-        m_decal->m_vAmbient.z = rParam.AmbientColor.b;
-        bool bAfterWater = GetObjManager()->IsAfterWater(m_decal->m_vWSPos, passInfo);
-
-        m_decal->Render(0, bAfterWater, distFading, rParam.fDistance, passInfo, SRendItemSorter(rParam.rendItemSorter));
-    }
-
-    // terrain decal meshes are created only during rendering so only after that bbox can be computed
-    if (bUpdateAABB)
-    {
-        UpdateAABBFromRenderMeshes();
-    }
-}
-
-
-void CDecalRenderNode::SetMaterial(_smart_ptr<IMaterial> pMat)
-{
-    if (m_decal)
-    {
-        m_decal->m_pMaterial = pMat;
-    }
-
-    m_pMaterial = pMat;
-
-    //special check for def decals forcing
-    if (GetCVars()->e_DecalsForceDeferred)
-    {
-        CheckForceDeferred();
-    }
-}
-
-
-
-void CDecalRenderNode::Precache()
-{
-    ProcessUpdateRequest();
-}
-
-
-void CDecalRenderNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "DecalNode");
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_decal);
-}
-
-void CDecalRenderNode::CleanUpOldDecals()
-{
-    if (m_nLastRenderedFrameId != 0 && // was rendered at least once
-        (int)GetRenderer()->GetFrameID(false) > (int)m_nLastRenderedFrameId + GetCVars()->e_DecalsMaxValidFrames)
-    {
-        DeleteDecal();
-        m_nLastRenderedFrameId = 0;
-        m_updateRequested = true; // make sure if rendered again, that the decal is recreated
-    }
-}
-
-void CDecalRenderNode::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_pos += delta;
-    m_WSBBox.Move(delta);
-    m_Matrix.SetTranslation(m_Matrix.GetTranslation() + delta);
-}
diff --git a/Code/CryEngine/Cry3DEngine/DecalRenderNode.h b/Code/CryEngine/Cry3DEngine/DecalRenderNode.h
deleted file mode 100644
index 87ca1fd9e1..0000000000
--- a/Code/CryEngine/Cry3DEngine/DecalRenderNode.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_DECALRENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_DECALRENDERNODE_H
-#pragma once
-
-
-#include "DecalManager.h"
-
-
-class CDecalRenderNode
-    : public IDecalRenderNode
-    , public Cry3DEngineBase
-{
-public:
-    // implements IDecalRenderNode
-    virtual void SetDecalProperties(const SDecalProperties& properties);
-    virtual const SDecalProperties* GetDecalProperties() const;
-    virtual void CleanUpOldDecals();
-
-    // implements IRenderNode
-    virtual IRenderNode* Clone() const;
-    virtual void SetMatrix(const Matrix34& mat);
-    virtual const Matrix34& GetMatrix() { return m_Matrix; }
-
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName() const;
-    virtual const char* GetName() const;
-    virtual Vec3 GetPos(bool bWorldOnly = true) const;
-    virtual void Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo);
-    void SetMaterial(_smart_ptr<IMaterial> pMat) override;
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = 0);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist();
-    virtual void Precache();
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    virtual const AABB GetBBox() const { return m_WSBBox; }
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-
-    virtual uint8 GetSortPriority() { return m_decalProperties.m_sortPrio; }
-
-    virtual void SetLayerId(uint16 nLayerId) { m_nLayerId = nLayerId; }
-    virtual uint16 GetLayerId() { return m_nLayerId; }
-    static void ResetDecalUpdatesCounter() { CDecalRenderNode::m_nFillBigDecalIndicesCounter = 0; }
-
-    // SetMatrix only supports changing position, this will do the full transform
-    void SetMatrixFull(const Matrix34& mat);
-public:
-    CDecalRenderNode();
-    void RequestUpdate() { m_updateRequested = true; DeleteDecal(); }
-    void DeleteDecal();
-
-private:
-    ~CDecalRenderNode();
-    void CreateDecals();
-    void ProcessUpdateRequest();
-    void UpdateAABBFromRenderMeshes();
-    bool CheckForceDeferred();
-
-    void SetCommonProperties(CryEngineDecalInfo& decalInfo);
-    void CreatePlanarDecal();
-    void CreateDecalOnTerrain();
-    void CreateDecal(const CryEngineDecalInfo& decalInfo);
-
-private:
-    Vec3 m_pos;
-    AABB m_localBounds;
-    _smart_ptr<IMaterial> m_pMaterial;
-    bool m_updateRequested;
-    SDecalProperties m_decalProperties;
-    CDecal* m_decal;
-    AABB m_WSBBox;
-    Matrix34 m_Matrix;
-    uint32 m_nLastRenderedFrameId;
-    uint16 m_nLayerId;
-
-public:
-    static int m_nFillBigDecalIndicesCounter;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_DECALRENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/DeferredCollisionEvent.cpp b/Code/CryEngine/Cry3DEngine/DeferredCollisionEvent.cpp
deleted file mode 100644
index dd053fa2b2..0000000000
--- a/Code/CryEngine/Cry3DEngine/DeferredCollisionEvent.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "DeferredCollisionEvent.h"
-
-CDeferredPhysicsEventManager::CDeferredPhysicsEventManager()
-    : m_hThreadPool(-1)
-    , m_bEntitySystemReset(false)
-{
-    if (gEnv->IsDedicated())
-    {
-        return;
-    }
-
-    // Disable MT if Editor.
-    if (gEnv->IsEditor())
-    {
-        return;
-    }
-
-    ThreadPoolDesc threadPoolDesc;
-    threadPoolDesc.sPoolName = "DeferredPhysicsEvents";
-    threadPoolDesc.nThreadStackSizeKB = 24;
-
-    // let the DeferredPhysicsEvents run on Core3
-    if (!threadPoolDesc.CreateThread(BIT(3)))
-    {
-        return;
-    }
-
-    IThreadTaskManager* pThreadTaskManager = gEnv->pSystem->GetIThreadTaskManager();
-    assert(pThreadTaskManager);
-
-    m_hThreadPool = pThreadTaskManager->CreateThreadsPool(threadPoolDesc);
-}
-
-
-CDeferredPhysicsEventManager::~CDeferredPhysicsEventManager()
-{
-}
-
-
-void CDeferredPhysicsEventManager::DispatchDeferredEvent(IDeferredPhysicsEvent* pEvent)
-{
-    assert(pEvent);
-    // execute immediately if we don't use deferred physcis events
-    if (GetCVars()->e_DeferredPhysicsEvents == 0 ||  m_hThreadPool < 0)
-    {
-        pEvent->OnUpdate();
-        return;
-    }
-
-    // Register the task with the ThreadTask manager
-    IThreadTaskManager* pThreadTaskManager = gEnv->pSystem->GetIThreadTaskManager();
-    assert(pThreadTaskManager);
-
-    pEvent->GetTaskInfo()->m_params.name = "DeferredPhysicsEvents";
-    pEvent->GetTaskInfo()->m_params.nFlags = THREAD_TASK_ASSIGN_TO_POOL;
-    pEvent->GetTaskInfo()->m_params.nThreadsGroupId = m_hThreadPool;
-    pEvent->GetTaskInfo()->m_pThread = NULL;
-    pThreadTaskManager->RegisterTask(pEvent, pEvent->GetTaskInfo()->m_params);
-}
-
-
-void ApplyCollisionImpulse(EventPhysCollision* pCollision)
-{
-    if (pCollision->normImpulse && pCollision->pEntity[1] &&
-        pCollision->pEntity[0] && pCollision->pEntity[0]->GetType() == PE_PARTICLE &&
-        pCollision->pEntity[0]->GetForeignData(pCollision->pEntity[0]->GetiForeignData()))      // no foreign data mean it's likely scheduled for deletion
-    {
-        pe_action_impulse ai;
-        ai.point = pCollision->pt;
-        ai.partid = pCollision->partid[1];
-        ai.impulse = (pCollision->vloc[0] - pCollision->vloc[1]) * pCollision->normImpulse;
-        pCollision->pEntity[1]->Action(&ai);
-    }
-}
-
-
-int CDeferredPhysicsEventManager::HandleEvent(const EventPhys* pEvent, IDeferredPhysicsEventManager::CreateEventFunc pCreateFunc, [[maybe_unused]] IDeferredPhysicsEvent::DeferredEventType type)
-{
-    EventPhysCollision* pCollision = (EventPhysCollision*)pEvent;
-    assert(pCollision);
-
-    if (pCollision->deferredState == EPC_DEFERRED_FINISHED)
-    {
-        ApplyCollisionImpulse(pCollision);
-        return pCollision->deferredResult;
-    }
-
-    // == create new deferred event object, and do some housekeeping(ensuring entities not deleted, remebering event for cleanup) == //
-    IDeferredPhysicsEvent* pDeferredEvent = pCreateFunc(pEvent);
-
-    // == start executing == //
-    pDeferredEvent->Start();
-
-
-    // == check if we really needed to deferred this event(early outs, not deferred code paths) == //
-    if (GetCVars()->e_DeferredPhysicsEvents == 0 || pDeferredEvent->HasFinished())
-    {
-        int nResult = pDeferredEvent->Result((EventPhys*)pEvent);
-        SAFE_DELETE(pDeferredEvent);
-        ApplyCollisionImpulse(pCollision);
-        return nResult;
-    }
-
-    if (pCollision->pEntity[0])
-    {
-        pCollision->pEntity[0]->AddRef();
-    }
-    if (pCollision->pEntity[1])
-    {
-        pCollision->pEntity[1]->AddRef();
-    }
-
-    // == re-queue event for the next frame, to keep the physical entity alive == //
-    RegisterDeferredEvent(pDeferredEvent);
-
-    return 0;
-}
-
-
-void CDeferredPhysicsEventManager::RegisterDeferredEvent(IDeferredPhysicsEvent* pDeferredEvent)
-{
-    assert(pDeferredEvent);
-    m_activeDeferredEvents.push_back(pDeferredEvent);
-}
-
-
-void CDeferredPhysicsEventManager::UnRegisterDeferredEvent(IDeferredPhysicsEvent* pDeferredEvent)
-{
-    std::vector<IDeferredPhysicsEvent*>::iterator it = std::find(m_activeDeferredEvents.begin(), m_activeDeferredEvents.end(), pDeferredEvent);
-    if (it == m_activeDeferredEvents.end())
-    {
-        return;
-    }
-
-    // == remove from active list == //
-    m_activeDeferredEvents.erase(it);
-
-    if (m_bEntitySystemReset)
-    {
-        return;
-    }
-
-    // == decrement keep alive counter on entity == //
-    EventPhysCollision* pCollision = (EventPhysCollision*)pDeferredEvent->PhysicsEvent();
-    if (pCollision->pEntity[0])
-    {
-        pCollision->pEntity[0]->Release();
-    }
-    if (pCollision->pEntity[1])
-    {
-        pCollision->pEntity[1]->Release();
-    }
-}
-
-
-void CDeferredPhysicsEventManager::ClearDeferredEvents()
-{
-    // move content of the active deferred events array to a tmp one to prevent provlems with UnRegisterDeferredEvent called by destructors
-    std::vector<IDeferredPhysicsEvent*> tmp = m_activeDeferredEvents;
-    m_bEntitySystemReset = true;
-
-    for (std::vector<IDeferredPhysicsEvent*>::iterator it = tmp.begin(); it != tmp.end(); ++it)
-    {
-        (*it)->Sync();
-        delete *it;
-    }
-    stl::free_container(m_activeDeferredEvents);
-    m_bEntitySystemReset = false;
-}
-
-void CDeferredPhysicsEventManager::Update()
-{
-    std::vector<IDeferredPhysicsEvent*> tmp = m_activeDeferredEvents;
-
-    for (std::vector<IDeferredPhysicsEvent*>::iterator it = tmp.begin(), end =  tmp.end(); it != end; ++it)
-    {
-        IDeferredPhysicsEvent* collisionEvent = *it;
-        assert(collisionEvent);
-        PREFAST_ASSUME(collisionEvent);
-        EventPhysCollision* epc = (EventPhysCollision*) collisionEvent->PhysicsEvent();
-
-        if (collisionEvent->HasFinished() == false)
-        {
-            continue;
-        }
-
-        epc->deferredResult = collisionEvent->Result();
-
-        if (epc->deferredState != EPC_DEFERRED_FINISHED)
-        {
-            epc->deferredState = EPC_DEFERRED_FINISHED;
-        }
-        else
-        {
-            SAFE_DELETE(collisionEvent);
-        }
-    }
-}
-
-IDeferredPhysicsEvent* CDeferredPhysicsEventManager::GetLastCollisionEventForEntity(IPhysicalEntity* pPhysEnt)
-{
-    EventPhysCollision* pLastPhysEvent;
-    for (int i = m_activeDeferredEvents.size() - 1; i >= 0; i--)
-    {
-        pLastPhysEvent = (EventPhysCollision*)m_activeDeferredEvents[i]->PhysicsEvent();
-        if (pLastPhysEvent && pLastPhysEvent->idval == EventPhysCollision::id && pLastPhysEvent->pEntity[0] == pPhysEnt)
-        {
-            return m_activeDeferredEvents[i];
-        }
-    }
-    return 0;
-}
diff --git a/Code/CryEngine/Cry3DEngine/DeferredCollisionEvent.h b/Code/CryEngine/Cry3DEngine/DeferredCollisionEvent.h
deleted file mode 100644
index 9ffcbe9f2c..0000000000
--- a/Code/CryEngine/Cry3DEngine/DeferredCollisionEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_DEFERREDCOLLISIONEVENT_H
-#define CRYINCLUDE_CRY3DENGINE_DEFERREDCOLLISIONEVENT_H
-#pragma once
-
-#include <IDeferredCollisionEvent.h>
-
-// Implementation class for the DeferredPhysicsEvent Manager
-class CDeferredPhysicsEventManager
-    : public IDeferredPhysicsEventManager
-    ,  public Cry3DEngineBase
-{
-public:
-    CDeferredPhysicsEventManager();
-    virtual ~CDeferredPhysicsEventManager();
-
-    virtual void DispatchDeferredEvent(IDeferredPhysicsEvent* pEvent);
-    virtual int HandleEvent(const EventPhys* pEvent, IDeferredPhysicsEventManager::CreateEventFunc, IDeferredPhysicsEvent::DeferredEventType);
-
-    virtual void RegisterDeferredEvent(IDeferredPhysicsEvent* pDeferredEvent);
-    virtual void UnRegisterDeferredEvent(IDeferredPhysicsEvent* pDeferredEvent);
-
-    virtual void ClearDeferredEvents();
-
-    virtual void Update();
-
-    virtual IDeferredPhysicsEvent* GetLastCollisionEventForEntity(IPhysicalEntity* pPhysEnt);
-
-private:
-    ThreadPoolHandle m_hThreadPool;                                                             // thread pool to use for deferred event tasks
-    std::vector<IDeferredPhysicsEvent*> m_activeDeferredEvents;     // list of all active deferred events, used for cleanup and statistics
-    bool m_bEntitySystemReset;  // means all entity ptrs in events are stale
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_DEFERREDCOLLISIONEVENT_H
diff --git a/Code/CryEngine/Cry3DEngine/DistanceCloudRenderNode.cpp b/Code/CryEngine/Cry3DEngine/DistanceCloudRenderNode.cpp
deleted file mode 100644
index b18f8ccb76..0000000000
--- a/Code/CryEngine/Cry3DEngine/DistanceCloudRenderNode.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "DistanceCloudRenderNode.h"
-#include "VisAreas.h"
-#include "ObjMan.h"
-#include "MatMan.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-CDistanceCloudRenderNode::CDistanceCloudRenderNode()
-    :   m_pos(0, 0, 0)
-    , m_sizeX(1)
-    , m_sizeY(1)
-    , m_rotationZ(0)
-    , m_pMaterial(NULL)
-{
-}
-
-
-CDistanceCloudRenderNode::~CDistanceCloudRenderNode()
-{
-    Get3DEngine()->FreeRenderNodeState(this);
-}
-
-
-SDistanceCloudProperties CDistanceCloudRenderNode::GetProperties() const
-{
-    SDistanceCloudProperties properties;
-
-    properties.m_sizeX = m_sizeX;
-    properties.m_sizeY = m_sizeY;
-    properties.m_rotationZ = m_rotationZ;
-    properties.m_pos = m_pos;
-    properties.m_pMaterialName = 0; // query materialID instead!
-
-    return properties;
-}
-
-
-void CDistanceCloudRenderNode::SetProperties(const SDistanceCloudProperties& properties)
-{
-    // register material
-    m_pMaterial = GetMatMan()->LoadMaterial(properties.m_pMaterialName, false);
-
-    // copy distance cloud properties
-    m_sizeX = properties.m_sizeX;
-    m_sizeY = properties.m_sizeY;
-    m_rotationZ = properties.m_rotationZ;
-    m_pos = properties.m_pos;
-}
-
-
-void CDistanceCloudRenderNode::SetMatrix(const Matrix34& mat)
-{
-    Get3DEngine()->UnRegisterEntityAsJob(this);
-
-    m_pos = mat.GetTranslation();
-
-    m_WSBBox.SetTransformedAABB(mat, AABB(-Vec3(1, 1, 1e-4f), Vec3(1, 1, 1e-4f)));
-
-    Get3DEngine()->RegisterEntity(this);
-}
-
-
-const char* CDistanceCloudRenderNode::GetEntityClassName() const
-{
-    return "DistanceCloud";
-}
-
-
-const char* CDistanceCloudRenderNode::GetName() const
-{
-    return "DistanceCloud";
-}
-
-static inline uint16 HalfFlip(uint16 h)
-{
-    uint16 mask = -int16(h >> 15) | 0x8000;
-    return h ^ mask;
-}
-
-
-void CDistanceCloudRenderNode::Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    _smart_ptr<IMaterial> pMaterial(GetMaterial());
-
-    if (!passInfo.RenderClouds() || !pMaterial)
-    {
-        return; // false;
-    }
-    CRenderObject* pOb(gEnv->pRenderer->EF_GetObject_Temp(passInfo.ThreadID()));
-    if (!pOb)
-    {
-        return; // false;
-    }
-    const CCamera& cam(passInfo.GetCamera());
-    float zDist = cam.GetPosition().z - m_pos.z;
-    if (cam.GetViewdir().z < 0)
-    {
-        zDist = -zDist;
-    }
-    pOb->m_nSort = HalfFlip(CryConvertFloatToHalf(zDist));
-    //pOb->m_II.m_Matrix.SetIdentity();
-
-    // fill general vertex data
-    f32 sinZ(0), cosZ(1);
-    sincos_tpl(DEG2RAD(m_rotationZ), &sinZ, &cosZ);
-    Vec3 right(m_sizeX * cosZ, m_sizeY * sinZ, 0);
-    Vec3 up(-m_sizeX * sinZ, m_sizeY * cosZ, 0);
-
-    SVF_P3F_C4B_T2F pVerts[4];
-    pVerts[0].xyz = (-right - up) + m_pos;
-    pVerts[0].st = Vec2(0, 1);
-    pVerts[0].color.dcolor = ~0;
-
-    pVerts[1].xyz = (right - up) + m_pos;
-    pVerts[1].st = Vec2(1, 1);
-    pVerts[1].color.dcolor = ~0;
-
-    pVerts[2].xyz = (right + up) + m_pos;
-    pVerts[2].st = Vec2(1, 0);
-    pVerts[2].color.dcolor = ~0;
-
-    pVerts[3].xyz = (-right + up) + m_pos;
-    pVerts[3].st = Vec2(0, 0);
-    pVerts[3].color.dcolor = ~0;
-
-    // prepare tangent space (tangent, bitangent) and fill it in
-    Vec3 rightUnit(cosZ, sinZ, 0);
-    Vec3 upUnit(-sinZ, cosZ, 0);
-
-    SPipTangents pTangents[4];
-
-    pTangents[0] = SPipTangents(rightUnit, -upUnit, 1);
-    pTangents[1] = pTangents[0];
-    pTangents[2] = pTangents[0];
-    pTangents[3] = pTangents[0];
-
-    // prepare indices
-    uint16 pIndices[6];
-    pIndices[0] = 0;
-    pIndices[1] = 1;
-    pIndices[2] = 2;
-
-    pIndices[3] = 0;
-    pIndices[4] = 2;
-    pIndices[5] = 3;
-
-    int afterWater(GetObjManager()->IsAfterWater(m_pos, passInfo));
-    GetRenderer()->EF_AddPolygonToScene(pMaterial->GetShaderItem(), 4, pVerts, pTangents, pOb, passInfo, pIndices, 6, afterWater, SRendItemSorter(rParam.rendItemSorter));
-
-    //  return true;
-}
-
-
-void CDistanceCloudRenderNode::SetMaterial(_smart_ptr<IMaterial> pMat)
-{
-    m_pMaterial = pMat;
-}
-
-
-void CDistanceCloudRenderNode::Precache()
-{
-}
-
-
-void CDistanceCloudRenderNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "DistanceCloudNode");
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-void CDistanceCloudRenderNode::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_pos += delta;
-    m_WSBBox.Move(delta);
-}
diff --git a/Code/CryEngine/Cry3DEngine/DistanceCloudRenderNode.h b/Code/CryEngine/Cry3DEngine/DistanceCloudRenderNode.h
deleted file mode 100644
index b9974f3c45..0000000000
--- a/Code/CryEngine/Cry3DEngine/DistanceCloudRenderNode.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_DISTANCECLOUDRENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_DISTANCECLOUDRENDERNODE_H
-#pragma once
-
-
-class CDistanceCloudRenderNode
-    : public IDistanceCloudRenderNode
-    , public Cry3DEngineBase
-{
-public:
-    // implements IDistanceCloudRenderNode
-    virtual void SetProperties(const SDistanceCloudProperties& properties);
-
-    // implements IRenderNode
-    virtual void SetMatrix(const Matrix34& mat);
-
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName() const;
-    virtual const char* GetName() const;
-    virtual Vec3 GetPos(bool bWorldOnly = true) const;
-    virtual void Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo);
-    void SetMaterial(_smart_ptr<IMaterial> pMat) override;
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = 0);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist();
-    virtual void Precache();
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual const AABB GetBBox() const { return m_WSBBox; }
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-    virtual void SetLayerId(uint16 nLayerId) { m_nLayerId = nLayerId; }
-    virtual uint16 GetLayerId() { return m_nLayerId; }
-
-public:
-    CDistanceCloudRenderNode();
-    SDistanceCloudProperties GetProperties() const;
-
-private:
-    ~CDistanceCloudRenderNode();
-
-private:
-    Vec3 m_pos;
-    float m_sizeX;
-    float m_sizeY;
-    float m_rotationZ;
-    _smart_ptr< IMaterial > m_pMaterial;
-    AABB m_WSBBox;
-    uint16 m_nLayerId;
-};
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_DISTANCECLOUDRENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/Environment/OceanEnvironmentBus.h b/Code/CryEngine/Cry3DEngine/Environment/OceanEnvironmentBus.h
deleted file mode 100644
index 088a34077d..0000000000
--- a/Code/CryEngine/Cry3DEngine/Environment/OceanEnvironmentBus.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Vector3.h>
-
-#include <I3DEngine.h>
-#include <ISystem.h>
-#include <OceanConstants.h>
-
-namespace AZ
-{
-    /**
-    * Feature toggle for the ocean feature(s)
-    */
-    class OceanFeatureToggle
-        : public AZ::EBusTraits
-    {
-    public:
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        using MutexType = AZStd::recursive_mutex;
-        //////////////////////////////////////////////////////////////////////////
-
-        virtual ~OceanFeatureToggle() = default;
-
-        virtual bool OceanComponentEnabled() const { return false; }
-
-    };
-    using OceanFeatureToggleBus = AZ::EBus<OceanFeatureToggle>;
-
-    /*!
-    * Messages services for environment data points
-    * Note: The Gem for Water is meant to override this when enabled in a project
-    */
-    class OceanEnvironmentRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        using MutexType = AZStd::recursive_mutex;
-
-        //////////////////////////////////////////////////////////////////////////
-
-        // flags for toggling ocean reflections
-        enum class ReflectionFlags
-        {
-            Entities = SRenderingPassInfo::ENTITIES,
-            StaticObjects = SRenderingPassInfo::STATIC_OBJECTS
-        };
-
-        // Ocean requests
-
-        virtual bool OceanIsEnabled() const = 0;
-
-        // Fast option - use if just ocean height required
-        virtual float GetOceanLevel() const = 0;
-        virtual void SetOceanLevel(float oceanLevel) = 0;
-        virtual float GetOceanLevelOrDefault(const float defaultValue) const = 0;
-        
-        // This will return ocean height or water volume height, optional for accurate water height query
-        virtual float GetWaterLevel(const Vec3& position) const = 0;
-
-        // Only use for Accurate query - this will return exact ocean height
-        virtual float GetAccurateOceanHeight(const Vec3& position) const = 0;
-
-        // gets the amount of water tessellation
-        virtual int GetWaterTessellationAmount() const = 0;
-        virtual void SetWaterTessellationAmount(int amount) = 0;
-
-        // the ocean material asset
-        virtual const AZStd::string& GetOceanMaterialName() const = 0;
-        virtual void SetOceanMaterialName(const AZStd::string& matName) = 0;
-
-        // Animation data
-        virtual float GetAnimationWindDirection() const = 0;
-        virtual float GetAnimationWindSpeed() const = 0;
-        virtual float GetAnimationWavesSpeed() const = 0;
-        virtual float GetAnimationWavesSize() const = 0;
-        virtual float GetAnimationWavesAmount() const = 0;
-        virtual void SetAnimationWindDirection(float dir) = 0;
-        virtual void SetAnimationWindSpeed(float speed) = 0;
-        virtual void SetAnimationWavesSpeed(float speed) = 0;
-        virtual void SetAnimationWavesSize(float size) = 0;
-        virtual void SetAnimationWavesAmount(float amount) = 0;
-        
-        // Ocean reflection
-        virtual void ApplyReflectRenderFlags(int& flags) const = 0;
-        virtual bool GetReflectRenderFlag(ReflectionFlags flag) const = 0;
-        virtual float GetReflectResolutionScale() const = 0;
-        virtual bool GetReflectionAnisotropic() const = 0;
-        virtual void SetReflectRenderFlag(ReflectionFlags flag, bool value) = 0;
-        virtual void SetReflectResolutionScale(float scale) = 0;
-        virtual void SetReflectionAnisotropic(bool enabled) = 0;
-        
-        // Ocean bottom
-        virtual bool GetUseOceanBottom() const = 0;
-        virtual void SetUseOceanBottom(bool use) = 0;
-
-        // Underwater Effects
-        virtual bool GetGodRaysEnabled() const = 0;
-        virtual void SetGodRaysEnabled(bool enabled) = 0;
-        virtual float GetUnderwaterDistortion() const = 0;
-        virtual void SetUnderwaterDistortion(float) = 0;
-
-        // Caustics
-        virtual bool  GetCausticsEnabled() const = 0;
-        virtual float GetCausticsDepth() const = 0;
-        virtual float GetCausticsIntensity() const = 0;
-        virtual float GetCausticsTiling() const = 0;
-        virtual float GetCausticsDistanceAttenuation() const = 0;
-        virtual void SetCausticsEnabled(bool enable)  = 0;
-        virtual void SetCausticsDepth(float depth)  = 0;
-        virtual void SetCausticsIntensity(float intensity)  = 0;
-        virtual void SetCausticsTiling(float tiling)  = 0;
-        virtual void SetCausticsDistanceAttenuation(float dist) = 0;
-
-        // Ocean fog data
-        virtual AZ::Color GetFogColorPremultiplied() const = 0;
-        virtual AZ::Color GetFogColor() const = 0;
-        virtual void SetFogColor(const AZ::Color& fogColor) = 0;
-        virtual float GetFogColorMultiplier() const = 0;
-        virtual void SetFogColorMultiplier(float fogMultiplier) = 0;
-        virtual AZ::Color GetNearFogColor() const = 0;
-        virtual void SetNearFogColor(const AZ::Color& nearColor) = 0;
-        virtual float GetFogDensity() const = 0;
-        virtual void SetFogDensity(float density) = 0;
-    };
-
-    using OceanEnvironmentBus = AZ::EBus<OceanEnvironmentRequests>;
-
-} // namespace AZ
-
-namespace OceanToggle
-{
-    /**
-    * As long as the Water gem is in a preview state, the legacy code and data will be protected by this feature toggle check.
-    */
-    AZ_INLINE bool IsActive()
-    {
-        bool bHasOceanFeature = false;
-        AZ::OceanFeatureToggleBus::BroadcastResult(bHasOceanFeature, &AZ::OceanFeatureToggleBus::Events::OceanComponentEnabled);
-        return bHasOceanFeature;
-    }
-} // namespace OceanToggle
-
-namespace OceanRequest
-{
-
-    AZ_INLINE bool OceanIsEnabled()
-    {
-        bool enabled = false;
-        AZ::OceanEnvironmentBus::BroadcastResult(enabled, &AZ::OceanEnvironmentBus::Events::OceanIsEnabled);
-        return enabled;
-    }
-
-    // Ocean level
-
-    AZ_INLINE float GetOceanLevel()
-    {
-        float fWaterLevel = AZ::OceanConstants::s_HeightUnknown;
-        AZ::OceanEnvironmentBus::BroadcastResult(fWaterLevel, &AZ::OceanEnvironmentBus::Events::GetOceanLevel);
-        return fWaterLevel;
-    }
-
-    AZ_INLINE float GetOceanLevelOrDefault(const float defaultValue)
-    {
-        return OceanIsEnabled() ? GetOceanLevel() : defaultValue;
-    }
-
-    AZ_INLINE float GetWaterLevel(const Vec3& position)
-    {
-        float fWaterLevel = AZ::OceanConstants::s_HeightUnknown;
-        AZ::OceanEnvironmentBus::BroadcastResult(fWaterLevel, &AZ::OceanEnvironmentBus::Events::GetWaterLevel, position);
-        return fWaterLevel;
-    }
-
-    AZ_INLINE float GetAccurateOceanHeight(const Vec3& position)
-    {
-        float fWaterLevel = AZ::OceanConstants::s_HeightUnknown;
-        AZ::OceanEnvironmentBus::BroadcastResult(fWaterLevel, &AZ::OceanEnvironmentBus::Events::GetAccurateOceanHeight, position);
-        return fWaterLevel;
-    }
-
-    // the ocean material
-
-    AZ_INLINE AZStd::string GetOceanMaterialName()
-    {
-        AZStd::string value = "EngineAssets/Materials/Water/Ocean_default.mtl";
-        AZ::OceanEnvironmentBus::BroadcastResult(value, &AZ::OceanEnvironmentBus::Events::GetOceanMaterialName);
-        return value;
-    }
-
-    // Wave animation data
-
-    AZ_INLINE float GetWavesAmount()
-    {
-        float value = AZ::OceanConstants::s_animationWavesAmountDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(value, &AZ::OceanEnvironmentBus::Events::GetAnimationWavesAmount);
-        return value;
-    }
-
-    AZ_INLINE float GetWavesSpeed()
-    {
-        float value = AZ::OceanConstants::s_animationWavesSpeedDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(value, &AZ::OceanEnvironmentBus::Events::GetAnimationWavesSpeed);
-        return value;
-    }
-
-    AZ_INLINE float GetWavesSize()
-    {
-        float value = AZ::OceanConstants::s_animationWavesSizeDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(value, &AZ::OceanEnvironmentBus::Events::GetAnimationWavesSize);
-        return value;
-    }
-
-    AZ_INLINE float GetWindDirection()
-    {
-        float value = AZ::OceanConstants::s_animationWindDirectionDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(value, &AZ::OceanEnvironmentBus::Events::GetAnimationWindDirection);
-        return value;
-    }
-
-    AZ_INLINE float GetWindSpeed()
-    {
-        float value = AZ::OceanConstants::s_animationWindSpeedDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(value, &AZ::OceanEnvironmentBus::Events::GetAnimationWindSpeed);
-        return value;
-    }
-
-    // Ocean bottom
-
-    AZ_INLINE bool GetUseOceanBottom()
-    {
-        bool useOceanBottom = AZ::OceanConstants::s_UseOceanBottom;
-        AZ::OceanEnvironmentBus::BroadcastResult(useOceanBottom, &AZ::OceanEnvironmentBus::Events::GetUseOceanBottom);
-        return useOceanBottom;
-    }
-
-
-    AZ_INLINE bool GetGodRaysEnabled()
-    {
-        bool godRaysEnabled = AZ::OceanConstants::s_GodRaysEnabled;
-        AZ::OceanEnvironmentBus::BroadcastResult(godRaysEnabled, &AZ::OceanEnvironmentBus::Events::GetGodRaysEnabled);
-        return godRaysEnabled;
-    }
-
-    AZ_INLINE float GetUnderwaterDistortion()
-    {
-        float underwaterDistortion = AZ::OceanConstants::s_UnderwaterDistortion;
-        AZ::OceanEnvironmentBus::BroadcastResult(underwaterDistortion, &AZ::OceanEnvironmentBus::Events::GetUnderwaterDistortion);
-        return underwaterDistortion;
-    }
-    
-    // Cuastics
-
-    AZ_INLINE bool GetCausticsEnabled()
-    {
-        bool causticsEnabled = false;
-        AZ::OceanEnvironmentBus::BroadcastResult(causticsEnabled, &AZ::OceanEnvironmentBus::Events::GetCausticsEnabled);
-        return causticsEnabled;
-    }
-
-    AZ_INLINE float GetCausticsDepth()
-    {
-        float causticsDepth = AZ::OceanConstants::s_CausticsDepthDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(causticsDepth, &AZ::OceanEnvironmentBus::Events::GetCausticsDepth);
-        return causticsDepth;
-    }
-
-    AZ_INLINE float GetCausticsIntensity()
-    {
-        float causticsIntensity = AZ::OceanConstants::s_CausticsIntensityDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(causticsIntensity, &AZ::OceanEnvironmentBus::Events::GetCausticsIntensity);
-        return causticsIntensity;
-    }
-
-    AZ_INLINE float GetCausticsTiling()
-    {
-        float causticsTiling = AZ::OceanConstants::s_CausticsTilingDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(causticsTiling, &AZ::OceanEnvironmentBus::Events::GetCausticsTiling);
-        return causticsTiling;
-    }
-
-    AZ_INLINE float GetCausticsDistanceAttenuation()
-    {
-        float causticsDistanceAtten = AZ::OceanConstants::s_CausticsDistanceAttenDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(causticsDistanceAtten, &AZ::OceanEnvironmentBus::Events::GetCausticsDistanceAttenuation);
-        return causticsDistanceAtten;
-    }
-
-    // Ocean fog
-    AZ_INLINE AZ::Vector3 GetFogColorPremultiplied()
-    {
-        AZ::Color fogColor = AZ::OceanConstants::s_oceanFogColorDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(fogColor, &AZ::OceanEnvironmentBus::Events::GetFogColorPremultiplied);
-        return fogColor.GetAsVector3();
-    }
-
-    AZ_INLINE AZ::Vector3 GetNearFogColor()
-    {
-        AZ::Color nearFogColor = AZ::OceanConstants::s_oceanNearFogColorDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(nearFogColor, &AZ::OceanEnvironmentBus::Events::GetNearFogColor);
-        return nearFogColor.GetAsVector3();
-    }
-
-    AZ_INLINE float GetFogDensity()
-    {
-        float fogDensity = AZ::OceanConstants::s_oceanFogDensityDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(fogDensity, &AZ::OceanEnvironmentBus::Events::GetFogDensity);
-        return fogDensity;
-    }
-
-} // namespace OceanRequest
diff --git a/Code/CryEngine/Cry3DEngine/EnvironmentPreset.cpp b/Code/CryEngine/Cry3DEngine/EnvironmentPreset.cpp
deleted file mode 100644
index 5dd2ea1811..0000000000
--- a/Code/CryEngine/Cry3DEngine/EnvironmentPreset.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "ITimeOfDay.h"
-#include "EnvironmentPreset.h"
-
-#include <Serialization/IArchive.h>
-#include <Serialization/IArchiveHost.h>
-#include <Serialization/ClassFactory.h>
-#include <Serialization/Enum.h>
-
-#include <Bezier.h>
-#include <Serialization/Enum.h>
-
-SERIALIZATION_ENUM_BEGIN_NESTED(SBezierControlPoint, ETangentType, "TangentType")
-SERIALIZATION_ENUM_VALUE_NESTED(SBezierControlPoint, eTangentType_Custom, "Custom")
-SERIALIZATION_ENUM_VALUE_NESTED(SBezierControlPoint, eTangentType_Auto, "Smooth")
-SERIALIZATION_ENUM_VALUE_NESTED(SBezierControlPoint, eTangentType_Zero, "Zero")
-SERIALIZATION_ENUM_VALUE_NESTED(SBezierControlPoint, eTangentType_Step, "Step")
-SERIALIZATION_ENUM_VALUE_NESTED(SBezierControlPoint, eTangentType_Linear, "Linear")
-SERIALIZATION_ENUM_END()
-
-namespace EnvironmentPresetDetails
-{
-    static const float sBezierSplineKeyValueEpsilon = 0.001f;
-
-    //////////////////////////////////////////////////////////////////////////
-    SBezierKey ApplyInTangent(const SBezierKey& key, const SBezierKey& leftKey, const SBezierKey* pRightKey)
-    {
-        SBezierKey newKey = key;
-
-        if (leftKey.m_controlPoint.m_outTangentType == SBezierControlPoint::eTangentType_Step)
-        {
-            newKey.m_controlPoint.m_inTangent = Vec2(0.0f, 0.0f);
-            return newKey;
-        }
-        else if (key.m_controlPoint.m_inTangentType != SBezierControlPoint::eTangentType_Step)
-        {
-            const SAnimTime leftTime = leftKey.m_time;
-            const SAnimTime rightTime = pRightKey ? pRightKey->m_time : key.m_time;
-
-            // Rebase to [0, rightTime - leftTime] to increase float precision
-            const float floatTime = (key.m_time - leftTime).ToFloat();
-            const float floatLeftTime = 0.0f;
-            const float floatRightTime = (rightTime - leftTime).ToFloat();
-
-            newKey.m_controlPoint = Bezier::CalculateInTangent(floatTime, key.m_controlPoint,
-                    floatLeftTime, &leftKey.m_controlPoint,
-                    floatRightTime, pRightKey ? &pRightKey->m_controlPoint : NULL);
-        }
-        else
-        {
-            newKey.m_controlPoint.m_inTangent = Vec2(0.0f, 0.0f);
-            newKey.m_controlPoint.m_value = leftKey.m_controlPoint.m_value;
-        }
-
-        return newKey;
-    }
-
-    SBezierKey ApplyOutTangent(const SBezierKey& key, const SBezierKey* pLeftKey, const SBezierKey& rightKey)
-    {
-        SBezierKey newKey = key;
-
-        if (rightKey.m_controlPoint.m_inTangentType == SBezierControlPoint::eTangentType_Step
-            && key.m_controlPoint.m_outTangentType != SBezierControlPoint::eTangentType_Step)
-        {
-            newKey.m_controlPoint.m_outTangent = Vec2(0.0f, 0.0f);
-        }
-        else if (key.m_controlPoint.m_outTangentType != SBezierControlPoint::eTangentType_Step)
-        {
-            const SAnimTime leftTime = pLeftKey ? pLeftKey->m_time : key.m_time;
-            const SAnimTime rightTime = rightKey.m_time;
-
-            // Rebase to [0, rightTime - leftTime] to increase float precision
-            const float floatTime = (key.m_time - leftTime).ToFloat();
-            const float floatLeftTime = 0.0f;
-            const float floatRightTime = (rightTime - leftTime).ToFloat();
-
-            newKey.m_controlPoint = Bezier::CalculateOutTangent(floatTime, key.m_controlPoint,
-                    floatLeftTime, pLeftKey ? &pLeftKey->m_controlPoint : NULL,
-                    floatRightTime, &rightKey.m_controlPoint);
-        }
-        else
-        {
-            newKey.m_controlPoint.m_outTangent = Vec2(0.0f, 0.0f);
-            newKey.m_controlPoint.m_value = rightKey.m_controlPoint.m_value;
-        }
-
-        return newKey;
-    }
-}
-
-CBezierSpline::CBezierSpline()
-{
-    m_keys.reserve(2);
-}
-
-CBezierSpline::~CBezierSpline()
-{
-}
-
-void CBezierSpline::Init(float fDefaultValue)
-{
-    m_keys.clear();
-    InsertKey(SAnimTime(0.0f), fDefaultValue);
-    InsertKey(SAnimTime(1.0f), fDefaultValue);
-}
-
-float CBezierSpline::Evaluate(float t) const
-{
-    if (m_keys.size() == 0)
-    {
-        return 0.0f;
-    }
-
-    if (m_keys.size() == 1)
-    {
-        return m_keys.front().m_controlPoint.m_value;
-    }
-
-    const SAnimTime time(t);
-
-    if (time <= m_keys.front().m_time)
-    {
-        return m_keys.front().m_controlPoint.m_value;
-    }
-    else if (time >= m_keys.back().m_time)
-    {
-        return m_keys.back().m_controlPoint.m_value;
-    }
-
-    const TKeyContainer::const_iterator it = std::upper_bound(m_keys.begin(), m_keys.end(), time, SCompKeyTime());
-    const TKeyContainer::const_iterator startIt = it - 1;
-
-    if (startIt->m_controlPoint.m_outTangentType == SBezierControlPoint::eTangentType_Step)
-    {
-        return it->m_controlPoint.m_value;
-    }
-
-    if (it->m_controlPoint.m_inTangentType == SBezierControlPoint::eTangentType_Step)
-    {
-        return startIt->m_controlPoint.m_value;
-    }
-
-    const SAnimTime deltaTime = it->m_time - startIt->m_time;
-
-    if (deltaTime == SAnimTime(0))
-    {
-        return startIt->m_controlPoint.m_value;
-    }
-
-    const float timeInSegment = (time - startIt->m_time).ToFloat();
-
-    const SBezierKey* pKeyLeftOfSegment = (startIt != m_keys.begin()) ? &*(startIt - 1) : NULL;
-    const SBezierKey* pKeyRightOfSegment = (startIt != (m_keys.end() - 2)) ? &*(startIt + 2) : NULL;
-    const SBezierKey segmentStart = EnvironmentPresetDetails::ApplyOutTangent(*startIt, pKeyLeftOfSegment, *(startIt + 1));
-    const SBezierKey segmentEnd = EnvironmentPresetDetails::ApplyInTangent(*(startIt + 1), *startIt, pKeyRightOfSegment);
-
-    const float factor = Bezier::InterpolationFactorFromX(timeInSegment, deltaTime.ToFloat(), segmentStart.m_controlPoint, segmentEnd.m_controlPoint);
-    const float fResult = Bezier::EvaluateY(factor, segmentStart.m_controlPoint, segmentEnd.m_controlPoint);
-
-    return fResult;
-}
-
-void CBezierSpline::InsertKey(SAnimTime time, float value)
-{
-    SBezierKey key;
-    key.m_time = time;
-    key.m_controlPoint.m_value = value;
-
-    const size_t nKeyNum = m_keys.size();
-    for (size_t i = 0; i < nKeyNum; ++i)
-    {
-        if (m_keys[i].m_time > time)
-        {
-            m_keys.insert(m_keys.begin() + i, key);
-            return;
-        }
-    }
-
-    m_keys.push_back(key);
-}
-
-void CBezierSpline::UpdateKeyForTime(float fTime, float value)
-{
-    const SAnimTime time(fTime);
-
-    const size_t nKeyNum = m_keys.size();
-    for (size_t i = 0; i < nKeyNum; ++i)
-    {
-        if (fabs(m_keys[i].m_time.ToFloat() - fTime) < EnvironmentPresetDetails::sBezierSplineKeyValueEpsilon)
-        {
-            m_keys[i].m_controlPoint.m_value = value;
-            return;
-        }
-    }
-
-    InsertKey(time, value);
-}
-
-void CBezierSpline::Serialize(Serialization::IArchive& ar)
-{
-    ar(m_keys, "keys");
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-CTimeOfDayVariable::CTimeOfDayVariable()
-    : m_id(ITimeOfDay::PARAM_TOTAL)
-    , m_type(ITimeOfDay::TYPE_FLOAT)
-    , m_name(NULL)
-    , m_displayName(NULL)
-    , m_group(NULL)
-    , m_minValue(0.0f)
-    , m_maxValue(0.0f)
-    , m_value(ZERO)
-{
-}
-
-CTimeOfDayVariable::~CTimeOfDayVariable()
-{
-}
-
-void CTimeOfDayVariable::Init(const char* group, const char* displayName, const char* name, ITimeOfDay::ETimeOfDayParamID nParamId, ITimeOfDay::EVariableType type, float defVal0, float defVal1, float defVal2)
-{
-    m_id = nParamId;
-    m_type = type;
-    m_name = name;
-    m_displayName = (displayName && *displayName) ? displayName : name;
-    m_group = (group && *group) ? group : "Default";
-
-    if (ITimeOfDay::TYPE_FLOAT == type)
-    {
-        m_value.x = defVal0;
-        m_minValue = defVal1;
-        m_maxValue = defVal2;
-        m_spline[0].Init(defVal0);
-    }
-    else if (ITimeOfDay::TYPE_COLOR == type)
-    {
-        m_value.x = defVal0;
-        m_value.y = defVal1;
-        m_value.z = defVal2;
-
-        m_minValue = 0.0f;
-        m_maxValue = 1.0f;
-
-        m_spline[0].Init(defVal0);
-        m_spline[1].Init(defVal1);
-        m_spline[2].Init(defVal2);
-    }
-}
-
-void CTimeOfDayVariable::Update(float time)
-{
-    m_value = GetInterpolatedAt(time);
-}
-
-Vec3 CTimeOfDayVariable::GetInterpolatedAt(float t) const
-{
-    Vec3 result;
-    result.x = clamp_tpl(m_spline[0].Evaluate(t), m_minValue, m_maxValue);
-    result.y = clamp_tpl(m_spline[1].Evaluate(t), m_minValue, m_maxValue);
-    result.z = clamp_tpl(m_spline[2].Evaluate(t), m_minValue, m_maxValue);
-    return result;
-}
-
-size_t CTimeOfDayVariable::GetSplineKeyCount(int nSpline) const
-{
-    if (const CBezierSpline* pSpline = GetSpline(nSpline))
-    {
-        return pSpline->GetKeyCount();
-    }
-
-    return 0;
-}
-
-bool CTimeOfDayVariable::GetSplineKeys(int nSpline, SBezierKey* keysArray, unsigned int keysArraySize) const
-{
-    if (const CBezierSpline* pSpline = GetSpline(nSpline))
-    {
-        if (keysArraySize < pSpline->GetKeyCount())
-        {
-            return false;
-        }
-
-        pSpline->GetKeys(keysArray);
-        return true;
-    }
-
-    return false;
-}
-
-bool CTimeOfDayVariable::SetSplineKeys(int nSpline, const SBezierKey* keysArray, unsigned int keysArraySize)
-{
-    if (CBezierSpline* pSpline = GetSpline(nSpline))
-    {
-        pSpline->SetKeys(keysArray, keysArraySize);
-        return true;
-    }
-    return false;
-}
-
-bool CTimeOfDayVariable::UpdateSplineKeyForTime(int nSpline, float fTime, float newKey)
-{
-    if (CBezierSpline* pSpline = GetSpline(nSpline))
-    {
-        pSpline->UpdateKeyForTime(fTime, newKey);
-        return true;
-    }
-    return false;
-}
-
-void CTimeOfDayVariable::Serialize(Serialization::IArchive& ar)
-{
-    ITimeOfDay::ETimeOfDayParamID defID = m_id;
-    ITimeOfDay::EVariableType   defType = m_type;
-
-    ar(defID, "id");
-    ar(defType, "type");
-    if (!ar.IsInput() || (defID == m_id && defType == m_type))
-    { // Write always, Read only when ID and Type are correct/Schema hasn't changed
-        ar(m_minValue, "minValue");
-        ar(m_maxValue, "maxValue");
-
-        ar(m_spline[0], "spline0");
-        ar(m_spline[1], "spline1");
-        ar(m_spline[2], "spline2");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-CEnvironmentPreset::CEnvironmentPreset()
-{
-    ResetVariables();
-}
-
-CEnvironmentPreset::~CEnvironmentPreset()
-{
-}
-
-void CEnvironmentPreset::ResetVariables()
-{
-    const float fRecip255 = 1.0f / 255.0f;
-
-    AddVar("Sun", "", "Sun color", ITimeOfDay::PARAM_SUN_COLOR, ITimeOfDay::TYPE_COLOR, 255.0f * fRecip255, 248.0f * fRecip255, 248.0f * fRecip255);
-    AddVar("Sun", "Sun intensity (lux)", "Sun intensity", ITimeOfDay::PARAM_SUN_INTENSITY, ITimeOfDay::TYPE_FLOAT, 119000.0f, 0.0f, 550000.0f);
-    AddVar("Sun", "", "Sun specular multiplier", ITimeOfDay::PARAM_SUN_SPECULAR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 4.0f);
-
-    AddVar("Fog", "Color (bottom)", "Fog color", ITimeOfDay::PARAM_FOG_COLOR, ITimeOfDay::TYPE_COLOR, 0.0f, 0.0f, 0.0f);
-    AddVar("Fog", "Color (bottom) multiplier", "Fog color multiplier", ITimeOfDay::PARAM_FOG_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 16.0f);
-    AddVar("Fog", "Height (bottom)", "Fog height (bottom)", ITimeOfDay::PARAM_VOLFOG_HEIGHT, ITimeOfDay::TYPE_FLOAT, 0.0f, -5000.0f, 30000.0f);
-    AddVar("Fog", "Density (bottom)", "Fog layer density (bottom)", ITimeOfDay::PARAM_VOLFOG_DENSITY, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-    AddVar("Fog", "Color (top)", "Fog color (top)", ITimeOfDay::PARAM_FOG_COLOR2, ITimeOfDay::TYPE_COLOR, 0.0f, 0.0f, 0.0f);
-    AddVar("Fog", "Color (top) multiplier", "Fog color (top) multiplier", ITimeOfDay::PARAM_FOG_COLOR2_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 16.0f);
-    AddVar("Fog", "Height (top)", "Fog height (top)", ITimeOfDay::PARAM_VOLFOG_HEIGHT2, ITimeOfDay::TYPE_FLOAT, 4000.0f, -5000.0f, 30000.0f);
-    AddVar("Fog", "Density (top)", "Fog layer density (top)", ITimeOfDay::PARAM_VOLFOG_DENSITY2, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 1.0f);
-    AddVar("Fog", "Color height offset", "Fog color height offset", ITimeOfDay::PARAM_VOLFOG_HEIGHT_OFFSET, ITimeOfDay::TYPE_FLOAT, 0.0f, -1.0f, 1.0f);
-
-    AddVar("Fog", "Color (radial)", "Fog color (radial)", ITimeOfDay::PARAM_FOG_RADIAL_COLOR, ITimeOfDay::TYPE_COLOR, 0.0f, 0.0f, 0.0f);
-    AddVar("Fog", "Color (radial) multiplier", "Fog color (radial) multiplier", ITimeOfDay::PARAM_FOG_RADIAL_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 16.0f);
-    AddVar("Fog", "Radial size", "Fog radial size", ITimeOfDay::PARAM_VOLFOG_RADIAL_SIZE, ITimeOfDay::TYPE_FLOAT, 0.75f, 0.0f, 1.0f);
-    AddVar("Fog", "Radial lobe", "Fog radial lobe", ITimeOfDay::PARAM_VOLFOG_RADIAL_LOBE, ITimeOfDay::TYPE_FLOAT, 0.5f, 0.0f, 1.0f);
-
-    AddVar("Fog", "Global density", "Volumetric fog: Global density", ITimeOfDay::PARAM_VOLFOG_GLOBAL_DENSITY, ITimeOfDay::TYPE_FLOAT, 0.02f, 0.0f, 100.0f);
-    AddVar("Fog", "Final density clamp", "Volumetric fog: Final density clamp", ITimeOfDay::PARAM_VOLFOG_FINAL_DENSITY_CLAMP, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-
-    AddVar("Fog", "Ramp start", "Volumetric fog: Ramp start", ITimeOfDay::PARAM_VOLFOG_RAMP_START, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 30000.0f);
-    AddVar("Fog", "Ramp end", "Volumetric fog: Ramp end", ITimeOfDay::PARAM_VOLFOG_RAMP_END, ITimeOfDay::TYPE_FLOAT, 100.0f, 0.0f, 30000.0f);
-    AddVar("Fog", "Ramp influence", "Volumetric fog: Ramp influence", ITimeOfDay::PARAM_VOLFOG_RAMP_INFLUENCE, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 1.0f);
-
-    AddVar("Fog", "Shadow darkening", "Volumetric fog: Shadow darkening", ITimeOfDay::PARAM_VOLFOG_SHADOW_DARKENING, ITimeOfDay::TYPE_FLOAT, 0.25f, 0.0f, 1.0f);
-    AddVar("Fog", "Shadow darkening sun", "Volumetric fog: Shadow darkening sun", ITimeOfDay::PARAM_VOLFOG_SHADOW_DARKENING_SUN, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-    AddVar("Fog", "Shadow darkening ambient", "Volumetric fog: Shadow darkening ambient", ITimeOfDay::PARAM_VOLFOG_SHADOW_DARKENING_AMBIENT, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-    AddVar("Fog", "Shadow range", "Volumetric fog: Shadow range", ITimeOfDay::PARAM_VOLFOG_SHADOW_RANGE, ITimeOfDay::TYPE_FLOAT, 0.1f, 0.0f, 1.0f);
-
-    AddVar("Volumetric fog", "Height (bottom)", "Volumetric fog 2: Fog height (bottom)", ITimeOfDay::PARAM_VOLFOG2_HEIGHT, ITimeOfDay::TYPE_FLOAT, 0.0f, -5000.0f, 30000.0f);
-    AddVar("Volumetric fog", "Density (bottom)", "Volumetric fog 2: Fog layer density (bottom)", ITimeOfDay::PARAM_VOLFOG2_DENSITY, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-    AddVar("Volumetric fog", "Height (top)", "Volumetric fog 2: Fog height (top)", ITimeOfDay::PARAM_VOLFOG2_HEIGHT2, ITimeOfDay::TYPE_FLOAT, 4000.0f, -5000.0f, 30000.0f);
-    AddVar("Volumetric fog", "Density (top)", "Volumetric fog 2: Fog layer density (top)", ITimeOfDay::PARAM_VOLFOG2_DENSITY2, ITimeOfDay::TYPE_FLOAT, 0.0001f, 0.0f, 1.0f);
-    AddVar("Volumetric fog", "Global density", "Volumetric fog 2: Global fog density", ITimeOfDay::PARAM_VOLFOG2_GLOBAL_DENSITY, ITimeOfDay::TYPE_FLOAT, 0.1f, 0.0f, 100.0f);
-    AddVar("Volumetric fog", "Ramp start", "Volumetric fog 2: Ramp start", ITimeOfDay::PARAM_VOLFOG2_RAMP_START, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 30000.0f);
-    AddVar("Volumetric fog", "Ramp end", "Volumetric fog 2: Ramp end", ITimeOfDay::PARAM_VOLFOG2_RAMP_END, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 30000.0f);
-    AddVar("Volumetric fog", "Color (atmosphere)", "Volumetric fog 2: Fog albedo color (atmosphere)", ITimeOfDay::PARAM_VOLFOG2_COLOR1, ITimeOfDay::TYPE_COLOR, 1.0f, 1.0f, 1.0f);
-    AddVar("Volumetric fog", "Anisotropy (atmosphere)", "Volumetric fog 2: Anisotropy factor (atmosphere)", ITimeOfDay::PARAM_VOLFOG2_ANISOTROPIC1, ITimeOfDay::TYPE_FLOAT, 0.2f, -1.0f, 1.0f);
-    AddVar("Volumetric fog", "Color (sun radial)", "Volumetric fog 2: Fog albedo color (sun radial)", ITimeOfDay::PARAM_VOLFOG2_COLOR2, ITimeOfDay::TYPE_COLOR, 1.0f, 1.0f, 1.0f);
-    AddVar("Volumetric fog", "Anisotropy (sun radial)", "Volumetric fog 2: Anisotropy factor (sun radial)", ITimeOfDay::PARAM_VOLFOG2_ANISOTROPIC2, ITimeOfDay::TYPE_FLOAT, 0.95f, -1.0f, 1.0f);
-    AddVar("Volumetric fog", "Radial blend factor", "Volumetric fog 2: Blend factor for sun scattering", ITimeOfDay::PARAM_VOLFOG2_BLEND_FACTOR, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-    AddVar("Volumetric fog", "Radial blend mode", "Volumetric fog 2: Blend mode for sun scattering", ITimeOfDay::PARAM_VOLFOG2_BLEND_MODE, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 1.0f);
-    AddVar("Volumetric fog", "Range", "Volumetric fog 2: Maximum range of ray-marching", ITimeOfDay::PARAM_VOLFOG2_RANGE, ITimeOfDay::TYPE_FLOAT, 64.0f, 0.0f, 8192.0f);
-    AddVar("Volumetric fog", "In-scattering", "Volumetric fog 2: In-scattering factor", ITimeOfDay::PARAM_VOLFOG2_INSCATTER, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 100.0f);
-    AddVar("Volumetric fog", "Extinction", "Volumetric fog 2: Extinction factor", ITimeOfDay::PARAM_VOLFOG2_EXTINCTION, ITimeOfDay::TYPE_FLOAT, 0.3f, 0.0f, 100.0f);
-    AddVar("Volumetric fog", "Color (entities)", "Volumetric fog 2: Fog albedo color (entities)", ITimeOfDay::PARAM_VOLFOG2_COLOR, ITimeOfDay::TYPE_COLOR, 1.0f, 1.0f, 1.0f);
-    AddVar("Volumetric fog", "Anisotropy (entities)", "Volumetric fog 2: Anisotropy factor (entities)", ITimeOfDay::PARAM_VOLFOG2_ANISOTROPIC, ITimeOfDay::TYPE_FLOAT, 0.6f, -1.0f, 1.0f);
-    AddVar("Volumetric fog", "Analytical fog visibility", "Volumetric fog 2: Analytical volumetric fog visibility", ITimeOfDay::PARAM_VOLFOG2_GLOBAL_FOG_VISIBILITY, ITimeOfDay::TYPE_FLOAT, 0.5f, 0.0f, 1.0f);
-    AddVar("Volumetric fog", "Final density clamp", "Volumetric fog 2: Final density clamp", ITimeOfDay::PARAM_VOLFOG2_FINAL_DENSITY_CLAMP, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-
-    AddVar("Sky Light", "Sun intensity", "Sky light: Sun intensity", ITimeOfDay::PARAM_SKYLIGHT_SUN_INTENSITY, ITimeOfDay::TYPE_COLOR, 1.0f, 1.0f, 1.0f);
-    AddVar("Sky Light", "Sun intensity multiplier", "Sky light: Sun intensity multiplier", ITimeOfDay::PARAM_SKYLIGHT_SUN_INTENSITY_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 50.0f, 0.0f, 1000.0f);
-    AddVar("Sky Light", "Mie scattering", "Sky light: Mie scattering", ITimeOfDay::PARAM_SKYLIGHT_KM, ITimeOfDay::TYPE_FLOAT, 4.8f, 0.0f, 1000.0f);
-    AddVar("Sky Light", "Rayleigh scattering", "Sky light: Rayleigh scattering", ITimeOfDay::PARAM_SKYLIGHT_KR, ITimeOfDay::TYPE_FLOAT, 2.0f, 0.0f, 1000.0f);
-    AddVar("Sky Light", "Sun anisotropy factor", "Sky light: Sun anisotropy factor", ITimeOfDay::PARAM_SKYLIGHT_G, ITimeOfDay::TYPE_FLOAT, -0.997f, -0.9999f, 0.9999f);
-    AddVar("Sky Light", "Wavelength (R)", "Sky light: Wavelength (R)", ITimeOfDay::PARAM_SKYLIGHT_WAVELENGTH_R, ITimeOfDay::TYPE_FLOAT, 694.0f, 380.0f, 780.0f);
-    AddVar("Sky Light", "Wavelength (G)", "Sky light: Wavelength (G)", ITimeOfDay::PARAM_SKYLIGHT_WAVELENGTH_G, ITimeOfDay::TYPE_FLOAT, 597.0f, 380.0f, 780.0f);
-    AddVar("Sky Light", "Wavelength (B)", "Sky light: Wavelength (B)", ITimeOfDay::PARAM_SKYLIGHT_WAVELENGTH_B, ITimeOfDay::TYPE_FLOAT, 488.0f, 380.0f, 780.0f);
-
-    AddVar("Night Sky", "Horizon color", "Night sky: Horizon color", ITimeOfDay::PARAM_NIGHSKY_HORIZON_COLOR, ITimeOfDay::TYPE_COLOR, 222.0f * fRecip255, 148.0f * fRecip255, 47.0f * fRecip255);
-    AddVar("Night Sky", "Zenith color", "Night sky: Zenith color", ITimeOfDay::PARAM_NIGHSKY_ZENITH_COLOR, ITimeOfDay::TYPE_COLOR, 17.0f * fRecip255, 38.0f * fRecip255, 78.0f * fRecip255);
-    AddVar("Night Sky", "Zenith shift", "Night sky: Zenith shift", ITimeOfDay::PARAM_NIGHSKY_ZENITH_SHIFT, ITimeOfDay::TYPE_FLOAT, 0.25f, 0.0f, 16.0f);
-    AddVar("Night Sky", "Star intensity", "Night sky: Star intensity", ITimeOfDay::PARAM_NIGHSKY_START_INTENSITY, ITimeOfDay::TYPE_FLOAT, 0.01f, 0.0f, 16.0f);
-    AddVar("Night Sky", "Moon color", "Night sky: Moon color", ITimeOfDay::PARAM_NIGHSKY_MOON_COLOR, ITimeOfDay::TYPE_COLOR, 255.0f * fRecip255, 255.0f * fRecip255, 255.0f * fRecip255);
-    AddVar("Night Sky", "Moon inner corona color", "Night sky: Moon inner corona color", ITimeOfDay::PARAM_NIGHSKY_MOON_INNERCORONA_COLOR, ITimeOfDay::TYPE_COLOR, 230.0f * fRecip255, 255.0f * fRecip255, 255.0f * fRecip255);
-    AddVar("Night Sky", "Moon inner corona scale", "Night sky: Moon inner corona scale", ITimeOfDay::PARAM_NIGHSKY_MOON_INNERCORONA_SCALE, ITimeOfDay::TYPE_FLOAT, 0.499f, 0.0f, 2.0f);
-    AddVar("Night Sky", "Moon outer corona color", "Night sky: Moon outer corona color", ITimeOfDay::PARAM_NIGHSKY_MOON_OUTERCORONA_COLOR, ITimeOfDay::TYPE_COLOR, 128.0f * fRecip255, 200.0f * fRecip255, 255.0f * fRecip255);
-    AddVar("Night Sky", "Moon outer corona scale", "Night sky: Moon outer corona scale", ITimeOfDay::PARAM_NIGHSKY_MOON_OUTERCORONA_SCALE, ITimeOfDay::TYPE_FLOAT, 0.006f, 0.0f, 2.0f);
-
-    AddVar("Night Sky Multiplier", "Horizon color", "Night sky: Horizon color multiplier", ITimeOfDay::PARAM_NIGHSKY_HORIZON_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.0001f, 0.0f, 1.0f);
-    AddVar("Night Sky Multiplier", "Zenith color", "Night sky: Zenith color multiplier", ITimeOfDay::PARAM_NIGHSKY_ZENITH_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.00002f, 0.0f, 1.0f);
-    AddVar("Night Sky Multiplier", "Moon color", "Night sky: Moon color multiplier", ITimeOfDay::PARAM_NIGHSKY_MOON_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.01f, 0.0f, 1.0f);
-    AddVar("Night Sky Multiplier", "Moon inner corona color", "Night sky: Moon inner corona color multiplier", ITimeOfDay::PARAM_NIGHSKY_MOON_INNERCORONA_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.0001f, 0.0f, 1.0f);
-    AddVar("Night Sky Multiplier", "Moon outer corona color", "Night sky: Moon outer corona color multiplier", ITimeOfDay::PARAM_NIGHSKY_MOON_OUTERCORONA_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.00005f, 0.0f, 1.0f);
-
-    AddVar("Cloud Shading", "Sun contribution", "Cloud shading: Sun light multiplier", ITimeOfDay::PARAM_CLOUDSHADING_SUNLIGHT_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 1.96f, 0.0f, 16.0f);
-    AddVar("Cloud Shading", "Sun custom color", "Cloud shading: Sun custom color", ITimeOfDay::PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR, ITimeOfDay::TYPE_COLOR, 215.0f * fRecip255, 200.0f * fRecip255, 170.0f * fRecip255);
-    AddVar("Cloud Shading", "Sun custom color multiplier", "Cloud shading: Sun custom color multiplier", ITimeOfDay::PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 16.0f);
-    AddVar("Cloud Shading", "Sun custom color influence", "Cloud shading: Sun custom color influence", ITimeOfDay::PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR_INFLUENCE, ITimeOfDay::TYPE_FLOAT, 0.0f,  0.0f, 1.0f);
-
-    AddVar("Sun Rays Effect", "", "Sun shafts visibility", ITimeOfDay::PARAM_SUN_SHAFTS_VISIBILITY, ITimeOfDay::TYPE_FLOAT, 0.25f,  0.0f, 1.0f);
-    AddVar("Sun Rays Effect", "", "Sun rays visibility", ITimeOfDay::PARAM_SUN_RAYS_VISIBILITY, ITimeOfDay::TYPE_FLOAT, 1.0f,  0.0f, 10.0f);
-    AddVar("Sun Rays Effect", "", "Sun rays attenuation", ITimeOfDay::PARAM_SUN_RAYS_ATTENUATION, ITimeOfDay::TYPE_FLOAT, 5.0f,  0.0f, 10.0f);
-    AddVar("Sun Rays Effect", "", "Sun rays suncolor influence", ITimeOfDay::PARAM_SUN_RAYS_SUNCOLORINFLUENCE, ITimeOfDay::TYPE_FLOAT, 1.0f,  0.0f, 1.0f);
-    AddVar("Sun Rays Effect", "", "Sun rays custom color", ITimeOfDay::PARAM_SUN_RAYS_CUSTOMCOLOR, ITimeOfDay::TYPE_COLOR, 1.0f, 1.0f, 1.0f);
-
-    AddVar("HDR", "", "Film curve shoulder scale", ITimeOfDay::PARAM_HDR_FILMCURVE_SHOULDER_SCALE, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 10.0f);
-    AddVar("HDR", "", "Film curve midtones scale", ITimeOfDay::PARAM_HDR_FILMCURVE_LINEAR_SCALE, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 10.0f);
-    AddVar("HDR", "", "Film curve toe scale", ITimeOfDay::PARAM_HDR_FILMCURVE_TOE_SCALE, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 10.0f);
-    AddVar("HDR", "", "Film curve whitepoint", ITimeOfDay::PARAM_HDR_FILMCURVE_WHITEPOINT, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 10.0f);
-    AddVar("HDR", "", "Saturation", ITimeOfDay::PARAM_HDR_COLORGRADING_COLOR_SATURATION, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 2.0f);
-    AddVar("HDR", "", "Color balance", ITimeOfDay::PARAM_HDR_COLORGRADING_COLOR_BALANCE, ITimeOfDay::TYPE_COLOR, 1.0f, 1.0f, 1.0f);
-    AddVar("HDR", "(Dep) Scene key", "Scene key", ITimeOfDay::PARAM_HDR_EYEADAPTATION_SCENEKEY, ITimeOfDay::TYPE_FLOAT, 0.18f, 0.0f, 1.0f);
-    AddVar("HDR", "(Dep) Min exposure", "Min exposure", ITimeOfDay::PARAM_HDR_EYEADAPTATION_MIN_EXPOSURE, ITimeOfDay::TYPE_FLOAT, 0.36f, 0.0f, 10.0f);
-    AddVar("HDR", "(Dep) Max exposure", "Max exposure", ITimeOfDay::PARAM_HDR_EYEADAPTATION_MAX_EXPOSURE, ITimeOfDay::TYPE_FLOAT, 2.8f, 0.0f, 10.0f);
-    AddVar("HDR", "", "EV Min", ITimeOfDay::PARAM_HDR_EYEADAPTATION_EV_MIN, ITimeOfDay::TYPE_FLOAT, 4.5f, -10.0f, 20.0f);
-    AddVar("HDR", "", "EV Max", ITimeOfDay::PARAM_HDR_EYEADAPTATION_EV_MAX, ITimeOfDay::TYPE_FLOAT, 17.0f, -10.0f, 20.0f);
-    AddVar("HDR", "", "EV Auto compensation", ITimeOfDay::PARAM_HDR_EYEADAPTATION_EV_AUTO_COMPENSATION, ITimeOfDay::TYPE_FLOAT, 1.5f, -5.0f, 5.0f);
-    AddVar("HDR", "", "Bloom amount", ITimeOfDay::PARAM_HDR_BLOOM_AMOUNT, ITimeOfDay::TYPE_FLOAT, 0.1f, 0.0f, 10.0f);
-
-    AddVar("Filters", "Grain", "Filters: grain", ITimeOfDay::PARAM_COLORGRADING_FILTERS_GRAIN, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 8.0f);   // deprecated
-    AddVar("Filters", "Photofilter color", "Filters: photofilter color", ITimeOfDay::PARAM_COLORGRADING_FILTERS_PHOTOFILTER_COLOR, ITimeOfDay::TYPE_COLOR, 0.952f, 0.517f, 0.09f);   // deprecated
-    AddVar("Filters", "Photofilter density", "Filters: photofilter density", ITimeOfDay::PARAM_COLORGRADING_FILTERS_PHOTOFILTER_DENSITY, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 1.0f); // deprecated
-
-    AddVar("Depth Of Field", "Focus range", "Dof: focus range", ITimeOfDay::PARAM_COLORGRADING_DOF_FOCUSRANGE, ITimeOfDay::TYPE_FLOAT, 1000.0f, 0.0f, 10000.0f);
-    AddVar("Depth Of Field", "Blur amount", "Dof: blur amount", ITimeOfDay::PARAM_COLORGRADING_DOF_BLURAMOUNT, ITimeOfDay::TYPE_FLOAT, 0.0f, 0.0f, 1.0f);
-    
-    AddVar("Advanced", "", "Ocean fog color", ITimeOfDay::PARAM_OCEANFOG_COLOR, ITimeOfDay::TYPE_COLOR, 29.0f * fRecip255, 102.0f * fRecip255, 141.0f * fRecip255);
-    AddVar("Advanced", "", "Ocean fog color multiplier", ITimeOfDay::PARAM_OCEANFOG_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-    AddVar("Advanced", "", "Ocean fog density", ITimeOfDay::PARAM_OCEANFOG_DENSITY, ITimeOfDay::TYPE_FLOAT, 0.2f, 0.0f, 1.0f);
-
-    AddVar("Advanced", "", "Static skybox multiplier", ITimeOfDay::PARAM_SKYBOX_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 1.0f);
-
-    const float arrDepthConstBias[] = {1.0f, 1.0f, 1.9f, 3.0f, 2.0f, 2.0f, 2.0f, 2.0f};
-    const float arrDepthSlopeBias[] = {4.0f, 2.0f, 0.24f, 0.24f, 0.5f, 0.5f, 0.5f, 0.5f};
-    AddVar("Shadows", "", "Cascade 0: Bias", ITimeOfDay::PARAM_SHADOWSC0_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[0], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 0: Slope Bias", ITimeOfDay::PARAM_SHADOWSC0_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[0], 0.0f, 500.0f);
-    AddVar("Shadows", "", "Cascade 1: Bias", ITimeOfDay::PARAM_SHADOWSC1_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[1], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 1: Slope Bias", ITimeOfDay::PARAM_SHADOWSC1_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[1], 0.0f, 500.0f);
-    AddVar("Shadows", "", "Cascade 2: Bias", ITimeOfDay::PARAM_SHADOWSC2_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[2], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 2: Slope Bias", ITimeOfDay::PARAM_SHADOWSC2_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[2], 0.0f, 500.0f);
-    AddVar("Shadows", "", "Cascade 3: Bias", ITimeOfDay::PARAM_SHADOWSC3_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[3], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 3: Slope Bias", ITimeOfDay::PARAM_SHADOWSC3_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[3], 0.0f, 500.0f);
-    AddVar("Shadows", "", "Cascade 4: Bias", ITimeOfDay::PARAM_SHADOWSC4_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[4], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 4: Slope Bias", ITimeOfDay::PARAM_SHADOWSC4_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[4], 0.0f, 500.0f);
-    AddVar("Shadows", "", "Cascade 5: Bias", ITimeOfDay::PARAM_SHADOWSC5_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[5], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 5: Slope Bias", ITimeOfDay::PARAM_SHADOWSC5_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[5], 0.0f, 500.0f);
-    AddVar("Shadows", "", "Cascade 6: Bias", ITimeOfDay::PARAM_SHADOWSC6_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[6], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 6: Slope Bias", ITimeOfDay::PARAM_SHADOWSC6_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[6], 0.0f, 500.0f);
-    AddVar("Shadows", "", "Cascade 7: Bias", ITimeOfDay::PARAM_SHADOWSC7_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthConstBias[7], 0.0f, 10.0f);
-    AddVar("Shadows", "", "Cascade 7: Slope Bias", ITimeOfDay::PARAM_SHADOWSC7_SLOPE_BIAS, ITimeOfDay::TYPE_FLOAT, arrDepthSlopeBias[7], 0.0f, 500.0f);
-
-    AddVar("Shadows", "", "Shadow jittering", ITimeOfDay::PARAM_SHADOW_JITTERING, ITimeOfDay::TYPE_FLOAT, 2.5f, 0.f, 10.f);
-
-    AddVar("Obsolete", "", "HDR dynamic power factor", ITimeOfDay::PARAM_HDR_DYNAMIC_POWER_FACTOR, ITimeOfDay::TYPE_FLOAT, 0.0f, -4.0f, 4.0f);
-    AddVar("Obsolete", "", "Sky brightening (terrain occlusion)", ITimeOfDay::PARAM_TERRAIN_OCCL_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 0.3f, 0.f, 1.f);
-    AddVar("Obsolete", "", "Sun color multiplier", ITimeOfDay::PARAM_SUN_COLOR_MULTIPLIER, ITimeOfDay::TYPE_FLOAT, 1.0f, 0.0f, 16.0f);
-}
-
-void CEnvironmentPreset::Serialize(Serialization::IArchive& ar)
-{
-    for (size_t i = 0; i < ITimeOfDay::PARAM_TOTAL; ++i)
-    {
-        ar(m_vars[i], "var");
-    }
-}
-
-void CEnvironmentPreset::Update(float t)
-{
-    for (size_t i = 0; i < ITimeOfDay::PARAM_TOTAL; ++i)
-    {
-        m_vars[i].Update(t);
-    }
-}
-
-CTimeOfDayVariable* CEnvironmentPreset::GetVar(const char* varName)
-{
-    for (size_t i = 0; i < ITimeOfDay::PARAM_TOTAL; ++i)
-    {
-        if (strcmp(m_vars[i].GetName(), varName) == 0)
-        {
-            return &m_vars[i];
-        }
-    }
-    return NULL;
-}
-
-bool CEnvironmentPreset::InterpolateVarInRange(ITimeOfDay::ETimeOfDayParamID id, float fMin, float fMax, unsigned int nCount, Vec3* resultArray) const
-{
-    const float fdx = 1.0f / float(nCount);
-    float normX = 0.0f;
-    for (unsigned int i = 0; i < nCount; ++i)
-    {
-        const float time = Lerp(fMin, fMax, normX);
-        resultArray[i] = m_vars[id].GetInterpolatedAt(time);
-        normX += fdx;
-    }
-
-    return true;
-}
-
-void CEnvironmentPreset::AddVar(const char* group, const char* displayName, const char* name, ITimeOfDay::ETimeOfDayParamID nParamId, ITimeOfDay::EVariableType type, float defVal0, float defVal1, float defVal2)
-{
-    CTimeOfDayVariable& var = m_vars[nParamId];
-    var.Init(group, displayName, name, nParamId, type, defVal0, defVal1, defVal2);
-}
diff --git a/Code/CryEngine/Cry3DEngine/EnvironmentPreset.h b/Code/CryEngine/Cry3DEngine/EnvironmentPreset.h
deleted file mode 100644
index 0fd4242f2e..0000000000
--- a/Code/CryEngine/Cry3DEngine/EnvironmentPreset.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef _environment_preset_h_
-#define _environment_preset_h_
-#pragma once
-
-#include <Bezier.h>
-
-class CBezierSpline
-{
-public:
-    CBezierSpline();
-    ~CBezierSpline();
-
-    void Init(float fDefaultValue);
-    float Evaluate(float t) const;
-
-    void SetKeys(const SBezierKey* keysArray, unsigned int keysArraySize) { m_keys.resize(keysArraySize); memcpy(&m_keys[0], keysArray, keysArraySize * sizeof(SBezierKey)); }
-    void GetKeys(SBezierKey* keys) const { memcpy(keys, &m_keys[0], m_keys.size() * sizeof(SBezierKey)); }
-
-    void InsertKey(SAnimTime time, float value);
-    void UpdateKeyForTime(float fTime, float value);
-
-    void Resize(size_t nSize) { m_keys.resize(nSize); }
-
-    size_t GetKeyCount() const { return m_keys.size(); }
-    const SBezierKey& GetKey(size_t nIndex) const { return m_keys[nIndex]; }
-    SBezierKey& GetKey(size_t nIndex) { return m_keys[nIndex]; }
-
-    void Serialize(Serialization::IArchive& ar);
-private:
-    typedef std::vector<SBezierKey> TKeyContainer;
-    TKeyContainer m_keys;
-
-    struct SCompKeyTime
-    {
-        bool operator()(const TKeyContainer::value_type& l, const TKeyContainer::value_type& r) const { return l.m_time < r.m_time; }
-        bool operator()(SAnimTime l, const TKeyContainer::value_type& r) const { return l < r.m_time; }
-        bool operator()(const TKeyContainer::value_type& l, SAnimTime r) const { return l.m_time < r; }
-    };
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CTimeOfDayVariable
-{
-public:
-    CTimeOfDayVariable();
-    ~CTimeOfDayVariable();
-
-    void Init(const char* group, const char* displayName, const char* name, ITimeOfDay::ETimeOfDayParamID nParamId, ITimeOfDay::EVariableType type, float defVal0, float defVal1, float defVal2);
-    void Update(float time);
-
-    Vec3 GetInterpolatedAt(float t) const;
-
-    ITimeOfDay::EVariableType GetType() const {return m_type; }
-    const char* GetName() const { return m_name; }
-    const char* GetDisplayName() const { return m_displayName; }
-    const char* GetGroupName() const { return m_group; }
-    const Vec3 GetValue() const { return m_value; }
-
-    float GetMinValue() const { return m_minValue; }
-    float GetMaxValue() const { return m_maxValue; }
-
-    const CBezierSpline* GetSpline(int nIndex) const
-    {
-        if (nIndex >= 0 && nIndex < Vec3::component_count)
-        {
-            return &m_spline[nIndex];
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-
-    CBezierSpline* GetSpline(int nIndex)
-    {
-        if (nIndex >= 0 && nIndex < Vec3::component_count)
-        {
-            return &m_spline[nIndex];
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-
-    size_t GetSplineKeyCount(int nSpline) const;
-    bool GetSplineKeys(int nSpline, SBezierKey* keysArray, unsigned int keysArraySize) const;
-    bool SetSplineKeys(int nSpline, const SBezierKey* keysArray, unsigned int keysArraySize);
-    bool UpdateSplineKeyForTime(int nSpline, float fTime, float newKey);
-
-    void Serialize(Serialization::IArchive& ar);
-private:
-    ITimeOfDay::ETimeOfDayParamID       m_id;
-    ITimeOfDay::EVariableType               m_type;
-
-    const char* m_name;  // Variable name.
-    const char* m_displayName;  // Variable user readable name.
-    const char* m_group; // Group name.
-
-    float m_minValue;
-    float m_maxValue;
-
-    Vec3 m_value;
-    CBezierSpline m_spline[Vec3::component_count]; //spline for each component in m_value
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CEnvironmentPreset
-{
-public:
-    CEnvironmentPreset();
-    ~CEnvironmentPreset();
-
-    void ResetVariables();
-    void Update(float t);
-
-    const CTimeOfDayVariable* GetVar(ITimeOfDay::ETimeOfDayParamID id) const { return &m_vars[id]; }
-    CTimeOfDayVariable* GetVar(ITimeOfDay::ETimeOfDayParamID id) { return &m_vars[id]; }
-    CTimeOfDayVariable* GetVar(const char* varName);
-    bool InterpolateVarInRange(ITimeOfDay::ETimeOfDayParamID id, float fMin, float fMax, unsigned int nCount, Vec3* resultArray) const;
-
-    void Serialize(Serialization::IArchive& ar);
-
-private:
-    void AddVar(const char* group, const char* displayName, const char* name, ITimeOfDay::ETimeOfDayParamID nParamId, ITimeOfDay::EVariableType type, float defVal0, float defVal1, float defVal2);
-
-    CTimeOfDayVariable m_vars[ITimeOfDay::PARAM_TOTAL];
-};
-
-#endif //_environment_preset_h_
diff --git a/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode.cpp b/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode.cpp
deleted file mode 100644
index a3de520b1f..0000000000
--- a/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode.cpp
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "FogVolumeRenderNode.h"
-#include "VisAreas.h"
-#include "CREFogVolume.h"
-#include "Cry_Geo.h"
-#include "ObjMan.h"
-#include "ClipVolumeManager.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-#include <limits>
-
-
-AABB CFogVolumeRenderNode::s_tracableFogVolumeArea(Vec3(0, 0, 0), Vec3(0, 0, 0));
-StaticInstance<CFogVolumeRenderNode::CachedFogVolumes> CFogVolumeRenderNode::s_cachedFogVolumes;
-StaticInstance<CFogVolumeRenderNode::GlobalFogVolumeMap> CFogVolumeRenderNode::s_globalFogVolumeMap;
-bool CFogVolumeRenderNode::s_forceTraceableAreaUpdate(false);
-
-void CFogVolumeRenderNode::StaticReset()
-{
-    stl::free_container(s_cachedFogVolumes);
-}
-
-void CFogVolumeRenderNode::ForceTraceableAreaUpdate()
-{
-    s_forceTraceableAreaUpdate = true;
-}
-
-
-void CFogVolumeRenderNode::SetTraceableArea(const AABB& traceableArea, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-    // do we bother?
-    if (!GetCVars()->e_Fog || !GetCVars()->e_FogVolumes)
-    {
-        return;
-    }
-
-    if (GetCVars()->e_VolumetricFog != 0)
-    {
-        return;
-    }
-
-    // is update of traceable areas necessary
-    if (!s_forceTraceableAreaUpdate)
-    {
-        if ((s_tracableFogVolumeArea.GetCenter() - traceableArea.GetCenter()).GetLengthSquared() < 1e-4f && (s_tracableFogVolumeArea.GetSize() - traceableArea.GetSize()).GetLengthSquared() < 1e-4f)
-        {
-            return;
-        }
-    }
-
-    // set new area and reset list of traceable fog volumes
-    s_tracableFogVolumeArea = traceableArea;
-    s_cachedFogVolumes.resize(0);
-
-    // collect all candidates
-    Vec3 traceableAreaCenter(s_tracableFogVolumeArea.GetCenter());
-    IVisArea* pVisAreaOfCenter(GetVisAreaManager() ? GetVisAreaManager()->GetVisAreaFromPos(traceableAreaCenter) : NULL);
-
-    GlobalFogVolumeMap::const_iterator itEnd(s_globalFogVolumeMap.end());
-    for (GlobalFogVolumeMap::const_iterator it(s_globalFogVolumeMap.begin()); it != itEnd; ++it)
-    {
-        const CFogVolumeRenderNode* pFogVolume(*it);
-        if (pVisAreaOfCenter || (!pVisAreaOfCenter && !pFogVolume->GetEntityVisArea()))    // if outside only add fog volumes which are outside as well
-        {
-            if (Overlap::AABB_AABB(s_tracableFogVolumeArea, pFogVolume->m_WSBBox))    // bb of fog volume overlaps with traceable area
-            {
-                s_cachedFogVolumes.push_back(SCachedFogVolume(pFogVolume, Vec3(pFogVolume->m_pos - traceableAreaCenter).GetLengthSquared()));
-            }
-        }
-    }
-
-    // sort by distance
-    std::sort(s_cachedFogVolumes.begin(), s_cachedFogVolumes.end());
-
-    // reset force-update flags
-    s_forceTraceableAreaUpdate = false;
-}
-
-void CFogVolumeRenderNode::RegisterFogVolume(const CFogVolumeRenderNode* pFogVolume)
-{
-    GlobalFogVolumeMap::const_iterator it(s_globalFogVolumeMap.find(pFogVolume));
-    assert(it == s_globalFogVolumeMap.end() &&
-        "CFogVolumeRenderNode::RegisterFogVolume() -- Fog volume already registered!");
-    if (it == s_globalFogVolumeMap.end())
-    {
-        s_globalFogVolumeMap.insert(pFogVolume);
-        ForceTraceableAreaUpdate();
-    }
-}
-
-
-void CFogVolumeRenderNode::UnregisterFogVolume(const CFogVolumeRenderNode* pFogVolume)
-{
-    GlobalFogVolumeMap::iterator it(s_globalFogVolumeMap.find(pFogVolume));
-    assert(it != s_globalFogVolumeMap.end() &&
-        "CFogVolumeRenderNode::UnRegisterFogVolume() -- Fog volume previously not registered!");
-    if (it != s_globalFogVolumeMap.end())
-    {
-        s_globalFogVolumeMap.erase(it);
-        ForceTraceableAreaUpdate();
-    }
-}
-
-
-CFogVolumeRenderNode::CFogVolumeRenderNode()
-    : m_matNodeWS()
-    , m_matWS()
-    , m_matWSInv()
-    , m_volumeType(0)
-    , m_pos(0, 0, 0)
-    , m_x(1, 0, 0)
-    , m_y(0, 1, 0)
-    , m_z(0, 0, 1)
-    , m_size(1, 1, 1)
-    , m_scale(1, 1, 1)
-    , m_globalDensity(1)
-    , m_densityOffset(0)
-    , m_nearCutoff(0)
-    , m_fHDRDynamic(0)
-    , m_softEdges(1)
-    , m_color(1, 1, 1, 1)
-    , m_useGlobalFogColor(false)
-    , m_affectsThisAreaOnly(false)
-    , m_rampParams(0, 1, 0)
-    , m_updateFrameID(0)
-    , m_windInfluence(1)
-    , m_noiseElapsedTime(-5000.0f)
-    , m_densityNoiseScale(0)
-    , m_densityNoiseOffset(0)
-    , m_densityNoiseTimeFrequency(0)
-    , m_densityNoiseFrequency(1, 1, 1)
-    , m_heightFallOffDir(0, 0, 1)
-    , m_heightFallOffDirScaled(0, 0, 1)
-    , m_heightFallOffShift(0, 0, 0)
-    , m_heightFallOffBasePoint(0, 0, 0)
-    , m_localBounds(Vec3(-0.5f, -0.5f, -0.5f), Vec3(0.5f, 0.5f, 0.5f))
-    , m_globalDensityFader()
-    , m_pMatFogVolEllipsoid(0)
-    , m_pMatFogVolBox(0)
-    , m_WSBBox()
-    , m_cachedSoftEdgesLerp(1, 0)
-    , m_cachedFogColor(1, 1, 1, 1)
-{
-    m_matNodeWS.SetIdentity();
-
-    m_matWS.SetIdentity();
-    m_matWSInv.SetIdentity();
-
-    m_windOffset.x = cry_random(0.0f, 1000.0f);
-    m_windOffset.y = cry_random(0.0f, 1000.0f);
-    m_windOffset.z = cry_random(0.0f, 1000.0f);
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_pFogVolumeRenderElement[i] = (CREFogVolume*) GetRenderer()->EF_CreateRE(eDATA_FogVolume);
-    }
-
-    m_pMatFogVolEllipsoid = Get3DEngine()->m_pMatFogVolEllipsoid;
-    m_pMatFogVolBox = Get3DEngine()->m_pMatFogVolBox;
-
-    //Get3DEngine()->RegisterEntity( this );
-    RegisterFogVolume(this);
-}
-
-
-CFogVolumeRenderNode::~CFogVolumeRenderNode()
-{
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        if (m_pFogVolumeRenderElement[i])
-        {
-            m_pFogVolumeRenderElement[i]->Release(false);
-            m_pFogVolumeRenderElement[i] = 0;
-        }
-    }
-
-    UnregisterFogVolume(this);
-    Get3DEngine()->FreeRenderNodeState(this);
-}
-
-
-void CFogVolumeRenderNode::UpdateFogVolumeMatrices()
-{
-    // update matrices used for ray tracing, distance sorting, etc.
-    Matrix34 mtx = Matrix34::CreateFromVectors(m_size.x * m_x * 0.5f, m_size.y * m_y * 0.5f, m_size.z * m_z * 0.5f, m_pos);
-    m_matWS = mtx;
-    m_matWSInv = mtx.GetInverted();
-}
-
-
-void CFogVolumeRenderNode::UpdateWorldSpaceBBox()
-{
-    // update bounding box in world space used for culling
-    m_WSBBox.SetTransformedAABB(m_matNodeWS, m_localBounds);
-}
-
-
-void CFogVolumeRenderNode::UpdateHeightFallOffBasePoint()
-{
-    m_heightFallOffBasePoint = m_pos + m_heightFallOffShift;
-}
-
-
-void CFogVolumeRenderNode::SetFogVolumeProperties(const SFogVolumeProperties& properties)
-{
-    m_globalDensityFader.SetInvalid();
-
-    assert(properties.m_size.x > 0 && properties.m_size.y > 0 && properties.m_size.z > 0);
-    if ((m_size - properties.m_size).GetLengthSquared() > 1e-4)
-    {
-        m_size = properties.m_size;
-        m_localBounds.min = Vec3(-0.5f, -0.5f, -0.5f).CompMul(m_size);
-        m_localBounds.max = -m_localBounds.min;
-        UpdateWorldSpaceBBox();
-    }
-
-    m_volumeType = properties.m_volumeType;
-    assert(m_volumeType >= 0 && m_volumeType <= 1);
-    m_color = properties.m_color;
-    assert(properties.m_globalDensity >= 0);
-    m_useGlobalFogColor = properties.m_useGlobalFogColor;
-    m_globalDensity = properties.m_globalDensity;
-    m_densityOffset = properties.m_densityOffset;
-    m_nearCutoff = properties.m_nearCutoff;
-    m_fHDRDynamic = properties.m_fHDRDynamic;
-    assert(properties.m_softEdges >= 0 && properties.m_softEdges <= 1);
-    m_softEdges = properties.m_softEdges;
-
-    // IgnoreVisArea and AffectsThisAreaOnly don't work concurrently.
-    SetRndFlags(ERF_RENDER_ALWAYS, properties.m_ignoresVisAreas && !properties.m_affectsThisAreaOnly);
-
-    m_affectsThisAreaOnly = properties.m_affectsThisAreaOnly;
-
-    float latiArc(DEG2RAD(90.0f - properties.m_heightFallOffDirLati));
-    float longArc(DEG2RAD(properties.m_heightFallOffDirLong));
-    float sinLati(sinf(latiArc));
-    float cosLati(cosf(latiArc));
-    float sinLong(sinf(longArc));
-    float cosLong(cosf(longArc));
-    m_heightFallOffDir = Vec3(sinLati * cosLong, sinLati * sinLong, cosLati);
-    m_heightFallOffShift = m_heightFallOffDir * properties.m_heightFallOffShift;
-    m_heightFallOffDirScaled = m_heightFallOffDir * properties.m_heightFallOffScale;
-    UpdateHeightFallOffBasePoint();
-
-    m_rampParams = Vec3(properties.m_rampStart, properties.m_rampEnd, properties.m_rampInfluence);
-
-    m_windInfluence = properties.m_windInfluence;
-    m_densityNoiseScale = properties.m_densityNoiseScale;
-    m_densityNoiseOffset = properties.m_densityNoiseOffset + 1.0f;
-    m_densityNoiseTimeFrequency = properties.m_densityNoiseTimeFrequency;
-    m_densityNoiseFrequency = properties.m_densityNoiseFrequency * 0.01f;// scale the value to useful range
-}
-
-
-const Matrix34& CFogVolumeRenderNode::GetMatrix() const
-{
-    return m_matNodeWS;
-}
-
-
-void CFogVolumeRenderNode::GetLocalBounds(AABB& bbox)
-{
-    bbox = m_localBounds;
-};
-
-
-void CFogVolumeRenderNode::SetMatrix(const Matrix34& mat)
-{
-    m_matNodeWS = mat;
-
-    // get translation and rotational part of fog volume from entity matrix
-    // scale is specified explicitly as fog volumes can be non-uniformly scaled
-    m_pos = m_matNodeWS.GetTranslation();
-    m_x = m_matNodeWS.GetColumn(0);
-    m_y = m_matNodeWS.GetColumn(1);
-    m_z = m_matNodeWS.GetColumn(2);
-
-    UpdateFogVolumeMatrices();
-    UpdateWorldSpaceBBox();
-    UpdateHeightFallOffBasePoint();
-
-    Get3DEngine()->RegisterEntity(this);
-    ForceTraceableAreaUpdate();
-}
-
-void CFogVolumeRenderNode::SetScale(const Vec3& scale)
-{
-    m_scale = scale;
-}
-
-void CFogVolumeRenderNode::FadeGlobalDensity(float fadeTime, float newGlobalDensity)
-{
-    if (newGlobalDensity >= 0)
-    {
-        if (fadeTime == 0)
-        {
-            m_globalDensity = newGlobalDensity;
-            m_globalDensityFader.SetInvalid();
-        }
-        else if (fadeTime > 0)
-        {
-            float curFrameTime(gEnv->pTimer->GetCurrTime());
-            m_globalDensityFader.Set(curFrameTime, curFrameTime + fadeTime, m_globalDensity, newGlobalDensity);
-        }
-    }
-}
-
-const char* CFogVolumeRenderNode::GetEntityClassName() const
-{
-    return "FogVolume";
-}
-
-
-const char* CFogVolumeRenderNode::GetName() const
-{
-    return "FogVolume";
-}
-
-
-ColorF CFogVolumeRenderNode::GetFogColor() const
-{
-    //FUNCTION_PROFILER_3DENGINE
-    Vec3 fogColor(m_color.r, m_color.g, m_color.b);
-
-    bool bVolFogEnabled = (GetCVars()->e_VolumetricFog != 0);
-    if (bVolFogEnabled)
-    {
-        if (m_useGlobalFogColor)
-        {
-            Get3DEngine()->GetGlobalParameter(E3DPARAM_VOLFOG2_COLOR, fogColor);
-        }
-    }
-    else
-    {
-        if (m_useGlobalFogColor)
-        {
-            fogColor = Get3DEngine()->GetFogColor();
-        }
-
-        bool bHDRModeEnabled = false;
-        GetRenderer()->EF_Query(EFQ_HDRModeEnabled, bHDRModeEnabled);
-        if (bHDRModeEnabled)
-        {
-            const float HDRDynamicMultiplier = 2.0f;
-            fogColor *= powf(HDRDynamicMultiplier, m_fHDRDynamic);
-        }
-    }
-
-    return fogColor;
-}
-
-
-Vec2 CFogVolumeRenderNode::GetSoftEdgeLerp(const Vec3& viewerPosOS) const
-{
-    // Volumetric fog doesn't need special treatment when camera is in the ellipsoid.
-    if (GetCVars()->e_VolumetricFog != 0)
-    {
-        return Vec2(m_softEdges, 1.0f - m_softEdges);
-    }
-
-    //FUNCTION_PROFILER_3DENGINE
-    // ramp down soft edge factor as soon as camera enters the ellipsoid
-    float softEdge(m_softEdges * clamp_tpl((viewerPosOS.GetLength() - 0.95f) * 20.0f, 0.0f, 1.0f));
-    return Vec2(softEdge, 1.0f - softEdge);
-}
-
-
-bool CFogVolumeRenderNode::IsViewerInsideVolume(const SRenderingPassInfo& passInfo) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-
-    // check if fog volumes bounding box intersects the near clipping plane
-    const Plane* pNearPlane(cam.GetFrustumPlane(FR_PLANE_NEAR));
-    Vec3 pntOnNearPlane(cam.GetPosition() - pNearPlane->DistFromPlane(cam.GetPosition()) * pNearPlane->n);
-    Vec3 pntOnNearPlaneOS(m_matWSInv.TransformPoint(pntOnNearPlane));
-
-    Vec3 nearPlaneOS_n(m_matWSInv.TransformVector(pNearPlane->n) /*.GetNormalized()*/);
-    f32 nearPlaneOS_d(-nearPlaneOS_n.Dot(pntOnNearPlaneOS));
-
-    // get extreme lengths
-    float t(fabsf(nearPlaneOS_n.x) + fabsf(nearPlaneOS_n.y) + fabsf(nearPlaneOS_n.z));
-    //float t( 0.0f );
-    //if( nearPlaneOS_n.x >= 0 ) t += -nearPlaneOS_n.x; else t += nearPlaneOS_n.x;
-    //if( nearPlaneOS_n.y >= 0 ) t += -nearPlaneOS_n.y; else t += nearPlaneOS_n.y;
-    //if( nearPlaneOS_n.z >= 0 ) t += -nearPlaneOS_n.z; else t += nearPlaneOS_n.z;
-
-    float t0 = t + nearPlaneOS_d;
-    float t1 = -t + nearPlaneOS_d;
-
-    return t0 * t1 < 0.0f;
-}
-
-
-void CFogVolumeRenderNode::Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // anything to render?
-    if (passInfo.IsRecursivePass())
-    {
-        return;
-    }
-
-    if (!m_pMatFogVolBox || !m_pMatFogVolEllipsoid || GetCVars()->e_Fog == 0 || GetCVars()->e_FogVolumes == 0)
-    {
-        return;
-    }
-
-    const int32 fillThreadID = passInfo.ThreadID();
-
-    if (!m_pFogVolumeRenderElement[fillThreadID])
-    {
-        return;
-    }
-
-    if (m_globalDensityFader.IsValid())
-    {
-        float curFrameTime(gEnv->pTimer->GetCurrTime());
-        m_globalDensity = m_globalDensityFader.GetValue(curFrameTime);
-        if (!m_globalDensityFader.IsTimeInRange(curFrameTime))
-        {
-            m_globalDensityFader.SetInvalid();
-        }
-    }
-
-    // transform camera into fog volumes object space (where fog volume is a unit-sphere at (0,0,0))
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 viewerPosWS(cam.GetPosition());
-    Vec3 viewerPosOS(m_matWSInv * viewerPosWS);
-
-    m_cachedFogColor = GetFogColor();
-    m_cachedSoftEdgesLerp = GetSoftEdgeLerp(viewerPosOS);
-
-    bool bVolFog = (GetCVars()->e_VolumetricFog != 0);
-
-    // reset elapsed time for noise when FogVolume stayed out of viewport for 30 frames.
-    // this prevents the time from being too large number.
-    if ((m_updateFrameID + 30) < passInfo.GetMainFrameID() && m_noiseElapsedTime > 5000.0f)
-    {
-        m_noiseElapsedTime = -5000.0f;
-    }
-
-    if (bVolFog && m_densityNoiseScale > 0.0f && m_updateFrameID != passInfo.GetMainFrameID())
-    {
-        Vec3 wind = Get3DEngine()->GetGlobalWind(false);
-        const float elapsedTime = gEnv->pTimer->GetFrameTime();
-
-        m_windOffset = ((-m_windInfluence * elapsedTime) * wind) + m_windOffset;
-
-        const float windOffsetSpan = 1000.0f;// it should match the constant value in FogVolume.cfx
-        m_windOffset.x = m_windOffset.x - floor(m_windOffset.x / windOffsetSpan) * windOffsetSpan;
-        m_windOffset.y = m_windOffset.y - floor(m_windOffset.y / windOffsetSpan) * windOffsetSpan;
-        m_windOffset.z = m_windOffset.z - floor(m_windOffset.z / windOffsetSpan) * windOffsetSpan;
-
-        m_noiseElapsedTime += m_densityNoiseTimeFrequency * elapsedTime;
-
-        m_updateFrameID = passInfo.GetMainFrameID();
-    }
-
-    float densityOffset = bVolFog ? (m_densityOffset * 0.001f) : m_densityOffset;// scale the value to useful range
-    // set render element attributes
-    m_pFogVolumeRenderElement[fillThreadID]->m_center = m_pos;
-    m_pFogVolumeRenderElement[fillThreadID]->m_viewerInsideVolume = IsViewerInsideVolume(passInfo) ? 1 : 0;
-    m_pFogVolumeRenderElement[fillThreadID]->m_affectsThisAreaOnly = m_affectsThisAreaOnly ? 1 : 0;
-    m_pFogVolumeRenderElement[fillThreadID]->m_stencilRef = rParam.nClipVolumeStencilRef;
-    m_pFogVolumeRenderElement[fillThreadID]->m_volumeType = (m_volumeType != 0) ? 1 : 0;
-    m_pFogVolumeRenderElement[fillThreadID]->m_localAABB = m_localBounds;
-    m_pFogVolumeRenderElement[fillThreadID]->m_matWSInv = m_matWSInv;
-    m_pFogVolumeRenderElement[fillThreadID]->m_fogColor = m_cachedFogColor;
-    m_pFogVolumeRenderElement[fillThreadID]->m_globalDensity = m_globalDensity;
-    m_pFogVolumeRenderElement[fillThreadID]->m_densityOffset = densityOffset;
-    m_pFogVolumeRenderElement[fillThreadID]->m_nearCutoff = m_nearCutoff;
-    m_pFogVolumeRenderElement[fillThreadID]->m_softEdgesLerp = m_cachedSoftEdgesLerp;
-    m_pFogVolumeRenderElement[fillThreadID]->m_heightFallOffDirScaled = m_heightFallOffDirScaled;
-    m_pFogVolumeRenderElement[fillThreadID]->m_heightFallOffBasePoint = m_heightFallOffBasePoint;
-    m_pFogVolumeRenderElement[fillThreadID]->m_eyePosInWS = viewerPosWS;
-    m_pFogVolumeRenderElement[fillThreadID]->m_eyePosInOS = viewerPosOS;
-    m_pFogVolumeRenderElement[fillThreadID]->m_rampParams = m_rampParams;
-    m_pFogVolumeRenderElement[fillThreadID]->m_windOffset = m_windOffset;
-    m_pFogVolumeRenderElement[fillThreadID]->m_noiseScale = m_densityNoiseScale;
-    m_pFogVolumeRenderElement[fillThreadID]->m_noiseFreq = m_densityNoiseFrequency;
-    m_pFogVolumeRenderElement[fillThreadID]->m_noiseOffset = m_densityNoiseOffset;
-    m_pFogVolumeRenderElement[fillThreadID]->m_noiseElapsedTime = m_noiseElapsedTime;
-    m_pFogVolumeRenderElement[fillThreadID]->m_scale = m_scale;
-
-    if (bVolFog && GetCVars()->e_FogVolumesTiledInjection)
-    {
-        // add FogVolume to volumetric fog renderer
-        GetRenderer()->PushFogVolume(m_pFogVolumeRenderElement[fillThreadID], passInfo);
-    }
-    else
-    {
-        IRenderer* pRenderer = GetRenderer();
-        CRenderObject* pRenderObject = pRenderer->EF_GetObject_Temp(fillThreadID);
-
-        if (!pRenderObject)
-        {
-            return;
-        }
-
-        // set basic render object properties
-        pRenderObject->m_II.m_Matrix = m_matNodeWS;
-        pRenderObject->m_fSort = 0;
-
-        int nAfterWater = GetObjManager()->IsAfterWater(m_pos, passInfo) ? 1 : 0;
-
-        // TODO: add constant factor to sortID to make fog volumes render before all other alpha transparent geometry (or have separate render list?)
-        pRenderObject->m_fSort = WATER_LEVEL_SORTID_OFFSET * 0.5f;
-
-        // get shader item
-        SShaderItem& shaderItem(0 != rParam.pMaterial ? rParam.pMaterial->GetShaderItem(0) :
-            1 == m_volumeType ? m_pMatFogVolBox->GetShaderItem(0) : m_pMatFogVolEllipsoid->GetShaderItem(0));
-
-        // get target render list
-        int nList = bVolFog ? EFSLIST_FOG_VOLUME : EFSLIST_TRANSP;
-
-        // add to renderer
-        GetRenderer()->EF_AddEf(m_pFogVolumeRenderElement[fillThreadID], shaderItem, pRenderObject, passInfo, nList, nAfterWater, SRendItemSorter(rParam.rendItemSorter));
-    }
-}
-
-
-void CFogVolumeRenderNode::SetMaterial(_smart_ptr<IMaterial> pMat)
-{
-}
-
-
-void CFogVolumeRenderNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "FogVolumeNode");
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-void CFogVolumeRenderNode::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_pos += delta;
-    m_matNodeWS.SetTranslation(m_matNodeWS.GetTranslation() + delta);
-    m_matWS.SetTranslation(m_matWS.GetTranslation() + delta);
-    m_matWSInv = m_matWS.GetInverted();
-    m_heightFallOffBasePoint += delta;
-    m_WSBBox.Move(delta);
-}
diff --git a/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode.h b/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode.h
deleted file mode 100644
index ef647c5368..0000000000
--- a/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_FOGVOLUMERENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_FOGVOLUMERENDERNODE_H
-#pragma once
-
-
-class CREFogVolume;
-
-
-class CFogVolumeRenderNode
-    : public IFogVolumeRenderNode
-    , public Cry3DEngineBase
-{
-public:
-    static void StaticReset();
-
-    static void SetTraceableArea(const AABB& traceableArea, const SRenderingPassInfo& passInfo);
-    static void TraceFogVolumes(const Vec3& vPos, const AABB& objBBox, SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo, bool fogVolumeShadingQuality);
-    static bool OverlapProjectedAABB(const AABB& objBBox0, const AABB& objBBox1, const CCamera& camera);
-public:
-    CFogVolumeRenderNode();
-
-    // implements IFogVolumeRenderNode
-    virtual void SetFogVolumeProperties(const SFogVolumeProperties& properties);
-    virtual const Matrix34& GetMatrix() const;
-
-    virtual void FadeGlobalDensity(float fadeTime, float newGlobalDensity);
-
-    // implements IRenderNode
-    virtual void GetLocalBounds(AABB& bbox);
-    virtual void SetMatrix(const Matrix34& mat);
-    virtual void SetScale(const Vec3& scale);
-
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName() const;
-    virtual const char* GetName() const;
-    virtual Vec3 GetPos(bool bWorldOnly = true) const;
-    virtual void Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo);
-    void SetMaterial(_smart_ptr<IMaterial> pMat) override;
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return NULL; }
-    virtual float GetMaxViewDist();
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual const AABB GetBBox() const { return m_WSBBox; }
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-    float GetGlobalDensity() const  { return  m_globalDensity; }
-    float GetDensityoffset() const { return  m_densityOffset; }
-    Vec3 GetHeightFallOffBasePoint() const { return  m_heightFallOffBasePoint; }
-    Vec3 GetHeightFallOffDirScaled() const { return  m_heightFallOffDirScaled; }
-
-
-    ILINE bool IsAffectsThisAreaOnly() const { return m_affectsThisAreaOnly; }
-    int GetVolumeType() const  { return m_volumeType; }
-private:
-    static void RegisterFogVolume(const CFogVolumeRenderNode* pFogVolume);
-    static void UnregisterFogVolume(const CFogVolumeRenderNode* pFogVolume);
-
-private:
-    ~CFogVolumeRenderNode();
-
-    void UpdateFogVolumeMatrices();
-    void UpdateWorldSpaceBBox();
-    void UpdateHeightFallOffBasePoint();
-    ColorF GetFogColor() const;
-    Vec2 GetSoftEdgeLerp(const Vec3& viewerPosOS) const;
-    bool IsViewerInsideVolume(const SRenderingPassInfo& passInfo) const;
-
-    void GetVolumetricFogColorEllipsoid(const Vec3& worldPos, const SRenderingPassInfo& passInfo, ColorF& resultColor) const;
-    void GetVolumetricFogColorBox(const Vec3& worldPos, const SRenderingPassInfo& passInfo, ColorF& resultColor) const;
-
-    static void ForceTraceableAreaUpdate();
-
-private:
-    struct SCachedFogVolume
-    {
-        SCachedFogVolume()
-            : m_pFogVol(0)
-            , m_distToCenterSq(0) {}
-
-        SCachedFogVolume(const CFogVolumeRenderNode* pFogVol, float distToCenterSq)
-            : m_pFogVol(pFogVol)
-            , m_distToCenterSq(distToCenterSq)
-        {
-        }
-
-        bool operator < (const SCachedFogVolume& rhs) const
-        {
-            return m_distToCenterSq > rhs.m_distToCenterSq;
-        }
-
-        const CFogVolumeRenderNode* m_pFogVol;
-        float m_distToCenterSq;
-    };
-
-    typedef std::vector< SCachedFogVolume > CachedFogVolumes;
-    typedef std::set< const CFogVolumeRenderNode* > GlobalFogVolumeMap;
-
-    static AABB s_tracableFogVolumeArea;
-    static StaticInstance<CachedFogVolumes> s_cachedFogVolumes;
-    static StaticInstance<GlobalFogVolumeMap> s_globalFogVolumeMap;
-    static bool s_forceTraceableAreaUpdate;
-
-    struct SFader
-    {
-        SFader()
-            : m_startTime(0)
-            , m_endTime(0)
-            , m_startValue(0)
-            , m_endValue(0)
-        {
-        }
-
-        void Set(float startTime, float endTime, float startValue, float endValue)
-        {
-            m_startTime = startTime;
-            m_endTime = endTime;
-            m_startValue = startValue;
-            m_endValue = endValue;
-        }
-
-        void SetInvalid()
-        {
-            Set(0, 0, 0, 0);
-        }
-
-        bool IsValid()
-        {
-            return m_startTime >= 0 && m_endTime > m_startTime && m_startValue != m_endValue;
-        }
-
-        bool IsTimeInRange(float time)
-        {
-            return time >= m_startTime && time <= m_endTime;
-        }
-
-        float GetValue(float time)
-        {
-            float t = clamp_tpl((time - m_startTime) / (m_endTime - m_startTime), 0.0f, 1.0f);
-            return m_startValue + t * (m_endValue - m_startValue);
-        }
-
-    private:
-        float m_startTime;
-        float m_endTime;
-        float m_startValue;
-        float m_endValue;
-    };
-
-private:
-    Matrix34 m_matNodeWS;
-
-    Matrix34 m_matWS;
-    Matrix34 m_matWSInv;
-
-    int m_volumeType;
-    Vec3 m_pos;
-    Vec3 m_x;
-    Vec3 m_y;
-    Vec3 m_z;
-    // size of fog set by SFogVolumeProperties
-    Vec3 m_size;
-    // scale on entity
-    Vec3 m_scale;
-
-    float m_globalDensity;
-    float m_densityOffset;
-    float m_nearCutoff;
-    float m_fHDRDynamic;
-    float m_softEdges;
-    ColorF m_color;
-    bool m_useGlobalFogColor;
-    bool m_affectsThisAreaOnly;
-    Vec3 m_rampParams;
-    uint32 m_updateFrameID;
-    float m_windInfluence;
-    Vec3 m_windOffset;
-    float m_noiseElapsedTime;
-    float m_densityNoiseScale;
-    float m_densityNoiseOffset;
-    float m_densityNoiseTimeFrequency;
-    Vec3 m_densityNoiseFrequency;
-
-    Vec3 m_heightFallOffDir;
-    Vec3 m_heightFallOffDirScaled;
-    Vec3 m_heightFallOffShift;
-    Vec3 m_heightFallOffBasePoint;
-
-    AABB m_localBounds;
-
-    SFader m_globalDensityFader;
-
-    _smart_ptr< IMaterial > m_pMatFogVolEllipsoid;
-    _smart_ptr< IMaterial > m_pMatFogVolBox;
-
-    CREFogVolume* m_pFogVolumeRenderElement[RT_COMMAND_BUF_COUNT];
-    AABB m_WSBBox;
-
-    Vec2 m_cachedSoftEdgesLerp;
-    ColorF m_cachedFogColor;
-};
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_FOGVOLUMERENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode_Jobs.cpp b/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode_Jobs.cpp
deleted file mode 100644
index 7f6b359d78..0000000000
--- a/Code/CryEngine/Cry3DEngine/FogVolumeRenderNode_Jobs.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "FogVolumeRenderNode.h"
-#include "VisAreas.h"
-#include "CREFogVolume.h"
-#include "Cry_Geo.h"
-#include "ObjMan.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
-inline static float expf_s(float arg)
-{
-    return expf(clamp_tpl(arg, -80.0f, 80.0f));
-}
-
-AABB UnprojectAABB2D(const AABB& aabb, const CCamera& camera)
-{
-    Vec3 results[4];
-    camera.Unproject(Vec3(aabb.min.x, aabb.min.y, 1), results[0]);
-    camera.Unproject(Vec3(aabb.max.x, aabb.min.y, 1), results[1]);
-    camera.Unproject(Vec3(aabb.max.x, aabb.max.y, 1), results[2]);
-    camera.Unproject(Vec3(aabb.min.x, aabb.max.y, 1), results[3]);
-
-    AABB newAABB(AABB::RESET);
-    newAABB.Add(results[0]);
-    newAABB.Add(results[1]);
-    newAABB.Add(results[2]);
-    newAABB.Add(results[3]);
-    return newAABB;
-}
-
-AABB GetProjectedQuadFromAABB(const AABB& aabb, const CCamera& camera)
-{
-    // Get all 8 points of the AABB
-    
-    Vec3 aabbPoints[] = 
-    {
-         Vec3(aabb.max.x, aabb.max.y, aabb.max.z),
-         Vec3(aabb.max.x, aabb.min.y, aabb.max.z),
-         Vec3(aabb.min.x, aabb.min.y, aabb.max.z),
-         Vec3(aabb.min.x, aabb.max.y, aabb.max.z),
-         Vec3(aabb.max.x, aabb.max.y, aabb.min.z),
-         Vec3(aabb.max.x, aabb.min.y, aabb.min.z),
-         Vec3(aabb.min.x, aabb.min.y, aabb.min.z),
-         Vec3(aabb.min.x, aabb.max.y, aabb.min.z),
-    };
-    const int numAABBPoints = AZ_ARRAY_SIZE(aabbPoints);
-    
-    AZ_Assert(numAABBPoints==8,"you should have 8 points in the aabb");
-
-    // Project each AABB point and construct another AABB.
-    AABB quadResult(AABB::RESET);
-    for (int i = 0; i < numAABBPoints; ++i)
-    {
-        Vec3 projectedPoint;
-        camera.Project(aabbPoints[i], projectedPoint);
-        quadResult.Add(projectedPoint);
-    }
-    return quadResult;
-}
-
-
-// To know if aabb are aligned with camera, we test if projected quads overlap.
-bool CFogVolumeRenderNode::OverlapProjectedAABB(const AABB& aabb0, const AABB& aabb1, const CCamera& camera)
-{
-    // quads are AABB2D.
-    AABB quad0 = GetProjectedQuadFromAABB(aabb0, camera);
-    AABB quad1 = GetProjectedQuadFromAABB(aabb1, camera);
-    bool bOverlap = Overlap::AABB_AABB2D(quad0, quad1);
-    return bOverlap;
-}
-
-void AverageFogVolume(SFogVolumeData& fogVolData, const CFogVolumeRenderNode* pFogVol)
-{
-    AABB& avgAABBoxOut = fogVolData.avgAABBox;
-    avgAABBoxOut.Add(pFogVol->GetBBox());
-
-    // ratio is used to approximate fog volumes contribution depending of the importance of their size.
-    float ratio = pFogVol->GetBBox().GetRadius() / avgAABBoxOut.GetRadius();
-    fogVolData.m_heightFallOffBasePoint = Lerp(fogVolData.m_heightFallOffBasePoint,pFogVol->GetHeightFallOffBasePoint(), ratio);
-    fogVolData.m_heightFallOffDirScaled = Lerp(fogVolData.m_heightFallOffDirScaled,pFogVol->GetHeightFallOffDirScaled(), ratio);
-    fogVolData.m_densityOffset = Lerp(fogVolData.m_densityOffset, pFogVol->GetDensityoffset(), ratio);
-    fogVolData.m_globalDensity = Lerp(fogVolData.m_globalDensity, pFogVol->GetGlobalDensity(), ratio);
-    fogVolData.m_volumeType |= pFogVol->GetVolumeType();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// TraceFogVolumes :
-// if object intersects/is aligned with fog volumes then register these fog volumes, 
-// check if object is in front of the fog volume and compute average color.
-// if highVertexShadingQuality average fog volume box.
-///////////////////////////////////////////////////////////////////////////////
-void CFogVolumeRenderNode::TraceFogVolumes(const Vec3& objPosition, const AABB& objAABB, SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo, bool fogVolumeShadingQuality)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    PrefetchLine(&s_tracableFogVolumeArea, 0);
-
-    // init default result
-    ColorF localFogColor = ColorF(0.0f, 0.0f, 0.0f, 0.0f);
-
-    // We will "accumulate" fog volumes contribution the same way that fog color.
-   
-    // trace is needed when volumetric fog is off.
-    if (GetCVars()->e_Fog && GetCVars()->e_FogVolumes && (GetCVars()->e_VolumetricFog == 0))
-    {
-        const Vec3 worldPos = objPosition;
-
-        // init view ray
-        Vec3 camPos(s_tracableFogVolumeArea.GetCenter());
-        Lineseg lineseg(camPos, objPosition);
-
-#ifdef _DEBUG
-        const SCachedFogVolume* prev(0);
-#endif
-        
-        // loop over all traceable fog volumes
-        CachedFogVolumes::const_iterator itEnd(s_cachedFogVolumes.end());
-        for (CachedFogVolumes::const_iterator it(s_cachedFogVolumes.begin()); it != itEnd; ++it)
-        {
-            // get current fog volume
-            const CFogVolumeRenderNode* pFogVol((*it).m_pFogVol);
-           
-            bool isAligned = false;
-            bool isFrontOfBoxCenter = false;
-            // only trace visible fog volumes
-            if (!(pFogVol->GetRndFlags() & ERF_HIDDEN))
-            {
-                bool projectedAABBIntersect = false;
-                bool isInside = Overlap::Point_AABB(objPosition, pFogVol->m_WSBBox);
-
-                if (fogVolumeShadingQuality)
-                {
-                    projectedAABBIntersect = OverlapProjectedAABB(pFogVol->m_WSBBox, objAABB, passInfo.GetCamera());
-                    isInside = isInside || Overlap::AABB_AABB(objAABB, pFogVol->m_WSBBox);
-                }
-           
-                // check if view ray intersects with bounding box of current fog volume
-                isAligned = Overlap::Lineseg_AABB(lineseg, pFogVol->m_WSBBox);
-                if (projectedAABBIntersect || isAligned)
-                {
-                    // compute contribution of current fog volume
-                    ColorF color(0,0,0);
-                 
-                    // Get distance camera to fog volume.
-                    const CCamera& cam(passInfo.GetCamera());
-                    Vec3 cameraToObject(objPosition - cam.GetPosition());
-                    Vec3 cameraToFogVolume(pFogVol->m_WSBBox.GetCenter() - cam.GetPosition());
-                    isFrontOfBoxCenter = (cameraToFogVolume.GetLengthSquared() > cameraToObject.GetLengthSquared());
-                    // if particle is in front of the box center and not inside the box, then do not accumulate fog color.
-                    if (isFrontOfBoxCenter && !isInside)
-                    {
-                        continue;
-                    }
-
-                    if (fogVolumeShadingQuality)
-                    {
-                        // Accumulate this fogVolData
-                        AverageFogVolume(fogVolData, pFogVol);
-                        color = pFogVol->GetFogColor();
-                    }
-                    else
-                    {
-                        if (0 == pFogVol->m_volumeType)
-                        {
-                            pFogVol->GetVolumetricFogColorEllipsoid(worldPos, passInfo, color);
-                        }
-                        else
-                        {
-                            pFogVol->GetVolumetricFogColorBox(worldPos, passInfo, color);
-                        }
-
-                        color.a = 1.0f - color.a;       // 0 = transparent, 1 = opaque
-                    }
-                    
-                    
-                 
-                    // blend fog colors
-                    localFogColor.r = Lerp(localFogColor.r, color.r, color.a);
-                    localFogColor.g = Lerp(localFogColor.g, color.g, color.a);
-                    localFogColor.b = Lerp(localFogColor.b, color.b, color.a);
-                    localFogColor.a = Lerp(localFogColor.a, 1.0f, color.a);
-            
-                }
-        
-            }
-
-#ifdef _DEBUG
-            if (prev)
-            {
-                assert(prev->m_distToCenterSq >= (*it).m_distToCenterSq);
-                prev = &(*it);
-            }
-#endif
-        }
-
-        const float fDivisor        = (float)fsel(-localFogColor.a, 1.0f, localFogColor.a);
-        const float fMultiplier = (float)fsel(-localFogColor.a, 0.0f, 1.0f / fDivisor);
-
-        localFogColor.r *= fMultiplier;
-        localFogColor.g *= fMultiplier;
-        localFogColor.b *= fMultiplier;
-    }
-
-    localFogColor.a = 1.0f - localFogColor.a;
-    fogVolData.fogColor = localFogColor;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CFogVolumeRenderNode::GetVolumetricFogColorEllipsoid(const Vec3& worldPos, const SRenderingPassInfo& passInfo, ColorF& resultColor) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 camPos(cam.GetPosition());
-    Vec3 camDir(cam.GetViewdir());
-    Vec3 cameraLookDir(worldPos - camPos);
-
-    resultColor = ColorF(1.0f, 1.0f, 1.0f, 1.0f);
-
-    if (cameraLookDir.GetLengthSquared() > 1e-4f)
-    {
-        // setup ray tracing in OS
-        Vec3 cameraPosInOSx2(m_matWSInv.TransformPoint(camPos) * 2.0f);
-        Vec3 cameraLookDirInOS(m_matWSInv.TransformVector(cameraLookDir));
-
-        float tI(sqrtf(cameraLookDirInOS.Dot(cameraLookDirInOS)));
-        float invOfScaledCamDirLength(1.0f / tI);
-        cameraLookDirInOS *= invOfScaledCamDirLength;
-
-        // calc coefficients for ellipsoid parametrization (just a simple unit-sphere in its own space)
-        float B(cameraPosInOSx2.Dot(cameraLookDirInOS));
-        float Bsq(B * B);
-        float C(cameraPosInOSx2.Dot(cameraPosInOSx2) - 4.0f);
-
-        // solve quadratic equation
-        float discr(Bsq - C);
-        if (discr >= 0.0)
-        {
-            float discrSqrt = sqrtf(discr);
-
-            // ray hit
-            Vec3 cameraPosInWS(camPos);
-            Vec3 cameraLookDirInWS((worldPos - camPos) * invOfScaledCamDirLength);
-
-            //////////////////////////////////////////////////////////////////////////
-
-            float tS(max(0.5f * (-B - discrSqrt), 0.0f));       // clamp to zero so front ray-ellipsoid intersection is NOT behind camera
-            float tE(max(0.5f * (-B + discrSqrt), 0.0f));       // clamp to zero so back ray-ellipsoid intersection is NOT behind camera
-            //float tI( ( worldPos - camPos ).Dot( camDir ) / cameraLookDirInWS.Dot( camDir ) );
-            tI = max(tS, min(tI, tE));     // clamp to range [tS, tE]
-
-            Vec3 front(tS * cameraLookDirInWS + cameraPosInWS);
-            Vec3 dist((tI - tS) * cameraLookDirInWS);
-            float distLength(dist.GetLength());
-            float fogInt(distLength * expf_s(-(front - m_heightFallOffBasePoint).Dot(m_heightFallOffDirScaled)));
-
-            //////////////////////////////////////////////////////////////////////////
-
-            float heightDiff(dist.Dot(m_heightFallOffDirScaled));
-            if (fabsf(heightDiff) > 0.001f)
-            {
-                fogInt *= (1.0f - expf_s(-heightDiff)) / heightDiff;
-            }
-
-            float softArg(clamp_tpl(discr * m_cachedSoftEdgesLerp.x + m_cachedSoftEdgesLerp.y, 0.0f, 1.0f));
-            fogInt *= softArg * (2.0f - softArg);
-
-            float fog(expf_s(-m_globalDensity * fogInt));
-
-            resultColor = ColorF(m_cachedFogColor.r, m_cachedFogColor.g, m_cachedFogColor.b, min(fog, 1.0f));
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CFogVolumeRenderNode::GetVolumetricFogColorBox(const Vec3& worldPos, const SRenderingPassInfo& passInfo, ColorF& resultColor) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 camPos(cam.GetPosition());
-    Vec3 cameraLookDir(worldPos - camPos);
-
-    resultColor = ColorF(1.0f, 1.0f, 1.0f, 1.0f);
-
-    if (cameraLookDir.GetLengthSquared() > 1e-4f)
-    {
-        // setup ray tracing in OS
-        Vec3 cameraPosInOS(m_matWSInv.TransformPoint(camPos));
-        Vec3 cameraLookDirInOS(m_matWSInv.TransformVector(cameraLookDir));
-
-        float tI(sqrtf(cameraLookDirInOS.Dot(cameraLookDirInOS)));
-        float invOfScaledCamDirLength(1.0f / tI);
-        cameraLookDirInOS *= invOfScaledCamDirLength;
-
-        const float fMax = std::numeric_limits<float>::max();
-        float tS(0), tE(fMax);
-
-        //TODO:
-        //  May be worth profiling use of a loop here, iterating over elements of vector;
-        //  might save on i-cache, but suspect we'll lose instruction interleaving and hit
-        //  more register dependency issues.
-
-        //These fsels mean that the result is ignored if cameraLookDirInOS.x is 0.0f,
-        //  avoiding a floating point compare. Avoiding the fcmp is ~15% faster
-        const float fXSelect        = -fabsf(cameraLookDirInOS.x);
-        const float fXDivisor       = (float)fsel(fXSelect, 1.0f, cameraLookDirInOS.x);
-        const float fXMultiplier = (float)fsel(fXSelect, 0.0f, 1.0f);
-        const float fXInvMultiplier = 1.0f - fXMultiplier;
-
-        //Accurate to 255/256ths on console
-        float invCameraDirInOSx = fres(fXDivisor); //(1.0f / fXDivisor);
-
-        float tPosPlane((1 - cameraPosInOS.x) * invCameraDirInOSx);
-        float tNegPlane((-1 - cameraPosInOS.x) * invCameraDirInOSx);
-
-        float tFrontFace    = (float)fsel(-cameraLookDirInOS.x, tPosPlane, tNegPlane);
-        float tBackFace     = (float)fsel(-cameraLookDirInOS.x, tNegPlane, tPosPlane);
-
-        tS = max(tS, tFrontFace * fXMultiplier);
-        tE = min(tE, (tBackFace * fXMultiplier) + (fXInvMultiplier * fMax));
-
-
-
-        const float fYSelect        = -fabsf(cameraLookDirInOS.y);
-        const float fYDivisor       = (float)fsel(fYSelect, 1.0f, cameraLookDirInOS.y);
-        const float fYMultiplier = (float)fsel(fYSelect, 0.0f, 1.0f);
-        const float fYInvMultiplier = 1.0f - fYMultiplier;
-
-        //Accurate to 255/256ths on console
-        float invCameraDirInOSy = fres(fYDivisor); //(1.0f / fYDivisor);
-
-        tPosPlane = ((1 - cameraPosInOS.y) * invCameraDirInOSy);
-        tNegPlane = ((-1 - cameraPosInOS.y) * invCameraDirInOSy);
-
-        tFrontFace  = (float)fsel(-cameraLookDirInOS.y, tPosPlane, tNegPlane);
-        tBackFace       = (float)fsel(-cameraLookDirInOS.y, tNegPlane, tPosPlane);
-
-        tS = max(tS, tFrontFace * fYMultiplier);
-        tE = min(tE, (tBackFace * fYMultiplier) + (fYInvMultiplier * fMax));
-
-
-
-        const float fZSelect        = -fabsf(cameraLookDirInOS.z);
-        const float fZDivisor       = (float)fsel(fZSelect, 1.0f, cameraLookDirInOS.z);
-        const float fZMultiplier = (float)fsel(fZSelect, 0.0f, 1.0f);
-        const float fZInvMultiplier = 1.0f - fZMultiplier;
-
-        //Accurate to 255/256ths on console
-        float invCameraDirInOSz = fres(fZDivisor); //(1.0f / fZDivisor);
-
-        tPosPlane = ((1 - cameraPosInOS.z) * invCameraDirInOSz);
-        tNegPlane = ((-1 - cameraPosInOS.z) * invCameraDirInOSz);
-
-        tFrontFace  = (float)fsel(-cameraLookDirInOS.z, tPosPlane, tNegPlane);
-        tBackFace       = (float)fsel(-cameraLookDirInOS.z, tNegPlane, tPosPlane);
-
-        tS = max(tS, tFrontFace * fZMultiplier);
-        tE = min(tE, (tBackFace * fZMultiplier) + (fZInvMultiplier * fMax));
-
-        tE = max(tE, 0.0f);
-
-        if (tS <= tE)
-        {
-            Vec3 cameraPosInWS(camPos);
-            Vec3 cameraLookDirInWS((worldPos - camPos) * invOfScaledCamDirLength);
-
-            //////////////////////////////////////////////////////////////////////////
-
-            tI = max(tS, min(tI, tE));     // clamp to range [tS, tE]
-
-            Vec3 front(tS * cameraLookDirInWS + cameraPosInWS);
-            Vec3 dist((tI - tS) * cameraLookDirInWS);
-            float distLength(dist.GetLength());
-            float fogInt(distLength * expf_s(-(front - m_heightFallOffBasePoint).Dot(m_heightFallOffDirScaled)));
-
-            //////////////////////////////////////////////////////////////////////////
-
-            float heightDiff(dist.Dot(m_heightFallOffDirScaled));
-
-            //heightDiff = fabsf( heightDiff ) > 0.001f ? heightDiff : 0.001f
-            heightDiff = (float)fsel((-fabsf(heightDiff) + 0.001f), 0.001f, heightDiff);
-
-            fogInt *= (1.0f - expf_s(-heightDiff)) * fres(heightDiff);
-
-            float fog(expf_s(-m_globalDensity * fogInt));
-
-            resultColor = ColorF(m_cachedFogColor.r, m_cachedFogColor.g, m_cachedFogColor.b, min(fog, 1.0f));
-        }
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/GeomCache.cpp b/Code/CryEngine/Cry3DEngine/GeomCache.cpp
deleted file mode 100644
index a2726c8a86..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCache.cpp
+++ /dev/null
@@ -1,1098 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Manages geometry cache data
-
-#include "Cry3DEngine_precompiled.h"
-
-#if defined(USE_GEOM_CACHES)
-
-#include <CryPath.h>
-#include "GeomCache.h"
-#include "GeomCacheManager.h"
-#include "GeomCacheDecoder.h"
-#include "StringUtils.h"
-#include "MatMan.h"
-
-#include <CryPhysicsDeprecation.h>
-
-CGeomCache::CGeomCache(const char* pFileName)
-    : m_bValid(false)
-    , m_bLoaded(false)
-    , m_refCount(0)
-    , m_fileName(pFileName)
-    , m_lastDrawMainFrameId(0)
-    , m_bPlaybackFromMemory(false)
-    , m_numFrames(0)
-    , m_compressedAnimationDataSize(0)
-    , m_totalUncompressedAnimationSize(0)
-    , m_numStreams(0)
-    , m_staticMeshDataOffset(0)
-    , m_aabb(0.0f)
-{
-    m_bUseStreaming = GetCVars()->e_StreamCgf > 0;
-    m_staticDataHeader.m_compressedSize = 0;
-    m_staticDataHeader.m_uncompressedSize = 0;
-
-    string materialPath = PathUtil::ReplaceExtension(m_fileName, "mtl");
-    m_pMaterial = GetMatMan()->LoadMaterial(materialPath);
-
-    if (!LoadGeomCache())
-    {
-        FileWarning(0, m_fileName.c_str(), "Failed to load geometry cache: %s", m_lastError.c_str());
-        stl::free_container(m_lastError);
-    }
-}
-
-CGeomCache::~CGeomCache()
-{
-    Shutdown();
-}
-
-int CGeomCache::AddRef()
-{
-    ++m_refCount;
-    return m_refCount;
-}
-
-int CGeomCache::Release()
-{
-    assert(m_refCount >= 0);
-
-    --m_refCount;
-    int refCount = m_refCount;
-    if (m_refCount <= 0)
-    {
-        GetGeomCacheManager()->DeleteGeomCache(this);
-    }
-
-    return refCount;
-}
-
-void CGeomCache::SetMaterial(_smart_ptr<IMaterial> pMaterial)
-{
-    m_pMaterial = pMaterial;
-}
-
-_smart_ptr<IMaterial> CGeomCache::GetMaterial()
-{
-    return m_pMaterial;
-}
-
-const _smart_ptr<IMaterial> CGeomCache::GetMaterial() const
-{
-    return m_pMaterial;
-}
-
-const char* CGeomCache::GetFilePath() const
-{
-    return m_fileName;
-}
-
-bool CGeomCache::LoadGeomCache()
-{
-    using namespace GeomCacheFile;
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    CRY_DEFINE_ASSET_SCOPE("GeomCache", m_fileName);
-
-    AZ::IO::ScopedFileHandle geomCacheFileHandle(*gEnv->pCryPak, m_fileName.c_str(), "rb");
-    if (!geomCacheFileHandle.IsValid())
-    {
-        return false;
-    }
-
-    size_t bytesRead = 0;
-
-    // Read header and check signature
-    SHeader header;
-    bytesRead = gEnv->pCryPak->FReadRaw((void*)&header, 1, sizeof(SHeader), geomCacheFileHandle);
-    if (bytesRead != sizeof(SHeader))
-    {
-        m_lastError = "Could not read header";
-        return false;
-    }
-
-    if (header.m_signature != kFileSignature)
-    {
-        m_lastError = "Bad file signature";
-        return false;
-    }
-
-    if (header.m_version != kCurrentVersion)
-    {
-        m_lastError = "Bad file version";
-        return false;
-    }
-
-    const bool bFileHas32BitIndexFormat = (header.m_flags & eFileHeaderFlags_32BitIndices) != 0;
-    if (((sizeof(vtx_idx) == sizeof(uint16)) && bFileHas32BitIndexFormat) || ((sizeof(vtx_idx) == sizeof(uint32)) && !bFileHas32BitIndexFormat))
-    {
-        m_lastError = "Index format mismatch";
-        return false;
-    }
-
-    if (header.m_blockCompressionFormat != eBlockCompressionFormat_None &&
-        header.m_blockCompressionFormat != eBlockCompressionFormat_Deflate &&
-        header.m_blockCompressionFormat != eBlockCompressionFormat_LZ4HC &&
-        header.m_blockCompressionFormat != eBlockCompressionFormat_ZSTD)
-        {
-            m_lastError = "Bad block compression format";
-            return false;
-        }
-
-    m_bPlaybackFromMemory = (header.m_flags & GeomCacheFile::eFileHeaderFlags_PlaybackFromMemory) != 0;
-    m_blockCompressionFormat = static_cast<EBlockCompressionFormat>(header.m_blockCompressionFormat);
-    m_totalUncompressedAnimationSize = header.m_totalUncompressedAnimationSize;
-    m_numFrames = header.m_numFrames;
-    m_aabb.min = Vec3(header.m_aabbMin[0], header.m_aabbMin[1], header.m_aabbMin[2]);
-    m_aabb.max = Vec3(header.m_aabbMax[0], header.m_aabbMax[1], header.m_aabbMax[2]);
-
-    // Read frame times and frame offsets.
-    if (!ReadFrameInfos(geomCacheFileHandle, header.m_numFrames))
-    {
-        return false;
-    }
-
-    const int maxPlaybackFromMemorySize = std::max(0, GetCVars()->e_GeomCacheMaxPlaybackFromMemorySize);
-    if (m_bPlaybackFromMemory && m_compressedAnimationDataSize > uint(maxPlaybackFromMemorySize * 1024 * 1024))
-    {
-        GetLog()->LogWarning("Animated data size of geometry cache '%s' is over memory playback limit "
-            "of %d MiB. Reverting to stream playback.", m_fileName.c_str(), maxPlaybackFromMemorySize);
-        m_bPlaybackFromMemory = false;
-    }
-
-    // Load static node data and physics geometries
-    {
-        std::vector<char> compressedData;
-        std::vector<char> decompressedData;
-
-        if (!ReadStaticBlock(geomCacheFileHandle, (EBlockCompressionFormat)(header.m_blockCompressionFormat), compressedData)
-            || !DecompressStaticBlock((EBlockCompressionFormat)(header.m_blockCompressionFormat), &compressedData[0], decompressedData))
-        {
-            if (m_lastError.empty())
-            {
-                m_lastError = "Could not read or decompress static block";
-            }
-
-            return false;
-        }
-
-        CGeomCacheStreamReader reader(&decompressedData[0], decompressedData.size());
-        if (!ReadNodesStaticDataRec(reader))
-        {
-            if (m_lastError.empty())
-            {
-                m_lastError = "Could not read node static data";
-            }
-
-            return false;
-        }
-    }
-
-    m_staticMeshDataOffset = gEnv->pCryPak->FTell(geomCacheFileHandle);
-
-    if (!m_bUseStreaming)
-    {
-        std::vector<char> compressedData;
-        std::vector<char> decompressedData;
-
-        if (!ReadStaticBlock(geomCacheFileHandle, (EBlockCompressionFormat)(header.m_blockCompressionFormat), compressedData)
-            || !DecompressStaticBlock((EBlockCompressionFormat)(header.m_blockCompressionFormat), &compressedData[0], decompressedData))
-        {
-            if (m_lastError.empty())
-            {
-                m_lastError = "Could not read or decompress static block";
-            }
-
-            return false;
-        }
-
-        CGeomCacheStreamReader reader(&decompressedData[0], decompressedData.size());
-        if (!ReadMeshesStaticData(reader, m_fileName.c_str()))
-        {
-            if (m_lastError.empty())
-            {
-                m_lastError = "Could not read mesh static data";
-            }
-
-            return false;
-        }
-
-        if (m_bPlaybackFromMemory && m_frameInfos.size() > 0)
-        {
-            std::vector<char> animationData;
-            animationData.resize(static_cast<size_t>(m_compressedAnimationDataSize));
-            bytesRead = gEnv->pCryPak->FReadRaw((void*)&animationData[0], 1, static_cast<uint>(m_compressedAnimationDataSize), geomCacheFileHandle);
-
-            if (!LoadAnimatedData(&animationData[0], 0))
-            {
-                return false;
-            }
-        }
-
-        m_bLoaded = true;
-    }
-    else
-    {
-        bytesRead = gEnv->pCryPak->FReadRaw((void*)&m_staticDataHeader, 1, sizeof(GeomCacheFile::SCompressedBlockHeader), geomCacheFileHandle);
-        if (bytesRead != sizeof(GeomCacheFile::SCompressedBlockHeader))
-        {
-            m_lastError = "Bad data";
-            return false;
-        }
-    }
-
-    m_bValid = true;
-    return true;
-}
-
-bool CGeomCache::ReadStaticBlock(AZ::IO::HandleType fileHandle, [[maybe_unused]] GeomCacheFile::EBlockCompressionFormat compressionFormat, std::vector<char>& compressedData)
-{
-    compressedData.resize(sizeof(GeomCacheFile::SCompressedBlockHeader));
-
-    size_t bytesRead = 0;
-    bytesRead = gEnv->pCryPak->FReadRaw((void*)&compressedData[0], 1, sizeof(GeomCacheFile::SCompressedBlockHeader), fileHandle);
-    if (bytesRead != sizeof(GeomCacheFile::SCompressedBlockHeader))
-    {
-        return false;
-    }
-
-    m_staticDataHeader = *reinterpret_cast<GeomCacheFile::SCompressedBlockHeader*>(&compressedData[0]);
-    compressedData.resize(sizeof(GeomCacheFile::SCompressedBlockHeader) + m_staticDataHeader.m_compressedSize);
-
-    bytesRead = gEnv->pCryPak->FReadRaw(&compressedData[sizeof(GeomCacheFile::SCompressedBlockHeader)], 1, m_staticDataHeader.m_compressedSize, fileHandle);
-    if (bytesRead != m_staticDataHeader.m_compressedSize)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool CGeomCache::DecompressStaticBlock(GeomCacheFile::EBlockCompressionFormat compressionFormat, const char* pCompressedData, std::vector<char>& decompressedData)
-{
-    const GeomCacheFile::SCompressedBlockHeader staticBlockHeader = *reinterpret_cast<const GeomCacheFile::SCompressedBlockHeader*>(pCompressedData);
-    decompressedData.resize(staticBlockHeader.m_uncompressedSize);
-
-    if (!GeomCacheDecoder::DecompressBlock(compressionFormat, &decompressedData[0], pCompressedData))
-    {
-        m_lastError = "Could not decompress static data";
-        return false;
-    }
-
-    return true;
-}
-
-bool CGeomCache::ReadFrameInfos(AZ::IO::HandleType fileHandle, const uint32 numFrames)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    size_t bytesRead;
-
-    std::vector<GeomCacheFile::SFrameInfo> fileFrameInfos;
-
-    fileFrameInfos.resize(numFrames);
-    bytesRead = gEnv->pCryPak->FReadRaw((void*)&fileFrameInfos[0], 1, numFrames * sizeof(GeomCacheFile::SFrameInfo), fileHandle);
-    if (bytesRead != (numFrames * sizeof(GeomCacheFile::SFrameInfo)))
-    {
-        return false;
-    }
-
-    m_frameInfos.resize(numFrames);
-    for (uint i = 0; i < numFrames; ++i)
-    {
-        m_frameInfos[i].m_frameTime = fileFrameInfos[i].m_frameTime;
-        m_frameInfos[i].m_frameType = fileFrameInfos[i].m_frameType;
-        m_frameInfos[i].m_frameSize = fileFrameInfos[i].m_frameSize;
-        m_frameInfos[i].m_frameOffset = fileFrameInfos[i].m_frameOffset;
-        m_compressedAnimationDataSize += m_frameInfos[i].m_frameSize;
-    }
-
-    if (m_frameInfos.front().m_frameType != GeomCacheFile::eFrameType_IFrame
-        || m_frameInfos.back().m_frameType != GeomCacheFile::eFrameType_IFrame)
-    {
-        return false;
-    }
-
-    // Assign prev/next index frames and count total data size
-    uint prevIFrame = 0;
-    for (uint i = 0; i < numFrames; ++i)
-    {
-        m_frameInfos[i].m_prevIFrame = prevIFrame;
-
-        if (m_frameInfos[i].m_frameType == GeomCacheFile::eFrameType_IFrame)
-        {
-            prevIFrame = i;
-        }
-    }
-
-    uint nextIFrame = numFrames - 1;
-    for (int i = numFrames - 1; i >= 0; --i)
-    {
-        m_frameInfos[i].m_nextIFrame = nextIFrame;
-
-        if (m_frameInfos[i].m_frameType == GeomCacheFile::eFrameType_IFrame)
-        {
-            nextIFrame = i;
-        }
-    }
-
-    return true;
-}
-
-bool CGeomCache::ReadMeshesStaticData(CGeomCacheStreamReader& reader, const char* pFileName)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    uint32 numMeshes;
-    if (!reader.Read(&numMeshes))
-    {
-        return false;
-    }
-
-    std::vector<GeomCacheFile::SMeshInfo> meshInfos;
-    meshInfos.reserve(numMeshes);
-
-    for (uint32 i = 0; i < numMeshes; ++i)
-    {
-        GeomCacheFile::SMeshInfo meshInfo;
-        m_staticMeshData.push_back(SGeomCacheStaticMeshData());
-        SGeomCacheStaticMeshData& staticMeshData = m_staticMeshData.back();
-
-        if (!reader.Read(&meshInfo))
-        {
-            return false;
-        }
-
-        staticMeshData.m_bUsePredictor = (meshInfo.m_flags & GeomCacheFile::eMeshIFrameFlags_UsePredictor) != 0;
-        staticMeshData.m_positionPrecision[0] = meshInfo.m_positionPrecision[0];
-        staticMeshData.m_positionPrecision[1] = meshInfo.m_positionPrecision[1];
-        staticMeshData.m_positionPrecision[2] = meshInfo.m_positionPrecision[2];
-        staticMeshData.m_uvMax = meshInfo.m_uvMax;
-        staticMeshData.m_constantStreams = static_cast<GeomCacheFile::EStreams>(meshInfo.m_constantStreams);
-        staticMeshData.m_animatedStreams = static_cast<GeomCacheFile::EStreams>(meshInfo.m_animatedStreams);
-        staticMeshData.m_numVertices = meshInfo.m_numVertices;
-        staticMeshData.m_aabb.min = Vec3(meshInfo.m_aabbMin[0], meshInfo.m_aabbMin[1], meshInfo.m_aabbMin[2]);
-        staticMeshData.m_aabb.max = Vec3(meshInfo.m_aabbMax[0], meshInfo.m_aabbMax[1], meshInfo.m_aabbMax[2]);
-        staticMeshData.m_hash = meshInfo.m_hash;
-
-        std::vector<char> tempName(meshInfo.m_nameLength);
-        if (!reader.Read(&tempName[0], meshInfo.m_nameLength))
-        {
-            return false;
-        }
-
-        if (gEnv->IsEditor())
-        {
-            staticMeshData.m_name = &tempName[0];
-        }
-
-        // Read material IDs
-        staticMeshData.m_materialIds.resize(meshInfo.m_numMaterials);
-
-        if (!reader.Read(&staticMeshData.m_materialIds[0], meshInfo.m_numMaterials))
-        {
-            return false;
-        }
-
-        meshInfos.push_back(meshInfo);
-    }
-
-    m_staticMeshData.reserve(numMeshes);
-    for (uint32 i = 0; i < numMeshes; ++i)
-    {
-        if (!ReadMeshStaticData(reader, meshInfos[i], m_staticMeshData[i], pFileName))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CGeomCache::ReadMeshStaticData(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo,
-    SGeomCacheStaticMeshData& staticMeshData, const char* pFileName)
-{
-    CGeomCacheMeshManager& meshManager = GetGeomCacheManager()->GetMeshManager();
-
-    if (meshInfo.m_animatedStreams == 0)
-    {
-        // If we don't need the static data to fill dynamic meshes, just construct a static mesh
-        _smart_ptr<IRenderMesh> pRenderMesh = meshManager.ConstructStaticRenderMesh(reader, meshInfo, staticMeshData, pFileName);
-
-        if (!pRenderMesh)
-        {
-            return false;
-        }
-
-        m_staticRenderMeshes.push_back(pRenderMesh);
-    }
-    else
-    {
-        // Otherwise we need the static data for filling the dynamic mesh later and read it to the vertex array in staticMeshData
-        if (!meshManager.ReadMeshStaticData(reader, meshInfo, staticMeshData))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CGeomCache::ReadNodesStaticDataRec(CGeomCacheStreamReader& reader)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    GeomCacheFile::SNodeInfo nodeInfo;
-    if (!reader.Read(&nodeInfo))
-    {
-        return false;
-    }
-
-    SGeomCacheStaticNodeData staticNodeData;
-    staticNodeData.m_meshOrGeometryIndex = nodeInfo.m_meshIndex;
-    staticNodeData.m_numChildren = nodeInfo.m_numChildren;
-    staticNodeData.m_type = static_cast<GeomCacheFile::ENodeType>(nodeInfo.m_type);
-    staticNodeData.m_transformType = static_cast<GeomCacheFile::ETransformType>(nodeInfo.m_transformType);
-
-    std::vector<char> tempName(nodeInfo.m_nameLength);
-    if (!reader.Read(&tempName[0], nodeInfo.m_nameLength))
-    {
-        return false;
-    }
-
-    if (gEnv->IsEditor())
-    {
-        staticNodeData.m_name = &tempName[0];
-    }
-
-    staticNodeData.m_nameHash = CryStringUtils::HashString(&tempName[0]);
-
-    if (!reader.Read(&staticNodeData.m_localTransform))
-    {
-        return false;
-    }
-
-    if (staticNodeData.m_type == GeomCacheFile::eNodeType_PhysicsGeometry)
-    {
-        uint32 geometrySize;
-        if (!reader.Read(&geometrySize))
-        {
-            return false;
-        }
-
-        std::vector<char> geometryData(geometrySize);
-        if (!reader.Read(&geometryData[0], geometrySize))
-        {
-            return false;
-        }
-
-        CMemStream memStream(&geometryData[0], geometrySize, false);
-        // Geometry
-        CRY_PHYSICS_REPLACEMENT_ASSERT();
-
-        staticNodeData.m_meshOrGeometryIndex = (uint32)(m_physicsGeometries.size() - 1);
-    }
-
-    m_staticNodeData.push_back(staticNodeData);
-
-    for (uint32 i = 0; i < nodeInfo.m_numChildren; ++i)
-    {
-        if (!ReadNodesStaticDataRec(reader))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-float CGeomCache::GetDuration() const
-{
-    if (m_frameInfos.empty())
-    {
-        return 0.0f;
-    }
-    else
-    {
-        return m_frameInfos.back().m_frameTime - m_frameInfos.front().m_frameTime;
-    }
-}
-
-IGeomCache::SStatistics CGeomCache::GetStatistics() const
-{
-    IGeomCache::SStatistics stats;
-    memset(&stats, 0, sizeof(stats));
-
-    std::set<uint16> materialIds;
-
-
-    const uint numMeshes = m_staticMeshData.size();
-    for (uint i = 0; i < numMeshes; ++i)
-    {
-        const SGeomCacheStaticMeshData& meshData = m_staticMeshData[i];
-        materialIds.insert(meshData.m_materialIds.begin(), meshData.m_materialIds.end());
-
-        stats.m_staticDataSize += static_cast<uint>(sizeof(SGeomCacheStaticMeshData));
-        stats.m_staticDataSize += static_cast<uint>(sizeof(vtx_idx) * meshData.m_indices.size());
-        stats.m_staticDataSize += static_cast<uint>(sizeof(uint32) * meshData.m_numIndices.size());
-        stats.m_staticDataSize += static_cast<uint>(sizeof(Vec3) * meshData.m_positions.size());
-        stats.m_staticDataSize += static_cast<uint>(sizeof(UCol) * meshData.m_colors.size());
-        stats.m_staticDataSize += static_cast<uint>(sizeof(Vec2) * meshData.m_texcoords.size());
-        stats.m_staticDataSize += static_cast<uint>(sizeof(SPipTangents) * meshData.m_tangents.size());
-        stats.m_staticDataSize += static_cast<uint>(sizeof(uint16) * meshData.m_materialIds.size());
-        stats.m_staticDataSize += static_cast<uint>(sizeof(uint16) * meshData.m_predictorData.size());
-
-        uint numIndices = 0;
-        const uint numMaterials = meshData.m_numIndices.size();
-        for (uint j = 0; j < numMaterials; ++j)
-        {
-            numIndices += meshData.m_numIndices[j];
-        }
-
-        if (meshData.m_animatedStreams == 0)
-        {
-            ++stats.m_numStaticMeshes;
-            stats.m_numStaticVertices += meshData.m_numVertices;
-            stats.m_numStaticTriangles += numIndices / 3;
-        }
-        else
-        {
-            ++stats.m_numAnimatedMeshes;
-            stats.m_numAnimatedVertices += meshData.m_numVertices;
-            stats.m_numAnimatedTriangles += numIndices / 3;
-        }
-    }
-
-    stats.m_staticDataSize += static_cast<uint>(m_staticNodeData.size() * sizeof(SGeomCacheStaticNodeData));
-    stats.m_staticDataSize += static_cast<uint>(m_frameInfos.size() * sizeof(SFrameInfo));
-
-    stats.m_bPlaybackFromMemory = m_bPlaybackFromMemory;
-    stats.m_averageAnimationDataRate = (float(m_compressedAnimationDataSize) / 1024.0f / 1024.0f) / float(GetDuration());
-    stats.m_numMaterials = static_cast<uint>(materialIds.size());
-    stats.m_diskAnimationDataSize = static_cast<uint>(m_compressedAnimationDataSize);
-    stats.m_memoryAnimationDataSize = static_cast<uint>(m_animationData.size());
-
-    return stats;
-}
-
-void CGeomCache::Shutdown()
-{
-    if (m_pStaticDataReadStream)
-    {
-        m_pStaticDataReadStream->Abort();
-        m_pStaticDataReadStream = NULL;
-    }
-
-    GetObjManager()->UnregisterForStreaming(this);
-    GetGeomCacheManager()->StopCacheStreamsAndWait(this);
-
-    const uint numListeners = m_listeners.size();
-    for (uint i = 0; i < numListeners; ++i)
-    {
-        m_listeners[i]->OnGeomCacheStaticDataUnloaded();
-    }
-
-    m_eStreamingStatus = ecss_NotLoaded;
-
-    stl::free_container(m_frameInfos);
-    stl::free_container(m_staticMeshData);
-    stl::free_container(m_staticNodeData);
-    stl::free_container(m_physicsGeometries);
-    stl::free_container(m_animationData);
-}
-
-void CGeomCache::Reload()
-{
-    Shutdown();
-
-    const bool bUseStreaming = m_bUseStreaming;
-    m_bUseStreaming = false;
-    m_bValid = false;
-    m_bLoaded = false;
-    LoadGeomCache();
-    m_bUseStreaming = bUseStreaming;
-
-    if (m_bLoaded)
-    {
-        const uint numListeners = m_listeners.size();
-        for (uint i = 0; i < numListeners; ++i)
-        {
-            m_listeners[i]->OnGeomCacheStaticDataLoaded();
-        }
-    }
-    else
-    {
-        FileWarning(0, m_fileName.c_str(), "Failed to load geometry cache: %s", m_lastError.c_str());
-        stl::free_container(m_lastError);
-    }
-}
-
-uint CGeomCache::GetNumFrames() const
-{
-    return m_frameInfos.size();
-}
-
-bool CGeomCache::PlaybackFromMemory() const
-{
-    return m_bPlaybackFromMemory;
-}
-
-uint64 CGeomCache::GetCompressedAnimationDataSize() const
-{
-    return m_compressedAnimationDataSize;
-}
-
-char* CGeomCache::GetFrameData(const uint frameIndex)
-{
-    assert(m_bPlaybackFromMemory);
-
-    char* pAnimationData = &m_animationData[0];
-
-    SGeomCacheFrameHeader* pFrameHeader = reinterpret_cast<SGeomCacheFrameHeader*>(
-            pAnimationData + (frameIndex * sizeof(SGeomCacheFrameHeader)));
-
-    return pAnimationData + pFrameHeader->m_offset;
-}
-
-const char* CGeomCache::GetFrameData(const uint frameIndex) const
-{
-    assert(m_bPlaybackFromMemory);
-
-    const char* pAnimationData = &m_animationData[0];
-
-    const SGeomCacheFrameHeader* pFrameHeader = reinterpret_cast<const SGeomCacheFrameHeader*>(
-            pAnimationData + (frameIndex * sizeof(SGeomCacheFrameHeader)));
-
-    return pAnimationData + pFrameHeader->m_offset;
-}
-
-const AABB& CGeomCache::GetAABB() const
-{
-    return m_aabb;
-}
-
-uint CGeomCache::GetFloorFrameIndex(const float time) const
-{
-    if (m_frameInfos.empty())
-    {
-        return 0;
-    }
-
-    const float duration = GetDuration();
-    float timeInCycle = fmod(time, duration);
-    uint numLoops = static_cast<uint>(floor(time / duration));
-
-    // Make sure that exactly at wrap around we still refer to last frame
-    if (timeInCycle == 0.0f && time > 0.0f)
-    {
-        timeInCycle = duration;
-        numLoops -= 1;
-    }
-
-    const uint numFrames = m_frameInfos.size();
-    const uint numPreviousCycleFrames = numLoops * numFrames;
-    uint frameInCycle;
-
-    // upper_bound = first value greater than time
-    SFrameInfo value = { timeInCycle };
-    std::vector<SFrameInfo>::const_iterator findIter =
-        std::upper_bound(m_frameInfos.begin(), m_frameInfos.end(), value, CompareFrameTimes);
-    if (findIter == m_frameInfos.begin())
-    {
-        frameInCycle = 0;
-    }
-    else if (findIter == m_frameInfos.end())
-    {
-        frameInCycle = static_cast<uint>(m_frameInfos.size() - 1);
-    }
-    else
-    {
-        frameInCycle = static_cast<uint>(findIter - m_frameInfos.begin() - 1);
-    }
-
-    return frameInCycle + numPreviousCycleFrames;
-}
-
-uint CGeomCache::GetCeilFrameIndex(const float time) const
-{
-    if (m_frameInfos.empty())
-    {
-        return 0;
-    }
-
-    const float duration = GetDuration();
-    float timeInCycle = fmod(time, duration);
-    uint numLoops = static_cast<uint>(floor(time / duration));
-
-    // Make sure that exactly at wrap around we still refer to last frame
-    if (timeInCycle == 0.0f && time > 0.0f)
-    {
-        timeInCycle = duration;
-        numLoops -= 1;
-    }
-
-    const uint numFrames = m_frameInfos.size();
-    const uint numPreviousCycleFrames = numLoops * numFrames;
-    uint frameInCycle;
-
-    // lower_bound = first value greater than or equal to time
-    SFrameInfo value = { timeInCycle };
-    std::vector<SFrameInfo>::const_iterator findIter =
-        std::lower_bound(m_frameInfos.begin(), m_frameInfos.end(), value, CompareFrameTimes);
-    if (findIter == m_frameInfos.end())
-    {
-        frameInCycle = static_cast<uint>(m_frameInfos.size() - 1);
-    }
-    else
-    {
-        frameInCycle = static_cast<uint>(findIter - m_frameInfos.begin());
-    }
-
-    return frameInCycle + numPreviousCycleFrames;
-}
-
-GeomCacheFile::EFrameType CGeomCache::GetFrameType(const uint frameIndex) const
-{
-    const uint numFrames = m_frameInfos.size();
-    return (GeomCacheFile::EFrameType)m_frameInfos[frameIndex % numFrames].m_frameType;
-}
-
-uint64 CGeomCache::GetFrameOffset(const uint frameIndex) const
-{
-    const uint numFrames = m_frameInfos.size();
-    return m_frameInfos[frameIndex % numFrames].m_frameOffset;
-}
-
-uint32 CGeomCache::GetFrameSize(const uint frameIndex) const
-{
-    const uint numFrames = m_frameInfos.size();
-    return m_frameInfos[frameIndex % numFrames].m_frameSize;
-}
-
-float CGeomCache::GetFrameTime(const uint frameIndex) const
-{
-    const uint numFrames = m_frameInfos.size();
-    const uint numLoops = frameIndex / numFrames;
-    const float duration = GetDuration();
-    return (duration * numLoops) + m_frameInfos[frameIndex % numFrames].m_frameTime;
-}
-
-uint CGeomCache::GetPrevIFrame(const uint frameIndex) const
-{
-    const uint numFrames = m_frameInfos.size();
-    const uint numLoops = frameIndex / numFrames;
-    return (numFrames * numLoops) + m_frameInfos[frameIndex % numFrames].m_prevIFrame;
-}
-
-uint CGeomCache::GetNextIFrame(const uint frameIndex) const
-{
-    const uint numFrames = m_frameInfos.size();
-    const uint numLoops = frameIndex / numFrames;
-    return (numFrames * numLoops) + m_frameInfos[frameIndex % numFrames].m_nextIFrame;
-}
-
-bool CGeomCache::NeedsPrevFrames(const uint frameIndex) const
-{
-    if (GetFrameType(frameIndex) == GeomCacheFile::eFrameType_IFrame
-        || GetFrameType(frameIndex - 1) == GeomCacheFile::eFrameType_IFrame)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void CGeomCache::ValidateReadRange(const uint start, uint& end) const
-{
-    const uint numFrames = m_frameInfos.size();
-    uint startMod = start % numFrames;
-    uint endMod = end % numFrames;
-
-    if (endMod < startMod)
-    {
-        end = start + (numFrames - 1 - startMod);
-    }
-}
-
-GeomCacheFile::EBlockCompressionFormat CGeomCache::GetBlockCompressionFormat() const
-{
-    return m_blockCompressionFormat;
-}
-
-void CGeomCache::UpdateStreamableComponents(float importance, [[maybe_unused]] const Matrix34A& objMatrix, [[maybe_unused]] IRenderNode* pRenderNode, bool bFullUpdate)
-{
-    if (!m_bUseStreaming)
-    {
-        return;
-    }
-
-    const int nRoundId = GetObjManager()->GetUpdateStreamingPrioriryRoundId();
-
-    if (UpdateStreamingPrioriryLowLevel(importance, nRoundId, bFullUpdate))
-    {
-        GetObjManager()->RegisterForStreaming(this);
-    }
-}
-
-void CGeomCache::StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream)
-{
-    m_bValid = false;
-
-    assert(m_eStreamingStatus == ecss_NotLoaded);
-    if (m_eStreamingStatus != ecss_NotLoaded)
-    {
-        return;
-    }
-
-    if (m_bLoaded)
-    {
-        const uint numListeners = m_listeners.size();
-        for (uint i = 0; i < numListeners; ++i)
-        {
-            m_listeners[i]->OnGeomCacheStaticDataLoaded();
-        }
-
-        m_eStreamingStatus = ecss_Ready;
-        return;
-    }
-
-    // start streaming
-    StreamReadParams params;
-    params.dwUserData = 0;
-    params.nOffset = static_cast<uint>(m_staticMeshDataOffset);
-    params.nSize = sizeof(GeomCacheFile::SCompressedBlockHeader) + m_staticDataHeader.m_compressedSize;
-    params.pBuffer = NULL;
-    params.nLoadTime = 10000;
-    params.nMaxLoadTime = 10000;
-
-    if (m_bPlaybackFromMemory)
-    {
-        params.nSize += static_cast<uint>(m_compressedAnimationDataSize);
-    }
-
-    if (bFinishNow)
-    {
-        params.ePriority = estpUrgent;
-    }
-
-    if (m_fileName.empty())
-    {
-        m_eStreamingStatus = ecss_Ready;
-        if (ppStream)
-        {
-            *ppStream = NULL;
-        }
-        return;
-    }
-
-    m_pStaticDataReadStream = GetSystem()->GetStreamEngine()->StartRead(eStreamTaskTypeGeometry, m_fileName, this, &params);
-
-    if (ppStream)
-    {
-        (*ppStream) = m_pStaticDataReadStream;
-    }
-
-    if (!bFinishNow)
-    {
-        m_eStreamingStatus = ecss_InProgress;
-    }
-    else if (!ppStream)
-    {
-        m_pStaticDataReadStream->Wait();
-    }
-}
-
-void CGeomCache::StreamOnComplete([[maybe_unused]] IReadStream* pStream, unsigned nError)
-{
-    if (nError != 0 || !m_bValid)
-    {
-        return;
-    }
-
-    const uint numListeners = m_listeners.size();
-    for (uint i = 0; i < numListeners; ++i)
-    {
-        m_listeners[i]->OnGeomCacheStaticDataLoaded();
-    }
-
-    m_eStreamingStatus = ecss_Ready;
-
-    m_pStaticDataReadStream = NULL;
-}
-
-void CGeomCache::StreamAsyncOnComplete(IReadStream* pStream, unsigned nError)
-{
-    if (nError != 0)
-    {
-        return;
-    }
-
-    const char* pData = (char*)pStream->GetBuffer();
-
-    std::vector<char> decompressedData;
-    if (!DecompressStaticBlock((GeomCacheFile::EBlockCompressionFormat)(m_blockCompressionFormat), pData, decompressedData))
-    {
-        if (m_lastError.empty())
-        {
-            m_lastError = "Could not decompress static block";
-            return;
-        }
-    }
-
-    CGeomCacheStreamReader reader(&decompressedData[0], decompressedData.size());
-    if (!ReadMeshesStaticData(reader, m_fileName.c_str()))
-    {
-        if (m_lastError.empty())
-        {
-            m_lastError = "Could not read mesh static data";
-            return;
-        }
-    }
-
-    if (m_bPlaybackFromMemory && m_frameInfos.size() > 0)
-    {
-        if (!LoadAnimatedData(pData, sizeof(GeomCacheFile::SCompressedBlockHeader) + m_staticDataHeader.m_compressedSize))
-        {
-            return;
-        }
-    }
-
-    m_bValid = true;
-    m_bLoaded = true;
-
-    pStream->FreeTemporaryMemory();
-}
-
-bool CGeomCache::LoadAnimatedData(const char* pData, const size_t bufferOffset)
-{
-    const uint numFrames = m_frameInfos.size();
-
-    // First get size necessary for decompressing animation data
-    uint32 totalDecompressedAnimatedDataSize = GeomCacheDecoder::GetDecompressBufferSize(pData + bufferOffset, numFrames);
-
-    // Allocate memory and decompress blocks into it
-    m_animationData.resize(totalDecompressedAnimatedDataSize);
-    if (!GeomCacheDecoder::DecompressBlocks(m_blockCompressionFormat, &m_animationData[0], pData + bufferOffset, 0, numFrames, numFrames))
-    {
-        m_lastError = "Could not decompress animation data";
-        return false;
-    }
-
-    // Decode index frames
-    for (uint i = 0; i < numFrames; ++i)
-    {
-        if (m_frameInfos[i].m_frameType == GeomCacheFile::eFrameType_IFrame)
-        {
-            GeomCacheDecoder::DecodeIFrame(this, GetFrameData(i));
-        }
-    }
-
-    // Decode b-frames
-    for (uint i = 0; i < numFrames; ++i)
-    {
-        if (m_frameInfos[i].m_frameType == GeomCacheFile::eFrameType_BFrame)
-        {
-            char* pFrameData = GetFrameData(i);
-            char* pPrevFrameData[2] = { pFrameData, pFrameData };
-
-            if (NeedsPrevFrames(i))
-            {
-                pPrevFrameData[0] = GetFrameData(i - 2);
-                pPrevFrameData[1] = GetFrameData(i - 1);
-            }
-
-            char* pFloorIndexFrameData = GetFrameData(GetPrevIFrame(i));
-            char* pCeilIndexFrameData = GetFrameData(GetNextIFrame(i));
-
-            GeomCacheDecoder::DecodeBFrame(this, pFrameData, pPrevFrameData, pFloorIndexFrameData, pCeilIndexFrameData);
-        }
-    }
-
-    return true;
-}
-
-int CGeomCache::GetStreamableContentMemoryUsage([[maybe_unused]] bool bJustForDebug)
-{
-    return 0;
-}
-
-void CGeomCache::ReleaseStreamableContent()
-{
-    const uint numListeners = m_listeners.size();
-    for (uint i = 0; i < numListeners; ++i)
-    {
-        m_listeners[i]->OnGeomCacheStaticDataUnloaded();
-    }
-
-    // Data cannot be unloaded right away, because stream could still be active,
-    // so we need to wait for a UnloadData callback from the geom cache managers
-    m_eStreamingStatus = ecss_NotLoaded;
-}
-
-void CGeomCache::GetStreamableName(string& sName)
-{
-    sName = m_fileName;
-}
-
-uint32 CGeomCache::GetLastDrawMainFrameId()
-{
-    return m_lastDrawMainFrameId;
-}
-
-bool CGeomCache::IsUnloadable() const
-{
-    return m_bUseStreaming;
-}
-
-void CGeomCache::AddListener(IGeomCacheListener* pListener)
-{
-    stl::push_back_unique(m_listeners, pListener);
-}
-
-void CGeomCache::RemoveListener(IGeomCacheListener* pListener)
-{
-    stl::find_and_erase(m_listeners, pListener);
-}
-
-void CGeomCache::UnloadData()
-{
-    //When not streaming, only allow data release if the geom cache has been processed by its render node
-    if (!m_bUseStreaming && !m_processedByRenderNode)
-    {
-        return;
-    }
-
-    if (m_eStreamingStatus == ecss_NotLoaded)
-    {
-        CGeomCacheMeshManager& meshManager = GetGeomCacheManager()->GetMeshManager();
-
-        uint numStaticMesh = m_staticMeshData.size();
-        for (uint i = 0; i < numStaticMesh; ++i)
-        {
-            if (m_staticMeshData[i].m_animatedStreams == 0)
-            {
-                meshManager.RemoveReference(m_staticMeshData[i]);
-            }
-        }
-
-        stl::free_container(m_staticRenderMeshes);
-        stl::free_container(m_staticMeshData);
-        stl::free_container(m_animationData);
-        m_bLoaded = false;
-    }
-}
-
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/GeomCache.h b/Code/CryEngine/Cry3DEngine/GeomCache.h
deleted file mode 100644
index f40dec46cf..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCache.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Manages geometry cache data
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_GEOMCACHE_H
-#define CRYINCLUDE_CRY3DENGINE_GEOMCACHE_H
-#pragma once
-
-#if defined(USE_GEOM_CACHES)
-
-#include <IGeomCache.h>
-#include "GeomCacheFileFormat.h"
-
-struct SGeomCacheStaticMeshData
-{
-    bool m_bUsePredictor;
-    uint8 m_positionPrecision[3];
-    float m_uvMax;
-    uint32 m_numVertices;
-    GeomCacheFile::EStreams m_constantStreams;
-    GeomCacheFile::EStreams m_animatedStreams;
-    uint64 m_hash;
-    AABB m_aabb;
-    string m_name;
-
-    std::vector<vtx_idx> m_indices;
-    std::vector<uint32> m_numIndices;
-    stl::aligned_vector<Vec3, 16> m_positions;
-    stl::aligned_vector<UCol, 16> m_colors;
-    stl::aligned_vector<Vec2, 16> m_texcoords;
-    stl::aligned_vector<SPipTangents, 16> m_tangents;
-    std::vector<uint16> m_materialIds;
-    std::vector<uint16> m_predictorData;
-};
-
-struct SGeomCacheStaticNodeData
-{
-    uint32 m_meshOrGeometryIndex;
-    uint32 m_numChildren;
-    GeomCacheFile::ENodeType m_type;
-    GeomCacheFile::ETransformType m_transformType;
-    QuatTNS m_localTransform;
-    uint32 m_nameHash;
-    string m_name;
-};
-
-class CGeomCacheStreamReader
-{
-public:
-    CGeomCacheStreamReader(const char* pData, const size_t length)
-        : m_pData(pData)
-        , m_length(length)
-        , m_position(0) {}
-
-    template<class T>
-    bool Read(T* pDest, size_t numElements)
-    {
-        const size_t numBytes = sizeof(T) * numElements;
-
-        if (m_position + numBytes > m_length)
-        {
-            return false;
-        }
-
-        memcpy(pDest, &m_pData[m_position], numBytes);
-        m_position += numBytes;
-
-        return true;
-    }
-
-    template<class T>
-    bool Read(T* pDest)
-    {
-        const size_t numBytes = sizeof(T);
-
-        if (m_position + numBytes > m_length)
-        {
-            return false;
-        }
-
-        memcpy(pDest, &m_pData[m_position], numBytes);
-        m_position += numBytes;
-
-        return true;
-    }
-
-private:
-    const char* m_pData;
-    const size_t m_length;
-    size_t m_position;
-};
-
-struct IGeomCacheListener
-{
-public:
-    virtual ~IGeomCacheListener() {}
-
-    virtual void OnGeomCacheStaticDataLoaded() = 0;
-    virtual void OnGeomCacheStaticDataUnloaded() = 0;
-};
-
-class CGeomCache
-    : public IGeomCache
-    , public IStreamCallback
-    , public Cry3DEngineBase
-{
-    friend class CGeomCacheManager;
-
-public:
-    CGeomCache(const char* pFileName);
-    ~CGeomCache();
-
-    // Gets number of frames
-    uint GetNumFrames() const;
-
-    // Returns true if cache plays back from memory
-    bool PlaybackFromMemory() const;
-
-    const char* GetFrameData(const uint frameIndex) const;
-    uint64 GetCompressedAnimationDataSize() const;
-
-    // Gets the max extend of the geom cache through the entire animation
-    const AABB& GetAABB() const override;
-
-    void SetProcessedByRenderNode(bool processedByRenderNode) override { m_processedByRenderNode = processedByRenderNode; }
-
-    // Returns frame for specific time. Rounds to ceil or floor
-    uint GetFloorFrameIndex(const float time) const;
-    uint GetCeilFrameIndex(const float time) const;
-
-    // Frame infos
-    GeomCacheFile::EFrameType GetFrameType(const uint frameIndex) const;
-    uint64 GetFrameOffset(const uint frameIndex) const;
-    uint32 GetFrameSize(const uint frameIndex) const;
-    float GetFrameTime(const uint frameIndex) const;
-    uint GetPrevIFrame(const uint frameIndex) const;
-    uint GetNextIFrame(const uint frameIndex) const;
-
-    // Returns true if this frame uses motion prediction and needs the last two frames
-    bool NeedsPrevFrames(const uint frameIndex) const;
-
-    // Validates a frame range for reading from disk
-    void ValidateReadRange(const uint start, uint& end) const;
-
-    // Get block compression format
-    GeomCacheFile::EBlockCompressionFormat GetBlockCompressionFormat() const;
-
-    // Access to the mesh and node lists
-    const std::vector<SGeomCacheStaticMeshData>& GetStaticMeshData() const { return m_staticMeshData; }
-    const std::vector<SGeomCacheStaticNodeData>& GetStaticNodeData() const { return m_staticNodeData; }
-    const std::vector<phys_geometry*>& GetPhysicsGeometries() const { return m_physicsGeometries; }
-
-    // Listener interface for async loading
-    void AddListener(IGeomCacheListener* pListener);
-    void RemoveListener(IGeomCacheListener* pListener);
-
-    bool IsLoaded() const { return m_bLoaded; }
-    void UnloadData();
-
-    // Ref count for streams
-    uint GetNumStreams() const { return m_numStreams; }
-    void IncreaseNumStreams() { ++m_numStreams; }
-    void DecreaseNumStreams() { --m_numStreams; }
-
-    // IGeomCache
-    virtual int AddRef();
-    virtual int Release();
-
-    virtual bool IsValid() const { return m_bValid; }
-
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMaterial);
-    virtual _smart_ptr<IMaterial> GetMaterial();
-    virtual const _smart_ptr<IMaterial> GetMaterial() const;
-
-    virtual const char* GetFilePath() const;
-
-    virtual float GetDuration() const;
-
-    virtual IGeomCache::SStatistics GetStatistics() const;
-
-    virtual void Reload();
-
-    // Static data streaming
-    void UpdateStreamableComponents(float importance, const Matrix34A& objMatrix, IRenderNode* pRenderNode, bool bFullUpdate);
-    void SetLastDrawMainFrameId(const uint32 id) { m_lastDrawMainFrameId = id; }
-
-    // IStreamable
-    virtual void StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream);
-    virtual int GetStreamableContentMemoryUsage(bool bJustForDebug);
-    virtual void ReleaseStreamableContent();
-    virtual void GetStreamableName(string& sName);
-    virtual uint32 GetLastDrawMainFrameId();
-    virtual bool IsUnloadable() const;
-
-    // IStreamCallback
-    virtual void StreamOnComplete(IReadStream* pStream, unsigned nError);
-    virtual void StreamAsyncOnComplete(IReadStream* pStream, unsigned nError);
-
-private:
-    struct SFrameInfo
-    {
-        float m_frameTime;
-        uint32 m_frameType;
-        uint32 m_frameSize;
-        uint32 m_prevIFrame;
-        uint32 m_nextIFrame;
-        uint64 m_frameOffset;
-    };
-
-    void Shutdown();
-
-    bool LoadGeomCache();
-
-    bool ReadFrameInfos(AZ::IO::HandleType fileHandle, const uint32 numFrames);
-
-    bool ReadStaticBlock(AZ::IO::HandleType fileHandle, GeomCacheFile::EBlockCompressionFormat compressionFormat, std::vector<char>& compressedData);
-    bool DecompressStaticBlock(GeomCacheFile::EBlockCompressionFormat compressionFormat, const char* pCompressedData, std::vector<char>& decompressedData);
-
-    bool ReadMeshesStaticData(CGeomCacheStreamReader& reader, const char* pFileName);
-    bool ReadMeshStaticData(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo,
-        SGeomCacheStaticMeshData& mesh, const char* pFileName);
-
-    bool LoadAnimatedData(const char* pData, const size_t bufferOffset);
-
-    bool ReadNodesStaticDataRec(CGeomCacheStreamReader& reader);
-
-    static bool CompareFrameTimes(const SFrameInfo& a, const SFrameInfo& b)
-    {
-        return a.m_frameTime < b.m_frameTime;
-    }
-
-    char* GetFrameData(const uint frameIndex);
-
-    bool m_bValid;
-    bool m_bLoaded;
-
-    int m_refCount;
-    _smart_ptr<IMaterial> m_pMaterial;
-    string m_fileName;
-    string m_lastError;
-
-    // Static data streaming state
-    bool m_bUseStreaming;
-    uint32 m_lastDrawMainFrameId;
-    IReadStreamPtr m_pStaticDataReadStream;
-
-    // Cache block compression format
-    GeomCacheFile::EBlockCompressionFormat m_blockCompressionFormat;
-
-    // Playback from memory flag
-    bool m_bPlaybackFromMemory;
-
-    // Number of frames
-    uint m_numFrames;
-
-    // Number of streams reading from this cache
-    uint m_numStreams;
-
-    // Offset of static mesh data
-    uint64 m_staticMeshDataOffset;
-
-    // Total size of animated data
-    uint64 m_compressedAnimationDataSize;
-
-    // Total size of uncompressed animation data
-    uint64 m_totalUncompressedAnimationSize;
-
-    // AABB of entire animation
-    AABB m_aabb;
-
-    // Static data size;
-    GeomCacheFile::SCompressedBlockHeader m_staticDataHeader;
-
-    // Frame infos
-    std::vector<SFrameInfo> m_frameInfos;
-
-    std::vector<SGeomCacheStaticMeshData> m_staticMeshData;
-    std::vector<SGeomCacheStaticNodeData> m_staticNodeData;
-
-    // Physics
-    std::vector<phys_geometry*> m_physicsGeometries;
-
-    // Holds references of static render meshes until cache object dies
-    std::vector<_smart_ptr<IRenderMesh> > m_staticRenderMeshes;
-
-    // Listeners
-    std::vector<IGeomCacheListener*> m_listeners;
-
-    // Animation data (memory playback)
-    std::vector<char> m_animationData;
-
-    // Only matters when e_streamCGF is 0
-    bool m_processedByRenderNode = true;
-};
-
-#endif
-#endif // CRYINCLUDE_CRY3DENGINE_GEOMCACHE_H
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheDecoder.cpp b/Code/CryEngine/Cry3DEngine/GeomCacheDecoder.cpp
deleted file mode 100644
index 6d8d1683b8..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheDecoder.cpp
+++ /dev/null
@@ -1,973 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Decodes geom cache data
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#if defined(USE_GEOM_CACHES)
-
-#include "GeomCacheDecoder.h"
-#include "GeomCache.h"
-#include "GeomCacheRenderNode.h"
-#include "GeomCachePredictors.h"
-#include "IZlibDecompressor.h"
-#include "ILZ4Decompressor.h"
-#include "IZStdDecompressor.h"
-#include "Cry3DEngineTraits.h"
-
-namespace GeomCacheDecoder
-{
-    // This namespace will provide the different vertex decode function permutations to avoid dynamic branching
-    const uint kNumPermutations = 2 * 2 * 2 * 3;
-
-    GeomCacheFile::Color FixedPointColorLerp(int32 a, int32 b, const int32 lerpFactor)
-    {
-        return a + (((b - a) * lerpFactor) >> 16);
-    }
-
-    inline uint GetDecodeVerticesPerm(const bool bMotionBlur, const GeomCacheFile::EStreams constantStreamMask, const GeomCacheFile::EStreams animatedStreamMask)
-    {
-        uint permutation = 0;
-
-        permutation += bMotionBlur ? (2 * 2 * 3) : 0;
-        permutation += (constantStreamMask& GeomCacheFile::eStream_Positions) ? (2 * 3) : 0;
-        permutation += (constantStreamMask& GeomCacheFile::eStream_Texcoords) ? 3 : 0;
-        permutation += (constantStreamMask& GeomCacheFile::eStream_Colors) ? 1 : 0;
-        permutation += (animatedStreamMask& GeomCacheFile::eStream_Colors) ? 2 : 0;
-
-        return permutation;
-    }
-
-#if AZ_LEGACY_3DENGINE_TRAIT_DO_EXTRA_GEOMCACHE_PROCESSING
-    #define vec4f_swizzle(v, p, q, r, s) (_mm_shuffle_ps((v), (v), ((s) << 6 | (r) << 4 | (q) << 2 | (p))))
-
-    void ConvertToTangentAndBitangentVec4f(const __m128 interpolated, const __m128 floor, __m128& tangent, __m128& bitangent)
-    {
-        const __m128 comparedAgainstW = _mm_setr_ps(FLT_MIN, FLT_MIN, FLT_MIN, 0.0f);
-        const __m128 flipSignMask = _mm_castsi128_ps(_mm_set1_epi32(0x80000000));
-        const __m128 twos = _mm_setr_ps(2.0f, 2.0f, 2.0f, 0.0f);
-
-        // (interpolated.w < 0.0f) != (floor.w < 0.0f) => flip sign of quaternions in registers
-        const __m128 cmp = _mm_xor_ps(_mm_cmplt_ps(interpolated, comparedAgainstW), _mm_cmplt_ps(floor, comparedAgainstW));
-        const __m128 signCmp = vec4f_swizzle(cmp, 3, 3, 3, 3);
-        const __m128 xyzw = _mm_xor_ps(interpolated, _mm_and_ps(signCmp, flipSignMask));
-        const __m128 wSignBit = _mm_and_ps(_mm_castsi128_ps(_mm_setr_epi32(0, 0, 0, 0x80000000)), xyzw);
-
-        // Calculate tangent & bitangent
-        const __m128 xxxx = vec4f_swizzle(xyzw, 0, 0, 0, 0);
-        const __m128 yyyy = vec4f_swizzle(xyzw, 1, 1, 1, 1);
-        const __m128 wwww = vec4f_swizzle(xyzw, 3, 3, 3, 3);
-        const __m128 wzyx = vec4f_swizzle(xyzw, 3, 2, 1, 0);
-        const __m128 zwxy = vec4f_swizzle(xyzw, 2, 3, 0, 1);
-
-        // tangent = (2 * (x * x + w * w) - 1, 2 * (y * x + z * w), 2 * (z * x - y * w), sign(w))
-        __m128 wwnw = _mm_xor_ps(wwww, _mm_castsi128_ps(_mm_setr_epi32(0, 0, 0x80000000, 0))); // -> (w, w, -w, w)
-        tangent = _mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(xyzw, xxxx), _mm_mul_ps(wzyx, wwnw)), twos), _mm_setr_ps(-1.0f, 0.0f, 0.0f, 1.0f));
-        tangent = _mm_or_ps(wSignBit, tangent);
-
-        // bitangent = (2 * (x * y - z * w), 2 * (y * y + w * w) - 1, 2 * (z * y + x * w), sign(w))
-        __m128 nwww = _mm_xor_ps(wwww, _mm_castsi128_ps(_mm_setr_epi32(0x80000000, 0, 0, 0))); // -> (-w, w, w, w)
-        bitangent = _mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(xyzw, yyyy), _mm_mul_ps(zwxy, nwww)), twos), _mm_setr_ps(0.0f, -1.0f, 0.0f, 1.0f));
-        bitangent = _mm_or_ps(wSignBit, bitangent);
-    }
-
-    // Don't use _mm_dp_ps because it's slower than the _mm_hadd_ps way (_mm_dp_ps is a microcoded instruction).
-    ILINE __m128 _mm_dp_ps_emu(const __m128& a, const __m128& b)
-    {
-        __m128 tmp1 = _mm_mul_ps(a, b);
-        __m128 tmp2 = _mm_hadd_ps(tmp1, tmp1);
-        return _mm_hadd_ps(tmp2, tmp2);
-    }
-
-    __m128i _mm_cvtepi16_epi32_emu(const __m128i& a)
-    {
-#if AZ_LEGACY_3DENGINE_TRAIT_HAS_MM_CVTEPI16_EPI32
-        return _mm_cvtepi16_epi32(a);
-#else
-        // 5 instructions (unpack, and, cmp, and, or). Idea is to fill 0xFFFF in the hi-word if the sign bit of the lo-word 1.
-        const __m128i signBitsMask = _mm_set1_epi32(0x00008000);
-        const __m128i hiWordBitMask = _mm_set1_epi32(0xFFFF0000);
-
-        // Unsigned conversion, upper word will be 0x0000 even if sign bit is set
-        const __m128i unpacked = _mm_unpacklo_epi16(a, _mm_set1_epi16(0));
-
-        // Mask out sign bits
-        const __m128i signBitsMasked = _mm_castps_si128(_mm_and_ps(_mm_castsi128_ps(unpacked), _mm_castsi128_ps(signBitsMask)));
-
-        // Sets dwords to 0xFFFFFFFF if sign bit is 1
-        const __m128i cmpBits = _mm_cmpeq_epi32(signBitsMasked, signBitsMask);
-
-        // Mask dwords to 0xFFFF0000 if sign bit was set
-        const __m128i signExtendBits = _mm_and_si128(hiWordBitMask, cmpBits);
-
-        // Finally sign extend with 0xFFFF0000 if sign bit was set
-        return _mm_or_si128(unpacked, signExtendBits);
-#endif
-    }
-#endif
-
-    void DecodeAndInterpolateTangents(const uint numVertices, const float lerpFactor, const GeomCacheFile::QTangent* __restrict pFloorQTangents,
-        const GeomCacheFile::QTangent* __restrict pCeilQTangents, strided_pointer<SPipTangents> pTangents)
-    {
-#if AZ_LEGACY_3DENGINE_TRAIT_DO_EXTRA_GEOMCACHE_PROCESSING
-        const uint numVerticesPerIteration = 2;
-        const uint numSIMDIterations = numVertices / numVerticesPerIteration;
-
-        const float kMultiplier = float((2 << (GeomCacheFile::kTangentQuatPrecision - 1)) - 1);
-        const __m128 convertFromUint16FactorPacked = _mm_set1_ps(1.0f / kMultiplier);
-        const __m128 lerpFactorPacked = _mm_set1_ps(lerpFactor);
-        const __m128i zero = _mm_setzero_si128();
-        const __m128 flipSignMask = _mm_castsi128_ps(_mm_set1_epi32(0x80000000));
-        const __m128 scaleToInt16Factor = _mm_setr_ps(32767.0f, 32767.0f, 32767.0f, 32767.0f);
-
-        __m128i* pFloorQTangents128 = (__m128i*)&pFloorQTangents[0];
-        __m128i* pCeilQTangents128 = (__m128i*)&pCeilQTangents[0];
-        __m128i* pTangents128 = (__m128i*)pTangents.data;
-
-        for (unsigned int i = 0, j = 0; i < numSIMDIterations; ++i, j += 2)
-        {
-            const __m128i floorQTangents = _mm_load_si128(pFloorQTangents128 + i);
-            const __m128i ceilQTangents = _mm_load_si128(pCeilQTangents128 + i);
-
-            // Unpack to lo/hi qTangents and convert to float [-1, 1]
-            __m128 floorLo = _mm_mul_ps(_mm_cvtepi32_ps(_mm_cvtepi16_epi32_emu(floorQTangents)), convertFromUint16FactorPacked);
-            __m128 floorHi = _mm_mul_ps(_mm_cvtepi32_ps(_mm_cvtepi16_epi32_emu(_mm_shuffle_epi32(floorQTangents, _MM_SHUFFLE(1, 0, 3, 2)))), convertFromUint16FactorPacked);
-            __m128 ceilLo = _mm_mul_ps(_mm_cvtepi32_ps(_mm_cvtepi16_epi32_emu(ceilQTangents)), convertFromUint16FactorPacked);
-            __m128 ceilHi = _mm_mul_ps(_mm_cvtepi32_ps(_mm_cvtepi16_epi32_emu(_mm_shuffle_epi32(ceilQTangents, _MM_SHUFFLE(1, 0, 3, 2)))), convertFromUint16FactorPacked);
-
-            // Need to flip sign of the ceil quaternion if the dot product of floor and ceil < 0
-            __m128 dotLo = _mm_dp_ps_emu(floorLo, ceilLo);
-            __m128 dotCmpLo = _mm_cmplt_ps(dotLo, _mm_castsi128_ps(zero));
-            __m128 flipSignLo = _mm_and_ps(dotCmpLo, flipSignMask);
-            ceilLo = _mm_xor_ps(ceilLo, flipSignLo);
-
-            __m128 dotHi = _mm_dp_ps_emu(floorHi, ceilHi);
-            __m128 dotCmpHi = _mm_cmplt_ps(dotHi, _mm_castsi128_ps(zero));
-            __m128 flipSignHi = _mm_and_ps(dotCmpHi, flipSignMask);
-            ceilHi = _mm_xor_ps(ceilHi, flipSignHi);
-
-            // Interpolate the quaternions
-            __m128 interpolatedLo = _mm_add_ps(_mm_mul_ps(_mm_sub_ps(ceilLo, floorLo), lerpFactorPacked), floorLo);
-            __m128 interpolatedHi = _mm_add_ps(_mm_mul_ps(_mm_sub_ps(ceilHi, floorHi), lerpFactorPacked), floorHi);
-
-            // Normalize
-            interpolatedLo = _mm_mul_ps(_mm_rsqrt_ps(_mm_dp_ps_emu(interpolatedLo, interpolatedLo)), interpolatedLo);
-            interpolatedHi = _mm_mul_ps(_mm_rsqrt_ps(_mm_dp_ps_emu(interpolatedHi, interpolatedHi)), interpolatedHi);
-
-            // Convert to tangent/bitangent pairs
-            __m128 tangentLo, bitangentLo, tangentHi, bitangentHi;
-            ConvertToTangentAndBitangentVec4f(interpolatedLo, floorLo, tangentLo, bitangentLo);
-            ConvertToTangentAndBitangentVec4f(interpolatedHi, floorHi, tangentHi, bitangentHi);
-
-            // Scale and convert to int
-            __m128i tangentIntLo = _mm_cvtps_epi32(_mm_mul_ps(tangentLo, scaleToInt16Factor));
-            __m128i bitangentIntLo = _mm_cvtps_epi32(_mm_mul_ps(bitangentLo, scaleToInt16Factor));
-            __m128i tangentIntHi = _mm_cvtps_epi32(_mm_mul_ps(tangentHi, scaleToInt16Factor));
-            __m128i bitangentIntHi = _mm_cvtps_epi32(_mm_mul_ps(bitangentHi, scaleToInt16Factor));
-
-            // Pack
-            __m128i tangentBitangentLo = _mm_packs_epi32(tangentIntLo, bitangentIntLo);
-            __m128i tangentBitangentHi = _mm_packs_epi32(tangentIntHi, bitangentIntHi);
-
-            // And finally store
-            _mm_store_si128(pTangents128 + j, tangentBitangentLo);
-            _mm_store_si128(pTangents128 + j + 1, tangentBitangentHi);
-        }
-
-        const uint scalarStart = numSIMDIterations * numVerticesPerIteration;
-#else
-        const uint scalarStart = 0;
-#endif
-        for (unsigned int i = scalarStart; i < numVertices; ++i)
-        {
-            const Quat decodedFloorQTangent = DecodeQTangent(pFloorQTangents[i]);
-            const Quat decodedCeilQTangent = DecodeQTangent(pCeilQTangents[i]);
-
-            Quat interpolatedQTangent = Quat::CreateNlerp(decodedFloorQTangent, decodedCeilQTangent, lerpFactor);
-
-            if ((interpolatedQTangent.w < 0.0f) != (decodedFloorQTangent.w < 0.0f))
-            {
-                interpolatedQTangent = -interpolatedQTangent;
-            }
-
-            ConvertToTangentAndBitangent(interpolatedQTangent, pTangents[i]);
-        }
-    }
-
-    template<bool bConstantColors, bool bAnimatedColors, bool bConstantTexcoords>
-    void DecodeAndInterpolateColorAndTexcoords([[maybe_unused]] SGeomCacheRenderMeshUpdateContext& updateContext, [[maybe_unused]] const uint index,
-        const SGeomCacheStaticMeshData& staticMeshData, [[maybe_unused]] uint32 fpLerpFactor, const float lerpFactor,
-        [[maybe_unused]] const GeomCacheFile::Color* __restrict pFloorReds, [[maybe_unused]] const GeomCacheFile::Color* __restrict pCeilReds,
-        [[maybe_unused]] const GeomCacheFile::Color* __restrict pFloorGreens, [[maybe_unused]] const GeomCacheFile::Color* __restrict pCeilGreens,
-        [[maybe_unused]] const GeomCacheFile::Color* __restrict pFloorBlues, [[maybe_unused]] const GeomCacheFile::Color* __restrict pCeilBlues,
-        [[maybe_unused]] const GeomCacheFile::Color* __restrict pFloorAlphas, [[maybe_unused]] const GeomCacheFile::Color* __restrict pCeilAlphas,
-        [[maybe_unused]] const GeomCacheFile::Texcoords* __restrict pFloorTexcoords, [[maybe_unused]] const GeomCacheFile::Texcoords* __restrict pCeilTexcoords)
-    {
-        if constexpr (!bConstantColors && !bAnimatedColors)
-        {
-            updateContext.m_pColors[index].dcolor = 0xFFFFFFFF;
-        }
-        else if (bConstantColors)
-        {
-            updateContext.m_pColors[index].bcolor[0] = staticMeshData.m_colors[index].bcolor[0];
-            updateContext.m_pColors[index].bcolor[1] = staticMeshData.m_colors[index].bcolor[1];
-            updateContext.m_pColors[index].bcolor[2] = staticMeshData.m_colors[index].bcolor[2];
-            updateContext.m_pColors[index].bcolor[3] = staticMeshData.m_colors[index].bcolor[3];
-        }
-        else if (bAnimatedColors)
-        {
-            updateContext.m_pColors[index].bcolor[0] = FixedPointColorLerp(pFloorBlues[index], pCeilBlues[index], fpLerpFactor);
-            updateContext.m_pColors[index].bcolor[1] = FixedPointColorLerp(pFloorGreens[index], pCeilGreens[index], fpLerpFactor);
-            updateContext.m_pColors[index].bcolor[2] = FixedPointColorLerp(pFloorReds[index], pCeilReds[index], fpLerpFactor);
-            updateContext.m_pColors[index].bcolor[3] = FixedPointColorLerp(pFloorAlphas[index], pCeilAlphas[index], fpLerpFactor);
-        }
-
-        if (bConstantTexcoords)
-        {
-            updateContext.m_pTexcoords[index] = staticMeshData.m_texcoords[index];
-        }
-        else
-        {
-            updateContext.m_pTexcoords[index] = Vec2::CreateLerp(DecodeTexcoord(pFloorTexcoords[index], staticMeshData.m_uvMax), DecodeTexcoord(pCeilTexcoords[index], staticMeshData.m_uvMax), lerpFactor);
-        }
-    }
-
-    template<uint Permutation>
-    void DecodeMeshVerticesBranchless(SGeomCacheRenderMeshUpdateContext& updateContext,
-        const SGeomCacheStaticMeshData& staticMeshData, const char* pFloorFrameDataPtr,
-        const char* pCeilFrameDataPtr, const float lerpFactor)
-    {
-        const unsigned int numVertices = staticMeshData.m_numVertices;
-        const int32 fpLerpFactor = int32(lerpFactor * 65535.0f);
-
-        const bool bMotionBlur = Permutation % (2 * 2 * 2 * 3) >= (2 * 2 * 3);
-        const bool bConstantPositions = Permutation % (2 * 2 * 3) >= (2 * 3);
-        const bool bConstantTexcoords = (Permutation % (2 * 3)) >= 3;
-        const bool bConstantColors = (Permutation % 3) == 1;
-        const bool bAnimatedColors = (Permutation % 3) == 2;
-
-        const Vec3& aabbMin = staticMeshData.m_aabb.min;
-        const Vec3 aabbSize = staticMeshData.m_aabb.GetSize();
-
-        const GeomCacheFile::Position* __restrict pFloorPositions = bConstantPositions ? NULL :
-            reinterpret_cast<const GeomCacheFile::Position*>(pFloorFrameDataPtr);
-        const GeomCacheFile::Position* __restrict pCeilPositions = bConstantPositions ? NULL :
-            reinterpret_cast<const GeomCacheFile::Position*>(pCeilFrameDataPtr);
-        pFloorFrameDataPtr += bConstantPositions ? 0 : ((numVertices * sizeof(GeomCacheFile::Position) + 15) & ~15);
-        pCeilFrameDataPtr += bConstantPositions ? 0 : ((numVertices * sizeof(GeomCacheFile::Position) + 15) & ~15);
-
-        const GeomCacheFile::Texcoords* __restrict pFloorTexcoords = bConstantTexcoords ? NULL :
-            reinterpret_cast<const GeomCacheFile::Texcoords*>(pFloorFrameDataPtr);
-        const GeomCacheFile::Texcoords* __restrict pCeilTexcoords = bConstantTexcoords ? NULL :
-            reinterpret_cast<const GeomCacheFile::Texcoords*>(pCeilFrameDataPtr);
-        pFloorFrameDataPtr += bConstantTexcoords ? 0 : ((numVertices * sizeof(GeomCacheFile::Texcoords) + 15) & ~15);
-        pCeilFrameDataPtr += bConstantTexcoords ? 0 : ((numVertices * sizeof(GeomCacheFile::Texcoords) + 15) & ~15);
-
-        const GeomCacheFile::QTangent* __restrict pFloorQTangents = (bConstantPositions && bConstantTexcoords) ? NULL :
-            reinterpret_cast<const GeomCacheFile::QTangent*>(pFloorFrameDataPtr);
-        const GeomCacheFile::QTangent* __restrict pCeilQTangents = (bConstantPositions && bConstantTexcoords) ? NULL :
-            reinterpret_cast<const GeomCacheFile::QTangent*>(pCeilFrameDataPtr);
-        pFloorFrameDataPtr += (bConstantPositions && bConstantTexcoords) ? 0 : ((numVertices * sizeof(GeomCacheFile::QTangent) + 15) & ~15);
-        pCeilFrameDataPtr += (bConstantPositions && bConstantTexcoords) ? 0 : ((numVertices * sizeof(GeomCacheFile::QTangent) + 15) & ~15);
-
-        const GeomCacheFile::Color* __restrict pFloorReds = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pFloorFrameDataPtr);
-        const GeomCacheFile::Color* __restrict pCeilReds = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pCeilFrameDataPtr);
-        pFloorFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-        pCeilFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-
-        const GeomCacheFile::Color* __restrict pFloorGreens = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pFloorFrameDataPtr);
-        const GeomCacheFile::Color* __restrict pCeilGreens = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pCeilFrameDataPtr);
-        pFloorFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-        pCeilFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-
-        const GeomCacheFile::Color* __restrict pFloorBlues = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pFloorFrameDataPtr);
-        const GeomCacheFile::Color* __restrict pCeilBlues = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pCeilFrameDataPtr);
-        pFloorFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-        pCeilFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-
-        const GeomCacheFile::Color* __restrict pFloorAlphas = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pFloorFrameDataPtr);
-        const GeomCacheFile::Color* __restrict pCeilAlphas = !bAnimatedColors ? NULL :
-            reinterpret_cast<const GeomCacheFile::Color*>(pCeilFrameDataPtr);
-        pFloorFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-        pCeilFrameDataPtr += !bAnimatedColors ? 0 : ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15);
-
-        const Vec3 posConvertFactor = Vec3(1.0f / float((2 << (staticMeshData.m_positionPrecision[0] - 1)) - 1),
-                1.0f / float((2 << (staticMeshData.m_positionPrecision[1] - 1)) - 1),
-                1.0f / float((2 << (staticMeshData.m_positionPrecision[2] - 1)) - 1));
-
-#if AZ_LEGACY_3DENGINE_TRAIT_DO_EXTRA_GEOMCACHE_PROCESSING
-        const uint numVerticesPerIteration = 8;
-        const uint numPackedFloatsPerIteration = (numVerticesPerIteration * sizeof(Vec3)) / 16;
-        const uint numPackedUInt16PerIteration = (numVerticesPerIteration * sizeof(Vec3_tpl<uint16>)) / 16;
-        const uint numFloatsPerIteration = numVerticesPerIteration * (sizeof(Vec3) / sizeof(float));
-        const uint numFloatsPerPack = 4;
-        const uint numSIMDIterations = numVertices / numVerticesPerIteration;
-
-        float* pPrevPositionsF = updateContext.m_prevPositions.size() > 0 ? (float*)&updateContext.m_prevPositions[0] : NULL;
-        float* pVelocitiesF = (float*)&updateContext.m_pVelocities[0];
-        __m128i* pFloorPositions128 = (__m128i*)&pFloorPositions[0];
-        __m128i* pCeilPositions128 = (__m128i*)&pCeilPositions[0];
-
-        const __m128 lerpFactorPacked = _mm_set1_ps(lerpFactor);
-
-        __m128 convertFromUint16FactorPacked[numPackedFloatsPerIteration];
-        convertFromUint16FactorPacked[0] = _mm_setr_ps(posConvertFactor.x, posConvertFactor.y, posConvertFactor.z, posConvertFactor.x);
-        convertFromUint16FactorPacked[1] = _mm_setr_ps(posConvertFactor.y, posConvertFactor.z, posConvertFactor.x, posConvertFactor.y);
-        convertFromUint16FactorPacked[2] = _mm_setr_ps(posConvertFactor.z, posConvertFactor.x, posConvertFactor.y, posConvertFactor.z);
-        convertFromUint16FactorPacked[3] = _mm_setr_ps(posConvertFactor.x, posConvertFactor.y, posConvertFactor.z, posConvertFactor.x);
-        convertFromUint16FactorPacked[4] = _mm_setr_ps(posConvertFactor.y, posConvertFactor.z, posConvertFactor.x, posConvertFactor.y);
-        convertFromUint16FactorPacked[5] = _mm_setr_ps(posConvertFactor.z, posConvertFactor.x, posConvertFactor.y, posConvertFactor.z);
-
-        __m128 aabbMinPacked[numPackedFloatsPerIteration];
-        aabbMinPacked[0] = _mm_setr_ps(aabbMin.x, aabbMin.y, aabbMin.z, aabbMin.x);
-        aabbMinPacked[1] = _mm_setr_ps(aabbMin.y, aabbMin.z, aabbMin.x, aabbMin.y);
-        aabbMinPacked[2] = _mm_setr_ps(aabbMin.z, aabbMin.x, aabbMin.y, aabbMin.z);
-        aabbMinPacked[3] = _mm_setr_ps(aabbMin.x, aabbMin.y, aabbMin.z, aabbMin.x);
-        aabbMinPacked[4] = _mm_setr_ps(aabbMin.y, aabbMin.z, aabbMin.x, aabbMin.y);
-        aabbMinPacked[5] = _mm_setr_ps(aabbMin.z, aabbMin.x, aabbMin.y, aabbMin.z);
-
-        __m128 aabbSizePacked[numPackedFloatsPerIteration];
-        aabbSizePacked[0] = _mm_setr_ps(aabbSize.x, aabbSize.y, aabbSize.z, aabbSize.x);
-        aabbSizePacked[1] = _mm_setr_ps(aabbSize.y, aabbSize.z, aabbSize.x, aabbSize.y);
-        aabbSizePacked[2] = _mm_setr_ps(aabbSize.z, aabbSize.x, aabbSize.y, aabbSize.z);
-        aabbSizePacked[3] = _mm_setr_ps(aabbSize.x, aabbSize.y, aabbSize.z, aabbSize.x);
-        aabbSizePacked[4] = _mm_setr_ps(aabbSize.y, aabbSize.z, aabbSize.x, aabbSize.y);
-        aabbSizePacked[5] = _mm_setr_ps(aabbSize.z, aabbSize.x, aabbSize.y, aabbSize.z);
-
-        __m128 newPositions[numPackedFloatsPerIteration];
-        __m128 oldPositions[numPackedFloatsPerIteration];
-
-        for (unsigned int i = 0; i < numSIMDIterations; ++i)
-        {
-            const uint floatOffset = i * numFloatsPerIteration;
-
-            if constexpr (bMotionBlur && !bConstantPositions)
-            {
-                for (uint j = 0; j < numPackedFloatsPerIteration; ++j)
-                {
-                    oldPositions[j] = _mm_load_ps(&pPrevPositionsF[floatOffset + j * numFloatsPerPack]);
-                }
-            }
-
-            if (bConstantPositions)
-            {
-                for (uint j = 0; j < numVerticesPerIteration; ++j)
-                {
-                    const uint index = (i * numVerticesPerIteration) + j;
-                    updateContext.m_pPositions[index] = staticMeshData.m_positions[index];
-                }
-            }
-            else if (!bConstantPositions)
-            {
-                const __m128i zero = _mm_setzero_si128();
-
-                for (uint j = 0, k = 0; j < numPackedUInt16PerIteration; ++j, k += 2)
-                {
-                    const uint indexLo = k;
-                    const uint indexHi = k + 1;
-
-                    __m128i floorPositions = _mm_load_si128(pFloorPositions128 + (i * numPackedUInt16PerIteration) + j);
-                    __m128i ceilPositions = _mm_load_si128(pCeilPositions128 + (i * numPackedUInt16PerIteration) + j);
-
-                    // Unpack and convert to float [0, 1]
-                    __m128 floorLo = _mm_mul_ps(_mm_cvtepi32_ps(_mm_unpacklo_epi16(floorPositions, zero)), convertFromUint16FactorPacked[indexLo]);
-                    __m128 floorHi = _mm_mul_ps(_mm_cvtepi32_ps(_mm_unpackhi_epi16(floorPositions, zero)), convertFromUint16FactorPacked[indexHi]);
-                    __m128 ceilLo = _mm_mul_ps(_mm_cvtepi32_ps(_mm_unpacklo_epi16(ceilPositions, zero)), convertFromUint16FactorPacked[indexLo]);
-                    __m128 ceilHi = _mm_mul_ps(_mm_cvtepi32_ps(_mm_unpackhi_epi16(ceilPositions, zero)), convertFromUint16FactorPacked[indexHi]);
-
-                    // Convert to [aabbMin, aabbMax] range
-                    floorLo = _mm_add_ps(_mm_mul_ps(floorLo, aabbSizePacked[indexLo]), aabbMinPacked[indexLo]);
-                    floorHi = _mm_add_ps(_mm_mul_ps(floorHi, aabbSizePacked[indexHi]), aabbMinPacked[indexHi]);
-                    ceilLo = _mm_add_ps(_mm_mul_ps(ceilLo, aabbSizePacked[indexLo]), aabbMinPacked[indexLo]);
-                    ceilHi = _mm_add_ps(_mm_mul_ps(ceilHi, aabbSizePacked[indexHi]), aabbMinPacked[indexHi]);
-
-                    // Interpolate
-                    newPositions[indexLo] = _mm_add_ps(_mm_mul_ps(_mm_sub_ps(ceilLo, floorLo), lerpFactorPacked), floorLo);
-                    newPositions[indexHi] = _mm_add_ps(_mm_mul_ps(_mm_sub_ps(ceilHi, floorHi), lerpFactorPacked), floorHi);
-                }
-
-                // Store to scratch & prev position array
-                _MS_ALIGN(16) Vec3 positionScratch[numVerticesPerIteration];
-                float* __restrict pPositionScratch128 = (float*)&positionScratch[0];
-                for (uint j = 0; j < numPackedFloatsPerIteration; ++j)
-                {
-                    _mm_store_ps(pPositionScratch128 + j * numFloatsPerPack, newPositions[j]);
-                    _mm_store_ps(&pPrevPositionsF[floatOffset + j * numFloatsPerPack], newPositions[j]);
-                }
-
-                // Scatter to position vertex stream
-                for (uint j = 0; j < numVerticesPerIteration; ++j)
-                {
-                    const uint index = (i * numVerticesPerIteration) + j;
-                    updateContext.m_pPositions[index] = positionScratch[j];
-                }
-            }
-
-            for (uint j = 0; j < numVerticesPerIteration; ++j)
-            {
-                const uint index = (i * numVerticesPerIteration) + j;
-                DecodeAndInterpolateColorAndTexcoords<bConstantColors, bAnimatedColors, bConstantTexcoords>(updateContext, index, staticMeshData, fpLerpFactor, lerpFactor,
-                    pFloorReds, pCeilReds, pFloorGreens, pCeilGreens, pFloorBlues, pCeilBlues, pFloorAlphas, pCeilAlphas, pFloorTexcoords, pCeilTexcoords);
-            }
-
-            if (!bMotionBlur)
-            {
-                __m128 zero = _mm_setzero_ps();
-                for (uint j = 0; j < numPackedFloatsPerIteration; ++j)
-                {
-                    _mm_store_ps(&pVelocitiesF[floatOffset + j * numFloatsPerPack], zero);
-                }
-            }
-            else if (!bConstantPositions)
-            {
-                for (uint j = 0; j < numPackedFloatsPerIteration; ++j)
-                {
-                    __m128 motionVectors = _mm_sub_ps(oldPositions[j], newPositions[j]);
-                    _mm_store_ps(&pVelocitiesF[floatOffset + j * numFloatsPerPack], motionVectors);
-                }
-            }
-        }
-
-        const uint scalarStart = numSIMDIterations * numVerticesPerIteration;
-#else
-        const uint scalarStart = 0;
-#endif
-
-        for (unsigned int i = scalarStart; i < numVertices; ++i)
-        {
-            Vec3 newPosition;
-            Vec3 oldPosition;
-
-            if constexpr (bMotionBlur && !bConstantPositions)
-            {
-                oldPosition = updateContext.m_prevPositions[i];
-            }
-
-            if (bConstantPositions)
-            {
-                newPosition = staticMeshData.m_positions[i];
-            }
-            else if (!bConstantPositions)
-            {
-                newPosition = Vec3::CreateLerp(DecodePosition(aabbMin, aabbSize, pFloorPositions[i], posConvertFactor),
-                        DecodePosition(aabbMin, aabbSize, pCeilPositions[i], posConvertFactor), lerpFactor);
-            }
-
-            Vec3 oldPos = updateContext.m_pPositions[i];
-            updateContext.m_pPositions[i] = newPosition;
-            updateContext.m_prevPositions[i] = newPosition;
-
-            DecodeAndInterpolateColorAndTexcoords<bConstantColors, bAnimatedColors, bConstantTexcoords>(updateContext, i, staticMeshData, fpLerpFactor, lerpFactor,
-                pFloorReds, pCeilReds, pFloorGreens, pCeilGreens, pFloorBlues, pCeilBlues, pFloorAlphas, pCeilAlphas, pFloorTexcoords, pCeilTexcoords);
-
-            if (!bMotionBlur)
-            {
-                updateContext.m_pVelocities[i] = Vec3(0.0f, 0.0f, 0.0f);
-            }
-            else if (!bConstantPositions)
-            {
-                updateContext.m_pVelocities[i] = oldPosition - newPosition;
-            }
-        }
-
-        if constexpr (bConstantPositions && bConstantTexcoords)
-        {
-            for (unsigned int i = 0; i < numVertices; ++i)
-            {
-                updateContext.m_pTangents[i] = staticMeshData.m_tangents[i];
-            }
-        }
-        else
-        {
-            DecodeAndInterpolateTangents(numVertices, lerpFactor, pFloorQTangents, pCeilQTangents, updateContext.m_pTangents);
-        }
-    }
-
-    uint32 GetMeshDataSize(const SGeomCacheStaticMeshData& staticMeshData)
-    {
-        const unsigned int numVertices = staticMeshData.m_numVertices;
-
-        const GeomCacheFile::EStreams constantStreamMask = staticMeshData.m_constantStreams;
-        const GeomCacheFile::EStreams animatedStreamMask = staticMeshData.m_animatedStreams;
-
-        const bool bConstantPositions = (constantStreamMask& GeomCacheFile::eStream_Positions) != 0;
-        const bool bConstantTexcoords = (constantStreamMask& GeomCacheFile::eStream_Texcoords) != 0;
-        const bool bAnimatedColors = (animatedStreamMask& GeomCacheFile::eStream_Colors) != 0;
-
-        uint32 offset = 0;
-        offset += bConstantPositions ? 0 : ((numVertices * sizeof(GeomCacheFile::Position) + 15) & ~15);
-        offset += bConstantTexcoords ? 0 : ((numVertices * sizeof(GeomCacheFile::Texcoords) + 15) & ~15);
-        offset += (bConstantPositions && bConstantTexcoords) ? 0 : ((numVertices * sizeof(GeomCacheFile::QTangent) + 15) & ~15);
-        offset += !bAnimatedColors ? 0 : (4 * ((numVertices * sizeof(GeomCacheFile::Color) + 15) & ~15));
-
-        return offset;
-    }
-
-    typedef void (* TDecodeVerticesBranchlessPtr)(SGeomCacheRenderMeshUpdateContext& updateContext,
-        const SGeomCacheStaticMeshData& staticMeshData, const char* pFloorFrameDataPtr,
-        const char* pCeilFrameDataPtr, const float lerpFactor);
-
-    TDecodeVerticesBranchlessPtr pDecodeFunctions[kNumPermutations];
-
-    template <unsigned int Permutation>
-    struct PermutationInit
-    {
-        // Need two variables, because GCC otherwise complains about too many recursions
-        static TDecodeVerticesBranchlessPtr m_pFunction1;
-        static TDecodeVerticesBranchlessPtr m_pFunction2;
-    };
-
-    template <unsigned int Permutation>
-    TDecodeVerticesBranchlessPtr PermutationInit<Permutation>::m_pFunction1 = pDecodeFunctions[Permutation - 1]
-            = PermutationInit<Permutation - 1>::m_pFunction1 = &DecodeMeshVerticesBranchless<Permutation - 1>;
-    template<>
-    TDecodeVerticesBranchlessPtr PermutationInit<0>::m_pFunction1 = &DecodeMeshVerticesBranchless<0>;
-
-    template <unsigned int Permutation>
-    TDecodeVerticesBranchlessPtr PermutationInit<Permutation>::m_pFunction2 = pDecodeFunctions[Permutation - 1 + (kNumPermutations / 2)]
-            = PermutationInit<Permutation - 1>::m_pFunction2 = &DecodeMeshVerticesBranchless<Permutation - 1 + (kNumPermutations / 2)>;
-    template<>
-    TDecodeVerticesBranchlessPtr PermutationInit<0>::m_pFunction2 = &DecodeMeshVerticesBranchless<(kNumPermutations / 2)>;
-
-    // This forces the instantiation of PermutationInit<kNumPermutations / 2>::m_pFunction
-    // and therefore recursively initializes pDecodeFunctions with the DecodeVertices<N> permutations
-    template struct PermutationInit<kNumPermutations / 2>;
-
-    void DecodeIFrame(const CGeomCache* pGeomCache, char* pData)
-    {
-        // Skip header
-        pData += sizeof(GeomCacheFile::SFrameHeader);
-        const std::vector<SGeomCacheStaticMeshData>& staticMeshData = pGeomCache->GetStaticMeshData();
-
-        const uint numMeshes = staticMeshData.size();
-        for (uint i = 0; i < numMeshes; ++i)
-        {
-            const SGeomCacheStaticMeshData& currentStaticMeshData = staticMeshData[i];
-
-            if (currentStaticMeshData.m_animatedStreams == 0)
-            {
-                continue;
-            }
-
-            pData += sizeof(GeomCacheFile::SMeshFrameHeader);
-
-            const GeomCacheFile::EStreams streamMask = currentStaticMeshData.m_animatedStreams;
-            const bool bUsePrediction = currentStaticMeshData.m_bUsePredictor;
-            const uint numVertices = currentStaticMeshData.m_numVertices;
-
-            if (streamMask & GeomCacheFile::eStream_Positions)
-            {
-                if (bUsePrediction)
-                {
-                    GeomCacheFile::Position* pPositions = reinterpret_cast<GeomCacheFile::Position*>(pData);
-                    GeomCachePredictors::ParallelogramPredictor<GeomCacheFile::Position, false>(numVertices, pPositions, pPositions, currentStaticMeshData.m_predictorData);
-                }
-
-                pData += ((sizeof(GeomCacheFile::Position) * numVertices) + 15) & ~15;
-            }
-
-            if (streamMask & GeomCacheFile::eStream_Texcoords)
-            {
-                if (bUsePrediction)
-                {
-                    GeomCacheFile::Texcoords* pTexcoords = reinterpret_cast<GeomCacheFile::Texcoords*>(pData);
-                    GeomCachePredictors::ParallelogramPredictor<GeomCacheFile::Texcoords, false>(numVertices, pTexcoords, pTexcoords, currentStaticMeshData.m_predictorData);
-                }
-
-                pData += ((sizeof(GeomCacheFile::Texcoords) * numVertices) + 15) & ~15;
-            }
-
-            if (streamMask & GeomCacheFile::eStream_QTangents)
-            {
-                if (bUsePrediction)
-                {
-                    GeomCacheFile::QTangent* pQTangents = reinterpret_cast<GeomCacheFile::QTangent*>(pData);
-                    GeomCachePredictors::QTangentPredictor<false>(numVertices, pQTangents, pQTangents, currentStaticMeshData.m_predictorData);
-                }
-
-                pData += ((sizeof(GeomCacheFile::QTangent) * numVertices) + 15) & ~15;
-            }
-
-            if (streamMask & GeomCacheFile::eStream_Colors)
-            {
-                if (bUsePrediction)
-                {
-                    GeomCacheFile::Color* pReds = reinterpret_cast<GeomCacheFile::Color*>(pData);
-                    pData += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-                    GeomCacheFile::Color* pGreens = reinterpret_cast<GeomCacheFile::Color*>(pData);
-                    pData += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-                    GeomCacheFile::Color* pBlues = reinterpret_cast<GeomCacheFile::Color*>(pData);
-                    pData += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-                    GeomCacheFile::Color* pAlphas = reinterpret_cast<GeomCacheFile::Color*>(pData);
-                    pData += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-
-                    GeomCachePredictors::ColorPredictor<false>(numVertices, pReds, pReds, currentStaticMeshData.m_predictorData);
-                    GeomCachePredictors::ColorPredictor<false>(numVertices, pGreens, pGreens, currentStaticMeshData.m_predictorData);
-                    GeomCachePredictors::ColorPredictor<false>(numVertices, pBlues, pBlues, currentStaticMeshData.m_predictorData);
-                    GeomCachePredictors::ColorPredictor<false>(numVertices, pAlphas, pAlphas, currentStaticMeshData.m_predictorData);
-                }
-                else
-                {
-                    pData += 4 * ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-                }
-            }
-        }
-    }
-
-    void DecodeBFrame(const CGeomCache* pGeomCache, char* pData, char* pPrevFramesData[2], char* pFloorIndexFrameData, char* pCeilIndexFrameData)
-    {
-        // Skip header
-        size_t offset = sizeof(GeomCacheFile::SFrameHeader);
-        const std::vector<SGeomCacheStaticMeshData>& staticMeshData = pGeomCache->GetStaticMeshData();
-
-        const uint numMeshes = staticMeshData.size();
-        for (uint i = 0; i < numMeshes; ++i)
-        {
-            const SGeomCacheStaticMeshData& currentStaticMeshData = staticMeshData[i];
-
-            if (currentStaticMeshData.m_animatedStreams == 0)
-            {
-                continue;
-            }
-
-            const GeomCacheFile::SMeshFrameHeader* pFrameHeader = reinterpret_cast<GeomCacheFile::SMeshFrameHeader*>(pData + offset);
-            offset += sizeof(GeomCacheFile::SMeshFrameHeader);
-
-            if ((pFrameHeader->m_flags & GeomCacheFile::eFrameFlags_Hidden) != 0)
-            {
-                offset += GetMeshDataSize(currentStaticMeshData);
-                continue;
-            }
-
-            const GeomCacheFile::EStreams streamMask = currentStaticMeshData.m_animatedStreams;
-            const uint numVertices = currentStaticMeshData.m_numVertices;
-
-            if (streamMask & GeomCacheFile::eStream_Positions)
-            {
-                GeomCacheFile::Position* pPositions = reinterpret_cast<GeomCacheFile::Position*>(pData + offset);
-                GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Position> predictorData;
-                predictorData.m_numElements = numVertices;
-                predictorData.m_pPrevFrames[0] = reinterpret_cast<GeomCacheFile::Position*>(pPrevFramesData[0] + offset);
-                predictorData.m_pPrevFrames[1] = reinterpret_cast<GeomCacheFile::Position*>(pPrevFramesData[1] + offset);
-                predictorData.m_pFloorFrame = reinterpret_cast<GeomCacheFile::Position*>(pFloorIndexFrameData + offset);
-                predictorData.m_pCeilFrame = reinterpret_cast<GeomCacheFile::Position*>(pCeilIndexFrameData + offset);
-
-                typedef Vec3_tpl<uint32> I;
-                GeomCachePredictors::InterpolateMotionDeltaPredictor<I, GeomCacheFile::Position, false>
-                    (pFrameHeader->m_positionStreamPredictorControl, predictorData, pPositions, pPositions);
-
-                offset += ((sizeof(GeomCacheFile::Position) * numVertices) + 15) & ~15;
-            }
-
-            if (streamMask & GeomCacheFile::eStream_Texcoords)
-            {
-                GeomCacheFile::Texcoords* pTexcoords = reinterpret_cast<GeomCacheFile::Texcoords*>(pData + offset);
-                GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Texcoords> predictorData;
-                predictorData.m_numElements = numVertices;
-                predictorData.m_pPrevFrames[0] = reinterpret_cast<GeomCacheFile::Texcoords*>(pPrevFramesData[0] + offset);
-                predictorData.m_pPrevFrames[1] = reinterpret_cast<GeomCacheFile::Texcoords*>(pPrevFramesData[1] + offset);
-                predictorData.m_pFloorFrame = reinterpret_cast<GeomCacheFile::Texcoords*>(pFloorIndexFrameData + offset);
-                predictorData.m_pCeilFrame = reinterpret_cast<GeomCacheFile::Texcoords*>(pCeilIndexFrameData + offset);
-
-                typedef Vec2_tpl<uint32> I;
-                GeomCachePredictors::InterpolateMotionDeltaPredictor<I, GeomCacheFile::Texcoords, false>
-                    (pFrameHeader->m_texcoordStreamPredictorControl, predictorData, pTexcoords, pTexcoords);
-
-                offset += ((sizeof(GeomCacheFile::Texcoords) * numVertices) + 15) & ~15;
-            }
-
-            if (streamMask & GeomCacheFile::eStream_QTangents)
-            {
-                GeomCacheFile::QTangent* pQTangents = reinterpret_cast<GeomCacheFile::QTangent*>(pData + offset);
-                GeomCachePredictors::STemporalPredictorData<GeomCacheFile::QTangent> predictorData;
-                predictorData.m_numElements = numVertices;
-                predictorData.m_pPrevFrames[0] = reinterpret_cast<GeomCacheFile::QTangent*>(pPrevFramesData[0] + offset);
-                predictorData.m_pPrevFrames[1] = reinterpret_cast<GeomCacheFile::QTangent*>(pPrevFramesData[1] + offset);
-                predictorData.m_pFloorFrame = reinterpret_cast<GeomCacheFile::QTangent*>(pFloorIndexFrameData + offset);
-                predictorData.m_pCeilFrame = reinterpret_cast<GeomCacheFile::QTangent*>(pCeilIndexFrameData + offset);
-
-                typedef Vec4_tpl<uint32> I;
-                GeomCachePredictors::InterpolateMotionDeltaPredictor<I, GeomCacheFile::QTangent, false>
-                    (pFrameHeader->m_qTangentStreamPredictorControl, predictorData, pQTangents, pQTangents);
-
-                offset += ((sizeof(GeomCacheFile::QTangent) * numVertices) + 15) & ~15;
-            }
-
-            if (streamMask & GeomCacheFile::eStream_Colors)
-            {
-                GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Color> predictorData;
-                typedef uint16 I;
-
-                GeomCacheFile::Color* pReds = reinterpret_cast<GeomCacheFile::Color*>(pData + offset);
-                predictorData.m_numElements = numVertices;
-                predictorData.m_pPrevFrames[0] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[0] + offset);
-                predictorData.m_pPrevFrames[1] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[1] + offset);
-                predictorData.m_pFloorFrame = reinterpret_cast<GeomCacheFile::Color*>(pFloorIndexFrameData + offset);
-                predictorData.m_pCeilFrame = reinterpret_cast<GeomCacheFile::Color*>(pCeilIndexFrameData + offset);
-
-                GeomCachePredictors::InterpolateMotionDeltaPredictor<I, GeomCacheFile::Color, false>
-                    (pFrameHeader->m_colorStreamPredictorControl[0], predictorData, pReds, pReds);
-
-                offset += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-
-                GeomCacheFile::Color* pGreens = reinterpret_cast<GeomCacheFile::Color*>(pData + offset);
-                predictorData.m_numElements = numVertices;
-                predictorData.m_pPrevFrames[0] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[0] + offset);
-                predictorData.m_pPrevFrames[1] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[1] + offset);
-                predictorData.m_pFloorFrame = reinterpret_cast<GeomCacheFile::Color*>(pFloorIndexFrameData + offset);
-                predictorData.m_pCeilFrame = reinterpret_cast<GeomCacheFile::Color*>(pCeilIndexFrameData + offset);
-
-                GeomCachePredictors::InterpolateMotionDeltaPredictor<I, GeomCacheFile::Color, false>
-                    (pFrameHeader->m_colorStreamPredictorControl[1], predictorData, pGreens, pGreens);
-
-                offset += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-
-                GeomCacheFile::Color* pBlues = reinterpret_cast<GeomCacheFile::Color*>(pData + offset);
-                predictorData.m_numElements = numVertices;
-                predictorData.m_pPrevFrames[0] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[0] + offset);
-                predictorData.m_pPrevFrames[1] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[1] + offset);
-                predictorData.m_pFloorFrame = reinterpret_cast<GeomCacheFile::Color*>(pFloorIndexFrameData + offset);
-                predictorData.m_pCeilFrame = reinterpret_cast<GeomCacheFile::Color*>(pCeilIndexFrameData + offset);
-
-                GeomCachePredictors::InterpolateMotionDeltaPredictor<I, GeomCacheFile::Color, false>
-                    (pFrameHeader->m_colorStreamPredictorControl[2], predictorData, pBlues, pBlues);
-
-                offset += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-
-                GeomCacheFile::Color* pAlphas = reinterpret_cast<GeomCacheFile::Color*>(pData + offset);
-                predictorData.m_numElements = numVertices;
-                predictorData.m_pPrevFrames[0] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[0] + offset);
-                predictorData.m_pPrevFrames[1] = reinterpret_cast<GeomCacheFile::Color*>(pPrevFramesData[1] + offset);
-                predictorData.m_pFloorFrame = reinterpret_cast<GeomCacheFile::Color*>(pFloorIndexFrameData + offset);
-                predictorData.m_pCeilFrame = reinterpret_cast<GeomCacheFile::Color*>(pCeilIndexFrameData + offset);
-
-                GeomCachePredictors::InterpolateMotionDeltaPredictor<I, GeomCacheFile::Color, false>
-                    (pFrameHeader->m_colorStreamPredictorControl[3], predictorData, pAlphas, pAlphas);
-
-                offset += ((sizeof(GeomCacheFile::Color) * numVertices) + 15) & ~15;
-            }
-        }
-    }
-
-    bool PrepareFillMeshData([[maybe_unused]] SGeomCacheRenderMeshUpdateContext& updateContext, const SGeomCacheStaticMeshData& staticMeshData,
-        const char*& pFloorFrameMeshData, const char*& pCeilFrameMeshData, size_t& offsetToNextMesh, float& lerpFactor)
-    {
-        const GeomCacheFile::SMeshFrameHeader* pFloorHeader = reinterpret_cast<const GeomCacheFile::SMeshFrameHeader* const>(pFloorFrameMeshData);
-        const GeomCacheFile::SMeshFrameHeader* pCeilHeader = reinterpret_cast<const GeomCacheFile::SMeshFrameHeader* const>(pCeilFrameMeshData);
-
-        pFloorFrameMeshData += sizeof(GeomCacheFile::SMeshFrameHeader);
-        pCeilFrameMeshData += sizeof(GeomCacheFile::SMeshFrameHeader);
-
-        const bool bFloorFrameHidden = (pFloorHeader->m_flags & GeomCacheFile::eFrameFlags_Hidden) != 0;
-        const bool bCeilFrameHidden = (pCeilHeader->m_flags & GeomCacheFile::eFrameFlags_Hidden) != 0;
-
-        offsetToNextMesh = GetMeshDataSize(staticMeshData);
-
-        if (bFloorFrameHidden && bCeilFrameHidden)
-        {
-            return false;
-        }
-        else if (bFloorFrameHidden)
-        {
-            lerpFactor = 1.0f;
-        }
-        else if (bCeilFrameHidden)
-        {
-            lerpFactor = 0.0f;
-        }
-
-#if defined(CONSOLE_CONST_CVAR_MODE)
-        if constexpr (CVars::e_GeomCacheLerpBetweenFrames == 0)
-#else
-        if (Cry3DEngineBase::m_pCVars->e_GeomCacheLerpBetweenFrames == 0)
-#endif
-        {
-            pCeilFrameMeshData = pFloorFrameMeshData;
-            lerpFactor = 0.0f;
-        }
-
-        return true;
-    }
-
-    void FillMeshDataFromDecodedFrame(const bool bMotionBlur, SGeomCacheRenderMeshUpdateContext& updateContext,
-        const SGeomCacheStaticMeshData& staticMeshData, const char* pFloorFrameMeshData, const char* pCeilFrameMeshData, float lerpFactor)
-    {
-        // Fetch indices from static data
-        const uint numIndices = staticMeshData.m_indices.size();
-        for (uint i = 0; i < numIndices; ++i)
-        {
-            updateContext.m_pIndices[i] = staticMeshData.m_indices[i];
-        }
-
-        const uint permutation = GetDecodeVerticesPerm(bMotionBlur, staticMeshData.m_constantStreams, staticMeshData.m_animatedStreams);
-        TDecodeVerticesBranchlessPtr pDecodeFunction = pDecodeFunctions[permutation];
-        (*pDecodeFunction)(updateContext, staticMeshData, pFloorFrameMeshData, pCeilFrameMeshData, lerpFactor);
-    }
-
-    Vec3 DecodePosition(const Vec3& aabbMin, const Vec3& aabbSize, const GeomCacheFile::Position& inPosition, const Vec3& convertFactor)
-    {
-        return Vec3(aabbMin.x + ((float)inPosition.x * convertFactor.x) * aabbSize.x,
-            aabbMin.y + ((float)inPosition.y * convertFactor.y) * aabbSize.y,
-            aabbMin.z + ((float)inPosition.z * convertFactor.z) * aabbSize.z);
-    }
-
-    Vec2 DecodeTexcoord(const GeomCacheFile::Texcoords& inTexcoords, float uvMax)
-    {
-        const float convertFromInt16Factor = 1.0f / 32767.0f;
-
-        return Vec2((float)inTexcoords.x * convertFromInt16Factor * uvMax,
-            (float)inTexcoords.y * convertFromInt16Factor * uvMax);
-    }
-
-    Quat DecodeQTangent(const GeomCacheFile::QTangent& inQTangent)
-    {
-        const float kMultiplier = float((2 << (GeomCacheFile::kTangentQuatPrecision - 1)) - 1);
-        const float convertFromInt16Factor = 1.0f / kMultiplier;
-
-        return Quat((float)inQTangent.w * convertFromInt16Factor, (float)inQTangent.x * convertFromInt16Factor,
-            (float)inQTangent.y * convertFromInt16Factor, (float)inQTangent.z * convertFromInt16Factor);
-    }
-
-    void TransformAndConvertToTangentAndBitangent(const Quat& rotation, const Quat& inQTangent, SPipTangents& outTangents)
-    {
-        int16 reflection = alias_cast<uint32>(inQTangent.w) & 0x80000000 ? -1 : +1;
-        Quat transformedQTangent = rotation * inQTangent;
-
-        outTangents = SPipTangents(transformedQTangent, reflection);
-    }
-
-    void ConvertToTangentAndBitangent(const Quat& inQTangent, SPipTangents& outTangents)
-    {
-        int16 reflection = alias_cast<uint32>(inQTangent.w) & 0x80000000 ? -1 : +1;
-
-        outTangents = SPipTangents(inQTangent, reflection);
-    }
-
-    uint32 GetDecompressBufferSize(const char* const pStartBlock, const unsigned int numFrames)
-    {
-        FUNCTION_PROFILER_3DENGINE;
-
-        uint32 totalUncompressedSize = 0;
-        const char* pCurrentBlock = pStartBlock;
-
-        const uint32 headersSize = ((sizeof(SGeomCacheFrameHeader) * numFrames) + 15) & ~15;
-
-        for (unsigned int i = 0; i < numFrames; ++i)
-        {
-            const GeomCacheFile::SCompressedBlockHeader* pBlockHeader = reinterpret_cast<const GeomCacheFile::SCompressedBlockHeader*>(pCurrentBlock);
-            pCurrentBlock += sizeof(GeomCacheFile::SCompressedBlockHeader) + pBlockHeader->m_compressedSize;
-            totalUncompressedSize += pBlockHeader->m_uncompressedSize;
-        }
-
-        uint32 totalSize = headersSize + totalUncompressedSize;
-        if (totalSize % 16 != 0)
-        {
-            CryFatalError("GetDecompressBufferSize mod 16 != 0");
-        }
-
-        return totalSize;
-    }
-
-    bool DecompressBlock(const GeomCacheFile::EBlockCompressionFormat compressionFormat, char* const pDest, const char* const pSource)
-    {
-        FUNCTION_PROFILER_3DENGINE;
-
-        const GeomCacheFile::SCompressedBlockHeader* const pBlockHeader = reinterpret_cast<const GeomCacheFile::SCompressedBlockHeader* const>(pSource);
-        const char* const pBlockData = reinterpret_cast<const char* const>(pSource + sizeof(GeomCacheFile::SCompressedBlockHeader));
-
-        if (compressionFormat == GeomCacheFile::eBlockCompressionFormat_None)
-        {
-            assert(pBlockHeader->m_compressedSize == pBlockHeader->m_uncompressedSize);
-            memcpy(const_cast<char*>(pDest), pSource + sizeof(GeomCacheFile::SCompressedBlockHeader), pBlockHeader->m_uncompressedSize);
-        }
-        else if (compressionFormat == GeomCacheFile::eBlockCompressionFormat_Deflate)
-        {
-            IZLibInflateStream* pInflateStream = GetISystem()->GetIZLibDecompressor()->CreateInflateStream();
-
-            pInflateStream->SetOutputBuffer(const_cast<char*>(pDest), pBlockHeader->m_uncompressedSize);
-            pInflateStream->Input(pBlockData, pBlockHeader->m_compressedSize);
-            pInflateStream->EndInput();
-            EZInflateState state = pInflateStream->GetState();
-            assert(state == eZInfState_Finished);
-            pInflateStream->Release();
-
-            if (state == eZInfState_Error)
-            {
-                return false;
-            }
-        }
-        else if (compressionFormat == GeomCacheFile::eBlockCompressionFormat_LZ4HC)
-        {
-            ILZ4Decompressor* pDecompressor = GetISystem()->GetLZ4Decompressor();
-            return pDecompressor->DecompressData(pBlockData, const_cast<char*>(pDest), pBlockHeader->m_uncompressedSize);
-        }
-        else if (compressionFormat == GeomCacheFile::eBlockCompressionFormat_ZSTD)
-        {
-            IZStdDecompressor* pDecompressor = GetISystem()->GetZStdDecompressor();
-            return pDecompressor->DecompressData(pBlockData, pBlockHeader->m_compressedSize, const_cast<char*>(pDest), pBlockHeader->m_uncompressedSize);
-        }
-        else
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    bool DecompressBlocks(const GeomCacheFile::EBlockCompressionFormat compressionFormat, char* const pDest,
-        const char* const pSource, const uint blockOffset, const uint numBlocks, const uint numHandleFrames)
-    {
-        FUNCTION_PROFILER_3DENGINE;
-
-        const char* pCurrentSource = pSource;
-        const uint32 headersSize = ((sizeof(SGeomCacheFrameHeader) * numHandleFrames) + 15) & ~15;
-        char* pCurrentDest = pDest + headersSize;
-
-        for (uint i = 0; i < blockOffset; ++i)
-        {
-            const GeomCacheFile::SCompressedBlockHeader* const pBlockHeader = reinterpret_cast<const GeomCacheFile::SCompressedBlockHeader* const>(pCurrentSource);
-            pCurrentSource += sizeof(GeomCacheFile::SCompressedBlockHeader) + pBlockHeader->m_compressedSize;
-            pCurrentDest += pBlockHeader->m_uncompressedSize;
-        }
-
-        for (uint i = blockOffset; i < blockOffset + numBlocks; ++i)
-        {
-            const GeomCacheFile::SCompressedBlockHeader* const pBlockHeader = reinterpret_cast<const GeomCacheFile::SCompressedBlockHeader* const>(pCurrentSource);
-
-            if (!DecompressBlock(compressionFormat, pCurrentDest, pCurrentSource))
-            {
-                return false;
-            }
-
-            SGeomCacheFrameHeader* pHeader = reinterpret_cast<SGeomCacheFrameHeader*>(pDest + i * sizeof(SGeomCacheFrameHeader));
-            pHeader->m_offset = static_cast<uint32>(pCurrentDest - pDest);
-            pHeader->m_state = SGeomCacheFrameHeader::eFHS_Undecoded;
-
-            pCurrentSource += sizeof(GeomCacheFile::SCompressedBlockHeader) + pBlockHeader->m_compressedSize;
-            pCurrentDest += pBlockHeader->m_uncompressedSize;
-        }
-
-        return true;
-    }
-}
-
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheDecoder.h b/Code/CryEngine/Cry3DEngine/GeomCacheDecoder.h
deleted file mode 100644
index cdbb2cb9f9..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheDecoder.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Decodes geom cache data
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_GEOMCACHEDECODER_H
-#define CRYINCLUDE_CRY3DENGINE_GEOMCACHEDECODER_H
-#pragma once
-
-#if defined(USE_GEOM_CACHES)
-
-#include "GeomCacheFileFormat.h"
-
-class CGeomCache;
-struct SGeomCacheRenderMeshUpdateContext;
-struct SGeomCacheStaticMeshData;
-
-struct SGeomCacheFrameHeader
-{
-    enum EFrameHeaderState
-    {
-        eFHS_Uninitialized = 0,
-        eFHS_Undecoded = 1,
-        eFHS_Decoded = 2
-    };
-
-    EFrameHeaderState m_state;
-    uint32 m_offset;
-};
-
-namespace GeomCacheDecoder
-{
-    // Decodes an index frame
-    void DecodeIFrame(const CGeomCache* pGeomCache, char* pData);
-
-    // Decodes a bi-directional predicted frame
-    void DecodeBFrame(const CGeomCache * pGeomCache, char* pData, char* pPrevFramesData[2],
-        char* pFloorIndexFrameData, char* pCeilIndexFrameData);
-
-    bool PrepareFillMeshData(SGeomCacheRenderMeshUpdateContext& updateContext, const SGeomCacheStaticMeshData& staticMeshData,
-        const char*& pFloorFrameMeshData, const char*& pCeilFrameMeshData, size_t& offsetToNextMesh, float& lerpFactor);
-
-    void FillMeshDataFromDecodedFrame(const bool bMotionBlur, SGeomCacheRenderMeshUpdateContext& updateContext,
-        const SGeomCacheStaticMeshData& staticMeshData, const char* pFloorFrameMeshData,
-        const char* pCeilFrameMeshData, float lerpFactor);
-
-    // Gets total needed space for uncompressing successive blocks
-    uint32 GetDecompressBufferSize(const char* const pStartBlock,  const uint numFrames);
-
-    // Decompresses one block of compressed data with header for input
-    bool DecompressBlock(const GeomCacheFile::EBlockCompressionFormat compressionFormat, char* const pDest, const char* const pSource);
-
-    // Decompresses blocks of compressed data with headers for input and output
-    bool DecompressBlocks(const GeomCacheFile::EBlockCompressionFormat compressionFormat, char* const pDest,
-        const char* const pSource, const uint blockOffset, const uint numBlocks, const uint numHandleFrames);
-
-    Vec3 DecodePosition(const Vec3& aabbMin, const Vec3& aabbSize, const GeomCacheFile::Position& inPosition, const Vec3& convertFactor);
-    Vec2 DecodeTexcoord(const GeomCacheFile::Texcoords& inTexcoords, float uvMax);
-    Quat DecodeQTangent(const GeomCacheFile::QTangent& inQTangent);
-
-    void TransformAndConvertToTangentAndBitangent(const Quat& rotation, const Quat& inQTangent, SPipTangents& outTangents);
-    void ConvertToTangentAndBitangent(const Quat& inQTangent, SPipTangents& outTangents);
-};
-
-#endif
-#endif // CRYINCLUDE_CRY3DENGINE_GEOMCACHEDECODER_H
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheManager.cpp b/Code/CryEngine/Cry3DEngine/GeomCacheManager.cpp
deleted file mode 100644
index 6547e786fe..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheManager.cpp
+++ /dev/null
@@ -1,1793 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Manages geometry cache instances and streaming
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#if defined(USE_GEOM_CACHES)
-
-#include "GeomCacheManager.h"
-#include "GeomCache.h"
-#include "GeomCacheRenderNode.h"
-#include "Cry_Color.h"
-
-namespace
-{
-    const uint kMinBufferSizeInMiB = 8;
-    const uint kMaxBufferSizeInMiB = 2048;
-}
-
-CGeomCacheManager::CGeomCacheManager()
-    : m_pPoolBaseAddress(NULL)
-    , m_pPool(NULL)
-    , m_poolSize(0)
-    , m_lastRequestStream(0)
-    , m_numMissedFrames(0)
-    , m_numStreamAborts(0)
-    , m_numErrorAborts(0)
-    , m_numDecompressStreamAborts(0)
-    , m_numReadStreamAborts(0)
-    , m_numFailedAllocs(0)
-{
-    ChangeBufferSize(GetCVars()->e_GeomCacheBufferSize);
-
-    ICVar* pGeomCacheBufferSizeCVar = gEnv->pConsole->GetCVar("e_GeomCacheBufferSize");
-    if (pGeomCacheBufferSizeCVar)
-    {
-        pGeomCacheBufferSizeCVar->SetOnChangeCallback(&CGeomCacheManager::OnChangeBufferSize);
-    }
-
-    // Connect for LegacyAssetEventBus::Handler
-    BusConnect(AZ_CRC("cax", 0x97e80f83));
-}
-
-CGeomCacheManager::~CGeomCacheManager()
-{
-    Reset();
-    UnloadGeomCaches();
-
-    if (!gEnv->IsDedicated())
-    {
-        m_pPool->Release();
-        m_pPool = NULL;
-
-        CryMemory::FreePages(m_pPoolBaseAddress, m_poolSize);
-    }
-    // Disconnect for LegacyAssetEventBus::Handler
-    BusDisconnect();
-}
-
-void CGeomCacheManager::Reset()
-{
-    const uint numStreams = m_streamInfos.size();
-    for (uint i = 0; i < numStreams; ++i)
-    {
-        SGeomCacheStreamInfo* pStreamInfo = m_streamInfos[i];
-        AbortStreamAndWait(*pStreamInfo);
-        delete pStreamInfo;
-    }
-
-    stl::free_container(m_streamInfos);
-
-    GetMeshManager().Reset();
-}
-
-void CGeomCacheManager::StopCacheStreamsAndWait(CGeomCache* pGeomCache)
-{
-    const uint numStreams = m_streamInfos.size();
-    for (uint i = 0; i < numStreams; ++i)
-    {
-        SGeomCacheStreamInfo* pStreamInfo = m_streamInfos[i];
-        if (pStreamInfo->m_pGeomCache == pGeomCache)
-        {
-            AbortStreamAndWait(*pStreamInfo);
-        }
-    }
-}
-
-CGeomCache* CGeomCacheManager::FindGeomCacheByFilename(const char* filename)
-{
-    return stl::find_in_map(m_nameToGeomCacheMap, CONST_TEMP_STRING(filename), NULL);
-}
-
-CGeomCache* CGeomCacheManager::LoadGeomCache(const char* szFileName)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    
-    // Normalize file name
-    char sFilename[_MAX_PATH];
-
-    // Remap %level% alias if needed an unify filename
-    int nAliasNameLen = sizeof("%level%") - 1;
-    if (strncmp(szFileName, "%level%", nAliasNameLen) == 0)
-    {
-        cry_strcpy(sFilename, Get3DEngine()->GetLevelFilePath(szFileName + nAliasNameLen));
-    }
-    else
-    {
-        cry_strcpy(sFilename, szFileName);
-    }
-    std::replace(sFilename, sFilename + strlen(sFilename), '\\', '/'); // To Unix Path
-
-    // Try to find existing object for that file
-    CGeomCache* pGeomCache = stl::find_in_map(m_nameToGeomCacheMap, CONST_TEMP_STRING(sFilename), NULL);
-    if (pGeomCache)
-    {
-        return pGeomCache;
-    }
-
-    // Load geom cache
-    pGeomCache = new CGeomCache(sFilename);
-    m_nameToGeomCacheMap[sFilename] = pGeomCache;
-    return pGeomCache;
-}
-
-void CGeomCacheManager::UnloadGeomCaches()
-{
-    for (TGeomCacheMap::iterator iter = m_nameToGeomCacheMap.begin(); iter != m_nameToGeomCacheMap.end(); ++iter)
-    {
-        delete iter->second;
-    }
-
-    stl::free_container(m_nameToGeomCacheMap);
-}
-
-void CGeomCacheManager::DeleteGeomCache(CGeomCache* pGeomCache)
-{
-    const char* pFilename = pGeomCache->GetFilePath();
-    m_nameToGeomCacheMap.erase(pFilename);
-    delete pGeomCache;
-}
-
-void CGeomCacheManager::RegisterForStreaming(CGeomCacheRenderNode* pRenderNode)
-{
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    if (!pRenderNode)
-    {
-        return;
-    }
-
-    for (uint i = 0; i < m_streamInfos.size(); ++i)
-    {
-        const SGeomCacheStreamInfo* pStreamInfo = m_streamInfos[i];
-        if (pStreamInfo->m_pRenderNode == pRenderNode)
-        {
-            return;
-        }
-    }
-
-    CGeomCache* pGeomCache = static_cast<CGeomCache*>(pRenderNode->GetGeomCache());
-    pGeomCache->IncreaseNumStreams();
-
-    const uint numFrames = pGeomCache->GetNumFrames();
-
-    SGeomCacheStreamInfo* pStreamInfo = new SGeomCacheStreamInfo(pRenderNode, pGeomCache, numFrames);
-    m_streamInfos.push_back(pStreamInfo);
-
-    // If cache is too short we need to allocate double the amount of frame data. Otherwise we can't loop without aborts,
-    // because IssueDiskReadRequest prevents the same frame info from being used twice.
-    const uint preferredDiskRequestSize = (size_t)std::max(0, GetCVars()->e_GeomCachePreferredDiskRequestSize * 1024);
-    const uint64 compressedAnimationDataSize = pGeomCache->GetCompressedAnimationDataSize();
-
-    const float maxBufferAheadTime = std::max(1.0f, GetCVars()->e_GeomCacheMaxBufferAheadTime);
-    const float duration = pGeomCache->GetDuration();
-
-    const bool bNeedDoubleFrameData = (compressedAnimationDataSize < (preferredDiskRequestSize * 2)) || (duration < (maxBufferAheadTime * 2));
-
-    const uint numFrameData = bNeedDoubleFrameData ? (numFrames * 2) : numFrames;
-    pStreamInfo->m_frameData.resize(numFrameData);
-    ReinitializeStreamFrameData(*pStreamInfo, 0, numFrameData - 1);
-}
-
-void CGeomCacheManager::OnFileChanged(AZStd::string assetPath)
-{
-    CGeomCache* geomCache = FindGeomCacheByFilename(assetPath.c_str());
-    if (geomCache)
-    {
-        geomCache->Reload();
-    }
-}
-
-void CGeomCacheManager::OnChangeBufferSize(ICVar* pCVar)
-{
-    GetGeomCacheManager()->ChangeBufferSize(pCVar->GetIVal());
-}
-
-void CGeomCacheManager::ChangeBufferSize(const uint newSizeInMiB)
-{
-    const uint numStreams = m_streamInfos.size();
-    for (uint i = 0; i < numStreams; ++i)
-    {
-        SGeomCacheStreamInfo* pStreamInfo = m_streamInfos[i];
-        AbortStreamAndWait(*pStreamInfo);
-    }
-
-    if (!gEnv->IsDedicated())
-    {
-        SAFE_RELEASE(m_pPool);
-        if (m_pPoolBaseAddress)
-        {
-            CryMemory::FreePages(m_pPoolBaseAddress, m_poolSize);
-        }
-
-        const int geomCacheBufferSize = clamp_tpl(newSizeInMiB, kMinBufferSizeInMiB, kMaxBufferSizeInMiB);
-        GetCVars()->e_GeomCacheBufferSize = geomCacheBufferSize;
-
-        const uint kMiBtoBytesFactor = 1024 * 1024;
-        m_poolSize = geomCacheBufferSize * kMiBtoBytesFactor;
-
-        m_pPoolBaseAddress = CryMemory::AllocPages(m_poolSize);
-        m_pPool = gEnv->pSystem->GetIMemoryManager()->CreateGeneralMemoryHeap(m_pPoolBaseAddress, m_poolSize, "GEOMCACHE_POOL");
-    }
-}
-
-void CGeomCacheManager::ReinitializeStreamFrameData(SGeomCacheStreamInfo& streamInfo, uint startFrame, uint endFrame)
-{
-    const CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-
-    const uint frameDataSize = streamInfo.m_frameData.size();
-    startFrame = std::min(frameDataSize - 1, startFrame);
-    endFrame = std::min(frameDataSize - 1, endFrame);
-
-    for (uint i = startFrame; i <= endFrame; ++i)
-    {
-        SGeomCacheStreamInfo::SFrameData& frameData = streamInfo.m_frameData[i];
-
-        frameData.m_bDecompressJobLaunched = false;
-        frameData.m_pDecompressHandle = NULL;
-
-        const GeomCacheFile::EFrameType frameType = pGeomCache->GetFrameType(i);
-
-        if (frameType == GeomCacheFile::eFrameType_IFrame)
-        {
-            frameData.m_decodeDependencyCounter = 1;
-        }
-        else if (frameType == GeomCacheFile::eFrameType_BFrame)
-        {
-            assert(i > 0);
-
-            if (pGeomCache->GetFrameType(i - 1) == GeomCacheFile::eFrameType_IFrame)
-            {
-                frameData.m_decodeDependencyCounter = 3;
-            }
-            else
-            {
-                frameData.m_decodeDependencyCounter = 2;
-            }
-        }
-    }
-}
-
-void CGeomCacheManager::UnRegisterForStreaming(CGeomCacheRenderNode* pRenderNode, bool bWaitForJobs)
-{
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    TStreamInfosIter iter = m_streamInfos.begin();
-    while (iter != m_streamInfos.end())
-    {
-        SGeomCacheStreamInfo* pStreamInfo = *iter;
-        if (pStreamInfo->m_pRenderNode == pRenderNode)
-        {
-            if (pStreamInfo->m_pNewestReadRequestHandle || pStreamInfo->m_pOldestDecompressHandle)
-            {
-                gEnv->pLog->LogWarning("Unregistering stream %s while still active", pStreamInfo->m_pRenderNode->GetName());
-            }
-
-            if (!bWaitForJobs)
-            {
-                AbortStream(*pStreamInfo);
-            }
-            else
-            {
-                AbortStreamAndWait(*pStreamInfo);
-            }
-
-            m_streamInfosAbortList.push_back(pStreamInfo);
-            iter = m_streamInfos.erase(iter);
-        }
-        else
-        {
-            ++iter;
-        }
-    }
-
-    RetireRemovedStreams();
-}
-
-void CGeomCacheManager::StreamingUpdate()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const bool bCachesActive = GetCVars()->e_GeomCaches != 0;
-
-    RetireRemovedStreams();
-
-    const uint numStreams = m_streamInfos.size();
-    for (uint i = 0; i < numStreams; ++i)
-    {
-        SGeomCacheStreamInfo& streamInfo = *m_streamInfos[i];
-
-        {
-            FRAME_PROFILER("CGeomCacheManager::StreamingUpdate_WaitForLastFillJob", GetSystem(), PROFILE_3DENGINE);
-            streamInfo.m_fillRenderNodeJobExecutor.WaitForCompletion();
-        }
-
-        // Update wanted playback frame
-        CGeomCacheRenderNode* pRenderNode = streamInfo.m_pRenderNode;
-        const CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-        streamInfo.m_wantedPlaybackTime = pRenderNode->GetPlaybackTime();
-        streamInfo.m_wantedFloorFrame = pGeomCache->GetFloorFrameIndex(streamInfo.m_wantedPlaybackTime);
-        streamInfo.m_wantedCeilFrame = pGeomCache->GetCeilFrameIndex(streamInfo.m_wantedPlaybackTime);
-        streamInfo.m_bLooping = streamInfo.m_pRenderNode->IsLooping();
-
-        if (!streamInfo.m_bLooping)
-        {
-            const uint numFrames = streamInfo.m_numFrames;
-            streamInfo.m_wantedFloorFrame = std::min((uint)streamInfo.m_wantedFloorFrame, numFrames - 1);
-            streamInfo.m_wantedCeilFrame = std::min((uint)streamInfo.m_wantedCeilFrame, numFrames - 1);
-        }
-
-        assert(streamInfo.m_wantedFloorFrame + 1 == streamInfo.m_wantedCeilFrame
-            || streamInfo.m_wantedFloorFrame == streamInfo.m_wantedCeilFrame);
-
-        // Update bbox for this frame
-        pRenderNode->UpdateBBox();
-
-        // Abort stream and trash it if it's not valid anymore
-        ValidateStream(streamInfo);
-
-        // Try to trash as many aborted handles as possible
-        RetireAbortedHandles(streamInfo);
-
-        // Retire handles that are not needed anymore
-        RetireHandles(streamInfo);
-    }
-
-    if (bCachesActive)
-    {
-        const CTimeValue currentFrameTime = GetTimer()->GetFrameStartTime();
-        LaunchStreamingJobs(numStreams, currentFrameTime);
-    }
-
-    // Start disk read requests alternating between geom cache render nodes until no more
-    // can be issued (buffers full, max read ahead time reached, no free request object)
-    bool bMoreRequests = true;
-    while (bMoreRequests && bCachesActive)
-    {
-        bMoreRequests = false;
-        uint nextRequestStream = m_lastRequestStream + 1;
-
-        for (uint i = 0; i < numStreams; ++i)
-        {
-            const uint requestStream = (nextRequestStream + i) % numStreams;
-
-            SGeomCacheStreamInfo& streamInfo = *m_streamInfos[i];
-            const CGeomCacheRenderNode* pRenderNode = streamInfo.m_pRenderNode;
-            const bool bIsStreaming = pRenderNode->IsStreaming();
-            const CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-            const bool bPlaybackFromMemory = pGeomCache->PlaybackFromMemory();
-            const float playbackFrame = streamInfo.m_wantedPlaybackTime;
-            const float displayedFrame = streamInfo.m_displayedFrameTime;
-
-            if (!bPlaybackFromMemory && (bIsStreaming || (displayedFrame != playbackFrame)))
-            {
-                const bool bRequestIssued = IssueDiskReadRequest(streamInfo);
-
-                if (bRequestIssued)
-                {
-                    m_lastRequestStream = requestStream;
-                }
-
-                bMoreRequests |= bRequestIssued;
-            }
-        }
-    }
-
-#ifndef _RELEASE
-    for (uint i = 0; i < numStreams; ++i)
-    {
-        SGeomCacheStreamInfo& streamInfo = *m_streamInfos[i];
-        streamInfo.m_pRenderNode->DebugRender();
-    }
-#endif
-}
-
-void CGeomCacheManager::LaunchStreamingJobs(const uint numStreams, const CTimeValue currentFrameTime)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    // Launch streaming jobs
-    for (uint i = 0; i < numStreams; ++i)
-    {
-        SGeomCacheStreamInfo* pStreamInfo = m_streamInfos[i];
-        CGeomCacheRenderNode* pRenderNode = pStreamInfo->m_pRenderNode;
-        const CGeomCache* pGeomCache = pStreamInfo->m_pGeomCache;
-
-        if (!pGeomCache)
-        {
-            continue;
-        }
-
-        const bool bIsStreaming = pRenderNode->IsStreaming();
-        const float playbackFrameTime = pStreamInfo->m_wantedPlaybackTime;
-        const float displayedFrameTime = pStreamInfo->m_displayedFrameTime;
-
-        LaunchDecompressJobs(pStreamInfo, currentFrameTime);
-
-        const bool bSameFrame = playbackFrameTime == displayedFrameTime;
-        if (!bSameFrame || pStreamInfo->m_sameFrameFillCount < 2)
-        {
-            pRenderNode->StartAsyncUpdate();
-            // Legacy priority - High
-            pStreamInfo->m_fillRenderNodeJobExecutor.StartJob([this, pStreamInfo]() { this->FillRenderNodeAsync_JobEntry(pStreamInfo); });
-
-        }
-    }
-}
-
-void CGeomCacheManager::RetireRemovedStreams()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    TStreamInfosIter iter = m_streamInfosAbortList.begin();
-
-    while (iter != m_streamInfosAbortList.end())
-    {
-        SGeomCacheStreamInfo* pStreamInfo = *iter;
-
-        pStreamInfo->m_fillRenderNodeJobExecutor.WaitForCompletion();
-        RetireAbortedHandles(*pStreamInfo);
-
-        if (pStreamInfo->m_fillRenderNodeJobExecutor.IsRunning()
-            || pStreamInfo->m_pReadAbortListHead || pStreamInfo->m_pDecompressAbortListHead)
-        {
-            ++iter;
-        }
-        else
-        {
-            // Nothing left running, we can finally delete the stream
-            CGeomCache* pGeomCache = pStreamInfo->m_pGeomCache;
-            pGeomCache->DecreaseNumStreams();
-
-            pStreamInfo->m_pRenderNode->ClearFillData();
-
-            delete pStreamInfo;
-            iter = m_streamInfosAbortList.erase(iter);
-        }
-    }
-
-    for (TGeomCacheMap::iterator it = m_nameToGeomCacheMap.begin(); it != m_nameToGeomCacheMap.end(); ++it)
-    {
-        CGeomCache* pGeomCache = it->second;
-        if (pGeomCache->GetNumStreams() == 0)
-        {
-            pGeomCache->UnloadData();
-        }
-    }
-}
-
-void CGeomCacheManager::ValidateStream(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const CGeomCacheRenderNode* pRenderNode = streamInfo.m_pRenderNode;
-    const bool bIsStreaming = pRenderNode->IsStreaming();
-    const float wantedPlaybackTime = streamInfo.m_wantedPlaybackTime;
-    const float displayedFrameTime = streamInfo.m_displayedFrameTime;
-
-    if (!pRenderNode->IsStreaming() && (displayedFrameTime == wantedPlaybackTime) && streamInfo.m_sameFrameFillCount >= 2)
-    {
-        AbortStream(streamInfo);
-        return;
-    }
-
-    // Abort if there was an error in the stream. Also set the render node to not play back in this case.
-    if (streamInfo.m_pOldestReadRequestHandle && streamInfo.m_pOldestReadRequestHandle->m_error != 0)
-    {
-        ++m_numStreamAborts;
-        ++m_numErrorAborts;
-        gEnv->pLog->LogError("Error in cache stream %s", streamInfo.m_pRenderNode->GetName());
-        AbortStream(streamInfo);
-        streamInfo.m_pRenderNode->StopStreaming();
-        return;
-    }
-
-    const CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-    const float currentCacheStreamingTime = streamInfo.m_pRenderNode->GetStreamingTime();
-    const uint wantedFloorFrame = pGeomCache->GetFloorFrameIndex(currentCacheStreamingTime);
-
-    // Check if stream is invalid
-    bool bAbort = false;
-
-    if (streamInfo.m_pOldestDecompressHandle)
-    {
-        if ((streamInfo.m_pOldestDecompressHandle->m_startFrame > wantedFloorFrame)
-            || (streamInfo.m_pNewestDecompressHandle->m_endFrame < wantedFloorFrame))
-        {
-            gEnv->pLog->LogWarning("Aborting cache stream %s (decompress stream: [%u, %u], wanted frame: %u)", streamInfo.m_pRenderNode->GetName(),
-                streamInfo.m_pOldestDecompressHandle->m_startFrame, streamInfo.m_pNewestDecompressHandle->m_endFrame, wantedFloorFrame);
-            ++m_numDecompressStreamAborts;
-            bAbort = true;
-        }
-    }
-    else if (streamInfo.m_pOldestReadRequestHandle)
-    {
-        if (streamInfo.m_pOldestReadRequestHandle->m_startFrame > wantedFloorFrame)
-        {
-            gEnv->pLog->LogWarning("Aborting cache stream %s (read stream start: %u, wanted frame: %u)", streamInfo.m_pRenderNode->GetName(),
-                streamInfo.m_pOldestReadRequestHandle->m_startFrame, wantedFloorFrame);
-            ++m_numReadStreamAborts;
-            bAbort = true;
-        }
-    }
-
-    if (bAbort)
-    {
-        ++m_numStreamAborts;
-        AbortStream(streamInfo);
-    }
-}
-
-void CGeomCacheManager::AbortStream(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    streamInfo.m_bAbort = true;
-
-    {
-        FRAME_PROFILER("CGeomCacheManager::AbortStream_LockFillRenderNode", GetSystem(), PROFILE_3DENGINE);
-        streamInfo.m_abortCS.Lock();
-    }
-
-    if (streamInfo.m_pNewestReadRequestHandle)
-    {
-        FRAME_PROFILER("CGeomCacheManager::AbortStream_AbortReads", GetSystem(), PROFILE_3DENGINE);
-
-        assert(streamInfo.m_pOldestReadRequestHandle != NULL);
-
-        // Abort read requests if possible
-        for (SGeomCacheReadRequestHandle* pCurrentReadRequestHandle = streamInfo.m_pOldestReadRequestHandle;
-             pCurrentReadRequestHandle; pCurrentReadRequestHandle = static_cast<SGeomCacheReadRequestHandle*>(pCurrentReadRequestHandle->m_pNext))
-        {
-            if (pCurrentReadRequestHandle->m_pReadStream)
-            {
-                pCurrentReadRequestHandle->m_pReadStream->TryAbort();
-            }
-        }
-
-        // Put all handles in the read request list on the abort list
-        assert(streamInfo.m_pNewestReadRequestHandle->m_pNext == NULL);
-        streamInfo.m_pNewestReadRequestHandle->m_pNext = streamInfo.m_pReadAbortListHead;
-        streamInfo.m_pReadAbortListHead = streamInfo.m_pOldestReadRequestHandle;
-
-        // Mark read request list as empty
-        streamInfo.m_pOldestReadRequestHandle = NULL;
-        streamInfo.m_pNewestReadRequestHandle = NULL;
-    }
-
-    if (streamInfo.m_pOldestDecompressHandle)
-    {
-        FRAME_PROFILER("CGeomCacheManager::AbortStream_AbortDecompress", GetSystem(), PROFILE_3DENGINE);
-
-        assert(streamInfo.m_pOldestDecompressHandle != NULL);
-
-        // Put all handles in the decompress list on the abort list
-        assert(streamInfo.m_pNewestDecompressHandle->m_pNext == NULL);
-        streamInfo.m_pNewestDecompressHandle->m_pNext = streamInfo.m_pDecompressAbortListHead;
-        streamInfo.m_pDecompressAbortListHead = streamInfo.m_pOldestDecompressHandle;
-
-        // Mark read decompress list as empty
-        streamInfo.m_pNewestDecompressHandle = NULL;
-        streamInfo.m_pOldestDecompressHandle = NULL;
-    }
-
-    assert(streamInfo.m_pOldestDecompressHandle == NULL
-        && streamInfo.m_pNewestDecompressHandle == NULL);
-
-    streamInfo.m_numFramesMissed = 0;
-    streamInfo.m_bAbort = false;
-    streamInfo.m_bLooping = false;
-    streamInfo.m_abortCS.Unlock();
-}
-
-void CGeomCacheManager::AbortStreamAndWait(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    AbortStream(streamInfo);
-
-    streamInfo.m_fillRenderNodeJobExecutor.WaitForCompletion();
-
-    CryMutex dummyCS;
-
-    // Wait for all read requests to finish
-    for (SGeomCacheReadRequestHandle* pCurrentAbortedHandle = streamInfo.m_pReadAbortListHead;
-         pCurrentAbortedHandle; pCurrentAbortedHandle = static_cast<SGeomCacheReadRequestHandle*>(pCurrentAbortedHandle->m_pNext))
-    {
-        CryAutoLock<CryMutex> lock(dummyCS);
-        while (pCurrentAbortedHandle->m_numJobReferences > 0)
-        {
-            pCurrentAbortedHandle->m_jobReferencesCV.Wait(dummyCS);
-        }
-
-        if (pCurrentAbortedHandle->m_pReadStream)
-        {
-            pCurrentAbortedHandle->m_pReadStream->Wait();
-        }
-    }
-
-    for (SGeomCacheBufferHandle* pCurrentAbortedHandle = streamInfo.m_pDecompressAbortListHead;
-         pCurrentAbortedHandle; pCurrentAbortedHandle = pCurrentAbortedHandle->m_pNext)
-    {
-        CryAutoLock<CryMutex> lock(dummyCS);
-        while (pCurrentAbortedHandle->m_numJobReferences > 0)
-        {
-            pCurrentAbortedHandle->m_jobReferencesCV.Wait(dummyCS);
-        }
-    }
-
-    // And finally retire their handles
-    RetireAbortedHandles(streamInfo);
-
-    assert(streamInfo.m_pReadAbortListHead == NULL);
-}
-
-void CGeomCacheManager::RetireAbortedHandles(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    SGeomCacheReadRequestHandle* pNextReadRequestAbortHandle = NULL;
-    for (SGeomCacheReadRequestHandle* pCurrentAbortedHandle = streamInfo.m_pReadAbortListHead;
-         pCurrentAbortedHandle; pCurrentAbortedHandle = pNextReadRequestAbortHandle)
-    {
-        // If jobs are still running, wait till next frame
-        if (pCurrentAbortedHandle->m_numJobReferences > 0 || (pCurrentAbortedHandle->m_pReadStream && !pCurrentAbortedHandle->m_pReadStream->IsFinished()))
-        {
-            break;
-        }
-
-        // Remove from abort list
-        pNextReadRequestAbortHandle = static_cast<SGeomCacheReadRequestHandle*>(pCurrentAbortedHandle->m_pNext);
-        streamInfo.m_pReadAbortListHead = pNextReadRequestAbortHandle;
-
-        // And finally retire handle
-        RetireBufferHandle(pCurrentAbortedHandle);
-    }
-
-    SGeomCacheBufferHandle* pNextDecompressAbortHandle = NULL;
-    for (SGeomCacheBufferHandle* pCurrentAbortedHandle = streamInfo.m_pDecompressAbortListHead;
-         pCurrentAbortedHandle; pCurrentAbortedHandle = pNextDecompressAbortHandle)
-    {
-        // If jobs are still running, wait till next frame
-        if (pCurrentAbortedHandle->m_numJobReferences > 0)
-        {
-            break;
-        }
-
-        // Remove from abort list
-        pNextDecompressAbortHandle = pCurrentAbortedHandle->m_pNext;
-        streamInfo.m_pDecompressAbortListHead = pNextDecompressAbortHandle;
-
-        // And finally retire handle
-        RetireDecompressHandle(streamInfo, pCurrentAbortedHandle);
-    }
-}
-
-bool CGeomCacheManager::IssueDiskReadRequest(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    // Constants
-    const CGeomCacheRenderNode* pRenderNode = streamInfo.m_pRenderNode;
-    const CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-    const bool bIsStreaming = pRenderNode->IsStreaming();
-
-    const float currentCacheStreamingTime = streamInfo.m_pRenderNode->GetStreamingTime();
-    const uint wantedFloorFrame = pGeomCache->GetFloorFrameIndex(currentCacheStreamingTime);
-    const uint wantedCeilFrame = pGeomCache->GetCeilFrameIndex(currentCacheStreamingTime);
-    const float minBufferAheadTime = std::max(0.1f, GetCVars()->e_GeomCacheMinBufferAheadTime);
-    const float maxBufferAheadTime = std::max(1.0f, GetCVars()->e_GeomCacheMaxBufferAheadTime);
-    const float cacheMinBufferAhead = currentCacheStreamingTime + minBufferAheadTime;
-    const float cacheMaxBufferAhead = currentCacheStreamingTime + maxBufferAheadTime;
-
-    const bool bLooping = streamInfo.m_bLooping;
-    const uint numFrames = streamInfo.m_numFrames;
-
-    const uint preferredDiskRequestSize = (size_t)std::max(0, GetCVars()->e_GeomCachePreferredDiskRequestSize * 1024);
-
-    // Compute frame range that we want to read from disk
-    uint frameRangeBegin = pGeomCache->GetPrevIFrame(wantedFloorFrame);
-    uint frameRangeEnd = pGeomCache->GetNextIFrame(bIsStreaming ? pGeomCache->GetCeilFrameIndex(cacheMaxBufferAhead) : wantedFloorFrame);
-
-    // Avoid reading an entire block if we are not streaming and time is precisely at an index frame.
-    // This primarily helps when streaming in the first frame after a render node is created.
-    if (!bIsStreaming && (wantedFloorFrame == wantedCeilFrame) &&
-        pGeomCache->GetFrameType(wantedFloorFrame) == GeomCacheFile::eFrameType_IFrame)
-    {
-        frameRangeBegin = wantedFloorFrame;
-        frameRangeEnd = frameRangeBegin;
-    }
-
-    // Make sure not to re-request frames that are already in the decode buffer
-    if (streamInfo.m_pNewestDecompressHandle)
-    {
-        uint decodedFramesEnd = streamInfo.m_pNewestDecompressHandle->m_endFrame;
-        frameRangeBegin = std::max(decodedFramesEnd + 1, frameRangeBegin);
-    }
-
-    // Read request params and handle to be filled
-    StreamReadParams params;
-    SGeomCacheReadRequestHandle* pRequestHandle;
-
-    {
-        assert(!streamInfo.m_pOldestReadRequestHandle || streamInfo.m_pNewestReadRequestHandle);
-        if (streamInfo.m_pNewestReadRequestHandle)
-        {
-            uint streamEndFrame = streamInfo.m_pNewestReadRequestHandle->m_endFrame;
-
-            // Check if we already requested up to frameRangeEnd
-            if (streamInfo.m_pNewestReadRequestHandle->m_endFrame >= frameRangeEnd)
-            {
-                return false;
-            }
-
-            frameRangeBegin = streamEndFrame + 1;
-        }
-
-        const float frameRangeBeginTime = pGeomCache->GetFrameTime(frameRangeBegin);
-        if (frameRangeBeginTime > cacheMinBufferAhead)
-        {
-            return false;
-        }
-
-        if (!bLooping && frameRangeEnd >= (numFrames - 1))
-        {
-            frameRangeEnd = numFrames - 1;
-        }
-
-        if (frameRangeBegin > frameRangeEnd)
-        {
-            return false;
-        }
-
-        if ((frameRangeEnd - frameRangeBegin + 1) > numFrames)
-        {
-            frameRangeEnd = frameRangeBegin + numFrames - 1;
-        }
-
-        pGeomCache->ValidateReadRange(frameRangeBegin, frameRangeEnd);
-
-        // Now that we have a final range of unread frames, make a read request
-        uint requestSize = 0;
-        for (uint currentFrame = frameRangeBegin; currentFrame <= frameRangeEnd; ++currentFrame)
-        {
-            requestSize += pGeomCache->GetFrameSize(currentFrame);
-
-            // Stop if size has reached preferred request size and current frame is an index frame
-            if (requestSize >= preferredDiskRequestSize && pGeomCache->GetFrameType(currentFrame) == GeomCacheFile::eFrameType_IFrame && frameRangeBegin != currentFrame)
-            {
-                frameRangeEnd = currentFrame;
-                break;
-            }
-        }
-
-        assert(requestSize > 0);
-
-        // Allocate new request handle & buffer space
-        pRequestHandle = NewReadRequestHandle(requestSize, streamInfo);
-        if (!pRequestHandle)
-        {
-            return false;
-        }
-
-        // Init handle
-        pRequestHandle->m_startFrame = frameRangeBegin;
-        pRequestHandle->m_endFrame = frameRangeEnd;
-
-        // Add request handle to stream linked list
-        if (streamInfo.m_pNewestReadRequestHandle)
-        {
-            streamInfo.m_pNewestReadRequestHandle->m_pNext = pRequestHandle;
-            streamInfo.m_pNewestReadRequestHandle = pRequestHandle;
-        }
-        else
-        {
-            streamInfo.m_pOldestReadRequestHandle = pRequestHandle;
-            streamInfo.m_pNewestReadRequestHandle = pRequestHandle;
-        }
-
-        const float timeLeft = std::max(pGeomCache->GetFrameTime(frameRangeBegin) - currentCacheStreamingTime
-                - static_cast<float>(GetCVars()->e_GeomCacheDecodeAheadTime), 0.0f);
-
-        // Fill read request params
-        params.nOffset = static_cast<uint>(pGeomCache->GetFrameOffset(frameRangeBegin));
-        params.nSize = requestSize;
-        params.pBuffer = pRequestHandle->m_pBuffer;
-        params.ePriority = estpAboveNormal;
-        params.nLoadTime = static_cast<uint>(timeLeft * 1000);
-        params.nPerceptualImportance = 255;
-        params.nFlags = IStreamEngine::FLAGS_NO_SYNC_CALLBACK;
-    }
-
-    // Issue request
-    CryInterlockedIncrement(&pRequestHandle->m_numJobReferences);
-    pRequestHandle->m_pReadStream = GetSystem()->GetStreamEngine()->StartRead(
-            eStreamTaskTypeGeomCache, pGeomCache->GetFilePath(), pRequestHandle, &params);
-
-    // This can happen if streaming system is already shutting down. There will be no callback in this case, so decrement m_numJobReferences.
-    if (pRequestHandle->m_pReadStream == NULL)
-    {
-        if (CryInterlockedDecrement(&pRequestHandle->m_numJobReferences) == 0)
-        {
-            pRequestHandle->m_jobReferencesCV.Notify();
-        }
-    }
-
-    return true;
-}
-
-void CGeomCacheManager::LaunchDecompressJobs(SGeomCacheStreamInfo* pStreamInfo, const CTimeValue currentFrameTime)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    const CGeomCache* pGeomCache = pStreamInfo->m_pGeomCache;
-    const GeomCacheFile::EBlockCompressionFormat blockCompressionFormat = pGeomCache->GetBlockCompressionFormat();
-    const float currentCacheStreamingTime = pStreamInfo->m_pRenderNode->GetStreamingTime();
-    const uint wantedFloorFrame = pGeomCache->GetFloorFrameIndex(currentCacheStreamingTime);
-    const uint numStreamFrames = pStreamInfo->m_numFrames;
-    const uint frameDataSize = pStreamInfo->m_frameData.size();
-
-    // Need to check if there are still jobs running for the same render node on the stream abort list
-    for (TStreamInfosIter iter = m_streamInfosAbortList.begin(); iter != m_streamInfosAbortList.end(); ++iter)
-    {
-        SGeomCacheStreamInfo* pCurrentStreamInfo = *iter;
-        if (pStreamInfo->m_pRenderNode == pCurrentStreamInfo->m_pRenderNode)
-        {
-            return;
-        }
-    }
-
-    // Wait until abort list has been processed before spawning new jobs
-    if (pStreamInfo->m_pDecompressAbortListHead || pStreamInfo->m_pReadAbortListHead)
-    {
-        return;
-    }
-
-    for (SGeomCacheReadRequestHandle* pReadRequestHandle = pStreamInfo->m_pOldestReadRequestHandle; pReadRequestHandle;
-         pReadRequestHandle = static_cast<SGeomCacheReadRequestHandle*>(pReadRequestHandle->m_pNext))
-    {
-        if (pReadRequestHandle->m_frameTime == currentFrameTime)
-        {
-            // Don't decode frames that were read in the same render frame
-            return;
-        }
-
-        if (pStreamInfo->m_bAbort)
-        {
-            return;
-        }
-
-        if (pReadRequestHandle->m_error)
-        {
-            return;
-        }
-
-        if (pReadRequestHandle->m_state != SGeomCacheReadRequestHandle::eRRHS_FinishedRead)
-        {
-            return;
-        }
-
-        // Stop decoding after e_GeomCacheDecodeAheadTime
-        const float blockDeltaFromPlaybackTime = (pGeomCache->GetFrameTime(pReadRequestHandle->m_startFrame) - currentCacheStreamingTime);
-        const float decodeAheadTime = GetCVars()->e_GeomCacheDecodeAheadTime;
-        if (blockDeltaFromPlaybackTime > decodeAheadTime)
-        {
-            return;
-        }
-
-        const uint startFrame = pReadRequestHandle->m_startFrame;
-        const uint endFrame = pReadRequestHandle->m_endFrame;
-
-        // Need to check if stream is already referencing same frames when looping
-        if (pStreamInfo->m_pOldestDecompressHandle && pStreamInfo->m_bLooping)
-        {
-            const uint checkRangeStart = pStreamInfo->m_pOldestDecompressHandle->m_startFrame;
-            const uint checkRangeEnd = pStreamInfo->m_pNewestDecompressHandle->m_endFrame;
-
-            const uint startRangeMod = checkRangeStart % frameDataSize;
-            const uint endRangeMod = checkRangeEnd % frameDataSize;
-            const uint startFrameMod = startFrame % frameDataSize;
-            // Check range must be extended to next index frame because retiring of stream begin could otherwise overwrite frame data
-            const uint endFrameMod = pGeomCache->GetNextIFrame(endFrame) % frameDataSize;
-
-            const bool bRangeWraps = endRangeMod < startRangeMod;
-            const bool bFramesWrap = endFrameMod < startFrameMod;
-
-            // check all four different cases for range overlapping
-            if ((bRangeWraps && bFramesWrap)
-                || (bRangeWraps && !bFramesWrap && (startFrameMod <= endRangeMod || endFrameMod >= startRangeMod))
-                || (!bRangeWraps && bFramesWrap && (startRangeMod <= endFrameMod || endRangeMod >= startFrameMod))
-                || (!bRangeWraps && !bFramesWrap && (startFrameMod <= endRangeMod && startRangeMod <= endFrameMod)))
-            {
-                return;
-            }
-        }
-
-        // Determine size for decompression buffer
-        const uint numFrames = (endFrame - startFrame) + 1;
-        const uint32 decompressBlockSize = GeomCacheDecoder::GetDecompressBufferSize(pReadRequestHandle->m_pBuffer, numFrames);
-
-        SGeomCacheBufferHandle* pNewDecompressBufferHandle = NewBufferHandle<SGeomCacheBufferHandle>(decompressBlockSize, *pStreamInfo);
-        if (!pNewDecompressBufferHandle)
-        {
-            // Could not allocate space for decompression
-            return;
-        }
-
-        // Zero frame headers
-        memset(pNewDecompressBufferHandle->m_pBuffer, 0, sizeof(SGeomCacheFrameHeader) * numFrames);
-
-        pReadRequestHandle->m_state = SGeomCacheReadRequestHandle::eRRHS_Decompressing;
-        pNewDecompressBufferHandle->m_startFrame = startFrame;
-        pNewDecompressBufferHandle->m_endFrame = endFrame;
-
-        for (uint i = startFrame; i <= endFrame; ++i)
-        {
-            const uint frameIndex = i % frameDataSize;
-            assert(!pStreamInfo->m_frameData[frameIndex].m_pDecompressHandle);
-            pStreamInfo->m_frameData[frameIndex].m_pDecompressHandle = pNewDecompressBufferHandle;
-        }
-
-        // Add to decompress request handle linked list
-        {
-            assert(!pStreamInfo->m_pOldestDecompressHandle || pStreamInfo->m_pNewestDecompressHandle);
-
-            // Add request handle to stream linked list
-            if (pStreamInfo->m_pNewestDecompressHandle)
-            {
-                pStreamInfo->m_pNewestDecompressHandle->m_pNext = pNewDecompressBufferHandle;
-                pStreamInfo->m_pNewestDecompressHandle = pNewDecompressBufferHandle;
-            }
-            else
-            {
-                pStreamInfo->m_pOldestDecompressHandle = pNewDecompressBufferHandle;
-                pStreamInfo->m_pNewestDecompressHandle = pNewDecompressBufferHandle;
-            }
-        }
-
-        for (uint i = 0; i < numFrames; ++i)
-        {
-            const uint frameIndex = startFrame + i;
-
-            // For b frames we need to make sure that jobs for previous frames were launched. Otherwise m_numJobReferences will
-            // never reach zero, because the frame decode job has a dependency job that was never launched.
-            if (pGeomCache->GetFrameType(frameIndex) == GeomCacheFile::eFrameType_IFrame
-                || pStreamInfo->m_frameData[(frameIndex - 1) % frameDataSize].m_bDecompressJobLaunched)
-            {
-                CryInterlockedIncrement(&pReadRequestHandle->m_numJobReferences);
-                CryInterlockedIncrement(&pNewDecompressBufferHandle->m_numJobReferences);
-                CryInterlockedIncrement(&pNewDecompressBufferHandle->m_numJobReferences);
-
-                pStreamInfo->m_frameData[frameIndex % frameDataSize].m_bDecompressJobLaunched = true;
-                // Legacy priority - stream
-                AZ::Job* job = AZ::CreateJobFunction([this, pStreamInfo, i, pNewDecompressBufferHandle, pReadRequestHandle]() { this->DecompressFrame_JobEntry(pStreamInfo, i, pNewDecompressBufferHandle, pReadRequestHandle); }, true, nullptr);
-                job->Start();
-
-            }
-        }
-    }
-}
-
-void CGeomCacheManager::DecompressFrame_JobEntry(SGeomCacheStreamInfo* pStreamInfo, const uint blockIndex,
-    SGeomCacheBufferHandle* pDecompressHandle, SGeomCacheReadRequestHandle* pReadRequestHandle)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const CGeomCache* pGeomCache = pStreamInfo->m_pGeomCache;
-    const uint frameIndex = pDecompressHandle->m_startFrame + blockIndex;
-
-    if (!pStreamInfo->m_bAbort && !pStreamInfo->m_pDecompressAbortListHead)
-    {
-        const GeomCacheFile::EBlockCompressionFormat blockCompressionFormat = pGeomCache->GetBlockCompressionFormat();
-        const uint numFrames = pReadRequestHandle->m_endFrame - pReadRequestHandle->m_startFrame + 1;
-
-        SGeomCacheFrameHeader* pHeader = GetFrameDecompressHeader(pStreamInfo, frameIndex);
-        if (!pHeader || pHeader->m_state != SGeomCacheFrameHeader::eFHS_Uninitialized)
-        {
-            CryFatalError("Trying to access uninitialized data while decoding an index frame");
-        }
-
-        if (!GeomCacheDecoder::DecompressBlocks(blockCompressionFormat, pDecompressHandle->m_pBuffer,
-                pReadRequestHandle->m_pBuffer, blockIndex, 1, numFrames))
-        {
-            // Decompress block size failed: Flag error
-            pReadRequestHandle->m_error = 1;
-        }
-    }
-
-    if (CryInterlockedDecrement(&pReadRequestHandle->m_numJobReferences) == 0)
-    {
-        pReadRequestHandle->m_state = SGeomCacheReadRequestHandle::eRRHS_Done;
-        pReadRequestHandle->m_jobReferencesCV.Notify();
-    }
-
-    if (CryInterlockedDecrement(&pDecompressHandle->m_numJobReferences) == 0)
-    {
-        pDecompressHandle->m_jobReferencesCV.Notify();
-    }
-
-    const int newDependencyCounter = CryInterlockedDecrement(GetDependencyCounter(pStreamInfo, frameIndex));
-
-    if (newDependencyCounter < 0 || newDependencyCounter > 2)
-    {
-        CryFatalError("Invalid dependency counter");
-    }
-    else if (newDependencyCounter == 0)
-    {
-        SDecodeFrameJobData jobData;
-        jobData.m_frameIndex = frameIndex;
-        jobData.m_pGeomCache = pGeomCache;
-        jobData.m_pStreamInfo = pStreamInfo;
-        LaunchDecodeJob(jobData);
-    }
-}
-
-void CGeomCacheManager::LaunchDecodeJob(SDecodeFrameJobData jobData)
-{
-    const GeomCacheFile::EFrameType frameType = jobData.m_pGeomCache->GetFrameType(jobData.m_frameIndex);
-
-    switch (frameType)
-    {
-        case GeomCacheFile::eFrameType_IFrame:
-        {
-            // Legacy priority - stream
-            AZ::Job* job = AZ::CreateJobFunction([this, jobData]() { this->DecodeIFrame_JobEntry(jobData); }, true);
-            job->Start();
-            break;
-        }
-        case GeomCacheFile::eFrameType_BFrame:
-        {
-            // Legacy priority - stream
-            AZ::Job* job = AZ::CreateJobFunction([this, jobData]() { this->DecodeBFrame_JobEntry(jobData); }, true);
-            job->Start();
-            break;
-        }
-    }
-}
-
-void CGeomCacheManager::DecodeIFrame_JobEntry(SDecodeFrameJobData jobData)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!jobData.m_pStreamInfo->m_bAbort && !jobData.m_pStreamInfo->m_pDecompressAbortListHead)
-    {
-        char* pFrameData = GetFrameDecompressData(jobData.m_pStreamInfo, jobData.m_frameIndex);
-        GeomCacheDecoder::DecodeIFrame(jobData.m_pGeomCache, pFrameData);
-
-        SGeomCacheFrameHeader* pHeader = GetFrameDecompressHeader(jobData.m_pStreamInfo, jobData.m_frameIndex);
-
-        if (pHeader->m_state != SGeomCacheFrameHeader::eFHS_Undecoded)
-        {
-            CryFatalError("Trying to access uninitialized data while decoding an index frame");
-        }
-
-        pHeader->m_state = SGeomCacheFrameHeader::eFHS_Decoded;
-    }
-
-    SGeomCacheBufferHandle* pHandle = GetFrameDecompressHandle(jobData.m_pStreamInfo, jobData.m_frameIndex);
-    if (CryInterlockedDecrement(&pHandle->m_numJobReferences) == 0)
-    {
-        pHandle->m_jobReferencesCV.Notify();
-    }
-
-    // Decrement dependency counter of first b frame after previous index frame and launch job if ready
-    const uint prevIFrame = jobData.m_pGeomCache->GetPrevIFrame(jobData.m_frameIndex);
-    if (prevIFrame < jobData.m_frameIndex)
-    {
-        const uint bFrameIndex = prevIFrame + 1;
-        if (jobData.m_pGeomCache->GetFrameType(bFrameIndex) == GeomCacheFile::eFrameType_BFrame)
-        {
-            const int newDependencyCounter = CryInterlockedDecrement(GetDependencyCounter(jobData.m_pStreamInfo, bFrameIndex));
-
-            if (newDependencyCounter < 0 || newDependencyCounter > 2)
-            {
-                CryFatalError("Invalid dependency counter");
-            }
-            else if (newDependencyCounter == 0)
-            {
-                SDecodeFrameJobData bFrameJobState = jobData;
-                bFrameJobState.m_frameIndex = bFrameIndex;
-                LaunchDecodeJob(bFrameJobState);
-            }
-        }
-    }
-
-    // Decrement dependency counter of b frame right after index frame and launch job if ready
-    const uint numFrames = jobData.m_pStreamInfo->m_numFrames;
-    if ((jobData.m_frameIndex % numFrames) + 1 < numFrames)
-    {
-        const uint bFrameIndex = jobData.m_frameIndex + 1;
-        if (jobData.m_pGeomCache->GetFrameType(bFrameIndex) == GeomCacheFile::eFrameType_BFrame)
-        {
-            const int newDependencyCounter = CryInterlockedDecrement(GetDependencyCounter(jobData.m_pStreamInfo, bFrameIndex));
-
-            if (newDependencyCounter < 0 || newDependencyCounter > 2)
-            {
-                CryFatalError("Invalid dependency counter");
-            }
-            else if (newDependencyCounter == 0)
-            {
-                SDecodeFrameJobData bFrameJobState = jobData;
-                bFrameJobState.m_frameIndex = bFrameIndex;
-                LaunchDecodeJob(bFrameJobState);
-            }
-        }
-    }
-}
-
-void CGeomCacheManager::DecodeBFrame_JobEntry(SDecodeFrameJobData jobData)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const uint prevIFrame = jobData.m_pGeomCache->GetPrevIFrame(jobData.m_frameIndex);
-    const uint nextIFrame = jobData.m_pGeomCache->GetNextIFrame(jobData.m_frameIndex);
-
-    if (!jobData.m_pStreamInfo->m_bAbort && !jobData.m_pStreamInfo->m_pDecompressAbortListHead)
-    {
-        char* pFrameData = GetFrameDecompressData(jobData.m_pStreamInfo, jobData.m_frameIndex);
-
-        // For frames that have 0 influence for motion the predictor will still read data
-        // from the prev frame pointers, so just set it to the current frame's data.
-        char* pPrevFramesData[2] = { pFrameData, pFrameData };
-        if (jobData.m_pGeomCache->NeedsPrevFrames(jobData.m_frameIndex))
-        {
-            pPrevFramesData[0] = GetFrameDecompressData(jobData.m_pStreamInfo, jobData.m_frameIndex - 2);
-            pPrevFramesData[1] = GetFrameDecompressData(jobData.m_pStreamInfo, jobData.m_frameIndex - 1);
-        }
-
-        SGeomCacheFrameHeader* pPrevIFrameHeader = GetFrameDecompressHeader(jobData.m_pStreamInfo, prevIFrame);
-        SGeomCacheFrameHeader* pNextIFrameHeader = GetFrameDecompressHeader(jobData.m_pStreamInfo, nextIFrame);
-
-        if (pPrevIFrameHeader->m_state != SGeomCacheFrameHeader::eFHS_Decoded
-            || pNextIFrameHeader->m_state != SGeomCacheFrameHeader::eFHS_Decoded)
-        {
-            CryFatalError("Trying to access invalid data while decoding a b frame");
-        }
-
-        char* pFloorIndexFrameData = GetFrameDecompressData(jobData.m_pStreamInfo, prevIFrame);
-        char* pCeilIndexFrameData = GetFrameDecompressData(jobData.m_pStreamInfo, nextIFrame);
-
-        GeomCacheDecoder::DecodeBFrame(jobData.m_pGeomCache, pFrameData, pPrevFramesData, pFloorIndexFrameData, pCeilIndexFrameData);
-
-        SGeomCacheFrameHeader* pHeader = GetFrameDecompressHeader(jobData.m_pStreamInfo, jobData.m_frameIndex);
-
-        if (pHeader->m_state != SGeomCacheFrameHeader::eFHS_Undecoded)
-        {
-            CryFatalError("Trying to access invalid data while decoding a b frame");
-        }
-
-        pHeader->m_state = SGeomCacheFrameHeader::eFHS_Decoded;
-    }
-
-    SGeomCacheBufferHandle* pHandle = GetFrameDecompressHandle(jobData.m_pStreamInfo, jobData.m_frameIndex);
-    if (CryInterlockedDecrement(&pHandle->m_numJobReferences) == 0)
-    {
-        pHandle->m_jobReferencesCV.Notify();
-    }
-
-    // Decrement dependency counter of b frame right after frame and launch job if ready
-    const uint numFrames = jobData.m_pStreamInfo->m_numFrames;
-    if ((jobData.m_frameIndex % numFrames) + 1 < numFrames)
-    {
-        const uint bFrameIndex = jobData.m_frameIndex + 1;
-        if (jobData.m_pGeomCache->GetFrameType(bFrameIndex) == GeomCacheFile::eFrameType_BFrame)
-        {
-            const int newDependencyCounter = CryInterlockedDecrement(GetDependencyCounter(jobData.m_pStreamInfo, bFrameIndex));
-
-            if (newDependencyCounter < 0 || newDependencyCounter > 2)
-            {
-                CryFatalError("Invalid dependency counter");
-            }
-            else if (newDependencyCounter == 0)
-            {
-                SDecodeFrameJobData bFrameJobState = jobData;
-                bFrameJobState.m_frameIndex = bFrameIndex;
-                LaunchDecodeJob(bFrameJobState);
-            }
-        }
-    }
-}
-
-void CGeomCacheManager::FillRenderNodeAsync_JobEntry(SGeomCacheStreamInfo* pStreamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // Prevent the stream from aborting while filling the render buffer
-    CryAutoLock<CryCriticalSection> abortLock(pStreamInfo->m_abortCS);
-
-    CGeomCacheRenderNode* pRenderNode = pStreamInfo->m_pRenderNode;
-    const CGeomCache* pGeomCache = pStreamInfo->m_pGeomCache;
-
-    if (pStreamInfo->m_bAbort || pStreamInfo->m_pDecompressAbortListHead)
-    {
-        // End job if abort flag was raised
-        pRenderNode->SkipFrameFill();
-        return;
-    }
-
-    const uint floorPlaybackFrame = pStreamInfo->m_wantedFloorFrame;
-    const uint ceilPlaybackFrame = pStreamInfo->m_wantedCeilFrame;
-    bool bFrameFilled = false;
-
-    const char* pFloorFrameData = NULL;
-    const char* pCeilFrameData = NULL;
-
-    if (!pGeomCache->PlaybackFromMemory())
-    {
-        SGeomCacheFrameHeader* pFloorHeader = GetFrameDecompressHeader(pStreamInfo, floorPlaybackFrame);
-        SGeomCacheFrameHeader* pCeilHeader = GetFrameDecompressHeader(pStreamInfo, ceilPlaybackFrame);
-
-        if (pFloorHeader && pFloorHeader->m_state == SGeomCacheFrameHeader::eFHS_Decoded && pCeilHeader && pCeilHeader->m_state == SGeomCacheFrameHeader::eFHS_Decoded)
-        {
-            pFloorFrameData = GetFrameDecompressData(pStreamInfo, floorPlaybackFrame);
-            pCeilFrameData = GetFrameDecompressData(pStreamInfo, ceilPlaybackFrame);
-        }
-    }
-    else
-    {
-        pFloorFrameData = pGeomCache->GetFrameData(floorPlaybackFrame % pGeomCache->GetNumFrames());
-        pCeilFrameData = pGeomCache->GetFrameData(ceilPlaybackFrame % pGeomCache->GetNumFrames());
-    }
-
-    if (pFloorFrameData && pCeilFrameData)
-    {
-        const float floorFrameTime = pGeomCache->GetFrameTime(floorPlaybackFrame);
-        const float ceilFrameTime = pGeomCache->GetFrameTime(ceilPlaybackFrame);
-        const float wantedPlaybackTime = pStreamInfo->m_wantedPlaybackTime;
-
-        assert(wantedPlaybackTime >= floorFrameTime && wantedPlaybackTime <= ceilFrameTime);
-
-        float lerpFactor = 0.0f;
-        if (ceilFrameTime != floorFrameTime)
-        {
-            lerpFactor = (wantedPlaybackTime - floorFrameTime) / (ceilFrameTime - floorFrameTime);
-        }
-
-        assert(lerpFactor >= 0.0f && lerpFactor <= 1.0f);
-
-        // m_displayedFrameTime == -1.0f means uninitialized cache. Treat as same frame, because we only want to fill twice on load.
-        const bool bSameFrame = (pStreamInfo->m_displayedFrameTime == pStreamInfo->m_wantedPlaybackTime) || (pStreamInfo->m_displayedFrameTime == -1.0f);
-
-        if (bSameFrame)
-        {
-            CryInterlockedIncrement(&pStreamInfo->m_sameFrameFillCount);
-        }
-        else
-        {
-            pStreamInfo->m_sameFrameFillCount = 0;
-        }
-
-        if (!pRenderNode->FillFrameAsync(pFloorFrameData, pCeilFrameData, lerpFactor))
-        {
-            pRenderNode->SkipFrameFill();
-        }
-
-        pStreamInfo->m_displayedFrameTime = pStreamInfo->m_wantedPlaybackTime;
-        bFrameFilled = true;
-    }
-    else
-    {
-        pRenderNode->SkipFrameFill();
-    }
-
-    if (!bFrameFilled && pRenderNode->IsStreaming())
-    {
-        // If this happens, then we don't have the necessary data in the decompression
-        // buffer and the geom cache render node wasn't updated
-        ++pStreamInfo->m_numFramesMissed;
-        ++m_numMissedFrames;
-    }
-}
-
-template<class TBufferHandleType>
-TBufferHandleType* CGeomCacheManager::NewBufferHandle(const uint32 size, SGeomCacheStreamInfo& streamInfo)
-{
-    if (gEnv->mMainThreadId != CryGetCurrentThreadId())
-    {
-        CryFatalError("CGeomCacheManager::NewBufferHandle must be called from main thread");
-    }
-
-    char* pBlock = NULL;
-
-    size_t pointerSize = (sizeof(SGeomCacheBufferHandle*) + 15) & ~15;
-
-    if (!gEnv->IsDedicated())
-    {
-        // Try to allocate requested size in the buffer, otherwise return NULL
-        {
-            FRAME_PROFILER("CGeomCacheManager::NewBufferHandle_Malloc", GetSystem(), PROFILE_3DENGINE);
-            pBlock = reinterpret_cast<char*>(m_pPool->Memalign(16, pointerSize + size, "geom cache block"));
-        }
-    }
-
-    if (!pBlock)
-    {
-        ++m_numFailedAllocs;
-        return NULL;
-    }
-
-    // Remove from free list
-    TBufferHandleType* pNewRequest = new TBufferHandleType();
-
-    // Initialize and return request handle
-    *alias_cast<TBufferHandleType**>(pBlock) = pNewRequest;
-    pNewRequest->m_pBuffer = pBlock + pointerSize;
-    pNewRequest->m_bufferSize = size;
-    pNewRequest->m_frameTime = GetTimer()->GetFrameStartTime();
-    pNewRequest->m_pStream = &streamInfo;
-
-    return pNewRequest;
-}
-
-SGeomCacheReadRequestHandle* CGeomCacheManager::NewReadRequestHandle(const uint32 size, SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    SGeomCacheBufferHandle* pNewHandle = NewBufferHandle<SGeomCacheReadRequestHandle>(size, streamInfo);
-    SGeomCacheReadRequestHandle* pReadRequestHandle = static_cast<SGeomCacheReadRequestHandle*>(pNewHandle);
-
-    if (pReadRequestHandle)
-    {
-        pReadRequestHandle->m_state = SGeomCacheReadRequestHandle::eRRHS_Reading;
-        pReadRequestHandle->m_error = 0L;
-        pReadRequestHandle->m_pReadStream = NULL;
-    }
-
-    return pReadRequestHandle;
-}
-
-void CGeomCacheManager::RetireHandles(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-    const float currentCacheStreamingTime = streamInfo.m_pRenderNode->GetStreamingTime();
-    const uint wantedFloorFrame = pGeomCache->GetFloorFrameIndex(currentCacheStreamingTime);
-
-    SGeomCacheBufferHandle* pNextReadRequestHandle = streamInfo.m_pOldestReadRequestHandle;
-    while (pNextReadRequestHandle)
-    {
-        SGeomCacheReadRequestHandle* pCurrentReadRequestHandle = static_cast<SGeomCacheReadRequestHandle*>(pNextReadRequestHandle);
-        pNextReadRequestHandle = pCurrentReadRequestHandle->m_pNext;
-
-        const uint handleEndFrame = pCurrentReadRequestHandle->m_endFrame;
-
-        if (pCurrentReadRequestHandle->m_numJobReferences == 0 &&
-            ((handleEndFrame + 2) < wantedFloorFrame || pCurrentReadRequestHandle->m_state == SGeomCacheReadRequestHandle::eRRHS_Done))
-        {
-            RetireOldestReadRequestHandle(streamInfo);
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    SGeomCacheBufferHandle* pNextDecompressHandle = streamInfo.m_pOldestDecompressHandle;
-    while (pNextDecompressHandle)
-    {
-        SGeomCacheBufferHandle* pCurrentDecompressHandle = pNextDecompressHandle;
-        pNextDecompressHandle = pCurrentDecompressHandle->m_pNext;
-
-        const uint handleEndFrame = pCurrentDecompressHandle->m_endFrame;
-
-        // We also wait for the jobs of the next frame because of b frame -> index frame back references
-        if (((handleEndFrame + 2) < wantedFloorFrame) && (pCurrentDecompressHandle->m_numJobReferences == 0)
-            && !(pCurrentDecompressHandle->m_pNext && pCurrentDecompressHandle->m_pNext->m_numJobReferences > 0))
-        {
-            RetireOldestDecompressHandle(streamInfo);
-        }
-        else
-        {
-            break;
-        }
-    }
-}
-
-void CGeomCacheManager::RetireOldestReadRequestHandle(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    SGeomCacheReadRequestHandle* pOldestHandle;
-
-    pOldestHandle = streamInfo.m_pOldestReadRequestHandle;
-
-    if (pOldestHandle == streamInfo.m_pNewestReadRequestHandle)
-    {
-        assert(pOldestHandle->m_pNext == NULL);
-        streamInfo.m_pOldestReadRequestHandle = NULL;
-        streamInfo.m_pNewestReadRequestHandle = NULL;
-    }
-    else
-    {
-        streamInfo.m_pOldestReadRequestHandle = static_cast<SGeomCacheReadRequestHandle*>(pOldestHandle->m_pNext);
-    }
-
-    assert(pOldestHandle);
-    if (pOldestHandle)
-    {
-        if (pOldestHandle->m_numJobReferences > 0)
-        {
-            CryFatalError("Trying to retire handle with non zero job count");
-        }
-
-        RetireBufferHandle(pOldestHandle);
-    }
-}
-
-void CGeomCacheManager::RetireOldestDecompressHandle(SGeomCacheStreamInfo& streamInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    SGeomCacheBufferHandle* pOldestHandle = NULL;
-
-    // Unlink from stream linked list
-    {
-        pOldestHandle = streamInfo.m_pOldestDecompressHandle;
-
-        assert(pOldestHandle);
-        if (!pOldestHandle)
-        {
-            return;
-        }
-
-        if (pOldestHandle == streamInfo.m_pNewestDecompressHandle)
-        {
-            assert(pOldestHandle->m_pNext == NULL);
-            streamInfo.m_pOldestDecompressHandle = NULL;
-            streamInfo.m_pNewestDecompressHandle = NULL;
-        }
-        else
-        {
-            streamInfo.m_pOldestDecompressHandle = pOldestHandle->m_pNext;
-        }
-    }
-
-    if (pOldestHandle)
-    {
-        RetireDecompressHandle(streamInfo, pOldestHandle);
-    }
-}
-
-void CGeomCacheManager::RetireDecompressHandle(SGeomCacheStreamInfo& streamInfo, SGeomCacheBufferHandle* pHandle)
-{
-    CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-
-    const uint frameDataSize = streamInfo.m_frameData.size();
-    uint reinitializeStart = pGeomCache->GetPrevIFrame(pHandle->m_startFrame) % frameDataSize;
-    uint reinitializeEnd = pHandle->m_endFrame % frameDataSize;
-
-    if (!pHandle->m_pNext && (reinitializeEnd != (frameDataSize - 1)))
-    {
-        // If this was the last handle in stream or the next handle start frame is not right after the current handles end frame
-        // we need to reinitialize until the next index frame because index frame jobs will decrement dependency
-        // counters from b frames ahead of time.
-
-        reinitializeEnd = pGeomCache->GetNextIFrame(reinitializeEnd) + 1;
-    }
-
-    ReinitializeStreamFrameData(streamInfo, reinitializeStart, reinitializeEnd);
-    RetireBufferHandle(pHandle);
-}
-
-template<class TBufferHandleType>
-void CGeomCacheManager::RetireBufferHandle(TBufferHandleType* pHandle)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (gEnv->mMainThreadId != CryGetCurrentThreadId())
-    {
-        CryFatalError("CGeomCacheManager::RetireBufferHandle must be called from main thread");
-    }
-
-    if (pHandle->m_numJobReferences)
-    {
-        CryFatalError("Trying to retire handle with jobs still running");
-    }
-
-    {
-        FRAME_PROFILER("CGeomCacheManager::RetireBufferHandle_Free", GetSystem(), PROFILE_3DENGINE);
-        size_t pointerSize = (sizeof(SGeomCacheBufferHandle*) + 15) & ~15;
-        m_pPool->Free(pHandle->m_pBuffer - pointerSize);
-    }
-
-    delete pHandle;
-}
-
-float CGeomCacheManager::GetPrecachedTime(const IGeomCacheRenderNode* pRenderNode)
-{
-    assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    for (uint i = 0; i < m_streamInfos.size(); ++i)
-    {
-        SGeomCacheStreamInfo& streamInfo = *m_streamInfos[i];
-        if (streamInfo.m_pRenderNode == pRenderNode)
-        {
-            const float playbackTime = pRenderNode->GetPlaybackTime();
-
-            if (streamInfo.m_pNewestDecompressHandle)
-            {
-                CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-
-                const uint frame = streamInfo.m_pNewestDecompressHandle->m_startFrame;
-                const float frameTime = pGeomCache->GetFrameTime(frame);
-
-                if (playbackTime <= frameTime)
-                {
-                    return frameTime - playbackTime;
-                }
-            }
-
-            break;
-        }
-    }
-
-    return 0.0f;
-}
-
-SGeomCacheBufferHandle* CGeomCacheManager::GetFrameDecompressHandle(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex)
-{
-    const uint frameDataSize = pStreamInfo->m_frameData.size();
-    return pStreamInfo->m_frameData[frameIndex % frameDataSize].m_pDecompressHandle;
-}
-
-SGeomCacheFrameHeader* CGeomCacheManager::GetFrameDecompressHeader(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex)
-{
-    SGeomCacheBufferHandle* pHandle = GetFrameDecompressHandle(pStreamInfo, frameIndex);
-
-    if (!pHandle)
-    {
-        return nullptr;
-    }
-
-    //If the start frame is greater than the frame index 
-    //we're going to crash because frameOffset will overflow and 
-    //access pHandle->pBuffer beyond its limits
-    //This can happen if the user sets the start frame too high
-    if (pHandle->m_startFrame > frameIndex)
-    {
-        return nullptr;
-    }
-
-    const uint frameOffset = frameIndex - pHandle->m_startFrame;
-    
-    SGeomCacheFrameHeader* pHeader = reinterpret_cast<SGeomCacheFrameHeader*>(
-            pHandle->m_pBuffer + (frameOffset * sizeof(SGeomCacheFrameHeader)));
-    return pHeader;
-}
-
-char* CGeomCacheManager::GetFrameDecompressData(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex)
-{
-    SGeomCacheFrameHeader* pHeader = GetFrameDecompressHeader(pStreamInfo, frameIndex);
-    SGeomCacheBufferHandle* pHandle = GetFrameDecompressHandle(pStreamInfo, frameIndex);
-
-    if (!pHandle || !pHeader)
-    {
-        return NULL;
-    }
-
-    return pHandle->m_pBuffer + pHeader->m_offset;
-}
-
-int* CGeomCacheManager::GetDependencyCounter(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex)
-{
-    const uint frameDataSize = pStreamInfo->m_frameData.size();
-    return &pStreamInfo->m_frameData[frameIndex % frameDataSize].m_decodeDependencyCounter;
-}
-
-#ifndef _RELEASE
-namespace
-{
-    void Draw2DBox(float x, float y, float width, float height, const ColorB& color, float screenHeight, float screenWidth, IRenderAuxGeom* pAuxRenderer)
-    {
-        float position[4][2] = {
-            { x - 1.0f,                 y - 1.0f},
-            { x - 1.0f,                 y + height + 1.0f},
-            { x + width + 1.0f, y + height + 1.0f},
-            { x + width + 1.0f, y - 1.0f}
-        };
-
-        Vec3 positions[4] = {
-            Vec3(position[0][0] / screenWidth, position[0][1] / screenHeight, 0.0f),
-            Vec3(position[1][0] / screenWidth, position[1][1] / screenHeight, 0.0f),
-            Vec3(position[2][0] / screenWidth, position[2][1] / screenHeight, 0.0f),
-            Vec3(position[3][0] / screenWidth, position[3][1] / screenHeight, 0.0f)
-        };
-
-        vtx_idx const indices[6] = { 0, 1, 2, 0, 2, 3 };
-
-        pAuxRenderer->DrawTriangles(positions, 4, indices, 6, color);
-    }
-
-    void Draw2DBoxOutLine(float x, float y, float width, float height, const ColorB& color, float screenHeight, float screenWidth, IRenderAuxGeom* pAuxRenderer)
-    {
-        float position[4][2] = {
-            { x - 1.0f,                 y - 1.0f},
-            { x - 1.0f,                 y + height + 1.0f},
-            { x + width + 1.0f, y + height + 1.0f},
-            { x + width + 1.0f, y - 1.0f}
-        };
-
-        Vec3 positions[4] = {
-            Vec3(position[0][0] / screenWidth, position[0][1] / screenHeight, 0.0f),
-            Vec3(position[1][0] / screenWidth, position[1][1] / screenHeight, 0.0f),
-            Vec3(position[2][0] / screenWidth, position[2][1] / screenHeight, 0.0f),
-            Vec3(position[3][0] / screenWidth, position[3][1] / screenHeight, 0.0f)
-        };
-
-
-        pAuxRenderer->DrawLine(positions[0], color, positions[1], color);
-        pAuxRenderer->DrawLine(positions[1], color, positions[2], color);
-        pAuxRenderer->DrawLine(positions[2], color, positions[3], color);
-        pAuxRenderer->DrawLine(positions[3], color, positions[0], color);
-    }
-
-    void DrawStream(const char* pBase, const size_t poolSize, const SGeomCacheBufferHandle* pFirstHandle, const ColorF& color, const float boxLeft, const float boxTop,
-        const float boxWidth, const float boxHeight, const float screenWidth, const float screenHeight, IRenderAuxGeom* pRenderAuxGeom)
-    {
-        const float bufferSize = (float)poolSize;
-        for (const SGeomCacheBufferHandle* pCurrentHandle = pFirstHandle; pCurrentHandle; pCurrentHandle = pCurrentHandle->m_pNext)
-        {
-            ColorF blockColor = color;
-
-            const float offset = (float)(pCurrentHandle->m_pBuffer - pBase);
-            const float size = (float)pCurrentHandle->m_bufferSize;
-
-            const float left = boxWidth * (offset / bufferSize);
-            const float width = boxWidth * (size / bufferSize);
-
-            Draw2DBox(boxLeft + left + 1, boxTop + 1, width - 3, boxHeight - 2, blockColor, screenHeight, screenWidth, pRenderAuxGeom);
-        }
-    }
-}
-
-void CGeomCacheManager::DrawDebugInfo()
-{
-    IRenderAuxGeom* const pRenderAuxGeom = gEnv->pRenderer->GetIRenderAuxGeom();
-
-    const SAuxGeomRenderFlags oldFlags = pRenderAuxGeom->GetRenderFlags();
-
-    SAuxGeomRenderFlags flags(e_Def2DPublicRenderflags);
-    flags.SetDepthTestFlag(e_DepthTestOff);
-    flags.SetDepthWriteFlag(e_DepthWriteOff);
-    flags.SetCullMode(e_CullModeNone);
-    flags.SetAlphaBlendMode(e_AlphaNone);
-    pRenderAuxGeom->SetRenderFlags(flags);
-
-    const float screenHeight = (float)gEnv->pRenderer->GetHeight();
-    const float screenWidth = (float)gEnv->pRenderer->GetWidth();
-
-    const float topOffset = screenHeight * 0.01f;
-    const float sideOffset = screenWidth * 0.01f;
-
-    const float bufferBoxTop = 2.0f + 8.0f * topOffset;
-    const float bufferBoxHeight = screenHeight * 0.05f;
-    const float bufferBoxLeft = sideOffset;
-    const float bufferBoxWidth = screenWidth * 0.5f;
-
-    float streamInfosTop = bufferBoxTop + bufferBoxHeight + 2.0f * topOffset;
-    const float streamInfoSpacing = 20.0f;
-    const float streamInfoBoxSize = 10.0f;
-
-    uint numActiveStreams = 0;
-
-    const uint kNumColors = 8;
-    ColorF colors[kNumColors] = { Col_Red, Col_Green, Col_Yellow, Col_Blue, Col_Aquamarine, Col_Thistle, Col_Tan, Col_Salmon };
-
-    uint colorIndex = 0;
-    const uint numStreams = m_streamInfos.size();
-    for (uint i = 0; i < numStreams; ++i)
-    {
-        SGeomCacheStreamInfo& streamInfo = *m_streamInfos[i];
-        CGeomCacheRenderNode* pRenderNode = streamInfo.m_pRenderNode;
-        CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
-        const char* pName = streamInfo.m_pRenderNode->GetName();
-
-        const bool bDisplay = ((GetCVars()->e_GeomCacheDebug != 2) || (pRenderNode->IsStreaming() || streamInfo.m_pOldestDecompressHandle || streamInfo.m_pNewestReadRequestHandle))
-            && strstr(pName, GetCVars()->e_GeomCacheDebugFilter->GetString()) != NULL;
-
-        if (bDisplay)
-        {
-            ColorF& color = colors[colorIndex % kNumColors];
-
-            DrawStream(reinterpret_cast<char*>(m_pPoolBaseAddress), m_poolSize, streamInfo.m_pOldestDecompressHandle, color, bufferBoxLeft, bufferBoxTop,
-                bufferBoxWidth, bufferBoxHeight, screenWidth, screenHeight, pRenderAuxGeom);
-            DrawStream(reinterpret_cast<char*>(m_pPoolBaseAddress), m_poolSize, streamInfo.m_pDecompressAbortListHead, color, bufferBoxLeft, bufferBoxTop,
-                bufferBoxWidth, bufferBoxHeight, screenWidth, screenHeight, pRenderAuxGeom);
-            DrawStream(reinterpret_cast<char*>(m_pPoolBaseAddress), m_poolSize, streamInfo.m_pOldestReadRequestHandle, color, bufferBoxLeft, bufferBoxTop,
-                bufferBoxWidth, bufferBoxHeight, screenWidth, screenHeight, pRenderAuxGeom);
-            DrawStream(reinterpret_cast<char*>(m_pPoolBaseAddress), m_poolSize, streamInfo.m_pReadAbortListHead, color, bufferBoxLeft, bufferBoxTop,
-                bufferBoxWidth, bufferBoxHeight, screenWidth, screenHeight, pRenderAuxGeom);
-
-            const float currentTop = streamInfosTop + streamInfoSpacing * 2.5f * numActiveStreams;
-            Draw2DBox(sideOffset, currentTop, streamInfoBoxSize, streamInfoBoxSize, color, screenHeight, screenWidth, pRenderAuxGeom);
-
-            const float wantedPlaybackTime = streamInfo.m_wantedPlaybackTime;
-            const uint wantedFloorFrame = streamInfo.m_wantedFloorFrame;
-            const uint wantedCeilFrame = streamInfo.m_wantedCeilFrame;
-            const int oldestDiskFrame = streamInfo.m_pOldestReadRequestHandle ? streamInfo.m_pOldestReadRequestHandle->m_startFrame : -1;
-            const int newestDiskFrame = streamInfo.m_pNewestReadRequestHandle ? streamInfo.m_pNewestReadRequestHandle->m_endFrame : -1;
-            const int oldestDecompressFrame = streamInfo.m_pOldestDecompressHandle ? streamInfo.m_pOldestDecompressHandle->m_startFrame : -1;
-            const int newestDecompressFrame = streamInfo.m_pNewestDecompressHandle ? streamInfo.m_pNewestDecompressHandle->m_endFrame : -1;
-
-            IGeomCache::SStatistics stats = pGeomCache->GetStatistics();
-
-            const char* pCompressionMethod = "Store";
-            if (pGeomCache->GetBlockCompressionFormat() == GeomCacheFile::eBlockCompressionFormat_Deflate)
-            {
-                pCompressionMethod = "Deflate";
-            }
-            else if (pGeomCache->GetBlockCompressionFormat() == GeomCacheFile::eBlockCompressionFormat_LZ4HC)
-            {
-                pCompressionMethod = "LZ4 HC";
-            }
-            else if (pGeomCache->GetBlockCompressionFormat() == GeomCacheFile::eBlockCompressionFormat_ZSTD)
-            {
-                pCompressionMethod = "ZSTD";
-            }
-            gEnv->pRenderer->Draw2dLabel(sideOffset + streamInfoSpacing, currentTop - 5.0f, 1.5f, Col_White, false, "%s - %.3gs %s- %.3g MiB/s - %s - %d frames missed",
-                streamInfo.m_pRenderNode->GetName(), pGeomCache->GetDuration(), streamInfo.m_bLooping ? "looping " : "", stats.m_averageAnimationDataRate, pCompressionMethod, streamInfo.m_numFramesMissed);
-            gEnv->pRenderer->Draw2dLabel(sideOffset + streamInfoSpacing, streamInfoSpacing + currentTop - 5.0f, 1.5f, Col_White, false,
-                "Frame: [%04u, %04u], Disk Frames: [%04u, %04u], Decompress Frames: [%04u, %04u], Playback time: %g", wantedFloorFrame, wantedCeilFrame,
-                oldestDiskFrame, newestDiskFrame, oldestDecompressFrame, newestDecompressFrame, wantedPlaybackTime);
-
-            ++numActiveStreams;
-            ++colorIndex;
-        }
-    }
-
-    const uint numAbortedStreams = m_streamInfosAbortList.size();
-    gEnv->pRenderer->Draw2dLabel(sideOffset, topOffset, 1.5f, Col_Yellow, false, "%u Geometry Cache(s) active", numActiveStreams);
-    gEnv->pRenderer->Draw2dLabel(sideOffset, 3.5f * topOffset, 1.5f, (m_numMissedFrames > 0) ? Col_Red : Col_Green, false, "%u Frames missed", m_numMissedFrames);
-    gEnv->pRenderer->Draw2dLabel(sideOffset + 160.0f, 3.5f * topOffset, 1.5f, (m_numStreamAborts > 0) ? Col_Red : Col_Green, false, "%u Stream aborts (err: %u, decomp: %u, read: %u)",
-        m_numStreamAborts, m_numErrorAborts, m_numDecompressStreamAborts, m_numReadStreamAborts);
-    gEnv->pRenderer->Draw2dLabel(sideOffset + 520.0f, 3.5f * topOffset, 1.5f, (m_numFailedAllocs > 0) ? Col_Yellow : Col_Green, false, "%u Failed alloc(s)", m_numFailedAllocs);
-    gEnv->pRenderer->Draw2dLabel(sideOffset + 670.0f, 3.5f * topOffset, 1.5f, (numAbortedStreams > 0) ? Col_Yellow : Col_Green, false, "%u Aborted stream(s)", numAbortedStreams);
-
-    gEnv->pRenderer->Draw2dLabel(sideOffset, 6.0f * topOffset, 1.25f, Col_White, false, "Geom Cache Buffer:");
-    Draw2DBoxOutLine(bufferBoxLeft, bufferBoxTop, bufferBoxWidth, bufferBoxHeight, Col_White, screenHeight, screenWidth, pRenderAuxGeom);
-
-    pRenderAuxGeom->SetRenderFlags(oldFlags);
-}
-#endif
-
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheManager.h b/Code/CryEngine/Cry3DEngine/GeomCacheManager.h
deleted file mode 100644
index 43e90c21ca..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheManager.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Manages geometry cache instances and streaming
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_GEOMCACHEMANAGER_H
-#define CRYINCLUDE_CRY3DENGINE_GEOMCACHEMANAGER_H
-#pragma once
-
-#if defined(USE_GEOM_CACHES)
-
-#include "GeomCacheDecoder.h"
-#include "GeomCacheMeshManager.h"
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-class CGeomCache;
-class CGeomCacheRenderNode;
-
-struct SGeomCacheStreamInfo;
-
-struct SGeomCacheBufferHandle
-{
-    SGeomCacheBufferHandle()
-    {
-        m_pNext = NULL;
-        m_startFrame = 0;
-        m_endFrame = 0;
-        m_bufferSize = 0;
-        m_pBuffer = NULL;
-        m_pStream = NULL;
-        m_numJobReferences = 0;
-    }
-
-    volatile int m_numJobReferences;
-    uint32 m_bufferSize;
-    uint32 m_startFrame;
-    uint32 m_endFrame;
-    char* m_pBuffer;
-
-    SGeomCacheStreamInfo* m_pStream;
-    CTimeValue m_frameTime;
-
-    // Next buffer handle for this stream or in the free list
-    SGeomCacheBufferHandle* m_pNext;
-
-    CryConditionVariable m_jobReferencesCV;
-};
-
-// This handle represents a block in the read buffer
-struct SGeomCacheReadRequestHandle
-    : public SGeomCacheBufferHandle
-    , public IStreamCallback
-{
-    // IStreamCallback
-    virtual void StreamOnComplete([[maybe_unused]] IReadStream* pStream, [[maybe_unused]] unsigned nError) {}
-    virtual void StreamAsyncOnComplete(IReadStream* pStream, unsigned nError)
-    {
-        if (nError != 0 && nError != ERROR_USER_ABORT)
-        {
-            string error = "Geom cache read request failed with error: " + string(pStream->GetErrorName());
-            gEnv->pLog->LogError("%s", error.c_str());
-        }
-
-        m_state = eRRHS_FinishedRead;
-        m_error = nError;
-
-        if (CryInterlockedDecrement(&m_numJobReferences) == 0)
-        {
-            m_jobReferencesCV.Notify();
-        }
-    }
-
-    enum EReadRequestHandleState
-    {
-        eRRHS_Reading = 0,
-        eRRHS_FinishedRead = 1,
-        eRRHS_Decompressing = 2,
-        eRRHS_Done = 3
-    };
-
-    volatile EReadRequestHandleState m_state;
-    volatile long m_error;
-    IReadStreamPtr m_pReadStream;
-};
-
-struct SGeomCacheStreamInfo
-{
-    SGeomCacheStreamInfo(CGeomCacheRenderNode* pRenderNode, CGeomCache* pGeomCache, const uint numFrames)
-        : m_pRenderNode(pRenderNode)
-        , m_pGeomCache(pGeomCache)
-        , m_numFrames(numFrames)
-        , m_displayedFrameTime(-1.0f)
-        , m_wantedPlaybackTime(0.0f)
-        , m_wantedFloorFrame(0)
-        , m_wantedCeilFrame(0)
-        , m_sameFrameFillCount(0)
-        , m_numFramesMissed(0)
-        , m_pOldestReadRequestHandle(NULL)
-        , m_pNewestReadRequestHandle(NULL)
-        , m_pReadAbortListHead(NULL)
-        ,   m_pOldestDecompressHandle(NULL)
-        , m_pNewestDecompressHandle(NULL)
-        , m_pDecompressAbortListHead(NULL)
-        , m_bAbort(0L)
-        , m_bLooping(false)
-    {}
-
-    CGeomCacheRenderNode* m_pRenderNode;
-    CGeomCache* m_pGeomCache;
-
-    uint m_numFrames;
-
-    volatile float m_displayedFrameTime;
-    volatile float m_wantedPlaybackTime;
-    volatile uint m_wantedFloorFrame;
-    volatile uint m_wantedCeilFrame;
-    volatile int m_sameFrameFillCount;
-
-    uint m_numFramesMissed;
-
-    SGeomCacheReadRequestHandle* m_pOldestReadRequestHandle;
-    SGeomCacheReadRequestHandle* m_pNewestReadRequestHandle;
-    SGeomCacheReadRequestHandle* m_pReadAbortListHead;
-
-    SGeomCacheBufferHandle* m_pOldestDecompressHandle;
-    SGeomCacheBufferHandle* m_pNewestDecompressHandle;
-    SGeomCacheBufferHandle* m_pDecompressAbortListHead;
-
-    volatile bool m_bAbort;
-    CryCriticalSection m_abortCS;
-
-    bool m_bLooping;
-
-    AZ::LegacyJobExecutor m_fillRenderNodeJobExecutor;
-
-    struct SFrameData
-    {
-        bool m_bDecompressJobLaunched;
-
-        // For each frame we initialize a counter to the number of jobs
-        // that need to complete before the frame can be decoded.
-        //
-        // Each index frame has exactly one dependent job (inflate)
-        // The first B frame after an index frame has three dependencies (inflate + previous and last index frame)
-        // All other B frames have only two dependencies (inflate + previous B frame)
-        int m_decodeDependencyCounter;
-
-        // Pointer to decompress handle for this frame.
-        SGeomCacheBufferHandle* m_pDecompressHandle;
-    };
-
-    // Array with data for each frame
-    std::vector<SFrameData> m_frameData;
-};
-
-struct SDecodeFrameJobData
-{
-    uint m_frameIndex;
-    const CGeomCache* m_pGeomCache;
-    SGeomCacheStreamInfo* m_pStreamInfo;
-};
-
-class CGeomCacheManager
-    : public Cry3DEngineBase
-    , public AzFramework::LegacyAssetEventBus::Handler
-{
-public:
-    CGeomCacheManager();
-    ~CGeomCacheManager();
-
-    // Called during level unload to free all resource references
-    void Reset();
-
-    CGeomCache* LoadGeomCache(const char* szFileName);
-    void DeleteGeomCache(CGeomCache* pGeomCache);
-
-    void StreamingUpdate();
-
-    void RegisterForStreaming(CGeomCacheRenderNode* pRenderNode);
-    void UnRegisterForStreaming(CGeomCacheRenderNode* pRenderNode, bool bWaitForJobs);
-
-    float GetPrecachedTime(const IGeomCacheRenderNode* pRenderNode);
-
-#ifndef _RELEASE
-    void DrawDebugInfo();
-    void ResetDebugInfo() { m_numMissedFrames = 0; m_numStreamAborts = 0; m_numFailedAllocs = 0; }
-#endif
-
-    void DecompressFrame_JobEntry(SGeomCacheStreamInfo* pStreamInfo, const uint blockIndex,
-        SGeomCacheBufferHandle* pDecompressHandle, SGeomCacheReadRequestHandle* pReadRequestHandle);
-
-    void FillRenderNodeAsync_JobEntry(SGeomCacheStreamInfo* pStreamInfo);
-
-    void DecodeIFrame_JobEntry(SDecodeFrameJobData jobState);
-    void DecodeBFrame_JobEntry(SDecodeFrameJobData jobState);
-
-    CGeomCacheMeshManager& GetMeshManager() { return m_meshManager; }
-
-    void StopCacheStreamsAndWait(CGeomCache* pGeomCache);
-
-    CGeomCache* FindGeomCacheByFilename(const char* filename);
-
-    // For changing the buffer size on runtime. This will do a blocking wait on all active streams,
-    // so it should only be called when we are sure that no caches are playing (e.g. on level load)
-    void ChangeBufferSize(const uint newSizeInMiB);
-
-private:
-
-    // override from LegacyAssetEventBus::Handler
-    void OnFileChanged(AZStd::string assetPath) override;
-
-    static void OnChangeBufferSize(ICVar* pCVar);
-
-    void ReinitializeStreamFrameData(SGeomCacheStreamInfo& streamInfo, uint startFrame, uint endFrame);
-
-    void UnloadGeomCaches();
-
-    bool IssueDiskReadRequest(SGeomCacheStreamInfo& pStreamInfo);
-
-    void LaunchStreamingJobs(const uint numStreams, const CTimeValue currentFrameTime);
-    void LaunchDecompressJobs(SGeomCacheStreamInfo* pStreamInfo, const CTimeValue currentFrameTime);
-    void LaunchDecodeJob(SDecodeFrameJobData jobState);
-
-    template<class TBufferHandleType>
-    TBufferHandleType* NewBufferHandle(const uint32 size, SGeomCacheStreamInfo& streamInfo);
-    SGeomCacheReadRequestHandle* NewReadRequestHandle(const uint32 size, SGeomCacheStreamInfo& streamInfo);
-
-    void RetireHandles(SGeomCacheStreamInfo& streamInfo);
-    void RetireOldestReadRequestHandle(SGeomCacheStreamInfo& streamInfo);
-    void RetireOldestDecompressHandle(SGeomCacheStreamInfo& streamInfo);
-    void RetireDecompressHandle(SGeomCacheStreamInfo& streamInfo, SGeomCacheBufferHandle* pHandle);
-    template<class TBufferHandleType>
-    void RetireBufferHandle(TBufferHandleType* pHandle);
-
-    void RetireRemovedStreams();
-    void ValidateStream(SGeomCacheStreamInfo& streamInfo);
-    void AbortStream(SGeomCacheStreamInfo& streamInfo);
-    void AbortStreamAndWait(SGeomCacheStreamInfo& streamInfo);
-    void RetireAbortedHandles(SGeomCacheStreamInfo& streamInfo);
-
-    SGeomCacheBufferHandle* GetFrameDecompressHandle(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex);
-    SGeomCacheFrameHeader* GetFrameDecompressHeader(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex);
-    char* GetFrameDecompressData(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex);
-    int* GetDependencyCounter(SGeomCacheStreamInfo* pStreamInfo, const uint frameIndex);
-
-    void* m_pPoolBaseAddress;
-    IGeneralMemoryHeap* m_pPool;
-    size_t m_poolSize;
-
-    uint m_lastRequestStream;
-
-    uint m_numMissedFrames;
-    uint m_numStreamAborts;
-    uint m_numErrorAborts;
-    uint m_numDecompressStreamAborts;
-    uint m_numReadStreamAborts;
-    uint m_numFailedAllocs;
-
-    typedef std::vector<SGeomCacheStreamInfo*>::iterator TStreamInfosIter;
-    std::vector<SGeomCacheStreamInfo*> m_streamInfos;
-    std::vector<SGeomCacheStreamInfo*> m_streamInfosAbortList;
-
-    typedef std::map<string, CGeomCache*, stl::less_stricmp<string> > TGeomCacheMap;
-    TGeomCacheMap m_nameToGeomCacheMap;
-
-    CGeomCacheMeshManager m_meshManager;
-};
-
-#endif
-#endif // CRYINCLUDE_CRY3DENGINE_GEOMCACHEMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheMeshManager.cpp b/Code/CryEngine/Cry3DEngine/GeomCacheMeshManager.cpp
deleted file mode 100644
index 8c12c38ed8..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheMeshManager.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Manages static meshes for geometry caches
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#if defined(USE_GEOM_CACHES)
-
-#include "GeomCacheMeshManager.h"
-#include "GeomCacheDecoder.h"
-
-void CGeomCacheMeshManager::Reset()
-{
-    stl::free_container(m_meshMap);
-}
-
-bool CGeomCacheMeshManager::ReadMeshStaticData(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, SGeomCacheStaticMeshData& staticMeshData) const
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (staticMeshData.m_constantStreams & GeomCacheFile::eStream_Indices)
-    {
-        if (!ReadMeshIndices(reader, meshInfo, staticMeshData, staticMeshData.m_indices))
-        {
-            return false;
-        }
-    }
-
-    if ((staticMeshData.m_constantStreams & GeomCacheFile::eStream_Positions) != 0)
-    {
-        staticMeshData.m_positions.resize(staticMeshData.m_numVertices);
-
-        strided_pointer<Vec3> positions(&staticMeshData.m_positions[0], sizeof(Vec3));
-        if (!ReadMeshPositions(reader, meshInfo, positions))
-        {
-            return false;
-        }
-    }
-
-    if ((staticMeshData.m_constantStreams & GeomCacheFile::eStream_Texcoords) != 0)
-    {
-        staticMeshData.m_texcoords.resize(staticMeshData.m_numVertices);
-
-        strided_pointer<Vec2> texcoords(&staticMeshData.m_texcoords[0], sizeof(Vec2));
-        if (!ReadMeshTexcoords(reader, meshInfo, texcoords))
-        {
-            return false;
-        }
-    }
-
-    if ((staticMeshData.m_constantStreams & GeomCacheFile::eStream_QTangents) != 0)
-    {
-        staticMeshData.m_tangents.resize(staticMeshData.m_numVertices);
-
-        strided_pointer<SPipTangents> tangents(&staticMeshData.m_tangents[0], sizeof(SPipTangents));
-        if (!ReadMeshQTangents(reader, meshInfo, tangents))
-        {
-            return false;
-        }
-    }
-
-    if ((staticMeshData.m_constantStreams & GeomCacheFile::eStream_Colors) != 0)
-    {
-        UCol defaultColor;
-        defaultColor.dcolor = 0xFFFFFFFF;
-        staticMeshData.m_colors.resize(staticMeshData.m_numVertices, defaultColor);
-
-        strided_pointer<UCol> colors(&staticMeshData.m_colors[0], sizeof(UCol));
-        if (!ReadMeshColors(reader, meshInfo, colors))
-        {
-            return false;
-        }
-    }
-
-    if (staticMeshData.m_bUsePredictor)
-    {
-        uint32 predictorDataSize;
-        if (!reader.Read(&predictorDataSize))
-        {
-            return false;
-        }
-
-        staticMeshData.m_predictorData.resize(predictorDataSize);
-        if (!reader.Read(&staticMeshData.m_predictorData[0], predictorDataSize))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-_smart_ptr<IRenderMesh> CGeomCacheMeshManager::ConstructStaticRenderMesh(CGeomCacheStreamReader& reader,
-    const GeomCacheFile::SMeshInfo& meshInfo, SGeomCacheStaticMeshData& staticMeshData, const char* pFileName)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    std::vector<char> vertexData(staticMeshData.m_numVertices * sizeof(SVF_P3F_C4B_T2F), 0);
-    std::vector<SPipTangents> tangentData(staticMeshData.m_numVertices);
-
-    std::vector<vtx_idx> indices;
-    strided_pointer<Vec3> positions((Vec3*)(&vertexData[0] + offsetof(SVF_P3F_C4B_T2F, xyz)), sizeof(SVF_P3F_C4B_T2F));
-    strided_pointer<UCol> colors((UCol*)(&vertexData[0] + offsetof(SVF_P3F_C4B_T2F, color)), sizeof(SVF_P3F_C4B_T2F));
-    strided_pointer<Vec2> texcoords((Vec2*)(&vertexData[0] + offsetof(SVF_P3F_C4B_T2F, st)), sizeof(SVF_P3F_C4B_T2F));
-    strided_pointer<SPipTangents> tangents((SPipTangents*)((char*)(&tangentData[0])), sizeof(SPipTangents));
-
-    if (!ReadMeshIndices(reader, meshInfo, staticMeshData, indices)
-        || !ReadMeshPositions(reader, meshInfo, positions)
-        || !ReadMeshTexcoords(reader, meshInfo, texcoords)
-        || !ReadMeshQTangents(reader, meshInfo, tangents))
-    {
-        return NULL;
-    }
-
-    if (meshInfo.m_constantStreams & GeomCacheFile::eStream_Colors)
-    {
-        if (!ReadMeshColors(reader, meshInfo, colors))
-        {
-            return NULL;
-        }
-    }
-    else
-    {
-        UCol defaultColor;
-        defaultColor.dcolor = 0xFFFFFFFF;
-
-        const uint numVertices = meshInfo.m_numVertices;
-        for (uint i = 0; i < numVertices; ++i)
-        {
-            colors[i] = defaultColor;
-        }
-    }
-
-    TMeshMap::iterator findIter = m_meshMap.find(staticMeshData.m_hash);
-    if (findIter != m_meshMap.end())
-    {
-        ++findIter->second.m_refCount;
-        return findIter->second.m_pRenderMesh;
-    }
-
-    _smart_ptr<IRenderMesh> pRenderMesh = gEnv->pRenderer->CreateRenderMeshInitialized(&vertexData[0], meshInfo.m_numVertices,
-            eVF_P3F_C4B_T2F, &indices[0], indices.size(), prtTriangleList, "GeomCacheConstantMesh", pFileName, eRMT_Static, 1, 0,
-            NULL, NULL, false, false, &tangentData[0]);
-
-    CRenderChunk chunk;
-    chunk.nNumVerts = meshInfo.m_numVertices;
-    uint32 currentIndexOffset = 0;
-
-    for (unsigned int i = 0; i < meshInfo.m_numMaterials; ++i)
-    {
-        chunk.nFirstIndexId = currentIndexOffset;
-        chunk.nNumIndices = staticMeshData.m_numIndices[i];
-        chunk.m_nMatID = staticMeshData.m_materialIds[i];
-        chunk.m_vertexFormat = eVF_P3F_C4B_T2F;
-        pRenderMesh->SetChunk(i, chunk);
-        currentIndexOffset += chunk.nNumIndices;
-    }
-
-    SMeshMapInfo meshMapInfo;
-    meshMapInfo.m_refCount = 1;
-    meshMapInfo.m_pRenderMesh = pRenderMesh;
-
-    m_meshMap[staticMeshData.m_hash] = meshMapInfo;
-    return pRenderMesh;
-}
-
-_smart_ptr<IRenderMesh> CGeomCacheMeshManager::GetStaticRenderMesh(const uint64 hash) const
-{
-    TMeshMap::const_iterator findIter = m_meshMap.find(hash);
-    if (findIter != m_meshMap.end())
-    {
-        return findIter->second.m_pRenderMesh;
-    }
-
-    return NULL;
-}
-
-void CGeomCacheMeshManager::RemoveReference(SGeomCacheStaticMeshData& staticMeshData)
-{
-    TMeshMap::iterator findIter = m_meshMap.find(staticMeshData.m_hash);
-    if (findIter != m_meshMap.end())
-    {
-        uint& refCount = findIter->second.m_refCount;
-        --refCount;
-
-        if (refCount == 0)
-        {
-            m_meshMap.erase(findIter);
-        }
-    }
-}
-
-bool CGeomCacheMeshManager::ReadMeshIndices(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo,
-    SGeomCacheStaticMeshData& staticMeshData, std::vector<vtx_idx>& indices) const
-{
-    const uint16 numMaterials = meshInfo.m_numMaterials;
-    staticMeshData.m_numIndices.reserve(numMaterials);
-
-    for (unsigned int i = 0; i < numMaterials; ++i)
-    {
-        uint32 numIndices;
-        if (!reader.Read(&numIndices))
-        {
-            return false;
-        }
-
-        staticMeshData.m_numIndices.push_back(numIndices);
-
-        const uint indicesStart = indices.size();
-        indices.resize(indicesStart + numIndices);
-        if (!reader.Read(&indices[indicesStart], numIndices))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CGeomCacheMeshManager::ReadMeshPositions(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<Vec3> positions) const
-{
-    const Vec3 aabbMin = Vec3(meshInfo.m_aabbMin[0], meshInfo.m_aabbMin[1], meshInfo.m_aabbMin[2]);
-    const Vec3 aabbMax = Vec3(meshInfo.m_aabbMax[0], meshInfo.m_aabbMax[1], meshInfo.m_aabbMax[2]);
-    const AABB meshAABB(aabbMin, aabbMax);
-    const Vec3 aabbSize = meshAABB.GetSize();
-    const Vec3 posConvertFactor = Vec3(1.0f / float((2 << (meshInfo.m_positionPrecision[0] - 1)) - 1),
-            1.0f / float((2 << (meshInfo.m_positionPrecision[1] - 1)) - 1),
-            1.0f / float((2 << (meshInfo.m_positionPrecision[2] - 1)) - 1));
-
-    const uint numVertices = meshInfo.m_numVertices;
-    for (uint i = 0; i < numVertices; ++i)
-    {
-        GeomCacheFile::Position position;
-
-        if (!reader.Read(&position))
-        {
-            return false;
-        }
-
-        positions[i] = GeomCacheDecoder::DecodePosition(aabbMin, aabbSize, position, posConvertFactor);
-    }
-
-    return true;
-}
-
-bool CGeomCacheMeshManager::ReadMeshTexcoords(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<Vec2> texcoords) const
-{
-    const uint numVertices = meshInfo.m_numVertices;
-    for (uint i = 0; i < numVertices; ++i)
-    {
-        GeomCacheFile::Texcoords texcoord;
-
-        if (!reader.Read(&texcoord))
-        {
-            return false;
-        }
-
-        texcoords[i] = GeomCacheDecoder::DecodeTexcoord(texcoord, meshInfo.m_uvMax);
-    }
-
-    return true;
-}
-
-bool CGeomCacheMeshManager::ReadMeshQTangents(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<SPipTangents> tangents) const
-{
-    const uint numVertices = meshInfo.m_numVertices;
-    for (uint i = 0; i < numVertices; ++i)
-    {
-        GeomCacheFile::QTangent qTangent;
-
-        if (!reader.Read(&qTangent))
-        {
-            return false;
-        }
-
-        Quat qDecodedTangent = GeomCacheDecoder::DecodeQTangent(qTangent);
-        GeomCacheDecoder::ConvertToTangentAndBitangent(qDecodedTangent, tangents[i]);
-    }
-
-    return true;
-}
-
-bool CGeomCacheMeshManager::ReadMeshColors(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<UCol> colors) const
-{
-    const uint numVertices = meshInfo.m_numVertices;
-    for (int colorIndex = 2; colorIndex >= 0; --colorIndex)
-    {
-        for (uint i = 0; i < numVertices; ++i)
-        {
-            GeomCacheFile::Color color;
-
-            if (!reader.Read(&color))
-            {
-                return false;
-            }
-
-            colors[i].bcolor[colorIndex] = color;
-        }
-    }
-
-    for (uint i = 0; i < numVertices; ++i)
-    {
-        GeomCacheFile::Color color;
-
-        if (!reader.Read(&color))
-        {
-            return false;
-        }
-
-        colors[i].bcolor[3] = color;
-    }
-
-    return true;
-}
-
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheMeshManager.h b/Code/CryEngine/Cry3DEngine/GeomCacheMeshManager.h
deleted file mode 100644
index 3c2f62d8b7..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheMeshManager.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Manages static meshes for geometry caches
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_GEOMCACHEMESHMANAGER_H
-#define CRYINCLUDE_CRY3DENGINE_GEOMCACHEMESHMANAGER_H
-#pragma once
-
-#if defined(USE_GEOM_CACHES)
-
-#include "IRenderMesh.h"
-#include "GeomCacheFileFormat.h"
-#include "GeomCache.h"
-#include <StlUtils.h>
-
-class CGeomCacheMeshManager
-{
-public:
-    void Reset();
-
-    bool ReadMeshStaticData(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, SGeomCacheStaticMeshData& staticMeshData) const;
-    _smart_ptr<IRenderMesh> ConstructStaticRenderMesh(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo,
-        SGeomCacheStaticMeshData& staticMeshData, const char* pFileName);
-    _smart_ptr<IRenderMesh> GetStaticRenderMesh(const uint64 hash) const;
-    void RemoveReference(SGeomCacheStaticMeshData& staticMeshData);
-private:
-    bool ReadMeshIndices(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo,
-        SGeomCacheStaticMeshData& staticMeshData, std::vector<vtx_idx>& indices) const;
-    bool ReadMeshPositions(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<Vec3> positions) const;
-    bool ReadMeshTexcoords(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<Vec2> texcoords) const;
-    bool ReadMeshQTangents(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<SPipTangents> tangents) const;
-    bool ReadMeshColors(CGeomCacheStreamReader& reader, const GeomCacheFile::SMeshInfo& meshInfo, strided_pointer<UCol> colors) const;
-
-    struct SMeshMapInfo
-    {
-        _smart_ptr<IRenderMesh> m_pRenderMesh;
-        uint m_refCount;
-    };
-
-    // Map from mesh hash to render mesh
-    typedef AZStd::unordered_map<uint64, SMeshMapInfo> TMeshMap;
-    TMeshMap m_meshMap;
-};
-
-#endif
-#endif // CRYINCLUDE_CRY3DENGINE_GEOMCACHEMESHMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/GeomCachePredictors.h b/Code/CryEngine/Cry3DEngine/GeomCachePredictors.h
deleted file mode 100644
index c6a3c44f6e..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCachePredictors.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Predictors for index frame compression
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_GEOMCACHEPREDICTORS_H
-#define CRYINCLUDE_CRY3DENGINE_GEOMCACHEPREDICTORS_H
-#pragma once
-
-#include "GeomCacheFileFormat.h"
-#include "Cry3DEngineTraits.h"
-
-namespace GeomCachePredictors
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Index frame prediction
-    //////////////////////////////////////////////////////////////////////////
-
-    template<class T, bool kbEncode>
-    void ParallelogramPredictor(const uint numValues, T* pIn, T* pOut, const std::vector<uint16>& predictorData)
-    {
-        T* pAbsoluteValues = kbEncode ? pIn : pOut;
-        uint outPosition = 0;
-
-        for (uint i = 0, predictorDataPos = 0; i < numValues; ++i)
-        {
-            const uint16 uDist = predictorData[predictorDataPos++];
-            T predictedValue;
-
-            if (uDist == 0xFFFF)
-            {
-                if (i == 0)
-                {
-                    // There is no previous value, so we just pass through
-                    pOut[outPosition++] = pIn[i];
-                    continue;
-                }
-
-                // No neighbour triangle, just use previous value for prediction
-                predictedValue = pAbsoluteValues[i - 1];
-            }
-            else
-            {
-                // Parallelogram prediction
-                const uint16 vDist = predictorData[predictorDataPos++];
-                const uint16 wDist = predictorData[predictorDataPos++];
-
-                const T& u = pAbsoluteValues[i - uDist];
-                const T& v = pAbsoluteValues[i - vDist];
-                const T& w = pAbsoluteValues[i - wDist];
-
-                predictedValue = u + v - w;
-            }
-
-            if (kbEncode)
-            {
-                const T realValue = pIn[i];
-                const T delta = realValue - predictedValue;
-                pOut[outPosition++] = delta;
-            }
-            else
-            {
-                const T delta = pIn[i];
-                const T realValue = delta + predictedValue;
-                pOut[outPosition++] = realValue;
-            }
-        }
-    }
-
-    template<bool kbEncode>
-    void QTangentPredictor(const uint numValues, const GeomCacheFile::QTangent* pIn, GeomCacheFile::QTangent* pOut, const std::vector<uint16>& predictorData)
-    {
-        const GeomCacheFile::QTangent* pAbsoluteValues = kbEncode ? pIn : pOut;
-        uint outPosition = 0;
-
-        for (uint i = 0, predictorDataPos = 0; i < numValues; ++i)
-        {
-            const uint16 uDist = predictorData[predictorDataPos++];
-            Vec4_tpl<int32> predictedValue;
-
-            if (uDist == 0xFFFF)
-            {
-                if (i == 0)
-                {
-                    // There is no previous value, so we just pass through
-                    pOut[outPosition++] = pIn[i];
-                    continue;
-                }
-
-                // No neighbour triangle, just use previous value for prediction
-                predictedValue = pAbsoluteValues[i - 1];
-            }
-            else
-            {
-                // Average value of two nearest vertices of adjancent triangle
-                const uint16 vDist = predictorData[predictorDataPos++];
-                ++predictorDataPos;
-
-                const GeomCacheFile::QTangent& u = pAbsoluteValues[i - uDist];
-                const GeomCacheFile::QTangent& v = pAbsoluteValues[i - vDist];
-                predictedValue = Vec4_tpl<int32>(u) + Vec4_tpl<int32>(v);
-
-                // Vec4_tpl defines division in a way that only works for floats
-                predictedValue.x /= 2;
-                predictedValue.y /= 2;
-                predictedValue.z /= 2;
-                predictedValue.w /= 2;
-            }
-
-            if (kbEncode)
-            {
-                const GeomCacheFile::QTangent& realValue = pIn[i];
-                const GeomCacheFile::QTangent delta = realValue - predictedValue;
-                pOut[outPosition++] = delta;
-            }
-            else
-            {
-                const GeomCacheFile::QTangent delta = pIn[i];
-                const GeomCacheFile::QTangent realValue = delta + predictedValue;
-                pOut[outPosition++] = realValue;
-            }
-        }
-    }
-
-    template<bool kbEncode>
-    inline void ColorPredictor(const uint numValues, const GeomCacheFile::Color* pIn, GeomCacheFile::Color* pOut, const std::vector<uint16>& predictorData)
-    {
-        const GeomCacheFile::Color* pAbsoluteValues = kbEncode ? pIn : pOut;
-        uint outPosition = 0;
-
-        for (uint i = 0, predictorDataPos = 0; i < numValues; ++i)
-        {
-            const uint16 uDist = predictorData[predictorDataPos++];
-            int32 predictedValue;
-
-            if (uDist == 0xFFFF)
-            {
-                if (i == 0)
-                {
-                    // There is no previous value, so we just pass through
-                    pOut[outPosition++] = pIn[i];
-                    continue;
-                }
-
-                // No neighbour triangle, just use previous value for prediction
-                predictedValue = pAbsoluteValues[i - 1];
-            }
-            else
-            {
-                // Average value of two nearest vertices of adjancent triangle
-                const uint16 vDist = predictorData[predictorDataPos++];
-                ++predictorDataPos;
-
-                const GeomCacheFile::Color& u = pAbsoluteValues[i - uDist];
-                const GeomCacheFile::Color& v = pAbsoluteValues[i - vDist];
-                predictedValue = (int32(u) + int32(v)) / 2;
-            }
-
-            if (kbEncode)
-            {
-                const GeomCacheFile::Color& realValue = pIn[i];
-                const GeomCacheFile::Color delta = realValue - predictedValue;
-                pOut[outPosition++] = delta;
-            }
-            else
-            {
-                const GeomCacheFile::Color delta = pIn[i];
-                const GeomCacheFile::Color realValue = delta + predictedValue;
-                pOut[outPosition++] = realValue;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Temporal prediction
-    //////////////////////////////////////////////////////////////////////////
-
-    // Motion predictor input data
-    template<class T>
-    struct STemporalPredictorData
-    {
-        uint m_numElements;
-        const T* m_pPrevFrames[2];
-        const T* m_pFloorFrame;
-        const T* m_pCeilFrame;
-    };
-
-    template<class T>
-    Vec2_tpl<T> operator>>(const Vec2_tpl<T>& v, uint shift)
-    {
-        Vec2_tpl<T> result = v;
-        result.x >>= shift;
-        result.y >>= shift;
-        return result;
-    }
-
-    template<class T>
-    Vec3_tpl<T> operator>>(const Vec3_tpl<T>& v, uint shift)
-    {
-        Vec3_tpl<T> result = v;
-        result.x >>= shift;
-        result.y >>= shift;
-        result.z >>= shift;
-        return result;
-    }
-
-    template<class T>
-    Vec4_tpl<T> operator>>(const Vec4_tpl<T>& v, uint shift)
-    {
-        Vec4_tpl<T> result = v;
-        result.x >>= shift;
-        result.y >>= shift;
-        result.z >>= shift;
-        result.w >>= shift;
-        return result;
-    }
-
-    template<class I, class T>
-    void InterpolateDeltaEncode(const uint numValues, const uint8 lerpFactor, const T* pFloorFrame, const T* pCeilFrame, const T* pIn, T* pOut)
-    {
-        for (uint i = 0; i < numValues; ++i)
-        {
-            const I floorValue = I(pFloorFrame[i]);
-            const I ceilValue = I(pCeilFrame[i]);
-            const T predictedValue = T(floorValue + (((ceilValue - floorValue) * lerpFactor) >> 8));
-
-            const T& realValue = pIn[i];
-            const T delta = realValue - predictedValue;
-            pOut[i] = delta;
-        }
-    }
-
-    template<class I, class T>
-    void MotionDeltaEncode(const uint numValues, const uint8 acceleration, const T* const pPrevFrames[2], const T* pIn, T* pOut)
-    {
-        for (uint i = 0; i < numValues; ++i)
-        {
-            const I prevPrevFrameValue = I(pPrevFrames[0][i]);
-            const I prevFrameValue = I(pPrevFrames[1][i]);
-            const T predictedValue = T(prevFrameValue + (((prevFrameValue - prevPrevFrameValue) * acceleration) >> 7));
-
-            const T& realValue = pIn[i];
-            const T delta = realValue - predictedValue;
-            pOut[i] = delta;
-        }
-    }
-
-    template<class I, class T, bool kbEncode>
-    void InterpolateMotionDeltaPredictor(const GeomCacheFile::STemporalPredictorControl& controlIn, const STemporalPredictorData<T>& data, const T* pIn, T* pOut)
-    {
-        const T* pFloorFrame = data.m_pFloorFrame;
-        const T* const pCeilFrame = data.m_pCeilFrame;
-        const T* const* pPrevFrames = data.m_pPrevFrames;
-
-        const uint8& lerpFactor = controlIn.m_indexFrameLerpFactor;
-        const uint8& acceleration = controlIn.m_acceleration;
-        const uint8 combineFactor = controlIn.m_combineFactor;
-
-        const uint numElements = data.m_numElements;
-        for (uint i = 0; i < numElements; ++i)
-        {
-            const I prevPrevFrameValue = I(pPrevFrames[0][i]);
-            const I prevFrameValue = I(pPrevFrames[1][i]);
-            const I floorValue = I(pFloorFrame[i]);
-            const I ceilValue = I(pCeilFrame[i]);
-
-            const I interpolatePredictedValue = T(floorValue + (((ceilValue - floorValue) * lerpFactor) >> 8));
-            const I motionPredictedValue = T(prevFrameValue + (((prevFrameValue - prevPrevFrameValue) * acceleration) >> 7));
-            const T predictedValue = (interpolatePredictedValue + (((motionPredictedValue - interpolatePredictedValue) * combineFactor) >> 7));
-
-            if (kbEncode)
-            {
-                const T realValue = pIn[i];
-                const T delta = realValue - predictedValue;
-                pOut[i] = delta;
-            }
-            else
-            {
-                const T delta = pIn[i];
-                const T realValue = delta + predictedValue;
-                pOut[i] = realValue;
-            }
-        }
-    }
-
-#if AZ_LEGACY_3DENGINE_TRAIT_DEFINE_MM_MULLO_EPI32_EMU
-    ILINE __m128i _mm_mullo_epi32_emu(const __m128i& a, const __m128i& b)
-    {
-    #if AZ_LEGACY_3DENGINE_TRAIT_HAS_MM_MULLO_EPI32
-        return _mm_mullo_epi32(a, b);
-    #else
-        __m128i tmp1 = _mm_mul_epu32(a, b);
-        __m128i tmp2 = _mm_mul_epu32(_mm_srli_si128(a, 4), _mm_srli_si128(b, 4));
-        return _mm_unpacklo_epi32(_mm_shuffle_epi32(tmp1, _MM_SHUFFLE(0, 0, 2, 0)), _mm_shuffle_epi32(tmp2, _MM_SHUFFLE(0, 0, 2, 0)));
-    #endif
-    }
-
-    ILINE __m128i _mm_packus_epi32_emu(__m128i& a, __m128i& b)
-    {
-#if AZ_LEGACY_3DENGINE_TRAIT_HAS_MM_PACKUS_EPI32
-        return _mm_packus_epi32(a, b);
-#else
-        a = _mm_slli_epi32(a, 16);
-        b = _mm_slli_epi32(b, 16);
-        a = _mm_srai_epi32(a, 16);
-        b = _mm_srai_epi32(b, 16);
-        return _mm_packs_epi32(a, b);
-#endif
-    }
-
-    ILINE __m128i Interpolate(__m128i a, __m128i b, __m128i c, const uint32 factor, const int shiftFactor)
-    {
-        const __m128i zero = _mm_setzero_si128();
-        const __m128i truncate = _mm_set_epi16(0, -1, 0, -1, 0, -1, 0, -1);
-
-        // Unpack to 2x4 32 bit integers
-        __m128i factors = _mm_set1_epi32(factor);
-
-        __m128i aLo = _mm_unpacklo_epi16(a, zero);
-        __m128i aHi = _mm_unpackhi_epi16(a, zero);
-        __m128i bLo = _mm_unpacklo_epi16(b, zero);
-        __m128i bHi = _mm_unpackhi_epi16(b, zero);
-
-        // Interpolate and pack again
-        __m128i lerpLo = _mm_sub_epi32(bLo, aLo);
-        lerpLo = _mm_mullo_epi32_emu(lerpLo, factors);
-        lerpLo = _mm_srli_epi32(lerpLo, shiftFactor);
-        lerpLo = _mm_and_si128(lerpLo, truncate);
-
-        __m128i lerpHi = _mm_sub_epi32(bHi, aHi);
-        lerpHi = _mm_mullo_epi32_emu(lerpHi, factors);
-        lerpHi = _mm_srli_epi32(lerpHi, shiftFactor);
-        lerpHi = _mm_and_si128(lerpHi, truncate);
-
-        __m128i lerp = _mm_packus_epi32_emu(lerpLo, lerpHi);
-        __m128i result = _mm_add_epi16(lerp, c);
-
-        return result;
-    }
-
-    template<>
-    void InterpolateMotionDeltaPredictor<uint32, uint16, false>
-        (const GeomCacheFile::STemporalPredictorControl& controlIn, const STemporalPredictorData<uint16>& data, const uint16* pIn, uint16* pOut)
-    {
-        __m128i* pRawIn = (__m128i*)pIn;
-        __m128i* pRawOut = (__m128i*)pOut;
-        __m128i* pFloorFrame = (__m128i*)data.m_pFloorFrame;
-        __m128i* pCeilFrame = (__m128i*)data.m_pCeilFrame;
-        __m128i* pPrevFrames[2] = { (__m128i*)data.m_pPrevFrames[0], (__m128i*)data.m_pPrevFrames[1] };
-
-        const uint8 lerpFactor = controlIn.m_indexFrameLerpFactor;
-        const uint8 acceleration = controlIn.m_acceleration;
-        const uint8 combineFactor = controlIn.m_combineFactor;
-
-        // vector store as much as possible, but account for cases where the output buffer
-        // size doesn't divide evenly by 8
-        const uint remainingElements = data.m_numElements % 8;
-        const uint numElementsPadded = data.m_numElements / 8 + (remainingElements != 0);
-        const uint lastElement = numElementsPadded - 1;
-        for (uint i = 0; i < numElementsPadded; ++i)
-        {
-            // Load 8 floor & ceil values
-            __m128i floorValues = _mm_load_si128(pFloorFrame + i);
-            __m128i ceilValues = _mm_load_si128(pCeilFrame + i);
-
-            // Load 8 prep prev & prev frame values
-            __m128i prevPrevFrameValues = _mm_load_si128(pPrevFrames[0] + i);
-            __m128i prevFrameValues = _mm_load_si128(pPrevFrames[1] + i);
-
-            // Calculate prediction
-            __m128i lerp = Interpolate(floorValues, ceilValues, floorValues, lerpFactor, 8);
-            __m128i motion = Interpolate(prevPrevFrameValues, prevFrameValues, prevFrameValues, acceleration, 7);
-            __m128i predictedValues = Interpolate(lerp, motion, lerp, combineFactor, 7);
-
-            __m128i delta = _mm_load_si128(pRawIn + i);
-            __m128i realValues = _mm_add_epi16(delta, predictedValues);
-            if (i == lastElement)
-            {
-                memcpy(pOut + (i * 8), &realValues, remainingElements * sizeof(uint16));
-            }
-            else
-            {
-                _mm_store_si128(pRawOut + i, realValues);
-            }
-        }
-    }
-
-    template<>
-    void InterpolateMotionDeltaPredictor<Vec2_tpl<uint32>, Vec2_tpl<uint16>, false>
-        (const GeomCacheFile::STemporalPredictorControl& controlIn, const STemporalPredictorData<Vec2_tpl<uint16> >& data,
-        const Vec2_tpl<uint16>* pIn, Vec2_tpl<uint16>* pOut)
-    {
-        STemporalPredictorData<uint16> uInt16Data;
-
-        uInt16Data.m_pFloorFrame = (uint16*)data.m_pFloorFrame;
-        uInt16Data.m_pCeilFrame = (uint16*)data.m_pCeilFrame;
-        uInt16Data.m_pPrevFrames[0] = (uint16*)data.m_pPrevFrames[0];
-        uInt16Data.m_pPrevFrames[1] = (uint16*)data.m_pPrevFrames[1];
-        uInt16Data.m_numElements = data.m_numElements * 2;
-
-        InterpolateMotionDeltaPredictor<uint32, uint16, false>(controlIn, uInt16Data, (uint16*)pIn, (uint16*)pOut);
-    }
-
-    template<>
-    void InterpolateMotionDeltaPredictor<Vec3_tpl<uint32>, Vec3_tpl<uint16>, false>
-        (const GeomCacheFile::STemporalPredictorControl& controlIn, const STemporalPredictorData<Vec3_tpl<uint16> >& data,
-        const Vec3_tpl<uint16>* pIn, Vec3_tpl<uint16>* pOut)
-    {
-        STemporalPredictorData<uint16> uInt16Data;
-
-        uInt16Data.m_pFloorFrame = (uint16*)data.m_pFloorFrame;
-        uInt16Data.m_pCeilFrame = (uint16*)data.m_pCeilFrame;
-        uInt16Data.m_pPrevFrames[0] = (uint16*)data.m_pPrevFrames[0];
-        uInt16Data.m_pPrevFrames[1] = (uint16*)data.m_pPrevFrames[1];
-        uInt16Data.m_numElements = data.m_numElements * 3;
-
-        InterpolateMotionDeltaPredictor<uint32, uint16, false>(controlIn, uInt16Data, (uint16*)pIn, (uint16*)pOut);
-    }
-
-    template<>
-    void InterpolateMotionDeltaPredictor<Vec4_tpl<uint32>, Vec4_tpl<uint16>, false>
-        (const GeomCacheFile::STemporalPredictorControl& controlIn, const STemporalPredictorData<Vec4_tpl<uint16> >& data,
-        const Vec4_tpl<uint16>* pIn, Vec4_tpl<uint16>* pOut)
-    {
-        STemporalPredictorData<uint16> uInt16Data;
-
-        uInt16Data.m_pFloorFrame = (uint16*)data.m_pFloorFrame;
-        uInt16Data.m_pCeilFrame = (uint16*)data.m_pCeilFrame;
-        uInt16Data.m_pPrevFrames[0] = (uint16*)data.m_pPrevFrames[0];
-        uInt16Data.m_pPrevFrames[1] = (uint16*)data.m_pPrevFrames[1];
-        uInt16Data.m_numElements = data.m_numElements * 4;
-
-        InterpolateMotionDeltaPredictor<uint32, uint16, false>(controlIn, uInt16Data, (uint16*)pIn, (uint16*)pOut);
-    }
-#endif
-}
-
-#endif // CRYINCLUDE_CRY3DENGINE_GEOMCACHEPREDICTORS_H
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheRenderNode.cpp b/Code/CryEngine/Cry3DEngine/GeomCacheRenderNode.cpp
deleted file mode 100644
index 8f190aa594..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheRenderNode.cpp
+++ /dev/null
@@ -1,1491 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Draws geometry caches
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#if defined(USE_GEOM_CACHES)
-
-#include "GeomCacheRenderNode.h"
-#include "GeomCacheManager.h"
-#include "MatMan.h"
-
-#include <AzCore/Jobs/JobFunction.h>
-
-namespace
-{
-    // Constants
-    const float kDefaultMaxViewDist = 1000.0f;
-}
-
-CGeomCacheRenderNode::CGeomCacheRenderNode()
-    : m_pGeomCache(NULL)
-    ,   m_playbackTime(0.0f)
-    , m_pPhysicalEntity(NULL)
-    , m_maxViewDist(kDefaultMaxViewDist)
-    , m_bBox(0.0f)
-    , m_currentAABB(0.0f)
-    , m_currentDisplayAABB(0.0f)
-    , m_standInVisible(eStandInType_None)
-    , m_pStandIn(NULL)
-    , m_pFirstFrameStandIn(NULL)
-    , m_pLastFrameStandIn(NULL)
-    , m_standInDistance(0.0f)
-    , m_streamInDistance(0.0f)
-    , m_bInitialized(false)
-    , m_bLooping(false)
-    , m_bIsStreaming(false)
-    , m_bFilledFrameOnce(false)
-    , m_bBoundsChanged(true)
-    , m_bDrawing(true)
-    , m_bTransformReady(true)
-{
-    m_matrix.SetIdentity();
-    m_pMaterial = GetMatMan()->GetDefaultMaterial();
-
-    SetRndFlags(ERF_HAS_CASTSHADOWMAPS, true);
-    SetRndFlags(ERF_CASTSHADOWMAPS, true);
-}
-
-CGeomCacheRenderNode::~CGeomCacheRenderNode()
-{
-    Clear(true);
-
-    if (m_pGeomCache)
-    {
-        m_pGeomCache->RemoveListener(this);
-        m_pGeomCache = nullptr;
-    }
-
-    m_pMaterial = nullptr;
-    
-    Get3DEngine()->FreeRenderNodeState(this);
-}
-
-const char* CGeomCacheRenderNode::GetEntityClassName() const
-{
-    return "GeomCache";
-}
-
-const char* CGeomCacheRenderNode::GetName() const
-{
-    if (m_pGeomCache)
-    {
-        return m_pGeomCache->GetFilePath();
-    }
-
-    return "GeomCacheNotSet";
-}
-
-Vec3 CGeomCacheRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    assert(bWorldOnly);
-    return m_matrix.GetTranslation();
-}
-
-void CGeomCacheRenderNode::SetBBox(const AABB& bBox)
-{
-    m_bBox = bBox;
-}
-
-const AABB CGeomCacheRenderNode::GetBBox() const
-{
-    return m_bBox;
-}
-
-void CGeomCacheRenderNode::UpdateBBox()
-{
-    AABB newAABB;
-
-    const Vec3 vCamPos = Get3DEngine()->GetRenderingCamera().GetPosition();
-    float distance = Distance::Point_Point(vCamPos, m_matrix.GetTranslation());
-
-    const bool bGeomCacheLoaded = m_pGeomCache ? m_pGeomCache->IsLoaded() : false;
-
-    const bool bAllowStandIn = GetCVars()->e_Lods != 0;
-    const bool bInStandInDistance = distance > m_standInDistance && bAllowStandIn;
-
-    EStandInType selectedStandIn = SelectStandIn();
-    IStatObj* pStandIn = GetStandIn(selectedStandIn);
-
-    if (pStandIn && (bInStandInDistance || !bGeomCacheLoaded))
-    {
-        m_standInVisible = selectedStandIn;
-        newAABB = pStandIn->GetAABB();
-    }
-    else
-    {
-        m_standInVisible = eStandInType_None;
-        newAABB = m_currentDisplayAABB;
-    }
-
-    if (newAABB.min != m_currentAABB.min || newAABB.max != m_currentAABB.max)
-    {
-        m_bBoundsChanged = true;
-        m_currentAABB = newAABB;
-    }
-
-    if (m_streamInDistance > 0.0f)
-    {
-        m_bIsStreaming = distance <= m_streamInDistance;
-    }
-}
-
-void CGeomCacheRenderNode::GetLocalBounds(AABB& bbox)
-{
-    bbox = m_currentAABB;
-}
-
-bool CGeomCacheRenderNode::DidBoundsChange()
-{
-    bool bBoundsChanged = m_bBoundsChanged;
-
-    if (bBoundsChanged)
-    {
-        CalcBBox();
-    }
-
-    m_bBoundsChanged = false;
-    return bBoundsChanged;
-}
-
-/* Geom caches are rendered using a custom render element for performance reasons (CREGeomCache).
-    * We only call mfAdd once per material, so a lot of meshes can be rendered with just one CRenderObject in the render pipeline.
-      * Mesh and transform updates run asynchronously started from FillFrameAsync and are synchronized in the render thread (CREGeomCache::Update)
-      * Visible meshes are added to a SMeshRenderData vector in UpdateTransformsRec. The lists are rendered in CREGeomCache::mfDraw
-      * Downside is that meshes in the cache are not sorted by depth for transparency passes
-*/
-void CGeomCacheRenderNode::Render(const struct SRendParams& rendParams, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_bInitialized || !m_bDrawing || (m_renderMeshes.empty() && m_renderMeshUpdateContexts.empty())
-        || !m_pGeomCache || m_dwRndFlags & ERF_HIDDEN || !passInfo.RenderGeomCaches())
-    {
-        return;
-    }
-
-    m_pGeomCache->SetLastDrawMainFrameId(passInfo.GetMainFrameID());
-
-    SRendParams drawParams = rendParams;
-
-    drawParams.pMatrix = &m_matrix;
-    drawParams.nClipVolumeStencilRef = 0;
-    drawParams.ppRNTmpData = &m_pRNTmpData;
-
-    switch (m_standInVisible)
-    {
-    case eStandInType_None:
-    {
-#ifndef _RELEASE
-        if (GetCVars()->e_GeomCacheDebugDrawMode == 3)
-        {
-            break;
-        }
-#endif
-
-        drawParams.pMaterial = m_pMaterial;
-
-        IRenderer* const pRenderer = GetRenderer();
-        CRenderObject* pRenderObject = pRenderer->EF_GetObject_Temp(passInfo.ThreadID());
-
-        if (pRenderObject)
-        {
-            FillRenderObject(drawParams, passInfo, m_pMaterial, pRenderObject);
-
-            if (m_pRenderElements.size() > 0 && passInfo.IsGeneralPass())
-            {
-                // Only need to call this once because SRenderObjData::m_pInstance is the same for all of them
-                m_pRenderElements.begin()->second.m_pRenderElement->SetupMotionBlur(pRenderObject, passInfo);
-            }
-
-            for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-            {
-                const uint materialId = iter->first;
-                CREGeomCache* pCREGeomCache = iter->second.m_pRenderElement;
-
-                SShaderItem& shaderItem = m_pMaterial->GetShaderItem(materialId);
-                const int renderList = rendParams.nRenderList;
-                const int afterWater = rendParams.nAfterWater;
-                SRendItemSorter rendItemSorter(rendParams.rendItemSorter);
-
-                pRenderer->EF_AddEf(pCREGeomCache, shaderItem, pRenderObject, passInfo, renderList, afterWater, rendItemSorter);
-            }
-        }
-        break;
-    }
-    case eStandInType_Default:
-    {
-        // Override material if there stand in has a material that is not default
-        _smart_ptr<IMaterial> pStandInMaterial = m_pStandIn->GetMaterial();
-        drawParams.pMaterial = (pStandInMaterial && !pStandInMaterial->IsDefault()) ? pStandInMaterial : drawParams.pMaterial;
-
-        m_pStandIn->Render(drawParams, passInfo);
-        break;
-    }
-    case eStandInType_FirstFrame:
-    {
-        // Override material if there stand in has a material that is not default
-        _smart_ptr<IMaterial> pStandInMaterial = m_pFirstFrameStandIn->GetMaterial();
-        drawParams.pMaterial = (pStandInMaterial && !pStandInMaterial->IsDefault()) ? pStandInMaterial : drawParams.pMaterial;
-
-        m_pFirstFrameStandIn->Render(drawParams, passInfo);
-        break;
-    }
-    case eStandInType_LastFrame:
-    {
-        // Override material if there stand in has a material that is not default
-        _smart_ptr<IMaterial> pStandInMaterial = m_pLastFrameStandIn->GetMaterial();
-        drawParams.pMaterial = (pStandInMaterial && !pStandInMaterial->IsDefault()) ? pStandInMaterial : drawParams.pMaterial;
-
-        m_pLastFrameStandIn->Render(drawParams, passInfo);
-        break;
-    }
-    }
-}
-
-void CGeomCacheRenderNode::SetMaterial(_smart_ptr<IMaterial> pMat)
-{
-    if (pMat)
-    {
-        m_pMaterial = pMat;
-    }
-    else if (m_pGeomCache)
-    {
-        _smart_ptr<IMaterial> pMaterial = m_pGeomCache->GetMaterial();
-        m_pMaterial = pMaterial;
-    }
-    else
-    {
-        m_pMaterial = GetMatMan()->GetDefaultMaterial();
-    }
-
-    UpdatePhysicalMaterials();
-}
-
-_smart_ptr<IMaterial> CGeomCacheRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    if (m_pMaterial)
-    {
-        return m_pMaterial;
-    }
-    else if (m_pGeomCache)
-    {
-        return m_pGeomCache->GetMaterial();
-    }
-
-    return NULL;
-}
-
-float CGeomCacheRenderNode::GetMaxViewDist()
-{
-    return m_maxViewDist * m_fViewDistanceMultiplier;
-}
-
-void CGeomCacheRenderNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "GeomCache");
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-void CGeomCacheRenderNode::SetMatrix(const Matrix34& matrix)
-{
-    m_matrix = matrix;
-    CalcBBox();
-}
-
-void CGeomCacheRenderNode::CalcBBox()
-{
-    m_bBox = AABB(0.0f);
-
-    if (!m_pGeomCache || !m_pGeomCache->IsValid())
-    {
-        return;
-    }
-
-    m_bBox.SetTransformedAABB(m_matrix, m_currentAABB);
-}
-
-bool CGeomCacheRenderNode::LoadGeomCache(const char* sGeomCacheFileName)
-{
-    Clear(false);
-
-    m_pGeomCache = static_cast<CGeomCache*>(Get3DEngine()->LoadGeomCache(sGeomCacheFileName));
-
-    if (m_pGeomCache && !m_pGeomCache->IsValid())
-    {
-        m_pGeomCache = NULL;
-    }
-
-    if (m_pGeomCache)
-    {
-        m_currentAABB = m_pGeomCache->GetAABB();
-        m_bBoundsChanged = true;
-        m_pMaterial = m_pGeomCache->GetMaterial();
-
-        const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-        m_nodeMatrices.resize(staticNodeData.size());
-        uint currentNodeIndex = 0;
-        InitTransformsRec(currentNodeIndex, staticNodeData, QuatTNS(IDENTITY));
-
-        m_pGeomCache->AddListener(this);
-
-        if (m_pGeomCache->IsLoaded())
-        {
-            return Initialize();
-        }
-    }
-
-    return true;
-}
-
-void CGeomCacheRenderNode::SetGeomCache(_smart_ptr<IGeomCache> geomCache)
-{
-    Clear(false);
-
-    if (geomCache == nullptr || !geomCache->IsValid())
-    {
-        return;
-    }
-
-    m_pGeomCache = static_cast<CGeomCache*>(geomCache.get());
-
-    m_currentAABB = m_pGeomCache->GetAABB();
-    m_bBoundsChanged = true;
-    m_pMaterial = m_pGeomCache->GetMaterial();
-
-    const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-    m_nodeMatrices.resize(staticNodeData.size());
-    uint currentNodeIndex = 0;
-    InitTransformsRec(currentNodeIndex, staticNodeData, QuatTNS(IDENTITY));
-
-    m_pGeomCache->AddListener(this);
-
-    if (m_pGeomCache->IsLoaded())
-    {
-        Initialize();
-    }
-}
-
-bool CGeomCacheRenderNode::Initialize()
-{
-    assert(!m_bInitialized);
-    if (m_bInitialized)
-    {
-        return true;
-    }
-
-    if (m_pGeomCache)
-    {
-        if (!InitializeRenderMeshes())
-        {
-            return false;
-        }
-
-        const std::vector<SGeomCacheStaticMeshData>& staticMeshData = m_pGeomCache->GetStaticMeshData();
-
-        const uint numMeshes = staticMeshData.size();
-        for (uint i = 0; i < numMeshes; ++i)
-        {
-            const SGeomCacheStaticMeshData& meshData = staticMeshData[i];
-            uint numMaterials = meshData.m_materialIds.size();
-
-            for (uint j = 0; j < numMaterials; ++j)
-            {
-                const uint16 materialId = meshData.m_materialIds[j];
-                if (m_pRenderElements.find(materialId) == m_pRenderElements.end())
-                {
-                    CREGeomCache* pRenderElement = static_cast<CREGeomCache*>(GetRenderer()->EF_CreateRE(eDATA_GeomCache));
-
-                    SGeomCacheRenderElementData renderElementData;
-                    renderElementData.m_pRenderElement = pRenderElement;
-                    renderElementData.m_pUpdateState = (volatile int*)NULL;
-                    renderElementData.m_pCurrentFillData = NULL;
-
-                    m_pRenderElements[materialId] = renderElementData;
-                    pRenderElement->InitializeRenderElement(numMeshes, &m_renderMeshes[0], materialId);
-                }
-            }
-        }
-
-        GetGeomCacheManager()->RegisterForStreaming(this);
-
-        m_bInitialized = true;
-
-        return true;
-    }
-
-    return false;
-}
-
-void CGeomCacheRenderNode::Clear(bool bWaitForStreamingJobs)
-{
-    m_bInitialized = false;
-
-    GetGeomCacheManager()->UnRegisterForStreaming(this, bWaitForStreamingJobs);
-
-    m_renderMeshes.clear();
-    m_renderMeshUpdateContexts.clear();
-
-    for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-    {
-        CREGeomCache* pCREGeomCache = iter->second.m_pRenderElement;
-        pCREGeomCache->Release();
-    }
-
-    m_currentAABB = AABB(0.0f);
-    m_currentDisplayAABB = AABB(0.0f);
-    m_pRenderElements.clear();
-}
-
-void CGeomCacheRenderNode::SetPlaybackTime(const float time)
-{
-    if (m_pGeomCache)
-    {
-        const float duration = m_pGeomCache->GetDuration();
-        const bool bInsideTimeRange = (time >= 0.0f && (m_bLooping || time <= duration));
-
-        float clampedTime = time < 0.0f ? 0.0f : time;
-        if (!m_bLooping)
-        {
-            clampedTime = time > duration ? duration : time;
-        }
-
-        m_playbackTime = clampedTime;
-        m_streamingTime = clampedTime;
-
-        if (m_pGeomCache && bInsideTimeRange)
-        {
-            StartStreaming(clampedTime);
-            return;
-        }
-    }
-
-    StopStreaming();
-}
-
-void CGeomCacheRenderNode::StartStreaming(const float time)
-{
-    if (m_pGeomCache && time >= 0.0f && (m_bLooping || time <= m_pGeomCache->GetDuration()))
-    {
-        m_streamingTime = time;
-        m_bIsStreaming = true;
-    }
-}
-
-void CGeomCacheRenderNode::StopStreaming()
-{
-    m_bIsStreaming = false;
-}
-
-bool CGeomCacheRenderNode::IsLooping() const
-{
-    return m_bLooping;
-}
-
-void CGeomCacheRenderNode::SetLooping(const bool bEnable)
-{
-    if (m_pGeomCache && m_pGeomCache->GetNumFrames() <= 1)
-    {
-        // looping a 1 frame cache is the same as not looping it. However the underlying logic on how we stream and read the GeomCache
-        // from disk breaks for a 1 frame loop. So we explicitly don't allow looping of a single frame cache, which doesn't make a
-        // visible difference to the user, since a 1 frame loop looks the same as playing back once.
-        m_bLooping = false;
-    }
-    else
-    {
-        m_bLooping = bEnable;
-    }
-}
-
-bool CGeomCacheRenderNode::IsStreaming() const
-{
-    return m_bIsStreaming && m_pGeomCache && !m_pGeomCache->PlaybackFromMemory();
-}
-
-float CGeomCacheRenderNode::GetPrecachedTime() const
-{
-    return GetGeomCacheManager()->GetPrecachedTime(this);
-}
-
-void CGeomCacheRenderNode::StartAsyncUpdate()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    m_bTransformReady = false;
-
-    for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-    {
-        SGeomCacheRenderElementData& data = iter->second;
-        CREGeomCache* pCREGeomCache = data.m_pRenderElement;
-        data.m_pUpdateState = pCREGeomCache->SetAsyncUpdateState(data.m_threadId);
-        data.m_pCurrentFillData = pCREGeomCache->GetMeshFillDataPtr();
-    }
-
-    const std::vector<SGeomCacheStaticMeshData>& staticMeshData = m_pGeomCache->GetStaticMeshData();
-
-    const uint numDynamicRenderMeshes = m_renderMeshUpdateContexts.size();
-    for (uint i = 0; i < numDynamicRenderMeshes; ++i)
-    {
-        SGeomCacheRenderMeshUpdateContext& updateContext = m_renderMeshUpdateContexts[i];
-
-        _smart_ptr<IRenderMesh> pRenderMesh = SetupDynamicRenderMesh(updateContext);
-        m_renderMeshUpdateContexts[i].m_pRenderMesh = pRenderMesh;
-
-        const SGeomCacheStaticMeshData& currentMeshData = staticMeshData[updateContext.m_meshId];
-        const uint numMaterials = currentMeshData.m_materialIds.size();
-        for (uint j = 0; j < numMaterials; ++j)
-        {
-            const uint16 materialId = currentMeshData.m_materialIds[j];
-            SGeomCacheRenderElementData& data = m_pRenderElements[materialId];
-            CREGeomCache::SMeshRenderData& meshData = (*data.m_pCurrentFillData)[updateContext.m_meshId];
-            meshData.m_pRenderMesh = pRenderMesh;
-        }
-    }
-}
-
-void CGeomCacheRenderNode::SkipFrameFill()
-{
-    const uint numDynamicRenderMeshes = m_renderMeshUpdateContexts.size();
-    for (uint i = 0; i < numDynamicRenderMeshes; ++i)
-    {
-        SGeomCacheRenderMeshUpdateContext& updateContext = m_renderMeshUpdateContexts[i];
-        if (updateContext.m_pUpdateState)
-        {
-            CryInterlockedDecrement(updateContext.m_pUpdateState);
-        }
-    }
-
-    for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-    {
-        CryInterlockedDecrement(iter->second.m_pUpdateState);
-    }
-
-    m_bTransformReady = true;
-    m_bTransformReadyCV.Notify();
-}
-
-bool CGeomCacheRenderNode::FillFrameAsync(const char* const pFloorFrameData, const char* const pCeilFrameData, const float lerpFactor)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    CryAutoLock<CryCriticalSection> fillLock(m_fillCS);
-
-    if ((m_renderMeshes.empty() && m_renderMeshUpdateContexts.empty())
-        || (!m_renderMeshUpdateContexts.empty() && m_renderMeshUpdateContexts[0].m_pUpdateState == NULL)
-        || (m_standInVisible != eStandInType_None && m_bFilledFrameOnce))
-    {
-        return false;
-    }
-
-    const CGeomCache* const pGeomCache = m_pGeomCache;
-    assert(pGeomCache);
-
-    if (!pGeomCache)
-    {
-        return false;
-    }
-
-    const std::vector<SGeomCacheStaticMeshData>& staticMeshData = pGeomCache->GetStaticMeshData();
-    const std::vector<SGeomCacheStaticNodeData>& staticNodeData = pGeomCache->GetStaticNodeData();
-
-    const uint numMeshes = staticMeshData.size();
-    const uint numNodes = staticNodeData.size();
-
-    if (numMeshes == 0 || numNodes == 0)
-    {
-        return false;
-    }
-
-    // Computer pointers to mesh & node data in frames
-    const GeomCacheFile::SFrameHeader* const floorFrameHeader = reinterpret_cast<const GeomCacheFile::SFrameHeader* const>(pFloorFrameData);
-    const char* pFloorMeshData = pFloorFrameData + sizeof(GeomCacheFile::SFrameHeader);
-    const char* const pFloorNodeData = pFloorFrameData + sizeof(GeomCacheFile::SFrameHeader) + floorFrameHeader->m_nodeDataOffset;
-
-    const GeomCacheFile::SFrameHeader* const ceilFrameHeader = reinterpret_cast<const GeomCacheFile::SFrameHeader* const>(pCeilFrameData);
-    const char* pCeilMeshData = pCeilFrameData + sizeof(GeomCacheFile::SFrameHeader);
-    const char* const pCeilNodeData = pCeilFrameData + sizeof(GeomCacheFile::SFrameHeader) + ceilFrameHeader->m_nodeDataOffset;
-
-    // Update geom cache AABB
-    AABB floorAABB(Vec3(floorFrameHeader->m_frameAABBMin[0], floorFrameHeader->m_frameAABBMin[1], floorFrameHeader->m_frameAABBMin[2]),
-        Vec3(floorFrameHeader->m_frameAABBMax[0], floorFrameHeader->m_frameAABBMax[1], floorFrameHeader->m_frameAABBMax[2]));
-    AABB ceilAABB(Vec3(ceilFrameHeader->m_frameAABBMin[0], ceilFrameHeader->m_frameAABBMin[1], ceilFrameHeader->m_frameAABBMin[2]),
-        Vec3(ceilFrameHeader->m_frameAABBMax[0], ceilFrameHeader->m_frameAABBMax[1], ceilFrameHeader->m_frameAABBMax[2]));
-
-    m_currentDisplayAABB = floorAABB;
-    m_currentDisplayAABB.Add(ceilAABB);
-
-    // Update meshes & clear instances
-    for (uint meshId = 0; meshId < numMeshes; ++meshId)
-    {
-        for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-        {
-            SGeomCacheRenderElementData& data = iter->second;
-            (*data.m_pCurrentFillData)[meshId].m_instances.clear();
-        }
-    }
-
-    // Add instance for current frame
-    uint currentMeshIndex = 0;
-    uint currentNodeIndex = 0;
-    uint currentNodeDataOffset = 0;
-
-    UpdateTransformsRec(currentMeshIndex, currentNodeIndex, staticNodeData, staticMeshData,
-        currentNodeDataOffset, pFloorNodeData, pCeilNodeData, QuatTNS(IDENTITY), lerpFactor);
-
-    m_bTransformReady = true;
-    m_bTransformReadyCV.Notify();
-
-    UpdatePhysicalEntity(NULL);
-
-    uint currentRenderMesh = 0;
-    for (uint meshId = 0; meshId < numMeshes; ++meshId)
-    {
-        const SGeomCacheStaticMeshData* pStaticMeshData = &staticMeshData[meshId];
-        if (pStaticMeshData->m_animatedStreams != 0)
-        {
-            size_t offsetToNextMesh = 0;
-            float meshLerpFactor = lerpFactor;
-            SGeomCacheRenderMeshUpdateContext* pUpdateContext = &m_renderMeshUpdateContexts[currentRenderMesh++];
-
-            if (GeomCacheDecoder::PrepareFillMeshData(*pUpdateContext, *pStaticMeshData, pFloorMeshData, pCeilMeshData, offsetToNextMesh, meshLerpFactor))
-            {
-                AZ::Job* job = AZ::CreateJobFunction([this, pUpdateContext, pStaticMeshData, pFloorMeshData, pCeilMeshData, meshLerpFactor]() { this->UpdateMesh_JobEntry(pUpdateContext, pStaticMeshData, pFloorMeshData, pCeilMeshData, meshLerpFactor); }, true, nullptr);
-                job->Start();
-            }
-            else
-            {
-                CryInterlockedDecrement(pUpdateContext->m_pUpdateState);
-            }
-
-            pFloorMeshData += offsetToNextMesh;
-            pCeilMeshData += offsetToNextMesh;
-        }
-    }
-
-    for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-    {
-        SGeomCacheRenderElementData& data = iter->second;
-        data.m_pRenderElement->DisplayFilledBuffer(data.m_threadId);
-        CryInterlockedDecrement(iter->second.m_pUpdateState);
-    }
-
-    m_bFilledFrameOnce = true;
-    return true;
-}
-
-void CGeomCacheRenderNode::UpdateMesh_JobEntry(SGeomCacheRenderMeshUpdateContext *pUpdateContext, const SGeomCacheStaticMeshData *pStaticMeshData,
-    const char* pFloorMeshData, const char* pCeilMeshData, float lerpFactor)
-{
-    GeomCacheDecoder::FillMeshDataFromDecodedFrame(m_bFilledFrameOnce, *pUpdateContext, *pStaticMeshData, pFloorMeshData, pCeilMeshData, lerpFactor);
-    CryInterlockedDecrement(pUpdateContext->m_pUpdateState);
-}
-
-void CGeomCacheRenderNode::ClearFillData()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const std::vector<SGeomCacheStaticMeshData>& staticMeshData = m_pGeomCache->GetStaticMeshData();
-    const uint numMeshes = staticMeshData.size();
-
-    // Clear dynamic render meshes in fill buffer to release their unused memory
-    for (uint meshId = 0; meshId < numMeshes; ++meshId)
-    {
-        const SGeomCacheStaticMeshData& meshData = staticMeshData[meshId];
-
-        if (meshData.m_animatedStreams != 0)
-        {
-            for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-            {
-                SGeomCacheRenderElementData& data = iter->second;
-                DynArray<CREGeomCache::SMeshRenderData>* pFillData = data.m_pRenderElement->GetMeshFillDataPtr();
-                (*pFillData)[meshId].m_pRenderMesh = NULL;
-            }
-        }
-    }
-}
-
-void CGeomCacheRenderNode::InitTransformsRec(uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData, const QuatTNS& currentTransform)
-{
-    const SGeomCacheStaticNodeData& currentNodeData = staticNodeData[currentNodeIndex];
-    const QuatTNS newTransformQuat = currentTransform * currentNodeData.m_localTransform;
-    const Matrix34 newTransformMatrix(newTransformQuat);
-    m_nodeMatrices[currentNodeIndex] = newTransformMatrix;
-
-    currentNodeIndex += 1;
-
-    const uint32 numChildren = currentNodeData.m_numChildren;
-    for (uint32 i = 0; i < numChildren; ++i)
-    {
-        InitTransformsRec(currentNodeIndex, staticNodeData, newTransformQuat);
-    }
-}
-
-void CGeomCacheRenderNode::UpdateTransformsRec(uint& currentNodeIndex, uint& currentMeshIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData,
-    const std::vector<SGeomCacheStaticMeshData>& staticMeshData, uint& currentNodeDataOffset, const char* const pFloorNodeData,
-    const char* const pCeilNodeData, const QuatTNS& currentTransform, const float lerpFactor)
-{
-    const SGeomCacheStaticNodeData& currentNodeData = staticNodeData[currentNodeIndex];
-
-    const uint32 floorNodeFlags = *reinterpret_cast<const uint32* const>(pFloorNodeData + currentNodeDataOffset);
-    const uint32 ceilNodeFlags = *reinterpret_cast<const uint32* const>(pCeilNodeData + currentNodeDataOffset);
-    currentNodeDataOffset += sizeof(uint32);
-
-    QuatTNS newTransformQuat;
-
-    // Update transform
-    if (currentNodeData.m_transformType == GeomCacheFile::eTransformType_Constant)
-    {
-        // Matrix from static data
-        newTransformQuat = currentTransform * currentNodeData.m_localTransform;
-    }
-    else
-    {
-        // Matrix from frame data
-        const QuatTNS* const pFloorTransform = reinterpret_cast<const QuatTNS* const>(pFloorNodeData + currentNodeDataOffset);
-        const QuatTNS* const pCeilTransform = reinterpret_cast<const QuatTNS* const>(pCeilNodeData + currentNodeDataOffset);
-
-        QuatTNS interpolatedTransform;
-        if (!(floorNodeFlags& GeomCacheFile::eFrameFlags_Hidden) && !(ceilNodeFlags & GeomCacheFile::eFrameFlags_Hidden))
-        {
-            interpolatedTransform.q = Quat::CreateSlerp(pFloorTransform->q, pCeilTransform->q, lerpFactor);
-            interpolatedTransform.t = Vec3::CreateLerp(pFloorTransform->t, pCeilTransform->t, lerpFactor);
-            interpolatedTransform.s = Vec3::CreateLerp(pFloorTransform->s, pCeilTransform->s, lerpFactor);
-        }
-        else if (!(floorNodeFlags & GeomCacheFile::eFrameFlags_Hidden))
-        {
-            interpolatedTransform = *pFloorTransform;
-        }
-        else
-        {
-            interpolatedTransform = *pCeilTransform;
-        }
-
-        newTransformQuat = currentTransform * interpolatedTransform;
-        currentNodeDataOffset += sizeof(QuatTNS);
-    }
-
-    Matrix34 newTransformMatrix(newTransformQuat);
-
-    if (currentNodeData.m_type == GeomCacheFile::eNodeType_Mesh)
-    {
-        const SGeomCacheStaticMeshData& currentMeshData = staticMeshData[currentNodeData.m_meshOrGeometryIndex];
-
-        const bool bVisible = ((floorNodeFlags& GeomCacheFile::eFrameFlags_Hidden) == 0);
-
-        if (bVisible)
-        {
-            CREGeomCache::SMeshInstance meshInstance;
-            meshInstance.m_aabb = currentMeshData.m_aabb;
-            meshInstance.m_matrix = newTransformMatrix;
-            meshInstance.m_prevMatrix = m_bFilledFrameOnce ? m_nodeMatrices[currentNodeIndex] : newTransformMatrix;
-
-#ifndef _RELEASE
-            const int debugDrawMode = GetCVars()->e_GeomCacheDebugDrawMode;
-            if (debugDrawMode == 0 || debugDrawMode > 2
-                || (debugDrawMode == 1 && currentMeshData.m_animatedStreams != 0)
-                || (debugDrawMode == 2 && currentMeshData.m_animatedStreams == 0))
-#endif
-            {
-                const uint numMaterials = currentMeshData.m_materialIds.size();
-                for (uint i = 0; i < numMaterials; ++i)
-                {
-                    const uint16 materialId = currentMeshData.m_materialIds[i];
-                    SGeomCacheRenderElementData& data = m_pRenderElements[materialId];
-                    (*data.m_pCurrentFillData)[currentNodeData.m_meshOrGeometryIndex].m_instances.push_back(meshInstance);
-                }
-            }
-        }
-    }
-
-    m_nodeMatrices[currentNodeIndex] = newTransformMatrix;
-
-    currentNodeIndex += 1;
-
-    const uint32 numChildren = currentNodeData.m_numChildren;
-    for (uint32 i = 0; i < numChildren; ++i)
-    {
-        UpdateTransformsRec(currentNodeIndex, currentMeshIndex, staticNodeData, staticMeshData, currentNodeDataOffset,
-            pFloorNodeData, pCeilNodeData, newTransformQuat, lerpFactor);
-    }
-}
-
-void CGeomCacheRenderNode::FillRenderObject(const SRendParams& rendParams, [[maybe_unused]] const SRenderingPassInfo& passInfo, _smart_ptr<IMaterial> pMaterial, CRenderObject* pRenderObject)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-
-    pRenderObject->m_pRenderNode = rendParams.pRenderNode;
-    pRenderObject->m_fSort = rendParams.fCustomSortOffset;
-    pRenderObject->m_fDistance = rendParams.fDistance;
-
-    pRenderObject->m_ObjFlags |= FOB_DYNAMIC_OBJECT;
-    pRenderObject->m_ObjFlags |= rendParams.dwFObjFlags;
-
-    pRenderObject->m_II.m_AmbColor = rendParams.AmbientColor;
-
-    if (rendParams.nTextureID >= 0)
-    {
-        pRenderObject->m_nTextureID = rendParams.nTextureID;
-    }
-
-    pRenderObject->m_II.m_Matrix = *rendParams.pMatrix;
-    pRenderObject->m_nClipVolumeStencilRef = rendParams.nClipVolumeStencilRef;
-    pRenderObject->m_fAlpha = rendParams.fAlpha;
-    pRenderObject->m_DissolveRef = rendParams.nDissolveRef;
-
-    if (rendParams.nAfterWater)
-    {
-        pRenderObject->m_ObjFlags |= FOB_AFTER_WATER;
-    }
-    else
-    {
-        pRenderObject->m_ObjFlags &= ~FOB_AFTER_WATER;
-    }
-
-    pRenderObject->m_pCurrMaterial = pMaterial;
-}
-
-bool CGeomCacheRenderNode::InitializeRenderMeshes()
-{
-    const std::vector<SGeomCacheStaticMeshData>& staticMeshData = m_pGeomCache->GetStaticMeshData();
-
-    const uint numMeshes = staticMeshData.size();
-    for (uint i = 0; i < numMeshes; ++i)
-    {
-        const SGeomCacheStaticMeshData& meshData = staticMeshData[i];
-
-        IRenderMesh* pRenderMesh = NULL;
-
-        // Only meshes with constant topology for now. TODO: Add support for heterogeneous meshes.
-        if (meshData.m_animatedStreams == 0)
-        {
-            pRenderMesh = GetGeomCacheManager()->GetMeshManager().GetStaticRenderMesh(meshData.m_hash);
-
-            assert(pRenderMesh != NULL);
-            if (!pRenderMesh)
-            {
-                return false;
-            }
-        }
-        else if (meshData.m_animatedStreams != 0)
-        {
-            SGeomCacheRenderMeshUpdateContext updateContext;
-            updateContext.m_prevPositions.resize(meshData.m_numVertices, Vec3(0.0f, 0.0f, 0.0f));
-            updateContext.m_meshId = i;
-            m_renderMeshUpdateContexts.push_back(updateContext);
-            pRenderMesh = NULL;
-        }
-
-        m_renderMeshes.push_back(pRenderMesh);
-    }
-
-    return true;
-}
-
-_smart_ptr<IRenderMesh> CGeomCacheRenderNode::SetupDynamicRenderMesh(SGeomCacheRenderMeshUpdateContext& updateContext)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const std::vector<SGeomCacheStaticMeshData>& staticMeshData = m_pGeomCache->GetStaticMeshData();
-    const SGeomCacheStaticMeshData& meshData = staticMeshData[updateContext.m_meshId];
-
-    // Create zero cleared render mesh
-    const uint numMaterials = meshData.m_numIndices.size();
-    uint numIndices = 0;
-    for (uint i = 0; i < numMaterials; ++i)
-    {
-        numIndices += meshData.m_numIndices[i];
-    }
-
-    _smart_ptr<IRenderMesh> pRenderMesh = gEnv->pRenderer->CreateRenderMeshInitialized(NULL, meshData.m_numVertices,
-            eVF_P3F_C4B_T2F, NULL, numIndices, prtTriangleList,
-            "GeomCacheDynamicMesh", m_pGeomCache->GetFilePath(), eRMT_Dynamic);
-
-    pRenderMesh->LockForThreadAccess();
-
-    updateContext.m_pIndices = pRenderMesh->GetIndexPtr(FSL_VIDEO_CREATE);
-    updateContext.m_pPositions.data = (Vec3*)pRenderMesh->GetPosPtrNoCache(updateContext.m_pPositions.iStride, FSL_VIDEO_CREATE);
-    updateContext.m_pColors.data = (UCol*)pRenderMesh->GetColorPtr(updateContext.m_pColors.iStride, FSL_VIDEO_CREATE);
-    updateContext.m_pTexcoords.data = (Vec2*)pRenderMesh->GetUVPtrNoCache(updateContext.m_pTexcoords.iStride, FSL_VIDEO_CREATE);
-    updateContext.m_pTangents.data = (SPipTangents*)pRenderMesh->GetTangentPtr(updateContext.m_pTangents.iStride, FSL_VIDEO_CREATE);
-    updateContext.m_pVelocities.data = (Vec3*)pRenderMesh->GetVelocityPtr(updateContext.m_pVelocities.iStride, FSL_VIDEO_CREATE);
-
-    CRenderChunk chunk;
-    chunk.nNumVerts = meshData.m_numVertices;
-    uint32 currentIndexOffset = 0;
-
-    std::vector<CRenderChunk> chunks;
-    chunks.reserve(numMaterials);
-
-    for (uint i = 0; i < numMaterials; ++i)
-    {
-        chunk.nFirstIndexId = currentIndexOffset;
-        chunk.nNumIndices = meshData.m_numIndices[i];
-        chunk.m_nMatID = meshData.m_materialIds[i];
-        chunks.push_back(chunk);
-        currentIndexOffset += chunk.nNumIndices;
-    }
-
-    pRenderMesh->SetRenderChunks(&chunks[0], numMaterials, false);
-
-    updateContext.m_pUpdateState = pRenderMesh->SetAsyncUpdateState();
-    pRenderMesh->UnLockForThreadAccess();
-
-    return pRenderMesh;
-}
-
-void CGeomCacheRenderNode::SetStandIn(const char* pFilePath, const char* pMaterial)
-{
-    m_pStandIn = Get3DEngine()->LoadStatObjAutoRef(pFilePath);
-
-    if (m_pStandIn)
-    {
-        m_pStandIn->SetMaterial(GetMatMan()->LoadMaterial(pMaterial));
-    }
-}
-
-void CGeomCacheRenderNode::SetFirstFrameStandIn(const char* pFilePath, const char* pMaterial)
-{
-    m_pFirstFrameStandIn = Get3DEngine()->LoadStatObjAutoRef(pFilePath);
-
-    if (m_pFirstFrameStandIn)
-    {
-        m_pFirstFrameStandIn->SetMaterial(GetMatMan()->LoadMaterial(pMaterial));
-    }
-}
-
-void CGeomCacheRenderNode::SetLastFrameStandIn(const char* pFilePath, const char* pMaterial)
-{
-    m_pLastFrameStandIn = Get3DEngine()->LoadStatObjAutoRef(pFilePath);
-
-    if (m_pLastFrameStandIn)
-    {
-        m_pLastFrameStandIn->SetMaterial(GetMatMan()->LoadMaterial(pMaterial));
-    }
-}
-
-void CGeomCacheRenderNode::SetStandInDistance(const float distance)
-{
-    m_standInDistance = distance;
-}
-
-void CGeomCacheRenderNode::SetStreamInDistance(const float distance)
-{
-    m_streamInDistance = distance;
-}
-
-CGeomCacheRenderNode::EStandInType CGeomCacheRenderNode::SelectStandIn() const
-{
-    const bool bFirstFrame = m_playbackTime == 0.0f;
-    const bool bLastFrame = !m_bLooping && (m_pGeomCache ? (m_playbackTime >= m_pGeomCache->GetDuration()) : false);
-
-    if (bFirstFrame && m_pFirstFrameStandIn && m_pFirstFrameStandIn->GetRenderMesh())
-    {
-        return eStandInType_FirstFrame;
-    }
-    else if (bLastFrame && m_pLastFrameStandIn && m_pLastFrameStandIn->GetRenderMesh())
-    {
-        return eStandInType_LastFrame;
-    }
-    else if (m_pStandIn && m_pStandIn->GetRenderMesh())
-    {
-        return eStandInType_Default;
-    }
-
-    return eStandInType_None;
-}
-
-IStatObj* CGeomCacheRenderNode::GetStandIn(const EStandInType type) const
-{
-    switch (type)
-    {
-    case eStandInType_Default:
-        return m_pStandIn;
-    case eStandInType_FirstFrame:
-        return m_pFirstFrameStandIn;
-    case eStandInType_LastFrame:
-        return m_pLastFrameStandIn;
-    }
-
-    return NULL;
-}
-
-void CGeomCacheRenderNode::DebugDraw(const SGeometryDebugDrawInfo& info, float fExtrudeScale, uint nodeIndex) const
-{
-    CryAutoLock<CryCriticalSection> fillLock(m_fillCS);
-
-    if (!m_bDrawing)
-    {
-        return;
-    }
-
-    switch (m_standInVisible)
-    {
-    case eStandInType_None:
-    {
-        if (m_pGeomCache && m_nodeMatrices.size() > 0)
-        {
-            const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-            nodeIndex = std::min(nodeIndex, (uint)(staticNodeData.size() - 1));
-            DebugDrawRec(info, fExtrudeScale, nodeIndex, staticNodeData);
-        }
-        break;
-    }
-    case eStandInType_Default:
-    {
-        m_pStandIn->DebugDraw(info, fExtrudeScale);
-        break;
-    }
-    case eStandInType_FirstFrame:
-    {
-        m_pFirstFrameStandIn->DebugDraw(info, fExtrudeScale);
-        break;
-    }
-    case eStandInType_LastFrame:
-    {
-        m_pLastFrameStandIn->DebugDraw(info, fExtrudeScale);
-        break;
-    }
-    }
-}
-
-void CGeomCacheRenderNode::DebugDrawRec(const SGeometryDebugDrawInfo& info, float fExtrudeScale,
-    uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData) const
-{
-    const SGeomCacheStaticNodeData& currentNodeData = staticNodeData[currentNodeIndex];
-
-    if (currentNodeData.m_type == GeomCacheFile::eNodeType_Mesh)
-    {
-        for (TRenderElementMap::const_iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-        {
-            CREGeomCache* pCREGeomCache = iter->second.m_pRenderElement;
-            DynArray<CREGeomCache::SMeshRenderData>* pFillData = pCREGeomCache->GetRenderDataPtr();
-
-            if (pFillData)
-            {
-                CREGeomCache::SMeshRenderData& renderData = (*pFillData)[currentNodeData.m_meshOrGeometryIndex];
-                IRenderMesh* pRenderMesh = renderData.m_pRenderMesh.get();
-
-                if (renderData.m_instances.size() > 0 && pRenderMesh)
-                {
-                    Matrix34 pieceMatrix = m_matrix * m_nodeMatrices[currentNodeIndex];
-
-                    SGeometryDebugDrawInfo subInfo = info;
-                    subInfo.tm = pieceMatrix;
-
-                    pRenderMesh->DebugDraw(subInfo, ~0, fExtrudeScale);
-                    break;
-                }
-            }
-        }
-    }
-
-    currentNodeIndex += 1;
-
-    const uint32 numChildren = currentNodeData.m_numChildren;
-    for (uint32 i = 0; i < numChildren; ++i)
-    {
-        DebugDrawRec(info, fExtrudeScale, currentNodeIndex, staticNodeData);
-    }
-}
-
-bool CGeomCacheRenderNode::RayIntersectionRec(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl, uint* pHitNodeIndex,
-    uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData, SRayHitInfo& hitOut, float& fMinDistance) const
-{
-    const SGeomCacheStaticNodeData& currentNodeData = staticNodeData[currentNodeIndex];
-
-    bool bHit = false;
-
-    if (currentNodeData.m_type == GeomCacheFile::eNodeType_Mesh)
-    {
-        for (TRenderElementMap::const_iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-        {
-            CREGeomCache* pCREGeomCache = iter->second.m_pRenderElement;
-            DynArray<CREGeomCache::SMeshRenderData>* pFillData = pCREGeomCache->GetRenderDataPtr();
-
-            if (pFillData)
-            {
-                CREGeomCache::SMeshRenderData& renderData = (*pFillData)[currentNodeData.m_meshOrGeometryIndex];
-                IRenderMesh* pRenderMesh = renderData.m_pRenderMesh.get();
-
-                if (renderData.m_instances.size() > 0 && pRenderMesh)
-                {
-                    Matrix34 pieceMatrix = m_matrix * m_nodeMatrices[currentNodeIndex];
-
-                    AABB meshAABB = m_pGeomCache->GetStaticMeshData()[currentNodeData.m_meshOrGeometryIndex].m_aabb;
-
-                    AABB pieceWorldAABB;
-                    pieceWorldAABB.SetTransformedAABB(pieceMatrix, meshAABB);
-
-                    Vec3 vOut;
-                    if (!Intersect::Ray_AABB(hitInfo.inRay, pieceWorldAABB, vOut))
-                    {
-                        continue;
-                    }
-
-                    Matrix34 invPieceMatrix = pieceMatrix.GetInverted();
-
-                    // Transform ray into sub-object local space.
-                    SRayHitInfo subHitInfo = hitInfo;
-                    ZeroStruct(subHitInfo);
-                    subHitInfo.inReferencePoint = invPieceMatrix.TransformPoint(hitInfo.inReferencePoint);
-                    subHitInfo.inRay.origin = invPieceMatrix.TransformPoint(hitInfo.inRay.origin);
-                    subHitInfo.inRay.direction = invPieceMatrix.TransformVector(hitInfo.inRay.direction);
-
-                    if (CRenderMeshUtils::RayIntersection(pRenderMesh, subHitInfo, NULL))
-                    {
-                        const uint materialId = iter->first;
-                        _smart_ptr<IMaterial> pMaterial = const_cast<CGeomCacheRenderNode*>(this)->GetMaterial(NULL);
-                        _smart_ptr<IMaterial> pSubMaterial = pMaterial->GetSafeSubMtl(materialId);
-
-                        if (subHitInfo.nHitMatID == materialId)
-                        {
-                            subHitInfo.vHitPos = pieceMatrix.TransformPoint(subHitInfo.vHitPos);
-                            subHitInfo.fDistance = hitInfo.inReferencePoint.GetDistance(subHitInfo.vHitPos);
-
-                            if (subHitInfo.fDistance < fMinDistance)
-                            {
-                                bHit = true;
-                                fMinDistance = subHitInfo.fDistance;
-                                hitOut = subHitInfo;
-
-                                hitOut.nHitMatID = materialId;
-                                if (pSubMaterial)
-                                {
-                                    hitInfo.nHitSurfaceID = pSubMaterial->GetSurfaceTypeId();
-                                }
-
-                                if (pHitNodeIndex)
-                                {
-                                    *pHitNodeIndex = currentNodeIndex;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    currentNodeIndex += 1;
-
-    const uint32 numChildren = currentNodeData.m_numChildren;
-    for (uint32 i = 0; i < numChildren; ++i)
-    {
-        bHit = RayIntersectionRec(hitInfo, pCustomMtl, pHitNodeIndex, currentNodeIndex, staticNodeData, hitOut, fMinDistance) || bHit;
-    }
-
-    return bHit;
-}
-
-#ifndef _RELEASE
-void CGeomCacheRenderNode::DebugRender()
-{
-    if (m_pGeomCache && GetCVars()->e_GeomCacheDebugDrawMode == 3)
-    {
-        const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-        uint currentNodeIndex = 0;
-        InstancingDebugDrawRec(currentNodeIndex, staticNodeData);
-    }
-}
-
-void CGeomCacheRenderNode::InstancingDebugDrawRec(uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData)
-{
-    CryAutoLock<CryCriticalSection> fillLock(m_fillCS);
-
-    const SGeomCacheStaticNodeData& currentNodeData = staticNodeData[currentNodeIndex];
-
-    ColorF colors[] = {
-        Col_Aquamarine, Col_Blue, Col_BlueViolet, Col_Brown, Col_CadetBlue, Col_Coral, Col_CornflowerBlue, Col_Cyan,
-        Col_DimGrey, Col_FireBrick, Col_ForestGreen, Col_Gold, Col_Goldenrod, Col_Gray, Col_Green, Col_GreenYellow, Col_IndianRed, Col_Khaki,
-        Col_LightBlue, Col_LightGray, Col_LightSteelBlue, Col_LightWood, Col_LimeGreen, Col_Magenta, Col_Maroon, Col_MedianWood, Col_MediumAquamarine,
-        Col_MediumBlue, Col_MediumForestGreen, Col_MediumGoldenrod, Col_MediumOrchid, Col_MediumSeaGreen, Col_MediumSlateBlue, Col_MediumSpringGreen,
-        Col_MediumTurquoise, Col_MediumVioletRed, Col_MidnightBlue, Col_Navy, Col_NavyBlue, Col_Orange, Col_OrangeRed, Col_Orchid, Col_PaleGreen,
-        Col_Pink, Col_Plum, Col_Red, Col_Salmon, Col_SeaGreen, Col_Sienna, Col_SkyBlue, Col_SlateBlue, Col_SpringGreen, Col_SteelBlue, Col_Tan,
-        Col_Thistle, Col_Transparent, Col_Turquoise, Col_Violet, Col_VioletRed, Col_Wheat, Col_Yellow
-    };
-
-    const uint kNumColors = sizeof(colors) / sizeof(ColorF);
-
-    if (currentNodeData.m_type == GeomCacheFile::eNodeType_Mesh)
-    {
-        for (TRenderElementMap::const_iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
-        {
-            CREGeomCache* pCREGeomCache = iter->second.m_pRenderElement;
-            DynArray<CREGeomCache::SMeshRenderData>* pFillData = pCREGeomCache->GetRenderDataPtr();
-
-            if (pFillData)
-            {
-                CREGeomCache::SMeshRenderData& renderData = (*pFillData)[currentNodeData.m_meshOrGeometryIndex];
-                IRenderMesh* pRenderMesh = renderData.m_pRenderMesh.get();
-
-                if (renderData.m_instances.size() > 0 && pRenderMesh)
-                {
-                    Matrix34 pieceMatrix = m_matrix * m_nodeMatrices[currentNodeIndex];
-
-                    SGeometryDebugDrawInfo info;
-                    info.bNoLines = true;
-                    info.bExtrude = false;
-                    info.tm = pieceMatrix;
-
-                    const uint64 kMul = 0x9ddfea08eb382d69ULL;
-                    uint64 hash = (uint64)alias_cast<UINT_PTR>(pRenderMesh);
-                    hash ^= (hash >> 47);
-                    hash *= kMul;
-
-                    info.color = colors[hash % kNumColors];
-
-                    pRenderMesh->DebugDraw(info);
-                    break;
-                }
-            }
-        }
-    }
-
-    currentNodeIndex += 1;
-
-    const uint32 numChildren = currentNodeData.m_numChildren;
-    for (uint32 i = 0; i < numChildren; ++i)
-    {
-        InstancingDebugDrawRec(currentNodeIndex, staticNodeData);
-    }
-}
-#endif
-
-bool CGeomCacheRenderNode::RayIntersection(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl, uint* pNodeIndex) const
-{
-    CryAutoLock<CryCriticalSection> fillLock(m_fillCS);
-
-    switch (m_standInVisible)
-    {
-    case eStandInType_None:
-    {
-        if (m_pGeomCache && m_nodeMatrices.size() > 0)
-        {
-            const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-
-            SRayHitInfo hitOut;
-            float fMinDistance = std::numeric_limits<float>::max();
-            uint currentNodeIndex = 0;
-
-            if (RayIntersectionRec(hitInfo, pCustomMtl, pNodeIndex, currentNodeIndex, staticNodeData, hitOut, fMinDistance))
-            {
-                // Restore input ray/reference point.
-                hitOut.inReferencePoint = hitInfo.inReferencePoint;
-                hitOut.inRay = hitInfo.inRay;
-                hitOut.fDistance = fMinDistance;
-
-                hitInfo = hitOut;
-                return true;
-            }
-        }
-        break;
-    }
-    case eStandInType_Default:
-    {
-        return m_pStandIn->RayIntersection(hitInfo, pCustomMtl);
-    }
-    case eStandInType_FirstFrame:
-    {
-        return m_pFirstFrameStandIn->RayIntersection(hitInfo, pCustomMtl);
-    }
-    case eStandInType_LastFrame:
-    {
-        return m_pLastFrameStandIn->RayIntersection(hitInfo, pCustomMtl);
-    }
-    }
-
-    return false;
-}
-
-uint CGeomCacheRenderNode::GetNodeCount() const
-{
-    if (!m_pGeomCache)
-    {
-        return 0;
-    }
-
-    const uint numNodes = m_pGeomCache->GetStaticNodeData().size();
-    return numNodes;
-}
-
-Matrix34 CGeomCacheRenderNode::GetNodeTransform(const uint nodeIndex) const
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    {
-        CryAutoLock<CryMutex> lock(m_bTransformsReadyCS);
-        while (!m_bTransformReady)
-        {
-            m_bTransformReadyCV.Wait(m_bTransformsReadyCS);
-        }
-    }
-
-    if (nodeIndex >= m_nodeMatrices.size() || !m_pGeomCache)
-    {
-        return Matrix34(IDENTITY);
-    }
-
-    return m_nodeMatrices[nodeIndex];
-}
-
-const char* CGeomCacheRenderNode::GetNodeName(const uint nodeIndex) const
-{
-    if (!m_pGeomCache)
-    {
-        return "";
-    }
-
-    const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-    return staticNodeData[nodeIndex].m_name.c_str();
-}
-
-uint32 CGeomCacheRenderNode::GetNodeNameHash(const uint nodeIndex) const
-{
-    if (!m_pGeomCache)
-    {
-        return 0;
-    }
-
-    const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-    return staticNodeData[nodeIndex].m_nameHash;
-}
-
-bool CGeomCacheRenderNode::IsNodeDataValid(const uint nodeIndex) const
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    {
-        CryAutoLock<CryMutex> lock(m_bTransformsReadyCS);
-        while (!m_bTransformReady)
-        {
-            m_bTransformReadyCV.Wait(m_bTransformsReadyCS);
-        }
-    }
-
-    if (nodeIndex >= m_nodeMatrices.size() || !m_pGeomCache)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void CGeomCacheRenderNode::InitPhysicalEntity(IPhysicalEntity* pPhysicalEntity, const pe_articgeomparams& params)
-{
-    m_pPhysicalEntity = pPhysicalEntity;
-    UpdatePhysicalEntity(&params);
-}
-
-void CGeomCacheRenderNode::UpdatePhysicalEntity(const pe_articgeomparams* pParams)
-{
-    if (!m_pPhysicalEntity)
-    {
-        return;
-    }
-
-    const std::vector<SGeomCacheStaticNodeData>& staticNodeData = m_pGeomCache->GetStaticNodeData();
-    const std::vector<phys_geometry*>& physicsGeometries = m_pGeomCache->GetPhysicsGeometries();
-
-    Matrix34 scaleMatrix = GetMatrix();
-    const Vec3 scale = Vec3(scaleMatrix.GetColumn0().GetLength(), scaleMatrix.GetColumn1().GetLength(), scaleMatrix.GetColumn2().GetLength());
-    scaleMatrix.SetScale(scale);
-
-    const uint numNodes = staticNodeData.size();
-    for (uint i = 0; i < numNodes; ++i)
-    {
-        const SGeomCacheStaticNodeData& nodeData = staticNodeData[i];
-        if (nodeData.m_type == GeomCacheFile::eNodeType_PhysicsGeometry)
-        {
-            const Matrix34 nodeTransform = GetNodeTransform(i);
-            phys_geometry* pGeometry = physicsGeometries[nodeData.m_meshOrGeometryIndex];
-            if (pGeometry)
-            {
-                Matrix34 nodeMatrix = scaleMatrix * nodeTransform;
-
-                if (pParams)
-                {
-                    pe_articgeomparams params = *pParams;
-                    m_pPhysicalEntity->AddGeometry(pGeometry, &params, i);
-                }
-
-                pe_params_part params;
-                params.pMtx3x4 = &nodeMatrix;
-                params.partid = i;
-                m_pPhysicalEntity->SetParams(&params);
-            }
-        }
-    }
-}
-
-void CGeomCacheRenderNode::UpdatePhysicalMaterials()
-{
-    if (m_pPhysicalEntity && m_pMaterial)
-    {
-        int surfaceTypesId[MAX_SUB_MATERIALS] = { 0 };
-        const int numIds = m_pMaterial->FillSurfaceTypeIds(surfaceTypesId);
-
-        pe_params_part params;
-        params.nMats = numIds;
-        params.pMatMapping = surfaceTypesId;
-        m_pPhysicalEntity->SetParams(&params);
-    }
-}
-
-void CGeomCacheRenderNode::UpdateStreamableComponents(float fImportance, float fDistance, bool bFullUpdate, int nLod, const float fInvScale, bool bDrawNear)
-{
-    Matrix34A matrix = GetMatrix();
-
-    const bool bAllowStandIn = GetCVars()->e_Lods != 0;
-    const bool bStreamInGeomCache = !m_pStandIn || (fDistance <= std::max(m_standInDistance, m_streamInDistance)) || !bAllowStandIn;
-    if (m_pGeomCache && bStreamInGeomCache)
-    {
-        m_pGeomCache->UpdateStreamableComponents(fImportance, matrix, this, bFullUpdate);
-    }
-
-    static_cast<CMatInfo*>(m_pMaterial.get())->PrecacheMaterial(fDistance * fInvScale, NULL, bFullUpdate, bDrawNear);
-
-    PrecacheStandIn(m_pStandIn, fImportance, fDistance, bFullUpdate, nLod, fInvScale, bDrawNear);
-    PrecacheStandIn(m_pFirstFrameStandIn, fImportance, fDistance, bFullUpdate, nLod, fInvScale, bDrawNear);
-    PrecacheStandIn(m_pLastFrameStandIn, fImportance, fDistance, bFullUpdate, nLod, fInvScale, bDrawNear);
-}
-
-void CGeomCacheRenderNode::PrecacheStandIn(IStatObj* pStandIn, float fImportance, float fDistance, bool bFullUpdate, int nLod, const float fInvScale, bool bDrawNear)
-{
-    if (pStandIn)
-    {
-        IStatObj* pLod = pStandIn->GetLodObject(nLod, true);
-        if (pLod)
-        {
-            IObjManager* pObjManager = GetObjManager();
-            Matrix34A matrix = GetMatrix();
-            static_cast<CStatObj*>(pLod)->UpdateStreamableComponents(fImportance, matrix, bFullUpdate, nLod);
-            pObjManager->PrecacheStatObjMaterial(pLod->GetMaterial(), fDistance * fInvScale, pLod, bFullUpdate, bDrawNear);
-        }
-    }
-}
-
-void CGeomCacheRenderNode::OnGeomCacheStaticDataLoaded()
-{
-    Initialize();
-}
-
-void CGeomCacheRenderNode::OnGeomCacheStaticDataUnloaded()
-{
-    Clear(false);
-}
-
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/GeomCacheRenderNode.h b/Code/CryEngine/Cry3DEngine/GeomCacheRenderNode.h
deleted file mode 100644
index 4181cb8224..0000000000
--- a/Code/CryEngine/Cry3DEngine/GeomCacheRenderNode.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Draws geometry caches
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_GEOMCACHERENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_GEOMCACHERENDERNODE_H
-#pragma once
-
-#if defined(USE_GEOM_CACHES)
-
-#include "GeomCache.h"
-#include "GeomCacheDecoder.h"
-
-struct SGeomCacheRenderMeshUpdateContext
-{
-    SGeomCacheRenderMeshUpdateContext()
-        : m_meshId(0)
-        , m_pRenderMesh(NULL)
-        , m_pUpdateState(NULL)
-        , m_pIndices(NULL) {}
-
-    // Information needed to create the render mesh each frame
-    uint m_meshId;
-
-    // The render mesh
-    _smart_ptr<IRenderMesh> m_pRenderMesh;
-
-    // Locks the render mesh from rendering until it was filled
-    volatile int* m_pUpdateState;
-
-    // Previous positions for motion blur
-    stl::aligned_vector<Vec3, 16> m_prevPositions;
-
-    // Data pointers for updating
-    vtx_idx* m_pIndices;
-    strided_pointer<Vec3> m_pPositions;
-    strided_pointer<UCol> m_pColors;
-    strided_pointer<Vec2> m_pTexcoords;
-    strided_pointer<SPipTangents> m_pTangents;
-    strided_pointer<Vec3> m_pVelocities;
-};
-
-struct SGeomCacheRenderElementData
-{
-    CREGeomCache* m_pRenderElement;
-    volatile int* m_pUpdateState;
-    int m_threadId;
-    DynArray<CREGeomCache::SMeshRenderData>* m_pCurrentFillData;
-};
-
-class CGeomCacheRenderNode
-    : public IGeomCacheRenderNode
-    , public IGeomCacheListener
-    , public Cry3DEngineBase
-{
-public:
-    CGeomCacheRenderNode();
-    virtual ~CGeomCacheRenderNode();
-
-    virtual const char* GetName() const;
-    virtual const char* GetEntityClassName() const;
-    virtual EERType GetRenderNodeType() { return eERType_GeomCache; }
-
-    virtual Vec3 GetPos(bool bWorldOnly) const;
-    virtual void SetBBox(const AABB& WSBBox);
-    virtual const AABB GetBBox() const;
-    virtual void GetLocalBounds(AABB& bbox);
-
-    // Called before rendering to update to current frame bbox
-    void UpdateBBox();
-
-    virtual void Render(const struct SRendParams& entDrawParams, const SRenderingPassInfo& passInfo);
-
-    void SetMatrix(const Matrix34& matrix);
-    const Matrix34& GetMatrix() const { return m_matrix; }
-
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMat);
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-
-    void SetBaseMaxViewDistance(float maxViewDistance) override { m_maxViewDist = maxViewDistance; }
-    virtual float GetMaxViewDist();
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    // Streaming
-    float GetStreamingTime() const { return std::max(m_streamingTime, m_playbackTime); }
-
-    // Called for starting the update job in CGeomCacheManager
-    void StartAsyncUpdate();
-
-    // Called by fill job if it didn't call FillFrameAsync because data wasn't available
-    void SkipFrameFill();
-
-    // Called from the update job in CGeomCacheManager
-    bool FillFrameAsync(const char* const pFloorFrameData, const char* const pCeilFrameData, const float lerpFactor);
-
-    // Called from FillFrameAsync
-    void UpdateMesh_JobEntry(SGeomCacheRenderMeshUpdateContext *pUpdateContext, const SGeomCacheStaticMeshData *pStaticMeshData,
-        const char* pFloorMeshData, const char* pCeilMeshData, float lerpFactor);
-
-    // Called from CGeomCacheManager when playback stops
-    void ClearFillData();
-
-    // Called from CObjManager to update streaming
-    void UpdateStreamableComponents(float fImportance, float fDistance, bool bFullUpdate, int nLod, const float fInvScale, bool bDrawNear);
-
-    // IGeomCacheRenderNode
-    virtual bool LoadGeomCache(const char* sGeomCacheFileName);
-    void SetGeomCache(_smart_ptr<IGeomCache> geomCache) override;
-
-    virtual void SetPlaybackTime(const float time);
-    virtual float GetPlaybackTime() const { return m_playbackTime; }
-
-    virtual bool IsStreaming() const;
-    virtual void StartStreaming(const float time);
-    virtual void StopStreaming();
-    virtual bool IsLooping() const;
-    virtual void SetLooping(const bool bEnable);
-    virtual float GetPrecachedTime() const;
-
-    virtual IGeomCache* GetGeomCache() const { return m_pGeomCache; }
-
-    virtual bool DidBoundsChange();
-
-    virtual void SetDrawing(bool bDrawing) { m_bDrawing = bDrawing; }
-
-    // Set stand in CGFs and distance
-    virtual void SetStandIn(const char* pFilePath, const char* pMaterial);
-    IStatObj* GetStandIn() override { return m_pStandIn; }
-    virtual void SetFirstFrameStandIn(const char* pFilePath, const char* pMaterial);
-    IStatObj* GetFirstFrameStandIn() override { return m_pFirstFrameStandIn; }
-    virtual void SetLastFrameStandIn(const char* pFilePath, const char* pMaterial);
-    IStatObj* GetLastFrameStandIn() override { return m_pLastFrameStandIn; }
-    virtual void SetStandInDistance(const float distance);
-    float GetStandInDistance() override { return m_standInDistance; }
-
-    // Set distance at which cache will start streaming automatically (0 means no auto streaming)
-    virtual void SetStreamInDistance(const float distance);
-    float GetStreamInDistance() override { return m_streamInDistance; }
-
-    virtual void DebugDraw(const SGeometryDebugDrawInfo& info, float fExtrudeScale, uint nodeIndex) const;
-    virtual bool RayIntersection(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl, uint* pHitNodeIndex) const;
-
-    // Get node information
-    virtual uint GetNodeCount() const;
-    virtual Matrix34 GetNodeTransform(const uint nodeIndex) const;
-    virtual const char* GetNodeName(const uint nodeIndex) const;
-    virtual uint32 GetNodeNameHash(const uint nodeIndex) const;
-    virtual bool IsNodeDataValid(const uint nodeIndex) const;
-
-    // Physics
-    virtual void InitPhysicalEntity(IPhysicalEntity* pPhysicalEntity, const pe_articgeomparams& params);
-
-    void OffsetPosition([[maybe_unused]] const Vec3& delta) {}
-
-#ifndef _RELEASE
-    void DebugRender();
-#endif
-
-private:
-    void CalcBBox();
-
-    void FillRenderObject(const SRendParams& rendParams, const SRenderingPassInfo& passInfo, _smart_ptr<IMaterial> pMaterial, CRenderObject* pRenderObject);
-
-    bool Initialize();
-    bool InitializeRenderMeshes();
-    _smart_ptr<IRenderMesh> SetupDynamicRenderMesh(SGeomCacheRenderMeshUpdateContext& updateContext);
-
-    void Clear(bool bWaitForStreamingJobs);
-
-    void InitTransformsRec(uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData, const QuatTNS& currentTransform);
-
-    void UpdateTransformsRec(uint& currentNodeIndex, uint& currentMeshIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData,
-        const std::vector<SGeomCacheStaticMeshData>& staticMeshData, uint& currentNodeDataOffset, const char* const pFloorNodeData,
-        const char* const pCeilNodeData, const QuatTNS& currentTransform, const float lerpFactor);
-
-    // IGeomCacheListener
-    virtual void OnGeomCacheStaticDataLoaded();
-    virtual void OnGeomCacheStaticDataUnloaded();
-
-    void DebugDrawRec(const SGeometryDebugDrawInfo& info, float fExtrudeScale,
-        uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData) const;
-    bool RayIntersectionRec(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl, uint* pHitNodeIndex,
-        uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData,
-        SRayHitInfo& hitOut, float& fMinDistance) const;
-
-#ifndef _RELEASE
-    void InstancingDebugDrawRec(uint& currentNodeIndex, const std::vector<SGeomCacheStaticNodeData>& staticNodeData);
-#endif
-
-    enum EStandInType
-    {
-        eStandInType_None,
-        eStandInType_Default,
-        eStandInType_FirstFrame,
-        eStandInType_LastFrame
-    };
-
-    EStandInType SelectStandIn() const;
-    IStatObj* GetStandIn(const EStandInType type) const;
-
-    void PrecacheStandIn(IStatObj* pStandIn, float fImportance, float fDistance, bool bFullUpdate, int nLod, const float fInvScale, bool bDrawNear);
-
-    void UpdatePhysicalEntity(const pe_articgeomparams* pParams);
-    void UpdatePhysicalMaterials();
-
-    // Material ID -> render element data + update state pointer
-    typedef AZStd::unordered_map<uint32, SGeomCacheRenderElementData> TRenderElementMap;
-    TRenderElementMap m_pRenderElements;
-
-    // Saved node transforms for motion blur and attachments
-    std::vector<Matrix34> m_nodeMatrices;
-
-    // All render meshes
-    std::vector<_smart_ptr<IRenderMesh> > m_renderMeshes;
-
-    // Update contexts for render meshes
-    std::vector<SGeomCacheRenderMeshUpdateContext> m_renderMeshUpdateContexts;
-
-    // Override material
-    _smart_ptr<IMaterial> m_pMaterial;
-
-    // The rendered cache
-    _smart_ptr<CGeomCache> m_pGeomCache;
-
-    // World space matrix
-    Matrix34 m_matrix;
-
-    // Playback
-    volatile float m_playbackTime;
-
-    // Streaming flag
-    volatile float m_streamingTime;
-
-    // Misc
-    IPhysicalEntity* m_pPhysicalEntity;
-    float m_maxViewDist;
-
-    // World space bounding box
-    AABB m_bBox;
-
-    // AABB of current displayed frame and render buffer
-    AABB m_currentAABB;
-    AABB m_currentDisplayAABB;
-
-    // Used for editor debug rendering & ray intersection
-    mutable CryCriticalSection m_fillCS;
-
-    // Transform ready sync
-    mutable CryMutex m_bTransformsReadyCS;
-    mutable CryConditionVariable m_bTransformReadyCV;
-
-    // Stand in stat objects
-    EStandInType m_standInVisible;
-    _smart_ptr<IStatObj> m_pStandIn;
-    _smart_ptr<IStatObj> m_pFirstFrameStandIn;
-    _smart_ptr<IStatObj> m_pLastFrameStandIn;
-    float m_standInDistance;
-
-    // Distance at which render node will automatically start streaming
-    float m_streamInDistance;
-
-    // Flags
-    volatile bool m_bInitialized;
-    bool m_bLooping;
-    volatile bool m_bIsStreaming;
-    bool m_bFilledFrameOnce;
-    bool m_bBoundsChanged;
-    bool m_bDrawing;
-    bool m_bTransformReady;
-};
-
-#endif
-#endif // CRYINCLUDE_CRY3DENGINE_GEOMCACHERENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/IndexedMesh.cpp b/Code/CryEngine/Cry3DEngine/IndexedMesh.cpp
deleted file mode 100644
index 3768c73433..0000000000
--- a/Code/CryEngine/Cry3DEngine/IndexedMesh.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "IndexedMesh.h"
-#include "MeshCompiler/MeshCompiler.h"
-
-DEFINE_INTRUSIVE_LINKED_LIST(CIndexedMesh)
-
-CIndexedMesh::CIndexedMesh()
-{
-}
-
-CIndexedMesh::~CIndexedMesh()
-{
-}
-
-void CIndexedMesh::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    CMesh::GetMemoryUsage(pSizer);
-}
-
-void CIndexedMesh::RestoreFacesFromIndices()
-{
-    const int indexCount = GetIndexCount();
-    SetFaceCount(indexCount / 3);
-    memset(m_pFaces, 0, GetFaceCount() * sizeof(m_pFaces[0]));
-
-    int nFaceId = 0;
-    for (int i = 0; i < indexCount; i += 3)
-    {
-        if (m_pIndices[i] != (vtx_idx) - 1)  // deleted faces have -1 here
-        {
-            for (int v = 0; v < 3; ++v)
-            {
-                assert((int)m_pIndices[i + v] < GetVertexCount());
-                m_pFaces[nFaceId].v[v] = m_pIndices[i + v];
-            }
-            ++nFaceId;
-        }
-    }
-
-    SetFaceCount(nFaceId);
-}
-
-void CIndexedMesh::Optimize(const char* szComment)
-{
-    mesh_compiler::CMeshCompiler meshCompiler;
-
-    if (szComment)
-    {
-        // mesh_compiler::MESH_COMPILE_OPTIMIZE is a bit expensive so we show a warning if it's used at run time
-        Warning("CIndexedMesh::Optimize is called at run time by %s", szComment);
-    }
-
-    if (!meshCompiler.Compile(*this, (mesh_compiler::MESH_COMPILE_TANGENTS | mesh_compiler::MESH_COMPILE_OPTIMIZE)))
-    {
-        Warning("CIndexedMesh::Optimize failed: %s", meshCompiler.GetLastError());
-    }
-}
-
-void CIndexedMesh::CalcBBox()
-{
-    const int vertexCount = GetVertexCount();
-
-    if (vertexCount == 0 || !m_pPositions)
-    {
-        m_bbox = AABB(Vec3(0, 0, 0), Vec3(0, 0, 0));
-        return;
-    }
-
-    assert(m_pPositionsF16 == 0);
-
-    m_bbox.Reset();
-
-    const int faceCount = GetFaceCount();
-
-    if (faceCount > 0)
-    {
-        for (int i = 0; i < faceCount; ++i)
-        {
-            for (int v = 0; v < 3; ++v)
-            {
-                const int nIndex = m_pFaces[i].v[v];
-                assert(nIndex >= 0 && nIndex < vertexCount);
-                m_bbox.Add(m_pPositions[nIndex]);
-            }
-        }
-    }
-    else
-    {
-        const int indexCount = GetIndexCount();
-
-        for (int i = 0; i < indexCount; ++i)
-        {
-            m_bbox.Add(m_pPositions[m_pIndices[i]]);
-        }
-    }
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/IndexedMesh.h b/Code/CryEngine/Cry3DEngine/IndexedMesh.h
deleted file mode 100644
index 7f50843728..0000000000
--- a/Code/CryEngine/Cry3DEngine/IndexedMesh.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_INDEXEDMESH_H
-#define CRYINCLUDE_CRY3DENGINE_INDEXEDMESH_H
-#pragma once
-
-#include "CryArray.h"
-#include "CryHeaders.h"
-#include "IIndexedMesh.h"
-
-class CIndexedMesh
-    : public IIndexedMesh
-    , public CMesh
-    , public stl::intrusive_linked_list_node<CIndexedMesh>
-    , public Cry3DEngineBase
-{
-public:
-    CIndexedMesh();
-    virtual ~CIndexedMesh();
-
-    //////////////////////////////////////////////////////////////////////////
-    // IIndexedMesh
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void Release()
-    {
-        delete this;
-    }
-
-    // gives read-only access to mesh data
-    virtual void GetMeshDescription(SMeshDescription& meshDesc) const
-    {
-        meshDesc.m_pFaces    = m_pFaces;
-        meshDesc.m_pVerts    = m_pPositions;
-        meshDesc.m_pVertsF16 = m_pPositionsF16;
-        meshDesc.m_pNorms    = m_pNorms;
-        meshDesc.m_pColor    = m_pColor0;
-        meshDesc.m_pTexCoord = m_pTexCoord;
-        meshDesc.m_pIndices  = m_pIndices;
-        meshDesc.m_nFaceCount  = GetFaceCount();
-        meshDesc.m_nVertCount  = GetVertexCount();
-        meshDesc.m_nCoorCount  = GetTexCoordCount();
-        meshDesc.m_nIndexCount = GetIndexCount();
-    }
-
-    virtual CMesh* GetMesh()
-    {
-        return this;
-    }
-
-    virtual void SetMesh(CMesh& mesh)
-    {
-        Copy(mesh);
-    }
-
-    virtual void FreeStreams()
-    {
-        return CMesh::FreeStreams();
-    }
-
-    virtual int GetFaceCount() const
-    {
-        return CMesh::GetFaceCount();
-    }
-
-    virtual void SetFaceCount(int nNewCount)
-    {
-        CMesh::SetFaceCount(nNewCount);
-    }
-
-    virtual int GetVertexCount() const
-    {
-        return CMesh::GetVertexCount();
-    }
-
-    virtual void SetVertexCount(int nNewCount)
-    {
-        CMesh::SetVertexCount(nNewCount);
-    }
-
-    virtual void SetColorCount(int nNewCount)
-    {
-        CMesh::ReallocStream(COLORS, 0, nNewCount);
-    }
-
-    virtual int GetTexCoordCount() const
-    {
-        return CMesh::GetTexCoordCount();
-    }
-
-    virtual void SetTexCoordCount(int nNewCount, int numStreams = 1)
-    {
-        for (int i = 0; i < numStreams; ++i)
-        {
-            CMesh::ReallocStream(TEXCOORDS, i, nNewCount);
-        }
-    }
-
-    virtual int GetTangentCount() const
-    {
-        return CMesh::GetTangentCount();
-    }
-
-    virtual void SetTangentCount(int nNewCount)
-    {
-        CMesh::ReallocStream(TANGENTS, 0, nNewCount);
-    }
-
-    virtual void SetTexCoordsAndTangentsCount(int nNewCount)
-    {
-        CMesh::SetTexCoordsAndTangentsCount(nNewCount);
-    }
-
-    virtual int GetIndexCount() const
-    {
-        return CMesh::GetIndexCount();
-    }
-
-    virtual void SetIndexCount(int nNewCount)
-    {
-        CMesh::SetIndexCount(nNewCount);
-    }
-
-    virtual void AllocateBoneMapping()
-    {
-        ReallocStream(BONEMAPPING, 0, GetVertexCount());
-    }
-
-    virtual int GetSubSetCount() const
-    {
-        return m_subsets.size();
-    }
-
-    virtual void SetSubSetCount(int nSubsets)
-    {
-        m_subsets.resize(nSubsets);
-    }
-
-    virtual const SMeshSubset& GetSubSet(int nIndex) const
-    {
-        return m_subsets[nIndex];
-    }
-
-    virtual void SetSubsetBounds(int nIndex, const Vec3& vCenter, float fRadius)
-    {
-        m_subsets[nIndex].vCenter = vCenter;
-        m_subsets[nIndex].fRadius = fRadius;
-    }
-
-    virtual void SetSubsetIndexVertexRanges(int nIndex, int nFirstIndexId, int nNumIndices, int nFirstVertId, int nNumVerts)
-    {
-        m_subsets[nIndex].nFirstIndexId = nFirstIndexId;
-        m_subsets[nIndex].nNumIndices = nNumIndices;
-        m_subsets[nIndex].nFirstVertId = nFirstVertId;
-        m_subsets[nIndex].nNumVerts = nNumVerts;
-    }
-
-    virtual void SetSubsetMaterialId(int nIndex, int nMatID)
-    {
-        m_subsets[nIndex].nMatID = nMatID;
-    }
-
-    virtual void SetSubsetMaterialProperties(int nIndex, int nMatFlags, int nPhysicalizeType, const AZ::Vertex::Format& vertexFormat)
-    {
-        m_subsets[nIndex].nMatFlags = nMatFlags;
-        m_subsets[nIndex].nPhysicalizeType = nPhysicalizeType;
-        m_subsets[nIndex].vertexFormat = vertexFormat;
-    }
-
-    virtual AABB GetBBox() const
-    {
-        return m_bbox;
-    }
-
-    virtual void SetBBox(const AABB& box)
-    {
-        m_bbox = box;
-    }
-
-    virtual void CalcBBox();
-
-    virtual void Optimize(const char* szComment = NULL);
-
-    virtual void RestoreFacesFromIndices();
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void GetMemoryUsage(class ICrySizer* pSizer) const;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_INDEXEDMESH_H
diff --git a/Code/CryEngine/Cry3DEngine/LightEntity.cpp b/Code/CryEngine/Cry3DEngine/LightEntity.cpp
deleted file mode 100644
index 2bd410b918..0000000000
--- a/Code/CryEngine/Cry3DEngine/LightEntity.cpp
+++ /dev/null
@@ -1,1926 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "3dEngine.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "LightEntity.h"
-#include "CullBuffer.h"
-#include "IShader.h"
-#include "ClipVolume.h"
-#include "ClipVolumeManager.h"
-#include "ShadowCache.h"
-
-#include <MathConversion.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-PodArray<SPlaneObject> CLightEntity::s_lstTmpCastersHull;
-
-#define MIN_SHADOW_RES_OMNI_LIGHT 64
-#define MIN_SHADOW_RES_PROJ_LIGHT 128
-
-void CLightEntity::StaticReset()
-{
-    stl::free_container(s_lstTmpCastersHull);
-}
-
-void CLightEntity::InitEntityShadowMapInfoStructure()
-{
-    // Init ShadowMapInfo structure
-    if (!m_pShadowMapInfo)
-    {
-        m_pShadowMapInfo = new ShadowMapInfo(); // leak
-    }
-}
-
-CLightEntity::CLightEntity()
-    : m_VoxelGIMode{VM_None}
-{
-    m_layerId = ~0;
-
-    m_bShadowCaster = false;
-    m_pShadowMapInfo = NULL;
-    m_pNotCaster = NULL;
-
-    memset(&m_Matrix, 0, sizeof(m_Matrix));
-
-    m_pStatObj = NULL;
-    GetInstCount(GetRenderNodeType())++;
-}
-
-CLightEntity::~CLightEntity()
-{
-    SAFE_RELEASE(m_light.m_Shader.m_pShader);
-
-    Get3DEngine()->FreeRenderNodeState(this);
-
-    ((C3DEngine*)Get3DEngine())->RemoveEntityLightSources(this);
-
-    // delete shadow frustums
-    if (m_pShadowMapInfo)
-    {
-        for (int nLod = 0; nLod < MAX_GSM_LODS_NUM; nLod++)
-        {
-            //TODO: after porting the sorting to jobs, add a sync point here to prevent deleting a ShadowFrustum which could still be used by a job
-            SAFE_DELETE(m_pShadowMapInfo->pGSM[nLod]);
-        }
-    }
-    SAFE_DELETE(m_pShadowMapInfo);
-
-    GetInstCount(GetRenderNodeType())--;
-
-    SAFE_RELEASE(m_pStatObj);
-}
-
-const char* CLightEntity::GetName(void) const
-{
-    return m_Name.size() ? m_Name.c_str() : (m_light.m_sName ? m_light.m_sName : "LightEntity");
-}
-
-bool CLightEntity::IsLightAreasVisible()
-{
-    IVisArea* pArea = GetEntityVisArea();
-
-    // test area vis
-    if (!pArea || pArea->GetVisFrameId() == GetRenderer()->GetFrameID())
-    {
-        return true; // visible
-    }
-    if (m_light.m_Flags & DLF_THIS_AREA_ONLY)
-    {
-        return false;
-    }
-
-    // test neighbors
-    IVisArea* Areas[64];
-    int nCount = pArea->GetVisAreaConnections(Areas, 64);
-    for (int i = 0; i < nCount; i++)
-    {
-        if (Areas[i]->GetVisFrameId() == GetRenderer()->GetFrameID())
-        {
-            return true; // visible
-        }
-    }
-    return false; // not visible
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int CLightEntity::GetSlotCount() const
-{
-    if (m_pStatObj)
-    {
-        return 1;
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLightEntity::SetMatrix(const Matrix34& mat)
-{
-    m_Matrix = mat;
-    Vec3 wp = mat.GetTranslation();
-    if (!(m_light.m_Flags & DLF_DEFERRED_CUBEMAPS))
-    {
-        float fRadius = m_light.m_fRadius;
-        if (m_light.m_Flags & DLF_AREA_LIGHT) // Use max for area lights.
-        {
-            fRadius += max(m_light.m_fAreaWidth, m_light.m_fAreaHeight);
-        }
-        SetBBox(AABB(wp - Vec3(fRadius), wp + Vec3(fRadius)));
-    }
-    else
-    {
-        OBB obb(OBB::CreateOBBfromAABB(Matrix33(m_Matrix), AABB(-m_light.m_ProbeExtents, m_light.m_ProbeExtents)));
-        SetBBox(AABB::CreateAABBfromOBB(wp, obb));
-    }
-    m_light.SetPosition(wp);
-    
-    // Updating light properties here can permanently set our m_bShadowCaster to false if e_shadows is 0 so preserve it.
-    // really updating the matrix shouldn't change our shadow casting property and we should probably make a new function 
-    // to update matrix related properties instead of calling SetLightProperties
-    bool isShadowCaster = m_bShadowCaster;
-    SetLightProperties(m_light);
-    m_bShadowCaster = isShadowCaster;
-
-    Get3DEngine()->RegisterEntity(this);
-
-    if (!memcmp(&m_Matrix, &mat, sizeof(Matrix34)))
-    {
-        return;
-    }
-
-    //update shadow frustums
-    if (m_pShadowMapInfo != NULL)
-    {
-        for (int i = 0; i < MAX_GSM_LODS_NUM && m_pShadowMapInfo->pGSM[i] != NULL; i++)
-        {
-            m_pShadowMapInfo->pGSM[i]->RequestUpdate();
-        }
-    }
-}
-
-
-void C3DEngine::UpdateSun(const SRenderingPassInfo& passInfo)
-{
-    if (GetCVars()->e_Sun)
-    {
-        if (!m_pSun)
-        {
-            m_pSun = (CLightEntity*)CreateLightSource();
-        }
-
-        CDLight DynLight;
-        DynLight.SetPosition(passInfo.GetCamera().GetPosition() + GetSunDir());
-        DynLight.m_fRadius  = 100000000;
-        DynLight.SetLightColor(GetSunColor());
-        DynLight.SetSpecularMult(GetGlobalParameter(E3DPARAM_SUN_SPECULAR_MULTIPLIER));
-        DynLight.m_Flags |= DLF_DIRECTIONAL | DLF_SUN | DLF_THIS_AREA_ONLY | DLF_LM | DLF_SPECULAROCCLUSION |
-            ((m_bSunShadows && passInfo.RenderShadows()) ? DLF_CASTSHADOW_MAPS : 0);
-        DynLight.m_sName = "Sun";
-
-        DynLight.m_nLightStyle = gEnv->p3DEngine->GetSunAnimIndex();
-        DynLight.SetAnimSpeed(gEnv->p3DEngine->GetSunAnimSpeed());
-        DynLight.m_nLightPhase = gEnv->p3DEngine->GetSunAnimPhase();
-
-        m_pSun->SetLightProperties(DynLight);
-
-        m_pSun->SetBBox(AABB(
-                DynLight.m_Origin - Vec3(DynLight.m_fRadius, DynLight.m_fRadius, DynLight.m_fRadius),
-                DynLight.m_Origin + Vec3(DynLight.m_fRadius, DynLight.m_fRadius, DynLight.m_fRadius)));
-
-        m_pSun->SetRndFlags(ERF_OUTDOORONLY, true);
-
-        CDLight* lightProps = &m_pSun->GetLightProperties(); //We want the address of the CDLight stored in the sun, not the address of DynLight
-        GetRenderer()->EF_UpdateDLight(lightProps);
-
-        //Update the sun's animated color with the color calculated in EF_UpdateDLight
-        gEnv->p3DEngine->SetSunAnimColor(Vec3(lightProps->m_Color.r, lightProps->m_Color.g, lightProps->m_Color.b));
-
-        RegisterEntity(m_pSun);
-    }
-    else if (m_pSun)
-    {
-        UnRegisterEntityAsJob(m_pSun);
-        DeleteLightSource(m_pSun);
-        m_pSun = nullptr;
-    }
-}
-
-Vec3 CLightEntity::GSM_GetNextScreenEdge(float fPrevRadius, float fPrevDistanceFromView, const SRenderingPassInfo& passInfo)
-{
-    Vec3 vEdgeN = passInfo.GetCamera().GetEdgeN();
-    Vec3 vEdgeF = passInfo.GetCamera().GetEdgeF();
-    Vec3 vPrevSphereCenter(0.0f, fPrevDistanceFromView, 0.0f);
-
-    float fDistToFrustEdge = (((vPrevSphereCenter - vEdgeN).Cross(vEdgeF - vEdgeN)).GetLength()) / ((vEdgeF - vEdgeN).GetLength());
-    float fDistToPlaneOnEdgeSquared = fPrevRadius * fPrevRadius - fDistToFrustEdge * fDistToFrustEdge;
-    float fDistToPlaneOnEdge = fDistToPlaneOnEdgeSquared > 0.0f ? sqrt_tpl(fDistToPlaneOnEdgeSquared) : 0.0f;
-
-    Vec3 vEdgeDir = (vEdgeF - vEdgeN);
-    vEdgeDir.SetLength(2.0f * fDistToPlaneOnEdge);
-    return vEdgeN + vEdgeDir;
-};
-
-float CLightEntity::GSM_GetLODProjectionCenter(const Vec3& vEdgeScreen, float fRadius)
-{
-    float fScreenEdgeSq = vEdgeScreen.z * vEdgeScreen.z + vEdgeScreen.x * vEdgeScreen.x;
-    float fRadiusSq = max(fRadius * fRadius, 2.0f * fScreenEdgeSq);
-    float fDistanceFromNear = sqrt_tpl(fRadiusSq - fScreenEdgeSq);
-    float fDistanceFromView = fDistanceFromNear + vEdgeScreen.y;
-    return fDistanceFromView;
-}
-
-
-void CLightEntity::UpdateGSMLightSourceShadowFrustum(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const int nMaxLodCount = min(GetCVars()->e_GsmLodsNum, MAX_GSM_LODS_NUM);
-    int nDynamicLodCount = nMaxLodCount;
-    int nCachedLodCount = 0;
-
-    // check for shadow cache
-    if (m_light.m_Flags & DLF_SUN)
-    {
-        int nFirstCachedLod = GetCVars()->e_ShadowsCache ? Get3DEngine()->m_nGsmCache - 1 : -1;
-        if (nFirstCachedLod >= 0)
-        {
-            nDynamicLodCount = clamp_tpl(nFirstCachedLod, 0, nMaxLodCount);
-            nCachedLodCount = nMaxLodCount - nDynamicLodCount;
-        }
-    }
-    else
-    {
-        // If a light is not the SUN, then we don't take e_GsmLodsNum 
-        // into account and decide we will have one lod.
-        nDynamicLodCount = 1;
-    }
-
-    // update dynamic and static frustums
-    float fDistFromView = 0;
-    float fRadiusLastLod = 0;
-
-    int nNextLod = 0;
-    nNextLod  = UpdateGSMLightSourceDynamicShadowFrustum(nDynamicLodCount, nCachedLodCount, fDistFromView, fRadiusLastLod, nCachedLodCount == 0, passInfo);
-    nNextLod += UpdateGSMLightSourceCachedShadowFrustum(nDynamicLodCount, nCachedLodCount, fDistFromView, fRadiusLastLod, passInfo);
-
-    // free not used frustums
-    for (int nLod = nNextLod; nLod < MAX_GSM_LODS_NUM; nLod++)
-    {
-        if (ShadowMapFrustum* pFr = m_pShadowMapInfo->pGSM[nLod])
-        {
-            pFr->ResetCasterLists();
-            pFr->m_eFrustumType = ShadowMapFrustum::e_GsmDynamic;
-            SAFE_DELETE(pFr->pShadowCacheData);
-        }
-    }
-}
-
-int CLightEntity::UpdateGSMLightSourceDynamicShadowFrustum(int nDynamicLodCount, int nDistanceLodCount, float& fDistanceFromViewNextDynamicLod, float& fGSMBoxSizeNextDynamicLod, bool bFadeLastCascade, const SRenderingPassInfo& passInfo)
-{
-    InitEntityShadowMapInfoStructure();
-
-    float fGSMBoxSize = fGSMBoxSizeNextDynamicLod = (float)Get3DEngine()->m_fGsmRange;
-    Vec3 vCameraDir = passInfo.GetCamera().GetMatrix().GetColumn(1).GetNormalized();
-    float fDistToLight = passInfo.GetCamera().GetPosition().GetDistance(GetPos(true));
-
-    PodArray<SPlaneObject>& lstCastersHull = s_lstTmpCastersHull;
-    lstCastersHull.Clear();
-
-    // prepare shadow frustums
-    int nLod;
-
-    //compute distance for first LOD
-    Vec3 vEdgeScreen = passInfo.GetCamera().GetEdgeN();
-    //clamp first frustum to DRAW_NEAREST_MIN near plane because weapon can be placed beyond camera near plane in world space
-    vEdgeScreen.y = min(vEdgeScreen.y, DRAW_NEAREST_MIN);
-    float fDistanceFromView = fDistanceFromViewNextDynamicLod = GSM_GetLODProjectionCenter(vEdgeScreen, Get3DEngine()->m_fGsmRange);
-
-    for (nLod = 0; nLod < nDynamicLodCount + nDistanceLodCount; nLod++)
-    {
-        float fFOV = (m_light).m_fLightFrustumAngle * 2;
-        bool bDoGSM = (fGSMBoxSize < m_light.m_fRadius * 0.01f && fGSMBoxSize < fDistToLight * 0.5f * (fFOV / 90.f) && fDistToLight < m_light.m_fRadius)
-            && ((m_light.m_Flags & DLF_SUN) || Get3DEngine()->GetShadowsCascadeCount(&m_light) > 1);
-
-        if (bDoGSM)
-        {
-            //Vec3 vSunDir = Get3DEngine()->GetSunDir().GetNormalized();  // todo: remove GetNormalized() once GetSunDir() returns the normalized value
-            Vec3 vSunDir = Vec3(1.0f, 0.0f, 0.0f);
-            Vec3 vCameraDirWithoutDepth = vCameraDir - vCameraDir.Dot(vSunDir) * vSunDir;
-
-            Vec3 vFocusPos = passInfo.GetCamera().GetPosition() + vCameraDirWithoutDepth * fGSMBoxSize;
-            SetBBox(AABB(vFocusPos - Vec3(fGSMBoxSize, fGSMBoxSize, fGSMBoxSize), vFocusPos + Vec3(fGSMBoxSize, fGSMBoxSize, fGSMBoxSize)));
-        }
-        else
-        {
-            float fRadius = m_light.m_fRadius;
-            if (m_light.m_Flags & DLF_AREA_LIGHT) // Use max for area lights.
-            {
-                fRadius += max(m_light.m_fAreaWidth, m_light.m_fAreaHeight);
-            }
-            SetBBox(AABB(m_light.m_Origin - Vec3(fRadius), m_light.m_Origin + Vec3(fRadius)));
-        }
-
-        if (!m_pShadowMapInfo->pGSM[nLod])
-        {
-            m_pShadowMapInfo->pGSM[nLod] = new ShadowMapFrustum;
-        }
-
-        m_pShadowMapInfo->pGSM[nLod]->m_eFrustumType = nLod < nDynamicLodCount ? ShadowMapFrustum::e_GsmDynamic : ShadowMapFrustum::e_GsmDynamicDistance;
-        m_pShadowMapInfo->pGSM[nLod]->bUseAdditiveBlending = false;
-        m_pShadowMapInfo->pGSM[nLod]->fShadowFadingDist = (bFadeLastCascade && nLod == nDynamicLodCount - 1) ? 1.0f : 0.0f;
-
-        if (!ProcessFrustum(nLod, bDoGSM ? fGSMBoxSize : 0, fDistanceFromView, lstCastersHull, passInfo))
-        {
-            nLod++;
-            break;
-        }
-
-        //compute plane  for next GSM slice
-        vEdgeScreen = GSM_GetNextScreenEdge(fGSMBoxSize, fDistanceFromView, passInfo);
-        fGSMBoxSize *= Get3DEngine()->m_fGsmRangeStep;
-
-        //compute distance from camera for next LOD
-        fDistanceFromView = GSM_GetLODProjectionCenter(vEdgeScreen, fGSMBoxSize);
-
-        if (nLod < nDynamicLodCount)
-        {
-            fDistanceFromViewNextDynamicLod = fDistanceFromView;
-            fGSMBoxSizeNextDynamicLod = fGSMBoxSize;
-        }
-    }
-
-    return nLod;
-}
-
-int CLightEntity::UpdateGSMLightSourceCachedShadowFrustum(int nFirstLod, int nLodCount, float& fDistFromViewDynamicLod, float fRadiusDynamicLod, const SRenderingPassInfo& passInfo)
-{
-    ShadowFrustumMGPUCache* pFrustumCache = GetRenderer()->GetShadowFrustumMGPUCache();
-    assert(pFrustumCache);
-
-    static ICVar* pHeightMapAOVar = GetConsole()->GetCVar("r_HeightMapAO");
-    const int firstCachedFrustumIndex = nFirstLod + nLodCount;
-    const bool bRestoreFromCache = GetRenderer()->GetActiveGPUCount() > 1 && pFrustumCache->nUpdateMaskMT != 0 &&  m_pShadowMapInfo->pGSM[firstCachedFrustumIndex];
-    const bool bHeightMapAO = Get3DEngine()->m_bHeightMapAoEnabled && pHeightMapAOVar && pHeightMapAOVar->GetIVal() > 0 && (m_light.m_Flags & DLF_SUN);
-
-    int nLod = 0;
-
-    if (bRestoreFromCache)
-    {
-        for (nLod = 0; nLod < nLodCount; ++nLod)
-        {
-            assert(pFrustumCache->m_pStaticShadowMapFrustums[nLod] && m_pShadowMapInfo->pGSM[firstCachedFrustumIndex + nLod]);
-
-            ShadowMapFrustum* pFr = m_pShadowMapInfo->pGSM[firstCachedFrustumIndex + nLod];
-            *pFr = *pFrustumCache->m_pStaticShadowMapFrustums[nLod];
-            pFr->bIsMGPUCopy = true;
-        }
-
-        if (bHeightMapAO)
-        {
-            assert(pFrustumCache->m_pHeightMapAOFrustum &&  m_pShadowMapInfo->pGSM[firstCachedFrustumIndex + nLod]);
-
-            ShadowMapFrustum* pFr = m_pShadowMapInfo->pGSM[firstCachedFrustumIndex + nLod];
-            *pFr = *pFrustumCache->m_pHeightMapAOFrustum;
-            pFr->bIsMGPUCopy = true;
-
-            ++nLod;
-        }
-    }
-    else
-    {
-        ShadowMapFrustum::ShadowCacheData::eUpdateStrategy nUpdateStrategy =
-            static_cast<ShadowMapFrustum::ShadowCacheData::eUpdateStrategy>(Get3DEngine()->m_nCachedShadowsUpdateStrategy);
-
-        if (GetCVars()->e_ShadowsCacheUpdate)
-        {
-            nUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eFullUpdate;
-        }
-
-        ShadowCache shadowCache(this, nUpdateStrategy);
-
-        for (nLod = 0; nLod < nLodCount; ++nLod)
-        {
-            ShadowMapFrustum*& pFr = m_pShadowMapInfo->pGSM[firstCachedFrustumIndex + nLod];
-            shadowCache.InitShadowFrustum(pFr, nFirstLod + nLod, nFirstLod, fDistFromViewDynamicLod, fRadiusDynamicLod, passInfo);
-            if (!pFr)
-            {
-                continue;
-            }
-
-            CalculateShadowBias(pFr, nFirstLod + nLod, fRadiusDynamicLod);
-            pFr->bIsMGPUCopy = false;
-
-            // update MGPU frustum cache
-            if (GetRenderer()->GetActiveGPUCount() > 1 && pFrustumCache->m_pStaticShadowMapFrustums[nLod])
-            {
-                *pFrustumCache->m_pStaticShadowMapFrustums[nLod] = *pFr;
-            }
-
-            // update distance from view
-            Vec3 vEdgeScreen = GSM_GetNextScreenEdge(fRadiusDynamicLod, fDistFromViewDynamicLod, passInfo);
-            fRadiusDynamicLod *= Get3DEngine()->m_fGsmRangeStep;
-            fDistFromViewDynamicLod = GSM_GetLODProjectionCenter(vEdgeScreen, fRadiusDynamicLod);
-        }
-
-        if (bHeightMapAO)
-        {
-            ShadowMapFrustum*& pFr = m_pShadowMapInfo->pGSM[firstCachedFrustumIndex + nLod];
-
-            shadowCache.InitHeightMapAOFrustum(pFr, nFirstLod + nLod, passInfo);
-            pFr->bIsMGPUCopy = false;
-            if (GetRenderer()->GetActiveGPUCount() > 1 && pFrustumCache->m_pHeightMapAOFrustum)
-            {
-                *pFrustumCache->m_pHeightMapAOFrustum = *pFr;
-            }
-
-            ++nLod;
-        }
-
-        if (GetCVars()->e_ShadowsCacheUpdate == 1)
-        {
-            GetCVars()->e_ShadowsCacheUpdate = 0;
-        }
-
-        if (GetCVars()->e_ShadowsCacheRequireManualUpdate == 1)
-        {
-            Get3DEngine()->m_nCachedShadowsUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eManualUpdate;
-        }
-        else if (GetCVars()->e_ShadowsCacheRequireManualUpdate == 2)
-        {
-            Get3DEngine()->m_nCachedShadowsUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eManualOrDistanceUpdate;
-        }
-        else
-        {
-            Get3DEngine()->m_nCachedShadowsUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eIncrementalUpdate;
-        }
-
-        int nActiveGPUCount = GetRenderer()->GetActiveGPUCount();
-        pFrustumCache->nUpdateMaskMT = (1 << nActiveGPUCount) - 1;
-    }
-
-    return nLod;
-}
-
-bool CLightEntity::ProcessFrustum(int nLod, float fGSMBoxSize, float fDistanceFromView, PodArray<SPlaneObject>& lstCastersHull, const SRenderingPassInfo& passInfo)
-{
-    ShadowMapFrustum* pFr = m_pShadowMapInfo->pGSM[nLod];
-
-    // make shadow map frustum for receiving (include all objects into frustum)
-    assert(pFr);
-
-    bool bDoGSM = fGSMBoxSize != 0;
-
-    if (bDoGSM)// && (m_light.m_Flags & DLF_SUN || m_light.m_Flags & DLF_PROJECT))
-    {
-        InitShadowFrustum_SUN_Conserv(pFr, SMC_EXTEND_FRUSTUM | SMC_SHADOW_FRUSTUM_TEST, fGSMBoxSize, fDistanceFromView, nLod, passInfo);
-
-        const uint32 renderNodeFlags = pFr->m_eFrustumType == ShadowMapFrustum::e_GsmDynamicDistance ? ERF_DYNAMIC_DISTANCESHADOWS : 0xFFFFFFFF;
-        FillFrustumCastersList_SUN(pFr, SMC_EXTEND_FRUSTUM | SMC_SHADOW_FRUSTUM_TEST, renderNodeFlags, lstCastersHull, nLod, passInfo);
-    }
-    else if (m_light.m_Flags & (DLF_PROJECT | DLF_AREA_LIGHT))
-    {
-        InitShadowFrustum_PROJECTOR(pFr, SMC_EXTEND_FRUSTUM | SMC_SHADOW_FRUSTUM_TEST, passInfo);
-        FillFrustumCastersList_PROJECTOR(pFr, SMC_EXTEND_FRUSTUM | SMC_SHADOW_FRUSTUM_TEST, passInfo);
-    }
-    else
-    {
-        pFr->bOmniDirectionalShadow = true;
-        InitShadowFrustum_OMNI(pFr, SMC_EXTEND_FRUSTUM | SMC_SHADOW_FRUSTUM_TEST, passInfo);
-        FillFrustumCastersList_OMNI(pFr, SMC_EXTEND_FRUSTUM | SMC_SHADOW_FRUSTUM_TEST, passInfo);
-    }
-
-    CalculateShadowBias(pFr, nLod, fGSMBoxSize);
-
-    if (GetCVars()->e_ShadowsFrustums && pFr && !pFr->m_castersList.IsEmpty())
-    {
-        pFr->DrawFrustum(GetRenderer(), (GetCVars()->e_ShadowsFrustums == 1) ? 1000 : 1);
-    }
-
-
-    return bDoGSM;
-}
-
-void CLightEntity::InitShadowFrustum_SUN_Conserv(ShadowMapFrustum* pFr, [[maybe_unused]] int dwAllowedTypes, float fGSMBoxSize, float fDistance, int nLod, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(nLod >= 0 && nLod < MAX_GSM_LODS_NUM);
-
-    //TOFIX: replace fGSMBoxSize  by fRadius
-    float fRadius = fGSMBoxSize;
-#ifdef FEATURE_SVO_GI
-    if (gEnv->pConsole->GetCVar("e_svoTI_Active") && 
-        gEnv->pConsole->GetCVar("e_svoTI_Active")->GetIVal() && 
-        nLod == 2)
-    {
-        fRadius += gEnv->pConsole->GetCVar("e_svoTI_ConeMaxLength")->GetFVal() * 0.5f;
-    }
-#endif
-
-    Vec3 vViewDir = passInfo.GetCamera().GetViewdir();
-    pFr->RequestUpdate();
-    pFr->nShadowMapLod = nLod;
-    pFr->vLightSrcRelPos = m_light.m_Origin - passInfo.GetCamera().GetPosition();
-    pFr->fRadius = m_light.m_fRadius;
-    assert(m_light.m_pOwner);
-    pFr->pLightOwner = m_light.m_pOwner;
-    pFr->m_Flags = m_light.m_Flags;
-    pFr->bIncrementalUpdate = false;
-
-    const AABB& box = GetBBox();
-    const float fBoxRadius = max(0.00001f, box.GetRadius());
-
-    //  float fDistToLightSrc = pFr->vLightSrcRelPos.GetLength();
-    pFr->fFOV = (float)RAD2DEG(atan_tpl(fRadius / DISTANCE_TO_THE_SUN)) * 2.0f;
-    if (pFr->fFOV > LIGHT_PROJECTOR_MAX_FOV)
-    {
-        pFr->fFOV = LIGHT_PROJECTOR_MAX_FOV;
-    }
-    pFr->fProjRatio = 1.0f;
-
-    //Sampling parameters
-    //Calculate proper projection of frustum to the terrain receiving area but not based on fBoxRadius
-
-    float arrWidthS[] = {1.94f, 1.0f, 0.8f, 0.5f, 0.3f, 0.3f, 0.3f, 0.3f};
-
-    pFr->fWidthS = arrWidthS[nLod];//fBoxRadiusMax/arrRangeS[nLod]; //fBoxRadius //*GetCVars()->e_ShadowsMaxTexRes *
-    pFr->fWidthT = pFr->fWidthS;
-    pFr->fBlurS = 0.0f;//arrBlurS[nLod];
-    pFr->fBlurT = pFr->fBlurS;
-
-    Vec3 vLightDir = pFr->vLightSrcRelPos.normalized();
-
-    float fDist = pFr->vLightSrcRelPos.GetLength();
-
-    //float fMaxFrustEdge = GSM_GetNextScreenEdge(fGSMBoxSize, fDistance).GetLength();
-    Vec3 vEdgeN = passInfo.GetCamera().GetEdgeN();
-    Vec3 vCamSpView(0.0f, fDistance, 0.0f);
-    float fEdgeScale = (fDistance + fGSMBoxSize) / vEdgeN.y * vEdgeN.GetLength();
-    float fMaxFrustEdge = ((vEdgeN.GetNormalized() * fEdgeScale) - vCamSpView).GetLength();
-    fMaxFrustEdge *= 1.37f;
-
-    {
-        const float fDepthRange = 2.0f * max(Get3DEngine()->m_fSunClipPlaneRange, fMaxFrustEdge);
-        const float fNearAdjust =  Lerp(fDepthRange - fMaxFrustEdge, fMaxFrustEdge, Get3DEngine()->m_fSunClipPlaneRangeShift);
-
-        pFr->fNearDist = fDist - fNearAdjust;
-        pFr->fFarDist = fDist + fDepthRange - fNearAdjust;
-    }
-
-    if (pFr->fFarDist > m_light.m_fRadius)
-    {
-        pFr->fFarDist = m_light.m_fRadius;
-    }
-
-    if (pFr->fNearDist < pFr->fFarDist * 0.005f)
-    {
-        pFr->fNearDist = pFr->fFarDist * 0.005f;
-    }
-
-    assert(pFr->fNearDist < pFr->fFarDist);
-
-    pFr->nTexSize = GetCVars()->e_ShadowsMaxTexRes;
-
-    pFr->vProjTranslation = passInfo.GetCamera().GetPosition() + fDistance * vViewDir;
-
-    // local jitter amount depends on frustum size
-    pFr->fFrustrumSize =  1.0f / (fGSMBoxSize * (float)Get3DEngine()->m_fGsmRange);
-    pFr->nUpdateFrameId = passInfo.GetFrameID();
-    pFr->bIncrementalUpdate = false;
-
-    // setup the frustum main frustum plane before calculating frustum bounds and blending
-    CCamera& FrustCam = pFr->FrustumPlanes[0] = CCamera();
-    Matrix34A mat = Matrix33::CreateRotationVDir(-vLightDir);
-    mat.SetTranslation(pFr->vLightSrcRelPos + pFr->vProjTranslation);
-    FrustCam.SetMatrixNoUpdate(mat);
-    FrustCam.SetFrustum(256, 256, pFr->fFOV * (gf_PI / 180.0f), pFr->fNearDist, pFr->fFarDist);
-
-    GetGsmFrustumBounds(passInfo.GetCamera(), pFr);
-
-    if (GetCVars()->e_ShadowsBlendCascades)
-    {
-        pFr->bBlendFrustum = true;
-        pFr->fBlendVal = GetCVars()->e_ShadowsBlendCascadesVal;
-
-        CCamera& BlendCam = pFr->FrustumPlanes[1] = pFr->FrustumPlanes[0];
-        BlendCam.SetFrustum(256, 256, pFr->fBlendVal * pFr->fFOV * (gf_PI / 180.0f), pFr->fNearDist, pFr->fFarDist);
-    }
-    else
-    {
-        pFr->bBlendFrustum = false;
-        pFr->fBlendVal = 1.0f;
-    }
-}
-
-void CLightEntity::CalculateShadowBias(ShadowMapFrustum* pFr, int nLod, float fGSMBoxSize) const
-{
-    const float* arrDepthConstBias = Get3DEngine()->GetShadowsCascadesConstBias();
-    const float* arrDepthSlopeBias = Get3DEngine()->GetShadowsCascadesSlopeBias();
-
-    assert(nLod >= 0 && nLod < 8);
-
-    if (m_light.m_Flags & DLF_SUN)
-    {
-        float fVladRatio = min(fGSMBoxSize / 2.f, 1.f);
-        float fConstBiasRatio = arrDepthConstBias[nLod] * Get3DEngine()->m_fShadowsConstBias * fVladRatio;
-        float fSlopeBiasRatio = arrDepthSlopeBias[nLod] * Get3DEngine()->m_fShadowsSlopeBias * fVladRatio;
-
-        pFr->fDepthConstBias = fConstBiasRatio * (pFr->fFarDist - pFr->fNearDist) / (872727.27f * 2.0f) /** 0.000000001f;*/;
-        pFr->fDepthTestBias  = fVladRatio * (pFr->fFarDist - pFr->fNearDist) * (fGSMBoxSize * 0.5f * 0.5f + 0.5f) * 0.0000005f;
-        pFr->fDepthSlopeBias = fSlopeBiasRatio * (fGSMBoxSize / max(0.00001f, Get3DEngine()->m_fGsmRange)) * 0.1f;
-    }
-    else
-    {
-        pFr->fDepthConstBias  = m_light.m_fShadowBias * 0.000003f * pFr->fFarDist; //should be reverted to 0.0000001 after fixinf +X-frustum
-        pFr->fDepthTestBias = 0.00028f * pFr->fFarDist;
-        pFr->fDepthSlopeBias = m_light.m_fShadowSlopeBias * Get3DEngine()->m_fShadowsSlopeBias;
-    }
-
-    if (pFr->fDepthTestBias > 0.005f)
-    {
-        pFr->fDepthTestBias = 0.005f;
-    }
-
-    if (pFr->fNearDist < 1000.f) // if not sun
-    {
-        if (pFr->fDepthTestBias < 0.0005f)
-        {
-            pFr->fDepthTestBias = 0.0005f;
-        }
-    }
-}
-
-bool SegmentFrustumIntersection(const Vec3& P0, const Vec3& P1, const CCamera& frustum, Vec3* pvIntesectP0 = NULL, Vec3* pvIntesectP1 = NULL)
-{
-    if (P0.IsEquivalent(P1))
-    {
-        return frustum.IsPointVisible(P0);
-    }
-
-    //Actual Segment-Frustum intersection test
-    float tE = 0.0f;
-    float tL = 1.0f;
-    Vec3 dS = P1 - P0;
-
-    for (int i = 0; i < 6; i++)
-    {
-        const Plane* currPlane = frustum.GetFrustumPlane(i);
-
-        Vec3 ni = currPlane->n;
-        Vec3 Vi = ni * (-currPlane->d);
-
-        float N = -(ni | Vec3(P0 - Vi));
-        float D = ni | dS;
-
-        if (D == 0) //segment is parallel to face
-        {
-            if (N < 0)
-            {
-                return false; //outside face
-            }
-            else
-            {
-                continue; //inside face
-            }
-        }
-
-        float t = N / D;
-        if (D < 0) //segment is entering face
-        {
-            tE = max(tE, t);
-            if (tE > tL)
-            {
-                return false;
-            }
-        }
-        else //segment is leaving face
-        {
-            tL = min(tL, t);
-            if (tL < tE)
-            {
-                return false;
-            }
-        }
-    }
-    //calc intersection point if needed
-    if (pvIntesectP0)
-    {
-        *pvIntesectP0 = P0 + tE * dS; // = P(tE) = point where S enters polygon
-    }
-    if (pvIntesectP1)
-    {
-        *pvIntesectP1 = P0 + tL * dS; // = P(tL) = point where S leaves polygon
-    }
-    //it's intersecting frustum
-    return true;
-}
-
-
-bool CLightEntity::FrustumIntersection(const CCamera& viewFrustum, const CCamera& shadowFrustum)
-{
-    int i;
-
-    Vec3 pvViewFrust[8];
-    Vec3 pvShadowFrust[8];
-
-    viewFrustum.GetFrustumVertices(pvViewFrust);
-    shadowFrustum.GetFrustumVertices(pvShadowFrust);
-
-    for (i = 0; i < 8; i++)
-    {
-        if (viewFrustum.IsPointVisible(pvShadowFrust[i]))
-        {
-            return true;
-        }
-
-        if (shadowFrustum.IsPointVisible(pvViewFrust[i]))
-        {
-            return true;
-        }
-    }
-
-    for (i = 0; i < 4; i++)
-    {
-        //far face
-        if (SegmentFrustumIntersection(pvShadowFrust[i], pvShadowFrust[(i + 1) % 4], viewFrustum))
-        {
-            return true;
-        }
-        //near face
-        if (SegmentFrustumIntersection(pvShadowFrust[i + 4], pvShadowFrust[(i + 1) % 4 + 4], viewFrustum))
-        {
-            return true;
-        }
-        //other edges
-        if (SegmentFrustumIntersection(pvShadowFrust[i], pvShadowFrust[i + 4], viewFrustum))
-        {
-            return true;
-        }
-
-        //vice-versa test
-        //far face
-        if (SegmentFrustumIntersection(pvViewFrust[i], pvViewFrust[(i + 1) % 4], shadowFrustum))
-        {
-            return true;
-        }
-        //near face
-        if (SegmentFrustumIntersection(pvViewFrust[i + 4], pvViewFrust[(i + 1) % 4 + 4], shadowFrustum))
-        {
-            return true;
-        }
-        //other edges
-        if (SegmentFrustumIntersection(pvViewFrust[i], pvViewFrust[i + 4], shadowFrustum))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool CLightEntity::GetGsmFrustumBounds(const CCamera& viewFrustum, ShadowMapFrustum* pShadowFrustum)
-{
-    int i;
-
-    Vec3 pvViewFrust[8];
-    Vec3 pvShadowFrust[8];
-
-    CCamera& camShadowFrustum = pShadowFrustum->FrustumPlanes[0];
-
-    Matrix34A mShadowView, mShadowProj;
-    Matrix34A mShadowComposite = viewFrustum.GetMatrix().GetInverted();
-    Matrix44A mCameraView = Matrix44A(viewFrustum.GetMatrix().GetInverted());
-    viewFrustum.GetFrustumVertices(pvViewFrust);
-    camShadowFrustum.GetFrustumVertices(pvShadowFrust);
-
-    Vec3 vCamPosition = viewFrustum.GetPosition();
-    Vec3 vIntersectP0(0, 0, 0), vIntersectP1(0, 0, 0);
-
-    AABB viewAABB;
-    viewAABB.Reset();
-
-    bool bIntersected = false;
-    f32 fDisatanceToMaxBound = 0;
-    Vec3 vMaxBoundPoint(ZERO);
-
-    for (i = 0; i < 4; i++)
-    {
-        //far face
-        if (SegmentFrustumIntersection(pvShadowFrust[i], pvShadowFrust[(i + 1) % 4], viewFrustum, &vIntersectP0, &vIntersectP1))
-        {
-            if (GetCVars()->e_GsmDepthBoundsDebug)
-            {
-                GetRenderer()->GetIRenderAuxGeom()->DrawLine(vIntersectP0, RGBA8(0xff, 0xff, 0x1f, 0xff), vIntersectP1, RGBA8(0xff, 0xff, 0x1f, 0xff), 2.0f);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP0, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP1, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-            }
-
-            float fCurDistance = (vCamPosition - vIntersectP0).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP0;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            fCurDistance = (vCamPosition - vIntersectP1).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP1;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            bIntersected = true;
-        }
-
-        //near face
-        if (SegmentFrustumIntersection(pvShadowFrust[i + 4], pvShadowFrust[(i + 1) % 4 + 4], viewFrustum, &vIntersectP0, &vIntersectP1))
-        {
-            if (GetCVars()->e_GsmDepthBoundsDebug)
-            {
-                GetRenderer()->GetIRenderAuxGeom()->DrawLine(vIntersectP0, RGBA8(0xff, 0xff, 0x1f, 0xff), vIntersectP1, RGBA8(0xff, 0xff, 0x1f, 0xff), 2.0f);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP0, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP1, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-            }
-
-            float fCurDistance = (vCamPosition - vIntersectP0).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP0;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            fCurDistance = (vCamPosition - vIntersectP1).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP1;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            bIntersected = true;
-        }
-
-        if (SegmentFrustumIntersection(pvShadowFrust[i], pvShadowFrust[i + 4], viewFrustum, &vIntersectP0, &vIntersectP1))
-        {
-            if (GetCVars()->e_GsmDepthBoundsDebug)
-            {
-                GetRenderer()->GetIRenderAuxGeom()->DrawLine(vIntersectP0, RGBA8(0xff, 0xff, 0x1f, 0xff), vIntersectP1, RGBA8(0xff, 0xff, 0x1f, 0xff), 2.0f);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP0, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP1, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-            }
-
-            float fCurDistance = (vCamPosition - vIntersectP0).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP0;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            fCurDistance = (vCamPosition - vIntersectP1).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP1;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            bIntersected = true;
-        }
-
-        if (SegmentFrustumIntersection(pvViewFrust[i], pvViewFrust[(i + 1) % 4], camShadowFrustum, &vIntersectP0, &vIntersectP1))
-        {
-            if (GetCVars()->e_GsmDepthBoundsDebug)
-            {
-                GetRenderer()->GetIRenderAuxGeom()->DrawLine(vIntersectP0, RGBA8(0xff, 0xff, 0x1f, 0xff), vIntersectP1, RGBA8(0xff, 0xff, 0x1f, 0xff), 2.0f);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP0, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP1, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-            }
-
-            float fCurDistance = (vCamPosition - vIntersectP0).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP0;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            fCurDistance = (vCamPosition - vIntersectP1).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP1;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            bIntersected = true;
-        }
-
-        if (SegmentFrustumIntersection(pvViewFrust[i + 4], pvViewFrust[(i + 1) % 4 + 4], camShadowFrustum, &vIntersectP0, &vIntersectP1))
-        {
-            if (GetCVars()->e_GsmDepthBoundsDebug)
-            {
-                GetRenderer()->GetIRenderAuxGeom()->DrawLine(vIntersectP0, RGBA8(0xff, 0xff, 0x1f, 0xff), vIntersectP1, RGBA8(0xff, 0xff, 0x1f, 0xff), 2.0f);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP0, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP1, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-            }
-
-            float fCurDistance = (vCamPosition - vIntersectP0).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP0;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            fCurDistance = (vCamPosition - vIntersectP1).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP1;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            bIntersected = true;
-        }
-
-        if (SegmentFrustumIntersection(pvViewFrust[i], pvViewFrust[i + 4], camShadowFrustum, &vIntersectP0, &vIntersectP1))
-        {
-            if (GetCVars()->e_GsmDepthBoundsDebug)
-            {
-                GetRenderer()->GetIRenderAuxGeom()->DrawLine(vIntersectP0, RGBA8(0xff, 0xff, 0x1f, 0xff), vIntersectP1, RGBA8(0xff, 0xff, 0x1f, 0xff), 2.0f);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP0, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vIntersectP1, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-            }
-
-            float fCurDistance = (vCamPosition - vIntersectP0).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP0;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            fCurDistance = (vCamPosition - vIntersectP1).GetLength();
-            if (fCurDistance > fDisatanceToMaxBound)
-            {
-                vMaxBoundPoint = vIntersectP1;
-                fDisatanceToMaxBound = fCurDistance;
-            }
-
-            bIntersected = true;
-        }
-    }
-
-    if (GetCVars()->e_GsmDepthBoundsDebug)
-    {
-        GetRenderer()->GetIRenderAuxGeom()->DrawPoint(vMaxBoundPoint, RGBA8(0xff, 0x00, 0x00, 0xff), 10);
-    }
-
-    return bIntersected;
-}
-
-void GetCubemapFrustum(ShadowMapFrustum* pFr, int nS, CCamera& shadowFrust)
-{
-    float sCubeVector[6][7] =
-    {
-        {1, 0, 0,  0, 0, 1, -90},//posx
-        {-1, 0, 0, 0, 0, 1,  90},//negx
-        {0, 1, 0,  0, 0, -1, 0},//posy
-        {0, -1, 0, 0, 0, 1,  0},//negy
-        {0, 0, 1,  0, 1, 0,  0},//posz
-        {0, 0, -1, 0, 1, 0,  0},//negz
-    };
-
-    int nShadowTexSize = pFr->nTexSize;
-    Vec3 vPos = pFr->vLightSrcRelPos + pFr->vProjTranslation;
-
-    Vec3 vForward = Vec3(sCubeVector[nS][0], sCubeVector[nS][1], sCubeVector[nS][2]);
-    Vec3 vUp      = Vec3(sCubeVector[nS][3], sCubeVector[nS][4], sCubeVector[nS][5]);
-    Matrix33 matRot = Matrix33::CreateOrientation(vForward, vUp, DEG2RAD(sCubeVector[nS][6]));
-
-    float fMinDist = pFr->fNearDist;
-    float fMaxDist = pFr->fFarDist;
-    shadowFrust.SetMatrix(Matrix34(matRot, vPos));
-    shadowFrust.SetFrustum(nShadowTexSize, nShadowTexSize, 90.0f * gf_PI / 180.0f, fMinDist, fMaxDist);
-}
-
-void CLightEntity::CheckValidFrustums_OMNI(ShadowMapFrustum* pFr, const SRenderingPassInfo& passInfo)
-{
-    pFr->nOmniFrustumMask = 0;
-
-    const CCamera& cameraFrust = passInfo.GetCamera();
-
-    for (int nS = 0; nS < 6; nS++)
-    {
-        CCamera shadowFrust;
-        GetCubemapFrustum(pFr, nS, shadowFrust);
-
-        if (FrustumIntersection(cameraFrust, shadowFrust))
-        {
-            pFr->nOmniFrustumMask |= (1 << nS);
-        }
-    }
-}
-
-bool CLightEntity::CheckFrustumsIntersect(CLightEntity* lightEnt)
-{
-    Vec3 pvShadowFrust[8];
-    bool bRes = false;
-
-    ShadowMapFrustum* pFr1;
-    ShadowMapFrustum* pFr2;
-
-    pFr1 = this->GetShadowFrustum(0);
-    pFr2 = lightEnt->GetShadowFrustum(0);
-
-    if (!pFr1 || !pFr2)
-    {
-        return false;
-    }
-
-    int nFaces1, nFaces2;
-    nFaces1 = (pFr1->bOmniDirectionalShadow ? 6 : 1);
-    nFaces2 = (pFr2->bOmniDirectionalShadow ? 6 : 1);
-
-    for (int nS1 = 0; nS1 < nFaces1; nS1++)
-    {
-        for (int nS2 = 0; nS2 < nFaces2; nS2++)
-        {
-            CCamera shadowFrust1 = pFr1->FrustumPlanes[nS1];
-            CCamera shadowFrust2 = pFr2->FrustumPlanes[nS2];
-            ;
-
-            if (FrustumIntersection(shadowFrust1, shadowFrust2))
-            {
-                bRes = true;
-
-                //debug frustums
-                vtx_idx pnInd[8] = {
-                    0, 4, 1, 5, 2, 6, 3, 7
-                };
-                //first frustum
-                shadowFrust1.GetFrustumVertices(pvShadowFrust);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPolyline(pvShadowFrust, 4, true, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawPolyline(pvShadowFrust + 4, 4, true, RGBA8(0xff, 0xff, 0x1f, 0xff));
-
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd + 2, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd + 4, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd + 6, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-
-                //second frustum
-                shadowFrust2.GetFrustumVertices(pvShadowFrust);
-                GetRenderer()->GetIRenderAuxGeom()->DrawPolyline(pvShadowFrust, 4, true, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawPolyline(pvShadowFrust + 4, 4, true, RGBA8(0xff, 0xff, 0x1f, 0xff));
-
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd + 2, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd + 4, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-                GetRenderer()->GetIRenderAuxGeom()->DrawLines(pvShadowFrust, 8, pnInd + 6, 2, RGBA8(0xff, 0xff, 0x1f, 0xff));
-            }
-        }
-    }
-    return bRes;
-}
-
-void CLightEntity::InitShadowFrustum_PROJECTOR(ShadowMapFrustum* pFr, [[maybe_unused]] int dwAllowedTypes, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const int nFrameId = passInfo.GetMainFrameID();
-
-    float fShadowUpdate = (float)(m_light.m_nShadowUpdateRatio * GetCVars()->e_ShadowsUpdateViewDistRatio);
-    const float fShadowUpdateScale = (1 <<    DL_SHADOW_UPDATE_SHIFT) * (1 << DL_SHADOW_UPDATE_SHIFT);// e_ShadowsUpdateViewDistRatio is also fixed point, 256 == 1.0f
-
-    // construct camera from projector
-    Matrix34 entMat = ((ILightSource*)m_light.m_pOwner)->GetMatrix();
-
-    Vec3 vProjDir = entMat.GetColumn(0).GetNormalizedSafe();
-
-    pFr->nShadowMapLod = -1;    // not used
-
-    // place center into middle of projector far plane
-    pFr->vLightSrcRelPos = -vProjDir * m_light.m_fRadius;
-    pFr->vProjTranslation = m_light.m_Origin - pFr->vLightSrcRelPos;
-    if (pFr->fRadius != m_light.m_fRadius)
-    {
-        pFr->RequestUpdate();
-    }
-    pFr->bIncrementalUpdate = false;
-    pFr->fRadius = m_light.m_fRadius;
-    assert(m_light.m_pOwner && m_light.m_pOwner == this);
-    pFr->pLightOwner = this;
-    pFr->m_Flags = m_light.m_Flags;
-    pFr->bBlendFrustum = false;
-
-    //  float fDistToLightSrc = pFr->vLightSrcRelPos.GetLength();
-    pFr->fFOV = CLAMP(m_light.m_fLightFrustumAngle * 2.f, 0.0001f, LIGHT_PROJECTOR_MAX_FOV);
-
-    pFr->fNearDist = 0.01f;
-    pFr->fFarDist = m_light.m_fRadius;
-
-    // set texture size
-    uint32 nTexSize = GetCVars()->e_ShadowsMaxTexRes;
-
-    if (pFr->bOmniDirectionalShadow)
-    {
-        nTexSize = GetCVars()->e_ShadowsMaxTexRes / 2;
-    }
-
-    const CCamera& cCam = passInfo.GetCamera();
-
-    float fLightToCameraDist = cCam.GetPosition().GetDistance(m_light.m_Origin);
-
-    float fLightToCameraDistAdjusted = max(5.f, fLightToCameraDist - m_light.m_fRadius);
-    while (nTexSize > (800.f / fLightToCameraDistAdjusted) * pFr->fRadius * m_light.m_Color.Luminance() * (pFr->fFOV / 90.f) && nTexSize > 256)
-    {
-        nTexSize /= 2;
-    }
-
-    float shadowUpdateDist = max(0.0f, fLightToCameraDist - m_light.m_fShadowUpdateMinRadius);
-
-    float shadowUpdateRate = 255.0f;
-
-    if (GetCVars()->e_ShadowsUpdateViewDistRatio)
-    {
-        shadowUpdateRate = min(255.f,  fShadowUpdateScale * shadowUpdateDist * passInfo.GetZoomFactor() / (fShadowUpdate));
-    }
-
-    pFr->nShadowPoolUpdateRate = (uint8) shadowUpdateRate;
-
-
-    if (m_light.m_Flags & DLF_DEFERRED_LIGHT)
-    {
-        float fScaledRadius = m_light.m_fRadius * m_light.m_fShadowResolutionScale;
-        //TD smooth distribution curve
-        float fAreaZ0, fAreaZ1;
-        if (fLightToCameraDist <= m_light.m_fRadius)
-        {
-            fAreaZ0 = cCam.GetNearPlane();
-            fAreaZ1 = 2.0f * fScaledRadius;
-        }
-        else
-        {
-            fAreaZ0 = max(cCam.GetNearPlane(), fLightToCameraDist - fScaledRadius);
-            fAreaZ1 = fLightToCameraDist + fScaledRadius;
-        }
-
-
-        float fCamFactor = log(cCam.GetFarPlane() / cCam.GetNearPlane());
-
-        float fFadingBase = GetCVars()->e_ShadowsAdaptScale;
-        float fSMZ0 = log(fAreaZ0 / cCam.GetNearPlane()) / log(fFadingBase);
-        float fSMZ1 = log(fAreaZ1 / cCam.GetNearPlane()) / log(fFadingBase);
-        fSMZ0 /= fCamFactor;
-        fSMZ1 /= fCamFactor;
-
-        float fCoverageScaleFactor = GetCVars()->e_ShadowsResScale;
-        if (!(m_light.m_Flags & (DLF_PROJECT | DLF_AREA_LIGHT)))
-        {
-            fCoverageScaleFactor /= 3.5f;
-        }
-
-
-        nTexSize = int((fSMZ1 - fSMZ0) * ((float)GetCVars()->e_ShadowsMaxTexRes * fCoverageScaleFactor /*/(7*cCam.GetFarPlane())*/));
-
-        uint32 nPoolSize = GetCVars()->e_ShadowsPoolSize;
-        uint32 nMaxTexRes = GetCVars()->e_ShadowsMaxTexRes;
-
-        uint32 nMinRes, nMaxRes, nPhysicalMaxRes;
-
-        if (m_light.m_Flags & (DLF_PROJECT | DLF_AREA_LIGHT))
-        {
-            nMinRes = MIN_SHADOW_RES_PROJ_LIGHT;
-            nMaxRes = nMaxTexRes;
-            nPhysicalMaxRes = nPoolSize;
-        }
-        else
-        {
-            nMinRes = MIN_SHADOW_RES_OMNI_LIGHT;
-            nMaxRes = nMaxTexRes >> 1;
-            nPhysicalMaxRes = nPoolSize >> 2;
-        }
-
-        if (m_light.m_nShadowMinResolution)
-        {
-            nMinRes = nPoolSize >> (4 - m_light.m_nShadowMinResolution); // 4 possible percentages of pool size exposed in editor 100%, 50%, 25%, 12.5% (IEditorImpl.cpp)
-
-            if (nMinRes > nMaxRes)           // if a very large min res is requested, go beyond normal limits, up to physical pool size. CINEMATICS ONLY PLEASE!
-            {
-                nMaxRes  = min(nPhysicalMaxRes, nMinRes);
-            }
-        }
-
-        nTexSize = max(nMinRes, nTexSize);
-        nTexSize = min(min(nMaxRes, nTexSize), nPhysicalMaxRes); // make sure we never go above pool size
-
-        // force power of two
-        nTexSize = 1 << IntegerLog2((uint32)nTexSize);
-    }
-
-    if (pFr->nTexSize != nTexSize)
-    {
-        pFr->nTexSize = nTexSize;
-        pFr->RequestUpdate();
-    }
-    pFr->fFrustrumSize =  20.0f * nTexSize / 64.0f;
-    pFr->nUpdateFrameId = nFrameId;
-}
-
-void CLightEntity::InitShadowFrustum_OMNI(ShadowMapFrustum* pFr, int dwAllowedTypes, const SRenderingPassInfo& passInfo)
-{
-    InitShadowFrustum_PROJECTOR(pFr, dwAllowedTypes, passInfo);
-    CheckValidFrustums_OMNI(pFr, passInfo);
-}
-
-bool IsABBBVisibleInFrontOfPlane_FAST(const AABB& objBox, const SPlaneObject& clipPlane);
-
-bool IsAABBInsideHull(const SPlaneObject* pHullPlanes, int nPlanesNum, const AABB& aabbBox)
-{
-    for (int i = 0; i < nPlanesNum; i++)
-    {
-        if (!IsABBBVisibleInFrontOfPlane_FAST(aabbBox, pHullPlanes[i]))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool IsSphereInsideHull(const SPlaneObject* pHullPlanes, int nPlanesNum, const Sphere& objSphere)
-{
-    for (int i = 0; i < nPlanesNum; i++)
-    {
-        if (-pHullPlanes[i].plane.DistFromPlane(objSphere.center) > objSphere.radius)
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-int CLightEntity::MakeShadowCastersHullSun(PodArray<SPlaneObject>& lstCastersHull, const SRenderingPassInfo& passInfo)
-{
-    // Construct hull from camera vertices and light source position
-    FUNCTION_PROFILER_3DENGINE;
-
-    Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-
-    Vec3 arrFrustVerts[10];
-    passInfo.GetCamera().GetFrustumVertices(arrFrustVerts);
-
-    // 0 to 5 are the camera frustum vertices
-    for (int v = 0; v < 4; v++)
-    {
-        arrFrustVerts[v] = vCamPos + (arrFrustVerts[v] - vCamPos).normalized() * GetObjManager()->GetGSMMaxDistance() * 1.3f; //0.2f;
-    }
-    arrFrustVerts[4] = passInfo.GetCamera().GetPosition();
-
-    // 5 to 9 are the translated frustum vertices
-    Vec3 vSunDir = (m_light.m_Origin - vCamPos).normalized() * Get3DEngine()->m_fSunClipPlaneRange;
-    for (int v = 0; v < 5; v++)
-    {
-        arrFrustVerts[v + 5] = arrFrustVerts[v] + vSunDir;
-    }
-
-    // The method outputs at most 10 planes
-    lstCastersHull.reserve(10);
-
-    // Indices to create the planes of the camera frustum, can be offset by 5 to create planes for the translated frustum
-    uint vertexIndex[5][3] = {
-        {4, 1, 0}, {4, 0, 3}, {4, 3, 2}, {4, 2, 1}, {0, 1, 2}
-    };
-
-    Plane planeArray[5];
-    planeArray[0] = Plane::CreatePlane(arrFrustVerts[vertexIndex[0][0]], arrFrustVerts[vertexIndex[0][1]], arrFrustVerts[vertexIndex[0][2]]);
-    planeArray[1] = Plane::CreatePlane(arrFrustVerts[vertexIndex[1][0]], arrFrustVerts[vertexIndex[1][1]], arrFrustVerts[vertexIndex[1][2]]);
-    planeArray[2] = Plane::CreatePlane(arrFrustVerts[vertexIndex[2][0]], arrFrustVerts[vertexIndex[2][1]], arrFrustVerts[vertexIndex[2][2]]);
-    planeArray[3] = Plane::CreatePlane(arrFrustVerts[vertexIndex[3][0]], arrFrustVerts[vertexIndex[3][1]], arrFrustVerts[vertexIndex[3][2]]);
-    planeArray[4] = Plane::CreatePlane(arrFrustVerts[vertexIndex[4][0]], arrFrustVerts[vertexIndex[4][1]], arrFrustVerts[vertexIndex[4][2]]);
-
-    // Test each plane against the sun vector to know if all the translated vertices are on the correct side of the plane.
-    bool bUsePlane[5];
-    for (uint i = 0; i < 5; ++i)
-    {
-        bUsePlane[i] = planeArray[i].n.Dot(vSunDir) > 0;
-    }
-
-    // Select the far plane
-    if (bUsePlane[4])
-    {
-        SPlaneObject po;
-        po.plane = planeArray[4];
-        po.Update();
-        lstCastersHull.Add(po);
-    }
-    else
-    {
-        SPlaneObject po;
-        po.plane = Plane::CreatePlane(arrFrustVerts[vertexIndex[4][0] + 5], arrFrustVerts[vertexIndex[4][1] + 5], arrFrustVerts[vertexIndex[4][2] + 5]);
-        po.Update();
-        lstCastersHull.Add(po);
-    }
-
-    // Select side planes
-    for (uint i = 0; i < 4; ++i)
-    {
-        uint iPlaneOffset = bUsePlane[i] ? 0 : 5;
-        uint iOtherOffset = bUsePlane[i] ? 5 : 0;
-        uint iNextPlane = i < 3 ? i + 1 : 0;
-
-        // Either add this plane or the equivalent plane in the translated frustum
-        if (bUsePlane[i])
-        {
-            SPlaneObject po;
-            po.plane = planeArray[i];
-            po.Update();
-            lstCastersHull.Add(po);
-        }
-        else
-        {
-            SPlaneObject po;
-            po.plane = Plane::CreatePlane(arrFrustVerts[vertexIndex[i][0] + 5], arrFrustVerts[vertexIndex[i][1] + 5], arrFrustVerts[vertexIndex[i][2] + 5]);
-            po.Update();
-            lstCastersHull.Add(po);
-        }
-
-        // If this plane belong to a different frustum than the far plane, add a junction plane
-        if (bUsePlane[4] != bUsePlane[i])
-        {
-            SPlaneObject po;
-            po.plane = Plane::CreatePlane(arrFrustVerts[vertexIndex[i][1] + iPlaneOffset], arrFrustVerts[vertexIndex[i][1] + iOtherOffset], arrFrustVerts[vertexIndex[i][2] + iPlaneOffset]);
-            //plane won't be valid in the case that the sun vector aligned with this edge of the camera frustrum. When this happens the new planes are pulled straight along that vector
-            //and the 3 vertices used will form 2 colinear vectors. Which will create an invalid plane.
-            //This means we don't need the junction plane however, so just don't create it.
-            if (po.plane.IsValid())
-            {
-                po.Update();
-                lstCastersHull.Add(po);
-            }
-        }
-
-        // If this plane belong to a different frustum than the next plane, add a junction plane
-        if (bUsePlane[iNextPlane] != bUsePlane[i])
-        {
-            SPlaneObject po;
-            po.plane = Plane::CreatePlane(arrFrustVerts[vertexIndex[i][0] + iPlaneOffset], arrFrustVerts[vertexIndex[i][2] + iPlaneOffset], arrFrustVerts[vertexIndex[i][2] + iOtherOffset]);
-            po.Update();
-            lstCastersHull.Add(po);
-        }
-    }
-
-    return lstCastersHull.Count();
-}
-
-void CLightEntity::FillFrustumCastersList_SUN(ShadowMapFrustum* pFr, int dwAllowedTypes, int nRenderNodeFlags, PodArray<SPlaneObject>& lstCastersHull, int nLod, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    pFr->bOmniDirectionalShadow = false;
-
-    if (pFr->bBlendFrustum)
-    {
-        float fBlendVal = GetCVars()->e_ShadowsBlendCascadesVal;
-
-        float fRange = Get3DEngine()->m_fGsmRange;
-        float fRangeStep = Get3DEngine()->m_fGsmRangeStep;
-        float fRadius  =  fRange * powf(fRangeStep, aznumeric_caster(nLod));
-
-        float fBlendRadius = fRadius - (fBlendVal * (nLod + 1));
-
-        pFr->fBlendVal =  fBlendRadius / fRadius;
-        pFr->bBlendFrustum = true;
-    }
-
-    AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-    const AZ::Vector3 terrainCenter = terrainAabb.GetCenter();
-    const float terrainSize = AZ::GetMax(terrainAabb.GetXExtent(), terrainAabb.GetYExtent());
-    Vec3 vMapCenter = AZVec3ToLYVec3(terrainCenter);
-
-    // prevent crash in qhull
-    if (!dwAllowedTypes || !((passInfo.GetCamera().GetPosition() - vMapCenter).GetLength() < terrainSize * 4))
-    {
-        return;
-    }
-
-    if (!lstCastersHull.Count()) // make hull first time it is needed
-    {
-        MakeShadowCastersHullSun(lstCastersHull, passInfo);
-    }
-
-    if (pFr->isUpdateRequested(0))
-    {
-        pFr->ResetCasterLists();
-        if (pFr->m_eFrustumType != ShadowMapFrustum::e_GsmDynamicDistance || GetCVars()->e_DynamicDistanceShadows > 0)
-        {
-            PodArray<SPlaneObject>* pShadowHull = (pFr->nShadowMapLod && !passInfo.IsRenderingCubemap()) ? &lstCastersHull : NULL;
-#ifdef FEATURE_SVO_GI
-            if (gEnv->pConsole->GetCVar("e_svoTI_Active") &&
-                gEnv->pConsole->GetCVar("e_svoTI_Active")->GetIVal())
-            {
-                pShadowHull = NULL; // TODO: enable hull usage for GI (use extended hull check)
-            }
-#endif
-            m_pObjManager->MakeShadowCastersList((CVisArea*)GetEntityVisArea(), GetBBox(),
-                dwAllowedTypes, nRenderNodeFlags, pFr->vLightSrcRelPos + pFr->vLightSrcRelPos, &m_light, pFr, pShadowHull, passInfo);
-        }
-    }
-}
-
-void CLightEntity::FillFrustumCastersList_PROJECTOR(ShadowMapFrustum* pFr, int dwAllowedTypes, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    //  fill casters list
-    pFr->ResetCasterLists();
-    pFr->bOmniDirectionalShadow = false;
-
-    if (dwAllowedTypes)
-    {
-        // setup camera
-        CCamera& FrustCam = pFr->FrustumPlanes[0] = CCamera();
-        Vec3 vLightDir = -pFr->vLightSrcRelPos.normalized();
-        Matrix34 mat = Matrix33::CreateRotationVDir(vLightDir);
-        mat.SetTranslation(GetBBox().GetCenter());
-
-        FrustCam.SetMatrix(mat);
-        FrustCam.SetFrustum(pFr->nTexSize, pFr->nTexSize, pFr->fFOV * (gf_PI / 180.0f), pFr->fNearDist, pFr->fFarDist);
-
-        m_pObjManager->MakeShadowCastersList((CVisArea*)GetEntityVisArea(), GetBBox(),
-            dwAllowedTypes, 0xFFFFFFFF, pFr->vLightSrcRelPos + GetBBox().GetCenter(), &m_light, pFr, NULL, passInfo);
-
-        DetectCastersListChanges(pFr, passInfo);
-
-        pFr->aabbCasters.Reset(); // fix: should i .Reset() pFr->aabbCasters ?
-    }
-}
-
-void CLightEntity::FillFrustumCastersList_OMNI(ShadowMapFrustum* pFr, int dwAllowedTypes, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    //  fill casters list
-    pFr->ResetCasterLists();
-
-    if (dwAllowedTypes)
-    {
-        // setup camera
-        CCamera& FrustCam = pFr->FrustumPlanes[0] = CCamera();
-        Vec3 vLightDir = -pFr->vLightSrcRelPos.normalized();
-        Matrix34 mat = Matrix33::CreateRotationVDir(vLightDir);
-        mat.SetTranslation(GetBBox().GetCenter());
-
-        FrustCam.SetMatrix(mat);
-        FrustCam.SetFrustum(256, 256, pFr->fFOV * (gf_PI / 180.0f) * 0.9f, pFr->fNearDist, pFr->fFarDist);
-
-        m_pObjManager->MakeShadowCastersList((CVisArea*)GetEntityVisArea(), GetBBox(),
-            dwAllowedTypes, 0xFFFFFFFF, pFr->vLightSrcRelPos + GetBBox().GetCenter(), &m_light, pFr, NULL, passInfo);
-
-        DetectCastersListChanges(pFr, passInfo);
-
-        pFr->aabbCasters.Reset(); // fix: should i .Reset() pFr->aabbCasters ?
-
-        // Update all omni frustums
-        pFr->UpdateOmniFrustums();
-    }
-}
-
-void CLightEntity::DetectCastersListChanges(ShadowMapFrustum* pFr, const SRenderingPassInfo& passInfo)
-{
-    uint32 uCastersListCheckSum = 0;
-    for (int i = 0; i < pFr->m_castersList.Count(); ++i)
-    {
-        IShadowCaster* pNode = pFr->m_castersList.GetAt(i);
-        const AABB entBox = pNode->GetBBoxVirtual();
-        uCastersListCheckSum += uint32((entBox.min.x + entBox.min.y + entBox.min.z) * 10000.f);
-        uCastersListCheckSum += uint32((entBox.max.x + entBox.max.y + entBox.max.z) * 10000.f);
-    }
-
-    if (pFr->fRadius < DISTANCE_TO_THE_SUN)
-    {
-        uCastersListCheckSum += uint32((m_WSBBox.min.x + m_WSBBox.min.y + m_WSBBox.min.z) * 10000.f);
-        uCastersListCheckSum += uint32((m_WSBBox.max.x + m_WSBBox.max.y + m_WSBBox.max.z) * 10000.f);
-    }
-
-    if (pFr->uCastersListCheckSum != uCastersListCheckSum)
-    {
-        pFr->RequestUpdate();
-        pFr->uCastersListCheckSum = uCastersListCheckSum;
-
-        if (GetCVars()->e_ShadowsDebug == 3)
-        {
-            const char* szName = ((CLightEntity*)(pFr->pLightOwner))->m_light.m_sName;
-            PrintMessage("Requesting %s shadow update for %s, frame id = %d",
-                pFr->bOmniDirectionalShadow ? "Cube" : "2D", szName, passInfo.GetFrameID());
-        }
-    }
-}
-
-ShadowMapFrustum* CLightEntity::GetShadowFrustum(int nId)
-{
-    if (m_pShadowMapInfo && nId < MAX_GSM_LODS_NUM)
-    {
-        return m_pShadowMapInfo->pGSM[nId];
-    }
-
-    return NULL;
-};
-
-
-void CLightEntity::OnCasterDeleted(IShadowCaster* pCaster)
-{
-    if (!m_pShadowMapInfo)
-    {
-        return;
-    }
-
-    for (int nGsmId = 0; nGsmId < MAX_GSM_LODS_NUM; nGsmId++)
-    {
-        ShadowMapFrustum* pFr = m_pShadowMapInfo->pGSM[nGsmId];
-        if (pFr)
-        {
-            pFr->m_castersList.Delete(pCaster);
-            pFr->m_jobExecutedCastersList.Delete(pCaster);
-
-            if (pFr->pShadowCacheData)
-            {
-                pFr->pShadowCacheData->mProcessedCasters.erase(pCaster);
-            }
-        }
-    }
-}
-
-void CLightEntity::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "LightEntity");
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_pShadowMapInfo);
-}
-
-void CLightEntity::UpdateCastShadowFlag(float fDistance, const SRenderingPassInfo& passInfo)
-{
-    if (!(m_light.m_Flags & DLF_SUN))
-    {
-        if (fDistance > m_fWSMaxViewDist * GetFloatCVar(e_ShadowsCastViewDistRatioLights) || !passInfo.RenderShadows())
-        {
-            m_light.m_Flags &= ~DLF_CASTSHADOW_MAPS;
-        }
-        else if (m_bShadowCaster)
-        {
-            m_light.m_Flags |= DLF_CASTSHADOW_MAPS;
-        }
-    }
-
-#if defined(FEATURE_SVO_GI)
-    if (GetVoxelGIMode() == VM_Dynamic)
-    {
-        m_light.m_Flags |= DLF_USE_FOR_SVOGI;
-    }
-    else
-    {
-        m_light.m_Flags &= ~DLF_USE_FOR_SVOGI;
-    }
-#endif
-}
-
-void CLightEntity::Render(const SRendParams& rParams, const SRenderingPassInfo& passInfo)
-{
-#if defined(FEATURE_SVO_GI)
-    if (gEnv->pConsole->GetCVar("e_svoTI_Active") && 
-        gEnv->pConsole->GetCVar("e_svoTI_Active")->GetIVal() && 
-        gEnv->pConsole->GetCVar("e_GI")->GetIVal() &&
-        !GetVoxelGIMode())
-    {
-        return;
-    }
-#endif
-    if (m_layerId != uint16(~0) && m_dwRndFlags & ERF_HIDDEN)
-    {
-        return;
-    }
-
-    if (!(m_light.m_Flags & DLF_DEFERRED_LIGHT) || passInfo.IsRecursivePass())
-    {
-        return;
-    }
-
-    if (m_light.m_fRadius < 0.01f)
-    {
-        return;
-    }
-
-    UpdateCastShadowFlag(rParams.fDistance, passInfo);
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    int nRenderNodeMinSpec = (m_dwRndFlags & ERF_SPEC_BITS_MASK) >> ERF_SPEC_BITS_SHIFT;
-    if (!CheckMinSpec(nRenderNodeMinSpec))
-    {
-        return;
-    }
-
-    Sphere sp(m_light.m_BaseOrigin, m_light.m_fBaseRadius);
-
-    bool bIsVisible = false;
-    if (m_light.m_Flags & DLF_DEFERRED_CUBEMAPS)
-    {
-        OBB obb(OBB::CreateOBBfromAABB(Matrix33(m_light.m_ObjMatrix), AABB(-m_light.m_ProbeExtents, m_light.m_ProbeExtents)));
-        bIsVisible = passInfo.GetCamera().IsOBBVisible_F(m_light.m_Origin, obb);
-    }
-    else if (m_light.m_Flags & DLF_AREA_LIGHT)
-    {
-        // OBB test for area lights.
-        Vec3 vBoxMax(m_light.m_fBaseRadius, m_light.m_fBaseRadius + m_light.m_fAreaWidth, m_light.m_fBaseRadius + m_light.m_fAreaHeight);
-        Vec3 vBoxMin(-0.1f, -(m_light.m_fBaseRadius + m_light.m_fAreaWidth), -(m_light.m_fBaseRadius + m_light.m_fAreaHeight));
-
-        OBB obb(OBB::CreateOBBfromAABB(Matrix33(m_light.m_ObjMatrix), AABB(vBoxMin, vBoxMax)));
-        bIsVisible = passInfo.GetCamera().IsOBBVisible_F(m_light.m_BaseOrigin, obb);
-    }
-    else
-    {
-        bIsVisible = passInfo.GetCamera().IsSphereVisible_F(sp);
-    }
-
-    if (!bIsVisible && !(m_light.m_Flags & DLF_ATTACH_TO_SUN))
-    {
-        return;
-    }
-
-    //assert(m_light.IsOk());
-
-    if ((m_light.m_Flags & DLF_DISABLED) || (!GetCVars()->e_DynamicLights))
-    {
-        return;
-    }
-
-    if ((m_light.m_Flags & DLF_PROJECT) && (m_light.m_fLightFrustumAngle < 90.f) && (m_light.m_pLightImage))
-    {
-        if (!gEnv->pConsole->GetCVar("e_GI")->GetIVal() || 
-            (gEnv->pConsole->GetCVar("e_svoTI_Active") && !gEnv->pConsole->GetCVar("e_svoTI_Active")->GetIVal()) || 
-            GetVoxelGIMode() != VM_Dynamic)
-        {
-            CCamera lightCam = passInfo.GetCamera();
-            lightCam.SetPositionNoUpdate(m_light.m_Origin);
-            Matrix34 entMat = ((ILightSource*)(m_light.m_pOwner))->GetMatrix();
-            entMat.OrthonormalizeFast();
-            Matrix33 matRot = Matrix33::CreateRotationVDir(entMat.GetColumn(0));
-            lightCam.SetMatrixNoUpdate(Matrix34(matRot, m_light.m_Origin));
-            lightCam.SetFrustum(1, 1, (m_light.m_fLightFrustumAngle * 2) / 180.0f * gf_PI, 0.1f, m_light.m_fRadius);
-            if (!FrustumIntersection(passInfo.GetCamera(), lightCam))
-            {
-                return;
-            }
-        }
-    }
-
-    const int nEngineFrameID = passInfo.GetFrameID();
-
-    int nMaxReqursion = (m_light.m_Flags & DLF_THIS_AREA_ONLY) ? 2 : 3;
-    if (!m_pObjManager || !m_pVisAreaManager || !m_pVisAreaManager->IsEntityVisAreaVisible(this, nMaxReqursion, &m_light, passInfo))
-    {
-        if (m_light.m_Flags & (DLF_SUN) && m_pVisAreaManager && m_pVisAreaManager->m_bSunIsNeeded)
-        {     // sun may be used in indoor even if outdoor is not visible
-        }
-        else if (!GetEntityVisArea() && !(m_light.m_Flags & DLF_THIS_AREA_ONLY) && m_pVisAreaManager && m_pVisAreaManager->m_bSunIsNeeded)
-        {     // not "this area only" outdoor light affects everything
-        }
-        else if ((m_light.m_Flags & (DLF_IGNORES_VISAREAS | DLF_THIS_AREA_ONLY)) == DLF_IGNORES_VISAREAS)
-        {
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    if (CVisArea* pArea = (CVisArea*)GetEntityVisArea())
-    {     // vis area lsource
-        IVisArea* pCameraVisArea = Get3DEngine()->GetVisAreaFromPos(passInfo.GetCamera().GetPosition());
-
-        // check if light is visible thru light area portal cameras
-        if (pArea->m_nRndFrameId == nEngineFrameID && pArea != (CVisArea*)pCameraVisArea)
-        {
-            int nCam = 0;
-            for (; nCam < pArea->m_lstCurCamerasLen; nCam++)
-            {
-                if (CVisArea::s_tmpCameras[pArea->m_lstCurCamerasIdx + nCam].IsSphereVisible_F(sp))
-                {
-                    break;
-                }
-            }
-
-            if (nCam == pArea->m_lstCurCamerasLen)
-            {
-                return;     // invisible
-            }
-        }
-
-        // check if lsource is in visible area
-        if (!IsLightAreasVisible() && pCameraVisArea != pArea)
-        {
-            if (m_light.m_Flags & DLF_THIS_AREA_ONLY)
-            {
-                if (pArea)
-                {
-                    int nRndFrameId = pArea->GetVisFrameId();
-                    if (nEngineFrameID - nRndFrameId > MAX_FRAME_ID_STEP_PER_FRAME)
-                    {
-                        return;     // area invisible
-                    }
-                }
-                else
-                {
-                    return;     // area invisible
-                }
-            }
-        }
-    }
-    else
-    {     // outdoor lsource
-        if (!(m_light.m_Flags & DLF_DIRECTIONAL) && !IsLightAreasVisible())
-        {
-            return;     // outdoor invisible
-        }
-    }
-
-    m_light.m_nStencilRef[0] = CClipVolumeManager::AffectsEverythingStencilRef;
-    m_light.m_nStencilRef[1] = CClipVolumeManager::InactiveVolumeStencilRef;
-
-    if (m_light.m_Flags & DLF_THIS_AREA_ONLY)
-    {
-        // User assigned clip volumes. Note: ClipVolume 0 has already been assigned in AsyncOctreeUpdate
-        if ((m_light.m_Flags & DLF_HAS_CLIP_VOLUME) != 0 && m_light.m_pClipVolumes[1] != NULL)
-        {
-            m_light.m_nStencilRef[1] = m_light.m_pClipVolumes[1]->GetStencilRef();
-        }
-
-        m_light.m_nStencilRef[0] = (m_pRNTmpData && m_pRNTmpData->userData.m_pClipVolume) ?  m_pRNTmpData->userData.m_pClipVolume->GetStencilRef() : 0;
-    }
-
-    // associated clip volume invisible
-    if (m_light.m_nStencilRef[0] == CClipVolumeManager::InactiveVolumeStencilRef && m_light.m_nStencilRef[1] == CClipVolumeManager::InactiveVolumeStencilRef)
-    {
-        return;
-    }
-
-    _smart_ptr<IMaterial> pMat = GetMaterial();
-    if (pMat)
-    {
-        SAFE_RELEASE(m_light.m_Shader.m_pShader);
-        m_light.m_Shader = pMat->GetShaderItem();
-        if (m_light.m_Shader.m_pShader)
-        {
-            m_light.m_Shader.m_pShader->AddRef();
-        }
-    }
-
-    GetRenderer()->EF_UpdateDLight(&m_light);
-
-    int16 forwardLightCount = Get3DEngine()->GetSunEntity() ? 1 : 0;
-    m_light.m_Id = int16(forwardLightCount + GetRenderer()->EF_GetDeferredLightsNum());
-
-    bool castShadows = false;
-    if (passInfo.RenderShadows() && (m_light.m_Flags & DLF_CASTSHADOW_MAPS) && m_light.m_Id >= 0)
-    {
-        UpdateGSMLightSourceShadowFrustum(passInfo);
-
-        if (m_pShadowMapInfo)
-        {
-            m_light.m_pShadowMapFrustums = m_pShadowMapInfo->pGSM;
-        }
-
-        castShadows = true;
-    }
-
-    if (GetCVars()->e_DynamicLights && m_fWSMaxViewDist)
-    {
-        if (GetCVars()->e_DynamicLights == 2)
-        {
-            CDLight* pL = &m_light;
-            float fSize = 0.05f * (sinf(GetCurTimeSec() * 10.f) + 2.0f);
-            DrawSphere(pL->m_Origin, fSize, pL->m_Color);
-            GetRenderer()->DrawLabel(pL->m_Origin, 1.3f, "id=%d, rad=%.1f, vdm=%.1f, mvd=%.1f, shadows=%i", pL->m_Id, pL->m_fRadius, m_fViewDistanceMultiplier, m_fWSMaxViewDist, castShadows);
-        }
-
-        const float mult = SATURATE(6.f * (1.f - (rParams.fDistance / m_fWSMaxViewDist)));
-        IF (m_light.m_Color.Luminance() * mult > 0, 1)
-        {
-            Get3DEngine()->AddLightToRenderer(m_light, mult, passInfo, SRendItemSorter(rParams.rendItemSorter));
-        }
-    }
-}
-
-IRenderNode::EVoxelGIMode CLightEntity::GetVoxelGIMode()
-{
-        if (m_light.m_BaseColor.Luminance() > .01f && m_light.m_fBaseRadius > 0.5f)
-        {
-            if (m_light.m_Flags & DLF_SUN)
-            {
-                if (GetCVars()->e_Sun)
-                {
-                    return VM_Static;
-                }
-                else
-                {
-                    return VM_None;
-                }
-            }
-            return m_VoxelGIMode;
-        }
-    return VM_None;
-}
-
-void CLightEntity::SetDesiredVoxelGIMode(EVoxelGIMode mode)
-{
-    m_VoxelGIMode = mode;
-}
-
-void CLightEntity::SetName(const char* name)
-{
-    m_Name = name;
-
-#if defined(FEATURE_SVO_GI)
-    if (strstr(m_Name.c_str(), "_TI"))
-    {
-        if (strstr(m_Name.c_str(), "_TI_DYN"))
-        {
-            m_VoxelGIMode = VM_Dynamic;
-        }
-        else
-        {
-            m_VoxelGIMode = VM_Static;
-        }
-    }
-#endif
-}
-
-void CLightEntity::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_light.m_Origin += delta;
-    m_light.m_BaseOrigin += delta;
-    m_Matrix.SetTranslation(m_Matrix.GetTranslation() + delta);
-    m_WSBBox.Move(delta);
-}
-
-void CLightEntity::ProcessPerObjectFrustum(ShadowMapFrustum* pFr, struct SPerObjectShadow* pPerObjectShadow, ILightSource* pLightSource, const SRenderingPassInfo& passInfo)
-{
-    assert(pFr);
-    CDLight& light = pLightSource->GetLightProperties();
-
-    pFr->RequestUpdate();
-    pFr->ResetCasterLists();
-    pFr->m_castersList.Add(pPerObjectShadow->pCaster);
-
-    // get caster's bounding box and scale
-    AABB objectBBox;
-    pPerObjectShadow->pCaster->FillBBox(objectBBox);
-    Vec3 vExtents = 0.5f * objectBBox.GetSize().CompMul(pPerObjectShadow->vBBoxScale);
-    pFr->aabbCasters = AABB(objectBBox.GetCenter() - vExtents, objectBBox.GetCenter() + vExtents);
-
-    pFr->m_Flags = light.m_Flags;
-    pFr->bUseAdditiveBlending = true;
-    uint nTexSize = aznumeric_caster(pPerObjectShadow->nTexSize * GetCVars()->e_ShadowsPerObjectResolutionScale);
-    nTexSize = clamp_tpl<uint>(nTexSize, 64, GetRenderer()->GetMaxTextureSize());
-    pFr->nTexSize = 1 << IntegerLog2(nTexSize);
-    pFr->nTextureWidth = pFr->nTexSize;
-    pFr->nTextureHeight = pFr->nTexSize;
-    pFr->bBlendFrustum = false;
-
-    // now update frustum params based on object box
-    AABB objectsBox = pFr->aabbCasters;
-    const Vec3 lightPos = light.m_Origin - passInfo.GetCamera().GetPosition() + objectsBox.GetCenter();
-    const Vec3 lookAt = objectsBox.GetCenter();
-
-    pFr->vProjTranslation = objectsBox.GetCenter();
-    pFr->vLightSrcRelPos = light.m_Origin - passInfo.GetCamera().GetPosition();
-    pFr->fFOV = (float)RAD2DEG(atan_tpl(objectsBox.GetRadius() / (lookAt - lightPos).GetLength())) * 2.0f;
-    pFr->fProjRatio = 1.0f;
-    pFr->fNearDist = pFr->vLightSrcRelPos.GetLength() - objectsBox.GetRadius();
-    pFr->fFarDist = pFr->vLightSrcRelPos.GetLength() + objectsBox.GetRadius();
-
-    pFr->fDepthConstBias = pPerObjectShadow->fConstBias;
-    pFr->fDepthSlopeBias = pPerObjectShadow->fSlopeBias;
-    pFr->fWidthS = pPerObjectShadow->fJitter;
-    pFr->fWidthT = pPerObjectShadow->fJitter;
-    pFr->fBlurS  = 0.0f;
-    pFr->fBlurT  = 0.0f;
-
-    if (GetCVars()->e_ShadowsFrustums)
-    {
-        pFr->DrawFrustum(GetRenderer(), (GetCVars()->e_ShadowsFrustums == 1) ? 1000 : 1);
-        Get3DEngine()->DrawBBox(pFr->aabbCasters, Col_Green);
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/LightEntity.h b/Code/CryEngine/Cry3DEngine/LightEntity.h
deleted file mode 100644
index cc0e094561..0000000000
--- a/Code/CryEngine/Cry3DEngine/LightEntity.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_LIGHTENTITY_H
-#define CRYINCLUDE_CRY3DENGINE_LIGHTENTITY_H
-#pragma once
-
-const float LIGHT_PROJECTOR_MAX_FOV = 180.f;
-
-struct CLightEntity
-    : public ILightSource
-    , public Cry3DEngineBase
-{
-    static void StaticReset();
-
-public:
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName(void) const { return "LightEntityClass"; }
-    virtual const char* GetName(void) const;
-    virtual Vec3 GetPos(bool) const;
-    virtual void Render(const SRendParams&, const SRenderingPassInfo& passInfo);
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMat) { m_pMaterial = pMat; }
-    virtual _smart_ptr<IMaterial> GetMaterial([[maybe_unused]] Vec3* pHitPos = NULL) { return m_pMaterial; }
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist();
-    virtual void SetLightProperties(const CDLight& light);
-    virtual CDLight& GetLightProperties() { return m_light; };
-    virtual void Release(bool);
-    virtual void SetMatrix(const Matrix34& mat);
-    virtual const Matrix34& GetMatrix() { return m_Matrix; }
-    virtual struct ShadowMapFrustum* GetShadowFrustum(int nId = 0);
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual const AABB GetBBox() const { return m_WSBBox; }
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-    virtual void SetCastingException(IRenderNode* pNotCaster) { m_pNotCaster = pNotCaster; }
-    virtual bool IsLightAreasVisible();
-
-    virtual struct IStatObj* GetEntityStatObj([[maybe_unused]] unsigned int nPartId = 0, [[maybe_unused]] unsigned int nSubPartId = 0, [[maybe_unused]] Matrix34A* pMatrix = NULL, [[maybe_unused]] bool bReturnOnlyVisible = false) { return NULL; }
-    virtual int GetSlotCount() const;
-    virtual EVoxelGIMode GetVoxelGIMode() override;
-    virtual void SetDesiredVoxelGIMode(EVoxelGIMode mode) override;
-    virtual void SetName(const char* name);
-    void InitEntityShadowMapInfoStructure();
-    void UpdateGSMLightSourceShadowFrustum(const SRenderingPassInfo& passInfo);
-    int UpdateGSMLightSourceDynamicShadowFrustum(int nDynamicLodCount, int nDistanceLodCount, float& fDistanceFromViewLastDynamicLod, float& fGSMBoxSizeLastDynamicLod, bool bFadeLastCascade, const SRenderingPassInfo& passInfo);
-    int UpdateGSMLightSourceCachedShadowFrustum(int nFirstLod, int nLodCount, float& fDistFromViewDynamicLod, float fRadiusDynamicLod, const SRenderingPassInfo& passInfo);
-    bool ProcessFrustum(int nLod, float fCamBoxSize, float fDistanceFromView, PodArray<struct SPlaneObject>& lstCastersHull, const SRenderingPassInfo& passInfo);
-    static void ProcessPerObjectFrustum(ShadowMapFrustum* pFr, struct SPerObjectShadow* pPerObjectShadow, ILightSource* pLightSource, const SRenderingPassInfo& passInfo);
-    void InitShadowFrustum_SUN_Conserv(ShadowMapFrustum* pFr, int dwAllowedTypes, float fGSMBoxSize, float fDistance, int nLod, const SRenderingPassInfo& passInfo);
-    void InitShadowFrustum_PROJECTOR(ShadowMapFrustum* pFr, int dwAllowedTypes, const SRenderingPassInfo& passInfo);
-    void InitShadowFrustum_OMNI(ShadowMapFrustum* pFr, int dwAllowedTypes, const SRenderingPassInfo& passInfo);
-    void FillFrustumCastersList_SUN(ShadowMapFrustum* pFr, int dwAllowedTypes, int nRenderNodeFlags, PodArray<struct SPlaneObject>& lstCastersHull, int nLod, const SRenderingPassInfo& passInfo);
-    void FillFrustumCastersList_PROJECTOR(ShadowMapFrustum* pFr, int dwAllowedTypes, const SRenderingPassInfo& passInfo);
-    void FillFrustumCastersList_OMNI(ShadowMapFrustum* pFr, int dwAllowedTypes, const SRenderingPassInfo& passInfo);
-    void CheckValidFrustums_OMNI(ShadowMapFrustum* pFr, const SRenderingPassInfo& passInfo);
-    bool CheckFrustumsIntersect(CLightEntity* lightEnt);
-    bool GetGsmFrustumBounds(const CCamera& viewFrustum, ShadowMapFrustum* pShadowFrustum);
-    void DetectCastersListChanges(ShadowMapFrustum* pFr, const SRenderingPassInfo& passInfo);
-    void OnCasterDeleted(IShadowCaster* pCaster);
-    int MakeShadowCastersHullSun(PodArray<SPlaneObject>& lstCastersHull, const SRenderingPassInfo& passInfo);
-    static Vec3 GSM_GetNextScreenEdge(float fPrevRadius, float fPrevDistanceFromView, const SRenderingPassInfo& passInfo);
-    static float GSM_GetLODProjectionCenter(const Vec3& vEdgeScreen, float fRadius);
-    static bool FrustumIntersection(const CCamera& viewFrustum, const CCamera& shadowFrustum);
-    void UpdateCastShadowFlag(float fDistance, const SRenderingPassInfo& passInfo);
-    void CalculateShadowBias(ShadowMapFrustum* pFr, int nLod, float fGSMBoxSize) const;
-
-    CLightEntity();
-    ~CLightEntity();
-
-    CDLight m_light;
-    bool m_bShadowCaster : 1;
-
-    _smart_ptr<IMaterial> m_pMaterial;
-    Matrix34 m_Matrix;
-    IRenderNode* m_pNotCaster;
-
-    // used for shadow maps
-    struct ShadowMapInfo
-    {
-        ShadowMapInfo() { memset(this, 0, sizeof(ShadowMapInfo)); }
-        void Release(struct IRenderer* pRenderer);
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(this, sizeof(*this));
-        }
-        struct ShadowMapFrustum* pGSM[MAX_GSM_LODS_NUM];
-    }* m_pShadowMapInfo;
-
-    AABB m_WSBBox;
-
-    void SetLayerId(uint16 nLayerId) { m_layerId = nLayerId; }
-    uint16 GetLayerId() { return m_layerId; }
-
-private:
-    static PodArray<SPlaneObject> s_lstTmpCastersHull;
-
-private:
-    IStatObj* m_pStatObj;
-
-    uint16 m_layerId;
-    EVoxelGIMode m_VoxelGIMode;
-    AZStd::string m_Name;
-};
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/MatMan.cpp b/Code/CryEngine/Cry3DEngine/MatMan.cpp
deleted file mode 100644
index 29c8ec1be5..0000000000
--- a/Code/CryEngine/Cry3DEngine/MatMan.cpp
+++ /dev/null
@@ -1,1577 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Material Manager Implementation
-
-
-#include "Cry3DEngine_precompiled.h"
-#include "MatMan.h"
-#include "3dEngine.h"
-#include "ObjMan.h"
-#include "IRenderer.h"
-#include "SurfaceTypeManager.h"
-#include "CGFContent.h"
-#include <CryPath.h>
-#include <IResourceManager.h>
-#include "MaterialUtils.h" // from crycommon
-#include <Pak/CryPakUtils.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-
-#define MATERIAL_EXT ".mtl"
-#define MATERIAL_NODRAW "nodraw"
-
-#define MATERIAL_DECALS_FOLDER "Materials/Decals"
-#define MATERIAL_DECALS_SEARCH_WILDCARD "*.mtl"
-#define MTL_LEVEL_CACHE_PAK "mtl.pak"
-
-
-//////////////////////////////////////////////////////////////////////////
-struct MaterialHelpers CMatMan::s_materialHelpers;
-
-int CMatMan::e_sketch_mode = 0;
-int CMatMan::e_pre_sketch_spec = 0;
-int CMatMan::e_texeldensity = 0;
-
-//------------------------------------------------------------------------------
-// Default textures declarations
-//------------------------------------------------------------------------------
-#if !defined(_RELEASE)
-    // Texture names to be used for error / process loading indications
-    static const char* szReplaceMe = "EngineAssets/TextureMsg/ReplaceMe.tif";
-    static const char* szTextureCompiling = "EngineAssets/TextureMsg/TextureCompiling.tif";
-    static const char* szShaderCompiling = "EngineAssets/TextureMsg/ShaderCompiling.tif";
-    static const char* szGeomNotBreakable = "EngineAssets/TextureMsg/GeomNotBreakable.tif";
-#else
-    // Some of the textures here will direct to the regular DefaultSolids_diff to prevent eye catching
-    // bug textures in release mode
-    static const char* szReplaceMe = "EngineAssets/TextureMsg/ReplaceMeRelease.tif";
-    static const char* szTextureCompiling = "EngineAssets/TextureMsg/DefaultSolids_diff.tif";
-    static const char* szShaderCompiling = "EngineAssets/TextureMsg/DefaultSolids_diff.tif";
-    static const char* szGeomNotBreakable = "EngineAssets/TextureMsg/ReplaceMeRelease.tif";
-#endif
-
-static const char* szDefaultSolid = "EngineAssets/TextureMsg/DefaultSolids_diff.tif";
-static const char* szNormalDefault = "EngineAssets/Textures/white_ddn.dds";
-//------------------------------------------------------------------------------
-
-
-static void OnSketchModeChange(ICVar* pVar)
-{
-    int mode = pVar->GetIVal();
-    ((CMatMan*)gEnv->p3DEngine->GetMaterialManager())->SetSketchMode(mode);
-}
-
-static void OnDebugTexelDensityChange(ICVar* pVar)
-{
-    int mode = pVar->GetIVal();
-    ((CMatMan*)gEnv->p3DEngine->GetMaterialManager())->SetTexelDensityDebug(mode);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMatMan::CMatMan()
-{
-    m_bInitialized = false;
-    m_bLoadSurfaceTypesInInit = true;
-    m_pListener = NULL;
-    m_pDefaultMtl = NULL;
-    m_pDefaultTerrainLayersMtl = NULL;
-    m_pDefaultLayersMtl = NULL;
-    m_pDefaultHelperMtl = NULL;
-    m_pNoDrawMtl = NULL;
-
-    m_pSurfaceTypeManager = new CSurfaceTypeManager(GetSystem());
-
-    REGISTER_CVAR_CB(e_sketch_mode, 0, VF_CHEAT, "Enables Sketch mode drawing", OnSketchModeChange);
-    REGISTER_CVAR_CB(e_texeldensity, 0, VF_CHEAT,
-        "Enables texel density debug\n"
-        " 1: Objects texel density\n"
-        " 2: Objects texel density with colored mipmaps\n"
-        " 3: Terrain texel density\n"
-        " 4: Terrain texel density with colored mipmaps\n",
-        OnDebugTexelDensityChange);
-
-    m_pXmlParser = GetISystem()->GetXmlUtils()->CreateXmlParser();
-
-    // Connect for LegacyAssetEventBus::Handler
-    BusConnect(AZ_CRC("mtl", 0xb01910e0));
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMatMan::~CMatMan()
-{
-    delete m_pSurfaceTypeManager;
-    int nNotUsed = 0, nNotUsedParents = 0;
-
-    m_pDefaultMtl = nullptr;
-    m_pDefaultTerrainLayersMtl = nullptr;
-    m_pDefaultLayersMtl = nullptr;
-    m_pDefaultHelperMtl = nullptr;
-    m_pNoDrawMtl = nullptr;
-
-    if (nNotUsed)
-    {
-        PrintMessage("Warning: CMatMan::~CMatMan: %d(%d) of %" PRISIZE_T " materials was not used in level",
-            nNotUsedParents, nNotUsed, m_mtlNameMap.size());
-    }
-
-
-    // Disconnect for LegacyAssetEventBus::Handler
-    BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZStd::string CMatMan::UnifyName(const char* sMtlName) const
-{
-    if (strlen(sMtlName) > AZ_MAX_PATH_LEN)
-    {
-        AZ_Error("Rendering", false, "Error attempting to generate material identifier from the input '%s'. The length of the string exceeds the maximum path length. If you are using script canvas or lua to find or load a material, ensure you are using a valid path to a material as input.", sMtlName);
-        return AZStd::string();
-    }
-
-    char name[AZ_MAX_PATH_LEN];
-    
-    azstrcpy(name, AZ_MAX_PATH_LEN, sMtlName);
-    MaterialUtils::UnifyMaterialName(name);
-    
-    return name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::CreateMaterial(const char* sMtlName, int nMtlFlags)
-{
-    CMatInfo* pMat = new CMatInfo;
-
-    //m_mtlSet.insert( pMat );
-    pMat->SetName(sMtlName);
-    pMat->SetFlags(nMtlFlags | pMat->GetFlags());
-
-    if (!(nMtlFlags & MTL_FLAG_PURE_CHILD))
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-        m_mtlNameMap[ UnifyName(sMtlName) ] = pMat;
-    }
-
-    if (nMtlFlags & MTL_FLAG_NON_REMOVABLE)
-    {
-        // Add reference to this material to prevent its deletion.
-        AZStd::lock_guard<AZStd::mutex> lock(m_nonRemovablesMutex);
-        m_nonRemovables.push_back(pMat);
-    }
-    return pMat;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// A placeholder material while the original is loading.
-// Add more edge case handling for various material types if required
-_smart_ptr<IMaterial> CMatMan::CreateMaterialPlaceholder(const char* materialName, int nMtlFlags, const char* textureName, _smart_ptr<IMaterial> existingMtl)
-{
-    SInputShaderResources   sr;
-    SShaderItem             si;
-
-    sr.m_LMaterial.m_Opacity = 1;
-    sr.m_LMaterial.m_Diffuse.set(1, 1, 1, 1);
-    sr.m_LMaterial.m_Specular.set(0, 0, 0, 0);
-
-    // This will create texture data insertion to the table for the diffuse slot
-    sr.m_TexturesResourcesMap[EFTT_DIFFUSE].m_Name = textureName;
-
-    if (nMtlFlags & MTL_FLAG_IS_TERRAIN)
-        si = GetRenderer()->EF_LoadShaderItem("Terrain.Layer", true, 0, &sr);
-    else if (nMtlFlags & MTL_FLAG_IS_SKY)
-        si = GetRenderer()->EF_LoadShaderItem("SkyHDR", true, 0, &sr);
-    else
-        si = GetRenderer()->EF_LoadShaderItem("Illum", true, 0, &sr);
-
-    if (si.m_pShaderResources)
-        si.m_pShaderResources->SetMaterialName(materialName);
-
-    if (existingMtl)
-    {
-        //For existing material we need to clear sub-materials, set flags and assign the new shader item.
-        existingMtl->SetSubMtlCount(0);
-        existingMtl->SetFlags(nMtlFlags);
-        existingMtl->AssignShaderItem(si);
-
-        //Note: All PURE_CHILD materials are sub-materials, but not all sub-materials are PURE_CHILD.
-        //You can have one sub-material that shares some properties with another sub-material in the same parent, and overrides other properties. A sub-material that does this is not a pure child.
-        //But since it is seldom used, this should cover most cases when we want to know whether the material is a root.
-        if (!(nMtlFlags & MTL_FLAG_PURE_CHILD))
-        {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-            m_mtlNameMap[UnifyName(materialName)] = existingMtl;
-        }
-
-        return existingMtl;
-    }
-    else
-    {
-        _smart_ptr<IMaterial>   pMtl = CreateMaterial(materialName);
-        pMtl->AssignShaderItem(si);
-        return pMtl;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::NotifyCreateMaterial(_smart_ptr<IMaterial> pMtl)
-{
-    if (m_pListener)
-    {
-        m_pListener->OnCreateMaterial(pMtl);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatMan::Unregister(_smart_ptr<IMaterial> pMat, bool deleteEditorMaterial)
-{
-    assert(pMat);
-    if (m_pListener && deleteEditorMaterial)
-    {
-        m_pListener->OnDeleteMaterial(pMat);
-    }
-
-    if (!(pMat->GetFlags() & MTL_FLAG_PURE_CHILD))
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-        
-        AZStd::string unifiedName = UnifyName(pMat->GetName());
-        m_pendingMaterialLoads.erase(unifiedName);
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::RenameMaterial(_smart_ptr<IMaterial> pMtl, const char* sNewName)
-{
-    assert(pMtl);
-    
-    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-    const char* sName = pMtl->GetName();
-    AZStd::unique_ptr<ManualResetEvent> resetEvent = nullptr;
-
-    if (*sName != '\0')
-    {
-        AZStd::string unifiedName = UnifyName(pMtl->GetName());
-        
-        if (m_pendingMaterialLoads.find(unifiedName) != m_pendingMaterialLoads.end())
-        {
-            resetEvent = std::move(m_pendingMaterialLoads[unifiedName]);
-            m_pendingMaterialLoads.erase(unifiedName);
-        }
-
-        m_mtlNameMap.erase(unifiedName);
-    }
-
-    pMtl->SetName(sNewName);
-    AZStd::string newUnifiedName = UnifyName(sNewName);
-
-    m_mtlNameMap[newUnifiedName] = pMtl;
-    if (resetEvent != nullptr)
-    {
-        m_pendingMaterialLoads[newUnifiedName] = std::move(resetEvent);
-    }
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::FindMaterial(const char* sMtlName) const
-{
-    AZStd::string name = UnifyName(sMtlName);
-    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-
-    MtlNameMap::const_iterator it = m_mtlNameMap.find(name);
-
-    if (it == m_mtlNameMap.end())
-    {
-        return 0;
-    }
-
-    return it->second;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//------------------------------------------------------------------------------
-_smart_ptr<IMaterial> CMatMan::LoadMaterial(const char* sMtlName, bool bMakeIfNotFound, bool bNonremovable, unsigned long nLoadingFlags)
-{
-    return LoadMaterialInternal(sMtlName, bMakeIfNotFound, bNonremovable, nLoadingFlags);
-}
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-//------------------------------------------------------------------------------
-_smart_ptr<IMaterial> CMatMan::LoadMaterialInternal(const char* sMtlName, bool bMakeIfNotFound, bool bNonremovable, unsigned long nLoadingFlags)
-{
-    if (!m_bInitialized)
-    {
-        InitDefaults();
-    }
-
-    if (m_pDefaultMtl && GetCVars()->e_StatObjPreload == 2)
-    {
-        return m_pDefaultMtl;
-    }
-
-    AZStd::string           name = UnifyName(sMtlName);
-    _smart_ptr<IMaterial>   pMtl = nullptr;
-
-    UniqueManualEvent       uniqueManualEvent = CheckMaterialCache(name, pMtl);
-
-    if (pMtl != nullptr)
-    {
-        return pMtl;
-    }
-
-    // Failed to retrieve from cache and failed to get 'permission' to safely load, abort load
-    if (!uniqueManualEvent.HasControl())
-    {
-        if (bMakeIfNotFound)
-        {
-            pMtl = CreateMaterialPlaceholder(name.c_str(), nLoadingFlags, szDefaultSolid);
-            return pMtl;
-        }
-        return nullptr;
-    }
-
-    LOADING_TIME_PROFILE_SECTION; // Only profile actually loading of the material.
-
-    CRY_DEFINE_ASSET_SCOPE("Material", sMtlName);
-
-    _smart_ptr<IMaterial> materialRawPointer = pMtl;
-
-    AZStd::string filename = name;
-    auto extPos = filename.find('.');
-
-    if (extPos == AZStd::string::npos)
-    {
-        filename += MATERIAL_EXT;
-    }
-
-    
-    bool fileExists = AZ::IO::FileIOBase::GetInstance()->Exists(filename.c_str());
-    if (!fileExists)
-    {
-        // If the material doesn't exist check if it's queued or being compiled. If so it means the file will become available shortly (as
-        //      GetAssetStatus will push it to the top of the queue) and hot loading will take care of the file. If it's in a broken state,
-        //      remove it as if loading failed.
-        AzFramework::AssetSystem::AssetStatus status = AzFramework::AssetSystem::AssetStatus_Unknown;
-        AzFramework::AssetSystemRequestBus::BroadcastResult(status, &AzFramework::AssetSystemRequestBus::Events::GetAssetStatus, filename);
-
-        switch (status)
-        {
-        case AzFramework::AssetSystem::AssetStatus_Queued:
-            // Fall through
-        case AzFramework::AssetSystem::AssetStatus_Compiling:
-        {
-            AZStd::string   unifiedName = UnifyName(filename.c_str());
-            pMtl = CreateMaterialPlaceholder(unifiedName.c_str(), nLoadingFlags, szDefaultSolid );
-            break;
-        }
-
-        case AzFramework::AssetSystem::AssetStatus_Compiled:
-            // If the materials compiled it could be that between the check if it exists and getting the status it completed compilation.
-            //      In this case, check the status again and load as normal if found, otherwise consider it an error.
-            if (AZ::IO::FileIOBase::GetInstance()->Exists(filename.c_str()))
-            {
-                fileExists = true;
-                break;
-            }
-            // else fall through
-
-        case AzFramework::AssetSystem::AssetStatus_Unknown:
-            // Fall through
-        case AzFramework::AssetSystem::AssetStatus_Missing:
-            // Fall through
-        case AzFramework::AssetSystem::AssetStatus_Failed:
-            // Fall through
-        default:
-        {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-            uniqueManualEvent.Set();
-            m_pendingMaterialLoads.erase(name);
-            break;
-        }
-        }
-    }
-    
-    if (fileExists)
-    {
-        // If the material already exists load it from the cache. If there's a build in flight the material will get reloaded
-        //      when building finishes and if it's not in flight anymore the latest material will be loaded.
-        XmlNodeRef mtlNode = GetSystem()->LoadXmlFromFile(filename.c_str());
-
-        if (mtlNode)
-        {
-            pMtl = MakeMaterialFromXml(name, mtlNode, false, 0, nullptr, nLoadingFlags);
-
-            if (pMtl && e_sketch_mode != 0)
-            {
-                ((CMatInfo*)pMtl.get())->SetSketchMode(e_sketch_mode);
-            }
-        }
-        else
-        {
-            //Loading has failed so evict from pending list.
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-            uniqueManualEvent.Set();
-            m_pendingMaterialLoads.erase(name);
-        }
-    }
-
-    if (bNonremovable && pMtl)
-    {   // mark as non-removable material on specific cases (probes..)
-        AZStd::lock_guard<AZStd::mutex> lock(m_nonRemovablesMutex);
-        m_nonRemovables.push_back((CMatInfo*)pMtl.get());
-    }
-
-    if (!pMtl && bMakeIfNotFound)
-    {
-        pMtl = CreateMaterialPlaceholder(name.c_str(), nLoadingFlags, szDefaultSolid);
-    }
-
-    return pMtl;
-}
-
-//! Let the first thread load the material, block the rest until its done so they can just use the cached version
-template<typename T>
-UniqueManualEvent CMatMan::CheckMaterialCache(const AZStd::string& name, T& cachedMaterial)
-{
-    bool hasControl = false;
-    ManualResetEvent* manualResetEvent;
-
-    AZStd::unique_lock<AZStd::recursive_mutex> lock(m_materialMapMutex);
-
-    auto iterator = m_pendingMaterialLoads.find(name);
-
-    if (iterator != m_pendingMaterialLoads.end())
-    {
-        manualResetEvent = iterator->second.get();
-    }
-    else
-    {
-        // Event not found, create one
-        hasControl = true;
-        manualResetEvent = new ManualResetEvent();
-        m_pendingMaterialLoads.emplace(name, AZStd::unique_ptr<ManualResetEvent>(manualResetEvent));
-    }
-
-    if (!hasControl)
-    {
-        manualResetEvent->Wait();
-
-        MtlNameMap::const_iterator it = m_mtlNameMap.find(name);
-
-        if (it != m_mtlNameMap.end())
-        {
-            cachedMaterial = it->second;
-        }
-        else
-        {
-            cachedMaterial = nullptr;
-        }
-    }
-
-    return UniqueManualEvent(manualResetEvent, hasControl);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::MakeMaterialFromXml(const AZStd::string& sMtlName, XmlNodeRef node, bool bForcePureChild, uint16 sortPrio /*= 0*/, _smart_ptr<IMaterial> pExistingMtl /*= 0*/, unsigned long nLoadingFlags /*= 0*/, _smart_ptr<IMaterial> pParentMtl /*= 0*/)
-{
-    int mtlFlags = 0;
-    CryFixedStringT<128> shaderName;
-    uint64 nShaderGenMask = 0;
-    SInputShaderResources sr;
-
-    assert(node != 0);
-
-    sr.m_SortPrio = sortPrio;
-
-    // Loading
-    node->getAttr("MtlFlags", mtlFlags);
-    mtlFlags &= (MTL_FLAGS_SAVE_MASK); // Clean flags that are not supposed to be save/loaded.
-    if (bForcePureChild)
-    {
-        mtlFlags |= MTL_FLAG_PURE_CHILD;
-    }
-
-    _smart_ptr<IMaterial> pMtl = pExistingMtl;
-    if (!pMtl)
-    {
-        pMtl = CreateMaterial(sMtlName.c_str(), mtlFlags);
-    }
-    else
-    {
-        pMtl->SetFlags(mtlFlags | pMtl->GetFlags());
-        pMtl->SetDirty(false);
-    }
-
-    uint32 dccMaterialHash = 0;
-    node->getAttr("DccMaterialHash", dccMaterialHash);
-    pMtl->SetDccMaterialHash(dccMaterialHash);
-
-    if (!(mtlFlags & MTL_FLAG_MULTI_SUBMTL))
-    {
-        shaderName = node->getAttr("Shader");
-
-        if (!(mtlFlags & MTL_64BIT_SHADERGENMASK))
-        {
-            uint32 nShaderGenMask32 = 0;
-            node->getAttr("GenMask", nShaderGenMask32);
-            nShaderGenMask = nShaderGenMask32;
-
-            // Remap 32bit flags to 64 bit version
-            nShaderGenMask = GetRenderer()->EF_GetRemapedShaderMaskGen((const char*) shaderName, nShaderGenMask);
-            mtlFlags |= MTL_64BIT_SHADERGENMASK;
-        }
-        else
-        {
-            node->getAttr("GenMask", nShaderGenMask);
-        }
-
-        if (node->haveAttr("StringGenMask"))
-        {
-            const char* pszShaderGenMask = node->getAttr("StringGenMask");
-            nShaderGenMask = GetRenderer()->EF_GetShaderGlobalMaskGenFromString((const char*) shaderName, pszShaderGenMask, nShaderGenMask); // get common mask gen
-        }
-        else
-        {
-            // version doesn't have string gen mask yet ? Remap flags if needed
-            nShaderGenMask = GetRenderer()->EF_GetRemapedShaderMaskGen((const char*) shaderName, nShaderGenMask, ((mtlFlags & MTL_64BIT_SHADERGENMASK) != 0));
-        }
-        mtlFlags |= MTL_64BIT_SHADERGENMASK;
-
-        const char* surfaceType = node->getAttr("SurfaceType");
-        pMtl->SetSurfaceType(surfaceType);
-
-        if (azstricmp(shaderName, "nodraw") == 0)
-        {
-            mtlFlags |= MTL_FLAG_NODRAW;
-        }
-
-        pMtl->SetFlags(mtlFlags | pMtl->GetFlags());
-
-        s_materialHelpers.SetLightingFromXml(sr, node);
-        s_materialHelpers.SetTexturesFromXml(sr, node);
-        s_materialHelpers.MigrateXmlLegacyData(sr, node);
-
-        // Next warn about textures with drive letter in them
-        for (auto &iter : sr.m_TexturesResourcesMap )
-        {
-            SEfResTexture*      pTexture = &(iter.second);
-            const char*         name = pTexture->m_Name;
-            if (name && (strchr(name, ':') != nullptr))
-            {
-                CryLog("Invalid texture '%s' found in material '%s'", name, sMtlName.c_str());
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check if we have a link name
-    //////////////////////////////////////////////////////////////////////////
-    XmlNodeRef pLinkName = node->findChild("MaterialLinkName");
-    if (pLinkName)
-    {
-        const char* szLinkName = pLinkName->getAttr("name");
-        pMtl->SetMaterialLinkName(szLinkName);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check if we have vertex deform.
-    //////////////////////////////////////////////////////////////////////////
-    s_materialHelpers.SetVertexDeformFromXml(sr, node);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Load public parameters.
-    XmlNodeRef publicVarsNode = node->findChild("PublicParams");
-
-    //////////////////////////////////////////////////////////////////////////
-    // Reload shader item with new resources and shader.
-    if (!(mtlFlags & MTL_FLAG_MULTI_SUBMTL))
-    {
-        sr.m_szMaterialName = sMtlName.c_str();
-        
-        LoadMaterialShader(pMtl, pParentMtl, shaderName.c_str(), nShaderGenMask, sr, publicVarsNode);
-        pMtl->SetShaderName(shaderName);
-    }
-    else
-    {
-        //Release any shader item if assigned for material group
-        pMtl->ReleaseCurrentShaderItem();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Load material layers data
-    //////////////////////////////////////////////////////////////////////////
-
-    if (pMtl && pMtl->GetShaderItem().m_pShader && pMtl->GetShaderItem().m_pShaderResources)
-    {
-        XmlNodeRef pMtlLayersNode = node->findChild("MaterialLayers");
-        if (pMtlLayersNode)
-        {
-            int nLayerCount = min((int) MTL_LAYER_MAX_SLOTS, (int) pMtlLayersNode->getChildCount());
-            if (nLayerCount)
-            {
-                uint8 nMaterialLayerFlags = 0;
-
-                pMtl->SetLayerCount(nLayerCount);
-                for (int l(0); l < nLayerCount; ++l)
-                {
-                    XmlNodeRef pLayerNode = pMtlLayersNode->getChild(l);
-                    if (pLayerNode)
-                    {
-                        if (const char* pszShaderName = pLayerNode->getAttr("Name"))
-                        {
-                            bool bNoDraw = false;
-                            pLayerNode->getAttr("NoDraw", bNoDraw);
-
-                            uint8 nLayerFlags = 0;
-                            if (bNoDraw)
-                            {
-                                nLayerFlags |= MTL_LAYER_USAGE_NODRAW;
-
-                                if (!azstricmp(pszShaderName, "frozenlayerwip"))
-                                {
-                                    nMaterialLayerFlags |= MTL_LAYER_FROZEN;
-                                }
-                            }
-                            else
-                            {
-                                nLayerFlags &= ~MTL_LAYER_USAGE_NODRAW;
-                            }
-
-                            bool bFadeOut = false;
-                            pLayerNode->getAttr("FadeOut", bFadeOut);
-                            if (bFadeOut)
-                            {
-                                nLayerFlags |= MTL_LAYER_USAGE_FADEOUT;
-                            }
-                            else
-                            {
-                                nLayerFlags &= ~MTL_LAYER_USAGE_FADEOUT;
-                            }
-
-                            XmlNodeRef pPublicsParamsNode = pLayerNode->findChild("PublicParams");
-                            sr.m_szMaterialName = sMtlName.c_str();
-                            LoadMaterialLayerSlot(l, pMtl, pszShaderName, sr, pPublicsParamsNode, nLayerFlags);
-                        }
-                    }
-                }
-
-                SShaderItem& pShaderItemBase = pMtl->GetShaderItem();
-                if (pShaderItemBase.m_pShaderResources)
-                {
-                    pShaderItemBase.m_pShaderResources->SetMtlLayerNoDrawFlags(nMaterialLayerFlags);
-                }
-            }
-        }
-    }
-
-    // Serialize sub materials.
-    XmlNodeRef childsNode = node->findChild("SubMaterials");
-    if (childsNode)
-    {
-        int nSubMtls = childsNode->getChildCount();
-        pMtl->SetSubMtlCount(nSubMtls);
-        for (int i = 0; i < nSubMtls; i++)
-        {
-            XmlNodeRef mtlNode = childsNode->getChild(i);
-            if (mtlNode->isTag("Material"))
-            {
-                const char* name = mtlNode->getAttr("Name");
-                _smart_ptr<IMaterial> pChildMtl = MakeMaterialFromXml(name, mtlNode, true, uint16(nSubMtls - i - 1), 0, nLoadingFlags, pMtl);
-                if (pChildMtl)
-                {
-                    pMtl->SetSubMtl(i, pChildMtl);
-                }
-                else
-                {
-                    pMtl->SetSubMtl(i, m_pDefaultMtl);
-                }
-            }
-            else
-            {
-                const char* name = mtlNode->getAttr("Name");
-                if (name[0])
-                {
-                    _smart_ptr<IMaterial> pChildMtl = LoadMaterial(name, true, false, nLoadingFlags);
-                    if (pChildMtl)
-                    {
-                        pMtl->SetSubMtl(i, pChildMtl);
-                    }
-                }
-            }
-        }
-    }
-    NotifyCreateMaterial(pMtl);
-    return pMtl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatMan::LoadMaterialShader(_smart_ptr<IMaterial> pMtl, _smart_ptr<IMaterial> pParentMtl, const char* sShader, uint64 nShaderGenMask, SInputShaderResources& sr, XmlNodeRef& publicsNode)
-{
-    // Mark material invalid by default.
-    sr.m_ResFlags = pMtl->GetFlags();
-
-    // Set public params.
-    if (publicsNode)
-    {
-        // Copy public params from the shader.
-        //sr.m_ShaderParams = shaderItem.m_pShader->GetPublicParams();
-        // Parse public parameters, and assign them to source shader resources.
-        ParsePublicParams(sr, publicsNode);
-        //shaderItem.m_pShaderResources->SetShaderParams(&sr, shaderItem.m_pShader);
-    }
-
-    SShaderItem shaderItem = gEnv->pRenderer->EF_LoadShaderItem(sShader, false, 0, &sr, nShaderGenMask);
-    if (!shaderItem.m_pShader || (shaderItem.m_pShader->GetFlags() & EF_NOTFOUND) != 0)
-    {
-        Warning("Failed to load shader \"%s\" in material \"%s\"", sShader, pMtl->GetName());
-        if (!shaderItem.m_pShader)
-        {
-            return false;
-        }
-    }
-    pMtl->AssignShaderItem(shaderItem);
-
-    return true;
-}
-
-bool CMatMan::LoadMaterialLayerSlot(uint32 nSlot, _smart_ptr<IMaterial> pMtl, const char* szShaderName, SInputShaderResources& pBaseResources, XmlNodeRef& pPublicsNode, uint8 nLayerFlags)
-{
-    if (!pMtl || pMtl->GetLayer(nSlot) || !pPublicsNode)
-    {
-        return false;
-    }
-
-    // need to handle no draw case
-    if (azstricmp(szShaderName, "nodraw") == 0)
-    {
-        // no shader = skip layer
-        return false;
-    }
-
-    // Get base material/shaderItem info
-    SInputShaderResources       pInputResources;
-    SShaderItem& pShaderItemBase = pMtl->GetShaderItem();
-
-    uint32 nMaskGenBase = (uint32)pShaderItemBase.m_pShader->GetGenerationMask();
-    SShaderGen* pShaderGenBase = pShaderItemBase.m_pShader->GetGenerationParams();
-
-    // copy diffuse and bump textures names
-    pInputResources.m_szMaterialName = pBaseResources.m_szMaterialName;
-
-    // The following copies the entire texture data for this slot as it did not exist in the map
-    if (pBaseResources.GetTextureResource(EFTT_DIFFUSE))
-    {
-        pInputResources.m_TexturesResourcesMap[EFTT_DIFFUSE].m_Name = pBaseResources.m_TexturesResourcesMap[EFTT_DIFFUSE].m_Name;
-    }
-
-    if (pBaseResources.GetTextureResource(EFTT_NORMALS))
-    {
-        pInputResources.m_TexturesResourcesMap[EFTT_NORMALS].m_Name = pBaseResources.m_TexturesResourcesMap[EFTT_NORMALS].m_Name;
-    }
-
-    // Names validity - if the texture slot doesn't exist or no name replace with default textures
-    if (pInputResources.m_TexturesResourcesMap[EFTT_DIFFUSE].m_Name.empty())
-    {
-        pInputResources.m_TexturesResourcesMap[EFTT_DIFFUSE].m_Name = szReplaceMe;
-    }
-
-    if (pInputResources.m_TexturesResourcesMap[EFTT_NORMALS].m_Name.empty())
-    {
-        pInputResources.m_TexturesResourcesMap[EFTT_NORMALS].m_Name = szNormalDefault;
-    }
-    // Load layer shader item
-    IShader* pNewShader = gEnv->pRenderer->EF_LoadShader(szShaderName, 0);
-    if (!pNewShader)
-    {
-        Warning("Failed to load material layer shader %s in Material %s", szShaderName, pMtl->GetName());
-        return false;
-    }
-
-    // mask generation for base material shader
-    uint32 nMaskGenLayer = 0;
-    SShaderGen* pShaderGenLayer = pNewShader->GetGenerationParams();
-    if (pShaderGenBase && pShaderGenLayer)
-    {
-        for (unsigned nLayerBit(0); nLayerBit < pShaderGenLayer->m_BitMask.size(); ++nLayerBit)
-        {
-            SShaderGenBit* pLayerBit = pShaderGenLayer->m_BitMask[nLayerBit];
-
-            for (unsigned nBaseBit(0); nBaseBit < pShaderGenBase->m_BitMask.size(); ++nBaseBit)
-            {
-                SShaderGenBit* pBaseBit = pShaderGenBase->m_BitMask[nBaseBit];
-
-                // Need to check if flag name is common to both shaders (since flags values can be different), if so activate it on this layer
-                if (nMaskGenBase & pBaseBit->m_Mask)
-                {
-                    if (!pLayerBit->m_ParamName.empty() && !pBaseBit->m_ParamName.empty())
-                    {
-                        if (pLayerBit->m_ParamName == pBaseBit->m_ParamName)
-                        {
-                            nMaskGenLayer |= pLayerBit->m_Mask;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // Reload with proper flags
-    IShader* pShader = gEnv->pRenderer->EF_LoadShader(szShaderName, 0, nMaskGenLayer);
-    if (!pShader)
-    {
-        Warning("Failed to load material layer shader %s in Material %s", szShaderName, pMtl->GetName());
-        SAFE_RELEASE(pNewShader);
-        return false;
-    }
-    SAFE_RELEASE(pNewShader);
-
-    // Copy public params from the shader.
-    //pInputResources.m_ShaderParams = pShaderItem.m_pShader->GetPublicParams();
-
-    // Copy resources from base material
-    SShaderItem ShaderItem(pShader, pShaderItemBase.m_pShaderResources->Clone());
-
-    ParsePublicParams(pInputResources, pPublicsNode);
-
-    // Parse public parameters, and assign them to source shader resources.
-    ShaderItem.m_pShaderResources->SetShaderParams(&pInputResources, ShaderItem.m_pShader);
-
-    IMaterialLayer* pCurrMtlLayer = pMtl->CreateLayer();
-
-    pCurrMtlLayer->SetFlags(nLayerFlags);
-    pCurrMtlLayer->SetShaderItem(pMtl, ShaderItem);
-
-    // Clone returns an instance with a refcount of 1, and SetShaderItem increments it, so
-    // we need to release the cloned ref.
-    SAFE_RELEASE(ShaderItem.m_pShaderResources);
-    SAFE_RELEASE(ShaderItem.m_pShader);
-
-    pMtl->SetLayer(nSlot, pCurrMtlLayer);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-static void shGetVector4(const char* buf, float v[4])
-{
-    if (!buf)
-    {
-        return;
-    }
-#if !defined(NDEBUG)
-    int res =
-#endif
-        azsscanf(buf, "%f,%f,%f,%f", &v[0], &v[1], &v[2], &v[3]);
-    assert(res);
-}
-
-void CMatMan::ParsePublicParams(SInputShaderResources& sr, XmlNodeRef paramsNode)
-{
-    sr.m_ShaderParams.clear();
-
-    int nA = paramsNode->getNumAttributes();
-    if (!nA)
-    {
-        return;
-    }
-
-    for (int i = 0; i < nA; i++)
-    {
-        const char* key = NULL, * val = NULL;
-        paramsNode->getAttributeByIndex(i, &key, &val);
-        SShaderParam Param;
-        assert(val && key);
-        Param.m_Name = key;
-        Param.m_Value.m_Color[0] = Param.m_Value.m_Color[1] = Param.m_Value.m_Color[2] = Param.m_Value.m_Color[3] = 0;
-        shGetVector4(val, Param.m_Value.m_Color);
-        Param.m_Type = eType_FCOLOR;
-        sr.m_ShaderParams.push_back(Param);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISurfaceType* CMatMan::GetSurfaceTypeByName(const char* sSurfaceTypeName, const char* sWhy)
-{
-    return m_pSurfaceTypeManager->GetSurfaceTypeByName(sSurfaceTypeName, sWhy);
-};
-
-//////////////////////////////////////////////////////////////////////////
-int CMatMan::GetSurfaceTypeIdByName(const char* sSurfaceTypeName, const char* sWhy)
-{
-    ISurfaceType* pSurfaceType = m_pSurfaceTypeManager->GetSurfaceTypeByName(sSurfaceTypeName, sWhy);
-    if (pSurfaceType)
-    {
-        return pSurfaceType->GetId();
-    }
-    return 0;
-};
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::GetDefaultLayersMaterial()
-{
-    if (!m_bInitialized)
-    {
-        InitDefaults();
-    }
-
-    return m_pDefaultLayersMtl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::GetDefaultHelperMaterial()
-{
-    if (!m_bInitialized)
-    {
-        InitDefaults();
-    }
-
-    return m_pDefaultHelperMtl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::GetLoadedMaterials(AZStd::vector<_smart_ptr<IMaterial>>* pData, uint32& nObjCount) const
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-    nObjCount = m_mtlNameMap.size();
-
-    if (!pData)
-    {
-        return;
-    }
-
-    MtlNameMap::const_iterator it, end = m_mtlNameMap.end();
-
-    for (it = m_mtlNameMap.begin(); it != end; ++it)
-    {
-        _smart_ptr<IMaterial> pMat = it->second;
-
-        pData->push_back(pMat);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::CloneMaterial(_smart_ptr<IMaterial> pSrcMtl, int nSubMtl)
-{
-    if (pSrcMtl->GetFlags() & MTL_FLAG_MULTI_SUBMTL)
-    {
-        _smart_ptr<IMaterial> pMultiMat = new CMatInfo;
-
-        //m_mtlSet.insert( pMat );
-        pMultiMat->SetName(pSrcMtl->GetName());
-        pMultiMat->SetFlags(pMultiMat->GetFlags() | MTL_FLAG_MULTI_SUBMTL);
-
-        bool bCloneAllSubMtls = nSubMtl < 0;
-
-        int nSubMtls = pSrcMtl->GetSubMtlCount();
-        pMultiMat->SetSubMtlCount(nSubMtls);
-        for (int i = 0; i < nSubMtls; i++)
-        {
-            CMatInfo* pChildSrcMtl = (CMatInfo*)pSrcMtl->GetSubMtl(i).get();
-            if (!pChildSrcMtl)
-            {
-                continue;
-            }
-            if (bCloneAllSubMtls)
-            {
-                pMultiMat->SetSubMtl(i, pChildSrcMtl->Clone());
-            }
-            else
-            {
-                pMultiMat->SetSubMtl(i, pChildSrcMtl);
-                if (i == nSubMtls)
-                {
-                    // Clone this slot.
-                    pMultiMat->SetSubMtl(i, pChildSrcMtl->Clone());
-                }
-            }
-        }
-        return pMultiMat;
-    }
-    else
-    {
-        _smart_ptr<IMaterial> pMat = reinterpret_cast<CMatInfo*>(pSrcMtl.get())->Clone();
-        return pMat;
-    }
-}
-
-void CMatMan::CopyMaterial(_smart_ptr<IMaterial> pMtlSrc, _smart_ptr<IMaterial> pMtlDest, EMaterialCopyFlags flags)
-{
-    ((CMatInfo*)pMtlSrc.get())->Copy(pMtlDest, flags);
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::CloneMultiMaterial(_smart_ptr<IMaterial> pSrcMtl, const char* sSubMtlName)
-{
-    if (pSrcMtl->GetFlags() & MTL_FLAG_MULTI_SUBMTL)
-    {
-        _smart_ptr<IMaterial> pMultiMat = new CMatInfo;
-
-        //m_mtlSet.insert( pMat );
-        pMultiMat->SetName(pSrcMtl->GetName());
-        pMultiMat->SetFlags(pMultiMat->GetFlags() | MTL_FLAG_MULTI_SUBMTL);
-
-        bool bCloneAllSubMtls = sSubMtlName == 0;
-
-        int nSubMtls = pSrcMtl->GetSubMtlCount();
-        pMultiMat->SetSubMtlCount(nSubMtls);
-        for (int i = 0; i < nSubMtls; i++)
-        {
-            CMatInfo* pChildSrcMtl = (CMatInfo*)pSrcMtl->GetSubMtl(i).get();
-            if (!pChildSrcMtl)
-            {
-                continue;
-            }
-            if (bCloneAllSubMtls)
-            {
-                pMultiMat->SetSubMtl(i, pChildSrcMtl->Clone());
-            }
-            else
-            {
-                pMultiMat->SetSubMtl(i, pChildSrcMtl);
-                if (azstricmp(pChildSrcMtl->GetName(), sSubMtlName) == 0)
-                {
-                    // Clone this slot.
-                    pMultiMat->SetSubMtl(i, pChildSrcMtl->Clone());
-                }
-            }
-        }
-        return pMultiMat;
-    }
-    else
-    {
-        return ((CMatInfo*)pSrcMtl.get())->Clone();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::DoLoadSurfaceTypesInInit(bool doLoadSurfaceTypesInInit)
-{
-    m_bLoadSurfaceTypesInInit = doLoadSurfaceTypesInInit;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::InitDefaults()
-{
-    if (m_bInitialized)
-    {
-        return;
-    }
-    m_bInitialized = true;
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    SYNCHRONOUS_LOADING_TICK();
-
-    if (m_bLoadSurfaceTypesInInit)
-    {
-        m_pSurfaceTypeManager->LoadSurfaceTypes();
-    }
-
-    if (!m_pDefaultMtl)
-    {
-        // This line is REQUIRED by the buildbot testing framework to determine when tests have formally started. Please inform WillW or Morgan before changing this.
-        CryLogAlways("Initializing default materials...");
-        m_pDefaultMtl = CreateMaterialPlaceholder("Default", 0, szReplaceMe);
-    }
-
-    if (!m_pDefaultTerrainLayersMtl)
-    {
-        m_pDefaultTerrainLayersMtl = CreateMaterialPlaceholder("DefaultTerrainLayer", MTL_FLAG_IS_TERRAIN, szReplaceMe);
-    }
-
-    if (!m_pDefaultLayersMtl)
-    {
-        m_pDefaultLayersMtl = LoadMaterial("Materials/material_layers_default", false);
-    }
-
-    if (!m_pNoDrawMtl)
-    {
-        m_pNoDrawMtl = new CMatInfo;
-        m_pNoDrawMtl->SetFlags(MTL_FLAG_NODRAW);
-        m_pNoDrawMtl->SetName(MATERIAL_NODRAW);
-        SShaderItem si;
-        si.m_pShader = GetRenderer()->EF_LoadShader(MATERIAL_NODRAW, 0);
-        m_pNoDrawMtl->AssignShaderItem(si);
-
-        AZStd::string unifiedName = UnifyName(m_pNoDrawMtl->GetName());
-        auto* resetEvent = new ManualResetEvent();
-        resetEvent->Set();
-
-        m_mtlNameMap[unifiedName] = m_pNoDrawMtl;
-        m_pendingMaterialLoads.emplace(unifiedName, AZStd::unique_ptr<ManualResetEvent>(resetEvent));
-    }
-
-    if (!m_pDefaultHelperMtl)
-    {
-        m_pDefaultHelperMtl = new CMatInfo;
-        m_pDefaultHelperMtl->SetName("DefaultHelper");
-        SInputShaderResources sr;
-        sr.m_LMaterial.m_Opacity = 1;
-        sr.m_LMaterial.m_Diffuse.set(1, 1, 1, 1);
-        // Notice that the following line creates a texture data slot, inserts it and set the texture name
-        sr.m_TexturesResourcesMap[EFTT_DIFFUSE].m_Name = szReplaceMe;    
-        SShaderItem si = GetRenderer()->EF_LoadShaderItem("Helper", true, 0, &sr);
-        if (si.m_pShaderResources)
-        {
-            si.m_pShaderResources->SetMaterialName("DefaultHelper");
-        }
-        m_pDefaultHelperMtl->AssignShaderItem(si);
-    }
-
-    SLICE_AND_SLEEP();
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::LoadCGFMaterial(CMaterialCGF* pMaterialCGF, const char* sCgfFilename, unsigned long nLoadingFlags)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    LOADING_TIME_PROFILE_SECTION;
-
-    CryPathString sMtlName = pMaterialCGF->name;
-    if (sMtlName.find('/') == stack_string::npos)
-    {
-        // If no slashes in the name assume it is in same folder as a cgf.
-        sMtlName = PathUtil::AddSlash(PathUtil::GetPath(stack_string(sCgfFilename))) + sMtlName;
-    }
-    else
-    {
-        sMtlName = PathUtil::MakeGamePath(sMtlName);
-    }
-    return LoadMaterial(sMtlName.c_str(), true, false, nLoadingFlags);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::SetSketchMode(int mode)
-{
-    if (mode != 0)
-    {
-        gEnv->pConsole->ExecuteString("exec sketch_on");
-    }
-    else
-    {
-        gEnv->pConsole->ExecuteString("exec sketch_off");
-    }
-
-    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-
-    for (MtlNameMap::iterator it = m_mtlNameMap.begin(); it != m_mtlNameMap.end(); ++it)
-    {
-        CMatInfo* pMtl = (CMatInfo*)it->second.get();
-        pMtl->SetSketchMode(mode);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::SetTexelDensityDebug(int mode)
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-
-    for (MtlNameMap::iterator it = m_mtlNameMap.begin(); it != m_mtlNameMap.end(); ++it)
-    {
-        CMatInfo* pMtl = (CMatInfo*)it->second.get();
-        pMtl->SetTexelDensityDebug(mode);
-    }
-}
-
-
-namespace
-{
-    static bool IsPureChild(_smart_ptr<IMaterial> pMtl)
-    {
-        return (pMtl->GetFlags() & MTL_FLAG_PURE_CHILD) ? true : false;
-    }
-    static bool IsMultiSubMaterial(_smart_ptr<IMaterial> pMtl)
-    {
-        return (pMtl->GetFlags() & MTL_FLAG_MULTI_SUBMTL) ? true : false;
-    };
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::ReloadMaterial(_smart_ptr<IMaterial> pMtl)
-{
-    AZStd::string name = UnifyName(pMtl->GetName());
-
-    AZStd::string filename = name;
-    auto extPos = filename.find('.');
-    if (extPos == AZStd::string::npos)
-    {
-        filename += MATERIAL_EXT;
-    }
-
-    XmlNodeRef mtlNode = GetSystem()->LoadXmlFromFile(filename.c_str());
-
-    if (mtlNode)
-    {
-        // This should reload the Material's data in-place without modifying any
-        // material management registration. Otherwise we would have to send some
-        // kind of messages about the material being replaced to every object 
-        // with a pointer to it.
-        MakeMaterialFromXml(name, mtlNode, false, 0, pMtl);
-    }
-    else
-    {
-        AZ_Warning("Material System", false, "Failed to re-load %s", filename.c_str());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::LoadMaterialFromXml(const char* sMtlName, XmlNodeRef mtlNode)
-{
-    AZStd::string name = UnifyName(sMtlName);
-
-    AZStd::unique_lock<AZStd::recursive_mutex> lock(m_materialMapMutex);
-    MtlNameMap::const_iterator it = m_mtlNameMap.find(name);
-
-    _smart_ptr<IMaterial> pMtl = 0;
-
-    if (it != m_mtlNameMap.end())
-    {
-        pMtl = it->second;
-        pMtl = MakeMaterialFromXml(name, mtlNode, false, 0, pMtl);
-        return pMtl;
-    }
-
-    if (!pMtl)
-    {
-        pMtl = MakeMaterialFromXml(name, mtlNode, false);
-    }
-
-    return pMtl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatMan::SaveMaterial(XmlNodeRef node, _smart_ptr<IMaterial> pMtl)
-{
-    // Saving.
-    node->setAttr("MtlFlags", pMtl->GetFlags());
-    node->setAttr("DccMaterialHash", pMtl->GetDccMaterialHash());
-
-    SShaderItem& si = pMtl->GetShaderItem(0);
-    SInputShaderResources m_shaderResources = SInputShaderResources(si.m_pShaderResources);
-
-    if (!IsMultiSubMaterial(pMtl))
-    {
-        node->setAttr("Shader", si.m_pShader->GetName());
-        node->setAttr("GenMask", si.m_pShader->GetGenerationMask());
-        node->setAttr("SurfaceType", pMtl->GetSurfaceType() ? pMtl->GetSurfaceType()->GetName() : NULL);
-
-        SInputShaderResources& sr = m_shaderResources;
-        //if (!m_shaderName.IsEmpty() && (azstricmp(m_shaderName,"nodraw") != 0))
-        {
-            s_materialHelpers.SetXmlFromLighting(sr, node);
-            s_materialHelpers.SetXmlFromTextures(sr, node);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Save out the link name if present
-    //////////////////////////////////////////////////////////////////////////
-    const char* szLinkName = pMtl->GetMaterialLinkName();
-    if (szLinkName != 0 && strlen(szLinkName))
-    {
-        XmlNodeRef pLinkName = node->newChild("MaterialLinkName");
-        pLinkName->setAttr("name", szLinkName);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check if we have vertex deform.
-    //////////////////////////////////////////////////////////////////////////
-    s_materialHelpers.SetXmlFromVertexDeform(m_shaderResources, node);
-
-    if (pMtl->GetSubMtlCount() > 0)
-    {
-        // Serialize sub materials.
-        XmlNodeRef childsNode = node->newChild("SubMaterials");
-        for (int i = 0; i < pMtl->GetSubMtlCount(); i++)
-        {
-            _smart_ptr<IMaterial> pSubMtl = pMtl->GetSubMtl(i);
-            if (pSubMtl && IsPureChild(pSubMtl))
-            {
-                XmlNodeRef mtlNode = childsNode->newChild("Material");
-                mtlNode->setAttr("Name", pSubMtl->GetName());
-                SaveMaterial(mtlNode, pSubMtl);
-            }
-            else
-            {
-                XmlNodeRef mtlNode = childsNode->newChild("MaterialRef");
-                if (pSubMtl)
-                {
-                    mtlNode->setAttr("Name", pSubMtl->GetName());
-                }
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Save public parameters.
-    //////////////////////////////////////////////////////////////////////////
-    /*
-      if (m_publicVarsCache)
-      {
-        node->addChild( m_publicVarsCache );
-      }
-      else */
-
-    if (!m_shaderResources.m_ShaderParams.empty())
-    {
-        XmlNodeRef publicsNode = node->newChild("PublicParams");
-        s_materialHelpers.SetXmlFromShaderParams(m_shaderResources, publicsNode);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Save material layers data
-    //////////////////////////////////////////////////////////////////////////
-
-    bool bMaterialLayers = false;
-    for (int l(0); l < MTL_LAYER_MAX_SLOTS; ++l)
-    {
-        const IMaterialLayer* pLayer = pMtl->GetLayer(l);
-        if (pLayer && pLayer->GetShaderItem().m_pShader && strlen(pLayer->GetShaderItem().m_pShader->GetName()) != 0)
-        {
-            bMaterialLayers = true;
-            break;
-        }
-    }
-
-    if (bMaterialLayers)
-    {
-        XmlNodeRef mtlLayersNode = node->newChild("MaterialLayers");
-        for (int l(0); l < MTL_LAYER_MAX_SLOTS; ++l)
-        {
-            XmlNodeRef layerNode = mtlLayersNode->newChild("Layer");
-            const IMaterialLayer* pLayer = pMtl->GetLayer(l);
-            if (pLayer && pLayer->GetShaderItem().m_pShader && strlen(pLayer->GetShaderItem().m_pShader->GetName()) != 0)
-            {
-                SInputShaderResources shaderRes(pLayer->GetShaderItem().m_pShaderResources);
-
-                layerNode->setAttr("Name", pLayer->GetShaderItem().m_pShader->GetName());
-                layerNode->setAttr("NoDraw", pLayer->GetShaderItem().m_pShader->GetFlags() & MTL_LAYER_USAGE_NODRAW);
-                layerNode->setAttr("FadeOut", pLayer->GetShaderItem().m_pShader->GetFlags() & MTL_LAYER_USAGE_FADEOUT);
-
-                if (!shaderRes.m_ShaderParams.empty())
-                {
-                    XmlNodeRef publicsNode = layerNode->newChild("PublicParams");
-                    s_materialHelpers.SetXmlFromShaderParams(shaderRes, publicsNode);
-                }
-            }
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::PreloadLevelMaterials()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    //bool bMtlfCacheExist = GetISystem()->GetIResourceManager()->LoadLevelCachePak( MTL_LEVEL_CACHE_PAK,"" );
-    //if (!bMtlfCacheExist)
-    //return;
-
-    PrintMessage("==== Starting Loading Level Materials ====");
-    float fStartTime = GetCurAsyncTimeSec();
-
-    auto pResList = GetISystem()->GetIResourceManager()->GetLevelResourceList();
-
-    if (!pResList)
-    {
-        Error("Error loading level Materials: resource list is NULL");
-        return;
-    }
-
-    int nCounter = 0;
-    int nInLevelCacheCount = 0;
-
-    _smart_ptr<IXmlParser> pXmlParser = GetISystem()->GetXmlUtils()->CreateXmlParser();
-
-    // Request objects loading from Streaming System.
-    CryPathString mtlName;
-    CryPathString mtlFilename;
-    CryPathString mtlCacheFilename;
-    for (const char* sName = pResList->GetFirst(); sName != NULL; sName = pResList->GetNext())
-    {
-        if (strstr(sName, ".mtl") == 0 && strstr(sName, ".binmtl") == 0)
-        {
-            continue;
-        }
-
-        mtlFilename = sName;
-
-        mtlName = sName;
-        PathUtil::RemoveExtension(mtlName);
-
-        if (FindMaterial(mtlName))
-        {
-            continue;
-        }
-
-        // Load this material as un-removable.
-        _smart_ptr<IMaterial> pMtl = LoadMaterial(mtlName, false, true);
-        if (pMtl)
-        {
-            nCounter++;
-        }
-
-        //This loop can take a few seconds, so we should refresh the loading screen and call the loading tick functions to ensure that no big gaps in coverage occur.
-        SYNCHRONOUS_LOADING_TICK();
-    }
-
-    //GetISystem()->GetIResourceManager()->UnloadLevelCachePak( MTL_LEVEL_CACHE_PAK );
-    PrintMessage("==== Finished loading level Materials: %d  mtls loaded (%d from LevelCache) in %.1f sec ====", nCounter, nInLevelCacheCount, GetCurAsyncTimeSec() - fStartTime);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::PreloadDecalMaterials()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    float fStartTime = GetCurAsyncTimeSec();
-
-    bool bVerboseLogging = GetCVars()->e_StatObjPreload > 1;
-    int nCounter = 0;
-
-    // Wildcards load.
-    CryPathString sPath = PathUtil::Make(CryPathString(MATERIAL_DECALS_FOLDER), CryPathString(MATERIAL_DECALS_SEARCH_WILDCARD));
-    PrintMessage("===== Loading all Decal materials from a folder: %s =====", sPath.c_str());
-
-    AZStd::vector<AZStd::string> mtlFiles;
-    SDirectoryEnumeratorHelper dirHelper;
-    dirHelper.ScanDirectoryRecursive(gEnv->pCryPak, "", MATERIAL_DECALS_FOLDER, MATERIAL_DECALS_SEARCH_WILDCARD, mtlFiles);
-
-    for (int i = 0, num = (int)mtlFiles.size(); i < num; i++)
-    {
-        CryPathString sMtlName{ mtlFiles[i].data(), mtlFiles[i].size() };
-        PathUtil::RemoveExtension(sMtlName);
-
-        if (bVerboseLogging)
-        {
-            CryLog("Preloading Decal Material: %s", sMtlName.c_str());
-        }
-
-        _smart_ptr<IMaterial> pMtl = LoadMaterial(sMtlName.c_str(), false, true); // Load material as non-removable
-        if (pMtl)
-        {
-            nCounter++;
-        }
-    }
-    PrintMessage("==== Finished Loading Decal Materials: %d  mtls loaded in %.1f sec ====", nCounter, GetCurAsyncTimeSec() - fStartTime);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatMan::ShutDown()
-{
-    CryLogAlways("shutting down mat man\n");
-    {
-        AZStd::unique_lock<AZStd::recursive_mutex> lock(m_materialMapMutex);
-
-        m_pXmlParser = 0;
-        
-        m_mtlNameMap.clear();
-        m_pendingMaterialLoads.clear();
-    }
-
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_nonRemovablesMutex);
-        stl::free_container(m_nonRemovables);
-    }
-
-    // Free default materials
-    m_pDefaultMtl = nullptr;
-    m_pDefaultTerrainLayersMtl = nullptr;
-    m_pNoDrawMtl = nullptr;
-    m_pDefaultHelperMtl = nullptr;
-    m_pDefaultLayersMtl = nullptr; 
-
- 
-
-    m_pSurfaceTypeManager->RemoveAll();
-    m_bInitialized = false;
-}
-
-
-void CMatMan::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_pDefaultMtl);
-    pSizer->AddObject(m_pDefaultLayersMtl);
-    pSizer->AddObject(m_pDefaultTerrainLayersMtl);
-    pSizer->AddObject(m_pNoDrawMtl);
-    pSizer->AddObject(m_pDefaultHelperMtl);
-    pSizer->AddObject(m_pSurfaceTypeManager);
-    pSizer->AddObject(m_pXmlParser);
-
-    pSizer->AddObject(m_mtlNameMap);
-    pSizer->AddObject(m_pendingMaterialLoads);
-    pSizer->AddObject(m_nonRemovables);
-}
-
-void CMatMan::UpdateShaderItems()
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-
-    for (MtlNameMap::iterator iter = m_mtlNameMap.begin(); iter != m_mtlNameMap.end(); ++iter)
-    {
-        CMatInfo* pMaterial = static_cast<CMatInfo*>(iter->second.get());
-        pMaterial->UpdateShaderItems();
-    }
-}
-
-void CMatMan::RefreshMaterialRuntime()
-{
-    RefreshShaderResourceConstants();
-}
-
-void CMatMan::RefreshShaderResourceConstants()
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_materialMapMutex);
-
-    for (MtlNameMap::iterator iter = m_mtlNameMap.begin(); iter != m_mtlNameMap.end(); ++iter)
-    {
-        CMatInfo* pMaterial = static_cast<CMatInfo*>(iter->second.get());
-        pMaterial->RefreshShaderResourceConstants();
-    }
-}
-
-// override from LegacyAssetEventBus::Handler
-// Notifies listeners that a file changed
-void CMatMan::OnFileChanged(AZStd::string assetPath)
-{
-    _smart_ptr<IMaterial> mat = FindMaterial(assetPath.c_str());
-
-    //Reload material pointer in place if the material is found
-    if (mat)
-    {
-        ReloadMaterial(mat);
-    }
-}
-
-void CMatMan::OnFileRemoved(AZStd::string assetPath)
-{
-    _smart_ptr<IMaterial> mat = FindMaterial(assetPath.c_str());
-
-    //Reload the material in place to a place holder
-    if (mat)
-    {
-        Unregister(mat);
-        CreateMaterialPlaceholder(mat->GetName(), mat->GetFlags(), szDefaultSolid, mat);
-    }
-}
-
diff --git a/Code/CryEngine/Cry3DEngine/MatMan.h b/Code/CryEngine/Cry3DEngine/MatMan.h
deleted file mode 100644
index 6706471f70..0000000000
--- a/Code/CryEngine/Cry3DEngine/MatMan.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_MATMAN_H
-#define CRYINCLUDE_CRY3DENGINE_MATMAN_H
-#pragma once
-
-#include "Cry3DEngineBase.h"
-#include "SurfaceTypeManager.h"
-#include <CryThreadSafeRendererContainer.h>
-#include "MaterialHelpers.h"
-#include <AzCore/std/parallel/atomic.h>
-#include <AzCore/std/parallel/condition_variable.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-// forward declarations.
-struct IMaterial;
-struct ISurfaceType;
-struct ISurfaceTypeManager;
-class CMatInfo;
-
-class ManualResetEvent
-{
-public:
-    ManualResetEvent()
-        : m_flag(false),
-        m_mutex(),
-        m_conditionVariable()
-    {
-    }
-
-    void Wait()
-    {
-        AZStd::unique_lock<AZStd::mutex> lock(m_mutex);
-        m_conditionVariable.wait(lock, [this]
-        {
-            return m_flag == true;
-        });
-    }
-
-    void Set()
-    {
-        {
-            AZStd::unique_lock<AZStd::mutex> lock(m_mutex);
-            m_flag = true;
-        }
-
-        m_conditionVariable.notify_all();
-    }
-
-    void Unset()
-    {
-        AZStd::unique_lock<AZStd::mutex> lock(m_mutex);
-        m_flag = false;
-    }
-
-    bool IsSet() const
-    {
-        AZStd::unique_lock<AZStd::mutex> lock(m_mutex);
-        return m_flag;
-    }
-
-private:
-    bool m_flag;
-    mutable AZStd::mutex m_mutex;
-    AZStd::condition_variable m_conditionVariable;
-};
-
-class UniqueManualEvent
-{
-public:
-    UniqueManualEvent(ManualResetEvent* manualResetEvent, bool hasControl)
-        : m_manualResetEvent(manualResetEvent),
-        m_hasControl(hasControl)
-    {
-
-    }
-
-    //! Indicates if the current thread has control of the event and is blocking other threads from proceeding
-    bool HasControl() const
-    {
-        return m_hasControl;
-    }
-
-    void Set()
-    {
-        if (m_hasControl)
-        {
-            m_manualResetEvent->Set();
-            m_hasControl = false;
-        }
-    }
-
-    ~UniqueManualEvent()
-    {
-        Set();
-    }
-
-private:
-    bool m_hasControl;
-    ManualResetEvent* m_manualResetEvent;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// CMatMan is a material manager class.
-//
-//////////////////////////////////////////////////////////////////////////
-class CMatMan
-    : public IMaterialManager
-    , public Cry3DEngineBase
-    , public AzFramework::LegacyAssetEventBus::Handler
-{
-public:
-    CMatMan();
-    virtual ~CMatMan();
-
-    void ShutDown();
-
-    // interface IMaterialManager --------------------------------------------------------
-
-    virtual _smart_ptr<IMaterial> CreateMaterial(const char* sMtlName, int nMtlFlags = 0);
-    virtual _smart_ptr<IMaterial> FindMaterial(const char* sMtlName) const;
-    virtual _smart_ptr<IMaterial> LoadMaterial(const char* sMtlName, bool bMakeIfNotFound = true, bool bNonremovable = false, unsigned long nLoadingFlags = 0);
-    virtual _smart_ptr<IMaterial> LoadMaterialFromXml(const char* sMtlName, XmlNodeRef mtlNode);
-    virtual void ReloadMaterial(_smart_ptr<IMaterial> pMtl);
-    virtual void SetListener(IMaterialManagerListener* pListener) { m_pListener = pListener; };
-    virtual _smart_ptr<IMaterial> GetDefaultMaterial();
-    virtual _smart_ptr<IMaterial> GetDefaultTerrainLayerMaterial()
-    {
-        if (!m_bInitialized)
-        {
-            InitDefaults();
-        }
-        return m_pDefaultTerrainLayersMtl;
-    }
-    virtual _smart_ptr<IMaterial> GetDefaultLayersMaterial();
-    virtual _smart_ptr<IMaterial> GetDefaultHelperMaterial();
-    virtual ISurfaceType* GetSurfaceTypeByName(const char* sSurfaceTypeName, const char* sWhy = NULL);
-    virtual int GetSurfaceTypeIdByName(const char* sSurfaceTypeName, const char* sWhy = NULL);
-    virtual ISurfaceType* GetSurfaceType(int nSurfaceTypeId, const char* sWhy = NULL)
-    {
-        return m_pSurfaceTypeManager->GetSurfaceTypeFast(nSurfaceTypeId, sWhy);
-    }
-    virtual ISurfaceTypeManager* GetSurfaceTypeManager() { return m_pSurfaceTypeManager; }
-
-    _smart_ptr<IMaterial> LoadCGFMaterial(CMaterialCGF* pMaterialCGF, const char* sCgfFilename, unsigned long nLoadingFlags = 0) override;
-    virtual _smart_ptr<IMaterial> CloneMaterial(_smart_ptr<IMaterial> pMtl, int nSubMtl = -1);
-    virtual _smart_ptr<IMaterial> CloneMultiMaterial(_smart_ptr<IMaterial> pMtl, const char* sSubMtlName = 0);
-    virtual void GetLoadedMaterials(AZStd::vector<_smart_ptr<IMaterial>>* pData, uint32& nObjCount) const;
-
-    virtual bool SaveMaterial(XmlNodeRef mtlNode, _smart_ptr<IMaterial> pMtl);
-    virtual void CopyMaterial(_smart_ptr<IMaterial> pMtlSrc, _smart_ptr<IMaterial> pMtlDest, EMaterialCopyFlags flags);
-
-    virtual void RenameMaterial(_smart_ptr<IMaterial> pMtl, const char* sNewName);
-    virtual void RefreshMaterialRuntime();
-    // ------------------------------------------------------------------------------------
-
-    void InitDefaults();
-
-    void PreloadLevelMaterials();
-    void DoLoadSurfaceTypesInInit(bool doLoadSurfaceTypesInInit);
-
-    void UpdateShaderItems();
-    void RefreshShaderResourceConstants();
-
-    // Load all known game decal materials.
-    void PreloadDecalMaterials();
-
-    void SetSketchMode(int mode);
-    int  GetSketchMode() { return e_sketch_mode; }
-    void SetTexelDensityDebug(int mode);
-    int  GetTexelDensityDebug() { return e_texeldensity; }
-
-    //////////////////////////////////////////////////////////////////////////
-    ISurfaceType* GetSurfaceTypeFast(int nSurfaceTypeId, const char* sWhy = NULL) { return m_pSurfaceTypeManager->GetSurfaceTypeFast(nSurfaceTypeId, sWhy); }
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-
-private: // -----------------------------------------------------------------------------
-    friend class CMatInfo;
-    bool Unregister(_smart_ptr<IMaterial> pMat, bool deleteEditorMaterial = true);
-
-    _smart_ptr<IMaterial> CreateMaterialPlaceholder(const char* materialName, int nMtlFlags, const char* textureName, _smart_ptr<IMaterial> existingMtl = nullptr);
-
-    bool LoadMaterialShader(_smart_ptr<IMaterial> pMtl, _smart_ptr<IMaterial> pParentMtl, const char* sShader, uint64 nShaderGenMask, SInputShaderResources& sr, XmlNodeRef& publicsNode);
-    bool LoadMaterialLayerSlot(uint32 nSlot, _smart_ptr<IMaterial> pMtl, const char* szShaderName, SInputShaderResources& pBaseResources, XmlNodeRef& pPublicsNode, uint8 nLayerFlags);
-
-    void ParsePublicParams(SInputShaderResources& sr, XmlNodeRef paramsNode);
-    AZStd::string UnifyName(const char* sMtlName) const;
-    // Can be called after material creation and initialization, to inform editor that new material in engine exist.
-    // Only used internally.
-    void NotifyCreateMaterial(_smart_ptr<IMaterial> pMtl);
-    // Make a valid material from the XML node.
-    _smart_ptr<IMaterial> MakeMaterialFromXml(const AZStd::string& sMtlName, XmlNodeRef node, bool bForcePureChild, uint16 sortPrio = 0, _smart_ptr<IMaterial> pExistingMtl = 0, unsigned long nLoadingFlags = 0, _smart_ptr<IMaterial> pParentMtl = 0);
-
-    template<typename T>
-    UniqueManualEvent CheckMaterialCache(const AZStd::string& name, T& cachedMaterial);
-
-    _smart_ptr<IMaterial> LoadMaterialInternal(const char* sMtlName, bool bMakeIfNotFound, bool bNonremovable, unsigned long nLoadingFlags);
-
-    // override from LegacyAssetEventBus::Handler
-    // Notifies listeners that a file changed
-    void OnFileChanged(AZStd::string assetPath) override;
-    void OnFileRemoved(AZStd::string assetPath) override;
-private:
-    typedef AZStd::unordered_map<AZStd::string, _smart_ptr<IMaterial> > MtlNameMap;
-
-    MtlNameMap                                                  m_mtlNameMap;                                   //
-
-    IMaterialManagerListener*           m_pListener;                                     //
-    _smart_ptr<IMaterial>               m_pDefaultMtl;                              //
-    _smart_ptr<IMaterial>               m_pDefaultLayersMtl;                    //
-    _smart_ptr<IMaterial>               m_pDefaultTerrainLayersMtl;     //
-    _smart_ptr<IMaterial>               m_pNoDrawMtl;                                   //
-    _smart_ptr<IMaterial>               m_pDefaultHelperMtl;
-
-    std::vector<_smart_ptr<CMatInfo> >  m_nonRemovables;                            //
-
-    CSurfaceTypeManager*                m_pSurfaceTypeManager;               //
-
-    //////////////////////////////////////////////////////////////////////////
-    // Cached XML parser.
-    _smart_ptr<IXmlParser> m_pXmlParser;
-
-    bool m_bInitialized;
-    bool m_bLoadSurfaceTypesInInit;
-
-    mutable AZStd::mutex m_nonRemovablesMutex;
-
-    mutable AZStd::recursive_mutex m_materialMapMutex;
-    AZStd::unordered_map<AZStd::string, AZStd::unique_ptr<ManualResetEvent>> m_pendingMaterialLoads;
-
-public:
-    // Global namespace "instance", not a class "instance", no member-variables, only const functions;
-    // Used to encapsulate the material-definition/io into Cry3DEngine (and make it plugable that way).
-    static MaterialHelpers s_materialHelpers;
-
-    static int e_sketch_mode;
-    static int e_lowspec_mode;
-    static int e_pre_sketch_spec;
-    static int e_texeldensity;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_MATMAN_H
-
diff --git a/Code/CryEngine/Cry3DEngine/Material.cpp b/Code/CryEngine/Cry3DEngine/Material.cpp
deleted file mode 100644
index b0853db518..0000000000
--- a/Code/CryEngine/Cry3DEngine/Material.cpp
+++ /dev/null
@@ -1,1455 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "MatMan.h"
-#include <IRenderer.h>
-#include "VisAreas.h"
-
-DEFINE_INTRUSIVE_LINKED_LIST(CMatInfo)
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialLayer::SetShaderItem(const _smart_ptr<IMaterial> pParentMtl, const SShaderItem& pShaderItem)
-{
-    assert(pParentMtl && "CMaterialLayer::SetShaderItem invalid material");
-
-    if (pShaderItem.m_pShader)
-    {
-        pShaderItem.m_pShader->AddRef();
-    }
-
-    if (pShaderItem.m_pShaderResources)
-    {
-        pShaderItem.m_pShaderResources->AddRef();
-        CMatInfo* pParentMatInfo = (CMatInfo*)(pParentMtl.get());
-        pShaderItem.m_pShaderResources->SetMaterialName(pParentMatInfo->m_sUniqueMaterialName);
-    }
-
-    gEnv->pRenderer->ClearShaderItem(&m_pShaderItem);
-    SAFE_RELEASE(m_pShaderItem.m_pShader);
-    SAFE_RELEASE(m_pShaderItem.m_pShaderResources);
-
-    m_pShaderItem = pShaderItem;
-    gEnv->pRenderer->UpdateShaderItem(&m_pShaderItem, nullptr);
-}
-//////////////////////////////////////////////////////////////////////////
-void CMaterialLayer::GetMemoryUsage(ICrySizer* pSizer)
-{
-    SIZER_COMPONENT_NAME(pSizer, "MaterialLayer");
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-//////////////////////////////////////////////////////////////////////////
-size_t CMaterialLayer::GetResourceMemoryUsage(ICrySizer* pSizer)
-{
-    size_t nResourceMemory(0);
-    // Pushing some context to use the Macro.
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Textures");
-
-        IRenderShaderResources* piResources(m_pShaderItem.m_pShaderResources);
-        if (piResources)
-        {
-            //////////////////////////////////////////////////////////////////////////
-            // Texture
-            for (size_t nCount = 0; nCount < EFTT_MAX; ++nCount)
-            {
-                SEfResTexture*  piTextureResource(piResources->GetTextureResource(nCount));
-                if (piTextureResource)
-                {
-                    ITexture* piTexture = piTextureResource->m_Sampler.m_pITex;
-                    if (piTexture)
-                    {
-                        SIZER_COMPONENT_NAME(pSizer, "MemoryTexture");
-                        size_t nCurrentResourceMemoryUsage = piTexture->GetDataSize();
-                        nResourceMemory += nCurrentResourceMemoryUsage;
-                        pSizer->AddObject(piTexture, nCurrentResourceMemoryUsage);
-
-                        IResourceCollector* pColl = pSizer->GetResourceCollector();
-                        if (pColl)
-                        {
-                            pColl->AddResource(piTexture->GetName(), nCurrentResourceMemoryUsage);
-                        }
-                    }
-                }
-            }
-            //////////////////////////////////////////////////////////////////////////
-        }
-    }
-    return nResourceMemory;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMatInfo::CMatInfo()
-{
-    m_nRefCount = 0;
-    m_Flags = 0;
-
-    m_nSurfaceTypeId = 0;
-
-    m_pMaterialLayers = 0;
-
-    m_ucDefautMappingAxis = 0;
-    m_fDefautMappingScale = 1.f;
-
-#ifdef SUPPORT_MATERIAL_SKETCH
-    m_pPreSketchShader = 0;
-    m_nPreSketchTechnique = 0;
-#endif
-
-#ifdef SUPPORT_MATERIAL_EDITING
-    m_pUserData = NULL;
-#endif
-
-    m_pActiveLayer = NULL;
-
-    m_shaderName = "Non-Initialized Shader name";
-
-    ZeroStruct(m_streamZoneInfo);
-
-    // Used to know when a .dccmtl file has been changed,
-    // requiring the source material to be updated
-    m_dccMaterialHash = 0;
-
-    m_isDirty = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMatInfo::~CMatInfo()
-{
-    ShutDown();
-}
-
-void CMatInfo::AddRef()
-{
-    CryInterlockedIncrement(&m_nRefCount);
-}
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::Release()
-{
-    if (CryInterlockedDecrement(&m_nRefCount) <= 0)
-    {
-        delete this;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::ShutDown()
-{
-    SAFE_DELETE(m_pMaterialLayers);
-
-    ReleaseCurrentShaderItem();
-    m_subMtls.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IMaterialHelpers& CMatInfo::GetMaterialHelpers()
-{
-    return GetMatMan()->s_materialHelpers;
-}
-
-IMaterialManager* CMatInfo::GetMaterialManager()
-{
-    return GetMatMan();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetName(const char* sName)
-{
-    m_sMaterialName = sName;
-    m_sUniqueMaterialName = m_sMaterialName;
-    if (m_shaderItem.m_pShaderResources)
-    {
-        m_shaderItem.m_pShaderResources->SetMaterialName(m_sUniqueMaterialName); // Only for correct warning message purposes.
-    }
-    if (m_Flags & MTL_FLAG_MULTI_SUBMTL)
-    {
-        for (int i = 0, num = m_subMtls.size(); i < num; i++)
-        {
-            if (m_subMtls[i] && (m_subMtls[i]->m_Flags & MTL_FLAG_PURE_CHILD))
-            {
-                m_subMtls[i]->m_sUniqueMaterialName = m_sMaterialName;
-                if (m_subMtls[i]->m_shaderItem.m_pShaderResources)
-                {
-                    m_subMtls[i]->m_shaderItem.m_pShaderResources->SetMaterialName(m_sUniqueMaterialName);
-                }
-            }
-
-            if (m_subMtls[i] && strstr(m_subMtls[i]->m_sUniqueMaterialName, MTL_SPECIAL_NAME_RAYCAST_PROXY) != 0)
-            {
-                m_subMtls[i]->m_Flags |= MTL_FLAG_RAYCAST_PROXY;
-                m_subMtls[i]->m_Flags |= MTL_FLAG_NODRAW;
-            }
-        }
-    }
-
-    if (strstr(sName, MTL_SPECIAL_NAME_COLLISION_PROXY) != 0 || strstr(sName, MTL_SPECIAL_NAME_COLLISION_PROXY_VEHICLE) != 0)
-    {
-        m_Flags |= MTL_FLAG_COLLISION_PROXY;
-    }
-    else if (strstr(sName, MTL_SPECIAL_NAME_RAYCAST_PROXY) != 0)
-    {
-        m_Flags |= MTL_FLAG_RAYCAST_PROXY;
-        m_Flags |= MTL_FLAG_NODRAW;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatInfo::IsDefault()
-{
-    return this == GetMatMan()->GetDefaultMaterial();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatInfo::IsMaterialGroup() const
-{
-    return (m_Flags & MTL_FLAG_MULTI_SUBMTL) != 0 || m_subMtls.size() > 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatInfo::IsSubMaterial() const
-{
-    return (m_Flags & MTL_FLAG_PURE_CHILD) != 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::UpdateFlags()
-{
-    m_Flags &= ~(MTL_FLAG_REQUIRE_FORWARD_RENDERING | MTL_FLAG_REQUIRE_NEAREST_CUBEMAP);
-
-    if (m_shaderItem.m_pShader)
-    {
-        IRenderShaderResources* pRendShaderResources = m_shaderItem.m_pShaderResources;
-
-        const bool bAlphaBlended = (m_shaderItem.m_pShader->GetFlags() & (EF_NODRAW | EF_DECAL)) || (pRendShaderResources && pRendShaderResources->IsTransparent());
-        const bool bIsHair = (m_shaderItem.m_pShader->GetFlags2() & EF2_HAIR) != 0;
-        const bool bIsGlass = m_shaderItem.m_pShader->GetShaderType() == eST_Glass;
-        const bool bIsWater = m_shaderItem.m_pShader->GetShaderType() == eST_Water;
-        const bool bIsEye = strcmp(m_shaderItem.m_pShader->GetName(), "Eye") == 0;
-        const bool bIsFur = m_shaderItem.m_pShader->GetShaderDrawType() == eSHDT_Fur;
-
-        if (bAlphaBlended && !(m_shaderItem.m_pShader->GetFlags2() & EF2_NODRAW) && !(m_shaderItem.m_pShader->GetFlags() & EF_DECAL))
-        {
-            m_Flags |= MTL_FLAG_REQUIRE_FORWARD_RENDERING;
-        }
-        else if (bIsHair || bIsGlass || bIsFur)
-        {
-            m_Flags |= MTL_FLAG_REQUIRE_FORWARD_RENDERING;
-        }
-
-        if ((bAlphaBlended || bIsHair || bIsGlass || bIsWater || bIsEye) &&
-            (pRendShaderResources) &&
-            (pRendShaderResources->GetTextureResource(EFTT_ENV)) &&
-            (pRendShaderResources->GetTextureResource(EFTT_ENV)->m_Sampler.m_eTexType == eTT_NearestCube))
-        {
-            m_Flags |= MTL_FLAG_REQUIRE_NEAREST_CUBEMAP;
-        }
-
-        // Make sure to refresh sectors
-        static int nLastUpdateFrameId = 0;
-        if (gEnv->IsEditing() && GetVisAreaManager() && nLastUpdateFrameId != GetRenderer()->GetFrameID())
-        {
-            nLastUpdateFrameId = GetRenderer()->GetFrameID();
-        }
-    }
-}
-
-void CMatInfo::ReleaseCurrentShaderItem()
-{
-    // Clear the renderer's shader resources to nullptr before releasing the shader item so there are no dangling pointers
-    gEnv->pRenderer->ClearShaderItem(&m_shaderItem);
-    SAFE_RELEASE(m_shaderItem.m_pShader);
-    SAFE_RELEASE(m_shaderItem.m_pShaderResources);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetShaderItem(const SShaderItem& _ShaderItem)
-{
-    if (_ShaderItem.m_pShader)
-    {
-        _ShaderItem.m_pShader->AddRef();
-    }
-    if (_ShaderItem.m_pShaderResources)
-    {
-        _ShaderItem.m_pShaderResources->AddRef();
-        _ShaderItem.m_pShaderResources->SetMaterialName(m_sUniqueMaterialName);
-    }
-
-    ReleaseCurrentShaderItem();
-
-    m_shaderItem = _ShaderItem;
-    gEnv->pRenderer->UpdateShaderItem(&m_shaderItem, this);
-
-    UpdateFlags();
-
-    int sketchMode = m_pMatMan->GetSketchMode();
-    if (sketchMode)
-    {
-        SetSketchMode(sketchMode);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::AssignShaderItem(const SShaderItem& _ShaderItem)
-{
-    //if (_ShaderItem.m_pShader)
-    //  _ShaderItem.m_pShader->AddRef();
-    if (_ShaderItem.m_pShaderResources)
-    {
-        _ShaderItem.m_pShaderResources->SetMaterialName(m_sUniqueMaterialName);
-    }
-
-    ReleaseCurrentShaderItem();
-
-    m_shaderItem = _ShaderItem;
-    gEnv->pRenderer->UpdateShaderItem(&m_shaderItem, this);
-
-    UpdateFlags();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetSurfaceType(const char* sSurfaceTypeName)
-{
-    m_nSurfaceTypeId = 0;
-
-    ISurfaceType* pSurfaceType = GetMatMan()->GetSurfaceTypeByName(sSurfaceTypeName, m_sMaterialName);
-    if (pSurfaceType)
-    {
-        m_nSurfaceTypeId = pSurfaceType->GetId();
-    }
-}
-
-ISurfaceType* CMatInfo::GetSurfaceType()
-{
-    return GetMatMan()->GetSurfaceType(m_nSurfaceTypeId, m_sMaterialName);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetSubMtlCount(int numSubMtl)
-{
-    AUTO_LOCK(GetSubMaterialResizeLock());
-    if (numSubMtl > 0)
-    {
-        m_Flags |= MTL_FLAG_MULTI_SUBMTL;
-    }
-    else if(numSubMtl == 0)
-    {
-        m_Flags &= ~MTL_FLAG_MULTI_SUBMTL;
-    }
-    else
-    {
-        AZ_Assert(false, "SetSubMtlCount called with negative value for material %s.", m_sMaterialName.c_str());
-        return;
-    }
-
-    m_subMtls.resize(numSubMtl);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatInfo::IsStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES], IRenderMesh* pRenderMesh) const
-{
-    if (pRenderMesh)
-    {
-        TRenderChunkArray* pChunks = &pRenderMesh->GetChunks();
-
-        if (pChunks != NULL)
-        {
-            for (uint32 i = 0, size = pChunks->size(); i < size; i++)
-            {
-                if (!AreChunkTexturesStreamedIn(&(*pChunks)[i], nMinPrecacheRoundIds))
-                {
-                    return false;
-                }
-            }
-        }
-
-        pChunks = &pRenderMesh->GetChunksSkinned();
-        for (uint32 i = 0, size = pChunks->size(); i < size; i++)
-        {
-            if (!AreChunkTexturesStreamedIn(&(*pChunks)[i], nMinPrecacheRoundIds))
-            {
-                return false;
-            }
-        }
-    }
-    else
-    {
-        if (!AreChunkTexturesStreamedIn(NULL, nMinPrecacheRoundIds))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CMatInfo::AreChunkTexturesStreamedIn(CRenderChunk* pRenderChunk, const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES]) const
-{
-    const CMatInfo* pMaterial = this;
-
-    if (pRenderChunk && pRenderChunk->pRE && pRenderChunk->nNumIndices && pRenderChunk->nNumVerts)
-    { // chunk is defined and have valid geometry
-        if (pRenderChunk->m_nMatID < (uint16)m_subMtls.size())
-        {
-            pMaterial = (CMatInfo*)m_subMtls[pRenderChunk->m_nMatID];
-        }
-
-        if (pMaterial != NULL)
-        {
-            return pMaterial->AreTexturesStreamedIn(nMinPrecacheRoundIds);
-        }
-    }
-    else if (!pRenderChunk)
-    {
-        if (!AreTexturesStreamedIn(nMinPrecacheRoundIds))
-        {
-            return false;
-        }
-
-        for (int nSubMtl = 0; nSubMtl < (int)m_subMtls.size(); ++nSubMtl)
-        {
-            pMaterial = m_subMtls[nSubMtl];
-
-            if (pMaterial != NULL)
-            {
-                if (!pMaterial->AreTexturesStreamedIn(nMinPrecacheRoundIds))
-                {
-                    return false;
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-bool CMatInfo::AreTexturesStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES]) const
-{
-    // Check this material
-    if (IRenderShaderResources* pShaderResources = GetShaderItem().m_pShaderResources)
-    {
-        for (auto iter = pShaderResources->GetTexturesResourceMap()->begin(); iter != pShaderResources->GetTexturesResourceMap()->end(); ++iter)
-        {
-            SEfResTexture*  pTextureResource = &(iter->second);
-            if (ITexture*   pTexture = pTextureResource->m_Sampler.m_pITex)
-            {
-                if (!pTexture->IsStreamedIn(nMinPrecacheRoundIds))
-                {
-                    return false;
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetSubMtl(int nSlot, _smart_ptr<IMaterial> pMtl)
-{
-    if (nSlot < 0 || nSlot >= static_cast<int>(m_subMtls.size()))
-    {
-        AZ_Error("Rendering", false, "SetSubMtl inserting material '%s' outside the range of m_subMtls in '%s'. Call SetSubMtlCount first to increase the size of m_subMtls.", pMtl->GetName(), m_sMaterialName.c_str());
-        return;
-    }
-    if (pMtl && pMtl->IsMaterialGroup())
-    {
-        AZ_Error("Rendering", false, "SetSubMtl attempting to insert a material group '%s' as a sub-material of '%s'. Only individual materials can be sub-materials.", pMtl->GetName(), m_sMaterialName.c_str());
-        return;
-    }
-    m_subMtls[nSlot] = (CMatInfo*)pMtl.get();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetLayerCount(uint32 nCount)
-{
-    if (!m_pMaterialLayers)
-    {
-        m_pMaterialLayers = new MatLayers;
-    }
-
-    m_pMaterialLayers->resize(nCount);
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 CMatInfo::GetLayerCount() const
-{
-    if (m_pMaterialLayers)
-    {
-        return (uint32) m_pMaterialLayers->size();
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetLayer(uint32 nSlot, IMaterialLayer* pLayer)
-{
-    assert(m_pMaterialLayers);
-    assert(nSlot < (uint32) m_pMaterialLayers->size());
-
-    if (m_pMaterialLayers && pLayer && nSlot < (uint32) m_pMaterialLayers->size())
-    {
-        (*m_pMaterialLayers)[nSlot] = static_cast< CMaterialLayer*>(pLayer);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-const IMaterialLayer* CMatInfo::GetLayer(uint8 nLayersMask, [[maybe_unused]] uint8 nLayersUsageMask) const
-{
-    if (m_pMaterialLayers && nLayersMask)
-    {
-        int nSlotCount = m_pMaterialLayers->size();
-        for (int nSlot = 0; nSlot < nSlotCount; ++nSlot)
-        {
-            CMaterialLayer* pLayer = static_cast< CMaterialLayer*>((*m_pMaterialLayers)[nSlot]);
-
-            if (nLayersMask & (1 << nSlot))
-            {
-                if (pLayer)
-                {
-                    m_pActiveLayer = pLayer;
-                    return m_pActiveLayer;
-                }
-
-                m_pActiveLayer = 0;
-
-                return 0;
-            }
-        }
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const IMaterialLayer* CMatInfo::GetLayer(uint32 nSlot) const
-{
-    if (m_pMaterialLayers && nSlot < (uint32) m_pMaterialLayers->size())
-    {
-        return static_cast< CMaterialLayer*>((*m_pMaterialLayers)[nSlot]);
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IMaterialLayer* CMatInfo::CreateLayer()
-{
-    return new CMaterialLayer;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetUserData([[maybe_unused]] void* pUserData)
-{
-#ifdef SUPPORT_MATERIAL_EDITING
-    m_pUserData = pUserData;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CMatInfo::GetUserData() const
-{
-#ifdef SUPPORT_MATERIAL_EDITING
-    return m_pUserData;
-#else
-    CryFatalError("CMatInfo::GetUserData not supported on this platform");
-    return NULL;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMatInfo::FillSurfaceTypeIds(int pSurfaceIdsTable[])
-{
-    if (m_subMtls.empty() || !(m_Flags & MTL_FLAG_MULTI_SUBMTL))
-    {
-        pSurfaceIdsTable[0] = m_nSurfaceTypeId;
-        return 1; // Not Multi material.
-    }
-    for (int i = 0; i < (int)m_subMtls.size(); i++)
-    {
-        if (m_subMtls[i] != 0)
-        {
-            pSurfaceIdsTable[i] = m_subMtls[i]->m_nSurfaceTypeId;
-        }
-        else
-        {
-            pSurfaceIdsTable[i] = 0;
-        }
-    }
-    return m_subMtls.size();
-}
-
-
-void CMatInfo::Copy(_smart_ptr<IMaterial> pMtlDest, EMaterialCopyFlags flags)
-{
-    CMatInfo* pMatInfo = static_cast<CMatInfo*>(pMtlDest.get());
-    if (flags & MTL_COPY_NAME)
-    {
-        pMatInfo->m_sMaterialName = m_sMaterialName;
-        pMatInfo->m_sUniqueMaterialName = m_sUniqueMaterialName;
-    }
-    pMatInfo->m_nSurfaceTypeId = m_nSurfaceTypeId;
-    pMatInfo->m_Flags = m_Flags;
-
-    if (GetShaderItem().m_pShaderResources)
-    {
-        //
-        SShaderItem& siSrc(GetShaderItem());
-        SInputShaderResources isr(siSrc.m_pShaderResources);
-        //
-        SShaderItem& siDstTex(pMatInfo->GetShaderItem());
-        SInputShaderResources idsTex(siDstTex.m_pShaderResources);
-        if (!(flags & MTL_COPY_TEXTURES))
-        {
-            isr.m_TexturesResourcesMap = idsTex.m_TexturesResourcesMap;
-        }
-        SShaderItem siDst(GetRenderer()->EF_LoadShaderItem(siSrc.m_pShader->GetName(), false, 0, &isr, siSrc.m_pShader->GetGenerationMask()));
-        pMatInfo->AssignShaderItem(siDst);
-        siDst.m_pShaderResources->CloneConstants(siSrc.m_pShaderResources);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<CMatInfo> CMatInfo::Clone()
-{
-    _smart_ptr<CMatInfo> pMatInfo = new CMatInfo;
-
-    pMatInfo->m_sMaterialName = m_sMaterialName;
-    pMatInfo->m_sUniqueMaterialName = m_sUniqueMaterialName;
-    pMatInfo->m_nSurfaceTypeId = m_nSurfaceTypeId;
-    pMatInfo->m_Flags = m_Flags;
-
-    SShaderItem& siSrc(GetShaderItem());
-    SInputShaderResources isr(siSrc.m_pShaderResources);
-
-    SShaderItem siDst(GetRenderer()->EF_LoadShaderItem(siSrc.m_pShader->GetName(), false, 0, &isr, siSrc.m_pShader->GetGenerationMask()));
-    pMatInfo->AssignShaderItem(siDst);
-    siDst.m_pShaderResources->CloneConstants(siSrc.m_pShaderResources);
-
-    // Necessary to delete all the data allocated in the renderer
-    GetRenderer()->EF_ReleaseInputShaderResource(&isr);
-
-    return pMatInfo;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "Material");
-    pSizer->AddObject(this, sizeof(*this));
-
-    if (m_pMaterialLayers)
-    {
-        int n = m_pMaterialLayers->size();
-        for (int i = 0; i < n; i++)
-        {
-            CMaterialLayer* pMaterialLayer = (*m_pMaterialLayers)[i];
-            if (pMaterialLayer)
-            {
-                pMaterialLayer->GetMemoryUsage(pSizer);
-            }
-        }
-    }
-
-    // all sub material
-    {
-        pSizer->AddObject(m_subMtls);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-size_t CMatInfo::GetResourceMemoryUsage(ICrySizer* pSizer)
-{
-    size_t  nTotalResourceMemoryUsage(0);
-
-    if (m_pMaterialLayers)
-    {
-        int n = m_pMaterialLayers->size();
-        for (int i = 0; i < n; i++)
-        {
-            CMaterialLayer* pMaterialLayer = (*m_pMaterialLayers)[i];
-            if (pMaterialLayer)
-            {
-                nTotalResourceMemoryUsage += pMaterialLayer->GetResourceMemoryUsage(pSizer);
-            }
-        }
-    }
-
-    if (m_shaderItem.m_pShaderResources)
-    {
-        nTotalResourceMemoryUsage += m_shaderItem.m_pShaderResources->GetResourceMemoryUsage(pSizer);
-    }
-
-    // all sub material
-    {
-        int iCnt = GetSubMtlCount();
-        for (int i = 0; i < iCnt; ++i)
-        {
-            _smart_ptr<IMaterial>  piMaterial(GetSubMtl(i));
-            if (piMaterial)
-            {
-                nTotalResourceMemoryUsage += piMaterial->GetResourceMemoryUsage(pSizer);
-            }
-        }
-    }
-    return nTotalResourceMemoryUsage;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMatInfo::SetGetMaterialParamFloat(const char* sParamName, float& v, bool bGet, bool allowShaderParam /*= false*/, int materialIndex /*= 0*/)
-{
-    //For a material group, we need to set the param to a sub-material specified by materialIndex
-    if (IsMaterialGroup())
-    {
-        int subMtlCount = GetSubMtlCount();
-        if (materialIndex >= 0 && materialIndex < subMtlCount)
-        {
-            IMaterial* subMtl = GetSubMtl(materialIndex);
-            if (subMtl)
-            {
-                return subMtl->SetGetMaterialParamFloat(sParamName, v, bGet, allowShaderParam);
-            }
-            else
-            {
-                AZ_Error("Rendering", false, "Attempted to access an invalid Sub-Material at index %d.", materialIndex);
-                return false;
-            }
-        }
-        else
-        {
-            AZ_Error("Rendering", false, "Attempted to access an invalid Sub-Material at index %d. %d Materials are available.", materialIndex, subMtlCount);
-            return false;
-        }
-    }
-    else if (materialIndex > 0)
-    {
-        AZ_Warning("Rendering", false, "Setting a parameter on a single Material does not require a Material Index.");
-    }
-
-    //For a single material, we need to make sure it has all the shader resources we need
-    IRenderShaderResources* pRendShaderRes = m_shaderItem.m_pShaderResources;
-    if (!pRendShaderRes)
-    {
-        AZ_Warning("Rendering", false, "Attempted to access params on a Material that has no Shader Resources.");
-        return false;
-    }
-
-    const bool bEmissive = pRendShaderRes->IsEmissive();
-    const bool bTransparent = pRendShaderRes->IsTransparent();
-    bool bOk = GetMaterialHelpers().SetGetMaterialParamFloat(*pRendShaderRes, sParamName, v, bGet);
-
-    if (!bOk && allowShaderParam)
-    {
-        auto& shaderParams = pRendShaderRes->GetParameters();
-
-        if (bGet)
-        {
-            for (int i = 0; i < shaderParams.size(); ++i)
-            {
-                SShaderParam& param = shaderParams[i];
-                if (azstricmp(param.m_Name.c_str(), sParamName) == 0)
-                {
-                    v = 0.0f;
-
-                    switch (param.m_Type)
-                    {
-                    case eType_BOOL:
-                        v = param.m_Value.m_Bool;
-                        bOk = true;
-                        break;
-                    case eType_BYTE:
-                        v = param.m_Value.m_Byte;
-                        bOk = true;
-                        break;
-                    case eType_SHORT:
-                        v = param.m_Value.m_Short;
-                        bOk = true;
-                        break;
-                    case eType_INT:
-                        v = (float)param.m_Value.m_Int;
-                        bOk = true;
-                        break;
-                    case eType_HALF:
-                    case eType_FLOAT:
-                        v = param.m_Value.m_Float;
-                        bOk = true;
-                        break;
-                    default:
-                        AZ_Warning(nullptr, false, "Unsupported param type %d in %s", param.m_Type, AZ_FUNCTION_SIGNATURE);
-                    }
-
-                    break;
-                }
-            }
-        }
-        else
-        {
-            UParamVal val;
-            val.m_Float = v;
-            bOk = SShaderParam::SetParam(sParamName, &shaderParams, val);
-        }
-    }
-
-    if (bOk && m_shaderItem.m_pShader && !bGet)
-    {
-        // since "glow" is a post effect it needs to be updated here
-        // If unit opacity changed, the transparency preprocess flag must be updated.  (This causes SShaderItem::Update() -> SShaderItem::PostLoad(),
-        // updating the transparency preprocess flag (SShaderItem::m_nPreprocessFlags, FB_TRANSPARENT) based on CShaderResources::IsTransparent())
-        if (bEmissive != pRendShaderRes->IsEmissive() ||
-            bTransparent != pRendShaderRes->IsTransparent())
-        {
-            GetRenderer()->ForceUpdateShaderItem(&m_shaderItem, this);
-        }
-
-        pRendShaderRes->UpdateConstants(m_shaderItem.m_pShader);
-    }
-
-    m_isDirty |= (bOk && !bGet);
-
-    return bOk;
-}
-
-bool CMatInfo::SetGetMaterialParamVec3(const char* sParamName, Vec3& v, bool bGet, bool allowShaderParam /*= false*/, int materialIndex /*= 0*/)
-{
-    static const float defaultAlpha = 1.0f;
-
-    Vec4 vec4(v, defaultAlpha);
-    const bool bOk = SetGetMaterialParamVec4(sParamName, vec4, bGet, allowShaderParam, materialIndex);
-
-    if(bOk && bGet)
-    {
-        v = Vec3(vec4);
-    }
-
-    m_isDirty |= (bOk && !bGet);
-
-    return bOk;
-}
-
-bool CMatInfo::SetGetMaterialParamVec4(const char* sParamName, Vec4& v, bool bGet, bool allowShaderParam /*= false*/, int materialIndex /*= 0*/)
-{
-    //For a material group, we need to set the param to a sub-material specified by materialIndex
-    if (IsMaterialGroup())
-    {
-        int subMtlCount = GetSubMtlCount();
-        if (materialIndex >= 0 && materialIndex < subMtlCount)
-        {
-            IMaterial* subMtl = GetSubMtl(materialIndex);
-            if (subMtl)
-            {
-                return subMtl->SetGetMaterialParamVec4(sParamName, v, bGet, allowShaderParam);
-            }
-            else
-            {
-                AZ_Error("Rendering", false, "Attempted to access an invalid Sub-Material at index %d.", materialIndex);
-                return false;
-            }
-        }
-        else
-        {
-            AZ_Error("Rendering", false, "Attempted to access an invalid Sub-Material at index %d. %d Materials are available.", materialIndex, subMtlCount);
-            return false;
-        }
-    }
-    else if (materialIndex > 0)
-    {
-        AZ_Warning("Rendering", false, "Setting a parameter on a single Material does not require a Material Index.");
-    }
-
-    //For a single material, we need to make sure it has all the shader resources we need
-    IRenderShaderResources* pRendShaderRes = m_shaderItem.m_pShaderResources;
-    if (!pRendShaderRes)
-    {
-        AZ_Warning("Rendering", false, "Attempted to access params on a Material that has no Shader Resources.");
-        return false;
-    }
-
-    static const float defaultAlpha = 1.0f;
-
-    // Note we are only passing XYZ to the IMaterialHelpers here because it only deals with with "diffuse", "specular", and "emissive_color", which don't use the W/alpha channel.
-    Vec3 vec3(v);
-    bool bOk = GetMaterialHelpers().SetGetMaterialParamVec3(*pRendShaderRes, sParamName, vec3, bGet);
-    if (bOk && bGet)
-    {
-        v = Vec4(vec3, defaultAlpha);
-    }
-
-    if (!bOk && allowShaderParam)
-    {
-        auto& shaderParams = pRendShaderRes->GetParameters();
-
-        if (bGet)
-        {
-            for (int i = 0; i < shaderParams.size(); ++i)
-            {
-                SShaderParam& param = shaderParams[i];
-                if (azstricmp(param.m_Name.c_str(), sParamName) == 0)
-                {
-                    if (param.m_Type == eType_VECTOR)
-                    {
-                        v = Vec4(param.m_Value.m_Vector[0], param.m_Value.m_Vector[1], param.m_Value.m_Vector[2], defaultAlpha);
-                        bOk = true;
-                    }
-                    else if (param.m_Type == eType_FCOLOR)
-                    {
-                        v = Vec4(param.m_Value.m_Color[0], param.m_Value.m_Color[1], param.m_Value.m_Color[2], param.m_Value.m_Color[3]);
-                        bOk = true;
-                    }
-                    else
-                    {
-                        AZ_Warning(nullptr, false, "Unsupported param type %d in %s", param.m_Type, AZ_FUNCTION_SIGNATURE);
-                    }
-                }
-            }
-        }
-        else
-        {
-            UParamVal val;
-            val.m_Color[0] = v.x;
-            val.m_Color[1] = v.y;
-            val.m_Color[2] = v.z;
-            val.m_Color[3] = v.w;
-
-            bOk = SShaderParam::SetParam(sParamName, &shaderParams, val);
-        }
-    }
-
-    if (bOk && m_shaderItem.m_pShader && !bGet)
-    {
-        pRendShaderRes->UpdateConstants(m_shaderItem.m_pShader);
-    }
-
-    m_isDirty |= (bOk && !bGet);
-
-    return bOk;
-}
-
-void CMatInfo::SetDirty(bool dirty /*= true*/)
-{
-    m_isDirty = dirty;
-}
-
-bool CMatInfo::IsDirty() const
-{
-    bool isChildrenDirty = false;
-    if (IsMaterialGroup())
-    {
-        for (int i = 0 ; i <  m_subMtls.size(); i ++)
-        {
-            if (m_subMtls[i])
-            {
-                if (m_subMtls[i]->IsMaterialGroup())
-                {
-                    AZ_Assert(!m_subMtls[i]->IsMaterialGroup(), "Sub-material '%s' in material '%s' is a material group. Material groups cannot be sub-materials. This could lead to a cycle and infinite recursion in CMatInfo::IsDirty().", m_subMtls[i]->GetName(), m_sMaterialName.c_str());
-                    // Exit early to prevent a possible infinite recursion.
-                    // Return true to conservatively indicate that this material should be re-loaded
-                    return true;
-                }
-                isChildrenDirty |= m_subMtls[i]->IsDirty();
-            }
-        }
-    }
-    return m_isDirty | isChildrenDirty;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetSketchMode([[maybe_unused]] int mode)
-{
-#ifdef SUPPORT_MATERIAL_SKETCH
-    if (mode == 0)
-    {
-        if (m_pPreSketchShader)
-        {
-            m_shaderItem.m_pShader = m_pPreSketchShader;
-            m_shaderItem.m_nTechnique = m_nPreSketchTechnique;
-            m_pPreSketchShader = 0;
-            m_nPreSketchTechnique = 0;
-        }
-    }
-    else
-    {
-        if (m_shaderItem.m_pShader && m_shaderItem.m_pShader != m_pPreSketchShader)
-        {
-            EShaderType shaderType = m_shaderItem.m_pShader->GetShaderType();
-
-            //      nGenerationMask = (uint32)m_shaderItem.m_pShader->GetGenerationMask();
-
-            // Do not replace this shader types.
-            switch (shaderType)
-            {
-            case eST_Shadow:
-            case eST_Water:
-            case eST_FX:
-            case eST_PostProcess:
-            case eST_HDR:
-            case eST_Sky:
-                // For this shaders do not replace them.
-                return;
-            }
-        }
-
-        if (!m_pPreSketchShader)
-        {
-            m_pPreSketchShader = m_shaderItem.m_pShader;
-            m_nPreSketchTechnique = m_shaderItem.m_nTechnique;
-        }
-
-        //m_shaderItem.m_pShader = ((CMatMan*)GetMatMan())->GetDefaultHelperMaterial()->GetShaderItem().m_pShader;
-        if (mode == 1)
-        {
-            m_shaderItem.m_pShader = gEnv->pRenderer->EF_LoadShader("Sketch");
-            m_shaderItem.m_nTechnique = 0;
-        }
-        else if (mode == 2)
-        {
-            m_shaderItem.m_pShader = gEnv->pRenderer->EF_LoadShader("Sketch.Fast");
-            m_shaderItem.m_nTechnique = 0;
-        }
-        else if (mode == 4)
-        {
-            SShaderItem tmp = gEnv->pRenderer->EF_LoadShaderItem("Sketch.TexelsPerMeter", false);
-            m_shaderItem.m_pShader = tmp.m_pShader;
-            m_shaderItem.m_nTechnique = tmp.m_nTechnique;
-        }
-
-        if (m_shaderItem.m_pShader)
-        {
-            m_shaderItem.m_pShader->AddRef();
-        }
-    }
-    for (int i = 0; i < (int)m_subMtls.size(); i++)
-    {
-        if (m_subMtls[i])
-        {
-            m_subMtls[i]->SetSketchMode(mode);
-        }
-    }
-#endif
-}
-
-void CMatInfo::SetTexelDensityDebug([[maybe_unused]] int mode)
-{
-#ifdef SUPPORT_MATERIAL_SKETCH
-    if (m_shaderItem.m_pShader)
-    {
-        EShaderType shaderType = m_pPreSketchShader ? m_pPreSketchShader->GetShaderType() : m_shaderItem.m_pShader->GetShaderType();
-
-        switch (shaderType)
-        {
-        case eST_Shadow:
-        case eST_Water:
-        case eST_FX:
-        case eST_PostProcess:
-        case eST_HDR:
-        case eST_Sky:
-            // For this shaders do not replace them.
-            mode = 0;
-            break;
-        default:
-            if (mode == 1 || mode == 2)
-            {
-                break;
-            }
-            mode = 0;
-            break;
-        }
-
-        if (mode == 0)
-        {
-            if (m_pPreSketchShader)
-            {
-                m_shaderItem.m_pShader = m_pPreSketchShader;
-                m_shaderItem.m_nTechnique = m_nPreSketchTechnique;
-                m_pPreSketchShader = 0;
-                m_nPreSketchTechnique = 0;
-            }
-        }
-        else
-        {
-            if (!m_pPreSketchShader)
-            {
-                m_pPreSketchShader = m_shaderItem.m_pShader;
-                m_nPreSketchTechnique = m_shaderItem.m_nTechnique;
-            }
-
-            SShaderItem tmp;
-            if (mode == 3 || mode == 4)
-            {
-                tmp = gEnv->pRenderer->EF_LoadShaderItem("SketchTerrain.TexelDensityTerrainLayer", false);
-            }
-            else
-            {
-                tmp = gEnv->pRenderer->EF_LoadShaderItem("Sketch.TexelDensity", false);
-            }
-            m_shaderItem.m_pShader = tmp.m_pShader;
-            m_shaderItem.m_nTechnique = tmp.m_nTechnique;
-        }
-    }
-
-    for (int i = 0; i < (int)m_subMtls.size(); i++)
-    {
-        if (m_subMtls[i])
-        {
-            m_subMtls[i]->SetTexelDensityDebug(mode);
-        }
-    }
-#endif
-}
-
-void CMatInfo::PrecacheMaterial(const float _fEntDistance, IRenderMesh* pRenderMesh, bool bFullUpdate, bool bDrawNear)
-{
-    //  FUNCTION_PROFILER_3DENGINE;
-    LOADING_TIME_PROFILE_SECTION;
-
-    int nFlags = 0;
-    float fEntDistance;
-    if (bDrawNear)
-    {
-        fEntDistance = _fEntDistance;
-        nFlags |= FPR_HIGHPRIORITY;
-    }
-    else
-    {
-        fEntDistance = max(GetFloatCVar(e_StreamPredictionMinReportDistance), _fEntDistance);
-    }
-
-    float fMipFactor = fEntDistance * fEntDistance;
-
-    // updating texture streaming distances
-    if (pRenderMesh)
-    {
-        TRenderChunkArray* pChunks = &pRenderMesh->GetChunks();
-
-        if (pChunks != NULL)
-        {
-            for (uint32 i = 0, size = pChunks->size(); i < size; i++)
-            {
-                PrecacheChunkTextures(fMipFactor, nFlags, &(*pChunks)[i], bFullUpdate);
-            }
-        }
-
-        pChunks = &pRenderMesh->GetChunksSkinned();
-        for (uint32 i = 0, size = pChunks->size(); i < size; i++)
-        {
-            PrecacheChunkTextures(fMipFactor, nFlags, &(*pChunks)[i], bFullUpdate);
-        }
-    }
-    else
-    {
-        PrecacheChunkTextures(fMipFactor, nFlags, NULL, bFullUpdate);
-    }
-}
-
-void CMatInfo::DisableTextureStreaming()
-{
-    const int numSubMaterials = max(GetSubMtlCount(), 1);
-    for (int subMaterialId = 0; subMaterialId < numSubMaterials; ++subMaterialId)
-    {
-        _smart_ptr<IMaterial> subMaterial = GetSafeSubMtl(subMaterialId);
-        if (subMaterial)
-        {
-            const SShaderItem&      shaderItem = subMaterial->GetShaderItem();
-            IRenderShaderResources* pSHRes = shaderItem.m_pShaderResources;
-
-            if (pSHRes)
-            {
-                // Iterate through each texture in the material
-                for ( auto& iter : *(pSHRes->GetTexturesResourceMap()) )
-                {
-                    SEfResTexture*  pTextureRes = &(iter.second);
-                    uint16          textureSlot = iter.first;
-                    uint32          textureFlags = FT_DONT_STREAM;
-
-                    if (textureSlot == EFTT_SMOOTHNESS || textureSlot == EFTT_SECOND_SMOOTHNESS)
-                    {
-                        textureFlags |= FT_ALPHA;
-                    }
-
-                    // Calling load texture here will not actually re-create/re-load an existing texture. It will simply toggle streaming off
-                    ITexture*       texture = gEnv->pRenderer->EF_LoadTexture(pTextureRes->m_Name.c_str(), textureFlags);
-                    // Call release to decrement the ref count, otherwise the texture will leak when switching between maps
-                    if (texture)
-                    {
-                        texture->Release();
-                    }
-                }
-            }
-        }
-    }
-}
-
-void CMatInfo::RequestTexturesLoading(const float fMipFactor)
-{
-    PrecacheTextures(fMipFactor, FPR_STARTLOADING, false);
-}
-
-void CMatInfo::PrecacheTextures(const float fMipFactor, const int nFlags, bool bFullUpdate)
-{
-    SStreamingPredictionZone& rZone = m_streamZoneInfo[bFullUpdate ? 1 : 0];
-    int bHighPriority = (nFlags & FPR_HIGHPRIORITY) != 0;
-
-    rZone.fMinMipFactor = min(rZone.fMinMipFactor, fMipFactor);
-    rZone.bHighPriority |= bHighPriority;
-
-    int nRoundId = bFullUpdate ? GetObjManager()->GetUpdateStreamingPrioriryRoundIdFast() : GetObjManager()->GetUpdateStreamingPrioriryRoundId();
-
-    // TODO: fix fast update
-    if (rZone.nRoundId != nRoundId)
-    {
-        int nCurrentFlags = Get3DEngine()->IsShadersSyncLoad() ? FPR_SYNCRONOUS : 0;
-        nCurrentFlags |= bFullUpdate ? FPR_SINGLE_FRAME_PRIORITY_UPDATE : 0;
-
-        SShaderItem& rSI = m_shaderItem;
-        if (rSI.m_pShader && rSI.m_pShaderResources && !(rSI.m_pShader->GetFlags() & EF_NODRAW))
-        {
-            if (rZone.nRoundId == (nRoundId - 1))
-            {
-                nCurrentFlags |= rZone.bHighPriority ? FPR_HIGHPRIORITY : 0;
-                GetRenderer()->EF_PrecacheResource(&rSI, rZone.fMinMipFactor, 0, nCurrentFlags, nRoundId, 1); // accumulated value is valid
-            }
-            else
-            {
-                nCurrentFlags |= (nFlags & FPR_HIGHPRIORITY);
-                GetRenderer()->EF_PrecacheResource(&rSI, fMipFactor, 0, nCurrentFlags, nRoundId, 1); // accumulated value is not valid, pass current value
-            }
-        }
-
-        rZone.nRoundId = nRoundId;
-        rZone.fMinMipFactor = fMipFactor;
-        rZone.bHighPriority = bHighPriority;
-    }
-}
-
-void CMatInfo::PrecacheChunkTextures(const float fMipFactorDef, const int nFlags, CRenderChunk* pRenderChunk, bool bFullUpdate)
-{
-    //  FUNCTION_PROFILER_3DENGINE;
-
-    CMatInfo* pMaterial = this;
-
-    if (pRenderChunk && pRenderChunk->pRE && pRenderChunk->nNumIndices && pRenderChunk->nNumVerts)
-    { // chunk is defined and have valid geometry
-        if (pRenderChunk->m_nMatID < (uint16)m_subMtls.size())
-        {
-            pMaterial = (CMatInfo*)m_subMtls[pRenderChunk->m_nMatID];
-        }
-
-        if (pMaterial != NULL)
-        {
-            float fMipFactor = GetCVars()->e_StreamPredictionTexelDensity ? (fMipFactorDef * pRenderChunk->m_texelAreaDensity) : fMipFactorDef;
-            pMaterial->PrecacheTextures(fMipFactor, nFlags, bFullUpdate);
-        }
-    }
-    else if (!pRenderChunk)
-    { // chunk is not set - load all sub-materials
-        float fMipFactor = fMipFactorDef;
-
-        PrecacheTextures(fMipFactor, nFlags, bFullUpdate);
-
-        for (int nSubMtl = 0; nSubMtl < (int)m_subMtls.size(); ++nSubMtl)
-        {
-            pMaterial = m_subMtls[nSubMtl];
-
-            if (pMaterial != NULL)
-            {
-                pMaterial->PrecacheTextures(fMipFactor, nFlags, bFullUpdate);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMatInfo::GetTextureMemoryUsage(ICrySizer* pSizer, int nSubMtlSlot)
-{
-    int textureSize = 0;
-    std::set<ITexture*> used;
-
-    int nSlotStart = 0;
-    int nSlotEnd = (int)m_subMtls.size();
-
-    if (nSubMtlSlot >= 0)
-    {
-        nSlotStart = nSubMtlSlot;
-        nSlotEnd = nSubMtlSlot + 1;
-    }
-    if (nSlotEnd >= (int)m_subMtls.size())
-    {
-        nSlotEnd = (int)m_subMtls.size();
-    }
-
-    if (nSlotEnd == 0)
-    {
-        nSlotEnd = 1;
-    }
-
-    for (int i = nSlotStart; i < nSlotEnd; i++)
-    {
-        IRenderShaderResources* pRes = m_shaderItem.m_pShaderResources;
-        if (i < (int)m_subMtls.size() && m_subMtls[i] != NULL && (m_Flags & MTL_FLAG_MULTI_SUBMTL))
-        {
-            SShaderItem shaderItem = m_subMtls[i]->m_shaderItem;
-            if (!shaderItem.m_pShaderResources)
-            {
-                continue;
-            }
-            pRes = shaderItem.m_pShaderResources;
-        }
-        if (!pRes)
-        {
-            continue;
-        }
-
-        for ( auto& iter : *(pRes->GetTexturesResourceMap()) )
-        {
-            SEfResTexture*  pResTexure = &(iter.second);
-            if (!pResTexure->m_Sampler.m_pITex)
-            {
-                continue;
-            }
-
-            ITexture*       pTexture = pResTexure->m_Sampler.m_pITex;
-            if (!pTexture)
-            {
-                continue;
-            }
-
-            if (used.find(pTexture) != used.end())  // Already used in size calculation.
-            {
-                continue;
-            }
-            used.insert(pTexture);
-
-            int nTexSize = pTexture->GetDataSize();
-            textureSize += nTexSize;
-
-            if (pSizer)
-            {
-                pSizer->AddObject(pTexture, nTexSize);
-            }
-        }
-    }
-
-    return textureSize;
-}
-
-void CMatInfo::SetKeepLowResSysCopyForDiffTex()
-{
-    int nSlotStart = 0;
-    int nSlotEnd = (int)m_subMtls.size();
-
-    if (nSlotEnd == 0)
-    {
-        nSlotEnd = 1;
-    }
-
-    for (int i = nSlotStart; i < nSlotEnd; i++)
-    {
-        IRenderShaderResources* pRes = m_shaderItem.m_pShaderResources;
-
-        if (i < (int)m_subMtls.size() && m_subMtls[i] != NULL && (m_Flags & MTL_FLAG_MULTI_SUBMTL))
-        {
-            SShaderItem shaderItem = m_subMtls[i]->m_shaderItem;
-            if (!shaderItem.m_pShaderResources)
-            {
-                continue;
-            }
-            pRes = shaderItem.m_pShaderResources;
-        }
-
-        if (!pRes)
-        {
-            continue;
-        }
-
-        {
-            SEfResTexture* pResTexure = pRes->GetTextureResource(EFTT_DIFFUSE);
-            if (!pResTexure || !pResTexure->m_Sampler.m_pITex)
-            {
-                continue;
-            }
-            ITexture* pTexture = pResTexure->m_Sampler.m_pITex;
-            if (!pTexture)
-            {
-                continue;
-            }
-
-            pTexture->SetKeepSystemCopy(true);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::SetMaterialLinkName([[maybe_unused]] const char* name)
-{
-#ifdef SUPPORT_MATERIAL_EDITING
-    if (name)
-    {
-        m_sMaterialLinkName = name;
-    }
-    else
-    {
-        m_sMaterialLinkName.clear();
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CMatInfo::GetMaterialLinkName() const
-{
-#ifdef SUPPORT_MATERIAL_EDITING
-    return m_sMaterialLinkName.c_str();
-#else
-    CryFatalError("CMatInfo::GetMaterialLinkName not supported on this platform");
-    return "";
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryCriticalSection& CMatInfo::GetSubMaterialResizeLock()
-{
-    static CryCriticalSection s_sSubMaterialResizeLock;
-    return s_sSubMaterialResizeLock;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatInfo::UpdateShaderItems()
-{
-    IRenderer* pRenderer = gEnv->pRenderer;
-    pRenderer->UpdateShaderItem(&m_shaderItem, this);
-
-    for (int  i = 0; i < (int)m_subMtls.size(); ++i)
-    {
-        CMatInfo* pSubMaterial = m_subMtls[i];
-        if (pSubMaterial)
-        {
-            pRenderer->UpdateShaderItem(&pSubMaterial->m_shaderItem, this);
-        }
-    }
-}
-
-void CMatInfo::RefreshShaderResourceConstants()
-{
-    IRenderer* pRenderer = gEnv->pRenderer;
-    pRenderer->RefreshShaderResourceConstants(&m_shaderItem, this);
-
-    for (int  i = 0; i < (int)m_subMtls.size(); ++i)
-    {
-        CMatInfo* pSubMaterial = m_subMtls[i];
-        if (pSubMaterial)
-        {
-            pRenderer->RefreshShaderResourceConstants(&pSubMaterial->m_shaderItem, this);
-        }
-    }
-}
-
diff --git a/Code/CryEngine/Cry3DEngine/Material.h b/Code/CryEngine/Cry3DEngine/Material.h
deleted file mode 100644
index bc0546a4e1..0000000000
--- a/Code/CryEngine/Cry3DEngine/Material.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_MATERIAL_H
-#define CRYINCLUDE_CRY3DENGINE_MATERIAL_H
-#pragma once
-
-#include <IMaterial.h>
-
-#if !defined(CONSOLE)
-#   define SUPPORT_MATERIAL_EDITING
-#endif
-
-#ifndef _RELEASE
-#define SUPPORT_MATERIAL_SKETCH
-#endif
-
-class CMaterialLayer
-    : public IMaterialLayer
-{
-public:
-    CMaterialLayer()
-        : m_nRefCount(0)
-        , m_nFlags(0)
-    {
-    }
-
-    virtual ~CMaterialLayer()
-    {
-        SAFE_RELEASE(m_pShaderItem.m_pShader);
-        SAFE_RELEASE(m_pShaderItem.m_pShaderResources);
-    }
-
-    virtual void AddRef()
-    {
-        m_nRefCount++;
-    };
-
-    virtual void Release()
-    {
-        if (--m_nRefCount <= 0)
-        {
-            delete this;
-        }
-    }
-
-    virtual void Enable(bool bEnable = true)
-    {
-        m_nFlags |= (bEnable == false) ? MTL_LAYER_USAGE_NODRAW : 0;
-    }
-
-    virtual bool IsEnabled() const
-    {
-        return (m_nFlags & MTL_LAYER_USAGE_NODRAW) ? false : true;
-    }
-
-    virtual void FadeOut(bool bFadeOut = true)
-    {
-        m_nFlags |= (bFadeOut == false) ? MTL_LAYER_USAGE_FADEOUT : 0;
-    }
-
-    virtual bool DoesFadeOut() const
-    {
-        return (m_nFlags & MTL_LAYER_USAGE_FADEOUT) ? true : false;
-    }
-
-    virtual void SetShaderItem(const _smart_ptr<IMaterial> pParentMtl, const SShaderItem& pShaderItem);
-
-    virtual const SShaderItem& GetShaderItem() const
-    {
-        return m_pShaderItem;
-    }
-
-    virtual SShaderItem& GetShaderItem()
-    {
-        return m_pShaderItem;
-    }
-
-    virtual void SetFlags(uint8 nFlags)
-    {
-        m_nFlags = nFlags;
-    }
-
-    virtual uint8 GetFlags() const
-    {
-        return m_nFlags;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer);
-    size_t GetResourceMemoryUsage(ICrySizer* pSizer);
-
-private:
-    uint8 m_nFlags;
-    int m_nRefCount;
-    SShaderItem m_pShaderItem;
-};
-
-//////////////////////////////////////////////////////////////////////
-class CMatInfo
-    : public IMaterial
-    , public Cry3DEngineBase
-{
-public:
-    CMatInfo();
-    ~CMatInfo();
-
-    void ShutDown();
-
-    virtual void AddRef();
-    virtual void Release();
-
-    virtual int GetNumRefs() { return m_nRefCount; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // IMaterial implementation
-    //////////////////////////////////////////////////////////////////////////
-    int Size();
-
-    virtual IMaterialHelpers& GetMaterialHelpers();
-    virtual IMaterialManager* GetMaterialManager();
-
-    virtual void SetName(const char* pName);
-    virtual const char* GetName() const { return m_sMaterialName; };
-
-    virtual void SetFlags(int flags) { m_Flags = flags; };
-    virtual int GetFlags() const { return m_Flags; };
-    virtual void UpdateFlags();
-
-    bool IsMaterialGroup() const override;
-    bool IsSubMaterial() const override;
-
-    // Returns true if this is the default material.
-    virtual bool IsDefault();
-
-    virtual int GetSurfaceTypeId() { return m_nSurfaceTypeId; };
-
-    virtual void SetSurfaceType(const char* sSurfaceTypeName);
-    virtual ISurfaceType* GetSurfaceType();
-
-    void SetShaderName(const char* pName) override
-    {
-        m_shaderName = pName;
-    };
-    const char* GetShaderName() const override
-    {
-        return m_shaderName.c_str();
-    };
-
-    // shader item
-    virtual void ReleaseCurrentShaderItem();
-    virtual void SetShaderItem(const SShaderItem& _ShaderItem);
-    // [Alexey] EF_LoadShaderItem return value with RefCount = 1, so if you'll use SetShaderItem after EF_LoadShaderItem use Assign function
-    virtual void AssignShaderItem(const SShaderItem& _ShaderItem);
-
-    virtual SShaderItem& GetShaderItem();
-    virtual const SShaderItem& GetShaderItem() const;
-
-    /**
-    * Retrieves the shader item of the sub-material of the given index
-    *
-    * If the material has no sub-materials or is not flagged as having any sub-materials
-    * this will return its own shader item. If no shader item is found for the given
-    * sub-material the default material's shader item will be returned instead.
-    *
-    * @param nSubMtlSlot The index to the requested sub-material
-    *
-    * @return A reference to the sub-material's shader item
-    */
-    virtual SShaderItem& GetShaderItem(int nSubMtlSlot);
-
-    /**
-    * Retrieves the shader item of the sub-material of the given index
-    *
-    * If the material has no sub-materials or is not flagged as having any sub-materials
-    * this will return its own shader item. If no shader item is found for the given
-    * sub-material the default material's shader item will be returned instead.
-    *
-    * @param nSubMtlSlot The index to the requested sub-material
-    *
-    * @return A reference to the sub-material's shader item
-    */
-    virtual const SShaderItem& GetShaderItem(int nSubMtlSlot) const;
-
-    virtual bool IsStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES], IRenderMesh* pRenderMesh) const;
-    bool AreChunkTexturesStreamedIn(CRenderChunk* pChunk, const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES]) const;
-    bool AreTexturesStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES]) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Functions to set param into the material/material group
-    // If this is a material group, materialIndex specifies the index of the sub-material to be modified
-    //////////////////////////////////////////////////////////////////////////
-    bool SetGetMaterialParamFloat(const char* sParamName, float& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) override;
-    bool SetGetMaterialParamVec3(const char* sParamName, Vec3& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) override;
-    bool SetGetMaterialParamVec4(const char* sParamName, Vec4& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) override;
-
-    void SetDirty(bool dirty = true) override;
-    bool IsDirty() const override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sub materials.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetSubMtlCount(int numSubMtl);
-    virtual int GetSubMtlCount(){return m_subMtls.size(); }
-    virtual _smart_ptr<IMaterial> GetSubMtl(int nSlot)
-    {
-        if (m_subMtls.empty() || !(m_Flags & MTL_FLAG_MULTI_SUBMTL))
-        {
-            return 0; // Not Multi material.
-        }
-        if (nSlot >= 0 && nSlot < (int)m_subMtls.size())
-        {
-            return m_subMtls[nSlot];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-    virtual void SetSubMtl(int nSlot, _smart_ptr<IMaterial> pMtl);
-    virtual void SetUserData(void* pUserData);
-    virtual void* GetUserData() const;
-
-    virtual _smart_ptr<IMaterial> GetSafeSubMtl(int nSlot);
-    virtual _smart_ptr<CMatInfo> Clone();
-    virtual void Copy(_smart_ptr<IMaterial> pMtlDest, EMaterialCopyFlags flags);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Layers
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetLayerCount(uint32 nCount);
-    virtual uint32 GetLayerCount() const;
-    virtual void SetLayer(uint32 nSlot, IMaterialLayer* pLayer);
-    virtual const IMaterialLayer* GetLayer(uint8 nLayersMask, uint8 nLayersUsageMask) const;
-    virtual const IMaterialLayer* GetLayer(uint32 nSlot) const;
-    virtual IMaterialLayer* CreateLayer();
-
-    // Fill int table with surface ids of sub materials.
-    // Return number of filled items.
-    int FillSurfaceTypeIds(int pSurfaceIdsTable[]);
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    virtual size_t GetResourceMemoryUsage(ICrySizer* pSizer);
-
-    void UpdateShaderItems() override;
-    void RefreshShaderResourceConstants();
-
-    //////////////////////////////////////////////////////////////////////////
-    void SetSketchMode(int mode);
-    void SetTexelDensityDebug(int mode);
-
-    // Check for specific rendering conditions (forward rendering/nearest cubemap requirement)
-    bool IsForwardRenderingRequired();
-    bool IsNearestCubemapRequired();
-
-    void DisableTextureStreaming() override;
-    virtual void RequestTexturesLoading(const float fMipFactor);
-
-    virtual void PrecacheMaterial(const float fEntDistance, struct IRenderMesh* pRenderMesh, bool bFullUpdate, bool bDrawNear = false);
-    void PrecacheTextures(const float fMipFactor, const int nFlags, bool bFullUpdate);
-    void PrecacheChunkTextures(const float fInstanceDistance, const int nFlags, CRenderChunk* pRenderChunk, bool bFullUpdate);
-
-    virtual int GetTextureMemoryUsage(ICrySizer* pSizer, int nSubMtlSlot = -1);
-    virtual void SetKeepLowResSysCopyForDiffTex();
-
-    virtual void SetMaterialLinkName(const char* name);
-    virtual const char* GetMaterialLinkName() const;
-
-    uint32 GetDccMaterialHash() const override { return m_dccMaterialHash; }
-    void SetDccMaterialHash(uint32 hash) override { m_dccMaterialHash = hash; }
-
-    virtual CryCriticalSection& GetSubMaterialResizeLock();
-
-private:
-    friend class CMatMan;
-    friend class CMaterialLayer;
-
-    //////////////////////////////////////////////////////////////////////////
-    string m_sMaterialName;
-    string m_sUniqueMaterialName;
-
-    // Id of surface type assigned to this material.
-    int m_nSurfaceTypeId;
-
-    //! Number of references to this material.
-    int m_nRefCount;
-    //! Material flags.
-    //! @see EMatInfoFlags
-    int m_Flags;
-
-    uint32 m_dccMaterialHash;
-
-    SShaderItem m_shaderItem;
-
-    //! shader full name
-    AZStd::string m_shaderName;
-
-#ifdef SUPPORT_MATERIAL_SKETCH
-    _smart_ptr<IShader> m_pPreSketchShader;
-    int m_nPreSketchTechnique;
-#endif
-
-    //! Array of Sub materials.
-    typedef DynArray<_smart_ptr<CMatInfo> > SubMtls;
-    SubMtls m_subMtls;
-
-#ifdef SUPPORT_MATERIAL_EDITING
-    // User data used by Editor.
-    void* m_pUserData;
-
-    string m_sMaterialLinkName;
-#endif
-
-    //! Material layers
-    typedef std::vector< _smart_ptr< CMaterialLayer > > MatLayers;
-    MatLayers* m_pMaterialLayers;
-
-    //! Used for material layers
-    mutable CMaterialLayer* m_pActiveLayer;
-
-    struct SStreamingPredictionZone
-    {
-        int nRoundId : 31;
-        int bHighPriority : 1;
-        float fMinMipFactor;
-    } m_streamZoneInfo[2];
-
-    bool m_isDirty;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_MATERIAL_H
-
diff --git a/Code/CryEngine/Cry3DEngine/MaterialHelpers.cpp b/Code/CryEngine/Cry3DEngine/MaterialHelpers.cpp
deleted file mode 100644
index a9a2c90cb2..0000000000
--- a/Code/CryEngine/Cry3DEngine/MaterialHelpers.cpp
+++ /dev/null
@@ -1,861 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "IShader.h"
-#include "MaterialHelpers.h"
-
-/* -----------------------------------------------------------------------
-  * These functions are used in Cry3DEngine, CrySystem, CryRenderD3D11,
-  * Editor, ResourceCompilerMaterial and more
-  */
-
-//////////////////////////////////////////////////////////////////////////
-namespace
-{
-    static struct
-    {
-        EEfResTextures slot;
-        const char* ename;
-        bool adjustable;
-        const char* name;
-        const char* description;
-        const char* suffix;
-    }
-    s_TexSlotSemantics[] =
-    {
-        // NOTE: must be in order with filled holes to allow direct lookup
-        { EFTT_DIFFUSE,           "EFTT_DIFFUSE",           true,  "Diffuse"          , "Base surface color. Alpha mask is contained in alpha channel."          , "_diff" },
-        { EFTT_NORMALS,           "EFTT_NORMALS",           true,  "Bumpmap"          , "Normal direction for each pixel simulating bumps on the surface. Smoothness map contained in alpha channel."          , "_ddn" }, // Ideally "Normal" but need to keep backwards-compatibility
-        { EFTT_SPECULAR,          "EFTT_SPECULAR",          true,  "Specular"         , "Reflective and shininess intensity and color of reflective highlights"         , "_spec" },
-        { EFTT_ENV,               "EFTT_ENV",               true,  "Environment"      , "Deprecated"    , "_cm" },
-        { EFTT_DETAIL_OVERLAY,    "EFTT_DETAIL_OVERLAY",    true,  "Detail"           , "Increases micro and macro surface bump, diffuse and gloss detail. To use, enable the 'Detail Mapping' shader gen param. "           , "_detail" },
-        { EFTT_SECOND_SMOOTHNESS, "EFTT_SECOND_SMOOTHNESS", false, "SecondSmoothness" , ""              , "" },
-        { EFTT_HEIGHT,            "EFTT_HEIGHT",            true,  "Heightmap"        , "Height for offset bump, POM, silhouette POM, and displacement mapping defined by a Grayscale texture"        , "_displ" },
-        { EFTT_DECAL_OVERLAY,     "EFTT_DECAL_OVERLAY",     true,  "Decal"            , ""              , "" }, // called "DecalOverlay" in the shaders
-        { EFTT_SUBSURFACE,        "EFTT_SUBSURFACE",        true,  "SubSurface"       , ""              , "_sss" }, // called "Subsurface" in the shaders
-        { EFTT_CUSTOM,            "EFTT_CUSTOM",            true,  "Custom"           , ""              , "" }, // called "CustomMap" in the shaders
-        { EFTT_CUSTOM_SECONDARY,  "EFTT_CUSTOM_SECONDARY",  true,  "[1] Custom"       , ""              , "" },
-        { EFTT_OPACITY,           "EFTT_OPACITY",           true,  "Opacity"          , "SubSurfaceScattering map to simulate thin areas for light to penetrate"          , "" },
-        { EFTT_SMOOTHNESS,        "EFTT_SMOOTHNESS",        false, "Smoothness"       , ""              , "_ddna" },
-        { EFTT_EMITTANCE,         "EFTT_EMITTANCE",         true,  "Emittance"        , "Multiplies the emissive color with RGB texture. Emissive alpha mask is contained in alpha channel."        , "_em" },
-        { EFTT_OCCLUSION,         "EFTT_OCCLUSION",         true,  "Occlusion"        , "Grayscale texture to mask diffuse lighting response and simulate darker areas"        , "" },
-        { EFTT_SPECULAR_2,        "EFTT_SPECULAR_2",        true,  "Specular2"        , ""              , "_spec"   },
-
-        // Backwards compatible names are found here and mapped to the updated enum
-        { EFTT_NORMALS,           "EFTT_BUMP",              false, "Normal"           , ""              , "" }, // called "Bump" in the shaders
-        { EFTT_SMOOTHNESS,        "EFTT_GLOSS_NORMAL_A",    false, "GlossNormalA"     , ""              , "" },
-        { EFTT_HEIGHT,            "EFTT_BUMPHEIGHT",        false, "Height"           , ""              , ""        }, // called "BumpHeight" in the shaders
-
-        // This is the terminator for the name-search
-        { EFTT_UNKNOWN,          "EFTT_UNKNOWN",          false, NULL          , ""        },
-    };
-
-#if 0
-    static class Verify
-    {
-    public:
-        Verify()
-        {
-            for (int i = 0; s_TexSlotSemantics[i].name; i++)
-            {
-                if (s_TexSlotSemantics[i].slot != i)
-                {
-                    throw std::runtime_error("Invalid texture slot lookup array.");
-                }
-            }
-        }
-    }
-    s_VerifyTexSlotSemantics;
-#endif
-}
-
-// This should be done per shader (hence, semantics lookup map should be constructed per shader type)
-EEfResTextures MaterialHelpers::FindTexSlot(const char* texName) const
-{
-    for (int i = 0; s_TexSlotSemantics[i].name; i++)
-    {
-        if (azstricmp(s_TexSlotSemantics[i].name, texName) == 0)
-        {
-            return s_TexSlotSemantics[i].slot;
-        }
-    }
-
-    return EFTT_UNKNOWN;
-}
-
-const char* MaterialHelpers::FindTexName(EEfResTextures texSlot) const
-{
-    for (int i = 0; s_TexSlotSemantics[i].name; i++)
-    {
-        if (s_TexSlotSemantics[i].slot == texSlot)
-        {
-            return s_TexSlotSemantics[i].name;
-        }
-    }
-
-    return NULL;
-}
-
-const char* MaterialHelpers::LookupTexName(EEfResTextures texSlot) const
-{
-    assert((texSlot >= 0) && (texSlot < EFTT_MAX));
-    return s_TexSlotSemantics[texSlot].name;
-}
-
-const char* MaterialHelpers::LookupTexDesc(EEfResTextures texSlot) const
-{
-    assert((texSlot >= 0) && (texSlot < EFTT_MAX));
-    return s_TexSlotSemantics[texSlot].description;
-}
-
-const char* MaterialHelpers::LookupTexEnum(EEfResTextures texSlot) const
-{
-    assert((texSlot >= 0) && (texSlot < EFTT_MAX));
-    return s_TexSlotSemantics[texSlot].ename;
-}
-
-const char* MaterialHelpers::LookupTexSuffix(EEfResTextures texSlot) const
-{
-    assert((texSlot >= 0) && (texSlot < EFTT_MAX));
-    return s_TexSlotSemantics[texSlot].suffix;
-}
-
-bool MaterialHelpers::IsAdjustableTexSlot(EEfResTextures texSlot) const
-{
-    assert((texSlot >= 0) && (texSlot < EFTT_MAX));
-    return s_TexSlotSemantics[texSlot].adjustable;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// [Shader System TO DO] - automate these lookups to be data driven!
-bool MaterialHelpers::SetGetMaterialParamFloat(IRenderShaderResources& pShaderResources, const char* sParamName, float& v, bool bGet) const
-{
-    EEfResTextures texSlot = EFTT_UNKNOWN;
-
-    if (!azstricmp("emissive_intensity", sParamName))
-    {
-        texSlot = EFTT_EMITTANCE;
-    }
-    else if (!azstricmp("shininess", sParamName))
-    {
-        texSlot = EFTT_SMOOTHNESS;
-    }
-    else if (!azstricmp("opacity", sParamName))
-    {
-        texSlot = EFTT_OPACITY;
-    }
-
-    if (!azstricmp("alpha", sParamName))
-    {
-        if (bGet)
-        {
-            v = pShaderResources.GetAlphaRef();
-        }
-        else
-        {
-            pShaderResources.SetAlphaRef(v);
-        }
-
-        return true;
-    }
-    else if (texSlot != EFTT_UNKNOWN)
-    {
-        if (bGet)
-        {
-            v = pShaderResources.GetStrengthValue(texSlot);
-        }
-        else
-        {
-            pShaderResources.SetStrengthValue(texSlot, v);
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool MaterialHelpers::SetGetMaterialParamVec3(IRenderShaderResources& pShaderResources, const char* sParamName, Vec3& v, bool bGet) const
-{
-    EEfResTextures texSlot = EFTT_UNKNOWN;
-
-    if (!azstricmp("diffuse", sParamName))
-    {
-        texSlot = EFTT_DIFFUSE;
-    }
-    else if (!azstricmp("specular", sParamName))
-    {
-        texSlot = EFTT_SPECULAR;
-    }
-    else if (!azstricmp("emissive_color", sParamName))
-    {
-        texSlot = EFTT_EMITTANCE;
-    }
-
-    if (texSlot != EFTT_UNKNOWN)
-    {
-        if (bGet)
-        {
-            v = pShaderResources.GetColorValue(texSlot).toVec3();
-        }
-        else
-        {
-            pShaderResources.SetColorValue(texSlot, ColorF(v, 1.0f));
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialHelpers::SetTexModFromXml(SEfTexModificator& pTextureModifier, const XmlNodeRef& modNode) const
-{
-    // Modificators
-    float f;
-    uint8 c;
-
-    modNode->getAttr("TexMod_RotateType", pTextureModifier.m_eRotType);
-    modNode->getAttr("TexMod_TexGenType", pTextureModifier.m_eTGType);
-    modNode->getAttr("TexMod_bTexGenProjected", pTextureModifier.m_bTexGenProjected);
-
-    for (int baseu = 'U', u = baseu; u <= 'W'; u++)
-    {
-        char RT[] = "Rotate?";
-        RT[6] = u;
-
-        if (modNode->getAttr(RT, f))
-        {
-            pTextureModifier.m_Rot            [u - baseu] = Degr2Word(f);
-        }
-
-        char RR[] = "TexMod_?RotateRate";
-        RR[7] = u;
-        char RP[] = "TexMod_?RotatePhase";
-        RP[7] = u;
-        char RA[] = "TexMod_?RotateAmplitude";
-        RA[7] = u;
-        char RC[] = "TexMod_?RotateCenter";
-        RC[7] = u;
-
-        if (modNode->getAttr(RR, f))
-        {
-            pTextureModifier.m_RotOscRate     [u - baseu] = Degr2Word(f);
-        }
-        if (modNode->getAttr(RP, f))
-        {
-            pTextureModifier.m_RotOscPhase    [u - baseu] = Degr2Word(f);
-        }
-        if (modNode->getAttr(RA, f))
-        {
-            pTextureModifier.m_RotOscAmplitude[u - baseu] = Degr2Word(f);
-        }
-        if (modNode->getAttr(RC, f))
-        {
-            pTextureModifier.m_RotOscCenter   [u - baseu] =           f;
-        }
-
-        if (u > 'V')
-        {
-            continue;
-        }
-
-        char TL[] = "Tile?";
-        TL[4] = u;
-        char OF[] = "Offset?";
-        OF[6] = u;
-
-        if (modNode->getAttr(TL, f))
-        {
-            pTextureModifier.m_Tiling         [u - baseu] = f;
-        }
-        if (modNode->getAttr(OF, f))
-        {
-            pTextureModifier.m_Offs           [u - baseu] = f;
-        }
-
-        char OT[] = "TexMod_?OscillatorType";
-        OT[7] = u;
-        char OR[] = "TexMod_?OscillatorRate";
-        OR[7] = u;
-        char OP[] = "TexMod_?OscillatorPhase";
-        OP[7] = u;
-        char OA[] = "TexMod_?OscillatorAmplitude";
-        OA[7] = u;
-
-        if (modNode->getAttr(OT, c))
-        {
-            pTextureModifier.m_eMoveType      [u - baseu] = c;
-        }
-        if (modNode->getAttr(OR, f))
-        {
-            pTextureModifier.m_OscRate        [u - baseu] = f;
-        }
-        if (modNode->getAttr(OP, f))
-        {
-            pTextureModifier.m_OscPhase       [u - baseu] = f;
-        }
-        if (modNode->getAttr(OA, f))
-        {
-            pTextureModifier.m_OscAmplitude   [u - baseu] = f;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static SEfTexModificator defaultTexMod;
-static bool defaultTexMod_Initialized = false;
-
-void MaterialHelpers::SetXmlFromTexMod(const SEfTexModificator& pTextureModifier, XmlNodeRef& node) const
-{
-    if (!defaultTexMod_Initialized)
-    {
-        ZeroStruct(defaultTexMod);
-        defaultTexMod.m_Tiling[0] = 1;
-        defaultTexMod.m_Tiling[1] = 1;
-        defaultTexMod_Initialized = true;
-    }
-
-    if (memcmp(&pTextureModifier, &defaultTexMod, sizeof(pTextureModifier)) == 0)
-    {
-        return;
-    }
-
-    XmlNodeRef modNode = node->newChild("TexMod");
-    if (modNode)
-    {
-        // Modificators
-        float f;
-        uint16 s;
-        uint8 c;
-
-        modNode->setAttr("TexMod_RotateType", pTextureModifier.m_eRotType);
-        modNode->setAttr("TexMod_TexGenType", pTextureModifier.m_eTGType);
-        modNode->setAttr("TexMod_bTexGenProjected", pTextureModifier.m_bTexGenProjected);
-
-        for (int baseu = 'U', u = baseu; u <= 'W'; u++)
-        {
-            char RT[] = "Rotate?";
-            RT[6] = u;
-
-            if ((s = pTextureModifier.m_Rot            [u - baseu]) != defaultTexMod.m_Rot            [u - baseu])
-            {
-                modNode->setAttr(RT, Word2Degr(s));
-            }
-
-            char RR[] = "TexMod_?RotateRate";
-            RR[7] = u;
-            char RP[] = "TexMod_?RotatePhase";
-            RP[7] = u;
-            char RA[] = "TexMod_?RotateAmplitude";
-            RA[7] = u;
-            char RC[] = "TexMod_?RotateCenter";
-            RC[7] = u;
-
-            if ((s = pTextureModifier.m_RotOscRate     [u - baseu]) != defaultTexMod.m_RotOscRate     [u - baseu])
-            {
-                modNode->setAttr(RR, Word2Degr(s));
-            }
-            if ((s = pTextureModifier.m_RotOscPhase    [u - baseu]) != defaultTexMod.m_RotOscPhase    [u - baseu])
-            {
-                modNode->setAttr(RP, Word2Degr(s));
-            }
-            if ((s = pTextureModifier.m_RotOscAmplitude[u - baseu]) != defaultTexMod.m_RotOscAmplitude[u - baseu])
-            {
-                modNode->setAttr(RA, Word2Degr(s));
-            }
-            if ((f = pTextureModifier.m_RotOscCenter   [u - baseu]) != defaultTexMod.m_RotOscCenter   [u - baseu])
-            {
-                modNode->setAttr(RC,           f);
-            }
-
-            if (u > 'V')
-            {
-                continue;
-            }
-
-            char TL[] = "Tile?";
-            TL[4] = u;
-            char OF[] = "Offset?";
-            OF[6] = u;
-
-            if ((f = pTextureModifier.m_Tiling         [u - baseu]) != defaultTexMod.m_Tiling         [u - baseu])
-            {
-                modNode->setAttr(TL, f);
-            }
-            if ((f = pTextureModifier.m_Offs           [u - baseu]) != defaultTexMod.m_Offs           [u - baseu])
-            {
-                modNode->setAttr(OF, f);
-            }
-
-            char OT[] = "TexMod_?OscillatorType";
-            OT[7] = u;
-            char OR[] = "TexMod_?OscillatorRate";
-            OR[7] = u;
-            char OP[] = "TexMod_?OscillatorPhase";
-            OP[7] = u;
-            char OA[] = "TexMod_?OscillatorAmplitude";
-            OA[7] = u;
-
-            if ((c = pTextureModifier.m_eMoveType      [u - baseu]) != defaultTexMod.m_eMoveType      [u - baseu])
-            {
-                modNode->setAttr(OT, c);
-            }
-            if ((f = pTextureModifier.m_OscRate        [u - baseu]) != defaultTexMod.m_OscRate        [u - baseu])
-            {
-                modNode->setAttr(OR, f);
-            }
-            if ((f = pTextureModifier.m_OscPhase       [u - baseu]) != defaultTexMod.m_OscPhase       [u - baseu])
-            {
-                modNode->setAttr(OP, f);
-            }
-            if ((f = pTextureModifier.m_OscAmplitude   [u - baseu]) != defaultTexMod.m_OscAmplitude   [u - baseu])
-            {
-                modNode->setAttr(OA, f);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialHelpers::SetTexturesFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const
-{
-    const char* texmap = "";
-    const char* fileName = "";
-
-    XmlNodeRef texturesNode = node->findChild("Textures");
-    if (texturesNode)
-    {
-        for (int c = 0; c < texturesNode->getChildCount(); c++)
-        {
-            XmlNodeRef texNode = texturesNode->getChild(c);
-            texmap = texNode->getAttr("Map");
-
-            // [Shader System TO DO] - this must become per shader (and not global) according to the parser
-            uint8   texSlot = MaterialHelpers::FindTexSlot(texmap);
-
-            // [Shader System TO DO] - in the new system simply gather texture slot names, then identify name usage 
-            // and accordingly match the slot (dynamically associated per shader by the parser).
-            if (texSlot == EFTT_UNKNOWN)
-            {
-                continue;
-            }
-
-            fileName = texNode->getAttr("File");
-
-            // legacy.  Some textures used to be referenced using "engine\\" or "engine/" - this is no longer valid
-            if (
-                (strlen(fileName) > 7) &&
-                (azstrnicmp(fileName, "engine", 6) == 0) &&
-                ((fileName[6] == '\\') || (fileName[6] == '/'))
-                )
-            {
-                fileName = fileName + 7;
-            }
-
-            // legacy:  Files were saved into a mtl with many leading forward or back slashes, we eat them all here.  We want it to start with a rel path.
-            const char* actualFileName = fileName;
-            while ((actualFileName[0]) && ((actualFileName[0] == '\\') || (actualFileName[0] == '/')))
-            {
-                ++actualFileName;
-            }
-            fileName = actualFileName;
-
-            // Next insert the texture resource if did not exist
-            TexturesResourcesMap*       pTextureReourcesMap = pShaderResources.GetTexturesResourceMap();
-            SEfResTexture*              pTextureRes = &(*pTextureReourcesMap)[texSlot];
-
-            pTextureRes->m_Name = fileName;
-            texNode->getAttr("IsTileU", pTextureRes->m_bUTile);
-            texNode->getAttr("IsTileV", pTextureRes->m_bVTile);
-            texNode->getAttr("TexType", pTextureRes->m_Sampler.m_eTexType);
-
-            int     filter = pTextureRes->m_Filter;
-            if (texNode->getAttr("Filter", filter))
-            {
-                pTextureRes->m_Filter = filter;
-            }
-
-            // Next look for modulation node - add it only if exist
-            XmlNodeRef  modNode = texNode->findChild("TexMod");
-            if (modNode)
-                SetTexModFromXml( *(pTextureRes->AddModificator()), modNode);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static SInputShaderResources    defaultShaderResource;      // for comparison with the default values
-static SEfResTexture            defaultTextureResource;     // for comparison with the default values
-
-void MaterialHelpers::SetXmlFromTextures( SInputShaderResources& pShaderResources, XmlNodeRef& node) const
-{
-    // Save texturing data.
-    XmlNodeRef texturesNode = node->newChild("Textures");
-
-    for (auto& iter : *(pShaderResources.GetTexturesResourceMap()) )
-    {
-        EEfResTextures texId = static_cast<EEfResTextures>(iter.first);
-        const SEfResTexture* pTextureRes = &(iter.second);
-        if (pTextureRes && !pTextureRes->m_Name.empty() && IsAdjustableTexSlot(texId))
-        {
-            XmlNodeRef texNode = texturesNode->newChild("Texture");
-
-            texNode->setAttr("Map", MaterialHelpers::LookupTexName(texId));
-            texNode->setAttr("File", pTextureRes->m_Name.c_str());
-
-            if (pTextureRes->m_Filter != defaultTextureResource.m_Filter)
-            {
-                texNode->setAttr("Filter", pTextureRes->m_Filter);
-            }
-            if (pTextureRes->m_bUTile != defaultTextureResource.m_bUTile)
-            {
-                texNode->setAttr("IsTileU", pTextureRes->m_bUTile);
-            }
-            if (pTextureRes->m_bVTile != defaultTextureResource.m_bVTile)
-            {
-                texNode->setAttr("IsTileV", pTextureRes->m_bVTile);
-            }
-            if (pTextureRes->m_Sampler.m_eTexType != defaultTextureResource.m_Sampler.m_eTexType)
-            {
-                texNode->setAttr("TexType", pTextureRes->m_Sampler.m_eTexType);
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // Save texture modificators Modificators
-            //////////////////////////////////////////////////////////////////////////
-            SetXmlFromTexMod( *pTextureRes->GetModificator(), texNode);
-        }
-        /* [Shader System] - TO DO: test to see if slots can be removed
-        else
-        {
-            AZ_Assert(!pTextureRes->m_Name.empty(), "Shader resource texture error - Texture exists without a name");
-        }
-        */
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialHelpers::SetVertexDeformFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const
-{
-    if (defaultShaderResource.m_DeformInfo.m_eType != pShaderResources.m_DeformInfo.m_eType)
-    {
-        node->setAttr("vertModifType", pShaderResources.m_DeformInfo.m_eType);
-    }
-
-    XmlNodeRef deformNode = node->findChild("VertexDeform");
-    if (deformNode)
-    {
-        int deform_type = eDT_Unknown;
-        deformNode->getAttr("Type", deform_type);
-        pShaderResources.m_DeformInfo.m_eType = (EDeformType)deform_type;
-        deformNode->getAttr("DividerX", pShaderResources.m_DeformInfo.m_fDividerX);
-        deformNode->getAttr("NoiseScale", pShaderResources.m_DeformInfo.m_vNoiseScale);
-
-        XmlNodeRef waveX = deformNode->findChild("WaveX");
-        if (waveX)
-        {
-            int type = eWF_None;
-            waveX->getAttr("Type", type);
-            pShaderResources.m_DeformInfo.m_WaveX.m_eWFType = (EWaveForm)type;
-            waveX->getAttr("Amp", pShaderResources.m_DeformInfo.m_WaveX.m_Amp);
-            waveX->getAttr("Level", pShaderResources.m_DeformInfo.m_WaveX.m_Level);
-            waveX->getAttr("Phase", pShaderResources.m_DeformInfo.m_WaveX.m_Phase);
-            waveX->getAttr("Freq", pShaderResources.m_DeformInfo.m_WaveX.m_Freq);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialHelpers::SetXmlFromVertexDeform(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const
-{
-    int vertModif = pShaderResources.m_DeformInfo.m_eType;
-    node->setAttr("vertModifType", vertModif);
-
-    if (pShaderResources.m_DeformInfo.m_eType != eDT_Unknown)
-    {
-        XmlNodeRef deformNode = node->newChild("VertexDeform");
-
-        deformNode->setAttr("Type", pShaderResources.m_DeformInfo.m_eType);
-        deformNode->setAttr("DividerX", pShaderResources.m_DeformInfo.m_fDividerX);
-        deformNode->setAttr("NoiseScale", pShaderResources.m_DeformInfo.m_vNoiseScale);
-
-        XmlNodeRef waveX = deformNode->newChild("WaveX");
-        waveX->setAttr("Type", pShaderResources.m_DeformInfo.m_WaveX.m_eWFType);
-        waveX->setAttr("Amp", pShaderResources.m_DeformInfo.m_WaveX.m_Amp);
-        waveX->setAttr("Level", pShaderResources.m_DeformInfo.m_WaveX.m_Level);
-        waveX->setAttr("Phase", pShaderResources.m_DeformInfo.m_WaveX.m_Phase);
-        waveX->setAttr("Freq", pShaderResources.m_DeformInfo.m_WaveX.m_Freq);
-
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static inline ColorF ToCFColor(const Vec3& col)
-{
-    return ColorF(col);
-}
-
-void MaterialHelpers::SetLightingFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const
-{
-    // Load lighting data.
-    Vec3 vColor;
-    Vec4 vColor4;
-    if (node->getAttr("Diffuse", vColor4))
-    {
-        pShaderResources.m_LMaterial.m_Diffuse = ColorF(vColor4.x, vColor4.y, vColor4.z, vColor4.w);
-    }
-    else if (node->getAttr("Diffuse", vColor))
-    {
-        pShaderResources.m_LMaterial.m_Diffuse = ToCFColor(vColor);
-    }
-    if (node->getAttr("Specular", vColor4))
-    {
-        pShaderResources.m_LMaterial.m_Specular = ColorF(vColor4.x, vColor4.y, vColor4.z, vColor4.w);
-    }
-    else if (node->getAttr("Specular", vColor))
-    {
-        pShaderResources.m_LMaterial.m_Specular = ToCFColor(vColor);
-    }
-    if (node->getAttr("Emittance", vColor4))
-    {
-        pShaderResources.m_LMaterial.m_Emittance = ColorF(vColor4.x, vColor4.y, vColor4.z, vColor4.w);
-    }
-
-    node->getAttr("Shininess", pShaderResources.m_LMaterial.m_Smoothness);
-    node->getAttr("Opacity", pShaderResources.m_LMaterial.m_Opacity);
-    node->getAttr("AlphaTest", pShaderResources.m_AlphaRef);
-    node->getAttr("VoxelCoverage", pShaderResources.m_VoxelCoverage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-static inline Vec3 ToVec3(const ColorF& col)
-{
-    return Vec3(col.r, col.g, col.b);
-}
-
-static inline Vec4 ToVec4(const ColorF& col)
-{
-    return Vec4(col.r, col.g, col.b, col.a);
-}
-
-void MaterialHelpers::SetXmlFromLighting(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const
-{
-    // Save ligthing data.
-    if (defaultShaderResource.m_LMaterial.m_Diffuse != pShaderResources.m_LMaterial.m_Diffuse)
-    {
-        node->setAttr("Diffuse", ToVec4(pShaderResources.m_LMaterial.m_Diffuse));
-    }
-    if (defaultShaderResource.m_LMaterial.m_Specular != pShaderResources.m_LMaterial.m_Specular)
-    {
-        node->setAttr("Specular", ToVec4(pShaderResources.m_LMaterial.m_Specular));
-    }
-    if (defaultShaderResource.m_LMaterial.m_Emittance != pShaderResources.m_LMaterial.m_Emittance)
-    {
-        node->setAttr("Emittance", ToVec4(pShaderResources.m_LMaterial.m_Emittance));
-    }
-
-    if (defaultShaderResource.m_LMaterial.m_Opacity != pShaderResources.m_LMaterial.m_Opacity)
-    {
-        node->setAttr("Opacity", pShaderResources.m_LMaterial.m_Opacity);
-    }
-    if (defaultShaderResource.m_LMaterial.m_Smoothness != pShaderResources.m_LMaterial.m_Smoothness)
-    {
-        node->setAttr("Shininess", pShaderResources.m_LMaterial.m_Smoothness);
-    }
-
-    if (defaultShaderResource.m_AlphaRef != pShaderResources.m_AlphaRef)
-    {
-        node->setAttr("AlphaTest", pShaderResources.m_AlphaRef);
-    }
-    if (defaultShaderResource.m_VoxelCoverage != pShaderResources.m_VoxelCoverage)
-    {
-        node->setAttr("VoxelCoverage", pShaderResources.m_VoxelCoverage);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialHelpers::SetShaderParamsFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const
-{
-    int nA = node->getNumAttributes();
-    if (!nA)
-    {
-        return;
-    }
-
-    for (int i = 0; i < nA; i++)
-    {
-        const char* key = NULL, * val = NULL;
-        node->getAttributeByIndex(i, &key, &val);
-
-        // try to set existing param first
-        bool bFound = false;
-
-        for (int j = 0; j < pShaderResources.m_ShaderParams.size(); j++)
-        {
-            SShaderParam* pParam = &pShaderResources.m_ShaderParams[j];
-
-            if (pParam->m_Name == key)
-            {
-                bFound = true;
-
-                switch (pParam->m_Type)
-                {
-                case eType_BYTE:
-                    node->getAttr(key, pParam->m_Value.m_Byte);
-                    break;
-                case eType_SHORT:
-                    node->getAttr(key, pParam->m_Value.m_Short);
-                    break;
-                case eType_INT:
-                    node->getAttr(key, pParam->m_Value.m_Int);
-                    break;
-                case eType_FLOAT:
-                    node->getAttr(key, pParam->m_Value.m_Float);
-                    break;
-                case eType_FCOLOR:
-                case eType_FCOLORA:
-                {
-                    Vec3 vValue;
-                    node->getAttr(key, vValue);
-
-                    pParam->m_Value.m_Color[0] = vValue.x;
-                    pParam->m_Value.m_Color[1] = vValue.y;
-                    pParam->m_Value.m_Color[2] = vValue.z;
-                }
-                break;
-                case eType_VECTOR:
-                {
-                    Vec4 vValue;
-                    if (node->getAttr(key, vValue))
-                    {
-                        pParam->m_Value.m_Color[0] = vValue.x;
-                        pParam->m_Value.m_Color[1] = vValue.y;
-                        pParam->m_Value.m_Color[2] = vValue.z;
-                        pParam->m_Value.m_Color[3] = vValue.w;
-                    }
-                    else
-                    {
-                        Vec3 vValue3;
-                        if (node->getAttr(key, vValue3))
-                        {
-                            pParam->m_Value.m_Color[0] = vValue3.x;
-                            pParam->m_Value.m_Color[1] = vValue3.y;
-                            pParam->m_Value.m_Color[2] = vValue3.z;
-                            pParam->m_Value.m_Color[3] = 1.0f;
-                        }
-                    }
-                }
-                break;
-                default:
-                    break;
-                }
-            }
-        }
-
-        if (!bFound)
-        {
-            assert(val && key);
-
-            SShaderParam Param;
-            Param.m_Name = key;
-            Param.m_Value.m_Color[0] = Param.m_Value.m_Color[1] = Param.m_Value.m_Color[2] = Param.m_Value.m_Color[3] = 0;
-#if !defined(NDEBUG)
-            int res =
-#endif
-                azsscanf(val, "%f,%f,%f,%f", &Param.m_Value.m_Color[0], &Param.m_Value.m_Color[1], &Param.m_Value.m_Color[2], &Param.m_Value.m_Color[3]);
-            assert(res);
-
-            pShaderResources.m_ShaderParams.push_back(Param);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialHelpers::SetXmlFromShaderParams(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const
-{
-    for (int i = 0; i < pShaderResources.m_ShaderParams.size(); i++)
-    {
-        const SShaderParam* pParam = &pShaderResources.m_ShaderParams[i];
-        switch (pParam->m_Type)
-        {
-        case eType_BYTE:
-            node->setAttr(pParam->m_Name.c_str(), (int)pParam->m_Value.m_Byte);
-            break;
-        case eType_SHORT:
-            node->setAttr(pParam->m_Name.c_str(), (int)pParam->m_Value.m_Short);
-            break;
-        case eType_INT:
-            node->setAttr(pParam->m_Name.c_str(), (int)pParam->m_Value.m_Int);
-            break;
-        case eType_FLOAT:
-            node->setAttr(pParam->m_Name.c_str(), (float)pParam->m_Value.m_Float);
-            break;
-        case eType_FCOLOR:
-            node->setAttr(pParam->m_Name.c_str(), Vec3(pParam->m_Value.m_Color[0], pParam->m_Value.m_Color[1], pParam->m_Value.m_Color[2]));
-            break;
-        case eType_VECTOR:
-            node->setAttr(pParam->m_Name.c_str(), Vec3(pParam->m_Value.m_Vector[0], pParam->m_Value.m_Vector[1], pParam->m_Value.m_Vector[2]));
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-//------------------------------------------------------------------------------
-// [Shader System TO DO] - the following function supports older version of data 
-// and converts them.
-// This needs to go away soon!
-//------------------------------------------------------------------------------
-void MaterialHelpers::MigrateXmlLegacyData(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const
-{
-    float glowAmount;
-
-    // Migrate glow from 3.8.3 to emittance
-    if (node->getAttr("GlowAmount", glowAmount) && glowAmount > 0)
-    {
-        SEfResTexture*     pTextureRes = pShaderResources.GetTextureResource(EFTT_DIFFUSE);
-        if (pTextureRes && (pTextureRes->m_Sampler.m_eTexType == eTT_2D))
-        {
-            // The following line will create and insert a new texture data slot if did not exist.
-            pShaderResources.m_TexturesResourcesMap[EFTT_EMITTANCE].m_Name = pTextureRes->m_Name;
-        }
-        const float legacyHDRDynMult = 2.0f;
-        const float legacyIntensityScale = 10.0f;  // Legacy scale factor 10000 divided by 1000 for kilonits
-
-        // Clamp this at EMISSIVE_INTENSITY_SOFT_MAX because some previous glow parameters become extremely bright.
-        pShaderResources.m_LMaterial.m_Emittance.a = min(powf(glowAmount * legacyHDRDynMult, legacyHDRDynMult) * legacyIntensityScale, EMISSIVE_INTENSITY_SOFT_MAX);
-
-        std::string materialName = node->getAttr("Name");
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Material %s has had legacy GlowAmount automatically converted to Emissive Intensity.  The material parameters related to Emittance should be manually adjusted for this material.", materialName.c_str());
-    }
-    
-    XmlNodeRef publicParamsNode = node->findChild("PublicParams");
-    if (publicParamsNode && publicParamsNode->haveAttr("BlendLayer2Specular"))
-    {
-        // Check to see if the BlendLayer2Specular is a float
-        AZStd::string blendLayer2SpecularString(publicParamsNode->getAttr("BlendLayer2Specular"));
-
-        // If there are no commas in the string representation, it must be a single float instead of a color
-        if (blendLayer2SpecularString.find(',') == AZStd::string::npos)
-        {
-            float blendLayer2SpecularFloat = 0.0f;
-            publicParamsNode->getAttr("BlendLayer2Specular", blendLayer2SpecularFloat);
-            publicParamsNode->setAttr("BlendLayer2Specular", Vec4(blendLayer2SpecularFloat, blendLayer2SpecularFloat, blendLayer2SpecularFloat, 0.0));
-        }
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/MaterialHelpers.h b/Code/CryEngine/Cry3DEngine/MaterialHelpers.h
deleted file mode 100644
index efc1139ec6..0000000000
--- a/Code/CryEngine/Cry3DEngine/MaterialHelpers.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __MaterialHelpers_h__
-#define __MaterialHelpers_h__
-#pragma once
-
-#include <IMaterial.h>
-
-// Description:
-//   Namespace "implementation", not a class "implementation", no member-variables, only const functions;
-//   Used to encapsulate the material-definition/io into Cry3DEngine (and make it plugable that way).
-struct MaterialHelpers
-    : public IMaterialHelpers
-{
-    //////////////////////////////////////////////////////////////////////////
-    virtual EEfResTextures FindTexSlot(const char* texName) const final;
-    virtual const char* FindTexName(EEfResTextures texSlot) const final;
-    virtual const char* LookupTexName(EEfResTextures texSlot) const final;
-    virtual const char* LookupTexDesc(EEfResTextures texSlot) const final;
-    virtual const char* LookupTexEnum(EEfResTextures texSlot) const final;
-    virtual const char* LookupTexSuffix(EEfResTextures texSlot) const final;
-    virtual bool IsAdjustableTexSlot(EEfResTextures texSlot) const final;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual bool SetGetMaterialParamFloat(IRenderShaderResources& pShaderResources, const char* sParamName, float& v, bool bGet) const final;
-    virtual bool SetGetMaterialParamVec3(IRenderShaderResources& pShaderResources, const char* sParamName, Vec3& v, bool bGet) const final;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetTexModFromXml(SEfTexModificator& pShaderResources, const XmlNodeRef& modNode) const final;
-    virtual void SetXmlFromTexMod(const SEfTexModificator& pShaderResources, XmlNodeRef& node) const final;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetTexturesFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const final;
-    virtual void SetXmlFromTextures( SInputShaderResources& pShaderResources, XmlNodeRef& node) const final;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetVertexDeformFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const final;
-    virtual void SetXmlFromVertexDeform(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const final;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetLightingFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const final;
-    virtual void SetXmlFromLighting(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const final;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetShaderParamsFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const final;
-    virtual void SetXmlFromShaderParams(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const final;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void MigrateXmlLegacyData(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const final;
-};
-
-#endif
-
diff --git a/Code/CryEngine/Cry3DEngine/Material_Jobs.cpp b/Code/CryEngine/Cry3DEngine/Material_Jobs.cpp
deleted file mode 100644
index 157c20a6e2..0000000000
--- a/Code/CryEngine/Cry3DEngine/Material_Jobs.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Material Manager Implementation
-
-
-#include "Cry3DEngine_precompiled.h"
-#include "MatMan.h"
-#include "3dEngine.h"
-#include "ObjMan.h"
-#include "IRenderer.h"
-#include "SurfaceTypeManager.h"
-#include "CGFContent.h"
-#include <IResourceManager.h>
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatMan::GetDefaultMaterial()
-{
-    return m_pDefaultMtl;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMatInfo::GetSafeSubMtl(int nSubMtlSlot)
-{
-    if (m_subMtls.empty() || !(m_Flags & MTL_FLAG_MULTI_SUBMTL))
-    {
-        return this; // Not Multi material.
-    }
-    if (nSubMtlSlot >= 0 && nSubMtlSlot < (int)m_subMtls.size() && m_subMtls[nSubMtlSlot] != NULL)
-    {
-        return m_subMtls[nSubMtlSlot];
-    }
-    else
-    {
-        return GetMatMan()->GetDefaultMaterial();
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-SShaderItem& CMatInfo::GetShaderItem()
-{
-    return m_shaderItem;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-const SShaderItem& CMatInfo::GetShaderItem() const
-{
-    return m_shaderItem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-SShaderItem& CMatInfo::GetShaderItem(int nSubMtlSlot)
-{
-    SShaderItem* pShaderItem = NULL;
-    if (m_subMtls.empty() || !(m_Flags & MTL_FLAG_MULTI_SUBMTL))
-    {
-        pShaderItem = &m_shaderItem; // Not Multi material.
-    }
-    else if (nSubMtlSlot >= 0 && nSubMtlSlot < (int)m_subMtls.size() && m_subMtls[nSubMtlSlot] != NULL)
-    {
-        pShaderItem = &(m_subMtls[nSubMtlSlot]->m_shaderItem);
-    }
-    else
-    {
-        _smart_ptr<IMaterial> pDefaultMaterial = GetMatMan()->GetDefaultMaterial();
-        pShaderItem = &(static_cast<CMatInfo*>(pDefaultMaterial.get())->m_shaderItem);
-    }
-
-    return *pShaderItem;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-const SShaderItem& CMatInfo::GetShaderItem(int nSubMtlSlot) const
-{
-    const SShaderItem* pShaderItem = NULL;
-    if (m_subMtls.empty() || !(m_Flags & MTL_FLAG_MULTI_SUBMTL))
-    {
-        pShaderItem = &m_shaderItem; // Not Multi material.
-    }
-    else if (nSubMtlSlot >= 0 && nSubMtlSlot < (int)m_subMtls.size() && m_subMtls[nSubMtlSlot] != NULL)
-    {
-        pShaderItem = &(m_subMtls[nSubMtlSlot]->m_shaderItem);
-    }
-    else
-    {
-        _smart_ptr<IMaterial> pDefaultMaterial = GetMatMan()->GetDefaultMaterial();
-        pShaderItem = &(static_cast<CMatInfo*>(pDefaultMaterial.get())->m_shaderItem);
-    }
-
-    return *pShaderItem;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CMatInfo::IsForwardRenderingRequired()
-{
-    bool bRequireForwardRendering = (m_Flags & MTL_FLAG_REQUIRE_FORWARD_RENDERING) != 0;
-
-    if (!bRequireForwardRendering)
-    {
-        for (int i = 0; i < (int)m_subMtls.size(); ++i)
-        {
-            if (m_subMtls[i] != 0 && m_subMtls[i]->m_Flags & MTL_FLAG_REQUIRE_FORWARD_RENDERING)
-            {
-                bRequireForwardRendering = true;
-                break;
-            }
-        }
-    }
-
-    return bRequireForwardRendering;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CMatInfo::IsNearestCubemapRequired()
-{
-    bool bRequireNearestCubemap = (m_Flags & MTL_FLAG_REQUIRE_NEAREST_CUBEMAP) != 0;
-
-    if (!bRequireNearestCubemap)
-    {
-        for (int i = 0; i < (int)m_subMtls.size(); ++i)
-        {
-            if (m_subMtls[i] != 0 && m_subMtls[i]->m_Flags & MTL_FLAG_REQUIRE_NEAREST_CUBEMAP)
-            {
-                bRequireNearestCubemap = true;
-                break;
-            }
-        }
-    }
-
-    return bRequireNearestCubemap;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/CMakeLists.txt b/Code/CryEngine/Cry3DEngine/MeshCompiler/CMakeLists.txt
deleted file mode 100644
index e50cf1c972..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-
-ly_add_target(
-    NAME Cry3DEngine.MeshCompiler.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        meshcompiler_files.cmake
-        ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-            ${pal_dir}
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::mikkelsen
-            Legacy::CryCommon
-)
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/ForsythFaceReorderer.cpp b/Code/CryEngine/Cry3DEngine/MeshCompiler/ForsythFaceReorderer.cpp
deleted file mode 100644
index 264c08905f..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/ForsythFaceReorderer.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-#include <platform.h>   // for assert
-
-#include "ForsythFaceReorderer.h"
-
-#include <cmath>      // powf()
-
-
-ForsythFaceReorderer::ForsythFaceReorderer()
-{
-    computeValencyScoreTable();
-}
-
-
-bool ForsythFaceReorderer::reorderFaces(
-    const size_t cacheSize,
-    const uint verticesPerFace,
-    const size_t indexCount,
-    const uint32* const inVertexIndices,
-    uint32* const outVertexIndices,
-    uint32* const outFaceToOldFace)
-{
-    clear();
-
-    if (verticesPerFace < sk_minVerticesPerFace || verticesPerFace > sk_maxVerticesPerFace)
-    {
-        return false;
-    }
-    if (indexCount <= 0)
-    {
-        return true;
-    }
-    if (indexCount % verticesPerFace != 0)
-    {
-        return false;
-    }
-    if (inVertexIndices == 0)
-    {
-        return false;
-    }
-    if (outVertexIndices == 0)
-    {
-        return false;
-    }
-
-    if ((cacheSize < verticesPerFace) || (cacheSize > sk_maxCacheSize))
-    {
-        return false;
-    }
-
-    m_cacheSize = (int)cacheSize;
-    m_cacheUsedSize = 0;
-    computeCacheScoreTable(verticesPerFace);
-
-    const size_t faceCount = indexCount / verticesPerFace;
-    if (indexCount / verticesPerFace >= (uint32) - 1)
-    {
-        // Face count is too high
-        return false;
-    }
-
-    size_t writtenFaceCount = 0;
-
-    uint32 vertexCount;
-    {
-        // TODO: use minVertexIndex also. It will allow to use less memory for ranged indices.
-        // For example indices in ranges [800;899] will use memory size 100, not 900.
-        uint32 maxVertexIndex = 0;
-        for (size_t i = 0; i < indexCount; ++i)
-        {
-            if (inVertexIndices[i] > maxVertexIndex)
-            {
-                maxVertexIndex = inVertexIndices[i];
-            }
-        }
-        if (((size_t)maxVertexIndex) + 1 >= (uint32) - 1)
-        {
-            // Vertex count is too high
-            return false;
-        }
-        vertexCount = maxVertexIndex + 1;
-    }
-
-    // Allocate and initialize arrays
-    {
-        {
-            Vertex initVertex;
-            initVertex.m_pFaceList = 0;
-            initVertex.m_aliveFaceCount = 0;
-            initVertex.m_posInCache = -1;
-            initVertex.m_score = 0;
-            m_vertices.resize(vertexCount, initVertex);
-        }
-
-        m_deadFacesBitArray.resize((faceCount + 7) / 8, 0);
-
-        m_faceScores.resize(faceCount, 0);
-
-        m_vertexFaceLists.resize(faceCount * verticesPerFace);
-    }
-
-    // Fill per-vertex face lists
-    {
-        for (size_t i = 0; i < indexCount; ++i)
-        {
-            const uint32 vertexIndex = inVertexIndices[i];
-            if (m_vertices[vertexIndex].m_aliveFaceCount >= sk_maxValency)
-            {
-                // Vertex valency is too high
-                return false;
-            }
-            ++m_vertices[vertexIndex].m_aliveFaceCount;
-        }
-
-        uint32 pos = 0;
-        for (uint32 vi = 0; vi < vertexCount; ++vi)
-        {
-            Vertex& v = m_vertices[vi];
-            v.m_pFaceList = &m_vertexFaceLists[pos];
-            pos += v.m_aliveFaceCount;
-            v.m_aliveFaceCount = 0;
-        }
-        assert(pos == faceCount * verticesPerFace);
-
-        const uint32* pVertexIndex = &inVertexIndices[0];
-        for (uint32 fi = 0; fi < faceCount; ++fi, pVertexIndex += verticesPerFace)
-        {
-            for (uint j = 0; j < verticesPerFace; ++j)
-            {
-                Vertex& v = m_vertices[pVertexIndex[j]];
-                v.m_pFaceList[v.m_aliveFaceCount++] = fi;
-            }
-        }
-    }
-
-    // Compute vertex and face scores
-    {
-        for (uint32 vi = 0; vi < vertexCount; ++vi)
-        {
-            computeVertexScore(m_vertices[vi]);
-        }
-
-        const uint32* pVertexIndex = &inVertexIndices[0];
-        for (uint32 fi = 0; fi < faceCount; ++fi, pVertexIndex += verticesPerFace)
-        {
-            m_faceScores[fi] = 0;
-            for (uint j = 0; j < verticesPerFace; ++j)
-            {
-                const Vertex& v = m_vertices[pVertexIndex[j]];
-                m_faceScores[fi] += v.m_score;
-            }
-        }
-    }
-
-    // Add faces with highest scores to the output buffer, one by one.
-    uint32 faceSearchCursor = 0;
-    uint32 bestFaceToAdd;
-    for (;; )
-    {
-        // Find face with highest score
-        {
-            bestFaceToAdd = (uint32) - 1;
-            float highestScore = -1;
-            for (int i = 0; i < m_cacheUsedSize; ++i)
-            {
-                const Vertex& v = m_vertices[m_cache[i]];
-                const uint32* const pFaces = v.m_pFaceList;
-                for (valency_type j = 0; j < v.m_aliveFaceCount; ++j)
-                {
-                    const uint32 faceIndex = pFaces[j];
-                    if (highestScore < m_faceScores[faceIndex])
-                    {
-                        highestScore = m_faceScores[faceIndex];
-                        bestFaceToAdd = faceIndex;
-                    }
-                }
-            }
-
-            if (bestFaceToAdd == (uint32) - 1)
-            {
-                bestFaceToAdd = findBestFaceToAdd(faceSearchCursor);
-                assert(bestFaceToAdd != (uint32) - 1);
-            }
-        }
-
-        // Add the best face to the output buffer
-        {
-            size_t writtenIndexCount = writtenFaceCount * verticesPerFace;
-            for (uint j = 0; j < verticesPerFace; ++j)
-            {
-                outVertexIndices[writtenIndexCount + j] = inVertexIndices[(size_t)bestFaceToAdd * verticesPerFace + j];
-            }
-            if (outFaceToOldFace)
-            {
-                outFaceToOldFace[writtenFaceCount] = bestFaceToAdd;
-            }
-            if (++writtenFaceCount == faceCount)
-            {
-                // We're done.
-                return true;
-            }
-        }
-
-        // Make changes to the cache, vertex & cache scores, vertex face lists
-        {
-            m_deadFacesBitArray[bestFaceToAdd >> 3] |= 1 << (bestFaceToAdd & 7);
-
-            for (int j = verticesPerFace - 1; j >= 0; --j)
-            {
-                const uint32 vertexIndex = inVertexIndices[(size_t)bestFaceToAdd * verticesPerFace + j];
-                moveVertexToCacheTop(vertexIndex);
-                removeFaceFromVertex(vertexIndex, bestFaceToAdd);
-            }
-
-            for (int i = 0; i < m_cacheUsedSize; ++i)
-            {
-                Vertex& v = m_vertices[m_cache[i]];
-                if (i >= m_cacheSize)
-                {
-                    v.m_posInCache = -1;
-                }
-                const float oldScore = v.m_score;
-                computeVertexScore(v);
-                const float differenceScore = v.m_score - oldScore;
-                const uint32* const pFaces = v.m_pFaceList;
-                for (valency_type j = 0; j < v.m_aliveFaceCount; ++j)
-                {
-                    m_faceScores[pFaces[j]] += differenceScore;
-                }
-            }
-            if (m_cacheUsedSize > m_cacheSize)
-            {
-                m_cacheUsedSize = m_cacheSize;
-            }
-        }
-    }
-}
-
-
-void ForsythFaceReorderer::clear()
-{
-    m_vertices.clear();
-    m_deadFacesBitArray.clear();
-    m_faceScores.clear();
-    m_vertexFaceLists.clear();
-}
-
-void ForsythFaceReorderer::computeCacheScoreTable(const int verticesPerFace)
-{
-    static const float lastFaceScore = 0.75f;
-    static const float cacheDecayPower = 1.5f;
-
-    // Vertices of last added face should have *same* fixed score,
-    // because otherwise results will depend on the order of vertices
-    // in face (5,6,7 and 7,5,6 will produce different results).
-    for (int j = 0; j < verticesPerFace; ++j)
-    {
-        m_scoreTable_cachePosition[j] = lastFaceScore;
-    }
-
-    for (int i = verticesPerFace; i < m_cacheSize; ++i)
-    {
-        const float x = 1.0f - ((i - verticesPerFace) / (m_cacheSize - verticesPerFace));
-        m_scoreTable_cachePosition[i] = powf(x, cacheDecayPower);
-    }
-}
-
-void ForsythFaceReorderer::computeValencyScoreTable()
-{
-    // Lower number of alive faces in the vertex produces higher score.
-    // It allows to  get rid of lone vertices quickly.
-
-    static const float valencyPower = -0.5f;
-    static const float valencyScale = 2.0f;
-
-    m_scoreTable_valency[0] = 0;
-    for (valency_type i = 1; i < sk_valencyTableSize; ++i)
-    {
-        m_scoreTable_valency[i] = valencyScale * powf(i, valencyPower);
-    }
-}
-
-void ForsythFaceReorderer::computeVertexScore(ForsythFaceReorderer::Vertex& v)
-{
-    if (v.m_aliveFaceCount > 0)
-    {
-        assert(v.m_posInCache < m_cacheSize);
-        const float valencyScore = (v.m_aliveFaceCount < sk_valencyTableSize) ? m_scoreTable_valency[v.m_aliveFaceCount] : 0;
-        // Preventing "SCA: warning C6385: Invalid data: accessing 'm_scoreTable_cachePosition', the readable size is '200' bytes, but '484' bytes might be read"
-        PREFAST_SUPPRESS_WARNING(6385) const float cacheScore = (v.m_posInCache >= 0) ? m_scoreTable_cachePosition[v.m_posInCache] : 0;
-        v.m_score = valencyScore + cacheScore;
-    }
-}
-
-void ForsythFaceReorderer::moveVertexToCacheTop(const uint32 vertexIndex)
-{
-    const int oldPosInCache = m_vertices[vertexIndex].m_posInCache;
-    for (int dst = (oldPosInCache >= 0) ? oldPosInCache : m_cacheUsedSize; dst > 0; --dst)
-    {
-        const uint32 v = m_cache[dst - 1];
-        m_cache[dst] = v;
-        ++m_vertices[v].m_posInCache;
-    }
-    m_cache[0] = vertexIndex;
-    m_vertices[vertexIndex].m_posInCache = 0;
-    if (oldPosInCache < 0)
-    {
-        ++m_cacheUsedSize;
-    }
-}
-
-void ForsythFaceReorderer::removeFaceFromVertex(const uint32 vertexIndex, const uint32 faceIndex)
-{
-    Vertex& v = m_vertices[vertexIndex];
-    assert(v.m_aliveFaceCount > 0);
-    uint32* const pFaces = v.m_pFaceList;
-    for (int j = 0;; ++j)
-    {
-        if (pFaces[j] == faceIndex)
-        {
-            pFaces[j] = pFaces[--v.m_aliveFaceCount];
-            return;
-        }
-    }
-}
-
-uint32 ForsythFaceReorderer::findBestFaceToAdd(uint32& faceSearchCursor) const
-{
-    assert(!m_faceScores.empty());
-    assert(faceSearchCursor < m_faceScores.size());
-    while (m_deadFacesBitArray[faceSearchCursor >> 3] & (1 << (faceSearchCursor & 7)))
-    {
-        ++faceSearchCursor;
-    }
-    return faceSearchCursor++;
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/ForsythFaceReorderer.h b/Code/CryEngine/Cry3DEngine/MeshCompiler/ForsythFaceReorderer.h
deleted file mode 100644
index 6bc9df5f91..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/ForsythFaceReorderer.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <vector>
-
-#include <BaseTypes.h>
-
-#include "CompileTimeAssert.h"
-
-
-//
-// Note: This implementation, in contrast to many other implementations
-// of the Forsyth's algorithm, does not crash when the input faces contain
-// duplicate indices, for example (8,3,8) or (1,1,9).
-//
-class ForsythFaceReorderer
-{
-public:
-    static const size_t sk_maxCacheSize = 50; // you can change it. note: making it higher will increase sizeof(*this)
-    static const size_t sk_minVerticesPerFace = 3;
-    static const size_t sk_maxVerticesPerFace = 4;
-
-    COMPILE_TIME_ASSERT(sk_minVerticesPerFace >= 3); // Bad min # of vertices per face
-    COMPILE_TIME_ASSERT(sk_minVerticesPerFace <= sk_maxVerticesPerFace); // Bad # of vertices per face
-    COMPILE_TIME_ASSERT(sk_maxVerticesPerFace <= sk_maxCacheSize); // Bad max cache size
-
-private:
-    typedef uint16 valency_type;
-    static const valency_type sk_maxValency = 0xFFFF;
-
-    typedef int8 cachepos_type;
-    static const cachepos_type sk_maxCachePos = 127;
-
-    struct Vertex
-    {
-        uint32*       m_pFaceList;
-        valency_type  m_aliveFaceCount;
-        cachepos_type m_posInCache;
-        float         m_score;
-    };
-
-    static const size_t sk_valencyTableSize = 32;  // note: size_t is used instead of valency_type because valency_type overflows if sk_valencyTableSize == 1 + sk_maxValency
-    COMPILE_TIME_ASSERT(sk_valencyTableSize - 1 <= sk_maxValency); // Bad valency table size
-
-    COMPILE_TIME_ASSERT(sk_maxCacheSize <= 1 + (size_t)sk_maxCachePos); // Max cache size is too big
-
-    std::vector<Vertex> m_vertices;
-    std::vector<uint8>  m_deadFacesBitArray;
-    std::vector<float>  m_faceScores;        // score of every face
-    std::vector<uint32> m_vertexFaceLists;   // lists with indices of faces (each vertex has own list)
-
-    int    m_cacheSize;
-    int    m_cacheUsedSize;
-    uint32 m_cache[sk_maxCacheSize + sk_maxVerticesPerFace];  // +sk_maxVerticesPerFace is temporary storage for vertices of the incoming face
-
-    float  m_scoreTable_valency[sk_valencyTableSize];
-    float  m_scoreTable_cachePosition[sk_maxCacheSize];
-
-public:
-    ForsythFaceReorderer();
-
-    // notes:
-    // 1) it's not allowed to pass same array for inVertexIndices and outVertexIndices
-    // 2) outFaceToOldFace is optional (pass 0 if you don't need this array filled)
-    bool reorderFaces(
-        const size_t cacheSize,
-        const uint verticesPerFace,
-        const size_t indexCount,
-        const uint32* const inVertexIndices,
-        uint32* const outVertexIndices,
-        uint32* const outFaceToOldFace);
-
-private:
-    void clear();
-    void computeCacheScoreTable(const int verticesPerFace);
-    void computeValencyScoreTable();
-    void computeVertexScore(Vertex& v);
-    void moveVertexToCacheTop(const uint32 vertexIndex);
-    void removeFaceFromVertex(const uint32 vertexIndex, const uint32 faceIndex);
-    uint32 findBestFaceToAdd(uint32& faceSearchCursor) const;
-};
-
-
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.cpp b/Code/CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.cpp
deleted file mode 100644
index 23b8c99be0..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.cpp
+++ /dev/null
@@ -1,1547 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-#include <Cry_Geo.h>
-
-#include "MeshCompiler.h"
-#include "TangentSpaceCalculation.h"
-#include "ForsythFaceReorderer.h"
-#include "PVRTTriStrip/PVRTTriStrip.h"
-
-#include <cstring>    // memset()
-
-
-namespace mesh_compiler
-{
-    //////////////////////////////////////////////////////////////////////////
-    CMeshCompiler::CMeshCompiler()
-        : m_pVertexMap(0)
-        , m_pIndexMap(0)
-    {
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    CMeshCompiler::~CMeshCompiler()
-    {
-    }
-
-    namespace
-    {
-        struct VertexLess
-        {
-            const CMesh& mesh;
-
-            VertexLess(const CMesh& a_mesh)
-                : mesh(a_mesh)
-            {
-                assert(mesh.m_pPositionsF16 == 0);
-            }
-
-            bool operator()(int a, int b) const
-            {
-                if (mesh.m_pTopologyIds && mesh.m_pTopologyIds[a] != mesh.m_pTopologyIds[b])
-                {
-                    return mesh.m_pTopologyIds[a] < mesh.m_pTopologyIds[b];
-                }
-
-                int res = memcmp(&mesh.m_pPositions[a], &mesh.m_pPositions[b], sizeof(mesh.m_pPositions[a]));
-                if (res)
-                {
-                    return res < 0;
-                }
-                for (uint streamIndex = 0; streamIndex < CMesh::maxStreamsPerType; ++streamIndex)
-                {
-                    SMeshTexCoord* texCoords = mesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, streamIndex);
-                    if (texCoords)
-                    {
-                        res = memcmp(&texCoords[a], &texCoords[b], sizeof(texCoords[a]));
-                        if (res)
-                        {
-                            return res < 0;
-                        }
-                    }
-                }
-                if (mesh.m_pNorms)
-                {
-                    res = memcmp(&mesh.m_pNorms[a], &mesh.m_pNorms[b], sizeof(mesh.m_pNorms[a]));
-                    if (res)
-                    {
-                        return res < 0;
-                    }
-                }
-                if (mesh.m_pColor0)
-                {
-                    res = memcmp(&mesh.m_pColor0[a], &mesh.m_pColor0[b], sizeof(mesh.m_pColor0[a]));
-                    if (res)
-                    {
-                        return res < 0;
-                    }
-                }
-                if (mesh.m_pColor1)
-                {
-                    res = memcmp(&mesh.m_pColor1[a], &mesh.m_pColor1[b], sizeof(mesh.m_pColor1[a]));
-                    if (res)
-                    {
-                        return res < 0;
-                    }
-                }
-                if (mesh.m_pVertMats)
-                {
-                    res = memcmp(&mesh.m_pVertMats[a], &mesh.m_pVertMats[b], sizeof(mesh.m_pVertMats[a]));
-                    if (res)
-                    {
-                        return res < 0;
-                    }
-                }
-                if (mesh.m_pTangents)
-                {
-                    res = memcmp(&mesh.m_pTangents[a], &mesh.m_pTangents[b], sizeof(mesh.m_pTangents[a]));
-                    if (res)
-                    {
-                        return res < 0;
-                    }
-                }
-
-                return false;
-            }
-        };
-
-        // Copies a vertex from old to new mesh
-        inline void CopyMeshVertex(CMesh& newMesh, int newVertex, const CMesh& oldMesh, int oldVertex)
-        {
-            assert(newVertex < newMesh.GetVertexCount());
-            assert(newMesh.m_pPositionsF16 == 0);
-            assert(oldMesh.m_pPositionsF16 == 0);
-
-            newMesh.m_pPositions[newVertex] = oldMesh.m_pPositions[oldVertex];
-            if (oldMesh.m_pNorms)
-            {
-                newMesh.m_pNorms[newVertex] = oldMesh.m_pNorms[oldVertex];
-            }
-            if (oldMesh.m_pTopologyIds)
-            {
-                newMesh.m_pTopologyIds[newVertex] = oldMesh.m_pTopologyIds[oldVertex];
-            }
-            for (uint streamIndex = 0; streamIndex < CMesh::maxStreamsPerType; ++streamIndex)
-            {
-                SMeshTexCoord* oldMeshTexCoords = oldMesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, streamIndex);
-                if (oldMeshTexCoords)
-                {
-                    SMeshTexCoord* newMeshTexCoords = newMesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, streamIndex);
-                    newMeshTexCoords[newVertex] = oldMeshTexCoords[oldVertex];
-                }
-            }
-            if (oldMesh.m_pColor0)
-            {
-                newMesh.m_pColor0[newVertex] = oldMesh.m_pColor0[oldVertex];
-            }
-            if (oldMesh.m_pColor1)
-            {
-                newMesh.m_pColor1[newVertex] = oldMesh.m_pColor1[oldVertex];
-            }
-            if (oldMesh.m_pVertMats)
-            {
-                newMesh.m_pVertMats[newVertex] = oldMesh.m_pVertMats[oldVertex];
-            }
-            if (oldMesh.m_pTangents)
-            {
-                newMesh.m_pTangents[newVertex] = oldMesh.m_pTangents[oldVertex];
-            }
-            //New since Touch Bending Gem. A Mesh can have boneMappings.
-            if (oldMesh.m_pBoneMapping)
-            {
-                newMesh.m_pBoneMapping[newVertex] = oldMesh.m_pBoneMapping[oldVertex];
-            }
-        }
-
-        // Modified version of MeshUtils::Mesh::ComputeVertexRemapping()
-        // Computes vertexOldToNew and vertexNewToOld by detecting duplicate vertices
-        void ComputeVertexRemapping(const CMesh& mesh, std::vector<int>& vertexOldToNew, std::vector<int>& vertexNewToOld)
-        {
-            const size_t nVerts = mesh.GetVertexCount();
-
-            vertexNewToOld.resize(nVerts);
-            for (size_t i = 0; i < nVerts; ++i)
-            {
-                vertexNewToOld[i] = i;
-            }
-
-            VertexLess less(mesh);
-            std::sort(vertexNewToOld.begin(), vertexNewToOld.end(), less);
-
-            vertexOldToNew.resize(nVerts);
-
-            int nVertsNew = 0;
-            for (size_t i = 0; i < nVerts; ++i)
-            {
-                if (i == 0 || less(vertexNewToOld[i - 1], vertexNewToOld[i]))
-                {
-                    vertexNewToOld[nVertsNew++] = vertexNewToOld[i];
-                }
-                vertexOldToNew[vertexNewToOld[i]] = nVertsNew - 1;
-            }
-            vertexNewToOld.resize(nVertsNew);
-        }
-    } // namespace
-
-    //////////////////////////////////////////////////////////////////////////
-
-    namespace
-    {
-        class CMeshInputProxy
-            : public ITriangleInputProxy
-        {
-            struct Index
-            {
-                int index;
-                int origPos;
-            };
-
-            template <class TComparator>
-            void prepareUniqueIndices(std::vector<int>& outIndices, std::vector<Index>& tmp, const TComparator& comparator)
-            {
-                const int faceCount = m_mesh.GetFaceCount();
-
-                tmp.resize(faceCount * 3);
-                outIndices.resize(faceCount * 3, -1);
-
-                for (int i = 0; i < faceCount; ++i)
-                {
-                    for (int j = 0; j < 3; ++j)
-                    {
-                        tmp[i * 3 + j].index = m_mesh.m_pFaces[i].v[j];
-                        tmp[i * 3 + j].origPos = i * 3 + j;
-                    }
-                }
-
-                std::sort(tmp.begin(), tmp.end(), comparator);
-
-                int curIndex = -1;
-                for (int i = 0, n = faceCount * 3; i < n; ++i)
-                {
-                    if (curIndex < 0 || comparator(tmp[i - 1], tmp[i]))
-                    {
-                        curIndex = tmp[i].index;
-                    }
-                    outIndices[tmp[i].origPos] = curIndex;
-                }
-            }
-
-            const char* ValidateMesh() const
-            {
-                if (m_mesh.m_pPositionsF16)
-                {
-                    return "the mesh has 16-bit positions";
-                }
-                if (!m_mesh.m_pFaces)
-                {
-                    return "the mesh has no stream with faces";
-                }
-                if (!m_mesh.m_pPositions)
-                {
-                    return "the mesh has no stream with positions";
-                }
-                if (!m_mesh.m_pNorms)
-                {
-                    return "the mesh has no stream with normals";
-                }
-                if (!m_mesh.m_pTexCoord)
-                {
-                    return "the mesh has no stream with texture coordinates";
-                }
-
-                const int faceCount = m_mesh.GetFaceCount();
-                const int vertexCount = m_mesh.GetVertexCount();
-                const int texCoordCount = m_mesh.GetTexCoordCount();
-                if (faceCount <= 0)
-                {
-                    return "face count in the mesh is 0";
-                }
-                if (vertexCount <= 0)
-                {
-                    return "vertex count in the mesh is 0";
-                }
-                if (texCoordCount <= 0)
-                {
-                    return "texture coordinate count in the mesh is 0";
-                }
-                if (vertexCount != texCoordCount)
-                {
-                    return "mismatch in number of positions and texture coordinates in the mesh";
-                }
-
-                for (int i = 0; i < faceCount; ++i)
-                {
-                    for (int j = 0; j < 3; ++j)
-                    {
-                        const int vIdx = m_mesh.m_pFaces[i].v[j];
-                        if (vIdx < 0 || vIdx >= vertexCount)
-                        {
-                            return "a face in the mesh has vertex index that is out of range";
-                        }
-                    }
-                }
-
-                // Trying to trigger a crash if a stream size is not correct
-                {
-                    Vec3 v(0.0f, 0.0f, 0.0f);
-                    SMeshNormal n(v);
-                    SMeshTexCoord uv(0, 0);
-
-                    v  = m_mesh.m_pPositions[0];
-                    v  = m_mesh.m_pPositions[vertexCount - 1];
-                    n  = m_mesh.m_pNorms[0];
-                    n  = m_mesh.m_pNorms[vertexCount - 1];
-                    uv = m_mesh.m_pTexCoord[0];
-                    uv = m_mesh.m_pTexCoord[vertexCount - 1];
-                }
-
-                return 0;
-            }
-
-        public:
-            CMeshInputProxy(const CMesh& inMesh)
-                : m_mesh(inMesh)
-            {
-                m_pErrorText = ValidateMesh();
-                if (m_pErrorText)
-                {
-                    return;
-                }
-
-                assert(m_mesh.m_pPositionsF16 == 0);
-
-                struct PositionComparator
-                {
-                    const Vec3* const pPositions;
-                    const int* const pTopologyIds;
-
-                    PositionComparator(const Vec3* const a_pPositions, const int* const a_pTopologyIds)
-                        : pPositions(a_pPositions)
-                        , pTopologyIds(a_pTopologyIds)
-                    {
-                    }
-
-                    bool operator()(const Index& v0, const Index& v1) const
-                    {
-                        if (pTopologyIds)
-                        {
-                            const int a = pTopologyIds[v0.index];
-                            const int b = pTopologyIds[v1.index];
-                            if (a != b)
-                            {
-                                return a < b;
-                            }
-                        }
-                        const Vec3& a = pPositions[v0.index];
-                        const Vec3& b = pPositions[v1.index];
-                        if (a.x != b.x)
-                        {
-                            return a.x < b.x;
-                        }
-                        if (a.y != b.y)
-                        {
-                            return a.y < b.y;
-                        }
-                        return a.z < b.z;
-                    }
-                };
-
-                struct NormalComparator
-                {
-                    const SMeshNormal* const pNormals;
-
-                    NormalComparator(const SMeshNormal* const a_pNormals)
-                        : pNormals(a_pNormals)
-                    {
-                    }
-
-                    bool operator()(const Index& v0, const Index& v1) const
-                    {
-                        const SMeshNormal& a = pNormals[v0.index];
-                        const SMeshNormal& b = pNormals[v1.index];
-
-                        return a < b;
-                    }
-                };
-
-                struct TexCoordComparator
-                {
-                    const SMeshTexCoord* const pTexCoords;
-
-                    TexCoordComparator(const SMeshTexCoord* const a_pTexCoords)
-                        : pTexCoords(a_pTexCoords)
-                    {
-                    }
-
-                    bool operator()(const Index& v0, const Index& v1) const
-                    {
-                        const SMeshTexCoord& a = pTexCoords[v0.index];
-                        const SMeshTexCoord& b = pTexCoords[v1.index];
-
-                        return a < b;
-                    }
-                };
-
-                std::vector<Index> tmp;
-                prepareUniqueIndices(m_posIndx, tmp, PositionComparator(m_mesh.m_pPositions, m_mesh.m_pTopologyIds));
-                prepareUniqueIndices(m_normIndx, tmp, NormalComparator(m_mesh.m_pNorms));
-                prepareUniqueIndices(m_texCoordIndx, tmp, TexCoordComparator(m_mesh.m_pTexCoord));
-                SMeshTexCoord* texCoords = m_mesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, 1);
-                if (texCoords)
-                {
-                    prepareUniqueIndices(m_texCoord2Indx, tmp, TexCoordComparator(texCoords));
-                }
-            }
-
-            const char* GetErrorText() const
-            {
-                return m_pErrorText;
-            }
-
-            // interface ITriangleInputProxy ----------------------------------------------
-
-            //! /return 0..
-            uint32 GetTriangleCount() const
-            {
-                return m_mesh.GetFaceCount();
-            }
-
-            //! /param indwTriNo 0..
-            //! /param outdwPos
-            //! /param outdwNorm
-            //! /param outdwUV
-            void GetTriangleIndices(const uint32 indwTriNo, uint32 outdwPos[3], uint32 outdwNorm[3], uint32 outdwUV[3]) const
-            {
-                const int* const pPosInds = &m_posIndx[indwTriNo * 3];
-                const int* const pNormInds = &m_normIndx[indwTriNo * 3];
-                const int* const pTexCoordInds = &m_texCoordIndx[indwTriNo * 3];
-
-                for (int j = 0; j < 3; ++j)
-                {
-                    outdwPos[j] = pPosInds[j];
-                    outdwUV[j] = pTexCoordInds[j];
-                    outdwNorm[j] = pNormInds[j];
-                }
-            }
-
-            //! /param indwPos 0..
-            //! /param outfPos
-            void GetPos(const uint32 indwPos, Vec3& outfPos) const
-            {
-                assert(!m_pErrorText);
-                assert((int)indwPos < m_mesh.GetVertexCount());
-                outfPos = m_mesh.m_pPositions[indwPos];
-            }
-
-            //! /param indwPos 0..
-            //! /param outfUV
-            void GetUV(const uint32 indwPos, Vec2& outfUV) const
-            {
-                assert(!m_pErrorText);
-                assert((int)indwPos < m_mesh.GetTexCoordCount());
-                outfUV = m_mesh.m_pTexCoord[indwPos].GetUV();
-            }
-
-            //! /param indwTriNo 0..
-            //! /param indwVertNo 0..
-            //! /param outfNorm
-            void GetNorm(const uint32 indwTriNo, const uint32 indwVertNo, Vec3& outfNorm) const
-            {
-                assert(!m_pErrorText);
-                assert((int)indwTriNo < m_mesh.GetFaceCount());
-                assert((int)indwVertNo < 3);
-                const int vIdx = m_mesh.m_pFaces[indwTriNo].v[indwVertNo];
-                assert(vIdx < m_mesh.GetVertexCount());
-                outfNorm = m_mesh.m_pNorms[vIdx].GetN();
-            }
-            //-----------------------------------------------------------------------------
-
-        private:
-            const CMesh& m_mesh;
-            const char* m_pErrorText;
-            std::vector<int> m_posIndx; // indices of unique positions (in mesh.m_pPositions) for each corner of each triangle
-            std::vector<int> m_normIndx; // indices of unique normals (in mesh.m_pNorms) for each corner of each triangle
-            std::vector<int> m_texCoordIndx; // indices of unique texture coordinates normals (in mesh.m_pTexCoord) for each corner of each triangle
-            std::vector<int> m_texCoord2Indx; // indices of unique texture coordinates normals (in mesh.m_pTexCoord[1]) for each corner of each triangle for the 2nd uv set
-        };
-    }
-
-
-    //do not use vec3 lib to keep it the fallback as it was
-    inline static Vec3 CrossProd(const Vec3& a, const Vec3& b)
-    {
-        Vec3 ret;
-        ret.x = a.y * b.z - a.z * b.y;
-        ret.y = a.z * b.x - a.x * b.z;
-        ret.z = a.x * b.y - a.y * b.x;
-        return ret;
-    }
-
-    inline static void GetOtherBaseVec(const Vec3& s, Vec3& a, Vec3& b)
-    {
-        if (fabsf(s.z) > 0.5f)
-        {
-            a.x =  s.z;
-            a.y =  s.y;
-            a.z = -s.x;
-        }
-        else
-        {
-            a.x =  s.y;
-            a.y = -s.x;
-            a.z =  s.z;
-        }
-
-        b = CrossProd(s, a).normalize();
-        a = CrossProd(b, s).normalize();
-    }
-
-    //check packed tangent space and ensure some useful values, fix always according to normal
-    static void VerifyTangentSpace(SMeshTangents& rTangents, const SMeshNormal& rNormal)
-    {
-        Vec3 normal = rNormal.GetN();
-
-        if (normal.GetLengthSquared() < 0.1f)
-        {
-            normal = Vec3(0, 0, 1);
-        }
-        else if (normal.GetLengthSquared() < 0.9f)
-        {
-            normal.Normalize();
-        }
-
-        //unpack first(necessary since the quantization can introduce errors whereas the original float data were different)
-        Vec3 tangent, bitangent;
-        rTangents.GetTB(tangent, bitangent);
-
-        //check if they are equal
-        const bool cIsEqual = (tangent == bitangent);
-        //check if they are zero
-        const bool cTangentIsZero   = (tangent.GetLengthSquared() < 0.01f);
-        const bool cBitangentIsZero = (bitangent.GetLengthSquared() < 0.01f);
-        const bool cbHasBeenChanged = (cIsEqual || cTangentIsZero || cBitangentIsZero);
-
-        if (cIsEqual)
-        {
-            //fix case where both vec's are equal
-            GetOtherBaseVec(normal, tangent, bitangent);
-        }
-        else
-        if (cTangentIsZero)
-        {
-            //fix case where tangent is zero
-            bitangent.Normalize();//just to make sure
-            if (abs(bitangent * normal) > 0.9f)//if angle between both vecs is to low, calc new one for both
-            {
-                GetOtherBaseVec(normal, tangent, bitangent);
-            }
-            else
-            {
-                tangent = CrossProd(normal, bitangent);
-            }
-        }
-        else
-        if (cBitangentIsZero)
-        {
-            //fix case where bitangent is zero
-            tangent.Normalize();//just to make sure
-            if (abs(tangent * normal) > 0.9f)//if angle between both vecs is to low, calc new one for both
-            {
-                GetOtherBaseVec(normal, tangent, bitangent);
-            }
-            else
-            {
-                bitangent = CrossProd(tangent, normal);
-            }
-        }
-
-        //pack altered tangent vecs
-        if (cbHasBeenChanged)
-        {
-            rTangents = SMeshTangents(tangent, bitangent, normal);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Optimizes CMesh.
-    // IMPLEMENTATION:
-    // . Sort|Group faces by materials
-    // . Create vertex buffer with sequence of (possibly non-unique) vertices, 3 verts per face
-    // . For each (non-unique) vertex calculate the tangent base
-    // . Index the mesh (Compact Vertices): detect and delete duplicate vertices
-    // . Remove degenerated triangles in the generated mesh (GetIndices())
-    // . Sort vertices and indices for GPU cache
-    bool CMeshCompiler::Compile(CMesh& mesh, int flags)
-    {
-        assert(mesh.m_pPositionsF16 == 0);
-
-        if (mesh.GetFaceCount() == 0)
-        {
-            // the mesh is either empty or already compiled
-
-            const int cVertexCount = mesh.GetVertexCount();
-            if (cVertexCount == 0)
-            {
-                // the mesh is empty, nothing to do
-                return true;
-            }
-
-            // the mesh is already compiled, likely to have a refresh here: just verify and correct tangent space
-            if (mesh.m_pTangents && mesh.m_pNorms)
-            {
-                for (int i = 0; i < cVertexCount; ++i)
-                {
-                    VerifyTangentSpace(mesh.m_pTangents[i], mesh.m_pNorms[i]);
-                }
-            }
-
-
-            // Confetti begin: David Srour
-            // A CGF is already compiled as soon as a mesh is imported in the editor.
-            // Thus, the following code path branch will only get hit if:
-            //   - RC job is being done outside the editor (eg. when compiling mobile resources via XML file)
-            //   - Job input is an already compiled CGF file
-            //   - "Refresh" was specific to force recompile
-            //   - "OptimizedPrimitiveType = 1" to specify PowerVR stripify algorithm
-            if (flags & MESH_COMPILE_PVR_STRIPIFY)
-            {
-                const bool bOk = StripifyMesh_PVRTriStripList(mesh);
-                if (!bOk)
-                {
-                    m_LastError.Format("Mesh compilation failed - stripifier failed. Contact an RC programmer.");
-                    return false;
-                }
-                FindVertexRanges(mesh);
-            }
-
-            return true;
-        }
-
-        // the mesh has faces - it means that it's a non-compiled mesh. let's compile it.
-
-        // Check input data
-        {
-            if (mesh.GetIndexCount() > 0)
-            {
-                m_LastError.Format(
-                    "Mesh compilation failed - input mesh has both indices and faces. Contact an RC programmer.");
-                return false;
-            }
-
-            const int vertexCount = mesh.GetVertexCount();
-            const int faceCount = mesh.GetFaceCount();
-            const int subSetCount = mesh.GetSubSetCount();
-
-            if (subSetCount >= MAX_SUB_MATERIALS)
-            {
-                m_LastError.Format(
-                    "Mesh compilation failed - Number of subsets (%d) exceeds the maximum amount of sub-materials (%d).",
-                    subSetCount, MAX_SUB_MATERIALS);
-                return false;
-            }
-
-            for (int i = 0; i < faceCount; ++i)
-            {
-                const SMeshFace& face = mesh.m_pFaces[i];
-                if (face.nSubset < 0 || face.nSubset >= subSetCount)
-                {
-                    m_LastError.Format(
-                        "Mesh compilation failed - face %d has bad subset index %d (allowed range is [0;%d]). Contact an RC programmer.",
-                        i, (int)face.nSubset, subSetCount - 1);
-                    return false;
-                }
-                for (int j = 0; j < 3; ++j)
-                {
-                    const int vIdx = mesh.m_pFaces[i].v[j];
-                    if (vIdx < 0 || vIdx >= vertexCount)
-                    {
-                        m_LastError.Format(
-                            "Mesh compilation failed - face %d has bad vertex index %d (allowed range is [0;%d]). Contact an RC programmer.",
-                            i, vIdx, vertexCount - 1);
-                        return false;
-                    }
-                }
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Calculate Tangent Space.
-        // Results will be stored in bases[] and m_thash_table[]
-        //////////////////////////////////////////////////////////////////////////
-
-        std::vector<SMeshTangents> bases;
-
-        // m_thash_table[] contains a std::vector<SBasisFace> per subset.
-        // Vector contains faces belonging to the subset.
-        // Face contains three indices of elements in bases[].
-        COMPILE_TIME_ASSERT(sizeof(m_thash_table) / sizeof(m_thash_table[0]) == MAX_SUB_MATERIALS);
-        for (int i = 0; i < MAX_SUB_MATERIALS; ++i)
-        {
-            m_thash_table[i].clear();
-        }
-
-        if (flags & MESH_COMPILE_TANGENTS)
-        {
-            // Generate tangent basis vectors before indexing per-material
-
-            CMeshInputProxy Input(mesh);
-            if (Input.GetErrorText())
-            {
-                m_LastError.Format("Mesh compilation failed - %s. Contact an RC or Editor programmer.", Input.GetErrorText());
-                return false;
-            }
-
-            CTangentSpaceCalculation tangents;
-            string errorMessage;
-
-            // calculate the base matrices
-            const bool bUseCustomNormals = (flags & MESH_COMPILE_USECUSTOMNORMALS) ? true : false;
-            const eCalculateTangentSpaceErrorCode nErrorCode = tangents.CalculateTangentSpace(Input, bUseCustomNormals, errorMessage);
-
-            if (nErrorCode != CALCULATE_TANGENT_SPACE_NO_ERRORS)
-            {
-                const char* errorCodeMessage;
-
-                switch (nErrorCode)
-                {
-                case VERTICES_SHARING_COORDINATES:
-                    errorCodeMessage = "Asset contains non-manifold geometry.\nPlease fix the model in your DCC tool to solve this issue.\n";
-                    break;
-                case ALL_VERTICES_ON_THE_SAME_VECTOR:
-                    errorCodeMessage = "Asset contains non-manifold geometry.\nPlease fix the model in your DCC tool to solve this issue.\n";
-                    break;
-                case BROKEN_TEXTURE_COORDINATES:
-                    errorCodeMessage = "Texture UV coordinates are not valid.\nCheck that the UV's have space on the UV map in your DCC tool to solve this issue.\n";
-                    break;
-                case MEMORY_ALLOCATION_FAILED:
-                    errorCodeMessage = "Mesh compiler failed to allocate memory for compilation.\nYou can reduce the size of your mesh to attempt to solve this issue.\n";
-                    break;
-                default:
-                    AZ_Assert(false, "Unknown error code. Please implement a failure message.");
-                    errorCodeMessage = "Unknown error code encountered.\nThis happens when a programmer has not implemented a message for an error code.\n";
-                    break;
-                }
-
-                m_LastError.Format("\n%s%sCalculateTangentSpace() failed - error code: %d", errorCodeMessage, errorMessage.c_str(), nErrorCode);
-                return false;
-            }
-
-            const uint32 dwCnt = tangents.GetBaseCount();
-            const uint32 dwTris = Input.GetTriangleCount();
-
-            bases.resize(dwCnt);
-
-            std::vector<int> basisIndices;
-            basisIndices.resize(dwTris * 3);
-
-            for (uint32 dwTri = 0; dwTri < dwTris; dwTri++)
-            {
-                uint32 dwBaseIndx[3];
-
-                tangents.GetTriangleBaseIndices(dwTri, dwBaseIndx);
-
-                // for every corner of the triangle
-                for (uint32 i = 0; i < 3; i++)
-                {
-                    assert(dwBaseIndx[i] < dwCnt);
-                    basisIndices[dwTri * 3 + i] = dwBaseIndx[i]; // set the base vector
-                }
-            }
-
-            for (uint32 i = 0; i < dwCnt; i++)
-            {
-                Vec3 Tangent, Bitangent, Normal;
-
-                tangents.GetBase(i, (float*)&Tangent, (float*)&Bitangent, (float*)&Normal);
-
-                bases[i] = SMeshTangents(Tangent, Bitangent, Normal);
-
-                VerifyTangentSpace(bases[i], SMeshNormal(Normal));
-            }
-
-            const int faceCount = mesh.GetFaceCount();
-            for (int i = 0; i < faceCount; i++)
-            {
-                SBasisFace fc;
-
-                fc.v[0] = basisIndices[i * 3 + 0];
-                fc.v[1] = basisIndices[i * 3 + 1];
-                fc.v[2] = basisIndices[i * 3 + 2];
-
-                const SMeshFace& face = mesh.m_pFaces[i];
-                m_thash_table[face.nSubset].push_back(fc);
-            }
-        }
-        //////////////////////////////////////////////////////////////////////////
-
-        // Create new mesh that will store non-unique vertices, 3 vertices per face
-
-        const int max_vert_num = mesh.GetFaceCount() * 3;
-
-        CMesh outMesh;
-        outMesh.Copy(mesh);
-        outMesh.SetVertexCount(max_vert_num);
-        outMesh.ReallocStream(CMesh::VERT_MATS, 0, max_vert_num);
-        if (mesh.m_pTopologyIds)
-        {
-            outMesh.ReallocStream(CMesh::TOPOLOGY_IDS, 0, max_vert_num);
-        }
-        if (mesh.m_pTexCoord)
-        {
-            outMesh.ReallocStream(CMesh::TEXCOORDS, 0, max_vert_num);
-        }
-        if (mesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, 1))
-        {
-            outMesh.ReallocStream(CMesh::TEXCOORDS, 1, max_vert_num);
-        }
-        if (flags & MESH_COMPILE_TANGENTS)
-        {
-            outMesh.ReallocStream(CMesh::TANGENTS, 0, max_vert_num);
-        }
-        if (mesh.m_pColor0)
-        {
-            outMesh.ReallocStream(CMesh::COLORS, 0, max_vert_num);
-        }
-        if (mesh.m_pColor1)
-        {
-            outMesh.ReallocStream(CMesh::COLORS, 1, max_vert_num);
-        }
-        //New Since Touch Bending Gem. A Touch Bendable Mesh has bone mappings.
-        if (mesh.m_pBoneMapping)
-        {
-            outMesh.ReallocStream(CMesh::BONEMAPPING, 0, max_vert_num);
-        }
-
-        // temporarily store original subset index in subset's nNumVerts
-        {
-            const uint32 nSubsets = outMesh.GetSubSetCount();
-            for (uint32 i = 0; i < nSubsets; i++)
-            {
-                outMesh.m_subsets[i].nNumVerts = i;
-            }
-        }
-
-        // Sort subsets depending on their physicalization type (don't do it for character meshes (with mapping)).
-        if (!m_pVertexMap)
-        {
-            // move normal physicalize subsets to the beginning (needed for breakable objects)
-            for (uint32 i = 0; i < (uint32)outMesh.m_subsets.size(); i++)
-            {
-                const SMeshSubset& outSubset = outMesh.m_subsets[i];
-                if (outSubset.nPhysicalizeType == PHYS_GEOM_TYPE_DEFAULT)
-                {
-                    const SMeshSubset tmp = outSubset;
-                    outMesh.m_subsets.erase(outMesh.m_subsets.begin() + i);
-                    outMesh.m_subsets.insert(outMesh.m_subsets.begin(), tmp);
-                }
-            }
-            // move physicalize proxy subsets to the end
-            for (int nSubset = (int)outMesh.m_subsets.size() - 1; nSubset >= 0; --nSubset)
-            {
-                const SMeshSubset& outSubset = outMesh.m_subsets[nSubset];
-                if (outSubset.nPhysicalizeType != PHYS_GEOM_TYPE_NONE && outSubset.nPhysicalizeType != PHYS_GEOM_TYPE_DEFAULT)
-                {
-                    const SMeshSubset tmp = outSubset;
-                    outMesh.m_subsets.erase(outMesh.m_subsets.begin() + nSubset);
-                    outMesh.m_subsets.push_back(tmp);
-                }
-            }
-        }
-
-        // m_vhash_table[] contains a std::vector<SMeshFace> per subset.
-        // Vector contains faces belonging to the subset.
-        // Face contains three indices of elements in mesh.m_pVertices[].
-        COMPILE_TIME_ASSERT(sizeof(m_vhash_table) / sizeof(m_vhash_table[0]) == MAX_SUB_MATERIALS);
-        for (int i = 0; i < MAX_SUB_MATERIALS; ++i)
-        {
-            m_vhash_table[i].clear();
-        }
-        for (int i = 0, n = mesh.GetFaceCount(); i < n; ++i)
-        {
-            const SMeshFace& face = mesh.m_pFaces[i];
-            m_vhash_table[face.nSubset].push_back(&face);
-        }
-
-        // Fill the new mesh with vertices
-        {
-            int buff_vert_count = 0;
-
-            for (int t = 0; t < outMesh.GetSubSetCount(); t++)
-            {
-                SMeshSubset& subset = outMesh.m_subsets[t];
-                // memorize the starting index of this material's face range
-                subset.nFirstIndexId = buff_vert_count;
-
-                // scan through all the faces using the shader #t.
-                // note: subset's nNumVerts contains original subset index
-                const size_t nNumFacesInSubset = m_vhash_table[subset.nNumVerts].size();
-                for (size_t i = 0; i < nNumFacesInSubset; ++i)
-                {
-                    const SMeshFace* const pFace = m_vhash_table[subset.nNumVerts][i];
-
-                    for (int v = 0; v < 3; ++v)
-                    {
-                        CopyMeshVertex(outMesh, buff_vert_count, mesh, pFace->v[v]);
-
-                        if (!bases.empty())
-                        {
-                            const SBasisFace& tFace = m_thash_table[subset.nNumVerts][i];
-                            outMesh.m_pTangents[buff_vert_count] = bases[tFace.v[v]];
-                        }
-
-                        // store subset id to prevent vertex sharing between materials during re-compacting
-                        outMesh.m_pVertMats[buff_vert_count] = pFace->nSubset;
-
-                        ++buff_vert_count;
-                    }
-                }
-
-                subset.nNumIndices = buff_vert_count - subset.nFirstIndexId;
-            }
-
-            if (buff_vert_count != max_vert_num)
-            {
-                m_LastError.Format("Mesh compilation failed - internal error inf handling vertices. Contact an RC programmer.");
-                return false;
-            }
-        }
-
-        if (!CreateIndicesAndDeleteDuplicateVertices(outMesh))
-        {
-            return false;
-        }
-
-        if (flags & MESH_COMPILE_VALIDATE_FAIL_ON_DEGENERATE_FACES)
-        {
-            if(CheckForDegenerateFaces(outMesh))
-            {
-                m_LastError.Format("Mesh contains degenerate faces.");
-                return false;
-            }
-        }
-
-        if (flags & MESH_COMPILE_OPTIMIZE)
-        {
-            const bool bOk = StripifyMesh_Forsyth(outMesh);
-            if (!bOk)
-            {
-                m_LastError.Format("Mesh compilation failed - stripifier failed. Contact an RC programmer.");
-                return false;
-            }
-        }
-        else
-        {
-            if (m_pIndexMap || m_pVertexMap)
-            {
-                m_LastError.Format("Mesh compilation failed - face and/or index maps cannot be requested without OPTIMIZE. Contact an RC programmer.");
-                return false;
-            }
-        }
-
-        FindVertexRanges(outMesh);
-
-        // Copy modified mesh back to original one.
-        mesh.Copy(outMesh);
-
-        // Calculate bounding box.
-        mesh.m_bbox.Reset();
-        for (int i = 0, n = mesh.GetVertexCount(); i < n; ++i)
-        {
-            mesh.m_bbox.Add(mesh.m_pPositions[i]);
-        }
-
-        if (flags & MESH_COMPILE_VALIDATE)
-        {
-            const char* pErrorDescription = 0;
-            if (!mesh.Validate(&pErrorDescription))
-            {
-                m_LastError.Format("Internal error in mesh compiling (%s). Contact an RC programmer.", pErrorDescription);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-    bool CMeshCompiler::StripifyMesh_Forsyth(CMesh& mesh)
-    {
-        if (mesh.GetFaceCount() > 0)
-        {
-            // We don't support stripifying of meshes with explicit faces, we support meshes with index array only
-            return false;
-        }
-
-        enum
-        {
-            kCACHESIZE_GEFORCE3 = 24
-        };
-        const size_t cacheSize = kCACHESIZE_GEFORCE3;
-        enum
-        {
-            kVerticesPerFace = 3
-        };
-
-        // Prepare mapping buffers
-        if (m_pIndexMap)
-        {
-            const int n = mesh.GetIndexCount();
-            m_pIndexMap->resize(n);
-            for (int i = 0; i < n; ++i)
-            {
-                (*m_pIndexMap)[i] = mesh.m_pIndices[i];
-            }
-        }
-        if (m_pVertexMap)
-        {
-            const int n = mesh.GetVertexCount();
-            m_pVertexMap->resize(n, -1);
-        }
-
-
-        CMesh newMesh;
-        newMesh.Copy(mesh);
-
-        // TODO: make those variables members of CMeshCompiler so we don't need to allocate memory every time
-        ForsythFaceReorderer ffr;
-        std::vector<uint32> buffer0;
-        std::vector<uint32> buffer1;
-
-        // Reserve space
-        //
-        // We will use buffer0 for both subset's indices and for mapping from old vertex indices
-        // to new vertex indices (number of vertices decreases in case some vertices are not
-        // referenced from indices). In the latter case having size of buffer0 equal to number of
-        // indices is not enough if indices refer vertices in a spare fashion. Unfortunately,
-        // to compute range of referenced vertices we need to scan all indices in all subsets
-        // which is not fast.
-        {
-            int maxIndexCountInSubset = 0;
-            int maxVertexCountInSubset = 0;
-
-            for (int i = 0; i < newMesh.GetSubSetCount(); i++)
-            {
-                const SMeshSubset& subset = mesh.m_subsets[i];
-
-                if (subset.nNumIndices == 0)
-                {
-                    continue;
-                }
-                if (subset.nNumIndices < 0)
-                {
-                    assert(0);
-                    return false;
-                }
-                if (subset.nNumIndices % kVerticesPerFace != 0)
-                {
-                    assert(0);
-                    return false;
-                }
-                if (subset.nFirstIndexId % kVerticesPerFace != 0)
-                {
-                    assert(0);
-                    return false;
-                }
-
-                if (maxIndexCountInSubset < subset.nNumIndices)
-                {
-                    maxIndexCountInSubset = subset.nNumIndices;
-                }
-
-                int subsetMinIndex = mesh.m_pIndices[subset.nFirstIndexId];
-                int subsetMaxIndex = subsetMinIndex;
-                for (int j = 1; j < subset.nNumIndices; ++j)
-                {
-                    const int idx = mesh.m_pIndices[subset.nFirstIndexId + j];
-                    if (idx < subsetMinIndex)
-                    {
-                        subsetMinIndex = idx;
-                    }
-                    else if (idx > subsetMaxIndex)
-                    {
-                        subsetMaxIndex = idx;
-                    }
-                }
-
-                if (maxVertexCountInSubset < subsetMaxIndex - subsetMinIndex + 1)
-                {
-                    maxVertexCountInSubset = subsetMaxIndex - subsetMinIndex + 1;
-                }
-            }
-
-            buffer0.resize(max(maxIndexCountInSubset, maxVertexCountInSubset));
-            buffer1.resize(maxIndexCountInSubset);
-        }
-
-        int newVertexCount = 0;
-
-        for (int i = 0; i < newMesh.GetSubSetCount(); i++)
-        {
-            const SMeshSubset& subset = mesh.m_subsets[i];
-
-            if (subset.nNumIndices == 0)
-            {
-                continue;
-            }
-
-            int subsetMinIndex = mesh.m_pIndices[subset.nFirstIndexId];
-            int subsetMaxIndex = subsetMinIndex;
-            for (int j = 1; j < subset.nNumIndices; ++j)
-            {
-                const int idx = mesh.m_pIndices[subset.nFirstIndexId + j];
-                if (idx < subsetMinIndex)
-                {
-                    subsetMinIndex = idx;
-                }
-                else if (idx > subsetMaxIndex)
-                {
-                    subsetMaxIndex = idx;
-                }
-            }
-
-            for (int j = 0; j < subset.nNumIndices; ++j)
-            {
-                buffer0[j] = mesh.m_pIndices[subset.nFirstIndexId + j] - subsetMinIndex;
-            }
-
-            const bool bOk = ffr.reorderFaces(
-                    cacheSize,
-                    kVerticesPerFace,
-                    subset.nNumIndices,
-                    &buffer0[0], // inVertexIndices
-                    &buffer1[0], // outVertexIndices
-                    0);   // faceToOldFace[] - we don't need it
-
-            if (!bOk)
-            {
-                return false;
-            }
-
-            // Reorder vertices
-
-            SMeshSubset& newSubset = newMesh.m_subsets[i];
-            newSubset.nFirstVertId = newVertexCount;
-            newSubset.nNumVerts = 0;
-            newSubset.nFirstIndexId = subset.nFirstIndexId;
-            newSubset.nNumIndices = subset.nNumIndices;
-
-            const int oldSubsetVertexCount = (int)subsetMaxIndex - (int)subsetMinIndex + 1;
-
-            assert(buffer0.size() >= (size_t)oldSubsetVertexCount);
-            memset(&buffer0[0], -1, sizeof(buffer0[0]) * oldSubsetVertexCount);
-
-            for (int j = 0; j < subset.nNumIndices; ++j)
-            {
-                const uint32 idx = buffer1[j];
-                const int oldVertexIndex = subsetMinIndex + idx;
-                if (buffer0[idx] == -1)
-                {
-                    if (m_pVertexMap)
-                    {
-                        (*m_pVertexMap)[oldVertexIndex] = newVertexCount;
-                    }
-                    buffer0[idx] = newVertexCount;
-                    //copy from old -> new vertex buffer
-                    CopyMeshVertex(newMesh, newVertexCount, mesh, oldVertexIndex);
-                    ++newVertexCount;
-                    ++newSubset.nNumVerts;
-                }
-                newMesh.m_pIndices[subset.nFirstIndexId + j] = buffer0[idx];
-            }
-        }
-
-        newMesh.SetVertexCount(newVertexCount);
-
-        mesh.Copy(newMesh);
-
-        return true;
-    }
-
-    // Confetti Begin: Nicholas Baldwin
-    bool CMeshCompiler::StripifyMesh_PVRTriStripList(CMesh& mesh)
-    {
-        if (mesh.GetFaceCount() > 0)
-        {
-            // We don't support stripifying of meshes with explicit faces, we support meshes with index array only
-            return false;
-        }
-
-        enum
-        {
-            kCACHESIZE_GEFORCE3 = 24
-        };
-        const size_t cacheSize = kCACHESIZE_GEFORCE3;
-        enum
-        {
-            kVerticesPerFace = 3
-        };
-
-        // Prepare mapping buffers
-        if (m_pIndexMap)
-        {
-            const int n = mesh.GetIndexCount();
-            m_pIndexMap->resize(n);
-            for (int i = 0; i < n; ++i)
-            {
-                (*m_pIndexMap)[i] = mesh.m_pIndices[i];
-            }
-        }
-        if (m_pVertexMap)
-        {
-            const int n = mesh.GetVertexCount();
-            m_pVertexMap->resize(n, -1);
-        }
-
-
-        CMesh newMesh;
-        newMesh.Copy(mesh);
-
-        // TODO: make those variables members of CMeshCompiler so we don't need to allocate memory every time
-        std::vector<uint32> buffer0;
-        std::vector<uint32> buffer1;
-
-        // Reserve space
-        //
-        // We will use buffer0 for both subset's indices and for mapping from old vertex indices
-        // to new vertex indices (number of vertices decreases in case some vertices are not
-        // referenced from indices). In the latter case having size of buffer0 equal to number of
-        // indices is not enough if indices refer vertices in a spare fashion. Unfortunately,
-        // to compute range of referenced vertices we need to scan all indices in all subsets
-        // which is not fast.
-        {
-            int maxIndexCountInSubset = 0;
-            int maxVertexCountInSubset = 0;
-
-            for (int i = 0; i < newMesh.GetSubSetCount(); i++)
-            {
-                const SMeshSubset& subset = mesh.m_subsets[i];
-
-                if (subset.nNumIndices == 0)
-                {
-                    continue;
-                }
-                if (subset.nNumIndices < 0)
-                {
-                    assert(0);
-                    return false;
-                }
-                if (subset.nNumIndices % kVerticesPerFace != 0)
-                {
-                    assert(0);
-                    return false;
-                }
-                if (subset.nFirstIndexId % kVerticesPerFace != 0)
-                {
-                    assert(0);
-                    return false;
-                }
-
-                if (maxIndexCountInSubset < subset.nNumIndices)
-                {
-                    maxIndexCountInSubset = subset.nNumIndices;
-                }
-
-                int subsetMinIndex = mesh.m_pIndices[subset.nFirstIndexId];
-                int subsetMaxIndex = subsetMinIndex;
-                for (int j = 1; j < subset.nNumIndices; ++j)
-                {
-                    const int idx = mesh.m_pIndices[subset.nFirstIndexId + j];
-                    if (idx < subsetMinIndex)
-                    {
-                        subsetMinIndex = idx;
-                    }
-                    else if (idx > subsetMaxIndex)
-                    {
-                        subsetMaxIndex = idx;
-                    }
-                }
-
-                if (maxVertexCountInSubset < subsetMaxIndex - subsetMinIndex + 1)
-                {
-                    maxVertexCountInSubset = subsetMaxIndex - subsetMinIndex + 1;
-                }
-            }
-
-            buffer0.resize(max(maxIndexCountInSubset, maxVertexCountInSubset));
-        }
-
-        int newVertexCount = 0;
-
-        for (int i = 0; i < newMesh.GetSubSetCount(); i++)
-        {
-            const SMeshSubset& subset = mesh.m_subsets[i];
-
-            if (subset.nNumIndices == 0)
-            {
-                continue;
-            }
-
-            int subsetMinIndex = mesh.m_pIndices[subset.nFirstIndexId];
-            int subsetMaxIndex = subsetMinIndex;
-            for (int j = 1; j < subset.nNumIndices; ++j)
-            {
-                const int idx = mesh.m_pIndices[subset.nFirstIndexId + j];
-                if (idx < subsetMinIndex)
-                {
-                    subsetMinIndex = idx;
-                }
-                else if (idx > subsetMaxIndex)
-                {
-                    subsetMaxIndex = idx;
-                }
-            }
-
-            buffer1.clear();
-            buffer1.resize(subset.nNumIndices);
-            for (int j = 0; j < subset.nNumIndices; ++j)
-            {
-                buffer0[j] = mesh.m_pIndices[subset.nFirstIndexId + j] - subsetMinIndex;
-                buffer1[j] = mesh.m_pIndices[subset.nFirstIndexId + j] - subsetMinIndex;
-            }
-
-            PVRTTriStripList(&buffer1[0], buffer1.size() / kVerticesPerFace);
-
-            // Reorder vertices
-
-            SMeshSubset& newSubset = newMesh.m_subsets[i];
-            newSubset.nFirstVertId = newVertexCount;
-            newSubset.nNumVerts = 0;
-            newSubset.nFirstIndexId = subset.nFirstIndexId;
-            newSubset.nNumIndices = subset.nNumIndices;
-
-            const int oldSubsetVertexCount = (int)subsetMaxIndex - (int)subsetMinIndex + 1;
-
-            assert(buffer0.size() >= (size_t)oldSubsetVertexCount);
-            memset(&buffer0[0], -1, sizeof(buffer0[0]) * oldSubsetVertexCount);
-
-            for (int j = 0; j < subset.nNumIndices; ++j)
-            {
-                const uint32 idx = buffer1[j];
-                const int oldVertexIndex = subsetMinIndex + idx;
-                if (buffer0[idx] == -1)
-                {
-                    if (m_pVertexMap)
-                    {
-                        (*m_pVertexMap)[oldVertexIndex] = newVertexCount;
-                    }
-                    buffer0[idx] = newVertexCount;
-                    //copy from old -> new vertex buffer
-                    CopyMeshVertex(newMesh, newVertexCount, mesh, oldVertexIndex);
-                    ++newVertexCount;
-                    ++newSubset.nNumVerts;
-                }
-                newMesh.m_pIndices[subset.nFirstIndexId + j] = buffer0[idx];
-            }
-        }
-
-        newMesh.SetVertexCount(newVertexCount);
-
-        mesh.Copy(newMesh);
-
-        return true;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //
-    // Input:
-    //   mesh contains mesh.GetVertexCount() vertices (vertex data are stored in
-    //   m_pPositions[] m_pNorms[] and in other data streams).
-    //   Face and index streams are ignored.
-    // Output:
-    //   1) mesh contains unique vertices only.
-    //   2) data stream mesh.m_pIndices has "inputMesh.GetVertexCount()"
-    //      indices (one output index per each input vertex).
-    //      note that an output index points to an *unique* vertex in the
-    //      output mesh.
-    //   3) data stream mesh.m_pFaces is empty.
-    //
-    // For example vertices [A, B, B, C, A, D] will be transformed to
-    // [A, B, C, D], and index array created will be [0, 1, 1, 2, 0, 3].
-    //
-    // Note that mesh.subsets[] is neither used nor changed.
-    //
-    bool CMeshCompiler::CreateIndicesAndDeleteDuplicateVertices(CMesh& mesh)
-    {
-        assert(mesh.m_pPositionsF16 == 0);
-
-        const int oldVertexCount = mesh.GetVertexCount();
-        if (oldVertexCount <= 0)
-        {
-            return true;
-        }
-
-        CMesh oldMesh;
-        oldMesh.Copy(mesh);
-
-        std::vector<int> vertexOldToNew;
-        std::vector<int> vertexNewToOld;
-        ComputeVertexRemapping(oldMesh, vertexOldToNew, vertexNewToOld);
-
-        const int newVertexCount = (int)vertexNewToOld.size();
-
-        assert(vertexOldToNew.size() == oldVertexCount);
-        const uint maxVertexCount = (sizeof(vtx_idx) == 2 ? 0xffff : 0x7fffffff);
-        if (newVertexCount > maxVertexCount)
-        {
-            m_LastError.Format("Too many vertices in mesh after compilation: %u (limit is %u).", (uint)newVertexCount, (uint)maxVertexCount);
-            return false;
-        }
-
-        for (int i = 0; i < newVertexCount; ++i)
-        {
-            CopyMeshVertex(mesh, i, oldMesh, vertexNewToOld[i]);
-        }
-
-        mesh.SetVertexCount(newVertexCount);
-        if (mesh.m_pNorms)
-        {
-            mesh.ReallocStream(CMesh::NORMALS, 0, newVertexCount);
-        }
-        if (mesh.m_pTexCoord)
-        {
-            mesh.ReallocStream(CMesh::TEXCOORDS, 0, newVertexCount);
-        }
-        if (mesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, 1))
-        {
-            mesh.ReallocStream(CMesh::TEXCOORDS, 1, newVertexCount);
-        }
-        if (mesh.m_pColor0)
-        {
-            mesh.ReallocStream(CMesh::COLORS, 0, newVertexCount);
-        }
-        if (mesh.m_pColor1)
-        {
-            mesh.ReallocStream(CMesh::COLORS, 1, newVertexCount);
-        }
-        if (mesh.m_pTangents)
-        {
-            mesh.ReallocStream(CMesh::TANGENTS, 0, newVertexCount);
-        }
-        //New since Touch Bending Gem. a Tocuh Bendable Mesh has bone mappings.
-        if (mesh.m_pBoneMapping)
-        {
-            mesh.ReallocStream(CMesh::BONEMAPPING, 0, newVertexCount);
-        }
-        mesh.ReallocStream(CMesh::TOPOLOGY_IDS, 0, 0);
-        mesh.ReallocStream(CMesh::VERT_MATS, 0, 0);
-        mesh.SetFaceCount(0);
-        mesh.SetIndexCount(oldVertexCount);
-        for (int i = 0; i < oldVertexCount; ++i)
-        {
-            mesh.m_pIndices[i] = vertexOldToNew[i];
-        }
-
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    bool CMeshCompiler::CheckForDegenerateFaces(const CMesh& mesh)
-    {
-        for (int i = 0; i < mesh.GetSubSetCount(); i++)
-        {
-            const SMeshSubset& subset = mesh.m_subsets[i];
-            for (int j = subset.nFirstIndexId; j < subset.nFirstIndexId + subset.nNumIndices; j += 3)
-            {
-                if (mesh.m_pIndices[j + 0] == mesh.m_pIndices[j + 1] ||
-                    mesh.m_pIndices[j + 1] == mesh.m_pIndices[j + 2] ||
-                    mesh.m_pIndices[j + 2] == mesh.m_pIndices[j + 0])
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void CMeshCompiler::FindVertexRanges(CMesh& mesh)
-    {
-        assert(mesh.m_pPositionsF16 == 0);
-
-        const int nNumIndices = mesh.GetIndexCount();
-
-        // Find vertex range (both index and spacial ranges) for each material (needed for rendering)
-        for (int i = 0; i < mesh.GetSubSetCount(); i++)
-        {
-            SMeshSubset& subset = mesh.m_subsets[i];
-
-            if (subset.nNumIndices == 0)
-            {
-                subset.nNumVerts = 0;
-                continue;
-            }
-
-            if (subset.nNumIndices + subset.nFirstIndexId > nNumIndices)
-            {
-                assert(0);
-                continue;
-            }
-
-            int nMin = INT_MAX;
-            int nMax = INT_MIN;
-            Vec3 vMin = SetMaxBB();
-            Vec3 vMax = SetMinBB();
-
-            for (int j = subset.nFirstIndexId; j < subset.nNumIndices + subset.nFirstIndexId; j++)
-            {
-                int index = mesh.m_pIndices[j];
-                Vec3 v = mesh.m_pPositions[index];
-                vMin.CheckMin(v);
-                vMax.CheckMax(v);
-                nMin = min(nMin, index);
-                nMax = max(nMax, index);
-            }
-            subset.vCenter = (vMin + vMax) * 0.5f;
-            subset.fRadius = (vMin - subset.vCenter).GetLength();
-            subset.nFirstVertId = nMin;
-            subset.nNumVerts = nMax - nMin + 1;
-        }
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    bool CMeshCompiler::CompareMeshes(const CMesh& mesh1, const CMesh& mesh2)
-    {
-        if (mesh1.m_subsets.size() != mesh2.m_subsets.size())
-        {
-            return false;
-        }
-
-        if (mesh1.GetFaceCount() != mesh2.GetFaceCount())
-        {
-            return false;
-        }
-        if (mesh1.GetVertexCount() != mesh2.GetVertexCount())
-        {
-            return false;
-        }
-        if (mesh1.GetTexCoordCount() != mesh2.GetTexCoordCount())
-        {
-            return false;
-        }
-        if (mesh1.GetIndexCount() != mesh2.GetIndexCount())
-        {
-            return false;
-        }
-
-        if (!mesh1.CompareStreams(mesh2))
-        {
-            return false;
-        }
-
-        return true;
-    }
-} // namespace mesh_compiler
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.h b/Code/CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.h
deleted file mode 100644
index 36735d5c1c..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_MESHCOMPILER_MESHCOMPILER_H
-#define CRYINCLUDE_CRY3DENGINE_MESHCOMPILER_MESHCOMPILER_H
-#pragma once
-
-#include "IIndexedMesh.h"
-
-namespace mesh_compiler
-{
-    enum EMeshCompileFlags
-    {
-        MESH_COMPILE_OPTIMIZE = BIT(0),
-        MESH_COMPILE_TANGENTS = BIT(1),
-        MESH_COMPILE_USECUSTOMNORMALS = BIT(3),
-        MESH_COMPILE_VALIDATE = BIT(4),
-
-        // Optimizes a mesh using PowerVR SDK's optimizer.
-        // This should only be set with "OptimizedPrimitiveType=1" when compiling mobile assets outside the editor.
-        MESH_COMPILE_PVR_STRIPIFY = BIT(5),
-
-        MESH_COMPILE_VALIDATE_FAIL_ON_DEGENERATE_FACES = BIT(6),
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    class CMeshCompiler
-    {
-    public:
-        CMeshCompiler();
-        ~CMeshCompiler();
-
-        // for flags see EMeshCompilerFlags
-        bool Compile(CMesh& mesh, int flags);
-
-        void SetVertexRemapping(std::vector<int>* pVertexMap)
-        {
-            m_pVertexMap = pVertexMap;
-        }
-
-        void SetIndexRemapping(std::vector<int>* pIndexMap)
-        {
-            m_pIndexMap = pIndexMap;
-        }
-
-        inline bool IsEquivalentVec3dCheckYFirst(const Vec3& v0, const Vec3& v1, float fEpsilon)
-        {
-            if (fabsf(v0.y - v1.y) < fEpsilon)
-            {
-                if (fabsf(v0.x - v1.x) < fEpsilon)
-                {
-                    if (fabsf(v0.z - v1.z) < fEpsilon)
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        _inline const Vec3& ToVec3(const Vec3& vec)    { return vec; }
-        _inline const Vec3  ToVec3(const Vec3f16& vec) { return vec.ToVec3(); }
-
-        template<class T>
-        inline int FindInPosBuffer_VF_P3X(const Vec3& vPosToFind, const T* pVertBuff, std::vector<int>* pHash, float fEpsilon)
-        {
-            for (uint32 i = 0; i < pHash->size(); i++)
-            {
-                if (IsEquivalentVec3dCheckYFirst(ToVec3(pVertBuff[(*pHash)[i]].xyz), vPosToFind, fEpsilon))
-                {
-                    return (*pHash)[i];
-                }
-            }
-
-            return -1;
-        }
-
-        template<class V, class I>
-        void WeldPos_VF_P3X(
-            PodArray<V>& vertices,
-            PodArray<SPipTangents>& tangents,
-            PodArray<SPipNormal>& normals,
-            PodArray<I>& indices,
-            float fEpsilon,
-            const AABB& boxBoundary)
-        {
-            const int numVertices = vertices.Count();
-            V* pTmpVerts    = new V[numVertices];
-            SPipTangents* pTmpTangents = new SPipTangents[tangents.Count()];
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-            SPipNormal* pTmpNormals = NULL;
-            if (normals.Count() > 0)
-            {
-                pTmpNormals = new SPipNormal[normals.Count()];
-            }
-
-            SPipNormal emptyNormal;
-#endif
-
-            int nCurVertex = 0;
-            PodArray<I> newIndices;
-            std::vector<int> arrHashTable[256];
-            newIndices.reserve(indices.size());
-            std::vector<int>* pHash = 0;
-
-            float fHashElemSize = 256.0f / max(boxBoundary.max.x - boxBoundary.min.x, 0.01f);
-
-            for (uint32 i = 0; i < indices.size(); i++)
-            {
-                int v = indices[i];
-
-                assert(v < vertices.Count());
-
-                V&            vPos  = vertices[v];
-                SPipTangents& vTang = tangents[v];
-#if ENABLE_NORMALSTREAM_SUPPORT
-                SPipNormal&   vNorm = pTmpNormals ? normals[v] : emptyNormal;
-#endif
-
-                bool bInRange(
-                    vPos.xyz.x > boxBoundary.min.x && vPos.xyz.y > boxBoundary.min.y && vPos.xyz.z > boxBoundary.min.z &&
-                    vPos.xyz.x < boxBoundary.max.x && vPos.xyz.y < boxBoundary.max.y && vPos.xyz.z < boxBoundary.max.z);
-
-                int nHashValue = int((vPos.xyz.x - boxBoundary.min.x) * fHashElemSize);
-
-                pHash = &arrHashTable[(unsigned char)(nHashValue)];
-                int nFind = FindInPosBuffer_VF_P3X(ToVec3(vPos.xyz), pTmpVerts, pHash, bInRange ? fEpsilon : 0.01f);
-                if (nFind < 0)
-                {
-                    pHash->push_back(nCurVertex);
-
-                    // make sure neighbor hashes also have this vertex
-                    if (bInRange && fEpsilon > 0.01f)
-                    {
-                        pHash = &arrHashTable[(unsigned char)(nHashValue + 1)];
-                        if (FindInPosBuffer_VF_P3X(ToVec3(vPos.xyz), pTmpVerts, pHash, fEpsilon) < 0)
-                        {
-                            pHash->push_back(nCurVertex);
-                        }
-
-                        pHash = &arrHashTable[(unsigned char)(nHashValue - 1)];
-                        if (FindInPosBuffer_VF_P3X(ToVec3(vPos.xyz), pTmpVerts, pHash, fEpsilon) < 0)
-                        {
-                            pHash->push_back(nCurVertex);
-                        }
-                    }
-
-                    PREFAST_ASSUME(nCurVertex < numVertices);
-
-                    // add new vertex
-                    pTmpVerts[nCurVertex] = vPos;
-                    pTmpTangents[nCurVertex] = vTang;
-#if ENABLE_NORMALSTREAM_SUPPORT
-                    if (pTmpNormals)
-                    {
-                        pTmpNormals[nCurVertex] = vNorm;
-                    }
-#endif
-                    newIndices.push_back(nCurVertex);
-                    nCurVertex++;
-                }
-                else
-                {
-                    newIndices.push_back(nFind);
-                }
-            }
-
-            indices.Clear();
-            indices.AddList(newIndices);
-
-            vertices.Clear();
-            vertices.AddList(pTmpVerts, nCurVertex);
-
-            tangents.Clear();
-            tangents.AddList(pTmpTangents, nCurVertex);
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-            if (pTmpNormals)
-            {
-                normals.Clear();
-                normals.AddList(pTmpNormals, nCurVertex);
-
-                delete[] pTmpNormals;
-            }
-#endif
-
-            delete [] pTmpVerts;
-            delete [] pTmpTangents;
-        }
-
-        static bool CompareMeshes(const CMesh& mesh1, const CMesh& mesh2);
-
-        const char* GetLastError() const
-        {
-            return m_LastError;
-        }
-
-    private:
-        bool CreateIndicesAndDeleteDuplicateVertices(CMesh& mesh);
-        bool StripifyMesh_Forsyth(CMesh& mesh);
-        bool StripifyMesh_PVRTriStripList(CMesh& mesh);
-
-    public:
-        static bool CheckForDegenerateFaces(const CMesh& mesh);
-
-    private:
-        static void FindVertexRanges(CMesh& mesh);
-
-    private:
-        struct SBasisFace
-        {
-            int v[3];
-        };
-        std::vector<const SMeshFace*> m_vhash_table[MAX_SUB_MATERIALS];
-        std::vector<SBasisFace> m_thash_table[MAX_SUB_MATERIALS];
-
-        std::vector<int>* m_pVertexMap;
-        std::vector<int>* m_pIndexMap;
-
-        string m_LastError;
-    };
-} // namespace mesh_compiler
-
-#endif // CRYINCLUDE_CRY3DENGINE_MESHCOMPILER_MESHCOMPILER_H
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/PVRTTriStrip/PVRTTriStrip.cpp b/Code/CryEngine/Cry3DEngine/MeshCompiler/PVRTTriStrip/PVRTTriStrip.cpp
deleted file mode 100644
index f0ff8f15c4..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/PVRTTriStrip/PVRTTriStrip.cpp
+++ /dev/null
@@ -1,947 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates.
-
-/******************************************************************************
-
- @File         PVRTTriStrip.cpp
-
- @Title        PVRTTriStrip
-
- @Version       @Version
-
- @Copyright    Copyright (c) Imagination Technologies Limited.
-
- @Platform     Independent
-
- @Description  Strips a triangle list.
-
-******************************************************************************/
-
-/****************************************************************************
-** Includes
-****************************************************************************/
-#include <platform.h>
-#include <stdlib.h>
-
-#include "PVRTTriStrip.h"
-
-/****************************************************************************
-** Defines
-****************************************************************************/
-#define RND_TRIS_ORDER
-#define FREE(X)     { if(X) { free(X); (X) = 0; } }
-
-/****************************************************************************
-** Structures
-****************************************************************************/
-
-/****************************************************************************
-** Class: CTri
-****************************************************************************/
-class CTri;
-
-/*!***************************************************************************
- @Class             CTriState
- @Description       Stores a pointer to the triangles either side of itself,
-                    as well as it's winding.
-*****************************************************************************/
-class CTriState
-{
-public:
-    CTri    *pRev, *pFwd;
-    bool    bWindFwd;
-
-    CTriState()
-    {
-        bWindFwd    = true;     // Initial value irrelevent
-        pRev        = NULL;
-        pFwd        = NULL;
-    }
-};
-/*!***************************************************************************
- @Class             CTri
- @Description       Object used to store information about the triangle, such as
-                    the vertex indices it is made from, which triangles are
-                    adjacent to it, etc.
-*****************************************************************************/
-class CTri
-{
-public:
-    CTriState   sNew, sOld;
-
-    CTri    *pAdj[3];
-    bool    bInStrip;
-
-    const unsigned int  *pIdx;      // three indices for the tri
-    bool                    bOutput;
-
-public:
-    CTri();
-    int FindEdge(const unsigned int pw0, const unsigned int pw1) const;
-    void Cement();
-    void Undo();
-    int EdgeFromAdjTri(const CTri &tri) const;  // Find the index of the adjacent tri
-};
-
-/*!***************************************************************************
- @Class             CStrip
- @Description       Object used to store the triangles that a given strip is
-                    composed from.
-*****************************************************************************/
-class CStrip
-{
-protected:
-    unsigned int    m_nTriCnt;
-    CTri            *m_pTri;
-    unsigned int    m_nStrips;
-
-    CTri            **m_psStrip;    // Working space for finding strips
-
-public:
-    CStrip(
-        const unsigned int  * const pui32TriList,
-        const unsigned int      nTriCnt);
-    ~CStrip();
-
-protected:
-    bool StripGrow(
-        CTri                &triFrom,
-        const unsigned int  nEdgeFrom,
-        const int           nMaxChange);
-
-public:
-    void StripFromEdges();
-    void StripImprove();
-
-    void Output(
-        unsigned int    **ppui32Strips,
-        unsigned int    **ppnStripLen,
-        unsigned int    *pnStripCnt);
-};
-
-/****************************************************************************
-** Constants
-****************************************************************************/
-
-/****************************************************************************
-** Code: Class: CTri
-****************************************************************************/
-CTri::CTri()
-{
-    pAdj[0]     = NULL;
-    pAdj[1]     = NULL;
-    pAdj[2]     = NULL;
-    bInStrip    = false;
-    bOutput     = false;
-}
-
-/*!***************************************************************************
- @Function          FindEdge
- @Input             pw0         The first index
- @Input             pw1         The second index
- @Return            The index of the edge
- @Description       Finds the index of the edge that the current object shares
-                    with the two vertex index values that have been passed in
-                    (or returns -1 if they dont share an edge).
-*****************************************************************************/
-int CTri::FindEdge(const unsigned int pw0, const unsigned int pw1) const
-{
-    if((pIdx[0] == pw0 && pIdx[1] == pw1))
-        return 0;
-    if((pIdx[1] == pw0 && pIdx[2] == pw1))
-        return 1;
-    if((pIdx[2] == pw0 && pIdx[0] == pw1))
-        return 2;
-    return -1;
-}
-/*!***************************************************************************
- @Function          Cement
- @Description       Assigns the new state as the old state.
-*****************************************************************************/
-void CTri::Cement()
-{
-    sOld = sNew;
-}
-/*!***************************************************************************
- @Function          Undo
- @Description       Reverts the new state to the old state.
-*****************************************************************************/
-void CTri::Undo()
-{
-    sNew = sOld;
-}
-/*!***************************************************************************
- @Function          EdgeFromAdjTri
- @Input             tri         The triangle to compare
- @Return            int         Index of adjacent triangle (-1 if not adjacent)
- @Description       If the input triangle is adjacent to the current triangle,
-                    it's index is returned.
-*****************************************************************************/
-int CTri::EdgeFromAdjTri(const CTri &tri) const
-{
-    for(int i = 0; i < 3; ++i)
-    {
-        if(pAdj[i] == &tri)
-        {
-            return i;
-        }
-    }
-    assert(false);
-    return -1;
-}
-
-/****************************************************************************
-** Local code
-****************************************************************************/
-/*!***************************************************************************
- @Function          OrphanTri
- @Input             tri         The triangle test
- @Return            int         Returns 1 if change was made
- @Description       If the input triangle is not wound forward and is not the last
-                    triangle in the strip, the connection with the next triangle
-                    in the strip is removed.
-*****************************************************************************/
-static int OrphanTri(
-    CTri        * const pTri)
-{
-    assert(!pTri->bInStrip);
-    if(pTri->sNew.bWindFwd || !pTri->sNew.pFwd)
-        return 0;
-
-    pTri->sNew.pFwd->sNew.pRev = NULL;
-    pTri->sNew.pFwd = NULL;
-    return 1;
-}
-/*!***************************************************************************
- @Function          TakeTri
- @Input             pTri        The triangle to take
- @Input             pRevNew     The triangle that is before pTri in the new strip
- @Return            int         Returns 1 if a new strip has been created
- @Description       Removes the triangle from it's current strip
-                    and places it in a new one (following pRevNew in the new strip).
-*****************************************************************************/
-static int TakeTri(
-    CTri        * const pTri,
-    CTri        * const pRevNew,
-    const bool  bFwd)
-{
-    int nRet;
-
-    assert(!pTri->bInStrip);
-
-    if(pTri->sNew.pFwd && pTri->sNew.pRev)
-    {
-        assert(pTri->sNew.pFwd->sNew.pRev == pTri);
-        pTri->sNew.pFwd->sNew.pRev = NULL;
-        assert(pTri->sNew.pRev->sNew.pFwd == pTri);
-        pTri->sNew.pRev->sNew.pFwd = NULL;
-
-        // If in the middle of a Strip, this will generate a new Strip
-        nRet = 1;
-
-        // The second tri in the strip may need to be orphaned, or it will have wrong winding order
-        nRet += OrphanTri(pTri->sNew.pFwd);
-    }
-    else if(pTri->sNew.pFwd)
-    {
-        assert(pTri->sNew.pFwd->sNew.pRev == pTri);
-        pTri->sNew.pFwd->sNew.pRev = NULL;
-
-        // If at the beginning of a Strip, no change
-        nRet = 0;
-
-        // The second tri in the strip may need to be orphaned, or it will have wrong winding order
-        nRet += OrphanTri(pTri->sNew.pFwd);
-    }
-    else if(pTri->sNew.pRev)
-    {
-        assert(pTri->sNew.pRev->sNew.pFwd == pTri);
-        pTri->sNew.pRev->sNew.pFwd = NULL;
-
-        // If at the end of a Strip, no change
-        nRet = 0;
-    }
-    else
-    {
-        // Otherwise it's a lonesome triangle; one Strip removed!
-        nRet = -1;
-    }
-
-    pTri->sNew.pFwd     = NULL;
-    pTri->sNew.pRev     = pRevNew;
-    pTri->bInStrip      = true;
-    pTri->sNew.bWindFwd = bFwd;
-
-    if(pRevNew)
-    {
-        assert(!pRevNew->sNew.pFwd);
-        pRevNew->sNew.pFwd  = pTri;
-    }
-
-    return nRet;
-}
-/*!***************************************************************************
- @Function          TryLinkEdge
- @Input             src         The source triangle
- @Input             cmp         The triangle to compare with
- @Input             nSrcEdge    The edge of souce triangle to compare
- @Input             idx0        Vertex index 0 of the compare triangle
- @Input             idx1        Vertex index 1 of the compare triangle
- @Description       If the triangle to compare currently has no adjacent
-                    triangle along the specified edge, link the source triangle
-                    (along it's specified edge) with the compare triangle.
-*****************************************************************************/
-static bool TryLinkEdge(
-    CTri                &src,
-    CTri                &cmp,
-    const int           nSrcEdge,
-    const unsigned int  idx0,
-    const unsigned int  idx1)
-{
-    int nCmpEdge;
-
-    nCmpEdge = cmp.FindEdge(idx0, idx1);
-    if(nCmpEdge != -1 && !cmp.pAdj[nCmpEdge])
-    {
-        cmp.pAdj[nCmpEdge] = &src;
-        src.pAdj[nSrcEdge] = &cmp;
-        return true;
-    }
-    return false;
-}
-
-/****************************************************************************
-** Code: Class: CStrip
-****************************************************************************/
-CStrip::CStrip(
-    const unsigned int  * const pui32TriList,
-    const unsigned int  nTriCnt)
-{
-    unsigned int    i, j;
-    bool            b0, b1, b2;
-
-    m_nTriCnt = nTriCnt;
-
-    /*
-        Generate adjacency info
-    */
-    m_pTri = new CTri[nTriCnt];
-    for(i = 0; i < nTriCnt; ++i)
-    {
-        // Set pointer to indices
-        m_pTri[i].pIdx = &pui32TriList[3 * i];
-
-        b0 = false;
-        b1 = false;
-        b2 = false;
-        for(j = 0; j < i && !(b0 & b1 & b2); ++j)
-        {
-            if(!b0)
-                b0 = TryLinkEdge(m_pTri[i], m_pTri[j], 0, m_pTri[i].pIdx[1], m_pTri[i].pIdx[0]);
-
-            if(!b1)
-                b1 = TryLinkEdge(m_pTri[i], m_pTri[j], 1, m_pTri[i].pIdx[2], m_pTri[i].pIdx[1]);
-
-            if(!b2)
-                b2 = TryLinkEdge(m_pTri[i], m_pTri[j], 2, m_pTri[i].pIdx[0], m_pTri[i].pIdx[2]);
-        }
-    }
-
-    // Initially, every triangle is a strip.
-    m_nStrips = m_nTriCnt;
-
-    // Allocate working space for the strippers
-    m_psStrip = new CTri*[m_nTriCnt];
-}
-
-CStrip::~CStrip()
-{
-    delete [] m_pTri;
-    delete [] m_psStrip;
-}
-/*!***************************************************************************
- @Function          StripGrow
- @Input             triFrom         The triangle to begin from
- @Input             nEdgeFrom       The edge of the triangle to begin from
- @Input             maxChange       The maximum number of changes to be made
- @Description       Takes triFrom as a starting point of triangles to add to
-                    the list and adds triangles sequentially by finding the next
-                    triangle that is adjacent to the current triangle.
-                    This is repeated until the maximum number of changes
-                    have been made.
-*****************************************************************************/
-bool CStrip::StripGrow(
-    CTri                &triFrom,
-    const unsigned int  nEdgeFrom,
-    const int           nMaxChange)
-{
-    unsigned int    i;
-    bool            bFwd;
-    int             nDiff, nDiffTot, nEdge;
-    CTri            *pTri, *pTriPrev, *pTmp;
-    unsigned int    nStripLen;
-
-    // Start strip from this tri
-    pTri        = &triFrom;
-    pTriPrev    = NULL;
-
-    nDiffTot    = 0;
-    nStripLen   = 0;
-
-    // Start strip from this edge
-    nEdge   = nEdgeFrom;
-    bFwd    = true;
-
-    // Extend the strip until we run out, or we find an improvement
-    nDiff = 1;
-    while(nDiff > nMaxChange)
-    {
-        // Add pTri to the strip
-        assert(pTri);
-        nDiff += TakeTri(pTri, pTriPrev, bFwd);
-        assert(nStripLen < m_nTriCnt);
-        m_psStrip[nStripLen++] = pTri;
-
-        // Jump to next tri
-        pTriPrev = pTri;
-        pTri = pTri->pAdj[nEdge];
-        if(!pTri)
-            break;  // No more tris, gotta stop
-
-        if(pTri->bInStrip)
-            break;  // No more tris, gotta stop
-
-        // Find which edge we came over
-        nEdge = pTri->EdgeFromAdjTri(*pTriPrev);
-
-        // Find the edge to leave over
-        if(bFwd)
-        {
-            if(--nEdge < 0)
-                nEdge = 2;
-        }
-        else
-        {
-            if(++nEdge > 2)
-                nEdge = 0;
-        }
-
-        // Swap the winding order for the next tri
-        bFwd = !bFwd;
-    }
-    assert(!pTriPrev->sNew.pFwd);
-
-    /*
-        Accept or reject this strip.
-
-        Accepting changes which don't change the number of strips
-        adds variety, which can help better strips to develop.
-    */
-    if(nDiff <= nMaxChange)
-    {
-        nDiffTot += nDiff;
-
-        // Great, take the Strip
-        for(i = 0; i < nStripLen; ++i)
-        {
-            pTri = m_psStrip[i];
-            assert(pTri->bInStrip);
-
-            // Cement affected tris
-            pTmp = pTri->sOld.pFwd;
-            if(pTmp && !pTmp->bInStrip)
-            {
-                if(pTmp->sOld.pFwd && !pTmp->sOld.pFwd->bInStrip)
-                    pTmp->sOld.pFwd->Cement();
-                pTmp->Cement();
-            }
-
-            pTmp = pTri->sOld.pRev;
-            if(pTmp && !pTmp->bInStrip)
-            {
-                pTmp->Cement();
-            }
-
-            // Cement this tris
-            pTri->bInStrip = false;
-            pTri->Cement();
-        }
-    }
-    else
-    {
-        // Shame, undo the strip
-        for(i = 0; i < nStripLen; ++i)
-        {
-            pTri = m_psStrip[i];
-            assert(pTri->bInStrip);
-
-            // Undo affected tris
-            pTmp = pTri->sOld.pFwd;
-            if(pTmp && !pTmp->bInStrip)
-            {
-                if(pTmp->sOld.pFwd && !pTmp->sOld.pFwd->bInStrip)
-                    pTmp->sOld.pFwd->Undo();
-                pTmp->Undo();
-            }
-
-            pTmp = pTri->sOld.pRev;
-            if(pTmp && !pTmp->bInStrip)
-            {
-                pTmp->Undo();
-            }
-
-            // Undo this tris
-            pTri->bInStrip = false;
-            pTri->Undo();
-        }
-    }
-
-#ifdef _DEBUG
-    for(int nDbg = 0; nDbg < (int)m_nTriCnt; ++nDbg)
-    {
-        assert(m_pTri[nDbg].bInStrip == false);
-        assert(m_pTri[nDbg].bOutput == false);
-        assert(m_pTri[nDbg].sOld.pRev == m_pTri[nDbg].sNew.pRev);
-        assert(m_pTri[nDbg].sOld.pFwd == m_pTri[nDbg].sNew.pFwd);
-
-        if(m_pTri[nDbg].sNew.pRev)
-        {
-            assert(m_pTri[nDbg].sNew.pRev->sNew.pFwd == &m_pTri[nDbg]);
-        }
-
-        if(m_pTri[nDbg].sNew.pFwd)
-        {
-            assert(m_pTri[nDbg].sNew.pFwd->sNew.pRev == &m_pTri[nDbg]);
-        }
-    }
-#endif
-
-    if(nDiffTot)
-    {
-        m_nStrips += nDiffTot;
-        return true;
-    }
-    return false;
-}
-
-/*!***************************************************************************
- @Function          StripFromEdges
- @Description       Creates a strip from the object's edge information.
-*****************************************************************************/
-void CStrip::StripFromEdges()
-{
-    unsigned int    i, j, nTest;
-    CTri            *pTri, *pTriPrev;
-    int             nEdge = 0;
-
-    /*
-        Attempt to create grid-oriented strips.
-    */
-    for(i = 0; i < m_nTriCnt; ++i)
-    {
-        pTri = &m_pTri[i];
-
-        // Count the number of empty edges
-        nTest = 0;
-        for(j = 0; j < 3; ++j)
-        {
-            if(!pTri->pAdj[j])
-            {
-                ++nTest;
-            }
-            else
-            {
-                nEdge = j;
-            }
-        }
-
-        if(nTest != 2)
-            continue;
-
-        for(;;)
-        {
-            // A tri with two empty edges is a corner (there are other corners too, but this works so...)
-            while(StripGrow(*pTri, nEdge, -1)) {};
-
-            pTriPrev = pTri;
-            pTri = pTri->pAdj[nEdge];
-            if(!pTri)
-                break;
-
-            // Find the edge we came over
-            nEdge = pTri->EdgeFromAdjTri(*pTriPrev);
-
-            // Step around to the next edge
-            if(++nEdge > 2)
-                nEdge = 0;
-
-            pTriPrev = pTri;
-            pTri = pTri->pAdj[nEdge];
-            if(!pTri)
-                break;
-
-            // Find the edge we came over
-            nEdge = pTri->EdgeFromAdjTri(*pTriPrev);
-
-            // Step around to the next edge
-            if(--nEdge < 0)
-                nEdge = 2;
-
-#if 0
-            // If we're not tracking the edge, give up
-            nTest = nEdge - 1;
-            if(nTest < 0)
-                nTest = 2;
-            if(pTri->pAdj[nTest])
-                break;
-            else
-                continue;
-#endif
-        }
-    }
-}
-
-#ifdef RND_TRIS_ORDER
-struct pair
-{
-    unsigned int i, o;
-};
-
-static int compare(const void *arg1, const void *arg2)
-{
-    return ((pair*)arg1)->i - ((pair*)arg2)->i;
-}
-#endif
-/*!***************************************************************************
- @Function          StripImprove
- @Description       Optimises the strip
-*****************************************************************************/
-void CStrip::StripImprove()
-{
-    unsigned int    i, j;
-    bool            bChanged;
-    int             nRepCnt, nChecks;
-    int             nMaxChange;
-#ifdef RND_TRIS_ORDER
-    pair            *pnOrder;
-
-    /*
-        Create a random order to process the tris
-    */
-    pnOrder = new pair[m_nTriCnt];
-#endif
-
-    nRepCnt = 0;
-    nChecks = 2;
-    nMaxChange  = 0;
-
-    /*
-        Reduce strip count by growing each of the three strips each tri can start.
-    */
-    while(nChecks)
-    {
-        --nChecks;
-
-        bChanged = false;
-
-#ifdef RND_TRIS_ORDER
-        /*
-            Create a random order to process the tris
-        */
-        for(i = 0; i < m_nTriCnt; ++i)
-        {
-            pnOrder[i].i = rand() * rand();
-            pnOrder[i].o = i;
-        }
-        qsort(pnOrder, m_nTriCnt, sizeof(*pnOrder), compare);
-#endif
-
-        /*
-            Process the tris
-        */
-        for(i = 0; i < m_nTriCnt; ++i)
-        {
-            for(j = 0; j < 3; ++j)
-            {
-#ifdef RND_TRIS_ORDER
-                bChanged |= StripGrow(m_pTri[pnOrder[i].o], j, nMaxChange);
-#else
-                bChanged |= StripGrow(m_pTri[i], j, nMaxChange);
-#endif
-            }
-        }
-        ++nRepCnt;
-
-        // Check the results once or twice
-        if(bChanged)
-            nChecks = 2;
-
-        nMaxChange = (nMaxChange == 0 ? -1 : 0);
-    }
-
-#ifdef RND_TRIS_ORDER
-    delete [] pnOrder;
-#endif
-    //_RPT1(_CRT_WARN, "Reps: %d\n", nRepCnt);
-}
-/*!***************************************************************************
- @Function          Output
- @Output            ppui32Strips
- @Output            ppnStripLen         The length of the strip
- @Output            pnStripCnt
- @Description       Outputs key information about the strip to the output
-                    parameters.
-*****************************************************************************/
-void CStrip::Output(
-    unsigned int    **ppui32Strips,
-    unsigned int    **ppnStripLen,
-    unsigned int    *pnStripCnt)
-{
-    unsigned int    *pui32Strips;
-    unsigned int    *pnStripLen;
-    unsigned int    i, j, nIdx, nStrip;
-    CTri            *pTri;
-
-    /*
-        Output Strips
-    */
-    pnStripLen = (unsigned int*)malloc(m_nStrips * sizeof(*pnStripLen));
-    pui32Strips = (unsigned int*)malloc((m_nTriCnt + m_nStrips * 2) * sizeof(*pui32Strips));
-    nStrip = 0;
-    nIdx = 0;
-    for(i = 0; i < m_nTriCnt; ++i)
-    {
-        pTri = &m_pTri[i];
-
-        if(pTri->sNew.pRev)
-            continue;
-        assert(!pTri->sNew.pFwd || pTri->sNew.bWindFwd);
-        assert(pTri->bOutput == false);
-
-        if(!pTri->sNew.pFwd)
-        {
-            pui32Strips[nIdx++] = pTri->pIdx[0];
-            pui32Strips[nIdx++] = pTri->pIdx[1];
-            pui32Strips[nIdx++] = pTri->pIdx[2];
-            pnStripLen[nStrip] = 1;
-            pTri->bOutput = true;
-        }
-        else
-        {
-            if(pTri->sNew.pFwd == pTri->pAdj[0])
-            {
-                pui32Strips[nIdx++] = pTri->pIdx[2];
-                pui32Strips[nIdx++] = pTri->pIdx[0];
-            }
-            else if(pTri->sNew.pFwd == pTri->pAdj[1])
-            {
-                pui32Strips[nIdx++] = pTri->pIdx[0];
-                pui32Strips[nIdx++] = pTri->pIdx[1];
-            }
-            else
-            {
-                assert(pTri->sNew.pFwd == pTri->pAdj[2]);
-                pui32Strips[nIdx++] = pTri->pIdx[1];
-                pui32Strips[nIdx++] = pTri->pIdx[2];
-            }
-
-            pnStripLen[nStrip] = 0;
-            do
-            {
-                assert(pTri->bOutput == false);
-
-                // Increment tris-in-this-strip counter
-                ++pnStripLen[nStrip];
-
-                // Output the new vertex index
-                for(j = 0; j < 3; ++j)
-                {
-                    if(
-                        (pui32Strips[nIdx-2] != pTri->pIdx[j]) &&
-                        (pui32Strips[nIdx-1] != pTri->pIdx[j]))
-                    {
-                        break;
-                    }
-                }
-                assert(j != 3);
-                pui32Strips[nIdx++] = pTri->pIdx[j];
-
-                // Double-check that the previous three indices are the indices of this tris (in some order)
-                assert(
-                    ((pui32Strips[nIdx-3] == pTri->pIdx[0]) && (pui32Strips[nIdx-2] == pTri->pIdx[1]) && (pui32Strips[nIdx-1] == pTri->pIdx[2])) ||
-                    ((pui32Strips[nIdx-3] == pTri->pIdx[1]) && (pui32Strips[nIdx-2] == pTri->pIdx[2]) && (pui32Strips[nIdx-1] == pTri->pIdx[0])) ||
-                    ((pui32Strips[nIdx-3] == pTri->pIdx[2]) && (pui32Strips[nIdx-2] == pTri->pIdx[0]) && (pui32Strips[nIdx-1] == pTri->pIdx[1])) ||
-                    ((pui32Strips[nIdx-3] == pTri->pIdx[2]) && (pui32Strips[nIdx-2] == pTri->pIdx[1]) && (pui32Strips[nIdx-1] == pTri->pIdx[0])) ||
-                    ((pui32Strips[nIdx-3] == pTri->pIdx[1]) && (pui32Strips[nIdx-2] == pTri->pIdx[0]) && (pui32Strips[nIdx-1] == pTri->pIdx[2])) ||
-                    ((pui32Strips[nIdx-3] == pTri->pIdx[0]) && (pui32Strips[nIdx-2] == pTri->pIdx[2]) && (pui32Strips[nIdx-1] == pTri->pIdx[1])));
-
-                // Check that the latest three indices are not degenerate
-                assert(pui32Strips[nIdx-1] != pui32Strips[nIdx-2]);
-                assert(pui32Strips[nIdx-1] != pui32Strips[nIdx-3]);
-                assert(pui32Strips[nIdx-2] != pui32Strips[nIdx-3]);
-
-                pTri->bOutput = true;
-
-                // Check that the next triangle is adjacent to this triangle
-                assert(
-                    (pTri->sNew.pFwd == pTri->pAdj[0]) ||
-                    (pTri->sNew.pFwd == pTri->pAdj[1]) ||
-                    (pTri->sNew.pFwd == pTri->pAdj[2]) ||
-                    (!pTri->sNew.pFwd));
-                // Check that this triangle is adjacent to the next triangle
-                assert(
-                    (!pTri->sNew.pFwd) ||
-                    (pTri == pTri->sNew.pFwd->pAdj[0]) ||
-                    (pTri == pTri->sNew.pFwd->pAdj[1]) ||
-                    (pTri == pTri->sNew.pFwd->pAdj[2]));
-
-                pTri = pTri->sNew.pFwd;
-            } while(pTri);
-        }
-
-        ++nStrip;
-    }
-    assert(nIdx == m_nTriCnt + m_nStrips * 2);
-    assert(nStrip == m_nStrips);
-
-    // Check all triangles have been output
-    for(i = 0; i < m_nTriCnt; ++i)
-    {
-        assert(m_pTri[i].bOutput == true);
-    }
-
-    // Check all triangles are present
-    j = 0;
-    for(i = 0; i < m_nStrips; ++i)
-    {
-        j += pnStripLen[i];
-    }
-    assert(j == m_nTriCnt);
-
-    // Output data
-    *pnStripCnt     = m_nStrips;
-    *ppui32Strips       = pui32Strips;
-    *ppnStripLen    = pnStripLen;
-}
-
-/****************************************************************************
-** Code
-****************************************************************************/
-
-/*!***************************************************************************
- @Function          PVRTTriStrip
- @Output            ppui32Strips
- @Output            ppnStripLen
- @Output            pnStripCnt
- @Input             pui32TriList
- @Input             nTriCnt
- @Description       Reads a triangle list and generates an optimised triangle strip.
-*****************************************************************************/
-void PVRTTriStrip(
-    unsigned int            **ppui32Strips,
-    unsigned int            **ppnStripLen,
-    unsigned int            *pnStripCnt,
-    const unsigned int  * const pui32TriList,
-    const unsigned int      nTriCnt)
-{
-    unsigned int    *pui32Strips;
-    unsigned int    *pnStripLen;
-    unsigned int    nStripCnt;
-
-    /*
-        If the order in which triangles are tested as strip roots is
-        randomised, then several attempts can be made. Use the best result.
-    */
-    for(int i = 0; i <
-#ifdef RND_TRIS_ORDER
-        5
-#else
-        1
-#endif
-        ; ++i)
-    {
-        CStrip stripper(pui32TriList, nTriCnt);
-
-#ifdef RND_TRIS_ORDER
-        srand(i);
-#endif
-
-        stripper.StripFromEdges();
-        stripper.StripImprove();
-        stripper.Output(&pui32Strips, &pnStripLen, &nStripCnt);
-
-        if(!i || nStripCnt < *pnStripCnt)
-        {
-            if(i)
-            {
-                FREE(*ppui32Strips);
-                FREE(*ppnStripLen);
-            }
-
-            *ppui32Strips       = pui32Strips;
-            *ppnStripLen    = pnStripLen;
-            *pnStripCnt     = nStripCnt;
-        }
-        else
-        {
-            FREE(pui32Strips);
-            FREE(pnStripLen);
-        }
-    }
-}
-
-/*!***************************************************************************
- @Function          PVRTTriStripList
- @Modified          pui32TriList
- @Input             nTriCnt
- @Description       Reads a triangle list and generates an optimised triangle strip.
-                    Result is converted back to a triangle list.
-*****************************************************************************/
-void PVRTTriStripList(unsigned int * const pui32TriList, const unsigned int nTriCnt)
-{
-    unsigned int    *pui32Strips;
-    unsigned int    *pnStripLength;
-    unsigned int    nNumStrips;
-    unsigned int    *pui32TriPtr, *pui32StripPtr;
-
-    /*
-        Strip the geometry
-    */
-    PVRTTriStrip(&pui32Strips, &pnStripLength, &nNumStrips, pui32TriList, nTriCnt);
-
-    /*
-        Convert back to a triangle list
-    */
-    pui32StripPtr   = pui32Strips;
-    pui32TriPtr = pui32TriList;
-    for(unsigned int i = 0; i < nNumStrips; ++i)
-    {
-        *pui32TriPtr++ = *pui32StripPtr++;
-        *pui32TriPtr++ = *pui32StripPtr++;
-        *pui32TriPtr++ = *pui32StripPtr++;
-
-        for(unsigned int j = 1; j < pnStripLength[i]; ++j)
-        {
-            // Use two indices from previous triangle, flipping tri order alternately.
-            if(j & 0x01)
-            {
-                *pui32TriPtr++ = pui32StripPtr[-1];
-                *pui32TriPtr++ = pui32StripPtr[-2];
-            }
-            else
-            {
-                *pui32TriPtr++ = pui32StripPtr[-2];
-                *pui32TriPtr++ = pui32StripPtr[-1];
-            }
-
-            *pui32TriPtr++ = *pui32StripPtr++;
-        }
-    }
-
-    free(pui32Strips);
-    free(pnStripLength);
-}
-
-/*****************************************************************************
- End of file (PVRTTriStrip.cpp)
-*****************************************************************************/
-
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/PVRTTriStrip/PVRTTriStrip.h b/Code/CryEngine/Cry3DEngine/MeshCompiler/PVRTTriStrip/PVRTTriStrip.h
deleted file mode 100644
index 7632eae191..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/PVRTTriStrip/PVRTTriStrip.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-/*!****************************************************************************
-
- @file         PVRTTriStrip.h
- @copyright    Copyright (c) Imagination Technologies Limited.
- @brief        Strips a triangle list.
-
-******************************************************************************/
-#ifndef _PVRTTRISTRIP_H_
-#define _PVRTTRISTRIP_H_
-
-
-/****************************************************************************
-** Declarations
-****************************************************************************/
-
-/*!***************************************************************************
- @brief             Reads a triangle list and generates an optimised triangle strip.
- @param[out]        ppui32Strips
- @param[out]        ppnStripLen
- @param[out]        pnStripCnt
- @param[in]         pui32TriList
- @param[in]         nTriCnt
-*****************************************************************************/
-void PVRTTriStrip(
-    unsigned int** ppui32Strips,
-    unsigned int** ppnStripLen,
-    unsigned int* pnStripCnt,
-    const unsigned int* const pui32TriList,
-    const unsigned int      nTriCnt);
-
-
-/*!***************************************************************************
- @brief             Reads a triangle list and generates an optimised triangle strip. Result is
-                    converted back to a triangle list.
- @param[in,out]     pui32TriList
- @param[in]         nTriCnt
-*****************************************************************************/
-void PVRTTriStripList(unsigned int* const pui32TriList, const unsigned int nTriCnt);
-
-
-#endif /* _PVRTTRISTRIP_H_ */
-
-/*****************************************************************************
- End of file (PVRTTriStrip.h)
-*****************************************************************************/
-
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Android/platform_android_files.cmake b/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Android/platform_android_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Android/platform_android_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Linux/platform_linux_files.cmake b/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Linux/platform_linux_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Linux/platform_linux_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Mac/platform_mac_files.cmake b/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Mac/platform_mac_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Mac/platform_mac_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Windows/platform_windows_files.cmake b/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Windows/platform_windows_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/Windows/platform_windows_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/iOS/platform_ios_files.cmake b/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/iOS/platform_ios_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/Platform/iOS/platform_ios_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/TangentSpaceCalculation.cpp b/Code/CryEngine/Cry3DEngine/MeshCompiler/TangentSpaceCalculation.cpp
deleted file mode 100644
index 9d2e513302..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/TangentSpaceCalculation.cpp
+++ /dev/null
@@ -1,823 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-#include <platform.h>
-#include <Cry_Vector2.h>
-#include <Cry_Vector3.h>
-
-
-#include "TangentSpaceCalculation.h"
-#include <mikkelsen/mikktspace.h>
-
-struct SMikkVertex
-{
-    Vec3 pos, norm, tang, bitang;
-    Vec2 magST;
-    Vec2 texc;
-};
-
-struct SMikkFace
-{
-    int vertexOffset;
-    int nrOriginalFace;
-};
-
-struct SMikkMesh
-{
-    std::vector<SMikkVertex>    mikkVerts;
-    std::vector<SMikkFace>      mikkFaces;
-    int                         mikkNumFaces;
-};
-
-CTangentSpaceCalculation::CBase33::CBase33()
-{
-}
-
-CTangentSpaceCalculation::CBase33::CBase33(const Vec3& Uval, const Vec3& Vval, const Vec3& Nval)
-{
-    u = Uval;
-    v = Vval;
-    n = Nval;
-}
-
-bool CTangentSpaceCalculation::CVec3PredicateLess::operator() (const Vec3& first, const Vec3& second) const
-{
-    if (first.x < second.x)
-    {
-        return true;
-    }
-
-    if (first.x > second.x)
-    {
-        return false;
-    }
-
-    if (first.y < second.y)
-    {
-        return true;
-    }
-
-    if (first.y > second.y)
-    {
-        return false;
-    }
-
-    return (first.z < second.z);
-}
-
-bool CTangentSpaceCalculation::CBase33PredicateLess::operator() (const CBase33& first, const CBase33& second) const
-{
-    if (first.n.x < second.n.x)
-    {
-        return true;
-    }
-
-    if (first.n.x > second.n.x)
-    {
-        return false;
-    }
-
-    if (first.n.y < second.n.y)
-    {
-        return true;
-    }
-
-    if (first.n.y > second.n.y)
-    {
-        return false;
-    }
-
-    if (first.n.z < second.n.z)
-    {
-        return true;
-    }
-
-    if (first.n.z > second.n.z)
-    {
-        return false;
-    }
-
-    if (first.u.x < second.u.x)
-    {
-        return true;
-    }
-
-    if (first.u.x > second.u.x)
-    {
-        return false;
-    }
-
-    if (first.u.y < second.u.y)
-    {
-        return true;
-    }
-
-    if (first.u.y > second.u.y)
-    {
-        return false;
-    }
-
-    if (first.u.z < second.u.z)
-    {
-        return true;
-    }
-
-    if (first.u.z > second.u.z)
-    {
-        return false;
-    }
-
-    if (first.v.x < second.v.x)
-    {
-        return true;
-    }
-
-    if (first.v.x > second.v.x)
-    {
-        return false;
-    }
-
-    if (first.v.y < second.v.y)
-    {
-        return true;
-    }
-
-    if (first.v.y > second.v.y)
-    {
-        return false;
-    }
-
-    return first.v.z < second.v.z;
-}
-
-bool CTangentSpaceCalculation::CBaseIndexOrder::operator() (const CBaseIndex& a, const CBaseIndex& b) const
-{
-    // first sort by position
-    if (a.m_posIndex < b.m_posIndex)
-    {
-        return true;
-    }
-    if (a.m_posIndex > b.m_posIndex)
-    {
-        return false;
-    }
-
-    // then by normal
-    if (a.m_normIndex < b.m_normIndex)
-    {
-        return true;
-    }
-    if (a.m_normIndex > b.m_normIndex)
-    {
-        return false;
-    }
-
-    return false;
-}
-
-float CTangentSpaceCalculation::CalcAngleBetween(const Vec3& invA, const Vec3& invB)
-{
-    double LengthQ = sqrt(invA.len2() * invB.len2());
-
-    // to prevent division by zero
-    if (LengthQ < 0.00000001)
-    {
-        LengthQ = 0.00000001;
-    }
-
-    double f = invA.Dot(invB) / LengthQ;
-
-    // acos_tpl need input in the range [-1..1]
-    if (f > 1.0f)
-    {
-        f = 1.0f;
-    }
-    else if (f < -1.0f)
-    {
-        f = -1.0f;
-    }
-
-    // cosf is not available on every platform
-    float fRet = (float)acos_tpl(f);
-
-    return fRet;
-}
-
-void CTangentSpaceCalculation::DebugMesh(const ITriangleInputProxy& proxy) const
-{
-    uint32 dwTriCount = proxy.GetTriangleCount();
-
-    // search for polygons that use the same indices (input data problems)
-    for (uint32 a = 0; a < dwTriCount; a++)
-    {
-        uint32 dwAPos[3], dwANorm[3], dwAUV[3];
-
-        proxy.GetTriangleIndices(a, dwAPos, dwANorm, dwAUV);
-
-        for (uint32 b = a + 1; b < dwTriCount; b++)
-        {
-            uint32 dwBPos[3], dwBNorm[3], dwBUV[3];
-
-            proxy.GetTriangleIndices(b, dwBPos, dwBNorm, dwBUV);
-
-            assert(!(dwAPos[0] == dwBPos[0] && dwAPos[1] == dwBPos[1] && dwAPos[2] == dwBPos[2]));
-            assert(!(dwAPos[1] == dwBPos[0] && dwAPos[2] == dwBPos[1] && dwAPos[0] == dwBPos[2]));
-            assert(!(dwAPos[2] == dwBPos[0] && dwAPos[0] == dwBPos[1] && dwAPos[1] == dwBPos[2]));
-
-            assert(!(dwAPos[1] == dwBPos[0] && dwAPos[0] == dwBPos[1] && dwAPos[2] == dwBPos[2]));
-            assert(!(dwAPos[2] == dwBPos[0] && dwAPos[1] == dwBPos[1] && dwAPos[0] == dwBPos[2]));
-            assert(!(dwAPos[0] == dwBPos[0] && dwAPos[2] == dwBPos[1] && dwAPos[1] == dwBPos[2]));
-        }
-    }
-}
-
-Vec3 CTangentSpaceCalculation::Rotate(const Vec3& vFrom, const Vec3& vTo, const Vec3& vInput)
-{
-    // no mesh is perfect
-    //      assert(IsNormalized(vFrom));
-    // no mesh is perfect
-    //      assert(IsNormalized(vTo));
-
-    // rotation axis
-    Vec3 vRotAxis = vFrom.cross(vTo);
-
-    float fSin = vRotAxis.len();
-    float fCos = vFrom.Dot(vTo);
-
-    // no rotation
-    if (fSin < 0.00001f)
-    {
-        return vInput;
-    }
-
-    // normalize
-    vRotAxis = vRotAxis * (1.0f / fSin);
-
-    // perpendicular to vRotAxis and vFrom90deg
-    Vec3 vFrom90deg = (vRotAxis.cross(vFrom)).normalize();
-
-    // Base is vFrom,vFrom90deg,vRotAxis
-    float fXInPlane = vFrom.Dot(vInput);
-    float fYInPlane = vFrom90deg.Dot(vInput);
-
-    Vec3 a = vFrom * (fXInPlane * fCos - fYInPlane * fSin);
-    Vec3 b = vFrom90deg * (fXInPlane * fSin + fYInPlane * fCos);
-    Vec3 c = vRotAxis * (vRotAxis.Dot(vInput));
-
-    return a + b + c;
-}
-
-eCalculateTangentSpaceErrorCode CTangentSpaceCalculation::CalculateTangentSpace(const ITriangleInputProxy& inInput, const bool bUseCustomNormals, string& errorMessage)
-{
-    if (bUseCustomNormals)
-    {
-        return CalculateTangentSpaceMikk(inInput, errorMessage);
-    }
-
-    uint32 dwTriCount = inInput.GetTriangleCount();
-
-    // not a number in texture coordinates
-    bool bTextureCoordinatesBroken = false;
-
-    // clear result
-    m_baseVectors.clear();
-    m_trianglesBaseAssigment.clear();
-    m_trianglesBaseAssigment.reserve(dwTriCount);
-    assert(m_baseVectors.empty());
-    assert(m_trianglesBaseAssigment.empty());
-
-    // second=index into m_BaseVectors, generated output data
-    std::multimap<CBaseIndex, uint32, CBaseIndexOrder> mBaseMap;
-    // base vectors per triangle
-    std::vector<CBase33> vTriangleBase;
-
-    // calculate the base vectors per triangle -------------------------------------------
-    {
-        eCalculateTangentSpaceErrorCode errorCode = CALCULATE_TANGENT_SPACE_NO_ERRORS;
-        for (uint32 i = 0; i < dwTriCount; i++)
-        {
-            // get data from caller ---------------------------
-            uint32 dwPos[3], dwNorm[3], dwUV[3];
-
-            inInput.GetTriangleIndices(i, dwPos, dwNorm, dwUV);
-
-            Vec3 vPos[3];
-            Vec2 vUV[3];
-
-            for (int e = 0; e < 3; e++)
-            {
-                inInput.GetPos(dwPos[e], vPos[e]);
-                inInput.GetUV(dwUV[e], vUV[e]);
-            }
-
-            // calculate tangent vectors ---------------------------
-
-            Vec3 vA = vPos[1] - vPos[0];
-            Vec3 vB = vPos[2] - vPos[0];
-            Vec3 vC = vPos[2] - vPos[1];
-
-            if (vA.IsZero())
-            {
-                //vert 0 and 1 have the same coordinates
-                errorMessage.Format("Vertices 0 and 1 have the same coordinate: (%f : %f : %f)\n", vPos[0].x, vPos[0].y, vPos[0].z);
-                errorCode = VERTICES_SHARING_COORDINATES;
-                continue;
-            }
-
-            if (vB.IsZero())
-            {
-                //vert 2 and 0 have the same coordinates
-                errorMessage.Format("Vertices 2 and 0 have the same coordinate: (%f : %f : %f)\n", vPos[0].x, vPos[0].y, vPos[0].z);
-                errorCode = VERTICES_SHARING_COORDINATES;
-                continue;
-            }
-
-            if (vC.IsZero())
-            {
-                //vert 2 and 1 have the same coordinates
-                errorMessage.Format("Vertices 2 and 1 have the same coordinate: (%f : %f : %f)\n", vPos[1].x, vPos[1].y, vPos[1].z);
-                errorCode = VERTICES_SHARING_COORDINATES;
-                continue;
-            }
-
-            float fDeltaU1 = vUV[1].x - vUV[0].x;
-            float fDeltaU2 = vUV[2].x - vUV[0].x;
-            float fDeltaV1 = vUV[1].y - vUV[0].y;
-            float fDeltaV2 = vUV[2].y - vUV[0].y;
-
-            float div   = (fDeltaU1 * fDeltaV2 - fDeltaU2 * fDeltaV1);
-
-            if (_isnan(div))
-            {
-                errorMessage.Format("Vertices 0,1,2 have broken texture coordinates v0:(%f : %f : %f) v1:(%f : %f : %f) v2:(%f : %f : %f)\n", vPos[0].x, vPos[0].y, vPos[0].z, vPos[1].x, vPos[1].y, vPos[1].z, vPos[2].x, vPos[2].y, vPos[2].z);
-                bTextureCoordinatesBroken = true;
-                div = 0.0f;
-            }
-
-            Vec3 vU, vV, vN = (vA.cross(vB)).normalize();
-
-            if (div != 0.0)
-            {
-                //  2D triangle area = (u1*v2-u2*v1)/2
-                float a = fDeltaV2;                     // /div was removed - no required because of normalize()
-                float b = -fDeltaV1;
-                float c = -fDeltaU2;
-                float d = fDeltaU1;
-
-                // /fAreaMul2*fAreaMul2 was optimized away -> small triangles in UV should contribute less and
-                // less artifacts (no divide and multiply)
-                vU = (vA * a + vB * b) * fsgnf(div);
-                vV = (vA * c + vB * d) * fsgnf(div);
-            }
-            else
-            {
-                vU = Vec3(1, 0, 0);
-                vV = Vec3(0, 1, 0);
-            }
-
-            vTriangleBase.push_back(CBase33(vU, vV, vN));
-        }
-        if (errorCode != CALCULATE_TANGENT_SPACE_NO_ERRORS)
-        {
-            return errorCode;
-        }
-    }
-
-    // distribute the normals to the vertices
-    {
-        // we create a new tangent base for every vertex index that has a different normal (later we split further for mirrored use)
-        // and sum the base vectors (weighted by angle and mirrored if necessary)
-        for (uint32 i = 0; i < dwTriCount; i++)
-        {
-            uint32 e;
-
-            // get data from caller ---------------------------
-            uint32 dwPos[3], dwNorm[3], dwUV[3];
-
-            inInput.GetTriangleIndices(i, dwPos, dwNorm, dwUV);
-            CBase33 TriBase = vTriangleBase[i];
-            Vec3 vPos[3];
-
-            for (e = 0; e < 3; e++)
-            {
-                inInput.GetPos(dwPos[e], vPos[e]);
-            }
-
-            // for each triangle vertex
-            for (e = 0; e < 3; e++)
-            {
-                // weight by angle to fix the L-Shape problem
-                float fWeight = CalcAngleBetween(vPos[(e + 2) % 3] - vPos[e], vPos[(e + 1) % 3] - vPos[e]);
-
-                if (fWeight <= 0.0f)
-                {
-                    fWeight = 0.0001f;
-                }
-
-                AddNormal2Base(mBaseMap, dwPos[e], dwNorm[e], TriBase.n * fWeight);
-            }
-        }
-    }
-
-    // distribute the uv vectors to the vertices
-    {
-        // we create a new tangent base for every vertex index that has a different normal
-        // if the base vectors does'nt fit we split as well
-        for (uint32 i = 0; i < dwTriCount; i++)
-        {
-            uint32 e;
-
-            // get data from caller ---------------------------
-            uint32 dwPos[3], dwNorm[3], dwUV[3];
-
-            CTriBaseIndex Indx;
-            inInput.GetTriangleIndices(i, dwPos, dwNorm, dwUV);
-            CBase33 TriBase = vTriangleBase[i];
-            Vec3 vPos[3];
-
-            for (e = 0; e < 3; e++)
-            {
-                inInput.GetPos(dwPos[e], vPos[e]);
-            }
-
-            // for each triangle vertex
-            for (e = 0; e < 3; e++)
-            {
-                // weight by angle to fix the L-Shape problem
-                float fWeight = CalcAngleBetween(vPos[(e + 2) % 3] - vPos[e], vPos[(e + 1) % 3] - vPos[e]);
-
-                Indx.p[e] = AddUV2Base(mBaseMap, dwPos[e], dwNorm[e], TriBase.u * fWeight, TriBase.v * fWeight, TriBase.n.normalize());
-            }
-
-            m_trianglesBaseAssigment.push_back(Indx);
-        }
-    }
-
-
-    // adjust the base vectors per vertex -------------------------------------------
-    {
-        std::vector<CBase33>::iterator it;
-
-        for (it = m_baseVectors.begin(); it != m_baseVectors.end(); ++it)
-        {
-            CBase33& ref = (*it);
-
-            // rotate u and v in n plane
-            {
-                Vec3 vUout, vVout, vNout;
-
-                vNout = ref.n;
-                vNout.normalize();
-
-                // project u in n plane
-                // project v in n plane
-                vUout = ref.u - vNout * (vNout.Dot(ref.u));
-                vVout = ref.v - vNout * (vNout.Dot(ref.v));
-
-                ref.u = vUout;
-                ref.u.normalize();
-
-                ref.v = vVout;
-                ref.v.normalize();
-
-                ref.n = vNout;
-
-                //assert(ref.u.x>=-1 && ref.u.x<=1);
-                //assert(ref.u.y>=-1 && ref.u.y<=1);
-                //assert(ref.u.z>=-1 && ref.u.z<=1);
-                //assert(ref.v.x>=-1 && ref.v.x<=1);
-                //assert(ref.v.y>=-1 && ref.v.y<=1);
-                //assert(ref.v.z>=-1 && ref.v.z<=1);
-                //assert(ref.n.x>=-1 && ref.n.x<=1);
-                //assert(ref.n.y>=-1 && ref.n.y<=1);
-                //assert(ref.n.z>=-1 && ref.n.z<=1);
-            }
-        }
-    }
-
-    return bTextureCoordinatesBroken ? BROKEN_TEXTURE_COORDINATES : CALCULATE_TANGENT_SPACE_NO_ERRORS;
-}
-
-uint32 CTangentSpaceCalculation::AddUV2Base(std::multimap<CBaseIndex, uint32, CBaseIndexOrder>& inMap,
-    const uint32 indwPosNo, const uint32 indwNormNo, const Vec3& inU, const Vec3& inV, const Vec3& inNormN)
-{
-    CBaseIndex Indx;
-
-    Indx.m_posIndex = indwPosNo;
-    Indx.m_normIndex = indwNormNo;
-
-    std::multimap<CBaseIndex, uint32, CBaseIndexOrder>::iterator iFind, iFindEnd;
-
-    iFind = inMap.lower_bound(Indx);
-
-    assert(iFind != inMap.end());
-
-    Vec3 vNormal = m_baseVectors[(*iFind).second].n;
-
-    iFindEnd = inMap.upper_bound(Indx);
-
-    uint32 dwBaseUVIndex = 0xffffffff;                                                    // init with not found
-
-    bool bParity = inU.cross(inV).Dot(inNormN) > 0.0f;
-
-    for (; iFind != iFindEnd; ++iFind)
-    {
-        CBase33& refFound = m_baseVectors[(*iFind).second];
-
-        if (!refFound.u.IsZero())
-        {
-            bool bParityRef = refFound.u.cross(refFound.v).Dot(refFound.n) > 0.0f;
-            bool bParityCheck = (bParityRef == bParity);
-
-            if (!bParityCheck)
-            {
-                continue;
-            }
-
-            //      bool bHalfAngleCheck=normalize(inU+inV) * normalize(refFound.u+refFound.v) > 0.0f;
-            Vec3 normRefFound = refFound.n;
-            normRefFound.normalize();
-
-            Vec3 uvRefSum = refFound.u + refFound.v;
-            uvRefSum.normalize();
-
-            Vec3 vRotHalf = Rotate(normRefFound, inNormN, uvRefSum);
-
-            Vec3 uvInSum = inU + inV;
-            uvInSum.normalize();
-            bool bHalfAngleCheck = uvInSum.Dot(vRotHalf) > 0.0f;
-            //      bool bHalfAngleCheck=normalize(normalize(inU)+normalize(inV)) * normalize(normalize(refFound.u)+normalize(refFound.v)) > 0.0f;
-
-            if (!bHalfAngleCheck)
-            {
-                continue;
-            }
-        }
-
-        dwBaseUVIndex = (*iFind).second;
-        break;
-    }
-
-    // not found
-    if (dwBaseUVIndex == 0xffffffff)
-    {
-        // otherwise create a new base
-        CBase33 Base(Vec3(0, 0, 0), Vec3(0, 0, 0), vNormal);
-
-        dwBaseUVIndex = m_baseVectors.size();
-
-        inMap.insert(std::pair<CBaseIndex, uint32>(Indx, dwBaseUVIndex));
-        m_baseVectors.push_back(Base);
-    }
-
-    CBase33& refBaseUV = m_baseVectors[dwBaseUVIndex];
-
-    refBaseUV.u = refBaseUV.u + inU;
-    refBaseUV.v = refBaseUV.v + inV;
-
-    //no mesh is perfect
-    if (inU.x != 0.0f || inU.y != 0.0f || inU.z != 0.0f)
-    {
-        assert(refBaseUV.u.x != 0.0f || refBaseUV.u.y != 0.0f || refBaseUV.u.z != 0.0f);
-    }
-    // no mesh is perfect
-    if (inV.x != 0.0f || inV.y != 0.0f || inV.z != 0.0f)
-    {
-        assert(refBaseUV.v.x != 0.0f || refBaseUV.v.y != 0.0f || refBaseUV.v.z != 0.0f);
-    }
-
-    return dwBaseUVIndex;
-}
-
-void CTangentSpaceCalculation::AddNormal2Base(std::multimap<CBaseIndex, uint32, CBaseIndexOrder>& inMap, const uint32 indwPosNo, const uint32 indwNormNo, const Vec3& inNormal)
-{
-    CBaseIndex Indx;
-
-    Indx.m_posIndex = indwPosNo;
-    Indx.m_normIndex = indwNormNo;
-
-    std::multimap<CBaseIndex, uint32, CBaseIndexOrder>::iterator iFind = inMap.find(Indx);
-
-    uint32 dwBaseNIndex;
-
-    if (iFind != inMap.end())
-    {
-        dwBaseNIndex = (*iFind).second;
-    }
-    else
-    {
-        CBase33 Base(Vec3(0, 0, 0), Vec3(0, 0, 0), Vec3(0, 0, 0));
-
-        dwBaseNIndex = m_baseVectors.size();
-        inMap.insert(std::pair<CBaseIndex, uint32>(Indx, dwBaseNIndex));
-        m_baseVectors.push_back(Base);
-    }
-
-    CBase33& refBaseN = m_baseVectors[dwBaseNIndex];
-
-    refBaseN.n = refBaseN.n + inNormal;
-}
-
-void CTangentSpaceCalculation::GetBase(const uint32 indwPos, float* outU, float* outV, float* outN)
-{
-    CBase33& base = m_baseVectors[indwPos];
-
-    outU[0] = base.u.x;
-    outV[0] = base.v.x;
-    outN[0] = base.n.x;
-    outU[1] = base.u.y;
-    outV[1] = base.v.y;
-    outN[1] = base.n.y;
-    outU[2] = base.u.z;
-    outV[2] = base.v.z;
-    outN[2] = base.n.z;
-}
-
-void CTangentSpaceCalculation::GetTriangleBaseIndices(const uint32 indwTriNo, uint32 outdwBase[3])
-{
-    assert(indwTriNo < m_trianglesBaseAssigment.size());
-    CTriBaseIndex& indx = m_trianglesBaseAssigment[indwTriNo];
-
-    for (uint32 i = 0; i < 3; i++)
-    {
-        outdwBase[i] = indx.p[i];
-    }
-}
-
-size_t CTangentSpaceCalculation::GetBaseCount()
-{
-    return m_baseVectors.size();
-}
-
-static int MikkGetNumFaces(const SMikkTSpaceContext* pContext)
-{
-    SMikkMesh* mikkMesh = (SMikkMesh*)pContext->m_pUserData;
-    return mikkMesh->mikkNumFaces;
-}
-
-static int MikkGetNumVerticesOfFace([[maybe_unused]] const SMikkTSpaceContext* pContext, [[maybe_unused]] const int iFace)
-{
-    return 3;
-}
-
-static void MikkGetPosition(const SMikkTSpaceContext* pContext, float fvPosOut[], const int iFace, const int iVert)
-{
-    SMikkMesh* mikkMesh = (SMikkMesh*)pContext->m_pUserData;
-    const SMikkFace& face = mikkMesh->mikkFaces[iFace];
-
-    const Vec3& pos = mikkMesh->mikkVerts[face.vertexOffset + iVert].pos;
-    fvPosOut[0] = pos.x;
-    fvPosOut[1] = pos.y;
-    fvPosOut[2] = pos.z;
-}
-
-static void MikkGetNormal(const SMikkTSpaceContext* pContext, float fvNormOut[], const int iFace, const int iVert)
-{
-    SMikkMesh* mikkMesh = (SMikkMesh*)pContext->m_pUserData;
-    const SMikkFace& face = mikkMesh->mikkFaces[iFace];
-
-    const Vec3& normal = mikkMesh->mikkVerts[face.vertexOffset + iVert].norm;
-    fvNormOut[0] = normal.x;
-    fvNormOut[1] = normal.y;
-    fvNormOut[2] = normal.z;
-}
-
-static void MikkGetTexCoord(const SMikkTSpaceContext* pContext, float fvTexcOut[], const int iFace, const int iVert)
-{
-    SMikkMesh* mikkMesh = (SMikkMesh*)pContext->m_pUserData;
-    const SMikkFace& face = mikkMesh->mikkFaces[iFace];
-
-    const Vec2& tan = mikkMesh->mikkVerts[face.vertexOffset + iVert].texc;
-    fvTexcOut[0] = tan.x;
-    fvTexcOut[1] = tan.y;
-}
-
-static void MikkSetTSpace(const SMikkTSpaceContext* pContext, const float fvTangent[], const float fvBiTangent[], const float fMagS, const float fMagT, [[maybe_unused]] const tbool bIsOrientationPreserving, const int iFace, const int iVert)
-{
-    SMikkMesh* mikkMesh = (SMikkMesh*)pContext->m_pUserData;
-    const SMikkFace& face = mikkMesh->mikkFaces[iFace];
-    const int index = face.vertexOffset + iVert;
-
-    mikkMesh->mikkVerts[index].tang     = Vec3(fvTangent[0], fvTangent[1], fvTangent[2]);
-    mikkMesh->mikkVerts[index].bitang   = Vec3(fvBiTangent[0], fvBiTangent[1], fvBiTangent[2]);
-    mikkMesh->mikkVerts[index].magST.x  = fMagS;
-    mikkMesh->mikkVerts[index].magST.y  = fMagT;
-}
-
-eCalculateTangentSpaceErrorCode CTangentSpaceCalculation::CalculateTangentSpaceMikk(const ITriangleInputProxy& proxy, string& errorMessage)
-{
-    const uint32 numFaces = proxy.GetTriangleCount();
-
-    // prepare the working mesh for mikkelsen algorithm
-    // when custom normals are specified, we'll use them
-    SMikkMesh mikkMesh;
-    mikkMesh.mikkNumFaces = numFaces;
-    mikkMesh.mikkVerts.resize(numFaces * 3);
-    mikkMesh.mikkFaces.resize(numFaces);
-
-    for (uint32 f = 0; f < numFaces; ++f)
-    {
-        uint32 outdwPos[3];
-        uint32 outdwNorm[3];
-        uint32 outdwUV[3];
-        proxy.GetTriangleIndices(f, outdwPos, outdwNorm, outdwUV);
-
-        mikkMesh.mikkFaces[f].vertexOffset = f * 3;
-        mikkMesh.mikkFaces[f].nrOriginalFace = f;
-
-        for (uint32 vId = 0; vId < 3; ++vId)
-        {
-            SMikkVertex& vert(mikkMesh.mikkVerts[mikkMesh.mikkFaces[f].vertexOffset + vId]);
-
-            proxy.GetPos(outdwPos[vId], vert.pos);
-            proxy.GetNorm(f, vId, vert.norm);
-            proxy.GetUV(outdwUV[vId], vert.texc);
-
-            vert.tang = Vec3(1.0f, 0.0f, 0.0f);
-            vert.bitang = Vec3(0.0f, 1.0f, 0.0f);
-        }
-    }
-
-    // prepare mikkelsen interface
-    SMikkTSpaceInterface mikkInterface;
-    memset(&mikkInterface, 0, sizeof(SMikkTSpaceInterface));
-
-    mikkInterface.m_getNumFaces             = MikkGetNumFaces;
-    mikkInterface.m_getNumVerticesOfFace    = MikkGetNumVerticesOfFace;
-    mikkInterface.m_getPosition             = MikkGetPosition;
-    mikkInterface.m_getNormal               = MikkGetNormal;
-    mikkInterface.m_getTexCoord             = MikkGetTexCoord;
-    mikkInterface.m_setTSpace               = MikkSetTSpace;
-
-    SMikkTSpaceContext mikkContext;
-    memset(&mikkContext, 0, sizeof(SMikkTSpaceContext));
-    mikkContext.m_pUserData = &mikkMesh;
-    mikkContext.m_pInterface = &mikkInterface;
-
-    // generate tangent basis
-    bool res = genTangSpaceDefault(&mikkContext) != 0;
-    if (!res)
-    {
-        errorMessage = "Failed to allocate memory for Mikkelsen Tangent Basis algorithm.";
-        return MEMORY_ALLOCATION_FAILED;
-    }
-
-    m_baseVectors.clear();
-    m_trianglesBaseAssigment.clear();
-    m_trianglesBaseAssigment.resize(proxy.GetTriangleCount());
-
-    std::map<CBase33, int, CBase33PredicateLess> uniqueBaseVectors;
-    std::map<CBase33, int, CBase33PredicateLess>::const_iterator it;
-
-    // remove tangent basis duplicates and add them to the mesh
-    for (int f = 0; f < mikkMesh.mikkNumFaces; ++f)
-    {
-        const SMikkFace& face = mikkMesh.mikkFaces[f];
-
-        CTriBaseIndex tbi;
-        for (int ii = 0; ii < 3; ++ii)
-        {
-            const int index = face.vertexOffset + ii;
-            const SMikkVertex& vert = mikkMesh.mikkVerts[index];
-
-            CBase33 base;
-            base.u = vert.tang;
-            base.v = vert.bitang;
-
-            float fNorm[3];
-            MikkGetNormal(&mikkContext, &fNorm[0], face.nrOriginalFace, ii);
-
-            base.n.x = fNorm[0];
-            base.n.y = fNorm[1];
-            base.n.z = fNorm[2];
-
-            int val;
-            it = uniqueBaseVectors.find(base);
-            if (it != uniqueBaseVectors.end())
-            {
-                val = it->second;
-            }
-            else
-            {
-                val = m_baseVectors.size();
-                m_baseVectors.push_back(base);
-                uniqueBaseVectors[base] = val;
-            }
-            tbi.p[ii] = val;
-        }
-        m_trianglesBaseAssigment[face.nrOriginalFace] = tbi;
-    }
-
-    return CALCULATE_TANGENT_SPACE_NO_ERRORS;
-}
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/TangentSpaceCalculation.h b/Code/CryEngine/Cry3DEngine/MeshCompiler/TangentSpaceCalculation.h
deleted file mode 100644
index a5abea7335..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/TangentSpaceCalculation.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description   : calculated the tangent space base vector for a given mesh
-// Dependencies  : none
-// Documentation : "How to calculate tangent base vectors.doc"
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_MESHCOMPILER_TANGENTSPACECALCULATION_H
-#define CRYINCLUDE_CRY3DENGINE_MESHCOMPILER_TANGENTSPACECALCULATION_H
-#pragma once
-
-
-enum eCalculateTangentSpaceErrorCode
-{
-    CALCULATE_TANGENT_SPACE_NO_ERRORS,
-    BROKEN_TEXTURE_COORDINATES,
-    VERTICES_SHARING_COORDINATES,
-    ALL_VERTICES_ON_THE_SAME_VECTOR,
-    MEMORY_ALLOCATION_FAILED
-};
-
-class ITriangleInputProxy
-{
-public:
-    virtual ~ITriangleInputProxy(){}
-
-    virtual uint32  GetTriangleCount() const = 0;
-    virtual void    GetTriangleIndices(const uint32 indwTriNo, uint32 outdwPos[3], uint32 outdwNorm[3], uint32 outdwUV[3]) const = 0;
-    virtual void    GetPos(const uint32 indwPos, Vec3& outfPos) const = 0;
-    virtual void    GetUV(const uint32 indwPos, Vec2& outfUV) const = 0;
-    virtual void    GetNorm(const uint32 indwTriNo, const uint32 indwVertNo, Vec3& outfNorm) const = 0;
-};
-
-class CTangentSpaceCalculation
-{
-public:
-    //! /param inInput - the normals are only used as smoothing input - we calculate the normals ourself
-    eCalculateTangentSpaceErrorCode CalculateTangentSpace(const ITriangleInputProxy& inInput, const bool bUseCustomNormals, string& errorMessage);
-
-    size_t  GetBaseCount();
-    void    GetTriangleBaseIndices(const uint32 indwTriNo, uint32 outdwBase[3]);
-
-    //! returns a orthogonal base (perpendicular and normalized)
-    void    GetBase(const uint32 indwPos, float* outU, float* outV, float* outN);
-
-private:
-
-    struct CBase33
-    {
-        CBase33();
-        CBase33(const Vec3& Uval, const Vec3& Vval, const Vec3& Nval);
-
-        Vec3 u;
-        Vec3 v;
-        Vec3 n; // part of the tangent base but can be used also as vertex normal
-    };
-
-    struct CVec3PredicateLess
-    {
-        bool operator() (const Vec3& first, const Vec3& second) const;
-    };
-
-    struct CBase33PredicateLess
-    {
-        bool operator() (const CBase33& first, const CBase33& second) const;
-    };
-
-    struct CBaseIndex
-    {
-        // position index in the positions stream
-        uint32 m_posIndex;
-        // normal index in the vertex normals stream
-        uint32 m_normIndex;
-    };
-
-    struct CBaseIndexOrder
-    {
-        bool operator() (const CBaseIndex& a, const CBaseIndex& b) const;
-    };
-
-    struct CTriBaseIndex
-    {
-        uint32 p[3]; //!< index in m_BaseVectors
-    };
-
-    // [dwTriangleCount]
-    std::vector<CTriBaseIndex>  m_trianglesBaseAssigment;
-    // [0..] generated output data
-    std::vector<CBase33>        m_baseVectors;
-
-    eCalculateTangentSpaceErrorCode CalculateTangentSpaceMikk(const ITriangleInputProxy& inInput, string& errorMessage);
-
-    CBase33& GetBase(std::multimap<CBaseIndex, uint32, CBaseIndexOrder>& inMap, const uint32 indwPosNo, const uint32 indwNormNo);
-    uint32  AddUV2Base(std::multimap<CBaseIndex, uint32, CBaseIndexOrder>& inMap, const uint32 indwPosNo, const uint32 indwNormNo, const Vec3& inU, const Vec3& inV, const Vec3& inNormN);
-    void    AddNormal2Base(std::multimap<CBaseIndex, uint32, CBaseIndexOrder>& inMap, const uint32 indwPosNo, const uint32 indwNormNo, const Vec3& inNormal);
-    Vec3    Rotate(const Vec3& vFrom, const Vec3& vTo, const Vec3& vInput);
-    void    DebugMesh(const ITriangleInputProxy& inInput) const;
-    float   CalcAngleBetween(const Vec3& invA, const Vec3& invB);
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_MESHCOMPILER_TANGENTSPACECALCULATION_H
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/VertexCacheOptimizer.cpp b/Code/CryEngine/Cry3DEngine/MeshCompiler/VertexCacheOptimizer.cpp
deleted file mode 100644
index d03d9c7c23..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/VertexCacheOptimizer.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-
-#include <platform.h>
-
-#include "VertexCacheOptimizer.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define VERTEXCACHEOPTIMIZER_CPP_SECTION_1 1
-#define VERTEXCACHEOPTIMIZER_CPP_SECTION_2 2
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION VERTEXCACHEOPTIMIZER_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(VertexCacheOptimizer_cpp)
-#endif
-
-namespace vcache
-{
-    bool VertexCacheOptimizer::ReorderIndicesInPlace([[maybe_unused]] void* pIndices, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] int indexSize)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION VERTEXCACHEOPTIMIZER_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(VertexCacheOptimizer_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-        #else
-        return true;
-        #endif
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/VertexCacheOptimizer.h b/Code/CryEngine/Cry3DEngine/MeshCompiler/VertexCacheOptimizer.h
deleted file mode 100644
index 70a35f96eb..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/VertexCacheOptimizer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <BaseTypes.h>
-
-namespace vcache
-{
-    class VertexCacheOptimizer
-    {
-    public:
-        static bool ReorderIndicesInPlace(void* pIndices, uint32 numIndices, int indexSize);
-
-        VertexCacheOptimizer(const VertexCacheOptimizer& rhs) = delete;
-        const VertexCacheOptimizer& operator=(VertexCacheOptimizer& rhs) = delete;
-    };
-}
diff --git a/Code/CryEngine/Cry3DEngine/MeshCompiler/meshcompiler_files.cmake b/Code/CryEngine/Cry3DEngine/MeshCompiler/meshcompiler_files.cmake
deleted file mode 100644
index 31f7369c88..0000000000
--- a/Code/CryEngine/Cry3DEngine/MeshCompiler/meshcompiler_files.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ForsythFaceReorderer.cpp
-    MeshCompiler.cpp
-    TangentSpaceCalculation.cpp
-    ForsythFaceReorderer.h
-    MeshCompiler.h
-    TangentSpaceCalculation.h
-    PVRTTriStrip/PVRTTriStrip.h
-    PVRTTriStrip/PVRTTriStrip.cpp
-    VertexCacheOptimizer.cpp
-    VertexCacheOptimizer.h
-)
diff --git a/Code/CryEngine/Cry3DEngine/ObjMan.cpp b/Code/CryEngine/Cry3DEngine/ObjMan.cpp
deleted file mode 100644
index a073f00859..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjMan.cpp
+++ /dev/null
@@ -1,1377 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Loading trees, buildings, register/unregister entities for rendering
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "CullBuffer.h"
-#include "3dEngine.h"
-#include "IndexedMesh.h"
-#include "ObjectsTree.h"
-#include <IResourceManager.h>
-#include "DecalRenderNode.h"
-#include <CryPath.h>
-#include <cctype>
-
-#include <StatObjBus.h>
-
-#include <LoadScreenBus.h>
-
-#define BRUSH_LIST_FILE "brushlist.txt"
-#define CGF_LEVEL_CACHE_PAK "cgf.pak"
-
-namespace BoneNames
-{
-    const char* Cloth = "cloth";
-}
-
-//////////////////////////////////////////////////////////////////////////
-IStatObj* CObjManager::GetStaticObjectByTypeID(int nTypeID, int nSID)
-{
-    assert(nSID >= 0 && nSID < m_lstStaticTypes.Count());
-
-    if (nTypeID >= 0 && nTypeID < m_lstStaticTypes[nSID].Count())
-    {
-        return m_lstStaticTypes[nSID][nTypeID].pStatObj;
-    }
-
-    return 0;
-}
-
-IStatObj* CObjManager::FindStaticObjectByFilename(const char* filename)
-{
-    string lowerFileName(filename);
-    return stl::find_in_map(m_nameToObjectMap, CONST_TEMP_STRING(lowerFileName.MakeLower()), NULL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::UnloadObjects(bool bDeleteAll)
-{
-
-    CleanStreamingData();
-
-    m_pRMBox = 0;
-
-    m_decalsToPrecreate.resize(0);
-
-    // Clear all objects that are in the garbage collector.
-    ClearStatObjGarbage();
-
-    stl::free_container(m_checkForGarbage);
-    m_bGarbageCollectionEnabled = false;
-
-    if (bDeleteAll)
-    {
-        {
-            AZStd::unique_lock<AZStd::recursive_mutex> loadLock(m_loadMutex);
-
-            m_lockedObjects.clear(); // Lock/Unlock resources will not work with this.
-
-            // Release default stat obj.
-            m_pDefaultCGF = 0;
-
-            m_nameToObjectMap.clear();
-            m_lstLoadedObjects.clear();
-        }
-
-#if !defined(_RELEASE)
-        int nNumLeaks = 0;
-#endif
-        std::vector<CStatObj*> garbage;
-        for (CStatObj* pStatObj = CStatObj::get_intrusive_list_root(); pStatObj; pStatObj = pStatObj->m_next_intrusive)
-        {
-            garbage.push_back(pStatObj);
-
-#if !defined(_RELEASE)
-            if (!pStatObj->IsDefaultObject())
-            {
-                nNumLeaks++;
-                Warning("StatObj not deleted: %s (%s)  RefCount: %d", pStatObj->m_szFileName.c_str(), pStatObj->m_szGeomName.c_str(), pStatObj->m_nUsers);
-            }
-#endif //_RELEASE
-        }
-
-#ifndef _RELEASE
-        // deleting leaked objects
-        if (nNumLeaks > 0)
-        {
-            Warning("CObjManager::CheckObjectLeaks: %d object(s) found in memory", nNumLeaks);
-        }
-#endif //_RELEASE
-
-        for (int i = 0, num = (int)garbage.size(); i < num; i++)
-        {
-            CStatObj* pStatObj = garbage[i];
-            pStatObj->ShutDown();
-        }
-        for (int i = 0, num = (int)garbage.size(); i < num; i++)
-        {
-            CStatObj* pStatObj = garbage[i];
-            delete pStatObj;
-        }
-
-#ifdef POOL_STATOBJ_ALLOCS
-        assert(m_statObjPool->GetTotalMemory().nUsed == 0);
-#endif
-    }
-    m_bGarbageCollectionEnabled = true;
-
-#ifdef POOL_STATOBJ_ALLOCS
-    m_statObjPool->FreeMemoryIfEmpty();
-#endif
-
-    //If this collection is not cleared on unload then character materials will
-    //leak and most likely crash the engine across level loads.
-    stl::free_container(m_collectedMaterials);
-    stl::free_container(m_decalsToPrecreate);
-    stl::free_container(m_tmpAreas0);
-    stl::free_container(m_tmpAreas1);
-    for (int nSID = 0; nSID < m_lstStaticTypes.Count(); nSID++)
-    {
-        m_lstStaticTypes[nSID].Free();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::CleanStreamingData()
-{
-    stl::free_container(m_arrStreamingNodeStack);
-
-    stl::free_container(m_arrStreamableToRelease);
-    stl::free_container(m_arrStreamableToLoad);
-    stl::free_container(m_arrStreamableToDelete);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// class for asyncronous preloading of level CGF's
-//////////////////////////////////////////////////////////////////////////
-struct CLevelStatObjLoader
-    : public IStreamCallback
-    , public Cry3DEngineBase
-{
-    int m_nTasksNum;
-
-    CLevelStatObjLoader()
-    {
-        m_nTasksNum = 0;
-    }
-
-    void StartStreaming(const char* pFileName)
-    {
-        m_nTasksNum++;
-
-        // request the file
-        StreamReadParams params;
-        params.dwUserData = 0;
-        params.nSize = 0;
-        params.pBuffer = NULL;
-        params.nLoadTime = 0;
-        params.nMaxLoadTime = 0;
-        params.ePriority = estpUrgent;
-        GetSystem()->GetStreamEngine()->StartRead(eStreamTaskTypeGeometry, pFileName, this, &params);
-    }
-
-    virtual void StreamOnComplete (IReadStream* pStream, unsigned nError)
-    {
-        if (!nError)
-        {
-            string szName = pStream->GetName();
-            // remove game folder from path
-            const char* szInGameName = strstr(szName, "\\");
-            // load CGF from memory
-            GetObjManager()->LoadStatObjUnsafeManualRef(szInGameName + 1, NULL, NULL, true, 0, pStream->GetBuffer(), pStream->GetBytesRead());
-        }
-
-        m_nTasksNum--;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Preload in efficient way all CGF's used in level
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::PreloadLevelObjects()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    // Starting a new level, so make sure the round ids are ahead of what they were in the last level
-    m_nUpdateStreamingPrioriryRoundId += 8;
-    m_nUpdateStreamingPrioriryRoundIdFast += 8;
-
-    PrintMessage("Starting loading level CGF's ...");
-    INDENT_LOG_DURING_SCOPE();
-
-    float fStartTime = GetCurAsyncTimeSec();
-
-    bool bCgfCacheExist = false;
-    if (GetCVars()->e_StreamCgf != 0)
-    {
-        // Only when streaming enable use no-mesh cgf pak.
-        //bCgfCacheExist = GetISystem()->GetIResourceManager()->LoadLevelCachePak( CGF_LEVEL_CACHE_PAK,"" );
-    }
-    auto pResList = GetISystem()->GetIResourceManager()->GetLevelResourceList();
-
-    // Construct streamer object
-    CLevelStatObjLoader cgfStreamer;
-
-    CryPathString cgfFilename;
-    int nCgfCounter = 0;
-    int nInLevelCacheCount = 0;
-
-    bool bVerboseLogging = GetCVars()->e_StatObjPreload > 1;
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Enumerate all .CGF inside level from the "brushlist.txt" file.
-    {
-        string brushListFilename = Get3DEngine()->GetLevelFilePath(BRUSH_LIST_FILE);
-        CCryFile file;
-        if (file.Open(brushListFilename.c_str(), "rb") && file.GetLength() > 0)
-        {
-            int nFileLength = file.GetLength();
-            char* buf = new char[nFileLength + 1];
-            buf[nFileLength] = 0; // Null terminate
-            file.ReadRaw(buf, nFileLength);
-
-            // Parse file, every line in a file represents a resource filename.
-            char seps[] = "\r\n";
-            char *next_token = nullptr;
-            char* token = azstrtok(buf, 0, seps, &next_token);
-            while (token != NULL)
-            {
-                int nAliasLen = sizeof("%level%") - 1;
-                if (strncmp(token, "%level%", nAliasLen) == 0)
-                {
-                    cgfFilename = Get3DEngine()->GetLevelFilePath(token + nAliasLen);
-                }
-                else
-                {
-                    cgfFilename = token;
-                }
-
-                if (bVerboseLogging)
-                {
-                    CryLog("%s", cgfFilename.c_str());
-                }
-                // Do not use streaming for the Brushes from level.pak.
-                GetObjManager()->LoadStatObjUnsafeManualRef(cgfFilename.c_str(), NULL, 0, false, 0);
-                //cgfStreamer.StartStreaming(cgfFilename.c_str());
-                nCgfCounter++;
-
-                token = azstrtok(NULL, 0, seps, &next_token);
-
-                //This loop can take a few seconds, so we should refresh the loading screen and call the loading tick functions to ensure that no big gaps in coverage occur.
-                SYNCHRONOUS_LOADING_TICK();
-            }
-            delete []buf;
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    // Request objects loading from Streaming System.
-    if (pResList)
-    {
-        if (const char* pCgfName = pResList->GetFirst())
-        {
-            while (pCgfName)
-            {
-                if (strstr(pCgfName, ".cgf"))
-                {
-                    const char* sLodName = strstr(pCgfName, "_lod");
-                    if (sLodName && (sLodName[4] >= '0' && sLodName[4] <= '9'))
-                    {
-                        // Ignore Lod files.
-                        pCgfName = pResList->GetNext();
-                        continue;
-                    }
-
-                    cgfFilename = pCgfName;
-
-                    if (bVerboseLogging)
-                    {
-                        CryLog("%s", cgfFilename.c_str());
-                    }
-                    IStatObj* pStatObj = GetObjManager()->LoadStatObjUnsafeManualRef(cgfFilename.c_str(), NULL, 0, true, 0);
-                    if (pStatObj)
-                    {
-                        if (pStatObj->IsMeshStrippedCGF())
-                        {
-                            nInLevelCacheCount++;
-                        }
-                    }
-                    // cgfStreamer.StartStreaming(cgfFilename.c_str());
-                    nCgfCounter++;
-
-                    // This loop can take a few seconds, so we should refresh the loading screen and call the loading tick functions to
-                    // ensure that no big gaps in coverage occur.
-                    SYNCHRONOUS_LOADING_TICK();
-                }
-
-                pCgfName = pResList->GetNext();
-            }
-        }
-    }
-
-    //  PrintMessage("Finished requesting level CGF's: %d objects in %.1f sec", nCgfCounter, GetCurAsyncTimeSec()-fStartTime);
-
-    // Continue updating streaming system until all CGF's are loaded
-    if (cgfStreamer.m_nTasksNum > 0)
-    {
-        LOADING_TIME_PROFILE_SECTION_NAMED("CObjManager::PreloadLevelObjects_StreamEngine_Update");
-        GetSystem()->GetStreamEngine()->UpdateAndWait();
-    }
-
-    if (bCgfCacheExist)
-    {
-        //GetISystem()->GetIResourceManager()->UnloadLevelCachePak( CGF_LEVEL_CACHE_PAK );
-    }
-
-    float dt = GetCurAsyncTimeSec() - fStartTime;
-    PrintMessage("Finished loading level CGF's: %d objects loaded (%d from LevelCache) in %.1f sec", nCgfCounter, nInLevelCacheCount, dt);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Create / delete object
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template<typename T>
-T CObjManager::LoadStatObjInternal(const char* filename,
-    const char* _szGeomName,
-    IStatObj::SSubObject** ppSubObject,
-    bool bUseStreaming,
-    unsigned long nLoadingFlags,
-    const void* pData,
-    int nDataSize,
-    [[maybe_unused]] const char* szBlockName)
-{
-    LoadDefaultCGF(filename, nLoadingFlags);
-
-    LOADING_TIME_PROFILE_SECTION;
-    
-    if (ppSubObject)
-    {
-        *ppSubObject = NULL;
-    }
-
-    AZStd::unique_lock<AZStd::recursive_mutex> loadLock(m_loadMutex);
-
-    if (!strcmp(filename, "NOFILE"))
-    { // make empty object to be filled from outside
-        CStatObj* pObject = new CStatObj();
-        m_lstLoadedObjects.insert(pObject);
-
-        return pObject;
-    }
-
-    // Normalize file name
-    // Remap %level% alias if needed and unify filename
-    char normalizedFilename[_MAX_PATH];
-    NormalizeLevelName(filename, normalizedFilename);
-
-    bool bForceBreakable = strstr(normalizedFilename, "break") != 0;
-    if (_szGeomName && !strcmp(_szGeomName, "#ForceBreakable"))
-    {
-        bForceBreakable = true;
-        _szGeomName = 0;
-    }
-
-    // Try to find already loaded object
-    IStatObj* pObject = 0;
-
-    int flagCloth = 0;
-    if (_szGeomName && !strcmp(_szGeomName, BoneNames::Cloth))
-    {
-        _szGeomName = 0;
-        flagCloth = STATIC_OBJECT_DYNAMIC | STATIC_OBJECT_CLONE;
-    }
-    else
-    {
-        // This branch needs to be handled carefully to avoid returning an object that is in the process of being deleted by ClearStatObjGarbage on another thread
-        // It is important that ClearStatObjGarbage is not run during this time (done via m_loadMutex)
-
-        AZStd::string lowerFileName(normalizedFilename);
-        int(* toLowerFunc)(int) = std::tolower; //Needed to help the compiler figure out the right tolower to use on android
-        AZStd::transform(lowerFileName.begin(), lowerFileName.end(), lowerFileName.begin(), toLowerFunc);
-
-        pObject = stl::find_in_map(m_nameToObjectMap, CONST_TEMP_STRING(lowerFileName.c_str()), NULL);
-        if (pObject)
-        {
-            assert(!pData);
-
-            return (T)LoadFromCacheNoRef(pObject, bUseStreaming, nLoadingFlags, _szGeomName, ppSubObject);
-        }
-    }
-
-    // Load new CGF
-    return LoadNewCGF(pObject, flagCloth, bUseStreaming, bForceBreakable, nLoadingFlags, normalizedFilename, pData, nDataSize, filename, _szGeomName, ppSubObject);
-}
-
-IStatObj* CObjManager::LoadStatObjUnsafeManualRef(const char* filename,
-    const char* _szGeomName,
-    IStatObj::SSubObject** ppSubObject,
-    bool bUseStreaming,
-    unsigned long nLoadingFlags,
-    const void* pData,
-    int nDataSize,
-    const char* szBlockName)
-{
-    return LoadStatObjInternal<IStatObj*>(filename, _szGeomName, ppSubObject, bUseStreaming, nLoadingFlags, pData, nDataSize, szBlockName);
-}
-
-_smart_ptr<IStatObj> CObjManager::LoadStatObjAutoRef(const char* filename,
-    const char* _szGeomName,
-    IStatObj::SSubObject** ppSubObject,
-    bool bUseStreaming,
-    unsigned long nLoadingFlags,
-    const void* pData,
-    int nDataSize,
-    const char* szBlockName)
-{
-    return LoadStatObjInternal<_smart_ptr<IStatObj> >(filename, _szGeomName, ppSubObject, bUseStreaming, nLoadingFlags, pData, nDataSize, szBlockName);
-}
-
-template <size_t SIZE_IN_CHARS>
-void CObjManager::NormalizeLevelName(const char* filename, char(&normalizedFilename)[SIZE_IN_CHARS])
-{
-    const int nAliasNameLen = sizeof("%level%") - 1;
-
-    if (strncmp(filename, "%level%", nAliasNameLen) == 0)
-    {
-        cry_strcpy(normalizedFilename, Get3DEngine()->GetLevelFilePath(filename + nAliasNameLen));
-    }
-    else
-    {
-        cry_strcpy(normalizedFilename, filename);
-    }
-
-    PREFAST_SUPPRESS_WARNING(6054) // normalizedFilename is null terminated
-    std::replace(normalizedFilename, normalizedFilename + strlen(normalizedFilename), '\\', '/'); // To Unix Path
-}
-
-void CObjManager::LoadDefaultCGF(const char* filename, unsigned long nLoadingFlags)
-{
-    string fixedFileName(filename);
-    fixedFileName = PathUtil::ToUnixPath(fixedFileName);
-
-    if (!m_pDefaultCGF && azstricmp(fixedFileName.c_str(), DEFAULT_CGF_NAME) != 0)
-    {
-        // Load default object if not yet loaded.
-        const char* sDefaulObjFilename = DEFAULT_CGF_NAME;
-        // prepare default object
-        m_pDefaultCGF = LoadStatObjUnsafeManualRef(sDefaulObjFilename, NULL, NULL, false, nLoadingFlags);
-        if (!m_pDefaultCGF)
-        {
-            Error("CObjManager::LoadStatObj: Default object not found (%s)", sDefaulObjFilename);
-            m_pDefaultCGF = new CStatObj();
-        }
-        m_pDefaultCGF->SetDefaultObject(true);
-    }
-}
-
-IStatObj* CObjManager::LoadNewCGF(IStatObj* pObject, int flagCloth, bool bUseStreaming, bool bForceBreakable, unsigned long nLoadingFlags, const char* normalizedFilename, const void* pData, int nDataSize, const char* originalFilename, const char* geomName, IStatObj::SSubObject** ppSubObject)
-{
-    pObject = new CStatObj();
-    pObject->SetFlags(pObject->GetFlags() | flagCloth);
-
-    bUseStreaming &= (GetCVars()->e_StreamCgf != 0);
-
-    if (bUseStreaming)
-    {
-        pObject->SetCanUnload(true);
-    }
-    if (bForceBreakable)
-    {
-        nLoadingFlags |= IStatObj::ELoadingFlagsForceBreakable;
-    }
-
-    if (!pObject->LoadCGF(normalizedFilename, strstr(normalizedFilename, "_lod") != NULL, nLoadingFlags, pData, nDataSize))
-    {
-        Error("Failed to load cgf: %s", originalFilename);
-        // object not found
-        // if geom name is specified - just return 0
-        if (geomName && geomName[0])
-        {
-            delete pObject;
-            return nullptr;
-        }
-
-        // make unique default CGF for every case of missing CGF, this will make export process more reliable and help finding missing CGF's in pure game
-        /*      pObject->m_bCanUnload = false;
-        if (m_bEditor && pObject->LoadCGF( DEFAULT_CGF_NAME, false, nLoadingFlags, pData, nDataSize ))
-        {
-        pObject->m_szFileName = sFilename;
-        pObject->m_bDefaultObject = true;
-        }
-        else*/
-        {
-            delete pObject;
-            return m_pDefaultCGF;
-        }
-    }
-
-    // now try to load lods
-    if (!pObject->AreLodsLoaded())
-    {
-        pObject->LoadLowLODs(bUseStreaming, nLoadingFlags);
-    }
-
-    if (!pObject->IsUnloadable())
-    { // even if streaming is disabled we register object for potential streaming (streaming system will never unload it)
-        pObject->DisableStreaming();
-    }
-
-    // sub meshes merging
-    pObject->TryMergeSubObjects(false);
-
-    m_lstLoadedObjects.insert(pObject);
-    m_nameToObjectMap[pObject->GetFileName().MakeLower()] = pObject;
-
-    if (geomName && geomName[0])
-    {
-        // Return SubObject.
-        CStatObj::SSubObject* pSubObject = pObject->FindSubObject(geomName);
-        if (!pSubObject || !pSubObject->pStatObj)
-        {
-            return 0;
-        }
-        if (pSubObject->pStatObj)
-        {
-            if (ppSubObject)
-            {
-                *ppSubObject = pSubObject;
-            }
-            return (CStatObj*)pSubObject->pStatObj;
-        }
-    }
-
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-    if (GetISystem() && GetISystem()->GetGlobalEnvironment() && GetISystem()->GetGlobalEnvironment()->mMainThreadId == CryGetCurrentThreadId())
-    {
-        EBUS_EVENT(LoadScreenBus, UpdateAndRender);
-    }
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-    return pObject;
-}
-
-IStatObj* CObjManager::LoadFromCacheNoRef(IStatObj* pObject, bool bUseStreaming, unsigned long nLoadingFlags, const char* geomName, IStatObj::SSubObject** ppSubObject)
-{
-    if (!bUseStreaming && pObject->IsUnloadable())
-    {
-        pObject->DisableStreaming();
-    }
-
-    if (!pObject->AreLodsLoaded())
-    {
-        pObject->LoadLowLODs(bUseStreaming, nLoadingFlags);
-    }
-
-    if (geomName && geomName[0])
-    {
-        // Return SubObject.
-        IStatObj::SSubObject* pSubObject = pObject->FindSubObject(geomName);
-        if (!pSubObject || !pSubObject->pStatObj)
-        {
-            return nullptr;
-        }
-
-        if (ppSubObject)
-        {
-            *ppSubObject = pSubObject;
-        }
-
-        // UnregisterForGarbage needs to be called on pObject before returning
-        UnregisterForGarbage(pObject);
-
-        return (CStatObj*)pSubObject->pStatObj;
-    }
-
-    UnregisterForGarbage(pObject);
-
-    return pObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjManager::InternalDeleteObject(IStatObj* pObject)
-{
-    assert(pObject);
-
-    AZStd::lock_guard<AZStd::recursive_mutex> loadLock(m_loadMutex);
-
-    if (!m_bLockCGFResources && !IsResourceLocked(pObject->GetFileName()))
-    {
-        LoadedObjects::iterator it = m_lstLoadedObjects.find(pObject);
-        if (it != m_lstLoadedObjects.end())
-        {
-            m_lstLoadedObjects.erase(it);
-            m_nameToObjectMap.erase(pObject->GetFileName().MakeLower());
-        }
-        else
-        {
-            //Warning( "CObjManager::ReleaseObject called on object not loaded in ObjectManager %s",pObject->m_szFileName.c_str() );
-            //return false;
-        }
-
-        delete pObject;
-        return true;
-    }
-    else if (m_bLockCGFResources)
-    {
-        // Put them to locked stat obj list.
-        stl::push_back_unique(m_lockedObjects, pObject);
-    }
-
-    return false;
-}
-
-IStatObj* CObjManager::AllocateStatObj()
-{
-#ifdef POOL_STATOBJ_ALLOCS
-    return (IStatObj*)m_statObjPool->Allocate();
-#else
-    return (IStatObj*)malloc(sizeof(CStatObj));
-#endif
-}
-
-void CObjManager::FreeStatObj(IStatObj* pObj)
-{
-#ifdef POOL_STATOBJ_ALLOCS
-    m_statObjPool->Deallocate(pObj);
-#else
-    free(pObj);
-#endif
-}
-
-CObjManager::CObjManager()
-    : m_pDefaultCGF (NULL)
-    , m_decalsToPrecreate()
-    , m_bNeedProcessObjectsStreaming_Finish(false)
-    , m_CullThread()
-    , m_fGSMMaxDistance(0)
-    , m_bLockCGFResources(false)
-    , m_sunAnimIndex(0)
-    , m_sunAnimSpeed(0)
-    , m_sunAnimPhase(0)
-    , m_nNextPrecachePointId(0)
-    , m_bCameraPrecacheOverridden(false)
-    , m_fILMul(1.f)
-    , m_fSSAOAmount(1.f)
-    , m_fSSAOContrast(1.f)
-    , m_pRMBox(nullptr)
-    , m_bGarbageCollectionEnabled(true)
-{
-#ifdef POOL_STATOBJ_ALLOCS
-    m_statObjPool = new stl::PoolAllocator<sizeof(CStatObj), stl::PSyncMultiThread, alignof(CStatObj)>(stl::FHeap().PageSize(64)); // 20Kb per page
-#endif
-
-    m_vStreamPreCachePointDefs.Add(SObjManPrecachePoint());
-    m_vStreamPreCacheCameras.Add(SObjManPrecacheCamera());
-
-    m_pObjManager = this;
-
-    m_vSunColor.Set(0, 0, 0);
-    m_rainParams.nUpdateFrameID = -1;
-    m_rainParams.fAmount = 0.f;
-    m_rainParams.fRadius = 1.f;
-    m_rainParams.vWorldPos.Set(0, 0, 0);
-    m_rainParams.vColor.Set(1, 1, 1);
-    m_rainParams.fFakeGlossiness = 0.5f;
-    m_rainParams.fFakeReflectionAmount = 1.5f;
-    m_rainParams.fDiffuseDarkening = 0.5f;
-    m_rainParams.fRainDropsAmount = 0.5f;
-    m_rainParams.fRainDropsSpeed = 1.f;
-    m_rainParams.fRainDropsLighting = 1.f;
-    m_rainParams.fMistAmount = 3.f;
-    m_rainParams.fMistHeight = 8.f;
-    m_rainParams.fPuddlesAmount = 1.5f;
-    m_rainParams.fPuddlesMaskAmount = 1.0f;
-    m_rainParams.fPuddlesRippleAmount = 2.0f;
-    m_rainParams.fSplashesAmount = 1.3f;
-    m_rainParams.bIgnoreVisareas = false;
-    m_rainParams.bDisableOcclusion = false;
-
-
-#ifdef SUPP_HWOBJ_OCCL
-    if (GetRenderer()->GetFeatures() & RFT_OCCLUSIONTEST)
-    {
-        m_pShaderOcclusionQuery = GetRenderer()->EF_LoadShader("OcclusionTest");
-    }
-    else
-    {
-        m_pShaderOcclusionQuery = 0;
-    }
-#endif
-    
-    m_decalsToPrecreate.reserve(128);
-
-    // init queue for check occlusion
-    m_CheckOcclusionQueue.Init(GetCVars()->e_CheckOcclusionQueueSize);
-    m_CheckOcclusionOutputQueue.Init(GetCVars()->e_CheckOcclusionOutputQueueSize);
-
-    StatInstGroupEventBus::Handler::BusConnect();
-}
-
-// make unit box for occlusion test
-void CObjManager::MakeUnitCube()
-{
-    if (m_pRMBox)
-    {
-        return;
-    }
-
-    SVF_P3F_C4B_T2F arrVerts[8];
-    arrVerts[0].xyz = Vec3(0, 0, 0);
-    arrVerts[1].xyz = Vec3(1, 0, 0);
-    arrVerts[2].xyz = Vec3(0, 0, 1);
-    arrVerts[3].xyz = Vec3(1, 0, 1);
-    arrVerts[4].xyz = Vec3(0, 1, 0);
-    arrVerts[5].xyz = Vec3(1, 1, 0);
-    arrVerts[6].xyz = Vec3(0, 1, 1);
-    arrVerts[7].xyz = Vec3(1, 1, 1);
-
-    //      6-------7
-    //   /         /|
-    //  2-------3   |
-    //  |        |  |
-    //  |   4    | 5
-    //  |        |/
-    //  0-------1
-
-    static const vtx_idx arrIndices[] =
-    {
-        // front + back
-        1, 0, 2,
-        2, 3, 1,
-        5, 6, 4,
-        5, 7, 6,
-        // left + right
-        0, 6, 2,
-        0, 4, 6,
-        1, 3, 7,
-        1, 7, 5,
-        // top + bottom
-        3, 2, 6,
-        6, 7, 3,
-        1, 4, 0,
-        1, 5, 4
-    };
-
-    m_pRMBox = GetRenderer()->CreateRenderMeshInitialized(
-            arrVerts,
-            sizeof(arrVerts) / sizeof(arrVerts[0]),
-            eVF_P3F_C4B_T2F,
-            arrIndices,
-            sizeof(arrIndices) / sizeof(arrIndices[0]),
-            prtTriangleList,
-            "OcclusionQueryCube", "OcclusionQueryCube",
-            eRMT_Static);
-
-    m_pRMBox->SetChunk(NULL, 0, sizeof(arrVerts) / sizeof(arrVerts[0]), 0, sizeof(arrIndices) / sizeof(arrIndices[0]), 1.0f, eVF_P3F_C4B_T2F, 0);
-
-    m_bGarbageCollectionEnabled = true;
-}
-
-CObjManager::~CObjManager()
-{
-    StatInstGroupEventBus::Handler::BusDisconnect();
-
-    // free default object
-    m_pDefaultCGF = 0;
-
-    // free brushes
-    /*  assert(!m_lstBrushContainer.Count());
-        for(int i=0; i<m_lstBrushContainer.Count(); i++)
-        {
-        if(m_lstBrushContainer[i]->GetEntityStatObj())
-          ReleaseObject((CStatObj*)m_lstBrushContainer[i]->GetEntityStatObj());
-            delete m_lstBrushContainer[i];
-        }
-        m_lstBrushContainer.Reset();
-    */
-    UnloadObjects(true);
-#ifdef POOL_STATOBJ_ALLOCS
-    delete m_statObjPool;
-#endif
-}
-
-
-// mostly xy size
-float CObjManager::GetXYRadius(int type, int nSID)
-{
-    assert(nSID >= 0 && nSID < m_lstStaticTypes.Count());
-
-    if ((m_lstStaticTypes[nSID].Count() <= type || !m_lstStaticTypes[nSID][type].pStatObj))
-    {
-        return 0.0f;
-    }
-
-    Vec3 vSize = m_lstStaticTypes[nSID][type].pStatObj->GetBoxMax() - m_lstStaticTypes[nSID][type].pStatObj->GetBoxMin();
-    vSize.z *= 0.5f;
-
-    float fXYRadius = vSize.GetLength() * 0.5f;
-
-    return fXYRadius;
-}
-
-bool CObjManager::GetStaticObjectBBox(int nType, Vec3& vBoxMin, Vec3& vBoxMax, int nSID)
-{
-    assert(nSID >= 0 && nSID < m_lstStaticTypes.Count());
-
-    if ((m_lstStaticTypes[nSID].Count() <= nType || !m_lstStaticTypes[nSID][nType].pStatObj))
-    {
-        return false;
-    }
-
-    vBoxMin = m_lstStaticTypes[nSID][nType].pStatObj->GetBoxMin();
-    vBoxMax = m_lstStaticTypes[nSID][nType].pStatObj->GetBoxMax();
-
-    return true;
-}
-
-
-void CObjManager::AddDecalToRenderer(float fDistance,
-    _smart_ptr<IMaterial> pMat,
-    const uint8 sortPrio,
-    Vec3 right,
-    Vec3 up,
-    const UCol& ucResCol,
-    [[maybe_unused]] const uint8 uBlendType,
-    const Vec3& vAmbientColor,
-    Vec3 vPos,
-    const int nAfterWater,
-    const SRenderingPassInfo& passInfo,
-    const SRendItemSorter& rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // repeated objects are free imedeately in renderer
-    CRenderObject* pOb(GetIdentityCRenderObject(passInfo.ThreadID()));
-    if (!pOb)
-    {
-        return;
-    }
-
-    // prepare render object
-    pOb->m_fDistance = fDistance;
-    pOb->m_nTextureID = -1;
-    pOb->m_fAlpha = (float)ucResCol.bcolor[3] / 255.f;
-    pOb->m_II.m_AmbColor = vAmbientColor;
-    pOb->m_fSort = 0;
-    pOb->m_ObjFlags |= FOB_DECAL;
-    pOb->m_nSort = sortPrio;
-
-    SVF_P3F_C4B_T2F pVerts[4];
-    uint16 pIndices[6];
-
-    // TODO: determine whether this is a decal on opaque or transparent geometry
-    // (put it in the respective renderlist for correct shadowing)
-    // fill general vertex data
-    pVerts[0].xyz = (-right - up) + vPos;
-    pVerts[0].st = Vec2(0, 1);
-    pVerts[0].color.dcolor = ~0;
-
-    pVerts[1].xyz = (right - up) + vPos;
-    pVerts[1].st = Vec2(1, 1);
-    pVerts[1].color.dcolor = ~0;
-
-    pVerts[2].xyz = (right + up) + vPos;
-    pVerts[2].st = Vec2(1, 0);
-    pVerts[2].color.dcolor = ~0;
-
-    pVerts[3].xyz = (-right + up) + vPos;
-    pVerts[3].st = Vec2(0, 0);
-    pVerts[3].color.dcolor = ~0;
-
-    // prepare tangent space (tangent, bitangent) and fill it in
-    Vec3 rightUnit(right.GetNormalized());
-    Vec3 upUnit(up.GetNormalized());
-
-    SPipTangents pTangents[4];
-
-    pTangents[0] = SPipTangents(rightUnit, -upUnit, -1);
-    pTangents[1] = pTangents[0];
-    pTangents[2] = pTangents[0];
-    pTangents[3] = pTangents[0];
-
-    // fill decals topology (two triangles)
-    pIndices[0] = 0;
-    pIndices[1] = 1;
-    pIndices[2] = 2;
-
-    pIndices[3] = 0;
-    pIndices[4] = 2;
-    pIndices[5] = 3;
-
-    GetRenderer()->EF_AddPolygonToScene(pMat->GetShaderItem(), 4, pVerts, pTangents, pOb, passInfo, pIndices, 6, nAfterWater, rendItemSorter);
-}
-
-
-void CObjManager::GetMemoryUsage(class ICrySizer* pSizer) const
-{
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Self");
-        pSizer->AddObject(this, sizeof(*this));
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "StaticTypes");
-        pSizer->AddObject(m_lstStaticTypes);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "CMesh");
-        CIndexedMesh* pMesh = CIndexedMesh::get_intrusive_list_root();
-        while (pMesh)
-        {
-            pSizer->AddObject(pMesh);
-            pMesh = pMesh->m_next_intrusive;
-        }
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "StatObj");
-        for (CStatObj* pStatObj = CStatObj::get_intrusive_list_root(); pStatObj; pStatObj = pStatObj->m_next_intrusive)
-        {
-            pStatObj->GetMemoryUsage(pSizer);
-        }
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "EmptyNodes");
-        pSizer->AddObject(COctreeNode::m_arrEmptyNodes);
-    }
-}
-
-// retrieves the bandwidth calculations for the audio streaming
-void CObjManager::GetBandwidthStats([[maybe_unused]] float* fBandwidthRequested)
-{
-#if !defined (_RELEASE)
-    if (fBandwidthRequested && CStatObj::s_fStreamingTime != 0.0f)
-    {
-        *fBandwidthRequested = (CStatObj::s_nBandwidth / CStatObj::s_fStreamingTime) / 1024.0f;
-    }
-#endif
-}
-
-void CObjManager::ReregisterEntitiesInArea(Vec3 vBoxMin, Vec3 vBoxMax)
-{
-    PodArray<SRNInfo> lstEntitiesInArea;
-
-    AABB vBoxAABB(vBoxMin, vBoxMax);
-
-    Get3DEngine()->MoveObjectsIntoListGlobal(&lstEntitiesInArea, &vBoxAABB, true);
-
-    if (GetVisAreaManager())
-    {
-        GetVisAreaManager()->MoveObjectsIntoList(&lstEntitiesInArea, vBoxAABB, true);
-    }
-
-    int nChanged = 0;
-    for (int i = 0; i < lstEntitiesInArea.Count(); i++)
-    {
-        IVisArea* pPrevArea = lstEntitiesInArea[i].pNode->GetEntityVisArea();
-        Get3DEngine()->UnRegisterEntityDirect(lstEntitiesInArea[i].pNode);
-
-        if (lstEntitiesInArea[i].pNode->GetRenderNodeType() == eERType_Decal)
-        {
-            ((CDecalRenderNode*)lstEntitiesInArea[i].pNode)->RequestUpdate();
-        }
-
-        Get3DEngine()->RegisterEntity(lstEntitiesInArea[i].pNode);
-        if (pPrevArea != lstEntitiesInArea[i].pNode->GetEntityVisArea())
-        {
-            nChanged++;
-        }
-    }
-}
-
-
-void CObjManager::FreeNotUsedCGFs()
-{
-    AZStd::vector<CStatObj*> garbageList;
-
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> loadLock(m_loadMutex);
-
-        m_lockedObjects.clear();
-
-        if (!m_bLockCGFResources)
-        {
-            //Timur, You MUST use next here, or with erase you invalidating
-            LoadedObjects::iterator next;
-            for (LoadedObjects::iterator it = m_lstLoadedObjects.begin(); it != m_lstLoadedObjects.end(); it = next)
-            {
-                next = it;
-                ++next;
-                CStatObj* p = (CStatObj*)(*it);
-                if (p->m_nUsers <= 0)
-                {
-                    // Add to the list and run CheckForGarbage afterwards so we don't have to hold two locks at once
-                    garbageList.push_back(p);
-                }
-            }
-        }
-    }
-
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_garbageMutex);
-        for (auto* object : garbageList)
-        {
-            CheckForGarbage(object);
-        }
-    }
-
-    ClearStatObjGarbage();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::GetLoadedStatObjArray(IStatObj** pObjectsArray, int& nCount)
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> loadLock(m_loadMutex);
-
-    if (!pObjectsArray)
-    {
-        nCount = m_lstLoadedObjects.size();
-        return;
-    }
-
-    CObjManager::LoadedObjects::iterator it = m_lstLoadedObjects.begin();
-    for (int i = 0; i < nCount && it != m_lstLoadedObjects.end(); i++, it++)
-    {
-        pObjectsArray[i] = *it;
-    }
-}
-
-void StatInstGroup::Update([[maybe_unused]] CVars* pCVars, [[maybe_unused]] int nGeomDetailScreenRes)
-{
-    m_dwRndFlags = 0;
-
-    static ICVar* pObjShadowCastSpec = gEnv->pConsole->GetCVar("e_ObjShadowCastSpec");
-    if (nCastShadowMinSpec <= pObjShadowCastSpec->GetIVal())
-    {
-        m_dwRndFlags |= ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS;
-    }
-
-    if (bDynamicDistanceShadows)
-    {
-        m_dwRndFlags |= ERF_DYNAMIC_DISTANCESHADOWS;
-    }
-    if (bHideability)
-    {
-        m_dwRndFlags |= ERF_HIDABLE;
-    }
-    if (bHideabilitySecondary)
-    {
-        m_dwRndFlags |= ERF_HIDABLE_SECONDARY;
-    }
-    if (!bAllowIndoor)
-    {
-        m_dwRndFlags |= ERF_OUTDOORONLY;
-    }
-
-    uint32 nSpec = (uint32)minConfigSpec;
-    if (nSpec != 0)
-    {
-        m_dwRndFlags &= ~ERF_SPEC_BITS_MASK;
-        m_dwRndFlags |= (nSpec << ERF_SPEC_BITS_SHIFT) & ERF_SPEC_BITS_MASK;
-    }
-
-    if (GetStatObj())
-    {
-        fVegRadiusVert = GetStatObj()->GetRadiusVert();
-        fVegRadiusHor = GetStatObj()->GetRadiusHors();
-        fVegRadius = max(fVegRadiusVert, fVegRadiusHor);
-    }
-    else
-    {
-        fVegRadiusHor = fVegRadius = fVegRadiusVert = 0;
-    }
-
-#if defined(FEATURE_SVO_GI)
-    _smart_ptr<IMaterial> pMat = pMaterial ? pMaterial : (pStatObj ? pStatObj->GetMaterial() : 0);
-    if (pMat && (gEnv->pConsole->GetCVar("e_svoTI_Active") && 
-        gEnv->pConsole->GetCVar("e_svoTI_Active")->GetIVal() && 
-        gEnv->pConsole->GetCVar("e_GI")->GetIVal()))
-    {
-        pMat->SetKeepLowResSysCopyForDiffTex();
-    }
-#endif
-}
-
-bool CObjManager::SphereRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const float fRadius, _smart_ptr<IMaterial> pMat)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // get position offset and stride
-    int nPosStride = 0;
-    byte* pPos  = pRenderMesh->GetPosPtr(nPosStride, FSL_READ);
-
-    // get indices
-    vtx_idx* pInds = pRenderMesh->GetIndexPtr(FSL_READ);
-    assert(pRenderMesh->GetIndicesCount() % 3 == 0);
-
-    // test tris
-    TRenderChunkArray& Chunks = pRenderMesh->GetChunks();
-    for (int nChunkId = 0; nChunkId < Chunks.size(); nChunkId++)
-    {
-        CRenderChunk* pChunk = &Chunks[nChunkId];
-        if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-        {
-            continue;
-        }
-
-        // skip transparent and alpha test
-        if (pMat)
-        {
-            const SShaderItem& shaderItem = pMat->GetShaderItem(pChunk->m_nMatID);
-            if (!shaderItem.m_pShader || shaderItem.m_pShader->GetFlags() & EF_NODRAW)
-            {
-                continue;
-            }
-        }
-
-        int nLastIndexId = pChunk->nFirstIndexId + pChunk->nNumIndices;
-        for (int i = pChunk->nFirstIndexId; i < nLastIndexId; i += 3)
-        {
-            assert((int)pInds[i + 0] < pRenderMesh->GetVerticesCount());
-            assert((int)pInds[i + 1] < pRenderMesh->GetVerticesCount());
-            assert((int)pInds[i + 2] < pRenderMesh->GetVerticesCount());
-
-            // get triangle vertices
-            Vec3 v0 = (*(Vec3*)&pPos[nPosStride * pInds[i + 0]]);
-            Vec3 v1 = (*(Vec3*)&pPos[nPosStride * pInds[i + 1]]);
-            Vec3 v2 = (*(Vec3*)&pPos[nPosStride * pInds[i + 2]]);
-
-            AABB triBox;
-            triBox.min = v0;
-            triBox.max = v0;
-            triBox.Add(v1);
-            triBox.Add(v2);
-
-            if (Overlap::Sphere_AABB(Sphere(vInPos, fRadius), triBox))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::ClearStatObjGarbage()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // No work? Exit early before attempting to take any locks
-    if (m_checkForGarbage.empty())
-    {
-        return;
-    }
-
-    // We have to take the load lock here because InternalDeleteObject needs this lock and loadMutex has to be locked before garbageMutex
-    // Additionally, we need to hold one of these locks for the entire duration of this function to prevent the loading thread from using an object that is about to be deleted
-    // To avoid stalls due to the threads loading files, try to get the lock and if it fails simply try again next frame unless there are too many garbage objects.
-    AZStd::unique_lock<AZStd::recursive_mutex> loadLock(m_loadMutex, AZStd::try_to_lock_t());
-    if (!loadLock.owns_lock())
-    {
-        if (m_checkForGarbage.size() > s_maxPendingGarbageObjects)
-        {
-            AZ_PROFILE_SCOPE_STALL(AZ::Debug::ProfileCategory::ThreeDEngine, "StatObjGarbage overflow");
-            // There are too many objects pending garbage collection so force a clear this frame even if loading is happening.
-            loadLock.lock();
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    AZStd::vector<IStatObj*> garbage;
-
-    // We might need to perform the entire garbage collection logic more than once because the call to
-    // pStatObj->Shutdown() has the potential to add separate LOD models back onto the m_checkForGarbage list.
-    // If we only run the logic once, we might exit the ClearStatObjGarbage() function with garbage that hasn't been
-    // fully cleared.
-    while (!m_checkForGarbage.empty())
-    {
-        {
-            AZStd::unique_lock<AZStd::recursive_mutex> garbageLock(m_garbageMutex);
-
-            // Make sure all stat objects inside this array are unique.
-            // Only check explicitly added objects.
-            IStatObj* pStatObj;
-
-            while (!m_checkForGarbage.empty())
-            {
-                pStatObj = m_checkForGarbage.back();
-                m_checkForGarbage.pop_back();
-
-                if (pStatObj->CheckGarbage())
-                {
-                    // Check if it must be released.
-                    int nChildRefs = pStatObj->CountChildReferences();
-
-                    if (pStatObj->GetUserCount() <= 0 && nChildRefs <= 0)
-                    {
-                        garbage.push_back(pStatObj);
-                    }
-                    else
-                    {
-                        pStatObj->SetCheckGarbage(false);
-                    }
-                }
-            }
-        }
-
-        // First ShutDown object clearing all pointers.
-        for (int i = 0, num = (int)garbage.size(); i < num; i++)
-        {
-            IStatObj* pStatObj = garbage[i];
-
-            if (!m_bLockCGFResources && !IsResourceLocked(pStatObj->GetFileName()))
-            {
-                // only shutdown object if it can be deleted by InternalDeleteObject()
-                pStatObj->ShutDown();
-            }
-        }
-
-        // Then delete all garbage objects.
-        for (int i = 0, num = (int)garbage.size(); i < num; i++)
-        {
-            IStatObj* pStatObj = garbage[i];
-            InternalDeleteObject(pStatObj);
-        }
-
-        garbage.clear();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IRenderMesh* CObjManager::GetRenderMeshBox()
-{
-    if (!m_pRMBox)
-    {
-        MakeUnitCube();
-    }
-    return m_pRMBox;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::CheckForGarbage(IStatObj* pObject)
-{
-    if (m_bGarbageCollectionEnabled &&
-        !pObject->CheckGarbage())
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_garbageMutex);
-
-        pObject->SetCheckGarbage(true);
-        m_checkForGarbage.push_back(pObject);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::UnregisterForGarbage(IStatObj* pObject)
-{
-    CRY_ASSERT(pObject);
-
-    if (m_bGarbageCollectionEnabled &&
-        pObject->CheckGarbage())
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_garbageMutex);
-
-        if (!m_checkForGarbage.empty())
-        {
-            auto iterator = std::find(m_checkForGarbage.begin(), m_checkForGarbage.end(), pObject);
-
-            if (iterator != m_checkForGarbage.end())
-            {
-                m_checkForGarbage.erase(iterator);
-            }
-        }
-
-        pObject->SetCheckGarbage(false);
-    }
-}
-
-void CObjManager::MakeDepthCubemapRenderItemList(CVisArea* pReceiverArea, const AABB& cubemapAABB, [[maybe_unused]] int renderNodeFlags, PodArray<struct IShadowCaster*>* objectsList, const SRenderingPassInfo& passInfo)
-{
-    if (pReceiverArea)
-    {
-        if (pReceiverArea->m_pObjectsTree)
-        {
-            pReceiverArea->m_pObjectsTree->FillDepthCubemapRenderList(cubemapAABB, passInfo, objectsList);
-        }
-    }
-    else
-    {
-        if (Get3DEngine()->IsObjectTreeReady())
-        {
-            Get3DEngine()->GetObjectTree()->FillDepthCubemapRenderList(cubemapAABB, passInfo, objectsList);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// StatInstGroupEventBus
-//////////////////////////////////////////////////////////////////////////
-StatInstGroupId CObjManager::GenerateStatInstGroupId()
-{
-    // generate new id
-    StatInstGroupId id = StatInstGroupEvents::s_InvalidStatInstGroupId;
-    for (StatInstGroupId i = 0; i < std::numeric_limits<StatInstGroupId>::max(); ++i)
-    {
-        if (m_usedIds.find(i) == m_usedIds.end())
-        {
-            id = i;
-            break;
-        }
-    }
-
-    if (id == StatInstGroupEvents::s_InvalidStatInstGroupId)
-    {
-        return id;
-    }
-
-    // Mark id as used
-    m_usedIds.insert(id);
-    return id;
-}
-
-void CObjManager::ReleaseStatInstGroupId(StatInstGroupId statInstGroupId)
-{
-    // Free id for this object
-    m_usedIds.erase(statInstGroupId);
-}
-
-void CObjManager::ReleaseStatInstGroupIdSet(const AZStd::unordered_set<StatInstGroupId>& statInstGroupIdSet)
-{
-    for (auto groupId : statInstGroupIdSet)
-    {
-        m_usedIds.erase(groupId);
-    }
-}
-
-void CObjManager::ReserveStatInstGroupIdRange(StatInstGroupId from, StatInstGroupId to)
-{
-    for (StatInstGroupId id = from; id < to; ++id)
-    {
-        m_usedIds.insert(id);
-    }
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/ObjMan.h b/Code/CryEngine/Cry3DEngine/ObjMan.h
deleted file mode 100644
index cd888b9932..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjMan.h
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_OBJMAN_H
-#define CRYINCLUDE_CRY3DENGINE_OBJMAN_H
-#pragma once
-
-
-#include <AzCore/std/parallel/mutex.h>
-#include <AzCore/std/parallel/lock.h>
-
-#include "StatObj.h"
-#include "../RenderDll/Common/Shadow_Renderer.h"
-
-#include "StlUtils.h"
-#include "cbuffer.h"
-#include "CZBufferCuller.h"
-#include "PoolAllocator.h"
-#include "CCullThread.h"
-#include <StatObjBus.h>
-#include <IObjManager.h>
-
-#include <map>
-#include <vector>
-
-#define ENTITY_MAX_DIST_FACTOR 100
-#define MAX_VALID_OBJECT_VOLUME (10000000000.f)
-#define DEFAULT_CGF_NAME ("engineassets/objects/default.cgf")
-
-struct IStatObj;
-struct IIndoorBase;
-struct IRenderNode;
-struct ISystem;
-struct IDecalRenderNode;
-struct SCheckOcclusionJobData;
-struct SCheckOcclusionOutput;
-struct CVisArea;
-
-class CVegetation;
-
-class C3DEngine;
-struct IMaterial;
-
-#define SMC_EXTEND_FRUSTUM 8
-#define SMC_SHADOW_FRUSTUM_TEST 16
-
-#define OCCL_TEST_HEIGHT_MAP    1
-#define OCCL_TEST_CBUFFER           2
-#define OCCL_TEST_INDOOR_OCCLUDERS_ONLY     4
-#define POOL_STATOBJ_ALLOCS
-
-//! contains stat obj instance group properties (vegetation object properties)
-struct StatInstGroup
-    : public IStatInstGroup
-{
-    StatInstGroup()
-    {
-        pStatObj = nullptr;
-    }
-
-    void Update(struct CVars* pCVars, int nGeomDetailScreenRes);
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-};
-
-struct SExportedBrushMaterial
-{
-    int size;
-    char material[64];
-};
-
-struct SRenderMeshInfoOutput
-{
-    SRenderMeshInfoOutput() { memset(this, 0, sizeof(*this)); }
-    _smart_ptr<IRenderMesh> pMesh;
-    _smart_ptr<IMaterial> pMat;
-};
-
-struct SObjManRenderDebugInfo
-{
-    SObjManRenderDebugInfo(IRenderNode* _pEnt, float _fEntDistance)
-        : pEnt(_pEnt)
-        , fEntDistance(_fEntDistance) {}
-
-    IRenderNode* pEnt;
-    float fEntDistance;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CObjManager
-    : public Cry3DEngineBase
-    , public IObjManager
-    , private StatInstGroupEventBus::Handler
-{
-public:
-    enum
-    {
-        MaxPrecachePoints = 4,
-    };
-    //! The maximum number of objects pending garbage collection before cleanup is forced
-    //! in the current frame instead of delayed until loading has completed.
-    //! This helps reduce spikes when cleaning up render objects.
-    static const size_t s_maxPendingGarbageObjects = 250;
-
-public:
-    CObjManager();
-    virtual ~CObjManager();
-
-    void PreloadLevelObjects();
-    void UnloadObjects(bool bDeleteAll);
-
-    void CheckTextureReadyFlag();
-
-    IStatObj* AllocateStatObj();
-    void FreeStatObj(IStatObj* pObj);
-    virtual _smart_ptr<IStatObj> GetDefaultCGF() { return m_pDefaultCGF; }
-
-    virtual SRainParams& GetRainParams() override { return m_rainParams; }
-    virtual SSnowParams& GetSnowParams() override { return m_snowParams;  }
-
-    template <class T>
-    static int GetItemId(std::vector<T*>* pArray, T* pItem, [[maybe_unused]] bool bAssertIfNotFound = true)
-    {
-        for (uint32 i = 0, end = pArray->size(); i < end; ++i)
-        {
-            if ((*pArray)[i] == pItem)
-            {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    template <class T>
-    static T* GetItemPtr(std::vector<T*>* pArray, int nId)
-    {
-        if (nId < 0)
-        {
-            return NULL;
-        }
-
-        assert(nId < (int)pArray->size());
-
-        if (nId < (int)pArray->size())
-        {
-            return (*pArray)[nId];
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-
-
-    template <class T>
-    static int GetItemId(std::vector<_smart_ptr<T> >* pArray, _smart_ptr<T> pItem, [[maybe_unused]] bool bAssertIfNotFound = true)
-    {
-        for (uint32 i = 0, end = pArray->size(); i < end; ++i)
-        {
-            if ((*pArray)[i] == pItem)
-            {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    template <class T>
-    static _smart_ptr<T> GetItemPtr(std::vector<_smart_ptr<T> >* pArray, int nId)
-    {
-        if (nId < 0)
-        {
-            return NULL;
-        }
-
-        assert(nId < (int)pArray->size());
-
-        if (nId < (int)pArray->size())
-        {
-            return (*pArray)[nId];
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-
-    //! Loads a static object from a CGF file.  Does not increment the static object's reference counter.  The reference returned is not guaranteed to be valid unless run on the same thread running the garbage collection.  Best used for priming the cache
-    virtual IStatObj* LoadStatObjUnsafeManualRef(const char* szFileName, const char* szGeomName = NULL, IStatObj::SSubObject** ppSubObject = NULL, bool bUseStreaming = true, unsigned long nLoadingFlags = 0, const void* m_pData = 0, int m_nDataSize = 0, const char* szBlockName = NULL) override;
-
-    //! Loads a static object from a CGF file.  Increments the static object's reference counter.  This method is threadsafe.  Not suitable for preloading
-    _smart_ptr<IStatObj> LoadStatObjAutoRef(const char* szFileName, const char* szGeomName = NULL, IStatObj::SSubObject** ppSubObject = NULL, bool bUseStreaming = true, unsigned long nLoadingFlags = 0, const void* m_pData = 0, int m_nDataSize = 0, const char* szBlockName = NULL);
-
-private:
-
-    template<typename T>
-    T LoadStatObjInternal(const char* filename, const char* _szGeomName, IStatObj::SSubObject** ppSubObject, bool bUseStreaming, unsigned long nLoadingFlags, const void* pData, int nDataSize, const char* szBlockName);
-
-    template <size_t SIZE_IN_CHARS>
-    void NormalizeLevelName(const char* filename, char(&normalizedFilename)[SIZE_IN_CHARS]);
-
-    void LoadDefaultCGF(const char* filename, unsigned long nLoadingFlags);
-    virtual IStatObj* LoadNewCGF(IStatObj* pObject, int flagCloth, bool bUseStreaming, bool bForceBreakable, unsigned long nLoadingFlags, const char* normalizedFilename, const void* pData, int nDataSize, const char* originalFilename, const char* geomName, IStatObj::SSubObject** ppSubObject) override;
-
-    virtual IStatObj* LoadFromCacheNoRef(IStatObj* pObject, bool bUseStreaming, unsigned long nLoadingFlags, const char* geomName, IStatObj::SSubObject** ppSubObject) override;
-
-    PodArray<PodArray<StatInstGroup> > m_lstStaticTypes;
-
-public:
-
-    void GetLoadedStatObjArray(IStatObj** pObjectsArray, int& nCount);
-
-    // Deletes object.
-    // Only should be called by Release function of IStatObj.
-    virtual bool InternalDeleteObject(IStatObj* pObject) override;
-
-    PodArray<PodArray<StatInstGroup> >& GetListStaticTypes() { return m_lstStaticTypes; }
-    int GetListStaticTypesCount() override { return m_lstStaticTypes.Count(); }
-    int GetListStaticTypesGroupCount(int typeId) override { return m_lstStaticTypes[typeId].Count(); }
-    IStatInstGroup* GetIStatInstGroup(int typeId, int groupId) override { return &m_lstStaticTypes[typeId][groupId]; }
-
-    void MakeShadowCastersList(CVisArea* pReceiverArea, const AABB& aabbReceiver,
-        int dwAllowedTypes, int32 nRenderNodeFlags, Vec3 vLightPos, CDLight* pLight, ShadowMapFrustum* pFr, PodArray<struct SPlaneObject>* pShadowHull, const SRenderingPassInfo& passInfo);
-
-    int MakeStaticShadowCastersList(IRenderNode* pIgnoreNode, ShadowMapFrustum* pFrustum, int renderNodeExcludeFlags, int nMaxNodes, const SRenderingPassInfo& passInfo);
-
-    void MakeDepthCubemapRenderItemList(CVisArea* pReceiverArea, const AABB& cubemapAABB, int renderNodeFlags, PodArray<struct IShadowCaster*>* objectsList, const SRenderingPassInfo& passInfo);
-
-    // decal pre-caching
-    DecalsToPrecreate m_decalsToPrecreate;
-
-    void PrecacheStatObjMaterial(_smart_ptr<IMaterial> pMaterial, const float fEntDistance, IStatObj* pStatObj, bool bFullUpdate, bool bDrawNear);
-    virtual DecalsToPrecreate& GetDecalsToPrecreate() override { return m_decalsToPrecreate; }
-
-    void PrecacheStatObj(IStatObj* pStatObj, int nLod, const Matrix34A& statObjMatrix, _smart_ptr<IMaterial> pMaterial, float fImportance, float fEntDistance, bool bFullUpdate, bool bHighPriority);
-
-    virtual PodArray<SStreamAbleObject>& GetArrStreamableObjects() override { return m_arrStreamableObjects; }
-    virtual PodArray<SObjManPrecacheCamera>& GetStreamPreCacheCameras() override { return m_vStreamPreCacheCameras; }
-
-    virtual Vec3 GetSunColor() override { return m_vSunColor; }
-    virtual void SetSunColor(const Vec3& color) override { m_vSunColor = color; }
-
-    Vec3 GetSunAnimColor() override { return m_sunAnimColor; }
-    void SetSunAnimColor(const Vec3& color) override { m_sunAnimColor = color; }
-
-    float GetSunAnimSpeed() override { return m_sunAnimSpeed; }
-    void SetSunAnimSpeed(float sunAnimSpeed) override { m_sunAnimSpeed = sunAnimSpeed; }
-
-    AZ::u8 GetSunAnimPhase() override { return m_sunAnimPhase; }
-    void SetSunAnimPhase(AZ::u8 sunAnimPhase) override { m_sunAnimPhase = sunAnimPhase; }
-
-    AZ::u8 GetSunAnimIndex() override { return m_sunAnimIndex; }
-    void SetSunAnimIndex(AZ::u8 sunAnimIndex) override { m_sunAnimIndex = sunAnimIndex; }
-
-    virtual float GetSSAOAmount() override { return m_fSSAOAmount;  }
-    virtual void SetSSAOAmount(float amount) override { m_fSSAOAmount = amount; }
-
-    virtual float GetSSAOContrast() override { return m_fSSAOContrast; }
-    virtual void SetSSAOContrast(float amount) override { m_fSSAOContrast = amount; }
-
-    virtual bool IsCameraPrecacheOverridden() override { return m_bCameraPrecacheOverridden; }
-    virtual void SetCameraPrecacheOverridden(bool state) override { m_bCameraPrecacheOverridden = state; }
-
-    virtual ObjectsMap& GetNameToObjectMap() override { return m_nameToObjectMap; }
-    virtual LoadedObjects& GetLoadedObjects() override { return m_lstLoadedObjects; }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    ObjectsMap m_nameToObjectMap;
-    LoadedObjects m_lstLoadedObjects;
-
-    /// Thread-safety for async requests to CreateInstance.
-    // Always take this lock before m_garbageMutex if taking both
-    AZStd::recursive_mutex m_loadMutex;
-
-public:
-    int GetLoadedObjectCount() { return m_lstLoadedObjects.size(); }
-
-    uint16 CheckCachedNearestCubeProbe(IRenderNode* pEnt)
-    {
-        if (pEnt->m_pRNTmpData)
-        {
-            CRNTmpData::SRNUserData& pUserDataRN = pEnt->m_pRNTmpData->userData;
-
-            const uint16 nCacheClearThreshold = 32;
-            ++pUserDataRN.nCubeMapIdCacheClearCounter;
-            pUserDataRN.nCubeMapIdCacheClearCounter &= (nCacheClearThreshold - 1);
-
-            if (pUserDataRN.nCubeMapId && pUserDataRN.nCubeMapIdCacheClearCounter)
-            {
-                return pUserDataRN.nCubeMapId;
-            }
-        }
-
-        // cache miss
-        return 0;
-    }
-
-    int16 GetNearestCubeProbe(IVisArea* pVisArea, const AABB& objBox, bool bSpecular = true);
-
-    void RenderObject(IRenderNode* o,
-        const AABB& objBox,
-        float fEntDistance,
-        EERType eERType,
-        const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-
-    void RenderDecalAndRoad(IRenderNode* pEnt,
-        const AABB& objBox, float fEntDistance,
-        bool nCheckOcclusion, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-
-    void RenderObjectDebugInfo(IRenderNode* pEnt, float fEntDistance, const SRenderingPassInfo& passInfo);
-    void RenderAllObjectDebugInfo();
-    void RenderObjectDebugInfo_Impl(IRenderNode* pEnt, float fEntDistance);
-    void RemoveFromRenderAllObjectDebugInfo(IRenderNode* pEnt);
-
-    float GetXYRadius(int nType, int nSID = GetDefSID());
-    bool GetStaticObjectBBox(int nType, Vec3& vBoxMin, Vec3& vBoxMax, int nSID = GetDefSID());
-
-    IStatObj* GetStaticObjectByTypeID(int nTypeID, int nSID = GetDefSID());
-    IStatObj* FindStaticObjectByFilename(const char* filename);
-
-    //float GetBendingRandomFactor() override;
-    int GetUpdateStreamingPrioriryRoundIdFast() override { return m_nUpdateStreamingPrioriryRoundIdFast; }
-    int GetUpdateStreamingPrioriryRoundId() override { return m_nUpdateStreamingPrioriryRoundId; };
-    virtual void IncrementUpdateStreamingPrioriryRoundIdFast(int amount) override { m_nUpdateStreamingPrioriryRoundIdFast += amount; }
-    virtual void IncrementUpdateStreamingPrioriryRoundId(int amount) override { m_nUpdateStreamingPrioriryRoundId += amount; }
-
-    virtual void SetLockCGFResources(bool value) override { m_bLockCGFResources = value; }
-    virtual bool IsLockCGFResources() override { return m_bLockCGFResources != 0; }
-
-
-    bool IsBoxOccluded(const AABB& objBox,
-        float fDistance,
-        OcclusionTestClient* const __restrict pOcclTestVars,
-        bool bIndoorOccludersOnly,
-        EOcclusionObjectType eOcclusionObjectType,
-        const SRenderingPassInfo& passInfo);
-
-    void AddDecalToRenderer(float fDistance,
-        _smart_ptr<IMaterial> pMat,
-        const uint8 sortPrio,
-        Vec3 right,
-        Vec3 up,
-        const UCol& ucResCol,
-        const uint8 uBlendType,
-        const Vec3& vAmbientColor,
-        Vec3 vPos,
-        const int nAfterWater,
-        const SRenderingPassInfo& passInfo,
-        const SRendItemSorter& rendItemSorter);
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void RegisterForStreaming(IStreamable* pObj);
-    void UnregisterForStreaming(IStreamable* pObj);
-    void UpdateRenderNodeStreamingPriority(IRenderNode* pObj, float fEntDistance, float fImportanceFactor, bool bFullUpdate, const SRenderingPassInfo& passInfo, bool bHighPriority = false);
-
-    void GetMemoryUsage(class ICrySizer* pSizer) const;
-    void GetBandwidthStats(float* fBandwidthRequested);
-
-    void ReregisterEntitiesInArea(Vec3 vBoxMin, Vec3 vBoxMax);
-    void UpdateObjectsStreamingPriority(bool bSyncLoad, const SRenderingPassInfo& passInfo);
-    void ProcessObjectsStreaming(const SRenderingPassInfo& passInfo);
-
-    // implementation parts of ProcessObjectsStreaming
-    void ProcessObjectsStreaming_Impl(bool bSyncLoad, const SRenderingPassInfo& passInfo);
-    void ProcessObjectsStreaming_Sort(bool bSyncLoad, const SRenderingPassInfo& passInfo);
-    void ProcessObjectsStreaming_Release();
-    void ProcessObjectsStreaming_InitLoad(bool bSyncLoad);
-    void ProcessObjectsStreaming_Finish();
-
-#ifdef OBJMAN_STREAM_STATS
-    void ProcessObjectsStreaming_Stats(const SRenderingPassInfo& passInfo);
-#endif
-
-    // time counters
-
-    virtual bool IsAfterWater(const Vec3& vPos, const SRenderingPassInfo& passInfo) override;
-
-    void GetObjectsStreamingStatus(I3DEngine::SObjectsStreamingStatus& outStatus);
-
-    void FreeNotUsedCGFs();
-
-    void MakeUnitCube();
-
-    //////////////////////////////////////////////////////////////////////////
-    // CheckOcclusion functionality
-    bool CheckOcclusion_TestAABB(const AABB& rAABB, float fEntDistance) override;
-    bool CheckOcclusion_TestQuad(const Vec3& vCenter, const Vec3& vAxisX, const Vec3& vAxisY) override;
-
-    void PushIntoCullQueue(const SCheckOcclusionJobData& rCheckOcclusionData) override;
-    void PopFromCullQueue(SCheckOcclusionJobData* pCheckOcclusionData);
-
-    void PushIntoCullOutputQueue(const SCheckOcclusionOutput& rCheckOcclusionOutput) override;
-    bool PopFromCullOutputQueue(SCheckOcclusionOutput* pCheckOcclusionOutput) override;
-
-    void BeginCulling() override;
-    void RemoveCullJobProducer() override;
-    void AddCullJobProducer() override;
-    virtual NAsyncCull::CCullThread& GetCullThread() override { return m_CullThread;  };
-
-#ifndef _RELEASE
-    void CoverageBufferDebugDraw() override;
-#endif
-
-    bool LoadOcclusionMesh(const char* pFileName) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Garbage collection for parent stat objects.
-    // Returns number of deleted objects
-    void ClearStatObjGarbage();
-    void CheckForGarbage(IStatObj* pObject);
-    void UnregisterForGarbage(IStatObj* pObject);
-
-    int GetObjectLOD(const IRenderNode* pObj, float fDistance);
-    bool RayStatObjIntersection(IStatObj* pStatObj, const Matrix34& objMat, _smart_ptr<IMaterial> pMat,
-        Vec3 vStart, Vec3 vEnd, Vec3& vClosestHitPoint, float& fClosestHitDistance, bool bFastTest);
-    bool RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal, bool bFastTest, _smart_ptr<IMaterial> pMat);
-    bool SphereRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const float fRadius, _smart_ptr<IMaterial> pMat);
-    PodArray<CVisArea*> m_tmpAreas0, m_tmpAreas1;
-
-    uint8 GetDissolveRef(float fDist, float fMaxViewDist);
-    float GetLodDistDissolveRef(SLodDistDissolveTransitionState* pState, float curDist, int nNewLod, const SRenderingPassInfo& passInfo);
-
-    virtual PodArray<COctreeNode*>& GetArrStreamingNodeStack() override { return m_arrStreamingNodeStack; }
-    virtual PodArray<SObjManPrecachePoint>& GetStreamPreCachePointDefs() override { return m_vStreamPreCachePointDefs; }
-
-    void CleanStreamingData();
-    IRenderMesh* GetRenderMeshBox();
-
-    void PrepareCullbufferAsync(const CCamera& rCamera);
-    void BeginOcclusionCulling(const SRenderingPassInfo& passInfo);
-    void EndOcclusionCulling(bool waitForOcclusionJobCompletion = false);
-    void RenderBufferedRenderMeshes(const SRenderingPassInfo& passInfo);
-
-    virtual float GetGSMMaxDistance() const override { return m_fGSMMaxDistance; }
-    virtual void SetGSMMaxDistance(float value) override { m_fGSMMaxDistance = value; }
-
-    virtual int IncrementNextPrecachePointId() override { return m_nNextPrecachePointId++; }
-private:
-    std::vector<std::pair<_smart_ptr<IMaterial>, float> > m_collectedMaterials;
-
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Public Member variables (need to be cleaned).
-    //////////////////////////////////////////////////////////////////////////
-
-    static int m_nUpdateStreamingPrioriryRoundId;
-    static int m_nUpdateStreamingPrioriryRoundIdFast;
-    static int s_nLastStreamingMemoryUsage;                 //For streaming tools in editor
-
-    Vec3    m_vSunColor;    //Similar to CDLight's m_BaseColor
-    Vec3    m_sunAnimColor; //Similar to CDLight's m_Color
-    float   m_sunAnimSpeed;
-    AZ::u8  m_sunAnimPhase;
-    AZ::u8  m_sunAnimIndex;
-
-    float                   m_fILMul;
-    float                   m_fSSAOAmount;
-    float                   m_fSSAOContrast;
-    SRainParams     m_rainParams;
-    SSnowParams     m_snowParams;
-
-    int           m_bLockCGFResources;
-
-    float m_fGSMMaxDistance;
-
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Private Member variables.
-    //////////////////////////////////////////////////////////////////////////
-    PodArray<IStreamable*>  m_arrStreamableToRelease;
-    PodArray<IStreamable*>  m_arrStreamableToLoad;
-    PodArray<IStreamable*>  m_arrStreamableToDelete;
-    bool m_bNeedProcessObjectsStreaming_Finish;
-
-#ifdef SUPP_HWOBJ_OCCL
-    IShader* m_pShaderOcclusionQuery;
-#endif
-
-    //  bool LoadStaticObjectsFromXML(XmlNodeRef xmlVegetation);
-    _smart_ptr<IStatObj>        m_pDefaultCGF;
-    _smart_ptr<IRenderMesh> m_pRMBox;
-
-    //////////////////////////////////////////////////////////////////////////
-    std::vector<_smart_ptr<IStatObj> > m_lockedObjects;
-
-    //////////////////////////////////////////////////////////////////////////
-
-    bool m_bGarbageCollectionEnabled;
-
-    PodArray<SStreamAbleObject> m_arrStreamableObjects;
-    PodArray<COctreeNode*> m_arrStreamingNodeStack;
-    PodArray<SObjManPrecachePoint> m_vStreamPreCachePointDefs;
-    PodArray<SObjManPrecacheCamera> m_vStreamPreCacheCameras;
-    int m_nNextPrecachePointId;
-    bool m_bCameraPrecacheOverridden;
-
-#ifdef POOL_STATOBJ_ALLOCS
-    stl::PoolAllocator<sizeof(CStatObj), stl::PSyncMultiThread, alignof(CStatObj)>* m_statObjPool;
-#endif
-
-    CThreadSafeRendererContainer<SObjManRenderDebugInfo> m_arrRenderDebugInfo;
-
-    NAsyncCull::CCullThread m_CullThread;
-    CryMT::SingleProducerSingleConsumerQueue<SCheckOcclusionJobData> m_CheckOcclusionQueue;
-    CryMT::N_ProducerSingleConsumerQueue<SCheckOcclusionOutput> m_CheckOcclusionOutputQueue;
-
-private:
-
-    // Always take this lock after m_loadLock if taking both
-    AZStd::recursive_mutex m_garbageMutex;
-    AZStd::vector<IStatObj*> m_checkForGarbage;
-
-private:
-    // StatInstGroupEventBus
-    AZStd::unordered_set<StatInstGroupId> m_usedIds;
-    StatInstGroupId GenerateStatInstGroupId() override;
-    void ReleaseStatInstGroupId(StatInstGroupId statInstGroupId) override;
-    void ReleaseStatInstGroupIdSet(const AZStd::unordered_set<StatInstGroupId>& statInstGroupIdSet) override;
-    void ReserveStatInstGroupIdRange(StatInstGroupId from, StatInstGroupId to) override;
-};
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_OBJMAN_H
diff --git a/Code/CryEngine/Cry3DEngine/ObjManDraw.cpp b/Code/CryEngine/Cry3DEngine/ObjManDraw.cpp
deleted file mode 100644
index ad2d4c8545..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjManDraw.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Draw static objects (vegetations)
-
-
-#include "Cry3DEngine_precompiled.h"
diff --git a/Code/CryEngine/Cry3DEngine/ObjManDrawEntity.cpp b/Code/CryEngine/Cry3DEngine/ObjManDrawEntity.cpp
deleted file mode 100644
index 350c566263..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjManDrawEntity.cpp
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Render all entities in the sector together with shadows
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "3dEngine.h"
-#include "CullBuffer.h"
-#include "3dEngine.h"
-#include "LightEntity.h"
-#include "DecalManager.h"
-#include "ObjectsTree.h"
-
-void CObjManager::RenderDecalAndRoad(IRenderNode* pEnt,
-    const AABB& objBox,
-    float fEntDistance,
-    bool nCheckOcclusion,
-    const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // do not draw if marked to be not drawn or already drawn in this frame
-    unsigned int nRndFlags = pEnt->GetRndFlags();
-
-    if (nRndFlags & ERF_HIDDEN)
-    {
-        return;
-    }
-
-    EERType eERType = pEnt->GetRenderNodeType();
-
-    // detect bad objects
-    float fEntLengthSquared = objBox.GetSize().GetLengthSquared();
-    if (eERType != eERType_Light || !_finite(fEntLengthSquared))
-    {
-        if (fEntLengthSquared > MAX_VALID_OBJECT_VOLUME || !_finite(fEntLengthSquared) || fEntLengthSquared <= 0)
-        {
-            Warning("CObjManager::RenderObject: Object has invalid bbox: %s,%s, Radius = %.2f, Center = (%.1f,%.1f,%.1f)",
-                pEnt->GetName(), pEnt->GetEntityClassName(), sqrt_tpl(fEntLengthSquared) * 0.5f,
-                pEnt->GetBBox().GetCenter().x, pEnt->GetBBox().GetCenter().y, pEnt->GetBBox().GetCenter().z);
-            return; // skip invalid objects - usually only objects with invalid very big scale will reach this point
-        }
-    }
-
-    // allocate RNTmpData for potentially visible objects
-    Get3DEngine()->CheckCreateRNTmpData(&pEnt->m_pRNTmpData, pEnt, passInfo);
-
-    if (nCheckOcclusion && pEnt->m_pOcNode)
-    {
-        if (GetObjManager()->IsBoxOccluded(objBox, fEntDistance * passInfo.GetInverseZoomFactor(), &pEnt->m_pRNTmpData->userData.m_OcclState,
-                pEnt->m_pOcNode->m_pVisArea != NULL, eoot_OBJECT, passInfo))
-        {
-            return;
-        }
-    }
-
-    // skip "outdoor only" objects if outdoor is not visible
-    if (GetCVars()->e_CoverageBuffer == 2 && nRndFlags & ERF_OUTDOORONLY && !Get3DEngine()->GetCoverageBuffer()->IsOutdooVisible())
-    {
-        return;
-    }
-
-    if (pEnt->GetDrawFrame(passInfo.GetRecursiveLevel()) == passInfo.GetFrameID())
-    {
-        return;
-    }
-    pEnt->SetDrawFrame(passInfo.GetFrameID(), passInfo.GetRecursiveLevel());
-
-    CVisArea* pVisArea = (CVisArea*)pEnt->GetEntityVisArea();
-
-    const Vec3& vCamPos = passInfo.GetCamera().GetPosition();
-
-    // test only near/big occluders - others will be tested on tree nodes level
-    if (!objBox.IsContainPoint(vCamPos))
-    {
-        if (eERType == eERType_Light || fEntDistance < pEnt->m_fWSMaxViewDist * GetCVars()->e_OcclusionCullingViewDistRatio)
-        {
-            if (IsBoxOccluded(objBox, fEntDistance * passInfo.GetInverseZoomFactor(), &pEnt->m_pRNTmpData->userData.m_OcclState, pVisArea != NULL, eoot_OBJECT, passInfo))
-            {
-                return;
-            }
-        }
-    }
-
-    SRendParams DrawParams;
-    DrawParams.pTerrainTexInfo = NULL;
-    DrawParams.dwFObjFlags = 0;
-    DrawParams.fDistance = fEntDistance;
-    DrawParams.AmbientColor = Vec3(0, 0, 0);
-    DrawParams.pRenderNode = pEnt;
-
-    // set lights bit mask
-    DrawParams.nAfterWater = IsAfterWater(objBox.GetCenter(), passInfo) ? 1 : 0;
-
-    // draw bbox
-    if (GetCVars()->e_BBoxes)// && eERType != eERType_Light)
-    {
-        RenderObjectDebugInfo(pEnt, fEntDistance, passInfo);
-    }
-
-    DrawParams.m_pVisArea =   pVisArea;
-
-    DrawParams.nMaterialLayers = pEnt->GetMaterialLayers();
-    DrawParams.rendItemSorter = rendItemSorter.GetValue();
-
-    pEnt->Render(DrawParams, passInfo);
-}
-
-void CObjManager::RenderObject(IRenderNode* pEnt,
-    const AABB& objBox,
-    float fEntDistance,
-    EERType eERType,
-    const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const CVars* pCVars = GetCVars();
-
-    // do not draw if marked to be not drawn or already drawn in this frame
-    unsigned int nRndFlags = pEnt->GetRndFlags();
-
-    if (nRndFlags & ERF_HIDDEN)
-    {
-        return;
-    }
-
-#ifndef _RELEASE
-    // check cvars
-    switch (eERType)
-    {
-    case eERType_Decal:
-        if (!passInfo.RenderDecals())
-        {
-            return;
-        }
-        break;
-    case eERType_WaterVolume:
-        if (!passInfo.RenderWaterVolumes())
-        {
-            return;
-        }
-        break;
-    case eERType_Light:
-        if (!GetCVars()->e_DynamicLights || !passInfo.RenderEntities())
-        {
-            return;
-        }
-        break;
-    case eERType_Cloud:
-    case eERType_DistanceCloud:
-        if (!passInfo.RenderClouds())
-        {
-            return;
-        }
-        break;
-    default:
-        if (!passInfo.RenderEntities())
-        {
-            return;
-        }
-        break;
-    }
-
-    // detect bad objects
-    float fEntLengthSquared = objBox.GetSize().GetLengthSquared();
-    if (eERType != eERType_Light || !_finite(fEntLengthSquared))
-    {
-        if (fEntLengthSquared > MAX_VALID_OBJECT_VOLUME || !_finite(fEntLengthSquared) || fEntLengthSquared <= 0)
-        {
-            Warning("CObjManager::RenderObject: Object has invalid bbox: %s, %s, Radius = %.2f, Center = (%.1f,%.1f,%.1f)",
-                pEnt->GetName(), pEnt->GetEntityClassName(), sqrt_tpl(fEntLengthSquared) * 0.5f,
-                pEnt->GetBBox().GetCenter().x, pEnt->GetBBox().GetCenter().y, pEnt->GetBBox().GetCenter().z);
-            return; // skip invalid objects - usually only objects with invalid very big scale will reach this point
-        }
-    }
-#endif
-
-    if (pEnt->m_dwRndFlags & ERF_COLLISION_PROXY || pEnt->m_dwRndFlags & ERF_RAYCAST_PROXY)
-    {
-        // Collision proxy is visible in Editor while in editing mode.
-        if (!gEnv->IsEditor() || !gEnv->IsEditing())
-        {
-            if (GetCVars()->e_DebugDraw == 0)
-            {
-                return; //true;
-            }
-        }
-    }
-
-    // allocate RNTmpData for potentially visible objects
-    Get3DEngine()->CheckCreateRNTmpData(&pEnt->m_pRNTmpData, pEnt, passInfo);
-    PrefetchLine(pEnt->m_pRNTmpData, 0);    //m_pRNTmpData is >128 bytes, prefetching data used in dissolveref here
-
-#if !defined(CONSOLE)
-    // detect already culled occluder
-    if ((nRndFlags & ERF_GOOD_OCCLUDER))
-    {
-        if (pEnt->m_pRNTmpData->userData.m_OcclState.nLastOccludedMainFrameID == passInfo.GetMainFrameID())
-        {
-            return;
-        }
-
-        if (pCVars->e_CoverageBufferDrawOccluders)
-        {
-            return;
-        }
-    }
-#endif // !defined(CONSOLE)
-
-    // skip "outdoor only" objects if outdoor is not visible
-    if (pCVars->e_CoverageBuffer == 2 && nRndFlags & ERF_OUTDOORONLY && !Get3DEngine()->GetCoverageBuffer()->IsOutdooVisible())
-    {
-        return;
-    }
-
-    const int nRenderStackLevel = passInfo.GetRecursiveLevel();
-
-    const int nDrawFrame = pEnt->GetDrawFrame(nRenderStackLevel);
-
-    if (eERType != eERType_Light)
-    {
-        if (nDrawFrame == passInfo.GetFrameID())
-        {
-            return;
-        }
-        pEnt->SetDrawFrame(passInfo.GetFrameID(), nRenderStackLevel);
-    }
-
-    CVisArea* pVisArea = (CVisArea*)pEnt->GetEntityVisArea();
-
-    const Vec3& vCamPos = passInfo.GetCamera().GetPosition();
-
-    // test only near/big occluders - others will be tested on tree nodes level
-    // Note: Not worth prefetch on rCam or objBox as both have been recently used by calling functions & will be in cache - Rich S
-    if (!(nRndFlags & ERF_RENDER_ALWAYS) && !objBox.IsContainPoint(vCamPos))
-    {
-        if (eERType == eERType_Light || fEntDistance < pEnt->m_fWSMaxViewDist * pCVars->e_OcclusionCullingViewDistRatio)
-        {
-            if (IsBoxOccluded(objBox, fEntDistance * passInfo.GetInverseZoomFactor(), &pEnt->m_pRNTmpData->userData.m_OcclState, pVisArea != NULL, eoot_OBJECT, passInfo))
-            {
-                return;
-            }
-        }
-    }
-
-    if (eERType == eERType_Light)
-    {
-        if (nDrawFrame == passInfo.GetFrameID())
-        {
-            return;
-        }
-        pEnt->SetDrawFrame(passInfo.GetFrameID(), nRenderStackLevel);
-    }
-
-    SRendParams DrawParams;
-    DrawParams.pTerrainTexInfo = NULL;
-    DrawParams.dwFObjFlags = 0;
-    DrawParams.fDistance = fEntDistance;
-    DrawParams.AmbientColor = Vec3(0, 0, 0);
-    DrawParams.pRenderNode = pEnt;
-    //DrawParams.pInstance = pEnt;
-
-    if (eERType != eERType_Light && (pEnt->m_nInternalFlags & IRenderNode::REQUIRES_NEAREST_CUBEMAP))
-    {
-        uint16 nCubemapTexId = CheckCachedNearestCubeProbe(pEnt);
-        if (!nCubemapTexId || !pCVars->e_CacheNearestCubePicking)
-        {
-            nCubemapTexId = GetNearestCubeProbe(pVisArea, objBox);
-        }
-
-        CRNTmpData::SRNUserData* pUserDataRN = (pEnt->m_pRNTmpData) ? &pEnt->m_pRNTmpData->userData : 0;
-        if (pUserDataRN)
-        {
-            pUserDataRN->nCubeMapId = nCubemapTexId;
-        }
-
-        DrawParams.nTextureID = nCubemapTexId;
-    }
-
-    if (pCVars->e_Dissolve && eERType != eERType_Light && passInfo.IsGeneralPass())
-    {
-        DrawParams.nDissolveRef = GetDissolveRef(fEntDistance, pEnt->m_fWSMaxViewDist);
-        if (DrawParams.nDissolveRef)
-        {
-            DrawParams.dwFObjFlags |= FOB_DISSOLVE | FOB_DISSOLVE_OUT;
-            if (DrawParams.nDissolveRef == 255)
-            {
-                return;
-            }
-        }
-    }
-
-    DrawParams.nAfterWater = IsAfterWater(objBox.GetCenter(), passInfo) ? 1 : 0;
-
-    if (nRndFlags & ERF_SELECTED)
-    {
-        DrawParams.dwFObjFlags |= FOB_SELECTED;
-    }
-
-    if (pCVars->e_LodForceUpdate)
-    {
-        pEnt->m_pRNTmpData->userData.nWantedLod = CObjManager::GetObjectLOD(pEnt, fEntDistance);
-    }
-
-    // draw bbox
-#if !defined(_RELEASE)
-    if (pCVars->e_BBoxes)// && eERType != eERType_Light)
-    {
-        RenderObjectDebugInfo(pEnt, fEntDistance, passInfo);
-    }
-#endif
-
-    if (pEnt->m_dwRndFlags & ERF_NO_DECALNODE_DECALS)
-    {
-        DrawParams.dwFObjFlags |= FOB_DYNAMIC_OBJECT;
-        DrawParams.NoDecalReceiver = true;
-    }
-
-    DrawParams.m_pVisArea =   pVisArea;
-
-#if !defined(_RELEASE)
-    if (nRenderStackLevel < 0 || nRenderStackLevel >= MAX_RECURSION_LEVELS)
-    {
-        CRY_ASSERT_MESSAGE(nRenderStackLevel >= 0 && nRenderStackLevel < MAX_RECURSION_LEVELS, "nRenderStackLevel is outside max recursions level");
-    }
-#endif
-
-    DrawParams.nClipVolumeStencilRef = 0;
-    if (pEnt->m_pRNTmpData && pEnt->m_pRNTmpData->userData.m_pClipVolume)
-    {
-        DrawParams.nClipVolumeStencilRef = pEnt->m_pRNTmpData->userData.m_pClipVolume->GetStencilRef();
-    }
-
-    DrawParams.nMaterialLayers = pEnt->GetMaterialLayers();
-    DrawParams.lodValue = pEnt->ComputeLod(pEnt->m_pRNTmpData->userData.nWantedLod, passInfo);
-    DrawParams.rendItemSorter = rendItemSorter.GetValue();
-
-    pEnt->Render(DrawParams, passInfo);
-}
-
-void CObjManager::RenderAllObjectDebugInfo()
-{
-    AZ_TRACE_METHOD();
-    m_arrRenderDebugInfo.CoalesceMemory();
-    for (size_t i = 0; i < m_arrRenderDebugInfo.size(); ++i)
-    {
-        SObjManRenderDebugInfo& rRenderDebugInfo = m_arrRenderDebugInfo[i];
-        if (rRenderDebugInfo.pEnt)
-        {
-            RenderObjectDebugInfo_Impl(rRenderDebugInfo.pEnt, rRenderDebugInfo.fEntDistance);
-        }
-    }
-    m_arrRenderDebugInfo.resize(0);
-}
-
-void CObjManager::RemoveFromRenderAllObjectDebugInfo(IRenderNode* pEnt)
-{
-    for (size_t i = 0; i < m_arrRenderDebugInfo.size(); ++i)
-    {
-        SObjManRenderDebugInfo& rRenderDebugInfo = m_arrRenderDebugInfo[i];
-        if (rRenderDebugInfo.pEnt == pEnt)
-        {
-            rRenderDebugInfo.pEnt = NULL;
-            break;
-        }
-    }
-}
-
-void CObjManager::RenderObjectDebugInfo_Impl(IRenderNode* pEnt, float fEntDistance)
-{
-    if (GetCVars()->e_BBoxes > 0)
-    {
-        ColorF color(1, 1, 1, 1);
-
-        if (GetCVars()->e_BBoxes == 2 && pEnt->GetRndFlags() & ERF_SELECTED)
-        {
-            color.a *= clamp_tpl(pEnt->GetImportance(), 0.5f, 1.f);
-            float fFontSize = max(2.f - fEntDistance * 0.01f, 1.f);
-
-            string sLabel = pEnt->GetDebugString();
-            if (sLabel.empty())
-            {
-                sLabel.Format("%s/%s",
-                    pEnt->GetName(), pEnt->GetEntityClassName());
-            }
-            GetRenderer()->DrawLabelEx(pEnt->GetBBox().GetCenter(), fFontSize, (float*)&color, true, true, "%s", sLabel.c_str());
-        }
-
-        IRenderAuxGeom* pRenAux = GetRenderer()->GetIRenderAuxGeom();
-        pRenAux->SetRenderFlags(SAuxGeomRenderFlags());
-        AABB    rAABB       =   pEnt->GetBBox();
-        const float Bias    =   GetCVars()->e_CoverageBufferAABBExpand;
-        if (Bias < 0.f)
-        {
-            rAABB.Expand((rAABB.max - rAABB.min) * Bias - Vec3(Bias, Bias, Bias));
-        }
-        else
-        {
-            rAABB.Expand(Vec3(Bias, Bias, Bias));
-        }
-
-        pRenAux->DrawAABB(rAABB, false, color, eBBD_Faceted);
-    }
-}
-
-bool CObjManager::RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal, bool bFastTest, _smart_ptr<IMaterial> pMat)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    struct MeshLock
-    {
-        MeshLock(IRenderMesh* m = 0)
-            : mesh(m)
-        {
-            if (m)
-            {
-                m->LockForThreadAccess();
-            }
-        }
-        ~MeshLock()
-        {
-            if (mesh)
-            {
-                mesh->UnlockStream(VSF_GENERAL);
-                mesh->UnlockIndexStream();
-                mesh->UnLockForThreadAccess();
-            }
-        }
-    private:
-        IRenderMesh* mesh;
-    };
-
-    MeshLock rmLock(pRenderMesh);
-
-    // get position offset and stride
-    int nPosStride = 0;
-    byte* pPos  = pRenderMesh->GetPosPtr(nPosStride, FSL_READ);
-
-    // get indices
-    vtx_idx* pInds = pRenderMesh->GetIndexPtr(FSL_READ);
-    assert(pRenderMesh->GetIndicesCount() % 3 == 0);
-
-    float fClosestHitDistance = -1;
-
-    Lineseg l0(vInPos + vInDir, vInPos - vInDir);
-    Lineseg l1(vInPos - vInDir, vInPos + vInDir);
-
-    Vec3 vHitPoint(0, 0, 0);
-
-    //  bool b2DTest = fabs(vInDir.x)<0.001f && fabs(vInDir.y)<0.001f;
-
-    // test tris
-    TRenderChunkArray& Chunks = pRenderMesh->GetChunks();
-    for (int nChunkId = 0; nChunkId < Chunks.size(); nChunkId++)
-    {
-        CRenderChunk* pChunk = &Chunks[nChunkId];
-        if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-        {
-            continue;
-        }
-
-        if (pMat)
-        {
-            const SShaderItem& shaderItem = pMat->GetShaderItem(pChunk->m_nMatID);
-            if (!shaderItem.m_pShader || shaderItem.m_pShader->GetFlags() & EF_NODRAW)
-            {
-                continue;
-            }
-        }
-
-        AABB triBox;
-
-        int nLastIndexId = pChunk->nFirstIndexId + pChunk->nNumIndices;
-        for (int i = pChunk->nFirstIndexId; i < nLastIndexId; i += 3)
-        {
-            assert((int)pInds[i + 0] < pRenderMesh->GetVerticesCount());
-            assert((int)pInds[i + 1] < pRenderMesh->GetVerticesCount());
-            assert((int)pInds[i + 2] < pRenderMesh->GetVerticesCount());
-
-            // get vertices
-            const Vec3 v0 = (*(Vec3*)&pPos[nPosStride * pInds[i + 0]]);
-            const Vec3 v1 = (*(Vec3*)&pPos[nPosStride * pInds[i + 1]]);
-            const Vec3 v2 = (*(Vec3*)&pPos[nPosStride * pInds[i + 2]]);
-            /*
-                        if(b2DTest)
-                        {
-                            triBox.min = triBox.max = v0;
-                            triBox.Add(v1);
-                            triBox.Add(v2);
-                            if( vInPos.x < triBox.min.x || vInPos.x > triBox.max.x || vInPos.y < triBox.min.y || vInPos.y > triBox.max.y )
-                                continue;
-                        }
-            */
-            // make line triangle intersection
-            if (Intersect::Lineseg_Triangle(l0, v0, v1, v2, vHitPoint) ||
-                Intersect::Lineseg_Triangle(l1, v0, v1, v2, vHitPoint))
-            {
-                if (bFastTest)
-                {
-                    return (true);
-                }
-
-                float fDist = vHitPoint.GetDistance(vInPos);
-                if (fDist < fClosestHitDistance || fClosestHitDistance < 0)
-                {
-                    fClosestHitDistance = fDist;
-                    vOutPos = vHitPoint;
-                    vOutNormal = (v1 - v0).Cross(v2 - v0);
-                }
-            }
-        }
-    }
-
-    if (fClosestHitDistance >= 0)
-    {
-        vOutNormal.Normalize();
-        return true;
-    }
-
-    return false;
-}
-
-bool CObjManager::RayStatObjIntersection(IStatObj* pStatObj, const Matrix34& objMatrix, _smart_ptr<IMaterial> pMat,
-    Vec3 vStart, Vec3 vEnd, Vec3& vClosestHitPoint, float& fClosestHitDistance, bool bFastTest)
-{
-    assert(pStatObj);
-
-    CStatObj* pCStatObj = (CStatObj*)pStatObj;
-
-    if (!pCStatObj || pCStatObj->m_nFlags & STATIC_OBJECT_HIDDEN)
-    {
-        return false;
-    }
-
-    Matrix34 matInv = objMatrix.GetInverted();
-    Vec3 vOSStart = matInv.TransformPoint(vStart);
-    Vec3 vOSEnd = matInv.TransformPoint(vEnd);
-    Vec3 vOSHitPoint(0, 0, 0), vOSHitNorm(0, 0, 0);
-
-    Vec3 vBoxHitPoint;
-    if (!Intersect::Ray_AABB(Ray(vOSStart, vOSEnd - vOSStart), pCStatObj->GetAABB(), vBoxHitPoint))
-    {
-        return false;
-    }
-
-    bool bHitDetected = false;
-
-    if (IRenderMesh* pRenderMesh = pStatObj->GetRenderMesh())
-    {
-        if (CObjManager::RayRenderMeshIntersection(pRenderMesh, vOSStart, vOSEnd - vOSStart, vOSHitPoint, vOSHitNorm, bFastTest, pMat))
-        {
-            bHitDetected = true;
-            Vec3 vHitPoint = objMatrix.TransformPoint(vOSHitPoint);
-            float fDist = vHitPoint.GetDistance(vStart);
-            if (fDist < fClosestHitDistance)
-            {
-                fClosestHitDistance = fDist;
-                vClosestHitPoint = vHitPoint;
-            }
-        }
-    }
-    else
-    {
-        // multi-sub-objects
-        for (int s = 0, num = pCStatObj->SubObjectCount(); s < num; s++)
-        {
-            IStatObj::SSubObject& subObj = pCStatObj->SubObject(s);
-            if (subObj.pStatObj && !subObj.bHidden && subObj.nType == STATIC_SUB_OBJECT_MESH)
-            {
-                Matrix34 subObjMatrix = objMatrix * subObj.tm;
-                if (RayStatObjIntersection(subObj.pStatObj, subObjMatrix, pMat, vStart, vEnd, vClosestHitPoint, fClosestHitDistance, bFastTest))
-                {
-                    bHitDetected = true;
-                }
-            }
-        }
-    }
-
-    return bHitDetected;
-}
diff --git a/Code/CryEngine/Cry3DEngine/ObjManFar.cpp b/Code/CryEngine/Cry3DEngine/ObjManFar.cpp
deleted file mode 100644
index 1d7f6aea92..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjManFar.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : draw far objects as sprites
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "3dEngine.h"
-
-static PodArray<SVegetationSpriteInfo> arrVegetationSprites[RT_COMMAND_BUF_COUNT][MAX_RECURSION_LEVELS];
-
-void CObjManager::UnloadFarObjects()
-{
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        for (int j = 0; j < MAX_RECURSION_LEVELS; ++j)
-        {
-            stl::free_container(arrVegetationSprites[i][j]);
-        }
-    }
-}
-
-void CObjManager::RenderFarObjects(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    int nCount = 0;
-    for (int t = 0; t < nThreadsNum; t++)
-    {
-        nCount += m_arrVegetationSprites[passInfo.GetRecursiveLevel()][t].size();
-    }
-
-    if (!m_REFarTreeSprites)
-    {
-        m_REFarTreeSprites = (CREFarTreeSprites*)GetRenderer()->EF_CreateRE(eDATA_FarTreeSprites);
-    }
-    if (m_REFarTreeSprites && GetCVars()->e_VegetationSprites && nCount && !GetCVars()->e_DefaultMaterial)
-    {
-        arrVegetationSprites[passInfo.ThreadID()][passInfo.GetRecursiveLevel()].Clear();
-
-        for (int t = 0; t < nThreadsNum; t++)
-        {
-            CThreadSafeRendererContainer<SVegetationSpriteInfo>& rList = m_arrVegetationSprites[passInfo.GetRecursiveLevel()][t];
-            if (rList.size())
-            {
-                rList.CoalesceMemory();
-                for (size_t i = 0; i < rList.size(); ++i)
-                {
-                    arrVegetationSprites[passInfo.ThreadID()][passInfo.GetRecursiveLevel()].Add(rList[i]);
-                }
-            }
-        }
-        m_REFarTreeSprites->m_arrVegetationSprites[passInfo.ThreadID()][passInfo.GetRecursiveLevel()] = &arrVegetationSprites[passInfo.ThreadID()][passInfo.GetRecursiveLevel()];
-        CRenderObject* pObj = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());
-        if (!pObj)
-        {
-            return;
-        }
-        pObj->m_II.m_Matrix.SetIdentity();
-        SShaderItem shItem(m_p3DEngine->m_pFarTreeSprites);
-        SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-        GetRenderer()->EF_AddEf(m_REFarTreeSprites, shItem, pObj, passInfo, EFSLIST_GENERAL, 1, rendItemSorter);
-    }
-}
-
-void CObjManager::DrawFarObjects(float fMaxViewDist, const SRenderingPassInfo& passInfo)
-{
-    if (!GetCVars()->e_VegetationSprites)
-    {
-        return;
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (passInfo.GetRecursiveLevel() >= MAX_RECURSION_LEVELS)
-    {
-        assert(!"Recursion depther than MAX_RECURSION_LEVELS is not supported");
-        return;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////
-    //  Draw all far
-    //////////////////////////////////////////////////////////////////////////////////////
-}
-
-void CObjManager::GenerateFarObjects(float fMaxViewDist, const SRenderingPassInfo& passInfo)
-{
-    if (!GetCVars()->e_VegetationSprites)
-    {
-        return;
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (passInfo.GetRecursiveLevel() >= MAX_RECURSION_LEVELS)
-    {
-        assert(!"Recursion depther than MAX_RECURSION_LEVELS is not supported");
-        return;
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/ObjManShadows.cpp b/Code/CryEngine/Cry3DEngine/ObjManShadows.cpp
deleted file mode 100644
index 66ceb3fef6..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjManShadows.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Shadow casters/receivers relations
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "3dEngine.h"
-#include <AABBSV.h>
-#include "LightEntity.h"
-#include "ObjectsTree.h"
-
-bool IsAABBInsideHull(const SPlaneObject* pHullPlanes, int nPlanesNum, const AABB& aabbBox);
-
-void CObjManager::MakeShadowCastersList(CVisArea* pArea, [[maybe_unused]] const AABB& aabbReceiver, [[maybe_unused]] int dwAllowedTypes, int32 nRenderNodeFlags, [[maybe_unused]] Vec3 vLightPos, CDLight* pLight, ShadowMapFrustum* pFr, PodArray<SPlaneObject>* pShadowHull, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    assert(pLight && vLightPos.len() > 1); // world space pos required
-
-    pFr->m_castersList.Clear();
-    pFr->m_jobExecutedCastersList.Clear();
-
-    CVisArea* pLightArea = pLight->m_pOwner ? (CVisArea*)pLight->m_pOwner->GetEntityVisArea() : NULL;
-
-    if (pArea)
-    {
-        if (pArea->m_pObjectsTree)
-        {
-            pArea->m_pObjectsTree->FillShadowCastersList(false, pLight, pFr, pShadowHull, nRenderNodeFlags, passInfo);
-        }
-
-        if (pLightArea)
-        {
-            // check neighbor sectors and portals if light and object are not in same area
-            if (!(pLight->m_Flags & DLF_THIS_AREA_ONLY))
-            {
-                for (int pp = 0; pp < pArea->m_lstConnections.Count(); pp++)
-                {
-                    CVisArea* pN = pArea->m_lstConnections[pp];
-                    if (pN->m_pObjectsTree)
-                    {
-                        pN->m_pObjectsTree->FillShadowCastersList(false, pLight, pFr, pShadowHull, nRenderNodeFlags, passInfo);
-                    }
-
-                    for (int p = 0; p < pN->m_lstConnections.Count(); p++)
-                    {
-                        CVisArea* pNN = pN->m_lstConnections[p];
-                        if (pNN != pLightArea && pNN->m_pObjectsTree)
-                        {
-                            pNN->m_pObjectsTree->FillShadowCastersList(false, pLight, pFr, pShadowHull, nRenderNodeFlags, passInfo);
-                        }
-                    }
-                }
-            }
-            else if (!pLightArea->IsPortal())
-            { // visit also portals
-                for (int p = 0; p < pArea->m_lstConnections.Count(); p++)
-                {
-                    CVisArea* pN = pArea->m_lstConnections[p];
-                    if (pN->m_pObjectsTree)
-                    {
-                        pN->m_pObjectsTree->FillShadowCastersList(false, pLight, pFr, pShadowHull, nRenderNodeFlags, passInfo);
-                    }
-                }
-            }
-        }
-    }
-    else
-    {
-        if (Get3DEngine()->IsObjectTreeReady())
-        {
-            Get3DEngine()->GetObjectTree()->FillShadowCastersList(false, pLight, pFr, pShadowHull, nRenderNodeFlags, passInfo);
-        }
-
-        // check also visareas effected by sun
-        CVisAreaManager* pVisAreaManager = GetVisAreaManager();
-        if (pVisAreaManager)
-        {
-            {
-                PodArray<CVisArea*>& lstAreas = pVisAreaManager->m_lstVisAreas;
-                for (int i = 0; i < lstAreas.Count(); i++)
-                {
-                    if (lstAreas[i]->IsAffectedByOutLights() && lstAreas[i]->m_pObjectsTree)
-                    {
-                        bool bUnused = false;
-                        if (pFr->IntersectAABB(*lstAreas[i]->GetAABBox(), &bUnused))
-                        {
-                            if (!pShadowHull || IsAABBInsideHull(pShadowHull->GetElements(), pShadowHull->Count(), *lstAreas[i]->GetAABBox()))
-                            {
-                                lstAreas[i]->m_pObjectsTree->FillShadowCastersList(false, pLight, pFr, pShadowHull, nRenderNodeFlags, passInfo);
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                PodArray<CVisArea*>& lstAreas = pVisAreaManager->m_lstPortals;
-                for (int i = 0; i < lstAreas.Count(); i++)
-                {
-                    if (lstAreas[i]->IsAffectedByOutLights() && lstAreas[i]->m_pObjectsTree)
-                    {
-                        bool bUnused = false;
-                        if (pFr->IntersectAABB(*lstAreas[i]->GetAABBox(), &bUnused))
-                        {
-                            if (!pShadowHull || IsAABBInsideHull(pShadowHull->GetElements(), pShadowHull->Count(), *lstAreas[i]->GetAABBox()))
-                            {
-                                lstAreas[i]->m_pObjectsTree->FillShadowCastersList(false, pLight, pFr, pShadowHull, nRenderNodeFlags, passInfo);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // add casters with per object shadow map for point lights
-    if ((pLight->m_Flags & DLF_SUN) == 0)
-    {
-        for (uint i = 0; i < Get3DEngine()->m_lstPerObjectShadows.size(); ++i)
-        {
-            IShadowCaster* pCaster = Get3DEngine()->m_lstPerObjectShadows[i].pCaster;
-            assert(pCaster);
-
-            AABB casterBox = pCaster->GetBBoxVirtual();
-
-            if (!IsRenderNodeTypeEnabled(pCaster->GetRenderNodeType()))
-            {
-                continue;
-            }
-
-            bool bObjCompletellyInFrustum = false;
-            if (!pFr->IntersectAABB(casterBox, &bObjCompletellyInFrustum))
-            {
-                continue;
-            }
-
-            pFr->m_castersList.Add(pCaster);
-        }
-    }
-}
-
-int CObjManager::MakeStaticShadowCastersList(IRenderNode* pIgnoreNode, ShadowMapFrustum* pFrustum, int renderNodeExcludeFlags, int nMaxNodes, const SRenderingPassInfo& passInfo)
-{
-    int nRemainingNodes = nMaxNodes;
-
-    int nNumTrees = 1;
-    if (CVisAreaManager* pVisAreaManager = GetVisAreaManager())
-    {
-        nNumTrees += pVisAreaManager->m_lstVisAreas.size() + pVisAreaManager->m_lstPortals.size();
-    }
-
-    // objects tree first
-    int nStartSID = pFrustum->pShadowCacheData->mOctreePath[0];
-    if (Get3DEngine()->IsObjectTreeReady())
-    {
-        Get3DEngine()->GetObjectTree()->GetShadowCastersTimeSliced(pIgnoreNode, pFrustum, renderNodeExcludeFlags, nRemainingNodes, 1, passInfo);
-    }
-
-    if (nRemainingNodes <= 0)
-    {
-        return nRemainingNodes;
-    }
-
-    pFrustum->pShadowCacheData->mOctreePath[0]++;
-
-    // Vis Areas
-    CVisAreaManager* pVisAreaManager = GetVisAreaManager();
-    if (pVisAreaManager)
-    {
-        PodArray<CVisArea*>* lstAreaTypes[] =
-        {
-            &pVisAreaManager->m_lstVisAreas,
-            &pVisAreaManager->m_lstPortals
-        };
-
-        //The minus one is a legacy counting issue. Essentially skipping the octree in the engine.
-        nStartSID = max(0, nStartSID - 1);
-
-        const int nNumAreaTypes = sizeof(lstAreaTypes) / sizeof(lstAreaTypes[0]);
-        for (int nAreaType = 0; nAreaType < nNumAreaTypes; ++nAreaType)
-        {
-            PodArray<CVisArea*>& lstAreas = *lstAreaTypes[nAreaType];
-
-            for (int i = nStartSID; i < lstAreas.Count(); i++)
-            {
-                if (lstAreas[i]->IsAffectedByOutLights() && lstAreas[i]->m_pObjectsTree)
-                {
-                    if (pFrustum->aabbCasters.IsReset() || Overlap::AABB_AABB(pFrustum->aabbCasters, *lstAreas[i]->GetAABBox()))
-                    {
-                        lstAreas[i]->m_pObjectsTree->GetShadowCastersTimeSliced(pIgnoreNode, pFrustum, renderNodeExcludeFlags, nRemainingNodes, 0, passInfo);
-                    }
-                }
-
-                if (nRemainingNodes <= 0)
-                {
-                    return nRemainingNodes;
-                }
-
-                pFrustum->pShadowCacheData->mOctreePath[0]++;
-            }
-
-            nStartSID = max(0, nStartSID - lstAreas.Count());
-        }
-    }
-
-
-    // if we got here we processed every tree, so reset tree index
-    pFrustum->pShadowCacheData->mOctreePath[0] = 0;
-    return nRemainingNodes;
-}
diff --git a/Code/CryEngine/Cry3DEngine/ObjManStreaming.cpp b/Code/CryEngine/Cry3DEngine/ObjManStreaming.cpp
deleted file mode 100644
index 8a71bdfea7..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjManStreaming.cpp
+++ /dev/null
@@ -1,1202 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Loading trees, buildings, ragister/unregister entities for rendering
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-
-#include "CullBuffer.h"
-#include "3dEngine.h"
-#include "IndexedMesh.h"
-#include "DecalRenderNode.h"
-#include "FogVolumeRenderNode.h"
-#include "GeomCacheRenderNode.h"
-#include "CryPhysicsDeprecation.h"
-
-int CObjManager::m_nUpdateStreamingPrioriryRoundId = 1;
-int CObjManager::m_nUpdateStreamingPrioriryRoundIdFast = 1;
-int CObjManager::s_nLastStreamingMemoryUsage = 0;
-
-struct CObjManager_Cmp_Streamable_Priority
-{
-    // returns true if v1 < v2
-    ILINE bool operator()(const SStreamAbleObject& v1, const SStreamAbleObject& v2) const
-    {
-        IStreamable* arrObj[2] = { v1.GetStreamAbleObject(), v2.GetStreamAbleObject() };
-
-        // compare priorities
-        if (v1.fCurImportance > v2.fCurImportance)
-        {
-            return true;
-        }
-        if (v1.fCurImportance < v2.fCurImportance)
-        {
-            return false;
-        }
-
-        // give low lod's and small meshes higher priority
-        int MemUsage0 = v1.GetStreamableContentMemoryUsage();
-        int MemUsage1 = v2.GetStreamableContentMemoryUsage();
-        if (MemUsage0 < MemUsage1)
-        {
-            return true;
-        }
-        if (MemUsage0 > MemUsage1)
-        {
-            return false;
-        }
-
-        // fix sorting consistency
-        if (arrObj[0] > arrObj[1])
-        {
-            return true;
-        }
-        if (arrObj[0] < arrObj[1])
-        {
-            return false;
-        }
-
-        return false;
-    }
-};
-
-void CObjManager::RegisterForStreaming(IStreamable* pObj)
-{
-    SStreamAbleObject streamAbleObject(pObj);
-    if (m_arrStreamableObjects.Find(streamAbleObject) < 0)
-    {
-        m_arrStreamableObjects.Add(streamAbleObject);
-
-#ifdef OBJMAN_STREAM_STATS
-        if (m_pStreamListener)
-        {
-            string name;
-            pObj->GetStreamableName(name);
-            m_pStreamListener->OnCreatedStreamedObject(name.c_str(), pObj);
-        }
-#endif
-    }
-}
-
-void CObjManager::UnregisterForStreaming(IStreamable* pObj)
-{
-    if (m_arrStreamableObjects.size() > 0)
-    {
-        SStreamAbleObject streamAbleObject(pObj, false);
-        [[maybe_unused]] bool deleted = m_arrStreamableObjects.Delete(streamAbleObject);
-
-#ifdef OBJMAN_STREAM_STATS
-        if (deleted && m_pStreamListener)
-        {
-            m_pStreamListener->OnDestroyedStreamedObject(pObj);
-        }
-#endif
-
-        if (m_arrStreamableObjects.empty())
-        {
-            stl::free_container(m_arrStreamableObjects);
-        }
-    }
-}
-
-void CObjManager::UpdateObjectsStreamingPriority(bool bSyncLoad, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    const size_t nPrecachePoints = m_vStreamPreCachePointDefs.size();
-    const bool bNeedsUnique = nPrecachePoints > 1;
-
-    if (bSyncLoad)
-    {
-        PrintMessage("Updating level streaming priorities for %" PRISIZE_T " cameras (LevelFrameId = %d)", nPrecachePoints, Get3DEngine()->GetStreamingFramesSinceLevelStart());
-        for (size_t pci = 0; pci < nPrecachePoints; ++pci)
-        {
-            PrintMessage("-- %f %f %f",
-                m_vStreamPreCacheCameras[m_vStreamPreCachePointDefs[pci].nId].vPosition.x,
-                m_vStreamPreCacheCameras[m_vStreamPreCachePointDefs[pci].nId].vPosition.y,
-                m_vStreamPreCacheCameras[m_vStreamPreCachePointDefs[pci].nId].vPosition.z);
-        }
-    }
-
-    CVisAreaManager* pVisAreaMgr = GetVisAreaManager();
-
-    if (bSyncLoad)
-    {
-        m_arrStreamingNodeStack.clear();
-    }
-
-    bool bPrecacheNear = true;
-
-    if (bSyncLoad || (passInfo.GetFrameID() & 3) || GetFloatCVar(e_StreamCgfFastUpdateMaxDistance) == 0)
-    {
-        bPrecacheNear = false;
-
-        if (!m_arrStreamingNodeStack.Count())
-        {
-            FRAME_PROFILER("UpdateObjectsStreamingPriority_Init", GetSystem(), PROFILE_3DENGINE);
-
-            if (GetCVars()->e_StreamCgf == 2)
-            {
-                PrintMessage("UpdateObjectsStreamingPriority_Restart %d", passInfo.GetFrameID());
-            }
-
-            for (size_t ppIdx = 0, ppCount = nPrecachePoints; ppIdx != ppCount; ++ppIdx)
-            {
-                const Vec3& vPrecachePoint = m_vStreamPreCacheCameras[ppIdx].vPosition;
-
-                CVisArea* pCurArea = pVisAreaMgr ? (CVisArea*)pVisAreaMgr->GetVisAreaFromPos(vPrecachePoint) : NULL;
-                if (CVisArea* pRoot0 = pCurArea)
-                {
-                    m_tmpAreas0.Clear();
-                    pRoot0->AddConnectedAreas(m_tmpAreas0, GetCVars()->e_StreamPredictionMaxVisAreaRecursion);
-
-                    bool bFoundOutside = false;
-
-                    if (!GetCVars()->e_StreamPredictionAlwaysIncludeOutside)
-                    {
-                        for (int v = 0; v < m_tmpAreas0.Count(); v++)
-                        {
-                            CVisArea* pN1 = m_tmpAreas0[v];
-                            if (pN1->IsPortal() && pN1->m_lstConnections.Count() == 1)
-                            {
-                                bFoundOutside = true;
-                                break;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        bFoundOutside = true;
-                    }
-
-                    if (bFoundOutside)
-                    {
-                        if (Get3DEngine()->IsObjectTreeReady())
-                        {
-                            m_arrStreamingNodeStack.Add(Get3DEngine()->GetObjectTree());
-                        }
-                    }
-
-                    for (int v = 0; v < m_tmpAreas0.Count(); v++)
-                    {
-                        CVisArea* pN1 = m_tmpAreas0[v];
-                        assert(bNeedsUnique || m_arrStreamingNodeStack.Find(pN1->m_pObjectsTree) < 0);
-                        if (pN1->m_pObjectsTree)
-                        {
-                            m_arrStreamingNodeStack.Add(pN1->m_pObjectsTree);
-                        }
-                    }
-                }
-                else if (GetVisAreaManager())
-                {
-                    if (Get3DEngine()->IsObjectTreeReady())
-                    {
-                        m_arrStreamingNodeStack.Add(Get3DEngine()->GetObjectTree());
-                    }
-
-                    // find portals around
-                    m_tmpAreas0.Clear();
-                    GetVisAreaManager()->MakeActiveEntransePortalsList(NULL, m_tmpAreas0, NULL, passInfo);
-
-                    // make list of areas for streaming
-                    m_tmpAreas1.Clear();
-                    for (int p = 0; p < m_tmpAreas0.Count(); p++)
-                    {
-                        if (CVisArea* pRoot = m_tmpAreas0[p])
-                        {
-                            pRoot->AddConnectedAreas(m_tmpAreas1, GetCVars()->e_StreamPredictionMaxVisAreaRecursion);
-                        }
-                    }
-
-                    // fill list of object trees
-                    for (int v = 0; v < m_tmpAreas1.Count(); v++)
-                    {
-                        CVisArea* pN1 = m_tmpAreas1[v];
-                        assert(bNeedsUnique || m_arrStreamingNodeStack.Find(pN1->m_pObjectsTree) < 0);
-                        if (pN1->m_pObjectsTree)
-                        {
-                            m_arrStreamingNodeStack.Add(pN1->m_pObjectsTree);
-                        }
-                    }
-                }
-                else
-                {
-                    if (Get3DEngine()->IsObjectTreeReady())
-                    {
-                        m_arrStreamingNodeStack.Add(Get3DEngine()->GetObjectTree());
-                    }
-                }
-            }
-
-            IF_UNLIKELY (bNeedsUnique)
-            {
-                std::sort(m_arrStreamingNodeStack.begin(), m_arrStreamingNodeStack.end());
-                m_arrStreamingNodeStack.resize(std::distance(m_arrStreamingNodeStack.begin(), std::unique(m_arrStreamingNodeStack.begin(), m_arrStreamingNodeStack.end())));
-            }
-        }
-
-        {
-            // Time-sliced scene streaming priority update
-            // Update scene faster if in zoom and if camera moving fast
-            float fMaxTimeToSpendMS = GetCVars()->e_StreamPredictionUpdateTimeSlice * max(Get3DEngine()->GetAverageCameraSpeed() * .5f, 1.f) / max(passInfo.GetZoomFactor(), 0.1f);
-            fMaxTimeToSpendMS = min(fMaxTimeToSpendMS, GetCVars()->e_StreamPredictionUpdateTimeSlice * 2.f);
-
-            CTimeValue maxTimeToSpend;
-            maxTimeToSpend.SetSeconds(fMaxTimeToSpendMS * 0.001f);
-
-            const CTimeValue startTime = GetTimer()->GetAsyncTime();
-
-            const float fMinDist = GetFloatCVar(e_StreamPredictionMinFarZoneDistance);
-            const float fMaxViewDistance = Get3DEngine()->GetMaxViewDistance();
-
-            {
-                FRAME_PROFILER("UpdateObjectsStreamingPriority_MarkNodes", GetSystem(), PROFILE_3DENGINE);
-
-                while (m_arrStreamingNodeStack.Count())
-                {
-                    COctreeNode* pLast = m_arrStreamingNodeStack.Last();
-                    m_arrStreamingNodeStack.DeleteLast();
-
-                    pLast->UpdateStreamingPriority(m_arrStreamingNodeStack, fMinDist, fMaxViewDistance, false, &m_vStreamPreCacheCameras[0], nPrecachePoints, passInfo);
-
-                    if (!bSyncLoad && (GetTimer()->GetAsyncTime() - startTime) > maxTimeToSpend)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (!m_arrStreamingNodeStack.Count())
-        {
-            // Round has done.
-            ++m_nUpdateStreamingPrioriryRoundId;
-        }
-    }
-
-    if (bPrecacheNear || bSyncLoad)
-    {
-        FRAME_PROFILER("UpdateObjectsStreamingPriority_Mark_NEAR_Nodes", GetSystem(), PROFILE_3DENGINE);
-
-        PodArray<COctreeNode*> fastStreamingNodeStack;
-        const int nVisAreaRecursion = min(GetCVars()->e_StreamPredictionMaxVisAreaRecursion, 2);
-
-        for (size_t ppIdx = 0, ppCount = nPrecachePoints; ppIdx != ppCount; ++ppIdx)
-        {
-            const Vec3& vPrecachePoint = m_vStreamPreCacheCameras[ppIdx].vPosition;
-
-            CVisArea* pCurArea = pVisAreaMgr ? (CVisArea*)pVisAreaMgr->GetVisAreaFromPos(vPrecachePoint) : NULL;
-            if (CVisArea* pRoot0 = pCurArea)
-            {
-                m_tmpAreas0.Clear();
-                pRoot0->AddConnectedAreas(m_tmpAreas0, nVisAreaRecursion);
-
-                bool bFoundOutside = false;
-
-                if (!GetCVars()->e_StreamPredictionAlwaysIncludeOutside)
-                {
-                    for (int v = 0; v < m_tmpAreas0.Count(); v++)
-                    {
-                        CVisArea* pN1 = m_tmpAreas0[v];
-                        if (pN1->IsPortal() && pN1->m_lstConnections.Count() == 1)
-                        {
-                            bFoundOutside = true;
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    bFoundOutside = true;
-                }
-
-                if (bFoundOutside)
-                {
-                    if (Get3DEngine()->IsObjectTreeReady())
-                    {
-                        fastStreamingNodeStack.Add(Get3DEngine()->GetObjectTree());
-                    }
-                }
-
-                for (int v = 0; v < m_tmpAreas0.Count(); v++)
-                {
-                    CVisArea* pN1 = m_tmpAreas0[v];
-                    assert(bNeedsUnique || fastStreamingNodeStack.Find(pN1->m_pObjectsTree) < 0);
-                    if (pN1->m_pObjectsTree)
-                    {
-                        fastStreamingNodeStack.Add(pN1->m_pObjectsTree);
-                    }
-                }
-            }
-            else if (GetVisAreaManager())
-            {
-                if (Get3DEngine()->IsObjectTreeReady())
-                {
-                    fastStreamingNodeStack.Add(Get3DEngine()->GetObjectTree());
-                }
-
-                // find portals around
-                m_tmpAreas0.Clear();
-                GetVisAreaManager()->MakeActiveEntransePortalsList(NULL, m_tmpAreas0, NULL, passInfo);
-
-                // make list of areas for streaming
-                m_tmpAreas1.Clear();
-                for (int p = 0; p < m_tmpAreas0.Count(); p++)
-                {
-                    if (CVisArea* pRoot = m_tmpAreas0[p])
-                    {
-                        pRoot->AddConnectedAreas(m_tmpAreas1, nVisAreaRecursion);
-                    }
-                }
-
-                // fill list of object trees
-                for (int v = 0; v < m_tmpAreas1.Count(); v++)
-                {
-                    CVisArea* pN1 = m_tmpAreas1[v];
-                    assert(bNeedsUnique || fastStreamingNodeStack.Find(pN1->m_pObjectsTree) < 0);
-                    if (pN1->m_pObjectsTree)
-                    {
-                        fastStreamingNodeStack.Add(pN1->m_pObjectsTree);
-                    }
-                }
-            }
-            else
-            {
-                if (Get3DEngine()->IsObjectTreeReady())
-                {
-                    fastStreamingNodeStack.Add(Get3DEngine()->GetObjectTree());
-                }
-            }
-        }
-
-        IF_UNLIKELY (bNeedsUnique)
-        {
-            std::sort(fastStreamingNodeStack.begin(), fastStreamingNodeStack.end());
-            fastStreamingNodeStack.resize(std::distance(fastStreamingNodeStack.begin(), std::unique(fastStreamingNodeStack.begin(), fastStreamingNodeStack.end())));
-        }
-
-        const float fMaxDist = max(0.f, GetFloatCVar(e_StreamCgfFastUpdateMaxDistance) - GetFloatCVar(e_StreamPredictionDistanceFar));
-
-        while (fastStreamingNodeStack.Count())
-        {
-            COctreeNode* pLast = fastStreamingNodeStack.Last();
-            fastStreamingNodeStack.DeleteLast();
-
-            pLast->UpdateStreamingPriority(fastStreamingNodeStack, 0.f, fMaxDist, true, &m_vStreamPreCacheCameras[0], nPrecachePoints, passInfo);
-        }
-
-        m_nUpdateStreamingPrioriryRoundIdFast++;
-    }
-}
-
-void CObjManager::CheckTextureReadyFlag()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (m_lstStaticTypes.empty())
-    {
-        return;
-    }
-
-    static uint32 nSID = 0;
-    static uint32 nGroupId = 0;
-
-    if (nSID >= m_lstStaticTypes.size())
-    {
-        nSID = 0;
-    }
-
-    PodArray<StatInstGroup>& rGroupTable = m_lstStaticTypes[nSID];
-
-    if (nGroupId >= rGroupTable.size())
-    {
-        nGroupId = 0;
-        nSID++;
-    }
-
-    nGroupId++;
-}
-
-void CObjManager::ProcessObjectsStreaming(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    IF (!GetCVars()->e_StreamCgf, 0)
-    {
-        return;
-    }
-
-    // this assert is most likely triggered by forgetting to call
-    // 3dEngine::SyncProcessStreamingUpdate at the end of the frame, leading to multiple
-    // updates, but not starting and/or stopping streaming tasks
-    assert(m_bNeedProcessObjectsStreaming_Finish == false);
-    if (m_bNeedProcessObjectsStreaming_Finish == true)
-    {
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "ProcessObjectsStreaming invoked without a following ProcessObjectsStreaming_Finish, please check your update logic");
-    }
-
-    const CCamera& rCamera = passInfo.GetCamera();
-
-    float fTimeStart = GetTimer()->GetAsyncCurTime();
-
-    bool bSyncLoad = Get3DEngine()->IsStatObjSyncLoad();
-
-    if (!m_bCameraPrecacheOverridden)
-    {
-        SObjManPrecacheCamera& precachePoint = m_vStreamPreCacheCameras[0];
-
-        if (rCamera.GetPosition().GetDistance(precachePoint.vPosition) >= GetFloatCVar(e_StreamCgfGridUpdateDistance))
-        {
-            Vec3 vOffset = Get3DEngine()->GetAverageCameraMoveDir() * GetFloatCVar(e_StreamPredictionAhead);
-            vOffset.z *= .5f;
-            precachePoint.vPosition = rCamera.GetPosition() + vOffset;
-
-            // Raycast for precache points
-            CRY_PHYSICS_REPLACEMENT_ASSERT();
-
-            if IsCVarConstAccess(constexpr) (bool(GetFloatCVar(e_StreamPredictionAheadDebug)))
-            {
-                DrawSphere(precachePoint.vPosition, 0.5f);
-            }
-        }
-
-        if (Distance::Point_AABBSq(precachePoint.vPosition, precachePoint.bbox) > 0.0f)
-        {
-            precachePoint.bbox = AABB(precachePoint.vPosition, GetCVars()->e_StreamPredictionBoxRadius);
-        }
-    }
-
-    if (bSyncLoad && Get3DEngine()->IsShadersSyncLoad())
-    {
-        PrintMessage("Pre-caching render meshes, shaders and textures");
-    }
-    else if (bSyncLoad)
-    {
-        PrintMessage("Pre-caching render meshes for camera position");
-    }
-
-    CTimeValue currentTime = gEnv->pTimer->GetAsyncTime();
-
-    bool bSyncLoadPoints = m_bCameraPrecacheOverridden || Get3DEngine()->IsContentPrecacheRequested() || bSyncLoad || (GetCVars()->e_StreamCgf == 3) || (GetCVars()->e_StreamCgfDebugHeatMap != 0);
-    UpdateObjectsStreamingPriority(bSyncLoadPoints, passInfo);
-
-    // Remove stale precache points
-
-    size_t ppWriteIdx = 0;
-    for (size_t ppIdx = 0, ppCount = m_vStreamPreCachePointDefs.size(); ppIdx != ppCount; ++ppIdx)
-    {
-        SObjManPrecachePoint& pp = m_vStreamPreCachePointDefs[ppIdx];
-
-        if (ppIdx == 0 || currentTime < pp.expireTime)
-        {
-            m_vStreamPreCachePointDefs[ppWriteIdx] = pp;
-            m_vStreamPreCacheCameras[ppWriteIdx] = m_vStreamPreCacheCameras[ppIdx];
-            ++ppWriteIdx;
-        }
-    }
-    m_vStreamPreCachePointDefs.resize(ppWriteIdx);
-    m_vStreamPreCacheCameras.resize(ppWriteIdx);
-
-    m_bCameraPrecacheOverridden = false;
-
-    m_bNeedProcessObjectsStreaming_Finish = true;
-    ProcessObjectsStreaming_Impl(bSyncLoad, passInfo);
-
-    // during precache don't run asynchrony and sync directly to ensure the ESYSTEM_EVENT_LEVEL_PRECACHED
-    // event is send to activate the renderthread
-    // this also applies to the editor, since it calls the render function multiple times and thus invoking the
-    // function multiple times without syncing
-    if (bSyncLoad || gEnv->IsEditor())
-    {
-        ProcessObjectsStreaming_Finish();
-    }
-
-    if (bSyncLoad)
-    {
-        float t = GetTimer()->GetAsyncCurTime() - fTimeStart;
-        if (t > (1.0f / 15.0f))
-        {
-            PrintMessage("Finished pre-caching in %.1f sec", t);
-        }
-    }
-}
-
-void CObjManager::ProcessObjectsStreaming_Impl(bool bSyncLoad, const SRenderingPassInfo& passInfo)
-{
-    ProcessObjectsStreaming_Sort(bSyncLoad, passInfo);
-    ProcessObjectsStreaming_Release();
-#ifdef OBJMAN_STREAM_STATS
-    ProcessObjectsStreaming_Stats(passInfo);
-#endif
-    ProcessObjectsStreaming_InitLoad(bSyncLoad);
-}
-
-void CObjManager::ProcessObjectsStreaming_Sort(bool bSyncLoad, const SRenderingPassInfo& passInfo)
-{
-    int nNumStreamableObjects = m_arrStreamableObjects.Count();
-
-    static float fLastTime = 0;
-    const float fTime = GetTimer()->GetAsyncCurTime();
-
-    // call sort only every 100 ms
-    if (nNumStreamableObjects && ((fTime > fLastTime + 0.1f) || bSyncLoad))
-    {
-        FRAME_PROFILER("ProcessObjectsStreaming_Sort", GetSystem(), PROFILE_3DENGINE);
-
-        SStreamAbleObject* arrStreamableObjects = &m_arrStreamableObjects[0];
-        assert(arrStreamableObjects);
-
-        const float fMeshStreamingMaxIImportance = 10.f;
-
-        if (bSyncLoad)
-        {
-            // just put file offset into importance
-            for (int i = 0; i < nNumStreamableObjects; i++)
-            {
-                SStreamAbleObject& rObj = arrStreamableObjects[i];
-
-                if (!rObj.GetStreamAbleObject()->IsUnloadable())
-                {
-                    rObj.fCurImportance = fMeshStreamingMaxIImportance;
-                    continue;
-                }
-
-                string fileName;
-                rObj.GetStreamAbleObject()->GetStreamableName(fileName);
-                int nOffset = (int)(GetPak()->GetFileOffsetOnMedia(fileName.c_str()) / 1024);
-                rObj.fCurImportance = -(float)nOffset;
-            }
-        }
-        else
-        {
-            // use data of previous prediction round since current round is not finished yet
-            int nRoundId = CObjManager::m_nUpdateStreamingPrioriryRoundId - 1;
-
-            for (int i = 0; i < nNumStreamableObjects; i++)
-            {
-                SStreamAbleObject& rObj = arrStreamableObjects[i];
-
-                if (!rObj.GetStreamAbleObject()->IsUnloadable())
-                {
-                    rObj.fCurImportance = fMeshStreamingMaxIImportance;
-                    continue;
-                }
-
-                // compute importance of objects for selected nRoundId
-                rObj.fCurImportance = -1000.f;
-
-                IStreamable::SInstancePriorityInfo* pInfo = &(rObj.GetStreamAbleObject()->m_arrUpdateStreamingPrioriryRoundInfo[0]);
-
-                for (int nRoundIdx = 0; nRoundIdx < 2; nRoundIdx++)
-                {
-                    if (pInfo[nRoundIdx].nRoundId == nRoundId)
-                    {
-                        rObj.fCurImportance = pInfo[nRoundIdx].fMaxImportance;
-                        if (rObj.GetLastDrawMainFrameId() > (passInfo.GetMainFrameID() - GetCVars()->e_RNTmpDataPoolMaxFrames))
-                        {
-                            rObj.fCurImportance += GetFloatCVar(e_StreamCgfVisObjPriority);
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-
-        std::sort(&arrStreamableObjects[0], &arrStreamableObjects[nNumStreamableObjects], CObjManager_Cmp_Streamable_Priority());
-
-        fLastTime = fTime;
-    }
-}
-
-void CObjManager::ProcessObjectsStreaming_Release()
-{
-    FRAME_PROFILER("ProcessObjectsStreaming_Release", GetSystem(), PROFILE_3DENGINE);
-    int nMemoryUsage = 0;
-
-    int nNumStreamableObjects = m_arrStreamableObjects.Count();
-    SStreamAbleObject* arrStreamableObjects = nNumStreamableObjects ? &m_arrStreamableObjects[0] : NULL;
-
-    for (int nObjId = 0; nObjId < nNumStreamableObjects; nObjId++)
-    {
-        const SStreamAbleObject& rObj = arrStreamableObjects[nObjId];
-
-        nMemoryUsage += rObj.GetStreamableContentMemoryUsage();
-
-        bool bUnload = nMemoryUsage >= GetCVars()->e_StreamCgfPoolSize * 1024 * 1024;
-
-        if (!bUnload && GetCVars()->e_StreamCgfDebug == 4)
-        {
-            if (rObj.GetStreamAbleObject()->m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId < (CObjManager::m_nUpdateStreamingPrioriryRoundId - 8))
-            {
-                bUnload = true;
-            }
-        }
-
-        if (bUnload && rObj.GetStreamAbleObject()->IsUnloadable())
-        {
-            if (rObj.GetStreamAbleObject()->m_eStreamingStatus == ecss_Ready)
-            {
-                m_arrStreamableToRelease.push_back(rObj.GetStreamAbleObject());
-            }
-
-            // remove from list if not active for long time
-            if (rObj.GetStreamAbleObject()->m_eStreamingStatus == ecss_NotLoaded)
-            {
-                if (rObj.GetStreamAbleObject()->m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId < (CObjManager::m_nUpdateStreamingPrioriryRoundId - 8))
-                {
-                    rObj.GetStreamAbleObject()->m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId = 0;
-                    m_arrStreamableToDelete.push_back(rObj.GetStreamAbleObject());
-                }
-            }
-        }
-    }
-    s_nLastStreamingMemoryUsage = nMemoryUsage;
-}
-
-void CObjManager::ProcessObjectsStreaming_InitLoad(bool bSyncLoad)
-{
-    FRAME_PROFILER("ProcessObjectsStreaming_InitLoad", GetSystem(), PROFILE_3DENGINE);
-
-    int nMaxInProgress = GetCVars()->e_StreamCgfMaxTasksInProgress;
-    int nMaxToStart = GetCVars()->e_StreamCgfMaxNewTasksPerUpdate;
-    int nMaxMemUsage = GetCVars()->e_StreamCgfPoolSize * 1024 * 1024;
-    int nNumStreamableObjects = m_arrStreamableObjects.Count();
-    SStreamAbleObject* arrStreamableObjects = nNumStreamableObjects ? &m_arrStreamableObjects[0] : NULL;
-
-    int nMemoryUsage = 0;
-    int nInProgress = 0;
-    int nInProgressMem = 0;
-    int nStarted = 0;
-
-    SMeshPoolStatistics stats;
-    GetRenderer()->EF_Query(EFQ_GetMeshPoolInfo, stats);
-    size_t poolLimit = stats.nPoolSize << 2; // 4 times the pool limit because the rendermesh pool has been reduced
-
-    for (int nObjId = 0; nObjId < nNumStreamableObjects; nObjId++)
-    {
-        const SStreamAbleObject& rObj = m_arrStreamableObjects[nObjId];
-        if (rObj.GetStreamAbleObject()->m_eStreamingStatus == ecss_InProgress)
-        {
-            nInProgress++;
-            nInProgressMem += rObj.GetStreamableContentMemoryUsage();
-        }
-    }
-
-    for (int nObjId = 0; (nObjId < nNumStreamableObjects) && ((nInProgress < nMaxInProgress && (nInProgressMem < static_cast<int>(poolLimit) || !poolLimit) && nStarted < nMaxToStart) || bSyncLoad); nObjId++)
-    {
-        const SStreamAbleObject& rObj = arrStreamableObjects[nObjId];
-        IStreamable* pStatObj = rObj.GetStreamAbleObject();
-
-        int size = rObj.GetStreamableContentMemoryUsage();
-        if (poolLimit && poolLimit <= (size_t)(nInProgressMem + size))
-        {
-            // Actually the above check is an implicit size limit on CGFs - which is awful because it can lead to meshes never
-            // streamed in. This has to change after crysis2 - for now, this will include a white list of meshes that need to be
-            // loaded for crysis2 in the prism2 level.
-            if ((size_t)poolLimit <= (size_t)size)
-            {
-                string name;
-                pStatObj->GetStreamableName(name);
-                CryLogAlways("[WARNING] object '%s' skipped because too large (%d kb (>= %" PRISIZE_T " kb limit))", name.c_str(), size / 1024, poolLimit / 1024);
-                continue;
-            }
-
-            if (!bSyncLoad)
-            {
-                continue;
-            }
-        }
-
-        nMemoryUsage += size;
-        if (nMemoryUsage >= nMaxMemUsage)
-        {
-            break;
-        }
-
-        if (rObj.GetStreamAbleObject()->m_eStreamingStatus == ecss_NotLoaded)
-        {
-            m_arrStreamableToLoad.push_back(rObj.GetStreamAbleObject());
-            nInProgressMem += size;
-            ++nInProgress;
-            ++nStarted;
-
-            if ((GetCVars()->e_AutoPrecacheCgf == 2) && (nObjId > nNumStreamableObjects / 2))
-            {
-                break;
-            }
-        }
-    }
-}
-
-void CObjManager::ProcessObjectsStreaming_Finish()
-{
-    if (m_bNeedProcessObjectsStreaming_Finish == false)
-    {
-        return;
-    }
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    m_bNeedProcessObjectsStreaming_Finish = false;
-
-    FRAME_PROFILER("ProcessObjectsStreaming_Finish", GetSystem(), PROFILE_3DENGINE);
-    bool bSyncLoad = Get3DEngine()->IsStatObjSyncLoad();
-
-    {
-        LOADING_TIME_PROFILE_SECTION;
-
-        // now unload the stat object
-        while (!m_arrStreamableToRelease.empty())
-        {
-            IStreamable* pStatObj = m_arrStreamableToRelease.back();
-            m_arrStreamableToRelease.DeleteLast();
-            if (pStatObj)
-            {
-                pStatObj->ReleaseStreamableContent();
-
-#ifdef OBJMAN_STREAM_STATS
-                if (m_pStreamListener)
-                {
-                    m_pStreamListener->OnUnloadedStreamedObject(pStatObj);
-                }
-#endif
-
-                if (GetCVars()->e_StreamCgfDebug == 2)
-                {
-                    string sName;
-                    pStatObj->GetStreamableName(sName);
-                    PrintMessage("Unloaded: %s", sName.c_str());
-                }
-            }
-            else
-            {
-                CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "ProcessObjectsStreaming_Finish is trying to release streamable content of a deleted pStatObj");
-            }
-        }
-
-        int nSyncObjCounter = 0;
-
-        // start streaming of stat objects
-        if (bSyncLoad)
-        {
-            gEnv->pRenderer->EnableBatchMode(true);
-        }
-
-        //const uint nMaxNumberOfSyncStreamingRequests = GetCVars()->e_AutoPrecacheCgfMaxTasks;
-
-        std::vector<IReadStreamPtr> streamsToFinish;
-
-        GetISystem()->GetStreamEngine()->BeginReadGroup(); // Make sure new streaming requests are accumulated
-
-        for (size_t nId = 0; nId < m_arrStreamableToLoad.size(); nId++)
-        {
-            IStreamable* pStatObj = m_arrStreamableToLoad[nId];
-
-            // If there is a rendermesh pool present, only submit streaming job if
-            // the pool size in the renderer is sufficient. NOTE: This is a weak
-            // test. Better test would be to actually preallocate the memory here and
-            // only submit the streaming job if the memory could be obtained.
-
-            if (GetCVars()->e_StreamCgfDebug == 2)
-            {
-                string sName;
-                pStatObj->GetStreamableName(sName);
-                PrintMessage("Loading: %s", sName.c_str());
-            }
-
-            pStatObj->StartStreaming(false, NULL);
-
-#ifdef OBJMAN_STREAM_STATS
-            if (m_pStreamListener)
-            {
-                m_pStreamListener->OnRequestedStreamedObject(pStatObj);
-            }
-#endif
-        }
-
-        GetISystem()->GetStreamEngine()->EndReadGroup(); // Make sure new streaming requests are accumulated
-
-        if (bSyncLoad)
-        {
-            gEnv->pRenderer->EnableBatchMode(false);
-        }
-
-        if (bSyncLoad && nSyncObjCounter)
-        {
-            PrintMessage("Finished synchronous pre-cache of render meshes for %d CGF's", nSyncObjCounter);
-        }
-
-        m_arrStreamableToLoad.clear();
-
-        // remove no longer needed objects from list
-        while (!m_arrStreamableToDelete.empty())
-        {
-            IStreamable* pStatObj = m_arrStreamableToDelete.back();
-            m_arrStreamableToDelete.DeleteLast();
-            SStreamAbleObject stramAbleObject(pStatObj);
-            m_arrStreamableObjects.Delete(stramAbleObject);
-
-#ifdef OBJMAN_STREAM_STATS
-            if (m_pStreamListener)
-            {
-                m_pStreamListener->OnDestroyedStreamedObject(pStatObj);
-            }
-#endif
-        }
-    }
-}
-
-#ifdef OBJMAN_STREAM_STATS
-void CObjManager::ProcessObjectsStreaming_Stats(const SRenderingPassInfo& passInfo)
-{
-    IStreamedObjectListener* pListener = m_pStreamListener;
-    if (!pListener)
-    {
-        return;
-    }
-
-    int nNumStreamableObjects = m_arrStreamableObjects.Count();
-    SStreamAbleObject* arrStreamableObjects = nNumStreamableObjects ? &m_arrStreamableObjects[0] : NULL;
-
-    int nCurrentFrameId = passInfo.GetMainFrameID();
-
-    void* pBegunUse[512];
-    void* pEndUse[512];
-
-    int nBegunUse = 0;
-    int nEndUse = 0;
-
-    for (int nObjId = 0; nObjId < nNumStreamableObjects; nObjId++)
-    {
-        const SStreamAbleObject& rObj = arrStreamableObjects[nObjId];
-        IStreamable* pObj = rObj.GetStreamAbleObject();
-
-        if (pObj->m_eStreamingStatus == ecss_Ready)
-        {
-            int framesSinceLastUse = nCurrentFrameId - pObj->GetLastDrawMainFrameId();
-
-            if (framesSinceLastUse < 2)
-            {
-                if (!pObj->m_nStatsInUse)
-                {
-                    pObj->m_nStatsInUse = 1;
-                    pBegunUse[nBegunUse++] = pObj;
-
-                    IF_UNLIKELY (nBegunUse == sizeof(pBegunUse) / sizeof(pBegunUse[0]))
-                    {
-                        pListener->OnBegunUsingStreamedObjects(pBegunUse, nBegunUse);
-                        nBegunUse = 0;
-                    }
-                }
-            }
-            else
-            {
-                if (pObj->m_nStatsInUse)
-                {
-                    pObj->m_nStatsInUse = 0;
-                    pEndUse[nEndUse++] = pObj;
-
-                    IF_UNLIKELY (nEndUse == sizeof(pEndUse) / sizeof(pEndUse[0]))
-                    {
-                        pListener->OnEndedUsingStreamedObjects(pEndUse, nEndUse);
-                        nEndUse = 0;
-                    }
-                }
-            }
-        }
-    }
-
-    if (nBegunUse)
-    {
-        pListener->OnBegunUsingStreamedObjects(pBegunUse, nBegunUse);
-    }
-
-    if (nEndUse)
-    {
-        pListener->OnEndedUsingStreamedObjects(pEndUse, nEndUse);
-    }
-}
-#endif
-
-void CObjManager::GetObjectsStreamingStatus(I3DEngine::SObjectsStreamingStatus& outStatus)
-{
-    outStatus.nReady = outStatus.nInProgress = outStatus.nTotal = outStatus.nAllocatedBytes = outStatus.nMemRequired = 0;
-    outStatus.nMeshPoolSize = GetCVars()->e_StreamCgfPoolSize;
-
-    for (LoadedObjects::iterator it = m_lstLoadedObjects.begin(); it != m_lstLoadedObjects.end(); ++it)
-    {
-        IStatObj* pStatObj = *it;
-        if (pStatObj->IsSubObject())
-        {
-            continue;
-        }
-
-        if (pStatObj->GetLodLevel0())
-        {
-            continue;
-        }
-
-        for (int l = 0; l < MAX_STATOBJ_LODS_NUM; l++)
-        {
-            if (CStatObj* pLod = (CStatObj*)pStatObj->GetLodObject(l))
-            {
-                outStatus.nTotal++;
-            }
-        }
-    }
-
-    outStatus.nActive = m_arrStreamableObjects.Count();
-
-    for (int nObjId = 0; nObjId < m_arrStreamableObjects.Count(); nObjId++)
-    {
-        const SStreamAbleObject& rStreamAbleObject = m_arrStreamableObjects[nObjId];
-
-        if (rStreamAbleObject.GetStreamAbleObject()->m_eStreamingStatus == ecss_Ready)
-        {
-            outStatus.nReady++;
-        }
-
-        if (rStreamAbleObject.GetStreamAbleObject()->m_eStreamingStatus == ecss_InProgress)
-        {
-            outStatus.nInProgress++;
-        }
-
-        if (rStreamAbleObject.GetStreamAbleObject()->m_eStreamingStatus == ecss_Ready)
-        {
-            outStatus.nAllocatedBytes += rStreamAbleObject.GetStreamableContentMemoryUsage();
-        }
-
-        if (rStreamAbleObject.GetStreamAbleObject()->m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId >= (CObjManager::m_nUpdateStreamingPrioriryRoundId - 4))
-        {
-            outStatus.nMemRequired += rStreamAbleObject.GetStreamableContentMemoryUsage();
-        }
-    }
-}
-
-void CObjManager::PrecacheStatObjMaterial(_smart_ptr<IMaterial> pMaterial, const float fEntDistance, IStatObj* pStatObj, bool bFullUpdate, bool bDrawNear)
-{
-    //  FUNCTION_PROFILER_3DENGINE;
-
-    if (!pMaterial && pStatObj)
-    {
-        pMaterial = pStatObj->GetMaterial();
-    }
-
-    if (!pMaterial)
-    {
-        return;
-    }
-
-    if (pStatObj)
-    {
-        for (int i = 0; i < pStatObj->GetSubObjectCount(); i++)
-        {
-            PrecacheStatObjMaterial(pMaterial, fEntDistance, pStatObj->GetSubObject(i)->pStatObj, bFullUpdate, bDrawNear);
-        }
-    }
-
-    if (CMatInfo* pMatInfo = static_cast<CMatInfo*>(pMaterial.get()))
-    {
-        pMatInfo->PrecacheMaterial(fEntDistance, (pStatObj ? pStatObj->GetRenderMesh() : NULL), bFullUpdate, bDrawNear);
-    }
-}
-
-namespace
-{
-    void CollectRenderMeshMaterials(_smart_ptr<IMaterial> pMaterial, IRenderMesh* pRenderMesh, std::vector<std::pair<_smart_ptr<IMaterial>, float> >& collectedMaterials)
-    {
-        if (!pMaterial || !pRenderMesh)
-        {
-            return;
-        }
-
-        stl::push_back_unique(collectedMaterials, std::pair<_smart_ptr<IMaterial>, float>(pMaterial, 1.0f));
-
-        TRenderChunkArray& chunks = pRenderMesh->GetChunks();
-        const uint subMtlCount = pMaterial->GetSubMtlCount();
-
-        const uint numChunks = chunks.size();
-        for (uint i = 0; i < numChunks; ++i)
-        {
-            CRenderChunk& chunk = chunks[i];
-            if (chunk.nNumIndices > 0 && chunk.nNumVerts > 0 && chunk.m_nMatID < subMtlCount)
-            {
-                stl::push_back_unique(collectedMaterials, std::pair<_smart_ptr<IMaterial>, float>(pMaterial->GetSubMtl(chunk.m_nMatID), chunk.m_texelAreaDensity));
-            }
-        }
-    }
-}
-
-void CObjManager::PrecacheStatObj(IStatObj* pStatObj, int nLod, const Matrix34A& statObjMatrix, _smart_ptr<IMaterial> pMaterial, float fImportance, float fEntDistance, bool bFullUpdate, bool bHighPriority)
-{
-    if (!pStatObj)
-    {
-        return;
-    }
-
-    const int minLod = pStatObj->GetMinUsableLod();
-    const int maxLod = (int)pStatObj->GetMaxUsableLod();
-    const int minPrecacheLod = clamp_tpl(nLod - 1, minLod, maxLod);
-    const int maxPrecacheLod = clamp_tpl(nLod + 1, minLod, maxLod);
-
-    for (int currentLod = minPrecacheLod; currentLod <= maxPrecacheLod; ++currentLod)
-    {
-        IStatObj* pLodStatObj = pStatObj->GetLodObject(currentLod, true);
-        _smart_ptr<IMaterial> pLodMaterial = pLodStatObj->GetMaterial();
-        PrecacheStatObjMaterial(pMaterial ? pMaterial : pLodMaterial, fEntDistance, pLodStatObj, bFullUpdate, bHighPriority);
-        pStatObj->UpdateStreamableComponents(fImportance, statObjMatrix, bFullUpdate, nLod);
-    }
-}
-
-void CObjManager::UpdateRenderNodeStreamingPriority(IRenderNode* pObj, float fEntDistanceReal, float fImportanceFactor, bool bFullUpdate, const SRenderingPassInfo& passInfo, bool bHighPriority)
-{
-    //  FUNCTION_PROFILER_3DENGINE;
-
-    if (pObj->m_dwRndFlags & ERF_HIDDEN)
-    {
-        return;
-    }
-
-    if (pObj->m_fWSMaxViewDist < 0.01f)
-    {
-        return;
-    }
-
-    // check cvars
-    const   EERType nodeType = pObj->GetRenderNodeType();
-
-    const float fEntDistance = max(0.f, fEntDistanceReal - GetFloatCVar(e_StreamPredictionDistanceNear));
-
-    float fImportance = (1.f - (fEntDistance / ((pObj->m_fWSMaxViewDist + GetFloatCVar(e_StreamPredictionDistanceFar))))) * fImportanceFactor;
-
-    if (fImportance < 0)
-    {
-        return;
-    }
-
-    float fObjScale = 1.f;
-    AABB objBox(pObj->GetBBox());
-
-    switch (nodeType)
-    {
-    case eERType_Decal:
-        if (!passInfo.RenderDecals())
-        {
-            return;
-        }
-        fObjScale = max(0.001f, ((CDecalRenderNode*)pObj)->CDecalRenderNode::GetMatrix().GetColumn0().GetLength());
-        break;
-    case eERType_WaterVolume:
-        if (!passInfo.RenderWaterVolumes())
-        {
-            return;
-        }
-        break;
-    case eERType_Light:
-        if (!GetCVars()->e_DynamicLights)
-        {
-            return;
-        }
-        break;
-    case eERType_FogVolume:
-        fObjScale = max(0.001f, ((CFogVolumeRenderNode*)pObj)->CFogVolumeRenderNode::GetMatrix().GetColumn0().GetLength());
-        break;
-    case eERType_Cloud:
-    case eERType_DistanceCloud:
-        fObjScale = max(0.001f, pObj->GetBBox().GetRadius());
-        break;
-#if defined(USE_GEOM_CACHES)
-    case eERType_GeomCache:
-        if (!passInfo.RenderGeomCaches())
-        {
-            return;
-        }
-        fObjScale = max(0.001f, ((CGeomCacheRenderNode*)pObj)->CGeomCacheRenderNode::GetMatrix().GetColumn0().GetLength());
-#endif
-    default:
-        if (!passInfo.RenderEntities())
-        {
-            return;
-        }
-        break;
-    }
-
-    float fInvObjScale = 1.0f / fObjScale;
-    int nLod = CObjManager::GetObjectLOD(pObj, fEntDistanceReal);
-    _smart_ptr<IMaterial> pRenderNodeMat = pObj->GetMaterialOverride();
-
-    if (pObj->m_pRNTmpData)
-    {
-        if IsCVarConstAccess(constexpr) (GetFloatCVar(e_StreamCgfGridUpdateDistance) != 0.0f || GetFloatCVar(e_StreamPredictionAhead) != 0.0f || GetFloatCVar(e_StreamPredictionMinFarZoneDistance) != 0.0f)
-        {
-            float fDistanceToCam = sqrt_tpl(Distance::Point_AABBSq(passInfo.GetCamera().GetPosition(), objBox)) * passInfo.GetZoomFactor();
-            pObj->m_pRNTmpData->userData.nWantedLod = CObjManager::GetObjectLOD(pObj, fDistanceToCam);
-        }
-        else
-        {
-            pObj->m_pRNTmpData->userData.nWantedLod = nLod;
-        }
-    }
-
-    const int nSlotCount = pObj->GetSlotCount();
-    for (int nEntSlot = 0; nEntSlot < nSlotCount; ++nEntSlot)
-    {
-        bool bDrawNear = false;
-
-        _smart_ptr<IMaterial> pSlotMat = pObj->GetEntitySlotMaterial(nEntSlot, false, &bDrawNear);
-        if (!pSlotMat)
-        {
-            pSlotMat = pRenderNodeMat;
-        }
-
-        // If the object is in camera space, don't use the prediction position.
-        const float fEntPrecacheDistance = (bDrawNear)
-            ? sqrt_tpl(Distance::Point_AABBSq(passInfo.GetCamera().GetPosition(), objBox))
-            : fEntDistance;
-
-        bDrawNear |= bHighPriority;
-
-        Matrix34A matParent;
-        CStatObj* pStatObj = (CStatObj*)pObj->GetEntityStatObj(nEntSlot, 0, &matParent, false);
-        if (pStatObj)
-        {
-            _smart_ptr<IMaterial> pStatObjMat = pStatObj->GetMaterial();
-            PrecacheStatObj(pStatObj, nLod, matParent, pSlotMat ? pSlotMat : pStatObjMat, fImportance, fEntDistanceReal * fInvObjScale, bFullUpdate, bHighPriority);
-        }
-
-#if defined(USE_GEOM_CACHES)
-        //This is the legacy case where the CGeomCacheRenderNode is a slot in a CComponentRenderer
-        else if (CGeomCacheRenderNode* pGeomCacheRenderNode = static_cast<CGeomCacheRenderNode*>(pObj->GetGeomCacheRenderNode(nEntSlot, &matParent, false)))
-        {
-            pGeomCacheRenderNode->UpdateStreamableComponents(fImportance, fEntDistance, bFullUpdate, nLod, fInvObjScale, bFullUpdate);
-        }
-        //For the newer AZ systems CGeomCacheRenderNodes are not tied to the CComponentRenderer
-        else if (nodeType == eERType_GeomCache)
-        {
-            CGeomCacheRenderNode* geomCacheRenderNode = static_cast<CGeomCacheRenderNode*>(pObj);
-            geomCacheRenderNode->UpdateStreamableComponents(fImportance, fEntDistance, bFullUpdate, nLod, fInvObjScale, bFullUpdate);
-        }
-#endif
-        else if (pSlotMat)
-        {
-            pSlotMat->PrecacheMaterial(fEntDistance * fInvObjScale, pObj->GetRenderMesh(nLod), bFullUpdate, bHighPriority);
-        }
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/ObjectsTree.cpp b/Code/CryEngine/Cry3DEngine/ObjectsTree.cpp
deleted file mode 100644
index 1c4427f3a0..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjectsTree.cpp
+++ /dev/null
@@ -1,1824 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "CullBuffer.h"
-#include "DecalRenderNode.h"
-#include "RenderMeshMerger.h"
-#include "DecalManager.h"
-#include "VisAreas.h"
-#include "LightEntity.h"
-#include "WaterVolumeRenderNode.h"
-#include "DistanceCloudRenderNode.h"
-#include "ShadowCache.h"
-#include "Ocean.h"
-#include "IShader.h"
-#include <PakLoadDataUtils.h>
-
-#include <AzCore/Component/TransformBus.h>
-
-#define MAX_NODE_NUM 7
-
-const float fNodeMinSize = 8.f;
-const float fObjectToNodeSizeRatio = 1.f / 8.f;
-const float fMinShadowCasterViewDist = 8.f;
-
-PodArray<COctreeNode*> COctreeNode::m_arrEmptyNodes;
-bool COctreeNode::m_removeVegetationCastersOneByOne = true;
-
-COctreeNode::~COctreeNode()
-{
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode, * pNext; pObj; pObj = pNext)
-        {
-            pNext = pObj->m_pNext;
-
-            if (pObj->IsAllocatedOutsideOf3DEngineDLL())
-            {
-                Get3DEngine()->UnRegisterEntityDirect(pObj);
-            }
-            else
-            {
-                pObj->ReleaseNode(true);
-            }
-        }
-
-        assert(!m_arrObjects[l].m_pFirstNode);
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        delete m_arrChilds[i];
-        m_arrChilds[i] = NULL;
-    }
-
-    m_arrEmptyNodes.Delete(this);
-
-    if (GetObjManager())
-    {
-        GetObjManager()->GetArrStreamingNodeStack().Delete(this);
-    }
-
-    if (m_pRNTmpData)
-    {
-        Get3DEngine()->FreeRNTmpData(&m_pRNTmpData);
-    }
-}
-
-void COctreeNode::SetVisArea(CVisArea* pVisArea)
-{
-    m_pVisArea = pVisArea;
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->SetVisArea(pVisArea);
-        }
-    }
-}
-
-
-extern float arrVegetation_fSpriteSwitchState[nThreadsNum];
-
-
-void COctreeNode::Render_Object_Nodes(bool bNodeCompletelyInFrustum, int nRenderMask, const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter)
-{
-    assert(nRenderMask & OCTREENODE_RENDER_FLAG_OBJECTS);
-
-    const CCamera& rCam = passInfo.GetCamera();
-
-    if (m_nOccludedFrameId == passInfo.GetFrameID())
-    {
-        return;
-    }
-
-    if (!bNodeCompletelyInFrustum && !rCam.IsAABBVisible_EH(m_objectsBox, &bNodeCompletelyInFrustum))
-    {
-        return;
-    }
-
-    const Vec3& vCamPos = rCam.GetPosition();
-
-    float fNodeDistanceSq = Distance::Point_AABBSq(vCamPos, m_objectsBox) * sqr(passInfo.GetZoomFactor());
-
-    if (fNodeDistanceSq > sqr(m_fObjectsMaxViewDist))
-    {
-        return;
-    }
-
-    float fNodeDistance = sqrt_tpl(fNodeDistanceSq);
-
-    Get3DEngine()->CheckCreateRNTmpData(&m_pRNTmpData, NULL, passInfo);
-
-    if (m_nLastVisFrameId != passInfo.GetFrameID() && m_pParent)
-    {
-        if (GetObjManager()->IsBoxOccluded(m_objectsBox, fNodeDistance, &m_pRNTmpData->userData.m_OcclState, m_pVisArea != NULL, eoot_OCCELL, passInfo))
-        {
-            m_nOccludedFrameId = passInfo.GetFrameID();
-            return;
-        }
-    }
-
-    m_nLastVisFrameId = passInfo.GetFrameID();
-
-    if (GetCVars()->e_ObjectsTreeBBoxes)
-    {
-        if (GetCVars()->e_ObjectsTreeBBoxes == 1)
-        {
-            const AABB& nodeBox = GetNodeBox();
-            DrawBBox(nodeBox, Col_Blue);
-        }
-        if (GetCVars()->e_ObjectsTreeBBoxes == 2)
-        {
-            DrawBBox(m_objectsBox, Col_Red);
-        }
-    }
-
-    m_fNodeDistance = fNodeDistance;
-    m_bNodeCompletelyInFrustum = bNodeCompletelyInFrustum;
-
-    if (HasAnyRenderableCandidates(passInfo))
-    {
-        // when using the occlusion culler, push the work to the jobs doing the occlusion checks, else just compute in main thread
-        if (GetCVars()->e_StatObjBufferRenderTasks == 1 && passInfo.IsGeneralPass())
-        {
-            GetObjManager()->PushIntoCullQueue(SCheckOcclusionJobData::CreateOctreeJobData(this, nRenderMask, rendItemSorter, &passInfo.GetCamera()));
-        }
-        else
-        {
-            RenderContentJobEntry(nRenderMask, passInfo, rendItemSorter, &passInfo.GetCamera());
-        }
-
-        rendItemSorter.IncreaseOctreeCounter();
-    }
-
-    int nFirst =
-        ((vCamPos.x > m_vNodeCenter.x) ? 4 : 0) |
-        ((vCamPos.y > m_vNodeCenter.y) ? 2 : 0) |
-        ((vCamPos.z > m_vNodeCenter.z) ? 1 : 0);
-
-    if (m_arrChilds[nFirst  ])
-    {
-        m_arrChilds[nFirst  ]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-
-    if (m_arrChilds[nFirst ^ 1])
-    {
-        m_arrChilds[nFirst ^ 1]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-
-    if (m_arrChilds[nFirst ^ 2])
-    {
-        m_arrChilds[nFirst ^ 2]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-
-    if (m_arrChilds[nFirst ^ 4])
-    {
-        m_arrChilds[nFirst ^ 4]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-
-    if (m_arrChilds[nFirst ^ 3])
-    {
-        m_arrChilds[nFirst ^ 3]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-
-    if (m_arrChilds[nFirst ^ 5])
-    {
-        m_arrChilds[nFirst ^ 5]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-
-    if (m_arrChilds[nFirst ^ 6])
-    {
-        m_arrChilds[nFirst ^ 6]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-
-    if (m_arrChilds[nFirst ^ 7])
-    {
-        m_arrChilds[nFirst ^ 7]->Render_Object_Nodes(bNodeCompletelyInFrustum, nRenderMask, passInfo, rendItemSorter);
-    }
-}
-
-void COctreeNode::CompileObjects()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    m_lstCasters.Clear();
-
-    m_bStaticInstancingIsDirty = true;
-
-    float fObjMaxViewDistance = 0;
-
-    size_t numCasters = 0;
-    const unsigned int nSkipShadowCastersRndFlags = ERF_HIDDEN | ERF_COLLISION_PROXY | ERF_RAYCAST_PROXY | ERF_STATIC_INSTANCING; // shadow casters with these render flags are ignored
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            int nFlags = pObj->GetRndFlags();
-
-            IF (nFlags & nSkipShadowCastersRndFlags, 0)
-            {
-                continue;
-            }
-
-            IF (GetCVars()->e_ShadowsPerObject && gEnv->p3DEngine->GetPerObjectShadow(pObj), 0)
-            {
-                continue;
-            }
-
-            EERType eRType = pObj->GetRenderNodeType();
-            float WSMaxViewDist = pObj->GetMaxViewDist();
-
-            if (nFlags & ERF_CASTSHADOWMAPS && WSMaxViewDist > fMinShadowCasterViewDist && eRType != eERType_Light)
-            {
-                ++numCasters;
-            }
-        }
-    }
-
-    m_lstCasters.reserve(numCasters);
-
-
-    // update node
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode, * pNext; pObj; pObj = pNext)
-        {
-            pNext = pObj->m_pNext;
-
-            IF (pObj->m_dwRndFlags & ERF_HIDDEN, 0)
-            {
-                continue;
-            }
-
-            EERType eRType = pObj->GetRenderNodeType();
-
-            // update max view distances
-            const float fNewMaxViewDist = pObj->GetMaxViewDist();
-            pObj->m_fWSMaxViewDist = fNewMaxViewDist;
-
-            // update REQUIRES_FORWARD_RENDERING flag
-            //IF(GetCVars()->e_ShadowsOnAlphaBlend,0)
-            {
-                pObj->m_nInternalFlags &= ~(IRenderNode::REQUIRES_FORWARD_RENDERING | IRenderNode::REQUIRES_NEAREST_CUBEMAP);
-                if (eRType != eERType_Light &&
-                    eRType != eERType_Cloud &&
-                    eRType != eERType_FogVolume &&
-                    eRType != eERType_Decal &&
-                    eRType != eERType_DistanceCloud)
-                {
-                    if (CMatInfo* pMatInfo = (CMatInfo*)pObj->GetMaterial().get())
-                    {
-                        if (pMatInfo->IsForwardRenderingRequired())
-                        {
-                            pObj->m_nInternalFlags |= IRenderNode::REQUIRES_FORWARD_RENDERING;
-                        }
-
-                        if (pMatInfo->IsNearestCubemapRequired())
-                        {
-                            pObj->m_nInternalFlags |= IRenderNode::REQUIRES_NEAREST_CUBEMAP;
-                        }
-                    }
-
-                    if (eRType == eERType_RenderComponent ||eRType == eERType_StaticMeshRenderComponent || eRType == eERType_DynamicMeshRenderComponent || eRType == eERType_SkinnedMeshRenderComponent)
-                    {
-                        int nSlotCount = pObj->GetSlotCount();
-
-                        for (int s = 0; s < nSlotCount; s++)
-                        {
-                            if (CMatInfo* pMat = (CMatInfo*)pObj->GetEntitySlotMaterial(s).get())
-                            {
-                                if (pMat->IsForwardRenderingRequired())
-                                {
-                                    pObj->m_nInternalFlags |= IRenderNode::REQUIRES_FORWARD_RENDERING;
-                                }
-                                if (pMat->IsNearestCubemapRequired())
-                                {
-                                    pObj->m_nInternalFlags |= IRenderNode::REQUIRES_NEAREST_CUBEMAP;
-                                }
-                            }
-
-                            if (IStatObj* pStatObj = pObj->GetEntityStatObj(s))
-                            {
-                                if (CMatInfo* pMat = (CMatInfo*)pStatObj->GetMaterial().get())
-                                {
-                                    if (pMat->IsForwardRenderingRequired())
-                                    {
-                                        pObj->m_nInternalFlags |= IRenderNode::REQUIRES_FORWARD_RENDERING;
-                                    }
-                                    if (pMat->IsNearestCubemapRequired())
-                                    {
-                                        pObj->m_nInternalFlags |= IRenderNode::REQUIRES_NEAREST_CUBEMAP;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            int nFlags = pObj->GetRndFlags();
-
-            // fill shadow casters list
-            const bool bHasPerObjectShadow = GetCVars()->e_ShadowsPerObject && gEnv->p3DEngine->GetPerObjectShadow(pObj);
-            if (!(nFlags & nSkipShadowCastersRndFlags) && nFlags & ERF_CASTSHADOWMAPS && fNewMaxViewDist > fMinShadowCasterViewDist &&
-                eRType != eERType_Light && !bHasPerObjectShadow)
-            {
-                COctreeNode* pNode = this;
-                while (pNode && !(pNode->m_renderFlags & ERF_CASTSHADOWMAPS))
-                {
-                    pNode->m_renderFlags |= ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS;
-                    pNode = pNode->m_pParent;
-                }
-
-                float fMaxCastDist = fNewMaxViewDist * GetCVars()->e_ShadowsCastViewDistRatio;
-                m_lstCasters.Add(SCasterInfo(pObj, fMaxCastDist, eRType));
-            }
-
-            fObjMaxViewDistance = max(fObjMaxViewDistance, fNewMaxViewDist);
-        }
-    }
-
-    if (fObjMaxViewDistance > m_fObjectsMaxViewDist)
-    {
-        COctreeNode* pNode = this;
-        while (pNode)
-        {
-            pNode->m_fObjectsMaxViewDist = max(pNode->m_fObjectsMaxViewDist, fObjMaxViewDistance);
-            pNode = pNode->m_pParent;
-        }
-    }
-
-    const Vec3& sunDir = Get3DEngine()->GetSunDirNormalized();
-    m_fpSunDirX = (uint32) (sunDir.x * 63.5f + 63.5f);
-    m_fpSunDirZ = (uint32) (sunDir.z * 63.5f + 63.5f);
-    m_fpSunDirYs = sunDir.y < 0.0f ? 1 : 0;
-}
-
-
-bool IsAABBInsideHull(const SPlaneObject* pHullPlanes, int nPlanesNum, const AABB& aabbBox);
-bool IsSphereInsideHull(const SPlaneObject* pHullPlanes, int nPlanesNum, const Sphere& objSphere);
-
-void COctreeNode::FillShadowCastersList(bool bNodeCompletellyInFrustum, CDLight* pLight, ShadowMapFrustum* pFr, PodArray<SPlaneObject>* pShadowHull, uint32 nRenderNodeFlags, const SRenderingPassInfo& passInfo)
-{
-    if (GetCVars()->e_Objects)
-    {
-        if (m_renderFlags & ERF_CASTSHADOWMAPS)
-        {
-            FRAME_PROFILER("COctreeNode::FillShadowMapCastersList", GetSystem(), PROFILE_3DENGINE);
-
-            _MS_ALIGN(64) ShadowMapFrustumParams params;
-            params.pLight = pLight;
-            params.pFr = pFr;
-            params.pShadowHull = pShadowHull;
-            params.passInfo = &passInfo;
-            params.vCamPos = passInfo.GetCamera().GetPosition();
-            params.bSun = (pLight->m_Flags & DLF_SUN) != 0;
-            params.nRenderNodeFlags = nRenderNodeFlags;
-
-            FillShadowMapCastersList(params, bNodeCompletellyInFrustum);
-        }
-    }
-}
-
-void COctreeNode::FillDepthCubemapRenderList(const AABB& cubemapAABB, const SRenderingPassInfo& passInfo, PodArray<struct IShadowCaster*>* objectsList)
-{
-    if (GetCVars()->e_Objects)
-    {
-        //get objects from this node
-        for (IRenderNode* obj = m_arrObjects[eRNListType_Unknown].m_pFirstNode; obj; obj = obj->m_pNext)
-        {
-            if (cubemapAABB.IsIntersectBox(obj->GetBBox()))
-            {
-                objectsList->Add(obj);
-            }
-        }
-
-        //check child nodes
-        for (int i = 0; i <= MAX_NODE_NUM; i++)
-        {
-            const bool bPrefetch = i < MAX_NODE_NUM && !!m_arrChilds[i + 1];
-
-            if (m_arrChilds[i])
-            {
-                m_arrChilds[i]->FillDepthCubemapRenderList(cubemapAABB, passInfo, objectsList);
-            }
-        }
-    }
-}
-
-void COctreeNode::FillShadowMapCastersList(const ShadowMapFrustumParams& params, bool bNodeCompletellyInFrustum)
-{
-    if (!bNodeCompletellyInFrustum && !params.pFr->IntersectAABB(m_objectsBox, &bNodeCompletellyInFrustum))
-    {
-        return;
-    }
-
-    const int frameID = params.passInfo->GetFrameID();
-    if (params.bSun && bNodeCompletellyInFrustum)
-    {
-        nFillShadowCastersSkipFrameId = frameID;
-    }
-
-    if (params.pShadowHull && !IsAABBInsideHull(params.pShadowHull->GetElements(), params.pShadowHull->Count(), m_objectsBox))
-    {
-        nFillShadowCastersSkipFrameId = frameID;
-        return;
-    }
-
-    PrefetchLine(&m_lstCasters, 0);
-
-    const float fShadowsCastViewDistRatio = GetCVars()->e_ShadowsCastViewDistRatio;
-    if (fShadowsCastViewDistRatio != 0.0f)
-    {
-        float fNodeDistanceSqr = Distance::Point_AABBSq(params.vCamPos, m_objectsBox);
-        if (fNodeDistanceSqr > sqr(m_fObjectsMaxViewDist * fShadowsCastViewDistRatio))
-        {
-            nFillShadowCastersSkipFrameId = frameID;
-            return;
-        }
-    }
-
-    PrefetchLine(m_lstCasters.begin(), 0);
-    PrefetchLine(m_lstCasters.begin(), 128);
-
-    IRenderNode* pNotCaster = ((CLightEntity*)params.pLight->m_pOwner)->m_pNotCaster;
-
-    SCasterInfo* pCastersEnd = m_lstCasters.end();
-    for (SCasterInfo* pCaster = m_lstCasters.begin(); pCaster < pCastersEnd; pCaster++)
-    {
-        if (params.bSun && pCaster->nGSMFrameId == frameID && params.pShadowHull)
-        {
-            continue;
-        }
-        if (!IsRenderNodeTypeEnabled(pCaster->nRType))
-        {
-            continue;
-        }
-        if (pCaster->pNode == NULL || pCaster->pNode == pNotCaster)
-        {
-            continue;
-        }
-        if ((pCaster->nRenderNodeFlags & params.nRenderNodeFlags) == 0)
-        {
-            continue;
-        }
-
-        float fDistanceSq = Distance::Point_PointSq(params.vCamPos, pCaster->objSphere.center);
-        if (fDistanceSq > sqr(pCaster->fMaxCastingDist + pCaster->objSphere.radius))
-        {
-            pCaster->nGSMFrameId = frameID;
-            continue;
-        }
-
-        bool bObjCompletellyInFrustum = bNodeCompletellyInFrustum;
-        if (!bObjCompletellyInFrustum && !params.pFr->IntersectAABB(pCaster->objBox, &bObjCompletellyInFrustum))
-        {
-            continue;
-        }
-        if (params.bSun && bObjCompletellyInFrustum)
-        {
-            pCaster->nGSMFrameId = frameID;
-        }
-
-        if (params.bSun && bObjCompletellyInFrustum)
-        {
-            pCaster->nGSMFrameId = frameID;
-        }
-        if (params.pShadowHull && !IsSphereInsideHull(params.pShadowHull->GetElements(), params.pShadowHull->Count(), pCaster->objSphere))
-        {
-            pCaster->nGSMFrameId = frameID;
-            continue;
-        }
-
-        if (pCaster->bCanExecuteAsRenderJob)
-        {
-            Get3DEngine()->CheckCreateRNTmpData(&pCaster->pNode->m_pRNTmpData, pCaster->pNode, *params.passInfo);
-            params.pFr->m_jobExecutedCastersList.Add(pCaster->pNode);
-        }
-        else
-        {
-            params.pFr->m_castersList.Add(pCaster->pNode);
-        }
-    }
-
-    for (int i = 0; i <= MAX_NODE_NUM; i++)
-    {
-        const bool bPrefetch = i < MAX_NODE_NUM && !!m_arrChilds[i + 1];
-
-        if (m_arrChilds[i] && (m_arrChilds[i]->m_renderFlags & ERF_CASTSHADOWMAPS) && (!params.bSun || !params.pShadowHull || m_arrChilds[i]->nFillShadowCastersSkipFrameId != frameID))
-        {
-            m_arrChilds[i]->FillShadowMapCastersList(params, bNodeCompletellyInFrustum);
-        }
-    }
-}
-
-AABB COctreeNode::GetShadowCastersBox(const AABB* pBBox, const Matrix34* pShadowSpaceTransform)
-{
-    AABB result(AABB::RESET);
-    if (!pBBox || Overlap::AABB_AABB(*pBBox, GetObjectsBBox()))
-    {
-        for (size_t i = 0; i < m_lstCasters.size(); ++i)
-        {
-            AABB casterBox = m_lstCasters[i].objBox;
-            if (!pBBox || Overlap::AABB_AABB(*pBBox, casterBox))
-            {
-                if (pShadowSpaceTransform)
-                {
-                    casterBox = AABB::CreateTransformedAABB(*pShadowSpaceTransform, casterBox);
-                }
-
-                result.Add(casterBox);
-            }
-        }
-
-        for (int i = 0; i < 8; i++)
-        {
-            if (m_arrChilds[i])
-            {
-                result.Add(m_arrChilds[i]->GetShadowCastersBox(pBBox, pShadowSpaceTransform));
-            }
-        }
-    }
-
-    return result;
-}
-
-COctreeNode* COctreeNode::FindNodeContainingBox(const AABB& objBox)
-{
-    {
-        const AABB& nodeBox = GetNodeBox();
-        if (!nodeBox.IsContainSphere(objBox.min, -0.01f) || !nodeBox.IsContainSphere(objBox.max, -0.01f))
-        {
-            return NULL;
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            if (COctreeNode* pFoundNode = m_arrChilds[i]->FindNodeContainingBox(objBox))
-            {
-                return pFoundNode;
-            }
-        }
-    }
-
-    return this;
-}
-
-void COctreeNode::MoveObjectsIntoList(PodArray<SRNInfo>* plstResultEntities, const AABB* pAreaBox,
-    bool bRemoveObjects, bool bSkipDecals, bool bSkip_ERF_NO_DECALNODE_DECALS, bool bSkipDynamicObjects,
-    EERType eRNType)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (pAreaBox && !Overlap::AABB_AABB(m_objectsBox, *pAreaBox))
-    {
-        return;
-    }
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode, * pNext; pObj; pObj = pNext)
-        {
-            pNext = pObj->m_pNext;
-
-            if (eRNType < eERType_TypesNum && pObj->GetRenderNodeType() != eRNType)
-            {
-                continue;
-            }
-
-            if (bSkipDecals && pObj->GetRenderNodeType() == eERType_Decal)
-            {
-                continue;
-            }
-
-            if (bSkip_ERF_NO_DECALNODE_DECALS && pObj->GetRndFlags() & ERF_NO_DECALNODE_DECALS)
-            {
-                continue;
-            }
-
-            if (bSkipDynamicObjects)
-            {
-                EERType eRType = pObj->GetRenderNodeType();
-
-                if (eRType == eERType_RenderComponent || eRType == eERType_DynamicMeshRenderComponent || eRType == eERType_SkinnedMeshRenderComponent)
-                {
-                    if (pObj->IsMovableByGame())
-                    {
-                        continue;
-                    }
-                }
-                else if (
-                    eRType != eERType_StaticMeshRenderComponent)
-                {
-                    continue;
-                }
-            }
-
-            if (pAreaBox && !Overlap::AABB_AABB(pObj->GetBBox(), *pAreaBox))
-            {
-                continue;
-            }
-
-            if (bRemoveObjects)
-            {
-                UnlinkObject(pObj);
-
-                CompileObjects();
-            }
-
-            plstResultEntities->Add(pObj);
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->MoveObjectsIntoList(plstResultEntities, pAreaBox, bRemoveObjects, bSkipDecals, bSkip_ERF_NO_DECALNODE_DECALS, bSkipDynamicObjects, eRNType);
-        }
-    }
-}
-
-void COctreeNode::DeleteObjectsByFlag(int nRndFlag)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode, * pNext; pObj; pObj = pNext)
-        {
-            pNext = pObj->m_pNext;
-
-            if (pObj->GetRndFlags() & nRndFlag)
-            {
-                DeleteObject(pObj);
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->DeleteObjectsByFlag(nRndFlag);
-        }
-    }
-}
-
-void COctreeNode::UnregisterEngineObjectsInArea(const SHotUpdateInfo* pExportInfo, PodArray<IRenderNode*>& arrUnregisteredObjects, bool bOnlyEngineObjects)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    const AABB* pAreaBox = (pExportInfo && !pExportInfo->areaBox.IsReset()) ? &pExportInfo->areaBox : NULL;
-
-    {
-        const AABB& nodeBox = GetNodeBox();
-        if (pAreaBox && !Overlap::AABB_AABB(nodeBox, *pAreaBox))
-        {
-            return;
-        }
-    }
-
-    uint32 nObjTypeMask = pExportInfo ? pExportInfo->nObjTypeMask : (uint32) ~0;
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode, * pNext; pObj; pObj = pNext)
-        {
-            pNext = pObj->m_pNext;
-
-            EERType eType = pObj->GetRenderNodeType();
-
-            if (bOnlyEngineObjects)
-            {
-                if (!(nObjTypeMask & (1 << eType)))
-                {
-                    continue;
-                }
-
-                if (eType == eERType_Decal ||
-                    eType == eERType_WaterVolume ||
-                    eType == eERType_DistanceCloud )
-                {
-                    Get3DEngine()->UnRegisterEntityAsJob(pObj);
-                    arrUnregisteredObjects.Add(pObj);
-                    CompileObjects();
-                }
-            }
-            else
-            {
-                Get3DEngine()->UnRegisterEntityAsJob(pObj);
-                arrUnregisteredObjects.Add(pObj);
-                CompileObjects();
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->UnregisterEngineObjectsInArea(pExportInfo, arrUnregisteredObjects, bOnlyEngineObjects);
-        }
-    }
-}
-
-int COctreeNode::GetObjectsCount(EOcTeeNodeListType eListType)
-{
-    int nCount = 0;
-
-    switch (eListType)
-    {
-    case eMain:
-        for (int l = 0; l < eRNListType_ListsNum; l++)
-        {
-            for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-            {
-                nCount++;
-            }
-        }
-        break;
-    case eCasters:
-        for (int l = 0; l < eRNListType_ListsNum; l++)
-        {
-            for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-            {
-                if (pObj->GetRndFlags() & ERF_CASTSHADOWMAPS)
-                {
-                    nCount++;
-                }
-            }
-        }
-        break;
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            nCount += m_arrChilds[i]->GetObjectsCount(eListType);
-        }
-    }
-
-    return nCount;
-}
-
-
-void COctreeNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            pObj->GetMemoryUsage(pSizer);
-        }
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "ObjLists");
-
-        pSizer->AddObject(m_lstCasters);
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->GetMemoryUsage(pSizer);
-        }
-    }
-
-    if (pSizer)
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-}
-
-void C3DEngine::GetObjectsByTypeGlobal(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback)
-{
-    if (Get3DEngine()->IsObjectTreeReady())
-    {
-        Get3DEngine()->GetObjectTree()->GetObjectsByType(lstObjects, objType, pBBox, filterCallback);
-    }
-}
-
-void C3DEngine::MoveObjectsIntoListGlobal(PodArray<SRNInfo>* plstResultEntities, const AABB* pAreaBox,
-    bool bRemoveObjects, bool bSkipDecals, bool bSkip_ERF_NO_DECALNODE_DECALS, bool bSkipDynamicObjects,
-    EERType eRNType)
-{
-    if (Get3DEngine()->IsObjectTreeReady())
-    {
-        Get3DEngine()->GetObjectTree()->MoveObjectsIntoList(plstResultEntities, pAreaBox, bRemoveObjects, bSkipDecals, bSkip_ERF_NO_DECALNODE_DECALS, bSkipDynamicObjects, eRNType);
-    }
-}
-
-void COctreeNode::ActivateObjectsLayer(uint16 nLayerId, bool bActivate, bool bPhys, IGeneralMemoryHeap* pHeap)
-{
-    for (IRenderNode* pObj = m_arrObjects[eRNListType_DecalsAndRoads].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-    {
-        EERType eType = pObj->GetRenderNodeType();
-
-        if (eType == eERType_Decal)
-        {
-            CDecalRenderNode* pDecal = (CDecalRenderNode*)pObj;
-            if (pDecal->GetLayerId() == nLayerId || nLayerId == uint16(~0))
-            {
-                pDecal->SetRndFlags(ERF_HIDDEN, !bActivate);
-
-                if (bActivate)
-                {
-                    pDecal->RequestUpdate();
-                }
-                else
-                {
-                    pDecal->DeleteDecal();
-                }
-            }
-        }
-    }
-
-    for (IRenderNode* pObj = m_arrObjects[eRNListType_Unknown].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-    {
-        if (pObj->GetRenderNodeType() == eERType_WaterVolume)
-        {
-            CWaterVolumeRenderNode* pWatVol = (CWaterVolumeRenderNode*)pObj;
-            if (pWatVol->GetLayerId() == nLayerId || nLayerId == uint16(~0))
-            {
-                pWatVol->SetRndFlags(ERF_HIDDEN, !bActivate);
-
-                if (GetCVars()->e_ObjectLayersActivationPhysics)
-                {
-                    if (bActivate && bPhys)
-                    {
-                        pWatVol->Physicalize();
-                    }
-                    else
-                    {
-                        pWatVol->Dephysicalize();
-                    }
-                }
-                else if (!bPhys)
-                {
-                    pWatVol->Dephysicalize();
-                }
-            }
-        }
-
-        if (pObj->GetRenderNodeType() == eERType_DistanceCloud)
-        {
-            CDistanceCloudRenderNode* pCloud = (CDistanceCloudRenderNode*)pObj;
-            if (pCloud->GetLayerId() == nLayerId || nLayerId == uint16(~0))
-            {
-                pCloud->SetRndFlags(ERF_HIDDEN, !bActivate);
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->ActivateObjectsLayer(nLayerId, bActivate, bPhys, pHeap);
-        }
-    }
-}
-
-void COctreeNode::GetLayerMemoryUsage(uint16 nLayerId, ICrySizer* pSizer, int* pNumBrushes, int* pNumDecals)
-{
-    for (IRenderNode* pObj = m_arrObjects[eRNListType_DecalsAndRoads].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-    {
-        EERType eType = pObj->GetRenderNodeType();
-
-        if (eType == eERType_Decal)
-        {
-            CDecalRenderNode* pDecal = (CDecalRenderNode*)pObj;
-            if (pDecal->GetLayerId() == nLayerId || nLayerId == uint16(~0))
-            {
-                pDecal->GetMemoryUsage(pSizer);
-                if (pNumDecals)
-                {
-                    (*pNumDecals)++;
-                }
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->GetLayerMemoryUsage(nLayerId, pSizer, pNumBrushes, pNumDecals);
-        }
-    }
-}
-
-
-void COctreeNode::GetObjects(PodArray<IRenderNode*>& lstObjects, const AABB* pBBox)
-{
-    if (pBBox && !Overlap::AABB_AABB(*pBBox, GetObjectsBBox()))
-    {
-        return;
-    }
-
-    unsigned int nCurrentObject(eRNListType_First);
-    for (nCurrentObject = eRNListType_First; nCurrentObject < eRNListType_ListsNum; ++nCurrentObject)
-    {
-        for (IRenderNode* pObj = m_arrObjects[nCurrentObject].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            if (!pBBox || Overlap::AABB_AABB(*pBBox, pObj->GetBBox()))
-            {
-                lstObjects.Add(pObj);
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->GetObjects(lstObjects, pBBox);
-        }
-    }
-}
-
-bool COctreeNode::GetShadowCastersTimeSliced(IRenderNode* pIgnoreNode, ShadowMapFrustum* pFrustum, int renderNodeExcludeFlags, int& totalRemainingNodes, int nCurLevel, const SRenderingPassInfo& passInfo)
-{
-    assert(pFrustum->pShadowCacheData);
-
-    if (totalRemainingNodes <= 0)
-    {
-        return false;
-    }
-
-    if (!pFrustum->pShadowCacheData->mOctreePathNodeProcessed[nCurLevel])
-    {
-        if (pFrustum->aabbCasters.IsReset() || Overlap::AABB_AABB(pFrustum->aabbCasters, GetObjectsBBox()))
-        {
-            for (int l = 0; l < eRNListType_ListsNum; l++)
-            {
-                for (IRenderNode* pNode = m_arrObjects[l].m_pFirstNode; pNode; pNode = pNode->m_pNext)
-                {
-                    if (!IsRenderNodeTypeEnabled(pNode->GetRenderNodeType()))
-                    {
-                        continue;
-                    }
-
-                    if (pNode == pIgnoreNode)
-                    {
-                        continue;
-                    }
-
-                    const int nFlags = pNode->GetRndFlags();
-                    if (nFlags & (ERF_HIDDEN | ERF_COLLISION_PROXY | ERF_RAYCAST_PROXY | renderNodeExcludeFlags))
-                    {
-                        continue;
-                    }
-
-                    // Ignore ERF_CASTSHADOWMAPS for ambient occlusion casters
-                    if (pFrustum->m_eFrustumType != ShadowMapFrustum::e_HeightMapAO && (pNode->GetRndFlags() & ERF_CASTSHADOWMAPS) == 0)
-                    {
-                        continue;
-                    }
-
-                    if (pFrustum->pShadowCacheData->mProcessedCasters.find(pNode) != pFrustum->pShadowCacheData->mProcessedCasters.end())
-                    {
-                        continue;
-                    }
-
-                    AABB objBox = pNode->GetBBox();
-                    const float fDistanceSq = Distance::Point_PointSq(passInfo.GetCamera().GetPosition(), objBox.GetCenter());
-                    const float fMaxDist = pNode->GetMaxViewDist() * GetCVars()->e_ShadowsCastViewDistRatio + objBox.GetRadius();
-
-                    if (fDistanceSq > sqr(fMaxDist))
-                    {
-                        continue;
-                    }
-
-                    // find closest loaded lod
-                    for (int nSlot = 0; nSlot < pNode->GetSlotCount(); ++nSlot)
-                    {
-                        bool bCanRender = false;
-
-                        if (IStatObj* pStatObj = pNode->GetEntityStatObj(nSlot))
-                        {
-                            for (int i = 0; i < MAX_STATOBJ_LODS_NUM; ++i)
-                            {
-                                IStatObj* pLod = pStatObj->GetLodObject(i);
-
-                                if (pLod && pLod->m_eStreamingStatus == ecss_Ready)
-                                {
-                                    bCanRender = true;
-                                    break;
-                                }
-                            }
-                        }
-
-                        if (bCanRender)
-                        {
-                            if (pNode->CanExecuteRenderAsJob())
-                            {
-                                Get3DEngine()->CheckCreateRNTmpData(&pNode->m_pRNTmpData, pNode, passInfo);
-                                pFrustum->m_jobExecutedCastersList.Add(pNode);
-                            }
-                            else
-                            {
-                                pFrustum->m_castersList.Add(pNode);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        pFrustum->pShadowCacheData->mOctreePathNodeProcessed[nCurLevel] = true;
-        if (!pFrustum->m_castersList.IsEmpty() || !pFrustum->m_jobExecutedCastersList.IsEmpty())
-        {
-            --totalRemainingNodes;
-        }
-    }
-
-
-    for (int i = pFrustum->pShadowCacheData->mOctreePath[nCurLevel]; i < 8; ++i)
-    {
-        if (m_arrChilds[i] && (m_arrChilds[i]->m_renderFlags & ERF_CASTSHADOWMAPS))
-        {
-            bool bDone = m_arrChilds[i]->GetShadowCastersTimeSliced(pIgnoreNode, pFrustum, renderNodeExcludeFlags, totalRemainingNodes, nCurLevel + 1, passInfo);
-
-            if (!bDone)
-            {
-                return false;
-            }
-        }
-
-        pFrustum->pShadowCacheData->mOctreePath[nCurLevel] = i;
-    }
-
-    // this subtree is fully processed: reset traversal state
-    pFrustum->pShadowCacheData->mOctreePath[nCurLevel] = 0;
-    pFrustum->pShadowCacheData->mOctreePathNodeProcessed[nCurLevel] = 0;
-    return true;
-}
-
-bool COctreeNode::IsObjectTypeInTheBox(EERType objType, const AABB& WSBBox)
-{
-    if (!Overlap::AABB_AABB(WSBBox, GetObjectsBBox()))
-    {
-        return false;
-    }
-
-    ERNListType eListType = IRenderNode::GetRenderNodeListId(objType);
-
-    for (IRenderNode* pObj = m_arrObjects[eListType].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-    {
-        if (pObj->GetRenderNodeType() == objType)
-        {
-            if (Overlap::AABB_AABB(WSBBox, pObj->GetBBox()))
-            {
-                return true;
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            if (m_arrChilds[i]->IsObjectTypeInTheBox(objType, WSBBox))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-
-bool COctreeNode::RayObjectsIntersection2D(Vec3 vStart, Vec3 vEnd, Vec3& vClosestHitPoint, float& fClosestHitDistance, EERType eERType)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    //  Vec3 vBoxHitPoint;
-    //  if(!Intersect::Ray_AABB(Ray(vStart, vEnd-vStart), m_objectsBox, vBoxHitPoint))
-    //  return false;
-
-    if (vStart.x > m_objectsBox.max.x || vStart.y > m_objectsBox.max.y ||
-        vStart.x < m_objectsBox.min.x || vStart.y < m_objectsBox.min.y)
-    {
-        return false;
-    }
-
-    const bool oceanEnabled = OceanToggle::IsActive() ? OceanRequest::OceanIsEnabled() : true;
-    float fOceanLevel = WATER_LEVEL_UNKNOWN;
-    if (OceanToggle::IsActive())
-    {
-        fOceanLevel = OceanRequest::GetOceanLevel();
-    }
-    else
-    {
-        fOceanLevel = m_pOcean ? m_pOcean->GetWaterLevel() : WATER_LEVEL_UNKNOWN;
-    }
-
-    ERNListType eListType = IRenderNode::GetRenderNodeListId(eERType);
-
-    for (IRenderNode* pObj = m_arrObjects[eListType].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-    {
-        uint32 dwFlags = pObj->GetRndFlags();
-
-        if (dwFlags & ERF_HIDDEN || !(dwFlags & ERF_CASTSHADOWMAPS) || dwFlags & ERF_COLLISION_PROXY)
-        {
-            continue;
-        }
-
-        if (pObj->GetRenderNodeType() != eERType)
-        {
-            continue;
-        }
-
-        //      if(!Intersect::Ray_AABB(Ray(vStart, vEnd-vStart), pObj->GetBBox(), vBoxHitPoint))
-        //      continue;
-
-        const AABB& objBox = pObj->GetBBox();
-
-        if ((objBox.max.z - objBox.min.z) < 2.f)
-        {
-            continue;
-        }
-
-        if (oceanEnabled && objBox.max.z < fOceanLevel)
-        {
-            continue;
-        }
-
-        if (vStart.x > objBox.max.x || vStart.y > objBox.max.y || vStart.x < objBox.min.x || vStart.y < objBox.min.y)
-        {
-            continue;
-        }
-
-        Matrix34A objMatrix;
-        CStatObj* pStatObj = (CStatObj*)pObj->GetEntityStatObj(0, 0, &objMatrix);
-
-        if (pStatObj->GetOcclusionAmount() < 0.32f)
-        {
-            continue;
-        }
-
-        {
-            if (pStatObj->m_nFlags & STATIC_OBJECT_HIDDEN)
-            {
-                continue;
-            }
-
-            Matrix34 matInv = objMatrix.GetInverted();
-            Vec3 vOSStart = matInv.TransformPoint(vStart);
-            Vec3 vOSEnd = matInv.TransformPoint(vEnd);
-            Vec3 vOSHitPoint(0, 0, 0), vOSHitNorm(0, 0, 0);
-
-            Vec3 vBoxHitPoint;
-            if (!Intersect::Ray_AABB(Ray(vOSStart, vOSEnd - vOSStart), pStatObj->GetAABB(), vBoxHitPoint))
-            {
-                continue;
-            }
-
-            vOSHitPoint = vOSStart;
-            vOSHitPoint.z = pStatObj->GetObjectHeight(vOSStart.x, vOSStart.y);
-
-            if (vOSHitPoint.z != 0)
-            {
-                Vec3 vHitPoint = objMatrix.TransformPoint(vOSHitPoint);
-                float fDist = vHitPoint.GetDistance(vStart);
-                if (fDist < fClosestHitDistance)
-                {
-                    fClosestHitDistance = fDist;
-                    vClosestHitPoint = vHitPoint;
-                }
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->RayObjectsIntersection2D(vStart, vEnd, vClosestHitPoint, fClosestHitDistance, eERType);
-        }
-    }
-
-    return false;
-}
-
-#endif
-
-void COctreeNode::GenerateStatObjAndMatTables(std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, SHotUpdateInfo* pExportInfo)
-{
-    //if eERType number is changed, have to check this code.
-    COMPILE_TIME_ASSERT(eERType_TypesNum == 28);
-
-    AABB* pBox = (pExportInfo && !pExportInfo->areaBox.IsReset()) ? &pExportInfo->areaBox : NULL;
-
-    if (pBox && !Overlap::AABB_AABB(GetNodeBox(), *pBox))
-    {
-        return;
-    }
-
-    uint32 nObjTypeMask = pExportInfo ? pExportInfo->nObjTypeMask : (uint32) ~0;
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            EERType eType = pObj->GetRenderNodeType();
-
-            if (!(nObjTypeMask & (1 << eType)))
-            {
-                continue;
-            }
-
-            //Add static meshes that have static transforms to the
-            //static object table.
-            if (eType == eERType_StaticMeshRenderComponent)
-            {
-                if (CObjManager::GetItemId<IStatObj>(pStatObjTable, pObj->GetEntityStatObj(), false) < 0)
-                {
-                    pStatObjTable->push_back(pObj->GetEntityStatObj());
-                }
-            }
-
-            if (eType == eERType_Decal ||
-                eType == eERType_WaterVolume ||
-                eType == eERType_DistanceCloud ||
-                eType == eERType_StaticMeshRenderComponent)
-            {
-                if (CObjManager::GetItemId(pMatTable, pObj->GetMaterial(), false) < 0)
-                {
-                    pMatTable->push_back(pObj->GetMaterial());
-                }
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->GenerateStatObjAndMatTables(pStatObjTable, pMatTable, pStatInstGroupTable, pExportInfo);
-        }
-    }
-}
-
-int COctreeNode::Cmp_OctreeNodeSize(const void* v1, const void* v2)
-{
-    COctreeNode* pNode1 = *((COctreeNode**)v1);
-    COctreeNode* pNode2 = *((COctreeNode**)v2);
-
-    if (pNode1->GetNodeRadius2() > pNode2->GetNodeRadius2())
-    {
-        return +1;
-    }
-    if (pNode1->GetNodeRadius2() < pNode2->GetNodeRadius2())
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-COctreeNode* COctreeNode::FindChildFor([[maybe_unused]] IRenderNode* pObj, [[maybe_unused]] const AABB& objBox, [[maybe_unused]] const float fObjRadius, const Vec3& vObjCenter)
-{
-    int nChildId =
-        ((vObjCenter.x > m_vNodeCenter.x) ? 4 : 0) |
-        ((vObjCenter.y > m_vNodeCenter.y) ? 2 : 0) |
-        ((vObjCenter.z > m_vNodeCenter.z) ? 1 : 0);
-
-    if (!m_arrChilds[nChildId])
-    {
-        m_arrChilds[nChildId] = COctreeNode::Create(m_nSID, GetChildBBox(nChildId), m_pVisArea, this);
-    }
-
-    return m_arrChilds[nChildId];
-}
-
-
-bool COctreeNode::HasChildNodes()
-{
-    if (!m_arrChilds[0] && !m_arrChilds[1] && !m_arrChilds[2] && !m_arrChilds[3])
-    {
-        if (!m_arrChilds[4] && !m_arrChilds[5] && !m_arrChilds[6] && !m_arrChilds[7])
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-int COctreeNode::CountChildNodes()
-{
-    return
-        (m_arrChilds[0] != 0) +
-        (m_arrChilds[1] != 0) +
-        (m_arrChilds[2] != 0) +
-        (m_arrChilds[3] != 0) +
-        (m_arrChilds[4] != 0) +
-        (m_arrChilds[5] != 0) +
-        (m_arrChilds[6] != 0) +
-        (m_arrChilds[7] != 0);
-}
-
-void COctreeNode::ReleaseEmptyNodes()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_arrEmptyNodes.Count())
-    {
-        return;
-    }
-
-    // sort childs first
-    qsort(m_arrEmptyNodes.GetElements(), m_arrEmptyNodes.Count(), sizeof(m_arrEmptyNodes[0]), Cmp_OctreeNodeSize);
-
-    int nInitCount = m_arrEmptyNodes.Count();
-
-    for (int i = 0; i < nInitCount && m_arrEmptyNodes.Count(); i++)
-    {
-        COctreeNode* pNode = m_arrEmptyNodes[0];
-
-        if (pNode && pNode->IsEmpty())
-        {
-            COctreeNode* pParent = pNode->m_pParent;
-
-            // unregister in parent
-            for (int n = 0; n < 8; n++)
-            {
-                if (pParent->m_arrChilds[n] == pNode)
-                {
-                    pParent->m_arrChilds[n] = NULL;
-                }
-            }
-
-            delete pNode;
-
-            // request parent validation
-            if (pParent && pParent->IsEmpty() && m_arrEmptyNodes.Find(pParent) < 0)
-            {
-                m_arrEmptyNodes.Add(pParent);
-            }
-        }
-
-        // remove from list
-        m_arrEmptyNodes.Delete(pNode);
-    }
-}
-
-void COctreeNode::StaticReset()
-{
-    ReleaseEmptyNodes();
-    stl::free_container(m_arrEmptyNodes);
-}
-
-static float Distance_PrecacheCam_AABBSq(const SObjManPrecacheCamera& a, const AABB& b)
-{
-    float d2 = 0.0f;
-
-    if (a.bbox.max.x < b.min.x)
-    {
-        d2 += sqr(b.min.x - a.bbox.max.x);
-    }
-    if (b.max.x < a.bbox.min.x)
-    {
-        d2 += sqr(a.bbox.min.x - b.max.x);
-    }
-    if (a.bbox.max.y < b.min.y)
-    {
-        d2 += sqr(b.min.y - a.bbox.max.y);
-    }
-    if (b.max.y < a.bbox.min.y)
-    {
-        d2 += sqr(a.bbox.min.y - b.max.y);
-    }
-    if (a.bbox.max.z < b.min.z)
-    {
-        d2 += sqr(b.min.z - a.bbox.max.z);
-    }
-    if (b.max.z < a.bbox.min.z)
-    {
-        d2 += sqr(a.bbox.min.z - b.max.z);
-    }
-
-    return d2;
-}
-
-bool COctreeNode::UpdateStreamingPriority(PodArray<COctreeNode*>& arrRecursion, float fMinDist, float fMaxDist, bool bFullUpdate, const SObjManPrecacheCamera* pPrecacheCams, size_t nPrecacheCams, const SRenderingPassInfo& passInfo)
-{
-    //  FUNCTION_PROFILER_3DENGINE;
-
-    // Select the minimum distance to the node
-    float fNodeDistanceSq = Distance_PrecacheCam_AABBSq(pPrecacheCams[0], m_objectsBox);
-    for (size_t iPrecacheCam = 1; iPrecacheCam < nPrecacheCams; ++iPrecacheCam)
-    {
-        float fPcNodeDistanceSq = Distance_PrecacheCam_AABBSq(pPrecacheCams[iPrecacheCam], m_objectsBox);
-        fNodeDistanceSq = min(fNodeDistanceSq, fPcNodeDistanceSq);
-    }
-    float fNodeDistance = sqrt_tpl(fNodeDistanceSq);
-
-    if (passInfo.GetCamera().IsAABBVisible_E(GetNodeBox()))
-    {
-        fNodeDistance *= passInfo.GetZoomFactor();
-    }
-
-    const float fPredictionDistanceFar = GetFloatCVar(e_StreamPredictionDistanceFar);
-
-    if (fNodeDistance > min(m_fObjectsMaxViewDist, fMaxDist) + fPredictionDistanceFar)
-    {
-        return true;
-    }
-
-    AABB objBox;
-
-    const bool bEnablePerNodeDistance = GetCVars()->e_StreamCgfUpdatePerNodeDistance > 0;
-    CVisArea* pRoot0 = GetVisAreaManager() ? GetVisAreaManager()->GetCurVisArea() : NULL;
-
-    float fMinDistSq = fMinDist * fMinDist;
-
-    PREFAST_SUPPRESS_WARNING(6255)
-    float* pfMinVisAreaDistSq = (float*)alloca(sizeof(float) * nPrecacheCams);
-
-    for (size_t iPrecacheCam = 0; iPrecacheCam < nPrecacheCams; ++iPrecacheCam)
-    {
-        float fMinVisAreaDist = 0.0f;
-
-        if (pRoot0)
-        {
-            // search from camera to entity visarea or outdoor
-            AABB aabbCam = pPrecacheCams[iPrecacheCam].bbox;
-            float fResDist = 10000.0f;
-            if (pRoot0->GetDistanceThruVisAreas(aabbCam, m_pVisArea, m_objectsBox, bFullUpdate ? 2 : GetCVars()->e_StreamPredictionMaxVisAreaRecursion, fResDist))
-            {
-                fMinVisAreaDist = fResDist;
-            }
-        }
-        else if (m_pVisArea)
-        {
-            // search from entity to outdoor
-            AABB aabbCam = pPrecacheCams[iPrecacheCam].bbox;
-            float fResDist = 10000.0f;
-            if (m_pVisArea->GetDistanceThruVisAreas(m_objectsBox, NULL, aabbCam, bFullUpdate ? 2 : GetCVars()->e_StreamPredictionMaxVisAreaRecursion, fResDist))
-            {
-                fMinVisAreaDist = fResDist;
-            }
-        }
-
-        pfMinVisAreaDistSq[iPrecacheCam] = fMinVisAreaDist * fMinVisAreaDist;
-    }
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            if (pObj->m_pNext)
-            {
-                cryPrefetchT0SSE(pObj->m_pNext);
-            }
-
-
-            IF (pObj->m_dwRndFlags & ERF_HIDDEN, 0)
-            {
-                continue;
-            }
-
-            pObj->FillBBox(objBox);
-
-            // stream more in zoom mode if in frustum
-            float fZoomFactorSq = passInfo.GetCamera().IsAABBVisible_E(objBox)
-                ? passInfo.GetZoomFactor() * passInfo.GetZoomFactor()
-                : 1.0f;
-
-            for (size_t iPrecacheCam = 0; iPrecacheCam < nPrecacheCams; ++iPrecacheCam)
-            {
-                const Vec3& pcPosition = pPrecacheCams[iPrecacheCam].vPosition;
-
-                float fEntDistanceSq = Distance_PrecacheCam_AABBSq(pPrecacheCams[iPrecacheCam], objBox);
-                fEntDistanceSq = max(fEntDistanceSq, fMinDistSq);
-                fEntDistanceSq *= fZoomFactorSq;
-                fEntDistanceSq = max(fEntDistanceSq, pfMinVisAreaDistSq[iPrecacheCam]);
-
-                float fMaxDistComb = min(pObj->m_fWSMaxViewDist, fMaxDist) + fPredictionDistanceFar;
-                float fMaxDistCombSq = fMaxDistComb * fMaxDistComb;
-
-                if (/*fMinDistSq <= fEntDistanceSq &&*/ fEntDistanceSq < fMaxDistCombSq)
-                {
-                    float fEntDistance = sqrt_tpl(fEntDistanceSq);
-                    assert(fEntDistance >= 0 && _finite(fEntDistance));
-
-                    float fDist = fEntDistance;
-                    if (!bFullUpdate && fEntDistance < fNodeDistance && bEnablePerNodeDistance)
-                    {
-                        fDist = fNodeDistance;
-                    }
-
-                    // If we're inside the object, very close, or facing the object, set importance scale to 1.0f. Otherwise, 0.8f.
-                    float fImportanceScale = (float)fsel(
-                            4.0f - fEntDistance,
-                            1.0f,
-                            (float)fsel(
-                                (objBox.GetCenter() - pcPosition).Dot(pPrecacheCams[iPrecacheCam].vDirection),
-                                1.0f,
-                                0.8f));
-
-                    // I replaced fEntDistance with fNoideDistance here because of Timur request! It's suppose to be unified to-node-distance
-                    GetObjManager()->UpdateRenderNodeStreamingPriority(pObj, fDist, fImportanceScale, bFullUpdate, passInfo);
-                }
-            }
-        }
-    }
-
-    // Prioritise the first camera (probably the real camera)
-    int nFirst =
-        ((pPrecacheCams[0].vPosition.x > m_vNodeCenter.x) ? 4 : 0) |
-        ((pPrecacheCams[0].vPosition.y > m_vNodeCenter.y) ? 2 : 0) |
-        ((pPrecacheCams[0].vPosition.z > m_vNodeCenter.z) ? 1 : 0);
-
-    if (m_arrChilds[nFirst  ])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst  ]);
-    }
-
-    if (m_arrChilds[nFirst ^ 1])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst ^ 1]);
-    }
-
-    if (m_arrChilds[nFirst ^ 2])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst ^ 2]);
-    }
-
-    if (m_arrChilds[nFirst ^ 4])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst ^ 4]);
-    }
-
-    if (m_arrChilds[nFirst ^ 3])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst ^ 3]);
-    }
-
-    if (m_arrChilds[nFirst ^ 5])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst ^ 5]);
-    }
-
-    if (m_arrChilds[nFirst ^ 6])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst ^ 6]);
-    }
-
-    if (m_arrChilds[nFirst ^ 7])
-    {
-        arrRecursion.Add(m_arrChilds[nFirst ^ 7]);
-    }
-
-    return true;
-}
-
-int COctreeNode::Load(AZ::IO::HandleType& fileHandle, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, EEndian eEndian, AABB* pBox, const SLayerVisibility* pLayerVisibilityMask)
-{
-    return Load_T(fileHandle, nDataSize, pStatObjTable, pMatTable, eEndian, pBox, pLayerVisibilityMask);
-}
-int COctreeNode::Load(uint8*& f, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, EEndian eEndian, AABB* pBox, const SLayerVisibility* pLayerVisibilityMask)
-{
-    return Load_T(f, nDataSize, pStatObjTable, pMatTable, eEndian, pBox, pLayerVisibilityMask);
-}
-
-template <class T>
-int COctreeNode::Load_T(T& f, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, EEndian eEndian, AABB* pBox, const SLayerVisibility* pLayerVisibilityMask)
-{
-    if (pBox && !Overlap::AABB_AABB(GetNodeBox(), *pBox))
-    {
-        return 0;
-    }
-
-    SOcTreeNodeChunk chunk;
-    if (!PakLoadDataUtils::LoadDataFromFile(&chunk, 1, f, nDataSize, eEndian))
-    {
-        return 0;
-    }
-
-    assert(chunk.nChunkVersion == OCTREENODE_CHUNK_VERSION || chunk.nChunkVersion == OCTREENODE_CHUNK_VERSION_OLD);
-    if (chunk.nChunkVersion != OCTREENODE_CHUNK_VERSION && chunk.nChunkVersion != OCTREENODE_CHUNK_VERSION_OLD)
-    {
-        return 0;
-    }
-
-    if (chunk.nObjectsBlockSize)
-    {
-        // load objects data into memory buffer, make sure buffer is aligned
-
-        auto pMemBlock = gEnv->pCryPak->PoolAllocMemoryBlock(chunk.nObjectsBlockSize + 8, "LoadObjectInstances");
-        byte* pPtr = (byte*)pMemBlock->m_address.get();
-
-        while (UINT_PTR(pPtr) & 3)
-        {
-            pPtr++;
-        }
-
-        if (!PakLoadDataUtils::LoadDataFromFile(pPtr, chunk.nObjectsBlockSize, f, nDataSize, eEndian))
-        {
-            return 0;
-        }
-
-        if (!m_bEditor)
-        {
-            LoadObjects(pPtr, pPtr + chunk.nObjectsBlockSize, pStatObjTable, pMatTable, eEndian, chunk.nChunkVersion, pLayerVisibilityMask);
-        }
-    }
-
-    // count number of nodes loaded
-    int nNodesNum = 1;
-
-    // process childs
-    for (int nChildId = 0; nChildId < 8; nChildId++)
-    {
-        if (chunk.ucChildsMask & (1 << nChildId))
-        {
-            if (!m_arrChilds[nChildId])
-            {
-                m_arrChilds[nChildId] = COctreeNode::Create(m_nSID, GetChildBBox(nChildId), m_pVisArea, this);
-            }
-
-            int nNewNodesNum = m_arrChilds[nChildId]->Load_T(f, nDataSize, pStatObjTable, pMatTable, eEndian, pBox, pLayerVisibilityMask);
-
-            if (!nNewNodesNum && !pBox)
-            {
-                return 0; // data error
-            }
-            nNodesNum += nNewNodesNum;
-        }
-    }
-
-    return nNodesNum;
-}
-
-
-
-
-
-#if ENGINE_ENABLE_COMPILATION
-int COctreeNode::GetData(byte*& pData, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo)
-{
-    AABB* pBox = (pExportInfo && !pExportInfo->areaBox.IsReset()) ? &pExportInfo->areaBox : NULL;
-
-    const AABB& nodeBox = GetNodeBox();
-    if (pBox && !Overlap::AABB_AABB(nodeBox, *pBox))
-    {
-        return 0;
-    }
-
-    if (pData)
-    {
-        // get node data
-        SOcTreeNodeChunk chunk;
-        chunk.nChunkVersion = OCTREENODE_CHUNK_VERSION;
-        chunk.nodeBox = nodeBox;
-
-        // fill ChildsMask
-        chunk.ucChildsMask = 0;
-        for (int i = 0; i < 8; i++)
-        {
-            if (m_arrChilds[i])
-            {
-                chunk.ucChildsMask |= (1 << i);
-            }
-        }
-
-        CMemoryBlock memblock;
-        SaveObjects(&memblock, pStatObjTable, pMatTable, pStatInstGroupTable, eEndian, pExportInfo);
-
-        chunk.nObjectsBlockSize = memblock.GetSize();
-
-        AddToPtr(pData, nDataSize, chunk, eEndian);
-
-        AddToPtr(pData, nDataSize, (byte*)memblock.GetData(), memblock.GetSize(), eEndian);
-    }
-    else // just count size
-    {
-        nDataSize += sizeof(SOcTreeNodeChunk);
-        nDataSize += SaveObjects(NULL, NULL, NULL, NULL, eEndian, pExportInfo);
-    }
-
-    // count number of nodes loaded
-    int nNodesNum = 1;
-
-    // process childs
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            nNodesNum += m_arrChilds[i]->GetData(pData, nDataSize, pStatObjTable, pMatTable, pStatInstGroupTable, eEndian, pExportInfo);
-        }
-    }
-
-    return nNodesNum;
-}
-#endif
-
-bool COctreeNode::CleanUpTree()
-{
-    bool bChildObjectsFound = false;
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            if (!m_arrChilds[i]->CleanUpTree())
-            {
-                delete m_arrChilds[i];
-                m_arrChilds[i] = NULL;
-            }
-            else
-            {
-                bChildObjectsFound = true;
-            }
-        }
-    }
-
-    // update max view distances
-
-    m_fObjectsMaxViewDist = 0.f;
-    m_objectsBox = GetNodeBox();
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            pObj->m_fWSMaxViewDist = pObj->GetMaxViewDist();
-            m_fObjectsMaxViewDist = max(m_fObjectsMaxViewDist, pObj->m_fWSMaxViewDist);
-            m_objectsBox.Add(pObj->GetBBox());
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_fObjectsMaxViewDist = max(m_fObjectsMaxViewDist, m_arrChilds[i]->m_fObjectsMaxViewDist);
-            m_objectsBox.Add(m_arrChilds[i]->m_objectsBox);
-        }
-    }
-
-    return (bChildObjectsFound || HasObjects());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool COctreeNode::CheckRenderFlagsMinSpec(uint32 dwRndFlags)
-{
-    int nRenderNodeMinSpec = (dwRndFlags & ERF_SPEC_BITS_MASK) >> ERF_SPEC_BITS_SHIFT;
-    return CheckMinSpec(nRenderNodeMinSpec);
-}
-
-void COctreeNode::OffsetObjects(const Vec3& offset)
-{
-    CompileObjects();
-    m_objectsBox.Move(offset);
-    m_vNodeCenter += offset;
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            pObj->OffsetPosition(offset);
-        }
-    }
-    for (int i = 0; i < 8; ++i)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->OffsetObjects(offset);
-        }
-    }
-}
-
-bool COctreeNode::HasAnyRenderableCandidates(const SRenderingPassInfo& passInfo) const
-{
-    // This checks if anything will be rendered, assuming we pass occlusion checks
-    // This is based on COctreeNode::RenderContentJobEntry's implementation,
-    // if that would do nothing, we can skip the running of occlusion and rendering jobs for this node
-    const bool bDecalsAndRoads = passInfo.RenderDecals() && m_arrObjects[eRNListType_DecalsAndRoads].m_pFirstNode != NULL;
-    const bool bUnknown = m_arrObjects[eRNListType_Unknown].m_pFirstNode != NULL;
-    return bDecalsAndRoads || bUnknown;
-}
diff --git a/Code/CryEngine/Cry3DEngine/ObjectsTree.h b/Code/CryEngine/Cry3DEngine/ObjectsTree.h
deleted file mode 100644
index 2a2260c010..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjectsTree.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_OBJECTSTREE_H
-#define CRYINCLUDE_CRY3DENGINE_OBJECTSTREE_H
-#pragma once
-
-#define OCTREENODE_RENDER_FLAG_OBJECTS      1
-#define OCTREENODE_RENDER_FLAG_OCCLUDERS    2
-#define OCTREENODE_RENDER_FLAG_CASTERS      4
-#define OCTREENODE_RENDER_FLAG_OBJECTS_ONLY_ENTITIES 8
-
-#define OCTREENODE_CHUNK_VERSION_OLD 3
-#define OCTREENODE_CHUNK_VERSION 5
-
-#include <AzCore/Casting/numeric_cast.h>
-#include <CryCommon/stl/STLAlignedAlloc.h>
-
-class COctreeNode;
-template <class T, size_t overAllocBytes>
-class PodArray;
-struct CLightEntity;
-struct ILightSource;
-///////////////////////////////////////////////////////////////////////////////
-// data to be pushed to occlusion culler
-_MS_ALIGN(16) struct SCheckOcclusionJobData
-{
-    enum JobTypeT
-    {
-        QUIT, 
-        OCTREE_NODE, 
-    };
-
-    SCheckOcclusionJobData() {}
-
-    static SCheckOcclusionJobData CreateQuitJobData();
-    static SCheckOcclusionJobData CreateOctreeJobData(COctreeNode* pOctTreeNode, int nRenderMask, const SRendItemSorter& rendItemSorter, const CCamera* pCam);
-
-    JobTypeT type; // type to indicate with which data the union is filled
-    union
-    {
-        // data for octree nodes
-        struct
-        {
-            COctreeNode*    pOctTreeNode;
-            int                     nRenderMask;
-        } octTreeData;
-
-        // data for terrain nodes
-        struct
-        {
-            float                   vAABBMin[3];
-            float                   vAABBMax[3];
-            float                   fDistance;
-        } terrainData;
-    };
-    // common data
-    SRendItemSorter rendItemSorter; // ensure order octree traversal oder even with parallel execution
-    const CCamera*  pCam;                       // store camera to handle vis areas correctly
-} _ALIGN(16);
-
-///////////////////////////////////////////////////////////////////////////////
-inline SCheckOcclusionJobData SCheckOcclusionJobData::CreateQuitJobData()
-{
-    SCheckOcclusionJobData jobData;
-    jobData.type = QUIT;
-    return jobData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-inline SCheckOcclusionJobData SCheckOcclusionJobData::CreateOctreeJobData(COctreeNode* pOctTreeNode, int nRenderMask, const SRendItemSorter& rendItemSorter, const CCamera* pCam)
-{
-    SCheckOcclusionJobData jobData;
-    jobData.type                    = OCTREE_NODE;
-    jobData.octTreeData.pOctTreeNode    = pOctTreeNode;
-    jobData.octTreeData.nRenderMask     = nRenderMask;
-    jobData.rendItemSorter = rendItemSorter;
-    jobData.pCam = pCam;
-    return jobData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// data written by occlusion culler jobs, to control main thread 3dengine side rendering
-_MS_ALIGN(16) struct SCheckOcclusionOutput
-{
-    enum JobTypeT
-    {
-        ROAD_DECALS, 
-        COMMON, 
-    };
-
-    static SCheckOcclusionOutput CreateDecalsAndRoadsOutput(IRenderNode* pObj, const AABB& rObjBox, float fEntDistance, bool bCheckPerObjectOcclusion, const SRendItemSorter& rendItemSorter);
-    static SCheckOcclusionOutput CreateCommonObjectOutput(IRenderNode* pObj, const AABB& rObjBox, float fEntDistance, SSectorTextureSet* pTerrainTexInfo, const SRendItemSorter& rendItemSorter);
-
-    JobTypeT            type;
-    union
-    {
-        //ROAD_DECALS,COMMON Data
-        struct
-        {
-            IRenderNode*                pObj;
-            SSectorTextureSet*  pTerrainTexInfo;
-            float                               fEntDistance;
-            bool                                bCheckPerObjectOcclusion;
-        } common;
-    };
-
-    AABB                                objBox;
-    SRendItemSorter rendItemSorter;
-} _ALIGN(16);
-
-///////////////////////////////////////////////////////////////////////////////
-inline SCheckOcclusionOutput SCheckOcclusionOutput::CreateDecalsAndRoadsOutput(IRenderNode* pObj, const AABB& rObjBox, float fEntDistance, bool bCheckPerObjectOcclusion, const SRendItemSorter& rendItemSorter)
-{
-    SCheckOcclusionOutput outputData;
-    outputData.type                                         = ROAD_DECALS;
-    outputData.rendItemSorter                       = rendItemSorter;
-    outputData.objBox                                       = rObjBox;
-
-    outputData.common.pObj                                      = pObj;
-    outputData.common.pTerrainTexInfo                   = NULL;
-    outputData.common.fEntDistance                      = fEntDistance;
-    outputData.common.bCheckPerObjectOcclusion = bCheckPerObjectOcclusion;
-
-    return outputData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-inline SCheckOcclusionOutput SCheckOcclusionOutput::CreateCommonObjectOutput(IRenderNode* pObj, const AABB& rObjBox, float fEntDistance, SSectorTextureSet* pTerrainTexInfo, const SRendItemSorter& rendItemSorter)
-{
-    SCheckOcclusionOutput outputData;
-    outputData.type                                         = COMMON;
-    outputData.rendItemSorter                       = rendItemSorter;
-    outputData.objBox                                       = rObjBox;
-
-    outputData.common.pObj                                      = pObj;
-    outputData.common.fEntDistance                      = fEntDistance;
-    outputData.common.pTerrainTexInfo                   = pTerrainTexInfo;
-
-    return outputData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-enum EOcTeeNodeListType
-{
-    eMain,
-    eCasters,
-    eSprites_deprecated,
-    eLights,
-};
-
-template <class T>
-struct TDoublyLinkedList
-{
-    T* m_pFirstNode, * m_pLastNode;
-
-    TDoublyLinkedList()
-    {
-        m_pFirstNode = m_pLastNode = NULL;
-    }
-
-    ~TDoublyLinkedList()
-    {
-        assert(!m_pFirstNode && !m_pLastNode);
-    }
-
-    void insertAfter(T* pAfter, T* pObj)
-    {
-        pObj->m_pPrev = pAfter;
-        pObj->m_pNext = pAfter->m_pNext;
-        if (pAfter->m_pNext == NULL)
-        {
-            m_pLastNode = pObj;
-        }
-        else
-        {
-            pAfter->m_pNext->m_pPrev = pObj;
-        }
-        pAfter->m_pNext = pObj;
-    }
-
-    void insertBefore(T* pBefore, T* pObj)
-    {
-        pObj->m_pPrev = pBefore->m_pPrev;
-        pObj->m_pNext = pBefore;
-        if (pBefore->m_pPrev == NULL)
-        {
-            m_pFirstNode = pObj;
-        }
-        else
-        {
-            pBefore->m_pPrev->m_pNext = pObj;
-        }
-        pBefore->m_pPrev    = pObj;
-    }
-
-    void insertBeginning(T* pObj)
-    {
-        if (m_pFirstNode == NULL)
-        {
-            m_pFirstNode = pObj;
-            m_pLastNode  = pObj;
-            pObj->m_pPrev = NULL;
-            pObj->m_pNext = NULL;
-        }
-        else
-        {
-            insertBefore(m_pFirstNode, pObj);
-        }
-    }
-
-    void insertEnd(T* pObj)
-    {
-        if (m_pLastNode == NULL)
-        {
-            insertBeginning(pObj);
-        }
-        else
-        {
-            insertAfter(m_pLastNode, pObj);
-        }
-    }
-
-    void remove(T* pObj)
-    {
-        if (pObj->m_pPrev == NULL)
-        {
-            m_pFirstNode = pObj->m_pNext;
-        }
-        else
-        {
-            pObj->m_pPrev->m_pNext = pObj->m_pNext;
-        }
-
-        if (pObj->m_pNext == NULL)
-        {
-            m_pLastNode = pObj->m_pPrev;
-        }
-        else
-        {
-            pObj->m_pNext->m_pPrev = pObj->m_pPrev;
-        }
-
-        pObj->m_pPrev = pObj->m_pNext = NULL;
-    }
-
-    bool empty() const { return m_pFirstNode == NULL; }
-};
-
-struct SInstancingInfo
-{
-    SInstancingInfo() { pStatInstGroup = 0; aabb.Reset(); fMinSpriteDistance = 10000.f; bInstancingInUse = 0; }
-    StatInstGroup* pStatInstGroup;
-    DynArray<CVegetation*> arrInstances;
-    stl::aligned_vector<CRenderObject::SInstanceData, 16> arrMats;
-    AABB aabb;
-    float fMinSpriteDistance;
-    bool bInstancingInUse;
-};
-
-struct SLayerVisibility
-{
-    const uint8* pLayerVisibilityMask;
-    const uint16* pLayerIdTranslation;
-};
-
-struct SOctreeLoadObjectsData
-{
-    COctreeNode* pNode;
-    ptrdiff_t offset;
-    size_t size;
-    _smart_ptr<IMemoryBlock> pMemBlock;
-    byte* pObjPtr;
-    byte* pEndObjPtr;
-};
-
-class COctreeNode
-    : Cry3DEngineBase
-    , public IOctreeNode
-{
-public:
-
-    struct ShadowMapFrustumParams
-    {
-        CDLight* pLight;
-        struct ShadowMapFrustum* pFr;
-        PodArray<SPlaneObject>* pShadowHull;
-        const SRenderingPassInfo* passInfo;
-        Vec3 vCamPos;
-        uint32 nRenderNodeFlags;
-        bool bSun;
-    };
-
-    ~COctreeNode();
-
-    bool HasChildNodes();
-    int CountChildNodes();
-    void InsertObject(IRenderNode* pObj, const AABB& objBox, const float fObjRadiusSqr, const Vec3& vObjCenter);
-    bool DeleteObject(IRenderNode* pObj);
-    void Render_Object_Nodes(bool bNodeCompletelyInFrustum, int nRenderMask, const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter);
-
-    static void Shutdown();
-    static void WaitForContentJobCompletion();
-    void RenderContent(int nRenderMask, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, const CCamera* pCam);
-    void RenderContentJobEntry(int nRenderMask, const SRenderingPassInfo& passInfo, SRendItemSorter rendItemSorter, const CCamera* pCam);
-    void RenderCommonObjects(TDoublyLinkedList<IRenderNode>* lstObjects, const CCamera& rCam, int nRenderMask, bool bNodeCompletelyInFrustum, SSectorTextureSet* pTerrainTexInfo, const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter);
-    void RenderDecalsAndRoads(TDoublyLinkedList<IRenderNode>* lstObjects, const CCamera& rCam, int nRenderMask, bool bNodeCompletelyInFrustum, SSectorTextureSet* pTerrainTexInfo, const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter);
-
-    void FillShadowCastersList(bool bNodeCompletellyInFrustum, CDLight* pLight, struct ShadowMapFrustum* pFr, PodArray<SPlaneObject>* pShadowHull, uint32 nRenderNodeFlags, const SRenderingPassInfo& passInfo);
-    void FillShadowMapCastersList(const ShadowMapFrustumParams& params, bool bNodeCompletellyInFrustum);
-    void FillDepthCubemapRenderList(const AABB& cubemapAABB, const SRenderingPassInfo& passInfo, PodArray<struct IShadowCaster*>* objectsList);
-    void ActivateObjectsLayer(uint16 nLayerId, bool bActivate, bool bPhys, IGeneralMemoryHeap* pHeap);
-    void GetLayerMemoryUsage(uint16 nLayerId, ICrySizer* pSizer, int* pNumBrushes, int* pNumDecals);
-
-    COctreeNode* FindNodeContainingBox(const AABB& objBox);
-    void MoveObjectsIntoList(PodArray<SRNInfo>* plstResultEntities, const AABB* pAreaBox, bool bRemoveObjects = false, bool bSkipDecals = false, bool bSkip_ERF_NO_DECALNODE_DECALS = false, bool bSkipDynamicObjects = false, EERType eRNType = eERType_TypesNum);
-
-# if ENGINE_ENABLE_COMPILATION
-    int GetData(byte*& pData, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo);
-# endif
-
-    const AABB& GetObjectsBBox() { return m_objectsBox; }
-    AABB GetShadowCastersBox(const AABB* pBBox, const Matrix34* pShadowSpaceTransform);
-    void DeleteObjectsByFlag(int nRndFlag);
-    void UnregisterEngineObjectsInArea(const SHotUpdateInfo* pExportInfo, PodArray<IRenderNode*>& arrUnregisteredObjects, bool bOnlyEngineObjects);
-    uint32 GetLastVisFrameId() { return m_nLastVisFrameId; }
-    void GetObjectsByType(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback = nullptr) override;
-    void GetObjectsByFlags(uint dwFlags, PodArray<IRenderNode*>& lstObjects);
-
-    void GetNearestCubeProbe(float& fMinDistance, int& nMaxPriority, CLightEntity*& pNearestLight, const AABB* pBBox);
-    void GetObjects(PodArray<IRenderNode*>& lstObjects, const AABB* pBBox);
-    bool GetShadowCastersTimeSliced(IRenderNode* pIgnoreNode, ShadowMapFrustum* pFrustum, int renderNodeExcludeFlags, int& totalRemainingNodes, int nCurLevel, const SRenderingPassInfo& passInfo);
-    bool IsObjectTypeInTheBox(EERType objType, const AABB& WSBBox);
-    bool CleanUpTree();
-    int GetObjectsCount(EOcTeeNodeListType eListType);
-    int    SaveObjects(class CMemoryBlock* pMemBlock, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, const SHotUpdateInfo * pExportInfo);
-    int    LoadObjects(byte* pPtr, byte* pEndPtr, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, int nChunkVersion, const SLayerVisibility* pLayerVisibility);
-    static int  GetSingleObjectSize (IRenderNode* pObj, const SHotUpdateInfo* pExportInfo);
-    static void SaveSingleObject (byte*& pPtr, int& nDatanSize, IRenderNode* pObj, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, const SHotUpdateInfo* pExportInfo);
-    static void LoadSingleObject(byte*& pPtr, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, int nChunkVersion, const SLayerVisibility* pLayerVisibility, int nSID);
-    bool IsRightNode(const AABB& objBox, const float fObjRadius, float fObjMaxViewDist);
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-    bool RayObjectsIntersection2D(Vec3 vStart, Vec3 vEnd, Vec3& vClosestHitPoint, float& fClosestHitDistance, EERType eERType);
-#endif
-
-    template <class T>
-    int Load_T(T& f, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, AABB* pBox, const SLayerVisibility* pLayerVisibility);
-    int Load(AZ::IO::HandleType& fileHandle, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, AABB* pBox, const SLayerVisibility* pLayerVisibility);
-    int Load(uint8*& f, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, AABB* pBox, const SLayerVisibility* pLayerVisibility);
-
-    void GenerateStatObjAndMatTables(std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, SHotUpdateInfo* pExportInfo);
-    static void ReleaseEmptyNodes();
-    static void StaticReset();
-    bool IsEmpty();
-    bool HasObjects();
-
-    bool UpdateStreamingPriority(PodArray<COctreeNode*>& arrRecursion, float fMinDist, float fMaxDist, bool bFullUpdate, const SObjManPrecacheCamera* pPrecacheCams, size_t nPrecacheCams, const SRenderingPassInfo& passInfo);
-    AABB GetNodeBox() const
-    {
-        return AABB(
-            m_vNodeCenter - m_vNodeAxisRadius,
-            m_vNodeCenter + m_vNodeAxisRadius);
-    }
-
-    void OffsetObjects(const Vec3& offset);
-    void SetVisArea(CVisArea* pVisArea);
-    void UpdateVisAreaSID([[maybe_unused]] CVisArea* pVisArea, int nSID)
-    {
-        assert(pVisArea);
-        m_nSID = nSID;
-    }
-
-    static COctreeNode* Create(int nSID, const AABB& box, struct CVisArea* pVisArea, COctreeNode* pParent = NULL);
-
-protected:
-    AABB GetChildBBox(int nChildId);
-    void CompileObjects();
-    void UpdateObjects(IRenderNode* pObj);
-    void CompileObjectsBrightness();
-    float GetNodeObjectsMaxViewDistance();
-
-    // Check if min spec specified in render node passes current server config spec.
-    static bool CheckRenderFlagsMinSpec(uint32 dwRndFlags);
-
-    void LinkObject(IRenderNode* pObj, EERType eERType, bool bPushFront = true);
-    void UnlinkObject(IRenderNode* pObj);
-
-    static int Cmp_OctreeNodeSize(const void* v1, const void* v2);
-
-private:
-    COctreeNode(int nSID, const AABB& box, struct CVisArea* pVisArea, COctreeNode* pParent);
-
-    float GetNodeRadius2() const { return m_vNodeAxisRadius.Dot(m_vNodeAxisRadius); }
-    COctreeNode* FindChildFor(IRenderNode* pObj, const AABB& objBox, const float fObjRadius, const Vec3& vObjCenter);
-    bool HasAnyRenderableCandidates(const SRenderingPassInfo& passInfo) const;
-
-    uint32 m_nOccludedFrameId;
-    uint32 m_renderFlags;
-    uint32 m_errTypesBitField;
-    AABB m_objectsBox;
-    float m_fObjectsMaxViewDist;
-    uint32 m_nLastVisFrameId;
-
-    COctreeNode* m_arrChilds[8];
-    TDoublyLinkedList<IRenderNode> m_arrObjects[eRNListType_ListsNum];
-    PodArray<SCasterInfo> m_lstCasters;
-    Vec3 m_vNodeCenter;
-    Vec3 m_vNodeAxisRadius;
-    COctreeNode* m_pParent;
-    uint32 nFillShadowCastersSkipFrameId;
-    float m_fNodeDistance;
-    int m_nManageVegetationsFrameId;
-    int m_nSID;
-    struct CRNTmpData* m_pRNTmpData;
-
-    uint32 m_bHasLights : 1;
-    uint32 m_bNodeCompletelyInFrustum : 1;
-    uint32 m_fpSunDirX : 7;
-    uint32 m_fpSunDirZ : 7;
-    uint32 m_fpSunDirYs : 1;
-    uint32 m_bStaticInstancingIsDirty : 1;
-
-    struct SNodeInstancingInfo
-    {
-        SNodeInstancingInfo() { pRNode = 0; nodeMatrix.IsIdentity(); }
-        Matrix34 nodeMatrix;
-        class CVegetation * pRNode;
-    };
-    std::map<std::pair<IStatObj*, _smart_ptr<IMaterial>>, PodArray<SNodeInstancingInfo>*> * m_pStaticInstancingInfo;
-
-    static void* m_pRenderContentJobQueue;
-    static bool m_removeVegetationCastersOneByOne;
-
-public:
-    static PodArray<COctreeNode*> m_arrEmptyNodes;
-};
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_OBJECTSTREE_H
diff --git a/Code/CryEngine/Cry3DEngine/ObjectsTree_Jobs.cpp b/Code/CryEngine/Cry3DEngine/ObjectsTree_Jobs.cpp
deleted file mode 100644
index 8c10083afd..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjectsTree_Jobs.cpp
+++ /dev/null
@@ -1,1433 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Octree parts used on Jobs to prevent scanning too many files for micro functions
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "CullBuffer.h"
-#include "3dEngine.h"
-#include "IndexedMesh.h"
-#include "ObjectsTree.h"
-
-#include "DecalRenderNode.h"
-#include "FogVolumeRenderNode.h"
-#include "Ocean.h"
-#include "LightEntity.h"
-#include "WaterVolumeRenderNode.h"
-#include "DistanceCloudRenderNode.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-#define CHECK_OBJECTS_BOX_WARNING_SIZE (1.0e+10f)
-#define fNodeMinSize (8.f)
-#define fObjectToNodeSizeRatio (1.f / 8.f)
-#define fMinShadowCasterViewDist (8.f)
-
-namespace LegacyInternal
-{
-    // File scoped LegacyJobExecutor instance used to run all RenderContent jobs
-    static AZ::LegacyJobExecutor* s_renderContentJobExecutor;
-};
-
-//////////////////////////////////////////////////////////////////////////
-COctreeNode::COctreeNode(int nSID, const AABB& box, CVisArea* pVisArea, COctreeNode* pParent)
-    : m_nOccludedFrameId(0), m_renderFlags(0), m_errTypesBitField(0), m_fObjectsMaxViewDist(0.0f), m_nLastVisFrameId(0)
-    , nFillShadowCastersSkipFrameId(0), m_fNodeDistance(0.0f), m_nManageVegetationsFrameId(0)
-    , m_bHasLights(0), m_bNodeCompletelyInFrustum(0)
-{
-    memset(m_arrChilds, 0, sizeof(m_arrChilds));
-    memset(m_arrObjects, 0, sizeof(m_arrObjects));
-    memset(&m_lstCasters, 0, sizeof(m_lstCasters));
-
-    m_pRNTmpData = NULL;
-    m_nSID = nSID;
-    m_vNodeCenter = box.GetCenter();
-    m_vNodeAxisRadius = box.GetSize() * 0.5f;
-    m_objectsBox.min = box.max;
-    m_objectsBox.max = box.min;
-
-#if !defined(_RELEASE)
-    // Check if bounding box is crazy
-#define CHECK_OBJECTS_BOX_WARNING_SIZE (1.0e+10f)
-    if (GetCVars()->e_CheckOctreeObjectsBoxSize != 0) // pParent is checked as silly sized things are added to the root (e.g. the sun)
-    {
-        if (pParent && !m_objectsBox.IsReset() && (m_objectsBox.min.len() > CHECK_OBJECTS_BOX_WARNING_SIZE || m_objectsBox.max.len() > CHECK_OBJECTS_BOX_WARNING_SIZE))
-        {
-            CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR_DBGBRK, "COctreeNode being created with a huge m_objectsBox: [%f %f %f] -> [%f %f %f]\n", m_objectsBox.min.x, m_objectsBox.min.y, m_objectsBox.min.z, m_objectsBox.max.x, m_objectsBox.max.y, m_objectsBox.max.z);
-        }
-    }
-#endif
-
-    m_pVisArea = pVisArea;
-    m_pParent = pParent;
-
-    m_fpSunDirX = 63;
-    m_fpSunDirZ = 0;
-    m_fpSunDirYs = 0;
-
-    m_pStaticInstancingInfo = nullptr;
-    m_bStaticInstancingIsDirty = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-COctreeNode* COctreeNode::Create(int nSID, const AABB& box, struct CVisArea* pVisArea, COctreeNode* pParent)
-{
-    return new COctreeNode(nSID, box, pVisArea, pParent);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool COctreeNode::HasObjects()
-{
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        if (m_arrObjects[l].m_pFirstNode)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void COctreeNode::RenderContent(int nRenderMask, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, const CCamera* pCam)
-{
-    if (GetCVars()->e_StatObjBufferRenderTasks == 1 && passInfo.IsGeneralPass())
-    {
-        GetObjManager()->AddCullJobProducer();
-    }
-
-    if (!LegacyInternal::s_renderContentJobExecutor)
-    {
-        LegacyInternal::s_renderContentJobExecutor = new AZ::LegacyJobExecutor;
-    }
-
-    LegacyInternal::s_renderContentJobExecutor->StartJob(
-        [this, nRenderMask, passInfo, rendItemSorter, pCam]
-        {
-            this->RenderContentJobEntry(nRenderMask, passInfo, rendItemSorter, pCam);
-        }
-    );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void COctreeNode::Shutdown()
-{
-    WaitForContentJobCompletion();
-}
-
-void COctreeNode::WaitForContentJobCompletion()
-{
-    //Deleting it calls WaitForCompletion(), and the next call to RenderContent() will create a new instance
-    delete LegacyInternal::s_renderContentJobExecutor;
-    LegacyInternal::s_renderContentJobExecutor = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void COctreeNode::RenderContentJobEntry(int nRenderMask, const SRenderingPassInfo& passInfo, SRendItemSorter rendItemSorter, const CCamera* pCam)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ThreeDEngine);
-
-    SSectorTextureSet* pTerrainTexInfo = NULL;
-
-    if (m_arrObjects[eRNListType_DecalsAndRoads].m_pFirstNode && (passInfo.RenderDecals()))
-    {
-        RenderDecalsAndRoads(&m_arrObjects[eRNListType_DecalsAndRoads], *pCam, nRenderMask, m_bNodeCompletelyInFrustum != 0, pTerrainTexInfo, passInfo, rendItemSorter);
-    }
-
-    if (m_arrObjects[eRNListType_Unknown].m_pFirstNode)
-    {
-        RenderCommonObjects(&m_arrObjects[eRNListType_Unknown], *pCam, nRenderMask, m_bNodeCompletelyInFrustum != 0, pTerrainTexInfo, passInfo, rendItemSorter);
-    }
-
-    if (GetCVars()->e_StatObjBufferRenderTasks == 1 && passInfo.IsGeneralPass())
-    {
-        GetObjManager()->RemoveCullJobProducer();
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void COctreeNode::RenderDecalsAndRoads(TDoublyLinkedList<IRenderNode>* lstObjects, const CCamera& rCam, [[maybe_unused]] int nRenderMask, bool bNodeCompletelyInFrustum, [[maybe_unused]] SSectorTextureSet* pTerrainTexInfo, const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    CVars* pCVars = GetCVars();
-    AABB objBox;
-    const Vec3 vCamPos = rCam.GetPosition();
-
-    bool bCheckPerObjectOcclusion = true;
-
-    for (IRenderNode* pObj = lstObjects->m_pFirstNode, * pNext; pObj; pObj = pNext)
-    {
-        rendItemSorter.IncreaseObjectCounter();
-        pNext = pObj->m_pNext;
-
-        if (pObj->m_pNext)
-        {
-            cryPrefetchT0SSE(pObj->m_pNext);
-        }
-
-        IF (pObj->m_dwRndFlags & ERF_HIDDEN, 0)
-        {
-            continue;
-        }
-
-        pObj->FillBBox(objBox);
-
-        if (bNodeCompletelyInFrustum || rCam.IsAABBVisible_FM(objBox))
-        {
-            float fEntDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, objBox)) * passInfo.GetZoomFactor();
-            assert(fEntDistance >= 0 && _finite(fEntDistance));
-            if (fEntDistance < pObj->m_fWSMaxViewDist)
-            {
-#if !defined(_RELEASE)
-                EERType rnType = pObj->GetRenderNodeType();
-                if (!passInfo.RenderDecals() && rnType == eERType_Decal)
-                {
-                    continue;
-                }
-#endif // _RELEASE
-
-                if (pCVars->e_StatObjBufferRenderTasks == 1 && passInfo.IsGeneralPass())
-                {
-                    // if object is visible, write to output queue for main thread processing
-                    if (GetObjManager()->CheckOcclusion_TestAABB(objBox, fEntDistance))
-                    {
-                        GetObjManager()->PushIntoCullOutputQueue(SCheckOcclusionOutput::CreateDecalsAndRoadsOutput(pObj, objBox, fEntDistance, bCheckPerObjectOcclusion, rendItemSorter));
-                    }
-                }
-                else
-                {
-                    GetObjManager()->RenderDecalAndRoad(pObj, objBox, fEntDistance, bCheckPerObjectOcclusion, passInfo, rendItemSorter);
-                }
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void COctreeNode::RenderCommonObjects(TDoublyLinkedList<IRenderNode>* lstObjects, const CCamera& rCam, int nRenderMask, bool bNodeCompletelyInFrustum, SSectorTextureSet* pTerrainTexInfo, const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    CVars* pCVars = GetCVars();
-    AABB objBox;
-    const Vec3 vCamPos = rCam.GetPosition();
-
-    for (IRenderNode* pObj = lstObjects->m_pFirstNode, * pNext; pObj; pObj = pNext)
-    {
-        rendItemSorter.IncreaseObjectCounter();
-        pNext = pObj->m_pNext;
-
-        if (pObj->m_pNext)
-        {
-            cryPrefetchT0SSE(pObj->m_pNext);
-        }
-
-        IF (pObj->m_dwRndFlags & ERF_HIDDEN, 0)
-        {
-            continue;
-        }
-
-        pObj->FillBBox(objBox);
-        EERType rnType = pObj->GetRenderNodeType();
-
-        if (bNodeCompletelyInFrustum || rCam.IsAABBVisible_FM(objBox))
-        {
-            float fEntDistance = sqrt_tpl(Distance::Point_AABBSq(vCamPos, objBox)) * passInfo.GetZoomFactor();
-            assert(fEntDistance >= 0 && _finite(fEntDistance));
-            if (fEntDistance < pObj->m_fWSMaxViewDist)
-            {
-                if (nRenderMask & OCTREENODE_RENDER_FLAG_OBJECTS_ONLY_ENTITIES)
-                {
-                    if (rnType != eERType_RenderComponent && rnType != eERType_DynamicMeshRenderComponent && rnType != eERType_SkinnedMeshRenderComponent)
-                    {
-                        if (rnType == eERType_Light)
-                        {
-                            CLightEntity* pEnt = (CLightEntity*)pObj;
-                            if (!pEnt->GetEntityVisArea() &&  !(pEnt->m_light.m_Flags & DLF_THIS_AREA_ONLY))
-                            { // not "this area only" outdoor light affects everything
-                            }
-                            else
-                            {
-                                continue;
-                            }
-                        }
-                        else
-                        {
-                            continue;
-                        }
-                    }
-                }
-
-                if (rnType == eERType_Light)
-                {
-                    bool bLightVisible = true;
-                    CLightEntity* pLightEnt = (CLightEntity*)pObj;
-
-                    // first check against camera view frustum
-                    CDLight* pLight = &pLightEnt->m_light;
-                    if (pLight->m_Flags & DLF_DEFERRED_CUBEMAPS)
-                    {
-                        OBB obb(OBB::CreateOBBfromAABB(Matrix33(pLight->m_ObjMatrix), AABB(-pLight->m_ProbeExtents, pLight->m_ProbeExtents)));
-                        bLightVisible = passInfo.GetCamera().IsOBBVisible_F(pLight->m_Origin, obb);
-                    }
-                    else if (pLightEnt->m_light.m_Flags & DLF_AREA_LIGHT)
-                    {
-                        // OBB test for area lights.
-                        Vec3 vBoxMax(pLight->m_fBaseRadius, pLight->m_fBaseRadius + pLight->m_fAreaWidth, pLight->m_fBaseRadius + pLight->m_fAreaHeight);
-                        Vec3 vBoxMin(-0.1f, -(pLight->m_fBaseRadius + pLight->m_fAreaWidth), -(pLight->m_fBaseRadius + pLight->m_fAreaHeight));
-
-                        OBB obb(OBB::CreateOBBfromAABB(Matrix33(pLight->m_ObjMatrix), AABB(vBoxMin, vBoxMax)));
-                        bLightVisible = rCam.IsOBBVisible_F(pLight->m_Origin, obb);
-                    }
-                    else
-                    {
-                        bLightVisible = rCam.IsSphereVisible_F(Sphere(pLight->m_BaseOrigin, pLight->m_fBaseRadius));
-                    }
-
-                    if (!bLightVisible)
-                    {
-                        continue;
-                    }
-                }
-
-                if (pCVars->e_StatObjBufferRenderTasks == 1 && passInfo.IsGeneralPass())
-                {
-                    // If object is visible
-                    if (rnType == eERType_DistanceCloud || GetObjManager()->CheckOcclusion_TestAABB(objBox, fEntDistance))
-                    {
-                        if (pObj->CanExecuteRenderAsJob())
-                        {
-                            // If object can be executed as a job, call RenderObject directly from this job
-                            GetObjManager()->RenderObject(pObj, objBox, fEntDistance, eERType_RenderComponent, passInfo, rendItemSorter);
-                        }
-                        else
-                        {
-                            // Otherwise, write to output queue for main thread processing
-                            GetObjManager()->PushIntoCullOutputQueue(SCheckOcclusionOutput::CreateCommonObjectOutput(pObj, objBox, fEntDistance, pTerrainTexInfo, rendItemSorter));
-                        }
-                    }
-                }
-                else
-                {
-                    GetObjManager()->RenderObject(pObj, objBox, fEntDistance, rnType, passInfo, rendItemSorter);
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void COctreeNode::UnlinkObject(IRenderNode* pObj)
-{
-    ERNListType eListType = pObj->GetRenderNodeListId(pObj->GetRenderNodeType());
-
-    assert(eListType >= 0 && eListType < eRNListType_ListsNum);
-    TDoublyLinkedList<IRenderNode>& rList = m_arrObjects[eListType];
-
-    assert(pObj != pObj->m_pPrev && pObj != pObj->m_pNext);
-    assert(!rList.m_pFirstNode || !rList.m_pFirstNode->m_pPrev);
-    assert(!rList.m_pLastNode || !rList.m_pLastNode->m_pNext);
-
-    if (pObj->m_pNext || pObj->m_pPrev || pObj == rList.m_pLastNode || pObj == rList.m_pFirstNode)
-    {
-        rList.remove(pObj);
-    }
-
-    assert(!rList.m_pFirstNode || !rList.m_pFirstNode->m_pPrev);
-    assert(!rList.m_pLastNode || !rList.m_pLastNode->m_pNext);
-    assert(pObj != pObj->m_pPrev && pObj != pObj->m_pNext);
-    assert(!pObj->m_pNext && !pObj->m_pPrev);
-}
-
-bool COctreeNode::DeleteObject(IRenderNode* pObj)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (pObj->m_pOcNode && pObj->m_pOcNode != this)
-    {
-        return ((COctreeNode*)(pObj->m_pOcNode))->DeleteObject(pObj);
-    }
-
-    UnlinkObject(pObj);
-
-    if (m_removeVegetationCastersOneByOne)
-    {
-        for (int i = 0; i < m_lstCasters.Count(); i++)
-        {
-            if (m_lstCasters[i].pNode == pObj)
-            {
-                m_lstCasters.Delete(i);
-                break;
-            }
-        }
-    }
-
-    C3DEngine* p3DEngine = Get3DEngine();
-    bool bSafeToUse = p3DEngine ? p3DEngine->IsObjectTreeReady() : false;
-
-    pObj->m_pOcNode = NULL;
-    pObj->m_nSID = -1;
-
-    if (bSafeToUse && IsEmpty() && m_arrEmptyNodes.Find(this) < 0)
-    {
-        m_arrEmptyNodes.Add(this);
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void COctreeNode::InsertObject(IRenderNode* pObj, const AABB& objBox, const float fObjRadiusSqr, const Vec3& vObjCenter)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ThreeDEngineDetailed);
-
-    COctreeNode* pCurrentNode = this;
-
-    const EERType eType = pObj->GetRenderNodeType();
-    const uint32 renderFlags = (pObj->GetRndFlags() & (ERF_GOOD_OCCLUDER | ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS));
-
-    const bool bTypeLight = (eType == eERType_Light);
-    const float fWSMaxViewDist = pObj->m_fWSMaxViewDist;
-
-    Vec3 vObjectCentre = vObjCenter;
-
-    while (true)
-    {
-        PrefetchLine(&pCurrentNode->m_arrChilds[0], 0);
-
-#if !defined(_RELEASE)
-        if (GetCVars()->e_CheckOctreeObjectsBoxSize != 0) // pCurrentNode->m_pParent is checked as silly sized things are added to the root (e.g. the sun)
-        {
-            if (pCurrentNode->m_pParent && !objBox.IsReset() && (objBox.min.len() > CHECK_OBJECTS_BOX_WARNING_SIZE || objBox.max.len() > CHECK_OBJECTS_BOX_WARNING_SIZE))
-            {
-                CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR_DBGBRK, "Huge object being added to a COctreeNode, name: '%s', objBox: [%f %f %f] -> [%f %f %f]\n", pObj->GetName(), objBox.min.x, objBox.min.y, objBox.min.z, objBox.max.x, objBox.max.y, objBox.max.z);
-            }
-        }
-#endif
-
-        // parent bbox includes all children
-        pCurrentNode->m_objectsBox.Add(objBox);
-
-        pCurrentNode->m_fObjectsMaxViewDist = max(pCurrentNode->m_fObjectsMaxViewDist, fWSMaxViewDist);
-
-        pCurrentNode->m_renderFlags |= renderFlags;
-
-        pCurrentNode->m_bHasLights |= (bTypeLight);
-
-        if (pCurrentNode->m_vNodeAxisRadius.x * 2.0f > fNodeMinSize) // store voxels and roads in root
-        {
-            float nodeRadius = sqrt(pCurrentNode->GetNodeRadius2());
-
-            if (fObjRadiusSqr < sqr(nodeRadius * fObjectToNodeSizeRatio))
-            {
-                int nChildId =
-                    ((vObjCenter.x > pCurrentNode->m_vNodeCenter.x) ? 4 : 0) |
-                    ((vObjCenter.y > pCurrentNode->m_vNodeCenter.y) ? 2 : 0) |
-                    ((vObjCenter.z > pCurrentNode->m_vNodeCenter.z) ? 1 : 0);
-
-                if (!pCurrentNode->m_arrChilds[nChildId])
-                {
-                    pCurrentNode->m_arrChilds[nChildId] = COctreeNode::Create(pCurrentNode->m_nSID, pCurrentNode->GetChildBBox(nChildId), pCurrentNode->m_pVisArea, pCurrentNode);
-                }
-
-                pCurrentNode = pCurrentNode->m_arrChilds[nChildId];
-
-                continue;
-            }
-        }
-
-        break;
-    }
-
-    //disable as it leads to some corruption on 360
-    //  PrefetchLine(&pObj->m_pOcNode, 0);  //Writing to m_pOcNode was a common L2 cache miss
-
-    pCurrentNode->LinkObject(pObj, eType);
-
-    pObj->m_pOcNode = pCurrentNode;
-    pObj->m_nSID = pCurrentNode->m_nSID;
-
-    // only mark octree nodes as not compiled during loading and in the editor
-    // otherwise update node (and parent node) flags on per added object basis
-    if (m_bLevelLoadingInProgress || gEnv->IsEditor())
-    {
-        // Do nothing
-    }
-    else
-    {
-        pCurrentNode->UpdateObjects(pObj);
-    }
-
-    pCurrentNode->m_nManageVegetationsFrameId = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-AABB COctreeNode::GetChildBBox(int nChildId)
-{
-    int x = (nChildId / 4);
-    int y = (nChildId - x * 4) / 2;
-    int z = (nChildId - x * 4 - y * 2);
-    const Vec3& vSize = m_vNodeAxisRadius;
-    Vec3 vOffset = vSize;
-    vOffset.x *= x;
-    vOffset.y *= y;
-    vOffset.z *= z;
-    AABB childBox;
-    childBox.min = m_vNodeCenter - vSize + vOffset;
-    childBox.max = childBox.min + vSize;
-    return childBox;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool COctreeNode::IsEmpty()
-{
-    if (m_pParent)
-    {
-        if (!m_arrChilds[0] && !m_arrChilds[1] && !m_arrChilds[2] && !m_arrChilds[3])
-        {
-            if (!m_arrChilds[4] && !m_arrChilds[5] && !m_arrChilds[6] && !m_arrChilds[7])
-            {
-                if (!HasObjects())
-                {
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool COctreeNode::IsRightNode(const AABB& objBox, const float fObjRadiusSqr, [[maybe_unused]] float fObjMaxViewDist)
-{
-    const AABB& nodeBox = GetNodeBox();
-    if (!Overlap::Point_AABB(objBox.GetCenter(), nodeBox))
-    {
-        if (m_pParent)
-        {
-            return false; // fail if center is not inside or node bbox
-        }
-    }
-    if (2 != Overlap::AABB_AABB_Inside(objBox, m_objectsBox))
-    {
-        return false; // fail if not completely inside of objects bbox
-    }
-    float fNodeRadiusRated = GetNodeRadius2() * sqr(fObjectToNodeSizeRatio);
-
-    if (fObjRadiusSqr > fNodeRadiusRated * 4.f)
-    {
-        if (m_pParent)
-        {
-            return false; // fail if object is too big and we need to register it some of parents
-        }
-    }
-    if (m_vNodeAxisRadius.x * 2.0f > fNodeMinSize)
-    {
-        if (fObjRadiusSqr < fNodeRadiusRated)
-        {
-            //      if(fObjMaxViewDist < m_fNodeRadius*GetCVars()->e_ViewDistRatioVegetation*fObjectToNodeSizeRatio)
-            return false; // fail if object is too small and we need to register it some of childs
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void COctreeNode::LinkObject(IRenderNode* pObj, EERType eERType, bool bPushFront)
-{
-    ERNListType eListType = pObj->GetRenderNodeListId(eERType);
-
-    TDoublyLinkedList<IRenderNode>& rList = m_arrObjects[eListType];
-
-    assert(pObj != pObj->m_pPrev && pObj != pObj->m_pNext);
-    assert(!pObj->m_pNext && !pObj->m_pPrev);
-    assert(!rList.m_pFirstNode || !rList.m_pFirstNode->m_pPrev);
-    assert(!rList.m_pLastNode || !rList.m_pLastNode->m_pNext);
-
-    if (bPushFront)
-    {
-        rList.insertBeginning(pObj);
-    }
-    else
-    {
-        rList.insertEnd(pObj);
-    }
-
-    assert(!rList.m_pFirstNode || !rList.m_pFirstNode->m_pPrev);
-    assert(!rList.m_pLastNode || !rList.m_pLastNode->m_pNext);
-    assert(pObj != pObj->m_pPrev && pObj != pObj->m_pNext);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void COctreeNode::UpdateObjects(IRenderNode* pObj)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ThreeDEngineDetailed);
-
-    float fObjMaxViewDistance = 0;
-
-    bool bVegetHasAlphaTrans = false;
-    int nFlags = pObj->GetRndFlags();
-    EERType eRType = pObj->GetRenderNodeType();
-
-    IF (nFlags & ERF_HIDDEN, 0)
-    {
-        return;
-    }
-
-    I3DEngine* p3DEngine = GetISystem()->GetI3DEngine();
-    const Vec3& sunDir = p3DEngine->GetSunDirNormalized();
-    uint32 sunDirX = (uint32)(sunDir.x * 63.5f + 63.5f);
-    uint32 sunDirZ = (uint32)(sunDir.z * 63.5f + 63.5f);
-    uint32 sunDirYs = (uint32)(sunDir.y < 0.0f ? 1 : 0);
-
-    pObj->m_nInternalFlags &= ~(IRenderNode::REQUIRES_FORWARD_RENDERING | IRenderNode::REQUIRES_NEAREST_CUBEMAP);
-
-    // update max view distances
-    const float fNewMaxViewDist = pObj->GetMaxViewDist();
-    pObj->m_fWSMaxViewDist = fNewMaxViewDist;
-
-    if (eRType != eERType_Light && eRType != eERType_Cloud && eRType != eERType_FogVolume && eRType != eERType_Decal && eRType != eERType_DistanceCloud)
-    {
-        {
-            CMatInfo* pMatInfo = (CMatInfo*)pObj->GetMaterial().get();
-            if (pMatInfo)
-            {
-                if (bVegetHasAlphaTrans || pMatInfo->IsForwardRenderingRequired())
-                {
-                    pObj->m_nInternalFlags |= IRenderNode::REQUIRES_FORWARD_RENDERING;
-                }
-
-                if (pMatInfo->IsNearestCubemapRequired())
-                {
-                    pObj->m_nInternalFlags |= IRenderNode::REQUIRES_NEAREST_CUBEMAP;
-                }
-            }
-
-            if (eRType == eERType_RenderComponent || eRType == eERType_DynamicMeshRenderComponent || eRType == eERType_SkinnedMeshRenderComponent)
-            {
-                int nSlotCount = pObj->GetSlotCount();
-
-                for (int s = 0; s < nSlotCount; s++)
-                {
-                    if (CMatInfo* pMat = (CMatInfo*)pObj->GetEntitySlotMaterial(s).get())
-                    {
-                        if (pMat->IsForwardRenderingRequired())
-                        {
-                            pObj->m_nInternalFlags |= IRenderNode::REQUIRES_FORWARD_RENDERING;
-                        }
-                        if (pMat->IsNearestCubemapRequired())
-                        {
-                            pObj->m_nInternalFlags |= IRenderNode::REQUIRES_NEAREST_CUBEMAP;
-                        }
-                    }
-
-                    if (IStatObj* pStatObj = pObj->GetEntityStatObj(s))
-                    {
-                        if (CMatInfo* pMat = (CMatInfo*)pStatObj->GetMaterial().get())
-                        {
-                            if (pMat->IsForwardRenderingRequired())
-                            {
-                                pObj->m_nInternalFlags |= IRenderNode::REQUIRES_FORWARD_RENDERING;
-                            }
-                            if (pMat->IsNearestCubemapRequired())
-                            {
-                                pObj->m_nInternalFlags |= IRenderNode::REQUIRES_NEAREST_CUBEMAP;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    bool bUpdateParentShadowFlags = false;
-
-    // fill shadow casters list
-    const bool bHasPerObjectShadow = GetCVars()->e_ShadowsPerObject && p3DEngine->GetPerObjectShadow(pObj);
-    if (nFlags & ERF_CASTSHADOWMAPS && fNewMaxViewDist > fMinShadowCasterViewDist && eRType != eERType_Light && !bHasPerObjectShadow)
-    {
-        bUpdateParentShadowFlags = true;
-
-        float fMaxCastDist = fNewMaxViewDist * GetCVars()->e_ShadowsCastViewDistRatio;
-        m_lstCasters.Add(SCasterInfo(pObj, fMaxCastDist, eRType));
-    }
-
-    fObjMaxViewDistance = max(fObjMaxViewDistance, fNewMaxViewDist);
-
-    // traverse the octree upwards and fill in new flags
-    COctreeNode* pNode = this;
-    bool bContinue = false;
-    do
-    {
-        // update max view dist
-        if (pNode->m_fObjectsMaxViewDist < fObjMaxViewDistance)
-        {
-            pNode->m_fObjectsMaxViewDist = fObjMaxViewDistance;
-            bContinue = true;
-        }
-
-        // update shadow flags
-        if (bUpdateParentShadowFlags && (pNode->m_renderFlags & ERF_CASTSHADOWMAPS) == 0)
-        {
-            pNode->m_renderFlags |= ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS;
-            bContinue = true;
-        }
-
-        pNode = pNode->m_pParent;
-    } while (pNode != NULL && bContinue);
-
-    m_fpSunDirX = sunDirX;
-    m_fpSunDirZ = sunDirZ;
-    m_fpSunDirYs = sunDirYs;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int16 CObjManager::GetNearestCubeProbe(IVisArea* pVisArea, const AABB& objBox, bool bSpecular)
-{
-    // Only used for alpha blended geometry - but still should be optimized further
-    float fMinDistance = FLT_MAX;
-    int nMaxPriority = -1;
-    CLightEntity* pNearestLight = NULL;
-    int16 nDefaultId = Get3DEngine()->GetBlackCMTexID();
-
-    if (!pVisArea)
-    {
-        if (Get3DEngine()->IsObjectTreeReady())
-        {
-            Get3DEngine()->GetObjectTree()->GetNearestCubeProbe(fMinDistance, nMaxPriority, pNearestLight, &objBox);
-        }
-    }
-    else
-    {
-        Get3DEngine()->GetVisAreaManager()->GetNearestCubeProbe(fMinDistance, nMaxPriority, pNearestLight, &objBox);
-    }
-
-    if (pNearestLight)
-    {
-        ITexture* pTexCM = bSpecular ? pNearestLight->m_light.GetSpecularCubemap() : pNearestLight->m_light.GetDiffuseCubemap();
-        // Return cubemap ID or -1 if invalid
-        return (pTexCM && pTexCM->GetTextureType() >= eTT_Cube) ? pTexCM->GetTextureID() : nDefaultId;
-    }
-
-    // No cubemap found
-    return nDefaultId;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjManager::IsAfterWater(const Vec3& vPos, const SRenderingPassInfo& passInfo)
-{
-    // considered "after water" if any of the following is true:
-    //    - Position & camera are on the same side of the water surface on recursive level 0
-    //    - Position & camera are on opposite sides of the water surface on recursive level 1
-
-    float fWaterLevel;
-    if (OceanToggle::IsActive())
-    {
-        if (!OceanRequest::OceanIsEnabled())
-        {
-            return true;
-        }
-        fWaterLevel = OceanRequest::GetOceanLevel();
-    }
-    else
-    {
-        fWaterLevel = GetOcean() ? GetOcean()->GetWaterLevel() : WATER_LEVEL_UNKNOWN;
-    }
-
-    return (0.5f - passInfo.GetRecursiveLevel()) * (0.5f - passInfo.IsCameraUnderWater()) * (vPos.z - fWaterLevel) > 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::RenderObjectDebugInfo(IRenderNode* pEnt, float fEntDistance,  const SRenderingPassInfo& passInfo)
-{
-    if (!passInfo.IsGeneralPass())
-    {
-        return;
-    }
-
-    m_arrRenderDebugInfo.push_back(SObjManRenderDebugInfo(pEnt, fEntDistance));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::RemoveCullJobProducer()
-{
-    m_CheckOcclusionOutputQueue.RemoveProducer();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::AddCullJobProducer()
-{
-    m_CheckOcclusionOutputQueue.AddProducer();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjManager::CheckOcclusion_TestAABB(const AABB& rAABB, float fEntDistance)
-{
-    return m_CullThread.TestAABB(rAABB, fEntDistance);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjManager::CheckOcclusion_TestQuad(const Vec3& vCenter, const Vec3& vAxisX, const Vec3& vAxisY)
-{
-    return m_CullThread.TestQuad(vCenter, vAxisX, vAxisY);
-}
-
-#ifndef _RELEASE
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::CoverageBufferDebugDraw()
-{
-    m_CullThread.CoverageBufferDebugDraw();
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjManager::LoadOcclusionMesh(const char* pFileName)
-{
-    return m_CullThread.LoadLevel(pFileName);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::PushIntoCullQueue(const SCheckOcclusionJobData& rCheckOcclusionData)
-{
-#if !defined(_RELEASE)
-    IF (!m_CullThread.IsActive(), 0)
-    {
-        __debugbreak();
-    }
-    IF (rCheckOcclusionData.type == SCheckOcclusionJobData::QUIT, 0)
-    {
-        m_CullThread.SetActive(false);
-    }
-#endif
-    // Prevent our queue from filling up, and make sure to always leave room for the "QUIT" message.
-    // If we try to add nodes to a full queue, it's possible for deadlocks to occur.  The CheckOcclusionQueue 
-    // is filled from the main thread, and will block if the queue is full.  The queue is emptied from a culling 
-    // thread, but the CheckOcclusionOutputQueue is filled from the culling thread and will block if *its* queue is 
-    // full.  The main thread is the one that empties the output queue thread, so queues that are full on both sides, 
-    // mixed with bad timing, can cause a deadlock.  Such are the perils of lockless fixed size queues. :(
-    // Rather than locking up, we will instead emit a warning and over-cull by not even submitting our geometry for
-    // potential rendering.
-    if ((m_CheckOcclusionQueue.FreeCount() > 1) ||
-        (rCheckOcclusionData.type == SCheckOcclusionJobData::QUIT))
-    {
-        m_CheckOcclusionQueue.Push(rCheckOcclusionData);
-    }
-    else
-    {
-        // If this warning is hit in the editor, it's likely because of editing terrain.  Edited terrain draws at the highest
-        // LOD, which means you'll need to set this to (heightmap height * width) / (32 * 32) at a bare minimum to have a 
-        // large enough buffer.  It will need to be even larger if you have significant amounts of static geometry in the level too.
-        // If this warning is hit in-game, you'll just need to use trial and error to determine a large enough size.
-        AZ_Warning("Cull", false,
-            "Occlusion Queue is full - need to set the e_CheckOcclusionQueueSize CVar value larger (current value = %u).", 
-            m_CheckOcclusionQueue.BufferSize());
-    }
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::PopFromCullQueue(SCheckOcclusionJobData* pCheckOcclusionData)
-{
-    m_CheckOcclusionQueue.Pop(pCheckOcclusionData);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::PushIntoCullOutputQueue(const SCheckOcclusionOutput& rCheckOcclusionOutput)
-{
-    // Prevent our output queue from filling up.  If we try to add nodes to a full queue, it's possible for deadlocks 
-    // to occur.  (See explanation in PushIntoCullQueue() above)
-    // Rather than locking up, we will instead emit a warning and over-cull by not even submitting our geometry for
-    // potential rendering.
-    if (m_CheckOcclusionOutputQueue.FreeCount() > 0)
-    {
-        m_CheckOcclusionOutputQueue.Push(rCheckOcclusionOutput);
-    }
-    else
-    {
-        // If this warning is hit in the editor, it's likely because of editing terrain.  This should likely be set to 2x to 4x the
-        // size of e_CheckOcclusionQueueSize.
-        // If this warning is hit in-game, you'll just need to use trial and error to determine a large enough size.
-        AZ_Warning("Cull", false,
-            "Occlusion Output Queue is full - need to set the e_CheckOcclusionOutputQueueSize CVar value larger (current value = %u).", 
-            m_CheckOcclusionOutputQueue.BufferSize());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjManager::PopFromCullOutputQueue(SCheckOcclusionOutput* pCheckOcclusionOutput)
-{
-    return m_CheckOcclusionOutputQueue.Pop(pCheckOcclusionOutput);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-uint8 CObjManager::GetDissolveRef(float fDist, float fMVD)
-{
-    float fDissolveDist = 1.0f / CLAMP(0.1f * fMVD, GetFloatCVar(e_DissolveDistMin), GetFloatCVar(e_DissolveDistMax));
-
-    return (uint8)SATURATEB((1.0f + (fDist - fMVD) * fDissolveDist) * 255.f);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CObjManager::GetLodDistDissolveRef(SLodDistDissolveTransitionState* pState, float curDist, int nNewLod, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-    float fDissolveDistbandClamped = min(GetFloatCVar(e_DissolveDistband), curDist * .4f) + 0.001f;
-
-    if (!pState->fStartDist)
-    {
-        pState->fStartDist = curDist;
-        pState->nOldLod = nNewLod;
-        pState->nNewLod = nNewLod;
-
-        pState->bFarside = (pState->nNewLod < pState->nOldLod && pState->nNewLod != -1) || pState->nOldLod == -1;
-    }
-    else if (pState->nNewLod != nNewLod)
-    {
-        pState->nNewLod = nNewLod;
-        pState->fStartDist = curDist;
-
-        pState->bFarside = (pState->nNewLod < pState->nOldLod && pState->nNewLod != -1) || pState->nOldLod == -1;
-    }
-    else if ((pState->nOldLod != pState->nNewLod))
-    {
-        // transition complete
-        if (
-            (!pState->bFarside && curDist - pState->fStartDist > fDissolveDistbandClamped) ||
-            (pState->bFarside && pState->fStartDist - curDist > fDissolveDistbandClamped)
-            )
-        {
-            pState->nOldLod = pState->nNewLod;
-        }
-        // with distance based transitions we can always 'fail' back to the previous LOD.
-        else if (
-            (!pState->bFarside && curDist < pState->fStartDist) ||
-            (pState->bFarside && curDist > pState->fStartDist)
-            )
-        {
-            pState->nNewLod = pState->nOldLod;
-        }
-    }
-
-    if (pState->nOldLod == pState->nNewLod)
-    {
-        return 0.f;
-    }
-    else
-    {
-        if (pState->bFarside)
-        {
-            return SATURATE(((pState->fStartDist - curDist) * (1.f / fDissolveDistbandClamped)));
-        }
-        else
-        {
-            return SATURATE(((curDist - pState->fStartDist) * (1.f / fDissolveDistbandClamped)));
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-int CObjManager::GetObjectLOD(const IRenderNode* pObj, float fDistance)
-{
-    SFrameLodInfo frameLodInfo = Get3DEngine()->GetFrameLodInfo();
-    int resultLod = MAX_STATOBJ_LODS_NUM - 1;
-    bool boundingBBoxBased = ((pObj->GetRndFlags() & ERF_LOD_BBOX_BASED) != 0);
-    // If it is bounding box based, it does not use face area data.
-    bool useLodFaceArea = (GetCVars()->e_LodFaceArea != 0)  && !boundingBBoxBased;
-  
-    if (useLodFaceArea)
-    {
-        float distances[SMeshLodInfo::s_nMaxLodCount];
-        useLodFaceArea = pObj->GetLodDistances(frameLodInfo, distances);
-        if (useLodFaceArea)
-        {
-            for (uint i = 0; i < MAX_STATOBJ_LODS_NUM - 1; ++i)
-            {
-                if (fDistance < distances[i])
-                {
-                    resultLod = i;
-                    break;
-                }
-            }
-        }
-    }
-
-    if (!useLodFaceArea)
-    {
-        const float fLodRatioNorm = pObj->GetLodRatioNormalized();
-        const float fRadius = pObj->GetBBox().GetRadius();
-        resultLod = (int)(fDistance * (fLodRatioNorm * fLodRatioNorm) / (max(frameLodInfo.fLodRatio * min(fRadius, GetFloatCVar(e_LodCompMaxSize)), 0.001f)));
-    }
-
-    return resultLod;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void COctreeNode::GetObjectsByFlags(uint dwFlags, PodArray<IRenderNode*>& lstObjects)
-{
-    unsigned int nCurrentObject(eRNListType_First);
-    for (nCurrentObject = eRNListType_First; nCurrentObject < eRNListType_ListsNum; ++nCurrentObject)
-    {
-        for (IRenderNode* pObj = m_arrObjects[nCurrentObject].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            if ((pObj->GetRndFlags() & dwFlags) == dwFlags)
-            {
-                lstObjects.Add(pObj);
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->GetObjectsByFlags(dwFlags, lstObjects);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void COctreeNode::GetObjectsByType(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback)
-{
-    if (objType == eERType_Light && !m_bHasLights)
-    {
-        return;
-    }
-
-    if (pBBox && !Overlap::AABB_AABB(*pBBox, GetObjectsBBox()))
-    {
-        return;
-    }
-
-    ERNListType eListType = IRenderNode::GetRenderNodeListId(objType);
-
-    for (IRenderNode* pObj = m_arrObjects[eListType].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-    {
-        if (pObj->GetRenderNodeType() == objType)
-        {
-            AABB box;
-            pObj->FillBBox(box);
-            if (!pBBox || Overlap::AABB_AABB(*pBBox, box))
-            {
-                // Check the filterCallback to perform a final validation that we want this object
-                // to appear in our results list.  If there's no filterCallback, then always add
-                // the object.
-                if (!filterCallback || filterCallback(pObj, objType))
-                {
-                    lstObjects.Add(pObj);
-                }
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->GetObjectsByType(lstObjects, objType, pBBox, filterCallback);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void COctreeNode::GetNearestCubeProbe(float& fMinDistance, int& nMaxPriority, CLightEntity*& pNearestLight, const AABB* pBBox)
-{
-    if (!m_bHasLights)
-    {
-        return;
-    }
-
-    if (!pBBox || pBBox && !Overlap::AABB_AABB(*pBBox, GetObjectsBBox()))
-    {
-        return;
-    }
-
-    Vec3 vCenter = pBBox->GetCenter();
-
-    ERNListType eListType = IRenderNode::GetRenderNodeListId(eERType_Light);
-
-    for (IRenderNode* pObj = m_arrObjects[eListType].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-    {
-        if (pObj->GetRenderNodeType() == eERType_Light)
-        {
-            AABB box;
-            pObj->FillBBox(box);
-            if (Overlap::AABB_AABB(*pBBox, box))
-            {
-                CLightEntity* pLightEnt = (CLightEntity*)pObj;
-                CDLight* pLight = &pLightEnt->m_light;
-
-                if (pLight->m_Flags & DLF_DEFERRED_CUBEMAPS)
-                {
-                    Vec3 vCenterRel = vCenter - pLight->GetPosition();
-                    Vec3 vCenterOBBSpace;
-                    vCenterOBBSpace.x = pLightEnt->m_Matrix.GetColumn0().GetNormalized().dot(vCenterRel);
-                    vCenterOBBSpace.y = pLightEnt->m_Matrix.GetColumn1().GetNormalized().dot(vCenterRel);
-                    vCenterOBBSpace.z = pLightEnt->m_Matrix.GetColumn2().GetNormalized().dot(vCenterRel);
-
-                    // Check if object center is within probe OBB
-                    Vec3 vProbeExtents = pLight->m_ProbeExtents;
-                    if (fabs(vCenterOBBSpace.x) < vProbeExtents.x && fabs(vCenterOBBSpace.y) < vProbeExtents.y && fabs(vCenterOBBSpace.z) < vProbeExtents.z)
-                    {
-                        if (pLight->m_nSortPriority > nMaxPriority 
-                            && pLight->m_fProbeAttenuation > 0) // Don't return a probe that is disabled/invisible. In particular this provides better results when lighting particles.
-                        {
-                            pNearestLight = (CLightEntity*)pObj;
-                            nMaxPriority = pLight->m_nSortPriority;
-                            fMinDistance = 0;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    for (int i = 0; i < 8; i++)
-    {
-        if (m_arrChilds[i])
-        {
-            m_arrChilds[i]->GetNearestCubeProbe(fMinDistance, nMaxPriority, pNearestLight, pBBox);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CObjManager::IsBoxOccluded(const AABB& objBox,
-    [[maybe_unused]] float fDistance,
-    OcclusionTestClient* const __restrict pOcclTestVars,
-    bool/* bIndoorOccludersOnly*/,
-    [[maybe_unused]] EOcclusionObjectType eOcclusionObjectType,
-    const SRenderingPassInfo& passInfo)
-{
-    // if object was visible during last frames
-    const uint32 mainFrameID = passInfo.GetMainFrameID();
-
-    if (GetCVars()->e_OcclusionLazyHideFrames)
-    {
-        //This causes massive spikes in draw calls when rotating
-        if (pOcclTestVars->nLastVisibleMainFrameID > mainFrameID - GetCVars()->e_OcclusionLazyHideFrames)
-        {
-            // prevent checking all objects in same frame
-            int nId = (int)(UINT_PTR(pOcclTestVars) / 256);
-            if ((nId & 7) != (mainFrameID & 7))
-            {
-                return false;
-            }
-        }
-    }
-
-    // use fast and reliable test right here
-    CVisAreaManager* pVisAreaManager = GetVisAreaManager();
-    if (GetCVars()->e_OcclusionVolumes && pVisAreaManager && pVisAreaManager->IsOccludedByOcclVolumes(objBox, passInfo))
-    {
-        pOcclTestVars->nLastOccludedMainFrameID = mainFrameID;
-        return true;
-    }
-
-    if (GetCVars()->e_CoverageBuffer)
-    {
-        return pOcclTestVars->nLastOccludedMainFrameID == mainFrameID - 1;
-    }
-
-    pOcclTestVars->nLastVisibleMainFrameID = mainFrameID;
-
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CLightEntity::FillBBox(AABB& aabb)
-{
-    aabb = CLightEntity::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CLightEntity::GetRenderNodeType()
-{
-    return eERType_Light;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CLightEntity::GetMaxViewDist()
-{
-    if (m_light.m_Flags & DLF_SUN)
-    {
-        return 10.f * DISTANCE_TO_THE_SUN;
-    }
-    return max(GetCVars()->e_ViewDistMin, CLightEntity::GetBBox().GetRadius() * GetCVars()->e_ViewDistRatioLights * GetViewDistanceMultiplier());
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 CLightEntity::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    assert(bWorldOnly);
-    return m_light.m_Origin;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void COcean::FillBBox(AABB& aabb)
-{
-    aabb = COcean::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType COcean::GetRenderNodeType()
-{
-    return eERType_WaterVolume;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 COcean::GetPos(bool) const
-{
-    return Vec3(0, 0, 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> COcean::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return m_pMaterial;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CFogVolumeRenderNode::FillBBox(AABB& aabb)
-{
-    aabb = CFogVolumeRenderNode::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CFogVolumeRenderNode::GetRenderNodeType()
-{
-    return eERType_FogVolume;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CFogVolumeRenderNode::GetMaxViewDist()
-{
-    return max(GetCVars()->e_ViewDistMin, CFogVolumeRenderNode::GetBBox().GetRadius() * GetCVars()->e_ViewDistRatio * GetViewDistanceMultiplier());
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 CFogVolumeRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    return m_pos;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CFogVolumeRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return 0;
-}
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CDecalRenderNode::FillBBox(AABB& aabb)
-{
-    aabb = CDecalRenderNode::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CDecalRenderNode::GetRenderNodeType()
-{
-    return eERType_Decal;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CDecalRenderNode::GetMaxViewDist()
-{
-    return m_decalProperties.m_maxViewDist * GetViewDistanceMultiplier();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 CDecalRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    return m_pos;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CDecalRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return m_pMaterial;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CWaterVolumeRenderNode::FillBBox(AABB& aabb)
-{
-    aabb = CWaterVolumeRenderNode::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CWaterVolumeRenderNode::GetRenderNodeType()
-{
-    return eERType_WaterVolume;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CWaterVolumeRenderNode::GetMaxViewDist()
-{
-    return max(GetCVars()->e_ViewDistMin, CWaterVolumeRenderNode::GetBBox().GetRadius() * GetCVars()->e_ViewDistRatio * GetViewDistanceMultiplier());
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 CWaterVolumeRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    return m_center;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CWaterVolumeRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return m_pMaterial;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CDistanceCloudRenderNode::FillBBox(AABB& aabb)
-{
-    aabb = CDistanceCloudRenderNode::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CDistanceCloudRenderNode::GetRenderNodeType()
-{
-    return eERType_DistanceCloud;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CDistanceCloudRenderNode::GetMaxViewDist()
-{
-    return max(GetCVars()->e_ViewDistMin, CDistanceCloudRenderNode::GetBBox().GetRadius() * GetCVars()->e_ViewDistRatio * GetViewDistanceMultiplier());
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 CDistanceCloudRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    return m_pos;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CDistanceCloudRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return m_pMaterial;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-#include "PrismRenderNode.h"
-
-///////////////////////////////////////////////////////////////////////////////
-void CPrismRenderNode::FillBBox(AABB& aabb)
-{
-    aabb = CPrismRenderNode::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CPrismRenderNode::GetRenderNodeType()
-{
-    return eERType_PrismObject;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CPrismRenderNode::GetMaxViewDist()
-{
-    return 1000.0f;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 CPrismRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    return m_mat.GetTranslation();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CPrismRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return m_pMaterial;
-}
-
-#endif
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-#include "VolumeObjectRenderNode.h"
-#include "CloudRenderNode.h"
-
-///////////////////////////////////////////////////////////////////////////////
-void CVolumeObjectRenderNode::FillBBox(AABB& aabb)
-{
-    aabb = CVolumeObjectRenderNode::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CVolumeObjectRenderNode::GetRenderNodeType()
-{
-    return eERType_VolumeObject;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-float CVolumeObjectRenderNode::GetMaxViewDist()
-{
-    return max(GetCVars()->e_ViewDistMin, CVolumeObjectRenderNode::GetBBox().GetRadius() * GetCVars()->e_ViewDistRatio * GetViewDistanceMultiplier());
-}
-
-///////////////////////////////////////////////////////////////////////////////
-Vec3 CVolumeObjectRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    return m_pos;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CVolumeObjectRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return m_pMaterial;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CCloudRenderNode::FillBBox(AABB& aabb)
-{
-    aabb = CCloudRenderNode::GetBBox();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-EERType CCloudRenderNode::GetRenderNodeType()
-{
-    return eERType_Cloud;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CCloudRenderNode::GetMaxViewDist()
-{
-    return max(GetCVars()->e_ViewDistMin, CCloudRenderNode::GetBBox().GetRadius() * GetCVars()->e_ViewDistRatio * GetViewDistanceMultiplier());
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 CCloudRenderNode::GetPos([[maybe_unused]] bool bWorldOnly) const
-{
-    return m_pos;
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CCloudRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-{
-    return m_pMaterial;
-}
diff --git a/Code/CryEngine/Cry3DEngine/ObjectsTree_MT.cpp b/Code/CryEngine/Cry3DEngine/ObjectsTree_MT.cpp
deleted file mode 100644
index 654fa26848..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjectsTree_MT.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "CullBuffer.h"
-#include "RenderMeshMerger.h"
-#include "DecalManager.h"
-#include "VisAreas.h"
-#include "LightEntity.h"
-
-#ifdef WIN32
-#include <CryWindows.h>
-#endif //WIN32
-
-#ifndef PI
-#define PI 3.14159f
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::PrepareCullbufferAsync(const CCamera& rCamera)
-{
-    AZ_TRACE_METHOD();
-    if (!(gEnv->IsDedicated()))
-    {
-        m_CullThread.PrepareCullbufferAsync(rCamera);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::BeginOcclusionCulling(const SRenderingPassInfo& passInfo)
-{
-    AZ_TRACE_METHOD();
-    if (!gEnv->IsDedicated())
-    {
-        m_CullThread.CullStart(passInfo);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::EndOcclusionCulling(bool waitForOcclusionJobCompletion)
-{
-    AZ_TRACE_METHOD();
-    if (!gEnv->IsDedicated())
-    {
-        m_CullThread.CullEnd(waitForOcclusionJobCompletion);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::RenderBufferedRenderMeshes(const SRenderingPassInfo& passInfo)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-    SCheckOcclusionOutput outputData;
-    while (1)
-    {
-        {
-            AZ_PROFILE_SCOPE_STALL(AZ::Debug::ProfileCategory::Renderer, "PopFromCullOutputQueue");
-            // process till we know that no more procers are working
-            if (!GetObjManager()->PopFromCullOutputQueue(&outputData))
-            {
-                break;
-            }
-        }
-
-        switch (outputData.type)
-        {
-        case SCheckOcclusionOutput::ROAD_DECALS:
-            GetObjManager()->RenderDecalAndRoad(outputData.common.pObj,
-                outputData.objBox,
-                outputData.common.fEntDistance,
-                outputData.common.bCheckPerObjectOcclusion,
-                passInfo,
-                outputData.rendItemSorter);
-            break;
-        case SCheckOcclusionOutput::COMMON:
-            GetObjManager()->RenderObject(outputData.common.pObj,
-                outputData.objBox,
-                outputData.common.fEntDistance,
-                outputData.common.pObj->GetRenderNodeType(),
-                passInfo,
-                outputData.rendItemSorter);
-            break;
-        default:
-            CryFatalError("Got Unknown Output type from CheckOcclusion");
-            break;
-        }
-    }
-#if !defined(_RELEASE)
-    if (GetCVars()->e_CoverageBufferDebug)
-    {
-        GetObjManager()->CoverageBufferDebugDraw();
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjManager::BeginCulling()
-{
-    m_CheckOcclusionOutputQueue.SetRunningState();
-}
-
diff --git a/Code/CryEngine/Cry3DEngine/ObjectsTree_Serialize.cpp b/Code/CryEngine/Cry3DEngine/ObjectsTree_Serialize.cpp
deleted file mode 100644
index dddf7567b9..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjectsTree_Serialize.cpp
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "DecalRenderNode.h"
-#include "WaterVolumeRenderNode.h"
-#include "DistanceCloudRenderNode.h"
-#include "VisAreas.h"
-#include <MathConversion.h>
-
-#pragma pack(push,4)
-
-// common node data
-struct SRenderNodeChunk
-{
-    AABB          m_WSBBox = AABB();
-    uint16        m_nLayerId = 0;
-    int8          m_cShadowLodBias = 0;
-    uint8         m_ucDummy = 0;
-    uint32        m_dwRndFlags = 0;
-    uint16        m_nObjectTypeIndex = 0;
-    uint16        m_pad16 = 0;
-    float         m_fViewDistanceMultiplier = 0.0f;
-    uint8         m_ucLodRatio = 0;
-    // Can't guarantee alignment for derived structs across different compilers
-    // http://stackoverflow.com/questions/22404423/c-pod-struct-inheritance-are-there-any-guarantees-about-the-memory-layout-of
-    uint8         m_pad8 = 0;
-    uint16        m_pad16B = 0;
-
-    AUTO_STRUCT_INFO_LOCAL
-};
-
-#define ROADCHUNKFLAG_IGNORE_TERRAIN_HOLES 1
-#define ROADCHUNKFLAG_PHYSICALIZE 2
-
-struct SDecalChunk
-    : public SRenderNodeChunk
-{
-    int16     m_projectionType = 0;
-    uint8     m_deferred = 0;
-    uint8     m_pad8 = 0;
-    f32       m_depth = 0.0f;
-    Vec3      m_pos = Vec3(0.0f);
-    Vec3      m_normal = Vec3(0.0f);
-    Matrix33  m_explicitRightUpFront = Matrix33();
-    f32       m_radius = 0.0f;
-    int32     m_nMaterialId = 0;
-    int32     m_nSortPriority = 0;
-
-    AUTO_STRUCT_INFO_LOCAL
-};
-
-struct SWaterVolumeChunk
-    : public SRenderNodeChunk
-{
-    // volume type and id
-    int32 m_volumeTypeAndMiscBits = 0;
-    uint64 m_volumeID = 0;
-
-    // material
-    int32 m_materialID = 0;
-
-    // fog properties
-    f32 m_fogDensity = 0.0f;
-    Vec3 m_fogColor = Vec3(0.0f);
-    Plane m_fogPlane = Plane();
-    f32 m_fogShadowing = 0.0f;
-
-    // caustic propeties
-    uint8 m_caustics = 0;
-    uint8 m_pad8 = 0;
-    uint16 m_pad16 = 0;
-    f32 m_causticIntensity = 0.0f;
-    f32 m_causticTiling = 0.0f;
-    f32 m_causticHeight = 0.0f;
-
-    // render geometry
-    f32 m_uTexCoordBegin = 0.0f;
-    f32 m_uTexCoordEnd = 0.0f;
-    f32 m_surfUScale = 0.0f;
-    f32 m_surfVScale = 0.0f;
-    uint32 m_numVertices = 0;
-
-    // physics properties
-    f32 m_volumeDepth = 0.0f;
-    f32 m_streamSpeed = 0.0f;
-    uint32 m_numVerticesPhysAreaContour = 0;
-
-    AUTO_STRUCT_INFO_LOCAL
-};
-
-struct SWaterVolumeVertex
-{
-    Vec3 m_xyz;
-
-    AUTO_STRUCT_INFO_LOCAL
-};
-
-struct SDistanceCloudChunk
-    : public SRenderNodeChunk
-{
-    Vec3 m_pos = Vec3(0.0f);
-    f32 m_sizeX = 0.0f;
-    f32 m_sizeY = 0.0f;
-    f32 m_rotationZ = 0.0f;
-    int32 m_materialID = 0;
-
-    AUTO_STRUCT_INFO_LOCAL
-};
-
-#pragma pack(pop)
-
-AUTO_TYPE_INFO(EERType)
-
-#include "TypeInfo_impl.h"
-#include "ObjectsTree_Serialize_info.h"
-
-inline void CopyCommonData(SRenderNodeChunk* pChunk, IRenderNode* pObj)
-{
-    pChunk->m_WSBBox = pObj->GetBBox();
-    //COPY_MEMBER_SAVE(pChunk,pObj,m_fWSMaxViewDist);
-    COPY_MEMBER_SAVE(pChunk, pObj, m_dwRndFlags);
-    COPY_MEMBER_SAVE(pChunk, pObj, m_fViewDistanceMultiplier);
-    COPY_MEMBER_SAVE(pChunk, pObj, m_ucLodRatio);
-    COPY_MEMBER_SAVE(pChunk, pObj, m_cShadowLodBias);
-    pChunk->m_nLayerId = pObj->GetLayerId();
-}
-
-inline void LoadCommonData(SRenderNodeChunk* pChunk, IRenderNode* pObj, const SLayerVisibility* pLayerVisibility)
-{
-    //COPY_MEMBER_LOAD(pObj,pChunk,m_fWSMaxViewDist);
-    COPY_MEMBER_LOAD(pObj, pChunk, m_dwRndFlags);
-    COPY_MEMBER_LOAD(pObj, pChunk, m_fViewDistanceMultiplier);
-    COPY_MEMBER_LOAD(pObj, pChunk, m_ucLodRatio);
-    COPY_MEMBER_LOAD(pObj, pChunk, m_cShadowLodBias);
-    pObj->m_dwRndFlags &= ~(ERF_HIDDEN | ERF_SELECTED);
-    if (pObj->m_dwRndFlags & ERF_CASTSHADOWMAPS)
-    {
-        pObj->m_dwRndFlags |= ERF_HAS_CASTSHADOWMAPS;
-    }
-
-    if (NULL != pLayerVisibility)
-    {
-        const uint16 newLayerId = pLayerVisibility->pLayerIdTranslation[pChunk->m_nLayerId];
-        pObj->SetLayerId(newLayerId);
-    }
-    else
-    {
-        pObj->SetLayerId(pChunk->m_nLayerId);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline static uint8 CheckLayerVisibility(const uint16 layerId, const SLayerVisibility* pLayerVisibility)
-{
-    return pLayerVisibility->pLayerVisibilityMask[layerId >> 3] & (1 << (layerId & 7));
-}
-
-//////////////////////////////////////////////////////////////////////////
-int COctreeNode::SaveObjects([[maybe_unused]] CMemoryBlock* pMemBlock, [[maybe_unused]] std::vector<IStatObj*>* pStatObjTable, [[maybe_unused]] std::vector<_smart_ptr<IMaterial> >* pMatTable, [[maybe_unused]] std::vector<IStatInstGroup*>* pStatInstGroupTable, [[maybe_unused]] EEndian eEndian, [[maybe_unused]] const SHotUpdateInfo* pExportInfo)
-{
-# if !ENGINE_ENABLE_COMPILATION
-    CryFatalError("serialization code removed, please enable ENGINE_ENABLE_COMPILATION in Cry3DEngine/StdAfx.h");
-    return 0;
-# else
-    uint32 nObjTypeMask = pExportInfo ? pExportInfo->nObjTypeMask : (uint32) ~0;
-
-    int nBlockSize = 0;
-
-    //  FreeAreaBrushes();
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pObj = m_arrObjects[l].m_pFirstNode; pObj; pObj = pObj->m_pNext)
-        {
-            IRenderNode* pRenderNode = pObj;
-            EERType eType = pRenderNode->GetRenderNodeType();
-
-            if (!(nObjTypeMask & (1 << eType)))
-            {
-                continue;
-            }
-
-            if ((pRenderNode->GetRndFlags() & ERF_COMPONENT_ENTITY) != 0)
-            {
-                continue;
-            }
-
-            nBlockSize += GetSingleObjectSize(pObj, pExportInfo);
-        }
-    }
-
-    if (!pMemBlock || !nBlockSize)
-    {
-        return nBlockSize;
-    }
-
-    pMemBlock->Allocate(nBlockSize);
-    byte* pPtr = (byte*)pMemBlock->GetData();
-
-    int nDatanSize = nBlockSize;
-
-    for (int l = 0; l < eRNListType_ListsNum; l++)
-    {
-        for (IRenderNode* pRenderNode = m_arrObjects[l].m_pFirstNode; pRenderNode; pRenderNode = pRenderNode->m_pNext)
-        {
-            EERType eType = pRenderNode->GetRenderNodeType();
-
-            if (!(nObjTypeMask & (1 << eType)))
-            {
-                continue;
-            }
-
-            if ((pRenderNode->GetRndFlags() & ERF_COMPONENT_ENTITY) != 0)
-            {
-                continue;
-            }
-
-            SaveSingleObject(pPtr, nDatanSize, pRenderNode, pStatObjTable, pMatTable, pStatInstGroupTable, eEndian, pExportInfo);
-        }
-    }
-
-    assert(pPtr == (byte*)pMemBlock->GetData() + nBlockSize);
-    assert(nDatanSize == 0);
-
-    return nBlockSize;
-# endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-int COctreeNode::LoadObjects(byte* pPtr, byte* pEndPtr, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, EEndian eEndian, int nChunkVersion, const SLayerVisibility* pLayerVisibility)
-{
-    while (pPtr < pEndPtr)
-    {
-        LoadSingleObject(pPtr, pStatObjTable, pMatTable, eEndian, nChunkVersion, pLayerVisibility, m_nSID);
-    }
-
-    return 0;
-}
-
-int COctreeNode::GetSingleObjectSize(IRenderNode* pObj, [[maybe_unused]] const SHotUpdateInfo* pExportInfo)
-{
-    IRenderNode* pRenderNode = pObj;
-    EERType eType = pRenderNode->GetRenderNodeType();
-
-    int nBlockSize = 0;
-
-    if (eType == eERType_Decal  && !(pRenderNode->GetRndFlags() & ERF_PROCEDURAL))
-    {
-        nBlockSize += sizeof(eType);
-        nBlockSize += sizeof(SDecalChunk);
-    }
-    else if (eType == eERType_WaterVolume)
-    {
-        CWaterVolumeRenderNode* pWVRN(static_cast< CWaterVolumeRenderNode* >(pRenderNode));
-        const SWaterVolumeSerialize* pSerParams(pWVRN->GetSerializationParams());
-        if (pSerParams && pWVRN->m_hasToBeSerialised)
-        {
-            nBlockSize += sizeof(eType);
-            nBlockSize += sizeof(SWaterVolumeChunk);
-            nBlockSize += (pSerParams->m_vertices.size() + pSerParams->m_physicsAreaContour.size()) * sizeof(SWaterVolumeVertex);
-            int cntAux;
-            pWVRN->GetAuxSerializationDataPtr(cntAux);
-            nBlockSize += cntAux * sizeof(float);
-        }
-    }
-    else if (eType == eERType_DistanceCloud)
-    {
-        nBlockSize += sizeof(eType);
-        nBlockSize += sizeof(SDistanceCloudChunk);
-    }
-    // align to 4
-    while (UINT_PTR(nBlockSize) & 3)
-    {
-        nBlockSize++;
-    }
-
-    return nBlockSize;
-}
-
-void COctreeNode::SaveSingleObject(byte*& pPtr, int& nDatanSize, IRenderNode* pEnt, [[maybe_unused]] std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, [[maybe_unused]] std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, [[maybe_unused]] const SHotUpdateInfo* pExportInfo)
-{
-    EERType eType = pEnt->GetRenderNodeType();
-
-    if (eERType_Decal == eType  && !(pEnt->GetRndFlags() & ERF_PROCEDURAL))
-    {
-        AddToPtr(pPtr, nDatanSize, eType, eEndian);
-
-        CDecalRenderNode* pObj((CDecalRenderNode*)pEnt);
-
-        SDecalChunk chunk;
-
-        CopyCommonData(&chunk, pObj);
-
-        // decal properties
-        const SDecalProperties* pDecalProperties(pObj->GetDecalProperties());
-        assert(pDecalProperties);
-        chunk.m_projectionType = pDecalProperties->m_projectionType;
-        chunk.m_deferred = pDecalProperties->m_deferred;
-        chunk.m_pos = pDecalProperties->m_pos;
-        chunk.m_normal = pDecalProperties->m_normal;
-        chunk.m_explicitRightUpFront = pDecalProperties->m_explicitRightUpFront;
-        chunk.m_radius = pDecalProperties->m_radius;
-        chunk.m_depth = pDecalProperties->m_depth;
-
-        chunk.m_nMaterialId = CObjManager::GetItemId(pMatTable, pObj->GetMaterial());
-        chunk.m_nSortPriority = pDecalProperties->m_sortPrio;
-
-        AddToPtr(pPtr, nDatanSize, chunk, eEndian);
-    }
-    else if (eERType_WaterVolume == eType)
-    {
-        CWaterVolumeRenderNode* pObj((CWaterVolumeRenderNode*)pEnt);
-
-        if (pObj->m_hasToBeSerialised)
-        {
-            // get access to serialization parameters
-            const SWaterVolumeSerialize* pSerData(pObj->GetSerializationParams());
-            if (pSerData)
-            {
-                //assert( pSerData ); // trying to save level outside the editor?
-
-                // save type
-                AddToPtr(pPtr, nDatanSize, eType, eEndian);
-
-                // save node data
-                SWaterVolumeChunk chunk;
-                int cntAux;
-                float* pAuxData = pObj->GetAuxSerializationDataPtr(cntAux);
-
-                CopyCommonData(&chunk, pObj);
-
-                chunk.m_volumeTypeAndMiscBits = (pSerData->m_volumeType & 0xFFFF) | ((pSerData->m_capFogAtVolumeDepth ? 1 : 0) << 16) | ((pSerData->m_fogColorAffectedBySun ? 0 : 1) << 17) | (cntAux << 24);
-                chunk.m_volumeID = pSerData->m_volumeID;
-
-                chunk.m_materialID = CObjManager::GetItemId(pMatTable, pSerData->m_pMaterial);
-
-                chunk.m_fogDensity = pSerData->m_fogDensity;
-                chunk.m_fogColor = pSerData->m_fogColor;
-                chunk.m_fogPlane = pSerData->m_fogPlane;
-                chunk.m_fogShadowing = pSerData->m_fogShadowing;
-
-                chunk.m_caustics = pSerData->m_caustics;
-                chunk.m_causticIntensity = pSerData->m_causticIntensity;
-                chunk.m_causticTiling = pSerData->m_causticTiling;
-                chunk.m_causticHeight = pSerData->m_causticHeight;
-
-                chunk.m_uTexCoordBegin = pSerData->m_uTexCoordBegin;
-                chunk.m_uTexCoordEnd = pSerData->m_uTexCoordEnd;
-                chunk.m_surfUScale = pSerData->m_surfUScale;
-                chunk.m_surfVScale = pSerData->m_surfVScale;
-                chunk.m_numVertices = pSerData->m_vertices.size();
-
-                chunk.m_volumeDepth = pSerData->m_volumeDepth;
-                chunk.m_streamSpeed = pSerData->m_streamSpeed;
-                chunk.m_numVerticesPhysAreaContour = pSerData->m_physicsAreaContour.size();
-
-                AddToPtr(pPtr, nDatanSize, chunk, eEndian);
-                AddToPtr(pPtr, pAuxData, cntAux, eEndian);
-                nDatanSize -= cntAux * sizeof(pAuxData[0]);
-
-                // save vertices
-                for (size_t i(0); i < pSerData->m_vertices.size(); ++i)
-                {
-                    SWaterVolumeVertex v;
-                    v.m_xyz = pSerData->m_vertices[i];
-
-                    AddToPtr(pPtr, nDatanSize, v, eEndian);
-                }
-
-                // save physics area contour vertices
-                for (size_t i(0); i < pSerData->m_physicsAreaContour.size(); ++i)
-                {
-                    SWaterVolumeVertex v;
-                    v.m_xyz = pSerData->m_physicsAreaContour[i];
-
-                    AddToPtr(pPtr, nDatanSize, v, eEndian);
-                }
-            }
-        }
-    }
-    else if (eERType_DistanceCloud == eType)
-    {
-        AddToPtr(pPtr, nDatanSize, eType, eEndian);
-
-        CDistanceCloudRenderNode* pObj((CDistanceCloudRenderNode*)pEnt);
-
-        SDistanceCloudChunk chunk;
-
-        CopyCommonData(&chunk, pObj);
-
-        // distance cloud properties
-        SDistanceCloudProperties properties(pObj->GetProperties());
-        chunk.m_pos = properties.m_pos;
-        chunk.m_sizeX = properties.m_sizeX;
-        chunk.m_sizeY = properties.m_sizeY;
-        chunk.m_rotationZ = properties.m_rotationZ;
-        chunk.m_materialID = CObjManager::GetItemId(pMatTable, pObj->GetMaterial());
-
-        AddToPtr(pPtr, nDatanSize, chunk, eEndian);
-    }
-
-    // align to 4
-    while (UINT_PTR(pPtr) & 3)
-    {
-        byte emptyByte = 222;
-        memcpy(pPtr, &emptyByte, sizeof(emptyByte));
-        pPtr += sizeof(emptyByte);
-        nDatanSize -= sizeof(emptyByte);
-    }
-}
-
-void COctreeNode::LoadSingleObject(byte*& pPtr, [[maybe_unused]] std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial> >* pMatTable, EEndian eEndian, [[maybe_unused]] int nChunkVersion, const SLayerVisibility* pLayerVisibility, int nSID)
-{
-    EERType eType = *StepData<EERType>(pPtr, eEndian);
-
-    // For these structures, our Endian swapping is built in to the member copy.
-    if (eERType_Decal == eType)
-    {
-        SDecalChunk* pChunk(StepData<SDecalChunk>(pPtr, eEndian));
-        if (!CheckRenderFlagsMinSpec(pChunk->m_dwRndFlags))
-        {
-            return;
-        }
-
-        if (Get3DEngine()->IsLayerSkipped(pChunk->m_nLayerId))
-        {
-            return;
-        }
-
-        CDecalRenderNode* pObj(new CDecalRenderNode());
-
-        // common node data
-        pObj->SetBBox(pChunk->m_WSBBox);
-        LoadCommonData(pChunk, pObj, pLayerVisibility);
-
-        // decal properties
-        SDecalProperties properties;
-
-        switch (pChunk->m_projectionType)
-        {
-        case SDecalProperties::eProjectOnTerrainAndStaticObjects:
-        {
-            properties.m_projectionType = SDecalProperties::eProjectOnTerrainAndStaticObjects;
-            break;
-        }
-        case SDecalProperties::eProjectOnTerrain:
-        {
-            properties.m_projectionType = SDecalProperties::eProjectOnTerrain;
-            break;
-        }
-        case SDecalProperties::ePlanar:
-        default:
-        {
-            properties.m_projectionType = SDecalProperties::ePlanar;
-            break;
-        }
-        }
-        memcpy(&properties.m_pos, &pChunk->m_pos, sizeof (pChunk->m_pos));
-        memcpy(&properties.m_normal, &pChunk->m_normal, sizeof (pChunk->m_normal));
-        memcpy(&properties.m_explicitRightUpFront, &pChunk->m_explicitRightUpFront, sizeof (pChunk->m_explicitRightUpFront));
-        memcpy(&properties.m_radius, &pChunk->m_radius, sizeof(pChunk->m_radius));
-        memcpy(&properties.m_depth, &pChunk->m_depth, sizeof(pChunk->m_depth));
-
-        _smart_ptr<IMaterial> pMaterial(CObjManager::GetItemPtr(pMatTable, pChunk->m_nMaterialId));
-        assert(pMaterial);
-        properties.m_pMaterialName = pMaterial ? pMaterial->GetName() : "";
-        properties.m_sortPrio = pChunk->m_nSortPriority;
-        properties.m_deferred = pChunk->m_deferred;
-
-        pObj->SetDecalProperties(properties);
-
-        // set object visibility
-        if (NULL != pLayerVisibility)
-        {
-            CRY_ASSERT(pChunk->m_nLayerId != 0);
-            if (!CheckLayerVisibility(pObj->GetLayerId(), pLayerVisibility))
-            {
-                pObj->SetRndFlags(ERF_HIDDEN, true);
-            }
-        }
-        else if (Get3DEngine()->IsAreaActivationInUse())
-        {
-            // keep everything deactivated, game will activate it later
-            pObj->SetRndFlags(ERF_HIDDEN, true);
-        }
-
-        //if( pObj->GetMaterialID() != pChunk->m_materialID )
-        if (pObj->GetMaterial() != pMaterial)
-        {
-            const char* pMatName("_can't_resolve_material_name_");
-            int32 matID(pChunk->m_nMaterialId);
-            if (matID >= 0 && matID < (int)pMatTable->size())
-            {
-                pMatName = pMaterial ? pMaterial->GetName() : "";
-            }
-            Warning("Warning: Removed placement decal at (%4.2f, %4.2f, %4.2f) with invalid material \"%s\"!\n", pChunk->m_pos.x, pChunk->m_pos.y, pChunk->m_pos.z, pMatName);
-            pObj->ReleaseNode();
-        }
-        else
-        {
-            Get3DEngine()->RegisterEntity(pObj, nSID, nSID);
-            GetObjManager()->GetDecalsToPrecreate().push_back(pObj);
-        }
-    }
-    else if (eERType_WaterVolume == eType)
-    {
-        // read common info
-        SWaterVolumeChunk* pChunk(StepData<SWaterVolumeChunk>(pPtr, eEndian));
-        if (!CheckRenderFlagsMinSpec(pChunk->m_dwRndFlags) || Get3DEngine()->IsLayerSkipped(pChunk->m_nLayerId))
-        {
-            for (uint32 j(0); j < pChunk->m_numVertices; ++j)
-            {
-                StepData<SWaterVolumeVertex>(pPtr, eEndian);
-            }
-
-            for (uint32 j(0); j < pChunk->m_numVerticesPhysAreaContour; ++j)
-            {
-                StepData<SWaterVolumeVertex>(pPtr, eEndian);
-            }
-
-            return;
-        }
-
-        CWaterVolumeRenderNode* pObj(new CWaterVolumeRenderNode());
-
-        int auxCntSrc = pChunk->m_volumeTypeAndMiscBits >> 24, auxCntDst;
-        float* pAuxDataDst = pObj->GetAuxSerializationDataPtr(auxCntDst);
-        StepData<float>(pPtr, auxCntSrc, eEndian);
-        memcpy(pAuxDataDst, pAuxDataDst, min(auxCntSrc, auxCntDst) * sizeof(float));
-
-        // read common node data
-        pObj->SetBBox(pChunk->m_WSBBox);
-        LoadCommonData(pChunk, pObj, pLayerVisibility);
-
-        // read vertices
-        std::vector<Vec3> vertices;
-        vertices.reserve(pChunk->m_numVertices);
-        for (uint32 j(0); j < pChunk->m_numVertices; ++j)
-        {
-            SWaterVolumeVertex* pVertex(StepData<SWaterVolumeVertex>(pPtr, eEndian));
-            vertices.push_back(pVertex->m_xyz);
-        }
-
-        // read physics area contour vertices
-        std::vector<Vec3> physicsAreaContour;
-        physicsAreaContour.reserve(pChunk->m_numVerticesPhysAreaContour);
-        for (uint32 j(0); j < pChunk->m_numVerticesPhysAreaContour; ++j)
-        {
-            SWaterVolumeVertex* pVertex(StepData<SWaterVolumeVertex>(pPtr, eEndian));
-            physicsAreaContour.push_back(pVertex->m_xyz);
-        }
-
-        const int volumeType = pChunk->m_volumeTypeAndMiscBits & 0xFFFF;
-        const bool capFogAtVolumeDepth = ((pChunk->m_volumeTypeAndMiscBits & 0x10000) != 0) ? true : false;
-        const bool fogColorAffectedBySun = ((pChunk->m_volumeTypeAndMiscBits & 0x20000) == 0) ? true : false;
-        const bool enableCaustics = (pChunk->m_caustics != 0) ? true : false;
-
-        // create volume
-        switch (volumeType)
-        {
-        case IWaterVolumeRenderNode::eWVT_River:
-        {
-            pObj->CreateRiver(pChunk->m_volumeID, &vertices[0], pChunk->m_numVertices, pChunk->m_uTexCoordBegin, pChunk->m_uTexCoordEnd, Vec2(pChunk->m_surfUScale, pChunk->m_surfVScale), pChunk->m_fogPlane, false, nSID);
-            break;
-        }
-        case IWaterVolumeRenderNode::eWVT_Area:
-        {
-            pObj->CreateArea(pChunk->m_volumeID, &vertices[0], pChunk->m_numVertices, Vec2(pChunk->m_surfUScale, pChunk->m_surfVScale),  pChunk->m_fogPlane, false, nSID);
-            break;
-        }
-        case IWaterVolumeRenderNode::eWVT_Ocean:
-        {
-            assert(!"COctreeNode::SerializeObjects( ... ) -- Water volume of type \"Ocean\" not supported yet!");
-            break;
-        }
-        default:
-        {
-            assert(!"COctreeNode::SerializeObjects( ... ) -- Invalid water volume type!");
-            break;
-        }
-        }
-
-        // set material
-        _smart_ptr<IMaterial> pMaterial(CObjManager::GetItemPtr(pMatTable, pChunk->m_materialID));
-
-
-        // set properties
-        pObj->SetFogDensity(pChunk->m_fogDensity);
-        pObj->SetFogColor(pChunk->m_fogColor);
-        pObj->SetFogColorAffectedBySun(fogColorAffectedBySun);
-        pObj->SetFogShadowing(pChunk->m_fogShadowing);
-
-        pObj->SetVolumeDepth(pChunk->m_volumeDepth);
-        pObj->SetStreamSpeed(pChunk->m_streamSpeed);
-        pObj->SetCapFogAtVolumeDepth(capFogAtVolumeDepth);
-
-        pObj->SetCaustics(enableCaustics);
-        pObj->SetCausticIntensity(pChunk->m_causticIntensity);
-        pObj->SetCausticTiling(pChunk->m_causticTiling);
-        pObj->SetCausticHeight(pChunk->m_causticHeight);
-
-        // set object visibility
-        if (NULL != pLayerVisibility)
-        {
-            CRY_ASSERT(pChunk->m_nLayerId != 0);
-            if (!CheckLayerVisibility(pObj->GetLayerId(), pLayerVisibility))
-            {
-                pObj->SetRndFlags(ERF_HIDDEN, true);
-            }
-        }
-        else if (Get3DEngine()->IsAreaActivationInUse())
-        {
-            // keep everything deactivated, game will activate it later
-            pObj->SetRndFlags(ERF_HIDDEN, true);
-        }
-
-        // set physics
-        if (!physicsAreaContour.empty())
-        {
-            switch (volumeType)
-            {
-            case IWaterVolumeRenderNode::eWVT_River:
-            {
-                pObj->SetRiverPhysicsArea(&physicsAreaContour[0], physicsAreaContour.size());
-                break;
-            }
-            case IWaterVolumeRenderNode::eWVT_Area:
-            {
-                pObj->SetAreaPhysicsArea(&physicsAreaContour[0], physicsAreaContour.size());
-                break;
-            }
-            case IWaterVolumeRenderNode::eWVT_Ocean:
-            {
-                assert(!"COctreeNode::SerializeObjects( ... ) -- Water volume of type \"Ocean\" not supported yet!");
-                break;
-            }
-            default:
-            {
-                assert(!"COctreeNode::SerializeObjects( ... ) -- Invalid water volume type!");
-                break;
-            }
-            }
-
-            if (!(Get3DEngine()->IsAreaActivationInUse() && GetCVars()->e_ObjectLayersActivationPhysics) && !(pChunk->m_dwRndFlags & ERF_NO_PHYSICS))
-            {
-                pObj->Physicalize();
-            }
-        }
-
-        // set material
-        pObj->SetMaterial(pMaterial);
-
-        Get3DEngine()->RegisterEntity(pObj, nSID, nSID);
-    }
-    else if (eERType_DistanceCloud == eType)
-    {
-        SDistanceCloudChunk* pChunk(StepData<SDistanceCloudChunk>(pPtr, eEndian));
-        if (!CheckRenderFlagsMinSpec(pChunk->m_dwRndFlags))
-        {
-            return;
-        }
-
-        if (Get3DEngine()->IsLayerSkipped(pChunk->m_nLayerId))
-        {
-            return;
-        }
-
-        CDistanceCloudRenderNode* pObj(new CDistanceCloudRenderNode());
-
-        // common node data
-        AABB box;
-        memcpy(&box, &pChunk->m_WSBBox, sizeof(AABB));
-        pObj->SetBBox(box);
-        LoadCommonData(pChunk, pObj, pLayerVisibility);
-
-        // distance cloud properties
-        SDistanceCloudProperties properties;
-
-        properties.m_pos = pChunk->m_pos;
-        properties.m_sizeX = pChunk->m_sizeX;
-        properties.m_sizeY = pChunk->m_sizeY;
-        properties.m_rotationZ = pChunk->m_rotationZ;
-
-        _smart_ptr<IMaterial> pMaterial(CObjManager::GetItemPtr(pMatTable, pChunk->m_materialID));
-        assert(pMaterial);
-        properties.m_pMaterialName = pMaterial ? pMaterial->GetName() : "";
-
-        pObj->SetProperties(properties);
-
-        // set object visibility
-        if (NULL != pLayerVisibility)
-        {
-            CRY_ASSERT(pChunk->m_nLayerId != 0);
-            if (!CheckLayerVisibility(pObj->GetLayerId(), pLayerVisibility))
-            {
-                pObj->SetRndFlags(ERF_HIDDEN, true);
-            }
-        }
-        else if (Get3DEngine()->IsAreaActivationInUse())
-        {
-            // keep everything deactivated, game will activate it later
-            pObj->SetRndFlags(ERF_HIDDEN, true);
-        }
-
-        if (pObj->GetMaterial() != pMaterial)
-        {
-            const char* pMatName("_can't_resolve_material_name_");
-            int32 matID(pChunk->m_materialID);
-            if (matID >= 0 && matID < (int32)(*pMatTable).size())
-            {
-                pMatName = pMaterial ? pMaterial->GetName() : "";
-            }
-            Warning("Warning: Removed distance cloud at (%4.2f, %4.2f, %4.2f) with invalid material \"%s\"!\n", pChunk->m_pos.x, pChunk->m_pos.y, pChunk->m_pos.z, pMatName);
-            pObj->ReleaseNode();
-        }
-        else
-        {
-            Get3DEngine()->RegisterEntity(pObj, nSID, nSID);
-        }
-    }
-    else
-    {
-        assert(!"Unsupported object type");
-    }
-
-    // align to 4
-    while (UINT_PTR(pPtr) & 3)
-    {
-        assert(*pPtr == 222);
-        pPtr++;
-    }
-}
-
diff --git a/Code/CryEngine/Cry3DEngine/ObjectsTree_Serialize_info.h b/Code/CryEngine/Cry3DEngine/ObjectsTree_Serialize_info.h
deleted file mode 100644
index b5194a233b..0000000000
--- a/Code/CryEngine/Cry3DEngine/ObjectsTree_Serialize_info.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_OBJECTSTREE_SERIALIZE_INFO_H
-#define CRYINCLUDE_CRY3DENGINE_OBJECTSTREE_SERIALIZE_INFO_H
-#pragma once
-
-STRUCT_INFO_BEGIN(SRenderNodeChunk)
-STRUCT_VAR_INFO(m_WSBBox, TYPE_INFO(AABB))
-STRUCT_VAR_INFO(m_nLayerId, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_cShadowLodBias, TYPE_INFO(int8))
-STRUCT_VAR_INFO(m_ucDummy,   TYPE_INFO(uint8))
-STRUCT_VAR_INFO(m_dwRndFlags, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_nObjectTypeIndex, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_pad16, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_fViewDistanceMultiplier, TYPE_INFO(float))
-STRUCT_VAR_INFO(m_ucLodRatio, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(m_pad8, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(m_pad16B, TYPE_INFO(uint16))
-STRUCT_INFO_END(SRenderNodeChunk)
-
-STRUCT_INFO_BEGIN(SDecalChunk)
-STRUCT_BASE_INFO(SRenderNodeChunk)
-STRUCT_VAR_INFO(m_projectionType, TYPE_INFO(int16))
-STRUCT_VAR_INFO(m_deferred, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(m_pad8, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(m_depth, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_pos, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(m_normal, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(m_explicitRightUpFront, TYPE_INFO(Matrix33))
-STRUCT_VAR_INFO(m_radius, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_nMaterialId, TYPE_INFO(int32))
-STRUCT_VAR_INFO(m_nSortPriority, TYPE_INFO(int32))
-STRUCT_INFO_END(SDecalChunk)
-
-STRUCT_INFO_BEGIN(SWaterVolumeChunk)
-STRUCT_BASE_INFO(SRenderNodeChunk)
-STRUCT_VAR_INFO(m_volumeTypeAndMiscBits, TYPE_INFO(int32))
-STRUCT_VAR_INFO(m_volumeID, TYPE_INFO(uint64))
-STRUCT_VAR_INFO(m_materialID, TYPE_INFO(int32))
-STRUCT_VAR_INFO(m_fogDensity, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_fogColor, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(m_fogPlane, TYPE_INFO(Plane))
-STRUCT_VAR_INFO(m_fogShadowing, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_caustics, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(m_pad8, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(m_pad16, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_causticIntensity, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_causticTiling, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_causticHeight, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_uTexCoordBegin, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_uTexCoordEnd, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_surfUScale, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_surfVScale, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_numVertices, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_volumeDepth, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_streamSpeed, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_numVerticesPhysAreaContour, TYPE_INFO(uint32))
-STRUCT_INFO_END(SWaterVolumeChunk)
-
-STRUCT_INFO_BEGIN(SWaterVolumeVertex)
-STRUCT_VAR_INFO(m_xyz, TYPE_INFO(Vec3))
-STRUCT_INFO_END(SWaterVolumeVertex)
-
-STRUCT_INFO_BEGIN(SDistanceCloudChunk)
-STRUCT_BASE_INFO(SRenderNodeChunk)
-STRUCT_VAR_INFO(m_pos, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(m_sizeX, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_sizeY, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_rotationZ, TYPE_INFO(f32))
-STRUCT_VAR_INFO(m_materialID, TYPE_INFO(int32))
-STRUCT_INFO_END(SDistanceCloudChunk)
-
-#endif // CRYINCLUDE_CRY3DENGINE_OBJECTSTREE_SERIALIZE_INFO_H
diff --git a/Code/CryEngine/Cry3DEngine/Ocean.cpp b/Code/CryEngine/Cry3DEngine/Ocean.cpp
deleted file mode 100644
index 98e45f6386..0000000000
--- a/Code/CryEngine/Cry3DEngine/Ocean.cpp
+++ /dev/null
@@ -1,1002 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Create and draw ocean water geometry (screen space grid, cycle buffers)
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "Ocean.h"
-#include "CullBuffer.h"
-#include "3dEngine.h"
-#include "ObjMan.h"
-#include "MatMan.h"
-#include "VisAreas.h"
-
-#include "Environment/OceanEnvironmentBus.h"
-
-ITimer* COcean::m_pTimer = 0;
-CREWaterOcean* COcean::m_pOceanRE = 0;
-uint32 COcean::m_nVisiblePixelsCount = ~0;
-float COcean::m_fWaterLevelInfo = WATER_LEVEL_UNKNOWN;
-
-// defined in CryEngine\Cry3DEngine\3dEngine.cpp
-namespace OceanGlobals
-{
-    extern float g_oceanStep;
-}
-
-COcean::COcean(_smart_ptr<IMaterial> pMat, float fWaterLevel)
-{
-    m_pRenderMesh = 0;
-    m_pBottomCapRenderMesh = 0;
-    m_swathWidth = 0;
-    m_bUsingFFT = false;
-    m_bUseTessHW = false;
-    m_fWaterLevel = fWaterLevel;
-
-    memset(m_fRECustomData, 0, sizeof(m_fRECustomData));
-    memset(m_fREOceanBottomCustomData, 0, sizeof(m_fREOceanBottomCustomData));
-    m_windUvTransform = AZ::Vector2(0.0f, 0.0f);
-
-    SetMaterial(pMat);
-    m_fLastFov = 0;
-    m_fLastVisibleFrameTime = 0.0f;
-
-    m_pShaderOcclusionQuery = GetRenderer()->EF_LoadShader("OcclusionTest", 0);
-
-    memset(m_pREOcclusionQueries, 0, sizeof(m_pREOcclusionQueries));
-
-    m_nLastVisibleFrameId = 0;
-
-    m_pBottomCapMaterial = GetMatMan()->LoadMaterial("EngineAssets/Materials/Water/WaterOceanBottom", false);
-    m_pFogIntoMat = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/OceanInto", false);
-    m_pFogOutofMat = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/OceanOutof", false);
-    m_pFogIntoMatLowSpec = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/OceanIntoLowSpec", false);
-    m_pFogOutofMatLowSpec = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/OceanOutofLowSpec", false);
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-    {
-        m_pWVRE[i] = static_cast<CREWaterVolume*>(GetRenderer()->EF_CreateRE(eDATA_WaterVolume));
-        if (m_pWVRE[i])
-        {
-            m_pWVRE[i]->m_drawWaterSurface = false;
-            m_pWVRE[i]->m_pParams = &m_wvParams[i];
-            m_pWVRE[i]->m_pOceanParams = &m_wvoParams[i];
-        }
-    }
-
-    m_pOceanRE = static_cast<CREWaterOcean*>(GetRenderer()->EF_CreateRE(eDATA_WaterOcean));
-
-    m_nVertsCount = 0;
-    m_nIndicesCount = 0;
-
-    m_bOceanFFT = false;
-}
-
-
-COcean::~COcean()
-{
-    for (int32 x = 0; x < CYCLE_BUFFERS_NUM; ++x)
-    {
-        if (m_pREOcclusionQueries[x])
-        {
-            m_pREOcclusionQueries[x]->Release(true);
-        }
-    }
-
-    m_pRenderMesh = NULL;
-    m_pBottomCapRenderMesh = NULL;
-
-    SAFE_RELEASE(m_pOceanRE);
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-    {
-        SAFE_RELEASE(m_pWVRE[i]);
-    }
-}
-
-int32 COcean::GetMemoryUsage()
-{
-    int32 nSize = 0;
-
-    nSize += sizeofVector(m_pMeshIndices);
-    nSize += sizeofVector(m_pMeshVerts);
-    nSize += sizeofVector(m_pBottomCapVerts);
-    nSize += sizeofVector(m_pBottomCapIndices);
-
-    return nSize;
-}
-
-void COcean::Update(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    C3DEngine* p3DEngine = (C3DEngine*)Get3DEngine();
-    IRenderer* pRenderer = GetRenderer();
-    if (passInfo.IsRecursivePass() ||  !passInfo.RenderWaterOcean() || !m_pMaterial)
-    {
-        return;
-    }
-
-    const CCamera& rCamera = passInfo.GetCamera();
-    uint32 nBufID = passInfo.GetFrameID() % CYCLE_BUFFERS_NUM;
-
-    Vec3 vCamPos = rCamera.GetPosition();
-    float fWaterLevel = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : p3DEngine->GetWaterLevel();
-
-    // No hardware FFT support
-    m_bOceanFFT = false;
-    if ((pRenderer->GetFeatures() & (RFT_HW_VERTEXTEXTURES) && GetCVars()->e_WaterOceanFFT) && pRenderer->EF_GetShaderQuality(eST_Water) >= eSQ_High)
-    {
-        m_bOceanFFT = true;
-    }
-
-    if (vCamPos.z < fWaterLevel)
-    {
-        // if camera is in indoors and lower than ocean level
-        // and exit portals are higher than ocean level - skip ocean rendering
-        CVisArea* pVisArea = (CVisArea*)p3DEngine->GetVisAreaFromPos(vCamPos);
-        if (pVisArea && !pVisArea->IsPortal())
-        {
-            for (int32 i = 0; i < pVisArea->m_lstConnections.Count(); i++)
-            {
-                if (pVisArea->m_lstConnections[i]->IsConnectedToOutdoor() && pVisArea->m_lstConnections[i]->m_boxArea.min.z < fWaterLevel)
-                {
-                    break; // there is portal making ocean visible
-                }
-                if (i == pVisArea->m_lstConnections.Count())
-                {
-                    return; // ocean surface is not visible
-                }
-            }
-        }
-    }
-
-    bool bWaterVisible = IsVisible(passInfo);
-    float _fWaterPlaneSize = rCamera.GetFarPlane();
-
-    // Check if water surface occluded
-    if (fabs(m_fLastFov - rCamera.GetFov()) < 0.01f && GetCVars()->e_HwOcclusionCullingWater && passInfo.IsGeneralPass())
-    {
-        AABB boxOcean(Vec3(vCamPos.x - _fWaterPlaneSize, vCamPos.y - _fWaterPlaneSize, fWaterLevel),
-            Vec3(vCamPos.x + _fWaterPlaneSize, vCamPos.y + _fWaterPlaneSize, fWaterLevel));
-
-        if ((!GetVisAreaManager()->IsOceanVisible() && rCamera.IsAABBVisible_EM(boxOcean)) ||
-            (GetVisAreaManager()->IsOceanVisible() && rCamera.IsAABBVisible_E(boxOcean)))
-        {
-            // make element if not ready
-            if (!m_pREOcclusionQueries[nBufID])
-            {
-                m_pREOcclusionQueries[nBufID] = (CREOcclusionQuery*)GetRenderer()->EF_CreateRE(eDATA_OcclusionQuery);
-                m_pREOcclusionQueries[nBufID]->m_pRMBox = (CRenderMesh*)GetObjManager()->GetRenderMeshBox();
-            }
-
-            // get last test result
-            //  if((m_pREOcclusionQueries[nFillThreadID][nBufID]->m_nCheckFrame - passInfo.GetFrameID())<2)
-            {
-                COcean::m_nVisiblePixelsCount = m_pREOcclusionQueries[nBufID]->m_nVisSamples;
-                if (COcean::IsWaterVisibleOcclusionCheck())
-                {
-                    m_nLastVisibleFrameId = passInfo.GetFrameID();
-                    bWaterVisible = true;
-                }
-            }
-
-            // request new test
-            m_pREOcclusionQueries[nBufID]->m_vBoxMin(boxOcean.min.x, boxOcean.min.y, boxOcean.min.z - 1.0f);
-            m_pREOcclusionQueries[nBufID]->m_vBoxMax(boxOcean.max.x, boxOcean.max.y, boxOcean.max.z);
-
-            m_pREOcclusionQueries[nBufID]->mfReadResult_Try(COcean::m_nVisiblePixelsCount);
-            if (!m_pREOcclusionQueries[nBufID]->m_nDrawFrame || m_pREOcclusionQueries[nBufID]->HasSucceeded())
-            {
-                SShaderItem shItem(m_pShaderOcclusionQuery);
-                CRenderObject* pObj = GetIdentityCRenderObject(passInfo.ThreadID());
-                if (!pObj)
-                {
-                    return;
-                }
-                GetRenderer()->EF_AddEf(m_pREOcclusionQueries[nBufID], shItem, pObj, passInfo, EFSLIST_WATER_VOLUMES, 0, SRendItemSorter::CreateDefaultRendItemSorter());
-            }
-        }
-    }
-    else
-    {
-        m_nLastVisibleFrameId = passInfo.GetFrameID();
-        bWaterVisible = true;
-    }
-
-    if (bWaterVisible || vCamPos.z  < fWaterLevel)
-    {
-        m_p3DEngine->SetOceanRenderFlags(OCR_OCEANVOLUME_VISIBLE);
-
-        // lazy mesh creation
-        if (bWaterVisible)
-        {
-            Create();
-        }
-    }
-}
-
-void COcean::Create()
-{
-    // Calculate water geometry and update vertex buffers
-    int32 nScrGridSizeX;
-    int32 nScrGridSizeY;
-
-    GetOceanGridSize(nScrGridSizeX, nScrGridSizeY);
-
-    bool bUseWaterTessHW;
-    GetRenderer()->EF_Query(EFQ_WaterTessellation, bUseWaterTessHW);
-
-    // Generate screen space grid
-    if ((m_bOceanFFT && m_bUsingFFT != m_bOceanFFT) || m_bUseTessHW != bUseWaterTessHW || m_swathWidth != GetCVars()->e_WaterTessellationSwathWidth || !m_nVertsCount || !m_nIndicesCount ||  nScrGridSizeX * nScrGridSizeY != m_nPrevGridDim)
-    {
-        m_nPrevGridDim = nScrGridSizeX * nScrGridSizeY;
-        m_pMeshVerts.Clear();
-        m_pMeshIndices.Clear();
-        m_nVertsCount = 0;
-        m_nIndicesCount = 0;
-
-        m_bUsingFFT = m_bOceanFFT;
-        m_bUseTessHW = bUseWaterTessHW;
-        // Update the swath width
-        m_swathWidth = GetCVars()->e_WaterTessellationSwathWidth;
-
-        // Render ocean with screen space tessellation
-
-        int32 nScreenY = GetRenderer()->GetHeight();
-        int32 nScreenX = GetRenderer()->GetWidth();
-
-        if (!nScreenY || !nScreenX)
-        {
-            return;
-        }
-
-        float fRcpScrGridSizeX = 1.0f / ((float) nScrGridSizeX - 1);
-        float fRcpScrGridSizeY = 1.0f / ((float) nScrGridSizeY - 1);
-
-        SVF_P3F_C4B_T2F tmp;
-        Vec3 vv;
-        vv.z = 0;
-
-        m_pMeshVerts.reserve(nScrGridSizeX * nScrGridSizeY);
-        m_pMeshIndices.reserve(nScrGridSizeX * nScrGridSizeY);
-
-        // Grid vertex generation
-        for (int32 y(0); y < nScrGridSizeY; ++y)
-        {
-            vv.y = (float) y * fRcpScrGridSizeY;// + fRcpScrGridSize;
-
-            for (int32 x(0); x < nScrGridSizeX; ++x)
-            {
-                // vert 1
-                vv.x = (float) x * fRcpScrGridSizeX;// + fRcpScrGridSize;
-
-                // store in z edges information
-                float fx = fabs((vv.x) * 2.0f - 1.0f);
-                float fy = fabs((vv.y) * 2.0f - 1.0f);
-                //float fEdgeDisplace = sqrt_tpl(fx*fx + fy * fy);//max(fx, fy);
-                float fEdgeDisplace = max(fx, fy);
-                //sqrt_tpl(fx*fx + fy * fy);
-                vv.z = fEdgeDisplace; //!((y==0 ||y == nScrGridSize-1) || (x==0 || x == nScrGridSize-1));
-
-                tmp.xyz = vv;
-                m_pMeshVerts.Add(tmp);
-            }
-        }
-
-        if (m_bUseTessHW)
-        {
-            // Normal approach
-            int32 nIndex = 0;
-            for (int32 y(0); y < nScrGridSizeY - 1; ++y)
-            {
-                for (int32 x(0); x < nScrGridSizeX - 1; ++x, ++nIndex)
-                {
-                    m_pMeshIndices.Add(nScrGridSizeX * y + x);
-                    m_pMeshIndices.Add(nScrGridSizeX * y + x + 1);
-                    m_pMeshIndices.Add(nScrGridSizeX * (y + 1) + x);
-
-                    m_pMeshIndices.Add(nScrGridSizeX * (y + 1) + x);
-                    m_pMeshIndices.Add(nScrGridSizeX * y + x + 1);
-                    m_pMeshIndices.Add(nScrGridSizeX * (y + 1) + x + 1);
-
-                    //m_pMeshIndices.Add( nIndex );
-                    //m_pMeshIndices.Add( nIndex + 1);
-                    //m_pMeshIndices.Add( nIndex + nScrGridSizeX);
-
-                    //m_pMeshIndices.Add( nIndex + nScrGridSizeX);
-                    //m_pMeshIndices.Add( nIndex + 1);
-                    //m_pMeshIndices.Add( nIndex + nScrGridSizeX + 1);
-                }
-            }
-        }
-        else
-        {
-            // Grid index generation
-
-            if (m_swathWidth < 0)
-            {
-                // Normal approach
-                int32 nIndex = 0;
-                for (int32 y(0); y < nScrGridSizeY - 1; ++y)
-                {
-                    for (int32 x(0); x < nScrGridSizeX; ++x, ++nIndex)
-                    {
-                        m_pMeshIndices.Add(nIndex);
-                        m_pMeshIndices.Add(nIndex + nScrGridSizeX);
-                    }
-
-                    if (nScrGridSizeY - 2 > y)
-                    {
-                        m_pMeshIndices.Add(nIndex + nScrGridSizeY - 1);
-                        m_pMeshIndices.Add(nIndex);
-                    }
-                }
-            }
-            else if(m_swathWidth > 1)
-            {
-                // Boustrophedonic walk
-                //
-                //  0  1  2  3  4
-                //  5  6  7  8  9
-                // 10 11 12 13 14
-                // 15 16 17 18 19
-                //
-                // Should generate the following indices
-                // 0 5 1 6 2 7 3 8 4 9 9 14 14 9 13 8 12 7 11 6 10 5 5 10 10 15 11 16 12 17 13 18 14 19
-                //
-
-                int32 startX = 0, endX = m_swathWidth - 1;
-
-                do
-                {
-                    for (int32 y(0); y < nScrGridSizeY - 1; y += 2)
-                    {
-                        // Forward
-                        for (int32 x(startX); x <= endX; ++x)
-                        {
-                            m_pMeshIndices.Add(y * nScrGridSizeX + x);
-                            m_pMeshIndices.Add((y + 1) * nScrGridSizeX + x);
-                        }
-
-                        // Can we go backwards?
-                        if (y + 2 < nScrGridSizeY)
-                        {
-                            // Restart strip by duplicating last and first of next strip
-                            m_pMeshIndices.Add((y + 1) * nScrGridSizeX + endX);
-                            m_pMeshIndices.Add((y + 2) * nScrGridSizeX + endX);
-
-                            //Backward
-                            for (int32 x(endX); x >= startX; --x)
-                            {
-                                m_pMeshIndices.Add((y + 2) * nScrGridSizeX + x);
-                                m_pMeshIndices.Add((y + 1) * nScrGridSizeX + x);
-                            }
-
-                            // Restart strip
-                            if (y + 2 == nScrGridSizeY - 1 && endX < nScrGridSizeX - 1)
-                            {
-                                if (endX < nScrGridSizeX - 1)
-                                {
-                                    // Need to restart at the top of the next column
-                                    m_pMeshIndices.Add((nScrGridSizeY - 1) * nScrGridSizeX + startX);
-                                    m_pMeshIndices.Add(endX);
-                                }
-                            }
-                            else
-                            {
-                                m_pMeshIndices.Add((y + 1) * nScrGridSizeX + startX);
-                                m_pMeshIndices.Add((y + 2) * nScrGridSizeX + startX);
-                            }
-                        }
-                        else
-                        {
-                            // We can restart to next column
-                            if (endX < nScrGridSizeX - 1)
-                            {
-                                // Restart strip for next swath
-                                m_pMeshIndices.Add((nScrGridSizeY - 1) * nScrGridSizeX + endX);
-                                m_pMeshIndices.Add(endX);
-                            }
-                        }
-                    }
-
-                    startX = endX;
-                    endX   = startX + m_swathWidth - 1;
-
-                    if (endX >= nScrGridSizeX)
-                    {
-                        endX = nScrGridSizeX - 1;
-                    }
-                } while (startX < nScrGridSizeX - 1);
-            }
-            else
-            {
-                AZ_TracePrintf("Ocean", "e_WaterTessellationSwathWidth cannot be 0.")
-            }
-        }
-
-        m_nVertsCount = m_pMeshVerts.Count();
-        m_nIndicesCount = m_pMeshIndices.Count();
-
-        m_pRenderMesh = GetRenderer()->CreateRenderMeshInitialized(
-                m_pMeshVerts.GetElements(),
-                m_pMeshVerts.Count(),
-                eVF_P3F_C4B_T2F,
-                m_pMeshIndices.GetElements(),
-                m_pMeshIndices.Count(),
-                m_bUseTessHW ? prtTriangleList : prtTriangleStrip,
-                "OutdoorWaterGrid", "OutdoorWaterGrid",
-                eRMT_Static);
-
-        m_pRenderMesh->SetChunk(m_pMaterial, 0, m_pMeshVerts.Count(), 0, m_pMeshIndices.Count(), 1.0f, eVF_P3F_C4B_T2F);
-
-        if (m_bOceanFFT)
-        {
-            m_pOceanRE->Create(m_pMeshVerts.Count(), m_pMeshVerts.GetElements(), m_pMeshIndices.Count(), m_pMeshIndices.GetElements(), sizeof(m_pMeshIndices[0]));
-        }
-
-        m_pMeshVerts.Free();
-        m_pMeshIndices.Free();
-    }
-}
-
-void COcean::Render(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // if reaches render stage - means ocean is visible
-
-    C3DEngine* p3DEngine = (C3DEngine*)Get3DEngine();
-    IRenderer* pRenderer(GetRenderer());
-
-    Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-    float fWaterLevel = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : p3DEngine->GetWaterLevel();
-
-    CRenderObject* pObject = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());
-    if (!pObject)
-    {
-        return;
-    }
-    pObject->m_II.m_Matrix.SetIdentity();
-    pObject->m_pRenderNode = this;
-
-    m_fLastFov = passInfo.GetCamera().GetFov();
-
-    // make distance to water level near to zero
-    m_pRenderMesh->SetBBox(vCamPos, vCamPos);
-
-    // test for multiple lights and shadows support
-
-    m_Camera = passInfo.GetCamera();
-    pObject->m_fAlpha = 1.f;
-
-    int32 gridSizeX;
-    int32 gridSizeY;
-    GetOceanGridSize(gridSizeX, gridSizeY);
-    const float tessellationScaleFactor = 1000.0f; // physical size of grid is how many grid tiles per thousand meters.
-    m_fRECustomData[0] = tessellationScaleFactor / (gridSizeX - 1);
-
-    const auto oceanAnimationData = p3DEngine->GetOceanAnimationParams();
-
-    m_fRECustomData[1] = oceanAnimationData.fWindSpeed;
-    m_fRECustomData[2] = oceanAnimationData.fWavesSpeed;
-    m_fRECustomData[3] = oceanAnimationData.fWavesAmount;
-    m_fRECustomData[4] = oceanAnimationData.fWavesSize;
-
-    const float timeDiff = p3DEngine->GetTimer()->GetFrameTime();
-
-    // calculate the wind direction
-    AZ::Vector2 windDirectionVector = AZ::Vector2::CreateFromAngle(oceanAnimationData.fWindDirection);
-
-    // calculate wind offset based on speed and time delta
-    float windFrameOffset = 0.0025f * timeDiff * oceanAnimationData.fWindSpeed;
-    m_windUvTransform += windDirectionVector * windFrameOffset;
-
-    // update constant buffer with the values;
-    m_fRECustomData[6] = m_windUvTransform.GetX();
-    m_fRECustomData[5] = m_windUvTransform.GetY();
-
-    m_fRECustomData[7] = fWaterLevel;
-
-    m_fRECustomData[8] = m_fRECustomData[9] = m_fRECustomData[10] = m_fRECustomData[11] = 0.0f;
-
-    bool isFastpath = GetCVars()->e_WaterOcean == 2;
-    bool bUsingMergedFog = false;
-
-    {
-        Vec3 camPos(passInfo.GetCamera().GetPosition());
-
-        // Check if we outside water volume - we can enable fast path with merged fog version
-        if (camPos.z - fWaterLevel >= oceanAnimationData.fWavesSize)
-        {
-            Vec3 fogColor;
-            if (OceanToggle::IsActive())
-            {
-                AZ::Vector3 oceanFogColor = OceanRequest::GetFogColorPremultiplied();
-                fogColor = Vec3(oceanFogColor.GetX(), oceanFogColor.GetY(), oceanFogColor.GetZ());
-            }
-            else
-            {
-                fogColor = m_p3DEngine->m_oceanFogColor;
-            }
-            Vec3 cFinalFogColor = gEnv->p3DEngine->GetSunColor().CompMul(fogColor);
-            float fogDensity = OceanToggle::IsActive() ? OceanRequest::GetFogDensity() : m_p3DEngine->m_oceanFogDensity;
-            Vec4 vFogParams = Vec4(cFinalFogColor, fogDensity * 1.44269502f);// log2(e) = 1.44269502
-
-            m_fRECustomData[8] = vFogParams.x;
-            m_fRECustomData[9] = vFogParams.y;
-            m_fRECustomData[10] = vFogParams.z;
-            m_fRECustomData[11] = vFogParams.w;
-            if (isFastpath)
-            {
-                bUsingMergedFog = true;
-            }
-        }
-    }
-
-    {
-        CMatInfo* pMatInfo = (CMatInfo*)m_pMaterial.get();
-        float fInstanceDistance = AZ::OceanConstants::s_oceanIsVeryFarAway;
-        pMatInfo->PrecacheMaterial(fInstanceDistance, 0, false);
-    }
-
-    if (!GetCVars()->e_WaterOceanFFT || !m_bOceanFFT)
-    {
-        m_pRenderMesh->SetREUserData(&m_fRECustomData[0]);
-        m_pRenderMesh->AddRenderElements(m_pMaterial, pObject, passInfo, EFSLIST_WATER, 0);
-    }
-    else
-    {
-        SShaderItem& shaderItem(m_pMaterial->GetShaderItem(0));
-        m_pOceanRE->m_CustomData = &m_fRECustomData[0];
-        pRenderer->EF_AddEf(m_pOceanRE, shaderItem, pObject, passInfo, EFSLIST_WATER, 0, SRendItemSorter::CreateDefaultRendItemSorter());
-    }
-
-    bool useOceanBottom = OceanToggle::IsActive() ? OceanRequest::GetUseOceanBottom() : (GetCVars()->e_WaterOceanBottom == 1);
-    if (useOceanBottom)
-    {
-        RenderBottomCap(passInfo);
-    }
-
-    if (!bUsingMergedFog)
-    {
-        RenderFog(passInfo);
-    }
-}
-
-void COcean::SetMaterial(_smart_ptr<IMaterial> pMat)
-{
-    m_pMaterial = pMat;
-}
-
-void COcean::RenderBottomCap(const SRenderingPassInfo& passInfo)
-{
-
-    Vec3 vCamPos = passInfo.GetCamera().GetPosition();
-
-    // Render ocean with screen space tessellation
-
-    int32 nScreenY = GetRenderer()->GetHeight();
-    int32 nScreenX = GetRenderer()->GetWidth();
-
-    if (!nScreenY || !nScreenX)
-    {
-        return;
-    }
-
-    // Calculate water geometry and update vertex buffers
-    static const int32 nScrGridSize = 5;
-    // distance between grid points for -1.0 to 1.0 space.
-    static const float fRcpScrGridSize = 2.0f / static_cast<float>(nScrGridSize - 1);
-
-    if (!m_pBottomCapVerts.Count() || !m_pBottomCapIndices.Count() ||  nScrGridSize * nScrGridSize != m_pBottomCapVerts.Count())
-    {
-        m_pBottomCapVerts.Clear();
-        m_pBottomCapIndices.Clear();
-
-        SVF_P3F_C4B_T2F tmp;
-        tmp.xyz.z = 1.0f;
-
-        // Grid vertex generation
-        for (int32 y = 0; y < nScrGridSize; ++y)
-        {
-            tmp.xyz.y = -1.0f + y * fRcpScrGridSize;
-            for (int32 x(0); x < nScrGridSize; ++x)
-            {
-                tmp.xyz.x = -1.0f + x * fRcpScrGridSize;
-                m_pBottomCapVerts.Add(tmp);
-            }
-        }
-
-        // Normal approach
-        int32 nIndex = 0;
-        for (int32 y(0); y < nScrGridSize - 1; ++y)
-        {
-            for (int32 x(0); x < nScrGridSize; ++x, ++nIndex)
-            {
-                m_pBottomCapIndices.Add(nIndex);
-                m_pBottomCapIndices.Add(nIndex + nScrGridSize);
-            }
-
-            if (nScrGridSize - 2 > y)
-            {
-                m_pBottomCapIndices.Add(nIndex + nScrGridSize - 1);
-                m_pBottomCapIndices.Add(nIndex);
-            }
-        }
-
-        m_pBottomCapRenderMesh = GetRenderer()->CreateRenderMeshInitialized(
-                m_pBottomCapVerts.GetElements(),
-                m_pBottomCapVerts.Count(),
-                eVF_P3F_C4B_T2F,
-                m_pBottomCapIndices.GetElements(),
-                m_pBottomCapIndices.Count(),
-                prtTriangleStrip,
-                "OceanBottomGrid", "OceanBottomGrid",
-                eRMT_Static);
-
-        m_pBottomCapRenderMesh->SetChunk(m_pBottomCapMaterial, 0, m_pBottomCapVerts.Count(), 0, m_pBottomCapIndices.Count(), 1.0f, eVF_P3F_C4B_T2F);
-    }
-
-    CRenderObject* pObject = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());
-    if (!pObject)
-    {
-        return;
-    }
-    pObject->m_II.m_Matrix.SetIdentity();
-    pObject->m_pRenderNode = this;
-
-    // make distance to water level near to zero
-    m_pBottomCapRenderMesh->SetBBox(vCamPos, vCamPos);
-
-    m_Camera = passInfo.GetCamera();
-    pObject->m_fAlpha = 1.f;
-
-    m_pBottomCapRenderMesh->AddRenderElements(m_pBottomCapMaterial, pObject, passInfo, EFSLIST_GENERAL, 0);
-}
-
-void COcean::RenderFog(const SRenderingPassInfo& passInfo)
-{
-    if (!GetCVars()->e_Fog || !GetCVars()->e_FogVolumes)
-    {
-        return;
-    }
-
-    IRenderer* pRenderer(GetRenderer());
-    C3DEngine* p3DEngine(Get3DEngine());
-
-    const int fillThreadID = passInfo.ThreadID();
-
-    CRenderObject* pROVol(pRenderer->EF_GetObject_Temp(fillThreadID));
-    if (!pROVol)
-    {
-        return;
-    }
-
-    bool isFastpath = GetCVars()->e_WaterOcean == 2;
-    bool isLowSpec(GetCVars()->e_ObjQuality == CONFIG_LOW_SPEC || isFastpath);
-    if (pROVol && m_pWVRE[fillThreadID] && ((!isLowSpec && m_pFogIntoMat && m_pFogOutofMat) ||
-                                            (isLowSpec && m_pFogIntoMatLowSpec && m_pFogOutofMatLowSpec)))
-    {
-        Vec3 camPos(passInfo.GetCamera().GetPosition());
-        float waterLevel(OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : p3DEngine->GetWaterLevel());
-        Vec3 planeOrigin(camPos.x, camPos.y, waterLevel);
-
-        // fill water volume param structure
-        m_wvParams[fillThreadID].m_center = planeOrigin;
-        m_wvParams[fillThreadID].m_fogPlane.Set(Vec3(0, 0, 1), -waterLevel);
-
-        float distCamToFogPlane(camPos.z + m_wvParams[fillThreadID].m_fogPlane.d);
-        m_wvParams[fillThreadID].m_viewerCloseToWaterPlane = (distCamToFogPlane) < 0.5f;
-        m_wvParams[fillThreadID].m_viewerInsideVolume = distCamToFogPlane < 0.00f;
-        m_wvParams[fillThreadID].m_viewerCloseToWaterVolume = true;
-
-        const auto oceanAnimationData = p3DEngine->GetOceanAnimationParams();
-
-        if (!isFastpath || (distCamToFogPlane < oceanAnimationData.fWavesSize))
-        {
-            Vec3 fogColor;
-            Vec3 fogColorShallow;
-            bool oceanToggleIsActive = OceanToggle::IsActive();
-            if (oceanToggleIsActive)
-            {
-                AZ::Vector3 oceanFogColor = OceanRequest::GetFogColorPremultiplied();
-                fogColor = Vec3(oceanFogColor.GetX(), oceanFogColor.GetY(), oceanFogColor.GetZ());
-
-                AZ::Vector3 nearFogColor = OceanRequest::GetNearFogColor();
-                fogColorShallow = Vec3(nearFogColor.GetX(), nearFogColor.GetY(), nearFogColor.GetZ());
-            }
-            else
-            {
-                fogColor = m_p3DEngine->m_oceanFogColor;
-                fogColorShallow = m_p3DEngine->m_oceanFogColorShallow;
-            }
-            float fogDensity = oceanToggleIsActive ? OceanRequest::GetFogDensity() : m_p3DEngine->m_oceanFogDensity;
-
-            if (isLowSpec)
-            {
-                m_wvParams[fillThreadID].m_fogColor = fogColor;
-                m_wvParams[fillThreadID].m_fogDensity = fogDensity;
-
-                m_wvoParams[fillThreadID].m_fogColor = Vec3(0, 0, 0);   // not needed for low spec
-                m_wvoParams[fillThreadID].m_fogColorShallow = Vec3(0, 0, 0);   // not needed for low spec
-                m_wvoParams[fillThreadID].m_fogDensity = 0; // not needed for low spec
-
-                m_pWVRE[fillThreadID]->m_pOceanParams = 0;
-            }
-            else
-            {
-                m_wvParams[fillThreadID].m_fogColor = Vec3(0, 0, 0);   // not needed, we set ocean specific params below
-                m_wvParams[fillThreadID].m_fogDensity = 0; // not needed, we set ocean specific params below
-
-                m_wvoParams[fillThreadID].m_fogColor = fogColor;
-                m_wvoParams[fillThreadID].m_fogColorShallow = fogColorShallow;
-                m_wvoParams[fillThreadID].m_fogDensity = fogDensity;
-
-                m_pWVRE[fillThreadID]->m_pOceanParams = &m_wvoParams[fillThreadID];
-            }
-
-            // tessellate plane
-            float planeSize(2.0f * passInfo.GetCamera().GetFarPlane());
-            size_t subDivSize(min(64, 1 + (int32) (planeSize / 512.0f)));
-            if (isFastpath)
-            {
-                subDivSize = 4;
-            }
-
-            size_t numSubDivVerts((subDivSize + 1) * (subDivSize + 1));
-
-            if (m_wvVertices[fillThreadID].size() != numSubDivVerts)
-            {
-                m_wvVertices[fillThreadID].resize(numSubDivVerts);
-                m_wvParams[fillThreadID].m_pVertices = &m_wvVertices[fillThreadID][0];
-                m_wvParams[fillThreadID].m_numVertices = m_wvVertices[fillThreadID].size();
-
-                m_wvIndices[fillThreadID].resize(subDivSize * subDivSize * 6);
-                m_wvParams[fillThreadID].m_pIndices = &m_wvIndices[fillThreadID][0];
-                m_wvParams[fillThreadID].m_numIndices = m_wvIndices[fillThreadID].size();
-
-                size_t ind(0);
-                for (uint32 y(0); y < subDivSize; ++y)
-                {
-                    for (uint32 x(0); x < subDivSize; ++x, ind += 6)
-                    {
-                        m_wvIndices[fillThreadID][ind + 0] = (y) * (subDivSize + 1) + (x);
-                        m_wvIndices[fillThreadID][ind + 1] = (y) * (subDivSize + 1) + (x + 1);
-                        m_wvIndices[fillThreadID][ind + 2] = (y + 1) * (subDivSize + 1) + (x + 1);
-
-                        m_wvIndices[fillThreadID][ind + 3] = (y) * (subDivSize + 1) + (x);
-                        m_wvIndices[fillThreadID][ind + 4] = (y + 1) * (subDivSize + 1) + (x + 1);
-                        m_wvIndices[fillThreadID][ind + 5] = (y + 1) * (subDivSize + 1) + (x);
-                    }
-                }
-            }
-            {
-                float xyDelta(2.0f * planeSize / (float) subDivSize);
-                float zDelta(waterLevel - camPos.z);
-
-                size_t ind(0);
-                float yd(-planeSize);
-                for (uint32 y(0); y <= subDivSize; ++y, yd += xyDelta)
-                {
-                    float xd(-planeSize);
-                    for (uint32 x(0); x <= subDivSize; ++x, xd += xyDelta, ++ind)
-                    {
-                        m_wvVertices[fillThreadID][ind].xyz = Vec3(xd, yd, zDelta);
-                        m_wvVertices[fillThreadID][ind].st = Vec2(0, 0);
-                    }
-                }
-            }
-
-            // fill in data for render object
-            pROVol->m_II.m_Matrix.SetIdentity();
-            pROVol->m_fSort = 0;
-
-            // get shader item
-            SShaderItem& shaderItem(m_wvParams[fillThreadID].m_viewerInsideVolume ?
-                (isLowSpec ? m_pFogOutofMatLowSpec->GetShaderItem(0) : m_pFogOutofMat->GetShaderItem(0)) :
-                (isLowSpec ? m_pFogIntoMatLowSpec->GetShaderItem(0) : m_pFogIntoMat->GetShaderItem(0)));
-
-            // add to renderer
-            pRenderer->EF_AddEf(m_pWVRE[fillThreadID], shaderItem, pROVol, passInfo, EFSLIST_WATER_VOLUMES, distCamToFogPlane < -0.1f, SRendItemSorter::CreateDefaultRendItemSorter());
-        }
-    }
-}
-
-bool COcean::IsVisible(const SRenderingPassInfo& passInfo)
-{
-    if (abs(m_nLastVisibleFrameId - passInfo.GetFrameID()) <= 2)
-    {
-        m_fLastVisibleFrameTime = 0.0f;
-    }
-
-    m_fLastVisibleFrameTime += gEnv->pTimer->GetFrameTime();
-
-    if (m_fLastVisibleFrameTime > 2.0f) // at least 2 seconds
-    {
-        return (abs(m_nLastVisibleFrameId - passInfo.GetFrameID()) < 64); // and at least 64 frames
-    }
-    return true; // keep water visible for a couple frames - or at least 1 second - minimizes popping during fast camera movement
-}
-
-void COcean::SetTimer(ITimer* pTimer)
-{
-    assert(pTimer);
-    m_pTimer = pTimer;
-}
-
-float COcean::GetWave(const Vec3& pPos, int32 nFrameID)
-{
-    // todo: optimize...
-
-    IRenderer* pRenderer(GetRenderer());
-    if (!pRenderer)
-    {
-        return 0.0f;
-    }
-
-    EShaderQuality nShaderQuality = pRenderer->EF_GetShaderQuality(eST_Water);
-
-    if (!m_pTimer || nShaderQuality < eSQ_High)
-    {
-        return 0.0f;
-    }
-
-    // Return height - matching computation on GPU
-
-    C3DEngine* p3DEngine(Get3DEngine());
-
-    bool bOceanFFT = false;
-    if ((pRenderer->GetFeatures() & (RFT_HW_VERTEXTEXTURES) && GetCVars()->e_WaterOceanFFT) && nShaderQuality >= eSQ_High)
-    {
-        bOceanFFT = true;
-    }
-
-    const auto oceanAnimationData = p3DEngine->GetOceanAnimationParams();
-
-    if (bOceanFFT)
-    {
-        Vec4 pDispPos = Vec4(0, 0, 0, 0);
-
-        if (m_pOceanRE)
-        {
-            // Get height from FFT grid
-
-            Vec4* pGridFFT = m_pOceanRE->GetDisplaceGrid();
-            if (!pGridFFT)
-            {
-                return 0.0f;
-            }
-
-            // match scales used in shader
-            float fScaleX = pPos.x * 0.0125f * oceanAnimationData.fWavesAmount * 1.25f;
-            float fScaleY = pPos.y * 0.0125f * oceanAnimationData.fWavesAmount * 1.25f;
-
-            float fu = fScaleX * 64.0f;
-            float fv = fScaleY * 64.0f;
-            int32 u1 = ((int32)fu) & 63;
-            int32 v1 = ((int32)fv) & 63;
-            int32 u2 = (u1 + 1) & 63;
-            int32 v2 = (v1 + 1) & 63;
-
-            // Fractional parts
-            float fracu = fu - floorf(fu);
-            float fracv = fv - floorf(fv);
-
-            // Get weights
-            float w1 = (1 - fracu) * (1 - fracv);
-            float w2 = fracu * (1 - fracv);
-            float w3 = (1 - fracu) * fracv;
-            float w4 = fracu *  fracv;
-
-            Vec4 h1 = pGridFFT[u1 + v1 * 64];
-            Vec4 h2 = pGridFFT[u2 + v1 * 64];
-            Vec4 h3 = pGridFFT[u1 + v2 * 64];
-            Vec4 h4 = pGridFFT[u2 + v2 * 64];
-
-            // scale and sum the four heights
-            pDispPos  = h1 * w1 + h2 * w2 + h3 * w3 + h4 * w4;
-        }
-
-        // match scales used in shader
-        return pDispPos.z * 0.06f * oceanAnimationData.fWavesSize;
-    }
-
-    // constant to scale down values a bit
-    const float fAnimAmplitudeScale = 1.0f / 5.0f;
-
-    static int32 s_nFrameID = 0;
-    static Vec3 s_vFlowDir = Vec3(0, 0, 0);
-    static Vec4 s_vFrequencies = Vec4(0, 0, 0, 0);
-    static Vec4 s_vPhases = Vec4(0, 0, 0, 0);
-    static Vec4 s_vAmplitudes = Vec4(0, 0, 0, 0);
-
-    // Update per-frame data
-    if (s_nFrameID != nFrameID)
-    {
-        sincos_tpl(oceanAnimationData.fWindDirection, &s_vFlowDir.y, &s_vFlowDir.x);
-        s_vFrequencies = Vec4(0.233f, 0.455f, 0.6135f, -0.1467f) * oceanAnimationData.fWavesSpeed * 5.0f;
-        s_vPhases = Vec4(0.1f, 0.159f, 0.557f, 0.2199f) * oceanAnimationData.fWavesAmount;
-        s_vAmplitudes = Vec4(1.0f, 0.5f, 0.25f, 0.5f) * oceanAnimationData.fWavesSize;
-
-        s_nFrameID = nFrameID;
-    }
-
-    const float fPhase = sqrt_tpl(pPos.x * pPos.x + pPos.y * pPos.y);
-    Vec4 vCosPhase = s_vPhases * (fPhase + pPos.x);
-
-    Vec4 vWaveFreq = s_vFrequencies * m_pTimer->GetCurrTime();
-
-    Vec4 vCosWave = Vec4(cos_tpl(vWaveFreq.x * s_vFlowDir.x + vCosPhase.x),
-            cos_tpl(vWaveFreq.y * s_vFlowDir.x + vCosPhase.y),
-            cos_tpl(vWaveFreq.z * s_vFlowDir.x + vCosPhase.z),
-            cos_tpl(vWaveFreq.w * s_vFlowDir.x + vCosPhase.w));
-
-
-    Vec4 vSinPhase = s_vPhases * (fPhase + pPos.y);
-    Vec4 vSinWave = Vec4(sin_tpl(vWaveFreq.x * s_vFlowDir.y + vSinPhase.x),
-            sin_tpl(vWaveFreq.y * s_vFlowDir.y + vSinPhase.y),
-            sin_tpl(vWaveFreq.z * s_vFlowDir.y + vSinPhase.z),
-            sin_tpl(vWaveFreq.w * s_vFlowDir.y + vSinPhase.w));
-
-    return (vCosWave.Dot(s_vAmplitudes) + vSinWave.Dot(s_vAmplitudes)) * fAnimAmplitudeScale;
-}
-
-uint32 COcean::GetVisiblePixelsCount()
-{
-    return m_nVisiblePixelsCount;
-}
-
-bool COcean::IsWaterVisibleOcclusionCheck()
-{
-    //Metal only supports yes(1 or more pixels)/no occlusion querys. m_nVisiblePixelsCount will always be 1 for yes, 0 for no.
-#if defined(IOS) || defined(ANDROID)
-    return m_nVisiblePixelsCount >= 1;
-#else
-    return m_nVisiblePixelsCount > 16;
-#endif
-}
-
-// Gets the X & Y Grid sizes based on cVars. Individual X & Y CVars should probably go away in
-// favor of a single value that exists on an ocean component instead of using CVars at all.
-void COcean::GetOceanGridSize(int& outX, int& outY) const
-{
-    // Calculate water geometry and update vertex buffers
-    if (OceanToggle::IsActive())
-    {
-        outX = AZ::OceanConstants::s_waterTessellationDefault;
-        AZ::OceanEnvironmentBus::BroadcastResult(outX, &AZ::OceanEnvironmentBus::Events::GetWaterTessellationAmount);
-        outY = outX;
-    }
-    else
-    {
-         // Calculate water geometry and update vertex buffers
-        outX = outY = GetCVars()->e_WaterTessellationAmount;
-
-        bool bUseWaterTessHW;
-        GetRenderer()->EF_Query(EFQ_WaterTessellation, bUseWaterTessHW);
-
-        if (!bUseWaterTessHW && m_bOceanFFT)
-        {
-            outX = outY = 20 * 10; // for hi/very specs - use maximum tessellation
-        }
-    }
-}
-
-void COcean::SetWaterLevel(float fWaterLevel)
-{
-    m_fWaterLevel = fWaterLevel;
-    OceanGlobals::g_oceanStep = -1; // if e_PhysOceanCell is used, make it re-apply the params on Update
-}
diff --git a/Code/CryEngine/Cry3DEngine/Ocean.h b/Code/CryEngine/Cry3DEngine/Ocean.h
deleted file mode 100644
index 4212292bed..0000000000
--- a/Code/CryEngine/Cry3DEngine/Ocean.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_TERRAIN_WATER_H
-#define CRYINCLUDE_CRY3DENGINE_TERRAIN_WATER_H
-#pragma once
-
-#include <AzCore/Math/Vector2.h>
-
-#define CYCLE_BUFFERS_NUM    4
-
-class COcean: public IRenderNode
-    , public Cry3DEngineBase
-{
-public:
-    COcean(_smart_ptr<IMaterial> pMat, float fWaterLevel);
-    ~COcean();
-
-
-    void SetWaterLevel(float fWaterLevel);
-    static void SetWaterLevelInfo(float fWaterLevelInfo) { m_fWaterLevelInfo = fWaterLevelInfo; }
-    static float GetWaterLevelInfo() { return m_fWaterLevelInfo; }
-
-    void Create();
-    void Update(const SRenderingPassInfo& passInfo);
-    void Render(const SRenderingPassInfo& passInfo);
-
-    bool IsVisible(const SRenderingPassInfo& passInfo);
-
-    void SetLastFov(float fLastFov) {m_fLastFov = fLastFov; }
-    static void SetTimer(ITimer* pTimer);
-
-    float GetWaterLevel() { return m_fWaterLevel; }
-    static float GetWave(const Vec3& pPosition, int32 nFrameID);
-    static uint32 GetVisiblePixelsCount();
-    int32 GetMemoryUsage();
-
-    // fake IRenderNode implementation
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName(void) const { return "Ocean"; }
-    virtual const char* GetName(void) const { return "Ocean"; }
-    virtual Vec3 GetPos(bool) const;
-    virtual void Render(const SRendParams&, [[maybe_unused]] const SRenderingPassInfo& passInfo) {}
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMat) override;
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = NULL);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist() { return 1000000.f; }
-    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-    virtual const AABB GetBBox() const { return AABB(Vec3(-1000000.f, -1000000.f, -1000000.f), Vec3(1000000.f, 1000000.f, 1000000.f)); }
-    virtual void SetBBox([[maybe_unused]] const AABB& WSBBox) { }
-    virtual void FillBBox(AABB& aabb);
-
-    virtual void OffsetPosition([[maybe_unused]] const Vec3& delta) {}
-
-private:
-
-    void RenderFog(const SRenderingPassInfo& passInfo);
-    void RenderBottomCap(const SRenderingPassInfo& passInfo);
-    void GetOceanGridSize(int& outX, int& outY) const;
-
-private:
-    static bool IsWaterVisibleOcclusionCheck();
-    
-    // Ocean data
-    _smart_ptr<IMaterial> m_pMaterial;
-    _smart_ptr<IRenderMesh> m_pRenderMesh;
-
-    PodArray<SVF_P3F_C4B_T2F> m_pMeshVerts;
-    PodArray<vtx_idx> m_pMeshIndices;
-
-    int32 m_nPrevGridDim;
-    int32 m_nVertsCount;
-    int32 m_nIndicesCount;
-
-    int32 m_nTessellationType;
-    int32 m_nTessellationTiles;
-
-    // Ocean bottom cap data
-    _smart_ptr< IMaterial > m_pBottomCapMaterial;
-    _smart_ptr<IRenderMesh> m_pBottomCapRenderMesh;
-
-    PodArray<SVF_P3F_C4B_T2F> m_pBottomCapVerts;
-    PodArray<vtx_idx> m_pBottomCapIndices;
-
-    // Visibility data
-    CCamera m_Camera;
-    class CREOcclusionQuery* m_pREOcclusionQueries[CYCLE_BUFFERS_NUM];
-    IShader* m_pShaderOcclusionQuery;
-    float m_fLastFov;
-    float m_fLastVisibleFrameTime;
-    int32 m_nLastVisibleFrameId;
-    static uint32 m_nVisiblePixelsCount;
-    float m_fWaterLevel;
-
-    float m_fRECustomData[12]; // used for passing data to renderer
-    float m_fREOceanBottomCustomData[8]; // used for passing data to renderer
-    AZ::Vector2 m_windUvTransform; // used for texture offset due to wind
-    bool m_bOceanFFT;
-
-    // Ocean fog related members
-    CREWaterVolume::SParams m_wvParams[RT_COMMAND_BUF_COUNT];
-    CREWaterVolume::SOceanParams m_wvoParams[RT_COMMAND_BUF_COUNT];
-
-    _smart_ptr< IMaterial > m_pFogIntoMat;
-    _smart_ptr< IMaterial > m_pFogOutofMat;
-    _smart_ptr< IMaterial > m_pFogIntoMatLowSpec;
-    _smart_ptr< IMaterial > m_pFogOutofMatLowSpec;
-
-    CREWaterVolume* m_pWVRE[RT_COMMAND_BUF_COUNT];
-    std::vector<SVF_P3F_C4B_T2F> m_wvVertices[RT_COMMAND_BUF_COUNT];
-    std::vector<uint16> m_wvIndices[RT_COMMAND_BUF_COUNT];
-
-    int32 m_swathWidth;
-    bool m_bUsingFFT;
-    bool m_bUseTessHW;
-
-    static ITimer* m_pTimer;
-    static CREWaterOcean* m_pOceanRE;
-    static float m_fWaterLevelInfo;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_TERRAIN_WATER_H
diff --git a/Code/CryEngine/Cry3DEngine/OpticsManager.cpp b/Code/CryEngine/Cry3DEngine/OpticsManager.cpp
deleted file mode 100644
index 01efd4a84f..0000000000
--- a/Code/CryEngine/Cry3DEngine/OpticsManager.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "OpticsManager.h"
-
-void COpticsManager::Reset()
-{
-    m_OpticsMap.clear();
-    m_SearchedOpticsSet.clear();
-    stl::free_container(m_OpticsList);
-}
-
-IOpticsElementBase* COpticsManager::Create(EFlareType type) const
-{
-    return gEnv->pRenderer->CreateOptics(type);
-}
-
-IOpticsElementBase* COpticsManager::ParseOpticsRecursively(IOpticsElementBase* pParentOptics, XmlNodeRef& node) const
-{
-    const char* type;
-    if (!node->getAttr("Type", &type))
-    {
-        return NULL;
-    }
-
-    IOpticsElementBase* pOptics = Create(GetFlareType(type));
-    if (pOptics == NULL)
-    {
-        return NULL;
-    }
-
-    bool bEnable(false);
-    node->getAttr("Enable", bEnable);
-    pOptics->SetEnabled(bEnable);
-
-    const char* name;
-    if (node->getAttr("Name", &name))
-    {
-        pOptics->SetName(name);
-    }
-
-    if (pParentOptics)
-    {
-        pParentOptics->AddElement(pOptics);
-    }
-
-    for (int i = 0, iChildCount(node->getChildCount()); i < iChildCount; ++i)
-    {
-        XmlNodeRef pChild = node->getChild(i);
-        if (pChild == (IXmlNode*)NULL)
-        {
-            continue;
-        }
-
-        if (!_stricmp(pChild->getTag(), "Params"))
-        {
-            pOptics->Load(pChild);
-        }
-        else if (!_stricmp(pChild->getTag(), "FlareItem"))
-        {
-            ParseOpticsRecursively(pOptics, pChild);
-        }
-    }
-
-    return pOptics;
-}
-
-
-bool COpticsManager::Load(const char* fullFlareName, int& nOutIndex, bool forceReload /*= false*/)
-{
-    if (!forceReload)
-    {
-        int nOpticsIndex = FindOpticsIndex(fullFlareName);
-        if (nOpticsIndex >= 0)
-        {
-            nOutIndex = nOpticsIndex;
-            return true;
-        }
-    }
-
-    string strFullFlareName(fullFlareName);
-    int nPos = strFullFlareName.find(".");
-    if (nPos == -1)
-    {
-        return false;
-    }
-
-    string xmlFileName = strFullFlareName.substr(0, nPos);
-
-    int restLength = strFullFlareName.length() - nPos - 1;
-    if (restLength <= 0)
-    {
-        return false;
-    }
-
-    if (!forceReload && m_SearchedOpticsSet.find(fullFlareName) != m_SearchedOpticsSet.end())
-    {
-        return false;
-    }
-
-    string fullPath = string(FLARE_LIBS_PATH) + xmlFileName + ".xml";
-    XmlNodeRef rootNode = gEnv->pSystem->LoadXmlFromFile(fullPath.c_str());
-
-    if (rootNode == (IXmlNode*)NULL)
-    {
-        return false;
-    }
-
-    string opticsLibName = strFullFlareName.substr(nPos + 1, restLength);
-    m_SearchedOpticsSet.insert(fullFlareName);
-
-    for (int i = 0, iChildCount(rootNode->getChildCount()); i < iChildCount; ++i)
-    {
-        XmlNodeRef childNode = rootNode->getChild(i);
-        if (childNode == (IXmlNode*)NULL)
-        {
-            continue;
-        }
-        const char* name;
-        if (!childNode->getAttr("Name", &name))
-        {
-            continue;
-        }
-        if (_stricmp(name, opticsLibName.c_str()))
-        {
-            continue;
-        }
-        IOpticsElementBase* pOptics = ParseOpticsRecursively(NULL, childNode);
-        if (pOptics == NULL)
-        {
-            return false;
-        }
-        return AddOptics(pOptics, fullFlareName, nOutIndex, forceReload);
-    }
-
-    return false;
-}
-
-bool COpticsManager::Load(XmlNodeRef& rootNode, int& nOutIndex)
-{
-    const char* name = NULL;
-    if ((rootNode == (IXmlNode*)NULL) || (!rootNode->getAttr("Name", &name)))
-    {
-        return false;
-    }
-
-    const char* libName = NULL;
-    if (!rootNode->getAttr("Library", &libName))
-    {
-        return false;
-    }
-
-    IOpticsElementBase* pOptics = ParseOpticsRecursively(NULL, rootNode);
-    if (pOptics == NULL)
-    {
-        return false;
-    }
-
-    string fullFlareName = libName + string(".") + name;
-    return AddOptics(pOptics, fullFlareName, nOutIndex);
-}
-
-EFlareType COpticsManager::GetFlareType(const char* typeStr) const
-{
-    if (typeStr == NULL)
-    {
-        return eFT__Base__;
-    }
-
-    const FlareInfoArray::Props array = FlareInfoArray::Get();
-    for (size_t i = 0; i < array.size; ++i)
-    {
-        if (!_stricmp(array.p[i].name, typeStr))
-        {
-            return array.p[i].type;
-        }
-    }
-
-    return eFT__Base__;
-}
-
-int COpticsManager::FindOpticsIndex(const char* fullFlareName) const
-{
-    std::map<string, int>::const_iterator iOptics = m_OpticsMap.find(CONST_TEMP_STRING(fullFlareName));
-    if (iOptics != m_OpticsMap.end())
-    {
-        return iOptics->second;
-    }
-    return -1;
-}
-
-IOpticsElementBase* COpticsManager::GetOptics(int nIndex)
-{
-    if ((size_t)nIndex >= m_OpticsList.size())
-    {
-        return NULL;
-    }
-    return m_OpticsList[nIndex];
-}
-
-bool COpticsManager::AddOptics(IOpticsElementBase* pOptics, const char* name, int& nOutNewIndex, bool allowReplace /*= false*/)
-{
-    if (name == NULL)
-    {
-        return false;
-    }
-
-    auto opticsIter = m_OpticsMap.find(name);
-    if (opticsIter != m_OpticsMap.end())
-    {
-        if (allowReplace)
-        {
-            nOutNewIndex = opticsIter->second;
-            m_OpticsList[nOutNewIndex] = pOptics;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    else
-    {
-        nOutNewIndex = (int)m_OpticsList.size();
-        m_OpticsList.push_back(pOptics);
-        m_OpticsMap[name] = nOutNewIndex;
-        return true;
-    }
-}
-
-bool COpticsManager::Rename(const char* fullFlareName, const char* newFullFlareName)
-{
-    if (m_OpticsMap.find(newFullFlareName) != m_OpticsMap.end())
-    {
-        return true;
-    }
-
-    std::map<string, int>::iterator iOptics = m_OpticsMap.find(fullFlareName);
-    if (iOptics == m_OpticsMap.end())
-    {
-        return false;
-    }
-
-    int nOpticsIndex = iOptics->second;
-    if (nOpticsIndex < 0 || nOpticsIndex >= (int)m_OpticsList.size())
-    {
-        return false;
-    }
-
-    m_OpticsMap.erase(iOptics);
-
-    IOpticsElementBasePtr pOptics = m_OpticsList[nOpticsIndex];
-    pOptics->SetName(newFullFlareName);
-    m_OpticsMap[newFullFlareName] = nOpticsIndex;
-
-    return true;
-}
-
-void COpticsManager::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    for (int i = 0, iSize(m_OpticsList.size()); i < iSize; ++i)
-    {
-        m_OpticsList[i]->GetMemoryUsage(pSizer);
-    }
-}
-
-void COpticsManager::Invalidate()
-{
-    for (int i = 0, iSize(m_OpticsList.size()); i < iSize; ++i)
-    {
-        m_OpticsList[i]->Invalidate();
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/OpticsManager.h b/Code/CryEngine/Cry3DEngine/OpticsManager.h
deleted file mode 100644
index 1bb8d4d8d6..0000000000
--- a/Code/CryEngine/Cry3DEngine/OpticsManager.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_OPTICSMANAGER_H
-#define CRYINCLUDE_CRY3DENGINE_OPTICSMANAGER_H
-#pragma once
-
-#include "IFlares.h"
-
-class COpticsManager
-    : public Cry3DEngineBase
-    , public IOpticsManager
-{
-public:
-
-    ~COpticsManager(){}
-
-    void Reset();
-
-    IOpticsElementBase* Create(EFlareType type) const;
-    IOpticsElementBase* GetOptics(int nIndex);
-
-    bool Load(const char* fullFlareName, int& nOutIndex, bool forceReload = false);
-    bool Load(XmlNodeRef& rootNode, int& nOutIndex);
-    bool AddOptics(IOpticsElementBase* pOptics, const char* name, int& nOutNewIndex, bool allowReplace = false);
-    bool Rename(const char* fullFlareName, const char* newFullFlareName);
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    void Invalidate();
-
-private:
-    IOpticsElementBase* ParseOpticsRecursively(IOpticsElementBase* pParentOptics, XmlNodeRef& node) const;
-    EFlareType GetFlareType(const char* typeStr) const;
-    int FindOpticsIndex(const char* fullFlareName) const;
-
-private:
-    std::vector<IOpticsElementBasePtr> m_OpticsList;
-    std::map<string, int> m_OpticsMap;
-    // All flare list which has already been searched for.
-    std::set<string> m_SearchedOpticsSet;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_OPTICSMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Android/platform_android_files.cmake b/Code/CryEngine/Cry3DEngine/Platform/Android/platform_android_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/Platform/Android/platform_android_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Linux/platform_linux_files.cmake b/Code/CryEngine/Cry3DEngine/Platform/Linux/platform_linux_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/Platform/Linux/platform_linux_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Mac/platform_mac.cmake b/Code/CryEngine/Cry3DEngine/Platform/Mac/platform_mac.cmake
deleted file mode 100644
index bafe20e506..0000000000
--- a/Code/CryEngine/Cry3DEngine/Platform/Mac/platform_mac.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-# Platform specific cmake file for configuring target compiler/link properties
-# based on the active platform
-# NOTE: functions in cmake are global, therefore adding functions to this file
-# is being avoided to prevent overriding functions declared in other targets platfrom
-# specific cmake files
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Mac/platform_mac_files.cmake b/Code/CryEngine/Cry3DEngine/Platform/Mac/platform_mac_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/Platform/Mac/platform_mac_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Windows/platform_windows.cmake b/Code/CryEngine/Cry3DEngine/Platform/Windows/platform_windows.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/CryEngine/Cry3DEngine/Platform/Windows/platform_windows.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Windows/platform_windows_files.cmake b/Code/CryEngine/Cry3DEngine/Platform/Windows/platform_windows_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/Platform/Windows/platform_windows_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/Platform/iOS/platform_ios_files.cmake b/Code/CryEngine/Cry3DEngine/Platform/iOS/platform_ios_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/Cry3DEngine/Platform/iOS/platform_ios_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/Cry3DEngine/PostEffectGroup.cpp b/Code/CryEngine/Cry3DEngine/PostEffectGroup.cpp
deleted file mode 100644
index 58e2ab4c88..0000000000
--- a/Code/CryEngine/Cry3DEngine/PostEffectGroup.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Cry3DEngine_precompiled.h"
-#include "PostEffectGroup.h"
-#include <AzCore/Asset/AssetManagerBus.h>
-
-class BlendVisitor
-{
-private:
-    bool m_enable;
-    float m_blendAmount;
-
-public:
-    void Init(bool enable, float blendAmount)
-    {
-        m_enable = enable;
-        m_blendAmount = blendAmount;
-    }
-
-    PostEffectGroupParam operator()(float base, float blend)
-    {
-        return base * (1.f - m_blendAmount) + blend * m_blendAmount;
-    }
-
-    PostEffectGroupParam operator()(const Vec4& base, const Vec4& blend)
-    {
-        return base * (1.f - m_blendAmount) + blend * m_blendAmount;
-    }
-
-    PostEffectGroupParam operator()(const AZStd::string& base, const AZStd::string& blend)
-    {
-        return m_enable ? blend : base;
-    }
-
-    template<typename T, typename U>
-    PostEffectGroupParam operator()(const T&, const U&)
-    {
-        CRY_ASSERT(false);
-        return 0.f;
-    }
-};
-
-class SyncVisitor
-{
-private:
-    const AZStd::string* m_name;
-
-public:
-    void SetName(const AZStd::string& name)
-    {
-        m_name = &name;
-    }
-
-    void operator()(float param)
-    {
-        if (gEnv && gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->SetPostEffectParam(m_name->c_str(), param);
-        }
-    }
-
-    void operator()(const Vec4& param)
-    {
-        if (gEnv && gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->SetPostEffectParamVec4(m_name->c_str(), param);
-        }
-    }
-
-    void operator()(const AZStd::string& param)
-    {
-        if (gEnv && gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->SetPostEffectParamString(m_name->c_str(), param.c_str());
-        }
-    }
-};
-
-PostEffectGroup::PostEffectGroup(class PostEffectGroupManager* manager, const char* name, GroupPriority priority, bool hold, float fadeDistance)
-    : m_manager(manager)
-    , m_name(name)
-    , m_enable(false)
-    , m_priority(priority)
-    , m_hold(hold)
-    , m_fadeDistance(fadeDistance)
-    , m_lastUpdateFrame(gEnv->nMainFrameID)
-    , m_enableDuration(0.f)
-    , m_disableDuration(1000.f)
-    , m_strength(0.f)
-{
-    EBUS_EVENT_RESULT(m_id, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, m_name.c_str(), AZ::AzTypeInfo<PostEffectGroup>::Uuid(), true);
-}
-
-void PostEffectGroup::SetEnable(bool enable)
-{
-    if (m_enable == enable)
-    {
-        return;
-    }
-    m_enable = enable;
-    if (m_enable)
-    {
-        m_lastUpdateFrame = gEnv->nMainFrameID;
-        m_enableDuration = 0.f;
-        m_manager->Sort();
-    }
-    else
-    {
-        m_disableDuration = 0.f;
-    }
-
-    // Our m_enable state has changed.  Alert the PostEffectGroupManager of this.
-    m_manager->SetGroupToggledThisFrame(this);
-}
-
-void PostEffectGroup::StopEffect()
-{
-    m_enable = false;
-    m_enableDuration = 0.f;
-    m_disableDuration = m_blendOut.GetKeyRangeEnd();
-}
-
-void PostEffectGroup::SetParam(const char* name, const PostEffectGroupParam& value)
-{
-    m_params[name] = value;
-    if (m_enable)
-    {
-        m_lastUpdateFrame = gEnv->nMainFrameID;
-        m_manager->Sort();
-    }
-}
-
-void PostEffectGroup::ClearParams()
-{
-    m_params.clear();
-    if (m_enable)
-    {
-        m_lastUpdateFrame = gEnv->nMainFrameID;
-        m_manager->Sort();
-    }
-}
-
-void PostEffectGroup::ApplyAtPosition(const Vec3& position)
-{
-    float distance = (position - gEnv->pSystem->GetViewCamera().GetPosition()).len();
-    if (distance < m_fadeDistance)
-    {
-        m_strength += 1.f - distance / m_fadeDistance;
-    }
-}
-
-void PostEffectGroup::BlendWith(AZStd::unordered_map<AZStd::string, PostEffectGroupParam>& paramMap)
-{
-    if (!m_enable && m_disableDuration >= m_blendOut.GetKeyRangeEnd())
-    {
-        return;
-    }
-    m_enableDuration += gEnv->pTimer->GetFrameTime();
-    if (!m_enable)
-    {
-        m_disableDuration += gEnv->pTimer->GetFrameTime();
-    }
-    if (m_enable && !m_hold && m_enableDuration >= m_blendIn.GetKeyRangeEnd())
-    {
-        m_enable = false;
-        m_disableDuration = m_enableDuration - m_blendIn.GetKeyRangeEnd();
-    }
-    for (auto& param : m_params)
-    {
-        if (paramMap.find(param.first) == paramMap.end())
-        {
-            paramMap[param.first] = param.second;
-        }
-        else
-        {
-            BlendVisitor blendVisitor;
-            float blendInAmount = 1.f, blendOutAmount = 1.f;
-            if (!m_blendIn.empty() && m_enableDuration < m_blendIn.GetKeyRangeEnd())
-            {
-                m_blendIn.InterpolateFloat(m_enableDuration, blendInAmount);
-            }
-            if (!m_enable) // m_blendOut.empty() is already checked above
-            {
-                m_blendOut.InterpolateFloat(m_disableDuration, blendOutAmount);
-            }
-            blendVisitor.Init(m_enable, blendInAmount * blendOutAmount * (m_fadeDistance ? m_strength : 1.f));
-            paramMap[param.first] = AZStd::visit(blendVisitor, paramMap[param.first], param.second);
-        }
-    }
-}
-
-void PostEffectGroup::ClearSplines()
-{
-    m_blendIn.Clear();
-    m_blendOut.Clear();
-}
-
-PostEffectGroupManager::PostEffectGroupManager()
-{
-    // Note that the priority of the Base group is 1, this is to prevent invalid ordering with the "Default" group.
-    PostEffectGroup* base = new PostEffectGroup(this, "Base", PostEffectGroup::kPriorityBase, true, 0.f);
-    base->SetEnable(true);
-    m_groups.push_back(std::unique_ptr<PostEffectGroup>(base));
-    gEnv->pRenderer->RegisterSyncWithMainListener(this);
-    if (gEnv->IsEditor())
-    {
-        //  Only monitor assets in the editor.
-        AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-    }
-}
-
-PostEffectGroupManager::~PostEffectGroupManager()
-{
-    gEnv->pRenderer->RemoveSyncWithMainListener(this);
-    if (gEnv->IsEditor())
-    {
-        AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
-    }
-}
-
-IPostEffectGroup* PostEffectGroupManager::GetGroup(const char* name)
-{
-    for (auto& group : m_groups)
-    {
-        if (strcmp(group->GetName(), name) == 0)
-        {
-            return group.get();
-        }
-    }
-    
-    // Group not loaded, so try to load it from XML
-    // Load on demand instead of at startup so that users can place the XML file in any CryPak path
-    return LoadGroup(name);
-}
-
-IPostEffectGroup* PostEffectGroupManager::GetGroup(const unsigned int index)
-{
-    if (index < m_groups.size())
-    {
-        return m_groups[index].get();
-    }
-
-    return nullptr;
-}
-
-const unsigned int PostEffectGroupManager::GetGroupCount()
-{
-    return m_groups.size();
-}
-
-IPostEffectGroup* PostEffectGroupManager::LoadGroup(const char* name, PostEffectGroup* groupToLoadInto)
-{
-    XmlNodeRef root = GetISystem()->LoadXmlFromFile(name);
-    unsigned int priority;
-    bool hold = false;
-    float fadeDistance = 0.f;
-    if (!root)
-    {
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "Can't open post effect group '%s'.", name);
-        return nullptr;
-    }
-    if (!root->isTag("PostEffectGroup"))
-    {
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "Post effect group '%s' is missing 'PostEffectGroup' root tag", name);
-        return nullptr;
-    }
-    if (!root->getAttr("priority", priority))
-    {
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "Post effect group '%s' is missing 'priority' attribute", name);
-        return nullptr;
-    }
-    root->getAttr("hold", hold);
-    root->getAttr("fadeDistance", fadeDistance);
-    PostEffectGroup* group = groupToLoadInto;
-    if (!group)
-    {
-        //  No pointer was sent in, so create a new PostEffectGroup and add it to the list.
-        group = new PostEffectGroup(this, name, static_cast<PostEffectGroup::GroupPriority>(priority), hold, fadeDistance);
-        m_groups.push_back(std::unique_ptr<PostEffectGroup>(group));
-    }
-    else
-    {
-        //  Existing PostEffectGroup was sent in, reset its properties so that we can load onto it again.
-        //  This is only called from OnCatalogAssetChanged, so should only happen in the editor.
-        group->StopEffect();
-        group->SetPriority(static_cast<PostEffectGroup::GroupPriority>(priority));
-        group->SetHold(hold);
-        group->SetFadeDistance(fadeDistance);
-        group->ClearSplines();
-    }
-    
-    for (int i = 0; i < root->getChildCount(); i++)
-    {
-        XmlNodeRef node = root->getChild(i);
-        const char* effectName;
-        if (node->isTag("Effect") && node->getAttr("name", &effectName))
-        {
-            // Set effect params
-            for (int j = 0; j < node->getChildCount(); j++)
-            {
-                XmlNodeRef paramNode = node->getChild(j);
-                const char* paramName;
-                if (paramNode->isTag("Param") && paramNode->getAttr("name", &paramName))
-                {
-                    std::string paramFullName = std::string(effectName) + "_" + paramName;
-                    float floatValue;
-                    Vec4 vec4Value;
-                    const char* stringValue;
-                    if (paramNode->getAttr("floatValue", floatValue))
-                    {
-                        group->SetParam(paramFullName.c_str(), floatValue);
-                    }
-                    else if (paramNode->getAttr("vec4Value", vec4Value))
-                    {
-                        group->SetParam(paramFullName.c_str(), vec4Value);
-                    }
-                    else if (paramNode->getAttr("colorValue", vec4Value))
-                    {
-                        group->SetParam(("clr_" + paramFullName).c_str(), vec4Value);
-                    }
-                    else if (paramNode->getAttr("stringValue", &stringValue))
-                    {
-                        group->SetParam(paramFullName.c_str(), stringValue);
-                    }
-                    else if (paramNode->getAttr("textureValue", &stringValue))
-                    {
-                        group->SetParam(("tex_" + paramFullName).c_str(), stringValue);
-                    }
-                    else
-                    {
-                        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Post effect group '%s' effect '%s' param '%s' needs either a floatValue, vec4Value, colorValue, stringValue, or textureValue attribute",
-                            name, effectName, paramName);
-                    }
-                }
-                else
-                {
-                    CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Post effect group '%s' effect '%s' must contain Param tags with a name attribute", name, effectName);
-                }
-            }
-            continue;
-        }
-        ISplineInterpolator* spline =
-            node->isTag("BlendIn") ? group->GetBlendIn() :
-            node->isTag("BlendOut") ? group->GetBlendOut() :
-            nullptr;
-        if (spline)
-        {
-            // Add blend spline keys
-            for (int j = 0; j < node->getChildCount(); j++)
-            {
-                XmlNodeRef keyNode = node->getChild(j);
-                float time, value;
-                if (keyNode->isTag("Key") && keyNode->getAttr("time", time) && keyNode->getAttr("value", value))
-                {
-                    spline->InsertKeyFloat(time, value);
-                }
-                else
-                {
-                    CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Post effect group '%s' blend spline key must be of form <Key time=\"time\" value=\"value\"/>", name);
-                }
-            }
-            // Set blend curve type
-            const char* curveAttr = node->getAttr("curve");
-            ESplineKeyTangentType curveType = SPLINE_KEY_TANGENT_NONE;
-            if (strcmp(curveAttr, "linear") == 0)
-            {
-                curveType = SPLINE_KEY_TANGENT_LINEAR;
-            }
-            else if (strcmp(curveAttr, "step") == 0)
-            {
-                curveType = SPLINE_KEY_TANGENT_STEP;
-            }
-            else if (strcmp(curveAttr, "") != 0 && strcmp(curveAttr, "smooth") != 0)
-            {
-                CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Post effect group '%s' %s spline has unrecognized curve '%s'. Expecting 'smooth', 'linear', or 'step'.",
-                    name, node->getTag(), curveAttr);
-            }
-            for (int j = 0; j < spline->GetKeyCount(); j++)
-            {
-                spline->SetKeyFlags(j, (curveType << SPLINE_KEY_TANGENT_IN_SHIFT) | (curveType << SPLINE_KEY_TANGENT_OUT_SHIFT));
-            }
-            continue;
-        }
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Unrecognized XML tag in post effect group '%s'", name);
-    }
-    return group;
-}
-
-void PostEffectGroupManager::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
-{
-    for (auto& group : m_groups)
-    {
-        if (group->GetAssetId() == assetId)
-        {
-            //  Reload this asset. Sending in the pointer will cause LoadGroup to load in place.
-            LoadGroup(group->GetName(), group.get());
-            return;
-        }
-    }
-}
-
-void PostEffectGroupManager::SyncMainWithRender()
-{
-    // Blend postprocessing params
-    m_paramCache.clear();
-
-    // Flip our buffers and clear
-    m_fillThreadIndex = (m_fillThreadIndex + 1) & 1;
-    m_groupsToggledThisFrame[m_fillThreadIndex].clear();
-
-    for (auto& group : m_groups)
-    {
-        group->BlendWith(m_paramCache);
-        group->ResetStrength();
-    }
-    SyncVisitor syncVisitor;
-    for (auto& param : m_paramCache)
-    {
-        syncVisitor.SetName(param.first);
-        AZStd::visit(syncVisitor, param.second);
-    }
-    // Swap buffers in lower level system
-    gEnv->pRenderer->SyncPostEffects();
-}
-
-void PostEffectGroupManager::Sort()
-{
-    // Sort effect groups by priority then time updated, so that they'll be blended in that order
-    std::sort(m_groups.begin(), m_groups.end(), [](const std::unique_ptr<PostEffectGroup>& a, const std::unique_ptr<PostEffectGroup>& b)
-        {
-            if (a->GetPriority() == b->GetPriority())
-            {
-                return a->GetLastUpdateFrame() < b->GetLastUpdateFrame();
-            }
-            return a->GetPriority() < b->GetPriority();
-        });
-}
-
-const PostEffectGroupList& PostEffectGroupManager::GetGroupsToggledThisFrame()
-{
-    unsigned int processThreadIndex = (m_fillThreadIndex + 1) & 1;
-    return m_groupsToggledThisFrame[processThreadIndex];
-}
-
-void PostEffectGroupManager::SetGroupToggledThisFrame( IPostEffectGroup* group )
-{
-    m_groupsToggledThisFrame[m_fillThreadIndex].push_back(group);
-}
diff --git a/Code/CryEngine/Cry3DEngine/PostEffectGroup.h b/Code/CryEngine/Cry3DEngine/PostEffectGroup.h
deleted file mode 100644
index cfc830ec44..0000000000
--- a/Code/CryEngine/Cry3DEngine/PostEffectGroup.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include "IPostEffectGroup.h"
-#include "ISplines.h"
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-class PostEffectGroup : public IPostEffectGroup
-{
-public:
-    // PostEffectGroups are assets, but have no handler yet.  For now, we will use this UUID to refer to them.
-    AZ_TYPE_INFO(PostEffectGroup, "{BDDCFCE8-6E4E-4816-AE1C-ED98B02DA75D}"); 
-
-    // Priority to assign to any group. Note that a higher value relates to a higher priority.
-    enum GroupPriority
-    {
-        kPriorityDefault = 0, // Used for the default effect settings.
-        kPriorityBase    = 1, // Base group edited by user/code. Should always be higher priority than kDefalt.
-        // Add any future priorities here.
-    };
-
-    PostEffectGroup(class PostEffectGroupManager* manager, const char* name, GroupPriority priority, bool hold, float fadeDistance);
-
-    const char* GetName() const override { return m_name.c_str(); }
-    void SetEnable(bool enable) override;
-    bool GetEnable() const override { return m_enable; }
-    unsigned int GetPriority() const override { return m_priority; }
-    bool GetHold() const override { return m_hold; }
-    float GetFadeDistance() const override { return m_fadeDistance; }
-    void SetParam(const char* name, const PostEffectGroupParam& value) override;
-    PostEffectGroupParam* GetParam(const char* name) override { return &m_params[name]; }
-    void ClearParams() override;
-    void ApplyAtPosition(const Vec3& position) override;
-    ISplineInterpolator* GetBlendIn() { return &m_blendIn; }
-    ISplineInterpolator* GetBlendOut() { return &m_blendOut; }
-    uint32 GetLastUpdateFrame() const { return m_lastUpdateFrame; }
-    void BlendWith(AZStd::unordered_map<AZStd::string, PostEffectGroupParam>& paramMap);
-    void ResetStrength() { m_strength = 0.f; }
-    AZ::Data::AssetId GetAssetId() const { return m_id; }
-    //  Functions for changing an effect that has already been loaded. Not in the interface because they are intended to be used internally during hot reloads in the editor.
-    void StopEffect();
-    void ClearSplines();
-    void SetPriority(GroupPriority priority) { m_priority = priority; }
-    void SetHold(bool hold) { m_hold = hold; }
-    void SetFadeDistance(float fadeDistance) { m_fadeDistance = fadeDistance; }
-
-private:
-    class BlendSpline : public spline::CBaseSplineInterpolator < float, spline::BezierSpline<float> >
-    {
-    public:
-        float GetKeyRangeEnd()
-        {
-            return empty() ? 0.f : GetKeyTime(num_keys() - 1);
-        }
-
-        void Clear()
-        {
-            RemoveKeysInRange(0.0f, GetKeyRangeEnd());
-        }
-
-        void SerializeSpline([[maybe_unused]] XmlNodeRef &node, [[maybe_unused]] bool bLoading){}
-    };
-
-    class PostEffectGroupManager* m_manager;
-    AZStd::string m_name;
-    bool m_enable;
-    GroupPriority m_priority;
-    bool m_hold;
-    float m_fadeDistance;
-    AZStd::unordered_map<AZStd::string, PostEffectGroupParam> m_params;
-    BlendSpline m_blendIn;
-    BlendSpline m_blendOut;
-    uint32 m_lastUpdateFrame;
-    float m_enableDuration;
-    float m_disableDuration;
-    float m_strength;
-    AZ::Data::AssetId m_id;
-};
-
-class PostEffectGroupManager
-    : public IPostEffectGroupManager
-    , public ISyncMainWithRenderListener
-    , private AzFramework::AssetCatalogEventBus::Handler
-{
-public:
-    PostEffectGroupManager();
-    ~PostEffectGroupManager() override;
-
-    IPostEffectGroup* GetGroup(const char* name) override;
-    IPostEffectGroup* GetGroup(const unsigned int index) override;
-    const unsigned int GetGroupCount() override;
-    void SyncMainWithRender() override;
-    void Sort();
-
-    // Returns a list of PostEFfectGroups that had their enabled state changed this frame
-    const PostEffectGroupList& GetGroupsToggledThisFrame() override;
-    void SetGroupToggledThisFrame( IPostEffectGroup* group );
-private:
-    //  Sending in a PostEffectGroup* to LoadGroup will cause a load in place.
-    //  Sending in a nullptr to LoadGroup will construct a new PostEffectGroup.
-    IPostEffectGroup* LoadGroup(const char* name, PostEffectGroup* groupToLoadInto = nullptr);
-    // =============== AssetCatalogEventBus Functions ==============
-    void OnCatalogAssetChanged(const AZ::Data::AssetId& assetId) override;
-
-    std::vector<std::unique_ptr<PostEffectGroup>> m_groups;
-    AZStd::unordered_map<AZStd::string, PostEffectGroupParam> m_paramCache;
-
-    // A list of PostEffectGroups that had their Enabled state changed this frame
-    // Double buffered for render thread/main thread.
-    PostEffectGroupList m_groupsToggledThisFrame[2];
-
-    // The renderer version of the fill/process thread IDs is not available to us here.
-    unsigned int m_fillThreadIndex = 0; 
-};
diff --git a/Code/CryEngine/Cry3DEngine/PostProcessEffects.cpp b/Code/CryEngine/Cry3DEngine/PostProcessEffects.cpp
deleted file mode 100644
index 52a771aa30..0000000000
--- a/Code/CryEngine/Cry3DEngine/PostProcessEffects.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Notes : Check PostEffects.h for list of available effects
-
-
-#include "Cry3DEngine_precompiled.h"
-#include "IPostEffectGroup.h"
-#include "ITimeOfDay.h"
-
-void C3DEngine::SetPostEffectParam(const char* pParam, float fValue, bool bForceValue) const
-{
-    if (pParam)
-    {
-        GetRenderer()->EF_SetPostEffectParam(pParam, fValue, bForceValue);
-    }
-}
-
-void C3DEngine::GetPostEffectParam(const char* pParam, float& fValue) const
-{
-    if (pParam)
-    {
-        GetRenderer()->EF_GetPostEffectParam(pParam, fValue);
-    }
-}
-
-void C3DEngine::SetPostEffectParamVec4(const char* pParam, const Vec4& pValue, bool bForceValue) const
-{
-    if (pParam)
-    {
-        GetRenderer()->EF_SetPostEffectParamVec4(pParam, pValue, bForceValue);
-    }
-}
-
-void C3DEngine::GetPostEffectParamVec4(const char* pParam, Vec4& pValue) const
-{
-    if (pParam)
-    {
-        GetRenderer()->EF_GetPostEffectParamVec4(pParam, pValue);
-    }
-}
-
-void C3DEngine::SetPostEffectParamString(const char* pParam, const char* pszArg) const
-{
-    if (pParam && pszArg)
-    {
-        GetRenderer()->EF_SetPostEffectParamString(pParam, pszArg);
-    }
-}
-
-void C3DEngine::GetPostEffectParamString(const char* pParam, const char*& pszArg) const
-{
-    if (pParam)
-    {
-        GetRenderer()->EF_GetPostEffectParamString(pParam, pszArg);
-    }
-}
-
-int32 C3DEngine::GetPostEffectID(const char* pPostEffectName)
-{
-    return GetRenderer()->EF_GetPostEffectID(pPostEffectName);
-}
-
-void C3DEngine::ResetPostEffects(bool bOnSpecChange)
-{
-    GetPostEffectBaseGroup()->ClearParams();
-    
-    GetRenderer()->EF_ResetPostEffects(bOnSpecChange);
-
-    GetTimeOfDay()->Update(false, true);
-}
-
-void C3DEngine::DisablePostEffects()
-{
-    IPostEffectGroupManager* groupManager = gEnv->p3DEngine->GetPostEffectGroups();
-    if (groupManager)
-    {
-        for (unsigned int i = 0; i < groupManager->GetGroupCount(); i++)
-        {
-            IPostEffectGroup* group = groupManager->GetGroup(i);
-            if (strcmp(group->GetName(), m_defaultPostEffectGroup) != 0 && strcmp(group->GetName(), "Base") != 0)
-            {
-                group->SetEnable(false);
-            }
-        }
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/PrismRenderNode.cpp b/Code/CryEngine/Cry3DEngine/PrismRenderNode.cpp
deleted file mode 100644
index f904e67bd1..0000000000
--- a/Code/CryEngine/Cry3DEngine/PrismRenderNode.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-
-#include "PrismRenderNode.h"
-
-CPrismRenderNode::CPrismRenderNode()
-    : m_pMaterial(0)
-{
-    m_mat.SetIdentity();
-    m_WSBBox = AABB(Vec3(-1, -1, -1), Vec3(1, 1, 1));
-    m_pRE = (CREPrismObject*) GetRenderer()->EF_CreateRE(eDATA_PrismObject);
-    //  m_pMaterial = GetMatMan()->LoadMaterial("Materials/VolumeData/Default", false);
-    m_dwRndFlags |= ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS;
-}
-
-CPrismRenderNode::~CPrismRenderNode()
-{
-    if (m_pRE)
-    {
-        m_pRE->Release(false);
-    }
-
-    Get3DEngine()->FreeRenderNodeState(this);
-}
-
-void CPrismRenderNode::SetMatrix(const Matrix34& mat)
-{
-    m_mat = mat;
-    m_WSBBox.SetTransformedAABB(mat, AABB(Vec3(-1, -1, -1), Vec3(1, 1, 1)));
-    Get3DEngine()->RegisterEntity(this);
-}
-
-
-const char* CPrismRenderNode::GetName() const
-{
-    return "PrismObject";
-}
-
-void CPrismRenderNode::Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pMaterial)
-    {
-        return;
-    }
-
-    CRenderObject* pRO = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());     // pointer could be cached
-
-    if (pRO)
-    {
-        // set basic render object properties
-        pRO->m_II.m_Matrix = m_mat;
-        pRO->m_fSort = 0;
-        pRO->m_fDistance = rParam.fDistance;
-
-        // transform camera into object space
-        const CCamera& cam(passInfo.GetCamera());
-        Vec3 viewerPosWS(cam.GetPosition());
-
-        m_pRE->m_center = m_mat.GetTranslation();
-
-        SShaderItem& shaderItem(m_pMaterial->GetShaderItem(0));
-
-        GetRenderer()->EF_AddEf(m_pRE, shaderItem, pRO, passInfo, EFSLIST_GENERAL, 0, SRendItemSorter(rParam.rendItemSorter));
-    }
-}
-
-void CPrismRenderNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "PrismRenderNode");
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-void CPrismRenderNode::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_WSBBox.Move(delta);
-    m_mat.SetTranslation(m_mat.GetTranslation() + delta);
-    if (m_pRE)
-    {
-        m_pRE->m_center += delta;
-    }
-}
-
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
diff --git a/Code/CryEngine/Cry3DEngine/PrismRenderNode.h b/Code/CryEngine/Cry3DEngine/PrismRenderNode.h
deleted file mode 100644
index 94b3165579..0000000000
--- a/Code/CryEngine/Cry3DEngine/PrismRenderNode.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_PRISMRENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_PRISMRENDERNODE_H
-#pragma once
-
-class CPrismRenderNode
-    : public IPrismRenderNode
-    , public Cry3DEngineBase
-{
-public:
-    CPrismRenderNode();
-
-    // interface IPrismRenderNode --------------------------------------------
-
-    // interface IRenderNode -------------------------------------------------
-    virtual void SetMatrix(const Matrix34& mat);
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName() const { return "PrismObject"; }
-    virtual const char* GetName() const;
-    virtual Vec3 GetPos(bool bWorldOnly = true) const;
-    virtual void Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo);
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMat) { m_pMaterial = pMat; }
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = 0);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist();
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual const AABB GetBBox() const { return m_WSBBox; }
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-
-private:
-    ~CPrismRenderNode();
-
-    AABB                                            m_WSBBox;
-    Matrix34                                    m_mat;
-    _smart_ptr< IMaterial >     m_pMaterial;
-    CREPrismObject*                    m_pRE;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_PRISMRENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/RenderMeshMerger.cpp b/Code/CryEngine/Cry3DEngine/RenderMeshMerger.cpp
deleted file mode 100644
index 6366b8d69d..0000000000
--- a/Code/CryEngine/Cry3DEngine/RenderMeshMerger.cpp
+++ /dev/null
@@ -1,1895 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "MatMan.h"
-#include "VisAreas.h"
-#include "CullBuffer.h"
-#include "3dEngine.h"
-#include "IndexedMesh.h"
-#include "RenderMeshMerger.h"
-#include "MeshCompiler/MeshCompiler.h"
-#include "../RenderDll/Common/Shaders/Vertex.h"
-
-CRenderMeshMerger::CRenderMeshMerger()
-{
-    m_nTotalVertexCount = 0;
-    m_nTotalIndexCount = 0;
-}
-
-CRenderMeshMerger::~CRenderMeshMerger()
-{
-}
-
-int CRenderMeshMerger::Cmp_Materials(_smart_ptr<IMaterial> pMat1, _smart_ptr<IMaterial> pMat2)
-{
-    if (!pMat1 || !pMat2)
-    {
-        return 0;
-    }
-
-    SShaderItem& shaderItem1 = pMat1->GetShaderItem();
-    SShaderItem& shaderItem2 = pMat2->GetShaderItem();
-
-    // vert format
-    AZ::Vertex::Format vertexFormat1 = shaderItem1.m_pShader->GetVertexFormat();
-    AZ::Vertex::Format vertexFormat2 = shaderItem2.m_pShader->GetVertexFormat();
-
-    if (vertexFormat1 > vertexFormat2)
-    {
-        return 1;
-    }
-    if (vertexFormat1 < vertexFormat2)
-    {
-        return -1;
-    }
-
-    bool bDecal1 = (shaderItem1.m_pShader->GetFlags() & EF_DECAL) != 0;
-    bool bDecal2 = (shaderItem2.m_pShader->GetFlags() & EF_DECAL) != 0;
-
-    // shader
-    if (bDecal1 > bDecal2)
-    {
-        return 1;
-    }
-    if (bDecal1 < bDecal2)
-    {
-        return -1;
-    }
-
-    // shader resources
-    if (shaderItem1.m_pShaderResources > shaderItem2.m_pShaderResources)
-    {
-        return 1;
-    }
-    if (shaderItem1.m_pShaderResources < shaderItem2.m_pShaderResources)
-    {
-        return -1;
-    }
-
-    // shader
-    if (shaderItem1.m_pShader > shaderItem2.m_pShader)
-    {
-        return 1;
-    }
-    if (shaderItem1.m_pShader < shaderItem2.m_pShader)
-    {
-        return -1;
-    }
-
-    // compare mats ptr
-    if (pMat1 > pMat2)
-    {
-        return 1;
-    }
-    if (pMat1 < pMat2)
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-int CRenderMeshMerger::Cmp_RenderChunksInfo(const void* v1, const void* v2)
-{
-    SRenderMeshInfoInput* in1 = (SRenderMeshInfoInput*)v1;
-    SRenderMeshInfoInput* in2 = (SRenderMeshInfoInput*)v2;
-
-    //assert(pChunk1->LMInfo.iRAETex == pChunk2->LMInfo.iRAETex);
-
-    _smart_ptr<IMaterial> pMat1 = in1->pMat;
-    _smart_ptr<IMaterial> pMat2 = in2->pMat;
-
-    return Cmp_Materials(pMat1, pMat2);
-}
-
-int CRenderMeshMerger::Cmp_RenderChunks_(const void* v1, const void* v2)
-{
-    SMergedChunk* pChunk1 = (SMergedChunk*)v1;
-    SMergedChunk* pChunk2 = (SMergedChunk*)v2;
-
-    if (pChunk1->rChunk.nSubObjectIndex < pChunk2->rChunk.nSubObjectIndex)
-    {
-        return -1;
-    }
-    if (pChunk1->rChunk.nSubObjectIndex > pChunk2->rChunk.nSubObjectIndex)
-    {
-        return 1;
-    }
-
-    _smart_ptr<IMaterial> pMat1 = pChunk1->pMaterial;
-    _smart_ptr<IMaterial> pMat2 = pChunk2->pMaterial;
-
-    return Cmp_Materials(pMat1, pMat2);
-}
-
-void CRenderMeshMerger::IsChunkValid([[maybe_unused]] const CRenderChunk& Ch, [[maybe_unused]] PodArray<SVF_P3S_C4B_T2S>& lstVerts, [[maybe_unused]] PodArray<uint32>& lstIndices)
-{
-#ifdef _DEBUG
-    assert(Ch.nFirstIndexId + Ch.nNumIndices <= (uint32)lstIndices.Count());
-    assert(Ch.nFirstVertId + Ch.nNumVerts <= (uint16)lstVerts.Count());
-
-    for (uint32 i = Ch.nFirstIndexId; i < Ch.nFirstIndexId + Ch.nNumIndices; i++)
-    {
-        assert(lstIndices[i] >= Ch.nFirstVertId && lstIndices[i] < (uint32)(Ch.nFirstVertId + Ch.nNumVerts));
-        assert(lstIndices[i] >= 0 && lstIndices[i] < (uint32)lstVerts.Count());
-    }
-#endif
-}
-
-void CRenderMeshMerger::MakeRenderMeshInfoListOfAllChunks(SRenderMeshInfoInput* pRMIArray, int nRMICount, SMergeInfo& info)
-{
-    for (int nRmi = 0; nRmi < nRMICount; nRmi++)
-    {
-        SRenderMeshInfoInput* pRMI  = &pRMIArray[nRmi];
-        IRenderMesh* pRM = pRMI->pMesh;
-
-        const TRenderChunkArray& chunks = pRM->GetChunks();
-        int nChunkCount = chunks.size();
-        for (int nChunk = 0; nChunk < nChunkCount; nChunk++)
-        {
-            const CRenderChunk& renderChunk = chunks[nChunk];
-
-            if (renderChunk.m_nMatFlags & MTL_FLAG_NODRAW || !renderChunk.pRE)
-            {
-                continue;
-            }
-
-            _smart_ptr<IMaterial> pCustMat;
-            if (pRMI->pMat && renderChunk.m_nMatID < pRMI->pMat->GetSubMtlCount())
-            {
-                pCustMat = pRMI->pMat->GetSubMtl(renderChunk.m_nMatID);
-            }
-            else
-            {
-                pCustMat = pRMI->pMat;
-            }
-
-            if (!pCustMat)
-            {
-                continue;
-            }
-            if (!pCustMat->GetShaderItem().m_pShader)
-            {
-                pCustMat = GetMatMan()->GetDefaultMaterial();
-            }
-
-            IShader* pShader = pCustMat->GetShaderItem().m_pShader;
-
-            if (!pShader)
-            {
-                continue;
-            }
-            if (pShader->GetFlags() & EF_NODRAW)
-            {
-                continue;
-            }
-
-            if  (info.pDecalClipInfo)
-            {
-                if (pShader->GetFlags() & EF_DECAL)
-                {
-                    continue;
-                }
-            }
-
-            SRenderMeshInfoInput RMIChunk = *pRMI;
-            RMIChunk.pMat = info.pDecalClipInfo ? NULL : pCustMat;
-            RMIChunk.nChunkId = nChunk;
-
-            m_lstRMIChunks.Add(RMIChunk);
-        }
-    }
-}
-
-// Note: This code used to be inline in CRenderMeshMerger::MakeListOfAllCRenderChunks, but it was for some reason seg faulting the Android GCC 4.9 compiler in Profile.
-void CalculateNormalAndTangent(SPipTangents& basis, SPipNormal& normal, byte* pNorm, byte* pTangs, int nNormStride, int nTangsStride, bool bMatrixHasRotation, int v, SRenderMeshInfoInput* pRMI)
-{
-    assert((pTangs) || (!pNorm));
-    if (pTangs)
-    {
-        basis = *(SPipTangents*)&pTangs[nTangsStride * v];
-#if ENABLE_NORMALSTREAM_SUPPORT
-        if (pNorm)
-        {
-            normal = *(SPipNormal*)&pNorm[nNormStride * v];
-        }
-#endif
-
-        if (bMatrixHasRotation)
-        {
-            basis.TransformSafelyBy(pRMI->mat);
-#if ENABLE_NORMALSTREAM_SUPPORT
-            if (pNorm)
-            {
-                normal.TransformSafelyBy(pRMI->mat);
-            }
-#endif
-        }
-    }
-}
-
-
-void CRenderMeshMerger::MakeListOfAllCRenderChunks(SMergeInfo& info)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    m_nTotalVertexCount = 0;
-    m_nTotalIndexCount = 0;
-
-    for (int nEntityId = 0; nEntityId < m_lstRMIChunks.Count(); nEntityId++)
-    {
-        SRenderMeshInfoInput* pRMI  = &m_lstRMIChunks[nEntityId];
-
-        bool bMatrixHasRotation;
-        if (!pRMI->mat.m01 && !pRMI->mat.m02 && !pRMI->mat.m10 && !pRMI->mat.m12 && !pRMI->mat.m20 && !pRMI->mat.m21)
-        {
-            bMatrixHasRotation = false;
-        }
-        else
-        {
-            bMatrixHasRotation = true;
-        }
-
-        Matrix34 matInv = pRMI->mat.GetInverted();
-
-        IRenderMesh* pRM = pRMI->pMesh;
-        if (!pRM->GetVerticesCount())
-        {
-            continue;
-        }
-
-        int nInitVertCout = m_lstVerts.Count();
-
-
-        int nPosStride = 0;
-        int nTexStride = 0;
-        int nColorStride = 0;
-        Vec3* pPos = 0;
-        Vec2* pTex = 0;
-        UCol* pColor = 0;
-
-        // get vertices's
-        {
-            FRAME_PROFILER("CRenderMeshMerger::MakeListOfAllCRenderChunks_GetPosPtr", GetSystem(), PROFILE_3DENGINE);
-
-            pPos = reinterpret_cast<Vec3*>(pRM->GetPosPtr(nPosStride, FSL_READ));
-            pTex = reinterpret_cast<Vec2*>(pRM->GetUVPtr(nTexStride, FSL_READ));
-            pColor = reinterpret_cast<UCol*>(pRM->GetColorPtr(nColorStride, FSL_READ));
-        }
-
-        if (!pPos || !pTex || !pColor)
-        {
-            continue;
-        }
-
-        // get tangent basis
-        int nNormStride = 0;
-        int nTangsStride = 0;
-        byte* pNorm = 0;
-        byte* pTangs = 0;
-
-        if (pRM->GetVertexFormat() != eVF_P3S_N4B_C4B_T2S)
-        {
-            pTangs = pRM->GetTangentPtr(nTangsStride, FSL_READ);
-        }
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-        // get normal stream
-        {
-            pNorm = pRM->GetNormPtr(nNormStride, FSL_READ);
-        }
-#endif
-
-        Vec3 vMin, vMax;
-        pRM->GetBBox(vMin, vMax);
-
-        // get indices
-        vtx_idx* pSrcInds = pRM->GetIndexPtr(FSL_READ);
-
-        Vec3 vOSPos(0, 0, 0);
-        Vec3 vOSProjDir(0, 0, 0);
-        float fMatrixScale = 1.f;
-        float fOSRadius = 0.f;
-
-        if (info.pDecalClipInfo && info.pDecalClipInfo->fRadius)
-        {
-            vOSPos = matInv.TransformPoint(info.pDecalClipInfo->vPos);
-            vOSProjDir = matInv.TransformVector(info.pDecalClipInfo->vProjDir);
-            fMatrixScale = vOSProjDir.GetLength();
-            fOSRadius = info.pDecalClipInfo->fRadius * fMatrixScale;
-            if (vOSProjDir.GetLength() > 0.01f)
-            {
-                vOSProjDir.Normalize();
-            }
-        }
-
-        CRenderChunk newMatInfo = pRM->GetChunks()[pRMI->nChunkId];
-
-#ifdef _DEBUG
-        uint32 nIndCount = pRM->GetIndicesCount();
-        CRenderChunk Ch = newMatInfo;
-        for (uint32 i = Ch.nFirstIndexId; i < Ch.nFirstIndexId + Ch.nNumIndices; i++)
-        {
-            assert(i >= 0 && i < nIndCount);
-            assert(pSrcInds[i] >= Ch.nFirstVertId && pSrcInds[i] < Ch.nFirstVertId + Ch.nNumVerts);
-            assert((int)pSrcInds[i] < pRM->GetVerticesCount());
-        }
-#endif
-
-        int nFirstIndexId = m_lstIndices.Count();
-
-        // add indices
-        for (uint32 i = newMatInfo.nFirstIndexId; i < newMatInfo.nFirstIndexId + newMatInfo.nNumIndices; i += 3)
-        {
-            assert((int)pSrcInds[i + 0] < pRM->GetVerticesCount());
-            assert((int)pSrcInds[i + 1] < pRM->GetVerticesCount());
-            assert((int)pSrcInds[i + 2] < pRM->GetVerticesCount());
-
-            assert((int)pSrcInds[i + 0] >= newMatInfo.nFirstVertId && pSrcInds[i + 0] < newMatInfo.nFirstVertId + newMatInfo.nNumVerts);
-            assert((int)pSrcInds[i + 1] >= newMatInfo.nFirstVertId && pSrcInds[i + 1] < newMatInfo.nFirstVertId + newMatInfo.nNumVerts);
-            assert((int)pSrcInds[i + 2] >= newMatInfo.nFirstVertId && pSrcInds[i + 2] < newMatInfo.nFirstVertId + newMatInfo.nNumVerts);
-
-            // skip not needed triangles for decals
-            if (fOSRadius)
-            {
-                // get verts
-                Vec3 v0 = pPos[nPosStride * pSrcInds[i + 0]];
-                Vec3 v1 = pPos[nPosStride * pSrcInds[i + 1]];
-                Vec3 v2 = pPos[nPosStride * pSrcInds[i + 2]];
-
-                if (vOSProjDir.IsZero())
-                { // explosion mode
-                  // test the face
-                    float fDot0 = (vOSPos - v0).Dot((v1 - v0).Cross(v2 - v0));
-                    float fTest = -0.15f;
-                    if (fDot0 < fTest)
-                    {
-                        continue;
-                    }
-                }
-                else
-                {
-                    // get triangle normal
-                    Vec3 vNormal = (v1 - v0).Cross(v2 - v0);
-
-                    // test the face
-                    if (vNormal.Dot(vOSProjDir) <= 0)
-                    {
-                        continue;
-                    }
-                }
-
-                // get bbox
-                AABB triBox;
-                triBox.min = v0;
-                triBox.min.CheckMin(v1);
-                triBox.min.CheckMin(v2);
-                triBox.max = v0;
-                triBox.max.CheckMax(v1);
-                triBox.max.CheckMax(v2);
-
-                if (!Overlap::Sphere_AABB(Sphere(vOSPos, fOSRadius), triBox))
-                {
-                    continue;
-                }
-            }
-            else if (info.pClipCellBox)
-            {
-                // get verts
-                Vec3 v0 = pRMI->mat.TransformPoint(pPos[nPosStride * pSrcInds[i + 0]]);
-                Vec3 v1 = pRMI->mat.TransformPoint(pPos[nPosStride * pSrcInds[i + 1]]);
-                Vec3 v2 = pRMI->mat.TransformPoint(pPos[nPosStride * pSrcInds[i + 2]]);
-
-                if (!Overlap::AABB_Triangle(*info.pClipCellBox, v0, v1, v2))
-                {
-                    continue;
-                }
-            }
-
-            m_lstIndices.Add((int)(pSrcInds[i + 0]) - newMatInfo.nFirstVertId + nInitVertCout);
-            m_lstIndices.Add((int)(pSrcInds[i + 1]) - newMatInfo.nFirstVertId + nInitVertCout);
-            m_lstIndices.Add((int)(pSrcInds[i + 2]) - newMatInfo.nFirstVertId + nInitVertCout);
-        }
-
-        newMatInfo.nFirstIndexId = nFirstIndexId;
-        newMatInfo.nNumIndices = m_lstIndices.Count() - nFirstIndexId;
-
-        if (!newMatInfo.nNumIndices)
-        {
-            continue;
-        }
-
-        // add vertices
-        for (int v = newMatInfo.nFirstVertId; v < (int)newMatInfo.nFirstVertId + (int)newMatInfo.nNumVerts; v++)
-        {
-            assert(v >= 0 && v < pRM->GetVerticesCount());
-
-            SVF_P3S_C4B_T2S vert;
-
-            // set pos
-            Vec3 vPos = pPos[nPosStride * v];
-            vPos = pRMI->mat.TransformPoint(vPos);
-            vert.xyz = vPos - info.vResultOffset;
-
-            // set uv
-            if (pTex)
-            {
-                vert.st = pTex[nTexStride * v];
-            }
-            else
-            {
-                vert.st = Vec2f16(0, 0);
-            }
-
-            vert.color = pColor[nColorStride * v + 0];
-
-            m_lstVerts.Add(vert);
-
-            // get tangent basis + normal
-            SPipTangents basis = SPipTangents(Vec4sf(0, 0, 0, 0), Vec4sf(0, 0, 0, 0));
-            SPipNormal normal = SPipNormal(Vec3(0, 0, 0));
-
-            CalculateNormalAndTangent(basis, normal, pNorm, pTangs, nNormStride, nTangsStride, bMatrixHasRotation, v, pRMI);
-
-            m_lstTangBasises.Add(basis);
-#if ENABLE_NORMALSTREAM_SUPPORT
-            m_lstNormals.Add(normal);
-#endif
-        }
-
-        // set vert range
-        newMatInfo.nFirstVertId = m_lstVerts.Count() - newMatInfo.nNumVerts;
-        newMatInfo.pRE = NULL;
-
-        //      assert(IsHeapValid());
-        //      IsChunkValid(newMatInfo, m_lstVerts, m_lstIndices);
-
-        if (m_lstChunks.Count())
-        {
-            assert(m_lstChunks.Last().rChunk.nFirstVertId + m_lstChunks.Last().rChunk.nNumVerts == newMatInfo.nFirstVertId);
-        }
-
-        if (newMatInfo.nNumIndices)
-        {
-            SMergedChunk mrgChunk;
-            mrgChunk.rChunk = newMatInfo;
-            mrgChunk.rChunk.nSubObjectIndex = pRMI->nSubObjectIndex;
-            mrgChunk.pMaterial = info.pDecalClipInfo ? NULL : pRMI->pMat.get();
-            if (pRMI->pMat)
-            {
-                mrgChunk.rChunk.m_nMatFlags = pRMI->pMat->GetFlags();
-            }
-            m_lstChunks.Add(mrgChunk);
-        }
-
-        m_nTotalVertexCount += newMatInfo.nNumVerts;
-        m_nTotalIndexCount += newMatInfo.nNumIndices;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMeshMerger::CompactVertices(SMergeInfo& info)
-{
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("Removing unused vertices");
-    }
-
-    PodArray<uint32> lstVertUsage;
-    lstVertUsage.PreAllocate(m_lstVerts.Count(), m_lstVerts.Count());
-    for (int i = 0; i < m_lstIndices.Count(); i++)
-    {
-        lstVertUsage[m_lstIndices[i]] = 1;
-    }
-
-    PodArray<SVF_P3S_C4B_T2S> lstVertsOptimized;
-    lstVertsOptimized.PreAllocate(m_lstVerts.Count());
-    PodArray<SPipTangents> lstTangBasisesOptimized;
-    lstTangBasisesOptimized.PreAllocate(m_lstVerts.Count());
-#if ENABLE_NORMALSTREAM_SUPPORT
-    PodArray<SPipNormal> lstNormalsOptimized;
-    lstNormalsOptimized.PreAllocate(m_lstVerts.Count());
-#endif
-
-    int nCurChunkId = 0;
-    CRenderChunk* pChBack = &m_lstChunks[0].rChunk;
-    int nVertsRemoved = 0;
-    PodArray<SMergedChunk> lstChunksBk;
-    lstChunksBk.AddList(m_lstChunks);
-    for (int i = 0; i < m_lstVerts.Count(); )
-    {
-        if (lstVertUsage[i])
-        {
-            lstVertsOptimized.Add(m_lstVerts[i]);
-            lstTangBasisesOptimized.Add(m_lstTangBasises[i]);
-#if ENABLE_NORMALSTREAM_SUPPORT
-            lstNormalsOptimized.Add(m_lstNormals[i]);
-#endif
-        }
-        else
-        {
-            nVertsRemoved++;
-        }
-
-        lstVertUsage[i] = lstVertsOptimized.Count() - 1;
-
-        i++;
-
-        if (i >= (int)lstChunksBk[nCurChunkId].rChunk.nFirstVertId + (int)lstChunksBk[nCurChunkId].rChunk.nNumVerts)
-        {
-            if (nVertsRemoved)
-            {
-                pChBack->nNumVerts -= nVertsRemoved;
-
-                for (int nId = nCurChunkId + 1; nId < m_lstChunks.Count(); nId++)
-                {
-                    CRenderChunk& ChBack = m_lstChunks[nId].rChunk;
-                    ChBack.nFirstVertId -= nVertsRemoved;
-                }
-
-                nVertsRemoved = 0;
-            }
-
-            nCurChunkId++;
-            if (nCurChunkId < m_lstChunks.Count())
-            {
-                pChBack = &m_lstChunks[nCurChunkId].rChunk;
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-
-    for (int i = 0; i < m_lstIndices.Count(); i++)
-    {
-        m_lstIndices[i] = lstVertUsage[m_lstIndices[i]];
-    }
-
-    int nOldVertsNum = m_lstVerts.Count();
-
-    m_lstVerts = lstVertsOptimized;
-    m_lstTangBasises = lstTangBasisesOptimized;
-#if ENABLE_NORMALSTREAM_SUPPORT
-    m_lstNormals = lstNormalsOptimized;
-#endif
-
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("old->new = %d->%d vertices", nOldVertsNum, m_lstVerts.Count());
-    }
-
-    int nBadTrisCount = 0;
-    for (int i = 0; i < m_lstIndices.Count(); i += 3)
-    {
-        if (m_lstIndices[i + 0] == m_lstIndices[i + 1] ||
-            m_lstIndices[i + 1] == m_lstIndices[i + 2] ||
-            m_lstIndices[i + 2] == m_lstIndices[i + 0])
-        {
-            nBadTrisCount++;
-        }
-    }
-
-    if (nBadTrisCount)
-    {
-        PrintMessage("CRenderMeshMerger::CompactVertices: Warning: %d bad tris found", nBadTrisCount);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMeshMerger::ClipByAABB(SMergeInfo& info)
-{
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("  Do clipping . . ." /*, m_lstChunks.Count()*/);
-    }
-
-    { // minimize range
-        uint32 nMin = ~0;
-        uint32 nMax = 0;
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            if (nMin > m_lstIndices[i])
-            {
-                nMin = m_lstIndices[i];
-            }
-            if (nMax < m_lstIndices[i])
-            {
-                nMax = m_lstIndices[i];
-            }
-        }
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            m_lstIndices[i] -= nMin;
-        }
-
-        if (m_lstVerts.Count() - nMax - 1 > 0)
-        {
-            m_lstVerts.Delete(nMax + 1, m_lstVerts.Count() - (nMax + 1));
-            m_lstTangBasises.Delete(nMax + 1, m_lstTangBasises.Count() - (nMax + 1));
-#if ENABLE_NORMALSTREAM_SUPPORT
-            m_lstNormals.Delete(nMax + 1, m_lstNormals.Count() - (nMax + 1));
-#endif
-        }
-
-        m_lstVerts.Delete(0, nMin);
-        m_lstTangBasises.Delete(0, nMin);
-#if ENABLE_NORMALSTREAM_SUPPORT
-        m_lstNormals.Delete(0, nMin);
-#endif
-    }
-
-    // define clip planes
-    Plane planes[6];
-    float fClipRadius = info.pDecalClipInfo->fRadius * 1.3f;
-    planes[0].SetPlane(Vec3(0, 0, 1), info.pDecalClipInfo->vPos + Vec3(0, 0, fClipRadius));
-    planes[1].SetPlane(Vec3(0, 0, -1), info.pDecalClipInfo->vPos + Vec3(0, 0, -fClipRadius));
-    planes[2].SetPlane(Vec3(0, 1, 0), info.pDecalClipInfo->vPos + Vec3(0, fClipRadius, 0));
-    planes[3].SetPlane(Vec3(0, -1, 0), info.pDecalClipInfo->vPos + Vec3(0, -fClipRadius, 0));
-    planes[4].SetPlane(Vec3(1, 0, 0), info.pDecalClipInfo->vPos + Vec3(fClipRadius, 0, 0));
-    planes[5].SetPlane(Vec3(-1, 0, 0), info.pDecalClipInfo->vPos + Vec3(-fClipRadius, 0, 0));
-
-    // clip triangles
-    int nOrigCount = m_lstIndices.Count();
-    for (int i = 0; i < nOrigCount; i += 3)
-    {
-        if (ClipTriangle(i, planes, 6))
-        {
-            i -= 3;
-            nOrigCount -= 3;
-        }
-    }
-
-    if (m_lstIndices.Count() < 3 || m_lstVerts.Count() < 3)
-    {
-        return;
-    }
-
-    assert(m_lstTangBasises.Count() == m_lstVerts.Count());
-#if ENABLE_NORMALSTREAM_SUPPORT
-    assert(m_lstNormals.Count() == m_lstVerts.Count());
-#endif
-
-    { // minimize range
-        uint32 nMin = ~0;
-        uint32 nMax = 0;
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            if (nMin > m_lstIndices[i])
-            {
-                nMin = m_lstIndices[i];
-            }
-            if (nMax < m_lstIndices[i])
-            {
-                nMax = m_lstIndices[i];
-            }
-        }
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            m_lstIndices[i] -= nMin;
-        }
-
-        if (m_lstVerts.Count() - nMax - 1 > 0)
-        {
-            m_lstVerts.Delete(nMax + 1, m_lstVerts.Count() - (nMax + 1));
-            m_lstTangBasises.Delete(nMax + 1, m_lstTangBasises.Count() - (nMax + 1));
-#if ENABLE_NORMALSTREAM_SUPPORT
-            m_lstNormals.Delete(nMax + 1, m_lstNormals.Count() - (nMax + 1));
-#endif
-        }
-
-        m_lstVerts.Delete(0, nMin);
-        m_lstTangBasises.Delete(0, nMin);
-#if ENABLE_NORMALSTREAM_SUPPORT
-        m_lstNormals.Delete(0, nMin);
-#endif
-    }
-
-#ifdef _DEBUG
-    assert(m_lstTangBasises.Count() == m_lstVerts.Count());
-#if ENABLE_NORMALSTREAM_SUPPORT
-    assert(m_lstNormals.Count() == m_lstVerts.Count());
-#endif
-    for (int i = 0; i < m_lstIndices.Count(); i++)
-    {
-        assert(m_lstIndices[i] >= 0 && m_lstIndices[i] < (uint32)m_lstVerts.Count());
-    }
-#endif
-
-    if (m_lstIndices.Count() < 3 || m_lstVerts.Count() < 3)
-    {
-        return;
-    }
-
-    m_lstChunks[0].rChunk.nNumIndices = m_lstIndices.Count();
-    m_lstChunks[0].rChunk.nNumVerts = m_lstVerts.Count();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderMeshMerger::ClipTriangle(int nStartIdxId, Plane* pPlanes, int nPlanesNum)
-{
-    const PodArray<Vec3>& clipped = m_tmpClipContext.Clip(
-            m_lstVerts[m_lstIndices[nStartIdxId + 0]].xyz.ToVec3(),
-            m_lstVerts[m_lstIndices[nStartIdxId + 1]].xyz.ToVec3(),
-            m_lstVerts[m_lstIndices[nStartIdxId + 2]].xyz.ToVec3(),
-            pPlanes, nPlanesNum);
-
-    if (clipped.Count() < 3)
-    {
-        m_lstIndices.Delete(nStartIdxId, 3);
-        return true; // entire triangle is clipped away
-    }
-
-    if (clipped.Count() == 3)
-    {
-        if (clipped[0].IsEquivalent(m_lstVerts[m_lstIndices[nStartIdxId + 0]].xyz.ToVec3()))
-        {
-            if (clipped[1].IsEquivalent(m_lstVerts[m_lstIndices[nStartIdxId + 1]].xyz.ToVec3()))
-            {
-                if (clipped[2].IsEquivalent(m_lstVerts[m_lstIndices[nStartIdxId + 2]].xyz.ToVec3()))
-                {
-                    return false; // entire triangle is in
-                }
-            }
-        }
-    }
-    // replace old triangle with several new triangles
-    int nStartId = m_lstVerts.Count();
-    int nStartIndex = m_lstIndices[nStartIdxId + 0];
-    SVF_P3S_C4B_T2S fullVert = m_lstVerts[nStartIndex];
-    SPipTangents fullTang = m_lstTangBasises[nStartIndex];
-#if ENABLE_NORMALSTREAM_SUPPORT
-    SPipNormal fullNorm = m_lstNormals[nStartIndex];
-#endif
-
-    for (int i = 0; i < clipped.Count(); i++)
-    {
-        fullVert.xyz = clipped[i];
-        m_lstVerts.Add(fullVert);
-        m_lstTangBasises.Add(fullTang);
-#if ENABLE_NORMALSTREAM_SUPPORT
-        m_lstNormals.Add(fullNorm);
-#endif
-    }
-
-    // put first new triangle into position of original one
-    m_lstIndices[nStartIdxId + 0] = nStartId + 0;
-    m_lstIndices[nStartIdxId + 1] = nStartId + 1;
-    m_lstIndices[nStartIdxId + 2] = nStartId + 2;
-
-    // put others in the end
-    for (int i = 1; i < clipped.Count() - 2; i++)
-    {
-        m_lstIndices.Add(nStartId + 0);
-        m_lstIndices.Add(nStartId + i + 1);
-        m_lstIndices.Add(nStartId + i + 2);
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMeshMerger::ClipDecals(SMergeInfo& info)
-{
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("  Do clipping . . ." /*, m_lstChunks.Count()*/);
-    }
-
-    { // minimize range
-        uint32 nMin = ~0;
-        uint32 nMax = 0;
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            if (nMin > m_lstIndices[i])
-            {
-                nMin = m_lstIndices[i];
-            }
-            if (nMax < m_lstIndices[i])
-            {
-                nMax = m_lstIndices[i];
-            }
-        }
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            m_lstIndices[i] -= nMin;
-        }
-
-        if (m_lstVerts.Count() - nMax - 1 > 0)
-        {
-            m_lstVerts.Delete(nMax + 1, m_lstVerts.Count() - (nMax + 1));
-            m_lstTangBasises.Delete(nMax + 1, m_lstTangBasises.Count() - (nMax + 1));
-#if ENABLE_NORMALSTREAM_SUPPORT
-            m_lstNormals.Delete(nMax + 1, m_lstNormals.Count() - (nMax + 1));
-#endif
-        }
-
-        m_lstVerts.Delete(0, nMin);
-        m_lstTangBasises.Delete(0, nMin);
-#if ENABLE_NORMALSTREAM_SUPPORT
-        m_lstNormals.Delete(0, nMin);
-#endif
-    }
-
-    // define clip planes
-    Plane planes[6];
-    float fClipRadius = info.pDecalClipInfo->fRadius * 1.3f;
-    planes[0].SetPlane(Vec3(0, 0, 1), info.pDecalClipInfo->vPos - info.vResultOffset  + Vec3(0, 0, fClipRadius));
-    planes[1].SetPlane(Vec3(0, 0, -1), info.pDecalClipInfo->vPos - info.vResultOffset  + Vec3(0, 0, -fClipRadius));
-    planes[2].SetPlane(Vec3(0, 1, 0), info.pDecalClipInfo->vPos - info.vResultOffset  + Vec3(0, fClipRadius, 0));
-    planes[3].SetPlane(Vec3(0, -1, 0), info.pDecalClipInfo->vPos - info.vResultOffset  + Vec3(0, -fClipRadius, 0));
-    planes[4].SetPlane(Vec3(1, 0, 0), info.pDecalClipInfo->vPos - info.vResultOffset  + Vec3(fClipRadius, 0, 0));
-    planes[5].SetPlane(Vec3(-1, 0, 0), info.pDecalClipInfo->vPos - info.vResultOffset  + Vec3(-fClipRadius, 0, 0));
-
-    // clip triangles
-    int nOrigCount = m_lstIndices.Count();
-    for (int i = 0; i < nOrigCount; i += 3)
-    {
-        if (ClipTriangle(i, planes, 6))
-        {
-            i -= 3;
-            nOrigCount -= 3;
-        }
-    }
-
-    if (m_lstIndices.Count() < 3 || m_lstVerts.Count() < 3)
-    {
-        return;
-    }
-
-    assert(m_lstTangBasises.Count() == m_lstVerts.Count());
-#if ENABLE_NORMALSTREAM_SUPPORT
-    assert(m_lstNormals.Count() == m_lstVerts.Count());
-#endif
-
-    { // minimize range
-        uint32 nMin = ~0;
-        uint32 nMax = 0;
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            if (nMin > m_lstIndices[i])
-            {
-                nMin = m_lstIndices[i];
-            }
-            if (nMax < m_lstIndices[i])
-            {
-                nMax = m_lstIndices[i];
-            }
-        }
-
-        for (int i = 0; i < m_lstIndices.Count(); i++)
-        {
-            m_lstIndices[i] -= nMin;
-        }
-
-        if (m_lstVerts.Count() - nMax - 1 > 0)
-        {
-            m_lstVerts.Delete(nMax + 1, m_lstVerts.Count() - (nMax + 1));
-            m_lstTangBasises.Delete(nMax + 1, m_lstTangBasises.Count() - (nMax + 1));
-#if ENABLE_NORMALSTREAM_SUPPORT
-            m_lstNormals.Delete(nMax + 1, m_lstNormals.Count() - (nMax + 1));
-#endif
-        }
-
-        m_lstVerts.Delete(0, nMin);
-        m_lstTangBasises.Delete(0, nMin);
-#if ENABLE_NORMALSTREAM_SUPPORT
-        m_lstNormals.Delete(0, nMin);
-#endif
-    }
-
-#ifdef _DEBUG
-    assert(m_lstTangBasises.Count() == m_lstVerts.Count());
-#if ENABLE_NORMALSTREAM_SUPPORT
-    assert(m_lstNormals.Count() == m_lstVerts.Count());
-#endif
-    for (int i = 0; i < m_lstIndices.Count(); i++)
-    {
-        assert(m_lstIndices[i] >= 0 && m_lstIndices[i] < (uint32)m_lstVerts.Count());
-    }
-#endif
-
-    if (m_lstIndices.Count() < 3 || m_lstVerts.Count() < 3)
-    {
-        return;
-    }
-
-    m_lstChunks[0].rChunk.nNumIndices = m_lstIndices.Count();
-    m_lstChunks[0].rChunk.nNumVerts = m_lstVerts.Count();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMeshMerger::TryMergingChunks(SMergeInfo& info)
-{
-    PodArray<SMergedChunk>& lstChunksMerged = m_lstChunksMergedTemp;
-    lstChunksMerged.clear();
-    lstChunksMerged.reserve(m_lstChunks.size());
-
-    AZ::Vertex::Format currentVertexFormat;
-    for (int nChunkId = 0; nChunkId < m_lstChunks.Count(); nChunkId++)
-    {
-        SMergedChunk& mergChunk = m_lstChunks[nChunkId];
-
-        //      IsChunkValid(mergChunk, m_lstVerts, m_lstIndices);
-
-        AZ::Vertex::Format chunkVertexFormat;
-        if (info.pDecalClipInfo)
-        {
-            chunkVertexFormat = AZ::Vertex::Format();
-        }
-        else if (info.bMergeToOneRenderMesh)
-        {
-            chunkVertexFormat = currentVertexFormat;
-        }
-        else
-        {
-            _smart_ptr<IMaterial> pMat = mergChunk.pMaterial;
-            chunkVertexFormat = mergChunk.rChunk.m_vertexFormat;
-        }
-
-        if (!nChunkId ||
-            (chunkVertexFormat != currentVertexFormat || Cmp_RenderChunks_(&mergChunk, &m_lstChunks[nChunkId - 1]) ||
-             (lstChunksMerged.Last().rChunk.nNumVerts + mergChunk.rChunk.nNumVerts) > 0xFFFF))
-        { // not equal materials - add new chunk
-            lstChunksMerged.Add(mergChunk);
-        }
-        else
-        {
-            float texelAreaDensity = 0.0f;
-            int totalIndices = 0;
-
-            if (lstChunksMerged.Last().rChunk.m_texelAreaDensity != (float)UINT_MAX)
-            {
-                texelAreaDensity += lstChunksMerged.Last().rChunk.nNumIndices * lstChunksMerged.Last().rChunk.m_texelAreaDensity;
-                totalIndices += lstChunksMerged.Last().rChunk.nNumIndices;
-            }
-
-            if (mergChunk.rChunk.m_texelAreaDensity != (float)UINT_MAX)
-            {
-                texelAreaDensity += mergChunk.rChunk.nNumIndices * mergChunk.rChunk.m_texelAreaDensity;
-                totalIndices += mergChunk.rChunk.nNumIndices;
-            }
-
-            if (totalIndices != 0)
-            {
-                lstChunksMerged.Last().rChunk.m_texelAreaDensity = texelAreaDensity / totalIndices;
-            }
-
-            lstChunksMerged.Last().rChunk.nNumIndices += mergChunk.rChunk.nNumIndices;
-            lstChunksMerged.Last().rChunk.nNumVerts += mergChunk.rChunk.nNumVerts;
-        }
-
-        IsChunkValid(lstChunksMerged.Last().rChunk, m_lstVerts, m_lstIndices);
-
-        currentVertexFormat = chunkVertexFormat;
-    }
-
-    m_lstChunks = lstChunksMerged;
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IRenderMesh> CRenderMeshMerger::MergeRenderMeshes(SRenderMeshInfoInput* pRMIArray, int nRMICount,
-    PodArray<SRenderMeshInfoOutput>& outRenderMeshes,
-    SMergeInfo& info) PREFAST_SUPPRESS_WARNING(6262)                              //function uses > 32k stack space
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("MergeRenderMeshs: name: %s, input brushes num: %d", info.sMeshName, nRMICount);
-    }
-
-    m_nTotalVertexCount = 0;
-    m_nTotalIndexCount = 0;
-
-    m_lstRMIChunks.clear();
-    m_lstVerts.clear();
-    m_lstTangBasises.clear();
-#if ENABLE_NORMALSTREAM_SUPPORT
-    m_lstNormals.clear();
-#endif
-    m_lstIndices.clear();
-    m_lstChunks.clear();
-
-    // make list of all chunks
-    MakeRenderMeshInfoListOfAllChunks(pRMIArray, nRMICount, info);
-
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("%d render chunks found", m_lstRMIChunks.Count());
-    }
-
-    if (!m_lstRMIChunks.Count())
-    {
-        return NULL;
-    }
-
-    // sort by materials
-    if (!info.pDecalClipInfo)
-    {
-        qsort(m_lstRMIChunks.GetElements(), m_lstRMIChunks.Count(), sizeof(m_lstRMIChunks[0]), Cmp_RenderChunksInfo);
-    }
-
-    // make list of all CRenderChunks
-    MakeListOfAllCRenderChunks(info);
-
-    //  assert(IsHeapValid());
-
-    if (!m_lstVerts.Count() || !m_lstChunks.Count() || !m_lstIndices.Count())
-    {
-        return NULL;
-    }
-
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("%d chunks left after culling (%d verts, %d indices)", m_lstChunks.Count(), m_lstVerts.Count(), m_lstIndices.Count());
-    }
-
-    // Split chunks that does not fit together.
-    TryMergingChunks(info);
-
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("%d chunks left after merging", m_lstChunks.Count());
-    }
-
-    if (!m_lstChunks.Count())
-    {
-        return NULL;
-    }
-
-    // now we have list of merged/sorted chunks, indices and vertices's
-    // overall amount of vertices's may be more than 0xFFFF
-    if (m_lstChunks.Count() == 1 && info.pDecalClipInfo && GetCVars()->e_DecalsClip)
-    {
-        // clip decals if needed
-        ClipDecals(info);
-        if (m_lstIndices.Count() < 3 || m_lstVerts.Count() < 3)
-        {
-            return NULL;
-        }
-
-        // find AABB
-        AABB aabb = AABB(m_lstVerts[0].xyz.ToVec3(), m_lstVerts[0].xyz.ToVec3());
-        for (int i = 0; i < m_lstVerts.Count(); i++)
-        {
-            aabb.Add(m_lstVerts[i].xyz.ToVec3());
-        }
-
-        // weld positions
-        mesh_compiler::CMeshCompiler meshCompiler;
-#if ENABLE_NORMALSTREAM_SUPPORT
-        PREFAST_SUPPRESS_WARNING(6385);
-        meshCompiler.WeldPos_VF_P3X(m_lstVerts, m_lstTangBasises, m_lstNormals, m_lstIndices, VEC_EPSILON, aabb);
-#else
-        PodArray<Vec3> lstNormalsDummy;
-        meshCompiler.WeldPos_VF_P3X(m_lstVerts, m_lstTangBasises, lstNormalsDummy, m_lstIndices, VEC_EPSILON, aabb);
-#endif
-
-        // update chunk
-        CRenderChunk& Ch0 = m_lstChunks[0].rChunk;
-        Ch0.nFirstIndexId = 0;
-        Ch0.nNumIndices = m_lstIndices.Count();
-        Ch0.nFirstVertId = 0;
-        Ch0.nNumVerts = m_lstVerts.Count();
-    }
-
-    if (/*GetCVars()->e_scene_merging_compact_vertices && */ info.bCompactVertBuffer)
-    { // remove gaps in vertex buffers
-        CompactVertices(info);
-    }
-
-#ifdef _DEBUG
-    for (int nChunkId = 0; nChunkId < m_lstChunks.Count(); nChunkId++)
-    {
-        CRenderChunk& Ch0 = m_lstChunks[nChunkId].rChunk;
-        IsChunkValid(Ch0, m_lstVerts, m_lstIndices);
-    }
-#endif // _DEBUG
-
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("Making new RenderMeshes");
-    }
-
-    outRenderMeshes.clear();
-
-    m_lstNewChunks.reserve(m_lstChunks.Count());
-    m_lstNewVerts.reserve(m_nTotalVertexCount);
-    m_lstNewTangBasises.reserve(m_nTotalVertexCount);
-#if ENABLE_NORMALSTREAM_SUPPORT
-    m_lstNormals.reserve(m_nTotalVertexCount);
-#endif
-    m_lstNewIndices.reserve(m_nTotalIndexCount);
-
-    for (int nChunkId = 0; nChunkId < m_lstChunks.Count(); )
-    {
-        AABB finalBox;
-        finalBox.Reset();
-
-        m_lstNewVerts.clear();
-        m_lstNewTangBasises.clear();
-#if ENABLE_NORMALSTREAM_SUPPORT
-        m_lstNormals.clear();
-#endif
-        m_lstNewIndices.clear();
-        m_lstNewChunks.clear();
-
-        int nVertsNum = 0;
-        for (; nChunkId < m_lstChunks.Count(); )
-        {
-            CRenderChunk Ch = m_lstChunks[nChunkId].rChunk;
-            SMergedChunk& mrgChunk = m_lstChunks[nChunkId];
-
-            assert(m_lstNewVerts.Count() + Ch.nNumVerts <= 0xFFFF);
-
-            IsChunkValid(Ch, m_lstVerts, m_lstIndices);
-
-            int nCurrIdxPos = m_lstNewIndices.Count();
-            int nCurrVertPos = m_lstNewVerts.Count();
-
-            m_lstNewVerts.AddList(&m_lstVerts[Ch.nFirstVertId], Ch.nNumVerts);
-            m_lstNewTangBasises.AddList(&m_lstTangBasises[Ch.nFirstVertId], Ch.nNumVerts);
-#if ENABLE_NORMALSTREAM_SUPPORT
-            m_lstNormals.AddList(&m_lstNormals[Ch.nFirstVertId], Ch.nNumVerts);
-#endif
-
-            for (uint32 i = Ch.nFirstIndexId; i < Ch.nFirstIndexId + Ch.nNumIndices; i++)
-            {
-                uint32 nIndex = m_lstIndices[i] - Ch.nFirstVertId + nCurrVertPos;
-                assert(nIndex >= 0 && nIndex <= 0xFFFF && nIndex < (uint32)m_lstNewVerts.Count());
-                nIndex = nIndex & 0xFFFF;
-                m_lstNewIndices.Add(nIndex);
-                finalBox.Add(m_lstNewVerts[nIndex].xyz.ToVec3());
-            }
-
-            Ch.nFirstIndexId = nCurrIdxPos;
-            Ch.nFirstVertId = nCurrVertPos;
-
-            nVertsNum += Ch.nNumVerts;
-
-            {
-                assert(Ch.nFirstIndexId + Ch.nNumIndices <= (uint32)m_lstNewIndices.Count());
-                assert(Ch.nFirstVertId + Ch.nNumVerts <= (uint16)m_lstNewVerts.Count());
-
-#ifdef _DEBUG
-                for (uint32 i = Ch.nFirstIndexId; i < Ch.nFirstIndexId + Ch.nNumIndices; i++)
-                {
-                    assert(m_lstNewIndices[i] >= Ch.nFirstVertId && m_lstNewIndices[i] < Ch.nFirstVertId + Ch.nNumVerts);
-                    assert((int)m_lstNewIndices[i] < m_lstNewVerts.Count());
-                }
-#endif
-            }
-
-            SMergedChunk newMergedChunk;
-            newMergedChunk.rChunk = Ch;
-            newMergedChunk.pMaterial = mrgChunk.pMaterial;
-            m_lstNewChunks.Add(newMergedChunk);
-
-            nChunkId++;
-
-            if (nChunkId < m_lstChunks.Count())
-            {
-                if (nVertsNum + m_lstChunks[nChunkId].rChunk.nNumVerts > 0xFFFF)
-                {
-                    break;
-                }
-
-                if (info.bMergeToOneRenderMesh)
-                {
-                    continue;
-                }
-
-                // detect vert format change
-                SShaderItem& shaderItemCur = mrgChunk.pMaterial->GetShaderItem();
-                AZ::Vertex::Format nextChunkVertexFormatCurrent = shaderItemCur.m_pShader->GetVertexFormat();
-                nextChunkVertexFormatCurrent = mrgChunk.rChunk.m_vertexFormat;
-
-                SShaderItem& shaderItemNext = m_lstChunks[nChunkId].pMaterial->GetShaderItem();
-                AZ::Vertex::Format nextChunkVertFormatNext = shaderItemNext.m_pShader->GetVertexFormat();
-                nextChunkVertFormatNext = m_lstChunks[nChunkId].rChunk.m_vertexFormat;
-
-                if (nextChunkVertFormatNext != nextChunkVertexFormatCurrent)
-                {
-                    break;
-                }
-            }
-        }
-
-        IRenderMesh::SInitParamerers params;
-        params.pVertBuffer = m_lstNewVerts.GetElements();
-        params.nVertexCount = m_lstNewVerts.Count();
-        params.vertexFormat = eVF_P3S_C4B_T2S;
-        params.pIndices = m_lstNewIndices.GetElements();
-        params.nIndexCount = m_lstNewIndices.Count();
-        params.pTangents = m_lstNewTangBasises.GetElements();
-#if ENABLE_NORMALSTREAM_SUPPORT
-        params.pNormals = m_lstNewNormals.GetElements();
-#endif
-        params.nPrimetiveType = prtTriangleList;
-        params.eType = eRMT_Static;
-        params.nRenderChunkCount = 0;
-        params.bOnlyVideoBuffer = false;
-        params.bPrecache = false;
-
-        // make new RenderMesh
-        _smart_ptr<IRenderMesh> pNewLB = GetRenderer()->CreateRenderMesh(info.sMeshName, info.sMeshType, &params);
-
-        _smart_ptr<IMaterial> pParentMaterial = NULL;
-
-        pNewLB->SetBBox(finalBox.min, finalBox.max);
-
-        if (!info.pUseMaterial)
-        {
-            // make new parent material
-            if (!info.pDecalClipInfo)
-            {
-                char szMatName[256] = "";
-                sprintf_s(szMatName, "%s_Material", info.sMeshName);
-                pParentMaterial = GetMatMan()->CreateMaterial(szMatName, MTL_FLAG_MULTI_SUBMTL);
-                pParentMaterial->AddRef();
-                pParentMaterial->SetSubMtlCount(m_lstChunks.Count());
-            }
-
-            // define chunks
-            for (int i = 0; i < m_lstNewChunks.Count(); i++)
-            {
-                CRenderChunk* pChunk = &m_lstNewChunks[i].rChunk;
-
-                _smart_ptr<IMaterial> pMat = m_lstNewChunks[i].pMaterial;
-
-                if (pParentMaterial)
-                {
-                    assert(pMat);
-                    pParentMaterial->SetSubMtl(i, pMat);
-                }
-
-                assert(pChunk->nFirstIndexId + pChunk->nNumIndices <= (uint32)m_lstNewIndices.Count());
-
-                pChunk->m_nMatID = i;
-                if (pMat)
-                {
-                    pChunk->m_nMatFlags = pMat->GetFlags();
-                }
-                pNewLB->SetChunk(i, *pChunk);
-            }
-        }
-        else
-        {
-            pParentMaterial = info.pUseMaterial;
-
-            // define chunks
-            for (int i = 0; i < m_lstNewChunks.Count(); i++)
-            {
-                CRenderChunk* pChunk = &m_lstNewChunks[i].rChunk;
-                assert(pChunk->nFirstIndexId + pChunk->nNumIndices <= (uint32)m_lstNewIndices.Count());
-
-                _smart_ptr<IMaterial> pSubMtl = info.pUseMaterial->GetSafeSubMtl(pChunk->m_nMatID);
-                pChunk->m_nMatFlags = pSubMtl->GetFlags();
-
-                pNewLB->SetChunk(i, *pChunk);
-            }
-        }
-
-        SRenderMeshInfoOutput rmi;
-        rmi.pMesh = pNewLB;
-        rmi.pMat = pParentMaterial;
-        if (pParentMaterial)
-        {
-            pParentMaterial->AddRef();
-        }
-
-        outRenderMeshes.push_back(rmi);
-    }
-
-    if (info.bPrintDebugMessages)
-    {
-        PrintMessage("%" PRISIZE_T " RenderMeshes created", outRenderMeshes.size());
-    }
-
-    return outRenderMeshes.Count() ? outRenderMeshes[0].pMesh : _smart_ptr<IRenderMesh>(NULL);
-}
-
-struct sort_render_chunks_by_material
-{
-    bool operator ()(const SMergedChunk& c1, const SMergedChunk& c2) const
-    {
-        return c1.pMaterial < c2.pMaterial;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderMeshMerger::GenerateRenderChunks(SRenderMeshInfoInput* pRMIArray, int nRMICount)
-{
-    bool bCanMerge = true;
-    PodArray<SMergedChunk>& allChunks = m_lstChunksAll;
-
-    allChunks.clear();
-    allChunks.reserve(nRMICount);
-
-    for (int nRmi = 0; nRmi < nRMICount; nRmi++)
-    {
-        SRenderMeshInfoInput* pRMI  = &pRMIArray[nRmi];
-        IRenderMesh* pRM = pRMI->pMesh;
-
-        // Ignore bad meshes.
-        if (pRM->GetVerticesCount() == 0 || pRM->GetIndicesCount() == 0)
-        {
-            continue;
-        }
-
-        const TRenderChunkArray& chunks = pRM->GetChunks();
-        int nChunkCount = chunks.size();
-        for (int nChunk = 0; nChunk < nChunkCount; nChunk++)
-        {
-            const CRenderChunk& renderChunk = chunks[nChunk];
-
-            if (renderChunk.m_nMatFlags & MTL_FLAG_NODRAW || !renderChunk.pRE)
-            {
-                continue;
-            }
-
-            if (renderChunk.nNumVerts == 0 || renderChunk.nNumIndices == 0)
-            {
-                continue;
-            }
-
-            if (!pRMI->pMat)
-            {
-                continue;
-            }
-
-            _smart_ptr<IMaterial> pCustMat = (pRMI->pMat) ? pRMI->pMat->GetSafeSubMtl(renderChunk.m_nMatID) : 0;
-            if (!pCustMat)
-            {
-                continue;
-            }
-
-            if (!pCustMat->GetShaderItem().m_pShader)
-            {
-                pCustMat = GetMatMan()->GetDefaultMaterial();
-            }
-
-            IShader* pShader = pCustMat->GetShaderItem().m_pShader;
-
-            if (!pShader)
-            {
-                continue;
-            }
-
-            if (pShader->GetFlags() & EF_NODRAW)
-            {
-                continue;
-            }
-
-            SMergedChunk newChunk;
-            newChunk.pFromMesh = pRMI;
-            newChunk.pMaterial = pCustMat;
-            newChunk.rChunk = renderChunk;
-            newChunk.rChunk.nSubObjectIndex = pRMI->nSubObjectIndex;
-            newChunk.rChunk.pRE = 0;
-
-            allChunks.push_back(newChunk);
-        }
-    }
-
-    // sort by materials
-    std::sort(allChunks.begin(), allChunks.end(), sort_render_chunks_by_material());
-
-    return bCanMerge;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMeshMerger::MergeRenderChunks()
-{
-    PodArray<SMergedChunk>& allChunks = m_lstChunksAll;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Create array of merged chunks.
-    //////////////////////////////////////////////////////////////////////////
-    PodArray<SMergedChunk>& mergedChunks = m_lstChunks;
-    mergedChunks.clear();
-    mergedChunks.reserve(allChunks.size());
-
-    if (allChunks.size() > 0)
-    {
-        // Add first chunk.
-        mergedChunks.push_back(allChunks[0]);
-    }
-
-    for (size_t nChunkId = 1; nChunkId < allChunks.size(); nChunkId++)
-    {
-        SMergedChunk& currChunk = allChunks[nChunkId];
-
-        SMergedChunk& prevChunk = mergedChunks.back();
-
-        if ((currChunk.pMaterial != prevChunk.pMaterial) ||
-            ((prevChunk.rChunk.nNumVerts + currChunk.rChunk.nNumVerts) > 0xFFFF) ||
-            ((prevChunk.rChunk.nNumIndices + currChunk.rChunk.nNumIndices) > 0xFFFF))
-        { // not equal materials - add new chunk
-            mergedChunks.Add(currChunk);
-        }
-        else
-        {
-            float texelAreaDensity = 0.0f;
-            int totalIndices = 0;
-
-            if (prevChunk.rChunk.m_texelAreaDensity != (float)UINT_MAX)
-            {
-                texelAreaDensity += prevChunk.rChunk.nNumIndices * prevChunk.rChunk.m_texelAreaDensity;
-                totalIndices += prevChunk.rChunk.nNumIndices;
-            }
-
-            if (currChunk.rChunk.m_texelAreaDensity != (float)UINT_MAX)
-            {
-                texelAreaDensity += currChunk.rChunk.nNumIndices * currChunk.rChunk.m_texelAreaDensity;
-                totalIndices += currChunk.rChunk.nNumIndices;
-            }
-
-            if (totalIndices != 0)
-            {
-                prevChunk.rChunk.m_texelAreaDensity = texelAreaDensity / totalIndices;
-            }
-            else
-            {
-                prevChunk.rChunk.m_texelAreaDensity = 1.f;
-            }
-
-            prevChunk.rChunk.nNumIndices += currChunk.rChunk.nNumIndices;
-            prevChunk.rChunk.nNumVerts += currChunk.rChunk.nNumVerts;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMeshMerger::MergeBuffers(AABB& bounds)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    m_nTotalVertexCount = 0;
-    m_nTotalIndexCount = 0;
-
-    int nNeedVertices = 0;
-    int nNeedIndices = 0;
-
-    PodArray<SMergedChunk>& allChunks = m_lstChunksAll;
-
-    // Calculate total required sizes.
-    for (size_t nChunk = 0; nChunk < allChunks.size(); nChunk++)
-    {
-        SMergedChunk& renderChunk = allChunks[nChunk];
-        nNeedIndices += renderChunk.rChunk.nNumIndices;
-        nNeedVertices += renderChunk.rChunk.nNumVerts;
-    }
-
-    PodArray<vtx_idx>& arrIndices = m_lstNewIndices;
-    arrIndices.clear();
-    arrIndices.reserve(nNeedIndices);
-
-    PodArray<SVF_P3S_C4B_T2S>& arrVertices = m_lstVerts;
-    arrVertices.clear();
-    arrVertices.reserve(nNeedVertices);
-
-    PodArray<SPipTangents>& arrTangents = m_lstTangBasises;
-    arrTangents.clear();
-    arrTangents.reserve(nNeedVertices);
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-    PodArray<SPipNormal>& arrNormals = m_lstNormals;
-    arrNormals.clear();
-    arrNormals.reserve(nNeedVertices);
-#endif
-
-    m_lstMergeBuffersData.clear();
-    m_lstMergeBuffersData.resize(allChunks.size());
-
-    m_tmpAABB = bounds;
-
-    // do all GetPos etc calls before in the t thread
-    for (size_t nChunk = 0; nChunk < allChunks.size(); nChunk++)
-    {
-        SMergeBuffersData& rMergeBufferData = m_lstMergeBuffersData[nChunk];
-        IRenderMesh* pRM =  allChunks[nChunk].pFromMesh->pMesh;
-        pRM->LockForThreadAccess();
-        rMergeBufferData.pPos = pRM->GetPosPtr(rMergeBufferData.nPosStride, FSL_READ);
-        rMergeBufferData.pTex = pRM->GetUVPtr(rMergeBufferData.nTexStride, FSL_READ);
-        rMergeBufferData.pColor = pRM->GetColorPtr(rMergeBufferData.nColorStride, FSL_READ);
-        rMergeBufferData.pTangs = pRM->GetTangentPtr(rMergeBufferData.nTangsStride, FSL_READ);
-        rMergeBufferData.nIndCount = pRM->GetIndicesCount();
-        rMergeBufferData.pSrcInds = pRM->GetIndexPtr(FSL_READ);
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-        rMergeBufferData.pNorm = pRM->GetNormPtr(rMergeBufferData.nNormStride, FSL_READ);
-#endif
-    }
-
-    MergeBuffersImpl(&m_tmpAABB, m_lstMergeBuffersData.GetElements());
-
-    // operation on buffers has finished, unlock them again for rendermesh garbage collection
-    for (size_t nChunk = 0; nChunk < allChunks.size(); nChunk++)
-    {
-        IRenderMesh* pRM =  allChunks[nChunk].pFromMesh->pMesh;
-        pRM->UnLockForThreadAccess();
-    }
-
-    bounds = m_tmpAABB;
-}
-
-void CRenderMeshMerger::MergeBuffersImpl(AABB* pBounds, SMergeBuffersData* _arrMergeBuffersData)
-{
-    // size for SPU buffers, currently we have 16 buffers, means we need 128 kb
-    uint32 nNumMergeChunks = m_lstChunksAll.size();
-
-    PodArray<SMergedChunk>& allChunks = m_lstChunksAll;
-    SMergeBuffersData* arrMergeBuffersData = _arrMergeBuffersData;
-
-    PodArray<vtx_idx>& arrIndices = m_lstNewIndices;
-    PodArray<SVF_P3S_C4B_T2S>& arrVertices = m_lstVerts;
-    PodArray<SPipTangents>& arrTangents = m_lstTangBasises;
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-    PodArray<SPipNormal>& arrNormals = m_lstNormals;
-#endif
-
-    for (size_t nChunk = 0; nChunk < nNumMergeChunks; nChunk++)
-    {
-        SMergedChunk& renderChunk = allChunks[nChunk];
-        SMergeBuffersData& rMergeBufferData = arrMergeBuffersData[nChunk];
-        SRenderMeshInfoInput* pRMI = renderChunk.pFromMesh;
-        Matrix34& rMatrix = pRMI->mat;
-
-        bool bMatrixHasRotation;
-        if (!rMatrix.m01 && !rMatrix.m02 && !rMatrix.m10 && !rMatrix.m12 && !rMatrix.m20 && !rMatrix.m21)
-        {
-            bMatrixHasRotation = false;
-        }
-        else
-        {
-            bMatrixHasRotation = true;
-        }
-
-        Vec3 vOffset = rMatrix.GetTranslation();
-
-        IRenderMesh* pRM = pRMI->pMesh;
-
-        // get streams.
-        int nPosStride = rMergeBufferData.nPosStride;
-        int nTexStride = rMergeBufferData.nTexStride;
-        int nColorStride = rMergeBufferData.nColorStride;
-        int nTangsStride = rMergeBufferData.nTangsStride;
-
-        uint8* pPos = rMergeBufferData.pPos;
-        uint8* pTex = rMergeBufferData.pTex;
-        uint8* pColor = rMergeBufferData.pColor;
-        uint8* pTangs = rMergeBufferData.pTangs;
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-        int nNormStride = rMergeBufferData.nNormStride;
-        uint8* pNorm = rMergeBufferData.pNorm;
-#endif
-
-        if (!pPos || !pTex || !pColor || !pTangs)
-        {
-            assert(0); // Should not happen.
-            continue;
-        }
-
-        Vec3 vMin, vMax;
-        pRM->GetBBox(vMin, vMax);
-        pBounds->Add(vMin);
-        pBounds->Add(vMax);
-
-        // get indices
-        vtx_idx* pInds = rMergeBufferData.pSrcInds;
-
-        Vec3 vOSPos(0, 0, 0);
-        Vec3 vOSProjDir(0, 0, 0);
-
-        int nLastVertex = arrVertices.size();
-        int nLastIndex = arrIndices.size();
-
-        //////////////////////////////////////////////////////////////////////////
-        // add indices
-        //////////////////////////////////////////////////////////////////////////
-        int nCurrIndex = nLastIndex;
-        arrIndices.resize(nLastIndex + renderChunk.rChunk.nNumIndices);
-        int nAdjustedVertexOffset = nLastVertex - renderChunk.rChunk.nFirstVertId;
-        int i = renderChunk.rChunk.nFirstIndexId;
-        int numInd = renderChunk.rChunk.nFirstIndexId + renderChunk.rChunk.nNumIndices;
-
-        vtx_idx* __restrict pSrcInds = pInds;
-        vtx_idx* __restrict pDstInds = &arrIndices[0];
-
-        for (; i < numInd; i += 3, nCurrIndex += 3)
-        {
-            pDstInds[nCurrIndex + 0] = pSrcInds[i + 0] + nAdjustedVertexOffset;
-            pDstInds[nCurrIndex + 1] = pSrcInds[i + 1] + nAdjustedVertexOffset;
-            pDstInds[nCurrIndex + 2] = pSrcInds[i + 2] + nAdjustedVertexOffset;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        renderChunk.rChunk.nFirstIndexId = nLastIndex;
-
-        //////////////////////////////////////////////////////////////////////////
-        // add vertices
-        //////////////////////////////////////////////////////////////////////////
-        int nCurrVertex = nLastVertex;
-        arrVertices.resize(nLastVertex + renderChunk.rChunk.nNumVerts);
-        arrTangents.resize(nLastVertex + renderChunk.rChunk.nNumVerts);
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-        arrNormals.resize(nLastVertex + renderChunk.rChunk.nNumVerts);
-#endif
-
-        int v = renderChunk.rChunk.nFirstVertId;
-        int numVert = renderChunk.rChunk.nFirstVertId + renderChunk.rChunk.nNumVerts;
-        if (bMatrixHasRotation)
-        {
-            SVF_P3S_C4B_T2S* __restrict pDstVerts = &arrVertices[0];
-            SPipTangents* __restrict pDstTangs = &arrTangents[0];
-#if ENABLE_NORMALSTREAM_SUPPORT
-            SPipNormal* __restrict pDstNorms = &arrNormals[0];
-#endif
-
-            uint8* pSrcPos = pPos;
-            uint8* pSrcTex = pTex;
-            uint8* pSrcColor = pColor;
-            uint8* pSrcTangs = pTangs;
-#if ENABLE_NORMALSTREAM_SUPPORT
-            uint8* pSrcNorm = pNorm;
-#endif
-            for (; v < numVert; v++, nCurrVertex++)
-            {
-                SVF_P3S_C4B_T2S& vert = pDstVerts[nCurrVertex];
-                SPipTangents& basis = pDstTangs[nCurrVertex];
-#if ENABLE_NORMALSTREAM_SUPPORT
-                SPipNormal& normal = pDstNorms[nCurrVertex];
-#endif
-                // set pos/uv
-                Vec3& vPos = (*(Vec3*)&pSrcPos[nPosStride * v]);
-                Vec2* pUV = (Vec2*)&pSrcTex[nTexStride * v];
-
-                vert.xyz = rMatrix.TransformPoint(vPos);
-                vert.st = *pUV;
-                vert.color.dcolor = *(uint32*)&pSrcColor[nColorStride * v + 0];
-
-                // get tangent basis
-                basis = *(SPipTangents*)&pSrcTangs[nTangsStride * v];
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-                normal = SPipNormal(Vec3(0, 0, 0));
-                if (pSrcNorm)
-                {
-                    normal = *(SPipNormal*)&pSrcNorm[nNormStride * v];
-                }
-#endif
-
-                if (bMatrixHasRotation)
-                {
-                    basis.TransformSafelyBy(rMatrix);
-#if ENABLE_NORMALSTREAM_SUPPORT
-                    if (pSrcNorm)
-                    {
-                        normal.TransformSafelyBy(rMatrix);
-                    }
-#endif
-                }
-            }
-        }
-        else
-        {
-            SVF_P3S_C4B_T2S* __restrict pDstVerts = &arrVertices[0];
-            SPipTangents* __restrict pDstTangs = &arrTangents[0];
-#if ENABLE_NORMALSTREAM_SUPPORT
-            SPipNormal* __restrict pDstNorms = &arrNormals[0];
-#endif
-
-            uint8* pSrcPos = pPos;
-            uint8* pSrcTex = pTex;
-            uint8* pSrcColor = pColor;
-            uint8* pSrcTangs = pTangs;
-#if ENABLE_NORMALSTREAM_SUPPORT
-            uint8* pSrcNorm = pNorm;
-#endif
-            for (; v < numVert; v++, nCurrVertex++)
-            {
-                SVF_P3S_C4B_T2S& vert = pDstVerts[nCurrVertex];
-                SPipTangents& basis = pDstTangs[nCurrVertex];
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-                SPipNormal& normal = pDstNorms[nCurrVertex];
-#endif
-
-                // set pos/uv
-                Vec3& vPos = (*(Vec3*)&pSrcPos[nPosStride * v]);
-                Vec2* pUV = (Vec2*)&pSrcTex[nTexStride * v];
-
-                vert.xyz = rMatrix.TransformPoint(vPos);
-                vert.st = *pUV;
-                vert.color.dcolor = *(uint32*)&pSrcColor[nColorStride * v];
-
-                // get tangent basis
-                basis = *(SPipTangents*)&pSrcTangs[nTangsStride * v];
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-                normal = SPipNormal(Vec3(0, 0, 0));
-                if (pSrcNorm)
-                {
-                    normal = *(SPipNormal*)(&pSrcNorm[nNormStride * v]);
-                }
-#endif
-            }
-        }
-
-        // set vert range
-        renderChunk.rChunk.nFirstVertId = nLastVertex;
-
-        m_nTotalVertexCount += renderChunk.rChunk.nNumVerts;
-        m_nTotalIndexCount += renderChunk.rChunk.nNumIndices;
-
-        renderChunk.rChunk.m_vertexFormat = eVF_P3S_C4B_T2S;
-    }
-}
-
-void CRenderMeshMerger::Reset()
-{
-    stl::free_container(m_lstRMIChunks);
-    stl::free_container(m_lstVerts);
-    stl::free_container(m_lstTangBasises);
-    stl::free_container(m_lstIndices);
-    stl::free_container(m_lstChunks);
-    stl::free_container(m_lstChunksAll);
-    stl::free_container(m_lstNewVerts);
-    stl::free_container(m_lstNewTangBasises);
-    stl::free_container(m_lstNewIndices);
-    stl::free_container(m_lstNewChunks);
-    stl::free_container(m_lstChunksMergedTemp);
-    stl::free_container(m_tmpRenderChunkArray);
-    stl::free_container(m_lstMergeBuffersData);
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-    stl::free_container(m_lstNormals);
-    stl::free_container(m_lstNewNormals);
-#endif
-
-    m_tmpClipContext.Reset();
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IRenderMesh> CRenderMeshMerger::MergeRenderMeshes(SRenderMeshInfoInput* pRMIArray, int nRMICount, SMergeInfo& info)
-{
-    m_nTotalVertexCount = 0;
-    m_nTotalIndexCount = 0;
-
-    m_lstRMIChunks.clear();
-    m_lstVerts.clear();
-    m_lstTangBasises.clear();
-#if ENABLE_NORMALSTREAM_SUPPORT
-    m_lstNormals.clear();
-#endif
-    m_lstIndices.clear();
-    m_lstNewIndices.clear();
-    m_lstChunks.clear();
-
-    // make list of all chunks
-    if (!GenerateRenderChunks(pRMIArray, nRMICount))
-    {
-        return 0;
-    }
-
-    MergeRenderChunks();
-
-    if (m_lstChunksAll.empty())
-    {
-        return NULL;
-    }
-
-    // Often even single mesh must be merged, when non identity matrix is provided
-    /*
-    if (m_lstChunks.size() == m_lstChunksAll.size())
-    {
-        // No reduction of render chunks.
-        return 0;
-    }
-    */
-
-    AABB finalBounds;
-    finalBounds.Reset();
-    MergeBuffers(finalBounds);
-
-    if (m_lstNewIndices.empty() || m_lstVerts.empty() || m_lstTangBasises.empty())
-    {
-        return 0;
-    }
-
-    // Repeat merging to properly update vertex ranges.
-    MergeRenderChunks();
-
-    IRenderMesh::SInitParamerers params;
-    params.pVertBuffer = &m_lstVerts.front();
-    params.nVertexCount = m_lstVerts.size();
-    params.vertexFormat = eVF_P3S_C4B_T2S;
-    params.pIndices = &m_lstNewIndices.front();
-    params.nIndexCount = m_lstNewIndices.size();
-    params.pTangents = &m_lstTangBasises.front();
-#if ENABLE_NORMALSTREAM_SUPPORT
-    params.pNormals = &m_lstNormals.front();
-#endif
-    params.nPrimetiveType = prtTriangleList;
-    params.eType = eRMT_Static;
-    params.nRenderChunkCount = 0;
-    params.bOnlyVideoBuffer = false;
-    params.bPrecache = false;
-    params.bLockForThreadAccess = true;//calls LockForThreadAccess in the Rendermesh ctor
-
-    _smart_ptr<IRenderMesh> pRenderMesh = GetRenderer()->CreateRenderMesh(info.sMeshType, info.sMeshName, &params);
-    pRenderMesh->SetBBox(finalBounds.min, finalBounds.max);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Setup merged chunks
-    //////////////////////////////////////////////////////////////////////////
-    m_tmpRenderChunkArray.resize(m_lstChunks.size());
-    for (size_t i = 0, num = m_lstChunks.size(); i < num; i++)
-    {
-        m_tmpRenderChunkArray[i] = m_lstChunks[i].rChunk;
-    }
-    pRenderMesh->SetRenderChunks(&m_tmpRenderChunkArray.front(), m_tmpRenderChunkArray.size(), false);
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Setup un-merged chunks
-    //////////////////////////////////////////////////////////////////////////
-    m_tmpRenderChunkArray.resize(m_lstChunksAll.size());
-    for (size_t i = 0, num = m_lstChunksAll.size(); i < num; i++)
-    {
-        m_tmpRenderChunkArray[i] = m_lstChunksAll[i].rChunk;
-    }
-    pRenderMesh->SetRenderChunks(&m_tmpRenderChunkArray.front(), m_tmpRenderChunkArray.size(), true);
-    //////////////////////////////////////////////////////////////////////////
-
-    pRenderMesh->UnLockForThreadAccess();
-
-    return pRenderMesh;
-}
diff --git a/Code/CryEngine/Cry3DEngine/RenderMeshMerger.h b/Code/CryEngine/Cry3DEngine/RenderMeshMerger.h
deleted file mode 100644
index 23df1750ad..0000000000
--- a/Code/CryEngine/Cry3DEngine/RenderMeshMerger.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_RENDERMESHMERGER_H
-#define CRYINCLUDE_CRY3DENGINE_RENDERMESHMERGER_H
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Input structure for RenderMesh merger
-//////////////////////////////////////////////////////////////////////////
-struct SRenderMeshInfoInput
-{
-    _smart_ptr<IRenderMesh>  pMesh;
-    _smart_ptr<IMaterial>    pMat;
-    IRenderNode* pSrcRndNode;
-    Matrix34        mat;
-    int           nSubObjectIndex;
-    int           nChunkId;
-    bool          bIdentityMatrix;
-
-    SRenderMeshInfoInput()
-        : pMesh(0)
-        , pMat(0)
-        , nChunkId(-1)
-        , nSubObjectIndex(0)
-        , pSrcRndNode(0)
-        , bIdentityMatrix(false) { mat.SetIdentity(); }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-};
-
-struct SDecalClipInfo
-{
-    Vec3 vPos;
-    float fRadius;
-    Vec3 vProjDir;
-};
-
-struct SMergeInfo
-{
-    const char* sMeshType;
-    const char* sMeshName;
-    bool bCompactVertBuffer;
-    bool bPrintDebugMessages;
-    bool bMakeNewMaterial;
-    bool bMergeToOneRenderMesh;
-    bool bPlaceInstancePositionIntoVertexNormal;
-    _smart_ptr<IMaterial> pUseMaterial; // Force to use this material
-
-    SDecalClipInfo* pDecalClipInfo;
-    AABB* pClipCellBox;
-    Vec3 vResultOffset; // this offset will be subtracted from output vertex positions
-
-    SMergeInfo()
-        : sMeshType("")
-        , sMeshName("")
-        , bCompactVertBuffer(false)
-        , bPrintDebugMessages(false)
-        , bMakeNewMaterial(true)
-        , bMergeToOneRenderMesh(false)
-        , bPlaceInstancePositionIntoVertexNormal(0)
-        , pUseMaterial(0)
-        , pDecalClipInfo(0)
-        , pClipCellBox(0)
-        , vResultOffset(0, 0, 0) {}
-};
-
-struct SMergedChunk
-{
-    CRenderChunk rChunk;
-    _smart_ptr<IMaterial> pMaterial;
-    SRenderMeshInfoInput* pFromMesh;
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-};
-
-struct SMergeBuffersData
-{
-    int nPosStride;
-    int nTexStride;
-    int nColorStride;
-    int nTangsStride;
-    int nIndCount;
-    uint8* pPos;
-    uint8* pTex;
-    uint8* pColor;
-    uint8* pTangs;
-    vtx_idx* pSrcInds;
-#if ENABLE_NORMALSTREAM_SUPPORT
-    int nNormStride;
-    uint8* pNorm;
-#endif
-};
-
-class CRenderMeshMerger
-    : public Cry3DEngineBase
-{
-public:
-    CRenderMeshMerger(void);
-    ~CRenderMeshMerger(void);
-
-    void Reset();
-
-    _smart_ptr<IRenderMesh> MergeRenderMeshes(SRenderMeshInfoInput* pRMIArray, int nRMICount, PodArray<SRenderMeshInfoOutput>& outRenderMeshes, SMergeInfo& info);
-
-    _smart_ptr<IRenderMesh> MergeRenderMeshes(SRenderMeshInfoInput* pRMIArray, int nRMICount, SMergeInfo& info);
-public:
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-
-        pSizer->AddObject(m_lstRMIChunks);
-        pSizer->AddObject(m_lstVerts);
-        pSizer->AddObject(m_lstTangBasises);
-        pSizer->AddObject(m_lstIndices);
-
-        pSizer->AddObject(m_lstChunks);
-        pSizer->AddObject(m_lstChunksAll);
-
-        pSizer->AddObject(m_lstNewVerts);
-        pSizer->AddObject(m_lstNewTangBasises);
-        pSizer->AddObject(m_lstNewIndices);
-        pSizer->AddObject(m_lstNewChunks);
-
-        pSizer->AddObject(m_lstChunksMergedTemp);
-
-        pSizer->AddObject(m_tmpRenderChunkArray);
-        pSizer->AddObject(m_tmpClipContext);
-    }
-
-    void MergeBuffersImpl(AABB* pBounds, SMergeBuffersData* arrMergeBuffersData);
-
-protected:
-    PodArray<SRenderMeshInfoInput> m_lstRMIChunks;
-    PodArray<SVF_P3S_C4B_T2S> m_lstVerts;
-    PodArray<SPipTangents> m_lstTangBasises;
-    PodArray<uint32> m_lstIndices;
-
-    PodArray<SMergedChunk> m_lstChunks;
-    PodArray<SMergedChunk> m_lstChunksAll;
-
-    PodArray<SVF_P3S_C4B_T2S> m_lstNewVerts;
-    PodArray<SPipTangents> m_lstNewTangBasises;
-    PodArray<vtx_idx> m_lstNewIndices;
-    PodArray<SMergedChunk> m_lstNewChunks;
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-    PodArray<SPipNormal> m_lstNormals;
-    PodArray<SPipNormal> m_lstNewNormals;
-#endif
-
-    PodArray<SMergedChunk> m_lstChunksMergedTemp;
-
-    TRenderChunkArray m_tmpRenderChunkArray;
-
-    PodArray<SMergeBuffersData> m_lstMergeBuffersData;
-    AABB m_tmpAABB;
-
-    CPolygonClipContext m_tmpClipContext;
-
-    int m_nTotalVertexCount;
-    int m_nTotalIndexCount;
-
-private:
-    bool GenerateRenderChunks(SRenderMeshInfoInput* pRMIArray, int nRMICount);
-    void MergeRenderChunks();
-    void MergeBuffers(AABB& bounds);
-
-    void MakeRenderMeshInfoListOfAllChunks(SRenderMeshInfoInput* pRMIArray, int nRMICount, SMergeInfo& info);
-    void MakeListOfAllCRenderChunks(SMergeInfo& info);
-    void IsChunkValid(const CRenderChunk& Ch, PodArray<SVF_P3S_C4B_T2S>& lstVerts, PodArray<uint32>& lstIndices);
-
-    void ClipByAABB(SMergeInfo& info);
-    void ClipDecals(SMergeInfo& info);
-    void CompactVertices(SMergeInfo& info);
-    void TryMergingChunks(SMergeInfo& info);
-
-    bool ClipTriangle(int nStartIdxId, Plane* pPlanes, int nPlanesNum);
-
-    static int Cmp_Materials(_smart_ptr<IMaterial> pMat1, _smart_ptr<IMaterial> pMat2);
-    static int Cmp_RenderChunks_(const void* v1, const void* v2);
-    static int Cmp_RenderChunksInfo(const void* v1, const void* v2);
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_RENDERMESHMERGER_H
diff --git a/Code/CryEngine/Cry3DEngine/RenderMeshUtils.cpp b/Code/CryEngine/Cry3DEngine/RenderMeshUtils.cpp
deleted file mode 100644
index 18acd0b7bd..0000000000
--- a/Code/CryEngine/Cry3DEngine/RenderMeshUtils.cpp
+++ /dev/null
@@ -1,904 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "RenderMeshUtils.h"
-
-namespace
-{
-    enum
-    {
-        MAX_CACHED_HITS = 8
-    };
-    struct SCachedHit
-    {
-        IRenderMesh* pRenderMesh;
-        SRayHitInfo hitInfo;
-        Vec3 tri[3];
-    };
-    static SCachedHit last_hits[MAX_CACHED_HITS];
-}
-
-
-bool SIntersectionData::Init(IRenderMesh* param_pRenderMesh, SRayHitInfo* param_pHitInfo, _smart_ptr<IMaterial> param_pMtl, bool param_bRequestDecalPlacementTest)
-{
-    pRenderMesh = param_pRenderMesh;
-    pHitInfo = param_pHitInfo;
-    pMtl = param_pMtl;
-    bDecalPlacementTestRequested = param_bRequestDecalPlacementTest;
-
-    bool bAllDMeshData = pHitInfo->bGetVertColorAndTC;
-
-    nVerts =  pRenderMesh->GetVerticesCount();
-    nInds =  pRenderMesh->GetIndicesCount();
-
-    if (nInds == 0 || nVerts == 0)
-    {
-        return false;
-    }
-    pPos =  (uint8*)pRenderMesh->GetPosPtr(nPosStride, FSL_READ);
-    pInds = pRenderMesh->GetIndexPtr(FSL_READ);
-
-#if defined (_DEBUG)
-    // Perform a quick validation of the vectors from this render mesh
-    for (int index = 0;index < nVerts; index++)
-    {
-        Vec3& check = *((Vec3*)&pPos[nPosStride * index]);
-        if (isnan(check.x) || isnan(check.y) || isnan(check.z))
-        {
-            CryLog("Warning:  Invalid vector at index (%d) detected in render mesh for %s.", nPosStride * index, pRenderMesh->GetSourceName());
-            break;
-        }
-    }
-#endif
-    
-    if (!pPos || !pInds)
-    {
-        return false;
-    }
-
-    if (bAllDMeshData)
-    {
-        pUV  = (uint8*)pRenderMesh->GetUVPtr(nUVStride, FSL_READ);
-        pCol = (uint8*)pRenderMesh->GetColorPtr(nColStride, FSL_READ);
-
-        pTangs = pRenderMesh->GetTangentPtr(nTangsStride, FSL_READ);
-    }
-
-    return true;
-}
-
-template <class T>
-bool GetBarycentricCoordinates(const T& a, const T& b, const T& c, const T& p, float& u, float& v, float& w, float fBorder /* = 0.f */)
-{
-    // Compute vectors
-    T v0 = b - a;
-    T v1 = c - a;
-    T v2 = p - a;
-
-    // Compute dot products
-    float dot00 = v0.Dot(v0);
-    float dot01 = v0.Dot(v1);
-    float dot02 = v0.Dot(v2);
-    float dot11 = v1.Dot(v1);
-    float dot12 = v1.Dot(v2);
-
-    // Compute barycentric coordinates
-    float invDenom = 1.f / (dot00 * dot11 - dot01 * dot01);
-    v = (dot11 * dot02 - dot01 * dot12) * invDenom;
-    w = (dot00 * dot12 - dot01 * dot02) * invDenom;
-    u = 1.f - v - w;
-
-    // Check if point is in triangle
-    return (u >= -fBorder) && (v >= -fBorder) && (w >= -fBorder);
-}
-
-void CRenderMeshUtils::ClearHitCache()
-{
-    // do not allow items to stay too long in the cache, it allows to minimize wrong hit detections
-    memmove(&last_hits[1], &last_hits[0], sizeof(last_hits) - sizeof(last_hits[0])); // Move hits to the end of array, throwing out the last one.
-    memset(&last_hits[0], 0, sizeof(last_hits[0]));
-}
-//////////////////////////////////////////////////////////////////////////
-bool CRenderMeshUtils::RayIntersection(IRenderMesh* pRenderMesh, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pMtl)
-{
-    SIntersectionData data;
-
-    pRenderMesh->LockForThreadAccess();
-    if (!data.Init(pRenderMesh, &hitInfo, pMtl))
-    {
-        return false;
-    }
-
-    // forward call to implementation
-    bool result = CRenderMeshUtils::RayIntersectionImpl(&data, &hitInfo, pMtl, false);
-
-    pRenderMesh->UnlockStream(VSF_GENERAL);
-    pRenderMesh->UnlockIndexStream();
-    pRenderMesh->UnLockForThreadAccess();
-    return result;
-}
-
-void CRenderMeshUtils::RayIntersectionAsync(SIntersectionData* pIntersectionRMData)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ThreeDEngine);
-
-    // forward call to implementation
-    SRayHitInfo& rHitInfo = *pIntersectionRMData->pHitInfo;
-    SIntersectionData& rIntersectionData = *pIntersectionRMData;
-
-    if (CRenderMeshUtils::RayIntersectionImpl(&rIntersectionData, &rHitInfo, rIntersectionData.pMtl, true))
-    {
-        const float testAreaSize = GetFloatCVar(e_DecalsPlacementTestAreaSize);
-        const float minTestDepth = GetFloatCVar(e_DecalsPlacementTestMinDepth);
-
-        if (rIntersectionData.bDecalPlacementTestRequested && testAreaSize)
-        {
-            rIntersectionData.fDecalPlacementTestMaxSize = 0.f;
-            float fRange = testAreaSize * 0.5f;
-
-            for (uint32 i = 0; i < 2; ++i, fRange *= 2.f)
-            {
-                Vec3 vDir = -rHitInfo.vHitNormal;
-                vDir.Normalize();
-
-                Vec3 vRight;
-                Vec3 vUp;
-
-                if (fabs(vDir.Dot(Vec3(0, 0, 1))) > 0.995f)
-                {
-                    vRight = Vec3(1, 0, 0);
-                    vUp = Vec3(0, 1, 0);
-                }
-                else
-                {
-                    vRight = vDir.Cross(Vec3(0, 0, 1));
-                    vUp = vRight.Cross(vDir);
-                }
-
-                Vec3 arrOffset[4] = { vRight* fRange, -vRight * fRange, vUp * fRange, -vUp * fRange };
-
-                SRayHitInfo hInfo;
-                SIntersectionData intersectionData;
-
-                float fDepth = max(minTestDepth, fRange * 0.2f);
-
-                int nPoint;
-                for (nPoint = 0; nPoint < 4; nPoint++)
-                {
-                    intersectionData = rIntersectionData;
-
-                    hInfo = rHitInfo;
-                    hInfo.inReferencePoint = hInfo.vHitPos + arrOffset[nPoint];//*fRange;
-                    hInfo.inRay.origin = hInfo.inReferencePoint + hInfo.vHitNormal * fDepth;
-                    hInfo.inRay.direction = -hInfo.vHitNormal * fDepth * 2.f;
-                    hInfo.fMaxHitDistance = fDepth;
-                    if (!CRenderMeshUtils::RayIntersectionImpl(&intersectionData, &hInfo, rIntersectionData.pMtl, true))
-                    {
-                        break;
-                    }
-                }
-
-                if (nPoint == 4)
-                {
-                    rIntersectionData.fDecalPlacementTestMaxSize = fRange;
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-    }
-}
-
-bool GetVertColorAndTC(SIntersectionData& rIntersectionRMData, SRayHitInfo& hitInfo)
-{
-    int nPosStride = rIntersectionRMData.nPosStride;
-    uint8* pPos = rIntersectionRMData.pPos;
-
-    int nUVStride = rIntersectionRMData.nUVStride;
-    uint8* pUV = rIntersectionRMData.pUV;
-
-    int nColStride = rIntersectionRMData.nColStride;
-    uint8* pCol = rIntersectionRMData.pCol;
-
-    vtx_idx* pInds = rIntersectionRMData.pInds;
-
-    int I0 = pInds[hitInfo.nHitTriID + 0];
-    int I1 = pInds[hitInfo.nHitTriID + 1];
-    int I2 = pInds[hitInfo.nHitTriID + 2];
-
-    // get tri vertices
-    Vec3& tv0 = *((Vec3*)&pPos[nPosStride * I0]);
-    Vec3& tv1 = *((Vec3*)&pPos[nPosStride * I1]);
-    Vec3& tv2 = *((Vec3*)&pPos[nPosStride * I2]);
-
-    float u = 0.f, v = 0.f, w = 0.f;
-    if (GetBarycentricCoordinates(tv0, tv1, tv2, hitInfo.vHitPos, u, v, w, 16.0f))
-    {
-        float arrVertWeight[3] = { max(0.f, u), max(0.f, v), max(0.f, w) };
-        float fDiv = 1.f / (arrVertWeight[0] + arrVertWeight[1] + arrVertWeight[2]);
-        arrVertWeight[0] *= fDiv;
-        arrVertWeight[1] *= fDiv;
-        arrVertWeight[2] *= fDiv;
-
-        Vec2 tc0 = *((Vec2*)&pUV[nUVStride * I0]);
-        Vec2 tc1 = *((Vec2*)&pUV[nUVStride * I1]);
-        Vec2 tc2 = *((Vec2*)&pUV[nUVStride * I2]);
-
-        hitInfo.vHitTC = tc0 * arrVertWeight[0] + tc1 * arrVertWeight[1] + tc2 * arrVertWeight[2];
-
-        Vec4 c0 = (*(ColorB*)&pCol[nColStride * I0]).toVec4();
-        Vec4 c1 = (*(ColorB*)&pCol[nColStride * I1]).toVec4();
-        Vec4 c2 = (*(ColorB*)&pCol[nColStride * I2]).toVec4();
-
-        // get tangent basis
-        int nTangsStride = rIntersectionRMData.nTangsStride;
-        byte* pTangs = rIntersectionRMData.pTangs;
-
-        Vec4 tangent[3];
-        Vec4 bitangent[3];
-        int arrId[3] = { I0, I1, I2 };
-        for (int ii = 0; ii < 3; ii++)
-        {
-            SPipTangents tb = *(SPipTangents*)&pTangs[nTangsStride * arrId[ii]];
-
-            tb.GetTB(tangent[ii], bitangent[ii]);
-        }
-
-        hitInfo.vHitTangent = (tangent[0] * arrVertWeight[0] + tangent[1] * arrVertWeight[1] + tangent[2] * arrVertWeight[2]);
-        hitInfo.vHitBitangent = (bitangent[0] * arrVertWeight[0] + bitangent[1] * arrVertWeight[1] + bitangent[2] * arrVertWeight[2]);
-        hitInfo.vHitColor = (c0 * arrVertWeight[0] + c1 * arrVertWeight[1] + c2 * arrVertWeight[2]) / 255.f;
-        return true;
-    }
-    return false;
-}
-
-bool CRenderMeshUtils::RayIntersectionImpl(SIntersectionData* pIntersectionRMData, SRayHitInfo* phitInfo, _smart_ptr<IMaterial> pMtl, bool bAsync)
-{
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-    IF (phitInfo->bGetVertColorAndTC, 0)
-#else
-    IF (phitInfo->bGetVertColorAndTC && phitInfo->inRay.direction.IsZero(), 0)
-#endif
-    {
-        return RayIntersectionFastImpl(*pIntersectionRMData, *phitInfo, pMtl, bAsync);
-    }
-
-    SIntersectionData& rIntersectionRMData = *pIntersectionRMData;
-    SRayHitInfo& hitInfo = *phitInfo;
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    //CTimeValue t0 = gEnv->pTimer->GetAsyncTime();
-
-    float fMaxDist2 = hitInfo.fMaxHitDistance * hitInfo.fMaxHitDistance;
-
-    Vec3 vHitPos(0, 0, 0);
-    Vec3 vHitNormal(0, 0, 0);
-
-    static bool bClearHitCache = true;
-    if (bClearHitCache && !bAsync)
-    {
-        memset(last_hits, 0, sizeof(last_hits));
-        bClearHitCache = false;
-    }
-
-    if (hitInfo.bUseCache && !bAsync)
-    {
-        Vec3 vOut;
-        // Check for cached hits.
-        for (int i = 0; i < MAX_CACHED_HITS; i++)
-        {
-            if (last_hits[i].pRenderMesh == rIntersectionRMData.pRenderMesh)
-            {
-                // If testing same render mesh, check if we hit the same triangle again.
-                if (Intersect::Ray_Triangle(hitInfo.inRay, last_hits[i].tri[0], last_hits[i].tri[2], last_hits[i].tri[1], vOut))
-                {
-                    if (fMaxDist2)
-                    {
-                        float fDistance2 = hitInfo.inReferencePoint.GetSquaredDistance(vOut);
-                        if (fDistance2 > fMaxDist2)
-                        {
-                            continue; // Ignore hits that are too far.
-                        }
-                    }
-
-                    // Cached hit.
-                    hitInfo.vHitPos = vOut;
-                    hitInfo.vHitNormal = last_hits[i].hitInfo.vHitNormal;
-                    hitInfo.nHitMatID = last_hits[i].hitInfo.nHitMatID;
-                    hitInfo.nHitSurfaceID = last_hits[i].hitInfo.nHitSurfaceID;
-
-                    if (hitInfo.inRetTriangle)
-                    {
-                        hitInfo.vTri0 = last_hits[i].tri[0];
-                        hitInfo.vTri1 = last_hits[i].tri[1];
-                        hitInfo.vTri2 = last_hits[i].tri[2];
-                    }
-                    //CTimeValue t1 = gEnv->pTimer->GetAsyncTime();
-                    //CryLogAlways( "TestTime :%.2f", (t1-t0).GetMilliSeconds() );
-                    //static int nCount = 0; CryLogAlways( "Cached Hit %d",++nCount );
-                    hitInfo.pRenderMesh = rIntersectionRMData.pRenderMesh;
-                    rIntersectionRMData.bResult = true;
-                    return true;
-                }
-            }
-        }
-    }
-
-    uint nVerts = rIntersectionRMData.nVerts;
-    int nInds = rIntersectionRMData.nInds;
-
-    assert(nInds != 0 && nVerts != 0);
-
-    // get position offset and stride
-    const int nPosStride = rIntersectionRMData.nPosStride;
-    uint8* const pPos = rIntersectionRMData.pPos;
-
-    // get indices
-    vtx_idx* const pInds = rIntersectionRMData.pInds;
-
-    assert(pInds != NULL && pPos != NULL);
-    assert(nInds % 3 == 0);
-
-    float fMinDistance2 = FLT_MAX;
-
-    Ray inRay = hitInfo.inRay;
-
-    bool bAnyHit = false;
-
-    Vec3 vOut;
-    Vec3 tri[3];
-
-    // test tris
-    TRenderChunkArray&  RESTRICT_REFERENCE Chunks = rIntersectionRMData.pRenderMesh->GetChunks();
-    int nChunkCount = Chunks.size();
-
-    for (int nChunkId = 0; nChunkId < nChunkCount; nChunkId++)
-    {
-        CRenderChunk* pChunk = &Chunks[nChunkId];
-
-        IF (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE, 0)
-        {
-            continue;
-        }
-        const int16 nChunkMatID = pChunk->m_nMatID;
-
-        bool b2Sided = false;
-
-        if (pMtl)
-        {
-            const SShaderItem& shaderItem = pMtl->GetShaderItem(nChunkMatID);
-            if (hitInfo.bOnlyZWrite && !shaderItem.IsZWrite())
-            {
-                continue;
-            }
-            if (!shaderItem.m_pShader || shaderItem.m_pShader->GetFlags() & EF_NODRAW || shaderItem.m_pShader->GetFlags() & EF_DECAL)
-            {
-                continue;
-            }
-            if (shaderItem.m_pShader->GetCull() & eCULL_None)
-            {
-                b2Sided = true;
-            }
-            if (shaderItem.m_pShaderResources && shaderItem.m_pShaderResources->GetResFlags() & MTL_FLAG_2SIDED)
-            {
-                b2Sided = true;
-            }
-        }
-
-        int nLastIndexId = pChunk->nFirstIndexId + pChunk->nNumIndices;
-        const vtx_idx* __restrict pIndices = rIntersectionRMData.pInds;
-
-        IF (nLastIndexId - 1 >= nInds, 0)
-        {
-            Error("%s (%s): invalid mesh chunk", __FUNCTION__, rIntersectionRMData.pRenderMesh->GetSourceName());
-            rIntersectionRMData.bResult = false;
-            return 0;
-        }
-
-        // make line triangle intersection
-        int i = pChunk->nFirstIndexId;
-
-        while (i < nLastIndexId)
-        {
-            int p = nLastIndexId;
-
-            for (; i < p; i += 3)//process all prefetched vertices
-            {
-                IF (pInds[i + 2] >= nVerts, 0)
-                {
-                    Error("%s (%s): invalid mesh indices", __FUNCTION__, rIntersectionRMData.pRenderMesh->GetSourceName());
-                    rIntersectionRMData.bResult = false;
-                    return 0;
-                }
-
-                // get tri vertices
-                const Vec3& tv0 = *(const Vec3*)&pPos[ nPosStride * pIndices[i + 0] ];
-                const Vec3& tv1 = *(const Vec3*)&pPos[ nPosStride * pIndices[i + 1] ];
-                const Vec3& tv2 = *(const Vec3*)&pPos[ nPosStride * pIndices[i + 2] ];
-
-                if (Intersect::Ray_Triangle(inRay, tv0, tv2, tv1, vOut))
-                {
-                    float fDistance2 = hitInfo.inReferencePoint.GetSquaredDistance(vOut);
-                    if (fMaxDist2)
-                    {
-                        if (fDistance2 > fMaxDist2)
-                        {
-                            continue; // Ignore hits that are too far.
-                        }
-                    }
-                    bAnyHit = true;
-                    // Test front.
-                    if (hitInfo.bInFirstHit)
-                    {
-                        vHitPos = vOut;
-                        hitInfo.nHitMatID = nChunkMatID;
-                        hitInfo.nHitTriID = i;
-                        tri[0] = tv0;
-                        tri[1] = tv1;
-                        tri[2] = tv2;
-                        goto AnyHit;//need to break chunk loops, vertex loop and prefetched loop
-                    }
-                    if (fDistance2 < fMinDistance2)
-                    {
-                        fMinDistance2 = fDistance2;
-                        vHitPos = vOut;
-                        hitInfo.nHitMatID = nChunkMatID;
-                        hitInfo.nHitTriID = i;
-                        tri[0] = tv0;
-                        tri[1] = tv1;
-                        tri[2] = tv2;
-                    }
-                }
-                else
-                if (b2Sided)
-                {
-                    if (Intersect::Ray_Triangle(inRay, tv0, tv1, tv2, vOut))
-                    {
-                        float fDistance2 = hitInfo.inReferencePoint.GetSquaredDistance(vOut);
-                        if (fMaxDist2)
-                        {
-                            if (fDistance2 > fMaxDist2)
-                            {
-                                continue; // Ignore hits that are too far.
-                            }
-                        }
-
-                        bAnyHit = true;
-                        // Test back.
-                        if (hitInfo.bInFirstHit)
-                        {
-                            vHitPos = vOut;
-                            hitInfo.nHitMatID = nChunkMatID;
-                            hitInfo.nHitTriID = i;
-                            tri[0] = tv0;
-                            tri[1] = tv2;
-                            tri[2] = tv1;
-                            goto AnyHit;//need to break chunk loops, vertex loop and prefetched loop
-                        }
-                        if (fDistance2 < fMinDistance2)
-                        {
-                            fMinDistance2 = fDistance2;
-                            vHitPos = vOut;
-                            hitInfo.nHitMatID = nChunkMatID;
-                            hitInfo.nHitTriID = i;
-                            tri[0] = tv0;
-                            tri[1] = tv2;
-                            tri[2] = tv1;
-                        }
-                    }
-                }
-            }
-        }
-    }
-AnyHit:
-    if (bAnyHit)
-    {
-        hitInfo.pRenderMesh = rIntersectionRMData.pRenderMesh;
-
-        // return closest to the shooter
-        hitInfo.fDistance = (float)sqrt_tpl(fMinDistance2);
-        hitInfo.vHitNormal = (tri[1] - tri[0]).Cross(tri[2] - tri[0]).GetNormalized();
-        hitInfo.vHitPos = vHitPos;
-        hitInfo.nHitSurfaceID = 0;
-
-        if (hitInfo.inRetTriangle)
-        {
-            hitInfo.vTri0 = tri[0];
-            hitInfo.vTri1 = tri[1];
-            hitInfo.vTri2 = tri[2];
-        }
-
-#ifndef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-        if (hitInfo.bGetVertColorAndTC && hitInfo.nHitTriID >= 0 && !inRay.direction.IsZero())
-        {
-            GetVertColorAndTC(rIntersectionRMData, hitInfo);
-        }
-#endif
-
-        if (pMtl)
-        {
-            pMtl = pMtl->GetSafeSubMtl(hitInfo.nHitMatID);
-            if (pMtl)
-            {
-                hitInfo.nHitSurfaceID = pMtl->GetSurfaceTypeId();
-            }
-        }
-
-        if (!bAsync)
-        {
-            //////////////////////////////////////////////////////////////////////////
-            // Add to cached results.
-            memmove(&last_hits[1], &last_hits[0], sizeof(last_hits) - sizeof(last_hits[0])); // Move hits to the end of array, throwing out the last one.
-            last_hits[0].pRenderMesh = rIntersectionRMData.pRenderMesh;
-            last_hits[0].hitInfo = hitInfo;
-            memcpy(last_hits[0].tri, tri, sizeof(tri));
-            //////////////////////////////////////////////////////////////////////////
-        }
-    }
-    //CTimeValue t1 = gEnv->pTimer->GetAsyncTime();
-    //CryLogAlways( "TestTime :%.2f", (t1-t0).GetMilliSeconds() );
-
-    rIntersectionRMData.bResult = bAnyHit;
-    return bAnyHit;
-}
-
-bool CRenderMeshUtils::RayIntersectionFast(IRenderMesh* pRenderMesh, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pMtl)
-{
-    SIntersectionData data;
-
-    if (!data.Init(pRenderMesh, &hitInfo, pMtl))
-    {
-        return false;
-    }
-
-    // forward call to implementation
-    return CRenderMeshUtils::RayIntersectionFastImpl(data, hitInfo, pMtl, false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderMeshUtils::RayIntersectionFastImpl(SIntersectionData& rIntersectionRMData, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pMtl, [[maybe_unused]] bool bAsync)
-{
-    float fBestDist = hitInfo.fMaxHitDistance; // squared distance works different for values less and more than 1.f
-
-    Vec3 vHitPos(0, 0, 0);
-    Vec3 vHitNormal(0, 0, 0);
-
-    int nVerts = rIntersectionRMData.nVerts;
-    int nInds = rIntersectionRMData.nInds;
-
-    assert(nInds != 0 && nVerts != 0);
-
-    // get position offset and stride
-    int nPosStride = rIntersectionRMData.nPosStride;
-    uint8* pPos = rIntersectionRMData.pPos;
-
-    int nUVStride = rIntersectionRMData.nUVStride;
-    uint8* pUV = rIntersectionRMData.pUV;
-
-    int nColStride = rIntersectionRMData.nColStride;
-    uint8* pCol = rIntersectionRMData.pCol;
-
-    // get indices
-    vtx_idx* pInds = rIntersectionRMData.pInds;
-
-    assert(pInds != NULL && pPos != NULL);
-
-    assert(nInds % 3 == 0);
-
-    Ray inRay = hitInfo.inRay;
-
-    bool bAnyHit = false;
-
-    Vec3 vOut;
-    Vec3 tri[3];
-
-    // test tris
-
-    Line inLine(inRay.origin, inRay.direction);
-
-    if (!inRay.direction.IsZero() && hitInfo.nHitTriID >= 0)
-    {
-        if (hitInfo.nHitTriID + 2 >= nInds)
-        {
-            return false;
-        }
-
-        int I0 = pInds[hitInfo.nHitTriID + 0];
-        int I1 = pInds[hitInfo.nHitTriID + 1];
-        int I2 = pInds[hitInfo.nHitTriID + 2];
-
-        if (I0 < nVerts && I1 < nVerts && I2 < nVerts)
-        {
-            // get tri vertices
-            Vec3& tv0 = *((Vec3*)&pPos[nPosStride * I0]);
-            Vec3& tv1 = *((Vec3*)&pPos[nPosStride * I1]);
-            Vec3& tv2 = *((Vec3*)&pPos[nPosStride * I2]);
-
-            if (Intersect::Line_Triangle(inLine, tv0, tv2, tv1, vOut))// || Intersect::Line_Triangle( inLine, tv0, tv1, tv2, vOut ))
-            {
-                float fDistance = (hitInfo.inReferencePoint - vOut).GetLengthFast();
-
-                if (fBestDist == 0.f || fDistance < fBestDist)
-                {
-                    bAnyHit = true;
-                    fBestDist = fDistance;
-                    vHitPos = vOut;
-                    tri[0] = tv0;
-                    tri[1] = tv1;
-                    tri[2] = tv2;
-                }
-            }
-        }
-    }
-
-    if (hitInfo.nHitTriID == HIT_UNKNOWN)
-    {
-        if (inRay.direction.IsZero())
-        {
-            ProcessBoxIntersection(inRay, hitInfo, rIntersectionRMData, pMtl, pInds, nVerts, pPos, nPosStride, pUV, nUVStride, pCol, nColStride, nInds, bAnyHit, fBestDist, vHitPos, tri);
-        }
-        else
-        {
-            if (const PodArray<std::pair<int, int> >* pTris = rIntersectionRMData.pRenderMesh->GetTrisForPosition(inRay.origin + inRay.direction * 0.5f, pMtl))
-            {
-                for (int nId = 0; nId < pTris->Count(); ++nId)
-                {
-                    const std::pair<int, int>& t = pTris->GetAt(nId);
-
-                    if (t.first + 2 >= nInds)
-                    {
-                        return false;
-                    }
-
-                    int I0 = pInds[t.first + 0];
-                    int I1 = pInds[t.first + 1];
-                    int I2 = pInds[t.first + 2];
-
-                    if (I0 >= nVerts || I1 >= nVerts || I2 >= nVerts)
-                    {
-                        return false;
-                    }
-
-                    // get tri vertices
-                    Vec3& tv0 = *((Vec3*)&pPos[nPosStride * I0]);
-                    Vec3& tv1 = *((Vec3*)&pPos[nPosStride * I1]);
-                    Vec3& tv2 = *((Vec3*)&pPos[nPosStride * I2]);
-
-                    if (Intersect::Line_Triangle(inLine, tv0, tv2, tv1, vOut))  // || Intersect::Line_Triangle( inLine, tv0, tv1, tv2, vOut ))
-                    {
-                        float fDistance = (hitInfo.inReferencePoint - vOut).GetLengthFast();
-
-                        if (fDistance < fBestDist)
-                        {
-                            bAnyHit = true;
-                            fBestDist = fDistance;
-                            vHitPos = vOut;
-                            tri[0] = tv0;
-                            tri[1] = tv1;
-                            tri[2] = tv2;
-                            hitInfo.nHitMatID = t.second;
-                            hitInfo.nHitTriID = t.first;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (bAnyHit)
-    {
-        hitInfo.pRenderMesh = rIntersectionRMData.pRenderMesh;
-
-        // return closest to the shooter
-        hitInfo.fDistance = fBestDist;
-        hitInfo.vHitNormal = (tri[1] - tri[0]).Cross(tri[2] - tri[0]).GetNormalized();
-        hitInfo.vHitPos = vHitPos;
-        hitInfo.nHitSurfaceID = 0;
-
-        if (pMtl)
-        {
-            pMtl = pMtl->GetSafeSubMtl(hitInfo.nHitMatID);
-            if (pMtl)
-            {
-                hitInfo.nHitSurfaceID = pMtl->GetSurfaceTypeId();
-            }
-        }
-
-        if (hitInfo.bGetVertColorAndTC && hitInfo.nHitTriID >= 0 && !inRay.direction.IsZero())
-        {
-            GetVertColorAndTC(rIntersectionRMData, hitInfo);
-        }
-    }
-
-    //CTimeValue t1 = gEnv->pTimer->GetAsyncTime();
-    //CryLogAlways( "TestTime :%.2f", (t1-t0).GetMilliSeconds() );
-
-    return bAnyHit;
-}
-
-// used for CPU voxelization
-bool CRenderMeshUtils::ProcessBoxIntersection(Ray& inRay, SRayHitInfo& hitInfo, SIntersectionData& rIntersectionRMData, _smart_ptr<IMaterial> pMtl, vtx_idx* pInds, int nVerts, uint8* pPos, int nPosStride, uint8* pUV, int nUVStride, uint8* pCol, int nColStride, int nInds, bool& bAnyHit, float& fBestDist, Vec3& vHitPos, Vec3* tri)
-{
-    AABB voxBox;
-    voxBox.min = inRay.origin - Vec3(hitInfo.fMaxHitDistance);
-    voxBox.max = inRay.origin + Vec3(hitInfo.fMaxHitDistance);
-
-    if (hitInfo.pHitTris)
-    { // just collect tris
-        TRenderChunkArray& Chunks = rIntersectionRMData.pRenderMesh->GetChunks();
-        int nChunkCount = Chunks.size();
-
-        for (int nChunkId = 0; nChunkId < nChunkCount; nChunkId++)
-        {
-            CRenderChunk* pChunk(&Chunks[nChunkId]);
-
-            IF (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE, 0)
-            {
-                continue;
-            }
-
-            const int16 nChunkMatID = pChunk->m_nMatID;
-
-            bool b2Sided = false;
-
-            const SShaderItem& shaderItem = pMtl->GetShaderItem(nChunkMatID);
-            //                  if (!shaderItem.IsZWrite())
-            //                  continue;
-            IShader* pShader = shaderItem.m_pShader;
-            if (!pShader || pShader->GetFlags() & EF_NODRAW || pShader->GetFlags() & EF_DECAL || (pShader->GetShaderType() != eST_General))
-            {
-                continue;
-            }
-            if (pShader->GetCull() & eCULL_None)
-            {
-                b2Sided = true;
-            }
-            if (shaderItem.m_pShaderResources && shaderItem.m_pShaderResources->GetResFlags() & MTL_FLAG_2SIDED)
-            {
-                b2Sided = true;
-            }
-
-            float fOpacity = shaderItem.m_pShaderResources->GetStrengthValue(EFTT_OPACITY) * shaderItem.m_pShaderResources->GetVoxelCoverage();
-            if (fOpacity < hitInfo.fMinHitOpacity)
-            {
-                continue;
-            }
-
-            //                  ColorB colEm = shaderItem.m_pShaderResources->GetEmissiveColor();
-            //                  if(!colEm.r && !colEm.g && !colEm.b)
-            //                      colEm = Col_DarkGray;
-
-            // make line triangle intersection
-            for (uint ii = pChunk->nFirstIndexId; ii < pChunk->nFirstIndexId + pChunk->nNumIndices; ii += 3)
-            {
-                int I0 = pInds[ii + 0];
-                int I1 = pInds[ii + 1];
-                int I2 = pInds[ii + 2];
-
-                if (I0 >= nVerts || I1 >= nVerts || I2 >= nVerts)
-                {
-                    return false;
-                }
-
-                // get tri vertices
-                Vec3& tv0 = *((Vec3*)&pPos[nPosStride * I0]);
-                Vec3& tv1 = *((Vec3*)&pPos[nPosStride * I1]);
-                Vec3& tv2 = *((Vec3*)&pPos[nPosStride * I2]);
-
-#if defined(_DEBUG)
-                // Additional validation checks against the vectors that will be used in the triangle overlap
-                // validation
-                if (isnan(tv0.x) || isnan(tv0.y) || isnan(tv0.z) || 
-                    isnan(tv1.x) || isnan(tv1.y) || isnan(tv1.z) ||
-                    isnan(tv2.x) || isnan(tv2.y) || isnan(tv2.z))
-                {
-                    return false;
-                }
-#endif // defined(_DEBUG)
-
-                if (Overlap::AABB_Triangle(voxBox, tv0, tv2, tv1))
-                {
-                    AABB triBox(tv0, tv0);
-                    triBox.Add(tv2);
-                    triBox.Add(tv1);
-
-                    if (triBox.GetRadiusSqr() > 0.00001f)
-                    {
-                        SRayHitTriangle ht;
-                        ht.v[0] = tv0;
-                        ht.v[1] = tv1;
-                        ht.v[2] = tv2;
-
-                        ht.t[0] = *((Vec2*)&pUV[nUVStride * I0]);
-                        ht.t[1] = *((Vec2*)&pUV[nUVStride * I1]);
-                        ht.t[2] = *((Vec2*)&pUV[nUVStride * I2]);
-
-                        ht.pMat = pMtl->GetSafeSubMtl(nChunkMatID);
-
-                        ht.c[0] = (*(ColorB*)&pCol[nColStride * I0]);
-                        ht.c[1] = (*(ColorB*)&pCol[nColStride * I1]);
-                        ht.c[2] = (*(ColorB*)&pCol[nColStride * I2]);
-
-                        ht.nOpacity = SATURATEB(int(fOpacity * 255.f));
-                        hitInfo.pHitTris->Add(ht);
-                    }
-                }
-            }
-        }
-    }
-    else if (const PodArray<std::pair<int, int> >* pTris = rIntersectionRMData.pRenderMesh->GetTrisForPosition(inRay.origin, pMtl))
-    {
-        for (int nId = 0; nId < pTris->Count(); ++nId)
-        {
-            const std::pair<int, int>& t = pTris->GetAt(nId);
-
-            if (t.first + 2 >= nInds)
-            {
-                return false;
-            }
-
-            int I0 = pInds[t.first + 0];
-            int I1 = pInds[t.first + 1];
-            int I2 = pInds[t.first + 2];
-
-            if (I0 >= nVerts || I1 >= nVerts || I2 >= nVerts)
-            {
-                return false;
-            }
-
-            // get tri vertices
-            Vec3& tv0 = *((Vec3*)&pPos[nPosStride * I0]);
-            Vec3& tv1 = *((Vec3*)&pPos[nPosStride * I1]);
-            Vec3& tv2 = *((Vec3*)&pPos[nPosStride * I2]);
-
-            if (Overlap::AABB_Triangle(voxBox, tv0, tv2, tv1))
-            {
-                {
-                    _smart_ptr<IMaterial> pSubMtl = pMtl->GetSafeSubMtl(t.second);
-                    if (pSubMtl)
-                    {
-                        if (!pSubMtl->GetShaderItem().IsZWrite())
-                        {
-                            continue;
-                        }
-                        if (!pSubMtl->GetShaderItem().m_pShader)
-                        {
-                            continue;
-                        }
-                        if (pSubMtl->GetShaderItem().m_pShader->GetShaderType() != eST_Metal && pSubMtl->GetShaderItem().m_pShader->GetShaderType() != eST_General)
-                        {
-                            continue;
-                        }
-                    }
-                }
-
-                bAnyHit = true;
-                fBestDist = 0;
-                vHitPos = voxBox.GetCenter();
-                tri[0] = tv0;
-                tri[1] = tv1;
-                tri[2] = tv2;
-                hitInfo.nHitMatID = t.second;
-                hitInfo.nHitTriID = t.first;
-
-                break;
-            }
-        }
-    }
-
-    return bAnyHit;
-}
diff --git a/Code/CryEngine/Cry3DEngine/RenderMeshUtils.h b/Code/CryEngine/Cry3DEngine/RenderMeshUtils.h
deleted file mode 100644
index da2f277773..0000000000
--- a/Code/CryEngine/Cry3DEngine/RenderMeshUtils.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_RENDERMESHUTILS_H
-#define CRYINCLUDE_CRY3DENGINE_RENDERMESHUTILS_H
-#pragma once
-
-struct SIntersectionData;
-
-//////////////////////////////////////////////////////////////////////////
-// RenderMesh utilities.
-//////////////////////////////////////////////////////////////////////////
-class CRenderMeshUtils
-    : public Cry3DEngineBase
-{
-public:
-    // Do a render-mesh vs Ray intersection, return true for intersection.
-    static bool RayIntersection(IRenderMesh* pRenderMesh, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pMtl = 0);
-    static bool RayIntersectionFast(IRenderMesh* pRenderMesh, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl = 0);
-
-    // async versions, aren't using the cache, and are used by the deferredrayintersection class
-    static void RayIntersectionAsync(SIntersectionData* pIntersectionRMData);
-
-    static void ClearHitCache();
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //void FindCollisionWithRenderMesh( IRenderMesh *pRenderMesh, SRayHitInfo &hitInfo );
-    //  void FindCollisionWithRenderMesh( IPhysiIRenderMesh2 *pRenderMesh, SRayHitInfo &hitInfo );
-private:
-    // functions implementing the logic for RayIntersection
-    static bool RayIntersectionImpl(SIntersectionData* pIntersectionRMData, SRayHitInfo* phitInfo, _smart_ptr<IMaterial> pCustomMtl, bool bAsync);
-    static bool RayIntersectionFastImpl(SIntersectionData& rIntersectionRMData, SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl, bool bAsync);
-    static bool ProcessBoxIntersection(Ray& inRay, SRayHitInfo& hitInfo, SIntersectionData& rIntersectionRMData, _smart_ptr<IMaterial> pMtl, vtx_idx* pInds, int nVerts, uint8* pPos, int nPosStride, uint8* pUV, int nUVStride, uint8* pCol, int nColStride, int nInds, bool& bAnyHit, float& fBestDist, Vec3& vHitPos, Vec3* tri);
-};
-
-// struct to collect parameters for the wrapped RayInterseciton functions
-struct SIntersectionData
-{
-    SIntersectionData()
-        : pRenderMesh(NULL)
-        ,  nVerts(0)
-        ,  nInds(0)
-        , nPosStride(0)
-        ,          pPos(NULL)
-        , pInds(NULL)
-        , nUVStride(0)
-        ,           pUV(NULL)
-        , nColStride(0)
-        ,          pCol(NULL)
-        , nTangsStride(0)
-        ,        pTangs(NULL)
-        , bResult(false)
-        ,         bNeedFallback(false)
-        , fDecalPlacementTestMaxSize(1000.f)
-        , bDecalPlacementTestRequested(false)
-        , pHitInfo(0)
-        , pMtl(0)
-    {
-    }
-
-    bool Init(IRenderMesh* pRenderMesh, SRayHitInfo* _pHitInfo, _smart_ptr<IMaterial> _pMtl, bool _bRequestDecalPlacementTest = false);
-
-    IRenderMesh* pRenderMesh;
-    SRayHitInfo* pHitInfo;
-    _smart_ptr<IMaterial> pMtl;
-    bool bDecalPlacementTestRequested;
-
-    int nVerts;
-    int nInds;
-
-    int nPosStride;
-    uint8* pPos;
-    vtx_idx* pInds;
-
-    int nUVStride;
-    uint8* pUV;
-
-    int nColStride;
-    uint8* pCol;
-
-    int nTangsStride;
-    byte* pTangs;
-
-    bool bResult;
-    float fDecalPlacementTestMaxSize; // decal will look acceptable in this place
-    bool bNeedFallback;
-};
-
-template <class T>
-bool GetBarycentricCoordinates(const T& a, const T& b, const T& c, const T& p, float& u, float& v, float& w, float fBorder = 0.f);
-
-#endif // CRYINCLUDE_CRY3DENGINE_RENDERMESHUTILS_H
diff --git a/Code/CryEngine/Cry3DEngine/RenderMeshUtils/Tests/Test_RenderMeshUtils.cpp b/Code/CryEngine/Cry3DEngine/RenderMeshUtils/Tests/Test_RenderMeshUtils.cpp
deleted file mode 100644
index b482d0c03e..0000000000
--- a/Code/CryEngine/Cry3DEngine/RenderMeshUtils/Tests/Test_RenderMeshUtils.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Cry3DEngine_precompiled.h"
-#include <AzTest/AzTest.h>
-
-#include "RenderMeshUtils.h"
-
-namespace TestRenderMeshUtils
-{
-    void TestBarycentricCoordinates(Vec3 t0, Vec3 t1, Vec3 t2, const std::vector<Vec3>& hitPoints, const std::vector<Vec3>& expectedBarycentricCoordinates, bool expectedIsHit)
-    {
-        assert(hitPoints.size() == expectedBarycentricCoordinates.size());
-
-        float u = 0.f;
-        float v = 0.f;
-        float w = 0.f;
-        for (uint i = 0; i < hitPoints.size(); ++i)
-        {
-            EXPECT_TRUE(GetBarycentricCoordinates(t0, t1, t2, hitPoints[i], u, v, w) == expectedIsHit);
-
-            EXPECT_FLOAT_EQ(expectedBarycentricCoordinates[i].x, u);
-            EXPECT_FLOAT_EQ(expectedBarycentricCoordinates[i].y, v);
-            EXPECT_FLOAT_EQ(expectedBarycentricCoordinates[i].z, w);
-        }
-    }
-
-    GTEST_TEST(GetBarycentricCoordinatesTest, Call_CoordinatesOnVertexOfUnitTriangle_ReturnsTrue)
-    {
-        // Test triangle
-        Vec3 t0(1.f, 0.f, 0.f);
-        Vec3 t1(0.f, 1.f, 0.f);
-        Vec3 t2(0.f, 0.f, 1.f);
-
-        // Test data
-        std::vector<Vec3> vertexHitPoints = {
-            { 1.f, 0.f, 0.f }, { 0.f, 1.f, 0.f }, { 0.f, 0.f, 1.f }
-        };
-        std::vector<Vec3> vertexExpectedBarycentricCoordinates = {
-            { 1.f, 0.f, 0.f }, { 0.f, 1.f, 0.f }, { 0.f, 0.f, 1.f }
-        };
-
-        TestBarycentricCoordinates(t0, t1, t2, vertexHitPoints, vertexExpectedBarycentricCoordinates, true);
-    }
-
-    GTEST_TEST(GetBarycentricCoordinatesTest, Call_CoordinatesOnEdgeOfUnitTriangle_ReturnsTrue)
-    {
-        // Test triangle
-        Vec3 t0(1.f, 0.f, 0.f);
-        Vec3 t1(0.f, 1.f, 0.f);
-        Vec3 t2(0.f, 0.f, 1.f);
-
-        // Test data
-        std::vector<Vec3> edgeHitPoints = {
-            { 0.5f, 0.5f, 0.0f }, { 0.5f, 0.0f, 0.5f }, { 0.0f, 0.5f, 0.5f }
-        };
-        std::vector<Vec3> edgeExpectedBarycentricCoordinates = {
-            { 0.5f, 0.5f, 0.0f }, { 0.5f, 0.0f, 0.5f }, { 0.0f, 0.5f, 0.5f }
-        };
-
-        TestBarycentricCoordinates(t0, t1, t2, edgeHitPoints, edgeExpectedBarycentricCoordinates, true);
-    }
-
-    GTEST_TEST(GetBarycentricCoordinatesTest, Call_CoordinatesOnCenterOfUnitTriangle_ReturnsTrue)
-    {
-        // Test triangle
-        Vec3 t0(1.f, 0.f, 0.f);
-        Vec3 t1(0.f, 1.f, 0.f);
-        Vec3 t2(0.f, 0.f, 1.f);
-
-        // Test data
-        std::vector<Vec3> centerHitPoints = {
-            { 0.5f, 0.5f, 0.5f }, { 1.f, 1.f, 1.f }, { -1.f, -1.f, -1.f }
-        };
-        std::vector<Vec3> centerExpectedBarycentricCoordinates = {
-            { 1.f / 3.f, 1.f / 3.f, 1.f / 3.f }, { 1.f / 3.f, 1.f / 3.f, 1.f / 3.f }, { 1.f / 3.f, 1.f / 3.f, 1.f / 3.f }
-        };
-
-        TestBarycentricCoordinates(t0, t1, t2, centerHitPoints, centerExpectedBarycentricCoordinates, true);
-    }
-
-    GTEST_TEST(GetBarycentricCoordinatesTest, Call_CoordinatesOffCenterOfUnitTriangle_ReturnsTrue)
-    {
-        // Test triangle
-        Vec3 t0(1.f, 0.f, 0.f);
-        Vec3 t1(0.f, 1.f, 0.f);
-        Vec3 t2(0.f, 0.f, 1.f);
-
-        // Test data
-        std::vector<Vec3> offCenterHitPoints = {
-            { 1.f, 1.f, .75f }, { -1.f, -1.f, -.75f }
-        };
-        std::vector<Vec3> offCenterExpectedBarycentricCoordinates = {
-            { 5.f / 12.f, 5.f / 12.f, 1.f / 6.f }, { 0.25f, 0.25f, 0.5f }
-        };
-
-        TestBarycentricCoordinates(t0, t1, t2, offCenterHitPoints, offCenterExpectedBarycentricCoordinates, true);
-    }
-
-    GTEST_TEST(GetBarycentricCoordinatesTest, Call_CoordinatesOutsideOfUnitTriangle_ReturnsFalse)
-    {
-        // Test triangle
-        Vec3 t0(1.f, 0.f, 0.f);
-        Vec3 t1(0.f, 1.f, 0.f);
-        Vec3 t2(0.f, 0.f, 1.f);
-
-        // Test data
-        std::vector<Vec3> nonHitPoints = {
-            { 1.f, 1.f, 0.f }, { 1.f, 0.f, 1.f }, { 0.f, 1.f, 1.f }
-        };
-        std::vector<Vec3> nonHitExpectedBarycentricCoordinates = {
-            { 2.f / 3.f, 2.f / 3.f, -1.f / 3.f }, { 2.f / 3.f, -1.f / 3.f, 2.f / 3.f }, { -1.f / 3.f, 2.f / 3.f, 2.f / 3.f }
-        };
-
-        TestBarycentricCoordinates(t0, t1, t2, nonHitPoints, nonHitExpectedBarycentricCoordinates, false);
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/ShadowCache.cpp b/Code/CryEngine/Cry3DEngine/ShadowCache.cpp
deleted file mode 100644
index c93b014cd2..0000000000
--- a/Code/CryEngine/Cry3DEngine/ShadowCache.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "ShadowCache.h"
-#include "LightEntity.h"
-#include "VisAreas.h"
-
-const float ShadowCache::AO_FRUSTUM_SLOPE_BIAS = 0.5f;
-
-void ShadowCache::InitShadowFrustum(ShadowMapFrustum*& pFr, int nLod, int nFirstStaticLod, float fDistFromViewDynamicLod, float fRadiusDynamicLod, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    assert(nLod >= 0);
-
-    // If we only allow updates via script, then early out here.
-    // When script triggers an update, m_nUpdateStrategy will be set to ShadowMapFrustum::ShadowCacheData::eFullUpdate for a single frame to process a full cached shadow update
-    if ( m_nUpdateStrategy == ShadowMapFrustum::ShadowCacheData::eManualUpdate )
-    {
-        return;
-    }
-
-    if (!pFr)
-    {
-        pFr = new ShadowMapFrustum;
-    }
-
-    if (!pFr->pShadowCacheData)
-    {
-        pFr->pShadowCacheData = new ShadowMapFrustum::ShadowCacheData;
-    }
-    
-    // Check if we both allow updates if the user moves too close to the border of the shadow map and if we have come too close to said border
-    ShadowMapFrustum::ShadowCacheData::eUpdateStrategy nUpdateStrategy = m_nUpdateStrategy;
-    bool allowDistanceBasedUpdates = nUpdateStrategy == ShadowMapFrustum::ShadowCacheData::eManualOrDistanceUpdate || nUpdateStrategy == ShadowMapFrustum::ShadowCacheData::eIncrementalUpdate;
-    if (allowDistanceBasedUpdates && Get3DEngine()->m_CachedShadowsBounds.IsReset())
-    {
-        // Distance from the camera to the center of the last time this cached static shadow map was updated
-        const float distanceBetweenCenters = (passInfo.GetCamera().GetPosition() - pFr->aabbCasters.GetCenter()).GetLength();
-
-        // Note: These values are calculated based on e_gsmRange, e_gsmRangeStep and your camera properties.  They will not change unless those change.
-        const float dynamicCascadeMeasurements = fDistFromViewDynamicLod + fRadiusDynamicLod;
-
-        // Check if our dynamic shadow frustum lies outside of the cached shadow frustum.  If so, force an update.
-        if ((distanceBetweenCenters + dynamicCascadeMeasurements) > pFr->aabbCasters.GetSize().x / 2.0f)
-        {
-            nUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eFullUpdate;
-
-            if (!gEnv->IsEditing())
-            {
-                // If our dynamic cascade always registers as larger than the update threshold for the cached frustum, regardless of how far the camera has moved, this is a serious error.
-                // This needs fixed either via CVars or a flow graph node.
-                if (dynamicCascadeMeasurements > (pFr->aabbCasters.GetSize().x / 2.0f))
-                {
-                    // To prevent per-frame spam, but still output often enough that this message will get noticed and hopefully fixed.
-                    // Not fixing this issue means users are potentially rendering thousands of extra objects into shadow maps per frame.
-                    static unsigned int s_lastOutput = 1000;
-                    if ((++s_lastOutput) > 1000)
-                    {
-                        s_lastOutput = 0;
-                        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Cached shadowmap %d is forced to update even though the camera has not moved or only slightly moved."                                                                                     \
-                            "\tIf you see this output very often, and you are not using their default values, you may need to either increase the shadow cache resolution (r_ShadowsCacheResolutions) or decrease the global shadow map resolution (e_ShadowsMaxTexRes)." \
-                            "\tOtherwise, add a flow graph node (Environment:RecomputeStaticShadows) that updates the cached shadowmaps for this region.",  nLod - nFirstStaticLod);
-                    }
-                }
-                else
-                {
-                    // The camera most likely moved a far distance away from where the last cached shadowmap was rendered;
-                    // however, the user did not add a flowgraph node to recompute the cached shadowmaps in this region
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Update required for cached shadow map %d." \
-                        "\tConsider setting up manual bounds for cached shadows in this region via flow graph (Environment:RecomputeStaticShadows) if this happens too often", nLod - nFirstStaticLod);
-                }
-            }
-        }
-    }
-
-    // If we allow only manual or distance-based updates, then early out here if nUpdateStrategy was not set to ShadowMapFrustum::ShadowCacheData::eFullUpdate after the distance checks above.
-    if ( nUpdateStrategy == ShadowMapFrustum::ShadowCacheData::eManualOrDistanceUpdate )
-    {
-        return;
-    }
-
-    AABB projectionBoundsLS(AABB::RESET);
-    const int nTexRes = GetRenderer()->GetCachedShadowsResolution()[nLod - nFirstStaticLod];
-
-    // non incremental update: set new bounding box and estimate near/far planes
-    if (nUpdateStrategy != ShadowMapFrustum::ShadowCacheData::eIncrementalUpdate)
-    {
-        Matrix34 matView = Matrix34(GetViewMatrix(passInfo).GetTransposed());
-
-        if (!Get3DEngine()->m_CachedShadowsBounds.IsReset())
-        {
-            float fBoxScale = powf(Get3DEngine()->m_fCachedShadowsCascadeScale, (float)nLod - nFirstStaticLod);
-            Vec3 fBoxScaleXY(max(1.f, fBoxScale));
-            fBoxScaleXY.z = 1.f;
-
-            Vec3 vExt = Get3DEngine()->m_CachedShadowsBounds.GetSize().CompMul(fBoxScaleXY * 0.5f);
-            Vec3 vCenter = Get3DEngine()->m_CachedShadowsBounds.GetCenter();
-
-            pFr->aabbCasters = AABB(vCenter - vExt, vCenter + vExt);
-            projectionBoundsLS = AABB::CreateTransformedAABB(matView, pFr->aabbCasters);
-        }
-        else
-        {
-            const float fDesiredPixelDensity =  fRadiusDynamicLod / GetCVars()->e_ShadowsMaxTexRes;
-            GetCasterBox(pFr->aabbCasters, projectionBoundsLS, fDesiredPixelDensity * nTexRes, matView, passInfo);
-        }
-    }
-
-    // finally init frustum
-    InitCachedFrustum(pFr, nUpdateStrategy, nLod, nTexRes, m_pLightEntity->m_light.m_Origin, projectionBoundsLS, passInfo);
-    pFr->m_eFrustumType = ShadowMapFrustum::e_GsmCached;
-    pFr->bBlendFrustum = GetCVars()->e_ShadowsBlendCascades > 0;
-    pFr->fBlendVal = pFr->bBlendFrustum ? GetCVars()->e_ShadowsBlendCascadesVal : 1.0f;
-
-    // frustum debug
-    {
-        const ColorF cascadeColors[] = { Col_Red, Col_Green, Col_Blue, Col_Yellow, Col_Magenta, Col_Cyan };
-        const uint colorCount = sizeof(cascadeColors) / sizeof(cascadeColors[0]);
-
-        if (GetCVars()->e_ShadowsCacheUpdate > 2)
-        {
-            Get3DEngine()->DrawBBox(pFr->aabbCasters, cascadeColors[pFr->nShadowMapLod % colorCount]);
-        }
-
-        if (GetCVars()->e_ShadowsFrustums > 0)
-        {
-            pFr->DrawFrustum(GetRenderer(), std::numeric_limits<int>::max());
-        }
-    }
-}
-
-void ShadowCache::InitCachedFrustum(ShadowMapFrustum*& pFr, ShadowMapFrustum::ShadowCacheData::eUpdateStrategy nUpdateStrategy, int nLod, int nTexSize, const Vec3& vLightPos, const AABB& projectionBoundsLS, const SRenderingPassInfo& passInfo)
-{
-    pFr->ResetCasterLists();
-    pFr->nTexSize = nTexSize;
-
-    if (nUpdateStrategy != ShadowMapFrustum::ShadowCacheData::eIncrementalUpdate)
-    {
-        pFr->pShadowCacheData->Reset();
-        pFr->nShadowGenMask = 1;
-
-        assert(m_pLightEntity->m_light.m_pOwner);
-        pFr->pLightOwner = m_pLightEntity->m_light.m_pOwner;
-        pFr->m_Flags = m_pLightEntity->m_light.m_Flags;
-        pFr->nUpdateFrameId = passInfo.GetFrameID();
-        pFr->nShadowMapLod = nLod;
-        pFr->vProjTranslation = pFr->aabbCasters.GetCenter();
-        pFr->vLightSrcRelPos = vLightPos - pFr->aabbCasters.GetCenter();
-        pFr->fNearDist = -projectionBoundsLS.max.z;
-        pFr->fFarDist  = -projectionBoundsLS.min.z;
-        pFr->fFOV = (float)RAD2DEG(atan_tpl(0.5 * projectionBoundsLS.GetSize().y / pFr->fNearDist)) * 2.f;
-        pFr->fProjRatio = projectionBoundsLS.GetSize().x / projectionBoundsLS.GetSize().y;
-        pFr->fRadius = m_pLightEntity->m_light.m_fRadius;
-        pFr->fFrustrumSize =  1.0f / (Get3DEngine()->m_fGsmRange * pFr->aabbCasters.GetRadius() * 2.0f);
-
-        const float arrWidthS[] = {1.94f, 1.0f, 0.8f, 0.5f, 0.3f, 0.3f, 0.3f, 0.3f};
-        pFr->fWidthS = pFr->fWidthT =  arrWidthS[nLod];
-        pFr->fBlurS = pFr->fBlurT = 0.0f;
-    }
-
-    const int maxNodesPerFrame = (nUpdateStrategy == ShadowMapFrustum::ShadowCacheData::eFullUpdate)
-        ? std::numeric_limits<int>::max()
-        : MAX_RENDERNODES_PER_FRAME* GetRenderer()->GetActiveGPUCount();
-
-    const bool bExcludeDynamicDistanceShadows = GetCVars()->e_DynamicDistanceShadows != 0;
-    m_pObjManager->MakeStaticShadowCastersList(((CLightEntity*)m_pLightEntity->m_light.m_pOwner)->m_pNotCaster, pFr,
-        bExcludeDynamicDistanceShadows ? ERF_DYNAMIC_DISTANCESHADOWS : 0, maxNodesPerFrame, passInfo);
-
-    pFr->pShadowCacheData->mProcessedCasters.insert(pFr->m_castersList.begin(), pFr->m_castersList.end());
-    pFr->pShadowCacheData->mProcessedCasters.insert(pFr->m_jobExecutedCastersList.begin(), pFr->m_jobExecutedCastersList.end());
-    pFr->RequestUpdate();
-    pFr->bIncrementalUpdate = nUpdateStrategy == ShadowMapFrustum::ShadowCacheData::eIncrementalUpdate && !pFr->pShadowCacheData->mProcessedCasters.empty();
-}
-
-void ShadowCache::InitHeightMapAOFrustum(ShadowMapFrustum*& pFr, int nLod, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    assert(nLod >= 0);
-
-    if (!pFr)
-    {
-        pFr = new ShadowMapFrustum;
-    }
-
-    if (!pFr->pShadowCacheData)
-    {
-        pFr->pShadowCacheData = new ShadowMapFrustum::ShadowCacheData;
-    }
-
-    static ICVar* pHeightMapAORes   = gEnv->pConsole->GetCVar("r_HeightMapAOResolution");
-    static ICVar* pHeightMapAORange = gEnv->pConsole->GetCVar("r_HeightMapAORange");
-
-    ShadowMapFrustum::ShadowCacheData::eUpdateStrategy nUpdateStrategy = m_nUpdateStrategy;
-
-    // check if we have come too close to the border of the map
-    const float fDistFromCenter = (passInfo.GetCamera().GetPosition() - pFr->aabbCasters.GetCenter()).GetLength() + pHeightMapAORange->GetFVal() * 0.25f;
-    if (fDistFromCenter > pFr->aabbCasters.GetSize().x / 2.0f)
-    {
-        nUpdateStrategy = ShadowMapFrustum::ShadowCacheData::eFullUpdate;
-
-        if (!gEnv->IsEditing())
-        {
-            CryLog("Update required for height map AO.");
-            CryLog("\tConsider increasing height map AO range (r_HeightMapAORange) if this happens too often");
-        }
-    }
-
-    AABB projectionBoundsLS(AABB::RESET);
-
-    // non incremental update: set new bounding box and estimate near/far planes
-    if (nUpdateStrategy != ShadowMapFrustum::ShadowCacheData::eIncrementalUpdate)
-    {
-        // Top down view
-        Matrix34 topDownView(IDENTITY);
-        topDownView.m03 = -passInfo.GetCamera().GetPosition().x;
-        topDownView.m13 = -passInfo.GetCamera().GetPosition().y;
-        topDownView.m23 = -passInfo.GetCamera().GetPosition().z - m_pLightEntity->m_light.m_Origin.GetLength();
-
-        GetCasterBox(pFr->aabbCasters, projectionBoundsLS, pHeightMapAORange->GetFVal() / 2.0f, topDownView, passInfo);
-
-        // snap to texels
-        const float fSnap = pHeightMapAORange->GetFVal() / pHeightMapAORes->GetFVal();
-        pFr->aabbCasters.min.x = fSnap * int(pFr->aabbCasters.min.x / fSnap);
-        pFr->aabbCasters.min.y = fSnap * int(pFr->aabbCasters.min.y / fSnap);
-        pFr->aabbCasters.min.z = fSnap * int(pFr->aabbCasters.min.z / fSnap);
-
-        pFr->aabbCasters.max.x = pFr->aabbCasters.min.x + pHeightMapAORange->GetFVal();
-        pFr->aabbCasters.max.y = pFr->aabbCasters.min.y + pHeightMapAORange->GetFVal();
-        pFr->aabbCasters.max.z = fSnap * int(pFr->aabbCasters.max.z / fSnap);
-
-        pFr->fDepthSlopeBias = AO_FRUSTUM_SLOPE_BIAS;
-        pFr->fDepthConstBias = 0;
-
-        pFr->mLightViewMatrix.SetIdentity();
-        pFr->mLightViewMatrix.m30 = -pFr->aabbCasters.GetCenter().x;
-        pFr->mLightViewMatrix.m31 = -pFr->aabbCasters.GetCenter().y;
-        pFr->mLightViewMatrix.m32 = -pFr->aabbCasters.GetCenter().z - m_pLightEntity->m_light.m_Origin.GetLength();
-
-        mathMatrixOrtho(&pFr->mLightProjMatrix, projectionBoundsLS.GetSize().x, projectionBoundsLS.GetSize().y, -projectionBoundsLS.max.z, -projectionBoundsLS.min.z);
-    }
-
-    const Vec3 lightPos = pFr->aabbCasters.GetCenter() + Vec3(0, 0, 1) * m_pLightEntity->m_light.m_Origin.GetLength();
-
-    // finally init frustum
-    const int nTexRes = (int)clamp_tpl(pHeightMapAORes->GetFVal(), 0.f, 16384.f);
-    InitCachedFrustum(pFr, nUpdateStrategy, nLod, nTexRes, lightPos, projectionBoundsLS, passInfo);
-    pFr->m_eFrustumType = ShadowMapFrustum::e_HeightMapAO;
-}
-
-void ShadowCache::GetCasterBox(AABB& BBoxWS, AABB& BBoxLS, float fRadius, const Matrix34& matView, const SRenderingPassInfo& passInfo)
-{
-    AABB projectionBoundsLS;
-
-    BBoxWS = AABB(passInfo.GetCamera().GetPosition(), fRadius);
-    BBoxLS = AABB(matView.TransformPoint(passInfo.GetCamera().GetPosition()), fRadius);
-
-    // try to get tighter near/far plane from casters
-    AABB casterBoxLS(AABB::RESET);
-    if (Get3DEngine()->IsObjectTreeReady())
-    {
-        casterBoxLS.Add(Get3DEngine()->GetObjectTree()->GetShadowCastersBox(&BBoxWS, &matView));
-    }
-
-    if (CVisAreaManager* pVisAreaManager = GetVisAreaManager())
-    {
-        for (int i = 0; i < pVisAreaManager->m_lstVisAreas.Count(); ++i)
-        {
-            if (pVisAreaManager->m_lstVisAreas[i] && pVisAreaManager->m_lstVisAreas[i]->m_pObjectsTree)
-            {
-                casterBoxLS.Add(pVisAreaManager->m_lstVisAreas[i]->m_pObjectsTree->GetShadowCastersBox(&BBoxWS, &matView));
-            }
-        }
-
-        for (int i = 0; i < pVisAreaManager->m_lstPortals.Count(); ++i)
-        {
-            if (pVisAreaManager->m_lstPortals[i] && pVisAreaManager->m_lstPortals[i]->m_pObjectsTree)
-            {
-                casterBoxLS.Add(pVisAreaManager->m_lstPortals[i]->m_pObjectsTree->GetShadowCastersBox(&BBoxWS, &matView));
-            }
-        }
-    }
-
-    if (!casterBoxLS.IsReset() && casterBoxLS.GetSize().z < 2 * fRadius)
-    {
-        float fDepthRange = 2.0f * max(Get3DEngine()->m_fSunClipPlaneRange, casterBoxLS.GetSize().z);
-        BBoxLS.max.z = casterBoxLS.max.z + 0.5f; // slight offset here to counter edge case where polygons are projection plane aligned and would come to lie directly on the near plane
-        BBoxLS.min.z = casterBoxLS.max.z - fDepthRange;
-    }
-}
-
-Matrix44 ShadowCache::GetViewMatrix(const SRenderingPassInfo& passInfo)
-{
-    const Vec3 zAxis(0.f, 0.f, 1.f);
-    const Vec3 yAxis(0.f, 1.f, 0.f);
-
-    Vec3 At = passInfo.GetCamera().GetPosition();
-    Vec3 Eye = m_pLightEntity->m_light.m_Origin;
-    Vec3 Up = fabsf((Eye - At).GetNormalized().Dot(zAxis)) > 0.9995f ? yAxis : zAxis;
-
-    Matrix44 result;
-    mathMatrixLookAt(&result, Eye, At, Up);
-
-    return result;
-}
-
-ILINE uint64 ShadowCache::HashValue(uint64 value)
-{
-    uint64 hash = value * kHashMul;
-    hash ^= (hash >> 47);
-    hash *= kHashMul;
-    return hash;
-}
diff --git a/Code/CryEngine/Cry3DEngine/ShadowCache.h b/Code/CryEngine/Cry3DEngine/ShadowCache.h
deleted file mode 100644
index 1d141c5a85..0000000000
--- a/Code/CryEngine/Cry3DEngine/ShadowCache.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef STATIC_SHADOWS_H
-#define STATIC_SHADOWS_H
-
-#include <platform.h>
-#include "../RenderDll/Common/Shadow_Renderer.h"
-
-class ShadowCache
-    : public Cry3DEngineBase
-{
-public:
-    ShadowCache(CLightEntity* pLightEntity, ShadowMapFrustum::ShadowCacheData::eUpdateStrategy nUpdateStrategy)
-        : m_pLightEntity(pLightEntity)
-        , m_nUpdateStrategy(nUpdateStrategy)
-    {}
-
-    void InitShadowFrustum(ShadowMapFrustum*& pFr, int nLod, int nFirstStaticLod, float fDistFromViewDynamicLod, float fRadiusDynamicLod, const SRenderingPassInfo& passInfo);
-    void InitHeightMapAOFrustum(ShadowMapFrustum*& pFr, int nLod, const SRenderingPassInfo& passInfo);
-
-private:
-    static const int MAX_RENDERNODES_PER_FRAME = 50;
-    static const float AO_FRUSTUM_SLOPE_BIAS;
-    static const uint64 kHashMul = 0x9ddfea08eb382d69ULL;
-
-
-    void InitCachedFrustum(ShadowMapFrustum*& pFr, ShadowMapFrustum::ShadowCacheData::eUpdateStrategy nUpdateStrategy, int nLod, int nTexSize, const Vec3& vLightPos, const AABB& projectionBoundsLS, const SRenderingPassInfo& passInfo);
-
-    void GetCasterBox(AABB& BBoxWS, AABB& BBoxLS, float fRadius, const Matrix34& matView, const SRenderingPassInfo& passInfo);
-    Matrix44 GetViewMatrix(const SRenderingPassInfo& passInfo);
-
-    ILINE uint64 HashValue(uint64 value);
-
-    CLightEntity* m_pLightEntity;
-    ShadowMapFrustum::ShadowCacheData::eUpdateStrategy m_nUpdateStrategy;
-};
-#endif
diff --git a/Code/CryEngine/Cry3DEngine/SkyLightManager.cpp b/Code/CryEngine/Cry3DEngine/SkyLightManager.cpp
deleted file mode 100644
index e692c63f7d..0000000000
--- a/Code/CryEngine/Cry3DEngine/SkyLightManager.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "SkyLightManager.h"
-#include "SkyLightNishita.h"
-#include <CRESky.h>
-
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-static AZ::LegacyJobExecutor s_jobExecutor;
-
-CSkyLightManager::CSkyLightManager()
-    : m_pSkyLightNishita(CryAlignedNew<CSkyLightNishita>())
-    , m_pSkyDomeMesh(0)
-    , m_curSkyDomeCondition()
-    , m_updatingSkyDomeCondition()
-    , m_numSkyDomeColorsComputed(SSkyLightRenderParams::skyDomeTextureSize)
-    , m_curBackBuffer(0)
-    , m_lastFrameID(0)
-    , m_curSkyHemiColor()
-    , m_curHazeColor(0.0f, 0.0f, 0.0f)
-    , m_curHazeColorMieNoPremul(0.0f, 0.0f, 0.0f)
-    , m_curHazeColorRayleighNoPremul(0.0f, 0.0f, 0.0f)
-    , m_skyHemiColorAccum()
-    , m_hazeColorAccum(0.0f, 0.0f, 0.0f)
-    , m_hazeColorMieNoPremulAccum(0.0f, 0.0f, 0.0f)
-    , m_hazeColorRayleighNoPremulAccum(0.0f, 0.0f, 0.0f)
-    , m_bFlushFullUpdate(false)
-    , m_renderParams()
-{
-    InitSkyDomeMesh();
-
-    m_updateRequested[0] = m_updateRequested[1] = 0;
-
-    // init textures with default data
-    m_skyDomeTextureDataMie[ 0 ].resize(SSkyLightRenderParams::skyDomeTextureSize);
-    m_skyDomeTextureDataMie[ 1 ].resize(SSkyLightRenderParams::skyDomeTextureSize);
-    m_skyDomeTextureDataRayleigh[ 0 ].resize(SSkyLightRenderParams::skyDomeTextureSize);
-    m_skyDomeTextureDataRayleigh[ 1 ].resize(SSkyLightRenderParams::skyDomeTextureSize);
-
-    // init time stamps
-    m_skyDomeTextureTimeStamp[ 0 ] = GetRenderer()->GetFrameID(false);
-    m_skyDomeTextureTimeStamp[ 1 ] = GetRenderer()->GetFrameID(false);
-
-    // init sky hemisphere colors and accumulators
-    memset(m_curSkyHemiColor, 0, sizeof(m_curSkyHemiColor));
-    memset(m_skyHemiColorAccum, 0, sizeof(m_skyHemiColorAccum));
-
-    // set default render parameters
-    UpdateRenderParams();
-}
-
-
-CSkyLightManager::~CSkyLightManager()
-{
-    CryAlignedDelete(m_pSkyLightNishita);
-}
-
-inline static void Sync()
-{
-    s_jobExecutor.WaitForCompletion();
-}
-
-void CSkyLightManager::PushUpdateParams()
-{
-    //pushes the update parameters, explicite call since engine requests asynchronously
-    memcpy(&m_reqSkyDomeCondition[0], &m_reqSkyDomeCondition[1], sizeof(SSkyDomeCondition));
-    m_updateRequested[0] = m_updateRequested[1];
-    m_updateRequested[1] = 0;
-}
-
-void CSkyLightManager::SetSkyDomeCondition(const SSkyDomeCondition& skyDomeCondition)
-{
-    m_reqSkyDomeCondition[1] = skyDomeCondition;
-    m_updateRequested[1] = 1;
-}
-
-
-void CSkyLightManager::FullUpdate()
-{
-    Sync();
-    PushUpdateParams();
-
-    s_jobExecutor.Reset();
-    s_jobExecutor.StartJob([this]() { this->UpdateInternal(GetRenderer()->GetFrameID(false), SSkyLightRenderParams::skyDomeTextureSize, (int)1); });
-
-    m_needRenderParamUpdate = true;
-    m_bFlushFullUpdate = true;
-}
-
-void CSkyLightManager::IncrementalUpdate(f32 updateRatioPerFrame, const SRenderingPassInfo& passInfo)
-{
-    Sync();
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    // get current ID of "main" frame (no recursive rendering),
-    // incremental update should only be processed once per frame
-    if (m_lastFrameID != passInfo.GetMainFrameID())
-    {
-        int32 numUpdate((int32) ((f32) SSkyLightRenderParams::skyDomeTextureSize * updateRatioPerFrame / 100.0f + 0.5f));
-        numUpdate = clamp_tpl(numUpdate, 1, SSkyLightRenderParams::skyDomeTextureSize);
-        if (m_needRenderParamUpdate)
-        {
-            UpdateRenderParams();           // update render params
-        }
-        PushUpdateParams();
-
-        s_jobExecutor.Reset();
-        s_jobExecutor.StartJob([this, passInfo, numUpdate]() { this->UpdateInternal(passInfo.GetMainFrameID(), numUpdate, (int)0); });
-    }
-}
-
-
-void CSkyLightManager::UpdateInternal(int32 newFrameID, int32 numUpdates, int callerIsFullUpdate)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // update sky dome if requested -- requires last update request to be fully processed!
-    int procUpdate = callerIsFullUpdate;
-    procUpdate |= (int)IsSkyDomeUpdateFinished();
-    procUpdate &= m_updateRequested[0];
-    if (procUpdate)
-    {
-        // set sky dome settings
-        memcpy(&m_updatingSkyDomeCondition, &m_reqSkyDomeCondition[0], sizeof(SSkyDomeCondition));
-        m_pSkyLightNishita->SetSunDirection(m_updatingSkyDomeCondition.m_sunDirection);
-        m_pSkyLightNishita->SetRGBWaveLengths(m_updatingSkyDomeCondition.m_rgbWaveLengths);
-        m_pSkyLightNishita->SetAtmosphericConditions(m_updatingSkyDomeCondition.m_sunIntensity,
-            1e-4f * m_updatingSkyDomeCondition.m_Km, 1e-4f * m_updatingSkyDomeCondition.m_Kr, m_updatingSkyDomeCondition.m_g);  // scale mie and rayleigh scattering for more convenient editing in time of day dialog
-
-        // update request has been accepted
-        m_updateRequested[0] = 0;
-        m_numSkyDomeColorsComputed = 0;
-
-        // reset sky & haze color accumulator
-        m_hazeColorAccum = Vec3(0.0f, 0.0f, 0.0f);
-        m_hazeColorMieNoPremulAccum = Vec3(0.0f, 0.0f, 0.0f);
-        m_hazeColorRayleighNoPremulAccum = Vec3(0.0f, 0.0f, 0.0f);
-        memset(m_skyHemiColorAccum, 0, sizeof(m_skyHemiColorAccum));
-    }
-
-    // any work to do?
-    if (false == IsSkyDomeUpdateFinished())
-    {
-        if (numUpdates <= 0)
-        {
-            // do a full update
-            numUpdates = SSkyLightRenderParams::skyDomeTextureSize;
-        }
-
-        // find minimally required work load for this incremental update
-        numUpdates = min(SSkyLightRenderParams::skyDomeTextureSize - m_numSkyDomeColorsComputed, numUpdates);
-
-        // perform color computations
-        SkyDomeTextureData& skyDomeTextureDataMie(m_skyDomeTextureDataMie[ GetBackBuffer() ]);
-        SkyDomeTextureData& skyDomeTextureDataRayleigh(m_skyDomeTextureDataRayleigh[ GetBackBuffer() ]);
-
-        int32 numSkyDomeColorsComputed(m_numSkyDomeColorsComputed);
-        for (; numUpdates > 0; --numUpdates, ++numSkyDomeColorsComputed)
-        {
-            // calc latitude/longitude
-            int lon(numSkyDomeColorsComputed / SSkyLightRenderParams::skyDomeTextureWidth);
-            int lat(numSkyDomeColorsComputed % SSkyLightRenderParams::skyDomeTextureWidth);
-
-            float lonArc(DEG2RAD((float) lon * 90.0f / (float) SSkyLightRenderParams::skyDomeTextureHeight));
-            float latArc(DEG2RAD((float) lat * 360.0f / (float) SSkyLightRenderParams::skyDomeTextureWidth));
-
-            float sinLon(0);
-            float cosLon(0);
-            sincos_tpl(lonArc, &sinLon, &cosLon);
-            float sinLat(0);
-            float cosLat(0);
-            sincos_tpl(latArc, &sinLat, &cosLat);
-
-            // calc sky direction for given update latitude/longitude (hemisphere)
-            Vec3 skyDir(sinLon * cosLat, sinLon * sinLat, cosLon);
-
-            // compute color
-            //Vec3 skyColAtDir( 0.0, 0.0, 0.0 );
-            Vec3 skyColAtDirMieNoPremul(0.0, 0.0, 0.0);
-            Vec3 skyColAtDirRayleighNoPremul(0.0, 0.0, 0.0);
-            Vec3 skyColAtDirRayleigh(0.0, 0.0, 0.0);
-
-            m_pSkyLightNishita->ComputeSkyColor(skyDir, 0, &skyColAtDirMieNoPremul, &skyColAtDirRayleighNoPremul, &skyColAtDirRayleigh);
-
-            // store color in texture
-            skyDomeTextureDataMie[ numSkyDomeColorsComputed ] = CryHalf4(skyColAtDirMieNoPremul.x, skyColAtDirMieNoPremul.y, skyColAtDirMieNoPremul.z, 1.0f);
-            skyDomeTextureDataRayleigh[ numSkyDomeColorsComputed ] = CryHalf4(skyColAtDirRayleighNoPremul.x, skyColAtDirRayleighNoPremul.y, skyColAtDirRayleighNoPremul.z, 1.0f);
-
-            // update haze color accum (accumulate second last sample row)
-            if (lon == SSkyLightRenderParams::skyDomeTextureHeight - 2)
-            {
-                m_hazeColorAccum += skyColAtDirRayleigh;
-                m_hazeColorMieNoPremulAccum += skyColAtDirMieNoPremul;
-                m_hazeColorRayleighNoPremulAccum += skyColAtDirRayleighNoPremul;
-            }
-
-            // update sky hemisphere color accumulator
-            int y(lon >> SSkyLightRenderParams::skyDomeTextureHeightBy2Log);
-            int x(((lat + SSkyLightRenderParams::skyDomeTextureWidthBy8) & (SSkyLightRenderParams::skyDomeTextureWidth - 1)) >> SSkyLightRenderParams::skyDomeTextureWidthBy4Log);
-            int skyHemiColAccumIdx(x * y + y);
-            assert(((unsigned int)skyHemiColAccumIdx) < 5);
-            m_skyHemiColorAccum[skyHemiColAccumIdx] += skyColAtDirRayleigh;
-        }
-
-        m_numSkyDomeColorsComputed = numSkyDomeColorsComputed;
-
-        // sky dome update finished?
-        if (false != IsSkyDomeUpdateFinished())
-        {
-            // update time stamp
-            m_skyDomeTextureTimeStamp[ GetBackBuffer() ] = newFrameID;
-
-            // get new haze color
-            const float c_invNumHazeSamples(1.0f / (float) SSkyLightRenderParams::skyDomeTextureWidth);
-            m_curHazeColor = m_hazeColorAccum * c_invNumHazeSamples;
-            m_curHazeColorMieNoPremul = m_hazeColorMieNoPremulAccum * c_invNumHazeSamples;
-            m_curHazeColorRayleighNoPremul = m_hazeColorRayleighNoPremulAccum * c_invNumHazeSamples;
-
-            // get new sky hemisphere colors
-            const float c_scaleHemiTop(2.0f / (SSkyLightRenderParams::skyDomeTextureWidth * SSkyLightRenderParams::skyDomeTextureHeight));
-            const float c_scaleHemiSide(8.0f / (SSkyLightRenderParams::skyDomeTextureWidth * SSkyLightRenderParams::skyDomeTextureHeight));
-            m_curSkyHemiColor[0] = m_skyHemiColorAccum[0] * c_scaleHemiTop;
-            m_curSkyHemiColor[1] = m_skyHemiColorAccum[1] * c_scaleHemiSide;
-            m_curSkyHemiColor[2] = m_skyHemiColorAccum[2] * c_scaleHemiSide;
-            m_curSkyHemiColor[3] = m_skyHemiColorAccum[3] * c_scaleHemiSide;
-            m_curSkyHemiColor[4] = m_skyHemiColorAccum[4] * c_scaleHemiSide;
-
-            // toggle sky light buffers
-            ToggleBuffer();
-        }
-    }
-
-    // update frame ID
-    m_lastFrameID = newFrameID;
-}
-
-void CSkyLightManager::SetQuality(int32 quality)
-{
-    if (quality != m_pSkyLightNishita->GetInScatteringIntegralStepSize())
-    {
-        Sync();
-        // when setting new quality we need to start sky dome update from scratch...
-        // ... to avoid "artifacts" in the resulting texture
-        m_numSkyDomeColorsComputed = 0;
-        m_pSkyLightNishita->SetInScatteringIntegralStepSize(quality);
-    }
-}
-
-const SSkyLightRenderParams* CSkyLightManager::GetRenderParams() const
-{
-    return &m_renderParams;
-}
-
-void CSkyLightManager::UpdateRenderParams()
-{
-    // sky dome mesh data
-    m_renderParams.m_pSkyDomeMesh = m_pSkyDomeMesh;
-
-    // sky dome texture access
-    m_renderParams.m_skyDomeTextureTimeStamp = m_skyDomeTextureTimeStamp[ GetFrontBuffer() ];
-    m_renderParams.m_pSkyDomeTextureDataMie = (const void*) &m_skyDomeTextureDataMie[ GetFrontBuffer() ][ 0 ];
-    m_renderParams.m_pSkyDomeTextureDataRayleigh = (const void*) &m_skyDomeTextureDataRayleigh[ GetFrontBuffer() ][ 0 ];
-    m_renderParams.m_skyDomeTexturePitch = SSkyLightRenderParams::skyDomeTextureWidth * sizeof(CryHalf4);
-
-    // shader constants for final per-pixel phase computation
-    m_renderParams.m_partialMieInScatteringConst = m_pSkyLightNishita->GetPartialMieInScatteringConst();
-    m_renderParams.m_partialRayleighInScatteringConst = m_pSkyLightNishita->GetPartialRayleighInScatteringConst();
-    Vec3 sunDir(m_pSkyLightNishita->GetSunDirection());
-    m_renderParams.m_sunDirection = Vec4(sunDir.x, sunDir.y, sunDir.z, 0.0f);
-    m_renderParams.m_phaseFunctionConsts = m_pSkyLightNishita->GetPhaseFunctionConsts();
-    m_renderParams.m_hazeColor = Vec4(m_curHazeColor.x, m_curHazeColor.y, m_curHazeColor.z, 0);
-    m_renderParams.m_hazeColorMieNoPremul = Vec4(m_curHazeColorMieNoPremul.x, m_curHazeColorMieNoPremul.y, m_curHazeColorMieNoPremul.z, 0);
-    m_renderParams.m_hazeColorRayleighNoPremul = Vec4(m_curHazeColorRayleighNoPremul.x, m_curHazeColorRayleighNoPremul.y, m_curHazeColorRayleighNoPremul.z, 0);
-
-    // set sky hemisphere colors
-    m_renderParams.m_skyColorTop = m_curSkyHemiColor[0];
-    m_renderParams.m_skyColorNorth = m_curSkyHemiColor[3];
-    m_renderParams.m_skyColorWest = m_curSkyHemiColor[4];
-    m_renderParams.m_skyColorSouth = m_curSkyHemiColor[1];
-    m_renderParams.m_skyColorEast = m_curSkyHemiColor[2];
-
-    // copy sky dome condition params
-    m_curSkyDomeCondition = m_updatingSkyDomeCondition;
-
-    m_needRenderParamUpdate = 0;
-}
-
-void CSkyLightManager::GetCurSkyDomeCondition(SSkyDomeCondition& skyCond) const
-{
-    skyCond = m_curSkyDomeCondition;
-}
-
-bool CSkyLightManager::IsSkyDomeUpdateFinished() const
-{
-    return(SSkyLightRenderParams::skyDomeTextureSize == m_numSkyDomeColorsComputed);
-}
-
-
-void CSkyLightManager::InitSkyDomeMesh()
-{
-    ReleaseSkyDomeMesh();
-
-#if defined(MOBILE)
-    const uint32 c_numRings(10);
-    const uint32 c_numSections(10);
-#else
-    const uint32 c_numRings(20);
-    const uint32 c_numSections(20);
-#endif
-    const uint32 c_numSkyDomeVertices((c_numRings + 1) * (c_numSections + 1));
-    const uint32 c_numSkyDomeTriangles(2 * c_numRings * c_numSections);
-    const uint32 c_numSkyDomeIndices(c_numSkyDomeTriangles * 3);
-
-    std::vector< vtx_idx > skyDomeIndices;
-    std::vector< SVF_P3F_C4B_T2F > skyDomeVertices;
-
-    // setup buffers with source data
-    skyDomeVertices.reserve(c_numSkyDomeVertices);
-    skyDomeIndices.reserve(c_numSkyDomeIndices);
-
-    // calculate vertices
-    float sectionSlice(DEG2RAD(360.0f / (float) c_numSections));
-    float ringSlice(DEG2RAD(180.0f / (float) c_numRings));
-    for (uint32 a(0); a <= c_numRings; ++a)
-    {
-        float w(sinf(a * ringSlice));
-        float z(cosf(a * ringSlice));
-
-        for (uint32 i(0); i <= c_numSections; ++i)
-        {
-            SVF_P3F_C4B_T2F v;
-
-            float ii(i - a * 0.5f);   // Gives better tessellation, requires texture address mode to be "wrap"
-            // for u when rendering (see v.st[ 0 ] below). Otherwise set ii = i;
-            v.xyz = Vec3(cosf(ii * sectionSlice) * w, sinf(ii * sectionSlice) * w, z);
-            assert(fabs(v.xyz.GetLengthSquared() - 1.0) < 1e-2 /*1e-4*/);           // because of FP-16 precision
-            v.st = Vec2(ii / (float) c_numSections, 2.0f * (float) a / (float) c_numRings);
-            skyDomeVertices.push_back(v);
-        }
-    }
-
-    // build faces
-    for (uint32 a(0); a < c_numRings; ++a)
-    {
-        for (uint32 i(0); i < c_numSections; ++i)
-        {
-            skyDomeIndices.push_back((vtx_idx) (a * (c_numSections + 1) + i + 1));
-            skyDomeIndices.push_back((vtx_idx) (a * (c_numSections + 1) + i));
-            skyDomeIndices.push_back((vtx_idx) ((a + 1) * (c_numSections + 1) + i + 1));
-
-            skyDomeIndices.push_back((vtx_idx) ((a + 1) * (c_numSections + 1) + i));
-            skyDomeIndices.push_back((vtx_idx) ((a + 1) * (c_numSections + 1) + i + 1));
-            skyDomeIndices.push_back((vtx_idx) (a * (c_numSections + 1) + i));
-        }
-    }
-
-    // sanity checks
-    assert(skyDomeVertices.size() == c_numSkyDomeVertices);
-    assert(skyDomeIndices.size() == c_numSkyDomeIndices);
-
-    // create static buffers in renderer
-    m_pSkyDomeMesh = gEnv->pRenderer->CreateRenderMeshInitialized(&skyDomeVertices[0], c_numSkyDomeVertices, eVF_P3F_C4B_T2F,
-            &skyDomeIndices[0], c_numSkyDomeIndices, prtTriangleList, "SkyHDR", "SkyHDR");
-}
-
-void CSkyLightManager::ReleaseSkyDomeMesh()
-{
-    m_renderParams.m_pSkyDomeMesh = NULL;
-    m_pSkyDomeMesh = NULL;
-}
-
-int CSkyLightManager::GetFrontBuffer() const
-{
-    assert(m_curBackBuffer >= 0 && m_curBackBuffer <= 1);
-    return((m_curBackBuffer + 1) & 1);
-}
-
-
-int CSkyLightManager::GetBackBuffer() const
-{
-    assert(m_curBackBuffer >= 0 && m_curBackBuffer <= 1);
-    return(m_curBackBuffer);
-}
-
-
-void CSkyLightManager::ToggleBuffer()
-{
-    assert(m_curBackBuffer >= 0 && m_curBackBuffer <= 1);
-    //better enforce cache flushing then making PPU wait til job has been finished
-    m_curBackBuffer = (m_curBackBuffer + 1) & 1;
-    m_needRenderParamUpdate = 1;
-}
-
-void CSkyLightManager::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_pSkyLightNishita);
-    pSizer->AddObject(m_skyDomeTextureDataMie[0]);
-    pSizer->AddObject(m_skyDomeTextureDataMie[1]);
-    pSizer->AddObject(m_skyDomeTextureDataRayleigh[0]);
-    pSizer->AddObject(m_skyDomeTextureDataRayleigh[1]);
-}
diff --git a/Code/CryEngine/Cry3DEngine/SkyLightManager.h b/Code/CryEngine/Cry3DEngine/SkyLightManager.h
deleted file mode 100644
index 9b8e545cd6..0000000000
--- a/Code/CryEngine/Cry3DEngine/SkyLightManager.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_SKYLIGHTMANAGER_H
-#define CRYINCLUDE_CRY3DENGINE_SKYLIGHTMANAGER_H
-#pragma once
-
-
-#include <memory>
-#include <vector>
-
-
-class CSkyLightNishita;
-struct ITimer;
-
-
-class CSkyLightManager
-    : public Cry3DEngineBase
-{
-public:
-    struct SSkyDomeCondition
-    {
-        SSkyDomeCondition()
-            : m_sunIntensity(20.0f, 20.0f, 20.0f)
-            , m_Km(0.001f)
-            , m_Kr(0.00025f)
-            , m_g(-0.99f)
-            , m_rgbWaveLengths(650.0f, 570.0f, 475.0f)
-            , m_sunDirection(0.0f, 0.707106f, 0.707106f)
-        {
-        }
-
-        Vec3 m_sunIntensity;
-        float m_Km;
-        float m_Kr;
-        float m_g;
-        Vec3 m_rgbWaveLengths;
-        Vec3 m_sunDirection;
-    } _ALIGN(16);
-
-public:
-    CSkyLightManager();
-    ~CSkyLightManager();
-
-    // sky dome condition
-    void SetSkyDomeCondition(const SSkyDomeCondition& skyDomeCondition);
-    void GetCurSkyDomeCondition(SSkyDomeCondition& skyCond) const;
-
-    // controls updates
-    void FullUpdate();
-    void IncrementalUpdate(f32 updateRatioPerFrame, const SRenderingPassInfo& passInfo);
-    void SetQuality(int32 quality);
-
-    // rendering params
-    const SSkyLightRenderParams* GetRenderParams() const;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    void InitSkyDomeMesh();
-    void ReleaseSkyDomeMesh();
-
-
-    void UpdateInternal(int32 newFrameID, int32 numUpdates, int callerIsFullUpdate = 0);
-private:
-    typedef std::vector<CryHalf4> SkyDomeTextureData;
-
-private:
-    bool IsSkyDomeUpdateFinished() const;
-
-    int GetFrontBuffer() const;
-    int GetBackBuffer() const;
-    void ToggleBuffer();
-public:
-    void UpdateRenderParams();
-private:
-    void PushUpdateParams();
-
-private:
-    SSkyDomeCondition m_curSkyDomeCondition;            //current sky dome conditions
-    SSkyDomeCondition m_reqSkyDomeCondition[2];     //requested sky dome conditions, double buffered(engine writes async)
-    SSkyDomeCondition m_updatingSkyDomeCondition; //sky dome conditions the update is currently processed with
-    int m_updateRequested[2];                                       //true if an update is requested, double buffered(engine writes async)
-    CSkyLightNishita* m_pSkyLightNishita;
-
-    SkyDomeTextureData m_skyDomeTextureDataMie[ 2 ];
-    SkyDomeTextureData m_skyDomeTextureDataRayleigh[ 2 ];
-    int32 m_skyDomeTextureTimeStamp[ 2 ];
-
-    bool m_bFlushFullUpdate;
-
-    _smart_ptr<IRenderMesh> m_pSkyDomeMesh;
-
-    int32 m_numSkyDomeColorsComputed;
-    int32 m_curBackBuffer;
-
-    int32 m_lastFrameID;
-    int32 m_needRenderParamUpdate;
-
-    Vec3 m_curSkyHemiColor[5];
-    Vec3 m_curHazeColor;
-    Vec3 m_curHazeColorMieNoPremul;
-    Vec3 m_curHazeColorRayleighNoPremul;
-
-    Vec3 m_skyHemiColorAccum[5];
-    Vec3 m_hazeColorAccum;
-    Vec3 m_hazeColorMieNoPremulAccum;
-    Vec3 m_hazeColorRayleighNoPremulAccum;
-
-    SSkyLightRenderParams m_renderParams _ALIGN(16);
-} _ALIGN(128);
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_SKYLIGHTMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/SkyLightNishita.cpp b/Code/CryEngine/Cry3DEngine/SkyLightNishita.cpp
deleted file mode 100644
index 260130556e..0000000000
--- a/Code/CryEngine/Cry3DEngine/SkyLightNishita.cpp
+++ /dev/null
@@ -1,729 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#define IGNORE_ASSERTS
-#if defined(_DEBUG) && defined(IGNORE_ASSERTS)
-#   undef assert
-#   define assert(cond) ((void)0)
-#endif
-
-#include "SkyLightNishita.h"
-
-#include <math.h>
-
-// constant definitions (all heights & radii given in km or km^-1 )
-const f64 c_maxAtmosphereHeight(100.0);
-const f64 c_earthRadius(6368.0);
-const f32 c_earthRadiusf(6368.0f);
-const f64 c_avgDensityHeightMieInv(1.0 / 1.2);
-const f64 c_avgDensityHeightRayleighInv(1.0 / 7.994);
-
-const f64 c_opticalDepthWhenHittingEarth(1e10);
-
-const f64 c_pi(3.1415926535897932384626433832795);
-const f32 c_pif(3.1415926535897932384626433832795f);
-
-// Machine epsilon is too small to catch rounding error asserts here. We use a large enough number to prevent rounding errors, but small
-// enough to still catch invalid conditions (10^-6).
-static const float floatDiffFactor = 0.000001f;
-
-// constants for optical LUT serialization
-const uint32 c_lutFileTag(0x4C594B53);                  // "SKYL"
-const uint32 c_lutFileVersion(0x00010002);
-const char c_lutFileName[] = "engineassets/sky/optical.lut";
-
-static inline f64 MapSaveExpArg(f64 arg)
-{
-    const f64 c_saveExpArgRange((f64)650.0);   // -650.0 to 650 range is safe not to introduce fp over-/underflows
-    return((arg < -c_saveExpArgRange) ? -c_saveExpArgRange : (arg > c_saveExpArgRange) ? c_saveExpArgRange : arg);
-}
-
-
-static inline f64 exp_precise(f64 arg)
-{
-    return(exp(MapSaveExpArg((f64) arg)));
-}
-
-namespace
-{
-    union eco
-    {
-        f64 d;
-        struct
-        {
-            int32 i, j;
-        } n;
-    };
-}
-
-static inline f64 exp_fast(f64 arg)
-{
-    const f64 eco_m(1048576L / 0.693147180559945309417232121458177);
-    const f64 eco_a(1072693248L - 60801L);
-
-#if defined(_CPU_X86) || defined(_CPU_AMD64) || defined(_CPU_ARM)// for little endian (tested on Win32 / Win64)
-    eco e;
-#   ifdef _DEBUG
-    e.d = 1.0;
-    assert(e.n.j - 1072693248L || e.n.i == 0);       // check IEEE-754 conformance
-#   endif
-    e.n.j = (int32) (eco_m * MapSaveExpArg(arg) + eco_a);
-    return((f64)e.d);
-#elif defined(_CPU_G5)
-    eco e;
-#   ifdef _DEBUG
-    e.d = 1.0;
-    assert(e.n.i == 1072693248L || e.n.j == 0);       // check IEEE-754 conformance
-#   endif
-    e.n.i = (int32) (eco_m * MapSaveExpArg(arg) + eco_a);
-    return((f64)e.d);
-#else // fall back to default exp_sky() implementation for untested/unsupported target platforms
-#   pragma message( "Optimized exp_fast() not available for this platform!" )
-#   pragma message( "If your target CPU is IEEE-754 conformant then please specify it in either the little or big endian branch (see SkyLightNishita.cpp::exp_fast())." )
-    return(exp(arg));
-#endif
-}
-
-static inline f64 OpticalScaleFunction(const f64& height, const f64& avgDensityHeightInv)
-{
-    assert(height >= 0.0);
-    assert(avgDensityHeightInv > 0.0 && avgDensityHeightInv <= 1.0);
-    return(exp_precise(-height * avgDensityHeightInv));
-}
-
-
-static inline f64 IntegrateOpticalDepthInternal(const Vec3d& start, const f64& startScale,
-    const Vec3d& end, const f64& endScale, const f64& avgDensityHeightInv, const f64& error)
-{
-    assert(_finite(startScale) &&  _finite(endScale));
-
-    Vec3d mid(0.5 * (start + end));
-    f64 midScale(OpticalScaleFunction(mid.GetLength() - c_earthRadius, avgDensityHeightInv));
-
-    if (fabs(startScale - midScale) <= error && fabs(midScale - endScale) <= error)
-    {
-        // integrate section this via simpson rule and stop recursing
-        const f64 c_oneSixth(1.0 / 6.0);
-        return((startScale + 4.0 * midScale + endScale) * c_oneSixth * (end - start).GetLength());
-    }
-    else
-    {
-        // refine section via recursing down left and right branch
-        return(IntegrateOpticalDepthInternal(start, startScale, mid, midScale, avgDensityHeightInv, error) +
-               IntegrateOpticalDepthInternal(mid, midScale, end, endScale, avgDensityHeightInv, error));
-    }
-}
-
-
-CSkyLightNishita::CSkyLightNishita()
-    : m_opticalDepthLUT()
-    , m_opticalScaleLUT()
-    , m_phaseLUT()
-    , m_Km(0.0f)
-    , m_Kr(0.0f)
-    , m_sunIntensity(20.0f, 20.0f, 20.0f)
-    , m_g(0.0f)
-    , m_invRGBWaveLength4(1.0f, 1.0f, 1.0f)
-    , m_sunDir(0.0f, 0.707106f, 0.707106f)
-    , m_inScatteringStepSize(1)
-{
-    SetRGBWaveLengths(Vec3(650.0f, 570.0f, 475.0f));
-    SetSunDirection(Vec3(0.0f, 0.707106f, 0.707106f));
-    SetAtmosphericConditions(Vec3(20.0f, 20.0f, 20.0f), 0.001f, 0.00025f, -0.99f);
-    ILog* pLog(C3DEngine::GetLog());
-    if (false == LoadOpticalLUTs())
-    {
-        if (0 != pLog)
-        {
-            PrintMessage("Sky light: Optical lookup tables couldn't be loaded off disc. Recomputation needed!");
-        }
-        ComputeOpticalLUTs();
-    }
-    else
-    {
-        if (0 != pLog)
-        {
-            PrintMessage("Sky light: Optical lookup tables loaded off disc.");
-        }
-    }
-}
-
-
-CSkyLightNishita::~CSkyLightNishita()
-{
-}
-
-
-CSkyLightNishita::SOpticalDepthLUTEntry CSkyLightNishita::LookupBilerpedOpticalDepthLUTEntry(
-    const SOpticalDepthLUTEntry* const __restrict cpOptDepthLUT,
-    uint32 heightIndex, const f32 cosVertAngle) const
-{
-    uint32 vertAngleIndex;
-    f32 vertAngleIndexFrc;
-    f32 saveCosVertAngle(clamp_tpl(cosVertAngle, -1.0f, 1.0f));
-    f32 _index((f32) (cOLUT_AngularSteps - 1) * (-saveCosVertAngle * 0.5f + 0.5f));
-    vertAngleIndex = (uint32) _index;
-    vertAngleIndexFrc = _index - floorf(_index);
-
-    if (vertAngleIndex >= cOLUT_AngularSteps - 1)
-    {
-        return(cpOptDepthLUT[ OpticalLUTIndex(heightIndex, vertAngleIndex) ]);
-    }
-    else
-    {
-        uint32 index(OpticalLUTIndex(heightIndex, vertAngleIndex));
-        const SOpticalDepthLUTEntry& a(cpOptDepthLUT[ index ]);
-        const SOpticalDepthLUTEntry& b(cpOptDepthLUT[ index + 1 ]);
-
-        SOpticalDepthLUTEntry res;
-        res.mie = a.mie + vertAngleIndexFrc * (b.mie - a.mie);
-        res.rayleigh = a.rayleigh + vertAngleIndexFrc * (b.rayleigh - a.rayleigh);
-        return(res);
-    }
-}
-
-CSkyLightNishita::SPhaseLUTEntry CSkyLightNishita::LookupBilerpedPhaseLUTEntry(const f32 cosPhaseAngle) const
-{
-    uint32 index;
-    f32 indexFrc;
-    MapCosPhaseAngleToIndex(cosPhaseAngle, index, indexFrc);
-
-    if (index >= cPLUT_AngularSteps - 1)
-    {
-        return(m_phaseLUT[ cPLUT_AngularSteps - 1 ]);
-    }
-    else
-    {
-        const SPhaseLUTEntry& a(m_phaseLUT[ index + 0 ]);
-        const SPhaseLUTEntry& b(m_phaseLUT[ index + 1 ]);
-
-        SPhaseLUTEntry res;
-        res.mie = a.mie + indexFrc * (b.mie - a.mie);
-        res.rayleigh = a.rayleigh + indexFrc * (b.rayleigh - a.rayleigh);
-        return(res);
-    }
-}
-
-void CSkyLightNishita::SamplePartialInScatteringAtHeight(const SOpticalScaleLUTEntry& osAtHeight,
-    const f32 outScatteringConstMie, const Vec3& outScatteringConstRayleigh, const SOpticalDepthLUTEntry& odAtHeightSky,
-    const SOpticalDepthLUTEntry& odAtViewerSky, const SOpticalDepthLUTEntry& odAtHeightSun,
-    Vec3& partialInScatteringMie, Vec3& partialInScatteringRayleigh) const
-{   
-    assert(odAtHeightSky.mie >= 0.0 && (odAtHeightSky.mie - floatDiffFactor) <= odAtViewerSky.mie);
-    assert(odAtHeightSun.mie >= 0.0);
-    assert(odAtHeightSky.rayleigh >= 0.0 && (odAtHeightSky.rayleigh - floatDiffFactor) <= odAtViewerSky.rayleigh);
-    assert(odAtHeightSun.rayleigh >= 0.0);
-
-    // mie out-scattering
-    f32 sampleExpArgMie(outScatteringConstMie * (-odAtHeightSun.mie - (odAtViewerSky.mie - odAtHeightSky.mie)));
-
-    // rayleigh out-scattering
-    Vec3 sampleExpArgRayleigh(outScatteringConstRayleigh * (-odAtHeightSun.rayleigh - (odAtViewerSky.rayleigh - odAtHeightSky.rayleigh)));
-
-    // partial in-scattering sampling result
-    Vec3 sampleExpArg(Vec3(sampleExpArgMie, sampleExpArgMie, sampleExpArgMie) + sampleExpArgRayleigh);
-    Vec3 sampleRes((float)exp_fast(sampleExpArg.x), (float)exp_fast(sampleExpArg.y), (float)exp_fast(sampleExpArg.z));
-
-    partialInScatteringMie = osAtHeight.mie * sampleRes;
-    partialInScatteringRayleigh = osAtHeight.rayleigh * sampleRes;
-}
-
-void CSkyLightNishita::ComputeInScatteringNoPremul(const f32 outScatteringConstMie, const Vec3& outScatteringConstRayleigh, const Vec3& skyDir,
-    Vec3& inScatteringMieNoPremul, Vec3& inScatteringRayleighNoPremul) const
-{
-    // start integration along the "skyDir" from the viewer's point of view
-    const Vec3 c_up(0.0f, 0.0f, 1.0f);
-    const Vec3 viewer(c_up * c_earthRadiusf);
-    Vec3 curRayPos(viewer);
-
-    // to be reused by ray-sphere intersection code in loop below
-    f32 B(2.0f * viewer.Dot(skyDir));
-    f32 Bsq(B * B);
-    f32 Cpart(viewer.Dot(viewer));
-
-    // calculate optical depth at viewer
-    const SOpticalDepthLUTEntry* const __restrict cpOptDepthLUT = &m_opticalDepthLUT[0];
-
-    const Vec3& cSunDir(m_sunDir);
-
-    SOpticalDepthLUTEntry odAtViewerSky(LookupBilerpedOpticalDepthLUTEntry(cpOptDepthLUT, 0, skyDir.Dot(c_up)));
-    SOpticalDepthLUTEntry odAtViewerSun(LookupBilerpedOpticalDepthLUTEntry(cpOptDepthLUT, 0, cSunDir.Dot(c_up)));
-
-    // sample partial in-scattering term at viewer
-    Vec3 curSampleMie, curSampleRayleigh;
-
-    const SOpticalScaleLUTEntry* const __restrict cpOptScaleLUT = &m_opticalScaleLUT[0];
-
-    SamplePartialInScatteringAtHeight(cpOptScaleLUT[0], outScatteringConstMie, outScatteringConstRayleigh,
-        odAtViewerSky, odAtViewerSky, odAtViewerSun, curSampleMie, curSampleRayleigh);
-
-    // integrate along "skyDir" over all height segments we've precalculated in the optical lookup table
-    inScatteringMieNoPremul = Vec3(0.0f, 0.0f, 0.0f);
-    inScatteringRayleighNoPremul = Vec3(0.0f, 0.0f, 0.0f);
-    const int32 cInScatteringStepSize(m_inScatteringStepSize);
-    for (int a(1); a < cOLUT_HeightSteps; a += cInScatteringStepSize)
-    {
-        // calculate intersection with current "atmosphere shell"
-        const SOpticalScaleLUTEntry& crOpticalScaleLUTEntry = cpOptScaleLUT[a];
-        SOpticalScaleLUTEntry osAtHeight(crOpticalScaleLUTEntry);
-
-        f32 C(Cpart - (c_earthRadiusf + osAtHeight.atmosphereLayerHeight) * (c_earthRadiusf + osAtHeight.atmosphereLayerHeight));
-        f32 det(Bsq - 4.0f * C);
-        assert(det >= 0.0f && (0.5f * (-B - sqrtf(det)) <= 0.0f) && (((int)(0.5f * (-B + sqrtf(det)))*100.0) / 100.0f >= 0.0f));
-
-        f32 t(0.5f * (-B + sqrtf(det)));
-
-        Vec3 newRayPos(viewer + t * skyDir);
-
-        // calculate optical depth at new position
-        // since atmosphere bends we need to determine a new up vector to properly index the optical LUT
-        Vec3 newUp(newRayPos.GetNormalized());
-        SOpticalDepthLUTEntry odAtHeightSky(LookupBilerpedOpticalDepthLUTEntry(cpOptDepthLUT, a, skyDir.Dot(newUp)));
-        SOpticalDepthLUTEntry odAtHeightSun(LookupBilerpedOpticalDepthLUTEntry(cpOptDepthLUT, a, cSunDir.Dot(newUp)));
-
-        // when optimized in clang, values seem to drift a bit and under certain edge conditions
-        // raise asserts in SamplePartialInScatteringAtHeight function
-        if (odAtHeightSky.mie > odAtViewerSky.mie)
-        {
-            odAtHeightSky.mie = odAtViewerSky.mie;
-        }
-        if (odAtHeightSky.rayleigh > odAtViewerSky.rayleigh)
-        {
-            odAtHeightSky.rayleigh = odAtViewerSky.rayleigh;
-        }
-        
-        // sample partial in-scattering term at new position
-        Vec3 newSampleMie, newSampleRayleigh;
-        SamplePartialInScatteringAtHeight(osAtHeight, outScatteringConstMie, outScatteringConstRayleigh,
-            odAtHeightSky, odAtViewerSky, odAtHeightSun, newSampleMie, newSampleRayleigh);
-
-        // integrate via trapezoid rule
-        f32 weight((newRayPos - curRayPos).GetLength() * 0.5f);
-        inScatteringMieNoPremul += (curSampleMie + newSampleMie) * weight;
-        inScatteringRayleighNoPremul += (curSampleRayleigh + newSampleRayleigh) * weight;
-
-        // update sampling data
-        curRayPos = newRayPos;
-        curSampleMie = newSampleMie;
-        curSampleRayleigh = newSampleRayleigh;
-    }
-}
-
-void CSkyLightNishita::ComputeSkyColor(const Vec3& skyDir, Vec3* pInScattering, Vec3* pInScatteringMieNoPremul,
-    Vec3* pInScatteringRayleighNoPremul, Vec3* pInScatteringRayleigh) const
-{
-    //// get high precision normalized sky direction
-    //Vec3 _skyDir( skyDir );
-    //assert( _skyDir.GetLengthSquared() > 0.0 );
-    //_skyDir.Normalize();
-
-    assert(fabsf(skyDir.GetLengthSquared() - 1.0f) <  1e-4f);
-
-    SPhaseLUTEntry phaseLUTEntry(LookupBilerpedPhaseLUTEntry(-skyDir.Dot(m_sunDir)));
-
-    // initialize constants for mie scattering
-    f32 phaseForPhiGMie(phaseLUTEntry.mie);
-    f32 outScatteringConstMie(4.0f * c_pif * m_Km);
-    Vec3 inScatteringConstMie(m_sunIntensity * m_Km * phaseForPhiGMie);
-
-    // initialize constants for rayleigh scattering
-    f32 phaseForPhiGRayleigh(phaseLUTEntry.rayleigh);
-    Vec3 outScatteringConstRayleigh(4.0f * (float)c_pi * m_Kr * m_invRGBWaveLength4);
-    Vec3 inScatteringConstRayleigh((m_sunIntensity * m_Kr * phaseForPhiGRayleigh).CompMul(m_invRGBWaveLength4));
-
-    // compute in-scattering
-    Vec3 inScatteringMieNoPremul, inScatteringRayleighNoPremul;
-
-    ComputeInScatteringNoPremul(outScatteringConstMie, outScatteringConstRayleigh, skyDir, inScatteringMieNoPremul, inScatteringRayleighNoPremul);
-
-    assert(inScatteringMieNoPremul.x >= 0.0f && inScatteringMieNoPremul.y >= 0.0f && inScatteringMieNoPremul.z >= 0.0f);
-    assert(inScatteringRayleighNoPremul.x >= 0.0f && inScatteringRayleighNoPremul.y >= 0.0f && inScatteringRayleighNoPremul.z >= 0.0f);
-
-    // return color
-    if (pInScattering)
-    {
-        *pInScattering = Vec3(inScatteringMieNoPremul.CompMul(inScatteringConstMie) + inScatteringRayleighNoPremul.CompMul(inScatteringConstRayleigh));
-    }
-
-    if (pInScatteringMieNoPremul)
-    {
-        *pInScatteringMieNoPremul = Vec3(inScatteringMieNoPremul);
-    }
-
-    if (pInScatteringRayleighNoPremul)
-    {
-        *pInScatteringRayleighNoPremul = Vec3(inScatteringRayleighNoPremul);
-    }
-
-    if (pInScatteringRayleigh)
-    {
-        *pInScatteringRayleigh = Vec3(inScatteringRayleighNoPremul.CompMul(inScatteringConstRayleigh));
-    }
-}
-
-void CSkyLightNishita::SetInScatteringIntegralStepSize(int32 stepSize)
-{
-    stepSize = stepSize < 1 ? 1 : stepSize > 2 ? 2 : stepSize;
-    m_inScatteringStepSize = stepSize;
-}
-
-int32 CSkyLightNishita::GetInScatteringIntegralStepSize() const
-{
-    return(m_inScatteringStepSize);
-}
-
-Vec4 CSkyLightNishita::GetPartialMieInScatteringConst() const
-{
-    Vec3 res(m_sunIntensity * m_Km);
-    return(Vec4(res.x, res.y, res.z, 0.0f));
-}
-
-
-Vec4 CSkyLightNishita::GetPartialRayleighInScatteringConst() const
-{
-    Vec3 res((m_sunIntensity * m_Kr).CompMul(m_invRGBWaveLength4));
-    return(Vec4(res.x, res.y, res.z, 0.0f));
-}
-
-
-Vec3 CSkyLightNishita::GetSunDirection() const
-{
-    return(Vec3(m_sunDir.x, m_sunDir.y, m_sunDir.z));
-}
-
-
-Vec4 CSkyLightNishita::GetPhaseFunctionConsts() const
-{
-    //f32 g2( m_g * m_g );
-    //f32 miePart( 1.5f * ( 1.0f - g2 ) / ( 2.0f + g2 ) );
-    //return( Vec4( m_g, m_g * m_g, miePart, 0.0f ) );
-
-    f32 g2(m_g * m_g);
-    f32 miePart(1.5f * (1.0f - g2) / (2.0f + g2));
-    f32 miePartPow(powf(miePart, -2.0f / 3.0f));
-    return(Vec4(miePartPow * -2.0f * m_g, miePartPow * (1.0f + g2), 0.0f, 0.0f));
-}
-
-
-f64 CSkyLightNishita::IntegrateOpticalDepth(const Vec3d& start, const Vec3d& end, const f64& avgDensityHeightInv, const f64& error) const
-{
-    f64 startScale(OpticalScaleFunction(start.GetLength() - c_earthRadius, avgDensityHeightInv));
-    f64 endScale(OpticalScaleFunction(end.GetLength() - c_earthRadius, avgDensityHeightInv));
-    return(IntegrateOpticalDepthInternal(start, startScale, end, endScale, avgDensityHeightInv, error));
-}
-
-
-bool CSkyLightNishita::ComputeOpticalDepth(const Vec3d& cameraLookDir, const f64& cameraHeight, const f64& avgDensityHeightInv, float& depth) const
-{
-    // init camera position
-    Vec3d cameraPos(0.0, cameraHeight + c_earthRadius, 0.0);
-
-    // check if ray hits earth
-    // compute B, and C of quadratic function (A=1, as looking direction is normalized)
-    f64 B(2.0 * cameraPos.Dot(cameraLookDir));
-    f64 Bsq(B * B);
-    f64 Cpart(cameraPos.Dot(cameraPos));
-    f64 C(Cpart - c_earthRadius * c_earthRadius);
-    f64 det(Bsq - 4.0 * C);
-
-    bool hitsEarth(det >= 0.0 && ((0.5 * (-B - sqrt(det)) > 1e-4) || (0.5 * (-B + sqrt(det)) > 1e-4)));
-    if (false != hitsEarth)
-    {
-        depth = (float)c_opticalDepthWhenHittingEarth;
-        return(false);
-    }
-
-    // find intersection with atmosphere top
-    C = Cpart - (c_maxAtmosphereHeight + c_earthRadius) * (c_maxAtmosphereHeight + c_earthRadius);
-    det = Bsq - 4.0 * C;
-    assert(det >= 0.0);   // ray defined outside the atmosphere
-    f64 t(0.5 * (-B + sqrt(det)));
-    assert(t >= -1e-4);
-    if (t < 0.0)
-    {
-        t = 0.0;
-    }
-
-    // integrate depth along ray from camera to atmosphere top
-    f64 _depth(0.0);
-
-    int numInitialSamples((int) t);
-    numInitialSamples = (numInitialSamples < 2) ? 2 : numInitialSamples;
-
-    Vec3d lastCameraPos(cameraPos);
-    for (int i(1); i < numInitialSamples; ++i)
-    {
-        Vec3d curCameraPos(cameraPos + cameraLookDir * (t * ((float) i / (float) numInitialSamples)));
-        _depth += IntegrateOpticalDepth(lastCameraPos, curCameraPos, avgDensityHeightInv, 1e-1);
-        lastCameraPos = curCameraPos;
-    }
-
-    assert(_depth >= 0.0 && _depth < 1e25);
-    assert(0 != _finite(_depth));
-
-    depth = (float) _depth;
-    return(true);
-}
-
-
-void CSkyLightNishita::ComputeOpticalLUTs()
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    ILog* pLog(C3DEngine::GetLog());
-    if (0 != pLog)
-    {
-        PrintMessage("Sky light: Computing optical lookup tables (this might take a while)... ");
-    }
-
-    // reset tables
-    m_opticalDepthLUT.resize(0);
-    m_opticalDepthLUT.reserve(cOLUT_HeightSteps * cOLUT_AngularSteps);
-
-    m_opticalScaleLUT.resize(0);
-    m_opticalScaleLUT.reserve(cOLUT_HeightSteps);
-
-    // compute LUTs
-    for (int a(0); a < cOLUT_HeightSteps; ++a)
-    {
-        f64 height(MapIndexToHeight(a));
-
-        // compute optical depth
-        for (int i(0); i < cOLUT_AngularSteps; ++i)
-        {
-            // init looking direction of camera
-            f64 cosVertAngle(MapIndexToCosVertAngle(i));
-            Vec3d cameraLookDir(sqrt(1.0 - cosVertAngle * cosVertAngle), cosVertAngle, 0.0);
-
-            // compute optical depth
-            SOpticalDepthLUTEntry e;
-            bool b0(ComputeOpticalDepth(cameraLookDir, height, c_avgDensityHeightMieInv, e.mie));
-            bool b1(ComputeOpticalDepth(cameraLookDir, height, c_avgDensityHeightRayleighInv, e.rayleigh));
-            assert(b0 == b1);
-
-            // blend out previous values once camera ray hits earth
-            if (false == b0 && false == b1 && i > 0)
-            {
-                e = m_opticalDepthLUT.back();
-                e.mie = (f32) ((f32)0.5 * (e.mie + c_opticalDepthWhenHittingEarth));
-                e.rayleigh = (f32) ((f32)0.5 * (e.rayleigh + c_opticalDepthWhenHittingEarth));
-            }
-
-            // store result
-            m_opticalDepthLUT.push_back(e);
-        }
-
-        {
-            // compute optical scale
-            SOpticalScaleLUTEntry e;
-            e.atmosphereLayerHeight = (f32) height;
-            e.mie = (f32) OpticalScaleFunction(height, c_avgDensityHeightMieInv);
-            e.rayleigh = (f32) OpticalScaleFunction(height, c_avgDensityHeightRayleighInv);
-            m_opticalScaleLUT.push_back(e);
-        }
-    }
-
-    // save LUTs for next time
-    SaveOpticalLUTs();
-    if (0 != pLog)
-    {
-        PrintMessage(" ... done.\n");
-    }
-}
-
-
-void CSkyLightNishita::ComputePhaseLUT()
-{
-    //ILog* pLog( C3DEngine::GetLog() );
-    //if( 0 != pLog )
-    //  PrintMessage( "Sky light: Computing phase lookup table... " );
-
-    // reset tables
-    m_phaseLUT.resize(0);
-    m_phaseLUT.reserve(cPLUT_AngularSteps);
-
-    // compute coefficients
-    f32 g(m_g);
-    f32 g2(g * g);
-    f32 miePart(1.5f * (1.0f - g2) / (2.0f + g2));
-
-    // calculate entries
-    for (int i(0); i < cPLUT_AngularSteps; ++i)
-    {
-        f32 cosine(MapIndexToCosPhaseAngle(i));
-        f32 cosine2(cosine * cosine);
-
-        //f32 t = 1.0f + g2 - 2.0f * g * cosine;
-        //if (fabsf(t) < 1e-5f)
-        //{
-        //  PrintMessage( "Sky light: g = %.10f", g );
-        //  PrintMessage( "Sky light: g2 = %.10f", g2 );
-        //  PrintMessage( "Sky light: cosine = %.10f", cosine );
-        //  PrintMessage( "Sky light: cosine2 = %.10f", cosine2 );
-        //  PrintMessage( "Sky light: t = %.10f", t );
-        //}
-
-        f32 miePhase(miePart * (1.0f + cosine2) / powf(1.0f + g2 - 2.0f * g * cosine, 1.5f));
-        f32 rayleighPhase(0.75f * (1.0f + cosine2));
-
-        SPhaseLUTEntry e;
-        e.mie = (float) miePhase;
-        e.rayleigh = (float) rayleighPhase;
-        m_phaseLUT.push_back(e);
-    }
-    //if( 0 != pLog )
-    //  PrintMessage( " ... done.\n" );
-}
-
-
-f64 CSkyLightNishita::MapIndexToHeight(uint32 index) const
-{
-    // a function that maps well to mie and rayleigh at the same time
-    // that is, a lot of indices will map below the average density height for mie & rayleigh scattering
-    assert(index < cOLUT_HeightSteps);
-    f64 x((f64)index / (cOLUT_HeightSteps - 1));
-    return(c_maxAtmosphereHeight * exp_precise(10.0 * (x - 1.0)) * x);
-}
-
-
-f64 CSkyLightNishita::MapIndexToCosVertAngle(uint32 index) const
-{
-    assert(index < cOLUT_AngularSteps);
-    return(1.0 - 2.0 * ((f64)index / (cOLUT_AngularSteps - 1)));
-}
-
-
-f32 CSkyLightNishita::MapIndexToCosPhaseAngle(uint32 index) const
-{
-    assert(index < cPLUT_AngularSteps);
-    return(1.0f - 2.0f * ((f32)index / ((f32)cPLUT_AngularSteps - 1)));
-}
-
-
-void CSkyLightNishita::MapCosPhaseAngleToIndex(const f32 cosPhaseAngle, uint32& index, f32& indexFrc) const
-{
-    //assert( -1 <= cosPhaseAngle && 1 >= cosPhaseAngle );
-    f32 saveCosPhaseAngle(clamp_tpl(cosPhaseAngle, -1.0f, 1.0f));
-    f32 _index((f32) (cPLUT_AngularSteps - 1) * (-saveCosPhaseAngle * 0.5f + 0.5f));
-    index = (uint32) _index;
-    indexFrc = _index - floorf(_index);
-}
-
-
-uint32 CSkyLightNishita::OpticalLUTIndex(uint32 heightIndex, uint32 cosVertAngleIndex) const
-{
-    assert(heightIndex < cOLUT_HeightSteps && cosVertAngleIndex < cOLUT_AngularSteps);
-    return(heightIndex * cOLUT_AngularSteps + cosVertAngleIndex);
-}
-
-
-bool CSkyLightNishita::LoadOpticalLUTs()
-{
-    auto pPak(C3DEngine::GetPak());
-    if (0 != pPak)
-    {
-        AZ::IO::HandleType fileHandle = pPak->FOpen(c_lutFileName, "rb");
-        if (fileHandle != AZ::IO::InvalidHandle)
-        {
-            size_t itemsRead(0);
-
-            // read in file tag
-            uint32 fileTag(0);
-            itemsRead = pPak->FRead(&fileTag, 1, fileHandle);
-            if (itemsRead != 1 || fileTag != c_lutFileTag)
-            {
-                // file tag mismatch
-                pPak->FClose(fileHandle);
-                return(false);
-            }
-
-            // read in file format version
-            uint32 fileVersion(0);
-            itemsRead = pPak->FRead(&fileVersion, 1, fileHandle);
-            if (itemsRead != 1 || fileVersion != c_lutFileVersion)
-            {
-                // file version mismatch
-                pPak->FClose(fileHandle);
-                return(false);
-            }
-
-            // read in optical depth LUT
-            m_opticalDepthLUT.resize(cOLUT_HeightSteps * cOLUT_AngularSteps);
-            itemsRead = pPak->FRead(&m_opticalDepthLUT[0], m_opticalDepthLUT.size(), fileHandle);
-            if (itemsRead != m_opticalDepthLUT.size())
-            {
-                pPak->FClose(fileHandle);
-                return(false);
-            }
-
-            // read in optical scale LUT
-            m_opticalScaleLUT.resize(cOLUT_HeightSteps);
-            itemsRead = pPak->FRead(&m_opticalScaleLUT[0], m_opticalScaleLUT.size(), fileHandle);
-            if (itemsRead != m_opticalScaleLUT.size())
-            {
-                pPak->FClose(fileHandle);
-                return(false);
-            }
-
-            // check if we read entire file
-            uint64_t curPos(pPak->FTell(fileHandle));
-            pPak->FSeek(fileHandle, 0, SEEK_END);
-            uint64_t endPos(pPak->FTell(fileHandle));
-            if (curPos != endPos)
-            {
-                pPak->FClose(fileHandle);
-                return(false);
-            }
-
-            // LUT successfully read
-            pPak->FClose(fileHandle);
-            return(true);
-        }
-    }
-
-    return(false);
-}
-
-
-void CSkyLightNishita::SaveOpticalLUTs() const
-{
-    // only save on little endian PCs so the load function can do proper endian swapping
-#if defined(_CPU_X86) || defined(_CPU_AMD64)
-    auto pPak(C3DEngine::GetPak());
-    if (0 != pPak)
-    {
-        AZ::IO::HandleType fileHandle = pPak->FOpen(c_lutFileName, "wb");
-        if (fileHandle != AZ::IO::InvalidHandle)
-        {
-            // write out file tag
-            pPak->FWrite(&c_lutFileTag, 1, sizeof(c_lutFileTag), fileHandle);
-
-            // write out file format version
-            pPak->FWrite(&c_lutFileVersion, 1, sizeof(c_lutFileVersion), fileHandle);
-
-            // write out optical depth LUT
-            assert(m_opticalDepthLUT.size() == cOLUT_HeightSteps * cOLUT_AngularSteps);
-            pPak->FWrite(&m_opticalDepthLUT[0], 1, sizeof(SOpticalDepthLUTEntry) * m_opticalDepthLUT.size(), fileHandle);
-
-            // write out optical scale LUT
-            assert(m_opticalScaleLUT.size() == cOLUT_HeightSteps);
-            pPak->FWrite(&m_opticalScaleLUT[0], 1, sizeof(SOpticalScaleLUTEntry) * m_opticalScaleLUT.size(), fileHandle);
-
-            // close file
-            pPak->FClose(fileHandle);
-        }
-    }
-#endif
-}
diff --git a/Code/CryEngine/Cry3DEngine/SkyLightNishita.h b/Code/CryEngine/Cry3DEngine/SkyLightNishita.h
deleted file mode 100644
index 74c638f063..0000000000
--- a/Code/CryEngine/Cry3DEngine/SkyLightNishita.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_SKYLIGHTNISHITA_H
-#define CRYINCLUDE_CRY3DENGINE_SKYLIGHTNISHITA_H
-#pragma once
-
-#include <vector>
-
-class CSkyLightManager;
-
-class CSkyLightNishita
-    : public Cry3DEngineBase
-{
-private:
-
-    // size of lookup tables
-    static const uint32 cOLUT_HeightSteps = 32;
-    static const uint32 cOLUT_AngularSteps = 256;
-
-    // definition of optical depth LUT for mie/rayleigh scattering
-    struct SOpticalDepthLUTEntry
-    {
-        f32 mie;
-        f32 rayleigh;
-
-        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-        AUTO_STRUCT_INFO
-    } _ALIGN(8);
-
-    // definition of optical scale LUT for mie/rayleigh scattering
-    struct SOpticalScaleLUTEntry
-    {
-        f32 atmosphereLayerHeight;
-        f32 mie;
-        f32 rayleigh;
-
-        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-        AUTO_STRUCT_INFO
-    };
-
-    // definition lookup table entry for phase function
-    struct SPhaseLUTEntry
-    {
-        f32 mie;
-        f32 rayleigh;
-    } _ALIGN(8);
-
-    // definition of lookup tables
-    typedef std::vector< SOpticalDepthLUTEntry > OpticalDepthLUT;
-    typedef std::vector< SOpticalScaleLUTEntry > OpticalScaleLUT;
-
-    static const uint32 cPLUT_AngularSteps = 256;
-    //replace std::vector by a custom class with static storage
-    class PhaseLUT
-    {
-        SPhaseLUTEntry m_LUT[cPLUT_AngularSteps] _ALIGN(128);
-        size_t m_Size;
-    public:
-        PhaseLUT()
-            : m_Size(0) { }
-        SPhaseLUTEntry& operator[] (size_t index) { return m_LUT[index]; }
-        const SPhaseLUTEntry& operator[] (size_t index) const { return m_LUT[index]; }
-        void resize(size_t size) { m_Size = size; };
-        void reserve(size_t) { }
-        void push_back(SPhaseLUTEntry& entry) { m_LUT[m_Size++] = entry; }
-        size_t size() const { return m_Size; }
-    };
-
-public:
-    CSkyLightNishita();
-    ~CSkyLightNishita();
-
-    // set sky dome conditions
-    void SetAtmosphericConditions(const Vec3& sunIntensity, const f32 Km, const f32 Kr, const f32 g);
-    void SetRGBWaveLengths(const Vec3& rgbWaveLengths);
-    void SetSunDirection(const Vec3& sunDir);
-
-    // compute sky colors
-    void ComputeSkyColor(const Vec3& skyDir, Vec3* pInScattering, Vec3* pInScatteringMieNoPremul, Vec3* pInScatteringRayleighNoPremul, Vec3* pInScatteringRayleigh) const;
-
-    void SetInScatteringIntegralStepSize(int32 stepSize);
-    int32 GetInScatteringIntegralStepSize() const;
-
-    // constants for final pixel shader processing, if "no pre-multiplied in-scattering " colors are to be processed in a pixel shader
-    Vec4 GetPartialMieInScatteringConst() const;
-    Vec4 GetPartialRayleighInScatteringConst() const;
-    Vec3 GetSunDirection() const;
-    Vec4 GetPhaseFunctionConsts() const;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_opticalDepthLUT);
-        pSizer->AddObject(m_opticalScaleLUT);
-    }
-private:
-    // mapping helpers
-    f64 MapIndexToHeight(uint32 index) const;
-    f64 MapIndexToCosVertAngle(uint32 index) const;
-    f32 MapIndexToCosPhaseAngle(uint32 index) const;
-
-    void MapCosPhaseAngleToIndex(const f32 cosPhaseAngle, uint32& index, f32& indexFrc) const;
-
-    // optical lookup table access helpers
-    uint32 OpticalLUTIndex(uint32 heightIndex, uint32 cosVertAngleIndex) const;
-
-    // computes lookup tables for optical depth, etc.
-    void ComputeOpticalLUTs();
-
-    // computes lookup table for phase function
-    void ComputePhaseLUT();
-
-    // computes optical depth (helpers for ComputeOpticalLUTs())
-    f64 IntegrateOpticalDepth(const Vec3d& start, const Vec3d& end,
-        const f64& avgDensityHeightInv, const f64& error) const;
-
-    bool ComputeOpticalDepth(const Vec3d& cameraLookDir, const f64& cameraHeight, const f64& avgDensityHeightInv, float& depth) const;
-
-    // does a bilinearily filtered lookup into the optical depth LUT
-    // SOpticalDepthLUTEntry* is passed to save address resolve operations
-    ILINE SOpticalDepthLUTEntry LookupBilerpedOpticalDepthLUTEntry(const SOpticalDepthLUTEntry* const __restrict cpOptDepthLUT,
-        uint32 heightIndex, const f32 cosVertAngle) const;
-
-    // does a bilinearily filtered lookup into the phase LUT
-    SPhaseLUTEntry LookupBilerpedPhaseLUTEntry(const f32 cosPhaseAngle) const;
-
-    // computes in-scattering
-    void SamplePartialInScatteringAtHeight(const SOpticalScaleLUTEntry& osAtHeight,
-        const f32 outScatteringConstMie, const Vec3& outScatteringConstRayleigh, const SOpticalDepthLUTEntry& odAtHeightSky,
-        const SOpticalDepthLUTEntry& odAtViewerSky, const SOpticalDepthLUTEntry& odAtHeightSun,
-        Vec3& partialInScatteringMie, Vec3& partialInScatteringRayleigh) const;
-
-    void ComputeInScatteringNoPremul(const f32 outScatteringConstMie, const Vec3& outScatteringConstRayleigh, const Vec3& skyDir,
-        Vec3& inScatteringMieNoPremul, Vec3& inScatteringRayleighNoPremul) const;
-
-    // serialization of optical LUTs
-    bool LoadOpticalLUTs();
-    void SaveOpticalLUTs() const;
-
-    const OpticalScaleLUT& GetOpticalScaleLUT() const;
-
-private:
-    // lookup tables
-    OpticalDepthLUT m_opticalDepthLUT;
-    OpticalScaleLUT m_opticalScaleLUT;
-    PhaseLUT m_phaseLUT;
-
-    // mie scattering constant
-    f32 m_Km;
-
-    // rayleigh scattering constant
-    f32 m_Kr;
-
-    // sun intensity
-    Vec3 m_sunIntensity;
-
-    // mie scattering asymmetry factor (g is always 0.0 for rayleigh scattering)
-    f32 m_g;
-
-    // wavelengths for r, g, and b to the -4th used for mie rayleigh scattering
-    Vec3 m_invRGBWaveLength4;
-
-    // direction towards the sun
-    Vec3 m_sunDir;
-
-    // step size for solving in-scattering integral
-    int32 m_inScatteringStepSize;
-
-    friend class CSkyLightManager;
-};
-
-ILINE void CSkyLightNishita::SetRGBWaveLengths(const Vec3& rgbWaveLengths)
-{
-    assert(380.0f <= rgbWaveLengths.x && 780.0f >= rgbWaveLengths.x);
-    assert(380.0f <= rgbWaveLengths.y && 780.0f >= rgbWaveLengths.y);
-    assert(380.0f <= rgbWaveLengths.z && 780.0f >= rgbWaveLengths.z);
-
-    m_invRGBWaveLength4.x = powf(rgbWaveLengths.x * 1e-3f, -4.0f);
-    m_invRGBWaveLength4.y = powf(rgbWaveLengths.y * 1e-3f, -4.0f);
-    m_invRGBWaveLength4.z = powf(rgbWaveLengths.z * 1e-3f, -4.0f);
-}
-
-ILINE void CSkyLightNishita::SetSunDirection(const Vec3& sunDir)
-{
-    assert(sunDir.GetLengthSquared() > 0.0f);
-    m_sunDir = sunDir;
-    m_sunDir.Normalize();
-}
-
-ILINE void CSkyLightNishita::SetAtmosphericConditions(const Vec3& sunIntensity,
-    const f32 Km, const f32 Kr, const f32 g)
-{
-    m_sunIntensity = sunIntensity;
-    m_Km = Km;
-    m_Kr = Kr;
-
-    // update g only if it changed as phase lut needs to be rebuilt
-    float newg(clamp_tpl(g, -0.9995f, 0.9995f));
-    if (fabsf(m_g - newg) > 1e-6f)
-    {
-        m_g = newg;
-        ComputePhaseLUT();
-    }
-}
-
-ILINE const CSkyLightNishita::OpticalScaleLUT& CSkyLightNishita::GetOpticalScaleLUT() const
-{
-    return m_opticalScaleLUT;
-}
-
-#endif // CRYINCLUDE_CRY3DENGINE_SKYLIGHTNISHITA_H
diff --git a/Code/CryEngine/Cry3DEngine/SkyLightNishita_info.h b/Code/CryEngine/Cry3DEngine/SkyLightNishita_info.h
deleted file mode 100644
index d22816717e..0000000000
--- a/Code/CryEngine/Cry3DEngine/SkyLightNishita_info.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_SKYLIGHTNISHITA_INFO_H
-#define CRYINCLUDE_CRY3DENGINE_SKYLIGHTNISHITA_INFO_H
-#pragma once
-
-#include "SkyLightNishita.h"
-
-STRUCT_INFO_BEGIN(CSkyLightNishita::SOpticalDepthLUTEntry)
-STRUCT_VAR_INFO(mie, TYPE_INFO(f32))
-STRUCT_VAR_INFO(rayleigh, TYPE_INFO(f32))
-STRUCT_INFO_END(CSkyLightNishita::SOpticalDepthLUTEntry)
-
-STRUCT_INFO_BEGIN(CSkyLightNishita::SOpticalScaleLUTEntry)
-STRUCT_VAR_INFO(atmosphereLayerHeight, TYPE_INFO(f32))
-STRUCT_VAR_INFO(mie, TYPE_INFO(f32))
-STRUCT_VAR_INFO(rayleigh, TYPE_INFO(f32))
-STRUCT_INFO_END(CSkyLightNishita::SOpticalScaleLUTEntry)
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_SKYLIGHTNISHITA_INFO_H
diff --git a/Code/CryEngine/Cry3DEngine/StatObj.h b/Code/CryEngine/Cry3DEngine/StatObj.h
deleted file mode 100644
index 771d7354a5..0000000000
--- a/Code/CryEngine/Cry3DEngine/StatObj.h
+++ /dev/null
@@ -1,742 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_STATOBJ_H
-#define CRYINCLUDE_CRY3DENGINE_STATOBJ_H
-#pragma once
-
-#if !defined(CONSOLE)
-#   define SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-#endif
-
-class CIndexedMesh;
-class CRenderObject;
-class CContentCGF;
-struct CNodeCGF;
-struct CMaterialCGF;
-struct phys_geometry;
-struct IIndexedMesh;
-
-#include "../Cry3DEngine/Cry3DEngineBase.h"
-#include "CryArray.h"
-
-#include <IStatObj.h>
-#include <IStreamEngine.h>
-#include "RenderMeshUtils.h"
-#include "GeomQuery.h"
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-#define MAX_PHYS_GEOMS_TYPES 4
-
-struct SDeformableMeshData
-{
-    IGeometry* pInternalGeom;
-    int* pVtxMap;
-    unsigned int* pUsedVtx;
-    int* pVtxTri;
-    int* pVtxTriBuf;
-    float* prVtxValency;
-    Vec3* pPrevVtx;
-    float kViscosity;
-};
-
-struct SSpine
-{
-    ~SSpine() { delete[] pVtx; delete[] pVtxCur; delete[] pSegDim; delete[] pStiffness; delete[] pDamping; delete[] pThickness; }
-    SSpine() : bActive(false), pVtx(nullptr), pVtxCur(nullptr), pSegDim(nullptr),
-        pStiffness(nullptr), pDamping(nullptr), pThickness(nullptr),
-        nVtx(0), len(0.0f), navg(0.0f, 0.0f, 0.0f), idmat(0), iAttachSpine(0), iAttachSeg(0) {}
-
-    bool bActive;
-    Vec3* pVtx;
-    Vec3* pVtxCur;
-    Vec4* pSegDim;
-
-    /// Per bone UDP for stiffness, damping and thickness for touch bending vegetation
-    float* pStiffness;
-    float* pDamping;
-    float* pThickness;
-
-    int nVtx;
-    float len;
-    Vec3 navg;
-    int idmat;
-    int iAttachSpine;
-    int iAttachSeg;
-};
-
-struct SClothTangentVtx
-{
-    int ivtxT; // for each vertex, specifies the iThisVtx->ivtxT edge, which is the closest to the vertex's tangent vector
-    Vec3 edge; // that edge's projection on the vertex's normal basis
-    int sgnNorm; // sign of phys normal * normal from the basis
-};
-
-struct SSkinVtx
-{
-    int bVolumetric;
-    int idx[4];
-    float w[4];
-    Matrix33 M;
-};
-
-struct SDelayedSkinParams
-{
-    Matrix34 mtxSkelToMesh;
-    IGeometry* pPhysSkel;
-    float r;
-};
-
-struct SPhysGeomThunk
-{
-    phys_geometry* pgeom;
-    int type;
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-    {
-        //      pSizer->AddObject(pgeom);
-    }
-};
-
-struct SPhysGeomArray
-{
-    phys_geometry* operator[](int idx) const
-    {
-        if (idx < PHYS_GEOM_TYPE_DEFAULT)
-        {
-            return idx < (int)m_array.size() ? m_array[idx].pgeom : 0;
-        }
-        else
-        {
-            int i;
-            for (i = m_array.size() - 1; i >= 0 && m_array[i].type != idx; i--)
-            {
-                ;
-            }
-            return i >= 0 ? m_array[i].pgeom : 0;
-        }
-    }
-    void SetPhysGeom(phys_geometry* pgeom, int idx = PHYS_GEOM_TYPE_DEFAULT, int type = PHYS_GEOM_TYPE_DEFAULT)
-    {
-        int i;
-        if (idx < PHYS_GEOM_TYPE_DEFAULT)
-        {
-            i = idx, idx = type;
-        }
-        else
-        {
-            for (i = 0; i < (int)m_array.size() && m_array[i].type != idx; i++)
-            {
-                ;
-            }
-        }
-        if (pgeom)
-        {
-            if (i >= (int)m_array.size())
-            {
-                m_array.resize(i + 1);
-            }
-            m_array[i].pgeom = pgeom;
-            m_array[i].type = idx;
-        }
-        else if (i < (int)m_array.size())
-        {
-            m_array.erase(m_array.begin() + i);
-        }
-    }
-    int GetGeomCount() { return m_array.size(); }
-    int GetGeomType(int idx) { return idx >= PHYS_GEOM_TYPE_DEFAULT ? idx : m_array[idx].type; }
-    std::vector<SPhysGeomThunk> m_array;
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_array);
-    }
-};
-
-
-struct SSyncToRenderMeshContext
-{
-    Vec3* vmin, *vmax;
-    int iVtx0;
-    int nVtx;
-    strided_pointer<Vec3> pVtx;
-    int* pVtxMap;
-    int mask;
-    float rscale;
-    SClothTangentVtx* ctd;
-    strided_pointer<Vec3> pMeshVtx;
-    strided_pointer<SPipTangents> pTangents;
-    strided_pointer<Vec3> pNormals; // TODO: change Vec3 to SPipNormal
-    CStatObj* pObj;
-    AZ::LegacyJobExecutor jobExecutor;
-
-    void Set(Vec3* _vmin, Vec3* _vmax, int _iVtx0, int _nVtx, strided_pointer<Vec3> _pVtx, int* _pVtxMap
-        , int _mask, float _rscale, SClothTangentVtx* _ctd, strided_pointer<Vec3> _pMeshVtx
-        , strided_pointer<SPipTangents> _pTangents, strided_pointer<Vec3> _pNormals, CStatObj* _pObj)
-    {
-        vmin = _vmin;
-        vmax = _vmax;
-        iVtx0 = _iVtx0;
-        nVtx = _nVtx;
-        pVtx = _pVtx;
-        pVtxMap = _pVtxMap;
-        mask = _mask;
-        rscale = _rscale;
-        ctd = _ctd;
-        pMeshVtx = _pMeshVtx;
-        pTangents = _pTangents;
-        pNormals = _pNormals;
-        pObj = _pObj;
-    }
-};
-
-struct CStatObj
-    : public IStatObj
-    , public IStreamCallback
-    , public stl::intrusive_linked_list_node<CStatObj>
-    , public Cry3DEngineBase
-{
-    CStatObj();
-    ~CStatObj();
-
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Variables.
-    //////////////////////////////////////////////////////////////////////////
-    volatile int m_nUsers; // reference counter
-
-    uint32 m_nLastDrawMainFrameId;
-
-    _smart_ptr<IRenderMesh> m_pRenderMesh;
-#ifdef SERVER_CHECKS
-    CMesh* m_pMesh;     // Used by the dedicated server where the render mesh doesn't exist
-#endif
-
-    CryCriticalSection m_streamingMeshLock;
-    _smart_ptr<IRenderMesh> m_pStreamedRenderMesh;
-    _smart_ptr<IRenderMesh> m_pMergedRenderMesh;
-
-    // Used by hierarchical breaking to hide sub-objects that initially must be hidden.
-    uint64 m_nInitialSubObjHideMask;
-
-    CIndexedMesh* m_pIndexedMesh;
-    volatile int m_lockIdxMesh;
-
-    string m_szFileName;
-    string m_szGeomName;
-    string m_szProperties;
-    string m_szStreamingDependencyFilePath;
-
-    int m_nLoadedTrisCount;
-    int m_nLoadedVertexCount;
-    int m_nRenderTrisCount;
-    int m_nRenderMatIds;
-    float m_fGeometricMeanFaceArea;
-    float m_fLodDistance;
-
-    // Default material.
-    _smart_ptr<IMaterial> m_pMaterial;
-
-    float m_fObjectRadius;
-    float m_fRadiusHors;
-    float m_fRadiusVert;
-
-    Vec3 m_vBoxMin, m_vBoxMax, m_vVegCenter;
-
-    SPhysGeomArray m_arrPhysGeomInfo;
-    ITetrLattice* m_pLattice;
-    IStatObj* m_pLastBooleanOp;
-    float m_lastBooleanOpScale;
-
-    _smart_ptr<CStatObj>* m_pLODs;
-    IStatObj* m_pLod0; // Level 0 stat object. (Pointer to the original object of the LOD)
-    unsigned int m_nMinUsableLod0 : 8;  // What is the minimal LOD that can be used as LOD0.
-    unsigned int m_nMaxUsableLod0 : 8; // What is the maximal LOD that can be used as LOD0.
-    unsigned int m_nMaxUsableLod : 8;  // What is the maximal LOD that can be used.
-    unsigned int m_nLoadedLodsNum : 8;  // How many lods loaded.
-
-
-    string m_cgfNodeName;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Externally set flags from enum EStaticObjectFlags.
-    //////////////////////////////////////////////////////////////////////////
-    int m_nFlags;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Internal Flags.
-    //////////////////////////////////////////////////////////////////////////
-    unsigned int m_bCheckGarbage : 1;
-    unsigned int m_bCanUnload : 1;
-    unsigned int m_bLodsLoaded : 1;
-    unsigned int m_bDefaultObject : 1;
-    unsigned int m_bOpenEdgesTested : 1;
-    unsigned int m_bSubObject : 1;       // This is sub object.
-    unsigned int m_bVehicleOnlyPhysics : 1;  // Object can be used for collisions with vehicles only
-    unsigned int m_bBreakableByGame : 1; // material is marked as breakable by game
-    unsigned int m_bSharesChildren : 1; // means its subobjects belong to another parent statobj
-    unsigned int m_bHasDeformationMorphs : 1;
-    unsigned int m_bTmpIndexedMesh : 1; // indexed mesh is temporary and can be deleted after MakeRenderMesh
-    unsigned int m_bUnmergable : 1; // Set if sub objects cannot be merged together to the single render merge.
-    unsigned int m_bMerged : 1; // Set if sub objects merged together to the single render merge.
-    unsigned int m_bMergedLODs : 1; // Set if m_pLODs were created while merging LODs
-    unsigned int m_bLowSpecLod0Set : 1;
-    unsigned int m_bHaveOcclusionProxy : 1; // If this stat object or its childs have occlusion proxy.
-    unsigned int m_bLodsAreLoadedFromSeparateFile : 1;
-    unsigned int m_bNoHitRefinement : 1; // doesn't refine bullet hits against rendermesh
-    unsigned int m_bDontOccludeExplosions : 1; // don't act as an explosion occluder in physics
-    unsigned int m_hasClothTangentsData : 1;
-    unsigned int m_hasSkinInfo : 1;
-    unsigned int m_bMeshStrippedCGF : 1; // This CGF was loaded from the Mesh Stripped CGF, (in Level Cache)
-    unsigned int m_isDeformable : 1; // This cgf is deformable in the sense that it has a special renderpath
-    unsigned int m_isProxyTooBig : 1;
-    unsigned int m_bHasStreamOnlyCGF : 1;
-
-    int m_idmatBreakable;   // breakable id for the physics
-    //////////////////////////////////////////////////////////////////////////
-
-    // streaming
-    int m_nRenderMeshMemoryUsage;
-    int m_nMergedMemoryUsage;
-    int m_arrRenderMeshesPotentialMemoryUsage[2];
-    IReadStreamPtr m_pReadStream;
-
-#if !defined (_RELEASE)
-    static float s_fStreamingTime;
-    static int s_nBandwidth;
-    float m_fStreamingStart;
-#endif
-
-    //////////////////////////////////////////////////////////////////////////
-
-    uint16* m_pMapFaceToFace0;
-    union
-    {
-        SClothTangentVtx* m_pClothTangentsData;
-        SSkinVtx* m_pSkinInfo;
-    };
-    SDelayedSkinParams* m_pDelayedSkinParams;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Bendable Foliage.
-    //////////////////////////////////////////////////////////////////////////
-    SSpine* m_pSpines;
-    int m_nSpines;
-    struct SMeshBoneMapping_uint8* m_pBoneMapping;
-    std::vector<uint16> m_chunkBoneIds;
-    //////////////////////////////////////////////////////////////////////////
-
-private:
-    //////////////////////////////////////////////////////////////////////////
-    // Sub objects.
-    //////////////////////////////////////////////////////////////////////////
-    std::vector<SSubObject> m_subObjects;
-    CStatObj* m_pParentObject;  // Parent object (Must not be smart pointer).
-    CStatObj* m_pClonedSourceObject;  // If this is cloned object, pointer to original source object (Must not be smart pointer).
-    int m_nSubObjectMeshCount;
-    int m_nNodeCount;
-
-    CGeomExtents m_Extents;                     // Cached extents for random pos generation.
-
-    //////////////////////////////////////////////////////////////////////////
-    // Special AI/Physics parameters.
-    //////////////////////////////////////////////////////////////////////////
-    float m_aiVegetationRadius;
-    float m_phys_mass;
-    float m_phys_density;
-
-    //////////////////////////////////////////////////////////////////////////
-    // used only in the editor
-    //////////////////////////////////////////////////////////////////////////
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-    float* m_pHeightmap;
-    int m_nHeightmapSize;
-    float m_fOcclusionAmount;
-#endif
-
-    SSyncToRenderMeshContext* m_pAsyncUpdateContext;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Cloth data
-    //////////////////////////////////////////////////////////////////////////
-    AZStd::vector<SMeshColor> m_clothData;
-
-    //////////////////////////////////////////////////////////////////////////
-    // METHODS.
-    //////////////////////////////////////////////////////////////////////////
-public:
-    virtual void SetDefaultObject(bool state) override { m_bDefaultObject = state; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Fast non virtual access functions.
-    ILINE IStatObj::SSubObject& SubObject(int nIndex) { return m_subObjects[nIndex]; };
-    ILINE int SubObjectCount() const { return m_subObjects.size(); };
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void SetCanUnload(bool value) override { m_bCanUnload = value; }
-    virtual bool IsUnloadable() const { return m_bCanUnload; }
-    virtual bool IsUnmergable() const { return m_bUnmergable; }
-    virtual void SetUnmergable(bool state) { m_bUnmergable = state; }
-
-    void DisableStreaming();
-
-    virtual bool AreLodsLoaded() const override { return m_bLodsLoaded; }
-    virtual SPhysGeomArray& GetArrPhysGeomInfo() override { return m_arrPhysGeomInfo; }
-
-    IIndexedMesh* GetIndexedMesh(bool bCreatefNone = false);
-    IIndexedMesh* CreateIndexedMesh();
-    void ReleaseIndexedMesh(bool bRenderMeshUpdated = false);
-    ILINE const Vec3 GetVegCenter() { return m_vVegCenter; }
-    ILINE float GetRadius() { return m_fObjectRadius; }
-
-    virtual void SetFlags(int nFlags) override { m_nFlags = nFlags; };
-    virtual int GetFlags() const override { return m_nFlags; };
-    virtual bool IsLodsAreLoadedFromSeparateFile() override { return m_bLodsAreLoadedFromSeparateFile; }
-
-    virtual int GetSubObjectMeshCount() const override { return m_nSubObjectMeshCount; }
-    virtual void SetSubObjectMeshCount(int count) { m_nSubObjectMeshCount = count; }
-
-    virtual unsigned int GetVehicleOnlyPhysics() { return m_bVehicleOnlyPhysics; };
-    virtual int GetIDMatBreakable() { return m_idmatBreakable; };
-    virtual unsigned int GetBreakableByGame() { return m_bBreakableByGame; };
-
-    //Note: This function checks both the children and root data
-    //It should really be 'has any deformable objects'
-    //Should eventually be refactored as part of an eventual statobj refactor.
-    virtual bool IsDeformable() override;
-
-    // Loader
-    bool LoadCGF(const char* filename, bool bLod, unsigned long nLoadingFlags, const void* pData, const int nDataSize);
-    bool LoadCGF_Int(const char* filename, bool bLod, unsigned long nLoadingFlags, const void* pData, const int nDataSize);
-
-    //////////////////////////////////////////////////////////////////////////
-    void SetMaterial(_smart_ptr<IMaterial> pMaterial);
-    _smart_ptr<IMaterial> GetMaterial() { return m_pMaterial; }
-    const _smart_ptr<IMaterial> GetMaterial() const { return m_pMaterial; }
-    //////////////////////////////////////////////////////////////////////////
-
-    void RenderInternal(CRenderObject* pRenderObject, uint64 nSubObjectHideMask, const CLodValue& lodValue, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw);
-    void RenderObjectInternal(CRenderObject* pRenderObject, int nLod, uint8 uLodDissolveRef, bool dissolveOut, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw);
-    void RenderSubObject(CRenderObject* pRenderObject, int nLod,
-        int nSubObjId, const Matrix34A& renderTM, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw);
-    void RenderSubObjectInternal(CRenderObject* pRenderObject, int nLod, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw);
-    virtual void Render(const SRendParams& rParams, const SRenderingPassInfo& passInfo);
-    void RenderRenderMesh(CRenderObject* pObj, struct SInstancingInfo* pInstInfo, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-    phys_geometry* GetPhysGeom(int nGeomType = PHYS_GEOM_TYPE_DEFAULT) { return m_arrPhysGeomInfo[nGeomType]; }
-    void SetPhysGeom(phys_geometry* pPhysGeom, int nGeomType = PHYS_GEOM_TYPE_DEFAULT)
-    {
-        m_arrPhysGeomInfo.SetPhysGeom(pPhysGeom, nGeomType);
-    }
-    ITetrLattice* GetTetrLattice() { return m_pLattice; }
-
-    float GetAIVegetationRadius() const { return m_aiVegetationRadius; }
-    void SetAIVegetationRadius(float radius) { m_aiVegetationRadius = radius; }
-
-    //! Refresh object ( reload shaders or/and object geometry )
-    virtual void Refresh(int nFlags);
-
-    IRenderMesh* GetRenderMesh() { return m_pRenderMesh; };
-    void SetRenderMesh(IRenderMesh* pRM);
-
-    const char* GetFilePath() const { return (m_szFileName); }
-    void SetFilePath(const char* szFileName) { m_szFileName = szFileName; }
-    const char* GetGeoName() { return (m_szGeomName); }
-    void SetGeoName(const char* szGeoName) { m_szGeomName = szGeoName; }
-    bool IsSameObject(const char* szFileName, const char* szGeomName);
-
-    //set object's min/max bbox
-    void  SetBBoxMin(const Vec3& vBBoxMin) { m_vBoxMin = vBBoxMin; }
-    void  SetBBoxMax(const Vec3& vBBoxMax) { m_vBoxMax = vBBoxMax; }
-    Vec3 GetBoxMin() { return m_vBoxMin; }
-    Vec3 GetBoxMax() { return m_vBoxMax; }
-    AABB GetAABB() { return AABB(m_vBoxMin, m_vBoxMax); }
-    AABB GetAABB() const { return AABB(m_vBoxMin, m_vBoxMax); }
-
-    virtual float GetExtent(EGeomForm eForm);
-    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm) const;
-
-    virtual Vec3 GetHelperPos(const char* szHelperName);
-    virtual const Matrix34& GetHelperTM(const char* szHelperName);
-
-    virtual float& GetRadiusVert() override { return m_fRadiusVert; }
-    virtual float& GetRadiusHors() override { return m_fRadiusHors; }
-
-    virtual int AddRef();
-
-    virtual int Release();
-    int GetNumRefs() const { return m_nUsers; }
-
-    virtual bool IsDefaultObject() { return (m_bDefaultObject); }
-
-    int GetLoadedTrisCount() const override { return m_nLoadedTrisCount; }
-    int GetRenderTrisCount() const override { return m_nRenderTrisCount; }
-    int GetRenderMatIds() const override { return m_nRenderMatIds; }
-
-    // Load LODs
-    void SetLodObject(int nLod, IStatObj* pLod) override;
-    bool LoadLowLODS_Prep(bool bUseStreaming, unsigned long nLoadingFlags);
-    IStatObj* LoadLowLODS_Load(int nLodLevel, bool bUseStreaming, unsigned long nLoadingFlags, const void* pData, int nDataLen);
-    void LoadLowLODS_Finalize(int nLoadedLods, IStatObj* loadedLods[MAX_STATOBJ_LODS_NUM]);
-    void LoadLowLODs(bool bUseStreaming, unsigned long nLoadingFlags);
-
-    // Free render resources for unused upper LODs.
-    virtual void CleanUnusedLods() override;
-
-    virtual void FreeIndexedMesh();
-    bool RenderDebugInfo(CRenderObject* pObj, const SRenderingPassInfo& passInfo);
-
-    //! Release method.
-    void GetMemoryUsage(class ICrySizer* pSizer) const;
-
-    void ShutDown();
-    void Init();
-
-    //  void CheckLoaded();
-    IStatObj* GetLodObject(int nLodLevel, bool bReturnNearest = false) override;
-    IStatObj* GetLowestLod() override;
-    _smart_ptr<CStatObj>* GetLods() override { return m_pLODs; }
-    int GetLoadedLodsNum() override { return m_nLoadedLodsNum; }
-    void SetMerged(bool state)  override { m_bMerged = state; }
-    int GetRenderMeshMemoryUsage() const override { return m_nRenderMeshMemoryUsage; }
-    int FindNearesLoadedLOD(int nLodIn, bool bSearchUp = false) override;
-    int FindHighestLOD(int nBias) override;
-
-    // interface IStreamCallback -----------------------------------------------------
-
-    void StreamAsyncOnComplete(IReadStream* pStream, unsigned nError) override;
-    void StreamOnComplete(IReadStream* pStream, unsigned nError) override;
-
-    // -------------------------------------------------------------------------------
-
-    void StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream) override;
-    void UpdateStreamingPrioriryInternal(const Matrix34A& objMatrix, float fDistance, bool bFullUpdate);
-
-    void MakeCompiledFileName(char* szCompiledFileName, int nMaxLen);
-
-    bool IsPhysicsExist();
-    bool IsSphereOverlap(const Sphere& sSphere);
-    void Invalidate(bool bPhysics = false, float tolerance = 0.05f);
-
-    IStatObj* UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<Vec3> pNormals, int iVtx0, int nVtx, int* pVtxMap = 0, float rscale = 1.f);
-    bool HasSkinInfo(float skinRadius = -1.0f) { return m_hasSkinInfo && m_pSkinInfo && (skinRadius < 0.0f || m_pSkinInfo[m_nLoadedVertexCount].w[0] == skinRadius); }
-    void PrepareSkinData(const Matrix34& mtxSkelToMesh, IGeometry* pPhysSkel, float r = 0.0f);
-    IStatObj* SkinVertices(strided_pointer<Vec3> pSkelVtx, const Matrix34& mtxSkelToMesh);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sub objects.
-    //////////////////////////////////////////////////////////////////////////
-    virtual int GetSubObjectCount() const { return m_subObjects.size(); }
-    virtual void SetSubObjectCount(int nCount);
-    virtual IStatObj::SSubObject* FindSubObject(const char* sNodeName);
-    virtual IStatObj::SSubObject* FindSubObject_StrStr(const char* sNodeName);
-    virtual IStatObj::SSubObject* FindSubObject_CGA(const char* sNodeName);
-    virtual IStatObj::SSubObject* GetSubObject(int nIndex)
-    {
-        if (nIndex >= 0 && nIndex < (int)m_subObjects.size())
-        {
-            return &m_subObjects[nIndex];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-    virtual bool RemoveSubObject(int nIndex);
-    virtual IStatObj* GetParentObject() const { return m_pParentObject; }
-    virtual IStatObj* GetCloneSourceObject() const { return m_pClonedSourceObject; }
-    virtual bool IsSubObject() const { return m_bSubObject; };
-    virtual bool CopySubObject(int nToIndex, IStatObj* pFromObj, int nFromIndex);
-    virtual int PhysicalizeSubobjects(IPhysicalEntity* pent, const Matrix34* pMtx, float mass, float density = 0.0f, int id0 = 0,
-        strided_pointer<int> pJointsIdMap = 0, const char* szPropsOverride = 0);
-    virtual IStatObj::SSubObject& AddSubObject(IStatObj* pStatObj);
-    virtual int Physicalize(IPhysicalEntity* pent, pe_geomparams* pgp, int id = -1, const char* szPropsOverride = 0);
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual bool SaveToCGF(const char* sFilename, IChunkFile** pOutChunkFile = NULL, bool bHavePhiscalProxy = false);
-
-    //virtual IStatObj* Clone(bool bCloneChildren=true, bool nDynamic=false);
-    virtual IStatObj* Clone(bool bCloneGeometry, bool bCloneChildren, bool bMeshesOnly);
-
-    virtual int SetDeformationMorphTarget(IStatObj* pDeformed);
-    virtual int SubobjHasDeformMorph(int iSubObj);
-    virtual IStatObj* DeformMorph(const Vec3& pt, float r, float strength, IRenderMesh* pWeights = 0);
-
-    virtual IStatObj* HideFoliage();
-
-    virtual int Serialize(TSerialize ser);
-
-    // Get object properties as loaded from CGF.
-    virtual const char* GetProperties() { return m_szProperties.c_str(); };
-    virtual void SetProperties(const char* props) { m_szProperties = props; ParseProperties(); }
-
-    virtual bool GetPhysicalProperties(float& mass, float& density);
-
-    virtual IStatObj* GetLastBooleanOp(float& scale) { scale = m_lastBooleanOpScale; return m_pLastBooleanOp; }
-
-    // Intersect ray with static object.
-    // Ray must be in object local space.
-    virtual bool RayIntersection(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl = 0);
-    virtual bool LineSegIntersection(const Lineseg& lineSeg, Vec3& hitPos, int& surfaceTypeId);
-
-    virtual void DebugDraw(const SGeometryDebugDrawInfo& info, float fExtrdueScale = 0.01f);
-    virtual void GetStatistics(SStatistics& stats);
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual uint64 GetInitialHideMask() { return m_nInitialSubObjHideMask; }
-    virtual uint64 UpdateInitialHideMask(uint64 maskAND = 0ul - 1ul, uint64 maskOR = 0) { return m_nInitialSubObjHideMask &= maskAND |= maskOR; }
-
-    virtual void SetStreamingDependencyFilePath(const char* szFileName)
-    {
-        const bool streamingDependencyLoop = CheckForStreamingDependencyLoop(szFileName);
-        if (streamingDependencyLoop)
-        {
-            CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "StatObj '%s' cannot set '%s' as a streaming dependency as it would result in a looping dependency.", GetFilePath(), szFileName);
-            return;
-        }
-
-        m_szStreamingDependencyFilePath = szFileName;
-    }
-
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-    float GetOcclusionAmount();
-    void CheckUpdateObjectHeightmap();
-    float GetObjectHeight(float x, float y);
-#endif
-
-    virtual int GetMaxUsableLod() const override;
-    virtual int GetMinUsableLod() const override;
-    virtual SMeshBoneMapping_uint8* GetBoneMapping() const override { return m_pBoneMapping; }
-    virtual int GetSpineCount() const override { return m_nSpines; }
-    virtual SSpine* GetSpines() const override { return m_pSpines; }
-
-    void RenderStreamingDebugInfo(CRenderObject* pRenderObject);
-    void RenderCoverInfo(CRenderObject* pRenderObject);
-
-    virtual int CountChildReferences() const override;
-    void ReleaseStreamableContent();
-    int GetStreamableContentMemoryUsage(bool bJustForDebug = false);
-    virtual void ComputeGeometricMean(SMeshLodInfo& lodInfo);
-    virtual float GetLodDistance() const override { return m_fLodDistance; }
-    virtual bool UpdateStreamableComponents(float fImportance, const Matrix34A& objMatrix, bool bFullUpdate, int nNewLod) override;
-    void GetStreamableName(string& sName)
-    {
-        sName = m_szFileName;
-        if (m_szGeomName.length())
-        {
-            sName += " - ";
-            sName += m_szGeomName;
-        }
-    };
-    void GetStreamFilePath(stack_string& strOut);
-    void FillRenderObject(const SRendParams& rParams, IRenderNode* pRenderNode, _smart_ptr<IMaterial> pMaterial,
-        SInstancingInfo* pInstInfo, CRenderObject*& pObj, const SRenderingPassInfo& passInfo);
-    virtual uint32 GetLastDrawMainFrameId() { return m_nLastDrawMainFrameId; }
-
-    // Allow pooled allocs
-    static void* operator new (size_t size);
-    static void operator delete (void* pToFree);
-
-    // Used in ObjMan.
-    void TryMergeSubObjects(bool bFromStreaming) override;
-    bool IsMeshStrippedCGF() const { return m_bMeshStrippedCGF; }
-    string& GetFileName() override { return m_szFileName; }
-    const string& GetFileName() const override { return m_szFileName; }
-
-    const string& GetCGFNodeName() const override { return m_cgfNodeName; }
-
-    int GetUserCount() const override { return m_nUsers; }
-    bool CheckGarbage() const override { return m_bCheckGarbage; }
-    void SetCheckGarbage(bool val) override { m_bCheckGarbage = val; }
-    IStatObj* GetLodLevel0() override { return m_pLod0; }
-    void SetLodLevel0(IStatObj* lod) override { m_pLod0 = lod; }
-
-    AZStd::vector<SMeshColor>& GetClothData() override { return m_clothData; }
-
-protected:
-    // Called by async stream callback.
-    bool LoadStreamRenderMeshes(const char* filename, const void* pData, const int nDataSize, bool bLod);
-    // Called by sync stream complete callback.
-    void CommitStreamRenderMeshes();
-
-
-    void MergeSubObjectsRenderMeshes(bool bFromStreaming, CStatObj* pLod0, int nLod);
-    void UnMergeSubObjectsRenderMeshes();
-    bool CanMergeSubObjects();
-    bool IsMatIDReferencedByObj(uint16 matID);
-
-    //  bool LoadCGF_Info( const char *filename );
-    CStatObj* MakeStatObjFromCgfNode(CContentCGF* pCGF, CNodeCGF* pNode, bool bLod, int nLoadingFlags, AABB& commonBBox);
-    void ParseProperties();
-
-    void CalcRadiuses();
-    void GetStatisticsNonRecursive(SStatistics& stats);
-
-
-    // Creates static object contents from mesh.
-    // Return true if successful.
-    _smart_ptr<IRenderMesh> MakeRenderMesh(CMesh* pMesh, bool bDoRenderMesh);
-    void MakeRenderMesh();
-
-
-    const char* stristr(const char* szString, const char* szSubstring)
-    {
-        int nSuperstringLength = (int)strlen(szString);
-        int nSubstringLength = (int)strlen(szSubstring);
-
-        for (int nSubstringPos = 0; nSubstringPos <= nSuperstringLength - nSubstringLength; ++nSubstringPos)
-        {
-            if (_strnicmp(szString + nSubstringPos, szSubstring, nSubstringLength) == 0)
-            {
-                return szString + nSubstringPos;
-            }
-        }
-        return NULL;
-    }
-
-    bool CheckForStreamingDependencyLoop(const char* szFilenameDependancy) const;
-
-    void FillClothData(CMesh& mesh);
-
-} _ALIGN(8);
-
-
-//////////////////////////////////////////////////////////////////////////
-// Wrapper around CStatObj that allow rendering of static object with specified parameters.
-//////////////////////////////////////////////////////////////////////////
-class CStatObjWrapper
-    : public CStatObj
-{
-    virtual void Render(const SRendParams& rParams, const SRenderingPassInfo& passInfo);
-private:
-    // Reference Static Object this wrapper was created for.
-    CStatObj* m_pReference;
-};
-
-//////////////////////////////////////////////////////////////////////////
-inline void InitializeSubObject(IStatObj::SSubObject& so)
-{
-    so.localTM.SetIdentity();
-    so.name = "";
-    so.properties = "";
-    so.nType = STATIC_SUB_OBJECT_MESH;
-    so.pWeights = 0;
-    so.nParent = -1;
-    so.tm.SetIdentity();
-    so.bIdentityMatrix = true;
-    so.bHidden = false;
-    so.helperSize = Vec3(0, 0, 0);
-    so.pStatObj = 0;
-    so.bShadowProxy = 0;
-}
-
-#endif // CRYINCLUDE_CRY3DENGINE_STATOBJ_H
diff --git a/Code/CryEngine/Cry3DEngine/StatObjConstr.cpp b/Code/CryEngine/Cry3DEngine/StatObjConstr.cpp
deleted file mode 100644
index 4e9d41d809..0000000000
--- a/Code/CryEngine/Cry3DEngine/StatObjConstr.cpp
+++ /dev/null
@@ -1,2148 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-
-#include "IndexedMesh.h"
-#include "../RenderDll/Common/Shadow_Renderer.h"
-#include <IRenderer.h>
-#include <CrySizer.h>
-#include "ObjMan.h"
-#include "MatMan.h"
-#include "RenderMeshMerger.h"
-
-#include <CryPhysicsDeprecation.h>
-
-#define MAX_VERTICES_MERGABLE 15000
-#define MAX_TRIS_IN_LOD_0 512
-#define TRIS_IN_LOD_WARNING_RAIO (1.5f)
-// Minimal ratio of Lod(n-1)/Lod(n) polygons to consider LOD for sub-object merging.
-#define MIN_TRIS_IN_MERGED_LOD_RAIO (1.5f)
-
-DEFINE_INTRUSIVE_LINKED_LIST(CStatObj)
-
-//////////////////////////////////////////////////////////////////////////
-CStatObj::CStatObj()
-{
-    m_pAsyncUpdateContext = 0;
-    m_nNodeCount = 0;
-    m_nMergedMemoryUsage = 0;
-    m_nUsers = 0; // reference counter
-    m_nLastDrawMainFrameId = 0;
-#ifdef SERVER_CHECKS
-    m_pMesh = NULL;
-#endif
-    m_nFlags = 0;
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-    m_fOcclusionAmount = -1;
-    m_pHeightmap = NULL;
-    m_nHeightmapSize = 0;
-#endif
-    m_pLODs = 0;
-    m_lastBooleanOpScale = 1.f;
-    m_fGeometricMeanFaceArea = 0.f;
-    m_fLodDistance = 0.0f;
-
-    Init();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::Init()
-{
-    m_pAsyncUpdateContext = 0;
-    m_pIndexedMesh = 0;
-    m_lockIdxMesh = 0;
-    m_nRenderTrisCount = m_nLoadedTrisCount = m_nLoadedVertexCount = 0;
-    m_nRenderMatIds = 0;
-    m_fObjectRadius = 0;
-    m_fRadiusHors = 0;
-    m_fRadiusVert = 0;
-    m_pParentObject = 0;
-    m_pClonedSourceObject = 0;
-    m_bVehicleOnlyPhysics = 0;
-    m_bBreakableByGame = 0;
-    m_idmatBreakable = -1;
-
-    m_nLoadedLodsNum = 1;
-    m_nMinUsableLod0 = 0;
-    m_nMaxUsableLod0 = 0;
-    m_nMaxUsableLod = 0;
-    m_pLod0 = 0;
-
-    m_aiVegetationRadius = -1.0f;
-    m_phys_mass = -1.0f;
-    m_phys_density = -1.0f;
-
-    m_vBoxMin.Set(0, 0, 0);
-    m_vBoxMax.Set(0, 0, 0);
-    m_vVegCenter.Set(0, 0, 0);
-
-    m_fGeometricMeanFaceArea = 0.f;
-    m_fLodDistance = 0.0f;
-
-    m_pRenderMesh = 0;
-
-
-    m_bDefaultObject = false;
-
-    if (m_pLODs)
-    {
-        for (int i = 0; i < MAX_STATOBJ_LODS_NUM; i++)
-        {
-            if (m_pLODs[i])
-            {
-                m_pLODs[i]->Init();
-            }
-        }
-    }
-
-    m_pReadStream = 0;
-    m_nSubObjectMeshCount = 0;
-
-    m_nRenderMeshMemoryUsage = 0;
-    m_arrRenderMeshesPotentialMemoryUsage[0] = m_arrRenderMeshesPotentialMemoryUsage[1] = -1;
-
-    m_bCanUnload  = false;
-    m_bLodsLoaded = false;
-    m_bDefaultObject = false;
-    m_bOpenEdgesTested = false;
-    m_bSubObject = false;
-    m_bSharesChildren = false;
-    m_bHasDeformationMorphs = false;
-    m_bTmpIndexedMesh = false;
-    m_bMerged = false;
-    m_bMergedLODs = false;
-    m_bUnmergable = false;
-    m_bLowSpecLod0Set = false;
-    m_bHaveOcclusionProxy = false;
-    m_bCheckGarbage = false;
-    m_bLodsAreLoadedFromSeparateFile = false;
-    m_bNoHitRefinement = false;
-    m_bDontOccludeExplosions = false;
-    m_isDeformable = false;
-    m_isProxyTooBig = false;
-    m_bHasStreamOnlyCGF = true;
-
-    // Assign default material originally.
-    m_pMaterial = GetMatMan()->GetDefaultMaterial();
-
-    m_pLattice = 0;
-    m_pSpines = 0;
-    m_nSpines = 0;
-    m_pBoneMapping = 0;
-    m_pLastBooleanOp = 0;
-    m_pMapFaceToFace0 = 0;
-    m_pClothTangentsData = 0;
-    m_pSkinInfo = 0;
-    m_hasClothTangentsData = m_hasSkinInfo = 0;
-    m_pDelayedSkinParams = 0;
-    m_arrPhysGeomInfo.m_array.clear();
-
-    m_nInitialSubObjHideMask = 0;
-
-#if !defined (_RELEASE)
-    m_fStreamingStart = 0.0f;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-CStatObj::~CStatObj()
-{
-    ShutDown();
-}
-
-void CStatObj::ShutDown()
-{
-    if (m_pReadStream)
-    {
-        // We don't need this stream anymore.
-        m_pReadStream->Abort();
-        m_pReadStream = NULL;
-    }
-
-    SAFE_DELETE(m_pAsyncUpdateContext);
-
-    //  assert (IsHeapValid());
-
-    SAFE_DELETE(m_pIndexedMesh);
-    //  assert (IsHeapValid());
-
-    for (int n = 0; n < m_arrPhysGeomInfo.GetGeomCount(); n++)
-    {
-        if (m_arrPhysGeomInfo[n])
-        {
-            if (m_arrPhysGeomInfo[n]->pGeom->GetForeignData() == (void*)this)
-            {
-                m_arrPhysGeomInfo[n]->pGeom->SetForeignData(0, 0);
-            }
-            // Unregister geometry
-            CRY_PHYSICS_REPLACEMENT_ASSERT();
-        }
-    }
-    m_arrPhysGeomInfo.m_array.clear();
-
-    m_pStreamedRenderMesh = 0;
-    m_pMergedRenderMesh = 0;
-    SetRenderMesh(0);
-#ifdef SERVER_CHECKS
-    SAFE_DELETE(m_pMesh);
-#endif
-
-    //  assert (IsHeapValid());
-
-    /* // SDynTexture is not accessible for 3dengine
-
-        for(int i=0; i<FAR_TEX_COUNT; i++)
-            if(m_arrSpriteTexPtr[i])
-                m_arrSpriteTexPtr[i]->ReleaseDynamicRT(true);
-
-        for(int i=0; i<FAR_TEX_COUNT_60; i++)
-            if(m_arrSpriteTexPtr_60[i])
-                m_arrSpriteTexPtr_60[i]->ReleaseDynamicRT(true);
-    */
-
-    SAFE_RELEASE(m_pLattice);
-
-    if (m_pLODs)
-    {
-        for (int i = 0; i < MAX_STATOBJ_LODS_NUM; i++)
-        {
-            if (m_pLODs[i])
-            {
-                if (m_pLODs[i]->m_pParentObject)
-                {
-                    GetObjManager()->UnregisterForStreaming(m_pLODs[i]->m_pParentObject);
-                }
-                else
-                {
-                    GetObjManager()->UnregisterForStreaming(m_pLODs[i]);
-                }
-
-                // Sub objects do not own the LODs, so they should not delete them.
-                m_pLODs[i] = 0;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Handle sub-objects and parents.
-    //////////////////////////////////////////////////////////////////////////
-    for (size_t i = 0; i < m_subObjects.size(); i++)
-    {
-        CStatObj* pChildObj = (CStatObj*)m_subObjects[i].pStatObj;
-        if (pChildObj)
-        {
-            if (!m_bSharesChildren)
-            {
-                pChildObj->m_pParentObject = NULL;
-            }
-            GetObjManager()->UnregisterForStreaming(pChildObj);
-            pChildObj->Release();
-        }
-    }
-    m_subObjects.clear();
-
-    if (m_pParentObject && !m_pParentObject->m_subObjects.empty())
-    {
-        // Remove this StatObject from sub-objects of the parent.
-        SSubObject* pSubObjects = &m_pParentObject->m_subObjects[0];
-        for (int i = 0, num = m_pParentObject->m_subObjects.size(); i < num; i++)
-        {
-            if (pSubObjects[i].pStatObj == this)
-            {
-                m_pParentObject->m_subObjects.erase(m_pParentObject->m_subObjects.begin() + i);
-                break;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    if (m_pMapFaceToFace0)
-    {
-        delete[] m_pMapFaceToFace0;
-    }
-    m_pMapFaceToFace0 = 0;
-    if (m_hasClothTangentsData && !m_pClonedSourceObject)
-    {
-        delete[] m_pClothTangentsData;
-    }
-    if (m_hasSkinInfo && !m_pClonedSourceObject)
-    {
-        delete[] m_pSkinInfo;
-    }
-    m_pClothTangentsData = 0;
-    m_hasClothTangentsData = 0;
-    m_pSkinInfo = 0;
-    m_hasSkinInfo = 0;
-
-    SAFE_DELETE(m_pDelayedSkinParams);
-
-    SAFE_RELEASE(m_pClonedSourceObject);
-
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-    m_fOcclusionAmount = -1;
-    SAFE_DELETE_ARRAY(m_pHeightmap);
-    m_pHeightmap = 0;
-#endif
-
-    GetObjManager()->UnregisterForStreaming(this);
-
-    SAFE_DELETE_ARRAY(m_pLODs);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CStatObj::Release()
-{
-    // Has to be thread safe, as it can be called by a worker thread for deferred plane breaks
-    int newRef = CryInterlockedDecrement(&m_nUsers);
-    if (newRef <= 1)
-    {
-        if (m_pParentObject && m_pParentObject->m_nUsers <= 0)
-        {
-            GetObjManager()->CheckForGarbage(m_pParentObject);
-        }
-        if (newRef <= 0)
-        {
-            GetObjManager()->CheckForGarbage(this);
-        }
-    }
-    return newRef;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CStatObj::operator new ([[maybe_unused]] size_t size)
-{
-    IObjManager* pObjManager = GetObjManager();
-    assert(size == sizeof(CStatObj));
-    return pObjManager->AllocateStatObj();
-}
-
-void CStatObj::operator delete (void* pToFree)
-{
-    IObjManager* pObjManager = GetObjManager();
-    pObjManager->FreeStatObj((CStatObj*)pToFree);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::FreeIndexedMesh()
-{
-    if (!m_lockIdxMesh)
-    {
-        WriteLock lock(m_lockIdxMesh);
-        delete m_pIndexedMesh;
-        m_pIndexedMesh = 0;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::CalcRadiuses()
-{
-    if (!m_vBoxMin.IsValid() || !m_vBoxMax.IsValid())
-    {
-        Error("CStatObj::CalcRadiuses: Invalid bbox, File name: %s", m_szFileName.c_str());
-        m_vBoxMin.zero();
-        m_vBoxMax.zero();
-    }
-
-    m_fObjectRadius = m_vBoxMin.GetDistance(m_vBoxMax) * 0.5f;
-    float dxh = (float)max(fabs(GetBoxMax().x), fabs(GetBoxMin().x));
-    float dyh = (float)max(fabs(GetBoxMax().y), fabs(GetBoxMin().y));
-    m_fRadiusHors = (float)sqrt_tpl(dxh * dxh + dyh * dyh);
-    m_fRadiusVert = (GetBoxMax().z - 0) * 0.5f;// never change this
-    m_vVegCenter = (m_vBoxMax + m_vBoxMin) * 0.5f;
-    m_vVegCenter.z = m_fRadiusVert;
-}
-
-void CStatObj::MakeRenderMesh()
-{
-    if (gEnv->IsDedicated())
-    {
-        return;
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-
-    SetRenderMesh(0);
-
-    if (!m_pIndexedMesh || m_pIndexedMesh->GetSubSetCount() == 0)
-    {
-        return;
-    }
-
-    CMesh* pMesh = m_pIndexedMesh->GetMesh();
-
-    m_nRenderTrisCount = 0;
-    //////////////////////////////////////////////////////////////////////////
-    // Initialize Mesh subset material flags.
-    //////////////////////////////////////////////////////////////////////////
-    for (int i = 0; i < pMesh->GetSubSetCount(); i++)
-    {
-        SMeshSubset& subset = pMesh->m_subsets[i];
-        if (!(subset.nMatFlags & MTL_FLAG_NODRAW))
-        {
-            m_nRenderTrisCount += subset.nNumIndices / 3;
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-    if (!m_nRenderTrisCount)
-    {
-        return;
-    }
-
-    if (!(GetFlags() & STATIC_OBJECT_DYNAMIC))
-    {
-        m_pRenderMesh = GetRenderer()->CreateRenderMesh("StatObj_Static", GetFilePath(), NULL, eRMT_Static);
-    }
-    else
-    {
-        m_pRenderMesh = GetRenderer()->CreateRenderMesh("StatObj_Dynamic", GetFilePath(), NULL, eRMT_Dynamic);
-        m_pRenderMesh->KeepSysMesh(true);
-    }
-
-    SMeshBoneMapping_uint16* const pBoneMap = pMesh->m_pBoneMapping;
-    pMesh->m_pBoneMapping = 0;
-    uint32 nFlags = 0;
-    nFlags |= (!GetCVars()->e_StreamCgf && Get3DEngine()->m_bInLoad) ? FSM_SETMESH_ASYNC : 0;
-    m_pRenderMesh->SetMesh(*pMesh, 0, nFlags, false);
-    pMesh->m_pBoneMapping = pBoneMap;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::SetMaterial(_smart_ptr<IMaterial> pMaterial)
-{
-    m_pMaterial = pMaterial;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-Vec3 CStatObj::GetHelperPos(const char* szHelperName)
-{
-    SSubObject* pSubObj = FindSubObject(szHelperName);
-    if (!pSubObj)
-    {
-        return Vec3(0, 0, 0);
-    }
-
-    return Vec3(pSubObj->tm.m03, pSubObj->tm.m13, pSubObj->tm.m23);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-const Matrix34& CStatObj::GetHelperTM(const char* szHelperName)
-{
-    SSubObject* pSubObj = FindSubObject(szHelperName);
-
-    if (!pSubObj)
-    {
-        static Matrix34 identity(IDENTITY);
-        return identity;
-    }
-
-    return pSubObj->tm;
-}
-
-bool CStatObj::IsSameObject(const char* szFileName, const char* szGeomName)
-{
-    // cmp object names
-    if (szGeomName)
-    {
-        if (azstricmp(szGeomName, m_szGeomName) != 0)
-        {
-            return false;
-        }
-    }
-
-    // Normalize file name
-    char szFileNameNorm[MAX_PATH_LENGTH] = "";
-    char* pszDest = szFileNameNorm;
-    const char* pszSource = szFileName;
-    while (*pszSource)
-    {
-        if (*pszSource == '\\')
-        {
-            *pszDest++ = '/';
-        }
-        else
-        {
-            *pszDest++ = *pszSource;
-        }
-        pszSource++;
-    }
-    *pszDest = 0;
-
-    // cmp file names
-    if (azstricmp(szFileNameNorm, m_szFileName) != 0)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void CStatObj::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Self");
-        pSizer->AddObject(this, sizeof(*this));
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "subObjects");
-        pSizer->AddObject(m_subObjects);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Strings");
-        pSizer->AddObject(m_szFileName);
-        pSizer->AddObject(m_szGeomName);
-        pSizer->AddObject(m_szProperties);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Material");
-        pSizer->AddObject(m_pMaterial);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "PhysGeomInfo");
-        pSizer->AddObject(m_arrPhysGeomInfo);
-    }
-
-    if (m_pLODs)
-    {
-        for (int i = 1; i < MAX_STATOBJ_LODS_NUM; i++)
-        {
-            SIZER_COMPONENT_NAME(pSizer, "StatObjLods");
-            pSizer->AddObject(m_pLODs[i]);
-        }
-    }
-
-    if (m_pIndexedMesh)
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Mesh");
-        pSizer->AddObject(m_pIndexedMesh);
-    }
-
-
-    int nVtx = 0;
-    if (m_pIndexedMesh)
-    {
-        nVtx = m_pIndexedMesh->GetVertexCount();
-    }
-    else if (m_pRenderMesh)
-    {
-        nVtx = m_pRenderMesh->GetVerticesCount();
-    }
-
-    if (m_pSpines)
-    {
-        SIZER_COMPONENT_NAME(pSizer, "StatObj Foliage Data");
-        pSizer->AddObject(m_pSpines, sizeof(m_pSpines[0]), m_nSpines);
-        if (m_pBoneMapping)
-        {
-            pSizer->AddObject(m_pBoneMapping, sizeof(m_pBoneMapping[0]), nVtx);
-        }
-        for (int i = 0; i < m_nSpines; i++)
-        {
-            pSizer->AddObject(m_pSpines[i].pVtx, sizeof(Vec3) * 2 + sizeof(Vec4), m_pSpines[i].nVtx);
-        }
-    }
-
-    if (m_hasClothTangentsData && (!m_pClonedSourceObject || m_pClonedSourceObject == this))
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Deformable StatObj ClothTangents");
-        pSizer->AddObject(m_pClothTangentsData, nVtx * sizeof(m_pClothTangentsData[0]));
-    }
-
-    if (m_hasSkinInfo && (!m_pClonedSourceObject || m_pClonedSourceObject == this))
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Deformable StatObj SkinData");
-        pSizer->AddObject(m_pSkinInfo, (nVtx + 1) * sizeof(m_pSkinInfo[0]));
-    }
-
-    if (m_pMapFaceToFace0)
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Deformable StatObj Mesh");
-        pSizer->AddObject(m_pMapFaceToFace0, sizeof(m_pMapFaceToFace0[0]) * max(m_nLoadedTrisCount, m_nRenderTrisCount));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::SetLodObject(int nLod, IStatObj* pLod)
-{
-    assert(nLod > 0 && nLod < MAX_STATOBJ_LODS_NUM);
-    if (nLod <= 0 || nLod >= MAX_STATOBJ_LODS_NUM)
-    {
-        return;
-    }
-
-    if (strstr(m_szProperties, "lowspeclod0"))
-    {
-        m_bLowSpecLod0Set = true;
-    }
-
-    bool bLodCompound = pLod && (pLod->GetFlags() & STATIC_OBJECT_COMPOUND) != 0;
-
-    if (pLod && !bLodCompound)
-    {
-        // Check if low lod decrease amount of used materials.
-        int nPrevLodMatIds = m_nRenderMatIds;
-        int nPrevLodTris = m_nLoadedTrisCount;
-        if (nLod > 1 && m_pLODs && m_pLODs[nLod - 1])
-        {
-            nPrevLodMatIds = m_pLODs[nLod - 1]->m_nRenderMatIds;
-            nPrevLodTris = m_pLODs[nLod - 1]->m_nLoadedTrisCount;
-        }
-
-        if (GetCVars()->e_LodsForceUse)
-        {
-            if ((int)m_nMaxUsableLod < nLod)
-            {
-                m_nMaxUsableLod = nLod;
-            }
-        }
-        else
-        {
-            int min_tris = GetCVars()->e_LodMinTtris;
-            if (((pLod->GetLoadedTrisCount() >= min_tris || nPrevLodTris >= (3 * min_tris) / 2)
-                 || pLod->GetRenderMatIds() < nPrevLodMatIds) && nLod > (int)m_nMaxUsableLod)
-            {
-                m_nMaxUsableLod = nLod;
-            }
-        }
-
-        if (m_pParentObject && (m_pParentObject->m_nMaxUsableLod < m_nMaxUsableLod))
-        {
-            m_pParentObject->m_nMaxUsableLod = m_nMaxUsableLod;
-        }
-
-        pLod->SetLodLevel0(this);
-        pLod->SetMaterial(m_pMaterial); // Lod must use same material as parent.
-
-        if (pLod->GetLoadedTrisCount() > MAX_TRIS_IN_LOD_0)
-        {
-            if ((strstr(pLod->GetProperties(), "lowspeclod0") != 0) && !m_bLowSpecLod0Set)
-            {
-                m_bLowSpecLod0Set = true;
-                m_nMaxUsableLod0 = nLod;
-            }
-            if (!m_bLowSpecLod0Set)
-            {
-                m_nMaxUsableLod0 = nLod;
-            }
-        }
-        if (nLod + 1 > (int)m_nLoadedLodsNum)
-        {
-            m_nLoadedLodsNum = nLod + 1;
-        }
-
-        // When assigning lod to child object.
-        if (m_pParentObject)
-        {
-            if (nLod + 1 > (int)m_pParentObject->m_nLoadedLodsNum)
-            {
-                m_pParentObject->m_nLoadedLodsNum = nLod + 1;
-            }
-        }
-    }
-
-    if (pLod && bLodCompound)
-    {
-        m_nMaxUsableLod = nLod;
-        pLod->SetUnmergable(m_bUnmergable);
-    }
-
-    if (!m_pLODs && pLod)
-    {
-        m_pLODs = new _smart_ptr<CStatObj>[MAX_STATOBJ_LODS_NUM];
-    }
-
-    if (m_pLODs)
-    {
-        m_pLODs[nLod] = (CStatObj*)pLod;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IStatObj* CStatObj::GetLodObject(int nLodLevel, bool bReturnNearest)
-{
-    if (nLodLevel < 1)
-    {
-        return this;
-    }
-
-    if (!m_pLODs)
-    {
-        if (bReturnNearest || nLodLevel == 0)
-        {
-            return this;
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-
-    if (bReturnNearest)
-    {
-        nLodLevel = CLAMP(nLodLevel, 0, MAX_STATOBJ_LODS_NUM - 1);
-    }
-
-    CStatObj* pLod = 0;
-    if (nLodLevel < MAX_STATOBJ_LODS_NUM)
-    {
-        pLod = m_pLODs[nLodLevel];
-
-        // Look up
-        if (bReturnNearest && !pLod)
-        {
-            // Find highest existing lod looking up.
-            int lod = nLodLevel;
-            while (lod > 0 && m_pLODs[lod] == 0)
-            {
-                lod--;
-            }
-            if (lod > 0)
-            {
-                pLod = m_pLODs[lod];
-            }
-            else
-            {
-                pLod = this;
-            }
-        }
-        // Look down
-        if (bReturnNearest && !pLod)
-        {
-            // Find highest existing lod looking down.
-            for (int lod = nLodLevel + 1; lod < MAX_STATOBJ_LODS_NUM; lod++)
-            {
-                if (m_pLODs[lod])
-                {
-                    pLod = m_pLODs[lod];
-                    break;
-                }
-            }
-        }
-    }
-
-    return pLod;
-}
-
-bool CStatObj::IsPhysicsExist()
-{
-    return m_arrPhysGeomInfo.GetGeomCount() > 0;
-}
-
-bool CStatObj::IsSphereOverlap(const Sphere& sSphere)
-{
-    if (m_pRenderMesh && Overlap::Sphere_AABB(sSphere, AABB(m_vBoxMin, m_vBoxMax)))
-    { // if inside bbox
-        int nPosStride = 0;
-        int nInds = m_pRenderMesh->GetIndicesCount();
-        const byte* pPos = m_pRenderMesh->GetPosPtr(nPosStride, FSL_READ);
-        vtx_idx* pInds = m_pRenderMesh->GetIndexPtr(FSL_READ);
-
-        if (pInds && pPos)
-        {
-            for (int i = 0; (i + 2) < nInds; i += 3)
-            { // test all triangles of water surface strip
-                Vec3 v0 = (*(Vec3*)&pPos[nPosStride * pInds[i + 0]]);
-                Vec3 v1 = (*(Vec3*)&pPos[nPosStride * pInds[i + 1]]);
-                Vec3 v2 = (*(Vec3*)&pPos[nPosStride * pInds[i + 2]]);
-                Vec3 vBoxMin = v0;
-                vBoxMin.CheckMin(v1);
-                vBoxMin.CheckMin(v2);
-                Vec3 vBoxMax = v0;
-                vBoxMax.CheckMax(v1);
-                vBoxMax.CheckMax(v2);
-
-                if (Overlap::Sphere_AABB(sSphere, AABB(vBoxMin, vBoxMax)))
-                {
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::Invalidate(bool bPhysics, float tolerance)
-{
-    AZ_UNUSED(bPhysics);
-    AZ_UNUSED(tolerance);
-
-    if (m_pIndexedMesh)
-    {
-        if (m_pIndexedMesh->GetIndexCount() > 0)
-        {
-            m_pIndexedMesh->CalcBBox();
-
-            m_vBoxMin = m_pIndexedMesh->m_bbox.min;
-            m_vBoxMax = m_pIndexedMesh->m_bbox.max;
-
-            MakeRenderMesh();
-            m_nLoadedVertexCount = m_pIndexedMesh->GetVertexCount();
-            m_nLoadedTrisCount = m_pIndexedMesh->GetFaceCount();
-            if (!m_nLoadedTrisCount)
-            {
-                m_nLoadedTrisCount = m_pIndexedMesh->GetIndexCount() / 3;
-            }
-            CalcRadiuses();
-        }
-
-        ReleaseIndexedMesh(true);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Iterate through sub objects and update hide mask and sub obj mesh count.
-    //////////////////////////////////////////////////////////////////////////
-    m_nSubObjectMeshCount = 0;
-    for (size_t i = 0, numsub = m_subObjects.size(); i < numsub; i++)
-    {
-        SSubObject& subObj = m_subObjects[i];
-        if (subObj.pStatObj && subObj.nType == STATIC_SUB_OBJECT_MESH)
-        {
-            m_nSubObjectMeshCount++;
-        }
-    }
-
-    UnMergeSubObjectsRenderMeshes();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IStatObj* CStatObj::Clone(bool bCloneGeometry, bool bCloneChildren, bool bMeshesOnly)
-{
-    if (m_bDefaultObject)
-    {
-        return this;
-    }
-
-
-
-    CStatObj* pNewObj = new CStatObj;
-
-    pNewObj->m_pClonedSourceObject = m_pClonedSourceObject ? m_pClonedSourceObject : this;
-    pNewObj->m_pClonedSourceObject->AddRef(); // Cloned object will keep a reference to this.
-
-    pNewObj->m_nLoadedTrisCount = m_nLoadedTrisCount;
-    pNewObj->m_nLoadedVertexCount = m_nLoadedVertexCount;
-    pNewObj->m_nRenderTrisCount = m_nRenderTrisCount;
-
-    if (bCloneGeometry)
-    {
-        if (m_bMerged)
-        {
-            UnMergeSubObjectsRenderMeshes();
-        }
-        if (m_pIndexedMesh && !m_bMerged)
-        {
-            pNewObj->m_pIndexedMesh = new CIndexedMesh;
-            pNewObj->m_pIndexedMesh->Copy(*m_pIndexedMesh->GetMesh());
-        }
-        if (m_pRenderMesh && !m_bMerged)
-        {
-            _smart_ptr<IRenderMesh> pRenderMesh = GetRenderer()->CreateRenderMesh(
-                    "StatObj_Cloned",
-                    pNewObj->GetFilePath(),
-                    NULL,
-                    ((GetFlags() & STATIC_OBJECT_DYNAMIC) ? eRMT_Dynamic : eRMT_Static));
-
-            m_pRenderMesh->CopyTo(pRenderMesh);
-            pNewObj->SetRenderMesh(pRenderMesh);
-        }
-    }
-    else
-    {
-        if (m_pRenderMesh)
-        {
-            if (m_pMergedRenderMesh != m_pRenderMesh)
-            {
-                pNewObj->SetRenderMesh(m_pRenderMesh);
-            }
-            else
-            {
-                pNewObj->m_pRenderMesh = m_pRenderMesh;
-            }
-        }
-        pNewObj->m_pMergedRenderMesh = m_pMergedRenderMesh;
-        pNewObj->m_bMerged = m_pMergedRenderMesh != NULL;
-    }
-
-    pNewObj->m_szFileName = m_szFileName;
-    pNewObj->m_szGeomName = m_szGeomName;
-
-    pNewObj->m_cgfNodeName = m_cgfNodeName;
-
-    // Default material.
-    pNewObj->m_pMaterial = m_pMaterial;
-
-    //*pNewObj->m_arrSpriteTexID = *m_arrSpriteTexID;
-
-    pNewObj->m_fObjectRadius = m_fObjectRadius;
-
-    for (int i = 0; i < m_arrPhysGeomInfo.GetGeomCount(); i++)
-    {
-        pNewObj->m_arrPhysGeomInfo.SetPhysGeom(m_arrPhysGeomInfo[i], i, m_arrPhysGeomInfo.GetGeomType(i));
-        if (pNewObj->m_arrPhysGeomInfo[i])
-        {
-            // Remove geometry
-            CRY_PHYSICS_REPLACEMENT_ASSERT();
-        }
-    }
-    pNewObj->m_vBoxMin = m_vBoxMin;
-    pNewObj->m_vBoxMax = m_vBoxMax;
-    pNewObj->m_vVegCenter = m_vVegCenter;
-
-    pNewObj->m_fGeometricMeanFaceArea = m_fGeometricMeanFaceArea;
-
-    pNewObj->m_fRadiusHors = m_fRadiusHors;
-    pNewObj->m_fRadiusVert = m_fRadiusVert;
-
-    pNewObj->m_nFlags = m_nFlags | STATIC_OBJECT_CLONE;
-
-    pNewObj->m_fLodDistance = m_fLodDistance;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Internal Flags.
-    //////////////////////////////////////////////////////////////////////////
-    pNewObj->m_bCanUnload = false;
-    pNewObj->m_bDefaultObject = m_bDefaultObject;
-    pNewObj->m_bOpenEdgesTested = m_bOpenEdgesTested;
-    pNewObj->m_bSubObject = false; // [anton] since parent is not copied anyway
-    pNewObj->m_bVehicleOnlyPhysics = m_bVehicleOnlyPhysics;
-    pNewObj->m_idmatBreakable = m_idmatBreakable;
-    pNewObj->m_bBreakableByGame = m_bBreakableByGame;
-    pNewObj->m_bHasDeformationMorphs = m_bHasDeformationMorphs;
-    pNewObj->m_bTmpIndexedMesh = m_bTmpIndexedMesh;
-    pNewObj->m_bHaveOcclusionProxy = m_bHaveOcclusionProxy;
-    pNewObj->m_bHasStreamOnlyCGF = m_bHasStreamOnlyCGF;
-    pNewObj->m_eStreamingStatus = m_eStreamingStatus;
-    //////////////////////////////////////////////////////////////////////////
-
-    int numSubObj = (int)m_subObjects.size();
-    if (bMeshesOnly)
-    {
-        numSubObj = 0;
-        for (size_t i = 0; i < m_subObjects.size(); i++)
-        {
-            if (m_subObjects[i].nType == STATIC_SUB_OBJECT_MESH)
-            {
-                numSubObj++;
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-    pNewObj->m_subObjects.reserve(numSubObj);
-    for (int i = 0; i < numSubObj; i++)
-    {
-        pNewObj->m_subObjects.push_back(m_subObjects[i]);
-        if (m_subObjects[i].pStatObj)
-        {
-            if (bCloneChildren)
-            {
-                pNewObj->m_subObjects[i].pStatObj = m_subObjects[i].pStatObj->Clone(bCloneGeometry, bCloneChildren, bMeshesOnly);
-                pNewObj->m_subObjects[i].pStatObj->AddRef();
-                ((CStatObj*)(pNewObj->m_subObjects[i].pStatObj))->m_pParentObject = pNewObj;
-            }
-            else
-            {
-                m_subObjects[i].pStatObj->AddRef();
-                ((CStatObj*)(m_subObjects[i].pStatObj))->m_nFlags |= STATIC_OBJECT_MULTIPLE_PARENTS;
-            }
-        }
-    }
-    pNewObj->m_nSubObjectMeshCount = m_nSubObjectMeshCount;
-    if (!bCloneChildren)
-    {
-        pNewObj->m_bSharesChildren = true;
-    }
-
-    pNewObj->m_hasClothTangentsData = m_hasClothTangentsData;
-    if (pNewObj->m_hasClothTangentsData)
-    {
-        pNewObj->m_pClothTangentsData = m_pClothTangentsData;
-    }
-
-    pNewObj->m_hasSkinInfo = m_hasSkinInfo;
-    if (pNewObj->m_hasSkinInfo)
-    {
-        pNewObj->m_pSkinInfo = m_pSkinInfo;
-    }
-
-    return pNewObj;
-}
-//////////////////////////////////////////////////////////////////////////
-
-IIndexedMesh* CStatObj::GetIndexedMesh(bool bCreateIfNone)
-{
-    WriteLock lock(m_lockIdxMesh);
-    if (m_pIndexedMesh)
-    {
-        return m_pIndexedMesh;
-    }
-    else if (m_pRenderMesh && bCreateIfNone)
-    {
-        if (m_pRenderMesh->GetIndexedMesh(m_pIndexedMesh = new CIndexedMesh) == NULL)
-        {
-            // GetIndexMesh will free the IndexedMesh object if an allocation failed
-            m_pIndexedMesh = NULL;
-            return NULL;
-        }
-
-        CMesh* pMesh = m_pIndexedMesh->GetMesh();
-        if (!pMesh || pMesh->m_subsets.size() <= 0)
-        {
-            m_pIndexedMesh->Release();
-            m_pIndexedMesh = 0;
-            return 0;
-        }
-        m_bTmpIndexedMesh = true;
-
-        int i, j, i0 = pMesh->m_subsets[0].nFirstVertId + pMesh->m_subsets[0].nNumVerts;
-        for (i = j = 1; i < pMesh->m_subsets.size(); i++)
-        {
-            if (pMesh->m_subsets[i].nFirstVertId - i0 < pMesh->m_subsets[j].nFirstVertId - i0)
-            {
-                j = i;
-            }
-        }
-        if (j < pMesh->m_subsets.size() && pMesh->m_subsets[0].nPhysicalizeType == PHYS_GEOM_TYPE_DEFAULT &&
-            pMesh->m_subsets[j].nPhysicalizeType != PHYS_GEOM_TYPE_DEFAULT && pMesh->m_subsets[j].nFirstVertId > i0)
-        {
-            pMesh->m_subsets[j].nNumVerts += pMesh->m_subsets[j].nFirstVertId - i0;
-            pMesh->m_subsets[j].nFirstVertId = i0;
-        }
-        return m_pIndexedMesh;
-    }
-    return 0;
-}
-
-IIndexedMesh* CStatObj::CreateIndexedMesh()
-{
-    if (!m_pIndexedMesh)
-    {
-        m_pIndexedMesh = new CIndexedMesh();
-    }
-
-    return m_pIndexedMesh;
-}
-
-void CStatObj::ReleaseIndexedMesh(bool bRenderMeshUpdated)
-{
-    WriteLock lock(m_lockIdxMesh);
-    if (m_bTmpIndexedMesh && m_pIndexedMesh)
-    {
-        int istart, iend;
-        CMesh* pMesh = m_pIndexedMesh->GetMesh();
-        if (m_pRenderMesh && !bRenderMeshUpdated)
-        {
-            TRenderChunkArray& Chunks = m_pRenderMesh->GetChunks();
-            for (int i = 0; i < pMesh->m_subsets.size(); i++)
-            {
-                Chunks[i].m_nMatFlags |= pMesh->m_subsets[i].nMatFlags & 1 << 30;
-            }
-        }
-        if (bRenderMeshUpdated && m_pBoneMapping)
-        {
-            for (int i = iend = 0; i < (int)pMesh->m_subsets.size(); i++)
-            {
-                if ((pMesh->m_subsets[i].nMatFlags & (MTL_FLAG_NOPHYSICALIZE | MTL_FLAG_NODRAW)) == MTL_FLAG_NOPHYSICALIZE)
-                {
-                    for (istart = iend++; iend < (int)m_chunkBoneIds.size() && m_chunkBoneIds[iend]; iend++)
-                    {
-                        ;
-                    }
-                    if (!pMesh->m_subsets[i].nNumIndices)
-                    {
-                        m_chunkBoneIds.erase(m_chunkBoneIds.begin() + istart, m_chunkBoneIds.begin() + iend);
-                        iend = istart;
-                    }
-                }
-            }
-        }
-        m_pIndexedMesh->Release();
-        m_pIndexedMesh = 0;
-        m_bTmpIndexedMesh = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static bool SubObjectsOfCompoundHaveLOD(const CStatObj* pStatObj, int nLod)
-{
-    int numSubObjects = pStatObj->GetSubObjectCount();
-    for (int i = 0; i < numSubObjects; ++i)
-    {
-        const IStatObj::SSubObject* pSubObject = const_cast<CStatObj*>(pStatObj)->GetSubObject(i);
-        if (!pSubObject)
-        {
-            continue;
-        }
-        const CStatObj* pChildObj = (const CStatObj*)pSubObject->pStatObj;
-        if (!pChildObj)
-        {
-            continue;
-        }
-        if (!pChildObj->m_pLODs)
-        {
-            continue;
-        }
-        const CStatObj* pLod = pChildObj->m_pLODs[nLod];
-        if (pLod)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::TryMergeSubObjects(bool bFromStreaming)
-{
-    // sub meshes merging
-    if (GetCVars()->e_StatObjMerge)
-    {
-        if (!m_bUnmergable && !IsDeformable())
-        {
-            MergeSubObjectsRenderMeshes(bFromStreaming, this, 0);
-
-            if (!bFromStreaming && !m_pLODs && m_nFlags & STATIC_OBJECT_COMPOUND)
-            {
-                // Check if LODs were not split (production mode)
-                for (int i = 1; i < MAX_STATOBJ_LODS_NUM; ++i)
-                {
-                    if (!SubObjectsOfCompoundHaveLOD(this, i))
-                    {
-                        continue;
-                    }
-
-                    CStatObj* pStatObj = new CStatObj();
-                    pStatObj->m_szFileName = m_szFileName;
-                    char lodName[32];
-                    azstrcpy(lodName, 32, "-mlod");
-                    azltoa(i, lodName + 5, AZ_ARRAY_SIZE(lodName) - 5, 10);
-                    pStatObj->m_szFileName.append(lodName);
-                    pStatObj->m_szGeomName = m_szGeomName;
-                    pStatObj->m_bSubObject = true;
-
-                    SetLodObject(i, pStatObj);
-                    m_bMergedLODs = true;
-                }
-            }
-
-            if (m_pLODs)
-            {
-                for (int i = 1; i < MAX_STATOBJ_LODS_NUM; i++)
-                {
-                    if (m_pLODs[i])
-                    {
-                        m_pLODs[i]->MergeSubObjectsRenderMeshes(bFromStreaming, this, i);
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::MergeSubObjectsRenderMeshes(bool bFromStreaming, CStatObj* pLod0, int nLod)
-{
-    if (m_bUnmergable)
-    {
-        return;
-    }
-
-    FUNCTION_PROFILER_3DENGINE;
-    LOADING_TIME_PROFILE_SECTION;
-
-    m_bMerged = false;
-    m_pMergedRenderMesh = 0;
-
-    int nSubObjCount = (int)pLod0->m_subObjects.size();
-
-    std::vector<SRenderMeshInfoInput> lstRMI;
-
-    SRenderMeshInfoInput rmi;
-
-    rmi.pMat = m_pMaterial;
-    rmi.mat.SetIdentity();
-    rmi.pMesh = 0;
-    rmi.pSrcRndNode = 0;
-
-    for (int s = 0; s < nSubObjCount; s++)
-    {
-        CStatObj::SSubObject* pSubObj = &pLod0->m_subObjects[s];
-        if (pSubObj->pStatObj && pSubObj->nType == STATIC_SUB_OBJECT_MESH)
-        {
-            CStatObj* pStatObj = (CStatObj*)pSubObj->pStatObj->GetLodObject(nLod, true); // Get lod, if not exist get lowest existing.
-            if (pStatObj)
-            {
-                CryAutoCriticalSection lock(pStatObj->m_streamingMeshLock);
-                if (pStatObj->m_pRenderMesh || pStatObj->m_pStreamedRenderMesh)
-                {
-                    rmi.pMesh = pStatObj->m_pRenderMesh ? pStatObj->m_pRenderMesh : pStatObj->m_pStreamedRenderMesh;
-                    rmi.mat = pSubObj->tm;
-                    rmi.bIdentityMatrix = pSubObj->bIdentityMatrix;
-                    rmi.nSubObjectIndex = s;
-                    lstRMI.push_back(rmi);
-                }
-            }
-        }
-    }
-
-    _smart_ptr<IRenderMesh> pMergedMesh = 0;
-    if (lstRMI.size() == 1 && lstRMI[0].bIdentityMatrix)
-    {
-        // If identity matrix and only mesh-subobject use it as a merged render mesh.
-        pMergedMesh = rmi.pMesh;
-    }
-    else if (!lstRMI.empty())
-    {
-        SMergeInfo info;
-        info.sMeshName = GetFilePath();
-        info.sMeshType = "StatObj_Merged";
-        info.bMergeToOneRenderMesh = true;
-        info.pUseMaterial = m_pMaterial;
-        pMergedMesh = GetSharedRenderMeshMerger()->MergeRenderMeshes(&lstRMI[0], lstRMI.size(), info);
-    }
-
-    if (pMergedMesh)
-    {
-        if (bFromStreaming)
-        {
-            CryAutoCriticalSection lock(m_streamingMeshLock);
-            m_pMergedRenderMesh = pMergedMesh;
-            m_pStreamedRenderMesh = pMergedMesh;
-        }
-        else
-        {
-            m_pMergedRenderMesh = pMergedMesh;
-            SetRenderMesh(pMergedMesh);
-        }
-
-        m_bMerged = true;
-        if (m_pLod0)
-        {
-            // Make sure upmost lod is also marked to be merged.
-            m_pLod0->SetMerged(true);
-        }
-    }
-}
-
-bool CStatObj::IsMatIDReferencedByObj(uint16 matID)
-{
-    //Check root obj
-    if (IRenderMesh* pRenderMesh = GetRenderMesh())
-    {
-        TRenderChunkArray& Chunks = pRenderMesh->GetChunks();
-
-        for (int nChunkId = 0; nChunkId < Chunks.size(); nChunkId++)
-        {
-            if (Chunks[nChunkId].m_nMatID == matID)
-            {
-                return true;
-            }
-        }
-    }
-
-    //check children
-    int nSubObjCount = (int)m_subObjects.size();
-    for (int s = 0; s < nSubObjCount; s++)
-    {
-        CStatObj::SSubObject* pSubObj = &m_subObjects[s];
-
-        if (pSubObj->pStatObj)
-        {
-            CStatObj* pSubStatObj = (CStatObj*)pSubObj->pStatObj;
-
-            if (IRenderMesh* pSubRenderMesh = pSubStatObj->GetRenderMesh())
-            {
-                TRenderChunkArray& Chunks = pSubRenderMesh->GetChunks();
-
-                for (int nChunkId = 0; nChunkId < Chunks.size(); nChunkId++)
-                {
-                    if (Chunks[nChunkId].m_nMatID == matID)
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::CanMergeSubObjects()
-{
-    if (gEnv->IsDedicated())
-    {
-        return false;
-    }
-
-    if (!m_clothData.empty())
-    {
-        return false;
-    }
-
-    int nSubMeshes = 0;
-    int nTotalVertexCount = 0;
-    int nTotalTriCount = 0;
-    int nTotalRenderChunksCount = 0;
-
-    int nSubObjCount = (int)m_subObjects.size();
-    for (int s = 0; s < nSubObjCount; s++)
-    {
-        CStatObj::SSubObject* pSubObj = &m_subObjects[s];
-        if (pSubObj->pStatObj && pSubObj->nType == STATIC_SUB_OBJECT_MESH && !pSubObj->bHidden)
-        {
-            CStatObj* pStatObj = (CStatObj*)pSubObj->pStatObj;
-
-            // Conditions to not merge subobjects
-            if (pStatObj->m_pMaterial != m_pMaterial ||  // Different materials
-                pStatObj->m_nSpines ||                   // It's bendable foliage
-                !pStatObj->m_clothData.empty())          // It's cloth
-            {
-                return false;
-            }
-            nSubMeshes++;
-            nTotalVertexCount += pStatObj->m_nLoadedVertexCount;
-            nTotalTriCount += pStatObj->m_nLoadedTrisCount;
-            nTotalRenderChunksCount += pStatObj->m_nRenderMatIds;
-        }
-    }
-
-    // Check for mat_breakable surface type in material
-    if (m_pMaterial)
-    {
-        int nSubMtls = m_pMaterial->GetSubMtlCount();
-        if (nSubMtls > 0)
-        {
-            for (int i = 0; i < nSubMtls; ++i)
-            {
-                _smart_ptr<IMaterial> pSubMtl = m_pMaterial->GetSafeSubMtl(i);
-                if (pSubMtl)
-                {
-                    ISurfaceType* pSFType = pSubMtl->GetSurfaceType();
-
-                    // This is breakable glass.
-                    // Do not merge meshes that have procedural physics breakability in them.
-                    if (pSFType && pSFType->GetBreakability() != 0)
-                    {
-                        //if mesh is streamed, we must assume the material is referenced
-                        if (m_bMeshStrippedCGF)
-                        {
-                            return false;
-                        }
-                        else if (IsMatIDReferencedByObj((uint16)i))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        else // nSubMtls==0
-        {
-            ISurfaceType* pSFType = m_pMaterial->GetSurfaceType();
-
-            // This is breakable glass.
-            // Do not merge meshes that have procedural physics breakability in them.
-            if (pSFType && pSFType->GetBreakability() != 0)
-            {
-                return false;
-            }
-        }
-    }
-
-    if (nTotalVertexCount > MAX_VERTICES_MERGABLE || nSubMeshes <= 1 || nTotalRenderChunksCount <= 1)
-    {
-        return false;
-    }
-    if ((nTotalTriCount / nTotalRenderChunksCount) > GetCVars()->e_StatObjMergeMaxTrisPerDrawCall)
-    {
-        return false; // tris to draw calls ratio is already not so bad
-    }
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::UnMergeSubObjectsRenderMeshes()
-{
-    if (m_bMerged)
-    {
-        m_bMerged = false;
-        m_pMergedRenderMesh = 0;
-        SetRenderMesh(0);
-    }
-    if (m_bMergedLODs)
-    {
-        delete[] m_pLODs;
-        m_pLODs = 0;
-    }
-}
-
-//------------------------------------------------------------------------------
-// This function is recovered from previous FindSubObject function which was then
-// changed and creating many CGA model issues (some joints never move).
-CStatObj::SSubObject* CStatObj::FindSubObject_CGA(const char* sNodeName)
-{
-    uint32 numSubObjects = m_subObjects.size();
-    for (uint32 i = 0; i < numSubObjects; i++)
-    {
-        if (azstricmp(m_subObjects[i].name.c_str(), sNodeName) == 0)
-        {
-            return &m_subObjects[i];
-        }
-    }
-    return 0;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CStatObj::SSubObject* CStatObj::FindSubObject(const char* sNodeName)
-{
-    uint32 numSubObjects = m_subObjects.size();
-    int len = 1; // some objects has ' ' in the beginning
-    for (; sNodeName[len] > ' ' && sNodeName[len] != ',' && sNodeName[len] != ';'; len++)
-    {
-        ;
-    }
-    for (uint32 i = 0; i < numSubObjects; i++)
-    {
-        if (_strnicmp(m_subObjects[i].name.c_str(), sNodeName, len) == 0 && m_subObjects[i].name[len] == 0)
-        {
-            return &m_subObjects[i];
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CStatObj::SSubObject* CStatObj::FindSubObject_StrStr(const char* sNodeName)
-{
-    uint32 numSubObjects = m_subObjects.size();
-    for (uint32 i = 0; i < numSubObjects; i++)
-    {
-        if (stristr(m_subObjects[i].name.c_str(), sNodeName))
-        {
-            return &m_subObjects[i];
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IStatObj::SSubObject& CStatObj::AddSubObject(IStatObj* pSubObj)
-{
-    assert(pSubObj);
-    SetSubObjectCount(m_subObjects.size() + 1);
-    InitializeSubObject(m_subObjects[m_subObjects.size() - 1]);
-    m_subObjects[m_subObjects.size() - 1].pStatObj = pSubObj;
-    pSubObj->AddRef();
-    return m_subObjects[m_subObjects.size() - 1];
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::RemoveSubObject(int nIndex)
-{
-    if (nIndex >= 0 && nIndex < (int)m_subObjects.size())
-    {
-        SSubObject* pSubObj = &m_subObjects[nIndex];
-        CStatObj* pChildObj = (CStatObj*)pSubObj->pStatObj;
-        if (pChildObj)
-        {
-            if (!m_bSharesChildren)
-            {
-                pChildObj->m_pParentObject = NULL;
-            }
-            pChildObj->Release();
-        }
-        m_subObjects.erase(m_subObjects.begin() + nIndex);
-        Invalidate(true);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::SetSubObjectCount(int nCount)
-{
-    // remove sub objects.
-    while ((int)m_subObjects.size() > nCount)
-    {
-        RemoveSubObject(m_subObjects.size() - 1);
-    }
-
-    SSubObject subobj;
-    InitializeSubObject(subobj);
-    m_subObjects.resize(nCount, subobj);
-
-    if (nCount > 0)
-    {
-        m_nFlags |= STATIC_OBJECT_COMPOUND;
-    }
-    else
-    {
-        m_nFlags &= ~STATIC_OBJECT_COMPOUND;
-    }
-    Invalidate(true);
-    UnMergeSubObjectsRenderMeshes();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::CopySubObject(int nToIndex, IStatObj* pFromObj, int nFromIndex)
-{
-    SSubObject* pSrcSubObj = pFromObj->GetSubObject(nFromIndex);
-    if (!pSrcSubObj)
-    {
-        return false;
-    }
-
-    if (nToIndex >= (int)m_subObjects.size())
-    {
-        SetSubObjectCount(nToIndex + 1);
-        if (pFromObj == this)
-        {
-            pSrcSubObj = pFromObj->GetSubObject(nFromIndex);
-        }
-    }
-
-    m_subObjects[nToIndex] = *pSrcSubObj;
-    if (pSrcSubObj->pStatObj)
-    {
-        pSrcSubObj->pStatObj->AddRef();
-    }
-
-    Invalidate(true);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::GetPhysicalProperties(float& mass, float& density)
-{
-    mass = m_phys_mass;
-    density = m_phys_density;
-    if (mass < 0 && density < 0)
-    {
-        return false;
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::RayIntersection(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl)
-{
-    Vec3 vOut;
-
-    bool bNonDirectionalTest = hitInfo.inRay.direction.IsZero();
-
-    // First check if ray intersect objects bounding box.
-    if (!bNonDirectionalTest && !Intersect::Ray_AABB(hitInfo.inRay, AABB(m_vBoxMin, m_vBoxMax), vOut))
-    {
-        return false;
-    }
-
-    if (bNonDirectionalTest && !Overlap::AABB_AABB(
-            AABB(hitInfo.inRay.origin - Vec3(hitInfo.fMaxHitDistance), hitInfo.inRay.origin + Vec3(hitInfo.fMaxHitDistance)),
-            AABB(m_vBoxMin, m_vBoxMax)))
-    {
-        return false;
-    }
-
-    if ((m_nFlags & STATIC_OBJECT_COMPOUND) && !m_bMerged)
-    {
-        SRayHitInfo hitOut;
-        bool bAnyHit = false;
-        float fMinDistance = FLT_MAX;
-        for (int i = 0, num = m_subObjects.size(); i < num; i++)
-        {
-            if (m_subObjects[i].pStatObj && m_subObjects[i].nType == STATIC_SUB_OBJECT_MESH && !m_subObjects[i].bHidden)
-            {
-                if (((CStatObj*)(m_subObjects[i].pStatObj))->m_nFlags & STATIC_OBJECT_HIDDEN)
-                {
-                    continue;
-                }
-
-                Matrix34 invertedTM = m_subObjects[i].tm.GetInverted();
-
-                SRayHitInfo hit = hitInfo;
-
-                // Transform ray into sub-object local space.
-                hit.inReferencePoint = invertedTM.TransformPoint(hit.inReferencePoint);
-                hit.inRay.origin = invertedTM.TransformPoint(hit.inRay.origin);
-                hit.inRay.direction = invertedTM.TransformVector(hit.inRay.direction);
-
-                int nFirstTriangleId = hit.pHitTris ? hit.pHitTris->Count() : 0;
-
-                if (((CStatObj*)m_subObjects[i].pStatObj)->RayIntersection(hit, pCustomMtl))
-                {
-                    if (hit.fDistance < fMinDistance)
-                    {
-                        hitInfo.pStatObj = m_subObjects[i].pStatObj;
-                        bAnyHit = true;
-                        hitOut = hit;
-                    }
-                }
-
-                // transform collected triangles from sub-object space into object space
-                if (hit.pHitTris)
-                {
-                    for (int t = nFirstTriangleId; t < hit.pHitTris->Count(); t++)
-                    {
-                        SRayHitTriangle& ht = hit.pHitTris->GetAt(t);
-                        for (int c = 0; c < 3; c++)
-                        {
-                            ht.v[c] = m_subObjects[i].tm.TransformPoint(ht.v[c]);
-                        }
-                    }
-                }
-            }
-        }
-        if (bAnyHit)
-        {
-            // Restore input ray/reference point.
-            hitOut.inReferencePoint = hitInfo.inReferencePoint;
-            hitOut.inRay = hitInfo.inRay;
-
-            hitInfo = hitOut;
-            return true;
-        }
-    }
-    else
-    {
-        bool result = false;
-        IRenderMesh* pRenderMesh = m_pRenderMesh;
-
-        // Sometimes, object has no base lod mesh. So need to hit test with low level mesh.
-        // If the distance from camera is larger then a base lod distance, then base lod mesh is not loaded yet.
-        if (!pRenderMesh && m_nMaxUsableLod > 0 && m_pLODs && m_pLODs[m_nMaxUsableLod])
-        {
-            pRenderMesh = m_pLODs[m_nMaxUsableLod]->GetRenderMesh();
-        }
-
-        AZ_Warning("StatObj Ray Intersection",
-            pRenderMesh,
-            "No render mesh available for hit testing for statobj %s", m_szFileName.c_str());
-
-        if (pRenderMesh)
-        {
-            result = CRenderMeshUtils::RayIntersection(pRenderMesh, hitInfo, pCustomMtl);
-            if (result)
-            {
-                hitInfo.pStatObj = this;
-                hitInfo.pRenderMesh = pRenderMesh;
-            }
-        }
-
-        return result;
-    }
-
-    return false;
-}
-
-bool CStatObj::LineSegIntersection(const Lineseg& lineSeg, Vec3& hitPos, int& surfaceTypeId)
-{
-    bool intersects = false;
-#ifdef SERVER_CHECKS
-    if (m_pMesh)
-    {
-        int numVertices, numVerticesf16, numIndices;
-        Vec3* pPositions = m_pMesh->GetStreamPtrAndElementCount<Vec3>(CMesh::POSITIONS, 0, &numVertices);
-        Vec3f16* pPositionsf16 = m_pMesh->GetStreamPtrAndElementCount<Vec3f16>(CMesh::POSITIONSF16, 0, &numVerticesf16);
-        uint16* pIndices = m_pMesh->GetStreamPtrAndElementCount<uint16>(CMesh::INDICES, 0, &numIndices);
-        if (numIndices && numVerticesf16)
-        {
-            DynArray<SMeshSubset>::iterator itSubset;
-            for (itSubset = m_pMesh->m_subsets.begin(); itSubset != m_pMesh->m_subsets.end(); ++itSubset)
-            {
-                if (!(itSubset->nMatFlags & MTL_FLAG_NODRAW))
-                {
-                    int lastIndex = itSubset->nFirstIndexId + itSubset->nNumIndices;
-                    for (int i = itSubset->nFirstIndexId; i < lastIndex; )
-                    {
-                        const Vec3 v0 = pPositionsf16[pIndices[i++]].ToVec3();
-                        const Vec3 v1 = pPositionsf16[pIndices[i++]].ToVec3();
-                        const Vec3 v2 = pPositionsf16[pIndices[i++]].ToVec3();
-
-                        if (Intersect::Lineseg_Triangle(lineSeg, v0, v2, v1, hitPos) || // Front face
-                            Intersect::Lineseg_Triangle(lineSeg, v0, v1, v2, hitPos))   // Back face
-                        {
-                            _smart_ptr<IMaterial> pMtl = m_pMaterial->GetSafeSubMtl(itSubset->nMatID);
-                            surfaceTypeId = pMtl->GetSurfaceTypeId();
-                            intersects = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        else if (numIndices && numVertices)
-        {
-            DynArray<SMeshSubset>::iterator itSubset;
-            for (itSubset = m_pMesh->m_subsets.begin(); itSubset != m_pMesh->m_subsets.end(); ++itSubset)
-            {
-                if (!(itSubset->nMatFlags & MTL_FLAG_NODRAW))
-                {
-                    int lastIndex = itSubset->nFirstIndexId + itSubset->nNumIndices;
-                    for (int i = itSubset->nFirstIndexId; i < lastIndex; )
-                    {
-                        const Vec3& v0 = pPositions[pIndices[i++]];
-                        const Vec3& v1 = pPositions[pIndices[i++]];
-                        const Vec3& v2 = pPositions[pIndices[i++]];
-
-                        if (Intersect::Lineseg_Triangle(lineSeg, v0, v2, v1, hitPos) || // Front face
-                            Intersect::Lineseg_Triangle(lineSeg, v0, v1, v2, hitPos))   // Back face
-                        {
-                            _smart_ptr<IMaterial> pMtl = m_pMaterial->GetSafeSubMtl(itSubset->nMatID);
-                            surfaceTypeId = pMtl->GetSurfaceTypeId();
-                            intersects = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    else
-#endif
-    if (m_pRenderMesh)
-    {
-        m_pRenderMesh->LockForThreadAccess();
-        int numIndices = m_pRenderMesh->GetIndicesCount();
-        int numVertices = m_pRenderMesh->GetVerticesCount();
-        if (numIndices && numVertices)
-        {
-            int posStride;
-            uint8* pPositions = (uint8*)m_pRenderMesh->GetPosPtr(posStride, FSL_READ);
-            vtx_idx* pIndices = m_pRenderMesh->GetIndexPtr(FSL_READ);
-
-            TRenderChunkArray& Chunks = m_pRenderMesh->GetChunks();
-            int nChunkCount = Chunks.size();
-            for (int nChunkId = 0; nChunkId < nChunkCount; nChunkId++)
-            {
-                CRenderChunk* pChunk = &Chunks[nChunkId];
-                if (!(pChunk->m_nMatFlags & MTL_FLAG_NODRAW))
-                {
-                    int lastIndex = pChunk->nFirstIndexId + pChunk->nNumIndices;
-                    for (int i = pChunk->nFirstIndexId; i < lastIndex; )
-                    {
-                        const Vec3& v0 = *(Vec3*)(pPositions + pIndices[i++] * posStride);
-                        const Vec3& v1 = *(Vec3*)(pPositions + pIndices[i++] * posStride);
-                        const Vec3& v2 = *(Vec3*)(pPositions + pIndices[i++] * posStride);
-
-                        if (Intersect::Lineseg_Triangle(lineSeg, v0, v2, v1, hitPos) || // Front face
-                            Intersect::Lineseg_Triangle(lineSeg, v0, v1, v2, hitPos))   // Back face
-                        {
-                            _smart_ptr<IMaterial> pMtl = m_pMaterial->GetSafeSubMtl(pChunk->m_nMatID);
-                            surfaceTypeId = pMtl->GetSurfaceTypeId();
-                            intersects = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        m_pRenderMesh->UnlockStream(VSF_GENERAL);
-        m_pRenderMesh->UnlockIndexStream();
-        m_pRenderMesh->UnLockForThreadAccess();
-    }
-    return intersects;
-}
-
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-
-float CStatObj::GetOcclusionAmount()
-{
-    if (m_fOcclusionAmount < 0)
-    {
-        PrintMessage("Computing occlusion value for: %s ... ", GetFilePath());
-
-        float fHits = 0;
-        float fTests = 0;
-
-        Matrix34 objMatrix;
-        objMatrix.SetIdentity();
-
-        Vec3 vStep = Vec3(0.5f, 0.5f, 0.5f);
-
-        Vec3 vClosestHitPoint;
-        float fClosestHitDistance = 1000;
-
-        // y-rays
-        for (float x = m_vBoxMin.x; x <= m_vBoxMax.x; x += vStep.x)
-        {
-            for (float z = m_vBoxMin.z; z <= m_vBoxMax.z; z += vStep.z)
-            {
-                Vec3 vStart (x, m_vBoxMin.y, z);
-                Vec3 vEnd       (x, m_vBoxMax.y, z);
-                if (GetObjManager()->RayStatObjIntersection(this, objMatrix, GetMaterial(), vStart, vEnd, vClosestHitPoint, fClosestHitDistance, true))
-                {
-                    fHits++;
-                }
-                fTests++;
-            }
-        }
-
-        // x-rays
-        for (float y = m_vBoxMin.y; y <= m_vBoxMax.y; y += vStep.y)
-        {
-            for (float z = m_vBoxMin.z; z <= m_vBoxMax.z; z += vStep.z)
-            {
-                Vec3 vStart (m_vBoxMin.x, y, z);
-                Vec3 vEnd       (m_vBoxMax.x, y, z);
-                if (GetObjManager()->RayStatObjIntersection(this, objMatrix, GetMaterial(), vStart, vEnd, vClosestHitPoint, fClosestHitDistance, true))
-                {
-                    fHits++;
-                }
-                fTests++;
-            }
-        }
-
-        // z-rays
-        for (float y = m_vBoxMin.y; y <= m_vBoxMax.y; y += vStep.y)
-        {
-            for (float x = m_vBoxMin.x; x <= m_vBoxMax.x; x += vStep.x)
-            {
-                Vec3 vStart (x, y, m_vBoxMax.z);
-                Vec3 vEnd       (x, y, m_vBoxMin.z);
-                if (GetObjManager()->RayStatObjIntersection(this, objMatrix, GetMaterial(), vStart, vEnd, vClosestHitPoint, fClosestHitDistance, true))
-                {
-                    fHits++;
-                }
-                fTests++;
-            }
-        }
-
-        m_fOcclusionAmount = fTests ? (fHits / fTests) : 0;
-
-        PrintMessagePlus("[%.2f]", m_fOcclusionAmount);
-    }
-
-    return m_fOcclusionAmount;
-}
-
-#endif
-
-void CStatObj::SetRenderMesh(IRenderMesh* pRM)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (pRM == m_pRenderMesh)
-    {
-        return;
-    }
-
-    {
-        CryAutoCriticalSection lock(m_streamingMeshLock);
-        m_pRenderMesh = pRM;
-    }
-
-
-    if (m_pRenderMesh)
-    {
-        m_nRenderTrisCount = 0;
-        m_nRenderMatIds = 0;
-
-        TRenderChunkArray& Chunks = m_pRenderMesh->GetChunks();
-        for (int nChunkId = 0; nChunkId < Chunks.size(); nChunkId++)
-        {
-            CRenderChunk* pChunk = &Chunks[nChunkId];
-            if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-            {
-                continue;
-            }
-
-            if (pChunk->nNumIndices > 0)
-            {
-                m_nRenderMatIds++;
-                m_nRenderTrisCount += pChunk->nNumIndices / 3;
-            }
-        }
-        m_nLoadedTrisCount = pRM->GetIndicesCount() / 3;
-        m_nLoadedVertexCount = pRM->GetVerticesCount();
-    }
-
-    // this will prepare all deformable object during loading instead when needed.
-    // Thus is will prevent runtime stalls (300ms when shooting a taxi with 6000 vertices)
-    // but will incrase memory since every deformable information needs to be loaded(500kb for the taxi)
-    // So this is more a workaround, the real solution would precompute the data in the RC and load
-    // the data only when needed into memory
-    if (GetCVars()->e_PrepareDeformableObjectsAtLoadTime && m_pRenderMesh && m_pDelayedSkinParams)
-    {
-        PrepareSkinData(m_pDelayedSkinParams->mtxSkelToMesh, m_pDelayedSkinParams->pPhysSkel, m_pDelayedSkinParams->r);
-    }
-}
-
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-
-void CStatObj::CheckUpdateObjectHeightmap()
-{
-    if (m_pHeightmap)
-    {
-        return;
-    }
-
-    PrintMessage("Computing object heightmap for: %s ... ", GetFilePath());
-
-    m_nHeightmapSize = (int)(CLAMP(max(m_vBoxMax.x - m_vBoxMin.x, m_vBoxMax.y - m_vBoxMin.y) * 16, 8, 256));
-    m_pHeightmap = new float[m_nHeightmapSize * m_nHeightmapSize];
-    memset(m_pHeightmap, 0, sizeof(float) * m_nHeightmapSize * m_nHeightmapSize);
-
-    float dx = max(0.001f, (m_vBoxMax.x - m_vBoxMin.x) / m_nHeightmapSize);
-    float dy = max(0.001f, (m_vBoxMax.y - m_vBoxMin.y) / m_nHeightmapSize);
-
-    Matrix34 objMatrix;
-    objMatrix.SetIdentity();
-
-    for (float x = m_vBoxMin.x + dx; x < m_vBoxMax.x - dx; x += dx)
-    {
-        for (float y = m_vBoxMin.y + dy; y < m_vBoxMax.y - dy; y += dy)
-        {
-            Vec3 vStart (x, y, m_vBoxMax.z);
-            Vec3 vEnd   (x, y, m_vBoxMin.z);
-
-            Vec3 vClosestHitPoint(0, 0, 0);
-            float fClosestHitDistance = 1000000;
-
-            if (GetObjManager()->RayStatObjIntersection(this, objMatrix, GetMaterial(),
-                    vStart, vEnd, vClosestHitPoint, fClosestHitDistance, false))
-            {
-                int nX = CLAMP(int((x - m_vBoxMin.x) / dx), 0, m_nHeightmapSize - 1);
-                int nY = CLAMP(int((y - m_vBoxMin.y) / dy), 0, m_nHeightmapSize - 1);
-                m_pHeightmap[nX * m_nHeightmapSize + nY] = vClosestHitPoint.z;
-            }
-        }
-    }
-
-    PrintMessagePlus("[%dx%d] done", m_nHeightmapSize, m_nHeightmapSize);
-}
-
-float CStatObj::GetObjectHeight(float x, float y)
-{
-    CheckUpdateObjectHeightmap();
-
-    float dx = max(0.001f, (m_vBoxMax.x - m_vBoxMin.x) / m_nHeightmapSize);
-    float dy = max(0.001f, (m_vBoxMax.y - m_vBoxMin.y) / m_nHeightmapSize);
-
-    int nX = CLAMP(int((x - m_vBoxMin.x) / dx), 0, m_nHeightmapSize - 1);
-    int nY = CLAMP(int((y - m_vBoxMin.y) / dy), 0, m_nHeightmapSize - 1);
-
-    return m_pHeightmap[nX * m_nHeightmapSize + nY];
-}
-
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-int CStatObj::CountChildReferences() const
-{
-    // Check if it must be released.
-    int nChildRefs = 0;
-    int numChilds = (int)m_subObjects.size();
-    for (int i = 0; i < numChilds; i++)
-    {
-        const IStatObj::SSubObject& so = m_subObjects[i];
-        CStatObj* pChildStatObj = (CStatObj*)so.pStatObj;
-        if (!pChildStatObj) // All stat objects must be at the begining of the array//
-        {
-            break;
-        }
-
-        // if I'm the real parent of this child, check that no-one else is referencing it, otherwise it doesn't matter if I get deleted
-        if (pChildStatObj->m_pParentObject == this)
-        {
-            bool bIgnoreSharedStatObj = false;
-            for (int k = 0; k < i; k++)
-            {
-                if (pChildStatObj == m_subObjects[k].pStatObj)
-                {
-                    // If we share pointer to this stat obj then do not count it again.
-                    bIgnoreSharedStatObj = true;
-                    nChildRefs -= 1; // 1 reference from current object should be ignored.
-                    break;
-                }
-            }
-            if (!bIgnoreSharedStatObj)
-            {
-                nChildRefs += pChildStatObj->m_nUsers - 1; // 1 reference from parent should be ignored.
-            }
-        }
-    }
-    assert(nChildRefs >= 0);
-    return nChildRefs;
-}
-
-IStatObj* CStatObj::GetLowestLod()
-{
-    if (int nLowestLod = CStatObj::GetMinUsableLod())
-    {
-        return m_pLODs ? (CStatObj*)m_pLODs[CStatObj::GetMinUsableLod()] : (CStatObj*)NULL;
-    }
-    return this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CStatObj::FindHighestLOD(int nBias)
-{
-    int nLowestLod = CStatObj::GetMinUsableLod();
-
-    // if requested lod is not ready - find nearest ready one
-    int nLod = CLAMP((int)m_nMaxUsableLod + nBias, nLowestLod, (int)m_nMaxUsableLod);
-
-    while (nLod && nLod >= nLowestLod && (!m_pLODs || !m_pLODs[nLod] || !m_pLODs[nLod]->GetRenderMesh()))
-    {
-        nLod--;
-    }
-
-    if (nLod == 0 && !GetRenderMesh())
-    {
-        nLod = -1;
-    }
-
-    return nLod;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::GetStatisticsNonRecursive(SStatistics& si)
-{
-    CStatObj* pStatObj = this;
-
-    for (int lod = 0; lod < MAX_STATOBJ_LODS_NUM; lod++)
-    {
-        CStatObj* pLod = (CStatObj*)pStatObj->GetLodObject(lod);
-        if (pLod)
-        {
-            //if (!pLod0 && pLod->GetRenderMesh())
-            //pLod0 = pLod;
-
-            if (lod > 0 && lod + 1 > si.nLods) // Assign last existing lod.
-            {
-                si.nLods = lod + 1;
-            }
-
-            si.nVerticesPerLod[lod] += pLod->m_nLoadedVertexCount;
-            si.nIndicesPerLod[lod] += pLod->m_nLoadedTrisCount * 3;
-            si.nMeshSize += pLod->m_nRenderMeshMemoryUsage;
-
-            IRenderMesh* pRenderMesh = pLod->GetRenderMesh();
-            if (pRenderMesh)
-            {
-                si.nMeshSizeLoaded += pRenderMesh->GetMemoryUsage(0, IRenderMesh::MEM_USAGE_ONLY_STREAMS);
-                //if (si.pTextureSizer)
-                //pRenderMesh->GetTextureMemoryUsage(0,si.pTextureSizer);
-                //if (si.pTextureSizer2)
-                //pRenderMesh->GetTextureMemoryUsage(0,si.pTextureSizer2);
-            }
-        }
-    }
-
-    si.nIndices += m_nLoadedTrisCount * 3;
-    si.nVertices += m_nLoadedVertexCount;
-
-    for (int j = 0; j < pStatObj->m_arrPhysGeomInfo.GetGeomCount(); j++)
-    {
-        if (pStatObj->GetPhysGeom(j))
-        {
-            ICrySizer* pPhysSizer = GetISystem()->CreateSizer();
-            pStatObj->GetPhysGeom(j)->pGeom->GetMemoryStatistics(pPhysSizer);
-            int sz = pPhysSizer->GetTotalSize();
-            si.nPhysProxySize += sz;
-            si.nPhysProxySizeMax = max(si.nPhysProxySizeMax, sz);
-            si.nPhysPrimitives += pStatObj->GetPhysGeom(j)->pGeom->GetPrimitiveCount();
-            pPhysSizer->Release();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::GetStatistics(SStatistics& si)
-{
-    si.bSplitLods = m_bLodsAreLoadedFromSeparateFile;
-
-    bool bMultiSubObj = (GetFlags() & STATIC_OBJECT_COMPOUND) != 0;
-    if (!bMultiSubObj)
-    {
-        GetStatisticsNonRecursive(si);
-        si.nSubMeshCount = 0;
-        si.nNumRefs = GetNumRefs();
-        si.nDrawCalls = m_nRenderMatIds;
-    }
-    else
-    {
-        si.nNumRefs = GetNumRefs();
-
-        std::vector<void*> addedObjects;
-        for (int k = 0; k < GetSubObjectCount(); k++)
-        {
-            if (!GetSubObject(k))
-            {
-                continue;
-            }
-            CStatObj* pSubObj = (CStatObj*)GetSubObject(k)->pStatObj;
-
-            int nSubObjectType = GetSubObject(k)->nType;
-            if (nSubObjectType != STATIC_SUB_OBJECT_MESH && nSubObjectType != STATIC_SUB_OBJECT_HELPER_MESH)
-            {
-                continue;
-            }
-
-            if (stl::find(addedObjects, pSubObj))
-            {
-                continue;
-            }
-            addedObjects.push_back(pSubObj);
-
-            if (pSubObj)
-            {
-                pSubObj->GetStatisticsNonRecursive(si);
-                si.nSubMeshCount++;
-
-                if (nSubObjectType == STATIC_SUB_OBJECT_MESH)
-                {
-                    si.nDrawCalls += pSubObj->m_nRenderMatIds;
-                }
-
-                if (pSubObj->GetNumRefs() > si.nNumRefs)
-                {
-                    si.nNumRefs = pSubObj->GetNumRefs();
-                }
-            }
-        }
-    }
-
-    // Only do rough estimation based on the material
-    // This is more consistent when streaming is enabled and render mesh may no exist
-    if (m_pMaterial)
-    {
-        if (si.pTextureSizer)
-        {
-            m_pMaterial->GetTextureMemoryUsage(si.pTextureSizer);
-        }
-        if (si.pTextureSizer2)
-        {
-            m_pMaterial->GetTextureMemoryUsage(si.pTextureSizer2);
-        }
-    }
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/StatObjLoad.cpp b/Code/CryEngine/Cry3DEngine/StatObjLoad.cpp
deleted file mode 100644
index d9a2919855..0000000000
--- a/Code/CryEngine/Cry3DEngine/StatObjLoad.cpp
+++ /dev/null
@@ -1,1724 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : loading
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "IndexedMesh.h"
-#include "MatMan.h"
-#include "ObjMan.h"
-#include "CGF/CGFLoader.h"
-#include "CGF/CGFSaver.h"
-#include "CGF/ReadOnlyChunkFile.h"
-
-#include "CryMemoryManager.h"
-#include <CryPath.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/Asset/AssetSystemTypes.h>
-#include <AzCore/std/string/conversions.h>
-#include <CryPhysicsDeprecation.h>
-
-#define GEOM_INFO_FILE_EXT "ginfo"
-#define MESH_NAME_FOR_MAIN "main"
-#define PHYSICS_BREAKABLE_JOINT "$joint"
-
-void CStatObj::Refresh(int nFlags)
-{
-    if (nFlags & FRO_GEOMETRY)
-    {
-        if (m_bCheckGarbage)
-        {
-            GetObjManager()->UnregisterForGarbage(this);
-        }
-
-        ShutDown();
-        Init();
-        bool bRes = LoadCGF(m_szFileName, false, 0, 0, 0);
-
-        LoadLowLODs(false, 0);
-        TryMergeSubObjects(false);
-
-        if (!bRes)
-        { // load default in case of error
-            ShutDown();
-            Init();
-            LoadCGF("objects/default.cgf", 0, 0, 0, 0);
-            m_bDefaultObject = true;
-        }
-
-        return;
-    }
-}
-
-void CStatObj::LoadLowLODs(bool bUseStreaming, unsigned long nLoadingFlags)
-{
-    if (!LoadLowLODS_Prep(bUseStreaming, nLoadingFlags))
-    {
-        return;
-    }
-
-    int nLoadedLods = 1;
-    IStatObj* loadedLods[MAX_STATOBJ_LODS_NUM];
-    for (int nLodLevel = 0; nLodLevel < MAX_STATOBJ_LODS_NUM; nLodLevel++)
-    {
-        loadedLods[nLodLevel] = 0;
-    }
-
-    for (int nLodLevel = 1; nLodLevel < MAX_STATOBJ_LODS_NUM; nLodLevel++)
-    {
-        IStatObj* pLodStatObj = LoadLowLODS_Load(nLodLevel, bUseStreaming, nLoadingFlags, NULL, 0);
-        if (!pLodStatObj)
-        {
-            break;
-        }
-        nLoadedLods++;
-
-        loadedLods[nLodLevel] = pLodStatObj;
-    }
-
-    LoadLowLODS_Finalize(nLoadedLods, loadedLods);
-}
-
-bool CStatObj::LoadLowLODS_Prep([[maybe_unused]] bool bUseStreaming, unsigned long nLoadingFlags)
-{
-    m_bLodsLoaded = true;
-
-    if (nLoadingFlags & ELoadingFlagsIgnoreLoDs)
-    {
-        return false;
-    }
-
-    const char* sFileExt = PathUtil::GetExt(m_szFileName);
-
-    if (m_nLoadedLodsNum > 1 && GetFlags() & STATIC_OBJECT_COMPOUND)
-    {
-        for (int nLodLevel = 1; nLodLevel < MAX_STATOBJ_LODS_NUM; nLodLevel++)
-        {
-            // make lod file name
-            char sLodFileName[512];
-            char sLodNum[8];
-            cry_strcpy(sLodFileName, m_szFileName);
-            char* sPointSeparator = strchr(sLodFileName, '.');
-            if (sPointSeparator)
-            {
-                *sPointSeparator = '\0'; // Terminate at the dot
-            }
-            cry_strcat(sLodFileName, "_lod");
-            azltoa(nLodLevel, sLodNum, AZ_ARRAY_SIZE(sLodNum), 10);
-            cry_strcat(sLodFileName, sLodNum);
-            cry_strcat(sLodFileName, ".");
-            cry_strcat(sLodFileName, sFileExt);
-
-            if (IsValidFile(sLodFileName))
-            {
-                m_nLoadedLodsNum = 1;
-                break;
-            }
-        }
-    }
-
-    if (m_nLoadedLodsNum > 1)
-    {
-        return false;
-    }
-
-    m_nLoadedLodsNum = 1;
-
-    if (!GetCVars()->e_Lods)
-    {
-        return false;
-    }
-
-    if (m_bSubObject) // Never do this for sub objects.
-    {
-        return false;
-    }
-
-    return true;
-}
-
-IStatObj* CStatObj::LoadLowLODS_Load(int nLodLevel, bool bUseStreaming, unsigned long nLoadingFlags, const void* pData, int nDataLen)
-{
-    const char* sFileExt = PathUtil::GetExt(m_szFileName);
-
-    // make lod file name
-    char sLodFileName[512];
-    char sLodNum[8];
-    cry_strcpy(sLodFileName, m_szFileName);
-    char* sPointSeparator = strchr(sLodFileName, '.');
-    if (sPointSeparator)
-    {
-        *sPointSeparator = '\0'; // Terminate at the dot
-    }
-    cry_strcat(sLodFileName, "_lod");
-    azltoa(nLodLevel, sLodNum, AZ_ARRAY_SIZE(sLodNum), 10);
-    cry_strcat(sLodFileName, sLodNum);
-    cry_strcat(sLodFileName, ".");
-    cry_strcat(sLodFileName, sFileExt);
-
-    IStatObj* pLodStatObj = m_pLODs ? (IStatObj*)m_pLODs[nLodLevel] : nullptr;
-
-    // try to load
-    bool bRes = false;
-
-    string lowerFileName(sLodFileName);
-    pLodStatObj = stl::find_in_map(m_pObjManager->GetNameToObjectMap(), CONST_TEMP_STRING(lowerFileName.MakeLower()), NULL);
-
-    if (pLodStatObj)
-    {
-        pLodStatObj->SetLodLevel0(this);
-        bRes = true;
-
-        typedef std::set<IStatObj*> LoadedObjects;
-        LoadedObjects::iterator it = m_pObjManager->GetLoadedObjects().find(pLodStatObj);
-        if (it != m_pObjManager->GetLoadedObjects().end())
-        {
-            m_pObjManager->GetLoadedObjects().erase(it);
-            m_pObjManager->GetNameToObjectMap().erase(CONST_TEMP_STRING(sLodFileName));
-        }
-    }
-    else if (pData || IsValidFile(sLodFileName))
-    {
-        if (!pLodStatObj)
-        {
-            pLodStatObj = new CStatObj();
-            pLodStatObj->SetLodLevel0(this);
-        }
-
-        if (bUseStreaming && GetCVars()->e_StreamCgf)
-        {
-            pLodStatObj->SetCanUnload(true);
-        }
-
-        bRes = pLodStatObj->LoadCGF(sLodFileName, true, nLoadingFlags, pData, nDataLen);
-    }
-
-    if (!bRes)
-    {
-        if ((m_pLODs ? (CStatObj*)m_pLODs[nLodLevel] : (CStatObj*)NULL) != pLodStatObj)
-        {
-            SAFE_RELEASE(pLodStatObj);
-        }
-        SetLodObject(nLodLevel, 0);
-        return NULL;
-    }
-
-    bool bLodCompound = (pLodStatObj->GetFlags() & STATIC_OBJECT_COMPOUND) != 0;
-    bool bLod0Compund = (GetFlags() & STATIC_OBJECT_COMPOUND) != 0;
-
-    SetLodObject(nLodLevel, pLodStatObj);
-
-    if (bLodCompound != bLod0Compund)
-    {
-        // LOD0 and LOD differ.
-        FileWarning(0, sLodFileName, "Invalid LOD%d, LOD%d have different merging property from LOD0", nLodLevel, nLodLevel);
-    }
-
-    return pLodStatObj;
-}
-
-void CStatObj::LoadLowLODS_Finalize(int nLoadedLods, IStatObj* loadedLods[MAX_STATOBJ_LODS_NUM])
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Put LODs into the sub objects.
-    //////////////////////////////////////////////////////////////////////////
-    if (nLoadedLods > 1)
-    {
-        m_bLodsAreLoadedFromSeparateFile = true;
-
-        for (int i = 0; i < (int)m_subObjects.size(); i++)
-        {
-            SSubObject* pSubObject = &m_subObjects[i];
-            if (!pSubObject->pStatObj || pSubObject->nType != STATIC_SUB_OBJECT_MESH)
-            {
-                continue;
-            }
-
-            IStatObj* pSubStatObj = (CStatObj*)pSubObject->pStatObj;
-
-            //          int nLoadedTrisCount = ((CStatObj*)pSubObject->pStatObj)->m_nLoadedTrisCount;
-
-            for (int nLodLevel = 1; nLodLevel < nLoadedLods; nLodLevel++)
-            {
-                if (loadedLods[nLodLevel] != 0 && loadedLods[nLodLevel]->GetSubObjectMeshCount() > 0)
-                {
-                    SSubObject* pLodSubObject = loadedLods[nLodLevel]->FindSubObject(pSubObject->name);
-                    if (pLodSubObject && pLodSubObject->pStatObj && pLodSubObject->nType == STATIC_SUB_OBJECT_MESH)
-                    {
-                        pSubStatObj->SetLodObject(nLodLevel, (CStatObj*)pLodSubObject->pStatObj);
-                    }
-                }
-            }
-            if (pSubStatObj)
-            {
-                pSubStatObj->CleanUnusedLods();
-            }
-        }
-    }
-
-    CleanUnusedLods();
-
-    for (int nLodLevel = 0; nLodLevel < MAX_STATOBJ_LODS_NUM; nLodLevel++)
-    {
-        if (loadedLods[nLodLevel])
-        {
-            GetObjManager()->CheckForGarbage(loadedLods[nLodLevel]);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::CleanUnusedLods()
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Free render resources for unused upper LODs.
-    //////////////////////////////////////////////////////////////////////////
-    if (m_nLoadedLodsNum > 1)
-    {
-        int nMinLod = GetMinUsableLod();
-        nMinLod = clamp_tpl(nMinLod, 0, (int)m_nLoadedLodsNum - 1);
-        for (int i = 0; i < nMinLod; i++)
-        {
-            CStatObj* pStatObj = (CStatObj*)GetLodObject(i);
-            if (!pStatObj)
-            {
-                continue;
-            }
-
-            if (pStatObj->m_pRenderMesh)
-            {
-                pStatObj->SetRenderMesh(0);
-            }
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-}
-
-void TransformMesh(CMesh& mesh, Matrix34 tm)
-{
-    const int nVerts = mesh.GetVertexCount();
-    if (mesh.m_pPositions)
-    {
-        for (int i = 0; i < nVerts; i++)
-        {
-            mesh.m_pPositions[i] = tm.TransformPoint(mesh.m_pPositions[i]);
-        }
-    }
-    else if (mesh.m_pPositionsF16)
-    {
-        for (int i = 0; i < nVerts; i++)
-        {
-            mesh.m_pPositionsF16[i] = tm.TransformPoint(mesh.m_pPositionsF16[i].ToVec3());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::LoadStreamRenderMeshes(const char* filename, const void* pData, const int nDataSize, bool bLod)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    CLoaderCGF cgfLoader(util::pool_allocate, util::pool_free, GetCVars()->e_StatObjTessellationMode != 2 || bLod);
-    CStackContainer<CContentCGF> contentContainer(InplaceFactory(m_szFileName));
-    CContentCGF* pCGF = contentContainer.get();
-
-    bool bMeshAssigned = false;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Load CGF.
-    //////////////////////////////////////////////////////////////////////////
-    class Listener
-        : public ILoaderCGFListener
-    {
-    public:
-        virtual void Warning([[maybe_unused]] const char* format) {}
-        virtual void Error([[maybe_unused]] const char* format) {}
-        virtual bool IsValidationEnabled() { return false; }
-    };
-
-    bool bLoaded = false;
-    bool bLoadedChunks = false;
-
-    Listener listener;
-    CReadOnlyChunkFile chunkFile(false, true);  // Chunk file must exist until CGF is completely loaded, and if loading from file do not make a copy of it.
-
-    if (filename && filename[0])
-    {
-        bLoadedChunks = chunkFile.Read(filename);
-    }
-    else
-    {
-        bLoadedChunks = chunkFile.ReadFromMemory(pData, nDataSize);
-    }
-
-    if (bLoadedChunks)
-    {
-        bLoaded = cgfLoader.LoadCGF(contentContainer.get(), m_szFileName, chunkFile, &listener, 0);
-    }
-
-    if (!bLoaded)
-    {
-        FileWarning(0, m_szFileName, "CGF Streaming Failed: %s", cgfLoader.GetLastError());
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    int nSubObjCount = (int)m_subObjects.size();
-
-    bool bBreakNodeLoop = false;
-
-    for (int i = 0; i < pCGF->GetNodeCount() && !bBreakNodeLoop; i++)
-    {
-        CNodeCGF* pNode = pCGF->GetNode(i);
-        if (!pNode->pMesh)
-        {
-            continue;
-        }
-
-        bool bNodeIsValidMesh = (pNode->type == CNodeCGF::NODE_MESH || (pNode->type == CNodeCGF::NODE_HELPER && pNode->helperType == HP_GEOMETRY));
-        if (!bNodeIsValidMesh)
-        {
-            continue;
-        }
-
-        CStatObj* pStatObj = 0;
-        for (int s = 0; s < nSubObjCount && !pStatObj; s++)
-        {
-            CStatObj* pSubStatObj = (CStatObj*)m_subObjects[s].pStatObj;
-            if (!pSubStatObj)
-            {
-                continue;
-            }
-            for (int nLod = 0; nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-            {
-                CStatObj* pSubLod = (CStatObj*)pSubStatObj->GetLodObject(nLod);
-                if (!pSubLod)
-                {
-                    continue;
-                }
-                if (0 == strcmp(pSubLod->m_cgfNodeName.c_str(), pNode->name))
-                {
-                    pStatObj = pSubLod;
-                    break;
-                }
-            }
-        }
-
-        if (!pStatObj && m_nSubObjectMeshCount <= 1)
-        {
-            // If we do not have sub objects, assign the root StatObj to be used, and then not check anymore other nodes.
-            for (int nLod = 0; nLod < MAX_STATOBJ_LODS_NUM && !pStatObj; nLod++)
-            {
-                CStatObj* pLod = (CStatObj*)GetLodObject(nLod);
-                if (!pLod)
-                {
-                    continue;
-                }
-                if (0 == strcmp(pLod->m_cgfNodeName.c_str(), pNode->name))
-                {
-                    pStatObj = pLod;
-                    break;
-                }
-            }
-        }
-        if (pStatObj)
-        {
-            // add mesh to sync setup queue
-            pStatObj->m_pStreamedRenderMesh = pStatObj->MakeRenderMesh(pNode->pMesh, true);
-            if (pStatObj->m_pStreamedRenderMesh)
-            {
-                bMeshAssigned = true;
-
-                //////////////////////////////////////////////////////////////////////////
-                // FIXME: Qtangents not generated for foliage in RC, we must do that here.
-                //////////////////////////////////////////////////////////////////////////
-                if (pStatObj->m_nSpines && pStatObj->m_pSpines) // foliage
-                {
-                    pStatObj->m_pStreamedRenderMesh->GenerateQTangents();
-                }
-            }
-        }
-    }
-    if (!bMeshAssigned)
-    {
-        Warning("RenderMesh not assigned %s", m_szFileName.c_str());
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Merge sub-objects for the new lod.
-    if (GetCVars()->e_StatObjMerge)
-    {
-        IStatObj* pLod0 = (m_pLod0) ? m_pLod0 : this;
-        pLod0->TryMergeSubObjects(true);
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::CommitStreamRenderMeshes()
-{
-    if (m_pStreamedRenderMesh)
-    {
-        CryAutoCriticalSection lock(m_streamingMeshLock);
-        SetRenderMesh(m_pStreamedRenderMesh);
-        m_pStreamedRenderMesh = 0;
-    }
-    if (m_pLODs)
-    {
-        for (int nLod = 0; nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-        {
-            CStatObj* pLodObj = m_pLODs[nLod];
-            if (pLodObj && pLodObj->m_pStreamedRenderMesh)
-            {
-                CryAutoCriticalSection lock(pLodObj->m_streamingMeshLock);
-
-                pLodObj->SetRenderMesh(pLodObj->m_pStreamedRenderMesh);
-                pLodObj->m_pStreamedRenderMesh = 0;
-            }
-        }
-    }
-
-    for (size_t i = 0, num = m_subObjects.size(); i < num; ++i)
-    {
-        CStatObj* pSubObj = (CStatObj*)m_subObjects[i].pStatObj;
-        if (pSubObj)
-        {
-            pSubObj->CommitStreamRenderMeshes();
-        }
-    }
-}
-
-bool CStatObj::IsDeformable()
-{
-    // Create deformable subobject is present
-    if (m_isDeformable)
-    {
-        return true;
-    }
-    else
-    {
-        for (int i = 0, n = GetSubObjectCount(); i < n; ++i)
-        {
-            IStatObj::SSubObject* subObject = GetSubObject(i);
-            if (!subObject)
-            {
-                continue;
-            }
-            if (CStatObj* pChild = static_cast<CStatObj*>(subObject->pStatObj))
-            {
-                if (pChild->m_isDeformable)
-                {
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::LoadCGF(const char* filename, bool bLod, unsigned long nLoadingFlags, const void* pData, const int nDataSize)
-{
-    FUNCTION_PROFILER_3DENGINE;
-    LOADING_TIME_PROFILE_SECTION;
-
-    CRY_DEFINE_ASSET_SCOPE("CGF", filename);
-
-    if (m_bSubObject) // Never execute this on the sub objects.
-    {
-        return true;
-    }
-
-    PrintComment("Loading %s", filename);
-    if (!bLod)
-    {
-        GetConsole()->TickProgressBar();
-    }
-
-    m_nRenderTrisCount = m_nLoadedTrisCount = 0;
-    m_nLoadedVertexCount = 0;
-    m_szFileName = filename;
-    m_szFileName.replace('\\', '/');
-
-    // Determine if stream only cgf is available
-    stack_string streamPath;
-    GetStreamFilePath(streamPath);
-    m_bHasStreamOnlyCGF = gEnv->pCryPak->IsFileExist(streamPath.c_str());
-
-    if (!m_bCanUnload)
-    {
-        if (m_bHasStreamOnlyCGF)
-        {
-            if (!LoadCGF_Int(filename, bLod, nLoadingFlags, pData, nDataSize))
-            {
-                return false;
-            }
-            return LoadStreamRenderMeshes(streamPath.c_str(), 0, 0, bLod);
-        }
-    }
-
-    return LoadCGF_Int(filename, bLod, nLoadingFlags, pData, nDataSize);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::LoadCGF_Int(const char* filename, bool bLod, unsigned long nLoadingFlags, const void* pData, const int nDataSize)
-{
-    using namespace AzFramework::AssetSystem;
-    CLoaderCGF cgfLoader(util::pool_allocate, util::pool_free, GetCVars()->e_StatObjTessellationMode != 2 || bLod);
-    CStackContainer<CContentCGF> contentContainer(InplaceFactory(filename));
-    CContentCGF* pCGF = contentContainer.get();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Load CGF.
-    //////////////////////////////////////////////////////////////////////////
-    class Listener
-        : public ILoaderCGFListener
-    {
-    public:
-        virtual void Warning(const char* format) {Cry3DEngineBase::Warning("%s", format); }
-        virtual void Error(const char* format) {Cry3DEngineBase::Error("%s", format); }
-        virtual bool IsValidationEnabled() { return Cry3DEngineBase::GetCVars()->e_StatObjValidate != 0; }
-    };
-
-    AZStd::string cleanedFileName = PathUtil::ToUnixPath(filename).c_str();
-    AZStd::to_lower(cleanedFileName.begin(), cleanedFileName.end());
-
-# if !defined(_RELEASE)
-
-    if (GetCVars()->e_CGFMaxFileSize >= 0 && (cleanedFileName.compare(DEFAULT_CGF_NAME) != 0))
-    {
-        size_t fileSize = gEnv->pCryPak->FGetSize(filename, true);
-        if (fileSize > (size_t)GetCVars()->e_CGFMaxFileSize << 10)
-        {
-            FileWarning(0, filename, "CGF Loading Failed: file '%s' (size %3.3f kb) exceeds size limit (max %3.3f kb)",
-                filename, fileSize / 1024.f, (GetCVars()->e_CGFMaxFileSize << 10) / 1024.f);
-            return false;
-        }
-    }
-# endif
-
-    Listener listener;
-    CReadOnlyChunkFile chunkFile(false, bLod);  // Chunk file must exist until CGF is completely loaded, and if loading from file do not make a copy of it.
-
-    bool bLoaded = false;
-    bool isFileMissing = false;
-    if (gEnv->pCryPak)
-    {
-        if (!gEnv->pCryPak->IsFileExist(filename))
-        {
-            isFileMissing = true;
-        }
-    }
-    else
-    {
-        if (!gEnv->pFileIO->Exists(filename))
-        {
-            isFileMissing = true;
-        }
-    }
-
-    bool isDefaultCGF = false;
-    if (isFileMissing)
-    {
-        //input filename is already converted to unixpath,
-        //we will convert the default cgf name to also unix path for comparision
-        AssetStatus status = AssetStatus_Unknown;
-        if (cleanedFileName.compare(DEFAULT_CGF_NAME) == 0)
-        {
-            isDefaultCGF = true;
-        }
-        if (isDefaultCGF)
-        {
-            //we are here if the default cgf is missing ,sync compile
-            EBUS_EVENT_RESULT(status, AzFramework::AssetSystemRequestBus, CompileAssetSync, cleanedFileName);
-        }
-        else
-        {
-            //we are here if a non default cgf file is missing
-            EBUS_EVENT_RESULT(status, AzFramework::AssetSystemRequestBus, GetAssetStatus, cleanedFileName);
-        }
-
-        if ((status == AssetStatus_Missing))
-        {
-            //if status is missing ,show the warning
-            FileWarning(0, cleanedFileName.c_str(), "CGF Loading Failed: %s", cgfLoader.GetLastError());
-            cleanedFileName = DEFAULT_CGF_NAME;
-        }
-        else if (!isDefaultCGF && status != AssetStatus_Compiled)
-        {
-            //if we are here it means that a non default cgf file is either in the AP queue or is compiling
-            //we than change the name to default cgf and let it load.
-            cleanedFileName = DEFAULT_CGF_NAME;
-        }
-    }
-
-    if (nDataSize)
-    {
-        if (chunkFile.ReadFromMemory(pData, nDataSize))
-        {
-            bLoaded = cgfLoader.LoadCGF(contentContainer.get(), cleanedFileName.c_str(), chunkFile, &listener, nLoadingFlags);
-        }
-    }
-    else
-    {
-        bLoaded = cgfLoader.LoadCGF(contentContainer.get(), cleanedFileName.c_str(), chunkFile, &listener, nLoadingFlags);
-    }
-    if (!bLoaded)
-    {
-        FileWarning(0, cleanedFileName.c_str(), "CGF Loading Failed: %s", cgfLoader.GetLastError());
-        return false;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    INDENT_LOG_DURING_SCOPE(true, "While loading static object geometry '%s'", filename);
-
-    CExportInfoCGF* pExportInfo = pCGF->GetExportInfo();
-    CNodeCGF* pFirstMeshNode = NULL;
-    CMesh* pFirstMesh = NULL;
-    m_nSubObjectMeshCount = 0;
-
-    if (!pExportInfo->bCompiledCGF)
-    {
-        FileWarning(0, cleanedFileName.c_str(), "CGF is not compiled, use RC");
-        return false;
-    }
-
-    m_bMeshStrippedCGF = pExportInfo->bNoMesh;
-
-    bool bHasJoints = false;
-    if (nLoadingFlags & ELoadingFlagsForceBreakable)
-    {
-        m_nFlags |= STATIC_OBJECT_DYNAMIC;
-    }
-
-    m_nNodeCount = pCGF->GetNodeCount();
-
-    m_clothData.clear();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Find out number of meshes, and get pointer to the first found mesh.
-    //////////////////////////////////////////////////////////////////////////
-    for (int i = 0; i < pCGF->GetNodeCount(); i++)
-    {
-        CNodeCGF* pNode = pCGF->GetNode(i);
-        if (pNode->type == CNodeCGF::NODE_MESH)
-        {
-            if (m_szProperties.empty())
-            {
-                m_szProperties = pNode->properties; // Take properties from the first mesh node.
-                m_szProperties.MakeLower();
-            }
-            m_nSubObjectMeshCount++;
-            if (!pFirstMeshNode)
-            {
-                pFirstMeshNode = pNode;
-                pFirstMesh = pNode->pMesh;
-            }
-        }
-        else if (strncmp(pNode->name, "$joint", 6) == 0)
-        {
-            bHasJoints = true;
-        }
-    }
-
-    bool bIsLod0Merged = false;
-    if (bLod && m_pLod0)
-    {
-        // This is a log object, check if parent was merged or not.
-        bIsLod0Merged = m_pLod0->GetSubObjectMeshCount() == 0;
-    }
-
-    if (pExportInfo->bMergeAllNodes || (m_nSubObjectMeshCount <= 1 && !bHasJoints && (!bLod || bIsLod0Merged)))
-    {
-        // If we merging all nodes, ignore sub object meshes.
-        m_nSubObjectMeshCount = 0;
-
-        if (pCGF->GetCommonMaterial())
-        {
-            if (nLoadingFlags & ELoadingFlagsPreviewMode)
-            {
-                m_pMaterial = GetMatMan()->GetDefaultMaterial();
-                m_pMaterial->AddRef();
-            }
-            else
-            {
-                m_pMaterial = GetMatMan()->LoadCGFMaterial(pCGF->GetCommonMaterial(), cleanedFileName.c_str(), nLoadingFlags);
-                if (m_pMaterial->IsDefault())
-                {
-                    FileWarning(0, cleanedFileName.c_str(), "CGF is unable to load its default material, see XML reader error above for material info.");
-                }
-            }
-        }
-    }
-
-    // Fail if mesh was not complied by RC
-    if (pFirstMesh && pFirstMesh->GetFaceCount() > 0)
-    {
-        FileWarning(0, cleanedFileName.c_str(), "CGF is not compiled");
-        return false;
-    }
-
-    if (GetCVars()->e_StatObjValidate)
-    {
-        const char* pErrorDescription = 0;
-        if (pFirstMesh && (!pFirstMesh->Validate(&pErrorDescription)))
-        {
-            FileWarning(0, cleanedFileName.c_str(), "CGF has invalid merged mesh (%s)", pErrorDescription);
-            assert(!"CGF has invalid merged mesh");
-            return false;
-        }
-        if (!pCGF->ValidateMeshes(&pErrorDescription))
-        {
-            FileWarning(0, cleanedFileName.c_str(), "CGF has invalid meshes (%s)", pErrorDescription);
-            assert(!"CGF has invalid meshes");
-            return false;
-        }
-    }
-
-    // Common of all sub nodes bbox.
-    AABB commonBBox;
-    commonBBox.Reset();
-
-    bool bHaveMeshNamedMain = false;
-    bool bHasBreakableJoints = false;
-    bool bRenderMeshLoaded = false; // even if streaming is disabled we may load now from stripped cgf so meshes will fail to load - in this case we will stream it later
-
-    //////////////////////////////////////////////////////////////////////////
-    // Create StatObj from Mesh.
-    //////////////////////////////////////////////////////////////////////////
-
-    _smart_ptr<IRenderMesh> pMainMesh;
-
-    if (pExportInfo->bMergeAllNodes || m_nSubObjectMeshCount == 0)
-    {
-        if (pFirstMeshNode)
-        {
-            m_vBoxMin = pFirstMeshNode->meshInfo.bboxMin;
-            m_vBoxMax = pFirstMeshNode->meshInfo.bboxMax;
-            m_fGeometricMeanFaceArea = pFirstMeshNode->meshInfo.fGeometricMean;
-            commonBBox.min = m_vBoxMin;
-            commonBBox.max = m_vBoxMax;
-            m_nRenderTrisCount = m_nLoadedTrisCount = pFirstMeshNode->meshInfo.nIndices / 3;
-            m_nLoadedVertexCount = pFirstMeshNode->meshInfo.nVerts;
-            m_cgfNodeName = pFirstMeshNode->name;
-            CalcRadiuses();
-
-            if (pFirstMesh)
-            {
-                // Assign mesh to this static object.
-                _smart_ptr<IRenderMesh> pRenderMesh = MakeRenderMesh(pFirstMesh, !m_bCanUnload);
-                SetRenderMesh(pRenderMesh);
-                pMainMesh = m_pRenderMesh;
-                bRenderMeshLoaded |= (m_pRenderMesh != 0);
-#ifdef SERVER_CHECKS
-                if (gEnv->IsDedicated() || GetCVars()->e_StatObjStoreMesh)
-                {
-                    m_pMesh = new CMesh();
-                    m_pMesh->Copy(*pFirstMesh);
-                }
-#endif
-                FillClothData(*pFirstMesh);
-            }
-            else
-            {
-                // If mesh not known now try to estimate its memory usage.
-                m_nRenderMeshMemoryUsage = CMesh::ApproximateRenderMeshMemoryUsage(pFirstMeshNode->meshInfo.nVerts, pFirstMeshNode->meshInfo.nIndices);
-                CalcRadiuses();
-            }
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    scratch_vector<CNodeCGF*> nodes;
-    static const size_t lodNamePrefixLength = strlen(CGF_NODE_NAME_LOD_PREFIX);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Create SubObjects.
-    //////////////////////////////////////////////////////////////////////////
-    if (pCGF->GetNodeCount() > 1 || m_nSubObjectMeshCount > 0)
-    {
-        nodes.reserve(pCGF->GetNodeCount());
-
-        scratch_vector< std::pair<CNodeCGF*, CStatObj*> > meshToObject;
-        meshToObject.reserve(pCGF->GetNodeCount());
-
-        //////////////////////////////////////////////
-        // Count required subobjects and reserve space
-        //////////////////////////////////////////////
-        size_t nSubObjects = 0;
-        for (int ii = 0; ii < pCGF->GetNodeCount(); ii++)
-        {
-            CNodeCGF* pNode = pCGF->GetNode(ii);
-
-            if (pNode->bPhysicsProxy)
-            {
-                continue;
-            }
-
-            if (pNode->type == CNodeCGF::NODE_MESH)
-            {
-                if (pExportInfo->bMergeAllNodes || m_nSubObjectMeshCount == 0) // Only add helpers, ignore meshes.
-                {
-                    continue;
-                }
-            }
-            else if (pNode->type == CNodeCGF::NODE_HELPER)
-            {
-                switch (pNode->helperType)
-                {
-                case HP_GEOMETRY:
-                {
-                    if (_strnicmp(pNode->name, CGF_NODE_NAME_LOD_PREFIX, lodNamePrefixLength) == 0)
-                    {
-                        continue;
-                    }
-                }
-                break;
-                }
-            }
-
-            ++nSubObjects;
-        }
-        m_subObjects.reserve(nSubObjects);
-        //////////////////////////////////////////////
-
-        int nNumMeshes = 0;
-        for (int ii = 0; ii < pCGF->GetNodeCount(); ii++)
-        {
-            CNodeCGF* pNode = pCGF->GetNode(ii);
-
-            if (pNode->bPhysicsProxy)
-            {
-                continue;
-            }
-
-            SSubObject subObject;
-            subObject.pStatObj = 0;
-            subObject.bIdentityMatrix = pNode->bIdentityMatrix;
-            subObject.bHidden = false;
-            subObject.tm = pNode->worldTM;
-            subObject.localTM = pNode->localTM;
-            subObject.name = pNode->name;
-            subObject.properties = pNode->properties;
-            subObject.nParent = -1;
-            subObject.pWeights = 0;
-            subObject.helperSize.Set(0, 0, 0);
-
-            if (pNode->type == CNodeCGF::NODE_MESH)
-            {
-                if (pExportInfo->bMergeAllNodes || m_nSubObjectMeshCount == 0) // Only add helpers, ignore meshes.
-                {
-                    continue;
-                }
-
-                nNumMeshes++;
-                subObject.nType = STATIC_SUB_OBJECT_MESH;
-
-                if (stristr(pNode->name, "shadowproxy") != 0)
-                {
-                    subObject.bShadowProxy = true;
-                }
-
-                if (_stricmp(pNode->name, MESH_NAME_FOR_MAIN) == 0)
-                {
-                    bHaveMeshNamedMain = true;
-                }
-            }
-            else if (pNode->type == CNodeCGF::NODE_LIGHT)
-            {
-                subObject.nType = STATIC_SUB_OBJECT_LIGHT;
-            }
-            else if (pNode->type == CNodeCGF::NODE_HELPER)
-            {
-                if (!bHasBreakableJoints)
-                {
-                    if (strstr(pNode->name, PHYSICS_BREAKABLE_JOINT) == 0)
-                    {
-                        bHasBreakableJoints = true;
-                    }
-                }
-
-                switch (pNode->helperType)
-                {
-                case HP_POINT:
-                    subObject.nType = STATIC_SUB_OBJECT_POINT;
-                    break;
-                case HP_DUMMY:
-                    subObject.nType = STATIC_SUB_OBJECT_DUMMY;
-                    subObject.helperSize = (pNode->helperSize * 0.01f);
-                    break;
-                case HP_XREF:
-                    subObject.nType = STATIC_SUB_OBJECT_XREF;
-                    break;
-                case HP_CAMERA:
-                    subObject.nType = STATIC_SUB_OBJECT_CAMERA;
-                    break;
-                case HP_GEOMETRY:
-                {
-                    subObject.nType = STATIC_SUB_OBJECT_HELPER_MESH;
-                    subObject.bHidden = true;     // Helpers are not rendered.
-                }
-                break;
-                default:
-                    assert(0); // unknown type.
-                }
-            }
-
-            // Only when multiple meshes inside.
-            // If only 1 mesh inside, Do not create a separate CStatObj for it.
-            if ((m_nSubObjectMeshCount > 0 && pNode->type == CNodeCGF::NODE_MESH) ||
-                (subObject.nType == STATIC_SUB_OBJECT_HELPER_MESH))
-            {
-                if (pNode->pSharedMesh)
-                {
-                    // Try to find already create StatObj for a shred mesh node
-                    for (int k = 0, num = (int)meshToObject.size(); k < num; k++)
-                    {
-                        if (pNode->pSharedMesh == meshToObject[k].first)
-                        {
-                            subObject.pStatObj = meshToObject[k].second;
-                            break;
-                        }
-                    }
-                }
-
-                if (!subObject.pStatObj)
-                {
-                    // Create a StatObj from the CGF node.
-                    subObject.pStatObj = MakeStatObjFromCgfNode(pCGF, pNode, bLod, nLoadingFlags, commonBBox);
-                    if (pNode->pSharedMesh)
-                    {
-                        meshToObject.push_back(std::make_pair(pNode->pSharedMesh, static_cast<CStatObj*>(subObject.pStatObj)));
-                    }
-                    else
-                    {
-                        meshToObject.push_back(std::make_pair(pNode, static_cast<CStatObj*>(subObject.pStatObj)));
-                    }
-                    bRenderMeshLoaded |= (((CStatObj*)subObject.pStatObj)->m_pRenderMesh != 0);
-                }
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // Check if helper object is a LOD
-            //////////////////////////////////////////////////////////////////////////
-            if ((subObject.nType == STATIC_SUB_OBJECT_HELPER_MESH) &&
-                (_strnicmp(pNode->name, CGF_NODE_NAME_LOD_PREFIX, lodNamePrefixLength) == 0))
-            {
-                // Check if helper object is a LOD
-
-                if (!subObject.pStatObj)
-                {
-                    continue;
-                }
-
-                CStatObj* pLodStatObj = (CStatObj*)subObject.pStatObj;
-                CStatObj* pStatObjParent = this;
-                if (!pExportInfo->bMergeAllNodes && m_nSubObjectMeshCount > 0 && pNode->pParent)
-                {
-                    // We are attached to some object, find it.
-                    for (int i = 0, num = nodes.size(); i < num; i++)
-                    {
-                        if (nodes[i] == pNode->pParent)
-                        {
-                            pStatObjParent = (CStatObj*)m_subObjects[i].pStatObj;
-                            break;
-                        }
-                    }
-                }
-                if (!pStatObjParent)
-                {
-                    continue;
-                }
-
-                const int nLodLevel = atoi(pNode->name + lodNamePrefixLength);
-                if ((nLodLevel >= 1) && (nLodLevel < MAX_STATOBJ_LODS_NUM))
-                {
-                    if (!pStatObjParent->m_pLODs || !pStatObjParent->m_pLODs[nLodLevel])
-                    {
-                        pStatObjParent->SetLodObject(nLodLevel, pLodStatObj);
-                    }
-                    else
-                    {
-                        const char* existingGeoName = pStatObjParent->m_pLODs[nLodLevel]->GetGeoName();
-                        FileWarning(0, cleanedFileName.c_str(), "Duplicated LOD helper %s (%s). Existing geometry name: %s", pNode->name, cleanedFileName.c_str(), existingGeoName);
-                    }
-                }
-
-                continue;
-            }
-            //////////////////////////////////////////////////////////////////////////
-
-            if (subObject.pStatObj)
-            {
-                subObject.pStatObj->AddRef();
-            }
-
-            m_subObjects.push_back(subObject);
-            nodes.push_back(pNode);
-        }
-
-        // Delete not assigned stat objects.
-        for (int k = 0, num = (int)meshToObject.size(); k < num; k++)
-        {
-            if (meshToObject[k].second->m_nUsers == 0)
-            {
-                delete meshToObject[k].second;
-            }
-        }
-
-        // Assign SubObject parent pointers.
-        int nNumCgfNodes = (int)nodes.size();
-        if (nNumCgfNodes > 0)
-        {
-            CNodeCGF** pNodes = &nodes[0];
-
-            //////////////////////////////////////////////////////////////////////////
-            // Move meshes to beginning, Sort sub-objects so that meshes are first.
-            for (int i = 0; i < nNumCgfNodes; i++)
-            {
-                if (pNodes[i]->type != CNodeCGF::NODE_MESH)
-                {
-                    // check if any more meshes exist.
-                    if (i < nNumMeshes)
-                    {
-                        // Try to find next mesh and place it here.
-                        for (int j = i + 1; j < nNumCgfNodes; j++)
-                        {
-                            if (pNodes[j]->type == CNodeCGF::NODE_MESH)
-                            {
-                                // Swap objects at j to i.
-                                std::swap(pNodes[i], pNodes[j]);
-                                std::swap(m_subObjects[i], m_subObjects[j]);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            //////////////////////////////////////////////////////////////////////////
-
-            // Assign Parent nodes.
-            for (int i = 0; i < nNumCgfNodes; i++)
-            {
-                CNodeCGF* pParentNode = pNodes[i]->pParent;
-                if (pParentNode)
-                {
-                    for (int j = 0; j < nNumCgfNodes; j++)
-                    {
-                        if (pNodes[j] == pParentNode)
-                        {
-                            m_subObjects[i].nParent = j;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // Handle Main/Remain meshes used for Destroyable Objects.
-            //////////////////////////////////////////////////////////////////////////
-            if (bHaveMeshNamedMain)
-            {
-                // If have mesh named main, then mark all sub object hidden except the one called "Main".
-                for (int i = 0, n = m_subObjects.size(); i < n; i++)
-                {
-                    if (m_subObjects[i].nType == STATIC_SUB_OBJECT_MESH)
-                    {
-                        if (azstricmp(m_subObjects[i].name, MESH_NAME_FOR_MAIN) == 0)
-                        {
-                            m_subObjects[i].bHidden = false;
-                        }
-                        else
-                        {
-                            m_subObjects[i].bHidden = true;
-                        }
-                    }
-                }
-            }
-            //////////////////////////////////////////////////////////////////////////
-        }
-    }
-
-    if (m_nSubObjectMeshCount > 0)
-    {
-        m_vBoxMin = commonBBox.min;
-        m_vBoxMax = commonBBox.max;
-        CalcRadiuses();
-    }
-
-    for (int i = 0; i < pCGF->GetNodeCount(); i++)
-    {
-        if (strstr(pCGF->GetNode(i)->properties, "deformable"))
-        {
-            m_nFlags |= STATIC_OBJECT_DEFORMABLE;
-        }
-    }
-
-    if (m_nSubObjectMeshCount > 0)
-    {
-        m_nFlags |= STATIC_OBJECT_COMPOUND;
-    }
-    else
-    {
-        m_nFlags &= ~STATIC_OBJECT_COMPOUND;
-    }
-
-    if (!bLod && !m_szProperties.empty())
-    {
-        ParseProperties();
-    }
-
-    if (!bLod)
-    {
-        CPhysicalizeInfoCGF* pPi = pCGF->GetPhysicalizeInfo();
-        if (pPi->nRetTets)
-        {
-            // Lattice support?
-            CRY_PHYSICS_REPLACEMENT_ASSERT();
-        }
-    }
-
-    if (m_bHasDeformationMorphs)
-    {
-        int i, j;
-        for (i = GetSubObjectCount() - 1; i >= 0; i--)
-        {
-            if ((j = SubobjHasDeformMorph(i)) >= 0)
-            {
-                GetSubObject(i)->pStatObj->SetDeformationMorphTarget(GetSubObject(j)->pStatObj);
-            }
-        }
-        m_bUnmergable = 1;
-    }
-
-    // Only objects with breakable physics joints can be merged.
-    if (!bHasBreakableJoints)
-    {
-        m_bUnmergable = true;
-    }
-
-    // sub meshes merging
-    if (GetCVars()->e_StatObjMerge)
-    {
-        if (!m_bUnmergable)
-        {
-            if (!CanMergeSubObjects())
-            {
-                m_bUnmergable = true;
-            }
-        }
-    }
-
-    // Merging always produces 16 bit meshes, so disable for 32 bit meshes for now
-    if (pFirstMesh && pFirstMesh->m_pPositions)
-    {
-        m_bUnmergable = true;
-    }
-
-    if (!m_bCanUnload && bRenderMeshLoaded)
-    {
-        m_eStreamingStatus = ecss_Ready;
-    }
-
-    // Determine if the cgf is deformable
-    if (stristr(m_szGeomName.c_str(), "bendable") && stristr(m_szProperties.c_str(), "mergedmesh_deform"))
-    {
-        m_isDeformable = 1;
-        DisableStreaming();
-    }
-    for (int i = 0; i < GetSubObjectCount(); ++i)
-    {
-        IStatObj::SSubObject* subObject = GetSubObject(i);
-        if (!subObject)
-        {
-            continue;
-        }
-        if (CStatObj* pChild = static_cast<CStatObj*>(GetSubObject(i)->pStatObj))
-        {
-            if (stristr(pChild->m_szGeomName.c_str(), "bendable") && stristr(pChild->m_szProperties.c_str(), "mergedmesh_deform"))
-            {
-                pChild->m_isDeformable = 1;
-                pChild->DisableStreaming();
-            }
-        }
-    }
-
-    SMeshLodInfo lodInfo;
-    ComputeGeometricMean(lodInfo);
-    m_fLodDistance = sqrt(lodInfo.fGeometricMean);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CStatObj* CStatObj::MakeStatObjFromCgfNode([[maybe_unused]] CContentCGF* pCGF, CNodeCGF* pNode, bool bLod, int nLoadingFlags, AABB& commonBBox)
-{
-    CNodeCGF* pTMNode = pNode;
-    if (pNode->pSharedMesh)
-    {
-        pNode = pNode->pSharedMesh;
-    }
-
-    // Calc bbox.
-    if (pNode->type == CNodeCGF::NODE_MESH)
-    {
-        AABB box(pNode->meshInfo.bboxMin, pNode->meshInfo.bboxMax);
-        box.SetTransformedAABB(pTMNode->worldTM, box);
-        commonBBox.Add(box.min);
-        commonBBox.Add(box.max);
-    }
-
-    CStatObj* pStatObj = new CStatObj;
-
-    pStatObj->m_szFileName = m_szFileName;
-    pStatObj->m_szGeomName = pNode->name;
-    pStatObj->m_bSubObject = true;
-
-    if (pNode->type == CNodeCGF::NODE_MESH)
-    {
-        pStatObj->m_pParentObject = this;
-    }
-
-    pStatObj->m_szProperties = pNode->properties;
-    pStatObj->m_szProperties.MakeLower();
-    if (!bLod && !pStatObj->m_szProperties.empty())
-    {
-        pStatObj->ParseProperties();
-    }
-
-    if (pNode->pMaterial)
-    {
-        if (nLoadingFlags & ELoadingFlagsPreviewMode)
-        {
-            pStatObj->m_pMaterial = GetMatMan()->GetDefaultMaterial();
-            pStatObj->m_pMaterial->AddRef();
-        }
-        else
-        {
-            pStatObj->m_pMaterial = GetMatMan()->LoadCGFMaterial(pNode->pMaterial, m_szFileName, nLoadingFlags);
-        }
-        if (!m_pMaterial || m_pMaterial->IsDefault())
-        {
-            m_pMaterial = pStatObj->m_pMaterial; // take it as a general stat obj material.
-        }
-    }
-    if (!pStatObj->m_pMaterial)
-    {
-        pStatObj->m_pMaterial = m_pMaterial;
-    }
-
-    pStatObj->m_vBoxMin = pNode->meshInfo.bboxMin;
-    pStatObj->m_vBoxMax = pNode->meshInfo.bboxMax;
-    pStatObj->m_nRenderMatIds = pNode->meshInfo.nSubsets;
-    pStatObj->m_nRenderTrisCount = pStatObj->m_nLoadedTrisCount = pNode->meshInfo.nIndices / 3;
-    pStatObj->m_nLoadedVertexCount = pNode->meshInfo.nVerts;
-    pStatObj->m_fGeometricMeanFaceArea = pNode->meshInfo.fGeometricMean;
-    pStatObj->CalcRadiuses();
-
-    if (nLoadingFlags & ELoadingFlagsForceBreakable)
-    {
-        pStatObj->m_nFlags |= STATIC_OBJECT_DYNAMIC;
-    }
-
-    if (pNode->pMesh)
-    {
-        _smart_ptr<IRenderMesh> pRenderMesh = pStatObj->MakeRenderMesh(pNode->pMesh, !m_bCanUnload);
-        pStatObj->SetRenderMesh(pRenderMesh);
-        pStatObj->FillClothData(*pNode->pMesh);
-    }
-    else
-    {
-        // If mesh not known now try to estimate its memory usage.
-        pStatObj->m_nRenderMeshMemoryUsage = CMesh::ApproximateRenderMeshMemoryUsage(pNode->meshInfo.nVerts, pNode->meshInfo.nIndices);
-    }
-    pStatObj->m_cgfNodeName = pNode->name;
-
-    if (pNode->pSkinInfo)
-    {
-        pStatObj->m_pSkinInfo = (SSkinVtx*)pNode->pSkinInfo;
-        pStatObj->m_hasSkinInfo = 1;
-        pNode->pSkinInfo = 0;
-    }
-
-    return pStatObj;
-}
-
-void CStatObj::FillClothData(CMesh& mesh)
-{
-    m_clothData.clear();
-
-    // NOTE: Using CMesh Colors stream with index 1 for cloth data
-    const int ClothVertexBufferStreamIndex = 1;
-    int numElements = 0;
-    const auto meshColorStream = mesh.GetStreamPtrAndElementCount<SMeshColor>(CMesh::COLORS, ClothVertexBufferStreamIndex, &numElements);
-    if (meshColorStream && numElements > 0)
-    {
-        m_clothData.resize(numElements);
-        for (int i = 0; i < numElements; ++i)
-        {
-            m_clothData[i] = meshColorStream[i];
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IRenderMesh> CStatObj::MakeRenderMesh(CMesh* pMesh, bool bDoRenderMesh)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!pMesh)
-    {
-        return 0;
-    }
-
-    m_vBoxMin = pMesh->m_bbox.min;
-    m_vBoxMax = pMesh->m_bbox.max;
-    m_fGeometricMeanFaceArea = pMesh->m_geometricMeanFaceArea;
-
-    CalcRadiuses();
-
-    m_nLoadedTrisCount = pMesh->GetIndexCount() / 3;
-    m_nLoadedVertexCount = pMesh->GetVertexCount();
-    if (!m_nLoadedTrisCount)
-    {
-        return 0;
-    }
-
-    m_nRenderTrisCount = 0;
-    m_nRenderMatIds = 0;
-    //////////////////////////////////////////////////////////////////////////
-    // Initialize Mesh subset material flags.
-    //////////////////////////////////////////////////////////////////////////
-    for (int i = 0; i < pMesh->GetSubSetCount(); i++)
-    {
-        SMeshSubset& subset = pMesh->m_subsets[i];
-        _smart_ptr<IMaterial> pMtl = m_pMaterial->GetSafeSubMtl(subset.nMatID);
-        subset.nMatFlags = pMtl->GetFlags();
-        if (subset.nPhysicalizeType == PHYS_GEOM_TYPE_NONE && pMtl->GetSurfaceType()->GetPhyscalParams().pierceability >= 10)
-        {
-            subset.nMatFlags |= MTL_FLAG_NOPHYSICALIZE;
-        }
-        if (!(subset.nMatFlags & MTL_FLAG_NODRAW) && (subset.nNumIndices > 0))
-        {
-            m_nRenderMatIds++;
-            m_nRenderTrisCount += subset.nNumIndices / 3;
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    if (!m_nRenderTrisCount)
-    {
-        return 0;
-    }
-
-    _smart_ptr<IRenderMesh> pOutRenderMesh;
-
-    // Create renderable mesh.
-    if (!gEnv->IsDedicated())
-    {
-        if (!pMesh)
-        {
-            return 0;
-        }
-        if (pMesh->GetSubSetCount() == 0)
-        {
-            return 0;
-        }
-
-        size_t nRenderMeshSize = ~0U;
-        if (bDoRenderMesh)
-        {
-            pOutRenderMesh = GetRenderer()->CreateRenderMesh("StatObj", m_szFileName.c_str());
-
-            if (m_idmatBreakable >= 0 || m_bBreakableByGame)
-            {
-                // need to keep mesh data in system memory for breakable meshes
-                pOutRenderMesh->KeepSysMesh(true);
-            }
-
-            // we cannot use FSM_CREATE_DEVICE_MESH flag since we can have an async call to the renderer!
-            {
-                uint32 nFlags = 0;
-                const threadID currentThread = CryGetCurrentThreadId();
-                threadID renderThread, mainThread;
-
-                gEnv->pRenderer->GetThreadIDs(mainThread, renderThread);
-
-                nFlags |= (GetCVars()->e_StreamCgf || currentThread != renderThread) ? 0 : FSM_CREATE_DEVICE_MESH;
-                nFlags |= (!GetCVars()->e_StreamCgf && Get3DEngine()->m_bInLoad) ? FSM_SETMESH_ASYNC : 0;
-#ifdef MESH_TESSELLATION_ENGINE
-                nFlags |= FSM_ENABLE_NORMALSTREAM;
-#endif
-                nRenderMeshSize = pOutRenderMesh->SetMesh(*pMesh, 0, nFlags, true);
-                if (nRenderMeshSize == ~0U)
-                {
-                    return 0;
-                }
-            }
-
-            bool arrMaterialSupportsTeselation[32];
-            ZeroStruct(arrMaterialSupportsTeselation);
-        }
-
-        m_nRenderMeshMemoryUsage = (nRenderMeshSize == ~0U) ? pMesh->EstimateRenderMeshMemoryUsage() : nRenderMeshSize;
-        //m_nRenderMeshMemoryUsage = pMesh->EstimateRenderMeshMemoryUsage();
-    }
-
-    return pOutRenderMesh;
-}
-
-static bool CreateNodeCGF(CContentCGF* pCGF, CStatObj* pStatObj, const char* name, CNodeCGF* pParent, CMaterialCGF* pMaterial)
-{
-    bool bRet = true;
-    CNodeCGF* pNode = NULL;
-    if (pStatObj->GetIndexedMesh())
-    {
-        // Add single node for merged mesh.
-        pNode = new CNodeCGF;
-
-        if (!pNode)
-        {
-            CryLog("SaveToCgf: failed to allocate CNodeCGF aborting");
-            return false;
-        }
-
-        pNode->type = CNodeCGF::NODE_MESH;
-        azsnprintf(pNode->name, sizeof(pNode->name), "%s", name);
-        pNode->localTM.SetIdentity();
-        pNode->worldTM.SetIdentity();
-        pNode->bIdentityMatrix = true;
-        pNode->pMesh = new CMesh;
-        pNode->pMesh->Copy(*(pStatObj->GetIndexedMesh()->GetMesh()));
-        if (pNode->pMesh)
-        {
-            pNode->pMesh->m_bbox = pStatObj->GetAABB();
-        }
-        pNode->pParent = pParent;
-        pNode->pMaterial = pMaterial;
-        pNode->nPhysicalizeFlags = 0;
-        pCGF->AddNode(pNode);
-    }
-
-    const int subobjCount = pStatObj->GetSubObjectCount();
-    for (int subidx = 0; subidx < subobjCount; ++subidx)
-    {
-        IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(subidx);
-        if (!pSubObj || !pSubObj->pStatObj)
-        {
-            CryLog("SaveToCgf: A sub-object in '%s' is broken.", name ? name : "<unknown>");
-            continue;
-        }
-        const char* subGeoName = pSubObj->pStatObj->GetGeoName() ? pSubObj->pStatObj->GetGeoName() : "Merged";
-        if (!CreateNodeCGF(pCGF, (CStatObj*)pSubObj->pStatObj, subGeoName, pNode, pMaterial))
-        {
-            bRet = false;
-        }
-    }
-    return bRet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Save statobj to the CGF file.
-bool CStatObj::SaveToCGF([[maybe_unused]] const char* sFilename, [[maybe_unused]] IChunkFile** pOutChunkFile, [[maybe_unused]] bool bHavePhiscalProxy)
-{
-#if defined(INCLUDE_SAVECGF)
-    CContentCGF* pCGF = new CContentCGF(sFilename);
-
-    pCGF->GetExportInfo()->bCompiledCGF = true;
-    pCGF->GetExportInfo()->bMergeAllNodes = (GetSubObjectCount() <= 0);
-    pCGF->GetExportInfo()->bHavePhysicsProxy = bHavePhiscalProxy;
-    cry_strcpy(pCGF->GetExportInfo()->rc_version_string, "From Sandbox");
-
-    CChunkFile* pChunkFile = new CChunkFile();
-    if (pOutChunkFile)
-    {
-        *pOutChunkFile = pChunkFile;
-    }
-
-    CMaterialCGF* pMaterialCGF = new CMaterialCGF;
-    if (m_pMaterial)
-    {
-        cry_strcpy(pMaterialCGF->name, m_pMaterial->GetName());
-    }
-    else
-    {
-        pMaterialCGF->name[0] = 0;
-    }
-    pMaterialCGF->nPhysicalizeType = PHYS_GEOM_TYPE_DEFAULT;
-    pMaterialCGF->bOldMaterial = false;
-    pMaterialCGF->nChunkId = 0;
-
-    // Array of sub materials.
-    //std::vector<CMaterialCGF*> subMaterials;
-
-    bool bResult = false;
-    if (CreateNodeCGF(pCGF, this, GetGeoName() ? GetGeoName() : "Merged", NULL, pMaterialCGF))
-    {
-        CSaverCGF cgfSaver(*pChunkFile);
-
-        const bool bNeedEndianSwap = false;
-        const bool bUseQtangents = false;
-        const bool bStorePositionsAsF16 = false;
-        const bool bStoreIndicesAsU16 = (sizeof(vtx_idx) == sizeof(uint16));
-
-        cgfSaver.SaveContent(pCGF, bNeedEndianSwap, bStorePositionsAsF16, bUseQtangents, bStoreIndicesAsU16);
-
-        bResult = true;
-    }
-
-    if (!pOutChunkFile && bResult)
-    {
-        bResult = pChunkFile->Write(sFilename);
-        pChunkFile->Release();
-    }
-
-    delete pCGF;
-
-    return bResult;
-#else // #if defined(INCLUDE_SAVECGF)
-#   if !defined(_RELEASE)
-    __debugbreak();
-#   endif
-    return false;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline char* trim_whitespaces(char* str, char* strEnd)
-{
-    char* first = str;
-    while (first < strEnd && (*first == ' ' || *first == '\t'))
-    {
-        first++;
-    }
-    char* s = strEnd - 1;
-    while (s >= first && (*s == ' ' || *s == '\t'))
-    {
-        *s-- = 0;
-    }
-    return first;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::ParseProperties()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    int nLen = m_szProperties.size();
-    if (nLen >= 4090)
-    {
-        Warning("CGF '%s' have longer then 4K geometry info file", m_szFileName.c_str());
-        nLen = 4090;
-    }
-
-    char properties[4096];
-    memcpy(properties, m_szProperties.c_str(), nLen);
-    properties[nLen] = 0;
-
-    char* str = properties;
-    char* strEnd = str + nLen;
-    while (str < strEnd)
-    {
-        char* line = str;
-        while (str < strEnd && *str != '\n' && *str != '\r')
-        {
-            str++;
-        }
-        char* lineEnd = str;
-        *lineEnd = 0;
-        str++;
-        while (str < strEnd && (*str == '\n' || *str == '\r')) // Skip all \r\n at end.
-        {
-            str++;
-        }
-
-        if (*line == '/' || *line == '#') // skip comments
-        {
-            continue;
-        }
-
-        if (line < lineEnd)
-        {
-            // Parse line.
-            char* l = line;
-            while (l < lineEnd && *l != '=')
-            {
-                l++;
-            }
-            if (l < lineEnd)
-            {
-                *l = 0;
-                char* left = line;
-                char* right = l + 1;
-
-                // remove white spaces from left and right.
-                left = trim_whitespaces(left, l);
-                right = trim_whitespaces(right, lineEnd);
-
-                //////////////////////////////////////////////////////////////////////////
-                if (0 == strcmp(left, "mass"))
-                {
-                    m_phys_mass = (float)atof(right);
-                }
-                else if (0 == strcmp(left, "density"))
-                {
-                    m_phys_density = (float)atof(right);
-                }
-                //////////////////////////////////////////////////////////////////////////
-            }
-            else
-            {
-                // There`s no = on the line, must be a flag.
-                //////////////////////////////////////////////////////////////////////////
-                if (0 == strcmp(line, "entity"))
-                {
-                    m_nFlags |= STATIC_OBJECT_SPAWN_ENTITY;
-                }
-                else if (0 == strcmp(line, "no_player_collide"))
-                {
-                    m_nFlags |= STATIC_OBJECT_NO_PLAYER_COLLIDE;
-                }
-                else if (0 == strcmp(line, "no_auto_hidepoints"))
-                {
-                    m_nFlags |= STATIC_OBJECT_NO_AUTO_HIDEPOINTS;
-                }
-                else if (0 == strcmp(line, "dynamic"))
-                {
-                    m_nFlags |= STATIC_OBJECT_DYNAMIC;
-                }
-                else if (0 == strcmp(line, "no_hit_refinement"))
-                {
-                    m_bNoHitRefinement = true;
-                    for (int i = m_arrPhysGeomInfo.GetGeomCount() - 1; i >= 0; i--)
-                    {
-                        m_arrPhysGeomInfo[i]->pGeom->SetForeignData(0, 0);
-                    }
-                }
-                else if (0 == strcmp(line, "no_explosion_occlusion"))
-                {
-                    m_bDontOccludeExplosions = true;
-                }
-                //////////////////////////////////////////////////////////////////////////
-            }
-        }
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/StatObjPhys.cpp b/Code/CryEngine/Cry3DEngine/StatObjPhys.cpp
deleted file mode 100644
index 2163983781..0000000000
--- a/Code/CryEngine/Cry3DEngine/StatObjPhys.cpp
+++ /dev/null
@@ -1,2133 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : make physical representation
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "IndexedMesh.h"
-#include "3dEngine.h"
-#include "CGFContent.h"
-#include "ObjMan.h"
-#define SMALL_MESH_NUM_INDEX 30
-
-#include <CryPhysicsDeprecation.h>
-
-
-//////////////////////////////////////////////////////////////////////////
-///////////////////////// Breakable Geometry /////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-namespace
-{
-    template<class T>
-    struct SplitArray
-    {
-        T* ptr[2];
-        T& operator[](int idx) { return ptr[idx >> 15][idx & ~(1 << 15)]; }
-        T* operator+(int idx) { return ptr[idx >> 15] + (idx & ~(1 << 15)); }
-        T* operator-(int idx) { return ptr[idx >> 15] - (idx & ~(1 << 15)); }
-    };
-}
-
-static inline int mapiTri(int itri, int* pIdx2iTri)
-{
-    int mask = (itri - BOP_NEWIDX0) >> 31;
-    return itri & mask | pIdx2iTri[itri - BOP_NEWIDX0 | mask];
-}
-
-static inline void swap(int* pSubsets, vtx_idx* pidx, int* pmap, int i1, int i2)
-{
-    int i = pSubsets[i1];
-    pSubsets[i1] = pSubsets[i2];
-    pSubsets[i2] = i;
-    i = pmap[i1];
-    pmap[i1] = pmap[i2];
-    pmap[i2] = i;
-    for (i = 0; i < 3; i++)
-    {
-        vtx_idx u = pidx[i1 * 3 + i];
-        pidx[i1 * 3 + i] = pidx[i2 * 3 + i];
-        pidx[i2 * 3 + i] = u;
-    }
-}
-static void qsort(int* pSubsets, vtx_idx* pidx, int* pmap, int ileft, int iright, int iter = 0)
-{
-    if (ileft >= iright)
-    {
-        return;
-    }
-    int i, ilast, diff = 0;
-    swap(pSubsets, pidx, pmap, ileft, (ileft + iright) >> 1);
-    for (ilast = ileft, i = ileft + 1; i <= iright; i++)
-    {
-        diff |= pSubsets[i] - pSubsets[ileft];
-        if (pSubsets[i] < pSubsets[ileft] + iter) // < when iter==0 and <= when iter==1
-        {
-            swap(pSubsets, pidx, pmap, ++ilast, i);
-        }
-    }
-    swap(pSubsets, pidx, pmap, ileft, ilast);
-
-    if (diff)
-    {
-        qsort(pSubsets, pidx, pmap, ileft, ilast - 1, iter ^ 1);
-        qsort(pSubsets, pidx, pmap, ilast + 1, iright, iter ^ 1);
-    }
-}
-
-static inline int check_mask(unsigned int* pMask, int i)
-{
-    return pMask[i >> 5] >> (i & 31) & 1;
-}
-static inline void set_mask(unsigned int* pMask, int i)
-{
-    pMask[i >> 5] |= 1u << (i & 31);
-}
-static inline void clear_mask(unsigned int* pMask, int i)
-{
-    pMask[i >> 5] &= ~(1u << (i & 31));
-}
-
-//////////////////////////////////////////////////////////////////////////
-///////////////////////// Deformable Geometry ////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-
-
-int CStatObj::SubobjHasDeformMorph(int iSubObj)
-{
-    int i;
-    char nameDeformed[256];
-    cry_strcpy(nameDeformed, m_subObjects[iSubObj].name);
-    cry_strcat(nameDeformed, "_Destroyed");
-
-    for (i = m_subObjects.size() - 1; i >= 0 && strcmp(m_subObjects[i].name, nameDeformed); i--)
-    {
-        ;
-    }
-    return i;
-}
-
-#define getBidx(islot) _getBidx(islot, pIdxABuf, pFaceToFace0A, pFace0ToFaceB, pIdxB)
-static inline int _getBidx(int islot, int* pIdxABuf, uint16* pFaceToFace0A, int* pFace0ToFaceB, vtx_idx* pIdxB)
-{
-    int idx, mask;
-    idx = pFace0ToFaceB[pFaceToFace0A[pIdxABuf[islot] >> 2]] * 3 + (pIdxABuf[islot] & 3);
-    mask = idx >> 31;
-    return (pIdxB[idx & ~mask] & ~mask) + mask;
-}
-
-
-int CStatObj::SetDeformationMorphTarget(IStatObj* pDeformed)
-{
-    int i, j, k, j0, it, ivtx, nVtxA, nVtxAnew, nVtxA0, nIdxA, nFacesA, nFacesB;
-    vtx_idx* pIdxA, * pIdxB;
-    int* pVtx2IdxA, * pIdxABuf, * pFace0ToFaceB;
-    uint16* pFaceToFace0A, * pFaceToFace0B, maxFace0;
-    _smart_ptr<IRenderMesh> pMeshA, pMeshB, pMeshBnew;
-    strided_pointer<Vec3> pVtxA, pVtxB, pVtxBnew;
-    strided_pointer<Vec2> pTexA, pTexB, pTexBnew;
-    strided_pointer<SPipTangents> pTangentsA, pTangentsB, pTangentsBnew;
-    if (!GetRenderMesh())
-    {
-        MakeRenderMesh();
-    }
-    if (!pDeformed->GetRenderMesh())
-    {
-        ((CStatObj*)pDeformed)->MakeRenderMesh();
-    }
-    if (!(pMeshA = GetRenderMesh()) || !(pMeshB = pDeformed->GetRenderMesh()))
-    {
-        return 0;
-    }
-    pFaceToFace0A = m_pMapFaceToFace0;
-    if (!pFaceToFace0A)
-    {
-        return 0;
-    }
-    pFaceToFace0B = ((CStatObj*)pDeformed)->m_pMapFaceToFace0;
-    if (!pFaceToFace0B)
-    {
-        return 0;
-    }
-    if (pMeshA->GetMorphBuddy())
-    {
-        return 1;
-    }
-
-    if (pMeshA->GetVerticesCount() > 0xffff || pMeshB->GetVerticesCount() > 0xffff)
-    {
-        return 0;
-    }
-
-    nVtxA0 = nVtxA = pMeshA->GetVerticesCount();
-    pVtxA.data = (Vec3*)pMeshA->GetPosPtr(pVtxA.iStride, FSL_READ);
-    pTexA.data = (Vec2*)pMeshA->GetUVPtr(pTexA.iStride, FSL_READ);
-    pTangentsA.data = (SPipTangents*)pMeshA->GetTangentPtr(pTangentsA.iStride, FSL_READ);
-
-    pVtxB.data = (Vec3*)pMeshB->GetPosPtr(pVtxB.iStride, FSL_READ);
-    pTexB.data = (Vec2*)pMeshB->GetUVPtr(pTexB.iStride, FSL_READ);
-    pTangentsB.data = (SPipTangents*)pMeshB->GetTangentPtr(pTangentsB.iStride, FSL_READ);
-
-    nFacesB = pMeshB->GetIndicesCount();
-    nFacesB /= 3;
-    pIdxB = pMeshB->GetIndexPtr(FSL_READ);
-    nIdxA = pMeshA->GetIndicesCount();
-    nFacesA = nIdxA /= 3;
-    pIdxA = pMeshA->GetIndexPtr(FSL_READ);
-
-    memset(pVtx2IdxA = new int[nVtxA + 1], 0, (nVtxA + 1) * sizeof(int));
-    for (i = 0; i < nIdxA; i++)
-    {
-        pVtx2IdxA[pIdxA[i]]++;
-    }
-    for (i = maxFace0 = 0; i < nFacesA; i++)
-    {
-        maxFace0 = max(maxFace0, pFaceToFace0A[i]);
-    }
-    for (i = 0; i < nVtxA; i++)
-    {
-        pVtx2IdxA[i + 1] += pVtx2IdxA[i];
-    }
-    pIdxABuf = new int[nIdxA];
-    for (i = nFacesA - 1; i >= 0; i--)
-    {
-        for (j = 2; j >= 0; j--)
-        {
-            pIdxABuf[--pVtx2IdxA[pIdxA[i * 3 + j]]] = i * 4 + j;
-        }
-    }
-
-    for (i = nFacesB - 1; i >= 0; i--)
-    {
-        maxFace0 = max(maxFace0, pFaceToFace0B[i]);
-    }
-    memset(pFace0ToFaceB = new int[maxFace0 + 1], -1, (maxFace0 + 1) * sizeof(int));
-    for (i = nFacesB - 1; i >= 0; i--)
-    {
-        pFace0ToFaceB[pFaceToFace0B[i]] = i;
-    }
-
-    for (i = nVtxAnew = k = 0; i < nVtxA; i++)
-    {
-        for (j = pVtx2IdxA[i]; j < pVtx2IdxA[i + 1] - 1; j++)
-        {
-            for (k = pVtx2IdxA[i + 1] - 1; k > j; k--)
-            {
-                if (getBidx(k - 1) > getBidx(k))
-                {
-                    it = pIdxABuf[k - 1], pIdxABuf[k - 1] = pIdxABuf[k], pIdxABuf[k] = it;
-                }
-            }
-        }
-        for (j = pVtx2IdxA[i] + 1; j < pVtx2IdxA[i + 1]; j++)
-        {
-            nVtxAnew += iszero(getBidx(j) - getBidx(j - 1)) ^ 1;
-#ifdef _DEBUG
-            if ((pVtxB[getBidx(j)] - pVtxB[getBidx(j - 1)]).len2() > sqr(0.01f))
-            {
-                k++;
-            }
-#endif
-        }
-    }
-
-    pMeshBnew = GetRenderer()->CreateRenderMesh("StatObj_Deformed", GetFilePath());
-    pMeshBnew->UpdateVertices(0, nVtxA0 + nVtxAnew, 0, VSF_GENERAL, 0u);
-    if (nVtxAnew)
-    {
-        pMeshA = GetRenderer()->CreateRenderMesh("StatObj_MorphTarget", GetFilePath());
-        m_pRenderMesh->CopyTo(pMeshA, nVtxAnew);
-        pVtxA.data = (Vec3*)pMeshA->GetPosPtr(pVtxA.iStride, FSL_SYSTEM_UPDATE);
-        pTexA.data = (Vec2*)pMeshA->GetUVPtr(pTexA.iStride, FSL_SYSTEM_UPDATE);
-        pTangentsA.data = (SPipTangents*)pMeshA->GetTangentPtr(pTangentsA.iStride, FSL_SYSTEM_UPDATE);
-        nIdxA = pMeshA->GetIndicesCount();
-        pIdxA = pMeshA->GetIndexPtr(FSL_READ);
-        m_pRenderMesh = pMeshA;
-    }
-
-    pVtxBnew.data = (Vec3*)pMeshBnew->GetPosPtr(pVtxBnew.iStride, FSL_SYSTEM_UPDATE);
-    pTexBnew.data = (Vec2*)pMeshBnew->GetUVPtr(pTexBnew.iStride, FSL_SYSTEM_UPDATE);
-    pTangentsBnew.data = (SPipTangents*)pMeshBnew->GetTangentPtr(pTangentsBnew.iStride, FSL_SYSTEM_UPDATE);
-
-    for (i = 0; i < nVtxA0; i++)
-    {
-        for (j = j0 = pVtx2IdxA[i]; j < pVtx2IdxA[i + 1]; j++)
-        {
-            if (j == pVtx2IdxA[i + 1] - 1 || getBidx(j) != getBidx(j + 1))
-            {
-                if (j0 > pVtx2IdxA[i])
-                {
-                    ivtx = nVtxA++;
-                    pVtxA[ivtx] = pVtxA[i];
-                    pTangentsA[ivtx] = pTangentsA[i];
-                    pTexA[ivtx] = pTexA[i];
-                    for (k = j0; k <= j; k++)
-                    {
-                        pIdxA[(pIdxABuf[k] >> 2) * 3 + (pIdxABuf[k] & 3)] = ivtx;
-                    }
-                }
-                else
-                {
-                    ivtx = i;
-                }
-                if ((it = getBidx(j)) >= 0)
-                {
-#ifdef _DEBUG
-                    static float maxdist = 0.1f;
-                    float dist = (pVtxB[it] - pVtxA[i]).len();
-                    if (dist > maxdist)
-                    {
-                        k++;
-                    }
-#endif
-                    pVtxBnew[ivtx] = pVtxB[it];
-                    pTangentsBnew[ivtx] = pTangentsB[it];
-                    pTexBnew[ivtx] = pTexB[it];
-                }
-                else
-                {
-                    pVtxBnew[ivtx] = pVtxA[i];
-                    pTangentsBnew[ivtx] = pTangentsA[i];
-                    pTexBnew[ivtx] = pTexA[i];
-                }
-                j0 = j + 1;
-            }
-        }
-    }
-
-    pMeshA->SetMorphBuddy(pMeshBnew);
-    pDeformed->SetFlags(pDeformed->GetFlags() | STATIC_OBJECT_HIDDEN);
-
-    pMeshBnew->UnlockStream(VSF_GENERAL);
-    pMeshBnew->UnlockStream(VSF_TANGENTS);
-    pMeshA->UnlockStream(VSF_GENERAL);
-    pMeshA->UnlockStream(VSF_TANGENTS);
-
-    delete [] pVtx2IdxA;
-    delete [] pIdxABuf;
-    delete [] pFace0ToFaceB;
-
-    return 1;
-}
-
-
-static inline float max_fast(float op1, float op2) { return (op1 + op2 + fabsf(op1 - op2)) * 0.5f; }
-static inline float min_fast(float op1, float op2) { return (op1 + op2 - fabsf(op1 - op2)) * 0.5f; }
-
-static void UpdateWeights(const Vec3& pt, float r, float strength, IRenderMesh* pMesh, IRenderMesh* pWeights)
-{
-    int i, nVtx = pMesh->GetVerticesCount();
-    float r2 = r * r, rr = 1 / r;
-    strided_pointer<Vec3> pVtx;
-    strided_pointer<Vec2> pWeight;
-    pVtx.data = (Vec3*)pMesh->GetPosPtr(pVtx.iStride, FSL_SYSTEM_UPDATE);
-    pWeight.data = (Vec2*)pWeights->GetPosPtr(pWeight.iStride, FSL_SYSTEM_UPDATE);
-
-    if (r > 0)
-    {
-        for (i = 0; i < nVtx; i++)
-        {
-            if ((pVtx[i] - pt).len2() < r2)
-            {
-                pWeight[i].x = max_fast(0.0f, min_fast(1.0f, pWeight[i].x + strength * (1 - (pVtx[i] - pt).len() * rr)));
-            }
-        }
-    }
-    else
-    {
-        for (i = 0; i < nVtx; i++)
-        {
-            pWeight[i].x = max_fast(0.0f, min_fast(1.0f, pWeight[i].x + strength));
-        }
-    }
-}
-
-
-IStatObj* CStatObj::DeformMorph(const Vec3& pt, float r, float strength, IRenderMesh* pWeights)
-{
-    int i, j;
-    CStatObj* pObj = this;
-
-    if (!GetCVars()->e_DeformableObjects)
-    {
-        return pObj;
-    }
-
-    if (m_bHasDeformationMorphs)
-    {
-        if (!(GetFlags() & STATIC_OBJECT_CLONE))
-        {
-            pObj = (CStatObj*)Clone(true, false, false);
-            pObj->m_bUnmergable = 1;
-            for (i = pObj->GetSubObjectCount() - 1; i >= 0; i--)
-            {
-                if ((j = pObj->SubobjHasDeformMorph(i)) >= 0)
-                {
-                    pObj->GetSubObject(i)->pWeights = pObj->GetSubObject(i)->pStatObj->GetRenderMesh()->GenerateMorphWeights();
-                    pObj->GetSubObject(j)->pStatObj->SetFlags(pObj->GetSubObject(j)->pStatObj->GetFlags() | STATIC_OBJECT_HIDDEN);
-                }
-            }
-            return pObj->DeformMorph(pt, r, strength, pWeights);
-        }
-        for (i = m_subObjects.size() - 1; i >= 0; i--)
-        {
-            if (m_subObjects[i].pWeights)
-            {
-                UpdateWeights(m_subObjects[i].tm.GetInverted() * pt,
-                    r * (fabs_tpl(m_subObjects[i].tm.GetColumn(0).len2() - 1.0f) < 0.01f ? 1.0f : 1.0f / m_subObjects[i].tm.GetColumn(0).len()),
-                    strength, m_subObjects[i].pStatObj->GetRenderMesh(), m_subObjects[i].pWeights);
-            }
-        }
-    }
-    else if (m_nSubObjectMeshCount == 0 && m_pRenderMesh && m_pRenderMesh->GetMorphBuddy())
-    {
-        if (!pWeights)
-        {
-            pObj = new CStatObj;
-            pObj->m_pMaterial = m_pMaterial;
-            pObj->m_fObjectRadius = m_fObjectRadius;
-            pObj->m_vBoxMin = m_vBoxMin;
-            pObj->m_vBoxMax = m_vBoxMax;
-            pObj->m_vVegCenter = m_vVegCenter;
-            pObj->m_fRadiusHors = m_fRadiusHors;
-            pObj->m_fRadiusVert = m_fRadiusVert;
-            pObj->m_nFlags = m_nFlags | STATIC_OBJECT_CLONE;
-            pObj->m_bHasDeformationMorphs = true;
-            pObj->m_nSubObjectMeshCount = 1;
-            pObj->m_bSharesChildren = true;
-            pObj->m_subObjects.resize(1);
-            pObj->m_subObjects[0].nType = STATIC_SUB_OBJECT_MESH;
-            pObj->m_subObjects[0].name = "";
-            pObj->m_subObjects[0].properties = "";
-            pObj->m_subObjects[0].bIdentityMatrix = true;
-            pObj->m_subObjects[0].tm.SetIdentity();
-            pObj->m_subObjects[0].localTM.SetIdentity();
-            pObj->m_subObjects[0].pStatObj = this;
-            pObj->m_subObjects[0].nParent = -1;
-            pObj->m_subObjects[0].helperSize = Vec3(0, 0, 0);
-            pObj->m_subObjects[0].pWeights = GetRenderMesh()->GenerateMorphWeights();
-            return pObj->DeformMorph(pt, r, strength, pWeights);
-        }
-        UpdateWeights(pt, r, strength, m_pRenderMesh, pWeights);
-    }
-
-    return this;
-}
-
-
-IStatObj* CStatObj::HideFoliage()
-{
-    int i;//,j,idx0;
-    CMesh* pMesh;
-    if (!GetIndexedMesh())
-    {
-        return this;
-    }
-
-    pMesh = GetIndexedMesh()->GetMesh();
-    for (i = pMesh->m_subsets.size() - 1; i >= 0; i--)
-    {
-        if (pMesh->m_subsets[i].nPhysicalizeType == PHYS_GEOM_TYPE_NONE)
-        {
-            //pMesh->m_subsets[i].nMatFlags |= MTL_FLAG_NODRAW;
-            //idx0 = i>0 ? pMesh->m_subsets[i-1].nFirstIndexId+pMesh->m_subsets[i-1].nNumIndices : 0;
-            pMesh->m_subsets.erase(pMesh->m_subsets.begin() + i);
-            /*for(j=i;j<pMesh->m_subsets.size();j++)
-            {
-                memmove(pMesh->m_pIndices+idx0, pMesh->m_pIndices+pMesh->m_subsets[j].nFirstIndexId,
-                    pMesh->m_subsets[j].nNumIndices*sizeof(pMesh->m_pIndices[0]));
-                pMesh->m_subsets[j].nFirstIndexId = idx0;
-                idx0 += pMesh->m_subsets[j].nNumIndices;
-            }
-            pMesh->m_nIndexCount = idx0;*/
-        }
-    }
-    Invalidate();
-
-    return this;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-////////////////////////   SubObjects    /////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-static inline int GetEdgeByBuddy(mesh_data* pmd, int itri, int itri_buddy)
-{
-    int iedge = 0, imask;
-    imask = pmd->pTopology[itri].ibuddy[1] - itri_buddy;
-    imask = (imask - 1) >> 31 ^ imask >> 31;
-    iedge = 1 & imask;
-    imask = pmd->pTopology[itri].ibuddy[2] - itri_buddy;
-    imask = (imask - 1) >> 31 ^ imask >> 31;
-    iedge = iedge & ~imask | 2 & imask;
-    return iedge;
-}
-static inline float qmin(float op1, float op2) { return (op1 + op2 - fabsf(op1 - op2)) * 0.5f; }
-static inline float qmax(float op1, float op2) { return (op1 + op2 + fabsf(op1 - op2)) * 0.5f; }
-
-static int __s_pvtx_map_dummy = 0;
-
-static void SyncToRenderMesh(SSyncToRenderMeshContext* ctx, volatile int* updateState)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ThreeDEngine);
-
-    IGeometry* pPhysGeom = ctx->pObj->GetPhysGeom() ? ctx->pObj->GetPhysGeom()->pGeom : 0;
-    if (pPhysGeom)
-    {
-        pPhysGeom->Lock(0);
-        IStatObj* pObjSrc = (IStatObj*)pPhysGeom->GetForeignData(0);
-        if (pPhysGeom->GetForeignData(DATA_MESHUPDATE) || !ctx->pObj->m_hasClothTangentsData || pObjSrc != ctx->pObj && pObjSrc != ctx->pObj->GetCloneSourceObject())
-        {   // skip all updates if the mesh was altered
-            if (updateState)
-            {
-                CryInterlockedDecrement(updateState);
-            }
-            pPhysGeom->Unlock(0);
-            return;
-        }
-    }
-    Vec3 n, edge, t;
-    int i, j;
-    Vec3* vmin = ctx->vmin, * vmax = ctx->vmax;
-    int iVtx0 = ctx->iVtx0, nVtx = ctx->nVtx, mask = ctx->mask;
-    strided_pointer<Vec3> pVtx = ctx->pVtx;
-    int* pVtxMap = (mask == ~0) ? &__s_pvtx_map_dummy : ctx->pVtxMap;
-    float rscale = ctx->rscale;
-    SClothTangentVtx* ctd = ctx->ctd;
-    strided_pointer<Vec3> pMeshVtx = ctx->pMeshVtx;
-    strided_pointer<SPipTangents> pTangents = ctx->pTangents;
-    strided_pointer<Vec3> pNormals = ctx->pNormals;
-
-    AABB bbox;
-    bbox.Reset();
-
-    if (pMeshVtx)
-    {
-        for (i = iVtx0; i < nVtx; i++)
-        {
-            Vec3 v = pVtx[j = pVtxMap[i & ~mask] | i & mask] * rscale;
-            bbox.Add(v);
-            pMeshVtx[i] = v;
-        }
-        *vmin = bbox.min;
-        *vmax = bbox.max;
-    }
-
-    if (pTangents)
-    {
-        for (i = iVtx0; i < nVtx; i++)
-        {
-            SMeshTangents tb(pTangents[i]);
-            int16 nsg;
-            tb.GetR(nsg);
-
-            j = pVtxMap[i & ~mask] | i & mask;
-            n = pNormals[j] * aznumeric_cast<float>(ctd[i].sgnNorm);
-            edge = (pVtx[ctd[i].ivtxT] - pVtx[j]).normalized();
-            Matrix33 M;
-            crossproduct_matrix(pNormals[j] * ctd[i].edge.y, M) *= nsg;
-            M += Matrix33(IDENTITY) * ctd[i].edge.x;
-            t = M.GetInverted() * (edge - n * ctd[i].edge.z);
-            (t -= n * (n * t)).Normalize();
-            t.x = qmin(qmax(t.x, -0.9999f), 0.9999f);
-            t.y = qmin(qmax(t.y, -0.9999f), 0.9999f);
-            t.z = qmin(qmax(t.z, -0.9999f), 0.9999f);
-            Vec3 b = n.Cross(t) * nsg;
-
-            tb = SMeshTangents(t, b, nsg);
-            tb.ExportTo(pTangents[i]);
-        }
-    }
-
-    if (updateState)
-    {
-        CryInterlockedDecrement(updateState);
-    }
-    if (pPhysGeom)
-    {
-        pPhysGeom->Unlock(0);
-    }
-}
-
-IStatObj* CStatObj::UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<Vec3> pNormals, int iVtx0, int nVtx, int* pVtxMap, float rscale)
-{
-    CStatObj* pObj = this;
-    if (m_pRenderMesh)
-    {
-        strided_pointer<Vec3> pMeshVtx;
-        strided_pointer<SPipTangents> pTangents;
-        int i, j, mask = 0, dummy = 0, nVtxFull;
-        if (!pVtxMap)
-        {
-            pVtxMap = &dummy, mask = ~0;
-        }
-        AABB bbox;
-        bbox.Reset();
-        SClothTangentVtx* ctd;
-
-        if (!m_hasClothTangentsData && GetPhysGeom() && GetPhysGeom()->pGeom->GetType() == GEOM_TRIMESH && m_pRenderMesh)
-        {
-            if (GetPhysGeom()->pGeom->GetForeignData(DATA_MESHUPDATE))
-            {
-                return this;
-            }
-            ctd = m_pClothTangentsData = new SClothTangentVtx[nVtxFull = m_pRenderMesh->GetVerticesCount()];
-            m_hasClothTangentsData = 1;
-            memset(m_pClothTangentsData, 0, sizeof(SClothTangentVtx) * nVtxFull);
-            mesh_data* pmd = (mesh_data*)GetPhysGeom()->pGeom->GetData();
-            m_pRenderMesh->LockForThreadAccess();
-            pTangents.data = (SPipTangents*)m_pRenderMesh->GetTangentPtr(pTangents.iStride, FSL_READ);
-            for (i = 0; i < pmd->nTris; i++)
-            {
-                for (j = 0; j < 3; j++)
-                {
-                    ctd[pmd->pIndices[i * 3 + j]].ivtxT = i, ctd[pmd->pIndices[i * 3 + j]].sgnNorm = j;
-                }
-            }
-            if (pmd->pVtxMap)
-            {
-                for (i = 0; i < pmd->nVertices; i++)
-                {
-                    ctd[i].ivtxT = ctd[pmd->pVtxMap[i]].ivtxT, ctd[i].sgnNorm = ctd[pmd->pVtxMap[i]].sgnNorm;
-                }
-            }
-
-            for (i = 0; i < nVtxFull && pTangents; i++)
-            {
-                j = pmd->pVtxMap ? pmd->pVtxMap[i] : i;
-
-                SMeshTangents tb = SMeshTangents(pTangents[i]);
-                Vec3 t, b, s;
-                tb.GetTBN(t, b, s);
-
-                float tedge = -1, tedgeDenom = 0;
-                int itri = ctd[i].ivtxT, iedge = ctd[i].sgnNorm, itriT = 0, iedgeT = 0, itri1, loop;
-                Vec3 n, edge, edge0;
-                n.zero();
-
-                for (int iter = 0; iter < 2; iter++)
-                {
-                    for (edge0.zero(), loop = 20;; ) // iter==0 - trace cw, 1 - ccw
-                    {
-                        edge = (pmd->pVertices[pmd->pIndices[itri * 3 + inc_mod3[iedge]]] - pmd->pVertices[pmd->pIndices[itri * 3 + iedge]]) * (1.f - iter * 2.f);
-                        n += (edge0 ^ edge) * (iter * 2.f - 1.f);
-                        edge0 = edge;
-                        if (sqr(t * edge) * tedgeDenom > tedge * edge.len2())
-                        {
-                            tedge = sqr(t * edge), tedgeDenom = edge.len2(), itriT = itri, iedgeT = iedge;
-                        }
-                        itri1 = pmd->pTopology[itri].ibuddy[iedge];
-                        if (itri1 == ctd[i].ivtxT || itri1 < 0 || --loop < 0)
-                        {
-                            break;
-                        }
-                        iedge = GetEdgeByBuddy(pmd, itri1, itri) + 1 + iter;
-                        itri = itri1;
-                        iedge -= 3 & (2 - iedge) >> 31;
-                    }
-                    if (itri1 >= 0 && iter == 0)
-                    {
-                        n.zero();
-                    }
-                    itri = ctd[i].ivtxT;
-                    iedge = dec_mod3[ctd[i].sgnNorm];
-                }
-                n += pmd->pVertices[pmd->pIndices[ctd[i].ivtxT * 3 + 1]] - pmd->pVertices[pmd->pIndices[ctd[i].ivtxT * 3]] ^
-                    pmd->pVertices[pmd->pIndices[ctd[i].ivtxT * 3 + 2]] - pmd->pVertices[pmd->pIndices[ctd[i].ivtxT * 3]];
-
-                if ((ctd[i].ivtxT = pmd->pIndices[itriT * 3 + iedgeT]) == j)
-                {
-                    ctd[i].ivtxT = pmd->pIndices[itriT * 3 + inc_mod3[iedgeT]];
-                }
-                edge = (pmd->pVertices[ctd[i].ivtxT] - pmd->pVertices[j]).normalized();
-
-                ctd[i].edge.Set(edge * t, edge * b, edge * s);
-                ctd[i].sgnNorm = sgnnz(n * s);
-            }
-            if (pObj != this)
-            {
-                memcpy(pObj->m_pClothTangentsData = new SClothTangentVtx[nVtxFull], ctd, nVtxFull * sizeof(SClothTangentVtx));
-                pObj->m_hasClothTangentsData = 1;
-            }
-            pObj->SetFlags(pObj->GetFlags() & ~STATIC_OBJECT_CANT_BREAK);
-            m_pRenderMesh->UnLockForThreadAccess();
-        }
-
-        if (GetTetrLattice() || m_hasSkinInfo)
-        {
-            Vec3 sz = GetAABB().GetSize();
-            float szmin = min(min(sz.x, sz.y), sz.z), szmax = max(max(sz.x, sz.y), sz.z), szmed = sz.x + sz.y + sz.y - szmin - szmax;
-            if (!m_hasSkinInfo)
-            {
-                PrepareSkinData(Matrix34(IDENTITY), 0, min(szmin * 0.5f, szmed * 0.15f));
-            }
-            if (pVtx)
-            {
-                return SkinVertices(pVtx, Matrix34(IDENTITY));
-            }
-            return pObj;
-        }
-
-        if (!pVtx)
-        {
-            return pObj;
-        }
-
-        if (!(GetFlags() & STATIC_OBJECT_CLONE))
-        {
-            pObj = (CStatObj*)Clone(true, true, false);
-            pObj->m_pRenderMesh->KeepSysMesh(true);
-        }
-
-        IRenderMesh* mesh = pObj->m_pRenderMesh;
-        mesh->LockForThreadAccess();
-        pMeshVtx.data = (Vec3*)((mesh = pObj->m_pRenderMesh)->GetPosPtr(pMeshVtx.iStride, FSL_SYSTEM_UPDATE));
-        if (m_hasClothTangentsData && m_pClothTangentsData)
-        {
-            pTangents.data = (SPipTangents*)mesh->GetTangentPtr(pTangents.iStride, FSL_SYSTEM_UPDATE);
-        }
-
-        if (!m_pAsyncUpdateContext)
-        {
-            m_pAsyncUpdateContext = new SSyncToRenderMeshContext;
-        }
-        else
-        {
-            m_pAsyncUpdateContext->jobExecutor.WaitForCompletion();
-        }
-        m_pAsyncUpdateContext->Set(&pObj->m_vBoxMin,    &pObj->m_vBoxMax,   iVtx0, nVtx, pVtx, pVtxMap, mask, rscale
-            , m_pClothTangentsData, pMeshVtx, pTangents, pNormals, pObj);
-
-        if (GetCVars()->e_RenderMeshUpdateAsync)
-        {
-            SSyncToRenderMeshContext* pAsyncUpdateContext = m_pAsyncUpdateContext;
-            volatile int* updateState = mesh->SetAsyncUpdateState();
-            m_pAsyncUpdateContext->jobExecutor.StartJob([pAsyncUpdateContext, updateState]()
-            {
-                SyncToRenderMesh(pAsyncUpdateContext, updateState);
-            });
-        }
-        else
-        {
-            SyncToRenderMesh(m_pAsyncUpdateContext, NULL);
-            if (m_hasClothTangentsData && m_pClothTangentsData)
-            {
-                mesh->UnlockStream(VSF_TANGENTS);
-            }
-            mesh->UnlockStream(VSF_GENERAL);
-        }
-        mesh->UnLockForThreadAccess();
-    }
-    return pObj;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-namespace
-{
-    CryCriticalSection g_cPrepareSkinData;
-}
-
-void CStatObj::PrepareSkinData(const Matrix34& mtxSkelToMesh, IGeometry* pPhysSkel, float r)
-{
-    if (m_hasSkinInfo || pPhysSkel && pPhysSkel->GetType() != GEOM_TRIMESH)
-    {
-        return;
-    }
-
-    // protect again possible paralle calls, if streaming is here, but mainthread also reaches this function
-    // before streaming thread has finished and wants to prepare data also
-    AUTO_LOCK(g_cPrepareSkinData);
-
-    // recheck again to guard again creating the object two times
-    if (m_hasSkinInfo)
-    {
-        return;
-    }
-
-    m_nFlags |= STATIC_OBJECT_DYNAMIC;
-    if (!m_pRenderMesh)
-    {
-        if (!m_pDelayedSkinParams)
-        {
-            m_pDelayedSkinParams = new SDelayedSkinParams;
-            m_pDelayedSkinParams->mtxSkelToMesh = mtxSkelToMesh;
-            m_pDelayedSkinParams->pPhysSkel = pPhysSkel;
-            m_pDelayedSkinParams->r = r;
-        }
-        return;
-    }
-    m_pRenderMesh->KeepSysMesh(true);
-
-    int i, j, nVtx;
-    Vec3 vtx[4];
-    geom_world_data gwd[2];
-    geom_contact* pcontact;
-    mesh_data* md;
-    // two spheres for checking intersections against skeleton
-    CRY_PHYSICS_REPLACEMENT_ASSERT();
-    AZ_UNUSED(pcontact);
-    AZ_UNUSED(j);
-    strided_pointer<Vec3> pVtx;
-    Matrix34 mtxMeshToSkel = mtxSkelToMesh.GetInverted();
-    ITetrLattice* pLattice = GetTetrLattice();
-    if (pLattice)
-    {
-        pPhysSkel = pLattice->CreateSkinMesh();
-    }
-
-    gwd[1].scale = mtxSkelToMesh.GetColumn0().len();
-    gwd[1].offset = mtxSkelToMesh.GetTranslation();
-    gwd[1].R = Matrix33(mtxSkelToMesh) * (1.0f / gwd[1].scale);
-    m_pRenderMesh->GetBBox(vtx[0], vtx[1]);
-    vtx[1] -= vtx[0];
-    primitives::sphere sph;
-    sph.center.zero();
-    sph.r = r > 0.0f ? r : min(min(vtx[1].x, vtx[1].y), vtx[1].z);
-    sph.r *= 3.0f;
-    assert(pPhysSkel);
-    PREFAST_ASSUME(pPhysSkel);
-    md = (mesh_data*)pPhysSkel->GetData();
-    IRenderMesh::ThreadAccessLock lockrm(m_pRenderMesh);
-    pVtx.data = (Vec3*)m_pRenderMesh->GetPosPtr(pVtx.iStride, FSL_READ);
-    SSkinVtx* pSkinInfo = m_pSkinInfo = new SSkinVtx[nVtx = m_pRenderMesh->GetVerticesCount()];
-    m_hasSkinInfo = 1;
-
-    for (i = 0; i < nVtx; i++)
-    {
-        Vec3 v = pVtx[i];
-        if (pSkinInfo[i].bVolumetric = (pLattice && pLattice->CheckPoint(mtxMeshToSkel * v, pSkinInfo[i].idx, pSkinInfo[i].w)))
-        {
-            pSkinInfo[i].M = Matrix33(md->pVertices[pSkinInfo[i].idx[1]] - md->pVertices[pSkinInfo[i].idx[0]],
-                    md->pVertices[pSkinInfo[i].idx[2]] - md->pVertices[pSkinInfo[i].idx[0]],
-                    md->pVertices[pSkinInfo[i].idx[3]] - md->pVertices[pSkinInfo[i].idx[0]]).GetInverted();
-        }
-        else
-        {
-            gwd[0].offset = v;
-        }
-    }
-    if (pLattice)
-    {
-        pPhysSkel->Release();
-    }
-}
-
-IStatObj* CStatObj::SkinVertices(strided_pointer<Vec3> pSkelVtx, const Matrix34& mtxSkelToMesh)
-{
-    if (!m_hasSkinInfo && m_pDelayedSkinParams)
-    {
-        PrepareSkinData(m_pDelayedSkinParams->mtxSkelToMesh, m_pDelayedSkinParams->pPhysSkel, m_pDelayedSkinParams->r);
-        if (m_hasSkinInfo)
-        {
-            delete m_pDelayedSkinParams, m_pDelayedSkinParams = 0;
-        }
-    }
-    if (!m_pRenderMesh || !m_hasSkinInfo)
-    {
-        return this;
-    }
-    CStatObj* pObj = this;
-    if (!(GetFlags() & STATIC_OBJECT_CLONE))
-    {
-        pObj = (CStatObj*)Clone(true, true, false);
-    }
-    if (!pObj->m_pClonedSourceObject || !pObj->m_pClonedSourceObject->m_pRenderMesh)
-    {
-        return pObj;
-    }
-
-    strided_pointer<Vec3> pVtx;
-    strided_pointer<SPipTangents> pTangents, pTangents0;
-    Vec3 vtx[4], t, b;
-    Matrix33 M;
-    AABB bbox;
-    bbox.Reset();
-    int i, j, nVtx;
-    SSkinVtx* pSkinInfo = m_pSkinInfo;
-    pObj->m_pRenderMesh->LockForThreadAccess();
-    pObj->m_pClonedSourceObject->m_pRenderMesh->LockForThreadAccess();
-
-    pVtx.data = (Vec3*)pObj->m_pRenderMesh->GetPosPtr(pVtx.iStride, FSL_SYSTEM_UPDATE);
-    pTangents.data = (SPipTangents*)pObj->m_pRenderMesh->GetTangentPtr(pTangents.iStride, FSL_SYSTEM_UPDATE);
-    pTangents0.data = (SPipTangents*)pObj->m_pClonedSourceObject->m_pRenderMesh->GetTangentPtr(pTangents0.iStride, FSL_READ);
-    nVtx = pObj->m_pRenderMesh->GetVerticesCount();
-    if (!pVtx.data)
-    {
-        nVtx = 0;
-    }
-    const bool canUseTangents = pTangents.data && pTangents0.data;
-    for (i = 0; i < nVtx; i++)
-    {
-        Vec3 v3 = pVtx[i];
-        if (pSkinInfo[i].idx[0] >= 0)
-        {
-            for (j = 0, v3.zero(); j < 3 + pSkinInfo[i].bVolumetric; j++)
-            {
-                v3 += pSkinInfo[i].w[j] * (vtx[j] = mtxSkelToMesh * pSkelVtx[pSkinInfo[i].idx[j]]);
-            }
-            if (!pSkinInfo[i].bVolumetric)
-            {
-                Vec3 n = (vtx[1] - vtx[0] ^ vtx[2] - vtx[0]).normalized();
-                v3 += n * pSkinInfo[i].w[3];
-                Vec3 edge = (vtx[1] + vtx[2] - vtx[0] * 2).normalized();
-                M = Matrix33(edge, n ^ edge, n);
-            }
-            else
-            {
-                M = Matrix33(vtx[1] - vtx[0], vtx[2] - vtx[0], vtx[3] - vtx[0]);
-            }
-            M *= pSkinInfo[i].M;
-            if (canUseTangents)
-            {
-                SMeshTangents tb(pTangents0[i]);
-
-                tb.RotateBy(M);
-                tb.ExportTo(pTangents0[i]);
-            }
-            pVtx[i] = v3;
-        }
-        bbox.Add(v3);
-    }
-    pObj->m_pRenderMesh->UnlockStream(VSF_GENERAL);
-    pObj->m_pRenderMesh->UnlockStream(VSF_TANGENTS);
-    pObj->m_pClonedSourceObject->m_pRenderMesh->UnlockStream(VSF_TANGENTS);
-    pObj->m_pClonedSourceObject->m_pRenderMesh->UnLockForThreadAccess();
-    pObj->m_pRenderMesh->UnLockForThreadAccess();
-    pObj->m_vBoxMin = bbox.min;
-    pObj->m_vBoxMax = bbox.max;
-    return pObj;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-int CStatObj::Physicalize(IPhysicalEntity* pent, pe_geomparams* pgp, int id, const char* szPropsOverride)
-{
-    int res = -1;
-    if (GetFlags() & STATIC_OBJECT_COMPOUND)
-    {
-        Matrix34 mtxId(IDENTITY);
-        res = PhysicalizeSubobjects(pent, pgp->pMtx3x4 ? pgp->pMtx3x4 : &mtxId, pgp->mass, pgp->density, id, 0, szPropsOverride);
-    }
-
-    {
-        int i, nNoColl, iNoColl = 0;
-        float V;
-        if (pgp->mass < 0 && pgp->density < 0)
-        {
-            GetPhysicalProperties(pgp->mass, pgp->density);
-        }
-        for (i = m_arrPhysGeomInfo.GetGeomCount() - 1, nNoColl = 0, V = 0.0f; i >= 0; i--)
-        {
-            if (m_arrPhysGeomInfo.GetGeomType(i) == PHYS_GEOM_TYPE_DEFAULT)
-            {
-                V += m_arrPhysGeomInfo[i]->V;
-            }
-            else
-            {
-                iNoColl = i, ++nNoColl;
-            }
-        }
-        int flags0 = pgp->flags;
-        ISurfaceTypeManager* pSurfaceMan = Get3DEngine()->GetMaterialManager()->GetSurfaceTypeManager();
-        if (phys_geometry* pSolid = m_arrPhysGeomInfo[PHYS_GEOM_TYPE_DEFAULT])
-        {
-            if (pSolid->surface_idx < pSolid->nMats)
-            {
-                if (ISurfaceType* pMat = pSurfaceMan->GetSurfaceType(pSolid->pMatMapping[pSolid->surface_idx]))
-                {
-                    if (pMat->GetPhyscalParams().collType >= 0)
-                    {
-                        (pgp->flags &= ~(geom_collides | geom_floats)) |= pMat->GetPhyscalParams().collType;
-                    }
-                }
-            }
-        }
-        if (pgp->mass > pgp->density && V > 0.0f)   // mass is set instead of density and V is valid
-        {
-            pgp->density = pgp->mass / V, pgp->mass = -1.0f;
-        }
-        (pgp->flags &= ~geom_colltype_explosion) |= geom_colltype_explosion & ~-(int)m_bDontOccludeExplosions;
-        (pgp->flags &= ~geom_manually_breakable) |= geom_manually_breakable &  - (int)m_bBreakableByGame;
-        if (m_nFlags & STATIC_OBJECT_NO_PLAYER_COLLIDE)
-        {
-            pgp->flags &= ~geom_colltype_player;
-        }
-        if (m_nSpines && m_arrPhysGeomInfo.GetGeomCount() - nNoColl <= 1 &&
-            (nNoColl == 1 || nNoColl == 2 && m_arrPhysGeomInfo[PHYS_GEOM_TYPE_NO_COLLIDE] && m_arrPhysGeomInfo[PHYS_GEOM_TYPE_OBSTRUCT]))
-        {
-            pe_params_structural_joint psj;
-            bool bHasJoints = false;
-            if (m_arrPhysGeomInfo.GetGeomCount() > nNoColl)
-            {
-                if (nNoColl && m_pParentObject && m_pParentObject != this)
-                {
-                    CStatObj* pParent;
-                    for (pParent = m_pParentObject; pParent->m_pParentObject; pParent = pParent->m_pParentObject)
-                    {
-                        ;
-                    }
-                    bHasJoints = pParent->FindSubObject_StrStr("$joint") != 0;
-                    psj.partid[0] = id;
-                    psj.pt = m_arrPhysGeomInfo[iNoColl]->origin;
-                    psj.bBreakable = 0;
-                }
-                res = pent->AddGeometry(m_arrPhysGeomInfo[PHYS_GEOM_TYPE_DEFAULT], pgp, id);
-                id += 1024;
-            }
-            pgp->minContactDist = 1.0f;
-            pgp->density = 5.0f;
-            if (nNoColl == 1)
-            {
-                pgp->flags = geom_log_interactions | geom_squashy;
-                pgp->flags |= geom_colltype_foliage_proxy;
-                res = pent->AddGeometry(m_arrPhysGeomInfo[iNoColl], pgp, psj.partid[1] = id);
-                if (bHasJoints)
-                {
-                    pent->SetParams(&psj);
-                }
-            }
-            else
-            {
-                pgp->flags = geom_squashy | geom_colltype_obstruct;
-                pent->AddGeometry(m_arrPhysGeomInfo[PHYS_GEOM_TYPE_OBSTRUCT], pgp, psj.partid[1] = id);
-                id += 1024;
-                if (bHasJoints)
-                {
-                    pent->SetParams(&psj);
-                }
-                pgp->flags = geom_log_interactions | geom_colltype_foliage_proxy;
-                int flagsCollider = pgp->flagsCollider;
-                pgp->flagsCollider = 0;
-                pent->AddGeometry(m_arrPhysGeomInfo[PHYS_GEOM_TYPE_NO_COLLIDE], pgp, psj.partid[1] = id);
-                pgp->flagsCollider = flagsCollider;
-                if (bHasJoints)
-                {
-                    pent->SetParams(&psj);
-                }
-            }
-        }
-        else if (nNoColl == 1 && m_arrPhysGeomInfo.GetGeomCount() == 2)
-        {   // one solid, one obstruct or nocoll proxy -> use single part with ray proxy
-            res = pent->AddGeometry(m_arrPhysGeomInfo[iNoColl], pgp, id);
-            pgp->flags |= geom_proxy;
-            pent->AddGeometry(m_arrPhysGeomInfo[iNoColl ^ 1], pgp, res);
-            pgp->flags &= ~geom_proxy;
-        }
-        else
-        {   // add all solid and non-colliding geoms as individual parts
-            for (i = 0; i < m_arrPhysGeomInfo.GetGeomCount(); i++)
-            {
-                if (m_arrPhysGeomInfo.GetGeomType(i) == PHYS_GEOM_TYPE_DEFAULT)
-                {
-                    res = pent->AddGeometry(m_arrPhysGeomInfo[i], pgp, id), id += 1024;
-                }
-            }
-            pgp->idmatBreakable = -1;
-            for (i = 0; i < m_arrPhysGeomInfo.GetGeomCount(); i++)
-            {
-                if (m_arrPhysGeomInfo.GetGeomType(i) == PHYS_GEOM_TYPE_NO_COLLIDE)
-                {
-                    pgp->flags = geom_colltype_ray, res = pent->AddGeometry(m_arrPhysGeomInfo[i], pgp, id), id += 1024;
-                }
-                else if (m_arrPhysGeomInfo.GetGeomType(i) == PHYS_GEOM_TYPE_OBSTRUCT)
-                {
-                    pgp->flags = geom_colltype_obstruct, res = pent->AddGeometry(m_arrPhysGeomInfo[i], pgp, id), id += 1024;
-                }
-            }
-        }
-        pgp->flags = flags0;
-
-        if (m_arrPhysGeomInfo.GetGeomCount() >= 10 && pent->GetType() == PE_STATIC)
-        {
-            pe_params_flags pf;
-            pf.flagsOR = pef_parts_traceable;
-            pf.flagsAND = ~pef_traceable;
-            pent->SetParams(&pf);
-        }
-    }
-    return res;
-}
-
-#define isalpha(c) isalpha((unsigned char)c)
-#define isdigit(c) isdigit((unsigned char)c)
-
-int CStatObj::PhysicalizeSubobjects(IPhysicalEntity* pent, const Matrix34* pMtx, float mass, float density, int id0, strided_pointer<int> pJointsIdMap, const char* szPropsOverride)
-{
-    int i, j, i0, i1, len = 0, len1, nObj = GetSubObjectCount(), ipart[2], nparts, bHasPlayerOnlyGeoms = 0, nGeoms = 0, id, idNext = 0;
-    float V[2], M, scale, jointsz;
-    const char* pval, * properties;
-    bool bHasSkeletons = false, bAutoJoints = false;
-    Matrix34 mtxLoc;
-    Vec3 dist;
-    primitives::box joint_bbox;
-    IGeometry* pJointBox = 0;
-
-    primitives::box bbox;
-    IStatObj::SSubObject* pSubObj, * pSubObj1;
-    pe_articgeomparams partpos;
-    pe_params_structural_joint psj;
-    pe_params_flags pf;
-    geom_world_data gwd;
-    intersection_params ip;
-    geom_contact* pcontacts;
-    scale = pMtx ? pMtx->GetColumn(0).len() : 1.0f;
-    ip.bStopAtFirstTri = ip.bNoBorder = true;
-
-    bbox.Basis.SetIdentity();
-    bbox.size.Set(0.5f, 0.5f, 0.5f);
-    bbox.center.zero();
-    joint_bbox = bbox;
-    pf.flagsOR = 0;
-
-    for (i = 0; i < nObj; i++)
-    {
-        if ((pSubObj = GetSubObject(i))->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj && pSubObj->pStatObj->GetPhysGeom() &&
-            pSubObj->bHidden && (!strncmp(pSubObj->name, "childof_", 8)))
-        {
-            pSubObj1 = FindSubObject((const char*)pSubObj->name + 8);
-            if (pSubObj1)
-            {
-                pSubObj1 = GetSubObject(pSubObj->nParent);
-                if (pSubObj1)
-                {
-                    if (strstr(pSubObj1->properties, "group"))
-                    {
-                        pSubObj->bHidden = pSubObj1->bHidden;
-                    }
-                }
-            }
-        }
-    }
-
-    for (i = 0, V[0] = V[1] = M = 0; i < nObj; i++)
-    {
-        if ((pSubObj = GetSubObject(i))->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj && pSubObj->pStatObj->GetPhysGeom() && !pSubObj->bHidden && strncmp(pSubObj->name, "skeleton_", 9))
-        {
-            float mi = -1.0f, dens = -1.0f, Vsubobj;
-            for (j = 0, Vsubobj = 0.0f; pSubObj->pStatObj->GetPhysGeom(j); j++)
-            {
-                if (((CStatObj*)pSubObj->pStatObj)->m_arrPhysGeomInfo.GetGeomType(j) == PHYS_GEOM_TYPE_DEFAULT)
-                {
-                    Vsubobj += pSubObj->pStatObj->GetPhysGeom(j)->V;
-                }
-            }
-            pSubObj->pStatObj->GetPhysicalProperties(mi, dens);
-            if (dens > 0)
-            {
-                mi = Vsubobj * cube(scale) * dens; // Calc mass.
-            }
-            if (mi != 0.0f)
-            {
-                V[isneg(mi)] += Vsubobj * cube(scale);
-            }
-            M += max(0.0f, mi);
-
-            if (((CStatObj*)pSubObj->pStatObj)->m_nRenderTrisCount <= 0 &&
-                pSubObj->pStatObj->GetPhysGeom()->pGeom->GetForeignData() == pSubObj->pStatObj &&
-                strstr(pSubObj->properties, "other_rendermesh"))
-            {
-                Vec3 center = pSubObj->localTM * (((CStatObj*)pSubObj->pStatObj)->m_vBoxMin + ((CStatObj*)pSubObj->pStatObj)->m_vBoxMax) * 0.5f;
-                float mindist = 1e10f, curdist;
-                for (j = 0, i0 = i; j < nObj; j++)
-                {
-                    if (j != i)
-                    {
-                        pSubObj1 = GetSubObject(j);
-                        if (pSubObj1 && pSubObj1->pStatObj && ((CStatObj*)pSubObj1->pStatObj)->m_nRenderTrisCount > 0)
-                        {
-                            curdist = (pSubObj1->localTM * (((CStatObj*)pSubObj1->pStatObj)->m_vBoxMin +
-                                ((CStatObj*)pSubObj1->pStatObj)->m_vBoxMax) * 0.5f - center).len2();
-                            if (curdist < mindist)
-                            {
-                                mindist = curdist;
-                                i0 = j;
-                            }
-                        }
-                    }
-                }
-                pSubObj->pStatObj->GetPhysGeom()->pGeom->SetForeignData(GetSubObject(i0)->pStatObj, 0);
-            }
-        }
-    }
-    for (i = 0; i < nObj; i++)
-    {
-        GetSubObject(i)->nBreakerJoints = 0;
-    }
-    if (mass <= 0)
-    {
-        mass = M * density;
-    }
-    if (density <= 0)
-    {
-        if ((V[0] + V[1]) != 0)
-        {
-            density = mass / (V[0] + V[1]);
-        }
-        else
-        {
-            density = 1000.0f; // Some default.
-        }
-    }
-    partpos.flags = geom_collides | geom_floats;
-
-    for (i = 0; i < nObj; i++)
-    {
-        if ((pSubObj = GetSubObject(i))->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj && pSubObj->pStatObj->GetPhysGeom() &&
-            !pSubObj->bHidden && strcmp(pSubObj->name, "colltype_player") == 0)
-        {
-            bHasPlayerOnlyGeoms = 1;
-        }
-    }
-
-    for (i = 0; i < nObj; i++)
-    {
-        if ((pSubObj = GetSubObject(i))->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj && ((CStatObj*)pSubObj->pStatObj)->m_arrPhysGeomInfo.GetGeomCount() && !pSubObj->bHidden)
-        {
-            if (pJointsIdMap)
-            {
-                continue;
-            }
-            partpos.idbody = i + id0;
-            partpos.pMtx3x4 = pMtx ? &(mtxLoc = *pMtx * pSubObj->tm) : &pSubObj->tm;
-
-            float mi = 0, di = 0;
-            if (pSubObj->pStatObj->GetPhysicalProperties(mi, di))
-            {
-                if (mi >= 0)
-                {
-                    partpos.mass = mi, partpos.density = 0;
-                }
-                else
-                {
-                    partpos.mass = 0, partpos.density = di;
-                }
-            }
-            else
-            {
-                partpos.density = density;
-            }
-            if (GetCVars()->e_ObjQuality != CONFIG_LOW_SPEC)
-            {
-                partpos.idmatBreakable = ((CStatObj*)pSubObj->pStatObj)->m_idmatBreakable;
-                if (((CStatObj*)pSubObj->pStatObj)->m_bVehicleOnlyPhysics)
-                {
-                    partpos.flags = geom_colltype6;
-                }
-                else
-                {
-                    partpos.flags = (geom_colltype_solid & ~(geom_colltype_player & - bHasPlayerOnlyGeoms)) | geom_colltype_ray | geom_floats | geom_colltype_explosion;
-                    if (bHasPlayerOnlyGeoms && strcmp(pSubObj->name, "colltype_player") == 0)
-                    {
-                        partpos.flags = geom_colltype_player;
-                    }
-                }
-            }
-            else
-            {
-                partpos.idmatBreakable = -1;
-                if (((CStatObj*)pSubObj->pStatObj)->m_bVehicleOnlyPhysics)
-                {
-                    partpos.flags = geom_colltype6;
-                }
-            }
-            if (!strncmp(pSubObj->name, "skeleton_", 9))
-            {
-                if (!GetCVars()->e_DeformableObjects)
-                {
-                    continue;
-                }
-                bHasSkeletons = true;
-                if (mi <= 0.0f)
-                {
-                    partpos.mass = 1.0f, partpos.density = 0.0f;
-                }
-            }
-            partpos.flagsCollider &= ~geom_destroyed_on_break;
-            if (strstr(pSubObj->properties, "pieces"))
-            {
-                partpos.flagsCollider |= geom_destroyed_on_break;
-            }
-            if (strstr(pSubObj->properties, "noselfcoll"))
-            {
-                partpos.flags &= ~(partpos.flagsCollider = geom_colltype_debris);
-            }
-            if ((id = pSubObj->pStatObj->Physicalize(pent, &partpos, i + id0)) >= 0)
-            {
-                nGeoms++, idNext = id + 1;
-            }
-            if (strstr(pSubObj->properties, "force_joint"))
-            {
-                pe_params_structural_joint psj1;
-                psj1.id = 1024 + i;
-                psj1.partid[0] = i + id0;
-                psj1.partid[1] = pSubObj->nParent + id0;
-                psj1.bBreakable = 0;
-                psj1.pt = *partpos.pMtx3x4 * (pSubObj->pStatObj->GetBoxMin() + pSubObj->pStatObj->GetBoxMax()) * 0.5f;
-                pent->SetParams(&psj1);
-            }
-        }
-        else
-        if (pSubObj->nType == STATIC_SUB_OBJECT_DUMMY && !strncmp(pSubObj->name, "$joint", 6))
-        {
-            properties = szPropsOverride ? szPropsOverride : (const char*)pSubObj->properties;
-            psj.pt = pSubObj->tm.GetTranslation();
-            psj.n = pSubObj->tm.GetColumn(2).normalized();
-            psj.axisx = pSubObj->tm.GetColumn(0).normalized();
-            float maxdim = max(pSubObj->helperSize.x, pSubObj->helperSize.y);
-            maxdim = max(maxdim, pSubObj->helperSize.z);
-            psj.szSensor = jointsz = maxdim * pSubObj->tm.GetColumn(0).len();
-            psj.partidEpicenter = -1;
-            psj.bBroken = 0;
-            psj.id = i;
-            psj.bReplaceExisting = 1;
-            if (pSubObj->name[6] != ' ')
-            {
-                gwd.offset = psj.pt;
-                ipart[1] = nObj;
-                for (i0 = nparts = 0; i0 < nObj && nparts < 2; i0++)
-                {
-                    if ((pSubObj1 = GetSubObject(i0))->nType == STATIC_SUB_OBJECT_MESH && pSubObj1->pStatObj && pSubObj1->pStatObj->GetPhysGeom() &&
-                        strncmp(pSubObj1->name, "skeleton_", 9) && !strstr(pSubObj1->properties, "group"))
-                    {
-                        gwd.offset = pSubObj1->tm.GetInverted() * psj.pt;
-                        pSubObj1->pStatObj->GetPhysGeom()->pGeom->GetBBox(&bbox);
-                        dist = bbox.Basis * (gwd.offset - bbox.center);
-                        for (j = 0; j < 3; j++)
-                        {
-                            dist[j] = max(0.0f, fabs_tpl(dist[j]) - bbox.size[j]);
-                        }
-                        gwd.scale = jointsz;
-                        if (fabs_tpl(pSubObj1->tm.GetColumn(0).len2() - 1.0f) > 0.01f)
-                        {
-                            gwd.scale /= pSubObj1->tm.GetColumn(0).len();
-                        }
-
-                        // Make a geometry box for intersection.
-                        if (!pJointBox)
-                        {
-                            // Create box for joint
-                            CRY_PHYSICS_REPLACEMENT_ASSERT();
-                        }
-                        {
-                            WriteLockCond lockColl;
-                            if (dist.len2() < sqr(gwd.scale * 0.5f) && pSubObj1->pStatObj->GetPhysGeom()->pGeom->IntersectLocked(pJointBox, 0, &gwd, &ip, pcontacts, lockColl))
-                            {
-                                ipart[nparts++] = i0;
-                            }
-                        }   // lock
-                    }
-                }
-                if (nparts == 0)
-                {
-                    continue;
-                }
-                GetSubObject(ipart[0])->pStatObj->GetPhysGeom()->pGeom->GetBBox(&bbox);
-                gwd.offset = GetSubObject(ipart[0])->tm * bbox.center;
-                j = isneg((gwd.offset - psj.pt) * psj.n);
-                i0 = ipart[j];
-                i1 = ipart[1 ^ j];
-
-                if (strlen((const char*)pSubObj->name) >= 7 && !strncmp((const char*)pSubObj->name + 7, "sample", 6))
-                {
-                    psj.bBroken = 2;
-                }
-                else if (strlen((const char*)pSubObj->name) >= 7 && !strncmp((const char*)pSubObj->name + 7, "impulse", 7))
-                {
-                    psj.bBroken = 2, psj.id = joint_impulse, psj.bReplaceExisting = 0, bAutoJoints = true;
-                }
-            }
-            else
-            {
-                for (i0 = 0; i0 < nObj && ((pSubObj1 = GetSubObject(i0))->nType != STATIC_SUB_OBJECT_MESH ||
-                                           (strlen((const char*)pSubObj->name) >= 7 && (strncmp((const char*)pSubObj->name + 7, pSubObj1->name, len = strlen(pSubObj1->name)) || isalpha(pSubObj->name[7 + len])))); i0++)
-                {
-                    ;
-                }
-                for (i1 = 0; i1 < nObj && ((pSubObj1 = GetSubObject(i1))->nType != STATIC_SUB_OBJECT_MESH ||
-                                           (strlen((const char*)pSubObj->name) >= 8 && (strncmp((const char*)pSubObj->name + 8 + len, pSubObj1->name, len1 = strlen(pSubObj1->name)) || isalpha(pSubObj->name[8 + len + len1])))); i1++)
-                {
-                    ;
-                }
-                if (i0 >= nObj && i1 >= nObj)
-                {
-                    CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "Error: cannot resolve part names in %s (%s)", (const char*)pSubObj->name, (const char*)m_szFileName);
-                }
-            }
-            if (pJointsIdMap)
-            {
-                i0 = pJointsIdMap[i0], i1 = pJointsIdMap[i1];
-            }
-            psj.partid[0] = i0 + id0;
-            psj.partid[1] = i1 + id0;
-            psj.maxForcePush = psj.maxForcePull = psj.maxForceShift = psj.maxTorqueBend = psj.maxTorqueTwist = 1E20f;
-            if (pMtx)
-            {
-                psj.pt = *pMtx * psj.pt;
-                psj.n = pMtx->TransformVector(psj.n).normalized();
-                psj.axisx = pMtx->TransformVector(psj.axisx).normalized();
-            }
-
-            pval = strstr(properties, "limit");
-            if (pval && (pval - 11 < properties - 11 || strncmp(pval - 11, "constraint_", 11)))
-            {
-                for (pval += 5; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.maxTorqueBend = aznumeric_caster(atof(pval));
-                }
-                //psj.maxTorqueTwist = psj.maxTorqueBend*5;
-                psj.maxForcePull = psj.maxTorqueBend;
-                psj.maxForceShift = psj.maxTorqueBend;
-                //              psj.maxForcePush = psj.maxForcePull*2.5f;
-                psj.bBreakable = 1;
-            }
-            pval = strstr(properties, "twist");
-            if (pval)
-            {
-                for (pval += 5; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.maxTorqueTwist = aznumeric_caster(atof(pval));
-                }
-            }
-            pval = strstr(properties, "bend");
-            if (pval)
-            {
-                for (pval += 4; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.maxTorqueBend = aznumeric_caster(atof(pval));
-                }
-            }
-            pval = strstr(properties, "push");
-            if (pval)
-            {
-                for (pval += 4; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.maxForcePush = aznumeric_caster(atof(pval));
-                }
-            }
-            pval = strstr(properties, "pull");
-            if (pval)
-            {
-                for (pval += 4; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.maxForcePull = aznumeric_caster(atof(pval));
-                }
-            }
-            pval = strstr(properties, "shift");
-            if (pval)
-            {
-                for (pval += 5; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.maxForceShift = aznumeric_caster(atof(pval));
-                }
-            }
-            pval = strstr(properties, "damage_accum");
-            if (pval)
-            {
-                for (pval += 5; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.damageAccum = aznumeric_caster(atof(pval));
-                }
-            }
-            pval = strstr(properties, "damage_accum_threshold");
-            if (pval)
-            {
-                for (pval += 5; *pval && !isdigit(*pval); pval++)
-                {
-                    ;
-                }
-                if (pval)
-                {
-                    psj.damageAccumThresh = aznumeric_caster(atof(pval));
-                }
-            }
-            if (psj.maxForcePush + psj.maxForcePull + psj.maxForceShift + psj.maxTorqueBend + psj.maxTorqueTwist > 4.9E20f)
-            {
-                if (azsscanf(properties, "%f %f %f %f %f",
-                        &psj.maxForcePush, &psj.maxForcePull, &psj.maxForceShift, &psj.maxTorqueBend, &psj.maxTorqueTwist) == 5)
-                {
-                    psj.maxForcePush *= density;
-                    psj.maxForcePull *= density;
-                    psj.maxForceShift *= density;
-                    psj.maxTorqueBend *= density;
-                    psj.maxTorqueTwist *= density;
-                    psj.bBreakable = 1;
-                }
-                else
-                {
-                    psj.bBreakable = 0;
-                }
-            }
-            psj.bDirectBreaksOnly = strstr(properties, "hits_only") != 0;
-            psj.limitConstraint.zero();
-            psj.bConstraintWillIgnoreCollisions = 1;
-
-            len = 16;
-            pval = strstr(properties, "constraint_limit");
-            if (pval)
-            {
-                for (pval += len; *pval && !isdigit(*pval); pval++);
-                if (pval)
-                {
-                    psj.limitConstraint.z = aznumeric_caster(atof(pval));
-                }
-            }
-            else
-            {
-                len = 5;
-                pval = strstr(properties, "C_lmt");
-                if (pval)
-                {
-                    for (pval += len; *pval && !isdigit(*pval); pval++)
-                        ;
-                    if (pval)
-                    {
-                        psj.limitConstraint.z = aznumeric_caster(atof(pval));
-                    }
-                }
-            }
-            len = 17;
-            pval = strstr(properties, "constraint_minang");
-            if (pval)
-            {
-                for (pval += len; *pval && !isdigit(*pval) && *pval != '-'; pval++);
-                if (pval)
-                {
-                    psj.limitConstraint.x = aznumeric_caster(DEG2RAD(atof(pval)));
-                }
-            }
-            else
-            {
-                len = 5;
-                pval = strstr(properties, "C_min");
-                if (pval)
-                {
-                    for (pval += len; *pval && !isdigit(*pval) && *pval != '-'; pval++)
-                        ;
-                    if (pval)
-                    {
-                        psj.limitConstraint.x = aznumeric_caster(DEG2RAD(atof(pval)));
-                    }
-                }
-            }
-            len = 17;
-            pval = strstr(properties, "constraint_maxang");
-            if (pval)
-            {
-                for (pval += len; *pval && !isdigit(*pval) && *pval != '-'; pval++);
-                if (pval)
-                {
-                    psj.limitConstraint.y = aznumeric_caster(DEG2RAD(atof(pval)));
-                }
-            }
-            else
-            {
-                len = 5;
-                pval = strstr(properties, "C_max");
-                if (pval)
-                {
-                    for (pval += len; *pval && !isdigit(*pval) && *pval != '-'; pval++);
-                    if (pval)
-                    {
-                        psj.limitConstraint.y = aznumeric_caster(DEG2RAD(atof(pval)));
-                    }
-                }
-            }
-            len = 18;
-            pval = strstr(properties, "constraint_damping");
-            if (pval)
-            {
-                for (pval += len; *pval && !isdigit(*pval); pval++);
-                if (pval)
-                {
-                    psj.dampingConstraint = aznumeric_caster(atof(pval));
-                }
-            }
-            else
-            {
-                len = 5;
-                pval = strstr(properties, "C_dmp");
-                if (pval)
-                {
-                    for (pval += len; *pval && !isdigit(*pval); pval++);
-                    if (pval)
-                    {
-                        psj.dampingConstraint = aznumeric_caster(atof(pval));
-                    }
-                }
-            }
-            if (strstr(properties, "constraint_collides") || strstr(properties, "C_coll"))
-            {
-                psj.bConstraintWillIgnoreCollisions = 0;
-            }
-            scale = GetFloatCVar(e_JointStrengthScale);
-            psj.maxForcePush *= scale;
-            psj.maxForcePull *= scale;
-            psj.maxForceShift *= scale;
-            psj.maxTorqueBend *= scale;
-            psj.maxTorqueTwist *= scale;
-            psj.limitConstraint.z *= scale;
-            pent->SetParams(&psj);
-            if (!gEnv->bMultiplayer && strstr(properties, "gameplay_critical"))
-            {
-                pf.flagsOR |= pef_override_impulse_scale;
-            }
-            if (gEnv->bMultiplayer && strstr(properties, "mp_break_always"))
-            {
-                pf.flagsOR |= pef_override_impulse_scale;
-            }
-            if (strstr(properties, "player_can_break"))
-            {
-                pf.flagsOR |= pef_players_can_break;
-            }
-
-            if (strstr(pSubObj->properties, "breaker"))
-            {
-                if (GetSubObject(i0))
-                {
-                    GetSubObject(i0)->nBreakerJoints++;
-                }
-                if (GetSubObject(i1))
-                {
-                    GetSubObject(i1)->nBreakerJoints++;
-                }
-            }
-        }
-    }
-
-    if (bAutoJoints)
-    {
-        psj.idx = -2; // tels the physics to try and generate joints
-        pent->SetParams(&psj);
-    }
-
-    pe_params_part pp;
-    if (bHasSkeletons)
-    {
-        for (i = 0; i < nObj; i++)
-        {
-            if ((pSubObj = GetSubObject(i))->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj && pSubObj->pStatObj->GetPhysGeom() && !pSubObj->bHidden &&
-                !strncmp(pSubObj->name, "skeleton_", 9))
-            {
-                pSubObj1 = FindSubObject((const char*)pSubObj->name + 9);
-                if (pSubObj1)
-                {
-                    pe_params_skeleton ps;
-                    properties = szPropsOverride ? szPropsOverride : (const char*)pSubObj->properties;
-                    pval = strstr(properties, "stiffness");
-                    if (pval)
-                    {
-                        for (pval += 9; *pval && !isdigit(*pval); pval++)
-                        {
-                            ;
-                        }
-                        if (pval)
-                        {
-                            ps.stiffness = aznumeric_caster(atof(pval));
-                        }
-                    }
-                    pval = strstr(properties, "thickness");
-                    if (pval)
-                    {
-                        for (pval += 9; *pval && !isdigit(*pval); pval++)
-                        {
-                            ;
-                        }
-                        if (pval)
-                        {
-                            ps.thickness = aznumeric_caster(atof(pval));
-                        }
-                    }
-                    pval = strstr(properties, "max_stretch");
-                    if (pval)
-                    {
-                        for (pval += 11; *pval && !isdigit(*pval); pval++)
-                        {
-                            ;
-                        }
-                        if (pval)
-                        {
-                            ps.maxStretch = aznumeric_caster(atof(pval));
-                        }
-                    }
-                    pval = strstr(properties, "max_impulse");
-                    if (pval)
-                    {
-                        for (pval += 11; *pval && !isdigit(*pval); pval++)
-                        {
-                            ;
-                        }
-                        if (pval)
-                        {
-                            ps.maxImpulse = aznumeric_caster(atof(pval));
-                        }
-                    }
-                    pval = strstr(properties, "skin_dist");
-                    if (pval)
-                    {
-                        for (pval += 9; *pval && !isdigit(*pval); pval++)
-                        {
-                            ;
-                        }
-                        if (pval)
-                        {
-                            pp.minContactDist = aznumeric_caster(atof(pval));
-                        }
-                    }
-                    pval = strstr(properties, "hardness");
-                    if (pval)
-                    {
-                        for (pval += 8; *pval && !isdigit(*pval); pval++)
-                        {
-                            ;
-                        }
-                        if (pval)
-                        {
-                            ps.hardness = aznumeric_caster(atof(pval));
-                        }
-                    }
-                    pval = strstr(properties, "explosion_scale");
-                    if (pval)
-                    {
-                        for (pval += 15; *pval && !isdigit(*pval); pval++)
-                        {
-                            ;
-                        }
-                        if (pval)
-                        {
-                            ps.explosionScale = aznumeric_caster(atof(pval));
-                        }
-                    }
-
-                    pp.partid = ps.partid = aznumeric_cast<int>((pSubObj1 - &m_subObjects[0])) + id0;
-                    pp.idSkeleton = i + id0;
-                    pent->SetParams(&pp);
-                    pent->SetParams(&ps);
-                    ((CStatObj*)pSubObj1->pStatObj)
-                        ->PrepareSkinData(
-                            pSubObj1->localTM.GetInverted() * pSubObj->localTM, pSubObj->pStatObj->GetPhysGeom()->pGeom,
-                            is_unused(pp.minContactDist) ? 0.0f : pp.minContactDist);
-                }
-            }
-        }
-    }
-
-    new(&pp)pe_params_part;
-    for (i = 0; i < nObj; i++)
-    {
-        pSubObj = GetSubObject(i);
-        if (pSubObj->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj && pSubObj->pStatObj->GetPhysGeom() && !pSubObj->bHidden &&
-            !strncmp(pSubObj->name, "childof_", 8))
-        {
-            pSubObj1 = FindSubObject((const char*)pSubObj->name + 8);
-            if (pSubObj1)
-            {
-                pSubObj1 = GetSubObject(pSubObj->nParent);
-                if (pSubObj1 && strstr(pSubObj1->properties, "group"))
-                {
-                    pp.partid = i + id0;
-                    pp.idParent = aznumeric_caster(pSubObj1 - &m_subObjects[0]);
-                    pent->SetParams(&pp);
-                    pSubObj->bHidden = true;
-                }
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Iterate through sub objects and update hide mask.
-    //////////////////////////////////////////////////////////////////////////
-    m_nInitialSubObjHideMask = 0;
-    for (size_t a = 0, numsub = m_subObjects.size(); a < numsub; a++)
-    {
-        SSubObject& subObj = m_subObjects[a];
-        if (subObj.pStatObj && subObj.nType == STATIC_SUB_OBJECT_MESH && subObj.bHidden)
-        {
-            m_nInitialSubObjHideMask |= ((uint64)1 << a);
-        }
-    }
-
-    if (nGeoms >= 10 && pent->GetType() == PE_STATIC)
-    {
-        pf.flagsOR |= pef_parts_traceable, pf.flagsAND = ~pef_traceable;
-    }
-
-    if (pf.flagsOR)
-    {
-        pent->SetParams(&pf);
-    }
-    if (pJointBox)
-    {
-        pJointBox->Release();
-    }
-    return idNext - 1;
-}
-
-//static const int g_nRanges = 5;
-static int g_rngb2a[] = { 0, 'A', 26, 'a', 52, '0', 62, '+', 63, '/' };
-static int g_rnga2b[] = { '+', 62, '/', 63, '0', 52, 'A', 0, 'a', 26 };
-static inline int mapsymb(int symb, int* pmap, int n)
-{
-    int i, j;
-    for (i = j = 0; j < n; j++)
-    {
-        i += isneg(symb - pmap[j * 2]);
-    }
-    i = n - 1 - i;
-    return symb - pmap[i * 2] + pmap[i * 2 + 1];
-}
-
-static int Bin2ascii(const unsigned char* pin, int sz, unsigned char* pout)
-{
-    int a0, a1, a2, i, j, nout, chr[4];
-    for (i = nout = 0; i < sz; i += 3, nout += 4)
-    {
-        a0 = pin[i];
-        j = isneg(i + 1 - sz);
-        a1 = pin[i + j] & - j;
-        j = isneg(i + 2 - sz);
-        a2 = pin[i + j * 2] & - j;
-        chr[0] = a0 >> 2;
-        chr[1] = a0 << 4 & 0x30 | (a1 >> 4) & 0x0F;
-        chr[2] = a1 << 2 & 0x3C | a2 >> 6 & 0x03;
-        chr[3] = a2 & 0x03F;
-        for (j = 0; j < 4; j++)
-        {
-            *pout++ = mapsymb(chr[j], g_rngb2a, 5);
-        }
-    }
-    return nout;
-}
-static int Ascii2bin(const unsigned char* pin, int sz, unsigned char* pout, int szout)
-{
-    int a0, a1, a2, a3, i, nout;
-    for (i = nout = 0; i < sz - 4; i += 4, nout += 3)
-    {
-        a0 = mapsymb(pin[i + 0], g_rnga2b, 5);
-        a1 = mapsymb(pin[i + 1], g_rnga2b, 5);
-        a2 = mapsymb(pin[i + 2], g_rnga2b, 5);
-        a3 = mapsymb(pin[i + 3], g_rnga2b, 5);
-        *pout++ = a0 << 2 | a1 >> 4;
-        *pout++ = a1 << 4 & 0xF0 | a2 >> 2 & 0x0F;
-        *pout++ = a2 << 6 & 0xC0 | a3;
-    }
-    a0 = mapsymb(pin[i + 0], g_rnga2b, 5);
-    a1 = mapsymb(pin[i + 1], g_rnga2b, 5);
-    a2 = mapsymb(pin[i + 2], g_rnga2b, 5);
-    a3 = mapsymb(pin[i + 3], g_rnga2b, 5);
-    if (nout < szout)
-    {
-        *pout++ = a0 << 2 | a1 >> 4, nout++;
-    }
-    if (nout < szout)
-    {
-        *pout++ = a1 << 4 & 0xF0 | a2 >> 2 & 0x0F, nout++;
-    }
-    if (nout < szout)
-    {
-        *pout++ = a2 << 6 & 0xC0 | a3, nout++;
-    }
-    return nout;
-}
-
-
-static void SerializeData(TSerialize ser, const char* name, void* pdata, int size)
-{
-    /*static std::vector<int> arr;
-    if (ser.IsReading())
-    {
-        ser.Value(name, arr);
-        memcpy(pdata, &arr[0], size);
-    } else
-    {
-        arr.resize(((size-1)>>2)+1);
-        memcpy(&arr[0], pdata, size);
-        ser.Value(name, arr);
-    }*/
-    static string str;
-    if (!size)
-    {
-        return;
-    }
-    if (ser.IsReading())
-    {
-        ser.Value(name, str);
-        int n = Ascii2bin((const unsigned char*)(const char*)str, str.length(), (unsigned char*)pdata, size);
-        assert(n == size);
-        (void)n;
-    }
-    else
-    {
-        str.resize(((size - 1) / 3 + 1) * 4);
-        int n = Bin2ascii((const unsigned char*)pdata, size, (unsigned char*)(const char*)str);
-        assert(n == str.length());
-        (void)n;
-        ser.Value(name, str);
-    }
-}
-
-
-int CStatObj::Serialize(TSerialize ser)
-{
-    ser.BeginGroup("StatObj");
-    ser.Value("Flags", m_nFlags);
-    if (GetFlags() & STATIC_OBJECT_COMPOUND)
-    {
-        int i, nParts = m_subObjects.size();
-        bool bVal;
-        string srcObjName;
-        ser.Value("nParts", nParts);
-        if (m_pClonedSourceObject)
-        {
-            SetSubObjectCount(nParts);
-            for (i = 0; i < nParts; i++)
-            {
-                ser.BeginGroup("part");
-                ser.Value("bGenerated", bVal = !ser.IsReading() && m_subObjects[i].pStatObj &&
-                        m_subObjects[i].pStatObj->GetFlags() & STATIC_OBJECT_GENERATED && !m_subObjects[i].bHidden);
-                if (bVal)
-                {
-                    if (ser.IsReading())
-                    {
-                        (m_subObjects[i].pStatObj = gEnv->p3DEngine->CreateStatObj())->AddRef();
-                    }
-                    m_subObjects[i].pStatObj->Serialize(ser);
-                }
-                else
-                {
-                    ser.Value("subobj", m_subObjects[i].name);
-                    if (ser.IsReading())
-                    {
-                        IStatObj::SSubObject* pSrcSubObj = m_pClonedSourceObject->FindSubObject(m_subObjects[i].name);
-                        if (pSrcSubObj)
-                        {
-                            m_subObjects[i] = *pSrcSubObj;
-                            if (pSrcSubObj->pStatObj)
-                            {
-                                pSrcSubObj->pStatObj->AddRef();
-                            }
-                        }
-                    }
-                }
-                bVal = m_subObjects[i].bHidden;
-                ser.Value("hidden", bVal);
-                m_subObjects[i].bHidden = bVal;
-                ser.EndGroup();
-            }
-        }
-    }
-    else
-    {
-#if defined(CONSOLE)
-        CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_ERROR, "Error: full geometry serialization should never happen on consoles. file: '%s' Geom: '%s'", m_szFileName.c_str(), m_szGeomName.c_str());
-#else
-        CMesh* pMesh;
-        int i, nVtx, nTris, nSubsets;
-        string matName;
-        _smart_ptr<IMaterial> pMat;
-
-        if (ser.IsReading())
-        {
-            ser.Value("nvtx", nVtx = 0);
-            if (nVtx)
-            {
-                m_pIndexedMesh = new CIndexedMesh();
-                pMesh = m_pIndexedMesh->GetMesh();
-                assert(pMesh->m_pPositionsF16 == 0);
-                ser.Value("ntris", nTris);
-                ser.Value("nsubsets", nSubsets);
-                pMesh->SetVertexCount(nVtx);
-                pMesh->ReallocStream(CMesh::TEXCOORDS, 0, nVtx);
-                pMesh->ReallocStream(CMesh::TANGENTS, 0, nVtx);
-                pMesh->SetIndexCount(nTris * 3);
-
-                for (i = 0; i < nSubsets; i++)
-                {
-                    SMeshSubset mss;
-                    ser.BeginGroup("subset");
-                    ser.Value("matid", mss.nMatID);
-                    ser.Value("matflg", mss.nMatFlags);
-                    ser.Value("vtx0", mss.nFirstVertId);
-                    ser.Value("nvtx", mss.nNumVerts);
-                    ser.Value("idx0", mss.nFirstIndexId);
-                    ser.Value("nidx", mss.nNumIndices);
-                    ser.Value("center", mss.vCenter);
-                    ser.Value("radius", mss.fRadius);
-                    pMesh->m_subsets.push_back(mss);
-                    ser.EndGroup();
-                }
-
-                SerializeData(ser, "Positions", pMesh->m_pPositions, nVtx * sizeof(pMesh->m_pPositions[0]));
-                SerializeData(ser, "Normals", pMesh->m_pNorms, nVtx * sizeof(pMesh->m_pNorms[0]));
-                SerializeData(ser, "TexCoord", pMesh->m_pTexCoord, nVtx * sizeof(pMesh->m_pTexCoord[0]));
-                SerializeData(ser, "Tangents", pMesh->m_pTangents, nVtx * sizeof(pMesh->m_pTangents[0]));
-                SerializeData(ser, "Indices", pMesh->m_pIndices, nTris * 3 * sizeof(pMesh->m_pIndices[0]));
-
-                ser.Value("Material", matName);
-                SetMaterial(gEnv->p3DEngine->GetMaterialManager()->FindMaterial(matName));
-                ser.Value("MaterialAux", matName);
-                if (m_pMaterial && (pMat = gEnv->p3DEngine->GetMaterialManager()->FindMaterial(matName)))
-                {
-                    if (pMat->GetSubMtlCount() > 0)
-                    {
-                        pMat = pMat->GetSubMtl(0);
-                    }
-                    for (i = m_pMaterial->GetSubMtlCount() - 1; i >= 0 && strcmp(m_pMaterial->GetSubMtl(i)->GetName(), matName); i--)
-                    {
-                        ;
-                    }
-                    if (i < 0)
-                    {
-                        i = m_pMaterial->GetSubMtlCount();
-                        m_pMaterial->SetSubMtlCount(i + 1);
-                        m_pMaterial->SetSubMtl(i, pMat);
-                    }
-                }
-
-                int surfaceTypesId[MAX_SUB_MATERIALS];
-                memset(surfaceTypesId, 0, sizeof(surfaceTypesId));
-                int numIds = 0;
-                if (m_pMaterial)
-                {
-                    numIds = m_pMaterial->FillSurfaceTypeIds(surfaceTypesId);
-                }
-
-
-                char* pIds = new char[nTris];
-                memset(pIds, 0, nTris);
-                int j, itri;
-                for (i = 0; i < pMesh->m_subsets.size(); i++)
-                {
-                    for (itri = (j = pMesh->m_subsets[i].nFirstIndexId) / 3; j < pMesh->m_subsets[i].nFirstIndexId + pMesh->m_subsets[i].nNumIndices; j += 3, itri++)
-                    {
-                        pIds[itri] = pMesh->m_subsets[i].nMatID;
-                    }
-                }
-
-                ser.Value("PhysSz", i);
-                if (i)
-                {
-                    char* pbuf = new char[i];
-                    CMemStream stm(pbuf, i, false);
-                    SerializeData(ser, "PhysMeshData", pbuf, i);
-                    CRY_PHYSICS_REPLACEMENT_ASSERT();
-                    delete[] pbuf;
-                }
-                delete[] pIds;
-
-                Invalidate();
-                SetFlags(STATIC_OBJECT_GENERATED);
-            }
-        }
-        else
-        {
-            if (GetIndexedMesh(true))
-            {
-                pMesh = GetIndexedMesh(true)->GetMesh();
-                assert(pMesh->m_pPositionsF16 == 0);
-                ser.Value("nvtx", nVtx = pMesh->GetVertexCount());
-                ser.Value("ntris", nTris = pMesh->GetIndexCount() / 3);
-                ser.Value("nsubsets", nSubsets = pMesh->m_subsets.size());
-
-                for (i = 0; i < nSubsets; i++)
-                {
-                    ser.BeginGroup("subset");
-                    ser.Value("matid", pMesh->m_subsets[i].nMatID);
-                    ser.Value("matflg", pMesh->m_subsets[i].nMatFlags);
-                    ser.Value("vtx0", pMesh->m_subsets[i].nFirstVertId);
-                    ser.Value("nvtx", pMesh->m_subsets[i].nNumVerts);
-                    ser.Value("idx0", pMesh->m_subsets[i].nFirstIndexId);
-                    ser.Value("nidx", pMesh->m_subsets[i].nNumIndices);
-                    ser.Value("center", pMesh->m_subsets[i].vCenter);
-                    ser.Value("radius", pMesh->m_subsets[i].fRadius);
-                    ser.EndGroup();
-                }
-
-                if (m_pMaterial && m_pMaterial->GetSubMtlCount() > 0)
-                {
-                    ser.Value("auxmatname", m_pMaterial->GetSubMtl(m_pMaterial->GetSubMtlCount() - 1)->GetName());
-                }
-
-                SerializeData(ser, "Positions", pMesh->m_pPositions, nVtx * sizeof(pMesh->m_pPositions[0]));
-                SerializeData(ser, "Normals", pMesh->m_pNorms, nVtx * sizeof(pMesh->m_pNorms[0]));
-                SerializeData(ser, "TexCoord", pMesh->m_pTexCoord, nVtx * sizeof(pMesh->m_pTexCoord[0]));
-                SerializeData(ser, "Tangents", pMesh->m_pTangents, nVtx * sizeof(pMesh->m_pTangents[0]));
-                SerializeData(ser, "Indices", pMesh->m_pIndices, nTris * 3 * sizeof(pMesh->m_pIndices[0]));
-
-                ser.Value("Material", GetMaterial()->GetName());
-                if (m_pMaterial && m_pMaterial->GetSubMtlCount() > 0)
-                {
-                    ser.Value("MaterialAux", m_pMaterial->GetSubMtl(m_pMaterial->GetSubMtlCount() - 1)->GetName());
-                }
-                else
-                {
-                    ser.Value("MaterialAux", matName = "");
-                }
-
-                if (GetPhysGeom())
-                {
-                    CMemStream stm(false);
-                    ser.Value("PhysSz", i = stm.GetUsedSize());
-                    SerializeData(ser, "PhysMeshData", stm.GetBuf(), i);
-                }
-                else
-                {
-                    ser.Value("PhysSz", i = 0);
-                }
-            }
-            else
-            {
-                ser.Value("nvtx", nVtx = 0);
-            }
-        }
-#endif // !defined(CONSOLE)
-    }
-
-    ser.EndGroup(); //StatObj
-
-    return 1;
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/StatObjRend.cpp b/Code/CryEngine/Cry3DEngine/StatObjRend.cpp
deleted file mode 100644
index 0cd0298241..0000000000
--- a/Code/CryEngine/Cry3DEngine/StatObjRend.cpp
+++ /dev/null
@@ -1,1068 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : prepare and add render element into renderer
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "../RenderDll/Common/Shadow_Renderer.h"
-#include "IndexedMesh.h"
-#include "VisAreas.h"
-#include "GeomQuery.h"
-#include "MatMan.h"
-#include <CryPath.h>
-
-void CStatObj::Render(const SRendParams& rParams, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (m_nFlags & STATIC_OBJECT_HIDDEN)
-    {
-        return;
-    }
-
-#ifndef _RELEASE
-    int nMaxDrawCalls = GetCVars()->e_MaxDrawCalls;
-    if (nMaxDrawCalls > 0)
-    {
-        // Don't calculate the number of drawcalls every single time a statobj is rendered.
-        // This creates a flickering effect with objects appearing and disappearing indicating that the limit has been reached.
-        static int nCurrObjCounter = 0;
-        if (((nCurrObjCounter++) & 31) == 1)
-        {
-            if (GetRenderer()->GetCurrentNumberOfDrawCalls() > nMaxDrawCalls)
-            {
-                return;
-            }
-        }
-    }
-#endif // _RELEASE
-
-    CRenderObject* pObj = GetRenderer()->EF_GetObject_Temp(passInfo.ThreadID());
-    FillRenderObject(rParams, rParams.pRenderNode, m_pMaterial, NULL, pObj, passInfo);
-
-    RenderInternal(pObj, rParams.nSubObjHideMask, rParams.lodValue, passInfo, SRendItemSorter(rParams.rendItemSorter), rParams.bForceDrawStatic);
-}
-
-void CStatObj::RenderStreamingDebugInfo([[maybe_unused]] CRenderObject* pRenderObject)
-{
-#ifndef _RELEASE
-    //  CStatObj * pStreamable = m_pParentObject ? m_pParentObject : this;
-
-    IStatObj* pStreamable = m_pLod0 ? m_pLod0 : this;
-
-    int nKB = 0;
-
-    if (pStreamable->GetRenderMesh())
-    {
-        nKB += pStreamable->GetRenderMeshMemoryUsage();
-    }
-
-    for (int nLod = 1; pStreamable->GetLods() && nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-    {
-        IStatObj* pLod = (CStatObj*)pStreamable->GetLods()[nLod];
-
-        if (!pLod)
-        {
-            continue;
-        }
-
-        if (pLod->GetRenderMesh())
-        {
-            nKB += pLod->GetRenderMeshMemoryUsage();
-        }
-    }
-
-    nKB >>= 10;
-
-    if (nKB > GetCVars()->e_StreamCgfDebugMinObjSize)
-    {
-        //      nKB = GetStreamableContentMemoryUsage(true) >> 10;
-
-        const char* pComment = 0;
-
-        pStreamable = pStreamable->GetParentObject() ? pStreamable->GetParentObject() : pStreamable;
-
-        if (!pStreamable->IsUnloadable())
-        {
-            pComment = "No stream";
-        }
-        else if (!pStreamable->IsLodsAreLoadedFromSeparateFile() && pStreamable->GetLoadedLodsNum())
-        {
-            pComment = "Single";
-        }
-        else if (pStreamable->GetLoadedLodsNum() > 1)
-        {
-            pComment = "Split";
-        }
-        else
-        {
-            pComment = "No LODs";
-        }
-
-        int nDiff = SATURATEB(int(float(nKB - GetCVars()->e_StreamCgfDebugMinObjSize) / max((int)1, GetCVars()->e_StreamCgfDebugMinObjSize) * 255));
-        DrawBBoxLabeled(AABB(m_vBoxMin, m_vBoxMax), pRenderObject->m_II.m_Matrix, ColorB(nDiff, 255 - nDiff, 0, 255),
-            "%.2f mb, %s", 1.f / 1024.f * (float)nKB, pComment);
-    }
-#endif //_RELEASE
-}
-
-//////////////////////////////////////////////////////////////////////
-void CStatObj::RenderCoverInfo(CRenderObject* pRenderObject)
-{
-    for (int i = 0; i < GetSubObjectCount(); ++i)
-    {
-        const IStatObj::SSubObject* subObject = GetSubObject(i);
-        if (subObject->nType != STATIC_SUB_OBJECT_DUMMY)
-        {
-            continue;
-        }
-        if (strstr(subObject->name, "$cover") == 0)
-        {
-            continue;
-        }
-
-        Vec3 localBoxMin = -subObject->helperSize * 0.5f;
-        Vec3 localBoxMax = subObject->helperSize * 0.5f;
-
-        GetRenderer()->GetIRenderAuxGeom()->DrawAABB(
-            AABB(localBoxMin, localBoxMax),
-            pRenderObject->m_II.m_Matrix * subObject->localTM,
-            true, ColorB(192, 0, 255, 255),
-            eBBD_Faceted);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-void CStatObj::FillRenderObject(const SRendParams& rParams, IRenderNode* pRenderNode, _smart_ptr<IMaterial> pMaterial,
-    SInstancingInfo* pInstInfo, CRenderObject*& pObj, const SRenderingPassInfo& passInfo)
-{
-    //  FUNCTION_PROFILER_3DENGINE;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Specify transformation
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-    assert(pObj);
-    if (!pObj)
-    {
-        return;
-    }
-
-    pObj->m_pRenderNode = pRenderNode;
-    pObj->m_fSort = rParams.fCustomSortOffset;
-    SRenderObjData* pOD = NULL;
-    if (rParams.pInstance || rParams.m_pVisArea || pInstInfo || rParams.nVisionParams || rParams.nHUDSilhouettesParams || rParams.nSubObjHideMask)
-    {
-        pOD = pObj->GetObjData();
-
-        pOD->m_uniqueObjectId = reinterpret_cast<uintptr_t>(rParams.pInstance);
-        pOD->m_nHUDSilhouetteParams = rParams.nHUDSilhouettesParams;
-
-        if (rParams.nSubObjHideMask && (m_pMergedRenderMesh != NULL))
-        {
-            // Only pass SubObject hide mask for merged objects, because they have a correct correlation between Hide Mask and Render Chunks.
-            pOD->m_nSubObjHideMask = rParams.nSubObjHideMask;
-            pObj->m_ObjFlags |= FOB_MESH_SUBSET_INDICES;
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Set flags
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    pObj->m_ObjFlags |= rParams.dwFObjFlags;
-
-    if (rParams.nTextureID >= 0)
-    {
-        pObj->m_nTextureID = rParams.nTextureID;
-    }
-
-    assert(rParams.pMatrix);
-    {
-        pObj->m_II.m_Matrix = *rParams.pMatrix;
-    }
-
-    pObj->m_II.m_AmbColor = rParams.AmbientColor;
-    pObj->m_nClipVolumeStencilRef = rParams.nClipVolumeStencilRef;
-    pObj->m_ObjFlags |= FOB_PARTICLE_SHADOWS;
-    pObj->m_fAlpha = rParams.fAlpha;
-    pObj->m_DissolveRef = rParams.nDissolveRef;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Process bending
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    if (pRenderNode && pRenderNode->GetRndFlags() & ERF_RECVWIND)
-    {
-        Get3DEngine()->SetupBending(pObj, pRenderNode, m_fRadiusVert, passInfo, false);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Set render quality
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    pObj->m_nRenderQuality = (uint16)(rParams.fRenderQuality * 65535.0f);
-    pObj->m_fDistance = rParams.fDistance;
-
-    {
-        //clear, when exchange the state of pLightMapInfo to NULL, the pObj parameters must be update...
-        pObj->m_nSort = fastround_positive(rParams.fDistance * 2.0f);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Add render elements
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    if (rParams.pMaterial)
-    {
-        pMaterial = rParams.pMaterial;
-    }
-
-    // prepare multi-layer stuff to render object
-    if (!rParams.nMaterialLayersBlend && rParams.nMaterialLayers)
-    {
-        uint8 nFrozenLayer = (rParams.nMaterialLayers & MTL_LAYER_FROZEN) ? MTL_LAYER_FROZEN_MASK : 0;
-        uint8 nWetLayer = (rParams.nMaterialLayers & MTL_LAYER_WET) ? MTL_LAYER_WET_MASK : 0;
-        pObj->m_nMaterialLayers = (uint32)(nFrozenLayer << 24) | (nWetLayer << 16);
-    }
-    else
-    {
-        pObj->m_nMaterialLayers = rParams.nMaterialLayersBlend;
-    }
-
-    if (rParams.nCustomData || rParams.nCustomFlags)
-    {
-        if (!pOD)
-        {
-            pOD = pObj->GetObjData();
-        }
-
-        pOD->m_nCustomData = rParams.nCustomData;
-        pOD->m_nCustomFlags = rParams.nCustomFlags;
-    }
-
-    if (rParams.nAfterWater)
-    {
-        pObj->m_ObjFlags |= FOB_AFTER_WATER;
-    }
-    else
-    {
-        pObj->m_ObjFlags &= ~FOB_AFTER_WATER;
-    }
-
-    pObj->m_pRenderNode = rParams.pRenderNode;
-    pObj->m_pCurrMaterial = pMaterial;
-    pObj->m_NoDecalReceiver = rParams.NoDecalReceiver;
-    if (Get3DEngine()->IsTessellationAllowed(pObj, passInfo))
-    {
-        // Allow this RO to be tessellated, however actual tessellation will be applied if enabled in material
-        pObj->m_ObjFlags |= FOB_ALLOW_TESSELLATION;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatObj::RenderDebugInfo([[maybe_unused]] CRenderObject* pObj, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-#ifndef _RELEASE
-
-    if (!passInfo.IsGeneralPass())
-    {
-        return false;
-    }
-
-    IRenderer* pRend = GetRenderer();
-    _smart_ptr<IMaterial> pMaterial = pObj->m_pCurrMaterial;
-
-    IRenderAuxGeom* pAuxGeom = GetRenderer()->GetIRenderAuxGeom();
-    if (!pAuxGeom)
-    {
-        return false;
-    }
-
-    Matrix34 tm = pObj->m_II.m_Matrix;
-
-    // Convert "camera space" to "world space"
-    if (pObj->m_ObjFlags & FOB_NEAREST)
-    {
-        tm.AddTranslation(gEnv->pRenderer->GetCamera().GetPosition());
-    }
-
-    AABB bbox(m_vBoxMin, m_vBoxMax);
-
-    bool bOnlyBoxes = GetCVars()->e_DebugDraw == -1;
-
-    int e_DebugDraw = GetCVars()->e_DebugDraw;
-    string e_DebugDrawFilter = GetCVars()->e_DebugDrawFilter->GetString();
-    bool bHasHelperFilter = e_DebugDrawFilter != "";
-    bool bFiltered = false;
-
-    if (e_DebugDraw == 1)
-    {
-        string name;
-        if (!m_szGeomName.empty())
-        {
-            name = m_szGeomName.c_str();
-        }
-        else
-        {
-            name = PathUtil::GetFile(m_szFileName.c_str());
-        }
-
-        bFiltered = name.find(e_DebugDrawFilter) == string::npos;
-    }
-
-    if ((GetCVars()->e_DebugDraw == 1 || bOnlyBoxes) && !bFiltered)
-    {
-        if (!m_bMerged)
-        {
-            pAuxGeom->DrawAABB(bbox, tm, false, ColorB(0, 255, 255, 128), eBBD_Faceted);
-        }
-        else
-        {
-            pAuxGeom->DrawAABB(bbox, tm, false, ColorB(255, 200, 0, 128), eBBD_Faceted);
-        }
-    }
-
-
-    bool bNoText = e_DebugDraw < 0;
-    if (e_DebugDraw < 0)
-    {
-        e_DebugDraw = -e_DebugDraw;
-    }
-
-
-
-    if (m_nRenderTrisCount > 0 && !bOnlyBoxes && !bFiltered)
-    { // cgf's name and tris num
-        int nThisLod = 0;
-        if (m_pLod0 && m_pLod0->GetLods())
-        {
-            for (int i = 0; i < MAX_STATOBJ_LODS_NUM; i++)
-            {
-                if (m_pLod0->GetLods()[i] == this)
-                {
-                    nThisLod = i;
-                    break;
-                }
-            }
-        }
-
-        const int nMaxUsableLod = (m_pLod0) ? m_pLod0->GetMaxUsableLod() : m_nMaxUsableLod;
-        const int nRealNumLods = (m_pLod0) ? m_pLod0->GetLoadedLodsNum() : m_nLoadedLodsNum;
-
-        int nNumLods = nRealNumLods;
-        if (nNumLods > nMaxUsableLod + 1)
-        {
-            nNumLods = nMaxUsableLod + 1;
-        }
-
-        int nLod = nThisLod;
-        if (nLod > nNumLods - 1)
-        {
-            nLod = nNumLods - 1;
-        }
-
-        Vec3 pos = tm.TransformPoint((m_vBoxMin + m_vBoxMax) * 0.5f);
-        float color[4] = {1, 1, 1, 1};
-        int nMats = m_pRenderMesh ? m_pRenderMesh->GetChunks().size() : 0;
-        int nRenderMats = 0;
-
-        if (nMats)
-        {
-            for (int i = 0; i < nMats; ++i)
-            {
-                CRenderChunk& rc = m_pRenderMesh->GetChunks()[i];
-                if (rc.pRE && rc.nNumIndices && rc.nNumVerts && ((rc.m_nMatFlags & MTL_FLAG_NODRAW) == 0))
-                {
-                    ++nRenderMats;
-                }
-            }
-        }
-
-        switch (e_DebugDraw)
-        {
-        case 1:
-        {
-            const char* shortName = "";
-            if (!m_szGeomName.empty())
-            {
-                shortName = m_szGeomName.c_str();
-            }
-            else
-            {
-                shortName = PathUtil::GetFile(m_szFileName.c_str());
-            }
-            if (nNumLods > 1)
-            {
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%s\n%d (LOD %d/%d)", shortName, m_nRenderTrisCount, nLod, nNumLods);
-            }
-            else
-            {
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%s\n%d", shortName, m_nRenderTrisCount);
-            }
-        }
-        break;
-
-        case 2:
-        {
-            //////////////////////////////////////////////////////////////////////////
-            // Show colored poly count.
-            //////////////////////////////////////////////////////////////////////////
-            int fMult = 1;
-            int nTris = m_nRenderTrisCount;
-            ColorB clr = ColorB(0, 0, 0, 255);
-            if (nTris >= 20000 * fMult)
-            {
-                clr = ColorB(255, 0, 0, 255);
-            }
-            else if (nTris >= 10000 * fMult)
-            {
-                clr = ColorB(255, 255, 0, 255);
-            }
-            else if (nTris >= 5000 * fMult)
-            {
-                clr = ColorB(0, 255, 0, 255);
-            }
-            else if (nTris >= 2500 * fMult)
-            {
-                clr = ColorB(0, 255, 255, 255);
-            }
-            else if (nTris > 1250 * fMult)
-            {
-                clr = ColorB(0, 0, 255, 255);
-            }
-
-            if (pMaterial)
-            {
-                pMaterial = GetMatMan()->GetDefaultHelperMaterial();
-            }
-            if (pObj)
-            {
-                pObj->m_II.m_AmbColor = ColorF(clr.r / 155.0f, clr.g / 155.0f, clr.b / 155.0f, 1);
-                pObj->m_nMaterialLayers = 0;
-                pObj->m_ObjFlags |= FOB_SELECTED;
-            }
-
-            if (!bNoText)
-            {
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%d", m_nRenderTrisCount);
-            }
-
-            return false;
-            //////////////////////////////////////////////////////////////////////////
-        }
-        case 3:
-        {
-            //////////////////////////////////////////////////////////////////////////
-            // Show Lods
-            //////////////////////////////////////////////////////////////////////////
-            ColorB clr;
-            if (nNumLods < 2)
-            {
-                if (m_nRenderTrisCount <= GetCVars()->e_LodMinTtris  || nRealNumLods > 1)
-                {
-                    clr = ColorB(50, 50, 50, 255);
-                }
-                else
-                {
-                    clr = ColorB(255, 0, 0, 255);
-                    float fAngle = gEnv->pTimer->GetFrameStartTime().GetPeriodicFraction(1.0f) * gf_PI2;
-                    clr.g = 127 + (int)(sinf(fAngle) * 120);      // flashing color
-                }
-            }
-            else
-            {
-                if (nLod == 0)
-                {
-                    clr = ColorB(255, 0, 0, 255);
-                }
-                else if (nLod == 1)
-                {
-                    clr = ColorB(0, 255, 0, 255);
-                }
-                else if (nLod == 2)
-                {
-                    clr = ColorB(0, 0, 255, 255);
-                }
-                else if (nLod == 3)
-                {
-                    clr = ColorB(0, 255, 255, 255);
-                }
-                else if (nLod == 4)
-                {
-                    clr = ColorB(255, 255, 0, 255);
-                }
-                else if (nLod == 5)
-                {
-                    clr = ColorB(255, 0, 255, 255);
-                }
-                else
-                {
-                    clr = ColorB(255, 255, 255, 255);
-                }
-            }
-
-            if (pMaterial)
-            {
-                pMaterial = GetMatMan()->GetDefaultHelperMaterial();
-            }
-            if (pObj)
-            {
-                pObj->m_II.m_AmbColor = ColorF(clr.r / 180.0f, clr.g / 180.0f, clr.b / 180.0f, 1);
-                pObj->m_nMaterialLayers = 0;
-                pObj->m_ObjFlags |= FOB_SELECTED;
-            }
-
-            // Don't skip objects with single lod (as they should flash)
-            if (pObj && !bNoText)
-            {
-                const int nLod0 = nNumLods > 1 ? GetMinUsableLod() : 0;     // Always 0 if one lod
-                const int maxLod = nNumLods > 1 ? GetMaxUsableLod() : 0;    // Always 0 if one lod
-
-                clr.toFloat4(color);    // Actually use the colours calculated already to indicate lod
-
-                const bool bRenderNodeValid(pObj && pObj->m_pRenderNode && ((UINT_PTR)(void*)(pObj->m_pRenderNode) > 0));
-                IRenderNode* pRN = (IRenderNode*)pObj->m_pRenderNode;
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%d [%d;%d] (%d/%.1f)",
-                    nLod, nLod0, maxLod,
-                    bRenderNodeValid ? pRN->GetLodRatio() : -1, pObj->m_fDistance);
-            }
-
-            return false;
-            //////////////////////////////////////////////////////////////////////////
-        }
-        case 4:
-        {
-            // Show texture usage.
-            if (m_pRenderMesh)
-            {
-                int nTexMemUsage = m_pRenderMesh->GetTextureMemoryUsage(pMaterial);
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%d", nTexMemUsage / 1024);      // in KByte
-            }
-        }
-        break;
-
-        case 5:
-        {
-            //////////////////////////////////////////////////////////////////////////
-            // Show Num Render materials.
-            //////////////////////////////////////////////////////////////////////////
-            ColorB clr(0, 0, 0, 0);
-            if (nRenderMats == 1)
-            {
-                clr = ColorB(0, 0, 255, 255);
-            }
-            else if (nRenderMats == 2)
-            {
-                clr = ColorB(0, 255, 255, 255);
-            }
-            else if (nRenderMats == 3)
-            {
-                clr = ColorB(0, 255, 0, 255);
-            }
-            else if (nRenderMats == 4)
-            {
-                clr = ColorB(255, 0, 255, 255);
-            }
-            else if (nRenderMats == 5)
-            {
-                clr = ColorB(255, 255, 0, 255);
-            }
-            else if (nRenderMats >= 6)
-            {
-                clr = ColorB(255, 0, 0, 255);
-            }
-            else if (nRenderMats >= 11)
-            {
-                clr = ColorB(255, 255, 255, 255);
-            }
-
-            if (pMaterial)
-            {
-                pMaterial = GetMatMan()->GetDefaultHelperMaterial();
-            }
-            if (pObj)
-            {
-                pObj->m_II.m_AmbColor = ColorF(clr.r / 155.0f, clr.g / 155.0f, clr.b / 155.0f, 1);
-                pObj->m_nMaterialLayers = 0;
-                pObj->m_ObjFlags |= FOB_SELECTED;
-            }
-
-            if (!bNoText)
-            {
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%d", nRenderMats);
-            }
-        }
-        break;
-
-        case 6:
-        {
-            if (pMaterial)
-            {
-                pMaterial = GetMatMan()->GetDefaultHelperMaterial();
-            }
-
-            ColorF col(1, 1, 1, 1);
-            if (pObj)
-            {
-                pObj->m_nMaterialLayers = 0;
-                col = pObj->m_II.m_AmbColor;
-            }
-
-            pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%d,%d,%d,%d", (int)(col.r * 255.0f), (int)(col.g * 255.0f), (int)(col.b * 255.0f), (int)(col.a * 255.0f));
-        }
-        break;
-
-        case 7:
-            if (m_pRenderMesh)
-            {
-                int nTexMemUsage = m_pRenderMesh->GetTextureMemoryUsage(pMaterial);
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%d,%d,%d", m_nRenderTrisCount, nRenderMats, nTexMemUsage / 1024);
-            }
-            break;
-        case 13:
-        {
-#ifdef SUPPORT_TERRAIN_AO_PRE_COMPUTATIONS
-            float fOcclusion = GetOcclusionAmount();
-            pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%.2f", fOcclusion);
-#endif
-        }
-        break;
-
-        case 16:
-        {
-            // Draw stats for object selected by debug gun
-            if (GetRenderer()->IsDebugRenderNode((IRenderNode*)pObj->m_pRenderNode))
-            {
-                const char* shortName = PathUtil::GetFile(m_szFileName.c_str());
-
-                int texMemUsage = 0;
-
-                if (m_pRenderMesh)
-                {
-                    texMemUsage = m_pRenderMesh->GetTextureMemoryUsage(pMaterial);
-                }
-
-                pAuxGeom->DrawAABB(bbox, tm, false, ColorB(0, 255, 255, 128), eBBD_Faceted);
-
-                float yellow[4] = {1.f, 1.f, 0.f, 1.f};
-
-                const float yOffset = 165.f;
-                const float xOffset = 970.f;
-
-                if (m_pParentObject == NULL)
-                {
-                    pRend->Draw2dLabel(xOffset, 40.f, 1.5f, yellow, false, "%s", shortName);
-
-                    pRend->Draw2dLabel(xOffset, yOffset, 1.5f, color, false,
-                        //"Mesh: %s\n"
-                        "LOD: %d/%d\n"
-                        "Num Instances: %d\n"
-                        "Num Tris: %d\n"
-                        "Tex Mem usage: %.2f kb\n"
-                        "Mesh Mem usage: %.2f kb\n"
-                        "Num Materials: %d\n"
-                        "Mesh Type: %s\n",
-                        //shortName,
-                        nLod, nNumLods,
-                        m_nUsers,
-                        m_nRenderTrisCount,
-                        texMemUsage / 1024.f,
-                        m_nRenderMeshMemoryUsage / 1024.f,
-                        nRenderMats,
-                        m_pRenderMesh->GetTypeName());
-                }
-                else
-                {
-                    for (int i = 0; i < m_pParentObject->SubObjectCount(); i++)
-                    {
-                        //find subobject position
-                        if (m_pParentObject->SubObject(i).pStatObj == this)
-                        {
-                            //only render the header once
-                            if (i == 0)
-                            {
-                                pRend->Draw2dLabel(600.f, 40.f, 2.f, yellow, false, "Debug Gun: %s", shortName);
-                            }
-                            float y = yOffset + ((i % 4) * 150.f);
-                            float x = xOffset - (floor(i / 4.f) * 200.f);
-
-                            pRend->Draw2dLabel(x, y, 1.5f, color, false,
-                                "Sub Mesh: %s\n"
-                                "LOD: %d/%d\n"
-                                "Num Instances: %d\n"
-                                "Num Tris: %d\n"
-                                "Tex Mem usage: %.2f kb\n"
-                                "Mesh Mem usage: %.2f kb\n"
-                                "Num Materials: %d\n"
-                                "Mesh Type: %s\n",
-                                m_szGeomName.c_str() ? m_szGeomName.c_str() : "UNKNOWN",
-                                nLod, nNumLods,
-                                m_nUsers,
-                                m_nRenderTrisCount,
-                                texMemUsage / 1024.f,
-                                m_nRenderMeshMemoryUsage / 1024.f,
-                                nRenderMats,
-                                m_pRenderMesh->GetTypeName());
-
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        break;
-
-        case 19:    // Displays the triangle count of physic proxies.
-            if (!bNoText)
-            {
-                int nPhysTrisCount = 0;
-                for (int j = 0; j < MAX_PHYS_GEOMS_TYPES; ++j)
-                {
-                    if (GetPhysGeom(j))
-                    {
-                        nPhysTrisCount += GetPhysGeom(j)->pGeom->GetPrimitiveCount();
-                    }
-                }
-
-                if (nPhysTrisCount == 0)
-                {
-                    color[3] = 0.1f;
-                }
-
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%d", nPhysTrisCount);
-            }
-            return false;
-
-        case 22:
-        {
-            // Show texture usage.
-            if (m_pRenderMesh)
-            {
-                pRend->DrawLabelEx(pos, 1.3f, color, true, true, "[LOD %d: %d]", nLod, m_pRenderMesh->GetVerticesCount());
-            }
-        }
-        break;
-        case 23:
-        {
-            if (pObj && pObj->m_pRenderNode)
-            {
-                IRenderNode* pRenderNode = (IRenderNode*)pObj->m_pRenderNode;
-                const bool bCastsShadow = (pRenderNode->GetRndFlags() & ERF_CASTSHADOWMAPS) != 0;
-                ColorF clr = bCastsShadow ? ColorF(1.f, 0.f, 0.f, 1.0f) : ColorF(0.f, 1.f, 0.f, 1.f);
-
-                int nIndices = 0;
-                int nIndicesNoShadow = 0;
-
-                // figure out how many primitives actually cast shadows
-                if (pMaterial && bCastsShadow)
-                {
-                    for (int i = 0; i < nMats; ++i)
-                    {
-                        CRenderChunk& rc = m_pRenderMesh->GetChunks()[i];
-                        if (rc.pRE && rc.nNumIndices && rc.nNumVerts && ((rc.m_nMatFlags & MTL_FLAG_NODRAW) == 0))
-                        {
-                            SShaderItem& ShaderItem         = pMaterial->GetShaderItem(rc.m_nMatID);
-                            IRenderShaderResources* pR  = ShaderItem.m_pShaderResources;
-
-                            if (pR && (pR->GetResFlags() & MTL_FLAG_NOSHADOW))
-                            {
-                                nIndicesNoShadow += rc.nNumIndices;
-                            }
-
-                            nIndices += rc.nNumIndices;
-                        }
-                    }
-
-                    Vec3 red, green;
-                    ColorF(1.f, 0.f, 0.f, 1.0f).toHSV(red.x, red.y, red.z);
-                    ColorF(0.f, 1.f, 0.f, 1.0f).toHSV(green.x, green.y, green.z);
-
-                    Vec3 c = Vec3::CreateLerp(red, green, (float)nIndicesNoShadow / max(nIndices, 1));
-                    clr.fromHSV(c.x, c.y, c.z);
-
-                    pMaterial = GetMatMan()->GetDefaultHelperMaterial();
-                }
-
-                pObj->m_II.m_AmbColor = clr;
-                pObj->m_nMaterialLayers = 0;
-                pObj->m_ObjFlags |= FOB_SELECTED;
-            }
-            return false;
-        }
-        case 24:
-        case 25:
-        {
-            // display a label for this render node if the triangle count equals or exceeds 
-            // e_DebugDrawLodMinTriangles and the object has no lods, or has too few lods
-            int minTriangleCount = GetCVars()->e_DebugDrawLodMinTriangles;
-            if (m_nLoadedTrisCount >= minTriangleCount)
-            {
-                IRenderNode* pRN = (IRenderNode*)pObj->m_pRenderNode;
-                const char* shortName = "";
-
-                if (!m_szGeomName.empty())
-                {
-                    shortName = m_szGeomName.c_str();
-                }
-                else
-                {
-                    shortName = PathUtil::GetFile(m_szFileName.c_str());
-                }
-
-                if (nNumLods == 1)
-                {
-                    color[1] = color[2] = 0.0f;
-
-                    IRenderer::RNDrawcallsMapNode& drawCallsPerNode = pRend->GetDrawCallsInfoPerNodePreviousFrame();
-                    auto iter = drawCallsPerNode.find(pRN);
-                    if (iter != drawCallsPerNode.end())
-                    {
-                        pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%s (%d)\n%d/%d/%d/%d/%d", shortName, m_nLoadedTrisCount, iter->second.nZpass, iter->second.nGeneral, iter->second.nTransparent, iter->second.nShadows, iter->second.nMisc);
-                    }
-                    else
-                    {
-                        pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%s (%d)", shortName, m_nLoadedTrisCount);
-                    }
-                }
-                else if (e_DebugDraw == 25 && nNumLods < MAX_STATOBJ_LODS_NUM)   // 25 adds in drawing of objects that should be at a lower lod than exists
-                {
-                    float lodDistance = sqrt(m_fGeometricMeanFaceArea);
-                    float nextLodDistance = lodDistance * (nNumLods) / (pRN->GetLodRatioNormalized() * gEnv->p3DEngine->GetFrameLodInfo().fTargetSize);
-                    if (pObj->m_fDistance > nextLodDistance)
-                    {
-                        color[0] = color[1] = 0.0f;
-                        pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%s (%d)", shortName, m_nLoadedTrisCount);
-                    }
-                }
-            }
-        }
-        break;
-        }
-    }
-
-    if (GetCVars()->e_DebugDraw == 15 && !bOnlyBoxes)
-    {
-        // helpers
-        for (int i = 0; i < (int)m_subObjects.size(); i++)
-        {
-            SSubObject* pSubObject = &(m_subObjects[i]);
-            if (pSubObject->nType == STATIC_SUB_OBJECT_MESH && pSubObject->pStatObj)
-            {
-                continue;
-            }
-
-            if (bHasHelperFilter)
-            {
-                if (pSubObject->name.find(e_DebugDrawFilter) == string::npos)
-                {
-                    continue;
-                }
-            }
-
-            // make object matrix
-            Matrix34 tMat = tm * pSubObject->tm;
-            Vec3 pos = tMat.GetTranslation();
-
-            // draw axes
-            float s = 0.02f;
-            ColorB col(0, 255, 255, 255);
-            pAuxGeom->DrawAABB(AABB(Vec3(-s, -s, -s), Vec3(s, s, s)), tMat, false, col, eBBD_Faceted);
-            pAuxGeom->DrawLine(pos + s * tMat.GetColumn1(), col, pos + 3.f * s * tMat.GetColumn1(), col);
-
-            // text
-            float color[4] = {0, 1, 1, 1};
-            pRend->DrawLabelEx(pos, 1.3f, color, true, true, "%s", pSubObject->name.c_str());
-        }
-    }
-
-
-    if (Get3DEngine()->IsDebugDrawListEnabled())
-    {
-        I3DEngine::SObjectInfoToAddToDebugDrawList objectInfo;
-        if (pObj->m_pRenderNode)
-        {
-            objectInfo.pName = ((IRenderNode*)pObj->m_pRenderNode)->GetName();
-            objectInfo.pClassName = ((IRenderNode*)pObj->m_pRenderNode)->GetEntityClassName();
-        }
-        else
-        {
-            objectInfo.pName = "";
-            objectInfo.pClassName = "";
-        }
-        objectInfo.pFileName = m_szFileName.c_str();
-        if (m_pRenderMesh && pObj->m_pCurrMaterial)
-        {
-            objectInfo.texMemory = m_pRenderMesh->GetTextureMemoryUsage(pObj->m_pCurrMaterial);
-        }
-        else
-        {
-            objectInfo.texMemory = 0;
-        }
-        objectInfo.numTris = m_nRenderTrisCount;
-        objectInfo.numVerts = m_nLoadedVertexCount;
-        objectInfo.meshMemory = m_nRenderMeshMemoryUsage;
-        objectInfo.pMat = &tm;
-        objectInfo.pBox = &bbox;
-        objectInfo.type = I3DEngine::DLOT_STATOBJ;
-        objectInfo.pRenderNode = (IRenderNode*)(pObj->m_pRenderNode);
-        Get3DEngine()->AddObjToDebugDrawList(objectInfo);
-    }
-
-
-
-#endif //_RELEASE
-    return false;
-}
-
-//
-// StatObj functions.
-//
-
-float CStatObj::GetExtent(EGeomForm eForm)
-{
-    int nSubCount = m_subObjects.size();
-    if (!nSubCount)
-    {
-        return m_pRenderMesh ? m_pRenderMesh->GetExtent(eForm) : 0.f;
-    }
-
-    CGeomExtent& ext = m_Extents.Make(eForm);
-    if (!ext)
-    {
-        // Create parts for main and sub-objects.
-        ext.ReserveParts(1 + nSubCount);
-
-        ext.AddPart(m_pRenderMesh ? m_pRenderMesh->GetExtent(eForm) : 0.f);
-
-        // Evaluate sub-objects.
-        for (int i = 0; i < nSubCount; i++)
-        {
-            IStatObj::SSubObject* pSub = &m_subObjects[i];
-            if (pSub->nType == STATIC_SUB_OBJECT_MESH && pSub->pStatObj)
-            {
-                float fExt = pSub->pStatObj->GetExtent(eForm);
-
-                if (eForm == GeomForm_Edges)
-                {
-                    fExt *= powf(pSub->tm.Determinant(), 0.333f);
-                }
-                else if (eForm == GeomForm_Surface)
-                {
-                    fExt *= powf(pSub->tm.Determinant(), 0.667f);
-                }
-                else if (eForm == GeomForm_Volume)
-                {
-                    fExt *= pSub->tm.Determinant();
-                }
-
-                ext.AddPart(fExt);
-            }
-            else
-            {
-                ext.AddPart(0.f);
-            }
-        }
-    }
-    return ext.TotalExtent();
-}
-
-void CStatObj::GetRandomPos(PosNorm& ran, EGeomForm eForm) const
-{
-    if (!m_subObjects.empty())
-    {
-        CGeomExtent const& ext = m_Extents[eForm];
-        int iSubObj = ext.RandomPart();
-        if (iSubObj-- > 0)
-        {
-            IStatObj::SSubObject const* pSub = &m_subObjects[iSubObj];
-            assert(pSub && pSub->pStatObj);
-            pSub->pStatObj->GetRandomPos(ran, eForm);
-            ran <<= pSub->tm;
-            return;
-        }
-    }
-    if (m_pRenderMesh)
-    {
-        m_pRenderMesh->GetRandomPos(ran, eForm);
-    }
-    else
-    {
-        ran.zero();
-    }
-}
-
-void CStatObj::ComputeGeometricMean(SMeshLodInfo& lodInfo)
-{
-    lodInfo.Clear();
-
-    lodInfo.fGeometricMean = m_fGeometricMeanFaceArea;
-    lodInfo.nFaceCount = m_nRenderTrisCount;
-
-    if (GetFlags() & STATIC_OBJECT_COMPOUND)
-    {
-        for (uint i = 0; i < m_subObjects.size(); ++i)
-        {
-            if (m_subObjects[i].nType == STATIC_SUB_OBJECT_MESH && m_subObjects[i].bShadowProxy == false && m_subObjects[i].pStatObj != NULL)
-            {
-                SMeshLodInfo subLodInfo;
-                static_cast<CStatObj*>(m_subObjects[i].pStatObj)->ComputeGeometricMean(subLodInfo);
-
-                lodInfo.Merge(subLodInfo);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::DebugDraw(const SGeometryDebugDrawInfo& info, float fExtrdueScale)
-{
-    if (m_nFlags & STATIC_OBJECT_COMPOUND && !m_bMerged)
-    {
-        // Draw sub objects.
-        for (int i = 0; i < (int)m_subObjects.size(); i++)
-        {
-            if (!m_subObjects[i].pStatObj || m_subObjects[i].bHidden || m_subObjects[i].nType != STATIC_SUB_OBJECT_MESH)
-            {
-                continue;
-            }
-
-            SGeometryDebugDrawInfo subInfo = info;
-            subInfo.tm = info.tm * m_subObjects[i].localTM;
-            m_subObjects[i].pStatObj->DebugDraw(subInfo, fExtrdueScale);
-        }
-    }
-    else if (m_pRenderMesh)
-    {
-        m_pRenderMesh->DebugDraw(info, ~0, fExtrdueScale);
-    }
-    else
-    {
-        // No RenderMesh in here, so probably no geometry in highest LOD, find it in lower LODs
-        if (m_pLODs)
-        {
-            assert(m_nMaxUsableLod < MAX_STATOBJ_LODS_NUM);
-            for (int nLod = 0; nLod <= (int)m_nMaxUsableLod; nLod++)
-            {
-                if (m_pLODs[nLod] && m_pLODs[nLod]->m_pRenderMesh)
-                {
-                    m_pLODs[nLod]->m_pRenderMesh->DebugDraw(info, ~0, fExtrdueScale);
-                    break;
-                }
-            }
-        }
-    }
-}
-
diff --git a/Code/CryEngine/Cry3DEngine/StatObjStream.cpp b/Code/CryEngine/Cry3DEngine/StatObjStream.cpp
deleted file mode 100644
index 6d9b1f98b1..0000000000
--- a/Code/CryEngine/Cry3DEngine/StatObjStream.cpp
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : loading
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "IndexedMesh.h"
-#include "../RenderDll/Common/Shadow_Renderer.h"
-#include <IRenderer.h>
-#include <CrySizer.h>
-
-#include "CGF/CGFLoader.h"
-#include "CGF/CGFSaver.h"
-#include "CGF/ReadOnlyChunkFile.h"
-
-#define GEOM_INFO_FILE_EXT "ginfo"
-#define MESH_NAME_FOR_MAIN "main"
-
-extern const char* stristr(const char* szString, const char* szSubstring);
-
-extern void TransformMesh(CMesh& mesh, Matrix34 tm);
-
-#if !defined (_RELEASE) 
-float CStatObj::s_fStreamingTime = 0.0f;
-int CStatObj::s_nBandwidth = 0;
-#endif
-
-void CStatObj::StreamAsyncOnComplete(IReadStream* pStream, unsigned nError)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (nError == ERROR_CANT_OPEN_FILE && m_bHasStreamOnlyCGF)
-    {
-        // Deliberately ignore
-    }
-    else if (pStream->IsError())
-    { // file was not loaded successfully
-        m_eStreamingStatus = ecss_Ready;
-        if (pStream->GetError() != ERROR_USER_ABORT && pStream->GetError() != ERROR_ABORTED_ON_SHUTDOWN)
-        {
-            Error("CStatObj::StreamAsyncOnComplete: Error loading CGF: %s Error: %s", m_szFileName.c_str(), pStream->GetErrorName());
-        }
-    }
-    else
-    {
-#if !defined (_RELEASE)
-        float timeinseconds = (gEnv->pTimer->GetCurrTime() - m_fStreamingStart);
-        s_nBandwidth += pStream->GetBytesRead();
-        s_fStreamingTime += timeinseconds;
-        m_fStreamingStart = 0.0f;
-#endif
-
-        if (!LoadStreamRenderMeshes(0, pStream->GetBuffer(), pStream->GetBytesRead(), strstr(m_szFileName.c_str(), "_lod") != NULL))
-        {
-            Error("CStatObj::StreamOnComplete_LoadCGF_FromMemBlock, filename=%s", m_szFileName.c_str());
-        }
-    }
-
-    pStream->FreeTemporaryMemory(); // We dont need internal stream loaded buffer anymore.
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::StreamOnComplete(IReadStream* pStream, unsigned nError)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // Synchronous callback.
-
-    if (nError == ERROR_CANT_OPEN_FILE && m_bHasStreamOnlyCGF)
-    {
-        m_bHasStreamOnlyCGF = 0;
-        m_eStreamingStatus = ecss_NotLoaded;
-    }
-    else if (pStream->IsError())
-    {
-        // file was not loaded successfully
-        if (pStream->GetError() != ERROR_USER_ABORT && pStream->GetError() != ERROR_ABORTED_ON_SHUTDOWN)
-        {
-            Error("CStatObj::StreamOnComplete: Error loading CGF: %s Error: %s", m_szFileName.c_str(), pStream->GetErrorName());
-        }
-
-        m_eStreamingStatus = ecss_Ready;
-    }
-    else
-    {
-        CommitStreamRenderMeshes();
-
-        //////////////////////////////////////////////////////////////////////////
-        // Forces vegetation sprites to be marked for regeneration from new mesh.
-        //////////////////////////////////////////////////////////////////////////
-        for (int nSID = 0; nSID < m_pObjManager->GetListStaticTypes().Count(); nSID++)
-        {
-            PodArray<StatInstGroup>& rGroupTable = m_pObjManager->GetListStaticTypes()[nSID];
-            for (int nGroupId = 0, nGroups = rGroupTable.Count(); nGroupId < nGroups; nGroupId++)
-            {
-                StatInstGroup& rGroup = rGroupTable[nGroupId];
-                if (rGroup.pStatObj == this)
-                {
-                    rGroup.Update(GetCVars(), Get3DEngine()->GetGeomDetailScreenRes());
-                }
-            }
-        }
-        //////////////////////////////////////////////////////////////////////////
-
-#ifdef OBJMAN_STREAM_STATS
-        if (m_pStreamListener)
-        {
-            m_pStreamListener->OnReceivedStreamedObject(static_cast<IStreamable*>(this));
-        }
-#endif
-
-        m_eStreamingStatus = ecss_Ready;
-    }
-
-    m_pReadStream = 0;
-}
-
-void CStatObj::GetStreamFilePath(stack_string& strOut)
-{
-    strOut = m_szFileName.c_str();
-    strOut.append("m");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatObj::StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream)
-{
-    assert(!m_pParentObject);
-
-    assert(m_eStreamingStatus == ecss_NotLoaded);
-
-    if (m_eStreamingStatus != ecss_NotLoaded)
-    {
-        return;
-    }
-
-    // start streaming
-    StreamReadParams params;
-    params.dwUserData = 0;
-    params.nSize = 0;
-    params.pBuffer = NULL;
-    params.nLoadTime = 10000;
-    params.nMaxLoadTime = 10000;
-    if (bFinishNow)
-    {
-        params.ePriority = estpUrgent;
-    }
-
-    if (m_szFileName.empty())
-    {
-        assert(!"CStatObj::StartStreaming: CGF name is empty");
-        m_eStreamingStatus = ecss_Ready;
-        if (ppStream)
-        {
-            *ppStream = NULL;
-        }
-        return;
-    }
-
-#if !defined (_RELEASE)
-    m_fStreamingStart = gEnv->pTimer->GetCurrTime();
-#endif //!defined (_RELEASE)
-    const char* path = m_szFileName.c_str();
-
-    stack_string streamPath;
-    if (m_bHasStreamOnlyCGF)
-    {
-        GetStreamFilePath(streamPath);
-        path = streamPath.c_str();
-    }
-
-    m_pReadStream = GetSystem()->GetStreamEngine()->StartRead(eStreamTaskTypeGeometry, path, this, &params);
-
-    if (ppStream)
-    {
-        (*ppStream) = m_pReadStream;
-    }
-    if (!bFinishNow)
-    {
-        m_eStreamingStatus = ecss_InProgress;
-    }
-    else if (!ppStream)
-    {
-        m_pReadStream->Wait();
-    }
-}
-
-void CStatObj::ReleaseStreamableContent()
-{
-    assert(!m_pParentObject);
-    assert(!m_pClonedSourceObject);
-    assert(!m_bSharesChildren);
-
-    bool bLodsAreLoadedFromSeparateFile = m_pLod0 ? m_pLod0->IsLodsAreLoadedFromSeparateFile() : m_bLodsAreLoadedFromSeparateFile;
-
-    if (!bLodsAreLoadedFromSeparateFile)
-    {
-        for (int nLod = 0; nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-        {
-            CStatObj* pLod = (CStatObj*)GetLodObject(nLod);
-
-            if (!pLod)
-            {
-                continue;
-            }
-
-            pLod->SetRenderMesh(0);
-            pLod->m_eStreamingStatus = ecss_NotLoaded;
-
-            if (pLod->m_pParentObject)
-            {
-                pLod->m_pParentObject->SetRenderMesh(0);
-                pLod->m_pParentObject->m_eStreamingStatus = ecss_NotLoaded;
-            }
-        }
-    }
-
-    for (int s = 0; s < GetSubObjectCount(); s++)
-    {
-        SSubObject& sub = *GetSubObject(s);
-        if (!sub.pStatObj)
-        {
-            continue;
-        }
-
-        if (bLodsAreLoadedFromSeparateFile)
-        {
-            CStatObj* pSubLod = (CStatObj*)sub.pStatObj;
-
-            if (!pSubLod)
-            {
-                continue;
-            }
-
-            pSubLod->SetRenderMesh(0);
-            pSubLod->m_eStreamingStatus = ecss_NotLoaded;
-
-            if (pSubLod->m_pParentObject)
-            {
-                pSubLod->m_pParentObject->SetRenderMesh(0);
-                pSubLod->m_pParentObject->m_eStreamingStatus = ecss_NotLoaded;
-            }
-        }
-        else
-        {
-            for (int nLod = 0; nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-            {
-                CStatObj* pSubLod = (CStatObj*)sub.pStatObj->GetLodObject(nLod);
-
-                if (!pSubLod)
-                {
-                    continue;
-                }
-
-                pSubLod->SetRenderMesh(0);
-                pSubLod->m_eStreamingStatus = ecss_NotLoaded;
-
-                if (pSubLod->m_pParentObject)
-                {
-                    pSubLod->m_pParentObject->SetRenderMesh(0);
-                    pSubLod->m_pParentObject->m_eStreamingStatus = ecss_NotLoaded;
-                }
-            }
-        }
-    }
-
-    SetRenderMesh(0);
-
-    m_pMergedRenderMesh = 0;
-
-    m_eStreamingStatus = ecss_NotLoaded;
-}
-
-int CStatObj::GetStreamableContentMemoryUsage([[maybe_unused]] bool bJustForDebug)
-{
-    assert(!m_pParentObject || bJustForDebug); // only parents allowed to be registered for streaming
-
-    bool bLodsAreLoadedFromSeparateFile = m_pLod0 ? m_pLod0->IsLodsAreLoadedFromSeparateFile() : m_bLodsAreLoadedFromSeparateFile;
-    bool bCountLods = !bLodsAreLoadedFromSeparateFile;
-
-    if (m_arrRenderMeshesPotentialMemoryUsage[bCountLods] < 0)
-    {
-        int nCount = 0;
-
-        if (bCountLods)
-        {
-            if (m_pLODs)
-            {
-                for (int nLod = 1; nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-                {
-                    CStatObj* pLod = (CStatObj*)m_pLODs[nLod];
-
-                    if (!pLod)
-                    {
-                        continue;
-                    }
-
-                    nCount += pLod->m_nRenderMeshMemoryUsage;
-                }
-            }
-        }
-
-        nCount += m_nRenderMeshMemoryUsage;
-
-        for (int s = 0; s < GetSubObjectCount(); s++)
-        {
-            SSubObject& sub = *GetSubObject(s);
-
-            if (!sub.pStatObj)
-            {
-                continue;
-            }
-
-            if (bCountLods)
-            {
-                CStatObj* pSubStatObj = (CStatObj*)sub.pStatObj;
-                if (pSubStatObj->m_pLODs)
-                {
-                    for (int nLod = 1; nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-                    {
-                        CStatObj* pSubLod = pSubStatObj->m_pLODs[nLod];
-
-                        if (!pSubLod)
-                        {
-                            continue;
-                        }
-
-                        nCount += pSubLod->m_nRenderMeshMemoryUsage;
-                    }
-                }
-            }
-
-            nCount += ((CStatObj*)sub.pStatObj)->m_nRenderMeshMemoryUsage;
-        }
-
-        m_arrRenderMeshesPotentialMemoryUsage[bCountLods] = nCount;
-    }
-
-    if (m_pMergedRenderMesh)
-    {
-        //TODO: Need to have a function to calculate memory usage.
-        //m_nMergedMemoryUsage = m_pMergedRenderMesh->GetAllocatedBytes(true);
-        m_nMergedMemoryUsage = m_pMergedRenderMesh->GetVerticesCount() * (sizeof(SPipTangents) + sizeof(SVF_P3S_C4B_T2S)) + m_pMergedRenderMesh->GetIndicesCount() * sizeof(uint16);
-    }
-    else
-    if (!GetCVars()->e_StatObjMerge)
-    {
-        m_nMergedMemoryUsage = 0;
-    }
-
-    return m_nMergedMemoryUsage + m_arrRenderMeshesPotentialMemoryUsage[bCountLods];
-}
-
-void CStatObj::UpdateStreamingPrioriryInternal(const Matrix34A& objMatrix, float fImportance, bool bFullUpdate)
-{
-    int nRoundId = GetObjManager()->GetUpdateStreamingPrioriryRoundId();
-
-    if (m_pParentObject && m_bSubObject)
-    { // stream parent for sub-objects
-        m_pParentObject->UpdateStreamingPrioriryInternal(objMatrix, fImportance, bFullUpdate);
-    }
-    else if (!m_bSubObject)
-    { // stream object itself
-        if (m_bCanUnload)
-        {
-            if (UpdateStreamingPrioriryLowLevel(fImportance, nRoundId, bFullUpdate))
-            {
-                GetObjManager()->RegisterForStreaming(this);
-            }
-        }
-    }
-    else if (m_pLod0)
-    { // sub-object lod without parent
-        m_pLod0->UpdateStreamingPrioriryInternal(objMatrix, fImportance, bFullUpdate);
-        assert(!m_pLod0->IsLodsAreLoadedFromSeparateFile());
-    }
-    else if (m_bCanUnload)
-    {
-        assert(!"Invalid CGF hierarchy");
-    }
-}
-
-bool CStatObj::UpdateStreamableComponents(float fImportance, const Matrix34A& objMatrix, bool bFullUpdate, int nNewLod)
-{
-    if (m_pLod0) // redirect to lod0, otherwise we fail to pre-cache neighbor LODs
-    {
-        return m_pLod0->UpdateStreamableComponents(fImportance, objMatrix, bFullUpdate, nNewLod);
-    }
-
-#ifndef _RELEASE
-    if (GetCVars()->e_StreamCgfDebug && strlen(GetCVars()->e_StreamCgfDebugFilter->GetString()) && strstr(m_szFileName, GetCVars()->e_StreamCgfDebugFilter->GetString()))
-    {
-        PrintMessage(__FUNCTION__);
-    }
-#endif
-
-    //  FUNCTION_PROFILER_3DENGINE;
-
-    if (m_nFlags & STATIC_OBJECT_HIDDEN)
-    {
-        return false;
-    }
-
-    nNewLod = min(nNewLod, MAX_STATOBJ_LODS_NUM - 1);
-
-    if ((m_nFlags & STATIC_OBJECT_COMPOUND) && SubObjectCount())
-    {
-        for (int s = 0, num = SubObjectCount(); s < num; s++)
-        {
-            IStatObj::SSubObject& subObj = SubObject(s);
-
-            if (subObj.pStatObj && subObj.nType == STATIC_SUB_OBJECT_MESH && !subObj.bShadowProxy)
-            {
-                Matrix34 subObjMatrix = objMatrix * subObj.tm;
-
-                CStatObj* pSubStatObj = ((CStatObj*)subObj.pStatObj);
-
-                if (pSubStatObj->m_nLoadedTrisCount < 1)
-                {
-                    continue;
-                }
-
-                for (int l = nNewLod; l <= (nNewLod + 1) && l < MAX_STATOBJ_LODS_NUM; l++)
-                {
-                    if (CStatObj* pLod = (CStatObj*)pSubStatObj->GetLodObject(l, true))
-                    {
-                        pLod->UpdateStreamingPrioriryInternal(objMatrix, fImportance, bFullUpdate);
-
-                        if (!(CStatObj*)pSubStatObj->m_pLODs)
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    else if (m_nLoadedTrisCount >= 1)
-    {
-        for (int l = nNewLod; l <= (nNewLod + 1) && l < MAX_STATOBJ_LODS_NUM; l++)
-        {
-            if (CStatObj* pLod = (CStatObj*)GetLodObject(l, true))
-            {
-                pLod->UpdateStreamingPrioriryInternal(objMatrix, fImportance, bFullUpdate);
-
-                if (!m_pLODs)
-                {
-                    break;
-                }
-            }
-        }
-    }
-
-    // update also next state CGF
-    if (!m_szStreamingDependencyFilePath.empty())
-    {
-        if (CStatObj* pNextState = (CStatObj*)GetObjManager()->FindStaticObjectByFilename(m_szStreamingDependencyFilePath))
-        {
-            pNextState->UpdateStreamableComponents(fImportance, objMatrix, bFullUpdate, nNewLod);
-        }
-    }
-
-    if (m_pParentObject && !m_pParentObject->m_szStreamingDependencyFilePath.empty())
-    {
-        if (CStatObj* pNextState = (CStatObj*)GetObjManager()->FindStaticObjectByFilename(m_pParentObject->m_szStreamingDependencyFilePath))
-        {
-            pNextState->UpdateStreamableComponents(fImportance, objMatrix, bFullUpdate, nNewLod);
-        }
-    }
-
-    return true;
-}
-
-void CStatObj::DisableStreaming()
-{
-    for (int nLodLevel = 0; nLodLevel < MAX_STATOBJ_LODS_NUM; nLodLevel++)
-    {
-        if (CStatObj* pLodObj = (CStatObj*)GetLodObject(nLodLevel))
-        {
-            pLodObj->m_nLastDrawMainFrameId = GetRenderer()->GetFrameID(false) + 1000;
-            pLodObj->UpdateStreamingPrioriryLowLevel(1.f, GetObjManager()->GetUpdateStreamingPrioriryRoundId(), true);
-            pLodObj->m_bCanUnload = false;
-
-            // only register the parent object for streaming, it will stream in all subobject + lods
-            if (pLodObj->m_pParentObject)
-            {
-                GetObjManager()->RegisterForStreaming(pLodObj->m_pParentObject);
-            }
-            else
-            {
-                GetObjManager()->RegisterForStreaming(pLodObj);
-            }
-        }
-    }
-}
-
-
-bool CStatObj::CheckForStreamingDependencyLoop(const char* szFilenameDependancy) const
-{
-    IObjManager* pObjManager = GetObjManager();
-    while (szFilenameDependancy)
-    {
-        const CStatObj* pStatObjDependency = static_cast<const CStatObj*>(pObjManager->FindStaticObjectByFilename(szFilenameDependancy));
-        if (!pStatObjDependency)
-        {
-            return false;
-        }
-
-        if (this == pStatObjDependency)
-        {
-            return true;
-        }
-
-        szFilenameDependancy = pStatObjDependency->m_szStreamingDependencyFilePath.c_str();
-    }
-
-    return false;
-}
diff --git a/Code/CryEngine/Cry3DEngine/StatObj_Jobs.cpp b/Code/CryEngine/Cry3DEngine/StatObj_Jobs.cpp
deleted file mode 100644
index cfb8528dae..0000000000
--- a/Code/CryEngine/Cry3DEngine/StatObj_Jobs.cpp
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : prepare and add render element into renderer
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "../RenderDll/Common/Shadow_Renderer.h"
-
-#include "IndexedMesh.h"
-#include "VisAreas.h"
-#include "GeomQuery.h"
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CStatObj::RenderInternal(CRenderObject* pRenderObject, uint64 nSubObjectHideMask, const CLodValue& lodValue, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (m_nFlags & STATIC_OBJECT_HIDDEN)
-    {
-        return;
-    }
-
-    m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-    if (m_pParentObject)
-    {
-        m_pParentObject->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-    }
-
-    if (m_nInitialSubObjHideMask != 0 && nSubObjectHideMask == 0)
-    {
-        nSubObjectHideMask = m_nInitialSubObjHideMask;
-        if ((m_pMergedRenderMesh != NULL) && !(pRenderObject->m_ObjFlags & FOB_MESH_SUBSET_INDICES)) // If not already set by per-instance hide mask.
-        {
-            SRenderObjData* pOD = GetRenderer()->EF_GetObjData(pRenderObject, true, passInfo.ThreadID());
-
-            // Only pass SubObject hide mask for merged objects, because they have a correct correlation between Hide Mask and Render Chunks.
-            pOD->m_nSubObjHideMask = m_nInitialSubObjHideMask;
-            pRenderObject->m_ObjFlags |= FOB_MESH_SUBSET_INDICES;
-        }
-    }
-
-    if (pRenderObject->m_pRenderNode)
-    {
-        IRenderNode* pRN = (IRenderNode*)pRenderObject->m_pRenderNode;
-        if (m_bEditor)
-        {
-            if (pRN->m_dwRndFlags & ERF_SELECTED)
-            {
-                m_nSelectedFrameId = passInfo.GetMainFrameID();
-                if (m_pParentObject)
-                {
-                    m_pParentObject->m_nSelectedFrameId = passInfo.GetMainFrameID();
-                }
-                pRenderObject->m_ObjFlags |= FOB_SELECTED;
-            }
-            else
-            {
-                pRenderObject->m_ObjFlags &= ~FOB_SELECTED;
-            }
-
-            if (!gEnv->IsEditing() && pRN->m_dwRndFlags & ERF_RAYCAST_PROXY)
-            {
-                return;
-            }
-        }
-        else
-        {
-            if (pRN->m_dwRndFlags & ERF_RAYCAST_PROXY)
-            {
-                return;
-            }
-        }
-    }
-
-    if ((m_nFlags & STATIC_OBJECT_COMPOUND) && !m_bMerged)
-    {
-        //////////////////////////////////////////////////////////////////////////
-        // Render SubMeshes if present.
-        //////////////////////////////////////////////////////////////////////////
-        if (m_nSubObjectMeshCount > 0)
-        {
-            CRenderObject* pRenderObjectB = NULL;
-
-            if (lodValue.DissolveRefB() != 255)
-            {
-                pRenderObject->m_DissolveRef = lodValue.DissolveRefA();
-
-                if (pRenderObject->m_DissolveRef)
-                {
-                    if (!(pRenderObject->m_ObjFlags & FOB_DISSOLVE))
-                    {
-                        pRenderObject->m_ObjFlags &= ~FOB_UPDATED_RTMASK;
-                    }
-                    pRenderObject->m_ObjFlags |= FOB_DISSOLVE;
-
-                    pRenderObject->m_ObjFlags |= FOB_DISSOLVE_OUT;
-                }
-                else
-                {
-                    if ((pRenderObject->m_ObjFlags & FOB_DISSOLVE))
-                    {
-                        pRenderObject->m_ObjFlags &= ~FOB_UPDATED_RTMASK;
-                    }
-                    pRenderObject->m_ObjFlags &= ~FOB_DISSOLVE;
-                }
-
-                if (lodValue.LodB() != -1)
-                {
-                    pRenderObjectB = GetRenderer()->EF_DuplicateRO(pRenderObject, passInfo);
-                    pRenderObjectB->m_ObjFlags &= ~FOB_DISSOLVE_OUT;
-                }
-            }
-            else
-            {
-                pRenderObject->m_DissolveRef = 0;
-                if ((pRenderObject->m_ObjFlags & FOB_DISSOLVE))
-                {
-                    pRenderObject->m_ObjFlags &= ~FOB_UPDATED_RTMASK;
-                }
-                pRenderObject->m_ObjFlags &= ~(FOB_DISSOLVE | FOB_DISSOLVE_OUT);
-            }
-
-            uint64 nBitIndex = 1;
-            Matrix34A renderTM = pRenderObject->m_II.m_Matrix;
-            for (int32 i = 0, subObjectsSize = m_subObjects.size(); i < subObjectsSize; ++i, nBitIndex <<= 1)
-            {
-                const SSubObject& subObj = m_subObjects[i];
-                if (subObj.nType == STATIC_SUB_OBJECT_MESH)    // all the meshes are at the beginning of the array.
-                {
-                    CStatObj* const __restrict pStatObj = (CStatObj*)subObj.pStatObj;
-
-                    if (pStatObj &&
-                        (pStatObj->m_nRenderTrisCount >= 2) &&
-                        !(pStatObj->m_nFlags & STATIC_OBJECT_HIDDEN) &&
-                        (nBitIndex & nSubObjectHideMask) == 0
-                        )
-                    {
-                        PrefetchLine(pRenderObject, 0);
-                        RenderSubObject(pRenderObject, lodValue.LodA(), i, renderTM, passInfo, rendItemSorter, forceStaticDraw);
-                        if (pRenderObjectB)
-                        {
-                            PrefetchLine(pRenderObjectB, 0);
-                            RenderSubObject(pRenderObjectB, lodValue.LodB(), i, renderTM, passInfo, rendItemSorter, forceStaticDraw);
-                        }
-                    }
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            if (GetCVars()->e_DebugDraw)
-            {
-                RenderDebugInfo(pRenderObject, passInfo);
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-    }
-    else
-    { // draw mesh, don't even try to render childs
-        RenderObjectInternal(pRenderObject, lodValue.LodA(), lodValue.DissolveRefA(), true, passInfo, rendItemSorter, forceStaticDraw);
-        if (lodValue.DissolveRefB() != 255) // check here since we're passing in A's ref.
-        {
-            RenderObjectInternal(pRenderObject, lodValue.LodB(), lodValue.DissolveRefA(), false, passInfo, rendItemSorter, forceStaticDraw);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CStatObj::RenderSubObject(CRenderObject* pRenderObject, int nLod,
-    int nSubObjId, const Matrix34A& renderTM, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw)
-{
-    const SSubObject& subObj = m_subObjects[nSubObjId];
-
-    CStatObj* const __restrict pStatObj = (CStatObj*)subObj.pStatObj;
-
-    if (pStatObj == NULL)
-    {
-        return;
-    }
-
-    if (subObj.bIdentityMatrix)
-    {
-        pStatObj->RenderSubObjectInternal(pRenderObject, nLod, passInfo, rendItemSorter, forceStaticDraw);
-    }
-    else
-    {
-        pRenderObject = GetRenderer()->EF_DuplicateRO(pRenderObject, passInfo);
-        pRenderObject->m_II.m_Matrix = renderTM * subObj.tm;
-        SRenderObjData* pRenderObjectData = pRenderObject->GetObjData();
-        pRenderObjectData->m_uniqueObjectId = pRenderObjectData->m_uniqueObjectId + nSubObjId;
-
-        pStatObj->RenderSubObjectInternal(pRenderObject, nLod, passInfo, rendItemSorter, forceStaticDraw);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CStatObj::RenderSubObjectInternal(CRenderObject* pRenderObject, int nLod, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, [[maybe_unused]] bool forceStaticDraw)
-{
-    assert(!(m_nFlags & STATIC_OBJECT_HIDDEN));
-    assert(m_nRenderTrisCount);
-
-    m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-    if (m_pParentObject && (m_nFlags & STATIC_OBJECT_MULTIPLE_PARENTS))
-    {
-        m_pParentObject->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-    }
-
-    assert(!m_pParentObject || m_pParentObject->m_nLastDrawMainFrameId == passInfo.GetMainFrameID());
-
-    assert(!(m_nFlags & STATIC_OBJECT_COMPOUND));
-    nLod = CLAMP(nLod, GetMinUsableLod(), (int)m_nMaxUsableLod);
-    assert(nLod < MAX_STATOBJ_LODS_NUM);
-
-    // try next lod's if selected one is not ready
-    if ((!nLod && m_pRenderMesh && m_pRenderMesh->CanRender()) || !GetCVars()->e_Lods)
-    {
-        PrefetchLine(pRenderObject, 0);
-        RenderRenderMesh(pRenderObject, NULL, passInfo, rendItemSorter);
-    }
-    else
-    {
-        if (m_pLODs && m_pLODs[nLod])
-        {
-            m_pLODs[nLod]->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-            if (m_pLODs[nLod]->m_pParentObject)
-            {
-                m_pLODs[nLod]->m_pParentObject->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-            }
-
-            if ((nLod + 1) < MAX_STATOBJ_LODS_NUM && m_pLODs[nLod + 1])
-            {
-                m_pLODs[nLod + 1]->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-                if (m_pLODs[nLod + 1]->m_pParentObject)
-                {
-                    m_pLODs[nLod + 1]->m_pParentObject->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-                }
-            }
-        }
-
-        if (m_pLODs)
-        {
-            for (; nLod <= (int)m_nMaxUsableLod; nLod++)
-            {
-                if (m_pLODs[nLod] && m_pLODs[nLod]->m_pRenderMesh && m_pLODs[nLod]->m_pRenderMesh->CanRender())
-                {
-                    PrefetchLine(pRenderObject, 0);
-                    m_pLODs[nLod]->RenderRenderMesh(pRenderObject, NULL, passInfo, rendItemSorter);
-                    break;
-                }
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CStatObj::RenderObjectInternal(CRenderObject* pRenderObject, int nTargetLod, uint8 uLodDissolveRef, bool dissolveOut, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, [[maybe_unused]] bool forceStaticDraw)
-{
-    if (nTargetLod == -1 || uLodDissolveRef == 255)
-    {
-        return;
-    }
-
-    int nLod = CLAMP(nTargetLod, GetMinUsableLod(), (int)m_nMaxUsableLod);
-    assert(nLod < MAX_STATOBJ_LODS_NUM);
-
-    pRenderObject = GetRenderer()->EF_DuplicateRO(pRenderObject, passInfo);
-
-    if (passInfo.IsShadowPass() && passInfo.GetShadowMapType() == SRenderingPassInfo::SHADOW_MAP_CACHED && pRenderObject->m_pRenderNode)
-    {
-        IShadowCaster* pCaster = static_cast<IShadowCaster*>(pRenderObject->m_pRenderNode);
-        pCaster->m_cStaticShadowLod = nLod;
-    }
-
-    pRenderObject->m_DissolveRef = uLodDissolveRef;
-
-    if (pRenderObject->m_DissolveRef)
-    {
-        if (!(pRenderObject->m_ObjFlags & FOB_DISSOLVE))
-        {
-            pRenderObject->m_ObjFlags &= ~FOB_UPDATED_RTMASK;
-        }
-        pRenderObject->m_ObjFlags |= FOB_DISSOLVE;
-
-        if (dissolveOut)
-        {
-            pRenderObject->m_ObjFlags |= FOB_DISSOLVE_OUT;
-        }
-    }
-    else
-    {
-        if ((pRenderObject->m_ObjFlags & FOB_DISSOLVE))
-        {
-            pRenderObject->m_ObjFlags &= ~FOB_UPDATED_RTMASK;
-        }
-        pRenderObject->m_ObjFlags &= ~FOB_DISSOLVE;
-    }
-
-    // try next lod's if selected one is not ready
-    if ((!nLod && m_pRenderMesh && m_pRenderMesh->CanRender()) || !GetCVars()->e_Lods)
-    {
-        PrefetchLine(pRenderObject, 0);
-        RenderRenderMesh(pRenderObject, NULL, passInfo, rendItemSorter);
-    }
-    else
-    {
-        if (m_pLODs && m_pLODs[nLod])
-        {
-            m_pLODs[nLod]->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-            if (m_pLODs[nLod]->m_pParentObject)
-            {
-                m_pLODs[nLod]->m_pParentObject->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-            }
-
-            if ((nLod + 1) < MAX_STATOBJ_LODS_NUM && m_pLODs[nLod + 1])
-            {
-                m_pLODs[nLod + 1]->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-                if (m_pLODs[nLod + 1]->m_pParentObject)
-                {
-                    m_pLODs[nLod + 1]->m_pParentObject->m_nLastDrawMainFrameId = passInfo.GetMainFrameID();
-                }
-            }
-        }
-
-        if (m_pLODs)
-        {
-            for (; nLod <= (int)m_nMaxUsableLod; nLod++)
-            {
-                if (m_pLODs[nLod] && m_pLODs[nLod]->m_pRenderMesh && m_pLODs[nLod]->m_pRenderMesh->CanRender())
-                {
-                    PrefetchLine(pRenderObject, 0);
-                    m_pLODs[nLod]->RenderRenderMesh(pRenderObject, NULL, passInfo, rendItemSorter);
-                    break;
-                }
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CStatObj::RenderRenderMesh(CRenderObject* pRenderObject, [[maybe_unused]] SInstancingInfo* pInstInfo, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-#if !defined(_RELEASE)
-    //DEBUG - filter which stat objs are rendered
-    if (GetCVars()->e_statObjRenderFilterMode && GetCVars()->e_pStatObjRenderFilterStr && GetCVars()->e_pStatObjRenderFilterStr[0])
-    {
-        if (GetCVars()->e_statObjRenderFilterMode == 1)
-        {
-            //only render elems containing str
-            if (!strstr(m_szFileName.c_str(), GetCVars()->e_pStatObjRenderFilterStr))
-            {
-                return;
-            }
-        }
-        else if (GetCVars()->e_statObjRenderFilterMode == 2)
-        {
-            //exclude elems containing str
-            if (strstr(m_szFileName.c_str(), GetCVars()->e_pStatObjRenderFilterStr))
-            {
-                return;
-            }
-        }
-    }
-
-    if (GetCVars()->e_DebugDraw &&  (!GetCVars()->e_DebugDrawShowOnlyCompound || (m_bSubObject || m_pParentObject)))
-    {
-        int nLod = 0;
-        if (m_pLod0 && m_pLod0->GetLods())
-        {
-            for (; nLod < MAX_STATOBJ_LODS_NUM; nLod++)
-            {
-                if (m_pLod0->GetLods()[nLod] == this)
-                {
-                    m_pRenderMesh->SetMeshLod(nLod);
-                    break;
-                }
-            }
-        }
-
-        if (GetCVars()->e_DebugDrawShowOnlyLod >= 0)
-        {
-            if (GetCVars()->e_DebugDrawShowOnlyLod != nLod)
-            {
-                return;
-            }
-        }
-
-        if (RenderDebugInfo(pRenderObject, passInfo))
-        {
-            return;
-        }
-
-        if (m_bSubObject)
-        {
-            pRenderObject = gEnv->pRenderer->EF_DuplicateRO(pRenderObject, passInfo);
-        }
-    }
-
-    if (!passInfo.IsShadowPass())
-    {
-        if (GetCVars()->e_StreamCgfDebug == 1)
-        {
-            RenderStreamingDebugInfo(pRenderObject);
-        }
-
-        if (GetCVars()->e_CoverCgfDebug == 1)
-        {
-            RenderCoverInfo(pRenderObject);
-        }
-    }
-#endif
-
-    if (GetCVars()->e_StatObjTestOBB && !passInfo.IsShadowPass())
-    {
-        Matrix34 worldTM = pRenderObject->GetMatrix();
-
-        OBB obb = OBB::CreateOBBfromAABB(Matrix33(worldTM), AABB(m_vBoxMin, m_vBoxMax));
-
-        if (!passInfo.GetCamera().IsOBBVisible_E(worldTM.GetTranslation(), obb))
-        {
-            return;
-        }
-    }
-    if (m_pRenderMesh)
-    {
-        CRenderObject* pObj = pRenderObject;
-#if !defined(_RELEASE)
-        if (m_isProxyTooBig)
-        {
-            pObj = GetRenderer()->EF_DuplicateRO(pRenderObject, passInfo);
-            pObj->m_pCurrMaterial = m_pMaterial;
-        }
-#endif
-        m_pRenderMesh->Render(pObj, passInfo, rendItemSorter);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-int CStatObj::GetMaxUsableLod() const
-{
-    int maxUsable = m_pLod0 ? max((int)m_nMaxUsableLod, (int)m_pLod0->GetMaxUsableLod()) : (int)m_nMaxUsableLod;
-    return min(maxUsable, GetCVars()->e_LodMax);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-int CStatObj::GetMinUsableLod() const
-{
-    int minUsable = m_pLod0 ? max((int)m_nMinUsableLod0, (int)m_pLod0->GetMinUsableLod()) : (int)m_nMinUsableLod0;
-    return max(minUsable, GetCVars()->e_LodMin);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-int CStatObj::FindNearesLoadedLOD(int nLodIn, bool bSearchUp)
-{
-    // make sure requested lod is loaded
-    /*  if(CStatObj * pObjForStreamIn = nLodIn ? m_pLODs[nLodIn] : this)
-      {
-        bool bRenderNodeValid(rParams.pRenderNode && ((int)(void*)(rParams.pRenderNode)>0) && rParams.pRenderNode->m_fWSMaxViewDist);
-        float fImportance = bRenderNodeValid ? (1.f - (rParams.fDistance / rParams.pRenderNode->m_fWSMaxViewDist)) : 0.5f;
-        pObjForStreamIn->UpdateStreamingPrioriryInternal(fImportance);
-      }*/
-
-    // if requested lod is not ready - find nearest ready one
-    int nLod = nLodIn;
-
-    if (nLod == 0 && !GetRenderMesh())
-    {
-        nLod++;
-    }
-
-    while (nLod && nLod < MAX_STATOBJ_LODS_NUM && (!m_pLODs || !m_pLODs[nLod] || !m_pLODs[nLod]->GetRenderMesh()))
-    {
-        nLod++;
-    }
-
-    if (nLod > (int)m_nMaxUsableLod)
-    {
-        if (bSearchUp)
-        {
-            nLod = min((int)m_nMaxUsableLod, nLodIn);
-
-            while (nLod && (!m_pLODs || !m_pLODs[nLod] || !m_pLODs[nLod]->GetRenderMesh()))
-            {
-                nLod--;
-            }
-
-            if (nLod == 0 && !GetRenderMesh())
-            {
-                nLod--;
-            }
-        }
-        else
-        {
-            nLod = -1;
-        }
-    }
-
-    return nLod;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CStatObj::AddRef()
-{
-    return CryInterlockedIncrement(&m_nUsers);
-}
diff --git a/Code/CryEngine/Cry3DEngine/SurfaceTypeManager.cpp b/Code/CryEngine/Cry3DEngine/SurfaceTypeManager.cpp
deleted file mode 100644
index 0d305d782c..0000000000
--- a/Code/CryEngine/Cry3DEngine/SurfaceTypeManager.cpp
+++ /dev/null
@@ -1,617 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "SurfaceTypeManager.h"
-#include <IMaterialEffects.h>
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-#define BASE_DYNAMIC_SURFACE_ID 100
-#define DEFAULT_MATERIAL_NAME "mat_default"
-
-//////////////////////////////////////////////////////////////////////////
-template <class TMap>
-class CSurfaceTypeEnumerator
-    : public ISurfaceTypeEnumerator
-{
-    std::vector<ISurfaceType*> m_items;
-    typename std::vector<ISurfaceType*>::iterator m_iterator;
-
-public:
-    CSurfaceTypeEnumerator(TMap* pMap)
-    {
-        assert(pMap);
-        m_items.reserve(pMap->size());
-        for (typename TMap::iterator it = pMap->begin(); it != pMap->end(); ++it)
-        {
-            m_items.push_back(it->second->pSurfaceType);
-        }
-        m_iterator = m_items.begin();
-    }
-    virtual void Release() { delete this; };
-    virtual ISurfaceType* GetFirst()
-    {
-        m_iterator = m_items.begin();
-        if (m_iterator == m_items.end())
-        {
-            return 0;
-        }
-        return *m_iterator;
-    }
-    virtual ISurfaceType* GetNext()
-    {
-        if (m_iterator != m_items.end())
-        {
-            m_iterator++;
-        }
-        if (m_iterator == m_items.end())
-        {
-            return 0;
-        }
-        return *m_iterator;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////
-class CMaterialSurfaceType
-    : public ISurfaceType
-{
-public:
-    string m_name;
-    string m_typename;
-    int m_nId;
-    int m_nFlags;
-    SSurfaceTypeAIParams* m_aiParams;
-    SPhysicalParams m_physParams;
-    SBreakable2DParams* m_pBreakable2DParams;
-    std::vector<SBreakageParticles> m_breakageParticles;
-
-    CMaterialSurfaceType(const char* name)
-    {
-        m_name = name;
-        m_nId = -1;
-        m_nFlags = 0;
-        m_aiParams = 0;
-        m_pBreakable2DParams = 0;
-        memset(&m_physParams, 0, sizeof(m_physParams));
-    }
-    ~CMaterialSurfaceType()
-    {
-        delete m_pBreakable2DParams;
-        delete m_aiParams;
-    }
-
-    void Reset()
-    {
-        SAFE_DELETE(m_aiParams);
-        SAFE_DELETE(m_pBreakable2DParams);
-        stl::free_container(m_breakageParticles);
-        stl::free_container(m_typename);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // ISurfaceType interface
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Release() { delete this; }
-    virtual uint16 GetId() const { return m_nId; }
-    virtual const char* GetName() const { return m_name; }
-    virtual const char* GetType() const { return m_typename; };
-    virtual int GetFlags() const { return m_nFlags; };
-    virtual void Execute([[maybe_unused]] SSurfaceTypeExecuteParams& params) {};
-    virtual bool Load(int nId) { m_nId = nId; return true; };
-    virtual int GetBreakability() const { return m_physParams.iBreakability; }
-    virtual int GetHitpoints() const { return (int)m_physParams.hit_points; }
-    virtual float GetBreakEnergy() const { return (float)m_physParams.break_energy; }
-    virtual const SSurfaceTypeAIParams* GetAIParams() { return m_aiParams; };
-    virtual const SPhysicalParams& GetPhyscalParams() { return m_physParams; };
-    virtual SBreakable2DParams* GetBreakable2DParams() { return m_pBreakable2DParams; };
-    virtual SBreakageParticles* GetBreakageParticles(const char* sType, bool bLookInDefault = true);
-    //////////////////////////////////////////////////////////////////////////
-};
-
-CMaterialSurfaceType* g_pDefaultSurfaceType = NULL;
-
-//////////////////////////////////////////////////////////////////////////
-CMaterialSurfaceType::SBreakageParticles* CMaterialSurfaceType::GetBreakageParticles(const char* sType, bool bLookInDefault)
-{
-    for (int i = 0, num = m_breakageParticles.size(); i < num; i++)
-    {
-        if (strcmp(sType, m_breakageParticles[i].type) == 0)
-        {
-            return &m_breakageParticles[i];
-        }
-    }
-    if (bLookInDefault && g_pDefaultSurfaceType)
-    {
-        for (int i = 0, num = g_pDefaultSurfaceType->m_breakageParticles.size(); i < num; i++)
-        {
-            if (strcmp(sType, g_pDefaultSurfaceType->m_breakageParticles[i].type) == 0)
-            {
-                return &g_pDefaultSurfaceType->m_breakageParticles[i];
-            }
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void ReloadSurfaceTypes([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-    CSurfaceTypeManager* pMgr = (CSurfaceTypeManager*)(gEnv->p3DEngine->GetMaterialManager()->GetSurfaceTypeManager());
-    pMgr->LoadSurfaceTypes();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// SurfaceManager implementation.
-//////////////////////////////////////////////////////////////////////////
-CSurfaceTypeManager::CSurfaceTypeManager(ISystem* pSystem)
-{
-    m_pSystem = pSystem;
-    m_lastSurfaceId = BASE_DYNAMIC_SURFACE_ID;
-    memset(m_idToSurface, 0, sizeof(m_idToSurface));
-
-    m_pDefaultSurfaceType = new CMaterialSurfaceType(DEFAULT_MATERIAL_NAME);
-    m_pDefaultSurfaceType->m_nId = 0;
-    RegisterSurfaceType(m_pDefaultSurfaceType, true);
-    g_pDefaultSurfaceType = m_pDefaultSurfaceType;
-
-    REGISTER_COMMAND("e_ReloadSurfaces", &ReloadSurfaceTypes, VF_NULL, "Reload physical properties of all materials");
-}
-
-//////////////////////////////////////////////////////////////////////////
-CSurfaceTypeManager::~CSurfaceTypeManager()
-{
-    g_pDefaultSurfaceType = NULL;
-    RemoveAll();
-    m_pDefaultSurfaceType->Release();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSurfaceTypeManager::RemoveAll()
-{
-    AZStd::unique_lock<AZStd::mutex> lock(m_nameToSurfaceMutex);
-
-    // Release all materials.
-    for (NameToSurfaceMap::iterator it = m_nameToSurface.begin(); it != m_nameToSurface.end(); ++it)
-    {
-        SSurfaceRecord* pRec = it->second;
-        if (pRec->pSurfaceType && pRec->pSurfaceType != m_pDefaultSurfaceType)
-        {
-            pRec->pSurfaceType->Release();
-        }
-        delete pRec;
-    }
-
-    if (m_pDefaultSurfaceType)
-    {
-        m_pDefaultSurfaceType->Reset();
-    }
-
-    stl::free_container(m_nameToSurface);
-    memset(m_idToSurface, 0, sizeof(m_idToSurface));
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISurfaceType* CSurfaceTypeManager::GetSurfaceTypeByName(const char* sName, const char* sWhy, bool warn)
-{
-    if (!sName || *sName == 0 || m_nameToSurface.size() == 1)
-    {
-        // Empty surface type.
-        return m_pDefaultSurfaceType;
-    }
-
-    AZStd::unique_lock<AZStd::mutex> lock(m_nameToSurfaceMutex);
-
-    NameToSurfaceMap::iterator it = m_nameToSurface.find(CONST_TEMP_STRING(sName));
-
-    SSurfaceRecord* pRec = 0;
-
-    if (it != m_nameToSurface.end())
-    {
-        pRec = it->second;
-    }
-
-    if (!pRec || !pRec->pSurfaceType)
-    {
-        if (!sWhy)
-        {
-            sWhy = "";
-        }
-        if (warn)
-        {
-            Warning("'%s' undefined surface type, using mat_default (%s)", sName, sWhy);
-        }
-        return m_pDefaultSurfaceType;
-    }
-
-    if (!pRec->bLoaded)
-    {
-        pRec->pSurfaceType->Load(pRec->pSurfaceType->GetId());
-        pRec->bLoaded = true;
-    }
-    return pRec->pSurfaceType;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISurfaceType* CSurfaceTypeManager::GetSurfaceTypeFast(int nSurfaceId, [[maybe_unused]] const char* sWhy)
-{
-    if (nSurfaceId <= 0 || nSurfaceId >= MAX_SURFACE_ID)
-    {
-        return m_pDefaultSurfaceType;
-    }
-    SSurfaceRecord* pRec = m_idToSurface[nSurfaceId];
-    if (!pRec || !pRec->pSurfaceType)
-    {
-        //Warning( "'%d' undefined surface type id, using mat_default (%s)",nSurfaceId,sWhy );
-        return m_pDefaultSurfaceType;
-    }
-
-    if (!pRec->bLoaded)
-    {
-        pRec->pSurfaceType->Load(pRec->pSurfaceType->GetId());
-        pRec->bLoaded = true;
-    }
-
-    return pRec->pSurfaceType;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISurfaceType* CSurfaceTypeManager::GetSurfaceType(int nSurfaceId, const char* sWhy)
-{
-    return GetSurfaceTypeFast(nSurfaceId, sWhy);
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISurfaceTypeEnumerator* CSurfaceTypeManager::GetEnumerator()
-{
-    return new CSurfaceTypeEnumerator<NameToSurfaceMap>(&m_nameToSurface);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSurfaceTypeManager::RegisterSurfaceType(ISurfaceType* pSurfaceType, bool bDefault)
-{
-    AZStd::unique_lock<AZStd::mutex> lock(m_nameToSurfaceMutex);
-
-    assert(pSurfaceType);
-
-    int nSurfTypeId = pSurfaceType->GetId();
-
-    SSurfaceRecord* pRecord = NULL;
-
-    if (nSurfTypeId >= 0 && nSurfTypeId <= MAX_SURFACE_ID)
-    {
-        pRecord = m_idToSurface[nSurfTypeId];
-        if (pRecord)
-        {
-            return true; // Already registered.
-        }
-    }
-
-    int nId = m_lastSurfaceId;
-    if (nId > MAX_SURFACE_ID)
-    {
-        return false;
-    }
-
-    if (bDefault)
-    {
-        nId = 0;
-        //m_pDefaultSurfaceType = pSurfaceType;
-    }
-    if (!pSurfaceType->Load(nId))
-    {
-        return false;
-    }
-
-    if (!bDefault)
-    {
-        m_lastSurfaceId++;
-    }
-
-    pRecord = new SSurfaceRecord;
-    pRecord->bLoaded = true;
-    pRecord->pSurfaceType = pSurfaceType;
-
-    m_idToSurface[nId] = pRecord;
-    m_nameToSurface[pSurfaceType->GetName()] = pRecord;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSurfaceTypeManager::UnregisterSurfaceType(ISurfaceType* pSurfaceType)
-{
-    AZStd::unique_lock<AZStd::mutex> lock(m_nameToSurfaceMutex);
-
-    assert(pSurfaceType);
-
-    assert(pSurfaceType->GetId() <= MAX_SURFACE_ID);
-
-    SSurfaceRecord* pRecord = m_idToSurface[pSurfaceType->GetId()];
-    if (pRecord)
-    {
-        m_idToSurface[pSurfaceType->GetId()] = 0;
-        m_nameToSurface.erase(pSurfaceType->GetName());
-        delete pRecord;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSurfaceTypeManager::LoadSurfaceTypes()
-{
-    XmlNodeRef root = GetISystem()->LoadXmlFromFile("Libs/MaterialEffects/SurfaceTypes.xml");
-    if (!root)
-    {
-        return;
-    }
-
-    RemoveAll();
-
-    m_lastSurfaceId = BASE_DYNAMIC_SURFACE_ID;
-    RegisterSurfaceType(m_pDefaultSurfaceType, true);
-
-    for (int i = 0, nChilds = root->getChildCount(); i < nChilds; i++)
-    {
-        SLICE_AND_SLEEP();
-
-        XmlNodeRef matNode = root->getChild(i);
-        if (!matNode->isTag("SurfaceType"))
-        {
-            continue;
-        }
-
-        const char* sName = matNode->getAttr("name");
-        NameToSurfaceMap::iterator it = m_nameToSurface.find(CONST_TEMP_STRING(sName));
-        CMaterialSurfaceType* pSurfaceType = 0;
-        if (it != m_nameToSurface.end())
-        {
-            pSurfaceType = (CMaterialSurfaceType*)it->second->pSurfaceType;
-        }
-        if (strcmp(sName, DEFAULT_MATERIAL_NAME) == 0)
-        {
-            pSurfaceType = m_pDefaultSurfaceType;
-        }
-
-        if (!pSurfaceType)
-        {
-            pSurfaceType = new CMaterialSurfaceType(sName);
-            bool bDefault = false;
-            if (!RegisterSurfaceType(pSurfaceType, bDefault))
-            {
-                continue;
-            }
-        }
-
-        int   bManuallyBreakable = 0;
-        bool  bNoCollide = false;
-        bool  vehicle_only_collisions = false;
-        bool  nBreakable2d = 0;
-        bool  can_shatter = false;
-
-        ISurfaceType::SPhysicalParams& physParams = pSurfaceType->m_physParams;
-
-        pSurfaceType->m_typename = matNode->getAttr("type");
-        if (pSurfaceType->m_typename.empty())
-        {
-            // typename will be name with mat_ prefix.
-            pSurfaceType->m_typename = pSurfaceType->m_name;
-            if (pSurfaceType->m_typename.find("mat_") == 0)
-            {
-                pSurfaceType->m_typename = pSurfaceType->m_typename.substr(4);
-            }
-        }
-
-        XmlNodeRef physNode = matNode->findChild("Physics");
-        physParams.friction = 0.7f;
-        physParams.breakable_id = -1;
-        physParams.collType = 1 << 31; // means "use default"
-        physParams.sound_obstruction = 0.0f;
-
-        if (physNode)
-        {
-            physNode->getAttr("friction", physParams.friction);
-            physNode->getAttr("elasticity", physParams.bouncyness);
-            physNode->getAttr("breakable_id", physParams.breakable_id);
-            physNode->getAttr("pierceability", physParams.pierceability = 0);
-            physNode->getAttr("damage_reduction", physParams.damage_reduction = 0);
-            physNode->getAttr("ricochet_angle", physParams.ric_angle = 0);
-            physNode->getAttr("ric_dam_reduction", physParams.ric_dam_reduction = 0);
-            physNode->getAttr("ric_vel_reduction", physParams.ric_vel_reduction = 0);
-            physNode->getAttr("no_collide", bNoCollide = 0);
-            physNode->getAttr("break_energy", physParams.break_energy = 0);
-            physNode->getAttr("hit_points", physParams.hit_points = 0);
-            physNode->getAttr("hit_radius", physParams.hit_radius = 10000.0f);
-            physNode->getAttr("hit_maxdmg", physParams.hit_maxdmg = 1000);
-            physNode->getAttr("hit_lifetime", physParams.hit_lifetime = 10.0f);
-            physNode->getAttr("hole_size", physParams.hole_size);
-            physNode->getAttr("hole_size_explosion", physParams.hole_size_explosion = 0.0f);
-            physNode->getAttr("breakable_2d", nBreakable2d);
-            physNode->getAttr("hit_points_secondary", physParams.hit_points_secondary = nBreakable2d ? 1.0f : physParams.hit_points);
-            physNode->getAttr("vehicle_only_collisions", vehicle_only_collisions);
-            physNode->getAttr("can_shatter", can_shatter);
-            physNode->getAttr("sound_obstruction", physParams.sound_obstruction);
-
-            string collTypeStr = physNode->getAttr("coll_types");
-            if (collTypeStr.length())
-            {
-                physParams.collType = geom_floats;
-                for (const char* ptr = collTypeStr.c_str(); *ptr; )
-                {
-                    for (; *ptr && (unsigned char)(*ptr - '0') > 9u; ptr++)
-                    {
-                        ;
-                    }
-                    const char* ptr0 = ptr;
-                    int num = 0;
-                    for (; (unsigned char)(*ptr - '0') <= 9u; (num *= 10) += *ptr++ - '0')
-                    {
-                        ;
-                    }
-                    if (ptr > ptr0)
-                    {
-                        if (ptr0 > collTypeStr.c_str() && (ptr0[-1] == '-' || ptr0[-1] == '~'))
-                        {
-                            physParams.collType &= ~(1 << num);
-                        }
-                        else
-                        {
-                            physParams.collType |=  1 << num;
-                        }
-                    }
-                }
-                const char* collNames[] = { "default", "all", "player", "vehicle", "explosion", "ray", "float", "water" };
-                const int collVals[] = { geom_colltype0, geom_collides, geom_colltype_player, geom_colltype_vehicle, geom_colltype_explosion, geom_colltype_ray, geom_floats, geom_floats };
-                for (int j = 0; j < sizeof(collVals) / sizeof(collVals[0]); j++)
-                {
-                    if (const char* name = strstr(collTypeStr.c_str(), collNames[j]))
-                    {
-                        if (name > collTypeStr.c_str() && (name[-1] == '-' || name[-1] == '~'))
-                        {
-                            physParams.collType &= ~collVals[j];
-                        }
-                        else
-                        {
-                            physParams.collType |= collVals[j];
-                        }
-                    }
-                }
-            }
-            else
-            {
-                physParams.collType = 1 << 31;
-            }
-
-            //Clamp pierceability
-            physParams.pierceability = max(0, min(15, physParams.pierceability));
-
-            // only assign if the object is not the same, otherwise the compiler
-            // will invoke a memcpy with the same source and destination
-            if (&pSurfaceType->m_physParams != &physParams)
-            {
-                pSurfaceType->m_physParams = physParams;
-            }
-
-            if (physParams.break_energy != 0)
-            {
-                physParams.iBreakability = nBreakable2d ? 1 : 2;
-                bManuallyBreakable = sf_manually_breakable;
-            }
-
-            if (bNoCollide)
-            {
-                pSurfaceType->m_nFlags |= SURFACE_TYPE_NO_COLLIDE;
-            }
-            if (vehicle_only_collisions)
-            {
-                pSurfaceType->m_nFlags |= SURFACE_TYPE_VEHICLE_ONLY_COLLISION;
-            }
-            if (can_shatter)
-            {
-                pSurfaceType->m_nFlags |= SURFACE_TYPE_CAN_SHATTER;
-            }
-
-        }
-
-        XmlNodeRef break2dNode = matNode->findChild("breakable_2d");
-        if (break2dNode)
-        {
-            ISurfaceType::SBreakable2DParams break2dParams;
-            break2dNode->getAttr("blast_radius", break2dParams.blast_radius = 0.2f);
-            if (!break2dNode->getAttr("blast_radius_first", break2dParams.blast_radius_first = 0.2f))
-            {
-                break2dParams.blast_radius_first = break2dParams.blast_radius;
-            }
-            break2dNode->getAttr("vert_size_spread", break2dParams.vert_size_spread = 0.0f);
-            break2dNode->getAttr("rigid_body", break2dParams.rigid_body = 0);
-            break2dNode->getAttr("lifetime", break2dParams.life_time = 4.0f);
-            break2dParams.particle_effect = break2dNode->getAttr("particle_effect");
-
-            break2dNode->getAttr("cell_size", break2dParams.cell_size = 0.1f);
-            break2dNode->getAttr("max_patch_tris", break2dParams.max_patch_tris = 6);
-            break2dNode->getAttr("filter_angle", break2dParams.filter_angle = 0.0f);
-            break2dNode->getAttr("shard_density", break2dParams.shard_density = 1200.0f);
-
-            break2dNode->getAttr("crack_decal_scale", break2dParams.crack_decal_scale = 0.0f);
-            break2dParams.crack_decal_mtl = break2dNode->getAttr("crack_decal_mtl");
-            break2dNode->getAttr("max_fracture", break2dParams.max_fracture = 1.0f);
-            break2dParams.full_fracture_fx = break2dNode->getAttr("full_fracture_fx");
-            break2dNode->getAttr("use_edge_alpha", break2dParams.use_edge_alpha = 0);
-            break2dParams.fracture_fx = break2dNode->getAttr("fracture_fx");
-            break2dNode->getAttr("no_procedural_full_fracture", break2dParams.no_procedural_full_fracture = 0);
-            break2dParams.broken_mtl = break2dNode->getAttr("broken_mtl");
-            if (break2dParams.broken_mtl.length())
-            {
-                gEnv->p3DEngine->GetMaterialManager()->LoadMaterial(break2dParams.broken_mtl, false);
-            }
-            break2dNode->getAttr("destroy_timeout", break2dParams.destroy_timeout = 0);
-            break2dNode->getAttr("destroy_timeout_spread", break2dParams.destroy_timeout_spread = 0);
-
-            SAFE_DELETE(pSurfaceType->m_pBreakable2DParams);
-            pSurfaceType->m_pBreakable2DParams = new ISurfaceType::SBreakable2DParams;
-            *pSurfaceType->m_pBreakable2DParams = break2dParams;
-        }
-
-        {
-            size_t nBreakageParticles = 0;
-            for (int n = 0; n < matNode->getChildCount(); n++)
-            {
-                XmlNodeRef breakageNode = matNode->getChild(n);
-                if (breakageNode->isTag("BreakageParticles"))
-                {
-                    ++nBreakageParticles;
-                }
-            }
-            pSurfaceType->m_breakageParticles.reserve(nBreakageParticles);
-
-            // Load Breakage particles.
-            for (int n = 0; n < matNode->getChildCount(); n++)
-            {
-                XmlNodeRef breakageNode = matNode->getChild(n);
-                if (breakageNode->isTag("BreakageParticles"))
-                {
-                    ISurfaceType::SBreakageParticles params;
-                    breakageNode->getAttr("scale", params.scale);
-                    breakageNode->getAttr("count_scale", params.count_scale);
-                    breakageNode->getAttr("count_per_unit", params.count_per_unit);
-                    params.type = breakageNode->getAttr("type");
-                    params.particle_effect = breakageNode->getAttr("effect");
-
-                    pSurfaceType->m_breakageParticles.push_back(params);
-                }
-            }
-        }
-
-        XmlNodeRef aiNode = matNode->findChild("AI");
-        if (aiNode)
-        {
-            ISurfaceType::SSurfaceTypeAIParams aiParams;
-            aiNode->getAttr("fImpactRadius", aiParams.fImpactRadius);
-            aiNode->getAttr("fImpactSoundRadius", aiParams.fImpactSoundRadius);
-            aiNode->getAttr("fFootStepRadius", aiParams.fFootStepRadius);
-            aiNode->getAttr("proneMult", aiParams.proneMult);
-            aiNode->getAttr("crouchMult", aiParams.crouchMult);
-            aiNode->getAttr("movingMult", aiParams.movingMult);
-
-            SAFE_DELETE(pSurfaceType->m_aiParams);
-            pSurfaceType->m_aiParams = new ISurfaceType::SSurfaceTypeAIParams;
-            *pSurfaceType->m_aiParams = aiParams;
-        }
-    }
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/SurfaceTypeManager.h b/Code/CryEngine/Cry3DEngine/SurfaceTypeManager.h
deleted file mode 100644
index 6981f5e7a6..0000000000
--- a/Code/CryEngine/Cry3DEngine/SurfaceTypeManager.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_SURFACETYPEMANAGER_H
-#define CRYINCLUDE_CRY3DENGINE_SURFACETYPEMANAGER_H
-#pragma once
-
-#include <I3DEngine.h>
-
-#define MAX_SURFACE_ID 255
-
-//////////////////////////////////////////////////////////////////////////
-// SurfaceManager is implementing ISurfaceManager interface.
-// Register and manages all known to game surface typs.
-//////////////////////////////////////////////////////////////////////////
-class CSurfaceTypeManager
-    : public ISurfaceTypeManager
-    , public Cry3DEngineBase
-{
-public:
-    CSurfaceTypeManager(ISystem* pSystem);
-    virtual ~CSurfaceTypeManager();
-
-    virtual void LoadSurfaceTypes();
-
-    virtual ISurfaceType* GetSurfaceTypeByName(const char* sName, const char* sWhy = NULL, bool warn = true);
-    virtual ISurfaceType* GetSurfaceType(int nSurfaceId, const char* sWhy = NULL);
-    virtual ISurfaceTypeEnumerator* GetEnumerator();
-
-    bool RegisterSurfaceType(ISurfaceType* pSurfaceType, bool bDefault = false);
-    void UnregisterSurfaceType(ISurfaceType* pSurfaceType);
-
-    ISurfaceType* GetSurfaceTypeFast(int nSurfaceId, const char* sWhy = NULL);
-
-    void RemoveAll();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_nameToSurface);
-        for (int i = 0; i < MAX_SURFACE_ID + 1; ++i)
-        {
-            pSizer->AddObject(m_idToSurface[i]);
-        }
-    }
-private:
-    ISystem* m_pSystem;
-    int m_lastSurfaceId;
-
-    class CMaterialSurfaceType* m_pDefaultSurfaceType;
-
-    struct SSurfaceRecord
-    {
-        bool bLoaded;
-        ISurfaceType* pSurfaceType;
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(this, sizeof(*this));
-        }
-    };
-
-    SSurfaceRecord* m_idToSurface[MAX_SURFACE_ID + 1];
-
-    AZStd::mutex m_nameToSurfaceMutex;
-    typedef std::map<string, SSurfaceRecord*> NameToSurfaceMap;
-    NameToSurfaceMap m_nameToSurface;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_SURFACETYPEMANAGER_H
diff --git a/Code/CryEngine/Cry3DEngine/Tests/MaterialTests.cpp b/Code/CryEngine/Cry3DEngine/Tests/MaterialTests.cpp
deleted file mode 100644
index 913b52f531..0000000000
--- a/Code/CryEngine/Cry3DEngine/Tests/MaterialTests.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Cry3DEngine_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <Mocks/ISystemMock.h>
-#include <Mocks/IRendererMock.h>
-
-#include "Material.h"
-
-class MaterialTest
-    : public UnitTest::AllocatorsTestFixture
-{
-public:
-    void SetUp() override
-    {
-        // capture prior state.
-        m_priorEnv = gEnv;
-        m_priorSystem = Cry3DEngineBase::m_pSystem;
-        m_priorRenderer = Cry3DEngineBase::m_pRenderer;
-
-        UnitTest::AllocatorsTestFixture::SetUp();
-
-        // LegacyAllocator is a lazily-created allocator, so it will always exist, but we still manually shut it down and
-        // start it up again between tests so we can have consistent behavior.
-        if (!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady())
-        {
-            AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
-        }
-
-        m_data = AZStd::make_unique<DataMembers>();
-
-        m_data->m_stubEnv.pSystem = &m_data->m_system;
-        m_data->m_stubEnv.pRenderer = &m_data->m_renderer;
-
-        // override state
-        gEnv = &m_data->m_stubEnv;
-        Cry3DEngineBase::m_pSystem = gEnv->pSystem;
-        Cry3DEngineBase::m_pRenderer = &m_data->m_renderer;
-    }
-
-    void TearDown() override
-    {
-        m_data.reset();
-
-        AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
-        UnitTest::AllocatorsTestFixture::TearDown();
-
-        // restore state.
-        gEnv = m_priorEnv;
-        Cry3DEngineBase::m_pSystem = m_priorSystem;
-        Cry3DEngineBase::m_pRenderer = m_priorRenderer;
-    }
-
-    struct DataMembers
-    {
-        SSystemGlobalEnvironment m_stubEnv;
-        ::testing::NiceMock<SystemMock> m_system;
-        ::testing::NiceMock<IRendererMock> m_renderer;
-    };
-
-    AZStd::unique_ptr<DataMembers> m_data;
-    SSystemGlobalEnvironment* m_priorEnv = nullptr;
-    ISystem* m_priorSystem = nullptr;
-    IRenderer* m_priorRenderer = nullptr;
-};
-
-TEST_F(MaterialTest, CMatInfo_SetSubMtl_OutOfRange)
-{
-    _smart_ptr<IMaterial> materialGroup = new CMatInfo();
-    _smart_ptr<IMaterial> validSubMaterial = new CMatInfo();
-    _smart_ptr<IMaterial> outOfRangeSubMaterial = new CMatInfo();
-
-    // Make materialGroup into an actual material group
-    materialGroup->SetSubMtlCount(1);
-    materialGroup->SetSubMtl(0, validSubMaterial);
-
-    AZ_TEST_START_TRACE_SUPPRESSION;
-    // SetSubMtl should fail because the index is beyond the range of material's vector of sub-materials
-    materialGroup->SetSubMtl(2, outOfRangeSubMaterial);
-    materialGroup->SetSubMtl(-1, outOfRangeSubMaterial);
-    AZ_TEST_STOP_TRACE_SUPPRESSION(2);
-
-    // Material should still have a 1-size vector of sub-materials, with 'subMaterial' as its only sub-material
-    EXPECT_TRUE(materialGroup->IsMaterialGroup());
-    EXPECT_EQ(materialGroup->GetSubMtlCount(), 1);
-    EXPECT_EQ(materialGroup->GetSubMtl(0), validSubMaterial);
-    EXPECT_EQ(materialGroup->GetSubMtl(1), nullptr);
-}
-
-TEST_F(MaterialTest, CMatInfo_SetSubMtl_InvalidSubMaterial)
-{
-    _smart_ptr<IMaterial> materialGroup = new CMatInfo();
-    _smart_ptr<IMaterial> inValidSubMaterial = new CMatInfo();
-    _smart_ptr<IMaterial> validSubMaterial0 = new CMatInfo();
-    _smart_ptr<IMaterial> validSubMaterial1 = new CMatInfo();
-
-    // Make the two materials into material groups by inserting sub-materials
-    materialGroup->SetSubMtlCount(2);
-    materialGroup->SetSubMtl(0, validSubMaterial0);
-    materialGroup->SetSubMtl(1, validSubMaterial1);
-
-    inValidSubMaterial->SetSubMtlCount(2);
-    inValidSubMaterial->SetSubMtl(0, validSubMaterial0);
-    inValidSubMaterial->SetSubMtl(1, validSubMaterial1);
-
-    // SetSubMtl should fail because subMaterial is a material group, and material groups cannot be sub-materials
-    AZ_TEST_START_TRACE_SUPPRESSION;
-    materialGroup->SetSubMtl(1, inValidSubMaterial);
-    AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-
-    // Check that subMaterial is not the material at index 1, since SetSubMtl should have failed
-    EXPECT_EQ(materialGroup->GetSubMtl(1), validSubMaterial1);
-    EXPECT_NE(materialGroup->GetSubMtl(1), inValidSubMaterial);
-}
-
-TEST_F(MaterialTest, CMatInfo_SetSubMtlCount_SetsMaterialGroupFlag)
-{
-    _smart_ptr<IMaterial> material = new CMatInfo();
-
-    // Check to ensure the material group flag is being set
-    material->SetSubMtlCount(1);
-    EXPECT_TRUE(material->IsMaterialGroup());
-
-    // Check to ensure the material group flag is being un-set
-    material->SetSubMtlCount(0);
-    EXPECT_FALSE(material->IsMaterialGroup());
-}
-
-TEST_F(MaterialTest, CMatInfo_IsDirty_DoesNotCrash)
-{
-    // Create a material group with two sub-materials
-    _smart_ptr<IMaterial> materialGroup = new CMatInfo();
-    materialGroup->SetSubMtlCount(2);
-
-    // Set one sub-material to be null, and the other valid
-    _smart_ptr<IMaterial> subMaterial = new CMatInfo();
-    materialGroup->SetSubMtl(0, nullptr);
-    materialGroup->SetSubMtl(1, subMaterial);
-
-    // Call IsDirty to validate that it does not crash
-    EXPECT_FALSE(materialGroup->IsDirty());
-}
diff --git a/Code/CryEngine/Cry3DEngine/Tests/MockValidationTest.cpp b/Code/CryEngine/Cry3DEngine/Tests/MockValidationTest.cpp
deleted file mode 100644
index 5ba771bc69..0000000000
--- a/Code/CryEngine/Cry3DEngine/Tests/MockValidationTest.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Cry3DEngine_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <Mocks/ISystemMock.h>
-#include <Mocks/ILogMock.h>
-
-TEST(MockValidationTests, SystemMock_Compiles)
-{
-    SystemMock mockSystem;
-}
-
-TEST(MockValidationTests, LogMock_Compiles)
-{
-    LogMock mockLog;
-}
diff --git a/Code/CryEngine/Cry3DEngine/Tests/OctreeTest.cpp b/Code/CryEngine/Cry3DEngine/Tests/OctreeTest.cpp
deleted file mode 100644
index 914605a40d..0000000000
--- a/Code/CryEngine/Cry3DEngine/Tests/OctreeTest.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Cry3DEngine_precompiled.h"
-#include <AzTest/AzTest.h>
-
-#include <AzCore/UnitTest/TestTypes.h>
-#include <Mocks/ISystemMock.h>
-#include <Mocks/I3DEngineMock.h>
-#include "DecalRenderNode.h"
-
-class OctreeTest
-    : public UnitTest::AllocatorsTestFixture
-{
-public:
-    void SetUp() override
-    {
-        // capture prior state.
-        m_savedState.m_Env = gEnv;
-        m_savedState.m_3DEngine = Cry3DEngineBase::m_p3DEngine;
-        m_savedState.m_system = Cry3DEngineBase::m_pSystem;
-        m_savedState.m_cvars = Cry3DEngineBase::m_pCVars;
-
-        UnitTest::AllocatorsTestFixture::SetUp();
-
-        // LegacyAllocator is a lazily-created allocator, so it will always exist, but we still manually shut it down and
-        // start it up again between tests so we can have consistent behavior.
-        if (!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady())
-        {
-            AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
-        }
-
-        m_data = AZStd::make_unique<DataMembers>();
-
-        // override state with our needed test mocks
-        gEnv = &(m_data->m_mockGEnv);
-        m_data->m_mockGEnv.p3DEngine = &(m_data->m_mock3DEngine);
-        m_data->m_mockGEnv.pSystem = &(m_data->m_system);
-        Cry3DEngineBase::m_pSystem = gEnv->pSystem;
-
-        // NOTE:  We've mocked out I3DEngine, but we don't currently have a mock of C3DEngine.
-        // For these unit tests, we need all code paths that we're testing to go through I3DEngine.
-        // We set the engine's C3DEngine pointer to null to guarantee we aren't using it.
-        Cry3DEngineBase::m_p3DEngine = nullptr;
-
-        // Set GetISystem()->GetI3DEngine() to return our mocked I3DEngine.
-        EXPECT_CALL(m_data->m_system, GetI3DEngine()).WillRepeatedly(Return(&(m_data->m_mock3DEngine)));
-
-        // Create a default set of CVars for the Octree to read from.
-        // This needs to happen *after* we've set gEnv, since CVars()
-        // is dependent on it.
-        m_mockCVars = new CVars();
-        Cry3DEngineBase::m_pCVars = m_mockCVars;
-
-        // Create the test Octree
-        const int nSID = 0;
-        m_octree = COctreeNode::Create(nSID, AABB(Vec3(0.0f), Vec3(1024.0f)), nullptr);
-    }
-
-    void TearDown() override
-    {
-        // Remove our test octree and mock cvars
-        delete m_octree;
-        delete m_mockCVars;
-
-        // Remove the other mocked systems
-        m_data.reset();
-
-        AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
-        UnitTest::AllocatorsTestFixture::TearDown();
-
-        // restore the global state that we modified during the test.
-        gEnv = m_savedState.m_Env;
-        Cry3DEngineBase::m_p3DEngine = m_savedState.m_3DEngine;
-        Cry3DEngineBase::m_pSystem = m_savedState.m_system;
-        Cry3DEngineBase::m_pCVars = m_savedState.m_cvars;
-    }
-
-    // Helper functions
-    IRenderNode* CreateAndAddDecalNode(float radius)
-    {
-        AABB nodeBox(radius);
-        IRenderNode* decalEntity = new CDecalRenderNode();
-        decalEntity->SetBBox(nodeBox);
-        m_octree->InsertObject(decalEntity, nodeBox, (radius * radius), nodeBox.GetCenter());
-        return decalEntity;
-    }
-
-    void RemoveNode(IRenderNode* node)
-    {
-        m_octree->DeleteObject(node);
-        delete node;
-    }
-
-protected:
-    struct DataMembers
-    {
-        SSystemGlobalEnvironment m_mockGEnv;
-        ::testing::NiceMock<I3DEngineMock> m_mock3DEngine;
-        ::testing::NiceMock<SystemMock> m_system;
-    };
-
-    AZStd::unique_ptr<DataMembers> m_data;
-
-    CVars* m_mockCVars = nullptr;
-    COctreeNode* m_octree = nullptr;
-
-private:
-    struct SavedState
-    {
-        SSystemGlobalEnvironment* m_Env = nullptr;
-        C3DEngine* m_3DEngine = nullptr;
-        ISystem* m_system = nullptr;
-        CVars* m_cvars = nullptr;
-    };
-
-    SavedState m_savedState;
-};
diff --git a/Code/CryEngine/Cry3DEngine/Tests/Test_Cry3DEngine.cpp b/Code/CryEngine/Cry3DEngine/Tests/Test_Cry3DEngine.cpp
deleted file mode 100644
index 5b8dfbaac7..0000000000
--- a/Code/CryEngine/Cry3DEngine/Tests/Test_Cry3DEngine.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Cry3DEngine_precompiled.h"
-#include <AzTest/AzTest.h>
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
-
-TEST(Cry3DEngineCVarTest, DeclareConstIntCVar_CheckDefault_ReturnsValue_FT)
-{
-    // Set the default value in the initialization
-    struct Foo {
-        DeclareConstIntCVar(test_cvar, 15);
-    } foo;
-    EXPECT_EQ(foo.test_cvar, 15);
-
-    DeclareConstIntCVar(test_cvar2, 15);
-    EXPECT_EQ(test_cvar2, 15);
-}
diff --git a/Code/CryEngine/Cry3DEngine/TimeOfDay.cpp b/Code/CryEngine/Cry3DEngine/TimeOfDay.cpp
deleted file mode 100644
index 067616899a..0000000000
--- a/Code/CryEngine/Cry3DEngine/TimeOfDay.cpp
+++ /dev/null
@@ -1,1251 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include <AzCore/Debug/Trace.h>
-#include "TimeOfDay.h"
-#include "Ocean.h"
-#include "IPostEffectGroup.h"
-#include <ISplines.h>
-#include <IRemoteCommand.h>
-#include "EnvironmentPreset.h"
-#include <Environment/OceanEnvironmentBus.h>
-
-// Maximum number of minutes in a day converted to a float value
-static const float s_maxTime = ((24 * 60) - 1) / 60.0f;
-
-class CBezierSplineFloat
-    : public spline::CBaseSplineInterpolator<float, spline::BezierSpline<float> >
-{
-public:
-    float m_fMinValue;
-    float m_fMaxValue;
-
-    virtual int GetNumDimensions() { return 1; };
-
-    virtual void Interpolate(float time, ValueType& value)
-    {
-        value_type v;
-        if (interpolate(time, v))
-        {
-            ToValueType(v, value);
-        }
-        // Clamp values
-        //value[0] = clamp_tpl(value[0],m_fMinValue,m_fMaxValue);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void SerializeSpline(XmlNodeRef& node, bool bLoading)
-    {
-        if (bLoading)
-        {
-            string keystr = node->getAttr("Keys");
-
-            resize(0);
-            int curPos = 0;
-            uint32 nKeys = 0;
-            string key = keystr.Tokenize(",", curPos);
-            while (!key.empty())
-            {
-                ++nKeys;
-                key = keystr.Tokenize(",", curPos);
-            }
-            reserve_keys(nKeys);
-
-            curPos = 0;
-            key = keystr.Tokenize(",", curPos);
-            while (!key.empty())
-            {
-                float time, v;
-                int flags = 0;
-
-                int res = azsscanf(key, "%g:%g:%d", &time, &v, &flags);
-                if (res != 3)
-                {
-                    res = azsscanf(key, "%g:%g", &time, &v);
-                    if (res != 2)
-                    {
-                        continue;
-                    }
-                }
-                ValueType val;
-                val[0] = v;
-                int keyIndex = InsertKey(time, val);
-                SetKeyFlags(keyIndex, flags);
-                key = keystr.Tokenize(",", curPos);
-            }
-        }
-        else
-        {
-            string keystr;
-            string skey;
-            for (int i = 0; i < num_keys(); i++)
-            {
-                skey.Format("%g:%g:%d,", key(i).time, key(i).value, key(i).flags);
-                keystr += skey;
-            }
-            node->setAttr("Keys", keystr);
-        }
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CBezierSplineVec3
-    : public spline::CBaseSplineInterpolator<Vec3, spline::BezierSpline<Vec3> >
-{
-public:
-    virtual int GetNumDimensions() { return 3; };
-
-    virtual void Interpolate(float time, ValueType& value)
-    {
-        value_type v;
-        if (interpolate(time, v))
-        {
-            ToValueType(v, value);
-        }
-        // Clamp for colors.
-        //value[0] = clamp_tpl(value[0],0.0f,1.0f);
-        //value[1] = clamp_tpl(value[1],0.0f,1.0f);
-        //value[2] = clamp_tpl(value[2],0.0f,1.0f);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void SerializeSpline(XmlNodeRef& node, bool bLoading)
-    {
-        if (bLoading)
-        {
-            string keystr = node->getAttr("Keys");
-
-            resize(0);
-            int curPos = 0;
-            uint32 nKeys = 0;
-            string key = keystr.Tokenize(",", curPos);
-            while (!key.empty())
-            {
-                ++nKeys;
-                key = keystr.Tokenize(",", curPos);
-            }
-            reserve_keys(nKeys);
-
-            curPos = 0;
-            key = keystr.Tokenize(",", curPos);
-            while (!key.empty())
-            {
-                float time, val0, val1, val2;
-                int flags = 0;
-                int res = azsscanf(key, "%g:(%g:%g:%g):%d,", &time, &val0, &val1, &val2, &flags);
-                if (res != 5)
-                {
-                    res = azsscanf(key, "%g:(%g:%g:%g),", &time, &val0, &val1, &val2);
-                    if (res != 4)
-                    {
-                        continue;
-                    }
-                }
-                ValueType val;
-                val[0] = val0;
-                val[1] = val1;
-                val[2] = val2;
-                int keyIndex = InsertKey(time, val);
-                SetKeyFlags(keyIndex, flags);
-                key = keystr.Tokenize(",", curPos);
-            }
-        }
-        else
-        {
-            string keystr;
-            string skey;
-            for (int i = 0; i < num_keys(); i++)
-            {
-                skey.Format("%g:(%g:%g:%g):%d,", key(i).time, key(i).value.x, key(i).value.y, key(i).value.z, key(i).flags);
-                keystr += skey;
-            }
-            node->setAttr("Keys", keystr);
-        }
-    }
-
-    void ClampValues([[maybe_unused]] float fMinValue, [[maybe_unused]] float fMaxValue)
-    {
-        for (int i = 0, nkeys = num_keys(); i < nkeys; i++)
-        {
-            ValueType val;
-            if (GetKeyValue(i, val))
-            {
-                //val[0] = clamp_tpl(val[0],fMinValue,fMaxValue);
-                //val[1] = clamp_tpl(val[1],fMinValue,fMaxValue);
-                //val[2] = clamp_tpl(val[2],fMinValue,fMaxValue);
-                SetKeyValue(i, val);
-            }
-        }
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-CTimeOfDay::CTimeOfDay()
-{
-    m_pTimer = 0;
-    SetTimer(gEnv->pTimer);
-    m_fTime = 12;
-    m_fEditorTime = 12;
-    m_bEditMode = false;
-
-    m_advancedInfo.fAnimSpeed = 0;
-    m_advancedInfo.fStartTime = 0;
-    m_advancedInfo.fEndTime = 24;
-    m_fHDRMultiplier = 1.f;
-    m_pTimeOfDaySpeedCVar = gEnv->pConsole->GetCVar("e_TimeOfDaySpeed");
-    m_pUpdateCallback = 0;
-    m_sunRotationLatitude = 0;
-    m_sunRotationLongitude = 0;
-    m_bPaused = false;
-    m_bSunLinkedToTOD = true;
-    memset(m_vars, 0, sizeof(SVariableInfo) * ITimeOfDay::PARAM_TOTAL);
-
-    // fill local var list so, sandbox can access var list without level being loaded
-
-    // Cryengine supports the notion of environment presets which are set in code that is currently not
-    // in Open 3D Engine. Therefore, create a default preset here that is used as the only one.
-    m_defaultPreset = new CEnvironmentPreset;
-    for (int i = 0; i < PARAM_TOTAL; ++i)
-    {
-        const CTimeOfDayVariable* presetVar = m_defaultPreset->GetVar((ETimeOfDayParamID)i);
-        SVariableInfo& var = m_vars[i];
-
-        var.name = presetVar->GetName();
-        var.displayName = presetVar->GetDisplayName();
-        var.group = presetVar->GetGroupName();
-
-        var.nParamId = i;
-        var.type = presetVar->GetType();
-        var.pInterpolator = NULL;
-
-        Vec3 presetVal = presetVar->GetValue();
-        var.fValue[0] = presetVal.x;
-        const EVariableType varType = presetVar->GetType();
-        if (varType == TYPE_FLOAT)
-        {
-            var.fValue[1] = presetVar->GetMinValue();
-            var.fValue[2] = presetVar->GetMaxValue();
-        }
-        else if (varType == TYPE_COLOR)
-        {
-            var.fValue[1] = presetVal.y;
-            var.fValue[2] = presetVal.z;
-        }
-    }
-
-    m_pCurrentPreset = m_defaultPreset;
-
-    ResetVariables();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTimeOfDay::~CTimeOfDay()
-{
-    for (int i = 0; i < GetVariableCount(); i++)
-    {
-        switch (m_vars[i].type)
-        {
-        case TYPE_FLOAT:
-            delete (CBezierSplineFloat*)(m_vars[i].pInterpolator);
-            break;
-        case TYPE_COLOR:
-            delete (CBezierSplineVec3*)(m_vars[i].pInterpolator);
-            break;
-        }
-    }
-
-    SAFE_DELETE(m_defaultPreset);
-}
-
-void CTimeOfDay::SetTimer(ITimer* pTimer)
-{
-    AZ_Assert(pTimer, "Null pointer access in CTimeOfDay::SetTimer!");
-    m_pTimer = pTimer;
-
-    // Update timer for ocean also - Craig
-    COcean::SetTimer(pTimer);
-}
-
-ITimeOfDay::SVariableInfo& CTimeOfDay::GetVar(ETimeOfDayParamID id)
-{
-    AZ_Assert(id == m_vars[id].nParamId, "Wrong ID in CTimeOfDay::GetVar!");
-    return(m_vars[ id ]);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTimeOfDay::GetVariableInfo(int nIndex, SVariableInfo& varInfo) const
-{
-    if (nIndex < 0 || nIndex >= GetVariableCount())
-    {
-        return false;
-    }
-
-    varInfo = m_vars[nIndex];
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::SetVariableValue(int nIndex, float fValue[3])
-{
-    if (nIndex < 0 || nIndex >= GetVariableCount())
-    {
-        return;
-    }
-
-    m_vars[nIndex].fValue[0] = fValue[0];
-    m_vars[nIndex].fValue[1] = fValue[1];
-    m_vars[nIndex].fValue[2] = fValue[2];
-}
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::ResetVariables()
-{
-    if (!m_pCurrentPreset)
-    {
-        return;
-    }
-
-    m_pCurrentPreset->ResetVariables();
-
-    m_varsMap.clear();
-    for (int i = 0; i < PARAM_TOTAL; ++i)
-    {
-        const CTimeOfDayVariable* presetVar = m_pCurrentPreset->GetVar((ETimeOfDayParamID)i);
-        SVariableInfo& var = m_vars[i];
-
-        var.name = presetVar->GetName();
-        var.displayName = presetVar->GetDisplayName();
-        var.group = presetVar->GetGroupName();
-
-        var.nParamId = i;
-        var.type = presetVar->GetType();
-        SAFE_DELETE(var.pInterpolator);
-
-        Vec3 presetVal = presetVar->GetValue();
-        var.fValue[0] = presetVal.x;
-        const EVariableType varType = presetVar->GetType();
-        if (varType == TYPE_FLOAT)
-        {
-            var.fValue[1] = presetVar->GetMinValue();
-            var.fValue[2] = presetVar->GetMaxValue();
-
-            CBezierSplineFloat* pSpline = new CBezierSplineFloat;
-            pSpline->m_fMinValue = var.fValue[1];
-            pSpline->m_fMaxValue = var.fValue[2];
-            pSpline->reserve_keys(2);
-            pSpline->InsertKeyFloat(0, var.fValue[0]);
-            pSpline->InsertKeyFloat(1, var.fValue[0]);
-            var.pInterpolator = pSpline;
-        }
-        else if (varType == TYPE_COLOR)
-        {
-            var.fValue[1] = presetVal.y;
-            var.fValue[2] = presetVal.z;
-
-            CBezierSplineVec3* pSpline = new CBezierSplineVec3;
-            pSpline->reserve_keys(2);
-            pSpline->InsertKeyFloat3(0, var.fValue);
-            pSpline->InsertKeyFloat3(1, var.fValue);
-            var.pInterpolator = pSpline;
-        }
-
-        m_varsMap[var.name] = var.nParamId;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::SetEnvironmentSettings(const SEnvironmentInfo& envInfo)
-{
-    m_sunRotationLongitude = envInfo.sunRotationLongitude;
-    m_sunRotationLatitude = envInfo.sunRotationLatitude;
-    m_bSunLinkedToTOD = envInfo.bSunLinkedToTOD;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// Time of day is specified in hours.
-void CTimeOfDay::SetTime(float fHour, bool bForceUpdate, bool bEnvUpdate)
-{
-    // set new time
-    m_fTime = fHour;
-
-    // Change time variable.
-    Cry3DEngineBase::GetCVars()->e_TimeOfDay = m_fTime;
-
-    Update(true, bForceUpdate, bEnvUpdate);
-
-    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_TIME_OF_DAY_SET, 0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::SetSunPos(float longitude, float latitude)
-{
-    m_sunRotationLongitude = longitude;
-    m_sunRotationLatitude = latitude;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::Update(bool bInterpolate, bool bForceUpdate, bool bEnvUpdate)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_3DENGINE);
-
-    if (bInterpolate)
-    {
-        if (m_pUpdateCallback)
-        {
-            m_pUpdateCallback->BeginUpdate();
-        }
-
-        // normalized time for interpolation
-        float t = m_fTime / s_maxTime;
-
-        // interpolate all values
-        for (uint32 i = 0; i < static_cast<uint32>(GetVariableCount()); i++)
-        {
-            SVariableInfo& var = m_vars[i];
-            if (var.pInterpolator)
-            {
-                if (var.pInterpolator->GetNumDimensions() == 1)
-                {
-                    var.pInterpolator->InterpolateFloat(t, var.fValue[0]);
-                }
-                else if (var.pInterpolator->GetNumDimensions() == 3)
-                {
-                    var.pInterpolator->InterpolateFloat3(t, var.fValue);
-                }
-
-                if (m_pUpdateCallback)
-                {
-                    const int dim = var.pInterpolator->GetNumDimensions();
-                    float customValues[3] = {0, 0, 0};
-                    float blendWeight = 0;
-                    if (m_pUpdateCallback->GetCustomValue((ETimeOfDayParamID) var.nParamId, dim, customValues, blendWeight))
-                    {
-                        AZ_Assert(blendWeight >= 0 && blendWeight <= 1, "blendweight outside 0 and 1 in CTimeOfDay::Update!");
-                        blendWeight = clamp_tpl(blendWeight, 0.0f, 1.0f);
-                        for (int j = 0; j < dim; ++j)
-                        {
-                            var.fValue[j] = var.fValue[j] + blendWeight * (customValues[j] - var.fValue[j]);
-                        }
-                    }
-                }
-
-                switch (var.type)
-                {
-                case TYPE_FLOAT:
-                {
-                    var.fValue[0] = clamp_tpl(var.fValue[0], var.fValue[1], var.fValue[2]);
-                    if (fabs(var.fValue[0]) < 1e-10f)
-                    {
-                        var.fValue[0] = 0.0f;
-                    }
-                    break;
-                }
-                case TYPE_COLOR:
-                {
-                    var.fValue[0] = clamp_tpl(var.fValue[0], 0.0f, 1.0f);
-                    var.fValue[1] = clamp_tpl(var.fValue[1], 0.0f, 1.0f);
-                    var.fValue[2] = clamp_tpl(var.fValue[2], 0.0f, 1.0f);
-                    break;
-                }
-                default:
-                {
-                    AZ_Error("TimeOfDay", false, "Invalid TimeOfDay object during CTimeOfDay::Update!");
-                }
-                }
-            }
-        }
-
-        if (m_pUpdateCallback)
-        {
-            m_pUpdateCallback->EndUpdate();
-        }
-    }
-
-    // update environment lighting according to new interpolated values
-    if (bEnvUpdate)
-    {
-        UpdateEnvLighting(bForceUpdate);
-    }
-}
-
-
-Vec3 ConvertIlluminanceToLightColor(float illuminance, Vec3 colorRGB)
-{
-    illuminance /= RENDERER_LIGHT_UNIT_SCALE;
-
-    ColorF color(colorRGB);
-    color.adjust_luminance(illuminance);
-
-    // Divide by PI as this is not done in the BRDF at the moment
-    Vec3 finalColor = color.toVec3() / gf_PI;
-
-    return finalColor;
-}
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::UpdateEnvLighting(bool forceUpdate)
-{
-    C3DEngine* p3DEngine((C3DEngine*)gEnv->p3DEngine);
-    IRenderer* pRenderer(gEnv->pRenderer);
-    IPostEffectGroup* postEffectGroup = p3DEngine->GetPostEffectBaseGroup();
-    const float fRecip255 = 1.0f / 255.0f;
-
-    bool bHDRModeEnabled = false;
-    pRenderer->EF_Query(EFQ_HDRModeEnabled, bHDRModeEnabled);
-    if (bHDRModeEnabled)
-    {
-        const Vec3 vEyeAdaptationParams(GetVar(PARAM_HDR_EYEADAPTATION_EV_MIN).fValue[ 0 ],
-            GetVar(PARAM_HDR_EYEADAPTATION_EV_MAX).fValue[ 0 ],
-            GetVar(PARAM_HDR_EYEADAPTATION_EV_AUTO_COMPENSATION).fValue[ 0 ]);
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_EYEADAPTATION_PARAMS, vEyeAdaptationParams);
-
-        const Vec3 vEyeAdaptationParamsLegacy(GetVar(PARAM_HDR_EYEADAPTATION_SCENEKEY).fValue[ 0 ],
-            GetVar(PARAM_HDR_EYEADAPTATION_MIN_EXPOSURE).fValue[ 0 ],
-            GetVar(PARAM_HDR_EYEADAPTATION_MAX_EXPOSURE).fValue[ 0 ]);
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_EYEADAPTATION_PARAMS_LEGACY, vEyeAdaptationParamsLegacy);
-
-        float fHDRShoulderScale(GetVar(PARAM_HDR_FILMCURVE_SHOULDER_SCALE).fValue[ 0 ]);
-        float fHDRMidtonesScale(GetVar(PARAM_HDR_FILMCURVE_LINEAR_SCALE).fValue[ 0 ]);
-        float fHDRToeScale(GetVar(PARAM_HDR_FILMCURVE_TOE_SCALE).fValue[ 0 ]);
-        float fHDRWhitePoint(GetVar(PARAM_HDR_FILMCURVE_WHITEPOINT).fValue[ 0 ]);
-
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_FILMCURVE_SHOULDER_SCALE, Vec3(fHDRShoulderScale, 0, 0));
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_FILMCURVE_LINEAR_SCALE, Vec3(fHDRMidtonesScale, 0, 0));
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_FILMCURVE_TOE_SCALE, Vec3(fHDRToeScale, 0, 0));
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_FILMCURVE_WHITEPOINT, Vec3(fHDRWhitePoint, 0, 0));
-
-        float fHDRBloomAmount(GetVar(PARAM_HDR_BLOOM_AMOUNT).fValue[ 0 ]);
-        postEffectGroup->SetParam("Global_User_HDRBloom", fHDRBloomAmount);
-
-        float fHDRSaturation(GetVar(PARAM_HDR_COLORGRADING_COLOR_SATURATION).fValue[ 0 ]);
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_COLORGRADING_COLOR_SATURATION, Vec3(fHDRSaturation, 0, 0));
-
-        Vec3 vColorBalance(GetVar(PARAM_HDR_COLORGRADING_COLOR_BALANCE).fValue[ 0 ],
-            GetVar(PARAM_HDR_COLORGRADING_COLOR_BALANCE).fValue[ 1 ],
-            GetVar(PARAM_HDR_COLORGRADING_COLOR_BALANCE).fValue[ 2 ]);
-        p3DEngine->SetGlobalParameter(E3DPARAM_HDR_COLORGRADING_COLOR_BALANCE, vColorBalance);
-    }
-
-    pRenderer->SetShadowJittering(GetVar(PARAM_SHADOW_JITTERING).fValue[ 0 ]);
-
-    float sunMultiplier(1.0f);
-    float sunSpecMultiplier(GetVar(PARAM_SUN_SPECULAR_MULTIPLIER).fValue[ 0 ]);
-    float fogMultiplier(GetVar(PARAM_FOG_COLOR_MULTIPLIER).fValue[ 0 ]);
-    float fogMultiplier2(GetVar(PARAM_FOG_COLOR2_MULTIPLIER).fValue[ 0 ]);
-    float fogMultiplierRadial(GetVar(PARAM_FOG_RADIAL_COLOR_MULTIPLIER).fValue[ 0 ]);
-    float nightSkyHorizonMultiplier(GetVar(PARAM_NIGHSKY_HORIZON_COLOR_MULTIPLIER).fValue[ 0 ]);
-    float nightSkyZenithMultiplier(GetVar(PARAM_NIGHSKY_ZENITH_COLOR_MULTIPLIER).fValue[ 0 ]);
-    float nightSkyMoonMultiplier(GetVar(PARAM_NIGHSKY_MOON_COLOR_MULTIPLIER).fValue[ 0 ]);
-    float nightSkyMoonInnerCoronaMultiplier(GetVar(PARAM_NIGHSKY_MOON_INNERCORONA_COLOR_MULTIPLIER).fValue[ 0 ]);
-    float nightSkyMoonOuterCoronaMultiplier(GetVar(PARAM_NIGHSKY_MOON_OUTERCORONA_COLOR_MULTIPLIER).fValue[ 0 ]);
-
-    // set sun position
-    Vec3 sunPos;
-
-
-    if (m_bSunLinkedToTOD)
-    {
-        float timeAng(((m_fTime + 12.0f) / s_maxTime) * gf_PI * 2.0f);
-        float sunRot = gf_PI * (-m_sunRotationLatitude) / 180.0f;
-        float longitude = 0.5f * gf_PI - gf_PI * m_sunRotationLongitude / 180.0f;
-
-        Matrix33 a, b, c, m;
-
-        a.SetRotationZ(timeAng);
-        b.SetRotationX(longitude);
-        c.SetRotationY(sunRot);
-
-        m = a * b * c;
-        sunPos = Vec3(0, 1, 0) * m;
-
-        float h = sunPos.z;
-        sunPos.z = sunPos.y;
-        sunPos.y = -h;
-    }
-    else // when not linked, it behaves like the moon
-    {
-        float sunLati(-gf_PI + gf_PI* m_sunRotationLatitude / 180.0f);
-        float sunLong(0.5f * gf_PI - gf_PI* m_sunRotationLongitude / 180.0f);
-
-        float sinLon(sinf(sunLong));
-        float cosLon(cosf(sunLong));
-        float sinLat(sinf(sunLati));
-        float cosLat(cosf(sunLati));
-
-        sunPos = Vec3(sinLon * cosLat, sinLon * sinLat, cosLon);
-    }
-
-
-    Vec3 sunPosOrig = sunPos;
-
-    // transition phase for sun/moon lighting
-    AZ_Assert(p3DEngine->m_dawnStart <= p3DEngine->m_dawnEnd, "Invalid sun/moon transition parameters in CTimeOfDay::UpdateEnvLighting!");
-    AZ_Assert(p3DEngine->m_duskStart <= p3DEngine->m_duskEnd, "Invalid sun/moon transition parameters in CTimeOfDay::UpdateEnvLighting!");
-    AZ_Assert(p3DEngine->m_dawnEnd <= p3DEngine->m_duskStart, "Invalid sun/moon transition parameters in CTimeOfDay::UpdateEnvLighting!");
-    float sunIntensityMultiplier(1.0f);
-
-    // The ratio between night and day for adjusting luminance.   Day = 1, Night = 0, transitions = [0..1]
-    float dayNightIndicator(1.0);   
-    // The ratio [0..1] relative to high noon which represents maximum luminance.
-    float midDayIndicator(1.0);
-
-    if (m_fTime < p3DEngine->m_dawnStart || m_fTime >= p3DEngine->m_duskEnd)
-    {   // Night time
-        p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_DIRECTION, sunPos);
-        sunIntensityMultiplier = 0.0f;
-        midDayIndicator = 0.0f;
-        dayNightIndicator = 0.0f;
-    }
-    else
-    {   // Dawn, day and dusk time
-
-        // Calculating the energy multiplier where mid-day sun is 1.0 and night is 0
-        const float noonTime = 12.0f;
-
-        if (m_fTime <= noonTime)
-        {
-            float   dawnToNoon = noonTime - p3DEngine->m_dawnStart;
-            midDayIndicator = (m_fTime - p3DEngine->m_dawnStart) / dawnToNoon;
-        }
-        else
-        {
-            float   noonToDusk = p3DEngine->m_duskEnd - noonTime;
-            midDayIndicator = (m_fTime - noonTime) / noonToDusk;
-        }
-        midDayIndicator = cos( 0.5f * midDayIndicator * 3.14159265f );     // Converting to the cosine to represent energy distribution
-
-        // Calculation of sun intensity and day-to-night indicator
-        if (m_fTime < p3DEngine->m_dawnEnd)
-        {
-            // dawn
-            AZ_Assert(p3DEngine->m_dawnStart < p3DEngine->m_dawnEnd, "Invalid sun/moon transition parameters in CTimeOfDay::UpdateEnvLighting!");
-            float b(0.5f * (p3DEngine->m_dawnStart + p3DEngine->m_dawnEnd));
-            if (m_fTime < b)
-            {
-                // fade out moon
-                sunMultiplier *= (b - m_fTime) / (b - p3DEngine->m_dawnStart);
-                sunIntensityMultiplier = 0.0f;
-                p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_DIRECTION, sunPos);
-            }
-            else
-            {
-                // fade in sun
-                float t((m_fTime - b) / (p3DEngine->m_dawnEnd - b));
-                sunMultiplier *= t;
-                sunIntensityMultiplier = t;
-            }
-            dayNightIndicator = (m_fTime - p3DEngine->m_dawnStart) / (p3DEngine->m_dawnEnd - p3DEngine->m_dawnStart);
-        }
-        else if (m_fTime < p3DEngine->m_duskStart)
-        {
-            // day
-            dayNightIndicator = 1.0;
-        }
-        else if (m_fTime < p3DEngine->m_duskEnd)
-        {
-            // dusk
-            AZ_Assert(p3DEngine->m_duskStart < p3DEngine->m_duskEnd, "Invalid sun/moon transition parameters in CTimeOfDay::UpdateEnvLighting!");
-            float b(0.5f * (p3DEngine->m_duskStart + p3DEngine->m_duskEnd));
-            if (m_fTime < b)
-            {
-                // fade out sun
-                float t((b - m_fTime) / (b - p3DEngine->m_duskStart));
-                sunMultiplier *= t;
-                sunIntensityMultiplier = t;
-            }
-            else
-            {
-                // fade in moon
-                sunMultiplier *= (m_fTime - b) / (p3DEngine->m_duskEnd - b);
-                sunIntensityMultiplier = 0.0;
-                p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_DIRECTION, sunPos);
-            }
-
-            dayNightIndicator = (p3DEngine->m_duskEnd - m_fTime) / (p3DEngine->m_duskEnd - p3DEngine->m_duskStart);
-        }
-    }
-
-    sunIntensityMultiplier = max(GetVar(PARAM_SKYLIGHT_SUN_INTENSITY_MULTIPLIER).fValue[0], 0.0f);
-    p3DEngine->SetGlobalParameter(E3DPARAM_DAY_NIGHT_INDICATOR, Vec3(dayNightIndicator, midDayIndicator, 0));
-
-    p3DEngine->SetSunDir(sunPos);
-
-    // set sun, sky, and fog color
-    Vec3 sunColor(Vec3(GetVar(PARAM_SUN_COLOR).fValue[ 0 ],
-            GetVar(PARAM_SUN_COLOR).fValue[ 1 ], GetVar(PARAM_SUN_COLOR).fValue[ 2 ]));
-    float sunIntensityLux(GetVar(PARAM_SUN_INTENSITY).fValue[ 0 ] * sunMultiplier);
-    p3DEngine->SetSunColor(ConvertIlluminanceToLightColor(sunIntensityLux, sunColor));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_SUN_SPECULAR_MULTIPLIER, Vec3(sunSpecMultiplier, 0, 0));
-
-    Vec3 fogColor(fogMultiplier* Vec3(GetVar(PARAM_FOG_COLOR).fValue[ 0 ],
-            GetVar(PARAM_FOG_COLOR).fValue[ 1 ], GetVar(PARAM_FOG_COLOR).fValue[ 2 ]));
-    p3DEngine->SetFogColor(fogColor);
-
-    const Vec3 fogColor2 = fogMultiplier2 * Vec3(GetVar(PARAM_FOG_COLOR2).fValue[0], GetVar(PARAM_FOG_COLOR2).fValue[1], GetVar(PARAM_FOG_COLOR2).fValue[2]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_FOG_COLOR2, fogColor2);
-
-    const Vec3 fogColorRadial = fogMultiplierRadial * Vec3(GetVar(PARAM_FOG_RADIAL_COLOR).fValue[0], GetVar(PARAM_FOG_RADIAL_COLOR).fValue[1], GetVar(PARAM_FOG_RADIAL_COLOR).fValue[2]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_FOG_RADIAL_COLOR, fogColorRadial);
-
-    const Vec3 volFogHeightDensity = Vec3(GetVar(PARAM_VOLFOG_HEIGHT).fValue[0], GetVar(PARAM_VOLFOG_DENSITY).fValue[0], 0);
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG_HEIGHT_DENSITY, volFogHeightDensity);
-
-    const Vec3 volFogHeightDensity2 = Vec3(GetVar(PARAM_VOLFOG_HEIGHT2).fValue[0], GetVar(PARAM_VOLFOG_DENSITY2).fValue[0], 0);
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG_HEIGHT_DENSITY2, volFogHeightDensity2);
-
-    const Vec3 volFogGradientCtrl = Vec3(GetVar(PARAM_VOLFOG_HEIGHT_OFFSET).fValue[0], GetVar(PARAM_VOLFOG_RADIAL_SIZE).fValue[0], GetVar(PARAM_VOLFOG_RADIAL_LOBE).fValue[0]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG_GRADIENT_CTRL, volFogGradientCtrl);
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG_GLOBAL_DENSITY, Vec3(GetVar(PARAM_VOLFOG_GLOBAL_DENSITY).fValue[0], 0, GetVar(PARAM_VOLFOG_FINAL_DENSITY_CLAMP).fValue[0]));
-
-    // set volumetric fog ramp
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG_RAMP, Vec3(GetVar(PARAM_VOLFOG_RAMP_START).fValue[0], GetVar(PARAM_VOLFOG_RAMP_END).fValue[0], GetVar(PARAM_VOLFOG_RAMP_INFLUENCE).fValue[0]));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_RANGE, Vec3(GetVar(PARAM_VOLFOG_SHADOW_RANGE).fValue[0], 0, 0));
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_DARKENING, Vec3(GetVar(PARAM_VOLFOG_SHADOW_DARKENING).fValue[0], GetVar(PARAM_VOLFOG_SHADOW_DARKENING_SUN).fValue[0], GetVar(PARAM_VOLFOG_SHADOW_DARKENING_AMBIENT).fValue[0]));
-
-    // set HDR sky lighting properties
-    Vec3 sunIntensity(sunIntensityMultiplier* Vec3(GetVar(PARAM_SKYLIGHT_SUN_INTENSITY).fValue[ 0 ],
-            GetVar(PARAM_SKYLIGHT_SUN_INTENSITY).fValue[ 1 ], GetVar(PARAM_SKYLIGHT_SUN_INTENSITY).fValue[ 2 ]));
-
-    Vec3 rgbWaveLengths(GetVar(PARAM_SKYLIGHT_WAVELENGTH_R).fValue[ 0 ],
-        GetVar(PARAM_SKYLIGHT_WAVELENGTH_G).fValue[ 0 ], GetVar(PARAM_SKYLIGHT_WAVELENGTH_B).fValue[ 0 ]);
-
-    p3DEngine->SetSkyLightParameters(sunPosOrig, sunIntensity, GetVar(PARAM_SKYLIGHT_KM).fValue[ 0 ],
-        GetVar(PARAM_SKYLIGHT_KR).fValue[ 0 ], GetVar(PARAM_SKYLIGHT_G).fValue[ 0 ], rgbWaveLengths, forceUpdate);
-
-    // set night sky color properties
-    Vec3 nightSkyHorizonColor(nightSkyHorizonMultiplier* Vec3(GetVar(PARAM_NIGHSKY_HORIZON_COLOR).fValue[ 0 ],
-            GetVar(PARAM_NIGHSKY_HORIZON_COLOR).fValue[ 1 ], GetVar(PARAM_NIGHSKY_HORIZON_COLOR).fValue[ 2 ]));
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_HORIZON_COLOR, nightSkyHorizonColor);
-
-    Vec3 nightSkyZenithColor(nightSkyZenithMultiplier* Vec3(GetVar(PARAM_NIGHSKY_ZENITH_COLOR).fValue[ 0 ],
-            GetVar(PARAM_NIGHSKY_ZENITH_COLOR).fValue[ 1 ], GetVar(PARAM_NIGHSKY_ZENITH_COLOR).fValue[ 2 ]));
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_ZENITH_COLOR, nightSkyZenithColor);
-
-    float nightSkyZenithColorShift(GetVar(PARAM_NIGHSKY_ZENITH_SHIFT).fValue[ 0 ]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_ZENITH_SHIFT, Vec3(nightSkyZenithColorShift, 0, 0));
-
-    float nightSkyStarIntensity(GetVar(PARAM_NIGHSKY_START_INTENSITY).fValue[ 0 ]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_STAR_INTENSITY, Vec3(nightSkyStarIntensity, 0, 0));
-
-    Vec3 nightSkyMoonColor(nightSkyMoonMultiplier* Vec3(GetVar(PARAM_NIGHSKY_MOON_COLOR).fValue[ 0 ],
-            GetVar(PARAM_NIGHSKY_MOON_COLOR).fValue[ 1 ], GetVar(PARAM_NIGHSKY_MOON_COLOR).fValue[ 2 ]));
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_MOON_COLOR, nightSkyMoonColor);
-
-    Vec3 nightSkyMoonInnerCoronaColor(nightSkyMoonInnerCoronaMultiplier* Vec3(GetVar(PARAM_NIGHSKY_MOON_INNERCORONA_COLOR).fValue[ 0 ],
-            GetVar(PARAM_NIGHSKY_MOON_INNERCORONA_COLOR).fValue[ 1 ], GetVar(PARAM_NIGHSKY_MOON_INNERCORONA_COLOR).fValue[ 2 ]));
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_MOON_INNERCORONA_COLOR, nightSkyMoonInnerCoronaColor);
-
-    float nightSkyMoonInnerCoronaScale(GetVar(PARAM_NIGHSKY_MOON_INNERCORONA_SCALE).fValue[ 0 ]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_MOON_INNERCORONA_SCALE, Vec3(nightSkyMoonInnerCoronaScale, 0, 0));
-
-    Vec3 nightSkyMoonOuterCoronaColor(nightSkyMoonOuterCoronaMultiplier* Vec3(GetVar(PARAM_NIGHSKY_MOON_OUTERCORONA_COLOR).fValue[ 0 ],
-            GetVar(PARAM_NIGHSKY_MOON_OUTERCORONA_COLOR).fValue[ 1 ], GetVar(PARAM_NIGHSKY_MOON_OUTERCORONA_COLOR).fValue[ 2 ]));
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_MOON_OUTERCORONA_COLOR, nightSkyMoonOuterCoronaColor);
-
-    float nightSkyMoonOuterCoronaScale(GetVar(PARAM_NIGHSKY_MOON_OUTERCORONA_SCALE).fValue[ 0 ]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_NIGHSKY_MOON_OUTERCORONA_SCALE, Vec3(nightSkyMoonOuterCoronaScale, 0, 0));
-
-    // set sun shafts visibility and activate if required
-
-    float fSunShaftsVis = GetVar(PARAM_SUN_SHAFTS_VISIBILITY).fValue[ 0 ];
-    fSunShaftsVis = clamp_tpl<float>(fSunShaftsVis, 0.0f, 0.3f);
-    float fSunRaysVis = GetVar(PARAM_SUN_RAYS_VISIBILITY).fValue[ 0 ];
-    float fSunRaysAtten = GetVar(PARAM_SUN_RAYS_ATTENUATION).fValue[ 0 ];
-    float fSunRaySunColInfluence = GetVar(PARAM_SUN_RAYS_SUNCOLORINFLUENCE).fValue[ 0 ];
-
-    float* pSunRaysCustomColorVar = GetVar(PARAM_SUN_RAYS_CUSTOMCOLOR).fValue;
-    Vec4 pSunRaysCustomColor = Vec4(pSunRaysCustomColorVar[0], pSunRaysCustomColorVar[1], pSunRaysCustomColorVar[2], 1.0f);
-
-    postEffectGroup->SetParam("SunShafts_Active", (fSunShaftsVis > 0.05f || fSunRaysVis > 0.05f) ? 1.f : 0.f);
-    postEffectGroup->SetParam("SunShafts_Amount", fSunShaftsVis);
-    postEffectGroup->SetParam("SunShafts_RaysAmount", fSunRaysVis);
-    postEffectGroup->SetParam("SunShafts_RaysAttenuation", fSunRaysAtten);
-    postEffectGroup->SetParam("SunShafts_RaysSunColInfluence", fSunRaySunColInfluence);
-    postEffectGroup->SetParam("SunShafts_RaysCustomColor", pSunRaysCustomColor);
-
-    {
-        const Vec3 cloudShadingMultipliers = Vec3(GetVar(PARAM_CLOUDSHADING_SUNLIGHT_MULTIPLIER).fValue[0], 0, 0);
-        p3DEngine->SetGlobalParameter(E3DPARAM_CLOUDSHADING_MULTIPLIERS, cloudShadingMultipliers);
-
-        const float cloudShadingCustomSunColorMult = GetVar(PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR_MULTIPLIER).fValue[0];
-        const Vec3 cloudShadingCustomSunColor = cloudShadingCustomSunColorMult * Vec3(GetVar(PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR).fValue[0], GetVar(PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR).fValue[1], GetVar(PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR).fValue[2]);
-        const float cloudShadingCustomSunColorInfluence = GetVar(PARAM_CLOUDSHADING_SUNLIGHT_CUSTOM_COLOR_INFLUENCE).fValue[0];
-
-        IObjManager* pObjMan = p3DEngine->GetObjectManager();
-        const Vec3 cloudShadingSunColor = pObjMan ? cloudShadingMultipliers.x* pObjMan->GetSunColor() : Vec3(0, 0, 0);
-
-        p3DEngine->SetGlobalParameter(E3DPARAM_CLOUDSHADING_SUNCOLOR, cloudShadingSunColor + (cloudShadingCustomSunColor - cloudShadingSunColor) * cloudShadingCustomSunColorInfluence);
-    }
-
-    bool bHasOceanFeature = false;
-    AZ::OceanFeatureToggleBus::BroadcastResult(bHasOceanFeature, &AZ::OceanFeatureToggleBus::Events::OceanComponentEnabled);
-    if (!bHasOceanFeature)
-    {
-        // set ocean fog color multiplier
-        const float oceanFogColorMultiplier = GetVar(PARAM_OCEANFOG_COLOR_MULTIPLIER).fValue[0];
-        const Vec3 oceanFogColor = Vec3(GetVar(PARAM_OCEANFOG_COLOR).fValue[0], GetVar(PARAM_OCEANFOG_COLOR).fValue[1], GetVar(PARAM_OCEANFOG_COLOR).fValue[2]);
-        p3DEngine->SetGlobalParameter(E3DPARAM_OCEANFOG_COLOR, oceanFogColor * oceanFogColorMultiplier);
-
-        // legacy style: set ocean color density
-        const float oceanFogColorDensity = GetVar(PARAM_OCEANFOG_DENSITY).fValue[0];
-        p3DEngine->SetGlobalParameter(E3DPARAM_OCEANFOG_DENSITY, Vec3(oceanFogColorDensity, 0, 0));
-    }
-
-    // set skybox multiplier
-    float skyBoxMultiplier(GetVar(PARAM_SKYBOX_MULTIPLIER).fValue[ 0 ] * m_fHDRMultiplier);
-    p3DEngine->SetGlobalParameter(E3DPARAM_SKYBOX_MULTIPLIER, Vec3(skyBoxMultiplier, 0, 0));
-
-    // Set color grading stuff
-    float fValue = GetVar(PARAM_COLORGRADING_FILTERS_GRAIN).fValue[ 0 ];
-    p3DEngine->SetGlobalParameter(E3DPARAM_COLORGRADING_FILTERS_GRAIN, Vec3(fValue, 0, 0));
-
-    Vec4 pColor = Vec4(GetVar(PARAM_COLORGRADING_FILTERS_PHOTOFILTER_COLOR).fValue[ 0 ],
-            GetVar(PARAM_COLORGRADING_FILTERS_PHOTOFILTER_COLOR).fValue[ 1 ],
-            GetVar(PARAM_COLORGRADING_FILTERS_PHOTOFILTER_COLOR).fValue[ 2 ], 1.0f);
-    p3DEngine->SetGlobalParameter(E3DPARAM_COLORGRADING_FILTERS_PHOTOFILTER_COLOR, Vec3(pColor.x, pColor.y, pColor.z));
-    fValue = GetVar(PARAM_COLORGRADING_FILTERS_PHOTOFILTER_DENSITY).fValue[ 0 ];
-    p3DEngine->SetGlobalParameter(E3DPARAM_COLORGRADING_FILTERS_PHOTOFILTER_DENSITY, Vec3(fValue, 0, 0));
-
-    fValue = GetVar(PARAM_COLORGRADING_DOF_FOCUSRANGE).fValue[ 0 ];
-    postEffectGroup->SetParam("Dof_Tod_FocusRange", fValue);
-
-    fValue = GetVar(PARAM_COLORGRADING_DOF_BLURAMOUNT).fValue[ 0 ];
-    postEffectGroup->SetParam("Dof_Tod_BlurAmount", fValue);
-
-    const float arrDepthConstBias[MAX_SHADOW_CASCADES_NUM] =
-    {
-        GetVar(PARAM_SHADOWSC0_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC1_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC2_BIAS).fValue[ 0 ],  GetVar(PARAM_SHADOWSC3_BIAS).fValue[ 0 ],
-        GetVar(PARAM_SHADOWSC4_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC5_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC6_BIAS).fValue[ 0 ],  GetVar(PARAM_SHADOWSC7_BIAS).fValue[ 0 ],
-        2.0f, 2.0f, 2.0f, 2.0f,
-        2.0f, 2.0f, 2.0f, 2.0f,
-        2.0f, 2.0f, 2.0f, 2.0f
-    };
-
-    const float arrDepthSlopeBias[MAX_SHADOW_CASCADES_NUM] =
-    {
-        GetVar(PARAM_SHADOWSC0_SLOPE_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC1_SLOPE_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC2_SLOPE_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC3_SLOPE_BIAS).fValue[ 0 ],
-        GetVar(PARAM_SHADOWSC4_SLOPE_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC5_SLOPE_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC6_SLOPE_BIAS).fValue[ 0 ], GetVar(PARAM_SHADOWSC7_SLOPE_BIAS).fValue[ 0 ],
-        0.5f, 0.5f, 0.5f, 0.5f,
-        0.5f, 0.5f, 0.5f, 0.5f,
-        0.5f, 0.5f, 0.5f, 0.5f
-    };
-
-    p3DEngine->SetShadowsCascadesBias(arrDepthConstBias, arrDepthSlopeBias);
-
-    if (gEnv->IsEditing())
-    {
-        p3DEngine->SetRecomputeCachedShadows();
-    }
-
-    // set volumetric fog 2 params
-    const Vec3 volFogCtrlParams = Vec3(GetVar(PARAM_VOLFOG2_RANGE).fValue[0], GetVar(PARAM_VOLFOG2_BLEND_FACTOR).fValue[0], GetVar(PARAM_VOLFOG2_BLEND_MODE).fValue[0]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volFogCtrlParams);
-
-    const Vec3 volFogScatteringParams = Vec3(GetVar(PARAM_VOLFOG2_INSCATTER).fValue[0], GetVar(PARAM_VOLFOG2_EXTINCTION).fValue[0], GetVar(PARAM_VOLFOG2_ANISOTROPIC).fValue[0]);
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_SCATTERING_PARAMS, volFogScatteringParams);
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_RAMP, Vec3(GetVar(PARAM_VOLFOG2_RAMP_START).fValue[0], GetVar(PARAM_VOLFOG2_RAMP_END).fValue[0], 0.0f));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_COLOR, Vec3(GetVar(PARAM_VOLFOG2_COLOR).fValue[0], GetVar(PARAM_VOLFOG2_COLOR).fValue[1], GetVar(PARAM_VOLFOG2_COLOR).fValue[2]));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_GLOBAL_DENSITY, Vec3(GetVar(PARAM_VOLFOG2_GLOBAL_DENSITY).fValue[0], GetVar(PARAM_VOLFOG2_FINAL_DENSITY_CLAMP).fValue[0], GetVar(PARAM_VOLFOG2_GLOBAL_FOG_VISIBILITY).fValue[0]));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_HEIGHT_DENSITY, Vec3(GetVar(PARAM_VOLFOG2_HEIGHT).fValue[0], GetVar(PARAM_VOLFOG2_DENSITY).fValue[0], GetVar(PARAM_VOLFOG2_ANISOTROPIC1).fValue[0]));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_HEIGHT_DENSITY2, Vec3(GetVar(PARAM_VOLFOG2_HEIGHT2).fValue[0], GetVar(PARAM_VOLFOG2_DENSITY2).fValue[0], GetVar(PARAM_VOLFOG2_ANISOTROPIC2).fValue[0]));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_COLOR1, Vec3(GetVar(PARAM_VOLFOG2_COLOR1).fValue[0], GetVar(PARAM_VOLFOG2_COLOR1).fValue[1], GetVar(PARAM_VOLFOG2_COLOR1).fValue[2]));
-
-    p3DEngine->SetGlobalParameter(E3DPARAM_VOLFOG2_COLOR2, Vec3(GetVar(PARAM_VOLFOG2_COLOR2).fValue[0], GetVar(PARAM_VOLFOG2_COLOR2).fValue[1], GetVar(PARAM_VOLFOG2_COLOR2).fValue[2]));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::SetAdvancedInfo(const SAdvancedInfo& advInfo)
-{
-    m_advancedInfo = advInfo;
-    if (m_pTimeOfDaySpeedCVar->GetFVal() != m_advancedInfo.fAnimSpeed)
-    {
-        m_pTimeOfDaySpeedCVar->Set(m_advancedInfo.fAnimSpeed);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::GetAdvancedInfo(SAdvancedInfo& advInfo)
-{
-    advInfo = m_advancedInfo;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::MigrateLegacyData(bool bSunIntensity, const XmlNodeRef& node)
-{
-    if (bSunIntensity)  // Convert sun intensity as specified up to CE 3.8.2 to illuminance
-    {
-        SVariableInfo& varSunIntensity = GetVar(PARAM_SUN_INTENSITY);
-        SVariableInfo& varSunMult = GetVar(PARAM_SUN_COLOR_MULTIPLIER);
-        SVariableInfo& varSunColor = GetVar(PARAM_SUN_COLOR);
-        SVariableInfo& varHDRPower = GetVar(PARAM_HDR_DYNAMIC_POWER_FACTOR);
-
-        int numKeys = varSunMult.pInterpolator->GetKeyCount();
-        for (int key = 0; key < numKeys; ++key)
-        {
-            float time = varSunMult.pInterpolator->GetKeyTime(key);
-
-            float sunMult, sunColor[3], hdrPower;
-            varSunMult.pInterpolator->GetKeyValueFloat(key, sunMult);
-            varSunColor.pInterpolator->InterpolateFloat3(time, sunColor);
-            varHDRPower.pInterpolator->InterpolateFloat(time, hdrPower);
-
-            const float HDRDynamicMultiplier = 2.0f;
-            float sunColorLum = sunColor[0] * 0.2126f + sunColor[1] * 0.7152f + sunColor[2] * 0.0722f;
-            float sunIntensity = sunMult * sunColorLum * 10000.0f * gf_PI;
-
-            varSunIntensity.pInterpolator->InsertKeyFloat(time, sunIntensity);
-        }
-    }
-
-    // copy data from old node to new node if old nodes exist.
-    // this needs to maintain compatibility from CE 3.8.2 to above.
-    // this should be removed in the future.
-    string paramOldNameFogAlbedoColor = "Volumetric fog 2: Fog albedo color";
-    string paramOldNameAnisotropic = "Volumetric fog 2: Anisotropic factor";
-    for (int i = 0; i < node->getChildCount(); i++)
-    {
-        XmlNodeRef varNode = node->getChild(i);
-        const char* name = varNode->getAttr("Name");
-        if (paramOldNameFogAlbedoColor.compare(name) == 0)
-        {
-            LoadValueFromXmlNode(PARAM_VOLFOG2_COLOR1, varNode);
-            LoadValueFromXmlNode(PARAM_VOLFOG2_COLOR2, varNode);
-            LoadValueFromXmlNode(PARAM_VOLFOG2_COLOR, varNode);
-        }
-        else if (paramOldNameAnisotropic.compare(name) == 0)
-        {
-            LoadValueFromXmlNode(PARAM_VOLFOG2_ANISOTROPIC1, varNode);
-            LoadValueFromXmlNode(PARAM_VOLFOG2_ANISOTROPIC, varNode);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::LoadValueFromXmlNode(ETimeOfDayParamID destId, const XmlNodeRef& varNode)
-{
-    if (destId < 0 || destId >= PARAM_TOTAL)
-    {
-        return;
-    }
-
-    XmlNodeRef splineNode = varNode->findChild("Spline");
-    SVariableInfo& var = GetVar(destId);
-    switch (var.type)
-    {
-    case TYPE_FLOAT:
-        varNode->getAttr("Value", var.fValue[0]);
-        if (var.pInterpolator && splineNode != 0)
-        {
-            ((CBezierSplineFloat*)var.pInterpolator)->SerializeSpline(splineNode, true);
-        }
-        break;
-    case TYPE_COLOR:
-    {
-        Vec3 v(var.fValue[0], var.fValue[1], var.fValue[2]);
-        varNode->getAttr("Color", v);
-        var.fValue[0] = v.x;
-        var.fValue[1] = v.y;
-        var.fValue[2] = v.z;
-
-        if (var.pInterpolator && splineNode != 0)
-        {
-            CBezierSplineVec3* pBezierSpline = ((CBezierSplineVec3*)var.pInterpolator);
-            pBezierSpline->SerializeSpline(splineNode, true);
-            // Clamp colors in case too big colors are provided.
-            pBezierSpline->ClampValues(-100, 100);
-        }
-    }
-    break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::Serialize(XmlNodeRef& node, bool bLoading)
-{
-    if (bLoading)
-    {
-        node->getAttr("Time", m_fTime);
-
-        node->getAttr("TimeStart", m_advancedInfo.fStartTime);
-        node->getAttr("TimeEnd", m_advancedInfo.fEndTime);
-        node->getAttr("TimeAnimSpeed", m_advancedInfo.fAnimSpeed);
-
-        if (m_pTimeOfDaySpeedCVar->GetFVal() != m_advancedInfo.fAnimSpeed)
-        {
-            m_pTimeOfDaySpeedCVar->Set(m_advancedInfo.fAnimSpeed);
-        }
-
-        bool bSunIntensityFound = false;
-
-        // Load.
-        for (int i = 0; i < node->getChildCount(); i++)
-        {
-            XmlNodeRef varNode = node->getChild(i);
-            int nParamId = stl::find_in_map(m_varsMap, varNode->getAttr("Name"), -1);
-            if (nParamId < 0 || nParamId >= PARAM_TOTAL)
-            {
-                continue;
-            }
-
-            if (nParamId == PARAM_SUN_INTENSITY)
-            {
-                bSunIntensityFound = true;
-            }
-
-            LoadValueFromXmlNode((ETimeOfDayParamID)nParamId, varNode);
-        }
-        MigrateLegacyData(!bSunIntensityFound, node);
-        SetTime(m_fTime, false);
-    }
-    else
-    {
-        node->setAttr("Time", m_fTime);
-        node->setAttr("TimeStart", m_advancedInfo.fStartTime);
-        node->setAttr("TimeEnd", m_advancedInfo.fEndTime);
-        node->setAttr("TimeAnimSpeed", m_advancedInfo.fAnimSpeed);
-        // Save.
-        for (uint32 i = 0; i < static_cast<uint32>(GetVariableCount()); i++)
-        {
-            SVariableInfo& var = m_vars[i];
-            XmlNodeRef varNode = node->newChild("Variable");
-            varNode->setAttr("Name", var.name);
-            switch (var.type)
-            {
-            case TYPE_FLOAT:
-                varNode->setAttr("Value", var.fValue[0]);
-                if (var.pInterpolator)
-                {
-                    XmlNodeRef splineNode = varNode->newChild("Spline");
-                    ((CBezierSplineFloat*)var.pInterpolator)->SerializeSpline(splineNode, bLoading);
-                }
-                break;
-            case TYPE_COLOR:
-                varNode->setAttr("Color", Vec3(var.fValue[0], var.fValue[1], var.fValue[2]));
-                if (var.pInterpolator)
-                {
-                    XmlNodeRef splineNode = varNode->newChild("Spline");
-                    ((CBezierSplineVec3*)var.pInterpolator)->SerializeSpline(splineNode, bLoading);
-                }
-                break;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::Serialize(TSerialize ser)
-{
-    AZ_Assert(ser.GetSerializationTarget() != eST_Network, "Cannot serialize to network error in CTimeOfDay::Serialize");
-
-    string tempName;
-
-    ser.Value("time", m_fTime);
-    ser.Value("mode", m_bEditMode);
-    ser.Value("m_sunRotationLatitude", m_sunRotationLatitude);
-    ser.Value("m_sunRotationLongitude", m_sunRotationLongitude);
-    int size = GetVariableCount();
-    ser.BeginGroup("VariableValues");
-    for (int v = 0; v < size; v++)
-    {
-        tempName = m_vars[v].name;
-        tempName.replace(' ', '_');
-        tempName.replace('(', '_');
-        tempName.replace(')', '_');
-        tempName.replace(':', '_');
-        ser.BeginGroup(tempName);
-        ser.Value("Val0", m_vars[v].fValue[0]);
-        ser.Value("Val1", m_vars[v].fValue[1]);
-        ser.Value("Val2", m_vars[v].fValue[2]);
-        ser.EndGroup();
-    }
-    ser.EndGroup();
-
-    ser.Value("AdvInfoSpeed", m_advancedInfo.fAnimSpeed);
-    ser.Value("AdvInfoStart", m_advancedInfo.fStartTime);
-    ser.Value("AdvInfoEnd", m_advancedInfo.fEndTime);
-
-    if (ser.IsReading())
-    {
-        SetTime(m_fTime, true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::NetSerialize(TSerialize ser, float lag, uint32 flags)
-{
-    if (0 == (flags & NETSER_STATICPROPS))
-    {
-        if (ser.IsWriting())
-        {
-            ser.Value("time", m_fTime, 'tod');
-        }
-        else
-        {
-            float serializedTime;
-            ser.Value("time", serializedTime, 'tod');
-            float remoteTime = serializedTime + ((flags & NETSER_COMPENSATELAG) != 0) * m_advancedInfo.fAnimSpeed * lag;
-            float setTime = remoteTime;
-            if (0 == (flags & NETSER_FORCESET))
-            {
-                const float adjustmentFactor = 0.05f;
-                const float wraparoundGuardHours = 2.0f;
-
-                float localTime = m_fTime;
-                // handle wraparound
-                if (localTime < wraparoundGuardHours && remoteTime > (s_maxTime - wraparoundGuardHours))
-                {
-                    localTime += s_maxTime;
-                }
-                else if (remoteTime < wraparoundGuardHours && localTime > (s_maxTime - wraparoundGuardHours))
-                {
-                    remoteTime += s_maxTime;
-                }
-                // don't blend times if they're very different
-                if (fabsf(remoteTime - localTime) < 1.0f)
-                {
-                    setTime = adjustmentFactor * remoteTime + (1.0f - adjustmentFactor) * m_fTime;
-                    if (setTime > s_maxTime)
-                    {
-                        setTime -= s_maxTime;
-                    }
-                }
-            }
-            SetTime(setTime, (flags & NETSER_FORCESET) != 0);
-        }
-    }
-    else
-    {
-        // no static serialization (yet)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTimeOfDay::Tick()
-{
-    AZ_TRACE_METHOD();
-    //  if(!gEnv->bServer)
-    //      return;
-    if (!m_bEditMode && !m_bPaused)
-    {
-        if (fabs(m_advancedInfo.fAnimSpeed) > 0.0001f)
-        {
-            // advance (forward or backward)
-            float fTime = m_fTime + m_advancedInfo.fAnimSpeed * m_pTimer->GetFrameTime();
-
-            // full cycle mode
-            if (m_advancedInfo.fStartTime <= 0.05f && m_advancedInfo.fEndTime >= 23.5f)
-            {
-                if (fTime > m_advancedInfo.fEndTime)
-                {
-                    fTime = m_advancedInfo.fStartTime;
-                }
-                if (fTime < m_advancedInfo.fStartTime)
-                {
-                    fTime = m_advancedInfo.fEndTime;
-                }
-            }
-            else if (fabs(m_advancedInfo.fStartTime - m_advancedInfo.fEndTime) <= 0.05f)//full cycle mode
-            {
-                if (fTime > s_maxTime)
-                {
-                    fTime -= s_maxTime;
-                }
-                else if (fTime < 0.0f)
-                {
-                    fTime += s_maxTime;
-                }
-            }
-            else
-            {
-                // clamp advancing time
-                if (fTime > m_advancedInfo.fEndTime)
-                {
-                    fTime = m_advancedInfo.fEndTime;
-                }
-                if (fTime < m_advancedInfo.fStartTime)
-                {
-                    fTime = m_advancedInfo.fStartTime;
-                }
-            }
-
-            SetTime(fTime);
-        }
-    }
-}
-
-void CTimeOfDay::SetUpdateCallback(ITimeOfDayUpdateCallback* pCallback)
-{
-    m_pUpdateCallback = pCallback;
-}
-
-void CTimeOfDay::LerpWith(const ITimeOfDay& other, float lerpValue, ITimeOfDay& output) const
-{
-    AZ_Assert(GetVariableCount() == other.GetVariableCount() && GetVariableCount() == output.GetVariableCount(), "Attempting to lerp mismatching TimeOfDay objects!");
-    CTimeOfDay& todOutput = static_cast<CTimeOfDay&>(output);
-    const CTimeOfDay& todOther = static_cast<const CTimeOfDay&>(other);
-
-    for (uint32 i = 0; i < static_cast<uint32>(GetVariableCount()); i++)
-    {
-        SVariableInfo& outvar = todOutput.m_vars[i];
-        const SVariableInfo& var0 = m_vars[i];
-        const SVariableInfo& var1 = todOther.m_vars[i];
-        if (outvar.nParamId == var0.nParamId && outvar.nParamId == var1.nParamId)
-        {
-            switch (outvar.type)
-            {
-            case TYPE_FLOAT:
-            {
-                outvar.fValue[0] = Lerp(var0.fValue[0], var1.fValue[0], lerpValue);
-                break;
-            }
-            case TYPE_COLOR:
-            {
-                outvar.fValue[0] = Lerp(var0.fValue[0], var1.fValue[0], lerpValue);
-                outvar.fValue[1] = Lerp(var0.fValue[1], var1.fValue[1], lerpValue);
-                outvar.fValue[2] = Lerp(var0.fValue[2], var1.fValue[2], lerpValue);
-                break;
-            }
-            default:
-            {
-                AZ_Error("TimeOfDay", false, "Attempting to lerp mismatching TimeOfDay objects!");
-            }
-            }
-        }
-        else
-        {
-            CryWarning(EValidatorModule::VALIDATOR_MODULE_3DENGINE, EValidatorSeverity::VALIDATOR_WARNING, "Lerping mismatched time of day settings!");
-        }
-    }
-}
-
-void CTimeOfDay::BeginEditMode()
-{
-    m_bEditMode = true;
-    SetTime(m_fEditorTime);
-}
-
-void CTimeOfDay::EndEditMode()
-{
-    m_bEditMode = false;
-    m_fEditorTime = m_fTime;
-}
diff --git a/Code/CryEngine/Cry3DEngine/TimeOfDay.h b/Code/CryEngine/Cry3DEngine/TimeOfDay.h
deleted file mode 100644
index 09609592b8..0000000000
--- a/Code/CryEngine/Cry3DEngine/TimeOfDay.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_TIMEOFDAY_H
-#define CRYINCLUDE_CRY3DENGINE_TIMEOFDAY_H
-#pragma once
-
-#include <ITimeOfDay.h>
-
-class CEnvironmentPreset;
-//////////////////////////////////////////////////////////////////////////
-// ITimeOfDay interface implementation.
-//////////////////////////////////////////////////////////////////////////
-class CTimeOfDay
-    : public ITimeOfDay
-{
-public:
-    CTimeOfDay();
-    ~CTimeOfDay();
-
-    //////////////////////////////////////////////////////////////////////////
-    // ITimeOfDay
-    //////////////////////////////////////////////////////////////////////////
-
-    int GetPresetCount() const override { return m_presets.size(); }
-    bool GetPresetsInfos([[maybe_unused]] SPresetInfo* resultArray, [[maybe_unused]] unsigned int arraySize) const override { return false; }
-    bool SetCurrentPreset([[maybe_unused]] const char* szPresetName) override { return false; };
-    bool AddNewPreset([[maybe_unused]] const char* szPresetName) override { return false; };
-    bool RemovePreset([[maybe_unused]] const char* szPresetName) override { return false; };
-    bool SavePreset([[maybe_unused]] const char* szPresetName) const override { return false; };
-    bool LoadPreset([[maybe_unused]] const char* szFilePath) override { return false; };
-    void ResetPreset([[maybe_unused]] const char* szPresetName) override { };
-
-    bool ImportPreset([[maybe_unused]] const char* szPresetName, [[maybe_unused]] const char* szFilePath) override { return false; };
-    bool ExportPreset([[maybe_unused]] const char* szPresetName, [[maybe_unused]] const char* szFilePath) const override { return false; };
-
-    int GetVariableCount() const override { return ITimeOfDay::PARAM_TOTAL; };
-    bool GetVariableInfo(int nIndex, SVariableInfo &varInfo) const override;
-    void SetVariableValue(int nIndex, float fValue[3]) override;
-
-    bool InterpolateVarInRange([[maybe_unused]] int nIndex, [[maybe_unused]] float fMin, [[maybe_unused]] float fMax, [[maybe_unused]] unsigned int nCount, [[maybe_unused]] Vec3* resultArray) const override { return false; };
-    uint GetSplineKeysCount([[maybe_unused]] int nIndex, [[maybe_unused]] int nSpline) const override { return 0; };
-    bool GetSplineKeysForVar([[maybe_unused]] int nIndex, [[maybe_unused]] int nSpline, [[maybe_unused]] SBezierKey* keysArray, [[maybe_unused]] unsigned int keysArraySize) const override { return false; };
-    bool SetSplineKeysForVar([[maybe_unused]] int nIndex, [[maybe_unused]] int nSpline, [[maybe_unused]] const SBezierKey* keysArray, [[maybe_unused]] unsigned int keysArraySize) override { return false; };
-    bool UpdateSplineKeyForVar([[maybe_unused]] int nIndex, [[maybe_unused]] int nSpline, [[maybe_unused]] float fTime, [[maybe_unused]] float newValue) override { return false; };
-
-    void ResetVariables() override;
-
-    // Time of day is specified in hours.
-    void SetTime(float fHour, bool bForceUpdate = false, bool bEnvUpdate = true) override;
-    void SetSunPos(float longitude, float latitude) override;
-    float GetSunLatitude() override { return m_sunRotationLatitude; }
-    float GetSunLongitude() override { return m_sunRotationLongitude; }
-    float GetTime() override { return m_fTime; };
-
-    void SetPaused(bool paused) override { m_bPaused = paused; }
-
-    void SetAdvancedInfo(const SAdvancedInfo &advInfo) override;
-    void GetAdvancedInfo(SAdvancedInfo &advInfo) override;
-
-    float GetHDRMultiplier() const { return m_fHDRMultiplier; }
-
-    void Update(bool bInterpolate = true, bool bForceUpdate = false, bool bForceEnvUpdate = true) override;
-    void SetUpdateCallback(ITimeOfDayUpdateCallback* pCallback) override;
-
-    void Serialize(XmlNodeRef& node, bool bLoading) override;
-    void Serialize(TSerialize ser) override;
-
-    void SetTimer(ITimer * pTimer) override;
-
-    void NetSerialize(TSerialize ser, float lag, uint32 flags) override;
-
-    void Tick() override;
-
-    void SetEnvironmentSettings(const SEnvironmentInfo& envInfo) override;
-    void LerpWith(const ITimeOfDay& other, float lerpValue, ITimeOfDay& output) const override;
-
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void BeginEditMode();
-    void EndEditMode();
-
-private:
-    CTimeOfDay(const CTimeOfDay&);
-    CTimeOfDay(const CTimeOfDay&&);
-    CTimeOfDay& operator=(const CTimeOfDay&);
-    CTimeOfDay& operator=(const CTimeOfDay&&);
-
-    SVariableInfo& GetVar(ETimeOfDayParamID id);
-    void UpdateEnvLighting(bool forceUpdate);
-    void MigrateLegacyData(bool bSunIntensity, const XmlNodeRef& node);
-    void LoadValueFromXmlNode(ETimeOfDayParamID destId, const XmlNodeRef& varNode);
-
-private:
-    typedef std::map<string, CEnvironmentPreset>              TPresetsSet;
-    TPresetsSet                                               m_presets;
-    CEnvironmentPreset*                                       m_pCurrentPreset;
-    CEnvironmentPreset*                                       m_defaultPreset;
-
-    SVariableInfo                                             m_vars[ITimeOfDay::PARAM_TOTAL];
-    std::map<const char*, int, stl::less_strcmp<const char*> >  m_varsMap;
-    float                                                     m_fTime;
-    float                                                     m_fEditorTime;
-    float                                                     m_sunRotationLatitude;
-    float                                                     m_sunRotationLongitude;
-
-    bool                                                      m_bEditMode;
-    bool                                                      m_bPaused;
-    bool                                                      m_bSunLinkedToTOD;
-
-    SAdvancedInfo                                             m_advancedInfo;
-    ITimer*                                                   m_pTimer;
-    float                                                     m_fHDRMultiplier;
-    ICVar*                                                    m_pTimeOfDaySpeedCVar;
-    ITimeOfDayUpdateCallback*                                 m_pUpdateCallback;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_TIMEOFDAY_H
diff --git a/Code/CryEngine/Cry3DEngine/VMath.hpp b/Code/CryEngine/Cry3DEngine/VMath.hpp
deleted file mode 100644
index 513c80f85c..0000000000
--- a/Code/CryEngine/Cry3DEngine/VMath.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : unified vector math lib
-
-#pragma once
-
-#define VEC4_SSE
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(VMath_hpp)
-#endif
-
-//#include <math.h>
-#include <Cry_Math.h>
-#include <Cry3DEngineTraits.h>
-
-namespace NVMath
-{
-#if defined(_CPU_NEON)
-    #include "VMath_NEON.hpp"
-#elif (AZ_LEGACY_3DENGINE_TRAIT_HAS_SSE || defined(IOS_SIMULATOR)) && (defined(VEC4_SSE) || defined(VEC4_SSE4))
-    #include "VMath_SSE.hpp"
-#else
-    #include "VMath_C.hpp"
-#endif
-}
diff --git a/Code/CryEngine/Cry3DEngine/VMath_C.hpp b/Code/CryEngine/Cry3DEngine/VMath_C.hpp
deleted file mode 100644
index e88c984073..0000000000
--- a/Code/CryEngine/Cry3DEngine/VMath_C.hpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : unified vector math lib
-
-
-#ifndef __D_VMATH_C__
-#define __D_VMATH_C__
-
-//#include <xmmintrin.h>
-
-
-union vec4
-{
-    struct
-    {
-        float m_Xf;
-        float m_Yf;
-        float m_Zf;
-        float m_Wf;
-    };
-    struct
-    {
-        uint32 m_Xu;
-        uint32 m_Yu;
-        uint32 m_Zu;
-        uint32 m_Wu;
-    };
-    struct
-    {
-        int32 m_Xs;
-        int32 m_Ys;
-        int32 m_Zs;
-        int32 m_Ws;
-    };
-    float m_f[4];
-    int32 m_s[4];
-    uint32 m_u[4];
-};
-
-#include "VMath_Prototypes.hpp"
-
-#define SWIZZLEMASK5(X, Y, Z, W)   ((X) | (Y << 2) | (Z << 4) | (W << 6))
-#define SWIZZLEMASK4(N, X, Y, Z)   N##x    =   SWIZZLEMASK5(X, Y, Z, 0), \
-    N##y    =   SWIZZLEMASK5(X, Y, Z, 1),                                \
-    N##z    =   SWIZZLEMASK5(X, Y, Z, 2),                                \
-    N##w    =   SWIZZLEMASK5(X, Y, Z, 3),
-#define SWIZZLEMASK3(N, X, Y)     SWIZZLEMASK4(N##x, X, Y, 0) \
-    SWIZZLEMASK4(N##y, X, Y, 1)                               \
-    SWIZZLEMASK4(N##z, X, Y, 2)                               \
-    SWIZZLEMASK4(N##w, X, Y, 3)
-#define SWIZZLEMASK2(N, X)       SWIZZLEMASK3(N##x, X, 0) \
-    SWIZZLEMASK3(N##y, X, 1)                              \
-    SWIZZLEMASK3(N##z, X, 2)                              \
-    SWIZZLEMASK3(N##w, X, 3)
-#define SWIZZLEMASK1            SWIZZLEMASK2(x, 0) \
-    SWIZZLEMASK2(y, 1)                             \
-    SWIZZLEMASK2(z, 2)                             \
-    SWIZZLEMASK2(w, 3)
-
-enum ESwizzleMask
-{
-    SWIZZLEMASK1
-};
-enum ECacheLvl
-{
-    ECL_LVL1,
-    ECL_LVL2,
-    ECL_LVL3,
-};
-#define BitX    1
-#define BitY    2
-#define BitZ    4
-#define BitW    8
-
-ILINE vec4              Vec4(float x, float y, float z, float w)
-{
-    vec4 Ret;
-    Ret.m_Xf    =   x;
-    Ret.m_Yf    =   y;
-    Ret.m_Zf    =   z;
-    Ret.m_Wf    =   w;
-    return Ret;
-}
-ILINE vec4              Vec4(uint32 x, uint32 y, uint32 z, uint32 w)
-{
-    vec4 Ret;
-    Ret.m_Xu    =   x;
-    Ret.m_Yu    =   y;
-    Ret.m_Zu    =   z;
-    Ret.m_Wu    =   w;
-    return Ret;
-}
-ILINE vec4              Vec4(float x)
-{
-    return Vec4(x, x, x, x);
-}
-ILINE float             Vec4float(vec4 V, uint32 Idx)
-{
-    return V.m_f[Idx];
-}
-template<int Idx>
-ILINE float             Vec4float(vec4 V)
-{
-    return Vec4float(V, Idx);
-}
-ILINE int32             Vec4int32(vec4 V, uint32 Idx)
-{
-    return V.m_s[Idx];
-}
-template<int Idx>
-ILINE int32             Vec4int32(vec4 V)
-{
-    return Vec4int32(V, Idx);
-}
-ILINE vec4              Vec4Zero()
-{
-    return Vec4(0.f);
-}
-
-ILINE vec4              Vec4One()
-{
-    return Vec4(1.f, 1.f, 1.f, 1.f);
-}
-ILINE vec4              Vec4Four()
-{
-    return Vec4(4.f, 4.f, 4.f, 4.f);
-}
-ILINE vec4              Vec4ZeroOneTwoThree()
-{
-    return Vec4(0.f, 1.f, 2.f, 3.f);
-}
-ILINE vec4              Vec4FFFFFFFF()
-{
-    return Vec4(~0u, ~0u, ~0u, ~0u);
-}
-ILINE vec4              Vec4Epsilon()
-{
-    return Vec4(FLT_EPSILON);
-}
-template<ECacheLvl L>
-ILINE void              Prefetch(const void* pData)
-{
-}
-template<ESwizzleMask M>
-ILINE vec4              Shuffle(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_u[M & 3], V0.m_u[(M >> 2) & 3], V1.m_u[(M >> 4) & 3], V1.m_u[(M >> 6) & 3]);
-}
-template<ESwizzleMask M>
-ILINE vec4              Swizzle(vec4 V)
-{
-    return Shuffle<M>(V, V);
-}
-template<int INDEX>
-ILINE vec4              Splat(vec4 V)
-{
-    CRY_ASSERT_MESSAGE(0, "Should not be reached!");
-    return Vec4FFFFFFFF();
-}
-template<>
-ILINE vec4              Splat<0>(vec4 V)
-{
-    return Shuffle<xxxx>(V, V);
-}
-template<>
-ILINE vec4              Splat<1>(vec4 V)
-{
-    return Shuffle<yyyy>(V, V);
-}
-template<>
-ILINE vec4              Splat<2>(vec4 V)
-{
-    return Shuffle<zzzz>(V, V);
-}
-template<>
-ILINE vec4              Splat<3>(vec4 V)
-{
-    return Shuffle<wwww>(V, V);
-}
-ILINE vec4              Add(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xf + V1.m_Xf,
-        V0.m_Yf + V1.m_Yf,
-        V0.m_Zf + V1.m_Zf,
-        V0.m_Wf + V1.m_Wf);
-}
-ILINE vec4              Sub(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xf - V1.m_Xf,
-        V0.m_Yf - V1.m_Yf,
-        V0.m_Zf - V1.m_Zf,
-        V0.m_Wf - V1.m_Wf);
-}
-ILINE vec4              Mul(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xf * V1.m_Xf,
-        V0.m_Yf * V1.m_Yf,
-        V0.m_Zf * V1.m_Zf,
-        V0.m_Wf * V1.m_Wf);
-}
-ILINE vec4              Div(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xf / V1.m_Xf,
-        V0.m_Yf / V1.m_Yf,
-        V0.m_Zf / V1.m_Zf,
-        V0.m_Wf / V1.m_Wf);
-}
-ILINE vec4              RcpFAST(vec4 V)
-{
-    return Div(Vec4One(), V);
-}
-ILINE vec4              DivFAST(vec4 V0, vec4 V1)
-{
-    return Div(V0, V1);
-}
-ILINE vec4              Rcp(vec4 V)
-{
-    return Div(Vec4One(), V);
-}
-ILINE vec4              Madd(vec4 V0, vec4 V1, vec4 V2)
-{
-    return Add(V2, Mul(V0, V1));
-}
-ILINE vec4              Msub(vec4 V0, vec4 V1, vec4 V2)
-{
-    return Sub(Mul(V0, V1), V2);
-}
-ILINE vec4              Min(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xf < V1.m_Xf ? V0.m_Xf : V1.m_Xf,
-        V0.m_Yf < V1.m_Yf ? V0.m_Yf : V1.m_Yf,
-        V0.m_Zf < V1.m_Zf ? V0.m_Zf : V1.m_Zf,
-        V0.m_Wf < V1.m_Wf ? V0.m_Wf : V1.m_Wf);
-}
-ILINE vec4              Max(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xf > V1.m_Xf ? V0.m_Xf : V1.m_Xf,
-        V0.m_Yf > V1.m_Yf ? V0.m_Yf : V1.m_Yf,
-        V0.m_Zf > V1.m_Zf ? V0.m_Zf : V1.m_Zf,
-        V0.m_Wf > V1.m_Wf ? V0.m_Wf : V1.m_Wf);
-}
-ILINE vec4              floatToint32(vec4 V)
-{
-    return Vec4(static_cast<uint32>(static_cast<int32>(V.m_Xf)),
-        static_cast<uint32>(static_cast<int32>(V.m_Yf)),
-        static_cast<uint32>(static_cast<int32>(V.m_Zf)),
-        static_cast<uint32>(static_cast<int32>(V.m_Wf)));
-}
-ILINE vec4              int32Tofloat(vec4 V)
-{
-    return Vec4(static_cast<float>(V.m_Xs),
-        static_cast<float>(V.m_Ys),
-        static_cast<float>(V.m_Zs),
-        static_cast<float>(V.m_Ws));
-}
-ILINE vec4              CmpLE(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xf <= V1.m_Xf ? ~0u : 0u,
-        V0.m_Yf <= V1.m_Yf ? ~0u : 0u,
-        V0.m_Zf <= V1.m_Zf ? ~0u : 0u,
-        V0.m_Wf <= V1.m_Wf ? ~0u : 0u);
-}
-ILINE uint32                SignMask(vec4 V)
-{
-    return (V.m_Xu >> 31) | ((V.m_Yu >> 31) << 1) | ((V.m_Zu >> 31) << 2) | ((V.m_Wu >> 31) << 3);
-}
-ILINE vec4              And(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xu & V1.m_Xu,
-        V0.m_Yu & V1.m_Yu,
-        V0.m_Zu & V1.m_Zu,
-        V0.m_Wu & V1.m_Wu);
-}
-ILINE vec4              AndNot(vec4 V0, vec4 V1)
-{
-    return Vec4((~V0.m_Xu) & V1.m_Xu,
-        (~V0.m_Yu) & V1.m_Yu,
-        (~V0.m_Zu) & V1.m_Zu,
-        (~V0.m_Wu) & V1.m_Wu);
-}
-ILINE vec4              Or(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xu | V1.m_Xu,
-        V0.m_Yu | V1.m_Yu,
-        V0.m_Zu | V1.m_Zu,
-        V0.m_Wu | V1.m_Wu);
-}
-ILINE vec4              Xor(vec4 V0, vec4 V1)
-{
-    return Vec4(V0.m_Xu ^ V1.m_Xu,
-        V0.m_Yu ^ V1.m_Yu,
-        V0.m_Zu ^ V1.m_Zu,
-        V0.m_Wu ^ V1.m_Wu);
-}
-ILINE vec4              Select(vec4 V0, vec4 V1, vec4 M)
-{
-    return SelectSign(V0, V1, M);
-}
-ILINE vec4              ShiftAR(vec4 V, uint32 Count)
-{
-    return Vec4(static_cast<uint32>(V.m_Xs >> Count),
-        static_cast<uint32>(V.m_Ys >> Count),
-        static_cast<uint32>(V.m_Zs >> Count),
-        static_cast<uint32>(V.m_Ws >> Count));
-}
-ILINE vec4              SelectSign(vec4 V0, vec4 V1, vec4 M)
-{
-    M   =   ShiftAR(M, 31);
-    return Or(AndNot(M, V0), And(M, V1));
-}
-template <int M>
-ILINE vec4              SelectStatic(vec4 V0, vec4 V1)
-{
-    const vec4 mask = NVMath::Vec4(M & 0x1 ? ~0x0u : 0x0u, M & 0x2 ? ~0x0u : 0x0u, M & 0x4 ? ~0x0u : 0x0u, M & 0x8 ? ~0x0u : 0x0u);
-    return Select(V0, V1, mask);
-}
-
-ILINE vec4              SelectBits(vec4 V0, vec4 V1, vec4 M)
-{
-    return Or(AndNot(M, V0), And(M, V1));
-}
-
-ILINE vec4              CmpEq(vec4 V0, vec4 V1)
-{
-    return Vec4(
-        V0.m_Xs == V1.m_Xs ? 0xffffffff : 0x0,
-        V0.m_Ys == V1.m_Ys ? 0xffffffff : 0x0,
-        V0.m_Zs == V1.m_Zs ? 0xffffffff : 0x0,
-        V0.m_Ws == V1.m_Ws ? 0xffffffff : 0x0);
-}
-
-ILINE void              ExtractByteToFloat(vec4& rVOut0, vec4& rVOut1, vec4& rVOut2, vec4& rVOut3, vec4 VIn)
-{
-    const char* const VInBytes = (const char*)&VIn;
-    vec4 VOutVecs[4];
-    int* VOutInts[4] =
-    {
-        reinterpret_cast<int*>(&VOutVecs[0]),
-        reinterpret_cast<int*>(&VOutVecs[1]),
-        reinterpret_cast<int*>(&VOutVecs[2]),
-        reinterpret_cast<int*>(&VOutVecs[3])
-    };
-
-    VOutInts[0][0] = VInBytes[ 0];
-    VOutInts[0][1] = VInBytes[ 1];
-    VOutInts[0][2] = VInBytes[ 2];
-    VOutInts[0][3] = VInBytes[ 3];
-    VOutInts[1][0] = VInBytes[ 4];
-    VOutInts[1][1] = VInBytes[ 5];
-    VOutInts[1][2] = VInBytes[ 6];
-    VOutInts[1][3] = VInBytes[ 7];
-    VOutInts[2][0] = VInBytes[ 8];
-    VOutInts[2][1] = VInBytes[ 9];
-    VOutInts[2][2] = VInBytes[10];
-    VOutInts[2][3] = VInBytes[11];
-    VOutInts[3][0] = VInBytes[12];
-    VOutInts[3][1] = VInBytes[13];
-    VOutInts[3][2] = VInBytes[14];
-    VOutInts[3][3] = VInBytes[15];
-
-    rVOut0 = int32Tofloat(VOutVecs[0]);
-    rVOut1 = int32Tofloat(VOutVecs[1]);
-    rVOut2 = int32Tofloat(VOutVecs[2]);
-    rVOut3 = int32Tofloat(VOutVecs[3]);
-}
-
-#endif
-
diff --git a/Code/CryEngine/Cry3DEngine/VMath_NEON.hpp b/Code/CryEngine/Cry3DEngine/VMath_NEON.hpp
deleted file mode 100644
index d032aa0ef7..0000000000
--- a/Code/CryEngine/Cry3DEngine/VMath_NEON.hpp
+++ /dev/null
@@ -1,552 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : unified vector math lib
-
-
-#ifndef __D_VMATH_NEON__
-#define __D_VMATH_NEON__
-
-#include <arm_neon.h>
-
-typedef float32x4_t vec4;
-
-#include "VMath_Prototypes.hpp"
-
-#define AVOID_COMPILER_BUG
-
-#ifdef AVOID_COMPILER_BUG
-
-#define SWIZZLEMASK5(X, Y, Z, W)   ((X) | (Y << 2) | (Z << 4) | (W << 6))
-#define SWIZZLEMASK4(N, X, Y, Z)   N##x    =   SWIZZLEMASK5(X, Y, Z, 0), \
-    N##y    =   SWIZZLEMASK5(X, Y, Z, 1),                                \
-    N##z    =   SWIZZLEMASK5(X, Y, Z, 2),                                \
-    N##w    =   SWIZZLEMASK5(X, Y, Z, 3),
-#define SWIZZLEMASK3(N, X, Y)     SWIZZLEMASK4(N##x, X, Y, 0) \
-    SWIZZLEMASK4(N##y, X, Y, 1)                               \
-    SWIZZLEMASK4(N##z, X, Y, 2)                               \
-    SWIZZLEMASK4(N##w, X, Y, 3)
-#define SWIZZLEMASK2(N, X)       SWIZZLEMASK3(N##x, X, 0) \
-    SWIZZLEMASK3(N##y, X, 1)                              \
-    SWIZZLEMASK3(N##z, X, 2)                              \
-    SWIZZLEMASK3(N##w, X, 3)
-#define SWIZZLEMASK1            SWIZZLEMASK2(x, 0) \
-    SWIZZLEMASK2(y, 1)                             \
-    SWIZZLEMASK2(z, 2)                             \
-    SWIZZLEMASK2(w, 3)
-
-enum ESwizzleMask
-{
-    SWIZZLEMASK1
-};
-
-#else
-
-#define SWIZZLEMASK5(X, Y, Z, W)   {(X + 0), (X + 1), (X + 2), (X + 3), (Y + 0), (Y + 1), (Y + 2), (Y + 3), (Z + 16), (Z + 17), (Z + 18), (Z + 19), (W + 16), (W + 17), (W + 18), (W + 19) }
-#define SWIZZLEMASK4(N, X, Y, Z)   SWIZZLEMASK5(X, Y, Z, 0), \
-    SWIZZLEMASK5(X, Y, Z, 4),                                \
-    SWIZZLEMASK5(X, Y, Z, 8),                                \
-    SWIZZLEMASK5(X, Y, Z, 12),
-#define SWIZZLEMASK3(N, X, Y)     SWIZZLEMASK4(N##x, X, Y, 0) \
-    SWIZZLEMASK4(N##y, X, Y, 4)                               \
-    SWIZZLEMASK4(N##z, X, Y, 8)                               \
-    SWIZZLEMASK4(N##w, X, Y, 12)
-#define SWIZZLEMASK2(N, X)       SWIZZLEMASK3(N##x, X, 0) \
-    SWIZZLEMASK3(N##y, X, 4)                              \
-    SWIZZLEMASK3(N##z, X, 8)                              \
-    SWIZZLEMASK3(N##w, X, 12)
-#define SWIZZLEMASK1            SWIZZLEMASK2(x, 0) \
-    SWIZZLEMASK2(y, 4)                             \
-    SWIZZLEMASK2(z, 8)                             \
-    SWIZZLEMASK2(w, 12)
-
-#define SWIZZLEINDEX5(X, Y, Z, W)  (X + Y + Z + W)
-#define SWIZZLEINDEX4(N, X, Y, Z)  N##x    =   SWIZZLEINDEX5(X, Y, Z, 0), \
-    N##y    =   SWIZZLEINDEX5(X, Y, Z, 1),                                \
-    N##z    =   SWIZZLEINDEX5(X, Y, Z, 2),                                \
-    N##w    =   SWIZZLEINDEX5(X, Y, Z, 3),
-#define SWIZZLEINDEX3(N, X, Y)        SWIZZLEINDEX4(N##x, X, Y, 0) \
-    SWIZZLEINDEX4(N##y, X, Y, 1)                                   \
-    SWIZZLEINDEX4(N##z, X, Y, 2)                                   \
-    SWIZZLEINDEX4(N##w, X, Y, 3)
-#define SWIZZLEINDEX2(N, X)      SWIZZLEINDEX3(N##x, X, 0) \
-    SWIZZLEINDEX3(N##y, X, 1)                              \
-    SWIZZLEINDEX3(N##z, X, 2)                              \
-    SWIZZLEINDEX3(N##w, X, 3)
-#define SWIZZLEINDEX1           SWIZZLEINDEX2(x, 0) \
-    SWIZZLEINDEX2(y, 1)                             \
-    SWIZZLEINDEX2(z, 2)                             \
-    SWIZZLEINDEX2(w, 3)
-
-enum ESwizzleMask
-{
-    SWIZZLEINDEX1
-};
-
-namespace cryengine_vmath_neon_internal
-{
-    // Contains pre-calculated lookup indices for Shuffle().  Indexed by ESwizzleMask
-    static const uint8x16_t g_SwizzleMasks[] = {
-        SWIZZLEMASK1
-    };
-} // namespace cryengine_vmath_neon_internal
-
-#endif // AVOID_COMPILER_BUG
-
-
-enum ECacheLvl
-{
-    ECL_LVL1,
-    ECL_LVL2,
-    ECL_LVL3,
-};
-
-/**
- * Bit masks for use with result from SignMask()
- */
-static const uint32 BitX = 0x00000080;
-static const uint32 BitY = 0x00008000;
-static const uint32 BitZ = 0x00800000;
-static const uint32 BitW = 0x80000000;
-
-ILINE vec4 Vec4(float x, float y, float z, float w)
-{
-    const vec4 Ret = {x, y, z, w};
-    return Ret;
-}
-
-ILINE vec4 Vec4(uint32 x, uint32 y, uint32 z, uint32 w)
-{
-    const uint32x4_t Ret = {x, y, z, w};
-    return (float32x4_t)Ret;
-}
-
-ILINE vec4 Vec4(float x)
-{
-    return Vec4(x, x, x, x);
-}
-
-template<int Idx>
-ILINE int32 Vec4int32(vec4 V)
-{
-    return vgetq_lane_s32((int32x4_t)V, Idx);
-}
-
-template <int Idx>
-ILINE float Vec4float(vec4 V)
-{
-    return vgetq_lane_f32(V, Idx);
-}
-
-ILINE int32 Vec4int32(vec4 V, uint32 Idx)
-{
-    switch (Idx)
-    {
-    case 0:
-        return vgetq_lane_s32((int32x4_t)V, 0);
-    case 1:
-        return vgetq_lane_s32((int32x4_t)V, 1);
-    case 2:
-        return vgetq_lane_s32((int32x4_t)V, 2);
-    case 3:
-        return vgetq_lane_s32((int32x4_t)V, 3);
-    default:
-        assert(0);
-        return 0;
-    }
-    //return V.m_s[Idx];
-}
-
-ILINE float Vec4float(vec4 V, uint32 Idx)
-{
-    switch (Idx)
-    {
-    case 0:
-        return vgetq_lane_f32(V, 0);
-    case 1:
-        return vgetq_lane_f32(V, 1);
-    case 2:
-        return vgetq_lane_f32(V, 2);
-    case 3:
-        return vgetq_lane_f32(V, 3);
-    default:
-        assert(0);
-        return 0;
-    }
-}
-
-ILINE vec4 Vec4Zero()
-{
-    static const float32x4_t V = {0.f, 0.f, 0.f, 0.f};
-    return V;
-}
-
-ILINE vec4 Vec4One()
-{
-    static const float32x4_t V = {1.f, 1.f, 1.f, 1.f};
-    return V;
-}
-ILINE vec4 Vec4Four()
-{
-    static const float32x4_t V = {4.f, 4.f, 4.f, 4.f};
-    return V;
-}
-ILINE vec4 Vec4ZeroOneTwoThree()
-{
-    static const float32x4_t V = {0.f, 1.f, 2.f, 3.f};
-    return V;
-}
-ILINE vec4 Vec4FFFFFFFF()
-{
-    return Vec4(0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff);
-}
-ILINE vec4 Vec4Epsilon()
-{
-    static const float32x4_t V = {FLT_EPSILON, FLT_EPSILON, FLT_EPSILON, FLT_EPSILON};
-    return V;
-}
-
-/**
- * Creates vector where each word element is set to value of specified element.
- * INDEX 0 is x, 1 is y, etc.
- * @returns {V[INDEX], V[INDEX], V[INDEX], V[INDEX]}
- */
-template<int INDEX>
-ILINE vec4 Splat(vec4 V)
-{
-    switch (INDEX)
-    {
-    case 0:
-        return vdupq_lane_f32(vget_low_f32(V), 0);
-    case 1:
-        return vdupq_lane_f32(vget_low_f32(V), 1);
-    case 2:
-        // expanded to fix a clang compiler error with the preprocessor
-        return vdupq_lane_f32(vget_high_f32(V), 0);
-    case 3:
-        // expanded to fix a clang compiler error with the preprocessor
-        return vdupq_lane_f32(vget_high_f32(V), 1);
-    default:
-        assert(0);
-        return Vec4FFFFFFFF();
-    }
-}
-
-template<ECacheLvl L>
-ILINE void Prefetch(const void* pData)
-{
-    __builtin_prefetch(pData);
-}
-
-/**
- * Return vector containing words from V0 and V1 based on mask M.
- * First two elements of M specify word index in V0 and last two elements
- * specify word index in V1.
- *
- * e.g.
- * Shuffle( M={0,1,2,3} ) => {V0[0], V0[1], V1[2], V1[3]}
- */
-template<ESwizzleMask M>
-ILINE vec4 Shuffle(vec4 V0, vec4 V1)
-{
-#ifdef AVOID_COMPILER_BUG
-    return Vec4(Vec4float(V0, M & 3), Vec4float(V0, (M >> 2) & 3), Vec4float(V1, (M >> 4) & 3), Vec4float(V1, (M >> 6) & 3));
-#else
-    //return Vec4(V0.m_u[M&3],V0.m_u[(M>>2)&3],V1.m_u[(M>>4)&3],V1.m_u[(M>>6)&3]);
-    assert(M >= 0 && M < sizeof(cryengine_vmath_neon_internal::g_SwizzleMasks) / sizeof(cryengine_vmath_neon_internal::g_SwizzleMasks[0]));
-    // Get precomputed vector containing lookup indices for swizzle
-    const uint8x16_t mask = cryengine_vmath_neon_internal::g_SwizzleMasks[ M ];
-    // Split the lookup indexes into xy and zw pair
-    const uint8x8_t low_index = vget_low_u8(mask);
-    const uint8x8_t high_index = vget_high_u8(mask);
-    // Combine inputs into table; VO=xyzw, V1=XYZW => xyzwXYZW
-    const uint8x8x4_t tbl = {
-        {
-            (uint8x8_t)vget_low_f32(V0),
-            (uint8x8_t)vget_high_f32(V0),
-            (uint8x8_t)vget_low_f32(V1),
-            (uint8x8_t)vget_high_f32(V1),
-        }
-    };
-    // Look up the xy values, then zw values, then combine them
-    const uint8x8_t low = vtbl4_u8(tbl, low_index);
-    const uint8x8_t high = vtbl4_u8(tbl, high_index);
-    const uint8x16_t ret = vcombine_u8(low, high);
-    return (float32x4_t)ret;
-#endif // AVOID_COMPILER_BUG
-}
-
-template<ESwizzleMask M>
-ILINE vec4 Swizzle(vec4 V)
-{
-    return Shuffle<M>(V, V);
-}
-
-/**
- * @returns V0 + V1
- */
-ILINE vec4 Add(vec4 V0, vec4 V1)
-{
-    return vaddq_f32(V0, V1);
-}
-
-/**
- * @returns V0 - V1
- */
-ILINE vec4              Sub(vec4 V0, vec4 V1)
-{
-    return vsubq_f32(V0, V1);
-}
-
-/**
- * @returns V0 * V1
- */
-ILINE vec4              Mul(vec4 V0, vec4 V1)
-{
-    return vmulq_f32(V0, V1);
-}
-
-/**
- * @returns V0 / V1
- */
-ILINE vec4              Div(vec4 V0, vec4 V1)
-{
-    return Mul(V0, Rcp(V1));
-}
-
-/**
- * @returns 1 / V
- */
-ILINE vec4              RcpFAST(vec4 V)
-{
-    return vrecpeq_f32(V);
-}
-
-/**
- * @returns V0 / V1
- */
-ILINE vec4              DivFAST(vec4 V0, vec4 V1)
-{
-    return Mul(V0, RcpFAST(V1));
-}
-
-/**
- * @returns 1 / V
- */
-ILINE vec4              Rcp(vec4 V)
-{
-    // Improve estimate precision with a single Newton-Raphson iteration
-    vec4 vEstimate = RcpFAST(V);
-    return vmulq_f32(vrecpsq_f32(V, vEstimate), vEstimate);
-}
-
-/**
- * @returns V0 * V1 + V2
- */
-ILINE vec4              Madd(vec4 V0, vec4 V1, vec4 V2)
-{
-    // Madd return V0*V1+V2 but vmla(a,b,c) does b*c+a
-    return vmlaq_f32(V2, V0, V1);
-}
-
-/**
- * @returns V0 * V1 - V2
- */
-ILINE vec4              Msub(vec4 V0, vec4 V1, vec4 V2)
-{
-    // Msub returns V0*V1-V2 but vmls(a,b,c) does a-b*c
-    return Sub(Mul(V0, V1), V2);
-}
-
-ILINE vec4              Min(vec4 V0, vec4 V1)
-{
-    return vminq_f32(V0, V1);
-}
-
-ILINE vec4              Max(vec4 V0, vec4 V1)
-{
-    return vmaxq_f32(V0, V1);
-}
-
-ILINE vec4              floatToint32(vec4 V)
-{
-    return (float32x4_t)vcvtq_s32_f32(V);
-}
-
-ILINE vec4              int32Tofloat(vec4 V)
-{
-    return vcvtq_f32_s32((int32x4_t)V);
-}
-
-ILINE vec4              CmpLE(vec4 V0, vec4 V1)
-{
-    return (float32x4_t)vcleq_f32(V0, V1);
-}
-
-/**
- * Return sign bit of each word as a single word.  Each is accessible via
- * Bit[X|Y|Z|W] mask.
- */
-ILINE uint32            SignMask(vec4 V)
-{
-    // Xcode 6.3 removed support for the non-standard 'vtbl1q_p8' in favour
-    // of the standard 'vtbl2_u8' which is not available in Xcode 6.2
-#if defined(__AARCH64_SIMD__) && defined(__apple_build_version__) && (__apple_build_version__ < 6020037)
-    const uint8x16_t tbl = vcombine_u8((uint8x8_t)vget_low_f32(V), (uint8x8_t)vget_high_f32(V));
-    const uint8x8_t idx_sign = {3, 7, 11, 15}; // MSB -> LSB = W -> X (0xWWZZYYXX)
-    const uint8x8_t sign_bytes = vtbl1q_p8(tbl, idx_sign);
-#elif 1
-    // Create table from which be select bytes with msb (sign) and combine into
-    // single word
-    const uint8x8x2_t tbl = {
-        {
-            (uint8x8_t)vget_low_f32(V),
-            (uint8x8_t)vget_high_f32(V),
-        }
-    };
-    const uint8x8_t idx_sign = {3, 7, 11, 15}; // MSB -> LSB = W -> X (0xWWZZYYXX)
-    const uint8x8_t sign_bytes = vtbl2_u8(tbl, idx_sign);
-#else
-    const int32x4_t rev = vshrq_n_s32((int32x4_t)V, 24);
-    const int16x4_t shorts = vmovn_s32(rev);
-    const uint8x8_t tbl = (uint8x8_t)shorts;
-    const uint8x8_t index = {1, 3, 5, 7};
-    const uint8x8_t sign_bytes = vtbl1_u8(tbl, index);
-#endif
-    return vget_lane_u32((uint32x2_t)sign_bytes, 0);
-    //return (V.m_Xu>>31)|((V.m_Yu>>31)<<1)|((V.m_Zu>>31)<<2)|((V.m_Wu>>31)<<3);
-}
-
-/**
- * @returns V0 & V1
- */
-ILINE vec4              And(vec4 V0, vec4 V1)
-{
-    return (float32x4_t)vandq_u32((uint32x4_t)V0, (uint32x4_t)V1);
-}
-
-/**
- * @returns ~V0 & V1
- */
-ILINE vec4              AndNot(vec4 V0, vec4 V1)
-{
-    return (float32x4_t)vandq_u32(vmvnq_u32((uint32x4_t)V0), (uint32x4_t)V1);
-}
-
-/**
- * @returns V0 | V1
- */
-ILINE vec4              Or(vec4 V0, vec4 V1)
-{
-    return (float32x4_t)vorrq_u32((uint32x4_t)V0, (uint32x4_t)V1);
-}
-
-/**
- * @returns V0 ^ V1
- */
-ILINE vec4              Xor(vec4 V0, vec4 V1)
-{
-    return (float32x4_t)veorq_u32((uint32x4_t)V0, (uint32x4_t)V1);
-}
-
-ILINE vec4              Select(vec4 V0, vec4 V1, vec4 M)
-{
-    return SelectSign(V0, V1, M);
-}
-
-/**
- * Returns new vector where each word element comes from V0 if the sign of
- * the corresponding word in M is 0 (+), otherwise the word element comes from
- * V1.
- *
- * e.g.
- * SelectSign( {0.f,1.f,2.f,3.f}, {a.f,b.f,c.f,d.f}, {0.f,0.f,-1.f,-1.f} )
- * => {0.f, 1.f, c.f, d.f}
- */
-ILINE vec4              SelectSign(vec4 V0, vec4 V1, vec4 M)
-{
-    const int32x4_t mask = vshrq_n_s32((int32x4_t)M, 31);
-    return vbslq_f32((uint32x4_t)mask, V1, V0);
-    //M =   ShiftAR(M,31);
-    //return Or(AndNot(M,V0),And(M,V1));
-}
-
-/**
- * Expands each byte of VIn as a float.
- *
- * e.g.
- * ExtractByteToFloat( {0x00010203, 0x04...} ) => {3.f, 2.f, 1.f, 0.f} ...
- */
-static ILINE void           ExtractByteToFloat(vec4& rVout0, vec4& rVout1, vec4& rVout2, vec4& rVout3, vec4 VIn)
-{
-    // 16 bytes => 2x 8 shorts
-    const int8x8_t XY8 = vget_low_s8((int8x16_t)VIn);
-    const int8x8_t ZW8 = vget_high_s8((int8x16_t)VIn);
-    const int16x8_t XY16 = vmovl_s8(XY8);
-    const int16x8_t ZW16 = vmovl_s8(ZW8);
-
-    // 2x 8 shorts => 4x 4 int
-    const int16x4_t X16 = vget_low_s16(XY16);
-    const int16x4_t Y16 = vget_high_s16(XY16);
-    const int16x4_t Z16 = vget_low_s16(ZW16);
-    const int16x4_t W16 = vget_high_s16(ZW16);
-    const int32x4_t X32 = vmovl_s16(X16);
-    const int32x4_t Y32 = vmovl_s16(Y16);
-    const int32x4_t Z32 = vmovl_s16(Z16);
-    const int32x4_t W32 = vmovl_s16(W16);
-
-    // 4x 4 int => 4x 4 float
-    rVout0 = vcvtq_f32_s32(X32);
-    rVout1 = vcvtq_f32_s32(Y32);
-    rVout2 = vcvtq_f32_s32(Z32);
-    rVout3 = vcvtq_f32_s32(W32);
-}
-
-/**
- * Returns vector where each bit is from V0 if the corresponding bit in
- * M is 0, otherwise the bit is from V1 (i.e. vsel instruction from PowerPC, or selb from SPU).
- *
- * e.g.
- * SelectBits(b0001, b1110, b0011) => b0010
- */
-ILINE vec4              SelectBits(vec4 V0, vec4 V1, vec4 M)
-{
-    // Order of args to vbsl is exact opposite of SelectBits()
-    return vbslq_f32((uint32x4_t)M, V1, V0);
-    //return Or(AndNot(M,V0),And(M,V1));
-}
-
-/**
- * Returns vector where, for each word, all bits are set to 1 if the
- * corresponding words in V0 and V1 are equal.
- *
- * e.g.
- * CmpEq( {0.f...}, {0.f, 1.f, 2.f...} ) => {0xffffffff, 0x0, 0x0, 0x0}
- */
-ILINE vec4              CmpEq(vec4 V0, vec4 V1)
-{
-    return (float32x4_t)vceqq_f32(V0, V1);
-}
-
-template <int M>
-ILINE vec4  SelectStatic(vec4 V0, vec4 V1)
-{
-    const vec4 mask = Vec4(M & 0x1 ? ~0x0u : 0x0u, M & 0x2 ? ~0x0u : 0x0u, M & 0x4 ? ~0x0u : 0x0u, M & 0x8 ? ~0x0u : 0x0u);
-    return Select(V0, V1, mask);
-}
-
-
-#endif // __D_VMATH_NEON__
-
-#undef AVOID_COMPILER_BUG
-
diff --git a/Code/CryEngine/Cry3DEngine/VMath_Prototypes.hpp b/Code/CryEngine/Cry3DEngine/VMath_Prototypes.hpp
deleted file mode 100644
index e4ff98caeb..0000000000
--- a/Code/CryEngine/Cry3DEngine/VMath_Prototypes.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : unified vector math lib
-
-
-#ifndef CRYINCLUDE_D_VMATH_H
-#define CRYINCLUDE_D_VMATH_H
-
-ILINE vec4  Vec4(float x);
-ILINE vec4  Vec4(float x, float y, float z, float w);
-ILINE vec4  Vec4(uint32 x, uint32 y, uint32 z, uint32 w);
-ILINE int32 Vec4int32(vec4 V, uint32 Idx);
-ILINE vec4  Vec4Zero();
-ILINE vec4  Vec4One();
-ILINE vec4  Vec4Four();
-ILINE vec4  Vec4ZeroOneTwoThree();
-ILINE vec4  Vec4FFFFFFFF();
-ILINE vec4  Vec4Epsilon();
-ILINE vec4  Add(vec4 V0, vec4 V1);
-ILINE vec4  Sub(vec4 V0, vec4 V1);
-ILINE vec4  Mul(vec4 V0, vec4 V1);
-ILINE vec4  Div(vec4 V0, vec4 V1);
-ILINE vec4  RcpFAST(vec4 V);
-ILINE vec4  DivFAST(vec4 V0, vec4 V1);
-ILINE vec4  Rcp(vec4 V);
-ILINE vec4  Madd(vec4 V0, vec4 V1, vec4 V2);
-ILINE vec4  Msub(vec4 V0, vec4 V1, vec4 V2);
-ILINE vec4  Min(vec4 V0, vec4 V1);
-ILINE vec4  Max(vec4 V0, vec4 V1);
-ILINE vec4  floatToint32(vec4 V);
-ILINE vec4  int32Tofloat(vec4 V);
-ILINE vec4  CmpLE(vec4 V0, vec4 V1);
-ILINE uint32    SignMask(vec4 V);
-ILINE vec4  And(vec4 V0, vec4 V1);
-ILINE vec4  AndNot(vec4 V0, vec4 V1);
-ILINE vec4  Or(vec4 V0, vec4 V1);
-ILINE vec4  Xor(vec4 V0, vec4 V1);
-ILINE vec4  Select(vec4 V0, vec4 V1, vec4 M);
-ILINE vec4  SelectSign(vec4 V0, vec4 V1, vec4 M);
-
-#endif
-
diff --git a/Code/CryEngine/Cry3DEngine/VMath_SSE.hpp b/Code/CryEngine/Cry3DEngine/VMath_SSE.hpp
deleted file mode 100644
index 3ef945f498..0000000000
--- a/Code/CryEngine/Cry3DEngine/VMath_SSE.hpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : unified vector math lib
-
-
-#ifndef __D_VMATH_SSE__
-#define __D_VMATH_SSE__
-
-#define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY
-//#include <smmintrin.h>
-
-typedef __m128  vec4;
-
-#include "VMath_Prototypes.hpp"
-
-#define SWIZZLEMASK4(N, X, Y, Z)   N##x    =   _MM_SHUFFLE(0, Z, Y, X), \
-    N##y    =   _MM_SHUFFLE(1, Z, Y, X),                                \
-    N##z    =   _MM_SHUFFLE(2, Z, Y, X),                                \
-    N##w    =   _MM_SHUFFLE(3, Z, Y, X),
-#define SWIZZLEMASK3(N, X, Y)     SWIZZLEMASK4(N##x, X, Y, 0) \
-    SWIZZLEMASK4(N##y, X, Y, 1)                               \
-    SWIZZLEMASK4(N##z, X, Y, 2)                               \
-    SWIZZLEMASK4(N##w, X, Y, 3)
-#define SWIZZLEMASK2(N, X)       SWIZZLEMASK3(N##x, X, 0) \
-    SWIZZLEMASK3(N##y, X, 1)                              \
-    SWIZZLEMASK3(N##z, X, 2)                              \
-    SWIZZLEMASK3(N##w, X, 3)
-#define SWIZZLEMASK1            SWIZZLEMASK2(x, 0) \
-    SWIZZLEMASK2(y, 1)                             \
-    SWIZZLEMASK2(z, 2)                             \
-    SWIZZLEMASK2(w, 3)
-
-enum ESwizzleMask
-{
-    SWIZZLEMASK1
-};
-enum ECacheLvl
-{
-    ECL_LVL1    =   _MM_HINT_T0,
-    ECL_LVL2    =   _MM_HINT_T1,
-    ECL_LVL3    =   _MM_HINT_T2,
-};
-#define BitX    1
-#define BitY    2
-#define BitZ    4
-#define BitW    8
-
-
-ILINE vec4              Vec4(float x)
-{
-    return _mm_set1_ps(x);
-}
-ILINE vec4              Vec4(float x, float y, float z, float w)
-{
-    return _mm_set_ps(w, z, y, x);
-}
-ILINE vec4              Vec4(uint32 x, uint32 y, uint32 z, uint32 w)
-{
-    return _mm_set_ps(*reinterpret_cast<float*>(&w),
-        *reinterpret_cast<float*>(&z),
-        *reinterpret_cast<float*>(&y),
-        *reinterpret_cast<float*>(&x));
-}
-ILINE float             Vec4float(vec4 V, uint32 Idx)
-{
-    union
-    {
-        vec4    Tmp;
-        float   V4[4];
-    } T;
-    T.Tmp   =   V;
-    return T.V4[Idx];
-}
-template<int Idx>
-ILINE float             Vec4float(vec4 V)
-{
-#if defined(VEC4_SSE4)
-    float f;
-    _MM_EXTRACT_FLOAT(f, V, Idx);
-    return f;
-#else
-    return Vec4float(V, Idx);
-#endif
-}
-template<int Idx>
-ILINE int32             Vec4int32(vec4 V)
-{
-#if defined(VEC4_SSE4)
-    return _mm_extract_ps(V, Idx);
-#else
-    return Vec4int32(V, Idx);
-#endif
-}
-ILINE int32             Vec4int32(vec4 V, uint32 Idx)
-{
-    union
-    {
-        vec4    Tmp;
-        int32   V4[4];
-    } T;
-    T.Tmp   =   V;
-    return T.V4[Idx];
-}
-ILINE vec4              Vec4Zero()
-{
-    return _mm_setzero_ps();
-}
-
-ILINE vec4              Vec4One()
-{
-    return _mm_set_ps(1.f, 1.f, 1.f, 1.f);
-}
-ILINE vec4              Vec4Four()
-{
-    return _mm_set_ps(4.f, 4.f, 4.f, 4.f);
-}
-ILINE vec4              Vec4ZeroOneTwoThree()
-{
-    return _mm_set_ps(3.f, 2.f, 1.f, 0.f);
-}
-ILINE vec4              Vec4FFFFFFFF()
-{
-    __m128 a = _mm_setzero_ps();
-    return _mm_cmpeq_ps(a, a);
-}
-ILINE vec4              Vec4Epsilon()
-{
-    return _mm_set_ps(FLT_EPSILON, FLT_EPSILON, FLT_EPSILON, FLT_EPSILON);
-}
-template<ECacheLvl L>
-ILINE void              Prefetch(const void* pData)
-{
-#if defined(LINUX) && !defined(__clang__)
-    _mm_prefetch(reinterpret_cast<const char*>(pData), (_mm_hint)L);
-#else
-    _mm_prefetch(reinterpret_cast<const char*>(pData), (int)L);
-#endif
-}
-template<ESwizzleMask M>
-ILINE vec4              Shuffle(vec4 V0, vec4 V1)
-{
-    return _mm_shuffle_ps(V0, V1, M);
-}
-template<ESwizzleMask M>
-ILINE vec4              Swizzle(vec4 V)
-{
-    return Shuffle<M>(V, V);
-}
-ILINE void              ExtractByteToFloat(vec4& rVOut0, vec4& rVOut1, vec4& rVOut2, vec4& rVOut3, vec4 VIn)
-{
-    const vec4 Zf       =       Vec4Zero();
-    const __m128i Z =   *reinterpret_cast<const __m128i*>(&Zf);
-    __m128i V0      =       _mm_unpacklo_epi8(*reinterpret_cast<const __m128i*>(&VIn), Z);
-    __m128i V1      =       _mm_unpackhi_epi8(*reinterpret_cast<const __m128i*>(&VIn), Z);
-    __m128i V00 =       _mm_unpacklo_epi8(V0, Z);
-    __m128i V01 =       _mm_unpackhi_epi8(V0, Z);
-    __m128i V10 =       _mm_unpacklo_epi8(V1, Z);
-    __m128i V11 =       _mm_unpackhi_epi8(V1, Z);
-    V00 =   _mm_srai_epi32(_mm_slli_epi32(V00, 24), 24);
-    V01 =   _mm_srai_epi32(_mm_slli_epi32(V01, 24), 24);
-    V10 =   _mm_srai_epi32(_mm_slli_epi32(V10, 24), 24);
-    V11 =   _mm_srai_epi32(_mm_slli_epi32(V11, 24), 24);
-    rVOut0  =   int32Tofloat(*reinterpret_cast<const vec4*>(&V00));
-    rVOut1  =   int32Tofloat(*reinterpret_cast<const vec4*>(&V01));
-    rVOut2  =   int32Tofloat(*reinterpret_cast<const vec4*>(&V10));
-    rVOut3  =   int32Tofloat(*reinterpret_cast<const vec4*>(&V11));
-}
-ILINE vec4              Add(vec4 V0, vec4 V1)
-{
-    return _mm_add_ps(V0, V1);
-}
-ILINE vec4              Sub(vec4 V0, vec4 V1)
-{
-    return _mm_sub_ps(V0, V1);
-}
-ILINE vec4              Mul(vec4 V0, vec4 V1)
-{
-    return _mm_mul_ps(V0, V1);
-}
-ILINE vec4              Div(vec4 V0, vec4 V1)
-{
-    return _mm_div_ps(V0, V1);
-}
-ILINE vec4              RcpFAST(vec4 V)
-{
-    return _mm_rcp_ps(V);
-}
-ILINE vec4              DivFAST(vec4 V0, vec4 V1)
-{
-    return Mul(V0, RcpFAST(V1));
-}
-ILINE vec4              Rcp(vec4 V)
-{
-    return Div(Vec4One(), V);
-}
-ILINE vec4              Madd(vec4 V0, vec4 V1, vec4 V2)
-{
-    return Add(V2, Mul(V0, V1));
-}
-ILINE vec4              Msub(vec4 V0, vec4 V1, vec4 V2)
-{
-    return Sub(Mul(V0, V1), V2);
-}
-ILINE vec4              Min(vec4 V0, vec4 V1)
-{
-    return _mm_min_ps(V0, V1);
-}
-ILINE vec4              Max(vec4 V0, vec4 V1)
-{
-    return _mm_max_ps(V0, V1);
-}
-ILINE vec4              floatToint32(vec4 V)
-{
-    const __m128i Tmp   =   _mm_cvttps_epi32(V);
-    return *reinterpret_cast<const vec4*>(&Tmp);
-}
-ILINE vec4              int32Tofloat(vec4 V)
-{
-    return _mm_cvtepi32_ps(*reinterpret_cast<__m128i*>(&V));
-}
-ILINE vec4              CmpLE(vec4 V0, vec4 V1)
-{
-    return _mm_cmple_ps(V0, V1);
-}
-ILINE vec4              CmpEq(vec4 V0, vec4 V1)
-{
-    return _mm_cmpeq_ps(V0, V1);
-}
-ILINE uint32                SignMask(vec4 V)
-{
-    return _mm_movemask_ps(V);
-}
-ILINE vec4              And(vec4 V0, vec4 V1)
-{
-    const __m128i Tmp   = _mm_and_si128(*reinterpret_cast<__m128i*>(&V0), *reinterpret_cast<__m128i*>(&V1));
-    return *reinterpret_cast<const vec4*>(&Tmp);
-}
-ILINE vec4              AndNot(vec4 V0, vec4 V1)
-{
-    const __m128i Tmp   = _mm_andnot_si128(*reinterpret_cast<__m128i*>(&V0), *reinterpret_cast<__m128i*>(&V1));
-    return *reinterpret_cast<const vec4*>(&Tmp);
-}
-ILINE vec4              Or(vec4 V0, vec4 V1)
-{
-    const __m128i Tmp   = _mm_or_si128(*reinterpret_cast<__m128i*>(&V0), *reinterpret_cast<__m128i*>(&V1));
-    return *reinterpret_cast<const vec4*>(&Tmp);
-}
-ILINE vec4              Xor(vec4 V0, vec4 V1)
-{
-    const __m128i Tmp   = _mm_xor_si128(*reinterpret_cast<__m128i*>(&V0), *reinterpret_cast<__m128i*>(&V1));
-    return *reinterpret_cast<const vec4*>(&Tmp);
-}
-ILINE vec4              ShiftAR(vec4 V, uint32 Count)
-{
-    const __m128i Tmp   =   _mm_srai_epi32(*reinterpret_cast<__m128i*>(&V), Count);
-    return *reinterpret_cast<const vec4*>(&Tmp);
-}
-template<int INDEX>
-ILINE vec4              Splat(vec4 V)
-{
-    CRY_ASSERT_MESSAGE(0, "Should not be reached!");
-    return Vec4FFFFFFFF();
-}
-template<>
-ILINE vec4              Splat<0>(vec4 V)
-{
-    return Shuffle<xxxx>(V, V);
-}
-template<>
-ILINE vec4              Splat<1>(vec4 V)
-{
-    return Shuffle<yyyy>(V, V);
-}
-template<>
-ILINE vec4              Splat<2>(vec4 V)
-{
-    return Shuffle<zzzz>(V, V);
-}
-template<>
-ILINE vec4              Splat<3>(vec4 V)
-{
-    return Shuffle<wwww>(V, V);
-}
-ILINE vec4              SelectBits(vec4 V0, vec4 V1, vec4 M)
-{
-#if defined(VEC4_SSE4)
-    return _mm_blendv_ps(V0, V1, M);
-#else
-    return Or(AndNot(M, V0), And(M, V1));
-#endif
-}
-ILINE vec4              Select(vec4 V0, vec4 V1, vec4 M)
-{
-#if !defined(VEC4_SSE4)
-    M   =   ShiftAR(M, 31);
-#endif
-    return SelectBits(V0, V1, M);
-}
-ILINE vec4              SelectSign(vec4 V0, vec4 V1, vec4 M)
-{
-#if defined(VEC4_SSE4)
-    return Select(V0, V1, M);
-#else
-    return Select(V0, V1, ShiftAR(M, 31));
-#endif
-}
-template <int M>
-ILINE vec4              SelectStatic(vec4 V0, vec4 V1)
-{
-#if defined(VEC4_SSE4)
-    return _mm_blend_ps(V0, V1, M);
-#else
-    const vec4 mask = Vec4(M & 0x1 ? ~0x0u : 0x0u, M & 0x2 ? ~0x0u : 0x0u, M & 0x4 ? ~0x0u : 0x0u, M & 0x8 ? ~0x0u : 0x0u);
-    return Select(V0, V1, mask);
-#endif
-}
-
-#endif
-
diff --git a/Code/CryEngine/Cry3DEngine/VisAreaCompile.cpp b/Code/CryEngine/Cry3DEngine/VisAreaCompile.cpp
deleted file mode 100644
index 34126d180c..0000000000
--- a/Code/CryEngine/Cry3DEngine/VisAreaCompile.cpp
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : visarea node loading/saving
-
-
-#include "Cry3DEngine_precompiled.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include <PakLoadDataUtils.h>
-
-#define VISAREA_NODE_CHUNK_VERSION 2
-
-#define VISAREA_FLAG_OCEAN_VISIBLE        BIT(0)
-#define VISAREA_FLAG_IGNORE_SKY_COLOR     BIT(1)
-#define VISAREA_FLAG_AFFECTEDBYOUTLIGHTS  BIT(2)
-#define VISAREA_FLAG_SKYONLY              BIT(3)
-#define VISAREA_FLAG_DOUBLESIDE           BIT(4)
-#define VISAREA_FLAG_USEININDOORS         BIT(5)
-#define VISAREA_FLAG_IGNORE_GI            BIT(6)
-#define VISAREA_FLAG_IGNORE_OUTDOOR_AO    BIT(7)
-
-#define MAX_VIS_AREA_CONNECTIONS_NUM 30
-
-struct SVisAreaChunk
-{
-    int     nChunkVersion;
-    AABB    boxArea, boxStatics;
-    char    sName[32];
-    int     nObjectsBlockSize;
-    int     arrConnectionsId[MAX_VIS_AREA_CONNECTIONS_NUM];
-    uint32  dwFlags;
-    float  fPortalBlending;
-    Vec3    vConnNormals[2];
-    float fHeight;
-    Vec3  vAmbColor;
-    float fViewDistRatio;
-
-    AUTO_STRUCT_INFO_LOCAL
-};
-
-#if ENGINE_ENABLE_COMPILATION
-int CVisArea::GetData(byte*& pData, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo)
-{
-    if (m_pObjectsTree)
-    {
-        m_pObjectsTree->CleanUpTree();
-    }
-
-    if (pData)
-    {
-        byte* pHead = pData;
-        SaveHeader(pData, nDataSize);
-
-        // save shape points num
-        int nPointsCount = m_lstShapePoints.Count();
-        SwapEndian(nPointsCount, eEndian);
-        memcpy(pData, &nPointsCount, sizeof(nPointsCount));
-        UPDATE_PTR_AND_SIZE(pData, nDataSize, sizeof(nPointsCount));
-
-        // save shape points
-        memcpy(pData, m_lstShapePoints.GetElements(), m_lstShapePoints.GetDataSize());
-        SwapEndian((Vec3*)pData, m_lstShapePoints.Count(), eEndian);
-        UPDATE_PTR_AND_SIZE(pData, nDataSize, m_lstShapePoints.GetDataSize());
-
-        SaveObjectsTree(pData, nDataSize, pStatObjTable, pMatTable, pStatInstGroupTable, eEndian, pExportInfo, pHead);
-    }
-    else // just count size
-    {
-        nDataSize += sizeof(SVisAreaChunk);
-
-        nDataSize += sizeof(int);
-        nDataSize += m_lstShapePoints.GetDataSize();
-
-        if (m_pObjectsTree)
-        {
-            m_pObjectsTree->GetData(pData, nDataSize, NULL, NULL, NULL, eEndian, pExportInfo);
-        }
-    }
-    return true;
-}
-#endif
-
-int CVisArea::Load(byte*& f, int& nDataSizeLeft, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo)
-{
-    return Load_T(f, nDataSizeLeft, pStatObjTable, pMatTable, eEndian, pExportInfo);
-}
-
-int CVisArea::Load(AZ::IO::HandleType& fileHandle, int& nDataSizeLeft, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo)
-{
-    return Load_T(fileHandle, nDataSizeLeft, pStatObjTable, pMatTable, eEndian, pExportInfo);
-}
-
-template <class T>
-int CVisArea::Load_T(T& f, int& nDataSizeLeft, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo)
-{
-    int objBlockSize = 0;
-    if (!LoadHeader_T(f, nDataSizeLeft, eEndian, objBlockSize))
-    {
-        return 0;
-    }
-
-    { // get shape points
-        int nPointsCount = 0;
-        if (!PakLoadDataUtils::LoadDataFromFile(&nPointsCount, 1, f, nDataSizeLeft, eEndian))
-        {
-            return 0;
-        }
-
-        // get shape points
-        m_lstShapePoints.PreAllocate(nPointsCount, nPointsCount);
-        if (!PakLoadDataUtils::LoadDataFromFile(m_lstShapePoints.GetElements(), nPointsCount, f, nDataSizeLeft, eEndian))
-        {
-            return 0;
-        }
-
-        UpdateClipVolume();
-    }
-
-    if (!LoadObjectsTree_T(f, nDataSizeLeft, 0, pStatObjTable, pMatTable, eEndian, pExportInfo, objBlockSize))
-    {
-        return 0;
-    }
-
-    return true;
-}
-
-
-const AABB* CVisArea::GetStaticObjectAABBox() const
-{
-    return &m_boxStatics;
-}
-#if ENGINE_ENABLE_COMPILATION
-int CVisArea::SaveHeader(byte*& pData, int& nDataSize)
-{
-    // save node info
-    SVisAreaChunk* pCunk = (SVisAreaChunk*)pData;
-    pCunk->nChunkVersion = VISAREA_NODE_CHUNK_VERSION;
-    pCunk->boxArea = m_boxArea;
-    UpdateGeometryBBox();
-    pCunk->boxStatics = m_boxStatics;
-    memset(pCunk->sName, 0, sizeof(pCunk->sName));
-    cry_strcpy(pCunk->sName, m_pVisAreaColdData->m_sName);
-    memcpy(pCunk->vConnNormals, m_vConnNormals, sizeof(pCunk->vConnNormals));
-    pCunk->fHeight = m_fHeight;
-    pCunk->vAmbColor = m_vAmbientColor;
-    pCunk->fViewDistRatio = m_fViewDistRatio;
-    pCunk->fPortalBlending = m_fPortalBlending;
-
-    pCunk->dwFlags = 0;
-    if (m_bOceanVisible)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_OCEAN_VISIBLE;
-    }
-    if (m_bIgnoreSky)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_IGNORE_SKY_COLOR;
-    }
-    if (m_bAffectedByOutLights)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_AFFECTEDBYOUTLIGHTS;
-    }
-    if (m_bSkyOnly)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_SKYONLY;
-    }
-    if (m_bDoubleSide)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_DOUBLESIDE;
-    }
-    if (m_bUseInIndoors)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_USEININDOORS;
-    }
-    if (m_bIgnoreGI)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_IGNORE_GI;
-    }
-    if (m_bIgnoreOutdoorAO)
-    {
-        pCunk->dwFlags |= VISAREA_FLAG_IGNORE_OUTDOOR_AO;
-    }
-
-    // transform connections id into pointers
-    PodArray<CVisArea*>& rAreas = IsPortal() ? GetVisAreaManager()->m_lstVisAreas : GetVisAreaManager()->m_lstPortals;
-    for (int i = 0; i < MAX_VIS_AREA_CONNECTIONS_NUM; i++)
-    {
-        pCunk->arrConnectionsId[i] = -1;
-    }
-    for (int i = 0; i < m_lstConnections.Count() && i < MAX_VIS_AREA_CONNECTIONS_NUM; i++)
-    {
-        IVisArea* pArea = m_lstConnections[i];
-        int nId;
-        for (nId = 0; nId < rAreas.Count(); nId++)
-        {
-            if (pArea == rAreas[nId])
-            {
-                break;
-            }
-        }
-
-        if (nId < rAreas.Count())
-        {
-            pCunk->arrConnectionsId[i] = nId;
-        }
-        else
-        {
-            pCunk->arrConnectionsId[i] = -1;
-            assert(!"Undefined connction");
-        }
-    }
-
-    UPDATE_PTR_AND_SIZE(pData, nDataSize, sizeof(SVisAreaChunk));
-
-    return true;
-}
-
-int CVisArea::SaveObjectsTree(byte*& pData, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo, byte* pHead)
-{
-    SVisAreaChunk* pCunk = (SVisAreaChunk*)pHead;
-
-    // save objects
-    pCunk->nObjectsBlockSize = 0;
-
-    // get data from objects tree
-    if (m_pObjectsTree)
-    {
-        byte* pTmp = NULL;
-        m_pObjectsTree->GetData(pTmp, pCunk->nObjectsBlockSize, NULL, NULL, NULL, eEndian, pExportInfo);
-        m_pObjectsTree->GetData(pData, nDataSize, pStatObjTable, pMatTable, pStatInstGroupTable, eEndian, pExportInfo); // UPDATE_PTR_AND_SIZE is inside
-    }
-
-    SwapEndian(*pCunk, eEndian);
-
-    return true;
-}
-#endif
-template <class T>
-int CVisArea::LoadHeader_T(T& f, int& nDataSizeLeft, EEndian eEndian, int& objBlockSize)
-{
-    SVisAreaChunk chunk;
-    if (!PakLoadDataUtils::LoadDataFromFile(&chunk, 1, f, nDataSizeLeft, eEndian))
-    {
-        return 0;
-    }
-
-    assert(chunk.nChunkVersion == VISAREA_NODE_CHUNK_VERSION);
-    if (chunk.nChunkVersion != VISAREA_NODE_CHUNK_VERSION)
-    {
-        return 0;
-    }
-
-    // get area info
-    m_boxArea = chunk.boxArea;
-    m_boxStatics = chunk.boxStatics;
-    chunk.sName[sizeof(chunk.sName) - 1] = 0;
-    cry_strcpy(m_pVisAreaColdData->m_sName, chunk.sName);
-    m_bThisIsPortal = strstr(m_pVisAreaColdData->m_sName, "portal") != 0;
-    m_bIgnoreSky = (strstr(m_pVisAreaColdData->m_sName, "ignoresky") != 0) || ((chunk.dwFlags & VISAREA_FLAG_IGNORE_SKY_COLOR) != 0);
-    memcpy(m_vConnNormals, chunk.vConnNormals, sizeof(m_vConnNormals));
-    m_fHeight = chunk.fHeight;
-    m_vAmbientColor = chunk.vAmbColor;
-    m_fViewDistRatio = chunk.fViewDistRatio;
-    m_fPortalBlending = chunk.fPortalBlending;
-
-    if (chunk.dwFlags == uint32(-1))
-    {
-        chunk.dwFlags = 0;
-    }
-    m_bOceanVisible = (chunk.dwFlags & VISAREA_FLAG_OCEAN_VISIBLE) != 0;
-
-    m_bAffectedByOutLights = (chunk.dwFlags & VISAREA_FLAG_AFFECTEDBYOUTLIGHTS) != 0;
-    m_bSkyOnly = (chunk.dwFlags & VISAREA_FLAG_SKYONLY) != 0;
-    m_bDoubleSide = (chunk.dwFlags & VISAREA_FLAG_DOUBLESIDE) != 0;
-    m_bUseInIndoors = (chunk.dwFlags & VISAREA_FLAG_USEININDOORS) != 0;
-    m_bIgnoreGI = (chunk.dwFlags & VISAREA_FLAG_IGNORE_GI) != 0;
-    m_bIgnoreOutdoorAO = (chunk.dwFlags & VISAREA_FLAG_IGNORE_OUTDOOR_AO) != 0;
-
-    objBlockSize = chunk.nObjectsBlockSize;
-
-    // convert connections id into pointers
-    PodArray<CVisArea*>& rAreas = IsPortal() ? GetVisAreaManager()->m_lstVisAreas : GetVisAreaManager()->m_lstPortals;
-    for (int i = 0; i < MAX_VIS_AREA_CONNECTIONS_NUM && rAreas.Count(); i++)
-    {
-        assert(chunk.arrConnectionsId[i] < rAreas.Count());
-        if (chunk.arrConnectionsId[i] >= 0)
-        {
-            m_lstConnections.Add(rAreas[chunk.arrConnectionsId[i]]);
-        }
-    }
-
-    return true;
-}
-
-template <class T>
-int CVisArea::LoadObjectsTree_T(T& f, int& nDataSizeLeft, int nSID, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo, const int objBlockSize)
-{
-    // mark tree as invalid since new visarea was just added
-    SAFE_DELETE(GetVisAreaManager()->m_pAABBTree);
-
-    AABB* pBox = (pExportInfo && !pExportInfo->areaBox.IsReset()) ? &pExportInfo->areaBox : NULL;
-
-    // load content of objects tree
-    if (!m_bEditor && objBlockSize > 4)
-    {
-        int nCurDataSize = nDataSizeLeft;
-        if (nCurDataSize > 0)
-        {
-            if (!m_pObjectsTree)
-            {
-                m_pObjectsTree = COctreeNode::Create(DEFAULT_SID, m_boxArea, this);
-            }
-            m_pObjectsTree->UpdateVisAreaSID(this, nSID);
-
-            if (pExportInfo != NULL && pExportInfo->pVisibleLayerMask != NULL && pExportInfo->pLayerIdTranslation)
-            {
-                SLayerVisibility visInfo;
-                visInfo.pLayerVisibilityMask = pExportInfo->pVisibleLayerMask;
-                visInfo.pLayerIdTranslation = pExportInfo->pLayerIdTranslation;
-                m_pObjectsTree->Load(f, nDataSizeLeft, pStatObjTable, pMatTable, eEndian, pBox, &visInfo);
-            }
-            else
-            {
-                m_pObjectsTree->Load(f, nDataSizeLeft, pStatObjTable, pMatTable, eEndian, pBox, NULL);
-            }
-
-            assert(nDataSizeLeft == (nCurDataSize - objBlockSize));
-        }
-    }
-    else if (objBlockSize > 0)
-    {
-        PakLoadDataUtils::LoadDataFromFile_Seek(objBlockSize, f, nDataSizeLeft, eEndian);
-    }
-
-    return true;
-}
-
-VisAreaGUID CVisArea::GetGUIDFromFile(byte* f, EEndian eEndian)
-{
-    SVisAreaChunk* pChunk = (SVisAreaChunk*)f;
-    SwapEndian(pChunk, sizeof(SVisAreaChunk), eEndian);
-
-    assert(pChunk->nChunkVersion == VISAREA_NODE_CHUNK_VERSION);
-    if (pChunk->nChunkVersion != VISAREA_NODE_CHUNK_VERSION)
-    {
-        return 0;
-    }
-
-    VisAreaGUID guid = *(VisAreaGUID*)(f + sizeof(SVisAreaChunk));
-    SwapEndian(&guid, sizeof(VisAreaGUID), eEndian);
-    return guid;
-}
-
-//////////////////////////////////////////////////////////////////////
-// Segmented World
-#if ENGINE_ENABLE_COMPILATION
-int CVisArea::GetSegmentData([[maybe_unused]] byte*& pData, [[maybe_unused]] int& nDataSize, [[maybe_unused]] std::vector<IStatObj*>* pStatObjTable, [[maybe_unused]] std::vector<_smart_ptr<IMaterial>>* pMatTable, [[maybe_unused]] std::vector<IStatInstGroup*>* pStatInstGroupTable, [[maybe_unused]] EEndian eEndian, [[maybe_unused]] SHotUpdateInfo* pExportInfo)
-{
-    CRY_ASSERT(false); // SegmentedWorld has been removed
-    return false;
-}
-#endif
-int CSWVisArea::Load(byte*& f, int& nDataSizeLeft, [[maybe_unused]] int nSID, [[maybe_unused]] std::vector<IStatObj*>* pStatObjTable, [[maybe_unused]] std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, [[maybe_unused]] SHotUpdateInfo* pExportInfo, [[maybe_unused]] const Vec2& indexOffset)
-{
-    int objBlockSize = 0;
-    if (!LoadHeader_T(f, nDataSizeLeft, eEndian, objBlockSize))
-    {
-        return 0;
-    }
-
-    CRY_ASSERT(false); // SegmentedWorld has been removed
-    return false;
-}
-
-#include "TypeInfo_impl.h"
-#include "VisAreaCompile_info.h"
-
-
diff --git a/Code/CryEngine/Cry3DEngine/VisAreaCompile_info.h b/Code/CryEngine/Cry3DEngine/VisAreaCompile_info.h
deleted file mode 100644
index 9435357dbc..0000000000
--- a/Code/CryEngine/Cry3DEngine/VisAreaCompile_info.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_VISAREACOMPILE_INFO_H
-#define CRYINCLUDE_CRY3DENGINE_VISAREACOMPILE_INFO_H
-#pragma once
-
-STRUCT_INFO_BEGIN(SVisAreaChunk)
-STRUCT_VAR_INFO(nChunkVersion, TYPE_INFO(int))
-STRUCT_VAR_INFO(boxArea, TYPE_INFO(AABB))
-STRUCT_VAR_INFO(boxStatics, TYPE_INFO(AABB))
-STRUCT_VAR_INFO(sName, TYPE_ARRAY(32, TYPE_INFO(char)))
-STRUCT_VAR_INFO(nObjectsBlockSize, TYPE_INFO(int))
-STRUCT_VAR_INFO(arrConnectionsId, TYPE_ARRAY(30, TYPE_INFO(int)))
-STRUCT_VAR_INFO(dwFlags, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(fPortalBlending, TYPE_INFO(float))
-STRUCT_VAR_INFO(vConnNormals, TYPE_ARRAY(2, TYPE_INFO(Vec3)))
-STRUCT_VAR_INFO(fHeight, TYPE_INFO(float))
-STRUCT_VAR_INFO(vAmbColor, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(fViewDistRatio, TYPE_INFO(float))
-STRUCT_INFO_END(SVisAreaChunk)
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_VISAREACOMPILE_INFO_H
diff --git a/Code/CryEngine/Cry3DEngine/VisAreaMan.cpp b/Code/CryEngine/Cry3DEngine/VisAreaMan.cpp
deleted file mode 100644
index bf1fd5ff52..0000000000
--- a/Code/CryEngine/Cry3DEngine/VisAreaMan.cpp
+++ /dev/null
@@ -1,2171 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "3dEngine.h"
-#include "TimeOfDay.h"
-#include "AABBSV.h"
-
-#define DEFAULT_INITIAL_PORTALS     1
-#define DEFAULT_INITIAL_VISAREAS    1
-#define DEFAULT_INITIAL_OCCLAREAS 1
-
-
-CVisAreaManager::CVisAreaManager()
-{
-    m_pCurPortal = m_pCurArea = 0;
-    m_bOutdoorVisible = false;
-    m_bSkyVisible = false;
-    m_bSunIsNeeded = false;
-    m_bOceanVisible = false;
-    m_pAABBTree = NULL;
-
-    m_visAreas.PreAllocate(DEFAULT_INITIAL_VISAREAS);
-    m_visAreaColdData.PreAllocate(DEFAULT_INITIAL_VISAREAS);
-
-    m_portals.PreAllocate(DEFAULT_INITIAL_PORTALS);
-    m_portalColdData.PreAllocate(DEFAULT_INITIAL_PORTALS);
-
-    m_occlAreas.PreAllocate(DEFAULT_INITIAL_OCCLAREAS);
-    m_occlAreaColdData.PreAllocate(DEFAULT_INITIAL_OCCLAREAS);
-
-    m_segVisAreas.Clear();
-    m_segPortals.Clear();
-    m_segOcclAreas.Clear();
-}
-
-void CVisAreaManager::DeleteAllVisAreas()
-{
-    for (int i = 0; i < m_lstVisAreas.Count(); i++)
-    {
-        if (m_visAreas.Find(m_lstVisAreas[i]) >= 0)
-        {
-            delete m_lstVisAreas[i];
-        }
-        else
-        {
-            delete m_lstVisAreas[i]->GetColdData();
-            delete m_lstVisAreas[i];
-        }
-    }
-
-    m_visAreas.Clear();
-    m_visAreaColdData.Clear();
-    m_lstVisAreas.Clear();
-
-
-    for (int i = 0; i < m_lstPortals.Count(); i++)
-    {
-        if (m_portals.Find(m_lstPortals[i]) >= 0)
-        {
-            delete m_lstPortals[i];
-        }
-        else
-        {
-            delete m_lstPortals[i]->GetColdData();
-            delete m_lstPortals[i];
-        }
-    }
-
-    m_portals.Clear();
-    m_portalColdData.Clear();
-    m_lstPortals.Clear();
-
-
-    for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-    {
-        if (m_occlAreas.Find(m_lstOcclAreas[i]) >= 0)
-        {
-            delete m_lstOcclAreas[i];
-        }
-        else
-        {
-            delete m_lstOcclAreas[i]->GetColdData();
-            delete m_lstOcclAreas[i];
-        }
-    }
-
-    m_occlAreas.Clear();
-    m_occlAreaColdData.Clear();
-    m_lstOcclAreas.Clear();
-
-    stl::free_container(CVisArea::m_lUnavailableAreas);
-}
-
-void SAABBTreeNode::OffsetPosition(const Vec3& delta)
-{
-    nodeBox.Move(delta);
-    if (!nodeAreas.Count())
-    {
-        for (int i = 0; i < 2; i++)
-        {
-            if (arrChilds[i])
-            {
-                arrChilds[i]->OffsetPosition(delta);
-            }
-        }
-    }
-}
-
-CVisAreaManager::~CVisAreaManager()
-{
-    if (GetRenderer())
-    {
-        GetRenderer()->EF_ClearDeferredClipVolumesList();
-    }
-
-    DeleteAllVisAreas();
-
-    delete m_pAABBTree;
-    m_pAABBTree = NULL;
-}
-
-SAABBTreeNode::SAABBTreeNode(PodArray<CVisArea*>& lstAreas, AABB box, int nRecursion)
-{
-    memset(this, 0, sizeof(*this));
-
-    nodeBox = box;
-
-    nRecursion++;
-    if (nRecursion > 8 || lstAreas.Count() < 8)
-    {
-        nodeAreas.AddList(lstAreas);
-        return;
-    }
-
-    PodArray<CVisArea*> lstAreas0, lstAreas1;
-    Vec3 vSize = nodeBox.GetSize();
-    Vec3 vCenter = nodeBox.GetCenter();
-
-    AABB nodeBox0 = nodeBox;
-    AABB nodeBox1 = nodeBox;
-
-    if (vSize.x >= vSize.y && vSize.x >= vSize.z)
-    {
-        nodeBox0.min.x = vCenter.x;
-        nodeBox1.max.x = vCenter.x;
-    }
-    else if (vSize.y >= vSize.x && vSize.y >= vSize.z)
-    {
-        nodeBox0.min.y = vCenter.y;
-        nodeBox1.max.y = vCenter.y;
-    }
-    else
-    {
-        nodeBox0.min.z = vCenter.z;
-        nodeBox1.max.z = vCenter.z;
-    }
-
-    for (int i = 0; i < lstAreas.Count(); i++)
-    {
-        if (Overlap::AABB_AABB(nodeBox0, *lstAreas[i]->GetAABBox()))
-        {
-            lstAreas0.Add(lstAreas[i]);
-        }
-
-        if (Overlap::AABB_AABB(nodeBox1, *lstAreas[i]->GetAABBox()))
-        {
-            lstAreas1.Add(lstAreas[i]);
-        }
-    }
-
-    if (lstAreas0.Count())
-    {
-        arrChilds[0] = new SAABBTreeNode(lstAreas0, nodeBox0, nRecursion);
-    }
-
-    if (lstAreas1.Count())
-    {
-        arrChilds[1] = new SAABBTreeNode(lstAreas1, nodeBox1, nRecursion);
-    }
-}
-
-SAABBTreeNode::~SAABBTreeNode()
-{
-    delete arrChilds[0];
-    delete arrChilds[1];
-}
-
-SAABBTreeNode* SAABBTreeNode::GetTopNode(const AABB& box, void** pNodeCache)
-{
-    AABB boxClip = box;
-    boxClip.ClipToBox(nodeBox);
-
-    SAABBTreeNode* pNode = this;
-    if (pNodeCache)
-    {
-        pNode = (SAABBTreeNode*)*pNodeCache;
-        if (!pNode || !pNode->nodeBox.ContainsBox(boxClip))
-        {
-            pNode = this;
-        }
-    }
-
-    // Find top node containing box.
-    for (;; )
-    {
-        int i;
-        for (i = 0; i < 2; i++)
-        {
-            if (pNode->arrChilds[i] && pNode->arrChilds[i]->nodeBox.ContainsBox(boxClip))
-            {
-                pNode = pNode->arrChilds[i];
-                break;
-            }
-        }
-        if (i == 2)
-        {
-            break;
-        }
-    }
-
-    if (pNodeCache)
-    {
-        *(SAABBTreeNode**)pNodeCache = pNode;
-    }
-    return pNode;
-}
-
-bool SAABBTreeNode::IntersectsVisAreas(const AABB& box)
-{
-    if (nodeBox.IsIntersectBox(box))
-    {
-        if (nodeAreas.Count())
-        { // leaf
-            for (int i = 0; i < nodeAreas.Count(); i++)
-            {
-                if (nodeAreas[i]->m_bActive && nodeAreas[i]->m_boxArea.IsIntersectBox(box))
-                {
-                    return true;
-                }
-            }
-        }
-        else
-        { // node
-            for (int i = 0; i < 2; i++)
-            {
-                if (arrChilds[i])
-                {
-                    if (arrChilds[i]->IntersectsVisAreas(box))
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-    return false;
-}
-
-int SAABBTreeNode::ClipOutsideVisAreas(Sphere& sphere, Vec3 const& vNormal)
-{
-    int nClipped = 0;
-
-    if (sphere.radius > FLT_MAX * 0.01f || Overlap::Sphere_AABB(sphere, nodeBox))
-    {
-        if (nodeAreas.Count())
-        { // leaf
-            for (int i = 0; i < nodeAreas.Count(); i++)
-            {
-                if (nodeAreas[i]->m_bActive && Overlap::Sphere_AABB(sphere, nodeAreas[i]->m_boxArea))
-                {
-                    nClipped += nodeAreas[i]->ClipToVisArea(false, sphere, vNormal);
-                }
-            }
-        }
-        else
-        { // node
-            for (int i = 0; i < 2; i++)
-            {
-                if (arrChilds[i])
-                {
-                    nClipped += arrChilds[i]->ClipOutsideVisAreas(sphere, vNormal);
-                }
-            }
-        }
-    }
-
-    return nClipped;
-}
-
-void CVisAreaManager::UpdateAABBTree()
-{
-    delete m_pAABBTree;
-    PodArray<CVisArea*> lstAreas;
-    lstAreas.AddList(m_lstPortals);
-    lstAreas.AddList(m_lstVisAreas);
-
-    AABB nodeBox;
-    nodeBox.min = Vec3(1000000, 1000000, 1000000);
-    nodeBox.max = -nodeBox.min;
-    for (int i = 0; i < lstAreas.Count(); i++)
-    {
-        nodeBox.Add(*lstAreas[i]->GetAABBox());
-    }
-
-    m_pAABBTree = new SAABBTreeNode(lstAreas, nodeBox);
-}
-
-bool CVisAreaManager::IsEntityVisible(IRenderNode* pEnt)
-{
-    if (GetCVars()->e_Portals == 3)
-    {
-        return true;
-    }
-
-    if (!pEnt->GetEntityVisArea())
-    {
-        return IsOutdoorAreasVisible();
-    }
-
-    return true;
-}
-
-void CVisAreaManager::SetCurAreas(const SRenderingPassInfo& passInfo)
-{
-    m_pCurArea = 0;
-    m_pCurPortal = 0;
-
-    if (!GetCVars()->e_Portals)
-    {
-        return;
-    }
-
-    if (!m_pAABBTree)
-    {
-        UpdateAABBTree();
-    }
-
-    CVisArea* pFound = m_pAABBTree->FindVisarea(passInfo.GetCamera().GetOccPos());
-
-#ifdef _DEBUG
-
-    // find camera portal id
-    for (int v = 0; v < m_lstPortals.Count(); v++)
-    {
-        if (m_lstPortals[v]->m_bActive &&  m_lstPortals[v]->IsPointInsideVisArea(passInfo.GetCamera().GetOccPos()))
-        {
-            m_pCurPortal = m_lstPortals[v];
-            break;
-        }
-    }
-
-    // if not inside any portal - try to find area
-    if (!m_pCurPortal)
-    {
-        //      int nFoundAreasNum = 0;
-
-        // find camera area
-        for (int nVolumeId = 0; nVolumeId < m_lstVisAreas.Count(); nVolumeId++)
-        {
-            if (m_lstVisAreas[nVolumeId]->IsPointInsideVisArea(passInfo.GetCamera().GetOccPos()))
-            {
-                //          nFoundAreasNum++;
-                m_pCurArea = m_lstVisAreas[nVolumeId];
-                break;
-            }
-        }
-
-        //      if(nFoundAreasNum>1) // if more than one area found - set cur area to undefined
-        { // todo: try to set joining portal as current
-          //    m_pCurArea = 0;
-        }
-    }
-
-    assert(pFound == m_pCurArea || pFound == m_pCurPortal);
-
-#endif // _DEBUG
-
-    if (pFound)
-    {
-        if (pFound->IsPortal())
-        {
-            m_pCurPortal = pFound;
-        }
-        else
-        {
-            m_pCurArea = pFound;
-        }
-    }
-
-    // camera is in outdoors
-    m_lstActiveEntransePortals.Clear();
-    if (!m_pCurArea && !m_pCurPortal)
-    {
-        MakeActiveEntransePortalsList(&passInfo.GetCamera(), m_lstActiveEntransePortals, 0, passInfo);
-    }
-
-    /*
-        if(m_pCurArea)
-        {
-            IVisArea * arrAreas[8];
-            int nres = m_pCurArea->GetVisAreaConnections(arrAreas, 8);
-            nres=nres;
-        }
-        DefineTrees();*/
-
-    /*  if(GetCVars()->e_Portals == 4)
-        {
-            if(m_pCurPortal)
-            {
-                IVisArea * arrAreas[64];
-                int nConnections = m_pCurPortal->GetVisAreaConnections(arrAreas,64);
-                PrintMessage("CurPortal = %s, nConnections = %d", m_pCurPortal->m_sName, nConnections);
-            }
-
-            if(m_pCurArea)
-            {
-                IVisArea * arrAreas[64];
-                int nConnections = m_pCurArea->GetVisAreaConnections(arrAreas,64);
-                PrintMessage("CurArea = %s, nRes = %d", m_pCurArea->m_sName, nConnections);
-            }
-        }*/
-}
-
-bool CVisAreaManager::IsSkyVisible()
-{
-    return m_bSkyVisible;
-}
-
-bool CVisAreaManager::IsOceanVisible()
-{
-    return m_bOceanVisible;
-}
-
-bool CVisAreaManager::IsOutdoorAreasVisible()
-{
-    if (!m_pCurArea && !m_pCurPortal)
-    {
-        m_bOutdoorVisible = true;
-        return m_bOutdoorVisible; // camera not in the areas
-    }
-
-    if (m_pCurPortal && m_pCurPortal->m_lstConnections.Count() == 1)
-    {
-        m_bOutdoorVisible = true;
-        return m_bOutdoorVisible; // camera is in exit portal
-    }
-
-    if (m_bOutdoorVisible)
-    {
-        return true; // exit is visible
-    }
-    // note: outdoor camera is no modified in this case
-    return false;
-}
-
-/*void CVisAreaManager::SetAreaFogVolume(CTerrain * pTerrain, CVisArea * pVisArea)
-{
-    pVisArea->m_pFogVolume=0;
-    for(int f=0; f<Get3DEngine()->GetFogVolumes().Count(); f++)
-    {
-        const Vec3 & v1Min = Get3DEngine()->GetFogVolumes()[f].box.min;
-        const Vec3 & v1Max = Get3DEngine()->GetFogVolumes()[f].box.max;
-        const Vec3 & v2Min = pVisArea->m_boxArea.min;
-        const Vec3 & v2Max = pVisArea->m_boxArea.max;
-
-        if(v1Max.x>v2Min.x && v2Max.x>v1Min.x)
-        if(v1Max.y>v2Min.y && v2Max.y>v1Min.y)
-        if(v1Max.z>v2Min.z && v2Max.z>v1Min.z)
-        if(!Get3DEngine()->GetFogVolumes()[f].bOcean)
-        {
-      Vec3 arrVerts3d[8] =
-      {
-        Vec3(v1Min.x,v1Min.y,v1Min.z),
-        Vec3(v1Min.x,v1Max.y,v1Min.z),
-        Vec3(v1Max.x,v1Min.y,v1Min.z),
-        Vec3(v1Max.x,v1Max.y,v1Min.z),
-        Vec3(v1Min.x,v1Min.y,v1Max.z),
-        Vec3(v1Min.x,v1Max.y,v1Max.z),
-        Vec3(v1Max.x,v1Min.y,v1Max.z),
-        Vec3(v1Max.x,v1Max.y,v1Max.z)
-      };
-
-      bool bIntersect = false;
-      for(int i=0; i<8; i++)
-        if(pVisArea->IsPointInsideVisArea(arrVerts3d[i]))
-        {
-          bIntersect = true;
-          break;
-        }
-
-      if(!bIntersect)
-        if(pVisArea->IsPointInsideVisArea((v1Min+v1Max)*0.5f))
-          bIntersect = true;
-
-      if(!bIntersect)
-      {
-        for(int i=0; i<pVisArea->m_lstShapePoints.Count(); i++)
-          if(Get3DEngine()->GetFogVolumes()[f].IsInsideBBox(pVisArea->m_lstShapePoints[i]))
-          {
-            bIntersect = true;
-            break;
-          }
-      }
-
-            if(!bIntersect)
-            {
-                Vec3 vCenter = (pVisArea->m_boxArea.min+pVisArea->m_boxArea.max)*0.5f;
-                if(Get3DEngine()->GetFogVolumes()[f].IsInsideBBox(vCenter))
-                    bIntersect = true;
-            }
-
-      if(bIntersect)
-      {
-              pVisArea->m_pFogVolume = &Get3DEngine()->GetFogVolumes()[f];
-              Get3DEngine()->GetFogVolumes()[f].bIndoorOnly = true;
-              pTerrain->UnregisterFogVolumeFromOutdoor(&Get3DEngine()->GetFogVolumes()[f]);
-              break;
-      }
-        }
-    }
-}*/
-
-void CVisAreaManager::PortalsDrawDebug()
-{
-    UpdateConnections();
-    /*
-        if(m_pCurArea)
-        {
-            for(int p=0; p<m_pCurArea->m_lstConnections.Count(); p++)
-            {
-                CVisArea * pPortal = m_pCurArea->m_lstConnections[p];
-                float fBlink = gEnv->pTimer->GetFrameStartTime().GetPeriodicFraction(1.0f)>0.5f ? 1.0f : 0.0f;
-                float fError = pPortal->IsPortalValid() ? 1.0f : fBlink;
-                GetRenderer()->SetMaterialColor(fError,fError*(pPortal->m_lstConnections.Count()<2),0,0.25f);
-                DrawBBox(pPortal->m_boxArea.min, pPortal->m_boxArea.max, DPRIM_SOLID_BOX);
-                GetRenderer()->DrawLabel((pPortal->m_boxArea.min+ pPortal->m_boxArea.max)*0.5f,
-                    2,pPortal->m_sName);
-            }
-        }
-        else*/
-    {
-        // debug draw areas
-        GetRenderer()->SetMaterialColor(0, 1, 0, 0.25f);
-        Vec3 oneVec(1, 1, 1);
-        for (int v = 0; v < m_lstVisAreas.Count(); v++)
-        {
-            DrawBBox(m_lstVisAreas[v]->m_boxArea.min, m_lstVisAreas[v]->m_boxArea.max);//, DPRIM_SOLID_BOX);
-            GetRenderer()->DrawLabelEx((m_lstVisAreas[v]->m_boxArea.min + m_lstVisAreas[v]->m_boxArea.max) * 0.5f,
-                1, (float*)&oneVec, 0, 1, m_lstVisAreas[v]->GetName());
-
-            GetRenderer()->SetMaterialColor(0, 1, 0, 0.25f);
-            DrawBBox(m_lstVisAreas[v]->m_boxStatics, Col_LightGray);
-        }
-
-        // debug draw portals
-        for (int v = 0; v < m_lstPortals.Count(); v++)
-        {
-            CVisArea* pPortal = m_lstPortals[v];
-
-            float fBlink = gEnv->pTimer->GetFrameStartTime().GetPeriodicFraction(1.0f) > 0.5f ? 1.0f : 0.0f;
-            float fError = pPortal->IsPortalValid() ? 1.f : fBlink;
-
-            ColorB col(
-                (int)clamp_tpl(fError * 255.0f, 0.0f, 255.0f),
-                (int)clamp_tpl(fError * (pPortal->m_lstConnections.Count() < 2) * 255.0f, 0.0f, 255.0f),
-                0,
-                64);
-            DrawBBox(pPortal->m_boxArea.min, pPortal->m_boxArea.max, col);
-
-            GetRenderer()->DrawLabelEx((pPortal->m_boxArea.min + pPortal->m_boxArea.max) * 0.5f,
-                1, (float*)&oneVec, 0, 1, pPortal->GetName());
-
-            Vec3 vCenter = (pPortal->m_boxArea.min + pPortal->m_boxArea.max) * 0.5f;
-            DrawBBox(vCenter - Vec3(0.1f, 0.1f, 0.1f), vCenter + Vec3(0.1f, 0.1f, 0.1f));
-
-            int nConnections = pPortal->m_lstConnections.Count();
-            if (nConnections == 1)
-            {
-                col = ColorB(0, 255, 0, 64);
-            }
-            else
-            {
-                col = ColorB(0, 0, 255, 64);
-            }
-
-            for (int i = 0; i < nConnections && i < 2; i++)
-            {
-                DrawLine(vCenter, vCenter + pPortal->m_vConnNormals[i], col);
-            }
-
-            DrawBBox(pPortal->m_boxStatics.min, pPortal->m_boxStatics.max, col);
-        }
-
-        /*
-                // debug draw area shape
-                GetRenderer()->SetMaterialColor(0,0,1,0.25f);
-                for(int v=0; v<m_lstVisAreas.Count(); v++)
-                for(int p=0; p<m_lstVisAreas[v]->m_lstShapePoints.Count(); p++)
-                    GetRenderer()->DrawLabel(m_lstVisAreas[v]->m_lstShapePoints[p], 2,"%d", p);
-                for(int v=0; v<m_lstPortals.Count(); v++)
-                for(int p=0; p<m_lstPortals[v]->m_lstShapePoints.Count(); p++)
-                    GetRenderer()->DrawLabel(m_lstPortals[v]->m_lstShapePoints[p], 2,"%d", p);*/
-    }
-}
-
-
-void CVisAreaManager::DrawVisibleSectors(const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    for (int i = 0; i < m_lstVisibleAreas.Count(); i++)
-    {
-        CVisArea* pArea = m_lstVisibleAreas[i];
-        if (pArea->m_pObjectsTree)
-        {
-            for (int c = 0; c < pArea->m_lstCurCamerasLen; c++)
-            {
-                rendItemSorter.IncreaseOctreeCounter();
-                // create a new RenderingPassInfo object, which a camera matching the visarea
-                pArea->m_pObjectsTree->Render_Object_Nodes(false, OCTREENODE_RENDER_FLAG_OBJECTS, SRenderingPassInfo::CreateTempRenderingInfo(CVisArea::s_tmpCameras[pArea->m_lstCurCamerasIdx + c], passInfo), rendItemSorter);
-            }
-        }
-    }
-
-    rendItemSorter.IncreaseGroupCounter();
-}
-
-
-void CVisAreaManager::CheckVis(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE_LEGACYONLY;
-    AZ_TRACE_METHOD();
-
-    if (passInfo.IsGeneralPass())
-    {
-        m_bOutdoorVisible = false;
-        m_bSkyVisible = false;
-        m_bOceanVisible = false;
-        CVisArea::s_tmpCameras.Clear();
-    }
-
-    m_lstOutdoorPortalCameras.Clear();
-    m_lstVisibleAreas.Clear();
-    m_bSunIsNeeded = false;
-    GetRenderer()->EF_ClearDeferredClipVolumesList();
-
-    SetCurAreas(passInfo);
-
-    CCamera camRoot = passInfo.GetCamera();
-    camRoot.m_ScissorInfo.x1 = 0;
-    camRoot.m_ScissorInfo.y1 = 0;
-    camRoot.m_ScissorInfo.x2 = GetRenderer()->GetWidth(); // todo: use values from camera
-    camRoot.m_ScissorInfo.y2 = GetRenderer()->GetHeight();
-
-    if (GetCVars()->e_Portals == 3)
-    {   // draw everything for debug
-        for (int i = 0; i < m_lstVisAreas.Count(); i++)
-        {
-            if (camRoot.IsAABBVisible_F(AABB(m_lstVisAreas[i]->m_boxArea.min, m_lstVisAreas[i]->m_boxArea.max)))
-            {
-                m_lstVisAreas[i]->PreRender(0, camRoot, 0, m_pCurPortal, &m_bOutdoorVisible, &m_lstOutdoorPortalCameras, &m_bSkyVisible, &m_bOceanVisible, m_lstVisibleAreas, passInfo);
-            }
-        }
-
-        for (int i = 0; i < m_lstPortals.Count(); i++)
-        {
-            if (camRoot.IsAABBVisible_F(AABB(m_lstPortals[i]->m_boxArea.min, m_lstPortals[i]->m_boxArea.max)))
-            {
-                m_lstPortals[i]->PreRender(0, camRoot, 0, m_pCurPortal, &m_bOutdoorVisible, &m_lstOutdoorPortalCameras, &m_bSkyVisible, &m_bOceanVisible, m_lstVisibleAreas, passInfo);
-            }
-        }
-    }
-    else
-    {
-        if (passInfo.IsRecursivePass())
-        { // use another starting point for reflections
-            CVisArea* pVisArea = (CVisArea*)GetVisAreaFromPos(camRoot.GetOccPos());
-            if (pVisArea)
-            {
-                pVisArea->PreRender(3, camRoot, 0, m_pCurPortal, &m_bOutdoorVisible, &m_lstOutdoorPortalCameras, &m_bSkyVisible, &m_bOceanVisible, m_lstVisibleAreas, passInfo);
-            }
-        }
-        else if (m_pCurArea)
-        { // camera inside some sector
-            m_pCurArea->PreRender(GetCVars()->e_PortalsMaxRecursion, camRoot, 0, m_pCurPortal, &m_bOutdoorVisible, &m_lstOutdoorPortalCameras, &m_bSkyVisible, &m_bOceanVisible, m_lstVisibleAreas, passInfo);
-
-            for (int ii = 0; ii < m_lstOutdoorPortalCameras.Count(); ii++) // process all exit portals
-            { // for each portal build list of potentially visible entrances into other areas
-                MakeActiveEntransePortalsList(&m_lstOutdoorPortalCameras[ii], m_lstActiveEntransePortals, (CVisArea*)m_lstOutdoorPortalCameras[ii].m_pPortal, passInfo);
-                for (int i = 0; i < m_lstActiveEntransePortals.Count(); i++) // entrance into another building is visible
-                {
-                    m_lstActiveEntransePortals[i]->PreRender(i == 0 ? 5 : 1,
-                        m_lstOutdoorPortalCameras[ii], 0, m_pCurPortal, 0, 0, 0, 0, m_lstVisibleAreas, passInfo);
-                }
-            }
-
-            // reset scissor if skybox is visible also thru skyboxonly portal
-            if (m_bSkyVisible && m_lstOutdoorPortalCameras.Count() == 1)
-            {
-                m_lstOutdoorPortalCameras[0].m_ScissorInfo.x1 =
-                    m_lstOutdoorPortalCameras[0].m_ScissorInfo.x2 =
-                        m_lstOutdoorPortalCameras[0].m_ScissorInfo.y1 =
-                            m_lstOutdoorPortalCameras[0].m_ScissorInfo.y2 = 0;
-            }
-        }
-        else if (m_pCurPortal)
-        {   // camera inside some portal
-            m_pCurPortal->PreRender(GetCVars()->e_PortalsMaxRecursion - 1, camRoot, 0, m_pCurPortal, &m_bOutdoorVisible, &m_lstOutdoorPortalCameras, &m_bSkyVisible, &m_bOceanVisible, m_lstVisibleAreas, passInfo);
-
-            if (m_pCurPortal->m_lstConnections.Count() == 1)
-            {
-                m_lstOutdoorPortalCameras.Clear(); // camera in outdoor
-            }
-            if (m_pCurPortal->m_lstConnections.Count() == 1 || m_lstOutdoorPortalCameras.Count())
-            { // if camera is in exit portal or exit is visible
-                MakeActiveEntransePortalsList(m_lstOutdoorPortalCameras.Count() ? &m_lstOutdoorPortalCameras[0] : &camRoot,
-                    m_lstActiveEntransePortals,
-                    m_lstOutdoorPortalCameras.Count() ? (CVisArea*)m_lstOutdoorPortalCameras[0].m_pPortal : m_pCurPortal, passInfo);
-                for (int i = 0; i < m_lstActiveEntransePortals.Count(); i++) // entrance into another building is visible
-                {
-                    m_lstActiveEntransePortals[i]->PreRender(i == 0 ? 5 : 1,
-                        m_lstOutdoorPortalCameras.Count() ? m_lstOutdoorPortalCameras[0] : camRoot, 0, m_pCurPortal, 0, 0, 0, 0, m_lstVisibleAreas, passInfo);
-                }
-                //              m_lstOutdoorPortalCameras.Clear();  // otherwise ocean in fleet was not scissored
-            }
-        }
-        else if (m_lstActiveEntransePortals.Count())
-        { // camera in outdoors - process visible entrance portals
-            for (int i = 0; i < m_lstActiveEntransePortals.Count(); i++)
-            {
-                m_lstActiveEntransePortals[i]->PreRender(5, camRoot, 0, m_lstActiveEntransePortals[i], &m_bOutdoorVisible, &m_lstOutdoorPortalCameras, &m_bSkyVisible, &m_bOceanVisible, m_lstVisibleAreas, passInfo);
-            }
-            m_lstActiveEntransePortals.Clear();
-
-            // do not recurse to another building since we already processed all potential entrances
-            m_lstOutdoorPortalCameras.Clear(); // use default camera
-            m_bOutdoorVisible = true;
-        }
-    }
-
-    if (GetCVars()->e_Portals == 2)
-    {
-        PortalsDrawDebug();
-    }
-}
-
-void CVisAreaManager::ActivatePortal(const Vec3& vPos, bool bActivate, const char* szEntityName)
-{
-    //  bool bFound = false;
-
-    for (int v = 0; v < m_lstPortals.Count(); v++)
-    {
-        AABB aabb;
-        aabb.min = m_lstPortals[v]->m_boxArea.min - Vec3(0.5f, 0.5f, 0.1f);
-        aabb.max = m_lstPortals[v]->m_boxArea.max + Vec3(0.5f, 0.5f, 0.0f);
-
-        if (Overlap::Point_AABB(vPos, aabb))
-        {
-            m_lstPortals[v]->m_bActive = bActivate;
-
-            // switch to PrintComment once portals activation is working stable
-            PrintMessage("I3DEngine::ActivatePortal(): Portal %s is %s by entity %s at position(%.1f,%.1f,%.1f)",
-                m_lstPortals[v]->GetName(), bActivate ? "Enabled" : "Disabled", szEntityName, vPos.x, vPos.y, vPos.z);
-
-            //      bFound = true;
-        }
-    }
-
-    /*
-  if(!bFound)
-  {
-    PrintComment("I3DEngine::ActivatePortal(): Portal not found for entity %s at position(%.1f,%.1f,%.1f)",
-      szEntityName, vPos.x, vPos.y, vPos.z);
-  }
-    */
-}
-/*
-bool CVisAreaManager::IsEntityInVisibleArea(IRenderNodeState * pRS)
-{
-    if( pRS && pRS->plstVisAreaId && pRS->plstVisAreaId->Count() )
-    {
-        PodArray<int> * pVisAreas = pRS->plstVisAreaId;
-        for(int n=0; n<pVisAreas->Count(); n++)
-            if( m_lstVisAreas[pVisAreas->GetAt(n)].m_nVisFrameId==passInfo.GetFrameID() )
-                break;
-
-        if(n==pVisAreas->Count())
-            return false; // no visible areas
-    }
-    else
-        return false; // entity is not inside
-
-    return true;
-}   */
-
-bool CVisAreaManager::IsValidVisAreaPointer(CVisArea* pVisArea)
-{
-    if (m_lstVisAreas.Find(pVisArea) < 0 &&
-        m_lstPortals.Find(pVisArea) < 0 &&
-        m_lstOcclAreas.Find(pVisArea) < 0)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-//This is only called from the editor, so pVisArea will not be pool allocated by type
-bool CVisAreaManager::DeleteVisArea(CVisArea* pVisArea)
-{
-    bool bFound = false;
-    if (m_lstVisAreas.Delete(pVisArea) || m_lstPortals.Delete(pVisArea) || m_lstOcclAreas.Delete(pVisArea))
-    {
-        delete pVisArea;
-        bFound = true;
-    }
-
-    m_lstActiveOcclVolumes.Delete(pVisArea);
-    m_lstIndoorActiveOcclVolumes.Delete(pVisArea);
-    m_lstActiveEntransePortals.Delete(pVisArea);
-
-    m_pCurArea = 0;
-    m_pCurPortal = 0;
-    UpdateConnections();
-
-    delete m_pAABBTree;
-    m_pAABBTree = NULL;
-
-    return bFound;
-}
-
-/*void CVisAreaManager::LoadVisAreaShapeFromXML(XmlNodeRef pDoc)
-{
-    for(int i=0; i<m_lstVisAreas.Count(); i++)
-    {
-        delete m_lstVisAreas[i];
-        m_lstVisAreas.Delete(i);
-        i--;
-    }
-
-    for(int i=0; i<m_lstPortals.Count(); i++)
-    {
-        delete m_lstPortals[i];
-        m_lstPortals.Delete(i);
-        i--;
-    }
-
-    // fill list of volumes of shape points
-    XmlNodeRef pObjectsNode = pDoc->findChild("Objects");
-    if (pObjectsNode)
-    {
-        for (int i = 0; i < pObjectsNode->getChildCount(); i++)
-        {
-            XmlNodeRef pNode = pObjectsNode->getChild(i);
-            if (pNode->isTag("Object"))
-            {
-        const char * pType = pNode->getAttr("Type");
-                if (strstr(pType,"OccluderArea") || strstr(pType,"VisArea") || strstr(pType,"Portal"))
-                {
-                    CVisArea * pArea = new CVisArea();
-
-                    pArea->m_boxArea.max=SetMinBB();
-                    pArea->m_boxArea.min=SetMaxBB();
-
-                    // set name
-                    strcpy(pArea->m_sName, pNode->getAttr("Name"));
-                    strlwr(pArea->m_sName);
-
-                    // set height
-                    pNode->getAttr("Height",pArea->m_fHeight);
-
-                    // set ambient color
-                    pNode->getAttr("AmbientColor", pArea->m_vAmbColor);
-
-                    // set dynamic ambient color
-//                  pNode->getAttr("DynAmbientColor", pArea->m_vDynAmbColor);
-
-          // set SkyOnly flag
-          pNode->getAttr("SkyOnly", pArea->m_bSkyOnly);
-
-          // set AfectedByOutLights flag
-          pNode->getAttr("AffectedBySun", pArea->m_bAfectedByOutLights);
-
-                    // set ViewDistRatio
-                    pNode->getAttr("ViewDistRatio", pArea->m_fViewDistRatio);
-
-                    // set DoubleSide flag
-                    pNode->getAttr("DoubleSide", pArea->m_bDoubleSide);
-
-                    // set UseInIndoors flag
-                    pNode->getAttr("UseInIndoors", pArea->m_bUseInIndoors);
-
-                    if(strstr(pType, "OccluderArea"))
-                        m_lstOcclAreas.Add(pArea);
-                    else if(strstr(pArea->m_sName,"portal") || strstr(pType,"Portal"))
-                        m_lstPortals.Add(pArea);
-                    else
-                        m_lstVisAreas.Add(pArea);
-
-                    // load vertices
-                    XmlNodeRef pPointsNode = pNode->findChild("Points");
-                    if (pPointsNode)
-                    for (int i = 0; i < pPointsNode->getChildCount(); i++)
-                    {
-                        XmlNodeRef pPointNode = pPointsNode->getChild(i);
-
-                        Vec3 vPos;
-                        if (pPointNode->isTag("Point") && pPointNode->getAttr("Pos", vPos))
-                        {
-                            pArea->m_lstShapePoints.Add(vPos);
-                            pArea->m_boxArea.max.CheckMax(vPos);
-                            pArea->m_boxArea.min.CheckMin(vPos);
-                            pArea->m_boxArea.max.CheckMax(vPos+Vec3(0,0,pArea->m_fHeight));
-                            pArea->m_boxArea.min.CheckMin(vPos+Vec3(0,0,pArea->m_fHeight));
-                        }
-                    }
-                    pArea->UpdateGeometryBBox();
-                }
-            }
-        }
-    }
-
-    // load area boxes to support old way
-//  LoadVisAreaBoxFromXML(pDoc);
-}*/
-
-
-//THIS SHOULD ONLY BE CALLED BY THE EDITOR
-void CVisAreaManager::UpdateVisArea(CVisArea* pArea, const Vec3* pPoints, int nCount, const char* szName, const SVisAreaInfo& info)
-{ // on first update there will be nothing to delete, area will be added into list only in this function
-    
-    // If pArea is in these lists, then remove it.
-    const VisAreaGUID& areaGUID = pArea->GetGUID();
-    for (int i = 0; i < m_lstVisAreas.Count(); ++i)
-    {
-        CVisArea* pAreaInList = m_lstVisAreas[i];
-        if (areaGUID == pAreaInList->GetGUID())
-        {
-            m_lstVisAreas.Delete(i);
-            --i;
-        }
-    }
-    for (int i = 0; i < m_lstPortals.Count(); ++i)
-    {
-        CVisArea* pPortalInList = m_lstPortals[i];
-        if (areaGUID == pPortalInList->GetGUID())
-        {
-            m_lstPortals.Delete(i);
-            --i;
-        }
-    }
-    for (int i = 0; i < m_lstOcclAreas.Count(); ++i)
-    {
-        CVisArea* pOccAreaInList = m_lstOcclAreas[i];
-        if (areaGUID == pOccAreaInList->GetGUID())
-        {
-            m_lstOcclAreas.Delete(i);
-            --i;
-        }
-    }
-
-    SGenericColdData* pColdData = pArea->GetColdData();
-    if (pColdData != NULL)
-    {
-        if (pColdData->m_dataType == eCDT_Portal)
-        {
-            SPortalColdData* pPortalColdData = static_cast<SPortalColdData*>(pColdData);
-            if (pPortalColdData->m_pRNTmpData)
-            {
-                Get3DEngine()->FreeRNTmpData(&pPortalColdData->m_pRNTmpData);
-                pPortalColdData->m_pRNTmpData = NULL;
-            }
-        }
-        delete pArea->GetColdData();
-        pArea->SetColdDataPtr(NULL);
-    }
-
-
-    SGenericColdData* pColdDataPtr = NULL;
-
-    char sTemp[64];
-    cry_strcpy(sTemp, szName);
-    _strlwr_s(sTemp, sizeof(sTemp));
- 
-    bool bPortal = false;
-    bool bVisArea = false;
-    bool bOcclArea = false;
-
-    //TODO: Refactor with code below so it's not horrible
-    if (strstr(sTemp, "portal"))
-    {
-        pColdDataPtr = new SPortalColdData();
-        bPortal = true;
-    }
-    else if (strstr(sTemp, "visarea"))
-    {
-        pColdDataPtr = new SGenericColdData();
-        bVisArea = true;
-    }
-    else if (strstr(sTemp, "occlarea"))
-    {
-        pColdDataPtr = new SGenericColdData();
-        bOcclArea = true;
-    }
-    else
-    {
-        pColdDataPtr = new SGenericColdData();
-    }
-
-    assert(pColdDataPtr);
-    pArea->SetColdDataPtr(pColdDataPtr);
-
-    pArea->Update(pPoints, nCount, sTemp, info);
-
-    if (bPortal)
-    {
-        if (pArea->m_lstConnections.Count() == 1)
-        {
-            pArea->UpdateGeometryBBox();
-        }
-
-        m_lstPortals.Add(pArea);
-    }
-    else if (bVisArea)
-    {
-        m_lstVisAreas.Add(pArea);
-    }
-    else if (bOcclArea)
-    {
-        m_lstOcclAreas.Add(pArea);
-    }
-
-    UpdateConnections();
-
-    delete m_pAABBTree;
-    m_pAABBTree = NULL;
-}
-
-void CVisAreaManager::UpdateConnections()
-{
-    // Reset connectivity
-    for (int p = 0; p < m_lstPortals.Count(); p++)
-    {
-        m_lstPortals[p]->m_lstConnections.Clear();
-    }
-
-    for (int v = 0; v < m_lstVisAreas.Count(); v++)
-    {
-        m_lstVisAreas[v]->m_lstConnections.Clear();
-    }
-
-    // Init connectivity - check intersection of all areas and portals
-    for (int p = 0; p < m_lstPortals.Count(); p++)
-    {
-        for (int v = 0; v < m_lstVisAreas.Count(); v++)
-        {
-            if (m_lstVisAreas[v]->IsPortalIntersectAreaInValidWay(m_lstPortals[p]))
-            { // if bboxes intersect
-                m_lstVisAreas[v]->m_lstConnections.Add(m_lstPortals[p]);
-                m_lstPortals[p]->m_lstConnections.Add(m_lstVisAreas[v]);
-
-                // set portal direction
-                Vec3 vNormal = m_lstVisAreas[v]->GetConnectionNormal(m_lstPortals[p]);
-                if (m_lstPortals[p]->m_lstConnections.Count() <= 2)
-                {
-                    m_lstPortals[p]->m_vConnNormals[m_lstPortals[p]->m_lstConnections.Count() - 1] = vNormal;
-                }
-            }
-        }
-    }
-}
-
-void CVisAreaManager::MoveObjectsIntoList(PodArray<SRNInfo>* plstVisAreasEntities, const AABB& boxArea, bool bRemoveObjects)
-{
-    for (int p = 0; p < m_lstPortals.Count(); p++)
-    {
-        if (m_lstPortals[p]->m_pObjectsTree && Overlap::AABB_AABB(m_lstPortals[p]->m_boxArea, boxArea))
-        {
-            m_lstPortals[p]->m_pObjectsTree->MoveObjectsIntoList(plstVisAreasEntities, bRemoveObjects ? NULL : &boxArea, bRemoveObjects);
-        }
-    }
-
-    for (int v = 0; v < m_lstVisAreas.Count(); v++)
-    {
-        if (m_lstVisAreas[v]->m_pObjectsTree && Overlap::AABB_AABB(m_lstVisAreas[v]->m_boxArea, boxArea))
-        {
-            m_lstVisAreas[v]->m_pObjectsTree->MoveObjectsIntoList(plstVisAreasEntities, bRemoveObjects ? NULL : &boxArea, bRemoveObjects);
-        }
-    }
-}
-
-bool CVisAreaManager::IntersectsVisAreas(const AABB& box, void** pNodeCache)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pAABBTree)
-    {
-        UpdateAABBTree();
-    }
-    SAABBTreeNode* pTopNode = m_pAABBTree->GetTopNode(box, pNodeCache);
-    return pTopNode->IntersectsVisAreas(box);
-}
-
-bool CVisAreaManager::ClipOutsideVisAreas(Sphere& sphere, Vec3 const& vNormal, void* pNodeCache)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pAABBTree)
-    {
-        UpdateAABBTree();
-    }
-    AABB box(sphere.center - Vec3(sphere.radius), sphere.center + Vec3(sphere.radius));
-    SAABBTreeNode* pTopNode = m_pAABBTree->GetTopNode(box, &pNodeCache);
-    return pTopNode->ClipOutsideVisAreas(sphere, vNormal) > 0;
-}
-
-//This is used by the editor. Use the visareas pool for all areas, so prefetching
-//  is still safe.
-CVisArea* CVisAreaManager::CreateVisArea(VisAreaGUID visGUID)
-{
-    return new CVisArea(visGUID);
-}
-
-bool CVisAreaManager::IsEntityVisAreaVisibleReqursive(CVisArea* pVisArea, int nMaxReqursion, PodArray<CVisArea*>* pUnavailableAreas, const CDLight* pLight, const SRenderingPassInfo& passInfo)
-{
-    int nAreaId = pUnavailableAreas->Count();
-    pUnavailableAreas->Add(pVisArea);
-
-    bool bFound = false;
-    if (pVisArea)
-    { // check is lsource area was rendered in prev frame
-        if (abs(pVisArea->m_nRndFrameId - passInfo.GetFrameID()) > 2)
-        {
-            if (nMaxReqursion > 1)
-            {
-                for (int n = 0; n < pVisArea->m_lstConnections.Count(); n++)
-                { // loop other sectors
-                    CVisArea* pNeibArea = (CVisArea*)pVisArea->m_lstConnections[n];
-                    if (-1 == pUnavailableAreas->Find(pNeibArea) &&
-                        (!pLight || Overlap::Sphere_AABB(Sphere(pLight->m_Origin, pLight->m_fRadius), *pNeibArea->GetAABBox())))
-                    {
-                        if (IsEntityVisAreaVisibleReqursive(pNeibArea, nMaxReqursion - 1, pUnavailableAreas, pLight, passInfo))
-                        {
-                            bFound = true;
-                            break;
-                        }//if visible
-                    }
-                }// for
-            }
-        }
-        else
-        {
-            bFound = true;
-        }
-    }
-    else if (IsOutdoorAreasVisible())                                    //Indirect - outdoor can be a problem!
-    {
-        bFound = true;
-    }
-
-    pUnavailableAreas->Delete(nAreaId);
-    return bFound;
-}
-
-bool CVisAreaManager::IsEntityVisAreaVisible(IRenderNode* pEnt, int nMaxReqursion, const CDLight* pLight, const SRenderingPassInfo& passInfo)
-{
-    if (!pEnt)
-    {
-        return false;
-    }
-
-    PodArray<CVisArea*>& lUnavailableAreas = m_tmpLstUnavailableAreas;
-    lUnavailableAreas.Clear();
-
-    lUnavailableAreas.PreAllocate(nMaxReqursion, 0);
-
-    return IsEntityVisAreaVisibleReqursive((CVisArea*)pEnt->GetEntityVisArea(), nMaxReqursion, &lUnavailableAreas, pLight, passInfo);
-    /*
-        if(pEnt->GetEntityVisArea())
-        {
-            if(pEnt->GetEntityVisArea())//->IsPortal())
-            { // check is lsource area was rendered in prev frame
-                CVisArea * pVisArea = pEnt->GetEntityVisArea();
-                int nRndFrameId = passInfo.GetFrameID();
-                if(abs(pVisArea->m_nRndFrameId - nRndFrameId)>2)
-                {
-                    if(!nCheckNeighbors)
-                        return false; // this area is not visible
-
-                    // try neibhour areas
-                    bool bFound = false;
-                    if(pEnt->GetEntityVisArea()->IsPortal())
-                    {
-                        CVisArea * pPort = pEnt->GetEntityVisArea();
-                        for(int n=0; n<pPort->m_lstConnections.Count(); n++)
-                        { // loop other sectors
-                            CVisArea * pNeibArea = (CVisArea*)pPort->m_lstConnections[n];
-                            if(abs(pNeibArea->m_nRndFrameId - passInfo.GetFrameID())<=2)
-                            {
-                                bFound=true;
-                                break;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        for(int t=0; !bFound && t<pVisArea->m_lstConnections.Count(); t++)
-                        { // loop portals
-                            CVisArea * pPort = (CVisArea*)pVisArea->m_lstConnections[t];
-                            if(abs(pPort->m_nRndFrameId - passInfo.GetFrameID())<=2)
-                            {
-                                bFound=true;
-                                break;
-                            }
-
-                            for(int n=0; n<pPort->m_lstConnections.Count(); n++)
-                            { // loop other sectors
-                                CVisArea * pNeibArea = (CVisArea*)pPort->m_lstConnections[n];
-                                if(abs(pNeibArea->m_nRndFrameId - passInfo.GetFrameID())<=2)
-                                {
-                                    bFound=true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    if(!bFound)
-                        return false;
-
-                    return true;
-                }
-            }
-            else
-                return false; // not visible
-        }
-        else if(!IsOutdoorAreasVisible())
-            return false;
-
-        return true;
-    */
-}
-
-int __cdecl CVisAreaManager__CmpDistToPortal(const void* v1, const void* v2)
-{
-    CVisArea* p1 = *((CVisArea**)v1);
-    CVisArea* p2 = *((CVisArea**)v2);
-
-    if (!p1 || !p2)
-    {
-        return 0;
-    }
-
-    if (p1->m_fDistance > p2->m_fDistance)
-    {
-        return 1;
-    }
-    else if (p1->m_fDistance < p2->m_fDistance)
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-void CVisAreaManager::MakeActiveEntransePortalsList(const CCamera* pCamera, PodArray<CVisArea*>& lstActiveEntransePortals, CVisArea* pThisPortal, const SRenderingPassInfo& passInfo)
-{
-    lstActiveEntransePortals.Clear();
-    float fZoomFactor = pCamera ? (0.2f + 0.8f * (RAD2DEG(pCamera->GetFov()) / 90.f)) : 1.f;
-
-    for (int nPortalId = 0; nPortalId < m_lstPortals.Count(); nPortalId++)
-    {
-        CVisArea* pPortal = m_lstPortals[nPortalId];
-
-        if (pPortal->m_lstConnections.Count() == 1 && pPortal != pThisPortal && pPortal->IsActive() && !pPortal->m_bSkyOnly)
-        {
-            if (!pCamera || pCamera->IsAABBVisible_F(pPortal->m_boxStatics))
-            {
-                Vec3 vNormal = pPortal->m_lstConnections[0]->GetConnectionNormal(pPortal);
-                Vec3 vCenter = (pPortal->m_boxArea.min + pPortal->m_boxArea.max) * 0.5f;
-                if (vNormal.Dot(vCenter - (pCamera ? pCamera->GetPosition() : passInfo.GetCamera().GetPosition())) < 0)
-                {
-                    continue;
-                }
-                /*
-                                if(pCurPortal)
-                                {
-                                    vNormal = pCurPortal->m_vConnNormals[0];
-                                    if(vNormal.Dot(vCenter - curCamera.GetPosition())<0)
-                                        continue;
-                                }
-                    */
-                pPortal->m_fDistance = pPortal->m_boxArea.GetDistance(pCamera ? pCamera->GetPosition() : passInfo.GetCamera().GetPosition());
-
-                float fRadius = (pPortal->m_boxArea.max - pPortal->m_boxArea.min).GetLength() * 0.5f;
-                if (pPortal->m_fDistance * fZoomFactor > fRadius * pPortal->m_fViewDistRatio * GetFloatCVar(e_ViewDistRatioPortals) / 60.f)
-                {
-                    continue;
-                }
-
-                SPortalColdData* pColdData = static_cast<SPortalColdData*>(pPortal->GetColdData());
-
-                Get3DEngine()->CheckCreateRNTmpData(&pColdData->m_pRNTmpData, NULL, passInfo);
-
-                // test occlusion
-                if (GetObjManager()->IsBoxOccluded(pPortal->m_boxStatics, pPortal->m_fDistance, &pColdData->m_pRNTmpData->userData.m_OcclState, false, eoot_PORTAL, passInfo))
-                {
-                    continue;
-                }
-
-                lstActiveEntransePortals.Add(pPortal);
-
-                //              if(GetCVars()->e_Portals==3)
-                //              DrawBBox(pPortal->m_boxStatics.min, pPortal->m_boxStatics.max);
-            }
-        }
-    }
-
-    // sort by distance
-    if (lstActiveEntransePortals.Count())
-    {
-        qsort(&lstActiveEntransePortals[0], lstActiveEntransePortals.Count(),
-            sizeof(lstActiveEntransePortals[0]), CVisAreaManager__CmpDistToPortal);
-        //      m_pCurPortal = lstActiveEntransePortals[0];
-    }
-}
-
-void CVisAreaManager::DrawOcclusionAreasIntoCBuffer([[maybe_unused]] CCullBuffer* pCBuffer, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    m_lstActiveOcclVolumes.Clear();
-    m_lstIndoorActiveOcclVolumes.Clear();
-
-#if defined(OCCLUSIONCULLER_W)
-    m_allActiveVerts.resize(0);
-    m_allActiveVerts.reserve(m_lstOcclAreas.Count());
-#endif
-
-    float fZoomFactor = 0.2f + 0.8f * (RAD2DEG(passInfo.GetCamera().GetFov()) / 90.f);
-    float fDistRatio = GetFloatCVar(e_OcclusionVolumesViewDistRatio) / fZoomFactor;
-
-    if (GetCVars()->e_OcclusionVolumes)
-    {
-        for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-        {
-            CVisArea* pArea = m_lstOcclAreas[i];
-            if (passInfo.GetCamera().IsAABBVisible_E(pArea->m_boxArea))
-            {
-                float fRadius = (pArea->m_boxArea.min - pArea->m_boxArea.max).GetLength();
-                Vec3 vPos = (pArea->m_boxArea.min + pArea->m_boxArea.max) * 0.5f;
-                float fDist = passInfo.GetCamera().GetPosition().GetDistance(vPos);
-                if (fDist < fRadius * pArea->m_fViewDistRatio * fDistRatio && pArea->m_lstShapePoints.Count() >= 2)
-                {
-                    int nRecursiveLevel = passInfo.GetRecursiveLevel();
-                    if (!pArea->m_arrOcclCamera[nRecursiveLevel])
-                    {
-                        pArea->m_arrOcclCamera[nRecursiveLevel] = new CCamera;
-                    }
-                    *pArea->m_arrOcclCamera[nRecursiveLevel] = passInfo.GetCamera();
-
-                    SActiveVerts activeVerts;
-
-                    if (pArea->m_lstShapePoints.Count() == 4)
-                    {
-                        activeVerts.arrvActiveVerts[0] = pArea->m_lstShapePoints[0];
-                        activeVerts.arrvActiveVerts[1] = pArea->m_lstShapePoints[1];
-                        activeVerts.arrvActiveVerts[2] = pArea->m_lstShapePoints[2];
-                        activeVerts.arrvActiveVerts[3] = pArea->m_lstShapePoints[3];
-                    }
-                    else
-                    {
-                        activeVerts.arrvActiveVerts[0] = pArea->m_lstShapePoints[0];
-                        activeVerts.arrvActiveVerts[1] = pArea->m_lstShapePoints[0] + Vec3(0, 0, pArea->m_fHeight);
-                        activeVerts.arrvActiveVerts[2] = pArea->m_lstShapePoints[1] + Vec3(0, 0, pArea->m_fHeight);
-                        activeVerts.arrvActiveVerts[3] = pArea->m_lstShapePoints[1];
-                    }
-
-                    Plane plane;
-                    plane.SetPlane(activeVerts.arrvActiveVerts[0], activeVerts.arrvActiveVerts[2], activeVerts.arrvActiveVerts[1]);
-
-                    if (plane.DistFromPlane(passInfo.GetCamera().GetPosition()) < 0)
-                    {
-                        std::swap(activeVerts.arrvActiveVerts[0], activeVerts.arrvActiveVerts[3]);
-                        std::swap(activeVerts.arrvActiveVerts[1], activeVerts.arrvActiveVerts[2]);
-                    }
-                    else if (!pArea->m_bDoubleSide)
-                    {
-                        continue;
-                    }
-
-                    //              GetRenderer()->SetMaterialColor(1,0,0,1);
-                    pArea->UpdatePortalCameraPlanes(*pArea->m_arrOcclCamera[passInfo.GetRecursiveLevel()], activeVerts.arrvActiveVerts, false, passInfo);
-
-                    // make far plane never clip anything
-
-#if defined(OCCLUSIONCULLER_W)
-                    m_allActiveVerts.push_back(activeVerts);
-#endif
-
-                    Plane newNearPlane;
-                    newNearPlane.SetPlane(activeVerts.arrvActiveVerts[0], activeVerts.arrvActiveVerts[2], activeVerts.arrvActiveVerts[1]);
-                    pArea->m_arrOcclCamera[passInfo.GetRecursiveLevel()]->SetFrustumPlane(FR_PLANE_NEAR, newNearPlane);
-
-                    Plane newFarPlane;
-                    newFarPlane.SetPlane(Vec3(0, 1, -1024), Vec3(1, 0, -1024), Vec3(0, 0, -1024));
-                    pArea->m_arrOcclCamera[passInfo.GetRecursiveLevel()]->SetFrustumPlane(FR_PLANE_FAR, newFarPlane);
-                    //pArea->m_arrOcclCamera[m_nRenderStackLevel]->UpdateFrustum();
-
-                    m_lstActiveOcclVolumes.Add(pArea);
-                    pArea->m_fDistance = fDist;
-                }
-            }
-        }
-    }
-
-    if (m_lstActiveOcclVolumes.Count())
-    { // sort occluders by distance to the camera
-        qsort(&m_lstActiveOcclVolumes[0], m_lstActiveOcclVolumes.Count(),
-            sizeof(m_lstActiveOcclVolumes[0]), CVisAreaManager__CmpDistToPortal);
-
-        // remove occluded occluders
-        for (int i = m_lstActiveOcclVolumes.Count() - 1; i >= 0; i--)
-        {
-            CVisArea* pArea = m_lstActiveOcclVolumes[i];
-            AABB extrudedBox = pArea->m_boxStatics;
-            extrudedBox.min -= Vec3(VEC_EPSILON, VEC_EPSILON, VEC_EPSILON);
-            extrudedBox.max += Vec3(VEC_EPSILON, VEC_EPSILON, VEC_EPSILON);
-            if (IsOccludedByOcclVolumes(extrudedBox, passInfo))
-            {
-                m_lstActiveOcclVolumes.Delete(i);
-            }
-        }
-
-#ifdef OCCLUSIONCULLER_W
-        // draw them into the CBuffer
-        for (size_t i = 0, size = m_allActiveVerts.size(); i < size; i++)
-        {
-            pCBuffer->AddOccluderPlane(m_allActiveVerts[i].arrvActiveVerts);
-        }
-#endif
-
-        // put indoor occluders into separate list
-        for (int i = m_lstActiveOcclVolumes.Count() - 1; i >= 0; i--)
-        {
-            CVisArea* pArea = m_lstActiveOcclVolumes[i];
-            if (pArea->m_bUseInIndoors)
-            {
-                m_lstIndoorActiveOcclVolumes.Add(pArea);
-            }
-        }
-
-        if (GetCVars()->e_Portals == 4)
-        {   // show really active occluders
-            for (int i = 0; i < m_lstActiveOcclVolumes.Count(); i++)
-            {
-                CVisArea* pArea = m_lstActiveOcclVolumes[i];
-                GetRenderer()->SetMaterialColor(0, 1, 0, 1);
-                DrawBBox(pArea->m_boxStatics.min, pArea->m_boxStatics.max);
-            }
-        }
-    }
-}
-
-void CVisAreaManager::GetStreamingStatus(int& nLoadedSectors, int& nTotalSectors)
-{
-    nLoadedSectors = 0;
-    nTotalSectors = m_lstPortals.Count() + m_lstVisAreas.Count();
-}
-
-void CVisAreaManager::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    // areas
-    for (int v = 0; v < m_lstVisAreas.Count(); v++)
-    {
-        m_lstVisAreas[v]->GetMemoryUsage(pSizer);
-    }
-
-    // portals
-    for (int v = 0; v < m_lstPortals.Count(); v++)
-    {
-        m_lstPortals[v]->GetMemoryUsage(pSizer);
-    }
-
-    // occl areas
-    for (int v = 0; v < m_lstOcclAreas.Count(); v++)
-    {
-        m_lstOcclAreas[v]->GetMemoryUsage(pSizer);
-    }
-
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-
-void CVisAreaManager::PrecacheLevel(bool bPrecacheAllVisAreas, Vec3* pPrecachePoints, int nPrecachePointsNum)
-{
-    CryLog("Precaching the level ...");
-    //  gEnv->pLog->UpdateLoadingScreen(0);
-
-    float fPrecacheTimeStart = GetTimer()->GetAsyncCurTime();
-
-    GetRenderer()->EnableSwapBuffers((GetCVars()->e_PrecacheLevel >= 2) ? true : false);
-
-    uint32 dwPrecacheLocations = 0;
-
-    Vec3 arrCamDir[6] =
-    {
-        Vec3(1, 0, 0),
-        Vec3(-1, 0, 0),
-        Vec3(0, 1, 0),
-        Vec3(0, -1, 0),
-        Vec3(0, 0, 1),
-        Vec3(0, 0, -1)
-    };
-
-    //loop over all sectors and place a light in the middle of the sector
-    for (int v = 0; v < m_lstVisAreas.Count() && bPrecacheAllVisAreas; v++)
-    {
-        GetRenderer()->EF_Query(EFQ_IncrementFrameID);
-
-        ++dwPrecacheLocations;
-
-        // find real geometry bbox
-        /*      bool bGeomFound = false;
-                Vec3 vBoxMin(100000.f,100000.f,100000.f);
-                Vec3 vBoxMax(-100000.f,-100000.f,-100000.f);
-                for(int s=0; s<ENTITY_LISTS_NUM; s++)
-                for(int e=0; e<m_lstVisAreas[v]->m_lstEntities[s].Count(); e++)
-                {
-                    AABB aabbBox = m_lstVisAreas[v]->m_lstEntities[s][e].aabbBox;
-                    vBoxMin.CheckMin(aabbBox.min);
-                    vBoxMax.CheckMax(aabbBox.max);
-                    bGeomFound = true;
-                }*/
-
-        Vec3 vAreaCenter = m_lstVisAreas[v]->m_boxArea.GetCenter();
-        CryLog("  Precaching VisArea %s", m_lstVisAreas[v]->GetName());
-
-        //place camera in the middle of a sector and render sector from different directions
-        for (int i = 0; i < 6 /*&& bGeomFound*/; i++)
-        {
-            GetRenderer()->BeginFrame();
-
-            // setup camera
-            CCamera cam = gEnv->pSystem->GetViewCamera();
-            Matrix33 mat = Matrix33::CreateRotationVDir(arrCamDir[i], 0);
-            cam.SetMatrix(mat);
-            cam.SetPosition(vAreaCenter);
-            cam.SetFrustum(GetRenderer()->GetWidth(), GetRenderer()->GetHeight(), gf_PI / 2, cam.GetNearPlane(), cam.GetFarPlane());
-            //          Get3DEngine()->SetupCamera(cam);
-
-
-            Get3DEngine()->RenderWorld(SHDF_ZPASS | SHDF_ALLOWHDR | SHDF_ALLOWPOSTPROCESS | SHDF_ALLOW_WATER | SHDF_ALLOW_AO, SRenderingPassInfo::CreateGeneralPassRenderingInfo(cam), "PrecacheVisAreas");
-
-            GetRenderer()->RenderDebug();
-            GetRenderer()->EndFrame();
-
-            if (GetCVars()->e_PrecacheLevel >= 2)
-            {
-                CrySleep(200);
-            }
-        }
-    }
-
-    CryLog("Precached %d visarea sectors", dwPrecacheLocations);
-
-
-    //--------------------------------------------------------------------------------------
-    //----                  PRE-FETCHING OF RENDER-DATA IN OUTDOORS                     ----
-    //--------------------------------------------------------------------------------------
-
-    // loop over all cam-position in the level and render this part of the level from 6 different directions
-    for (int p = 0; pPrecachePoints && p < nPrecachePointsNum; p++) //loop over outdoor-camera position
-    {
-        CryLog("  Precaching PrecacheCamera point %d of %d", p, nPrecachePointsNum);
-        for (int i = 0; i < 6; i++) //loop over 6 camera orientations
-        {
-            GetRenderer()->BeginFrame();
-
-            // setup camera
-            CCamera cam = gEnv->pSystem->GetViewCamera();
-            Matrix33 mat = Matrix33::CreateRotationVDir(arrCamDir[i], 0);
-            cam.SetMatrix(mat);
-            cam.SetPosition(pPrecachePoints[p]);
-            cam.SetFrustum(GetRenderer()->GetWidth(), GetRenderer()->GetHeight(), gf_PI / 2, cam.GetNearPlane(), cam.GetFarPlane());
-
-            Get3DEngine()->RenderWorld(SHDF_ZPASS | SHDF_ALLOWHDR | SHDF_ALLOWPOSTPROCESS | SHDF_ALLOW_WATER | SHDF_ALLOW_AO, SRenderingPassInfo::CreateGeneralPassRenderingInfo(cam), "PrecacheOutdoor");
-
-            GetRenderer()->RenderDebug();
-            GetRenderer()->EndFrame();
-
-            if (GetCVars()->e_PrecacheLevel >= 2)
-            {
-                CrySleep(1000);
-            }
-        }
-    }
-
-    CryLog("Precached %d PrecacheCameraXX points", nPrecachePointsNum);
-
-    GetRenderer()->EnableSwapBuffers(true);
-
-    float fPrecacheTime = GetTimer()->GetAsyncCurTime() - fPrecacheTimeStart;
-    CryLog("Level Precache finished in %.2f seconds", fPrecacheTime);
-}
-
-void CVisAreaManager::GetObjectsAround(Vec3 vExploPos, float fExploRadius, PodArray<SRNInfo>* pEntList, bool bSkip_ERF_NO_DECALNODE_DECALS, bool bSkipDynamicObjects)
-{
-    AABB aabbBox(vExploPos - Vec3(fExploRadius, fExploRadius, fExploRadius), vExploPos + Vec3(fExploRadius, fExploRadius, fExploRadius));
-
-    CVisArea* pVisArea = (CVisArea*)GetVisAreaFromPos(vExploPos);
-
-    if (pVisArea && pVisArea->m_pObjectsTree)
-    {
-        pVisArea->m_pObjectsTree->MoveObjectsIntoList(pEntList, &aabbBox, false, true, bSkip_ERF_NO_DECALNODE_DECALS, bSkipDynamicObjects);
-    }
-    /*
-        // find static objects around
-        for(int i=0; pVisArea && i<pVisArea->m_lstEntities[STATIC_OBJECTS].Count(); i++)
-        {
-        IRenderNode * pRenderNode = pVisArea->m_lstEntities[STATIC_OBJECTS][i].pNode;
-        if(bSkip_ERF_NO_DECALNODE_DECALS && pRenderNode->GetRndFlags()&ERF_NO_DECALNODE_DECALS)
-        continue;
-        if(pRenderNode->GetRenderNodeType() == eERType_Decal)
-        continue;
-        if(Overlap::Sphere_AABB(Sphere(vExploPos,fExploRadius), pRenderNode->GetBBox()))
-        if(pEntList->Find(pRenderNode)<0)
-        pEntList->Add(pRenderNode);
-        }
-        }*/
-}
-
-void CVisAreaManager::IntersectWithBox(const AABB& aabbBox, PodArray<CVisArea*>* plstResult, [[maybe_unused]] bool bOnlyIfVisible)
-{
-    for (int p = 0; p < m_lstPortals.Count(); p++)
-    {
-        if (m_lstPortals[p]->m_boxArea.min.x < aabbBox.max.x&& m_lstPortals[p]->m_boxArea.max.x > aabbBox.min.x &&
-            m_lstPortals[p]->m_boxArea.min.y < aabbBox.max.y&& m_lstPortals[p]->m_boxArea.max.y > aabbBox.min.y)
-        {
-            plstResult->Add(m_lstPortals[p]);
-        }
-    }
-
-    for (int v = 0; v < m_lstVisAreas.Count(); v++)
-    {
-        if (m_lstVisAreas[v]->m_boxArea.min.x < aabbBox.max.x&& m_lstVisAreas[v]->m_boxArea.max.x > aabbBox.min.x &&
-            m_lstVisAreas[v]->m_boxArea.min.y < aabbBox.max.y&& m_lstVisAreas[v]->m_boxArea.max.y > aabbBox.min.y)
-        {
-            plstResult->Add(m_lstVisAreas[v]);
-        }
-    }
-}
-
-int CVisAreaManager::GetNumberOfVisArea() const
-{
-    return m_lstPortals.size() + m_lstVisAreas.size();
-}
-
-IVisArea* CVisAreaManager::GetVisAreaById(int nID) const
-{
-    if (nID < 0)
-    {
-        return NULL;
-    }
-
-    if (nID < (int)m_lstPortals.size())
-    {
-        return m_lstPortals[ nID ];
-    }
-    nID -= m_lstPortals.size();
-    if (nID < (int)m_lstVisAreas.size())
-    {
-        return m_lstVisAreas[ nID ];
-    }
-
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVisAreaManager::AddListener(IVisAreaCallback* pListener)
-{
-    if (m_lstCallbacks.Find(pListener) < 0)
-    {
-        m_lstCallbacks.Add(pListener);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVisAreaManager::RemoveListener(IVisAreaCallback* pListener)
-{
-    m_lstCallbacks.Delete(pListener);
-}
-
-void CVisAreaManager::CloneRegion(const AABB& region, const Vec3& offset, float zRotation)
-{
-    PodArray<Vec3> points;
-
-    PodArray<CVisArea*> visAreas;
-    IntersectWithBox(region, &visAreas, false);
-
-    Vec3 localOrigin = region.GetCenter();
-    Matrix34 l2w(Matrix33::CreateRotationZ(zRotation));
-    l2w.SetTranslation(offset);
-
-    int numAreas = visAreas.size();
-    for (int i = 0; i < numAreas; ++i)
-    {
-        CVisArea* pSrcArea = visAreas[i];
-        CVisArea* pCloneArea = CreateVisArea(0);
-
-        SVisAreaInfo info;
-        info.fHeight                = pSrcArea->m_fHeight;
-        info.vAmbientColor          = pSrcArea->m_vAmbientColor;
-        info.bAffectedByOutLights   = pSrcArea->m_bAffectedByOutLights;
-        info.bIgnoreSkyColor        = pSrcArea->m_bIgnoreSky;
-        info.bSkyOnly               = pSrcArea->m_bSkyOnly;
-        info.fViewDistRatio         = pSrcArea->m_fViewDistRatio;
-        info.bDoubleSide            = pSrcArea->m_bDoubleSide;
-        info.bUseDeepness           = pSrcArea->m_bUseDeepness;
-        info.bUseInIndoors          = pSrcArea->m_bUseInIndoors;
-        info.bOceanIsVisible        = pSrcArea->m_bOceanVisible;
-        info.bIgnoreGI              = pSrcArea->m_bIgnoreGI;
-        info.bIgnoreOutdoorAO       = pSrcArea->m_bIgnoreOutdoorAO;
-
-        points = pSrcArea->m_lstShapePoints;
-        int numPoints = points.size();
-        for (int p = 0; p < numPoints; ++p)
-        {
-            Vec3& point = points[p];
-
-            point -= localOrigin;
-            point = l2w * point;
-        }
-
-        const char* pName = pSrcArea->m_pVisAreaColdData->m_sName;
-
-        UpdateVisArea(pCloneArea, &points[0], numPoints, pName, info);
-    }
-}
-
-void CVisAreaManager::ClearRegion(const AABB& region)
-{
-    PodArray<CVisArea*> visAreas;
-    IntersectWithBox(region, &visAreas, false);
-
-    bool updated = false;
-
-    // What we're doing here is basically just what's done in DeleteVisArea, but this
-    // should be a pooled vis area, so we don't want to actually delete it.  Instead we
-    // just unregister them and let the pool cleanup actually destruct them.
-    int numAreas = visAreas.size();
-    for (int i = 0; i < numAreas; ++i)
-    {
-        CVisArea* pVisArea = visAreas[i];
-
-        // IntersectWithBox only checks x and y, but we want to also make sure it's in the z
-        if (pVisArea->m_boxArea.min.z < region.max.z && pVisArea->m_boxArea.max.z > region.min.z)
-        {
-            bool deletedVis = m_lstVisAreas.Delete(pVisArea);
-            bool deletedPortal = m_lstPortals.Delete(pVisArea);
-            bool deletedOccluder = m_lstOcclAreas.Delete(pVisArea);
-
-            CRY_ASSERT_MESSAGE(!deletedVis || (m_visAreas.Find(pVisArea) >= 0), "Should only clear pooled vis areas, going to leak");
-            CRY_ASSERT_MESSAGE(!deletedPortal || (m_portals.Find(pVisArea) >= 0), "Should only clear pooled portals, going to leak");
-            CRY_ASSERT_MESSAGE(!deletedOccluder || (m_occlAreas.Find(pVisArea) >= 0), "Should only clear pooled occluders, going to leak");
-
-            if (deletedVis || deletedPortal || deletedOccluder)
-            {
-                updated = true;
-            }
-
-            m_lstActiveOcclVolumes.Delete(pVisArea);
-            m_lstIndoorActiveOcclVolumes.Delete(pVisArea);
-            m_lstActiveEntransePortals.Delete(pVisArea);
-        }
-    }
-
-    if (updated)
-    {
-        m_pCurArea = NULL;
-        m_pCurPortal = NULL;
-        UpdateConnections();
-
-        delete m_pAABBTree;
-        m_pAABBTree = NULL;
-    }
-}
-
-void CVisAreaManager::ActivateObjectsLayer(uint16 nLayerId, bool bActivate, bool bPhys, IGeneralMemoryHeap* pHeap)
-{
-    {
-        uint32 dwSize = m_lstVisAreas.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstVisAreas[dwI]->m_pObjectsTree)
-            {
-                m_lstVisAreas[dwI]->m_pObjectsTree->ActivateObjectsLayer(nLayerId, bActivate, bPhys, pHeap);
-            }
-        }
-    }
-
-    {
-        uint32 dwSize = m_lstPortals.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstPortals[dwI]->m_pObjectsTree)
-            {
-                m_lstPortals[dwI]->m_pObjectsTree->ActivateObjectsLayer(nLayerId, bActivate, bPhys, pHeap);
-            }
-        }
-    }
-}
-
-
-void CVisAreaManager::GetObjects(PodArray<IRenderNode*>& lstObjects, const AABB* pBBox)
-{
-    {
-        uint32 dwSize = m_lstVisAreas.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstVisAreas[dwI]->m_pObjectsTree)
-            {
-                m_lstVisAreas[dwI]->m_pObjectsTree->GetObjects(lstObjects, pBBox);
-            }
-        }
-    }
-
-    {
-        uint32 dwSize = m_lstPortals.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstPortals[dwI]->m_pObjectsTree)
-            {
-                m_lstPortals[dwI]->m_pObjectsTree->GetObjects(lstObjects, pBBox);
-            }
-        }
-    }
-}
-
-void CVisAreaManager::GetObjectsByFlags(uint dwFlags, PodArray<IRenderNode*>& lstObjects)
-{
-    {
-        uint32 dwSize = m_lstVisAreas.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstVisAreas[dwI]->m_pObjectsTree)
-            {
-                m_lstVisAreas[dwI]->m_pObjectsTree->GetObjectsByFlags(dwFlags, lstObjects);
-            }
-        }
-    }
-
-    {
-        uint32 dwSize = m_lstPortals.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstPortals[dwI]->m_pObjectsTree)
-            {
-                m_lstPortals[dwI]->m_pObjectsTree->GetObjectsByFlags(dwFlags, lstObjects);
-            }
-        }
-    }
-}
-
-void CVisAreaManager::GenerateStatObjAndMatTables(std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, SHotUpdateInfo* pExportInfo)
-{
-    {
-        uint32 dwSize = m_lstVisAreas.Count();
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstVisAreas[dwI]->m_pObjectsTree)
-            {
-                m_lstVisAreas[dwI]->m_pObjectsTree->GenerateStatObjAndMatTables(pStatObjTable, pMatTable, pStatInstGroupTable, pExportInfo);
-            }
-        }
-    }
-
-    {
-        uint32 dwSize = m_lstPortals.Count();
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstPortals[dwI]->m_pObjectsTree)
-            {
-                m_lstPortals[dwI]->m_pObjectsTree->GenerateStatObjAndMatTables(pStatObjTable, pMatTable, pStatInstGroupTable, pExportInfo);
-            }
-        }
-    }
-}
-
-bool CVisAreaManager::IsAABBVisibleFromPoint(AABB& box, Vec3 pos)
-{
-    CVisArea* pAreaBox = (CVisArea*)GetVisAreaFromPos(box.GetCenter());
-    CVisArea* pAreaPos = (CVisArea*)GetVisAreaFromPos(pos);
-
-    if (!pAreaBox && !pAreaPos)
-    {
-        return true;     // no indoors involved
-    }
-    PodArray<CVisArea*> arrPortals;
-    int nRecursion = 0;
-    Shadowvolume sv;
-    NAABB_SV::AABB_ReceiverShadowVolume(pos, box, sv);
-
-    bool bRes = false;
-
-    bRes = FindShortestPathToVisArea(pAreaPos, pAreaBox, arrPortals, nRecursion, sv);
-
-    GetRenderer()->DrawLabel(box.GetCenter(), 2, "-%s-", bRes ? "Y" : "N");
-    GetRenderer()->DrawLabel(pos, 2, "-X-");
-    DrawLine(pos, box.GetCenter());
-    DrawBBox(box, bRes ? Col_White : Col_NavyBlue);
-
-    return bRes;
-}
-
-bool CVisAreaManager::FindShortestPathToVisArea(CVisArea* pThisArea, CVisArea* pTargetArea, PodArray<CVisArea*>& arrVisitedAreas, int& nRecursion, const Shadowvolume& sv)
-{
-    // skip double processing
-    if (arrVisitedAreas.Find(pThisArea) >= 0)
-    {
-        return false;
-    }
-
-    // check if point to box frustum intersects pThisArea visarea
-    if (pThisArea && !NAABB_SV::Is_AABB_In_ShadowVolume(sv, *pThisArea->GetAABBox()))
-    {
-        return false;
-    }
-
-    // check if box visarea reached
-    if (pThisArea == pTargetArea)
-    {
-        return true;
-    }
-
-    // register as already processed
-    arrVisitedAreas.Add(pThisArea);
-
-    // recurse to connections
-    if (pThisArea)
-    {
-        for (int p = 0; p < pThisArea->m_lstConnections.Count(); p++)
-        {
-            if (FindShortestPathToVisArea(pThisArea->m_lstConnections[p], pTargetArea, arrVisitedAreas, nRecursion, sv))
-            {
-                return true;
-            }
-        }
-
-        if (pThisArea->IsPortal() && pThisArea->m_lstConnections.Count() == 1 && !pThisArea->m_bSkyOnly)
-        {
-            if (FindShortestPathToVisArea(NULL, pTargetArea, arrVisitedAreas, nRecursion, sv))
-            {
-                return true;
-            }
-        }
-    }
-    else
-    {
-        for (int p = 0; p < m_lstPortals.Count(); p++)
-        {
-            if (m_lstPortals[p]->IsPortal() && m_lstPortals[p]->m_lstConnections.Count() == 1 && !m_lstPortals[p]->m_bSkyOnly)
-            {
-                if (FindShortestPathToVisArea(m_lstPortals[p], pTargetArea, arrVisitedAreas, nRecursion, sv))
-                {
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-CVisArea* CVisAreaManager::CreateTypeVisArea()
-{
-    CVisArea* pNewVisArea = new CVisArea();
-    SGenericColdData* pColdData     = &m_visAreaColdData.AddNew();
-
-    m_visAreas.Add(pNewVisArea);
-    pColdData->ResetGenericData();
-    pNewVisArea->SetColdDataPtr(pColdData);
-
-    return pNewVisArea;
-}
-
-CVisArea* CVisAreaManager::CreateTypePortal()
-{
-    CVisArea* pNewPortal    = new CVisArea();
-    SPortalColdData* pColdData     = &m_portalColdData.AddNew();
-
-    m_portals.Add(pNewPortal);
-    pColdData->ResetPortalData();
-    pNewPortal->SetColdDataPtr(pColdData);
-
-    return pNewPortal;
-}
-
-CVisArea* CVisAreaManager::CreateTypeOcclArea()
-{
-    CVisArea* pNewOcclArea  = new CVisArea();
-    SGenericColdData* pColdData         = &m_occlAreaColdData.AddNew();
-
-    m_occlAreas.Add(pNewOcclArea);
-    pColdData->ResetGenericData();
-    pNewOcclArea->SetColdDataPtr(pColdData);
-
-    return pNewOcclArea;
-}
-
-void CVisAreaManager::InitAABBTree()
-{
-    IF (!m_pAABBTree, 0)
-    {
-        UpdateAABBTree();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-// Segmented World
-void CVisAreaManager::ReleaseInactiveSegments()
-{
-    for (int i = 0; i < m_arrDeletedVisArea.Count(); i++)
-    {
-        int nSlotID = m_arrDeletedVisArea[i];
-        SAFE_DELETE(m_visAreas[nSlotID]->m_pObjectsTree);
-    }
-    m_arrDeletedVisArea.Clear();
-    for (int i = 0; i < m_arrDeletedPortal.Count(); i++)
-    {
-        int nSlotID = m_arrDeletedPortal[i];
-        SAFE_DELETE(m_portals[nSlotID]->m_pObjectsTree);
-    }
-    m_arrDeletedPortal.Clear();
-    for (int i = 0; i < m_arrDeletedOcclArea.Count(); i++)
-    {
-        int nSlotID = m_arrDeletedOcclArea[i];
-        SAFE_DELETE(m_occlAreas[nSlotID]->m_pObjectsTree);
-    }
-    m_arrDeletedOcclArea.Clear();
-}
-
-bool CVisAreaManager::CreateSegment(int nSID)
-{
-    if (nSID >= m_visAreaSegmentData.Count())
-    {
-        m_visAreaSegmentData.PreAllocate(nSID + 1, nSID + 1);
-        m_portalSegmentData.PreAllocate(nSID + 1, nSID + 1);
-        if (GetCVars()->e_OcclusionVolumes)
-        {
-            m_occlAreaSegmentData.PreAllocate(nSID + 1, nSID + 1);
-        }
-    }
-
-    return true;
-}
-
-bool CVisAreaManager::DeleteSegment(int nSID, bool bDeleteNow)
-{
-    if (nSID < 0 || (size_t)nSID >= m_visAreaSegmentData.size())
-    {
-        return false;
-    }
-
-    DeleteVisAreaSegment(nSID, m_visAreaSegmentData, m_lstVisAreas, m_visAreas, m_arrDeletedVisArea);
-    DeleteVisAreaSegment(nSID, m_portalSegmentData, m_lstPortals, m_portals, m_arrDeletedPortal);
-    if (GetCVars()->e_OcclusionVolumes)
-    {
-        DeleteVisAreaSegment(nSID, m_occlAreaSegmentData, m_lstOcclAreas, m_occlAreas, m_arrDeletedOcclArea);
-    }
-
-    if (bDeleteNow)
-    {
-        ReleaseInactiveSegments();
-    }
-
-    return true;
-}
-
-void CVisAreaManager::DeleteVisAreaSegment(int nSID,
-    PodArray<CVisAreaSegmentData>& visAreaSegmentData,
-    PodArray<CVisArea*>& lstVisAreas,
-    PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas,
-    PodArray<int>& deletedVisAreas)
-{
-    std::vector<int>& visAreasInSegment = visAreaSegmentData[nSID].m_visAreaIndices;
-    for (size_t i = 0; i < visAreasInSegment.size(); i++)
-    {
-        int index = visAreasInSegment[i];
-        assert(index >= 0 && index < visAreas.Count());
-        CSWVisArea* pVisArea = (CSWVisArea*)visAreas[index];
-        pVisArea->Release();
-
-        // delete the visarea if it's ref count reaches zero
-        if (!pVisArea->NumRefs())
-        {
-            deletedVisAreas.push_back(index);
-        }
-    }
-    visAreasInSegment.clear();
-
-    for (int i = 0; i < lstVisAreas.Count(); i++)
-    {
-        CSWVisArea* pVisArea = (CSWVisArea*)lstVisAreas[i];
-        if (!pVisArea->NumRefs())
-        {
-            lstVisAreas.Delete(i);
-        }
-    }
-}
-
-CVisArea* CVisAreaManager::FindVisAreaByGuid(VisAreaGUID guid, PodArray<CVisArea*>& lstVisAreas)
-{
-    if (!guid)
-    {
-        for (int i = 0; i < lstVisAreas.Count(); i++)
-        {
-            if (lstVisAreas[i] && guid == lstVisAreas[i]->m_nVisGUID)
-            {
-                return lstVisAreas[i];
-            }
-        }
-    }
-
-    return NULL;
-}
-
-void CVisAreaManager::OffsetPosition(const Vec3& delta)
-{
-    for (int i = 0; i < m_lstVisAreas.Count(); i++)
-    {
-        m_lstVisAreas[i]->OffsetPosition(delta);
-    }
-
-    for (int i = 0; i < m_lstPortals.Count(); i++)
-    {
-        m_lstPortals[i]->OffsetPosition(delta);
-    }
-
-    for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-    {
-        m_lstOcclAreas[i]->OffsetPosition(delta);
-    }
-
-    if (m_pAABBTree)
-    {
-        m_pAABBTree->OffsetPosition(delta);
-    }
-}
diff --git a/Code/CryEngine/Cry3DEngine/VisAreaManCompile.cpp b/Code/CryEngine/Cry3DEngine/VisAreaManCompile.cpp
deleted file mode 100644
index 3398c09c36..0000000000
--- a/Code/CryEngine/Cry3DEngine/VisAreaManCompile.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : check vis
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "ObjMan.h"
-#include "VisAreas.h"
-
-bool CVisAreaManager::GetCompiledData([[maybe_unused]] byte* pData, [[maybe_unused]] int nDataSize, [[maybe_unused]] std::vector<struct IStatObj*>** ppStatObjTable, [[maybe_unused]] std::vector<_smart_ptr<IMaterial>>** ppMatTable, [[maybe_unused]] std::vector<struct IStatInstGroup*>** ppStatInstGroupTable, [[maybe_unused]] EEndian eEndian, [[maybe_unused]] SHotUpdateInfo* pExportInfo)
-{
-# if !ENGINE_ENABLE_COMPILATION
-    CryFatalError("serialization code removed, please enable 3DENGINE_ENABLE_COMPILATION in Cry3DEngine/StdAfx.h");
-    return false;
-# else
-    float fStartTime = GetCurAsyncTimeSec();
-
-
-    //  PrintMessage("Exporting indoor data (%s, %.2f MB) ...",
-
-    // write header
-    SVisAreaManChunkHeader* pVisAreaManagerChunkHeader = (SVisAreaManChunkHeader*)pData;
-    pVisAreaManagerChunkHeader->nVersion = VISAREAMANAGER_CHUNK_VERSION;
-    pVisAreaManagerChunkHeader->nDummy = 0;
-    pVisAreaManagerChunkHeader->nFlags = (eEndian == eBigEndian) ? SERIALIZATION_FLAG_BIG_ENDIAN : 0;
-    pVisAreaManagerChunkHeader->nFlags2 = 0;
-    pVisAreaManagerChunkHeader->nChunkSize = nDataSize;
-
-    SwapEndian(*pVisAreaManagerChunkHeader, eEndian);
-
-    UPDATE_PTR_AND_SIZE(pData, nDataSize, sizeof(SVisAreaManChunkHeader));
-
-    pVisAreaManagerChunkHeader->nVisAreasNum = m_lstVisAreas.Count();
-    pVisAreaManagerChunkHeader->nPortalsNum = m_lstPortals.Count();
-    pVisAreaManagerChunkHeader->nOcclAreasNum = m_lstOcclAreas.Count();
-
-    for (int i = 0; i < m_lstVisAreas.Count(); i++)
-    {
-        m_lstVisAreas[i]->GetData(pData, nDataSize, *ppStatObjTable, *ppMatTable, *ppStatInstGroupTable, eEndian, pExportInfo);
-    }
-
-    for (int i = 0; i < m_lstPortals.Count(); i++)
-    {
-        m_lstPortals[i]->GetData(pData, nDataSize, *ppStatObjTable, *ppMatTable, *ppStatInstGroupTable, eEndian, pExportInfo);
-    }
-
-    for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-    {
-        m_lstOcclAreas[i]->GetData(pData, nDataSize, *ppStatObjTable, *ppMatTable, *ppStatInstGroupTable, eEndian, pExportInfo);
-    }
-
-    SAFE_DELETE(*ppStatObjTable);
-    SAFE_DELETE(*ppMatTable);
-    SAFE_DELETE(*ppStatInstGroupTable);
-
-    if (!pExportInfo)
-    {
-        PrintMessagePlus(" done in %.2f sec", GetCurAsyncTimeSec() - fStartTime);
-    }
-
-    assert(nDataSize == 0);
-    return nDataSize == 0;
-# endif
-}
-
-int CVisAreaManager::GetCompiledDataSize([[maybe_unused]] SHotUpdateInfo* pExportInfo)
-{
-# if !ENGINE_ENABLE_COMPILATION
-    CryFatalError("serialization code removed, please enable 3DENGINE_ENABLE_COMPILATION in Cry3DEngine/StdAfx.h");
-    return 0;
-# else
-
-    int nDataSize = 0;
-    byte* pData = NULL;
-
-    // get header size
-    nDataSize += sizeof(SVisAreaManChunkHeader);
-
-    for (int i = 0; i < m_lstVisAreas.Count(); i++)
-    {
-        m_lstVisAreas[i]->GetData(pData, nDataSize, NULL, NULL, NULL, eLittleEndian, pExportInfo);
-    }
-
-    for (int i = 0; i < m_lstPortals.Count(); i++)
-    {
-        m_lstPortals[i]->GetData(pData, nDataSize, NULL, NULL, NULL, eLittleEndian, pExportInfo);
-    }
-
-    for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-    {
-        m_lstOcclAreas[i]->GetData(pData, nDataSize, NULL, NULL, NULL, eLittleEndian, pExportInfo);
-    }
-
-    return nDataSize;
-# endif
-}
-
-bool CVisAreaManager::Load(AZ::IO::HandleType& fileHandle, int& nDataSize, struct SVisAreaManChunkHeader* pVisAreaManagerChunkHeader, std::vector<struct IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable)
-{
-    bool bRes;
-
-    // in case of small data amount (console game) load entire file into memory in single operation
-    if (nDataSize < 4 * 1024 * 1024)
-    {
-        auto pMemBlock = gEnv->pCryPak->PoolAllocMemoryBlock(nDataSize + 8, "LoadIndoors");
-        byte* pPtr = (byte*)pMemBlock->m_address.get();
-        while (UINT_PTR(pPtr) & 3)
-        {
-            pPtr++;
-        }
-
-        if (GetPak()->FReadRaw(pPtr, 1, nDataSize - sizeof(SVisAreaManChunkHeader), fileHandle) != nDataSize - sizeof(SVisAreaManChunkHeader))
-        {
-            return false;
-        }
-
-        bRes = Load_T(pPtr, nDataSize, pVisAreaManagerChunkHeader, pStatObjTable, pMatTable, false, NULL);
-    }
-    else
-    {
-        bRes = Load_T(fileHandle, nDataSize, pVisAreaManagerChunkHeader, pStatObjTable, pMatTable, false, NULL);
-    }
-
-    return bRes;
-}
-
-bool CVisAreaManager::SetCompiledData(byte* pData, int nDataSize, std::vector<struct IStatObj*>** ppStatObjTable, std::vector<_smart_ptr<IMaterial>>** ppMatTable, bool bHotUpdate, SHotUpdateInfo* pExportInfo)
-{
-    SVisAreaManChunkHeader* pChunkHeader = (SVisAreaManChunkHeader*)pData;
-    pData += sizeof(SVisAreaManChunkHeader);
-
-    SwapEndian(*pChunkHeader, eLittleEndian);
-
-    bool bRes = Load_T(pData, nDataSize, pChunkHeader, *ppStatObjTable, *ppMatTable, bHotUpdate, pExportInfo);
-
-    SAFE_DELETE(*ppStatObjTable);
-    SAFE_DELETE(*ppMatTable);
-
-    return bRes;
-}
-
-void CVisAreaManager::UnregisterEngineObjectsInArea(const SHotUpdateInfo* pExportInfo, PodArray<IRenderNode*>& arrUnregisteredObjects, bool bOnlyEngineObjects)
-{
-    for (int i = 0; i < m_lstVisAreas.Count(); i++)
-    {
-        if (m_lstVisAreas[i]->m_pObjectsTree)
-        {
-            m_lstVisAreas[i]->m_pObjectsTree->UnregisterEngineObjectsInArea(pExportInfo, arrUnregisteredObjects, bOnlyEngineObjects);
-        }
-    }
-
-    for (int i = 0; i < m_lstPortals.Count(); i++)
-    {
-        if (m_lstPortals[i]->m_pObjectsTree)
-        {
-            m_lstPortals[i]->m_pObjectsTree->UnregisterEngineObjectsInArea(pExportInfo, arrUnregisteredObjects, bOnlyEngineObjects);
-        }
-    }
-
-    for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-    {
-        if (m_lstOcclAreas[i]->m_pObjectsTree)
-        {
-            m_lstOcclAreas[i]->m_pObjectsTree->UnregisterEngineObjectsInArea(pExportInfo, arrUnregisteredObjects, bOnlyEngineObjects);
-        }
-    }
-}
-
-void CVisAreaManager::OnVisAreaDeleted(IVisArea* pArea)
-{
-    for (int i = 0, num = m_lstCallbacks.size(); i < num; i++)
-    {
-        m_lstCallbacks[i]->OnVisAreaDeleted(pArea);
-    }
-
-    m_lstActiveOcclVolumes.Delete((CVisArea*)pArea);
-    m_lstIndoorActiveOcclVolumes.Delete((CVisArea*)pArea);
-    m_lstActiveEntransePortals.Delete((CVisArea*)pArea);
-}
-
-template <class T>
-bool CVisAreaManager::Load_T(T& f, int& nDataSize, SVisAreaManChunkHeader* pVisAreaManagerChunkHeader, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, [[maybe_unused]] bool bHotUpdate, SHotUpdateInfo* pExportInfo)
-{
-    if (pVisAreaManagerChunkHeader->nVersion != VISAREAMANAGER_CHUNK_VERSION)
-    {
-        Error("CVisAreaManager::SetCompiledData: version of file is %d, expected version is %d", pVisAreaManagerChunkHeader->nVersion, (int)VISAREAMANAGER_CHUNK_VERSION);
-        return 0;
-    }
-
-    if (pVisAreaManagerChunkHeader->nChunkSize != nDataSize)
-    {
-        Error("CVisAreaManager::SetCompiledData: data size mismatch (%d != %d)", pVisAreaManagerChunkHeader->nChunkSize, nDataSize);
-        return 0;
-    }
-
-
-    EEndian eEndian = (pVisAreaManagerChunkHeader->nFlags & SERIALIZATION_FLAG_BIG_ENDIAN) ? eBigEndian : eLittleEndian;
-
-    PodArray<IRenderNode*> arrUnregisteredObjects;
-    UnregisterEngineObjectsInArea(pExportInfo, arrUnregisteredObjects, true);
-
-    PodArray<IRenderNode*> arrUnregisteredEntities;
-    UnregisterEngineObjectsInArea(NULL, arrUnregisteredEntities, false);
-
-    DeleteAllVisAreas();
-
-    SAFE_DELETE(m_pAABBTree);
-    m_pCurArea = m_pCurPortal = 0;
-
-    { // construct areas
-        m_lstVisAreas.PreAllocate(pVisAreaManagerChunkHeader->nVisAreasNum, pVisAreaManagerChunkHeader->nVisAreasNum);
-        m_lstPortals.PreAllocate(pVisAreaManagerChunkHeader->nPortalsNum, pVisAreaManagerChunkHeader->nPortalsNum);
-        m_lstOcclAreas.PreAllocate(pVisAreaManagerChunkHeader->nOcclAreasNum, pVisAreaManagerChunkHeader->nOcclAreasNum);
-
-        nDataSize -= sizeof(SVisAreaManChunkHeader);
-
-        //    if(bHotUpdate)
-        //    PrintMessage("Importing indoor data (%s, %.2f MB) ...",
-        m_visAreas.PreAllocate(pVisAreaManagerChunkHeader->nVisAreasNum);
-        m_visAreaColdData.PreAllocate(pVisAreaManagerChunkHeader->nVisAreasNum);
-
-        m_portals.PreAllocate(pVisAreaManagerChunkHeader->nPortalsNum);
-        m_portalColdData.PreAllocate(pVisAreaManagerChunkHeader->nPortalsNum);
-
-        m_occlAreas.PreAllocate(pVisAreaManagerChunkHeader->nOcclAreasNum);
-        m_occlAreaColdData.PreAllocate(pVisAreaManagerChunkHeader->nOcclAreasNum);
-
-        for (int i = 0; i < m_lstVisAreas.Count(); i++)
-        {
-            m_lstVisAreas[i] = CreateTypeVisArea();
-        }
-        for (int i = 0; i < m_lstPortals.Count(); i++)
-        {
-            m_lstPortals[i] = CreateTypePortal();
-        }
-        for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-        {
-            m_lstOcclAreas[i] = CreateTypeOcclArea();
-        }
-    }
-
-    { // load areas content
-        for (int i = 0; i < m_lstVisAreas.Count(); i++)
-        {
-            m_lstVisAreas[i]->Load(f, nDataSize, pStatObjTable, pMatTable, eEndian, pExportInfo);
-        }
-
-        for (int i = 0; i < m_lstPortals.Count(); i++)
-        {
-            m_lstPortals[i]->Load(f, nDataSize, pStatObjTable, pMatTable, eEndian, pExportInfo);
-        }
-
-        for (int i = 0; i < m_lstOcclAreas.Count(); i++)
-        {
-            m_lstOcclAreas[i]->Load(f, nDataSize, pStatObjTable, pMatTable, eEndian, pExportInfo);
-        }
-    }
-
-    for (int i = 0; i < arrUnregisteredObjects.Count(); i++)
-    {
-        arrUnregisteredObjects[i]->ReleaseNode();
-    }
-    arrUnregisteredObjects.Reset();
-
-    for (int i = 0; i < arrUnregisteredEntities.Count(); i++)
-    {
-        Get3DEngine()->RegisterEntity(arrUnregisteredEntities[i]);
-    }
-    arrUnregisteredEntities.Reset();
-
-    SAFE_DELETE(m_pAABBTree);
-    m_pCurArea = m_pCurPortal = 0;
-    UpdateConnections();
-
-    return nDataSize == 0;
-}
-
-//////////////////////////////////////////////////////////////////////
-// Segmented World
-inline bool IsContainBox2D(const AABB& base, const AABB& test)
-{
-    if (base.min.x < test.max.x && base.max.x > test.min.x &&
-        base.min.y < test.max.y && base.max.y > test.min.y)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CVisAreaManager::PrepareSegmentData(const AABB& box)
-{
-    m_segVisAreas.Clear();
-    for (int v = 0; v < m_lstVisAreas.Count(); v++)
-    {
-        if (IsContainBox2D(m_lstVisAreas[v]->m_boxArea, box))
-        {
-            m_segVisAreas.Add(m_lstVisAreas[v]);
-        }
-    }
-
-    m_segPortals.Clear();
-    for (int p = 0; p < m_lstPortals.Count(); p++)
-    {
-        if (IsContainBox2D(m_lstPortals[p]->m_boxArea, box))
-        {
-            m_segPortals.Add(m_lstPortals[p]);
-        }
-    }
-
-    m_segOcclAreas.Clear();
-    for (int o = 0; o < m_lstOcclAreas.Count(); o++)
-    {
-        if (IsContainBox2D(m_lstOcclAreas[o]->m_boxArea, box))
-        {
-            m_segOcclAreas.Add(m_lstOcclAreas[o]);
-        }
-    }
-}
-
-bool CVisAreaManager::StreamCompiledData(uint8* pData, int nDataSize, int nSID, std::vector<struct IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<struct IStatInstGroup*>* pStatInstGroupTable, const Vec2& vIndexOffset)
-{
-    SVisAreaManChunkHeader* pVisAreaManagerChunkHeader = (SVisAreaManChunkHeader*)pData;
-
-    pData += sizeof(SVisAreaManChunkHeader);
-    nDataSize -= sizeof(SVisAreaManChunkHeader);
-
-    assert(pVisAreaManagerChunkHeader->nVersion == VISAREAMANAGER_CHUNK_VERSION);
-
-    EEndian eEndian = (pVisAreaManagerChunkHeader->nFlags & SERIALIZATION_FLAG_BIG_ENDIAN) ? eBigEndian : eLittleEndian;
-
-    SAFE_DELETE(m_pAABBTree);
-    m_pCurArea = m_pCurPortal = 0;
-
-    for (int i = 0; i < pVisAreaManagerChunkHeader->nVisAreasNum; i++)
-    {
-        VisAreaGUID guid = CVisArea::GetGUIDFromFile(pData, eEndian);
-        CSWVisArea* pVisArea = (CSWVisArea*)FindVisAreaByGuid(guid, m_lstVisAreas);
-        if (!pVisArea)
-        {
-            pVisArea = CreateVisAreaFromPool(m_lstVisAreas, m_visAreas, m_visAreaColdData, false);
-            m_lstVisAreas.Add(pVisArea);
-        }
-        pVisArea->AddRef();
-        m_visAreaSegmentData[nSID].m_visAreaIndices.push_back(pVisArea->m_nSlotID);
-        pVisArea->Load(pData, nDataSize, nSID, pStatObjTable, pMatTable, eEndian, 0, vIndexOffset);
-    }
-
-    for (int i = 0; i < pVisAreaManagerChunkHeader->nPortalsNum; i++)
-    {
-        VisAreaGUID guid = CVisArea::GetGUIDFromFile(pData, eEndian);
-        CSWVisArea* pVisArea = (CSWVisArea*)FindVisAreaByGuid(guid, m_lstPortals);
-        if (!pVisArea)
-        {
-            pVisArea = CreateVisAreaFromPool(m_lstPortals, m_portals, m_portalColdData, true);
-            m_lstPortals.Add(pVisArea);
-        }
-        pVisArea->AddRef();
-        m_portalSegmentData[nSID].m_visAreaIndices.push_back(pVisArea->m_nSlotID);
-        pVisArea->Load(pData, nDataSize, nSID, pStatObjTable, pMatTable, eEndian, 0, vIndexOffset);
-    }
-
-    for (int i = 0; i < pVisAreaManagerChunkHeader->nOcclAreasNum; i++)
-    {
-        VisAreaGUID guid = CVisArea::GetGUIDFromFile(pData, eEndian);
-        CSWVisArea* pVisArea = (CSWVisArea*)FindVisAreaByGuid(guid, m_lstOcclAreas);
-        if (!pVisArea)
-        {
-            pVisArea = CreateVisAreaFromPool(m_lstOcclAreas, m_occlAreas, m_occlAreaColdData, false);
-            m_lstOcclAreas.Add(pVisArea);
-        }
-        pVisArea->AddRef();
-        m_occlAreaSegmentData[nSID].m_visAreaIndices.push_back(pVisArea->m_nSlotID);
-        pVisArea->Load(pData, nDataSize, nSID, pStatObjTable, pMatTable, eEndian, 0, vIndexOffset);
-    }
-
-    SAFE_DELETE(m_pAABBTree);
-    m_pCurArea = m_pCurPortal = 0;
-
-    SAFE_DELETE(pStatObjTable);
-    SAFE_DELETE(pMatTable);
-    SAFE_DELETE(pStatInstGroupTable);
-
-    return !(nDataSize == 0);
-}
-
-CSWVisArea* CVisAreaManager::FindFreeVisAreaFromPool(PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas)
-{
-    for (int i = 0; i < visAreas.Count(); i++)
-    {
-        CSWVisArea* pVisArea = (CSWVisArea*)visAreas[i];
-
-        if (!pVisArea->NumRefs())
-        {
-            pVisArea->m_nSlotID = i;
-            return pVisArea;
-        }
-    }
-
-    return NULL;
-}
-
-template<class T>
-CSWVisArea* CVisAreaManager::CreateVisAreaFromPool(PodArray<CVisArea*>& lstVisAreas, PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas, PodArray<T>& visAreaColdData, bool bIsPortal)
-{
-    CSWVisArea* pVisArea = FindFreeVisAreaFromPool(visAreas);
-    if (!pVisArea)
-    {
-        int nVisArea = visAreas.Count();
-        visAreas.PreAllocate(nVisArea * 2);
-        visAreaColdData.PreAllocate(nVisArea * 2);
-
-        ResetVisAreaList(lstVisAreas, visAreas, visAreaColdData);
-
-        pVisArea = CreateTypeArea(visAreas, visAreaColdData, bIsPortal);
-
-        // assign the slot id once the pool is enlarged
-        pVisArea->m_nSlotID = nVisArea;
-    }
-
-    return pVisArea;
-}
-
-template<class T>
-void CVisAreaManager::ResetVisAreaList(PodArray<CVisArea*>& lstVisAreas, PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas, PodArray<T>& visAreaColdData)
-{
-    for (int i = 0; i < visAreas.Count(); i++)
-    {
-        CVisArea* pVisArea = visAreas[i];
-        if (pVisArea->m_pObjectsTree)
-        {
-            pVisArea->m_pObjectsTree->SetVisArea(pVisArea);
-        }
-        pVisArea->SetColdDataPtr(&visAreaColdData[i]);
-        lstVisAreas[i] = pVisArea;
-    }
-}
-
-template<class T>
-CSWVisArea* CVisAreaManager::CreateTypeArea(PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas, PodArray<T>& visAreaColdData, bool bIsPortal)
-{
-    CSWVisArea* pNewVisArea = new CSWVisArea();
-    SGenericColdData* pColdData     = &visAreaColdData.AddNew();
-
-    visAreas.Add(pNewVisArea);
-    pColdData->m_dataType = bIsPortal ? eCDT_Portal : eCDT_Generic;
-    pNewVisArea->SetColdDataPtr(pColdData);
-
-    return pNewVisArea;
-}
-
diff --git a/Code/CryEngine/Cry3DEngine/VisArea_Jobs.cpp b/Code/CryEngine/Cry3DEngine/VisArea_Jobs.cpp
deleted file mode 100644
index e95f203b5f..0000000000
--- a/Code/CryEngine/Cry3DEngine/VisArea_Jobs.cpp
+++ /dev/null
@@ -1,809 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Visibility areas
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "3dEngine.h"
-#include "TimeOfDay.h"
-#include "AABBSV.h"
-#include "Cry_LegacyPhysUtils.h"
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-bool InsidePolygon(const Vec3* __restrict polygon, int N, const Vec3& p)
-{
-    int counter = 0;
-    int i;
-    float xinters;
-    const Vec3* p1 = &polygon[0];
-
-    for (i = 1; i <= N; i++)
-    {
-        const Vec3* p2 = &polygon[i % N];
-        if (p.y > min(p1->y, p2->y))
-        {
-            if (p.y <= max(p1->y, p2->y))
-            {
-                if (p.x <= max(p1->x, p2->x))
-                {
-                    if (p1->y != p2->y)
-                    {
-                        xinters = (p.y - p1->y) * (p2->x - p1->x) / (p2->y - p1->y) + p1->x;
-                        if (p1->x == p2->x || p.x <= xinters)
-                        {
-                            counter++;
-                        }
-                    }
-                }
-            }
-        }
-        p1 = p2;
-    }
-
-    if (counter % 2 == 0)
-    {
-        return(false);
-    }
-    else
-    {
-        return(true);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool InsideSpherePolygon(Vec3* polygon, int N, Sphere& S)
-{
-    int i;
-    Vec3 p1, p2;
-
-    p1 = polygon[0];
-    for (i = 1; i <= N; i++)
-    {
-        p2 = polygon[i % N];
-        Vec3 vA(p1 - S.center);
-        Vec3 vD(p2 - p1);
-        vA.z = vD.z = 0;
-        vD.NormalizeSafe();
-        float fB = vD.Dot(vA);
-        float fC = vA.Dot(vA) - S.radius * S.radius;
-        if (fB * fB >= fC)           //at least 1 root
-        {
-            return(true);
-        }
-        p1 = p2;
-    }
-
-    return(false);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-void CVisAreaManager::GetNearestCubeProbe(float& fMinDistance, int& nMaxPriority, CLightEntity*& pNearestLight, const AABB* pBBox)
-{
-    {
-        uint32 dwSize = m_lstVisAreas.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstVisAreas[dwI]->m_pObjectsTree)
-            {
-                if (!pBBox || Overlap::AABB_AABB(*m_lstVisAreas[dwI]->GetAABBox(), *pBBox))
-                {
-                    m_lstVisAreas[dwI]->m_pObjectsTree->GetNearestCubeProbe(fMinDistance, nMaxPriority, pNearestLight, pBBox);
-                }
-            }
-        }
-    }
-
-    {
-        uint32 dwSize = m_lstPortals.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstPortals[dwI]->m_pObjectsTree)
-            {
-                if (!pBBox || Overlap::AABB_AABB(*m_lstPortals[dwI]->GetAABBox(), *pBBox))
-                {
-                    m_lstPortals[dwI]->m_pObjectsTree->GetNearestCubeProbe(fMinDistance, nMaxPriority, pNearestLight, pBBox);
-                }
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CVisAreaManager::GetObjectsByType(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback)
-{
-    {
-        uint32 dwSize = m_lstVisAreas.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstVisAreas[dwI]->m_pObjectsTree)
-            {
-                if (!pBBox || Overlap::AABB_AABB(*m_lstVisAreas[dwI]->GetAABBox(), *pBBox))
-                {
-                    m_lstVisAreas[dwI]->m_pObjectsTree->GetObjectsByType(lstObjects, objType, pBBox, filterCallback);
-                }
-            }
-        }
-    }
-
-    {
-        uint32 dwSize = m_lstPortals.Count();
-
-        for (uint32 dwI = 0; dwI < dwSize; ++dwI)
-        {
-            if (m_lstPortals[dwI]->m_pObjectsTree)
-            {
-                if (!pBBox || Overlap::AABB_AABB(*m_lstPortals[dwI]->GetAABBox(), *pBBox))
-                {
-                    m_lstPortals[dwI]->m_pObjectsTree->GetObjectsByType(lstObjects, objType, pBBox, filterCallback);
-                }
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisAreaManager::IsOccludedByOcclVolumes(const AABB& objBox, const SRenderingPassInfo& passInfo, bool bCheckOnlyIndoorVolumes)
-{
-    PodArray<CVisArea*>& rList = bCheckOnlyIndoorVolumes ? m_lstIndoorActiveOcclVolumes : m_lstActiveOcclVolumes;
-
-    for (int i = 0; i < rList.Count(); i++)
-    {
-        CCamera* pCamera = rList[i]->m_arrOcclCamera[passInfo.GetRecursiveLevel()];
-        bool bAllIn = 0;
-        if (pCamera)
-        {
-            // reduce code size by skipping many cache lookups in the camera functions as well as the camera constructor
-            char bufCamera[sizeof(CCamera)] _ALIGN(128);
-            memcpy(bufCamera, pCamera, sizeof(CCamera));
-            if (alias_cast<CCamera*>(bufCamera)->IsAABBVisible_EH(objBox, &bAllIn))
-            {
-                if (bAllIn)
-                {
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-IVisArea* CVisAreaManager::GetVisAreaFromPos(const Vec3& vPos)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    if (!m_pAABBTree)
-    {
-        UpdateAABBTree();
-    }
-
-    return m_pAABBTree->FindVisarea(vPos);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisArea::IsBoxOverlapVisArea(const AABB& objBox)
-{
-    if (!Overlap::AABB_AABB(objBox, m_boxArea))
-    {
-        return false;
-    }
-
-    PodArray<Vec3>& polygonA = s_tmpPolygonA;
-    polygonA.Clear();
-    polygonA.Add(Vec3(objBox.min.x, objBox.min.y, objBox.min.z));
-    polygonA.Add(Vec3(objBox.min.x, objBox.max.y, objBox.min.z));
-    polygonA.Add(Vec3(objBox.max.x, objBox.max.y, objBox.min.z));
-    polygonA.Add(Vec3(objBox.max.x, objBox.min.y, objBox.min.z));
-    return Overlap::Polygon_Polygon2D< PodArray<Vec3> >(polygonA, m_lstShapePoints);
-}
-
-#define PORTAL_GEOM_BBOX_EXTENT 1.5f
-
-///////////////////////////////////////////////////////////////////////////////
-void CVisArea::UpdateGeometryBBox()
-{
-    m_boxStatics.max = m_boxArea.max;
-    m_boxStatics.min = m_boxArea.min;
-
-    if (IsPortal())
-    { // fix for big objects passing portal
-        m_boxStatics.max += Vec3(PORTAL_GEOM_BBOX_EXTENT, PORTAL_GEOM_BBOX_EXTENT, PORTAL_GEOM_BBOX_EXTENT);
-        m_boxStatics.min -= Vec3(PORTAL_GEOM_BBOX_EXTENT, PORTAL_GEOM_BBOX_EXTENT, PORTAL_GEOM_BBOX_EXTENT);
-    }
-
-    if (m_pObjectsTree)
-    {
-        PodArray<IRenderNode*> lstObjects;
-        m_pObjectsTree->GetObjectsByType(lstObjects, eERType_StaticMeshRenderComponent, NULL);
-
-        for (int i = 0; i < lstObjects.Count(); i++)
-        {
-            AABB aabb;
-            lstObjects[i]->FillBBox(aabb);
-            m_boxStatics.Add(aabb);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CVisArea::UpdateClipVolume()
-{
-    if (m_lstShapePoints.Count() < 3)
-    {
-        return;
-    }
-
-    const int nPoints = m_lstShapePoints.size();
-    const int nVertexCount = nPoints * 2;
-    const int nIndexCount = (2 * nPoints + 2 * (nPoints - 2)) * 3; // 2*nPoints for sides, nPoints-2 for top and nPoints-2 for bottom
-
-    m_pClipVolumeMesh = NULL;
-
-    if (nPoints < 3)
-    {
-        return;
-    }
-
-    std::vector<SVF_P3F_C4B_T2F> vertices;
-    std::vector<vtx_idx> indices;
-
-    vertices.resize(nVertexCount);
-    indices.resize(nIndexCount);
-
-    std::vector<Vec2> triangulationPoints;
-    triangulationPoints.resize(nPoints + 1);
-    MARK_UNUSED triangulationPoints[nPoints].x;
-
-    for (int i = 0; i < nPoints; ++i)
-    {
-        int nPointIdx = IsShapeClockwise() ? nPoints - 1 - i : i;
-
-        vertices[i].xyz = m_lstShapePoints[nPointIdx];
-        vertices[i].color.dcolor = 0xFFFFFFFF;
-        vertices[i].st = Vec2(ZERO);
-
-        vertices[i + nPoints].xyz = m_lstShapePoints[nPointIdx] + Vec3(0, 0, m_fHeight);
-        vertices[i + nPoints].color.dcolor = 0xFFFFFFFF;
-        vertices[i + nPoints].st = Vec2(ZERO);
-
-        triangulationPoints[i] = Vec2(m_lstShapePoints[nPointIdx]);
-    }
-
-    // triangulate shape first
-    std::vector<int> triangleIndices;
-    triangleIndices.resize((nPoints - 2) * 3);
-    MARK_UNUSED triangleIndices[triangleIndices.size() - 1];
-
-    int nTris = LegacyCryPhysicsUtils::TriangulatePoly(&triangulationPoints[0], triangulationPoints.size(), &triangleIndices[0], triangleIndices.size());
-
-    if (nTris == nPoints - 2) // triangulation success?
-    {
-        // top and bottom faces
-        size_t nCurIndex = 0;
-        for (; nCurIndex < triangleIndices.size(); nCurIndex += 3)
-        {
-            indices[nCurIndex + 2] = triangleIndices[nCurIndex + 0];
-            indices[nCurIndex + 1] = triangleIndices[nCurIndex + 1];
-            indices[nCurIndex + 0] = triangleIndices[nCurIndex + 2];
-
-            indices[triangleIndices.size() + nCurIndex + 0] = triangleIndices[nCurIndex + 0] + nPoints;
-            indices[triangleIndices.size() + nCurIndex + 1] = triangleIndices[nCurIndex + 1] + nPoints;
-            indices[triangleIndices.size() + nCurIndex + 2] = triangleIndices[nCurIndex + 2] + nPoints;
-        }
-
-        nCurIndex = 2 * triangleIndices.size();
-
-        // side faces
-        for (int i = 0; i < nPoints; i++)
-        {
-            vtx_idx bl = i;
-            vtx_idx br = (i + 1) % nPoints;
-
-            indices[nCurIndex++] = bl;
-            indices[nCurIndex++] = br + nPoints;
-            indices[nCurIndex++] = bl + nPoints;
-
-            indices[nCurIndex++] = bl;
-            indices[nCurIndex++] = br;
-            indices[nCurIndex++] = br + nPoints;
-        }
-
-        m_pClipVolumeMesh = gEnv->pRenderer->CreateRenderMeshInitialized(&vertices[0], vertices.size(),
-                eVF_P3F_C4B_T2F, &indices[0], indices.size(), prtTriangleList,
-                "ClipVolume", GetName(), eRMT_Dynamic);
-    }
-}
-
-
-void CVisArea::GetClipVolumeMesh(_smart_ptr<IRenderMesh>& renderMesh, Matrix34& worldTM) const
-{
-    renderMesh = m_pClipVolumeMesh;
-    worldTM = Matrix34(IDENTITY);
-}
-
-uint CVisArea::GetClipVolumeFlags() const
-{
-    int nFlags = IClipVolume::eClipVolumeIsVisArea;
-    nFlags |= IsConnectedToOutdoor() ? IClipVolume::eClipVolumeConnectedToOutdoor : 0;
-    nFlags |= IsAffectedByOutLights() ? IClipVolume::eClipVolumeAffectedBySun : 0;
-    nFlags |= IsIgnoringGI() ? IClipVolume::eClipVolumeIgnoreGI : 0;
-    nFlags |= IsIgnoringOutdoorAO()   ? IClipVolume::eClipVolumeIgnoreOutdoorAO    : 0;
-
-    return nFlags;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CVisArea::UpdatePortalBlendInfo()
-{
-    if (m_bThisIsPortal && m_lstConnections.Count() > 0 && GetCVars()->e_PortalsBlend > 0 && m_fPortalBlending > 0)
-    {
-        SClipVolumeBlendInfo blendInfo;
-        Vec3 vPlanePoints[2][3];
-        uint nPointCount[2] = {0, 0};
-
-        for (int p = 0; p < m_lstShapePoints.Count(); ++p)
-        {
-            Vec3 vTestPoint = m_lstShapePoints[p] + Vec3(0, 0, m_fHeight * 0.5f);
-            int nVisAreaIndex = (m_lstConnections[0] && m_lstConnections[0]->IsPointInsideVisArea(vTestPoint)) ? 0 : 1;
-
-            if (nPointCount[nVisAreaIndex] < 2)
-            {
-                vPlanePoints[nVisAreaIndex][nPointCount[nVisAreaIndex]] = m_lstShapePoints[p];
-                nPointCount[nVisAreaIndex]++;
-            }
-        }
-
-        for (int i = 0; i < 2; ++i)
-        {
-            if (nPointCount[i] == 2)
-            {
-                if (IsShapeClockwise())
-                {
-                    std::swap(vPlanePoints[i][0], vPlanePoints[i][1]);
-                }
-
-                blendInfo.blendPlanes[i] = Plane::CreatePlane(vPlanePoints[i][0], vPlanePoints[i][0] + Vec3(0, 0, m_fHeight), vPlanePoints[i][1]);
-                blendInfo.blendVolumes[i] = i < m_lstConnections.Count() ? m_lstConnections[i] : NULL;
-
-                // make sure plane normal points inside portal
-                if (nPointCount[(i + 1) % 2] > 0)
-                {
-                    Vec3 c(ZERO);
-                    for (uint j = 0; j < nPointCount[(i + 1) % 2]; ++j)
-                    {
-                        c += vPlanePoints[(i + 1) % 2][j];
-                    }
-                    c /= (float)nPointCount[(i + 1) % 2];
-
-                    if (blendInfo.blendPlanes[i].DistFromPlane(c) < 0)
-                    {
-                        blendInfo.blendPlanes[i].n = -blendInfo.blendPlanes[i].n;
-                        blendInfo.blendPlanes[i].d = -blendInfo.blendPlanes[i].d;
-                    }
-                }
-            }
-            else
-            {
-                blendInfo.blendPlanes[i] = Plane(Vec3(ZERO), 0);
-                blendInfo.blendVolumes[i] = NULL;
-            }
-        }
-
-        // weight planes by user specified importance. works because we renormalize in the shader
-        float planeWeight = clamp_tpl(m_fPortalBlending, 1e-5f, 1.f - 1e-5f);
-
-        blendInfo.blendPlanes[0].n *= planeWeight;
-        blendInfo.blendPlanes[0].d *= planeWeight;
-        blendInfo.blendPlanes[1].n *= 1 - planeWeight;
-        blendInfo.blendPlanes[1].d *= 1 - planeWeight;
-
-        GetRenderer()->EF_SetDeferredClipVolumeBlendData(this, blendInfo);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisAreaManager::SetEntityArea(IRenderNode* pEnt, const AABB& objBox, const float fObjRadiusSqr)
-{
-    assert(pEnt);
-
-    Vec3 vEntCenter = Get3DEngine()->GetEntityRegisterPoint(pEnt);
-
-    // find portal containing object center
-    CVisArea* pVisArea = NULL;
-
-    const int kNumPortals = m_lstPortals.Count();
-    for (int v = 0; v < kNumPortals; v++)
-    {
-        CVisArea* pCurrentPortal = m_lstPortals[v];
-        PrefetchLine(pCurrentPortal, 256);
-        PrefetchLine(pCurrentPortal, 384);
-        if (pCurrentPortal->IsPointInsideVisArea(vEntCenter))
-        {
-            pVisArea = pCurrentPortal;
-            if (!pVisArea->m_pObjectsTree)
-            {
-                pVisArea->m_pObjectsTree = COctreeNode::Create(DEFAULT_SID, pVisArea->m_boxArea, pVisArea);
-            }
-            pVisArea->m_pObjectsTree->InsertObject(pEnt, objBox, fObjRadiusSqr, vEntCenter);
-            break;
-        }
-    }
-
-    if (!pVisArea && pEnt->m_dwRndFlags & ERF_REGISTER_BY_BBOX)
-    {
-        AABB aabb;
-        pEnt->FillBBox(aabb);
-
-        for (int v = 0; v < kNumPortals; v++)
-        {
-            CVisArea* pCurrentPortal = m_lstPortals[v];
-            PrefetchLine(pCurrentPortal, 256);
-            PrefetchLine(pCurrentPortal, 384);
-            if (pCurrentPortal->IsBoxOverlapVisArea(aabb))
-            {
-                pVisArea = pCurrentPortal;
-                if (!pVisArea->m_pObjectsTree)
-                {
-                    pVisArea->m_pObjectsTree = COctreeNode::Create(DEFAULT_SID, pVisArea->m_boxArea, pVisArea);
-                }
-
-                pVisArea->m_pObjectsTree->InsertObject(pEnt, objBox, fObjRadiusSqr, vEntCenter);
-                break;
-            }
-        }
-    }
-
-    if (!pVisArea) // if portal not found - find volume
-    {
-        const int kNumVisAreas = m_lstVisAreas.Count();
-        for (int v = 0; v < kNumVisAreas; v++)
-        {
-            CVisArea* pCurrentVisArea = m_lstVisAreas[v];
-            PrefetchLine(pCurrentVisArea, 256);
-            PrefetchLine(pCurrentVisArea, 384);
-            if (pCurrentVisArea->IsPointInsideVisArea(vEntCenter))
-            {
-                pVisArea = pCurrentVisArea;
-                if (!pVisArea->m_pObjectsTree)
-                {
-                    pVisArea->m_pObjectsTree = COctreeNode::Create(DEFAULT_SID, pVisArea->m_boxArea, pVisArea);
-                }
-                pVisArea->m_pObjectsTree->InsertObject(pEnt, objBox, fObjRadiusSqr, vEntCenter);
-                break;
-            }
-        }
-    }
-
-    if (pVisArea && 
-        (pEnt->GetRenderNodeType() == eERType_StaticMeshRenderComponent)
-       ) // update bbox of exit portal
-    {
-        if (pVisArea->IsPortal())
-        {
-            pVisArea->UpdateGeometryBBox();
-        }
-    }
-
-    return pVisArea != 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-CVisArea* SAABBTreeNode::FindVisarea(const Vec3& vPos)
-{
-    if (nodeBox.IsContainPoint(vPos))
-    {
-        if (nodeAreas.Count())
-        { // leaf
-            for (int i = 0; i < nodeAreas.Count(); i++)
-            {
-                if (nodeAreas[i]->m_bActive && nodeAreas[i]->IsPointInsideVisArea(vPos))
-                {
-                    return nodeAreas[i];
-                }
-            }
-        }
-        else
-        { // node
-            for (int i = 0; i < 2; i++)
-            {
-                if (arrChilds[i])
-                {
-                    if (CVisArea* pArea = arrChilds[i]->FindVisarea(vPos))
-                    {
-                        return pArea;
-                    }
-                }
-            }
-        }
-    }
-
-    return NULL;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// Current scheme: Will never move sphere center, just clip radius, even to 0.
-bool CVisArea::ClipToVisArea(bool bInside, Sphere& sphere, Vec3 const& vNormal)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    /*
-        Clip        PointZ  PointXY
-
-        In          In          In                  inside, clip Z and XY
-        In          In          Out                 outside, return 0
-        In          Out         In                  outside, return 0
-        In          Out         Out                 outside, return 0
-
-        Out         In          In                  inside, return 0
-        Out         In          Out                 outside, clip XY
-        Out         Out         In                  outside, clip Z
-        Out         Out         Out                 outside, clip XY
-    */
-
-    bool bClipXY = false, bClipZ = false;
-    if (bInside)
-    {
-        // Clip to 0 if center outside.
-        if (!IsPointInsideVisArea(sphere.center))
-        {
-            sphere.radius = 0.f;
-            return true;
-        }
-        bClipXY = bClipZ = true;
-    }
-    else
-    {
-        if (Overlap::Point_AABB(sphere.center, m_boxArea))
-        {
-            if (InsidePolygon(m_lstShapePoints.begin(), m_lstShapePoints.size(), sphere.center))
-            {
-                sphere.radius = 0.f;
-                return true;
-            }
-            else
-            {
-                bClipXY = true;
-            }
-        }
-        else if (InsidePolygon(m_lstShapePoints.begin(), m_lstShapePoints.size(), sphere.center))
-        {
-            bClipZ = true;
-        }
-        else
-        {
-            bClipXY = true;
-        }
-    }
-
-    float fOrigRadius = sphere.radius;
-    if (bClipZ)
-    {
-        // Check against vertical planes.
-        float fDist = min(abs(m_boxArea.max.z - sphere.center.z), abs(sphere.center.z - m_boxArea.min.z));
-        float fRadiusScale = sqrt_tpl(max(1.f - sqr(vNormal.z), 0.f));
-        if (fDist < sphere.radius * fRadiusScale)
-        {
-            sphere.radius = fDist / fRadiusScale;
-            if (sphere.radius <= 0.f)
-            {
-                return true;
-            }
-        }
-    }
-
-    if (bClipXY)
-    {
-        Vec3 vP1 = m_lstShapePoints[0];
-        vP1.z = clamp_tpl(sphere.center.z, m_boxArea.min.z, m_boxArea.max.z);
-        for (int n = m_lstShapePoints.Count() - 1; n >= 0; n--)
-        {
-            Vec3 vP0 = m_lstShapePoints[n];
-            vP0.z = vP1.z;
-
-            // Compute nearest vector from center to plane.
-            Vec3 vP = vP0 - sphere.center;
-            Vec3 vD = vP1 - vP0;
-            float fN = -(vP * vD);
-            if (fN > 0.f)
-            {
-                float fD = vD.GetLengthSquared();
-                if (fN >= fD)
-                {
-                    vP += vD;
-                }
-                else
-                {
-                    vP += vD * (fN / fD);
-                }
-            }
-
-            // Check distance only in planar direction.
-            float fDist = vP.GetLength() * 0.99f;
-            float fRadiusScale = fDist > 0.f ? sqrt_tpl(max(1.f - sqr(vNormal * vP) / sqr(fDist), 0.f)) : 1.f;
-            if (fDist < sphere.radius * fRadiusScale)
-            {
-                sphere.radius = fDist / fRadiusScale;
-                if (sphere.radius <= 0.f)
-                {
-                    return true;
-                }
-            }
-
-            vP1 = vP0;
-        }
-    }
-
-    return sphere.radius < fOrigRadius;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisArea::IsPointInsideVisArea(const Vec3& vPos) const
-{
-    const int kNumPoints = m_lstShapePoints.Count();
-    if (kNumPoints)
-    {
-        const Vec3* pLstShapePoints = &m_lstShapePoints[0];
-        PrefetchLine(pLstShapePoints, 0);
-        if (Overlap::Point_AABB(vPos, m_boxArea))
-        {
-            if (InsidePolygon(pLstShapePoints, kNumPoints, vPos))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisArea::IsSphereInsideVisArea(const Vec3& vPos, const f32 fRadius)
-{
-    Sphere S(vPos, fRadius);
-    if (Overlap::Sphere_AABB(S, m_boxArea))
-    {
-        if (InsidePolygon(&m_lstShapePoints[0], m_lstShapePoints.Count(), vPos) || InsideSpherePolygon(&m_lstShapePoints[0], m_lstShapePoints.Count(), S))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-const AABB* CVisArea::GetAABBox() const
-{
-    return &m_boxArea;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisArea::IsPortal() const
-{
-    return m_bThisIsPortal;
-}
-
-float CVisArea::CalcSignedArea()
-{
-    float fArea = 0;
-    for (int i = 0; i < m_lstShapePoints.Count(); i++)
-    {
-        const Vec3& v0 = m_lstShapePoints[i];
-        const Vec3& v1 = m_lstShapePoints[(i + 1) % m_lstShapePoints.Count()];
-        fArea += v0.x * v1.y - v1.x * v0.y;
-    }
-    return fArea / 2;
-}
-
-void CVisArea::GetShapePoints(const Vec3*& pPoints, size_t& nPoints)
-{
-    if (m_lstShapePoints.empty())
-    {
-        pPoints = 0;
-        nPoints = 0;
-    }
-    else
-    {
-        pPoints = &m_lstShapePoints[0];
-        nPoints = m_lstShapePoints.size();
-    }
-}
-
-float CVisArea::GetHeight()
-{
-    return m_fHeight;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisArea::FindVisArea(IVisArea* pAnotherArea, int nMaxRecursion, bool bSkipDisabledPortals)
-{
-    // collect visited areas in order to prevent visiting it again
-    StaticDynArray<CVisArea*, 1024> lVisitedParents;
-
-    return FindVisAreaReqursive(pAnotherArea, nMaxRecursion, bSkipDisabledPortals, lVisitedParents);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisArea::FindVisAreaReqursive(IVisArea* pAnotherArea, int nMaxReqursion, bool bSkipDisabledPortals, StaticDynArray<CVisArea*, 1024>& arrVisitedParents)
-{
-    arrVisitedParents.push_back(this);
-
-    if (pAnotherArea == this)
-    {
-        return true;
-    }
-
-    if (pAnotherArea == NULL && IsConnectedToOutdoor())
-    {
-        return true;
-    }
-
-    bool bFound = false;
-
-    if (nMaxReqursion > 1)
-    {
-        for (int p = 0; p < m_lstConnections.Count(); p++)
-        {
-            if (!bSkipDisabledPortals || m_lstConnections[p]->IsActive())
-            {
-                if (std::find(arrVisitedParents.begin(), arrVisitedParents.end(), m_lstConnections[p]) == arrVisitedParents.end())
-                {
-                    if (m_lstConnections[p]->FindVisAreaReqursive(pAnotherArea, nMaxReqursion - 1, bSkipDisabledPortals, arrVisitedParents))
-                    {
-                        bFound = true;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return bFound;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool CVisArea::IsConnectedToOutdoor() const
-{
-    if (IsPortal()) // check if this portal has just one conection
-    {
-        return m_lstConnections.Count() == 1;
-    }
-
-    // find portals with just one conection
-    for (int p = 0; p < m_lstConnections.Count(); p++)
-    {
-        CVisArea* pPortal = m_lstConnections[p];
-        if (pPortal->m_lstConnections.Count() == 1)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
diff --git a/Code/CryEngine/Cry3DEngine/VisAreas.cpp b/Code/CryEngine/Cry3DEngine/VisAreas.cpp
deleted file mode 100644
index d1247f7fc1..0000000000
--- a/Code/CryEngine/Cry3DEngine/VisAreas.cpp
+++ /dev/null
@@ -1,1148 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Visibility areas
-
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "StatObj.h"
-#include "ObjMan.h"
-#include "VisAreas.h"
-#include "3dEngine.h"
-#include "TimeOfDay.h"
-
-PodArray<CVisArea*> CVisArea::m_lUnavailableAreas;
-PodArray<Vec3> CVisArea::s_tmpLstPortVertsClipped;
-PodArray<Vec3> CVisArea::s_tmpLstPortVertsSS;
-PodArray<Vec3> CVisArea::s_tmpPolygonA;
-PodArray<IRenderNode*>  CVisArea::s_tmpLstLights;
-
-CPolygonClipContext CVisArea::s_tmpClipContext;
-PodArray<CCamera> CVisArea::s_tmpCameras;
-int CVisArea::s_nGetDistanceThruVisAreasCallCounter = 0;
-
-void CVisArea::Update(const Vec3* pPoints, int nCount, const char* szName, const SVisAreaInfo& info)
-{
-    assert(m_pVisAreaColdData);
-
-
-    cry_strcpy(m_pVisAreaColdData->m_sName, szName);
-    _strlwr_s(m_pVisAreaColdData->m_sName, sizeof(m_pVisAreaColdData->m_sName));
-
-    m_bThisIsPortal = strstr(m_pVisAreaColdData->m_sName, "portal") != 0;
-    m_bIgnoreSky = (strstr(m_pVisAreaColdData->m_sName, "ignoresky") != 0) || info.bIgnoreSkyColor;
-
-    m_fHeight = info.fHeight;
-    m_vAmbientColor = info.vAmbientColor;
-    m_bAffectedByOutLights = info.bAffectedByOutLights;
-    m_bSkyOnly = info.bSkyOnly;
-    m_fViewDistRatio = info.fViewDistRatio;
-    m_bDoubleSide = info.bDoubleSide;
-    m_bUseDeepness = info.bUseDeepness;
-    m_bUseInIndoors = info.bUseInIndoors;
-    m_bOceanVisible = info.bOceanIsVisible;
-    m_bIgnoreGI = info.bIgnoreGI;
-    m_bIgnoreOutdoorAO = info.bIgnoreOutdoorAO;
-    m_fPortalBlending = info.fPortalBlending;
-
-    m_lstShapePoints.PreAllocate(nCount, nCount);
-
-    if (nCount)
-    {
-        memcpy(&m_lstShapePoints[0], pPoints, sizeof(Vec3) * nCount);
-    }
-
-    // update bbox
-    m_boxArea.max = SetMinBB();
-    m_boxArea.min = SetMaxBB();
-
-    for (int i = 0; i < nCount; i++)
-    {
-        m_boxArea.max.CheckMax(pPoints[i]);
-        m_boxArea.min.CheckMin(pPoints[i]);
-
-        m_boxArea.max.CheckMax(pPoints[i] + Vec3(0, 0, m_fHeight));
-        m_boxArea.min.CheckMin(pPoints[i] + Vec3(0, 0, m_fHeight));
-    }
-
-    UpdateGeometryBBox();
-    UpdateClipVolume();
-}
-
-
-void CVisArea::StaticReset()
-{
-    stl::free_container(m_lUnavailableAreas);
-    stl::free_container(s_tmpLstPortVertsClipped);
-    stl::free_container(s_tmpLstPortVertsSS);
-    stl::free_container(s_tmpPolygonA);
-    stl::free_container(s_tmpLstLights);
-    stl::free_container(s_tmpCameras);
-    s_tmpClipContext.Reset();
-}
-
-void CVisArea::Init()
-{
-    m_fGetDistanceThruVisAreasMinDistance = 10000.f;
-    m_nGetDistanceThruVisAreasLastCallID = -1;
-    m_pVisAreaColdData = NULL;
-    m_boxStatics.min = m_boxStatics.max = m_boxArea.min = m_boxArea.max = Vec3(0, 0, 0);
-    m_nRndFrameId = -1;
-    m_bActive = true;
-    m_fHeight = 0;
-    m_vAmbientColor(0, 0, 0);
-    m_vConnNormals[0] = m_vConnNormals[1] = Vec3(0, 0, 0);
-    m_bAffectedByOutLights = false;
-    m_fDistance = 0;
-    m_bOceanVisible = m_bSkyOnly = false;
-    memset(m_arrOcclCamera, 0, sizeof(m_arrOcclCamera));
-    m_fViewDistRatio = 100.f;
-    m_bDoubleSide = true;
-    m_bUseDeepness = false;
-    m_bUseInIndoors = false;
-    m_bIgnoreSky = m_bThisIsPortal = false;
-    m_bIgnoreGI = false;
-    m_bIgnoreOutdoorAO = false;
-    m_lstCurCamerasCap = 0;
-    m_lstCurCamerasLen = 0;
-    m_lstCurCamerasIdx = 0;
-    m_nVisGUID = 0;
-    m_fPortalBlending = 0.5f;
-    m_nStencilRef = 0;
-}
-
-CVisArea::CVisArea()
-{
-    Init();
-}
-
-CVisArea::CVisArea(VisAreaGUID visGUID)
-{
-    Init();
-    m_nVisGUID = visGUID;
-}
-
-CVisArea::~CVisArea()
-{
-    for (int i = 0; i < MAX_RECURSION_LEVELS; i++)
-    {
-        SAFE_DELETE(m_arrOcclCamera[i]);
-    }
-
-    GetVisAreaManager()->OnVisAreaDeleted(this);
-
-    if (m_pVisAreaColdData->m_dataType == eCDT_Portal)
-    {
-        SPortalColdData* pPortalColdData = static_cast<SPortalColdData*>(m_pVisAreaColdData);
-        if (pPortalColdData->m_pRNTmpData)
-        {
-            Get3DEngine()->FreeRNTmpData(&pPortalColdData->m_pRNTmpData);
-        }
-    }
-}
-
-float LineSegDistanceSqr(const Vec3& vPos, const Vec3& vP0, const Vec3& vP1)
-{
-    // Dist of line seg A(+D) from origin:
-    // P = A + D t[0..1]
-    // d^2(t) = (A + D t)^2 = A^2 + 2 A*D t + D^2 t^2
-    // d^2\t = 2 A*D + 2 D^2 t = 0
-    // tmin = -A*D / D^2 clamp_tpl(0,1)
-    // Pmin = A + D tmin
-    Vec3 vP = vP0 - vPos;
-    Vec3 vD = vP1 - vP0;
-    float fN = -(vP * vD);
-    if (fN > 0.f)
-    {
-        float fD = vD.GetLengthSquared();
-        if (fN >= fD)
-        {
-            vP += vD;
-        }
-        else
-        {
-            vP += vD * (fN / fD);
-        }
-    }
-    return vP.GetLengthSquared();
-}
-
-void CVisArea::FindSurroundingVisAreaReqursive(int nMaxReqursion, bool bSkipDisabledPortals, PodArray<IVisArea*>* pVisitedAreas, int nMaxVisitedAreas, int nDeepness, PodArray<CVisArea*>* pUnavailableAreas)
-{
-    pUnavailableAreas->Add(this);
-
-    if (pVisitedAreas && pVisitedAreas->Count() < nMaxVisitedAreas)
-    {
-        pVisitedAreas->Add(this);
-    }
-
-    if (nMaxReqursion > (nDeepness + 1))
-    {
-        for (int p = 0; p < m_lstConnections.Count(); p++)
-        {
-            if (!bSkipDisabledPortals || m_lstConnections[p]->IsActive())
-            {
-                if (-1 == pUnavailableAreas->Find(m_lstConnections[p]))
-                {
-                    m_lstConnections[p]->FindSurroundingVisAreaReqursive(nMaxReqursion, bSkipDisabledPortals, pVisitedAreas, nMaxVisitedAreas, nDeepness + 1, pUnavailableAreas);
-                }
-            }
-        }
-    }
-}
-
-void CVisArea::FindSurroundingVisArea(int nMaxReqursion, bool bSkipDisabledPortals, PodArray<IVisArea*>* pVisitedAreas, int nMaxVisitedAreas, int nDeepness)
-{
-    if (pVisitedAreas)
-    {
-        if (pVisitedAreas->capacity() < (uint32)nMaxVisitedAreas)
-        {
-            pVisitedAreas->PreAllocate(nMaxVisitedAreas);
-        }
-    }
-
-    m_lUnavailableAreas.Clear();
-    m_lUnavailableAreas.PreAllocate(nMaxVisitedAreas, 0);
-
-    FindSurroundingVisAreaReqursive(nMaxReqursion, bSkipDisabledPortals, pVisitedAreas, nMaxVisitedAreas, nDeepness, &m_lUnavailableAreas);
-}
-
-int CVisArea::GetVisFrameId()
-{
-    return m_nRndFrameId;
-}
-
-bool Is2dLinesIntersect(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4)
-{
-    float fDiv = (y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1);
-
-    if (fabs(fDiv) < 0.00001f)
-    {
-        return false;
-    }
-
-    float ua = ((x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3)) / fDiv;
-    float ub = ((x2 - x1) * (y1 - y3) - (y2 - y1) * (x1 - x3)) / fDiv;
-
-    return ua > 0 && ua < 1 && ub > 0 && ub < 1;
-}
-
-
-Vec3 CVisArea::GetConnectionNormal(CVisArea* pPortal)
-{
-    assert(m_lstShapePoints.Count() >= 3);
-    // find side of shape intersecting with portal
-    int nIntersNum = 0;
-    Vec3 arrNormals[2] = {Vec3(0, 0, 0), Vec3(0, 0, 0)};
-    for (int v = 0; v < m_lstShapePoints.Count(); v++)
-    {
-        nIntersNum = 0;
-        arrNormals[0] = Vec3(0, 0, 0);
-        arrNormals[1] = Vec3(0, 0, 0);
-        const Vec3& v0 = m_lstShapePoints[v];
-        const Vec3& v1 = m_lstShapePoints[(v + 1) % m_lstShapePoints.Count()];
-        for (int p = 0; p < pPortal->m_lstShapePoints.Count(); p++)
-        {
-            const Vec3& p0 = pPortal->m_lstShapePoints[p];
-            const Vec3& p1 = pPortal->m_lstShapePoints[(p + 1) % pPortal->m_lstShapePoints.Count()];
-
-            if (Is2dLinesIntersect(v0.x, v0.y, v1.x, v1.y, p0.x, p0.y, p1.x, p1.y))
-            {
-                Vec3 vNormal = (v0 - v1).GetNormalized().Cross(Vec3(0, 0, 1.f));
-                if (nIntersNum < 2)
-                {
-                    arrNormals[nIntersNum++] = (IsShapeClockwise()) ? -vNormal : vNormal;
-                }
-            }
-        }
-
-        if (nIntersNum == 2)
-        {
-            break;
-        }
-    }
-
-    if (nIntersNum == 2 &&
-        //IsEquivalent(arrNormals[0] == arrNormals[1])
-        arrNormals[0].IsEquivalent(arrNormals[1], VEC_EPSILON)
-        )
-    {
-        return arrNormals[0];
-    }
-
-    {
-        int nBottomPoints = 0;
-        for (int p = 0; p < pPortal->m_lstShapePoints.Count() && p < 4; p++)
-        {
-            if (IsPointInsideVisArea(pPortal->m_lstShapePoints[p]))
-            {
-                nBottomPoints++;
-            }
-        }
-
-        int nUpPoints = 0;
-        for (int p = 0; p < pPortal->m_lstShapePoints.Count() && p < 4; p++)
-        {
-            if (IsPointInsideVisArea(pPortal->m_lstShapePoints[p] + Vec3(0, 0, pPortal->m_fHeight)))
-            {
-                nUpPoints++;
-            }
-        }
-
-        if (nBottomPoints == 0 && nUpPoints == 4)
-        {
-            return Vec3(0, 0, 1);
-        }
-
-        if (nBottomPoints == 4 && nUpPoints == 0)
-        {
-            return Vec3(0, 0, -1);
-        }
-    }
-
-    return Vec3(0, 0, 0);
-}
-
-void CVisArea::UpdatePortalCameraPlanes(CCamera& cam, Vec3* pVerts, bool NotForcePlaneSet, const SRenderingPassInfo& passInfo)
-{
-    const Vec3& vCamPos = passInfo.GetCamera().GetPosition();
-    Plane plane, farPlane;
-
-    farPlane = *passInfo.GetCamera().GetFrustumPlane(FR_PLANE_FAR);
-    cam.SetFrustumPlane(FR_PLANE_FAR, farPlane);
-
-    //plane.SetPlane(pVerts[0],pVerts[2],pVerts[1]);  // can potentially create a plane facing the wrong way
-    plane.SetPlane(-farPlane.n, pVerts[0]);
-    cam.SetFrustumPlane(FR_PLANE_NEAR, plane);
-
-    plane.SetPlane(vCamPos, pVerts[3], pVerts[2]);    // update plane only if it reduces fov
-    if (!NotForcePlaneSet || plane.n.Dot(cam.GetFrustumPlane(FR_PLANE_LEFT)->n) <
-        cam.GetFrustumPlane(FR_PLANE_RIGHT)->n.Dot(cam.GetFrustumPlane(FR_PLANE_LEFT)->n))
-    {
-        cam.SetFrustumPlane(FR_PLANE_RIGHT, plane);
-    }
-
-    plane.SetPlane(vCamPos, pVerts[1], pVerts[0]);    // update plane only if it reduces fov
-    if (!NotForcePlaneSet || plane.n.Dot(cam.GetFrustumPlane(FR_PLANE_RIGHT)->n) <
-        cam.GetFrustumPlane(FR_PLANE_LEFT)->n.Dot(cam.GetFrustumPlane(FR_PLANE_RIGHT)->n))
-    {
-        cam.SetFrustumPlane(FR_PLANE_LEFT, plane);
-    }
-
-    plane.SetPlane(vCamPos, pVerts[0], pVerts[3]);    // update plane only if it reduces fov
-    if (!NotForcePlaneSet || plane.n.Dot(cam.GetFrustumPlane(FR_PLANE_TOP)->n) <
-        cam.GetFrustumPlane(FR_PLANE_BOTTOM)->n.Dot(cam.GetFrustumPlane(FR_PLANE_TOP)->n))
-    {
-        cam.SetFrustumPlane(FR_PLANE_BOTTOM, plane);
-    }
-
-    plane.SetPlane(vCamPos, pVerts[2], pVerts[1]); // update plane only if it reduces fov
-    if (!NotForcePlaneSet || plane.n.Dot(cam.GetFrustumPlane(FR_PLANE_BOTTOM)->n) <
-        cam.GetFrustumPlane(FR_PLANE_TOP)->n.Dot(cam.GetFrustumPlane(FR_PLANE_BOTTOM)->n))
-    {
-        cam.SetFrustumPlane(FR_PLANE_TOP, plane);
-    }
-
-    Vec3 arrvPortVertsCamSpace[4];
-    for (int i = 0; i < 4; i++)
-    {
-        arrvPortVertsCamSpace[i] = pVerts[i] - cam.GetPosition();
-    }
-    cam.SetFrustumVertices(arrvPortVertsCamSpace);
-
-    //cam.UpdateFrustum();
-
-    if (GetCVars()->e_Portals == 5)
-    {
-        float farrColor[4] = {1, 1, 1, 1};
-        //      GetRenderer()->SetMaterialColor(1,1,1,1);
-        DrawLine(pVerts[0], pVerts[1]);
-        GetRenderer()->DrawLabelEx(pVerts[0], 1, farrColor, false, true, "0");
-        DrawLine(pVerts[1], pVerts[2]);
-        GetRenderer()->DrawLabelEx(pVerts[1], 1, farrColor, false, true, "1");
-        DrawLine(pVerts[2], pVerts[3]);
-        GetRenderer()->DrawLabelEx(pVerts[2], 1, farrColor, false, true, "2");
-        DrawLine(pVerts[3], pVerts[0]);
-        GetRenderer()->DrawLabelEx(pVerts[3], 1, farrColor, false, true, "3");
-    }
-}
-
-int __cdecl CVisAreaManager__CmpDistToPortal(const void* v1, const void* v2);
-
-void CVisArea::PreRender(int nReqursionLevel,
-    CCamera CurCamera, CVisArea* pParent, CVisArea* pCurPortal,
-    bool* pbOutdoorVisible, PodArray<CCamera>* plstOutPortCameras, bool* pbSkyVisible, bool* pbOceanVisible,
-    PodArray<CVisArea*>& lstVisibleAreas,
-    const SRenderingPassInfo& passInfo)
-{
-    // mark as rendered
-    if (m_nRndFrameId != passInfo.GetFrameID())
-    {
-        m_lstCurCamerasIdx = 0;
-        m_lstCurCamerasLen = 0;
-        if (m_lstCurCamerasCap)
-        {
-            m_lstCurCamerasIdx = s_tmpCameras.size();
-            s_tmpCameras.resize(s_tmpCameras.size() + m_lstCurCamerasCap);
-        }
-    }
-
-    m_nRndFrameId = passInfo.GetFrameID();
-
-    if (m_bAffectedByOutLights)
-    {
-        GetVisAreaManager()->m_bSunIsNeeded = true;
-    }
-
-    if (m_lstCurCamerasLen == m_lstCurCamerasCap)
-    {
-        int newIdx = s_tmpCameras.size();
-
-        m_lstCurCamerasCap +=  max(1, m_lstCurCamerasCap / 2);
-        s_tmpCameras.resize(newIdx + m_lstCurCamerasCap);
-        if (m_lstCurCamerasLen)
-        {
-            memcpy(&s_tmpCameras[newIdx], &s_tmpCameras[m_lstCurCamerasIdx], m_lstCurCamerasLen * sizeof(CCamera));
-        }
-
-        m_lstCurCamerasIdx = newIdx;
-    }
-    s_tmpCameras[m_lstCurCamerasIdx + m_lstCurCamerasLen] = CurCamera;
-    ++m_lstCurCamerasLen;
-
-    if (lstVisibleAreas.Find(this) < 0)
-    {
-        lstVisibleAreas.Add(this);
-        m_nStencilRef = GetRenderer()->EF_AddDeferredClipVolume(this);
-    }
-
-    // check recursion and portal activity
-    if (!nReqursionLevel || !m_bActive)
-    {
-        return;
-    }
-
-    if (pParent && m_bThisIsPortal && m_lstConnections.Count() == 1 && // detect entrance
-        !IsPointInsideVisArea(passInfo.GetCamera().GetPosition()))   // detect camera in outdoors
-    {
-        AABB boxAreaEx = m_boxArea;
-        float fZNear = CurCamera.GetNearPlane();
-        boxAreaEx.min -= Vec3(fZNear, fZNear, fZNear);
-        boxAreaEx.max += Vec3(fZNear, fZNear, fZNear);
-        if (!CurCamera.IsAABBVisible_E(boxAreaEx)) // if portal is invisible
-        {
-            return; // stop recursion
-        }
-    }
-
-    bool bCanSeeThruThisArea = true;
-
-    // prepare new camera for next areas
-    if (m_bThisIsPortal && m_lstConnections.Count() &&
-        (this != pCurPortal || !pCurPortal->IsPointInsideVisArea(CurCamera.GetPosition())))
-    {
-        Vec3 vCenter = m_boxArea.GetCenter();
-        float fRadius = m_boxArea.GetRadius();
-
-        Vec3 vPortNorm = (!pParent || pParent == m_lstConnections[0] || m_lstConnections.Count() == 1) ?
-            m_vConnNormals[0] : m_vConnNormals[1];
-
-        // exit/entrance portal has only one normal in direction to outdoors, so flip it to the camera
-        if (m_lstConnections.Count() == 1 && !pParent)
-        {
-            vPortNorm = -vPortNorm;
-        }
-
-        // back face check
-        Vec3 vPortToCamDir = CurCamera.GetPosition() - vCenter;
-        if (vPortToCamDir.Dot(vPortNorm) < 0)
-        {
-            return;
-        }
-
-        if (!m_bDoubleSide)
-        {
-            if (vPortToCamDir.Dot(m_vConnNormals[0]) < 0)
-            {
-                return;
-            }
-        }
-
-        Vec3 arrPortVerts[4];
-        Vec3 arrPortVertsOtherSide[4];
-        bool barrPortVertsOtherSideValid = false;
-        if (pParent && !vPortNorm.IsEquivalent(Vec3(0, 0, 0), VEC_EPSILON) && vPortNorm.z)
-        { // up/down portal
-            int nEven = IsShapeClockwise();
-            if (vPortNorm.z > 0)
-            {
-                nEven = !nEven;
-            }
-            for (int i = 0; i < 4; i++)
-            {
-                arrPortVerts[i] = m_lstShapePoints[nEven ? (3 - i) : i] + Vec3(0, 0, m_fHeight) * (vPortNorm.z > 0);
-                arrPortVertsOtherSide[i] = m_lstShapePoints[nEven ? (3 - i) : i] + Vec3(0, 0, m_fHeight) * (vPortNorm.z < 0);
-            }
-            barrPortVertsOtherSideValid = true;
-        }
-        else if (!vPortNorm.IsEquivalent(Vec3(0, 0, 0), VEC_EPSILON)    && vPortNorm.z == 0)
-        { // basic portal
-            Vec3 arrInAreaPoint[2] = {Vec3(0, 0, 0), Vec3(0, 0, 0)};
-            int arrInAreaPointId[2] = {-1, -1};
-            int nInAreaPointCounter = 0;
-
-            Vec3 arrOutAreaPoint[2] = {Vec3(0, 0, 0), Vec3(0, 0, 0)};
-            int nOutAreaPointCounter = 0;
-
-            // find 2 points of portal in this area (or in this outdoors)
-            for (int i = 0; i < m_lstShapePoints.Count() && nInAreaPointCounter < 2; i++)
-            {
-                Vec3 vTestPoint = m_lstShapePoints[i] + Vec3(0, 0, m_fHeight * 0.5f);
-                CVisArea* pAnotherArea = m_lstConnections[0];
-                if ((pParent && (pParent->IsPointInsideVisArea(vTestPoint))) ||
-                    (!pParent && (!pAnotherArea->IsPointInsideVisArea(vTestPoint))))
-                {
-                    arrInAreaPointId[nInAreaPointCounter] = i;
-                    arrInAreaPoint[nInAreaPointCounter++] = m_lstShapePoints[i];
-                }
-            }
-
-            // find 2 points of portal not in this area (or not in this outdoors)
-            for (int i = 0; i < m_lstShapePoints.Count() && nOutAreaPointCounter < 2; i++)
-            {
-                Vec3 vTestPoint = m_lstShapePoints[i] + Vec3(0, 0, m_fHeight * 0.5f);
-                CVisArea* pAnotherArea = m_lstConnections[0];
-                if ((pParent && (pParent->IsPointInsideVisArea(vTestPoint))) ||
-                    (!pParent && (!pAnotherArea->IsPointInsideVisArea(vTestPoint))))
-                {
-                }
-                else
-                {
-                    arrOutAreaPoint[nOutAreaPointCounter++] = m_lstShapePoints[i];
-                }
-            }
-
-            if (nInAreaPointCounter == 2)
-            { // success, take into account volume and portal shape versts order
-                int nEven = IsShapeClockwise();
-                if (arrInAreaPointId[1] - arrInAreaPointId[0] != 1)
-                {
-                    nEven = !nEven;
-                }
-
-                arrPortVerts[0] = arrInAreaPoint[nEven];
-                arrPortVerts[1] = arrInAreaPoint[nEven] + Vec3(0, 0, m_fHeight);
-                arrPortVerts[2] = arrInAreaPoint[!nEven] + Vec3(0, 0, m_fHeight);
-                arrPortVerts[3] = arrInAreaPoint[!nEven];
-
-                nEven = !nEven;
-
-                arrPortVertsOtherSide[0] = arrOutAreaPoint[nEven];
-                arrPortVertsOtherSide[1] = arrOutAreaPoint[nEven] + Vec3(0, 0, m_fHeight);
-                arrPortVertsOtherSide[2] = arrOutAreaPoint[!nEven] + Vec3(0, 0, m_fHeight);
-                arrPortVertsOtherSide[3] = arrOutAreaPoint[!nEven];
-                barrPortVertsOtherSideValid = true;
-            }
-            else
-            { // something wrong
-                Warning("CVisArea::PreRender: Invalid portal: %s", m_pVisAreaColdData->m_sName);
-                return;
-            }
-        }
-        else if (!pParent && vPortNorm.z == 0 && m_lstConnections.Count() == 1)
-        { // basic entrance portal
-            Vec3 vBorder = (vPortNorm.Cross(Vec3(0, 0, 1.f))).GetNormalized() * fRadius;
-            arrPortVerts[0] = vCenter - Vec3(0, 0, 1.f) * fRadius - vBorder;
-            arrPortVerts[1] = vCenter + Vec3(0, 0, 1.f) * fRadius - vBorder;
-            arrPortVerts[2] = vCenter + Vec3(0, 0, 1.f) * fRadius + vBorder;
-            arrPortVerts[3] = vCenter - Vec3(0, 0, 1.f) * fRadius + vBorder;
-        }
-        else if (!pParent && vPortNorm.z != 0 && m_lstConnections.Count() == 1)
-        { // up/down entrance portal
-            Vec3 vBorder = (vPortNorm.Cross(Vec3(0, 1, 0.f))).GetNormalized() * fRadius;
-            arrPortVerts[0] = vCenter - Vec3(0, 1, 0.f) * fRadius + vBorder;
-            arrPortVerts[1] = vCenter + Vec3(0, 1, 0.f) * fRadius + vBorder;
-            arrPortVerts[2] = vCenter + Vec3(0, 1, 0.f) * fRadius - vBorder;
-            arrPortVerts[3] = vCenter - Vec3(0, 1, 0.f) * fRadius - vBorder;
-        }
-        else
-        { // something wrong or areabox portal - use simple solution
-            if (vPortNorm.IsEquivalent(Vec3(0, 0, 0), VEC_EPSILON))
-            {
-                vPortNorm = (vCenter - passInfo.GetCamera().GetPosition()).GetNormalized();
-            }
-
-            Vec3 vBorder = (vPortNorm.Cross(Vec3(0, 0, 1.f))).GetNormalized() * fRadius;
-            arrPortVerts[0] = vCenter - Vec3(0, 0, 1.f) * fRadius - vBorder;
-            arrPortVerts[1] = vCenter + Vec3(0, 0, 1.f) * fRadius - vBorder;
-            arrPortVerts[2] = vCenter + Vec3(0, 0, 1.f) * fRadius + vBorder;
-            arrPortVerts[3] = vCenter - Vec3(0, 0, 1.f) * fRadius + vBorder;
-        }
-
-        if (GetCVars()->e_Portals == 4) // make color recursion dependent
-        {
-            GetRenderer()->SetMaterialColor(1, 1, passInfo.IsGeneralPass(), 1);
-        }
-
-        Vec3 vPortalFaceCenter = (arrPortVerts[0] + arrPortVerts[1] + arrPortVerts[2] + arrPortVerts[3]) / 4;
-        vPortToCamDir = CurCamera.GetPosition() - vPortalFaceCenter;
-        if (vPortToCamDir.GetNormalized().Dot(vPortNorm) < -0.01f)
-        {
-            UpdatePortalBlendInfo();
-            return;
-        }
-
-        const bool Upright  =   (fabsf(vPortNorm.z) < FLT_EPSILON);
-        CCamera camParent = CurCamera;
-
-        // clip portal quad by camera planes
-        PodArray<Vec3>& lstPortVertsClipped = s_tmpLstPortVertsClipped;
-        lstPortVertsClipped.Clear();
-        lstPortVertsClipped.AddList(arrPortVerts, 4);
-        ClipPortalVerticesByCameraFrustum(&lstPortVertsClipped, camParent);
-
-        AABB aabb;
-        aabb.Reset();
-
-        if (lstPortVertsClipped.Count() > 2)
-        {
-            // find screen space bounds of clipped portal
-            for (int i = 0; i < lstPortVertsClipped.Count(); i++)
-            {
-                Vec3 vSS;
-                GetRenderer()->ProjectToScreen(lstPortVertsClipped[i].x, lstPortVertsClipped[i].y, lstPortVertsClipped[i].z, &vSS.x, &vSS.y, &vSS.z);
-                vSS.y = 100 - vSS.y;
-                aabb.Add(vSS);
-            }
-        }
-        else
-        {
-            if (!CVisArea::IsSphereInsideVisArea(CurCamera.GetPosition(), CurCamera.GetNearPlane()))
-            {
-                bCanSeeThruThisArea = false;
-            }
-        }
-
-        if (lstPortVertsClipped.Count() > 2 && aabb.min.z > 0.01f)
-        {
-            PodArray<Vec3>& lstPortVertsSS = s_tmpLstPortVertsSS;
-            lstPortVertsSS.PreAllocate(4, 4);
-
-            // get 3d positions of portal bounds
-            {
-                int i = 0;
-                float w = (float)GetRenderer()->GetWidth();
-                float h = (float)GetRenderer()->GetHeight();
-                float d = 0.01f;
-
-                GetRenderer()->UnProjectFromScreen(aabb.min.x * w / 100, aabb.min.y * h / 100, d, &lstPortVertsSS[i].x, &lstPortVertsSS[i].y, &lstPortVertsSS[i].z);
-                i++;
-                GetRenderer()->UnProjectFromScreen(aabb.min.x * w / 100, aabb.max.y * h / 100, d, &lstPortVertsSS[i].x, &lstPortVertsSS[i].y, &lstPortVertsSS[i].z);
-                i++;
-                GetRenderer()->UnProjectFromScreen(aabb.max.x * w / 100, aabb.max.y * h / 100, d, &lstPortVertsSS[i].x, &lstPortVertsSS[i].y, &lstPortVertsSS[i].z);
-                i++;
-                GetRenderer()->UnProjectFromScreen(aabb.max.x * w / 100, aabb.min.y * h / 100, d, &lstPortVertsSS[i].x, &lstPortVertsSS[i].y, &lstPortVertsSS[i].z);
-                i++;
-
-                CurCamera.m_ScissorInfo.x1 = uint16(CLAMP(aabb.min.x * w / 100, 0, w));
-                CurCamera.m_ScissorInfo.y1 = uint16(CLAMP(aabb.min.y * h / 100, 0, h));
-                CurCamera.m_ScissorInfo.x2 = uint16(CLAMP(aabb.max.x * w / 100, 0, w));
-                CurCamera.m_ScissorInfo.y2 = uint16(CLAMP(aabb.max.y * h / 100, 0, h));
-            }
-
-            if (GetCVars()->e_Portals == 4)
-            {
-                for (int i = 0; i < lstPortVertsSS.Count(); i++)
-                {
-                    float farrColor[4] = { float((nReqursionLevel & 1) > 0), float((nReqursionLevel & 2) > 0), float((nReqursionLevel & 4) > 0), 1};
-                    ColorF c(farrColor[0], farrColor[1], farrColor[2], farrColor[3]);
-                    DrawSphere(lstPortVertsSS[i], 0.002f, c);
-                    GetRenderer()->DrawLabelEx(lstPortVertsSS[i], 0.1f, farrColor, false, true, "%d", i);
-                }
-            }
-
-            UpdatePortalCameraPlanes(CurCamera, lstPortVertsSS.GetElements(), Upright, passInfo);
-
-            bCanSeeThruThisArea =
-                (CurCamera.m_ScissorInfo.x1 < CurCamera.m_ScissorInfo.x2) &&
-                (CurCamera.m_ScissorInfo.y1 < CurCamera.m_ScissorInfo.y2);
-        }
-
-        if (m_bUseDeepness && bCanSeeThruThisArea && barrPortVertsOtherSideValid)
-        {
-            Vec3 vOtherSideBoxMax = SetMinBB();
-            Vec3 vOtherSideBoxMin = SetMaxBB();
-            for (int i = 0; i < 4; i++)
-            {
-                vOtherSideBoxMin.CheckMin(arrPortVertsOtherSide[i] - Vec3(0.01f, 0.01f, 0.01f));
-                vOtherSideBoxMax.CheckMax(arrPortVertsOtherSide[i] + Vec3(0.01f, 0.01f, 0.01f));
-            }
-
-            bCanSeeThruThisArea = CurCamera.IsAABBVisible_E(AABB(vOtherSideBoxMin, vOtherSideBoxMax));
-        }
-
-        if (bCanSeeThruThisArea && pParent && m_lstConnections.Count() == 1)
-        { // set this camera for outdoor
-            if (nReqursionLevel >= 1)
-            {
-                if (!m_bSkyOnly)
-                {
-                    if (plstOutPortCameras)
-                    {
-                        plstOutPortCameras->Add(CurCamera);
-                        plstOutPortCameras->Last().m_pPortal = this;
-                    }
-                    if (pbOutdoorVisible)
-                    {
-                        *pbOutdoorVisible = true;
-                    }
-                }
-                else if (pbSkyVisible)
-                {
-                    *pbSkyVisible = true;
-                }
-            }
-
-            UpdatePortalBlendInfo();
-            return;
-        }
-    }
-
-    // sort portals by distance
-    if (!m_bThisIsPortal && m_lstConnections.Count())
-    {
-        for (int p = 0; p < m_lstConnections.Count(); p++)
-        {
-            CVisArea* pNeibVolume = m_lstConnections[p];
-            pNeibVolume->m_fDistance = CurCamera.GetPosition().GetDistance((pNeibVolume->m_boxArea.min + pNeibVolume->m_boxArea.max) * 0.5f);
-        }
-
-        qsort(&m_lstConnections[0], m_lstConnections.Count(),
-            sizeof(m_lstConnections[0]), CVisAreaManager__CmpDistToPortal);
-    }
-
-    if (m_bOceanVisible && pbOceanVisible)
-    {
-        *pbOceanVisible = true;
-    }
-
-    // recurse to connections
-    for (int p = 0; p < m_lstConnections.Count(); p++)
-    {
-        CVisArea* pNeibVolume = m_lstConnections[p];
-        if (pNeibVolume != pParent)
-        {
-            if (!m_bThisIsPortal)
-            { // skip far portals
-                float fRadius = (pNeibVolume->m_boxArea.max - pNeibVolume->m_boxArea.min).GetLength() * 0.5f * GetFloatCVar(e_ViewDistRatioPortals) / 60.f;
-                if (pNeibVolume->m_fDistance * passInfo.GetZoomFactor() > fRadius * pNeibVolume->m_fViewDistRatio)
-                {
-                    continue;
-                }
-
-                Vec3 vPortNorm = (this == pNeibVolume->m_lstConnections[0] || pNeibVolume->m_lstConnections.Count() == 1) ?
-                    pNeibVolume->m_vConnNormals[0] : pNeibVolume->m_vConnNormals[1];
-
-                // back face check
-                Vec3 vPortToCamDir = CurCamera.GetPosition() - pNeibVolume->GetAABBox()->GetCenter();
-                if (vPortToCamDir.Dot(vPortNorm) < 0)
-                {
-                    continue;
-                }
-            }
-
-            if ((bCanSeeThruThisArea || m_lstConnections.Count() == 1) && (m_bThisIsPortal || CurCamera.IsAABBVisible_F(pNeibVolume->m_boxStatics)))
-            {
-                pNeibVolume->PreRender(nReqursionLevel - 1, CurCamera, this, pCurPortal, pbOutdoorVisible, plstOutPortCameras, pbSkyVisible, pbOceanVisible, lstVisibleAreas, passInfo);
-            }
-        }
-    }
-
-    if (m_bThisIsPortal)
-    {
-        UpdatePortalBlendInfo();
-    }
-}
-
-//! return list of visareas connected to specified visarea (can return portals and sectors)
-int CVisArea::GetRealConnections(IVisArea** pAreas, int nMaxConnNum, [[maybe_unused]] bool bSkipDisabledPortals)
-{
-    int nOut = 0;
-    for (int nArea = 0; nArea < m_lstConnections.Count(); nArea++)
-    {
-        if (nOut < nMaxConnNum)
-        {
-            pAreas[nOut] = (IVisArea*)m_lstConnections[nArea];
-        }
-        nOut++;
-    }
-    return nOut;
-}
-
-//! return list of sectors conected to specified sector or portal (returns sectors only)
-// todo: change the way it returns data
-int CVisArea::GetVisAreaConnections(IVisArea** pAreas, int nMaxConnNum, bool bSkipDisabledPortals)
-{
-    int nOut = 0;
-    if (IsPortal())
-    {
-        /*      for(int nArea=0; nArea<m_lstConnections.Count(); nArea++)
-                {
-                    if(nOut<nMaxConnNum)
-                        pAreas[nOut] = (IVisArea*)m_lstConnections[nArea];
-                    nOut++;
-                }*/
-        return min(nMaxConnNum, GetRealConnections(pAreas, nMaxConnNum, bSkipDisabledPortals));
-    }
-    else
-    {
-        for (int nPort = 0; nPort < m_lstConnections.Count(); nPort++)
-        {
-            CVisArea* pPortal = m_lstConnections[nPort];
-            assert(pPortal->IsPortal());
-            for (int nArea = 0; nArea < pPortal->m_lstConnections.Count(); nArea++)
-            {
-                if (pPortal->m_lstConnections[nArea] != this)
-                {
-                    if (!bSkipDisabledPortals || pPortal->IsActive())
-                    {
-                        if (nOut < nMaxConnNum)
-                        {
-                            pAreas[nOut] = (IVisArea*)pPortal->m_lstConnections[nArea];
-                        }
-                        nOut++;
-                        break; // take first valid connection
-                    }
-                }
-            }
-        }
-    }
-
-    return min(nMaxConnNum, nOut);
-}
-
-bool CVisArea::IsPortalValid()
-{
-    int nCount = m_lstConnections.Count();
-    if (nCount > 2 || nCount == 0)
-    {
-        return false;
-    }
-
-    for (int i = 0; i < nCount; i++)
-    {
-        if (m_vConnNormals[i].IsEquivalent(Vec3(0, 0, 0), VEC_EPSILON))
-        {
-            return false;
-        }
-    }
-
-    if (nCount > 1)
-    {
-        if (m_vConnNormals[0].Dot(m_vConnNormals[1]) > -0.99f)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CVisArea::IsPortalIntersectAreaInValidWay(CVisArea* pPortal)
-{
-    const Vec3& v1Min = pPortal->m_boxArea.min;
-    const Vec3& v1Max = pPortal->m_boxArea.max;
-    const Vec3& v2Min = m_boxArea.min;
-    const Vec3& v2Max = m_boxArea.max;
-
-    if (v1Max.x > v2Min.x && v2Max.x > v1Min.x)
-    {
-        if (v1Max.y > v2Min.y && v2Max.y > v1Min.y)
-        {
-            if (v1Max.z > v2Min.z && v2Max.z > v1Min.z)
-            {
-                // vertical portal
-                for (int v = 0; v < m_lstShapePoints.Count(); v++)
-                {
-                    int nIntersNum = 0;
-                    bool arrIntResult[4] = { 0, 0, 0, 0 };
-                    for (int p = 0; p < pPortal->m_lstShapePoints.Count() && p < 4; p++)
-                    {
-                        const Vec3& v0 = m_lstShapePoints[v];
-                        const Vec3& v1 = m_lstShapePoints[(v + 1) % m_lstShapePoints.Count()];
-                        const Vec3& p0 = pPortal->m_lstShapePoints[p];
-                        const Vec3& p1 = pPortal->m_lstShapePoints[(p + 1) % pPortal->m_lstShapePoints.Count()];
-
-                        if (Is2dLinesIntersect(v0.x, v0.y, v1.x, v1.y, p0.x, p0.y, p1.x, p1.y))
-                        {
-                            nIntersNum++;
-                            arrIntResult[p] = true;
-                        }
-                    }
-                    if (nIntersNum == 2 && arrIntResult[0] == arrIntResult[2] && arrIntResult[1] == arrIntResult[3])
-                    {
-                        return true;
-                    }
-                }
-
-                // horisontal portal
-                {
-                    int nBottomPoints = 0, nUpPoints = 0;
-                    for (int p = 0; p < pPortal->m_lstShapePoints.Count() && p < 4; p++)
-                    {
-                        if (IsPointInsideVisArea(pPortal->m_lstShapePoints[p]))
-                        {
-                            nBottomPoints++;
-                        }
-                    }
-
-                    for (int p = 0; p < pPortal->m_lstShapePoints.Count() && p < 4; p++)
-                    {
-                        if (IsPointInsideVisArea(pPortal->m_lstShapePoints[p] + Vec3(0, 0, pPortal->m_fHeight)))
-                        {
-                            nUpPoints++;
-                        }
-                    }
-
-                    if (nBottomPoints == 0 && nUpPoints == 4)
-                    {
-                        return true;
-                    }
-
-                    if (nBottomPoints == 4 && nUpPoints == 0)
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-
-/*
-void CVisArea::SetTreeId(int nTreeId)
-{
-    if(m_nTreeId == nTreeId)
-        return;
-
-    m_nTreeId = nTreeId;
-
-    for(int p=0; p<m_lstConnections.Count(); p++)
-        m_lstConnections[p]->SetTreeId(nTreeId);
-}
-*/
-bool CVisArea::IsShapeClockwise()
-{
-    float fClockWise =
-        (m_lstShapePoints[0].x - m_lstShapePoints[1].x) * (m_lstShapePoints[2].y - m_lstShapePoints[1].y) -
-        (m_lstShapePoints[0].y - m_lstShapePoints[1].y) * (m_lstShapePoints[2].x - m_lstShapePoints[1].x);
-
-    return fClockWise > 0;
-}
-
-void CVisArea::DrawAreaBoundsIntoCBuffer([[maybe_unused]] CCullBuffer* pCBuffer)
-{
-    assert(!"temprary not supported");
-
-    /*  if(m_lstShapePoints.Count()!=4)
-        return;
-
-      Vec3 arrVerts[8];
-      int arrIndices[24];
-
-      int v=0;
-      int i=0;
-      for(int p=0; p<4 && p<m_lstShapePoints.Count(); p++)
-      {
-        arrVerts[v++] = m_lstShapePoints[p];
-        arrVerts[v++] = m_lstShapePoints[p] + Vec3(0,0,m_fHeight);
-
-        arrIndices[i++] = (p*2+0)%8;
-        arrIndices[i++] = (p*2+1)%8;
-        arrIndices[i++] = (p*2+2)%8;
-        arrIndices[i++] = (p*2+3)%8;
-        arrIndices[i++] = (p*2+2)%8;
-        arrIndices[i++] = (p*2+1)%8;
-      }
-
-      Matrix34 mat;
-      mat.SetIdentity();
-      pCBuffer->AddMesh(arrVerts,8,arrIndices,24,&mat);*/
-}
-
-void CVisArea::ClipPortalVerticesByCameraFrustum(PodArray<Vec3>* pPolygon, const CCamera& cam)
-{
-    Plane planes[5] = {
-        *cam.GetFrustumPlane(FR_PLANE_RIGHT),
-        *cam.GetFrustumPlane(FR_PLANE_LEFT),
-        *cam.GetFrustumPlane(FR_PLANE_TOP),
-        *cam.GetFrustumPlane(FR_PLANE_BOTTOM),
-        *cam.GetFrustumPlane(FR_PLANE_NEAR)
-    };
-
-    const PodArray<Vec3>& clipped = s_tmpClipContext.Clip(*pPolygon, planes, 4);
-
-    pPolygon->Clear();
-    pPolygon->AddList(clipped);
-}
-
-void CVisArea::GetMemoryUsage(ICrySizer* pSizer)
-{
-    //  pSizer->AddContainer(m_lstEntities[STATIC_OBJECTS]);
-    //pSizer->AddContainer(m_lstEntities[DYNAMIC_OBJECTS]);
-
-    // TODO: include obects tree
-
-
-    if (m_pObjectsTree)
-    {
-        SIZER_COMPONENT_NAME(pSizer, "IndoorObjectsTree");
-        m_pObjectsTree->GetMemoryUsage(pSizer);
-    }
-
-    //  for(int nStatic=0; nStatic<2; nStatic++)
-    //for(int i=0; i<m_lstEntities[nStatic].Count(); i++)
-    //    nSize += m_lstEntities[nStatic][i].pNode->GetMemoryUsage();
-
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-void CVisArea::AddConnectedAreas(PodArray<CVisArea*>& lstAreas, int nMaxRecursion)
-{
-    if (lstAreas.Find(this) < 0)
-    {
-        lstAreas.Add(this);
-
-        // add connected areas
-        if (nMaxRecursion)
-        {
-            nMaxRecursion--;
-
-            for (int p = 0; p < m_lstConnections.Count(); p++)
-            {
-                m_lstConnections[p]->AddConnectedAreas(lstAreas, nMaxRecursion);
-            }
-        }
-    }
-}
-
-bool CVisArea::GetDistanceThruVisAreas(AABB vCurBoxIn, IVisArea* pTargetArea, const AABB& targetBox, int nMaxReqursion, float& fResDist)
-{
-    return GetDistanceThruVisAreasReq(vCurBoxIn, 0, pTargetArea, targetBox, nMaxReqursion, fResDist, NULL, s_nGetDistanceThruVisAreasCallCounter++);
-}
-
-float DistanceAABB(const AABB& aBox, const AABB& bBox)
-{
-    float result = 0;
-
-    for (int i = 0; i < 3; ++i)
-    {
-        const float& aMin = aBox.min[i];
-        const float& aMax = aBox.max[i];
-        const float& bMin = bBox.min[i];
-        const float& bMax = bBox.max[i];
-
-        if (aMin > bMax)
-        {
-            const float delta = bMax - aMin;
-
-            result += delta * delta;
-        }
-        else if (bMin > aMax)
-        {
-            const float delta = aMax - bMin;
-
-            result += delta * delta;
-        }
-        // else the projection intervals overlap.
-    }
-
-    return sqrt(result);
-}
-
-bool CVisArea::GetDistanceThruVisAreasReq(AABB vCurBoxIn, float fCurDistIn, IVisArea* pTargetArea, const AABB& targetBox, int nMaxReqursion, float& fResDist, CVisArea* pPrevArea, int nCallID)
-{
-    if (pTargetArea == this || (pTargetArea == NULL && IsConnectedToOutdoor()))
-    { // target area is found
-        fResDist = min(fResDist, fCurDistIn + DistanceAABB(vCurBoxIn, targetBox));
-        return true;
-    }
-
-    // if we already visited this area and last time input distance was smaller - makes no sence to continue
-    if (nCallID == m_nGetDistanceThruVisAreasLastCallID)
-    {
-        if (fCurDistIn >= m_fGetDistanceThruVisAreasMinDistance)
-        {
-            return false;
-        }
-    }
-
-    m_nGetDistanceThruVisAreasLastCallID = nCallID;
-    m_fGetDistanceThruVisAreasMinDistance = fCurDistIn;
-
-    fResDist = FLT_MAX;
-
-    bool bFound = false;
-
-    if (nMaxReqursion > 1)
-    {
-        for (int p = 0; p < m_lstConnections.Count(); p++)
-        {
-            if ((m_lstConnections[p] != pPrevArea) && m_lstConnections[p]->IsActive())
-            {
-                AABB vCurBox = vCurBoxIn;
-                float fCurDist = fCurDistIn;
-                float dist = FLT_MAX;
-
-                if (IsPortal())
-                {
-                    vCurBox = vCurBoxIn;
-                    fCurDist = fCurDistIn;
-                }
-                else
-                {
-                    vCurBox = *m_lstConnections[p]->GetAABBox();
-                    fCurDist = fCurDistIn + DistanceAABB(vCurBox, vCurBoxIn);
-                }
-
-                if (m_lstConnections[p]->GetDistanceThruVisAreasReq(vCurBox, fCurDist, pTargetArea, targetBox, nMaxReqursion - 1, dist, this, nCallID))
-                {
-                    bFound     = true;
-                    fResDist = min(fResDist, dist);
-                }
-            }
-        }
-    }
-
-    return bFound;
-}
-
-void CVisArea::OffsetPosition(const Vec3& delta)
-{
-    m_boxArea.Move(delta);
-    m_boxStatics.Move(delta);
-    for (int i = 0; i < m_lstShapePoints.Count(); i++)
-    {
-        m_lstShapePoints[i] += delta;
-    }
-    if (m_pObjectsTree)
-    {
-        m_pObjectsTree->OffsetObjects(delta);
-    }
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/VisAreas.h b/Code/CryEngine/Cry3DEngine/VisAreas.h
deleted file mode 100644
index 4fbc5ce421..0000000000
--- a/Code/CryEngine/Cry3DEngine/VisAreas.h
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : visibility areas header
-
-
-#ifndef CRYINCLUDE_CRY3DENGINE_VISAREAS_H
-#define CRYINCLUDE_CRY3DENGINE_VISAREAS_H
-#pragma once
-
-#include "BasicArea.h"
-#include "CullBuffer.h"
-
-// Unique identifier for each VisArea instance
-typedef unsigned int VisAreaId;
-
-typedef uint64 VisAreaGUID;
-
-#define ReservedVisAreaBytes 384
-
-enum EVisAreaColdDataType
-{
-    eCDT_Generic = 0,
-    eCDT_Portal
-};
-
-struct SGenericColdData
-{
-    SGenericColdData()
-    {
-        m_dataType = eCDT_Generic;
-    }
-
-    ILINE void ResetGenericData()
-    {
-        m_dataType = eCDT_Generic;
-    }
-
-    EVisAreaColdDataType m_dataType;
-    char m_sName[64];
-};
-
-struct SPortalColdData
-    : public SGenericColdData
-{
-    SPortalColdData()
-    {
-        m_dataType = eCDT_Portal;
-        m_pRNTmpData = NULL;
-    }
-
-    ILINE void ResetPortalData()
-    {
-        m_dataType = eCDT_Portal;
-    }
-
-    struct CRNTmpData* m_pRNTmpData;
-};
-
-struct CVisArea
-    : public IVisArea
-    , public CBasicArea
-{
-    static void StaticReset();
-
-    // editor interface
-    virtual void Update(const Vec3* pPoints, int nCount, const char* szName, const SVisAreaInfo& info);
-
-    CVisArea();
-    CVisArea(VisAreaGUID visGUID);
-    virtual ~CVisArea();
-
-    bool operator ==(const CVisArea& v1) const { return &v1 == this; }
-
-    void Init();
-    ILINE SGenericColdData* GetColdData() { return m_pVisAreaColdData; }
-    ILINE void SetColdDataPtr(SGenericColdData* pColdData) { m_pVisAreaColdData = pColdData; }
-    bool IsSphereInsideVisArea(const Vec3& vPos, const f32 fRadius);
-    bool IsPointInsideVisArea(const Vec3& vPos) const;
-    bool IsBoxOverlapVisArea(const AABB& objBox);
-    bool ClipToVisArea(bool bInside, Sphere& sphere, Vec3 const& vNormal);
-    bool FindVisArea(IVisArea* pAnotherArea, int nMaxRecursion, bool bSkipDisabledPortals);
-    bool FindVisAreaReqursive(IVisArea* pAnotherArea, int nMaxReqursion, bool bSkipDisabledPortals, StaticDynArray<CVisArea*, 1024>& arrVisitedParents);
-    bool GetDistanceThruVisAreas(AABB vCurBoxIn, IVisArea* pTargetArea, const AABB& targetBox, int nMaxReqursion, float& fResDist);
-    bool GetDistanceThruVisAreasReq(AABB vCurBoxIn, float fCurDistIn, IVisArea* pTargetArea, const AABB& targetBox, int nMaxReqursion, float& fResDist, CVisArea* pPrevArea, int nCallID);
-    void FindSurroundingVisArea(int nMaxReqursion, bool bSkipDisabledPortals, PodArray<IVisArea*>* pVisitedAreas = NULL, int nMaxVisitedAreas = 0, int nDeepness = 0);
-    void FindSurroundingVisAreaReqursive(int nMaxReqursion, bool bSkipDisabledPortals, PodArray<IVisArea*>* pVisitedAreas, int nMaxVisitedAreas, int nDeepness, PodArray<CVisArea*>* pUnavailableAreas);
-    int GetVisFrameId();
-    Vec3 GetConnectionNormal(CVisArea* pPortal);
-    void PreRender(int nReqursionLevel, CCamera CurCamera, CVisArea* pParent, CVisArea* pCurPortal, bool* pbOutdoorVisible, PodArray<CCamera>* plstOutPortCameras, bool* pbSkyVisible, bool* pbOceanVisible, PodArray<CVisArea*>& lstVisibleAreas, const SRenderingPassInfo& passInfo);
-    void UpdatePortalCameraPlanes(CCamera& cam, Vec3* pVerts, bool bMergeFrustums, const SRenderingPassInfo& passInfo);
-    int GetVisAreaConnections(IVisArea** pAreas, int nMaxConnNum, bool bSkipDisabledPortals = false);
-    int GetRealConnections(IVisArea** pAreas, int nMaxConnNum, bool bSkipDisabledPortals = false);
-    bool IsPortalValid();
-    bool IsPortalIntersectAreaInValidWay(CVisArea* pPortal);
-    bool IsPortal() const;
-    bool IsShapeClockwise();
-    bool IsAffectedByOutLights() const { return m_bAffectedByOutLights; }
-    bool IsActive() { return m_bActive || (GetCVars()->e_Portals == 4); }
-    void UpdateGeometryBBox();
-    void UpdateClipVolume();
-    void UpdatePortalBlendInfo();
-    void DrawAreaBoundsIntoCBuffer(class CCullBuffer* pCBuffer);
-    void ClipPortalVerticesByCameraFrustum(PodArray<Vec3>* pPolygon, const CCamera& cam);
-    void GetMemoryUsage(ICrySizer* pSizer);
-    bool IsConnectedToOutdoor() const;
-    bool IsIgnoringGI() const { return m_bIgnoreGI; }
-    bool IsIgnoringOutdoorAO() const { return m_bIgnoreOutdoorAO; }
-
-    const char* GetName() { return m_pVisAreaColdData->m_sName; }
-# if ENGINE_ENABLE_COMPILATION
-    int SaveHeader(byte*& pData, int& nDataSize);
-    int SaveObjectsTree(byte*& pData, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo, byte* pHead);
-    int GetData(byte*& pData, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo);
-    int GetSegmentData(byte*& pData, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo);
-# endif
-    template <class T>
-    int LoadHeader_T(T& f, int& nDataSizeLeft, EEndian eEndian, int& objBlockSize);
-    template <class T>
-    int LoadObjectsTree_T(T& f, int& nDataSizeLeft, int nSID, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo, const int objBlockSize);
-    template <class T>
-    int Load_T(T& f, int& nDataSize, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo);
-    int Load(byte*& f, int& nDataSizeLeft, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo);
-    int Load(AZ::IO::HandleType& fileHandle, int& nDataSizeLeft, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo);
-    const AABB* GetAABBox() const;
-    const AABB* GetStaticObjectAABBox() const;
-    void AddConnectedAreas(PodArray<CVisArea*>& lstAreas, int nMaxRecursion);
-    void GetShapePoints(const Vec3*& pPoints, size_t& nPoints);
-    float GetHeight();
-    float CalcSignedArea();
-
-    bool CalcPortalBlendPlanes(Vec3 camPos);
-    virtual void GetClipVolumeMesh(_smart_ptr<IRenderMesh>& renderMesh, Matrix34& worldTM) const;
-    virtual AABB GetClipVolumeBBox() const { return *GetStaticObjectAABBox(); }
-    virtual uint8 GetStencilRef() const { return m_nStencilRef; }
-    virtual uint    GetClipVolumeFlags() const;
-    virtual bool IsPointInsideClipVolume(const Vec3& vPos) const { return IsPointInsideVisArea(vPos); }
-
-    void OffsetPosition(const Vec3& delta);
-    static VisAreaGUID GetGUIDFromFile(byte* f, EEndian eEndian);
-    VisAreaGUID GetGUID() const { return m_nVisGUID; }
-
-    static PodArray<CVisArea*> m_lUnavailableAreas;
-    static PodArray<Vec3> s_tmpLstPortVertsClipped;
-    static PodArray<Vec3> s_tmpLstPortVertsSS;
-    static PodArray<Vec3> s_tmpPolygonA;
-    static PodArray<IRenderNode*>   s_tmpLstLights;
-    static CPolygonClipContext s_tmpClipContext;
-    static PodArray<CCamera> s_tmpCameras;
-    static int s_nGetDistanceThruVisAreasCallCounter;
-
-    VisAreaGUID m_nVisGUID;
-    PodArray<CVisArea*> m_lstConnections;
-    Vec3 m_vConnNormals[2];
-    int m_nRndFrameId;
-    float m_fGetDistanceThruVisAreasMinDistance;
-    int m_nGetDistanceThruVisAreasLastCallID;
-    float m_fPortalBlending;
-
-    PodArray<Vec3> m_lstShapePoints;
-    float m_fHeight;
-
-    _smart_ptr<IRenderMesh> m_pClipVolumeMesh;
-
-    Vec3 m_vAmbientColor;
-    float m_fDistance;
-    float m_fViewDistRatio;
-    CCamera* m_arrOcclCamera[MAX_RECURSION_LEVELS];
-    int m_lstCurCamerasLen;
-    int m_lstCurCamerasCap;
-    int m_lstCurCamerasIdx;
-    uint8 m_nStencilRef;
-    SGenericColdData* m_pVisAreaColdData;
-    bool m_bAffectedByOutLights;
-    bool m_bSkyOnly;
-    bool m_bOceanVisible;
-    bool m_bDoubleSide;
-    bool m_bUseDeepness;
-    bool m_bUseInIndoors;
-    bool m_bThisIsPortal;
-    bool m_bIgnoreSky;
-    bool m_bActive;
-    bool m_bIgnoreGI;
-    bool m_bIgnoreOutdoorAO;
-};
-
-struct CSWVisArea
-    : public CVisArea
-    , public _i_reference_target_t
-{
-    CSWVisArea()
-        : CVisArea()
-        , m_nSlotID(-1) {}
-    ~CSWVisArea() {}
-
-    void Release()
-    {
-        --m_nRefCounter;
-        if (m_nRefCounter < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-    }
-
-    int Load(byte*& f, int& nDataSizeLeft, int nSID, std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, EEndian eEndian, SHotUpdateInfo* pExportInfo, const Vec2& indexOffset);
-
-    int m_nSlotID;
-};
-
-struct SAABBTreeNode
-{
-    SAABBTreeNode(PodArray<CVisArea*>& lstAreas, AABB box, int nMaxRecursion = 0);
-    ~SAABBTreeNode();
-    CVisArea* FindVisarea(const Vec3& vPos);
-    SAABBTreeNode* GetTopNode(const AABB& box, void** pNodeCache);
-    bool IntersectsVisAreas(const AABB& box);
-    int ClipOutsideVisAreas(Sphere& sphere, Vec3 const& vNormal);
-    void OffsetPosition(const Vec3& delta);
-
-    AABB nodeBox;
-    PodArray<CVisArea*> nodeAreas;
-    SAABBTreeNode* arrChilds[2];
-};
-
-struct TTopologicalSorter;
-
-struct CVisAreaSegmentData
-{
-    // active vis areas in current segment
-    std::vector<int> m_visAreaIndices;
-};
-
-struct CVisAreaManager
-    : public IVisAreaManager
-    , Cry3DEngineBase
-{
-    CVisArea* m_pCurArea, * m_pCurPortal;
-    PodArray<CVisArea* > m_lstActiveEntransePortals;
-
-    PodArray<CVisArea*> m_lstVisAreas;
-    PodArray<CVisArea*> m_lstPortals;
-    PodArray<CVisArea*> m_lstOcclAreas;
-    PodArray<CVisArea*> m_segVisAreas;
-    PodArray<CVisArea*> m_segPortals;
-    PodArray<CVisArea*> m_segOcclAreas;
-    PodArray<CVisArea*> m_lstActiveOcclVolumes;
-    PodArray<CVisArea*> m_lstIndoorActiveOcclVolumes;
-    PodArray<CVisArea*> m_lstVisibleAreas;
-    PodArray<CVisArea*> m_tmpLstUnavailableAreas;
-    PodArray<CVisArea*> m_tmpLstLightBoxAreas;
-    bool m_bOutdoorVisible;
-    bool m_bSkyVisible;
-    bool m_bOceanVisible;
-    bool m_bSunIsNeeded;
-    PodArray<CCamera> m_lstOutdoorPortalCameras;
-    PodArray<IVisAreaCallback*> m_lstCallbacks;
-    SAABBTreeNode* m_pAABBTree;
-
-    CVisAreaManager();
-    ~CVisAreaManager();
-    void UpdateAABBTree();
-    void SetCurAreas(const SRenderingPassInfo& passInfo);
-    PodArray<CVisArea*>* GetActiveEntransePortals() { return &m_lstActiveEntransePortals; }
-    void PortalsDrawDebug();
-    bool IsEntityVisible(IRenderNode* pEnt);
-    bool IsOutdoorAreasVisible() override;
-    bool IsSkyVisible();
-    bool IsOceanVisible();
-    CVisArea* CreateVisArea(VisAreaGUID visGUID);
-    bool DeleteVisArea(CVisArea* pVisArea);
-    bool SetEntityArea(IRenderNode* pEnt, const AABB& objBox, const float fObjRadiusSqr);
-    void CheckVis(const SRenderingPassInfo& passInfo);
-    void DrawVisibleSectors(const SRenderingPassInfo& passInfo, SRendItemSorter& rendItemSorter);
-    void ActivatePortal(const Vec3& vPos, bool bActivate, const char* szEntityName);
-    void UpdateVisArea(CVisArea* pArea, const Vec3* pPoints, int nCount, const char* szName, const SVisAreaInfo& info);
-    virtual void UpdateConnections();
-    void MoveObjectsIntoList(PodArray<SRNInfo>* plstVisAreasEntities, const AABB& boxArea, bool bRemoveObjects = false);
-    IVisArea* GetVisAreaFromPos(const Vec3& vPos);
-    bool IntersectsVisAreas(const AABB& box, void** pNodeCache = 0);
-    bool ClipOutsideVisAreas(Sphere& sphere, Vec3 const& vNormal, void* pNodeCache = 0);
-    bool IsEntityVisAreaVisible(IRenderNode* pEnt, int nMaxReqursion, const CDLight* pLight, const SRenderingPassInfo& passInfo);
-    void MakeActiveEntransePortalsList(const CCamera* pCamera, PodArray<CVisArea*>& lstActiveEntransePortals, CVisArea* pThisPortal, const SRenderingPassInfo& passInfo);
-    void DrawOcclusionAreasIntoCBuffer(CCullBuffer* pCBuffer, const SRenderingPassInfo& passInfo);
-    bool IsValidVisAreaPointer(CVisArea* pVisArea);
-    void GetStreamingStatus(int& nLoadedSectors, int& nTotalSectors);
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    bool IsOccludedByOcclVolumes(const AABB& objBox, const SRenderingPassInfo& passInfo, bool bCheckOnlyIndoorVolumes = false);
-    void GetObjectsAround(Vec3 vExploPos, float fExploRadius, PodArray<SRNInfo>* pEntList, bool bSkip_ERF_NO_DECALNODE_DECALS = false, bool bSkipDynamicObjects = false);
-    void IntersectWithBox(const AABB& aabbBox, PodArray<CVisArea*>* plstResult, bool bOnlyIfVisible);
-    template <class T>
-    bool Load_T(T& f, int& nDataSize, struct SVisAreaManChunkHeader* pVisAreaManagerChunkHeader, std::vector<struct IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, bool bHotUpdate, SHotUpdateInfo* pExportInfo);
-    virtual bool Load(AZ::IO::HandleType& fileHandle, int& nDataSize, struct SVisAreaManChunkHeader* pVisAreaManagerChunkHeader, std::vector<struct IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable);
-    virtual bool SetCompiledData(byte* pData, int nDataSize, std::vector<struct IStatObj*>** ppStatObjTable, std::vector<_smart_ptr<IMaterial>>** ppMatTable, bool bHotUpdate, SHotUpdateInfo* pExportInfo);
-    virtual bool GetCompiledData(byte* pData, int nDataSize, std::vector<struct IStatObj*>** ppStatObjTable, std::vector<_smart_ptr<IMaterial>>** ppMatTable, std::vector<struct IStatInstGroup*>** ppStatInstGroupTable, EEndian eEndian, SHotUpdateInfo* pExportInfo);
-    virtual int GetCompiledDataSize(SHotUpdateInfo* pExportInfo);
-    void UnregisterEngineObjectsInArea(const SHotUpdateInfo* pExportInfo, PodArray<IRenderNode*>& arrUnregisteredObjects, bool bOnlyEngineObjects);
-    void PrecacheLevel(bool bPrecacheAllVisAreas, Vec3* pPrecachePoints, int nPrecachePointsNum);
-    bool IsEntityVisAreaVisibleReqursive(CVisArea* pVisArea, int nMaxReqursion, PodArray<CVisArea*>* pUnavailableAreas, const CDLight* pLight, const SRenderingPassInfo& passInfo);
-    bool IsAABBVisibleFromPoint(AABB& aabb, Vec3 vPos);
-    bool FindShortestPathToVisArea(CVisArea* pThisArea, CVisArea* pTargetArea, PodArray<CVisArea*>& arrVisitedAreas, int& nRecursion, const struct Shadowvolume& sv);
-
-    int             GetNumberOfVisArea() const;                                                                             // the function give back the accumlated number of visareas and portals
-    IVisArea* GetVisAreaById(int nID) const;                                                                    // give back the visarea interface based on the id (0..GetNumberOfVisArea()) it can be a visarea or a portal
-
-    virtual void AddListener(IVisAreaCallback* pListener);
-    virtual void RemoveListener(IVisAreaCallback* pListener);
-
-    virtual void CloneRegion(const AABB& region, const Vec3& offset, float zRotation);
-    virtual void ClearRegion(const AABB& region);
-
-    void InitAABBTree();
-
-    // -------------------------------------
-
-    void GetObjectsByType(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback = nullptr) override;
-    void GetObjectsByFlags(uint dwFlags, PodArray<IRenderNode*>& lstObjects);
-
-    void GetNearestCubeProbe(float& fMinDistance, int& nMaxPriority, CLightEntity*& pNearestLight, const AABB* pBBox);
-
-    void GetObjects(PodArray<IRenderNode*>& lstObjects, const AABB* pBBox);
-    CVisArea* GetCurVisArea() { return m_pCurArea ? m_pCurArea : m_pCurPortal; }
-    void GenerateStatObjAndMatTables(std::vector<IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<IStatInstGroup*>* pStatInstGroupTable, SHotUpdateInfo* pExportInfo);
-    void OnVisAreaDeleted(IVisArea* pArea);
-    void ActivateObjectsLayer(uint16 nLayerId, bool bActivate, bool bPhys, IGeneralMemoryHeap* pHeap);
-
-    virtual void PrepareSegmentData(const AABB& box);
-    virtual void ReleaseInactiveSegments();
-    virtual bool CreateSegment(int nSID);
-    virtual bool DeleteSegment(int nSID, bool bDeleteNow);
-    virtual bool StreamCompiledData(uint8* pData, int nDataSize, int nSID, std::vector<struct IStatObj*>* pStatObjTable, std::vector<_smart_ptr<IMaterial>>* pMatTable, std::vector<struct IStatInstGroup*>* pStatInstGroupTable, const Vec2& vIndexOffset);
-    virtual void OffsetPosition(const Vec3& delta);
-
-private:
-    void DeleteAllVisAreas();
-
-    CVisArea* CreateTypeVisArea();
-    CVisArea* CreateTypePortal();
-    CVisArea* CreateTypeOcclArea();
-
-    void DeleteVisAreaSegment(int nSID, PodArray<CVisAreaSegmentData>& visAreaSegmentData, PodArray<CVisArea*>& lstVisAreas, PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas, PodArray<int>& deletedVisAreas);
-    CVisArea* FindVisAreaByGuid(VisAreaGUID guid, PodArray<CVisArea*>& lstVisAreas);
-    CSWVisArea* FindFreeVisAreaFromPool(PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas);
-    template<class T>
-    CSWVisArea* CreateVisAreaFromPool(PodArray<CVisArea*>& lstVisAreas, PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas, PodArray<T>& visAreaColdData, bool bIsPortal);
-    template<class T>
-    void ResetVisAreaList(PodArray<CVisArea*>& lstVisAreas, PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas, PodArray<T>& visAreaColdData);
-    template<class T>
-    CSWVisArea* CreateTypeArea(PodArray<CVisArea*, ReservedVisAreaBytes>& visAreas, PodArray<T>& visAreaColdData, bool bIsPortal);
-
-    PodArray<CVisArea*, ReservedVisAreaBytes> m_portals;
-    PodArray<CVisArea*, ReservedVisAreaBytes> m_visAreas;
-    PodArray<CVisArea*, ReservedVisAreaBytes> m_occlAreas;
-
-    PodArray<SGenericColdData>  m_visAreaColdData;
-    PodArray<SPortalColdData>       m_portalColdData;
-    PodArray<SGenericColdData>  m_occlAreaColdData;
-
-    PodArray<CVisAreaSegmentData> m_visAreaSegmentData;
-    PodArray<CVisAreaSegmentData> m_portalSegmentData;
-    PodArray<CVisAreaSegmentData> m_occlAreaSegmentData;
-
-    PodArray<int> m_arrDeletedVisArea;
-    PodArray<int> m_arrDeletedPortal;
-    PodArray<int> m_arrDeletedOcclArea;
-
-    struct SActiveVerts
-    {
-        Vec3 arrvActiveVerts[4];
-    };
-
-#if defined(OCCLUSIONCULLER_W)
-    std::vector<SActiveVerts> m_allActiveVerts;
-#endif
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_VISAREAS_H
diff --git a/Code/CryEngine/Cry3DEngine/VolumeObjectDataCreate.cpp b/Code/CryEngine/Cry3DEngine/VolumeObjectDataCreate.cpp
deleted file mode 100644
index 173aded389..0000000000
--- a/Code/CryEngine/Cry3DEngine/VolumeObjectDataCreate.cpp
+++ /dev/null
@@ -1,1148 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates.
-
-/*
-Perlin Noise
-https://mrl.nyu.edu/~perlin/doc/oscar.html
-
-Copyright Ken Perlin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-*/
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "VolumeObjectDataCreate.h"
-
-#include <vector>
-#include <math.h>
-#include "Cry_LegacyPhysUtils.h"
-
-namespace
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Coherent noise function over 1, 2 or 3 dimensions
-    // (copyright Ken Perlin)
-
-    #define B 0x100
-    #define BM 0xff
-    #define N 0x1000
-    #define NP 12   /* 2^N */
-    #define NM 0xfff
-
-    #define s_curve(t) (t * t * (3. - 2. * t))
-    #define lerp(t, a, b) (a + t * (b - a))
-    #define setup(i, b0, b1, r0, r1) \
-    t = vec[i] + N;                  \
-    b0 = ((int)t) & BM;              \
-    b1 = (b0 + 1) & BM;              \
-    r0 = t - (int)t;                 \
-    r1 = r0 - 1.;
-    #define at2(rx, ry) (rx * q[0] + ry * q[1])
-    #define at3(rx, ry, rz) (rx * q[0] + ry * q[1] + rz * q[2])
-
-    void init(void);
-    //double noise1(double);
-    //double noise2(double *);
-    double noise3(double*);
-    //void normalize2(double *);
-    void normalize3(double*);
-
-    //double PerlinNoise1D(double,double,double,int);
-    //double PerlinNoise2D(double,double,double,double,int);
-    float PerlinNoise3D(double, double, double, double, double, int);
-
-    static int pp[B + B + 2];
-    //static double g1[B + B + 2];
-    //static double g2[B + B + 2][2];
-    static double g3[B + B + 2][3];
-    static int start = 1;
-
-    //double noise1(double arg)
-    //{
-    //  int bx0, bx1;
-    //  double rx0, rx1, sx, t, u, v, vec[1];
-
-    //  vec[0] = arg;
-    //  if (start) {
-    //      start = 0;
-    //      init();
-    //  }
-
-    //  setup(0,bx0,bx1,rx0,rx1);
-
-    //  sx = s_curve(rx0);
-    //  u = rx0 * g1[ p[ bx0 ] ];
-    //  v = rx1 * g1[ p[ bx1 ] ];
-
-    //  return(lerp(sx, u, v));
-    //}
-
-    //double noise2(double vec[2])
-    //{
-    //  int bx0, bx1, by0, by1, b00, b10, b01, b11;
-    //  double rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
-    //  int i, j;
-
-    //  if (start) {
-    //      start = 0;
-    //      init();
-    //  }
-
-    //  setup(0, bx0,bx1, rx0,rx1);
-    //  setup(1, by0,by1, ry0,ry1);
-
-    //  i = p[ bx0 ];
-    //  j = p[ bx1 ];
-
-    //  b00 = p[ i + by0 ];
-    //  b10 = p[ j + by0 ];
-    //  b01 = p[ i + by1 ];
-    //  b11 = p[ j + by1 ];
-
-    //  sx = s_curve(rx0);
-    //  sy = s_curve(ry0);
-
-    //  q = g2[ b00 ] ; u = at2(rx0,ry0);
-    //  q = g2[ b10 ] ; v = at2(rx1,ry0);
-    //  a = lerp(sx, u, v);
-
-    //  q = g2[ b01 ] ; u = at2(rx0,ry1);
-    //  q = g2[ b11 ] ; v = at2(rx1,ry1);
-    //  b = lerp(sx, u, v);
-
-    //  return lerp(sy, a, b);
-    //}
-
-    double noise3(double vec[3])
-    {
-        int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
-        double rx0, rx1, ry0, ry1, rz0, rz1, * q, sy, sz, a, b, c, d, t, u, v;
-        int i, j;
-
-        if (start)
-        {
-            start = 0;
-            init();
-        }
-
-        setup(0, bx0, bx1, rx0, rx1);
-        setup(1, by0, by1, ry0, ry1);
-        setup(2, bz0, bz1, rz0, rz1);
-
-        i = pp[ bx0 ];
-        j = pp[ bx1 ];
-
-        b00 = pp[ i + by0 ];
-        b10 = pp[ j + by0 ];
-        b01 = pp[ i + by1 ];
-        b11 = pp[ j + by1 ];
-
-        t  = s_curve(rx0);
-        sy = s_curve(ry0);
-        sz = s_curve(rz0);
-
-        q = g3[ b00 + bz0 ];
-        u = at3(rx0, ry0, rz0);
-        q = g3[ b10 + bz0 ];
-        v = at3(rx1, ry0, rz0);
-        a = lerp(t, u, v);
-
-        q = g3[ b01 + bz0 ];
-        u = at3(rx0, ry1, rz0);
-        q = g3[ b11 + bz0 ];
-        v = at3(rx1, ry1, rz0);
-        b = lerp(t, u, v);
-
-        c = lerp(sy, a, b);
-
-        q = g3[ b00 + bz1 ];
-        u = at3(rx0, ry0, rz1);
-        q = g3[ b10 + bz1 ];
-        v = at3(rx1, ry0, rz1);
-        a = lerp(t, u, v);
-
-        q = g3[ b01 + bz1 ];
-        u = at3(rx0, ry1, rz1);
-        q = g3[ b11 + bz1 ];
-        v = at3(rx1, ry1, rz1);
-        b = lerp(t, u, v);
-
-        d = lerp(sy, a, b);
-
-        return lerp(sz, c, d);
-    }
-
-    //void normalize2(double v[2])
-    //{
-    //  double s;
-
-    //  s = sqrt(v[0] * v[0] + v[1] * v[1]);
-    //  v[0] = v[0] / s;
-    //  v[1] = v[1] / s;
-    //}
-
-    void normalize3(double v[3])
-    {
-        double s;
-
-        s = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-        v[0] = v[0] / s;
-        v[1] = v[1] / s;
-        v[2] = v[2] / s;
-    }
-
-    void init(void)
-    {
-        int i, j, k;
-
-        for (i = 0; i < B; i++)
-        {
-            pp[i] = i;
-            //g1[i] = (double)((cry_rand() % (B + B)) - B) / B;
-
-            //for (j = 0 ; j < 2 ; j++)
-            //  g2[i][j] = (double)((cry_rand() % (B + B)) - B) / B;
-            //normalize2(g2[i]);
-
-            for (j = 0; j < 3; j++)
-            {
-                g3[i][j] = cry_random(-1.0f, 1.0f);
-            }
-            normalize3(g3[i]);
-        }
-
-        while (--i)
-        {
-            k = pp[i];
-            pp[i] = pp[j = cry_random(0, B - 1)];
-            pp[j] = k;
-        }
-
-        for (i = 0; i < B + 2; i++)
-        {
-            pp[B + i] = pp[i];
-            //g1[B + i] = g1[i];
-            //for (j = 0 ; j < 2 ; j++)
-            //  g2[B + i][j] = g2[i][j];
-            for (j = 0; j < 3; j++)
-            {
-                g3[B + i][j] = g3[i][j];
-            }
-        }
-    }
-
-    /* --- My harmonic summing functions - PDB --------------------------*/
-
-    /*
-    In what follows "alpha" is the weight when the sum is formed.
-    Typically it is 2, As this approaches 1 the function is noisier.
-    "beta" is the harmonic scaling/spacing, typically 2.
-    */
-
-    //double PerlinNoise1D(double x,double alpha,double beta,int n)
-    //{
-    //  int i;
-    //  double val,sum = 0;
-    //  double p,scale = 1;
-
-    //  p = x;
-    //  for (i=0;i<n;i++) {
-    //      val = noise1(p);
-    //      sum += val / scale;
-    //      scale *= alpha;
-    //      p *= beta;
-    //  }
-    //  return(sum);
-    //}
-
-    //double PerlinNoise2D(double x,double y,double alpha,double beta,int n)
-    //{
-    //  int i;
-    //  double val,sum = 0;
-    //  double p[2],scale = 1;
-
-    //  p[0] = x;
-    //  p[1] = y;
-    //  for (i=0;i<n;i++) {
-    //      val = noise2(p);
-    //      sum += val / scale;
-    //      scale *= alpha;
-    //      p[0] *= beta;
-    //      p[1] *= beta;
-    //  }
-    //  return(sum);
-    //}
-
-    float PerlinNoise3D(double x, double y, double z, double alpha, double beta, int n)
-    {
-        int i;
-        double val, sum = 0;
-        double p[3], scale = 1;
-
-        p[0] = x;
-        p[1] = y;
-        p[2] = z;
-        for (i = 0; i < n; i++)
-        {
-            val = noise3(p);
-            sum += val / scale;
-            scale *= alpha;
-            p[0] *= beta;
-            p[1] *= beta;
-            p[2] *= beta;
-        }
-        return aznumeric_cast<float>(sum);
-    }
-
-    #undef B
-    #undef BM
-    #undef N
-    #undef NP
-    #undef NM
-
-    //////////////////////////////////////////////////////////////////////////
-
-    struct VolumeParticle
-    {
-        Vec3 p;
-        float r;
-
-        VolumeParticle()
-            : p(0, 0, 0)
-            , r(0)
-        {
-        }
-    };
-
-    typedef std::vector<VolumeParticle> VolumeDesc;
-
-    //////////////////////////////////////////////////////////////////////////
-
-    bool ReadVolumeDescription(const char* pFilePath, VolumeDesc& volDesc, float& globalDensity)
-    {
-        volDesc.clear();
-        globalDensity = 1;
-
-        XmlNodeRef root(gEnv->pSystem->LoadXmlFromFile(pFilePath));
-        if (root)
-        {
-            int numSprites(root->getChildCount());
-            if (numSprites > 0)
-            {
-                root->getAttr("Density", globalDensity);
-                globalDensity = clamp_tpl(globalDensity, 0.0f, 1.0f);
-
-                volDesc.reserve(numSprites);
-                for (int i(0); i < numSprites; ++i)
-                {
-                    XmlNodeRef child(root->getChild(i));
-                    if (child)
-                    {
-                        VolumeParticle vp;
-                        child->getAttr("Pos", vp.p);
-                        child->getAttr("Radius", vp.r);
-                        volDesc.push_back(vp);
-                    }
-                }
-            }
-        }
-
-        return !volDesc.empty();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void CalcBoundingBox(const VolumeDesc& volDesc, AABB& bbox)
-    {
-        bbox.Reset();
-
-        if (volDesc.empty())
-        {
-            return;
-        }
-
-        for (size_t i = 0; i < volDesc.size(); ++i)
-        {
-            bbox.Add(volDesc[i].p, volDesc[i].r);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void CalcTightBounds(const AABB& bbox, AABB& tightBounds, float& scale)
-    {
-        float max = bbox.max.x - bbox.min.x;
-
-        if (bbox.max.y - bbox.min.y > max)
-        {
-            max = bbox.max.y - bbox.min.y;
-        }
-
-        if (bbox.max.z - bbox.min.z > max)
-        {
-            max = bbox.max.z - bbox.min.z;
-        }
-
-        tightBounds.min.x = -(bbox.max.x - bbox.min.x) / max;
-        tightBounds.max.x =  (bbox.max.x - bbox.min.x) / max;
-
-        tightBounds.min.y = -(bbox.max.y - bbox.min.y) / max;
-        tightBounds.max.y =  (bbox.max.y - bbox.min.y) / max;
-
-        tightBounds.min.z = -(bbox.max.z - bbox.min.z) / max;
-        tightBounds.max.z =  (bbox.max.z - bbox.min.z) / max;
-
-        scale = max * 0.5f;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void AdjustBoundingBox(AABB& bbox)
-    {
-        float max = bbox.max.x - bbox.min.x;
-
-        if (bbox.max.y - bbox.min.y > max)
-        {
-            max = bbox.max.y - bbox.min.y;
-        }
-
-        if (bbox.max.z - bbox.min.z > max)
-        {
-            max = bbox.max.z - bbox.min.z;
-        }
-
-        float adj = (max - (bbox.max.x - bbox.min.x)) * 0.5f;
-        bbox.min.x -= adj;
-        bbox.max.x += adj;
-
-        adj = (max - (bbox.max.y - bbox.min.y)) * 0.5f;
-        bbox.min.y -= adj;
-        bbox.max.y += adj;
-
-        adj = (max - (bbox.max.z - bbox.min.z)) * 0.5f;
-        bbox.min.z -= adj;
-        bbox.max.z += adj;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    inline uint8 TrilinearFilteredLookup(const SVolumeDataSrcB& density, const float lx, const float ly, const float lz)
-    {
-        if (lx < 0 || ly < 0 || lz < 0)
-        {
-            return 0;
-        }
-
-        int x = (int) lx;
-        int y = (int) ly;
-        int z = (int) lz;
-
-        if (x > (int)density.m_width - 2 || y > (int)density.m_height - 2 || z > (int)density.m_depth - 2)
-        {
-            return 0;
-        }
-
-        const uint8* src = &density[density.Idx(x, y, z)];
-
-        int lerpX = (int) ((lx - x) * 256.0f);
-        int lerpY = (int) ((ly - y) * 256.0f);
-        int lerpZ = (int) ((lz - z) * 256.0f);
-
-        int _s000 = src[0];
-        int _s001 = src[1];
-        int _s010 = src[density.m_width];
-        int _s011 = src[1 + density.m_width];
-
-        src += density.m_slice;
-
-        int _s100 = src[0];
-        int _s101 = src[1];
-        int _s110 = src[density.m_width];
-        int _s111 = src[1 + density.m_width];
-
-        int s00 = (_s000 << 8) + (_s001 - _s000) * lerpX;
-        int s01 = (_s010 << 8) + (_s011 - _s010) * lerpX;
-        int s0 = ((s00 << 8) + (s01 - s00) * lerpY) >> 8;
-
-        int s10 = (_s100 << 8) + (_s101 - _s100) * lerpX;
-        int s11 = (_s110 << 8) + (_s111 - _s110) * lerpX;
-        int s1 = ((s10 << 8) + (s11 - s10) * lerpY) >> 8;
-
-        return ((s0 << 8) + (s1 - s0) * lerpZ) >> 16;
-    }
-
-    inline int sat(int f)
-    {
-        return (f < 0) ? 0 : ((f > 255) ? 255 : f);
-    }
-
-    void Voxelize(const VolumeDesc& volDesc, float globalDensity, const AABB& bbox, SVolumeDataSrcB& trg)
-    {
-        SVolumeDataSrcB tmp(trg.m_width + 2, trg.m_height + 2, trg.m_depth + 2);
-
-        // clear temporary volume
-        for (size_t i(0); i < tmp.size(); ++i)
-        {
-            tmp[i] = 0;
-        }
-
-        // rasterize spheres
-        for (size_t i = 0; i < volDesc.size(); ++i)
-        {
-            const VolumeParticle& vp(volDesc[i]);
-
-            int sz = (int) floor((float) (trg.m_depth - 1) * ((vp.p.z - vp.r) - bbox.min.z) / (bbox.max.z - bbox.min.z));
-            int ez = (int) ceil((float) (trg.m_depth - 1) * ((vp.p.z + vp.r) - bbox.min.z) / (bbox.max.z - bbox.min.z));
-
-            int sy = (int) floor((float) (trg.m_height - 1) * ((vp.p.y - vp.r) - bbox.min.y) / (bbox.max.y - bbox.min.y));
-            int ey = (int) ceil((float) (trg.m_height - 1) * ((vp.p.y + vp.r) - bbox.min.y) / (bbox.max.y - bbox.min.y));
-
-            int sx = (int) floor((float) (trg.m_width - 1) * ((vp.p.x - vp.r) - bbox.min.x) / (bbox.max.x - bbox.min.x));
-            int ex = (int) ceil((float) (trg.m_width - 1) * ((vp.p.x + vp.r) - bbox.min.x) / (bbox.max.x - bbox.min.x));
-
-            float stepZ = (bbox.max.z - bbox.min.z) / (float) trg.m_depth;
-            float wz = vp.p.z - (bbox.min.z + ((float) sz + 0.5f) * stepZ);
-
-            for (int z = sz; z <= ez; ++z, wz -= stepZ)
-            {
-                float dz2 = wz * wz;
-
-                float stepY = (bbox.max.y - bbox.min.y) / (float) trg.m_height;
-                float wy = vp.p.y - (bbox.min.y + ((float) sy + 0.5f) * stepY);
-
-                for (int y = sy; y <= ey; ++y, wy -= stepY)
-                {
-                    float dy2 = wy * wy;
-
-                    float stepX = (bbox.max.x - bbox.min.x) / (float) trg.m_width;
-                    float wx = vp.p.x - (bbox.min.x + ((float) sx + 0.5f) * stepX);
-
-                    size_t idx = tmp.Idx(sx + 1, y + 1, z + 1);
-                    for (int x = sx; x <= ex; ++x, wx -= stepX, ++idx)
-                    {
-                        float dx2 = wx * wx;
-                        float d = sqrt_tpl(dx2 + dy2 + dz2);
-                        float v = max(1.0f - d / vp.r, 0.0f) * globalDensity;
-                        tmp[idx] = max(tmp[idx], (uint8) (v * 255.0f));
-                    }
-                }
-            }
-        }
-
-        // perturb volume using Perlin noise
-        {
-            float stepGx = 5.0f / (float) trg.m_width;
-            float stepGy = 5.0f / (float) trg.m_height;
-            float stepGz = 5.0f / (float) trg.m_depth;
-
-            const float origBias = 0.25f;
-            const float origFillDens = 1.2f;
-
-            const uint8 bias = (uint8) (origBias * 256.0f);
-            const uint32 biasNorm = (uint32) (256.0f * 256.0f * (origFillDens / (1.0f - origBias)));
-
-            size_t idx = 0;
-
-            float nz = 0;
-            float gz = 0;
-            for (unsigned int z = 0; z < trg.m_depth; ++z, nz += 1.0f, gz += stepGz)
-            {
-                float ny = 0;
-                float gy = 0;
-                for (unsigned int y = 0; y < trg.m_height; ++y, ny += 1.0f, gy += stepGy)
-                {
-                    float nx = 0;
-                    float gx = 0;
-                    for (unsigned int x = 0; x < trg.m_width; ++x, nx += 1.0f, gx += stepGx, ++idx)
-                    {
-                        float gtx = (float)nx + 5.0f * PerlinNoise3D(gx, gy, gz, 2.0f, 2.1525f, 5);
-                        float gty = (float)ny + 5.0f * PerlinNoise3D(gx + 21.132f, gy, gz, 2.0f, 2.1525f, 5);
-                        float gtz = (float)nz + 5.0f * PerlinNoise3D(gx, gy + 3.412f, gz, 2.0f, 2.1525f, 5);
-
-                        //float val = (float) TrilinearFilteredLookup(tmp, gtx + 1.0f, gty + 1.0f, gtz + 1.0f) / 255.0f;
-                        //trg[idx] = (uint8) (saturate(saturate(val - origBias) / (1.0f - origBias) * origFillDens) * 255.0f);
-
-                        uint8 val = TrilinearFilteredLookup(tmp, gtx + 1.0f, gty + 1.0f, gtz + 1.0f);
-                        trg[idx] = sat(sat(val - bias) * biasNorm >> 16);
-
-                        //trg[idx] = (uint8) TrilinearFilteredLookup(tmp, gtx + 1.0f, gty + 1.0f, gtz + 1.0f);
-                    }
-                }
-            }
-        }
-
-        //// low pass filter
-        //{
-        //  {
-        //      size_t srcIdx = 0;
-        //      for (unsigned int z = 0; z < trg.m_depth; ++z)
-        //      {
-        //          for (unsigned int y = 0; y < trg.m_height; ++y)
-        //          {
-        //              size_t dstIdx = tmp.Idx(1, y+1, z+1);
-        //              for (unsigned int x = 0; x < trg.m_width; ++x, ++srcIdx, ++dstIdx)
-        //                  tmp[dstIdx] = trg[srcIdx];
-        //          }
-        //      }
-        //  }
-        //  {
-        //      size_t dstIdx = 0;
-        //      for (unsigned int z = 0; z < trg.m_depth; ++z)
-        //      {
-        //          for (unsigned int y = 0; y < trg.m_height; ++y)
-        //          {
-        //              const uint8* src = &tmp[tmp.Idx(1, y+1, z+1)];
-        //              for (unsigned int x = 0; x < trg.m_width; ++x, ++dstIdx, ++src)
-        //              {
-        //                  const uint8* srcRow1 = src - tmp.m_slice - 1;
-        //                  const uint8* srcRow0 = srcRow1 - tmp.m_width;
-        //                  const uint8* srcRow2 = srcRow1 + tmp.m_width;
-
-        //                  uint32 sum = 0;
-        //                  sum += srcRow0[0] + srcRow0[1] + srcRow0[2];
-        //                  sum += srcRow1[0] + (srcRow1[1] << 1) + srcRow1[2];
-        //                  sum += srcRow2[0] + srcRow2[1] + srcRow2[2];
-
-        //                  srcRow0 += tmp.m_slice;
-        //                  srcRow1 += tmp.m_slice;
-        //                  srcRow2 += tmp.m_slice;
-
-        //                  sum += srcRow0[0] + (srcRow0[1] << 1) + srcRow0[2];
-        //                  sum += (srcRow1[0] << 1) + (srcRow1[1] << 4) + (srcRow1[2] << 1);
-        //                  sum += srcRow2[0] + (srcRow2[1] << 1) + srcRow2[2];
-
-        //                  srcRow0 += tmp.m_slice;
-        //                  srcRow1 += tmp.m_slice;
-        //                  srcRow2 += tmp.m_slice;
-
-        //                  sum += srcRow0[0] + srcRow0[1] + srcRow0[2];
-        //                  sum += srcRow1[0] + (srcRow1[1] << 1) + srcRow1[2];
-        //                  sum += srcRow2[0] + srcRow2[1] + srcRow2[2];
-
-        //                  const uint32 weight = 65536 / 48;
-        //                  sum *= weight;
-        //                  sum >>= 16;
-
-        //                  trg[dstIdx] = sum;
-        //              }
-        //          }
-        //      }
-        //  }
-        //}
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    /*
-        void DumpAsRAW(SVolumeDataSrcB& v, const char* name)
-        {
-            FILE* f(fopen(name, "wb"));
-
-            if (f)
-            {
-                for (unsigned int y = 0; y < 64; ++y)
-                {
-                    for (unsigned int z = 0; z < 64; ++z)
-                    {
-                        for (unsigned int x = 0; x < 64; ++x)
-                        {
-                            uint8 val = v[v.Idx(x,y,z)];
-
-                            fwrite(&val, 1, 1, f);
-                        }
-                    }
-                }
-                fclose(f);
-            }
-        }
-    */
-    //////////////////////////////////////////////////////////////////////////
-
-    inline void PerPixelFilteredLookup(uint8* pShadow, const uint8* pDensity, const int s00, const int s01,
-        const int s10, const int s11, const int lerpX, const int lerpY, const int shadowStrength)
-    {
-        int _s00 = pShadow[s00];
-        int _s01 = pShadow[s01];
-        int _s10 = pShadow[s10];
-        int _s11 = pShadow[s11];
-
-        int s0 = (_s00 << 8) + (_s01 - _s00) * lerpX;
-        int s1 = (_s10 << 8) + (_s11 - _s10) * lerpX;
-        int s = ((s0 << 8) + (s1 - s0) * lerpY) >> 8;
-        //int d = *pDensity * 103; // 103 = 0.4 * 256.0
-        int d = *pDensity * shadowStrength;
-
-        // todo: store data 1-
-        //*pShadow = fastround_positive(s * (1.0f - 0.2f * d));
-        *pShadow = s * (65280 - d) >> 24; // 65280 = 1.0 * 255 * 256
-    }
-
-    //shadow is propagated from one slice to the next
-    inline void PerSliceFilteredLookup(uint8* pShadow, const uint8* pDensity, const int duOffset, const int dvOffset,
-        const int s00, const int s01, const int s10, const int s11, const int lerpX, const int lerpY, const int shadowStrength)
-    {
-        for (int v = 0; v < VOLUME_SHADOW_SIZE - 1; ++v)
-        {
-            for (int u = 0; u < VOLUME_SHADOW_SIZE - 1; ++u)
-            {
-                int offset(duOffset * u + dvOffset * v);
-                PerPixelFilteredLookup(&pShadow[offset], &pDensity[offset], s00, s01, s10, s11, lerpX, lerpY, shadowStrength);
-            }
-        }
-    }
-
-    inline void PerBlockFilteredLookup(uint8* pShadow, const uint8* pDensity, const int duOffset, const int dvOffset,
-        const int dwOffset, const int s00, const int s01, const int s10, const int s11, const int lerpX, const int lerpY, const int shadowStrength)
-    {
-        for (int w = 1; w < VOLUME_SHADOW_SIZE; ++w)
-        {
-            int offset(dwOffset * w);
-            PerSliceFilteredLookup(&pShadow[offset], &pDensity[offset], duOffset, dvOffset, s00, s01, s10, s11, lerpX, lerpY, shadowStrength);
-        }
-    }
-} // anonymous namespace
-
-
-bool CreateVolumeObject(const char* filePath, SVolumeDataSrcB& trg, AABB& tightBounds, float& scale)
-{
-    VolumeDesc volDesc;
-    float globalDensity(1);
-    if (ReadVolumeDescription(filePath, volDesc, globalDensity))
-    {
-        AABB bbox;
-
-        CalcBoundingBox(volDesc, bbox);
-        CalcTightBounds(bbox, tightBounds, scale);
-        AdjustBoundingBox(bbox);
-        Voxelize(volDesc, globalDensity, bbox, trg);
-        //DumpAsRAW(trg, "E:\\TestDensity.raw");
-        return true;
-    }
-
-    return false;
-}
-
-
-bool CreateVolumeShadow(const Vec3& lightDir, float shadowStrength, const SVolumeDataSrcB& density, SVolumeDataSrcB& shadows)
-{
-    for (size_t i(0); i < shadows.size(); ++i)
-    {
-        shadows[i] = 255;
-    }
-
-    if (density.m_width != VOLUME_SHADOW_SIZE || density.m_height != VOLUME_SHADOW_SIZE || density.m_depth != VOLUME_SHADOW_SIZE ||
-        shadows.m_width != VOLUME_SHADOW_SIZE || shadows.m_height != VOLUME_SHADOW_SIZE || shadows.m_depth != VOLUME_SHADOW_SIZE)
-    {
-        assert(!"CreateVolumeShadow() -- density and/or shadow volume has invalid dimension!");
-        return false;
-    }
-
-    float sun[3] = {lightDir.x, lightDir.y, lightDir.z};
-
-    int majAxis = 0;
-    {
-        float abssun[3] = { fabsf(sun[0]), fabsf(sun[1]), fabsf(sun[2]) };
-
-        if (abssun[1] > abssun[0])
-        {
-            majAxis = 1;
-        }
-        if (abssun[2] > abssun[majAxis])
-        {
-            majAxis = 2;
-        }
-
-        // project direction onto the -1..1 cube sides
-        float fInv = 1.0f / abssun[majAxis];
-
-        sun[0] *= fInv;
-        sun[1] *= fInv;
-        sun[2] *= fInv;
-    }
-
-    int du[3] = { 0 };
-    int dv[3] = { 0 };
-    int dw[3] = { 0 };
-
-    int w = 0;
-
-    if (sun[majAxis] > 0)
-    {
-        dw[majAxis] = 1;
-    }
-    else
-    {
-        dw[majAxis] = -1;
-        w = VOLUME_SHADOW_SIZE - 1;
-    }
-
-    int secAxis = (majAxis + 1) % 3;
-    int thirdAxis = (majAxis + 2) % 3;
-
-    du[secAxis] = 1;
-    dv[thirdAxis] = 1;
-
-    int duOffset = du[0] + (du[1] + du[2] * VOLUME_SHADOW_SIZE) * VOLUME_SHADOW_SIZE;
-    int dvOffset = dv[0] + (dv[1] + dv[2] * VOLUME_SHADOW_SIZE) * VOLUME_SHADOW_SIZE;
-    int dwOffset = dw[0] + (dw[1] + dw[2] * VOLUME_SHADOW_SIZE) * VOLUME_SHADOW_SIZE;
-
-
-    float lerpX = sun[secAxis];
-    float lerpY = sun[thirdAxis];
-
-    //if(sun[majAxis]>0)
-    {
-        lerpX = -lerpX;
-        lerpY = -lerpY;
-    }
-
-    int prevSliceOffset = -dwOffset;
-    int offset = -w * dwOffset;
-
-    if (lerpX < 0)
-    {
-        lerpX += 1.0f;
-        prevSliceOffset -= duOffset;
-        offset += duOffset;
-    }
-
-    if (lerpY < 0)
-    {
-        lerpY += 1.0f;
-        prevSliceOffset -= dvOffset;
-        offset += dvOffset;
-    }
-
-    PerBlockFilteredLookup(&shadows[offset], &density[offset], duOffset, dvOffset, dwOffset,
-        prevSliceOffset, duOffset + prevSliceOffset, dvOffset + prevSliceOffset, duOffset + dvOffset + prevSliceOffset,
-        (int) (lerpX * 256.0f), (int) (lerpY * 256.0f), (int) (clamp_tpl(shadowStrength, 0.0f, 1.0f) * 256.0f));
-
-    return true;
-}
-
-
-bool CreateDownscaledVolumeObject(const SVolumeDataSrcB& src, SVolumeDataSrcB& trg)
-{
-    if (src.m_width != 2 * trg.m_width || src.m_height != 2 * trg.m_height || src.m_depth != 2 * trg.m_height)
-    {
-        for (size_t i(0); i < trg.size(); ++i)
-        {
-            trg[i] = 255;
-        }
-
-        assert(!"CreateDownscaledVolumeObject() -- src and/or trg volume has invalid dimension!");
-        return false;
-    }
-
-    for (unsigned int z = 0; z < trg.m_depth; ++z)
-    {
-        for (unsigned int y = 0; y < trg.m_height; ++y)
-        {
-            for (unsigned int x = 0; x < trg.m_width; ++x)
-            {
-                trg[trg.Idx(x, y, z)] = (uint8) (0.125f * (src[src.Idx(2 * x, 2 * y, 2 * z)] +
-                                                           src[src.Idx(2 * x + 1, 2 * y, 2 * z)] +
-                                                           src[src.Idx(2 * x, 2 * y + 1, 2 * z)] +
-                                                           src[src.Idx(2 * x + 1, 2 * y + 1, 2 * z)] +
-                                                           src[src.Idx(2 * x, 2 * y, 2 * z + 1)] +
-                                                           src[src.Idx(2 * x + 1, 2 * y, 2 * z + 1)] +
-                                                           src[src.Idx(2 * x, 2 * y + 1, 2 * z + 1)] +
-                                                           src[src.Idx(2 * x + 1, 2 * y + 1, 2 * z + 1)]));
-            }
-        }
-    }
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-
-
-namespace
-{
-    typedef std::vector<Vec3> Points;
-    typedef std::vector<uint8> PointIndexCache;
-
-    bool IsPowerOfTwo(unsigned int x)
-    {
-        int cnt = 0;
-        while (x > 0)
-        {
-            cnt += x & 1;
-            x >>= 1;
-        }
-        return cnt == 1;
-    }
-
-    bool GeneratePoints(const SVolumeDataSrcB& src, Points& pts)
-    {
-        struct SPointGenerator
-        {
-        public:
-            SPointGenerator(const SVolumeDataSrcB& _src, unsigned int _size, Points& _pts)
-                : m_src(_src)
-                , m_pts(_pts)
-                , m_cache()
-            {
-                size_t cacheSize = (m_src.m_width * m_src.m_height * m_src.m_depth + 7) >> 3;
-                m_cache.resize(cacheSize);
-
-                for (size_t i = 0; i < cacheSize; ++i)
-                {
-                    m_cache[i] = 0;
-                }
-
-                if (Traverse(0, 0, 0, _size))
-                {
-                    PushPts(0, 0, 0, _size);
-                }
-            }
-
-        private:
-            void PushPt(unsigned int x, unsigned int y, unsigned int z)
-            {
-                size_t idx = m_src.Idx(x, y, z);
-                if ((m_cache[idx >> 3] & (1 << (idx & 7))) == 0)
-                {
-                    Vec3 p;
-                    p.x = 2.0f * ((float) x / (float) m_src.m_width) - 1.0f;
-                    p.y = 2.0f * ((float) y / (float) m_src.m_height) - 1.0f;
-                    p.z = 2.0f * ((float) z / (float) m_src.m_depth) - 1.0f;
-                    assert(fabs(p.x) <= 1.0f && fabs(p.y) <= 1.0f && fabs(p.z) <= 1.0f);
-                    m_pts.push_back(p);
-                    m_cache[idx >> 3] |= 1 << (idx & 7);
-                }
-            }
-
-            void PushPts(unsigned int x, unsigned int y, unsigned int z, unsigned int size)
-            {
-                PushPt(x, y, z);
-                PushPt(x + size, y, z);
-                PushPt(x, y + size, z);
-                PushPt(x + size, y + size, z);
-                PushPt(x, y, z + size);
-                PushPt(x + size, y, z + size);
-                PushPt(x, y + size, z + size);
-                PushPt(x + size, y + size, z + size);
-            }
-
-            bool Traverse(unsigned int x, unsigned int y, unsigned int z, unsigned int size)
-            {
-                if (size == 1)
-                {
-                    bool isSolid = false;
-
-                    unsigned int zs = max((int) z - 1, 0);
-                    unsigned int ze = min(z + 2, m_src.m_depth);
-                    for (; zs < ze; ++zs)
-                    {
-                        unsigned int ys = max((int)y - 1, 0);
-                        unsigned int ye = min(y + 2, m_src.m_height);
-                        for (; ys < ye; ++ys)
-                        {
-                            unsigned int xs = max((int)x - 1, 0);
-                            unsigned int xe = min(x + 2, m_src.m_width);
-                            for (; xs < xe; ++xs)
-                            {
-                                isSolid |= m_src[m_src.Idx(xs, ys, zs)] != 0;
-                                if (isSolid)
-                                {
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                    return false;
-                }
-
-                unsigned int ns = size >> 1;
-
-                bool isSolid[8];
-                isSolid[0] = Traverse(x, y, z, ns);
-                isSolid[1] = Traverse(x + ns, y, z, ns);
-                isSolid[2] = Traverse(x, y + ns, z, ns);
-                isSolid[3] = Traverse(x + ns, y + ns, z, ns);
-                isSolid[4] = Traverse(x, y, z + ns, ns);
-                isSolid[5] = Traverse(x + ns, y, z + ns, ns);
-                isSolid[6] = Traverse(x, y + ns, z + ns, ns);
-                isSolid[7] = Traverse(x + ns, y + ns, z + ns, ns);
-
-                bool mergeSubtrees = isSolid[0];
-                for (int i = 1; i < 8; ++i)
-                {
-                    mergeSubtrees &= isSolid[i];
-                }
-
-                if (!mergeSubtrees)
-                {
-                    if (isSolid[0])
-                    {
-                        PushPts(x, y, z, ns);
-                    }
-                    if (isSolid[1])
-                    {
-                        PushPts(x + ns, y, z, ns);
-                    }
-                    if (isSolid[2])
-                    {
-                        PushPts(x, y + ns, z, ns);
-                    }
-                    if (isSolid[3])
-                    {
-                        PushPts(x + ns, y + ns, z, ns);
-                    }
-                    if (isSolid[4])
-                    {
-                        PushPts(x, y, z + ns, ns);
-                    }
-                    if (isSolid[5])
-                    {
-                        PushPts(x + ns, y, z + ns, ns);
-                    }
-                    if (isSolid[6])
-                    {
-                        PushPts(x, y + ns, z + ns, ns);
-                    }
-                    if (isSolid[7])
-                    {
-                        PushPts(x + ns, y + ns, z + ns, ns);
-                    }
-                }
-
-                return mergeSubtrees;
-            }
-
-        private:
-            const SVolumeDataSrcB& m_src;
-            Points& m_pts;
-            PointIndexCache m_cache;
-        };
-
-        if (src.m_width != src.m_height || src.m_width != src.m_depth || src.m_height != src.m_depth)
-        {
-            return false;
-        }
-
-        unsigned int size = src.m_width;
-
-        if (!IsPowerOfTwo(size))
-        {
-            return false;
-        }
-
-        SPointGenerator gen(src, size, pts);
-
-        return true;
-    }
-
-    void* qhmalloc(size_t s)
-    {
-        return new uint8[s];
-    }
-
-    void qhfree(void* p)
-    {
-        delete [] (uint8*) p;
-    }
-} // anonymous namespace
-
-
-bool CreateVolumeDataHull(const SVolumeDataSrcB& src, SVolumeDataHull& hull)
-{
-    Points pts;
-    if (GeneratePoints(src, pts))
-    {
-        Vec3* pPts = &pts[0];
-        size_t numPts = pts.size();
-
-        // compute convex hull
-        LegacyCryPhysicsUtils::index_t* pIndices = 0;
-        int numTris = LegacyCryPhysicsUtils::qhull(pPts, (int) numPts, pIndices, qhmalloc);
-
-        if (pIndices)
-        {
-            // map used vertices
-            typedef std::map<int, int> Vtx2Vtx;
-            Vtx2Vtx v2v;
-            for (int i = 0, idx = 0; i < numTris; ++i)
-            {
-                if (v2v.find(pIndices[idx]) == v2v.end())
-                {
-                    v2v.insert(Vtx2Vtx::value_type(pIndices[idx], -1));
-                }
-                ++idx;
-
-                if (v2v.find(pIndices[idx]) == v2v.end())
-                {
-                    v2v.insert(Vtx2Vtx::value_type(pIndices[idx], -1));
-                }
-                ++idx;
-
-                if (v2v.find(pIndices[idx]) == v2v.end())
-                {
-                    v2v.insert(Vtx2Vtx::value_type(pIndices[idx], -1));
-                }
-                ++idx;
-            }
-            // generate new indices
-            int newIdx = 0;
-            {
-                Vtx2Vtx::iterator it = v2v.begin();
-                Vtx2Vtx::iterator itEnd = v2v.end();
-                for (; it != itEnd; ++it, ++newIdx)
-                {
-                    (*it).second = newIdx;
-                }
-            }
-            // write used vertices
-            {
-                hull.m_numPts = newIdx;
-                SAFE_DELETE_ARRAY(hull.m_pPts);
-                hull.m_pPts = new SVF_P3F[newIdx];
-
-                Vtx2Vtx::iterator it = v2v.begin();
-                Vtx2Vtx::iterator itEnd = v2v.end();
-                for (size_t i = 0; it != itEnd; ++it, ++i)
-                {
-                    assert((*it).second == i);
-                    hull.m_pPts[i].xyz = pPts[(*it).first];
-                }
-            }
-            // write remapped indices
-            {
-                hull.m_numTris = numTris;
-                SAFE_DELETE_ARRAY(hull.m_pIdx);
-                hull.m_pIdx = new vtx_idx [numTris * 3];
-
-                for (int i = 0; i < numTris * 3; ++i)
-                {
-                    assert(v2v.find(pIndices[i]) != v2v.end());
-                    hull.m_pIdx[i] = v2v[pIndices[i]];
-                }
-            }
-            // free temp hull index array
-            qhfree(pIndices);
-        }
-        else
-        {
-            hull.m_numPts = 0;
-            hull.m_numTris = 0;
-
-            SAFE_DELETE_ARRAY(hull.m_pPts);
-            SAFE_DELETE_ARRAY(hull.m_pIdx);
-        }
-
-        return true;
-    }
-    return false;
-}
-#undef lerp
diff --git a/Code/CryEngine/Cry3DEngine/VolumeObjectDataCreate.h b/Code/CryEngine/Cry3DEngine/VolumeObjectDataCreate.h
deleted file mode 100644
index 44995bc951..0000000000
--- a/Code/CryEngine/Cry3DEngine/VolumeObjectDataCreate.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_VOLUMEOBJECTDATACREATE_H
-#define CRYINCLUDE_CRY3DENGINE_VOLUMEOBJECTDATACREATE_H
-#pragma once
-
-const int VOLUME_SIZE(64);
-const int VOLUME_SHADOW_SIZE(32);
-
-
-template <typename T>
-struct SVolumeDataSrc
-{
-    typedef T VoxelElementType;
-
-    unsigned int m_width;
-    unsigned int m_height;
-    unsigned int m_depth;
-    unsigned int m_slice;
-    VoxelElementType* m_pData;
-
-    SVolumeDataSrc(unsigned int width, unsigned int height, unsigned int depth)
-        : m_width(width)
-        , m_height(height)
-        , m_depth(depth)
-        , m_slice(width * depth)
-        , m_pData(0)
-    {
-        m_pData = new VoxelElementType[m_width * m_height * m_depth];
-    }
-
-    ~SVolumeDataSrc()
-    {
-        SAFE_DELETE_ARRAY(m_pData)
-    }
-
-    size_t size() const
-    {
-        return m_width * m_height * m_depth;
-    }
-
-    size_t Idx(unsigned int x, unsigned int y, unsigned int z) const
-    {
-        //return z * m_width * m_height + y * m_width + x;
-        return (z * m_height + y) * m_width + x;
-    }
-
-    T& operator[](size_t idx)
-    {
-        return m_pData[idx];
-    }
-
-    const T& operator[](size_t idx) const
-    {
-        return m_pData[idx];
-    }
-};
-
-
-typedef SVolumeDataSrc<uint8> SVolumeDataSrcB;
-typedef SVolumeDataSrc<float> SVolumeDataSrcF;
-
-
-bool CreateVolumeObject(const char* filePath, SVolumeDataSrcB& trg, AABB& tightBounds, float& scale);
-bool CreateVolumeShadow(const Vec3& lightDir, float shadowStrength, const SVolumeDataSrcB& density, SVolumeDataSrcB& shadows);
-bool CreateDownscaledVolumeObject(const SVolumeDataSrcB& src, SVolumeDataSrcB& trg);
-
-
-struct SVolumeDataHull
-{
-    SVolumeDataHull()
-        : m_numPts(0)
-        , m_numTris(0)
-        , m_pPts(0)
-        , m_pIdx(0)
-    {
-    }
-
-    ~SVolumeDataHull()
-    {
-        SAFE_DELETE_ARRAY(m_pPts);
-        SAFE_DELETE_ARRAY(m_pIdx);
-    }
-
-    size_t m_numPts;
-    size_t m_numTris;
-    SVF_P3F* m_pPts;
-    vtx_idx* m_pIdx;
-};
-
-
-bool CreateVolumeDataHull(const SVolumeDataSrcB& src, SVolumeDataHull& hull);
-
-#endif // CRYINCLUDE_CRY3DENGINE_VOLUMEOBJECTDATACREATE_H
diff --git a/Code/CryEngine/Cry3DEngine/VolumeObjectRenderNode.cpp b/Code/CryEngine/Cry3DEngine/VolumeObjectRenderNode.cpp
deleted file mode 100644
index 4cb5298bbb..0000000000
--- a/Code/CryEngine/Cry3DEngine/VolumeObjectRenderNode.cpp
+++ /dev/null
@@ -1,971 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "VolumeObjectRenderNode.h"
-#include "VolumeObjectDataCreate.h"
-#include "MatMan.h"
-#include "Environment/OceanEnvironmentBus.h"
-
-#include <map>
-
-
-//////////////////////////////////////////////////////////////////////////
-// volume data cache
-
-class CVolumeDataCache
-{
-public:
-    static CVolumeDataCache& Access();
-
-public:
-    ~CVolumeDataCache();
-
-    void AddItem(const string& name, CVolumeDataItem* pItem);
-    void RemoveItem(const string& name);
-    CVolumeDataItem* GetItem(const string& name) const;
-    size_t size() const;
-
-private:
-    typedef std::map<string, CVolumeDataItem*> VolumeDataItemMap;
-
-private:
-    CVolumeDataCache();
-
-private:
-    VolumeDataItemMap m_cache;
-};
-
-
-CVolumeDataCache& CVolumeDataCache::Access()
-{
-    static CVolumeDataCache s_inst;
-    return s_inst;
-}
-
-
-CVolumeDataCache::CVolumeDataCache()
-    : m_cache()
-{
-}
-
-
-CVolumeDataCache::~CVolumeDataCache()
-{
-    assert(m_cache.empty());
-}
-
-
-void CVolumeDataCache::AddItem(const string& name, CVolumeDataItem* pItem)
-{
-    VolumeDataItemMap::iterator it(m_cache.find(name));
-    assert(it == m_cache.end());
-    if (it == m_cache.end())
-    {
-        m_cache.insert(VolumeDataItemMap::value_type(name, pItem));
-    }
-}
-
-
-void CVolumeDataCache::RemoveItem(const string& name)
-{
-    VolumeDataItemMap::iterator it(m_cache.find(name));
-    assert(it != m_cache.end());
-    if (it != m_cache.end())
-    {
-        m_cache.erase(it);
-    }
-}
-
-
-CVolumeDataItem* CVolumeDataCache::GetItem(const string& name) const
-{
-    VolumeDataItemMap::const_iterator it(m_cache.find(name));
-    return it != m_cache.end() ? (*it).second : 0;
-}
-
-
-size_t CVolumeDataCache::size() const
-{
-    return m_cache.size();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// volume data item
-
-class CVolumeDataItem
-{
-public:
-    static CVolumeDataItem* Create(const char* filePath, const CREVolumeObject* pVolTexFactory);
-
-public:
-    void AddRef();
-    void Release();
-
-    bool IsValid() const;
-    void AddToCache();
-
-    const SVolumeDataSrcB* GetData() const;
-    IVolumeTexture* GetVolumeTexture() const;
-
-    const AABB& GetTightBounds() const;
-    float GetScale() const;
-
-    const SVolumeDataHull* GetHull() const;
-    _smart_ptr<IRenderMesh> GetHullMesh();
-
-private:
-    CVolumeDataItem(const char* filePath, const CREVolumeObject* pVolTexFactory);
-    ~CVolumeDataItem();
-
-private:
-    int m_refCount;
-    bool m_isValid;
-    bool m_isCached;
-    AABB m_tightBounds;
-    float m_scale;
-    string m_volDataFilePath;
-    SVolumeDataSrcB* m_pData;
-    IVolumeTexture* m_pVolTex;
-    SVolumeDataHull* m_pHull;
-    _smart_ptr<IRenderMesh> m_pHullMesh;
-};
-
-
-CVolumeDataItem* CVolumeDataItem::Create(const char* filePath, const CREVolumeObject* pVolTexFactory)
-{
-    return new CVolumeDataItem(filePath, pVolTexFactory);
-}
-
-
-CVolumeDataItem::CVolumeDataItem(const char* filePath, const CREVolumeObject* pVolTexFactory)
-    : m_refCount(1)
-    , m_isValid(false)
-    , m_isCached(false)
-    , m_tightBounds(Vec3(-1, -1, -1), Vec3(1, 1, 1))
-    , m_scale(1)
-    , m_volDataFilePath(filePath)
-    , m_pData(0)
-    , m_pVolTex(0)
-    , m_pHull(0)
-    , m_pHullMesh(0)
-{
-    if (filePath && pVolTexFactory)
-    {
-        SVolumeDataSrcB* pData = new SVolumeDataSrcB(VOLUME_SIZE, VOLUME_SIZE, VOLUME_SIZE);
-        if (pData && pData->m_pData)
-        {
-            if (CreateVolumeObject(m_volDataFilePath, *pData, m_tightBounds, m_scale))
-            {
-                m_pVolTex = pVolTexFactory->CreateVolumeTexture();
-                if (m_pVolTex)
-                {
-                    m_isValid = m_pVolTex->Create(pData->m_width, pData->m_height, pData->m_depth, pData->m_pData);
-                }
-
-                m_pHull = new SVolumeDataHull();
-                if (CreateVolumeDataHull(*pData, *m_pHull))
-                {
-                    m_pHullMesh = gEnv->pRenderer->CreateRenderMeshInitialized(m_pHull->m_pPts, (int) m_pHull->m_numPts, eVF_P3F,
-                            m_pHull->m_pIdx, (int) m_pHull->m_numTris * 3, prtTriangleList, "VolumeObjectHull", "VolumeObjectHull");
-                    m_isValid &= m_pHullMesh != 0;
-                }
-                else
-                {
-                    m_isValid = false;
-                }
-
-                // delete hull in sys mem if no debug drawing is needed
-                SAFE_DELETE(m_pHull);
-
-                m_pData = new SVolumeDataSrcB(VOLUME_SHADOW_SIZE, VOLUME_SHADOW_SIZE, VOLUME_SHADOW_SIZE);
-                if (m_pData && m_pData->m_pData)
-                {
-                    m_isValid &= CreateDownscaledVolumeObject(*pData, *m_pData);
-                }
-                else
-                {
-                    m_isValid = false;
-                }
-            }
-        }
-        SAFE_DELETE(pData);
-    }
-}
-
-
-CVolumeDataItem::~CVolumeDataItem()
-{
-    if (m_isCached)
-    {
-        assert(CVolumeDataCache::Access().GetItem(m_volDataFilePath) == this);
-        CVolumeDataCache::Access().RemoveItem(m_volDataFilePath);
-    }
-
-    SAFE_DELETE(m_pData);
-    SAFE_RELEASE(m_pVolTex);
-    SAFE_DELETE(m_pHull);
-    m_pHullMesh = NULL;
-}
-
-
-void CVolumeDataItem::AddRef()
-{
-    ++m_refCount;
-}
-
-
-void CVolumeDataItem::Release()
-{
-    --m_refCount;
-    if (m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-
-bool CVolumeDataItem::IsValid() const
-{
-    return m_isValid;
-}
-
-
-void CVolumeDataItem::AddToCache()
-{
-    if (m_isValid && !m_isCached)
-    {
-        CVolumeDataCache::Access().AddItem(m_volDataFilePath, this);
-        m_isCached = true;
-    }
-}
-
-
-const SVolumeDataSrcB* CVolumeDataItem::GetData() const
-{
-    return m_pData;
-}
-
-
-IVolumeTexture* CVolumeDataItem::GetVolumeTexture() const
-{
-    return m_pVolTex;
-}
-
-
-const AABB& CVolumeDataItem::GetTightBounds() const
-{
-    return m_tightBounds;
-}
-
-
-float CVolumeDataItem::GetScale() const
-{
-    return m_scale;
-}
-
-
-const SVolumeDataHull* CVolumeDataItem::GetHull() const
-{
-    return m_pHull;
-}
-
-
-_smart_ptr<IRenderMesh> CVolumeDataItem::GetHullMesh()
-{
-    return m_pHullMesh;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// volume shadow creator
-
-class CVolumeShadowCreator
-{
-public:
-    static CVolumeShadowCreator* Create();
-
-public:
-    int AddRef();
-    int Release();
-
-    void CalculateShadows(const Vec3& newLightDir, float shadowStrength, const CVolumeDataItem* pVolSrc, IVolumeTexture* pShadDst);
-
-private:
-    CVolumeShadowCreator();
-    ~CVolumeShadowCreator();
-
-private:
-    int m_refCount;
-    SVolumeDataSrcB* m_pShad;
-};
-
-
-CVolumeShadowCreator* CVolumeShadowCreator::Create()
-{
-    return new CVolumeShadowCreator;
-}
-
-
-CVolumeShadowCreator::CVolumeShadowCreator()
-    : m_refCount(1)
-    , m_pShad(0)
-{
-}
-
-
-CVolumeShadowCreator::~CVolumeShadowCreator()
-{
-}
-
-
-int CVolumeShadowCreator::AddRef()
-{
-    ++m_refCount;
-    return m_refCount;
-}
-
-
-int CVolumeShadowCreator::Release()
-{
-    --m_refCount;
-    int ref(m_refCount);
-    if (m_refCount <= 0)
-    {
-        delete this;
-    }
-    return ref;
-}
-
-
-void CVolumeShadowCreator::CalculateShadows(const Vec3& newLightDir, float shadowStrength, const CVolumeDataItem* pVolSrc, IVolumeTexture* pShadDst)
-{
-    const SVolumeDataSrcB* pSrc(pVolSrc->GetData());
-    if (!pSrc)
-    {
-        return;
-    }
-
-    if (!m_pShad || m_pShad->m_width != pSrc->m_width || m_pShad->m_height != pSrc->m_height || m_pShad->m_depth != pSrc->m_depth)
-    {
-        SAFE_DELETE(m_pShad);
-        m_pShad = new SVolumeDataSrcB(pSrc->m_width, pSrc->m_height, pSrc->m_depth);
-    }
-
-    if (m_pShad)
-    {
-        //float t = gEnv->pTimer->GetAsyncCurTime();
-        CreateVolumeShadow(newLightDir, shadowStrength, *pSrc, *m_pShad);
-        //t = gEnv->pTimer->GetAsyncCurTime() - t;
-        //gEnv->pLog->Log("CreateVolumeShadow(%.3f, %.3f, %.3f) took %.2fms", newLightDir.x, newLightDir.y, newLightDir.z, t * 1000.0f);
-        pShadDst->Update(m_pShad->m_width, m_pShad->m_height, m_pShad->m_depth, m_pShad->m_pData);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// CVolumeObjectRenderNode implementation
-
-CVolumeShadowCreator* CVolumeObjectRenderNode::ms_pVolShadowCreator(0);
-StaticInstance<CVolumeObjectRenderNode::VolumeObjectSet> CVolumeObjectRenderNode::ms_volumeObjects;
-
-ICVar* CVolumeObjectRenderNode::ms_CV_volobj_stats(0);
-int CVolumeObjectRenderNode::e_volobj_stats(0);
-
-
-void CVolumeObjectRenderNode::MoveVolumeObjects()
-{
-    for (VolumeObjectSet::iterator it(ms_volumeObjects.begin()), itEnd(ms_volumeObjects.end()); it != itEnd; ++it)
-    {
-        (*it)->Move();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    if (e_volobj_stats)
-    {
-        CryLogAlways("#VolumeObjects = %" PRISIZE_T, ms_volumeObjects.size());
-        CryLogAlways("#VolumeDataItems = %" PRISIZE_T, CVolumeDataCache::Access().size());
-        e_volobj_stats = 0;
-    }
-}
-
-
-void CVolumeObjectRenderNode::RegisterVolumeObject(CVolumeObjectRenderNode* p)
-{
-    VolumeObjectSet::iterator it(ms_volumeObjects.find(p));
-    assert(it == ms_volumeObjects.end() && "CVolumeObjectRenderNode::RegisterVolumeObject() -- Object already registered!");
-    if (it == ms_volumeObjects.end())
-    {
-        ms_volumeObjects.insert(p);
-    }
-}
-
-
-void CVolumeObjectRenderNode::UnregisterVolumeObject(CVolumeObjectRenderNode* p)
-{
-    VolumeObjectSet::iterator it(ms_volumeObjects.find(p));
-    assert(it != ms_volumeObjects.end() && "CVolumeObjectRenderNode::UnregisterVolumeObject() -- Object not registered or previously removed!");
-    if (it != ms_volumeObjects.end())
-    {
-        ms_volumeObjects.erase(it);
-    }
-}
-
-
-CVolumeObjectRenderNode::CVolumeObjectRenderNode()
-    : m_WSBBox()
-    , m_pos(0, 0, 0)
-    , m_origin(0, 0, 0)
-    , m_matOrig()
-    , m_mat()
-    , m_matInv()
-    , m_lastCachedLightDir(0, 0, 0)
-    , m_tightBoundsOS()
-    , m_moveProps()
-    , m_alpha(1)
-    , m_scale(1)
-    , m_shadowStrength(0.4f)
-    , m_pMaterial(0)
-    , m_pVolDataItem(0)
-    , m_pVolShadTex(0)
-{
-    m_matOrig.SetIdentity();
-    m_mat.SetIdentity();
-    m_matInv.SetIdentity();
-
-    m_WSBBox = AABB(Vec3(-1, -1, -1), Vec3(1, 1, 1));
-    m_tightBoundsOS = AABB(Vec3(-1, -1, -1), Vec3(1, 1, 1));
-
-    m_moveProps.m_autoMove = false;
-    m_moveProps.m_speed = Vec3(0, 0, 0);
-    m_moveProps.m_spaceLoopBox = Vec3(2000.0f, 2000.0f, 2000.0f);
-    m_moveProps.m_fadeDistance = 0;
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_pRE[i] = (CREVolumeObject*) GetRenderer()->EF_CreateRE(eDATA_VolumeObject);
-    }
-
-    m_pMaterial = GetMatMan()->LoadMaterial("Materials/VolumeData/Default", false);
-
-    if (!ms_pVolShadowCreator)
-    {
-        ms_pVolShadowCreator = CVolumeShadowCreator::Create();
-    }
-    else
-    {
-        ms_pVolShadowCreator->AddRef();
-    }
-
-    RegisterVolumeObject(this);
-
-    if (!ms_CV_volobj_stats)
-    {
-        ms_CV_volobj_stats = REGISTER_CVAR(e_volobj_stats, 0, VF_NULL, "");
-    }
-}
-
-
-CVolumeObjectRenderNode::~CVolumeObjectRenderNode()
-{
-    if (ms_pVolShadowCreator->Release() <= 0)
-    {
-        ms_pVolShadowCreator = 0;
-    }
-
-    SAFE_RELEASE(m_pVolShadTex);
-    SAFE_RELEASE(m_pVolDataItem);
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        if (m_pRE[i])
-        {
-            m_pRE[i]->Release(false);
-            m_pRE[i] = 0;
-        }
-    }
-
-    Get3DEngine()->FreeRenderNodeState(this);
-
-    UnregisterVolumeObject(this);
-}
-
-
-void CVolumeObjectRenderNode::LoadVolumeData(const char* filePath)
-{
-    CREVolumeObject* pVolTextureFactory = m_pRE[0]; // ok to use first instance as function is stateless, ptr is not store in objects created below
-
-    CVolumeDataItem* pNewVolDataItem(CVolumeDataCache::Access().GetItem(filePath));
-    if (pNewVolDataItem)
-    {
-        pNewVolDataItem->AddRef();
-        if (m_pVolDataItem)
-        {
-            m_pVolDataItem->Release();
-        }
-        m_pVolDataItem = pNewVolDataItem;
-        InvalidateLastCachedLightDir();
-    }
-    else
-    {
-        pNewVolDataItem = CVolumeDataItem::Create(filePath, pVolTextureFactory);
-        if (pNewVolDataItem && pNewVolDataItem->IsValid())
-        {
-            pNewVolDataItem->AddToCache();
-            if (m_pVolDataItem)
-            {
-                m_pVolDataItem->Release();
-            }
-            m_pVolDataItem = pNewVolDataItem;
-            InvalidateLastCachedLightDir();
-        }
-        else
-        {
-            SAFE_RELEASE(pNewVolDataItem);
-        }
-    }
-
-    SetMatrix(m_matOrig);
-
-    if (m_pVolDataItem && pVolTextureFactory && !m_pVolShadTex)
-    {
-        m_pVolShadTex = pVolTextureFactory->CreateVolumeTexture();
-        if (!m_pVolShadTex->Create(VOLUME_SHADOW_SIZE, VOLUME_SHADOW_SIZE, VOLUME_SHADOW_SIZE, 0))
-        {
-            SAFE_RELEASE(m_pVolShadTex);
-        }
-    }
-}
-
-
-void CVolumeObjectRenderNode::SetProperties([[maybe_unused]] const SVolumeObjectProperties& properties)
-{
-}
-
-
-void CVolumeObjectRenderNode::SetMovementProperties(const SVolumeObjectMovementProperties& properties)
-{
-    m_moveProps = properties;
-}
-
-
-void CVolumeObjectRenderNode::SetMatrix(const Matrix34& mat)
-{
-    m_matOrig = mat;
-    float initialScale(m_pVolDataItem ? m_pVolDataItem->GetScale() : 1);
-    SetMatrixInternal(mat * Matrix33::CreateScale(Vec3(initialScale)), true);
-}
-
-
-void CVolumeObjectRenderNode::SetMatrixInternal(const Matrix34& mat, bool updateOrigin)
-{
-    Get3DEngine()->UnRegisterEntityAsJob(this);
-
-    if (updateOrigin)
-    {
-        m_origin = mat.GetTranslation();
-    }
-
-    m_pos = mat.GetTranslation();
-    m_mat = mat;
-    m_matInv = mat.GetInverted();
-
-    m_tightBoundsOS = m_pVolDataItem ? m_pVolDataItem->GetTightBounds() : AABB(Vec3(-1, -1, -1), Vec3(1, 1, 1));
-    m_WSBBox.SetTransformedAABB(m_mat, m_tightBoundsOS);
-
-    Vec3 scale(m_mat.GetColumn(0).GetLength(), m_mat.GetColumn(1).GetLength(), m_mat.GetColumn(2).GetLength());
-
-    const float Epsilon = 0.001f;
-    AZ_Warning(
-        "VolumeObjectRenderNode",
-        fabsf(scale.x - scale.y) < Epsilon && fabsf(scale.x - scale.z) < Epsilon && fabsf(scale.y - scale.z) < Epsilon,
-        "VolumeObjectRenderNode is using non-uniform scale. Forcing to uniform...");
-    m_scale = max(max(scale.x, scale.y), scale.z);
-
-    Get3DEngine()->RegisterEntity(this);
-}
-
-
-const char* CVolumeObjectRenderNode::GetEntityClassName() const
-{
-    return "VolumeObject";
-}
-
-
-const char* CVolumeObjectRenderNode::GetName() const
-{
-    return "VolumeObject";
-}
-
-
-bool CVolumeObjectRenderNode::IsViewerInsideVolume(const SRenderingPassInfo& passInfo) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 camPosOS(m_matInv.TransformPoint(cam.GetPosition()));
-    const Vec3& scale(m_tightBoundsOS.max);
-    return fabsf(camPosOS.x) < scale.x && fabsf(camPosOS.y) < scale.y && fabsf(camPosOS.z) < scale.z;
-}
-
-
-bool CVolumeObjectRenderNode::NearPlaneIntersectsVolume(const SRenderingPassInfo& passInfo) const
-{
-    const CCamera& cam = passInfo.GetCamera();
-
-    // check if bounding box intersects the near clipping plane
-    const Plane* pNearPlane(cam.GetFrustumPlane(FR_PLANE_NEAR));
-    Vec3 pntOnNearPlane(cam.GetPosition() - pNearPlane->DistFromPlane(cam.GetPosition()) * pNearPlane->n);
-    Vec3 pntOnNearPlaneOS(m_matInv.TransformPoint(pntOnNearPlane));
-
-    Vec3 nearPlaneOS_n(m_matInv.TransformVector(pNearPlane->n) /*.GetNormalized()*/);
-    f32 nearPlaneOS_d(-nearPlaneOS_n.Dot(pntOnNearPlaneOS));
-
-    // get extreme lengths
-    float t(fabsf(nearPlaneOS_n.x * m_tightBoundsOS.max.x) + fabsf(nearPlaneOS_n.y * m_tightBoundsOS.max.y) + fabsf(nearPlaneOS_n.z * m_tightBoundsOS.max.z));
-    //float t(0.0f);
-    //if(nearPlaneOS_n.x >= 0) t += -nearPlaneOS_n.x; else t += nearPlaneOS_n.x;
-    //if(nearPlaneOS_n.y >= 0) t += -nearPlaneOS_n.y; else t += nearPlaneOS_n.y;
-    //if(nearPlaneOS_n.z >= 0) t += -nearPlaneOS_n.z; else t += nearPlaneOS_n.z;
-
-    float t0(t + nearPlaneOS_d);
-    float t1(-t + nearPlaneOS_d);
-
-    return t0 * t1 < 0.0f;
-}
-
-
-void CVolumeObjectRenderNode::InvalidateLastCachedLightDir()
-{
-    m_lastCachedLightDir = Vec3(0, 0, 0);
-}
-
-
-void CVolumeObjectRenderNode::UpdateShadows()
-{
-    Vec3 newLightDir(m_p3DEngine->GetSunDirNormalized());
-
-    float shadowStrength(GetFloatCVar(e_VolObjShadowStrength));
-    if (ms_pVolShadowCreator)
-    {
-        Vec3 newLightDirLS(m_matInv.TransformVector(newLightDir).GetNormalized()); // 0.999f = 1.56 deg = ??? minutes of TOD update, TODO: make adjustable
-        if (m_shadowStrength != shadowStrength || newLightDirLS.Dot(m_lastCachedLightDir) < 0.999f)
-        {
-            ms_pVolShadowCreator->CalculateShadows(-newLightDirLS, shadowStrength, m_pVolDataItem, m_pVolShadTex);
-            m_lastCachedLightDir = newLightDirLS;
-            m_shadowStrength = shadowStrength;
-        }
-    }
-}
-
-
-Plane CVolumeObjectRenderNode::GetVolumeTraceStartPlane(bool viewerInsideVolume, const SRenderingPassInfo& passInfo) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 vdir(cam.GetViewdir());
-    Vec3 vpos(cam.GetPosition());
-
-    if (!viewerInsideVolume)
-    {
-        const Vec3 bbp[8] =
-        {
-            Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.min.y, m_tightBoundsOS.min.z),
-            Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.max.y, m_tightBoundsOS.min.z),
-            Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.max.y, m_tightBoundsOS.min.z),
-            Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.min.y, m_tightBoundsOS.min.z),
-            Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.min.y, m_tightBoundsOS.max.z),
-            Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.max.y, m_tightBoundsOS.max.z),
-            Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.max.y, m_tightBoundsOS.max.z),
-            Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.min.y, m_tightBoundsOS.max.z)
-        };
-
-        Plane viewPlane(vdir, -vdir.Dot(vpos));
-
-        Vec3 p(m_mat * bbp[0]);
-        float d(viewPlane.DistFromPlane(p));
-
-        for (int i(1); i < 8; ++i)
-        {
-            Vec3 ptmp(m_mat * bbp[i]);
-            float dtmp(viewPlane.DistFromPlane(ptmp));
-
-            if (dtmp < d)
-            {
-                p = ptmp;
-                d = dtmp;
-            }
-        }
-
-        return Plane(vdir, -vdir.Dot(p));
-    }
-    else
-    {
-        return Plane(vdir, -vdir.Dot(vpos));
-    }
-}
-
-
-float CVolumeObjectRenderNode::GetDistanceToCamera(const SRenderingPassInfo& passInfo) const
-{
-    const Vec3 bbp[8] =
-    {
-        m_mat* Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.min.y, m_tightBoundsOS.min.z),
-        m_mat * Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.max.y, m_tightBoundsOS.min.z),
-        m_mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.max.y, m_tightBoundsOS.min.z),
-        m_mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.min.y, m_tightBoundsOS.min.z),
-        m_mat * Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.min.y, m_tightBoundsOS.max.z),
-        m_mat * Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.max.y, m_tightBoundsOS.max.z),
-        m_mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.max.y, m_tightBoundsOS.max.z),
-        m_mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.min.y, m_tightBoundsOS.max.z)
-    };
-
-    const CCamera& cam(passInfo.GetCamera());
-    const Plane* pNearPlane(cam.GetFrustumPlane(FR_PLANE_NEAR));
-    const Vec3 camPos(cam.GetPosition());
-
-    f32 distSq(0.0f);
-    for (int i(0); i < 8; ++i)
-    {
-        float tmpDistSq((bbp[i] - camPos).GetLengthSquared());
-        if (tmpDistSq > distSq && pNearPlane->DistFromPlane(bbp[i]) < 0.0f)
-        {
-            distSq = tmpDistSq;
-        }
-    }
-
-    return sqrt_tpl(distSq);
-}
-
-
-void CVolumeObjectRenderNode::Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // anything to render?
-    if (passInfo.IsRecursivePass() || !m_pMaterial || !m_pVolDataItem || !m_pVolShadTex || !passInfo.RenderClouds())
-    {
-        return;
-    }
-
-    IRenderer* pRenderer(GetRenderer());
-
-    const int fillThreadID = passInfo.ThreadID();
-
-    // get render objects
-    CRenderObject* pRO = pRenderer->EF_GetObject_Temp(fillThreadID);
-    if (!pRO || !m_pRE[fillThreadID])
-    {
-        return;
-    }
-
-    // update shadow volume
-    UpdateShadows();
-
-    // set basic render object properties
-    pRO->m_II.m_Matrix = m_mat;
-    pRO->m_fSort = 0;
-    pRO->m_fDistance = GetDistanceToCamera(passInfo);
-
-    // transform camera into object space
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 viewerPosWS(cam.GetPosition());
-    Vec3 viewerPosOS(m_matInv * viewerPosWS);
-
-    // set render element attributes
-    bool viewerInsideVolume(IsViewerInsideVolume(passInfo));
-    bool nearPlaneIntersectsVolume(NearPlaneIntersectsVolume(passInfo));
-    m_pRE[fillThreadID]->m_center = m_pos;
-    m_pRE[fillThreadID]->m_matInv = m_matInv;
-    m_pRE[fillThreadID]->m_eyePosInWS = viewerPosWS;
-    m_pRE[fillThreadID]->m_eyePosInOS = viewerPosOS;
-    m_pRE[fillThreadID]->m_volumeTraceStartPlane = GetVolumeTraceStartPlane(viewerInsideVolume, passInfo);
-    m_pRE[fillThreadID]->m_renderBoundsOS = m_tightBoundsOS;
-    m_pRE[fillThreadID]->m_pHullMesh = m_pVolDataItem->GetHullMesh();
-    m_pRE[fillThreadID]->m_viewerInsideVolume = viewerInsideVolume;
-    m_pRE[fillThreadID]->m_nearPlaneIntersectsVolume = nearPlaneIntersectsVolume;
-    m_pRE[fillThreadID]->m_alpha = m_alpha;
-    m_pRE[fillThreadID]->m_scale = m_scale;
-    m_pRE[fillThreadID]->m_pDensVol = m_pVolDataItem->GetVolumeTexture();
-    m_pRE[fillThreadID]->m_pShadVol = m_pVolShadTex;
-
-    float mvd(GetMaxViewDist());
-    float d((passInfo.GetCamera().GetPosition() - m_mat.GetTranslation()).GetLength());
-    if (d > 0.9f * mvd)
-    {
-        float s(clamp_tpl(1.0f - (d - 0.9f * mvd) / (0.1f * mvd), 0.0f, 1.0f));
-        m_pRE[fillThreadID]->m_alpha *= s;
-    }
-
-    // add to renderer
-    SShaderItem& shaderItem(m_pMaterial->GetShaderItem(0));
-    int afterWater(GetObjManager()->IsAfterWater(m_pos, passInfo));
-    pRenderer->EF_AddEf(m_pRE[fillThreadID], shaderItem, pRO, passInfo, EFSLIST_TRANSP, afterWater, SRendItemSorter(rParam.rendItemSorter));
-
-#if 0
-    IRenderAuxGeom* p = pRenderer->GetIRenderAuxGeom();
-    if (p)
-    {
-        const Matrix34& mat = m_mat;
-        Vec3 bpp[8] =
-        {
-            mat* Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.min.y, m_tightBoundsOS.min.z),
-            mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.min.y, m_tightBoundsOS.min.z),
-            mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.max.y, m_tightBoundsOS.min.z),
-            mat * Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.max.y, m_tightBoundsOS.min.z),
-
-            mat * Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.min.y, m_tightBoundsOS.max.z),
-            mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.min.y, m_tightBoundsOS.max.z),
-            mat * Vec3(m_tightBoundsOS.max.x, m_tightBoundsOS.max.y, m_tightBoundsOS.max.z),
-            mat * Vec3(m_tightBoundsOS.min.x, m_tightBoundsOS.max.y, m_tightBoundsOS.max.z)
-        };
-
-        p->SetRenderFlags(e_Def3DPublicRenderflags);
-
-        p->DrawLine(bpp[0], ColorB(255, 0, 0, 255), bpp[1], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[1], ColorB(255, 0, 0, 255), bpp[2], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[2], ColorB(255, 0, 0, 255), bpp[3], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[3], ColorB(255, 0, 0, 255), bpp[0], ColorB(255, 0, 0, 255));
-
-        p->DrawLine(bpp[4], ColorB(255, 0, 0, 255), bpp[5], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[5], ColorB(255, 0, 0, 255), bpp[6], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[6], ColorB(255, 0, 0, 255), bpp[7], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[7], ColorB(255, 0, 0, 255), bpp[4], ColorB(255, 0, 0, 255));
-
-        p->DrawLine(bpp[0], ColorB(255, 0, 0, 255), bpp[4], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[1], ColorB(255, 0, 0, 255), bpp[5], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[2], ColorB(255, 0, 0, 255), bpp[6], ColorB(255, 0, 0, 255));
-        p->DrawLine(bpp[3], ColorB(255, 0, 0, 255), bpp[7], ColorB(255, 0, 0, 255));
-
-        const SVolumeDataHull* pHull(m_pVolDataItem->GetHull());
-        if (pHull)
-        {
-            for (size_t i = 0; i < pHull->m_numTris; ++i)
-            {
-                p->DrawTriangle(mat * pHull->m_pPts[pHull->m_pIdx[i * 3]].xyz, ColorB(255, 0, 255, 255),
-                    mat * pHull->m_pPts[pHull->m_pIdx[i * 3 + 1]].xyz, ColorB(255, 0, 255, 255),
-                    mat * pHull->m_pPts[pHull->m_pIdx[i * 3 + 2]].xyz, ColorB(255, 0, 255, 255));
-            }
-        }
-    }
-#endif
-}
-
-
-void CVolumeObjectRenderNode::SetMaterial(_smart_ptr<IMaterial> pMat)
-{
-    m_pMaterial = pMat;
-}
-
-
-void CVolumeObjectRenderNode::Precache()
-{
-}
-
-
-void CVolumeObjectRenderNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "VolumeObjectRenderNode");
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-
-void CVolumeObjectRenderNode::Move()
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    m_alpha = 1;
-
-    Vec3 pos(m_mat.GetTranslation());
-
-    ITimer* pTimer(gEnv->pTimer);
-    if (m_moveProps.m_autoMove)
-    {
-        // update position
-        float deltaTime = pTimer->GetFrameTime();
-
-        assert(deltaTime >= 0);
-
-        pos += deltaTime * m_moveProps.m_speed;
-
-        // constrain movement to specified loop box
-        Vec3 loopBoxMin(m_origin - m_moveProps.m_spaceLoopBox);
-        Vec3 loopBoxMax(m_origin + m_moveProps.m_spaceLoopBox);
-
-        if (pos.x < loopBoxMin.x)
-        {
-            pos.x = loopBoxMax.x;
-        }
-        if (pos.y < loopBoxMin.y)
-        {
-            pos.y = loopBoxMax.y;
-        }
-        if (pos.z < loopBoxMin.z)
-        {
-            pos.z = loopBoxMax.z;
-        }
-
-        if (pos.x > loopBoxMax.x)
-        {
-            pos.x = loopBoxMin.x;
-        }
-        if (pos.y > loopBoxMax.y)
-        {
-            pos.y = loopBoxMin.y;
-        }
-        if (pos.z > loopBoxMax.z)
-        {
-            pos.z = loopBoxMin.z;
-        }
-
-        // set new position
-        Matrix34 mat(m_mat);
-        mat.SetTranslation(pos);
-        SetMatrixInternal(mat, false);
-
-        // fade out clouds at the borders of the loop box
-        if (m_moveProps.m_fadeDistance > 0)
-        {
-            Vec3 fade(max(m_moveProps.m_spaceLoopBox.x, m_moveProps.m_fadeDistance),
-                max(m_moveProps.m_spaceLoopBox.y, m_moveProps.m_fadeDistance),
-                max(m_moveProps.m_spaceLoopBox.z, m_moveProps.m_fadeDistance));
-
-            fade -= Vec3(fabs(pos.x - m_origin.x), fabs(pos.y - m_origin.y), fabs(pos.z - m_origin.z));
-
-            m_alpha = clamp_tpl(min(min(fade.x, fade.y), fade.z) / m_moveProps.m_fadeDistance, 0.0f, 1.0f);
-        }
-    }
-    else
-    {
-        if ((m_origin - pos).GetLengthSquared() > 1e-4f)
-        {
-            Matrix34 mat(m_mat);
-            mat.SetTranslation(m_origin);
-            SetMatrixInternal(mat, false);
-        }
-    }
-}
-
-void CVolumeObjectRenderNode::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_WSBBox.Move(delta);
-    m_pos += delta;
-    m_origin += delta;
-    m_matOrig.SetTranslation(m_matOrig.GetTranslation() + delta);
-    m_mat.SetTranslation(m_mat.GetTranslation() + delta);
-    m_matInv = m_mat.GetInverted();
-}
diff --git a/Code/CryEngine/Cry3DEngine/VolumeObjectRenderNode.h b/Code/CryEngine/Cry3DEngine/VolumeObjectRenderNode.h
deleted file mode 100644
index 9f0bae3c75..0000000000
--- a/Code/CryEngine/Cry3DEngine/VolumeObjectRenderNode.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_VOLUMEOBJECTRENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_VOLUMEOBJECTRENDERNODE_H
-#pragma once
-
-class CREVolumeObject;
-class CVolumeDataItem;
-class CVolumeShadowCreator;
-
-
-class CVolumeObjectRenderNode
-    : public IVolumeObjectRenderNode
-    , public Cry3DEngineBase
-{
-public:
-    static void MoveVolumeObjects();
-
-public:
-    CVolumeObjectRenderNode();
-
-    // implements IVolumeObjectRenderNode
-    virtual void LoadVolumeData(const char* filePath);
-    virtual void SetProperties(const SVolumeObjectProperties& properties);
-    virtual void SetMovementProperties(const SVolumeObjectMovementProperties& properties);
-
-    // implements IRenderNode
-    virtual void SetMatrix(const Matrix34& mat);
-
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName() const;
-    virtual const char* GetName() const;
-    virtual Vec3 GetPos(bool bWorldOnly = true) const;
-    virtual void Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo);
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMat);
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = 0);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist();
-    virtual void Precache();
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual const AABB GetBBox() const { return m_WSBBox; }
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-
-
-private:
-    typedef std::set<CVolumeObjectRenderNode*> VolumeObjectSet;
-
-private:
-    static void RegisterVolumeObject(CVolumeObjectRenderNode* p);
-    static void UnregisterVolumeObject(CVolumeObjectRenderNode* p);
-
-private:
-    ~CVolumeObjectRenderNode();
-    bool IsViewerInsideVolume(const SRenderingPassInfo& passInfo) const;
-    bool NearPlaneIntersectsVolume(const SRenderingPassInfo& passInfo) const;
-    void InvalidateLastCachedLightDir();
-    void UpdateShadows();
-    Plane GetVolumeTraceStartPlane(bool viewerInsideVolume, const SRenderingPassInfo& passInfo) const;
-    float GetDistanceToCamera(const SRenderingPassInfo& passInfo) const;
-    void SetMatrixInternal(const Matrix34& mat, bool updateOrigin);
-    void Move();
-
-private:
-    static CVolumeShadowCreator* ms_pVolShadowCreator;
-    static StaticInstance<VolumeObjectSet> ms_volumeObjects;
-
-    static ICVar* ms_CV_volobj_stats;
-    static int e_volobj_stats;
-
-private:
-    AABB m_WSBBox;
-
-    Vec3 m_pos;
-    Vec3 m_origin;
-
-    Matrix34 m_matOrig;
-    Matrix34 m_mat;
-    Matrix34 m_matInv;
-
-    Vec3 m_lastCachedLightDir;
-
-    AABB m_tightBoundsOS;
-
-    SVolumeObjectMovementProperties m_moveProps;
-
-    float m_alpha;
-    float m_scale;
-
-    float m_shadowStrength;
-
-    _smart_ptr< IMaterial > m_pMaterial;
-
-    CREVolumeObject* m_pRE[RT_COMMAND_BUF_COUNT];
-
-    CVolumeDataItem* m_pVolDataItem;
-    IVolumeTexture* m_pVolShadTex;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_VOLUMEOBJECTRENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/WaterVolumeRenderNode.cpp b/Code/CryEngine/Cry3DEngine/WaterVolumeRenderNode.cpp
deleted file mode 100644
index 8be76eac1b..0000000000
--- a/Code/CryEngine/Cry3DEngine/WaterVolumeRenderNode.cpp
+++ /dev/null
@@ -1,1441 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Cry3DEngine_precompiled.h"
-#include "WaterVolumeRenderNode.h"
-#include "VisAreas.h"
-#include "MatMan.h"
-#include "TimeOfDay.h"
-#include <Cry_Geo.h>
-#include "MathConversion.h"
-
-#include <AzCore/Math/Plane.h>
-#include <AzCore/Math/Vector2.h>
-
-//////////////////////////////////////////////////////////////////////////
-// private triangulation code
-namespace WaterVolumeRenderNodeUtils
-{
-    template< typename T >
-    size_t PosOffset();
-
-    template<>
-    size_t PosOffset<Vec3>()
-    {
-        return 0;
-    }
-
-    template<>
-    size_t PosOffset<SVF_P3F_C4B_T2F>()
-    {
-        return offsetof(SVF_P3F_C4B_T2F, xyz);
-    }
-
-
-    template< typename T >
-    struct VertexAccess
-    {
-        VertexAccess(const T* pVertices, size_t numVertices)
-            : m_pVertices(pVertices)
-              , m_numVertices(numVertices)
-        {
-        }
-
-        const Vec3& operator[] (size_t idx) const
-        {
-            assert(idx < m_numVertices);
-            const T* pVertex = &m_pVertices[ idx ];
-            return *(Vec3*) ((size_t) pVertex + PosOffset<T>());
-        }
-
-        const size_t GetNumVertices() const
-        {
-            return m_numVertices;
-        }
-
-    private:
-        const T* m_pVertices;
-        size_t m_numVertices;
-    };
-
-
-    template< typename T >
-    float Area(const VertexAccess<T>& contour)
-    {
-        int n = contour.GetNumVertices();
-        float area = 0.0f;
-
-        for (int p = n - 1, q = 0; q < n; p = q++)
-        {
-            area += contour[p].x * contour[q].y - contour[q].x * contour[p].y;
-        }
-
-        return area * 0.5f;
-    }
-
-    bool InsideTriangle(float Ax, float Ay, float Bx, float By, float Cx, float Cy, float Px, float Py)
-    {
-        float ax = Cx - Bx;
-        float ay = Cy - By;
-        float bx = Ax - Cx;
-        float by = Ay - Cy;
-        float cx = Bx - Ax;
-        float cy = By - Ay;
-        float apx = Px - Ax;
-        float apy = Py - Ay;
-        float bpx = Px - Bx;
-        float bpy = Py - By;
-        float cpx = Px - Cx;
-        float cpy = Py - Cy;
-
-        float aCROSSbp = ax * bpy - ay * bpx;
-        float cCROSSap = cx * apy - cy * apx;
-        float bCROSScp = bx * cpy - by * cpx;
-
-        const float fEpsilon =  -FLT_EPSILON;
-        return (aCROSSbp >= fEpsilon) && (bCROSScp >= fEpsilon) && (cCROSSap >= fEpsilon);
-    };
-
-    template< typename T, typename S >
-    bool Snip(const VertexAccess<T>& contour, int u, int v, int w, int n, const S* V)
-    {
-        float Ax = contour[V[u]].x;
-        float Ay = contour[V[u]].y;
-
-        float Bx = contour[V[v]].x;
-        float By = contour[V[v]].y;
-
-        float Cx = contour[V[w]].x;
-        float Cy = contour[V[w]].y;
-
-        if ((((Bx - Ax) * (Cy - Ay)) - ((By - Ay) * (Cx - Ax))) < 1e-6f)
-        {
-            return false;
-        }
-
-        for (int p = 0; p < n; p++)
-        {
-            if ((p == u) || (p == v) || (p == w))
-            {
-                continue;
-            }
-
-            float Px = contour[V[p]].x;
-            float Py = contour[V[p]].y;
-
-            if (WaterVolumeRenderNodeUtils::InsideTriangle(Ax, Ay, Bx, By, Cx, Cy, Px, Py))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-    template< typename T, typename S >
-    bool Triangulate(const VertexAccess<T>& contour, std::vector<S>& result)
-    {
-        // reset result
-        result.resize(0);
-
-        //C6255: _alloca indicates failure by raising a stack overflow exception. Consider using _malloca instead
-        PREFAST_SUPPRESS_WARNING(6255)
-        // allocate and initialize list of vertices in polygon
-        int n = contour.GetNumVertices();
-        if (n < 3)
-        {
-            return false;
-        }
-
-        S* V = (S*) alloca(n * sizeof(S));
-
-        // we want a counter-clockwise polygon in V
-        if (0.0f < Area(contour))
-        {
-            for (int v = 0; v < n; v++)
-            {
-                V[v] = v;
-            }
-        }
-        else
-        {
-            for (int v = 0; v < n; v++)
-            {
-                V[v] = (n - 1) - v;
-            }
-        }
-
-        int nv = n;
-
-        //  remove nv-2 vertices, creating 1 triangle every time
-        int count = 2 * nv;   // error detection
-
-        for (int m = 0, v = nv - 1; nv > 2; )
-        {
-            // if we loop, it is probably a non-simple polygon
-            if (0 >= (count--))
-            {
-                return false; // ERROR - probably bad polygon!
-            }
-            // three consecutive vertices in current polygon, <u,v,w>
-            int u = v;
-            if (nv <= u)
-            {
-                u = 0;                        // previous
-            }
-            v = u + 1;
-            if (nv <= v)
-            {
-                v = 0;                        // new v
-            }
-            int w = v + 1;
-            if (nv <= w)
-            {
-                w = 0;                        // next
-            }
-            if (Snip(contour, u, v, w, nv, V))
-            {
-                // true names of the vertices
-                PREFAST_SUPPRESS_WARNING(6385)
-                S a = V[u];
-                S b = V[v];
-                S c = V[w];
-
-                // output triangle
-                result.push_back(a);
-                result.push_back(b);
-                result.push_back(c);
-
-                m++;
-
-                // remove v from remaining polygon
-                for (int s = v, t = v + 1; t < nv; s++, t++)
-                {
-                    PREFAST_SUPPRESS_WARNING(6386)
-                    V[s] = V[t];
-                }
-
-                nv--;
-
-                // reset error detection counter
-                count = 2 * nv;
-            }
-        }
-
-        return true;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// helpers
-
-inline static Vec3 MapVertexToFogPlane(const Vec3& v, const Plane& p)
-{
-    const Vec3 projDir(0, 0, 1);
-    float perpdist = p | v;
-    float cosine = p.n | projDir;
-    assert(fabs(cosine) > 1e-4);
-    float pd_c = -perpdist / cosine;
-    return v + projDir * pd_c;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// CWaterVolumeRenderNode implementation
-
-CWaterVolumeRenderNode::CWaterVolumeRenderNode()
-    : m_volumeType(IWaterVolumeRenderNode::eWVT_Unknown)
-    , m_volumeID(~0)
-    , m_volumeDepth(0)
-    , m_streamSpeed(0)
-    , m_wvParams()
-    , m_pMaterial(0)
-    , m_pWaterBodyIntoMat(0)
-    , m_pWaterBodyOutofMat(0)
-    , m_pSerParams(0)
-    , m_pPhysAreaInput(0)
-    , m_pPhysArea(0)
-    , m_waterSurfaceVertices()
-    , m_waterSurfaceIndices()
-    , m_parentEntityWorldTM()
-    , m_nLayerId(0)
-    , m_fogDensity(0)
-    , m_fogColor(0.2f, 0.5f, 0.7f)
-    , m_fogColorAffectedBySun(true)
-    , m_fogPlane(Vec3(0, 0, 1), 0)
-    , m_fogPlaneBase(Vec3(0, 0, 1), 0)
-    , m_fogShadowing(0.5f)
-    , m_center(0, 0, 0)
-    , m_WSBBox(Vec3(-1, -1, -1), Vec3(1, 1, 1))
-    , m_capFogAtVolumeDepth(false)
-    , m_caustics(true)
-    , m_causticIntensity(1.0f)
-    , m_causticTiling(1.0f)
-    , m_causticHeight(0.5f)
-    , m_attachedToEntity(false)
-{
-    m_pWaterBodyIntoMat = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/WaterFogVolumeInto", false);
-    m_pWaterBodyOutofMat = GetMatMan()->LoadMaterial("EngineAssets/Materials/Fog/WaterFogVolumeOutof", false);
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_pVolumeRE[i] = static_cast<CREWaterVolume*>(GetRenderer()->EF_CreateRE(eDATA_WaterVolume));
-        if (m_pVolumeRE[i])
-        {
-            m_pVolumeRE[i]->m_drawWaterSurface = false;
-            m_pVolumeRE[i]->m_pParams = &m_wvParams[i];
-        }
-    }
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_pSurfaceRE[i] = static_cast<CREWaterVolume*>(GetRenderer()->EF_CreateRE(eDATA_WaterVolume));
-        if (m_pSurfaceRE[i])
-        {
-            m_pSurfaceRE[i]->m_drawWaterSurface = true;
-            m_pSurfaceRE[i]->m_pParams = &m_wvParams[i];
-        }
-    }
-
-    m_parentEntityWorldTM.SetIdentity();
-    m_vOffset = Vec3(ZERO);
-}
-
-
-CWaterVolumeRenderNode::~CWaterVolumeRenderNode()
-{
-    Dephysicalize();
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_pVolumeRE[i]->Release(true);
-        m_pVolumeRE[i] = 0;
-        m_pSurfaceRE[i]->Release(true);
-        m_pSurfaceRE[i] = 0;
-    }
-    SAFE_DELETE(m_pSerParams);
-    SAFE_DELETE(m_pPhysAreaInput);
-
-    Get3DEngine()->FreeRenderNodeState(this);
-}
-
-
-void CWaterVolumeRenderNode::SetAreaAttachedToEntity()
-{
-    m_attachedToEntity = true;
-}
-
-
-void CWaterVolumeRenderNode::SetFogDensity(float fogDensity)
-{
-    m_fogDensity = fogDensity;
-}
-
-
-float CWaterVolumeRenderNode::GetFogDensity() const
-{
-    return m_fogDensity;
-}
-
-
-void CWaterVolumeRenderNode::SetFogColor(const Vec3& fogColor)
-{
-    m_fogColor = fogColor;
-}
-
-
-void CWaterVolumeRenderNode::SetFogColorAffectedBySun(bool enable)
-{
-    m_fogColorAffectedBySun = enable;
-}
-
-
-void CWaterVolumeRenderNode::SetFogShadowing(float fogShadowing)
-{
-    m_fogShadowing = fogShadowing;
-}
-
-
-void CWaterVolumeRenderNode::SetCapFogAtVolumeDepth(bool capFog)
-{
-    m_capFogAtVolumeDepth = capFog;
-}
-
-
-void CWaterVolumeRenderNode::SetVolumeDepth(float volumeDepth)
-{
-    m_volumeDepth = volumeDepth;
-
-    UpdateBoundingBox();
-}
-
-
-void CWaterVolumeRenderNode::SetStreamSpeed(float streamSpeed)
-{
-    m_streamSpeed = streamSpeed;
-}
-
-
-void CWaterVolumeRenderNode::SetCaustics(bool caustics)
-{
-    m_caustics = caustics;
-}
-
-
-void CWaterVolumeRenderNode::SetCausticIntensity(float causticIntensity)
-{
-    m_causticIntensity = causticIntensity;
-}
-
-
-void CWaterVolumeRenderNode::SetCausticTiling(float causticTiling)
-{
-    m_causticTiling = causticTiling;
-}
-
-
-void CWaterVolumeRenderNode::SetCausticHeight(float causticHeight)
-{
-    m_causticHeight = causticHeight;
-}
-
-
-void CWaterVolumeRenderNode::CreateOcean([[maybe_unused]] uint64 volumeID, [[maybe_unused]] /* TBD */ bool keepSerializationParams)
-{
-}
-
-
-void CWaterVolumeRenderNode::CreateArea(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale, const Plane& fogPlane, bool keepSerializationParams, int nSID)
-{
-    const bool serializeWith3DEngine = keepSerializationParams && !IsAttachedToEntity();
-
-    assert(fabs(fogPlane.n.GetLengthSquared() - 1.0f) < 1e-4 && "CWaterVolumeRenderNode::CreateArea(...) -- Fog plane normal doesn't have unit length!");
-    assert(fogPlane.n.Dot(Vec3(0, 0, 1)) > 1e-4f && "CWaterVolumeRenderNode::CreateArea(...) -- Invalid fog plane specified!");
-    if (fogPlane.n.Dot(Vec3(0, 0, 1)) <= 1e-4f)
-    {
-        return;
-    }
-
-    assert(numVertices >= 3);
-    if (numVertices < 3)
-    {
-        return;
-    }
-
-    m_volumeID = volumeID;
-    m_fogPlane = fogPlane;
-    m_fogPlaneBase = fogPlane;
-    m_volumeType = IWaterVolumeRenderNode::eWVT_Area;
-
-    // copy volatile creation params to be able to serialize water volume if needed (only in editor)
-    if (serializeWith3DEngine)
-    {
-        CopyVolatileAreaSerParams(pVertices, numVertices, surfUVScale);
-    }
-
-    // remove form 3d engine
-    Get3DEngine()->UnRegisterEntityAsJob(this);
-
-    // Edges pre-pass - break into smaller edges, in case distance threshold too big
-    PodArray< Vec3 > pTessVertList;
-    PodArray< SVF_P3F_C4B_T2F > pVertsTemp;
-    PodArray< uint16 > pIndicesTemp;
-
-    for (uint32 v(0); v < numVertices; ++v)
-    {
-        Vec3 in_a = pVertices[v];
-        Vec3 in_b = (v < numVertices - 1) ? pVertices[v + 1] : pVertices[0]; // close mesh
-
-        Vec3 vAB = in_b - in_a;
-        float fLenAB = vAB.len();
-        vAB.normalize();
-
-        pTessVertList.push_back(in_a);
-
-        const float fLenThreshold = 100.0f;  // break every 100 meters
-        Vec3 vNewVert = Vec3(in_a + (vAB * fLenThreshold));
-        while (fLenAB > fLenThreshold)
-        {
-            pTessVertList.push_back(vNewVert);
-
-            vNewVert = Vec3(vNewVert + (vAB * fLenThreshold));
-            vAB = in_b - vNewVert;
-            fLenAB = vAB.len();
-            vAB.normalize();
-        }
-    }
-
-    m_waterSurfaceVertices.resize(pTessVertList.size());
-    for (uint32 i = 0; i < pTessVertList.size(); ++i)
-    {
-        // project input vertex onto fog plane
-        m_waterSurfaceVertices[i].xyz = MapVertexToFogPlane(pTessVertList[i], fogPlane);
-
-        // generate texture coordinates
-        m_waterSurfaceVertices[i].st = Vec2(surfUVScale.x * (pTessVertList[i].x - pTessVertList[0].x), surfUVScale.y * (pTessVertList[i].y - pTessVertList[0].y));
-
-        pVertsTemp.push_back(m_waterSurfaceVertices[i]);
-    }
-
-    // generate indices.
-    //  Note: triangulation code not robust, relies on contour/vertices to be declared sequentially and no holes -> too many vertices will lead to stretched results
-    WaterVolumeRenderNodeUtils::Triangulate(WaterVolumeRenderNodeUtils::VertexAccess<SVF_P3F_C4B_T2F>(&m_waterSurfaceVertices[0], m_waterSurfaceVertices.size()), m_waterSurfaceIndices);
-
-    // update bounding info
-    UpdateBoundingBox();
-
-    // Safety check.
-    if (m_waterSurfaceIndices.empty())
-    {
-        return;
-    }
-
-    // Pre-tessellate mesh further
-    uint32_t iterationCount = 4;
-    for (uint32 i = 0; i < iterationCount; ++i)
-    {
-        uint32 nIndices =  m_waterSurfaceIndices.size();
-        for (uint32 t = 0; t < nIndices; t += 3)
-        {
-            // Get triangle, compute median edge vertex, insert to vertex list
-            uint16 id_a = m_waterSurfaceIndices[t + 0];
-            uint16 id_b = m_waterSurfaceIndices[t + 1];
-            uint16 id_c = m_waterSurfaceIndices[t + 2];
-
-            SVF_P3F_C4B_T2F& vtx_a = m_waterSurfaceVertices[ id_a ];
-            SVF_P3F_C4B_T2F& vtx_b = m_waterSurfaceVertices[ id_b ];
-            SVF_P3F_C4B_T2F& vtx_c = m_waterSurfaceVertices[ id_c ];
-
-            SVF_P3F_C4B_T2F vtx_m_ab;
-            vtx_m_ab.xyz = (vtx_a.xyz + vtx_b.xyz) * 0.5f;
-            vtx_m_ab.st = (vtx_a.st + vtx_b.st) * 0.5f;
-            vtx_m_ab.color = vtx_a.color;
-
-            pVertsTemp.push_back(vtx_m_ab);
-            uint16 id_d = (uint16) pVertsTemp.size() - 1;
-
-            SVF_P3F_C4B_T2F vtx_m_bc;
-            vtx_m_bc.xyz = (vtx_b.xyz + vtx_c.xyz) * 0.5f;
-            vtx_m_bc.st = (vtx_b.st + vtx_c.st) * 0.5f;
-            vtx_m_bc.color = vtx_a.color;
-
-            pVertsTemp.push_back(vtx_m_bc);
-            uint16 id_e = (uint16) pVertsTemp.size() - 1;
-
-            SVF_P3F_C4B_T2F vtx_m_ca;
-            vtx_m_ca.xyz = (vtx_a.xyz + vtx_c.xyz) * 0.5f;
-            vtx_m_ca.st = (vtx_a.st + vtx_c.st) * 0.5f;
-            vtx_m_ca.color = vtx_a.color;
-
-            pVertsTemp.push_back(vtx_m_ca);
-            uint16 id_f = (uint16) pVertsTemp.size() - 1;
-
-            // build new indices
-
-            // aed
-            pIndicesTemp.push_back(id_a);
-            pIndicesTemp.push_back(id_d);
-            pIndicesTemp.push_back(id_f);
-
-            // ebd
-            pIndicesTemp.push_back(id_d);
-            pIndicesTemp.push_back(id_b);
-            pIndicesTemp.push_back(id_e);
-
-            // bfd
-            pIndicesTemp.push_back(id_f);
-            pIndicesTemp.push_back(id_d);
-            pIndicesTemp.push_back(id_e);
-
-            // fcd
-            pIndicesTemp.push_back(id_f);
-            pIndicesTemp.push_back(id_e);
-            pIndicesTemp.push_back(id_c);
-        }
-
-        // update index list for new iteration
-        m_waterSurfaceIndices.resize(pIndicesTemp.size());
-        memcpy(&m_waterSurfaceIndices[0], &pIndicesTemp[0], sizeof(uint16) * pIndicesTemp.size());
-        m_waterSurfaceVertices.resize(pVertsTemp.size());
-        memcpy(&m_waterSurfaceVertices[0], &pVertsTemp[0], sizeof(SVF_P3F_C4B_T2F) * pVertsTemp.size());
-        pIndicesTemp.clear();
-    }
-
-    // update reference to vertex and index buffer
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_wvParams[i].m_pVertices = &m_waterSurfaceVertices[0];
-        m_wvParams[i].m_numVertices = m_waterSurfaceVertices.size();
-        m_wvParams[i].m_pIndices = &m_waterSurfaceIndices[0];
-        m_wvParams[i].m_numIndices = m_waterSurfaceIndices.size();
-    }
-
-    // add to 3d engine
-    Get3DEngine()->RegisterEntity(this, nSID, nSID);
-}
-
-void CWaterVolumeRenderNode::CreateRiver(uint64 volumeID, const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, float uTexCoordBegin, float uTexCoordEnd, const AZ::Vector2& surfUVScale, const AZ::Plane& fogPlane, bool keepSerializationParams, int nSID)
-{
-    PodArray<Vec3> points;
-    points.reserve(verticies.size());
-    for (auto azPoint : verticies)
-    {
-        points.Add(AZVec3ToLYVec3(transform.TransformPoint(azPoint)));
-    }
-
-    Plane plane = AZPlaneToLyPlane(fogPlane);
-    CreateRiver(volumeID, points.GetElements(), static_cast<unsigned int>(verticies.size()), uTexCoordBegin, uTexCoordEnd, Vec2(surfUVScale.GetX(), surfUVScale.GetY()), plane, keepSerializationParams, nSID);
-}
-
-void CWaterVolumeRenderNode::CreateRiver(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale, const Plane& fogPlane, bool keepSerializationParams, int nSID)
-{
-    const float precisionTolerance = 1e-2f;
-
-    assert(fabs(fogPlane.n.GetLengthSquared() - 1.0f) < precisionTolerance && "CWaterVolumeRenderNode::CreateRiver(...) -- Fog plane normal doesn't have unit length!");
-    assert(fogPlane.n.Dot(Vec3(0, 0, 1)) > precisionTolerance && "CWaterVolumeRenderNode::CreateRiver(...) -- Invalid fog plane specified!");
-    if (fogPlane.n.Dot(Vec3(0, 0, 1)) <= precisionTolerance)
-    {
-        return;
-    }
-
-    assert(numVertices == 4);
-    if (numVertices != 4 || !_finite(pVertices[0].x) || !_finite(pVertices[1].x) || !_finite(pVertices[2].x) || !_finite(pVertices[3].x))
-    {
-        return;
-    }
-
-    m_volumeID = volumeID;
-    m_fogPlane = fogPlane;
-    m_fogPlaneBase = fogPlane;
-    m_volumeType = IWaterVolumeRenderNode::eWVT_River;
-
-    // copy volatile creation params to be able to serialize water volume if needed (only in editor)
-    if (keepSerializationParams)
-    {
-        CopyVolatileRiverSerParams(pVertices, numVertices, uTexCoordBegin, uTexCoordEnd, surfUVScale);
-    }
-
-    // remove form 3d engine
-    Get3DEngine()->UnRegisterEntityAsJob(this);
-
-    // generate vertices
-    m_waterSurfaceVertices.resize(5);
-    m_waterSurfaceVertices[0].xyz = pVertices[0];
-    m_waterSurfaceVertices[1].xyz = pVertices[1];
-    m_waterSurfaceVertices[2].xyz = pVertices[2];
-    m_waterSurfaceVertices[3].xyz = pVertices[3];
-    m_waterSurfaceVertices[4].xyz = 0.25f * (pVertices[0] + pVertices[1] + pVertices[2] + pVertices[3]);
-
-    Vec3 tv0 = Vec3(0, 0,  1.f);
-    Vec3 tv1 = Vec3(0, 0,  -1.f);
-    Plane planes[4];
-    planes[0].SetPlane(pVertices[0], pVertices[1], pVertices[1] + tv0);
-    planes[1].SetPlane(pVertices[2], pVertices[3], pVertices[3] + tv1);
-    planes[2].SetPlane(pVertices[0], pVertices[2], pVertices[2] + tv1);
-    planes[3].SetPlane(pVertices[1], pVertices[3], pVertices[3] + tv0);
-
-
-    for (uint32 i(0); i < 5; ++i)
-    {
-        // map input vertex onto fog plane
-        m_waterSurfaceVertices[i].xyz = MapVertexToFogPlane(m_waterSurfaceVertices[i].xyz, fogPlane);
-
-        // generate texture coordinates
-        float d0(fabsf(planes[0].DistFromPlane(m_waterSurfaceVertices[i].xyz)));
-        float d1(fabsf(planes[1].DistFromPlane(m_waterSurfaceVertices[i].xyz)));
-        float d2(fabsf(planes[2].DistFromPlane(m_waterSurfaceVertices[i].xyz)));
-        float d3(fabsf(planes[3].DistFromPlane(m_waterSurfaceVertices[i].xyz)));
-        float t(fabsf(d0 + d1) < FLT_EPSILON ? 0.0f : clamp_tpl(d0 / (d0 + d1), 0.0f, 1.0f));
-
-        Vec2 st = Vec2((1 - t) * fabsf(uTexCoordBegin) + t * fabsf(uTexCoordEnd), fabsf(d2 + d3) < FLT_EPSILON ? 0.0f : clamp_tpl(d2 / (d2 + d3), 0.0f, 1.0f));
-        st[0] *= surfUVScale.x;
-        st[1] *= surfUVScale.y;
-
-        m_waterSurfaceVertices[i].st = st;
-    }
-
-    // generate indices
-    m_waterSurfaceIndices.resize(12);
-    m_waterSurfaceIndices[ 0] = 0;
-    m_waterSurfaceIndices[ 1] = 1;
-    m_waterSurfaceIndices[ 2] = 4;
-
-    m_waterSurfaceIndices[ 3] = 1;
-    m_waterSurfaceIndices[ 4] = 3;
-    m_waterSurfaceIndices[ 5] = 4;
-
-    m_waterSurfaceIndices[ 6] = 3;
-    m_waterSurfaceIndices[ 7] = 2;
-    m_waterSurfaceIndices[ 8] = 4;
-
-    m_waterSurfaceIndices[ 9] = 0;
-    m_waterSurfaceIndices[10] = 4;
-    m_waterSurfaceIndices[11] = 2;
-
-    // update bounding info
-    UpdateBoundingBox();
-
-    // update reference to vertex and index buffer
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_wvParams[i].m_pVertices = &m_waterSurfaceVertices[0];
-        m_wvParams[i].m_numVertices = m_waterSurfaceVertices.size();
-        m_wvParams[i].m_pIndices = &m_waterSurfaceIndices[0];
-        m_wvParams[i].m_numIndices = m_waterSurfaceIndices.size();
-    }
-
-    // add to 3d engine
-    Get3DEngine()->RegisterEntity(this, nSID, nSID);
-}
-
-
-void CWaterVolumeRenderNode::SetAreaPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams)
-{
-    const bool serializeWith3DEngine = keepSerializationParams && !IsAttachedToEntity();
-
-    assert(pVertices && numVertices > 3 && m_volumeType == IWaterVolumeRenderNode::eWVT_Area);
-    if (!pVertices || numVertices <= 3 || m_volumeType != IWaterVolumeRenderNode::eWVT_Area)
-    {
-        return;
-    }
-
-    if (!m_pPhysAreaInput)
-    {
-        m_pPhysAreaInput = new SWaterVolumePhysAreaInput;
-    }
-
-    const Plane& fogPlane(m_fogPlane);
-
-    // generate contour vertices
-    m_pPhysAreaInput->m_contour.resize(numVertices);
-
-    // map input vertices onto fog plane
-    if (WaterVolumeRenderNodeUtils::Area(WaterVolumeRenderNodeUtils::VertexAccess<Vec3>(pVertices, numVertices)) > 0.0f)
-    {
-        for (unsigned int i(0); i < numVertices; ++i)
-        {
-            m_pPhysAreaInput->m_contour[i] = MapVertexToFogPlane(pVertices[i], fogPlane);   // flip vertex order as physics expects them CCW
-        }
-    }
-    else
-    {
-        for (unsigned int i(0); i < numVertices; ++i)
-        {
-            m_pPhysAreaInput->m_contour[i] = MapVertexToFogPlane(pVertices[numVertices - 1 - i], fogPlane);
-        }
-    }
-
-    // triangulate contour
-    WaterVolumeRenderNodeUtils::Triangulate(WaterVolumeRenderNodeUtils::VertexAccess<Vec3>(&m_pPhysAreaInput->m_contour[0], m_pPhysAreaInput->m_contour.size()), m_pPhysAreaInput->m_indices);
-
-    // reset flow
-    m_pPhysAreaInput->m_flowContour.resize(0);
-
-    if (serializeWith3DEngine)
-    {
-        CopyVolatilePhysicsAreaContourSerParams(pVertices, numVertices);
-    }
-}
-
-void CWaterVolumeRenderNode::SetRiverPhysicsArea(const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, bool keepSerializationParams)
-{
-    PodArray<Vec3> points;
-    points.reserve(verticies.size());
-    for (auto azPoint : verticies)
-    {
-        points.Add(AZVec3ToLYVec3(transform.TransformPoint(azPoint)));
-    }
-    SetRiverPhysicsArea(points.GetElements(), static_cast<unsigned int>(verticies.size()), keepSerializationParams);
-}
-
-void CWaterVolumeRenderNode::SetRiverPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams)
-{
-    assert(pVertices && numVertices > 3 && !(numVertices & 1) && m_volumeType == IWaterVolumeRenderNode::eWVT_River);
-    if (!pVertices || numVertices <= 3 || (numVertices & 1) || m_volumeType != IWaterVolumeRenderNode::eWVT_River)
-    {
-        return;
-    }
-
-    if (!m_pPhysAreaInput)
-    {
-        m_pPhysAreaInput = new SWaterVolumePhysAreaInput;
-    }
-
-    const Plane& fogPlane(m_fogPlane);
-
-    // generate contour vertices
-    m_pPhysAreaInput->m_contour.resize(numVertices);
-
-    // map input vertices onto fog plane
-    if (WaterVolumeRenderNodeUtils::Area(WaterVolumeRenderNodeUtils::VertexAccess<Vec3>(pVertices, numVertices)) > 0.0f)
-    {
-        for (unsigned int i(0); i < numVertices; ++i)
-        {
-            m_pPhysAreaInput->m_contour[i] = MapVertexToFogPlane(pVertices[i], fogPlane);   // flip vertex order as physics expects them CCW
-        }
-    }
-    else
-    {
-        for (unsigned int i(0); i < numVertices; ++i)
-        {
-            m_pPhysAreaInput->m_contour[i] = MapVertexToFogPlane(pVertices[numVertices - 1 - i], fogPlane);
-        }
-    }
-
-    // generate flow along contour
-    unsigned int h(numVertices / 2);
-    unsigned int h2(numVertices);
-    m_pPhysAreaInput->m_flowContour.resize(numVertices);
-    for (unsigned int i(0); i < h; ++i)
-    {
-        if (!i)
-        {
-            m_pPhysAreaInput->m_flowContour[i] = (m_pPhysAreaInput->m_contour[i + 1] - m_pPhysAreaInput->m_contour[i]).GetNormalizedSafe() * m_streamSpeed;
-        }
-        else if (i == h - 1)
-        {
-            m_pPhysAreaInput->m_flowContour[i] = (m_pPhysAreaInput->m_contour[i] - m_pPhysAreaInput->m_contour[i - 1]).GetNormalizedSafe() * m_streamSpeed;
-        }
-        else
-        {
-            m_pPhysAreaInput->m_flowContour[i] = (m_pPhysAreaInput->m_contour[i + 1] - m_pPhysAreaInput->m_contour[i - 1]).GetNormalizedSafe() * m_streamSpeed;
-        }
-    }
-
-    for (unsigned int i(0); i < h; ++i)
-    {
-        if (!i)
-        {
-            m_pPhysAreaInput->m_flowContour[h2 - 1 - i] = (m_pPhysAreaInput->m_contour[h2 - 1 - i - 1] - m_pPhysAreaInput->m_contour[h2 - 1 - i]).GetNormalizedSafe() * m_streamSpeed;
-        }
-        else if (i == h - 1)
-        {
-            m_pPhysAreaInput->m_flowContour[h2 - 1 - i] = (m_pPhysAreaInput->m_contour[h2 - 1 - i] - m_pPhysAreaInput->m_contour[h2 - 1 - i + 1]).GetNormalizedSafe() * m_streamSpeed;
-        }
-        else
-        {
-            m_pPhysAreaInput->m_flowContour[h2 - 1 - i] = (m_pPhysAreaInput->m_contour[h2 - 1 - i - 1] - m_pPhysAreaInput->m_contour[h2 - 1 - i + 1]).GetNormalizedSafe() * m_streamSpeed;
-        }
-    }
-
-    // triangulate contour
-    m_pPhysAreaInput->m_indices.resize(3 * 2 * (numVertices / 2 - 1));
-    for (unsigned int i(0); i < h - 1; ++i)
-    {
-        m_pPhysAreaInput->m_indices[6 * i + 0] = i;
-        m_pPhysAreaInput->m_indices[6 * i + 1] = i + 1;
-        m_pPhysAreaInput->m_indices[6 * i + 2] = h2 - 1 - i - 1;
-
-        m_pPhysAreaInput->m_indices[6 * i + 3] = h2 - 1 - i - 1;
-        m_pPhysAreaInput->m_indices[6 * i + 4] = h2 - 1 - i;
-        m_pPhysAreaInput->m_indices[6 * i + 5] = i;
-    }
-
-    if (keepSerializationParams)
-    {
-        CopyVolatilePhysicsAreaContourSerParams(pVertices, numVertices);
-    }
-}
-
-
-
-const char* CWaterVolumeRenderNode::GetEntityClassName() const
-{
-    return "WaterVolume";
-}
-
-
-const char* CWaterVolumeRenderNode::GetName() const
-{
-    return "WaterVolume";
-}
-
-IRenderNode* CWaterVolumeRenderNode::Clone() const
-{
-    CWaterVolumeRenderNode* pWaterVol = new CWaterVolumeRenderNode();
-
-    // CWaterVolumeRenderNode member vars
-    pWaterVol->m_volumeType = m_volumeType;
-
-    pWaterVol->m_volumeID = m_volumeID;
-
-    pWaterVol->m_volumeDepth = m_volumeDepth;
-    pWaterVol->m_streamSpeed = m_streamSpeed;
-
-    pWaterVol->m_pMaterial = m_pMaterial;
-    pWaterVol->m_pWaterBodyIntoMat = m_pWaterBodyIntoMat;
-    pWaterVol->m_pWaterBodyOutofMat = m_pWaterBodyOutofMat;
-
-    if (m_pPhysAreaInput != NULL)
-    {
-        pWaterVol->m_pPhysAreaInput = new SWaterVolumePhysAreaInput;
-        *pWaterVol->m_pPhysAreaInput = *m_pPhysAreaInput;
-    }
-    else
-    {
-        pWaterVol->m_pPhysAreaInput = NULL;
-    }
-
-    pWaterVol->m_waterSurfaceVertices = m_waterSurfaceVertices;
-    pWaterVol->m_waterSurfaceIndices = m_waterSurfaceIndices;
-
-    pWaterVol->m_parentEntityWorldTM = m_parentEntityWorldTM;
-    pWaterVol->m_nLayerId = m_nLayerId;
-
-    pWaterVol->m_fogDensity = m_fogDensity;
-    pWaterVol->m_fogColor = m_fogColor;
-    pWaterVol->m_fogColorAffectedBySun = m_fogColorAffectedBySun;
-    pWaterVol->m_fogShadowing = m_fogShadowing;
-
-    pWaterVol->m_fogPlane = m_fogPlane;
-    pWaterVol->m_fogPlaneBase = m_fogPlaneBase;
-
-    pWaterVol->m_center = m_center;
-    pWaterVol->m_WSBBox = m_WSBBox;
-
-    pWaterVol->m_capFogAtVolumeDepth = m_capFogAtVolumeDepth;
-    pWaterVol->m_attachedToEntity = m_attachedToEntity;
-    pWaterVol->m_caustics = m_caustics;
-
-    pWaterVol->m_causticIntensity = m_causticIntensity;
-    pWaterVol->m_causticTiling = m_causticTiling;
-    pWaterVol->m_causticShadow = m_causticShadow;
-    pWaterVol->m_causticHeight = m_causticHeight;
-
-    // update reference to vertex and index buffer
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        pWaterVol->m_wvParams[i].m_pVertices = &pWaterVol->m_waterSurfaceVertices[0];
-        pWaterVol->m_wvParams[i].m_numVertices = pWaterVol->m_waterSurfaceVertices.size();
-        pWaterVol->m_wvParams[i].m_pIndices = &pWaterVol->m_waterSurfaceIndices[0];
-        pWaterVol->m_wvParams[i].m_numIndices = pWaterVol->m_waterSurfaceIndices.size();
-    }
-
-    //IRenderNode member vars
-    //  We cannot just copy over due to issues with the linked list of IRenderNode objects
-    CopyIRenderNodeData(pWaterVol);
-
-    return pWaterVol;
-}
-
-inline void TransformPosition(Vec3& pos, const Vec3& localOrigin, const Matrix34& l2w)
-{
-    pos = pos - localOrigin;
-    pos = l2w * pos;
-}
-
-void CWaterVolumeRenderNode::Transform(const Vec3& localOrigin, const Matrix34& l2w)
-{
-    CRY_ASSERT_MESSAGE(!IsAttachedToEntity(), "FIXME: Don't currently support transforming attached water volumes");
-
-    if (m_pPhysAreaInput != NULL)
-    {
-        for (std::vector<Vec3>::iterator it = m_pPhysAreaInput->m_contour.begin(); it != m_pPhysAreaInput->m_contour.end(); ++it)
-        {
-            Vec3& pos = *it;
-            TransformPosition(pos, localOrigin, l2w);
-        }
-
-        for (std::vector<Vec3>::iterator it = m_pPhysAreaInput->m_flowContour.begin(); it != m_pPhysAreaInput->m_flowContour.end(); ++it)
-        {
-            Vec3& pos = *it;
-            TransformPosition(pos, localOrigin, l2w);
-        }
-    }
-
-    for (WaterSurfaceVertices::iterator it = m_waterSurfaceVertices.begin(); it != m_waterSurfaceVertices.end(); ++it)
-    {
-        SVF_P3F_C4B_T2F& vert = *it;
-        TransformPosition(vert.xyz, localOrigin, l2w);
-    }
-
-    Vec3 origFogPoint = m_fogPlane.n * m_fogPlane.d;
-    TransformPosition(origFogPoint, localOrigin, l2w);
-    m_fogPlane.SetPlane(l2w.TransformVector(m_fogPlaneBase.n).GetNormalized(), origFogPoint);
-
-    TransformPosition(m_center, localOrigin, l2w);
-
-    UpdateBoundingBox();
-}
-
-void CWaterVolumeRenderNode::SetMatrix(const Matrix34& mat)
-{
-    if (!IsAttachedToEntity())
-    {
-        return;
-    }
-
-    m_parentEntityWorldTM = mat;
-    m_fogPlane.SetPlane(m_parentEntityWorldTM.TransformVector(m_fogPlaneBase.n).GetNormalized(), m_parentEntityWorldTM.GetTranslation());
-
-    UpdateBoundingBox();
-}
-
-
-void CWaterVolumeRenderNode::Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo)
-{
-    Render_JobEntry(rParam, passInfo, SRendItemSorter(rParam.rendItemSorter));
-}
-
-void CWaterVolumeRenderNode::Render_JobEntry(const SRendParams& rParam, const SRenderingPassInfo& passInfo, SRendItemSorter rendItemSorter)
-{
-    FUNCTION_PROFILER_3DENGINE;
-
-    // hack: special case for when inside amphibious vehicle
-    if (Get3DEngine()->GetOceanRenderFlags() & OCR_NO_DRAW)
-    {
-        return;
-    }
-
-    // anything to render?
-    if (passInfo.IsRecursivePass() || !m_pMaterial || !m_pWaterBodyIntoMat || !m_pWaterBodyOutofMat || !passInfo.RenderWaterVolumes() ||
-        m_waterSurfaceVertices.empty() || m_waterSurfaceIndices.empty())
-    {
-        return;
-    }
-
-    if (m_fogDensity == 0)
-    {
-        return;
-    }
-
-    IRenderer* pRenderer(GetRenderer());
-
-    const int fillThreadID = passInfo.ThreadID();
-
-    // get render objects
-    CRenderObject* pROVol = pRenderer->EF_GetObject_Temp(fillThreadID);
-    CRenderObject* pROSurf = pRenderer->EF_GetObject_Temp(fillThreadID);
-    if (!pROVol || !pROSurf)
-    {
-        return;
-    }
-
-    if (!m_pSurfaceRE[fillThreadID])
-    {
-        return;
-    }
-
-    float distToWaterVolumeSurface(GetCameraDistToWaterVolumeSurface(passInfo));
-    bool aboveWaterVolumeSurface(distToWaterVolumeSurface > 0.0f);
-    bool belowWaterVolume(m_capFogAtVolumeDepth && distToWaterVolumeSurface < -m_volumeDepth);
-    bool insideWaterVolumeSurface2D(IsCameraInsideWaterVolumeSurface2D(passInfo));
-    bool insideWaterVolume(insideWaterVolumeSurface2D && !aboveWaterVolumeSurface && !belowWaterVolume);
-
-    // fill parameters to render elements
-    m_wvParams[fillThreadID].m_viewerInsideVolume = insideWaterVolume;
-    m_wvParams[fillThreadID].m_viewerCloseToWaterPlane = /*insideWaterVolumeSurface2D && */ fabsf(distToWaterVolumeSurface) < 0.5f;
-    m_wvParams[fillThreadID].m_viewerCloseToWaterVolume = GetCameraDistSqToWaterVolumeAABB(passInfo) < 9.0f; //Sq dist
-
-    const float hdrMultiplier = m_fogColorAffectedBySun ? 1.0f : ((CTimeOfDay*)Get3DEngine()->GetTimeOfDay())->GetHDRMultiplier();
-
-    m_wvParams[fillThreadID].m_fogDensity = m_fogDensity;
-    m_wvParams[fillThreadID].m_fogColor = m_fogColor * hdrMultiplier;
-    m_wvParams[fillThreadID].m_fogColorAffectedBySun = m_fogColorAffectedBySun;
-    m_wvParams[fillThreadID].m_fogPlane = m_fogPlane;
-    m_wvParams[fillThreadID].m_fogShadowing = m_fogShadowing;
-
-    m_wvParams[fillThreadID].m_caustics = m_caustics;
-    m_wvParams[fillThreadID].m_causticIntensity = m_causticIntensity;
-    m_wvParams[fillThreadID].m_causticTiling = m_causticTiling;
-    m_wvParams[fillThreadID].m_causticHeight = m_causticHeight;
-
-    m_wvParams[fillThreadID].m_center = m_center;
-    m_wvParams[fillThreadID].m_WSBBox = m_WSBBox;
-
-    // if above water render fog together with water surface
-    bool isFastpath = GetCVars()->e_WaterVolumes == 2 && (distToWaterVolumeSurface > 0.5f || insideWaterVolume);
-    m_pSurfaceRE[fillThreadID]->m_drawFastPath = isFastpath;
-
-    // submit volume
-    if (GetCVars()->e_Fog)
-    {
-        if ((insideWaterVolume || (!isFastpath && aboveWaterVolumeSurface)) && m_pVolumeRE[fillThreadID])
-        {
-            // fill in data for render object
-            if (!IsAttachedToEntity())
-            {
-                pROVol->m_II.m_Matrix.SetIdentity();
-            }
-            else
-            {
-                pROVol->m_II.m_Matrix = m_parentEntityWorldTM;
-            }
-            pROVol->m_fSort = 0;
-
-            // get shader item
-            SShaderItem& shaderItem(m_wvParams[fillThreadID].m_viewerInsideVolume ? m_pWaterBodyOutofMat->GetShaderItem(0) : m_pWaterBodyIntoMat->GetShaderItem(0));
-
-            // add to renderer
-            GetRenderer()->EF_AddEf(m_pVolumeRE[fillThreadID], shaderItem, pROVol, passInfo, EFSLIST_WATER_VOLUMES, aboveWaterVolumeSurface ? 0 : 1, rendItemSorter);
-        }
-    }
-
-    // submit surface
-    {
-        // fill in data for render object
-        if (!IsAttachedToEntity())
-        {
-            pROSurf->m_II.m_Matrix.SetIdentity();
-        }
-        else
-        {
-            pROSurf->m_II.m_Matrix = m_parentEntityWorldTM;
-        }
-        pROSurf->m_fSort = 0;
-        pROSurf->m_nTextureID = rParam.nTextureID;
-
-        // get shader item
-        SShaderItem& shaderItem(m_pMaterial->GetShaderItem(0));
-
-        // add to renderer
-        // Render water refractive surface between beforeWater / afterWater objects.
-        GetRenderer()->EF_AddEf(m_pSurfaceRE[fillThreadID], shaderItem, pROSurf, passInfo, EFSLIST_REFRACTIVE_SURFACE, 0, rendItemSorter);
-    }
-}
-
-
-void CWaterVolumeRenderNode::SetMaterial(_smart_ptr<IMaterial> pMat)
-{
-    m_pMaterial = pMat;
-}
-
-
-void CWaterVolumeRenderNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    SIZER_COMPONENT_NAME(pSizer, "WaterVolumeNode");
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_pSerParams);
-    pSizer->AddObject(m_pPhysAreaInput);
-    pSizer->AddObject(m_waterSurfaceVertices);
-    pSizer->AddObject(m_waterSurfaceIndices);
-}
-
-
-void CWaterVolumeRenderNode::Precache()
-{
-}
-
-
-IPhysicalEntity* CWaterVolumeRenderNode::GetPhysics() const
-{
-    return m_pPhysArea;
-}
-
-
-void CWaterVolumeRenderNode::SetPhysics(IPhysicalEntity* pPhysArea)
-{
-    m_pPhysArea = pPhysArea;
-}
-
-
-void CWaterVolumeRenderNode::CheckPhysicalized()
-{
-    if (!GetPhysics())
-    {
-        Physicalize();
-    }
-}
-
-
-void CWaterVolumeRenderNode::Physicalize([[maybe_unused]] bool bInstant)
-{
-    if (IsAttachedToEntity())
-    {
-        return;
-    }
-
-    Dephysicalize();
-
-    // setup physical area
-}
-
-
-void CWaterVolumeRenderNode::Dephysicalize([[maybe_unused]] bool bKeepIfReferenced)
-{
-    if (m_pPhysArea)
-    {
-        m_pPhysArea = 0;
-        m_attachedToEntity = false;
-    }
-}
-
-
-float CWaterVolumeRenderNode::GetCameraDistToWaterVolumeSurface(const SRenderingPassInfo& passInfo) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 camPos(cam.GetPosition());
-    return m_fogPlane.DistFromPlane(camPos);
-}
-
-
-float CWaterVolumeRenderNode::GetCameraDistSqToWaterVolumeAABB(const SRenderingPassInfo& passInfo) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 camPos(cam.GetPosition());
-    return m_WSBBox.GetDistanceSqr(camPos);
-}
-
-
-bool CWaterVolumeRenderNode::IsCameraInsideWaterVolumeSurface2D(const SRenderingPassInfo& passInfo) const
-{
-    const CCamera& cam(passInfo.GetCamera());
-    Vec3 camPos(cam.GetPosition());
-
-    pe_status_area sa;
-    sa.bUniformOnly = true;
-    MARK_UNUSED sa.ctr;
-    if (m_pPhysArea && m_pPhysArea->GetStatus(&sa) && sa.pSurface)
-    {
-        pe_status_contains_point scp;
-        scp.pt = camPos;
-        return m_pPhysArea->GetStatus(&scp) != 0;
-    }
-
-    WaterVolumeRenderNodeUtils::VertexAccess<SVF_P3F_C4B_T2F> ca(&m_waterSurfaceVertices[0], m_waterSurfaceVertices.size());
-    for (size_t i(0); i < m_waterSurfaceIndices.size(); i += 3)
-    {
-        const Vec3 v0 = m_parentEntityWorldTM.TransformPoint(ca[ m_waterSurfaceIndices[i] ]);
-        const Vec3 v1 = m_parentEntityWorldTM.TransformPoint(ca[ m_waterSurfaceIndices[i + 1] ]);
-        const Vec3 v2 = m_parentEntityWorldTM.TransformPoint(ca[ m_waterSurfaceIndices[i + 2] ]);
-
-        if (WaterVolumeRenderNodeUtils::InsideTriangle(v0.x, v0.y, v1.x, v1.y, v2.x, v2.y, camPos.x, camPos.y))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-void CWaterVolumeRenderNode::UpdateBoundingBox()
-{
-    m_WSBBox.Reset();
-    for (size_t i(0); i < m_waterSurfaceVertices.size(); ++i)
-    {
-        m_WSBBox.Add(m_parentEntityWorldTM.TransformPoint(m_waterSurfaceVertices[i].xyz));
-    }
-
-    if (IVisArea* pArea = Get3DEngine()->GetVisAreaFromPos(m_WSBBox.GetCenter()))
-    {
-        if (m_WSBBox.min.z > pArea->GetAABBox()->min.z)
-        {
-            m_WSBBox.min.z = pArea->GetAABBox()->min.z;
-        }
-        return;
-    }
-
-    m_WSBBox.min.z -= m_volumeDepth;
-    m_center = m_WSBBox.GetCenter();
-}
-
-
-const SWaterVolumeSerialize* CWaterVolumeRenderNode::GetSerializationParams()
-{
-    if (!m_pSerParams)
-    {
-        return 0;
-    }
-
-    // before returning, copy non-volatile serialization params
-    m_pSerParams->m_volumeType = m_volumeType;
-    m_pSerParams->m_volumeID = m_volumeID;
-
-    m_pSerParams->m_pMaterial = m_pMaterial;
-
-    m_pSerParams->m_fogDensity = m_fogDensity;
-    m_pSerParams->m_fogColor = m_fogColor;
-    m_pSerParams->m_fogColorAffectedBySun = m_fogColorAffectedBySun;
-    m_pSerParams->m_fogPlane = m_fogPlane;
-    m_pSerParams->m_fogShadowing = m_fogShadowing;
-
-    m_pSerParams->m_volumeDepth = m_volumeDepth;
-    m_pSerParams->m_streamSpeed = m_streamSpeed;
-    m_pSerParams->m_capFogAtVolumeDepth = m_capFogAtVolumeDepth;
-
-    m_pSerParams->m_caustics = m_caustics;
-    m_pSerParams->m_causticIntensity = m_causticIntensity;
-    m_pSerParams->m_causticTiling = m_causticTiling;
-    m_pSerParams->m_causticHeight = m_causticHeight;
-
-    return m_pSerParams;
-}
-
-
-void CWaterVolumeRenderNode::CopyVolatilePhysicsAreaContourSerParams(const Vec3* pVertices, unsigned int numVertices)
-{
-    if (!m_pSerParams)
-    {
-        m_pSerParams = new SWaterVolumeSerialize;
-    }
-
-    m_pSerParams->m_physicsAreaContour.resize(numVertices);
-    for (unsigned int i(0); i < numVertices; ++i)
-    {
-        m_pSerParams->m_physicsAreaContour[i] = pVertices[i];
-    }
-}
-
-
-void CWaterVolumeRenderNode::CopyVolatileRiverSerParams(const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale)
-{
-    if (!m_pSerParams)
-    {
-        m_pSerParams = new SWaterVolumeSerialize;
-    }
-
-    m_pSerParams->m_uTexCoordBegin = uTexCoordBegin;
-    m_pSerParams->m_uTexCoordEnd = uTexCoordEnd;
-
-    m_pSerParams->m_surfUScale = surfUVScale.x;
-    m_pSerParams->m_surfVScale = surfUVScale.y;
-
-    m_pSerParams->m_vertices.resize(numVertices);
-    for (uint32 i(0); i < numVertices; ++i)
-    {
-        m_pSerParams->m_vertices[i] = pVertices[i];
-    }
-}
-
-
-void CWaterVolumeRenderNode::CopyVolatileAreaSerParams(const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale)
-{
-    if (!m_pSerParams)
-    {
-        m_pSerParams = new SWaterVolumeSerialize;
-    }
-
-    m_pSerParams->m_uTexCoordBegin = 1.0f;
-    m_pSerParams->m_uTexCoordEnd = 1.0f;
-
-    m_pSerParams->m_surfUScale = surfUVScale.x;
-    m_pSerParams->m_surfVScale = surfUVScale.y;
-
-    m_pSerParams->m_vertices.resize(numVertices);
-    for (uint32 i(0); i < numVertices; ++i)
-    {
-        m_pSerParams->m_vertices[i] = pVertices[i];
-    }
-}
-
-
-int OnWaterUpdate(const EventPhysAreaChange* pEvent)
-{
-    if (pEvent->iForeignData == PHYS_FOREIGN_ID_WATERVOLUME)
-    {
-        CWaterVolumeRenderNode* pWVRN = static_cast<CWaterVolumeRenderNode*>(pEvent->pForeignData);
-        pe_status_area sa;
-        sa.bUniformOnly = true;
-        MARK_UNUSED sa.ctr;
-        // Calling GetPhysArea() instead of GetPhysics() to avoid a crash of using bad memory. Refer to [LY-103758] for details on the crash
-        if (pWVRN->GetPhysArea() != pEvent->pEntity || !pEvent->pEntity->GetStatus(&sa))
-        {
-            return 1;
-        }
-        if (pEvent->pContainer)
-        {
-            pWVRN->SetAreaAttachedToEntity();
-            pWVRN->SetMatrix(Matrix34(Vec3(1), pEvent->qContainer, pEvent->posContainer));
-        }
-        pWVRN->SyncToPhysMesh(QuatT(pEvent->q, pEvent->pos), sa.pSurface, pEvent->depth);
-    }
-    return 1;
-}
-
-
-void CWaterVolumeRenderNode::SyncToPhysMesh(const QuatT& qtSurface, IGeometry* pSurface, float depth)
-{
-    mesh_data* pmd;
-    if (!pSurface || pSurface->GetType() != GEOM_TRIMESH)
-    {
-        return;
-    }
-    pmd = (mesh_data*)pSurface->GetData();
-    if (!pmd)
-    {
-        return;
-    }
-    bool bResized = m_waterSurfaceVertices.size() != pmd->nVertices;
-    if (bResized)
-    {
-        m_waterSurfaceVertices.resize(pmd->nVertices);
-    }
-    Vec2 uvScale = m_pSerParams ? Vec2(m_pSerParams->m_surfUScale, m_pSerParams->m_surfVScale) : Vec2(1.0f, 1.0f);
-    for (int i = 0; i < pmd->nVertices; i++)
-    {
-        m_waterSurfaceVertices[i].xyz = qtSurface * pmd->pVertices[i];
-        m_waterSurfaceVertices[i].st = Vec2(pmd->pVertices[i].x * uvScale.x, pmd->pVertices[i].y * uvScale.y);
-    }
-    if (m_waterSurfaceIndices.size() != pmd->nTris * 3)
-    {
-        m_waterSurfaceIndices.resize(pmd->nTris * 3), bResized = true;
-    }
-    for (int i = 0; i < pmd->nTris * 3; i++)
-    {
-        m_waterSurfaceIndices[i] = pmd->pIndices[i];
-    }
-
-    if (bResized)
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            m_wvParams[i].m_pVertices = &m_waterSurfaceVertices[0];
-            m_wvParams[i].m_numVertices = m_waterSurfaceVertices.size();
-            m_wvParams[i].m_pIndices = &m_waterSurfaceIndices[0];
-            m_wvParams[i].m_numIndices = m_waterSurfaceIndices.size();
-        }
-    }
-
-    m_fogPlane.SetPlane(qtSurface.q * Vec3(0, 0, 1), qtSurface.t);
-    m_volumeDepth = depth;
-    UpdateBoundingBox();
-}
-
-void CWaterVolumeRenderNode::OffsetPosition(const Vec3& delta)
-{
-    if (m_pRNTmpData)
-    {
-        m_pRNTmpData->OffsetPosition(delta);
-    }
-    m_vOffset += delta;
-    m_center += delta;
-    m_WSBBox.Move(delta);
-    for (int i = 0; i < (int)m_waterSurfaceVertices.size(); ++i)
-    {
-        m_waterSurfaceVertices[i].xyz += delta;
-    }
-
-    if (m_pPhysAreaInput)
-    {
-        for (std::vector<Vec3>::iterator it = m_pPhysAreaInput->m_contour.begin(); it != m_pPhysAreaInput->m_contour.end(); ++it)
-        {
-            *it += delta;
-        }
-        for (std::vector<Vec3>::iterator it = m_pPhysAreaInput->m_flowContour.begin(); it != m_pPhysAreaInput->m_flowContour.end(); ++it)
-        {
-            *it += delta;
-        }
-    }
-
-    if (m_pPhysArea)
-    {
-        pe_params_pos par_pos;
-        m_pPhysArea->GetParams(&par_pos);
-        par_pos.bRecalcBounds |= 2;
-        par_pos.pos = m_vOffset;
-        m_pPhysArea->SetParams(&par_pos);
-    }
-}
-
-
diff --git a/Code/CryEngine/Cry3DEngine/WaterVolumeRenderNode.h b/Code/CryEngine/Cry3DEngine/WaterVolumeRenderNode.h
deleted file mode 100644
index 1805a8647d..0000000000
--- a/Code/CryEngine/Cry3DEngine/WaterVolumeRenderNode.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_WATERVOLUMERENDERNODE_H
-#define CRYINCLUDE_CRY3DENGINE_WATERVOLUMERENDERNODE_H
-#pragma once
-
-
-#include "VertexFormats.h"
-
-
-namespace AZ 
-{
-    class Vector2;
-    class Plane;
-}
-
-struct SWaterVolumeSerialize
-{
-    // volume type and id
-    int32 m_volumeType;
-    uint64 m_volumeID;
-
-    // material
-    _smart_ptr<IMaterial> m_pMaterial;
-
-    // fog properties
-    f32 m_fogDensity;
-    Vec3 m_fogColor;
-    bool m_fogColorAffectedBySun;
-    Plane m_fogPlane;
-    f32 m_fogShadowing;
-
-    f32 m_volumeDepth;
-    f32 m_streamSpeed;
-    bool m_capFogAtVolumeDepth;
-
-    // caustic properties
-    bool m_caustics;
-    f32 m_causticIntensity;
-    f32 m_causticTiling;
-    f32 m_causticHeight;
-
-    // render geometry
-    f32 m_uTexCoordBegin;
-    f32 m_uTexCoordEnd;
-    f32 m_surfUScale;
-    f32 m_surfVScale;
-    typedef std::vector< Vec3 > VertexArraySerialize;
-    VertexArraySerialize m_vertices;
-
-    // physics properties
-    typedef std::vector< Vec3 > PhysicsAreaContourSerialize;
-    PhysicsAreaContourSerialize m_physicsAreaContour;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_vertices);
-        pSizer->AddObject(m_physicsAreaContour);
-    }
-};
-
-struct SWaterVolumePhysAreaInput
-{
-    typedef std::vector< Vec3 > PhysicsVertices;
-    typedef std::vector< int > PhysicsIndices;
-
-    PhysicsVertices m_contour;
-    PhysicsVertices m_flowContour;
-    PhysicsIndices m_indices;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_contour);
-        pSizer->AddObject(m_flowContour);
-        pSizer->AddObject(m_indices);
-    }
-};
-
-class CWaterVolumeRenderNode
-    : public IWaterVolumeRenderNode
-    , public Cry3DEngineBase
-{
-public:
-    // implements IWaterVolumeRenderNode
-    virtual void SetAreaAttachedToEntity();
-
-    virtual void SetFogDensity(float fogDensity);
-    virtual float GetFogDensity() const;
-    virtual void SetFogColor(const Vec3& fogColor);
-    virtual void SetFogColorAffectedBySun(bool enable);
-    virtual void SetFogShadowing(float fogShadowing);
-
-    virtual void SetCapFogAtVolumeDepth(bool capFog);
-    virtual void SetVolumeDepth(float volumeDepth);
-    virtual void SetStreamSpeed(float streamSpeed);
-
-    virtual void SetCaustics(bool caustics);
-    virtual void SetCausticIntensity(float causticIntensity);
-    virtual void SetCausticTiling(float causticTiling);
-    virtual void SetCausticHeight(float causticHeight);
-    virtual void SetAuxPhysParams(pe_params_area* pa)
-    {
-        m_auxPhysParams = *pa;
-        if (m_pPhysArea)
-        {
-            m_pPhysArea->SetParams(pa);
-        }
-    }
-
-    virtual void CreateOcean(uint64 volumeID, /* TBD */ bool keepSerializationParams = false);
-    virtual void CreateArea(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale, const Plane& fogPlane, bool keepSerializationParams = false, int nSID = GetDefSID());
-    virtual void CreateRiver(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale, const Plane& fogPlane, bool keepSerializationParams = false, int nSID = GetDefSID());
-    virtual void CreateRiver(uint64 volumeID, const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, float uTexCoordBegin, float uTexCoordEnd, const AZ::Vector2& surfUVScale, const AZ::Plane& fogPlane, bool keepSerializationParams, int nSID);
-
-    virtual void SetAreaPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams = false);
-    virtual void SetRiverPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams = false);
-    virtual void SetRiverPhysicsArea(const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, bool keepSerializationParams = false);
-
-    void SyncToPhysMesh(const QuatT& qtSurface, IGeometry* pSurface, float depth);
-
-    // implements IRenderNode
-    virtual EERType GetRenderNodeType();
-    virtual const char* GetEntityClassName() const;
-    virtual const char* GetName() const;
-    virtual void SetMatrix(const Matrix34& mat);
-    virtual Vec3 GetPos(bool bWorldOnly = true) const;
-    virtual void Render(const SRendParams& rParam, const SRenderingPassInfo& passInfo);
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMat);
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos);
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() { return m_pMaterial; }
-    virtual float GetMaxViewDist();
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual void Precache();
-
-    virtual IPhysicalEntity* GetPhysics() const;
-    virtual void SetPhysics(IPhysicalEntity*);
-    inline IPhysicalEntity* GetPhysArea() const { return m_pPhysArea; }
-
-    virtual void CheckPhysicalized();
-    virtual void Physicalize(bool bInstant = false);
-    virtual void Dephysicalize(bool bKeepIfReferenced = false);
-
-    virtual const AABB GetBBox() const
-    {
-        AABB WSBBox = m_WSBBox;
-        // Expand bounding box upwards while using caustics to avoid clipping the caustics when the volume goes out of view.
-        if (m_caustics)
-        {
-            WSBBox.max.z += m_causticHeight;
-        }
-        return WSBBox;
-    }
-
-    virtual void SetBBox(const AABB& WSBBox) { m_WSBBox = WSBBox; }
-    virtual void FillBBox(AABB& aabb);
-    virtual void OffsetPosition(const Vec3& delta);
-
-    virtual void SetLayerId(uint16 nLayerId) { m_nLayerId = nLayerId; }
-    virtual uint16 GetLayerId() { return m_nLayerId; }
-
-    void Render_JobEntry(const SRendParams& rParam, const SRenderingPassInfo& passInfo, SRendItemSorter rendItemSorter);
-
-    void Transform(const Vec3& localOrigin, const Matrix34& l2w);
-    virtual IRenderNode* Clone() const;
-
-public:
-    CWaterVolumeRenderNode();
-    const SWaterVolumeSerialize* GetSerializationParams();
-    float* GetAuxSerializationDataPtr(int& count)
-    {
-        // TODO: 'pe_params_area' members between 'volume' and 'growthReserve' are not float only - a member (bConvexBorder) has int type, this should be investigated.
-        AZ_PUSH_DISABLE_WARNING(,"-Winvalid-offsetof")
-        count = (offsetof(pe_params_area, growthReserve) - offsetof(pe_params_area, volume)) / sizeof(float) + 1;
-        AZ_POP_DISABLE_WARNING
-        return &m_auxPhysParams.volume;
-    }
-
-private:
-    typedef std::vector< SVF_P3F_C4B_T2F > WaterSurfaceVertices;
-    typedef std::vector< uint16 > WaterSurfaceIndices;
-
-private:
-    ~CWaterVolumeRenderNode();
-
-    float GetCameraDistToWaterVolumeSurface(const SRenderingPassInfo& passInfo) const;
-    float GetCameraDistSqToWaterVolumeAABB(const SRenderingPassInfo& passInfo) const;
-    bool IsCameraInsideWaterVolumeSurface2D(const SRenderingPassInfo& passInfo) const;
-
-    void UpdateBoundingBox();
-
-    void CopyVolatilePhysicsAreaContourSerParams(const Vec3* pVertices, unsigned int numVertices);
-    void CopyVolatileRiverSerParams(const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale);
-
-    void CopyVolatileAreaSerParams(const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale);
-
-    bool IsAttachedToEntity() const { return m_attachedToEntity; }
-
-
-private:
-    IWaterVolumeRenderNode::EWaterVolumeType m_volumeType;
-    uint64 m_volumeID;
-
-    float m_volumeDepth;
-    float m_streamSpeed;
-
-    CREWaterVolume::SParams m_wvParams[RT_COMMAND_BUF_COUNT];
-
-    _smart_ptr< IMaterial > m_pMaterial;
-    _smart_ptr< IMaterial > m_pWaterBodyIntoMat;
-    _smart_ptr< IMaterial > m_pWaterBodyOutofMat;
-
-    CREWaterVolume* m_pVolumeRE[RT_COMMAND_BUF_COUNT];
-    CREWaterVolume* m_pSurfaceRE[RT_COMMAND_BUF_COUNT];
-    SWaterVolumeSerialize* m_pSerParams;
-
-    SWaterVolumePhysAreaInput* m_pPhysAreaInput;
-    IPhysicalEntity* m_pPhysArea;
-
-    WaterSurfaceVertices m_waterSurfaceVertices;
-    WaterSurfaceIndices m_waterSurfaceIndices;
-
-    Matrix34 m_parentEntityWorldTM;
-    uint16 m_nLayerId;
-
-    float m_fogDensity;
-    Vec3 m_fogColor;
-    bool m_fogColorAffectedBySun;
-    float m_fogShadowing;
-
-    Plane m_fogPlane;
-    Plane m_fogPlaneBase;
-
-    Vec3 m_vOffset;
-    Vec3 m_center;
-    AABB m_WSBBox;
-
-    bool m_capFogAtVolumeDepth;
-    bool m_attachedToEntity;
-    bool m_caustics;
-
-    float m_causticIntensity;
-    float m_causticTiling;
-    float m_causticShadow;
-    float m_causticHeight;
-    pe_params_area m_auxPhysParams;
-};
-
-
-#endif // CRYINCLUDE_CRY3DENGINE_WATERVOLUMERENDERNODE_H
diff --git a/Code/CryEngine/Cry3DEngine/cbuffer.cpp b/Code/CryEngine/Cry3DEngine/cbuffer.cpp
deleted file mode 100644
index 57120e0502..0000000000
--- a/Code/CryEngine/Cry3DEngine/cbuffer.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Occlusion (coverage) buffer
-
-#include "Cry3DEngine_precompiled.h"
-#include "cbuffer.h"
-#include "StatObj.h"
-
-class CCoverageBuffer
-    : public Cry3DEngineBase
-{
-public:
-    // can be used by other classes
-    static void ClipPolygon(PodArray<Vec3>& PolygonOut, const PodArray<Vec3>& pPolygon, const Plane& ClipPlane);
-    static void ClipPolygon(PodArray<Vec3>* pPolygon, const Plane& ClipPlane);
-    static void MatMul4(float* product, const float* a, const float* b);
-    static void TransformPoint(float out[4], const float m[16], const float in[4]);
-
-protected:
-
-    static int ClipEdge(const Vec3& v1, const Vec3& v2, const Plane& ClipPlane, Vec3& vRes1, Vec3& vRes2);
-
-#if defined(WIN32) && defined(_CPU_X86)
-    inline int fastfround(float f) // note: only positive numbers works correct
-    {
-        int i;
-        __asm fld[f]
-            __asm fistp[i]
-            return i;
-    }
-#else
-    inline int fastfround(float f) { int i; i = (int)(f + 0.5f); return i; } // note: only positive numbers works correct
-#endif
-};
-
-void CCoverageBuffer::TransformPoint(float out[4], const float m[16], const float in[4])
-{
-#define M(row, col)  m[col * 4 + row]
-    out[0] = M(0, 0) * in[0] + M(0, 1) * in[1] + M(0, 2) * in[2] + M(0, 3) * in[3];
-    out[1] = M(1, 0) * in[0] + M(1, 1) * in[1] + M(1, 2) * in[2] + M(1, 3) * in[3];
-    out[2] = M(2, 0) * in[0] + M(2, 1) * in[1] + M(2, 2) * in[2] + M(2, 3) * in[3];
-    out[3] = M(3, 0) * in[0] + M(3, 1) * in[1] + M(3, 2) * in[2] + M(3, 3) * in[3];
-#undef M
-}
-
-void CCoverageBuffer::MatMul4(float* product, const float* a, const float* b)
-{
-#define A(row, col)  a[(col << 2) + row]
-#define B(row, col)  b[(col << 2) + row]
-#define P(row, col)  product[(col << 2) + row]
-    int i;
-    for (i = 0; i < 4; i++)
-    {
-        float ai0 = A(i, 0),  ai1 = A(i, 1),  ai2 = A(i, 2),  ai3 = A(i, 3);
-        P(i, 0) = ai0 * B(0, 0) + ai1 * B(1, 0) + ai2 * B(2, 0) + ai3 * B(3, 0);
-        P(i, 1) = ai0 * B(0, 1) + ai1 * B(1, 1) + ai2 * B(2, 1) + ai3 * B(3, 1);
-        P(i, 2) = ai0 * B(0, 2) + ai1 * B(1, 2) + ai2 * B(2, 2) + ai3 * B(3, 2);
-        P(i, 3) = ai0 * B(0, 3) + ai1 * B(1, 3) + ai2 * B(2, 3) + ai3 * B(3, 3);
-    }
-#undef A
-#undef B
-#undef P
-}
-
-// return number of vertices to add
-int CCoverageBuffer::ClipEdge(const Vec3& v1, const Vec3& v2, const Plane& ClipPlane, Vec3& vRes1, Vec3& vRes2)
-{
-    float d1 = -ClipPlane.DistFromPlane(v1);
-    float d2 = -ClipPlane.DistFromPlane(v2);
-    if (d1 < 0 && d2 < 0)
-    {
-        return 0; // all clipped = do not add any vertices
-    }
-    if (d1 >= 0 && d2 >= 0)
-    {
-        vRes1 = v2;
-        return 1; // both not clipped - add second vertex
-    }
-
-    // calculate new vertex
-    Vec3 vIntersectionPoint = v1 + (v2 - v1) * (Ffabs(d1) / (Ffabs(d2) + Ffabs(d1)));
-
-#ifdef _DEBUG
-    float fNewDist = -ClipPlane.DistFromPlane(vIntersectionPoint);
-    assert(Ffabs(fNewDist) < 0.01f);
-#endif
-
-    if (d1 >= 0 && d2 < 0)
-    { // from vis to no vis
-        vRes1 = vIntersectionPoint;
-        return 1;
-    }
-    else if (d1 < 0 && d2 >= 0)
-    { // from not vis to vis
-        vRes1 = vIntersectionPoint;
-        vRes2 = v2;
-        return 2;
-    }
-
-    assert(0);
-    return 0;
-}
-
-void CCoverageBuffer::ClipPolygon(PodArray<Vec3>& PolygonOut, const PodArray<Vec3>& pPolygon, const Plane& ClipPlane)
-{
-    PolygonOut.Clear();
-    // clip edges, make list of new vertices
-    for (int i = 0; i < pPolygon.Count(); i++)
-    {
-        Vec3 vNewVert1(0, 0, 0), vNewVert2(0, 0, 0);
-        if (int nNewVertNum = ClipEdge(pPolygon.GetAt(i), pPolygon.GetAt((i + 1) % pPolygon.Count()), ClipPlane, vNewVert1, vNewVert2))
-        {
-            PolygonOut.Add(vNewVert1);
-            if (nNewVertNum > 1)
-            {
-                PolygonOut.Add(vNewVert2);
-            }
-        }
-    }
-
-    // check result
-#if !defined(NDEBUG)
-    for (int i = 0; i < PolygonOut.Count(); i++)
-    {
-        float d1 = -ClipPlane.DistFromPlane(PolygonOut.GetAt(i));           
-        assert(d1 >= -0.01f);
-    }
-#endif
-
-    assert(PolygonOut.Count() == 0 || PolygonOut.Count() >= 3);
-}
-
-void CCoverageBuffer::ClipPolygon(PodArray<Vec3>* pPolygon, const Plane& ClipPlane)
-{
-    static PodArray<Vec3> PolygonOut; // Keep this list static to not perform reallocation every time.
-    PolygonOut.Clear();
-    ClipPolygon(*pPolygon, PolygonOut, ClipPlane);
-    pPolygon->Clear();
-    pPolygon->AddList(PolygonOut);
-}
-
-bool IsABBBVisibleInFrontOfPlane_FAST(const AABB& objBox, const SPlaneObject& clipPlane)
-{
-    const f32* p = &objBox.min.x;
-    if ((clipPlane.plane | Vec3(p[clipPlane.vIdx2.x], p[clipPlane.vIdx2.y], p[clipPlane.vIdx2.z])) > 0)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-CPolygonClipContext::CPolygonClipContext()
-{
-}
-
-void CPolygonClipContext::Reset()
-{
-    stl::free_container(m_lstPolygonA);
-    stl::free_container(m_lstPolygonB);
-}
-
-const PodArray<Vec3>& CPolygonClipContext::Clip(const PodArray<Vec3>& poly, const Plane* planes, size_t numPlanes)
-{
-    m_lstPolygonA.Clear();
-    m_lstPolygonB.Clear();
-
-    m_lstPolygonA.AddList(poly);
-
-    PodArray<Vec3>* src = &m_lstPolygonA, * dst = &m_lstPolygonB;
-
-    for (size_t i = 0; i < numPlanes && src->Count() >= 3; std::swap(src, dst), i++)
-    {
-        CCoverageBuffer::ClipPolygon(*dst, *src, planes[i]);
-    }
-
-    return *src;
-}
-
-const PodArray<Vec3>& CPolygonClipContext::Clip(const Vec3& a, const Vec3& b, const Vec3& c, const Plane* planes, size_t numPlanes)
-{
-    m_lstPolygonA.Clear();
-    m_lstPolygonB.Clear();
-
-    m_lstPolygonA.Add(a);
-    m_lstPolygonA.Add(b);
-    m_lstPolygonA.Add(c);
-
-    PodArray<Vec3>* src = &m_lstPolygonA, * dst = &m_lstPolygonB;
-
-    for (size_t i = 0; i < numPlanes && src->Count() >= 3; std::swap(src, dst), i++)
-    {
-        CCoverageBuffer::ClipPolygon(*dst, *src, planes[i]);
-    }
-
-    return *src;
-}
-
-void CPolygonClipContext::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(m_lstPolygonA);
-    pSizer->AddObject(m_lstPolygonB);
-}
diff --git a/Code/CryEngine/Cry3DEngine/cbuffer.h b/Code/CryEngine/Cry3DEngine/cbuffer.h
deleted file mode 100644
index 8ac5021acc..0000000000
--- a/Code/CryEngine/Cry3DEngine/cbuffer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRY3DENGINE_CBUFFER_H
-#define CRYINCLUDE_CRY3DENGINE_CBUFFER_H
-#pragma once
-
-#include <AzCore/Casting/numeric_cast.h>
-
-#define Point2d Vec3
-
-struct SPlaneObject
-{
-    Plane plane;
-    Vec3_tpl<uint8> vIdx1, vIdx2;
-
-    void Update()
-    {
-        //avoid breaking strict aliasing rules
-        union f32_u
-        {
-            float floatVal;
-            uint32 uintVal;
-        };
-        f32_u ux;
-        ux.floatVal = plane.n.x;
-        f32_u uy;
-        uy.floatVal = plane.n.y;
-        f32_u uz;
-        uz.floatVal = plane.n.z;
-        uint32 bitX =   ux.uintVal >> 31;
-        uint32 bitY =   uy.uintVal >> 31;
-        uint32 bitZ =   uz.uintVal >> 31;
-        vIdx1.x = aznumeric_caster(bitX * 3 + 0);
-        vIdx2.x = aznumeric_caster((1 - bitX) * 3 + 0);
-        vIdx1.y = aznumeric_caster(bitY * 3 + 1);
-        vIdx2.y = aznumeric_caster((1 - bitY) * 3 + 1);
-        vIdx1.z = aznumeric_caster(bitZ * 3 + 2);
-        vIdx2.z = aznumeric_caster((1 - bitZ) * 3 + 2);
-    }
-};
-
-class CPolygonClipContext
-{
-public:
-    CPolygonClipContext();
-
-    void Reset();
-
-    const PodArray<Vec3>& Clip(const PodArray<Vec3>& poly, const Plane* planes, size_t numPlanes);
-    const PodArray<Vec3>& Clip(const Vec3& a, const Vec3& b, const Vec3& c, const Plane* planes, size_t numPlanes);
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-private:
-    PodArray<Vec3> m_lstPolygonA;
-    PodArray<Vec3> m_lstPolygonB;
-};
-
-#endif // CRYINCLUDE_CRY3DENGINE_CBUFFER_H
diff --git a/Code/CryEngine/Cry3DEngine/cry3dengine_files.cmake b/Code/CryEngine/Cry3DEngine/cry3dengine_files.cmake
deleted file mode 100644
index 095d1f9d51..0000000000
--- a/Code/CryEngine/Cry3DEngine/cry3dengine_files.cmake
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Cry3DEngine_precompiled.cpp
-    Cry3DEngineTraits.h
-    3dEngineLoad.cpp
-    VolumeObjectDataCreate.cpp
-    VolumeObjectRenderNode.cpp
-    VolumeObjectDataCreate.h
-    VolumeObjectRenderNode.h
-    Ocean.cpp
-    WaterVolumeRenderNode.cpp
-    Ocean.h
-    WaterVolumeRenderNode.h
-    Environment/OceanEnvironmentBus.h
-    StatObjPhys.cpp
-    StatObjRend.cpp
-    StatObjStream.cpp
-    IndexedMesh.cpp
-    StatObjConstr.cpp
-    StatObjLoad.cpp
-    StatObj_Jobs.cpp
-    IndexedMesh.h
-    StatObj.h
-    ObjMan.cpp
-    ObjManDraw.cpp
-    ObjManDrawEntity.cpp
-    ObjManShadows.cpp
-    ObjManStreaming.cpp
-    ObjMan.h
-    ObjectsTree.cpp
-    ObjectsTree_MT.cpp
-    ObjectsTree_Jobs.cpp
-    ObjectsTree_Serialize.cpp
-    ObjectsTree.h
-    ObjectsTree_Serialize_info.h
-    cbuffer.h
-    cbuffer.cpp
-    CCullRenderer.cpp
-    CCullRenderer.h
-    CCullThread.cpp
-    CCullThread.h
-    CullBuffer.cpp
-    CullBuffer.h
-    CZBufferCuller.cpp
-    CZBufferCuller.h
-    VMath.hpp
-    VMath_C.hpp
-    VMath_NEON.hpp
-    VMath_Prototypes.hpp
-    VMath_SSE.hpp
-    LightEntity.cpp
-    LightEntity.h
-    Material_Jobs.cpp
-    MaterialHelpers.cpp
-    MaterialHelpers.h
-    Material.cpp
-    Material.h
-    MatMan.cpp
-    MatMan.h
-    SurfaceTypeManager.cpp
-    SurfaceTypeManager.h
-    PostProcessEffects.cpp
-    RenderMeshMerger.cpp
-    RenderMeshUtils.cpp
-    RenderMeshMerger.h
-    RenderMeshUtils.h
-    SkyLightManager.cpp
-    SkyLightNishita.cpp
-    TimeOfDay.cpp
-    SkyLightManager.h
-    SkyLightNishita.h
-    SkyLightNishita_info.h
-    TimeOfDay.h
-    EnvironmentPreset.h
-    EnvironmentPreset.cpp
-    ShadowCache.cpp
-    ShadowCache.h
-    PostEffectGroup.cpp
-    PostEffectGroup.h
-    VisAreaMan.cpp
-    VisAreaCompile.cpp
-    VisAreas.cpp
-    VisAreaManCompile.cpp
-    VisArea_Jobs.cpp
-    BasicArea.cpp
-    BasicArea.h
-    VisAreaCompile_info.h
-    VisAreas.h
-    GeomCachePredictors.h
-    DeferredCollisionEvent.cpp
-    3DEngineMemory.cpp
-    3DEngineMemory.h
-    Cry3DEngineBase.cpp
-    Cry3DEngineBase.h
-    DeferredCollisionEvent.h
-    resource.h
-    Cry3DEngine_precompiled.h
-    3dEngine.cpp
-    3dEngine.h
-    3dEngineOctreeCompile.cpp
-    3DEngine_Jobs.cpp
-    3DEngineLight.cpp
-    3DEngineRender.cpp
-    ClipVolume.cpp
-    ClipVolume.h
-    ClipVolumeManager.cpp
-    ClipVolumeManager.h
-    cvars.cpp
-    cvars.h
-    CloudRenderNode.cpp
-    CloudsManager.cpp
-    DistanceCloudRenderNode.cpp
-    CloudRenderNode.h
-    CloudsManager.h
-    Cry_LegacyPhysUtils.h
-    DistanceCloudRenderNode.h
-    Decal.cpp
-    DecalManager.cpp
-    DecalRenderNode.cpp
-    DecalManager.h
-    DecalRenderNode.h
-    FogVolumeRenderNode.cpp
-    FogVolumeRenderNode_Jobs.cpp
-    FogVolumeRenderNode.h
-    PrismRenderNode.cpp
-    PrismRenderNode.h
-    OpticsManager.cpp
-    OpticsManager.h
-    GeomCache.cpp
-    GeomCache.h
-    GeomCacheRenderNode.cpp
-    GeomCacheRenderNode.h
-    GeomCacheManager.cpp
-    GeomCacheManager.h
-    GeomCacheDecoder.cpp
-    GeomCacheDecoder.h
-    GeomCacheMeshManager.h
-    GeomCacheMeshManager.cpp
-    Cry_LegacyPhysUtils.h
-    Cry_LegacyPhysUtils.cpp
-)
diff --git a/Code/CryEngine/Cry3DEngine/cry3dengine_shared_files.cmake b/Code/CryEngine/Cry3DEngine/cry3dengine_shared_files.cmake
deleted file mode 100644
index 777660a52a..0000000000
--- a/Code/CryEngine/Cry3DEngine/cry3dengine_shared_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Cry3DEngine.cpp
-)
diff --git a/Code/CryEngine/Cry3DEngine/cry3dengine_test_files.cmake b/Code/CryEngine/Cry3DEngine/cry3dengine_test_files.cmake
deleted file mode 100644
index 76c7f272da..0000000000
--- a/Code/CryEngine/Cry3DEngine/cry3dengine_test_files.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    RenderMeshUtils/Tests/Test_RenderMeshUtils.cpp
-    Tests/Test_Cry3DEngine.cpp
-    Tests/MockValidationTest.cpp
-    Tests/MaterialTests.cpp
-    Tests/OctreeTest.cpp
-    Cry3DEngine.cpp
-)
diff --git a/Code/CryEngine/Cry3DEngine/cvars.cpp b/Code/CryEngine/Cry3DEngine/cvars.cpp
deleted file mode 100644
index e63c539a85..0000000000
--- a/Code/CryEngine/Cry3DEngine/cvars.cpp
+++ /dev/null
@@ -1,955 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : console variables used in 3dengine
-
-#include "Cry3DEngine_precompiled.h"
-
-#include "3dEngine.h"
-#include "IRenderer.h"
-#include "IStatObj.h"  // MAX_STATOBJ_LODS_NUM
-#include "ITimeOfDay.h"
-
-#include "Environment/OceanEnvironmentBus.h"
-
-//////////////////////////////////////////////////////////////////////////
-void OnTimeOfDayVarChange([[maybe_unused]] ICVar* pArgs)
-{
-    gEnv->p3DEngine->GetTimeOfDay()->SetTime(Cry3DEngineBase::GetCVars()->e_TimeOfDay);
-}
-
-void OnTimeOfDaySpeedVarChange([[maybe_unused]] ICVar* pArgs)
-{
-    ITimeOfDay::SAdvancedInfo advInfo;
-    gEnv->p3DEngine->GetTimeOfDay()->GetAdvancedInfo(advInfo);
-    advInfo.fAnimSpeed = Cry3DEngineBase::GetCVars()->e_TimeOfDaySpeed;
-    gEnv->p3DEngine->GetTimeOfDay()->SetAdvancedInfo(advInfo);
-}
-
-void OnCGFStreamingChange([[maybe_unused]] ICVar* pArgs)
-{
-    if (gEnv->IsEditor())
-    {
-        Cry3DEngineBase::GetCVars()->e_StreamCgf = 0;
-    }
-}
-
-void OnGsmLodsNumChange(ICVar* pArgs)
-{
-    Cry3DEngineBase::GetRenderer()->UpdateCachedShadowsLodCount(pArgs->GetIVal());
-}
-
-void OnDynamicDistanceShadowsVarChange([[maybe_unused]] ICVar* pArgs)
-{
-    Cry3DEngineBase::Get3DEngine()->SetRecomputeCachedShadows(ShadowMapFrustum::ShadowCacheData::eFullUpdate);
-}
-
-void OnVolumetricFogChanged(ICVar* pArgs)
-{
-    const ICVar* deferredShadingCVar = gEnv->pConsole->GetCVar("r_DeferredShadingTiled");
-    if (deferredShadingCVar->GetIVal() == 0 && pArgs->GetIVal() != 0)
-    {
-        gEnv->pLog->LogWarning("e_VolumetricFog is set to 0 when r_DeferredShadingTiled is 0.");
-        Cry3DEngineBase::GetCVars()->e_VolumetricFog = 0;
-    }
-}
-
-#if !defined(_RELEASE)
-void OnTerrainPerformanceSecondsChanged([[maybe_unused]] ICVar* pArgs)
-{
-#ifdef LY_TERRAIN_LEGACY_RUNTIME
-    AZ::Debug::TerrainProfiler::RefreshFrameProfilerStatus();
-#endif
-}
-#endif
-
-void OnDebugDrawChange(ICVar* pArgs)
-{
-    static bool collectingDrawCalls = false;
-
-    int e_debugDraw = pArgs->GetIVal();
-    if (e_debugDraw >= 24 && e_debugDraw <= 25)
-    {
-        gEnv->pRenderer->CollectDrawCallsInfo(true);
-        gEnv->pRenderer->CollectDrawCallsInfoPerNode(true);
-        collectingDrawCalls = true;
-    }
-    else if (collectingDrawCalls)
-    {
-        gEnv->pRenderer->CollectDrawCallsInfo(false);
-        gEnv->pRenderer->CollectDrawCallsInfoPerNode(false);
-        collectingDrawCalls = false;
-    }
-}
-
-void CVars::Init()
-{
-    DefineConstIntCVar(e_Fog, 1, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK,
-        "Activates global height/distance based fog");
-    DefineConstIntCVar(e_FogVolumes, 1, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK,
-        "Activates local height/distance based fog volumes");
-    REGISTER_CVAR_CB(e_VolumetricFog, 0, VF_NULL,
-        "Activates volumetric fog", OnVolumetricFogChanged);
-    DefineConstIntCVar(e_FogVolumesTiledInjection, 1, VF_NULL,
-        "Activates tiled FogVolume density injection");
-    REGISTER_CVAR(e_Entities, 1, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK,
-        "Activates drawing of entities");
-    DefineConstIntCVar(e_SkyBox, 1, VF_CHEAT,
-        "Activates drawing of skybox and moving cloud layers");
-    DefineConstIntCVar(e_WaterOcean, e_WaterOceanDefault, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK,
-        "Activates drawing of ocean. \n"
-        "1: use usual rendering path\n"
-        "2: use fast rendering path with merged fog");
-
-    if (!OceanToggle::IsActive())
-    {
-        DefineConstIntCVar(e_WaterOceanBottom, 1, VF_CHEAT,
-            "Activates drawing bottom of ocean");
-    }
-
-    REGISTER_CVAR(e_WaterOceanFFT, 0, VF_NULL,
-        "Activates fft based ocean");
-
-    DefineConstIntCVar(e_WaterRipplesDebug, 0, VF_CHEAT,
-        "Draw water hits that affect water ripple simulation");
-
-    DefineConstIntCVar(e_DebugDrawShowOnlyCompound, 0, VF_NULL,
-        "e_DebugDraw shows only Compound (less efficient) static meshes");
-    DefineConstIntCVar(e_DebugDrawShowOnlyLod, -1, VF_NULL,
-        "e_DebugDraw shows only objects showing lod X");
-
-#ifdef CONSOLE_CONST_CVAR_MODE
-    // in console release builds the const cvars work differently (see ISystem.h where CONSOLE_CONST_CVAR_MODE is defined), 
-    // so revert to the version of e_debugdraw that doesn't support mode 24 & 25 which require the OnDebugDrawChange callback
-    DefineConstIntCVar(e_DebugDraw, 0, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK,
-        "Draw helpers with information for each object (same number negative hides the text)\n"
-        " 1: Name of the used cgf, polycount, used LOD\n"
-        " 2: Color coded polygon count\n"
-        " 3: Show color coded LODs count, flashing color indicates no Lod\n"
-        " 4: Display object texture memory usage\n"
-        " 5: Display color coded number of render materials\n"
-        " 6: Display ambient color\n"
-        " 7: Display tri count, number of render materials, texture memory\n"
-        " 8: Free slot\n"
-        " 9: Free slot\n"
-        "10: Render geometry with simple lines and triangles\n"
-        "11: Free slot\n"
-        "12: Free slot\n"
-        "13: Display occlusion amount (used during AO computations). Warning: can take a long time to calculate, depending on level size! \n"
-        "15: Display helpers\n"
-        "16: Display debug gun\n"
-        "17: Streaming info (buffer sizes)\n"
-        "18: Free slot\n"
-        "19: Physics proxy triangle count\n"
-        "20: Display Character attachments texture memory usage\n"
-        "21: Display animated object distance to camera\n"
-        "22: Display object's current LOD vertex count\n"
-        "23: Display shadow casters in red\n"
-        "24: Disabled\n"
-        "25: Disabled\n"
-        "----------------debug draw list values. Any of them enable 2d on-screen listing type info debug. Specific values define the list sorting-----------\n"
-        " 100: tri count\n"
-        " 101: verts count\n"
-        " 102: draw calls\n"
-        " 103: texture memory\n"
-        " 104: mesh memory"
-        );
-#else
-    REGISTER_CVAR_CB(e_DebugDraw, 0, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK | CONST_CVAR_FLAGS,
-        "Draw helpers with information for each object (same number negative hides the text)\n"
-        " 1: Name of the used cgf, polycount, used LOD\n"
-        " 2: Color coded polygon count\n"
-        " 3: Show color coded LODs count, flashing color indicates no Lod\n"
-        " 4: Display object texture memory usage\n"
-        " 5: Display color coded number of render materials\n"
-        " 6: Display ambient color\n"
-        " 7: Display tri count, number of render materials, texture memory\n"
-        " 8: Free slot\n"
-        " 9: Free slot\n"
-        "10: Render geometry with simple lines and triangles\n"
-        "11: Free slot\n"
-        "12: Free slot\n"
-        "13: Display occlusion amount (used during AO computations). Warning: can take a long time to calculate, depending on level size! \n"
-        "15: Display helpers\n"
-        "16: Display debug gun\n"
-        "17: Streaming info (buffer sizes)\n"
-        "18: Free slot\n"
-        "19: Physics proxy triangle count\n"
-        "20: Display Character attachments texture memory usage\n"
-        "21: Display animated object distance to camera\n"
-        "22: Display object's current LOD vertex count\n"
-        "23: Display shadow casters in red\n"
-        "24: Display meshes with no LODs\n"
-        "25: Display meshes with no LODs, meshes with not enough LODs\n"
-        "----------------debug draw list values. Any of them enable 2d on-screen listing type info debug. Specific values define the list sorting-----------\n"
-        " 100: tri count\n"
-        " 101: verts count\n"
-        " 102: draw calls\n"
-        " 103: texture memory\n"
-        " 104: mesh memory",
-        OnDebugDrawChange);
-#endif
-
-    REGISTER_CVAR(e_DebugDrawLodMinTriangles, 200, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK | CONST_CVAR_FLAGS,
-        "Minimum number of triangles (lod 0) to show in LOD debug draw");
-
-#ifndef _RELEASE
-    DefineConstIntCVar(e_DebugDrawListSize, 24, VF_DEV_ONLY,    "num objects in the list for e_DebugDraw list infodebug");
-    REGISTER_STRING_CB_DEV_ONLY("e_DebugDrawListFilter", "",  VF_NULL,
-            "filter for e_DebugDraw list. Combine object type letters to create the filter\n"
-            "(example: e_DebugDrawListFilter BVC = shows Characters+StatObject). 'all' = no filter.\n"
-            " C: Character\n"
-            " S: StatObj (non characters)\n", NULL);
-    DefineConstIntCVar(e_DebugDrawListBBoxIndex, 0, VF_DEV_ONLY,
-        "enables BBOX drawing for the 'n' element of the DebugDrawList (starting by 1.   0 = no bbox drawing).");
-    REGISTER_COMMAND("e_DebugDrawListCMD", CDebugDrawListMgr::ConsoleCommand, VF_DEV_ONLY,
-        "Issue commands to control e_DebugDraw list debuginfo behaviour\n"
-        "'Freeze' (F) - stops refreshing stats\n"
-        "'Continue' (C) - unfreezes\n"
-        "'DumpLog' (D) - dumps the current on-screen info into the log");
-#endif
-
-#if !defined(_RELEASE)
-    e_pStatObjRenderFilterStr = NULL;
-    REGISTER_CVAR2("e_StatObjRenderFilter", &e_pStatObjRenderFilterStr, "", VF_NULL, "Debug: Controls which cgfs are rendered, based on input string");
-    e_statObjRenderFilterMode = 0;
-    REGISTER_CVAR2("e_StatObjRenderFilterMode", &e_statObjRenderFilterMode, 0, VF_NULL, "Debug: Controls how e_StatObjRenderFilter is use. 0=disabled 1=include 2=exclude");
-#endif
-
-    DefineConstFloatCVar(e_SunAngleSnapSec, VF_NULL,
-        "Sun dir snap control");
-    DefineConstFloatCVar(e_SunAngleSnapDot, VF_NULL,
-        "Sun dir snap control");
-
-    DefineConstIntCVar(e_Roads, 1, VF_CHEAT | VF_CHEAT_ALWAYS_CHECK,
-        "Activates drawing of road objects");
-
-    REGISTER_CVAR(e_Decals, 1, VF_NULL | VF_CHEAT_ALWAYS_CHECK,
-        "Activates drawing of decals (game decals and hand-placed)");
-    REGISTER_CVAR(e_DecalsForceDeferred, 0, VF_NULL,
-        "1 - force to convert all decals to use deferred ones");
-    REGISTER_CVAR(e_DecalsDefferedStatic, 1, VF_NULL,
-        "1 - switch all non-planar decals placed by level designer to deferred");
-    REGISTER_CVAR(e_DecalsDefferedDynamic, 1, VF_NULL,
-        "1 - make all game play decals deferred, 2 - make all game play decals non deferred");
-    DefineConstFloatCVar(e_DecalsDefferedDynamicMinSize, VF_CHEAT,
-        "Convert only dynamic decals bigger than X into deferred");
-    DefineConstFloatCVar(e_DecalsDefferedDynamicDepthScale, VF_CHEAT,
-        "Scale decal projection depth");
-    DefineConstFloatCVar(e_DecalsPlacementTestAreaSize, VF_CHEAT,
-        "Avoid spawning decals on the corners or edges of entity geometry");
-    DefineConstFloatCVar(e_DecalsPlacementTestMinDepth, VF_CHEAT,
-        "Avoid spawning decals on the corners or edges of entity geometry");
-    REGISTER_CVAR(e_DecalsMaxTrisInObject, 8000, VF_NULL,
-        "Do not create decals on objects having more than X triangles");
-    REGISTER_CVAR(e_DecalsAllowGameDecals,    1, VF_NULL,
-        "Allows creation of decals by game (like weapon bullets marks)");
-    DefineConstIntCVar(e_DecalsHitCache, 1, VF_CHEAT,
-        "Use smart hit caching for bullet hits (may cause no decals in some cases)");
-    DefineConstIntCVar(e_DecalsMerge, 0, VF_NULL,
-        "Combine pieces of decals into one render call");
-    DefineConstIntCVar(e_DecalsPreCreate, 1, VF_NULL,
-        "Pre-create decals at load time");
-    DefineConstIntCVar(e_DecalsClip, 1, VF_NULL,
-        "Clip decal geometry by decal bbox");
-    DefineConstFloatCVar(e_DecalsRange, VF_NULL,
-        "Less precision for decals outside this range");
-    REGISTER_CVAR(e_DecalsLifeTimeScale, 1.f, VF_NULL,
-        "Allows to increase or reduce decals life time for different specs");
-    REGISTER_CVAR(e_DecalsNeighborMaxLifeTime, 4.f, VF_NULL,
-        "If not zero - new decals will force old decals to fade in X seconds");
-    REGISTER_CVAR(e_DecalsOverlapping, 0, VF_NULL,
-        "If zero - new decals will not be spawned if the distance to nearest decals less than X");
-    DefineConstIntCVar(e_DecalsMaxValidFrames, 600, VF_NULL,
-        "Number of frames after which not visible static decals are removed");
-    REGISTER_CVAR(e_DecalsMaxUpdatesPerFrame, 4, VF_NULL,
-        "Maximum number of static decal render mesh updates per frame");
-    DefineConstIntCVar(e_VegetationBending, 1, VF_NULL,
-        "Enable vegetation bending (does not affect merged grass)");
-
-    DefineConstIntCVar(e_ForceDetailLevelForScreenRes, 0, VF_DEPRECATED,
-        "[DEPRECATED] Force sprite distance and other values used for some specific screen resolution, 0 means current");
-
-    DefineConstIntCVar(e_Wind, 1, VF_CHEAT,
-        "Enable global wind calculations, affects vegetations bending animations");
-    DefineConstIntCVar(e_WindAreas, 1, VF_CHEAT,
-        "Debug");
-    DefineConstFloatCVar(e_WindBendingDistRatio, VF_CHEAT,
-        "Wind cutoff distance for bending (linearly attentuated to that distance)");
-    REGISTER_CVAR(e_Shadows, 1, VF_NULL,
-        "Activates drawing of shadows");
-    REGISTER_CVAR(e_ShadowsBlendCascades, 1, VF_NULL,
-        "Blend between shadow cascades: 0=off, 1=on");
-    REGISTER_CVAR(e_ShadowsBlendCascadesVal, 0.75f, VF_NULL,
-        "Size of cascade blend region");
-#if defined(WIN32)
-    REGISTER_CVAR(e_ShadowsLodBiasFixed, 1, VF_NULL,
-        "Simplifies mesh for shadow map generation by X LOD levels");
-#else
-    DefineConstIntCVar(e_ShadowsLodBiasFixed, 0, VF_NULL,
-        "Simplifies mesh for shadow map generation by X LOD levels");
-#endif
-    DefineConstIntCVar(e_ShadowsLodBiasInvis, 0, VF_NULL,
-        "Simplifies mesh for shadow map generation by X LOD levels, if object is not visible in main frame");
-
-    REGISTER_CVAR(e_Tessellation, 1, VF_NULL,
-        "HW geometry tessellation  0 = not allowed, 1 = allowed");
-    REGISTER_CVAR(e_TessellationMaxDistance, 30.f, VF_NULL,
-        "Maximum distance from camera in meters to allow tessellation, also affects distance-based displacement fadeout");
-    DefineConstIntCVar(e_ShadowsTessellateCascades, 1, VF_NULL,
-        "Maximum cascade number to render tessellated shadows (0 = no tessellation for sun shadows)");
-    DefineConstIntCVar(e_ShadowsTessellateDLights, 0, VF_NULL,
-        "Disable/enable tessellation for local lights shadows");
-    REGISTER_CVAR(e_ShadowsOnAlphaBlend, 0, VF_NULL,
-        "Enable shadows on alphablended ");
-    DefineConstIntCVar(e_ShadowsFrustums, 0, VF_CHEAT,
-        "Debug");
-    DefineConstIntCVar(e_ShadowsDebug, 0, VF_CHEAT,
-        "0=off, 2=visualize shadow maps on the screen");
-    REGISTER_CVAR(e_ShadowsCache, 1, VF_NULL,
-        "Activates drawing of static cached shadows");
-    REGISTER_CVAR(e_ShadowsCacheUpdate, 0, VF_NULL,
-        "Trigger updates of the shadow cache: 0=no update, 1=one update, 2=continuous updates");
-    REGISTER_CVAR(e_ShadowsCacheObjectLod, 0, VF_NULL,
-        "The lod used for rendering objects into the shadow cache. Set to -1 to disable");
-    REGISTER_CVAR_CB(e_ShadowsCacheRenderCharacters, 0, VF_NULL,
-        "Render characters into the shadow cache. 0=disabled, 1=enabled", OnDynamicDistanceShadowsVarChange);
-    REGISTER_CVAR(e_ShadowsCacheRequireManualUpdate, 0, VF_NULL,
-        "Sets whether levels must trigger manual updates of the cached shadow maps:\n"
-        "0=Cached shadows default to Incremental updates. Each cached shadow frustum will traverse and cull the octree each frame (Potentially high CPU/GPU overhead)\n"
-        "1=Levels must trigger cached shadow updates via script (Preferred: Lowest overhead)\n"
-        "2=Levels may either trigger cached shadow updates via script or allow cached shadows to update if the user moves too close to the border of the shadowmap");
-    REGISTER_CVAR_CB(e_DynamicDistanceShadows, 1, VF_NULL,
-        "Enable dynamic distance shadows, 0=disable, 1=enable, -1=don't render dynamic distance shadows", OnDynamicDistanceShadowsVarChange);
-    DefineConstIntCVar(e_ShadowsCascadesDebug, 0, VF_CHEAT,
-        "0=off, 1=visualize sun shadow cascades on screen");
-    REGISTER_CVAR(e_ShadowsPerObjectResolutionScale, 1, VF_NULL,
-        "Global scale for per object shadow texture resolution\n"
-        "NOTE: individual texture resolution is rounded to next power of two ");
-    REGISTER_CVAR(e_ShadowsClouds, 1, VF_NULL,
-        "Cloud shadows");   // no cheat var because this feature shouldn't be strong enough to affect gameplay a lot
-    REGISTER_CVAR(e_ShadowsPoolSize, 2048, VF_NULL,
-        "Set size of shadow pool (e_ShadowsPoolSize*e_ShadowsPoolSize)");
-    REGISTER_CVAR(e_ShadowsMaxTexRes, 1024, VF_NULL,
-        "Set maximum resolution of shadow map\n256(faster), 512(medium), 1024(better quality)");
-    REGISTER_CVAR(e_ShadowsResScale, 2.8f, VF_NULL,
-        "Shadows slope bias for shadowgen");
-    REGISTER_CVAR(e_ShadowsAdaptScale, 2.72f, VF_NULL,
-        "Shadows slope bias for shadowgen");
-    REGISTER_CVAR(e_ShadowsSlopeBias, 1.0f, VF_NULL,
-        "Shadows slope bias for shadowgen");
-    REGISTER_CVAR(e_ShadowsSlopeBiasHQ, 0.25f, VF_NULL,
-        "Shadows slope bias for shadowgen (for high quality mode)");
-    REGISTER_CVAR(e_ShadowsConstBias, 1.0f, VF_NULL,
-        "Shadows slope bias for shadowgen");
-    REGISTER_CVAR(e_ShadowsConstBiasHQ, 0.05f, VF_NULL,
-        "Shadows slope bias for shadowgen (high quality mode)");
-    REGISTER_CVAR(e_ShadowsClearShowMaskAtLoad, 1, VF_NULL,
-                  "Clears the shadow mask at level load to remove any bad shadow data from previous level.\n"
-                  "0 = Better perf. It does not clear the shadow which will help set shadowmask texture to be memoryless. This will help reduce gpu bandwidth)\n"
-                  "1 = This will disable the memoryless optimization as it would clear the shadow at level load. Only use this if you see residual shadows from previous level showing up in current level.\n");
-
-    DefineConstIntCVar(e_ShadowsMasksLimit, 0, VF_NULL,
-        "Maximum amount of allocated shadow mask textures\n"
-        "This limits the number of shadow casting lights overlapping\n"
-        "0=disable limit(unpredictable memory requirements)\n"
-        "1=one texture (4 channels for 4 lights)\n"
-        "2=two textures (8 channels for 8 lights), ...");
-
-    REGISTER_CVAR(e_ShadowsUpdateViewDistRatio, 128, VF_NULL,
-        "View dist ratio for shadow maps updating for shadowpool");
-    DefineConstFloatCVar(e_ShadowsCastViewDistRatioLights, VF_NULL,
-        "View dist ratio for shadow maps casting for light sources");
-    REGISTER_CVAR(e_ShadowsCastViewDistRatio, 0.8f, VF_NULL,
-        "View dist ratio for shadow maps casting from objects");
-    REGISTER_CVAR(e_GsmRange, 3.0f, VF_NULL,
-        "Size of LOD 0 GSM area (in meters)");
-    REGISTER_CVAR(e_GsmRangeStep, 3.0f, VF_NULL,
-        "Range of next GSM lod is previous range multiplied by step");
-    REGISTER_CVAR_CB(e_GsmLodsNum, 5, VF_NULL,
-        "Number of GSM lods (0..5)", OnGsmLodsNumChange);
-    DefineConstIntCVar(e_GsmDepthBoundsDebug, 0, VF_NULL,
-        "Debug GSM bounds regions calculation");
-    DefineConstIntCVar(e_GsmStats, 0, VF_CHEAT,
-        "Show GSM statistics 0=off, 1=enable debug to the screens");
-    REGISTER_CVAR(e_RNTmpDataPoolMaxFrames, 16, VF_CHEAT,
-        "Cache RNTmpData at least for X framres");
-
-    DefineConstIntCVar(e_AutoPrecacheCameraJumpDist, 16, VF_CHEAT,
-        "When not 0 - Force full pre-cache of textures, procedural vegetation and shaders\n"
-        "if camera moved for more than X meters in one frame or on new cut scene start");
-    DefineConstIntCVar(e_AutoPrecacheTexturesAndShaders, 0, VF_CHEAT,
-        "Force auto pre-cache of general textures and shaders");
-    DefineConstIntCVar(e_AutoPrecacheCgf, 1, VF_CHEAT,
-        "Force auto pre-cache of CGF render meshes. 1=pre-cache all meshes around camera. 2=pre-cache only important ones (twice faster)");
-    REGISTER_CVAR(e_AutoPrecacheCgfMaxTasks, 8, VF_NULL,
-        "Maximum number of parallel streaming tasks during pre-caching");
-    REGISTER_CVAR(e_TerrainOcclusionCullingMaxDist,   200.f, VF_NULL,
-        "Max length of ray (for version 1)");
-    REGISTER_CVAR(e_StreamPredictionUpdateTimeSlice, 0.4f, VF_NULL,
-        "Maximum amount of time to spend for scene streaming priority update in milliseconds");
-    REGISTER_CVAR(e_StreamAutoMipFactorSpeedThreshold, 0.f, VF_NULL,
-        "Debug");
-    REGISTER_CVAR(e_StreamAutoMipFactorMin, 0.5f, VF_NULL,
-        "Debug");
-    REGISTER_CVAR(e_StreamAutoMipFactorMax, 1.0f, VF_NULL,
-        "Debug");
-    REGISTER_CVAR(e_StreamAutoMipFactorMaxDVD, 0.5f, VF_NULL,
-        "Debug");
-
-    REGISTER_CVAR(e_OcclusionCullingViewDistRatio, 0.5f, VF_NULL,
-        "Skip per object occlusion test for very far objects - culling on tree level will handle it");
-
-    REGISTER_CVAR(e_Sun, 1, VF_CHEAT,
-        "Activates sun light source");
-    REGISTER_CVAR(e_CoverageBuffer, 1, VF_NULL,
-        "Activates usage of software coverage buffer.\n"
-        "1 - camera culling only\n"
-        "2 - camera culling and light-to-object check");
-    REGISTER_CVAR(e_CoverageBufferVersion, 2, VF_NULL,
-        "1 Vladimir's, 2MichaelK's");
-    DefineConstIntCVar(e_CoverageBufferDebug, 0, VF_CHEAT,
-        "Display content of main camera coverage buffer");
-    DefineConstIntCVar(e_CoverageBufferDebugFreeze, 0, VF_CHEAT,
-        "Freezes view matrix/-frustum ");
-    DefineConstIntCVar(e_CoverageBufferDrawOccluders, 0, VF_CHEAT,
-        "Debug draw of occluders for coverage buffer");
-    DefineConstIntCVar(e_CoverageBufferTestMode, 2, VF_CHEAT,
-        "Debug");
-    REGISTER_CVAR(e_CoverageBufferBias, 0.05f, VF_NULL,
-        "Coverage buffer z-biasing");
-    REGISTER_CVAR(e_CoverageBufferAABBExpand, 0.020f, VF_NULL,
-        "expanding the AABB's of the objects to test to avoid z-fighting issues in the Coverage buffer");
-    REGISTER_CVAR(e_CoverageBufferEarlyOut, 1, VF_NULL,
-        "preempting occluder rasterization to avoid stalling in the main thread if rendering is faster");
-    REGISTER_CVAR(e_CoverageBufferEarlyOutDelay, 3.0f, VF_NULL,
-        "Time in ms that rasterizer is allowed to continue working after early out request");
-    REGISTER_CVAR(e_CoverageBufferRotationSafeCheck, 0, VF_NULL,
-        "Coverage buffer safe checking for rotation 0=disabled 1=enabled 2=enabled for out of frustum object");
-    DefineConstIntCVar(e_CoverageBufferLightsDebugSide, -1, VF_CHEAT,
-        "Debug");
-    REGISTER_CVAR(e_CoverageBufferDebugDrawScale, 1, VF_CHEAT,
-        "Debug");
-    REGISTER_CVAR(e_CoverageBufferResolution, 128, VF_NULL,
-        "Resolution of software coverage buffer");
-
-    REGISTER_CVAR(e_CoverageBufferReproj, 0, VF_NULL,
-        "Use re-projection technique on CBuffer, 1 simple reproject, 2 additional hole filling, 4 using ocm mesh for occlusion checking");
-    REGISTER_CVAR(e_CoverageBufferRastPolyLimit, 500000, VF_NULL,
-        "maximum amount of polys to rasterize cap, 0 means no limit\ndefault is 500000");
-    REGISTER_CVAR(e_CoverageBufferShowOccluder, 0, VF_NULL,
-        "1 show only meshes used as occluder, 2 show only meshes not used as occluder");
-    REGISTER_CVAR(e_CoverageBufferAccurateOBBTest, 0, VF_NULL,
-        "Checking of OBB boxes instead of AABB or bounding rects");
-    DefineConstIntCVar(e_CoverageBufferTolerance, 0, VF_NULL,
-        "amount of visible pixel that will still identify the object as covered");
-    DefineConstIntCVar(e_CoverageBufferOccludersTestMinTrisNum, 0, VF_CHEAT,
-        "Debug");
-    REGISTER_CVAR(e_CoverageBufferOccludersViewDistRatio, 1.0f, VF_CHEAT,
-        "Debug");
-    DefineConstFloatCVar(e_CoverageBufferOccludersLodRatio, VF_CHEAT,
-        "Debug");
-    DefineConstIntCVar(e_CoverageBufferTreeDebug, 0, VF_CHEAT,
-        "Debug");
-    DefineConstIntCVar(e_CoverageBufferMaxAddRenderMeshTime, 2, VF_NULL,
-        "Max time for unlimited AddRenderMesh");
-    REGISTER_CVAR(e_CoverageBufferNumberFramesLatency, 2, VF_NULL,
-        "Configures the number of frames of latency between the GPU write of the downsample Z-Target and CPU readback of that target.\n"
-        "0 - Disable CPU readback (For debugging)"
-        "1 - Coverage buffer uses previous frame's depth information. (Not recommended, CPU may stall waiting on GPU)\n"
-        "2 - Coverage buffer uses two frame old depth. (Default)\n"
-        "3 - Coverage buffer uses three frame old depth information.");
-
-    DefineConstIntCVar(e_DynamicLightsMaxCount, 512, VF_CHEAT,
-        "Sets maximum amount of dynamic light sources");
-
-    DefineConstIntCVar(e_DynamicLights, 1, VF_CHEAT,
-        "Activates dynamic light sources");
-    DefineConstIntCVar(e_DynamicLightsForceDeferred, 1, VF_CHEAT,
-        "Convert all lights to deferred (except sun)");
-    REGISTER_CVAR(e_DynamicLightsFrameIdVisTest, 1, VF_NULL,
-        "Use based on last draw frame visibility test");
-    DefineConstIntCVar(e_DynamicLightsConsistentSortOrder, 1, VF_NULL,
-        "Debug");
-
-    DefineConstIntCVar(e_HwOcclusionCullingWater,   1, VF_NULL,
-        "Activates usage of HW occlusion test for ocean");
-
-    DefineConstIntCVar(e_Portals, 1, VF_CHEAT,
-        "Activates drawing of visareas content (indoors), values 2,3,4 used for debugging");
-    DefineConstIntCVar(e_PortalsBigEntitiesFix, 1, VF_CHEAT,
-        "Enables special processing of big entities like vehicles intersecting portals");
-    DefineConstIntCVar(e_PortalsBlend, 1, VF_CHEAT,
-        "Blend lights and cubemaps of vis areas connected to portals 0=off, 1=on");
-    REGISTER_CVAR(e_PortalsMaxRecursion, 8, VF_NULL,
-        "Maximum number of visareas and portals to traverse for indoor rendering");
-    REGISTER_CVAR(e_DynamicLightsMaxEntityLights, 16, VF_NULL,
-        "Set maximum number of lights affecting object");
-    DefineConstFloatCVar(e_MaxViewDistance, VF_CHEAT,
-        "Far clipping plane distance");
-    REGISTER_CVAR(e_MaxViewDistSpecLerp, 1, VF_NULL,
-        "1 - use max view distance set by designer for very high spec\n0 - for very low spec\nValues between 0 and 1 - will lerp between high and low spec max view distances");
-    DefineConstFloatCVar(e_MaxViewDistFullDistCamHeight, VF_CHEAT,
-        "Debug");
-    DefineConstIntCVar(e_WaterVolumes, e_WaterVolumesDefault, VF_CHEAT,
-        "Activates drawing of water volumes\n"
-        "1: use usual rendering path\n"
-        "2: use fast rendering path with merged fog");
-    DefineConstIntCVar(e_RenderTransparentUnderWater, e_RenderTransparentUnderWaterDefault, VF_NULL,
-        "Determines how transparent/alphablended objects are rendered in WaterVolume\n"
-        "0: they are not rendered under water (fast performance)\n"
-        "1: they are rendered twice under water and above water (higher quality)");
-    if (!OceanToggle::IsActive())
-    {
-        REGISTER_CVAR(e_WaterTessellationAmount, 200, VF_NULL,  // being deprecated by Water gem
-            "Set tessellation amount");
-    }
-
-    REGISTER_CVAR(e_WaterTessellationSwathWidth, 12, VF_NULL,
-        "Set the swath width for the boustrophedonic mesh stripping");
-    DefineConstIntCVar(e_BBoxes, 0, VF_CHEAT,
-        "Activates drawing of bounding boxes");
-
-    DefineConstIntCVar(e_StreamSaveStartupResultsIntoXML, 0, VF_NULL,
-        "Save basic information about streaming performance on level start into XML");
-    REGISTER_CVAR(e_StreamCgfPoolSize, 24, VF_NULL,
-        "Render mesh cache size in MB");
-    REGISTER_CVAR(e_SQTestBegin, 0, VF_NULL,
-        "If not zero - start streaming latency unit test");
-    REGISTER_CVAR(e_SQTestCount, 0, VF_NULL,
-        "If not zero - restart test X times");
-    REGISTER_CVAR(e_SQTestExitOnFinish, 0, VF_NULL,
-        "If not zero - shutdown when finished testing");
-    REGISTER_CVAR(e_SQTestDistance, 80, VF_NULL,
-        "Distance to travel");
-    REGISTER_CVAR(e_SQTestMip, 1, VF_NULL,
-        "Mip to wait during test");
-    REGISTER_CVAR(e_SQTestMoveSpeed, 10, VF_NULL,
-        "Camera speed during test (meters/sec)");
-
-    // Small temp pool size for consoles, editor and pc have much larger capabilities
-    DefineConstIntCVar(e_3dEngineTempPoolSize, 1024, VF_NULL,
-        "pool size for temporary allocations in kb, requires app restart");
-
-    DefineConstIntCVar(e_3dEngineLogAlways, 0, VF_NULL,
-        "Set maximum verbosity to 3dengine.dll log messages");
-
-    DefineConstIntCVar(e_CoverCgfDebug, 0, VF_NULL, "Shows the cover setups on cfg files");
-
-    REGISTER_CVAR(e_StreamCgfMaxTasksInProgress, 32, VF_CHEAT,
-        "Maximum number of files simultaneously requested from streaming system");
-    REGISTER_CVAR(e_StreamCgfMaxNewTasksPerUpdate, 4, VF_CHEAT,
-        "Maximum number of files requested from streaming system per update");
-    REGISTER_CVAR(e_StreamPredictionMaxVisAreaRecursion, 9, VF_CHEAT,
-        "Maximum number visareas and portals to traverse.");
-    REGISTER_CVAR(e_StreamPredictionBoxRadius, 1, VF_CHEAT, "Radius of stream prediction box");
-    REGISTER_CVAR(e_StreamPredictionTexelDensity, 1, VF_CHEAT,
-        "Use mesh texture mapping density info for textures streaming");
-    REGISTER_CVAR(e_StreamPredictionAlwaysIncludeOutside, 0, VF_CHEAT,
-        "Always include outside octrees in streaming");
-    DefineConstFloatCVar(e_StreamCgfFastUpdateMaxDistance, VF_CHEAT,
-        "Update streaming priorities for near objects every second frame");
-    DefineConstFloatCVar(e_StreamPredictionMinFarZoneDistance, VF_CHEAT,
-        "Debug");
-    DefineConstFloatCVar(e_StreamPredictionMinReportDistance, VF_CHEAT,
-        "Debug");
-    REGISTER_CVAR_CB(e_StreamCgf, 1, VF_REQUIRE_APP_RESTART,
-        "Enable streaming of static render meshes", OnCGFStreamingChange);
-    DefineConstIntCVar(e_StreamCgfDebug, 0, VF_NULL,
-        "Draw helpers and other debug information about CGF streaming\n"
-        " 1: Draw color coded boxes for objects taking more than e_StreamCgfDebugMinObjSize,\n"
-        "    also shows are the LOD's stored in single CGF or were split into several CGF's\n"
-        " 2: Trace into console every loading and unloading operation\n"
-        " 3: Print list of currently active objects taking more than e_StreamCgfDebugMinObjSize KB");
-    DefineConstIntCVar(e_StreamCgfDebugMinObjSize, 100, VF_CHEAT,
-        "Threshold for objects debugging in KB");
-    DefineConstIntCVar(e_StreamCgfDebugHeatMap, 0, VF_CHEAT,
-        "Generate and show mesh streaming heat map\n"
-        " 1: Generate heat map for entire level\n"
-        " 2: Show last heat map");
-    DefineConstFloatCVar(e_StreamPredictionDistanceFar, VF_CHEAT,
-        "Prediction distance for streaming, affects far objects");
-    DefineConstFloatCVar(e_StreamPredictionDistanceNear, VF_CHEAT,
-        "Prediction distance for streaming, affects LOD of objects");
-    DefineConstFloatCVar(e_StreamCgfVisObjPriority, VF_CHEAT,
-        "Priority boost for visible objects\n"
-        "0 - visible objects has no priority over invisible objects, camera direction does not affect streaming\n"
-        "1 - visible objects has highest priority, in case of trashing will produce even more trashing");
-
-    DefineConstFloatCVar(e_StreamCgfGridUpdateDistance, VF_CHEAT,
-        "Update streaming priorities when camera moves more than this value");
-
-    DefineConstFloatCVar(e_StreamPredictionAhead, VF_CHEAT,
-        "Use predicted camera position for streaming priority updates");
-
-    DefineConstFloatCVar(e_StreamPredictionAheadDebug, VF_CHEAT,
-        "Draw ball at predicted position");
-
-    DefineConstFloatCVar(e_DissolveDistMax, VF_CHEAT,
-        "At most how near to object MVD dissolve effect triggers (10% of MVD, clamped to this)");
-
-    DefineConstFloatCVar(e_DissolveDistMin, VF_CHEAT,
-        "At least how near to object MVD dissolve effect triggers (10% of MVD, clamped to this)");
-
-    DefineConstFloatCVar(e_DissolveDistband, VF_CHEAT,
-        "Over how many meters transition takes place");
-
-
-    DefineConstIntCVar(e_StreamCgfUpdatePerNodeDistance, 1, VF_CHEAT,
-        "Use node distance as entity distance for far nodex ");
-
-    DefineConstIntCVar(e_ScissorDebug, 0, VF_CHEAT,
-        "Debug");
-
-    REGISTER_CVAR(e_OnDemandPhysics, gEnv->IsEditor() ? 0 : 1, VF_NULL,
-        "Turns on on-demand physicalization (0=off)");
-    REGISTER_CVAR(e_OnDemandMaxSize, 20.0f, VF_NULL,
-        "Specifies the maximum size of vegetation objects that are physicalized on-demand");
-    DefineConstIntCVar(e_Sleep, 0, VF_CHEAT,
-        "Sleep X in C3DEngine::Draw");
-    REGISTER_CVAR(e_ObjectLayersActivation, (m_bEditor ? 0 : 1), VF_CHEAT, "Allow game to activate/deactivate object layers");
-    DefineConstIntCVar(e_ObjectLayersActivationPhysics, 1, VF_CHEAT,
-        "Allow game to create/free physics of objects: 0: Disable; 1: All; 2: Water only.");
-    DefineConstIntCVar(e_Objects, 1, VF_CHEAT,
-        "Render or not all objects");
-    DefineConstIntCVar(e_Render, e_RenderDefault, VF_CHEAT,
-        "Enable engine rendering");
-    DefineConstIntCVar(e_ObjectsTreeBBoxes, 0, VF_CHEAT,
-        "Debug draw of object tree bboxes");
-    /*  REGISTER_CVAR(e_obj_tree_min_node_size, 0, VF_CHEAT,
-            "Debug draw of object tree bboxes");
-      REGISTER_CVAR(e_obj_tree_max_node_size, 0, VF_CHEAT,
-            "Debug draw of object tree bboxes");*/
-    REGISTER_CVAR(e_StatObjBufferRenderTasks, 1, VF_NULL,
-        "1 - occlusion test on render node level, 2 - occlusion test on render mesh level");
-    REGISTER_CVAR(e_CheckOcclusion, 1, VF_NULL, "Perform a visible check in check occlusion job");
-
-    #define DEFAULT_CHECK_OCCLUSION_QUEUE_SIZE 1024
-    #define DEFAULT_CHECK_OCCLUSION_OUTPUT_QUEUE_SIZE 4096
-
-    REGISTER_CVAR(e_CheckOcclusionQueueSize, DEFAULT_CHECK_OCCLUSION_QUEUE_SIZE, VF_NULL,
-        "Size of queue for data send to check occlusion job");
-    REGISTER_CVAR(e_CheckOcclusionOutputQueueSize, DEFAULT_CHECK_OCCLUSION_OUTPUT_QUEUE_SIZE, VF_NULL,
-        "Size of queue for data send from check occlusion job");
-    REGISTER_CVAR(e_StatObjTessellationMaxEdgeLenght, 1.75f, VF_CHEAT,
-        "Split edges longer than X meters");
-    REGISTER_CVAR(e_StatObjTessellationMode, 1, VF_CHEAT,
-        "Set they way pre-tessellated version of meshes is created: 0 = no pre-tessellation, 1 = load from disk, 2 = generate from normal mesh on loading");
-    DefineConstIntCVar(e_StatObjTestOBB, 0, VF_CHEAT,
-        "Use additional OBB check for culling");
-    DefineConstIntCVar(e_ObjStats, 0, VF_CHEAT,
-        "Show instances count");
-    DefineConstIntCVar(e_ObjFastRegister, 1, VF_CHEAT,
-        "Debug");
-
-    DefineConstIntCVar(e_OcclusionLazyHideFrames, 0, VF_CHEAT,
-        "Makes less occluson tests, but it takes more frames to detect invisible objects");
-    DefineConstIntCVar(e_OcclusionVolumes, e_OcclusionVolumesDefault, VF_CHEAT,
-        "Enable occlusion volumes(antiportals)");
-    DefineConstFloatCVar(e_OcclusionVolumesViewDistRatio, VF_NULL,
-        "Controls how far occlusion volumes starts to occlude objects");
-
-    DefineConstIntCVar(e_PrecacheLevel, 0, VF_NULL,
-        "Pre-render objects right after level loading");
-    REGISTER_CVAR(e_Dissolve, 1, VF_NULL,
-        "Objects alphatest_noise_fading out on distance and between lods");
-    DefineConstIntCVar(e_Lods, 1, VF_NULL,
-        "Load and use LOD models for static geometry");
-    DefineConstIntCVar(e_LodFaceArea, 1, VF_NULL,
-        "Use geometric mean of faces area to compute LOD");
-    DefineConstIntCVar(e_LodsForceUse, 1, VF_NULL,
-        "Force using LODs even if triangle count do not suit");
-    DefineConstFloatCVar(e_LodBoundingBoxDistanceMultiplier, VF_CHEAT,
-        "e_LodBoundingBoxDistanceMultiplier ");
-
-    REGISTER_CVAR(e_SQTestDelay, 5.f, VF_NULL,
-        "Time to stabilize the system before camera movements");
-
-    DefineConstIntCVar(e_Recursion, 1, VF_NULL,
-        "If 0 - will skip recursive render calls like render into texture");
-    DefineConstIntCVar(e_RecursionOcclusionCulling, 0, VF_NULL,
-        "If 0 - will disable occlusion tests for recursive render calls like render into texture");
-    REGISTER_CVAR(e_RecursionViewDistRatio, 0.1f, VF_NULL,
-        "Set all view distances shorter by factor of X");
-
-    REGISTER_CVAR(e_Clouds, 1, VF_NULL,
-        "Enable clouds rendering");
-
-    REGISTER_CVAR(e_SkyUpdateRate, 0.12f, VF_NULL,
-        "Percentage of a full dynamic sky update calculated per frame (0..100].");
-    DefineConstIntCVar(e_SkyQuality, 1, VF_NULL,
-        "Quality of dynamic sky: 1 (very high), 2 (high).");
-    DefineConstIntCVar(e_SkyType, 1, VF_NULL,
-        "Type of sky used: 0 (static), 1 (dynamic).");
-
-    DefineConstIntCVar(e_DisplayMemoryUsageIcon, e_DisplayMemoryUsageIconDefault, VF_NULL,
-        "Turns On/Off the memory usage icon rendering: 1 on, 0 off.");
-
-    REGISTER_CVAR(e_LodRatio, 6.0f, VF_NULL,
-        "LOD distance ratio for objects");
-    REGISTER_CVAR(e_LodFaceAreaTargetSize, 0.005f, VF_NULL,
-        "Threshold used for LOD computation.");
-    REGISTER_CVAR(e_FogVolumeShadingQuality, 0, VF_NULL,
-        "Fog Volume Shading Quality 0: standard, 1:high (better fog volume interaction)");
-    DefineConstFloatCVar(e_LodCompMaxSize, VF_NULL,
-        "Affects LOD selection for big objects, small number will switch more objects into lower LOD");
-    REGISTER_CVAR(e_ViewDistRatio, 60.0f, VF_CVARGRP_IGNOREINREALVAL,
-        "View distance ratio for objects");
-    DefineConstFloatCVar(e_ViewDistCompMaxSize, VF_NULL,
-        "Affects max view distance for big objects, small number will render less objects");
-    DefineConstFloatCVar(e_ViewDistRatioPortals, VF_NULL,
-        "View distance ratio for portals");
-    REGISTER_CVAR(e_ViewDistRatioDetail, 30.0f, VF_NULL,
-        "View distance ratio for detail objects");
-    REGISTER_CVAR(e_ViewDistRatioLights, 50.0f, VF_NULL,
-        "View distance ratio for light sources");
-    REGISTER_CVAR(e_ViewDistRatioCustom, 60.0f, VF_NULL,
-        "View distance ratio for special marked objects (Players,AI,Vehicles)");
-    REGISTER_CVAR(e_ViewDistMin, 0.0f, VF_NULL,
-        "Min distance on what far objects will be culled out");
-    REGISTER_CVAR(e_LodMin, 0, VF_NULL,
-        "Min LOD for objects");
-    REGISTER_CVAR(e_CharLodMin, 0, VF_NULL,
-        "Min LOD for character objects");
-    REGISTER_CVAR(e_LodForceUpdate, 0, VF_NULL,
-        "When active, recalculate object LOD when rendering instead of using LOD calculated during previous frame.");
-    REGISTER_CVAR(e_LodMax, MAX_STATOBJ_LODS_NUM - 1, VF_CHEAT,
-        "Max LOD for objects");
-    DefineConstIntCVar(e_LodMinTtris, 300, VF_CHEAT,
-        "LODs with less triangles will not be used");
-    REGISTER_CVAR(e_PhysMinCellSize, 4, VF_NULL,
-        "Min size of cell in physical entity grid");
-    DefineConstIntCVar(e_PhysEntityGridSizeDefault, 4096, VF_NULL,
-        "Default size of the physical entity grid when there's no terrain.");
-    REGISTER_CVAR(e_PhysProxyTriLimit, 5000, VF_NULL,
-        "Maximum allowed triangle count for phys proxies");
-    DefineConstIntCVar(e_PhysFoliage, 2, VF_NULL,
-        "Enables physicalized foliage\n"
-        "1 - only for dynamic objects\n"
-        "2 - for static and dynamic)");
-    DefineConstIntCVar(e_RenderMeshUpdateAsync, 1, VF_NULL,
-        "Enables async updating of dynamically updated rendermeshes\n"
-        "0 - performs a synchronous update\n"
-        "1 - performs the update in an async job (default))");
-    REGISTER_CVAR(e_FoliageWindActivationDist,  0,  VF_NULL,
-        "If the wind is sufficiently strong, visible foliage in this view dist will be forcefully activated");
-
-    DefineConstIntCVar(e_DeformableObjects, e_DeformableObjectsDefault, VF_NULL,
-        "Enable / Disable morph based deformable objects");
-
-    REGISTER_CVAR(e_CullVegActivation, 200, VF_NULL,
-        "Vegetation activation distance limit; 0 disables visibility-based culling (= unconditional activation)");
-
-    REGISTER_CVAR(e_PhysOceanCell, e_PhysOceanCellDefault, VF_NULL,
-        "Cell size for ocean approximation in physics, 0 assumes flat plane");
-
-    DefineConstFloatCVar(e_JointStrengthScale, VF_NULL,
-        "Scales the strength of prebroken objects\' joints (for tweaking)");
-
-    DefineConstFloatCVar(e_VolObjShadowStrength, VF_NULL,
-        "Self shadow intensity of volume objects [0..1].");
-
-    REGISTER_CVAR(e_ScreenShot, 0, VF_NULL,
-        "Make screenshot combined up of multiple rendered frames\n"
-        "(negative values for multiple frames, positive for a a single frame)\n"
-        " 1 highres\n"
-        " 2 360 degree panorama\n"
-        " 3 Map top-down view\n"
-        "\n"
-        "see:\n"
-        "  e_ScreenShotWidth, e_ScreenShotHeight, e_ScreenShotQuality, e_ScreenShotMapCenterX,\n"
-        "  e_ScreenShotMapCenterY, e_ScreenShotMapSize, e_ScreenShotMinSlices, e_ScreenShotDebug");
-
-    REGISTER_CVAR(e_ScreenShotWidth, 2000, VF_NULL,
-        "used for all type highres screenshots made by e_ScreenShot to define the\n"
-        "width of the destination image, 2000 default");
-    REGISTER_CVAR(e_ScreenShotHeight, 1500, VF_NULL,
-        "used for all type highres screenshots made by e_ScreenShot to define the\n"
-        "height of the destination image, 1500 default");
-    REGISTER_CVAR(e_ScreenShotQuality, 30, VF_NULL,
-        "used for all type highres screenshots made by e_ScreenShot to define the quality\n"
-        "0=fast, 10 .. 30 .. 100 = extra border in percent (soften seams), negative value to debug");
-    REGISTER_CVAR(e_ScreenShotMinSlices, 1, VF_NULL,
-        "used for all type highres screenshots made by e_ScreenShot to define the amount\n"
-        "of sub-screenshots for the width and height to generate the image,\n the min count\n"
-        "will be automatically raised if not sufficient (per screenshot-based)");
-    REGISTER_CVAR(e_ScreenShotMapCenterX, 0.0f, VF_NULL,
-        "param for the centerX position of the camera, see e_ScreenShotMap\n"
-        "defines the x position of the top left corner of the screenshot-area on the terrain,\n"
-        "0.0 - 1.0 (0.0 is default)");
-    REGISTER_CVAR(e_ScreenShotMapCenterY, 0.0f, VF_NULL,
-        "param for the centerX position of the camera, see e_ScreenShotMap\n"
-        "defines the y position of the top left corner of the screenshot-area on the terrain,\n"
-        "0.0 - 1.0 (0.0 is default)");
-    REGISTER_CVAR(e_ScreenShotMapSizeX, 1024.f, VF_NULL,
-        "param for the size in worldunits of area to make map screenshot, see e_ScreenShotMap\n"
-        "defines the x position of the bottom right corner of the screenshot-area on the terrain,\n"
-        "0.0 - 1.0 (1.0 is default)");
-    REGISTER_CVAR(e_ScreenShotMapSizeY, 1024.f, VF_NULL,
-        "param for the size in worldunits of area to make map screenshot, see e_ScreenShotMap\n"
-        "defines the x position of the bottom right corner of the screenshot-area on the terrain,\n"
-        "0.0 - 1.0 (1.0 is default)");
-    REGISTER_CVAR(e_ScreenShotMapCamHeight, 4000.f, VF_NULL,
-        "param for top-down-view screenshot creation, defining the camera height for screenshots,\n"
-        "see e_ScreenShotMap defines the y position of the bottom right corner of the\n"
-        "screenshot-area on the terrain,\n"
-        "0.0 - 1.0 (1.0 is default)");
-    REGISTER_CVAR(e_ScreenShotMapOrientation, 0, VF_NULL,
-        "param for rotating the orientation through 90 degrees so the screen shot width is along the X axis\n"
-        "see e_ScreenShotMap\n"
-        "0 - 1 (0 is default)");
-    REGISTER_CVAR(e_ScreenShotDebug, 0, VF_NULL,
-        "0 off\n1 show stitching borders\n2 show overlapping areas");
-
-    DefineConstIntCVar(e_Ropes, 1, VF_CHEAT,
-        "Turn Rendering of Ropes on/off");
-
-    DefineConstIntCVar(e_StatObjValidate, e_StatObjValidateDefault, VF_NULL,
-        "Enable CGF mesh validation during loading");
-
-    DefineConstIntCVar(e_StatObjPreload, 1, VF_NULL,
-        "Load level CGF's in efficient way");
-
-    DefineConstIntCVar(e_PreloadMaterials, 1, VF_NULL,
-        "Preload level materials from level cache pak and resources list");
-    DefineConstIntCVar(e_PreloadDecals, 1, VF_NULL,
-        "Preload all materials for decals");
-
-    DefineConstIntCVar(e_StatObjMerge, 1, VF_NULL,
-        "Enable CGF sub-objects meshes merging");
-    DefineConstIntCVar(e_StatObjMergeUseThread, 1, VF_NULL,
-        "Use a thread to perform sub-objects meshes merging");
-    DefineConstIntCVar(e_StatObjMergeMaxTrisPerDrawCall, 500, VF_NULL,
-        "Skip merging of meshes already having acceptable number of triangles per draw call");
-    DefineConstIntCVar(e_StatObjStoreMesh, 0, VF_NULL,
-        "Store the mesh if enabled, used for cheat detection purposes (they will be stored by default on the dedi server)");
-
-    DefineConstIntCVar(e_DefaultMaterial, 0, VF_CHEAT,
-        "use gray illumination as default");
-
-    REGISTER_CVAR(e_ObjQuality, 0, VF_NULL,
-        "Object detail quality");
-    REGISTER_CVAR(e_LightQuality, 0, VF_NULL,
-        "Light detail quality. Controls whether lights are created or casts shadows based on the minimum spec level set in the light configuration."
-        "1: Creates or casts shadows from lights that have the minimum spec level set to low."
-        "2: Creates or casts shadows from lights that have the minimum spec level set to low or medium."
-        "3: Creates or casts shadows from lights that have the minimum spec level set to low, medium or high."
-        "4: Creates or casts shadows from lights that have the minimum spec level set to low, medium, high or very high.");
-    REGISTER_CVAR(e_ObjShadowCastSpec, 0, VF_NULL,
-        "Object shadow casting spec. Only objects with Shadow Cast Spec <= e_ObjShadowCastSpec will cast shadows");
-
-    DefineConstIntCVar(e_LightVolumes, e_LightVolumesDefault, VF_NULL,
-        "Allows deferred lighting for registered alpha blended geometry\n"
-        "0 = Off\n"
-        "1 = Enabled\n"
-        "2 = Enabled just for sun light\n");
-
-    DefineConstIntCVar(e_LightVolumesDebug, 0, VF_NULL,
-        "Display light volumes debug info\n"
-        "0 = Off\n"
-        "1 = Enabled\n");
-
-    e_ScreenShotFileFormat = REGISTER_STRING("e_ScreenShotFileFormat", "tga",  VF_NULL,
-            "Set output image file format for hires screen shots. Can be jpg or tga");
-
-    e_ScreenShotFileName = REGISTER_STRING("e_ScreenShotFileName", "", VF_NULL, 
-        "Sets the output screen shot name, can include relative directories to @user@/ScreenShots");
-
-    e_SQTestTextureName = REGISTER_STRING("e_SQTestTextureName", "strfrn_advrt_boards_screen",  VF_NULL,
-            "Reference texture name for streaming latency test");
-    e_StreamCgfDebugFilter = REGISTER_STRING("e_StreamCgfDebugFilter", "",  VF_NULL,
-            "Show only items containing specified text");
-
-    e_CameraGoto = REGISTER_STRING("e_CameraGoto", "0",  VF_CHEAT,
-            "Move cameras to a certain pos/angle");
-    e_DebugDrawFilter = REGISTER_STRING("e_DebugDrawFilter", "",  VF_NULL,
-            "Show a specified text on DebugDraw");
-
-    REGISTER_CVAR_CB(e_TimeOfDay, 0.0f, VF_CHEAT | VF_CHEAT_NOCHECK, "Current Time of Day", OnTimeOfDayVarChange);
-    REGISTER_CVAR_CB(e_TimeOfDaySpeed, 0.0f, VF_CHEAT | VF_CHEAT_NOCHECK, "Time of Day change speed", OnTimeOfDaySpeedVarChange);
-    DefineConstIntCVar(e_TimeOfDayDebug, 0, VF_NULL,
-        "Display time of day current values on screen");
-
-
-    DefineConstFloatCVar(e_CameraRotationSpeed, VF_CHEAT,
-        "Rotate camera around Z axis for debugging");
-    DefineConstIntCVar(e_CameraFreeze, 0, VF_CHEAT,
-        "Freeze 3dengine camera (good to debug object culling and LOD).\n"
-        "The view frustum is drawn in write frame.\n"
-        " 0 = off\n"
-        " 1 = activated");
-
-    REGISTER_CVAR(e_GI, 1, VF_NULL,
-        "Enable/disable global illumination. Default: 1 - enabled");
-
-    REGISTER_CVAR(e_RenderMeshCollisionTolerance, 0.3f, VF_NULL,
-        "Min distance between physics-proxy and rendermesh before collision is considered a hole");
-
-    REGISTER_CVAR(e_WorldSegmentationTest, 0, VF_CHEAT,
-        "Debug only: simulates multi-segment behavior in the editor");
-
-    DefineConstIntCVar(e_PrepareDeformableObjectsAtLoadTime, 0, VF_CHEAT,
-        "Enable to Prepare deformable objects at load time instead on demand, prevents peaks but increases memory usage");
-
-    DefineConstIntCVar(e_DeferredPhysicsEvents, 1, VF_CHEAT,
-        "Enable to Perform some physics events deferred as a task/job");
-
-    REGISTER_CVAR(e_levelStartupFrameNum, 0, VF_NULL,
-        "Set to number of frames to capture for avg fps computation");
-
-    REGISTER_CVAR(e_levelStartupFrameDelay, 0, VF_NULL,
-        "Set to number of frames to wait after level load before beginning fps measuring");
-
-    REGISTER_CVAR(e_CacheNearestCubePicking, 1, VF_NULL,
-        "Enable caching nearest cube maps probe picking for alpha blended geometry");
-
-
-    REGISTER_CVAR(e_CGFMaxFileSize, -1, VF_CHEAT,
-        "will refuse to load any cgf larger than the given filesize (in kb)\n"
-        "-1 - 1024 (<0 off (default), >0 filesize limit)");
-
-    REGISTER_CVAR(e_MaxDrawCalls, 0, VF_CHEAT,
-        "Will not render CGFs past the given amount of drawcalls\n"
-        "(<=0 off (default), >0 draw calls limit)");
-
-    REGISTER_CVAR(e_CheckOctreeObjectsBoxSize, 1, VF_NULL, "Warning for crazy sized COctreeNode m_objectsBoxes");
-    REGISTER_CVAR(e_DebugGeomPrep, 0, VF_NULL,  "enable logging of Geom preparation");
-    DefineConstIntCVar(e_GeomCaches, 1, VF_NULL, "Activates drawing of geometry caches");
-    REGISTER_CVAR(e_GeomCacheBufferSize, 128, VF_CHEAT, "Geometry cache stream buffer upper limit size in MB. Default: 128");
-    REGISTER_CVAR(e_GeomCacheMaxPlaybackFromMemorySize, 16, VF_CHEAT,
-        "Maximum size of geometry cache animated data in MB before always streaming from disk ignoring the memory playback flag. Default: 16");
-    REGISTER_CVAR(e_GeomCachePreferredDiskRequestSize, 1024, VF_CHEAT,
-        "Preferred disk request size for geometry cache streaming in KB. Default: 1024");
-    REGISTER_CVAR(e_GeomCacheMinBufferAheadTime, 2.0f, VF_CHEAT,
-        "Time in seconds minimum that data will be buffered ahead for geom cache streaming. Default: 2.0");
-    REGISTER_CVAR(e_GeomCacheMaxBufferAheadTime, 5.0f, VF_CHEAT,
-        "Time in seconds maximum that data will be buffered ahead for geom cache streaming. Default: 5.0");
-    REGISTER_CVAR(e_GeomCacheDecodeAheadTime, 0.5f, VF_CHEAT,
-        "Time in seconds that data will be decoded ahead for geom cache streaming. Default: 0.5");
-#ifndef _RELEASE
-    DefineConstIntCVar(e_GeomCacheDebug, 0, VF_CHEAT, "Show geometry cache debug overlay. Default: 0");
-    e_GeomCacheDebugFilter = REGISTER_STRING("e_GeomCacheDebugFilter", "", VF_CHEAT, "Set name filter for e_geomCacheDebug");
-    DefineConstIntCVar(e_GeomCacheDebugDrawMode, 0, VF_CHEAT, "Geometry cache debug draw mode\n"
-        " 0 = normal\n"
-        " 1 = only animated meshes\n"
-        " 2 = only static meshes\n"
-        " 3 = debug instancing");
-#endif
-    DefineConstIntCVar(e_GeomCacheLerpBetweenFrames, 1, VF_CHEAT, "Interpolate between geometry cache frames. Default: 1");
-
-    REGISTER_CVAR(e_PermanentRenderObjects, 0, VF_NULL, "Creates permanent render objects for each render node");
-    REGISTER_CVAR(e_StaticInstancing, 0, VF_NULL, "Enables instancing of static objects");
-    REGISTER_CVAR(e_StaticInstancingMinInstNum, 10, VF_NULL, "Minimum number of common static objects in a tree node before hardware instancing is used.");
-
-    DefineConstIntCVar(e_MemoryProfiling, 0, VF_DEV_ONLY, "Toggle displaying memory usage statistics");
-}
diff --git a/Code/CryEngine/Cry3DEngine/cvars.h b/Code/CryEngine/Cry3DEngine/cvars.h
deleted file mode 100644
index 359e532eb3..0000000000
--- a/Code/CryEngine/Cry3DEngine/cvars.h
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#if defined(CONSOLE_CONST_CVAR_MODE)
-# define GetFloatCVar(name) name ## Default
-#else
-# define GetFloatCVar(name) (Cry3DEngineBase::GetCVars())->name
-#endif
-
-// console variables
-struct CVars
-    : public Cry3DEngineBase
-{
-    CVars()
-    { Init(); }
-
-    void Init();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-    //default values used for const cvars
-#ifdef _RELEASE
-    enum
-    {
-        e_StatObjValidateDefault = 0
-    };                                      // Validate meshes in all but release builds.
-#else
-    enum
-    {
-        e_StatObjValidateDefault = 1
-    };                                      // Validate meshes in all but release builds.
-#endif
-#ifdef CONSOLE_CONST_CVAR_MODE
-    enum
-    {
-        e_DisplayMemoryUsageIconDefault = 0
-    };
-#else
-    enum
-    {
-        e_DisplayMemoryUsageIconDefault = 1
-    };
-#endif
-#define e_PhysOceanCellDefault (0.f)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(cvars_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    enum
-    {
-        e_DeformableObjectsDefault = 1
-    };
-    enum
-    {
-        e_OcclusionVolumesDefault = 1
-    };
-    enum
-    {
-        e_WaterOceanDefault = 1
-    };
-    enum
-    {
-        e_WaterVolumesDefault = 1
-    };
-    enum
-    {
-        e_LightVolumesDefault = 1
-    };
-#endif
-
-
-#define e_RenderTransparentUnderWaterDefault (0)
-#define e_DecalsDefferedDynamicMinSizeDefault (0.35f)
-#define e_DecalsPlacementTestAreaSizeDefault (0.08f)
-#define e_DecalsPlacementTestMinDepthDefault (0.05f)
-#define e_StreamPredictionDistanceFarDefault (16.f)
-#define e_StreamPredictionDistanceNearDefault (0.f)
-#define e_StreamCgfVisObjPriorityDefault (0.5f)
-#define e_WindBendingDistRatioDefault (0.5f)
-#define e_MaxViewDistFullDistCamHeightDefault (1000.f)
-#define e_CoverageBufferOccludersLodRatioDefault (0.25f)
-#define e_LodCompMaxSizeDefault (6.f)
-#define e_LodBoundingBoxDistanceMultiplierDefault (0.1f)
-#define e_MaxViewDistanceDefault (-1.f)
-#define e_ViewDistCompMaxSizeDefault (64.f)
-#define e_ViewDistRatioPortalsDefault (60.f)
-#define e_WindDefault (0.1f)
-#define e_ShadowsCastViewDistRatioLightsDefault (1.f)
-#define e_DecalsRangeDefault (20.f)
-#define e_GsmRangeStepExtendedDefault (8.f)
-#define e_SunAngleSnapSecDefault (0.1f)
-#define e_SunAngleSnapDotDefault (0.999999f)
-#define e_OcclusionVolumesViewDistRatioDefault (0.05f)
-#define e_JointStrengthScaleDefault (1.f)
-#define e_VolObjShadowStrengthDefault (.4f)
-#define e_CameraRotationSpeedDefault (0.f)
-#define e_DecalsDefferedDynamicDepthScaleDefault (4.0f)
-#define e_StreamCgfFastUpdateMaxDistanceDefault (16.f)
-#define e_StreamPredictionMinFarZoneDistanceDefault (16.f)
-#define e_StreamPredictionMinReportDistanceDefault (0.75f)
-#define e_StreamCgfGridUpdateDistanceDefault (0.f)
-#define e_StreamPredictionAheadDefault (0.5f)
-#define e_StreamPredictionAheadDebugDefault (0.f)
-#define e_DissolveDistMaxDefault (8.0f)
-#define e_DissolveDistMinDefault (2.0f)
-#define e_DissolveDistbandDefault (3.0f)
-#define e_RenderMeshCollisionToleranceDefault (0.3f)
-
-#if _RELEASE
-#define e_RenderDefault (1)
-#else
-#define e_RenderDefault (gEnv->IsDedicated() ? 0 : 1)
-#endif
-
-    int e_Decals;
-    int e_DecalsAllowGameDecals;
-    int e_CoverageBufferVersion;
-    DeclareConstFloatCVar(e_FoliageBrokenBranchesDamping);
-    float e_ShadowsCastViewDistRatio;
-    float e_OnDemandMaxSize;
-    float e_MaxViewDistSpecLerp;
-    float e_StreamAutoMipFactorSpeedThreshold;
-    DeclareConstFloatCVar(e_DecalsDefferedDynamicMinSize);
-    DeclareConstIntCVar(e_Objects, 1);
-    float e_ViewDistRatioCustom;
-    float e_StreamPredictionUpdateTimeSlice;
-    DeclareConstIntCVar(e_DisplayMemoryUsageIcon, e_DisplayMemoryUsageIconDefault);
-    int e_ScreenShotWidth;
-    DeclareConstIntCVar(e_CoverageBufferTolerance, 0);
-    int e_ScreenShotDebug;
-#if defined(WIN32)
-    int e_ShadowsLodBiasFixed;
-#else
-    DeclareConstIntCVar(e_ShadowsLodBiasFixed, 0);
-#endif
-    DeclareConstIntCVar(e_FogVolumes, 1);
-    int e_VolumetricFog;
-    DeclareConstIntCVar(e_FogVolumesTiledInjection, 1);
-    DeclareConstIntCVar(e_Render, e_RenderDefault);
-    int e_Tessellation;
-    float e_TessellationMaxDistance;
-    DeclareConstIntCVar(e_ShadowsTessellateCascades, 1);
-    DeclareConstIntCVar(e_ShadowsTessellateDLights, 0);
-    int e_CoverageBufferReproj;
-    int e_CoverageBufferRastPolyLimit;
-    int e_CoverageBufferShowOccluder;
-    int e_CoverageBufferNumberFramesLatency;
-    DeclareConstFloatCVar(e_ViewDistRatioPortals);
-    DeclareConstFloatCVar(e_CoverageBufferOccludersLodRatio);
-    DeclareConstIntCVar(e_ObjFastRegister, 1);
-    float e_ViewDistRatioLights;
-    DeclareConstIntCVar(e_DebugDraw, 0);
-    int e_DebugDrawLodMinTriangles; // cvar for min number of triangles in object before displaying lod warnings
-    ICVar* e_DebugDrawFilter;
-    DeclareConstIntCVar(e_DebugDrawListSize, 16);
-    DeclareConstIntCVar(e_DebugDrawListBBoxIndex, 0);
-#if !defined(_RELEASE)
-    const char* e_pStatObjRenderFilterStr;
-    int e_statObjRenderFilterMode;
-#endif
-    DeclareConstIntCVar(e_AutoPrecacheTexturesAndShaders, 0);
-    int e_StreamPredictionMaxVisAreaRecursion;
-    float e_StreamPredictionBoxRadius;
-    int e_Clouds;
-    int e_DecalsMaxTrisInObject;
-    DeclareConstFloatCVar(e_OcclusionVolumesViewDistRatio);
-    DeclareConstFloatCVar(e_SunAngleSnapDot);
-    DeclareConstIntCVar(e_PreloadDecals, 1);
-    int e_WorldSegmentationTest;
-    float e_DecalsLifeTimeScale;
-    int e_DecalsForceDeferred;
-    DeclareConstIntCVar(e_CoverageBufferDebugFreeze, 0);
-    int e_PhysProxyTriLimit;
-    float e_FoliageWindActivationDist;
-    ICVar* e_SQTestTextureName;
-    int e_ShadowsClouds;
-    int e_levelStartupFrameDelay;
-    float e_SkyUpdateRate;
-    float e_RecursionViewDistRatio;
-    DeclareConstIntCVar(e_StreamCgfDebugMinObjSize, 100);
-    int e_CullVegActivation;
-    int e_StreamPredictionTexelDensity;
-    int e_StreamPredictionAlwaysIncludeOutside;
-    DeclareConstIntCVar(e_DynamicLights, 1);
-    int e_DynamicLightsFrameIdVisTest;
-    DeclareConstIntCVar(e_ShadowsLodBiasInvis, 0);
-    float e_CoverageBufferBias;
-    int e_DynamicLightsMaxEntityLights;
-    int e_SQTestMoveSpeed;
-    float e_StreamAutoMipFactorMax;
-    int e_CoverageBufferAccurateOBBTest;
-    int e_ObjQuality;
-    int e_LightQuality;
-    int e_RNTmpDataPoolMaxFrames;
-    DeclareConstIntCVar(e_DynamicLightsMaxCount, 512);
-    int e_StreamCgfPoolSize;
-    DeclareConstIntCVar(e_StatObjPreload, 1);
-    DeclareConstIntCVar(e_ShadowsDebug, 0);
-    DeclareConstIntCVar(e_ShadowsCascadesDebug, 0);
-    DeclareConstFloatCVar(e_StreamPredictionDistanceNear);
-    float e_CoverageBufferDebugDrawScale;
-    DeclareConstIntCVar(e_GsmStats, 0);
-    DeclareConstIntCVar(e_DynamicLightsForceDeferred, 1);
-    DeclareConstIntCVar(e_Fog, 1);
-    float e_TimeOfDay;
-    DeclareConstIntCVar(e_SkyBox, 1);
-    float e_CoverageBufferAABBExpand;
-    int e_CoverageBufferEarlyOut;
-    float e_CoverageBufferEarlyOutDelay;
-    int e_Dissolve;
-    int e_StatObjBufferRenderTasks;
-    DeclareConstIntCVar(e_StreamCgfUpdatePerNodeDistance, 1);
-    DeclareConstFloatCVar(e_DecalsDefferedDynamicDepthScale);
-    DeclareConstIntCVar(e_LightVolumes, e_LightVolumesDefault);
-    DeclareConstIntCVar(e_LightVolumesDebug, 0);
-    DeclareConstIntCVar(e_Portals, 1);
-    DeclareConstIntCVar(e_PortalsBlend, 1);
-    int e_PortalsMaxRecursion;
-    float e_StreamAutoMipFactorMaxDVD;
-    DeclareConstIntCVar(e_CameraFreeze, 0);
-    DeclareConstFloatCVar(e_StreamPredictionAhead);
-    DeclareConstFloatCVar(e_FoliageBranchesStiffness);
-    DeclareConstFloatCVar(e_StreamPredictionMinFarZoneDistance);
-    int e_StreamCgf;
-    int e_CheckOcclusion;
-    int e_CheckOcclusionQueueSize;
-    int e_CheckOcclusionOutputQueueSize;
-    DeclareConstIntCVar(e_WaterVolumes, e_WaterVolumesDefault);
-    DeclareConstIntCVar(e_RenderTransparentUnderWater, e_RenderTransparentUnderWaterDefault);
-    float e_ScreenShotMapCamHeight;
-    DeclareConstIntCVar(e_CoverageBufferOccludersTestMinTrisNum, 0);
-    DeclareConstIntCVar(e_DeformableObjects, e_DeformableObjectsDefault);
-
-    DeclareConstFloatCVar(e_StreamCgfFastUpdateMaxDistance);
-    DeclareConstIntCVar(e_DecalsClip, 1);
-    ICVar* e_ScreenShotFileFormat;
-    ICVar* e_ScreenShotFileName;
-    int e_CharLodMin;
-    float e_PhysOceanCell;
-    DeclareConstIntCVar(e_WindAreas, 1);
-    DeclareConstFloatCVar(e_WindBendingDistRatio);
-    float e_SQTestDelay;
-    int e_PhysMinCellSize;
-    DeclareConstIntCVar(e_PhysEntityGridSizeDefault, 4096);
-    int e_StreamCgfMaxTasksInProgress;
-    int e_StreamCgfMaxNewTasksPerUpdate;
-    int e_CoverageBufferResolution;
-    DeclareConstFloatCVar(e_DecalsPlacementTestAreaSize);
-    DeclareConstFloatCVar(e_DecalsPlacementTestMinDepth);
-    DeclareConstFloatCVar(e_CameraRotationSpeed);
-    float e_ScreenShotMapSizeY;
-    int e_GI;
-    DeclareConstIntCVar(e_CoverageBufferLightsDebugSide, -1);
-    DeclareConstIntCVar(e_PortalsBigEntitiesFix, 1);
-    int e_SQTestBegin;
-    ICVar* e_CameraGoto;
-
-    DeclareConstFloatCVar(e_StreamPredictionMinReportDistance);
-    int e_WaterTessellationSwathWidth;
-    DeclareConstIntCVar(e_RecursionOcclusionCulling, 0);
-    DeclareConstIntCVar(e_StreamSaveStartupResultsIntoXML, 0);
-    DeclareConstIntCVar(e_PhysFoliage, 2);
-    DeclareConstIntCVar(e_RenderMeshUpdateAsync, 1);
-    DeclareConstIntCVar(e_CoverageBufferTreeDebug, 0);
-    float e_CoverageBufferOccludersViewDistRatio;
-    int e_DecalsDefferedDynamic;
-    DeclareConstIntCVar(e_DefaultMaterial, 0);
-    int e_ShadowsOcclusionCulling;
-    int e_LodMin;
-    DeclareConstIntCVar(e_PreloadMaterials, 1);
-    DeclareConstIntCVar(e_ObjStats, 0);
-    DeclareConstIntCVar(e_ShadowsFrustums, 0);
-    DeclareConstIntCVar(e_OcclusionVolumes, e_OcclusionVolumesDefault);
-    int e_DecalsDefferedStatic;
-    DeclareConstIntCVar(e_Roads, 1);
-    DeclareConstIntCVar(e_DebugDrawShowOnlyCompound, 0);
-    DeclareConstIntCVar(e_StatObjMergeUseThread, 1);
-    DeclareConstFloatCVar(e_SunAngleSnapSec);
-    float e_GsmRangeStep;
-    float e_LodRatio;
-    float e_LodFaceAreaTargetSize;
-    DeclareConstIntCVar(e_CoverageBufferDrawOccluders, 0);
-    DeclareConstIntCVar(e_ObjectsTreeBBoxes, 0);
-    DeclareConstIntCVar(e_PrepareDeformableObjectsAtLoadTime, 0);
-    DeclareConstIntCVar(e_3dEngineTempPoolSize, 1024);
-    DeclareConstFloatCVar(e_MaxViewDistFullDistCamHeight);
-    DeclareConstIntCVar(e_VegetationBending, 1);
-    DeclareConstFloatCVar(e_StreamPredictionAheadDebug);
-    float e_ShadowsSlopeBias;
-    float e_ShadowsSlopeBiasHQ;
-    DeclareConstIntCVar(e_GsmDepthBoundsDebug, 0);
-    DeclareConstIntCVar(e_TimeOfDayDebug, 0);
-    int e_WaterTessellationAmount;  // being deprecated by Water gem
-    int e_Entities;
-    int e_CoverageBuffer;
-    int e_FogVolumeShadingQuality;
-    int e_ScreenShotQuality;
-    int e_levelStartupFrameNum;
-    DeclareConstIntCVar(e_DecalsPreCreate, 1);
-    int e_SQTestCount;
-    float e_GsmRange;
-    int e_ScreenShotMapOrientation;
-    int e_ScreenShotHeight;
-    int e_WaterOceanFFT;
-    DeclareConstFloatCVar(e_MaxViewDistance);
-    DeclareConstIntCVar(e_AutoPrecacheCameraJumpDist, 16);
-    DeclareConstIntCVar(e_LodsForceUse, 1);
-    DeclareConstIntCVar(e_ForceDetailLevelForScreenRes, 0);
-    DeclareConstIntCVar(e_3dEngineLogAlways, 0);
-    DeclareConstIntCVar(e_DecalsHitCache, 1);
-    DeclareConstIntCVar(e_BBoxes, 0);
-    float e_TimeOfDaySpeed;
-    int e_LodMax;
-    int e_LodForceUpdate;
-    DeclareConstFloatCVar(e_ViewDistCompMaxSize);
-    float e_ShadowsAdaptScale;
-    float e_ScreenShotMapSizeX;
-    float e_OcclusionCullingViewDistRatio;
-    DeclareConstIntCVar(e_WaterOceanBottom, 1);
-    DeclareConstIntCVar(e_WaterRipplesDebug, 0);
-    int e_OnDemandPhysics;
-    float e_ShadowsResScale;
-    DeclareConstIntCVar(e_Recursion, 1);
-    DeclareConstIntCVar(e_CoverageBufferMaxAddRenderMeshTime, 2);
-    int e_CoverageBufferRotationSafeCheck;
-    DeclareConstIntCVar(e_StatObjTestOBB, 0);
-    DeclareConstIntCVar(e_StatObjValidate, e_StatObjValidateDefault);
-    DeclareConstIntCVar(e_DecalsMaxValidFrames, 600);
-    DeclareConstIntCVar(e_DecalsMerge, 0);
-    int e_SQTestDistance;
-    float e_ViewDistMin;
-    float e_StreamAutoMipFactorMin;
-    DeclareConstIntCVar(e_LodMinTtris, 300);
-    DeclareConstIntCVar(e_SkyQuality, 1);
-    DeclareConstIntCVar(e_ScissorDebug, 0);
-    DeclareConstIntCVar(e_StatObjMergeMaxTrisPerDrawCall, 500);
-    DeclareConstIntCVar(e_DynamicLightsConsistentSortOrder, 1);
-    DeclareConstIntCVar(e_StreamCgfDebug, 0);
-    float e_TerrainOcclusionCullingMaxDist;
-    float e_StatObjTessellationMaxEdgeLenght;
-    int e_StatObjTessellationMode;
-    DeclareConstIntCVar(e_OcclusionLazyHideFrames, 0);
-    float e_RenderMeshCollisionTolerance;
-    DeclareConstIntCVar(e_ShadowsMasksLimit, 0);
-    int e_ShadowsCache;
-    int e_ShadowsCacheUpdate;
-    int e_ShadowsCacheObjectLod;
-    int e_ShadowsCacheRenderCharacters;
-    int e_ShadowsCacheRequireManualUpdate;
-    int e_ShadowsPerObject;
-    int e_DynamicDistanceShadows;
-    float e_ShadowsPerObjectResolutionScale;
-    int e_ObjShadowCastSpec;
-    DeclareConstFloatCVar(e_JointStrengthScale);
-    int e_AutoPrecacheCgfMaxTasks;
-    float e_DecalsNeighborMaxLifeTime;
-    DeclareConstFloatCVar(e_StreamCgfVisObjPriority);
-    int e_ObjectLayersActivation;
-    DeclareConstFloatCVar(e_DissolveDistMax);
-    DeclareConstFloatCVar(e_DissolveDistMin);
-    DeclareConstFloatCVar(e_DissolveDistband);
-    int e_ScreenShotMinSlices;
-    int e_DecalsMaxUpdatesPerFrame;
-    DeclareConstIntCVar(e_SkyType, 1);
-    int e_GsmLodsNum;
-    DeclareConstIntCVar(e_AutoPrecacheCgf, 1);
-    DeclareConstIntCVar(e_HwOcclusionCullingWater, 1);
-    DeclareConstIntCVar(e_CoverageBufferTestMode, 2);
-    DeclareConstIntCVar(e_DeferredPhysicsEvents, 1);
-    DeclareConstFloatCVar(e_ShadowsCastViewDistRatioLights);
-    int e_ShadowsUpdateViewDistRatio;
-    DeclareConstIntCVar(e_Lods, 1);
-    DeclareConstIntCVar(e_LodFaceArea, 1);
-    DeclareConstFloatCVar(e_LodBoundingBoxDistanceMultiplier);
-    float e_ShadowsConstBias;
-    float e_ShadowsConstBiasHQ;
-    int e_ShadowsClearShowMaskAtLoad;
-    DeclareConstIntCVar(e_Ropes, 1);
-    int e_ShadowsPoolSize;
-    int e_ShadowsMaxTexRes;
-    int e_Sun;
-    DeclareConstFloatCVar(e_DecalsRange);
-    float e_ScreenShotMapCenterY;
-    int e_CacheNearestCubePicking;
-    DeclareConstIntCVar(e_CoverCgfDebug, 0);
-    DeclareConstFloatCVar(e_StreamCgfGridUpdateDistance);
-    DeclareConstFloatCVar(e_LodCompMaxSize);
-    float e_ViewDistRatioDetail;
-    DeclareConstIntCVar(e_Sleep, 0);
-    DeclareConstIntCVar(e_Wind, 1);
-    int e_SQTestMip;
-    int e_Shadows;
-    int e_ShadowsBlendCascades;
-    float e_ShadowsBlendCascadesVal;
-    DeclareConstIntCVar(e_DebugDrawShowOnlyLod, -1);
-    int e_ScreenShot;
-    DeclareConstIntCVar(e_PrecacheLevel, 0);
-    float e_ScreenShotMapCenterX;
-    DeclareConstIntCVar(e_CoverageBufferDebug, 0);
-    DeclareConstIntCVar(e_StatObjMerge, 1);
-    DeclareConstIntCVar(e_StatObjStoreMesh, 0);
-    ICVar* e_StreamCgfDebugFilter;
-    int e_ShadowsOnAlphaBlend;
-    DeclareConstFloatCVar(e_VolObjShadowStrength);
-    DeclareConstIntCVar(e_WaterOcean, e_WaterOceanDefault);
-    float e_ViewDistRatio;
-    DeclareConstIntCVar(e_ObjectLayersActivationPhysics, 1);
-    DeclareConstIntCVar(e_StreamCgfDebugHeatMap, 0);
-    DeclareConstFloatCVar(e_StreamPredictionDistanceFar);
-    int e_SQTestExitOnFinish;
-    int e_DecalsOverlapping;
-    int e_CGFMaxFileSize;
-    int e_MaxDrawCalls;
-#if !defined(_RELEASE)
-#endif
-
-    int e_DebugGeomPrep;
-
-    int e_CheckOctreeObjectsBoxSize;
-    DeclareConstIntCVar(e_GeomCaches, 1);
-    int e_GeomCacheBufferSize;
-    int e_GeomCacheMaxPlaybackFromMemorySize;
-    int e_GeomCachePreferredDiskRequestSize;
-    float e_GeomCacheMinBufferAheadTime;
-    float e_GeomCacheMaxBufferAheadTime;
-    float e_GeomCacheDecodeAheadTime;
-    DeclareConstIntCVar(e_GeomCacheDebug, 0);
-    ICVar* e_GeomCacheDebugFilter;
-    DeclareConstIntCVar(e_GeomCacheDebugDrawMode, 0);
-    DeclareConstIntCVar(e_GeomCacheLerpBetweenFrames, 1);
-
-    int e_PermanentRenderObjects;
-    int e_StaticInstancing;
-    int e_StaticInstancingMinInstNum;
-
-    DeclareConstIntCVar(e_MemoryProfiling, 0);
-
-
-};
diff --git a/Code/CryEngine/Cry3DEngine/resource.h b/Code/CryEngine/Cry3DEngine/resource.h
deleted file mode 100644
index c5ff972593..0000000000
--- a/Code/CryEngine/Cry3DEngine/resource.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by Cry3DEngine.rc
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Code/CryEngine/CryCommon/CREGeomCache.h b/Code/CryEngine/CryCommon/CREGeomCache.h
index 089915988e..6911b8486e 100644
--- a/Code/CryEngine/CryCommon/CREGeomCache.h
+++ b/Code/CryEngine/CryCommon/CREGeomCache.h
@@ -19,7 +19,7 @@
 
 #if defined(USE_GEOM_CACHES)
 
-#include "../RenderDll/Common/Shaders/Vertex.h"
+#include <Vertex.h>
 #include <CryCommon/StaticInstance.h>
 
 class CREGeomCache
diff --git a/Code/CryEngine/CryCommon/CRESky.h b/Code/CryEngine/CryCommon/CRESky.h
index e1ef7bcaa8..3dfc7d184f 100644
--- a/Code/CryEngine/CryCommon/CRESky.h
+++ b/Code/CryEngine/CryCommon/CRESky.h
@@ -17,7 +17,7 @@
 //=============================================================
 
 #include "VertexFormats.h"
-#include "../RenderDll/Common/Shaders/Vertex.h"
+#include <Vertex.h>
 
 struct SSkyLightRenderParams;
 
diff --git a/Code/CryEngine/CryCommon/CREVolumeObject.h b/Code/CryEngine/CryCommon/CREVolumeObject.h
index d84c7b3e50..2137053a8e 100644
--- a/Code/CryEngine/CryCommon/CREVolumeObject.h
+++ b/Code/CryEngine/CryCommon/CREVolumeObject.h
@@ -55,7 +55,7 @@ public:
     Matrix34 m_matInv;
     Vec3 m_eyePosInWS;
     Vec3 m_eyePosInOS;
-    Plane m_volumeTraceStartPlane;
+    Plane_tpl<f32> m_volumeTraceStartPlane;
     AABB m_renderBoundsOS;
     bool m_viewerInsideVolume;
     bool m_nearPlaneIntersectsVolume;
diff --git a/Code/CryEngine/CryCommon/CREWaterOcean.h b/Code/CryEngine/CryCommon/CREWaterOcean.h
index 784588309f..e8ca310d41 100644
--- a/Code/CryEngine/CryCommon/CREWaterOcean.h
+++ b/Code/CryEngine/CryCommon/CREWaterOcean.h
@@ -25,7 +25,7 @@ public:
 
     virtual void mfPrepare(bool bCheckOverflow);
     virtual bool mfDraw(CShader* ef, SShaderPass* sfm);
-    virtual void mfGetPlane(Plane& pl);
+    virtual void mfGetPlane(Plane_tpl<f32>& pl);
 
     virtual void Create(uint32 nVerticesCount, SVF_P3F_C4B_T2F* pVertices, uint32 nIndicesCount, const void* pIndices, uint32 nIndexSizeof);
     void ReleaseOcean();
diff --git a/Code/CryEngine/CryCommon/CREWaterVolume.h b/Code/CryEngine/CryCommon/CREWaterVolume.h
index 3e7a0636e6..89102e3097 100644
--- a/Code/CryEngine/CryCommon/CREWaterVolume.h
+++ b/Code/CryEngine/CryCommon/CREWaterVolume.h
@@ -27,7 +27,7 @@ public:
     virtual ~CREWaterVolume();
     virtual void mfPrepare(bool bCheckOverflow);
     virtual bool mfDraw(CShader* ef, SShaderPass* sfm);
-    virtual void mfGetPlane(Plane& pl);
+    virtual void mfGetPlane(Plane_tpl<f32>& pl);
     virtual void mfCenter(Vec3& vCenter, CRenderObject* pObj);
 
     virtual void GetMemoryUsage(ICrySizer* pSizer) const
@@ -69,7 +69,7 @@ public:
         Vec3 m_center;
         AABB m_WSBBox;
 
-        Plane m_fogPlane;
+        Plane_tpl<f32> m_fogPlane;
         float m_fogDensity;
         Vec3 m_fogColor;
         bool m_fogColorAffectedBySun;
diff --git a/Code/CryEngine/CryCommon/CryFontBus.h b/Code/CryEngine/CryCommon/CryFontBus.h
deleted file mode 100644
index 9922193f42..0000000000
--- a/Code/CryEngine/CryCommon/CryFontBus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-#include <CryCommon/ISystem.h>
-
-namespace AZ
-{
-    /*!
-     * Signal LY to create an ICryFont
-     */
-    class CryFontCreationRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        using MutexType = AZStd::recursive_mutex;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-        virtual bool CreateCryFont([[maybe_unused]] SSystemGlobalEnvironment& env, [[maybe_unused]] const SSystemInitParams& initParams) {return false;} //! return false to fall back to default CryFont initialization
-    };
-    using CryFontCreationRequestBus = AZ::EBus<CryFontCreationRequests>;
-
-}
diff --git a/Code/CryEngine/CryCommon/Cry_Camera.h b/Code/CryEngine/CryCommon/Cry_Camera.h
index a744d7335f..56a764d897 100644
--- a/Code/CryEngine/CryCommon/Cry_Camera.h
+++ b/Code/CryEngine/CryCommon/Cry_Camera.h
@@ -594,7 +594,7 @@ public:
     ILINE const Vec3& GetFPVertex(int nId) const; //get far-plane vertices
     ILINE const Vec3& GetPPVertex(int nId) const; //get projection-plane vertices
 
-    ILINE const Plane* GetFrustumPlane(int numplane)    const       { return &m_fp[numplane]; }
+    ILINE const Plane_tpl<f32>* GetFrustumPlane(int numplane)    const       { return &m_fp[numplane]; }
 
     //////////////////////////////////////////////////////////////////////////
     // Z-Buffer ranges.
@@ -720,7 +720,7 @@ private:
     Vec3    m_cltn, m_crtn, m_clbn, m_crbn;        //this are the 4 vertices of the near-plane in cam-space
     Vec3    m_cltf, m_crtf, m_clbf, m_crbf;        //this are the 4 vertices of the farclip-plane in cam-space
 
-    Plane   m_fp [FRUSTUM_PLANES]; //
+    Plane_tpl<f32>   m_fp [FRUSTUM_PLANES]; //
     uint32  m_idx1[FRUSTUM_PLANES], m_idy1[FRUSTUM_PLANES], m_idz1[FRUSTUM_PLANES]; //
     uint32  m_idx2[FRUSTUM_PLANES], m_idy2[FRUSTUM_PLANES], m_idz2[FRUSTUM_PLANES]; //
 
@@ -742,7 +742,7 @@ public:
         m_crtp = arrvVerts[2];
         m_crbp = arrvVerts[3];
     }
-    inline void SetFrustumPlane(int i, const Plane& plane)
+    inline void SetFrustumPlane(int i, const Plane_tpl<f32>& plane)
     {
         m_fp[i] = plane;
         //do not break strict aliasing rules, use union instead of reinterpret_casts
@@ -1180,12 +1180,12 @@ inline void CCamera::UpdateFrustum()
     //-------------------------------------------------------------------------------
     //---  calculate the six frustum-planes using the frustum edges in world-space ---
     //-------------------------------------------------------------------------------
-    m_fp[FR_PLANE_NEAR  ]   =   Plane::CreatePlane(m_crtn + GetPosition(), m_cltn + GetPosition(), m_crbn + GetPosition());
-    m_fp[FR_PLANE_RIGHT ]   =   Plane::CreatePlane(m_crbf + GetPosition(), m_crtf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_LEFT  ]   =   Plane::CreatePlane(m_cltf + GetPosition(), m_clbf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_TOP   ]   =   Plane::CreatePlane(m_crtf + GetPosition(), m_cltf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_BOTTOM]   =   Plane::CreatePlane(m_clbf + GetPosition(), m_crbf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_FAR   ]   =   Plane::CreatePlane(m_crtf + GetPosition(), m_crbf + GetPosition(), m_cltf + GetPosition());  //clip-plane
+    m_fp[FR_PLANE_NEAR  ]   = Plane_tpl<f32>::CreatePlane(m_crtn + GetPosition(), m_cltn + GetPosition(), m_crbn + GetPosition());
+    m_fp[FR_PLANE_RIGHT ]   = Plane_tpl<f32>::CreatePlane(m_crbf + GetPosition(), m_crtf + GetPosition(), GetPosition());
+    m_fp[FR_PLANE_LEFT  ]   = Plane_tpl<f32>::CreatePlane(m_cltf + GetPosition(), m_clbf + GetPosition(), GetPosition());
+    m_fp[FR_PLANE_TOP   ]   = Plane_tpl<f32>::CreatePlane(m_crtf + GetPosition(), m_cltf + GetPosition(), GetPosition());
+    m_fp[FR_PLANE_BOTTOM]   = Plane_tpl<f32>::CreatePlane(m_clbf + GetPosition(), m_crbf + GetPosition(), GetPosition());
+    m_fp[FR_PLANE_FAR   ]   = Plane_tpl<f32>::CreatePlane(m_crtf + GetPosition(), m_crbf + GetPosition(), m_cltf + GetPosition());  //clip-plane
 
     uint32 rh = m_Matrix.IsOrthonormalRH();
     if (rh == 0)
diff --git a/Code/CryEngine/CryCommon/Cry_GeoDistance.h b/Code/CryEngine/CryCommon/Cry_GeoDistance.h
index 92c1f65d87..47794c7671 100644
--- a/Code/CryEngine/CryCommon/Cry_GeoDistance.h
+++ b/Code/CryEngine/CryCommon/Cry_GeoDistance.h
@@ -1168,17 +1168,6 @@ namespace Distance {
         return fDist2;
     }
 
-    // Compute both the min and max distances of a box to a plane, in the sense of the plane normal.
-    inline void AABB_Plane(float* pfDistMin, float* pfDistMax, const AABB& box, const Plane& pl)
-    {
-        float fDist0 = pl.DistFromPlane(box.min),
-              fDistX = (box.max.x - box.min.x) * pl.n.x,
-              fDistY = (box.max.y - box.min.y) * pl.n.y,
-              fDistZ = (box.max.z - box.min.z) * pl.n.z;
-        *pfDistMin = fDist0 + min(fDistX, 0.f) + min(fDistY, 0.f) + min(fDistZ, 0.f);
-        *pfDistMax = fDist0 + max(fDistX, 0.f) + max(fDistY, 0.f) + max(fDistZ, 0.f);
-    }
-
     //----------------------------------------------------------------------------------
     // Distance: Sphere_Triangle
     //----------------------------------------------------------------------------------
diff --git a/Code/CryEngine/CryCommon/Cry_GeoIntersect.h b/Code/CryEngine/CryCommon/Cry_GeoIntersect.h
index c2f556c4b7..89f6d8ebaf 100644
--- a/Code/CryEngine/CryCommon/Cry_GeoIntersect.h
+++ b/Code/CryEngine/CryCommon/Cry_GeoIntersect.h
@@ -22,7 +22,7 @@
 #include <Cry_Geo.h>
 
 namespace Intersect {
-    inline bool Ray_Plane(const Ray& ray, const Plane& plane, Vec3& output, bool bSingleSidePlane = true)
+    inline bool Ray_Plane(const Ray& ray, const Plane_tpl<f32>& plane, Vec3& output, bool bSingleSidePlane = true)
     {
         float cosine    =   plane.n | ray.direction;
 
@@ -49,7 +49,7 @@ namespace Intersect {
         return true;        //intersection occurred
     }
 
-    inline bool Line_Plane(const Line& line, const Plane& plane, Vec3& output, bool bSingleSidePlane = true)
+    inline bool Line_Plane(const Line& line, const Plane_tpl<f32>& plane, Vec3& output, bool bSingleSidePlane = true)
     {
         float cosine        =   plane.n | line.direction;
 
diff --git a/Code/CryEngine/CryCommon/Cry_GeoOverlap.h b/Code/CryEngine/CryCommon/Cry_GeoOverlap.h
index 3f2c7081d7..ab560b7518 100644
--- a/Code/CryEngine/CryCommon/Cry_GeoOverlap.h
+++ b/Code/CryEngine/CryCommon/Cry_GeoOverlap.h
@@ -945,29 +945,6 @@ namespace Overlap {
         }
     }
 
-
-    /*!
-    *
-    * we use the SEPARATING-AXIS-TEST for OBB/Plane overlap.
-    *
-    * Example:
-    *  bool result=Overlap::OBB_Plane( pos,obb, plane );
-    *
-    */
-    inline bool OBB_Plane(const Vec3& pos, const OBB& obb, const Plane& plane)
-    {
-        //the new center-position in world-space
-        Vec3 p  =   obb.m33 * obb.c + pos;
-        //extract the orientation-vectors from the columns of the 3x3 matrix
-        //and scale them by the half-lengths
-        Vec3 ax = Vec3(obb.m33.m00, obb.m33.m10, obb.m33.m20) * obb.h.x;
-        Vec3 ay = Vec3(obb.m33.m01, obb.m33.m11, obb.m33.m21) * obb.h.y;
-        Vec3 az = Vec3(obb.m33.m02, obb.m33.m12, obb.m33.m22) * obb.h.z;
-        //check OBB against Plane, using the plane-normal as separating axis
-        return fabsf(plane | p) < (fabsf(plane.n | ax) + fabsf(plane.n | ay) + fabsf(plane.n | az));
-    }
-
-
     /*!
     *
     * we use the SEPARATING AXIS TEST to check if a triangle and AABB overlap.
@@ -1214,7 +1191,7 @@ namespace Overlap {
 
         //test if the box intersects the plane of the triangle
         //compute plane equation of triangle: normal*x+d=0
-        Plane plane = Plane::CreatePlane((e0 % e1), v0);
+        Plane_tpl<f32> plane = Plane_tpl<f32>::CreatePlane((e0 % e1), v0);
 
         Vec3 vmin, vmax;
         if (plane.n.x > 0.0f)
@@ -1505,7 +1482,7 @@ namespace Overlap {
 
         //test if the box overlaps the plane of the triangle
         //compute plane equation of triangle: normal*x+d=0
-        Plane plane = Plane::CreatePlane((e0 % e1), v0);
+        Plane_tpl<f32> plane = Plane_tpl<f32>::CreatePlane((e0 % e1), v0);
 
         Vec3 vmin, vmax;
         if (plane.n.x > 0.0f)
diff --git a/Code/CryEngine/CryCommon/I3DEngine.h b/Code/CryEngine/CryCommon/I3DEngine.h
index 8d3801ecb4..883b0a6d3b 100644
--- a/Code/CryEngine/CryCommon/I3DEngine.h
+++ b/Code/CryEngine/CryCommon/I3DEngine.h
@@ -458,7 +458,7 @@ struct SClipVolumeBlendInfo
 {
     static const int BlendPlaneCount = 2;
 
-    Plane blendPlanes[BlendPlaneCount];
+    Plane_tpl<f32> blendPlanes[BlendPlaneCount];
     struct IClipVolume* blendVolumes[BlendPlaneCount];
 };
 
diff --git a/Code/CryEngine/CryCommon/IEntityRenderState.h b/Code/CryEngine/CryCommon/IEntityRenderState.h
index 912f4632ab..92ff354eff 100644
--- a/Code/CryEngine/CryCommon/IEntityRenderState.h
+++ b/Code/CryEngine/CryCommon/IEntityRenderState.h
@@ -731,8 +731,8 @@ struct IWaterVolumeRenderNode
     virtual void SetAuxPhysParams(pe_params_area*) = 0;
 
     virtual void CreateOcean(uint64 volumeID, /* TBD */ bool keepSerializationParams = false) = 0;
-    virtual void CreateArea(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale, const Plane& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
-    virtual void CreateRiver(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale, const Plane& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
+    virtual void CreateArea(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale, const Plane_tpl<f32>& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
+    virtual void CreateRiver(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale, const Plane_tpl<f32>& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
     virtual void CreateRiver(uint64 volumeID, const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, float uTexCoordBegin, float uTexCoordEnd, const AZ::Vector2& surfUVScale, const AZ::Plane& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
 
     virtual void SetAreaPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams = false) = 0;
diff --git a/Code/CryEngine/CryCommon/IIndexedMesh.h b/Code/CryEngine/CryCommon/IIndexedMesh.h
index 9d0d77ffc8..d7ba19ae6c 100644
--- a/Code/CryEngine/CryCommon/IIndexedMesh.h
+++ b/Code/CryEngine/CryCommon/IIndexedMesh.h
@@ -22,7 +22,7 @@
 #include <CrySizer.h>
 #include <Cry_Geo.h>    // for AABB
 #include <VertexFormats.h>
-#include <../RenderDll/Common/Shaders/Vertex.h>
+#include <Vertex.h>
 #include <AzCore/Casting/numeric_cast.h>
 
 // Description:
diff --git a/Code/CryEngine/CryCommon/IShader.h b/Code/CryEngine/CryCommon/IShader.h
index d284394904..7fcbdefebb 100644
--- a/Code/CryEngine/CryCommon/IShader.h
+++ b/Code/CryEngine/CryCommon/IShader.h
@@ -26,7 +26,7 @@
 #include "smartptr.h"
 #include <IFlares.h> // <> required for Interfuscator
 #include "VertexFormats.h"
-#include <RenderDll/Common/Shaders/Vertex.h>
+#include <Vertex.h>
 #include <AzCore/Casting/numeric_cast.h>
 #include <AzCore/std/containers/map.h>
 
@@ -52,7 +52,6 @@ struct SShaderItem;
 class ITexture;
 struct IMaterial;
 struct SParam;
-class CMaterial;
 struct SShaderSerializeContext;
 struct IAnimNode;
 struct SSkinningData;
diff --git a/Code/CryEngine/CryCommon/RendElement.h b/Code/CryEngine/CryCommon/RendElement.h
index c3dc1c080d..41bcf2bf67 100644
--- a/Code/CryEngine/CryCommon/RendElement.h
+++ b/Code/CryEngine/CryCommon/RendElement.h
@@ -119,7 +119,7 @@ struct IRenderElement
     virtual void mfCenter(Vec3& centr, CRenderObject* pObj) = 0;
     virtual void mfGetBBox(Vec3& vMins, Vec3& vMaxs) = 0;
     virtual void mfReset() = 0;
-    virtual void mfGetPlane(Plane& pl) = 0;
+    virtual void mfGetPlane(Plane_tpl<f32>& pl) = 0;
     virtual void mfExport(struct SShaderSerializeContext& SC) = 0;
     virtual void mfImport(struct SShaderSerializeContext& SC, uint32& offset) = 0;
     virtual void mfPrecache(const SShaderItem& SH) = 0;
@@ -265,7 +265,7 @@ public:
     void mfPrecache([[maybe_unused]] const SShaderItem& SH) override {}
     void mfExport([[maybe_unused]] struct SShaderSerializeContext& SC) override { CryFatalError("mfExport has not been implemented for this render element type"); }
     void mfImport([[maybe_unused]] struct SShaderSerializeContext& SC, [[maybe_unused]] uint32& offset) override { CryFatalError("mfImport has not been implemented for this render element type"); }
-    void mfGetPlane(Plane& pl) override;
+    void mfGetPlane(Plane_tpl<f32>& pl) override;
     void* mfGetPointer([[maybe_unused]] ESrcPointer ePT, [[maybe_unused]] int* Stride, [[maybe_unused]] EParamType Type, [[maybe_unused]] ESrcPointer Dst, [[maybe_unused]] int Flags) override { return nullptr; }
     
     uint16 mfGetFlags()  override { return m_Flags; }
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/Vertex.h b/Code/CryEngine/CryCommon/Vertex.h
similarity index 100%
rename from Code/CryEngine/RenderDll/Common/Shaders/Vertex.h
rename to Code/CryEngine/CryCommon/Vertex.h
diff --git a/Code/CryEngine/CryFont/CMakeLists.txt b/Code/CryEngine/CryFont/CMakeLists.txt
deleted file mode 100644
index 9e2f29f7b6..0000000000
--- a/Code/CryEngine/CryFont/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_target(
-    NAME CryFont ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-    NAMESPACE Legacy
-    FILES_CMAKE
-        cryfont_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::freetype
-            Legacy::CryCommon
-)
diff --git a/Code/CryEngine/CryFont/CryFont.cpp b/Code/CryEngine/CryFont/CryFont.cpp
deleted file mode 100644
index ab39a0fa4d..0000000000
--- a/Code/CryEngine/CryFont/CryFont.cpp
+++ /dev/null
@@ -1,845 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : CCryFont class.
-
-
-#include "CryFont_precompiled.h"
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include "CryFont.h"
-#include "CryPath.h"
-#include "FFont.h"
-#include "FontTexture.h"
-#include "FontRenderer.h"
-#include "ILocalizationManager.h"
-
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/Archive/IArchive.h>
-
-// Static member definitions
-const Vec2i CCryFont::defaultGlyphSize = Vec2i(ICryFont::defaultGlyphSizeX, ICryFont::defaultGlyphSizeY);
-
-#if !defined(_RELEASE)
-static void DumpFontTexture(IConsoleCmdArgs* pArgs)
-{
-    if (pArgs->GetArgCount() != 2)
-    {
-        return;
-    }
-
-    const char* pFontName = pArgs->GetArg(1);
-
-    if (pFontName && *pFontName && *pFontName != '0')
-    {
-        string fontFile("@devroot@/");
-        fontFile += pFontName;
-        fontFile += ".bmp";
-
-        CFFont* pFont = (CFFont*) gEnv->pCryFont->GetFont(pFontName);
-        if (pFont)
-        {
-            pFont->GetFontTexture()->WriteToFile(fontFile.c_str());
-            gEnv->pLog->LogWithType(IMiniLog::eInputResponse, "Dumped \"%s\" texture to \"%s\"!", pFontName, fontFile.c_str());
-        }
-    }
-}
-
-static void DumpFontNames([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-    string names = gEnv->pCryFont->GetLoadedFontNames();
-    gEnv->pLog->LogWithType(IMiniLog::eInputResponse, "Currently loaded fonts: %s", names.c_str());
-}
-
-static void ReloadFonts([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-    gEnv->pCryFont->ReloadAllFonts();
-}
-#endif
-
-namespace
-{
-    //! Stores paths to styled font assets for a given set of languages
-    //! This struct stores the XML data contained within the <font> tag of
-    //! an enclosing <fontfamily> definition:
-    //!
-    //! <fontfamily name="FontFamilyName">
-    //!     <font lang="Language1, Language2">
-    //!         <file path="regular.font" />
-    //!         <file path="bold.font" tags="b" />
-    //!         <file path="italic.font" tags="i" />
-    //!         <file path="bolditalic.font" tags="b,i" />
-    //!     </font>
-    //! </fontfamily>
-    struct FontTagXml
-    {
-        //! \return True if all font asset paths are non-empty, false otherwise
-        bool IsValid() const
-        {
-            // Note that "lang" can be empty
-            return !m_fontFilename.empty()
-                && !m_boldFontFilename.empty()
-                && !m_italicFontFilename.empty()
-                && !m_boldItalicFontFilename.empty();
-        }
-
-        string m_lang;                      //!< Stores a comma-separated list of languages this collection of fonts applies to.
-                                            //!< If this is an empty string, it implies that these set of fonts will be applied
-                                            //!< by default (when a language is being used but no fonts in the font family are
-                                            //!< mapped to that language).
-
-        string m_fontFilename;              //!< Font used when no styling is applied.
-        string m_boldFontFilename;          //!< Bold-styled font
-        string m_italicFontFilename;        //!< Italic-styled font
-        string m_boldItalicFontFilename;    //!< Bold-italic-styled font
-    };
-
-    //! Stores parsed font family XML data.
-    //! This struct contains the name of the font family and a list of font
-    //! file XML data for all the language-specific mappings of this
-    //! font family.
-    //!
-    //! Example XML:
-    //!
-    //! <fontfamily name="FontFamilyName">
-    //!     <font>
-    //!         <file path="regular.font" />
-    //!         <file path="bold.font" tags="b" />
-    //!         <file path="italic.font" tags="i" />
-    //!         <file path="bolditalic.font" tags="b,i" />
-    //!     </font>
-    //!     <font lang="korean">
-    //!         <file path="../korean/korean-regular.font" />
-    //!         <file path="../korean/korean-italic.font" tags="b" />
-    //!         <file path="../korean/korean-bold.font" tags="i" />
-    //!         <file path="../korean/korean-bolditalic.font" tags="b,i" />
-    //!     </font>
-    //!     <font lang="chinesesimplified">
-    //!         <file path="../chinesesimplified/chinesesimplified-regular.font" />
-    //!         <file path="../chinesesimplified/chinesesimplified-bold.font" tags="b" />
-    //!         <file path="../chinesesimplified/chinesesimplified-italic.font" tags="i" />
-    //!         <file path="../chinesesimplified/chinesesimplified-bolditalic.font" tags="b,i" />
-    //!     </font>
-    //! </fontfamily>
-    struct FontFamilyTagXml
-    {
-        //! Returns true if all font file fields were parsed, false otherwise.
-        bool IsValid() const
-        {
-            for (const FontTagXml& fontTagXml : m_fontTagsXml)
-            {
-                if (!fontTagXml.IsValid())
-                {
-                    return false;
-                }
-            }
-
-            // Every font family must have a name
-            return !m_fontFamilyName.empty();
-        }
-
-        string m_fontFamilyName;                  //!< Value of the "name" font-family tag attribute
-        AZStd::list<FontTagXml> m_fontTagsXml;    //!< List of child <font> tag data.
-    };
-
-    //! Returns true if the XML tree was traversed successfully, false otherwise.
-    //!
-    //! Note that, if this function returns true, it simply means that there were
-    //! no unexpected structure issues with the given XML tree, it doesn't 
-    //! necessarily mean that all the required fields were parsed.
-    bool ParseFontFamilyXml(const XmlNodeRef& node, FontFamilyTagXml& xmlData)
-    {
-        if (!node)
-        {
-            return false;
-        }
-
-        // <fontfamily>
-        if (AZStd::string(node->getTag()) == "fontfamily")
-        {
-            const int numAttributes = node->getNumAttributes();
-
-            if (numAttributes <= 0)
-            {
-                // Expecting at least one attribute
-                return false;
-            }
-
-            string name;
-
-            for (int i = 0, count = node->getNumAttributes(); i < count; ++i)
-            {
-                const char* key = "";
-                const char* value = "";
-                if (node->getAttributeByIndex(i, &key, &value))
-                {
-                    if (string(key) == "name")
-                    {
-                        name = value;
-                    }
-                    else
-                    {
-                        // Unexpected font tag attribute
-                        return false;
-                    }
-                }
-            }
-
-            name.Trim();
-            if (!name.empty())
-            {
-                xmlData.m_fontFamilyName = name;
-            }
-            else
-            {
-                // Font family must have a name
-                return false;
-            }
-        }
-
-        // <font>
-        if (AZStd::string(node->getTag()) == "font")
-        {
-            xmlData.m_fontTagsXml.push_back(FontTagXml());
-
-            string lang;
-            for (int i = 0, count = node->getNumAttributes(); i < count; ++i)
-            {
-                const char* key = "";
-                const char* value = "";
-                if (node->getAttributeByIndex(i, &key, &value))
-                {
-                    if (string(key) == "lang")
-                    {
-                        lang = value;
-                    }
-                    else
-                    {
-                        // Unexpected font tag attribute
-                        return false;
-                    }
-                }
-            }
-
-            lang.Trim();
-            if (!lang.empty())
-            {
-                xmlData.m_fontTagsXml.back().m_lang = lang;
-            }
-        }
-
-        // <file>
-        else if (AZStd::string(node->getTag()) == "file")
-        {
-            const int numAttributes = node->getNumAttributes();
-
-            if (numAttributes <= 0)
-            {
-                // Expecting at least one attribute
-                return false;
-            }
-
-            string path;
-            string tags;
-
-            for (int i = 0, count = node->getNumAttributes(); i < count; ++i)
-            {
-                const char* key = "";
-                const char* value = "";
-                if (node->getAttributeByIndex(i, &key, &value))
-                {
-                    if (string(key) == "path")
-                    {
-                        path = value;
-                    }
-                    else if (string(key) == "tags")
-                    {
-                        tags = value;
-                    }
-                    else
-                    {
-                        // Unexpected font tag attribute
-                        return false;
-                    }
-                }
-            }
-
-            tags.Trim();
-            if (tags.empty())
-            {
-                xmlData.m_fontTagsXml.back().m_fontFilename = path;
-            }
-            else if (tags == "b")
-            {
-                xmlData.m_fontTagsXml.back().m_boldFontFilename = path;
-            }
-            else if (tags == "i")
-            {
-                xmlData.m_fontTagsXml.back().m_italicFontFilename = path;
-            }
-            else
-            {
-                // We'll just assume any other tag indicates bold italic
-                xmlData.m_fontTagsXml.back().m_boldItalicFontFilename = path;
-            }
-        }
-
-        for (int i = 0, count = node->getChildCount(); i < count; ++i)
-        {
-            XmlNodeRef child = node->getChild(i);
-            if (!ParseFontFamilyXml(child, xmlData))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    //! Only attempt XML file load if file exists.
-    //! There are use-cases where the XML path is not fully known (such as
-    //! when referencing font family names from font family XML files), and
-    //! attempting to load the XML files directly via ISystem() methods can
-    //! produce a lot of warning noise.
-    XmlNodeRef SafeLoadXmlFromFile(const string& xmlPath)
-    {
-        if (gEnv->pCryPak->IsFileExist(xmlPath.c_str()))
-        {
-            return GetISystem()->LoadXmlFromFile(xmlPath.c_str());
-        }
-
-        return XmlNodeRef();
-    }
-
-}
-
-CCryFont::CCryFont(ISystem* pSystem)
-    : m_pSystem(pSystem)
-    , m_fonts()
-    , m_rndPropIsRGBA(false)
-    , m_rndPropHalfTexelOffset(0.5f)
-{
-    assert(m_pSystem);
-
-    CryLogAlways("Using FreeType %d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
-
-    // Persist fonts for application lifetime to prevent unnecessary work
-    REGISTER_CVAR(r_persistFontFamilies, r_persistFontFamilies, VF_NULL, "Persist loaded font families for lifetime of application.");
-
-#if !defined(_RELEASE)
-    REGISTER_COMMAND("r_DumpFontTexture", DumpFontTexture, 0,
-        "Dumps the specified font's texture to a bitmap file\n"
-        "Use r_DumpFontTexture to get the loaded font names\n"
-        "Usage: r_DumpFontTexture <fontname>");
-    REGISTER_COMMAND("r_DumpFontNames", DumpFontNames, 0,
-        "Logs a list of fonts currently loaded");
-    REGISTER_COMMAND("r_ReloadFonts", ReloadFonts, VF_NULL,
-        "Reload all fonts");
-#endif
-}
-
-CCryFont::~CCryFont()
-{
-    // Persist fonts for application lifetime to prevent unnecessary work
-    m_persistedFontFamilies.clear();
-
-    for (FontMapItor it = m_fonts.begin(), itEnd = m_fonts.end(); it != itEnd; )
-    {
-        CFFont* pFont = it->second;
-        ++it; // iterate as Release() below will remove font from the map
-        SAFE_RELEASE(pFont);
-    }
-}
-
-void CCryFont::Release()
-{
-    delete this;
-}
-
-IFFont* CCryFont::NewFont(const char* pFontName)
-{
-    string name = pFontName;
-    name.MakeLower();
-
-    FontMapItor it = m_fonts.find(CONST_TEMP_STRING(name.c_str()));
-    if (it != m_fonts.end())
-    {
-        return it->second;
-    }
-
-    CFFont* pFont = new CFFont(m_pSystem, this, name.c_str());
-    m_fonts.insert(FontMapItor::value_type(name, pFont));
-    return pFont;
-}
-
-IFFont* CCryFont::GetFont(const char* pFontName) const
-{
-    FontMapConstItor it = m_fonts.find(CONST_TEMP_STRING(string(pFontName).MakeLower()));
-    return it != m_fonts.end() ? it->second : 0;
-}
-
-FontFamilyPtr CCryFont::LoadFontFamily(const char* pFontFamilyName)
-{
-    FontFamilyPtr fontFamily(nullptr);
-    string fontFamilyPath;
-    string fontFamilyFullPath;
-    
-    XmlNodeRef root = LoadFontFamilyXml(pFontFamilyName, fontFamilyPath, fontFamilyFullPath);
-
-    if (root)
-    {
-        FontFamilyTagXml xmlData;
-        const bool parseSuccess = ParseFontFamilyXml(root, xmlData);
-        if (parseSuccess && xmlData.IsValid())
-        {
-            const char* currentLanguage = gEnv->pSystem->GetLocalizationManager()->GetLanguage();
-            FontTagXml* defaultFont = nullptr;
-            FontTagXml* langSpecificFont = nullptr;
-
-            // Note that we don't break out of this for-loop early because we
-            // want to find both the default font family and the 
-            // language-specific font family. We prefer the lang-specific 
-            // family but will fall back on the default if it doesn't exist.
-            for (FontTagXml& fontTagXml : xmlData.m_fontTagsXml)
-            {
-                if (fontTagXml.m_lang.empty())
-                {
-                    defaultFont = &fontTagXml;
-                }
-                else
-                {
-                    int searchPos = 0;
-                    string langToken;
-
-                    // "lang" font-tag attribute could be comma-separated
-                    while (!(langToken = fontTagXml.m_lang.Tokenize(",", searchPos)).empty())
-                    {
-                        if (langToken.Trim() == currentLanguage)
-                        {
-                            langSpecificFont = &fontTagXml;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (langSpecificFont || defaultFont)
-            {
-                // Prefer lang-specific font-family over default, if it exists
-                FontTagXml* fontTagXml = langSpecificFont ? langSpecificFont : defaultFont;
-
-                // Pre-pend font family's path to make font family XML paths 
-                // relative to font family file
-                fontTagXml->m_fontFilename = fontFamilyPath + fontTagXml->m_fontFilename;
-                fontTagXml->m_boldFontFilename = fontFamilyPath + fontTagXml->m_boldFontFilename;
-                fontTagXml->m_italicFontFilename = fontFamilyPath + fontTagXml->m_italicFontFilename;
-                fontTagXml->m_boldItalicFontFilename = fontFamilyPath + fontTagXml->m_boldItalicFontFilename;
-
-                IFFont* normal = LoadFont(fontTagXml->m_fontFilename.c_str());
-                IFFont* bold = LoadFont(fontTagXml->m_boldFontFilename.c_str());
-                IFFont* italic = LoadFont(fontTagXml->m_italicFontFilename.c_str());
-                IFFont* boldItalic = LoadFont(fontTagXml->m_boldItalicFontFilename.c_str());
-
-                // Only continue if all fonts were created successfully
-                if (normal && bold && italic && boldItalic)
-                {
-                    fontFamily.reset(new FontFamily(),
-                        [this](FontFamily* pFontFamily)
-                    {
-                        ReleaseFontFamily(pFontFamily);
-                    });
-
-                    // Map the font family name both by path and by name defined
-                    // within the Font Family XML itself. This allows font 
-                    // families to also be referenced simply by name.
-                    if (!AddFontFamilyToMaps(fontFamilyFullPath, xmlData.m_fontFamilyName, fontFamily))
-                    {
-                        SAFE_RELEASE(normal);
-                        SAFE_RELEASE(bold);
-                        SAFE_RELEASE(italic);
-                        SAFE_RELEASE(boldItalic);
-
-                        return nullptr;
-                    }
-
-                    fontFamily->familyName = xmlData.m_fontFamilyName;
-                    fontFamily->normal = normal;
-                    fontFamily->bold = bold;
-                    fontFamily->italic = italic;
-                    fontFamily->boldItalic = boldItalic;
-                }
-                else
-                {
-                    SAFE_RELEASE(normal);
-                    SAFE_RELEASE(bold);
-                    SAFE_RELEASE(italic);
-                    SAFE_RELEASE(boldItalic);
-                }
-            }
-        }
-    }
-
-    if (!fontFamily)
-    {
-        // Unable to load font family XML, so load font normally and associate
-        // it with a font family
-        IFFont* pFont = LoadFont(pFontFamilyName);
-
-        if (pFont)
-        {
-            // Create a font family from a single font by assigning all the
-            // font family stylings to the same font
-            fontFamily.reset(new FontFamily(),
-                [this](FontFamily* pFontFamily)
-            {
-                ReleaseFontFamily(pFontFamily);
-            });
-
-            // Use filepath as familyName so font loading/unloading doesn't break with duplicate file names
-            fontFamily->familyName = pFontFamilyName;
-
-            if (!AddFontFamilyToMaps(pFontFamilyName, fontFamily->familyName, fontFamily))
-            {
-                SAFE_RELEASE(pFont);
-
-                return nullptr;
-            }
-
-            // Assign all stylings to the same font
-            fontFamily->normal = pFont;
-            fontFamily->bold = pFont;
-            fontFamily->italic = pFont;
-            fontFamily->boldItalic = pFont;
-
-            // The other three stylings need to have their ref count 
-            // incremented (even though in this particular case its all the
-            // same font) because when ReleaseFontFamily executes all fonts
-            // in the family will be (corresondingly) Release'd.
-            fontFamily->bold->AddRef();
-            fontFamily->italic->AddRef();
-            fontFamily->boldItalic->AddRef();
-        }
-    }
-
-    // Persist fonts for application lifetime to prevent unnecessary work
-    if (r_persistFontFamilies > 0)
-    {
-        m_persistedFontFamilies.emplace_back(FontFamilyPtr(fontFamily));
-    }
-
-    return fontFamily;
-}
-
-FontFamilyPtr CCryFont::GetFontFamily(const char* pFontFamilyName)
-{
-    FontFamilyPtr fontFamily = nullptr;
-
-    // The given string could either be: a font family name (defined in font
-    // family XML), a file path (for regular fonts mapped as font families),
-    // or just the filename of a font itself. Fonts are mapped by font family
-    // name or by filepath, so attempt lookup using the map first since it's
-    // the fastest.
-    string loweredName = string(pFontFamilyName).Trim().MakeLower();
-    auto it = m_fontFamilies.find(PathUtil::MakeGamePath(loweredName).c_str());
-    if (it != m_fontFamilies.end())
-    {
-        fontFamily = FontFamilyPtr(it->second);
-    }
-    else
-    {
-        // Iterate through all fonts, returning the first match where simply
-        // the filename of a font could be a match. This case will likely be
-        // hit when text markup references a font that doesn't belong to a 
-        // font family.
-        for (const auto& fontFamilyIter : m_fontFamilies)
-        {
-            const AZStd::string& mappedFontFamilyName = fontFamilyIter.first;
-            string mappedFilenameNoExtension = PathUtil::GetFileName(mappedFontFamilyName.c_str());
-
-            string searchStringFilenameNoExtension = PathUtil::GetFileName(loweredName);
-
-            if (mappedFilenameNoExtension == searchStringFilenameNoExtension)
-            {
-                fontFamily = FontFamilyPtr(fontFamilyIter.second);
-                break;
-            }
-        }
-    }
-
-    return fontFamily;
-}
-
-void CCryFont::AddCharsToFontTextures(FontFamilyPtr pFontFamily, const char* pChars, int glyphSizeX, int glyphSizeY)
-{
-    pFontFamily->normal->AddCharsToFontTexture(pChars, glyphSizeX, glyphSizeY);
-    pFontFamily->bold->AddCharsToFontTexture(pChars, glyphSizeX, glyphSizeY);
-    pFontFamily->italic->AddCharsToFontTexture(pChars, glyphSizeX, glyphSizeY);
-    pFontFamily->boldItalic->AddCharsToFontTexture(pChars, glyphSizeX, glyphSizeY);
-}
-
-void CCryFont::SetRendererProperties(IRenderer* pRenderer)
-{
-    if (pRenderer)
-    {
-        m_rndPropIsRGBA = (pRenderer->GetFeatures() & RFT_RGBA) != 0;
-        m_rndPropHalfTexelOffset = 0.0f;
-    }
-}
-
-void CCryFont::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    if (!pSizer->Add(*this))
-    {
-        return;
-    }
-
-    pSizer->AddObject(m_fonts);
-}
-
-string CCryFont::GetLoadedFontNames() const
-{
-    string ret;
-    for (FontMapConstItor it = m_fonts.begin(), itEnd = m_fonts.end(); it != itEnd; ++it)
-    {
-        CFFont* pFont = it->second;
-        if (pFont)
-        {
-            if (!ret.empty())
-            {
-                ret += ",";
-            }
-            ret += pFont->GetName();
-        }
-    }
-    return ret;
-}
-
-void CCryFont::OnLanguageChanged()
-{
-    ReloadAllFonts();
-
-    EBUS_EVENT(LanguageChangeNotificationBus, LanguageChanged);
-}
-
-void CCryFont::ReloadAllFonts()
-{
-    // Persist fonts for application lifetime to prevent unnecessary work
-    m_persistedFontFamilies.clear();
-
-    AZStd::list<AZStd::string> fontFamilyFilenames;
-    AZStd::list<FontFamily*> fontFamilyWeakPtrs;
-
-    // Iterate through all currently loaded font families
-    for (auto it : m_fontFamilyReverseLookup)
-    {
-        fontFamilyWeakPtrs.push_back(it.first);
-        fontFamilyFilenames.push_back(it.second->first);
-    }
-
-    // Release font-family resources and unmap them
-    for (auto fontFamily : fontFamilyWeakPtrs)
-    {
-        ReleaseFontFamily(fontFamily);
-    }
-
-    // Reload the font families
-    for (auto familyFilename : fontFamilyFilenames)
-    {
-        LoadFontFamily(familyFilename.c_str());
-    }
-
-    // All UI text components need to reload their font assets (both in-game
-    // and in-editor).
-    EBUS_EVENT(FontNotificationBus, OnFontsReloaded);
-}
-
-void CCryFont::UnregisterFont(const char* pFontName)
-{
-    FontMapItor it = m_fonts.find(CONST_TEMP_STRING(pFontName));
-
-#if defined(AZ_ENABLE_TRACING)
-    IFFont* fontPtr = it->second;
-#endif
-
-    if (it != m_fonts.end())
-    {
-        m_fonts.erase(it);
-    }
-
-#if defined(AZ_ENABLE_TRACING)
-    // Make sure the font being released isn't currently in use by a font family.
-    // If it is, the FontFamily will have a dangling pointer and will cause a
-    // crash when the FontFamily eventually gets released.
-    for (auto reverseMapEntry : m_fontFamilyReverseLookup)
-    {
-        FontFamily* fontFamily = reverseMapEntry.first;
-        AZ_Assert(fontFamily->normal != fontPtr, 
-            "The following font is being freed but still in use by a FontFamily: %s",
-            pFontName);
-        AZ_Assert(fontFamily->italic != fontPtr,
-            "The following font is being freed but still in use by a FontFamily: %s",
-            pFontName);
-        AZ_Assert(fontFamily->bold != fontPtr,
-            "The following font is being freed but still in use by a FontFamily: %s",
-            pFontName);
-        AZ_Assert(fontFamily->boldItalic != fontPtr,
-            "The following font is being freed but still in use by a FontFamily: %s",
-            pFontName);
-    }
-#endif
-}
-
-IFFont* CCryFont::LoadFont(const char* pFontName)
-{
-    string fontName = pFontName;
-    fontName.MakeLower();
-
-    IFFont* font = GetFont(fontName);
-    if (font)
-    {
-        font->AddRef(); // use existing loaded font
-    }
-    else
-    {
-        // attempt to create and load a new font, use the font pathname as the font name
-        font = NewFont(fontName);
-        if (!font)
-        {
-            string errorMsg = "Error creating a new font named ";
-            errorMsg += fontName;
-            errorMsg += ".";
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, errorMsg.c_str());
-        }
-        else
-        {
-            // creating font adds one to its refcount so no need for AddRef here
-            if (!font->Load(fontName))
-            {
-                string errorMsg = "Error loading a font from ";
-                errorMsg += fontName;
-                errorMsg += ".";
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, errorMsg);
-                font->Release();
-                font = nullptr;
-            }
-        }
-    }
-
-    return font;
-}
-
-void CCryFont::ReleaseFontFamily(FontFamily* pFontFamily)
-{
-    // Ensure that Font Family was mapped prior to destruction
-    const bool isMapped = m_fontFamilyReverseLookup.find(pFontFamily) != m_fontFamilyReverseLookup.end();
-    if (!isMapped)
-    {
-        return;
-    }
-
-    // Note that the FontFamily is mapped both by filename and by "family name"
-    auto it = m_fontFamilyReverseLookup[pFontFamily];
-    m_fontFamilies.erase(it);
-    string familyName(pFontFamily->familyName);
-    m_fontFamilies.erase(familyName.MakeLower().c_str());
-
-    // Reverse lookup is used to avoid needing to store filename path with
-    // the font family, so we need to remove that entry also.
-    m_fontFamilyReverseLookup.erase(pFontFamily);
-
-    SAFE_RELEASE(pFontFamily->normal);
-    SAFE_RELEASE(pFontFamily->bold);
-    SAFE_RELEASE(pFontFamily->italic);
-    SAFE_RELEASE(pFontFamily->boldItalic);
-}
-
-bool CCryFont::AddFontFamilyToMaps(const char* pFontFamilyFilename, const char* pFontFamilyName, FontFamilyPtr fontFamily)
-{
-    if (!pFontFamilyFilename || !pFontFamilyName || !fontFamily.get())
-    {
-        return false;
-    }
-
-    // We don't support "updating" mapped values. 
-    AZStd::string loweredFilename(PathUtil::MakeGamePath(string(pFontFamilyFilename)).c_str());
-    AZStd::to_lower<AZStd::string::iterator>(loweredFilename.begin(), loweredFilename.end());
-    if (m_fontFamilies.find(loweredFilename) != m_fontFamilies.end())
-    {
-        string warnMsg;
-        warnMsg.Format("Couldn't load Font Family '%s': already loaded", pFontFamilyFilename);
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, warnMsg.c_str());
-        return false;
-    }
-
-    // Similarly, we don't support Font Family XMLs that have the same font 
-    // family name (we assume all Font Family names are unique).
-    AZStd::string loweredFontFamilyName(pFontFamilyName);
-    AZStd::to_lower<AZStd::string::iterator>(loweredFontFamilyName.begin(), loweredFontFamilyName.end());
-    if (m_fontFamilies.find(loweredFontFamilyName) != m_fontFamilies.end())
-    {
-        string warnMsg;
-        warnMsg.Format("Couldn't load Font Family '%s': already loaded", pFontFamilyName);
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, warnMsg.c_str());
-        return false;
-    }
-
-    // First, insert by filename
-    AZStd::pair<AZStd::string, AZStd::weak_ptr<FontFamily>> insertPair(loweredFilename, fontFamily);
-    auto iterPosition = m_fontFamilies.insert(insertPair).first;
-    m_fontFamilyReverseLookup[fontFamily.get()] = iterPosition;
-    
-    // Then, by Font Family name
-    AZStd::pair<AZStd::string, AZStd::weak_ptr<FontFamily>> nameInsertPair(loweredFontFamilyName, fontFamily);
-    m_fontFamilies.insert(nameInsertPair);
-
-    return true;
-}
-
-XmlNodeRef CCryFont::LoadFontFamilyXml(const char* pFontFamilyName, string& outputDirectory, string& outputFullPath)
-{
-    outputFullPath = pFontFamilyName;
-    outputDirectory = PathUtil::GetPath(pFontFamilyName);
-    XmlNodeRef root = SafeLoadXmlFromFile(outputFullPath);
-
-    // When parsing a <font> tag in markup, only the font name is given and 
-    // not a path, so we try to build a "best guess" path from the name.
-    if (!root)
-    {
-        string fileNoExtension(PathUtil::GetFileName(pFontFamilyName));
-        string fileExtension(PathUtil::GetExt(pFontFamilyName));
-
-        if (fileExtension.empty())
-        {
-            fileExtension = ".fontfamily";
-        }
-
-        // Try: "fonts/fontName.fontfamily"
-        outputDirectory = string("fonts/");
-        outputFullPath = outputDirectory + fileNoExtension + fileExtension;
-        root = SafeLoadXmlFromFile(outputFullPath);
-
-        // Finally, try: "fonts/fontName/fontName.fontfamily"
-        if (!root)
-        {
-            outputDirectory = string("fonts/") + fileNoExtension + "/";
-            outputFullPath = outputDirectory + fileNoExtension + fileExtension;
-            root = SafeLoadXmlFromFile(outputFullPath);
-        }
-    }
-
-    return root;
-}
-
-#endif
-
diff --git a/Code/CryEngine/CryFont/CryFont.def b/Code/CryEngine/CryFont/CryFont.def
deleted file mode 100644
index 43bfe0b13d..0000000000
--- a/Code/CryEngine/CryFont/CryFont.def
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPORTS
-	ModuleInitISystem @2
-	CryModuleGetMemoryInfo @8
diff --git a/Code/CryEngine/CryFont/CryFont.h b/Code/CryEngine/CryFont/CryFont.h
deleted file mode 100644
index 726818f5a7..0000000000
--- a/Code/CryEngine/CryFont/CryFont.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYFONT_CRYFONT_H
-#define CRYINCLUDE_CRYFONT_CRYFONT_H
-#pragma once
-
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include <IXml.h>
-#include <AzCore/std/containers/map.h>
-#include <AzCore/std/smart_ptr/weak_ptr.h>
-#include <map>
-
-class CFFont;
-
-
-class CCryFont
-    : public ICryFont
-{
-    friend class CFFont;
-
-public:
-
-    static const Vec2i defaultGlyphSize;    //!< Default glyph size indicates that glyphs in the font texture
-                                            //!< should be rendered at the maximum resolution supported by
-                                            //!< the font texture's glyph cell/slot configuration (configured
-                                            //!< via font XML).
-
-public:
-    CCryFont(ISystem* pSystem);
-    virtual ~CCryFont();
-
-    virtual void Release();
-    virtual IFFont* NewFont(const char* pFontName);
-    virtual IFFont* GetFont(const char* pFontName) const;
-    virtual FontFamilyPtr LoadFontFamily(const char* pFontFamilyName) override;
-    virtual FontFamilyPtr GetFontFamily(const char* pFontFamilyName) override;
-    virtual void AddCharsToFontTextures(FontFamilyPtr pFontFamily, const char* pChars, int glyphSizeX = ICryFont::defaultGlyphSizeX, int glyphSizeY = ICryFont::defaultGlyphSizeY) override;
-    virtual void SetRendererProperties(IRenderer* pRenderer);
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual string GetLoadedFontNames() const;
-    virtual void OnLanguageChanged() override;
-    virtual void ReloadAllFonts() override;
-
-public:
-    void UnregisterFont(const char* pFontName);
-    bool RndPropIsRGBA() const { return m_rndPropIsRGBA; }
-    float RndPropHalfTexelOffset() const { return m_rndPropHalfTexelOffset; }
-
-private:
-    typedef std::map<string, CFFont*> FontMap;
-    typedef FontMap::iterator FontMapItor;
-    typedef FontMap::const_iterator FontMapConstItor;
-
-    typedef AZStd::map<AZStd::string, AZStd::weak_ptr<FontFamily>> FontFamilyMap;
-    typedef AZStd::map<FontFamily*, FontFamilyMap::iterator> FontFamilyReverseLookupMap;
-
-private:
-    //! Convenience method for loading fonts
-    IFFont* LoadFont(const char* fontName);
-
-    //! Called when final FontFamily shared_ptr is destroyed; do not call directly.
-    void ReleaseFontFamily(FontFamily* pFontFamily);
-
-    //! Adds new entries into both font family maps for the given font family
-    //!
-    //! Note that it's not possible to update Font Family mappings with this
-    //! method. The only way to do that would be to release the font family 
-    //! and re-load it with the new values.
-    //!
-    //! \return True only if the Font Family was added to the maps, false for all other cases (such as
-    //! when the font family is already mapped).
-    bool AddFontFamilyToMaps(const char* pFontFamilyFilename, const char* pFontFamilyName, FontFamilyPtr fontFamily);
-
-    //! Internal method that (possibly) makes several attempts at locating and loading a given font family XML.
-    //! \param pFontFamilyName The name of the font family, or path to a font family file.
-    //! \param outputDirectory Path to loaded font family (no filename), may need resolving with PathUtil::MakeGamePath.
-    //! \param outputFullPath Full path to loaded font family, may need resolving with PathUtil::MakeGamePath.
-    XmlNodeRef LoadFontFamilyXml(const char* pFontFamilyName, string& outputDirectory, string& outputFullPath);
-
-private:
-    FontMap m_fonts;
-    FontFamilyMap m_fontFamilies; //!< Map font family names to weak ptrs so we can construct shared_ptrs but not keep a ref ourselves.
-    FontFamilyReverseLookupMap m_fontFamilyReverseLookup; //<! FontFamily pointer reverse-lookup for quick removal
-    ISystem* m_pSystem;
-    bool m_rndPropIsRGBA;
-    float m_rndPropHalfTexelOffset;
-
-    int r_persistFontFamilies = 1; //!< Persist fonts for application lifetime to prevent unnecessary work; enabled by default.
-    AZStd::vector<FontFamilyPtr> m_persistedFontFamilies; //!< Stores persisted fonts (if "persist font families" is enabled)
-
-};
-
-#endif
-
-#endif // CRYINCLUDE_CRYFONT_CRYFONT_H
diff --git a/Code/CryEngine/CryFont/CryFont.rc b/Code/CryEngine/CryFont/CryFont.rc
deleted file mode 100644
index 5730d0a537..0000000000
--- a/Code/CryEngine/CryFont/CryFont.rc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000904b0"
-        BEGIN
-            VALUE "CompanyName", "Amazon.com, Inc."
-            VALUE "FileVersion", "1, 0, 0, 1"
-            VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
-            VALUE "ProductName", "Lumberyard"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x9, 1200
-    END
-END
-
-#endif    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Code/CryEngine/CryFont/CryFont_precompiled.cpp b/Code/CryEngine/CryFont/CryFont_precompiled.cpp
deleted file mode 100644
index 235fe8e053..0000000000
--- a/Code/CryEngine/CryFont/CryFont_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "CryFont_precompiled.h"
diff --git a/Code/CryEngine/CryFont/CryFont_precompiled.h b/Code/CryEngine/CryFont/CryFont_precompiled.h
deleted file mode 100644
index e37845aa35..0000000000
--- a/Code/CryEngine/CryFont/CryFont_precompiled.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <vector>
-
-#define CRYFONT_EXPORTS
-
-#include <platform.h>
-
-#include <IFont.h>
-
-#include <ILog.h>
-#include <IConsole.h>
-#include <IRenderer.h>
-#include <CrySizer.h>
-
-#define USE_NULLFONT
-
-#if defined(DEDICATED_SERVER)
-#define USE_NULLFONT_ALWAYS 1
-#endif
-
diff --git a/Code/CryEngine/CryFont/FBitmap.h b/Code/CryEngine/CryFont/FBitmap.h
deleted file mode 100644
index 93f5505726..0000000000
--- a/Code/CryEngine/CryFont/FBitmap.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef CRYINCLUDE_CRYFONT_FBITMAP_H
-#define CRYINCLUDE_CRYFONT_FBITMAP_H
-
-
-class CFBitmap
-{
-public:
-    CFBitmap();
-    ~CFBitmap();
-
-    int Blur(int iIterations);
-    int Scale(float fScaleX, float fScaleY);
-
-    int BlitFrom(CFBitmap* pSrc, int iSX, int iSY, int iDX, int iDY, int iW, int iH);
-    int BlitTo(CFBitmap* pDst, int iDX, int iDY, int iSX, int iSY, int iW, int iH);
-
-    int Create(int iWidth, int iHeight);
-    int Release();
-
-    int SaveBitmap(const string& szFileName);
-    int Get32Bpp(unsigned int** pBuffer)
-    {
-        (*pBuffer) = new unsigned int[m_iWidth * m_iHeight];
-
-        if (!(*pBuffer))
-        {
-            return 0;
-        }
-
-        int iDataSize = m_iWidth * m_iHeight;
-
-        for (int i = 0; i < iDataSize; i++)
-        {
-            (*pBuffer)[i] = (m_pData[i] << 24) | (m_pData[i] << 16) | (m_pData[i] << 8) | (m_pData[i]);
-        }
-
-        return 1;
-    }
-
-    int GetWidth() { return m_iWidth; }
-    int GetHeight() { return m_iHeight; }
-
-    void SetRenderData(void* pRenderData) { m_pIRenderData = pRenderData; };
-    void* GetRenderData() { return m_pIRenderData; };
-
-    void GetMemoryUsage (class ICrySizer* pSizer);
-
-    unsigned char* GetData() { return m_pData; }
-
-public:
-
-    int             m_iWidth;
-    int             m_iHeight;
-
-    unsigned char* m_pData;
-    void* m_pIRenderData;
-};
-
-
-#endif // CRYINCLUDE_CRYFONT_FBITMAP_H
diff --git a/Code/CryEngine/CryFont/FFont.cpp b/Code/CryEngine/CryFont/FFont.cpp
deleted file mode 100644
index c028a0827e..0000000000
--- a/Code/CryEngine/CryFont/FFont.cpp
+++ /dev/null
@@ -1,1550 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Font class.
-
-
-#include "CryFont_precompiled.h"
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include "FFont.h"
-#include "CryFont.h"
-#include "FontTexture.h"
-#include "UnicodeIterator.h"
-
-#include <AzCore/std/parallel/lock.h>
-#include <AzFramework/Archive/Archive.h>
-
-static ColorB ColorTable[10] =
-{
-    ColorB(0x00, 0x00, 0x00), // black
-    ColorB(0xff, 0xff, 0xff), // white
-    ColorB(0x00, 0x00, 0xff), // blue
-    ColorB(0x00, 0xff, 0x00), // green
-    ColorB(0xff, 0x00, 0x00), // red
-    ColorB(0x00, 0xff, 0xff), // cyan
-    ColorB(0xff, 0xff, 0x00), // yellow
-    ColorB(0xff, 0x00, 0xff), // purple
-    ColorB(0xff, 0x80, 0x00), // orange
-    ColorB(0x8f, 0x8f, 0x8f), // grey
-};
-
-static const int TabCharCount = 4;
-static const size_t MsgBufferSize = 1024;
-static const size_t MaxDrawVBQuads = 128;
-
-CFFont::CFFont(ISystem* pSystem, CCryFont* pCryFont, const char* pFontName)
-    : m_name(pFontName)
-    , m_curPath("")
-    , m_pFontTexture(0)
-    , m_fontBufferSize(0)
-    , m_pFontBuffer(0)
-    , m_texID(-1)
-    , m_textureVersion(0)
-    , m_pSystem(pSystem)
-    , m_pCryFont(pCryFont)
-    , m_fontTexDirty(false)
-    , m_effects()
-    , m_pDrawVB(0)
-    , m_nRefCount(0)
-    , m_monospacedFont(false)
-{
-    assert(m_name.c_str());
-    assert(m_pSystem);
-    assert(m_pCryFont);
-
-    // create default effect
-    SEffect* pEffect = AddEffect("default");
-    pEffect->AddPass();
-
-    m_pDrawVB = new SVF_P3F_C4B_T2F[MaxDrawVBQuads * 6];
-
-    AddRef();
-}
-
-CFFont::~CFFont()
-{
-    // The font should already be unregistered through a call to
-    // CFFont::Release() at this point.
-    CRY_ASSERT(m_pCryFont == nullptr);
-
-    Free();
-
-    SAFE_DELETE_ARRAY(m_pDrawVB);
-}
-
-int32 CFFont::AddRef()
-{
-    int32 nRef = CryInterlockedIncrement(&m_nRefCount);
-    return nRef;
-}
-
-int32 CFFont::Release()
-{
-    if (m_nRefCount > 0)
-    {
-        int32 nRef = CryInterlockedDecrement(&m_nRefCount);
-        if (nRef < 0)
-        {
-            CryFatalError("CBaseResource::Release() called more than once!");
-        }
-
-        if (nRef <= 0)
-        {
-            if (m_pCryFont)
-            {
-                AZStd::lock_guard<AZStd::recursive_mutex> locker(m_fontMutex);
-
-                // Unregister font so no one can increase it's ref count while it is queued for deletion
-                m_pCryFont->UnregisterFont(m_name);
-                m_pCryFont = nullptr;
-            }
-
-            if (gEnv->pRenderer)
-            {
-                gEnv->pRenderer->DeleteFont(this);
-            }
-            return 0;
-        }
-        return nRef;
-    }
-    return 0;
-}
-
-// Load a font from a TTF file
-bool CFFont::Load(const char* pFontFilePath, unsigned int width, unsigned int height, unsigned int widthNumSlots, unsigned int heightNumSlots, unsigned int flags, float sizeRatio)
-{
-    if (!pFontFilePath)
-    {
-        return false;
-    }
-
-    Free();
-
-    auto pPak = gEnv->pCryPak;
-
-    string fullFile;
-    if (pPak->IsAbsPath(pFontFilePath))
-    {
-        fullFile = pFontFilePath;
-    }
-    else
-    {
-        fullFile = m_curPath + pFontFilePath;
-    }
-
-    int iSmoothMethod = (flags & TTFFLAG_SMOOTH_MASK) >> TTFFLAG_SMOOTH_SHIFT;
-    int iSmoothAmount = (flags & TTFFLAG_SMOOTH_AMOUNT_MASK) >> TTFFLAG_SMOOTH_AMOUNT_SHIFT;
-
-    AZ::IO::HandleType fileHandle = pPak->FOpen(fullFile.c_str(), "rb");
-    if (fileHandle == AZ::IO::InvalidHandle)
-    {
-        return false;
-    }
-
-    size_t fileSize = pPak->FGetSize(fileHandle);
-    if (!fileSize)
-    {
-        pPak->FClose(fileHandle);
-        return false;
-    }
-
-    unsigned char* pBuffer = new unsigned char[fileSize];
-    if (!pPak->FReadRaw(pBuffer, fileSize, 1, fileHandle))
-    {
-        pPak->FClose(fileHandle);
-        delete [] pBuffer;
-        return false;
-    }
-
-    pPak->FClose(fileHandle);
-
-    if (!m_pFontTexture)
-    {
-        m_pFontTexture = new CFontTexture();
-    }
-
-    if (!m_pFontTexture || !m_pFontTexture->CreateFromMemory(pBuffer, (int)fileSize, width, height, iSmoothMethod, iSmoothAmount, widthNumSlots, heightNumSlots, sizeRatio))
-    {
-        delete [] pBuffer;
-        return false;
-    }
-
-    m_monospacedFont = m_pFontTexture->GetMonospaced();
-    m_pFontBuffer = pBuffer;
-    m_fontBufferSize = fileSize;
-    m_fontTexDirty = false;
-    m_sizeRatio = sizeRatio;
-
-    InitCache();
-
-    return true;
-}
-
-
-void CFFont::Free()
-{
-    IRenderer* pRenderer = gEnv->pRenderer;
-    if (m_texID >= 0 && pRenderer)
-    {
-        pRenderer->RemoveTexture(m_texID);
-        m_texID = -1;
-        m_textureVersion = 0;
-    }
-
-    delete m_pFontTexture;
-    m_pFontTexture = 0;
-
-    delete [] m_pFontBuffer;
-    m_pFontBuffer = 0;
-}
-
-void CFFont::DrawString(float x, float y, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    IF (!pStr, 0)
-    {
-        return;
-    }
-
-    DrawStringUInternal(x, y, 1.0f, pStr, asciiMultiLine, ctx);
-}
-
-void CFFont::DrawString(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    IF (!pStr, 0)
-    {
-        return;
-    }
-
-    DrawStringUInternal(x, y, z, pStr, asciiMultiLine, ctx);
-}
-
-void CFFont::DrawStringUInternal(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    IF (!pStr || !m_pFontTexture || ctx.m_fxIdx >= m_effects.size() || m_effects[ctx.m_fxIdx].m_passes.empty(), 0)
-    {
-        return;
-    }
-
-    AZStd::lock_guard<AZStd::recursive_mutex> locker(m_fontMutex);
-
-    IRenderer* pRenderer = gEnv->pRenderer;
-    AZ_Assert(pRenderer, "gEnv->pRenderer is NULL");
-
-    pRenderer->DrawStringU(this, x, y, z, pStr, asciiMultiLine, ctx);
-}
-
-ILINE uint32 COLCONV(uint32 clr)
-{
-    return ((clr & 0xff00ff00) | ((clr & 0xff0000) >> 16) | ((clr & 0xff) << 16));
-}
-
-void CFFont::RenderCallback(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> locker(m_fontMutex);
-
-    const size_t fxSize = m_effects.size();
-
-    IF (fxSize && m_texID == -1 && !InitTexture(), 0)
-    {
-        return;
-    }
-
-    // if the font is about to be deleted then m_pCryFont can be nullptr
-    if (!m_pCryFont)
-    {
-        return;
-    }
-
-    SVF_P3F_C4B_T2F* pVertex = m_pDrawVB;
-    size_t vbOffset = 0;
-
-    bool isFontRenderStateSet = false;
-    TransformationMatrices backupSceneMatrices;
-    IRenderer* pRenderer = gEnv->pRenderer;
-    AZ_Assert(pRenderer, "gEnv->pRenderer is NULL");
-
-    int baseState = ctx.m_baseState;
-    bool overrideViewProjMatrices = ctx.m_overrideViewProjMatrices;
-    int texId = m_texID;
-
-    // Local function to share code needed when we render the vertex buffer so far
-    AZStd::function<void(void)> RenderVB = [&pVertex, &vbOffset, pRenderer]
-    {
-        gEnv->pRenderer->DrawDynVB(pVertex, 0, vbOffset, 0, prtTriangleList);
-        vbOffset = 0;
-    };
-
-    // Local function that is passed into CreateQuadsForText as the AddQuad function
-    AddFunction AddQuad = [&pVertex, &vbOffset, RenderVB]
-        (const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, const Vec2& tc0, const Vec2& tc1, const Vec2& tc2, const Vec2& tc3, uint32 packedColor)
-    {
-        // define char quad
-        pVertex[vbOffset].xyz = v0;
-        pVertex[vbOffset].color.dcolor = packedColor;
-        pVertex[vbOffset].st = tc0;
-
-        pVertex[vbOffset + 1].xyz = v1;
-        pVertex[vbOffset + 1].color.dcolor = packedColor;
-        pVertex[vbOffset + 1].st = tc1;
-
-        pVertex[vbOffset + 2].xyz = v2;
-        pVertex[vbOffset + 2].color.dcolor = packedColor;
-        pVertex[vbOffset + 2].st = tc2;
-
-        pVertex[vbOffset + 3].xyz = v2;
-        pVertex[vbOffset + 3].color.dcolor = packedColor;
-        pVertex[vbOffset + 3].st = tc2;
-
-        pVertex[vbOffset + 4].xyz = v3;
-        pVertex[vbOffset + 4].color.dcolor = packedColor;
-        pVertex[vbOffset + 4].st = tc3;
-
-        pVertex[vbOffset + 5].xyz = v0;
-        pVertex[vbOffset + 5].color.dcolor = packedColor;
-        pVertex[vbOffset + 5].st = tc0;
-
-        vbOffset += 6;
-
-        if (vbOffset >= MaxDrawVBQuads * 6)
-        {
-            RenderVB();
-        }
-    };
-
-    // Local function that is passed into CreateQuadsForText as the BeginPass function
-    BeginPassFunction BeginPass = [&pVertex, &vbOffset, &isFontRenderStateSet, &backupSceneMatrices, texId, pRenderer, baseState, RenderVB, overrideViewProjMatrices]
-        (const SRenderingPass* pPass)
-    {
-        // We don't want to set this state before the call to CreateQuadsForText since that calls Prepare,
-        // which is needed before FontSetTexture
-        if (!isFontRenderStateSet)
-        {
-            pRenderer->FontSetTexture(texId, FILTER_TRILINEAR);
-            pRenderer->FontSetRenderingState(overrideViewProjMatrices, backupSceneMatrices);
-            gEnv->pRenderer->FontSetBlending(pPass->m_blendSrc, pPass->m_blendDest, baseState);
-            isFontRenderStateSet = true;
-        }
-        
-        if (vbOffset > 0)
-        {
-            RenderVB();
-        }
-
-        gEnv->pRenderer->FontSetBlending(pPass->m_blendSrc, pPass->m_blendDest, baseState);
-    };
-
-    CreateQuadsForText(x, y, z, pStr, asciiMultiLine, ctx, AddQuad, BeginPass);
-
-    if (vbOffset > 0)
-    {
-        RenderVB();
-    }
-
-    // restore the old states
-    if (isFontRenderStateSet)
-    {
-        pRenderer->FontRestoreRenderingState(overrideViewProjMatrices, backupSceneMatrices);
-    }
-}
-
-Vec2 CFFont::GetTextSize(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    IF (!pStr, 0)
-    {
-        return Vec2(0.0f, 0.0f);
-    }
-
-    return GetTextSizeUInternal(pStr, asciiMultiLine, ctx);
-}
-
-Vec2 CFFont::GetTextSizeUInternal(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    const size_t fxSize = m_effects.size();
-
-    IF (!pStr || !m_pFontTexture || !fxSize, 0)
-    {
-        return Vec2(0, 0);
-    }
-
-    AZStd::lock_guard<AZStd::recursive_mutex> locker(m_fontMutex);
-
-    Prepare(pStr, false, ctx.m_requestSize);
-
-    IRenderer* pRenderer = gEnv->pRenderer;
-    AZ_Assert(pRenderer, "gEnv->pRenderer is NULL");
-
-    // This is the "logical" size of the font (in pixels). The actual size of
-    // the glyphs in the font texture may have additional scaling applied or
-    // could have been re-rendered at a different size.
-    Vec2 size = ctx.m_size;
-    if (ctx.m_sizeIn800x600)
-    {
-        pRenderer->ScaleCoord(size.x, size.y);
-    }
-
-    // This scaling takes into account the logical size of the font relative
-    // to any additional scaling applied (such as from "size ratio").
-    const TextScaleInfoInternal scaleInfo(CalculateScaleInternal(ctx));
-
-    float maxW = 0;
-    float maxH = 0;
-
-    const size_t fxIdx = ctx.m_fxIdx < fxSize ? ctx.m_fxIdx : 0;
-    const SEffect& fx = m_effects[fxIdx];
-
-    for (size_t i = 0, numPasses = fx.m_passes.size(); i < numPasses; ++i)
-    {
-        const SRenderingPass* pPass = &fx.m_passes[numPasses - i - 1];
-
-        // gather pass data
-        Vec2 offset = pPass->m_posOffset;
-
-        float charX = offset.x;
-        float charY = offset.y + size.y;
-
-        if (charY > maxH)
-        {
-            maxH = charY;
-        }
-
-        // parse the string, ignoring control characters
-        uint32_t nextCh = 0;
-        Unicode::CIterator<const char*, false> pChar(pStr);
-        while (uint32_t ch = *pChar)
-        {
-            ++pChar;
-            nextCh = *pChar;
-            switch (ch)
-            {
-            case '\\':
-            {
-                if (*pChar != 'n' || !asciiMultiLine)
-                {
-                    break;
-                }
-
-                ++pChar;
-            }
-            case '\n':
-            {
-                if (charX > maxW)
-                {
-                    maxW = charX;
-                }
-
-                charX = offset.x;
-                charY += size.y;
-
-                if (charY > maxH)
-                {
-                    maxH = charY;
-                }
-
-                continue;
-            }
-            break;
-            case '\r':
-            {
-                if (charX > maxW)
-                {
-                    maxW = charX;
-                }
-
-                charX = offset.x;
-                continue;
-            }
-            break;
-            case '\t':
-            {
-                if (ctx.m_proportional)
-                {
-                    charX += TabCharCount * size.x * FONT_SPACE_SIZE;
-                }
-                else
-                {
-                    charX += TabCharCount * size.x * ctx.m_widthScale;
-                }
-                continue;
-            }
-            break;
-            case '$':
-            {
-                if (ctx.m_processSpecialChars)
-                {
-                    if (*pChar == '$')
-                    {
-                        ++pChar;
-                    }
-                    else if (isdigit(*pChar))
-                    {
-                        ++pChar;
-                        continue;
-                    }
-                    else if (*pChar == 'O' || *pChar == 'o')
-                    {
-                        ++pChar;
-                        continue;
-                    }
-                }
-            }
-            break;
-            default:
-                break;
-            }
-
-            const bool rerenderGlyphs = m_sizeBehavior == SizeBehavior::Rerender;
-            const Vec2i requestSize = rerenderGlyphs ? ctx.m_requestSize : CCryFont::defaultGlyphSize;
-            int horizontalAdvance = m_pFontTexture->GetHorizontalAdvance(ch, requestSize);
-            float advance;
-
-            if (ctx.m_proportional)
-            {
-                advance = horizontalAdvance * scaleInfo.scale.x;
-            }
-            else
-            {
-                advance = size.x * ctx.m_widthScale;
-            }
-
-            // Adjust "advance" here for kerning purposes
-            Vec2 kerningOffset(Vec2_Zero);
-            if (ctx.m_kerningEnabled && nextCh)
-            {
-                kerningOffset = m_pFontTexture->GetKerning(ch, nextCh) * scaleInfo.scale.x;
-            }
-
-            // Adjust char width with tracking only if there is a next character
-            if (nextCh)
-            {
-                charX += ctx.m_tracking;
-            }
-
-            charX += advance + kerningOffset.x;
-        }
-
-        if (charX > maxW)
-        {
-            maxW = charX;
-        }
-    }
-
-    return Vec2(maxW, maxH);
-}
-
-uint32 CFFont::GetNumQuadsForText(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    uint32 numQuads = 0;
-
-    const size_t fxSize = m_effects.size();
-    const size_t fxIdx = ctx.m_fxIdx < fxSize ? ctx.m_fxIdx : 0;
-    const SEffect& fx = m_effects[fxIdx];
-
-    for (size_t j = 0, numPasses = fx.m_passes.size(); j < numPasses; ++j)
-    {
-        size_t i = numPasses - j - 1;
-        bool drawFrame = ctx.m_framed && i == numPasses - 1;
-
-        if (drawFrame)
-        {
-            ++numQuads;
-        }
-            
-        uint32_t nextCh = 0;
-        Unicode::CIterator<const char*, false> pChar(pStr);
-        while (uint32_t ch = *pChar)
-        {
-            ++pChar;
-            nextCh = *pChar;
-
-            switch (ch)
-            {
-            case '\\':
-            {
-                if (*pChar != 'n' || !asciiMultiLine)
-                {
-                    break;
-                }
-                ++pChar;
-            }
-            case '\n':
-            {
-                continue;
-            }
-            break;
-            case '\r':
-            {
-                continue;
-            }
-            break;
-            case '\t':
-            {
-                continue;
-            }
-            break;
-            case '$':
-            {
-                if (ctx.m_processSpecialChars)
-                {
-                    if (*pChar == '$')
-                    {
-                        ++pChar;
-                    }
-                    else if (isdigit(*pChar))
-                    {
-                        ++pChar;
-                        continue;
-                    }
-                    else if (*pChar == 'O' || *pChar == 'o')
-                    {
-                        ++pChar;
-                        continue;
-                    }
-                }
-            }
-            break;
-            default:
-                break;
-            }
-        
-            ++numQuads;
-        }
-    }
-
-    return numQuads;
-}
-
-uint32 CFFont::WriteTextQuadsToBuffers(SVF_P2F_C4B_T2F_F4B* verts, uint16* indices, uint32 maxQuads, float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> locker(m_fontMutex);
-
-    uint32 numQuadsWritten = 0;
-
-    const size_t fxSize = m_effects.size();
-    IF (fxSize && m_texID == -1 && !InitTexture(), 0)
-    {
-        return numQuadsWritten;
-    }
-
-    // if the font is about to be deleted then m_pCryFont can be nullptr
-    if (!m_pCryFont)
-    {
-        return numQuadsWritten;
-    }
-
-    SVF_P2F_C4B_T2F_F4B* pVertex = verts;
-    uint16* pIndex = indices;
-    size_t vbOffset = 0;
-    size_t ibOffset = 0;
-
-    // Local function that is passed into CreateQuadsForText as the AddQuad function
-    AddFunction AddQuad = [&pVertex, &pIndex, &vbOffset, &ibOffset, maxQuads, &numQuadsWritten]
-        (const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, const Vec2& tc0, const Vec2& tc1, const Vec2& tc2, const Vec2& tc3, uint32 packedColor)
-    {
-        Vec2 xy0(v0);
-        Vec2 xy1(v1);
-        Vec2 xy2(v2);
-        Vec2 xy3(v3);
-
-        AZ_Assert(vbOffset + 3 < maxQuads * 4, "Vertex buffer overflow");
-        AZ_Assert(ibOffset + 5 < maxQuads * 6, "Index buffer overflow");
-
-        // This should never happen but for safety make sure we never write off end of buffers (should hit asserts above if this is the case)
-        if (numQuadsWritten < maxQuads)
-        {
-            // define char quad
-            pVertex[vbOffset].xy = xy0;
-            pVertex[vbOffset].color.dcolor = packedColor;
-            pVertex[vbOffset].st = tc0;
-            pVertex[vbOffset].texIndex = 0;
-            pVertex[vbOffset].texHasColorChannel = 0;
-            pVertex[vbOffset].texIndex2 = 0;
-            pVertex[vbOffset].pad = 0;
-
-            pVertex[vbOffset + 1].xy = xy1;
-            pVertex[vbOffset + 1].color.dcolor = packedColor;
-            pVertex[vbOffset + 1].st = tc1;
-            pVertex[vbOffset + 1].texIndex = 0;
-            pVertex[vbOffset + 1].texHasColorChannel = 0;
-            pVertex[vbOffset + 1].texIndex2 = 0;
-            pVertex[vbOffset + 1].pad = 0;
-
-            pVertex[vbOffset + 2].xy = xy2;
-            pVertex[vbOffset + 2].color.dcolor = packedColor;
-            pVertex[vbOffset + 2].st = tc2;
-            pVertex[vbOffset + 2].texIndex = 0;
-            pVertex[vbOffset + 2].texHasColorChannel = 0;
-            pVertex[vbOffset + 2].texIndex2 = 0;
-            pVertex[vbOffset + 2].pad = 0;
-
-            pVertex[vbOffset + 3].xy = xy3;
-            pVertex[vbOffset + 3].color.dcolor = packedColor;
-            pVertex[vbOffset + 3].st = tc3;
-            pVertex[vbOffset + 3].texIndex = 0;
-            pVertex[vbOffset + 3].texHasColorChannel = 0;
-            pVertex[vbOffset + 3].texIndex2 = 0;
-            pVertex[vbOffset + 3].pad = 0;
-
-            pIndex[ibOffset] = vbOffset;
-            pIndex[ibOffset + 1] = vbOffset + 1;
-            pIndex[ibOffset + 2] = vbOffset + 2;
-            pIndex[ibOffset + 3] = vbOffset + 2;
-            pIndex[ibOffset + 4] = vbOffset + 3;
-            pIndex[ibOffset + 5] = vbOffset + 0;
-
-            vbOffset += 4;
-            ibOffset += 6;
-
-            ++numQuadsWritten;
-        }
-    };
-
-    // Local function that is passed into CreateQuadsForText as the BeginPass function
-    BeginPassFunction BeginPass = []
-        (const SRenderingPass* /* pPass */)
-    {
-    };
-
-
-    CreateQuadsForText(x, y, z, pStr, asciiMultiLine, ctx, AddQuad, BeginPass);
-
-    return numQuadsWritten;
-}
-
-int CFFont::GetFontTextureId()
-{
-    if (m_texID == -1 && !InitTexture())
-    {
-        return -1;
-    }
-
-    return m_texID;
-}
-
-uint32 CFFont::GetFontTextureVersion()
-{
-    return m_textureVersion;
-}
-
-void CFFont::CreateQuadsForText(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx,
-    AddFunction AddQuad, BeginPassFunction BeginPass)
-{
-    const size_t fxSize = m_effects.size();
-
-    Prepare(pStr, true, ctx.m_requestSize);
-
-    const size_t fxIdx = ctx.m_fxIdx < fxSize ? ctx.m_fxIdx : 0;
-    const SEffect& fx = m_effects[fxIdx];
-
-    bool isRGB = m_pCryFont->RndPropIsRGBA();
-
-    float halfTexelShift = m_pCryFont->RndPropHalfTexelOffset();
-
-    bool passZeroColorOverridden = ctx.IsColorOverridden();
-
-    uint32 alphaBlend = passZeroColorOverridden ? ctx.m_colorOverride.a : fx.m_passes[0].m_color.a;
-    if (alphaBlend > 128)
-    {
-        ++alphaBlend; // 0..256 for proper blending
-    }
-    IRenderer* pRenderer = gEnv->pRenderer;
-    AZ_Assert(pRenderer, "gEnv->pRenderer is NULL");
-
-    // This is the "logical" size of the font (in pixels). The actual size of
-    // the glyphs in the font texture may have additional scaling applied or
-    // could have been re-rendered at a different size.
-    Vec2 size = ctx.m_size;
-    if (ctx.m_sizeIn800x600)
-    {
-        pRenderer->ScaleCoord(size.x, size.y);
-    }
-
-    // This scaling takes into account the logical size of the font relative
-    // to any additional scaling applied (such as from "size ratio").
-    const TextScaleInfoInternal scaleInfo(CalculateScaleInternal(ctx));
-    
-    Vec2 baseXY = Vec2(x, y); // in pixels
-    if (ctx.m_sizeIn800x600)
-    {
-        pRenderer->ScaleCoord(baseXY.x, baseXY.y);
-    }
-
-    // Apply overscan border
-    const int flags = ctx.GetFlags();
-    if ((flags & eDrawText_2D) && !(flags & eDrawText_IgnoreOverscan))
-    {
-        Vec2 overscanBorder = Vec2(0.0f, 0.0f);
-        pRenderer->EF_Query(EFQ_OverscanBorders, overscanBorder);
-
-        const float screenWidth = (float)pRenderer->GetOverlayWidth();
-        const float screenHeight = (float)pRenderer->GetOverlayHeight();
-        Vec2 overscanBorderOffset = ZERO;
-        if (!(flags & eDrawText_Center))
-        {
-            overscanBorderOffset.x = (overscanBorder.x * screenWidth);
-        }
-        if (!(flags & eDrawText_CenterV))
-        {
-            overscanBorderOffset.y = (overscanBorder.y * screenHeight);
-        }
-        if (flags & eDrawText_Right)
-        {
-            overscanBorderOffset.x = -overscanBorderOffset.x;
-        }
-        if (flags & eDrawText_Bottom)
-        {
-            overscanBorderOffset.y = -overscanBorderOffset.y;
-        }
-        baseXY += overscanBorderOffset;
-    }
-
-    // snap for pixel perfect rendering (better quality for text)
-    if (ctx.m_pixelAligned)
-    {
-        baseXY.x = floor(baseXY.x);
-        baseXY.y = floor(baseXY.y);
-
-        // for smaller fonts (half res or less) it's better to average multiple pixels (we don't miss lines)
-        if (scaleInfo.scale.x < 0.9f)
-        {
-            baseXY.x += 0.5f; // try to average two columns (for exact half res)
-        }
-        if (scaleInfo.scale.y < 0.9f)
-        {
-            baseXY.y += 0.25f; // hand tweaked value to get a good result with tiny font (640x480 underscore in console)
-        }
-    }
-
-    for (size_t j = 0, numPasses = fx.m_passes.size(); j < numPasses; ++j)
-    {
-        size_t i = numPasses - j - 1;
-
-        const SRenderingPass* pPass = &fx.m_passes[i];
-
-        if (!i)
-        {
-            alphaBlend = 256;
-        }
-
-        ColorB passColor = !i && passZeroColorOverridden ? ctx.m_colorOverride : fx.m_passes[i].m_color;
-
-        // gather pass data
-        Vec2 offset = pPass->m_posOffset; // in pixels
-
-        float charX = baseXY.x + offset.x; // in pixels
-        float charY = baseXY.y + offset.y; // in pixels
-
-        ColorB color = passColor;
-
-        bool drawFrame = ctx.m_framed && i == numPasses - 1;
-
-        BeginPass(pPass);
-
-        if (drawFrame)
-        {
-            ColorB tempColor(255, 255, 255, 255);
-            uint32 frameColor = tempColor.pack_abgr8888();
-            if (!isRGB)
-            {
-                frameColor = COLCONV(frameColor);
-            }
-
-            Vec2 textSize = GetTextSizeUInternal(pStr, asciiMultiLine, ctx);
-
-            float x0 = baseXY.x - 12;
-            float y0 = baseXY.y - 6;
-            float x1 = baseXY.x + textSize.x + 12;
-            float y1 = baseXY.y + textSize.y + 6;
-
-            bool culled = false;
-            IF (ctx.m_clippingEnabled, 0)
-            {
-                float clipX = ctx.m_clipX;
-                float clipY = ctx.m_clipY;
-                float clipR = ctx.m_clipX + ctx.m_clipWidth;
-                float clipB = ctx.m_clipY + ctx.m_clipHeight;
-
-                if ((x0 >= clipR) || (y0 >= clipB) || (x1 < clipX) || (y1 < clipY))
-                {
-                    culled = true;
-                }
-
-                x0 = max(clipX, x0);
-                y0 = max(clipY, y0);
-                x1 = min(clipR, x1);
-                y1 = min(clipB, y1);
-
-                //if (!culled && ((x1 - x0 <= 0.0f) || (y1 - y0 <= 0.0f)))
-                //  culled = true;
-            }
-
-            IF (!culled, 1)
-            {
-                Vec3 v0(x0, y0, z);
-                Vec3 v2(x1, y1, z);
-                Vec3 v1(v2.x, v0.y, v0.z); // to avoid float->half conversion
-                Vec3 v3(v0.x, v2.y, v0.z); // to avoid float->half conversion
-
-                if (ctx.m_drawTextFlags & eDrawText_UseTransform)
-                {
-                    v0 = ctx.m_transform * v0;
-                    v2 = ctx.m_transform * v2;
-                    v1 = ctx.m_transform * v1;
-                    v3 = ctx.m_transform * v3;
-                }
-
-                Vec2 gradientUvMin, gradientUvMax;
-                GetGradientTextureCoord(gradientUvMin.x, gradientUvMin.y, gradientUvMax.x, gradientUvMax.y);
-
-                // define the frame quad
-                Vec2 uv(gradientUvMin.x, gradientUvMax.y);
-                AddQuad(v0, v1, v2, v3, uv, uv, uv, uv, frameColor);
-            }
-        }
-
-        // parse the string, ignoring control characters
-        uint32_t nextCh = 0;
-        Unicode::CIterator<const char*, false> pChar(pStr);
-        while (uint32_t ch = *pChar)
-        {
-            ++pChar;
-            nextCh = *pChar;
-
-            switch (ch)
-            {
-            case '\\':
-            {
-                if (*pChar != 'n' || !asciiMultiLine)
-                {
-                    break;
-                }
-                ++pChar;
-            }
-            case '\n':
-            {
-                charX = baseXY.x + offset.x;
-                charY += size.y;
-                continue;
-            }
-            break;
-            case '\r':
-            {
-                charX = baseXY.x + offset.x;
-                continue;
-            }
-            break;
-            case '\t':
-            {
-                if (ctx.m_proportional)
-                {
-                    charX += TabCharCount * size.x * FONT_SPACE_SIZE;
-                }
-                else
-                {
-                    charX += TabCharCount * size.x * ctx.m_widthScale;
-                }
-                continue;
-            }
-            break;
-            case '$':
-            {
-                if (ctx.m_processSpecialChars)
-                {
-                    if (*pChar == '$')
-                    {
-                        ++pChar;
-                    }
-                    else if (isdigit(*pChar))
-                    {
-                        if (!i)
-                        {
-                            int colorIndex = (*pChar) - '0';
-                            ColorB newColor = ColorTable[colorIndex];
-                            color.r = newColor.r;
-                            color.g = newColor.g;
-                            color.b = newColor.b;
-                            // Leave alpha at original value!
-                        }
-                        ++pChar;
-                        continue;
-                    }
-                    else if (*pChar == 'O' || *pChar == 'o')
-                    {
-                        if (!i)
-                        {
-                            color = passColor;
-                        }
-                        ++pChar;
-                        continue;
-                    }
-                }
-            }
-            break;
-            default:
-                break;
-            }
-
-            // get texture coordinates
-            float texCoord[4];
-
-            int charOffsetX, charOffsetY; // in font texels
-            int charSizeX, charSizeY; // in font texels
-            const bool rerenderGlyphs = m_sizeBehavior == SizeBehavior::Rerender;
-            const Vec2i requestSize = rerenderGlyphs ? ctx.m_requestSize : CCryFont::defaultGlyphSize;
-            m_pFontTexture->GetTextureCoord(m_pFontTexture->GetCharSlot(ch, requestSize), texCoord, charSizeX, charSizeY, charOffsetX, charOffsetY, requestSize);
-
-            int horizontalAdvance = m_pFontTexture->GetHorizontalAdvance(ch, requestSize);
-            float advance;
-
-            if (ctx.m_proportional)
-            {
-                advance = horizontalAdvance * scaleInfo.scale.x;
-            }
-            else
-            {
-                advance = size.x * ctx.m_widthScale;
-            }
-
-            Vec2 kerningOffset(Vec2_Zero);
-            if (ctx.m_kerningEnabled && nextCh)
-            {
-                kerningOffset = m_pFontTexture->GetKerning(ch, nextCh) * scaleInfo.scale.x;
-            }
-
-            float trackingOffset = 0.0f;
-            if (nextCh)
-            {
-                trackingOffset = ctx.m_tracking;
-            }
-
-            float px = charX + charOffsetX * scaleInfo.scale.x; // in pixels
-            float py = charY + charOffsetY * scaleInfo.scale.y; // in pixels
-            float pr = px + charSizeX * scaleInfo.scale.x;
-            float pb = py + charSizeY * scaleInfo.scale.y;
-
-            // compute clipping
-            float newX = px; // in pixels
-            float newY = py; // in pixels
-            float newR = pr; // in pixels
-            float newB = pb; // in pixels
-
-            if (ctx.m_clippingEnabled)
-            {
-                float clipX = ctx.m_clipX;
-                float clipY = ctx.m_clipY;
-                float clipR = ctx.m_clipX + ctx.m_clipWidth;
-                float clipB = ctx.m_clipY + ctx.m_clipHeight;
-
-                // clip non visible
-                if ((px >= clipR) || (py >= clipB) || (pr < clipX) || (pb < clipY))
-                {
-                    charX += advance + kerningOffset.x + trackingOffset;
-                    continue;
-                }
-                // clip partially visible
-                else
-                {
-                    float width = horizontalAdvance * scaleInfo.rcpCellWidth;
-                    if ((width <= 0.0f) || (size.y <= 0.0f))
-                    {
-                        charX += advance + kerningOffset.x + trackingOffset;
-                        continue;
-                    }
-
-                    // clip the image to the scissor rect
-                    newX = max(clipX, px);
-                    newY = max(clipY, py);
-                    newR = min(clipR, pr);
-                    newB = min(clipB, pb);
-
-                    float rcpWidth = 1.0f / width;
-                    float rcpHeight = 1.0f / size.y;
-
-                    float texW = texCoord[2] - texCoord[0];
-                    float texH = texCoord[3] - texCoord[1];
-
-                    // clip horizontal
-                    texCoord[0] = texCoord[0] + texW * (newX - px) * rcpWidth;
-                    texCoord[2] = texCoord[2] + texW * (newR - pr) * rcpWidth;
-
-                    // clip vertical
-                    texCoord[1] = texCoord[1] + texH * (newY - py) * rcpHeight;
-                    texCoord[3] = texCoord[3] + texH * (newB - pb) * rcpHeight;
-                }
-            }
-
-            newX += halfTexelShift;
-            newY += halfTexelShift;
-            newR += halfTexelShift;
-            newB += halfTexelShift;
-
-            //int offset = vbLen * 6;
-
-            Vec3 v0(newX, newY, z);
-            Vec3 v2(newR, newB, z);
-            Vec3 v1(v2.x, v0.y, v0.z); // to avoid float->half conversion
-            Vec3 v3(v0.x, v2.y, v0.z); // to avoid float->half conversion
-
-            Vec2 tc0(texCoord[0], texCoord[1]);
-            Vec2 tc2(texCoord[2], texCoord[3]);
-            Vec2 tc1(tc2.x, tc0.y); // to avoid float->half conversion
-            Vec2 tc3(tc0.x, tc2.y); // to avoid float->half conversion
-
-            uint32 packedColor = 0;
-            {
-                ColorB tempColor = color;
-                tempColor.a = ((uint32) tempColor.a * alphaBlend) >> 8;
-                packedColor = tempColor.pack_abgr8888();
-
-                if (!isRGB)
-                {
-                    packedColor = COLCONV(packedColor);
-                }
-            }
-
-            if (ctx.m_drawTextFlags & eDrawText_UseTransform)
-            {
-                v0 = ctx.m_transform * v0;
-                v2 = ctx.m_transform * v2;
-                v1 = ctx.m_transform * v1;
-                v3 = ctx.m_transform * v3;
-            }
-
-            AddQuad(v0, v1, v2, v3, tc0, tc1, tc2, tc3, packedColor);
-
-            charX += advance + kerningOffset.x + trackingOffset;
-        }
-    }
-}
-
-CFFont::TextScaleInfoInternal CFFont::CalculateScaleInternal(const STextDrawContext& ctx) const
-{
-    Vec2 size = GetRestoredFontSize(ctx); // in pixel
-
-    IRenderer* pRenderer = gEnv->pRenderer;
-    AZ_Assert(pRenderer, "gEnv->pRenderer is NULL");
-
-    if (ctx.m_sizeIn800x600)
-    {
-        pRenderer->ScaleCoord(size.x, size.y);
-    }
-
-    float rcpCellWidth;
-    Vec2 scale;
-
-    int fontTextureCellWidth = GetFontTexture()->GetCellWidth();
-    int fontTextureCellHeight = GetFontTexture()->GetCellHeight();
-
-    if (ctx.m_proportional)
-    {
-        rcpCellWidth = (1.0f / static_cast<float>(fontTextureCellWidth)) * size.x;
-        scale = Vec2(rcpCellWidth * ctx.m_widthScale, size.y / static_cast<float>(fontTextureCellHeight));
-    }
-    else
-    {
-        rcpCellWidth = size.x / 16.0f;
-        scale = Vec2(rcpCellWidth * ctx.m_widthScale, size.y * ctx.m_widthScale / 16.0f);
-    }
-
-    return TextScaleInfoInternal(scale, rcpCellWidth);
-}
-
-size_t CFFont::GetTextLength(const char* pStr, const bool asciiMultiLine) const
-{
-    size_t len = 0;
-
-    // parse the string, ignoring control characters
-    const char* pChar = pStr;
-    while (char ch = *pChar++)
-    {
-        if ((ch & 0xC0) == 0x80)
-        {
-            continue;                      // Skip UTF-8 continuation bytes, we count only the first byte of a code-point
-        }
-        switch (ch)
-        {
-        case '\\':
-        {
-            if (*pChar != 'n' || !asciiMultiLine)
-            {
-                break;
-            }
-            ++pChar;
-        }
-        case '\n':
-        case '\r':
-        case '\t':
-        {
-            continue;
-        }
-        break;
-        case '$':
-        {
-            if (*pChar == '$')
-            {
-                ++pChar;
-            }
-            else if (*pChar)
-            {
-                ++pChar;
-                continue;
-            }
-        }
-        break;
-        default:
-            break;
-        }
-        ++len;
-    }
-
-    return len;
-}
-
-void CFFont::WrapText(string& result, float maxWidth, const char* pStr, const STextDrawContext& ctx)
-{
-    result = pStr;
-
-    if (ctx.m_sizeIn800x600)
-    {
-        maxWidth = gEnv->pRenderer->ScaleCoordX(maxWidth);
-    }
-
-    Vec2 strSize = GetTextSizeUInternal(result.c_str(), true, ctx);
-
-    if (strSize.x <= maxWidth)
-    {
-        return;
-    }
-
-    // Assume a given string has multiple lines of text if it's height is
-    // greater than the height of its font.
-    const bool multiLine = strSize.y > GetRestoredFontSize(ctx).y;
-
-    int lastSpace = -1;
-    const char* pLastSpace = NULL;
-    float lastSpaceWidth = 0.0f;
-
-    float curCharWidth = 0.0f;
-    float curLineWidth = 0.0f;
-    float biggestLineWidth = 0.0f;
-    float widthSum = 0.0f;
-
-    int curChar = 0;
-    Unicode::CIterator<const char*, false> pChar(result.c_str());
-    while (uint32_t ch = *pChar)
-    {
-        // Dollar sign escape codes.  The following scenarios can happen with dollar signs embedded in a string.
-        // The following character is...
-        //    1. ... a digit, 'O' or 'o' which indicates a color code.  Both characters a skipped in the width calculation.
-        //    2. ... another dollar sign.  Only 1 dollar sign is skipped in the width calculation.
-        //    3. ... anything else.  The dollar sign is processed in the width calculation.
-        if (ctx.m_processSpecialChars && ch == '$')
-        {
-            ++pChar;
-            char nextChar = *pChar;
-
-            if (isdigit(nextChar) || nextChar == 'O' || nextChar == 'o')
-            {
-                ++pChar;
-                continue;
-            }
-            else if (nextChar != '$')
-            {
-                --pChar;
-            }
-        }
-
-        // get char width and sum it to the line width
-        // Note: This is not unicode compatible, since char-width depends on surrounding context (ie, combining diacritics etc)
-        char codepoint[5];
-        Unicode::Convert(codepoint, ch);
-        curCharWidth = GetTextSizeUInternal(codepoint, true, ctx).x;
-
-        // keep track of spaces
-        // they are good for splitting the string
-        if (ch == ' ')
-        {
-            lastSpace = curChar;
-            lastSpaceWidth = curLineWidth + curCharWidth;
-            pLastSpace = pChar.GetPosition();
-            assert(*pLastSpace == ' ');
-        }
-
-        bool prevCharWasNewline = false;
-        const bool notFirstChar = pChar.GetPosition() != result.c_str();
-        if (*pChar && notFirstChar)
-        {
-            const char* pPrevCharStr = pChar.GetPosition() - 1;
-            prevCharWasNewline = pPrevCharStr[0] == '\n';
-        }
-
-        // if line exceed allowed width, split it
-        if (prevCharWasNewline || (curLineWidth + curCharWidth >= maxWidth && (*pChar)))
-        {
-            if (prevCharWasNewline)
-            {
-                // Reset the current line width to account for newline
-                curLineWidth = curCharWidth;
-                widthSum += curLineWidth;
-            }
-            else if ((lastSpace > 0) && ((curChar - lastSpace) < 16) && (curChar - lastSpace >= 0)) // 16 is the default threshold
-            {
-                *(char*)pLastSpace = '\n';  // This is safe inside UTF-8 because space is single-byte codepoint
-
-                if (lastSpaceWidth > biggestLineWidth)
-                {
-                    biggestLineWidth = lastSpaceWidth;
-                }
-
-                curLineWidth = curLineWidth - lastSpaceWidth + curCharWidth;
-                widthSum += curLineWidth;
-            }
-            else
-            {
-                const char* pBuf = pChar.GetPosition();
-                size_t bytesProcessed = pBuf - result.c_str();
-                result.insert(bytesProcessed, '\n'); // Insert the newline, this invalidates the iterator
-                pBuf = result.c_str() + bytesProcessed; // In case reallocation occurs, we ensure we are inside the new buffer
-                assert(*pBuf == '\n');
-                pChar.SetPosition(pBuf); // pChar once again points inside the target string, at the current character
-                assert(*pChar == ch);
-                ++pChar;
-                ++curChar;
-
-                if (curLineWidth > biggestLineWidth)
-                {
-                    biggestLineWidth = curLineWidth;
-                }
-
-                widthSum += curLineWidth;
-                curLineWidth = curCharWidth;
-            }
-
-            // if we don't need any more line breaks, then just stop, but for
-            // multiple lines we can't assume that there aren't any more
-            // strings to wrap, so continue
-            if (strSize.x - widthSum <= maxWidth && !multiLine)
-            {
-                break;
-            }
-
-            lastSpaceWidth = 0;
-            lastSpace = 0;
-        }
-        else
-        {
-            curLineWidth += curCharWidth;
-        }
-
-        ++curChar;
-        ++pChar;
-    }
-}
-
-void CFFont::GetMemoryUsage (ICrySizer* pSizer) const
-{
-    pSizer->AddObject(m_name);
-    pSizer->AddObject(m_curPath);
-    pSizer->AddObject(m_pFontTexture);
-    pSizer->AddObject(m_pFontBuffer, m_fontBufferSize);
-    pSizer->AddObject(m_effects);
-    pSizer->AddObject(m_pDrawVB, sizeof(SVF_P3F_C4B_T2F) * MaxDrawVBQuads * 6);
-}
-
-void CFFont::GetGradientTextureCoord(float& minU, float& minV, float& maxU, float& maxV) const
-{
-    const CTextureSlot* pSlot = m_pFontTexture->GetGradientSlot();
-    assert(pSlot);
-
-    float invWidth = 1.0f / (float) m_pFontTexture->GetWidth();
-    float invHeight = 1.0f / (float) m_pFontTexture->GetHeight();
-
-    // deflate by one pixel to avoid bilinear filtering on the borders
-    minU = pSlot->vTexCoord[0] + invWidth;
-    minV = pSlot->vTexCoord[1] + invHeight;
-    maxU = pSlot->vTexCoord[0] + (pSlot->iCharWidth - 1) * invWidth;
-    maxV = pSlot->vTexCoord[1] + (pSlot->iCharHeight - 1) * invHeight;
-}
-
-unsigned int CFFont::GetEffectId(const char* pEffectName) const
-{
-    if (pEffectName)
-    {
-        for (size_t i = 0, numEffects = m_effects.size(); i < numEffects; ++i)
-        {
-            if (!strcmp(m_effects[i].m_name.c_str(), pEffectName))
-            {
-                return i;
-            }
-        }
-    }
-
-    return 0;
-}
-
-unsigned int CFFont::GetNumEffects() const
-{
-    return m_effects.size();
-}
-
-const char* CFFont::GetEffectName(unsigned int effectId) const
-{
-    return (effectId < m_effects.size()) ? m_effects[effectId].m_name.c_str() : nullptr;
-}
-
-Vec2 CFFont::GetMaxEffectOffset(unsigned int effectId) const
-{
-    Vec2 maxOffset(0.0f, 0.0f);
-
-    if (effectId < m_effects.size())
-    {
-        const SEffect& fx = m_effects[effectId];
-
-        for (size_t i = 0, numPasses = fx.m_passes.size(); i < numPasses; ++i)
-        {
-            const SRenderingPass* pPass = &fx.m_passes[numPasses - i - 1];
-
-            // gather pass data
-            Vec2 offset = pPass->m_posOffset;
-
-            if (maxOffset.x < offset.x)
-            {
-                maxOffset.x = offset.x;
-            }
-
-            if (maxOffset.y < offset.y)
-            {
-                maxOffset.y = offset.y;
-            }
-        }
-    }
-
-    return maxOffset;
-}
-
-bool CFFont::DoesEffectHaveTransparency(unsigned int effectId) const
-{
-    const size_t fxSize = m_effects.size();
-    const size_t fxIdx = effectId < fxSize ? effectId : 0;
-    const SEffect& fx = m_effects[fxIdx];
-
-    for (auto& pass : fx.m_passes)
-    {
-        // if the alpha is not 255 then there is transparency
-        if (pass.m_color.a != 255)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void CFFont::AddCharsToFontTexture(const char* pChars, int glyphSizeX, int glyphSizeY)
-{
-    AZStd::lock_guard<AZStd::recursive_mutex> locker(m_fontMutex);
-    Vec2i glyphSize(glyphSizeX, glyphSizeY);
-    Prepare(pChars, false, glyphSize);
-}
-
-Vec2 CFFont::GetKerning(uint32_t leftGlyph, uint32_t rightGlyph, const STextDrawContext& ctx) const
-{
-    const TextScaleInfoInternal scaleInfo(CalculateScaleInternal(ctx));
-    return m_pFontTexture->GetKerning(leftGlyph, rightGlyph) * scaleInfo.scale.x;
-}
-
-float CFFont::GetAscender(const STextDrawContext& ctx) const
-{
-    return (ctx.m_size.y * m_pFontTexture->GetAscenderToHeightRatio());
-}
-
-float CFFont::GetBaseline(const STextDrawContext& ctx) const
-{
-    const TextScaleInfoInternal scaleInfo(CalculateScaleInternal(ctx));
-    // Calculate baseline the same way as the font renderer which uses the glyph height * size ratio.
-    // Adding 1 because FontTexture always adds 1 to the char height in GetTextureCoord
-    return (round(m_pFontTexture->GetCellHeight() * GetSizeRatio()) + 1.0f) * scaleInfo.scale.y;
-}
-
-bool CFFont::InitTexture()
-{    
-    m_texID = gEnv->pRenderer->FontCreateTexture(m_pFontTexture->GetWidth(), m_pFontTexture->GetHeight(), (uint8*)m_pFontTexture->GetBuffer(), eTF_A8, IRenderer::FontCreateTextureGenMipsDefaultValue, m_name.c_str());
-    m_textureVersion = 0;
-    return m_texID >= 0;
-}
-
-bool CFFont::InitCache()
-{
-    m_pFontTexture->CreateGradientSlot();
-
-    // precache (not required but for faster printout later)
-    const char first = ' ';
-    const char last = '~';
-    char buf[last - first + 2];
-    char* p = buf;
-
-    // precache all [normal] printable characters to the string (missing ones are updated on demand)
-    for (int i = first; i <= last; ++i)
-    {
-        *p++ = i;
-    }
-    *p = 0;
-
-    Prepare(buf, false);
-
-    return true;
-}
-
-CFFont::SEffect* CFFont::AddEffect(const char* pEffectName)
-{
-    m_effects.push_back(SEffect(pEffectName));
-    return &m_effects[m_effects.size() - 1];
-}
-
-CFFont::SEffect* CFFont::GetDefaultEffect()
-{
-    return &m_effects[0];
-}
-
-void CFFont::Prepare(const char* pStr, bool updateTexture, const Vec2i& glyphSize)
-{
-    const bool rerenderGlyphs = m_sizeBehavior == SizeBehavior::Rerender;
-    const Vec2i usedGlyphSize = rerenderGlyphs ? glyphSize : CCryFont::defaultGlyphSize;
-    bool texUpdateNeeded = m_pFontTexture->PreCacheString(pStr, nullptr, m_sizeRatio, usedGlyphSize, m_fontHintParams) == 1 || m_fontTexDirty;
-    if (updateTexture && texUpdateNeeded && m_texID >= 0)
-    {
-        gEnv->pRenderer->FontUpdateTexture(m_texID, 0, 0, m_pFontTexture->GetWidth(), m_pFontTexture->GetHeight(), (unsigned char*)m_pFontTexture->GetBuffer());
-        m_fontTexDirty = false;
-        ++m_textureVersion;
-
-        // Let any listeners know that the font texture has changed
-        EBUS_EVENT(FontNotificationBus, OnFontTextureUpdated, this);
-    }
-    else
-    {
-        m_fontTexDirty = texUpdateNeeded;
-    }
-}
-
-Vec2 CFFont::GetRestoredFontSize(const STextDrawContext& ctx) const
-{
-    // Calculate the scale that we need to apply to the text size to ensure
-    // it's on-screen size is the same regardless of the slot scaling needed
-    // to fit the glyphs of the font within the font texture slots.
-    float restoringScale = IFFontConstants::defaultSizeRatio / m_sizeRatio;
-    return Vec2(ctx.m_size.x * restoringScale, ctx.m_size.y * restoringScale);
-}
-
-#endif
-
diff --git a/Code/CryEngine/CryFont/FFont.h b/Code/CryEngine/CryFont/FFont.h
deleted file mode 100644
index c2eddd7b1d..0000000000
--- a/Code/CryEngine/CryFont/FFont.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Font class.
-
-
-#ifndef CRYINCLUDE_CRYFONT_FFONT_H
-#define CRYINCLUDE_CRYFONT_FFONT_H
-#pragma once
-
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include <vector>
-#include <Cry_Math.h>
-#include <Cry_Color.h>
-#include <CryString.h>
-#include "CryFont.h"
-
-#include <AzCore/std/parallel/mutex.h>
-
-struct ISystem;
-class CFontTexture;
-
-
-class CFFont
-    : public IFFont
-    , public IFFont_RenderProxy
-{
-public:
-    //! Determines how characters of different sizes should be handled during render.
-    enum class SizeBehavior
-    {
-        Scale,      //!< Default behavior; glyphs rendered at different sizes are rendered on scaled geometry
-        Rerender    //!< Similar to Scale, but the glyph in the font texture is re-rendered to match the target
-                    //!< size, as long as the size isn't greater than the maximum glyph/slot resolution as
-                    //!< configured for the font texture in the font XML.
-    };
-
-    //! The hinting visual algorithm to be used (when hinting is enabled)
-    enum class HintStyle
-    {
-        Normal, //!< Default hinting behavior provided by font renderer
-        Light   //!< Produces fuzzier glyphs but more accurately tracks glyph shape
-    };
-
-    //! Chooses whether hinting info should be obtained from the font, turned off entirely, or automatically generated
-    enum class HintBehavior
-    {
-        Default,    //!< Obtain hinting data from font itself
-        AutoHint,   //!< Procedurally derive hinting information from glyph
-        NoHinting,  //!< Disable hinting entirely
-    };
-
-    //! Simple struct used to communicate font hinting parameters to font renderer.
-    struct FontHintParams
-    {
-        FontHintParams() : hintStyle(HintStyle::Normal), hintBehavior(HintBehavior::Default) { }
-
-        HintStyle hintStyle;
-        HintBehavior hintBehavior;
-    };
-
-    struct SRenderingPass
-    {
-        ColorB m_color;
-        Vec2 m_posOffset;
-        int m_blendSrc;
-        int m_blendDest;
-
-        SRenderingPass()
-            : m_color(255, 255, 255, 255)
-            , m_posOffset(0, 0)
-            , m_blendSrc(GS_BLSRC_SRCALPHA)
-            , m_blendDest(GS_BLDST_ONEMINUSSRCALPHA)
-        {
-        }
-
-        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-    };
-
-    struct SEffect
-    {
-        string m_name;
-        std::vector<SRenderingPass> m_passes;
-
-        SEffect(const char* name)
-            : m_name(name)
-        {
-            assert(name);
-        }
-
-        SRenderingPass* AddPass()
-        {
-            m_passes.push_back(SRenderingPass());
-            return &m_passes[m_passes.size() - 1];
-        }
-
-        void ClearPasses()
-        {
-            m_passes.resize(0);
-        }
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(m_name);
-            pSizer->AddObject(m_passes);
-        }
-    };
-
-    typedef std::vector<SEffect> Effects;
-    typedef Effects::iterator EffectsIt;
-
-public:
-    virtual int32 AddRef() override;
-    virtual int32 Release() override;
-    virtual bool Load(const char* pFontFilePath, unsigned int width, unsigned int height, unsigned int widthNumSlots, unsigned int heightNumSlots, unsigned int flags, float sizeRatio);
-    virtual bool Load(const char* pXMLFile);
-    virtual void Free();
-    virtual void DrawString(float x, float y, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-    virtual void DrawString(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-    virtual Vec2 GetTextSize(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-    virtual size_t GetTextLength(const char* pStr, const bool asciiMultiLine) const;
-    virtual void WrapText(string& result, float maxWidth, const char* pStr, const STextDrawContext& ctx);
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual void GetGradientTextureCoord(float& minU, float& minV, float& maxU, float& maxV) const;
-    virtual unsigned int GetEffectId(const char* pEffectName) const;
-    virtual unsigned int GetNumEffects() const;
-    virtual const char* GetEffectName(unsigned int effectId) const;
-    virtual Vec2 GetMaxEffectOffset(unsigned int effectId) const;
-    virtual bool DoesEffectHaveTransparency(unsigned int effectId) const;
-    virtual void AddCharsToFontTexture(const char* pChars, int glyphSizeX = ICryFont::defaultGlyphSizeX, int glyphSizeY = ICryFont::defaultGlyphSizeY) override;
-    virtual Vec2 GetKerning(uint32_t leftGlyph, uint32_t rightGlyph, const STextDrawContext& ctx) const override;
-    virtual float GetAscender(const STextDrawContext& ctx) const override;
-    virtual float GetBaseline(const STextDrawContext& ctx) const override;
-
-    virtual uint32 GetNumQuadsForText(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-    virtual uint32 WriteTextQuadsToBuffers(SVF_P2F_C4B_T2F_F4B* verts, uint16* indices, uint32 maxQuads, float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-    virtual int GetFontTextureId();
-    virtual uint32 GetFontTextureVersion();
-
-    virtual float GetSizeRatio() const override { return m_sizeRatio; }
-
-public:
-    virtual void RenderCallback(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-
-public:
-    CFFont(ISystem* pSystem, CCryFont* pCryFont, const char* pFontName);
-
-    bool InitTexture();
-    bool InitCache();
-
-    CFontTexture* GetFontTexture() const { return m_pFontTexture; }
-    const string& GetName() const { return m_name; }
-
-    SEffect* AddEffect(const char* pEffectName);
-    SEffect* GetDefaultEffect();
-
-private:
-    virtual ~CFFont();
-
-    void Prepare(const char* pStr, bool updateTexture, const Vec2i& glyphSize = CCryFont::defaultGlyphSize);
-    void DrawStringUInternal(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-    Vec2 GetTextSizeUInternal(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-
-    using AddFunction = AZStd::function<void(const Vec3&, const Vec3&, const Vec3&, const Vec3&, const Vec2&, const Vec2&, const Vec2&, const Vec2&, uint32)>;
-    using BeginPassFunction = AZStd::function<void(const SRenderingPass* pPass)>;
-    
-    //! This function is used by both RenderCallback and WriteTextQuadsToBuffers
-    //! To do this is takes two function pointers that implement the appropriate AddQuad and BeginPass behavior
-    void CreateQuadsForText(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx,
-        AddFunction AddQuad, BeginPassFunction BeginPass);
-
-    struct TextScaleInfoInternal
-    {
-        TextScaleInfoInternal(const Vec2& _scale, float _rcpCellWidth)
-            : scale(_scale), rcpCellWidth(_rcpCellWidth) { }
-
-        Vec2 scale;
-        float rcpCellWidth;
-    };
-
-    TextScaleInfoInternal CalculateScaleInternal(const STextDrawContext& ctx) const;
-
-    Vec2 GetRestoredFontSize(const STextDrawContext& ctx) const;
-
-private:
-    string m_name;
-    string m_curPath;
-
-    CFontTexture* m_pFontTexture;
-
-    size_t m_fontBufferSize;
-    unsigned char* m_pFontBuffer;
-
-    int m_texID;    
-    uint32 m_textureVersion;
-
-    ISystem* m_pSystem;
-
-    AZStd::recursive_mutex m_fontMutex; //!< Controls access between main and render threads. It's common for one thread
-                                        //!< to add un-cached glyphs to the font texture while another is accessing the
-                                        //!< font texture.
-
-    CCryFont* m_pCryFont;
-
-    bool m_fontTexDirty;
-
-    Effects m_effects;
-
-    SVF_P3F_C4B_T2F* m_pDrawVB;
-
-    volatile int32 m_nRefCount;
-
-    bool m_monospacedFont; //!< True if this font is fixed/monospaced, false otherwise (obtained from FreeType)
-
-    float m_sizeRatio = IFFontConstants::defaultSizeRatio;
-    SizeBehavior m_sizeBehavior = SizeBehavior::Scale;   //!< Changes how glyphs rendered at different sizes are rendered.
-    FontHintParams m_fontHintParams; //!< How the font should be hinted when its loaded and rendered to the font texture
-};
-
-#endif
-
-#endif // CRYINCLUDE_CRYFONT_FFONT_H
diff --git a/Code/CryEngine/CryFont/FFontXML.cpp b/Code/CryEngine/CryFont/FFontXML.cpp
deleted file mode 100644
index 1fdd84994e..0000000000
--- a/Code/CryEngine/CryFont/FFontXML.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : XML parsing to load a font.
-
-
-#include "CryFont_precompiled.h"
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include "FFont.h"
-#include "FontTexture.h"
-#include <Cry_Math.h>
-#include <CryPath.h>
-
-#if defined(WIN32) || defined(WIN64)
-#   include <shlobj.h>
-#   include <StringUtils.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Xml parser implementation
-
-enum
-{
-
-    ELEMENT_UNKNOWN         = 0,
-    ELEMENT_FONT            = 1,
-    ELEMENT_EFFECT          = 2,
-    ELEMENT_EFFECTFILE      = 3,
-    ELEMENT_PASS            = 4,
-    ELEMENT_PASS_COLOR      = 5,
-    ELEMENT_PASS_POSOFFSET  = 12,
-    ELEMENT_PASS_BLEND      = 14
-};
-
-static inline int GetBlendModeFromString(const string& str, bool dst)
-{
-    int blend = GS_BLSRC_ONE;
-
-    if (str == "zero")
-    {
-        blend = dst ? GS_BLDST_ZERO : GS_BLSRC_ZERO;
-    }
-    else if (str == "one")
-    {
-        blend = dst ? GS_BLDST_ONE : GS_BLSRC_ONE;
-    }
-    else if (str == "srcalpha" ||
-             str == "src_alpha")
-    {
-        blend = dst ? GS_BLDST_SRCALPHA : GS_BLSRC_SRCALPHA;
-    }
-    else if (str == "invsrcalpha" ||
-             str == "inv_src_alpha")
-    {
-        blend = dst ? GS_BLDST_ONEMINUSSRCALPHA : GS_BLSRC_ONEMINUSSRCALPHA;
-    }
-    else if (str == "dstalpha" ||
-             str == "dst_alpha")
-    {
-        blend = dst ? GS_BLDST_DSTALPHA : GS_BLSRC_DSTALPHA;
-    }
-    else if (str == "invdstalpha" ||
-             str == "inv_dst_alpha")
-    {
-        blend = dst ? GS_BLDST_ONEMINUSDSTALPHA : GS_BLSRC_ONEMINUSDSTALPHA;
-    }
-    else if (str == "dstcolor" ||
-             str == "dst_color")
-    {
-        blend = GS_BLSRC_DSTCOL;
-    }
-    else if (str == "srccolor" ||
-             str == "src_color")
-    {
-        blend = GS_BLDST_SRCCOL;
-    }
-    else if (str == "invdstcolor" ||
-             str == "inv_dst_color")
-    {
-        blend = GS_BLSRC_ONEMINUSDSTCOL;
-    }
-    else if (str == "invsrccolor" ||
-             str == "inv_src_color")
-    {
-        blend = GS_BLDST_ONEMINUSSRCCOL;
-    }
-
-    return blend;
-}
-
-class CXmlFontShader
-{
-public:
-    CXmlFontShader(CFFont* pFont)
-    {
-        m_pFont = pFont;
-        m_nElement = ELEMENT_UNKNOWN;
-        m_pEffect = NULL;
-        m_pPass = NULL;
-        m_FontTexSize.set(0, 0);
-
-        static const int defaultSlotWidthSize = 16;
-        static const int defaultSlotHeightSize = 8;
-        m_SlotSizes.set(defaultSlotWidthSize, defaultSlotHeightSize);
-
-        m_FontSmoothAmount = 0;
-        m_FontSmoothMethod = FONT_SMOOTH_NONE;
-    }
-
-    ~CXmlFontShader()
-    {
-    }
-
-    void ScanXmlNodesRecursively(XmlNodeRef node)
-    {
-        if (!node)
-        {
-            return;
-        }
-
-        FoundElement(node->getTag());
-
-        for (int i = 0, count = node->getNumAttributes(); i < count; ++i)
-        {
-            const char* key = "";
-            const char* value = "";
-            if (node->getAttributeByIndex(i, &key, &value))
-            {
-                FoundAttribute(key, value);
-            }
-        }
-
-        for (int i = 0, count = node->getChildCount(); i < count; ++i)
-        {
-            XmlNodeRef child = node->getChild(i);
-            ScanXmlNodesRecursively(child);
-        }
-    }
-
-private:
-    // notify methods
-    void FoundElement(const string& name)
-    {
-        //MessageBox(NULL, string("[" + name + "]").c_str(), "FoundElement", MB_OK);
-        // process the previous element
-        switch (m_nElement)
-        {
-        case ELEMENT_FONT:
-        {
-            if (!m_FontTexSize.x || !m_FontTexSize.y)
-            {
-                m_FontTexSize.set(512, 512);
-            }
-
-            bool fontLoaded = m_pFont->Load(m_strFontPath.c_str(), m_FontTexSize.x, m_FontTexSize.y, m_SlotSizes.x, m_SlotSizes.y, TTFFLAG_CREATE(m_FontSmoothMethod, m_FontSmoothAmount), m_SizeRatio);
-#if defined(WIN32) || defined(WIN64)
-            if (!fontLoaded)
-            {
-                TCHAR sysFontPath[MAX_PATH];
-                if (SUCCEEDED(SHGetFolderPath(0, CSIDL_FONTS, 0, SHGFP_TYPE_DEFAULT, sysFontPath)))
-                {
-                    const char* pFontPath = m_strFontPath.c_str();
-                    const char* pFontName = CryStringUtils::FindFileNameInPath(pFontPath);
-
-                    string newFontPath(sysFontPath);
-                    newFontPath += "/";
-                    newFontPath += pFontName;
-                    m_pFont->Load(newFontPath, m_FontTexSize.x, m_FontTexSize.y, m_SlotSizes.x, m_SlotSizes.y, TTFFLAG_CREATE(m_FontSmoothMethod, m_FontSmoothAmount), m_SizeRatio);
-                }
-            }
-#endif
-        }
-        break;
-
-        default:
-            break;
-        }
-
-        // Translate the m_nElement name to a define
-        if (name == "font")
-        {
-            m_nElement = ELEMENT_FONT;
-        }
-        else if (name == "effect")
-        {
-            m_nElement = ELEMENT_EFFECT;
-        }
-        else if (name == "effectfile")
-        {
-            m_nElement = ELEMENT_EFFECTFILE;
-        }
-        else if (name == "pass")
-        {
-            m_pPass = NULL;
-            m_nElement = ELEMENT_PASS;
-            if (m_pEffect)
-            {
-                m_pPass = m_pEffect->AddPass();
-            }
-        }
-        else if (name == "color")
-        {
-            m_nElement = ELEMENT_PASS_COLOR;
-        }
-        else if (name == "pos" ||
-                 name == "offset")
-        {
-            m_nElement = ELEMENT_PASS_POSOFFSET;
-        }
-        else if (name == "blend" ||
-                 name == "blending")
-        {
-            m_nElement = ELEMENT_PASS_BLEND;
-        }
-        else
-        {
-            m_nElement = ELEMENT_UNKNOWN;
-        }
-    }
-
-    void FoundAttribute(const string& name, const string& value)
-    {
-        //MessageBox(NULL, string(name + "\n" + value).c_str(), "FoundAttribute", MB_OK);
-        switch (m_nElement)
-        {
-        case ELEMENT_FONT:
-            if (name == "path")
-            {
-                m_strFontPath = value;
-            }
-            else if (name == "w")
-            {
-                m_FontTexSize.x = (long)atof(value.c_str());
-            }
-            else if (name == "h")
-            {
-                m_FontTexSize.y = (long)atof(value.c_str());
-            }
-            else if (name == "widthslots")
-            {
-                m_SlotSizes.x = (int)atoi(value.c_str());
-            }
-            else if (name == "heightslots")
-            {
-                m_SlotSizes.y = (int)atoi(value.c_str());
-            }
-            else if (name == "sizeratio")
-            {
-                m_SizeRatio = static_cast<float>(atof(value.c_str()));
-            }
-            else if (name == "smooth")
-            {
-                if (value == "blur")
-                {
-                    m_FontSmoothMethod = FONT_SMOOTH_BLUR;
-                }
-                else if (value == "supersample")
-                {
-                    m_FontSmoothMethod = FONT_SMOOTH_SUPERSAMPLE;
-                }
-                else if (value == "none")
-                {
-                    m_FontSmoothMethod = FONT_SMOOTH_NONE;
-                }
-            }
-            else if (name == "smooth_amount")
-            {
-                m_FontSmoothAmount = (long)atof(value.c_str());
-            }
-            break;
-
-        case ELEMENT_EFFECT:
-            if (name == "name")
-            {
-                if (value == "default")
-                {
-                    m_pEffect = m_pFont->GetDefaultEffect();
-                    m_pEffect->ClearPasses();
-                }
-                else
-                {
-                    m_pEffect = m_pFont->AddEffect(value.c_str());
-                }
-            }
-            break;
-
-        case ELEMENT_EFFECTFILE:
-            if (name == "path")
-            {
-                m_strFontEffectPath = value;
-            }
-            break;
-
-        case ELEMENT_PASS_COLOR:
-            if (!m_pPass)
-            {
-                break;
-            }
-            if (name == "r")
-            {
-                m_pPass->m_color.r = (uint8)((float)atof(value.c_str()) * 255.0f);
-            }
-            else if (name == "g")
-            {
-                m_pPass->m_color.g = (uint8)((float)atof(value.c_str()) * 255.0f);
-            }
-            else if (name == "b")
-            {
-                m_pPass->m_color.b = (uint8)((float)atof(value.c_str()) * 255.0f);
-            }
-            else if (name == "a")
-            {
-                m_pPass->m_color.a = (uint8)((float)atof(value.c_str()) * 255.0f);
-            }
-            break;
-
-        case ELEMENT_PASS_POSOFFSET:
-            if (!m_pPass)
-            {
-                break;
-            }
-            if (name == "x")
-            {
-                m_pPass->m_posOffset.x = (float)atoi(value.c_str());
-            }
-            else if (name == "y")
-            {
-                m_pPass->m_posOffset.y = (float)atoi(value.c_str());
-            }
-            break;
-
-        case ELEMENT_PASS_BLEND:
-            if (!m_pPass)
-            {
-                break;
-            }
-            if (name == "src")
-            {
-                m_pPass->m_blendSrc = GetBlendModeFromString(value, false);
-            }
-            else if (name == "dst")
-            {
-                m_pPass->m_blendDest = GetBlendModeFromString(value, true);
-            }
-            else if (name == "type")
-            {
-                if (value == "modulate")
-                {
-                    m_pPass->m_blendSrc = GS_BLSRC_SRCALPHA;
-                    m_pPass->m_blendDest = GS_BLDST_ONEMINUSSRCALPHA;
-                }
-                else if (value == "additive")
-                {
-                    m_pPass->m_blendSrc = GS_BLSRC_SRCALPHA;
-                    m_pPass->m_blendDest = GS_BLDST_ONE;
-                }
-            }
-            break;
-
-        default:
-        case ELEMENT_UNKNOWN:
-            break;
-        }
-    }
-
-public:
-    CFFont* m_pFont;
-
-    unsigned long m_nElement;
-
-    CFFont::SEffect*        m_pEffect;
-    CFFont::SRenderingPass* m_pPass;
-
-    string    m_strFontPath;
-    string    m_strFontEffectPath;
-    vector2l  m_FontTexSize;
-    Vec2i     m_SlotSizes;
-    float     m_SizeRatio = IFFontConstants::defaultSizeRatio;
-
-    int       m_FontSmoothMethod;
-    int       m_FontSmoothAmount;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Main loading function
-bool CFFont::Load(const char* pXMLFile)
-{
-    m_curPath = "";
-    if (pXMLFile)
-    {
-        m_curPath = PathUtil::GetPath(pXMLFile);
-    }
-
-    XmlNodeRef root = GetISystem()->LoadXmlFromFile(pXMLFile);
-    if (!root)
-    {
-        return false;
-    }
-
-    CXmlFontShader xmlfs(this);
-    xmlfs.ScanXmlNodesRecursively(root);
-
-    // if this was not a valid font XML file then return false
-    if (!m_pFontTexture || !m_pFontBuffer)
-    {
-        return false;
-    }
-
-    // if there was a font effect file then parse that for effects
-    if (!xmlfs.m_strFontEffectPath.empty())
-    {
-        XmlNodeRef fontEffectRoot = GetISystem()->LoadXmlFromFile(xmlfs.m_strFontEffectPath.c_str());
-        if (!fontEffectRoot)
-        {
-            AZ_Warning("Font", false, "Error parsing font file %s, 'effectfile' pathname %s could not be found.",
-                pXMLFile, xmlfs.m_strFontEffectPath.c_str());
-            return false;
-        }
-
-        if (m_effects.size() > 1 || (m_effects.size() == 1 && (m_effects[0].m_name != "default" || m_effects[0].m_passes.size() > 1)))
-        {
-            AZ_Warning("Font", false, "Error parsing font file %s, 'effectfile' and 'effect' cannot both be used in the same font file.",
-                pXMLFile);
-            m_effects.clear();
-        }
-
-        // parse the font effects file, adding to this font object
-        CXmlFontShader xmlfsEffect(this);
-        xmlfsEffect.ScanXmlNodesRecursively(fontEffectRoot);
-    }
-
-    return true;
-}
-
-#endif
-
diff --git a/Code/CryEngine/CryFont/FontRenderer.cpp b/Code/CryEngine/CryFont/FontRenderer.cpp
deleted file mode 100644
index 2cf160896b..0000000000
--- a/Code/CryEngine/CryFont/FontRenderer.cpp
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//
-// Purpose:
-//  - Render a glyph outline into a bitmap using FreeType 2
-
-#include "CryFont_precompiled.h"
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include "FontRenderer.h"
-
-#include <freetype/ftoutln.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftimage.h>
-
-#include <AzCore/Casting/lossy_cast.h>
-
-// Sizes are defined in in 26.6 fixed float format (TT_F26Dot6), where
-// 1 unit is 1/64 of a pixel.
-static const int fractionalPixelUnits = 64;
-
-namespace
-{
-    FT_Int32 GetLoadFlags(CFFont::HintBehavior hintBehavior)
-    {
-        switch (hintBehavior)
-        {
-        case CFFont::HintBehavior::NoHinting:
-        {
-            return FT_LOAD_NO_HINTING;
-            break;
-        }
-        case CFFont::HintBehavior::AutoHint:
-        {
-            return FT_LOAD_FORCE_AUTOHINT;
-            break;
-        }
-        }
-        return FT_LOAD_DEFAULT;
-    }
-
-    FT_Int32 GetLoadTarget(CFFont::HintStyle hintStyle)
-    {
-        if (hintStyle == CFFont::HintStyle::Light)
-        {
-            return FT_LOAD_TARGET_LIGHT;
-        }
-
-        return FT_LOAD_TARGET_NORMAL;
-    }
-
-    FT_Render_Mode GetRenderMode(CFFont::HintStyle hintStyle)
-    {
-        // We use the hint style to drive the render mode also. These should 
-        // usually be correlated with each other for best results, even though 
-        // they could technically be different.
-        if (hintStyle == CFFont::HintStyle::Light)
-        {
-            return FT_RENDER_MODE_LIGHT;
-        }
-
-        return FT_RENDER_MODE_NORMAL;
-    }
-}
-
-//-------------------------------------------------------------------------------------------------
-CFontRenderer::CFontRenderer()
-    : m_pLibrary(0)
-    , m_pFace(0)
-    , m_pGlyph(0)
-    , m_fSizeRatio(IFFontConstants::defaultSizeRatio)
-    , m_pEncoding(FONT_ENCODING_UNICODE)
-    , m_iGlyphBitmapWidth(0)
-    , m_iGlyphBitmapHeight(0)
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-CFontRenderer::~CFontRenderer()
-{
-    FT_Done_Face(m_pFace);
-    ;
-    FT_Done_FreeType(m_pLibrary);
-    m_pFace = NULL;
-    m_pLibrary = NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontRenderer::LoadFromFile(const string& szFileName)
-{
-    int iError = FT_Init_FreeType(&m_pLibrary);
-
-    if (iError)
-    {
-        return 0;
-    }
-
-    if (m_pFace)
-    {
-        FT_Done_Face(m_pFace);
-        m_pFace = 0;
-    }
-
-    iError = FT_New_Face(m_pLibrary, szFileName.c_str(), 0, &m_pFace);
-
-    if (iError)
-    {
-        return 0;
-    }
-
-    SetEncoding(FONT_ENCODING_UNICODE);
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontRenderer::LoadFromMemory(unsigned char* pBuffer, int iBufferSize)
-{
-    int iError = FT_Init_FreeType(&m_pLibrary);
-
-    if (iError)
-    {
-        return 0;
-    }
-
-    if (m_pFace)
-    {
-        FT_Done_Face(m_pFace);
-        m_pFace = 0;
-    }
-    iError = FT_New_Memory_Face(m_pLibrary, pBuffer, iBufferSize, 0, &m_pFace);
-
-    if (iError)
-    {
-        return 0;
-    }
-
-    SetEncoding(FONT_ENCODING_UNICODE);
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontRenderer::Release()
-{
-    FT_Done_Face(m_pFace);
-    ;
-    FT_Done_FreeType(m_pLibrary);
-    m_pFace = NULL;
-    m_pLibrary = NULL;
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontRenderer::SetGlyphBitmapSize(int iWidth, int iHeight, float sizeRatio)
-{
-    m_iGlyphBitmapWidth = iWidth;
-    m_iGlyphBitmapHeight = iHeight;
-
-    // Assign the given scale for texture slots as long as its positive
-    m_fSizeRatio = sizeRatio > 0.0f ? sizeRatio : m_fSizeRatio;
-
-    FT_Set_Pixel_Sizes(m_pFace, (int)(m_iGlyphBitmapWidth * m_fSizeRatio), (int)(m_iGlyphBitmapHeight * m_fSizeRatio));
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontRenderer::GetGlyphBitmapSize(int* pWidth, int* pHeight)
-{
-    if (pWidth)
-    {
-        *pWidth = m_iGlyphBitmapWidth;
-    }
-
-    if (pHeight)
-    {
-        *pHeight = m_iGlyphBitmapHeight;
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontRenderer::SetEncoding(FT_Encoding pEncoding)
-{
-    if (FT_Select_Charmap(m_pFace, pEncoding))
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-int CFontRenderer::GetGlyph(CGlyphBitmap* pGlyphBitmap, int* iHoriAdvance, uint8* iGlyphWidth, uint8* iGlyphHeight, AZ::s32& iCharOffsetX, AZ::s32& iCharOffsetY, int iX, int iY, int iCharCode, const CFFont::FontHintParams& fontHintParams)
-{
-    FT_Int32 loadFlags = GetLoadFlags(fontHintParams.hintBehavior);
-    loadFlags |= GetLoadTarget(fontHintParams.hintStyle);
-
-    int iError = FT_Load_Char(m_pFace, iCharCode, loadFlags);
-
-    if (iError)
-    {
-        return 0;
-    }
-
-    FT_Render_Mode renderMode = GetRenderMode(fontHintParams.hintStyle);
-
-    m_pGlyph = m_pFace->glyph;
-
-    iError = FT_Render_Glyph(m_pGlyph, renderMode);
-
-    if (iError)
-    {
-        return 0;
-    }
-
-    if (iHoriAdvance)
-    {
-        *iHoriAdvance = m_pGlyph->metrics.horiAdvance / fractionalPixelUnits;
-    }
-
-    if (iGlyphWidth)
-    {
-        *iGlyphWidth = m_pGlyph->bitmap.width;
-    }
-
-    if (iGlyphHeight)
-    {
-        *iGlyphHeight = m_pGlyph->bitmap.rows;
-    }
-
-    unsigned char* pBuffer = pGlyphBitmap->GetBuffer();
-    AZ_Assert(pBuffer, "CGlyphBitmap: bad buffer");
-
-    uint32 dwGlyphWidth = pGlyphBitmap->GetWidth();
-    iCharOffsetX = m_pGlyph->bitmap_left;
-    iCharOffsetY = (static_cast<AZ::s32>(round(m_iGlyphBitmapHeight * m_fSizeRatio)) - m_pGlyph->bitmap_top);
-
-    const int textureSlotBufferWidth = pGlyphBitmap->GetWidth();
-    const int textureSlotBufferHeight = pGlyphBitmap->GetHeight();
-
-    // might happen if font characters are too big or cache dimenstions in font.xml is too small "<font path="VeraMono.ttf" w="320" h="368"/>"
-    const bool charWidthFits = iX + m_pGlyph->bitmap.width <= textureSlotBufferWidth;
-    const bool charHeightFits = iY + m_pGlyph->bitmap.rows <= textureSlotBufferHeight;
-    const bool charFitsInSlot = charWidthFits && charHeightFits;
-    AZ_Error("Font", charFitsInSlot, "Character code %d doesn't fit in font texture; check 'sizeRatio' attribute in font XML or adjust this character's sizing in the font.", iCharCode);
-
-    // Since we might be re-rendering/overwriting a glyph that already exists
-    // in the font texture, clear the contents of this particular slot so no
-    // artifacts of the previous glyph remain.
-    pGlyphBitmap->Clear();
-
-    // Restrict iteration to smallest of either the texture slot or glyph 
-    // bitmap buffer ranges
-    const int bufferMaxIterWidth = AZStd::GetMin<int>(textureSlotBufferWidth, m_pGlyph->bitmap.width);
-    const int bufferMaxIterHeight = AZStd::GetMin<int>(textureSlotBufferHeight, m_pGlyph->bitmap.rows);
-
-    for (int i = 0; i < bufferMaxIterHeight; i++)
-    {
-        int iNewY = i + iY;
-
-        for (int j = 0; j < bufferMaxIterWidth; j++)
-        {
-            unsigned char   cColor = m_pGlyph->bitmap.buffer[(i * m_pGlyph->bitmap.width) + j];
-            int             iOffset = iNewY * dwGlyphWidth + iX + j;
-
-            if (iOffset >= (int)dwGlyphWidth * m_iGlyphBitmapHeight)
-            {
-                continue;
-            }
-
-            pBuffer[iOffset] = cColor;
-            //          pBuffer[iOffset] = cColor/2+32;     // debug - visualize character in a block
-        }
-    }
-
-    return 1;
-}
-
-int CFontRenderer::GetGlyphScaled([[maybe_unused]] CGlyphBitmap* pGlyphBitmap, [[maybe_unused]] int* iGlyphWidth, [[maybe_unused]] int* iGlyphHeight, [[maybe_unused]] int iX, [[maybe_unused]] int iY, [[maybe_unused]] float fScaleX, [[maybe_unused]] float fScaleY, [[maybe_unused]] int iCharCode)
-{
-    return 1;
-}
-
-Vec2 CFontRenderer::GetKerning(uint32_t leftGlyph, uint32_t rightGlyph)
-{
-    FT_Vector kerningOffsets;
-    kerningOffsets.x = kerningOffsets.y = 0;
-
-    if (FT_HAS_KERNING(m_pFace))
-    {
-        const FT_UInt leftGlyphIndex = FT_Get_Char_Index(m_pFace, leftGlyph);
-        const FT_UInt rightGlyphIndex = FT_Get_Char_Index(m_pFace, rightGlyph);
-
-        [[maybe_unused]] FT_Error ftError = FT_Get_Kerning(m_pFace, leftGlyphIndex, rightGlyphIndex, FT_KERNING_DEFAULT, &kerningOffsets);
-
-#if !defined(_RELEASE)
-        if (0 != ftError)
-        {
-            string warnMsg;
-            warnMsg.Format("FT_Get_Kerning returned %d", ftError);
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, warnMsg.c_str());
-        }
-#endif
-    }
-
-    return Vec2(azlossy_cast<float>(kerningOffsets.x / fractionalPixelUnits), azlossy_cast<float>(kerningOffsets.y / fractionalPixelUnits));
-}
-
-float CFontRenderer::GetAscenderToHeightRatio()
-{
-    return (static_cast<float>(m_pFace->ascender) / static_cast<float>(m_pFace->height));
-}
-
-//-------------------------------------------------------------------------------------------------
-/*
-int CFontRenderer::FT_GetIndex(int iCharCode)
-{
-if (iCharCode < 256)
-{ 
-int iIndex = 0;
-int iUnicode;
-
-// try unicode
-for (int i = 0; i < m_pFace->num_charmaps; i++)
-{
-if ((m_pFace->charmaps[i]->platform_id == 3) && (m_pFace->charmaps[i]->encoding_id == 1))
-{
-iUnicode = i;
-
-FT_Set_Charmap(m_pFace, m_pFace->charmaps[i]);
-
-iIndex = FT_Get_Char_Index(m_pFace, iCharCode);
-
-// not unicode, try ascii
-if (iIndex == 0)
-{
-for (int i = 0; i < m_pFace->num_charmaps; i++)
-{
-if ((m_pFace->charmaps[i]->platform_id == 0) && (m_pFace->charmaps[i]->encoding_id == 0))
-{
-FT_Set_Charmap(m_pFace, m_pFace->charmaps[i]);
-
-iIndex = FT_Get_Char_Index(m_pFace, iCharCode);
-
-// not ascii either, reuse unicode default "missing char"
-if (iIndex == 0)
-{
-FT_Set_Charmap(m_pFace, m_pFace->charmaps[iUnicode]);
-
-return FT_Get_Char_Index(m_pFace, iCharCode);
-}
-}
-}
-}
-
-return  iIndex;
-}
-}
-
-return 0;
-}
-else
-{
-for (int i = 0; i < m_pFace->num_charmaps; i++)
-{
-if ((m_pFace->charmaps[i]->platform_id == 3) && (m_pFace->charmaps[i]->encoding_id == 1))
-{
-FT_Set_Charmap(m_pFace, m_pFace->charmaps[i]);
-
-return FT_Get_Char_Index(m_pFace, iCharCode);
-}
-}
-
-return 0;
-}
-
-return 0;
-}
-*/
-
-#endif // #if !defined(USE_NULLFONT_ALWAYS)
diff --git a/Code/CryEngine/CryFont/FontRenderer.h b/Code/CryEngine/CryFont/FontRenderer.h
deleted file mode 100644
index aca26a1e04..0000000000
--- a/Code/CryEngine/CryFont/FontRenderer.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Render a glyph outline into a bitmap using FreeType 2
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#ifndef CRYINCLUDE_CRYFONT_FONTRENDERER_H
-#define CRYINCLUDE_CRYFONT_FONTRENDERER_H
-#pragma once
-
-
-
-#include "GlyphBitmap.h"
-#include "FFont.h"
-#include <ft2build.h>
-#pragma push_macro("generic")
-#define generic GenericFromFreeTypeLibrary
-#include <freetype/freetype.h>
-#undef generic
-#pragma pop_macro("generic")
-
-
-// Corresponds to the Unicode character set. This value covers all versions of the Unicode repertoire,
-// including ASCII and Latin-1. Most fonts include a Unicode charmap, but not all of them.
-#define FONT_ENCODING_UNICODE       (FT_ENCODING_UNICODE)
-
-// Corresponds to the Microsoft Symbol encoding, used to encode mathematical symbols in the 32..255 character code range.
-// For more information, see `http://www.ceviz.net/symbol.htm'.
-#define FONT_ENCODING_SYMBOL        (FT_ENCODING_MS_SYMBOL)
-
-// Corresponds to Microsoft's Japanese SJIS encoding.
-// More info at `http://langsupport.japanreference.com/encoding.shtml'. See note on multi-byte encodings below.
-#define FONT_ENCODING_SJIS          (FT_ENCODING_MS_SJIS)
-
-// Corresponds to the encoding system for Simplified Chinese, as used in China. Only found in some TrueType fonts.
-#define FONT_ENCODING_GB2312        (FT_ENCODING_MS_GB2312)
-
-// Corresponds to the encoding system for Traditional Chinese, as used in Taiwan and Hong Kong. Only found in some TrueType fonts.
-#define FONT_ENCODING_BIG5          (FT_ENCODING_MS_BIG5)
-
-// Corresponds to the Korean encoding system known as Wansung.
-// This is a Microsoft encoding that is only found in some TrueType fonts.
-// For more information, see `http://www.microsoft.com/typography/unicode/949.txt'.
-#define FONT_ENCODING_WANSUNG       (FT_ENCODING_MS_WANSUNG)
-
-// The Korean standard character set (KS C-5601-1992), which corresponds to Windows code page 1361.
-// This character set includes all possible Hangeul character combinations. Only found on some rare TrueType fonts.
-#define FONT_ENCODING_JOHAB     (FT_ENCODING_MS_JOHAB)
-
-
-
-//------------------------------------------------------------------------------------
-class CFontRenderer
-{
-public:
-
-    CFontRenderer();
-    ~CFontRenderer();
-
-    int         LoadFromFile(const string& szFileName);
-    int         LoadFromMemory(unsigned char* pBuffer, int iBufferSize);
-    int         Release();
-
-    int         SetGlyphBitmapSize(int iWidth, int iHeight, float sizeRatio);
-    int         GetGlyphBitmapSize(int* pWidth, int* pHeight);
-
-    int         SetSizeRatio(float fSizeRatio) { m_fSizeRatio = fSizeRatio; return 1; };
-    float       GetSizeRatio() { return m_fSizeRatio; };
-
-    int         SetEncoding(FT_Encoding pEncoding);
-    FT_Encoding GetEncoding() { return m_pEncoding; };
-
-    //! Populates the given pGlyphBitmap's buffer from the FreeType bitmap buffer
-    //! \param iCharCode Used as a character index to retrieve the FreeType glyph and it's associated bitmap buffer for the character
-    //! \param pGlyphBitmap The FreeType glyph buffer is essentially copied into this CGlyphBitmap buffer
-    int         GetGlyph(CGlyphBitmap* pGlyphBitmap, int* iHoriAdvance, uint8* iGlyphWidth, uint8* iGlyphHeight, AZ::s32& iCharOffsetX, AZ::s32& iCharOffsetY, int iX, int iY, int iCharCode, const CFFont::FontHintParams& glyphFlags = CFFont::FontHintParams());
-    int         GetGlyphScaled(CGlyphBitmap* pGlyphBitmap, int* iGlyphWidth, int* iGlyphHeight, int iX, int iY, float fScaleX, float fScaleY, int iCharCode);
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-    bool GetMonospaced() const { return FT_IS_FIXED_WIDTH(m_pFace) != 0; }
-
-    Vec2 GetKerning(uint32_t leftGlyph, uint32_t rightGlyph);
-
-    float GetAscenderToHeightRatio();
-
-private:
-
-    FT_Library      m_pLibrary;
-    FT_Face         m_pFace;
-    FT_GlyphSlot    m_pGlyph;
-    float           m_fSizeRatio;
-
-    FT_Encoding     m_pEncoding;
-
-    int             m_iGlyphBitmapWidth;
-    int             m_iGlyphBitmapHeight;
-};
-
-#endif // CRYINCLUDE_CRYFONT_FONTRENDERER_H
-
-#endif // #if !defined(USE_NULLFONT_ALWAYS)
diff --git a/Code/CryEngine/CryFont/FontTexture.cpp b/Code/CryEngine/CryFont/FontTexture.cpp
deleted file mode 100644
index 8db7484d59..0000000000
--- a/Code/CryEngine/CryFont/FontTexture.cpp
+++ /dev/null
@@ -1,633 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Purpose:
-//  - Create and update a texture with the most recently used glyphs
-
-#include "CryFont_precompiled.h"
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include "FontTexture.h"
-#include "UnicodeIterator.h"
-#include <AzCore/IO/FileIO.h>
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef GetCharWidth
-#endif
-
-//-------------------------------------------------------------------------------------------------
-CFontTexture::CFontTexture()
-    : m_wSlotUsage(1)
-    , m_iWidth(0)
-    , m_iHeight(0)
-    , m_fInvWidth(0.0f)
-    , m_fInvHeight(0.0f)
-    , m_iCellWidth(0)
-    , m_iCellHeight(0)
-    , m_fTextureCellWidth(0)
-    , m_fTextureCellHeight(0)
-    , m_iWidthCellCount(0)
-    , m_iHeightCellCount(0)
-    , m_nTextureSlotCount(0)
-    , m_pBuffer(0)
-    , m_iSmoothMethod(FONT_SMOOTH_NONE)
-    , m_iSmoothAmount(FONT_SMOOTH_AMOUNT_NONE)
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-CFontTexture::~CFontTexture()
-{
-    Release();
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::CreateFromFile(const string& szFileName, int iWidth, int iHeight, int iSmoothMethod, int iSmoothAmount, int iWidthCellCount, int iHeightCellCount)
-{
-    if (!m_pGlyphCache.LoadFontFromFile(szFileName))
-    {
-        Release();
-
-        return 0;
-    }
-
-    if (!Create(iWidth, iHeight, iSmoothMethod, iSmoothAmount, iWidthCellCount, iHeightCellCount))
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::CreateFromMemory(unsigned char* pFileData, int iDataSize, int iWidth, int iHeight, int iSmoothMethod, int iSmoothAmount, int iWidthCellCount, int iHeightCellCount, float sizeRatio)
-{
-    if (!m_pGlyphCache.LoadFontFromMemory(pFileData, iDataSize))
-    {
-        Release();
-
-        return 0;
-    }
-
-    if (!Create(iWidth, iHeight, iSmoothMethod, iSmoothAmount, iWidthCellCount, iHeightCellCount, sizeRatio))
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::Create(int iWidth, int iHeight, int iSmoothMethod, int iSmoothAmount, int iWidthCellCount, int iHeightCellCount, float sizeRatio)
-{
-    m_pBuffer = new FONT_TEXTURE_TYPE[iWidth * iHeight];
-    if (!m_pBuffer)
-    {
-        return 0;
-    }
-
-    memset(m_pBuffer, 0, iWidth * iHeight * sizeof(FONT_TEXTURE_TYPE));
-
-    if (!(iWidthCellCount * iHeightCellCount))
-    {
-        return 0;
-    }
-
-    m_iWidth = iWidth;
-    m_iHeight = iHeight;
-    m_fInvWidth = 1.0f / (float)iWidth;
-    m_fInvHeight = 1.0f / (float)iHeight;
-
-    m_iWidthCellCount = iWidthCellCount;
-    m_iHeightCellCount = iHeightCellCount;
-    m_nTextureSlotCount = m_iWidthCellCount * m_iHeightCellCount;
-
-    m_iSmoothMethod = iSmoothMethod;
-    m_iSmoothAmount = iSmoothAmount;
-
-    m_iCellWidth = m_iWidth / m_iWidthCellCount;
-    m_iCellHeight = m_iHeight / m_iHeightCellCount;
-
-    m_fTextureCellWidth = m_iCellWidth * m_fInvWidth;
-    m_fTextureCellHeight = m_iCellHeight * m_fInvHeight;
-
-    if (!m_pGlyphCache.Create(FONT_GLYPH_CACHE_SIZE, m_iCellWidth, m_iCellHeight, iSmoothMethod, iSmoothAmount, sizeRatio))
-    {
-        Release();
-
-        return 0;
-    }
-
-    if (!CreateSlotList(m_nTextureSlotCount))
-    {
-        Release();
-
-        return 0;
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::Release()
-{
-    delete[] m_pBuffer;
-    m_pBuffer = 0;
-
-    ReleaseSlotList();
-
-    m_pSlotTable.clear();
-
-    m_pGlyphCache.Release();
-
-    m_iWidthCellCount = 0;
-    m_iHeightCellCount = 0;
-    m_nTextureSlotCount = 0;
-
-    m_iWidth = 0;
-    m_iHeight = 0;
-    m_fInvWidth = 0.0f;
-    m_fInvHeight = 0.0f;
-
-    m_iCellWidth = 0;
-    m_iCellHeight = 0;
-
-    m_iSmoothMethod = 0;
-    m_iSmoothAmount = 0;
-
-    m_fTextureCellWidth = 0.0f;
-    m_fTextureCellHeight = 0.0f;
-
-    m_wSlotUsage = 1;
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-uint32 CFontTexture::GetSlotChar(int iSlot) const
-{
-    return m_pSlotList[iSlot]->cCurrentChar;
-}
-
-//-------------------------------------------------------------------------------------------------
-CTextureSlot* CFontTexture::GetCharSlot(uint32 cChar, const Vec2i& glyphSize)
-{
-    CryFont::FontTexture::CTextureSlotKey slotKey = GetTextureSlotKey(cChar, glyphSize);
-    CTextureSlotTableItor pItor = m_pSlotTable.find(slotKey);
-
-    if (pItor != m_pSlotTable.end())
-    {
-        return pItor->second;
-    }
-
-    return 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-CTextureSlot* CFontTexture::GetLRUSlot()
-{
-    uint16 wMaxSlotAge = 0;
-    CTextureSlot* pLRUSlot = 0;
-    CTextureSlot* pSlot;
-
-    CTextureSlotListItor pItor = m_pSlotList.begin();
-
-    while (pItor != m_pSlotList.end())
-    {
-        pSlot = *pItor;
-
-        if (pSlot->wSlotUsage == 0)
-        {
-            return pSlot;
-        }
-        else
-        {
-            uint16 slotAge = m_wSlotUsage - pSlot->wSlotUsage;
-            if (slotAge > wMaxSlotAge)
-            {
-                pLRUSlot = pSlot;
-                wMaxSlotAge = slotAge;
-            }
-        }
-
-        ++pItor;
-    }
-
-    return pLRUSlot;
-}
-
-//-------------------------------------------------------------------------------------------------
-CTextureSlot* CFontTexture::GetMRUSlot()
-{
-    uint16 wMinSlotAge = 0xFFFF;
-    CTextureSlot* pMRUSlot = 0;
-    CTextureSlot* pSlot;
-
-    CTextureSlotListItor pItor = m_pSlotList.begin();
-
-    while (pItor != m_pSlotList.end())
-    {
-        pSlot = *pItor;
-
-        if (pSlot->wSlotUsage != 0)
-        {
-            uint16 slotAge = m_wSlotUsage - pSlot->wSlotUsage;
-            if (slotAge > wMinSlotAge)
-            {
-                pMRUSlot = pSlot;
-                wMinSlotAge = slotAge;
-            }
-        }
-
-        ++pItor;
-    }
-
-    return pMRUSlot;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::PreCacheString(const char* szString, int* pUpdated, float sizeRatio, const Vec2i& glyphSize, const CFFont::FontHintParams& fontHintParams)
-{
-    Vec2i clampedGlyphSize = ClampGlyphSize(glyphSize, m_iCellWidth, m_iCellHeight);
-
-    uint16 wSlotUsage = m_wSlotUsage++;
-    int iUpdated = 0;
-
-    uint32 cChar;
-    for (Unicode::CIterator<const char*, false> it(szString); *it; ++it)
-    {
-        cChar = *it;
-        CTextureSlot* pSlot = GetCharSlot(cChar, clampedGlyphSize);
-
-        if (!pSlot)
-        {
-            pSlot = GetLRUSlot();
-
-            if (!pSlot)
-            {
-                return 0;
-            }
-
-            if (!UpdateSlot(pSlot->iTextureSlot, wSlotUsage, cChar, sizeRatio, clampedGlyphSize, fontHintParams))
-            {
-                return 0;
-            }
-
-            ++iUpdated;
-        }
-        else
-        {
-            pSlot->wSlotUsage = wSlotUsage;
-        }
-    }
-
-    if (pUpdated)
-    {
-        *pUpdated = iUpdated;
-    }
-
-    if (iUpdated)
-    {
-        return 1;
-    }
-
-    return 2;
-}
-
-//-------------------------------------------------------------------------------------------------
-void CFontTexture::GetTextureCoord(CTextureSlot* pSlot, float texCoords[4],
-    int& iCharSizeX, int& iCharSizeY, int& iCharOffsetX, int& iCharOffsetY,
-    const Vec2i& glyphSize) const
-{
-    if (!pSlot)
-    {
-        return;         // expected behavior
-    }
-
-    // Re-rendered glyphs are stored at smaller sizes than glyphs rendered at
-    // the (maximum) font texture slot resolution. We scale the returned width
-    // and height of the (actual) rendered glyph sizes so its transparent to 
-    // callers that the glyph is actually smaller (from being re-rendered).
-    const float requestSizeWidthScale = AZ::GetMin<float>(1.0f, GetRequestSizeWidthScale(glyphSize));
-    const float requestSizeHeightScale = AZ::GetMin<float>(1.0f, GetRequestSizeHeightScale(glyphSize));
-    const float invRequestSizeWidthScale = 1.0f / requestSizeWidthScale;
-    const float invRequestSizeHeightScale = 1.0f / requestSizeHeightScale;
-
-    // The inverse scale grows as the glyph size decreases. Once the glyph size
-    // reaches the font texture's max slot dimensions, we cap width/height scale
-    // since the text draw context will apply normal (as opposed to re-rendered)
-    // scaling.
-    int iChWidth = static_cast<int>(pSlot->iCharWidth * invRequestSizeWidthScale);
-    int iChHeight = static_cast<int>(pSlot->iCharHeight * invRequestSizeHeightScale);
-
-    float slotCoord0 = pSlot->vTexCoord[0];
-    float slotCoord1 = pSlot->vTexCoord[1];
-    texCoords[0] = slotCoord0 - m_fInvWidth;                                      // extra pixel for nicer bilinear filter
-    texCoords[1] = slotCoord1 - m_fInvHeight;                                     // extra pixel for nicer bilinear filter
-    
-    // UV coordinates also must be scaled relative to the re-rendered glyph size
-    // as well. Width scale must be capped at 1.0f since glyph can't grow 
-    // beyond the slot's resolution.
-    texCoords[2] = slotCoord0 + (((float)iChWidth * m_fInvWidth) * requestSizeWidthScale);
-    texCoords[3] = slotCoord1 + (((float)iChHeight * m_fInvHeight) * requestSizeHeightScale);
-
-    iCharSizeX = iChWidth + 1;                                        // extra pixel for nicer bilinear filter
-    iCharSizeY = iChHeight + 1;                                   // extra pixel for nicer bilinear filter
-
-    // Offsets are scaled accordingly when the rendered glyph size is smaller 
-    // than the glyph/slot dimensions, but otherwise we expect the text draw 
-    // context to apply scaling beyond that.
-    iCharOffsetX = static_cast<int>(pSlot->iCharOffsetX * invRequestSizeWidthScale);
-    iCharOffsetY = static_cast<int>(pSlot->iCharOffsetY * invRequestSizeHeightScale);
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::GetCharacterWidth(uint32 cChar) const
-{
-    CTextureSlotTableItorConst pItor = m_pSlotTable.find(GetTextureSlotKey(cChar));
-
-    if (pItor == m_pSlotTable.end())
-    {
-        return 0;
-    }
-
-    const CTextureSlot& rSlot = *pItor->second;
-
-    // For proportional fonts, add one pixel of spacing for aesthetic reasons
-    int proportionalOffset = GetMonospaced() ? 0 : 1;
-
-    return rSlot.iCharWidth + proportionalOffset;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::GetHorizontalAdvance(uint32 cChar, const Vec2i& glyphSize) const
-{
-    CTextureSlotTableItorConst pItor = m_pSlotTable.find(GetTextureSlotKey(cChar, glyphSize));
-
-    if (pItor == m_pSlotTable.end())
-    {
-        return 0;
-    }
-
-    const CTextureSlot& rSlot = *pItor->second;
-
-    // Re-rendered glyphs are stored at smaller sizes than glyphs rendered at
-    // the (maximum) font texture slot resolution. We scale the returned width
-    // and height of the (actual) rendered glyph sizes so its transparent to 
-    // callers that the glyph is actually smaller (from being re-rendered).
-    const float requestSizeWidthScale = GetRequestSizeWidthScale(glyphSize);
-    const float invRequestSizeWidthScale = 1.0f / requestSizeWidthScale;
-
-    // Only multiply by 1.0f when glyphsize is greater than cell width because we assume that callers
-    // will use the font draw text context to scale the value appropriately.
-    return static_cast<int>(rSlot.iHoriAdvance * AZ::GetMax<float>(1.0f, invRequestSizeWidthScale));
-}
-
-//-------------------------------------------------------------------------------------------------
-/*
-int CFontTexture::GetCharHeightByChar(wchar_t cChar)
-{
-CTextureSlotTableItor pItor = m_pSlotTable.find(cChar);
-
-if (pItor != m_pSlotTable.end())
-{
-return pItor->second->iCharHeight;
-}
-
-return 0;
-}
-*/
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::WriteToFile([[maybe_unused]] const string& szFileName)
-{
-#ifdef WIN32
-    AZ::IO::FileIOStream outputFile(szFileName.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeBinary);
-
-    if (!outputFile.IsOpen())
-    {
-        return 0;
-    }
-
-    BITMAPFILEHEADER pHeader;
-    BITMAPINFOHEADER pInfoHeader;
-
-    memset(&pHeader, 0, sizeof(BITMAPFILEHEADER));
-    memset(&pInfoHeader, 0, sizeof(BITMAPINFOHEADER));
-
-    pHeader.bfType = 0x4D42;
-    pHeader.bfSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + m_iWidth * m_iHeight * 3;
-    pHeader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
-
-    pInfoHeader.biSize = sizeof(BITMAPINFOHEADER);
-    pInfoHeader.biWidth = m_iWidth;
-    pInfoHeader.biHeight = m_iHeight;
-    pInfoHeader.biPlanes = 1;
-    pInfoHeader.biBitCount = 24;
-    pInfoHeader.biCompression = 0;
-    pInfoHeader.biSizeImage = m_iWidth * m_iHeight * 3;
-
-    outputFile.Write(sizeof(BITMAPFILEHEADER), &pHeader);
-    outputFile.Write(sizeof(BITMAPINFOHEADER), &pInfoHeader);
-
-    unsigned char cRGB[3];
-
-    for (int i = m_iHeight - 1; i >= 0; i--)
-    {
-        for (int j = 0; j < m_iWidth; j++)
-        {
-            cRGB[0] = m_pBuffer[(i * m_iWidth) + j];
-            cRGB[1] = *cRGB;
-
-            cRGB[2] = *cRGB;
-
-            outputFile.Write(3, cRGB);
-        }
-    }
-
-#endif
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-Vec2 CFontTexture::GetKerning(uint32_t leftGlyph, uint32_t rightGlyph)
-{
-    return m_pGlyphCache.GetKerning(leftGlyph, rightGlyph);
-}
-
-//-------------------------------------------------------------------------------------------------
-float CFontTexture::GetAscenderToHeightRatio()
-{
-    return m_pGlyphCache.GetAscenderToHeightRatio();
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::CreateSlotList(int iListSize)
-{
-    int y, x;
-
-    for (int i = 0; i < iListSize; i++)
-    {
-        CTextureSlot* pTextureSlot = new CTextureSlot;
-
-        if (!pTextureSlot)
-        {
-            return 0;
-        }
-
-        pTextureSlot->iTextureSlot = i;
-        pTextureSlot->Reset();
-
-        y = i / m_iWidthCellCount;
-        x = i % m_iWidthCellCount;
-
-        pTextureSlot->vTexCoord[0] = (float)(x * m_fTextureCellWidth) + (0.5f / (float)m_iWidth);
-        pTextureSlot->vTexCoord[1] = (float)(y * m_fTextureCellHeight) + (0.5f / (float)m_iHeight);
-
-        m_pSlotList.push_back(pTextureSlot);
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::ReleaseSlotList()
-{
-    CTextureSlotListItor pItor = m_pSlotList.begin();
-
-    while (pItor != m_pSlotList.end())
-    {
-        delete (*pItor);
-
-        pItor = m_pSlotList.erase(pItor);
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CFontTexture::UpdateSlot(int iSlot, uint16 wSlotUsage, uint32 cChar, float sizeRatio, const Vec2i& glyphSize, const CFFont::FontHintParams& fontHintParams)
-{
-    CTextureSlot* pSlot = m_pSlotList[iSlot];
-
-    if (!pSlot)
-    {
-        return 0;
-    }
-
-    CTextureSlotTableItor pItor = m_pSlotTable.find(GetTextureSlotKey(pSlot->cCurrentChar, pSlot->glyphSize));
-
-    if (pItor != m_pSlotTable.end())
-    {
-        m_pSlotTable.erase(pItor);
-    }
-    m_pSlotTable.insert(AZStd::pair<CryFont::FontTexture::CTextureSlotKey, CTextureSlot*>(GetTextureSlotKey(cChar, glyphSize), pSlot));
-    pSlot->glyphSize = glyphSize;
-    pSlot->wSlotUsage = wSlotUsage;
-    pSlot->cCurrentChar = cChar;
-
-    int iWidth = 0;
-    int iHeight = 0;
-
-    // blit the char glyph into the texture
-    int x = pSlot->iTextureSlot % m_iWidthCellCount;
-    int y = pSlot->iTextureSlot / m_iWidthCellCount;
-
-    CGlyphBitmap* pGlyphBitmap;
-
-    if (glyphSize.x > 0 && glyphSize.y > 0)
-    {
-        m_pGlyphCache.SetGlyphBitmapSize(glyphSize.x, glyphSize.y, sizeRatio);
-    }
-
-    if (!m_pGlyphCache.GetGlyph(&pGlyphBitmap, &pSlot->iHoriAdvance, &iWidth, &iHeight, pSlot->iCharOffsetX, pSlot->iCharOffsetY, cChar, glyphSize, fontHintParams))
-    {
-        return 0;
-    }
-
-    pSlot->iCharWidth = iWidth;
-    pSlot->iCharHeight = iHeight;
-
-    // Add a pixel along width and height to avoid artifacts being rendered
-    // from a previous glyph in this slot due to bilinear filtering. The source
-    // glyph bitmap buffer is presumed to be cleared prior to FreeType rendering
-    // to the bitmap.
-    const int blitWidth = AZ::GetMin<int>(iWidth + 1, m_iCellWidth);
-    const int blitHeight = AZ::GetMin<int>(iHeight + 1, m_iCellHeight);
-
-    pGlyphBitmap->BlitTo8(m_pBuffer, 0, 0,
-        blitWidth, blitHeight, x * m_iCellWidth, y * m_iCellHeight, m_iWidth);
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-void CFontTexture::CreateGradientSlot()
-{
-    CTextureSlot* pSlot = GetGradientSlot();
-    assert(pSlot->cCurrentChar == (uint32)~0);      // 0 needs to be unused spot
-
-    pSlot->Reset();
-    pSlot->iCharWidth = m_iCellWidth - 2;
-    pSlot->iCharHeight = m_iCellHeight - 2;
-    pSlot->SetNotReusable();
-
-    int x = pSlot->iTextureSlot % m_iWidthCellCount;
-    int y = pSlot->iTextureSlot / m_iWidthCellCount;
-
-    assert(sizeof(*m_pBuffer) == sizeof(uint8));
-    uint8* pBuffer = &m_pBuffer[x * m_iCellWidth + y * m_iCellHeight * m_iWidth];
-
-    for (uint32 dwY = 0; dwY < pSlot->iCharHeight; ++dwY)
-    {
-        for (uint32 dwX = 0; dwX < pSlot->iCharWidth; ++dwX)
-        {
-            pBuffer[dwX + dwY * m_iWidth] = dwY * 255 / (pSlot->iCharHeight - 1);
-        }
-    }
-}
-
-//-------------------------------------------------------------------------------------------------
-CTextureSlot* CFontTexture::GetGradientSlot()
-{
-    return m_pSlotList[0];
-}
-
-//-------------------------------------------------------------------------------------------------
-CryFont::FontTexture::CTextureSlotKey CFontTexture::GetTextureSlotKey(uint32 cChar, const Vec2i& glyphSize) const
-{
-    const Vec2i clampedGlyphSize(ClampGlyphSize(glyphSize, m_iCellWidth, m_iCellHeight));
-    return CryFont::FontTexture::CTextureSlotKey(clampedGlyphSize, cChar);
-}
-
-Vec2i CFontTexture::ClampGlyphSize(const Vec2i& glyphSize, int cellWidth, int cellHeight)
-{
-    const Vec2i maxCellDimensions(cellWidth, cellHeight);
-    Vec2i clampedGlyphSize(glyphSize);
-
-    const bool hasZeroDimension = glyphSize.x == 0 || glyphSize.y == 0;
-    const bool isDefaultSize = glyphSize == CCryFont::defaultGlyphSize;
-    const bool exceedsDimensions = glyphSize.x > cellWidth || glyphSize.y > cellHeight;
-    const bool useMaxCellDimension = hasZeroDimension || isDefaultSize || exceedsDimensions;
-    if (useMaxCellDimension)
-    {
-        clampedGlyphSize = maxCellDimensions;
-    }
-
-    return clampedGlyphSize;
-}
-
-#endif // #if !defined(USE_NULLFONT_ALWAYS)
diff --git a/Code/CryEngine/CryFont/FontTexture.h b/Code/CryEngine/CryFont/FontTexture.h
deleted file mode 100644
index 45d0403f47..0000000000
--- a/Code/CryEngine/CryFont/FontTexture.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYFONT_FONTTEXTURE_H
-#define CRYINCLUDE_CRYFONT_FONTTEXTURE_H
-#pragma once
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include "GlyphCache.h"
-#include "GlyphBitmap.h"
-#include "CryFont.h"
-#include "FFont.h"
-
-typedef uint8 FONT_TEXTURE_TYPE;
-
-// the number of slots in the glyph cache
-// each slot ocupies ((glyph_bitmap_width * glyph_bitmap_height) + 24) bytes
-#define FONT_GLYPH_CACHE_SIZE           (1)
-
-// the glyph spacing in font texels between characters in proportional font mode (more correct would be to take the value in the character)
-#define FONT_GLYPH_PROP_SPACING     (1)
-
-// the size of a rendered space, this value gets multiplied by the default characted width
-#define FONT_SPACE_SIZE                     (0.5f)
-
-// don't draw this char (used to avoid drawing color codes)
-#define FONT_NOT_DRAWABLE_CHAR      (0xffff)
-
-// smoothing methods
-#define FONT_SMOOTH_NONE            0
-#define FONT_SMOOTH_BLUR            1
-#define FONT_SMOOTH_SUPERSAMPLE     2
-
-// smoothing amounts
-#define FONT_SMOOTH_AMOUNT_NONE     0
-#define FONT_SMOOTH_AMOUNT_2X       1
-#define FONT_SMOOTH_AMOUNT_4X       2
-
-//! Stores glyph meta-data read from the font (FreeType).
-//!
-//! \sa CCacheSlot
-typedef struct CTextureSlot
-{
-    Vec2i               glyphSize = CCryFont::defaultGlyphSize; //!< Size of the rendered glyph stored in the font texture
-    uint16              wSlotUsage;                             //!< For LRU strategy, 0xffff is never released
-    uint32              cCurrentChar;                           //!< ~0 if not used for characters
-    int                 iTextureSlot;
-    int                 iHoriAdvance;                           //!< Advance width. See FT_Glyph_Metrics::horiAdvance.
-    float               vTexCoord[2];                           //!< Character position in the texture (not yet half texel corrected)
-    uint8               iCharWidth;                             //!< Glyph width (in pixel)
-    uint8               iCharHeight;                            //!< Glyph height (in pixel)
-    AZ::s32             iCharOffsetX;                           //!< Glyph's left-side bearing (in pixels). See FT_GlyphSlotRec::bitmap_left.
-    AZ::s32             iCharOffsetY;                           //!< Glyph's top bearing (in pixels). See FT_GlyphSlotRec::bitmap_top.
-
-    void Reset()
-    {
-        wSlotUsage = 0;
-        cCurrentChar = ~0;
-        iHoriAdvance = 0;
-        iCharWidth = 0;
-        iCharHeight = 0;
-        iCharOffsetX = 0;
-        iCharOffsetY = 0;
-    }
-
-    void SetNotReusable()
-    {
-        wSlotUsage = 0xffff;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-} CTextureSlot;
-
-
-typedef std::vector<CTextureSlot*>                                      CTextureSlotList;
-typedef std::vector<CTextureSlot*>::iterator                            CTextureSlotListItor;
-
-namespace CryFont
-{
-    namespace FontTexture
-    {
-        //! Height and width pair for glyph size mapping
-        typedef Vec2i                                                           CGlyphSizeType;
-
-        //! Pair for mapping a height and width size to a UTF32 character/glyph
-        typedef AZStd::pair<CGlyphSizeType, uint32>                             CTextureSlotKey;
-
-        //! Hasher for texture slot table keys (glyphsize-char code pair)
-        //!
-        //! Instead of creating our own custom hash, the types are broken down to their
-        //! native types (ints) and passed to existing hashes that handle those types.
-        struct HashTextureSlotTableKey
-        {
-            typedef CTextureSlotKey                 ArgumentType;
-            typedef AZStd::size_t                   ResultType;
-            typedef AZStd::pair<int32, int32>       Int32Pair;
-            typedef AZStd::pair<Int32Pair, uint32>  Int32PairU32Pair;
-            ResultType operator()(const ArgumentType& value) const
-            {
-                // Utiliize existing hash function for pairs of ints
-                AZStd::hash<Int32PairU32Pair> pairHash;
-                return pairHash(Int32PairU32Pair(Int32Pair(value.first.x, value.first.y), value.second));
-            }
-        };
-    }
-}
-
-//! Maps size-speicifc UTF32 glyphs to their corresponding texture slots
-typedef AZStd::unordered_map<CryFont::FontTexture::CTextureSlotKey, CTextureSlot*, CryFont::FontTexture::HashTextureSlotTableKey> CTextureSlotTable;
-
-typedef CTextureSlotTable::iterator         CTextureSlotTableItor;
-typedef CTextureSlotTable::const_iterator   CTextureSlotTableItorConst;
-
-#ifdef WIN64
-#undef GetCharWidth
-#undef GetCharHeight
-#endif
-
-//! Stores the glyphs of a font within a single texture.
-//!
-//! The texture resolution is configurable, as is the number of slots within
-//! the texture. 
-//!
-//! A texture slot contains a single glyph within the font and are uniform
-//! size throughout the font texture (each slot occupies the same size 
-//! regardless of the size of a glyph being stored, so a '.' occupies the 
-//! same amount of space as a 'W', for example).
-//!
-//! Font glyph buffers are read from FreeType and copied into the texture.
-//!
-//! \sa CTextureSlot, CFontRenderer
-class CFontTexture
-{
-public:
-    CFontTexture();
-    ~CFontTexture();
-
-    int CreateFromFile(const string& szFileName, int iWidth, int iHeight, int iSmoothMethod, int iSmoothAmount, int iWidthCharCount = 16, int iHeightCharCount = 16);
-
-    //! Default texture slot width/height is 16x8 slots, allowing for 128 glyphs to be stored in the font texture. This was
-    //! previously 16x16, allowing 256 glyphs to be stored. For reference, there are 95 printable ASCII characters, so by
-    //! reducing the number of slots, the height of the font texture can be halved (for some nice memory savings). We may
-    //! want to make this configurable in the font XML (especially for languages with a large number of printable chars).
-    int CreateFromMemory(unsigned char* pFileData, int iDataSize, int iWidth, int iHeight, int iSmoothMethod, int iSmoothAmount, int iWidthCharCount, int iHeightCharCount, float sizeRatio);
-
-    int Create(int iWidth, int iHeight, int iSmoothMethod, int iSmoothAmount, int iWidthCharCount = 16, int iHeightCharCount = 16, float sizeRatio = IFFontConstants::defaultSizeRatio);
-    int Release();
-
-    int SetEncoding(FT_Encoding pEncoding) { return m_pGlyphCache.SetEncoding(pEncoding); }
-    FT_Encoding GetEncoding() { return m_pGlyphCache.GetEncoding(); }
-
-    int GetCellWidth() { return m_iCellWidth; }
-    int GetCellHeight() { return m_iCellHeight; }
-
-    int GetWidth() { return m_iWidth; }
-    int GetHeight() { return m_iHeight; }
-
-    int GetWidthCellCount() { return m_iWidthCellCount; }
-    int GetHeightCellCount() { return m_iHeightCellCount; }
-
-    float GetTextureCellWidth() { return m_fTextureCellWidth; }
-    float GetTextureCellHeight() { return m_fTextureCellHeight; }
-
-    FONT_TEXTURE_TYPE* GetBuffer() { return m_pBuffer; }
-
-    uint32 GetSlotChar(int iSlot) const;
-    CTextureSlot* GetCharSlot(uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize);
-    CTextureSlot* GetGradientSlot();
-
-    CTextureSlot* GetLRUSlot();
-    CTextureSlot* GetMRUSlot();
-
-    //! Returns 1 if texture updated, returns 2 if texture not updated, returns 0 on error
-    //! \param szString A string of glyphs (UTF8) to added to the font texture (if they don't already exist in the font texture)
-    //! \param pUpdated is the number of slots updated
-    //! \param sizeRatio A sizing scale that gets applied to all glyphs sizes before they are stored in the font texture.
-    //! \param glyphSize The resolution to render the glyphs in szString at. 
-    //! \param glyphFlags Controls hinting behavior for glyphs rendered to the font texture.
-    int PreCacheString(const char* szString, int* pUpdated = 0, float sizeRatio = IFFontConstants::defaultSizeRatio, const Vec2i& glyphSize = CCryFont::defaultGlyphSize, const CFFont::FontHintParams& glyphFlags = CFFont::FontHintParams());
-    // Arguments:
-    //   pSlot - function does nothing if this pointer is 0
-    void GetTextureCoord(CTextureSlot * pSlot, float texCoords[4], int& iCharSizeX, int& iCharSizeY, int& iCharOffsetX, int& iCharOffsetY, const Vec2i& glyphSize = CCryFont::defaultGlyphSize) const;
-    int GetCharacterWidth(uint32 cChar) const;
-    //! Gets the horizontal advance for the given glyph/char.
-    //! \param cChar The glyph (UTF32) to get the horizontal advance for.
-    //! \param glyphSize The rendered size of the glyph to get the advance for (the same glyph could be stored in the font texture at multiple sizes).
-    int GetHorizontalAdvance(uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize) const;
-    //  int GetCharHeightByChar(wchar_t cChar);
-
-    // useful for special feature rendering interleaved with fonts (e.g. box behind the text)
-    void CreateGradientSlot();
-
-    int WriteToFile(const string& szFileName);
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_pGlyphCache);
-        pSizer->AddObject(m_pSlotList);
-        //pSizer->AddContainer(m_pSlotTable);
-        pSizer->AddObject(m_pBuffer, m_iWidth * m_iHeight * sizeof(FONT_TEXTURE_TYPE));
-    }
-
-    bool GetMonospaced() const { return m_pGlyphCache.GetMonospaced(); }
-
-    Vec2 GetKerning(uint32_t leftGlyph, uint32_t rightGlyph);
-
-    float GetAscenderToHeightRatio();
-
-public: // ---------------------------------------------------------------
-
-        //! Clamps the given glyph size to the given max cell width and height dimensions.
-    static Vec2i ClampGlyphSize(const Vec2i& glyphSize, int cellWidth, int cellHeight);
-
-private: // ---------------------------------------------------------------
-
-    int CreateSlotList(int iListSize);
-    int ReleaseSlotList();
-
-    //! Updates the given font texture slot with the given glyph (UTF8) with the given parameters. If the glyph doesn't
-    //! exist in the font texture at the given size, then the glyph will be rendered to the font texture with the given
-    //! parameters.
-    //! \param iSlot Index of the texture slot to update within the slot list.
-    //! \param wSlotUsage Used for LRU strategy to determine how many times a glyph is referenced for retention within the font texture (before eviction).
-    //! \param cChar UTF32 glyph to store within the slot.
-    //! \param sizeRatio A sizing scale that should be applied to the glyph before being stored within the font texture.
-    //! \param glyphSize The size of the glyph to be rendered at within the font texture.
-    //! \param glyphFlags Specifies hinting behavior that should be applied to the glyph when rendered to the font texture.
-    int UpdateSlot(int iSlot, uint16 wSlotUsage, uint32 cChar, float sizeRatio, const Vec2i& glyphSize = CCryFont::defaultGlyphSize, const CFFont::FontHintParams& glyphFlags = CFFont::FontHintParams());
-
-    CryFont::FontTexture::CTextureSlotKey GetTextureSlotKey(uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize) const;
-
-    //! Calculates scaling info that should be applied when the rendered glyph size doesn't match the maximum glyph slot resolution.
-    //!
-    //! Glyphs can be re-rendered to glyph slots at smaller resolutions for pixel-perfect resolution (rather than applying a scale
-    //! to glyphs rendered at larger sizes). These scaling values allow clients of the font texture to use the glyphs without regard
-    //! to whether the glyphs have been re-rendered or not.
-    float GetRequestSizeWidthScale(const Vec2i& glyphSize) const
-    {
-        const int cellWidth = m_iCellWidth == 0 ? 1 : m_iCellWidth;
-        const float invCellWidth = 1.0f / cellWidth;
-        return glyphSize.x > 0 ? glyphSize.x * invCellWidth : 1.0f;
-    }
-
-    //! Calculates scaling info that should be applied when the rendered glyph size doesn't match the maximum glyph slot resolution.
-    //!
-    //! Glyphs can be re-rendered to glyph slots at smaller resolutions for pixel-perfect resolution (rather than applying a scale
-    //! to glyphs rendered at larger sizes). These scaling values allow clients of the font texture to use the glyphs without regard
-    //! to whether the glyphs have been re-rendered or not.
-    float GetRequestSizeHeightScale(const Vec2i& glyphSize) const
-    {
-        const int cellHeight = m_iCellHeight == 0 ? 1 : m_iCellHeight;
-        const float invCellHeight = 1.0f / cellHeight;
-        return glyphSize.y > 0 ? glyphSize.y * invCellHeight : 1.0f;
-    }
-
-    // --------------------------------
-
-    int                                     m_iWidth;                               // whole texture cache width
-    int                                     m_iHeight;                          // whole texture cache height
-
-    float                                   m_fInvWidth;
-    float                                   m_fInvHeight;
-
-    int                                     m_iCellWidth;
-    int                                     m_iCellHeight;
-
-    float                                   m_fTextureCellWidth;
-    float                                   m_fTextureCellHeight;
-
-    int                                     m_iWidthCellCount;
-    int                                     m_iHeightCellCount;
-
-    int                                     m_nTextureSlotCount;
-
-    int                                     m_iSmoothMethod;
-    int                                     m_iSmoothAmount;
-
-    CGlyphCache                     m_pGlyphCache;
-    CTextureSlotList            m_pSlotList;
-    CTextureSlotTable           m_pSlotTable;
-
-    FONT_TEXTURE_TYPE*     m_pBuffer;                           // [y*iWidth * x] x=0..iWidth-1, y=0..iHeight-1
-
-    uint16                              m_wSlotUsage;
-};
-
-#endif // #if !defined(USE_NULLFONT_ALWAYS)
-
-#endif // CRYINCLUDE_CRYFONT_FONTTEXTURE_H
diff --git a/Code/CryEngine/CryFont/GlyphBitmap.cpp b/Code/CryEngine/CryFont/GlyphBitmap.cpp
deleted file mode 100644
index 8ae893c317..0000000000
--- a/Code/CryEngine/CryFont/GlyphBitmap.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Purpose:
-//  - Hold a glyph bitmap and blit it to the main texture
-
-#include "CryFont_precompiled.h"
-#include "GlyphBitmap.h"
-#include <math.h>
-
-
-//-------------------------------------------------------------------------------------------------
-CGlyphBitmap::CGlyphBitmap()
-    : m_iWidth(0)
-    , m_iHeight(0)
-    , m_pBuffer(0)
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-CGlyphBitmap::~CGlyphBitmap()
-{
-    Release();
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::Create(int iWidth, int iHeight)
-{
-    Release();
-
-    m_pBuffer = new unsigned char[iWidth * iHeight];
-
-    if (!m_pBuffer)
-    {
-        return 0;
-    }
-
-    m_iWidth = iWidth;
-    m_iHeight = iHeight;
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::Release()
-{
-    if (m_pBuffer)
-    {
-        delete[] m_pBuffer;
-    }
-    m_pBuffer = 0;
-    m_iWidth = m_iHeight = 0;
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::Blur(int iIterations)
-{
-    int cSum;
-    int yOffset;
-    int yupOffset;
-    int ydownOffset;
-
-    for (int i = 0; i < iIterations; i++)
-    {
-        for (int y = 0; y < m_iHeight; y++)
-        {
-            yOffset = y * m_iWidth;
-
-            if (y - 1 >= 0)
-            {
-                yupOffset = (y - 1) * m_iWidth;
-            }
-            else
-            {
-                yupOffset = (y) * m_iWidth;
-            }
-
-            if (y + 1 < m_iHeight)
-            {
-                ydownOffset = (y + 1) * m_iWidth;
-            }
-            else
-            {
-                ydownOffset = (y) * m_iWidth;
-            }
-
-            for (int x = 0; x < m_iWidth; x++)
-            {
-                cSum = m_pBuffer[yupOffset + x] + m_pBuffer[ydownOffset + x];
-
-                if (x - 1 >= 0)
-                {
-                    cSum += m_pBuffer[yOffset + x - 1];
-                }
-                else
-                {
-                    cSum += m_pBuffer[yOffset + x];
-                }
-
-                if (x + 1 < m_iWidth)
-                {
-                    cSum += m_pBuffer[yOffset + x + 1];
-                }
-                else
-                {
-                    cSum += m_pBuffer[yOffset + x];
-                }
-
-                m_pBuffer[yOffset + x] = cSum >> 2;
-            }
-        }
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::Scale(float fScaleX, float fScaleY)
-{
-    int iNewWidth = (int)(m_iWidth * fScaleX);
-    int iNewHeight = (int)(m_iHeight * fScaleY);
-
-    unsigned char* pNewBuffer = new unsigned char[iNewWidth * iNewHeight];
-
-    if (!pNewBuffer)
-    {
-        return 0;
-    }
-
-    float xFactor = m_iWidth / (float)iNewWidth;
-    float yFactor = m_iHeight / (float)iNewHeight;
-
-    float xFractioned, yFractioned, xFraction, yFraction, oneMinusX, oneMinusY, fR0, fR1;
-    int xCeil, yCeil, xFloor, yFloor, yNewOffset;
-
-    unsigned char c0, c1, c2, c3;
-
-    for (int y = 0; y < iNewHeight; ++y)
-    {
-        yFractioned = y * yFactor;
-        yFloor = (int)floor_tpl(yFractioned);
-        yCeil = yFloor + 1;
-
-        if (yCeil >= m_iHeight)
-        {
-            yCeil = yFloor;
-        }
-
-        yFraction = yFractioned - yFloor;
-        oneMinusY = 1.0f - yFraction;
-
-        yNewOffset = y * iNewWidth;
-
-        for (int x = 0; x < iNewWidth; ++x)
-        {
-            xFractioned = x * xFactor;
-            xFloor = (int)floor_tpl(xFractioned);
-            xCeil = xFloor + 1;
-
-            if (xCeil >= m_iWidth)
-            {
-                xCeil = xFloor;
-            }
-
-            xFraction = xFractioned - xFloor;
-            oneMinusX = 1.0f - xFraction;
-
-            c0 = m_pBuffer[yFloor * m_iWidth + xFloor];
-            c1 = m_pBuffer[yFloor * m_iWidth + xCeil];
-            c2 = m_pBuffer[yCeil * m_iWidth + xFloor];
-            c3 = m_pBuffer[yCeil * m_iWidth + xCeil];
-
-            fR0 = (oneMinusX * c0 + xFraction * c1);
-            fR1 = (oneMinusX * c2 + xFraction * c3);
-
-            pNewBuffer[yNewOffset + x] = (unsigned char)((oneMinusY * fR0) + (yFraction * fR1));
-        }
-    }
-
-    m_iWidth = iNewWidth;
-    m_iHeight = iNewHeight;
-
-    delete[] m_pBuffer;
-    m_pBuffer = pNewBuffer;
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::Clear()
-{
-    memset(m_pBuffer, 0, m_iWidth * m_iHeight);
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::BlitTo8(unsigned char* pBuffer, int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, int iDestY, int iDestWidth)
-{
-    int ySrcOffset, yDestOffset;
-
-    for (int y = 0; y < iSrcHeight; y++)
-    {
-        ySrcOffset = (iSrcY + y) * m_iWidth;
-        yDestOffset = (iDestY + y) * iDestWidth;
-
-        for (int x = 0; x < iSrcWidth; x++)
-        {
-            pBuffer[yDestOffset + iDestX + x] = m_pBuffer[ySrcOffset + iSrcX + x];
-        }
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::BlitTo32(unsigned int* pBuffer, int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, int iDestY, int iDestWidth)
-{
-    int ySrcOffset, yDestOffset;
-    char cColor;
-
-    for (int y = 0; y < iSrcHeight; y++)
-    {
-        ySrcOffset = (iSrcY + y) * m_iWidth;
-        yDestOffset = (iDestY + y) * iDestWidth;
-
-        for (int x = 0; x < iSrcWidth; x++)
-        {
-            cColor = m_pBuffer[ySrcOffset + iSrcX + x];
-
-            pBuffer[yDestOffset + iDestX + x] = (cColor << 24) | (255 << 16) | (255 << 8) | 255;
-        }
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::BlitScaledTo8(unsigned char* pBuffer, [[maybe_unused]] int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, [[maybe_unused]] int iDestY, int iDestWidth, int iDestHeight, int iDestBufferWidth)
-{
-    int iNewWidth = (int)iDestWidth;
-    int iNewHeight = (int)iDestHeight;
-
-    unsigned char* pNewBuffer = pBuffer;
-
-    float xFactor = iSrcWidth / (float)iNewWidth;
-    float yFactor = iSrcHeight / (float)iNewHeight;
-
-    float xFractioned, yFractioned, xFraction, yFraction, oneMinusX, oneMinusY, fR0, fR1;
-    int xCeil, yCeil, xFloor, yFloor, yNewOffset;
-
-    unsigned char c0, c1, c2, c3;
-
-    for (int y = 0; y < iNewHeight; ++y)
-    {
-        yFractioned = y * yFactor;
-        yFloor = (int)floor_tpl(yFractioned);
-        yCeil = yFloor + 1;
-
-        yFraction = yFractioned - yFloor;
-        oneMinusY = 1.0f - yFraction;
-
-        yNewOffset = y * iDestBufferWidth;
-
-        yFloor += iSrcY;
-        yCeil += iSrcY;
-
-        if (yCeil >= m_iHeight)
-        {
-            yCeil = yFloor;
-        }
-
-        for (int x = 0; x < iNewWidth; ++x)
-        {
-            xFractioned = x * xFactor;
-            xFloor = (int)floor_tpl(xFractioned);
-            xCeil = xFloor + 1;
-
-            xFraction = xFractioned - xFloor;
-            oneMinusX = 1.0f - xFraction;
-
-            xFloor += iSrcY;
-            xCeil += iSrcY;
-
-            if (xCeil >= m_iWidth)
-            {
-                xCeil = xFloor;
-            }
-
-            c0 = m_pBuffer[yFloor * m_iWidth + xFloor];
-            c1 = m_pBuffer[yFloor * m_iWidth + xCeil];
-            c2 = m_pBuffer[yCeil * m_iWidth + xFloor];
-            c3 = m_pBuffer[yCeil * m_iWidth + xCeil];
-
-            fR0 = (oneMinusX * c0 + xFraction * c1);
-            fR1 = (oneMinusX * c2 + xFraction * c3);
-
-            pNewBuffer[yNewOffset + x + iDestX] = (unsigned char)((oneMinusY * fR0) + (yFraction * fR1));
-        }
-    }
-
-    return 1;
-}
-
-
-#if defined(__GNUC__)
-#if __GNUC__ >= 4 && __GNUC__MINOR__ < 7
-#pragma GCC diagnostic ignored "-Woverflow"
-#endif
-#endif
-//-------------------------------------------------------------------------------------------------
-int CGlyphBitmap::BlitScaledTo32(unsigned char* pBuffer, [[maybe_unused]] int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, [[maybe_unused]] int iDestY, int iDestWidth, int iDestHeight, int iDestBufferWidth)
-{
-    int iNewWidth = (int)iDestWidth;
-    int iNewHeight = (int)iDestHeight;
-
-    unsigned char* pNewBuffer = pBuffer;
-
-    float xFactor = iSrcWidth / (float)iNewWidth;
-    float yFactor = iSrcHeight / (float)iNewHeight;
-
-    float xFractioned, yFractioned, xFraction, yFraction, oneMinusX, oneMinusY, fR0, fR1;
-    int xCeil, yCeil, xFloor, yFloor, yNewOffset;
-
-    unsigned char c0, c1, c2, c3, cColor;
-
-    for (int y = 0; y < iNewHeight; ++y)
-    {
-        yFractioned = y * yFactor;
-        yFloor = (int)floor_tpl(yFractioned);
-        yCeil = yFloor + 1;
-
-        yFraction = yFractioned - yFloor;
-        oneMinusY = 1.0f - yFraction;
-
-        yNewOffset = y * iDestBufferWidth;
-
-        yFloor += iSrcY;
-        yCeil += iSrcY;
-
-        if (yCeil >= m_iHeight)
-        {
-            yCeil = yFloor;
-        }
-
-        for (int x = 0; x < iNewWidth; ++x)
-        {
-            xFractioned = x * xFactor;
-            xFloor = (int)floor_tpl(xFractioned);
-            xCeil = xFloor + 1;
-
-            xFraction = xFractioned - xFloor;
-            oneMinusX = 1.0f - xFraction;
-
-            xFloor += iSrcY;
-            xCeil += iSrcY;
-
-            if (xCeil >= m_iWidth)
-            {
-                xCeil = xFloor;
-            }
-
-            c0 = m_pBuffer[yFloor * m_iWidth + xFloor];
-            c1 = m_pBuffer[yFloor * m_iWidth + xCeil];
-            c2 = m_pBuffer[yCeil * m_iWidth + xFloor];
-            c3 = m_pBuffer[yCeil * m_iWidth + xCeil];
-
-            fR0 = (oneMinusX * c0 + xFraction * c1);
-            fR1 = (oneMinusX * c2 + xFraction * c3);
-
-            cColor = (unsigned char)((oneMinusY * fR0) + (yFraction * fR1));
-
-            pNewBuffer[yNewOffset + x + iDestX] = 0xffffff | (cColor << 24);
-        }
-    }
-
-    return 1;
-}
-#if defined(__GNUC__)
-#if __GNUC__ >= 4 && __GNUC__MINOR__ < 7
-#pragma GCC diagnostic error  "-Woverflow"
-#endif
-#endif
-//-------------------------------------------------------------------------------------------------
diff --git a/Code/CryEngine/CryFont/GlyphBitmap.h b/Code/CryEngine/CryFont/GlyphBitmap.h
deleted file mode 100644
index 3d04a36cf7..0000000000
--- a/Code/CryEngine/CryFont/GlyphBitmap.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Purpose : Hold a glyph bitmap and blit it to the main texture
-
-#ifndef CRYINCLUDE_CRYFONT_GLYPHBITMAP_H
-#define CRYINCLUDE_CRYFONT_GLYPHBITMAP_H
-
-#pragma once
-
-
-class CGlyphBitmap
-{
-public:
-    CGlyphBitmap();
-    ~CGlyphBitmap();
-
-    int Create(int iWidth, int iHeight);
-    int Release();
-
-    unsigned char* GetBuffer() { return m_pBuffer; };
-
-    int Blur(int iIterations);
-    int Scale(float fScaleX, float fScaleY);
-
-    int Clear();
-
-    int BlitTo8(unsigned char* pBuffer, int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, int iDestY, int iDestWidth);
-    int BlitTo32(unsigned int* pBuffer, int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, int iDestY, int iDestWidth);
-
-    int BlitScaledTo8(unsigned char* pBuffer, int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, int iDestY, int iDestWidth, int iDestHeight, int iDestBufferWidth);
-    int BlitScaledTo32(unsigned char* pBuffer, int iSrcX, int iSrcY, int iSrcWidth, int iSrcHeight, int iDestX, int iDestY, int iDestWidth, int iDestHeight, int iDestBufferWidth);
-
-    int GetWidth() { return m_iWidth; }
-    int GetHeight() { return m_iHeight; }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_pBuffer, m_iWidth * m_iHeight);
-    }
-
-private:
-
-    unsigned char* m_pBuffer;
-    int             m_iWidth;
-    int             m_iHeight;
-};
-
-#endif // CRYINCLUDE_CRYFONT_GLYPHBITMAP_H
diff --git a/Code/CryEngine/CryFont/GlyphCache.cpp b/Code/CryEngine/CryFont/GlyphCache.cpp
deleted file mode 100644
index 96949009df..0000000000
--- a/Code/CryEngine/CryFont/GlyphCache.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Purpose:
-//  - Manage and cache glyphs, retrieving them from the renderer as needed
-
-#include "CryFont_precompiled.h"
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include "GlyphCache.h"
-#include "FontTexture.h"
-
-
-
-//-------------------------------------------------------------------------------------------------
-CGlyphCache::CGlyphCache()
-    : m_dwUsage(1)
-    , m_iGlyphBitmapWidth(0)
-    , m_iGlyphBitmapHeight(0)
-    , m_pScaleBitmap(0)
-{
-    m_pCacheTable.clear();
-    m_pSlotList.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-CGlyphCache::~CGlyphCache()
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::Create(int iCacheSize, int iGlyphBitmapWidth, int iGlyphBitmapHeight, int iSmoothMethod, int iSmoothAmount, float sizeRatio)
-{
-    m_iSmoothMethod = iSmoothMethod;
-    m_iSmoothAmount = iSmoothAmount;
-
-    m_iGlyphBitmapWidth = iGlyphBitmapWidth;
-    m_iGlyphBitmapHeight = iGlyphBitmapHeight;
-
-
-    if (!CreateSlotList(iCacheSize))
-    {
-        ReleaseSlotList();
-
-        return 0;
-    }
-
-    int iScaledGlyphWidth = 0;
-    int iScaledGlyphHeight = 0;
-
-    switch (m_iSmoothMethod)
-    {
-    case FONT_SMOOTH_SUPERSAMPLE:
-    {
-        switch (m_iSmoothAmount)
-        {
-        case FONT_SMOOTH_AMOUNT_2X:
-            iScaledGlyphWidth = m_iGlyphBitmapWidth << 1;
-            iScaledGlyphHeight = m_iGlyphBitmapHeight << 1;
-            break;
-        case FONT_SMOOTH_AMOUNT_4X:
-            iScaledGlyphWidth = m_iGlyphBitmapWidth << 2;
-            iScaledGlyphHeight = m_iGlyphBitmapHeight << 2;
-            break;
-        }
-    }
-    break;
-    }
-
-    if (iScaledGlyphWidth)
-    {
-        m_pScaleBitmap = new CGlyphBitmap;
-
-        if (!m_pScaleBitmap)
-        {
-            Release();
-
-            return 0;
-        }
-
-        if (!m_pScaleBitmap->Create(iScaledGlyphWidth, iScaledGlyphHeight))
-        {
-            Release();
-
-            return 0;
-        }
-
-        m_pFontRenderer.SetGlyphBitmapSize(iScaledGlyphWidth, iScaledGlyphHeight, sizeRatio);
-    }
-    else
-    {
-        m_pFontRenderer.SetGlyphBitmapSize(m_iGlyphBitmapWidth, m_iGlyphBitmapHeight, sizeRatio);
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::Release()
-{
-    ReleaseSlotList();
-
-    m_pCacheTable.clear();
-
-    if (m_pScaleBitmap)
-    {
-        m_pScaleBitmap->Release();
-
-        delete m_pScaleBitmap;
-
-        m_pScaleBitmap = 0;
-    }
-
-    m_iGlyphBitmapWidth = 0;
-    m_iGlyphBitmapHeight = 0;
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::LoadFontFromFile(const string& szFileName)
-{
-    return m_pFontRenderer.LoadFromFile(szFileName);
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::LoadFontFromMemory(unsigned char* pFileBuffer, int iDataSize)
-{
-    return m_pFontRenderer.LoadFromMemory(pFileBuffer, iDataSize);
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::ReleaseFont()
-{
-    m_pFontRenderer.Release();
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::GetGlyphBitmapSize(int* pWidth, int* pHeight)
-{
-    if (pWidth)
-    {
-        *pWidth = m_iGlyphBitmapWidth;
-    }
-
-    if (pHeight)
-    {
-        *pHeight = m_iGlyphBitmapWidth;
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-void CGlyphCache::SetGlyphBitmapSize(int width, int height, float sizeRatio)
-{
-    m_pFontRenderer.SetGlyphBitmapSize(width, height, sizeRatio);
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::PreCacheGlyph(uint32 cChar, const Vec2i& glyphSize, const CFFont::FontHintParams& fontHintParams)
-{
-    CCacheTable::iterator pItor = m_pCacheTable.find(GetCacheSlotKey(cChar, glyphSize));
-
-    if (pItor != m_pCacheTable.end())
-    {
-        pItor->second->dwUsage = m_dwUsage;
-
-        return 1;
-    }
-
-    CCacheSlot* pSlot = GetLRUSlot();
-
-    if (!pSlot)
-    {
-        return 0;
-    }
-
-    if (pSlot->dwUsage > 0)
-    {
-        UnCacheGlyph(pSlot->cCurrentChar, pSlot->glyphSize);
-    }
-
-    if (m_pScaleBitmap)
-    {
-        int iOffsetMult = 1;
-
-        switch (m_iSmoothAmount)
-        {
-        case FONT_SMOOTH_AMOUNT_2X:
-            iOffsetMult = 2;
-            break;
-        case FONT_SMOOTH_AMOUNT_4X:
-            iOffsetMult = 4;
-            break;
-        }
-
-        m_pScaleBitmap->Clear();
-
-        if (!m_pFontRenderer.GetGlyph(m_pScaleBitmap, &pSlot->iHoriAdvance, &pSlot->iCharWidth, &pSlot->iCharHeight, pSlot->iCharOffsetX, pSlot->iCharOffsetY, 0, 0, cChar, fontHintParams))
-        {
-            return 0;
-        }
-
-        pSlot->iCharWidth >>= iOffsetMult >> 1;
-        pSlot->iCharHeight >>= iOffsetMult >> 1;
-
-        m_pScaleBitmap->BlitScaledTo8(pSlot->pGlyphBitmap.GetBuffer(), 0, 0, m_pScaleBitmap->GetWidth(), m_pScaleBitmap->GetHeight(), 0, 0, pSlot->pGlyphBitmap.GetWidth(), pSlot->pGlyphBitmap.GetHeight(), pSlot->pGlyphBitmap.GetWidth());
-    }
-    else
-    {
-        if (!m_pFontRenderer.GetGlyph(&pSlot->pGlyphBitmap, &pSlot->iHoriAdvance, &pSlot->iCharWidth, &pSlot->iCharHeight, pSlot->iCharOffsetX, pSlot->iCharOffsetY, 0, 0, cChar, fontHintParams))
-        {
-            return 0;
-        }
-    }
-
-    if (m_iSmoothMethod == FONT_SMOOTH_BLUR)
-    {
-        pSlot->pGlyphBitmap.Blur(m_iSmoothAmount);
-    }
-
-    pSlot->dwUsage = m_dwUsage;
-    pSlot->cCurrentChar = cChar;
-    pSlot->glyphSize = glyphSize;
-
-    m_pCacheTable.insert(AZStd::pair<CryFont::GlyphCache::CCacheTableKey, CCacheSlot*>(GetCacheSlotKey(cChar, glyphSize), pSlot));
-
-    return 1;
-}
-
-int CGlyphCache::UnCacheGlyph(uint32 cChar, const Vec2i& glyphSize)
-{
-    CCacheTable::iterator pItor = m_pCacheTable.find(GetCacheSlotKey(cChar, glyphSize));
-
-    if (pItor != m_pCacheTable.end())
-    {
-        CCacheSlot* pSlot = pItor->second;
-
-        pSlot->Reset();
-
-        m_pCacheTable.erase(pItor);
-
-        return 1;
-    }
-
-    return 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::GlyphCached(uint32 cChar, const Vec2i& glyphSize)
-{
-    return (m_pCacheTable.find(GetCacheSlotKey(cChar, glyphSize)) != m_pCacheTable.end());
-}
-
-//-------------------------------------------------------------------------------------------------
-CCacheSlot* CGlyphCache::GetLRUSlot()
-{
-    unsigned int    dwMinUsage = 0xffffffff;
-    CCacheSlot* pLRUSlot = 0;
-    CCacheSlot* pSlot;
-
-    CCacheSlotListItor pItor = m_pSlotList.begin();
-
-    while (pItor != m_pSlotList.end())
-    {
-        pSlot = *pItor;
-
-        if (pSlot->dwUsage == 0)
-        {
-            return pSlot;
-        }
-        else
-        {
-            if (pSlot->dwUsage < dwMinUsage)
-            {
-                pLRUSlot = pSlot;
-                dwMinUsage = pSlot->dwUsage;
-            }
-        }
-
-        pItor++;
-    }
-
-    return pLRUSlot;
-}
-
-//-------------------------------------------------------------------------------------------------
-CCacheSlot* CGlyphCache::GetMRUSlot()
-{
-    unsigned int    dwMaxUsage = 0;
-    CCacheSlot* pMRUSlot = 0;
-    CCacheSlot* pSlot;
-
-    CCacheSlotListItor pItor = m_pSlotList.begin();
-
-    while (pItor != m_pSlotList.end())
-    {
-        pSlot = *pItor;
-
-        if (pSlot->dwUsage != 0)
-        {
-            if (pSlot->dwUsage > dwMaxUsage)
-            {
-                pMRUSlot = pSlot;
-                dwMaxUsage = pSlot->dwUsage;
-            }
-        }
-
-        pItor++;
-    }
-
-    return pMRUSlot;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::GetGlyph(CGlyphBitmap** pGlyph, int* piHoriAdvance, int* piWidth, int* piHeight, AZ::s32& iCharOffsetX, AZ::s32& iCharOffsetY, uint32 cChar, const Vec2i& glyphSize, const CFFont::FontHintParams& fontHintParams)
-{
-    CCacheTable::iterator pItor = m_pCacheTable.find(GetCacheSlotKey(cChar, glyphSize));
-
-    if (pItor == m_pCacheTable.end())
-    {
-        if (!PreCacheGlyph(cChar, glyphSize, fontHintParams))
-        {
-            return 0;
-        }
-    }
-
-    pItor = m_pCacheTable.find(GetCacheSlotKey(cChar, glyphSize));
-
-    pItor->second->dwUsage = m_dwUsage++;
-    (*pGlyph) = &pItor->second->pGlyphBitmap;
-
-    if (piHoriAdvance)
-    {
-        *piHoriAdvance = pItor->second->iHoriAdvance;
-    }
-
-    if (piWidth)
-    {
-        *piWidth = pItor->second->iCharWidth;
-    }
-
-    if (piHeight)
-    {
-        *piHeight = pItor->second->iCharHeight;
-    }
-
-    iCharOffsetX = pItor->second->iCharOffsetX;
-    iCharOffsetY = pItor->second->iCharOffsetY;
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-Vec2 CGlyphCache::GetKerning(uint32_t leftGlyph, uint32_t rightGlyph)
-{
-    return m_pFontRenderer.GetKerning(leftGlyph, rightGlyph);
-}
-
-//-------------------------------------------------------------------------------------------------
-float CGlyphCache::GetAscenderToHeightRatio()
-{
-    return m_pFontRenderer.GetAscenderToHeightRatio();
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::CreateSlotList(int iListSize)
-{
-    for (int i = 0; i < iListSize; i++)
-    {
-        CCacheSlot* pCacheSlot = new CCacheSlot;
-
-        if (!pCacheSlot)
-        {
-            return 0;
-        }
-
-        if (!pCacheSlot->pGlyphBitmap.Create(m_iGlyphBitmapWidth, m_iGlyphBitmapHeight))
-        {
-            delete pCacheSlot;
-
-            return 0;
-        }
-
-        pCacheSlot->Reset();
-
-        pCacheSlot->iCacheSlot = i;
-
-        m_pSlotList.push_back(pCacheSlot);
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-int CGlyphCache::ReleaseSlotList()
-{
-    CCacheSlotListItor pItor = m_pSlotList.begin();
-
-    while (pItor != m_pSlotList.end())
-    {
-        (*pItor)->pGlyphBitmap.Release();
-
-        delete (*pItor);
-
-        pItor = m_pSlotList.erase(pItor);
-    }
-
-    return 1;
-}
-
-//-------------------------------------------------------------------------------------------------
-CryFont::GlyphCache::CCacheTableKey CGlyphCache::GetCacheSlotKey(uint32 cChar, const Vec2i& glyphSize) const
-{
-    const Vec2i clampedGlyphSize = CFontTexture::ClampGlyphSize(glyphSize, m_iGlyphBitmapWidth, m_iGlyphBitmapHeight);
-    return CryFont::GlyphCache::CCacheTableKey(clampedGlyphSize, cChar);
-}
-
-#endif // #if !defined(USE_NULLFONT_ALWAYS)
diff --git a/Code/CryEngine/CryFont/GlyphCache.h b/Code/CryEngine/CryFont/GlyphCache.h
deleted file mode 100644
index c0cc1db555..0000000000
--- a/Code/CryEngine/CryFont/GlyphCache.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-// Purpose:
-//  - Manage and cache glyphs, retrieving them from the renderer as needed
-
-#ifndef CRYINCLUDE_CRYFONT_GLYPHCACHE_H
-#define CRYINCLUDE_CRYFONT_GLYPHCACHE_H
-#pragma once
-
-#if !defined(USE_NULLFONT_ALWAYS)
-
-#include <vector>
-#include "GlyphBitmap.h"
-#include "FontRenderer.h"
-#include "CryFont.h"
-#include <StlUtils.h>
-
-//! Glyph cache slots store the bitmap buffer and glyph metadata from FreeType.
-//!
-//! This bitmap buffer is eventually copied to a CFontTexture texture buffer.
-//! A glyph cache slot bitmap buffer only holds a single glyph, whereas the 
-//! CFontTexture stores multiple glyphs in a grid (row/col) format.
-typedef struct CCacheSlot
-{
-    Vec2i           glyphSize = CCryFont::defaultGlyphSize; //!< The render resolution of the glyph in the glyph bitmap
-    unsigned int    dwUsage;
-    int             iCacheSlot;
-    int             iHoriAdvance;                           //!< Advance width. See FT_Glyph_Metrics::horiAdvance.
-    uint32          cCurrentChar;
-
-    uint8           iCharWidth;                             //!< Glyph width (in pixel)
-    uint8           iCharHeight;                            //!< Glyph height (in pixel)
-    AZ::s32         iCharOffsetX;                           //!< Glyph's left-side bearing (in pixels). See FT_GlyphSlotRec::bitmap_left.
-    AZ::s32         iCharOffsetY;                           //!< Glyph's top bearing (in pixels). See FT_GlyphSlotRec::bitmap_top.
-
-    CGlyphBitmap    pGlyphBitmap;                           //!< Contains a buffer storing a copy of the glyph from FreeType
-
-    void            Reset()
-    {
-        dwUsage = 0;
-        cCurrentChar = ~0;
-
-        iCharWidth = 0;
-        iCharHeight = 0;
-        iCharOffsetX = 0;
-        iCharOffsetY = 0;
-
-        pGlyphBitmap.Clear();
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(pGlyphBitmap);
-    }
-} CCacheSlot;
-
-namespace CryFont
-{
-    namespace GlyphCache
-    {
-        //! Height and width pair for glyph size mapping
-        typedef Vec2i                                               CCacheTableGlyphSizeType;
-
-        //! Pair for mapping a height and width size to a UTF32 character/glyph
-        typedef AZStd::pair<CCacheTableGlyphSizeType, uint32>       CCacheTableKey;
-
-        //! Hasher for glyph cache table keys (glyphsize-char code pair)
-        //!
-        //! Instead of creating our own custom hash, the types are broken down to their
-        //! native types (ints) and passed to existing hashes that handle those types.
-        struct HashGlyphCacheTableKey
-        {
-            typedef CCacheTableKey                  ArgumentType;
-            typedef AZStd::size_t                   ResultType;
-            typedef AZStd::pair<int32, int32>       Int32Pair;
-            typedef AZStd::pair<Int32Pair, uint32>  Int32PairU32Pair;
-            ResultType operator()(const ArgumentType& value) const
-            {
-                AZStd::hash<Int32PairU32Pair> pairHash;
-                return pairHash(Int32PairU32Pair(Int32Pair(value.first.x, value.first.y), value.second));
-            }
-        };
-    }
-}
-
-//! Maps size-speicifc UTF32 glyphs to their corresponding cache slots
-typedef AZStd::unordered_map<CryFont::GlyphCache::CCacheTableKey, CCacheSlot*, CryFont::GlyphCache::HashGlyphCacheTableKey> CCacheTable;
-
-typedef std::vector<CCacheSlot*>            CCacheSlotList;
-typedef std::vector<CCacheSlot*>::iterator  CCacheSlotListItor;
-
-
-#ifdef WIN64
-#undef GetCharWidth
-#undef GetCharHeight
-#endif
-
-//! The glyph cache maps UTF32 codepoints to their corresponding FreeType data.
-//!
-//! This cache is used to associate font glyph info (read from FreeType) with
-//! UTF32 codepoints. Ultimately the glyph info will be read into a font texture
-//! (CFontTexture) to avoid future FreeType lookups.
-//!
-//! If a CFontTexture is missing a glyph that is currently stored in the glyph 
-//! cache, the cached data can be returned instead of having to be rendered from
-//! FreeType again.
-//!
-//! \sa CFontTexture
-class CGlyphCache
-{
-public:
-    CGlyphCache();
-    ~CGlyphCache();
-
-    int Create(int iCacheSize, int iGlyphBitmapWidth, int iGlyphBitmapHeight, int iSmoothMethod, int iSmoothAmount, float sizeRatio);
-    int Release();
-
-    int LoadFontFromFile(const string& szFileName);
-    int LoadFontFromMemory(unsigned char* pFileBuffer, int iDataSize);
-    int ReleaseFont();
-
-    int SetEncoding(FT_Encoding pEncoding) { return m_pFontRenderer.SetEncoding(pEncoding); };
-    FT_Encoding GetEncoding() { return m_pFontRenderer.GetEncoding(); };
-
-    int GetGlyphBitmapSize(int* pWidth, int* pHeight);
-    void SetGlyphBitmapSize(int width, int height, float sizeRatio);
-
-    int PreCacheGlyph(uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize, const CFFont::FontHintParams& glyphFlags = CFFont::FontHintParams());
-    int UnCacheGlyph(uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize);
-    int GlyphCached(uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize);
-
-    CCacheSlot* GetLRUSlot();
-    CCacheSlot* GetMRUSlot();
-
-    //! Obtains glyph information for the given UTF32 codepoint.
-    //! This information is obtained from a CCacheSlot that corresponds to
-    //! the given codepoint. If the codepoint doesn't exist within the cache
-    //! table (m_pCacheTable), then the information is obtain from FreeType
-    //! directly via CFontRenderer.
-    //!
-    //! Ultimately the glyph bitmap is copied into a font texture 
-    //! (CFontTexture). Once the glyph is copied into the font texture then
-    //! the font texture is referenced directly rather than relying on the
-    //! glyph cache or FreeType.
-    //!
-    //! \sa CFontRenderer::GetGlyph, CFontTexture::UpdateSlot
-    int GetGlyph(CGlyphBitmap** pGlyph, int* piHoriAdvance, int* piWidth, int* piHeight, AZ::s32& iCharOffsetX, AZ::s32& iCharOffsetY, uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize, const CFFont::FontHintParams& glyphFlags = CFFont::FontHintParams());
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_pSlotList);
-        //pSizer->AddContainer(m_pCacheTable);
-        pSizer->AddObject(m_pScaleBitmap);
-        pSizer->AddObject(m_pFontRenderer);
-    }
-
-    bool GetMonospaced() const { return m_pFontRenderer.GetMonospaced(); }
-
-    Vec2 GetKerning(uint32_t leftGlyph, uint32_t rightGlyph);
-
-    float GetAscenderToHeightRatio();
-
-private:
-
-    //! Returns a key for the cache table where the given char is mapped at the given size.
-    CryFont::GlyphCache::CCacheTableKey GetCacheSlotKey(uint32 cChar, const Vec2i& glyphSize = CCryFont::defaultGlyphSize) const;
-
-    int             CreateSlotList(int iListSize);
-    int             ReleaseSlotList();
-
-    CCacheSlotList  m_pSlotList;
-    CCacheTable     m_pCacheTable;
-
-    int             m_iGlyphBitmapWidth;
-    int             m_iGlyphBitmapHeight;
-
-    int             m_iSmoothMethod;
-    int             m_iSmoothAmount;
-
-    CGlyphBitmap* m_pScaleBitmap;
-
-    CFontRenderer   m_pFontRenderer;
-
-    unsigned int    m_dwUsage;
-};
-
-#endif // #if !defined(USE_NULLFONT_ALWAYS)
-
-#endif // CRYINCLUDE_CRYFONT_GLYPHCACHE_H
diff --git a/Code/CryEngine/CryFont/ICryFont.cpp b/Code/CryEngine/CryFont/ICryFont.cpp
deleted file mode 100644
index dfbaf65335..0000000000
--- a/Code/CryEngine/CryFont/ICryFont.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Create the font interface.
-
-
-#include "CryFont_precompiled.h"
-
-#include <IEngineModule.h>
-#include <CryExtension/ICryFactory.h>
-#include <CryExtension/Impl/ClassWeaver.h>
-
-#include "CryFont.h"
-#if defined(USE_NULLFONT)
-#include "NullFont.h"
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-struct CSystemEventListner_Font
-    : public ISystemEventListener
-{
-public:
-    virtual void OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-    {
-        switch (event)
-        {
-        case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
-        {
-            STLALLOCATOR_CLEANUP;
-            break;
-        }
-        }
-    }
-};
-static CSystemEventListner_Font g_system_event_listener_font;
-
-///////////////////////////////////////////////
-extern "C" ICryFont * CreateCryFontInterface(ISystem * pSystem)
-{
-    ModuleInitISystem(pSystem, "CryFont");
-
-    if (gEnv->IsDedicated())
-    {
-#if defined(USE_NULLFONT)
-        return new CCryNullFont();
-#else
-        // The NULL font implementation must be present for all platforms
-        // supporting running as a pure dedicated server.
-        pSystem->GetILog()->LogError("Missing NULL font implementation for dedicated server");
-        return NULL;
-#endif
-    }
-    else
-    {
-#if defined(USE_NULLFONT) && defined(USE_NULLFONT_ALWAYS)
-        return new CCryNullFont();
-#else
-        pSystem->GetISystemEventDispatcher()->RegisterListener(&g_system_event_listener_font);
-        return new CCryFont(pSystem);
-#endif
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CEngineModule_CryFont
-    : public IEngineModule
-{
-    CRYINTERFACE_SIMPLE(IEngineModule)
-    CRYGENERATE_SINGLETONCLASS(CEngineModule_CryFont, "EngineModule_CryFont", 0x6758643f43214957, 0x9b920d898d31f434)
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual const char* GetName() const {
-        return "CryFont";
-    };
-    virtual const char* GetCategory() const { return "CryEngine"; };
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual bool Initialize(SSystemGlobalEnvironment& env, [[maybe_unused]] const SSystemInitParams& initParams)
-    {
-        ISystem* pSystem = env.pSystem;
-        env.pCryFont = CreateCryFontInterface(pSystem);
-        return env.pCryFont != 0;
-    }
-};
-
-CRYREGISTER_SINGLETON_CLASS(CEngineModule_CryFont)
-
-CEngineModule_CryFont::CEngineModule_CryFont()
-{
-};
-
-CEngineModule_CryFont::~CEngineModule_CryFont()
-{
-};
diff --git a/Code/CryEngine/CryFont/NullFont.cpp b/Code/CryEngine/CryFont/NullFont.cpp
deleted file mode 100644
index bddca1bbed..0000000000
--- a/Code/CryEngine/CryFont/NullFont.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Dummy font implementation (dedicated server)
-
-#include "CryFont_precompiled.h"
-
-#if defined(USE_NULLFONT)
-
-#include "NullFont.h"
-
-CNullFont CCryNullFont::ms_nullFont;
-
-#endif // USE_NULLFONT
diff --git a/Code/CryEngine/CryFont/NullFont.h b/Code/CryEngine/CryFont/NullFont.h
deleted file mode 100644
index 94fceeb9b0..0000000000
--- a/Code/CryEngine/CryFont/NullFont.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Dummy font implementation (dedicated server)
-
-
-#ifndef CRYINCLUDE_CRYFONT_NULLFONT_H
-#define CRYINCLUDE_CRYFONT_NULLFONT_H
-#pragma once
-
-
-#if defined(USE_NULLFONT)
-
-#include <IFont.h>
-
-class CNullFont
-    : public IFFont
-{
-public:
-    CNullFont() {}
-    virtual ~CNullFont() {}
-
-    virtual int32 AddRef() { return 0; };
-    virtual int32 Release() { return 0; };
-
-    virtual bool Load([[maybe_unused]] const char* pFontFilePath, [[maybe_unused]] unsigned int width, [[maybe_unused]] unsigned int height, [[maybe_unused]] unsigned int widthNumSlots, [[maybe_unused]] unsigned int heightNumSlots, [[maybe_unused]] unsigned int flags, [[maybe_unused]] float sizeRatio) { return true; }
-    virtual bool Load([[maybe_unused]] const char* pXMLFile) { return true; }
-    virtual void Free() {}
-
-    virtual void DrawString([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] const char* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) {}
-    virtual void DrawString([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z, [[maybe_unused]] const char* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) {}
-
-    virtual void DrawStringW([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] const wchar_t* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) {}
-    virtual void DrawStringW([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z, [[maybe_unused]] const wchar_t* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) {}
-
-    virtual Vec2 GetTextSize([[maybe_unused]] const char* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) { return Vec2(0.0f, 0.0f); }
-    virtual Vec2 GetTextSizeW([[maybe_unused]] const wchar_t* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) { return Vec2(0.0f, 0.0f); }
-
-    virtual size_t GetTextLength([[maybe_unused]] const char* pStr, [[maybe_unused]] const bool asciiMultiLine) const { return 0; }
-    virtual size_t GetTextLengthW([[maybe_unused]] const wchar_t* pStr, [[maybe_unused]] const bool asciiMultiLine) const { return 0; }
-
-    virtual void WrapText(string& result, [[maybe_unused]] float maxWidth, const char* pStr, [[maybe_unused]] const STextDrawContext& ctx) { result = pStr; }
-    virtual void WrapTextW(wstring& result, [[maybe_unused]] float maxWidth, const wchar_t* pStr, [[maybe_unused]] const STextDrawContext& ctx) { result = pStr; }
-
-    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-    virtual void GetGradientTextureCoord([[maybe_unused]] float& minU, [[maybe_unused]] float& minV, [[maybe_unused]] float& maxU, [[maybe_unused]] float& maxV) const {}
-
-    virtual unsigned int GetEffectId([[maybe_unused]] const char* pEffectName) const { return 0; }
-    virtual unsigned int GetNumEffects() const { return 0; }
-    virtual const char* GetEffectName([[maybe_unused]] unsigned int effectId) const { return nullptr; }
-    virtual Vec2 GetMaxEffectOffset([[maybe_unused]] unsigned int effectId) const { return Vec2(); }
-    virtual bool DoesEffectHaveTransparency([[maybe_unused]] unsigned int effectId) const { return false; }
-
-    virtual void AddCharsToFontTexture([[maybe_unused]] const char* pChars, [[maybe_unused]] int glyphSizeX, [[maybe_unused]] int glyphSizeY) override {}
-    virtual Vec2 GetKerning([[maybe_unused]] uint32_t leftGlyph, [[maybe_unused]] uint32_t rightGlyph, [[maybe_unused]] const STextDrawContext& ctx) const override { return Vec2(); }
-    virtual float GetAscender([[maybe_unused]] const STextDrawContext& ctx) const override { return 0.0f; }
-    virtual float GetBaseline([[maybe_unused]] const STextDrawContext& ctx) const override { return 0.0f; }
-    virtual float GetSizeRatio() const override { return IFFontConstants::defaultSizeRatio; }
-    virtual uint32 GetNumQuadsForText([[maybe_unused]] const char* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) { return 0; }
-    virtual uint32 WriteTextQuadsToBuffers([[maybe_unused]] SVF_P2F_C4B_T2F_F4B* verts, [[maybe_unused]] uint16* indices, [[maybe_unused]] uint32 maxQuads, [[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z, [[maybe_unused]] const char* pStr, [[maybe_unused]] const bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) { return 0; }
-    virtual int GetFontTextureId() { return -1; }
-    virtual uint32 GetFontTextureVersion() { return 0; }
-};
-
-class CCryNullFont
-    : public ICryFont
-{
-public:
-    virtual void Release() {}
-    virtual IFFont* NewFont([[maybe_unused]] const char* pFontName) { return &ms_nullFont; }
-    virtual IFFont* GetFont([[maybe_unused]] const char* pFontName) const { return &ms_nullFont; }
-    virtual FontFamilyPtr LoadFontFamily([[maybe_unused]] const char* pFontFamilyName) override { CRY_ASSERT(false); return nullptr; }
-    virtual FontFamilyPtr GetFontFamily([[maybe_unused]] const char* pFontFamilyName) override { CRY_ASSERT(false); return nullptr; }
-    virtual void AddCharsToFontTextures(FontFamilyPtr pFontFamily, [[maybe_unused]] const char* pChars, [[maybe_unused]] int glyphSizeX, [[maybe_unused]] int glyphSizeY) override {};
-    virtual void SetRendererProperties([[maybe_unused]] IRenderer* pRenderer) {}
-    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-    virtual string GetLoadedFontNames() const { return ""; }
-    virtual void OnLanguageChanged() override { }
-    virtual void ReloadAllFonts() override { } 
-
-private:
-    static CNullFont ms_nullFont;
-};
-
-#endif // USE_NULLFONT
-
-#endif // CRYINCLUDE_CRYFONT_NULLFONT_H
diff --git a/Code/CryEngine/CryFont/Platform/Linux/platform_linux.cmake b/Code/CryEngine/CryFont/Platform/Linux/platform_linux.cmake
deleted file mode 100644
index bafe20e506..0000000000
--- a/Code/CryEngine/CryFont/Platform/Linux/platform_linux.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-# Platform specific cmake file for configuring target compiler/link properties
-# based on the active platform
-# NOTE: functions in cmake are global, therefore adding functions to this file
-# is being avoided to prevent overriding functions declared in other targets platfrom
-# specific cmake files
diff --git a/Code/CryEngine/CryFont/cryfont_files.cmake b/Code/CryEngine/CryFont/cryfont_files.cmake
deleted file mode 100644
index f46a5b5b44..0000000000
--- a/Code/CryEngine/CryFont/cryfont_files.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    CryFont.cpp
-    FFont.cpp
-    FFontXML.cpp
-    FontRenderer.cpp
-    FontTexture.cpp
-    GlyphBitmap.cpp
-    GlyphCache.cpp
-    ICryFont.cpp
-    NullFont.cpp
-    CryFont.h
-    FBitmap.h
-    FFont.h
-    FontRenderer.h
-    FontTexture.h
-    GlyphBitmap.h
-    GlyphCache.h
-    NullFont.h
-    resource.h
-    CryFont_precompiled.h
-    CryFont_precompiled.cpp
-)
diff --git a/Code/CryEngine/CryFont/resource.h b/Code/CryEngine/CryFont/resource.h
deleted file mode 100644
index ed88839421..0000000000
--- a/Code/CryEngine/CryFont/resource.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#define VS_VERSION_INFO                 1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Code/CryEngine/CrySystem/CMakeLists.txt b/Code/CryEngine/CrySystem/CMakeLists.txt
index 32ddc4a3a5..1a5593e5d8 100644
--- a/Code/CryEngine/CrySystem/CMakeLists.txt
+++ b/Code/CryEngine/CrySystem/CMakeLists.txt
@@ -60,8 +60,6 @@ ly_add_target(
             Legacy::CrySystem.XMLBinary
             Legacy::RemoteConsoleCore
             AZ::AzFramework
-    RUNTIME_DEPENDENCIES
-        Legacy::Cry3DEngine
 )
 
 ly_add_source_properties(
@@ -92,8 +90,6 @@ ly_add_target(
             AZ::AzCore
             Legacy::CryCommon
             Legacy::CryCommon.EngineSettings.Static
-    RUNTIME_DEPENDENCIES
-        Legacy::CryFont
 )
 
 ################################################################################
diff --git a/Code/CryEngine/CrySystem/CPUDetect.cpp b/Code/CryEngine/CrySystem/CPUDetect.cpp
index 9af68a1854..6d924a1514 100644
--- a/Code/CryEngine/CrySystem/CPUDetect.cpp
+++ b/Code/CryEngine/CrySystem/CPUDetect.cpp
@@ -52,11 +52,7 @@
 # define cpuid(op, eax, ebx, ecx, edx) __asm__("cpuid" : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) : "a" (op) : "cc");
 #endif
 
-#if defined(AZ_MONOLITHIC_BUILD)
-extern int g_CpuFlags;
-#else
 int g_CpuFlags;
-#endif
 
 struct SAutoMaxPriority
 {
diff --git a/Code/CryEngine/CrySystem/Platform/Mac/platform_mac.cmake b/Code/CryEngine/CrySystem/Platform/Mac/platform_mac.cmake
index 6c55ad5b08..bafe20e506 100644
--- a/Code/CryEngine/CrySystem/Platform/Mac/platform_mac.cmake
+++ b/Code/CryEngine/CrySystem/Platform/Mac/platform_mac.cmake
@@ -14,14 +14,3 @@
 # NOTE: functions in cmake are global, therefore adding functions to this file
 # is being avoided to prevent overriding functions declared in other targets platfrom
 # specific cmake files
-
-if (LY_MONOLITHIC_GAME) # Only Atom is supported in monolithic builds
-    set(LY_BUILD_DEPENDENCIES
-        PUBLIC
-            Legacy::CryRenderOther
-    )
-else()
-    set(LY_RUNTIME_DEPENDENCIES
-        Legacy::CryRenderMetal
-    )
-endif()
diff --git a/Code/CryEngine/CrySystem/System.h b/Code/CryEngine/CrySystem/System.h
index 47fdb362e9..e4fcc82552 100644
--- a/Code/CryEngine/CrySystem/System.h
+++ b/Code/CryEngine/CrySystem/System.h
@@ -676,17 +676,11 @@ private:
     //! @name Initialization routines
     //@{
     bool InitConsole();
-    bool InitRenderer(WIN_HINSTANCE hinst, WIN_HWND hwnd, const SSystemInitParams& initParams);
-
-    bool InitFont(const SSystemInitParams& initParams);
     bool InitFileSystem();
     bool InitFileSystem_LoadEngineFolders(const SSystemInitParams& initParams);
     bool InitStreamEngine();
-    bool Init3DEngine(const SSystemInitParams& initParams);
     bool InitAudioSystem(const SSystemInitParams& initParams);
     bool InitShine(const SSystemInitParams& initParams);
-    bool OpenRenderLibrary(int type, const SSystemInitParams& initParams);
-    bool OpenRenderLibrary(const char* t_rend, const SSystemInitParams& initParams);
 
     //@}
 
@@ -738,9 +732,6 @@ private:
     bool GetWinGameFolder(char* szMyDocumentsPath, int maxPathSize);
 #endif
 
-    //! \brief Initializes the given IFFont member variable with the given name (internal use only).
-    bool LoadFontInternal(IFFont*& font, const string& fontName);
-
 public:
     void EnableFloatExceptions(int type);
 
diff --git a/Code/CryEngine/CrySystem/SystemInit.cpp b/Code/CryEngine/CrySystem/SystemInit.cpp
index fcbf0b8215..d293f9ca80 100644
--- a/Code/CryEngine/CrySystem/SystemInit.cpp
+++ b/Code/CryEngine/CrySystem/SystemInit.cpp
@@ -43,8 +43,6 @@
 #include <StringUtils.h>
 #include <IThreadManager.h>
 
-#include "CryFontBus.h"
-
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzFramework/IO/LocalFileIO.h>
 
@@ -247,24 +245,6 @@ CUNIXConsole* pUnixConsole;
 
 #define LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME "Libs/Localization/localization.xml"
 
-#define LOAD_LEGACY_RENDERER_FOR_EDITOR false // If you set this to true you must also set 'ed_useAtomNativeViewport' to false (see /Code/Sandbox/Editor/ViewManager.cpp)
-#define LOAD_LEGACY_RENDERER_FOR_LAUNCHER false
-
-//////////////////////////////////////////////////////////////////////////
-// Where possible, these are defaults used to initialize cvars
-// System.cfg can then be used to override them
-// This includes the Game DLL, although it is loaded elsewhere
-
-#define DLL_FONT           "CryFont"
-#define DLL_3DENGINE       "Cry3DEngine"
-#define DLL_RENDERER_DX9   "CryRenderD3D9"
-#define DLL_RENDERER_DX11  "CryRenderD3D11"
-#define DLL_RENDERER_DX12  "CryRenderD3D12"
-#define DLL_RENDERER_METAL "CryRenderMetal"
-#define DLL_RENDERER_GL    "CryRenderGL"
-#define DLL_RENDERER_NULL  "CryRenderNULL"
-#define DLL_SHINE          "LyShine"
-
 //////////////////////////////////////////////////////////////////////////
 #if defined(WIN32) || defined(LINUX) || defined(APPLE)
 #   define DLL_MODULE_INIT_ISYSTEM "ModuleInitISystem"
@@ -1079,58 +1059,6 @@ void CSystem::ShutdownModuleLibraries()
 #endif // !defined(AZ_MONOLITHIC_BUILD)
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::OpenRenderLibrary([[maybe_unused]] const char* t_rend, const SSystemInitParams& initParams)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_6
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-
-    if (gEnv->IsDedicated())
-    {
-        return OpenRenderLibrary(R_NULL_RENDERER, initParams);
-    }
-
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        return OpenRenderLibrary(R_DX11_RENDERER, initParams);
-    }
-    else if (azstricmp(t_rend, "DX9") == 0)
-    {
-        return OpenRenderLibrary(R_DX9_RENDERER, initParams);
-    }
-    else if (azstricmp(t_rend, "DX11") == 0)
-    {
-        return OpenRenderLibrary(R_DX11_RENDERER, initParams);
-    }
-    else if (azstricmp(t_rend, "DX12") == 0)
-    {
-        return OpenRenderLibrary(R_DX12_RENDERER, initParams);
-    }
-    else if (azstricmp(t_rend, "GL") == 0)
-    {
-        return OpenRenderLibrary(R_GL_RENDERER, initParams);
-    }
-    else if (azstricmp(t_rend, "METAL") == 0)
-    {
-        return OpenRenderLibrary(R_METAL_RENDERER, initParams);
-    }
-    else if (azstricmp(t_rend, "NULL") == 0)
-    {
-        return OpenRenderLibrary(R_NULL_RENDERER, initParams);
-    }
-
-    AZ_Assert(false, "Unknown renderer type: %s", t_rend);
-    return false;
-#endif
-}
-
 /////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////
 
@@ -1220,126 +1148,6 @@ wstring GetErrorStringUnsupportedGPU(const char* gpuName, unsigned int gpuVendor
 }
 #endif
 
-bool CSystem::OpenRenderLibrary(int type, const SSystemInitParams& initParams)
-{
-    LOADING_TIME_PROFILE_SECTION;
-#if defined(WIN32) || defined(WIN64)
-    if (!gEnv->IsDedicated())
-    {
-        unsigned int gpuVendorId = 0, gpuDeviceId = 0, totVidMem = 0;
-        char gpuName[256];
-        Win32SysInspect::DXFeatureLevel featureLevel = Win32SysInspect::DXFL_Undefined;
-        Win32SysInspect::GetGPUInfo(gpuName, sizeof(gpuName), gpuVendorId, gpuDeviceId, totVidMem, featureLevel);
-
-        if (m_env.IsEditor())
-        {
-#if defined(EXTERNAL_CRASH_REPORTING)
-            CrashHandler::CrashHandlerBase::AddAnnotation("dx.feature.level", Win32SysInspect::GetFeatureLevelAsString(featureLevel));
-            CrashHandler::CrashHandlerBase::AddAnnotation("gpu.name", gpuName);
-            CrashHandler::CrashHandlerBase::AddAnnotation("gpu.vendorId", std::to_string(gpuVendorId));
-            CrashHandler::CrashHandlerBase::AddAnnotation("gpu.deviceId", std::to_string(gpuDeviceId));
-            CrashHandler::CrashHandlerBase::AddAnnotation("gpu.memory", std::to_string(totVidMem));
-#endif
-        }
-        else
-        {
-            if (featureLevel < Win32SysInspect::DXFL_11_0)
-            {
-                const char logMsgFmt[] ("Unsupported GPU configuration!\n- %s (vendor = 0x%.4x, device = 0x%.4x)\n- Dedicated video memory: %d MB\n- Feature level: %s\n");
-                AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, logMsgFmt, gpuName, gpuVendorId, gpuDeviceId, totVidMem >> 20, GetFeatureLevelAsString(featureLevel));
-
-#if !defined(_RELEASE)
-                const bool allowPrompts = m_env.pSystem->GetICmdLine()->FindArg(eCLAT_Pre, "noprompt") == 0;
-#else
-                const bool allowPrompts = true;
-#endif // !defined(_RELEASE)
-                if (allowPrompts)
-                {
-                    AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Asking user if they wish to continue...");
-                    const int mbRes = MessageBoxW(0, GetErrorStringUnsupportedGPU(gpuName, gpuVendorId, gpuDeviceId).c_str(), L"Open 3D Engine", MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2 | MB_DEFAULT_DESKTOP_ONLY);
-                    if (mbRes == IDCANCEL)
-                    {
-                        AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "User chose to cancel startup due to unsupported GPU.");
-                        return false;
-                    }
-                }
-                else
-                {
-#if !defined(_RELEASE)
-                    const bool obeyGPUCheck = m_env.pSystem->GetICmdLine()->FindArg(eCLAT_Pre, "anygpu") == 0;
-#else
-                    const bool obeyGPUCheck = true;
-#endif // !defined(_RELEASE)
-                    if (obeyGPUCheck)
-                    {
-                        AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "No prompts allowed and unsupported GPU check active. Treating unsupported GPU as error and exiting.");
-                        return false;
-                    }
-                }
-
-                AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "User chose to continue despite unsupported GPU!");
-            }
-        }
-    }
-#endif
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_7
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-
-    if (gEnv->IsDedicated())
-    {
-        type = R_NULL_RENDERER;
-    }
-    const char* libname = "";
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        libname = DLL_RENDERER_NULL;
-    }
-    else if (type == R_DX9_RENDERER)
-    {
-        libname = DLL_RENDERER_DX9;
-    }
-    else if (type == R_DX11_RENDERER)
-    {
-        libname = DLL_RENDERER_DX11;
-    }
-    else if (type == R_DX12_RENDERER)
-    {
-        libname = DLL_RENDERER_DX12;
-    }
-    else if (type == R_NULL_RENDERER)
-    {
-        libname = DLL_RENDERER_NULL;
-    }
-    else if (type == R_GL_RENDERER)
-    {
-        libname = DLL_RENDERER_GL;
-    }
-    else if (type == R_METAL_RENDERER)
-    {
-        libname = DLL_RENDERER_METAL;
-    }
-    else
-    {
-        AZ_Assert(false, "Renderer did not initialize correctly; no valid renderer specified.");
-        return false;
-    }
-
-    if (!InitializeEngineModule(libname, "EngineModule_CryRenderer", initParams))
-    {
-        return false;
-    }
-
-    if (!m_env.pRenderer)
-    {
-        AZ_Assert(false, "Renderer did not initialize correctly; it could not be found in the system environment.");
-        return false;
-    }
-
-    return true;
-}
-
 /////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////
 bool CSystem::InitConsole()
@@ -1391,123 +1199,6 @@ ICVar* CSystem::attachVariable (const char* szVarName, int* pContainer, const ch
     return pVar;
 }
 
-/////////////////////////////////////////////////////////////////////////////////
-bool CSystem::InitRenderer(WIN_HINSTANCE hinst, WIN_HWND hwnd, const SSystemInitParams& initParams)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    if (m_pUserCallback)
-    {
-        m_pUserCallback->OnInitProgress("Initializing Renderer...");
-    }
-
-    if (m_bEditor)
-    {
-        m_env.pConsole->GetCVar("r_Width");
-
-        // save current screen width/height/bpp, so they can be restored on shutdown
-        m_iWidth = m_env.pConsole->GetCVar("r_Width")->GetIVal();
-        m_iHeight = m_env.pConsole->GetCVar("r_Height")->GetIVal();
-        m_iColorBits = m_env.pConsole->GetCVar("r_ColorBits")->GetIVal();
-    }
-
-    if (!OpenRenderLibrary(m_rDriver->GetString(), initParams))
-    {
-        return false;
-    }
-
-#if defined(AZ_PLATFORM_IOS) || defined(AZ_PLATFORM_ANDROID)
-    if (m_rWidthAndHeightAsFractionOfScreenSize->GetFlags() & VF_WASINCONFIG)
-    {
-        int displayWidth = 0;
-        int displayHeight = 0;
-        if (GetPrimaryPhysicalDisplayDimensions(displayWidth, displayHeight))
-        {
-            // Ideally we would probably want to clamp this at the source,
-            // but I don't believe cvars support specifying a valid range.
-            float scaleFactor = 1.0f;
-
-            if(IsTablet())
-            {
-                scaleFactor = AZ::GetClamp(m_rTabletWidthAndHeightAsFractionOfScreenSize->GetFVal(), 0.1f, 1.0f);
-            }
-            else
-            {
-                scaleFactor = AZ::GetClamp(m_rWidthAndHeightAsFractionOfScreenSize->GetFVal(), 0.1f, 1.0f);
-            }
-
-            displayWidth *= scaleFactor;
-            displayHeight *= scaleFactor;
-
-            const int maxWidth = m_rMaxWidth->GetIVal();
-            if (maxWidth > 0 && maxWidth < displayWidth)
-            {
-                const float widthScaleFactor = static_cast<float>(maxWidth) / static_cast<float>(displayWidth);
-                displayWidth *= widthScaleFactor;
-                displayHeight *= widthScaleFactor;
-            }
-
-            const int maxHeight = m_rMaxHeight->GetIVal();
-            if (maxHeight > 0 && maxHeight < displayHeight)
-            {
-                const float heightScaleFactor = static_cast<float>(maxHeight) / static_cast<float>(displayHeight);
-                displayWidth *= heightScaleFactor;
-                displayHeight *= heightScaleFactor;
-            }
-
-            m_rWidth->Set(displayWidth);
-            m_rHeight->Set(displayHeight);
-        }
-    }
-#endif // defined(AZ_PLATFORM_IOS) || defined(AZ_PLATFORM_ANDROID)
-
-    if (m_env.pRenderer)
-    {
-        // This is crucial as textures suffix are hard coded to context and we need to initialize
-        // the texture semantics to look it up.
-        m_env.pRenderer->InitTexturesSemantics();
-
-#ifdef WIN32
-        SCustomRenderInitArgs args;
-        args.appStartedFromMediaCenter = strstr(initParams.szSystemCmdLine, "ReLaunchMediaCenter") != 0;
-
-        m_hWnd = m_env.pRenderer->Init(0, 0, m_rWidth->GetIVal(), m_rHeight->GetIVal(), m_rColorBits->GetIVal(), m_rDepthBits->GetIVal(), m_rStencilBits->GetIVal(), m_rFullscreen->GetIVal() ? true : false, initParams.bEditor, hinst, hwnd, false, &args, initParams.bShaderCacheGen);
-        //Timur, Not very clean code, we need to push new hwnd value to the system init params, so other modules can used when initializing.
-        (const_cast<SSystemInitParams*>(&initParams))->hWnd = m_hWnd;
-
-
-        bool retVal = (initParams.bShaderCacheGen || m_hWnd != 0);
-        AZ_Assert(retVal, "Renderer failed to initialize correctly.");
-        return retVal;
-#else   // WIN32
-        WIN_HWND h = m_env.pRenderer->Init(0, 0, m_rWidth->GetIVal(), m_rHeight->GetIVal(), m_rColorBits->GetIVal(), m_rDepthBits->GetIVal(), m_rStencilBits->GetIVal(), m_rFullscreen->GetIVal() ? true : false, initParams.bEditor, hinst, hwnd, false, nullptr, initParams.bShaderCacheGen);
-
-#if (defined(LINUX) && !defined(AZ_PLATFORM_ANDROID))
-        return true;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_8
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        bool retVal = (initParams.bShaderCacheGen || h != 0);
-        if (retVal)
-        {
-            return true;
-        }
-
-        AZ_Assert(false, "Renderer failed to initialize correctly.");
-        return false;
-#endif
-#endif
-    }
-    return true;
-}
-
-
-
 /////////////////////////////////////////////////////////////////////////////////
 bool CSystem::InitFileSystem()
 {
@@ -1662,68 +1353,6 @@ bool CSystem::InitStreamEngine()
     return true;
 }
 
-/////////////////////////////////////////////////////////////////////////////////
-bool CSystem::InitFont(const SSystemInitParams& initParams)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    bool fontInited = false;
-    AZ::CryFontCreationRequestBus::BroadcastResult(fontInited, &AZ::CryFontCreationRequests::CreateCryFont, m_env, initParams);
-    if (!fontInited && !InitializeEngineModule(DLL_FONT, "EngineModule_CryFont", initParams))
-    {
-        return false;
-    }
-
-    if (!m_env.pCryFont)
-    {
-        AZ_Assert(false, "Font System did not initialize correctly; it could not be found in the system environment");
-        return false;
-    }
-
-    if (gEnv->IsDedicated())
-    {
-        return true;
-    }
-
-    if (!LoadFontInternal(m_pIFont, "default"))
-    {
-        return false;
-    }
-
-    if (!LoadFontInternal(m_pIFontUi, "default-ui"))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::Init3DEngine(const SSystemInitParams& initParams)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    if (!InitializeEngineModule(DLL_3DENGINE, "EngineModule_Cry3DEngine", initParams))
-    {
-        return false;
-    }
-
-    if (!m_env.p3DEngine)
-    {
-        AZ_Assert(false, "3D Engine did not initialize correctly; it could not be found in the system environment");
-        return false;
-    }
-
-    if (!m_env.p3DEngine->Init())
-    {
-        return false;
-    }
-    m_pProcess = m_env.p3DEngine;
-    m_pProcess->SetFlags(PROC_3DENGINE);
-
-    return true;
-}
-
 //////////////////////////////////////////////////////////////////////////
 bool CSystem::InitAudioSystem(const SSystemInitParams& initParams)
 {
@@ -2785,42 +2414,6 @@ AZ_POP_DISABLE_WARNING
         }
         InlineInitializationProcessing("CSystem::Init InitLocalizations");
 
-        //////////////////////////////////////////////////////////////////////////
-        // RENDERER
-        //////////////////////////////////////////////////////////////////////////
-        const bool loadLegacyRenderer = gEnv->IsEditor() ?
-                                        LOAD_LEGACY_RENDERER_FOR_EDITOR :
-                                        LOAD_LEGACY_RENDERER_FOR_LAUNCHER;
-        if (loadLegacyRenderer && !startupParams.bSkipRenderer)
-        {
-            AZ_Assert(CryMemory::IsHeapValid(), "CryMemory must be valid before initializing renderer.");
-            AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Renderer initialization");
-
-            if (!InitRenderer(m_hInst, m_hWnd, startupParams))
-            {
-                return false;
-            }
-            AZ_Assert(CryMemory::IsHeapValid(), "CryMemory must be valid after initializing renderer.");
-            if (m_env.pRenderer)
-            {
-                bool bMultiGPUEnabled = false;
-                m_env.pRenderer->EF_Query(EFQ_MultiGPUEnabled, bMultiGPUEnabled);
-                if (bMultiGPUEnabled)
-                {
-                    LoadConfiguration("mgpu.cfg");
-                }
-            }
-
-            InlineInitializationProcessing("CSystem::Init InitRenderer");
-
-            if (m_env.pCryFont)
-            {
-                m_env.pCryFont->SetRendererProperties(m_env.pRenderer);
-            }
-
-            AZ_Assert(m_env.pRenderer || startupParams.bSkipRenderer, "The renderer did not initialize correctly.");
-        }
-
 #if !defined(AZ_RELEASE_BUILD) && defined(AZ_PLATFORM_ANDROID)
         m_thermalInfoHandler = AZStd::make_unique<ThermalInfoAndroidHandler>();
 #endif
@@ -2928,24 +2521,10 @@ AZ_POP_DISABLE_WARNING
             }
         }
 
-        //////////////////////////////////////////////////////////////////////////
-        // FONT
-        //////////////////////////////////////////////////////////////////////////
-        if (!startupParams.bSkipFont)
-        {
-            AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Font initialization");
-            if (!InitFont(startupParams))
-            {
-                return false;
-            }
-        }
-
-        InlineInitializationProcessing("CSystem::Init InitFonts");
 
-        // The last update to the loading screen message was 'Initializing CryFont...'
         // Compiling the default system textures can be the lengthiest portion of
         // editor initialization, so it is useful to inform users that they are waiting on
-        // the necessary default textures to compile, and that they are not waiting on CryFont.
+        // the necessary default textures to compile.
         if (m_pUserCallback)
         {
             m_pUserCallback->OnInitProgress("First time asset processing - may take a minute...");
@@ -3040,28 +2619,6 @@ AZ_POP_DISABLE_WARNING
             return false;
         }
 
-        //////////////////////////////////////////////////////////////////////////
-        // Init 3d engine
-        //////////////////////////////////////////////////////////////////////////
-        if (loadLegacyRenderer && !startupParams.bSkipRenderer && !startupParams.bShaderCacheGen)
-        {
-            AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Initializing 3D Engine");
-            INDENT_LOG_DURING_SCOPE();
-
-            if (!Init3DEngine(startupParams))
-            {
-                return false;
-            }
-
-            // try flush to keep renderer busy
-            if (m_env.pRenderer)
-            {
-                m_env.pRenderer->TryFlush();
-            }
-
-            InlineInitializationProcessing("CSystem::Init Init3DEngine");
-        }
-
         //////////////////////////////////////////////////////////////////////////
         // SERVICE NETWORK
         //////////////////////////////////////////////////////////////////////////
@@ -4223,24 +3780,3 @@ void CSystem::SetAssertVisible(bool bAssertVisble)
 {
     m_bIsAsserting = bAssertVisble;
 }
-
-bool CSystem::LoadFontInternal(IFFont*& font, const string& fontName)
-{
-    font = m_env.pCryFont->NewFont(fontName);
-    if (!font)
-    {
-        AZ_Assert(false, "Could not instantiate the default font.");
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    string szFontPath = "Fonts/" + fontName + ".font";
-
-    if (!font->Load(szFontPath.c_str()))
-    {
-        AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "Could not load font: %s.  Make sure the program is running from the correct working directory.", szFontPath.c_str());
-        return false;
-    }
-
-    return true;
-}
diff --git a/Code/CryEngine/CrySystem/SystemRender.cpp b/Code/CryEngine/CrySystem/SystemRender.cpp
index 01828175db..a544cef4a5 100644
--- a/Code/CryEngine/CrySystem/SystemRender.cpp
+++ b/Code/CryEngine/CrySystem/SystemRender.cpp
@@ -58,75 +58,6 @@
 extern CMTSafeHeap* g_pPakHeap;
 #if defined(AZ_PLATFORM_ANDROID)
 #include <AzCore/Android/Utils.h>
-#elif defined(AZ_PLATFORM_IOS)
-
-#if defined(AZ_MONOLITHIC_BUILD)
-extern bool UIKitGetPrimaryPhysicalDisplayDimensions(int& o_widthPixels, int& o_heightPixels);
-#else
-
-using NativeScreenType = UIScreen;
-using NativeWindowType = UIWindow;
-
-////////////////////////////////////////////////////////////////////////////////
-bool UIKitGetPrimaryPhysicalDisplayDimensions(int& o_widthPixels, int& o_heightPixels)
-{
-
-    NativeScreenType* nativeScreen = [NativeScreenType mainScreen];
-    CGRect screenBounds = [nativeScreen bounds];
-    CGFloat screenScale = [nativeScreen scale];
-    o_widthPixels = static_cast<int>(screenBounds.size.width * screenScale);
-    o_heightPixels = static_cast<int>(screenBounds.size.height * screenScale);
-
-    const bool isScreenLandscape = o_widthPixels > o_heightPixels;
-
-    UIInterfaceOrientation uiOrientation = UIInterfaceOrientationUnknown;
-#if defined(__IPHONE_13_0) || defined(__TVOS_13_0)
-    if(@available(iOS 13.0, tvOS 13.0, *))
-    {
-        UIWindow* foundWindow = nil;
-        
-        //Find the key window
-        NSArray* windows = [[UIApplication sharedApplication] windows];
-        for (UIWindow* window in windows)
-        {
-            if (window.isKeyWindow)
-            {
-                foundWindow = window;
-                break;
-            }
-        }
-        
-        //Check if the key window is found
-        if(foundWindow)
-        {
-            uiOrientation = foundWindow.windowScene.interfaceOrientation;
-        }
-        else
-        {
-            //If no key window is found create a temporary window in order to extract the orientation
-            //This can happen as this function gets called before the renderer is initialized
-            CGRect screenBounds = [[NativeScreenType mainScreen] bounds];
-            UIWindow* tempWindow = [[NativeWindowType alloc] initWithFrame: screenBounds];
-            uiOrientation = tempWindow.windowScene.interfaceOrientation;
-            [tempWindow release];
-        }
-    }
-#else
-    uiOrientation = UIApplication.sharedApplication.statusBarOrientation;
-#endif
-    
-    const bool isInterfaceLandscape = UIInterfaceOrientationIsLandscape(uiOrientation);
-    if (isScreenLandscape != isInterfaceLandscape)
-    {
-        const int width = o_widthPixels;
-        o_widthPixels = o_heightPixels;
-        o_heightPixels = width;
-    }
-
-    return true;
-}
-#endif
-
 #endif
 
 extern int CryMemoryGetAllocatedSize();
@@ -151,8 +82,6 @@ bool CSystem::GetPrimaryPhysicalDisplayDimensions([[maybe_unused]] int& o_widthP
     return true;
 #elif defined(AZ_PLATFORM_ANDROID)
     return AZ::Android::Utils::GetWindowSize(o_widthPixels, o_heightPixels);
-#elif defined(AZ_PLATFORM_IOS)
-    return UIKitGetPrimaryPhysicalDisplayDimensions(o_widthPixels, o_heightPixels);
 #else
     return false;
 #endif
diff --git a/Code/CryEngine/RenderDll/CMakeLists.txt b/Code/CryEngine/RenderDll/CMakeLists.txt
deleted file mode 100644
index 90594c4dd9..0000000000
--- a/Code/CryEngine/RenderDll/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-add_subdirectory(XRenderD3D9)
-add_subdirectory(XRenderNULL)
diff --git a/Code/CryEngine/RenderDll/Common/AMD/LICENSING.txt b/Code/CryEngine/RenderDll/Common/AMD/LICENSING.txt
deleted file mode 100644
index 958befd68b..0000000000
--- a/Code/CryEngine/RenderDll/Common/AMD/LICENSING.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Advanced Micro Devices, Inc.
-Software License Agreement – Sample Source Code
-
-IMPORTANT—READ CAREFULLY:  Do not install, copy or use the enclosed software, documentation and/or materials until you have carefully read and agreed to the following terms and conditions.  This is a legal agreement (“Agreement”) between you (either an individual or an entity) (“You”) and Advanced Micro Devices, Inc. (“AMD”).
-If You do not agree to the terms of this Agreement, do not install, copy or use this software, documentation or materials or any portion thereof.  By loading or using the software provided herewith, which may include binary code, source code, associated install scripts and online or electronic documentation, or materials or any portion thereof, that is made available by AMD to download from any media (collectively “Software”), You agree to all of the terms of this Agreement.
-1.   LICENSE: 
-a.   Subject to the terms and conditions of this Agreement, AMD grants You the following non-exclusive, non-transferable, royalty-free, limited copyright license to (i) download, copy, use, modify, and create derivative works of the source code version of the Software and materials associated with this Agreement, including without limitation printed documentation, (collectively, “Materials”) for internal evaluation only with AMD processors or graphics products; and (ii) make and distribute copies of the Materials and derivative works thereof created by You in binary code form only for use only with Your products that support AMD processors and in computer systems including AMD processors or graphics products, provided that You agree to include all copyright legends and other legal notices that may appear in the Software.  Additionally, You agree that any distribution of the Materials to a third party, must include a software license agreement with terms and conditions that are at least as restrictive and protective of AMD’s intellectual property rights in the Materials as the terms and conditions set forth herein, including but not limited to the terms and conditions set forth in Sections 4 through 7 herein.   Except for the limited license granted herein, You shall have no other rights in the Materials, whether express, implied, arising by estoppel or otherwise.
-b.   Except as expressly licensed herein, You do not have the right to (i) distribute, rent, lease, sell, sublicense, assign, or otherwise transfer the Materials, in whole or in part, to third parties for commercial or for non-commercial use; or (ii) modify, disassemble, reverse engineer, or decompile the Software, or otherwise reduce any part of the Software to any human readable form.
-c.    AMD is under no obligation to support or provide maintenance for the Materials or to provide any updates or enhancements to You.
-2.   FEEDBACK:  You may provide AMD feedback, suggestions or opinions as to the Software, its features, and desired enhancements or changes.  If You provide feedback, suggestions or opinions to AMD regarding any new features, use, functionality, or change to the Software or any materials related to the Software, You hereby agree to grant, and do grant, AMD all rights needed for AMD to incorporate and commercialize any new feature, use, functionality, or change at no charge or encumbrance to AMD. You agree that AMD may disclose such feedback, suggestions or opinions to any third party in any manner, and You agree that AMD has the ability to sublicense any of the foregoing rights in any feedback, suggestions or opinions or AMD products or services in any form to any third party without restriction. 
-3.   OWNERSHIP AND COPYRIGHT OF MATERIALS: You agree that the Materials are owned by AMD and/or AMD’s licensors (if any), and are protected by United States and foreign intellectual property laws (e.g. patent and copyright laws) and international treaty provisions.  You will not remove the copyright notice from the Materials.  You agree to prevent any unauthorized copying of the Materials.  All title and copyrights in and to the Materials, all copies thereof (in whole or in part, and in any form), and all rights therein shall remain vested in AMD.  Except as expressly provided herein, AMD does not grant any express or implied right to You under AMD patents, copyrights, trademarks, or trade secret information and such rights are reserved to AMD and/or its licensors.
-4.   WARRANTY DISCLAIMER: THE MATERIALS ARE PROVIDED “AS IS” WITHOUT ANY EXPRESS OR IMPLIED WARRANTY OF ANY KIND INCLUDING WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY, TITLE, OR FITNESS FOR ANY PARTICULAR PURPOSE, OR THOSE ARISING FROM CUSTOM OF TRADE OR COURSE OF USAGE.  
-FOR CLARIFICATION, THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE MATERIALS REMAINS WITH YOU.  AMD DOES NOT WARRANT, GUARANTEE, OR MAKE ANY REPRESENTATIONS AS TO THE CORRECTNESS, ACCURACY, COMPLETENESS, QUALITY, OR RELIABILITY OF THE MATERIALS.  AMD DOES NOT WARRANT THAT OPERATION OF THE MATERIALS WILL BE UNINTERRUPTED OR ERROR-FREE.  YOU ARE RESPONSIBLE FOR DETERMINING THE APPROPRIATENESS OF USING THE SOFTWARE AND ASSUME ALL RISKS ASSOCIATED WITH THE USE OF THE MATERIALS, INCLUDING BUT NOT LIMITED TO THE RISKS OF PROGRAM ERRORS, DAMAGE TO OR LOSS OF DATA, PROGRAMS OR EQUIPMENT, AND UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.  Some jurisdictions do not allow for the exclusion or limitation of implied warranties, so the above limitations or exclusions may not apply to You.
-5.   LIMITATION OF LIABILITY:  IN NO EVENT SHALL AMD OR ITS DIRECTORS, OFFICERS, EMPLOYEES AND AGENTS, ITS SUPPLIERS OR ITS LICENSORS BE LIABLE TO YOUOR ANY THIRD PARTIES IN RECEIPT OF THE MATERIALS UNDER ANY THEORY OF LIABILITY, WHETHER EQUITABLE, LEGAL OR COMMON LAW ACTION ARISING HEREUNDER FOR CONTRACT, STRICT LIABILITY, INDEMNITY, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE FOR DAMAGES WHICH, IN THE AGGREGATE EXCEED TEN DOLLARS ($10.00).  IN NO EVENT SHALL AMD BE LIABLE FOR ANY CONSEQUENTIAL, INCIDENTAL, PUNITIVE OR SPECIAL DAMAGES, INCLUDING, BUT NOT LIMITED TO LOSS OF PROFITS, BUSINESS INTERRUPTION, OR LOSS OF INFORMATION ARISING OUT OF THE USE OF OR INABILITY TO USE THE MATERIALS, EVEN IF AMD HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  BY USING THE MATERIALS WITHOUT CHARGE, YOU ACCEPT THIS ALLOCATION OF RISK.  Because some jurisdictions prohibit the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to You.
-6.   EXPORT RESTRICTIONS: You shall adhere to all applicable U.S., European, and other export laws, including but not limited to the U.S. Export Administration Regulations (“EAR”), (15 C.F.R. Sections 730 through 774), and E.U. Council Regulation (EC) No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of the EAR, You hereby certify that, except pursuant to a license granted by the United States Department of Commerce Bureau of Industry and Security or as otherwise permitted pursuant to a License Exception under the EAR, You will not (1) export, re-export or release to a national of a country in Country Groups D:1, E:1 or E:2 any restricted technology, software, or source code it receives from AMD, or (2) export to Country Groups D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774 of EAR).  For the most current Country Group listings, or for additional information about the EAR or Your obligations under those regulations, please refer to the U.S. Bureau of Industry and Security’s website at http://www.bis.doc.gov/.
-7.   U.S. GOVERNMENT RESTRICTED RIGHTS: The Materials are provided with “RESTRICTED RIGHTS.”  Use, duplication or disclosure by the Government is subject to restrictions as set forth in FAR52.227-14 and DFAR252.227-7013, et seq., or its successor.  Use of the Materials by the Government constitutes acknowledgment of AMD’s proprietary rights in them.
-8.   TERMINATION OF LICENSE: This Agreement will terminate immediately without notice from AMD or judicial resolution if You fail to comply with any provisions of this Agreement.  Upon termination of this Agreement, You must delete or destroy all copies of the Materials.
-9.   SURVIVAL:  Sections 1(b)-(c), 2, 3, 4, 5, 6, 7, 9, 10, 11, 12 and 13 shall survive any expiration or termination of this Agreement.
-10. APPLICABLE LAWS:  Any claim arising under or relating to this Agreement shall be governed by and construed in accordance with the substantive laws of the State of California, without regard to principles of conflict of laws.    Each party hereto submits to the jurisdiction of the state and federal courts of Santa Clara County and the Northern District of California for the purposes of all legal proceedings arising out of or relating to this Agreement or the subject matter hereof.  Each party waives any objection which it may have to contest such forum.
-11. Severability:  Should any term of this Agreement be declared void or unenforceable by any court of competent jurisdiction, such declaration shall have no effect on the remaining terms hereof.
-12. No Waiver:  The failure of either party to enforce any rights granted hereunder or to take action against the other party in the event of any breach hereunder shall not be deemed a waiver by that party as to subsequent enforcement of rights or subsequent actions in the event of future breaches.
-13. ENTIRE AGREEMENT:  This Agreement constitutes the entire agreement between the parties and supersedes any prior or contemporaneous oral or written agreements with respect to the subject matter of this Agreement.
\ No newline at end of file
diff --git a/Code/CryEngine/RenderDll/Common/CommonRender.cpp b/Code/CryEngine/RenderDll/Common/CommonRender.cpp
deleted file mode 100644
index 87cae00f68..0000000000
--- a/Code/CryEngine/RenderDll/Common/CommonRender.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Crytek Common render helper functions and structures declarations.
-
-
-#include "RenderDll_precompiled.h"
-
-
-// Resource manager internal variables.
-ResourceClassMap CBaseResource::m_sResources;
-CryCriticalSection CBaseResource::s_cResLock;
-
-CBaseResource& CBaseResource::operator=([[maybe_unused]] const CBaseResource& Src)
-{
-    return *this;
-}
-
-bool CBaseResource::IsValid()
-{
-    AUTO_LOCK(s_cResLock); // Not thread safe without this
-
-    SResourceContainer* pContainer = GetResourcesForClass(m_ClassName);
-    if (!pContainer)
-    {
-        return false;
-    }
-
-    ResourceClassMapItor itRM = m_sResources.find(m_ClassName);
-
-    if (itRM == m_sResources.end())
-    {
-        return false;
-    }
-    if (itRM->second != pContainer)
-    {
-        return false;
-    }
-    ResourcesMapItor itRL = itRM->second->m_RMap.find(m_NameCRC);
-    if (itRL == itRM->second->m_RMap.end())
-    {
-        return false;
-    }
-    if (itRL->second != this)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-SResourceContainer* CBaseResource::GetResourcesForClass(const CCryNameTSCRC& className)
-{
-    ResourceClassMapItor itRM = m_sResources.find(className);
-    if (itRM == m_sResources.end())
-    {
-        return NULL;
-    }
-    return itRM->second;
-}
-
-CBaseResource* CBaseResource::GetResource(const CCryNameTSCRC& className, int nID, bool bAddRef)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-        AUTO_LOCK(s_cResLock); // Not thread safe without this
-
-    SResourceContainer* pRL = GetResourcesForClass(className);
-    if (!pRL)
-    {
-        return NULL;
-    }
-
-    int nIndex = RListIndexFromId(nID);
-
-    //assert(pRL->m_RList.size() > nID);
-    if (nIndex >= (int)pRL->m_RList.size() || nIndex < 0)
-    {
-        return NULL;
-    }
-    CBaseResource* pBR = pRL->m_RList[nIndex];
-    if (pBR)
-    {
-        if (bAddRef)
-        {
-            pBR->AddRef();
-        }
-        return pBR;
-    }
-    return NULL;
-}
-
-CBaseResource* CBaseResource::GetResource(const CCryNameTSCRC& className, const CCryNameTSCRC& Name, bool bAddRef)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-        AUTO_LOCK(s_cResLock); // Not thread safe without this
-
-    SResourceContainer* pRL = GetResourcesForClass(className);
-    if (!pRL)
-    {
-        return NULL;
-    }
-
-    CBaseResource* pBR = NULL;
-    ResourcesMapItor itRL = pRL->m_RMap.find(Name);
-    if (itRL != pRL->m_RMap.end())
-    {
-        pBR = itRL->second;
-        if (bAddRef)
-        {
-            pBR->AddRef();
-        }
-        return pBR;
-    }
-    return NULL;
-}
-
-bool CBaseResource::Register(const CCryNameTSCRC& className, const CCryNameTSCRC& Name)
-{
-    AUTO_LOCK(s_cResLock); // Not thread safe without this
-
-    SResourceContainer* pRL = GetResourcesForClass(className);
-    if (!pRL)
-    {
-        pRL = new SResourceContainer;
-        m_sResources.insert(ResourceClassMapItor::value_type(className, pRL));
-    }
-
-    assert(pRL);
-    if (!pRL)
-    {
-        return false;
-    }
-
-    ResourcesMapItor itRL = pRL->m_RMap.find(Name);
-    if (itRL != pRL->m_RMap.end())
-    {
-        return false;
-    }
-    pRL->m_RMap.insert(ResourcesMapItor::value_type(Name, this));
-    int nIndex;
-    if (pRL->m_AvailableIDs.size())
-    {
-        ResourceIds::iterator it = pRL->m_AvailableIDs.end() - 1;
-        nIndex = RListIndexFromId(*it);
-        pRL->m_AvailableIDs.erase(it);
-        assert(nIndex < (int)pRL->m_RList.size());
-        pRL->m_RList[nIndex] = this;
-    }
-    else
-    {
-        nIndex = pRL->m_RList.size();
-        pRL->m_RList.push_back(this);
-    }
-    m_nID = IdFromRListIndex(nIndex);
-    m_NameCRC = Name;
-    m_ClassName = className;
-    m_nRefCount = 1;
-
-    return true;
-}
-
-bool CBaseResource::UnRegister()
-{
-    AUTO_LOCK(s_cResLock); // Not thread safe without this
-
-    if (IsValid())
-    {
-        SResourceContainer* pContainer = GetResourcesForClass(m_ClassName);
-        assert(pContainer);
-        if (pContainer)
-        {
-            pContainer->m_RMap.erase(m_NameCRC);
-            pContainer->m_RList[RListIndexFromId(m_nID)] = NULL;
-            pContainer->m_AvailableIDs.push_back(m_nID);
-        }
-        return true;
-    }
-    return false;
-}
-
-int32 CBaseResource::Release()
-{
-    IF (m_nRefCount > 0, 1)
-    {
-        int32 nRef = CryInterlockedDecrement(&m_nRefCount);
-        if (nRef < 0)
-        {
-            CryFatalError("CBaseResource::Release() called more than once!");
-        }
-
-        if (nRef <= 0)
-        {
-            UnRegister();
-            if (gRenDev && gRenDev->m_pRT)
-            {
-                gRenDev->m_pRT->RC_ReleaseBaseResource(this);
-            }
-            return 0;
-        }
-        return nRef;
-    }
-    return 0;
-}
-
-//=================================================================
-
-SResourceContainer::~SResourceContainer()
-{
-    for (ResourcesMapItor it = m_RMap.begin(); it != m_RMap.end(); )
-    {
-        CBaseResource* pRes = it->second;
-        if (pRes && CRenderer::CV_r_printmemoryleaks)
-        {
-            iLog->Log("Warning: ~SResourceContainer: Resource %d was not deleted (%d)", pRes->GetID(), pRes->GetRefCounter());
-        }
-        ++it; // advance "it" here because the safe release below usually invalidates "it" (calls m_RMap.erase(it))
-        SAFE_RELEASE(pRes);
-    }
-    m_RMap.clear();
-    m_RList.clear();
-    m_AvailableIDs.clear();
-}
-
-void CBaseResource::ShutDown()
-{
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_releaseallresourcesonexit)
-    {
-        ResourceClassMapItor it;
-        for (it = m_sResources.begin(); it != m_sResources.end(); it++)
-        {
-            SResourceContainer* pCN = it->second;
-            SAFE_DELETE(pCN);
-        }
-        m_sResources.clear();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/CommonRender.h b/Code/CryEngine/RenderDll/Common/CommonRender.h
deleted file mode 100644
index d7cc4d4339..0000000000
--- a/Code/CryEngine/RenderDll/Common/CommonRender.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-
-#include "Cry_Math.h"
-
-#include "Defs.h"
-#include "Cry_Color.h"
-#include <Cry_Camera.h>
-#include <MemoryAccess.h>
-#include "STLGlobalAllocator.h"
-
-#if defined(NULL_RENDERER)
-#define VSCONST_INSTDATA   40
-#define VSCONST_SKINMATRIX (40)
-#define NUM_MAX_BONES_PER_GROUP (100)
-#define NUM_MAX_BONES_PER_GROUP_WITH_MB (50)
-#define VSCONST_NOISE_TABLE 64
-
-#else
-#define VSCONST_INSTDATA   0
-#define VSCONST_SKINMATRIX 0
-#define VSCONST_NOISE_TABLE 0
-#define NUM_MAX_BONES_PER_GROUP (250)
-#define NUM_MAX_BONES_PER_GROUP_WITH_MB (125)
-
-#endif
-
-
-//////////////////////////////////////////////////////////////////////
-class CRenderer;
-extern CRenderer* gRenDev;
-
-class CBaseResource;
-
-//====================================================================
-
-#define CR_LITTLE_ENDIAN
-
-struct SWaveForm;
-
-extern bool gbRgb;
-
-_inline DWORD COLCONV (DWORD clr)
-{
-    return ((clr & 0xff00ff00) | ((clr & 0xff0000) >> 16) | ((clr & 0xff) << 16));
-}
-_inline void COLCONV (ColorF& col)
-{
-    float v = col[0];
-    col[0] = col[2];
-    col[2] = v;
-}
-
-_inline void f2d(double* dst, float* src)
-{
-    for (int i = 0; i < 16; i++)
-    {
-        dst[i] = src[i];
-    }
-}
-
-_inline void d2f(float* dst, double* src)
-{
-    for (int i = 0; i < 16; i++)
-    {
-        dst[i] = (float)src[i];
-    }
-}
-
-//=================================================================
-
-typedef std::map<CCryNameTSCRC, CBaseResource*> ResourcesMap;
-
-typedef ResourcesMap::iterator ResourcesMapItor;
-
-typedef std::vector<CBaseResource*, stl::STLGlobalAllocator<CBaseResource*> > ResourcesList;
-typedef std::vector<int, stl::STLGlobalAllocator<int> > ResourceIds;
-
-struct SResourceContainer
-{
-    ResourcesList m_RList;           // List of objects for access by Id's
-    ResourcesMap  m_RMap;            // Map of objects for fast searching
-    ResourceIds   m_AvailableIDs;    // Available object Id's for efficient ID's assigning after deleting
-
-    SResourceContainer()
-    {
-        m_RList.reserve(512);
-    }
-
-    ~SResourceContainer();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_RList);
-        pSizer->AddObject(m_RMap);
-        pSizer->AddObject(m_AvailableIDs);
-    }
-};
-
-typedef AZStd::unordered_map<CCryNameTSCRC, SResourceContainer*, AZStd::hash<CCryNameTSCRC>, AZStd::equal_to<CCryNameTSCRC>, AZ::StdLegacyAllocator> ResourceClassMap;
-
-typedef ResourceClassMap::iterator ResourceClassMapItor;
-
-class CBaseResource
-{
-private:
-    // Per resource variables
-    volatile int32 m_nRefCount;
-    int m_nID;
-    CCryNameTSCRC m_ClassName;
-    CCryNameTSCRC m_NameCRC;
-
-    static ResourceClassMap m_sResources;
-
-public:
-    static CryCriticalSection s_cResLock;
-
-    //! Dirty flags will indicate what kind of data was invalidated
-    enum EDirtyFlags
-    {
-        eDeviceResourceDirty = BIT(0),
-        eDeviceResourceViewDirty = BIT(1),
-    };
-
-    // CCryUnknown interface
-    inline void SetRefCounter(int nRefCounter) { m_nRefCount = nRefCounter; }
-    virtual int32 AddRef()
-    {
-        int32 nRef = CryInterlockedIncrement(&m_nRefCount);
-        return nRef;
-    }
-    virtual int32 Release();
-    virtual int GetRefCounter() const { return m_nRefCount; }
-
-    // Increment ref count, if not already scheduled for destruction.
-    int32 TryAddRef()
-    {
-        volatile int nOldRef, nNewRef;
-        do
-        {
-            nOldRef = m_nRefCount;
-            if (nOldRef == 0)
-            {
-                return 0;
-            }
-            nNewRef = nOldRef + 1;
-        }
-        while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nRefCount), nNewRef, nOldRef) != nOldRef);
-        return nNewRef;
-    }
-
-    // Constructors.
-    CBaseResource()
-        : m_nRefCount(1) {}
-    CBaseResource(const CBaseResource& Src);
-    CBaseResource& operator=(const CBaseResource& Src);
-
-    // Destructor.
-    virtual ~CBaseResource() {};
-
-    CCryNameTSCRC GetNameCRC() { return m_NameCRC; }
-    //inline const char *GetName() const { return m_Name.c_str(); }
-    //inline const char *GetClassName() const { return m_ClassName.c_str(); }
-    inline int GetID() const { return m_nID; }
-    inline void SetID(int nID) { m_nID = nID; }
-
-    virtual bool  IsValid();
-
-    static ILINE int RListIndexFromId(int id) { return id - 1; }
-    static ILINE int IdFromRListIndex(int idx) { return idx + 1; }
-
-    static ResourceClassMap& GetMaps() { return m_sResources; }
-    static CBaseResource* GetResource(const CCryNameTSCRC& className, int nID, bool bAddRef);
-    static CBaseResource* GetResource(const CCryNameTSCRC& className, const CCryNameTSCRC& Name, bool bAddRef);
-    static SResourceContainer* GetResourcesForClass(const CCryNameTSCRC& className);
-    static void ShutDown();
-
-    bool Register(const CCryNameTSCRC& resName, const CCryNameTSCRC& Name);
-    bool UnRegister();
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-    virtual void InvalidateDeviceResource([[maybe_unused]] uint32 dirtyFlags) {};
-};
-
diff --git a/Code/CryEngine/RenderDll/Common/CryNameR.h b/Code/CryEngine/RenderDll/Common/CryNameR.h
deleted file mode 100644
index 3984e948fe..0000000000
--- a/Code/CryEngine/RenderDll/Common/CryNameR.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_CRYNAMER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_CRYNAMER_H
-#pragma once
-
-#include "CryCrc32.h"
-
-//#define CHECK_INVALID_ACCESS
-
-//////////////////////////////////////////////////////////////////////////
-class CNameTableR
-{
-public:
-    // Name entry header, immediately after this header in memory starts actual string data.
-    struct SNameEntryR
-    {
-        // Reference count of this string.
-        int nRefCount;
-        // Current length of string.
-        int nLength;
-        // Size of memory allocated at the end of this class.
-        int nAllocSize;
-        // Here in memory starts character buffer of size nAllocSize.
-        //char data[nAllocSize]
-
-        const char* GetStr() { return (char*)(this + 1); }
-        void  AddRef() { CryInterlockedIncrement(&nRefCount); };
-        int   Release() { return CryInterlockedDecrement(&nRefCount); };
-        int   GetMemoryUsage() { return sizeof(SNameEntryR) + strlen(GetStr()); }
-        int     GetLength(){return nLength; }
-    };
-
-    static threadID m_nRenderThread;
-
-private:
-    typedef AZStd::unordered_map<const char*, SNameEntryR*, stl::hash_string_caseless<const char*>, stl::equality_string_caseless<const char*> > NameMap;
-    NameMap m_nameMap;
-
-    void CheckThread()
-    {
-#ifdef CHECK_INVALID_ACCESS
-        DWORD d = ::GetCurrentThreadId();
-        if (m_nRenderThread != 0 && d != m_nRenderThread)
-        {
-            __debugbreak();
-        }
-#endif
-    }
-
-public:
-
-    CNameTableR() {}
-
-    ~CNameTableR()
-    {
-        for (NameMap::iterator it = m_nameMap.begin(); it != m_nameMap.end(); ++it)
-        {
-            CryModuleFree(it->second);
-        }
-    }
-
-    // Only finds an existing name table entry, return 0 if not found.
-    SNameEntryR* FindEntry(const char* str)
-    {
-        CheckThread();
-        SNameEntryR* pEntry = stl::find_in_map(m_nameMap, str, 0);
-        return pEntry;
-    }
-
-    // Finds an existing name table entry, or creates a new one if not found.
-    SNameEntryR* GetEntry(const char* str)
-    {
-        CheckThread();
-        
-        SNameEntryR* pEntry = stl::find_in_map(m_nameMap, str, 0);
-        if (!pEntry)
-        {
-            // Create a new entry.
-            unsigned int nLen = strlen(str);
-            unsigned int allocLen = sizeof(SNameEntryR) + (nLen + 1) * sizeof(char);
-            pEntry = (SNameEntryR*)CryModuleMalloc(allocLen);
-            assert(pEntry != NULL);
-            pEntry->nRefCount = 0;
-            pEntry->nLength = nLen;
-            pEntry->nAllocSize = allocLen;
-            // Copy string to the end of name entry.
-            char* pEntryStr = const_cast<char*>(pEntry->GetStr());
-            memcpy(pEntryStr, str, nLen + 1);
-            // put in map.
-            //m_nameMap.insert( NameMap::value_type(pEntry->GetStr(),pEntry) );
-            m_nameMap[pEntry->GetStr()] = pEntry;
-        }
-        return pEntry;
-    }
-
-    // Release existing name table entry.
-    void Release(SNameEntryR* pEntry)
-    {
-        CheckThread();
-        
-        assert(pEntry);
-        m_nameMap.erase(pEntry->GetStr());
-        CryModuleFree(pEntry);
-    }
-    int GetMemoryUsage()
-    {
-        int nSize = 0;
-        NameMap::iterator it;
-        int n = 0;
-        for (it = m_nameMap.begin(); it != m_nameMap.end(); it++)
-        {
-            nSize += strlen(it->first);
-            nSize += it->second->GetMemoryUsage();
-            n++;
-        }
-        nSize += n * 8;
-
-        return nSize;
-    }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_nameMap);
-    }
-    int GetNumberOfEntries()
-    {
-        return m_nameMap.size();
-    }
-
-    // Log all names inside CryNameTS table.
-    void LogNames()
-    {
-        NameMap::iterator it;
-        for (it = m_nameMap.begin(); it != m_nameMap.end(); ++it)
-        {
-            SNameEntryR* pNameEntry = it->second;
-            CryLog("[%4d] %s", pNameEntry->nLength, pNameEntry->GetStr());
-        }
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Class CCryNameR
-//////////////////////////////////////////////////////////////////////////
-class CCryNameR
-{
-public:
-    CCryNameR();
-    CCryNameR(const CCryNameR& n);
-    // !!! do not allow implicit conversion as it can lead to subtle bugs when passing const char* values
-    // to stl algorithms (as operator < will create a CCryNameR and potentially insert into the name table
-    // while processing the algorithm)
-    explicit CCryNameR(const char* s);
-    ~CCryNameR();
-
-    CCryNameR& operator=(const CCryNameR& n);
-    CCryNameR& operator=(const char* s);
-
-    bool operator==(const CCryNameR& n) const;
-    bool operator<(const CCryNameR& n) const;
-
-    operator size_t() const
-    {
-        return AZStd::hash_string(m_str, _length());
-    }
-
-    bool empty() const
-    {
-        return length() == 0;
-    }
-    void reset()
-    {
-        _release(m_str);
-        m_str = 0;
-    }
-    void addref()
-    {
-        _addref(m_str);
-    }
-
-    const char* c_str() const
-    {
-        return (m_str) ? m_str : "";
-    }
-    int length() const
-    {
-        return _length();
-    };
-
-    static bool find(const char* str)
-    {
-        if (ms_table)
-        {
-            return ms_table->FindEntry(str) != 0;
-        }
-        return false;
-    }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        //pSizer->AddObject(m_str);
-        pSizer->AddObject(ms_table);
-    }
-    static int GetMemoryUsage()
-    {
-        if (ms_table)
-        {
-            return ms_table->GetMemoryUsage();
-        }
-        return 0;
-    }
-    static int GetNumberOfEntries()
-    {
-        if (ms_table)
-        {
-            return ms_table->GetNumberOfEntries();
-        }
-        return 0;
-    }
-
-    static void CreateNameTable()
-    {
-        AZ_Assert(!ms_table, "CNameTableR was already created!\n");
-        ms_table = new CNameTableR();
-    }
-
-    static void ReleaseNameTable()
-    {
-        delete ms_table;
-        ms_table = nullptr;
-    }
-
-private:
-    typedef CNameTableR::SNameEntryR SNameEntry;
-
-    static CNameTableR* ms_table;
-
-    SNameEntry* _entry(const char* pBuffer) const
-    {
-        assert(pBuffer);
-        return ((SNameEntry*)pBuffer) - 1;
-    }
-    void _release(const char* pBuffer)
-    {
-        if (pBuffer && _entry(pBuffer)->Release() <= 0)
-        {
-            if (ms_table)
-            {
-                ms_table->Release(_entry(pBuffer));
-            }
-            else
-            {
-                CryModuleFree(_entry(pBuffer));
-            }
-        }
-    }
-    int _length() const
-    {
-        return (m_str) ? _entry(m_str)->nLength : 0;
-    }
-    void _addref(const char* pBuffer)
-    {
-        if (pBuffer)
-        {
-            _entry(pBuffer)->AddRef();
-        }
-    }
-
-    const char* m_str;
-};
-
-inline CCryNameR::CCryNameR()
-{
-    m_str = 0;
-}
-
-inline CCryNameR::CCryNameR(const CCryNameR& n)
-{
-    _addref(n.m_str);
-    m_str = n.m_str;
-}
-
-inline CCryNameR::CCryNameR(const char* s)
-{
-    if (!ms_table)
-    {
-        m_str = nullptr;
-        return;
-    }
-
-    const char* pBuf = 0;
-    if (s && *s)
-    {
-        pBuf = ms_table->GetEntry(s)->GetStr();
-    }
-
-    _addref(pBuf);
-    m_str = pBuf;
-}
-
-inline CCryNameR::~CCryNameR()
-{
-    _release(m_str);
-}
-
-inline CCryNameR& CCryNameR::operator=(const CCryNameR& n)
-{
-    _addref(n.m_str);
-    _release(m_str);
-    m_str = n.m_str;
-    return *this;
-}
-
-inline CCryNameR& CCryNameR::operator=(const char* s)
-{
-    if (!ms_table)
-    {
-        return *this;
-    }
-
-    const char* pBuf = 0;
-    if (s && *s)
-    {
-        pBuf = ms_table->GetEntry(s)->GetStr();
-    }
-
-    _addref(pBuf);
-    _release(m_str);
-    m_str = pBuf;
-    return *this;
-}
-
-inline bool CCryNameR::operator==(const CCryNameR& n) const
-{
-    return m_str == n.m_str;
-}
-
-inline bool CCryNameR::operator<(const CCryNameR& n) const
-{
-    return m_str < n.m_str;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Class CCryNameTSCRC.
-//////////////////////////////////////////////////////////////////////////
-class CCryNameTSCRC
-{
-public:
-    CCryNameTSCRC();
-    CCryNameTSCRC(const CCryNameTSCRC& n);
-    CCryNameTSCRC(const char* s);
-    CCryNameTSCRC(const char* s, bool bOnlyFind);
-    CCryNameTSCRC(uint32 n) { m_nID = n; }
-    ~CCryNameTSCRC();
-
-    CCryNameTSCRC& operator=(const CCryNameTSCRC& n);
-    CCryNameTSCRC& operator=(const char* s);
-
-    operator size_t() const
-    {
-        return m_nID;
-    }
-
-    bool  operator==(const CCryNameTSCRC& n) const;
-    bool  operator!=(const CCryNameTSCRC& n) const;
-
-    bool  operator==(const char* s) const;
-    bool  operator!=(const char* s) const;
-
-    bool  operator<(const CCryNameTSCRC& n) const;
-    bool  operator>(const CCryNameTSCRC& n) const;
-
-    bool  empty() const { return m_nID == 0; }
-    void  reset() {   m_nID = 0; }
-    uint32 get()  {   return m_nID; }
-    void  add(int nAdd) { m_nID += nAdd; }
-
-    AUTO_STRUCT_INFO
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
-private:
-
-    uint32 m_nID;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CCryNameTSCRC
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameTSCRC::CCryNameTSCRC()
-{
-    m_nID = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameTSCRC::CCryNameTSCRC(const CCryNameTSCRC& n)
-{
-    m_nID = n.m_nID;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameTSCRC::CCryNameTSCRC(const char* s)
-{
-    m_nID = 0;
-    *this = s;
-}
-
-inline CCryNameTSCRC::~CCryNameTSCRC()
-{
-    m_nID = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameTSCRC&   CCryNameTSCRC::operator=(const CCryNameTSCRC& n)
-{
-    m_nID = n.m_nID;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameTSCRC&   CCryNameTSCRC::operator=(const char* s)
-{
-    assert(s);
-    if (*s) // if not empty
-    {
-        m_nID = CCrc32::ComputeLowercase(s);
-    }
-    return *this;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-inline bool CCryNameTSCRC::operator==(const CCryNameTSCRC& n) const
-{
-    return m_nID == n.m_nID;
-}
-
-inline bool CCryNameTSCRC::operator!=(const CCryNameTSCRC& n) const
-{
-    return !(*this == n);
-}
-
-inline bool CCryNameTSCRC::operator==(const char* str) const
-{
-    assert(str);
-    if (*str) // if not empty
-    {
-        uint32 nID = CCrc32::ComputeLowercase(str);
-        return m_nID == nID;
-    }
-    return m_nID == 0;
-}
-
-inline bool CCryNameTSCRC::operator!=(const char* str) const
-{
-    if (!m_nID)
-    {
-        return true;
-    }
-    if (*str) // if not empty
-    {
-        uint32 nID = CCrc32::ComputeLowercase(str);
-        return m_nID != nID;
-    }
-    return false;
-}
-
-inline bool CCryNameTSCRC::operator<(const CCryNameTSCRC& n) const
-{
-    return m_nID < n.m_nID;
-}
-
-inline bool CCryNameTSCRC::operator>(const CCryNameTSCRC& n) const
-{
-    return m_nID > n.m_nID;
-}
-
-inline bool operator==(const string& s, const CCryNameTSCRC& n)
-{
-    return n == s;
-}
-inline bool operator!=(const string& s, const CCryNameTSCRC& n)
-{
-    return n != s;
-}
-
-inline bool operator==(const char* s, const CCryNameTSCRC& n)
-{
-    return n == s;
-}
-inline bool operator!=(const char* s, const CCryNameTSCRC& n)
-{
-    return n != s;
-}
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_CRYNAMER_H
diff --git a/Code/CryEngine/RenderDll/Common/DeferredRenderUtils.cpp b/Code/CryEngine/RenderDll/Common/DeferredRenderUtils.cpp
deleted file mode 100644
index 19c6378949..0000000000
--- a/Code/CryEngine/RenderDll/Common/DeferredRenderUtils.cpp
+++ /dev/null
@@ -1,648 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ShadowUtils.h"
-#include "DeferredRenderUtils.h"
-
-void CDeferredRenderUtils::CreateUnitFrustumMesh(int tessx, int tessy, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Geometry generating
-    //////////////////////////////////////////////////////////////////////////
-
-    int32 nBaseVertexIndex = 0;
-
-    indBuff.clear();
-    indBuff.reserve(indBuff.size() + (tessx * tessy - 1) * 6); //TOFIX: correct number of indices
-    vertBuff.clear();
-    vertBuff.reserve(nBaseVertexIndex + tessx * tessy);
-
-    float pViewport[4] = {0.0f, 0.0f, 1.0f, 1.0f};
-    float fViewportMinZ = 0.0f;
-    float fViewportMaxZ = 1.0f;
-
-
-    float szx = 1.0f;
-    float szy = 1.0f;
-
-    float deltax = szx / (tessx - 1.0f);
-    float deltay = szy / (tessy - 1.0f);
-
-    SVF_P3F_C4B_T2F vert;
-    Vec3 tri_vert;
-    Vec3 a;
-    Vec3 vPos;
-
-
-
-    //generate tessellation for far plane
-    a.z = 1.0f;
-
-    for (int i = 0; i < tessy; i++)
-    {
-        for (int j = 0; j < tessx; j++)
-        {
-            a.x = j * deltax;
-            a.y = i * deltay;
-
-            //pre-transform viewport transform vertices in static mesh
-            vPos.x = (a.x - pViewport[0]) * 2.0f / pViewport[2] - 1.0f;
-            vPos.y = 1.0f - ((a.y - pViewport[1]) * 2.0f / pViewport[3]); //flip coords for y axis
-            vPos.z = (a.z - fViewportMinZ) / (fViewportMaxZ - fViewportMinZ);
-
-
-            vert.xyz = vPos;
-            vert.st = Vec2(1.0f, 1.0f); //valid extraction
-            vertBuff.push_back(vert);
-        }
-    }
-
-    //push light origin
-    vert.xyz = Vec3(0, 0, 0);
-    vert.st = Vec2(0.0f, 0.0f); //do not extract
-    vertBuff.push_back(vert);
-
-    //init indices for triangles drawing
-    for (int i = 0; i < tessy - 1; i++)
-    {
-        for (int j = 0; j < tessx - 1; j++)
-        {
-            indBuff.push_back((uint16)(i * tessx + j + 1         + nBaseVertexIndex));
-            indBuff.push_back((uint16)(i * tessx + j           + nBaseVertexIndex));
-            indBuff.push_back((uint16)((i + 1) * tessx + (j + 1) + nBaseVertexIndex));
-
-            indBuff.push_back((uint16)((i + 1) * tessx + j       + nBaseVertexIndex));
-            indBuff.push_back((uint16)((i + 1) * tessx + (j + 1) + nBaseVertexIndex));
-            indBuff.push_back((uint16)(i * tessx + j           + nBaseVertexIndex));
-        }
-    }
-
-    //Additional faces
-    for (int j = 0; j < tessx - 1; j++)
-    {
-        indBuff.push_back((uint16)((tessy - 1) * tessx + j + 1 + nBaseVertexIndex));
-        indBuff.push_back((uint16)((tessy - 1) * tessx + j   + nBaseVertexIndex));
-        indBuff.push_back((uint16)(tessy * tessx           + nBaseVertexIndex));//light origin - last vertex
-
-        indBuff.push_back((uint16)(tessy * tessx + nBaseVertexIndex)); //light origin - last vertex
-        indBuff.push_back((uint16)(j           + nBaseVertexIndex));
-        indBuff.push_back((uint16)(j + 1         + nBaseVertexIndex));
-    }
-
-
-    for (int i = 0; i < tessy - 1; i++)
-    {
-        indBuff.push_back((uint16)((i + 1) * tessx + nBaseVertexIndex));
-        indBuff.push_back((uint16)(i * tessx     + nBaseVertexIndex));
-        indBuff.push_back((uint16)(tessy * tessx + nBaseVertexIndex)); //light origin - last vertex
-
-        indBuff.push_back((uint16)(tessy * tessx             + nBaseVertexIndex));//light origin - last vertex
-        indBuff.push_back((uint16)(i * tessx + (tessx - 1)     + nBaseVertexIndex));
-        indBuff.push_back((uint16)((i + 1) * tessx + (tessx - 1) + nBaseVertexIndex));
-    }
-}
-
-
-//push rectangle mesh
-void CDeferredRenderUtils::CreateUnitFrustumMeshTransformed(SRenderLight* pLight, ShadowMapFrustum* pFrustum, int nAxis, int tessx, int tessy, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    //assert(pFrustum!=NULL);
-    assert(pLight != NULL);
-
-    Vec3& vLightPos = pLight->m_Origin;
-    f32 fLightRadius = pLight->m_fRadius;
-
-    int32 pViewport[4] = {0, 0, 1, 1};
-
-    Matrix44A mProjection;
-    Matrix44A mView;
-
-    if (pFrustum == NULL)
-    {
-        //for light source
-        CShadowUtils::GetCubemapFrustumForLight(pLight, nAxis, g_fOmniLightFov /*pLight->m_fLightFrustumAngle*/ + 3.0f, &mProjection, &mView, false); // 3.0f -  offset to make sure that frustums are intersected
-    }
-    else
-    {
-        if (!pFrustum->bOmniDirectionalShadow)
-        {
-            //temporarily disabled since mLightProjMatrix contains pre-multiplied matrix already
-            //pmProjection = &(pFrustum->mLightProjMatrix);
-            mProjection = gRenDev->m_IdentityMatrix;
-            mView = pFrustum->mLightViewMatrix;
-        }
-        else
-        {
-            //calc one of cubemap's frustums
-            Matrix33 mRot = (Matrix33(pLight->m_ObjMatrix));
-            //rotation for shadow frustums is disabled
-            CShadowUtils::GetCubemapFrustum(FTYP_OMNILIGHTVOLUME, pFrustum, nAxis, &mProjection, &mView /*, &mRot*/);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Geometry generating
-    //////////////////////////////////////////////////////////////////////////
-
-    //add geometry to the existing one
-    int32 nBaseVertexIndex = vertBuff.size();
-
-    indBuff.clear();
-    indBuff.reserve(indBuff.size() + (tessx * tessy - 1) * 6); //TOFIX: correct number of indices
-    vertBuff.clear();
-    vertBuff.reserve(nBaseVertexIndex + tessx * tessy);
-
-
-    float szx = 1.0f;
-    float szy = 1.0f;
-
-    float deltax = szx / (tessx - 1);
-    float deltay = szy / (tessy - 1);
-
-    SVF_P3F_C4B_T2F vert;
-    Vec3 tri_vert;
-    Vec3 a;
-
-    //generate tessellation for far plane
-    a.z = 1.0f;
-
-    for (int i = 0; i < tessy; i++)
-    {
-        for (int j = 0; j < tessx; j++)
-        {
-            a.x = j * deltax;
-            a.y = i * deltay;
-
-            // A
-            mathVec3UnProject(&tri_vert, &a, pViewport, &mProjection, &mView, &gRenDev->m_IdentityMatrix, g_CpuFlags);
-
-            //calc vertex expansion in world space coords
-            Vec3 vLightDir = tri_vert - vLightPos;
-            vLightDir.Normalize();
-            vLightDir.SetLength(fLightRadius * 1.05f);
-
-            vert.xyz = vLightPos + vLightDir;
-            vert.st = Vec2(0.0f, 0.0f);
-            vertBuff.push_back(vert);
-        }
-    }
-
-    //push light origin
-    vert.xyz = vLightPos;
-    vert.st = Vec2(0.0f, 0.0f);
-    vertBuff.push_back(vert);
-
-    //init indices for triangles drawing
-    for (int i = 0; i < tessy - 1; i++)
-    {
-        for (int j = 0; j < tessx - 1; j++)
-        {
-            indBuff.push_back((uint16)(i * tessx + j + 1         + nBaseVertexIndex));
-            indBuff.push_back((uint16)(i * tessx + j           + nBaseVertexIndex));
-            indBuff.push_back((uint16)((i + 1) * tessx + (j + 1) + nBaseVertexIndex));
-
-            indBuff.push_back((uint16)((i + 1) * tessx + j       + nBaseVertexIndex));
-            indBuff.push_back((uint16)((i + 1) * tessx + (j + 1) + nBaseVertexIndex));
-            indBuff.push_back((uint16)(i * tessx + j           + nBaseVertexIndex));
-        }
-    }
-
-    //Additional faces
-    for (int j = 0; j < tessx - 1; j++)
-    {
-        indBuff.push_back((uint16)((tessy - 1) * tessx + j + 1 + nBaseVertexIndex));
-        indBuff.push_back((uint16)((tessy - 1) * tessx + j   + nBaseVertexIndex));
-        indBuff.push_back((uint16)(tessy * tessx           + nBaseVertexIndex));//light origin - last vertex
-
-        indBuff.push_back((uint16)(tessy * tessx + nBaseVertexIndex)); //light origin - last vertex
-        indBuff.push_back((uint16)(j           + nBaseVertexIndex));
-        indBuff.push_back((uint16)(j + 1         + nBaseVertexIndex));
-    }
-
-
-    for (int i = 0; i < tessy - 1; i++)
-    {
-        indBuff.push_back((uint16)((i + 1) * tessx + nBaseVertexIndex));
-        indBuff.push_back((uint16)(i * tessx     + nBaseVertexIndex));
-        indBuff.push_back((uint16)(tessy * tessx + nBaseVertexIndex)); //light origin - last vertex
-
-        indBuff.push_back((uint16)(tessy * tessx             + nBaseVertexIndex));//light origin - last vertex
-        indBuff.push_back((uint16)(i * tessx + (tessx - 1)     + nBaseVertexIndex));
-        indBuff.push_back((uint16)((i + 1) * tessx + (tessx - 1) + nBaseVertexIndex));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Approximate with 8 vertices
-//////////////////////////////////////////////////////////////////////////
-void CreateSimpleLightFrustumMeshTransformed(ShadowMapFrustum* pFrustum, int nFrustNum, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    //SVF_P3F_T2F_T3F
-    SVF_P3F_C4B_T2F vert;
-    Vec3 vNDC;
-
-
-    assert(pFrustum != NULL);
-
-    indBuff.clear();
-    indBuff.reserve(36);
-
-    vertBuff.clear();
-    vertBuff.reserve(8);
-
-    //first vertex for cone
-    //vert.xyz = Vec3(0.0f, 0.0f, 0.0f);
-    //vert.st = Vec2(0.0f, 0.0f);
-    //vertBuff.push_back(vert);
-
-    int32 pViewport[4] = {0, 0, 1, 1};
-
-    Matrix44A* pmProjection;
-    Matrix44A* pmView;
-
-    Matrix44A mProjectionCM;
-    Matrix44A mViewCM;
-
-    if (!pFrustum->bOmniDirectionalShadow)
-    {
-        //temporarily disabled since mLightProjMatrix contains pre-multiplied matrix already
-        //pmProjection = &(pFrustum->mLightProjMatrix);
-        pmProjection = &gRenDev->m_IdentityMatrix;
-        pmView = &(pFrustum->mLightViewMatrix);
-    }
-    else
-    {
-        //calc one of cubemap's frustums
-        CShadowUtils::GetCubemapFrustum(FTYP_OMNILIGHTVOLUME, pFrustum, nFrustNum, &mProjectionCM, &mViewCM);
-
-        pmProjection = &mProjectionCM;
-        pmView = &mViewCM;
-    }
-
-
-    //Create frustum
-    for (int i = 0; i < 8; i++)
-    {
-        //Generate screen space frustum (CCW faces)
-        vNDC = Vec3((i == 0 || i == 3 || i == 4 || i == 7) ? 0.0f : 1.0f,
-                (i == 0 || i == 1 || i == 4 || i == 5) ? 0.0f : 1.0f,
-                (i == 0 || i == 1 || i == 2 || i == 3) ? 0.0f : 1.0f
-                );
-        //TD: convert math functions to column ordered matrices
-        Vec3 pvObj(vert.xyz);
-        mathVec3UnProject(&pvObj, &vNDC, pViewport, pmProjection, pmView, &gRenDev->m_IdentityMatrix, g_CpuFlags);
-        vert.st = Vec2(0.0f, 0.0f);
-        vertBuff.push_back(vert);
-    }
-
-
-    //CCW faces
-    static uint16 nFaces[6][4] = {
-        {0, 1, 2, 3},
-        {4, 7, 6, 5},
-        {0, 3, 7, 4},
-        {1, 5, 6, 2},
-        {0, 4, 5, 1},
-        {3, 2, 6, 7}
-    };
-
-    //init indices for triangles drawing
-    for (int i = 0; i < 6; i++)
-    {
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][1]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-        indBuff.push_back((uint16)  nFaces[i][3]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//Sphere light volumes
-//////////////////////////////////////////////////////////////////////////
-void CDeferredRenderUtils::SphereTessR(Vec3& v0, Vec3& v1, Vec3& v2, int depth, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    if (depth == 0)
-    {
-        SVF_P3F_C4B_T2F vert;
-
-        int nVertCount = vertBuff.size();
-        vert.st = Vec2(0.0f, 0.0f);
-
-        vert.xyz = v0;
-        vertBuff.push_back(vert);
-        indBuff.push_back(nVertCount++);
-
-        vert.xyz = v1;
-        vertBuff.push_back(vert);
-        indBuff.push_back(nVertCount++);
-
-        vert.xyz = v2;
-        vertBuff.push_back(vert);
-        indBuff.push_back(nVertCount++);
-    }
-    else
-    {
-        Vec3 v01, v12, v02;
-
-        v01 = (v0 + v1).GetNormalized();
-        v12 = (v1 + v2).GetNormalized();
-        v02 = (v0 + v2).GetNormalized();
-
-        SphereTessR(v0,  v01, v02, depth - 1, indBuff, vertBuff);
-        SphereTessR(v01,  v1, v12, depth - 1, indBuff, vertBuff);
-        SphereTessR(v12, v02, v01, depth - 1, indBuff, vertBuff);
-        SphereTessR(v12,  v2, v02, depth - 1, indBuff, vertBuff);
-    }
-}
-
-
-void CDeferredRenderUtils::SphereTess(Vec3& v0, Vec3& v1, Vec3& v2, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    int depth;
-    Vec3 w0, w1, w2;
-    int i, j, k;
-
-    SVF_P3F_C4B_T2F vert;
-
-    vert.st = Vec2(0.0f, 0.0f);
-    int nVertCount = vertBuff.size();
-
-    depth = 2;
-    for (i = 0; i < depth; i++)
-    {
-        for (j = 0; i + j < depth; j++)
-        {
-            k = depth - i - j;
-
-            {
-                w0 = (i * v0 + j * v1 + k * v2) / depth;
-                w1 = ((i + 1) * v0 + j * v1 + (k - 1) * v2)
-                    / depth;
-                w2 = (i * v0 + (j + 1) * v1 + (k - 1) * v2)
-                    / depth;
-            }
-
-            w0.Normalize();
-            w1.Normalize();
-            w2.Normalize();
-
-            vert.xyz = w1;
-            vertBuff.push_back(vert);
-            indBuff.push_back(nVertCount++);
-
-            vert.xyz = w0;
-            vertBuff.push_back(vert);
-            indBuff.push_back(nVertCount++);
-
-            vert.xyz = w2;
-            vertBuff.push_back(vert);
-            indBuff.push_back(nVertCount++);
-        }
-    }
-}
-
-#define X .525731112119133606f
-#define Z .850650808352039932f
-
-void CDeferredRenderUtils::CreateUnitSphere(int rec, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    static Vec3 verts[12] =
-    {
-        Vec3(-X, 0, Z),
-        Vec3(X, 0, Z),
-        Vec3(-X, 0, -Z),
-        Vec3(X, 0, -Z),
-        Vec3(0, Z, X),
-        Vec3(0, Z, -X),
-        Vec3(0, -Z, X),
-        Vec3(0, -Z, -X),
-        Vec3(Z, X, 0),
-        Vec3(-Z, X, 0),
-        Vec3(Z, -X, 0),
-        Vec3(-Z, -X, 0)
-    };
-
-    static int indices[20][3] =
-    {
-        {0, 4, 1},
-        {0, 9, 4},
-        {9, 5, 4},
-        {4, 5, 8},
-        {4, 8, 1},
-        {8, 10, 1},
-        {8, 3, 10},
-        {5, 3, 8},
-        {5, 2, 3},
-        {2, 7, 3},
-        {7, 10, 3},
-        {7, 6, 10},
-        {7, 11, 6},
-        {11, 0, 6},
-        {0, 1, 6},
-        {6, 1, 10},
-        {9, 0, 11},
-        {9, 11, 2},
-        {9, 2, 5},
-        {7, 2, 11},
-    };
-
-    indBuff.clear();
-    vertBuff.clear();
-
-    SVF_P3F_C4B_T2F vert;
-
-    vert.st = Vec2(0.0f, 0.0f);
-
-    //debug
-    /*for(int i=0; i<12; i++)
-    {
-    vert.xyz = verts[i];
-    vertBuff.push_back(vert);
-    }
-
-    for (int i = 19; i >= 0; i--)
-    {
-    indBuff.push_back( (uint16)indices[i][2] );
-    indBuff.push_back( (uint16)indices[i][1] );
-    indBuff.push_back( (uint16)indices[i][0] );
-    }*/
-
-    for (int i = 19; i >= 0; i--)
-    {
-        Vec3& v0 = verts[indices[i][2]];
-        Vec3& v1 = verts[indices[i][1]];
-        Vec3& v2 = verts[indices[i][0]];
-        //SphereTess(v0, v1, v2, indBuff, vertBuff);
-        SphereTessR(v0, v1, v2, rec, indBuff, vertBuff);
-    }
-}
-#undef X
-#undef Z
-
-void CDeferredRenderUtils::CreateUnitBox(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    SVF_P3F_C4B_T2F vert;
-    Vec3 vNDC;
-
-    indBuff.clear();
-    indBuff.reserve(36);
-
-    vertBuff.clear();
-    vertBuff.reserve(8);
-
-    //Create unit box
-    for (int i = 0; i < 8; i++)
-    {
-        //Generate screen space frustum (CCW faces)
-        vNDC = Vec3((i == 0 || i == 1 || i == 4 || i == 5) ? 0.0f : 1.0f,
-                (i == 0 || i == 3 || i == 4 || i == 7) ? 0.0f : 1.0f,
-                (i == 0 || i == 1 || i == 2 || i == 3) ? 0.0f : 1.0f
-                );
-        vert.xyz = vNDC;
-        vert.st = Vec2(0.0f, 0.0f);
-        vert.color.dcolor = -1;
-        vertBuff.push_back(vert);
-    }
-
-    //CCW faces
-    uint16 nFaces[6][4] = {
-        {0, 1, 2, 3},
-        {4, 7, 6, 5},
-        {0, 3, 7, 4},
-        {1, 5, 6, 2},
-        {0, 4, 5, 1},
-        {3, 2, 6, 7}
-    };
-
-    //init indices for triangles drawing
-    for (int i = 0; i < 6; i++)
-    {
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][1]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-        indBuff.push_back((uint16)  nFaces[i][3]);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// Approximate with 8 vertices
-//////////////////////////////////////////////////////////////////////////
-void CDeferredRenderUtils::CreateSimpleLightFrustumMesh(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    //SVF_P3F_T2F_T3F
-    SVF_P3F_C4B_T2F vert;
-    Vec3 vNDC;
-
-    indBuff.clear();
-    indBuff.reserve(36);
-
-    vertBuff.clear();
-    vertBuff.reserve(8);
-
-    int32 pViewport[4] = {0, 0, 1, 1};
-    float fViewportMinZ = 0.0f, fViewportMaxZ = 1.0f;
-
-
-    Matrix44A mProjectionCM;
-    Matrix44A mViewCM;
-
-    Vec3 vPos;
-
-    //Create frustum
-    for (int i = 0; i < 8; i++)
-    {
-        //Generate screen space frustum (CCW faces)
-        //vNDC = Vec3((i==0 || i==3 || i==4 || i==7) ? 0.0f : 1.0f,
-        //  (i==0 || i==1 || i==4 || i==5) ? 0.0f : 1.0f,
-        //  (i==0 || i==1 || i==2 || i==3) ? 0.0f : 1.0f
-        //  );
-
-        vNDC = Vec3((i == 0 || i == 1 || i == 4 || i == 5) ? 0.0f : 1.0f,
-                (i == 0 || i == 3 || i == 4 || i == 7) ? 0.0f : 1.0f,
-                (i == 0 || i == 1 || i == 2 || i == 3) ? 0.0f : 1.0f);
-
-
-        //pre-transform viewport transform vertices in static mesh
-        vPos.x = (vNDC.x - pViewport[0]) * 2.0f / pViewport[2] - 1.0f;
-        vPos.y = 1.0f - ((vNDC.y - pViewport[1]) * 2.0f / pViewport[3]); //flip coords for y axis
-        vPos.z = (vNDC.z - fViewportMinZ) / (fViewportMaxZ - fViewportMinZ);
-
-        vert.xyz = vPos;
-        vert.st = Vec2(1.0f, 1.0f); //valid extraction
-        vertBuff.push_back(vert);
-    }
-
-
-    //CCW faces
-    static uint16 nFaces[6][4] = {
-        {0, 1, 2, 3},
-        {4, 7, 6, 5},
-        {0, 3, 7, 4},
-        {1, 5, 6, 2},
-        {0, 4, 5, 1},
-        {3, 2, 6, 7}
-    };
-
-    //init indices for triangles drawing
-    for (int i = 0; i < 6; i++)
-    {
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][1]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-        indBuff.push_back((uint16)  nFaces[i][3]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//FS quad
-//////////////////////////////////////////////////////////////////////////
-
-void CDeferredRenderUtils::CreateQuad(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    SVF_P3F_C4B_T2F pScreenQuad[] =
-    {
-        { Vec3(0, 0, 0), {
-              {0}
-          }, Vec2(0, 0) },
-        { Vec3(0, 1, 0), {
-              {0}
-          }, Vec2(0, 1) },
-        { Vec3(1, 0, 0), {
-              {0}
-          }, Vec2(1, 0) },
-        { Vec3(1, 1, 0), {
-              {0}
-          }, Vec2(1, 1) },
-    };
-
-    vertBuff.clear();
-    vertBuff.reserve(4);
-
-    vertBuff.push_back(pScreenQuad[0]);
-    vertBuff.push_back(pScreenQuad[1]);
-    vertBuff.push_back(pScreenQuad[2]);
-    vertBuff.push_back(pScreenQuad[3]);
-
-    indBuff.clear();
-}
diff --git a/Code/CryEngine/RenderDll/Common/DeferredRenderUtils.h b/Code/CryEngine/RenderDll/Common/DeferredRenderUtils.h
deleted file mode 100644
index 954d1b4c4c..0000000000
--- a/Code/CryEngine/RenderDll/Common/DeferredRenderUtils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __DEFERRED_RENDER_UTILS_H__
-#define __DEFERRED_RENDER_UTILS_H__
-
-#define SDeferMeshVert SVF_P3F_C4B_T2F
-
-typedef std::vector<SVF_P3F_C4B_T2F> t_arrDeferredMeshVertBuff;
-typedef std::vector<uint16> t_arrDeferredMeshIndBuff;
-
-class CDeferredRenderUtils
-{
-public:
-    static void CreateUnitFrustumMesh(int tessx, int tessy, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-    static void CreateUnitFrustumMeshTransformed(SRenderLight* pLight, ShadowMapFrustum* pFrustum, int nAxis, int tessx, int tessy, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-    static void CreateUnitSphere(int rec, /*SRenderLight* pLight, int depth, */ t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-
-    static void CreateSimpleLightFrustumMesh(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-    static void CreateSimpleLightFrustumMeshTransformed(ShadowMapFrustum* pFrustum, int nFrustNum, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-    static void CreateUnitBox(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-
-    static void CreateQuad(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-
-    CDeferredRenderUtils();
-    ~CDeferredRenderUtils();
-private:
-    static void SphereTess(Vec3& v0, Vec3& v1, Vec3& v2, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-    static void SphereTessR(Vec3& v0, Vec3& v1, Vec3& v2, int depth, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/Defs.h b/Code/CryEngine/RenderDll/Common/Defs.h
deleted file mode 100644
index 5d3cbf05c4..0000000000
--- a/Code/CryEngine/RenderDll/Common/Defs.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(Defs_h)
-#endif
-#if defined(DEFS_H_NO_SIGNAL_H)
-#undef DEFS_H_NO_SIGNAL_H
-#else
-#include <signal.h>
-#endif
-#include <errno.h>
-#include <string.h>
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef ABS
-#define ABS(x) ((x) < 0 ? -(x) : (x))
-#endif
-
-#if !defined(SIGN) && !defined(DO_AMIGAOS)
-#define SIGN(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))
-#endif
-
-#define EPSILON 0.001f           /* Small value */
-#define SMALL_EPSILON 0.000001f  /* Very small value */
-#ifndef _WIN32
-//#define INFINITE 999999000      /* Very large number */
-#endif
-#ifndef PI
-#define PI 3.14159265358979323f  /* You know this number, don't you? */
-#endif
-#ifndef M_PI
-#define M_PI PI
-#endif
-#ifndef M_PI_2
-#define M_PI_2 (PI / 2)
-#endif //M_PI_2
-
-#if !defined(LINUX) && !defined(MAC)
-    #if defined(COMP_WCC)
-        #define strcasecmp _stricmp
-        #define strncasecmp strnicmp
-    #endif
-
-    #if defined(_MSC_VER)
-        #define strcasecmp _stricmp
-        #define strncasecmp _strnicmp
-    #endif
-#endif  // !defined(LINUX) && !defined(MAC)
-
-#ifdef _CPU_X86
-
-// This is 'stolen' from someone (I don't remember who anymore). It
-// is a nice and fast way to convert a floating point number to int
-// (only works on a i386 type processor).
-// It is equivalent to 'i=(int)(f+.5)'.
-#define FIST_MAGIC ((float)((((65536.0 * 65536.0 * 16) + (65536.0 * 0.5)) * 65536.0)))
-_inline long QuickRound (float inval)
-{
-    double dtemp = FIST_MAGIC + inval;
-    return ((*(long*)&dtemp) - 0x80000000);
-}
-
-_inline long QuickInt (float inval)
-{
-    double dtemp = FIST_MAGIC + (inval - .4999f);
-    return ((*(long*)&dtemp) - 0x80000000);
-}
-
-// This is my own invention derived from the previous one. This converts
-// a floating point number to a 16.16 fixed point integer. It is
-// equivalent to 'i=(int)(f*65536.)'.
-#define FIST_MAGIC2 ((float)((((65536.0 * 16) + (0.5)) * 65536.0)))
-inline long QuickInt16 (float inval)
-{
-    double dtemp = FIST_MAGIC2 + inval;
-    return ((*(long*)&dtemp) - 0x80000000);
-}
-#endif //_CPU_X86
-
-#ifdef PROC_M68K
-
-#define FIST_MAGIC ((((65536.0 * 65536.0 * 16) + (65536.0 * 0.5)) * 65536.0))
-inline long QuickRound (float inval)
-{
-    double dtemp = FIST_MAGIC + inval;
-    return (*(((long*)&dtemp) + 1)) - 0x80000000;
-}
-
-inline long QuickInt (float inval)
-{
-    double dtemp = FIST_MAGIC + (inval - .4999);
-    return (*(((long*)&dtemp) + 1)) - 0x80000000;
-}
-
-#define FIST_MAGIC2 ((((65536.0 * 16) + (0.5)) * 65536.0))
-inline long QuickInt16 (float inval)
-{
-    double dtemp = FIST_MAGIC2 + inval;
-    return (*(((long*)&dtemp) + 1)) - 0x80000000;
-}
-#endif
-
-#if defined(_CPU_X86) || defined(PROC_M68K)
-#  define QRound(x) QuickRound(x)
-#  define QInt(x) QuickInt(x)
-#  define QInt16(x) QuickInt16(x)
-#else
-#  define QRound(x) ((int)((x) + .5))
-#  define QInt(x) ((int)(x))
-#  define QInt16(x) ((int)((x) * 65536.))
-#endif
-
-// @@@ I don't know if there is a better way to convert
-// a floating point to 8:24 fixed point (one with constants
-// like the tricks above instead of the multiplication).
-#define QInt24(x) (QInt16(((x) * 256.0f)))
-
-#if STATS
-    #define STAT(x) x
-#else
-    #define STAT(x)
-#endif
-
-
-//#define SMALL_Z .01
-#define SMALL_Z 0.1f
-
-#define USE_OCCLUSION 0 // Experimental feature, will not work in this version.
-
-// Some useful macros: these should be true at least for 32-bit processors
-#define LONGFROM2SHORT(s1, s2) (((short)s1) << 16 | (((short)s2) & 0xffff))
-#define SHORT1FROMLONG(l)     (short)(((int)l) >> 16)
-#define SHORT2FROMLONG(l)     (short)(((int)l) & 0xffff)
diff --git a/Code/CryEngine/RenderDll/Common/DevBuffer.h b/Code/CryEngine/RenderDll/Common/DevBuffer.h
deleted file mode 100644
index 3866fd069e..0000000000
--- a/Code/CryEngine/RenderDll/Common/DevBuffer.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <XRenderD3D9/DeviceManager/Base.h>
-#include <XRenderD3D9/DeviceManager/Enums.h>
-
-////////////////////////////////////////////////////////////////////////////////////////
-// Usage hints
-enum BUFFER_USAGE
-{
-    BU_IMMUTABLE = 0, // For data that never, ever changes
-    BU_STATIC,    // For long-lived data that changes infrequently (every n-frames)
-    BU_DYNAMIC,   // For short-lived data that changes frequently (every frame)
-    BU_TRANSIENT, // For very short-lived data that can be considered garbage after first usage
-    BU_TRANSIENT_RT, // For very short-lived data that can be considered garbage after first usage
-    BU_WHEN_LOADINGTHREAD_ACTIVE, // yes we can ... because renderloadingthread frames not synced with mainthread frames
-    BU_MAX
-};
-
-////////////////////////////////////////////////////////////////////////////////////////
-// Binding flags
-enum BUFFER_BIND_TYPE
-{
-    BBT_VERTEX_BUFFER = 0,
-    BBT_INDEX_BUFFER,
-    BBT_MAX
-};
-
-typedef uintptr_t buffer_handle_t;
-typedef uint32 item_handle_t;
-
-// CRY DX12
-////////////////////////////////////////////////////////////////////////////////////////
-struct SDescriptorBlock
-{
-    SDescriptorBlock(uint32 id)
-        : blockID(id)
-        , pBuffer(NULL)
-        , size(0)
-        , offset(~0u)
-    {}
-
-    const uint32 blockID;
-
-    void* pBuffer;
-    uint32 size;
-    uint32 offset;
-};
-
-class CDeviceBufferManager;
-struct ConstantBufferAllocator;
-
-namespace AzRHI
-{
-    enum class ConstantBufferUsage : AZ::u8
-    {
-        Static,
-        Dynamic
-    };
-
-    enum class ConstantBufferFlags : AZ::u8
-    {
-        None = 0,
-        DenyStreaming = BIT(1), // Used by OpenGL for constant buffer streaming
-    };
-    AZ_DEFINE_ENUM_BITWISE_OPERATORS(ConstantBufferFlags)
-
-    class ConstantBuffer
-    {
-    public:
-        ConstantBuffer(uint32 handle);
-        virtual ~ConstantBuffer();
-
-        inline D3DBuffer* GetPlatformBuffer() const
-        {
-            return m_buffer;
-        }
-
-        inline AzRHI::ConstantBufferUsage GetUsage() const
-        {
-            return m_usage;
-        }
-
-        inline AzRHI::ConstantBufferFlags GetFlags() const
-        {
-            return m_flags;
-        }
-
-        inline AZ::u32 GetByteOffset() const
-        {
-            return m_offset;
-        }
-
-        inline AZ::u32 GetByteCount() const
-        {
-            return m_size;
-        }
-
-#if !defined(NULL_RENDERER)
-        inline AZ::u64 GetCode() const
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(DevBuffer_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            return reinterpret_cast<AZ::u64>(m_buffer) | ((AZ::u64)m_offset << 40);
-#endif
-        }
-#endif // !NULL_RENDERER
-
-        void AddRef();
-
-        AZ::u32 Release();
-
-        void* BeginWrite();
-
-        void EndWrite();
-
-        void UpdateBuffer(const void* data, AZ::u32 size);
-
-    private:
-        friend class ::CDeviceBufferManager;
-        friend struct ::ConstantBufferAllocator;
-
-        const char* m_name;
-        D3DBuffer* m_buffer;
-        item_handle_t m_handle;
-        void* m_allocator;
-        void* m_base_ptr;
-        AZ::u32 m_offset;
-        AZ::u32 m_size;
-        ConstantBufferUsage m_usage;
-        ConstantBufferFlags m_flags;
-        AZ::u8 m_used : 1;
-        AZ::u8 m_dynamic : 1;
-        AZStd::atomic_uint m_refCount;
-
-        int m_nHeapOffset;
-        SDescriptorBlock* m_pDescriptorBlock;
-    };
-
-    using ConstantBufferPtr = _smart_ptr<AzRHI::ConstantBuffer>;
-
-    AZ::u32 GetConstantRegisterCountMax(EHWShaderClass shaderClass);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-// Pool statistics
-struct SDeviceBufferPoolStats
-    : private NoCopy
-{
-    string buffer_descr;
-    size_t  bank_size;     // size of a pool bank in bytes
-    size_t  num_banks;     // number of banks currently allocated
-    size_t  num_allocs;    // number of allocs present in the device pool
-    IDefragAllocatorStats allocator_stats; // backing allocator statistics
-
-    SDeviceBufferPoolStats()
-        : buffer_descr()
-        , bank_size()
-        , num_banks()
-        , num_allocs()
-        , allocator_stats()
-    { memset(&allocator_stats, 0x0, sizeof(allocator_stats)); }
-
-    ~SDeviceBufferPoolStats() {}
-};
-
-class CVertexBuffer;
-class CIndexBuffer;
-
-class IDeviceBufferManager
-{
-    friend class CGuardedDeviceBufferManager;
-    friend class CDeviceManager;
-public:
-
-# ifndef NULL_RENDERER
-    virtual D3DBuffer* GetD3D(buffer_handle_t handle, size_t* outOffset) = 0;
-#endif
-    virtual void LockDevMan() = 0;
-    virtual void UnlockDevMan() = 0;
-
-private:
-    virtual buffer_handle_t Create_Locked(BUFFER_BIND_TYPE, BUFFER_USAGE, size_t) = 0;
-    virtual void Destroy_Locked(buffer_handle_t) = 0;
-    virtual void* BeginRead_Locked(buffer_handle_t handle) = 0;
-    virtual void* BeginWrite_Locked(buffer_handle_t handle) = 0;
-    virtual void  EndReadWrite_Locked(buffer_handle_t handle) = 0;
-    virtual bool  UpdateBuffer_Locked(buffer_handle_t handle, const void*, size_t) = 0;
-    virtual size_t Size_Locked(buffer_handle_t) = 0;
-};
-
-class CDeviceBufferManager : public IDeviceBufferManager
-{
-    buffer_handle_t Create_Locked(BUFFER_BIND_TYPE, BUFFER_USAGE, size_t) override;
-    void Destroy_Locked(buffer_handle_t) override;
-    void* BeginRead_Locked(buffer_handle_t handle) override;
-    void* BeginWrite_Locked(buffer_handle_t handle) override;
-    void  EndReadWrite_Locked(buffer_handle_t handle) override;
-    bool  UpdateBuffer_Locked(buffer_handle_t handle, const void*, size_t) override;
-    size_t Size_Locked(buffer_handle_t) override;
-
-public:
-    CDeviceBufferManager();
-    ~CDeviceBufferManager();
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // Initialization and destruction and high level update funcationality
-    bool Init();
-    void Update(uint32 frameId, bool called_during_loading);
-    void ReleaseEmptyBanks(uint32 frameId);
-    void Sync(uint32 frameId);
-    bool Shutdown();
-
-    AzRHI::ConstantBuffer* CreateConstantBuffer(
-        const char* name,
-        AZ::u32 size,
-        AzRHI::ConstantBufferUsage usage,
-        AzRHI::ConstantBufferFlags flags = AzRHI::ConstantBufferFlags::None);
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // Descriptor blocks
-    SDescriptorBlock* CreateDescriptorBlock(size_t size);
-    void ReleaseDescriptorBlock(SDescriptorBlock* pBlock);
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // Locks the global devicebuffer lock
-    void LockDevMan() override;
-    void UnlockDevMan() override;
-
-    // Returns the size in bytes of the allocation
-    size_t Size(buffer_handle_t);
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // Buffer Resource creation methods
-    //
-    buffer_handle_t Create(BUFFER_BIND_TYPE, BUFFER_USAGE, size_t);
-    void Destroy(buffer_handle_t);
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // Manual IO operations
-    //
-    // Note: it's an error to NOT end an IO operation with EndReadWrite!!!
-    //
-    // Note: If you are writing (updating) a buffer only partially, please be aware that the
-    //       the contents of the untouched areas might be undefined as a copy-on-write semantic
-    //       ensures that the updating of buffers does not synchronize with the GPU at any cost.
-    //
-    void* BeginRead(buffer_handle_t handle);
-    void* BeginWrite(buffer_handle_t handle);
-    void  EndReadWrite(buffer_handle_t handle);
-    bool  UpdateBuffer(buffer_handle_t handle, const void*, size_t);
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // Get Stats back from the devbuffer
-    bool GetStats(BUFFER_BIND_TYPE, BUFFER_USAGE, SDeviceBufferPoolStats&);
-
-# ifndef NULL_RENDERER
-    D3DBuffer* GetD3D(buffer_handle_t handle, size_t* outOffset);
-# endif
-
-    /////////////////////////////////////////////////////////////
-    // Legacy interface
-    //
-    // Use with care, can be removed at any point!
-    CVertexBuffer* CreateVBuffer(size_t, const AZ::Vertex::Format&, const char*, BUFFER_USAGE usage = BU_STATIC); //waltont given that this is a legacy interface, does it make more sense to just remove it? What is the alternative, new interface? The only place that uses it is BreakableGlass.
-    void ReleaseVBuffer(CVertexBuffer*);
-
-    CIndexBuffer* CreateIBuffer(size_t, const char*, BUFFER_USAGE usage = BU_STATIC);
-    void ReleaseIBuffer(CIndexBuffer*);
-
-    bool UpdateVBuffer(CVertexBuffer*, void*, size_t);
-    bool UpdateIBuffer(CIndexBuffer*, void*, size_t);
-};
-
-class CGuardedDeviceBufferManager
-    : public NoCopy
-{
-private:
-    IDeviceBufferManager* m_pDevMan;
-
-public:
-    explicit CGuardedDeviceBufferManager(IDeviceBufferManager* pDevMan)
-        : m_pDevMan(pDevMan)
-    {
-        m_pDevMan->LockDevMan();
-    }
-
-    ~CGuardedDeviceBufferManager()
-    {
-        m_pDevMan->UnlockDevMan();
-    }
-
-    inline buffer_handle_t Create(BUFFER_BIND_TYPE type, BUFFER_USAGE usage, size_t size)
-    {
-        return m_pDevMan->Create_Locked(type, usage, size);
-    }
-
-    inline void Destroy(buffer_handle_t handle)
-    {
-        return m_pDevMan->Destroy_Locked(handle);
-    }
-
-    inline void* BeginRead(buffer_handle_t handle)
-    {
-        return m_pDevMan->BeginRead_Locked(handle);
-    }
-
-    inline void* BeginWrite(buffer_handle_t handle)
-    {
-        return m_pDevMan->BeginWrite_Locked(handle);
-    }
-
-    inline void EndReadWrite(buffer_handle_t handle)
-    {
-        m_pDevMan->EndReadWrite_Locked(handle);
-    }
-
-    inline bool UpdateBuffer(buffer_handle_t handle, const void* src, size_t size)
-    {
-        return m_pDevMan->UpdateBuffer_Locked(handle, src, size);
-    }
-
-# ifndef NULL_RENDERER
-    inline D3DBuffer* GetD3D(buffer_handle_t handle, size_t* offset)
-    {
-        return m_pDevMan->GetD3D(handle, offset);
-    }
-# endif
-};
-
-
-class SRecursiveSpinLock
-{
-    volatile LONG m_lock;
-    volatile threadID m_owner;
-    volatile uint16 m_counter;
-
-    enum
-    {
-        SPIN_COUNT = 10
-    };
-
-public:
-
-    SRecursiveSpinLock()
-        : m_lock()
-        , m_owner()
-        , m_counter()
-    {}
-
-    ~SRecursiveSpinLock() {}
-
-    void Lock()
-    {
-        threadID threadId = CryGetCurrentThreadId();
-        int32 iterations = 0;
-retry:
-        IF (CryInterlockedCompareExchange(&(this->m_lock), 1L, 0L) == 0L, 1)
-        {
-            assert (m_owner == 0u && m_counter == 0u);
-            m_owner = threadId;
-            m_counter = 1;
-        }
-        else
-        {
-            IF (m_owner == threadId, 1)
-            {
-                ++m_counter;
-            }
-            else
-            {
-                Sleep((1 & isneg(SPIN_COUNT - iterations++)));
-                goto retry;
-            }
-        }
-    }
-
-    bool TryLock()
-    {
-        threadID threadId = CryGetCurrentThreadId();
-        IF (CryInterlockedCompareExchange(&m_lock, 1L, 0L) == 0L, 1)
-        {
-            assert (m_owner == 0u && m_counter == 0u);
-            m_owner = threadId;
-            m_counter = 1;
-            return true;
-        }
-        else
-        {
-            IF (m_owner == threadId, 1)
-            {
-                ++m_counter;
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-    }
-
-    void Unlock()
-    {
-        assert (m_owner == CryGetCurrentThreadId() && m_counter != 0u);
-        IF ((m_counter -= 1) == 0u, 1)
-        {
-            m_owner = 0u;
-            m_lock = 0L;
-            MemoryBarrier();
-        }
-    }
-};
-
-class SRecursiveSpinLocker
-{
-    SRecursiveSpinLock* lock;
-public:
-    SRecursiveSpinLocker(SRecursiveSpinLock* _lock)
-        : lock(_lock)
-    {
-        lock->Lock();
-    }
-    ~SRecursiveSpinLocker() { lock->Unlock(); }
-};
-#define SREC_AUTO_LOCK(x) SRecursiveSpinLocker AZ_JOIN(_lock, __LINE__)(&(x))
-
-class CConditonalDevManLock
-{
-    CDeviceBufferManager* m_pDevBufMan;
-    int m_Active;
-public:
-    explicit CConditonalDevManLock(CDeviceBufferManager* DevMan, int active)
-        : m_pDevBufMan(DevMan)
-        , m_Active(active)
-    {
-        if (m_Active)
-        {
-            m_pDevBufMan->LockDevMan();
-        }
-    }
-
-    ~CConditonalDevManLock()
-    {
-        if (m_Active)
-        {
-            m_pDevBufMan->UnlockDevMan();
-        }
-    }
-};
-
-// WrappedDX11Buffer Flags
-#define DX11BUF_DYNAMIC       BIT(0)
-#define DX11BUF_STRUCTURED    BIT(1)
-#define DX11BUF_BIND_SRV      BIT(2)
-#define DX11BUF_BIND_UAV      BIT(3)
-#define DX11BUF_UAV_APPEND    BIT(4)
-#define DX11BUF_DRAWINDIRECT  BIT(5)
-#define DX11BUF_STAGING       BIT(6)
-
-#if !defined(NULL_RENDERER)
-struct WrappedDX11Buffer
-{
-    WrappedDX11Buffer()
-        : m_pBuffer{}
-        , m_pSRV{}
-        , m_pUAV{}
-        , m_numElements{}
-        , m_elementSize{}
-        , m_elementFormat{DXGI_FORMAT_UNKNOWN}
-        , m_flags(0)
-        , m_currentBuffer{}
-    {
-    }
-
-    ~WrappedDX11Buffer();
-
-    WrappedDX11Buffer(const WrappedDX11Buffer& src);
-    WrappedDX11Buffer& operator=(const WrappedDX11Buffer& rhs);
-
-    bool operator==(const WrappedDX11Buffer& other) const;
-
-    D3DUnorderedAccessView* GetUnorderedAccessView() const
-    {
-        return m_pUAV[m_currentBuffer];
-    }
-
-    D3DShaderResourceView* GetShaderResourceView() const
-    {
-        return m_pSRV[m_currentBuffer];
-    }
-
-    void Create(uint32 numElements, uint32 elementSize, DXGI_FORMAT elementFormat, uint32 flags, const void* pData, int32 nESRAMOffset = -1);
-    void Release();
-    void UpdateBufferContent(void* pData, size_t nSize);
-
-    static const uint32_t MAX_VIEW_COUNT = 3;
-
-    D3DBuffer* m_pBuffer;
-    D3DShaderResourceView* m_pSRV[MAX_VIEW_COUNT];
-    D3DUnorderedAccessView* m_pUAV[MAX_VIEW_COUNT];
-    uint32 m_elementSize;
-    uint32 m_numElements;
-    DXGI_FORMAT m_elementFormat;
-    uint32 m_flags;
-    uint32_t m_currentBuffer;
-};
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/FencedIB.h b/Code/CryEngine/RenderDll/Common/FencedIB.h
deleted file mode 100644
index 557cd78a9b..0000000000
--- a/Code/CryEngine/RenderDll/Common/FencedIB.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-///////////////////////////////////////////////////////////////////////////////
-// Vertex Data container optmized for direct VideoMemory access on Consoles
-// No driver overhead, the lock function returns a direct pointer into Video Memory
-// which is used by the GPU
-// *NOTE: The programmer has to ensure that the Video Memory is not overwritten
-//              while beeing used. For this the container provides additional fence and
-//              wait for fence functions. Also double buffering of the container could be needed
-// *NOTE: On non console platforms, this container is using the driver facilities to ensure
-//              no memory is overwrite. This could mean additional memory allocated by the driver
-template <class IndexType>
-class FencedIB
-{
-public:
-    FencedIB(uint32 nIndexCount, uint32 nIndexStride);
-    ~FencedIB();
-
-    IndexType*      LockIB(uint32 nLockCount);
-    void                    UnlockIB();
-    HRESULT             Bind(uint32 nOffs);
-
-    uint32 GetIndexCount() const;
-
-    void SetFence();
-    void WaitForFence();
-
-private:
-    D3DBuffer*     m_pIB;
-    uint32                      m_nIndexCount;
-    IndexType*              m_pLockedData;
-    uint32                      m_nIndexStride;
-    DeviceFenceHandle   m_Fence;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-FencedIB<IndexType>::FencedIB(uint32 nIndexCount, uint32 nIndexStride)
-    : m_pIB(NULL)
-    , m_pLockedData(NULL)
-    , m_nIndexStride(nIndexStride)
-    , m_nIndexCount(nIndexCount)
-{
-    HRESULT hr = gRenDev->m_DevMan.CreateDirectAccessBuffer(m_nIndexCount, m_nIndexStride, CDeviceManager::BIND_INDEX_BUFFER, (D3DBuffer**)&m_pIB);
-    CHECK_HRESULT(hr);
-
-    gRenDev->m_DevMan.CreateFence(m_Fence);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-FencedIB<IndexType>::~FencedIB()
-{
-    UnlockIB();
-    if (m_pIB)
-    {
-        gRenDev->m_DevMan.DestroyDirectAccessBuffer((D3DBuffer*)m_pIB);
-    }
-
-    gRenDev->m_DevMan.ReleaseFence(m_Fence);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-IndexType* FencedIB<IndexType>::LockIB([[maybe_unused]] uint32 nLockCount)
-{
-    // Ensure there is enough space in the VB for this data
-    assert (nLockCount <= m_nIndexCount);
-
-    if (m_pLockedData)
-    {
-        return m_pLockedData;
-    }
-
-    if (m_pIB)
-    {
-        gRenDev->m_DevMan.LockDirectAccessBuffer((D3DBuffer*)m_pIB, CDeviceManager::BIND_INDEX_BUFFER, (void**)&m_pLockedData);
-    }
-
-    return m_pLockedData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-void FencedIB<IndexType>::UnlockIB()
-{
-    if (m_pLockedData && m_pIB)
-    {
-        gRenDev->m_DevMan.UnlockDirectAccessBuffer((D3DBuffer*)m_pIB, CDeviceManager::BIND_INDEX_BUFFER);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(FencedIB_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#   else
-        CDeviceManager::InvalidateCpuCache(m_pLockedData, 0, m_nIndexCount * m_nIndexStride);
-        CDeviceManager::InvalidateGpuCache((D3DBuffer*)m_pIB, m_pLockedData, 0, m_nIndexCount * m_nIndexStride);
-#   endif
-        m_pLockedData = NULL;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-HRESULT FencedIB<IndexType>::Bind(uint32 nOffs)
-{
-    COMPILE_TIME_ASSERT(sizeof(IndexType) == 2 || sizeof(IndexType) == 4);
-    return gcpRendD3D->FX_SetIStream(m_pIB, nOffs, (sizeof(IndexType) == 2 ? Index16 : Index32));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-uint32 FencedIB<IndexType>::GetIndexCount() const
-{
-    return m_nIndexCount;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-void FencedIB<IndexType>::SetFence()
-{
-#if BUFFER_ENABLE_DIRECT_ACCESS == 1
-    gRenDev->m_DevMan.IssueFence(m_Fence);
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class IndexType>
-void FencedIB<IndexType>::WaitForFence()
-{
-#if BUFFER_ENABLE_DIRECT_ACCESS == 1
-    gRenDev->m_DevMan.SyncFence(m_Fence, true, false);
-#endif
-}
diff --git a/Code/CryEngine/RenderDll/Common/FencedVB.h b/Code/CryEngine/RenderDll/Common/FencedVB.h
deleted file mode 100644
index 5f173ea1a1..0000000000
--- a/Code/CryEngine/RenderDll/Common/FencedVB.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-///////////////////////////////////////////////////////////////////////////////
-// Vertex Data container optmized for direct VideoMemory access on Consoles
-// No driver overhead, the lock function returns a direct pointer into Video Memory
-// which is used by the GPU
-// *NOTE: The programmer has to ensure that the Video Memory is not overwritten
-//              while beeing used. For this the container provides additional fence and
-//              wait for fence functions. Also double buffering of the container could be needed
-// *NOTE: On non console platforms, this container is using the driver facilities to ensure
-//              no memory is overwrite. This could mean additional memory allocated by the driver
-template <class VertexType>
-class FencedVB
-{
-public:
-    FencedVB(uint32 nVertexCount, uint32 nVertStride);
-    ~FencedVB();
-
-    VertexType*     LockVB(uint32 nLockCount);
-    void                    UnlockVB();
-    HRESULT             Bind(uint32 StreamNumber = 0, int nBytesOffset = 0, int nStride = 0);
-
-    uint32 GetVertexCount() const;
-
-    void SetFence();
-    void WaitForFence();
-
-private:
-    D3DBuffer*    m_pVB;
-    uint32                      m_nVertexCount;
-
-    VertexType*             m_pLockedData;
-    uint32                      m_nVertStride;
-    DeviceFenceHandle   m_Fence;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-FencedVB<VertexType>::FencedVB(uint32 nVertexCount, uint32 nVertStride)
-    : m_pVB(NULL)
-    , m_pLockedData(NULL)
-    , m_nVertStride(nVertStride)
-    , m_nVertexCount(nVertexCount)
-{
-    HRESULT hr = gRenDev->m_DevMan.CreateDirectAccessBuffer(m_nVertexCount, m_nVertStride, CDeviceManager::BIND_VERTEX_BUFFER, (D3DBuffer**)&m_pVB);
-    CHECK_HRESULT(hr);
-
-    gRenDev->m_DevMan.CreateFence(m_Fence);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-FencedVB<VertexType>::~FencedVB()
-{
-    UnlockVB();
-    if (m_pVB)
-    {
-        gRenDev->m_DevMan.DestroyDirectAccessBuffer((D3DBuffer*)m_pVB);
-    }
-
-    gRenDev->m_DevMan.ReleaseFence(m_Fence);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-VertexType* FencedVB<VertexType>::LockVB([[maybe_unused]] uint32 nLockCount)
-{
-    // Ensure there is enough space in the VB for this data
-    assert (nLockCount <= m_nVertexCount);
-
-    if (m_pLockedData)
-    {
-        return m_pLockedData;
-    }
-
-    if (m_pVB)
-    {
-        gRenDev->m_DevMan.LockDirectAccessBuffer((D3DBuffer*)m_pVB, CDeviceManager::BIND_VERTEX_BUFFER, (void**)&m_pLockedData);
-    }
-
-    return m_pLockedData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-void FencedVB<VertexType>::UnlockVB()
-{
-    if (m_pLockedData && m_pVB)
-    {
-        gRenDev->m_DevMan.UnlockDirectAccessBuffer((D3DBuffer*)m_pVB, CDeviceManager::BIND_VERTEX_BUFFER);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(FencedVB_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#   else
-        CDeviceManager::InvalidateCpuCache(m_pLockedData, 0, m_nVertexCount * m_nVertStride);
-        CDeviceManager::InvalidateGpuCache((D3DBuffer*)m_pVB, m_pLockedData, 0, m_nVertexCount * m_nVertStride);
-#   endif
-        m_pLockedData = NULL;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-HRESULT FencedVB<VertexType>::Bind(uint32 StreamNumber, int nBytesOffset, int nStride)
-{
-    HRESULT h = gcpRendD3D->FX_SetVStream(StreamNumber, m_pVB, nBytesOffset, nStride == 0 ? m_nVertStride : nStride);
-    CHECK_HRESULT(h);
-    return h;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-uint32 FencedVB<VertexType>::GetVertexCount() const
-{
-    return m_nVertexCount;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-void FencedVB<VertexType>::SetFence()
-{
-#if BUFFER_ENABLE_DIRECT_ACCESS == 1
-    gRenDev->m_DevMan.IssueFence(m_Fence);
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <class VertexType>
-void FencedVB<VertexType>::WaitForFence()
-{
-#if BUFFER_ENABLE_DIRECT_ACCESS == 1
-    gRenDev->m_DevMan.SyncFence(m_Fence, true, false);
-#endif
-}
diff --git a/Code/CryEngine/RenderDll/Common/FrameProfiler.h b/Code/CryEngine/RenderDll/Common/FrameProfiler.h
deleted file mode 100644
index 9856ffb14b..0000000000
--- a/Code/CryEngine/RenderDll/Common/FrameProfiler.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// A simple profiler useful for collecting multiple call times per frame
-// and displaying their different average statistics.
-// For usage, see the bottom of the file
-
-#pragma once
-
-#include <AzCore/Debug/Profiler.h>
-
-#define PP_CONCAT2(A, B) A##B
-#define PP_CONCAT(A, B) PP_CONCAT2(A, B)
-// set #if 0 here if you don't want profiling to be compiled in the code
-//#if 0
-#ifdef ENABLE_FRAME_PROFILER
-
-// define PROFILE_RENDERER_DETAILED for additional render device events
-// #define PROFILE_RENDERER_DETAILED
-#ifdef PROFILE_RENDERER_DETAILED
-#   define PROFILE_FRAME(id) FRAME_PROFILER_FAST("Renderer:" #id, iSystem, PROFILE_RENDERER, g_bProfilerEnabled)
-#else
-#   define PROFILE_FRAME(id)
-#endif
-
-
-#define PROFILE_PS_TIME_SCOPE(EXT) \
-    PROFILE_PS_TIME_SCOPE_COND(EXT, true)
-
-#define PROFILE_PS_TIME_SCOPE_COND(EXT, CONDITION)                                                                                                  \
-    class CProfilePSTimeScope                                                                                                                       \
-    {                                                                                                                                               \
-        bool m_bCondition;                                                                                                                          \
-        CTimeValue m_startTime;                                                                                                                     \
-    public:                                                                                                                                         \
-        CProfilePSTimeScope(bool bCondition)                                                                                                        \
-        {                                                                                                                                           \
-            m_bCondition = bCondition;                                                                                                              \
-            if (bCondition) {                                                                                                                       \
-                m_startTime = iTimer->GetAsyncTime(); }                                                                                             \
-        }                                                                                                                                           \
-        ~CProfilePSTimeScope()                                                                                                                      \
-        {                                                                                                                                           \
-            if (m_bCondition) {                                                                                                                     \
-                gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_##EXT += iTimer->GetAsyncTime().GetDifferenceInSeconds(m_startTime); } \
-        }                                                                                                                                           \
-    } PP_CONCAT(profilePSTimeScope, __LINE__)(CONDITION);
-#define PROFILE_DIPS_START                       \
-    CTimeValue TimeDIP = iTimer->GetAsyncTime(); \
-
-#define PROFILE_DIPS_END(id)                                                                                                              \
-    gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_fTimeDIPs[id] += iTimer->GetAsyncTime().GetDifferenceInSeconds(TimeDIP); \
-
-// to get around a stupid compiler bug (Win32 debug with Edit and Continue enabled) where assert can't be used
-#if defined(_DEBUG)
-#define FP_CHECK_SHADER      if (!gRenDev->m_RP.m_pShader) {__debugbreak(); }
-#else
-#define FP_CHECK_SHADER
-#endif
-
-#define PROFILE_SHADER_SCOPE                                                                                                                                                                     \
-    class CProfileShaderScope                                                                                                                                                                    \
-    {                                                                                                                                                                                            \
-        bool bProfile;                                                                                                                                                                           \
-        bool bDoEnd;                                                                                                                                                                             \
-        float time0;                                                                                                                                                                             \
-        int nNumDips;                                                                                                                                                                            \
-        int nNumPolys;                                                                                                                                                                           \
-    public:                                                                                                                                                                                      \
-        CProfileShaderScope()                                                                                                                                                                    \
-        {                                                                                                                                                                                        \
-            bDoEnd = true;                                                                                                                                                                       \
-            time0 = 0;                                                                                                                                                                           \
-            nNumDips = 0;                                                                                                                                                                        \
-            nNumPolys = 0;                                                                                                                                                                       \
-            if (CRenderer::CV_r_profileshaders == 1 || (CRenderer::CV_r_profileshaders == 2 && gRenDev->m_RP.m_pCurObject && (gRenDev->m_RP.m_pCurObject->m_ObjFlags & FOB_SELECTED)))     \
-            {                                                                                                                                                                                    \
-                bProfile = true;                                                                                                                                                                 \
-                time0 = iTimer->GetAsyncCurTime();                                                                                                                                               \
-                gRenDev->m_RP.m_fProfileTime = time0;                                                                                                                                         \
-                nNumPolys = gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_nPolygons[gRenDev->m_RP.m_nPassGroupDIP];                                                            \
-                nNumDips = gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_nDIPs[gRenDev->m_RP.m_nPassGroupDIP];                                                                 \
-            }                                                                                                                                                                                    \
-            else                                                                                                                                                                                 \
-            {                                                                                                                                                                                    \
-                bProfile = false;                                                                                                                                                                \
-            }                                                                                                                                                                                    \
-        }                                                                                                                                                                                        \
-        ~CProfileShaderScope()                                                                                                                                                                   \
-        {   End(); }                                                                                                                                                                             \
-        void End()                                                                                                                                                                               \
-        {                                                                                                                                                                                        \
-            if (!bDoEnd) {                                                                                                                                                                       \
-                return; }                                                                                                                                                                        \
-            bDoEnd = false;                                                                                                                                                                      \
-            float fTime = 0;                                                                                                                                                                     \
-            if (bProfile)                                                                                                                                                                        \
-            {                                                                                                                                                                                    \
-                float time1 = iTimer->GetAsyncCurTime();                                                                                                                                         \
-                fTime = time1 - time0;                                                                                                                                                           \
-            }                                                                                                                                                                                    \
-                                                                                                                                                                                                 \
-            if (gRenDev->m_RP.m_pShader && gRenDev->m_RP.m_pCurTechnique)                                                                                                                  \
-            {                                                                                                                                                                                    \
-                if (CRenderer::CV_r_profileshaders == 1 || (CRenderer::CV_r_profileshaders == 2 && gRenDev->m_RP.m_pCurObject && (gRenDev->m_RP.m_pCurObject->m_ObjFlags & FOB_SELECTED))) \
-                {                                                                                                                                                                                \
-                    if (time0 == gRenDev->m_RP.m_fProfileTime)                                                                                                                                \
-                    {                                                                                                                                                                            \
-                        SProfInfo pi;                                                                                                                                                            \
-                        pi.Time = fTime;                                                                                                                                                         \
-                        pi.NumPolys = gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_nPolygons[gRenDev->m_RP.m_nPassGroupDIP] - nNumPolys;                                      \
-                        pi.NumDips = gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_nDIPs[gRenDev->m_RP.m_nPassGroupDIP] - nNumDips;                                            \
-                        FP_CHECK_SHADER;                                                                                                                                                         \
-                        pi.pShader = gRenDev->m_RP.m_pShader;                                                                                                                                 \
-                        pi.pTechnique = gRenDev->m_RP.m_pCurTechnique;                                                                                                                        \
-                        pi.m_nItems = 0;                                                                                                                                                         \
-                        gRenDev->m_RP.m_Profile.AddElem(pi);                                                                                                                                  \
-                    }                                                                                                                                                                            \
-                }                                                                                                                                                                                \
-            }                                                                                                                                                                                    \
-        }                                                                                                                                                                                        \
-    } profileShaderScope;
-
-#define PROFILE_SHADER_START \
-    PROFILE_SHADER_SCOPE
-
-#define PROFILE_SHADER_END \
-    profileShaderScope.End();
-
-#else
-#define PROFILE_FRAME(id)
-#define PROFILE_SHADER_SCOPE
-#define PROFILE_SHADER_START
-#define PROFILE_SHADER_END
-#define PROFILE_PS_TIME_SCOPE(EXT)
-#define PROFILE_PS_TIME_SCOPE_COND(EXT, CONDITION)
-#define PROFILE_DIPS_START
-#define PROFILE_DIPS_END(id)
-#endif
-
-#if defined(ENABLE_FRAME_PROFILER_LABELS)
-
-// define these to instrument push/pop marker for GPU, also added to the internal profiler and CPU Markers
-    #define PROFILE_LABEL(X)
-    #define PROFILE_LABEL_PUSH(X)
-    #define PROFILE_LABEL_POP(X)
-
-// scope util class for GPU profiling Marker
-    #define PROFILE_LABEL_SCOPE(X)            \
-    AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Renderer, X); \
-    class CProfileLabelScope                  \
-    {                                         \
-        const char* m_label;                  \
-        AZ::Debug::EventTrace::ScopedSlice m_slice; \
-    public:                                   \
-        CProfileLabelScope(const char* label) \
-            : m_label(label)                  \
-            , m_slice(label, "Renderer") \
-        { PROFILE_LABEL_PUSH(label); }        \
-        ~CProfileLabelScope()                 \
-        { PROFILE_LABEL_POP(m_label); }       \
-    } PP_CONCAT(profileLabelScope, __LINE__)(X);
-
-// scope util class for GPU profiling Marker with a dynamic string name
-#define PROFILE_LABEL_SCOPE_DYNAMIC(X)            \
-    AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::Renderer, "%s", X); \
-    class CProfileLabelScope                  \
-    {                                         \
-        const char* m_label;                  \
-        AZ::Debug::EventTrace::ScopedSlice m_slice; \
-    public:                                   \
-        CProfileLabelScope(const char* label) \
-            : m_label(label)                  \
-            , m_slice(label, "Renderer") \
-        { PROFILE_LABEL_PUSH(label); }        \
-        ~CProfileLabelScope()                 \
-        { PROFILE_LABEL_POP(m_label); }       \
-    } PP_CONCAT(profileLabelScope, __LINE__)(X);
-
-#else
-    #define PROFILE_LABEL(X)
-    #define PROFILE_LABEL_PUSH(X)
-    #define PROFILE_LABEL_POP(X)
-    #define PROFILE_LABEL_SCOPE(X)
-#endif
-
-#define PROFILE_LABEL_SHADER(X) PROFILE_LABEL(X)
-
-
-#if defined(ENABLE_FRAME_PROFILER) && !defined(_RELEASE)
-    #define FUNCTION_PROFILER_RENDER_FLAT \
-        FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_RENDERER) \
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::RendererDetailed)
-#else
-    #define FUNCTION_PROFILER_RENDER_FLAT
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/IColorGradingControllerInt.h b/Code/CryEngine/RenderDll/Common/IColorGradingControllerInt.h
deleted file mode 100644
index 117596c7bd..0000000000
--- a/Code/CryEngine/RenderDll/Common/IColorGradingControllerInt.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <IColorGradingController.h>
-
-
-struct IColorGradingControllerInt
-    : public IColorGradingController
-{
-    virtual void RT_SetLayers(const SColorChartLayer* pLayers, uint32 numLayers) = 0;
-};
diff --git a/Code/CryEngine/RenderDll/Common/Include_HLSL_CPP_Shared.h b/Code/CryEngine/RenderDll/Common/Include_HLSL_CPP_Shared.h
deleted file mode 100644
index 78c9657918..0000000000
--- a/Code/CryEngine/RenderDll/Common/Include_HLSL_CPP_Shared.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-#ifdef __cplusplus
-// C++
-    #pragma once
-    #pragma pack(push,4)
-
-    #define hlsl_cbuffer(name)                struct HLSL_##name
-    #define hlsl_cbuffer_register(name, reg, slot) \
-    enum { SLOT_##name = slot };                   \
-    struct HLSL_##name
-       
-    #define hlsl_int(member)                  int32    member
-    #define hlsl_int2(member)                 Vec2i    member
-    #define hlsl_int3(member)                 Vec3i    member
-    #define hlsl_int4(member)                 Vec4i    member
-    #define hlsl_uint(member)                 uint32   member
-    #define hlsl_uint2(member)                Vec2ui   member
-    #define hlsl_uint3(member)                Vec3ui   member
-    #define hlsl_uint4(member)                Vec4ui   member
-    #define hlsl_float(member)                float    member
-    #define hlsl_float2(member)               Vec2     member
-    #define hlsl_float3(member)               Vec3     member
-    #define hlsl_float4(member)               Vec4     member
-    #define hlsl_matrix44(member)             Matrix44 member
-    #define hlsl_matrix34(member)             Matrix34 member
-#else //__cplusplus
-// HLSL
-    #define hlsl_cbuffer(name)                cbuffer  name
-    #define hlsl_cbuffer_register(name, reg, float)   cbuffer  name: reg
-    #define hlsl_int(member)                  int      member
-    #define hlsl_int2(member)                 int2     member
-    #define hlsl_int3(member)                 int3     member
-    #define hlsl_int4(member)                 int4     member
-    #define hlsl_uint(member)                 uint     member
-    #define hlsl_uint2(member)                uint2    member
-    #define hlsl_uint3(member)                uint3    member
-    #define hlsl_uint4(member)                uint4    member
-    #define hlsl_float(member)                float    member
-    #define hlsl_float2(member)               float2   member
-    #define hlsl_float3(member)               float3   member
-    #define hlsl_float4(member)               float4   member
-    #define hlsl_matrix44(member)             float4x4 member
-    #define hlsl_matrix34(member)             float3x4 member
-#endif //__cplusplus
-
-// TODO: include in shaders
-
-hlsl_cbuffer(PerPassConstantBuffer_GBuffer)
-{
-    hlsl_float4(g_VS_WorldViewPos);
-    hlsl_matrix44(g_VS_ViewProjMatr);
-    hlsl_matrix44(g_VS_ViewProjZeroMatr);
-};
-
-#if defined(FEATURE_SVO_GI)
-hlsl_cbuffer(PerPassConstantBuffer_Svo)
-{
-    hlsl_float4(PerPass_SvoTreeSettings0);
-    hlsl_float4(PerPass_SvoTreeSettings1);
-    hlsl_float4(PerPass_SvoParams0);
-    hlsl_float4(PerPass_SvoParams1);
-    hlsl_float4(PerPass_SvoParams2);
-    hlsl_float4(PerPass_SvoParams3);
-    hlsl_float4(PerPass_SvoParams4);
-    hlsl_float4(PerPass_SvoParams5);
-    hlsl_float4(PerPass_SvoParams6);
-};
-#endif
-
-hlsl_cbuffer(PerSubPassConstantBuffer_ShadowGen)
-{
-    hlsl_float4(PerShadow_LightPos);
-    hlsl_float4(PerShadow_ViewPos);
-    hlsl_float4(PerShadow_FrustumInfo);
-    hlsl_float4(PerShadow_BiasInfo);
-};
-
-hlsl_cbuffer(PerInstanceConstantBuffer)
-{
-    hlsl_matrix34(SPIObjWorldMat);
-    hlsl_float4(SPIBendInfo);
-    hlsl_float4(SPIBendInfoPrev);
-    hlsl_float4(SPIAmbientOpacity);
-    hlsl_float4(SPIDissolveRef);
-};
-
-hlsl_cbuffer(PerViewConstantBuffer)
-{
-    hlsl_float4(PerView_WorldViewPos);
-    hlsl_float4(PerView_WorldViewPosPrev);
-    hlsl_matrix44(PerView_ViewProjZeroMatr);
-    hlsl_matrix44(PerView_ViewProjZeroMatrPrev);
-    hlsl_matrix44(PerView_ViewProjZeroMatrPrevNearest);
-    hlsl_float4(PerView_AnimGenParams);
-
-    hlsl_float4(PerView_ViewBasisX);
-    hlsl_float4(PerView_ViewBasisY);
-    hlsl_float4(PerView_ViewBasisZ);
-
-    hlsl_matrix44(PerView_ViewProjMatr);
-    hlsl_matrix44(PerView_ViewProjMatrPrev);
-    hlsl_matrix44(PerView_ViewMatr);
-    hlsl_matrix44(PerView_ProjMatr);
-    hlsl_float4(PerView_TessellationParams);
-
-    hlsl_float4(PerView_ScreenSize);
-    hlsl_float4(PerView_HPosScale);
-    hlsl_float4(PerView_ProjRatio);
-    hlsl_float4(PerView_NearestScaled);
-    hlsl_float4(PerView_NearFarClipDist);
-
-    hlsl_float4(PerView_FogColor);
-
-    hlsl_matrix44(PerView_FrustumPlaneEquation);
-    hlsl_float4(PerView_JitterParams);
-};
-
-hlsl_cbuffer(PerFrameConstantBuffer)
-{
-    hlsl_float4(PerFrame_VolumetricFogParams);
-    hlsl_float4(PerFrame_VolumetricFogRampParams);
-    hlsl_float4(PerFrame_VolumetricFogColorGradientBase);
-    hlsl_float4(PerFrame_VolumetricFogColorGradientDelta);
-    hlsl_float4(PerFrame_VolumetricFogColorGradientParams);
-    hlsl_float4(PerFrame_VolumetricFogColorGradientRadial);
-    hlsl_float4(PerFrame_VolumetricFogSamplingParams);
-    hlsl_float4(PerFrame_VolumetricFogDistributionParams);
-    hlsl_float4(PerFrame_VolumetricFogScatteringParams);
-    hlsl_float4(PerFrame_VolumetricFogScatteringBlendParams);
-    hlsl_float4(PerFrame_VolumetricFogScatteringColor);
-    hlsl_float4(PerFrame_VolumetricFogScatteringSecondaryColor);
-    hlsl_float4(PerFrame_VolumetricFogHeightDensityParams);
-    hlsl_float4(PerFrame_VolumetricFogHeightDensityRampParams);
-    hlsl_float4(PerFrame_VolumetricFogDistanceParams);
-    hlsl_float4(PerFrame_VolumetricFogGlobalEnvProbe0);
-    hlsl_float4(PerFrame_VolumetricFogGlobalEnvProbe1);
-
-    hlsl_float4(PerFrame_SvoLightingParams);
-
-    hlsl_float4(PerFrame_Time);
-
-    hlsl_float4(PerFrame_SunColor);
-    hlsl_float4(PerFrame_SunDirection);
-    hlsl_float4(PerFrame_HDRParams);
-
-    hlsl_float4(PerFrame_CloudShadingColorSun);
-    hlsl_float4(PerFrame_CloudShadingColorSky);
-    hlsl_float4(PerFrame_CloudShadowParams);
-    hlsl_float4(PerFrame_CloudShadowAnimParams);
-
-    hlsl_float4(PerFrame_CausticsSmoothSunDirection);
-
-    hlsl_float4(PerFrame_DecalZFightingRemedy);
-    hlsl_float4(PerFrame_WaterLevel);
-
-    hlsl_float4(PerFrame_StereoParams);
-    hlsl_float4(PerFrame_RandomParams);
-
-    hlsl_uint4(PerFrame_MultiLayerAlphaBlendLayerData);
-};
-
-#ifdef __cplusplus
-// C++
-    #pragma pack(pop)
-
-#else //__cplusplus
-// HLSL
-
-#endif //__cplusplus
diff --git a/Code/CryEngine/RenderDll/Common/Memory/VRAMDriller.cpp b/Code/CryEngine/RenderDll/Common/Memory/VRAMDriller.cpp
deleted file mode 100644
index b91bea8e8f..0000000000
--- a/Code/CryEngine/RenderDll/Common/Memory/VRAMDriller.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <Common/Memory/VRAMDriller.h>
-#include <AzCore/Math/Crc.h>
-
-namespace Render
-{
-    namespace Debug
-    {
-        //=========================================================================
-
-        struct VRAMCategoryInfo
-        {
-            VRAMAllocationCategory m_category = VRAM_CATEGORY_INVALID;
-            const char* m_categoryName = nullptr;
-            VRAMSubCategoryType m_subcategories;
-        };
-
-        struct VRAMAllocationInfo
-        {
-            void* m_address = nullptr;
-            size_t m_byteSize = 0;
-            string m_allocationName;
-            VRAMAllocationCategory m_category = VRAM_CATEGORY_INVALID;
-            VRAMAllocationSubcategory m_subcategory = VRAM_SUBCATEGORY_INVALID;
-        };
-
-        typedef AZStd::unordered_map<VRAMAllocationCategory, VRAMCategoryInfo, AZStd::hash<VRAMAllocationCategory>, AZStd::equal_to<VRAMAllocationCategory>, AZ::OSStdAllocator> VRAMCategoryType;
-        typedef AZStd::unordered_map<void*, VRAMAllocationInfo, AZStd::hash<void*>, AZStd::equal_to<void*>, AZ::OSStdAllocator> VRAMAllocationRecordsType;
-
-        /**
-         * VRAMDrillerAllocations: A class that tracks VRAM allocations and categories/subcategories for the allocations
-         */
-        class VRAMDrillerAllocations
-        {
-            friend class VRAMDriller;
-            AZ_CLASS_ALLOCATOR(VRAMDrillerAllocations, AZ::OSAllocator, 0)
-
-        public:
-
-            VRAMDrillerAllocations() {}
-            ~VRAMDrillerAllocations()
-            {
-                m_allocations.clear();
-            }
-
-            //=========================================================================
-
-            const VRAMCategoryInfo* RegisterCategory(VRAMAllocationCategory category, const char* categoryName, const VRAMSubCategoryType& subcategories)
-            {
-                AZ_Assert(category < VRAM_CATEGORY_INVALID, ("Error, invalid VRAM category"));
-
-                // Insert and populate the category
-                VRAMCategoryType::pair_iter_bool iterBool = m_categories.insert_key(category);
-                AZ_Assert(iterBool.second, "VRAM category %u is already registered!", category);
-
-                VRAMCategoryInfo& categoryInfo = iterBool.first->second;
-                categoryInfo.m_category = category;
-                categoryInfo.m_categoryName = categoryName;
-                categoryInfo.m_subcategories = subcategories;
-
-                return &categoryInfo;
-            }
-
-            void UnregisterAllCategories(AZ::Debug::DrillerOutputStream* output)
-            {
-                // Skip if we have no active output
-                if (output != nullptr)
-                {
-                    for (AZStd::pair<VRAMAllocationCategory, VRAMCategoryInfo> currentCategory : m_categories)
-                    {
-                        output->BeginTag(AZ_CRC("VRAMDriller"));
-                        output->BeginTag(AZ_CRC("UnregisterCategory"));
-                        output->Write(AZ_CRC("Category"), static_cast<unsigned int>(currentCategory.first));
-                        output->EndTag(AZ_CRC("UnregisterCategory"));
-                        output->EndTag(AZ_CRC("VRAMDriller"));
-                    }
-                }
-                m_categories.clear();
-            }
-
-            const VRAMCategoryType& GetCategoriesMap()
-            {
-                return m_categories;
-            }
-
-            //=========================================================================
-
-            const VRAMAllocationInfo* RegisterAllocation(void* address, size_t byteSize, const char* allocationName, VRAMAllocationCategory category, VRAMAllocationSubcategory subcategory)
-            {
-                AZ_Assert(address, ("Error, allocation address is null"));
-
-                // Insert and populate the allocation record
-                VRAMAllocationRecordsType::pair_iter_bool iterBool = m_allocations.insert_key(address);
-
-                // Turning off the VRAMDriller altogether causes weird allocation errors
-                AZ_Warning("Driller", iterBool.second, "VRAM memory address 0x%p is already allocated and being tracked! VRAM memory reporting may now be inaccurate.", address);
-
-                VRAMAllocationInfo& allocationInfo = iterBool.first->second;
-                allocationInfo.m_byteSize =  byteSize;
-                allocationInfo.m_allocationName = allocationName;
-                allocationInfo.m_category = category;
-                allocationInfo.m_subcategory = subcategory;
-                
-                // Update simple tracking statistics
-                m_simpleAllocationStatistics[category][subcategory].m_allocatedBytes += byteSize;
-                m_simpleAllocationStatistics[category][subcategory].m_numberAllocations++;
-
-                return &allocationInfo;
-            }
-
-            void UnregisterAllocation(void* address)
-            {
-                VRAMAllocationRecordsType::iterator iter = m_allocations.find(address);
-
-                // Turning off the VRAMDriller altogether causes weird allocation errors
-                AZ_Warning("Driller", iter != m_allocations.end(), "VRAM memory address 0x%p does not exist in the records. VRAM memory reporting may now be inaccurate.", address);
-                
-                if ( iter != m_allocations.end() )
-                {
-                    // Update simple tracking statistics
-                    VRAMAllocationInfo& allocationInfo = iter->second;
-                    m_simpleAllocationStatistics[allocationInfo.m_category][allocationInfo.m_subcategory].m_allocatedBytes -= allocationInfo.m_byteSize;
-                    m_simpleAllocationStatistics[allocationInfo.m_category][allocationInfo.m_subcategory].m_numberAllocations--;
-
-                    m_allocations.erase(iter);
-                }
-            }
-
-            const VRAMAllocationRecordsType& GetAllocationsMap()
-            {
-                return m_allocations;
-            }
-
-            //=========================================================================
-
-            struct SimpleAllocationStatistics
-            {
-                size_t m_allocatedBytes = 0;
-                size_t m_numberAllocations = 0;
-            };
-
-            SimpleAllocationStatistics m_simpleAllocationStatistics[VRAM_CATEGORY_NUMBER_CATEGORIES][VRAM_SUBCATEGORY_NUMBER_SUBCATEGORIES];
-
-        private:
-
-            VRAMCategoryType m_categories;
-            VRAMAllocationRecordsType m_allocations;
-        };
-
-        //=========================================================================
-
-        VRAMDriller::VRAMDriller()
-        {
-#if PLATFORM_MEMORY_INSTRUMENTATION_ENABLED
-            m_platformMemoryInstrumentationRootGroupId = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationRootGroupId, "VRAM", AZ::PlatformMemoryInstrumentation::m_groupRoot);
-
-            m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_TEXTURE] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_TEXTURE], "Texture", m_platformMemoryInstrumentationRootGroupId);
-            m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_BUFFER] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_BUFFER], "Buffer", m_platformMemoryInstrumentationRootGroupId);
-            m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_MISC] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_MISC], "Misc", m_platformMemoryInstrumentationRootGroupId);
-
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_TEXTURE_RENDERTARGET] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_TEXTURE_RENDERTARGET], "Render Target", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_TEXTURE]);
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_TEXTURE_TEXTURE] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_TEXTURE_TEXTURE], "Texture", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_TEXTURE]);
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_TEXTURE_DYNAMIC] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_TEXTURE_DYNAMIC], "Dynamic", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_TEXTURE]);
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER], "Vertex Buffer", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_BUFFER]);
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER], "Index Buffer", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_BUFFER]);
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_CONSTANT_BUFFER] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_CONSTANT_BUFFER], "Constant Buffer", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_BUFFER]);
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_OTHER_BUFFER] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_BUFFER_OTHER_BUFFER], "Other Buffer", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_BUFFER]);
-            m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_MISC_OTHER] = AZ::PlatformMemoryInstrumentation::GetNextGroupId();
-            AZ::PlatformMemoryInstrumentation::RegisterGroup(m_platformMemoryInstrumentationSubcategoryIds[VRAM_SUBCATEGORY_MISC_OTHER], "Misc", m_platformMemoryInstrumentationCategoryIds[VRAM_CATEGORY_MISC]);
-#endif
-            BusConnect();
-        }
-
-        VRAMDriller::~VRAMDriller()
-        {
-            BusDisconnect();
-        }
-
-        const char* VRAMDriller::GroupName() const
-        {
-            return "RenderingDrillers";
-        }
-
-        const char* VRAMDriller::GetName() const
-        {
-            return "VRAMDriller";
-        }
-
-        const char* VRAMDriller::GetDescription() const
-        {
-            return "Reports all VRAM memory allocations.";
-        }
-
-        void VRAMDriller::Start(const Param* params, int numParams)
-        {
-            (void)params;
-            (void)numParams;
-
-            if (m_allocations)
-            {
-                const VRAMCategoryType& categoriesMap = m_allocations->GetCategoriesMap();
-                for (VRAMCategoryType::const_iterator iter = categoriesMap.begin(); iter != categoriesMap.end(); ++iter)
-                {
-                    RegisterCategoryOutput(iter->first, &iter->second);
-                }
-
-                const VRAMAllocationRecordsType& allocationMap = m_allocations->GetAllocationsMap();
-                for (VRAMAllocationRecordsType::const_iterator iter = allocationMap.begin(); iter != allocationMap.end(); ++iter)
-                {
-                    RegisterAllocationOutput(iter->first, &iter->second);
-                }
-            }
-        }
-
-        void VRAMDriller::Stop()
-        {
-        }
-
-        void VRAMDriller::CreateAllocationRecords([[maybe_unused]] unsigned char stackRecordLevels, [[maybe_unused]] bool isMemoryGuard, [[maybe_unused]] bool isMarkUnallocatedMemory)
-        {
-            AZ_Assert(m_allocations == nullptr, "Allocation records for the VRAMDriller already exist");
-            m_allocations = aznew VRAMDrillerAllocations();
-        }
-
-        void VRAMDriller::DestroyAllocationRecords()
-        {
-            AZ_Assert(m_allocations != nullptr, "Allocation records for the VRAMDriller do not exist");
-            delete m_allocations;
-            m_allocations = nullptr;
-        }
-
-        //=========================================================================
-
-        void VRAMDriller::RegisterAllocation(void* address, size_t byteSize, const char* allocationName, VRAMAllocationCategory category, VRAMAllocationSubcategory subcategory)
-        {
-            AZ_Assert(category != VRAM_CATEGORY_INVALID, "Invalid VRAM allocation category");
-            AZ_Assert(subcategory != VRAM_SUBCATEGORY_INVALID, "No subcategory provided for VRAM Allocation");
-
-#if PLATFORM_MEMORY_INSTRUMENTATION_ENABLED
-            AZ::PlatformMemoryInstrumentation::Alloc(address, byteSize, 0, m_platformMemoryInstrumentationSubcategoryIds[subcategory]);
-#else
-            AZ_Assert(m_allocations != nullptr, "Allocation records for the VRAMDriller do not exist!");
-
-            const VRAMAllocationInfo* info = m_allocations->RegisterAllocation(address, byteSize, allocationName, category, subcategory);
-            // Skip if we have no active output
-            if (m_output == nullptr)
-            {
-                return;
-            }
-
-            RegisterAllocationOutput(address, info);
-#endif
-        }
-
-        void VRAMDriller::RegisterAllocationOutput(void* address, const VRAMAllocationInfo* info)
-        {
-            AZ_Assert(m_output != nullptr, ("The DrillerOutputStream is null"));
-
-            m_output->BeginTag(AZ_CRC("VRAMDriller"));
-            m_output->BeginTag(AZ_CRC("RegisterAllocation", 0x992a9780));
-            m_output->Write(AZ_CRC("Address", 0x0d4e6f81), address);
-            m_output->Write(AZ_CRC("Category"), static_cast<unsigned int>(info->m_category));
-            m_output->Write(AZ_CRC("Subcategory"), static_cast<unsigned int>(info->m_subcategory));
-            m_output->Write(AZ_CRC("Name", 0x5e237e06), info->m_allocationName.c_str());
-            m_output->Write(AZ_CRC("Size", 0xf7c0246a), info->m_byteSize);
-            m_output->EndTag(AZ_CRC("RegisterAllocation", 0x992a9780));
-            m_output->EndTag(AZ_CRC("VRAMDriller"));
-        }
-
-        void VRAMDriller::UnregisterAllocation(void* address)
-        {
-#if PLATFORM_MEMORY_INSTRUMENTATION_ENABLED
-            AZ::PlatformMemoryInstrumentation::Free(address);
-#else
-            AZ_Assert(m_allocations != nullptr, "Allocation records for the VRAMDriller do not exist!");
-            m_allocations->UnregisterAllocation(address);
-
-            // Skip if the driller is not actively capturing
-            if (m_output == nullptr)
-            {
-                return;
-            }
-
-            m_output->BeginTag(AZ_CRC("VRAMDriller"));
-            m_output->BeginTag(AZ_CRC("UnRegisterAllocation", 0xea5dc4cd));
-            m_output->Write(AZ_CRC("Address", 0x0d4e6f81), address);
-            m_output->EndTag(AZ_CRC("UnRegisterAllocation", 0xea5dc4cd));
-            m_output->EndTag(AZ_CRC("VRAMDriller"));
-#endif
-        }
-
-        //=========================================================================
-
-        void VRAMDriller::RegisterCategory(VRAMAllocationCategory category, const char* categoryName, const VRAMSubCategoryType& subcategories)
-        {
-            AZ_Assert(m_allocations != nullptr, "Allocation records for the VRAMDriller do not exist!");
-            AZ_Assert(category != VRAM_CATEGORY_INVALID, "Invalid VRAM allocation category");
-            AZ_Assert(subcategories.size(), "No subcategory provided for VRAM category");
-
-            const VRAMCategoryInfo* info = m_allocations->RegisterCategory(category, categoryName, subcategories);
-
-            // Skip if the driller is not actively capturing
-            if (m_output == nullptr)
-            {
-                return;
-            }
-
-            RegisterCategoryOutput(category, info);
-        }
-
-        void VRAMDriller::RegisterCategoryOutput(VRAMAllocationCategory category, const VRAMCategoryInfo* info)
-        {
-            AZ_Assert(m_output != nullptr, ("The DrillerOutputStream is null"));
-            AZ_Assert(info != nullptr, ("The VRAMCategoryInfo is null"));
-
-            m_output->BeginTag(AZ_CRC("VRAMDriller"));
-            m_output->BeginTag(AZ_CRC("RegisterCategory"));
-            m_output->Write(AZ_CRC("Category"), static_cast<unsigned int>(category));
-            m_output->Write(AZ_CRC("CategoryName"), info->m_categoryName);
-
-            for (VRAMSubCategoryType::const_iterator iter = info->m_subcategories.begin(); iter != info->m_subcategories.end(); ++iter)
-            {
-                const VRAMSubcategory* subcategoryInfo = iter;
-                m_output->Write(AZ_CRC("SubcategoryId"), static_cast<unsigned int>(subcategoryInfo->m_subcategoryId));
-                m_output->Write(AZ_CRC("SubcategoryName"), subcategoryInfo->m_subcategoryName);
-            }
-
-            m_output->EndTag(AZ_CRC("RegisterCategory"));
-            m_output->EndTag(AZ_CRC("VRAMDriller"));
-        }
-
-        void VRAMDriller::UnregisterAllCategories()
-        {
-            AZ_Assert(m_allocations != nullptr, "Allocation records for the VRAMDriller do not exist!");
-            m_allocations->UnregisterAllCategories(m_output);
-        }
-
-        //=========================================================================
-
-        void VRAMDriller::GetCurrentVRAMStats(VRAMAllocationCategory category, VRAMAllocationSubcategory subcategory, AZStd::string& categoryName, AZStd::string& subcategoryName, size_t& numberBytesAllocated, size_t& numberAllocations)
-        {
-            // Verify the category exists
-            const VRAMCategoryType& categoriesMap = m_allocations->GetCategoriesMap();
-            auto categoryIter = categoriesMap.find(category);
-            if (categoryIter != categoriesMap.end())
-            {
-                // Get the category and subcategory names
-                const VRAMCategoryInfo& categoryInfo = categoryIter->second;
-                categoryName = categoryInfo.m_categoryName;
-
-                subcategoryName = "INVALID_SUBCATEGORY";
-                for (int subCat=0; subCat<categoryInfo.m_subcategories.size(); ++subCat)
-                {
-                    if (categoryInfo.m_subcategories[subCat].m_subcategoryId == subcategory)
-                    {
-                        subcategoryName = categoryInfo.m_subcategories[subCat].m_subcategoryName;
-                        break;
-                    }
-                }
-                    
-                // Get the basic allocation statistics
-                VRAMDrillerAllocations::SimpleAllocationStatistics& stats = m_allocations->m_simpleAllocationStatistics[category][subcategory];
-                numberBytesAllocated = stats.m_allocatedBytes;
-                numberAllocations = stats.m_numberAllocations;
-            }
-        }
-
-        //=========================================================================
-
-    }// namespace Debug
-} // namespace Render
diff --git a/Code/CryEngine/RenderDll/Common/Memory/VRAMDriller.h b/Code/CryEngine/RenderDll/Common/Memory/VRAMDriller.h
deleted file mode 100644
index 837744ebad..0000000000
--- a/Code/CryEngine/RenderDll/Common/Memory/VRAMDriller.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLER_H 1
-
-#include <AzCore/Driller/Driller.h>
-#include <Common/Memory/VRAMDrillerBus.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/Memory/PlatformMemoryInstrumentation.h>
-
-namespace Render
-{
-    namespace Debug
-    {
-        /**
-         * VRAMDriller: A class that tracks VRAM allocations and communicates with the Driller
-         * to log and generate reports for the allocations.
-         */
-        class VRAMDriller
-            : public AZ::Debug::Driller
-            , public VRAMDrillerBus::Handler
-        {
-        public:
-            AZ_CLASS_ALLOCATOR(VRAMDriller, AZ::OSAllocator, 0)
-
-            VRAMDriller();
-            ~VRAMDriller();
-
-            void CreateAllocationRecords(unsigned char stackRecordLevels, bool isMemoryGuard, bool isMarkUnallocatedMemory);
-            void DestroyAllocationRecords();
-
-        protected:
-            //////////////////////////////////////////////////////////////////////////
-            // Driller
-            virtual const char*  GroupName() const;
-            virtual const char*  GetName() const;
-            virtual const char*  GetDescription() const;
-            virtual void         Start(const Param* params = NULL, int numParams = 0);
-            virtual void         Stop();
-            //////////////////////////////////////////////////////////////////////////
-
-            //////////////////////////////////////////////////////////////////////////
-            // VRAMDrillerBus
-            virtual void RegisterCategory(VRAMAllocationCategory category, const char* categoryName, const VRAMSubCategoryType& subcategories);
-            virtual void UnregisterAllCategories();
-            virtual void RegisterAllocation(void* address, size_t byteSize, const char* allocationName, VRAMAllocationCategory category, VRAMAllocationSubcategory subcategory);
-            virtual void UnregisterAllocation(void* address);
-            virtual void GetCurrentVRAMStats(VRAMAllocationCategory category, VRAMAllocationSubcategory subcategory, AZStd::string& categoryName, AZStd::string& subcategoryName, size_t& numberBytesAllocated, size_t& numberAllocations);
-            //////////////////////////////////////////////////////////////////////////
-
-            // Subfunctions of RegisterCategory and RegisterAllocation.
-            // Split out due to these parts being called in from both of those functions and the Start function
-            void RegisterCategoryOutput(VRAMAllocationCategory category, const struct VRAMCategoryInfo* info);
-            void RegisterAllocationOutput(void* address, const struct VRAMAllocationInfo* info);
-
-        private:
-
-#if PLATFORM_MEMORY_INSTRUMENTATION_ENABLED
-            uint16_t m_platformMemoryInstrumentationRootGroupId = 0;
-            uint16_t m_platformMemoryInstrumentationCategoryIds[Render::Debug::VRAM_CATEGORY_NUMBER_CATEGORIES] = { 0 };
-            uint16_t m_platformMemoryInstrumentationSubcategoryIds[Render::Debug::VRAM_SUBCATEGORY_NUMBER_SUBCATEGORIES] = { 0 };
-#endif
-            class VRAMDrillerAllocations* m_allocations = nullptr;
-        };
-    } // namespace Debug
-} // namespace Render
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLER_H
-#pragma once
diff --git a/Code/CryEngine/RenderDll/Common/Memory/VRAMDrillerBus.h b/Code/CryEngine/RenderDll/Common/Memory/VRAMDrillerBus.h
deleted file mode 100644
index ba779b2e54..0000000000
--- a/Code/CryEngine/RenderDll/Common/Memory/VRAMDrillerBus.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H 1
-
-#include <AzCore/Driller/DrillerBus.h>
-
-namespace Render
-{
-    namespace Debug
-    {
-        enum VRAMAllocationCategory
-        {
-            VRAM_CATEGORY_TEXTURE,
-            VRAM_CATEGORY_BUFFER,
-            VRAM_CATEGORY_MISC,
-
-            VRAM_CATEGORY_NUMBER_CATEGORIES,
-            VRAM_CATEGORY_INVALID = VRAM_CATEGORY_NUMBER_CATEGORIES
-        };
-
-        enum VRAMAllocationSubcategory
-        {
-            VRAM_SUBCATEGORY_TEXTURE_RENDERTARGET,      // Rendertarget allocations
-            VRAM_SUBCATEGORY_TEXTURE_TEXTURE,           // Texture resources loaded from a file
-            VRAM_SUBCATEGORY_TEXTURE_DYNAMIC,           // Texture created dynamically at runtime (staging or CPU-updated)
-
-            VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER,      // Vertex buffers
-            VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER,       // Index buffers
-            VRAM_SUBCATEGORY_BUFFER_CONSTANT_BUFFER,    // Constant buffers
-            VRAM_SUBCATEGORY_BUFFER_OTHER_BUFFER,       // Other buffers
-
-            VRAM_SUBCATEGORY_MISC_OTHER,                // Other
-
-            VRAM_SUBCATEGORY_NUMBER_SUBCATEGORIES,
-            VRAM_SUBCATEGORY_INVALID = VRAM_SUBCATEGORY_NUMBER_SUBCATEGORIES,
-        };
-
-        struct VRAMSubcategory
-        {
-            VRAMSubcategory(VRAMAllocationSubcategory subcategoryId, const char* subcategoryName)
-                : m_subcategoryId(subcategoryId)
-                , m_subcategoryName(subcategoryName)
-            {}
-
-            VRAMAllocationSubcategory m_subcategoryId = VRAM_SUBCATEGORY_INVALID;
-            const char* m_subcategoryName = nullptr;
-        };
-
-        typedef AZStd::vector<VRAMSubcategory, AZ::OSStdAllocator> VRAMSubCategoryType;
-        
-        /**
-         * VRAM allocations driller message.
-         *
-         * We use a driller bus so all messages are sending in exclusive matter no other driller messages
-         * can be triggered at that moment, so we already preserve the calling order. You can assume
-         * all access code in the driller framework in guarded. You can manually lock the driller mutex are you
-         * use by using \ref AZ::Debug::DrillerEBusMutex.
-         */
-        class VRAMDrillerMessages
-            : public AZ::Debug::DrillerEBusTraits
-        {
-        public:
-            virtual ~VRAMDrillerMessages() {}
-
-            // Register a category with a set of subcategories.  A category
-            virtual void RegisterCategory(VRAMAllocationCategory category, const char* categoryName, const VRAMSubCategoryType& subcategories) = 0;
-            virtual void UnregisterAllCategories() = 0;
-
-            // Functions for registering and unregistering individual VRAM allocations
-            virtual void RegisterAllocation(void* address, size_t byteSize, const char* allocationName, VRAMAllocationCategory category, VRAMAllocationSubcategory subcategories) = 0;
-            virtual void UnregisterAllocation(void* address) = 0;
-
-            // Query the most up-to-date information about a specific category and subcategory.
-            // Returns the category and subcategory names, the number of currently allocated bytes and the current number of allocations
-            virtual void GetCurrentVRAMStats(VRAMAllocationCategory category, VRAMAllocationSubcategory subcategory, AZStd::string& categoryName, AZStd::string& subcategoryName, size_t& numberBytesAllocated, size_t& numberAllocations) = 0;
-        };
-
-        typedef AZ::EBus<VRAMDrillerMessages> VRAMDrillerBus;
-    } // namespace Debug
-} // namespace Render
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H
-#pragma once
diff --git a/Code/CryEngine/RenderDll/Common/OcclQuery.h b/Code/CryEngine/RenderDll/Common/OcclQuery.h
deleted file mode 100644
index 82edb5c131..0000000000
--- a/Code/CryEngine/RenderDll/Common/OcclQuery.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_OCCLQUERY_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_OCCLQUERY_H
-#pragma once
-
-class COcclusionQuery
-{
-public:
-    COcclusionQuery()
-        : m_nVisSamples(~0)
-        , m_nCheckFrame(0)
-        , m_nDrawFrame(0)
-        , m_nOcclusionID(0)
-    {
-    }
-
-    ~COcclusionQuery()
-    {
-        Release();
-    }
-
-    void Create();
-    void Release();
-
-    void BeginQuery();
-    void EndQuery();
-
-    uint32 GetVisibleSamples(bool bAsynchronous);
-
-    int GetDrawFrame() const
-    {
-        return m_nDrawFrame;
-    }
-
-    bool IsReady();
-
-    bool IsCreated() const { return m_nOcclusionID != 0; }
-
-private:
-
-    int m_nVisSamples;
-    int m_nCheckFrame;
-    int m_nDrawFrame;
-
-    UINT_PTR m_nOcclusionID; // this will carry a pointer D3DQuery, so it needs to be 64-bit on Windows 64
-};
-
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_OCCLQUERY_H
diff --git a/Code/CryEngine/RenderDll/Common/PerInstanceConstantBufferPool.cpp b/Code/CryEngine/RenderDll/Common/PerInstanceConstantBufferPool.cpp
deleted file mode 100644
index f2475c0b48..0000000000
--- a/Code/CryEngine/RenderDll/Common/PerInstanceConstantBufferPool.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "PerInstanceConstantBufferPool.h"
-#include "DevBuffer.h"
-#include "RenderView.h"
-#include "RenderPipeline.h"
-#include "Include_HLSL_CPP_Shared.h"
-
-#if !defined(NULL_RENDERER)
-#include "DriverD3D.h"
-#endif
-
-namespace
-{
-    void BuildPerInstanceConstantBuffer(HLSL_PerInstanceConstantBuffer* outBuffer, CRenderObject* renderObject, float realTime, float realTimePrev)
-    {
-        AZ::u64 objectFlags = renderObject->m_ObjFlags;
-
-        outBuffer->SPIObjWorldMat = renderObject->GetMatrix();
-
-        SBending* bending = renderObject->m_data.m_pBending;
-        if (bending != nullptr)
-        {
-            outBuffer->SPIBendInfo = bending->GetShaderConstants(realTime);
-        }
-
-        bending = renderObject->m_data.m_BendingPrev;
-        if (bending != nullptr)
-        {
-            outBuffer->SPIBendInfoPrev = bending->GetShaderConstants(realTimePrev);
-        }
-
-        outBuffer->SPIAmbientOpacity.x = renderObject->m_II.m_AmbColor.r;
-        outBuffer->SPIAmbientOpacity.y = renderObject->m_II.m_AmbColor.g;
-        outBuffer->SPIAmbientOpacity.z = renderObject->m_II.m_AmbColor.b;
-        outBuffer->SPIAmbientOpacity.w = renderObject->m_fAlpha;
-
-        const bool bDissolve = (objectFlags & (FOB_DISSOLVE_OUT | FOB_DISSOLVE)) != 0;
-        const bool bDissolveOut = (objectFlags & FOB_DISSOLVE_OUT) != 0;
-
-        outBuffer->SPIDissolveRef.x = bDissolve ? (float)(renderObject->m_DissolveRef) * (1.0f / 255.0f) : 0.0f;
-        outBuffer->SPIDissolveRef.y = bDissolveOut ? 1.0f : -1.0f;
-        outBuffer->SPIDissolveRef.z = 0.0f;
-        outBuffer->SPIDissolveRef.w = 0.0f;
-    }
-}
-
-PerInstanceConstantBufferPool::PerInstanceConstantBufferPool()
-    : m_CurrentRenderItem{}
-    , m_UpdateConstantBuffer{}
-    , m_UpdateIndirectConstantBuffer{}
-    , m_PooledConstantBuffer{}
-#if defined(FEATURE_SPI_INDEXED_CB)
-    , m_PooledIndirectConstantBuffer{}
-#endif
-{
-}
-
-void PerInstanceConstantBufferPool::Init()
-{
-    for (AZ::u32 i = 0; i < SPI_NUM_STATIC_INST_CB; ++i)
-    {
-        m_PooledConstantBuffer[i] = NULL;
-    }
-#if defined(FEATURE_SPI_INDEXED_CB)
-    for (AZ::u32 i = 0; i < SPI_NUM_INSTS_PER_CB; ++i)
-    {
-        m_PooledIndirectConstantBuffer[i] = NULL;
-    }
-#endif
-    m_UpdateConstantBuffer = nullptr;
-    m_UpdateIndirectConstantBuffer = nullptr;
-}
-
-void PerInstanceConstantBufferPool::Shutdown()
-{
-    for (AZ::u32 i = 0; i < SPI_NUM_STATIC_INST_CB; ++i)
-    {
-        SAFE_RELEASE(m_PooledConstantBuffer[i]);
-    }
-#if defined(FEATURE_SPI_INDEXED_CB)
-    for (AZ::u32 i = 0; i < SPI_NUM_INSTS_PER_CB; ++i)
-    {
-        SAFE_RELEASE(m_PooledIndirectConstantBuffer[i]);
-    }
-#endif
-    SAFE_RELEASE(m_UpdateIndirectConstantBuffer);
-    SAFE_RELEASE(m_UpdateConstantBuffer);
-}
-
-void PerInstanceConstantBufferPool::Update(CRenderView& renderView, float realTime)
-{
-#if !defined(NULL_RENDERER)
-
-    if (m_PooledConstantBuffer[0] == nullptr)
-    {
-        auto& bufferManager = gRenDev->m_DevBufMan;
-
-        for (AZ::u32 i = 0; i < SPI_NUM_STATIC_INST_CB; ++i)
-        {
-            m_PooledConstantBuffer[i] = bufferManager.CreateConstantBuffer(
-                "PerInstancePool",
-                SPI_NUM_INSTS_PER_CB * sizeof(HLSL_PerInstanceConstantBuffer),
-                AzRHI::ConstantBufferUsage::Dynamic,
-                AzRHI::ConstantBufferFlags::DenyStreaming);
-        }
-
-#ifdef FEATURE_SPI_INDEXED_CB
-        for (AZ::u32 i = 0; i < SPI_NUM_INSTS_PER_CB; ++i)
-        {
-            AZ::u32 data[4] = { i, 0, 0, 0 };
-            m_PooledIndirectConstantBuffer[i] = bufferManager.CreateConstantBuffer(
-                "PerInstanceIndirectPool",
-                sizeof(AZ::u32) * 4,
-                AzRHI::ConstantBufferUsage::Static,
-                AzRHI::ConstantBufferFlags::DenyStreaming);
-            m_PooledIndirectConstantBuffer[i]->UpdateBuffer(&data, sizeof(AZ::u32) * 4);
-        }
-#endif
-
-        m_UpdateConstantBuffer = bufferManager.CreateConstantBuffer(
-            "PerInstanceUpdate",
-            SPI_NUM_INSTS_PER_CB * sizeof(HLSL_PerInstanceConstantBuffer),
-            AzRHI::ConstantBufferUsage::Dynamic,
-            AzRHI::ConstantBufferFlags::DenyStreaming);
-
-        AZ::u32 data[4] = { 0, 0, 0, 0 };
-        m_UpdateIndirectConstantBuffer = bufferManager.CreateConstantBuffer(
-            "PerInstanceIndirectUpdate",
-            sizeof(AZ::u32) * 4,
-            AzRHI::ConstantBufferUsage::Static,
-            AzRHI::ConstantBufferFlags::DenyStreaming);
-
-        m_UpdateIndirectConstantBuffer->UpdateBuffer(&data, sizeof(AZ::u32) * 4);
-    }
-
-    PROFILE_FRAME(UpdatePerInstanceConstants);
-    AZ_TRACE_METHOD();
-
-    AZ::u32 nextBufferIdx = 0;
-    AZ::u32 nextInstanceIdx = 0;
-    AZ::u32 constantBufferIdxLimit = SPI_NUM_STATIC_INST_CB;
-    void* mappedData = nullptr;
-        
-    // Assign half of the constant buffer budget per eye when in VR mode
-    if (gcpRendD3D->GetIStereoRenderer()->IsRenderingToHMD())
-    {
-        // For the right eye (rendered second), begin indexing half way into the array
-        if (gRenDev->m_CurRenderEye == STEREO_EYE_RIGHT)
-        {
-            nextBufferIdx = constantBufferIdxLimit / 2;
-        }
-        else
-        {
-            // For the left eye, just reduce the limit by half
-            constantBufferIdxLimit /= 2;
-        }
-    }
-
-    float realTimePrev = realTime - CRenderer::GetElapsedTime();
-
-    for (AZ::u32 renderListIdx = EFSLIST_PREPROCESS; renderListIdx < EFSLIST_NUM; renderListIdx++)
-    {
-        for (AZ::u32 bAfterWater = 0; bAfterWater < 2; bAfterWater++)
-        {
-            auto& renderItems = renderView.GetRenderItems(bAfterWater, renderListIdx);
-
-            for (AZ::u32 itemIndex = 0; itemIndex < renderItems.size(); itemIndex++)
-            {
-                SRendItem* renderItem = &renderItems[itemIndex];
-                CRenderObject* renderObject = renderItem->pObj;
-
-                if (!renderObject)
-                {
-                    AZ_Assert(false, "Failed to update static inst buffer pool, index %u - the render object is null", nextBufferIdx);
-                    continue;
-                }
-
-                if (renderObject->m_PerInstanceConstantBufferKey.IsValid())
-                {
-                    continue;
-                }
-
-                if (nextBufferIdx >= constantBufferIdxLimit)
-                {
-                    auto* renderer = gEnv->pRenderer;
-
-                    int nDrawCalls, nShadowGenDrawCalls;
-                    renderer->GetCurrentNumberOfDrawCalls(nDrawCalls, nShadowGenDrawCalls);
-                    int nTotalDrawCalls = nDrawCalls + nShadowGenDrawCalls;
-                    int nTotalInstanced = nTotalDrawCalls + renderer->GetNumGeomInstanceDrawCalls();
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Ran out of static inst buffers -- DP: %04d ShadowGen: %04d Total: %04d Instanced: %04d", nDrawCalls, nShadowGenDrawCalls, nTotalDrawCalls, nTotalInstanced);
-                    return;
-                }
-
-                AzRHI::ConstantBuffer* constantBuffer = m_PooledConstantBuffer[nextBufferIdx];
-                if (nextInstanceIdx == 0)
-                {
-                    mappedData = constantBuffer->BeginWrite();
-                    if (!mappedData)
-                    {
-                        AZ_Error("Renderer", false, "Failed to update static inst buffer pool, index %u", nextBufferIdx);
-                        return;
-                    }
-                }
-
-                HLSL_PerInstanceConstantBuffer* outputData = reinterpret_cast<HLSL_PerInstanceConstantBuffer*>(mappedData) + nextInstanceIdx;
-                BuildPerInstanceConstantBuffer(outputData, renderObject, realTime, realTimePrev);
-
-                renderObject->m_PerInstanceConstantBufferKey.m_Id = nextInstanceIdx + (nextBufferIdx * SPI_NUM_INSTS_PER_CB);
-#ifdef FEATURE_SPI_INDEXED_CB
-                renderObject->m_PerInstanceConstantBufferKey.m_IndirectId = nextInstanceIdx;
-#endif
-                nextInstanceIdx++;
-                if (nextInstanceIdx == SPI_NUM_INSTS_PER_CB)
-                {
-                    constantBuffer->EndWrite();
-                    nextInstanceIdx = 0;
-                    nextBufferIdx++;
-                }
-            }
-        }
-    }
-
-    if (nextInstanceIdx != 0)
-    {
-        m_PooledConstantBuffer[nextBufferIdx]->EndWrite();
-    }
-#endif
-}
-
-void PerInstanceConstantBufferPool::SetConstantBuffer(SRendItem* renderItem)
-{
-    CRenderObject* object = renderItem->pObj;
-    const AZ::u32 directId = object->m_PerInstanceConstantBufferKey.m_Id;
-
-    if (directId == 0xffff)
-    {
-        return;
-    }
-
-    m_CurrentRenderItem = renderItem;
-
-    AZ::u32 bufferIndex = directId / SPI_NUM_INSTS_PER_CB;
-
-    auto& deviceManager = gRenDev->m_DevMan;
-
-#if (SPI_NUM_INSTS_PER_CB == 1)
-    deviceManager.BindConstantBuffer(eHWSC_Vertex, m_PooledConstantBuffer[bufferIndex], eConstantBufferShaderSlot_SPI);
-    deviceManager.BindConstantBuffer(eHWSC_Pixel, m_PooledConstantBuffer[bufferIndex], eConstantBufferShaderSlot_SPI);
-#elif defined(FEATURE_SPI_INDEXED_CB)
-    AZ::u32 indirectId = object->m_PerInstanceConstantBufferKey.m_IndirectId;
-
-    if (indirectId >= SPI_NUM_INSTS_PER_CB)
-    {
-        CryLogAlways("ERROR: SetBuffer - indirect index is invalid");
-        return;
-    }
-
-    deviceManager.BindConstantBuffer(eHWSC_Vertex, m_PooledConstantBuffer[bufferIndex], eConstantBufferShaderSlot_SPI);
-    deviceManager.BindConstantBuffer(eHWSC_Pixel, m_PooledConstantBuffer[bufferIndex], eConstantBufferShaderSlot_SPI);
-    deviceManager.BindConstantBuffer(eHWSC_Vertex, m_PooledIndirectConstantBuffer[indirectId], eConstantBufferShaderSlot_SPIIndex);
-    deviceManager.BindConstantBuffer(eHWSC_Pixel, m_PooledIndirectConstantBuffer[indirectId], eConstantBufferShaderSlot_SPIIndex);
-#else
-    AZ::u32 itemIndex = directId % SPI_NUM_INSTS_PER_CB;
-    AZ::u32 first[1] = {itemIndex * static_cast<AZ::u32>(sizeof(HLSL_PerInstanceConstantBuffer))};
-    AZ::u32 count[1] = {static_cast<AZ::u32>(sizeof(HLSL_PerInstanceConstantBuffer))};
-
-    deviceManager.BindConstantBuffer(eHWSC_Vertex, m_PooledConstantBuffer[bufferIndex], eConstantBufferShaderSlot_SPI, first[0], count[0]);
-    deviceManager.BindConstantBuffer(eHWSC_Pixel, m_PooledConstantBuffer[bufferIndex], eConstantBufferShaderSlot_SPI, first[0], count[0]);
-#endif
-}
-
-void PerInstanceConstantBufferPool::UpdateConstantBuffer(ConstantUpdateCB constantUpdateCallback, float realTime)
-{
-    AZ_Assert(m_CurrentRenderItem, "current render item is null");
-
-    CRenderObject* renderObject = m_CurrentRenderItem->pObj;
-    if (!renderObject)
-    {
-        AZ_Assert(false, "Failed to update static inst buffer - the current render object is null");
-        return;
-    }
-
-    float realTimePrev = realTime - CRenderer::GetElapsedTime();
-
-    void* mappedData = m_UpdateConstantBuffer->BeginWrite();    
-    if (!mappedData)
-    {
-        AZ_Error("Renderer", false, "Failed to update static inst buffer");
-        return;
-    }
-
-    BuildPerInstanceConstantBuffer(reinterpret_cast<HLSL_PerInstanceConstantBuffer*>(mappedData), renderObject, realTime, realTimePrev);
-
-    constantUpdateCallback(mappedData);
-    m_UpdateConstantBuffer->EndWrite();
-
-    auto& devManager = gRenDev->m_DevMan;
-    devManager.BindConstantBuffer(eHWSC_Vertex, m_UpdateConstantBuffer, eConstantBufferShaderSlot_SPI);
-    devManager.BindConstantBuffer(eHWSC_Pixel, m_UpdateConstantBuffer, eConstantBufferShaderSlot_SPI);
-
-#if defined(FEATURE_SPI_INDEXED_CB)
-    devManager.BindConstantBuffer(eHWSC_Vertex, m_UpdateIndirectConstantBuffer, eConstantBufferShaderSlot_SPIIndex);
-    devManager.BindConstantBuffer(eHWSC_Pixel, m_UpdateIndirectConstantBuffer, eConstantBufferShaderSlot_SPIIndex);
-#endif
-}
diff --git a/Code/CryEngine/RenderDll/Common/PerInstanceConstantBufferPool.h b/Code/CryEngine/RenderDll/Common/PerInstanceConstantBufferPool.h
deleted file mode 100644
index 08548b4a98..0000000000
--- a/Code/CryEngine/RenderDll/Common/PerInstanceConstantBufferPool.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "Defs.h"
-
-#if (defined(WIN32) || defined(APPLE) || defined(LINUX) || defined(USE_FEATURE_SPI_INDEXED_CB_BY_DEFAULT))
-    #define FEATURE_SPI_INDEXED_CB
-
-    #if defined(DONT_USE_SPI_INDEXED_CB)
-        #undef FEATURE_SPI_INDEXED_CB
-    #endif
-#endif
-
-// DirectX 11.0
-#if defined(WIN32) || defined(LINUX) || defined(APPLE) || defined(USE_FEATURE_SPI_INDEXED_CB_BY_DEFAULT)
-
-    #define SPI_NUM_STATIC_INST_CB_DEFAULT (2048 * 64)
-
-    #ifdef FEATURE_SPI_INDEXED_CB
-        #define SPI_NUM_INSTS_PER_CB        128 // Must match SPI struct in FXConstantDefs.cfi
-        #define SPI_NUM_STATIC_INST_CB  (SPI_NUM_STATIC_INST_CB_DEFAULT / SPI_NUM_INSTS_PER_CB)
-    #else
-        #define SPI_NUM_INSTS_PER_CB        1
-        #define SPI_NUM_STATIC_INST_CB  SPI_NUM_STATIC_INST_CB_DEFAULT
-    #endif // FEATURE_SPI_INDEXED_CB
-
-// DirectX 11.1 and higher
-#else
-    #define SPI_NUM_INSTS_PER_CB    2048
-    #define SPI_NUM_STATIC_INST_CB  64
-#endif
-
-struct SRendItem;
-
-class IPerInstanceConstantBufferPool
-{
-    virtual void SetConstantBuffer(SRendItem* renderItem) = 0;
-};
-
-class PerInstanceConstantBufferPool : public IPerInstanceConstantBufferPool
-{
-public:
-    PerInstanceConstantBufferPool();
-
-    using ConstantUpdateCB = AZStd::function<void(void*)>;
-
-    inline SRendItem* GetCurrentRenderItem()
-    {
-        return m_CurrentRenderItem;
-    }
-
-    void Init();
-    void Shutdown();
-
-    void SetConstantBuffer(SRendItem* renderItem);
-    void UpdateConstantBuffer(ConstantUpdateCB callback, float realTime);
-    void Update(CRenderView& renderView, float realTime);
-    
-private:
-    SRendItem* m_CurrentRenderItem;
-
-    AzRHI::ConstantBuffer* m_PooledConstantBuffer[SPI_NUM_STATIC_INST_CB];
-#if defined(FEATURE_SPI_INDEXED_CB)
-    AzRHI::ConstantBuffer* m_PooledIndirectConstantBuffer[SPI_NUM_INSTS_PER_CB];
-#endif
-
-    AzRHI::ConstantBuffer* m_UpdateConstantBuffer;
-    AzRHI::ConstantBuffer* m_UpdateIndirectConstantBuffer;
-};
diff --git a/Code/CryEngine/RenderDll/Common/PostProcess/PostEffects.cpp b/Code/CryEngine/RenderDll/Common/PostProcess/PostEffects.cpp
deleted file mode 100644
index 00307557ad..0000000000
--- a/Code/CryEngine/RenderDll/Common/PostProcess/PostEffects.cpp
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "PostEffects.h"
-#include "PostProcessUtils.h"
-#include "IPostEffectGroup.h"
-#include <AzCore/std/sort.h>
-
-#include "../../../Cry3DEngine/Environment/OceanEnvironmentBus.h"
-
-AZStd::vector< CWaterRipples::SWaterHit, AZ::StdLegacyAllocator > CWaterRipples::s_pWaterHits[RT_COMMAND_BUF_COUNT];
-AZStd::vector< CWaterRipples::SWaterHit, AZ::StdLegacyAllocator > CWaterRipples::s_pWaterHitsMGPU;
-AZStd::vector< CWaterRipples::SWaterHitRecord, AZ::StdLegacyAllocator > CWaterRipples::m_DebugWaterHits;
-Vec3 CWaterRipples::s_CameraPos = Vec3(ZERO);
-Vec2 CWaterRipples::s_SimOrigin = Vec2(ZERO);
-int CWaterRipples::s_nUpdateMask;
-Vec4 CWaterRipples::s_vParams = Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-Vec4 CWaterRipples::s_vLookupParams = Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-bool CWaterRipples::s_bInitializeSim;
-
-int CSunShafts::Initialize()
-{
-    Release();
-
-    m_pOcclQuery = new COcclusionQuery;
-    m_pOcclQuery->Create();
-
-    return true;
-}
-
-void CSunShafts::Release()
-{
-    SAFE_DELETE(m_pOcclQuery);
-}
-
-void CSunShafts::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-}
-
-void CSunShafts::OnLostDevice()
-{
-    Release();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CFilterSharpening::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessFilters)
-    {
-        return false;
-    }
-
-    if (fabs(m_pAmount->GetParam() - 1.0f) + CRenderer::CV_r_Sharpening + CRenderer::CV_r_ChromaticAberration > 0.09f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CFilterSharpening::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(1.0f);
-    m_pType->ResetParam(0.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CFilterBlurring::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessFilters)
-    {
-        return false;
-    }
-
-    if (m_pAmount->GetParam() > 0.09f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CFilterBlurring::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-    m_pType->ResetParam(0.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CUberGamePostProcess::Preprocess()
-{
-    const float fParamThreshold = 1.0f / 255.0f;
-    const Vec4 vWhite = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-
-    bool bEnable = false;
-    bEnable |= m_pColorTint->GetParamVec4() != vWhite;
-    bEnable |= m_pNoise->GetParam() > fParamThreshold;
-    bEnable |= m_pSyncWaveAmplitude->GetParam() > fParamThreshold;
-    bEnable |= m_pGrainAmount->GetParam() > fParamThreshold;
-    bEnable |= m_pPixelationScale->GetParam() > fParamThreshold;
-
-    if (m_pInterlationAmount->GetParam() > fParamThreshold || m_pVSyncAmount->GetParam() > fParamThreshold)
-    {
-        m_nCurrPostEffectsMask |= ePE_SyncArtifacts;
-        bEnable = true;
-    }
-
-    // todo: looks like some game code/flowgraph doing silly stuff - investigate
-    const float fParamThresholdBackCompatibility = 0.09f;
-
-    if (m_pChromaShiftAmount->GetParam() > fParamThresholdBackCompatibility || m_pFilterChromaShiftAmount->GetParam() > fParamThresholdBackCompatibility)
-    {
-        m_nCurrPostEffectsMask |= ePE_ChromaShift;
-        bEnable = true;
-    }
-
-    return bEnable;
-}
-
-void CUberGamePostProcess::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_nCurrPostEffectsMask = 0;
-
-    m_pVSyncAmount->ResetParam(0.0f);
-    m_pVSyncFreq->ResetParam(1.0f);
-
-    const Vec4 vWhite = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-    m_pColorTint->ResetParamVec4(vWhite);
-
-    m_pInterlationAmount->ResetParam(0.0f);
-    m_pInterlationTiling->ResetParam(1.0f);
-    m_pInterlationRotation->ResetParam(0.0f);
-
-    m_pPixelationScale->ResetParam(0.0f);
-    m_pNoise->ResetParam(0.0f);
-
-    m_pSyncWaveFreq->ResetParam(0.0f);
-    m_pSyncWavePhase->ResetParam(0.0f);
-    m_pSyncWaveAmplitude->ResetParam(0.0f);
-
-    m_pFilterChromaShiftAmount->ResetParam(0.0f);
-    m_pChromaShiftAmount->ResetParam(0.0f);
-
-    m_pGrainAmount->ResetParam(0.0f);
-    m_pGrainTile->ResetParam(1.0f);
-
-    m_pMask->Release();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CColorGrading::Preprocess()
-{
-    // Depreceated: to be removed / replaced by UberPostProcess shader
-    return false;
-}
-
-void CColorGrading::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    // reset user params
-    m_pSaturationOffset->ResetParam(0.0f);
-    m_pPhotoFilterColorOffset->ResetParamVec4(Vec4(0.0f, 0.0f, 0.0f, 0.0f));
-    m_pPhotoFilterColorDensityOffset->ResetParam(0.0f);
-    m_pGrainAmountOffset->ResetParam(0.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CUnderwaterGodRays::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    static ICVar* pVar = iConsole->GetCVar("e_WaterOcean");
-
-    //bool bOceanVolumeVisible = (gEnv->p3DEngine->GetOceanRenderFlags() & OCR_OCEANVOLUME_VISIBLE) != 0;
-    bool godRaysEnabled = OceanToggle::IsActive() ? OceanRequest::GetGodRaysEnabled() : (CRenderer::CV_r_water_godrays == 1);
-    if (godRaysEnabled && m_pAmount->GetParam() > 0.005f) // && bOceanEnabled && bOceanVolumeVisible)
-    {
-        float fWatLevel = SPostEffectsUtils::m_fWaterLevel;
-        if (fWatLevel - 0.1f > gRenDev->GetViewParameters().vOrigin.z)
-        {
-            // check water level
-
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void CUnderwaterGodRays::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(1.0f);
-    m_pQuality->ResetParam(1.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CVolumetricScattering::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_High, eSQ_High);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessGameFx)
-    {
-        return false;
-    }
-
-    if (m_pAmount->GetParam() > 0.005f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CVolumetricScattering::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-    m_pType->ResetParam(0.0f);
-    m_pQuality->ResetParam(1.0f);
-    m_pTiling->ResetParam(1.0f);
-    m_pSpeed->ResetParam(1.0f);
-    m_pColor->ResetParamVec4(Vec4(0.5f, 0.75f, 1.0f, 1.0f));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Game/Hud specific post-effects
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CAlienInterference::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-    m_pTintColor->ResetParamVec4(Vec4(Vec3(0.85f, 0.95f, 1.25f) * 0.5f, 1.0f));
-}
-
-bool CAlienInterference::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessGameFx)
-    {
-        return false;
-    }
-
-    if (m_pAmount->GetParam() > 0.09f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-int CGhostVision::CreateResources()
-{
-    Release();
-
-    m_pUserTex1 = CTexture::ForName("EngineAssets/Textures/user_tex1.tif",  FT_DONT_STREAM, eTF_Unknown);
-    m_pUserTex2 = CTexture::ForName("EngineAssets/Textures/user_tex2.tif",  FT_DONT_STREAM, eTF_Unknown);
-
-    return true;
-}
-
-void CGhostVision::Release()
-{
-    SAFE_RELEASE(m_pUserTex1);
-    SAFE_RELEASE(m_pUserTex2);
-}
-
-void CGhostVision::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pUserValue1->ResetParam(0.0f);
-    m_pUserValue2->ResetParam(0.0f);
-    m_pUserValue3->ResetParam(0.0f);
-    m_pTintColor->ResetParamVec4(Vec4(Vec3(0.85f, 0.95f, 1.25f) * 0.5f, 1.0f));
-}
-
-bool CGhostVision::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Low, eSQ_Low);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessGameFx)
-    {
-        return false;
-    }
-
-    if (m_pUserValue1->GetParam() > 0.09f || m_pUserValue2->GetParam() > 0.09f || m_pUserValue3->GetParam() > 0.09f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-bool CWaterDroplets::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    const bool bUserActive = m_pAmount->GetParam() > 0.005f;
-
-    bool godRaysEnabled = OceanToggle::IsActive() ? OceanRequest::GetGodRaysEnabled() : (CRenderer::CV_r_water_godrays == 1);
-    if (godRaysEnabled)
-    {
-        return bUserActive; // user enabled override
-    }
-
-    return false;
-}
-
-void CWaterDroplets::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CWaterFlow::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessGameFx)
-    {
-        return false;
-    }
-
-    if (m_pAmount->GetParam() > 0.005f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CWaterFlow::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CWaterVolume::Preprocess()
-{
-    if (!gRenDev->m_RP.m_eQuality)
-    {
-        return false;
-    }
-
-    if (m_pAmount->GetParam() > 0.005f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CWaterVolume::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CScreenFrost::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessGameFx)
-    {
-        return false;
-    }
-
-    if (m_pAmount->GetParam() > 0.09f)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CScreenFrost::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-    m_pCenterAmount->ResetParam(1.0f);
-    m_fRandOffset = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-int CRainDrops::CreateResources()
-{
-    Release();
-
-    //create texture for HitEffect accumulation
-    m_bFirstFrame = true;
-
-    // Already generated ? No need to proceed
-    if (!m_pDropsLst.empty())
-    {
-        return 1;
-    }
-
-    m_pDropsLst.reserve(m_nMaxDropsCount);
-    for (int p = 0; p < m_nMaxDropsCount; p++)
-    {
-        SRainDrop* pDrop = new SRainDrop;
-        m_pDropsLst.push_back(pDrop);
-    }
-
-    return 1;
-}
-
-void CRainDrops::Release()
-{
-    if (m_pDropsLst.empty())
-    {
-        return;
-    }
-
-    SRainDropsItor pItor, pItorEnd = m_pDropsLst.end();
-    for (pItor = m_pDropsLst.begin(); pItor != pItorEnd; ++pItor)
-    {
-        SAFE_DELETE((*pItor));
-    }
-    m_pDropsLst.clear();
-}
-
-
-void CRainDrops::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_bFirstFrame = true;
-    m_uCurrentDytex = 0;
-
-    m_pAmount->ResetParam(0.0f);
-    m_pSpawnTimeDistance->ResetParam(0.35f);
-    m_pSize->ResetParam(5.0f);
-    m_pSizeVar->ResetParam(2.5f);
-    m_nAliveDrops = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CHudSilhouettes::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pActive->ResetParam(0.0f);
-    m_pAmount->ResetParam(1.0f);
-    m_pType->ResetParam(1);
-
-    FindIfSilhouettesOptimisedTechAvailable();
-}
-
-bool CHudSilhouettes::Preprocess()
-{
-    if ((CRenderer::CV_r_customvisions != 3) || (m_bSilhouettesOptimisedTechAvailable))
-    {
-        if (!CRenderer::CV_r_PostProcessGameFx ||
-            !CRenderer::CV_r_customvisions ||
-            gRenDev->IsPost3DRendererEnabled())
-        {
-            return false;
-        }
-
-        // no need to proceed
-        float fType = m_pType->GetParam();
-        uint32 nBatchMask = SRendItem::BatchFlags(EFSLIST_GENERAL, gRenDev->m_RP.m_pRLD) | SRendItem::BatchFlags(EFSLIST_TRANSP, gRenDev->m_RP.m_pRLD);
-
-        if ((!(nBatchMask & FB_CUSTOM_RENDER)) && fType == 1.0f)
-        {
-            return false;
-        }
-
-        if (m_pAmount->GetParam() > 0.005f)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CFlashBang::Release()
-{
-    SAFE_DELETE(m_pGhostImage);
-}
-
-void CFlashBang::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    SAFE_DELETE(m_pGhostImage);
-    m_pActive->ResetParam(0.0f);
-    m_pTime->ResetParam(2.0f);
-    m_pDifractionAmount->ResetParam(1.0f);
-    m_pBlindAmount->ResetParam(0.5f);
-    m_fBlindAmount = 1.0f;
-    m_fSpawnTime = 0.0f;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CSoftAlphaTest::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-}
-
-bool CSoftAlphaTest::Preprocess()
-{
-    uint32 nBatchMask = SRendItem::BatchFlags(EFSLIST_GENERAL, gRenDev->m_RP.m_pRLD);
-    return CRenderer::CV_r_SoftAlphaTest != 0 && (nBatchMask & FB_SOFTALPHATEST);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CImageGhosting::Preprocess()
-{
-    CTexture* pPrevFrame = CTexture::s_ptexPrevFrameScaled;
-    if (!pPrevFrame)
-    {
-        m_bInit = true;
-        return false;
-    }
-
-    if (m_pAmount->GetParam() > 0.09f)
-    {
-        return true;
-    }
-
-    m_bInit = true;
-
-    return false;
-}
-
-void CImageGhosting::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_bInit = true;
-    m_pAmount->ResetParam(0.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-int CFilterKillCamera::Initialize()
-{
-    m_techName = "KillCameraFilter";
-    m_paramName = "psParams";
-    return 1;
-}
-
-bool CFilterKillCamera::Preprocess()
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessFilters)
-    {
-        return false;
-    }
-
-    if (m_pActive->GetParam() > 0.0f)
-    {
-        const int mode = int_round(m_pMode->GetParam());
-        if (mode != m_lastMode)
-        {
-            m_blindTimer = 0.0f;
-            m_lastMode = mode;
-        }
-
-        return true;
-    }
-
-    m_blindTimer = 0.0f;
-
-    return false;
-}
-
-void CFilterKillCamera::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    // Game controls parameters + reset (removed from here due to a race condition).
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CScreenBlood::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pAmount->ResetParam(0.0f);
-    m_pBorder->ResetParamVec4(Vec4(0.0f, 0.0f, 2.0f, 1.0f)); // Border: x=xOffset y=yOffset z=range w=alpha
-}
-
-bool CScreenBlood::Preprocess()
-{
-    return (CRenderer::CV_r_PostProcessGameFx && m_pAmount->GetParam() > 0.005f);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-bool CPost3DRenderer::Preprocess()
-{
-    if (IsActive())
-    {
-        // Defer turning off post effect for 5 frames - sometimes the flash is left rendering on the screen
-        // for a frame, if we don't render the post effect for this frame then junk will be rendered into
-        // the flash. Currently the post effect is disabled at the latest point in menu code, thus this is the
-        // simplest/safest fix.
-        m_deferDisableFrameCountDown = 5;
-    }
-    else if (m_deferDisableFrameCountDown > 0)
-    {
-        m_deferDisableFrameCountDown--;
-    }
-
-    const bool bRender = (m_deferDisableFrameCountDown > 0) ? true : false;
-    return bRender;
-}
-
-void CPost3DRenderer::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    // Let game code fully control its active status, otherwise in some situations
-    // the post effect system will get reset between menus and game and thus this
-    // will get turned off when undesired
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-// AZStd visitor class to resolve the effect parameter into the appropriate type
-class FetchVisitor
-{
-public:
-
-    void SetEffectParam( CEffectParam* effectParameter )
-    {
-        m_effectParam = effectParameter;
-    }
-
-    void operator()(float param)
-    {
-        m_effectParam->SetParam(param);
-    }
-
-    void operator()(const Vec4& param)
-    {
-        m_effectParam->SetParamVec4(param);
-    }
-
-    void operator()(const AZStd::string& param)
-    {
-        m_effectParam->SetParamString(param.c_str());
-    }
-
-private:
-
-    CEffectParam* m_effectParam = nullptr;
-};
-
-// Helper function to set a CEffectParam from a group, visitor and parameter name
-void SetEffectParamFromVisitor( IPostEffectGroup* group, FetchVisitor& fetchVisitor, const char* paramName, CEffectParam* effectParam /* in/out */ )
-{
-    PostEffectGroupParam* groupParam = group->GetParam(paramName);
-    fetchVisitor.SetEffectParam( effectParam );
-    AZStd::visit(fetchVisitor, *groupParam);
-}
-
-bool ScreenFader::Preprocess()
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessGameFx)
-    {
-        return false;
-    }
-
-    IPostEffectGroupManager* groupManager = gEnv->p3DEngine->GetPostEffectGroups();
-    const PostEffectGroupList& toggledGroupList = groupManager->GetGroupsToggledThisFrame();
-    bool newScreenPassAdded = false;
-
-    // Iterate over all of the groups that had their enabled/disabled flag toggled this frame
-    // If the group already exists in the screenpass list, then that should mean it either needs change its
-    // state to fade-in (if it was actively fading-out), or it needs to change to fade-out (if it was actively fading in or rendering at full opacity)
-    // Once a group has faded out completely, then it will be removed from the screenpass list.
-    for ( auto groupIter = toggledGroupList.begin(); groupIter != toggledGroupList.end(); ++groupIter )
-    {
-        IPostEffectGroup* group = (*groupIter);
-        bool foundGroupInList = false;
-        for ( ScreenPassList::iterator passIter = m_screenPasses.begin(); passIter != m_screenPasses.end(); ++passIter )
-        {
-            ScreenFaderPass* pass = (*passIter);
-            if ( pass->m_group == group )
-            {
-                foundGroupInList = true;
-                if ( group->GetEnable() )
-                {
-                    // If the group has changed to enabled, then that means the group was actively fading out before
-                    // Change its state to fade-in, and fade from its existing alpha value.
-                    pass->m_fadingIn = true;
-                    pass->m_fadingOut = false;
-                    pass->m_fadeDirection = 1.0f;
-                    pass->m_fadeDuration = pass->m_fadeInTime;
-                }
-                else
-                {
-                    // If the group has changed to disabled, then that means we were either actively fading in or rendering at full opacity.
-                    // Change its state to fade out and fade from its existing alpha value
-                    pass->m_fadingIn = false;
-                    pass->m_fadingOut = true;
-                    pass->m_fadeDirection = -1.0f;
-                    pass->m_fadeDuration = pass->m_fadeOutTime;
-                }
-                break;
-            }
-        }
-
-        // If the group was not found, then add it to the list
-        if ( !foundGroupInList )
-        {
-            FetchVisitor groupParamVisitor;
-
-            SetEffectParamFromVisitor( group, groupParamVisitor, "ScreenFader_Enable", m_enable );
-            bool fadeIn = m_enable->GetParam() ? true : false;
-
-            if ( fadeIn )
-            {
-                // The screen fader is different from the other PostEffects in the PostEffectsGroups.
-                // We do not want the interpolated parameters when enabling another group since we want to render
-                // multiple stacked screenfaders.  Fetch the parameters from the original PostEffectGroup for this
-                // screen fader pass
-                ScreenFaderPass* pass = new ScreenFaderPass();
-                pass->m_group = group;
-                pass->m_fadingIn = true;
-                pass->m_fadeDirection = 1.0f;
-                
-                SetEffectParamFromVisitor( group, groupParamVisitor, "ScreenFader_FadeColor", m_fadeColor );
-                pass->m_currentColor = m_fadeColor->GetParamVec4();
-                
-                SetEffectParamFromVisitor( group, groupParamVisitor, "ScreenFader_ScreenCoordinates", m_screenCoordinates );
-                pass->m_screenCoordinates = m_screenCoordinates->GetParamVec4();
-                
-                SetEffectParamFromVisitor( group, groupParamVisitor, "ScreenFader_TextureName", m_fadeTextureParam );
-                pass->m_fadeTexture = static_cast<CParamTexture*>(m_fadeTextureParam)->GetParamTexture();
-
-                if (pass->m_fadeTexture)
-                {
-                    // Since we are manually holding onto a CTexture pointer, make sure we increment the ref count
-                    pass->m_fadeTexture->AddRef();
-                }
-                
-                SetEffectParamFromVisitor( group, groupParamVisitor, "ScreenFader_FadeOutTime", m_fadeOutTime );
-                pass->m_fadeOutTime = m_fadeOutTime->GetParam();
-
-                SetEffectParamFromVisitor( group, groupParamVisitor, "ScreenFader_FadeInTime", m_fadeInTime );
-                pass->m_fadeInTime = m_fadeInTime->GetParam();
-                pass->m_fadeDuration = pass->m_fadeInTime;
-
-                m_screenPasses.push_back( pass );
-                newScreenPassAdded = true;
-            }
-        }
-    }
-
-    // If we added a new ScreenPass, then re-sort our ScreenPasses based on the PostEffectGroup's priorities
-    if ( newScreenPassAdded )
-    {
-        m_screenPasses.sort(SortFaderPasses);
-    }
-    
-    // Update all of the screen passes, removing any that have recently faded out from the list.
-    auto passIter = m_screenPasses.begin();
-    while ( passIter != m_screenPasses.end() )
-    {
-        ScreenFaderPass* pass = (*passIter);
-
-        if ( pass->m_fadingOut && pass->m_currentFadeTime <= 0.0f )
-        {
-            // We have finished fading out.  Now clean up the list and remove the pass.
-            delete pass;
-            passIter = m_screenPasses.erase(passIter);
-        }
-        else if ( pass->m_fadingIn && (pass->m_currentFadeTime >= pass->m_fadeDuration) )
-        {
-            // We have finished fading in.  Stay at 100% fade time until fade out is triggered.
-            pass->m_currentFadeTime = pass->m_fadeDuration;
-            pass->m_fadingIn = false;
-        }
-        ++passIter;
-    }
-
-    return m_screenPasses.size() > 0;
-}
-
-void ScreenFader::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    // Do not clear m_screenPasses here, otherwise global and default PostEffectGroups will be removed
-}
-
-bool ScreenFader::SortFaderPasses(ScreenFaderPass* pass1, ScreenFaderPass* pass2)
-{
-    return pass1->m_group->GetPriority() < pass2->m_group->GetPriority();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/Common/PostProcess/PostEffects.h b/Code/CryEngine/RenderDll/Common/PostProcess/PostEffects.h
deleted file mode 100644
index 61bc127f71..0000000000
--- a/Code/CryEngine/RenderDll/Common/PostProcess/PostEffects.h
+++ /dev/null
@@ -1,1645 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTEFFECTS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTEFFECTS_H
-#pragma once
-
-#include "PostProcessUtils.h"
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-
-struct MotionBlurObjectParameters
-{
-    MotionBlurObjectParameters()
-        : m_renderObject{}
-        , m_updateFrameId{}
-    {}
-
-    MotionBlurObjectParameters(CRenderObject* renderObject, const Matrix34A& worldMatrix, AZ::u32 updateFrameId)
-        : m_worldMatrix(worldMatrix)
-        , m_renderObject(renderObject)
-        , m_updateFrameId(updateFrameId) {}
-
-    Matrix34 m_worldMatrix;
-    CRenderObject* m_renderObject;
-    AZ::u32 m_updateFrameId;
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-class CMotionBlur
-    : public CPostEffect
-{
-public:
-    CMotionBlur()
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_eMotionBlur;
-
-        // Register technique instance and it's parameters
-        AddParamBool("MotionBlur_Active", m_pActive, 0);
-        AddParamFloatNoTransition("FilterRadialBlurring_Amount", m_pRadBlurAmount, 0.0f);
-        AddParamFloatNoTransition("FilterRadialBlurring_ScreenPosX", m_pRadBlurScreenPosX, 0.5f);
-        AddParamFloatNoTransition("FilterRadialBlurring_ScreenPosY", m_pRadBlurScreenPosY, 0.5f);
-        AddParamFloatNoTransition("FilterRadialBlurring_Radius", m_pRadBlurRadius, 1.0f);
-        AddParamVec4("Global_DirectionalBlur_Vec", m_pDirectionalBlurVec, Vec4(0, 0, 0, 0));
-
-        for (int idx = 0; idx < AZ_ARRAY_SIZE(m_Objects); ++idx)
-        {
-            m_Objects[idx] = AZStd::make_unique<ObjectMap>();
-        }
-    }
-
-    virtual ~CMotionBlur()
-    {
-        Release();
-    }
-
-    virtual void Render();
-    virtual bool Preprocess();
-
-    virtual void Release()
-    {
-        m_Objects[0]->clear();
-        m_Objects[1]->clear();
-        m_Objects[2]->clear();
-    }
-
-    virtual void Reset([[maybe_unused]] bool bOnSpecChange = false)
-    {
-        m_pDirectionalBlurVec->ResetParamVec4(Vec4(0, 0, 0, 0));
-    }
-
-    void RenderObjectsVelocity();
-    void CopyAndScaleDoFBuffer(CTexture* pSrcTex, CTexture* pDestTex);
-    void OnBeginFrame();
-    float ComputeMotionScale();
-
-    static void SetupObject(CRenderObject* pObj, const SRenderingPassInfo& passInfo);
-    static void GetPrevObjToWorldMat(CRenderObject* pObj, Matrix44A& res);
-    static void InsertNewElements();
-    static void FreeData();
-
-    static const Matrix44A &GetPrevView()
-    {
-        return gRenDev->GetPreviousFrameMatrixSet().m_ViewMatrix;
-    }
-
-    virtual const char* GetName() const
-    {
-        return "MotionBlur";
-    }
-
-private:
-    friend class CMotionBlurPass;
-
-    CEffectParam* m_pRadBlurAmount, * m_pRadBlurScreenPosX, * m_pRadBlurScreenPosY, * m_pRadBlurRadius;
-    CEffectParam* m_pDirectionalBlurVec;
-
-    //! m_Objects contains motion blur parameters and is triple buffered
-    //! t0: being written, t-1: current render frame, t-2: previous render frame
-    static const uint32_t s_maxObjectBuffers = 3;
-    typedef VectorMap<uintptr_t, MotionBlurObjectParameters > ObjectMap;
-    static AZStd::unique_ptr<ObjectMap> m_Objects[s_maxObjectBuffers]; 
-
-    //! Thread safe double buffered fill data used to populate the m_Objects buffer
-    static TSRC_ALIGN CThreadSafeRendererContainer<ObjectMap::value_type> m_FillData[RT_COMMAND_BUF_COUNT];
-
-    //! The threshold in frames at which we want to discard per-object motion data
-    static const uint32_t s_discardThreshold = 60;
-};
-
-struct DepthOfFieldParameters
-{
-    DepthOfFieldParameters()
-        : m_bEnabled{false}
-    {}
-
-    Vec4 m_FocusParams0;
-    Vec4 m_FocusParams1;
-    bool m_bEnabled;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Deprecated: This class is used as a placeholder for parameters, but the 
-// rendering logic now lives in DepthOfFieldPass.
-//
-class CDepthOfField
-    : public CPostEffect
-{
-public:
-    CDepthOfField()
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_eDepthOfField;
-        AddParamBool("Dof_Active", m_pActive, 0);
-        AddParamFloatNoTransition("Dof_FocusDistance", m_pFocusDistance, 3.5f);
-        AddParamFloatNoTransition("Dof_FocusRange", m_pFocusRange, 0.0f);
-        AddParamFloatNoTransition("Dof_FocusMin", m_pFocusMin, 2.0f);
-        AddParamFloatNoTransition("Dof_FocusMax", m_pFocusMax, 10.0f);
-        AddParamFloatNoTransition("Dof_FocusLimit", m_pFocusLimit, 100.0f);
-        AddParamFloatNoTransition("Dof_CenterWeight", m_pCenterWeight, 1.0f);
-        AddParamFloatNoTransition("Dof_BlurAmount", m_pBlurAmount, 1.0f);
-        AddParamBool("Dof_User_Active", m_pUserActive, 0);
-        AddParamFloatNoTransition("Dof_User_FocusDistance", m_pUserFocusDistance, 3.5f);
-        AddParamFloatNoTransition("Dof_User_FocusRange", m_pUserFocusRange, 5.0f);
-        AddParamFloatNoTransition("Dof_User_BlurAmount", m_pUserBlurAmount, 1.0f);
-        AddParamFloatNoTransition("Dof_Tod_FocusRange", m_pTimeOfDayFocusRange, 1000.0f);
-        AddParamFloatNoTransition("Dof_Tod_BlurAmount", m_pTimeOfDayBlurAmount, 0.0f);
-        AddParamFloatNoTransition("Dof_FocusMinZ", m_pFocusMinZ, 0.0f); // 0.4 is good default
-        AddParamFloatNoTransition("Dof_FocusMinZScale", m_pFocusMinZScale, 0.0f); // 1.0 is good default
-
-        m_fUserFocusRangeCurr = 0;
-        m_fUserFocusDistanceCurr = 0;
-        m_fUserBlurAmountCurr = 0;
-        m_todFocusRange = 0.0f;
-        m_todBlurAmount = 0.0f;
-    }
-
-    virtual void Reset([[maybe_unused]] bool bOnSpecChange = false)
-    {
-        m_pFocusDistance->ResetParam(3.5f);
-        m_pFocusRange->ResetParam(0.0f);
-        m_pCenterWeight->ResetParam(1.0f);
-        m_pBlurAmount->ResetParam(1.0f);
-        m_pFocusMin->ResetParam(2.0f);
-        m_pFocusMax->ResetParam(10.0f);
-        m_pFocusLimit->ResetParam(100.0f);
-        m_pActive->ResetParam(0.0f);
-        m_pUserActive->ResetParam(0.0f);
-        m_pUserFocusDistance->ResetParam(3.5f);
-        m_pUserFocusRange->ResetParam(5.0f);
-        m_pUserBlurAmount->ResetParam(1.0f);
-        m_pFocusMinZ->ResetParam(0.0f);
-        m_pFocusMinZScale->ResetParam(0.0f);
-
-        m_fUserFocusRangeCurr = 0;
-        m_fUserFocusDistanceCurr = 0;
-        m_fUserBlurAmountCurr = 0;
-        m_todFocusRange = 0;
-        m_todBlurAmount = 0;
-    }
-
-    virtual int CreateResources() { return true; }
-    virtual void Release() {}
-    virtual void Render() {}
-    virtual bool Preprocess() { return false; }
-    virtual const char* GetName() const { return "DepthOfField"; }
-
-    void UpdateParameters();
-
-    const DepthOfFieldParameters& GetParameters() const
-    {
-        return m_Parameters;
-    }
-
-private:
-    CEffectParam* m_pFocusDistance, * m_pFocusRange, * m_pCenterWeight, * m_pBlurAmount;
-    CEffectParam* m_pFocusMin, * m_pFocusMax;
-    CEffectParam* m_pUserActive, * m_pUserFocusDistance, * m_pUserFocusRange, * m_pUserBlurAmount;
-    CEffectParam* m_pTimeOfDayFocusRange, * m_pTimeOfDayBlurAmount;
-    CEffectParam* m_pFocusMinZ, * m_pFocusMinZScale, *m_pFocusLimit;
-
-    DepthOfFieldParameters m_Parameters;
-
-    float m_fUserFocusRangeCurr;
-    float m_fUserFocusDistanceCurr;
-    float m_fUserBlurAmountCurr;
-    float m_todFocusRange;
-    float m_todBlurAmount;
-};
-
-class CPostAA
-    : public CPostEffect
-{
-public:
-    CPostAA()
-    {
-        m_nRenderFlags = PSP_UPDATE_SCENE_SPECULAR;
-        m_nID = ePFX_PostAA;
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset([[maybe_unused]] bool bOnSpecChange = false) {}
-
-    virtual const char* GetName() const
-    {
-        return "PostAA";
-    }
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CSunShafts
-    : public CPostEffect
-{
-public:
-    CSunShafts()
-    {
-        m_nID = ePFX_SunShafts;
-        m_pOcclQuery = 0;
-
-        AddParamBool("SunShafts_Active", m_pActive, 0);
-        AddParamInt("SunShafts_Type", m_pShaftsType, 0); // default shafts type - highest quality
-        AddParamFloatNoTransition("SunShafts_Amount", m_pShaftsAmount, 0.25f); // shafts visibility
-        AddParamFloatNoTransition("SunShafts_RaysAmount", m_pRaysAmount, 0.25f); // rays visibility
-        AddParamFloatNoTransition("SunShafts_RaysAttenuation", m_pRaysAttenuation, 5.0f); // rays attenuation
-        AddParamFloatNoTransition("SunShafts_RaysSunColInfluence", m_pRaysSunColInfluence, 1.0f); // sun color influence
-        AddParamVec4NoTransition("SunShafts_RaysCustomColor", m_pRaysCustomCol, Vec4(1.0f, 1.0f, 1.0f, 1.0f));
-        AddParamFloat("Scratches_Strength", m_pScratchStrength, 0.0f);
-        AddParamFloat("Scratches_Threshold", m_pScratchThreshold, 0.0f);
-        AddParamFloat("Scratches_Intensity", m_pScratchIntensity, 0.7f);
-        m_bShaftsEnabled = false;
-        m_nVisSampleCount = 0;
-    }
-
-
-    virtual int Initialize();
-    virtual void Release();
-    virtual void OnLostDevice();
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    bool IsVisible();
-    bool SunShaftsGen(CTexture* pSunShafts, CTexture* pPingPongRT = 0);
-    bool MergedSceneDownsampleAndSunShaftsMaskGen(CTexture* pSceneSrc, CTexture* pSceneDst, CTexture* pSunShaftsMaskDst);
-    void GetSunShaftsParams(Vec4 pParams[2])
-    {
-        pParams[0] = m_pRaysCustomCol->GetParamVec4();
-        pParams[1] = Vec4(0, 0, m_pRaysAmount->GetParam(), m_pRaysSunColInfluence->GetParam());
-    }
-
-    virtual const char* GetName() const
-    {
-        return "MergedSunShaftsEdgeAAColorCorrection";
-    }
-
-private:
-
-    bool m_bShaftsEnabled;
-    uint32 m_nVisSampleCount;
-
-    // int, float, float, float, vec4
-    CEffectParam* m_pShaftsType, * m_pShaftsAmount, * m_pRaysAmount, * m_pRaysAttenuation, * m_pRaysSunColInfluence, * m_pRaysCustomCol;
-    CEffectParam* m_pScratchStrength, * m_pScratchThreshold, * m_pScratchIntensity;
-    COcclusionQuery* m_pOcclQuery;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CFilterSharpening
-    : public CPostEffect
-{
-public:
-    CFilterSharpening()
-    {
-        m_nID = ePFX_FilterSharpening;
-
-        AddParamInt("FilterSharpening_Type", m_pType, 0);
-        AddParamFloat("FilterSharpening_Amount", m_pAmount, 1.0f);
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "FilterSharpening";
-    }
-
-private:
-
-    // float, int
-    CEffectParam* m_pAmount, * m_pType;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CFilterBlurring
-    : public CPostEffect
-{
-public:
-    CFilterBlurring()
-    {
-        m_nID = ePFX_FilterBlurring;
-
-        AddParamInt("FilterBlurring_Type", m_pType, 0);
-        AddParamFloat("FilterBlurring_Amount", m_pAmount, 0.0f);
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "FilterBlurring";
-    }
-
-private:
-
-    // float, int
-    CEffectParam* m_pAmount, * m_pType;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CUberGamePostProcess
-    : public CPostEffect
-{
-public:
-
-    // Bitmaks used to enable only certain effects or combinations of most expensive effects
-    enum EPostsProcessMask
-    {
-        ePE_SyncArtifacts = (1 << 0),
-        ePE_RadialBlur = (1 << 1),
-        ePE_ChromaShift = (1 << 2),
-    };
-
-    CUberGamePostProcess()
-    {
-        m_nID = ePFX_UberGamePostProcess;
-        m_nCurrPostEffectsMask = 0;
-
-        AddParamTex("tex_VisualArtifacts_Mask", m_pMask, 0);
-
-        AddParamVec4("clr_VisualArtifacts_ColorTint", m_pColorTint, Vec4(1.0f, 1.0f, 1.0f, 1.0f));
-
-        AddParamFloat("VisualArtifacts_Vsync", m_pVSyncAmount, 0.0f);
-        AddParamFloat("VisualArtifacts_VsyncFreq", m_pVSyncFreq, 1.0f);
-
-        AddParamFloat("VisualArtifacts_Interlacing", m_pInterlationAmount, 0.0f);
-        AddParamFloat("VisualArtifacts_InterlacingTile", m_pInterlationTiling, 1.0f);
-        AddParamFloat("VisualArtifacts_InterlacingRot", m_pInterlationRotation, 0.0f);
-
-        AddParamFloat("VisualArtifacts_Pixelation", m_pPixelationScale, 0.0f);
-        AddParamFloat("VisualArtifacts_Noise", m_pNoise, 0.0f);
-
-        AddParamFloat("VisualArtifacts_SyncWaveFreq", m_pSyncWaveFreq, 0.0f);
-        AddParamFloat("VisualArtifacts_SyncWavePhase", m_pSyncWavePhase, 0.0f);
-        AddParamFloat("VisualArtifacts_SyncWaveAmplitude", m_pSyncWaveAmplitude, 0.0f);
-
-        AddParamFloat("FilterChromaShift_User_Amount", m_pFilterChromaShiftAmount, 0.0f); // Kept for backward - compatibility
-        AddParamFloat("FilterArtifacts_ChromaShift", m_pChromaShiftAmount, 0.0f);
-
-        AddParamFloat("FilterGrain_Amount", m_pFilterGrainAmount, 0.0f);// Kept for backward - compatibility
-        AddParamFloat("FilterArtifacts_Grain", m_pGrainAmount, 0.0f);
-        AddParamFloatNoTransition("FilterArtifacts_GrainTile", m_pGrainTile, 1.0f);
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "UberGamePostProcess";
-    }
-
-private:
-    CEffectParam* m_pVSyncAmount;
-    CEffectParam* m_pVSyncFreq;
-
-    CEffectParam* m_pColorTint;
-
-    CEffectParam* m_pInterlationAmount;
-    CEffectParam* m_pInterlationTiling;
-    CEffectParam* m_pInterlationRotation;
-
-    CEffectParam* m_pPixelationScale;
-    CEffectParam* m_pNoise;
-
-    CEffectParam* m_pSyncWaveFreq;
-    CEffectParam* m_pSyncWavePhase;
-    CEffectParam* m_pSyncWaveAmplitude;
-
-    CEffectParam* m_pFilterChromaShiftAmount;
-    CEffectParam* m_pChromaShiftAmount;
-
-    CEffectParam* m_pGrainAmount;
-    CEffectParam* m_pFilterGrainAmount; // todo: add support
-    CEffectParam* m_pGrainTile;
-
-    CEffectParam* m_pMask;
-
-    uint8 m_nCurrPostEffectsMask;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct SColorGradingMergeParams;
-
-class CColorGrading
-    : public CPostEffect
-{
-public:
-    CColorGrading()
-    {
-        m_nID = ePFX_ColorGrading;
-
-        // levels adjustment
-        AddParamFloatNoTransition("ColorGrading_minInput", m_pMinInput, 0.0f);
-        AddParamFloatNoTransition("ColorGrading_gammaInput", m_pGammaInput, 1.0f);
-        AddParamFloatNoTransition("ColorGrading_maxInput", m_pMaxInput, 255.0f);
-        AddParamFloatNoTransition("ColorGrading_minOutput", m_pMinOutput, 0.0f);
-        AddParamFloatNoTransition("ColorGrading_maxOutput", m_pMaxOutput, 255.0f);
-
-        // generic color adjustment
-        AddParamFloatNoTransition("ColorGrading_Brightness", m_pBrightness, 1.0f);
-        AddParamFloatNoTransition("ColorGrading_Contrast", m_pContrast, 1.0f);
-        AddParamFloatNoTransition("ColorGrading_Saturation", m_pSaturation, 1.0f);
-
-        // filter color
-        m_pDefaultPhotoFilterColor = Vec4(0.952f, 0.517f, 0.09f, 1.0f);
-        AddParamVec4NoTransition("clr_ColorGrading_PhotoFilterColor", m_pPhotoFilterColor,  m_pDefaultPhotoFilterColor);  // use photoshop default orange
-        AddParamFloatNoTransition("ColorGrading_PhotoFilterColorDensity", m_pPhotoFilterColorDensity, 0.0f);
-
-        // selective color
-        AddParamVec4NoTransition("clr_ColorGrading_SelectiveColor", m_pSelectiveColor, Vec4(0.0f, 0.0f, 0.0f, 0.0f)),
-        AddParamFloatNoTransition("ColorGrading_SelectiveColorCyans", m_pSelectiveColorCyans, 0.0f),
-        AddParamFloatNoTransition("ColorGrading_SelectiveColorMagentas", m_pSelectiveColorMagentas, 0.0f),
-        AddParamFloatNoTransition("ColorGrading_SelectiveColorYellows", m_pSelectiveColorYellows, 0.0f),
-        AddParamFloatNoTransition("ColorGrading_SelectiveColorBlacks", m_pSelectiveColorBlacks, 0.0f),
-
-        // mist adjustment
-        AddParamFloatNoTransition("ColorGrading_GrainAmount", m_pGrainAmount, 0.0f);
-        AddParamFloatNoTransition("ColorGrading_SharpenAmount", m_pSharpenAmount, 1.0f);
-
-        // user params
-        AddParamFloatNoTransition("ColorGrading_Saturation_Offset", m_pSaturationOffset, 0.0f);
-        AddParamVec4NoTransition("ColorGrading_PhotoFilterColor_Offset", m_pPhotoFilterColorOffset, Vec4(0.0f, 0.0f, 0.0f, 0.0f));
-        AddParamFloatNoTransition("ColorGrading_PhotoFilterColorDensity_Offset", m_pPhotoFilterColorDensityOffset, 0.0f);
-        AddParamFloatNoTransition("ColorGrading_GrainAmount_Offset", m_pGrainAmountOffset, 0.0f);
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    bool UpdateParams(SColorGradingMergeParams& pMergeParams);
-
-    virtual const char* GetName() const
-    {
-        return "ColorGrading";
-    }
-
-private:
-
-    // levels adjustment
-    CEffectParam* m_pMinInput;
-    CEffectParam* m_pGammaInput;
-    CEffectParam* m_pMaxInput;
-    CEffectParam* m_pMinOutput;
-    CEffectParam* m_pMaxOutput;
-
-    // generic color adjustment
-    CEffectParam* m_pBrightness;
-    CEffectParam* m_pContrast;
-    CEffectParam* m_pSaturation;
-    CEffectParam* m_pSaturationOffset;
-
-    // filter color
-    CEffectParam* m_pPhotoFilterColor;
-    CEffectParam* m_pPhotoFilterColorDensity;
-    CEffectParam* m_pPhotoFilterColorOffset;
-    CEffectParam* m_pPhotoFilterColorDensityOffset;
-    Vec4 m_pDefaultPhotoFilterColor;
-
-    // selective color
-    CEffectParam* m_pSelectiveColor;
-    CEffectParam* m_pSelectiveColorCyans;
-    CEffectParam* m_pSelectiveColorMagentas;
-    CEffectParam* m_pSelectiveColorYellows;
-    CEffectParam* m_pSelectiveColorBlacks;
-
-    // misc adjustments
-    CEffectParam* m_pGrainAmount;
-    CEffectParam* m_pGrainAmountOffset;
-
-    CEffectParam* m_pSharpenAmount;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CUnderwaterGodRays
-    : public CPostEffect
-{
-public:
-    CUnderwaterGodRays()
-    {
-        m_nID = ePFX_eUnderwaterGodRays;
-
-        AddParamFloat("UnderwaterGodRays_Amount", m_pAmount, 1.0f);
-        AddParamInt("UnderwaterGodRays_Quality", m_pQuality, 1); // 0 = low, 1 = med, 2= high, 3= ultra-high, 4= crazy high, and so on
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "UnderwaterGodRays";
-    }
-
-private:
-
-    // float, int
-    CEffectParam* m_pAmount, * m_pQuality;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CVolumetricScattering
-    : public CPostEffect
-{
-public:
-    CVolumetricScattering()
-    {
-        m_nID = ePFX_eVolumetricScattering;
-
-        AddParamFloat("VolumetricScattering_Amount", m_pAmount, 0.0f);
-        AddParamFloat("VolumetricScattering_Tilling", m_pTiling, 1.0f);
-        AddParamFloat("VolumetricScattering_Speed", m_pSpeed, 1.0f);
-        AddParamVec4("clr_VolumetricScattering_Color", m_pColor, Vec4(0.5f, 0.75f, 1.0f, 1.0f));
-
-        AddParamInt("VolumetricScattering_Type", m_pType, 0); // 0 = alien environment, 1 = ?, 2 = ?? ???
-        AddParamInt("VolumetricScattering_Quality", m_pQuality, 1); // 0 = low, 1 = med, 2= high, 3= ultra-high, 4= crazy high, and so on
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "VolumetricScattering";
-    }
-
-private:
-
-    // float, int, int
-    CEffectParam* m_pAmount, * m_pTiling, * m_pSpeed, * m_pColor, * m_pType, * m_pQuality;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Game/Hud specific post-effects
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CAlienInterference
-    : public CPostEffect
-{
-public:
-    CAlienInterference()
-    {
-        m_nID = ePFX_eAlienInterference;
-
-        AddParamFloat("AlienInterference_Amount", m_pAmount, 0);
-        AddParamVec4NoTransition("clr_AlienInterference_Color", m_pTintColor, Vec4(Vec3(0.85f, 0.95f, 1.25f) * 0.5f, 1.0f));
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "AlienInterference";
-    }
-
-private:
-
-    // float
-    CEffectParam* m_pAmount;
-    // vec4
-    CEffectParam* m_pTintColor;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class CGhostVision
-    : public CPostEffect
-{
-public:
-    CGhostVision()
-    {
-        m_nID = ePFX_eGhostVision;
-
-        m_pUserTex1 = 0;
-        m_pUserTex2 = 0;
-
-        AddParamBool("GhostVision_Bool1", m_pUserBool1, 0);
-        AddParamBool("GhostVision_Bool2", m_pUserBool2, 0);
-        AddParamBool("GhostVision_Bool3", m_pUserBool3, 0);
-        AddParamFloat("GhostVision_Amount1", m_pUserValue1, 0);
-        AddParamFloat("GhostVision_Amount2", m_pUserValue2, 0);
-        AddParamFloat("GhostVision_Amount3", m_pUserValue3, 0);
-        AddParamVec4NoTransition("clr_GhostVision_Color", m_pTintColor, Vec4(Vec3(0.55f, 0.55f, 0.55f) * 0.5f, 1.0f));
-    }
-
-    virtual int CreateResources();
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Release();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "GhostVision";
-    }
-
-private:
-    // texture
-    CTexture* m_pUserTex1;
-    CTexture* m_pUserTex2;
-
-    // bool
-    CEffectParam* m_pUserBool1;
-    CEffectParam* m_pUserBool2;
-    CEffectParam* m_pUserBool3;
-
-    // float
-    CEffectParam* m_pUserValue1;
-    CEffectParam* m_pUserValue2;
-    CEffectParam* m_pUserValue3;
-
-    // vec4
-    CEffectParam* m_pTintColor;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class CWaterDroplets
-    : public CPostEffect
-{
-public:
-    CWaterDroplets()
-    {
-        m_nID = ePFX_eWaterDroplets;
-
-        AddParamFloat("WaterDroplets_Amount", m_pAmount, 0.0f);
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "WaterDroplets";
-    }
-
-private:
-
-    // float
-    CEffectParam* m_pAmount;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CWaterFlow
-    : public CPostEffect
-{
-public:
-    CWaterFlow()
-    {
-        m_nID = ePFX_eWaterFlow;
-
-        AddParamFloat("WaterFlow_Amount", m_pAmount, 0.0f);
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "WaterFlow";
-    }
-
-private:
-
-    // float
-    CEffectParam* m_pAmount;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CWaterRipples
-    : public CPostEffect
-{
-    struct SWaterHit
-    {
-        SWaterHit()
-            : worldPos(0.0f, 0.0f)
-            , scale(1.0f)
-            , strength(1.0f)
-        {
-        }
-
-        SWaterHit(const Vec3& hitWorldPos, const float hitScale, const float hitStrength)
-            : worldPos(hitWorldPos.x, hitWorldPos.y)
-            , scale(hitScale)
-            , strength(hitStrength)
-        {
-        }
-
-        Vec2  worldPos;
-        float scale;
-        float strength;
-    };
-
-public:
-    CWaterRipples()
-        : m_bSnapToCenter(false)
-        , m_bInitializeSim(true)
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_WaterRipples;
-
-        AddParamFloatNoTransition("WaterRipples_Amount", m_pAmount, 0.0f);
-
-        m_pRipplesGenTechName = "WaterRipplesGen";
-        m_pRipplesHitTechName = "WaterRipplesHit";
-        m_pRipplesParamName = "WaterRipplesParams";
-
-        m_fLastSpawnTime = 0.0f;
-        m_fSimGridSize = 25.0f;
-        m_fSimGridSnapRange = 5.0f;
-
-        for (uint32 i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-        {
-            s_pWaterHits[i].reserve(16);
-        }
-
-        s_nUpdateMask = 0;
-    }
-
-    static void CreatePhysCallbacks();
-    static void ReleasePhysCallbacks();
-    virtual bool Preprocess();
-
-    // Enabled/Disabled if no hits on list to process - call from render thread
-    bool RT_SimulationStatus();
-
-    // Add hits to list - called from main thread
-    static void AddHit(const Vec3& vPos, const float scale, const float strength);
-
-    virtual void Release()
-    {
-        Reset();
-    }
-
-    void RenderHits();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "WaterRipples";
-    }
-
-    Vec4 GetLookupParams() { return s_vLookupParams; }
-
-    void DEBUG_DrawWaterHits();
-
-private:
-
-    static int OnEventPhysCollision(const struct EventPhys* pEvent);
-
-private:
-
-    enum
-    {
-        MAX_HITS = 128
-    };
-
-    struct SWaterHitRecord
-    {
-        SWaterHit mHit;
-        float fHeight;
-        int nCounter;
-    };
-
-    CCryNameTSCRC m_pRipplesGenTechName;
-    CCryNameTSCRC m_pRipplesHitTechName;
-    CCryNameR m_pRipplesParamName;
-
-    // float
-    CEffectParam* m_pAmount;
-    float m_fLastSpawnTime;
-    float m_fLastUpdateTime;
-
-    float m_fSimGridSize;
-    float m_fSimGridSnapRange;
-
-    static AZStd::vector< CWaterRipples::SWaterHit, AZ::StdLegacyAllocator > s_pWaterHits[RT_COMMAND_BUF_COUNT];
-    static AZStd::vector< CWaterRipples::SWaterHit, AZ::StdLegacyAllocator > s_pWaterHitsMGPU;
-    static AZStd::vector< CWaterRipples::SWaterHitRecord, AZ::StdLegacyAllocator > m_DebugWaterHits;
-    static Vec3 s_CameraPos;
-    static Vec2 s_SimOrigin;
-
-    static int s_nUpdateMask;
-    static Vec4 s_vParams;
-    static Vec4 s_vLookupParams;
-
-    static bool s_bInitializeSim;
-    bool m_bSnapToCenter;
-    bool m_bInitializeSim;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CWaterVolume
-    : public CPostEffect
-{
-public:
-    CWaterVolume()
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_WaterVolume;
-
-        AddParamFloatNoTransition("WaterVolume_Amount", m_pAmount, 0.0f);
-        m_nCurrSimID = 0;
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    int GetCurrentPuddle()
-    {
-        return m_nCurrSimID;
-    }
-
-    virtual const char* GetName() const
-    {
-        return "WaterVolume";
-    }
-
-private:
-
-    // float
-    CEffectParam* m_pAmount;
-    int m_nCurrSimID;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CScreenFrost
-    : public CPostEffect
-{
-public:
-    CScreenFrost()
-    {
-        m_nID = ePFX_eScreenFrost;
-
-        AddParamFloat("ScreenFrost_Amount", m_pAmount, 0.0f); // amount of visible frost
-        AddParamFloat("ScreenFrost_CenterAmount", m_pCenterAmount, 1.0f); // amount of visible frost in center
-
-        m_fRandOffset = 0;
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "ScreenFrost";
-    }
-
-private:
-
-    // float, float
-    CEffectParam* m_pAmount, * m_pCenterAmount;
-    float m_fRandOffset;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CRainDrops
-    : public CPostEffect
-{
-public:
-    CRainDrops()
-    {
-        m_nID = ePFX_eRainDrops;
-
-        AddParamFloat("RainDrops_Amount", m_pAmount, 0.0f); // amount of visible droplets
-        AddParamFloat("RainDrops_SpawnTimeDistance", m_pSpawnTimeDistance, 0.35f); // amount of visible droplets
-        AddParamFloat("RainDrops_Size", m_pSize, 5.0f); // drop size
-        AddParamFloat("RainDrops_SizeVariation", m_pSizeVar, 2.5f); // drop size variation
-
-        m_uCurrentDytex = 0;
-        m_pVelocityProj = Vec3(0, 0, 0);
-
-        m_nAliveDrops = 0;
-
-        m_pPrevView.SetIdentity();
-        m_pViewProjPrev.SetIdentity();
-
-        m_bFirstFrame = true;
-    }
-
-    virtual ~CRainDrops()
-    {
-        Release();
-    }
-
-    virtual int CreateResources();
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    virtual void Release();
-
-    virtual const char* GetName() const;
-
-private:
-
-    // Rain particle properties
-    struct SRainDrop
-    {
-        // set default data
-        SRainDrop()
-            : m_pPos(0, 0, 0)
-            , m_fSize(5.0f)
-            , m_fSizeVar(2.5f)
-            , m_fSpawnTime(0.0f)
-            , m_fLifeTime(2.0f)
-            , m_fLifeTimeVar(1.0f)
-            , m_fWeight(1.0f)
-            , m_fWeightVar(0.25f)
-        {
-        }
-
-        // Screen position
-        Vec3 m_pPos;
-        // Size and variation (bigger also means more weight)
-        float m_fSize, m_fSizeVar;
-        // Spawn time
-        float m_fSpawnTime;
-        // Life time and variation
-        float m_fLifeTime, m_fLifeTimeVar;
-        // Weight and variation
-        float m_fWeight, m_fWeightVar;
-    };
-
-    //in Preprocess(), check if effect is active
-    bool IsActiveRain();
-
-    // Compute current interpolated view matrix
-    Matrix44 ComputeCurrentView(int iViewportWidth, int iViewportHeight);
-
-    // Spawn a particle
-    void SpawnParticle(SRainDrop*& pParticle, int iRTWidth, int iRTHeight);
-    // Update all particles
-    void UpdateParticles(int iRTWidth, int iRTHeight);
-    // Generate rain drops map
-    void RainDropsMapGen();
-    // Draw the raindrops
-    void DrawRaindrops(int iViewportWidth, int iViewportHeight, int iRTWidth, int iRTHeight);
-    // Apply the blur and movement to it
-    void ApplyExtinction(CTexture*& rptexPrevRT, int iViewportWidth, int iViewportHeight, int iRTWidth, int iRTHeight);
-
-    // Final draw pass, merge with backbuffer
-    void DrawFinal(CTexture*& rptexCurrRT);
-
-    // float
-    CEffectParam* m_pAmount;
-    CEffectParam* m_pSpawnTimeDistance;
-    CEffectParam* m_pSize;
-    CEffectParam* m_pSizeVar;
-
-    uint16        m_uCurrentDytex;
-    bool          m_bFirstFrame;
-
-    //todo: use generic screen particles
-    typedef std::vector<SRainDrop*> SRainDropsVec;
-    typedef SRainDropsVec::iterator SRainDropsItor;
-    SRainDropsVec m_pDropsLst;
-
-    Vec3 m_pVelocityProj;
-    Matrix44 m_pPrevView;
-    Matrix44 m_pViewProjPrev;
-
-    int m_nAliveDrops;
-    static const int m_nMaxDropsCount = 100;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CHudSilhouettes
-    : public CPostEffect
-{
-public:
-    CHudSilhouettes()
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_HUDSilhouettes;
-
-        m_deferredSilhouettesOptimisedTech = "DeferredSilhouettesOptimised";
-        m_psParamName = "psParams";
-        m_vsParamName = "vsParams";
-
-        m_bSilhouettesOptimisedTechAvailable = false;
-        m_pSilhouetesRT = NULL;
-
-        AddParamBool("HudSilhouettes_Active", m_pActive, 0);
-        AddParamFloatNoTransition("HudSilhouettes_Amount", m_pAmount, 1.0f); //0.0f gives funky blending result ? investigate
-        AddParamFloatNoTransition("HudSilhouettes_FillStr", m_pFillStr, 0.15f);
-        AddParamInt("HudSilhouettes_Type", m_pType, 1);
-
-        FindIfSilhouettesOptimisedTechAvailable();
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "HUDSilhouettes";
-    }
-
-private:
-
-    void    RenderDeferredSilhouettes(float fBlendParam, float fType);
-    void  RenderDeferredSilhouettesOptimised(float fBlendParam, float fType);
-
-    void    FindIfSilhouettesOptimisedTechAvailable()
-    {
-#ifndef NULL_RENDERER
-        if (CShaderMan::s_shPostEffectsGame)
-        {
-            m_bSilhouettesOptimisedTechAvailable = (CShaderMan::s_shPostEffectsGame->mfFindTechnique(m_deferredSilhouettesOptimisedTech)) ? true : false;
-        }
-#endif
-    }
-
-
-    CCryNameTSCRC m_deferredSilhouettesOptimisedTech;
-    CCryNameR           m_vsParamName;
-    CCryNameR           m_psParamName;
-
-    // float
-    CEffectParam* m_pAmount, * m_pFillStr, * m_pType;
-    CTexture* m_pSilhouetesRT;
-
-    bool m_bSilhouettesOptimisedTechAvailable;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CFlashBang
-    : public CPostEffect
-{
-public:
-    CFlashBang()
-    {
-        m_nID = ePFX_eFlashBang;
-
-        AddParamBool("FlashBang_Active", m_pActive, 0);
-        AddParamFloat("FlashBang_DifractionAmount", m_pDifractionAmount, 1.0f);
-        AddParamFloat("FlashBang_Time", m_pTime, 2.0f); // flashbang time duration in seconds
-        AddParamFloat("FlashBang_BlindAmount", m_pBlindAmount, 0.5f); // flashbang blind time (fraction of frashbang time)
-
-        m_pGhostImage = 0;
-        m_fBlindAmount = 1.0f;
-        m_fSpawnTime = 0.0f;
-    }
-
-    virtual ~CFlashBang()
-    {
-        Release();
-    }
-
-    virtual bool Preprocess();
-    virtual void Release();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "FlashBang";
-    }
-
-private:
-
-    SDynTexture* m_pGhostImage;
-
-    float m_fBlindAmount;
-    float m_fSpawnTime;
-
-    // float, float
-    CEffectParam* m_pTime, * m_pDifractionAmount, * m_pBlindAmount;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CSceneRain
-    : public CPostEffect
-{
-public:
-    CSceneRain()
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_SceneRain;
-
-        m_pConeVB = 0;
-        m_nConeVBSize = 0;
-        m_updateFrameCount = 0;
-        m_bReinit = true;
-
-        AddParamBool("SceneRain_Active", m_pActive, 0);
-    }
-
-    virtual int CreateResources();
-    virtual void Release();
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    virtual void OnLostDevice();
-
-    virtual const char* GetName() const;
-
-    // Rain volume parameters (filled during rain layer/occ generation pass)
-    SRainParams m_RainVolParams;
-
-private:
-    bool m_bReinit;
-    void* m_pConeVB;
-    uint16 m_nConeVBSize;
-    uint32 m_updateFrameCount;
-    void CreateBuffers(uint16 nVerts, void*& pINVB, SVF_P3F_C4B_T2F* pVtxList);
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CSceneSnow
-    : public CPostEffect
-{
-public:
-    _smart_ptr<IRenderMesh> m_pSnowFlakeMesh;
-    CSceneSnow()
-    {
-        m_nID = ePFX_SceneSnow;
-
-        AddParamBool("SceneSnow_Active", m_pActive, 0);
-
-        m_nAliveClusters = 0;
-        m_pSnowFlakeMesh = NULL;
-    }
-
-    virtual ~CSceneSnow()
-    {
-        Release();
-    }
-
-    bool IsActiveSnow();
-
-    virtual int CreateResources();
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    virtual void Release();
-
-    virtual const char* GetName() const;
-
-    // Rain volume parameters (filled during rain layer/occ generation pass)
-    // Needed for occlusion.
-    SRainParams m_RainVolParams;
-    SSnowParams m_SnowVolParams;
-
-private:
-
-    // Snow particle properties
-    struct SSnowCluster
-    {
-        // set default data
-        SSnowCluster()
-            : m_pPos(0, 0, 0)
-            , m_pPosPrev(0, 0, 0)
-            , m_fSpawnTime(0.0f)
-            , m_fLifeTime(4.0f)
-            , m_fLifeTimeVar(2.5f)
-            , m_fWeight(0.3f)
-            , m_fWeightVar(0.1f)
-        {
-        }
-
-        // World position
-        Vec3 m_pPos, m_pPosPrev;
-        // Spawn time
-        float m_fSpawnTime;
-        // Life time and variation
-        float m_fLifeTime, m_fLifeTimeVar;
-        // Weight and variation
-        float m_fWeight, m_fWeightVar;
-    };
-
-    // Generate particle cluster mesh
-    bool GenerateClusterMesh();
-    // Spawn a cluster
-    void SpawnCluster(SSnowCluster*& pCluster);
-    // Update all clusters
-    void UpdateClusters();
-    // Draw clusters
-    void DrawClusters();
-    // Half resolution composite.
-    void HalfResComposite();
-
-    // float
-    CEffectParam* m_pActive;
-
-    typedef std::vector<SSnowCluster*> SSnowClusterVec;
-    typedef SSnowClusterVec::iterator SSnowClusterItor;
-    SSnowClusterVec m_pClusterList;
-
-    int m_nSnowFlakeVertCount;
-
-    int m_nAliveClusters;
-    int m_nNumClusters;
-    int m_nFlakesPerCluster;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CSoftAlphaTest
-    : public CPostEffect
-{
-public:
-    CSoftAlphaTest()
-    {
-        m_nID = ePFX_eSoftAlphaTest;
-        m_nRenderFlags = 0;
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    virtual const char* GetName() const
-    {
-        return "SoftAlphaTest";
-    }
-
-private:
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CImageGhosting
-    : public CPostEffect
-{
-public:
-    CImageGhosting()
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_ImageGhosting;
-        AddParamFloat("ImageGhosting_Amount", m_pAmount, 0);
-        m_bInit = true;
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    virtual const char* GetName() const
-    {
-        return "ImageGhosting";
-    }
-
-private:
-
-    CEffectParam* m_pAmount;
-    bool m_bInit;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CFilterKillCamera
-    : public CPostEffect
-{
-public:
-
-    CFilterKillCamera()
-    {
-        m_nID = ePFX_FilterKillCamera;
-
-        AddParamBool("FilterKillCamera_Active", m_pActive, 0);
-        AddParamInt("FilterKillCamera_Mode", m_pMode, 0);
-        AddParamFloat("FilterKillCamera_GrainStrength", m_pGrainStrength, 0.0f);
-        AddParamVec4("FilterKillCamera_ChromaShift", m_pChromaShift, Vec4(1.0f, 0.5f, 0.1f, 1.0f)); // xyz = offset, w = strength
-        AddParamVec4("FilterKillCamera_Vignette", m_pVignette, Vec4(1.0f, 1.0f, 0.5f, 1.4f)); // xy = screen scale, z = radius, w = blind noise vignette scale
-        AddParamVec4("FilterKillCamera_ColorScale", m_pColorScale, Vec4(1.0f, 1.0f, 1.0f, 1.0f));
-        AddParamVec4("FilterKillCamera_Blindness", m_pBlindness, Vec4(0.5f, 0.5f, 1.0f, 0.7f)); // x = blind duration, y = blind fade out duration, z = blindness grey scale, w = blind noise min scale
-
-        m_blindTimer = 0.0f;
-        m_lastMode = 0;
-    }
-
-    virtual int Initialize();
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "FilterKillCamera";
-    }
-
-private:
-
-    CCryNameTSCRC m_techName;
-    CCryNameR m_paramName;
-
-    CEffectParam* m_pGrainStrength;
-    CEffectParam*   m_pChromaShift;
-    CEffectParam* m_pVignette;
-    CEffectParam* m_pColorScale;
-    CEffectParam* m_pBlindness;
-    CEffectParam* m_pMode;
-    float                   m_blindTimer;
-    int                     m_lastMode;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CScreenBlood
-    : public CPostEffect
-{
-public:
-    CScreenBlood()
-    {
-        m_nRenderFlags = 0;
-        m_nID = ePFX_eScreenBlood;
-        AddParamFloat("ScreenBlood_Amount", m_pAmount, 0.0f);  // damage amount
-        AddParamVec4("ScreenBlood_Border", m_pBorder, Vec4(0.0f, 0.0f, 2.0f, 1.0f));  // Border: x=xOffset y=yOffset z=range w=alpha
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-    virtual const char* GetName() const
-    {
-        return "ScreenBlood";
-    }
-
-private:
-
-    CEffectParam* m_pAmount;
-    CEffectParam* m_pBorder;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class ScreenFader
-    : public CPostEffect
-{
-public:
-    ScreenFader()
-    {
-        m_nID = ePFX_ScreenFader;
-
-        AddParamBool("ScreenFader_Enable", m_enable, false);
-        AddParamFloatNoTransition("ScreenFader_FadeInTime", m_fadeInTime, 0.0f);
-        AddParamFloatNoTransition("ScreenFader_FadeOutTime", m_fadeOutTime, 0.0f);
-        AddParamVec4NoTransition("ScreenFader_ScreenCoordinates", m_screenCoordinates, Vec4(0.0f, 0.0f, 1.0f, 1.0f));
-        AddParamVec4NoTransition("ScreenFader_FadeColor", m_fadeColor, Vec4(0.0f, 0.0f, 0.0f, 0.0f));
-        AddParamTex("ScreenFader_TextureName", m_fadeTextureParam, 0);
-    }
-
-    ~ScreenFader()
-    {
-        // Clean up our ScenePasses
-        ScreenPassList::iterator passIter = m_screenPasses.begin();
-        while ( passIter != m_screenPasses.end() )
-        {
-            ScreenFaderPass* pass = (*passIter);
-            delete pass;
-            passIter = m_screenPasses.erase(passIter);
-        }
-    }
-
-    bool Preprocess() override;
-    virtual void Render() override;
-    virtual void Reset(bool bOnSpecChange = false) override;
-
-    const char* GetName() const override
-    {
-        return "ScreenFader";
-    }
-
-private:
-    
-    struct ScreenFaderPass
-    {
-        ScreenFaderPass()
-        {
-            m_currentColor = ColorF(0.0f, 0.0f, 0.0f, 1.0f);    
-            m_screenCoordinates = Vec4(0.0f, 0.0f, 1.0f, 1.0f);
-        }
-        ~ScreenFaderPass()
-        {
-            if ( m_fadeTexture )
-            {
-                m_fadeTexture->Release();
-            }
-        }
-
-        IPostEffectGroup* m_group = nullptr;
-        CTexture* m_fadeTexture = nullptr;
-        ColorF m_currentColor;
-
-        // Specified as a 0 -> 1 percentage value for screen coordinates.  0,0,1,1 == fullscreen.
-        Vec4 m_screenCoordinates;
-        bool m_fadingIn = false;
-        bool m_fadingOut = false;
-        float m_currentFadeTime = 0.0f;
-        float m_fadeInTime = 0.0f;
-        float m_fadeOutTime = 0.0f;
-        float m_fadeDuration = 0.0f; // Helper variable that will be set to the duration of fadeInTime or FadeOutTime
-        float m_fadeDirection = 0.0f; // Multiplier -1 or +1
-    };
-    
-    static bool SortFaderPasses(ScreenFaderPass* pass1, ScreenFaderPass* pass2);
-
-    ScreenFader(const ScreenFader& other) = delete;
-    ScreenFader(ScreenFader&&) = delete;
-
-    // Screen fader passes will render on top of each other, rather than blend between the previous
-    // screen fader passes that were set in previous PostEffectGroup files.
-    // This list will be sorted based on the priority of its PostEffectGroup
-    typedef AZStd::list<ScreenFaderPass*> ScreenPassList;
-    ScreenPassList m_screenPasses;
-
-    // Unlike other CPostEffect objects, we do NOT want to read the values that are auto-populated into these variables.
-    // They will input into ::PreProcess with the blended values between the last two PostEffectGroup layers.
-    // This system requires the individual values from each active group, not the blended values.
-    // These variables are re-used as teporary variables when reading variables from the groups.
-    CEffectParam* m_enable = nullptr;
-    CEffectParam* m_fadeInTime = nullptr;
-    CEffectParam* m_fadeOutTime = nullptr;
-    CEffectParam* m_fadeColor = nullptr;
-    CEffectParam* m_screenCoordinates = nullptr;
-    CEffectParam* m_fadeTextureParam = nullptr;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CPost3DRenderer
-    : public CPostEffect
-{
-public:
-
-    enum ERenderMeshMode
-    {
-        eRMM_Default = 0,
-        eRMM_Custom,
-        eRMM_DepthOnly
-    };
-
-    enum EPost3DRendererFlags
-    {
-        eP3DR_HasSilhouettes                                                = (1 << 0),
-        eP3DR_DirtyFlashRT                                                  =   (1 << 1),
-        eP3DR_ClearOnResolveTempRT                                  = (1 << 2),
-        eP3DR_ClearOnResolveFlashRT                                 = (1 << 3),
-        eP3DR_ClearOnResolvePrevBackBufferCopyRT        = (1 << 4)
-    };
-
-    CPost3DRenderer()
-    {
-        m_nID = ePFX_Post3DRenderer;
-
-        AddParamBool("Post3DRenderer_Active", m_pActive, 0);
-        AddParamFloat("Post3DRenderer_FOVScale", m_pFOVScale, 0.5f);
-        AddParamFloat("Post3DRenderer_SilhouetteStrength", m_pSilhouetteStrength, 0.3f);
-        AddParamFloat("Post3DRenderer_EdgeFadeScale", m_pEdgeFadeScale, 0.2f); // Between 0 and 1.0
-        AddParamFloat("Post3DRenderer_PixelAspectRatio", m_pPixelAspectRatio, 1.0f);
-        AddParamVec4("Post3DRenderer_Ambient", m_pAmbient, Vec4(0.0f, 0.0f, 0.0f, 0.2f));
-
-        m_gammaCorrectionTechName = "Post3DRendererGammaCorrection";
-        m_alphaCorrectionTechName = "Post3DRendererAlphaCorrection";
-        m_texToTexTechName = "TextureToTexture";
-        m_customRenderTechName = "CustomRenderPass";
-        m_combineSilhouettesTechName = "Post3DRendererSilhouttes";
-        m_silhouetteTechName = "BinocularView";
-
-        m_psParamName = "psParams";
-        m_vsParamName = "vsParams";
-
-        m_nRenderFlags = 0;
-
-        m_pFlashRT = NULL;
-        m_pTempRT = NULL;
-
-        m_edgeFadeScale = 0.0f;
-        m_alpha = 1.0f;
-        m_groupCount = 0;
-        m_post3DRendererflags = 0;
-        m_deferDisableFrameCountDown = 0;
-    }
-
-    virtual bool Preprocess();
-    virtual void Render();
-    virtual void Reset(bool bOnSpecChange = false);
-
-    virtual const char* GetName() const
-    {
-        return "Post3DRenderer";
-    }
-
-private:
-
-    ILINE bool HasModelsToRender() const
-    {
-        SRenderListDesc* pRenderListDesc = gRenDev->m_RP.m_pRLD;
-        const uint32 batchMask = SRendItem::BatchFlags(EFSLIST_GENERAL, pRenderListDesc)
-            | SRendItem::BatchFlags(EFSLIST_SKIN, pRenderListDesc)
-            | SRendItem::BatchFlags(EFSLIST_DECAL, pRenderListDesc)
-            | SRendItem::BatchFlags(EFSLIST_TRANSP, pRenderListDesc);
-        return (batchMask & FB_POST_3D_RENDER) ? true : false;
-    }
-
-    void    ClearFlashRT();
-
-    void  RenderGroup(uint8 groupId);
-    void    RenderMeshes(uint8 groupId, float screenRect[4], ERenderMeshMode renderMeshMode = eRMM_Default);
-    void    RenderDepth(uint8 groupId, float screenRect[4], bool bCustomRender = false);
-    void    AlphaCorrection();
-    void    GammaCorrection(float screenRect[4]);
-    void    RenderSilhouettes(uint8 groupId, float screenRect[4]);
-    void    SilhouetteOutlines(CTexture* pOutlineTex, CTexture* pGlowTex);
-    void    SilhouetteGlow(CTexture* pOutlineTex, CTexture* pGlowTex);
-    void    SilhouetteCombineBlurAndOutline(CTexture* pOutlineTex, CTexture* pGlowTex);
-    void    ApplyShaderQuality(EShaderType shaderType = eST_General);
-
-    void    ProcessRenderList(int list, uint32 batchFilter, uint8 groupId, float screenRect[4], bool bCustomRender = false);
-    void  ProcessBatchesList(int listStart, int listEnd, uint32 batchFilter, uint8 groupId, float screenRect[4], bool bCustomRender = false);
-
-    CCryNameTSCRC       m_gammaCorrectionTechName;
-    CCryNameTSCRC       m_alphaCorrectionTechName;
-    CCryNameTSCRC     m_texToTexTechName;
-    CCryNameTSCRC       m_customRenderTechName;
-    CCryNameTSCRC       m_combineSilhouettesTechName;
-    CCryNameTSCRC       m_silhouetteTechName;
-
-    CCryNameR               m_psParamName;
-    CCryNameR               m_vsParamName;
-
-    CEffectParam*       m_pFOVScale;
-    CEffectParam*       m_pAmbient;
-    CEffectParam*       m_pSilhouetteStrength;
-    CEffectParam*       m_pEdgeFadeScale;
-    CEffectParam*       m_pPixelAspectRatio;
-
-    CTexture*               m_pFlashRT;
-    CTexture*               m_pTempRT;
-
-    float                       m_alpha;
-    float                       m_edgeFadeScale;
-
-    uint8                       m_groupCount;
-    uint8                       m_post3DRendererflags;
-    uint8                       m_deferDisableFrameCountDown;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTEFFECTS_H
diff --git a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcess.cpp b/Code/CryEngine/RenderDll/Common/PostProcess/PostProcess.cpp
deleted file mode 100644
index 1d30fa53cf..0000000000
--- a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcess.cpp
+++ /dev/null
@@ -1,673 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "PostEffects.h"
-#include <I3DEngine.h>
-
-void CParamBool::SetParam(float fParam, [[maybe_unused]] bool bForceValue)
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    CParamBoolThreadSafeData* pThreadSafeData = &m_threadSafeData[threadID];
-    pThreadSafeData->bParam = (fParam) ? true : false;
-    pThreadSafeData->bSetThisFrame = true;
-}
-
-float CParamBool::GetParam()
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    return static_cast<float>(m_threadSafeData[threadID].bParam);
-}
-
-void CParamBool::SyncMainWithRender()
-{
-    CParamBoolThreadSafeData* pFillData = &m_threadSafeData[gRenDev->m_RP.m_nFillThreadID];
-
-    const bool bIsMultiThreaded = (gRenDev->m_pRT) ? (gRenDev->m_pRT->IsMultithreaded()) : false;
-    CParamBoolThreadSafeData* pProcessData = NULL;
-    if (bIsMultiThreaded)
-    {
-        // If value is set on render thread, then this should override main thread value
-        pProcessData = &m_threadSafeData[gRenDev->m_RP.m_nProcessThreadID];
-        if (pProcessData->bSetThisFrame)
-        {
-            pFillData->bParam = pProcessData->bParam;
-        }
-    }
-
-    // Reset set value
-    pFillData->bSetThisFrame = false;
-
-    if (bIsMultiThreaded)
-    {
-        // Copy fill data into process data
-        memcpy(pProcessData, pFillData, sizeof(CParamBoolThreadSafeData));
-    }
-}
-
-void CParamInt::SetParam(float fParam, [[maybe_unused]] bool bForceValue)
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    CParamIntThreadSafeData* pThreadSafeData = &m_threadSafeData[threadID];
-    pThreadSafeData->nParam = static_cast<int>(fParam);
-    pThreadSafeData->bSetThisFrame = true;
-}
-
-float CParamInt::GetParam()
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    return static_cast<float>(m_threadSafeData[threadID].nParam);
-}
-void CParamInt::SyncMainWithRender()
-{
-    CParamIntThreadSafeData* pFillData = &m_threadSafeData[gRenDev->m_RP.m_nFillThreadID];
-
-    const bool bIsMultiThreaded = (gRenDev->m_pRT) ? (gRenDev->m_pRT->IsMultithreaded()) : false;
-    CParamIntThreadSafeData* pProcessData = NULL;
-    if (bIsMultiThreaded)
-    {
-        // If value is set on render thread, then this should override main thread value
-        pProcessData = &m_threadSafeData[gRenDev->m_RP.m_nProcessThreadID];
-        if (pProcessData->bSetThisFrame)
-        {
-            pFillData->nParam = pProcessData->nParam;
-        }
-    }
-
-    // Reset set value
-    pFillData->bSetThisFrame = false;
-
-    if (bIsMultiThreaded)
-    {
-        // Copy fill data into process data
-        memcpy(pProcessData, pFillData, sizeof(CParamIntThreadSafeData));
-    }
-}
-
-void CParamFloat::SetParam(float fParam, [[maybe_unused]] bool bForceValue)
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    CParamFloatThreadSafeData* pThreadSafeData = &m_threadSafeData[threadID];
-    pThreadSafeData->fParam = fParam;
-    pThreadSafeData->bSetThisFrame = true;
-}
-
-float CParamFloat::GetParam()
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    return m_threadSafeData[threadID].fParam;
-}
-
-void CParamFloat::SyncMainWithRender()
-{
-    // The Effect params can be set/get from both threads, accumulate and sync data here
-    CParamFloatThreadSafeData* pFillData = &m_threadSafeData[gRenDev->m_RP.m_nFillThreadID];
-
-    const bool bIsMultiThreaded = (gRenDev->m_pRT) ? (gRenDev->m_pRT->IsMultithreaded()) : false;
-    CParamFloatThreadSafeData* pProcessData = NULL;
-    if (bIsMultiThreaded)
-    {
-        // If value is set on render thread, then this should override main thread value
-        pProcessData = &m_threadSafeData[gRenDev->m_RP.m_nProcessThreadID];
-        if (pProcessData->bSetThisFrame)
-        {
-            pFillData->fParam = pProcessData->fParam;
-        }
-    }
-
-    // Reset set value
-    pFillData->bSetThisFrame = false;
-
-    if (bIsMultiThreaded)
-    {
-        // Copy fill data into process data
-        memcpy(pProcessData, pFillData, sizeof(CParamFloatThreadSafeData));
-    }
-}
-
-void CParamVec4::SetParamVec4(const Vec4& vParam, [[maybe_unused]] bool bForceValue)
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    CParamVec4ThreadSafeData* pThreadSafeData = &m_threadSafeData[threadID];
-    pThreadSafeData->vParam = vParam;
-    pThreadSafeData->bSetThisFrame = true;
-}
-
-Vec4 CParamVec4::GetParamVec4()
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    return m_threadSafeData[threadID].vParam;
-}
-
-void CParamVec4::SyncMainWithRender()
-{
-    // The Effect params can be set/get from both threads, accumulate and sync data here
-    CParamVec4ThreadSafeData* pFillData = &m_threadSafeData[gRenDev->m_RP.m_nFillThreadID];
-
-    const bool bIsMultiThreaded = (gRenDev->m_pRT) ? (gRenDev->m_pRT->IsMultithreaded()) : false;
-    CParamVec4ThreadSafeData* pProcessData = NULL;
-    if (bIsMultiThreaded)
-    {
-        // If value is set on render thread, then this should override main thread value
-        pProcessData = &m_threadSafeData[gRenDev->m_RP.m_nProcessThreadID];
-        if (pProcessData->bSetThisFrame)
-        {
-            pFillData->vParam = pProcessData->vParam;
-        }
-    }
-
-    // Reset set value
-    pFillData->bSetThisFrame = false;
-
-    if (bIsMultiThreaded)
-    {
-        // Copy fill data into process data
-        memcpy(pProcessData, pFillData, sizeof(CParamVec4ThreadSafeData));
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#if !defined(_RELEASE)
-
-static void SetPostEffectParamF(IConsoleCmdArgs* pArgs)
-{
-    if (pArgs->GetArgCount() < 3)
-    {
-        return;
-    }
-
-    bool bForceValue = false;
-    if (pArgs->GetArgCount() > 3)
-    {
-        const int iForceValue = (int)atoi(pArgs->GetArg(3));
-        if (iForceValue != 0)
-        {
-            bForceValue = true;
-        }
-    }
-
-    const char* szPostEffectParamName = pArgs->GetArg(1);
-    const float fValue = (float)atof(pArgs->GetArg(2));
-
-    I3DEngine* pEngine = gEnv->p3DEngine;
-    pEngine->SetPostEffectParam(szPostEffectParamName, fValue, bForceValue);
-}
-
-static void GetPostEffectParamF(IConsoleCmdArgs* pArgs)
-{
-    if (pArgs->GetArgCount() < 2)
-    {
-        return;
-    }
-
-    const char* szPostEffectParamName = pArgs->GetArg(1);
-
-    I3DEngine* pEngine = gEnv->p3DEngine;
-    float fValue = 0.0f;
-    pEngine->GetPostEffectParam(szPostEffectParamName, fValue);
-    CryLogAlways("\nPost effect param value: %f", fValue);
-}
-
-#endif // !defined(_RELEASE)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-int CPostEffectsMgr::Init()
-{
-    m_bPostReset = false;
-    ClearCache();
-
-    // Initialize the CRC table
-    // This is the official polynomial used by CRC-32
-    // in PKZip, WinZip and Ethernet.
-    unsigned int ulPolynomial = 0x04c11db7;
-
-    // 256 values representing ASCII character codes.
-    for (int i = 0; i <= 0xFF; i++)
-    {
-        m_nCRC32Table[i] = CRC32Reflect(i, 8) << 24;
-        for (int j = 0; j < 8; j++)
-        {
-            m_nCRC32Table[i] = (m_nCRC32Table[i] << 1) ^ (m_nCRC32Table[i] & (1 << 31) ? ulPolynomial : 0);
-        }
-        m_nCRC32Table[i] = CRC32Reflect(m_nCRC32Table[i], 32);
-    } //i
-
-    // Register default parameters
-    AddParamFloat("Global_Brightness", m_pBrightness, 1.0f); // brightness
-    AddParamFloat("Global_Contrast", m_pContrast, 1.0f); // contrast
-    AddParamFloat("Global_Saturation", m_pSaturation, 1.0f); // saturation
-
-    AddParamFloat("Global_ColorC", m_pColorC, 0.0f); // cyan amount
-    AddParamFloat("Global_ColorY", m_pColorY, 0.0f); // yellow amount
-    AddParamFloat("Global_ColorM", m_pColorM, 0.0f); // magenta amount
-    AddParamFloat("Global_ColorK", m_pColorK, 0.0f); // darkness amount
-
-    AddParamFloat("Global_ColorHue", m_pColorHue, 0.0f); // image hue rotation
-
-    // User parameters
-    AddParamFloat("Global_User_Brightness", m_pUserBrightness, 1.0f); // brightness
-    AddParamFloat("Global_User_Contrast", m_pUserContrast, 1.0f); // contrast
-    AddParamFloat("Global_User_Saturation", m_pUserSaturation, 1.0f); // saturation
-
-    AddParamFloat("Global_User_ColorC", m_pUserColorC, 0.0f); // cyan amount
-    AddParamFloat("Global_User_ColorY", m_pUserColorY, 0.0f); // yellow amount
-    AddParamFloat("Global_User_ColorM", m_pUserColorM, 0.0f); // magenta amount
-    AddParamFloat("Global_User_ColorK", m_pUserColorK, 0.0f); // darkness amount
-
-    AddParamFloat("Global_User_ColorHue", m_pUserColorHue, 0.0f); // image hue rotation
-
-    AddParamFloat("Global_User_HDRBloom", m_UserHDRBloom, 0.f); // bloom amount
-
-    // Register all post processes
-    AddEffect(CSceneSnow);
-    AddEffect(CSceneRain);
-    AddEffect(CSunShafts);
-    AddEffect(CDepthOfField);
-    AddEffect(CMotionBlur);
-    AddEffect(CUnderwaterGodRays);
-    AddEffect(CVolumetricScattering);
-    AddEffect(CRainDrops);
-    AddEffect(CWaterDroplets);
-    AddEffect(CWaterFlow);
-    AddEffect(CScreenFrost);
-    AddEffect(CAlienInterference);
-    AddEffect(CFlashBang);
-    AddEffect(CFilterSharpening);
-    AddEffect(CFilterBlurring);
-    AddEffect(CColorGrading);
-    AddEffect(CHudSilhouettes);
-    AddEffect(CImageGhosting);
-    AddEffect(CWaterRipples);
-    AddEffect(CWaterVolume);
-    AddEffect(CPostAA);
-    AddEffect(CFilterKillCamera);
-    AddEffect(CUberGamePostProcess);
-    AddEffect(CSoftAlphaTest);
-    AddEffect(CScreenBlood);
-    AddEffect(CPost3DRenderer);
-    AddEffect(CGhostVision);
-    AddEffect(ScreenFader);
-
-    // Sort all post effects by ID
-    std::sort(m_pEffects.begin(), m_pEffects.end(), SortEffectsByID);
-
-    // Initialize all post process techniques
-    std::for_each(m_pEffects.begin(), m_pEffects.end(), SContainerPostEffectInitialize());
-    m_bCreated = false;
-
-    // Initialize parameters
-    StringEffectMapItor pItor = m_pNameIdMapGen.begin(), pEnd = m_pNameIdMapGen.end();
-    for (; pItor != pEnd; ++pItor)
-    {
-        m_pNameIdMap.insert(KeyEffectMapItor::value_type(GetCRC(pItor->first.c_str()), pItor->second));
-    }
-
-    m_pNameIdMapGen.clear();
-
-#if !defined(_RELEASE)
-    REGISTER_COMMAND("r_setposteffectparamf", SetPostEffectParamF, VF_CHEAT, "Sets post effect param (float)n"
-        "Usage: r_setposteffectparamf [posteffectparamname, value, forceValue(OPTIONAL)]\n"
-        "Example: r_setposteffectparamf HUD3D_FOV 35.0   (Doesn't force value)\n"
-        "Example: r_setposteffectparamf HUD3D_FOV 35.0 1 (Forces value)\n");
-
-     REGISTER_COMMAND("r_getposteffectparamf", GetPostEffectParamF, VF_CHEAT, "Outputs post effect param value (float) to log"
-        "Usage: r_setposteffectparamf [posteffectparamname]\n"
-        "Example: r_getposteffectparamf HUD3D_FOV\n");
-#endif
-
-    // TESTING
-    static int r_3MonHack;
-    static float r_3MonHackHUDFOVX;
-    static float r_3MonHackHUDFOVY;
-    static float r_3MonHackLeftCGFOffsetX;
-    static float r_3MonHackRightCGFOffsetX;
-    REGISTER_CVAR(r_3MonHack, 0, VF_CHEAT | VF_CHEAT_NOCHECK, "Enables 3 monitor hack hud in center");
-    REGISTER_CVAR(r_3MonHackHUDFOVX, 28, VF_CHEAT | VF_CHEAT_NOCHECK, "3 monitor hack hud in center - X FOV");
-    REGISTER_CVAR(r_3MonHackHUDFOVY, 60, VF_CHEAT | VF_CHEAT_NOCHECK, "3 monitor hack hud in center - Y FOV");
-    REGISTER_CVAR(r_3MonHackLeftCGFOffsetX, 0.93f, VF_CHEAT | VF_CHEAT_NOCHECK, "3 monitor hack hud in center - Adds position offset in X direction to all left CGF planes");
-    REGISTER_CVAR(r_3MonHackRightCGFOffsetX, -0.93f, VF_CHEAT | VF_CHEAT_NOCHECK, "3 monitor hack hud in center - Adds position offset in X direction to all right CGF planes");
-
-
-    return 1;
-}
-
-void CPostEffectsMgr::CreateResources()
-{
-    // Initialize all post process techniques
-    if (!m_bCreated)
-    {
-        std::for_each(m_pEffects.begin(), m_pEffects.end(), SContainerPostEffectCreateResources());
-    }
-    m_bCreated = true;
-}
-void CPostEffectsMgr::ReleaseResources()
-{
-    if (m_bCreated)
-    {
-        std::for_each(m_pEffects.begin(), m_pEffects.end(), container_object_safe_release());
-    }
-
-#ifndef _RELEASE
-    ClearDebugInfo();
-#endif
-
-    m_bCreated = false;
-}
-
-void CPostEffectsMgr::Release()
-{
-    // Free all resources
-    ClearCache();
-
-    std::for_each(m_pNameIdMap.begin(), m_pNameIdMap.end(), SContainerKeyEffectParamDelete());
-    m_pNameIdMap.clear();
-
-    std::for_each(m_pEffects.begin(), m_pEffects.end(), container_object_safe_release());
-    std::for_each(m_pEffects.begin(), m_pEffects.end(), container_object_safe_delete());
-    m_pEffects.clear();
-
-    m_bCreated = false;
-
-#if !defined(_RELEASE)
-    IConsole* pConsole = gEnv->pConsole;
-    if (pConsole)
-    {
-        pConsole->RemoveCommand("r_setposteffectparamf");
-        pConsole->RemoveCommand("r_getposteffectparamf");
-    }
-#endif
-}
-
-void CPostEffectsMgr::Reset(bool bOnSpecChange)
-{
-    ClearCache();
-
-    m_pBrightness->ResetParam(1.0f);
-    m_pContrast->ResetParam(1.0f);
-    m_pSaturation->ResetParam(1.0f);
-    m_pColorC->ResetParam(0.0f);
-    m_pColorY->ResetParam(0.0f);
-    m_pColorM->ResetParam(0.0f);
-    m_pColorK->ResetParam(0.0f);
-    m_pColorHue->ResetParam(0.0f);
-    m_pUserBrightness->ResetParam(1.0f);
-    m_pUserContrast->ResetParam(1.0f);
-    m_pUserSaturation->ResetParam(1.0f);
-    m_pUserColorC->ResetParam(0.0f);
-    m_pUserColorY->ResetParam(0.0f);
-    m_pUserColorM->ResetParam(0.0f);
-    m_pUserColorK->ResetParam(0.0f);
-    m_pUserColorHue->ResetParam(0.0f);
-
-    if (bOnSpecChange)
-    {
-        std::for_each(m_pEffects.begin(), m_pEffects.end(), SContainerPostEffectResetOnSpecChange());
-    }
-    else
-    {
-        std::for_each(m_pEffects.begin(), m_pEffects.end(), SContainerPostEffectReset());
-    }
-}
-
-int32 CPostEffectsMgr::GetEffectID(const char* pEffectName)
-{
-    int32 effectID = ePFX_Invalid;
-
-    CPostEffectsMgr* pPostMgr = PostEffectMgr();
-    for (CPostEffectItor pItor = pPostMgr->GetEffects().begin(), pItorEnd = pPostMgr->GetEffects().end(); pItor != pItorEnd; ++pItor)
-    {
-        CPostEffect* pCurrEffect = (*pItor);
-        if (strcmp(pEffectName, pCurrEffect->GetName()) == 0)
-        {
-            effectID = pCurrEffect->GetID();
-            break;
-        }
-    }
-
-    return effectID;
-}
-
-void CPostEffectsMgr::OnLostDevice()
-{
-    std::for_each(m_pEffects.begin(), m_pEffects.end(), SContainerPostEffectOnLostDevice());
-}
-
-void CPostEffectsMgr::OnBeginFrame()
-{
-    std::for_each(m_pEffects.begin(), m_pEffects.end(), SContainerPostEffectOnBeginFrame());
-}
-
-void CPostEffectsMgr::SyncMainWithRender()
-{
-    KeyEffectMapItor iter;
-    for (iter = m_pNameIdMap.begin(); iter != m_pNameIdMap.end(); iter++)
-    {
-        iter->second->SyncMainWithRender();
-    }
-}
-
-// Used only when creating the crc table
-uint32 CPostEffectsMgr::CRC32Reflect(uint32 ref, char ch)
-{
-    uint32 value = 0;
-
-    // Swap bit 0 for bit 7
-    // bit 1 for bit 6, etc.
-    for (int i = 1; i < (ch + 1); i++)
-    {
-        if (ref & 1)
-        {
-            value |= 1 << (ch - i);
-        }
-        ref >>= 1;
-    }
-    return value;
-}
-
-uint32 CPostEffectsMgr::GetCRC(const char* pszName)
-{
-    if (!pszName)
-    {
-        assert(false && "CPostEffectsMgr::GetCRC() invalid string passed");
-        return 0;
-    }
-
-    // Once the lookup table has been filled in by the constructor,
-    // this function creates all CRCs using only the lookup table.
-    // Be sure to use unsigned variables, because negative values introduce high bits where zero bits are required.
-
-    const char* szPtr = pszName;
-    uint32 ulCRC = 0xffffffff; // Start out with all bits set high.
-    unsigned char c;
-
-    while (*szPtr)
-    {
-        c = *szPtr++;
-        if (c >= 'a' && c <= 'z')
-        {
-            c -= 32; //convert to uppercase
-        }
-        ulCRC = (ulCRC >> 8) ^ m_nCRC32Table[(ulCRC & 0xFF) ^ c];
-    }
-
-    // Exclusive OR the result with the beginning value...avoids the % operator
-    return ulCRC ^ 0xffffffff;
-}
-
-CEffectParam* CPostEffectsMgr::GetByName(const char* pszParam)
-{
-    assert(pszParam || "mfGetByName: null FX name");
-
-    uint32 nCurrKey = GetCRC(pszParam);
-
-    int nThreadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-
-    // cache per-thread
-    ParamCache* pCache = &m_pParamCache[nThreadID];
-
-    // Check cache first
-    if (nCurrKey == pCache->m_nKey && pCache->m_pParam)
-    {
-        if (CRenderer::CV_r_PostProcess == 3)
-        {
-            m_pEffectParamsUpdated.insert(StringEffectMapItor::value_type(pszParam, pCache->m_pParam));
-        }
-
-        return pCache->m_pParam;
-    }
-
-    KeyEffectMapItor pItor = m_pNameIdMap.find(nCurrKey);
-
-    if (pItor != m_pNameIdMap.end())
-    {
-        pCache->m_pParam =  pItor->second;
-        pCache->m_nKey = nCurrKey;
-
-        if (CRenderer::CV_r_PostProcess == 3)
-        {
-            m_pEffectParamsUpdated.insert(StringEffectMapItor::value_type(pszParam, pCache->m_pParam));
-        }
-
-        return pCache->m_pParam;
-    }
-
-    return 0;
-}
-
-float CPostEffectsMgr::GetByNameF(const char* pszParam)
-{
-    CEffectParam* pParam = GetByName(pszParam);
-    if (pParam)
-    {
-        return pParam->GetParam();
-    }
-
-    return 0.0f;
-}
-
-Vec4 CPostEffectsMgr::GetByNameVec4(const char* pszParam)
-{
-    CEffectParam* pParam = GetByName(pszParam);
-    if (pParam)
-    {
-        return pParam->GetParamVec4();
-    }
-
-    return Vec4(0, 0, 0, 0);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-int CPostEffectsMgr::SortEffectsByID(const CPostEffect* p1, const CPostEffect* p2)
-{
-    return (p1->GetID() < p2->GetID());
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-int CParamTexture::Create(const char* pszFileName)
-{
-    if (!pszFileName || pszFileName[0] == '\0')
-    {
-        return 0;
-    }
-
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    CParamTextureThreadSafeData* pThreadSafeData = &m_threadSafeData[threadID];
-
-    if (pThreadSafeData->pTexParam)
-    {
-        // check if texture is same
-        if (!azstricmp(pThreadSafeData->pTexParam->GetName(), pszFileName))
-        {
-            return 0;
-        }
-        // release texture if required
-        SAFE_RELEASE(pThreadSafeData->pTexParam);
-    }
-
-    pThreadSafeData->pTexParam = CTexture::ForName(pszFileName, FT_DONT_STREAM, eTF_Unknown);
-    pThreadSafeData->bSetThisFrame = true;
-    assert(pThreadSafeData->pTexParam || "CParamTexture.Create: texture not found!");
-
-    return 1;
-}
-
-const char* CParamTexture::GetParamString() const
-{
-    const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-    const CTexture* texture = m_threadSafeData[threadID].pTexParam;
-    return texture ? texture->GetName() : "";
-}
-
-void CParamTexture::Release()
-{
-    CParamTextureThreadSafeData* pFillData = &m_threadSafeData[gRenDev->m_RP.m_nFillThreadID];
-
-    const bool bIsMultiThreaded = (gRenDev->m_pRT) ? (gRenDev->m_pRT->IsMultithreaded()) : false;
-    if (bIsMultiThreaded)
-    {
-        CParamTextureThreadSafeData* pProcessData = &m_threadSafeData[gRenDev->m_RP.m_nProcessThreadID];
-        if (pProcessData->pTexParam != pFillData->pTexParam)
-        {
-            SAFE_RELEASE(pProcessData->pTexParam);
-            pProcessData->bSetThisFrame = true;
-        }
-    }
-
-    SAFE_RELEASE(pFillData->pTexParam);
-    pFillData->bSetThisFrame = true;
-}
-
-void CParamTexture::SyncMainWithRender()
-{
-    CParamTextureThreadSafeData* pFillData = &m_threadSafeData[gRenDev->m_RP.m_nFillThreadID];
-
-    const bool bIsMultiThreaded = (gRenDev->m_pRT) ? (gRenDev->m_pRT->IsMultithreaded()) : false;
-    CParamTextureThreadSafeData* pProcessData = NULL;
-    if (bIsMultiThreaded)
-    {
-        // If value is set on render thread, then this should override main thread value
-        pProcessData = &m_threadSafeData[gRenDev->m_RP.m_nProcessThreadID];
-        if (pProcessData->bSetThisFrame)
-        {
-            if (pFillData->bSetThisFrame)
-            {
-                // If the main thread also set a texture on the same frame (highly unlikely), then release this texture
-                // 1st before overriding it with the texture set from the render thread
-                SAFE_RELEASE(pFillData->pTexParam);
-            }
-            pFillData->pTexParam = pProcessData->pTexParam;
-        }
-    }
-
-    // Reset set value
-    pFillData->bSetThisFrame = false;
-
-    if (bIsMultiThreaded)
-    {
-        // Copy fill data into process data
-        memcpy(pProcessData, pFillData, sizeof(CParamTextureThreadSafeData));
-    }
-}
-
-CPostEffectsMgr* PostEffectMgr()
-{
-    return gRenDev->m_pPostProcessMgr;
-}
diff --git a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcess.h b/Code/CryEngine/RenderDll/Common/PostProcess/PostProcess.h
deleted file mode 100644
index fa973da560..0000000000
--- a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcess.h
+++ /dev/null
@@ -1,736 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef _POSTPROCESS_H_
-#define _POSTPROCESS_H_
-
-class CShader;
-class CTexture;
-
-
-// Declare effects ID - this will also be used as rendering sort order
-enum EPostEffectID
-{
-    ePFX_Invalid = -1,
-    ePFX_WaterVolume = 0,
-    ePFX_WaterRipples,
-
-    ePFX_SceneRain,
-
-    // Don't change order of post processes before sunshafts (on pc we doing some trickery to avoid redundant stretchrects)
-    ePFX_SunShafts,
-    ePFX_eMotionBlur,
-    ePFX_ColorGrading,
-    ePFX_eDepthOfField,
-    ePFX_HUDSilhouettes,
-
-    ePFX_eSoftAlphaTest,
-
-    ePFX_PostAA,
-    ePFX_SceneSnow,
-
-    ePFX_eUnderwaterGodRays,
-    ePFX_eVolumetricScattering,
-
-    // todo: merge all following into UberGamePostProcess
-    ePFX_FilterSharpening,
-    ePFX_FilterBlurring,
-    ePFX_UberGamePostProcess,
-
-    ePFX_eFlashBang,
-
-    ePFX_ImageGhosting,
-
-    ePFX_eRainDrops,
-    ePFX_eWaterDroplets,
-    ePFX_eWaterFlow,
-    ePFX_eScreenBlood,
-    ePFX_eScreenFrost,
-
-    ePFX_FilterKillCamera,
-    ePFX_eAlienInterference,
-    ePFX_eGhostVision,
-
-    ePFX_Post3DRenderer,
-
-    ePFX_ScreenFader,
-
-    ePFX_Max
-};
-
-// Base effect parameter class, derive all new from this one
-class CEffectParam
-{
-public:
-
-    CEffectParam(){ }
-
-    virtual ~CEffectParam()
-    {
-        Release();
-    }
-
-    // Should implement where necessary. For example check CParamTexture
-    virtual void Release() { }
-
-    // Set parameters
-    virtual void SetParam([[maybe_unused]] float fParam, [[maybe_unused]] bool bForceValue = false) {}
-    virtual void SetParamVec4([[maybe_unused]] const Vec4& pParam, [[maybe_unused]] bool bForceValue = false) {}
-    virtual void SetParamString([[maybe_unused]] const char* pszParam) {}
-    virtual void ResetParam(float fParam) { SetParam(fParam, true); }
-    virtual void ResetParamVec4(const Vec4& pParam) { SetParamVec4(pParam, true); }
-
-    // Get parameters
-    virtual float GetParam()  { return 1.0f; }
-    virtual Vec4 GetParamVec4()  { return Vec4(1.0f, 1.0f, 1.0f, 1.0f); }
-    virtual const char* GetParamString() const { return 0; }
-
-    // Sync main thread data with render thread data
-    virtual void SyncMainWithRender() {}
-
-    // Create effect parameter
-    template <typename ParamT, typename T>
-    static CEffectParam* Create(const T& pParam, bool bSmoothTransition = true)
-    {
-        return new ParamT(pParam, bSmoothTransition);
-    }
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Bool type effect param
-class CParamBool
-    : public CEffectParam
-{
-public:
-    CParamBool(bool bParam, [[maybe_unused]] bool bSmoothTransition)
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            CParamBoolThreadSafeData* pThreadSafeData = &m_threadSafeData[i];
-            pThreadSafeData->bParam = bParam;
-            pThreadSafeData->bSetThisFrame = false;
-        }
-    }
-
-    virtual void SetParam(float fParam, bool bForceValue);
-    virtual float GetParam();
-    virtual void SyncMainWithRender();
-
-private:
-
-    struct CParamBoolThreadSafeData
-    {
-        bool bParam;
-        bool bSetThisFrame;
-    };
-
-    CParamBoolThreadSafeData m_threadSafeData[RT_COMMAND_BUF_COUNT];
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Int type effect param
-class CParamInt
-    : public CEffectParam
-{
-public:
-    CParamInt(int nParam, [[maybe_unused]] bool bSmoothTransition)
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            CParamIntThreadSafeData* pThreadSafeData = &m_threadSafeData[i];
-            pThreadSafeData->nParam = nParam;
-            pThreadSafeData->bSetThisFrame = false;
-        }
-    }
-
-    virtual void SetParam(float fParam, bool bForceValue);
-    virtual float GetParam();
-    virtual void SyncMainWithRender();
-
-private:
-
-    struct CParamIntThreadSafeData
-    {
-        int nParam;
-        bool bSetThisFrame;
-    };
-
-    CParamIntThreadSafeData m_threadSafeData[RT_COMMAND_BUF_COUNT];
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Float type effect param
-class CParamFloat
-    : public CEffectParam
-{
-public:
-    CParamFloat(float fParam, bool bSmoothTransition)
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            CParamFloatThreadSafeData* pThreadSafeData = &m_threadSafeData[i];
-            pThreadSafeData->fParam = fParam;
-            pThreadSafeData->fFrameParamAcc = fParam;
-            pThreadSafeData->nFrameSetCount = 0;
-            pThreadSafeData->bValueForced = false;
-        }
-        m_fParamDefault = fParam;
-        m_bSmoothTransition = bSmoothTransition;
-    }
-
-    virtual void SetParam(float fParam, bool bForceValue);
-    virtual float GetParam();
-    virtual void SyncMainWithRender();
-
-private:
-
-    struct CParamFloatThreadSafeData
-    {
-        float fParam;
-        float fFrameParamAcc;
-        uint8 nFrameSetCount;
-        bool bValueForced;
-        bool bSetThisFrame;
-    };
-
-    CParamFloatThreadSafeData m_threadSafeData[RT_COMMAND_BUF_COUNT];
-
-    float m_fParamDefault;
-    bool m_bSmoothTransition;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Vec4 type effect param
-class CParamVec4
-    : public CEffectParam
-{
-public:
-    CParamVec4(const Vec4& vParam, bool bSmoothTransition)
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            CParamVec4ThreadSafeData* pThreadSafeData = &m_threadSafeData[i];
-            pThreadSafeData->vParam = vParam;
-            pThreadSafeData->vFrameParamAcc = vParam;
-            pThreadSafeData->nFrameSetCount = 0;
-            pThreadSafeData->bValueForced = false;
-        }
-        m_vParamDefault = vParam;
-        m_bSmoothTransition = bSmoothTransition;
-    }
-
-    virtual void SetParamVec4(const Vec4& vParam, bool bForceValue);
-    virtual Vec4 GetParamVec4();
-    virtual void SyncMainWithRender();
-
-private:
-
-    struct CParamVec4ThreadSafeData
-    {
-        Vec4 vParam;
-        Vec4 vFrameParamAcc;
-        uint8 nFrameSetCount;
-        bool bValueForced;
-        bool bSetThisFrame;
-    };
-
-    CParamVec4ThreadSafeData m_threadSafeData[RT_COMMAND_BUF_COUNT];
-
-    Vec4 m_vParamDefault;
-    bool m_bSmoothTransition;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// CTexture type effect param
-class CParamTexture
-    : public CEffectParam
-{
-public:
-    CParamTexture()
-    {
-        Reset();
-    }
-
-    CParamTexture([[maybe_unused]] int nInit, [[maybe_unused]] bool bSmoothTransition)
-    {
-        Reset();
-    }
-
-    virtual ~CParamTexture()
-    {
-        Release();
-    }
-
-    int Create(const char* pszFileName);
-
-    virtual void Release();
-
-    virtual void SetParamString(const char* pParam)
-    {
-        Create(pParam);
-    }
-
-    virtual const char* GetParamString() const;
-
-    CTexture* GetParamTexture() const
-    {
-        const int threadID = gRenDev->m_pRT ? gRenDev->m_pRT->GetThreadList() : 0;
-        return m_threadSafeData[threadID].pTexParam;
-    }
-
-    virtual void SyncMainWithRender();
-
-private:
-
-    void Reset()
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            CParamTextureThreadSafeData* pThreadSafeData = &m_threadSafeData[i];
-            pThreadSafeData->pTexParam = NULL;
-            pThreadSafeData->bSetThisFrame = false;
-        }
-    }
-
-    struct CParamTextureThreadSafeData
-    {
-        CTexture* pTexParam;
-        bool bSetThisFrame;
-    };
-
-    CParamTextureThreadSafeData m_threadSafeData[RT_COMMAND_BUF_COUNT];
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Post processing render flags
-enum EPostProcessRenderFlag
-{
-    PSP_UPDATE_BACKBUFFER = (1 << 0),                   // updates back-buffer texture for technique
-    PSP_REQUIRES_UPDATE = (1 << 1),                     // required calling update member function
-    PSP_LAST_ENABLED_POSTPROCESS = (1 << 2),    // last enabled post process (used to determine if rendering directly to backbuffer required)
-    PSP_UPDATE_SCENE_SPECULAR = (1 << 3)               // updates/overwrites the scene specular texture (s_ptexSceneSpecular) for use in the current effect
-};
-
-// Post effects base structure interface. All techniques derive from this one.
-class CPostEffect
-{
-public:
-    CPostEffect()
-        : m_pActive(0)
-        , /*m_nID(ePFX_DefaultID),*/ m_nRenderFlags(PSP_UPDATE_BACKBUFFER)
-    {
-    }
-
-    virtual ~CPostEffect()
-    {
-        Release();
-    }
-
-    // Initialize post processing technique - device access allowed (queries, ...)
-    virtual int Initialize() { return 1; }
-    // Create all the resources for the pp effects which don't require the device (such as textures)
-    virtual int CreateResources() { return 1; }
-    // Free resources used
-    virtual void Release() { }
-    // Preprocess technique
-    virtual bool Preprocess() { return IsActive(); }
-    // Some effects might require updating data/parameters, etc
-    virtual void Update() { };
-    // Render technique
-    virtual void Render() = 0;
-    // Reset technique state to default
-    virtual void Reset(bool bOnSpecChange = false) = 0;
-    // release resources when required
-    virtual void OnLostDevice() { }
-
-    // Add render element/object to post process (use for custom geometry)
-    virtual void AddRE([[maybe_unused]] const CRendElementBase* pRE, [[maybe_unused]] const SShaderItem* pShaderItem, [[maybe_unused]] CRenderObject* pObj, [[maybe_unused]] const SRenderingPassInfo& passInfo) { }
-    // release resources when required
-    virtual void OnBeginFrame() { }
-
-    // Get technique render flags
-    int GetRenderFlags() const
-    {
-        return m_nRenderFlags;
-    }
-
-    // Get effect name
-    virtual const char* GetName() const
-    {
-        return "PostEffectDefault";
-    }
-
-    // Is technique active ?
-    virtual bool IsActive() const
-    {
-        float fActive = m_pActive->GetParam();
-        return (fActive) ? 1 : 0;
-    }
-
-    inline uint8 GetID() const
-    {
-        return m_nID;
-    }
-
-
-protected:
-    uint8 m_nRenderFlags;
-    uint8 m_nID;
-    CEffectParam* m_pActive;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-typedef std::map<string, CEffectParam*> StringEffectMap;
-typedef StringEffectMap::iterator StringEffectMapItor;
-
-typedef std::map<uint32, CEffectParam*> KeyEffectMap;
-typedef KeyEffectMap::iterator KeyEffectMapItor;
-
-typedef std::vector< CPostEffect* > CPostEffectVec;
-typedef CPostEffectVec::iterator CPostEffectItor;
-
-# ifndef _RELEASE
-#define POSTSEFFECTS_DEBUGINFO_TIMEOUT (1.0f)
-struct SPostEffectsDebugInfo
-{
-    SPostEffectsDebugInfo(CPostEffect* _pEffect)
-        : pEffect(_pEffect)
-        , szParamName(NULL)
-        , fParamVal(0.0f)
-        , fTimeOut(POSTSEFFECTS_DEBUGINFO_TIMEOUT){}
-    SPostEffectsDebugInfo(const string& _szParamName, float val)
-        : pEffect(NULL)
-        , szParamName(_szParamName)
-        , fParamVal(val)
-        , fTimeOut(POSTSEFFECTS_DEBUGINFO_TIMEOUT){}
-    CPostEffect* pEffect;
-    string szParamName;
-    float fParamVal;
-    float fTimeOut;
-};
-typedef std::vector< SPostEffectsDebugInfo > CPostEffectDebugVec;
-#endif
-
-
-class CPostEffectsMgr;
-CPostEffectsMgr* PostEffectMgr();
-
-// Post process effects manager
-class CPostEffectsMgr
-{
-public:
-    CPostEffectsMgr()
-        : m_nPostBlendEffectsFlags(0)
-    {
-        ClearCache();
-#ifndef _RELEASE
-        m_activeEffectsDebug.reserve(16);
-        m_activeParamsDebug.reserve(32);
-#endif
-        m_bCreated = false;
-    }
-
-    virtual ~CPostEffectsMgr()
-    {
-        Release();
-    }
-
-    // Create/Initialize post processing effects
-    int  Init();
-    void CreateResources();
-    // Free resources used
-    void Release();
-    void ReleaseResources();
-    // Reset all post effects
-    void Reset(bool bOnSpecChange = false);
-    // Start processing effects
-    void Begin();
-    // End processing effects
-    void End();
-    // release resources when required
-    void OnLostDevice();
-    // release resources when required
-    void OnBeginFrame();
-    // Sync main thread post effect data with render thread post effect data
-    void SyncMainWithRender();
-
-    // Get techniques list
-    CPostEffectVec& GetEffects()
-    {
-        return m_pEffects;
-    }
-    inline bool IsCreated()
-    {
-        return m_pEffects.size() != 0;
-    }
-
-    // Get post effect
-    CPostEffect* GetEffect(EPostEffectID nID)
-    {
-        assert(nID < ePFX_Max);
-        return m_pEffects[ nID ];
-    }
-
-    // Get post effect ID
-    int32 GetEffectID(const char* pEffectName);
-
-    // Get name to id map
-    KeyEffectMap& GetNameIdMap()
-    {
-        return m_pNameIdMap;
-    }
-
-    // Given a string returns corresponding SEffectParam if exists, else returns null
-    CEffectParam* GetByName(const char* pszParam);
-
-    // Given a string returns containing value if exists, else returns 0
-    float GetByNameF(const char* pszParam);
-    Vec4 GetByNameVec4(const char* pszParam);
-
-    // Register effect
-    void RegisterEffect(CPostEffect* pEffect)
-    {
-        assert(pEffect);
-        m_pEffects.push_back(pEffect);
-    }
-
-    // Register a parameter
-    template <typename paramT, typename T>
-    void RegisterParam(const char* pszName, CEffectParam*& pParam, const T& pParamVal, bool bSmoothTransition = true)
-    {
-        pParam = CEffectParam::Create< paramT >(pParamVal, bSmoothTransition);
-        m_pNameIdMapGen.insert(StringEffectMapItor::value_type(pszName, pParam));
-    }
-
-    // Current enabled post blending effects
-    uint8 GetPostBlendEffectsFlags()
-    {
-        return m_nPostBlendEffectsFlags;
-    }
-
-    // Enabled/disable post blending effects
-    void SetPostBlendEffectsFlags(uint8 nFlags)
-    {
-        m_nPostBlendEffectsFlags = nFlags;
-    }
-
-    friend CPostEffectsMgr* PostEffectMgr();
-
-    static bool CheckPostProcessQuality(ERenderQuality nMinRQ, EShaderQuality nMinSQ)
-    {
-        if (gRenDev->m_RP.m_eQuality >= nMinRQ && gRenDev->EF_GetShaderQuality(eST_PostProcess) >= nMinSQ)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    StringEffectMap* GetDebugParamsUsedInFrame()
-    {
-        return &m_pEffectParamsUpdated;
-    }
-
-#ifndef _RELEASE
-    CPostEffectDebugVec& GetActiveEffectsDebug() { return m_activeEffectsDebug; }
-    CPostEffectDebugVec& GetActiveEffectsParamsDebug() { return m_activeParamsDebug; }
-    void ClearDebugInfo()
-    {
-        m_activeEffectsDebug.clear();
-        m_activeParamsDebug.clear();
-    }
-#endif
-
-    static int SortEffectsByID(const CPostEffect* p1, const CPostEffect* p2);
-
-    // Get techniques list
-    CPostEffectVec& GetActiveEffects(int threadID)
-    {
-        return m_activeEffects[threadID];
-    }
-
-private:
-
-    // Pass a text string to this function and it will return the CRC
-    uint32 GetCRC(const char* pszName);
-    // Used only when creating the crc table
-    uint32  CRC32Reflect(uint32 ref, char ch);
-    // zero out the cache
-    void ClearCache()
-    {
-#ifndef _RELEASE
-        ClearDebugInfo();
-#endif
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-        {
-            m_pParamCache[i].m_nKey = 0;
-            m_pParamCache[i].m_pParam = 0;
-        }
-    }
-
-protected:
-
-    bool m_bPostReset;
-    bool m_bCreated;
-    uint8 m_nPostBlendEffectsFlags;
-
-    // Shared parameters
-    CEffectParam* m_pBrightness, * m_pContrast, * m_pSaturation, * m_pSharpening;
-    CEffectParam* m_pColorC, * m_pColorY, * m_pColorM, * m_pColorK, * m_pColorHue;
-
-    CEffectParam* m_pUserBrightness, * m_pUserContrast, * m_pUserSaturation, * m_pUserSharpening;
-    CEffectParam* m_pUserColorC, * m_pUserColorY, * m_pUserColorM, * m_pUserColorK, * m_pUserColorHue;
-
-    // sorry: quick & dirty solution for c2 shipping - custom type handling for HDR setup in cinematics - make this properly after shipping
-    CEffectParam* m_UserHDRBloom;
-
-    CPostEffectVec m_pEffects;
-    CPostEffectVec m_activeEffects[RT_COMMAND_BUF_COUNT];
-    KeyEffectMap m_pNameIdMap;
-    StringEffectMap m_pNameIdMapGen;
-    // for debugging purposes only
-    StringEffectMap m_pEffectParamsUpdated;
-#ifndef _RELEASE
-    CPostEffectDebugVec m_activeEffectsDebug;
-    CPostEffectDebugVec m_activeParamsDebug;
-#endif
-
-    uint32 m_nCRC32Table[256];  // Lookup table array
-
-    struct ParamCache
-    {
-        uint32 m_nKey;
-        CEffectParam* m_pParam;
-    } m_pParamCache[RT_COMMAND_BUF_COUNT];
-};
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// Some nice utilities for handling post effects containers
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define AddEffect(ef) PostEffectMgr()->RegisterEffect(CryAlignedNew<ef>())
-#define AddParamBool(szName, pParam, val) PostEffectMgr()->RegisterParam<CParamBool, bool>((szName), (pParam), val)
-#define AddParamInt(szName, pParam, val) PostEffectMgr()->RegisterParam<CParamInt, int>((szName), (pParam), val)
-#define AddParamFloat(szName, pParam, val) PostEffectMgr()->RegisterParam<CParamFloat, float>((szName), (pParam), val)
-#define AddParamVec4(szName, pParam, val) PostEffectMgr()->RegisterParam<CParamVec4, Vec4>((szName), (pParam), val)
-#define AddParamFloatNoTransition(szName, pParam, val) PostEffectMgr()->RegisterParam<CParamFloat, float>((szName), (pParam), val, false)
-#define AddParamVec4NoTransition(szName, pParam, val) PostEffectMgr()->RegisterParam<CParamVec4, Vec4>((szName), (pParam), val, false)
-#define AddParamTex(szName, pParam, val) PostEffectMgr()->RegisterParam<CParamTexture, int>((szName), (pParam), val)
-
-struct container_object_safe_delete
-{
-    template<typename T>
-    void operator()(T* pObj) const
-    {
-        CryAlignedDelete(pObj);
-    }
-};
-
-struct container_object_safe_release
-{
-    template<typename T>
-    void operator()(T* pObj) const
-    {
-        SAFE_RELEASE(pObj);
-    }
-};
-
-struct SContainerKeyEffectParamDelete
-{
-    void operator()(KeyEffectMap::value_type& pObj)
-    {
-        SAFE_DELETE(pObj.second);
-    }
-};
-
-struct SContainerPostEffectInitialize
-{
-    void operator() (CPostEffect* pObj) const
-    {
-        if (pObj)
-        {
-            pObj->Initialize();
-        }
-    }
-};
-
-struct SContainerPostEffectCreateResources
-{
-    void operator() (CPostEffect* pObj) const
-    {
-        if (pObj)
-        {
-            pObj->CreateResources();
-        }
-    }
-};
-
-struct SContainerPostEffectReset
-{
-    void operator()(CPostEffect* pObj) const
-    {
-        if (pObj)
-        {
-            pObj->Reset();
-        }
-    }
-};
-
-struct SContainerPostEffectResetOnSpecChange
-{
-    void operator()(CPostEffect* pObj) const
-    {
-        if (pObj)
-        {
-            pObj->Reset(true);
-        }
-    }
-};
-
-struct SContainerPostEffectOnLostDevice
-{
-    void operator() (CPostEffect* pObj) const
-    {
-        if (pObj)
-        {
-            pObj->OnLostDevice();
-        }
-    }
-};
-
-struct SContainerPostEffectOnBeginFrame
-{
-    void operator() (CPostEffect* pObj) const
-    {
-        if (pObj)
-        {
-            pObj->OnBeginFrame();
-        }
-    }
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.cpp b/Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.cpp
deleted file mode 100644
index ea6ee680ed..0000000000
--- a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.cpp
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Post processing common utilities
-
-
-#include "RenderDll_precompiled.h"
-#include "PostProcessUtils.h"
-#include "../RendElements/FlareSoftOcclusionQuery.h"
-
-RECT  SPostEffectsUtils::m_pScreenRect;
-ITimer* SPostEffectsUtils::m_pTimer;
-int SPostEffectsUtils::m_iFrameCounter = 0;
-SDepthTexture* SPostEffectsUtils::m_pCurDepthSurface;
-CShader* SPostEffectsUtils::m_pCurrShader;
-int SPostEffectsUtils::m_nColorMatrixFrameID;
-float SPostEffectsUtils::m_fWaterLevel;
-float SPostEffectsUtils::m_fOverscanBorderAspectRatio = 1.0f;
-Matrix44 SPostEffectsUtils::m_pScaleBias = Matrix44(
-        0.5f,     0,      0,   0,
-        0, -0.5f,    0,   0,
-        0,       0, 1.0f,   0,
-        0.5f,    0.5f,    0,   1.0f);
-
-Vec3 SPostEffectsUtils::m_vRT = Vec3(0, 0, 0);
-Vec3 SPostEffectsUtils::m_vLT = Vec3(0, 0, 0);
-Vec3 SPostEffectsUtils::m_vLB = Vec3(0, 0, 0);
-Vec3 SPostEffectsUtils::m_vRB = Vec3(0, 0, 0);
-int SPostEffectsUtils::m_nFrustrumFrameID = 0;
-
-CTexture* SPostEffectsUtils::m_UpscaleTarget = nullptr;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool SPostEffectsUtils::Create()
-{
-    assert(gRenDev);
-
-    const SViewport& MainVp = gRenDev->m_MainViewport;
-    const bool bCreatePostAA = CRenderer::CV_r_AntialiasingMode && !CTexture::IsTextureExist(CTexture::s_ptexPrevBackBuffer[0][0]);
-    //@NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
-    const bool bCreateCaustics = (CRenderer::CV_r_watervolumecaustics && CRenderer::CV_r_watercaustics) && !CTexture::IsTextureExist(CTexture::s_ptexWaterCaustics[0]);
-
-    static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-
-    ETEX_Format nHDRReducedFormat = gRenDev->UseHalfFloatRenderTargets() ? eTF_R11G11B10F : eTF_R10G10B10A2;
-
-    ETEX_Format taaFormat = eTF_R8G8B8A8;
-    if (CRenderer::CV_r_AntialiasingMode == eAT_TAA)
-    {
-        taaFormat = eTF_R16G16B16A16F;
-    }
-
-    bool taaFormatMismatch = (CRenderer::CV_r_AntialiasingMode && CTexture::s_ptexPrevBackBuffer[0][0] && CTexture::s_ptexPrevBackBuffer[0][0]->GetDstFormat() != taaFormat);
-
-    if (!CTexture::s_ptexBackBufferScaled[0] || taaFormatMismatch || m_pScreenRect.right != MainVp.nWidth || m_pScreenRect.bottom != MainVp.nHeight || bCreatePostAA || bCreateCaustics)
-    {
-        assert(gRenDev);
-
-        const int nWidth = gRenDev->GetWidth();
-        const int nHeight = gRenDev->GetHeight();
-
-        // Update viewport info
-        m_pScreenRect.left = 0;
-        m_pScreenRect.top = 0;
-
-        m_pScreenRect.right = nWidth;
-        m_pScreenRect.bottom = nHeight;
-
-        if (CRenderer::CV_r_AntialiasingMode)
-        {
-            CreateRenderTarget("$PrevBackBuffer0", CTexture::s_ptexPrevBackBuffer[0][0], nWidth, nHeight, Clr_Unknown, 1, 0, taaFormat, TO_PREVBACKBUFFERMAP0, FT_DONT_RELEASE | FT_USAGE_ALLOWREADSRGB);
-            CreateRenderTarget("$PrevBackBuffer1", CTexture::s_ptexPrevBackBuffer[1][0], nWidth, nHeight, Clr_Unknown, 1, 0, taaFormat, TO_PREVBACKBUFFERMAP1, FT_DONT_RELEASE | FT_USAGE_ALLOWREADSRGB);
-            if (gRenDev->m_bDualStereoSupport)
-            {
-                CreateRenderTarget("$PrevBackBuffer0_R", CTexture::s_ptexPrevBackBuffer[0][1], nWidth, nHeight, Clr_Unknown, 1, 0, taaFormat, -1, FT_DONT_RELEASE | FT_USAGE_ALLOWREADSRGB);
-                CreateRenderTarget("$PrevBackBuffer1_R", CTexture::s_ptexPrevBackBuffer[1][1], nWidth, nHeight, Clr_Unknown, 1, 0, taaFormat, -1, FT_DONT_RELEASE | FT_USAGE_ALLOWREADSRGB);
-            }
-        }
-        else
-        {
-            SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[0][0]);
-            SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[1][0]);
-            SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[0][1]);
-            SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[1][1]);
-        }
-
-        CreateRenderTarget("$Cached3DHud", CTexture::s_ptexCached3DHud, nWidth, nHeight, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-        CreateRenderTarget("$Cached3DHudDownsampled", CTexture::s_ptexCached3DHudScaled, nWidth >> 2, nHeight >> 2, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-
-        // Scaled versions of the scene target
-        CreateRenderTarget("$BackBufferScaled_d2", CTexture::s_ptexBackBufferScaled[0], nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, 0, eTF_R8G8B8A8, TO_BACKBUFFERSCALED_D2, FT_DONT_RELEASE);
-
-        // Ghosting requires data overframes, need to handle for each GPU in MGPU mode
-        CreateRenderTarget("$PrevFrameScaled", CTexture::s_ptexPrevFrameScaled, nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-
-        CreateRenderTarget("$BackBufferScaledTemp_d2", CTexture::s_ptexBackBufferScaledTemp[0], nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-
-        CreateRenderTarget("$WaterVolumeRefl", CTexture::s_ptexWaterVolumeRefl[0], nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, true, nHDRReducedFormat, TO_WATERVOLUMEREFLMAP, FT_DONT_RELEASE);
-        CreateRenderTarget("$WaterVolumeReflPrev", CTexture::s_ptexWaterVolumeRefl[1], nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, true, nHDRReducedFormat, TO_WATERVOLUMEREFLMAPPREV, FT_DONT_RELEASE);
-
-        CreateRenderTarget("$BackBufferScaled_d4", CTexture::s_ptexBackBufferScaled[1], nWidth >> 2, nHeight >> 2, Clr_Unknown, 1, 0, eTF_R8G8B8A8, TO_BACKBUFFERSCALED_D4, FT_DONT_RELEASE);
-        CreateRenderTarget("$BackBufferScaledTemp_d4", CTexture::s_ptexBackBufferScaledTemp[1], nWidth >> 2, nHeight >> 2, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-
-        CreateRenderTarget("$BackBufferScaled_d8", CTexture::s_ptexBackBufferScaled[2], nWidth >> 3, nHeight >> 3, Clr_Unknown, 1, 0, eTF_R8G8B8A8, TO_BACKBUFFERSCALED_D8, FT_DONT_RELEASE);
-
-        CreateRenderTarget("$RainDropsAccumRT_0", CTexture::s_ptexRainDropsRT[0], nWidth >> 2, nHeight >> 2, Clr_Unknown, 1, false, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-        CreateRenderTarget("$RainDropsAccumRT_1", CTexture::s_ptexRainDropsRT[1], nWidth >> 2, nHeight >> 2, Clr_Unknown, 1, false, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-
-        CreateRenderTarget("$RainSSOcclusion0", CTexture::s_ptexRainSSOcclusion[0], nWidth >> 3, nHeight >> 3, Clr_Unknown, 1, false, eTF_R8G8B8A8);
-        CreateRenderTarget("$RainSSOcclusion1", CTexture::s_ptexRainSSOcclusion[1], nWidth >> 3, nHeight >> 3, Clr_Unknown, 1, false, eTF_R8G8B8A8);
-
-        CreateRenderTarget("$RainOcclusion", CTexture::s_ptexRainOcclusion, RAIN_OCC_MAP_SIZE, RAIN_OCC_MAP_SIZE, Clr_Unknown, false, false, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-
-        // Water phys simulation requires data overframes, need to handle for each GPU in MGPU mode
-        CreateRenderTarget("$WaterRipplesDDN_0", CTexture::s_ptexWaterRipplesDDN, 256, 256, Clr_Unknown, 1, true, eTF_R8G8B8A8, TO_WATERRIPPLESMAP);
-        if (gRenDev->UseHalfFloatRenderTargets())
-        {
-            CreateRenderTarget("$WaterVolumeDDN", CTexture::s_ptexWaterVolumeDDN, 64, 64, Clr_Unknown, 1, true, eTF_R16G16B16A16F, TO_WATERVOLUMEMAP);
-        }
-        else
-        {
-            CreateRenderTarget("$WaterVolumeDDN", CTexture::s_ptexWaterVolumeDDN, 64, 64, Clr_Unknown, 1, true, eTF_R8G8B8A8, TO_WATERVOLUMEMAP);
-        }
-
-        if (CRenderer::CV_r_watervolumecaustics && CRenderer::CV_r_watercaustics) //@NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
-        {
-            const int nCausticRes = clamp_tpl(CRenderer::CV_r_watervolumecausticsresolution, 256, 4096);
-            CreateRenderTarget("$WaterVolumeCaustics", CTexture::s_ptexWaterCaustics[0], nCausticRes, nCausticRes, Clr_Unknown, 1, false, eTF_R8G8B8A8, TO_WATERVOLUMECAUSTICSMAP);
-            CreateRenderTarget("$WaterVolumeCausticsTemp", CTexture::s_ptexWaterCaustics[1], nCausticRes, nCausticRes, Clr_Unknown, 1, false, eTF_R8G8B8A8, TO_WATERVOLUMECAUSTICSMAPTEMP);
-        }
-        else
-        {
-            SAFE_RELEASE(CTexture::s_ptexWaterCaustics[0]);
-            SAFE_RELEASE(CTexture::s_ptexWaterCaustics[1]);
-        }
-
-    #if defined(VOLUMETRIC_FOG_SHADOWS)
-        int fogShadowBufDiv = (CRenderer::CV_r_FogShadows == 2) ? 4 : 2;
-        CreateRenderTarget("$VolFogShadowBuf0", CTexture::s_ptexVolFogShadowBuf[0], nWidth / fogShadowBufDiv, nHeight / fogShadowBufDiv, Clr_Unknown, 1, 0, eTF_R8G8B8A8, TO_VOLFOGSHADOW_BUF);
-        CreateRenderTarget("$VolFogShadowBuf1", CTexture::s_ptexVolFogShadowBuf[1], nWidth / fogShadowBufDiv, nHeight / fogShadowBufDiv, Clr_Unknown, 1, 0, eTF_R8G8B8A8);
-    #endif
-
-        char str[256];
-
-        // TODO: Only create necessary RTs for minimal ring?
-        for (int i = 0; i < MAX_OCCLUSION_READBACK_TEXTURES; i++)
-        {
-            azsprintf(str, "$FlaresOcclusion_%d", i);
-
-            CreateRenderTarget(str, CTexture::s_ptexFlaresOcclusionRing[i], CFlareSoftOcclusionQuery::s_nIDColMax, CFlareSoftOcclusionQuery::s_nIDRowMax, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE | FT_STAGE_READBACK);
-        }
-
-        CreateRenderTarget("$FlaresGather", CTexture::s_ptexFlaresGather, CFlareSoftOcclusionQuery::s_nGatherTextureWidth, CFlareSoftOcclusionQuery::s_nGatherTextureHeight, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-    }
-
-    return 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::Release()
-{
-    SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[0][0]);
-    SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[1][0]);
-    SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[0][1]);
-    SAFE_RELEASE(CTexture::s_ptexPrevBackBuffer[1][1]);
-
-    SAFE_RELEASE(CTexture::s_ptexBackBufferScaled[0]);
-    SAFE_RELEASE(CTexture::s_ptexBackBufferScaled[1]);
-    SAFE_RELEASE(CTexture::s_ptexBackBufferScaled[2]);
-
-    SAFE_RELEASE(CTexture::s_ptexBackBufferScaledTemp[0]);
-    SAFE_RELEASE(CTexture::s_ptexBackBufferScaledTemp[1]);
-
-    SAFE_RELEASE(CTexture::s_ptexWaterVolumeDDN);
-    SAFE_RELEASE(CTexture::s_ptexWaterVolumeRefl[0]);
-    SAFE_RELEASE(CTexture::s_ptexWaterVolumeRefl[1]);
-    SAFE_RELEASE(CTexture::s_ptexWaterCaustics[0]);
-    SAFE_RELEASE(CTexture::s_ptexWaterCaustics[1]);
-
-    SAFE_RELEASE(CTexture::s_ptexCached3DHud);
-    SAFE_RELEASE(CTexture::s_ptexCached3DHudScaled);
-
-    SAFE_RELEASE(CTexture::s_ptexPrevFrameScaled);
-    SAFE_RELEASE(CTexture::s_ptexWaterRipplesDDN);
-
-    SAFE_RELEASE(CTexture::s_ptexRainDropsRT[0]);
-    SAFE_RELEASE(CTexture::s_ptexRainDropsRT[1]);
-
-    SAFE_RELEASE(CTexture::s_ptexRainSSOcclusion[0]);
-    SAFE_RELEASE(CTexture::s_ptexRainSSOcclusion[1]);
-    SAFE_RELEASE(CTexture::s_ptexRainOcclusion);
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    SAFE_RELEASE(CTexture::s_ptexVolFogShadowBuf[0]);
-    SAFE_RELEASE(CTexture::s_ptexVolFogShadowBuf[1]);
-#endif
-
-    for (int i = 0; i < MAX_OCCLUSION_READBACK_TEXTURES; i++)
-    {
-        SAFE_RELEASE(CTexture::s_ptexFlaresOcclusionRing[i]);
-    }
-    SAFE_RELEASE(CTexture::s_ptexFlaresGather);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::GetFullScreenTri(SVF_P3F_C4B_T2F pResult[3], int nTexWidth, int nTexHeight, float z, const RECT * pSrcRegion)
-{
-    if (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-        z = 1.0f - z;
-
-    pResult[0].xyz = Vec3(-0.0f, -0.0f, z);
-    pResult[0].color.dcolor = ~0U;
-    pResult[0].st = Vec2(0, 0);
-    pResult[1].xyz = Vec3(-0.0f, 2.0f, z);
-    pResult[1].color.dcolor = ~0U;
-    pResult[1].st = Vec2(0, 2);
-    pResult[2].xyz = Vec3(2.0f, -0.0f, z);
-    pResult[2].color.dcolor = ~0U;
-    pResult[2].st = Vec2(2, 0);
-
-    if (pSrcRegion)
-    {
-        const Vec4 vTexCoordsRegion(2.0f*float(pSrcRegion->left) / nTexWidth,
-            2.0f*float(pSrcRegion->right) / nTexWidth,
-            2.0f*float(pSrcRegion->top) / nTexHeight,
-            2.0f*float(pSrcRegion->bottom) / nTexHeight);
-        pResult[0].st = Vec2(vTexCoordsRegion.x, vTexCoordsRegion.z);
-        pResult[1].st = Vec2(vTexCoordsRegion.x, vTexCoordsRegion.w);
-        pResult[2].st = Vec2(vTexCoordsRegion.y, vTexCoordsRegion.z);
-    }
-}
-
-void SPostEffectsUtils::DrawFullScreenTri(int nTexWidth, int nTexHeight, float z, const RECT * pSrcRegion)
-{
-    SVF_P3F_C4B_T2F screenTri[3];
-    GetFullScreenTri(screenTri, nTexWidth, nTexHeight, z, pSrcRegion);
-
-    CVertexBuffer strip(screenTri, eVF_P3F_C4B_T2F);
-    gRenDev->DrawPrimitivesInternal(&strip, 3, eptTriangleList);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::DrawScreenQuad([[maybe_unused]] int nTexWidth, [[maybe_unused]] int nTexHeight, float x0, float y0, float x1, float y1)
-{
-    const float z = (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 1.0f : 0.0f;
-
-    Vec3 vv[4];
-    vv[0] = Vec3(x0, y0, z);
-    vv[1] = Vec3(x0, y1, z);
-    vv[2] = Vec3(x1, y0, z);
-    vv[3] = Vec3(x1, y1, z);
-    SVF_P3F_C4B_T2F pScreenQuad[] =
-    {
-        { Vec3(0, 0, 0), {
-              {0}
-          }, Vec2(0, 0) },
-        { Vec3(0, 0, 0), {
-              {0}
-          }, Vec2(0, 1) },
-        { Vec3(0, 0, 0), {
-              {0}
-          }, Vec2(1, 0) },
-        { Vec3(0, 0, 0), {
-              {0}
-          }, Vec2(1, 1) },
-    };
-
-    pScreenQuad[0].xyz = vv[0];
-    pScreenQuad[1].xyz = vv[1];
-    pScreenQuad[2].xyz = vv[2];
-    pScreenQuad[3].xyz = vv[3];
-
-    gRenDev->m_RP.m_PersFlags2 &= ~(RBPF2_COMMIT_PF);
-
-    CVertexBuffer strip(pScreenQuad, eVF_P3F_C4B_T2F);
-    gRenDev->DrawPrimitivesInternal(&strip, 4, eptTriangleStrip);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::DrawQuad([[maybe_unused]] int nTexWidth, [[maybe_unused]] int nTexHeight,
-    const Vec2& vxA, const Vec2& vxB, const Vec2& vxC, const Vec2& vxD,
-    const Vec2& uvA, const Vec2& uvB, const Vec2& uvC, const Vec2& uvD)
-{
-    const float z = (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 1.0f : 0.0f;
-
-    SVF_P3F_C4B_T2F pScreenQuad[4] =
-    {
-        { Vec3(vxA.x, vxA.y, z), {
-              {0}
-          }, uvA },
-        { Vec3(vxB.x, vxB.y, z), {
-              {0}
-          }, uvB },
-        { Vec3(vxD.x, vxD.y, z), {
-              {0}
-          }, uvD },
-        { Vec3(vxC.x, vxC.y, z), {
-              {0}
-          }, uvC }
-    };
-    gRenDev->m_RP.m_PersFlags2 &= ~(RBPF2_COMMIT_PF);
-
-    CVertexBuffer strip(pScreenQuad, eVF_P3F_C4B_T2F);
-    gRenDev->DrawPrimitivesInternal(&strip, 4, eptTriangleStrip);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::GetFullScreenTriWPOS(SVF_P3F_T2F_T3F pResult[3], int nTexWidth, int nTexHeight, float z, const RECT *pSrcRegion)
-{
-    UpdateFrustumCorners();
-
-    if (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-        z = 1.0f - z;
-
-    pResult[0].p = Vec3(-0.0f, -0.0f, z);
-    pResult[0].st0 = Vec2(0, 0);
-    pResult[0].st1 = m_vLT;
-    pResult[1].p = Vec3(-0.0f, 2.0f, z);
-    pResult[1].st0 = Vec2(0, 2);
-    pResult[1].st1 = m_vLB*2.0f - m_vLT;
-    pResult[2].p = Vec3(2.0f, -0.0f, z);
-    pResult[2].st0 = Vec2(2, 0);
-    pResult[2].st1 = m_vRT*2.0f - m_vLT;
-
-    if (pSrcRegion)
-    {
-        const Vec4 vTexCoordsRegion(2.0f*float(pSrcRegion->left) / nTexWidth,
-            2.0f*float(pSrcRegion->right) / nTexWidth,
-            2.0f*float(pSrcRegion->top) / nTexHeight,
-            2.0f*float(pSrcRegion->bottom) / nTexHeight);
-        pResult[0].st0 = Vec2(vTexCoordsRegion.x, vTexCoordsRegion.z);
-        pResult[1].st0 = Vec2(vTexCoordsRegion.x, vTexCoordsRegion.w);
-        pResult[2].st0 = Vec2(vTexCoordsRegion.y, vTexCoordsRegion.z);
-    }
-}
-
-void SPostEffectsUtils::DrawFullScreenTriWPOS(int nTexWidth, int nTexHeight, float z, const RECT *pSrcRegion)
-{
-    SVF_P3F_T2F_T3F screenTri[3];
-    GetFullScreenTriWPOS(screenTri, nTexWidth, nTexHeight, z, pSrcRegion);
-
-    CVertexBuffer strip(&screenTri[0], eVF_P3F_T2F_T3F);
-    gRenDev->DrawPrimitivesInternal(&strip, 3, eptTriangleList);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::SetTexture(CTexture* pTex, int nStage, int nFilter, int nClamp, bool bSRGBLookup, DWORD dwBorderColor)
-{
-    if (pTex)
-    {
-        STexState TS;
-        TS.SetFilterMode(nFilter);
-        TS.SetClampMode(nClamp, nClamp, nClamp);
-        if (nClamp == TADDR_BORDER)
-        {
-            TS.SetBorderColor(dwBorderColor);
-        }
-        TS.m_bSRGBLookup = bSRGBLookup;
-        int nTexState = CTexture::GetTexState(TS);
-        pTex->Apply(nStage, nTexState);
-    }
-    else
-    {
-        CTexture::ApplyForID(nStage, 0, -1, -1);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool SPostEffectsUtils::CreateRenderTarget(const char* szTexName, CTexture*& pTex, int nWidth, int nHeight, const ColorF& cClear, [[maybe_unused]] bool bUseAlpha, bool bMipMaps, ETEX_Format eTF, int nCustomID, int nFlags)
-{
-    // check if parameters are valid
-    if (!nWidth || !nHeight)
-    {
-        return 0;
-    }
-
-    uint32 flags = nFlags;
-    flags |= FT_DONT_STREAM | FT_USAGE_RENDERTARGET | (bMipMaps ? FT_FORCE_MIPS : FT_NOMIPS);
-
-    // if texture doesn't exist yet, create it
-    if (!CTexture::IsTextureExist(pTex))
-    {
-        pTex = CTexture::CreateRenderTarget(szTexName, nWidth, nHeight, cClear, eTT_2D, flags, eTF, nCustomID);
-    }
-    else
-    {
-        pTex->SetFlags(flags);
-        pTex->SetWidth(nWidth);
-        pTex->SetHeight(nHeight);
-        pTex->CreateRenderTarget(eTF, cClear);
-    }
-
-    // Following will mess up don't care resolve/restore actions since Fill() sets textures to be cleared on next draw
-#if !defined(CRY_USE_METAL) && !defined(OPENGL_ES)
-    if (pTex)
-    {
-        pTex->Clear();
-    }
-#endif
-
-    return CTexture::IsTextureExist(pTex) ? 1 : 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool SPostEffectsUtils::ShBeginPass(CShader* pShader, const CCryNameTSCRC& TechName, uint32 nFlags)
-{
-    assert(pShader);
-
-    m_pCurrShader = pShader;
-
-    uint32 nPasses;
-    m_pCurrShader->FXSetTechnique(TechName);
-    m_pCurrShader->FXBegin(&nPasses, nFlags);
-    return m_pCurrShader->FXBeginPass(0);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::ShEndPass()
-{
-    assert(m_pCurrShader);
-
-    m_pCurrShader->FXEndPass();
-    m_pCurrShader->FXEnd();
-
-    m_pCurrShader = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::ShSetParamVS(const CCryNameR& pParamName, const Vec4& pParam)
-{
-    assert(m_pCurrShader);
-    m_pCurrShader->FXSetVSFloat(pParamName, &pParam, 1);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::ShSetParamPS(const CCryNameR& pParamName, const Vec4& pParam)
-{
-    assert(m_pCurrShader);
-    m_pCurrShader->FXSetPSFloat(pParamName, &pParam, 1);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::ClearScreen(float r, float g, float b, float a)
-{
-    static CCryNameTSCRC pTechName("ClearScreen");
-    ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    Vec4 pClrScrParms = Vec4(r, g, b, a);
-    static CCryNameR pParamName("clrScrParams");
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParamName, &pClrScrParms, 1);
-
-    DrawFullScreenTri(iWidth, iHeight);
-
-    ShEndPass();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::PrepareGmemDeferredDecals()
-{
-    static CCryNameTSCRC pTechName("PrepareGmemDeferredDecals");
-    ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    DrawFullScreenTri(iWidth, iHeight);
-
-    ShEndPass();
-}
-void SPostEffectsUtils::ClearGmemGBuffer()
-{
-    static CCryNameTSCRC pTechName("ClearGmemGBuffer");
-    ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    DrawFullScreenTri(iWidth, iHeight);
-
-    ShEndPass();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SPostEffectsUtils::UpdateFrustumCorners()
-{
-    auto& renderPipeline = gRenDev->m_RP;
-    auto& threadInfo = renderPipeline.m_TI[renderPipeline.m_nProcessThreadID];
-
-    int nFrameID = threadInfo.m_nFrameID;
-    if (m_nFrustrumFrameID != nFrameID || CRenderer::CV_r_StereoMode == 1)
-    {
-        Vec3 frustumCoords[8];
-        gRenDev->GetViewParameters().CalcVerts(frustumCoords);
-
-        m_vRT = frustumCoords[4] - frustumCoords[0];
-        m_vLT = frustumCoords[5] - frustumCoords[1];
-        m_vLB = frustumCoords[6] - frustumCoords[2];
-        m_vRB = frustumCoords[7] - frustumCoords[3];
-
-        // Swap order when mirrored culling enabled
-        if ((gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_MIRRORCULL))
-        {
-            m_vLT = frustumCoords[4] - frustumCoords[0];
-            m_vRT = frustumCoords[5] - frustumCoords[1];
-            m_vRB = frustumCoords[6] - frustumCoords[2];
-            m_vLB = frustumCoords[7] - frustumCoords[3];
-        }
-
-        m_nFrustrumFrameID = nFrameID;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void SPostEffectsUtils::UpdateOverscanBorderAspectRatio()
-{
-    if (gRenDev)
-    {
-        const float screenWidth = (float)gRenDev->GetWidth();
-        const float screenHeight = (float)gRenDev->GetHeight();
-        Vec2 overscanBorders = Vec2(0.0f, 0.0f);
-        gRenDev->EF_Query(EFQ_OverscanBorders, overscanBorders);
-
-        const float aspectX = (screenWidth * (1.0f - (overscanBorders.y * 2.0f)));
-        const float aspectY = (screenHeight * (1.0f - (overscanBorders.x * 2.0f)));
-        m_fOverscanBorderAspectRatio = aspectX / max(aspectY, 0.001f);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-Matrix44& SPostEffectsUtils::GetColorMatrix()
-{
-    CPostEffectsMgr* pPostMgr = PostEffectMgr();
-    int nFrameID = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameID;
-    if (m_nColorMatrixFrameID != nFrameID)
-    {
-        // Create color transformation matrices
-        float fBrightness = pPostMgr->GetByNameF("Global_Brightness");
-        float fContrast = pPostMgr->GetByNameF("Global_Contrast");
-        float fSaturation = pPostMgr->GetByNameF("Global_Saturation");
-        float fColorC = pPostMgr->GetByNameF("Global_ColorC");
-        float fColorM = pPostMgr->GetByNameF("Global_ColorM");
-        float fColorY = pPostMgr->GetByNameF("Global_ColorY");
-        float fColorK = pPostMgr->GetByNameF("Global_ColorK");
-        float fColorHue = pPostMgr->GetByNameF("Global_ColorHue");
-
-        float fUserCyan = pPostMgr->GetByNameF("Global_User_ColorC");
-        fColorC = fUserCyan;
-
-        float fUserMagenta = pPostMgr->GetByNameF("Global_User_ColorM");
-        fColorM = fUserMagenta;
-
-        float fUserYellow = pPostMgr->GetByNameF("Global_User_ColorY");
-        fColorY = fUserYellow;
-
-        float fUserLuminance = pPostMgr->GetByNameF("Global_User_ColorK");
-        fColorK = fUserLuminance;
-
-        float fUserHue = pPostMgr->GetByNameF("Global_User_ColorHue");
-        fColorHue = fUserHue;
-
-        float fUserBrightness = pPostMgr->GetByNameF("Global_User_Brightness");
-        fBrightness = fUserBrightness;
-
-        float fUserContrast = pPostMgr->GetByNameF("Global_User_Contrast");
-        fContrast = fUserContrast;
-
-        float fUserSaturation = pPostMgr->GetByNameF("Global_User_Saturation"); // translate to 0
-        fSaturation = fUserSaturation;
-
-        // Saturation matrix
-        Matrix44 pSaturationMat;
-
-        {
-            float y = 0.3086f, u = 0.6094f, v = 0.0820f, s = clamp_tpl<float>(fSaturation, -1.0f, 100.0f);
-
-            float a = (1.0f - s) * y + s;
-            float b = (1.0f - s) * y;
-            float c = (1.0f - s) * y;
-            float d = (1.0f - s) * u;
-            float e = (1.0f - s) * u + s;
-            float f = (1.0f - s) * u;
-            float g = (1.0f - s) * v;
-            float h = (1.0f - s) * v;
-            float i = (1.0f - s) * v + s;
-
-            pSaturationMat.SetIdentity();
-            pSaturationMat.SetRow(0, Vec3(a, d, g));
-            pSaturationMat.SetRow(1, Vec3(b, e, h));
-            pSaturationMat.SetRow(2, Vec3(c, f, i));
-        }
-
-        // Create Brightness matrix
-        Matrix44 pBrightMat;
-        fBrightness = clamp_tpl<float>(fBrightness, 0.0f, 100.0f);
-
-        pBrightMat.SetIdentity();
-        pBrightMat.SetRow(0, Vec3(fBrightness, 0, 0));
-        pBrightMat.SetRow(1, Vec3(0, fBrightness, 0));
-        pBrightMat.SetRow(2, Vec3(0, 0, fBrightness));
-
-        // Create Contrast matrix
-        Matrix44 pContrastMat;
-        {
-            float c = clamp_tpl<float>(fContrast, -1.0f, 100.0f);
-
-            pContrastMat.SetIdentity();
-            pContrastMat.SetRow(0, Vec3(c, 0, 0));
-            pContrastMat.SetRow(1, Vec3(0, c, 0));
-            pContrastMat.SetRow(2, Vec3(0, 0, c));
-            pContrastMat.SetColumn(3, 0.5f * Vec3(1.0f - c, 1.0f - c, 1.0f - c));
-        }
-
-        // Create CMKY matrix
-        Matrix44 pCMKYMat;
-        {
-            Vec4 pCMYKParams = Vec4(fColorC + fColorK, fColorM + fColorK, fColorY + fColorK, 1.0f);
-
-            pCMKYMat.SetIdentity();
-            pCMKYMat.SetColumn(3, -Vec3(pCMYKParams.x, pCMYKParams.y, pCMYKParams.z));
-        }
-
-        // Create Hue rotation matrix
-        Matrix44 pHueMat;
-        {
-            pHueMat.SetIdentity();
-
-            const Vec3 pHueVec = Vec3(0.57735026f, 0.57735026f, 0.57735026f); // (normalized(1,1,1)
-            pHueMat = Matrix34::CreateRotationAA(fColorHue * PI, pHueVec);
-            pHueMat.SetColumn(3, Vec3(0, 0, 0));
-        }
-
-        // Compose final color matrix and set fragment program constants
-        m_pColorMat = pSaturationMat * (pBrightMat * pContrastMat * pCMKYMat * pHueMat);
-
-        m_nColorMatrixFrameID = nFrameID;
-    }
-
-
-    return m_pColorMat;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.h b/Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.h
deleted file mode 100644
index 2e8390798e..0000000000
--- a/Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Post processing common utilities
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
-#pragma once
-
-
-struct SDepthTexture;
-class CShader;
-
-struct SPostEffectsUtils
-{
-    enum EDepthDownsample
-    {
-        eDepthDownsample_None = 0,
-
-        eDepthDownsample_Min,
-        eDepthDownsample_Max,
-    };
-
-    // Create all resources
-    bool Create();
-
-    // Release all used resources
-    void Release();
-
-    // Create a render target
-    static bool CreateRenderTarget(const char* szTexName, CTexture*& pTex, int iWidth, int iHeight, const ColorF& cClear, bool bUseAlpha, bool bMipMaps = 0, ETEX_Format pTexFormat = eTF_R8G8B8A8, int nCustomID = -1, int nFlags = 0);
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Utilities to void some code duplication
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    // Begins render pass utility - for post process stuff only pass 0 assumed to be used
-    static bool ShBeginPass(CShader* pShader, const CCryNameTSCRC& TechName, uint32 nFlags = 0);
-
-    // Ends render pass utility
-    static void ShEndPass();
-
-    // Set vertex shader constant utility
-    static void ShSetParamVS(const CCryNameR& pParamName, const Vec4& pParam);
-
-    // Set pixel shader constant utility
-    static void ShSetParamPS(const CCryNameR& pParamName, const Vec4& pParam);
-
-    static void GetFullScreenTri(SVF_P3F_C4B_T2F pResult[3], int nTexWidth, int nTexHeight, float z = 0, const RECT * pSrcRegion = NULL);
-    static void GetFullScreenTriWPOS(SVF_P3F_T2F_T3F pResult[3], int nTexWidth, int nTexHeight, float z = 0, const RECT * pSrcRegion = NULL);
-
-    // Draws fullscreen aligned triangle
-    static void DrawFullScreenTri(int nTexWidth, int nTexHeight, float z = 0, const RECT* pSrcRegion = NULL);
-    static void DrawFullScreenTriWPOS(int nTexWidth, int nTexHeight, float z = 0, const RECT* pSrcRegion = NULL);
-
-    // Draws static quad. Uv/size offsets handled via vertex shader.
-    virtual void DrawQuadFS(CShader* pShader, bool bOutputCamVec, int nWidth, int nHeight, float x0 = 0, float y0 = 0, float x1 = 1, float y1 = 1, float z = 0) = 0;
-
-    // Deprecated - use DrawQuadFS. Draws screen aligned quad
-    static void DrawScreenQuad(int nTexWidth, int nTexHeight, float x0 = 0, float y0 = 0, float x1 = 1, float y1 = 1);
-
-    //  Deprecated: Only used in GammaCorrection technique - Draws a generic, non-screen-aligned quad
-    static void DrawQuad(int nTexWidth, int nTexHeight,
-        const Vec2& vxA, const Vec2& vxB, const Vec2& vxC, const Vec2& vxD,
-        const Vec2& uvA = Vec2(0, 0), const Vec2& uvB = Vec2(0, 1), const Vec2& uvC = Vec2(1, 1), const Vec2& uvD = Vec2(1, 0));
-
-    // Sets a texture
-    static void SetTexture(CTexture* pTex, int nStage, int nFilter = FILTER_LINEAR, int nClamp = 1, bool bSRGBLookup = false, DWORD dwBorderColor = 0);
-
-    // Copy a texture into other texture
-    virtual void StretchRect(CTexture* pSrc, CTexture*& pDst, bool bClearAlpha = false, bool bDecodeSrcRGBK = false, bool bEncodeDstRGBK = false, bool bBigDownsample = false, EDepthDownsample depthDownsampleMode = eDepthDownsample_None, bool bBindMultisampled = false, const RECT* srcRegion = NULL) = 0;
-
-    // Copy screen into texture
-    virtual void CopyScreenToTexture(CTexture*& pDst, const RECT* pSrcRect) = 0;
-
-    // Apply Gaussian blur a texture
-    virtual void TexBlurGaussian(CTexture* pTex, int nAmount = 1, float fScale = 1.0f, float fDistribution = 5.0f, bool bAlphaOnly = false, CTexture* pMask = 0, bool bSRGB = false, CTexture* pBlurTmp = 0) = 0;
-
-    // Clear active render target region
-    static void ClearScreen(float r, float g, float b, float a);
-
-    static void UpdateFrustumCorners();
-    static void UpdateOverscanBorderAspectRatio();
-
-    // Special full screen pass utility functions used by GMEM path /////
-    static void PrepareGmemDeferredDecals();
-    static void ClearGmemGBuffer();
-    /////////////////////////////////////////////////////////////////////
-
-    // Log utility
-    static void Log(const char* pszMsg)
-    {
-        if (gRenDev->m_logFileHandle != AZ::IO::InvalidHandle && pszMsg)
-        {
-            gRenDev->Logv(SRendItem::m_RecurseLevel[gRenDev->m_pRT->GetThreadList()], pszMsg);
-        }
-    }
-
-    // Get current color matrix set up by global color parameters
-    Matrix44& GetColorMatrix();
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Math utils
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    // Linear interpolation
-    static float InterpolateLinear(float p1, float p2, float t)
-    {
-        return p1 + (p2 - p1) * t;
-    };
-
-    // Cubic interpolation
-    static float InterpolateCubic(float p1, float p2, float p3, float p4, float t)
-    {
-        float t2 = t * t;
-        return (((-p1 * 2.0f) + (p2 * 5.0f) - (p3 * 4.0f) + p4) / 6.0f) * t2 * t + (p1 + p3 - (2.0f * p2)) * t2 + (((-4.0f * p1) + p2 + (p3 * 4.0f) - p4) / 6.0f) * t + p2;
-    };
-
-    // Sine interpolation
-    static float InterpolateSine(float p1, float p2, float p3, float p4, float t)
-    {
-        return p2 + (t * (p3 - p2)) + (sinf(t * PI) * ((p2 + p2) - p1 - p3 + (t * (p1 - (p2 + p2 + p2) + (p3 + p3 + p3) - p4))) / 8.0f);
-    };
-
-    // Return normalized random number
-    static float randf()
-    {
-        return cry_random(0.0f, 1.0f);
-    }
-
-    // Return signed normalized random number
-    static float srandf()
-    {
-        return cry_random(-1.0f, 1.0f);
-    }
-
-    // Returns a quasi-random sequence of values; for 2d data (2, 3) is the recommended base
-    static float HaltonSequence(int index, int primeBase)
-    {
-        float invBase = 1.0f / (float)primeBase;
-        float f = invBase;
-        float result = 0;
-
-        for (int i = index; i > 0; i /= primeBase, f *= invBase)
-        {
-            result += f * (float)(i % primeBase);
-        }
-
-        return result;
-    }
-
-    // Returns closest power of 2 size
-    static int GetClosestPow2Size(int size)
-    {
-        float fPower = floorf(logf((float)size) / logf(2.0f));
-        int nResize = int(powf(2.0f, fPower));
-
-        // Clamp
-        if (nResize >= 512)
-        {
-            nResize = 512;
-        }
-
-        return nResize;
-    }
-
-    static void GetViewMatrix(Matrix44A& viewMatrix, bool bCameraSpace = false)
-    {
-        viewMatrix = gRenDev->m_ViewMatrix;
-        if (bCameraSpace)
-        {
-            viewMatrix.m30 = 0.0f;
-            viewMatrix.m31 = 0.0f;
-            viewMatrix.m32 = 0.0f;
-        }
-    }
-
-    static void GetTextureRect(CTexture* pTexture, RECT* pRect)
-    {
-        pRect->left = 0;
-        pRect->top = 0;
-        pRect->right = pTexture->GetWidth();
-        pRect->bottom = pTexture->GetHeight();
-    }
-
-    static float GaussianDistribution1D(float x, float rho)
-    {
-        float g = 1.0f / (rho * sqrtf(2.0f * PI));
-        g *= expf(-(x * x) / (2.0f * rho * rho));
-        return g;
-    }
-
-    static float GaussianDistribution2D(float x, float y, float rho)
-    {
-        float g = 1.0f / (2.0f * PI * rho * rho);
-        g *= expf(-(x * x + y * y) / (2 * rho * rho));
-        return g;
-    }
-
-    static CTexture* GetTemporalCurrentTarget()
-    {
-        return CTexture::s_ptexPrevBackBuffer[SPostEffectsUtils::m_iFrameCounter % 2][gRenDev->m_CurRenderEye];
-    }
-
-    static CTexture* GetTemporalHistoryTarget()
-    {
-        return CTexture::s_ptexPrevBackBuffer[(SPostEffectsUtils::m_iFrameCounter + 1) % 2][gRenDev->m_CurRenderEye];
-    }
-
-    static CTexture* GetCoCCurrentTarget()
-    {
-        return CTexture::s_ptexSceneCoCHistory[SPostEffectsUtils::m_iFrameCounter % 2];
-    }
-
-    static CTexture* GetCoCHistoryTarget()
-    {
-        return CTexture::s_ptexSceneCoCHistory[(SPostEffectsUtils::m_iFrameCounter + 1) % 2];
-    }
-
-    static CTexture* AcquireFinalCompositeTarget(bool bNeedHDRTarget)
-    {
-        if (bNeedHDRTarget)
-        {
-            m_UpscaleTarget = GetTemporalHistoryTarget();
-        }
-        else
-        {
-            m_UpscaleTarget = CTexture::s_ptexSceneDiffuse;
-        }
-        return m_UpscaleTarget;
-    }
-
-    static CTexture* GetFinalCompositeTarget()
-    {
-        return m_UpscaleTarget;
-    }
-
-    static CTexture* GetVelocityObjectRT()
-    {
-        return CTexture::s_ptexVelocityObjects[gRenDev->m_CurRenderEye];
-    }
-
-    static float GetOverscanBorderAspectRatio()
-    {
-        return m_fOverscanBorderAspectRatio;
-    }
-
-public:
-
-    static SDepthTexture* m_pCurDepthSurface;
-    static RECT m_pScreenRect;
-    static ITimer* m_pTimer;
-    static int m_iFrameCounter;
-    static int m_nColorMatrixFrameID;
-
-    static CShader* m_pCurrShader;
-
-    Matrix44 m_pView;
-    Matrix44 m_pProj;
-    Matrix44 m_pViewProj;
-    Matrix44 m_pColorMat;
-    static Matrix44 m_pScaleBias;
-    static float m_fWaterLevel;
-
-    // frustrum corners
-    static Vec3 m_vRT, m_vLT, m_vLB, m_vRB;
-    static int m_nFrustrumFrameID;
-
-protected:
-
-    SPostEffectsUtils()
-    {
-        m_pView.SetIdentity();
-        m_pProj.SetIdentity();
-        m_pViewProj.SetIdentity();
-        m_pColorMat.SetIdentity();
-
-        m_pCurDepthSurface = NULL;
-        m_pScreenRect.left = m_pScreenRect.top = 0;
-        m_pScreenRect.bottom = m_pScreenRect.right = 0;
-        m_pTimer = NULL;
-        m_iFrameCounter = 0;
-        m_nColorMatrixFrameID = -1;
-
-        m_pCurrShader = NULL;
-        m_fWaterLevel = 0.0;
-        m_vRT = m_vLT = m_vLB = m_vRB = Vec3(ZERO);
-        m_nFrustrumFrameID = -1;
-    }
-
-    virtual ~SPostEffectsUtils()
-    {
-    }
-
-    static float m_fOverscanBorderAspectRatio;
-
-private:
-    static CTexture* m_UpscaleTarget;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.cpp b/Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.cpp
deleted file mode 100644
index 5ac258be94..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "AbstractMeshElement.h"
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-#include "../../../CryCommon/VertexFormats.h"
-
-void AbstractMeshElement::ApplyVert()
-{
-    if (!GetVertCount())
-    {
-        return;
-    }
-
-    TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(GetVertBufData(), GetVertCount(), 0);
-    gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F);
-}
-
-void AbstractMeshElement::ApplyIndices()
-{
-    if (!GetIndexCount())
-    {
-        return;
-    }
-
-    TempDynIB16::CreateFillAndBind(GetIndexBufData(), GetIndexCount());
-}
-
-void AbstractMeshElement::ApplyMesh()
-{
-    ApplyVert();
-    ApplyIndices();
-}
-
-void AbstractMeshElement::DrawMeshTriList()
-{
-    int nVertexBufferCount = GetVertCount();
-    int nIndexBufferCount = GetIndexCount();
-    if (nVertexBufferCount <= 0 || nIndexBufferCount <= 0)
-    {
-        return;
-    }
-    gcpRendD3D->FX_Commit();
-    gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nVertexBufferCount, 0, nIndexBufferCount);
-}
-
-void AbstractMeshElement::DrawMeshWireframe()
-{
-    int nVertexBufferCount = GetVertCount();
-    int nIndexBufferCount = GetIndexCount();
-    if (nVertexBufferCount <= 0 || nIndexBufferCount <= 0)
-    {
-        return;
-    }
-
-    const int32 nState = gRenDev->m_RP.m_CurState;
-    gcpRendD3D->FX_SetState(nState | GS_WIREFRAME);
-
-    gcpRendD3D->FX_Commit();
-    gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nVertexBufferCount, 0, nIndexBufferCount);
-
-    gcpRendD3D->FX_SetState(nState);
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.h b/Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.h
deleted file mode 100644
index a22e844a93..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_ABSTRACTMESHELEMENT_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_ABSTRACTMESHELEMENT_H
-#pragma once
-
-struct SVF_P3F_C4B_T2F;
-class AbstractMeshElement
-{
-protected:
-    std::vector<SVF_P3F_C4B_T2F> m_vertBuf;
-    std::vector<uint16> m_idxBuf;
-    bool m_meshDirty;
-
-    virtual void ApplyMesh();
-    virtual void ApplyVert();
-    virtual void ApplyIndices();
-
-    //  Render the mesh. Must have ApplyMesh called before this to make sure
-    //  all data are copied and all states are set.
-    void DrawMeshTriList();
-
-    //  Render the mesh in wireframe mode. Primarily for debugging. NO FXCommit needed.
-    //  Must have ApplyMesh called before this to make sure
-    //  all data are copied and all states are set.
-    void DrawMeshWireframe();
-
-    // Custom Mesh Generation function.
-    // Force to generate the mesh only.
-    // This method doesn't alter the mark-dirty flag
-    virtual void GenMesh() = 0;
-
-    // Validate the internal mesh representation.
-    // This regenerates the mesh when the related data is modified
-    virtual void ValidateMesh()
-    {
-        if (m_meshDirty)
-        {
-            GenMesh();
-            m_meshDirty = false;
-        }
-    }
-
-    int GetMeshDataSize() const
-    {
-        return m_vertBuf.size() * sizeof(SVF_P3F_C4B_T2F) + m_idxBuf.size() * sizeof(uint16) + sizeof(bool);
-    }
-
-public:
-    AbstractMeshElement()
-        : m_meshDirty(true)
-    {
-    }
-    virtual ~AbstractMeshElement() {}
-
-    SVF_P3F_C4B_T2F* GetVertBufData() { return &m_vertBuf[0]; }
-    int GetVertCount() { return m_vertBuf.size(); }
-    int GetVertBufSize() { return GetVertCount() * sizeof(SVF_P3F_C4B_T2F); }
-
-    uint16* GetIndexBufData() { return &m_idxBuf[0]; }
-    int GetIndexCount() { return m_idxBuf.size(); }
-    int GetIndexBufSize() { return GetIndexCount() * sizeof(uint16); }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_ABSTRACTMESHELEMENT_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREBeam.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREBeam.cpp
deleted file mode 100644
index d3016036af..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREBeam.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "RendElement.h"
-#include "I3DEngine.h"
-
-void CREBeam::mfPrepare(bool bCheckOverflow)
-{
-    CRenderer* rd = gRenDev;
-
-    if (bCheckOverflow)
-    {
-        rd->FX_CheckOverflow(0, 0, this);
-    }
-
-    CRenderObject* obj = rd->m_RP.m_pCurObject;
-
-    if (CRenderer::CV_r_beams == 0)
-    {
-        rd->m_RP.m_pRE = NULL;
-        rd->m_RP.m_RendNumIndices = 0;
-        rd->m_RP.m_RendNumVerts = 0;
-    }
-    else
-    {
-        const int nThreadID = rd->m_RP.m_nProcessThreadID;
-        SRenderObjData* pOD = obj->GetObjData();
-        if (pOD)
-        {
-            SRenderLight* pLight = rd->EF_GetDeferredLightByID(pOD->m_nLightID);
-            if (pLight && pLight->m_Flags & DLF_PROJECT)
-            {
-                rd->m_RP.m_pRE = this;
-                rd->m_RP.m_RendNumIndices = 0;
-                rd->m_RP.m_RendNumVerts = 0;
-            }
-            else
-            {
-                rd->m_RP.m_pRE = NULL;
-                rd->m_RP.m_RendNumIndices = 0;
-                rd->m_RP.m_RendNumVerts = 0;
-            }
-        }
-        else
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Render object data is null. This may affect lighting.");
-        }
-    }
-}
-
-bool CREBeam::mfCompile([[maybe_unused]] CParserBin& Parser, [[maybe_unused]] SParserFrame& Frame)
-{
-    return true;
-}
-
-
-void CREBeam::SetupGeometry(SVF_P3F_C4B_T2F* pVertices, uint16* pIndices, float fAngleCoeff, float fNear, float fFar)
-{
-    const int nNumSides = BEAM_RE_CONE_SIDES;
-    Vec2 rotations[nNumSides];
-    float fIncrement = 1.0f / (float)nNumSides;
-    float fAngle = 0.0f;
-    for (uint32 i = 0; i < nNumSides; i++)
-    {
-        sincos_tpl(fAngle, &rotations[i].x, &rotations[i].y);
-        fAngle += fIncrement * gf_PI2;
-    }
-
-    float fScaleNear = fNear * fAngleCoeff;
-    float fScaleFar = fFar * fAngleCoeff;
-
-    UCol cBlack, cWhite;
-    cBlack.dcolor = 0;
-    cWhite.dcolor = 0xFFFFFFFF;
-
-    for (uint32 i = 0; i < nNumSides; i++) //Near Verts
-    {
-        pVertices[ i ].xyz      = Vec3(fNear,  rotations[i].x * fScaleNear, rotations[i].y * fScaleNear);
-        pVertices[ i ].color = cWhite;
-        pVertices[ i ].st       = Vec2(rotations[i].x, rotations[i].y);
-    }
-
-    for (uint32 i = 0; i < (nNumSides); i++) // Far verts
-    {
-        pVertices[ i + nNumSides].xyz       = Vec3(fFar,   rotations[i].x * fScaleFar, rotations[i].y * fScaleFar);
-        pVertices[ i + nNumSides].color = cWhite;
-        pVertices[ i + nNumSides].st        = Vec2(rotations[i].x, rotations[i].y);
-    }
-
-    uint32 nNearCapVert = nNumSides * 2;
-    uint32 nFarCapVert = nNumSides * 2 + 1;
-
-    //near cap vert
-    pVertices[ nNearCapVert ].xyz = Vec3(fNear, 0.0f, 0.0f);
-    pVertices[ nNearCapVert ].color = cBlack;
-    pVertices[ nNearCapVert ].st = Vec2(0, 0);
-
-    //far cap vert
-    pVertices[ nFarCapVert  ].xyz = Vec3(fFar, 0.0f, 0.0f);
-    pVertices[ nFarCapVert  ].color = cWhite;
-    pVertices[ nFarCapVert  ].st = Vec2(0, 0);
-
-    for (uint32 i = 0; i < nNumSides; i++)
-    {
-        uint32 idx = i * 6;
-        pIndices[idx]    = (i) % (nNumSides);
-        pIndices[idx + 1] = (i) % (nNumSides)       + nNumSides;
-        pIndices[idx + 2] = (i + 1) % (nNumSides) + nNumSides;
-
-        pIndices[idx + 3] = (i + 1) % (nNumSides) + nNumSides;
-        pIndices[idx + 4] = (i + 1) % (nNumSides);
-        pIndices[idx + 5] = (i) % (nNumSides);
-    }
-
-    for (uint32 i = 0; i < nNumSides; i++) // cap plane near
-    {
-        uint32 idx = ((nNumSides) * 6) + (i * 3);
-        pIndices[idx]       = nNearCapVert;
-        pIndices[idx + 1] = (i) % (nNumSides);
-        pIndices[idx + 2] = (i + 1) % (nNumSides);
-    }
-
-    for (uint32 i = 0; i < nNumSides; i++) // cap plane far
-    {
-        uint32 idx = ((nNumSides) * 9) + (i * 3);
-        pIndices[idx]       = nFarCapVert;
-        pIndices[idx + 1] = (i + 1) % (nNumSides) + nNumSides;
-        pIndices[idx + 2] = (i) % (nNumSides)       + nNumSides;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREBeam.h b/Code/CryEngine/RenderDll/Common/RendElements/CREBeam.h
deleted file mode 100644
index a002126701..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREBeam.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __CREBEAM_H__
-#define __CREBEAM_H__
-
-#define BEAM_RE_CONE_SIDES 32
-//=============================================================
-
-
-class CREBeam
-    : public CRendElementBase
-{
-private:
-
-    CCryNameR m_eyePosInWSName;
-    CCryNameR m_projMatrixName;
-    CCryNameR m_invProjMatrixName;
-    CCryNameR m_shadowCoordsName;
-    CCryNameR m_lightParamsName;
-    CCryNameR m_sphereParamsName;
-    CCryNameR m_coneParamsName;
-    CCryNameR m_lightPosName;
-    CCryNameR m_miscOffsetsName;
-    CCryNameR m_sampleOffsetsName;
-    CCryNameR m_lightDiffuseName;
-    CCryNameR m_screenScaleName;
-
-public:
-    CREBeam()
-    {
-        mfSetType(eDATA_Beam);
-
-        m_eyePosInWSName        = CCryNameR("eyePosInWS");
-        m_projMatrixName        = CCryNameR("projMatrix");
-        m_invProjMatrixName = CCryNameR("invProjMatrix");
-        m_shadowCoordsName  = CCryNameR("shadowCoords");
-        m_lightParamsName       = CCryNameR("lightParams");
-        m_sphereParamsName  = CCryNameR("sphereParams");
-        m_coneParamsName        = CCryNameR("coneParams");
-        m_lightPosName          = CCryNameR("lightPos");
-        m_miscOffsetsName       = CCryNameR("MiscParams");
-        m_sampleOffsetsName = CCryNameR("SampleOffsets");
-        m_lightDiffuseName  = CCryNameR("lightDiffuse");
-        m_screenScaleName       = CCryNameR("g_ScreenScale");
-    }
-
-    virtual ~CREBeam()
-    {
-    }
-
-    virtual void mfPrepare(bool bCheckOverflow);
-    virtual bool mfCompile(CParserBin& Parser, SParserFrame& Frame);
-    virtual bool mfDraw(CShader* ef, SShaderPass* sl);
-    virtual void mfExport([[maybe_unused]] struct SShaderSerializeContext& SC) {};
-    virtual void mfImport([[maybe_unused]] struct SShaderSerializeContext& SC, [[maybe_unused]] uint32& offset) {};
-
-    void SetupGeometry(SVF_P3F_C4B_T2F* pVertices, uint16* pIndices, float fAngleCoeff, float fNear, float fFar);
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-};
-
-#endif  // __CREBEAM_H__
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREClientPoly.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREClientPoly.cpp
deleted file mode 100644
index f05717ee5b..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREClientPoly.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : implementation of 3D Client polygons RE.
-
-
-#include "RenderDll_precompiled.h"
-
-
-//===============================================================
-
-
-TArray<CREClientPoly*> CREClientPoly::m_PolysStorage[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-
-CRendElementBase* CREClientPoly::mfCopyConstruct(void)
-{
-    CREClientPoly* cp = new CREClientPoly;
-    *cp = *this;
-    return cp;
-}
-
-void CREClientPoly::mfPrepare(bool bCheckOverflow)
-{
-    CRenderer* rd = gRenDev;
-    int i, n;
-
-    rd->m_RP.m_CurVFormat = eVF_P3F_C4B_T2F;
-
-    rd->FX_StartMerging();
-    CREClientPoly::mRS.NumRendPolys++;
-
-    int savev = rd->m_RP.m_RendNumVerts;
-    int savei = rd->m_RP.m_RendNumIndices;
-
-    int nThreadID = rd->m_RP.m_nProcessThreadID;
-
-    int nVerts = 0;
-    int nInds = 0;
-    if (bCheckOverflow)
-    {
-        rd->FX_CheckOverflow(m_sNumVerts, m_sNumIndices, this, &nVerts, &nInds);
-    }
-
-    if (m_nOffsInd >= (int)(rd->m_RP.m_SysIndexPool[nThreadID].size()))
-    {
-        assert(0);
-        return;
-    }
-
-    uint16* pSrcInds = &rd->m_RP.m_SysIndexPool[nThreadID][m_nOffsInd];
-    n = rd->m_RP.m_RendNumVerts;
-    uint16* dinds = &rd->m_RP.m_RendIndices[gRenDev->m_RP.m_RendNumIndices];
-    for (i = 0; i < nInds; i++, dinds++, pSrcInds++)
-    {
-        *dinds = *pSrcInds + n;
-    }
-    rd->m_RP.m_RendNumIndices += i;
-
-    UVertStreamPtr ptr = rd->m_RP.m_NextStreamPtr;
-    byte* OffsTC, * OffsColor;
-    SVF_P3F_C4B_T2F* pSrc = (SVF_P3F_C4B_T2F*)&rd->m_RP.m_SysVertexPool[nThreadID][m_nOffsVert];
-
-    OffsTC = rd->m_RP.m_StreamOffsetTC + ptr.PtrB;
-    OffsColor = rd->m_RP.m_StreamOffsetColor + ptr.PtrB;
-    for (i = 0; i < nVerts; i++, ptr.PtrB += rd->m_RP.m_StreamStride, OffsTC += rd->m_RP.m_StreamStride, OffsColor += rd->m_RP.m_StreamStride)
-    {
-        *(float*)(ptr.PtrB + 0) = pSrc[i].xyz[0];
-        *(float*)(ptr.PtrB + 4) = pSrc[i].xyz[1];
-        *(float*)(ptr.PtrB + 8) = pSrc[i].xyz[2];
-        *(float*)(OffsTC) = pSrc[i].st[0];
-        *(float*)(OffsTC + 4) = pSrc[i].st[1];
-        *(uint32*)OffsColor = pSrc[i].color.dcolor;
-    }
-
-    rd->m_RP.m_NextStreamPtr = ptr;
-
-    if (m_nOffsTang >= 0)
-    {
-        UVertStreamPtr ptrTang = rd->m_RP.m_NextStreamPtrTang;
-        SPipTangents* pTangents = (SPipTangents*)&rd->m_RP.m_SysVertexPool[nThreadID][m_nOffsTang];
-        for (i = 0; i < nVerts; i++, ptrTang.PtrB += sizeof(SPipTangents))
-        {
-            *(SPipTangents*)(ptrTang.PtrB) = pTangents[i];
-        }
-        rd->m_RP.m_NextStreamPtrTang = ptrTang;
-    }
-
-    rd->m_RP.m_RendNumVerts += nVerts;
-
-    CREClientPoly::mRS.NumVerts += rd->m_RP.m_RendNumVerts - savev;
-    CREClientPoly::mRS.NumIndices += rd->m_RP.m_RendNumIndices - savei;
-}
-
-
-//=======================================================================
-
-SClientPolyStat CREClientPoly::mRS;
-
-void CREClientPoly::mfPrintStat()
-{
-    /*  char str[1024];
-
-      *gpCurPrX = 4;
-      sprintf(str, "Num Indices: %i\n", mRS.NumIndices);
-      gRenDev->mfPrintString (str, PS_TRANSPARENT | PS_UP);
-
-      *gpCurPrX = 4;
-      sprintf(str, "Num Verts: %i\n", mRS.NumVerts);
-      gRenDev->mfPrintString (str, PS_TRANSPARENT | PS_UP);
-
-      *gpCurPrX = 4;
-      sprintf(str, "Num Render Client Polys: %i\n", mRS.NumRendPolys);
-      gRenDev->mfPrintString (str, PS_TRANSPARENT | PS_UP);
-
-      *gpCurPrX = 4;
-      sprintf(str, "Num Occluded Client Polys: %i\n", mRS.NumOccPolys);
-      gRenDev->mfPrintString (str, PS_TRANSPARENT | PS_UP);
-
-      *gpCurPrX = 4;
-      gRenDev->mfPrintString ("\nClient Polygons status info:\n", PS_TRANSPARENT | PS_UP);*/
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREClientPoly.h b/Code/CryEngine/RenderDll/Common/RendElements/CREClientPoly.h
deleted file mode 100644
index cd59a16b76..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREClientPoly.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __CRECLIENTPOLY_H__
-#define __CRECLIENTPOLY_H__
-
-//=============================================================
-
-struct SClientPolyStat
-{
-    int NumOccPolys;
-    int NumRendPolys;
-    int NumVerts;
-    int NumIndices;
-};
-
-class CREClientPoly
-    : public CRendElementBase
-{
-public:
-    enum eFlags
-    {
-        efAfterWater = 1 << 0,
-        efShadowGen = 1 << 1,
-    };
-    SShaderItem m_Shader;
-    CRenderObject* m_pObject;
-    short m_sNumVerts;
-    short m_sNumIndices;
-    byte m_nCPFlags;
-    int m_nOffsVert;
-    int m_nOffsTang;
-    int m_nOffsInd;
-
-    SRendItemSorter rendItemSorter;
-    static SClientPolyStat mRS;
-    static void mfPrintStat();
-
-public:
-    CREClientPoly()
-    {
-        mfSetType(eDATA_ClientPoly);
-        m_sNumVerts = 0;
-        m_nCPFlags = 0;
-        mfUpdateFlags(FCEF_TRANSFORM);
-    }
-
-    virtual ~CREClientPoly() {};
-
-    virtual void mfPrepare(bool bCheckOverflow);
-    virtual CRendElementBase* mfCopyConstruct(void);
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_PolysStorage);
-    }
-
-    static TArray<CREClientPoly*> m_PolysStorage[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-};
-
-#endif  // __CRECLIENTPOLY2D_H__
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CRECloud.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CRECloud.cpp
deleted file mode 100644
index a8bb6b754e..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CRECloud.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "RendElement.h"
-#include "CRECloud.h"
-#include "../Textures/TextureManager.h"
-
-#include <I3DEngine.h>
-
-uint32  CRECloud::m_siShadeResolution = 32;
-float CRECloud::m_sfAlbedo = 0.9f;
-float CRECloud::m_sfExtinction = 80.0f;
-float CRECloud::m_sfTransparency = exp(-m_sfExtinction);
-float CRECloud::m_sfScatterFactor = m_sfAlbedo * m_sfExtinction * (1.0f / (4.0f * (float)M_PI));
-float CRECloud::m_sfSortAngleErrorTolerance = 0.8f;
-float CRECloud::m_sfSortSquareDistanceTolerance = 100.0f;
-
-void CRECloud::SortParticles(const Vec3& vViewDir, const Vec3& vSortPoint, ESortDirection eDir)
-{
-    Vec3 partPos;
-    for (uint32 i = 0; i < m_particles.size(); ++i)
-    {
-        partPos = m_particles[i]->GetPosition();
-        partPos -= vSortPoint;
-        m_particles[i]->SetSquareSortDistance(partPos * vViewDir);
-    }
-
-    switch (eDir)
-    {
-    case eSort_TOWARD:
-        std::sort(m_particles.begin(), m_particles.end(), m_towardComparator);
-        break;
-    case eSort_AWAY:
-        std::sort(m_particles.begin(), m_particles.end(), m_awayComparator);
-        break;
-    default:
-        break;
-    }
-}
-
-void CRECloud::GetIllumParams(ColorF& specColor, ColorF& diffColor)
-{
-    CShaderResources* pRes = gRenDev->m_RP.m_pShaderResources;
-    if (pRes && pRes->HasLMConstants())
-    {
-        specColor = pRes->GetColorValue(EFTT_SPECULAR);
-        diffColor = pRes->GetColorValue(EFTT_DIFFUSE);
-    }
-    else
-    {
-        ColorF col = gRenDev->m_RP.m_pSunLight->m_Color;
-        float fLum = col.Luminance();
-        col.NormalizeCol(diffColor);
-        specColor.a = 1.0f;
-        specColor = specColor * fLum / 1.5f;
-        diffColor = gRenDev->m_RP.m_pCurObject->m_II.m_AmbColor / 5.0f;
-    }
-}
-
-void CRECloud::ShadeCloud([[maybe_unused]] Vec3 vPos)
-{
-    ColorF specColor, diffColor;
-    if (gRenDev->m_RP.m_pSunLight)
-    {
-        GetIllumParams(specColor, diffColor);
-        //IlluminateCloud(gRenDev->m_RP.m_pSunLight->m_Origin, vPos, difColor, ambColor, true);
-        m_CurSpecColor = specColor;
-        m_CurDiffColor = diffColor;
-        m_bReshadeCloud = false;
-        if (gRenDev->m_RP.m_pCurObject && gRenDev->m_RP.m_pCurObject->GetRE())
-        {
-            CREImposter* pRE = (CREImposter*)gRenDev->m_RP.m_pCurObject->GetRE();
-            pRE->m_bScreenImposter = true;
-        }
-    }
-}
-
-void CRECloud::UpdateWorldSpaceBounds(CRenderObject* pObj)
-{
-    CREImposter* pRE = (CREImposter*)pObj->GetRE();
-    assert(pRE);
-    if (!pRE)
-    {
-        return;
-    }
-    pRE->m_WorldSpaceBV = m_boundingBox;
-    if (m_Flags & FCEF_OLD)
-    {
-        Matrix34 mScale = Matrix34::CreateScale(Vec3(m_fScale, m_fScale, m_fScale));
-        pRE->m_WorldSpaceBV.Transform(mScale);
-    }
-    pRE->m_WorldSpaceBV.Transform(pObj->m_II.m_Matrix);
-}
-
-void CRECloud::mfPrepare(bool bCheckOverflow)
-{
-    CRenderer* rd = gRenDev;
-
-    if (bCheckOverflow)
-    {
-        rd->FX_CheckOverflow(0, 0, this);
-    }
-
-    CRenderObject* pObj = rd->m_RP.m_pCurObject;
-    CREImposter* pRE = (CREImposter*)pObj->GetRE();
-    SRenderObjData* pOD = pObj->GetObjData();
-    assert(pOD);
-    if (!pOD)
-    {
-        return;
-    }
-    if (!pRE)
-    {
-        pRE = new CREImposter;
-        pObj->m_pRE = pRE;
-        pRE->m_State = GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA | GS_ALPHATEST_GREATER;
-        pRE->m_AlphaRef = 0;
-    }
-
-    if (pOD->m_fTempVars[0] != pOD->m_fTempVars[1])
-    {
-        pOD->m_fTempVars[1] = pOD->m_fTempVars[0];
-        m_bReshadeCloud = true;
-    }
-    if (m_Flags & FCEF_OLD)
-    {
-        float fCloudRadius = m_boundingBox.GetRadius();
-        m_fScale = pOD->m_fTempVars[0] / fCloudRadius;
-    }
-    else
-    {
-        m_fScale = pOD->m_fTempVars[0];
-    }
-
-    ColorF specColor, diffColor;
-    GetIllumParams(specColor, diffColor);
-    if (specColor != m_CurSpecColor || diffColor != m_CurDiffColor)
-    {
-        m_bReshadeCloud = true;
-    }
-
-    UpdateWorldSpaceBounds(pObj);
-    Vec3 vPos = pRE->GetPosition();
-
-    {
-        if (m_bReshadeCloud)
-        {
-            ShadeCloud(vPos);
-        }
-        UpdateImposter(pObj);
-    }
-
-    rd->m_RP.m_pCurObject = pObj;
-    rd->m_RP.m_pRE = this;
-    rd->m_RP.m_RendNumIndices = 0;
-    rd->m_RP.m_RendNumVerts = 4;
-    rd->m_RP.m_FirstVertex = 0;
-}
-
-bool CRECloud::mfLoadCloud(const string& name, float fScale, [[maybe_unused]] bool bLocal)
-{
-    uint32 i;
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(name.c_str(), "rb");
-    if (fileHandle == AZ::IO::InvalidHandle)
-    {
-        return false;
-    }
-
-    uint32 iNumParticles;
-
-    mfSetFlags(FCEF_OLD);
-
-    gEnv->pCryPak->FRead(&iNumParticles, 1, fileHandle);
-    if (iNumParticles == 0x238c)
-    {
-        char fTexName[128];
-        char texName[256];
-        gEnv->pCryPak->FRead(&iNumParticles, 1, fileHandle);
-        int n = 0;
-        int ch;
-        do
-        {
-            ch = gEnv->pCryPak->Getc(fileHandle);
-            fTexName[n++] = ch;
-            if (n > 128)
-            {
-                fTexName[127] = ch;
-                break;
-            }
-        } while (ch != 0);
-        fpStripExtension(fTexName, fTexName);
-        sprintf_s(texName, "Textures/Clouds/%s.dds", fTexName);
-        m_pTexParticle = CTexture::ForName(texName, 0, eTF_Unknown);
-        gEnv->pCryPak->FRead(&m_nNumColorGradients, 1, fileHandle);
-        //m_pColorGradients = new SColorLevel [m_nNumColorGradients];
-        for (i = 0; i < m_nNumColorGradients; i++)
-        {
-            float fLevel;
-            gEnv->pCryPak->FRead(&fLevel, 1, fileHandle);
-            //m_pColorGradients[i].m_fLevel /= 100.0f;
-            uint32 iColor;
-            gEnv->pCryPak->FRead(&iColor, 1, fileHandle);
-            //m_pColorGradients[i].m_vColor = ColorF(iColor);
-        }
-        for (i = 0; i < iNumParticles; ++i)
-        {
-            Vec3 vPosition;
-            short nShadingNum;
-            short nGroupNum;
-            short nWidthMin, nWidthMax;
-            short nLengthMin, nLengthMax;
-            short nRotMin, nRotMax;
-            Vec2 vUV[2];
-            gEnv->pCryPak->FRead(&vPosition, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nShadingNum, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nGroupNum, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nWidthMin, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nWidthMax, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nLengthMin, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nLengthMax, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nRotMin, 1, fileHandle);
-            gEnv->pCryPak->FRead(&nRotMax, 1, fileHandle);
-            gEnv->pCryPak->FRead(&vUV[0], 1, fileHandle);
-            gEnv->pCryPak->FRead(&vUV[1], 1, fileHandle);
-
-            vPosition *= 0.001f;
-            float fWidth = (float)nWidthMin * 0.001f;
-            float fHeight = (float)nLengthMin * 0.001f;
-            float fRotMin = (float)nRotMin;
-            float fRotMax = (float)nRotMax;
-            Exchange(vPosition.y, vPosition.z);
-            vUV[0].y = 1.0f - vUV[0].y;
-            vUV[1].y = 1.0f - vUV[1].y;
-            Exchange(vUV[0].x, vUV[1].x);
-            /*int nX = nShadingNum & 0x3;
-            int nY = nShadingNum >> 2;
-            vUV[0].x = (float)nX * 0.25f;
-            vUV[1].x = vUV[0].x + 0.25f;
-            vUV[0].y = (float)nY * 0.25f;
-            vUV[1].y = vUV[0].y + 0.25f;*/
-            SCloudParticle* pParticle = new SCloudParticle(vPosition, fWidth, fHeight, fRotMin, fRotMax, vUV);
-
-            Vec3 vMin = pParticle->GetPosition() - Vec3(fWidth, fWidth, fHeight);
-            Vec3 vMax = pParticle->GetPosition() + Vec3(fWidth, fWidth, fHeight);
-            m_boundingBox.AddPoint(vMin);
-            m_boundingBox.AddPoint(vMax);
-            m_particles.push_back(pParticle);
-        }
-        Vec3 vCenter = m_boundingBox.GetCenter();
-        if (vCenter != Vec3(0, 0, 0))
-        {
-            m_boundingBox.Clear();
-            for (i = 0; i < iNumParticles; i++)
-            {
-                SCloudParticle* pParticle = m_particles[i];
-                pParticle->SetPosition(pParticle->GetPosition() - vCenter);
-                float fWidth = pParticle->GetRadiusX();
-                float fHeight = pParticle->GetRadiusY();
-                Vec3 vMin = pParticle->GetPosition() - Vec3(fWidth, fWidth, fHeight);
-                Vec3 vMax = pParticle->GetPosition() + Vec3(fWidth, fWidth, fHeight);
-                m_boundingBox.AddPoint(vMin);
-                m_boundingBox.AddPoint(vMax);
-            }
-        }
-    }
-    else
-    {
-        Vec3 vCenter = Vec3(0, 0, 0);
-        gEnv->pCryPak->FRead(&vCenter[0], 1, fileHandle);
-        vCenter = Vec3(0, 0, 0);
-
-        Vec3* pParticlePositions = new Vec3[iNumParticles];
-        float* pParticleRadii     = new float[iNumParticles];
-        ColorF* pParticleColors    = new ColorF[iNumParticles];
-
-        gEnv->pCryPak->FRead(pParticlePositions, iNumParticles, fileHandle);
-        gEnv->pCryPak->FRead(pParticleRadii, iNumParticles, fileHandle);
-        gEnv->pCryPak->FRead(pParticleColors, iNumParticles, fileHandle);
-
-        for (i = 0; i < iNumParticles; ++i)
-        {
-            if (pParticleRadii[i] < 0.8f)
-            {
-                continue;
-            }
-            pParticleRadii[i] *= 1.25f;
-            Exchange(pParticlePositions[i].y, pParticlePositions[i].z);
-            SCloudParticle* pParticle = new SCloudParticle((pParticlePositions[i] + vCenter) * fScale, pParticleRadii[i] * fScale, pParticleColors[i]);
-
-            float fRadiusX = pParticle->GetRadiusX();
-            float fRadiusY = pParticle->GetRadiusX();
-            Vec3 vRadius = Vec3(fRadiusX, fRadiusX, fRadiusY);
-
-            //Vec3 Mins = pParticle->GetPosition() - vRadius;
-            //Vec3 Maxs = pParticle->GetPosition() + vRadius;
-            //m_boundingBox.AddPoint(Mins);
-            //m_boundingBox.AddPoint(Maxs);
-            m_boundingBox.AddPoint(pParticle->GetPosition());
-
-            m_particles.push_back(pParticle);
-        }
-        SAFE_DELETE_ARRAY(pParticleColors);
-        SAFE_DELETE_ARRAY(pParticleRadii);
-        SAFE_DELETE_ARRAY(pParticlePositions);
-
-        m_pTexParticle = CTextureManager::Instance()->GetWhiteTexture();
-    }
-
-    gEnv->pCryPak->FClose(fileHandle);
-
-    return true;
-}
-
-bool CRECloud::mfCompile(CParserBin& Parser, SParserFrame& Frame)
-{
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(ParticlesFile)
-    FX_TOKEN(Scale)
-    FX_END_TOKENS
-
-    bool bRes = true;
-    float fScale = 1.0f;
-    string pname;
-    ColorF col;
-
-    while (Parser.ParseObject(sCommands))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_ParticlesFile:
-            pname = Parser.GetString(Parser.m_Data);
-            break;
-        case eT_Scale:
-            fScale = Parser.GetFloat(Parser.m_Data);
-            break;
-        }
-    }
-
-    if (!pname.empty())
-    {
-        mfLoadCloud(pname, fScale, false);
-    }
-    m_bReshadeCloud = true;
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CRECloud.h b/Code/CryEngine/RenderDll/Common/RendElements/CRECloud.h
deleted file mode 100644
index 603fc953d7..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CRECloud.h
+++ /dev/null
@@ -1,173 +0,0 @@
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __CRECLOUD_H__
-#define __CRECLOUD_H__
-
-//=============================================================
-
-#define FCEF_OLD    0x1000
-
-class CRECloud
-    : public CREBaseCloud
-{
-    friend class CREImposter;
-
-protected: // datatypes
-    typedef std::vector<SCloudParticle*>     ParticleArray;
-    typedef ParticleArray::iterator         ParticleIterator;
-    typedef ParticleArray::const_iterator   ParticleConstIterator;
-
-    typedef std::vector<Vec3>              DirectionArray;
-    typedef DirectionArray::iterator       DirectionIterator;
-
-    class ParticleAwayComparator
-    {
-    public:
-        bool operator()(SCloudParticle* pA, SCloudParticle* pB)
-        {
-            return ((*pA) < (*pB));
-        }
-    };
-
-    class ParticleTowardComparator
-    {
-    public:
-        bool operator()(SCloudParticle* pA, SCloudParticle* pB)
-        {
-            return ((*pA) > (*pB));
-        }
-    };
-
-protected: // data
-    enum ESortDirection
-    {
-        eSort_TOWARD,
-        eSort_AWAY
-    };
-
-    ParticleArray               m_particles;     // cloud particles
-    // particle sorting functors for STL sort.
-    ParticleTowardComparator    m_towardComparator;
-    ParticleAwayComparator      m_awayComparator;
-
-    DirectionArray              m_lightDirections;// light directions in cloud space (cached)
-
-    SMinMaxBox                  m_boundingBox;   // bounds
-
-    bool                        m_bUseAnisoLighting;
-
-    Vec3                        m_vLastSortViewDir;
-    Vec3                        m_vLastSortCamPos;
-    Vec3                        m_vSortPos;
-
-    float                       m_fSplitDistance;
-    bool                        m_bReshadeCloud;
-    bool                        m_bEnabled;
-    float                       m_fScale;
-
-    CTexture*                   m_pTexParticle;
-    uint32                      m_nNumPlanes;
-    uint32                      m_nNumColorGradients;
-
-    ColorF                      m_CurSpecColor;
-    ColorF                      m_CurDiffColor;
-    float                                               m_fCloudColorScale;     // needed for HDR (>=1)
-
-    static uint32                 m_siShadeResolution;// the resolution of the viewport used for shading
-    static float                m_sfAlbedo;      // the cloud albedo
-    static float                m_sfExtinction;  // the extinction of the clouds
-    static float                m_sfTransparency;// the transparency of the clouds
-    static float                m_sfScatterFactor;// How much the clouds scatter
-    static float                m_sfSortAngleErrorTolerance;// how far the view must turn to cause a resort.
-    static float                m_sfSortSquareDistanceTolerance;// how far the view must move to cause a resort.
-
-
-protected:
-    void SortParticles(const Vec3& vViewDir, const Vec3& vSortPoint, ESortDirection eDir);
-    void GetIllumParams(ColorF& specColor, ColorF& diffColor);
-    void ShadeCloud(Vec3 vPos);
-    void IlluminateCloud(Vec3 vLightPos, Vec3 vObjPos, ColorF cLightColor, ColorF cAmbColor, bool bReset);
-    void DisplayWithoutImpostor(const CameraViewParameters& camera);
-    bool mfDisplay(bool bDisplayFrontOfSplit);
-    void UpdateWorldSpaceBounds(CRenderObject* pObj);
-    inline float GetScale() { return m_fScale; }
-    bool UpdateImposter(CRenderObject* pObj);
-    bool mfLoadCloud(const string& name, float fScale, bool bLocal);
-
-    void ClearParticles()
-    {
-        size_t size = m_particles.size();
-        for (size_t i(0); i < size; ++i)
-        {
-            delete m_particles[i];
-        }
-        m_particles.resize(0);
-    }
-
-public:
-    CRECloud()
-        : CREBaseCloud()
-        , m_bUseAnisoLighting(true)
-        , m_bReshadeCloud(true)
-        , m_bEnabled(true)
-        , m_fScale(1.0f)
-        , m_vLastSortViewDir(Vec3(0, 0, 0))
-        , m_vLastSortCamPos(Vec3(0, 0, 0))
-        , m_CurSpecColor(Col_White)
-        , m_CurDiffColor(Col_White)
-        , m_pTexParticle(NULL)
-        , m_nNumPlanes(0)
-        , m_nNumColorGradients(0)
-        , m_fCloudColorScale(1)
-    {
-        mfSetType(eDATA_Cloud);
-        mfSetFlags(FCEF_TRANSFORM);
-    }
-
-    virtual ~CRECloud()
-    {
-        ClearParticles();
-    }
-
-    virtual bool mfCompile(CParserBin& Parser, SParserFrame& Frame);
-    virtual void mfPrepare(bool bCheckOverflow);
-    virtual bool mfDraw(CShader* ef, SShaderPass* sl);
-
-    virtual void SetParticles(SCloudParticle* pParticles, int nNumParticles)
-    {
-        m_bReshadeCloud = true;
-
-        m_boundingBox.Clear();
-
-        ClearParticles();
-        m_particles.reserve(nNumParticles);
-
-        for (int i = 0; i < nNumParticles; i++)
-        {
-            SCloudParticle* pPart = new SCloudParticle;
-            *pPart = pParticles[i];
-            float rx = pPart->GetRadiusX();
-            Vec3 vMin = pPart->GetPosition() - Vec3(rx, rx, rx);
-            Vec3 vMax = pPart->GetPosition() + Vec3(rx, rx, rx);
-            m_boundingBox.AddPoint(vMin);
-            m_boundingBox.AddPoint(vMax);
-            m_particles.push_back(pPart);
-        }
-    }
-
-    bool GenerateCloudImposter(CShader* pShader, CShaderResources* pRes, CRenderObject* pObject);
-};
-
-#endif  // __CRECLOUD_H__
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.cpp
deleted file mode 100644
index fd5b8d12d5..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Deferred shading processing render element
-
-#include "RenderDll_precompiled.h"
-
-
-// constructor/destructor
-CREDeferredShading::CREDeferredShading()
-{
-    // setup screen process renderer type
-    mfSetType(eDATA_DeferredShading);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-
-CREDeferredShading::~CREDeferredShading()
-{
-};
-
-// prepare screen processing
-void CREDeferredShading:: mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-}
-
-void CREDeferredShading::mfReset()
-{
-}
-
-void CREDeferredShading::mfActivate([[maybe_unused]] int iProcess)
-{
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.h b/Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.h
deleted file mode 100644
index 66aae3a905..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Deferred shading processing render element
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CREDEFERREDSHADING_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CREDEFERREDSHADING_H
-#pragma once
-
-
-
-class CREDeferredShading
-    : public CRendElementBase
-{
-    friend class CD3D9Renderer;
-    friend class CGLRenderer;
-
-public:
-
-    // constructor/destructor
-    CREDeferredShading();
-
-    virtual ~CREDeferredShading();
-
-    // prepare screen processing
-    virtual void mfPrepare(bool bCheckOverflow);
-    // render screen processing
-    virtual bool mfDraw(CShader* ef, SShaderPass* sfm);
-
-    // begin screen processing
-    virtual void mfActivate(int iProcess);
-    // reset
-    virtual void mfReset(void);
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CREDEFERREDSHADING_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREFogVolume.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREFogVolume.cpp
deleted file mode 100644
index 88cd2d879d..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREFogVolume.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "CREFogVolume.h"
-#include <IEntityRenderState.h> // <> required for Interfuscator
-
-
-CREFogVolume::CREFogVolume()
-    : CRendElementBase()
-    , m_center(0.0f, 0.0f, 0.0f)
-    , m_viewerInsideVolume(0)
-    , m_stencilRef(0)
-    , m_reserved(0)
-    , m_localAABB(Vec3(-1, -1, -1), Vec3(1, 1, 1))
-    , m_matWSInv()
-    , m_fogColor(1, 1, 1, 1)
-    , m_globalDensity(1)
-    , m_softEdgesLerp(1, 0)
-    , m_heightFallOffDirScaled(0, 0, 1)
-    , m_heightFallOffBasePoint(0, 0, 0)
-    , m_eyePosInWS(0, 0, 0)
-    , m_eyePosInOS(0, 0, 0)
-    , m_rampParams(0, 0, 0)
-    , m_windOffset(0, 0, 0)
-    , m_noiseScale(0)
-    , m_noiseFreq(1, 1, 1)
-    , m_noiseOffset(0)
-    , m_noiseElapsedTime(0)
-{
-    mfSetType(eDATA_FogVolume);
-    mfUpdateFlags(FCEF_TRANSFORM);
-
-    m_matWSInv.SetIdentity();
-}
-
-
-CREFogVolume::~CREFogVolume()
-{
-}
-
-
-void CREFogVolume::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREGameEffect.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREGameEffect.cpp
deleted file mode 100644
index ea7c16914e..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREGameEffect.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Render element that uses the IREGameEffect interface for its functionality
-
-#include "RenderDll_precompiled.h"
-#include "CREGameEffect.h"
-
-//--------------------------------------------------------------------------------------------------
-// Name: CREGameEffect
-// Desc: Constructor
-//--------------------------------------------------------------------------------------------------
-CREGameEffect::CREGameEffect()
-{
-    m_pImpl = NULL;
-    mfSetType(eDATA_GameEffect);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: ~CREGameEffect
-// Desc: Destructor
-//--------------------------------------------------------------------------------------------------
-CREGameEffect::~CREGameEffect()
-{
-    SAFE_DELETE(m_pImpl);
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: mfPrepare
-// Desc: Prepares rendering
-//--------------------------------------------------------------------------------------------------
-void CREGameEffect::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-    gRenDev->m_RP.m_pRE                         = this;
-    gRenDev->m_RP.m_RendNumIndices  = 0;
-    gRenDev->m_RP.m_RendNumVerts        = 0;
-
-    if (m_pImpl)
-    {
-        m_pImpl->mfPrepare(false);
-    }
-}//-------------------------------------------------------------------------------------------------
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREGeomCache.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREGeomCache.cpp
deleted file mode 100644
index bea79db280..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREGeomCache.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Backend part of geometry cache rendering
-
-
-#include "RenderDll_precompiled.h"
-
-#include <Common/RendererDefs.h>
-#include <Cry_Math.h>
-
-#if defined(USE_GEOM_CACHES)
-
-#include "RendElement.h"
-#include "CREGeomCache.h"
-#include "I3DEngine.h"
-#include "../Renderer.h"
-#include "../Common/PostProcess/PostEffects.h"
-
-StaticInstance<CREGeomCache::UpdateList> CREGeomCache::sm_updateList[2];
-
-CREGeomCache::CREGeomCache()
- : m_geomCacheVertexFormat(eVF_P3F_C4B_T2F)
-{
-    m_bUpdateFrame[0] = false;
-    m_bUpdateFrame[1] = false;
-    m_transformUpdateState[0] = 0;
-    m_transformUpdateState[1] = 0;
-
-    mfSetType(eDATA_GeomCache);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-
-CREGeomCache::~CREGeomCache()
-{
-    CryAutoLock<CryCriticalSection> lock1(sm_updateList[0]->m_mutex);
-    CryAutoLock<CryCriticalSection> lock2(sm_updateList[1]->m_mutex);
-
-    stl::find_and_erase(sm_updateList[0]->m_geoms, this);
-    stl::find_and_erase(sm_updateList[1]->m_geoms, this);
-}
-
-void CREGeomCache::InitializeRenderElement(const uint numMeshes, _smart_ptr<IRenderMesh>* pMeshes, uint16 materialId)
-{
-    m_bUpdateFrame[0] = false;
-    m_bUpdateFrame[1] = false;
-
-    m_meshFillData[0].clear();
-    m_meshFillData[1].clear();
-    m_meshRenderData.clear();
-
-    m_meshFillData[0].reserve(numMeshes);
-    m_meshFillData[1].reserve(numMeshes);
-    m_meshRenderData.reserve(numMeshes);
-
-    for (uint i = 0; i < numMeshes; ++i)
-    {
-        SMeshRenderData meshRenderData;
-        meshRenderData.m_pRenderMesh = pMeshes[i];
-        m_meshRenderData.push_back(meshRenderData);
-        m_meshFillData[0].push_back(meshRenderData);
-        m_meshFillData[1].push_back(meshRenderData);
-    }
-
-    m_materialId = materialId;
-}
-
-void CREGeomCache::mfPrepare(bool bCheckOverflow)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    CRenderer* const pRenderer = gRenDev;
-
-    if (bCheckOverflow)
-    {
-        pRenderer->FX_CheckOverflow(0, 0, this);
-    }
-
-    pRenderer->m_RP.m_CurVFormat = GetVertexFormat();
-    pRenderer->m_RP.m_pRE = this;
-    pRenderer->m_RP.m_FirstVertex = 0;
-    pRenderer->m_RP.m_FirstIndex =  0;
-    pRenderer->m_RP.m_RendNumIndices = 0;
-    pRenderer->m_RP.m_RendNumVerts = 0;
-}
-
-void CREGeomCache::SetupMotionBlur(CRenderObject* pRenderObject, const SRenderingPassInfo& passInfo)
-{
-    CMotionBlur::SetupObject(pRenderObject, passInfo);
-
-    if (pRenderObject->m_fDistance < CRenderer::CV_r_MotionBlurMaxViewDist)
-    {
-        pRenderObject->m_ObjFlags |= FOB_VERTEX_VELOCITY | FOB_MOTION_BLUR;
-    }
-}
-
-bool CREGeomCache::Update(const int flags, const bool bTessellation)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    // Wait until render node update has finished
-    const int threadId = gRenDev->m_RP.m_nProcessThreadID;
-    while (m_transformUpdateState[threadId])
-    {
-        CrySleep(0);
-    }
-
-    // Check if update was successful and if so copy data to render buffer
-    if (m_bUpdateFrame[threadId])
-    {
-        m_meshRenderData = m_meshFillData[threadId];
-    }
-
-    const uint numMeshes = m_meshFillData[threadId].size();
-    bool bRet = true;
-
-    for (uint nMesh = 0; nMesh < numMeshes; ++nMesh)
-    {
-        SMeshRenderData& meshData = m_meshFillData[threadId][nMesh];
-        CRenderMesh* const pRenderMesh = static_cast<CRenderMesh*>(meshData.m_pRenderMesh.get());
-
-        if (pRenderMesh && pRenderMesh->m_Modified[threadId].linked())
-        {
-            // Sync the async render mesh update. This waits for the fill thread started from main thread if it's still running.
-            // We need to do this manually, because geom caches don't use CREMesh.
-            pRenderMesh->SyncAsyncUpdate(threadId);
-
-            CRenderMesh* pVertexContainer = pRenderMesh->_GetVertexContainer();
-            bool bSucceed = pRenderMesh->RT_CheckUpdate(pVertexContainer, flags | VSM_MASK, bTessellation);
-            if (bSucceed)
-            {
-                pRenderMesh->m_Modified[threadId].erase();
-            }
-
-            if (!bSucceed || !pVertexContainer->_HasVBStream(VSF_GENERAL))
-            {
-                bRet = false;
-            }
-        }
-    }
-
-    return bRet;
-}
-
-void CREGeomCache::UpdateModified()
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    const int threadId = gRenDev->m_RP.m_nProcessThreadID;
-    AZ_Assert(threadId >= 0 && threadId <= 2, "Container is not expecting this index");
-    CryAutoLock<CryCriticalSection> lock(sm_updateList[threadId]->m_mutex);
-
-    for (auto iter = sm_updateList[threadId]->m_geoms.begin();
-         iter != sm_updateList[threadId]->m_geoms.end(); iter = sm_updateList[threadId]->m_geoms.erase(iter))
-    {
-        CREGeomCache* pRenderElement = *iter;
-        pRenderElement->Update(0, false);
-    }
-}
-
-bool CREGeomCache::mfUpdate(int Flags, bool bTessellation)
-{
-    const bool bRet = Update(Flags, bTessellation);
-
-    const int threadId = gRenDev->m_RP.m_nProcessThreadID;
-    CryAutoLock<CryCriticalSection> lock(sm_updateList[threadId]->m_mutex);
-    stl::find_and_erase(sm_updateList[threadId]->m_geoms, this);
-
-    m_Flags &= ~FCEF_DIRTY;
-    return bRet;
-}
-
-volatile int* CREGeomCache::SetAsyncUpdateState(int& threadId)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    ASSERT_IS_MAIN_THREAD(gRenDev->m_pRT);
-    threadId = gRenDev->m_RP.m_nFillThreadID;
-
-    m_bUpdateFrame[threadId] = false;
-
-    CryAutoLock<CryCriticalSection> lock(sm_updateList[threadId]->m_mutex);
-    stl::push_back_unique(sm_updateList[threadId]->m_geoms, this);
-
-    CryInterlockedIncrement(&m_transformUpdateState[threadId]);
-    return &m_transformUpdateState[threadId];
-}
-
-DynArray<CREGeomCache::SMeshRenderData>* CREGeomCache::GetMeshFillDataPtr()
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    assert(gEnv->IsEditor() || !gRenDev->m_pRT->IsRenderThread(true));
-    const int threadId = gRenDev->m_RP.m_nFillThreadID;
-    return &m_meshFillData[threadId];
-}
-
-DynArray<CREGeomCache::SMeshRenderData>* CREGeomCache::GetRenderDataPtr()
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    assert(gEnv->IsEditor() || !gRenDev->m_pRT->IsRenderThread(true));
-    return &m_meshRenderData;
-}
-
-void CREGeomCache::DisplayFilledBuffer(const int threadId)
-{
-    if (m_bUpdateFrame[threadId])
-    {
-        // You need to call SetAsyncUpdateState before DisplayFilledBuffer
-        __debugbreak();
-    }
-    m_bUpdateFrame[threadId] = true;
-}
-
-AZ::Vertex::Format CREGeomCache::GetVertexFormat() const
-{
-    return m_geomCacheVertexFormat;
-}
-
-bool CREGeomCache::GetGeometryInfo(SGeometryInfo &streams)
-{
-    ZeroStruct(streams);
-    streams.vertexFormat = GetVertexFormat();
-    streams.nFirstIndex = 0;
-    streams.nFirstVertex = 0;
-    streams.nNumIndices = 0;
-    streams.primitiveType = eptTriangleList;
-    streams.streamMask = 0;
-    return true;
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.cpp
deleted file mode 100644
index 6b9f3ed913..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : HDR processing render element
-
-#include "RenderDll_precompiled.h"
-
-
-// constructor/destructor
-CREHDRProcess::CREHDRProcess()
-{
-    // setup screen process renderer type
-    mfSetType(eDATA_HDRProcess);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-
-CREHDRProcess::~CREHDRProcess()
-{
-};
-
-// prepare screen processing
-void CREHDRProcess:: mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-}
-
-void CREHDRProcess::mfReset()
-{
-}
-
-void CREHDRProcess::mfActivate([[maybe_unused]] int iProcess)
-{
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.h b/Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.h
deleted file mode 100644
index 04e9269130..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : HDR processing render element
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CREHDRPROCESS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CREHDRPROCESS_H
-#pragma once
-
-
-
-// screen processing render element
-class CREHDRProcess
-    : public CRendElementBase
-{
-    friend class CD3D9Renderer;
-    friend class CGLRenderer;
-
-public:
-
-    // constructor/destructor
-    CREHDRProcess();
-
-    virtual ~CREHDRProcess();
-
-    // prepare screen processing
-    virtual void mfPrepare(bool bCheckOverflow);
-    // render screen processing
-    virtual bool mfDraw(CShader* ef, SShaderPass* sfm);
-
-    // begin screen processing
-    virtual void mfActivate(int iProcess);
-    // reset
-    virtual void mfReset(void);
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CREHDRPROCESS_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREImposter.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREImposter.cpp
deleted file mode 100644
index 385abdc09b..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREImposter.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "RendElement.h"
-#include "CREImposter.h"
-#include "I3DEngine.h"
-
-int CREImposter::m_MemUpdated;
-int CREImposter::m_MemPostponed;
-int CREImposter::m_PrevMemUpdated;
-int CREImposter::m_PrevMemPostponed;
-
-IDynTexture* CREImposter::m_pScreenTexture = NULL;
-
-bool CREImposter::IsImposterValid(const CameraViewParameters& cam, [[maybe_unused]] float fRadiusX, [[maybe_unused]] float fRadiusY, [[maybe_unused]] float fCamRadiusX, [[maybe_unused]] float fCamRadiusY,
-    const int iRequiredLogResX, const int iRequiredLogResY, const uint32 dwBestEdge)
-{
-    if (dwBestEdge != m_nLastBestEdge)
-    {
-        return false;
-    }
-
-    float fTransparency = gRenDev->m_RP.m_pCurObject->m_II.m_AmbColor.a;
-    if (gRenDev->m_RP.m_pShaderResources)
-    {
-        fTransparency *= gRenDev->m_RP.m_pShaderResources->GetStrengthValue(EFTT_OPACITY);
-    }
-    if (m_fCurTransparency != fTransparency)
-    {
-        m_fCurTransparency = fTransparency;
-        return false;
-    }
-
-    // screen impostors should always be updated
-    if (m_bScreenImposter)
-    {
-        m_vFarPoint = Vec3(0, 0, 0);
-        m_vNearPoint = Vec3(0, 0, 0);
-        return false;
-    }
-    if (m_bSplit)
-    {
-        return false;
-    }
-
-    Vec3 vEye = m_vPos - cam.vOrigin;
-    float fDistance = vEye.GetLength();
-
-    if (fDistance < 0.0001f)
-    {
-        return false;                   // to avoid float exceptions
-    }
-    vEye /= fDistance;
-
-    Vec3 vOldEye = m_vFarPoint - m_LastViewParameters.vOrigin;
-    float fOldEyeDist = vOldEye.GetLength();
-
-    if (fOldEyeDist < 0.0001f)
-    {
-        return false;                   // to avoid float exceptions
-    }
-    vOldEye /= fOldEyeDist;
-
-    float fCosAlpha = vEye * vOldEye; // dot product of normalized vectors = cosine
-    if (fCosAlpha < m_fErrorToleranceCosAngle)
-    {
-        return false;
-    }
-
-    Vec3 curSunDir(gEnv->p3DEngine->GetSunDir().GetNormalized());
-    if (m_vLastSunDir.Dot(curSunDir) < 0.995)
-    {
-        return false;
-    }
-
-    // equal pow-of-2 size comparison for consistent look
-
-    if (iRequiredLogResX != m_nLogResolutionX)
-    {
-        return false;
-    }
-
-    if (iRequiredLogResY != m_nLogResolutionY)
-    {
-        return false;
-    }
-
-    if (gRenDev->m_nFrameReset != m_nFrameReset)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void CREImposter::ReleaseResources()
-{
-    SAFE_DELETE(m_pTexture);
-    SAFE_DELETE(m_pScreenTexture);
-    SAFE_DELETE(m_pFrontTexture);
-    SAFE_DELETE(m_pTextureDepth);
-}
-
-int IntersectRayAABB(Vec3 p, Vec3 d, SMinMaxBox a, Vec3& q)
-{
-    float tmin = 0;
-    float tmax = FLT_MAX;
-    int i;
-    const Vec3& min = a.GetMin();
-    const Vec3& max = a.GetMax();
-    for (i = 0; i < 3; i++)
-    {
-        if (fabs(d[i]) < 0.001f)
-        {
-            if (p[i] < min[i] || p[i] > max[i])
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            float ood = 1.0f / d[i];
-            float t1 = (min[i] - p[i]) * ood;
-            float t2 = (max[i] - p[i]) * ood;
-            if (t1 > t2)
-            {
-                Exchange(t1, t2);
-            }
-            if (t1 > tmin)
-            {
-                tmin = t1;
-            }
-            if (t2 > tmax)
-            {
-                tmax = t2;
-            }
-        }
-    }
-    q = p + d * tmin;
-
-    return 1;
-}
-
-Vec3 CREImposter::GetPosition()
-{
-    Vec3 vNearest = m_WorldSpaceBV.GetCenter();
-
-    return vNearest;
-}
-
-void CREImposter::mfPrepare(bool bCheckOverflow)
-{
-    CRenderer* rd = gRenDev;
-    if (bCheckOverflow)
-    {
-        rd->FX_CheckOverflow(0, 0, this);
-    }
-
-    CRenderObject* pObj = rd->m_RP.m_pCurObject;
-
-    CShaderResources* pRes = rd->m_RP.m_pShaderResources;
-    CShader* pShader = rd->m_RP.m_pShader;
-    int nTech = rd->m_RP.m_nShaderTechnique;
-
-    UpdateImposter();
-
-    rd->FX_Start(pShader, nTech, pRes, this);
-    rd->m_RP.m_pCurObject = pObj;
-
-    rd->m_RP.m_pRE = this;
-    rd->m_RP.m_RendNumIndices = 0;
-    rd->m_RP.m_RendNumVerts = 4;
-    rd->m_RP.m_FirstVertex = 0;
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CRELensOptics.h b/Code/CryEngine/RenderDll/Common/RendElements/CRELensOptics.h
deleted file mode 100644
index e9c834e042..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CRELensOptics.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CRELENSOPTICS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CRELENSOPTICS_H
-#pragma once
-
-class CRELensOptics
-    : public CRendElementBase
-{
-public:
-    CRELensOptics(void);
-    ~CRELensOptics(void);
-
-    virtual bool mfCompile(CParserBin& Parser, SParserFrame& Frame);
-    virtual void mfPrepare(bool bCheckOverflow);
-    virtual bool mfDraw(CShader* ef, SShaderPass* sfm);
-    virtual void mfExport([[maybe_unused]] struct SShaderSerializeContext& SC) {};
-    virtual void mfImport([[maybe_unused]] struct SShaderSerializeContext& SC, [[maybe_unused]] uint32& offset) {};
-
-    void ProcessGlobalAction();
-
-    static void ClearResources();
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CRELENSOPTICS_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREMesh.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREMesh.cpp
deleted file mode 100644
index ade5ff1ab4..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREMesh.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "CREMeshImpl.h"
-
-#if !defined(NULL_RENDERER)
-#include "XRenderD3D9/DriverD3D.h"
-#endif
-
-void CREMeshImpl::mfReset()
-{
-}
-
-void CREMeshImpl::mfCenter(Vec3& Pos, CRenderObject* pObj)
-{
-    Vec3 Mins = m_pRenderMesh->m_vBoxMin;
-    Vec3 Maxs = m_pRenderMesh->m_vBoxMax;
-    Pos = (Mins + Maxs) * 0.5f;
-    if (pObj)
-    {
-        Pos += pObj->GetTranslation();
-    }
-}
-
-void CREMeshImpl::mfGetBBox(Vec3& vMins, Vec3& vMaxs)
-{
-    vMins = m_pRenderMesh->_GetVertexContainer()->m_vBoxMin;
-    vMaxs = m_pRenderMesh->_GetVertexContainer()->m_vBoxMax;
-}
-
-
-///////////////////////////////////////////////////////////////////
-
-void CREMeshImpl::mfPrepare(bool bCheckOverflow)
-{
-    DETAILED_PROFILE_MARKER("CREMeshImpl::mfPrepare");
-    CRenderer* rd = gRenDev;
-
-    if (bCheckOverflow)
-    {
-        rd->FX_CheckOverflow(0, 0, this);
-    }
-
-    IF (!m_pRenderMesh, 0)
-    {
-        return;
-    }
-
-    rd->m_RP.m_CurVFormat = m_pChunk->m_vertexFormat;
-
-    {
-        rd->m_RP.m_pRE = this;
-
-        rd->m_RP.m_FirstVertex = m_nFirstVertId;
-        rd->m_RP.m_FirstIndex =  m_nFirstIndexId;
-        rd->m_RP.m_RendNumIndices = m_nNumIndices;
-        rd->m_RP.m_RendNumVerts = m_nNumVerts;
-
-        if (rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & (RBPF_SHADOWGEN) && (gRenDev->m_RP.m_PersFlags2 & RBPF2_DISABLECOLORWRITES))
-        {
-            _smart_ptr<IMaterial> pMaterial = (gRenDev->m_RP.m_pCurObject) ? (gRenDev->m_RP.m_pCurObject->m_pCurrMaterial) : NULL;
-            m_pRenderMesh->AddShadowPassMergedChunkIndicesAndVertices(m_pChunk, pMaterial, rd->m_RP.m_RendNumVerts, rd->m_RP.m_RendNumIndices);
-        }
-    }
-}
-
-TRenderChunkArray* CREMeshImpl::mfGetMatInfoList()
-{
-    return &m_pRenderMesh->m_Chunks;
-}
-
-int CREMeshImpl::mfGetMatId()
-{
-    return m_pChunk->m_nMatID;
-}
-
-CRenderChunk* CREMeshImpl::mfGetMatInfo()
-{
-    return m_pChunk;
-}
-
-void CREMeshImpl::mfPrecache(const SShaderItem& SH)
-{
-    DETAILED_PROFILE_MARKER("CREMeshImpl::mfPrecache");
-    CShader* pSH = (CShader*)SH.m_pShader;
-    IF (!pSH, 0)
-    {
-        return;
-    }
-    IF (!m_pRenderMesh, 0)
-    {
-        return;
-    }
-    IF (m_pRenderMesh->_HasVBStream(VSF_GENERAL), 0)
-    {
-        return;
-    }
-
-    mfCheckUpdate(VSM_TANGENTS, gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID);
-}
-
-bool CREMeshImpl::mfUpdate(int Flags, bool bTessellation)
-{
-    DETAILED_PROFILE_MARKER("CREMeshImpl::mfUpdate");
-    FUNCTION_PROFILER_RENDER_FLAT
-    IF (m_pRenderMesh == NULL, 0)
-    {
-        return false;
-    }
-
-    CRenderer* rd = gRenDev;
-    const int threadId = rd->m_RP.m_nProcessThreadID;
-
-    bool bSucceed = true;
-
-    CRenderMesh* pVContainer = m_pRenderMesh->_GetVertexContainer();
-    
-    m_pRenderMesh->m_nFlags &= ~FRM_SKINNEDNEXTDRAW;
-
-    if (m_pRenderMesh->m_Modified[threadId].linked() || bTessellation) // TODO: use the modified list also for tessellated meshes
-    {
-        m_pRenderMesh->SyncAsyncUpdate(gRenDev->m_RP.m_nProcessThreadID);
-
-        bSucceed = m_pRenderMesh->RT_CheckUpdate(pVContainer, Flags | VSM_MASK, bTessellation);
-        if (bSucceed)
-        {
-            m_pRenderMesh->m_Modified[threadId].erase();
-        }
-    }
-
-    if (!bSucceed || !pVContainer->_HasVBStream(VSF_GENERAL))
-    {
-        return false;
-    }
-
-    bool bSkinned = (m_pRenderMesh->m_nFlags & (FRM_SKINNED | FRM_SKINNEDNEXTDRAW)) != 0;
-    if ((Flags | VSM_MASK) & VSM_TANGENTS)
-    {
-        if (bSkinned && pVContainer->_HasVBStream(VSF_QTANGENTS))
-        {
-            rd->m_RP.m_FlagsStreams_Stream &= ~VSM_TANGENTS;
-            rd->m_RP.m_FlagsStreams_Decl &= ~VSM_TANGENTS;
-            rd->m_RP.m_FlagsStreams_Stream |= (1 << VSF_QTANGENTS);
-            rd->m_RP.m_FlagsStreams_Decl |= (1 << VSF_QTANGENTS);
-        }
-    }
-
-    rd->m_RP.m_CurVFormat = m_pChunk->m_vertexFormat;
-    m_Flags &= ~FCEF_DIRTY;
-
-    return true;
-}
-
-void* CREMeshImpl::mfGetPointer(ESrcPointer ePT, int* Stride, [[maybe_unused]] EParamType Type, [[maybe_unused]] ESrcPointer Dst, [[maybe_unused]] int Flags)
-{
-    DETAILED_PROFILE_MARKER("CREMeshImpl::mfGetPointer");
-    CRenderMesh* pRM = m_pRenderMesh->_GetVertexContainer();
-    byte* pD = NULL;
-    IRenderMesh::ThreadAccessLock lock(pRM);
-
-    switch (ePT)
-    {
-    case eSrcPointer_Vert:
-        pD = pRM->GetPosPtr(*Stride,  FSL_READ);
-        break;
-    case eSrcPointer_Tex:
-        pD = pRM->GetUVPtr(*Stride,  FSL_READ);
-        break;
-    case eSrcPointer_Normal:
-        pD = pRM->GetNormPtr(*Stride,  FSL_READ);
-        break;
-    case eSrcPointer_Tangent:
-        pD = pRM->GetTangentPtr(*Stride, FSL_READ);
-        break;
-    case eSrcPointer_Color:
-        pD = pRM->GetColorPtr(*Stride, FSL_READ);
-        break;
-    default:
-        assert(false);
-        break;
-    }
-    if (m_nFirstVertId && pD)
-    {
-        pD += m_nFirstVertId * (*Stride);
-    }
-    return pD;
-}
-
-void CREMeshImpl::mfGetPlane(Plane& pl)
-{
-
-    // fixme: plane orientation based on biggest bbox axis
-    Vec3 pMin, pMax;
-    mfGetBBox(pMin, pMax);
-    Vec3 p0 = pMin;
-    Vec3 p1 = Vec3(pMax.x, pMin.y, pMin.z);
-    Vec3 p2 = Vec3(pMin.x, pMax.y, pMin.z);
-    pl.SetPlane(p2, p0, p1);
-}
-
-AZ::Vertex::Format CREMeshImpl::GetVertexFormat() const
-{
-    if (m_pChunk)
-    {
-        return m_pChunk->m_vertexFormat;
-    }
-    else if (m_pRenderMesh)
-    {
-        return m_pRenderMesh->_GetVertexContainer()->_GetVertexFormat();
-    }
-    return AZ::Vertex::Format(eVF_Unknown);
-}
-bool CREMeshImpl::GetGeometryInfo(SGeometryInfo &geomInfo)
-{
-    if (!m_pRenderMesh)
-        return false;
-
-    CRenderMesh *pVContainer = m_pRenderMesh->_GetVertexContainer();
-
-    geomInfo.nFirstIndex = m_nFirstIndexId;
-    geomInfo.nFirstVertex = m_nFirstVertId;
-    geomInfo.nNumVertices = m_nNumVerts;
-    geomInfo.nNumIndices = m_nNumIndices;
-
-    geomInfo.vertexFormat = pVContainer->_GetVertexFormat();
-    geomInfo.primitiveType = pVContainer->GetPrimitiveType();
-
-    geomInfo.streamMask = 0;
-
-    const bool bSkinned = (m_pRenderMesh->m_nFlags & (FRM_SKINNED | FRM_SKINNEDNEXTDRAW)) != 0;
-    if (bSkinned && pVContainer->_HasVBStream(VSF_QTANGENTS))
-        geomInfo.streamMask |= BIT(VSF_QTANGENTS);
-
-    {
-        // Check if needs updating.
-        //TODO Fix constant | 0x80000000
-        //bool bTessEnabled = (pso->m_ShaderFlags_RT & g_HWSR_MaskBit[HWSR_NO_TESSELLATION]) != 0;
-        bool bTessEnabled = false;
-        uint32 streamMask = 0;
-        uint16 nFrameId = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-        if (!mfCheckUpdate((uint32)streamMask | 0x80000000, (uint16)nFrameId, bTessEnabled))
-            return false;
-    }
-
-    if (!m_pRenderMesh->FillGeometryInfo(geomInfo))
-        return false;
-
-    return true;
-}
-
-bool CREMeshImpl::BindRemappedSkinningData([[maybe_unused]] uint32 guid)
-{
-#if !defined(NULL_RENDERER)
-    CD3D9Renderer *rd = gcpRendD3D;
-
-    SGeometryStreamInfo streamInfo;
-    CRenderMesh *pRM = m_pRenderMesh->_GetVertexContainer();
-    if (pRM->GetRemappedSkinningData(guid, streamInfo))
-    {
-        rd->FX_SetVStream(VSF_HWSKIN_INFO, streamInfo.pStream, streamInfo.nOffset, streamInfo.nStride);
-        return true;
-    }
-#endif
-    return false;
-}
-
-#if !defined(NULL_RENDERER)
-bool CREMeshImpl::mfPreDraw([[maybe_unused]] SShaderPass *sl)
-{
-    DETAILED_PROFILE_MARKER("CREMeshImpl::mfPreDraw");
-    IF(!m_pRenderMesh, 0)
-        return false;
-
-    CRenderMesh *pRM = m_pRenderMesh->_GetVertexContainer();
-    pRM->PrefetchVertexStreams();
-
-    // Should never happen. Video buffer is missing
-    if (!pRM->_HasVBStream(VSF_GENERAL) || !m_pRenderMesh->_HasIBStream())
-        return false;
-
-    m_pRenderMesh->BindStreamsToRenderPipeline();
-
-    m_Flags |= FCEF_PRE_DRAW_DONE;
-
-    return true;
-}
-
-#if !defined(_RELEASE)
-inline bool CREMeshImpl::ValidateDraw(EShaderType shaderType)
-{
-    bool ret = true;
-
-    if (shaderType != eST_General &&
-        shaderType != eST_PostProcess &&
-        shaderType != eST_FX &&
-        shaderType != eST_Glass &&
-        shaderType != eST_Water)
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Incorrect shader set for mesh type: %s : %d", m_pRenderMesh->GetSourceName(), shaderType);
-        ret = false;
-    }
-
-    if (!(m_Flags&FCEF_PRE_DRAW_DONE))
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "PreDraw not called for mesh: %s", m_pRenderMesh->GetSourceName());
-        ret = false;
-    }
-
-    return ret;
-}
-#endif
-
-bool CREMeshImpl::mfDraw(CShader *ef, [[maybe_unused]] SShaderPass *sl)
-{
-    DETAILED_PROFILE_MARKER("CREMeshImpl::mfDraw");
-    FUNCTION_PROFILER_RENDER_FLAT
-        CD3D9Renderer *r = gcpRendD3D;
-
-#if !defined(_RELEASE)
-    if (!ValidateDraw(ef->m_eShaderType))
-    {
-        return false;
-    }
-#endif
-
-    CRenderMesh *pRM = m_pRenderMesh;
-    if (ef->m_HWTechniques.Num() && pRM->CanRender())
-    {
-        r->FX_DrawIndexedMesh(r->m_RP.m_RendNumGroup >= 0 ? eptHWSkinGroups : pRM->GetPrimitiveType());
-    }
-    return true;
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREMeshImpl.h b/Code/CryEngine/RenderDll/Common/RendElements/CREMeshImpl.h
deleted file mode 100644
index d84dde7b4f..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREMeshImpl.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-class CREMeshImpl
-    : public CREMesh
-{
-#if !defined(NULL_RENDERER)
-public:
-    // Constant buffer used for tessellation. It has just one constant which tells the hull shader how it needs to offset iPrimitiveID that comes from HW.
-    WrappedDX11Buffer m_tessCB;
-#endif
-
-public:
-    virtual struct CRenderChunk* mfGetMatInfo();
-    virtual TRenderChunkArray* mfGetMatInfoList();
-    virtual int mfGetMatId();
-    virtual bool mfPreDraw(SShaderPass* sl);
-    virtual bool mfIsHWSkinned()
-    {
-        return (m_Flags & FCEF_SKINNED) != 0;
-    }
-    virtual void mfGetPlane(Plane& pl);
-    virtual void mfPrepare(bool bCheckOverflow);
-    virtual void mfReset();
-    virtual void mfCenter(Vec3& Pos, CRenderObject* pObj);
-    virtual bool mfDraw(CShader* ef, SShaderPass* sfm);
-    virtual void* mfGetPointer(ESrcPointer ePT, int* Stride, EParamType Type, ESrcPointer Dst, int Flags);
-    virtual bool mfUpdate(int Flags, bool bTessellation = false);
-    virtual void mfGetBBox(Vec3& vMins, Vec3& vMaxs);
-    virtual void mfPrecache(const SShaderItem& SH);
-    virtual int Size()
-    {
-        int nSize = sizeof(*this);
-        return nSize;
-    }
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-    bool BindRemappedSkinningData(uint32 guid);
-
-    CREMeshImpl()
-    {
-    }
-
-    virtual ~CREMeshImpl()
-    {
-    }
-
-#if !defined(_RELEASE)
-    inline bool ValidateDraw(EShaderType shaderType);
-#endif
-
-    virtual bool GetGeometryInfo(SGeometryInfo &geomInfo) override;
-    virtual AZ::Vertex::Format GetVertexFormat() const override;
-
-    //protected:
-    //  CREMeshImpl(CREMeshImpl&);
-    //  CREMeshImpl& operator=(CREMeshImpl&);
-};
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREOclusionQuery.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREOclusionQuery.cpp
deleted file mode 100644
index 7870c27158..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREOclusionQuery.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "RendElement.h"
-
-void CREOcclusionQuery::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-
-    mfSetType(eDATA_OcclusionQuery);
-    mfUpdateFlags(FCEF_TRANSFORM);
-    //  m_matWSInv.SetIdentity();
-
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_FirstVertex = 0;
-    gRenDev->m_RP.m_RendNumVerts = 4;
-
-    if (m_pRMBox && m_pRMBox->m_Chunks.size())
-    {
-        CRenderChunk* pChunk = &m_pRMBox->m_Chunks[0];
-        if (pChunk)
-        {
-            gRenDev->m_RP.m_RendNumIndices = pChunk->nNumIndices;
-            gRenDev->m_RP.m_FirstVertex = 0;
-            gRenDev->m_RP.m_RendNumVerts = pChunk->nNumVerts;
-        }
-    }
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREPostProcess.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREPostProcess.cpp
deleted file mode 100644
index f5dc86b125..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREPostProcess.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Post processing RenderElement
-
-
-#include "RenderDll_precompiled.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CREPostProcess::CREPostProcess()
-{
-    mfSetType(eDATA_PostProcess);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-
-CREPostProcess::~CREPostProcess()
-{
-}
-
-void CREPostProcess:: mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-
-    if (CRenderer::CV_r_PostProcessReset)
-    {
-        CRenderer::CV_r_PostProcessReset = 0;
-        mfReset();
-    }
-}
-
-void CREPostProcess::Reset(bool bOnSpecChange)
-{
-    if (PostEffectMgr())
-    {
-        PostEffectMgr()->Reset(bOnSpecChange);
-    }
-}
-
-int CREPostProcess:: mfSetParameter(const char* pszParam, float fValue, bool bForceValue) const
-{
-    assert((pszParam) && "mfSetParameter: null parameter");
-
-    CEffectParam* pParam = PostEffectMgr()->GetByName(pszParam);
-    if (!pParam)
-    {
-        return 0;
-    }
-
-    pParam->SetParam(fValue, bForceValue);
-
-    return 1;
-}
-
-void CREPostProcess:: mfGetParameter(const char* pszParam, float& fValue) const
-{
-    assert((pszParam) && "mfGetParameter: null parameter");
-
-    CEffectParam* pParam = PostEffectMgr()->GetByName(pszParam);
-    if (!pParam)
-    {
-        return;
-    }
-
-    fValue = pParam->GetParam();
-}
-
-int CREPostProcess:: mfSetParameterVec4(const char* pszParam, const Vec4& pValue, bool bForceValue) const
-{
-    assert((pszParam) && "mfSetParameter: null parameter");
-
-    CEffectParam* pParam = PostEffectMgr()->GetByName(pszParam);
-    if (!pParam)
-    {
-        return 0;
-    }
-
-    pParam->SetParamVec4(pValue, bForceValue);
-
-    return 1;
-}
-
-void CREPostProcess:: mfGetParameterVec4(const char* pszParam, Vec4& pValue) const
-{
-    assert((pszParam) && "mfGetParameter: null parameter");
-
-    CEffectParam* pParam = PostEffectMgr()->GetByName(pszParam);
-    if (!pParam)
-    {
-        return;
-    }
-
-    pValue = pParam->GetParamVec4();
-}
-
-int CREPostProcess::mfSetParameterString(const char* pszParam, const char* pszArg) const
-{
-    assert((pszParam || pszArg) && "mfSetParameter: null parameter");
-
-    CEffectParam* pParam = PostEffectMgr()->GetByName(pszParam);
-    if (!pParam)
-    {
-        return 0;
-    }
-
-    pParam->SetParamString(pszArg);
-    return 1;
-}
-
-void CREPostProcess::mfGetParameterString(const char* pszParam, const char*& pszArg) const
-{
-    assert((pszParam) && "mfGetParameter: null parameter");
-
-    CEffectParam* pParam = PostEffectMgr()->GetByName(pszParam);
-    if (!pParam)
-    {
-        return;
-    }
-
-    pszArg = pParam->GetParamString();
-}
-
-int32 CREPostProcess::mfGetPostEffectID(const char* pPostEffectName) const
-{
-    assert(pPostEffectName && "mfGetParameter: null parameter");
-
-    return PostEffectMgr()->GetEffectID(pPostEffectName);
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREPrismObject.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREPrismObject.cpp
deleted file mode 100644
index 696ffe1cb9..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREPrismObject.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-
-#include "CREPrismObject.h"
-#include <IEntityRenderState.h> // <> required for Interfuscator
-
-CREPrismObject::CREPrismObject()
-    : CRendElementBase()
-    , m_center(0, 0, 0)
-{
-    mfSetType(eDATA_PrismObject);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-
-void CREPrismObject::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-}
-
-
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CRESky.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CRESky.cpp
deleted file mode 100644
index b1fe13cfe2..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CRESky.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "RendElement.h"
-#include "CRESky.h"
-#include "Stars.h"
-#include "I3DEngine.h"
-#include <Common/RenderCapabilities.h>
-#include <Pak/CryPakUtils.h>
-
-#if !defined(NULL_RENDERER)
-#include "../../XRenderD3D9/DriverD3D.h"
-#endif
-
-CRESky::CRESky()
-    : m_skyVertexFormat(eVF_P3F_C4B_T2F)
-{
-    mfSetType(eDATA_Sky);
-    mfUpdateFlags(FCEF_TRANSFORM);
-    m_fTerrainWaterLevel = 0;
-    m_fAlpha = 1;
-    m_nSphereListId = 0;
-    m_fSkyBoxStretching = 1.f;
-}
-
-void CRESky::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-}
-
-AZ::Vertex::Format CRESky::GetVertexFormat() const
-{
-    return m_skyVertexFormat;
-}
-
-bool CRESky::GetGeometryInfo(SGeometryInfo &streams)
-{
-    ZeroStruct(streams);
-    streams.vertexFormat = GetVertexFormat();
-    streams.primitiveType = eptTriangleList;
-    return true;
-}
-
-CRESky::~CRESky()
-{
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// HDR Sky
-//////////////////////////////////////////////////////////////////////////
-CREHDRSky::CREHDRSky()
-    : m_pRenderParams(0)
-    , m_skyDomeTextureLastTimeStamp(-1)
-    , m_frameReset(0)
-    , m_pStars(0)
-    , m_pSkyDomeTextureMie(0)
-    , m_pSkyDomeTextureRayleigh(0)
-    , m_hdrSkyVertexFormat(eVF_P3F_C4B_T2F)
-{
-    mfSetType(eDATA_HDRSky);
-    mfUpdateFlags(FCEF_TRANSFORM);
-    Init();
-}
-
-void CREHDRSky::GenerateSkyDomeTextures([[maybe_unused]] int32 width, [[maybe_unused]] int32 height)
-{
-    SAFE_RELEASE(m_pSkyDomeTextureMie);
-    SAFE_RELEASE(m_pSkyDomeTextureRayleigh);
-
-#if !defined(NULL_RENDERER)
-    int creationFlags = FT_STATE_CLAMP | FT_NOMIPS;
-
-    m_pSkyDomeTextureMie = CTexture::Create2DTexture("$SkyDomeTextureMie", width, height, 1, creationFlags, 0, eTF_R16G16B16A16F, eTF_R16G16B16A16F);
-    m_pSkyDomeTextureMie->SetFilterMode(FILTER_LINEAR);
-    m_pSkyDomeTextureMie->SetClampingMode(0, 1, 1);
-    m_pSkyDomeTextureMie->UpdateTexStates();
-
-    m_pSkyDomeTextureRayleigh = CTexture::Create2DTexture("$SkyDomeTextureRayleigh", width, height, 1, creationFlags, 0, eTF_R16G16B16A16F, eTF_R16G16B16A16F);
-    m_pSkyDomeTextureRayleigh->SetFilterMode(FILTER_LINEAR);
-    m_pSkyDomeTextureRayleigh->SetClampingMode(0, 1, 1);
-    m_pSkyDomeTextureRayleigh->UpdateTexStates();
-#endif
-}
-
-void CREHDRSky::Init()
-{
-    // The drivers in Qualcomm devices running Android 4.4 and OpenGL ES 3.0 crash
-    // when running the "Stars" vertex shader. The problem is a combination of using gl_VertexID
-    // and accessing global arrays. Disabling it for GLES 3.0 devices for now.
-    if (!m_pStars && GetShaderLanguage() != eSL_GLES3_0)
-    {
-        m_pStars = new CStars;
-    }
-
-    //No longer defer texture creation, MT resource creation now supported
-    //gRenDev->m_pRT->RC_GenerateSkyDomeTextures(this, SSkyLightRenderParams::skyDomeTextureWidth, SSkyLightRenderParams::skyDomeTextureHeight);
-    GenerateSkyDomeTextures(SSkyLightRenderParams::skyDomeTextureWidth, SSkyLightRenderParams::skyDomeTextureHeight);
-}
-
-void CREHDRSky::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-
-    //gRenDev->FX_CheckOverflow( 0, 0, this );
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-}
-
-AZ::Vertex::Format CREHDRSky::GetVertexFormat() const
-{
-    return m_hdrSkyVertexFormat;
-}
-
-bool CREHDRSky::GetGeometryInfo(SGeometryInfo &streams)
-{
-    ZeroStruct(streams);
-    streams.vertexFormat = GetVertexFormat();
-    streams.primitiveType = eptTriangleList;
-    return true;
-}
-
-CREHDRSky::~CREHDRSky()
-{
-    SAFE_DELETE(m_pStars);
-
-    SAFE_RELEASE(m_pSkyDomeTextureMie);
-    SAFE_RELEASE(m_pSkyDomeTextureRayleigh);
-}
-
-void CREHDRSky::SetCommonMoonParams(CShader* ef, bool bUseMoon)
-{
-    I3DEngine* p3DEngine(gEnv->p3DEngine);
-
-    Vec3 mr;
-    p3DEngine->GetGlobalParameter(E3DPARAM_SKY_MOONROTATION, mr);
-    float moonLati = -gf_PI + gf_PI * mr.x / 180.0f;
-    float moonLong = 0.5f * gf_PI - gf_PI * mr.y / 180.0f;
-
-    float sinLonR = sinf(-0.5f * gf_PI);
-    float cosLonR = cosf(-0.5f * gf_PI);
-    float sinLatR = sinf(moonLati + 0.5f * gf_PI);
-    float cosLatR = cosf(moonLati + 0.5f * gf_PI);
-    Vec3 moonTexGenRight(sinLonR * cosLatR, sinLonR * sinLatR, cosLonR);
-
-    Vec4 nsMoonTexGenRight(moonTexGenRight, 0);
-    static CCryNameR ParamNameTGR("SkyDome_NightMoonTexGenRight");
-    ef->FXSetVSFloat(ParamNameTGR, &nsMoonTexGenRight, 1);
-
-    float sinLonU = sinf(moonLong + 0.5f * gf_PI);
-    float cosLonU = cosf(moonLong + 0.5f * gf_PI);
-    float sinLatU = sinf(moonLati);
-    float cosLatU = cosf(moonLati);
-    Vec3 moonTexGenUp(sinLonU * cosLatU, sinLonU * sinLatU, cosLonU);
-
-    Vec4 nsMoonTexGenUp(moonTexGenUp, 0);
-    static CCryNameR ParamNameTGU("SkyDome_NightMoonTexGenUp");
-    ef->FXSetVSFloat(ParamNameTGU, &nsMoonTexGenUp, 1);
-
-    Vec3 nightMoonDirection;
-    p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_DIRECTION, nightMoonDirection);
-    float nightMoonSize(25.0f - 24.0f * clamp_tpl(p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_SIZE), 0.0f, 1.0f));
-    Vec4 nsMoonDirSize(nightMoonDirection, bUseMoon ? nightMoonSize  : 9999.0f);
-    static CCryNameR ParamNameDirSize("SkyDome_NightMoonDirSize");
-    ef->FXSetVSFloat(ParamNameDirSize, &nsMoonDirSize, 1);
-    ef->FXSetPSFloat(ParamNameDirSize, &nsMoonDirSize, 1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Stars
-//////////////////////////////////////////////////////////////////////////
-
-
-CStars::CStars()
-    : m_numStars(0)
-    , m_pStarMesh(0)
-    , m_pShader(0)
-{
-    if (LoadData())
-    {
-#ifndef NULL_RENDERER
-        gRenDev->m_cEF.mfRefreshSystemShader("Stars", gRenDev->m_cEF.s_ShaderStars);
-        m_pShader = gRenDev->m_cEF.s_ShaderStars;
-#endif
-    }
-}
-
-
-CStars::~CStars()
-{
-    m_pStarMesh = NULL;
-}
-
-
-
-bool CStars::LoadData()
-{
-    const uint32 c_fileTag(0x52415453);             // "STAR"
-    const uint32 c_fileVersion(0x00010001);
-    const char c_fileName[] = "engineassets/sky/stars.dat";
-
-    auto pPak(gEnv->pCryPak);
-    if (pPak)
-    {
-        CInMemoryFileLoader file(pPak);
-        if (file.FOpen(c_fileName, "rb"))
-        {
-            // read and validate header
-            size_t itemsRead(0);
-            uint32 fileTag(0);
-            itemsRead = file.FRead(&fileTag, 1);
-            if (itemsRead != 1 || fileTag != c_fileTag)
-            {
-                file.FClose();
-                return false;
-            }
-
-            uint32 fileVersion(0);
-            itemsRead = file.FRead(&fileVersion, 1);
-            if (itemsRead != 1 || fileVersion != c_fileVersion)
-            {
-                file.FClose();
-                return false;
-            }
-
-            // read in stars
-            file.FRead(&m_numStars, 1);
-
-            SVF_P3S_C4B_T2S* pData(new SVF_P3S_C4B_T2S[6 * m_numStars]);
-
-            for (unsigned int i(0); i < m_numStars; ++i)
-            {
-                float ra(0);
-                file.FRead(&ra, 1);
-
-                float dec(0);
-                file.FRead(&dec, 1);
-
-                uint8 r(0);
-                file.FRead(&r, 1);
-
-                uint8 g(0);
-                file.FRead(&g, 1);
-
-                uint8 b(0);
-                file.FRead(&b, 1);
-
-                uint8 mag(0);
-                file.FRead(&mag, 1);
-
-                Vec3 v;
-                v.x = -cosf(DEG2RAD(dec)) * sinf(DEG2RAD(ra * 15.0f));
-                v.y = cosf(DEG2RAD(dec)) * cosf(DEG2RAD(ra * 15.0f));
-                v.z = sinf(DEG2RAD(dec));
-
-                for (int k = 0; k < 6; k++)
-                {
-                    pData[6 * i + k].xyz = v;
-                    pData[6 * i + k].color.dcolor = (mag << 24) + (b << 16) + (g << 8) + r;
-                }
-            }
-
-            m_pStarMesh = gRenDev->CreateRenderMeshInitialized(pData, 6 * m_numStars, eVF_P3S_C4B_T2S, 0, 0, prtTriangleList, "Stars", "Stars");
-
-            delete [] pData;
-
-            // check if we read entire file
-            long curPos(file.FTell());
-            file.FSeek(0, SEEK_END);
-            long endPos(file.FTell());
-            if (curPos != endPos)
-            {
-                file.FClose();
-                return false;
-            }
-
-            file.FClose();
-            return true;
-        }
-    }
-    return false;
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREVolumeObject.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREVolumeObject.cpp
deleted file mode 100644
index 87127a4e11..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREVolumeObject.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "CREVolumeObject.h"
-#include <IEntityRenderState.h> // <> required for Interfuscator
-#include <AzCore/std/containers/vector.h>
-
-#if !defined(NULL_RENDERER)
-#include "../../XRenderD3D9/DriverD3D.h"
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-//
-
-class CVolumeTexture
-    : public IVolumeTexture
-{
-public:
-    void Release() override;
-    bool Create(unsigned int width, unsigned int height, unsigned int depth, unsigned char* pData) override;
-    bool Update(unsigned int width, unsigned int height, unsigned int depth, const unsigned char* pData) override;
-    int GetTexID() const override;
-    uint32 GetWidth() const override { return m_width; }
-    uint32 GetHeight() const override { return m_height; }
-    uint32 GetDepth() const override { return m_depth; }
-    CTexture* GetTexture() const override { return m_pTex; }
-    CVolumeTexture();
-    ~CVolumeTexture();
-
-private:
-    unsigned int m_width;
-    unsigned int m_height;
-    unsigned int m_depth;
-
-    static const size_t StagingBufferFrameCount = 2;
-    AZStd::vector<uint8_t> m_StagingData;
-    uint8_t m_FrameIndex;
-
-    inline uint8_t* GetCurrentStagingData()
-    {
-        const size_t sliceSize = m_StagingData.size() / StagingBufferFrameCount;
-        return &m_StagingData[m_FrameIndex * sliceSize];
-    }
-
-    CTexture* m_pTex;
-};
-
-
-CVolumeTexture::CVolumeTexture()
-    : m_width(0)
-    , m_height(0)
-    , m_depth(0)
-    , m_pTex(0)
-    , m_FrameIndex(0)
-{
-}
-
-
-CVolumeTexture::~CVolumeTexture()
-{
-    if (m_pTex)
-    {
-        gRenDev->RemoveTexture(m_pTex->GetTextureID());
-    }
-}
-
-
-void CVolumeTexture::Release()
-{
-    delete this;
-}
-
-
-bool CVolumeTexture::Create(unsigned int width, unsigned int height, unsigned int depth, unsigned char* pData)
-{
-    assert(!m_pTex);
-    if (!m_pTex)
-    {
-        char name[128];
-        name[sizeof(name) - 1] = '\0';
-        azsnprintf(name, sizeof(name) - 1, "$VolObj_%d", gRenDev->m_TexGenID++);
-
-        const uint32_t totalByteCount = width * height * depth;
-        m_StagingData.resize(totalByteCount * StagingBufferFrameCount);
-
-        if (pData)
-        {
-            uint8_t* currentStagingData = GetCurrentStagingData();
-            memcpy(currentStagingData, pData, totalByteCount);
-            pData = currentStagingData;
-        }
-
-        int flags(FT_DONT_STREAM);
-        m_pTex = CTexture::Create3DTexture(name, width, height, depth, 1, flags, pData, eTF_A8, eTF_A8);
-
-        m_width = width;
-        m_height = height;
-        m_depth = depth;
-    }
-    return m_pTex != 0;
-}
-
-
-bool CVolumeTexture::Update([[maybe_unused]] unsigned int width, [[maybe_unused]] unsigned int height, [[maybe_unused]] unsigned int depth, [[maybe_unused]] const unsigned char* pData)
-{
-    if (!CTexture::IsTextureExist(m_pTex))
-    {
-        return false;
-    }
-
-    m_FrameIndex ^= m_FrameIndex;
-    
-#if !defined(NULL_RENDERER)
-    uint8_t* stagingData = GetCurrentStagingData();
-    unsigned int cpyWidth = min(width, m_width);
-    unsigned int cpyHeight = min(height, m_height);
-    unsigned int cpyDepth = min(depth, m_depth);
-    memcpy(stagingData, pData, cpyWidth * cpyHeight * cpyDepth);
-
-    m_pTex->UpdateTextureRegion(stagingData, 0, 0, 0, cpyWidth, cpyHeight, cpyDepth, m_pTex->GetDstFormat());
-#endif
-
-    return true;
-}
-
-
-int CVolumeTexture::GetTexID() const
-{
-    return m_pTex ? m_pTex->GetTextureID() : 0;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-//
-
-CREVolumeObject::CREVolumeObject()
-    : CRendElementBase()
-    , m_center(0, 0, 0)
-    , m_matInv()
-    , m_eyePosInWS(0, 0, 0)
-    , m_eyePosInOS(0, 0, 0)
-    , m_volumeTraceStartPlane(Vec3(0, 0, 1), 0)
-    , m_renderBoundsOS(Vec3(-1, -1, -1), Vec3(1, 1, 1))
-    , m_viewerInsideVolume(false)
-    , m_nearPlaneIntersectsVolume(false)
-    , m_alpha(1)
-    , m_scale(1)
-    , m_pDensVol(0)
-    , m_pShadVol(0)
-    , m_pHullMesh(0)
-{
-    mfSetType(eDATA_VolumeObject);
-    mfUpdateFlags(FCEF_TRANSFORM);
-    m_matInv.SetIdentity();
-}
-
-
-CREVolumeObject::~CREVolumeObject()
-{
-}
-
-
-void CREVolumeObject::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-    gRenDev->m_RP.m_CurVFormat = eVF_P3F;
-}
-
-
-IVolumeTexture* CREVolumeObject::CreateVolumeTexture() const
-{
-    return new CVolumeTexture();
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREWaterOcean.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREWaterOcean.cpp
deleted file mode 100644
index f54e69f1ff..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREWaterOcean.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "CREWaterOcean.h"
-#include "I3DEngine.h"
-
-CREWaterOcean::CREWaterOcean()
-    : CRendElementBase()
-{
-    mfSetType(eDATA_WaterOcean);
-    mfUpdateFlags(FCEF_TRANSFORM);
-
-    m_nVerticesCount = 0;
-    m_nIndicesCount = 0;
-
-    m_pVertDecl = 0;
-    m_pVertices = 0;
-    m_pIndices = 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CREWaterOcean::~CREWaterOcean()
-{
-    ReleaseOcean();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CREWaterOcean::mfGetPlane([[maybe_unused]] Plane& pl)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CREWaterOcean::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-    gRenDev->m_RP.m_CurVFormat = eVF_P3F_C4B_T2F;
-    FrameUpdate();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-Vec3 CREWaterOcean ::GetPositionAt(float x, float y) const
-{
-    //assert( m_pWaterSim );
-    if (WaterSimMgr())
-    {
-        return WaterSimMgr()->GetPositionAt((int)x, (int)y);
-    }
-
-    return Vec3(0, 0, 0);
-}
-
-Vec4* CREWaterOcean::GetDisplaceGrid() const
-{
-    //assert( m_pWaterSim );
-    if (WaterSimMgr())
-    {
-        return WaterSimMgr()->GetDisplaceGrid();
-    }
-
-    return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CREWaterOcean::UpdateFFT()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CREWaterVolume.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CREWaterVolume.cpp
deleted file mode 100644
index 74b11e94fb..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CREWaterVolume.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "CREWaterVolume.h"
-
-
-CREWaterVolume::CREWaterVolume()
-    : CRendElementBase()
-    , m_pParams(0)
-    , m_pOceanParams(0)
-    , m_drawWaterSurface(false)
-    , m_drawFastPath(false)
-{
-    mfSetType(eDATA_WaterVolume);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-
-
-CREWaterVolume::~CREWaterVolume()
-{
-}
-
-
-void CREWaterVolume::mfGetPlane(Plane& pl)
-{
-    pl = m_pParams->m_fogPlane;
-    pl.d = -pl.d;
-}
-
-void CREWaterVolume::mfCenter(Vec3& vCenter, CRenderObject* pObj)
-{
-    vCenter = m_pParams->m_center;
-    if (pObj)
-    {
-        vCenter += pObj->GetTranslation();
-    }
-}
-
-void CREWaterVolume::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-    gRenDev->m_RP.m_CurVFormat = eVF_P3F_C4B_T2F;
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CameraOrbs.cpp b/Code/CryEngine/RenderDll/Common/RendElements/CameraOrbs.cpp
deleted file mode 100644
index ecfd8e1ca8..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CameraOrbs.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "MeshUtil.h"
-#include "CameraOrbs.h"
-#include "../Textures/Texture.h"
-#include "../Textures/TextureManager.h"
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-
-class ScreenTile
-    : public AbstractMeshElement
-{
-public:
-    ScreenTile()
-    {
-        ValidateMesh();
-    }
-    void GenMesh()
-    {
-        const int rowCount = 15;
-        const int colCount = 25;
-        MeshUtil::GenScreenTile(-1, -1, 1, 1, ColorF(1, 1, 1, 1), rowCount, colCount,  m_vertBuf, m_idxBuf);
-    }
-
-    void Draw()
-    {
-        ApplyMesh();
-        gcpRendD3D->FX_Commit();
-        DrawMeshTriList();
-    }
-};
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&CameraOrbs::FUNC_NAME)
-void  CameraOrbs::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-
-    FuncVariableGroup camGroup;
-    camGroup.SetName("CameraOrbs", "Camera Orbs");
-    camGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Illum range", "Illum range", this, MFPtr(SetIllumRange), MFPtr(GetIllumRange)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Orb Texture", "The texture for orbs", this, MFPtr(SetOrbTex), MFPtr(GetOrbTex)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Lens Texture", "The texture for lens", this, MFPtr(SetLensTex), MFPtr(GetLensTex)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable lens texture", "Enable lens texture", this, MFPtr(SetUseLensTex), MFPtr(GetUseLensTex)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable lens detail shading", "Enable lens detail shading", this, MFPtr(SetEnableLensDetailShading), MFPtr(GetEnableLensDetailShading)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Lens texture strength", "Lens texture strength", this, MFPtr(SetLensTexStrength), MFPtr(GetLensTexStrength)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Lens detail shading strength", "Lens detail shading strength", this, MFPtr(SetLensDetailShadingStrength), MFPtr(GetLensDetailShadingStrength)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Lens detail bumpiness", "Lens detail bumpiness", this, MFPtr(SetLensDetailBumpiness), MFPtr(GetLensDetailBumpiness)));
-    camGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable orb detail shading", "Enable orb detail shading", this, MFPtr(SetEnableOrbDetailShading), MFPtr(GetEnableOrbDetailShading)));
-    groups.push_back(camGroup);
-
-    FuncVariableGroup genGroup;
-    genGroup.SetName("Generator");
-    genGroup.AddVariable(new OpticsMFPVariable(e_INT, "Number of orbs", "Number of orbs", this, MFPtr(SetNumOrbs), MFPtr(GetNumOrbs), 0, 1000.0f));
-    genGroup.AddVariable(new OpticsMFPVariable(e_INT, "Noise seed", "Noise seed", this, MFPtr(SetNoiseSeed), MFPtr(GetNoiseSeed), -255.0f, 255.0f));
-    genGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Color variation", "Color variation", this, MFPtr(SetColorNoise), MFPtr(GetColorNoise)));
-    genGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Size variation", "Size variation", this, MFPtr(SetSizeNoise), MFPtr(GetSizeNoise)));
-    genGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Rotation variation", "Rotation variation", this, MFPtr(SetRotationNoise), MFPtr(GetRotationNoise)));
-    groups.push_back(genGroup);
-
-    FuncVariableGroup advShadingGroup;
-    advShadingGroup.SetName("AdvancedShading", "Advanced Shading");
-    advShadingGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable adv shading", "Enable advanced shading mode", this, MFPtr(SetEnableAdvancdShading), MFPtr(GetEnableAdvancedShading)));
-    advShadingGroup.AddVariable(new OpticsMFPVariable(e_COLOR, "Ambient Diffuse", "Ambient diffuse light (RGBK)", this, MFPtr(SetAmbientDiffuseRGBK), MFPtr(GetAmbientDiffuseRGBK)));
-    advShadingGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Absorptance", "Absorptance of on-lens dirt", this, MFPtr(SetAbsorptance), MFPtr(GetAbsorptance)));
-    advShadingGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Transparency", "Transparency of on-lens dirt", this, MFPtr(SetTransparency), MFPtr(GetTransparency)));
-    advShadingGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Scattering", "Subsurface Scattering of on-lens dirt", this, MFPtr(SetScatteringStrength), MFPtr(GetScatteringStrength)));
-    groups.push_back(advShadingGroup);
-}
-#undef MFPtr
-#endif
-
-void CameraOrbs::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pCameraOrbsNode = pNode->findChild("CameraOrbs");
-    if (pCameraOrbsNode)
-    {
-        float fIllumRadius(m_fIllumRadius);
-        if (pCameraOrbsNode->getAttr("Illumrange", fIllumRadius))
-        {
-            SetIllumRange(fIllumRadius);
-        }
-
-        const char* orbTextureName(NULL);
-        if (pCameraOrbsNode->getAttr("OrbTexture", &orbTextureName))
-        {
-            if (orbTextureName && orbTextureName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(orbTextureName);
-                SetOrbTex((CTexture*)pTexture);
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-
-        const char* lensTextureName(NULL);
-        if (pCameraOrbsNode->getAttr("LensTexture", &lensTextureName))
-        {
-            if (lensTextureName && lensTextureName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(lensTextureName);
-                SetLensTex((CTexture*)pTexture);
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-
-        bool bUseLensTex(m_bUseLensTex);
-        if (pCameraOrbsNode->getAttr("Enablelenstexture", bUseLensTex))
-        {
-            SetUseLensTex(bUseLensTex);
-        }
-
-        bool bLensDetailShading(m_bLensDetailShading);
-        if (pCameraOrbsNode->getAttr("Enablelensdetailshading", bLensDetailShading))
-        {
-            SetEnableLensDetailShading(bLensDetailShading);
-        }
-
-        float fLensTexStrength(m_fLensTexStrength);
-        if (pCameraOrbsNode->getAttr("Lenstexturestrength", fLensTexStrength))
-        {
-            SetLensTexStrength(fLensTexStrength);
-        }
-
-        float fLensDetailShadingStrength(m_fLensDetailShadingStrength);
-        if (pCameraOrbsNode->getAttr("Lensdetailshadingstrength", fLensDetailShadingStrength))
-        {
-            SetLensDetailShadingStrength(fLensDetailShadingStrength);
-        }
-
-        float fLensDetailBumpiness(m_fLensDetailBumpiness);
-        if (pCameraOrbsNode->getAttr("Lensdetailbumpiness", fLensDetailBumpiness))
-        {
-            SetLensDetailBumpiness(fLensDetailBumpiness);
-        }
-
-        bool bOrbDetailShading(m_bOrbDetailShading);
-        if (pCameraOrbsNode->getAttr("Enableorbdetailshading", bOrbDetailShading))
-        {
-            SetEnableOrbDetailShading(bOrbDetailShading);
-        }
-    }
-
-    XmlNodeRef pGeneratorNode = pNode->findChild("Generator");
-    if (pGeneratorNode)
-    {
-        int numOfOrbs(m_nNumOrbs);
-        if (pGeneratorNode->getAttr("Numberoforbs", numOfOrbs))
-        {
-            SetNumOrbs(numOfOrbs);
-        }
-
-        int nNoiseSeed(m_iNoiseSeed);
-        if (pGeneratorNode->getAttr("Noiseseed", nNoiseSeed))
-        {
-            SetNoiseSeed(nNoiseSeed);
-        }
-
-        float fColorNoise(m_fClrNoise);
-        if (pGeneratorNode->getAttr("Colorvariation", fColorNoise))
-        {
-            SetColorNoise(fColorNoise);
-        }
-
-        float fSizeNoise(m_fSizeNoise);
-        if (pGeneratorNode->getAttr("Sizevariation", fSizeNoise))
-        {
-            SetSizeNoise(fSizeNoise);
-        }
-
-        float fRotNoise(m_fRotNoise);
-        if (pGeneratorNode->getAttr("Rotationvariation", fRotNoise))
-        {
-            SetRotationNoise(fRotNoise);
-        }
-    }
-
-    XmlNodeRef pAdvancedShading = pNode->findChild("AdvancedShading");
-    if (pAdvancedShading)
-    {
-        bool bAdvancedShading(m_bAdvancedShading);
-        if (pAdvancedShading->getAttr("Enableadvshading", bAdvancedShading))
-        {
-            SetEnableAdvancdShading(bAdvancedShading);
-        }
-
-        Vec3 vColor(m_cAmbientDiffuse.r, m_cAmbientDiffuse.g, m_cAmbientDiffuse.b);
-        int nAlpha((int)(m_cAmbientDiffuse.a * 255.0f));
-        if (pAdvancedShading->getAttr("AmbientDiffuse", vColor) && pAdvancedShading->getAttr("AmbientDiffuse.alpha", nAlpha))
-        {
-            SetAmbientDiffuseRGBK(ColorF(vColor.x, vColor.y, vColor.z, (float)nAlpha / 255.0f));
-        }
-
-        float fAbsorptance(m_fAbsorptance);
-        if (pAdvancedShading->getAttr("Absorptance", fAbsorptance))
-        {
-            SetAbsorptance(fAbsorptance);
-        }
-
-        float fTransparency(m_fTransparency);
-        if (pAdvancedShading->getAttr("Transparency", fTransparency))
-        {
-            SetTransparency(fTransparency);
-        }
-
-        float fScatteringStrength(m_fScatteringStrength);
-        if (pAdvancedShading->getAttr("Scattering", fScatteringStrength))
-        {
-            SetScatteringStrength(fScatteringStrength);
-        }
-    }
-}
-
-void CameraOrbs::GenMesh()
-{
-    ScatterOrbs();
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-    MeshUtil::GenSprites(m_OrbsList, iWidth / (float)iHeight, true, m_vertBuf, m_idxBuf);
-    MeshUtil::TrianglizeQuadIndices(m_OrbsList.size(), m_idxBuf);
-}
-
-void CameraOrbs::ScatterOrbs()
-{
-    stable_rand::setSeed(m_iNoiseSeed);
-    for (uint32 i = 0; i < m_OrbsList.size(); i++)
-    {
-        SpritePoint& sprite = m_OrbsList[i];
-
-        Vec2& p = sprite.pos;
-        p.x = stable_rand::randUnit();
-        p.y = stable_rand::randUnit();
-
-        sprite.rotation = m_fRotation * stable_rand::randBias(GetRotationNoise()) * 2 * PI;
-        sprite.size = m_globalSize * stable_rand::randBias(GetSizeNoise());
-        sprite.brightness = m_globalFlareBrightness * stable_rand::randBias(GetBrightnessNoise());
-
-        ColorF& clr = sprite.color;
-        ColorF variation(stable_rand::randBias(m_fClrNoise), stable_rand::randBias(m_fClrNoise), stable_rand::randBias(m_fClrNoise));
-        clr = variation;
-
-        float clrMax = clr.Max();
-        clr /= clrMax;
-        clr.a = m_globalColor.a;
-    }
-}
-
-CTexture* CameraOrbs::GetOrbTex()
-{
-    if (!m_pOrbTex)
-    {
-        m_pOrbTex = CTexture::ForName("EngineAssets/Textures/flares/orb_01.tif",  FT_DONT_STREAM, eTF_Unknown);
-    }
-    return m_pOrbTex;
-}
-
-CTexture* CameraOrbs::GetLensTex()
-{
-    if (!m_pLensTex)
-    {
-        m_pLensTex = CTexture::ForName("EngineAssets/Textures/flares/lens_dirtyglass.tif", FT_DONT_STREAM, eTF_Unknown);
-    }
-
-    return m_pLensTex;
-}
-
-void CameraOrbs::ApplyOrbFlags([[maybe_unused]] CShader* shader, bool detailShading) const
-{
-    if (detailShading)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-}
-
-void CameraOrbs::ApplyLensDetailParams(CShader* shader, float texStength, float detailStrength, float bumpiness) const
-{
-    static CCryNameR lensDetailName("lensDetailParams");
-    const Vec4 lensDetailParam(texStength, detailStrength, bumpiness, 0);
-    shader->FXSetPSFloat(lensDetailName, &lensDetailParam, 1);
-}
-
-void CameraOrbs::ApplyAdvancedShadingFlag([[maybe_unused]] CShader* shader) const
-{
-    if (m_bAdvancedShading)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-}
-
-void CameraOrbs::ApplyAdvancedShadingParams(CShader* shader, const ColorF& ambDiffuseRGBK, float absorptance, float transparency, float scattering) const
-{
-    static CCryNameR ambDiffuseRGBKName("ambientDiffuseRGBK");
-    static CCryNameR advShadingName("advShadingParams");
-
-    static STexState pointTS(FILTER_POINT, true);
-    CTexture* pAmbTex = CTexture::s_ptexSceneTarget;
-    pAmbTex->Apply(1, CTexture::GetTexState(pointTS));
-
-    const Vec4 ambDiffuseRGBKParam(ambDiffuseRGBK.r, ambDiffuseRGBK.g, ambDiffuseRGBK.b, ambDiffuseRGBK.a);
-    const Vec4 advShadingParam(absorptance, transparency, scattering, 0);
-    shader->FXSetPSFloat(ambDiffuseRGBKName, &ambDiffuseRGBKParam, 1);
-    shader->FXSetPSFloat(advShadingName, &advShadingParam, 1);
-}
-
-void CameraOrbs::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux)
-{
-    static ScreenTile screenTile;
-
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("CameraOrbs");
-
-    gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-    static CCryNameTSCRC pCameraOrbsTechName("CameraOrbs");
-    static CCryNameR lightColorName("lightColorInfo");
-
-    static STexState bilinearTS(FILTER_LINEAR, true);
-    bilinearTS.SetBorderColor(0);
-    bilinearTS.SetClampMode(TADDR_BORDER, TADDR_BORDER, TADDR_BORDER);
-
-    vSrcProjPos = computeOrbitPos(vSrcProjPos, m_globalOrbitAngle);
-
-    shader->FXSetTechnique(pCameraOrbsTechName);
-
-    uint nPass;
-    shader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-
-    ApplyGeneralFlags(shader);
-    ApplyAdvancedShadingFlag(shader);
-    ApplyOcclusionBokehFlag(shader);
-    ApplyOrbFlags(shader, m_bOrbDetailShading);
-
-    shader->FXBeginPass(0);
-
-    const float x = computeMovementLocationX(vSrcProjPos);
-    const float y = computeMovementLocationY(vSrcProjPos);
-    ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-    ApplyVSParam_LightProjPos(shader, Vec3(x, y, aux.linearDepth));
-
-    const ColorF lightColor = m_globalFlareBrightness * m_globalColor * m_globalColor.a;
-    const Vec4 lightColorParam(lightColor.r, lightColor.g, lightColor.b, m_fIllumRadius);
-    shader->FXSetVSFloat(lightColorName, &lightColorParam, 1);
-
-    ApplyLensDetailParams(shader,  1, 1, GetLensDetailBumpiness());
-    if (m_globalOcclusionBokeh)
-    {
-        ApplyOcclusionPattern(shader);
-    }
-    else
-    {
-       CTextureManager::Instance()->GetBlackTexture()->Apply(5, CTexture::GetTexState(bilinearTS));
-    }
-
-    if (m_bAdvancedShading)
-    {
-        ApplyAdvancedShadingParams(shader, GetAmbientDiffuseRGBK(), GetAbsorptance(), GetTransparency(), GetScatteringStrength());
-    }
-
-    CTexture* pOrbTex = GetOrbTex() ? GetOrbTex() : CTextureManager::Instance()->GetBlackTexture();
-    pOrbTex->Apply(0, CTexture::GetTexState(bilinearTS));
-    ValidateMesh();
-    ApplyMesh();
-    DrawMeshTriList();
-    shader->FXEndPass();
-
-    if (m_bUseLensTex)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT = 0;
-        ApplyOrbFlags(shader, m_bLensDetailShading);
-        shader->FXBeginPass(1);
-        if (m_bAdvancedShading)
-        {
-            ApplyAdvancedShadingParams(shader, GetAmbientDiffuseRGBK(), GetAbsorptance(), GetTransparency(), GetScatteringStrength());
-        }
-        ApplyLensDetailParams(shader,  GetLensTexStrength(), GetLensDetailShadingStrength(), GetLensDetailBumpiness());
-        CTexture* pLensTex = GetLensTex() ? GetLensTex() : CTextureManager::Instance()->GetBlackTexture();
-        pLensTex->Apply(2, CTexture::GetTexState(bilinearTS));
-        screenTile.Draw();
-        shader->FXEndPass();
-    }
-
-    shader->FXEnd();
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/CameraOrbs.h b/Code/CryEngine/RenderDll/Common/RendElements/CameraOrbs.h
deleted file mode 100644
index ee3e1ed57f..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/CameraOrbs.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CAMERAORBS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CAMERAORBS_H
-#pragma once
-
-#include "OpticsElement.h"
-#include "AbstractMeshElement.h"
-
-class CTexture;
-class CameraOrbs
-    : public COpticsElement
-    , public AbstractMeshElement
-{
-private:
-    _smart_ptr<CTexture> m_pOrbTex;
-    _smart_ptr<CTexture> m_pLensTex;
-
-    bool m_bUseLensTex : 1;
-    bool m_bOrbDetailShading : 1;
-    bool m_bLensDetailShading : 1;
-
-    float m_fLensTexStrength;
-    float m_fLensDetailShadingStrength;
-    float m_fLensDetailBumpiness;
-
-    bool m_bAdvancedShading : 1;
-    ColorF m_cAmbientDiffuse;
-    float m_fAbsorptance;
-    float m_fTransparency;
-    float m_fScatteringStrength;
-
-    int m_nNumOrbs;
-    float m_fIllumRadius;
-    float m_fRotation;
-
-    unsigned int m_iNoiseSeed;
-    float m_fSizeNoise;
-    float m_fBrightnessNoise;
-    float m_fRotNoise;
-    float m_fClrNoise;
-
-    std::vector<SpritePoint> m_OrbsList;
-
-    static const int MAX_ORBS_NUMBER = 10000;
-
-protected:
-
-#if defined(FLARES_SUPPORT_EDITING)
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-    void GenMesh();
-    void DrawMesh(uint32 vOffset, uint32 iOffset);
-    void Invalidate()
-    {
-        m_meshDirty = true;
-    }
-
-public:
-
-    CameraOrbs (const char* name, const int numOrbs = 100)
-        : COpticsElement(name, 0.19f)
-        , m_fSizeNoise(0.8f)
-        , m_fBrightnessNoise(0.4f)
-        , m_fRotNoise(0.8f)
-        , m_fClrNoise(0.5f)
-        , m_fIllumRadius(1.f)
-        , m_bUseLensTex(0)
-        , m_bOrbDetailShading(0)
-        , m_bLensDetailShading(0)
-        , m_fLensTexStrength(1.f)
-        , m_fLensDetailShadingStrength(0.157f)
-        , m_fLensDetailBumpiness(0.073f)
-        , m_bAdvancedShading(false)
-        , m_cAmbientDiffuse(LensOpConst::_LO_DEF_CLR_BLK)
-        , m_fAbsorptance(4.0f)
-        , m_fTransparency(0.37f)
-        , m_fScatteringStrength(1.0f)
-        , m_iNoiseSeed(0)
-    {
-        m_Color.a = 1.f;
-        SetPerspectiveFactor(0.f);
-        SetRotation(0.7f);
-        SetNumOrbs(numOrbs);
-        m_meshDirty = true;
-    }
-
-protected:
-    void ApplyOrbFlags(CShader* shader, bool detailShading) const;
-    void ApplyLensDetailParams(CShader* shader, float texStength, float detailStrength, float bumpiness) const;
-    void ApplyAdvancedShadingFlag(CShader* shader) const;
-    void ApplyAdvancedShadingParams(CShader* shader, const ColorF& ambDiffuseRGBK, float absorptance, float transparency, float scattering) const;
-
-public:
-
-    void ScatterOrbs();
-
-    int GetNumOrbs() const { return m_OrbsList.size(); }
-    void SetNumOrbs(int n)
-    {
-        n = clamp_tpl<int>(n, 0, MAX_ORBS_NUMBER);
-        if (n != m_nNumOrbs)
-        {
-            m_nNumOrbs = n;
-            if (m_nNumOrbs > 0)
-            {
-                m_OrbsList.resize(m_nNumOrbs);
-            }
-            m_meshDirty = true;
-        }
-    }
-
-    EFlareType GetType() { return eFT_CameraOrbs; }
-    void PreRender([[maybe_unused]] CShader* shader, [[maybe_unused]] Vec3 vSrcWorldPos, [[maybe_unused]] Vec3 vSrcProjPos, [[maybe_unused]] SAuxParams& aux){}
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void PostRender([[maybe_unused]] CShader* shader, [[maybe_unused]] Vec3 vSrcWorldPos, [[maybe_unused]] Vec3 vSrcProjPos, [[maybe_unused]] SAuxParams& aux){}
-    void Load(IXmlNode* pNode);
-
-    CTexture* GetOrbTex();
-    CTexture* GetLensTex();
-    void SetOrbTex(CTexture* tex) { m_pOrbTex = tex; }
-    void SetLensTex(CTexture* tex) { m_pLensTex = tex; }
-    void SetUseLensTex(bool b) { m_bUseLensTex = b; }
-    bool GetUseLensTex() { return m_bUseLensTex; }
-    void SetEnableOrbDetailShading(bool b) { m_bOrbDetailShading = b; }
-    bool GetEnableOrbDetailShading() { return m_bOrbDetailShading; }
-    void SetEnableLensDetailShading(bool b) { m_bLensDetailShading = b; }
-    bool GetEnableLensDetailShading() { return m_bLensDetailShading; }
-
-    void SetSize(float s)
-    {
-        COpticsElement::SetSize(s);
-        m_meshDirty = true;
-    }
-
-    float GetLensTexStrength() const { return m_fLensTexStrength; }
-    void SetLensTexStrength(float strength) { m_fLensTexStrength = strength; }
-
-    float GetLensDetailShadingStrength() const { return m_fLensDetailShadingStrength; }
-    void SetLensDetailShadingStrength(float strength) { m_fLensDetailShadingStrength = strength; }
-
-    float GetLensDetailBumpiness() const { return m_fLensDetailBumpiness; }
-    void SetLensDetailBumpiness(float bumpiness) { m_fLensDetailBumpiness = bumpiness; }
-
-    float GetRotation() { return m_fRotation; }
-    void SetRotation(float rot)
-    {
-        m_fRotation = rot;
-        m_meshDirty = true;
-    }
-
-    int GetNoiseSeed() const { return m_iNoiseSeed; }
-    void SetNoiseSeed(int s)
-    {
-        m_iNoiseSeed = s;
-        m_meshDirty = true;
-    }
-
-    float GetSizeNoise() { return m_fSizeNoise; }
-    void SetSizeNoise(float s)
-    {
-        m_fSizeNoise = s;
-        m_meshDirty = true;
-    }
-
-    float GetBrightnessNoise() { return m_fBrightnessNoise; }
-    void SetBrightnessNoise(float b)
-    {
-        m_fBrightnessNoise = b;
-        m_meshDirty = true;
-    }
-
-    float GetRotationNoise() { return m_fRotNoise; }
-    void SetRotationNoise(float r)
-    {
-        m_fRotNoise = r;
-        m_meshDirty = true;
-    }
-
-    float GetColorNoise() { return m_fClrNoise; }
-    void SetColorNoise(float clrNoise)
-    {
-        m_fClrNoise = clrNoise;
-        m_meshDirty = true;
-    }
-
-    float GetIllumRange() { return m_fIllumRadius; }
-    void SetIllumRange(float range)
-    {
-        m_fIllumRadius = range;
-    }
-
-    bool GetEnableAdvancedShading() const { return m_bAdvancedShading; }
-    void SetEnableAdvancdShading(bool b) { m_bAdvancedShading = b; }
-
-    ColorF GetAmbientDiffuseRGBK() const { return m_cAmbientDiffuse; }
-    void SetAmbientDiffuseRGBK(ColorF amb) { m_cAmbientDiffuse = amb; }
-
-    float GetAbsorptance() const { return m_fAbsorptance; }
-    void SetAbsorptance(float a) { m_fAbsorptance = a; }
-
-    float GetTransparency() const { return m_fTransparency; }
-    void SetTransparency(float t)  { m_fTransparency = t; }
-
-    float GetScatteringStrength() const { return m_fScatteringStrength; }
-    void SetScatteringStrength(float s) { m_fScatteringStrength = s; }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this) + GetMeshDataSize());
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CAMERAORBS_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/ChromaticRing.cpp b/Code/CryEngine/RenderDll/Common/RendElements/ChromaticRing.cpp
deleted file mode 100644
index f31e82b8fd..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/ChromaticRing.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ChromaticRing.h"
-#include "../Textures/Texture.h"
-#include "../CryNameR.h"
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&ChromaticRing::FUNC_NAME)
-void  ChromaticRing::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-
-    FuncVariableGroup crGroup;
-    crGroup.SetName("ChromaticRing", "Chromatic Ring");
-    crGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Lock to light", "Lock to light", this, MFPtr(SetLockMovement), MFPtr(IsLockMovement)));
-    crGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Thickness", "Thickness", this, MFPtr(SetWidth), MFPtr(GetWidth)));
-
-    crGroup.AddVariable(new OpticsMFPVariable(e_INT, "Polygon complexity", "Polygon complexity", this, MFPtr(SetPolyComplexity), MFPtr(GetPolyComplexity), 0, 1024.0f));
-    crGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Gradient Texture", "Gradient Texture", this, MFPtr(SetSpectrumTex), MFPtr(GetSpectrumTex)));
-    crGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable Gradient Texture", "Enable Gradient Texture", this, MFPtr(SetUsingSpectrumTex), MFPtr(IsUsingSpectrumTex)));
-
-    crGroup.AddVariable(new OpticsMFPVariable(e_INT, "Noise seed", "Noise seed", this, MFPtr(SetNoiseSeed), MFPtr(GetNoiseSeed), -255.0f, 255.0f));
-    crGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Noise strength", "Noise strength", this, MFPtr(SetNoiseStrength), MFPtr(GetNoiseStrength)));
-    crGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Completion fading", "the fading ratio at the ends of this arc", this, MFPtr(SetCompletionFading), MFPtr(GetCompletionFading)));
-    crGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Completion span angle", "The span of this arc in degree", this, MFPtr(SetCompletionSpanAngle), MFPtr(GetCompletionSpanAngle)));
-    crGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Completion rotation", "The rotation of this arc", this, MFPtr(SetCompletionRotation), MFPtr(GetCompletionRotation)));
-
-    groups.push_back(crGroup);
-}
-#undef MFPtr
-#endif
-
-void ChromaticRing::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pCameraOrbsNode = pNode->findChild("ChromaticRing");
-    if (pCameraOrbsNode)
-    {
-        bool bLockMovement(m_bLockMovement);
-        if (pCameraOrbsNode->getAttr("Locktolight", bLockMovement))
-        {
-            SetLockMovement(bLockMovement);
-        }
-
-        float fWidth(m_fWidth);
-        if (pCameraOrbsNode->getAttr("Thickness", fWidth))
-        {
-            SetWidth(fWidth);
-        }
-
-        int nPolyComplexity(m_nPolyComplexity);
-        if (pCameraOrbsNode->getAttr("Polygoncomplexity", nPolyComplexity))
-        {
-            SetPolyComplexity(nPolyComplexity);
-        }
-
-        const char* gradientTexName = NULL;
-        if (pCameraOrbsNode->getAttr("GradientTexture", &gradientTexName))
-        {
-            if (gradientTexName && gradientTexName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(gradientTexName);
-                SetSpectrumTex((CTexture*)pTexture);
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-
-        bool bUseSpectrumTex(m_bUseSpectrumTex);
-        if (pCameraOrbsNode->getAttr("EnableGradientTexture", bUseSpectrumTex))
-        {
-            SetUsingSpectrumTex(bUseSpectrumTex);
-        }
-
-        int nNoiseSeed(m_nNoiseSeed);
-        if (pCameraOrbsNode->getAttr("Noiseseed", nNoiseSeed))
-        {
-            SetNoiseSeed(nNoiseSeed);
-        }
-
-        float fNoiseStrength(m_fNoiseStrength);
-        if (pCameraOrbsNode->getAttr("Noisestrength", fNoiseStrength))
-        {
-            SetNoiseStrength(fNoiseStrength);
-        }
-
-        float fCompletionFading(m_fCompletionFading);
-        if (pCameraOrbsNode->getAttr("Completionfading", fCompletionFading))
-        {
-            SetCompletionFading(fCompletionFading);
-        }
-
-        float fTotalAngle(0);
-        if (pCameraOrbsNode->getAttr("Completionspanangle", fTotalAngle))
-        {
-            SetCompletionSpanAngle(fTotalAngle);
-        }
-
-        float fCompletionRotation(0);
-        if (pCameraOrbsNode->getAttr("Completionrotation", fCompletionRotation))
-        {
-            SetCompletionRotation(fCompletionRotation);
-        }
-    }
-}
-
-void ChromaticRing::DrawMesh()
-{
-    gcpRendD3D->FX_Commit();
-    DrawMeshTriList();
-    DrawMeshWireframe();
-}
-
-float ChromaticRing::computeDynamicSize(const Vec3& vSrcProjPos, const float maxSize)
-{
-    Vec2 dir(vSrcProjPos.x - 0.5f, vSrcProjPos.y - 0.5f);
-    float len = dir.GetLength();
-    const float hoopDistFactor = 2.3f;
-    return len * hoopDistFactor * maxSize;
-}
-
-void ChromaticRing::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, [[maybe_unused]] SAuxParams& aux)
-{
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("ChromaticRing");
-
-    gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-    vSrcProjPos = computeOrbitPos(vSrcProjPos, m_globalOrbitAngle);
-
-    static CCryNameTSCRC pChromaticRingTechName("ChromaticRing");
-    shader->FXSetTechnique(pChromaticRingTechName);
-    uint nPass;
-    shader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-
-    ApplyGeneralFlags(shader);
-    ApplySpectrumTexFlag(shader, m_bUseSpectrumTex);
-    shader->FXBeginPass(0);
-
-    float newSize = computeDynamicSize(vSrcProjPos, m_globalSize);
-
-    float oldSize = m_globalSize;
-    m_globalSize = newSize;
-    ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-    m_globalSize = oldSize;
-    ApplyExternTintAndBrightnessVS(shader, m_globalColor, m_globalFlareBrightness);
-
-    static CCryNameR meshCenterName("meshCenterAndBrt");
-    float x, y;
-    if (m_bLockMovement)
-    {
-        x = vSrcProjPos.x;
-        y = vSrcProjPos.y;
-    }
-    else
-    {
-        x = computeMovementLocationX(vSrcProjPos);
-        y = computeMovementLocationY(vSrcProjPos);
-    }
-    const Vec4 meshCenterParam(x, y, vSrcProjPos.z, m_globalFlareBrightness);
-    shader->FXSetVSFloat(meshCenterName, &meshCenterParam, 1);
-
-    static STexState bilinearTS(FILTER_LINEAR, true);
-    bilinearTS.SetBorderColor(0);
-    bilinearTS.SetClampMode(TADDR_BORDER, TADDR_BORDER, TADDR_BORDER);
-    if (m_pSpectrumTex == NULL)
-    {
-        m_pSpectrumTex = CTexture::ForName("EngineAssets/Textures/flares/spectrum_full.tif",  FT_DONT_STREAM, eTF_Unknown);
-    }
-    m_pSpectrumTex->Apply(0, CTexture::GetTexState(bilinearTS));
-
-    ValidateMesh();
-    ApplyMesh();
-    DrawMesh();
-    shader->FXEndPass();
-
-    shader->FXEnd();
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/ChromaticRing.h b/Code/CryEngine/RenderDll/Common/RendElements/ChromaticRing.h
deleted file mode 100644
index 399927099e..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/ChromaticRing.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CHROMATICRING_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CHROMATICRING_H
-#pragma once
-
-#include "OpticsElement.h"
-#include "AbstractMeshElement.h"
-#include "MeshUtil.h"
-
-class CTexture;
-class ChromaticRing
-    : public COpticsElement
-    , public AbstractMeshElement
-{
-private:
-    bool m_bLockMovement : 1;
-
-    _smart_ptr<CTexture> m_pSpectrumTex;
-    bool m_bUseSpectrumTex : 1;
-
-    int m_nPolyComplexity;
-    int m_nColorComplexity;
-
-    float m_fWidth;
-    float m_fNoiseStrength;
-    int m_nNoiseSeed;
-
-    float m_fCompletionStart;
-    float m_fCompletionEnd;
-    float m_fCompletionFading;
-
-protected:
-
-#if defined(FLARES_SUPPORT_EDITING)
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-    void GenMesh()
-    {
-        ColorF c(1, 1, 1, 1);
-
-        int polyComplexity(m_nPolyComplexity);
-        if (CRenderer::CV_r_FlaresTessellationRatio < 1 && CRenderer::CV_r_FlaresTessellationRatio > 0)
-        {
-            polyComplexity = (int)((float)m_nPolyComplexity * CRenderer::CV_r_FlaresTessellationRatio);
-        }
-
-        MeshUtil::GenHoop(
-            m_fSize, polyComplexity, m_fWidth, 2, c,
-            m_fNoiseStrength * m_fSize, m_nNoiseSeed, m_fCompletionStart, m_fCompletionEnd, m_fCompletionFading,
-            m_vertBuf, m_idxBuf);
-    }
-    void DrawMesh();
-    void Invalidate()
-    {
-        m_meshDirty = true;
-    }
-    static float computeDynamicSize(const Vec3& vSrcProjPos, const float maxSize);
-
-public:
-
-    ChromaticRing(const char* name)
-        : COpticsElement(name)
-        , m_bUseSpectrumTex(false)
-        , m_fWidth(0.5f)
-        , m_nPolyComplexity(160)
-        , m_nColorComplexity(2)
-        , m_fNoiseStrength(0.0f)
-        , m_fCompletionStart(90.f)
-        , m_fCompletionEnd(270.f)
-        , m_fCompletionFading(45.f)
-    {
-        SetSize(0.9f);
-        SetAutoRotation(true);
-        SetAspectRatioCorrection(false);
-
-        m_meshDirty = true;
-    }
-
-    EFlareType GetType() { return eFT_ChromaticRing; }
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void Load(IXmlNode* pNode);
-
-    void SetSize(float s)
-    {
-        COpticsElement::SetSize(s);
-        m_meshDirty = true;
-    }
-
-    bool IsLockMovement() const { return m_bLockMovement; }
-    void SetLockMovement(bool b) { m_bLockMovement = b; }
-
-    int GetPolyComplexity() { return m_nPolyComplexity; }
-    void SetPolyComplexity(int polyCplx)
-    {
-        if (polyCplx <= 0)
-        {
-            polyCplx = 1;
-        }
-        else if (polyCplx > 1024)
-        {
-            polyCplx = 1024;
-        }
-        m_nPolyComplexity = polyCplx;
-        m_meshDirty = true;
-    }
-
-    int GetColorComplexity() { return m_nColorComplexity; }
-    void SetColorComplexity(int clrCplx)
-    {
-        if (clrCplx <= 0)
-        {
-            clrCplx = 1;
-        }
-        m_nColorComplexity = clrCplx;
-        m_meshDirty = true;
-    }
-
-    CTexture* GetSpectrumTex() { return m_pSpectrumTex; }
-    void SetSpectrumTex(CTexture* tex)
-    {
-        m_pSpectrumTex = tex;
-    }
-
-    bool IsUsingSpectrumTex() { return m_bUseSpectrumTex; }
-    void SetUsingSpectrumTex(bool b)
-    {
-        m_bUseSpectrumTex = b;
-    }
-
-    int GetNoiseSeed() { return m_nNoiseSeed; }
-    void SetNoiseSeed(int seed)
-    {
-        m_nNoiseSeed = seed;
-        m_meshDirty = true;
-    }
-
-    float GetWidth() { return m_fWidth; }
-    void SetWidth(float w)
-    {
-        m_fWidth = w;
-        m_meshDirty = true;
-    }
-
-    float GetNoiseStrength() { return m_fNoiseStrength; }
-    void SetNoiseStrength(float noise)
-    {
-        m_fNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    float GetCompletionFading() { return m_fCompletionFading; }
-    void SetCompletionFading(float f)
-    {
-        m_fCompletionFading = f;
-        m_meshDirty = true;
-    }
-
-    float GetCompletionSpanAngle() { return (m_fCompletionEnd - m_fCompletionStart); }
-    void SetCompletionSpanAngle(float totalAngle)
-    {
-        float rotAngle = GetCompletionRotation();
-        float halfTotalAngle = totalAngle / 2;
-        m_fCompletionStart = rotAngle - halfTotalAngle;
-        m_fCompletionEnd = rotAngle + halfTotalAngle;
-        m_meshDirty = true;
-    }
-
-    float GetCompletionRotation() { return (m_fCompletionStart + m_fCompletionEnd) * 0.5f; }
-    void SetCompletionRotation(float rot)
-    {
-        float oldRotAngle = GetCompletionRotation();
-        float rotDiff = rot - oldRotAngle;
-        m_fCompletionStart += rotDiff;
-        m_fCompletionEnd += rotDiff;
-        m_meshDirty = true;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this) + GetMeshDataSize());
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_CHROMATICRING_H
-
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/FlareSoftOcclusionQuery.cpp b/Code/CryEngine/RenderDll/Common/RendElements/FlareSoftOcclusionQuery.cpp
deleted file mode 100644
index b24bef854b..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/FlareSoftOcclusionQuery.cpp
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "FlareSoftOcclusionQuery.h"
-#include "../CryNameR.h"
-#include "../../XRenderD3D9/DriverD3D.h"
-#include "../Textures/Texture.h"
-#include "I3DEngine.h"
-
-unsigned char CFlareSoftOcclusionQuery::s_paletteRawCache[s_nIDMax * 4];
-char CFlareSoftOcclusionQuery::s_idHashTable[s_nIDMax];
-int CFlareSoftOcclusionQuery::s_idCount = 0;
-int CFlareSoftOcclusionQuery::s_ringReadIdx = 1;
-int CFlareSoftOcclusionQuery::s_ringWriteIdx = 0;
-int CFlareSoftOcclusionQuery::s_ringSize = MAX_OCCLUSION_READBACK_TEXTURES;
-
-static bool g_bCreatedGlobalResources = false;
-
-const float CFlareSoftOcclusionQuery::s_fSectorWidth = (float)s_nGatherEachSectorWidth / (float)s_nGatherTextureWidth;
-const float CFlareSoftOcclusionQuery::s_fSectorHeight = (float)s_nGatherEachSectorHeight / (float)s_nGatherTextureHeight;
-
-float CSoftOcclusionVisiblityFader::UpdateVisibility(const float newTargetVisibility, const float duration)
-{
-    m_TimeLine.duration = duration;
-
-    if (fabs(newTargetVisibility - m_fTargetVisibility) > 0.1f)
-    {
-        m_TimeLine.startValue = m_TimeLine.GetPrevYValue();
-        m_fTargetVisibility = newTargetVisibility;
-        m_TimeLine.rewind();
-    }
-    else if (newTargetVisibility < 0.05f)
-    {
-        m_fTargetVisibility = newTargetVisibility;
-        m_TimeLine.endValue = newTargetVisibility;
-    }
-    else
-    {
-        m_TimeLine.endValue = m_fTargetVisibility;
-    }
-
-    // Fade in fixed time (in ms), fade out user controlled
-    const float fadeInTime = m_TimeLine.duration * (1.0f / 0.15f);
-    const float fadeOutTime = 1e3f;
-    float dt = (newTargetVisibility > m_fVisibilityFactor) ? fadeInTime : fadeOutTime;
-
-    m_fVisibilityFactor = m_TimeLine.step(gEnv->pTimer->GetFrameTime() * dt); // interpolate
-
-    return m_fVisibilityFactor;
-}
-
-void ReportIDPoolOverflow(int idCount, int idMax)
-{
-    iLog->Log("Number of soft occlusion queries [%d] exceeds current allowed range %d", idCount, idMax);
-}
-
-int CFlareSoftOcclusionQuery::GenID()
-{
-    int hashCode = s_idCount % s_nIDMax;
-
-    while (hashCode < s_nIDMax && s_idHashTable[hashCode])
-    {
-        hashCode++;
-    }
-
-    if (hashCode >= s_nIDMax)
-    {
-        ReportIDPoolOverflow(s_idCount + 1, s_nIDMax);
-        hashCode = 0;
-    }
-
-    s_idHashTable[hashCode] = (char)1;
-    s_idCount++;
-
-    return hashCode;
-}
-
-void CFlareSoftOcclusionQuery::ReleaseID(int id)
-{
-    if (id < s_nIDMax)
-    {
-        s_idHashTable[id] = (char)0;
-    }
-}
-
-void CFlareSoftOcclusionQuery::InitGlobalResources()
-{
-    if (g_bCreatedGlobalResources)
-    {
-        return;
-    }
-
-    const uint32 numGPUs = (gRenDev->GetActiveGPUCount() <= MAX_OCCLUSION_READBACK_TEXTURES / 2) ? gRenDev->GetActiveGPUCount() : 1;
-    s_ringWriteIdx = 0;
-    s_ringReadIdx = numGPUs;
-    s_ringSize = MAX_OCCLUSION_READBACK_TEXTURES;
-
-    memset(s_idHashTable, 0, sizeof(s_idHashTable));
-    memset(s_paletteRawCache, 0, sizeof(s_paletteRawCache));
-
-    g_bCreatedGlobalResources = true;
-}
-
-void CFlareSoftOcclusionQuery::GetDomainInTexture(float& out_x0, float& out_y0, float& out_x1, float& out_y1)
-{
-    out_x0 = (m_nID % s_nIDColMax) * s_fSectorWidth;
-    out_y0 = (m_nID / s_nIDColMax) * s_fSectorHeight;
-    out_x1 = out_x0 + s_fSectorWidth;
-    out_y1 = out_y0 + s_fSectorHeight;
-}
-
-bool CFlareSoftOcclusionQuery::ComputeProjPos(const Vec3& vWorldPos, const Matrix44A& viewMat, const Matrix44A& projMat, Vec3& outProjPos)
-{
-    static int vp[] = {0, 0, 1, 1};
-    if (mathVec3Project(&outProjPos, &vWorldPos, vp, &projMat, &viewMat, &gRenDev->m_IdentityMatrix) == 0.0f)
-    {
-        return false;
-    }
-    return true;
-}
-
-void CFlareSoftOcclusionQuery::GetSectorSize(float& width, float& height)
-{
-    width = s_fSectorWidth;
-    height = s_fSectorWidth;
-}
-
-void CFlareSoftOcclusionQuery::GetOcclusionSectorInfo(SOcclusionSectorInfo& out_Info)
-{
-    Vec3 vProjectedPos;
-    if (ComputeProjPos(m_PosToBeChecked, gRenDev->m_ViewMatrix, gRenDev->m_ProjMatrix, vProjectedPos) == false)
-    {
-        return;
-    }
-    out_Info.lineardepth = clamp_tpl(ComputeLinearDepth(m_PosToBeChecked, gRenDev->m_CameraMatrix, gRenDev->GetViewParameters().fNear, gRenDev->GetViewParameters().fFar), -1.0f, 0.99f);
-
-    out_Info.u0 = vProjectedPos.x - m_fOccPlaneWidth / 2;
-    out_Info.v0 = vProjectedPos.y - m_fOccPlaneHeight / 2;
-    out_Info.u1 = vProjectedPos.x + m_fOccPlaneWidth / 2;
-    out_Info.v1 = vProjectedPos.y + m_fOccPlaneHeight / 2;
-
-    if (out_Info.u0 < 0)
-    {
-        out_Info.u0 = 0;
-    }
-    if (out_Info.v0 < 0)
-    {
-        out_Info.v0 = 0;
-    }
-    if (out_Info.u1 > 1)
-    {
-        out_Info.u1 = 1;
-    }
-    if (out_Info.v1 > 1)
-    {
-        out_Info.v1 = 1;
-    }
-
-    GetDomainInTexture(out_Info.x0, out_Info.y0, out_Info.x1, out_Info.y1);
-
-    out_Info.x0 = out_Info.x0 * 2.0f - 1;
-    out_Info.y0 = -(out_Info.y0 * 2.0f - 1.0f);
-    out_Info.x1 = out_Info.x1 * 2.0f - 1;
-    out_Info.y1 = -(out_Info.y1 * 2.0f - 1.0f);
-}
-
-float CFlareSoftOcclusionQuery::ComputeLinearDepth(const Vec3& worldPos, const Matrix44A& cameraMat, float nearDist, float farDist)
-{
-    Vec4 out, wPos4;
-    wPos4.x = worldPos.x;
-    wPos4.y = worldPos.y;
-    wPos4.z = worldPos.z;
-    wPos4.w = 1;
-    mathVec4Transform((f32*)&out, (f32*)(&cameraMat), (f32*)&wPos4);
-    if (out.w == 0.0f)
-    {
-        return 0;
-    }
-    const CameraViewParameters& rc = gRenDev->GetViewParameters();
-    float linearDepth = (-out.z - rc.fNear) / (farDist - nearDist);
-
-    return linearDepth;
-}
-
-void CFlareSoftOcclusionQuery::UpdateCachedResults()
-{
-    int cacheIdx = 4 * m_nID;
-    m_fOccResultCache = s_paletteRawCache[cacheIdx + 0] / 255.0f;
-    m_fDirResultCache = (s_paletteRawCache[cacheIdx + 3] / 255.0f) * 2.0f * PI;
-    sincos_tpl(m_fDirResultCache, &m_DirVecResultCache.y, &m_DirVecResultCache.x);
-}
-
-CTexture* CFlareSoftOcclusionQuery::GetGatherTexture() const
-{
-    return CTexture::s_ptexFlaresGather;
-}
-
-void CFlareSoftOcclusionQuery::BatchReadResults()
-{
-    if (!g_bCreatedGlobalResources)
-    {
-        return;
-    }
-    CTexture::s_ptexFlaresOcclusionRing[s_ringWriteIdx]->GetDevTexture()->AccessCurrStagingResource(0, false, [=](void* pData, uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-        {
-            unsigned char* pTexBuf = reinterpret_cast<unsigned char*>(pData);
-            int validLineStrideBytes = s_nIDColMax * 4;
-            for (int i = 0; i < s_nIDRowMax; i++)
-            {
-                memcpy(s_paletteRawCache + i * validLineStrideBytes, pTexBuf + i * rowPitch, validLineStrideBytes);
-            }
-
-            return true;
-        });
-}
-
-void CFlareSoftOcclusionQuery::ReadbackSoftOcclQuery()
-{
-    CTexture::s_ptexFlaresOcclusionRing[s_ringWriteIdx]->GetDevTexture()->DownloadToStagingResource(0);
-
-    // sync point. Move to next texture to read and write
-    s_ringReadIdx = (s_ringReadIdx + 1) % s_ringSize;
-    s_ringWriteIdx = (s_ringWriteIdx + 1) % s_ringSize;
-}
-
-CTexture* CFlareSoftOcclusionQuery::GetOcclusionTex()
-{
-    return CTexture::s_ptexFlaresOcclusionRing[s_ringWriteIdx];
-}
-
-void CSoftOcclusionManager::ComputeVisibility()
-{
-    static STexState ShadowTexState(FILTER_POINT, TADDR_BORDER, TADDR_BORDER, TADDR_BORDER, 0);
-    CShader* pShader = CShaderMan::s_ShaderSoftOcclusionQuery;
-
-    gcpRendD3D->FX_ClearTarget(CTexture::s_ptexFlaresGather, Clr_Transparent);
-    gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexFlaresGather, NULL);
-
-    pShader->FXBeginPass(0);
-
-    const uint32 vertexCount = GetSize() * 4;
-
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-    vb.Allocate(vertexCount);
-    SVF_P3F_C4B_T2F* pDeviceVBAddr = vb.Lock();
-
-    for (int i(0), iSoftOcclusionListSize(GetSize()); i < iSoftOcclusionListSize; ++i)
-    {
-        CFlareSoftOcclusionQuery* pSoftOcclusion = GetSoftOcclusionQuery(i);
-        if (pSoftOcclusion == NULL)
-        {
-            continue;
-        }
-        int offset = i * 4;
-
-        CFlareSoftOcclusionQuery::SOcclusionSectorInfo sInfo;
-        pSoftOcclusion->GetOcclusionSectorInfo(sInfo);
-
-        for (int k = 0; k < 4; ++k)
-        {
-            pDeviceVBAddr[offset + k].color.dcolor = 0xFFFFFFFF;
-        }
-
-        pDeviceVBAddr[offset + 0].st = Vec2(sInfo.u0 * gcpRendD3D->m_CurViewportScale.x, sInfo.v0 * gcpRendD3D->m_CurViewportScale.y);
-        pDeviceVBAddr[offset + 1].st = Vec2(sInfo.u1 * gcpRendD3D->m_CurViewportScale.x, sInfo.v0 * gcpRendD3D->m_CurViewportScale.y);
-        pDeviceVBAddr[offset + 2].st = Vec2(sInfo.u1 * gcpRendD3D->m_CurViewportScale.x, sInfo.v1 * gcpRendD3D->m_CurViewportScale.y);
-        pDeviceVBAddr[offset + 3].st = Vec2(sInfo.u0 * gcpRendD3D->m_CurViewportScale.x, sInfo.v1 * gcpRendD3D->m_CurViewportScale.y);
-
-        pDeviceVBAddr[offset + 0].xyz = Vec3(sInfo.x0, sInfo.y1, sInfo.lineardepth);
-        pDeviceVBAddr[offset + 1].xyz = Vec3(sInfo.x1, sInfo.y1, sInfo.lineardepth);
-        pDeviceVBAddr[offset + 2].xyz = Vec3(sInfo.x1, sInfo.y0, sInfo.lineardepth);
-        pDeviceVBAddr[offset + 3].xyz = Vec3(sInfo.x0, sInfo.y0, sInfo.lineardepth);
-    }
-
-    vb.Unlock();
-    vb.Bind(0);
-    vb.Release();
-
-    if (pDeviceVBAddr && m_bSuccessGenerateIB)
-    {
-        CTexture::s_ptexZTargetScaled->Apply(0, CTexture::GetTexState(ShadowTexState));
-
-        gcpRendD3D->FX_Commit();
-
-        if (SUCCEEDED(gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, vertexCount, 0, m_IndexBufferCount);
-        }
-    }
-    pShader->FXEndPass();
-    gcpRendD3D->FX_PopRenderTarget(0);
-}
-
-bool CSoftOcclusionManager::GenerateIndexBuffer()
-{
-    m_IndexBufferCount = GetSize() * 2 * 3;
-    if (m_IndexBufferCount <= 0)
-    {
-        return false;
-    }
-
-    TempDynIB16 ib(gcpRendD3D);
-    ib.Allocate(m_IndexBufferCount);
-    uint16* pDeviceIBAddr = ib.Lock();
-
-    for (int i(0), iSoftOcclusionListSize(GetSize()); i < iSoftOcclusionListSize; ++i)
-    {
-        CFlareSoftOcclusionQuery* pSoftOcclusion = GetSoftOcclusionQuery(i);
-        if (pSoftOcclusion == NULL)
-        {
-            continue;
-        }
-        int offset0 = i * 6;
-        int offset1 = i * 4;
-        pDeviceIBAddr[offset0 + 0] = offset1 + 0;
-        pDeviceIBAddr[offset0 + 1] = offset1 + 1;
-        pDeviceIBAddr[offset0 + 2] = offset1 + 2;
-        pDeviceIBAddr[offset0 + 3] = offset1 + 2;
-        pDeviceIBAddr[offset0 + 4] = offset1 + 3;
-        pDeviceIBAddr[offset0 + 5] = offset1 + 0;
-    }
-
-    ib.Unlock();
-    m_IndexBufferOffset = 0;
-    ib.Bind();
-    ib.Release();
-
-    return true;
-}
-
-void CSoftOcclusionManager::GatherOcclusions()
-{
-    CShader* pShader = CShaderMan::s_ShaderSoftOcclusionQuery;
-    static STexState GatherTexState(FILTER_POINT, true);
-
-    gcpRendD3D->FX_ClearTarget(CFlareSoftOcclusionQuery::GetOcclusionTex(), Clr_Transparent);
-    gcpRendD3D->FX_PushRenderTarget(0, CFlareSoftOcclusionQuery::GetOcclusionTex(), NULL);
-
-    pShader->FXBeginPass(1);
-    float x0 = 0, y0 = 0, x1 = 0, y1 = 0;
-
-    const uint32 vertexCount = GetSize() * 4;
-
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-    vb.Allocate(vertexCount);
-    SVF_P3F_C4B_T2F* pDeviceVBAddr = vb.Lock();
-
-    for (int i = 0, iSoftOcclusionListSize(GetSize()); i < iSoftOcclusionListSize; ++i)
-    {
-        CFlareSoftOcclusionQuery* pSoftOcclusion = GetSoftOcclusionQuery(i);
-        if (pSoftOcclusion == NULL)
-        {
-            continue;
-        }
-        int offset = i * 4;
-        pSoftOcclusion->GetDomainInTexture(x0, y0, x1, y1);
-        for (int k = 0; k < 4; ++k)
-        {
-            pDeviceVBAddr[offset + k].st = Vec2((x0 + x1) * 0.5f * gcpRendD3D->m_CurViewportScale.x, (y0 + y1) * 0.5f * gcpRendD3D->m_CurViewportScale.y);
-            pDeviceVBAddr[offset + k].color.dcolor = 0xFFFFFFFF;
-        }
-        x0 = x0 * 2.0f - 1.0f;
-        y0 = -(y0 * 2.0f - 1.0f);
-        x1 = x1 * 2.0f - 1.0f;
-        y1 = -(y1 * 2.0f - 1.0f);
-        pDeviceVBAddr[offset + 0].xyz = Vec3(x0, y1, 1);
-        pDeviceVBAddr[offset + 1].xyz = Vec3(x1, y1, 1);
-        pDeviceVBAddr[offset + 2].xyz = Vec3(x1, y0, 1);
-        pDeviceVBAddr[offset + 3].xyz = Vec3(x0, y0, 1);
-    }
-
-    vb.Unlock();
-    vb.Bind(0);
-    vb.Release();
-
-    if (pDeviceVBAddr && m_bSuccessGenerateIB)
-    {
-        static CCryNameR occlusionNormalizedSizeName("occlusionNormalizedSize");
-        const Vec4 occlusionSizeParam(CFlareSoftOcclusionQuery::s_fSectorWidth, CFlareSoftOcclusionQuery::s_fSectorHeight, 0, 0);
-        pShader->FXSetPSFloat(occlusionNormalizedSizeName, &occlusionSizeParam, 1);
-        CTexture::s_ptexFlaresGather->Apply(0, CTexture::GetTexState(GatherTexState));
-
-        gcpRendD3D->FX_Commit();
-
-        if (SUCCEEDED(gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, vertexCount, 0, m_IndexBufferCount);
-        }
-    }
-    pShader->FXEndPass();
-    gcpRendD3D->FX_PopRenderTarget(0);
-}
-
-CFlareSoftOcclusionQuery* CSoftOcclusionManager::GetSoftOcclusionQuery(int nIndex) const
-{
-    if (nIndex >= CFlareSoftOcclusionQuery::s_nIDMax)
-    {
-        return NULL;
-    }
-    return m_SoftOcclusionQueries[nIndex];
-}
-
-void CSoftOcclusionManager::AddSoftOcclusionQuery(CFlareSoftOcclusionQuery* pQuery, const Vec3& vPos)
-{
-    if (m_nPos < CFlareSoftOcclusionQuery::s_nIDMax)
-    {
-        pQuery->SetPosToBeChecked(vPos);
-        m_SoftOcclusionQueries[m_nPos++] = pQuery;
-    }
-}
-
-bool CSoftOcclusionManager::Begin()
-{
-    if (GetSize() > 0)
-    {
-        m_bSuccessGenerateIB = GenerateIndexBuffer();
-        return true;
-    }
-    return false;
-}
-
-void CSoftOcclusionManager::End()
-{
-    m_nPos = 0;
-}
-
-void CSoftOcclusionManager::ClearResources()
-{
-    for (int i = 0; i < CFlareSoftOcclusionQuery::s_nIDMax; ++i)
-    {
-        m_SoftOcclusionQueries[i] = NULL;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/FlareSoftOcclusionQuery.h b/Code/CryEngine/RenderDll/Common/RendElements/FlareSoftOcclusionQuery.h
deleted file mode 100644
index ccdd30e35c..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/FlareSoftOcclusionQuery.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_FLARESOFTOCCLUSIONQUERY_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_FLARESOFTOCCLUSIONQUERY_H
-#pragma once
-
-#include "IFlares.h"
-#include "Cry_Vector2.h"
-#include "Timeline.h"
-
-class CTexture;
-class CShader;
-class RootOpticsElement;
-
-class CSoftOcclusionVisiblityFader
-{
-public:
-    CSoftOcclusionVisiblityFader()
-        : m_fTargetVisibility(-1.0f)
-        , m_fVisibilityFactor(1.0f)
-    {
-    }
-
-    float   UpdateVisibility(const float newTargetVisibility, const float duration);
-
-    TimelineFloat   m_TimeLine;
-    float                   m_fTargetVisibility;
-    float                   m_fVisibilityFactor;
-};
-
-class CFlareSoftOcclusionQuery
-    : public ISoftOcclusionQuery
-{
-public:
-    static const int s_nIDColMax = 32;
-    static const int s_nIDRowMax = 32;
-    static const int s_nIDMax = s_nIDColMax * s_nIDRowMax;
-
-    static const int s_nGatherEachSectorWidth = 8;
-    static const int s_nGatherEachSectorHeight = 8;
-
-    static const int s_nGatherTextureWidth = s_nGatherEachSectorWidth * s_nIDColMax;
-    static const int s_nGatherTextureHeight = s_nGatherEachSectorHeight * s_nIDRowMax;
-
-    static const float s_fSectorWidth;
-    static const float s_fSectorHeight;
-
-private:
-    static int s_idCount;
-    static char s_idHashTable[s_nIDMax];
-    static unsigned char s_paletteRawCache[s_nIDMax * 4];
-
-    static int s_ringReadIdx;
-    static int s_ringWriteIdx;
-    static int s_ringSize;
-
-private:
-    static int GenID();
-    static void ReleaseID(int id);
-
-public:
-    CFlareSoftOcclusionQuery(const uint8 numFaders = 0)
-        : m_fOccPlaneWidth(0.02f)
-        , m_fOccPlaneHeight(0.02f)
-        , m_PosToBeChecked(0, 0, 0)
-        , m_fOccResultCache(1)
-        , m_numVisibilityFaders(numFaders)
-        , m_pVisbilityFaders(NULL)
-        , m_refCount(1)
-    {
-        InitGlobalResources();
-        m_nID = GenID();
-        if (m_numVisibilityFaders > 0)
-        {
-            m_pVisbilityFaders = new CSoftOcclusionVisiblityFader[m_numVisibilityFaders];
-        }
-    }
-
-    ~CFlareSoftOcclusionQuery()
-    {
-        CRY_ASSERT(m_refCount == 0);
-        ReleaseID(m_nID);
-        m_numVisibilityFaders = 0;
-        SAFE_DELETE_ARRAY(m_pVisbilityFaders);
-    }
-
-    // Manage multi-thread references
-    virtual void AddRef()
-    {
-        CryInterlockedIncrement(&m_refCount);
-    }
-
-    virtual void Release()
-    {
-        if (CryInterlockedDecrement(&m_refCount) <= 0)
-        {
-            delete this;
-        }
-    }
-
-    static void InitGlobalResources();
-    static void BatchReadResults();
-    static void ReadbackSoftOcclQuery();
-    static CTexture* GetOcclusionTex();
-
-    void GetDomainInTexture(float& out_x0, float& out_y0, float& out_x1, float& out_y1);
-    void GetSectorSize(float& width, float& height);
-
-    struct SOcclusionSectorInfo
-    {
-        float x0, y0, x1, y1;
-        float u0, v0, u1, v1;
-        float lineardepth;
-    };
-    void GetOcclusionSectorInfo(SOcclusionSectorInfo& out_occlusionSector);
-
-    void UpdateCachedResults();
-    int GetID()
-    {
-        return m_nID;
-    }
-    float GetVisibility() const
-    {
-        return m_fOccResultCache;
-    }
-    float GetOccResult()  const { return m_fOccResultCache; }
-    float GetDirResult()  const { return m_fDirResultCache; }
-    const Vec2& GetDirVecResult() const {return m_DirVecResultCache; }
-    bool IsVisible() const { return m_fOccResultCache > 0; }
-    void SetPosToBeChecked(const Vec3& vPos)
-    {
-        m_PosToBeChecked = vPos;
-    }
-
-    CSoftOcclusionVisiblityFader*   GetVisibilityFader(const uint8 index) const
-    {
-        return (m_pVisbilityFaders && index < m_numVisibilityFaders) ? &m_pVisbilityFaders[index] : NULL;
-    }
-
-    void SetOccPlaneSizeRatio(const Vec2& vRatio) { m_fOccPlaneWidth = vRatio.x; m_fOccPlaneHeight = vRatio.y; }
-    float GetOccPlaneWidth() const { return m_fOccPlaneWidth; }
-    float GetOccPlaneHeight() const { return m_fOccPlaneHeight; }
-
-    CTexture* GetGatherTexture() const;
-
-    static bool ComputeProjPos(const Vec3& vWorldPos, const Matrix44A& viewMat, const Matrix44A& projMat, Vec3& outProjPos);
-    static float ComputeLinearDepth(const Vec3& worldPos, const Matrix44A& cameraMat, float nearDist, float farDist);
-
-private:
-    uint8                                                   m_numVisibilityFaders;
-    CSoftOcclusionVisiblityFader*   m_pVisbilityFaders;
-
-    int m_nID;
-
-    float m_fOccResultCache;
-    float m_fDirResultCache;
-    Vec2 m_DirVecResultCache;
-
-    Vec3 m_PosToBeChecked;
-
-    float m_fOccPlaneWidth;
-    float m_fOccPlaneHeight;
-
-    volatile int m_refCount;
-};
-
-class CSoftOcclusionManager
-{
-public:
-
-    CSoftOcclusionManager()
-    {
-        m_nPos = 0;
-        m_IndexBufferOffset = 0;
-        m_IndexBufferCount = 0;
-        m_bSuccessGenerateIB = false;
-    }
-
-    void AddSoftOcclusionQuery(CFlareSoftOcclusionQuery* pQuery, const Vec3& vPos);
-
-    bool Begin();
-    void End();
-
-    int GetSize()
-    {
-        return m_nPos;
-    }
-
-    CFlareSoftOcclusionQuery* GetSoftOcclusionQuery(int nIndex) const;
-
-    void GatherOcclusions();
-    void ComputeVisibility();
-
-    void ClearResources();
-private:
-
-    bool GenerateIndexBuffer();
-
-    bool m_bSuccessGenerateIB;
-    uint32 m_IndexBufferOffset;
-    uint32 m_IndexBufferCount;
-
-    int m_nPos;
-    _smart_ptr<CFlareSoftOcclusionQuery> m_SoftOcclusionQueries[CFlareSoftOcclusionQuery::s_nIDMax];
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_FLARESOFTOCCLUSIONQUERY_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Ghost.cpp b/Code/CryEngine/RenderDll/Common/RendElements/Ghost.cpp
deleted file mode 100644
index cc4d25e31c..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Ghost.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "Ghost.h"
-#include "MeshUtil.h"
-#include "../Textures/TextureManager.h"
-
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&CLensGhost::FUNC_NAME)
-void CLensGhost::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-    FuncVariableGroup ghostGroup;
-    ghostGroup.SetName("LensGhost", "Lens Ghost");
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Texture", "The texture for lens ghosts", this, MFPtr(SetTexture), MFPtr(GetTexture)));
-    groups.push_back(ghostGroup);
-}
-#undef MFPtr
-#endif
-
-void CLensGhost::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pLensGhost = pNode->findChild("LensGhost");
-    if (pLensGhost)
-    {
-        const char* textureName(NULL);
-        if (pLensGhost->getAttr("Texture", &textureName))
-        {
-            if (textureName && textureName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(textureName);
-                SetTexture((CTexture*)pTexture);
-                //Release this reference because we're no longer going to reference the texture from this pointer
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-    }
-}
-
-CTexture* CLensGhost::GetTexture()
-{
-    if (!m_pTex)
-    {
-        m_pTex = CTexture::ForName("EngineAssets/Textures/flares/ghost_grey.tif",  FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown);
-    }
-    return m_pTex;
-}
-
-void CLensGhost::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, [[maybe_unused]] SAuxParams& aux)
-{
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("Ghost");
-
-    gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-    vSrcProjPos = computeOrbitPos(vSrcProjPos, m_globalOrbitAngle);
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    static CCryNameTSCRC pGhostTechName("Ghost");
-    static CCryNameR texSizeName("baseTexSize");
-    static CCryNameR tileInfoName("ghostTileInfo");
-
-    static STexState bilinearTS(FILTER_LINEAR, true);
-    bilinearTS.SetBorderColor(0);
-    bilinearTS.SetClampMode(TADDR_BORDER, TADDR_BORDER, TADDR_BORDER);
-
-    shader->FXSetTechnique(pGhostTechName);
-
-    uint nPass;
-    shader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-
-    ApplyGeneralFlags(shader);
-    ApplyOcclusionBokehFlag(shader);
-    shader->FXBeginPass(0);
-
-    CTexture* tex = GetTexture() ? GetTexture() : CTextureManager::Instance()->GetBlackTexture();
-    tex->Apply(0, CTexture::GetTexState(bilinearTS));
-
-    const Vec4 texSizeParam((float)tex->GetWidth(), (float)tex->GetHeight(), 0, 0);
-    shader->FXSetVSFloat(texSizeName, &texSizeParam, 1);
-
-    if (m_globalOcclusionBokeh)
-    {
-        ApplyOcclusionPattern(shader);
-    }
-    else
-    {
-        CTextureManager::Instance()->GetBlackTexture()->Apply(5, CTexture::GetTexState(bilinearTS));
-    }
-
-    shader->FXSetVSFloat(tileInfoName, &m_vTileDefinition, 1);
-    ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-
-    float x = computeMovementLocationX(vSrcProjPos);
-    float y = computeMovementLocationY(vSrcProjPos);
-
-    rd->DrawQuad(x, y, x, y, m_globalColor, m_globalFlareBrightness);
-    shader->FXEndPass();
-
-    shader->FXEnd();
-}
-
-
-const int CMultipleGhost::MAX_COUNT = 1000;
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&CMultipleGhost::FUNC_NAME)
-void  CMultipleGhost::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-    FuncVariableGroup ghostGroup;
-    ghostGroup.SetName("MultiGhost", "Multi Ghost");
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Texture", "The texture for lens ghosts", this, MFPtr(SetTexture), MFPtr(GetTexture)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_INT, "Count", "The number of ghosts", this, MFPtr(SetCount), MFPtr(GetCount), 0, static_cast<float>(MAX_COUNT)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_INT, "Random Seed", "The Seed of random generator", this, MFPtr(SetRandSeed), MFPtr(GetRandSeed), -255.0f, 255.0f));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "Scattering range", "The scattering range for sub ghosts", this, MFPtr(SetRange), MFPtr(GetRange)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "position factor", "multiplier of position", this, MFPtr(SetPositionFactor), MFPtr(GetPositionFactor)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "position offset", "offset of position", this, MFPtr(SetPositionOffset), MFPtr(GetPositionOffset)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "X-axis noise", "the noise of scattering on x-axis", this, MFPtr(SetXOffsetNoise), MFPtr(GetXOffsetNoise)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Y-axis noise", "the noise of scattering on y-axis", this, MFPtr(SetYOffsetNoise), MFPtr(GetYOffsetNoise)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Size Variation", "The strength for size variation", this, MFPtr(SetSizeNoise), MFPtr(GetSizeNoise)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Brightness Variation", "The strength for brightness variation", this, MFPtr(SetBrightnessNoise), MFPtr(GetBrightnessNoise)));
-    ghostGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Color Variation", "The strength for color variation", this, MFPtr(SetColorNoise), MFPtr(GetColorNoise)));
-    groups.push_back(ghostGroup);
-}
-#undef MFPtr
-#endif
-
-void CMultipleGhost::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pMultiGhostNode = pNode->findChild("MultiGhost");
-
-    if (pMultiGhostNode)
-    {
-        const char* textureName(NULL);
-        if (pMultiGhostNode->getAttr("Texture", &textureName))
-        {
-            if (textureName && textureName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(textureName);
-                SetTexture((CTexture*)pTexture);
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-
-        int nCount(0);
-        if (pMultiGhostNode->getAttr("Count", nCount))
-        {
-            SetCount(nCount);
-        }
-
-        int nRandSeed(0);
-        if (pMultiGhostNode->getAttr("RandomSeed", nRandSeed))
-        {
-            SetRandSeed(nRandSeed);
-        }
-
-        Vec2 vRange(m_vRange);
-        if (pMultiGhostNode->getAttr("Scatteringrange", vRange))
-        {
-            SetRange(vRange);
-        }
-
-        Vec2 vPositionFactor(m_vPositionFactor);
-        if (pMultiGhostNode->getAttr("positionfactor", vPositionFactor))
-        {
-            SetPositionFactor(vPositionFactor);
-        }
-
-        Vec2 vPositionOffset(m_vPositionOffset);
-        if (pMultiGhostNode->getAttr("positionoffset", vPositionOffset))
-        {
-            SetPositionOffset(vPositionOffset);
-        }
-
-        float xOffsetNoise(m_fXOffsetNoise);
-        if (pMultiGhostNode->getAttr("X-axisnoise", xOffsetNoise))
-        {
-            SetXOffsetNoise(xOffsetNoise);
-        }
-
-        float yOffsetNoise(m_fYOffsetNoise);
-        if (pMultiGhostNode->getAttr("Y-axisnoise", yOffsetNoise))
-        {
-            SetYOffsetNoise(yOffsetNoise);
-        }
-
-        float fSizeNoise(m_fSizeNoise);
-        if (pMultiGhostNode->getAttr("SizeVariation", fSizeNoise))
-        {
-            SetSizeNoise(fSizeNoise);
-        }
-
-        float fBrightnessNoise(m_fBrightnessNoise);
-        if (pMultiGhostNode->getAttr("BrightnessVariation", fBrightnessNoise))
-        {
-            SetBrightnessNoise(fBrightnessNoise);
-        }
-
-        float fColorNoise(m_fColorNoise);
-        if (pMultiGhostNode->getAttr("ColorVariation", fColorNoise))
-        {
-            SetColorNoise(fColorNoise);
-        }
-    }
-}
-
-void CMultipleGhost::SetCount(int count)
-{
-    if (count < 0)
-    {
-        return;
-    }
-    m_nCount = min(count, MAX_COUNT);
-    RemoveAll();
-    for (int i = 0; i < m_nCount; i++)
-    {
-        CLensGhost* ghost = new CLensGhost("SubGhost");
-        ghost->SetAutoRotation(true);
-        ghost->SetAspectRatioCorrection(true);
-        ghost->SetOccBokehEnabled(true);
-        ghost->SetSensorSizeFactor(1);
-        ghost->SetSensorBrightnessFactor(1);
-        Add(ghost);
-    }
-    m_bContentDirty = true;
-}
-
-void CMultipleGhost::GenGhosts(SAuxParams& aux)
-{
-    stable_rand::setSeed(GetRandSeed());
-
-    float rangeStart = m_vRange.x;
-    float rangeEnd = m_vRange.y;
-    float span = rangeEnd - rangeStart;
-    float halfXNoiseRange = span / 2 * m_fXOffsetNoise;
-    float halfYNoiseRange = span / 2 * m_fYOffsetNoise;
-    if ((uint)GetCount() != children.size())
-    {
-        SetCount(GetCount());
-    }
-    for (uint i = 0; i < children.size(); i++)
-    {
-        CLensGhost* ghost = (CLensGhost*)&*(children[i]);
-        ghost->SetTexture(GetTexture());
-        Vec2 pos;
-        float axisPos = stable_rand::randPositive() * span + rangeStart;
-        pos.x = stable_rand::randUnit() * halfXNoiseRange + axisPos * m_vPositionFactor.x + m_vPositionOffset.x;
-        pos.y = stable_rand::randUnit() * halfYNoiseRange + axisPos * m_vPositionFactor.y + m_vPositionOffset.y;
-        ghost->SetMovement(pos);
-        ghost->SetSize(stable_rand::randBias(GetSizeNoise()));
-        ghost->SetBrightness(stable_rand::randBias(GetBrightnessNoise()));
-        ColorF variation(stable_rand::randBias(GetColorNoise()), stable_rand::randBias(GetColorNoise()), stable_rand::randBias(GetColorNoise()));
-        ghost->SetColor(variation);
-
-        ghost->SetDynamicsEnabled(GetDynamicsEnabled());
-        ghost->SetDynamicsInvert(GetDynamicsInvert());
-        ghost->SetDynamicsOffset(GetDynamicsOffset());
-        ghost->SetDynamicsRange(GetDynamicsRange());
-    }
-    validateChildrenGlobalVars(aux);
-    m_bContentDirty = false;
-}
-
-void CMultipleGhost::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux)
-{
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("MultiGhost");
-
-    if (m_bContentDirty)
-    {
-        GenGhosts(aux);
-    }
-
-    COpticsGroup::Render(shader, vSrcWorldPos, vSrcProjPos, aux);
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Ghost.h b/Code/CryEngine/RenderDll/Common/RendElements/Ghost.h
deleted file mode 100644
index 2080ff87e7..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Ghost.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_GHOST_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_GHOST_H
-#pragma once
-
-#include "OpticsElement.h"
-#include "OpticsGroup.h"
-
-class CLensGhost
-    : public COpticsElement
-{
-    _smart_ptr<CTexture> m_pTex;
-    Vec4 m_vTileDefinition;
-
-protected:
-#if defined(FLARES_SUPPORT_EDITING)
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-
-public:
-
-    CLensGhost(const char* name, CTexture* externalTex = NULL)
-        : COpticsElement(name)
-        , m_pTex(externalTex)
-    {
-    }
-
-    virtual IOpticsElementBase* Clone()
-    {
-        return new CLensGhost(*this);
-    }
-
-    EFlareType GetType() { return eFT_Ghost; }
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void Load(IXmlNode* pNode);
-
-    CTexture* GetTexture();
-    void SetTexture(CTexture* tex) { m_pTex = tex; }
-
-    int GetTileIndex() { return (int)m_vTileDefinition.w; }
-    int GetTotalTileCount() { return (int)m_vTileDefinition.z; }
-    int GetTileCountX() { return (int)m_vTileDefinition.x; }
-    int GetTileCountY() { return (int)m_vTileDefinition.y; }
-
-    void SetTileIndex(int idx)
-    {
-        if (idx >= 0 && idx <= GetTotalTileCount())
-        {
-            m_vTileDefinition.w = (float)idx;
-        }
-    }
-
-    void SetTileCountX(int n)
-    {
-        int totalCount = GetTotalTileCount();
-        if (totalCount > n * GetTileCountY())
-        {
-            totalCount = n * GetTileCountY();
-        }
-
-        SetTileDefinition(n, GetTileCountY(), totalCount, GetTileIndex());
-    }
-
-    void SetTileCountY(int n)
-    {
-        int totalCount = GetTotalTileCount();
-        if (totalCount > GetTileCountX() * n)
-        {
-            totalCount = GetTileCountX() * n;
-        }
-
-        SetTileDefinition(GetTileCountX(), n, totalCount, GetTileIndex());
-    }
-
-    void SetTotalTileCount(int  t)
-    {
-        SetTileDefinition(GetTileCountX(), GetTileCountY(), t, GetTileIndex());
-    }
-
-    void SetTileDefinition(int countX, int countY, int totalCount, int index)
-    {
-        if (totalCount > countX * countY)
-        {
-            return;
-        }
-
-        m_vTileDefinition.x = (float)countX;
-        m_vTileDefinition.y = (float)countY;
-        m_vTileDefinition.z = (float)totalCount;
-        m_vTileDefinition.w = (float)index;
-    }
-
-    void SetTileDefinition(Vec4 df)
-    {
-        SetTileDefinition((int)df.x, (int)df.y, (int)df.z, (int)df.w);
-    }
-};
-
-class CMultipleGhost
-    : public COpticsGroup
-{
-protected:
-    _smart_ptr<CTexture> m_pTex;
-
-    Vec2 m_vRange;
-    float m_fXOffsetNoise;
-    float m_fYOffsetNoise;
-    Vec2 m_vPositionFactor;
-    Vec2 m_vPositionOffset;
-    int m_nCount;
-    int m_nRandSeed;
-
-    float m_fSizeNoise;
-    float m_fBrightnessNoise;
-    float m_fColorNoise;
-
-    bool m_bContentDirty  : 1;
-
-protected:
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-
-public:
-    CMultipleGhost(const char* name)
-        : COpticsGroup(name)
-        , m_nCount(0)
-        , m_nRandSeed(0)
-        , m_bContentDirty(true)
-        , m_fXOffsetNoise(0)
-        , m_fYOffsetNoise(0)
-        , m_fSizeNoise(0.4f)
-        , m_fColorNoise(0.3f)
-        , m_fBrightnessNoise(0.3f)
-    {
-        m_vRange.set(0.1f, 0.7f);
-        m_vPositionFactor.set(1, 1);
-        m_vPositionOffset.set(0, 0);
-        SetSize(0.04f);
-        SetBrightness(0.3f);
-        SetCount(20);
-    }
-
-public:
-    static const int MAX_COUNT;
-
-    void GenGhosts(SAuxParams& aux);
-
-    EFlareType GetType() { return eFT_MultiGhosts; }
-    bool IsGroup() const { return false; }
-    int GetElementCount() const { return 0; }
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void Load(IXmlNode* pNode);
-
-    CTexture* GetTexture() const { return m_pTex; }
-    void SetTexture(CTexture* tex)
-    {
-        m_pTex = tex;
-        m_bContentDirty = true;
-    }
-
-    float GetXOffsetNoise() const { return m_fXOffsetNoise; }
-    void SetXOffsetNoise(float x)
-    {
-        m_fXOffsetNoise = x;
-        m_bContentDirty = true;
-    }
-
-    float GetYOffsetNoise() const { return m_fYOffsetNoise; }
-    void SetYOffsetNoise(float y)
-    {
-        m_fYOffsetNoise = y;
-        m_bContentDirty = true;
-    }
-
-    Vec2 GetPositionFactor() const { return m_vPositionFactor; }
-    void SetPositionFactor(Vec2 positionFactor)
-    {
-        m_vPositionFactor = positionFactor;
-        m_bContentDirty = true;
-    }
-
-    Vec2 GetPositionOffset() const { return m_vPositionOffset; }
-    void SetPositionOffset(Vec2 offsets)
-    {
-        m_vPositionOffset = offsets;
-        m_bContentDirty = true;
-    }
-
-    Vec2 GetRange() const { return m_vRange; }
-    void SetRange(Vec2 range)
-    {
-        m_vRange = range;
-        m_bContentDirty = true;
-    }
-
-    int GetCount() const { return m_nCount; }
-    void SetCount(int count);
-
-    int GetRandSeed() const { return m_nRandSeed; }
-    void SetRandSeed(int n)
-    {
-        m_nRandSeed = n;
-        m_bContentDirty = true;
-    }
-
-    float GetSizeNoise() const { return m_fSizeNoise; }
-    void SetSizeNoise(float n)
-    {
-        m_fSizeNoise = n;
-        m_bContentDirty = true;
-    }
-
-    float GetBrightnessNoise() const { return m_fBrightnessNoise; }
-    void SetBrightnessNoise(float n)
-    {
-        m_fBrightnessNoise = n;
-        m_bContentDirty = true;
-    }
-
-    float GetColorNoise() const { return m_fColorNoise; }
-    void SetColorNoise(float n)
-    {
-        m_fColorNoise = n;
-        m_bContentDirty = true;
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_GHOST_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Glow.cpp b/Code/CryEngine/RenderDll/Common/RendElements/Glow.cpp
deleted file mode 100644
index f01bacbc7c..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Glow.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "Glow.h"
-#include "../Textures/Texture.h"
-#include "../CryNameR.h"
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&Glow::FUNC_NAME)
-void Glow::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-
-    FuncVariableGroup glowGroup;
-    glowGroup.SetName("Glow");
-    glowGroup.AddVariable(new OpticsMFPVariable(e_INT, "Polygon factor", "Polygons factor", this, MFPtr(SetPolygonFactor), MFPtr(GetPolygonFactor), 0, 128.0f));
-    glowGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Focus factor", "Focus factor", this, MFPtr(SetFocusFactor), MFPtr(GetFocusFactor)));
-    glowGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Gamma", "Gamma", this, MFPtr(SetGamma), MFPtr(GetGamma)));
-    groups.push_back(glowGroup);
-}
-#undef MFPtr
-#endif
-
-void Glow::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pGlowNode = pNode->findChild("Glow");
-    if (pGlowNode)
-    {
-        int nPolygonFactor(0);
-        if (pGlowNode->getAttr("Polygonfactor", nPolygonFactor))
-        {
-            SetPolygonFactor(nPolygonFactor);
-        }
-
-        float fFocusFactor(m_fFocusFactor);
-        if (pGlowNode->getAttr("Focusfactor", fFocusFactor))
-        {
-            SetFocusFactor(fFocusFactor);
-        }
-
-        float fGamma(m_fGamma);
-        if (pGlowNode->getAttr("Gamma", fGamma))
-        {
-            SetGamma(fGamma);
-        }
-    }
-}
-
-void Glow::GenMesh()
-{
-    float ringPos = 1;
-    MeshUtil::GenDisk(m_fSize, (int)m_fPolyonFactor, 1, true, m_globalColor, &ringPos, m_vertBuf, m_idxBuf);
-}
-
-void Glow::ApplyDistributionParamsPS(CShader* shader)
-{
-    static CCryNameR lumaParamsName("lumaParams");
-    Vec4 lumaParams(m_fFocusFactor, m_fGamma, 0, 0);
-    shader->FXSetPSFloat(lumaParamsName, &lumaParams, 1);
-}
-
-void Glow::DrawMesh()
-{
-    gcpRendD3D->FX_Commit();
-    DrawMeshTriList();
-}
-
-void Glow::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, [[maybe_unused]] SAuxParams& aux)
-{
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("Glow");
-
-    gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-    static CCryNameTSCRC pGlowTechName("Glow");
-    shader->FXSetTechnique(pGlowTechName);
-    uint nPass;
-
-    shader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-
-    ApplyGeneralFlags(shader);
-    shader->FXBeginPass(0);
-
-    ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-    ApplyExternTintAndBrightnessVS(shader, m_globalColor, m_globalFlareBrightness);
-
-    static CCryNameR meshCenterName("meshCenterAndBrt");
-    float x = computeMovementLocationX(vSrcProjPos);
-    float y = computeMovementLocationY(vSrcProjPos);
-    const Vec4 meshCenterParam(x, y, vSrcProjPos.z, 1);
-    shader->FXSetVSFloat(meshCenterName, &meshCenterParam, 1);
-
-    ApplyDistributionParamsPS(shader);
-
-    ValidateMesh();
-    ApplyMesh();
-    DrawMesh();
-
-    shader->FXEndPass();
-
-    shader->FXEnd();
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Glow.h b/Code/CryEngine/RenderDll/Common/RendElements/Glow.h
deleted file mode 100644
index aab57c5b06..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Glow.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_GLOW_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_GLOW_H
-#pragma once
-
-#include "OpticsElement.h"
-#include "AbstractMeshElement.h"
-#include "MeshUtil.h"
-
-class Glow
-    : public COpticsElement
-    , public AbstractMeshElement
-{
-private:
-    static float compositionBufRatio;
-
-protected:
-    float m_fFocusFactor;
-    float m_fPolyonFactor;
-    float m_fGamma;
-
-protected:
-    void ApplyDistributionParamsPS(CShader* shader);
-    virtual void GenMesh();
-    void DrawMesh();
-    void Invalidate()
-    {
-        m_meshDirty = true;
-    }
-
-public:
-    Glow(const char* name)
-        : COpticsElement(name)
-        , m_fFocusFactor(0.3f)
-        , m_fPolyonFactor(32.f)
-        , m_fGamma(1)
-    {
-        m_Color.a = 1.f; //Max alpha so that the ghost can be seen when it's created
-    }
-
-
-#if defined(FLARES_SUPPORT_EDITING)
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-
-    EFlareType GetType() { return eFT_Glow; }
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void Load(IXmlNode* pNode);
-
-    void SetColor(ColorF t)
-    {
-        COpticsElement::SetColor(t);
-        m_meshDirty = true;
-    }
-    float GetFocusFactor() const {return m_fFocusFactor; }
-    void SetFocusFactor(float f)
-    {
-        m_fFocusFactor = f;
-    }
-    int GetPolygonFactor() const { return (int)m_fPolyonFactor; }
-    void SetPolygonFactor(int f)
-    {
-        if (f < 0)
-        {
-            f = 0;
-        }
-        else if (f > 128)
-        {
-            f = 128;
-        }
-        if (m_fPolyonFactor != f)
-        {
-            m_fPolyonFactor = (float)f;
-            m_meshDirty = true;
-        }
-    }
-    float GetGamma() const { return m_fGamma; }
-    void SetGamma(float gamma)
-    {
-        m_fGamma = (float)gamma;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this) + GetMeshDataSize());
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_GLOW_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/ImageSpaceShafts.cpp b/Code/CryEngine/RenderDll/Common/RendElements/ImageSpaceShafts.cpp
deleted file mode 100644
index de35bf0c45..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/ImageSpaceShafts.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ImageSpaceShafts.h"
-#include "FlareSoftOcclusionQuery.h"
-#include "../CryNameR.h"
-#include "Common/Textures/TextureManager.h"
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-
-CTexture* ImageSpaceShafts::m_pOccBuffer = NULL;
-CTexture* ImageSpaceShafts::m_pDraftBuffer = NULL;
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&ImageSpaceShafts::FUNC_NAME)
-void ImageSpaceShafts::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-    FuncVariableGroup isShaftsGroup;
-    isShaftsGroup.SetName("ImageSpaceShafts", "Image Space Shafts");
-    isShaftsGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "High Quality", "Enable High quality mode", this, MFPtr(SetHighQualityMode), MFPtr(IsHighQualityMode)));
-    isShaftsGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Gobo Tex", "Gobo texture", this, MFPtr(SetGoboTex), MFPtr(GetGoboTex)));
-    groups.push_back(isShaftsGroup);
-}
-#undef MFPtr
-#endif
-
-void ImageSpaceShafts::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pImageSpaceNode = pNode->findChild("ImageSpaceShafts");
-    if (pImageSpaceNode)
-    {
-        bool bHighQualityMode(m_bHighQualityMode);
-        if (pImageSpaceNode->getAttr("HighQuality", bHighQualityMode))
-        {
-            SetHighQualityMode(bHighQualityMode);
-        }
-        else
-        {
-            assert(0);
-        }
-
-        const char* pGoboTexName = NULL;
-        if (pImageSpaceNode->getAttr("GoboTex", &pGoboTexName))
-        {
-            if (pGoboTexName && pGoboTexName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(pGoboTexName);
-                SetGoboTex((CTexture*)pTexture);
-                //Release this reference because we're no longer going to reference the texture from this pointer
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-CTexture* ImageSpaceShafts::GetGoboTex() 
-{
-    if (!m_pGoboTex)
-    {
-        m_pGoboTex = CTexture::ForName("EngineAssets/Textures/flares/iris_shaft.tif", FT_DONT_STREAM, eTF_Unknown);
-    }
-    return m_pGoboTex;
-}
-
-void ImageSpaceShafts::InitTextures()
-{
-    float occBufRatio, occDraftRatio, occFinalRatio;
-    if (m_bHighQualityMode && CRenderer::CV_r_flareHqShafts)
-    {
-        occBufRatio = 0.5f;
-        occDraftRatio = 0.5f;
-        occFinalRatio = 0.5f;
-    }
-    else
-    {
-        occBufRatio = 0.25f;
-        occDraftRatio = 0.4f;
-        occFinalRatio = 0.45f;
-    }
-
-    int w = gcpRendD3D->GetWidth();
-    int h = gcpRendD3D->GetHeight();
-    int flag = FT_DONT_RELEASE | FT_DONT_STREAM;
-    m_pOccBuffer = CTexture::CreateRenderTarget("$ImageSpaceShaftsOccBuffer", (int)(w * occBufRatio), (int)(h * occBufRatio), Clr_Empty, eTT_2D, flag, eTF_R8G8B8A8);
-
-    ETEX_Format draftTexFormat(eTF_R16G16B16A16);
-
-    m_pDraftBuffer = CTexture::CreateRenderTarget("$ImageSpaceShaftsDraftBuffer", (int)(w * occDraftRatio), (int)(h * occDraftRatio), Clr_Empty, eTT_2D, flag, draftTexFormat);
-
-    m_bTexDirty = false;
-}
-
-static STexState s_isPointTS(FILTER_POINT, true);
-static STexState s_isBilinearTS(FILTER_BILINEAR, true);
-
-void ImageSpaceShafts::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux)
-{
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    if (!m_pOccBuffer || m_bTexDirty)
-    {
-        InitTextures();
-    }
-
-    PROFILE_LABEL_SCOPE("ImagesSpaceShafts");
-
-    vSrcProjPos = computeOrbitPos(vSrcProjPos, m_globalOrbitAngle);
-
-    static CCryNameTSCRC pImageSpaceShaftsTechName("ImageSpaceShafts");
-    shader->FXSetTechnique(pImageSpaceShaftsTechName);
-    uint nPass;
-    shader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-    static CCryNameR texSizeName("baseTexSize");
-
-    Vec4 texSizeParam(1, 1, 0, 0);
-
-    {
-        PROFILE_LABEL_SCOPE("ImagesSpaceShafts-Occ");
-
-        gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-        rd->FX_ClearTarget(m_pOccBuffer, Clr_Empty);
-        rd->FX_PushRenderTarget(0, m_pOccBuffer, NULL, -1, false);
-
-        ApplyGeneralFlags(shader);
-        shader->FXBeginPass(0);
-
-        CTexture* pGoboTex = ((CTexture*)m_pGoboTex) ? ((CTexture*)m_pGoboTex) : CTextureManager::Instance()->GetBlackTexture();
-        pGoboTex->Apply(0, CTexture::GetTexState(s_isBilinearTS));
-        CTexture::s_ptexZTargetScaled->Apply(1, CTexture::GetTexState(s_isBilinearTS));
-
-        ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-        shader->FXSetVSFloat(texSizeName, &texSizeParam, 1);
-
-        rd->DrawQuad(vSrcProjPos.x, vSrcProjPos.y, vSrcProjPos.x, vSrcProjPos.y, m_globalColor, aux.linearDepth);
-        shader->FXEndPass();
-
-        rd->FX_PopRenderTarget(0);
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("ImagesSpaceShafts-Gen");
-
-        gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-        rd->FX_ClearTarget(m_pDraftBuffer, Clr_Empty);
-        rd->FX_PushRenderTarget(0, m_pDraftBuffer, NULL, -1, false);
-
-        ApplyGeneralFlags(shader);
-        shader->FXBeginPass(1);
-
-        ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-        shader->FXSetVSFloat(texSizeName, &texSizeParam, 1);
-        m_pOccBuffer->Apply(1,  CTexture::GetTexState(s_isBilinearTS));
-
-        rd->DrawQuad(vSrcProjPos.x, vSrcProjPos.y, vSrcProjPos.x, vSrcProjPos.y, m_globalColor, m_globalShaftBrightness);
-        shader->FXEndPass();
-
-        rd->FX_PopRenderTarget(0);
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("ImagesSpaceShafts-BLEND");
-
-        gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-        m_pDraftBuffer->Apply(1,  CTexture::GetTexState(s_isBilinearTS));
-
-        shader->FXBeginPass(2);
-        rd->DrawQuad(0, 0, 0, 0, m_globalColor, m_globalShaftBrightness);
-        shader->FXEndPass();
-    }
-
-    shader->FXEnd();
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/ImageSpaceShafts.h b/Code/CryEngine/RenderDll/Common/RendElements/ImageSpaceShafts.h
deleted file mode 100644
index 247322d8a8..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/ImageSpaceShafts.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_IMAGESPACESHAFTS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_IMAGESPACESHAFTS_H
-#pragma once
-
-#include "OpticsElement.h"
-
-class CTexture;
-class CD3D9Renderer;
-
-class ImageSpaceShafts
-    : public COpticsElement
-{
-protected:
-    static CTexture* m_pOccBuffer;
-    static CTexture* m_pDraftBuffer;
-
-protected:
-    bool m_bHighQualityMode;
-    bool m_bTexDirty;
-    _smart_ptr<CTexture> m_pGoboTex;
-
-    virtual void InitTextures();
-
-public:
-
-    ImageSpaceShafts(const char* name)
-        : COpticsElement(name)
-        , m_bTexDirty(true)
-        , m_bHighQualityMode(false)
-    {
-        m_Color.a = 1.f;
-        SetSize(0.7f);
-    }
-
-    EFlareType GetType() { return eFT_ImageSpaceShafts; }
-
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void Load(IXmlNode* pNode);
-
-    bool IsHighQualityMode() const { return m_bHighQualityMode; }
-    void SetHighQualityMode(bool b) { m_bHighQualityMode = b; m_bTexDirty = true; }
-
-    CTexture* GetGoboTex();
-    void SetGoboTex(CTexture* tex) { m_pGoboTex = tex; }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_IMAGESPACESHAFTS_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Interpolator.h b/Code/CryEngine/RenderDll/Common/RendElements/Interpolator.h
deleted file mode 100644
index c2fa0f844f..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Interpolator.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-// Interpolator deals with animations' interpolation.
-// These are bare bones interpolators: they take 3 key values as inputs.
-// The first two specify the two end points(start and end), and the last one specify the interpolation tweenness (x-value).
-// The output is the y-value.
-// For additional time-based playback type animation, see Timeline.
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_INTERPOLATOR_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_INTERPOLATOR_H
-#pragma once
-
-template<class T>
-class Interpolator
-{
-protected:
-    virtual T mix(T v0, T v1, float mixRatio)
-    {
-        return (T)(v0 * (1 - mixRatio) + v1 * mixRatio);
-    }
-public:
-    virtual ~Interpolator(){}
-    virtual T compute(T start, T end, float xValue) = 0;
-};
-
-template<class T>
-class LinearInterp
-    : public Interpolator<T>
-{
-public:
-    virtual T compute(T start, T end, float xValue)
-    {
-        return Interpolator<T>::mix(start, end, xValue);
-    }
-};
-
-template<class T>
-class CubicInterp
-    : public Interpolator<T>
-{
-public:
-    virtual T compute(T start, T end, float xValue)
-    {
-        float x = xValue * xValue * (3 - 2 * xValue);
-        return Interpolator<T>::mix(start, end, x);
-    }
-};
-
-namespace InterpPredef
-{
-    static LinearInterp<float> Linear_FLOAT;
-    static LinearInterp<int> Linear_INT;
-
-    static CubicInterp<float> CUBIC_FLOAT;
-    static CubicInterp<int> CUBIC_INT;
-}
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_INTERPOLATOR_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/IrisShafts.cpp b/Code/CryEngine/RenderDll/Common/RendElements/IrisShafts.cpp
deleted file mode 100644
index 3c7f10b9b4..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/IrisShafts.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "IrisShafts.h"
-#include "RootOpticsElement.h"
-#include "FlareSoftOcclusionQuery.h"
-#include "../CryNameR.h"
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-#include "../Common/Textures/TextureManager.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&IrisShafts::FUNC_NAME)
-void IrisShafts::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-    FuncVariableGroup irisGroup;
-    irisGroup.SetName("IrisShafts", "Iris Shafts");
-    irisGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable gradient tex", "Enable gradient texture", this, MFPtr(SetEnableSpectrumTex), MFPtr(GetEnableSpectrumTex)));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Base Tex", "Basic Texture", this, MFPtr(SetBaseTex), MFPtr(GetBaseTex)));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Gradient Tex", "Gradient Texture", this, MFPtr(SetSpectrumTex), MFPtr(GetSpectrumTex)));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_INT, "Noise seed", "Noise seed", this, MFPtr(SetNoiseSeed), MFPtr(GetNoiseSeed), -255.0f, 255.0f));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_INT, "Complexity", "Complexity of shafts", this, MFPtr(SetComplexity), MFPtr(GetComplexity), 0, 1000.0f));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_INT, "Smoothness", "The level of smoothness", this, MFPtr(SetSmoothLevel), MFPtr(GetSmoothLevel), 0, 255.0f));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Thickness", "Thickness of the shafts", this, MFPtr(SetThickness), MFPtr(GetThickness), 0, 255.0f));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Thickness noise", "Noise strength of thickness variation", this, MFPtr(SetThicknessNoise), MFPtr(GetThicknessNoise)));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Spread", "Spread of the shafts", this, MFPtr(SetSpread), MFPtr(GetSpread)));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Spread noise", "Noise strength of spread variation", this, MFPtr(SetSpreadNoise), MFPtr(GetSpreadNoise)));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Size noise", "Noise strength of shafts' sizes", this, MFPtr(SetSizeNoise), MFPtr(GetSizeNoise)));
-    irisGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Spacing noise", "Noise strength of shafts' spacing", this, MFPtr(SetSpacingNoise), MFPtr(GetSpacingNoise)));
-    groups.push_back(irisGroup);
-}
-#undef MFPtr
-#endif
-
-void IrisShafts::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pIrisShaftsNode = pNode->findChild("IrisShafts");
-
-    if (pIrisShaftsNode)
-    {
-        bool bUseSpectrumTex(m_bUseSpectrumTex);
-        if (pIrisShaftsNode->getAttr("Enablegradienttex", bUseSpectrumTex))
-        {
-            SetEnableSpectrumTex(bUseSpectrumTex);
-        }
-
-        const char* baseTextureName = NULL;
-        if (pIrisShaftsNode->getAttr("BaseTex", &baseTextureName))
-        {
-            if (baseTextureName && baseTextureName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(baseTextureName);
-                SetBaseTex((CTexture*)pTexture);
-                //Release this reference because we're no longer going to reference the texture from this pointer
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-
-        const char* gradientTexName = NULL;
-        if (pIrisShaftsNode->getAttr("GradientTex", &gradientTexName))
-        {
-            if (gradientTexName && gradientTexName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(gradientTexName);
-                SetSpectrumTex((CTexture*)pTexture);
-                //Release this reference because we're no longer going to reference the texture from this pointer
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-
-        int nNoiseSeed(m_nNoiseSeed);
-        if (pIrisShaftsNode->getAttr("Noiseseed", nNoiseSeed))
-        {
-            SetNoiseSeed(nNoiseSeed);
-        }
-
-        int nComplexity(m_nComplexity);
-        if (pIrisShaftsNode->getAttr("Complexity", nComplexity))
-        {
-            SetComplexity(nComplexity);
-        }
-
-        int nSmoothLevel(m_nSmoothLevel);
-        if (pIrisShaftsNode->getAttr("Smoothness", nSmoothLevel))
-        {
-            SetSmoothLevel(nSmoothLevel);
-        }
-
-        float fThickness(m_fThickness);
-        if (pIrisShaftsNode->getAttr("Thickness", fThickness))
-        {
-            SetThickness(fThickness);
-        }
-
-        float fThicknessNoise(m_fThicknessNoiseStrength);
-        if (pIrisShaftsNode->getAttr("Thicknessnoise", fThicknessNoise))
-        {
-            SetThicknessNoise(fThicknessNoise);
-        }
-
-        float fSpread(m_fSpread);
-        if (pIrisShaftsNode->getAttr("Spread", fSpread))
-        {
-            SetSpread(fSpread);
-        }
-
-        float fThicknessNoiseStrength(m_fThicknessNoiseStrength);
-        if (pIrisShaftsNode->getAttr("Spreadnoise", fThicknessNoiseStrength))
-        {
-            SetSpreadNoise(fThicknessNoiseStrength);
-        }
-
-        float fSizeNoiseStrength(m_fSizeNoiseStrength);
-        if (pIrisShaftsNode->getAttr("Sizenoise", fSizeNoiseStrength))
-        {
-            SetSizeNoise(fSizeNoiseStrength);
-        }
-
-        float fSpacingNoiseStrength(m_fSpacingNoiseStrength);
-        if (pIrisShaftsNode->getAttr("Spacingnoise", fSpacingNoiseStrength))
-        {
-            SetSpacingNoise(fSpacingNoiseStrength);
-        }
-    }
-}
-
-float IrisShafts::ComputeSpreadParameters(const float spread)
-{
-    return spread * 75;
-}
-
-int IrisShafts::ComputeDynamicSmoothLevel(int maxLevel, float spanAngle, float threshold)
-{
-    return min(maxLevel, (int)(spanAngle / threshold));
-}
-
-void IrisShafts::GenMesh()
-{
-    stable_rand::setSeed((int)(m_nNoiseSeed * m_fConcentrationBoost));
-
-    float dirDelta = 1.0f / (float)m_nComplexity;
-    float halfAngleRange = m_fAngleRange / 2;
-    ColorF color(1, 1, 1, 1);
-
-    m_vertBuf.clear();
-    m_idxBuf.clear();
-
-    std::vector<int> randomTable;
-    randomTable.resize(m_nComplexity);
-    for (int i = 0; i < m_nComplexity; ++i)
-    {
-        randomTable[i] = i;
-    }
-    for (int i = 0; i < m_nComplexity; ++i)
-    {
-        std::swap(randomTable[(int)(stable_rand::randPositive() * m_nComplexity)], randomTable[(int)(stable_rand::randPositive() * m_nComplexity)]);
-    }
-
-    for (int i = 0; i < m_nComplexity; i++)
-    {
-        float spacingNoise = 1 + stable_rand::randUnit() * m_fSpacingNoiseStrength;
-
-        float dirDiff;
-        if (m_fConcentrationBoost > 1.f && randomTable[i] == m_nComplexity / 2)
-        {
-            dirDiff = dirDelta * spacingNoise * 0.05f;
-        }
-        else
-        {
-            dirDiff = m_fAngleRange * fmod((randomTable[i] * dirDelta + spacingNoise), 1.0f) - halfAngleRange;
-        }
-        float dirUnit = m_fPrimaryDir + dirDiff;
-        float dir = 360 * dirUnit;
-
-        float dirDiffRatio = fabs(dirDiff) / m_fAngleRange;
-        float sizeBoost = 1 + (m_fConcentrationBoost - 1) * (-1.75f * dirDiffRatio + 2.f);  // From center to edge: 2->0.25
-        float brightnessBoost = 1 + (m_fConcentrationBoost - 1) * (1 / (15 * (dirDiffRatio + 0.02f)) - 1);  // from center to edge: 2.333->-0.994
-
-        color.a = brightnessBoost;
-        float size = sizeBoost * (1 + stable_rand::randUnit() * m_fSizeNoiseStrength);
-        float thickness = m_fThickness * (1 + stable_rand::randUnit() * m_fThicknessNoiseStrength);
-        float spread = m_fSpread * (1 + stable_rand::randUnit() * m_fSpreadNoiseStrength);
-        float halfAngle = ComputeSpreadParameters(spread);
-        int dynSmoothLevel = ComputeDynamicSmoothLevel(m_nSmoothLevel, halfAngle * 2, 1);
-        if (dynSmoothLevel <= 1)
-        {
-            continue;
-        }
-
-        std::vector<SVF_P3F_C4B_T2F> vertices;
-        std::vector<uint16> indices;
-        MeshUtil::GenShaft(size, thickness, dynSmoothLevel, dir - halfAngle, dir + halfAngle, color, vertices, indices);
-
-        int generatedPolyonNum = (int)(indices.size() + m_idxBuf.size()) / 3;
-        if (CRenderer::CV_r_FlaresIrisShaftMaxPolyNum != 0 && generatedPolyonNum > CRenderer::CV_r_FlaresIrisShaftMaxPolyNum)
-        {
-            break;
-        }
-
-        int indexOffset = m_vertBuf.size();
-        m_vertBuf.insert(m_vertBuf.end(), vertices.begin(), vertices.end());
-
-        for (int k = 0, iIndexSize(indices.size()); k < iIndexSize; ++k)
-        {
-            m_idxBuf.push_back(indices[k] + indexOffset);
-        }
-    }
-}
-
-void IrisShafts::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, [[maybe_unused]] SAuxParams& aux)
-{
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("IrisShafts");
-
-    gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-    vSrcProjPos = computeOrbitPos(vSrcProjPos, m_globalOrbitAngle);
-    static CCryNameTSCRC pIrisShaftsTechName("IrisShafts");
-    shader->FXSetTechnique(pIrisShaftsTechName);
-    uint nPass;
-    shader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-
-    ApplyGeneralFlags(shader);
-    ApplySpectrumTexFlag(shader, m_bUseSpectrumTex);
-    shader->FXBeginPass(0);
-
-    if (m_globalOcclusionBokeh)
-    {
-        RootOpticsElement* root = GetRoot();
-        CFlareSoftOcclusionQuery* occQuery = root->GetOcclusionQuery();
-        float occ = occQuery->GetOccResult();
-        float interpOcc = root->GetShaftVisibilityFactor();
-
-        if (occ >= 0.05f && fabs(m_fPrevOcc - occ) > 0.01f)
-        {
-            m_fAngleRange = 0.65f * occ * occ + 0.35f;
-            m_fPrimaryDir = occQuery->GetDirResult() / (2 * PI);
-            m_fConcentrationBoost = 2.0f - occ;
-            m_fBrightnessBoost = aznumeric_cast<float>(1 + 2 * pow(occ - 1, 6));
-
-            m_meshDirty = true;
-            m_fPrevOcc = occ;
-        }
-        else if (occ < 0.05f)
-        {
-            m_fAngleRange = 0.33f;
-            m_fBrightnessBoost = aznumeric_cast<float>(1 + 2 * pow(interpOcc - 1, 6));
-            m_fPrevOcc = 0;
-            m_meshDirty = true;
-        }
-    }
-    else
-    {
-        if (m_fAngleRange < 0.999f)
-        {
-            m_meshDirty = true;
-        }
-        m_fPrimaryDir = 0;
-        m_fAngleRange = 1;
-        m_fConcentrationBoost = 1;
-        m_fBrightnessBoost = 1;
-    }
-
-    ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-    ApplyExternTintAndBrightnessVS(shader, m_globalColor, m_globalFlareBrightness);
-
-    static CCryNameR meshCenterName("meshCenterAndBrt");
-    const float x = computeMovementLocationX(vSrcProjPos);
-    const float y = computeMovementLocationY(vSrcProjPos);
-    const Vec4 meshCenterParam(x, y, vSrcProjPos.z, 1);
-    shader->FXSetVSFloat(meshCenterName, &meshCenterParam, 1);
-
-    static STexState bilinearTS(FILTER_LINEAR, true);
-    bilinearTS.SetBorderColor(0);
-    bilinearTS.SetClampMode(TADDR_BORDER, TADDR_BORDER, TADDR_BORDER);
-
-    CTexture* pBaseTex = ((CTexture*)m_pBaseTex) ? ((CTexture*)m_pBaseTex) : CTextureManager::Instance()->GetBlackTexture();
-    pBaseTex->Apply(1, CTexture::GetTexState(bilinearTS));
-
-    CTexture* pSpectrumTex = (m_bUseSpectrumTex && ((CTexture*)m_pSpectrumTex)) ? ((CTexture*)m_pSpectrumTex) : CTextureManager::Instance()->GetBlackTexture();
-    pSpectrumTex->Apply(0, CTexture::GetTexState(bilinearTS));
-
-    if (m_MaxNumberOfPolygon != CRenderer::CV_r_FlaresIrisShaftMaxPolyNum)
-    {
-        m_meshDirty = true;
-        m_MaxNumberOfPolygon = CRenderer::CV_r_FlaresIrisShaftMaxPolyNum;
-    }
-
-    ValidateMesh();
-
-    ApplyMesh();
-    DrawMeshTriList();
-
-    shader->FXEndPass();
-
-    shader->FXEnd();
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/IrisShafts.h b/Code/CryEngine/RenderDll/Common/RendElements/IrisShafts.h
deleted file mode 100644
index bf147d2ba5..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/IrisShafts.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_IRISSHAFTS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_IRISSHAFTS_H
-#pragma once
-
-#include "OpticsElement.h"
-#include "AbstractMeshElement.h"
-#include "MeshUtil.h"
-
-class CTexture;
-class IrisShafts
-    : public COpticsElement
-    , public AbstractMeshElement
-{
-private:
-    _smart_ptr<CTexture> m_pBaseTex;
-    _smart_ptr<CTexture> m_pSpectrumTex;
-    bool m_bUseSpectrumTex : 1;
-
-    int m_nComplexity;
-    int m_nSmoothLevel;
-    int m_nColorComplexity;
-
-    float m_fPrevOcc;
-    float m_fPrimaryDir;
-    float m_fAngleRange;
-    float m_fConcentrationBoost;
-    float m_fBrightnessBoost;
-
-    float m_fSizeNoiseStrength;
-    float m_fThicknessNoiseStrength;
-    float m_fSpreadNoiseStrength;
-    float m_fSpacingNoiseStrength;
-
-    float m_fSpread;
-    float m_fThickness;
-    int m_nNoiseSeed;
-
-    int m_MaxNumberOfPolygon;
-
-protected:
-    virtual void GenMesh();
-    float ComputeSpreadParameters(const float thickness);
-    int     ComputeDynamicSmoothLevel(int maxLevel, float spanAngle, float threshold);
-    void Invalidate()
-    {
-        m_meshDirty = true;
-    }
-
-public:
-    IrisShafts (const char* name)
-        : COpticsElement(name, 0.5f)
-        , m_fThickness(0.3f)
-        , m_fSpread(0.2f)
-        , m_nSmoothLevel(2)
-        , m_nNoiseSeed(81)
-        , m_pBaseTex(0)
-        , m_fSizeNoiseStrength(0.8f)
-        , m_fThicknessNoiseStrength(0.6f)
-        , m_fSpacingNoiseStrength(0.2f)
-        , m_fSpreadNoiseStrength(0.0f)
-        , m_bUseSpectrumTex(false)
-        , m_fPrimaryDir(0)
-        , m_fAngleRange(1)
-        , m_fConcentrationBoost(0)
-        , m_fPrevOcc(-1.f)
-        , m_fBrightnessBoost(0)
-        , m_MaxNumberOfPolygon(0)
-    {
-        m_vMovement.x = 1.f;
-        m_vMovement.y = 1.f;
-        m_Color.a = 1.f;
-
-        m_pBaseTex = CTexture::ForName("EngineAssets/Textures/flares/iris_shaft.dds", FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown);
-
-        SetAutoRotation(false);
-        SetAspectRatioCorrection(true);
-        SetColorComplexity(2);
-        SetComplexity(32);
-
-        m_meshDirty = true;
-    }
-
-#if defined(FLARES_SUPPORT_EDITING)
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-
-    EFlareType GetType() { return eFT_IrisShafts; }
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void Load(IXmlNode* pNode);
-
-    bool GetEnableSpectrumTex() const { return m_bUseSpectrumTex; }
-    void SetEnableSpectrumTex(bool b) { m_bUseSpectrumTex = b; }
-
-    CTexture* GetSpectrumTex() const { return m_pSpectrumTex; }
-    void SetSpectrumTex(CTexture* tex)  { m_pSpectrumTex = tex; }
-
-    CTexture* GetBaseTex() const { return m_pBaseTex; }
-    void SetBaseTex(CTexture* tex)  { m_pBaseTex = tex; }
-
-    int GetNoiseSeed() const { return m_nNoiseSeed; }
-    void SetNoiseSeed(int seed)
-    {
-        m_nNoiseSeed = seed;
-        m_meshDirty = true;
-    }
-
-    int GetComplexity() const { return m_nComplexity; }
-    void SetComplexity(int n)
-    {
-        m_nComplexity = n;
-        m_meshDirty = true;
-    }
-
-    int GetColorComplexity() const { return m_nColorComplexity; }
-    void SetColorComplexity(int n)
-    {
-        m_nColorComplexity = n;
-        m_meshDirty = true;
-    }
-
-    int GetSmoothLevel() const { return m_nSmoothLevel; }
-    void SetSmoothLevel(int n)
-    {
-        m_nSmoothLevel = n;
-        m_meshDirty = true;
-    }
-
-    float GetThickness() const { return m_fThickness; }
-    void SetThickness(float f)
-    {
-        m_fThickness = f;
-        m_meshDirty = true;
-    }
-
-    float GetSpread() const { return m_fSpread; }
-    void SetSpread(float s)
-    {
-        m_fSpread = s;
-        m_meshDirty = true;
-    }
-
-    float GetThicknessNoise() const { return m_fThicknessNoiseStrength; }
-    void SetThicknessNoise(float noise)
-    {
-        m_fThicknessNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    float GetSpreadNoise() const { return m_fSpreadNoiseStrength; }
-    void SetSpreadNoise(float noise)
-    {
-        m_fThicknessNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    float GetSizeNoise() const { return m_fSizeNoiseStrength; }
-    void SetSizeNoise(float noise)
-    {
-        m_fSizeNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    float GetSpacingNoise() const { return m_fSpacingNoiseStrength; }
-    void SetSpacingNoise(float noise)
-    {
-        m_fSpacingNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this) + GetMeshDataSize());
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_IRISSHAFTS_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/MeshUtil.cpp b/Code/CryEngine/RenderDll/Common/RendElements/MeshUtil.cpp
deleted file mode 100644
index e329d3f8ef..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/MeshUtil.cpp
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "MeshUtil.h"
-#include "../../../CryCommon/VertexFormats.h"
-#include "../../../CryCommon/MTPseudoRandom.h"
-
-using namespace stable_rand;
-
-CMTRand_int32 randGen;
-void stable_rand::setSeed(uint32 seed) {randGen.seed(seed); }
-float stable_rand::randUnit() { return randGen.GenerateFloat() * 2.f - 1.f; }
-float stable_rand::randPositive() { return randGen.GenerateFloat(); }
-float stable_rand::randBias(float noise) { return 1.f + randUnit() * noise; }
-
-float computeFade(float current, float start, float end, float fadingLength)
-{
-    if (current < start - fadingLength)
-    {
-        return 0;
-    }
-    else if (current < start)
-    {
-        return 1 - (start - current) / fadingLength;
-    }
-    else if (current > end + fadingLength)
-    {
-        return 0;
-    }
-    else if (current > end)
-    {
-        return 1 - (current - end) / fadingLength;
-    }
-    else
-    {
-        return 1;
-    }
-}
-
-Vec2 rotate(float x, float y, float rad)
-{
-    Vec2 ret;
-    float cosRad = cos(rad);
-    float sinRad = sin(rad);
-    ret.x = x * cosRad  -  y * sinRad;
-    ret.y = y * cosRad  +  x * sinRad;
-    return ret;
-}
-
-void MeshUtil::GenDisk([[maybe_unused]] float radius, int polySides, int ringCount, bool capInnerHole, const ColorF& clr, float* ringPosArray, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut)
-{
-    bool gCollectPosArray = false;
-    if (ringPosArray == NULL)
-    {
-        // create a uniformly spaced setting
-        ringPosArray = new float[ringCount];
-        float ringCountf = (float)ringCount;
-        for (int i = 0; i < ringCount; i++)
-        {
-            ringPosArray[i] = (i + 1) / ringCountf;
-        }
-        gCollectPosArray = true;
-    }
-
-    // Current strategy: whether or not capping, center pivot is always generated only not indexed in later case.
-    // UV mapping follows polar representation: u for thou, v for theta
-    DWORD dclr = clr.pack_argb8888();
-    vertOut.resize(polySides * ringCount + 1);  // rings and the center
-
-    SVF_P3F_C4B_T2F& centerV = vertOut[0];
-    centerV.xyz = Vec3(0, 0, 0);
-    centerV.st = Vec2(0, 0);
-    centerV.color.dcolor = dclr;
-
-    // Generate all vertices starting from inner rings:
-    for (int i = 0; i < polySides; i++)
-    {
-        float theta = i / (float)polySides;
-        float angle = 2 * PI * theta;
-        float x = cos(angle);
-        float y = sin(angle);
-        //float noise = randUnit() * noiseStrength;
-
-        for (int r = 0; r < ringCount; r++)
-        {
-            float curRingRadius = ringPosArray[r];
-            float thou = (r + 1) / (float)(ringCount);
-            //curRingRadius += noise; // apply translation noise
-
-            SVF_P3F_C4B_T2F& vert = vertOut[i * ringCount + r + 1];
-            vert.xyz.Set(x * curRingRadius, y * curRingRadius, 0);
-            vert.st.set(thou, theta);
-
-            vert.color.dcolor = dclr;
-        }
-    }
-
-    // Rings' Indices;
-    int holeCapperIdxCount = 0;
-    if (capInnerHole)
-    {
-        holeCapperIdxCount = polySides * 3;
-    }
-    idxOut.resize(polySides * (ringCount - 1) * 6 + holeCapperIdxCount);
-
-    for (int i = 0; i < polySides; i++)
-    {
-        int baseVertIdx0 = i * ringCount;
-        for (int r = 0; r < ringCount - 1; r++)
-        {
-            // counter clock wise:
-            int a = baseVertIdx0 + r;
-            int b = a + 1;
-            int c = (a + ringCount + 1) % vertOut.size();
-            int d = (c - 1) % vertOut.size();
-
-            int baseIdx = (i * (ringCount - 1) + r) * 6 + holeCapperIdxCount;
-            idxOut[baseIdx] = b;
-            idxOut[baseIdx + 1] = c;
-            idxOut[baseIdx + 2] = a;
-
-            idxOut[baseIdx + 3] = a;
-            idxOut[baseIdx + 4] = c;
-            idxOut[baseIdx + 5] = d;
-        }
-    }
-
-    // indices for the capper:
-    if (capInnerHole)
-    {
-        // inner circle:
-        // vert: [nPolySide][nRing]
-        // index: [nPolySide][3]
-        for (int i = 0; i < polySides; i++)
-        {
-            int baseIdx = i * 3;
-            idxOut[baseIdx] = 0;
-            idxOut[baseIdx + 1] = 1 + i * ringCount;
-            idxOut[baseIdx + 2] = (i != (polySides - 1)) ? (2 + i * ringCount) : 1;
-        }
-    }
-
-    if (gCollectPosArray)
-    {
-        delete [] ringPosArray;
-    }
-}
-
-//Generate a hoop which consists of specified number of inscribe circles
-void MeshUtil::GenHoop(float radius, int polySides, float thickness, int ringCount, const ColorF& clr, float noiseStrength, int noiseSeed, float startAngle, float endAngle, float fadeAngle, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut)
-{
-    // use inscribe circles. Tangent point is at the origin:
-    setSeed(noiseSeed);
-
-    polySides *= 2;
-
-    if (ringCount < 2)
-    {
-        // Log("Warning: Illegal ring count");
-        ringCount = 2;
-    }
-
-    if (endAngle < startAngle)
-    {
-        float tmp = endAngle;
-        endAngle = startAngle;
-        startAngle = tmp;
-    }
-
-    float startAngleRad = startAngle / 180 * PI;
-    float endAngleRad = endAngle / 180 * PI;
-    float fadeAngleRad = fadeAngle / 180 * PI;
-
-    // Verts:
-    vertOut.resize(polySides * ringCount);
-
-    float innerRadius = radius - thickness;
-    float deltaRadius = thickness / (float)(ringCount - 1);
-    float deltaTheta = 1 / (float)polySides;
-
-    for (int i = 0; i < polySides; i++)
-    {
-        float spikeThetaWidth = 0.18f * deltaTheta;
-        float thetaLinear = i / (float)polySides + randUnit() * 0.5f * deltaTheta - spikeThetaWidth;  // old linear mapping
-        float k = 2.6f * thetaLinear - 1.3f;
-        float theta = 0.5f + 0.5f * tanf(k) / tanf(1.3f);
-        float angle = 2 * PI * theta;
-        float x = cos(angle);
-        float y = sin(angle);
-        float fade = computeFade(angle, startAngleRad, endAngleRad, fadeAngleRad);
-        float noise = randUnit() * noiseStrength;
-
-        for (int r = 0; r < ringCount; r++)
-        {
-            float curRingRadius = innerRadius + r * deltaRadius;
-            float thou = r / (float)(ringCount - 1);
-            curRingRadius += noise; // apply translation noise
-
-            SVF_P3F_C4B_T2F& vert = vertOut[i * ringCount + r];
-            vert.xyz.Set((x - 1) * curRingRadius, y * curRingRadius, 0);
-            vert.st.set(thou, theta);
-
-            ColorF c(clr.r, clr.g, clr.b, clr.a * fade);
-            vert.color.dcolor = c.pack_argb8888();
-        }
-
-        // generate spikes
-        i++;
-        theta += 2 * spikeThetaWidth;
-        angle = 2 * PI * theta;
-        x = cos(angle);
-        y = sin(angle);
-        for (int r = 0; r < ringCount; r++)
-        {
-            float curRingRadius = innerRadius + r * deltaRadius;
-            float thou = r / (float)(ringCount - 1);
-            curRingRadius += noise; // apply translation noise
-
-            SVF_P3F_C4B_T2F& vert = vertOut[i * ringCount + r];
-            vert.xyz.Set((x - 1) * curRingRadius, y * curRingRadius, 0);
-            vert.st.set(thou, theta);
-
-            ColorF c(clr.r, clr.g, clr.b, clr.a * fade);
-            vert.color.dcolor = c.pack_argb8888();
-        }
-    }
-
-    // Indices;
-    idxOut.resize(polySides * (ringCount - 1) * 6);
-    for (int i = 0; i < polySides; i++)
-    {
-        int baseVertIdx0 = i * ringCount;
-        for (int r = 0; r < ringCount - 1; r++)
-        {
-            // counter clock wise:
-            int a = baseVertIdx0 + r;
-            int b = a + 1;
-            int c = (a + ringCount + 1) % vertOut.size();
-            int d = (c - 1) % vertOut.size();
-
-            int baseIdx = (i * (ringCount - 1) + r) * 6;
-            idxOut[baseIdx] = b;
-            idxOut[baseIdx + 1] = c;
-            idxOut[baseIdx + 2] = a;
-
-            idxOut[baseIdx + 3] = a;
-            idxOut[baseIdx + 4] = c;
-            idxOut[baseIdx + 5] = d;
-        }
-    }
-}
-
-void MeshUtil::GenTrapezoidFan(int numSideVert, float radius, float startAngleDegree, float endAngleDegree, float centerThickness, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut)
-{
-    if (endAngleDegree < startAngleDegree)
-    {
-        float tmp = endAngleDegree;
-        endAngleDegree = startAngleDegree;
-        startAngleDegree = tmp;
-    }
-
-    float startAngle = startAngleDegree / 180 * PI;
-    float endAngle = endAngleDegree / 180 * PI;
-    float midAngle = 0.5f * (startAngle + endAngle);
-    float halfAngleRange = 0.5f * (endAngle - startAngle);
-    float angleDelta = (endAngle - startAngle) / (numSideVert - 1);
-
-    vertOut.resize(numSideVert * 2);
-    float dirX = cos(midAngle);
-    float dirY = sin(midAngle);
-    DWORD dclr = clr.pack_argb8888();
-    for (int i = 0; i < numSideVert; i++)
-    {
-        float relativeAngle = i * angleDelta;
-        float theta = startAngle + relativeAngle;
-        float x = cos(theta);
-        float y = sin(theta);
-
-        float angleRatio = (theta - midAngle) / halfAngleRange;
-        float u = i / (float)(numSideVert - 1);
-
-        SVF_P3F_C4B_T2F& vert = vertOut[i * 2];
-        float yRela = angleRatio;
-        vert.xyz.Set((-yRela * dirY) * centerThickness, (yRela * dirX) * centerThickness, 0);  // swap x,y and negate and translate
-        vert.st.set(u, 0);
-        vert.color.dcolor = dclr;
-
-        // top:
-        SVF_P3F_C4B_T2F& vert2 = vertOut[i * 2 + 1];
-        vert2.xyz.Set(x * radius, y * radius, 0);
-        vert2.st.set(u, 1);
-        vert2.color.dcolor = dclr;
-    }
-
-    idxOut.resize((numSideVert - 1) * 6);
-    for (int i = 0; i < numSideVert - 1; i++)
-    {
-        int baseVertIdx = i;
-        int a = baseVertIdx * 2;
-        int b = a + 2;
-        int c = b + 1;
-        int d = a + 1;
-
-        int baseIdx = i * 6;
-
-        idxOut[baseIdx] = b;
-        idxOut[baseIdx + 1] = c;
-        idxOut[baseIdx + 2] = a;
-
-        idxOut[baseIdx + 3] = a;
-        idxOut[baseIdx + 4] = c;
-        idxOut[baseIdx + 5] = d;
-    }
-}
-
-void MeshUtil::GenFan(int numSideVert, float radius, float startAngleDegree, float endAngleDegree, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut)
-{
-    if (endAngleDegree < startAngleDegree)
-    {
-        float tmp = endAngleDegree;
-        endAngleDegree = startAngleDegree;
-        startAngleDegree = tmp;
-    }
-
-    float startAngle = startAngleDegree / 180 * PI;
-    float endAngle = endAngleDegree / 180 * PI;
-    float angleDelta = (endAngle - startAngle) / (numSideVert - 1);
-
-    vertOut.resize(numSideVert + 1);
-    DWORD dclr = clr.pack_argb8888();
-
-    // center
-    SVF_P3F_C4B_T2F& centerVert = vertOut[0];
-    centerVert.xyz.Set(0, 0, 0);
-    centerVert.st.set(0, 0);
-    centerVert.color.dcolor = dclr;
-
-    for (int i = 0; i < numSideVert; i++)
-    {
-        float relativeAngle = i * angleDelta;
-        float theta = startAngle + relativeAngle;
-        float x = cos(theta);
-        float y = sin(theta);
-        float xLocal = cos(relativeAngle);
-        float yLocal = sin(relativeAngle);
-
-        // top:
-        SVF_P3F_C4B_T2F& vert2 = vertOut[i + 1];
-        vert2.xyz.Set(x * radius, y * radius, 0);
-        vert2.st.set(xLocal, yLocal);
-        vert2.color.dcolor = dclr;
-    }
-
-    idxOut.resize((numSideVert - 1) * 3);
-    for (int i = 0; i < numSideVert - 1; i++)
-    {
-        int baseVertIdx = i + 1;
-
-        int a = 0;
-        int b = baseVertIdx;
-        int c = baseVertIdx + 1;
-
-        int baseIdx = i * 3;
-
-        idxOut[baseIdx] = a;
-        idxOut[baseIdx + 1] = c;
-        idxOut[baseIdx + 2] = b;
-    }
-}
-
-// A shaft/falloff-fan is a simple coarse fan-shaped mesh with odd number of side-vertices.
-// It's UV mapping spans a strict rectangular shape (x:[0,1,0]  y:[0,1]).
-// On top of the fan shape, there's a concentric beam which simulates the spike effect.
-void MeshUtil::GenShaft(float radius, float centerThickness, int complexity, float startAngleDegree, float endAngleDegree, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut)
-{
-    if (complexity <= 1)
-    {
-        return;
-    }
-
-    int numSideVert = complexity;
-    GenTrapezoidFan(numSideVert, radius, startAngleDegree, endAngleDegree, centerThickness, clr, vertOut, idxOut);
-
-    float midAngleDegree = 0.5f * (startAngleDegree + endAngleDegree);
-    float halfAngleRangeDegree = 0.5f * (endAngleDegree - startAngleDegree);
-    const float beamWidthFactor = 0.1f;
-    float beamHalfAngle = halfAngleRangeDegree * beamWidthFactor;
-    std::vector<SVF_P3F_C4B_T2F> beamVertOut;
-    std::vector<uint16> beamIdxOut;
-    ColorF clr2 = clr * 1.1f;
-
-    GenTrapezoidFan(2, radius, midAngleDegree - beamHalfAngle, midAngleDegree + beamHalfAngle, centerThickness, clr2, beamVertOut, beamIdxOut);
-}
-
-void MeshUtil::GenStreak(float dir, float radius, float thickness, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut)
-{
-    static const int polySides = 24;
-
-    Matrix33 rotMx;
-    rotMx.SetRotationAA(dir * PI, Vec3(0, 0, 1));
-
-    DWORD dclr = clr.pack_argb8888();
-    vertOut.resize(polySides + 1);
-
-    SVF_P3F_C4B_T2F& centerV = vertOut[0];
-    centerV.xyz = Vec3(0, 0, 0);
-    centerV.st = Vec2(0, 0);
-    centerV.color.dcolor = dclr;
-
-    // Generate all vertices
-    for (int i = 0; i < polySides; i++)
-    {
-        float theta = i / (float)polySides;
-        float angle = 2 * PI * theta;
-        float x = cos(angle);
-        float y = sin(angle) * thickness;
-
-        Vec2 scale(x, y);
-        scale = scale * rotMx;
-
-        x = scale.x;
-        y = scale.y;
-
-        SVF_P3F_C4B_T2F& vert = vertOut[i + 1];
-        vert.xyz.Set(x * radius, y * radius, 0);
-        vert.st.set(1.0f, theta);
-        vert.color.dcolor = dclr;
-    }
-
-    // indices;
-    int centerIdxCount = polySides * 3;
-    idxOut.resize(centerIdxCount);
-
-    for (int i = 0; i < polySides; i++)
-    {
-        int baseIdx = i * 3;
-        idxOut[baseIdx] = 0;
-        idxOut[baseIdx + 1] = 1 + i;
-        idxOut[baseIdx + 2] = (i != (polySides - 1)) ? (2 + i) : 1;
-    }
-}
-
-void MeshUtil::GenSprites(std::vector<SpritePoint>& spriteList, float aspectRatio, bool packPivotPos, std::vector<SVF_P3F_C4B_T2F>& vertOut, [[maybe_unused]] std::vector<uint16>& idxOut)
-{
-    vertOut.resize(spriteList.size() * 4);
-
-    for (unsigned int i = 0; i < spriteList.size(); i++)
-    {
-        SpritePoint& sprite = spriteList[i];
-        Vec2& pivot = sprite.pos;
-
-        float size = sprite.size;
-        float rot = sprite.rotation;
-        ColorF clr = sprite.color;
-
-        float radius = size;
-        DWORD dclr = clr.pack_argb8888();
-
-        int vertIdx = i * 4;
-
-        SVF_P3F_C4B_T2F& vert0 = vertOut[vertIdx];
-        Vec2 p = rotate(-radius, -radius, rot);
-
-        float zComp;
-        if (packPivotPos)
-        {
-            zComp = (float)(((int)floor((pivot.x * 0.5f + 0.5f) * 4095) << 12) | ((int)floor((pivot.y * 0.5f + 0.5f) * 4095))) / (4096 * 4096);
-        }
-        else
-        {
-            zComp = rot;
-        }
-
-        vert0.xyz.Set(p.x / aspectRatio + pivot.x, p.y + pivot.y, zComp);
-        vert0.color.dcolor = dclr;
-        vert0.st.set(0, 0);
-
-        SVF_P3F_C4B_T2F& vert1 = vertOut[vertIdx + 1];
-        p = rotate(radius, -radius, rot);
-        vert1.xyz.Set(p.x / aspectRatio + pivot.x, p.y + pivot.y, zComp);
-        vert1.color.dcolor = dclr;
-        vert1.st.set(1, 0);
-
-        SVF_P3F_C4B_T2F& vert2 = vertOut[vertIdx + 2];
-        p = rotate(radius, radius, rot);
-        vert2.xyz.Set(p.x / aspectRatio + pivot.x, p.y + pivot.y, zComp);
-        vert2.color.dcolor = dclr;
-        vert2.st.set(1, 1);
-
-        SVF_P3F_C4B_T2F& vert3 = vertOut[vertIdx + 3];
-        p = rotate(-radius, radius, rot);
-        vert3.xyz.Set(p.x / aspectRatio + pivot.x, p.y + pivot.y, zComp);
-        vert3.color.dcolor = dclr;
-        vert3.st.set(0, 1);
-    }
-}
-
-void MeshUtil::TrianglizeQuadIndices(int quadCount, std::vector<uint16>& idxOut)
-{
-    idxOut.resize(quadCount * 6);
-    for (int i = 0; i < quadCount; i++)
-    {
-        int baseVertIdx = i * 4;
-        int a = baseVertIdx;
-        int b = a + 1;
-        int c = b + 1;
-        int d = c + 1;
-
-        int baseIdx = i * 6;
-
-        idxOut[baseIdx] = b;
-        idxOut[baseIdx + 1] = c;
-        idxOut[baseIdx + 2] = a;
-
-        idxOut[baseIdx + 3] = c;
-        idxOut[baseIdx + 4] = a;
-        idxOut[baseIdx + 5] = d;
-    }
-}
-
-void MeshUtil::GenScreenTile(float x0, float y0, float x1, float y1, ColorF clr, int rowCount, int columnCount, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut)
-{
-    int yCount = rowCount + 1;
-    int xCount = columnCount + 1;
-    vertOut.resize(xCount * yCount);
-
-    DWORD dclr = clr.pack_argb8888();
-
-    float xSpan = x1 - x0;
-    float ySpan = y1 - y0;
-    float xDelta = xSpan / columnCount;
-    float yDelta = ySpan / rowCount;
-    float uDelta = 1.f / columnCount;
-    float vDelta = 1.f / rowCount;
-
-    for (int j = 0; j < yCount; j++)
-    {
-        for (int i = 0; i < xCount; i++)
-        {
-            SVF_P3F_C4B_T2F& vert = vertOut[ i + j * xCount ];
-            vert.xyz.Set(x0 + xDelta * i, y0 + yDelta * j, 0);
-            vert.st.set(uDelta * i, vDelta * j);
-            vert.color.dcolor = dclr;
-        }
-    }
-
-    idxOut.resize(rowCount * columnCount * 6);
-    for (int j = 0; j < rowCount; j++)
-    {
-        for (int i = 0; i < columnCount; i++)
-        {
-            int a = i + j * xCount;
-            int b = a + 1;
-            int c = (i + 1) + (j + 1) * xCount;
-            int d = c - 1;
-
-            int baseIdx = (i + j * columnCount) * 6;
-            idxOut[ baseIdx + 0 ] = b;
-            idxOut[ baseIdx + 1 ] = c;
-            idxOut[ baseIdx + 2 ] = a;
-
-            idxOut[ baseIdx + 3 ] = a;
-            idxOut[ baseIdx + 4 ] = c;
-            idxOut[ baseIdx + 5 ] = d;
-        }
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/MeshUtil.h b/Code/CryEngine/RenderDll/Common/RendElements/MeshUtil.h
deleted file mode 100644
index 57ffa2de1f..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/MeshUtil.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_MESHUTIL_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_MESHUTIL_H
-#pragma once
-
-#include "../../../CryCommon/VertexFormats.h"
-
-namespace stable_rand
-{
-    void setSeed(uint32 seed);
-    float randUnit();
-    float randPositive();
-    float randBias(float noise);
-}
-
-struct SpritePoint
-{
-    Vec2 pos;
-    float size;
-    float brightness;
-    float rotation;
-    ColorF color;
-
-    SpritePoint(const Vec2& _pos, float _brightness)
-        : pos(_pos)
-        , brightness(_brightness)
-        , size(0.1f)
-        , rotation(0)
-    {
-        color.set(1, 1, 1, 1);
-    }
-    SpritePoint()
-        : brightness(1)
-        , size(0.1f)
-        , rotation(0)
-    {
-        pos.set(0, 0);
-        color.set(1, 1, 1, 1);
-    }
-};
-
-class MeshUtil
-{
-public:
-    static void GenDisk(float radius, int polySides, int ringCount, bool capInnerHole, const ColorF& clr, float* ringPosArray, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-
-    static void GenHoop(float radius, int polySides, float thickness, int ringCount, const ColorF& clr, float noiseStrength, int noiseSeed, float startAngle, float endAngle, float fadeAngle, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-    static void GenTrapezoidFan(int numSideVert, float radius, float startAngleDegree, float endAngleDegree, float centerThickness, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-    static void GenFan(int numSideVert, float radius, float startAngleDegree, float endAngleDegree, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-
-    //A falloff fan is a simple coarse fan-shaped mesh with odd number of side-vertices.
-    //It's UV mapping spans a strict rectanglular shape (x:[0,1,0]  y:[0,1]).
-    //On top of the fan shape, there's a concentric beam which simulates the spike effect.
-    static void GenShaft(float radius, float centerThickness, int complexity, float startAngleDegree, float endAngleDegree, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-    static void GenStreak(float dir, float radius, float thickness, const ColorF& clr, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-    static void GenSprites(std::vector<SpritePoint>& spriteList, float aspectRatio,  bool packPivotPos, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-    static void TrianglizeQuadIndices(int quadCount, std::vector<uint16>& idxOut);
-    static void GenScreenTile(float x0, float y0, float x1, float y1, ColorF clr, int rowCount, int columnCount, std::vector<SVF_P3F_C4B_T2F>& vertOut, std::vector<uint16>& idxOut);
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_MESHUTIL_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsElement.cpp b/Code/CryEngine/RenderDll/Common/RendElements/OpticsElement.cpp
deleted file mode 100644
index 1db2c3c72e..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsElement.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "OpticsElement.h"
-#include "../CryNameR.h"
-#include "../../XRenderD3D9/DriverD3D.h"
-#include "RootOpticsElement.h"
-#include "../Textures/Texture.h"
-#include "../Common/Textures/TextureManager.h"
-#include "FlareSoftOcclusionQuery.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-AZStd::vector<FuncVariableGroup> COpticsElement::GetEditorParamGroups()
-{
-    if (m_paramGroups.empty())
-    {
-        InitEditorParamGroups(m_paramGroups);
-    }
-
-    return m_paramGroups;
-}
-
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&COpticsElement::FUNC_NAME)
-void COpticsElement::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    FuncVariableGroup baseGroup;
-    baseGroup.SetName("Common");
-    baseGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Size", "Size", this, MFPtr(SetSize), MFPtr(GetSize)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Perspective factor", "Perspective factor", this, MFPtr(SetPerspectiveFactor), MFPtr(GetPerspectiveFactor)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Distance Fading factor", "Distance fading factor", this, MFPtr(SetDistanceFadingFactor), MFPtr(GetDistanceFadingFactor)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Brightness", "Brightness", this, MFPtr(SetBrightness), MFPtr(GetBrightness)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "Position", "The relative position to light", this, MFPtr(SetMovement), MFPtr(GetMovement)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_COLOR, "Tint", "Basic tint", this, MFPtr(SetColor), MFPtr(GetColor)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Orbit angle", "The rotation angle of the virtual light source", this, MFPtr(SetOrbitAngle), MFPtr(GetOrbitAngle)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Occlusion Interaction", "Enable various flare interaction with the occlusion", this, MFPtr(SetOccBokehEnabled), MFPtr(IsOccBokehEnabled)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Auto Rotation", "Enable Auto Rotation around the pivot", this, MFPtr(SetAutoRotation), MFPtr(HasAutoRotation)));
-    baseGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Correct Aspect Ratio", "Correct aspect ratio", this, MFPtr(SetAspectRatioCorrection), MFPtr(HasAspectRatioCorrection)));
-    groups.push_back(baseGroup);
-
-    FuncVariableGroup sensorGroup;
-    sensorGroup.SetName("Sensor");
-    sensorGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Sensor image size variation factor", "sensor image size variation factor", this, MFPtr(SetSensorSizeFactor), MFPtr(GetSensorSizeFactor)));
-    sensorGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Sensor image brightness variation factor", "sensor image brightness variation factor", this, MFPtr(SetSensorBrightnessFactor), MFPtr(GetSensorBrightnessFactor)));
-    groups.push_back(sensorGroup);
-
-    FuncVariableGroup xformGroup;
-    xformGroup.SetName("Transformation");
-    xformGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "Scale", "Scale", this, MFPtr(SetScale), MFPtr(GetScale)));
-    xformGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "Translation", "Translation", this, MFPtr(SetTranslation), MFPtr(GetTranslation)));
-    xformGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Rotation", "Rotation", this, MFPtr(SetRotation), MFPtr(GetRotation)));
-    groups.push_back(xformGroup);
-
-    FuncVariableGroup dynamicsGroup;
-    dynamicsGroup.SetName("Dynamics");
-    dynamicsGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable", "Enable.", this, MFPtr(SetDynamicsEnabled), MFPtr(GetDynamicsEnabled)));
-    dynamicsGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Trigger Invert", "Invert the trigger area.", this, MFPtr(SetDynamicsInvert), MFPtr(GetDynamicsInvert)));
-    dynamicsGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "Trigger Offset", "Offset from the center of the screen.", this, MFPtr(SetDynamicsOffset), MFPtr(GetDynamicsOffset)));
-    dynamicsGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Trigger Range", "How much influence the trigger has.", this, MFPtr(SetDynamicsRange), MFPtr(GetDynamicsRange)));
-    dynamicsGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Trigger Falloff", "Falloff strength of the trigger area.", this, MFPtr(SetDynamicsFalloff), MFPtr(GetDynamicsFalloff)));
-    groups.push_back(dynamicsGroup);
-}
-#undef MFPtr
-#endif
-
-void COpticsElement::Load(IXmlNode* pNode)
-{
-    XmlNodeRef pCommonNode = pNode->findChild("Common");
-    if (pCommonNode)
-    {
-        float fSize(m_fSize);
-        if (pCommonNode->getAttr("Size", fSize))
-        {
-            SetSize(fSize);
-        }
-
-        float fPerspectiveFactor(m_fPerpectiveFactor);
-        if (pCommonNode->getAttr("Perspectivefactor", fPerspectiveFactor))
-        {
-            SetPerspectiveFactor(fPerspectiveFactor);
-        }
-
-        float fDistanceFadingFactor = m_fDistanceFadingFactor;
-        if (pCommonNode->getAttr("DistanceFadingfactor", fDistanceFadingFactor))
-        {
-            SetDistanceFadingFactor(fDistanceFadingFactor);
-        }
-
-        float fBrightness = m_fBrightness;
-        if (pCommonNode->getAttr("Brightness", fBrightness))
-        {
-            SetBrightness(fBrightness);
-        }
-
-        Vec2 vPos(m_vMovement);
-        if (pCommonNode->getAttr("Position", vPos))
-        {
-            SetMovement(vPos);
-        }
-
-        Vec3 color(m_Color.r, m_Color.g, m_Color.b);
-        int nAlpha((int)(m_Color.a * 255.0f));
-        if (pCommonNode->getAttr("Tint", color) && pCommonNode->getAttr("Tint.alpha", nAlpha))
-        {
-            SetColor(ColorF(color.x, color.y, color.z, (float)nAlpha / 255.0f));
-        }
-
-        float fOrbitAngle(m_fOrbitAngle);
-        if (pCommonNode->getAttr("Orbitangle", fOrbitAngle))
-        {
-            SetOrbitAngle(fOrbitAngle);
-        }
-
-        bool bOcclusionBokeh(m_bOcclusionBokeh);
-        if (pCommonNode->getAttr("OcclusionInteraction", bOcclusionBokeh))
-        {
-            SetOccBokehEnabled(bOcclusionBokeh);
-        }
-
-        bool bAutoRotation(m_bAutoRotation);
-        if (pCommonNode->getAttr("AutoRotation", bAutoRotation))
-        {
-            SetAutoRotation(bAutoRotation);
-        }
-
-        bool bCorrectAspectRatio(m_bCorrectAspectRatio);
-        if (pCommonNode->getAttr("CorrectAspectRatio", bCorrectAspectRatio))
-        {
-            SetAspectRatioCorrection(bCorrectAspectRatio);
-        }
-    }
-
-    XmlNodeRef pSensorNode = pNode->findChild("Sensor");
-    if (pSensorNode)
-    {
-        float fSensorSizeFactor(m_fSensorSizeFactor);
-        if (pSensorNode->getAttr("Sensorimagesizevariationfactor", fSensorSizeFactor))
-        {
-            SetSensorSizeFactor(fSensorSizeFactor);
-        }
-
-        float fSensorBrightnessFactor = m_fSensorBrightnessFactor;
-        if (pSensorNode->getAttr("Sensorimagebrightnessvariationfactor", fSensorBrightnessFactor))
-        {
-            SetSensorBrightnessFactor(fSensorBrightnessFactor);
-        }
-    }
-
-    XmlNodeRef pTransformationNode = pNode->findChild("Transformation");
-    if (pTransformationNode)
-    {
-        Vec2 vScale(xform_scale);
-        if (pTransformationNode->getAttr("Scale", vScale))
-        {
-            SetScale(vScale);
-        }
-
-        Vec2 vTranslation(xform_translate);
-        if (pTransformationNode->getAttr("Translation", vTranslation))
-        {
-            SetTranslation(vTranslation);
-        }
-
-        float fRotation(xform_rotation);
-        if (pTransformationNode->getAttr("Rotation", fRotation))
-        {
-            SetRotation(fRotation);
-        }
-    }
-
-    XmlNodeRef pDynamicsNode = pNode->findChild("Dynamics");
-    if (pDynamicsNode)
-    {
-        bool bEnable(m_bEnabled);
-        if (pDynamicsNode->getAttr("Enable", bEnable))
-        {
-            SetDynamicsEnabled(bEnable);
-        }
-
-        bool bDynamicInvert(m_bDynamicsInvert);
-        if (pDynamicsNode->getAttr("TriggerInvert", bDynamicInvert))
-        {
-            SetDynamicsInvert(bDynamicInvert);
-        }
-
-        Vec2 vDynamicsOffset(m_vDynamicsOffset);
-        if (pDynamicsNode->getAttr("TriggerOffset", vDynamicsOffset))
-        {
-            SetDynamicsOffset(vDynamicsOffset);
-        }
-
-        float fDynamicsRange(m_fDynamicsRange);
-        if (pDynamicsNode->getAttr("TriggerRange", fDynamicsRange))
-        {
-            SetDynamicsRange(fDynamicsRange);
-        }
-
-        float fDynamicsFalloff(m_fDynamicsFalloff);
-        if (pDynamicsNode->getAttr("TriggerFalloff", fDynamicsFalloff))
-        {
-            SetDynamicsFalloff(fDynamicsFalloff);
-        }
-    }
-}
-
-RootOpticsElement* COpticsElement::GetRoot()
-{
-    IOpticsElementBase* parent = this;
-    do
-    {
-        parent = parent->GetParent();
-        if (parent == NULL)
-        {
-            return NULL;
-        }
-    } while (parent->GetType() != eFT_Root);
-    return (RootOpticsElement*)parent;
-}
-
-void COpticsElement::validateGlobalVars(SAuxParams& aux)
-{
-    if (m_pParent)
-    {
-        m_globalPerpectiveFactor = m_fPerpectiveFactor * m_pParent->m_globalPerpectiveFactor;
-        m_globalDistanceFadingFactor = m_fDistanceFadingFactor * m_pParent->m_globalDistanceFadingFactor;
-        m_globalSensorSizeFactor = m_fSensorSizeFactor * m_pParent->m_globalSensorSizeFactor;
-        float sensorSizeFactor = 1 + m_globalSensorSizeFactor * aux.sensorVariationValue;
-
-        m_globalSensorBrightnessFactor = m_fSensorBrightnessFactor * m_pParent->m_globalSensorBrightnessFactor;
-        float sensorBrightnessFactor = fabs(1 + m_globalSensorBrightnessFactor * aux.sensorVariationValue);
-
-        float perspectiveShortening = 1 + m_globalPerpectiveFactor * (aux.perspectiveShortening - 1);
-        m_globalSize = m_fSize * m_pParent->m_globalSize * perspectiveShortening * sensorSizeFactor;  // remember to multiply the additional perspective factor
-
-        if (aux.bMultiplyColor)
-        {
-            m_globalColor = m_Color * m_pParent->m_globalColor;
-        }
-        else
-        {
-            m_globalColor = ColorF(m_Color.r + m_pParent->m_globalColor.r,
-                    m_Color.g + m_pParent->m_globalColor.g,
-                    m_Color.b + m_pParent->m_globalColor.b,
-                    m_Color.a * m_pParent->m_globalColor.a);
-        }
-
-        float fading = clamp_tpl(1 - 1000.f * m_globalDistanceFadingFactor * aux.linearDepth, 0.0f, 1.f);
-        float brightness = m_fBrightness * sensorBrightnessFactor * fading;
-        m_globalFlareBrightness = brightness * m_pParent->m_globalFlareBrightness;
-        m_globalShaftBrightness = brightness * m_pParent->m_globalShaftBrightness;
-
-        m_globalMovement.x = m_vMovement.x * m_pParent->m_globalMovement.x;
-        m_globalMovement.y = m_vMovement.y * m_pParent->m_globalMovement.y;
-
-        if (!m_pParent->m_globalTransform.IsIdentity())
-        {
-            m_globalTransform = m_mxTransform * m_pParent->m_globalTransform;
-        }
-        else
-        {
-            m_globalTransform = m_mxTransform;
-        }
-
-        m_globalOrbitAngle = m_fOrbitAngle + m_pParent->m_globalOrbitAngle;
-        m_globalOcclusionBokeh = m_bOcclusionBokeh & m_pParent->m_globalOcclusionBokeh;
-        m_globalAutoRotation = m_bAutoRotation & m_pParent->m_bAutoRotation;
-        m_globalCorrectAspectRatio = m_bCorrectAspectRatio & m_pParent->m_bCorrectAspectRatio;
-    }
-}
-
-void COpticsElement::updateXformMatrix()
-{
-    Matrix33 scaleMx;
-    scaleMx.SetScale(Vec3(xform_scale.x, xform_scale.y, 1));
-    Matrix33 rotMx;
-    rotMx.SetRotationAA(xform_rotation * 2.0f * PI, Vec3(0, 0, 1));
-    Matrix33 combine = rotMx * scaleMx;
-    combine.SetColumn(2, Vec3(xform_translate.x, xform_translate.y, 1));
-    SetTransform(combine);
-}
-
-const Vec3 COpticsElement::computeOrbitPos(const Vec3& vSrcProjPos, float orbitAngle)
-{
-    if (orbitAngle < 0.01f && orbitAngle > -0.01f)
-    {
-        return vSrcProjPos;
-    }
-
-    const Vec2 oriVec (vSrcProjPos.x - 0.5f, vSrcProjPos.y - 0.5f);
-    float orbitSin = 0.0f, orbitCos = 0.0f;
-    sincos_tpl(orbitAngle, &orbitSin, &orbitCos);
-    const Vec2 resultVec = Vec2(oriVec.x * orbitCos - oriVec.y * orbitSin, oriVec.y * orbitCos + oriVec.x * orbitSin);
-    return Vec3(resultVec.x + 0.5f, resultVec.y + 0.5f, vSrcProjPos.z);
-}
-
-void COpticsElement::ApplyVSParam_WPosAndSize(CShader* shader, const Vec3& wpos)
-{
-    static CCryNameR wPosAndSizeName("wposAndSize");
-    Vec4 wPosAndSizeParam(wpos, m_globalSize);
-    shader->FXSetVSFloat(wPosAndSizeName, &wPosAndSizeParam, 1);
-}
-
-void COpticsElement::ApplyOcclusionPattern(CShader* shader)
-{
-    if (GetRoot() == NULL)
-    {
-        return;
-    }
-
-    static STexState bilinearTS(FILTER_LINEAR, true);
-
-    CFlareSoftOcclusionQuery* pSoftOcclusionQuery = GetRoot()->GetOcclusionQuery();
-    if (pSoftOcclusionQuery && pSoftOcclusionQuery->GetGatherTexture())
-    {
-        CTexture* pGatherTex = pSoftOcclusionQuery->GetGatherTexture();
-        pGatherTex->Apply(5, CTexture::GetTexState(bilinearTS));
-
-        float x0 = 0, y0 = 0, x1 = 0, y1 = 0;
-        pSoftOcclusionQuery->GetDomainInTexture(x0, y0, x1, y1);
-        float width, height;
-        pSoftOcclusionQuery->GetSectorSize(width, height);
-
-        static CCryNameR occPatternInfoName("occPatternInfo");
-        const Vec4 occPatternInfo((x0 + x1) * 0.5f, (y0 + y1) * 0.5f, width, height);
-        shader->FXSetPSFloat(occPatternInfoName, &occPatternInfo, 1);
-    }
-    else
-    {
-        CTextureManager::Instance()->GetBlackTexture()->Apply(5, CTexture::GetTexState(bilinearTS));
-    }
-}
-
-void COpticsElement::ApplyOcclusionBokehFlag([[maybe_unused]] CShader* shader)
-{
-    if (m_globalOcclusionBokeh)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE3];
-    }
-}
-
-void COpticsElement::ApplySpectrumTexFlag([[maybe_unused]] CShader* shader, bool enabled)
-{
-    if (enabled)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-}
-
-void COpticsElement::ApplyExternTintAndBrightnessVS(CShader* shader, ColorF& cExTint, float fExBrt)
-{
-    static CCryNameR exTintName("externTint");
-    Vec4 exTintParam(cExTint.r * fExBrt, cExTint.g * fExBrt, cExTint.b * fExBrt, cExTint.a);
-    shader->FXSetVSFloat(exTintName, &exTintParam, 1);
-}
-
-void COpticsElement::ApplyVSParam_Xform(CShader* shader, Matrix33& mx33)
-{
-    static CCryNameR xformName("xform");
-    Matrix44 mx44(mx33);
-    mx44.Transpose();
-    shader->FXSetVSFloat(xformName, reinterpret_cast<Vec4*>(mx44.GetData()), 3);
-}
-
-void COpticsElement::ApplyVSParam_Dynamics(CShader* shader, const Vec3& lightProjPos)
-{
-    static CCryNameR dynamicsName("dynamics");
-
-    float fTriggerArea = 1.0f;
-    if (m_bDynamics)
-    {
-        float fRange = 1.0f / max(0.01f, m_fDynamicsRange);
-        float fFalloff = m_fDynamicsFalloff;
-
-        Vec2 vProjPos;
-        vProjPos.x = (lightProjPos.x * 2.f - 1.f) + m_vDynamicsOffset.x;
-        vProjPos.y = (lightProjPos.y * 2.f - 1.f) + m_vDynamicsOffset.y;
-
-        fTriggerArea = vProjPos.GetLength();
-        fTriggerArea = m_bDynamicsInvert ? 1.0f - fTriggerArea : fTriggerArea;
-        fTriggerArea = powf(clamp_tpl(1.f - fTriggerArea * fRange, 0.f, 1.f), fFalloff);
-    }
-
-    Vec4 dynamicsParam(fTriggerArea, 1, 1, 1);
-    shader->FXSetVSFloat(dynamicsName, &dynamicsParam, 1);
-}
-
-void COpticsElement::ApplyGeneralFlags([[maybe_unused]] CShader* shader)
-{
-    if (m_globalAutoRotation)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-    if (m_globalCorrectAspectRatio)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-}
-
-void COpticsElement::ApplyVSParam_LightProjPos(CShader* shader, const Vec3& lightProjPos)
-{
-    static CCryNameR ccrName("lightProjPos");
-    Vec4 lpposParam(lightProjPos.x, lightProjPos.y, lightProjPos.z, 0);
-    shader->FXSetVSFloat(ccrName, &lpposParam, 1);
-}
-
-void COpticsElement::ApplyPSParam_LightProjPos(CShader* shader, const Vec3& lightProjPos)
-{
-    static CCryNameR ccrName("lightProjPos");
-    Vec4 lpposParam(lightProjPos.x, lightProjPos.y, lightProjPos.z, 0);
-    shader->FXSetPSFloat(ccrName, &lpposParam, 1);
-}
-
-void COpticsElement::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsElement.h b/Code/CryEngine/RenderDll/Common/RendElements/OpticsElement.h
deleted file mode 100644
index 7e9cfad6e3..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsElement.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSELEMENT_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSELEMENT_H
-#pragma once
-
-#include "CryString.h"
-#include "Cry_Vector2.h"
-#include "Cry_Vector3.h"
-#include "Cry_Matrix33.h"
-#include "Cry_Color.h"
-#include "IFlares.h"
-
-class CD3D9Renderer;
-class CTexture;
-class RootOpticsElement;
-
-namespace LensOpConst
-{
-    static Vec4 _LO_DEF_VEC4(1.f, 1.f, 1.f, 0.f);
-    static Vec2 _LO_DEF_VEC2(0.f, 0.f);
-    static Vec2 _LO_DEF_VEC2_I(1.f, 1.f);
-    static Vec2 _LO_DEF_ANGLE(-90.f, 90.f);
-    static Matrix33 _LO_DEF_MX33(IDENTITY);
-    static ColorF _LO_DEF_CLR(1.f, 1.f, 1.f, 0.2f);
-    static ColorF _LO_DEF_CLR_BLK(0.f, 0.f, 0.f, 0.0f);
-    static float _LO_MIN(1e-6f);
-}
-
-typedef MFPVariable<IOpticsElementBase> OpticsMFPVariable;
-typedef void (IOpticsElementBase::* Optics_MFPtr)(void);
-
-class COpticsElement
-    : public IOpticsElementBase
-{
-public:
-    struct SAuxParams
-    {
-        float perspectiveShortening;
-        float linearDepth;
-        float distance;
-        float sensorVariationValue;
-        float viewAngleFalloff;
-        bool attachToSun;
-        bool bMultiplyColor;
-        bool bForceRender;
-    };
-
-private:
-    Vec2 xform_scale;
-    Vec2 xform_translate;
-    float xform_rotation;
-
-protected:
-    COpticsElement* m_pParent;
-    Vec2 m_globalMovement;
-    Matrix33 m_globalTransform;
-    ColorF m_globalColor;
-    float m_globalFlareBrightness;
-    float m_globalShaftBrightness;
-    float m_globalSize;
-    float m_globalPerpectiveFactor;
-    float m_globalDistanceFadingFactor;
-    float m_globalOrbitAngle;
-    float m_globalSensorSizeFactor;
-    float m_globalSensorBrightnessFactor;
-    bool m_globalAutoRotation : 1;
-    bool m_globalCorrectAspectRatio : 1;
-    bool m_globalOcclusionBokeh : 1;
-
-    string m_name;
-    bool m_bEnabled : 1;
-
-protected:
-
-    Matrix33 m_mxTransform;
-    float m_fSize;
-    float m_fPerpectiveFactor;
-    float m_fDistanceFadingFactor;
-    ColorF m_Color;
-    float m_fBrightness;
-    Vec2 m_vMovement;
-    float m_fOrbitAngle;
-    float m_fSensorSizeFactor;
-    float m_fSensorBrightnessFactor;
-    Vec2 m_vDynamicsOffset;
-    float m_fDynamicsRange;
-    float m_fDynamicsFalloff;
-    bool m_bAutoRotation : 1;
-    bool m_bCorrectAspectRatio : 1;
-    bool m_bOcclusionBokeh : 1;
-    bool m_bDynamics : 1;
-    bool m_bDynamicsInvert : 1;
-
-#if defined(FLARES_SUPPORT_EDITING)
-    AZStd::vector<FuncVariableGroup> m_paramGroups;
-#endif
-public:
-
-    COpticsElement (const char* name, float size  = 0.3f, const float brightness = 1.0f, const ColorF& color = LensOpConst::_LO_DEF_CLR)
-        : m_pParent(0)
-        , m_bEnabled(true)
-        , m_fPerpectiveFactor(0)
-        , m_globalPerpectiveFactor(1)
-        , m_fOrbitAngle(0)
-        , m_bOcclusionBokeh(false)
-        , m_fSensorSizeFactor(0)
-        , m_fSensorBrightnessFactor(0)
-        , m_fDistanceFadingFactor(1)
-    {
-        m_name = name;
-        m_vMovement = Vec2(1.f, 1.f);
-        m_fSize = size;
-        m_Color = color;
-        m_mxTransform = LensOpConst::_LO_DEF_MX33;
-
-        m_globalMovement = LensOpConst::_LO_DEF_VEC2_I;
-        m_globalTransform = Matrix33::CreateIdentity();
-        m_globalColor.Set(1.f, 1.f, 1.f, 1.f);
-        m_globalFlareBrightness = 1.f;
-        m_globalShaftBrightness = 1.f;
-        m_globalSize = 1;
-        m_fBrightness = brightness;
-        m_bAutoRotation = false;
-        m_bCorrectAspectRatio = true;
-
-        xform_scale.set(1.f, 1.f);
-        xform_rotation = 0.f;
-        xform_translate.set(0.f, 0.f);
-
-        m_bDynamics = false;
-        m_vDynamicsOffset.set(0.f, 0.f);
-        m_fDynamicsRange = 1.f;
-        m_bDynamicsInvert = false;
-        m_fDynamicsFalloff = 1.f;
-    }
-
-    virtual ~COpticsElement()
-    {
-    }
-
-    virtual void Load(IXmlNode* pNode);
-
-    COpticsElement(const COpticsElement& copyFrom)
-    {
-        *this = copyFrom;
-#if defined(FLARES_SUPPORT_EDITING)
-        m_paramGroups.clear();
-#endif
-    }
-
-    IOpticsElementBase* GetParent() const
-    {
-        return m_pParent;
-    }
-
-    RootOpticsElement* GetRoot();
-
-    string GetName() const { return m_name; }
-    void SetName(const char* newName)
-    {
-        m_name = newName;
-    }
-    bool IsEnabled() const { return m_bEnabled; }
-    float GetSize() const { return m_fSize; }
-    float GetPerspectiveFactor() const { return m_fPerpectiveFactor; }
-    float GetDistanceFadingFactor() const { return m_fDistanceFadingFactor; }
-    float GetBrightness() const { return m_fBrightness; }
-    ColorF GetColor() const { return m_Color; }
-    Vec2 GetMovement() const { return m_vMovement; }
-    float GetOrbitAngle() const {return m_fOrbitAngle; }
-    float GetSensorSizeFactor() const { return m_fSensorSizeFactor; }
-    float GetSensorBrightnessFactor() const { return m_fSensorBrightnessFactor; }
-    bool IsOccBokehEnabled() const { return m_bOcclusionBokeh; }
-    bool HasAutoRotation() const { return m_bAutoRotation; }
-    bool HasAspectRatioCorrection() const { return m_bCorrectAspectRatio; }
-
-    void SetEnabled(bool b) override { m_bEnabled = b; }
-    void SetSize(float s) override { m_fSize = s; }
-    void SetPerspectiveFactor(float p) override { m_fPerpectiveFactor = p; }
-    void SetDistanceFadingFactor(float p) override { m_fDistanceFadingFactor = p; }
-    void SetBrightness(float b) override { m_fBrightness = b; }
-    void SetColor(ColorF color) { m_Color = color; Invalidate(); }
-    void SetMovement(Vec2 movement)
-    {
-        m_vMovement = movement;
-        if (fabs(m_vMovement.x) < 0.0001f)
-        {
-            m_vMovement.x = 0.001f;
-        }
-        if (fabs(m_vMovement.y) < 0.0001f)
-        {
-            m_vMovement.y = 0.001f;
-        }
-    }
-    void SetTransform(const Matrix33& xform) override { m_mxTransform = xform; }
-    void SetOccBokehEnabled(bool b) override { m_bOcclusionBokeh = b; }
-    void SetOrbitAngle(float orbitAngle) override { m_fOrbitAngle = orbitAngle; }
-    void SetSensorSizeFactor(float sizeFactor) override { m_fSensorSizeFactor = sizeFactor; }
-    void SetSensorBrightnessFactor(float brtFactor) override { m_fSensorBrightnessFactor = brtFactor; }
-    void SetAutoRotation(bool b) override { m_bAutoRotation = b; }
-    void SetAspectRatioCorrection(bool b) override { m_bCorrectAspectRatio = b; }
-
-    void SetParent(COpticsElement* pParent)
-    {
-        m_pParent = pParent;
-    }
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    bool IsVisible() const
-    {
-        return m_globalColor.a > LensOpConst::_LO_MIN && m_globalFlareBrightness > LensOpConst::_LO_MIN;
-    }
-
-    virtual void Render([[maybe_unused]] SLensFlareRenderParam* pParam, [[maybe_unused]] const Vec3& vPos){assert(0); }
-
-protected:
-    void updateXformMatrix();
-    virtual void Invalidate() {}
-
-public:
-    void SetScale(Vec2 scale)
-    {
-        xform_scale = scale;
-        updateXformMatrix();
-    }
-    void SetRotation(float rot)
-    {
-        xform_rotation = rot;
-        updateXformMatrix();
-    }
-    void SetTranslation(Vec2 xlation)
-    {
-        xform_translate = xlation;
-        updateXformMatrix();
-    }
-    Vec2 GetScale() { return xform_scale; }
-    Vec2 GetTranslation() { return xform_translate; }
-    float GetRotation() { return xform_rotation; }
-
-    void SetDynamicsEnabled(bool enable) { m_bDynamics = enable; }
-    void SetDynamicsOffset(Vec2 offset) { m_vDynamicsOffset = offset; }
-    void SetDynamicsRange(float range)  { m_fDynamicsRange = range; }
-    void SetDynamicsInvert(bool invert) { m_bDynamicsInvert = invert; }
-    void SetDynamicsFalloff(float falloff) { m_fDynamicsFalloff = falloff; }
-
-    bool GetDynamicsEnabled() const { return m_bDynamics; }
-    Vec2 GetDynamicsOffset() const { return m_vDynamicsOffset; }
-    float GetDynamicsRange() const { return m_fDynamicsRange; }
-    bool GetDynamicsInvert() const { return m_bDynamicsInvert; }
-    float GetDynamicsFalloff() const { return m_fDynamicsFalloff; }
-
-    virtual void AddElement([[maybe_unused]] IOpticsElementBase* pElement) {}
-    virtual void InsertElement([[maybe_unused]] int nPos, [[maybe_unused]] IOpticsElementBase* pElement) {}
-    virtual void Remove([[maybe_unused]] int i) {}
-    virtual void RemoveAll() {}
-    virtual int GetElementCount() const {return 0; }
-    virtual IOpticsElementBase* GetElementAt([[maybe_unused]] int  i) const
-    {
-#ifndef RELEASE
-        iLog->Log("ERROR");
-        __debugbreak();
-#endif
-        return 0;
-    }
-
-#if defined(FLARES_SUPPORT_EDITING)
-    virtual AZStd::vector<FuncVariableGroup> GetEditorParamGroups();
-#endif
-
-protected:
-
-#if defined(FLARES_SUPPORT_EDITING)
-    virtual void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-
-public:
-
-    virtual void validateGlobalVars(SAuxParams& aux);
-
-    float computeMovementLocationX(const Vec3& vSrcProjPos)
-    {
-        return (vSrcProjPos.x - 0.5f) * m_globalMovement.x + 0.5f;
-    }
-
-    float computeMovementLocationY(const Vec3& vSrcProjPos)
-    {
-        return (vSrcProjPos.y - 0.5f) * m_globalMovement.y + 0.5f;
-    }
-
-    static const Vec3 computeOrbitPos(const Vec3& vSrcProjPos, float orbitAngle);
-    void ApplyVSParam_WPosAndSize(CShader* shader, const Vec3& wpos);
-
-    void ApplyOcclusionPattern(CShader* shader);
-    void ApplyGeneralFlags(CShader* shader);
-    void ApplyOcclusionBokehFlag(CShader* shader);
-    void ApplySpectrumTexFlag(CShader* shader, bool enabled);
-    void ApplyExternTintAndBrightnessVS(CShader* shader, ColorF& cExTint, float fExBrt);
-    void ApplyVSParam_Xform(CShader* shader, Matrix33& mx33);
-    void ApplyVSParam_Dynamics(CShader* shader, const Vec3& projPos);
-    void ApplyPSParam_LightProjPos(CShader* shader, const Vec3& lightProjPos);
-    void ApplyVSParam_LightProjPos(CShader* shader, const Vec3& lightProjPos);
-
-    void ApplyCommonVSParams(CShader* shader, const Vec3& wpos, const Vec3& lightProjPos)
-    {
-        //If aspect ratio correction is on (default) we want to adjust the global 
-        //transform to re-scale the flare geometry to keep a constant size regardless of 
-        //the window's aspect ratio.
-        //This used to be handled in the shader with params passed from a method ApplyVSParams_ScreenWidthHeight.
-        //But that only applied to ghost flares and why bother doing that per-vertex when we can do it once
-        //per constant buffer.
-        if (HasAspectRatioCorrection())
-        {
-            const float inverseAspectRatio = static_cast<float>(gEnv->pRenderer->GetHeight()) / static_cast<float>(gEnv->pRenderer->GetWidth());
-
-            //Adjust the entire base to avoid warping when rotation is applied
-            const Vec3 adjustedXBasis = m_globalTransform.GetRow(0) * inverseAspectRatio;
-            m_globalTransform.SetRow(0, adjustedXBasis);
-        }
-
-        ApplyVSParam_WPosAndSize(shader, wpos);
-        ApplyVSParam_Xform(shader, m_globalTransform);
-        ApplyVSParam_Dynamics(shader, lightProjPos);
-    }
-
-    virtual EFlareType GetType() { return eFT__Base__; }
-    virtual bool IsGroup() const { return false; }
-
-    virtual void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux) = 0;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSELEMENT_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.cpp b/Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.cpp
deleted file mode 100644
index ab56dcd0e3..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "OpticsFactory.h"
-
-#include "RootOpticsElement.h"
-#include "OpticsElement.h"
-#include "Ghost.h"
-#include "Glow.h"
-#include "ChromaticRing.h"
-#include "CameraOrbs.h"
-#include "IrisShafts.h"
-#include "Streaks.h"
-#include "ImageSpaceShafts.h"
-#include "OpticsReference.h"
-#include "OpticsProxy.h"
-#include "OpticsPredef.hpp"
-
-IOpticsElementBase*  COpticsFactory::Create(EFlareType type) const
-{
-    switch (type)
-    {
-    case eFT_Root:
-        return new RootOpticsElement;
-    case eFT_Group:
-        return new COpticsGroup("[Group]");
-    case eFT_Ghost:
-        return new CLensGhost("Ghost");
-    case eFT_MultiGhosts:
-        return new CMultipleGhost("Multi Ghost");
-    case eFT_Glow:
-        return new Glow("Glow");
-    case eFT_IrisShafts:
-        return new IrisShafts("Iris Shafts");
-    case eFT_ChromaticRing:
-        return new ChromaticRing("Chromatic Ring");
-    case eFT_CameraOrbs:
-        return new CameraOrbs("Orbs");
-    case eFT_ImageSpaceShafts:
-        return new ImageSpaceShafts("Vol Shafts");
-    case eFT_Streaks:
-        return new Streaks("Streaks");
-    case eFT_Reference:
-        return new COpticsReference("Reference");
-    case eFT_Proxy:
-        return new COpticsProxy("Proxy");
-    default:
-        return NULL;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.h b/Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.h
deleted file mode 100644
index ce92dd30a5..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSFACTORY_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSFACTORY_H
-#pragma once
-
-#include "IFlares.h"
-
-class COpticsFactory
-{
-private:
-    COpticsFactory(){}
-
-public:
-    static COpticsFactory* GetInstance()
-    {
-        static COpticsFactory instance;
-        return &instance;
-    }
-
-    IOpticsElementBase* Create(EFlareType type) const;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSFACTORY_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsGroup.cpp b/Code/CryEngine/RenderDll/Common/RendElements/OpticsGroup.cpp
deleted file mode 100644
index 2efbe07696..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsGroup.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "../CryNameR.h"
-#include "../../XRenderD3D9/DriverD3D.h"
-#include "../Textures/Texture.h"
-#include "OpticsGroup.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&COpticsGroup::FUNC_NAME)
-void COpticsGroup::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-}
-#undef MFPtr
-#endif
-
-void COpticsGroup::_init()
-{
-    SetSize(1.f);
-    SetAutoRotation(true);
-}
-
-COpticsGroup::COpticsGroup(const char* name, COpticsElement* ghost, ...)
-    : COpticsElement(name)
-{
-    _init();
-
-    va_list arg;
-    va_start(arg, ghost);
-
-    COpticsElement* curArg;
-    while ((curArg = va_arg(arg, COpticsElement*)) != NULL)
-    {
-        Add(curArg);
-    }
-
-    va_end(arg);
-}
-
-COpticsGroup& COpticsGroup::Add(IOpticsElementBase* pElement)
-{
-    children.push_back(pElement);
-    ((COpticsElement*)&*pElement)->SetParent(this);
-    return *this;
-}
-
-void COpticsGroup::InsertElement(int nPos, IOpticsElementBase* pElement)
-{
-    children.insert(children.begin() + nPos, pElement);
-    ((COpticsElement*)&*pElement)->SetParent(this);
-}
-
-void COpticsGroup::Remove(int i)
-{
-    children.erase(children.begin() + i);
-}
-
-void COpticsGroup::RemoveAll()
-{
-    children.clear();
-}
-
-int COpticsGroup::GetElementCount() const { return children.size(); }
-
-IOpticsElementBase* COpticsGroup::GetElementAt(int i) const { return children.at(i);  }
-
-void COpticsGroup::SetElementAt(int i, IOpticsElementBase* elem)
-{
-    if (i < 0 || i > GetElementCount())
-    {
-        return;
-    }
-    children[i] = elem;
-    ((COpticsElement*)&*children[i])->SetParent(this);
-}
-
-void COpticsGroup::validateGlobalVars(SAuxParams& aux)
-{
-    COpticsElement::validateGlobalVars(aux);
-    validateChildrenGlobalVars(aux);
-}
-void COpticsGroup::validateChildrenGlobalVars(SAuxParams& aux)
-{
-    for (uint i = 0; i < children.size(); i++)
-    {
-        ((COpticsElement*)GetElementAt(i))->validateGlobalVars(aux);
-    }
-}
-
-void COpticsGroup::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux)
-{
-    PROFILE_LABEL_SCOPE("LensEfxGroup");
-
-    for (uint i = 0; i < children.size(); i++)
-    {
-        if (GetElementAt(i)->IsEnabled())
-        {
-            ((COpticsElement*)GetElementAt(i))->Render(shader, vSrcWorldPos, vSrcProjPos, aux);
-        }
-    }
-}
-
-void COpticsGroup::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    for (int i = 0, iChildSize(children.size()); i < iChildSize; ++i)
-    {
-        children[i]->GetMemoryUsage(pSizer);
-    }
-    pSizer->AddObject(this, sizeof(*this));
-}
-
-void COpticsGroup::Invalidate()
-{
-    for (int i = 0, iChildSize(children.size()); i < iChildSize; ++i)
-    {
-        children[i]->Invalidate();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsGroup.h b/Code/CryEngine/RenderDll/Common/RendElements/OpticsGroup.h
deleted file mode 100644
index 61a6ae0178..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsGroup.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSGROUP_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSGROUP_H
-#pragma once
-
-#include "OpticsElement.h"
-
-class COpticsGroup
-    : public COpticsElement
-{
-protected:
-    std::vector<IOpticsElementBasePtr> children;
-    void _init();
-
-public:
-
-    COpticsGroup(const char* name = "[Unnamed_Group]")
-        : COpticsElement(name) { _init(); };
-    COpticsGroup(const char* name, COpticsElement* elem, ...);
-    virtual ~COpticsGroup(){}
-
-    COpticsGroup& Add(IOpticsElementBase* pElement);
-    void Remove(int i);
-    void RemoveAll();
-    virtual int GetElementCount() const;
-    IOpticsElementBase* GetElementAt(int  i) const;
-
-    void AddElement(IOpticsElementBase* pElement) {   Add(pElement);    }
-    void InsertElement(int nPos, IOpticsElementBase* pElement);
-    void SetElementAt(int i, IOpticsElementBase* elem);
-    void Invalidate();
-
-    bool IsGroup() const { return true; }
-    void validateChildrenGlobalVars(SAuxParams& aux);
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual EFlareType GetType() { return eFT_Group; }
-    virtual void validateGlobalVars(SAuxParams& aux);
-
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-
-#if defined(FLARES_SUPPORT_EDITING)
-    virtual void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-
-public:
-    static COpticsGroup predef_simpleCamGhost;
-    static COpticsGroup predef_cheapCamGhost;
-    static COpticsGroup predef_multiGlassGhost;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSGROUP_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsPredef.hpp b/Code/CryEngine/RenderDll/Common/RendElements/OpticsPredef.hpp
deleted file mode 100644
index 791fc42d46..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsPredef.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "OpticsElement.h"
-#include "RootOpticsElement.h"
-#include "Ghost.h"
-#include "Glow.h"
-#include "ChromaticRing.h"
-#include "IrisShafts.h"
-#include "Streaks.h"
-#include "CameraOrbs.h"
-
-class OpticsPredef
-{
-public:
-    COpticsGroup PREDEF_MULTIGLASS_GHOST;
-
-private:
-    void InitPredef()
-    {
-        static CTexture* s_pCenterFlare = CTexture::ForName("EngineAssets/Textures/flares/lens_flare1-wide.tif",  FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown);
-
-        PREDEF_MULTIGLASS_GHOST.SetName("[Multi-glass Reflection]");
-
-        Glow* rotStreak = new Glow("RotatingStreak");
-        rotStreak->SetSize(0.28f);
-        rotStreak->SetAutoRotation(true);
-        rotStreak->SetFocusFactor(-0.18f);
-        rotStreak->SetBrightness(6.f);
-        rotStreak->SetScale(Vec2(0.034f, 25.f));
-        PREDEF_MULTIGLASS_GHOST.Add(rotStreak);
-
-        CameraOrbs* orbs = new CameraOrbs("Orbs");
-        orbs->SetIllumRange(1.2f);
-        orbs->SetUseLensTex(true);
-        PREDEF_MULTIGLASS_GHOST.Add(orbs);
-
-        ChromaticRing* ring = new ChromaticRing("Forward Ring");
-        PREDEF_MULTIGLASS_GHOST.Add(ring);
-
-        ChromaticRing* backRing = new ChromaticRing("Backward Ring");
-        backRing->SetCompletionFading(10.f);
-        backRing->SetCompletionSpanAngle(25.f);
-        PREDEF_MULTIGLASS_GHOST.Add(backRing);
-
-        CLensGhost* centerCorona = new CLensGhost("Center Corona");
-        centerCorona->SetTexture(s_pCenterFlare);
-        centerCorona->SetSize(0.6f);
-        PREDEF_MULTIGLASS_GHOST.Add(centerCorona);
-    }
-    OpticsPredef()
-    {
-        InitPredef();
-    }
-
-    OpticsPredef(OpticsPredef const& copy);
-    void operator=(OpticsPredef const& copy);
-
-public:
-    static OpticsPredef* GetInstance()
-    {
-        static OpticsPredef instance;
-        return &instance;
-    }
-};
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsProxy.cpp b/Code/CryEngine/RenderDll/Common/RendElements/OpticsProxy.cpp
deleted file mode 100644
index 20a9033622..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsProxy.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "OpticsProxy.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-AZStd::vector<FuncVariableGroup> COpticsProxy::GetEditorParamGroups()
-{
-    return AZStd::vector<FuncVariableGroup>();
-}
-#endif
-
-COpticsProxy::COpticsProxy(const char* name)
-    : m_bEnable(false)
-    , m_name(name)
-    , m_pOpticsReference(NULL)
-{
-}
-
-void COpticsProxy::Load(IXmlNode* pNode)
-{
-    XmlNodeRef pProxy = pNode->findChild("Proxy");
-    if (pProxy)
-    {
-        const char* referenceName(NULL);
-        if (pProxy->getAttr("Reference", &referenceName))
-        {
-            if (referenceName && referenceName[0])
-            {
-                int nReferenceIndex(-1);
-                if (gEnv->pOpticsManager->Load(referenceName, nReferenceIndex))
-                {
-                    IOpticsElementBase* pOptics = gEnv->pOpticsManager->GetOptics(nReferenceIndex);
-                    if (pOptics->GetType() == eFT_Reference)
-                    {
-                        m_pOpticsReference = (COpticsReference*)gEnv->pOpticsManager->GetOptics(nReferenceIndex);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void COpticsProxy::GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-{
-}
-
-void COpticsProxy::Invalidate()
-{
-}
-
-void COpticsProxy::Render(SLensFlareRenderParam* pParam, const Vec3& vPos)
-{
-    if (m_pOpticsReference)
-    {
-        m_pOpticsReference->Render(pParam, vPos);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsProxy.h b/Code/CryEngine/RenderDll/Common/RendElements/OpticsProxy.h
deleted file mode 100644
index e21f5eb3a6..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsProxy.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSPROXY_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSPROXY_H
-#pragma once
-
-#include "OpticsReference.h"
-
-class COpticsProxy
-    : public IOpticsElementBase
-{
-public:
-
-    COpticsProxy(const char* name);
-    ~COpticsProxy(){}
-
-    EFlareType GetType()    {       return eFT_Proxy;   }
-    bool IsGroup() const    {       return false;   }
-
-    string GetName() const  {   return m_name;  }
-    void SetName(const char* ch_name)   {   m_name = ch_name;   }
-    void Load(IXmlNode* pNode);
-
-    IOpticsElementBase* GetParent() const   {   return NULL;    }
-
-    bool IsEnabled() const  {   return m_bEnable;   }
-    void SetEnabled(bool b) { m_bEnable = b;        }
-
-    void AddElement([[maybe_unused]] IOpticsElementBase* pElement)   {}
-    void InsertElement([[maybe_unused]] int nPos, [[maybe_unused]] IOpticsElementBase* pElement) {}
-    void Remove([[maybe_unused]] int i)    {}
-    void RemoveAll() {}
-    int GetElementCount() const {   return 0;   }
-    IOpticsElementBase* GetElementAt([[maybe_unused]] int  i) const    {   return NULL;    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    void Invalidate();
-
-    void Render(SLensFlareRenderParam* pParam, const Vec3& vPos);
-
-    void SetOpticsReference(IOpticsElementBase* pReference)
-    {
-        if (pReference->GetType() == eFT_Reference)
-        {
-            m_pOpticsReference = (COpticsReference*)pReference;
-        }
-    }
-    IOpticsElementBase* GetOpticsReference() const
-    {
-        return m_pOpticsReference;
-    }
-#if defined(FLARES_SUPPORT_EDITING)
-    AZStd::vector<FuncVariableGroup> GetEditorParamGroups();
-#endif
-
-public:
-
-    bool m_bEnable;
-    string m_name;
-    _smart_ptr<COpticsReference> m_pOpticsReference;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSPROXY_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsReference.cpp b/Code/CryEngine/RenderDll/Common/RendElements/OpticsReference.cpp
deleted file mode 100644
index d93b5a17b0..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsReference.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "OpticsReference.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-AZStd::vector<FuncVariableGroup> COpticsReference::GetEditorParamGroups()
-{
-    return AZStd::vector<FuncVariableGroup>();
-}
-#endif
-
-COpticsReference::COpticsReference(const char* name)
-    : m_name(name)
-{
-}
-
-void COpticsReference::Load([[maybe_unused]] IXmlNode* pNode)
-{
-}
-
-void COpticsReference::AddElement(IOpticsElementBase* pElement)
-{
-    m_OpticsList.push_back(pElement);
-}
-
-void COpticsReference::InsertElement(int nPos, IOpticsElementBase* pElement)
-{
-    if (nPos < 0 || nPos >= (int)m_OpticsList.size())
-    {
-        return;
-    }
-    m_OpticsList.insert(m_OpticsList.begin() + nPos, pElement);
-}
-
-void COpticsReference::Remove(int i)
-{
-    if (i < 0 || i >= (int)m_OpticsList.size())
-    {
-        return;
-    }
-    m_OpticsList.erase(m_OpticsList.begin() + i);
-}
-
-void COpticsReference::RemoveAll()
-{
-    m_OpticsList.clear();
-}
-
-int COpticsReference::GetElementCount() const
-{
-    return m_OpticsList.size();
-}
-
-IOpticsElementBase* COpticsReference::GetElementAt(int  i) const
-{
-    if (i < 0 || i >= (int)m_OpticsList.size())
-    {
-        return NULL;
-    }
-    return m_OpticsList[i];
-}
-
-void COpticsReference::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    for (int i = 0, iSize(m_OpticsList.size()); i < iSize; ++i)
-    {
-        m_OpticsList[i]->GetMemoryUsage(pSizer);
-    }
-}
-
-void COpticsReference::Invalidate()
-{
-    for (int i = 0, iSize(m_OpticsList.size()); i < iSize; ++i)
-    {
-        m_OpticsList[i]->Invalidate();
-    }
-}
-
-void COpticsReference::Render(SLensFlareRenderParam* pParam, const Vec3& vPos)
-{
-    for (int i = 0, iSize(m_OpticsList.size()); i < iSize; ++i)
-    {
-        m_OpticsList[i]->Render(pParam, vPos);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/OpticsReference.h b/Code/CryEngine/RenderDll/Common/RendElements/OpticsReference.h
deleted file mode 100644
index 0c8db4d7d0..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/OpticsReference.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSREFERENCE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSREFERENCE_H
-#pragma once
-
-#include "IFlares.h"
-
-class COpticsReference
-    : public IOpticsElementBase
-{
-public:
-
-#if defined(FLARES_SUPPORT_EDITING)
-    AZStd::vector<FuncVariableGroup> GetEditorParamGroups();
-#endif
-
-    COpticsReference(const char* name);
-    ~COpticsReference(){}
-
-    EFlareType GetType()    {       return eFT_Reference;   }
-    bool IsGroup() const    {       return false;   }
-
-    string GetName() const  {   return m_name;  }
-    void SetName(const char* ch_name)   {   m_name = ch_name; }
-    void Load(IXmlNode* pNode);
-
-    IOpticsElementBase* GetParent() const   {   return NULL;    }
-
-    bool IsEnabled() const  {       return true;    }
-    void SetEnabled([[maybe_unused]] bool b) {}
-    void AddElement(IOpticsElementBase* pElement);
-    void InsertElement(int nPos, IOpticsElementBase* pElement);
-    void Remove(int i);
-    void RemoveAll();
-    int GetElementCount() const;
-    IOpticsElementBase* GetElementAt(int  i) const;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    void Invalidate();
-
-    void Render(SLensFlareRenderParam* pParam, const Vec3& vPos);
-
-public:
-    string m_name;
-    std::vector<IOpticsElementBasePtr> m_OpticsList;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_OPTICSREFERENCE_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/RendElement.cpp b/Code/CryEngine/RenderDll/Common/RendElements/RendElement.cpp
deleted file mode 100644
index c0e83ac804..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/RendElement.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : common RE functions.
-
-
-#include "RenderDll_precompiled.h"
-
-//TArray<CRendElementBase *> CRendElementBase::m_AllREs;
-
-CRendElement CRendElement::m_RootGlobal;
-CRendElement CRendElement::m_RootRelease[4];
-
-//===============================================================
-
-CryCriticalSection m_sREResLock;
-
-//============================================================================
-
-void CRendElement::ShutDown()
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_releaseallresourcesonexit)
-    {
-        return;
-    }
-
-    AUTO_LOCK(m_sREResLock); // Not thread safe without this
-
-    CRendElement* pRE;
-    CRendElement* pRENext;
-    for (pRE = CRendElement::m_RootGlobal.m_NextGlobal; pRE != &CRendElement::m_RootGlobal; pRE = pRENext)
-    {
-        pRENext = pRE->m_NextGlobal;
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_printmemoryleaks)
-        {
-            iLog->Log("Warning: CRendElementBase::ShutDown: RenderElement %s was not deleted", pRE->mfTypeString());
-        }
-        pRE->Release();
-    }
-}
-
-void CRendElement::Tick()
-{
-#ifndef STRIP_RENDER_THREAD
-    assert(gRenDev->m_pRT->IsMainThread(true));
-#endif
-    int nFrameID = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-    int nFrame = nFrameID - 3;
-    CRendElement& Root = CRendElement::m_RootRelease[nFrame & 3];
-    CRendElement* pRENext = NULL;
-
-    for (CRendElement* pRE = Root.m_NextGlobal; pRE != &Root; pRE = pRENext)
-    {
-        pRENext = pRE->m_NextGlobal;
-        SAFE_DELETE(pRE);
-    }
-}
-
-void CRendElement::Cleanup()
-{
-    gRenDev->m_pRT->FlushAndWait();
-
-    AUTO_LOCK(m_sREResLock); // Not thread safe without this
-
-    for (int i = 0; i < 4; ++i)
-    {
-        CRendElement& Root = CRendElement::m_RootRelease[i];
-        CRendElement* pRENext = NULL;
-
-        for (CRendElement* pRE = Root.m_NextGlobal; pRE != &Root; pRE = pRENext)
-        {
-            pRENext = pRE->m_NextGlobal;
-            SAFE_DELETE(pRE);
-        }
-    }
-}
-
-CRendElement::CRendElement()
-{
-    m_Type = eDATA_Unknown;
-    if (!m_RootGlobal.m_NextGlobal)
-    {
-        m_RootGlobal.m_NextGlobal = &m_RootGlobal;
-        m_RootGlobal.m_PrevGlobal = &m_RootGlobal;
-        for (int i = 0; i < 4; i++)
-        {
-            m_RootRelease[i].m_NextGlobal = &m_RootRelease[i];
-            m_RootRelease[i].m_PrevGlobal = &m_RootRelease[i];
-        }
-    }
-}
-
-
-CRendElement::~CRendElement()
-{
-    assert(m_Type == eDATA_Unknown || m_Type == eDATA_Particle || m_Type == eDATA_GPUParticle || m_Type == eDATA_Gem || m_Type == eDATA_VolumeObject);
-
-    //@TODO: Fix later, prevent crash on exit in single executable
-    if (this == &m_RootRelease[0] || this == &m_RootRelease[1] || this == &m_RootRelease[2] || this == &m_RootRelease[3] || this == &m_RootGlobal)
-    {
-        return;
-    }
-
-    AUTO_LOCK(m_sREResLock);
-    UnlinkGlobal();
-}
-
-void CRendElement::Release(bool bForce)
-{
-    CRendElementBase* pThis = (CRendElementBase*)this;
-    pThis->m_Flags |= FCEF_DELETED;
-
-    m_Type = eDATA_Unknown;
-    if (bForce)
-    {
-        delete this;
-        return;
-    }
-    int nFrame = gRenDev->GetFrameID(false);
-
-    AUTO_LOCK(m_sREResLock);
-    CRendElement& Root = CRendElement::m_RootRelease[nFrame & 3];
-    UnlinkGlobal();
-    LinkGlobal(&Root);
-}
-
-CRendElementBase::CRendElementBase()
-{
-    m_Flags = 0;
-    m_nFrameUpdated = 0xffff;
-    m_CustomData = NULL;
-    m_NextGlobal = NULL;
-    m_PrevGlobal = NULL;
-    int i;
-    for (i = 0; i < MAX_CUSTOM_TEX_BINDS_NUM; i++)
-    {
-        m_CustomTexBind[i] = -1;
-    }
-
-    AUTO_LOCK(m_sREResLock);
-    LinkGlobal(&m_RootGlobal);
-}
-CRendElementBase::~CRendElementBase()
-{
-    if ((m_Flags & FCEF_ALLOC_CUST_FLOAT_DATA) && m_CustomData)
-    {
-        delete [] ((float*)m_CustomData);
-        m_CustomData = 0;
-    }
-}
-
-const char* CRendElement::mfTypeString()
-{
-    switch (m_Type)
-    {
-    case eDATA_Sky:
-        return "Sky";
-    case eDATA_Beam:
-        return "Beam";
-    case eDATA_ClientPoly:
-        return "ClientPoly";
-    case eDATA_Flare:
-        return "Flare";
-    case eDATA_Terrain:
-        return "Terrain";
-    case eDATA_SkyZone:
-        return "SkyZone";
-    case eDATA_Mesh:
-        return "Mesh";
-    case eDATA_Imposter:
-        return "Imposter";
-    case eDATA_LensOptics:
-        return "LensOptics";
-    case eDATA_OcclusionQuery:
-        return "OcclusionQuery";
-    case eDATA_Particle:
-        return "Particle";
-    case eDATA_GPUParticle:
-        return "GPUParticle";
-    case eDATA_PostProcess:
-        return "PostProcess";
-    case eDATA_HDRProcess:
-        return "HDRProcess";
-    case eDATA_Cloud:
-        return "Cloud";
-    case eDATA_HDRSky:
-        return "HDRSky";
-    case eDATA_FogVolume:
-        return "FogVolume";
-    case eDATA_WaterVolume:
-        return "WaterVolume";
-    case eDATA_WaterOcean:
-        return "WaterOcean";
-    case eDATA_VolumeObject:
-        return "VolumeObject";
-    case eDATA_PrismObject:
-        return "PrismObject";
-    case eDATA_DeferredShading:
-        return "DeferredShading";
-    case eDATA_GameEffect:
-        return "GameEffect";
-    case eDATA_BreakableGlass:
-        return "BreakableGlass";
-    case eDATA_GeomCache:
-        return "GeomCache";
-    case eDATA_Gem:
-        return "Gem";
-    default:
-    {
-        CRY_ASSERT(false);
-        return "Unknown";
-    }
-    }
-}
-
-CRendElementBase* CRendElementBase::mfCopyConstruct(void)
-{
-    CRendElementBase* re = new CRendElementBase;
-    *re = *this;
-    return re;
-}
-void CRendElementBase::mfCenter(Vec3& centr, [[maybe_unused]] CRenderObject* pObj)
-{
-    centr(0, 0, 0);
-}
-void CRendElementBase::mfGetPlane(Plane& pl)
-{
-    pl.n = Vec3(0, 0, 1);
-    pl.d = 0;
-}
-
-//=============================================================================
-
-void* SRendItem::mfGetPointerCommon(ESrcPointer ePT, int* Stride, [[maybe_unused]] EParamType Type, [[maybe_unused]] ESrcPointer Dst, [[maybe_unused]] int Flags)
-{
-    int j;
-    switch (ePT)
-    {
-    case eSrcPointer_Vert:
-        *Stride = gRenDev->m_RP.m_StreamStride;
-        return gRenDev->m_RP.m_StreamPtr.PtrB;
-
-    case eSrcPointer_Color:
-        *Stride = gRenDev->m_RP.m_StreamStride;
-        return gRenDev->m_RP.m_StreamPtr.PtrB + gRenDev->m_RP.m_StreamOffsetColor;
-
-    case eSrcPointer_Tex:
-    case eSrcPointer_TexLM:
-        *Stride = gRenDev->m_RP.m_StreamStride;
-        j = ePT - eSrcPointer_Tex;
-        return gRenDev->m_RP.m_StreamPtr.PtrB + gRenDev->m_RP.m_StreamOffsetTC + j * 16;
-    }
-    return NULL;
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/RootOpticsElement.cpp b/Code/CryEngine/RenderDll/Common/RendElements/RootOpticsElement.cpp
deleted file mode 100644
index 3ca6e4e8a6..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/RootOpticsElement.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "RootOpticsElement.h"
-#include "FlareSoftOcclusionQuery.h"
-#include "../Textures/Texture.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "stdarg.h"
-
-enum EVisFader
-{
-    VISFADER_FLARE = 0,
-    VISFADER_SHAFT,
-    VISFADER_NUM
-};
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&RootOpticsElement::FUNC_NAME)
-void  RootOpticsElement::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsGroup::InitEditorParamGroups(groups);
-
-    FuncVariableGroup rootGroup;
-    rootGroup.SetName("GlobalSettings", "Global Settings");
-    rootGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable Occlusion", "Enable Occlusion", this, MFPtr(SetOcclusionEnabled), MFPtr(IsOcclusionEnabled)));
-    rootGroup.AddVariable(new OpticsMFPVariable(e_VEC2, "Occlusion Size", "The size for occlusion plane", this, MFPtr(SetOccSize), MFPtr(GetOccSize)));
-    rootGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Flare fade time", "The duration of flare afterimage fading in seconds", this, MFPtr(SetFlareFadingDuration), MFPtr(GetFlareFadingDuration)));
-    rootGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Shaft fade time", "The duration of shaft afterimage fading in seconds", this, MFPtr(SetShaftFadingDuration), MFPtr(GetShaftFadingDuration)));
-    rootGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Affected by light color", "light color can affect flare color", this, MFPtr(SetAffectedByLightColor), MFPtr(IsAffectedByLightColor)));
-    rootGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Affected by light radius", "light radius can affect flare fading", this, MFPtr(SetAffectedByLightRadius), MFPtr(IsAffectedByLightRadius)));
-    rootGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Affected by light FOV", "light projection FOV can affect flare fading", this, MFPtr(SetAffectedByLightFOV), MFPtr(IsAffectedByLightFOV)));
-    rootGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Multiply Color", "Select one of between Multiply and Addition about color calculation. If true, Multiply will be chosen.", this, MFPtr(SetMultiplyColor), MFPtr(IsMultiplyColor)));
-    groups.push_back(rootGroup);
-
-    FuncVariableGroup sensorGroup;
-    sensorGroup.SetName("Sensor");
-    sensorGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Custom Sensor Variation Map", "Enable Custom Sensor Variation Map", this, MFPtr(SetCustomSensorVariationMapEnabled), MFPtr(IsCustomSensorVariationMapEnabled)));
-    sensorGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Effective Sensor Size", "The size of image-able part of the sensor", this, MFPtr(SetEffectiveSensorSize), MFPtr(GetEffectiveSensorSize)));
-    groups.push_back(sensorGroup);
-}
-#undef MFPtr
-#endif
-
-void RootOpticsElement::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pGloabalSettingsNode = pNode->findChild("GlobalSettings");
-    if (pGloabalSettingsNode)
-    {
-        bool bOcclusionEnabled(m_bOcclusionEnabled);
-        if (pGloabalSettingsNode->getAttr("EnableOcclusion", bOcclusionEnabled))
-        {
-            SetOcclusionEnabled(bOcclusionEnabled);
-        }
-
-        Vec2 occlusionSize(m_OcclusionSize);
-        if (pGloabalSettingsNode->getAttr("OcclusionSize", occlusionSize))
-        {
-            SetOccSize(occlusionSize);
-        }
-
-        float fFlareTimelineDuration(m_fFlareTimelineDuration);
-        if (pGloabalSettingsNode->getAttr("Flarefadetime", fFlareTimelineDuration))
-        {
-            SetFlareFadingDuration(fFlareTimelineDuration);
-        }
-
-        float fShaftTimelineDuration(m_fShaftTimelineDuration);
-        if (pGloabalSettingsNode->getAttr("Flarefadetime", fShaftTimelineDuration))
-        {
-            SetShaftFadingDuration(fShaftTimelineDuration);
-        }
-
-        bool bAffectedByLightColor(m_bAffectedByLightColor);
-        if (pGloabalSettingsNode->getAttr("Affectedbylightcolor", bAffectedByLightColor))
-        {
-            SetAffectedByLightColor(bAffectedByLightColor);
-        }
-
-        bool bAffectedByLightRadius(m_bAffectedByLightRadius);
-        if (pGloabalSettingsNode->getAttr("Affectedbylightradius", bAffectedByLightRadius))
-        {
-            SetAffectedByLightRadius(bAffectedByLightRadius);
-        }
-
-        bool bAffectedByLightFOV(m_bAffectedByLightFOV);
-        if (pGloabalSettingsNode->getAttr("AffectedbylightFOV", bAffectedByLightFOV))
-        {
-            SetAffectedByLightFOV(bAffectedByLightFOV);
-        }
-
-        bool bMultiplyColor(m_bMultiplyColor);
-        if (pGloabalSettingsNode->getAttr("MultiplyColor", bMultiplyColor))
-        {
-            SetMultiplyColor(bMultiplyColor);
-        }
-    }
-
-    XmlNodeRef pSensorNode = pNode->findChild("Sensor");
-    if (pSensorNode)
-    {
-        bool bCustomSensorVariationMap(m_bCustomSensorVariationMap);
-        if (pSensorNode->getAttr("CustomSensorVariationMap", bCustomSensorVariationMap))
-        {
-            SetCustomSensorVariationMapEnabled(bCustomSensorVariationMap);
-        }
-
-        float fEffectiveSensorSize(m_fEffectiveSensorSize);
-        if (pSensorNode->getAttr("EffectiveSensorSize", fEffectiveSensorSize))
-        {
-            SetEffectiveSensorSize(fEffectiveSensorSize);
-        }
-    }
-}
-
-void RootOpticsElement::SetOcclusionQuery(CFlareSoftOcclusionQuery* query)
-{
-    m_pOccQuery = query;
-}
-
-float RootOpticsElement::GetFlareVisibilityFactor() const
-{
-    CSoftOcclusionVisiblityFader* pFader = m_pOccQuery ? m_pOccQuery->GetVisibilityFader(VISFADER_FLARE) : NULL;
-    return pFader ? pFader->m_fVisibilityFactor : 0.0f;
-}
-
-float RootOpticsElement::GetShaftVisibilityFactor() const
-{
-    CSoftOcclusionVisiblityFader* pFader = m_pOccQuery ? m_pOccQuery->GetVisibilityFader(VISFADER_SHAFT) : NULL;
-    return pFader ? pFader->m_fVisibilityFactor : 0.0f;
-}
-
-void RootOpticsElement::SetVisibilityFactor(float f)
-{
-    f = clamp_tpl(f, 0.f, 1.f);
-
-    if (m_pOccQuery)
-    {
-        for (uint i = 0; i < VISFADER_NUM; ++i)
-        {
-            if (CSoftOcclusionVisiblityFader* pFader = m_pOccQuery->GetVisibilityFader(i))
-            {
-                pFader->m_fVisibilityFactor = f;
-            }
-        }
-    }
-}
-
-CTexture* RootOpticsElement::GetOcclusionPattern()
-{
-    return m_pOccQuery->GetGatherTexture();
-}
-
-void RootOpticsElement::validateGlobalVars(SAuxParams& aux)
-{
-    m_globalPerpectiveFactor = m_fPerpectiveFactor;
-    m_globalDistanceFadingFactor = m_flareLight.m_bAttachToSun ? 0.0f : m_fDistanceFadingFactor;
-    m_globalSensorBrightnessFactor = m_fSensorBrightnessFactor;
-    m_globalSensorSizeFactor = m_fSensorSizeFactor;
-    m_globalSize = m_fSize;
-    m_globalFlareBrightness = GetBrightness();
-    m_globalMovement = m_vMovement;
-
-    if (m_bAffectedByLightColor)
-    {
-        if (aux.bMultiplyColor)
-        {
-            m_globalColor = ColorF(m_Color.r * m_flareLight.m_cLdrClr.r, m_Color.g * m_flareLight.m_cLdrClr.g, m_Color.b * m_flareLight.m_cLdrClr.b, m_Color.a);
-        }
-        else
-        {
-            m_globalColor = ColorF(m_Color.r + m_flareLight.m_cLdrClr.r, m_Color.g + m_flareLight.m_cLdrClr.g, m_Color.b + m_flareLight.m_cLdrClr.b, m_Color.a);
-        }
-
-        m_globalFlareBrightness *= m_flareLight.m_fClrMultiplier;
-    }
-    else
-    {
-        m_globalColor = m_Color;
-    }
-
-    if (m_bAffectedByLightRadius)
-    {
-        m_globalFlareBrightness *= clamp_tpl(1 - aux.distance / m_flareLight.m_fRadius, 0.0f, 1.0f);
-    }
-
-    if (m_bAffectedByLightFOV)
-    {
-        m_globalFlareBrightness *= aux.viewAngleFalloff;
-    }
-
-    float fShaftVisibilityFactor = aux.bForceRender ? 1.0f : GetShaftVisibilityFactor();
-    float fFlareVisibilityFactor = aux.bForceRender ? 1.0f : GetFlareVisibilityFactor();
-
-    m_globalShaftBrightness = m_globalFlareBrightness * fShaftVisibilityFactor;
-    m_globalFlareBrightness *= fFlareVisibilityFactor;
-
-    m_globalOcclusionBokeh = m_bOcclusionBokeh & IsOcclusionEnabled();
-    m_globalCorrectAspectRatio = m_globalCorrectAspectRatio;
-    m_globalAutoRotation = m_globalAutoRotation;
-    m_globalOrbitAngle = m_fOrbitAngle;
-    m_globalTransform = m_mxTransform;
-
-    COpticsGroup::validateChildrenGlobalVars(aux);
-}
-
-void RootOpticsElement::Render(SLensFlareRenderParam* pParam, const Vec3& vPos)
-{
-    if (pParam == NULL)
-    {
-        return;
-    }
-
-    if (!pParam->IsValid())
-    {
-        return;
-    }
-
-    SFlareLight light;
-    light.m_vPos = vPos;
-    light.m_fRadius = 10000.0f;
-    light.m_bAttachToSun = false;
-    light.m_cLdrClr = ColorF(1, 1, 1, 1);
-    light.m_fClrMultiplier = 1;
-    light.m_fViewAngleFalloff = 1;
-
-    ProcessAll((CShader*)pParam->pShader, light, true, pParam->pCamera);
-}
-
-bool RootOpticsElement::ProcessAll(CShader* shader, SFlareLight& light, bool bForceRender, CCamera* pCamera)
-{
-    CD3D9Renderer* pRD = gcpRendD3D;
-
-    Vec3 vSrcWorldPos = light.m_vPos;
-    Vec3 vSrcProjPos;
-
-    m_flareLight = light;
-    float linearDepth = 0;
-    float distance = 0;
-
-    if (pCamera)
-    {
-        Matrix44A mProj, mView;
-        mathMatrixPerspectiveFov(&mProj, pCamera->GetFov(), pCamera->GetProjRatio(), pCamera->GetNearPlane(), pCamera->GetFarPlane());
-        mathMatrixLookAt(&mView, pCamera->GetPosition(), pCamera->GetPosition() + pCamera->GetViewdir(), Vec3(0, 0, 1));
-        if (!CFlareSoftOcclusionQuery::ComputeProjPos(vSrcWorldPos, mView, mProj, vSrcProjPos))
-        {
-            return false;
-        }
-        linearDepth = clamp_tpl(CFlareSoftOcclusionQuery::ComputeLinearDepth(vSrcWorldPos, mView, pCamera->GetNearPlane(), pCamera->GetFarPlane()), -1.0f, 0.99f);
-        distance = mView.GetTranslation().GetDistance(vSrcWorldPos);
-    }
-    else
-    {
-        if (!CFlareSoftOcclusionQuery::ComputeProjPos(vSrcWorldPos, pRD->m_ViewMatrix, pRD->m_ProjMatrix, vSrcProjPos))
-        {
-            return false;
-        }
-
-        if (pRD->m_RP.m_TI[pRD->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-        {
-            vSrcProjPos.z = 1.0f - vSrcProjPos.z;
-        }
-
-        const CameraViewParameters& rc = gRenDev->GetViewParameters();
-        linearDepth = clamp_tpl(CFlareSoftOcclusionQuery::ComputeLinearDepth(vSrcWorldPos, pRD->m_CameraMatrix, rc.fNear, rc.fFar), -1.0f, 0.99f);
-        distance = pRD->GetViewParameters().vOrigin.GetDistance(vSrcWorldPos);
-    }
-
-    if (GetElementCount() <= 0 || !IsEnabled())
-    {
-        return false;
-    }
-
-    if (!bForceRender && (linearDepth <= 0 || !IsVisibleBasedOnLight(light, distance)))
-    {
-        return false;
-    }
-
-    bool bVisible(!IsOcclusionEnabled());
-
-    if (!bVisible && !bForceRender)
-    {
-        float curTargetVisibility = 0.0f;
-        m_fFlareVisibilityFactor = m_fShaftVisibilityFactor = 0.0f;
-
-        if (m_pOccQuery)
-        {
-            curTargetVisibility = m_pOccQuery->GetVisibility();
-
-            if (CSoftOcclusionVisiblityFader* pFader = m_pOccQuery->GetVisibilityFader(VISFADER_FLARE))
-            {
-                m_fFlareVisibilityFactor = pFader->UpdateVisibility(curTargetVisibility, m_fFlareTimelineDuration);
-            }
-
-            if (CSoftOcclusionVisiblityFader* pFader = m_pOccQuery->GetVisibilityFader(VISFADER_SHAFT))
-            {
-                m_fShaftVisibilityFactor = pFader->UpdateVisibility(curTargetVisibility, m_fShaftTimelineDuration);
-            }
-        }
-
-        bVisible = IsVisible();
-    }
-
-    if (bVisible || bForceRender)
-    {
-        SAuxParams aux;
-        aux.linearDepth = linearDepth;
-        aux.distance = distance;
-        float x = vSrcProjPos.x * 2 - 1;
-        float y = vSrcProjPos.y * 2 - 1;
-        float unitLenSq = (x * x + y * y);
-        aux.sensorVariationValue = clamp_tpl((1 - powf(unitLenSq, 0.25f)) * 2 - 1, -1.0f, 1.0f);
-        aux.perspectiveShortening = clamp_tpl(10.f * (1.f - vSrcProjPos.z), 0.0f, 2.0f);
-        aux.viewAngleFalloff = light.m_fViewAngleFalloff;
-        aux.attachToSun = light.m_bAttachToSun;
-        aux.bMultiplyColor = IsMultiplyColor();
-        aux.bForceRender = bForceRender;
-
-        // The legacy entity system does not allow for overriding the color, brightness and size of lens flares.
-        // The new component systems does allow for overriding these values so we apply them only when valid
-        if (light.m_opticsParams.m_isValid)
-        {
-            SetColor(light.m_opticsParams.m_color);
-            SetBrightness(light.m_opticsParams.m_brightness);
-            SetSize(light.m_opticsParams.m_size);
-        }
-        validateGlobalVars(aux);
-        if (bForceRender || m_globalFlareBrightness > 0.001f || m_globalShaftBrightness > 0.001f)
-        {
-            gcpRendD3D->m_RP.m_PersFlags2 |= RBPF2_LENS_OPTICS_COMPOSITE;
-            COpticsGroup::Render(shader, vSrcWorldPos, vSrcProjPos, aux);
-        }
-    }
-
-    return true;
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/RootOpticsElement.h b/Code/CryEngine/RenderDll/Common/RendElements/RootOpticsElement.h
deleted file mode 100644
index db614ce8a8..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/RootOpticsElement.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_ROOTOPTICSELEMENT_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_ROOTOPTICSELEMENT_H
-#pragma once
-
-#include "OpticsGroup.h"
-#include "Timeline.h"
-
-class CRenderObject;
-class CFlareSoftOcclusionQuery;
-
-class RootOpticsElement
-    : public COpticsGroup
-{
-public:
-    struct SFlareLight
-    {
-        Vec3 m_vPos;
-        ColorF m_cLdrClr;
-        float m_fClrMultiplier;
-        float m_fRadius;
-        float m_fViewAngleFalloff;
-        bool m_bAttachToSun;
-        SOpticsInstanceParameters m_opticsParams;
-    };
-
-private:
-
-    bool m_bChromaticAbrEnabled : 1;
-    bool m_bLateralChromaticAbr : 1;
-    float m_fChromaticAbrOffset;
-    float m_fChromaticAbrDir;
-
-    float m_fEffectiveSensorSize;
-    bool m_bCustomSensorVariationMap : 1;
-
-    bool m_bPostBlur : 1;
-    float m_fPostBlurAmount;
-
-    bool m_bOcclusionEnabled : 1;
-    float m_fFlareVisibilityFactor;
-    float m_fShaftVisibilityFactor;
-    float m_fFlareTimelineDuration;
-    float m_fShaftTimelineDuration;
-    CFlareSoftOcclusionQuery* m_pOccQuery;
-
-    bool m_bAffectedByLightColor : 1;
-    bool m_bAffectedByLightRadius : 1;
-    bool m_bAffectedByLightFOV : 1;
-    SFlareLight m_flareLight;
-    Vec2 m_OcclusionSize;
-    bool m_bMultiplyColor : 1;
-
-public:
-
-    RootOpticsElement()
-        : COpticsGroup("@root")
-        , m_bChromaticAbrEnabled(false)
-        , m_bLateralChromaticAbr(false)
-        , m_fChromaticAbrOffset(0.002f)
-        , m_fChromaticAbrDir(0.785f)
-        , m_bOcclusionEnabled(true)
-        , m_fFlareVisibilityFactor(1)
-        , m_fShaftVisibilityFactor(1)
-        , m_pOccQuery(NULL)
-        , m_fEffectiveSensorSize(0.8f)
-        , m_bCustomSensorVariationMap(false)
-        , m_bAffectedByLightColor(false)
-        , m_bAffectedByLightRadius(false)
-        , m_bAffectedByLightFOV(true)
-        , m_bPostBlur(false)
-        , m_fPostBlurAmount(0)
-        , m_bMultiplyColor(true)
-    {
-        SetFlareFadingDuration(0.2f);
-        SetShaftFadingDuration(1.0f);
-        m_OcclusionSize = Vec2(0.02f, 0.02f);
-        m_fPerpectiveFactor = 1;
-    }
-
-    ~RootOpticsElement()
-    {
-    }
-
-    EFlareType GetType() { return eFT_Root; }
-    void validateGlobalVars(SAuxParams& aux);
-
-#if defined(FLARES_SUPPORT_EDITING)
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-
-    void Load(IXmlNode* pNode);
-
-    using COpticsGroup::Render;
-    void Render(SLensFlareRenderParam* pParam, const Vec3& vPos);
-    bool ProcessAll(CShader* shader, SFlareLight& light, bool bForceRender = false, CCamera* pCamera = NULL);
-
-    IOpticsElementBase* GetParent() const { return NULL; }
-
-    float GetEffectiveSensorSize() const { return m_fEffectiveSensorSize; }
-    void SetEffectiveSensorSize(float s) { m_fEffectiveSensorSize = s; }
-
-    bool IsCustomSensorVariationMapEnabled() const { return m_bCustomSensorVariationMap; }
-    void SetCustomSensorVariationMapEnabled(bool b) { m_bCustomSensorVariationMap = b; }
-
-    bool IsVisible() const { return (m_fFlareVisibilityFactor > 0.0f) || (m_fShaftVisibilityFactor > 0.0f); }
-    bool IsVisibleBasedOnLight(const SFlareLight& light, float distance) const
-    {
-        return (!m_bAffectedByLightRadius || distance < light.m_fRadius) &&
-               (!m_bAffectedByLightColor || ((light.m_cLdrClr.r > LensOpConst::_LO_MIN || light.m_cLdrClr.g > LensOpConst::_LO_MIN || light.m_cLdrClr.b > LensOpConst::_LO_MIN) && light.m_fClrMultiplier > LensOpConst::_LO_MIN)) &&
-               (!m_bAffectedByLightFOV || light.m_fViewAngleFalloff > LensOpConst::_LO_MIN);
-    }
-    bool IsOcclusionEnabled() const { return m_bOcclusionEnabled; }
-    void SetOcclusionEnabled(bool b)
-    {
-        m_bOcclusionEnabled = b;
-        if (!b)
-        {
-            SetVisibilityFactor(1.0f);
-        }
-    }
-
-    void SetOcclusionQuery(CFlareSoftOcclusionQuery* query);
-    CFlareSoftOcclusionQuery* GetOcclusionQuery() { return m_pOccQuery; }
-
-    float GetFlareVisibilityFactor() const;
-    float GetShaftVisibilityFactor() const;
-    void SetVisibilityFactor(float f);
-    Vec2 GetOccSize() const
-    {
-        return m_OcclusionSize;
-    }
-    void SetOccSize(Vec2 vSize)
-    {
-        m_OcclusionSize = vSize;
-    }
-
-    CTexture* GetOcclusionPattern();
-
-    float GetFlareFadingDuration() const { return m_fFlareTimelineDuration / 1e3f; }
-    void SetFlareFadingDuration(float d) { m_fFlareTimelineDuration = d * 1e3f; }
-
-    float GetShaftFadingDuration() const { return m_fShaftTimelineDuration / 1e3f; }
-    void SetShaftFadingDuration(float d) { m_fShaftTimelineDuration = d * 1e3f; }
-
-    bool IsAffectedByLightColor() const { return m_bAffectedByLightColor; }
-    void SetAffectedByLightColor(bool b)  { m_bAffectedByLightColor = b; }
-
-    bool IsAffectedByLightRadius() const { return m_bAffectedByLightRadius; }
-    void SetAffectedByLightRadius(bool b)  { m_bAffectedByLightRadius = b; }
-
-    bool IsAffectedByLightFOV() const { return m_bAffectedByLightFOV; }
-    void SetAffectedByLightFOV(bool b)  { m_bAffectedByLightFOV = b; }
-
-    bool IsMultiplyColor() const    {   return m_bMultiplyColor;    }
-    void SetMultiplyColor(bool b) { m_bMultiplyColor = b; }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_ROOTOPTICSELEMENT_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Stars.h b/Code/CryEngine/RenderDll/Common/RendElements/Stars.h
deleted file mode 100644
index e0c72f2655..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Stars.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_STARS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_STARS_H
-#pragma once
-class CStars
-{
-public:
-    CStars();
-    ~CStars();
-
-    void Render(bool bUseMoon);
-
-private:
-    bool LoadData();
-
-private:
-    uint32 m_numStars;
-    _smart_ptr<IRenderMesh> m_pStarMesh;
-    CShader* m_pShader;
-};
-
-#endif  // #ifndef _STARS_H_
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Streaks.cpp b/Code/CryEngine/RenderDll/Common/RendElements/Streaks.cpp
deleted file mode 100644
index 3e7f3626fe..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Streaks.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "Streaks.h"
-#include "RootOpticsElement.h"
-#include "../CryNameR.h"
-#include "../../RenderDll/XRenderD3D9/DriverD3D.h"
-
-#if defined(FLARES_SUPPORT_EDITING)
-#define MFPtr(FUNC_NAME) (Optics_MFPtr)(&Streaks::FUNC_NAME)
-void  Streaks::InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups)
-{
-    COpticsElement::InitEditorParamGroups(groups);
-
-    FuncVariableGroup streakGroup;
-    streakGroup.SetName("Streaks", "Streaks");
-    streakGroup.AddVariable(new OpticsMFPVariable(e_BOOL, "Enable gradient tex", "Enable gradient texture", this, MFPtr(SetEnableSpectrumTex), MFPtr(GetEnableSpectrumTex)));
-    streakGroup.AddVariable(new OpticsMFPVariable(e_TEXTURE2D, "Gradient Tex", "Gradient Texture", this, MFPtr(SetSpectrumTex), MFPtr(GetSpectrumTex)));
-    streakGroup.AddVariable(new OpticsMFPVariable(e_INT, "Noise seed", "Noise seed", this, MFPtr(SetNoiseSeed), MFPtr(GetNoiseSeed), -255.0f, 255.0f));
-    streakGroup.AddVariable(new OpticsMFPVariable(e_INT, "Streak count", "Number of streaks to generate", this, MFPtr(SetStreakCount), MFPtr(GetStreakCount), 0, 1000.0f));
-    streakGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Thickness", "Thickness of the shafts", this, MFPtr(SetThickness), MFPtr(GetThickness)));
-    streakGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Thickness noise", "Noise strength of thickness variation", this, MFPtr(SetThicknessNoise), MFPtr(GetThicknessNoise)));
-    streakGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Size noise", "Noise strength of shafts' sizes", this, MFPtr(SetSizeNoise), MFPtr(GetSizeNoise)));
-    streakGroup.AddVariable(new OpticsMFPVariable(e_FLOAT, "Spacing noise", "Noise strength of shafts' spacing", this, MFPtr(SetSpacingNoise), MFPtr(GetSpacingNoise)));
-    groups.push_back(streakGroup);
-}
-#undef MFPtr
-#endif
-
-void Streaks::Load(IXmlNode* pNode)
-{
-    COpticsElement::Load(pNode);
-
-    XmlNodeRef pStreakNode = pNode->findChild("Streaks");
-
-    if (pStreakNode)
-    {
-        bool bUseSpectrumTex(m_bUseSpectrumTex);
-        if (pStreakNode->getAttr("Enablegradienttex", bUseSpectrumTex))
-        {
-            SetEnableSpectrumTex(bUseSpectrumTex);
-        }
-
-        const char* gradientTexName = NULL;
-        if (pStreakNode->getAttr("GradientTex", &gradientTexName))
-        {
-            if (gradientTexName && gradientTexName[0])
-            {
-                ITexture* pTexture = gEnv->pRenderer->EF_LoadTexture(gradientTexName);
-                SetSpectrumTex((CTexture*)pTexture);
-                if (pTexture)
-                {
-                    pTexture->Release();
-                }
-            }
-        }
-
-        int nNoiseSeed(m_nNoiseSeed);
-        if (pStreakNode->getAttr("Noiseseed", nNoiseSeed))
-        {
-            SetNoiseSeed(nNoiseSeed);
-        }
-
-        int nStreakCount(m_nStreakCount);
-        if (pStreakNode->getAttr("Streakcount", nStreakCount))
-        {
-            SetStreakCount(nStreakCount);
-        }
-
-        float fThickness(m_fThickness);
-        if (pStreakNode->getAttr("Thickness", fThickness))
-        {
-            SetThickness(fThickness);
-        }
-
-        float fThicknessNoiseStrength(m_fThicknessNoiseStrength);
-        if (pStreakNode->getAttr("Thicknessnoise", fThicknessNoiseStrength))
-        {
-            SetThicknessNoise(fThicknessNoiseStrength);
-        }
-
-        float fSizeNoiseStrength(m_fSizeNoiseStrength);
-        if (pStreakNode->getAttr("Sizenoise", fSizeNoiseStrength))
-        {
-            SetSizeNoise(fSizeNoiseStrength);
-        }
-
-        float fSpacingNoiseStrength(m_fSpacingNoiseStrength);
-        if (pStreakNode->getAttr("Spacingnoise", fSpacingNoiseStrength))
-        {
-            SetSpacingNoise(fSpacingNoiseStrength);
-        }
-    }
-}
-
-void Streaks::DrawMesh()
-{
-    gcpRendD3D->FX_Commit();
-    DrawMeshTriList();
-}
-
-void Streaks::GenMesh()
-{
-    stable_rand::setSeed((int)m_nNoiseSeed);
-    float dirDelta = 1.0f / (float)(m_separatedMeshList.size());
-
-    ColorF tint(1, 1, 1, 1);
-    for (uint32 i = 0; i < m_separatedMeshList.size(); i++)
-    {
-        float spacingNoise = 1 + stable_rand::randUnit() * m_fSpacingNoiseStrength;
-
-        float dirUnit = (i * dirDelta + spacingNoise);
-        float dir = dirUnit;
-
-        float randRadius = (1 + stable_rand::randUnit() * m_fSizeNoiseStrength);
-        float thickness = m_fThickness * (1 + stable_rand::randUnit() * m_fThicknessNoiseStrength);
-
-        std::vector<SVF_P3F_C4B_T2F>& vBuf =  (m_separatedMeshList[i]);
-        MeshUtil::GenStreak(dir, randRadius, thickness, tint, vBuf, m_separatedMeshIndices);
-    }
-}
-
-void Streaks::ApplySingleMesh(int n)
-{
-    m_vertBuf = m_separatedMeshList[n];
-    m_idxBuf = m_separatedMeshIndices;
-    ApplyMesh();
-}
-
-void Streaks::Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, [[maybe_unused]] SAuxParams& aux)
-{
-    if (!IsVisible())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("DRAW_Streaks");
-
-    gRenDev->m_RP.m_FlagsShader_RT = 0;
-
-    vSrcProjPos = computeOrbitPos(vSrcProjPos, m_globalOrbitAngle);
-    shader->FXSetTechnique("Streaks");
-    uint nPass;
-    shader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-
-    ApplyGeneralFlags(shader);
-    ApplySpectrumTexFlag(shader, m_bUseSpectrumTex);
-    shader->FXBeginPass(0);
-
-    // common params
-    ApplyCommonVSParams(shader, vSrcWorldPos, vSrcProjPos);
-    ApplyExternTintAndBrightnessVS(shader, m_globalColor, m_globalFlareBrightness);
-
-    // meshCenter and brightness params
-    static CCryNameR meshCenterName("meshCenterAndBrt");
-    float x = computeMovementLocationX(vSrcProjPos);
-    float y = computeMovementLocationY(vSrcProjPos);
-    Vec4 meshCenterParam(x, y, vSrcProjPos.z, 1);
-    shader->FXSetVSFloat(meshCenterName, &meshCenterParam, 1);
-
-    // spectrum texture:
-    static STexState bilinearTS(FILTER_LINEAR, true);
-    bilinearTS.SetBorderColor(0);
-    bilinearTS.SetClampMode(TADDR_BORDER, TADDR_BORDER, TADDR_BORDER);
-
-    if (m_bUseSpectrumTex)
-    {
-        if (m_pSpectrumTex == NULL)
-        {
-            m_pSpectrumTex = CTexture::ForName("EngineAssets/Textures/flares/spectrum_full.tif",  FT_DONT_STREAM, eTF_Unknown);
-            if (m_pSpectrumTex)
-            {
-                m_pSpectrumTex->Release();
-            }
-        }
-        m_pSpectrumTex->Apply(0, CTexture::GetTexState(bilinearTS));
-    }
-
-    ValidateMesh();
-    for (uint32 i = 0; i < m_separatedMeshList.size(); i++)
-    {
-        ApplySingleMesh(i);
-        DrawMesh();
-    }
-    shader->FXEndPass();
-    shader->FXEnd();
-}
-
-void Streaks::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    int nVertexSize(0);
-    for (int i = 0, iSize(m_separatedMeshList.size()); i < iSize; ++i)
-    {
-        nVertexSize += m_separatedMeshList[i].size() * sizeof(SVF_P3F_C4B_T2F);
-    }
-    pSizer->AddObject(this, sizeof(*this) + GetMeshDataSize() + nVertexSize + m_separatedMeshIndices.size() * sizeof(uint16));
-}
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Streaks.h b/Code/CryEngine/RenderDll/Common/RendElements/Streaks.h
deleted file mode 100644
index 63c679acf5..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Streaks.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_STREAKS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_STREAKS_H
-#pragma once
-
-#include "OpticsElement.h"
-#include "AbstractMeshElement.h"
-#include "MeshUtil.h"
-
-class CTexture;
-class Streaks
-    : public COpticsElement
-    , public AbstractMeshElement
-{
-private:
-    _smart_ptr<CTexture> m_pSpectrumTex;
-    bool m_bUseSpectrumTex;
-
-    int m_nStreakCount;
-    int m_nColorComplexity;
-
-    // noise strengths
-    float m_fSizeNoiseStrength;
-    float m_fThicknessNoiseStrength;
-    float m_fSpacingNoiseStrength;
-
-    float m_fThickness;
-    int m_nNoiseSeed;
-
-protected:
-    std::vector< std::vector<SVF_P3F_C4B_T2F> > m_separatedMeshList;
-    std::vector< uint16 > m_separatedMeshIndices;
-
-    // !Override
-    virtual void GenMesh();
-    virtual void ApplySingleMesh(int n);
-    virtual void DrawMesh();
-    void Invalidate()
-    {
-        m_meshDirty = true;
-    }
-
-public:
-    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // ctor
-    Streaks (const char* name)
-        : COpticsElement(name, 0.5f)
-        , m_fThickness(0.3f)
-        , m_nNoiseSeed(81)
-        , m_fSizeNoiseStrength(0.8f)
-        , m_fThicknessNoiseStrength(0.6f)
-        , m_fSpacingNoiseStrength(0.2f)
-        , m_bUseSpectrumTex(false)
-    {
-        m_vMovement.x = 1.f;
-        m_vMovement.y = 1.f;
-        m_Color.a = 1.f;
-
-        SetAutoRotation(false);
-        SetAspectRatioCorrection(true);
-        SetColorComplexity(2);
-        SetStreakCount(1);
-
-        m_meshDirty = true;
-    }
-
-#if defined(FLARES_SUPPORT_EDITING)
-    void InitEditorParamGroups(AZStd::vector<FuncVariableGroup>& groups);
-#endif
-    EFlareType GetType() { return eFT_Streaks; }
-    void Render(CShader* shader, Vec3 vSrcWorldPos, Vec3 vSrcProjPos, SAuxParams& aux);
-    void Load(IXmlNode* pNode);
-
-    bool GetEnableSpectrumTex() const { return m_bUseSpectrumTex; }
-    void SetEnableSpectrumTex(bool b) { m_bUseSpectrumTex = b; }
-
-    CTexture* GetSpectrumTex() const { return m_pSpectrumTex; }
-    void SetSpectrumTex(CTexture* tex)  { m_pSpectrumTex = tex; }
-
-    int GetNoiseSeed() const { return m_nNoiseSeed; }
-    void SetNoiseSeed(int seed)
-    {
-        m_nNoiseSeed = seed;
-        m_meshDirty = true;
-    }
-
-    int GetStreakCount() const { return m_nStreakCount; }
-    void SetStreakCount(int n)
-    {
-        m_nStreakCount = n;
-        m_separatedMeshList.resize(n);
-        m_meshDirty = true;
-    }
-
-    int GetColorComplexity() const { return m_nColorComplexity; }
-    void SetColorComplexity(int n)
-    {
-        m_nColorComplexity = n;
-        m_meshDirty = true;
-    }
-
-    float GetThickness() const { return m_fThickness; }
-    void SetThickness(float f)
-    {
-        m_fThickness = f;
-        m_meshDirty = true;
-    }
-
-    float GetThicknessNoise() const { return m_fThicknessNoiseStrength; }
-    void SetThicknessNoise(float noise)
-    {
-        m_fThicknessNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    float GetSizeNoise() const { return m_fSizeNoiseStrength; }
-    void SetSizeNoise(float noise)
-    {
-        m_fSizeNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    float GetSpacingNoise() const { return m_fSpacingNoiseStrength; }
-    void SetSpacingNoise(float noise)
-    {
-        m_fSpacingNoiseStrength = noise;
-        m_meshDirty = true;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_STREAKS_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Timeline.h b/Code/CryEngine/RenderDll/Common/RendElements/Timeline.h
deleted file mode 100644
index b6c7d59fae..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Timeline.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_TIMELINE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_TIMELINE_H
-#pragma once
-
-#include "Interpolator.h"
-
-template <class T>
-class Timeline
-{
-public:
-    enum LoopMode
-    {
-        NORMAL, REVERSE, LOOP
-    };
-
-protected:
-    T prevYValue;
-    float prevXValue;
-
-public:
-    Interpolator<T>* pInterp;
-    T startValue;
-    T endValue;
-    LoopMode loopMode;
-    float duration;         // in milliseconds
-    float currentTime;  // in milliseconds
-
-    void init(T start, T end, float _duration, Interpolator<T>* interp)
-    {
-        SetInterpolationRange(start, end);
-        prevYValue = start;
-        prevXValue = 0;
-        this->duration = _duration;
-        loopMode = NORMAL;
-
-        pInterp = interp;
-    }
-
-protected:
-    float computeTimeStepping(float curTime, float elapsedMs)
-    {
-        switch (loopMode)
-        {
-        case NORMAL:
-            curTime += elapsedMs;
-            if (curTime > duration)
-            {
-                return duration;
-            }
-        case REVERSE:
-            curTime -= elapsedMs;
-            if (curTime < 0)
-            {
-                return 0;
-            }
-        case LOOP:
-            curTime += elapsedMs;
-            if (curTime > duration)
-            {
-                return fmod(curTime, duration);
-            }
-        }
-
-        return curTime;
-    }
-
-    void positCursorByRatio(float ratio)
-    {
-        switch (loopMode)
-        {
-        case NORMAL:
-            currentTime = ratio * duration;
-            break;
-        case REVERSE:
-            currentTime = (1 - ratio) * duration;
-            break;
-        case LOOP:
-            break;
-        }
-    }
-
-public:
-
-    virtual ~Timeline() {}
-    Timeline(T start, T end, float _duration, Interpolator<T>* interp)
-    {
-        currentTime = 0;
-        init(start, end, _duration, interp);
-    }
-
-    Timeline(Interpolator<T>* interp)
-    {
-        currentTime = 0;
-        init(0, 1, 1000, interp);
-    }
-
-    // Accumulate time and produce the interpolated value accordingly
-    virtual T step(float elapsedMs)
-    {
-        currentTime = computeTimeStepping(currentTime, elapsedMs);
-        prevXValue = currentTime / duration;
-
-        prevYValue = pInterp->compute(startValue, endValue, prevXValue);
-        return prevYValue;
-    }
-
-    // Rewind the current time to initial position
-    virtual void rewind()
-    {
-        positCursorByRatio(0);
-    }
-
-    void SetInterpolationRange(T start, T end)
-    {
-        startValue = start;
-        endValue = end;
-    }
-
-    float GetPrevXValue() { return prevXValue; }
-    T GetPrevYValue() { return prevYValue; }
-};
-
-namespace {
-    float tempFloat0 = 0;
-    float tempFloat1 = 1;
-    int tempInt0 = 0;
-    int tempInt1 = 1;
-}
-
-class TimelineFloat
-    : public Timeline<float>
-{
-public:
-    TimelineFloat()
-        : Timeline<float>(0, 1, 1000, &InterpPredef::CUBIC_FLOAT) {}
-};
-
-class TimelineInt
-    : public Timeline<int>
-{
-public:
-    TimelineInt()
-        : Timeline<int>(0, 1, 1000, &InterpPredef::CUBIC_INT) {}
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_TIMELINE_H
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.cpp b/Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.cpp
deleted file mode 100644
index 1bd6a5a6ae..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.cpp
+++ /dev/null
@@ -1,853 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Polygon math helper functions optimized for breakable glass sim
-
-
-#include "RenderDll_precompiled.h"
-#include "PolygonMath2D.h"
-
-#ifndef RELEASE
-#define ASSERT_NUM_POLY_SIDES(numPts)               {if (numPts < 0 || numPts > POLY_ARRAY_SIZE) {                                                            \
-                                                         CRY_ASSERT_MESSAGE(0, "[BreakGlassSystem Error]: Polygon too large, need to increase array sizes."); \
-                                                         CryLogAlways("[BreakGlassSystem Error]: Polygon too large, need to increase array sizes."); }        \
-}
-#else
-#define ASSERT_NUM_POLY_SIDES(numPts)
-#endif
-
-//--------------------------------------------------------------------------------------------------
-// Name: PointInTriangle2D
-// Desc: Determines if a point is in the specified triangle
-//--------------------------------------------------------------------------------------------------
-bool PointInTriangle2D(const Vec2& pt, const Vec2& a, const Vec2& b, const Vec2& c)
-{
-    float ax, ay, bx, by, cx, cy, apx, apy, bpx, bpy, cpx, cpy;
-    float cCROSSap, bCROSScp, aCROSSbp;
-
-    ax = c.x - b.x;
-    ay = c.y - b.y;
-    bx = a.x - c.x;
-    by = a.y - c.y;
-    cx = b.x - a.x;
-    cy = b.y - a.y;
-
-    apx = pt.x - a.x;
-    apy = pt.y - a.y;
-    bpx = pt.x - b.x;
-    bpy = pt.y - b.y;
-    cpx = pt.x - c.x;
-    cpy = pt.y - c.y;
-
-    aCROSSbp = ax * bpy - ay * bpx;
-    cCROSSap = cx * apy - cy * apx;
-    bCROSScp = bx * cpy - by * cpx;
-
-    float ra = (float)fsel(aCROSSbp, 1.0f, 0.0f);
-    float rb = (float)fsel(cCROSSap, 1.0f, 0.0f);
-    float rc = (float)fsel(bCROSScp, 1.0f, 0.0f);
-
-    return (ra + rb + rc) > 2.5f;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: TriangleIsConvex2D
-// Desc: Determines if a triangle is convex (angle at B less than 180 degrees)
-//--------------------------------------------------------------------------------------------------
-bool TriangleIsConvex2D(const Vec2& a, const Vec2& b, const Vec2& c)
-{
-    const Vec2 ba = a - b;
-    const Vec2 bc = c - b;
-
-    const float cross = ba.x * bc.y - bc.x * ba.y;
-    return (cross < 0.0f);
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: LineCircleIntersect2D
-// Desc: Finds the intersection points (if any) between a line and circle
-// Note: Returns the number of intersection points (0, 1 or 2)
-//--------------------------------------------------------------------------------------------------
-int LineCircleIntersect2D(const Vec2& pt0, const Vec2& pt1, const Vec2& center, const float radiusSq, float& intersectA, float& intersectB)
-{
-    int numIntersects = 0;
-
-    const Vec2 lineSegment = pt1 - pt0;
-    const Vec2 circleToLine = pt0 - center;
-
-    // Check if there is an intersection
-    const float a = lineSegment.Dot(lineSegment);
-    const float b = 2.0f * circleToLine.Dot(lineSegment);
-    const float c = circleToLine.Dot(circleToLine) - radiusSq;
-
-    float discriminant = b * b - 4 * a * c;
-    float isIntersection = min(discriminant, a);
-
-    if (isIntersection >= 0.0f)
-    {
-        // Find exact intersection points (assuming infinite length line)
-        discriminant = sqrtf(discriminant);
-        float inv2A = 1.0f / (a + a);
-
-        intersectA = (-b + discriminant) * inv2A;
-        intersectB = (-b - discriminant) * inv2A;
-
-        // Found if either value valid
-        if (intersectA >= 0.0f && intersectA <= 1.0f)
-        {
-            ++numIntersects;
-        }
-
-        if (intersectB >= 0.0f && intersectB <= 1.0f)
-        {
-            ++numIntersects;
-        }
-    }
-
-    return numIntersects;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: PointInPolygon2D
-// Desc: Determines if a point is in the specified polygon
-// Note: Taken from "Cry_GeoOverlap.h" and cut down for our specific tests
-//--------------------------------------------------------------------------------------------------
-bool PointInPolygon2D(const Vec2& pt, const Vec2* pPolygon, const int numPts)
-{
-    bool count = false;
-
-    if (pPolygon)
-    {
-        for (int i = 0, j = 1; i < numPts; ++i, ++j)
-        {
-            j = (j == numPts) ? 0 : j;
-
-            const Vec2& l0 = pPolygon[i];
-            const Vec2& l1 = pPolygon[j];
-
-            if ((((l1.y < pt.y) && (pt.y < l0.y)) || ((l0.y < pt.y) && (pt.y < l1.y)))
-                && (pt.x < (l0.x - l1.x) * (pt.y - l1.y) / (l0.y - l1.y) + l1.x))
-            {
-                count = !count;
-            }
-        }
-    }
-
-    return count;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: CalculatePolygonArea2D
-// Desc: Calculates the area covered by a 2D polygon
-//--------------------------------------------------------------------------------------------------
-float CalculatePolygonArea2D(const Vec2* pPolygon, const int numPts)
-{
-    float area = 0.0f;
-
-    if (pPolygon && numPts > 0)
-    {
-        for (int i = numPts - 1, j = 0; j < numPts; i = j++)
-        {
-            area += pPolygon[i].x * pPolygon[j].y;
-            area -= pPolygon[j].x * pPolygon[i].y;
-        }
-    }
-
-    return area * 0.5f;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: CalculatePolygonBounds2D
-// Desc: Calculates the AA size of a 2D polygon
-//--------------------------------------------------------------------------------------------------
-Vec2 CalculatePolygonBounds2D(const Vec2* pPolygon, const int numPts)
-{
-    Vec2 bounds(Vec2_Zero);
-
-    if (pPolygon && numPts > 0)
-    {
-        Vec2 minPt = pPolygon[0], maxPt = pPolygon[0];
-
-        for (int i = 1; i < numPts; ++i)
-        {
-            minPt.x = min(minPt.x, pPolygon[i].x);
-            minPt.y = min(minPt.y, pPolygon[i].y);
-
-            maxPt.x = max(maxPt.x, pPolygon[i].x);
-            maxPt.y = max(maxPt.y, pPolygon[i].y);
-        }
-
-        bounds = maxPt - minPt;
-    }
-
-    return bounds;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: CalculatePolygonCenter2D
-// Desc: Calculates the center of a 2D polygon
-//--------------------------------------------------------------------------------------------------
-Vec2 CalculatePolygonCenter2D(const Vec2* pPolygon, const int numPts)
-{
-    Vec2 center(0.0f, 0.0f);
-
-    if (pPolygon && numPts > 0)
-    {
-        const float size = (float)numPts;
-
-        for (int i = 0; i < numPts; ++i)
-        {
-            center += pPolygon[i];
-        }
-
-        center /= size;
-    }
-
-    return center;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: CalculatePolygonSharedPerimeter2D
-// Desc: Calculates the connected percentage of fragments
-// Note: Returns fraction of perimeter connected in two float params
-//--------------------------------------------------------------------------------------------------
-bool CalculatePolygonSharedPerimeter2D(const Vec2* pPolygonA, const int numPtsA, const Vec2* pPolygonB, const int numPtsB, float& connectionA, float& connectionB)
-{
-    // Default values
-    const int minPolySize = 3;
-    connectionA = connectionB = 0.0f;
-
-    ASSERT_NUM_POLY_SIDES(numPtsA);
-    ASSERT_NUM_POLY_SIDES(numPtsB);
-
-    if (pPolygonA && numPtsA >= minPolySize && numPtsA <= POLY_ARRAY_SIZE
-        && pPolygonB && numPtsB >= minPolySize  && numPtsB <= POLY_ARRAY_SIZE)
-    {
-        // Check for shared polygon points
-        TPolyIndexArray polyAShared, polyBShared;
-
-        for (int i = 0; i < numPtsA; ++i)
-        {
-            for (int j = 0; j < numPtsB; ++j)
-            {
-                // Store matching points
-                if (pPolygonA[i] == pPolygonB[j])
-                {
-                    polyAShared.push_back(i);
-                    polyBShared.push_back(j);
-                }
-            }
-        }
-
-        // Valid connection found when two or more points shared
-        const bool connFound = (polyAShared.size() >= 2);
-
-        // Calculate fraction of A that is shared
-        if (connFound)
-        {
-            // Calculate squared length of A's perimeter shared
-            const uint polyASize = polyAShared.size() - 1;
-
-            for (uint i = 0; i < polyASize; ++i)
-            {
-                const Vec2& pt = pPolygonA[polyAShared[i]];
-                const Vec2& nextPt = pPolygonA[polyAShared[i + 1]];
-
-                connectionA += (nextPt - pt).GetLength2();
-            }
-
-            // Calculate remaining squared perimeter length
-            float polyAPerimSq = connectionA;
-            int polyIndex = polyAShared.back();
-
-            while (polyIndex != polyAShared[0])
-            {
-                polyIndex = (polyIndex + 1 == numPtsA) ? 0 : polyIndex + 1;
-                int nextPolyIndex = (polyIndex + 1 == numPtsA) ? 0 : polyIndex + 1;
-
-                const Vec2& pt = pPolygonA[polyIndex];
-                const Vec2& nextPt = pPolygonA[nextPolyIndex];
-
-                polyAPerimSq += (nextPt - pt).GetLength2();
-            }
-
-            // Convert to fraction
-            connectionA = sqrtf(connectionA / polyAPerimSq);
-        }
-
-        // Calculate fraction of B that is shared
-        if (connFound)
-        {
-            // Calculate squared length of B's perimeter shared
-            const uint polyBSize = polyBShared.size() - 1;
-
-            for (uint i = 0; i < polyBSize; ++i)
-            {
-                const Vec2& pt = pPolygonB[polyBShared[i]];
-                const Vec2& nextPt = pPolygonB[polyBShared[i + 1]];
-
-                connectionB += (nextPt - pt).GetLength2();
-            }
-
-            // Calculate remaining squared perimeter length
-            float polyBPerimSq = connectionB;
-            int polyIndex = polyBShared.back();
-
-            while (polyIndex != polyBShared[0])
-            {
-                polyIndex = (polyIndex + 1 == numPtsB) ? 0 : polyIndex + 1;
-                int nextPolyIndex = (polyIndex + 1 == numPtsB) ? 0 : polyIndex + 1;
-
-                const Vec2& pt = pPolygonB[polyIndex];
-                const Vec2& nextPt = pPolygonB[nextPolyIndex];
-
-                polyBPerimSq += (nextPt - pt).GetLength2();
-            }
-
-            // Convert to fraction
-            connectionB = sqrtf(connectionB / polyBPerimSq);
-        }
-
-        // Successful
-        return true;
-    }
-
-    return false;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: TriangulatePolygon2D
-// Desc: Generates triangles from a polygon's in-order point list
-//--------------------------------------------------------------------------------------------------
-void TriangulatePolygon2D(const Vec2* pPolygon, const int numPolyPts, PodArray<Vec2>* pVertices, PodArray<uint8>* pIndices)
-{
-    ASSERT_NUM_POLY_SIDES(numPolyPts);
-
-    if (pPolygon && numPolyPts >= 3 && numPolyPts <= POLY_ARRAY_SIZE && (pVertices || pIndices))
-    {
-        int numPts = numPolyPts;
-        int numTris = numPts - 2;
-
-        // Offset for output vertex data
-        int vertOffset = 0;
-
-        if (pVertices)
-        {
-            vertOffset = pVertices->Count();
-            pVertices->resize(vertOffset + numTris * 3);
-        }
-
-        // Offset for output index data
-        int indOffset = 0;
-
-        if (pIndices)
-        {
-            indOffset = pIndices->Count();
-            pIndices->resize(indOffset + numTris * 3);
-        }
-
-        // Simple case, push single triangle
-        if (numTris == 1)
-        {
-            if (pVertices)
-            {
-                (*pVertices)[vertOffset] = pPolygon[0];
-                (*pVertices)[vertOffset + 1] = pPolygon[1];
-                (*pVertices)[vertOffset + 2] = pPolygon[2];
-            }
-
-            if (pIndices)
-            {
-                (*pIndices)[indOffset] = 0;
-                (*pIndices)[indOffset + 1] = 1;
-                (*pIndices)[indOffset + 2] = 2;
-            }
-        }
-
-        // Complex case, need to triangulate full point list
-        else if (numTris > 1)
-        {
-            // Initialise outline list as pIndices
-            TPolyIndexArray outline;
-            outline.resize(numPts);
-
-            for (int i = 0; i < numPts; ++i)
-            {
-                outline[i] = i;
-            }
-
-            // Already know the expected number of triangles
-            for (int i = 0; i < numTris; ++i)
-            {
-                int* pIterBegin = outline.begin();
-                int* pIterEnd = outline.end();
-
-                int* pIterA = pIterBegin;
-                int* pIterB = pIterBegin;
-                int* pIterC = pIterBegin;
-                ++pIterB;
-                ++pIterC;
-                ++pIterC;
-
-                // Loop around entire list and check for ears
-                for (int j = 0; j < numPts; ++j)
-                {
-                    const Vec2& a = pPolygon[*pIterA];
-                    const Vec2& b = pPolygon[*pIterB];
-                    const Vec2& c = pPolygon[*pIterC];
-
-                    // Valid ear triangles will be convex (internal angle < 180)
-                    if (TriangleIsConvex2D(a, b, c))
-                    {
-                        // Check valid triangles against all other outline points
-                        int* pIterPt = pIterBegin;
-                        bool isEar = true;
-
-                        do
-                        {
-                            if (pIterPt != pIterA && pIterPt != pIterB && pIterPt != pIterC)
-                            {
-                                const Vec2& pt = pPolygon[*pIterPt];
-
-                                // When we have a point in the triangle, it means this is *not* an ear
-                                if (PointInTriangle2D(pt, a, b, c))
-                                {
-                                    isEar = false;
-                                    break;
-                                }
-                            }
-
-                            ++pIterPt;
-                        } while (pIterPt != pIterEnd);
-
-                        // Create triangle and clip ear when found
-                        if (isEar)
-                        {
-                            if (pVertices)
-                            {
-                                (*pVertices)[vertOffset] = pPolygon[*pIterA];
-                                (*pVertices)[vertOffset + 1] = pPolygon[*pIterB];
-                                (*pVertices)[vertOffset + 2] = pPolygon[*pIterC];
-                            }
-
-                            if (pIndices)
-                            {
-                                (*pIndices)[indOffset] = *pIterA;
-                                (*pIndices)[indOffset + 1] = *pIterB;
-                                (*pIndices)[indOffset + 2] = *pIterC;
-                            }
-
-                            // If ear is last point, erase immediately
-                            if (*pIterB == *pIterEnd)
-                            {
-                                outline.pop_back();
-                            }
-
-                            // May need to shuffle points along (rather than erase)
-                            else
-                            {
-                                while (pIterC != pIterEnd)
-                                {
-                                    *pIterB = *pIterC;
-                                    ++pIterB;
-                                    ++pIterC;
-
-                                    // Need to handle looping case
-                                    if (pIterB == pIterEnd)
-                                    {
-                                        pIterB = pIterBegin;
-                                    }
-                                }
-
-                                outline.pop_back();
-                            }
-
-                            // Done with this ear
-                            break;
-                        }
-                    }
-
-                    // Try next triangle
-                    ++pIterA;
-                    ++pIterB;
-                    ++pIterC;
-
-                    // Treat outline as a ring buffer
-                    pIterBegin = outline.begin();
-                    pIterEnd = outline.end();
-
-                    if (pIterC == pIterEnd)
-                    {
-                        pIterC = pIterBegin;
-                    }
-                    else if (pIterB == pIterEnd)
-                    {
-                        pIterB = pIterBegin;
-                    }
-                }
-
-                // Clipped one ear point
-                --numPts;
-                vertOffset += 3;
-                indOffset += 3;
-            }
-        }
-    }
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: FindPolygonCircleSplitPoints
-// Desc: Common code to finds the split points for SplitPolygonAroundPoint() varations
-//--------------------------------------------------------------------------------------------------
-struct SPolyCircleSplit
-{
-    int A, B, ANext, BNext, numPtsToMove;
-    Vec2 ptA, ptB, ptMid;
-    bool allPtsInsideCircle, validSegment, cyclicSegment;
-};
-
-bool FindPolygonCircleSplitPoints(const Vec2* pPolygon, const int numPts, const Vec2& splitPt, const float splitRadius, SPolyCircleSplit& split)
-{
-    // Default data
-    const int invalidPt = -1;
-    split.A = split.B = invalidPt;
-    split.allPtsInsideCircle = true;
-
-    if (pPolygon && numPts >= 3)
-    {
-        const float splitRadiusSq = splitRadius * splitRadius;
-        float intersectA, intersectB;
-
-        // Loop round polygon
-        for (int i = 0; i < numPts; ++i)
-        {
-            // Check segment for intersection
-            int j = (i + 1 == numPts) ? 0 : i + 1;
-
-            float tA, tB;
-            int numIntersects = LineCircleIntersect2D(pPolygon[i], pPolygon[j], splitPt, splitRadiusSq, tA, tB);
-
-            // Store line intersection points if found
-            if (numIntersects == 1)
-            {
-                tA = (tA < 0.0f || tA > 1.0f) ? tB : tA;
-
-                if (split.A == invalidPt)
-                {
-                    split.A = i;
-                    intersectA = tA;
-                }
-                else
-                {
-                    split.B = i;
-                    intersectB = tA;
-                    break;
-                }
-            }
-
-            // Can be a case where the circle intersects fully on one line. This
-            // means we can't really split the polygon though, so early out
-            else if (numIntersects == 2)
-            {
-                split.A = split.B = invalidPt;
-                intersectA = intersectB = 0.0f;
-                break;
-            }
-
-            // Check if we still have all points inside the circle
-            if (split.allPtsInsideCircle)
-            {
-                const float distSq = (pPolygon[i] - splitPt).GetLength2();
-
-                if (distSq > splitRadiusSq)
-                {
-                    split.allPtsInsideCircle = false;
-                }
-            }
-        }
-
-        // Valid polygon segment?
-        if (split.validSegment = (split.A >= 0 && split.B >= 0 && split.A != split.B))
-        {
-            // May need to swap points to ensure generating inner polygon
-            const float splitADistSq = (pPolygon[split.A] - splitPt).GetLength2();
-
-            if (splitADistSq < splitRadiusSq)
-            {
-                int temp = split.A;
-                split.A = split.B;
-                split.B = temp;
-            }
-
-            // Calculate how many points in cut segment
-            split.cyclicSegment = split.A > split.B;
-            split.numPtsToMove = split.cyclicSegment ? (split.B + numPts) - split.A : split.B - split.A;
-
-            if (split.numPtsToMove > 0)
-            {
-                // Calculate intersect points
-                split.ANext = (split.A + 1 == numPts) ? 0 : split.A + 1;
-                split.BNext = (split.B + 1 == numPts) ? 0 : split.B + 1;
-
-                split.ptA = pPolygon[split.A] * intersectA + pPolygon[split.ANext] * (1.0f - intersectA);
-                split.ptB = pPolygon[split.B] * intersectB + pPolygon[split.BNext] * (1.0f - intersectB);
-
-                // Extra mid-point lying on circle, for use with the outer polygon only
-                split.ptMid = (split.ptA + split.ptB) * 0.5f;
-                split.ptMid = splitPt + (split.ptMid - splitPt).Normalize() * splitRadius;
-            }
-            else
-            {
-                split.validSegment = false;
-            }
-        }
-    }
-
-    return (split.validSegment && split.numPtsToMove > 0);
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: SplitPolygonAroundPoint <TPolygonArray>
-// Desc: Splits a polygon outline along the radial line around the point
-// Note: Removes verts from input data, then creates the INNER polygon piece.
-//           Does not do anything if polygon fully contains circle
-//--------------------------------------------------------------------------------------------------
-void SplitPolygonAroundPoint(TPolygonArray& outline, const Vec2& splitPt, const float splitRadius, TPolygonArray& splitInnerOutline)
-{
-    const Vec2* pOutlinePts = outline.begin();
-    const int outlineSize = outline.size();
-
-    // Build inner polygon if both split points where found, and they create a valid segment
-    SPolyCircleSplit split;
-    if (FindPolygonCircleSplitPoints(pOutlinePts, outlineSize, splitPt, splitRadius, split))
-    {
-        // Create new inner polygon from split points and old polygon segment (if arrays large enough)
-        if (split.numPtsToMove > 0 && split.numPtsToMove <= POLY_ARRAY_SIZE - 2)
-        {
-            splitInnerOutline.resize(split.numPtsToMove + 2);
-
-            splitInnerOutline[0] = split.ptA;
-            splitInnerOutline[split.numPtsToMove + 1] = split.ptB;
-
-            for (int i = 1; i < split.numPtsToMove + 1; ++i)
-            {
-                int j = split.A + i;
-                j = (j >= outlineSize) ? j - outlineSize : j;
-
-                splitInnerOutline[i] = pOutlinePts[j];
-            }
-        }
-        else
-        {
-            splitInnerOutline.clear();
-        }
-
-        // Cyclic segment - need to delete both ends, then add intersect points
-        if (split.cyclicSegment)
-        {
-            const int numStartPts = split.B + 1;
-            const int numEndPts = outlineSize - (split.A + 1);
-            const bool canAddMidPt = (numStartPts + numEndPts >= 3);
-
-            if (numEndPts > 0)
-            {
-                outline.erase(split.A + 1, numEndPts);
-            }
-
-            if (numStartPts > 0)
-            {
-                outline.erase(0, numStartPts);
-            }
-
-            outline.push_back(split.ptA);
-            if (canAddMidPt)
-            {
-                outline.push_back(split.ptMid);
-            }
-            outline.push_back(split.ptB);
-        }
-
-        // Contiguous segment - single delete then insert intersect points
-        else
-        {
-            outline.erase(split.ANext, split.numPtsToMove);
-
-            const bool splitTouchesEnd = (split.B == outlineSize - 1);
-            const bool canAddMidPt = (split.numPtsToMove >= 3);
-            if (splitTouchesEnd)
-            {
-                outline.push_back(split.ptA);
-                if (canAddMidPt)
-                {
-                    outline.push_back(split.ptMid);
-                }
-                outline.push_back(split.ptB);
-            }
-            else
-            {
-                outline.insert_before(split.ptB, split.A + 1);
-                if (canAddMidPt)
-                {
-                    outline.insert_before(split.ptMid, split.A + 1);
-                }
-                outline.insert_before(split.ptA, split.A + 1);
-            }
-        }
-    }
-
-    // If failed, might be the case where entire polygon is inside
-    else if (split.allPtsInsideCircle)
-    {
-        // Move the polygon to the output list
-        splitInnerOutline.resize(outlineSize);
-
-        for (int i = 0; i < outlineSize; ++i)
-        {
-            splitInnerOutline[i] = pOutlinePts[i];
-        }
-
-        outline.clear();
-    }
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: SplitPolygonAroundPoint <PodArray>
-// Desc: Splits a polygon outline along the radial line around the point
-// Note: Removes verts from input data, then creates the INNER polygon piece.
-//           Does not do anything if polygon fully contains circle
-//--------------------------------------------------------------------------------------------------
-void SplitPolygonAroundPoint(PodArray<Vec2>& outline, const Vec2& splitPt, const float splitRadius, TPolygonArray& splitInnerOutline)
-{
-    const Vec2* pOutlinePts = outline.begin();
-    const int outlineSize = outline.Count();
-
-    // Build inner polygon if both split points where found, and they create a valid segment
-    SPolyCircleSplit split;
-    if (FindPolygonCircleSplitPoints(pOutlinePts, outlineSize, splitPt, splitRadius, split))
-    {
-        // Create new inner polygon from split points and old polygon segment
-        splitInnerOutline.resize(split.numPtsToMove + 2);
-
-        splitInnerOutline[0] = split.ptA;
-        splitInnerOutline[split.numPtsToMove + 1] = split.ptB;
-
-        for (int i = 1; i < split.numPtsToMove + 1; ++i)
-        {
-            int j = split.A + i;
-            j = (j >= outlineSize) ? j - outlineSize : j;
-
-            splitInnerOutline[i] = pOutlinePts[j];
-        }
-
-        // Cyclic segment - need to delete both ends, then add intersect points
-        if (split.cyclicSegment)
-        {
-            const int numStartPts = split.B + 1;
-            const int numEndPts = outlineSize - (split.A + 1);
-
-            if (numEndPts > 0)
-            {
-                outline.Delete(split.A + 1, numEndPts);
-            }
-
-            if (numStartPts > 0)
-            {
-                outline.Delete(0, numStartPts);
-            }
-
-            outline.push_back(split.ptA);
-            outline.push_back(split.ptMid);
-            outline.push_back(split.ptB);
-        }
-
-        // Contiguous segment - single delete then insert intersect points
-        else
-        {
-            outline.Delete(split.ANext, split.numPtsToMove);
-
-            const bool splitTouchesEnd = split.B == outlineSize - 1;
-            if (splitTouchesEnd)
-            {
-                outline.push_back(split.ptA);
-                outline.push_back(split.ptMid);
-                outline.push_back(split.ptB);
-            }
-            else
-            {
-                outline.InsertBefore(split.ptB, split.A + 1);
-                outline.InsertBefore(split.ptMid, split.A + 1);
-                outline.InsertBefore(split.ptA, split.A + 1);
-            }
-        }
-    }
-
-    // If failed, might be the case where entire polygon is inside
-    else if (split.allPtsInsideCircle)
-    {
-        // Move the polygon to the output list
-        splitInnerOutline.resize(outlineSize);
-
-        for (int i = 0; i < outlineSize; ++i)
-        {
-            splitInnerOutline[i] = pOutlinePts[i];
-        }
-
-        outline.Clear();
-    }
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: PolygonInCircle2D
-// Desc: Determines if a polygon is contained within the specified circle
-//--------------------------------------------------------------------------------------------------
-EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, const Vec2* pPolygon, const int numPts)
-{
-    EPolygonInCircle2D state = EPolygonInCircle2D_Outside;
-
-    if (pPolygon && numPts >= 3)
-    {
-        const float radiusSq = radius * radius;
-
-        Vec2 centerDir;
-        float centerDistSq;
-        int numPtsOutside = 0;
-
-        // Check state of each point
-        for (int i = 0; i < numPts; ++i)
-        {
-            centerDir = center - pPolygon[i];
-            centerDistSq = centerDir.GetLength2();
-
-            if (centerDistSq > radiusSq)
-            {
-                ++numPtsOutside;
-            }
-        }
-
-        // Determine state
-        if (numPtsOutside == numPts)
-        {
-            state = EPolygonInCircle2D_Outside;
-        }
-        else if (numPtsOutside > 0)
-        {
-            state = EPolygonInCircle2D_Overlap;
-        }
-        else
-        {
-            state = EPolygonInCircle2D_Inside;
-        }
-    }
-
-    return state;
-}//-------------------------------------------------------------------------------------------------
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.h b/Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.h
deleted file mode 100644
index fd8cc1b292..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_UTILS_POLYGONMATH2D_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_UTILS_POLYGONMATH2D_H
-#pragma once
-
-#include "CryFixedArray.h"
-
-//==================================================================================================
-// Name: FixedPodArray
-// Desc: Extension of CryFixedArray to add useful functionality
-// Note: This should be promoted into CryFixedArray in the long term
-// Author: Chris Bunner
-//==================================================================================================
-template <class T, unsigned int N>
-class FixedPodArray
-    : public CryFixedArray<T, N>
-{
-    typedef CryFixedArray<T, N> CFA;
-
-public:
-    ILINE void resize(const uint size)
-    {
-        if (size <= N)
-        {
-            CFA::m_curSize[0] = size;
-        }
-        else
-        {
-            CryLogAlways("FixedPodArray::resize() failing as size too large - NOT resizing array");
-            CRY_ASSERT_MESSAGE(0, "FixedPodArray::resize() failing as size too large - NOT resizing array");
-        }
-    }
-
-    ILINE void erase(const uint index, const uint count = 1)
-    {
-        const uint size = CFA::m_curSize[0];
-
-        if (index == size - count)
-        {
-            // Simple remove
-            CFA::m_curSize[0] -= count;
-        }
-        else if (index + count < size)
-        {
-            // Shuffle set of elements along
-            const uint range = size - (index + count);
-            memmove(&CFA::at(index), &CFA::at(index + count), sizeof(T) * range);
-
-            CFA::m_curSize[0] -= count;
-        }
-        else
-        {
-            CryLogAlways("FixedPodArray::erase() failing as element range invalid - NOT removing element");
-            CRY_ASSERT_MESSAGE(0, "FixedPodArray::erase() failing as element range invalid - NOT removing element");
-        }
-    }
-
-    ILINE void insert_before(const T& elem, const uint index)
-    {
-        const uint size = CFA::m_curSize[0];
-
-        if (index < size && size < N)
-        {
-            // Shuffle set of elements along
-            const uint count = size - index;
-            memmove(&CFA::at(index + 1), &CFA::at(index), sizeof(T) * count);
-
-            // Add new element
-            memcpy(&CFA::at(index), &elem, sizeof(T));
-            ++CFA::m_curSize[0];
-        }
-        else
-        {
-            CryLogAlways("FixedPodArray::insert_before() failing as element index invalid - NOT inserting element");
-            CRY_ASSERT_MESSAGE(0, "FixedPodArray::insert_before() failing as element index invalid - NOT inserting element");
-        }
-    }
-
-    ILINE int   find(const T& elem)
-    {
-        const uint size = CFA::m_curSize[0];
-        const int invalid = -1;
-
-        int index = invalid;
-
-        for (uint i = 0; i < size; ++i)
-        {
-            if (CFA::at(i) == elem)
-            {
-                index = i;
-                break;
-            }
-        }
-
-        return index;
-    }
-};
-
-//==================================================================================================
-// Name: PolygonMath2D
-// Desc: Polygon math helper functions optimized for breakable glass sim
-// Note: Functions often assume clockwise polygon point order
-// Author: Chris Bunner
-//==================================================================================================
-
-// Common polygon array types
-#define POLY_ARRAY_SIZE         45
-
-typedef FixedPodArray<Vec2, POLY_ARRAY_SIZE>                    TPolygonArray;
-typedef FixedPodArray<int, POLY_ARRAY_SIZE>                     TPolyIndexArray;
-
-// 2D triangle helpers
-bool        PointInTriangle2D(const Vec2& pt, const Vec2& a, const Vec2& b, const Vec2& c);
-bool        TriangleIsConvex2D(const Vec2& a, const Vec2& b, const Vec2& c);
-
-// 2D intersection helpers
-int         LineCircleIntersect2D(const Vec2& pt0, const Vec2& pt1, const Vec2& center, const float radiusSq, float& intersectA, float& intersectB);
-
-// 2D polygon helpers
-bool        PointInPolygon2D(const Vec2& pt, const Vec2* pPolygon, const int numPts);
-
-float       CalculatePolygonArea2D(const Vec2* pPolygon, const int numPts);
-Vec2        CalculatePolygonBounds2D(const Vec2* pPolygon, const int numPts);
-Vec2        CalculatePolygonCenter2D(const Vec2* pPolygon, const int numPts);
-bool        CalculatePolygonSharedPerimeter2D(const Vec2* pPolygonA, const int numPtsA, const Vec2* pPolygonB, const int numPtsB, float& connectionA, float& connectionB);
-
-void        TriangulatePolygon2D(const Vec2* pPolygon, const int numPolyPts, PodArray<Vec2>* pVertices, PodArray<uint8>* pIndices);
-void        SplitPolygonAroundPoint(TPolygonArray& outline, const Vec2& splitPt, const float splitRadius, TPolygonArray& splitInnerOutline);
-void        SplitPolygonAroundPoint(PodArray<Vec2>& outline, const Vec2& splitPt, const float splitRadius, TPolygonArray& splitInnerOutline);
-
-// Helper with result enum
-enum EPolygonInCircle2D
-{
-    EPolygonInCircle2D_Inside = 0,
-    EPolygonInCircle2D_Outside,
-    EPolygonInCircle2D_Overlap
-};
-
-EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, const Vec2* pPolygon, const int numPts);
-
-#endif // _POLYGON_MATH_2D_
diff --git a/Code/CryEngine/RenderDll/Common/RendElements/Utils/SpatialHashGrid.h b/Code/CryEngine/RenderDll/Common/RendElements/Utils/SpatialHashGrid.h
deleted file mode 100644
index be70d9e8c1..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendElements/Utils/SpatialHashGrid.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_UTILS_SPATIALHASHGRID_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDELEMENTS_UTILS_SPATIALHASHGRID_H
-#pragma once
-
-#if GLASSCFG_USE_HASH_GRID
-
-//==================================================================================================
-// Name: CSpatialHashGrid
-// Desc: Templated 2D spatial hashing grid spanning positively from origin
-// Author: Chris Bunner
-//==================================================================================================
-template <class T, uint32 GridSize, uint32 BucketSize>
-class CSpatialHashGrid
-{
-public:
-    CSpatialHashGrid(const float gridWidth, const float gridHeight);
-    ~CSpatialHashGrid();
-
-    uint32  HashPosition(const float x, const float y);
-    void        AddElementToGrid(const float x, const float y, const T& elem);
-    void        AddElementToGrid(const uint32 index, const T& elem);
-    void        RemoveElementFromGrid(const float x, const float y, const T& elem);
-    void        RemoveElementFromGrid(const uint32 index, const T& elem);
-
-    void        ClearGrid();
-
-#ifndef RELEASE
-    void        DebugDraw();
-#endif
-
-    // Bucket accessors
-    ILINE const CryFixedArray<T, BucketSize>* const GetBucket(const uint32 index)
-    {
-        return (index < m_area) ? &m_buckets[index] : NULL;
-    }
-
-    ILINE uint32 GetNumBuckets()
-    {
-        return m_area;
-    }
-
-    // Resizing
-    ILINE void Resize(const float gridWidth, const float gridHeight)
-    {
-        m_invCellWidth = m_fGridSize / gridWidth;
-        m_invCellHeight = m_fGridSize / gridHeight;
-    }
-
-private:
-    CSpatialHashGrid(const CSpatialHashGrid& rhs);
-    CSpatialHashGrid& operator = (const CSpatialHashGrid& rhs);
-
-    uint32      m_gridSize;
-    uint32      m_area;
-
-    float           m_fGridSize;
-    float           m_invCellWidth;
-    float           m_invCellHeight;
-
-    CryFixedArray<T, BucketSize> m_buckets[GridSize * GridSize];
-};//------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: Constructor
-//--------------------------------------------------------------------------------------------------
-template <class T, uint32 GridSize, uint32 BucketSize>
-CSpatialHashGrid<T, GridSize, BucketSize>::CSpatialHashGrid(const float gridWidth, const float gridHeight)
-    : m_gridSize(GridSize)
-    , m_area(GridSize * GridSize)
-    , m_fGridSize((float)GridSize)
-{
-    Resize(gridWidth, gridHeight);
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: Destructor
-//--------------------------------------------------------------------------------------------------
-template <class T, uint32 GridSize, uint32 BucketSize>
-CSpatialHashGrid<T, GridSize, BucketSize>::~CSpatialHashGrid()
-{
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: HashPosition
-// Desc: Hashes a position to cell index and performs simple bounds checking
-//--------------------------------------------------------------------------------------------------
-template <class T, uint32 GridSize, uint32 BucketSize>
-uint32 CSpatialHashGrid<T, GridSize, BucketSize>::HashPosition(const float x, const float y)
-{
-    const uint32 actualCellIndex = (uint32)(y * m_invCellHeight * m_fGridSize + x * m_invCellWidth);
-    const uint32 errorCellIndex = (uint32) - 1;
-
-    float cellX = x * m_invCellWidth;
-    float cellY = y * m_invCellHeight;
-
-    // Handle out of bounds
-    cellX = (float)fsel(cellX, cellX, -1.0f);
-    cellX = (float)fsel(m_fGridSize - cellX, cellX, -1.0f);
-    cellY = (float)fsel(cellY, cellY, -1.0f);
-    cellY = (float)fsel(m_fGridSize - cellY, cellY, -1.0f);
-
-    cellX = min(cellX, cellY);
-
-    const uint32 cellIndex = (cellX < 0.0f) ? errorCellIndex : actualCellIndex;
-    return cellIndex;
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: AddElementToGrid
-// Desc: Hashes and adds a unique element to the grid buckets
-//--------------------------------------------------------------------------------------------------
-template <class T, uint32 GridSize, uint32 BucketSize>
-void CSpatialHashGrid<T, GridSize, BucketSize>::AddElementToGrid(const float x, const float y, const T& elem)
-{
-    uint32 elemCell = HashPosition(x, y);
-    AddElementToGrid(elemCell, elem);
-}
-
-template <class T, uint32 GridSize, uint32 BucketSize>
-void CSpatialHashGrid<T, GridSize, BucketSize>::AddElementToGrid(const uint32 index, const T& elem)
-{
-    if (index < m_area)
-    {
-        // Only add unique elements
-        CryFixedArray<T, BucketSize>* pBucket = &m_buckets[index];
-        const uint numElems = pBucket->size();
-        const T* pElems = pBucket->begin();
-        int elemIndex = -1;
-
-        if (numElems < BucketSize)
-        {
-            for (uint i = 0; i < numElems; ++i)
-            {
-                if (pElems[i] == elem)
-                {
-                    elemIndex = i;
-                    break;
-                }
-            }
-
-            if (elemIndex == -1)
-            {
-                pBucket->push_back(elem);
-            }
-        }
-    }
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: RemoveElementFromGrid
-// Desc: Hashes and removes an element from the grid buckets
-//--------------------------------------------------------------------------------------------------
-template <class T, uint32 GridSize, uint32 BucketSize>
-void CSpatialHashGrid<T, GridSize, BucketSize>::RemoveElementFromGrid(const float x, const float y, const T& elem)
-{
-    uint32 elemCell = HashPosition(x, y);
-    RemoveElementFromGrid(elemCell, elem);
-}
-
-template <class T, uint32 GridSize, uint32 BucketSize>
-void CSpatialHashGrid<T, GridSize, BucketSize>::RemoveElementFromGrid(const uint32 index, const T& elem)
-{
-    if (index < m_area)
-    {
-        CryFixedArray<T, BucketSize>* pBucket = &m_buckets[index];
-        const uint numElems = pBucket->size();
-        T* pElems = pBucket->begin();
-
-        for (uint i = 0; i < numElems; ++i)
-        {
-            if (pElems[i] == elem)
-            {
-                pElems[i] = pElems[numElems - 1];
-                pBucket->pop_back();
-                break;
-            }
-        }
-    }
-}//-------------------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------------------
-// Name: ClearGrid
-// Desc: Clears all grid buckets
-//--------------------------------------------------------------------------------------------------
-template <class T, uint32 GridSize, uint32 BucketSize>
-void CSpatialHashGrid<T, GridSize, BucketSize>::ClearGrid()
-{
-    for (uint32 i = 0; i < m_area; ++i)
-    {
-        m_buckets[i].clear();
-    }
-}//-------------------------------------------------------------------------------------------------
-
-#ifndef RELEASE
-//--------------------------------------------------------------------------------------------------
-// Name: DebugDraw
-// Desc: Draws the grid element counts to the screen
-//--------------------------------------------------------------------------------------------------
-template <class T, uint32 GridSize, uint32 BucketSize>
-void CSpatialHashGrid<T, GridSize, BucketSize>::DebugDraw()
-{
-    IRenderAuxGeom* pRenderer = gEnv->pRenderer->GetIRenderAuxGeom();
-    SAuxGeomRenderFlags oldFlags = pRenderer->GetRenderFlags();
-
-    SAuxGeomRenderFlags newFlags = e_Def2DPublicRenderflags;
-    newFlags.SetCullMode(e_CullModeNone);
-    newFlags.SetDepthWriteFlag(e_DepthWriteOff);
-    newFlags.SetAlphaBlendMode(e_AlphaBlended);
-    pRenderer->SetRenderFlags(newFlags);
-
-    // Draw black backing
-    const float invWidth = 1.0f / (float)gEnv->pRenderer->GetWidth();
-    const float invHeight = 1.0f / (float)gEnv->pRenderer->GetHeight();
-
-    const float minX = (322.5f - m_fGridSize * 15.0f) * invWidth;
-    const float maxX = (322.5f) * invWidth;
-    const float minY = (370.0f) * invHeight;
-    const float maxY = (370.0f + m_fGridSize * 15.0f) * invHeight;
-
-    Vec3 quad[6] =
-    {
-        Vec3(minX, minY, 0.0f),
-        Vec3(minX, maxY, 0.0f),
-        Vec3(maxX, maxY, 0.0f),
-
-        Vec3(minX, minY, 0.0f),
-        Vec3(maxX, maxY, 0.0f),
-        Vec3(maxX, minY, 0.0f)
-    };
-
-    pRenderer->DrawTriangles(quad, 6, ColorB(0, 0, 0, 127));
-    pRenderer->SetRenderFlags(oldFlags);
-
-    // Draw hash grid data
-    const ColorF col[8] =
-    {
-        ColorF(0.0f, 0.0f, 0.0f, 1.0f),
-        ColorF(1.0f, 0.0f, 0.0f, 1.0f),
-        ColorF(0.5f, 1.0f, 0.0f, 1.0f),
-        ColorF(0.0f, 1.0f, 0.0f, 1.0f),
-        ColorF(0.0f, 1.0f, 0.5f, 1.0f),
-        ColorF(0.0f, 0.5f, 1.0f, 1.0f),
-        ColorF(0.0f, 0.0f, 1.0f, 1.0f),
-        ColorF(0.5f, 0.0f, 1.0f, 1.0f),
-    };
-
-    float x = 315.0f, y = 370.0f;
-
-    for (uint32 i = 0; i < m_gridSize; ++i)
-    {
-        for (uint32 j = 0; j < m_gridSize; ++j)
-        {
-            int index = i * m_gridSize + j;
-            int count = (int)m_buckets[index].size();
-            ColorF textCol = col[min < int > (count, 7)];
-
-            if (count > 0)
-            {
-                textCol.r = textCol.r * 0.4f + 0.6f;
-                textCol.g = textCol.g * 0.4f + 0.6f;
-                textCol.b = textCol.b * 0.4f + 0.6f;
-            }
-
-            gEnv->pRenderer->Draw2dLabel(x, y, 1.0f, &textCol.r, false, "%i", count);
-            y += 15.0f;
-        }
-
-        x -= 15.0f;
-        y = 370.0f;
-    }
-}//-------------------------------------------------------------------------------------------------
-#endif // !RELEASE
-
-#endif // GLASSCFG_USE_HASH_GRID
-#endif // _SPATIAL_HASH_GRID_
diff --git a/Code/CryEngine/RenderDll/Common/RenderAuxGeom.cpp b/Code/CryEngine/RenderDll/Common/RenderAuxGeom.cpp
deleted file mode 100644
index 8330c278fe..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderAuxGeom.cpp
+++ /dev/null
@@ -1,2310 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "RenderAuxGeom.h"
-#include <IStereoRenderer.h>
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-
-static inline uint32 PackColor(const ColorB& col)
-{
-    return(((uint8) (col.a) << 24) +
-           ((uint8) (col.r) << 16) +
-           ((uint8) (col.g) <<  8) +
-           ((uint8) (col.b)));
-}
-
-static inline ColorB
-ScaleColor(ColorB color, float scale)
-{
-    Vec3 col((float) color.r, (float) color.g, (float) color.b);
-    col *= scale;
-    return(ColorB((uint8) col.x, (uint8)col.y, (uint8) col.z, color.a));
-}
-
-static inline uint32 AlphaFlags(const ColorB& colV)
-{
-    if (colV.a > 0 && colV.a < 0xFF)
-    {
-        return e_AlphaBlended;
-    }
-    return 0;
-}
-
-CAuxGeomCB::CAuxGeomCB(IRenderAuxGeomImpl* pRenderAuxGeom)
-    : m_pRenderAuxGeom(pRenderAuxGeom)
-    , m_lastFlushPos(0)
-{
-    assert(m_pRenderAuxGeom != 0);
-    m_cbCurrent = AddCBuffer();
-}
-
-CAuxGeomCB::~CAuxGeomCB()
-{
-    for (CBList::iterator it = m_cbData.begin(); it != m_cbData.end(); ++it)
-    {
-        delete *it;
-    }
-}
-
-
-void CAuxGeomCB::SetRenderFlags(const SAuxGeomRenderFlags& renderFlags)
-{
-    // make sure caller only tries to set public bits
-    assert(0 == (renderFlags.m_renderFlags & ~e_PublicParamsMask));
-    m_cbCurrent->m_curRenderFlags = renderFlags;
-}
-
-
-SAuxGeomRenderFlags CAuxGeomCB::GetRenderFlags()
-{
-    return(m_cbCurrent->m_curRenderFlags);
-}
-
-
-void CAuxGeomCB::DrawPoint(const Vec3& v, const ColorB& col, uint8 size)
-{
-    assert(size > 0);
-    SAuxVertex* pVertex(0);
-    AddPrimitive(pVertex, 1, CreatePointRenderFlags(size));
-
-    pVertex->xyz = v;
-    pVertex->color.dcolor = PackColor(col);
-}
-
-
-void CAuxGeomCB::DrawPoints(const Vec3* v, uint32 numPoints, const ColorB& col, uint8 size)
-{
-    assert(size > 0);
-    SAuxVertex* pVertices(0);
-    AddPrimitive(pVertices, numPoints, CreatePointRenderFlags(size));
-
-    uint32 color(PackColor(col));
-    for (uint32 i(0); i < numPoints; ++i)
-    {
-        pVertices[ i ].xyz = v[ i ];
-        pVertices[ i ].color.dcolor = color;
-    }
-}
-
-
-void CAuxGeomCB::DrawPoints(const Vec3* v, uint32 numPoints, const ColorB* col, uint8 size)
-{
-    assert(size > 0);
-    SAuxVertex* pVertices(0);
-    AddPrimitive(pVertices, numPoints, CreatePointRenderFlags(size));
-
-    for (uint32 i(0); i < numPoints; ++i)
-    {
-        pVertices[ i ].xyz = v[ i ];
-        pVertices[ i ].color.dcolor = PackColor(col[ i ]);
-    }
-}
-
-void CAuxGeomCB::DrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, float thickness)
-{
-    if (thickness <= 1.0f)
-    {
-        SAuxVertex* pVertices(0);
-        AddPrimitive(pVertices, 2, CreateLineRenderFlags(false) | AlphaFlags(colV0) | AlphaFlags(colV1));
-
-        pVertices[ 0 ].xyz = v0;
-        pVertices[ 0 ].color.dcolor = PackColor(colV0);
-        pVertices[ 1 ].xyz = v1;
-        pVertices[ 1 ].color.dcolor = PackColor(colV1);
-    }
-    else
-    {
-        DrawThickLine(v0, colV0, v1, colV1, thickness);
-    }
-}
-
-
-void CAuxGeomCB::DrawLines(const Vec3* v, uint32 numPoints, const ColorB& col, float thickness)
-{
-    assert((numPoints >= 2) && (0 == (numPoints & 1)));
-
-    if (thickness <= 1.0f)
-    {
-        SAuxVertex* pVertices(0);
-        AddPrimitive(pVertices, numPoints, CreateLineRenderFlags(false) | AlphaFlags(col));
-
-        uint32 color(PackColor(col));
-        for (uint32 i(0); i < numPoints; ++i)
-        {
-            pVertices[ i ].xyz = v[ i ];
-            pVertices[ i ].color.dcolor = color;
-        }
-    }
-    else
-    {
-        for (uint32 i(0); i < numPoints; i += 2)
-        {
-            DrawThickLine(v[ i ], col, v[ i + 1], col, thickness);
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawLines(const Vec3* v, uint32 numPoints, const ColorB* col, float thickness)
-{
-    assert((numPoints >= 2) && (0 == (numPoints & 1)));
-
-    if (thickness <= 1.0f)
-    {
-        SAuxVertex* pVertices(0);
-        AddPrimitive(pVertices, numPoints, CreateLineRenderFlags(false));
-
-        for (uint32 i(0); i < numPoints; ++i)
-        {
-            pVertices[ i ].xyz = v[ i ];
-            pVertices[ i ].color.dcolor = PackColor(col[ i ]);
-        }
-    }
-    else
-    {
-        for (uint32 i(0); i < numPoints; i += 2)
-        {
-            DrawThickLine(v[ i ], col[ i ], v[ i + 1], col[ i + 1 ], thickness);
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col, float thickness)
-{
-    assert(numPoints >= 2);
-    assert((numIndices >= 2) && (0 == (numIndices & 1)));
-
-    if (thickness <= 1.0f)
-    {
-        SAuxVertex* pVertices(0);
-        vtx_idx* pIndices(0);
-        AddIndexedPrimitive(pVertices, numPoints, pIndices, numIndices, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-        uint32 color(PackColor(col));
-        for (uint32 i(0); i < numPoints; ++i)
-        {
-            pVertices[ i ].xyz = v[ i ];
-            pVertices[ i ].color.dcolor = color;
-        }
-
-        memcpy(pIndices, ind, sizeof(pIndices[0]) * numIndices);
-    }
-    else
-    {
-        for (uint32 i(0); i < numIndices; i += 2)
-        {
-            DrawThickLine(v[ ind[ i ] ], col, v[ ind[ i + 1 ] ], col, thickness);
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col, float thickness)
-{
-    assert(numPoints >= 2);
-    assert((numIndices >= 2) && (0 == (numIndices & 1)));
-
-    if (thickness <= 1.0f)
-    {
-        SAuxVertex* pVertices(0);
-        vtx_idx* pIndices(0);
-        AddIndexedPrimitive(pVertices, numPoints, pIndices, numIndices, CreateLineRenderFlags(true));
-
-        for (uint32 i(0); i < numPoints; ++i)
-        {
-            pVertices[ i ].xyz = v[ i ];
-            pVertices[ i ].color.dcolor = PackColor(col[ i ]);
-        }
-
-        memcpy(pIndices, ind, sizeof(pIndices[0]) * numIndices);
-    }
-    else
-    {
-        for (uint32 i(0); i < numIndices; i += 2)
-        {
-            DrawThickLine(v[ ind[ i ] ], col[ ind[ i ] ], v[ ind[ i + 1 ] ], col[ ind[ i + 1 ] ], thickness);
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB& col, float thickness)
-{
-    assert(numPoints >= 2);
-    assert(!closed || numPoints >= 3);   // if "closed" then we need at least three vertices
-
-    if (thickness <= 1.0f)
-    {
-        SAuxVertex* pVertices(0);
-        vtx_idx* pIndices(0);
-        AddIndexedPrimitive(pVertices, numPoints, pIndices, (false != closed) ? 2 * numPoints  : 2 * (numPoints - 1), CreateLineRenderFlags(true) | AlphaFlags(col));
-
-        uint32 color(PackColor(col));
-        for (uint32 i(0); i < numPoints; ++i)
-        {
-            pVertices[ i ].xyz = v[ i ];
-            pVertices[ i ].color.dcolor = color;
-        }
-
-        for (uint32 i(0); i < numPoints - 1; ++i)
-        {
-            pIndices[ 0 ] = i;
-            pIndices[ 1 ] = i + 1;
-            pIndices += 2;
-        }
-        if (false !=  closed)
-        {
-            pIndices[ 0 ] = numPoints - 1;
-            pIndices[ 1 ] = 0;
-        }
-    }
-    else
-    {
-        for (uint32 i(0); i < numPoints - 1; ++i)
-        {
-            DrawThickLine(v[ i ], col, v[ i + 1 ], col, thickness);
-        }
-        if (false !=  closed)
-        {
-            DrawThickLine(v[ numPoints - 1 ], col, v[ 0 ], col, thickness);
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB* col, float thickness)
-{
-    assert(numPoints >= 2);
-    assert(!closed || numPoints >= 3);   // if "closed" then we need at least three vertices
-
-    if (thickness <= 1.0f)
-    {
-        SAuxVertex* pVertices(0);
-        vtx_idx* pIndices(0);
-        AddIndexedPrimitive(pVertices, numPoints, pIndices, (false != closed) ? 2 * numPoints  : 2 * (numPoints - 1), CreateLineRenderFlags(true));
-
-        for (uint32 i(0); i < numPoints; ++i)
-        {
-            pVertices[ i ].xyz = v[ i ];
-            pVertices[ i ].color.dcolor = PackColor(col[ i ]);
-        }
-
-        for (uint32 i(0); i < numPoints - 1; ++i)
-        {
-            pIndices[ 0 ] = i;
-            pIndices[ 1 ] = i + 1;
-            pIndices += 2;
-        }
-        if (false !=  closed)
-        {
-            pIndices[ 0 ] = numPoints - 1;
-            pIndices[ 1 ] = 0;
-        }
-    }
-    else
-    {
-        for (uint32 i(0); i < numPoints - 1; ++i)
-        {
-            DrawThickLine(v[ i ], col[ i ], v[ i + 1 ], col[ i + 1 ], thickness);
-        }
-        if (false !=  closed)
-        {
-            DrawThickLine(v[ numPoints - 1 ], col[ numPoints - 1 ], v[ 0 ], col[ 0 ], thickness);
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawThickLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, float thickness)
-{
-    assert(thickness > 0.0f);
-    assert(0 != gRenDev);
-
-    // allocate space for two triangles
-    SAuxVertex* pVertices(0);
-    AddPrimitive(pVertices, 6, CreateTriangleRenderFlags(false) | e_TriListParam_ProcessThickLines);
-
-    // Encode paramaters for thick line in vertex memory.
-    // The actual "aux render" implementation has to process these before feeding it to the GPU.
-    // This was done as implementation needs access to several render specific informations
-    // (see D3DRenderAuxGeom.cpp for an implementation).
-    pVertices[ 0 ].xyz = v0;
-    pVertices[ 0 ].color.dcolor = PackColor(colV0);
-    pVertices[ 1 ].xyz = v1;
-    pVertices[ 1 ].color.dcolor = PackColor(colV1);
-
-    pVertices[ 2 ].xyz = Vec3(thickness, 0.0f, 0.0f);
-}
-
-
-void CAuxGeomCB::DrawTriangle(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, const Vec3& v2, const ColorB& colV2)
-{
-    SAuxVertex* pVertices(0);
-    AddPrimitive(pVertices, 3, CreateTriangleRenderFlags(false));
-
-    pVertices[ 0 ].xyz = v0;
-    pVertices[ 0 ].color.dcolor = PackColor(colV0);
-
-    pVertices[ 1 ].xyz = v1;
-    pVertices[ 1 ].color.dcolor = PackColor(colV1);
-
-    pVertices[ 2 ].xyz = v2;
-    pVertices[ 2 ].color.dcolor = PackColor(colV2);
-}
-
-
-void CAuxGeomCB::DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB& col)
-{
-    assert((numPoints >= 3) && (0 == (numPoints % 3)));
-
-    SAuxVertex* pVertices(0);
-    AddPrimitive(pVertices, numPoints, CreateTriangleRenderFlags(false));
-
-    uint32 color(PackColor(col));
-    for (uint32 i(0); i < numPoints; ++i)
-    {
-        pVertices[ i ].xyz = v[ i ];
-        pVertices[ i ].color.dcolor = color;
-    }
-}
-
-
-void CAuxGeomCB::DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB* col)
-{
-    assert((numPoints >= 3) && (0 == (numPoints % 3)));
-
-    SAuxVertex* pVertices(0);
-    AddPrimitive(pVertices, numPoints, CreateTriangleRenderFlags(false));
-
-    for (uint32 i(0); i < numPoints; ++i)
-    {
-        pVertices[ i ].xyz = v[ i ];
-        pVertices[ i ].color.dcolor = PackColor(col[ i ]);
-    }
-}
-
-
-void CAuxGeomCB::DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col)
-{
-    assert(numPoints >= 3);
-    assert((numIndices >= 3) && (0 == (numIndices % 3)));
-
-    SAuxVertex* pVertices(0);
-    vtx_idx* pIndices(0);
-    AddIndexedPrimitive(pVertices, numPoints, pIndices, numIndices, CreateTriangleRenderFlags(true));
-
-    uint32 color(PackColor(col));
-    for (uint32 i(0); i < numPoints; ++i)
-    {
-        pVertices[ i ].xyz = v[ i ];
-        pVertices[ i ].color.dcolor = color;
-    }
-
-    memcpy(pIndices, ind, sizeof(pIndices[0]) * numIndices);
-}
-
-
-void CAuxGeomCB::DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col)
-{
-    assert(numPoints >= 3);
-    assert((numIndices >= 3) && (0 == (numIndices % 3)));
-
-    SAuxVertex* pVertices(0);
-    vtx_idx* pIndices(0);
-    AddIndexedPrimitive(pVertices, numPoints, pIndices, numIndices, CreateTriangleRenderFlags(true));
-
-    for (uint32 i(0); i < numPoints; ++i)
-    {
-        pVertices[ i ].xyz = v[ i ];
-        pVertices[ i ].color.dcolor = PackColor(col[ i ]);
-    }
-
-    memcpy(pIndices, ind, sizeof(pIndices[0]) * numIndices);
-}
-
-void CAuxGeomCB::DrawQuad(float width, float height, const Matrix34& matWorld, const ColorB& col, bool drawShaded)
-{
-    if (width <= 0.0f && height <= 0.0f)
-    {
-        return;
-    }
-
-    SAuxDrawObjParams* pDrawParams(0);
-    AddObject(pDrawParams, CreateObjectRenderFlags(eDOT_Quad));
-
-    Matrix34 scaleMatrix = Matrix33::CreateScale(Vec3(width, 1.0f, height));
-    Matrix34 finalMatrix = matWorld * scaleMatrix;
-
-    Matrix33 rotationMatrix;
-    matWorld.GetRotation33(rotationMatrix);
-
-    pDrawParams->m_matWorld = finalMatrix;
-    pDrawParams->m_matWorldRotation = rotationMatrix;
-    pDrawParams->m_color = PackColor(col);
-    pDrawParams->m_size = max(width, height) * 0.5f;
-    pDrawParams->m_shaded = drawShaded;
-}
-
-
-void CAuxGeomCB::DrawAABB(const AABB& aabb, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle)
-{
-    SAuxVertex* pVertices(0);
-    vtx_idx* pIndices(0);
-
-    if (eBBD_Extremes_Color_Encoded == bbDrawStyle)
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            pIndices[  6 ] = 7;
-            pIndices[  7 ] = 6;
-            pIndices[  8 ] = 5;
-            pIndices[  9 ] = 7;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 4;
-
-            pIndices[ 12 ] = 3;
-            pIndices[ 13 ] = 2;
-            pIndices[ 14 ] = 6;
-            pIndices[ 15 ] = 3;
-            pIndices[ 16 ] = 6;
-            pIndices[ 17 ] = 7;
-
-            pIndices[ 18 ] = 4;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 1;
-            pIndices[ 21 ] = 4;
-            pIndices[ 22 ] = 1;
-            pIndices[ 23 ] = 0;
-
-            pIndices[ 24 ] = 1;
-            pIndices[ 25 ] = 5;
-            pIndices[ 26 ] = 6;
-            pIndices[ 27 ] = 1;
-            pIndices[ 28 ] = 6;
-            pIndices[ 29 ] = 2;
-
-            pIndices[ 30 ] = 4;
-            pIndices[ 31 ] = 0;
-            pIndices[ 32 ] = 3;
-            pIndices[ 33 ] = 4;
-            pIndices[ 34 ] = 3;
-            pIndices[ 35 ] = 7;
-        }
-
-        uint32 color(PackColor(col));
-        uint32 colorMin(PackColor(ColorB(15, 15, 15, col.a)));
-        uint32 colorMax(PackColor(ColorB(255, 255, 255, col.a)));
-
-        pVertices[ 0 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.min.z);
-        pVertices[ 0 ].color.dcolor = colorMin;
-        pVertices[ 1 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.min.z);
-        pVertices[ 1 ].color.dcolor = color;
-        pVertices[ 2 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.min.z);
-        pVertices[ 2 ].color.dcolor = color;
-        pVertices[ 3 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.min.z);
-        pVertices[ 3 ].color.dcolor = color;
-        pVertices[ 4 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.max.z);
-        pVertices[ 4 ].color.dcolor = color;
-        pVertices[ 5 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.max.z);
-        pVertices[ 5 ].color.dcolor = color;
-        pVertices[ 6 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.max.z);
-        pVertices[ 6 ].color.dcolor = colorMax;
-        pVertices[ 7 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.max.z);
-        pVertices[ 7 ].color.dcolor = color;
-    }
-    else
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            uint32 color(PackColor(col));
-
-            pVertices[ 0 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.min.z);
-            pVertices[ 0 ].color.dcolor = color;
-            pVertices[ 1 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.min.z);
-            pVertices[ 1 ].color.dcolor = color;
-            pVertices[ 2 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.min.z);
-            pVertices[ 2 ].color.dcolor = color;
-            pVertices[ 3 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.min.z);
-            pVertices[ 3 ].color.dcolor = color;
-            pVertices[ 4 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.max.z);
-            pVertices[ 4 ].color.dcolor = color;
-            pVertices[ 5 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.max.z);
-            pVertices[ 5 ].color.dcolor = color;
-            pVertices[ 6 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.max.z);
-            pVertices[ 6 ].color.dcolor = color;
-            pVertices[ 7 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.max.z);
-            pVertices[ 7 ].color.dcolor = color;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 24, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            Vec3 xyz(aabb.min.x, aabb.min.y, aabb.min.z);
-            Vec3 xyZ(aabb.min.x, aabb.min.y, aabb.max.z);
-            Vec3 xYz(aabb.min.x, aabb.max.y, aabb.min.z);
-            Vec3 xYZ(aabb.min.x, aabb.max.y, aabb.max.z);
-            Vec3 Xyz(aabb.max.x, aabb.min.y, aabb.min.z);
-            Vec3 XyZ(aabb.max.x, aabb.min.y, aabb.max.z);
-            Vec3 XYz(aabb.max.x, aabb.max.y, aabb.min.z);
-            Vec3 XYZ(aabb.max.x, aabb.max.y, aabb.max.z);
-
-            uint32 colDown(PackColor(ScaleColor(col, 0.5f)));
-            pVertices[  0 ].xyz = xyz;
-            pVertices[  0 ].color.dcolor = colDown;
-            pVertices[  1 ].xyz = xYz;
-            pVertices[  1 ].color.dcolor = colDown;
-            pVertices[  2 ].xyz = XYz;
-            pVertices[  2 ].color.dcolor = colDown;
-            pVertices[  3 ].xyz = Xyz;
-            pVertices[  3 ].color.dcolor = colDown;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            uint32 colTop(PackColor(col));
-            pVertices[  4 ].xyz = xyZ;
-            pVertices[  4 ].color.dcolor = colTop;
-            pVertices[  5 ].xyz = XyZ;
-            pVertices[  5 ].color.dcolor = colTop;
-            pVertices[  6 ].xyz = XYZ;
-            pVertices[  6 ].color.dcolor = colTop;
-            pVertices[  7 ].xyz = xYZ;
-            pVertices[  7 ].color.dcolor = colTop;
-
-            pIndices[  6 ] = 4;
-            pIndices[  7 ] = 5;
-            pIndices[  8 ] = 6;
-            pIndices[  9 ] = 4;
-            pIndices[ 10 ] = 6;
-            pIndices[ 11 ] = 7;
-
-            uint32 colBack(PackColor(ScaleColor(col, 0.6f)));
-            pVertices[  8 ].xyz = xyz;
-            pVertices[  8 ].color.dcolor = colBack;
-            pVertices[  9 ].xyz = Xyz;
-            pVertices[  9 ].color.dcolor = colBack;
-            pVertices[ 10 ].xyz = XyZ;
-            pVertices[ 10 ].color.dcolor = colBack;
-            pVertices[ 11 ].xyz = xyZ;
-            pVertices[ 11 ].color.dcolor = colBack;
-
-            pIndices[ 12 ] = 8;
-            pIndices[  13 ] = 9;
-            pIndices[ 14 ] = 10;
-            pIndices[ 15 ] = 8;
-            pIndices[  16 ] = 10;
-            pIndices[ 17 ] = 11;
-
-            uint32 colFront(PackColor(ScaleColor(col, 0.9f)));
-            pVertices[ 12 ].xyz = xYz;
-            pVertices[ 12 ].color.dcolor = colFront;
-            pVertices[ 13 ].xyz = xYZ;
-            pVertices[ 13 ].color.dcolor = colFront;
-            pVertices[ 14 ].xyz = XYZ;
-            pVertices[ 14 ].color.dcolor = colFront;
-            pVertices[ 15 ].xyz = XYz;
-            pVertices[ 15 ].color.dcolor = colFront;
-
-            pIndices[ 18 ] = 12;
-            pIndices[ 19 ] = 13;
-            pIndices[ 20 ] = 14;
-            pIndices[ 21 ] = 12;
-            pIndices[ 22 ] = 14;
-            pIndices[ 23 ] = 15;
-
-            uint32 colLeft(PackColor(ScaleColor(col, 0.7f)));
-            pVertices[ 16 ].xyz = xyz;
-            pVertices[ 16 ].color.dcolor = colLeft;
-            pVertices[ 17 ].xyz = xyZ;
-            pVertices[ 17 ].color.dcolor = colLeft;
-            pVertices[ 18 ].xyz = xYZ;
-            pVertices[ 18 ].color.dcolor = colLeft;
-            pVertices[ 19 ].xyz = xYz;
-            pVertices[ 19 ].color.dcolor = colLeft;
-
-            pIndices[ 24 ] = 16;
-            pIndices[ 25 ] = 17;
-            pIndices[ 26 ] = 18;
-            pIndices[ 27 ] = 16;
-            pIndices[ 28 ] = 18;
-            pIndices[ 29 ] = 19;
-
-            uint32 colRight(PackColor(ScaleColor(col, 0.8f)));
-            pVertices[ 20 ].xyz = Xyz;
-            pVertices[ 20 ].color.dcolor = colRight;
-            pVertices[ 21 ].xyz = XYz;
-            pVertices[ 21 ].color.dcolor = colRight;
-            pVertices[ 22 ].xyz = XYZ;
-            pVertices[ 22 ].color.dcolor = colRight;
-            pVertices[ 23 ].xyz = XyZ;
-            pVertices[ 23 ].color.dcolor = colRight;
-
-            pIndices[ 30 ] = 20;
-            pIndices[ 31 ] = 21;
-            pIndices[ 32 ] = 22;
-            pIndices[ 33 ] = 20;
-            pIndices[ 34 ] = 22;
-            pIndices[ 35 ] = 23;
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawAABBs(const AABB* aabbs, uint32 aabbCount, bool bSolid, const ColorB& col,
-    const EBoundingBoxDrawStyle& bbDrawStyle)
-{
-    SAuxVertex* pVertices(0);
-    vtx_idx* pIndices(0);
-
-    if (eBBD_Extremes_Color_Encoded == bbDrawStyle)
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8 * aabbCount, pIndices, 24 * aabbCount, CreateLineRenderFlags(true));
-
-            for (size_t i = 0; i < aabbCount; ++i)
-            {
-                size_t n = i * 24;
-                size_t nv = i * 8;
-                pIndices[ n + 0 ] = 0;
-                pIndices[  n + 1 ] = nv + 1;
-                pIndices[ n + 2 ] = 1;
-                pIndices[  n + 3 ] = nv + 2;
-                pIndices[ n + 4 ] = 2;
-                pIndices[  n + 5 ] = nv + 3;
-                pIndices[ n + 6 ] = 3;
-                pIndices[  n + 7 ] = nv + 0;
-
-                pIndices[ n + 8 ] = 4;
-                pIndices[  n + 9 ] = nv + 5;
-                pIndices[ n + 10 ] = 5;
-                pIndices[ n + 11 ] = nv + 6;
-                pIndices[ n + 12 ] = 6;
-                pIndices[ n + 13 ] = nv + 7;
-                pIndices[ n + 14 ] = 7;
-                pIndices[ n + 15 ] = nv + 4;
-
-                pIndices[ n + 16 ] = 0;
-                pIndices[ n + 17 ] = nv + 4;
-                pIndices[ n + 18 ] = 1;
-                pIndices[ n + 19 ] = nv + 5;
-                pIndices[ n + 20 ] = 2;
-                pIndices[ n + 21 ] = nv + 6;
-                pIndices[ n + 22 ] = 3;
-                pIndices[ n + 23 ] = nv + 7;
-            }
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 8 * aabbCount, pIndices, 36 * aabbCount, CreateTriangleRenderFlags(true));
-
-            for (size_t i = 0; i < aabbCount; ++i)
-            {
-                size_t n = i * 36;
-                size_t nv = i * 8;
-
-                pIndices[  n + 0 ] = nv + 0;
-                pIndices[  n + 1 ] = nv + 1;
-                pIndices[  n + 2 ] = nv + 2;
-                pIndices[  n + 3 ] = nv + 0;
-                pIndices[  n + 4 ] = nv + 2;
-                pIndices[  n + 5 ] = nv + 3;
-
-                pIndices[  n + 6 ] = nv + 7;
-                pIndices[  n + 7 ] = nv + 6;
-                pIndices[  n + 8 ] = nv + 5;
-                pIndices[  n + 9 ] = nv + 7;
-                pIndices[ n + 10 ] = nv + 5;
-                pIndices[ n + 11 ] = nv + 4;
-
-                pIndices[ n + 12 ] = nv + 3;
-                pIndices[ n + 13 ] = nv + 2;
-                pIndices[ n + 14 ] = nv + 6;
-                pIndices[ n + 15 ] = nv + 3;
-                pIndices[ n + 16 ] = nv + 6;
-                pIndices[ n + 17 ] = nv + 7;
-
-                pIndices[ n + 18 ] = nv + 4;
-                pIndices[ n + 19 ] = nv + 5;
-                pIndices[ n + 20 ] = nv + 1;
-                pIndices[ n + 21 ] = nv + 4;
-                pIndices[ n + 22 ] = nv + 1;
-                pIndices[ n + 23 ] = nv + 0;
-
-                pIndices[ n + 24 ] = nv + 1;
-                pIndices[ n + 25 ] = nv + 5;
-                pIndices[ n + 26 ] = nv + 6;
-                pIndices[ n + 27 ] = nv + 1;
-                pIndices[ n + 28 ] = nv + 6;
-                pIndices[ n + 29 ] = nv + 2;
-
-                pIndices[ n + 30 ] = nv + 4;
-                pIndices[ n + 31 ] = nv + 0;
-                pIndices[ n + 32 ] = nv + 3;
-                pIndices[ n + 33 ] = nv + 4;
-                pIndices[ n + 34 ] = nv + 3;
-                pIndices[ n + 35 ] = nv + 7;
-            }
-        }
-
-        uint32 color(PackColor(col));
-        uint32 colorMin(PackColor(ColorB(15, 15, 15, col.a)));
-        uint32 colorMax(PackColor(ColorB(255, 255, 255, col.a)));
-
-        for (size_t i = 0; i < aabbCount; ++i)
-        {
-            const AABB& aabb = aabbs[i];
-
-            size_t n = i * 8;
-            pVertices[ n + 0 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.min.z);
-            pVertices[ n + 0 ].color.dcolor = colorMin;
-            pVertices[ n + 1 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.min.z);
-            pVertices[ n + 1 ].color.dcolor = color;
-            pVertices[ n + 2 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.min.z);
-            pVertices[ n + 2 ].color.dcolor = color;
-            pVertices[ n + 3 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.min.z);
-            pVertices[ n + 3 ].color.dcolor = color;
-            pVertices[ n + 4 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.max.z);
-            pVertices[ n + 4 ].color.dcolor = color;
-            pVertices[ n + 5 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.max.z);
-            pVertices[ n + 5 ].color.dcolor = color;
-            pVertices[ n + 6 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.max.z);
-            pVertices[ n + 6 ].color.dcolor = colorMax;
-            pVertices[ n + 7 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.max.z);
-            pVertices[ n + 7 ].color.dcolor = color;
-        }
-    }
-    else
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8 * aabbCount, pIndices, 24 * aabbCount, CreateLineRenderFlags(true));
-
-            uint32 color(PackColor(col));
-
-            for (size_t i = 0; i < aabbCount; ++i)
-            {
-                const AABB& aabb = aabbs[i];
-                size_t nv = i * 24;
-                size_t n = i * 8;
-
-                pVertices[ nv + 0 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.min.z);
-                pVertices[ nv + 0 ].color.dcolor = color;
-                pVertices[ nv + 1 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.min.z);
-                pVertices[ nv + 1 ].color.dcolor = color;
-                pVertices[ nv + 2 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.min.z);
-                pVertices[ nv + 2 ].color.dcolor = color;
-                pVertices[ nv + 3 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.min.z);
-                pVertices[ nv + 3 ].color.dcolor = color;
-                pVertices[ nv + 4 ].xyz = Vec3(aabb.min.x, aabb.min.y, aabb.max.z);
-                pVertices[ nv + 4 ].color.dcolor = color;
-                pVertices[ nv + 5 ].xyz = Vec3(aabb.min.x, aabb.max.y, aabb.max.z);
-                pVertices[ nv + 5 ].color.dcolor = color;
-                pVertices[ nv + 6 ].xyz = Vec3(aabb.max.x, aabb.max.y, aabb.max.z);
-                pVertices[ nv + 6 ].color.dcolor = color;
-                pVertices[ nv + 7 ].xyz = Vec3(aabb.max.x, aabb.min.y, aabb.max.z);
-                pVertices[ nv + 7 ].color.dcolor = color;
-
-                pIndices[  n + 0 ] = nv + 0;
-                pIndices[  n + 1 ] = nv + 1;
-                pIndices[  n + 2 ] = nv + 1;
-                pIndices[  n + 3 ] = nv + 2;
-                pIndices[  n + 4 ] = nv + 2;
-                pIndices[  n + 5 ] = nv + 3;
-                pIndices[  n + 6 ] = nv + 3;
-                pIndices[  n + 7 ] = nv + 0;
-
-                pIndices[  n + 8 ] = nv + 4;
-                pIndices[  n + 9 ] = nv + 5;
-                pIndices[ n + 10 ] = nv + 5;
-                pIndices[ n + 11 ] = nv + 6;
-                pIndices[ n + 12 ] = nv + 6;
-                pIndices[ n + 13 ] = nv + 7;
-                pIndices[ n + 14 ] = nv + 7;
-                pIndices[ n + 15 ] = nv + 4;
-
-                pIndices[ n + 16 ] = nv + 0;
-                pIndices[ n + 17 ] = nv + 4;
-                pIndices[ n + 18 ] = nv + 1;
-                pIndices[ n + 19 ] = nv + 5;
-                pIndices[ n + 20 ] = nv + 2;
-                pIndices[ n + 21 ] = nv + 6;
-                pIndices[ n + 22 ] = nv + 3;
-                pIndices[ n + 23 ] = nv + 7;
-            }
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 24 * aabbCount, pIndices, 36 * aabbCount, CreateTriangleRenderFlags(true));
-
-            for (size_t i = 0; i < aabbCount; ++i)
-            {
-                const AABB& aabb = aabbs[i];
-
-                size_t n = i * 36;
-                size_t nv = i * 24;
-
-                Vec3 xyz(aabb.min.x, aabb.min.y, aabb.min.z);
-                Vec3 xyZ(aabb.min.x, aabb.min.y, aabb.max.z);
-                Vec3 xYz(aabb.min.x, aabb.max.y, aabb.min.z);
-                Vec3 xYZ(aabb.min.x, aabb.max.y, aabb.max.z);
-                Vec3 Xyz(aabb.max.x, aabb.min.y, aabb.min.z);
-                Vec3 XyZ(aabb.max.x, aabb.min.y, aabb.max.z);
-                Vec3 XYz(aabb.max.x, aabb.max.y, aabb.min.z);
-                Vec3 XYZ(aabb.max.x, aabb.max.y, aabb.max.z);
-
-                uint32 colDown(PackColor(ScaleColor(col, 0.5f)));
-                pVertices[  nv + 0 ].xyz = xyz;
-                pVertices[  nv + 0 ].color.dcolor = colDown;
-                pVertices[  nv + 1 ].xyz = xYz;
-                pVertices[  nv + 1 ].color.dcolor = colDown;
-                pVertices[  nv + 2 ].xyz = XYz;
-                pVertices[  nv + 2 ].color.dcolor = colDown;
-                pVertices[  nv + 3 ].xyz = Xyz;
-                pVertices[  nv + 3 ].color.dcolor = colDown;
-
-                pIndices[  n + 0 ] = nv + 0;
-                pIndices[  n + 1 ] = nv + 1;
-                pIndices[  n + 2 ] = nv + 2;
-                pIndices[  n + 3 ] = nv + 0;
-                pIndices[  n + 4 ] = nv + 2;
-                pIndices[  n + 5 ] = nv + 3;
-
-                uint32 colTop(PackColor(col));
-                pVertices[  nv + 4 ].xyz = xyZ;
-                pVertices[  nv + 4 ].color.dcolor = colTop;
-                pVertices[  nv + 5 ].xyz = XyZ;
-                pVertices[  nv + 5 ].color.dcolor = colTop;
-                pVertices[  nv + 6 ].xyz = XYZ;
-                pVertices[  nv + 6 ].color.dcolor = colTop;
-                pVertices[  nv + 7 ].xyz = xYZ;
-                pVertices[  nv + 7 ].color.dcolor = colTop;
-
-                pIndices[  n + 6 ] = nv + 4;
-                pIndices[  n + 7 ] = nv + 5;
-                pIndices[  n + 8 ] = nv + 6;
-                pIndices[  n + 9 ] = nv + 4;
-                pIndices[ n + 10 ] = nv + 6;
-                pIndices[ n + 11 ] = nv + 7;
-
-                uint32 colBack(PackColor(ScaleColor(col, 0.6f)));
-                pVertices[  nv + 8 ].xyz = xyz;
-                pVertices[  nv + 8 ].color.dcolor = colBack;
-                pVertices[  nv + 9 ].xyz = Xyz;
-                pVertices[  nv + 9 ].color.dcolor = colBack;
-                pVertices[ nv + 10 ].xyz = XyZ;
-                pVertices[ nv + 10 ].color.dcolor = colBack;
-                pVertices[ nv + 11 ].xyz = xyZ;
-                pVertices[ nv + 11 ].color.dcolor = colBack;
-
-                pIndices[ n + 12 ] = nv + 8;
-                pIndices[  n + 13 ] = nv + 9;
-                pIndices[ n + 14 ] = nv + 10;
-                pIndices[ n + 15 ] = nv + 8;
-                pIndices[  n + 16 ] = nv + 10;
-                pIndices[ n + 17 ] = nv + 11;
-
-                uint32 colFront(PackColor(ScaleColor(col, 0.9f)));
-                pVertices[ nv + 12 ].xyz = xYz;
-                pVertices[ nv + 12 ].color.dcolor = colFront;
-                pVertices[ nv + 13 ].xyz = xYZ;
-                pVertices[ nv + 13 ].color.dcolor = colFront;
-                pVertices[ nv + 14 ].xyz = XYZ;
-                pVertices[ nv + 14 ].color.dcolor = colFront;
-                pVertices[ nv + 15 ].xyz = XYz;
-                pVertices[ nv + 15 ].color.dcolor = colFront;
-
-                pIndices[ n + 18 ] = nv + 12;
-                pIndices[ n + 19 ] = nv + 13;
-                pIndices[ n + 20 ] = nv + 14;
-                pIndices[ n + 21 ] = nv + 12;
-                pIndices[ n + 22 ] = nv + 14;
-                pIndices[ n + 23 ] = nv + 15;
-
-                uint32 colLeft(PackColor(ScaleColor(col, 0.7f)));
-                pVertices[ nv + 16 ].xyz = xyz;
-                pVertices[ nv + 16 ].color.dcolor = colLeft;
-                pVertices[ nv + 17 ].xyz = xyZ;
-                pVertices[ nv + 17 ].color.dcolor = colLeft;
-                pVertices[ nv + 18 ].xyz = xYZ;
-                pVertices[ nv + 18 ].color.dcolor = colLeft;
-                pVertices[ nv + 19 ].xyz = xYz;
-                pVertices[ nv + 19 ].color.dcolor = colLeft;
-
-                pIndices[ n + 24 ] = nv + 16;
-                pIndices[ n + 25 ] = nv + 17;
-                pIndices[ n + 26 ] = nv + 18;
-                pIndices[ n + 27 ] = nv + 16;
-                pIndices[ n + 28 ] = nv + 18;
-                pIndices[ n + 29 ] = nv + 19;
-
-                uint32 colRight(PackColor(ScaleColor(col, 0.8f)));
-                pVertices[ nv + 20 ].xyz = Xyz;
-                pVertices[ nv + 20 ].color.dcolor = colRight;
-                pVertices[ nv + 21 ].xyz = XYz;
-                pVertices[ nv + 21 ].color.dcolor = colRight;
-                pVertices[ nv + 22 ].xyz = XYZ;
-                pVertices[ nv + 22 ].color.dcolor = colRight;
-                pVertices[ nv + 23 ].xyz = XyZ;
-                pVertices[ nv + 23 ].color.dcolor = colRight;
-
-                pIndices[ n + 30 ] = nv + 20;
-                pIndices[ n + 31 ] = nv + 21;
-                pIndices[ n + 32 ] = nv + 22;
-                pIndices[ n + 33 ] = nv + 20;
-                pIndices[ n + 34 ] = nv + 22;
-                pIndices[ n + 35 ] = nv + 23;
-            }
-        }
-    }
-}
-
-void CAuxGeomCB::DrawAABB(const AABB& aabb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle)
-{
-    SAuxVertex* pVertices(0);
-    vtx_idx* pIndices(0);
-
-    if (eBBD_Extremes_Color_Encoded == bbDrawStyle)
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            pIndices[  6 ] = 7;
-            pIndices[  7 ] = 6;
-            pIndices[  8 ] = 5;
-            pIndices[  9 ] = 7;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 4;
-
-            pIndices[ 12 ] = 3;
-            pIndices[ 13 ] = 2;
-            pIndices[ 14 ] = 6;
-            pIndices[ 15 ] = 3;
-            pIndices[ 16 ] = 6;
-            pIndices[ 17 ] = 7;
-
-            pIndices[ 18 ] = 4;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 1;
-            pIndices[ 21 ] = 4;
-            pIndices[ 22 ] = 1;
-            pIndices[ 23 ] = 0;
-
-            pIndices[ 24 ] = 1;
-            pIndices[ 25 ] = 5;
-            pIndices[ 26 ] = 6;
-            pIndices[ 27 ] = 1;
-            pIndices[ 28 ] = 6;
-            pIndices[ 29 ] = 2;
-
-            pIndices[ 30 ] = 4;
-            pIndices[ 31 ] = 0;
-            pIndices[ 32 ] = 3;
-            pIndices[ 33 ] = 4;
-            pIndices[ 34 ] = 3;
-            pIndices[ 35 ] = 7;
-        }
-
-        uint32 color(PackColor(col));
-        uint32 colorMin(PackColor(ColorB(15, 15, 15, col.a)));
-        uint32 colorMax(PackColor(ColorB(255, 255, 255, col.a)));
-
-        pVertices[ 0 ].xyz = matWorld * Vec3(aabb.min.x, aabb.min.y, aabb.min.z);
-        pVertices[ 0 ].color.dcolor = colorMin;
-        pVertices[ 1 ].xyz = matWorld * Vec3(aabb.min.x, aabb.max.y, aabb.min.z);
-        pVertices[ 1 ].color.dcolor = color;
-        pVertices[ 2 ].xyz = matWorld * Vec3(aabb.max.x, aabb.max.y, aabb.min.z);
-        pVertices[ 2 ].color.dcolor = color;
-        pVertices[ 3 ].xyz = matWorld * Vec3(aabb.max.x, aabb.min.y, aabb.min.z);
-        pVertices[ 3 ].color.dcolor = color;
-        pVertices[ 4 ].xyz = matWorld * Vec3(aabb.min.x, aabb.min.y, aabb.max.z);
-        pVertices[ 4 ].color.dcolor = color;
-        pVertices[ 5 ].xyz = matWorld * Vec3(aabb.min.x, aabb.max.y, aabb.max.z);
-        pVertices[ 5 ].color.dcolor = color;
-        pVertices[ 6 ].xyz = matWorld * Vec3(aabb.max.x, aabb.max.y, aabb.max.z);
-        pVertices[ 6 ].color.dcolor = colorMax;
-        pVertices[ 7 ].xyz = matWorld * Vec3(aabb.max.x, aabb.min.y, aabb.max.z);
-        pVertices[ 7 ].color.dcolor = color;
-    }
-    else
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            uint32 color(PackColor(col));
-
-            pVertices[ 0 ].xyz = matWorld * Vec3(aabb.min.x, aabb.min.y, aabb.min.z);
-            pVertices[ 0 ].color.dcolor = color;
-            pVertices[ 1 ].xyz = matWorld * Vec3(aabb.min.x, aabb.max.y, aabb.min.z);
-            pVertices[ 1 ].color.dcolor = color;
-            pVertices[ 2 ].xyz = matWorld * Vec3(aabb.max.x, aabb.max.y, aabb.min.z);
-            pVertices[ 2 ].color.dcolor = color;
-            pVertices[ 3 ].xyz = matWorld * Vec3(aabb.max.x, aabb.min.y, aabb.min.z);
-            pVertices[ 3 ].color.dcolor = color;
-            pVertices[ 4 ].xyz = matWorld * Vec3(aabb.min.x, aabb.min.y, aabb.max.z);
-            pVertices[ 4 ].color.dcolor = color;
-            pVertices[ 5 ].xyz = matWorld * Vec3(aabb.min.x, aabb.max.y, aabb.max.z);
-            pVertices[ 5 ].color.dcolor = color;
-            pVertices[ 6 ].xyz = matWorld * Vec3(aabb.max.x, aabb.max.y, aabb.max.z);
-            pVertices[ 6 ].color.dcolor = color;
-            pVertices[ 7 ].xyz = matWorld * Vec3(aabb.max.x, aabb.min.y, aabb.max.z);
-            pVertices[ 7 ].color.dcolor = color;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 24, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            Vec3 xyz(matWorld * Vec3(aabb.min.x, aabb.min.y, aabb.min.z));
-            Vec3 xyZ(matWorld * Vec3(aabb.min.x, aabb.min.y, aabb.max.z));
-            Vec3 xYz(matWorld * Vec3(aabb.min.x, aabb.max.y, aabb.min.z));
-            Vec3 xYZ(matWorld * Vec3(aabb.min.x, aabb.max.y, aabb.max.z));
-            Vec3 Xyz(matWorld * Vec3(aabb.max.x, aabb.min.y, aabb.min.z));
-            Vec3 XyZ(matWorld * Vec3(aabb.max.x, aabb.min.y, aabb.max.z));
-            Vec3 XYz(matWorld * Vec3(aabb.max.x, aabb.max.y, aabb.min.z));
-            Vec3 XYZ(matWorld * Vec3(aabb.max.x, aabb.max.y, aabb.max.z));
-
-            uint32 colDown(PackColor(ScaleColor(col, 0.5f)));
-            pVertices[  0 ].xyz = xyz;
-            pVertices[  0 ].color.dcolor = colDown;
-            pVertices[  1 ].xyz = xYz;
-            pVertices[  1 ].color.dcolor = colDown;
-            pVertices[  2 ].xyz = XYz;
-            pVertices[  2 ].color.dcolor = colDown;
-            pVertices[  3 ].xyz = Xyz;
-            pVertices[  3 ].color.dcolor = colDown;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            uint32 colTop(PackColor(col));
-            pVertices[  4 ].xyz = xyZ;
-            pVertices[  4 ].color.dcolor = colTop;
-            pVertices[  5 ].xyz = XyZ;
-            pVertices[  5 ].color.dcolor = colTop;
-            pVertices[  6 ].xyz = XYZ;
-            pVertices[  6 ].color.dcolor = colTop;
-            pVertices[  7 ].xyz = xYZ;
-            pVertices[  7 ].color.dcolor = colTop;
-
-            pIndices[  6 ] = 4;
-            pIndices[  7 ] = 5;
-            pIndices[  8 ] = 6;
-            pIndices[  9 ] = 4;
-            pIndices[ 10 ] = 6;
-            pIndices[ 11 ] = 7;
-
-            uint32 colBack(PackColor(ScaleColor(col, 0.6f)));
-            pVertices[  8 ].xyz = xyz;
-            pVertices[  8 ].color.dcolor = colBack;
-            pVertices[  9 ].xyz = Xyz;
-            pVertices[  9 ].color.dcolor = colBack;
-            pVertices[ 10 ].xyz = XyZ;
-            pVertices[ 10 ].color.dcolor = colBack;
-            pVertices[ 11 ].xyz = xyZ;
-            pVertices[ 11 ].color.dcolor = colBack;
-
-            pIndices[ 12 ] = 8;
-            pIndices[  13 ] = 9;
-            pIndices[ 14 ] = 10;
-            pIndices[ 15 ] = 8;
-            pIndices[  16 ] = 10;
-            pIndices[ 17 ] = 11;
-
-            uint32 colFront(PackColor(ScaleColor(col, 0.9f)));
-            pVertices[ 12 ].xyz = xYz;
-            pVertices[ 12 ].color.dcolor = colFront;
-            pVertices[ 13 ].xyz = xYZ;
-            pVertices[ 13 ].color.dcolor = colFront;
-            pVertices[ 14 ].xyz = XYZ;
-            pVertices[ 14 ].color.dcolor = colFront;
-            pVertices[ 15 ].xyz = XYz;
-            pVertices[ 15 ].color.dcolor = colFront;
-
-            pIndices[ 18 ] = 12;
-            pIndices[ 19 ] = 13;
-            pIndices[ 20 ] = 14;
-            pIndices[ 21 ] = 12;
-            pIndices[ 22 ] = 14;
-            pIndices[ 23 ] = 15;
-
-            uint32 colLeft(PackColor(ScaleColor(col, 0.7f)));
-            pVertices[ 16 ].xyz = xyz;
-            pVertices[ 16 ].color.dcolor = colLeft;
-            pVertices[ 17 ].xyz = xyZ;
-            pVertices[ 17 ].color.dcolor = colLeft;
-            pVertices[ 18 ].xyz = xYZ;
-            pVertices[ 18 ].color.dcolor = colLeft;
-            pVertices[ 19 ].xyz = xYz;
-            pVertices[ 19 ].color.dcolor = colLeft;
-
-            pIndices[ 24 ] = 16;
-            pIndices[ 25 ] = 17;
-            pIndices[ 26 ] = 18;
-            pIndices[ 27 ] = 16;
-            pIndices[ 28 ] = 18;
-            pIndices[ 29 ] = 19;
-
-            uint32 colRight(PackColor(ScaleColor(col, 0.8f)));
-            pVertices[ 20 ].xyz = Xyz;
-            pVertices[ 20 ].color.dcolor = colRight;
-            pVertices[ 21 ].xyz = XYz;
-            pVertices[ 21 ].color.dcolor = colRight;
-            pVertices[ 22 ].xyz = XYZ;
-            pVertices[ 22 ].color.dcolor = colRight;
-            pVertices[ 23 ].xyz = XyZ;
-            pVertices[ 23 ].color.dcolor = colRight;
-
-            pIndices[ 30 ] = 20;
-            pIndices[ 31 ] = 21;
-            pIndices[ 32 ] = 22;
-            pIndices[ 33 ] = 20;
-            pIndices[ 34 ] = 22;
-            pIndices[ 35 ] = 23;
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawOBB(const OBB& obb, const Vec3& pos, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle)
-{
-    SAuxVertex* pVertices(0);
-    vtx_idx* pIndices(0);
-
-    if (eBBD_Extremes_Color_Encoded == bbDrawStyle)
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            pIndices[  6 ] = 7;
-            pIndices[  7 ] = 6;
-            pIndices[  8 ] = 5;
-            pIndices[  9 ] = 7;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 4;
-
-            pIndices[ 12 ] = 3;
-            pIndices[ 13 ] = 2;
-            pIndices[ 14 ] = 6;
-            pIndices[ 15 ] = 3;
-            pIndices[ 16 ] = 6;
-            pIndices[ 17 ] = 7;
-
-            pIndices[ 18 ] = 4;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 1;
-            pIndices[ 21 ] = 4;
-            pIndices[ 22 ] = 1;
-            pIndices[ 23 ] = 0;
-
-            pIndices[ 24 ] = 1;
-            pIndices[ 25 ] = 5;
-            pIndices[ 26 ] = 6;
-            pIndices[ 27 ] = 1;
-            pIndices[ 28 ] = 6;
-            pIndices[ 29 ] = 2;
-
-            pIndices[ 30 ] = 4;
-            pIndices[ 31 ] = 0;
-            pIndices[ 32 ] = 3;
-            pIndices[ 33 ] = 4;
-            pIndices[ 34 ] = 3;
-            pIndices[ 35 ] = 7;
-        }
-
-        uint32 color(PackColor(col));
-        uint32 colorMin(PackColor(ColorB(15, 15, 15, col.a)));
-        uint32 colorMax(PackColor(ColorB(255, 255, 255, col.a)));
-
-        AABB aabb(obb.c - obb.h, obb.c + obb.h);
-        pVertices[ 0 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.min.z) + pos;
-        pVertices[ 0 ].color.dcolor = colorMin;
-        pVertices[ 1 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.min.z) + pos;
-        pVertices[ 1 ].color.dcolor = color;
-        pVertices[ 2 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.min.z) + pos;
-        pVertices[ 2 ].color.dcolor = color;
-        pVertices[ 3 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.min.z) + pos;
-        pVertices[ 3 ].color.dcolor = color;
-        pVertices[ 4 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.max.z) + pos;
-        pVertices[ 4 ].color.dcolor = color;
-        pVertices[ 5 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.max.z) + pos;
-        pVertices[ 5 ].color.dcolor = color;
-        pVertices[ 6 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.max.z) + pos;
-        pVertices[ 6 ].color.dcolor = colorMax;
-        pVertices[ 7 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.max.z) + pos;
-        pVertices[ 7 ].color.dcolor = color;
-    }
-    else
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            uint32 color(PackColor(col));
-
-            AABB aabb(obb.c - obb.h, obb.c + obb.h);
-            pVertices[ 0 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.min.z) + pos;
-            pVertices[ 0 ].color.dcolor = color;
-            pVertices[ 1 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.min.z) + pos;
-            pVertices[ 1 ].color.dcolor = color;
-            pVertices[ 2 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.min.z) + pos;
-            pVertices[ 2 ].color.dcolor = color;
-            pVertices[ 3 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.min.z) + pos;
-            pVertices[ 3 ].color.dcolor = color;
-            pVertices[ 4 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.max.z) + pos;
-            pVertices[ 4 ].color.dcolor = color;
-            pVertices[ 5 ].xyz = obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.max.z) + pos;
-            pVertices[ 5 ].color.dcolor = color;
-            pVertices[ 6 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.max.z) + pos;
-            pVertices[ 6 ].color.dcolor = color;
-            pVertices[ 7 ].xyz = obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.max.z) + pos;
-            pVertices[ 7 ].color.dcolor = color;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 24, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            AABB aabb(obb.c - obb.h, obb.c + obb.h);
-            Vec3 xyz(obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.min.z) + pos);
-            Vec3 xyZ(obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.max.z) + pos);
-            Vec3 xYz(obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.min.z) + pos);
-            Vec3 xYZ(obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.max.z) + pos);
-            Vec3 Xyz(obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.min.z) + pos);
-            Vec3 XyZ(obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.max.z) + pos);
-            Vec3 XYz(obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.min.z) + pos);
-            Vec3 XYZ(obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.max.z) + pos);
-
-            uint32 colDown(PackColor(ScaleColor(col, 0.5f)));
-            pVertices[  0 ].xyz = xyz;
-            pVertices[  0 ].color.dcolor = colDown;
-            pVertices[  1 ].xyz = xYz;
-            pVertices[  1 ].color.dcolor = colDown;
-            pVertices[  2 ].xyz = XYz;
-            pVertices[  2 ].color.dcolor = colDown;
-            pVertices[  3 ].xyz = Xyz;
-            pVertices[  3 ].color.dcolor = colDown;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            uint32 colTop(PackColor(col));
-            pVertices[  4 ].xyz = xyZ;
-            pVertices[  4 ].color.dcolor = colTop;
-            pVertices[  5 ].xyz = XyZ;
-            pVertices[  5 ].color.dcolor = colTop;
-            pVertices[  6 ].xyz = XYZ;
-            pVertices[  6 ].color.dcolor = colTop;
-            pVertices[  7 ].xyz = xYZ;
-            pVertices[  7 ].color.dcolor = colTop;
-
-            pIndices[  6 ] = 4;
-            pIndices[  7 ] = 5;
-            pIndices[  8 ] = 6;
-            pIndices[  9 ] = 4;
-            pIndices[ 10 ] = 6;
-            pIndices[ 11 ] = 7;
-
-            uint32 colBack(PackColor(ScaleColor(col, 0.6f)));
-            pVertices[  8 ].xyz = xyz;
-            pVertices[  8 ].color.dcolor = colBack;
-            pVertices[  9 ].xyz = Xyz;
-            pVertices[  9 ].color.dcolor = colBack;
-            pVertices[ 10 ].xyz = XyZ;
-            pVertices[ 10 ].color.dcolor = colBack;
-            pVertices[ 11 ].xyz = xyZ;
-            pVertices[ 11 ].color.dcolor = colBack;
-
-            pIndices[ 12 ] = 8;
-            pIndices[  13 ] = 9;
-            pIndices[ 14 ] = 10;
-            pIndices[ 15 ] = 8;
-            pIndices[  16 ] = 10;
-            pIndices[ 17 ] = 11;
-
-            uint32 colFront(PackColor(ScaleColor(col, 0.9f)));
-            pVertices[ 12 ].xyz = xYz;
-            pVertices[ 12 ].color.dcolor = colFront;
-            pVertices[ 13 ].xyz = xYZ;
-            pVertices[ 13 ].color.dcolor = colFront;
-            pVertices[ 14 ].xyz = XYZ;
-            pVertices[ 14 ].color.dcolor = colFront;
-            pVertices[ 15 ].xyz = XYz;
-            pVertices[ 15 ].color.dcolor = colFront;
-
-            pIndices[ 18 ] = 12;
-            pIndices[ 19 ] = 13;
-            pIndices[ 20 ] = 14;
-            pIndices[ 21 ] = 12;
-            pIndices[ 22 ] = 14;
-            pIndices[ 23 ] = 15;
-
-            uint32 colLeft(PackColor(ScaleColor(col, 0.7f)));
-            pVertices[ 16 ].xyz = xyz;
-            pVertices[ 16 ].color.dcolor = colLeft;
-            pVertices[ 17 ].xyz = xyZ;
-            pVertices[ 17 ].color.dcolor = colLeft;
-            pVertices[ 18 ].xyz = xYZ;
-            pVertices[ 18 ].color.dcolor = colLeft;
-            pVertices[ 19 ].xyz = xYz;
-            pVertices[ 19 ].color.dcolor = colLeft;
-
-            pIndices[ 24 ] = 16;
-            pIndices[ 25 ] = 17;
-            pIndices[ 26 ] = 18;
-            pIndices[ 27 ] = 16;
-            pIndices[ 28 ] = 18;
-            pIndices[ 29 ] = 19;
-
-            uint32 colRight(PackColor(ScaleColor(col, 0.8f)));
-            pVertices[ 20 ].xyz = Xyz;
-            pVertices[ 20 ].color.dcolor = colRight;
-            pVertices[ 21 ].xyz = XYz;
-            pVertices[ 21 ].color.dcolor = colRight;
-            pVertices[ 22 ].xyz = XYZ;
-            pVertices[ 22 ].color.dcolor = colRight;
-            pVertices[ 23 ].xyz = XyZ;
-            pVertices[ 23 ].color.dcolor = colRight;
-
-            pIndices[ 30 ] = 20;
-            pIndices[ 31 ] = 21;
-            pIndices[ 32 ] = 22;
-            pIndices[ 33 ] = 20;
-            pIndices[ 34 ] = 22;
-            pIndices[ 35 ] = 23;
-        }
-    }
-}
-
-
-void CAuxGeomCB::DrawOBB(const OBB& obb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle)
-{
-    SAuxVertex* pVertices(0);
-    vtx_idx* pIndices(0);
-
-    if (eBBD_Extremes_Color_Encoded == bbDrawStyle)
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            pIndices[  6 ] = 7;
-            pIndices[  7 ] = 6;
-            pIndices[  8 ] = 5;
-            pIndices[  9 ] = 7;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 4;
-
-            pIndices[ 12 ] = 3;
-            pIndices[ 13 ] = 2;
-            pIndices[ 14 ] = 6;
-            pIndices[ 15 ] = 3;
-            pIndices[ 16 ] = 6;
-            pIndices[ 17 ] = 7;
-
-            pIndices[ 18 ] = 4;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 1;
-            pIndices[ 21 ] = 4;
-            pIndices[ 22 ] = 1;
-            pIndices[ 23 ] = 0;
-
-            pIndices[ 24 ] = 1;
-            pIndices[ 25 ] = 5;
-            pIndices[ 26 ] = 6;
-            pIndices[ 27 ] = 1;
-            pIndices[ 28 ] = 6;
-            pIndices[ 29 ] = 2;
-
-            pIndices[ 30 ] = 4;
-            pIndices[ 31 ] = 0;
-            pIndices[ 32 ] = 3;
-            pIndices[ 33 ] = 4;
-            pIndices[ 34 ] = 3;
-            pIndices[ 35 ] = 7;
-        }
-
-        uint32 color(PackColor(col));
-        uint32 colorMin(PackColor(ColorB(15, 15, 15, col.a)));
-        uint32 colorMax(PackColor(ColorB(255, 255, 255, col.a)));
-
-        AABB aabb(obb.c - obb.h, obb.c + obb.h);
-        pVertices[ 0 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.min.z));
-        pVertices[ 0 ].color.dcolor = colorMin;
-        pVertices[ 1 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.min.z));
-        pVertices[ 1 ].color.dcolor = color;
-        pVertices[ 2 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.min.z));
-        pVertices[ 2 ].color.dcolor = color;
-        pVertices[ 3 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.min.z));
-        pVertices[ 3 ].color.dcolor = color;
-        pVertices[ 4 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.max.z));
-        pVertices[ 4 ].color.dcolor = color;
-        pVertices[ 5 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.max.z));
-        pVertices[ 5 ].color.dcolor = color;
-        pVertices[ 6 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.max.z));
-        pVertices[ 6 ].color.dcolor = colorMax;
-        pVertices[ 7 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.max.z));
-        pVertices[ 7 ].color.dcolor = color;
-    }
-    else
-    {
-        if (false == bSolid)
-        {
-            AddIndexedPrimitive(pVertices, 8, pIndices, 24, CreateLineRenderFlags(true) | AlphaFlags(col));
-
-            uint32 color(PackColor(col));
-
-            AABB aabb(obb.c - obb.h, obb.c + obb.h);
-            pVertices[ 0 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.min.z));
-            pVertices[ 0 ].color.dcolor = color;
-            pVertices[ 1 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.min.z));
-            pVertices[ 1 ].color.dcolor = color;
-            pVertices[ 2 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.min.z));
-            pVertices[ 2 ].color.dcolor = color;
-            pVertices[ 3 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.min.z));
-            pVertices[ 3 ].color.dcolor = color;
-            pVertices[ 4 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.max.z));
-            pVertices[ 4 ].color.dcolor = color;
-            pVertices[ 5 ].xyz = matWorld * (obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.max.z));
-            pVertices[ 5 ].color.dcolor = color;
-            pVertices[ 6 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.max.z));
-            pVertices[ 6 ].color.dcolor = color;
-            pVertices[ 7 ].xyz = matWorld * (obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.max.z));
-            pVertices[ 7 ].color.dcolor = color;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 1;
-            pIndices[  3 ] = 2;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-            pIndices[  6 ] = 3;
-            pIndices[  7 ] = 0;
-
-            pIndices[  8 ] = 4;
-            pIndices[  9 ] = 5;
-            pIndices[ 10 ] = 5;
-            pIndices[ 11 ] = 6;
-            pIndices[ 12 ] = 6;
-            pIndices[ 13 ] = 7;
-            pIndices[ 14 ] = 7;
-            pIndices[ 15 ] = 4;
-
-            pIndices[ 16 ] = 0;
-            pIndices[ 17 ] = 4;
-            pIndices[ 18 ] = 1;
-            pIndices[ 19 ] = 5;
-            pIndices[ 20 ] = 2;
-            pIndices[ 21 ] = 6;
-            pIndices[ 22 ] = 3;
-            pIndices[ 23 ] = 7;
-        }
-        else
-        {
-            AddIndexedPrimitive(pVertices, 24, pIndices, 36, CreateTriangleRenderFlags(true));
-
-            AABB aabb(obb.c - obb.h, obb.c + obb.h);
-            Vec3 xyz(matWorld * (obb.m33* Vec3(aabb.min.x, aabb.min.y, aabb.min.z)));
-            Vec3 xyZ(matWorld * (obb.m33* Vec3(aabb.min.x, aabb.min.y, aabb.max.z)));
-            Vec3 xYz(matWorld * (obb.m33* Vec3(aabb.min.x, aabb.max.y, aabb.min.z)));
-            Vec3 xYZ(matWorld * (obb.m33* Vec3(aabb.min.x, aabb.max.y, aabb.max.z)));
-            Vec3 Xyz(matWorld * (obb.m33* Vec3(aabb.max.x, aabb.min.y, aabb.min.z)));
-            Vec3 XyZ(matWorld * (obb.m33* Vec3(aabb.max.x, aabb.min.y, aabb.max.z)));
-            Vec3 XYz(matWorld * (obb.m33* Vec3(aabb.max.x, aabb.max.y, aabb.min.z)));
-            Vec3 XYZ(matWorld * (obb.m33* Vec3(aabb.max.x, aabb.max.y, aabb.max.z)));
-
-            uint32 colDown(PackColor(ScaleColor(col, 0.5f)));
-            pVertices[  0 ].xyz = xyz;
-            pVertices[  0 ].color.dcolor = colDown;
-            pVertices[  1 ].xyz = xYz;
-            pVertices[  1 ].color.dcolor = colDown;
-            pVertices[  2 ].xyz = XYz;
-            pVertices[  2 ].color.dcolor = colDown;
-            pVertices[  3 ].xyz = Xyz;
-            pVertices[  3 ].color.dcolor = colDown;
-
-            pIndices[  0 ] = 0;
-            pIndices[  1 ] = 1;
-            pIndices[  2 ] = 2;
-            pIndices[  3 ] = 0;
-            pIndices[  4 ] = 2;
-            pIndices[  5 ] = 3;
-
-            uint32 colTop(PackColor(col));
-            pVertices[  4 ].xyz = xyZ;
-            pVertices[  4 ].color.dcolor = colTop;
-            pVertices[  5 ].xyz = XyZ;
-            pVertices[  5 ].color.dcolor = colTop;
-            pVertices[  6 ].xyz = XYZ;
-            pVertices[  6 ].color.dcolor = colTop;
-            pVertices[  7 ].xyz = xYZ;
-            pVertices[  7 ].color.dcolor = colTop;
-
-            pIndices[  6 ] = 4;
-            pIndices[  7 ] = 5;
-            pIndices[  8 ] = 6;
-            pIndices[  9 ] = 4;
-            pIndices[ 10 ] = 6;
-            pIndices[ 11 ] = 7;
-
-            uint32 colBack(PackColor(ScaleColor(col, 0.6f)));
-            pVertices[  8 ].xyz = xyz;
-            pVertices[  8 ].color.dcolor = colBack;
-            pVertices[  9 ].xyz = Xyz;
-            pVertices[  9 ].color.dcolor = colBack;
-            pVertices[ 10 ].xyz = XyZ;
-            pVertices[ 10 ].color.dcolor = colBack;
-            pVertices[ 11 ].xyz = xyZ;
-            pVertices[ 11 ].color.dcolor = colBack;
-
-            pIndices[ 12 ] = 8;
-            pIndices[  13 ] = 9;
-            pIndices[ 14 ] = 10;
-            pIndices[ 15 ] = 8;
-            pIndices[  16 ] = 10;
-            pIndices[ 17 ] = 11;
-
-            uint32 colFront(PackColor(ScaleColor(col, 0.9f)));
-            pVertices[ 12 ].xyz = xYz;
-            pVertices[ 12 ].color.dcolor = colFront;
-            pVertices[ 13 ].xyz = xYZ;
-            pVertices[ 13 ].color.dcolor = colFront;
-            pVertices[ 14 ].xyz = XYZ;
-            pVertices[ 14 ].color.dcolor = colFront;
-            pVertices[ 15 ].xyz = XYz;
-            pVertices[ 15 ].color.dcolor = colFront;
-
-            pIndices[ 18 ] = 12;
-            pIndices[ 19 ] = 13;
-            pIndices[ 20 ] = 14;
-            pIndices[ 21 ] = 12;
-            pIndices[ 22 ] = 14;
-            pIndices[ 23 ] = 15;
-
-            uint32 colLeft(PackColor(ScaleColor(col, 0.7f)));
-            pVertices[ 16 ].xyz = xyz;
-            pVertices[ 16 ].color.dcolor = colLeft;
-            pVertices[ 17 ].xyz = xyZ;
-            pVertices[ 17 ].color.dcolor = colLeft;
-            pVertices[ 18 ].xyz = xYZ;
-            pVertices[ 18 ].color.dcolor = colLeft;
-            pVertices[ 19 ].xyz = xYz;
-            pVertices[ 19 ].color.dcolor = colLeft;
-
-            pIndices[ 24 ] = 16;
-            pIndices[ 25 ] = 17;
-            pIndices[ 26 ] = 18;
-            pIndices[ 27 ] = 16;
-            pIndices[ 28 ] = 18;
-            pIndices[ 29 ] = 19;
-
-            uint32 colRight(PackColor(ScaleColor(col, 0.8f)));
-            pVertices[ 20 ].xyz = Xyz;
-            pVertices[ 20 ].color.dcolor = colRight;
-            pVertices[ 21 ].xyz = XYz;
-            pVertices[ 21 ].color.dcolor = colRight;
-            pVertices[ 22 ].xyz = XYZ;
-            pVertices[ 22 ].color.dcolor = colRight;
-            pVertices[ 23 ].xyz = XyZ;
-            pVertices[ 23 ].color.dcolor = colRight;
-
-            pIndices[ 30 ] = 20;
-            pIndices[ 31 ] = 21;
-            pIndices[ 32 ] = 22;
-            pIndices[ 33 ] = 20;
-            pIndices[ 34 ] = 22;
-            pIndices[ 35 ] = 23;
-        }
-    }
-}
-
-
-
-void CAuxGeomCB::DrawSphere(const Vec3& pos, float radius, const ColorB& col, bool drawShaded)
-{
-    if (radius > 0.0f)
-    {
-        SAuxDrawObjParams* pDrawParams(0);
-        AddObject(pDrawParams, CreateObjectRenderFlags(eDOT_Sphere));
-
-        pDrawParams->m_matWorld = Matrix34::CreateTranslationMat(pos) * Matrix33::CreateScale(Vec3(radius, radius, radius));
-        pDrawParams->m_matWorldRotation.SetIdentity();
-        pDrawParams->m_color = PackColor(col);
-        pDrawParams->m_size = radius;
-        pDrawParams->m_shaded = drawShaded;
-    }
-}
-
-void CAuxGeomCB::DrawDisk(const Vec3& pos, const Vec3& dir, float radius, const ColorB& col, bool drawShaded)
-{
-    if (radius > 0.0f && dir.GetLengthSquared() > 0.0f)
-    {
-        SAuxDrawObjParams* pDrawParams(0);
-        AddObject(pDrawParams, CreateObjectRenderFlags(eDOT_Disk));
-
-        Vec3 direction(dir.normalized());
-        Vec3 orthogonal(direction.GetOrthogonal().normalized());
-
-        Matrix33 matRot;
-        matRot.SetIdentity();
-        matRot.SetColumn(0, orthogonal);
-        matRot.SetColumn(1, direction);
-        matRot.SetColumn(2, orthogonal.Cross(direction));
-
-        pDrawParams->m_matWorld = Matrix34::CreateTranslationMat(pos) * matRot * Matrix33::CreateScale(Vec3(radius, 1.0, radius));
-        pDrawParams->m_matWorldRotation = matRot;
-        pDrawParams->m_color = PackColor(col);
-        pDrawParams->m_size = radius;
-        pDrawParams->m_shaded = drawShaded;
-    }
-}
-
-void CAuxGeomCB::DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded)
-{
-    if (radius > 0.0f && height > 0.0f && dir.GetLengthSquared() > 0.0f)
-    {
-        SAuxDrawObjParams* pDrawParams(0);
-        AddObject(pDrawParams, CreateObjectRenderFlags(eDOT_Cone));
-
-        Vec3 direction(dir.normalized());
-        Vec3 orthogonal(direction.GetOrthogonal().normalized());
-
-        Matrix33 matRot;
-        matRot.SetIdentity();
-        matRot.SetColumn(0, orthogonal);
-        matRot.SetColumn(1, direction);
-        matRot.SetColumn(2, orthogonal.Cross(direction));
-
-        pDrawParams->m_matWorld = Matrix34::CreateTranslationMat(pos) * matRot * Matrix33::CreateScale(Vec3(radius, height, radius));
-        pDrawParams->m_matWorldRotation = matRot;
-        pDrawParams->m_color = PackColor(col);
-        pDrawParams->m_size = max(radius, height * 0.5f);
-        pDrawParams->m_shaded = drawShaded;
-    }
-}
-
-
-void CAuxGeomCB::DrawCylinder(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded)
-{
-    if (radius > 0.0f && height > 0.0f && dir.GetLengthSquared() > 0.0f)
-    {
-        SAuxDrawObjParams* pDrawParams(0);
-        AddObject(pDrawParams, CreateObjectRenderFlags(eDOT_Cylinder));
-
-        Vec3 direction(dir.normalized());
-        Vec3 orthogonal(direction.GetOrthogonal().normalized());
-
-        Matrix33 matRot;
-        matRot.SetIdentity();
-        matRot.SetColumn(0, orthogonal);
-        matRot.SetColumn(1, direction);
-        matRot.SetColumn(2, orthogonal.Cross(direction));
-
-        pDrawParams->m_matWorld = Matrix34::CreateTranslationMat(pos) * matRot * Matrix33::CreateScale(Vec3(radius, height, radius));
-        pDrawParams->m_matWorldRotation = matRot;
-        pDrawParams->m_color = PackColor(col);
-        pDrawParams->m_size = max(radius, height * 0.5f);
-        pDrawParams->m_shaded = drawShaded;
-    }
-}
-
-
-void CAuxGeomCB::DrawBone(const Vec3& p, const Vec3& c,  ColorB col)
-{
-    Vec3 vBoneVec = c - p;
-    float fBoneLength = vBoneVec.GetLength();
-
-    if (fBoneLength < 1e-4)
-    {
-        return;
-    }
-
-    Matrix33 m33 = Matrix33::CreateRotationV0V1(Vec3(1, 0, 0), vBoneVec / fBoneLength);
-    Matrix34 m34 = Matrix34(m33, p);
-
-    f32 t       =   min(0.01f, fBoneLength * 0.05f);
-
-    //bone points in x-direction
-    Vec3 s  =   Vec3(ZERO);
-    Vec3 m0 =   Vec3(t, +t, +t);
-    Vec3 m1 =   Vec3(t, -t, +t);
-    Vec3 m2 =   Vec3(t, -t, -t);
-    Vec3 m3 =   Vec3(t, +t, -t);
-    Vec3 e  =   Vec3(fBoneLength, 0, 0);
-
-    Vec3 VBuffer[6];
-    ColorB CBuffer[6];
-
-    VBuffer[0]  =   m34 * s;
-    CBuffer[0]  =   RGBA8(0xff, 0x1f, 0x1f, 0x00);  //start of bone (joint)
-
-    VBuffer[1]  =   m34 * m0;
-    CBuffer[1]  =   col;
-    VBuffer[2]  =   m34 * m1;
-    CBuffer[2]  =   col;
-    VBuffer[3]  =   m34 * m2;
-    CBuffer[3]  =   col;
-    VBuffer[4]  =   m34 * m3;
-    CBuffer[4]  =   col;
-
-    VBuffer[5]  =   m34 * e;
-    CBuffer[5]  =   RGBA8(0x07, 0x0f, 0x1f, 0x00); //end of bone
-
-
-    DrawLine(VBuffer[0], CBuffer[0], VBuffer[1], CBuffer[1]);
-    DrawLine(VBuffer[0], CBuffer[0], VBuffer[2], CBuffer[2]);
-    DrawLine(VBuffer[0], CBuffer[0], VBuffer[3], CBuffer[3]);
-    DrawLine(VBuffer[0], CBuffer[0], VBuffer[4], CBuffer[4]);
-
-    DrawLine(VBuffer[1], CBuffer[1], VBuffer[2], CBuffer[2]);
-    DrawLine(VBuffer[2], CBuffer[2], VBuffer[3], CBuffer[3]);
-    DrawLine(VBuffer[3], CBuffer[3], VBuffer[4], CBuffer[4]);
-    DrawLine(VBuffer[4], CBuffer[4], VBuffer[1], CBuffer[1]);
-
-    DrawLine(VBuffer[5], CBuffer[5], VBuffer[1], CBuffer[1]);
-    DrawLine(VBuffer[5], CBuffer[5], VBuffer[2], CBuffer[2]);
-    DrawLine(VBuffer[5], CBuffer[5], VBuffer[3], CBuffer[3]);
-    DrawLine(VBuffer[5], CBuffer[5], VBuffer[4], CBuffer[4]);
-}
-
-#include "CommonRender.h"
-
-
-void  CAuxGeomCB::RenderText(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args)
-{
-    if (format && !gEnv->IsDedicated())
-    {
-        char str[512];
-
-        vsnprintf_s(str, sizeof(str), sizeof(str) - 1, format, args);
-        str[sizeof(str) - 1] = '\0';
-        gEnv->pRenderer->DrawTextQueued(pos, ti, str);
-    }
-}
-
-void CAuxGeomCB::Flush()
-{
-    Flush(false);
-}
-
-void CAuxGeomCB::Flush(bool reset)
-{
-    size_t lastFlushPos = GetLastFlushPos();
-    size_t curFlushPos  = GetCurFlushPos();
-    if ((lastFlushPos < curFlushPos) || reset)
-    {
-        UpdateLastFlushPos();
-        SAuxGeomCBRawDataPackaged data = SAuxGeomCBRawDataPackaged(AccessData());
-        m_pRenderAuxGeom->Flush(data, lastFlushPos, curFlushPos, reset);
-    }
-}
-
-void CAuxGeomCB::UpdateLastFlushPos()
-{
-    bool shouldUpdate = true;
-
-    // If stereo is enabled then we don't want to reset the flush position UNLESS we're rendering the second eye. Otherwise,
-    // the aux geom will only get drawn to the first eye.
-    if (gEnv->pRenderer->IsStereoEnabled())
-    {
-        if (gEnv->pRenderer->GetIStereoRenderer()->GetStatus() == IStereoRenderer::Status::kRenderingFirstEye)
-        {
-            shouldUpdate = false;
-        }
-    }
-
-    if (shouldUpdate)
-    {
-        m_lastFlushPos = GetCurFlushPos();
-    }
-}
-
-void CAuxGeomCB::Commit([[maybe_unused]] uint frames)
-{
-    Flush();
-}
-
-void CAuxGeomCB::Process()
-{
-    m_pRenderAuxGeom->FlushTextMessages(m_cbCurrent->m_TextMessages, true);
-    m_lastFlushPos = 0;
-    m_cbCurrent->Reset();
-}
-
-// Note: Runs on MainThread in RC_EndFrame before enqueing the the render command
-void CAuxGeomCBMainThread::Commit(uint frames)
-{
-    m_cbCurrent->SetUsed(true);
-    m_cbCurrent->SetCount(frames);
-
-    Flush(true);
-
-    assert(m_cbCurrent->m_curTransMatIdx == -1);
-    m_cbCurrent->m_curTransMatIdx = -1;
-
-    m_cbCurrent->SetUsed(true);
-    m_cbCurrent->SetCount(frames);
-
-    // Select the next buffer.  Note that between m_CBReady[2] and m_cbCurrent all being uniquely allocated, this works out to a triple buffering scenario.
-    // This allows us to not have to change shared code with the other classes that reference m_cbCurrent as the currently active buffer.
-    // NOTE: In this case, there does not appear to be any reason to require the atomic interlocked exchange.
-    // It appears they only use the InterlockedExchange to do the swap in one line of code.
-    const unsigned char nextBuffer = m_currentReadyBuffer + 1;
-    m_currentReadyBuffer = (nextBuffer == c_numCBReadyBuffers) ? 0 : nextBuffer;
-    m_cbCurrent = (SAuxGeomCBRawData*)CryInterlockedExchangePointer((void* volatile*)&m_CBReady[m_currentReadyBuffer], m_cbCurrent);
-
-    m_lastFlushPos = 0;
-
-    m_cbCurrent->Reset();
-}
-
-// Note: Runs on RenderThread in RT_EndFrame
-void CAuxGeomCBMainThread::Process()
-{
-    m_pRenderAuxGeom->FlushTextMessages(m_CBReady[m_currentReadyBuffer]->m_TextMessages, true);
-    m_CBReady[m_currentReadyBuffer]->SetUsed(false);
-}
-
-
-void CAuxGeomCBWorkerThread::Flush()
-{
-}
-
-void CAuxGeomCBWorkerThread::Commit(uint frames)
-{
-    m_cbCurrent->SetUsed(true);
-    m_cbCurrent->SetCount(frames);
-
-    Flush();
-
-    assert(m_cbCurrent->m_curTransMatIdx == -1);
-    m_cbCurrent->m_curTransMatIdx = -1;
-
-    m_cbCurrent = (SAuxGeomCBRawData*)CryInterlockedExchangePointer((void* volatile*)&m_CBReady, m_cbCurrent);
-
-    if (!m_cbCurrent)
-    {
-        for (CBList::iterator it = m_cbData.begin(); it != m_cbData.end(); ++it)
-        {
-            if (!(*it)->IsUsed())
-            {
-                m_cbCurrent = *it;
-            }
-        }
-
-        if (!m_cbCurrent)
-        {
-            m_cbCurrent = AddCBuffer();
-        }
-    }
-
-    m_lastFlushPos = 0;
-
-    m_cbCurrent->Reset();
-}
-
-void CAuxGeomCBWorkerThread::Process()
-{
-    if (SAuxGeomCBRawData* current = (SAuxGeomCBRawData*)CryInterlockedExchangePointer((void* volatile*)&m_CBReady, 0))
-    {
-        if (m_cbProcessed)
-        {
-            m_cbProcessed->SetUsed(false);
-        }
-
-        m_cbProcessed = current;
-    }
-
-    if (SAuxGeomCBRawData* processed = m_cbProcessed)
-    {
-        if (size_t curFlushPos  = processed->m_auxPushBuffer.size())
-        {
-            SAuxGeomCBRawDataPackaged data = SAuxGeomCBRawDataPackaged(processed);
-            m_pRenderAuxGeom->Flush(data, 0, curFlushPos);
-        }
-
-        m_pRenderAuxGeom->FlushTextMessages(processed->m_TextMessages, false);
-
-        if (processed->Count() == 1)
-        {
-            processed->SetUsed(false);
-            m_cbProcessed = 0;
-        }
-    }
-}
-
-
-void CAuxGeomCB::SAuxGeomCBRawData::GetSortedPushBuffer(size_t begin, size_t end, AuxSortedPushBuffer& auxSortedPushBuffer) const
-{
-    assert(begin < end);
-    assert(end <= m_auxPushBuffer.size());
-
-    auxSortedPushBuffer.reserve(end - begin);
-    auxSortedPushBuffer.resize(0);
-
-    for (AuxPushBuffer::const_iterator it(m_auxPushBuffer.begin() + begin), itEnd(m_auxPushBuffer.begin() + end); it != itEnd; ++it)
-    {
-        auxSortedPushBuffer.push_back(&(*it));
-    }
-
-    std::sort(auxSortedPushBuffer.begin(), auxSortedPushBuffer.end(), PushBufferSortFunc());
-}
-
-
-void CAuxGeomCB::AddPushBufferEntry(uint32 numVertices, uint32 numIndices, const SAuxGeomRenderFlags& renderFlags)
-{
-    assert(numVertices > 0);
-
-    AuxPushBuffer& auxPushBuffer(AccessData()->m_auxPushBuffer);
-
-    EPrimType primType(GetPrimType(renderFlags));
-    if (false == auxPushBuffer.empty() &&
-        auxPushBuffer[ auxPushBuffer.size() - 1 ].m_renderFlags == renderFlags &&
-        auxPushBuffer[ auxPushBuffer.size() - 1 ].m_transMatrixIdx == GetTransMatrixIndex() &&
-        (e_PtList == primType || e_LineList == primType || e_TriList == primType))
-    {
-        // Perform a runtime optimization (pre-merging) which effectively reduces the number of PB entries created.
-        // We can merge this entry with the previous one as its render flags match with the ones of the previous entry
-        // (e.g. merges consecutive DrawLine(...) calls with same render flags into one PB entry).
-
-        // Only done for non-indexed primitives as otherwise there would be the additional overhead of patching
-        // the indices for each push buffer entry. Indices already and still have to be patched during rendering
-        // anyway (merging) so in case of indexed primitives there'd be no real benefit. Also, merging up too many
-        // indexed primitves could potentially produce a push buffer entry which cannot be rendered as it exceeds
-        // the vb/ib buffer size for auxiliary geometries in the renderer.
-        SAuxPushBufferEntry& lastPBEntry(auxPushBuffer[ auxPushBuffer.size() - 1 ]);
-        lastPBEntry.m_numVertices += numVertices;
-        lastPBEntry.m_numIndices += numIndices;
-    }
-    else
-    {
-        // create new push buffer entry
-        auxPushBuffer.push_back(SAuxPushBufferEntry(numVertices, numIndices,
-            AccessData()->m_auxVertexBuffer.size(), AccessData()->m_auxIndexBuffer.size(), GetTransMatrixIndex(), renderFlags));
-    }
-}
-
-
-void CAuxGeomCB::AddPrimitive(SAuxVertex*& pVertices, uint32 numVertices, const SAuxGeomRenderFlags& renderFlags)
-{
-    assert(numVertices > 0);
-
-    // add push buffer entry to allow later merging of batches commited via DP
-    AddPushBufferEntry(numVertices, 0, renderFlags);
-
-    // get vertex ptr
-    AuxVertexBuffer& auxVertexBuffer(AccessData()->m_auxVertexBuffer);
-    AuxVertexBuffer::size_type oldVBSize(auxVertexBuffer.size());
-    auxVertexBuffer.resize(oldVBSize + numVertices);
-    pVertices = &auxVertexBuffer[ oldVBSize ];
-}
-
-void CAuxGeomCB::AddIndexedPrimitive(SAuxVertex*& pVertices, uint32 numVertices, vtx_idx*& pIndices, uint32 numIndices, const SAuxGeomRenderFlags& renderFlags)
-{
-    assert(numVertices > 0);
-    assert(numIndices > 0);
-
-    // add push buffer entry to allow later merging of batches commited via DIP
-    AddPushBufferEntry(numVertices, numIndices, renderFlags);
-
-    // get vertex ptr
-    AuxVertexBuffer& auxVertexBuffer(AccessData()->m_auxVertexBuffer);
-    AuxVertexBuffer::size_type oldVBSize(auxVertexBuffer.size());
-    auxVertexBuffer.resize(oldVBSize + numVertices);
-    pVertices = &auxVertexBuffer[ oldVBSize ];
-
-    // get index ptr
-    AuxIndexBuffer& auxIndexBuffer(AccessData()->m_auxIndexBuffer);
-    AuxIndexBuffer::size_type oldIBSize(auxIndexBuffer.size());
-    auxIndexBuffer.resize(oldIBSize + numIndices);
-    pIndices = &auxIndexBuffer[ oldIBSize ];
-}
-
-
-void CAuxGeomCB::AddObject(SAuxDrawObjParams*& pDrawParams, const SAuxGeomRenderFlags& renderFlags)
-{
-    // create new push buffer entry
-    AuxPushBuffer& auxPushBuffer(AccessData()->m_auxPushBuffer);
-    AuxDrawObjParamBuffer& auxDrawObjParamBuffer(AccessData()->m_auxDrawObjParamBuffer);
-    auxPushBuffer.push_back(SAuxPushBufferEntry(auxDrawObjParamBuffer.size(), GetTransMatrixIndex(), renderFlags));
-
-    // get draw param buffer ptr
-    AuxDrawObjParamBuffer::size_type oldSize(auxDrawObjParamBuffer.size());
-    auxDrawObjParamBuffer.resize(oldSize + 1);
-    pDrawParams = &auxDrawObjParamBuffer[ oldSize ];
-}
-
-
-void CAuxGeomCB::SAuxGeomCBRawData::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(&m_auxPushBuffer, m_auxPushBuffer.capacity() * sizeof(AuxPushBuffer::value_type));
-    pSizer->AddObject(&m_auxVertexBuffer, m_auxVertexBuffer.capacity() * sizeof(AuxVertexBuffer::value_type));
-    pSizer->AddObject(&m_auxIndexBuffer, m_auxIndexBuffer.capacity() * sizeof(AuxIndexBuffer::value_type));
-    pSizer->AddObject(&m_auxDrawObjParamBuffer, m_auxDrawObjParamBuffer.capacity() * sizeof(AuxDrawObjParamBuffer::value_type));
-    pSizer->AddObject(m_TextMessages);
-}
-
-#endif // #if defined(ENABLE_RENDER_AUX_GEOM)
diff --git a/Code/CryEngine/RenderDll/Common/RenderAuxGeom.h b/Code/CryEngine/RenderDll/Common/RenderAuxGeom.h
deleted file mode 100644
index 946330b2bd..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderAuxGeom.h
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef _RENDERAUXGEOM_H_
-#define _RENDERAUXGEOM_H_
-
-#if defined(ENABLE_PROFILING_CODE) || !defined(_RELEASE)
-#   define ENABLE_RENDER_AUX_GEOM
-#endif
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-
-#include "IRenderAuxGeom.h"
-#include "VertexFormats.h"
-#include <CrySizer.h>
-#include <CryCommon/stl/STLAlignedAlloc.h>
-
-class ICrySizer;
-class CAuxGeomCB;
-struct SAuxGeomCBRawDataPackaged;
-
-
-struct IRenderAuxGeomImpl
-{
-public:
-    virtual ~IRenderAuxGeomImpl(){}
-    virtual void Flush(SAuxGeomCBRawDataPackaged& data, size_t begin, size_t end, bool reset = false) = 0;
-    virtual void RT_Flush(SAuxGeomCBRawDataPackaged& data, size_t begin, size_t end, bool reset = false) = 0;
-
-    virtual void FlushTextMessages(CTextMessages& tMessages, bool reset) = 0;
-};
-
-
-class CAuxGeomCB
-    : public IRenderAuxGeom
-{
-public:
-    // interface
-    virtual void SetRenderFlags(const SAuxGeomRenderFlags& renderFlags);
-    virtual SAuxGeomRenderFlags GetRenderFlags();
-
-    virtual void DrawPoint(const Vec3& v, const ColorB& col, uint8 size = 1);
-    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB& col, uint8 size = 1);
-    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB* col, uint8 size = 1);
-
-    virtual void DrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB& col, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB* col, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col, float thickness = 1.0f);
-    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB& col, float thickness = 1.0f);
-    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB* col, float thickness = 1.0f);
-
-    virtual void DrawTriangle(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, const Vec3& v2, const ColorB& colV2);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB& col);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB* col);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col);
-
-    virtual void DrawQuad(float width, float height, const Matrix34& matWorld, const ColorB& col, bool drawShaded = true);
-
-    virtual void DrawAABB(const AABB& aabb, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle);
-    virtual void DrawAABBs(const AABB* aabbs, uint32 aabbCount, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle);
-    virtual void DrawAABB(const AABB& aabb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle);
-
-    virtual void DrawOBB(const OBB& obb, const Vec3& pos, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle);
-    virtual void DrawOBB(const OBB& obb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle);
-
-    virtual void DrawSphere(const Vec3& pos, float radius, const ColorB& col, bool drawShaded = true);
-    virtual void DrawDisk(const Vec3& pos, const Vec3& dir, float radius, const ColorB& col, bool drawShaded = true);
-    virtual void DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded = true);
-    virtual void DrawCylinder(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded = true);
-
-    virtual void DrawBone(const Vec3& rParent, const Vec3& rBone, ColorB col);
-
-    virtual void RenderText(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args);
-
-    void Flush(bool reset);
-    virtual void Flush();
-    virtual void Commit(uint frames = 0);
-    virtual void Process();
-
-public:
-    enum EPrimType
-    {
-        e_PtList,
-        e_LineList,
-        e_LineListInd,
-        e_TriList,
-        e_TriListInd,
-        e_Obj,
-
-        e_NumPrimTypes,
-
-        e_PrimTypeInvalid
-    };
-
-    enum EAuxDrawObjType
-    {
-        eDOT_Sphere,
-        eDOT_Cone,
-        eDOT_Cylinder,
-        eDOT_Disk,
-        eDOT_Quad,
-    };
-
-    struct SAuxDrawObjParams
-    {
-        SAuxDrawObjParams()
-        {
-            m_matWorld.SetIdentity();
-            m_matWorldRotation.SetIdentity();
-            m_color = 0;
-            m_size = 0;
-            m_shaded = false;
-        }
-
-        Matrix34 m_matWorld;
-        Matrix33 m_matWorldRotation;
-        uint32 m_color;
-        float m_size;
-        bool m_shaded;
-    };
-
-    struct SAuxPushBufferEntry
-    {
-        SAuxPushBufferEntry()
-        {
-        }
-
-        SAuxPushBufferEntry(uint32 numVertices, uint32 numIndices, uint32 vertexOffs, uint32 indexOffs, uint32 transMatrixIdx, const SAuxGeomRenderFlags& renderFlags)
-            : m_numVertices(numVertices)
-            , m_numIndices(numIndices)
-            , m_vertexOffs(vertexOffs)
-            , m_indexOffs(indexOffs)
-            , m_transMatrixIdx(transMatrixIdx)
-            , m_renderFlags(renderFlags)
-        {
-        }
-
-        SAuxPushBufferEntry(uint32 drawParamOffs, uint32 transMatrixIdx, const SAuxGeomRenderFlags& renderFlags)
-            : m_numVertices(0)
-            , m_numIndices(0)
-            , m_vertexOffs(drawParamOffs)
-            , m_indexOffs(0)
-            , m_transMatrixIdx(transMatrixIdx)
-            , m_renderFlags(renderFlags)
-        {
-            assert(e_Obj == GetPrimType(m_renderFlags));
-        }
-
-        bool GetDrawParamOffs(uint32& drawParamOffs) const
-        {
-            if (e_Obj == GetPrimType(m_renderFlags))
-            {
-                drawParamOffs = m_vertexOffs;
-                return(true);
-            }
-            return(false);
-        }
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(this, sizeof(*this));
-        }
-        uint32 m_numVertices;
-        uint32 m_numIndices;
-        uint32 m_vertexOffs;
-        uint32 m_indexOffs;
-        int m_transMatrixIdx;
-        SAuxGeomRenderFlags m_renderFlags;
-    };
-
-    typedef std::vector< SAuxPushBufferEntry > AuxPushBuffer;
-    typedef std::vector< const SAuxPushBufferEntry* > AuxSortedPushBuffer;
-    typedef std::vector< SAuxVertex > AuxVertexBuffer;
-    typedef std::vector< vtx_idx > AuxIndexBuffer;
-    typedef std::vector< SAuxDrawObjParams > AuxDrawObjParamBuffer;
-    typedef stl::aligned_vector<Matrix44, 16> AuxOrthoMatrixBuffer;
-
-    struct SAuxGeomCBRawData
-    {
-    public:
-        SAuxGeomCBRawData()
-            : m_isUsed(false)
-            , m_curRenderFlags(e_Def3DPublicRenderflags)
-            , m_curTransMatIdx(-1)
-            , m_uCount(0) {}
-
-        void GetSortedPushBuffer(size_t begin, size_t end, AuxSortedPushBuffer& auxSortedPushBuffer) const;
-        void GetMemoryUsage(ICrySizer* pSizer) const;
-
-        void Reset()
-        {
-            m_auxPushBuffer.resize(0);
-            m_auxVertexBuffer.resize(0);
-            m_auxIndexBuffer.resize(0);
-            m_auxDrawObjParamBuffer.resize(0);
-            m_auxOrthoMatrices.resize(0);
-            m_TextMessages.Clear();
-
-            m_curRenderFlags = e_Def3DPublicRenderflags;
-            m_curTransMatIdx = -1;
-            m_uCount = 0;
-        }
-
-        bool IsUsed()
-        {
-            return m_isUsed;
-        }
-
-        void SetUsed(bool used)
-        {
-            m_isUsed = used;
-        }
-
-
-        void SetCount(uint count)
-        {
-            m_uCount = count;
-        }
-
-        uint Count()
-        {
-            return m_uCount > 0 ? m_uCount-- : m_uCount;
-        }
-
-    public:
-        AuxPushBuffer m_auxPushBuffer;
-        AuxVertexBuffer m_auxVertexBuffer;
-        AuxIndexBuffer m_auxIndexBuffer;
-        AuxDrawObjParamBuffer m_auxDrawObjParamBuffer;
-        AuxOrthoMatrixBuffer m_auxOrthoMatrices;
-        CTextMessages m_TextMessages;
-        SAuxGeomRenderFlags m_curRenderFlags;
-        int m_curTransMatIdx;
-        uint m_uCount;
-        bool m_isUsed;
-    };
-
-public:
-    // c/dtor
-    CAuxGeomCB(IRenderAuxGeomImpl* pRenderAuxGeom);
-    virtual ~CAuxGeomCB();
-
-    // get methods for private flags
-    static EPrimType GetPrimType(const SAuxGeomRenderFlags& renderFlags);
-    static bool IsThickLine(const SAuxGeomRenderFlags& renderFlags);
-    static EAuxDrawObjType GetAuxObjType(const SAuxGeomRenderFlags& renderFlags);
-    static uint8 GetPointSize(const SAuxGeomRenderFlags& renderFlags);
-
-    // memory usage
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->Add(*this);
-        for (CBList::const_iterator it = m_cbData.begin(); it != m_cbData.end(); ++it)
-        {
-            (*it)->GetMemoryUsage(pSizer);
-        }
-    }
-
-    void FreeMemory()
-    {
-        for (CBList::iterator it = m_cbData.begin(); it != m_cbData.end(); ++it)
-        {
-            stl::reconstruct(**it);
-        }
-    }
-
-    // setting orthogonal projection
-    void SetOrthoMode(bool enable, Matrix44A* pMatrix = 0)
-    {
-        if (enable)
-        {
-            assert(pMatrix);
-            m_cbCurrent->m_curTransMatIdx = m_cbCurrent->m_auxOrthoMatrices.size();
-            m_cbCurrent->m_auxOrthoMatrices.push_back(*pMatrix);
-        }
-        else
-        {
-            m_cbCurrent->m_curTransMatIdx = -1;
-        }
-    }
-
-private:
-    enum EAuxGeomPrivateRenderflagBitMasks
-    {
-        // public field starts at bit 22
-
-        e_PrimTypeShift         = 19,
-        e_PrimTypeMask          = 0x7 << e_PrimTypeShift,
-
-        e_PrivateRenderflagsMask = (1 << 19) - 1
-    };
-
-    enum EAuxGeomPrivateRenderflags
-    {
-        // for non-indexed triangles
-        e_TriListParam_ProcessThickLines = 0x00000001,
-
-        // for triangles
-
-        // for lines
-
-        // for points
-
-        // for objects
-    };
-
-private:
-    uint32 CreatePointRenderFlags(uint8 size);
-    uint32 CreateLineRenderFlags(bool indexed);
-    uint32 CreateTriangleRenderFlags(bool indexed);
-    uint32 CreateObjectRenderFlags(const EAuxDrawObjType& objType);
-
-    void DrawThickLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, float thickness);
-
-    void AddPushBufferEntry(uint32 numVertices, uint32 numIndices, const SAuxGeomRenderFlags& renderFlags);
-    void AddPrimitive(SAuxVertex*& pVertices, uint32 numVertices, const SAuxGeomRenderFlags& renderFlags);
-    void AddIndexedPrimitive(SAuxVertex*& pVertices, uint32 numVertices, vtx_idx*& pIndices, uint32 numIndices, const SAuxGeomRenderFlags& renderFlags);
-    void AddObject(SAuxDrawObjParams*& pDrawParams, const SAuxGeomRenderFlags& renderFlags);
-
-
-protected:
-    size_t GetLastFlushPos() const
-    {
-        return m_lastFlushPos;
-    }
-
-    size_t GetCurFlushPos() const
-    {
-        return m_cbCurrent->m_auxPushBuffer.size();
-    }
-
-    void UpdateLastFlushPos();
-
-    int GetTransMatrixIndex() const
-    {
-        return m_cbCurrent->m_curTransMatIdx;
-    }
-
-    SAuxGeomCBRawData* AccessData()
-    {
-        return m_cbCurrent;
-    }
-
-protected:
-    struct PushBufferSortFunc
-    {
-        bool operator() (const SAuxPushBufferEntry* lhs, const SAuxPushBufferEntry* rhs) const
-        {
-            if (lhs->m_renderFlags.m_renderFlags != rhs->m_renderFlags.m_renderFlags)
-            {
-                return lhs->m_renderFlags.m_renderFlags < rhs->m_renderFlags.m_renderFlags;
-            }
-
-            return lhs->m_transMatrixIdx < rhs->m_transMatrixIdx;
-        }
-    };
-
-    IRenderAuxGeomImpl* m_pRenderAuxGeom;
-
-    size_t m_lastFlushPos;
-
-    typedef std::list<SAuxGeomCBRawData*> CBList;
-    CBList m_cbData;
-
-    SAuxGeomCBRawData* m_cbCurrent;
-
-    SAuxGeomCBRawData* AddCBuffer()
-    {
-        SAuxGeomCBRawData* ptr = new SAuxGeomCBRawData;
-        m_cbData.push_back(ptr);
-        return ptr;
-    }
-};
-
-
-class CAuxGeomCBMainThread
-    : public CAuxGeomCB
-{
-public:
-    // Triple-buffered including base class's m_cbCurrent
-    static const int c_numCBReadyBuffers = 2;
-    CAuxGeomCBMainThread(IRenderAuxGeomImpl* pRenderAuxGeom)
-        : CAuxGeomCB(pRenderAuxGeom)
-    {
-        for (int i = 0; i < c_numCBReadyBuffers; ++i)
-        {
-            m_CBReady[i] = AddCBuffer();
-        }
-    }
-    virtual void Commit(uint frames = 0);
-    virtual void Process();
-
-protected:
-    SAuxGeomCBRawData* volatile m_CBReady[c_numCBReadyBuffers];
-    unsigned char m_currentReadyBuffer = 0;
-};
-
-class CAuxGeomCBWorkerThread
-    : public CAuxGeomCB
-{
-    SAuxGeomCBRawData* m_cbProcessed = nullptr;
-    SAuxGeomCBRawData* volatile m_CBReady = nullptr;
-
-public:
-    CAuxGeomCBWorkerThread(IRenderAuxGeomImpl* pRenderAuxGeom)
-        : CAuxGeomCB(pRenderAuxGeom)
-        , m_cbProcessed(0) {}
-    virtual void Flush();
-    virtual void Commit(uint frames = 0);
-    virtual void Process();
-};
-
-// package CAuxGeomCB::SAuxGeomCBRawData ptr via seperate struct as nested types cannot be forward declared
-struct SAuxGeomCBRawDataPackaged
-{
-    SAuxGeomCBRawDataPackaged(CAuxGeomCB::SAuxGeomCBRawData* pData)
-        : m_pData(pData)
-    {
-        assert(m_pData);
-    }
-
-    CAuxGeomCB::SAuxGeomCBRawData* m_pData;
-};
-
-
-inline uint32 CAuxGeomCB::CreatePointRenderFlags(uint8 size)
-{
-    return(m_cbCurrent->m_curRenderFlags.m_renderFlags | (e_PtList << e_PrimTypeShift) | size);
-}
-
-
-inline uint32 CAuxGeomCB::CreateLineRenderFlags(bool indexed)
-{
-    if (false != indexed)
-    {
-        return(m_cbCurrent->m_curRenderFlags.m_renderFlags | (e_LineListInd << e_PrimTypeShift));
-    }
-    else
-    {
-        return(m_cbCurrent->m_curRenderFlags.m_renderFlags | (e_LineList << e_PrimTypeShift));
-    }
-}
-
-
-inline uint32 CAuxGeomCB::CreateTriangleRenderFlags(bool indexed)
-{
-    if (false != indexed)
-    {
-        return(m_cbCurrent->m_curRenderFlags.m_renderFlags | (e_TriListInd << e_PrimTypeShift));
-    }
-    else
-    {
-        return(m_cbCurrent->m_curRenderFlags.m_renderFlags | (e_TriList << e_PrimTypeShift));
-    }
-}
-
-
-inline uint32 CAuxGeomCB::CreateObjectRenderFlags(const EAuxDrawObjType& objType)
-{
-    return(m_cbCurrent->m_curRenderFlags.m_renderFlags | (e_Obj << e_PrimTypeShift) | objType);
-}
-
-
-inline CAuxGeomCB::EPrimType CAuxGeomCB::GetPrimType(const SAuxGeomRenderFlags& renderFlags)
-{
-    uint32 primType((renderFlags.m_renderFlags & e_PrimTypeMask) >> e_PrimTypeShift);
-    switch (primType)
-    {
-    case e_PtList:
-    {
-        return(e_PtList);
-    }
-    case e_LineList:
-    {
-        return(e_LineList);
-    }
-    case e_LineListInd:
-    {
-        return(e_LineListInd);
-    }
-    case e_TriList:
-    {
-        return(e_TriList);
-    }
-    case e_TriListInd:
-    {
-        return(e_TriListInd);
-    }
-    case e_Obj:
-    default:
-    {
-        assert(e_Obj == primType);
-        return(e_Obj);
-    }
-    }
-}
-
-
-inline bool CAuxGeomCB::IsThickLine(const SAuxGeomRenderFlags& renderFlags)
-{
-    EPrimType primType(GetPrimType(renderFlags));
-    assert(e_TriList == primType);
-
-    if (e_TriList == primType)
-    {
-        return(0 != (renderFlags.m_renderFlags & e_TriListParam_ProcessThickLines));
-    }
-    else
-    {
-        return(false);
-    }
-}
-
-
-inline CAuxGeomCB::EAuxDrawObjType CAuxGeomCB::GetAuxObjType(const SAuxGeomRenderFlags& renderFlags)
-{
-    assert(e_Obj == GetPrimType(renderFlags));
-
-    uint32 objType((renderFlags.m_renderFlags & e_PrivateRenderflagsMask));
-    switch (objType)
-    {
-    case eDOT_Sphere:
-    default:
-    {
-        assert(eDOT_Sphere == objType);
-        return(eDOT_Sphere);
-    }
-    case eDOT_Disk:
-    {
-        assert(eDOT_Disk == objType);
-        return(eDOT_Disk);
-    }
-    case eDOT_Quad:
-    {
-        assert(eDOT_Quad == objType);
-        return(eDOT_Quad);
-    }
-    case eDOT_Cone:
-    {
-        assert(eDOT_Cone == objType);
-        return(eDOT_Cone);
-    }
-    case eDOT_Cylinder:
-    {
-        assert(eDOT_Cylinder == objType);
-        return(eDOT_Cylinder);
-    }
-    }
-}
-
-
-inline uint8 CAuxGeomCB::GetPointSize(const SAuxGeomRenderFlags& renderFlags)
-{
-    EPrimType primType(GetPrimType(renderFlags));
-    assert(e_PtList == primType);
-
-    if (e_PtList == primType)
-    {
-        return(renderFlags.m_renderFlags & e_PrivateRenderflagsMask);
-    }
-    else
-    {
-        return(0);
-    }
-}
-
-#endif // #if defined(ENABLE_RENDER_AUX_GEOM)
-
-class CAuxGeomCB_Null
-    : public IRenderAuxGeom
-{
-public:
-    // interface
-    virtual void SetRenderFlags([[maybe_unused]] const SAuxGeomRenderFlags& renderFlags) {}
-    virtual SAuxGeomRenderFlags GetRenderFlags() {return SAuxGeomRenderFlags(); }
-
-    virtual void DrawPoint([[maybe_unused]] const Vec3& v, [[maybe_unused]] const ColorB& col, [[maybe_unused]] uint8 size = 1) {}
-    virtual void DrawPoints([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB& col, [[maybe_unused]] uint8 size = 1) {}
-    virtual void DrawPoints([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB* col, [[maybe_unused]] uint8 size = 1) {}
-
-    virtual void DrawLine([[maybe_unused]] const Vec3& v0, [[maybe_unused]] const ColorB& colV0, [[maybe_unused]] const Vec3& v1, [[maybe_unused]] const ColorB& colV1, [[maybe_unused]] float thickness = 1.0f) {}
-    virtual void DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB& col, [[maybe_unused]] float thickness = 1.0f) {}
-    virtual void DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB* col, [[maybe_unused]] float thickness = 1.0f) {}
-    virtual void DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB& col, [[maybe_unused]] float thickness = 1.0f) {}
-    virtual void DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB* col, [[maybe_unused]] float thickness = 1.0f) {}
-    virtual void DrawPolyline([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] bool closed, [[maybe_unused]] const ColorB& col, [[maybe_unused]] float thickness = 1.0f) {}
-    virtual void DrawPolyline([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] bool closed, [[maybe_unused]] const ColorB* col, [[maybe_unused]] float thickness = 1.0f) {}
-
-    virtual void DrawTriangle([[maybe_unused]] const Vec3& v0, [[maybe_unused]] const ColorB& colV0, [[maybe_unused]] const Vec3& v1, [[maybe_unused]] const ColorB& colV1, [[maybe_unused]] const Vec3& v2, [[maybe_unused]] const ColorB& colV2) {}
-    virtual void DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB& col) {}
-    virtual void DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB* col) {}
-    virtual void DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB& col) {}
-    virtual void DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB* col) {}
-
-    virtual void DrawQuad([[maybe_unused]] float width, [[maybe_unused]] float height, [[maybe_unused]] const Matrix34& matWorld, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-
-    virtual void DrawAABB([[maybe_unused]] const AABB& aabb, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-    virtual void DrawAABBs([[maybe_unused]] const AABB* aabbs, [[maybe_unused]] uint32 aabbCount, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-    virtual void DrawAABB([[maybe_unused]] const AABB& aabb, [[maybe_unused]] const Matrix34& matWorld, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-
-    virtual void DrawOBB([[maybe_unused]] const OBB& obb, [[maybe_unused]] const Vec3& pos, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-    virtual void DrawOBB([[maybe_unused]] const OBB& obb, [[maybe_unused]] const Matrix34& matWorld, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-
-    virtual void DrawSphere([[maybe_unused]] const Vec3& pos, [[maybe_unused]] float radius, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-    virtual void DrawDisk([[maybe_unused]] const Vec3& pos, [[maybe_unused]] const Vec3& dir, [[maybe_unused]] float radius, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-    virtual void DrawCone([[maybe_unused]] const Vec3& pos, [[maybe_unused]] const Vec3& dir, [[maybe_unused]] float radius, [[maybe_unused]] float height, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-    virtual void DrawCylinder([[maybe_unused]] const Vec3& pos, [[maybe_unused]] const Vec3& dir, [[maybe_unused]] float radius, [[maybe_unused]] float height, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-
-    virtual void DrawBone([[maybe_unused]] const Vec3& rParent, [[maybe_unused]] const Vec3& rBone, [[maybe_unused]] ColorB col) {}
-
-    virtual void RenderText([[maybe_unused]] Vec3 pos, [[maybe_unused]] SDrawTextInfo& ti, [[maybe_unused]] const char* format, [[maybe_unused]] va_list args) {}
-
-    virtual void Flush() {}
-    virtual void Commit([[maybe_unused]] uint frames = 0) {}
-    virtual void Process() {}
-
-public:
-    CAuxGeomCB_Null() {}
-    ~CAuxGeomCB_Null() {}
-};
-
-#endif // #ifndef _RENDERAUXGEOM_H_
diff --git a/Code/CryEngine/RenderDll/Common/RenderCapabilities.h b/Code/CryEngine/RenderDll/Common/RenderCapabilities.h
deleted file mode 100644
index 84e5042272..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderCapabilities.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDERCAPABILITIES_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDERCAPABILITIES_H
-#pragma once
-
-#include <XRenderD3D9/DeviceManager/Enums.h>
-#include <AzCore/std/containers/bitset.h>
-
-namespace RenderCapabilities
-{
-    // GPU Vendor ID list
-    static const unsigned int s_gpuVendorIdNVIDIA = 0x10de;
-    static const unsigned int s_gpuVendorIdAMD = 0x1002;
-    static const unsigned int s_gpuVendorIdIntel = 0x8086;
-    static const unsigned int s_gpuVendorIdQualcomm = 0x5143;
-    static const unsigned int s_gpuVendorIdSamsung = 0x1099;
-    static const unsigned int s_gpuVendorIdARM = 0x13B5;
-
-    //Note that for platforms that don't support texture views, you are still allowed to create a single view, that view must "match" the creation parameters of
-    //the texture.
-    bool SupportsTextureViews();
-
-    // Test to determine if stencil textures are supported
-    bool SupportsStencilTextures();
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-    // Test to determine how much MRT bpp is available. (-1 means no restriction)
-    int GetAvailableMRTbpp();
-
-    // Tests to see if GMEM 128bpp path is supported.
-    bool Supports128bppGmemPath();
-
-    // Tests to see if GMEM 256bpp path is supported.
-    bool Supports256bppGmemPath();
-
-    // Tests to see if the device can support enough renderTargets.
-    bool SupportsRenderTargets(int numRTs);
-#endif
-
-#if defined(OPENGL_ES)
-    bool SupportsHalfFloatRendering();
-#endif
-
-#if defined(OPENGL_ES) || defined(OPENGL)
-    uint32 GetDeviceGLVersion();
-#endif
-    
-    //Check if Depth clipping API is enabled
-    bool SupportsDepthClipping();
-
-    // Flags for Frame Buffer Fetch capabilities
-    enum
-    {
-        FBF_ALL_COLORS  = 0,// Can fetch from any color render target that is bound. 
-        FBF_COLOR0,         // Some devices only allows fetching from the first color render target.
-        FBF_DEPTH,          // Can fetch the depth value from the attached buffer.
-        FBF_STENCIL,        // Can fetch the stencil value from the attached buffer.
-        FBF_COUNT
-    };
-
-    using FrameBufferFetchMask = AZStd::bitset<FBF_COUNT>;
-
-    FrameBufferFetchMask GetFrameBufferFetchCapabilities();
-
-    // Extracting this out as to not pollute rest of code base with a bunch of "if defined(OPENGL_ES)"
-    bool SupportsPLSExtension();
-
-    bool SupportsDualSourceBlending();
-
-    bool SupportsStructuredBuffer(EShaderStage stage);
-
-    bool SupportsIndependentBlending();
-}
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDERCAPABILITIES_H
diff --git a/Code/CryEngine/RenderDll/Common/RenderMesh.cpp b/Code/CryEngine/RenderDll/Common/RenderMesh.cpp
deleted file mode 100644
index 357731fc6d..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderMesh.cpp
+++ /dev/null
@@ -1,5233 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "IIndexedMesh.h"
-#include "CGFContent.h"
-#include "GeomQuery.h"
-#include "RenderMesh.h"
-#include "PostProcess/PostEffects.h"
-#include "QTangent.h"
-#include <Common/Memory/VRAMDrillerBus.h>
-
-#if !defined(NULL_RENDERER)
-#include "XRenderD3D9/DriverD3D.h"
-#endif
-
-#define RENDERMESH_ASYNC_MEMCPY_THRESHOLD (1 << 10)
-#define MESH_DATA_DEFAULT_ALIGN (128u)
-
-#ifdef MESH_TESSELLATION_RENDERER
-// Rebuilding the adjaency information needs access to system copies of the buffers. Needs fixing
-#undef BUFFER_ENABLE_DIRECT_ACCESS
-#define BUFFER_ENABLE_DIRECT_ACCESS 0
-#endif
-
-namespace
-{
-    class CConditionalLock
-    {
-    public:
-        CConditionalLock(CryCriticalSection& lock, bool doConditionalLock)
-            : m_critSection(lock)
-            , m_doConditionalLock(doConditionalLock)
-        {
-            if (m_doConditionalLock)
-            {
-                m_critSection.Lock();
-            }
-        }
-        ~CConditionalLock()
-        {
-            if (m_doConditionalLock)
-            {
-                m_critSection.Unlock();
-            }
-        }
-
-    private:
-        CryCriticalSection& m_critSection;
-        bool m_doConditionalLock = false;
-    };
-
-    static inline void RelinkTail(util::list<CRenderMesh>& instance, util::list<CRenderMesh>& list, int threadId)
-    {
-        // Conditional lock logic - When multi-threaded rendering is enabled, 
-        // this data is double buffered and we must only lock when attempting 
-        // to modify the fill thread data.  Only the render thread should  
-        // access the process thread data so we don't need to lock in that case. 
-        // In single-threaded rendering (editor) we must always lock because
-        // the data is not double buffered.
-        bool isRenderThread = gRenDev->m_pRT->IsRenderThread();
-        bool doConditionalLock = !isRenderThread || threadId == gRenDev->m_pRT->CurThreadFill() || CRenderer::CV_r_multithreaded == 0;
-
-        CConditionalLock lock(CRenderMesh::m_sLinkLock, doConditionalLock);
-        instance.relink_tail(&list);
-    }
-
-    struct SMeshPool
-    {
-        IGeneralMemoryHeap* m_MeshDataPool;
-        IGeneralMemoryHeap* m_MeshInstancePool;
-        void* m_MeshDataMemory;
-        void* m_MeshInstanceMemory;
-        CryCriticalSection m_MeshPoolCS;
-        SMeshPoolStatistics m_MeshDataPoolStats;
-        SMeshPool()
-            : m_MeshPoolCS()
-            , m_MeshDataPool()
-            , m_MeshInstancePool()
-            , m_MeshDataMemory()
-            , m_MeshInstanceMemory()
-            , m_MeshDataPoolStats()
-        {}
-    };
-    static SMeshPool s_MeshPool;
-
-    //////////////////////////////////////////////////////////////////////////
-    static void* AllocateMeshData(size_t nSize, size_t nAlign = MESH_DATA_DEFAULT_ALIGN, [[maybe_unused]] bool bFlush = false)
-    {
-        nSize = (nSize + (nAlign - 1)) & ~(nAlign - 1);
-
-        if (s_MeshPool.m_MeshDataPool && s_MeshPool.m_MeshDataPoolStats.nPoolSize > nSize)
-        {
-try_again:
-            s_MeshPool.m_MeshPoolCS.Lock();
-            void* ptr = s_MeshPool.m_MeshDataPool->Memalign(nAlign, nSize, "RENDERMESH_POOL");
-            if (ptr)
-            {
-                s_MeshPool.m_MeshDataPoolStats.nPoolInUse += s_MeshPool.m_MeshDataPool->UsableSize(ptr);
-                s_MeshPool.m_MeshDataPoolStats.nPoolInUsePeak =
-                    std::max(
-                        s_MeshPool.m_MeshDataPoolStats.nPoolInUsePeak,
-                        s_MeshPool.m_MeshDataPoolStats.nPoolInUse);
-                s_MeshPool.m_MeshPoolCS.Unlock();
-                return ptr;
-            }
-            else
-            {
-                s_MeshPool.m_MeshPoolCS.Unlock();
-                // Clean up the stale mesh temporary data - and do it from the main thread.
-                if (gRenDev->m_pRT->IsMainThread() && CRenderMesh::ClearStaleMemory(false, gRenDev->m_RP.m_nFillThreadID))
-                {
-                    goto try_again;
-                }
-                else if (gRenDev->m_pRT->IsRenderThread() && CRenderMesh::ClearStaleMemory(false, gRenDev->m_RP.m_nProcessThreadID))
-                {
-                    goto try_again;
-                }
-            }
-            s_MeshPool.m_MeshPoolCS.Lock();
-            s_MeshPool.m_MeshDataPoolStats.nFallbacks += nSize;
-            s_MeshPool.m_MeshPoolCS.Unlock();
-        }
-        return CryModuleMemalign(nSize, nAlign);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    static void FreeMeshData(void* ptr)
-    {
-        if (ptr == NULL)
-        {
-            return;
-        }
-        {
-            AUTO_LOCK(s_MeshPool.m_MeshPoolCS);
-            size_t nSize = 0u;
-            if (s_MeshPool.m_MeshDataPool && (nSize = s_MeshPool.m_MeshDataPool->Free(ptr)) > 0)
-            {
-                s_MeshPool.m_MeshDataPoolStats.nPoolInUse -=
-                    (nSize < s_MeshPool.m_MeshDataPoolStats.nPoolInUse) ? nSize : s_MeshPool.m_MeshDataPoolStats.nPoolInUse;
-                return;
-            }
-        }
-        CryModuleMemalignFree(ptr);
-    }
-
-    template<typename Type>
-    static Type* AllocateMeshData(size_t nCount = 1)
-    {
-        void* pStorage = AllocateMeshData(sizeof(Type) * nCount, std::max((size_t)TARGET_DEFAULT_ALIGN, (size_t)__alignof(Type)));
-        if (!pStorage)
-        {
-            return NULL;
-        }
-        Type* pTypeArray = reinterpret_cast<Type*>(pStorage);
-        for (size_t i = 0; i < nCount; ++i)
-        {
-            new (pTypeArray + i)Type;
-        }
-        return pTypeArray;
-    }
-
-    static bool InitializePool()
-    {
-        if (gRenDev->CV_r_meshpoolsize > 0)
-        {
-            if (s_MeshPool.m_MeshDataPool || s_MeshPool.m_MeshDataMemory)
-            {
-                CryFatalError("render meshpool already initialized");
-                return false;
-            }
-            size_t poolSize = static_cast<size_t>(gRenDev->CV_r_meshpoolsize) * 1024U;
-            s_MeshPool.m_MeshDataMemory = CryModuleMemalign(poolSize, 128u);
-            if (!s_MeshPool.m_MeshDataMemory)
-            {
-                CryFatalError("could not allocate render meshpool");
-                return false;
-            }
-
-            // Initialize the actual pool
-            s_MeshPool.m_MeshDataPool = gEnv->pSystem->GetIMemoryManager()->CreateGeneralMemoryHeap(
-                    s_MeshPool.m_MeshDataMemory, poolSize,  "RENDERMESH_POOL");
-            s_MeshPool.m_MeshDataPoolStats.nPoolSize = poolSize;
-        }
-        if (gRenDev->CV_r_meshinstancepoolsize && !s_MeshPool.m_MeshInstancePool)
-        {
-            size_t poolSize = static_cast<size_t>(gRenDev->CV_r_meshinstancepoolsize) * 1024U;
-            s_MeshPool.m_MeshInstanceMemory = CryModuleMemalign(poolSize, 128u);
-            if (!s_MeshPool.m_MeshInstanceMemory)
-            {
-                CryFatalError("could not allocate render mesh instance pool");
-                return false;
-            }
-
-            s_MeshPool.m_MeshInstancePool = gEnv->pSystem->GetIMemoryManager()->CreateGeneralMemoryHeap(
-                    s_MeshPool.m_MeshInstanceMemory, poolSize, "RENDERMESH_INSTANCE_POOL");
-            s_MeshPool.m_MeshDataPoolStats.nInstancePoolInUse = 0;
-            s_MeshPool.m_MeshDataPoolStats.nInstancePoolInUsePeak = 0;
-            s_MeshPool.m_MeshDataPoolStats.nInstancePoolSize = gRenDev->CV_r_meshinstancepoolsize * 1024;
-        }
-        return true;
-    }
-
-    static void ShutdownPool()
-    {
-        if (s_MeshPool.m_MeshDataPool)
-        {
-            s_MeshPool.m_MeshDataPool->Release();
-            s_MeshPool.m_MeshDataPool = NULL;
-        }
-        if (s_MeshPool.m_MeshDataMemory)
-        {
-            CryModuleMemalignFree(s_MeshPool.m_MeshDataMemory);
-            s_MeshPool.m_MeshDataMemory = NULL;
-        }
-        if (s_MeshPool.m_MeshInstancePool)
-        {
-            s_MeshPool.m_MeshInstancePool->Cleanup();
-            s_MeshPool.m_MeshInstancePool->Release();
-            s_MeshPool.m_MeshInstancePool = NULL;
-        }
-        if (s_MeshPool.m_MeshInstanceMemory)
-        {
-            CryModuleMemalignFree(s_MeshPool.m_MeshInstanceMemory);
-            s_MeshPool.m_MeshInstanceMemory = NULL;
-        }
-    }
-
-    static void* AllocateMeshInstanceData(size_t size, size_t align)
-    {
-        if (s_MeshPool.m_MeshInstancePool)
-        {
-            if (void* ptr = s_MeshPool.m_MeshInstancePool->Memalign(align, size, "rendermesh instance data"))
-            {
-#       if !defined(_RELEASE)
-                AUTO_LOCK(s_MeshPool.m_MeshPoolCS);
-                s_MeshPool.m_MeshDataPoolStats.nInstancePoolInUsePeak = std::max(
-                        s_MeshPool.m_MeshDataPoolStats.nInstancePoolInUsePeak,
-                        s_MeshPool.m_MeshDataPoolStats.nInstancePoolInUse += size);
-#       endif
-                return ptr;
-            }
-        }
-        return CryModuleMemalign(size, align);
-    }
-
-    static void FreeMeshInstanceData(void* ptr)
-    {
-        if (s_MeshPool.m_MeshInstancePool)
-        {
-            size_t size = s_MeshPool.m_MeshInstancePool->UsableSize(ptr);
-            if (size)
-            {
-#     if !defined(_RELEASE)
-                AUTO_LOCK(s_MeshPool.m_MeshPoolCS);
-                s_MeshPool.m_MeshDataPoolStats.nInstancePoolInUse -= size;
-#     endif
-                s_MeshPool.m_MeshInstancePool->Free(ptr);
-                return;
-            }
-        }
-        CryModuleMemalignFree(ptr);
-    }
-}
-
-#define alignup(alignment, value)   ((((uintptr_t)(value)) + ((alignment) - 1)) & (~((uintptr_t)(alignment) - 1)))
-#define alignup16(value)                        alignup(16, value)
-
-namespace
-{
-    inline uint32 GetCurrentRenderFrameID()
-    {
-        ASSERT_IS_MAIN_THREAD(gRenDev->m_pRT);
-        return gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-    };
-}
-
-#if defined(USE_VBIB_PUSH_DOWN)
-static inline bool VidMemPushDown(void* pDst, const void* pSrc, size_t nSize, void* pDst1 = NULL, const void* pSrc1 = NULL, size_t nSize1 = 0, int cachePosStride = -1, void* pFP16Dst = NULL, uint32 nVerts = 0)
-{
-}
-    #define ASSERT_LOCK
-static std::vector<CRenderMesh*> g_MeshCleanupVec;    //for cleanup of meshes itself
-#else
-    #define ASSERT_LOCK assert((m_nVerts == 0) || pData)
-#endif
-
-#if !defined(_RELEASE)
-ILINE void CheckVideoBufferAccessViolation([[maybe_unused]] CRenderMesh& mesh)
-{
-    //LogWarning("CRenderMesh::LockVB: accessing video buffer for cgf=%s",mesh.GetSourceName());
-}
-    #define MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT CheckVideoBufferAccessViolation(*this)
-#else
-    #define MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT
-#endif
-
-CryCriticalSection CRenderMesh::m_sLinkLock;
-
-// Additional streams stride
-int32 CRenderMesh::m_cSizeStream[VSF_NUM] =
-{
-    -1,
-    sizeof(SPipTangents),      // VSF_TANGENTS
-    sizeof(SPipQTangents),     // VSF_QTANGENTS
-    sizeof(SVF_W4B_I4S),       // VSF_HWSKIN_INFO
-    sizeof(SVF_P3F),           // VSF_VERTEX_VELOCITY
-# if ENABLE_NORMALSTREAM_SUPPORT
-    sizeof(SPipNormal),        // VSF_NORMALS
-#endif
-};
-
-util::list<CRenderMesh> CRenderMesh::m_MeshList;
-util::list<CRenderMesh> CRenderMesh::m_MeshGarbageList[MAX_RELEASED_MESH_FRAMES];
-util::list<CRenderMesh> CRenderMesh::m_MeshDirtyList[2];
-util::list<CRenderMesh> CRenderMesh::m_MeshModifiedList[2];
-
-int CRenderMesh::Release()
-{
-    long refCnt = CryInterlockedDecrement(&m_nRefCounter);
-# if !defined(_RELEASE)
-    if (refCnt < 0)
-    {
-        CryLogAlways("CRenderMesh::Release() called so many times on rendermesh that refcount became negative");
-        if (CRenderer::CV_r_BreakOnError)
-        {
-            __debugbreak();
-        }
-    }
-# endif
-    if (refCnt == 0)
-    {
-        AUTO_LOCK(m_sLinkLock);
-#   if !defined(_RELEASE)
-        if (m_nFlags & FRM_RELEASED)
-        {
-            CryLogAlways("CRenderMesh::Release() mesh already in the garbage list (double delete pending)");
-            if (CRenderer::CV_r_BreakOnError)
-            {
-                __debugbreak();
-            }
-        }
-#   endif
-        m_nFlags |= FRM_RELEASED;
-        int nFrame = gRenDev->GetFrameID(false);
-        util::list<CRenderMesh>* garbage = &CRenderMesh::m_MeshGarbageList[nFrame & (MAX_RELEASED_MESH_FRAMES - 1)];
-        m_Chain.relink_tail(garbage);
-    }
-
-    return refCnt;
-}
-
-CRenderMesh::CRenderMesh()
-{
-#if defined(USE_VBIB_PUSH_DOWN)
-    m_VBIBFramePushID = 0;
-#endif
-    memset(m_VBStream, 0x0, sizeof(m_VBStream));
-
-    SMeshStream* streams = (SMeshStream*)AllocateMeshInstanceData(sizeof(SMeshStream) * VSF_NUM, 64u);
-    for (signed i = 0; i < VSF_NUM; ++i)
-    {
-        new (m_VBStream[i] = &streams[i])SMeshStream();
-    }
-
-    m_keepSysMesh = false;
-    m_nLastRenderFrameID = 0;
-    m_nLastSubsetGCRenderFrameID = 0;
-    m_nThreadAccessCounter = 0;
-    for (size_t i = 0; i < 2; ++i)
-    {
-        m_asyncUpdateState[i] = m_asyncUpdateStateCounter[i] = 0;
-    }
-
-# if !defined(_RELEASE) && defined(RM_CATCH_EXCESSIVE_LOCKS)
-    m_lockTime = 0.f;
-# endif
-}
-
-CRenderMesh::CRenderMesh (const char* szType, const char* szSourceName, bool bLock)
-{
-    memset(m_VBStream, 0x0, sizeof(m_VBStream));
-
-    SMeshStream* streams = (SMeshStream*)AllocateMeshInstanceData(sizeof(SMeshStream) * VSF_NUM, 64u);
-    for (signed i = 0; i < VSF_NUM; ++i)
-    {
-        new (m_VBStream[i] = &streams[i])SMeshStream();
-    }
-
-    m_keepSysMesh = false;
-    m_nRefCounter = 0;
-    m_nLastRenderFrameID = 0;
-    m_nLastSubsetGCRenderFrameID = 0;
-
-    m_sType = szType;
-    m_sSource = szSourceName;
-
-    m_vBoxMin = m_vBoxMax = Vec3(0, 0, 0); //used for hw occlusion test
-    m_nVerts = 0;
-    m_nInds = 0;
-    m_vertexFormat = AZ::Vertex::Format(eVF_P3F_C4B_T2F);
-    m_pVertexContainer = NULL;
-
-    {
-        AUTO_LOCK(m_sLinkLock);
-        m_Chain.relink_tail(&m_MeshList);
-    }
-    m_nPrimetiveType = eptTriangleList;
-
-    //  m_nFrameRender = 0;
-    //m_nFrameUpdate = 0;
-    m_nClientTextureBindID = 0;
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-    m_pTrisMap = NULL;
-#endif
-
-    m_pCachePos = NULL;
-    m_nFrameRequestCachePos = 0;
-    m_nFlagsCachePos = 0;
-
-    m_nFrameRequestCacheUVs = 0;
-    m_nFlagsCacheUVs = 0;
-
-    _SetRenderMeshType(eRMT_Static);
-
-    m_nFlags = 0;
-    m_fGeometricMeanFaceArea = 0.f;
-    m_nLod = 0;
-
-#if defined(USE_VBIB_PUSH_DOWN)
-    m_VBIBFramePushID = 0;
-#endif
-
-    m_nThreadAccessCounter = 0;
-    for (size_t i = 0; i < 2; ++i)
-    {
-        m_asyncUpdateState[i] = m_asyncUpdateStateCounter[i] = 0;
-    }
-
-    IF (bLock, 0)//when called from another thread like the Streaming AsyncCallbackCGF, we need to lock it
-    {
-        LockForThreadAccess();
-    }
-}
-
-void CRenderMesh::Cleanup()
-{
-    FreeDeviceBuffers(false);
-    FreeSystemBuffers();
-
-    m_meshSubSetIndices.clear();
-
-    if (m_pVertexContainer)
-    {
-        m_pVertexContainer->m_lstVertexContainerUsers.Delete(this);
-        m_pVertexContainer = NULL;
-    }
-
-    for (int i = 0; i < m_lstVertexContainerUsers.Count(); i++)
-    {
-        if (m_lstVertexContainerUsers[i]->GetVertexContainer() == this)
-        {
-            m_lstVertexContainerUsers[i]->m_pVertexContainer = NULL;
-        }
-    }
-    m_lstVertexContainerUsers.Clear();
-
-    ReleaseRenderChunks(&m_ChunksSkinned);
-    ReleaseRenderChunks(&m_ChunksSubObjects);
-    ReleaseRenderChunks(&m_Chunks);
-
-    m_ChunksSubObjects.clear();
-    m_Chunks.clear();
-
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-    SAFE_DELETE(m_pTrisMap);
-#endif
-
-    for (size_t i = 0; i < 2; ++i)
-    {
-        m_asyncUpdateState[i] = m_asyncUpdateStateCounter[i] = 0;
-    }
-
-    for (int i = 0; i < VSF_NUM; ++i)
-    {
-        if (m_VBStream[i])
-        {
-            m_VBStream[i]->~SMeshStream();
-        }
-    }
-    FreeMeshInstanceData(m_VBStream[0]);
-    memset(m_VBStream, 0, sizeof(m_VBStream));
-
-    for (size_t j = 0; j < 2; ++j)
-    {
-        for (size_t i = 0, end = m_CreatedBoneIndices[j].size(); i < end; ++i)
-        {
-            delete[] m_CreatedBoneIndices[j][i].pStream;
-        }
-    }
-    for (size_t i = 0, end = m_RemappedBoneIndices.size(); i < end; ++i)
-    {
-        if (m_RemappedBoneIndices[i].refcount && m_RemappedBoneIndices[i].guid != ~0u)
-        {
-            CryLogAlways("remapped bone indices with refcount '%d' still around for '%s 0x%p\n", m_RemappedBoneIndices[i].refcount, m_sSource.c_str(), this);
-        }
-        if (m_RemappedBoneIndices[i].buffer != ~0u)
-        {
-            // Unregister the allocation with the VRAM driller
-            void* address = reinterpret_cast<void*>(m_RemappedBoneIndices[i].buffer);
-            EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, address);
-
-            gRenDev->m_DevBufMan.Destroy(m_RemappedBoneIndices[i].buffer);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CRenderMesh::~CRenderMesh()
-{
-    // make sure to stop and delete all mesh subset indice tasks
-    ASSERT_IS_RENDER_THREAD(gRenDev->m_pRT);
-
-    int nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; SyncAsyncUpdate(i++))
-    {
-        ;
-    }
-
-    // make sure no subset rendermesh job is still running which uses this mesh
-    for (int j = 0; j < RT_COMMAND_BUF_COUNT; ++j)
-    {
-        size_t nNumSubSetRenderMeshJobs = m_meshSubSetRenderMeshJobs[j].size();
-        for (size_t i = 0; i < nNumSubSetRenderMeshJobs; ++i)
-        {
-            SMeshSubSetIndicesJobEntry& rSubSetJob = m_meshSubSetRenderMeshJobs[j][i];
-            if (rSubSetJob.m_pSrcRM == this)
-            {
-                rSubSetJob.jobExecutor.WaitForCompletion();
-                rSubSetJob.m_pSrcRM = NULL;
-            }
-        }
-    }
-
-    // remove ourself from deferred subset mesh garbage collection
-    for (size_t i = 0; i < m_deferredSubsetGarbageCollection[nThreadID].size(); ++i)
-    {
-        if (m_deferredSubsetGarbageCollection[nThreadID][i] == this)
-        {
-            m_deferredSubsetGarbageCollection[nThreadID][i] = NULL;
-        }
-    }
-
-    assert(m_nThreadAccessCounter == 0);
-
-    {
-        AUTO_LOCK(m_sLinkLock);
-        for (int i = 0; i < 2; ++i)
-        {
-            m_Dirty[i].erase(), m_Modified[i].erase();
-        }
-        m_Chain.erase();
-    }
-
-    Cleanup();
-}
-
-void CRenderMesh::ReleaseRenderChunks(TRenderChunkArray* pChunks)
-{
-    if (pChunks)
-    {
-        for (size_t i = 0, c = pChunks->size(); i != c; ++i)
-        {
-            CRenderChunk& rChunk = pChunks->at(i);
-
-            if (rChunk.pRE)
-            {
-                CREMeshImpl* pRE = static_cast<CREMeshImpl*>(rChunk.pRE);
-                pRE->Release(false);
-                pRE->m_pRenderMesh = NULL;
-                rChunk.pRE = 0;
-            }
-        }
-    }
-}
-
-SMeshStream* CRenderMesh::GetVertexStream(int nStream, uint32 nFlags)
-{
-    SMeshStream*& pMS = m_VBStream[nStream];
-    IF (!pMS && (nFlags & FSL_WRITE), 0)
-    {
-        pMS = new (AllocateMeshInstanceData(sizeof(SMeshStream), alignof(SMeshStream)))SMeshStream;
-    }
-    return pMS;
-}
-
-void* CRenderMesh::LockVB(int nStream, uint32 nFlags, int nVerts, int* nStride, [[maybe_unused]] bool prefetchIB, [[maybe_unused]] bool inplaceCachePos)
-{
-    FUNCTION_PROFILER_RENDERER;
-# if !defined(_RELEASE)
-    if (!m_nThreadAccessCounter)
-    {
-        CryLogAlways("rendermesh must be locked via LockForThreadAccess() before LockIB/VB is called");
-        if (CRenderer::CV_r_BreakOnError)
-        {
-            __debugbreak();
-        }
-    }
-#endif
-    const int threadId = gRenDev->m_RP.m_nFillThreadID;
-
-    if (!CanRender()) // if allocation failure suffered, don't lock anything anymore
-    {
-        return NULL;
-    }
-
-    SREC_AUTO_LOCK(m_sResLock);//need lock as resource must not be updated concurrently
-    SMeshStream* MS = GetVertexStream(nStream, nFlags);
-
-#if defined(USE_VBIB_PUSH_DOWN)
-    m_VBIBFramePushID = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-    if (nFlags == FSL_SYSTEM_CREATE || nFlags == FSL_SYSTEM_UPDATE)
-    {
-        MS->m_nLockFlags &= ~FSL_VBIBPUSHDOWN;
-    }
-#endif
-
-    assert(nVerts <= (int)m_nVerts);
-    if (nVerts > (int)m_nVerts)
-    {
-        nVerts = m_nVerts;
-    }
-    if (nStride)
-    {
-        *nStride = GetStreamStride(nStream);
-    }
-
-    m_nFlags |= FRM_READYTOUPLOAD;
-
-    byte* pD;
-
-    if (nFlags == FSL_SYSTEM_CREATE)
-    {
-lSysCreate:
-        RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-        if (!MS->m_pUpdateData)
-        {
-            uint32 nSize = GetStreamSize(nStream);
-            pD = reinterpret_cast<byte*>(AllocateMeshData(nSize));
-            if (!pD)
-            {
-                return NULL;
-            }
-            MS->m_pUpdateData = pD;
-        }
-        else
-        {
-            pD = (byte*)MS->m_pUpdateData;
-        }
-        //MS->m_nFrameRequest = nFrame;
-        MS->m_nLockFlags = (FSL_SYSTEM_CREATE | (MS->m_nLockFlags & FSL_LOCKED));
-        return pD;
-    }
-    else
-    if (nFlags == FSL_SYSTEM_UPDATE)
-    {
-lSysUpdate:
-        RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-        if (!MS->m_pUpdateData)
-        {
-            MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT;
-            CopyStreamToSystemForUpdate(*MS, GetStreamSize(nStream));
-        }
-        assert(nStream || MS->m_pUpdateData);
-        if (!MS->m_pUpdateData)
-        {
-            return NULL;
-        }
-        //MS->m_nFrameRequest = nFrame;
-        pD = (byte*)MS->m_pUpdateData;
-        MS->m_nLockFlags = (nFlags | (MS->m_nLockFlags & FSL_LOCKED));
-        return pD;
-    }
-    else if (nFlags == FSL_READ)
-    {
-        if (!MS)
-        {
-            return NULL;
-        }
-        RelinkTail(m_Dirty[threadId], m_MeshDirtyList[threadId], threadId);
-        if (MS->m_pUpdateData)
-        {
-            pD = (byte*)MS->m_pUpdateData;
-            return pD;
-        }
-        nFlags = FSL_READ | FSL_VIDEO;
-    }
-
-    if (nFlags == (FSL_READ | FSL_VIDEO))
-    {
-        if (!MS)
-        {
-            return NULL;
-        }
-        RelinkTail(m_Dirty[threadId], m_MeshDirtyList[threadId], threadId);
-#   if !BUFFER_ENABLE_DIRECT_ACCESS || defined(NULL_RENDERER)
-        if (gRenDev->m_pRT && gRenDev->m_pRT->IsMultithreaded())
-        {
-            // Always use system copy in MT mode
-            goto lSysUpdate;
-        }
-        else
-#   endif
-        {
-            buffer_handle_t nVB = MS->m_nID;
-            if (nVB == ~0u)
-            {
-                return NULL;
-            }
-            // Try to lock device buffer in single-threaded mode
-            if (!MS->m_pLockedData)
-            {
-                MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT;
-                MS->m_pLockedData = gRenDev->m_DevBufMan.BeginRead(nVB);
-                if (MS->m_pLockedData)
-                {
-                    MS->m_nLockFlags |= FSL_LOCKED;
-                }
-            }
-            if (MS->m_pLockedData)
-            {
-                ++MS->m_nLockCount;
-                pD = (byte*)MS->m_pLockedData;
-                return pD;
-            }
-        }
-    }
-    if (nFlags == (FSL_VIDEO_CREATE))
-    {
-        // Only consoles support direct uploading to vram, but as the data is not
-        // double buffered in the non-dynamic case, only creation is supported
-        // DX11 has to use the deferred context to call map, which is not threadsafe
-        // DX9 can experience huge stalls if resources are used while rendering is performed
-        buffer_handle_t nVB = ~0u;
-#   if BUFFER_ENABLE_DIRECT_ACCESS && !defined(NULL_RENDERER)
-        nVB = MS->m_nID;
-        int nFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-        if ((nVB != ~0u && (MS->m_nFrameCreate != nFrame || MS->m_nElements != m_nVerts)) || !CRenderer::CV_r_buffer_enable_lockless_updates)
-#   endif
-        goto lSysCreate;
-        RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-        if (nVB == ~0u && !CreateVidVertices(nStream))
-        {
-            RT_AllocationFailure("Create VB-Stream", GetStreamSize(nStream, m_nVerts));
-            return NULL;
-        }
-        nVB = MS->m_nID;
-        if (!MS->m_pLockedData)
-        {
-            MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT;
-            if ((MS->m_pLockedData = gRenDev->m_DevBufMan.BeginWrite(nVB)) == NULL)
-            {
-                return NULL;
-            }
-            MS->m_nLockFlags |= FSL_DIRECT | FSL_LOCKED;
-        }
-        ++MS->m_nLockCount;
-        pD = (byte*)MS->m_pLockedData;
-        return pD;
-    }
-    if (nFlags == (FSL_VIDEO_UPDATE))
-    {
-        goto lSysUpdate;
-    }
-
-    return NULL;
-}
-
-vtx_idx* CRenderMesh::LockIB(uint32 nFlags, int nOffset, [[maybe_unused]] int nInds)
-{
-    FUNCTION_PROFILER_RENDERER;
-    
-    byte* pD;
-# if !defined(_RELEASE)
-    if (!m_nThreadAccessCounter)
-    {
-        CryLogAlways("rendermesh must be locked via LockForThreadAccess() before LockIB/VB is called");
-        if (CRenderer::CV_r_BreakOnError)
-        {
-            __debugbreak();
-        }
-    }
-#endif
-    if (!CanRender()) // if allocation failure suffered, don't lock anything anymore
-    {
-        return NULL;
-    }
-
-    const int threadId = gRenDev->m_RP.m_nFillThreadID;
-
-    int nFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-    SREC_AUTO_LOCK(m_sResLock);//need lock as resource must not be updated concurrently
-
-#if defined(USE_VBIB_PUSH_DOWN)
-    m_VBIBFramePushID = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-    if (nFlags == FSL_SYSTEM_CREATE || nFlags == FSL_SYSTEM_UPDATE)
-    {
-        m_IBStream.m_nLockFlags &= ~FSL_VBIBPUSHDOWN;
-    }
-#endif
-    m_nFlags |= FRM_READYTOUPLOAD;
-
-    assert(nInds <= (int)m_nInds);
-    if (nFlags == FSL_SYSTEM_CREATE)
-    {
-lSysCreate:
-        RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-        if (!m_IBStream.m_pUpdateData)
-        {
-            uint32 nSize = m_nInds * sizeof(vtx_idx);
-            pD = reinterpret_cast<byte*>(AllocateMeshData(nSize));
-            if (!pD)
-            {
-                return NULL;
-            }
-            m_IBStream.m_pUpdateData = (vtx_idx*)pD;
-        }
-        else
-        {
-            pD = (byte*)m_IBStream.m_pUpdateData;
-        }
-        //m_IBStream.m_nFrameRequest = nFrame;
-        m_IBStream.m_nLockFlags = (nFlags | (m_IBStream.m_nLockFlags & FSL_LOCKED));
-        return (vtx_idx*)&pD[nOffset];
-    }
-    else
-    if (nFlags == FSL_SYSTEM_UPDATE)
-    {
-lSysUpdate:
-        RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-        if (!m_IBStream.m_pUpdateData)
-        {
-            MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT;
-            CopyStreamToSystemForUpdate(m_IBStream, sizeof(vtx_idx) * m_nInds);
-        }
-        assert(m_IBStream.m_pUpdateData);
-        if (!m_IBStream.m_pUpdateData)
-        {
-            return NULL;
-        }
-        //m_IBStream.m_nFrameRequest = nFrame;
-        pD = (byte*)m_IBStream.m_pUpdateData;
-        m_IBStream.m_nLockFlags = (nFlags | (m_IBStream.m_nLockFlags & FSL_LOCKED));
-        return (vtx_idx*)&pD[nOffset];
-    }
-    else if (nFlags == FSL_READ)
-    {
-        RelinkTail(m_Dirty[threadId], m_MeshDirtyList[threadId], threadId);
-        if (m_IBStream.m_pUpdateData)
-        {
-            pD = (byte*)m_IBStream.m_pUpdateData;
-            return (vtx_idx*)&pD[nOffset];
-        }
-        nFlags = FSL_READ | FSL_VIDEO;
-    }
-
-    if (nFlags == (FSL_READ | FSL_VIDEO))
-    {
-        RelinkTail(m_Dirty[threadId], m_MeshDirtyList[threadId], threadId);
-        buffer_handle_t nIB = m_IBStream.m_nID;
-        if (nIB == ~0u)
-        {
-            return NULL;
-        }
-        if (gRenDev->m_pRT && gRenDev->m_pRT->IsMultithreaded())
-        {
-            // Always use system copy in MT mode
-            goto lSysUpdate;
-        }
-        else
-        {
-            // TODO: make smart caching mesh algorithm for consoles
-            if (!m_IBStream.m_pLockedData)
-            {
-                MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT;
-                m_IBStream.m_pLockedData = gRenDev->m_DevBufMan.BeginRead(nIB);
-                if (m_IBStream.m_pLockedData)
-                {
-                    m_IBStream.m_nLockFlags |= FSL_LOCKED;
-                }
-            }
-            if (m_IBStream.m_pLockedData)
-            {
-                pD = (byte*)m_IBStream.m_pLockedData;
-                ++m_IBStream.m_nLockCount;
-                return (vtx_idx*)&pD[nOffset];
-            }
-        }
-    }
-    if (nFlags == (FSL_VIDEO_CREATE))
-    {
-        // Only consoles support direct uploading to vram, but as the data is not
-        // double buffered, only creation is supported
-        // DX11 has to use the deferred context to call map, which is not threadsafe
-        // DX9 can experience huge stalls if resources are used while rendering is performed
-        buffer_handle_t nIB = -1;
-#   if BUFFER_ENABLE_DIRECT_ACCESS && !defined(NULL_RENDERER)
-        nIB = m_IBStream.m_nID;
-        if ((nIB != ~0u && (m_IBStream.m_nFrameCreate || m_IBStream.m_nElements != m_nInds)) || !CRenderer::CV_r_buffer_enable_lockless_updates)
-#   endif
-        goto lSysCreate;
-        RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-        if (m_IBStream.m_nID == ~0u)
-        {
-            size_t bufferSize = m_nInds * sizeof(vtx_idx);
-            nIB = (m_IBStream.m_nID = gRenDev->m_DevBufMan.Create(BBT_INDEX_BUFFER, (BUFFER_USAGE)m_eType, bufferSize));
-            m_IBStream.m_nFrameCreate = nFrame;
-
-            // Register the allocation with the VRAM driller
-            void* address = reinterpret_cast<void*>(nIB);
-            const char* bufferName = GetSourceName();
-            EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, bufferSize, bufferName, Render::Debug::VRAM_CATEGORY_BUFFER, Render::Debug::VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER);
-        }
-        if (nIB == ~0u)
-        {
-            RT_AllocationFailure("Create IB-Stream", m_nInds * sizeof(vtx_idx));
-            return NULL;
-        }
-        m_IBStream.m_nElements = m_nInds;
-        if (!m_IBStream.m_pLockedData)
-        {
-            MESSAGE_VIDEO_BUFFER_ACC_ATTEMPT;
-            if ((m_IBStream.m_pLockedData = gRenDev->m_DevBufMan.BeginWrite(nIB)) == NULL)
-            {
-                return NULL;
-            }
-            m_IBStream.m_nLockFlags |= FSL_DIRECT | FSL_LOCKED;
-        }
-        ++m_IBStream.m_nLockCount;
-        pD = (byte*)m_IBStream.m_pLockedData;
-        return (vtx_idx*)&pD[nOffset];
-    }
-    if (nFlags == (FSL_VIDEO_UPDATE))
-    {
-        goto lSysUpdate;
-    }
-
-    assert(0);
-
-    return NULL;
-}
-
-ILINE void CRenderMesh::UnlockVB(int nStream)
-{
-    SREC_AUTO_LOCK(m_sResLock);
-    SMeshStream* pMS = GetVertexStream(nStream, 0);
-    if (pMS && pMS->m_nLockFlags & FSL_LOCKED)
-    {
-        assert(pMS->m_nLockCount);
-        if ((--pMS->m_nLockCount) == 0)
-        {
-            gRenDev->m_DevBufMan.EndReadWrite(pMS->m_nID);
-            pMS->m_nLockFlags &= ~FSL_LOCKED;
-            pMS->m_pLockedData = NULL;
-        }
-    }
-    if (pMS && (pMS->m_nLockFlags & FSL_WRITE) && (pMS->m_nLockFlags & (FSL_SYSTEM_CREATE | FSL_SYSTEM_UPDATE)))
-    {
-        pMS->m_nLockFlags &= ~(FSL_SYSTEM_CREATE | FSL_SYSTEM_UPDATE);
-        pMS->m_nFrameRequest = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-    }
-}
-
-ILINE void CRenderMesh::UnlockIB()
-{
-    SREC_AUTO_LOCK(m_sResLock);
-    if (m_IBStream.m_nLockFlags & FSL_LOCKED)
-    {
-        assert(m_IBStream.m_nLockCount);
-        if ((--m_IBStream.m_nLockCount) == 0)
-        {
-            gRenDev->m_DevBufMan.EndReadWrite(m_IBStream.m_nID);
-            m_IBStream.m_nLockFlags &= ~FSL_LOCKED;
-            m_IBStream.m_pLockedData = NULL;
-        }
-    }
-    if ((m_IBStream.m_nLockFlags & FSL_WRITE) && (m_IBStream.m_nLockFlags & (FSL_SYSTEM_CREATE | FSL_SYSTEM_UPDATE)))
-    {
-        m_IBStream.m_nLockFlags &= ~(FSL_SYSTEM_CREATE | FSL_SYSTEM_UPDATE);
-        m_IBStream.m_nFrameRequest = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-    }
-}
-
-void CRenderMesh::UnlockStream(int nStream)
-{
-    UnlockVB(nStream);
-    SREC_AUTO_LOCK(m_sResLock);
-
-    if (nStream == VSF_GENERAL)
-    {
-        if (m_nFlagsCachePos && m_pCachePos)
-        {
-            uint32 i;
-            int nStride;
-            byte* pDst = (byte*)LockVB(nStream, FSL_SYSTEM_UPDATE, m_nVerts, &nStride);
-            assert(pDst);
-            if (pDst)
-            {
-                for (i = 0; i < m_nVerts; i++)
-                {
-                    Vec3f16* pVDst = (Vec3f16*)pDst;
-                    *pVDst = m_pCachePos[i];
-                    pDst += nStride;
-                }
-            }
-            m_nFlagsCachePos = 0;
-        }
-
-        if (m_nFlagsCacheUVs && m_UVCache.size() > 0)
-        {
-            int nStride;
-            byte* streamStart = (byte*)LockVB(nStream, FSL_SYSTEM_UPDATE, m_nVerts, &nStride);
-
-            // Iterate over the cached uv coordinates and write them to the vertex buffer stream
-            for (int uvSet = 0; uvSet < m_UVCache.size(); ++uvSet)
-            {
-                if (m_UVCache[uvSet])
-                {
-                    uint texCoordOffset = 0;
-                    GetVertexFormat().TryCalculateOffset(texCoordOffset, AZ::Vertex::AttributeUsage::TexCoord, uvSet);
-                    byte* texCoord = streamStart + texCoordOffset;
-
-                    assert(streamStart);
-                    if (streamStart)
-                    {
-                        for (uint32 i = 0; i < m_nVerts; i++)
-                        {
-                            Vec2f16* pVDst = (Vec2f16*)texCoord;
-                            *pVDst = m_UVCache[uvSet][i];
-                            texCoord += nStride;
-                        }
-                    }
-                }
-            }
-            m_nFlagsCacheUVs = 0;
-        }
-    }
-
-    SMeshStream* pMS = GetVertexStream(nStream, 0);
-    IF (pMS, 1)
-    {
-        pMS->m_nLockFlags &= ~(FSL_WRITE | FSL_READ | FSL_SYSTEM | FSL_VIDEO);
-    }
-}
-void CRenderMesh::UnlockIndexStream()
-{
-    
-    UnlockIB();
-    m_IBStream.m_nLockFlags &= ~(FSL_WRITE | FSL_READ | FSL_SYSTEM | FSL_VIDEO);
-}
-
-bool CRenderMesh::CopyStreamToSystemForUpdate(SMeshStream& MS, size_t nSize)
-{    
-    FUNCTION_PROFILER_RENDERER;
-    SREC_AUTO_LOCK(m_sResLock);
-    if (!MS.m_pUpdateData)
-    {
-        buffer_handle_t nVB = MS.m_nID;
-        if (nVB == ~0u)
-        {
-            return false;
-        }
-        void* pSrc = MS.m_pLockedData;
-        if (!pSrc)
-        {
-            pSrc = gRenDev->m_DevBufMan.BeginRead(nVB);
-            MS.m_nLockFlags |= FSL_LOCKED;
-        }
-        assert(pSrc);
-        if (!pSrc)
-        {
-            return false;
-        }
-        ++MS.m_nLockCount;
-        byte* pD = reinterpret_cast<byte*>(AllocateMeshData(nSize, MESH_DATA_DEFAULT_ALIGN, false));
-        if (pD)
-        {
-            cryMemcpy(pD, pSrc, nSize);
-            if (MS.m_nLockFlags & FSL_LOCKED)
-            {
-                if ((--MS.m_nLockCount) == 0)
-                {
-                    MS.m_nLockFlags &= ~FSL_LOCKED;
-                    MS.m_pLockedData = NULL;
-                    gRenDev->m_DevBufMan.EndReadWrite(nVB);
-                }
-            }
-            MS.m_pUpdateData = pD;
-            m_nFlags |= FRM_READYTOUPLOAD;
-            return true;
-        }
-    }
-    return false;
-}
-
-size_t CRenderMesh::SetMesh_Int(CMesh& mesh, [[maybe_unused]] int nSecColorsSetOffset, uint32 flags)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    char* pVBuff = NULL;
-    SPipTangents* pTBuff = NULL;
-    SPipQTangents* pQTBuff = NULL;
-    SVF_P3F* pVelocities = NULL;
-    SPipNormal* pNBuff = NULL;
-    uint32 nVerts = mesh.GetVertexCount();
-    uint32 nInds = mesh.GetIndexCount();
-    vtx_idx* pInds = NULL;
-
-    //AUTO_LOCK(m_sResLock);//need a resource lock as mesh could be reseted due to allocation failure
-    LockForThreadAccess();
-
-    ReleaseRenderChunks(&m_ChunksSkinned);
-
-    m_vBoxMin = mesh.m_bbox.min;
-    m_vBoxMax = mesh.m_bbox.max;
-
-    m_fGeometricMeanFaceArea = mesh.m_geometricMeanFaceArea;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Initialize Render Chunks.
-    //////////////////////////////////////////////////////////////////////////
-    uint32 numSubsets = mesh.GetSubSetCount();
-
-    uint32 numChunks = 0;
-    for (uint32 i = 0; i < numSubsets; i++)
-    {
-        if (mesh.m_subsets[i].nNumIndices == 0)
-        {
-            continue;
-        }
-
-        if (mesh.m_subsets[i].nMatFlags & MTL_FLAG_NODRAW)
-        {
-            continue;
-        }
-
-        ++numChunks;
-    }
-    m_Chunks.reserve(numChunks);
-
-    // Determine the vertex format of each chunk based on the properties of the mesh
-    mesh.SetSubmeshVertexFormats();
-
-    for (uint32 i = 0; i < numSubsets; i++)
-    {
-        CRenderChunk ChunkInfo;
-
-        if (mesh.m_subsets[i].nNumIndices == 0)
-        {
-            continue;
-        }
-
-        if (mesh.m_subsets[i].nMatFlags & MTL_FLAG_NODRAW)
-        {
-            continue;
-        }
-
-        //add empty chunk, because PodArray is not working with STL-vectors
-        m_Chunks.push_back(ChunkInfo);
-
-        uint32 num = m_Chunks.size();
-        CRenderChunk* pChunk = &m_Chunks[num - 1];
-
-        pChunk->nFirstIndexId = mesh.m_subsets[i].nFirstIndexId;
-        pChunk->nNumIndices   = mesh.m_subsets[i].nNumIndices;
-        pChunk->nFirstVertId  = mesh.m_subsets[i].nFirstVertId;
-        pChunk->nNumVerts     = mesh.m_subsets[i].nNumVerts;
-        pChunk->m_nMatID      = mesh.m_subsets[i].nMatID;
-        pChunk->m_nMatFlags   = mesh.m_subsets[i].nMatFlags;
-        pChunk->m_vertexFormat = mesh.m_subsets[i].vertexFormat;
-        if (mesh.m_subsets[i].nPhysicalizeType == PHYS_GEOM_TYPE_NONE)
-        {
-            pChunk->m_nMatFlags |= MTL_FLAG_NOPHYSICALIZE;
-        }
-
-        float texelAreaDensity = 1.0f;
-
-        if (!(flags & FSM_IGNORE_TEXELDENSITY))
-        {
-            float posArea;
-            float texArea;
-            const char* errorText = "";
-
-            if (mesh.m_subsets[i].fTexelDensity > 0.00001f)
-            {
-                texelAreaDensity = mesh.m_subsets[i].fTexelDensity;
-            }
-            else
-            {
-                const bool ok = mesh.ComputeSubsetTexMappingAreas(i, posArea, texArea, errorText);
-                if (ok)
-                {
-                    texelAreaDensity = texArea / posArea;
-                }
-                else
-                {
-                    // Commented out to prevent spam (contact Moritz Finck or Marco Corbetta for details)
-                    // gEnv->pLog->LogError("Failed to compute texture mapping density for mesh '%s': ?%s", GetSourceName(), errorText);
-                }
-            }
-        }
-
-        pChunk->m_texelAreaDensity = texelAreaDensity;
-
-#define VALIDATE_CHUCKS
-#if defined(_DEBUG) && defined(VALIDATE_CHUCKS)
-        size_t indStart(pChunk->nFirstIndexId);
-        size_t indEnd(pChunk->nFirstIndexId + pChunk->nNumIndices);
-        for (size_t j(indStart); j < indEnd; ++j)
-        {
-            size_t vtxStart(pChunk->nFirstVertId);
-            size_t vtxEnd(pChunk->nFirstVertId + pChunk->nNumVerts);
-            size_t curIndex0(mesh.m_pIndices[ j ]);   // absolute indexing
-            size_t curIndex1(mesh.m_pIndices[ j ] + vtxStart);   // relative indexing using base vertex index
-            AZ_Assert((curIndex0 >= vtxStart && curIndex0 < vtxEnd) || (curIndex1 >= vtxStart && curIndex1 < vtxEnd), "Index is out of mesh vertices' range!");
-        }
-#endif
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Create RenderElements.
-    //////////////////////////////////////////////////////////////////////////
-    int nCurChunk = 0;
-    for (int i = 0; i < mesh.GetSubSetCount(); i++)
-    {
-        SMeshSubset& subset = mesh.m_subsets[i];
-        if (subset.nNumIndices == 0)
-        {
-            continue;
-        }
-
-        if (subset.nMatFlags & MTL_FLAG_NODRAW)
-        {
-            continue;
-        }
-
-        CRenderChunk* pRenderChunk = &m_Chunks[nCurChunk++];
-        CREMeshImpl* pRenderElement = (CREMeshImpl*) gRenDev->EF_CreateRE(eDATA_Mesh);
-
-        // Cross link render chunk with render element.
-        pRenderChunk->pRE = pRenderElement;
-        AssignChunk(pRenderChunk, pRenderElement);
-        if (subset.nNumVerts <= 500 && !mesh.m_pBoneMapping && !(flags & FSM_NO_TANGENTS))
-        {
-            pRenderElement->mfUpdateFlags(FCEF_MERGABLE);
-        }
-
-        if (mesh.m_pBoneMapping)
-        {
-            pRenderElement->mfUpdateFlags(FCEF_SKINNED);
-        }
-    }
-    if (mesh.m_pBoneMapping)
-    {
-        m_nFlags |= FRM_SKINNED;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Create system vertex buffer in system memory.
-    //////////////////////////////////////////////////////////////////////////
-#if ENABLE_NORMALSTREAM_SUPPORT
-    if (flags & FSM_ENABLE_NORMALSTREAM)
-    {
-        m_nFlags |= FRM_ENABLE_NORMALSTREAM;
-    }
-#endif
-
-    m_nVerts = nVerts;
-    m_nInds = 0;
-    m_vertexFormat = mesh.GetMeshGroupVertexFormat();
-
-    pVBuff = (char*)LockVB(VSF_GENERAL, FSL_VIDEO_CREATE);
-    // stop initializing if allocation failed
-    if (pVBuff == NULL)
-    {
-        m_nVerts = 0;
-        goto error;
-    }
-
-# if ENABLE_NORMALSTREAM_SUPPORT
-    if (m_nFlags & FRM_ENABLE_NORMALSTREAM)
-    {
-        pNBuff = (SPipNormal*)LockVB(VSF_NORMALS, FSL_VIDEO_CREATE);
-    }
-# endif
-
-    if (!(flags & FSM_NO_TANGENTS))
-    {
-        if (mesh.m_pQTangents)
-        {
-            pQTBuff = (SPipQTangents*)LockVB(VSF_QTANGENTS, FSL_VIDEO_CREATE);
-        }
-        else
-        {
-            pTBuff = (SPipTangents*)LockVB(VSF_TANGENTS, FSL_VIDEO_CREATE);
-        }
-
-        // stop initializing if allocation failed
-        if (pTBuff == NULL && pQTBuff == NULL)
-        {
-            goto error;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Copy indices.
-    //////////////////////////////////////////////////////////////////////////
-    m_nInds = nInds;
-    pInds = LockIB(FSL_VIDEO_CREATE);
-
-    // stop initializing if allocation failed
-    if (m_nInds && pInds == NULL)
-    {
-        m_nInds = 0;
-        goto error;
-    }
-
-    if (flags & FSM_VERTEX_VELOCITY)
-    {
-        pVelocities = (SVF_P3F*)LockVB(VSF_VERTEX_VELOCITY, FSL_VIDEO_CREATE);
-
-        // stop initializing if allocation failed
-        if (pVelocities == NULL)
-        {
-            goto error;
-        }
-    }
-
-
-    // Copy data to mesh
-    {
-        SSetMeshIntData setMeshIntData =
-        {
-            &mesh,
-            pVBuff,
-            pTBuff,
-            pQTBuff,
-            pVelocities,
-            nVerts,
-            nInds,
-            pInds,
-            flags,
-            pNBuff
-        };
-        SetMesh_IntImpl(setMeshIntData);
-    }
-
-
-    // unlock all streams
-    UnlockVB(VSF_GENERAL);
-#if ENABLE_NORMALSTREAM_SUPPORT
-    if (m_nFlags & FRM_ENABLE_NORMALSTREAM)
-    {
-        UnlockVB(VSF_NORMALS);
-    }
-# endif
-    UnlockIB();
-
-    if (!(flags & FSM_NO_TANGENTS))
-    {
-        if (mesh.m_pQTangents)
-        {
-            UnlockVB(VSF_QTANGENTS);
-        }
-        else
-        {
-            UnlockVB(VSF_TANGENTS);
-        }
-    }
-
-    if (flags & FSM_VERTEX_VELOCITY)
-    {
-        UnlockVB(VSF_VERTEX_VELOCITY);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Copy skin-streams.
-    //////////////////////////////////////////////////////////////////////////
-    if (mesh.m_pBoneMapping)
-    {
-        SetSkinningDataCharacter(mesh, mesh.m_pBoneMapping, mesh.m_pExtraBoneMapping);
-    }
-
-    // Create device buffers immediately in non-multithreaded mode
-    if (!gRenDev->m_pRT->IsMultithreaded() && (flags & FSM_CREATE_DEVICE_MESH))
-    {
-        CheckUpdate(VSM_MASK);
-    }
-
-    UnLockForThreadAccess();
-    return Size(SIZE_ONLY_SYSTEM);
-
-error:
-    UnLockForThreadAccess();
-    RT_AllocationFailure("Generic Streaming Error", 0);
-    return ~0U;
-}
-
-size_t CRenderMesh::SetMesh(CMesh& mesh, int nSecColorsSetOffset, uint32 flags, bool requiresLock)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    
-    size_t resultingSize = ~0U;
-# ifdef USE_VBIB_PUSH_DOWN
-    requiresLock = true;
-# endif
-    if (requiresLock)
-    {
-        SREC_AUTO_LOCK(m_sResLock);
-        resultingSize = SetMesh_Int(mesh, nSecColorsSetOffset, flags);
-    }
-    else
-    {
-        resultingSize = SetMesh_Int(mesh, nSecColorsSetOffset, flags);
-    }
-
-    return resultingSize;
-}
-
-void CRenderMesh::SetSkinningDataVegetation(struct SMeshBoneMapping_uint8* pBoneMapping)
-{
-    LockForThreadAccess();
-    SVF_W4B_I4S* pSkinBuff = (SVF_W4B_I4S*)LockVB(VSF_HWSKIN_INFO, FSL_VIDEO_CREATE);
-
-    // stop initializing if allocation failed
-    if (pSkinBuff == NULL)
-    {
-        return;
-    }
-
-    for (uint32 i = 0; i < m_nVerts; i++)
-    {
-        // get bone IDs
-        uint16 b0 = pBoneMapping[i].boneIds[0];
-        uint16 b1 = pBoneMapping[i].boneIds[1];
-        uint16 b2 = pBoneMapping[i].boneIds[2];
-        uint16 b3 = pBoneMapping[i].boneIds[3];
-
-        // get weights
-        const uint8 w0 = pBoneMapping[i].weights[0];
-        const uint8 w1 = pBoneMapping[i].weights[1];
-        const uint8 w2 = pBoneMapping[i].weights[2];
-        const uint8 w3 = pBoneMapping[i].weights[3];
-
-        // if weight is zero set bone ID to zero as the bone has no influence anyway,
-        // this will fix some issue with incorrectly exported models (e.g. system freezes on ATI cards when access invalid bones)
-        if (w0 == 0)
-        {
-            b0 = 0;
-        }
-        if (w1 == 0)
-        {
-            b1 = 0;
-        }
-        if (w2 == 0)
-        {
-            b2 = 0;
-        }
-        if (w3 == 0)
-        {
-            b3 = 0;
-        }
-
-        pSkinBuff[i].indices[0] = b0;
-        pSkinBuff[i].indices[1] = b1;
-        pSkinBuff[i].indices[2] = b2;
-        pSkinBuff[i].indices[3] = b3;
-
-        pSkinBuff[i].weights.bcolor[0] = w0;
-        pSkinBuff[i].weights.bcolor[1] = w1;
-        pSkinBuff[i].weights.bcolor[2] = w2;
-        pSkinBuff[i].weights.bcolor[3] = w3;
-
-        //  if (pBSStreamTemp)
-        //    pSkinBuff[i].boneSpace  = pBSStreamTemp[i];
-    }
-    UnlockVB(VSF_HWSKIN_INFO);
-    UnLockForThreadAccess();
-
-    CreateRemappedBoneIndicesPair(~0u, m_ChunksSkinned);
-}
-
-void CRenderMesh::SetSkinningDataCharacter([[maybe_unused]] CMesh& mesh, struct SMeshBoneMapping_uint16* pBoneMapping, [[maybe_unused]] struct SMeshBoneMapping_uint16* pExtraBoneMapping)
-{
-    SVF_W4B_I4S* pSkinBuff = (SVF_W4B_I4S*)LockVB(VSF_HWSKIN_INFO, FSL_VIDEO_CREATE);
-
-    // stop initializing if allocation failed
-    if (pSkinBuff == NULL)
-    {
-        return;
-    }
-
-    for (uint32 i = 0; i < m_nVerts; i++)
-    {
-        // get bone IDs
-        uint16 b0 = pBoneMapping[i].boneIds[0];
-        uint16 b1 = pBoneMapping[i].boneIds[1];
-        uint16 b2 = pBoneMapping[i].boneIds[2];
-        uint16 b3 = pBoneMapping[i].boneIds[3];
-
-        // get weights
-        const uint8 w0 = pBoneMapping[i].weights[0];
-        const uint8 w1 = pBoneMapping[i].weights[1];
-        const uint8 w2 = pBoneMapping[i].weights[2];
-        const uint8 w3 = pBoneMapping[i].weights[3];
-
-        // if weight is zero set bone ID to zero as the bone has no influence anyway,
-        // this will fix some issue with incorrectly exported models (e.g. system freezes on ATI cards when access invalid bones)
-        if (w0 == 0)
-        {
-            b0 = 0;
-        }
-        if (w1 == 0)
-        {
-            b1 = 0;
-        }
-        if (w2 == 0)
-        {
-            b2 = 0;
-        }
-        if (w3 == 0)
-        {
-            b3 = 0;
-        }
-
-        pSkinBuff[i].indices[0] = b0;
-        pSkinBuff[i].indices[1] = b1;
-        pSkinBuff[i].indices[2] = b2;
-        pSkinBuff[i].indices[3] = b3;
-
-        pSkinBuff[i].weights.bcolor[0] = w0;
-        pSkinBuff[i].weights.bcolor[1] = w1;
-        pSkinBuff[i].weights.bcolor[2] = w2;
-        pSkinBuff[i].weights.bcolor[3] = w3;
-    }
-
-    UnlockVB(VSF_HWSKIN_INFO);
-
-#if !defined(NULL_RENDERER)
-    if (pExtraBoneMapping && m_extraBonesBuffer.m_numElements == 0 && m_nVerts)
-    {
-        std::vector<SVF_W4B_I4S> pExtraBones;
-        pExtraBones.resize(m_nVerts);
-        for (uint32 i = 0; i < m_nVerts; i++)
-        {
-            // get bone IDs
-            uint16 b0 = pExtraBoneMapping[i].boneIds[0];
-            uint16 b1 = pExtraBoneMapping[i].boneIds[1];
-            uint16 b2 = pExtraBoneMapping[i].boneIds[2];
-            uint16 b3 = pExtraBoneMapping[i].boneIds[3];
-
-            // get weights
-            const uint8 w0 = pExtraBoneMapping[i].weights[0];
-            const uint8 w1 = pExtraBoneMapping[i].weights[1];
-            const uint8 w2 = pExtraBoneMapping[i].weights[2];
-            const uint8 w3 = pExtraBoneMapping[i].weights[3];
-
-            if (w0 == 0)
-            {
-                b0 = 0;
-            }
-            if (w1 == 0)
-            {
-                b1 = 0;
-            }
-            if (w2 == 0)
-            {
-                b2 = 0;
-            }
-            if (w3 == 0)
-            {
-                b3 = 0;
-            }
-
-            pExtraBones[i].indices[0] = b0;
-            pExtraBones[i].indices[1] = b1;
-            pExtraBones[i].indices[2] = b2;
-            pExtraBones[i].indices[3] = b3;
-
-            pExtraBones[i].weights.bcolor[0] = w0;
-            pExtraBones[i].weights.bcolor[1] = w1;
-            pExtraBones[i].weights.bcolor[2] = w2;
-            pExtraBones[i].weights.bcolor[3] = w3;
-        }
-
-        m_extraBonesBuffer.Create(pExtraBones.size(), sizeof(SVF_W4B_I4S), DXGI_FORMAT_UNKNOWN, DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, &pExtraBones[0]);
-    }
-#endif
-
-    CreateRemappedBoneIndicesPair(~0u, m_Chunks);
-}
-
-uint CRenderMesh::GetSkinningWeightCount() const
-{
-#if !defined(NULL_RENDERER)
-    if (_HasVBStream(VSF_HWSKIN_INFO))
-    {
-        return m_extraBonesBuffer.m_numElements > 0 ? 8 : 4;
-    }
-#endif
-
-    return 0;
-}
-
-IIndexedMesh* CRenderMesh::GetIndexedMesh(IIndexedMesh* pIdxMesh)
-{    
-    struct MeshDataLock
-    {
-        MeshDataLock(CRenderMesh* pMesh)
-            : _Mesh(pMesh) { _Mesh->LockForThreadAccess(); }
-        ~MeshDataLock() { _Mesh->UnLockForThreadAccess(); }
-        CRenderMesh* _Mesh;
-    };
-    MeshDataLock _lock(this);
-
-    if (!pIdxMesh)
-    {
-        pIdxMesh = gEnv->p3DEngine->CreateIndexedMesh();
-    }
-
-    // catch failed allocation of IndexedMesh
-    if (pIdxMesh == NULL)
-    {
-        return NULL;
-    }
-
-    CMesh* const pMesh = pIdxMesh->GetMesh();
-
-    uint32 numTexCoords = m_vertexFormat.GetAttributeUsageCount(AZ::Vertex::AttributeUsage::TexCoord);
-
-    // These functions also re-allocate the streams
-    pIdxMesh->SetVertexCount(m_nVerts);
-    pIdxMesh->SetTexCoordCount(m_nVerts, numTexCoords);
-    pIdxMesh->SetTangentCount(m_nVerts);
-    pIdxMesh->SetIndexCount(m_nInds);
-    pIdxMesh->SetSubSetCount(m_Chunks.size());
-
-    strided_pointer<Vec3> pVtx;
-    strided_pointer<SPipTangents> pTangs;
-    pVtx.data = (Vec3*)GetPosPtr(pVtx.iStride, FSL_READ);
-
-    bool texCoordAllocationSucceeded = true;
-    AZStd::vector<strided_pointer<Vec2>> stridedTexCoordPointers;
-    stridedTexCoordPointers.resize(numTexCoords);
-    for (int streamIndex = 0; streamIndex < stridedTexCoordPointers.size(); ++streamIndex)
-    {
-        stridedTexCoordPointers[streamIndex].data = (Vec2*)GetUVPtr(stridedTexCoordPointers[streamIndex].iStride, FSL_READ, streamIndex);
-        if (stridedTexCoordPointers[streamIndex].data == nullptr || !pMesh->GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, streamIndex))
-        {
-            texCoordAllocationSucceeded = false;
-            break;
-        }
-    }
-    pTangs.data = (SPipTangents*)GetTangentPtr(pTangs.iStride, FSL_READ);
-
-    // don't copy if some src, or dest buffer is NULL (can happen because of failed allocations)
-    if (pVtx.data == NULL           || (pMesh->m_pPositions == NULL && pMesh->m_pPositionsF16 == NULL) ||
-        !texCoordAllocationSucceeded ||
-        pTangs.data == NULL     || pMesh->m_pTangents  == NULL)
-    {
-        UnlockStream(VSF_GENERAL);
-        delete pIdxMesh;
-        return NULL;
-    }
-
-    
-    for (uint32 i = 0; i < m_nVerts; i++)
-    {
-        pMesh->m_pPositions[i] = pVtx[i];
-        pMesh->m_pNorms    [i] = SMeshNormal(Vec3(0, 0, 1));//pNorm[i];
-        pMesh->m_pTangents [i] = SMeshTangents(pTangs[i]);
-    }
-
-    for (int streamIndex = 0; streamIndex < stridedTexCoordPointers.size(); ++streamIndex)
-    {
-        SMeshTexCoord* meshTextureCoordinates = pMesh->GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, streamIndex);
-        for (uint32 i = 0; i < m_nVerts; ++i)
-        {
-            meshTextureCoordinates[i] = SMeshTexCoord(stridedTexCoordPointers[streamIndex][i]);
-        }
-    }
-
-    uint offset = 0;
-    if (m_vertexFormat.TryCalculateOffset(offset, AZ::Vertex::AttributeUsage::Color))
-    {
-        strided_pointer<SMeshColor> pColors;
-        pColors.data = (SMeshColor*)GetColorPtr(pColors.iStride, FSL_READ);
-        pIdxMesh->SetColorCount(m_nVerts);
-        SMeshColor* colorStream = pMesh->GetStreamPtr<SMeshColor>(CMesh::COLORS);
-        for (int i = 0; i < (int)m_nVerts; i++)
-        {
-            colorStream[i] = pColors[i];
-        }
-    }
-    UnlockStream(VSF_GENERAL);
-
-    vtx_idx* pInds = GetIndexPtr(FSL_READ);
-    for (int i = 0; i < (int)m_nInds; i++)
-    {
-        pMesh->m_pIndices[i] = pInds[i];
-    }
-    UnlockIndexStream();
-
-    SVF_W4B_I4S* pSkinBuff = (SVF_W4B_I4S*)LockVB(VSF_HWSKIN_INFO, FSL_READ);
-    if (pSkinBuff)
-    {
-        pIdxMesh->AllocateBoneMapping();
-        for (int i = 0; i < (int)m_nVerts; i++)
-        {
-            for (int j = 0; j < 4; j++)
-            {
-                pMesh->m_pBoneMapping[i].boneIds[j] = pSkinBuff[i].indices[j];
-                pMesh->m_pBoneMapping[i].weights[j] = pSkinBuff[i].weights.bcolor[j];
-            }
-        }
-        UnlockVB(VSF_HWSKIN_INFO);
-    }
-
-    for (int i = 0; i < (int)m_Chunks.size(); i++)
-    {
-        pIdxMesh->SetSubsetIndexVertexRanges(i, m_Chunks[i].nFirstIndexId, m_Chunks[i].nNumIndices, m_Chunks[i].nFirstVertId, m_Chunks[i].nNumVerts);
-        pIdxMesh->SetSubsetMaterialId(i, m_Chunks[i].m_nMatID);
-        const int nMatFlags = m_Chunks[i].m_nMatFlags;
-        const int nPhysicalizeType = (nMatFlags & MTL_FLAG_NOPHYSICALIZE)
-            ? PHYS_GEOM_TYPE_NONE
-            : ((nMatFlags & MTL_FLAG_NODRAW) ? PHYS_GEOM_TYPE_OBSTRUCT : PHYS_GEOM_TYPE_DEFAULT);
-        pIdxMesh->SetSubsetMaterialProperties(i, nMatFlags, nPhysicalizeType, m_Chunks[i].m_vertexFormat);
-
-        const SMeshSubset& mss = pIdxMesh->GetSubSet(i);
-        Vec3 vCenter;
-        vCenter.zero();
-        for (uint32 j = mss.nFirstIndexId; j < mss.nFirstIndexId + mss.nNumIndices; j++)
-        {
-            vCenter += pMesh->m_pPositions[pMesh->m_pIndices[j]];
-        }
-        if (mss.nNumIndices)
-        {
-            vCenter /= (float)mss.nNumIndices;
-        }
-        float fRadius = 0;
-        for (uint32 j = mss.nFirstIndexId; j < mss.nFirstIndexId + mss.nNumIndices; j++)
-        {
-            fRadius = max(fRadius, (pMesh->m_pPositions[pMesh->m_pIndices[j]] - vCenter).len2());
-        }
-        fRadius = sqrt_tpl(fRadius);
-        pIdxMesh->SetSubsetBounds(i, vCenter, fRadius);
-    }
-
-    return pIdxMesh;
-}
-
-void CRenderMesh::GenerateQTangents()
-{    
-    // FIXME: This needs to be cleaned up. Breakable foliage shouldn't need both streams, and this shouldn't be duplicated
-    // between here and CryAnimation.
-    LockForThreadAccess();
-    int srcStride = 0;
-    void* pSrcD = LockVB(VSF_TANGENTS, FSL_READ, 0, &srcStride);
-    if (pSrcD)
-    {
-        int dstStride = 0;
-        void* pDstD = LockVB(VSF_QTANGENTS, FSL_VIDEO_CREATE, 0, &dstStride);
-        assert(pDstD);
-        if (pDstD)
-        {
-            SPipTangents* pTangents = (SPipTangents*)pSrcD;
-            SPipQTangents* pQTangents = (SPipQTangents*)pDstD;
-            MeshTangentsFrameToQTangents(
-                pTangents, srcStride, m_nVerts,
-                pQTangents, dstStride);
-        }
-        UnlockVB(VSF_QTANGENTS);
-    }
-    UnlockVB(VSF_TANGENTS);
-    UnLockForThreadAccess();
-}
-
-void CRenderMesh::CreateChunksSkinned()
-{
-    ReleaseRenderChunks(&m_ChunksSkinned);
-
-    TRenderChunkArray& arrSrcMats = m_Chunks;
-    TRenderChunkArray& arrNewMats = m_ChunksSkinned;
-    arrNewMats.resize (arrSrcMats.size());
-    for (int i = 0; i < arrSrcMats.size(); ++i)
-    {
-        CRenderChunk& rSrcMat = arrSrcMats[i];
-        CRenderChunk& rNewMat = arrNewMats[i];
-        rNewMat = rSrcMat;
-        CREMeshImpl* re = (CREMeshImpl*) rSrcMat.pRE;
-        if (re)
-        {
-            rNewMat.pRE = (CREMeshImpl*) gRenDev->EF_CreateRE(eDATA_Mesh);
-            CRendElement* pNext = rNewMat.pRE->m_NextGlobal;
-            CRendElement* pPrev = rNewMat.pRE->m_PrevGlobal;
-            *(CREMeshImpl*)rNewMat.pRE = *re;
-            if (rNewMat.pRE->m_pChunk) // affects the source mesh!! will only work correctly if the source is deleted after copying
-            {
-                rNewMat.pRE->m_pChunk = &rNewMat;
-            }
-            rNewMat.pRE->m_NextGlobal = pNext;
-            rNewMat.pRE->m_PrevGlobal = pPrev;
-            rNewMat.pRE->m_pRenderMesh = this;
-            rNewMat.pRE->m_CustomData = NULL;
-        }
-    }
-}
-
-int CRenderMesh::GetRenderChunksCount(_smart_ptr<IMaterial> pMaterial, int& nRenderTrisCount)
-{
-    int nCount = 0;
-    nRenderTrisCount = 0;
-
-    const uint32 ni = (uint32)m_Chunks.size();
-    for (uint32 i = 0; i < ni; i++)
-    {
-        CRenderChunk* pChunk = &m_Chunks[i];
-        CRendElementBase* pREMesh = pChunk->pRE;
-
-        SShaderItem* pShaderItem = &pMaterial->GetShaderItem(pChunk->m_nMatID);
-
-        CShaderResources* pR = (CShaderResources*)pShaderItem->m_pShaderResources;
-        CShader* pS = (CShader*)pShaderItem->m_pShader;
-        if (pREMesh && pS && pR)
-        {
-            if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW)
-            {
-                continue;
-            }
-
-            if (pS->m_Flags2 & EF2_NODRAW)
-            {
-                continue;
-            }
-
-            if (pChunk->nNumIndices)
-            {
-                nRenderTrisCount += pChunk->nNumIndices / 3;
-                nCount++;
-            }
-        }
-    }
-
-    return nCount;
-}
-
-void CRenderMesh::CopyTo(IRenderMesh* _pDst, int nAppendVtx, [[maybe_unused]] bool bDynamic, bool fullCopy)
-{    
-    CRenderMesh* pDst = (CRenderMesh*)_pDst;
-#ifdef USE_VBIB_PUSH_DOWN
-    SREC_AUTO_LOCK(m_sResLock);
-#endif
-    TRenderChunkArray& arrSrcMats = m_Chunks;
-    TRenderChunkArray& arrNewMats = pDst->m_Chunks;
-    //pDst->m_bMaterialsWasCreatedInRenderer  = true;
-    arrNewMats.resize (arrSrcMats.size());
-    int i;
-    for (i = 0; i < arrSrcMats.size(); ++i)
-    {
-        CRenderChunk& rSrcMat = arrSrcMats[i];
-        CRenderChunk& rNewMat = arrNewMats[i];
-        rNewMat = rSrcMat;
-        rNewMat.nNumVerts   += ((m_nVerts - 2 - rNewMat.nNumVerts - rNewMat.nFirstVertId) >> 31) & nAppendVtx;
-        CREMeshImpl* re = (CREMeshImpl*) rSrcMat.pRE;
-        if (re)
-        {
-            AZ_Assert(!re->m_CustomData, "Trying to copy a render mesh after custom data has been set."); // Custom data cannot be copied over (used by Terrain and Decals)
-            rNewMat.pRE = (CREMeshImpl*) gRenDev->EF_CreateRE(eDATA_Mesh);
-            CRendElement* pNext = rNewMat.pRE->m_NextGlobal;
-            CRendElement* pPrev = rNewMat.pRE->m_PrevGlobal;
-            *(CREMeshImpl*)rNewMat.pRE = *re;
-            if (rNewMat.pRE->m_pChunk) // affects the source mesh!! will only work correctly if the source is deleted after copying
-            {
-                rNewMat.pRE->m_pChunk = &rNewMat;
-                rNewMat.pRE->m_pChunk->nNumVerts += ((m_nVerts - 2 - re->m_pChunk->nNumVerts - re->m_pChunk->nFirstVertId) >> 31) & nAppendVtx;
-            }
-            rNewMat.pRE->m_NextGlobal = pNext;
-            rNewMat.pRE->m_PrevGlobal = pPrev;
-            rNewMat.pRE->m_pRenderMesh = pDst;
-            rNewMat.pRE->m_CustomData = NULL;
-        }
-    }
-    LockForThreadAccess();
-    pDst->LockForThreadAccess();
-    pDst->m_nVerts = m_nVerts + nAppendVtx;
-    if (fullCopy)
-    {
-        pDst->m_vertexFormat = m_vertexFormat;
-        for (i = 0; i < VSF_NUM; i++)
-        {
-            void* pSrcD = LockVB(i, FSL_READ);
-            if (pSrcD)
-            {
-                void* pDstD = pDst->LockVB(i, FSL_VIDEO_CREATE);
-                assert(pDstD);
-                if (pDstD)
-                {
-                    cryMemcpy(pDstD, pSrcD, GetStreamSize(i), MC_CPU_TO_GPU);
-                }
-                pDst->UnlockVB(i);
-            }
-            UnlockVB(i);
-        }
-
-        pDst->m_nInds = m_nInds;
-        void* pSrcD = LockIB(FSL_READ);
-        if (pSrcD)
-        {
-            void* pDstD = pDst->LockIB(FSL_VIDEO_CREATE);
-            assert(pDstD);
-            if (pDstD)
-            {
-                cryMemcpy(pDstD, pSrcD, m_nInds * sizeof(vtx_idx), MC_CPU_TO_GPU);
-            }
-            pDst->UnlockIB();
-        }
-
-        pDst->m_eType = m_eType;
-        pDst->m_nFlags = m_nFlags;
-    }
-    UnlockIB();
-    UnLockForThreadAccess();
-    pDst->UnLockForThreadAccess();
-}
-
-// set effector for all chunks
-void CRenderMesh::SetCustomTexID(int nCustomTID)
-{    
-    if (m_Chunks.size())
-    {
-        for (int i = 0; i < m_Chunks.size(); i++)
-        {
-            CRenderChunk* pChunk = &m_Chunks[i];
-            if (pChunk->pRE)
-            {
-                pChunk->pRE->m_CustomTexBind[0] = nCustomTID;
-            }
-        }
-    }
-}
-
-void CRenderMesh::SetChunk(int nIndex, CRenderChunk& inChunk)
-{
-    if (!inChunk.nNumIndices || !inChunk.nNumVerts || m_nInds == 0)
-    {
-        return;
-    }
-
-    CRenderChunk* pRenderChunk = NULL;
-
-    if (nIndex < 0 || nIndex >= m_Chunks.size())
-    {
-        // add new chunk
-        CRenderChunk matinfo;
-        m_Chunks.push_back(matinfo);
-        pRenderChunk = &m_Chunks.back();
-
-        pRenderChunk->pRE = (CREMeshImpl*) gRenDev->EF_CreateRE(eDATA_Mesh);
-        pRenderChunk->pRE->m_CustomTexBind[0] = m_nClientTextureBindID;
-    }
-    else
-    {
-        // use present chunk
-        pRenderChunk = &m_Chunks[nIndex];
-    }
-
-    pRenderChunk->m_nMatID = inChunk.m_nMatID;
-    pRenderChunk->m_nMatFlags = inChunk.m_nMatFlags;
-
-    pRenderChunk->nFirstIndexId   = inChunk.nFirstIndexId;
-    pRenderChunk->nNumIndices     = MAX(inChunk.nNumIndices, 0);
-    pRenderChunk->nFirstVertId    = inChunk.nFirstVertId;
-    pRenderChunk->nNumVerts           = MAX(inChunk.nNumVerts, 0);
-    pRenderChunk->nSubObjectIndex = inChunk.nSubObjectIndex;
-
-    pRenderChunk->m_texelAreaDensity = inChunk.m_texelAreaDensity;
-
-    pRenderChunk->m_vertexFormat = inChunk.m_vertexFormat;
-
-    // update chunk RE
-    if (pRenderChunk->pRE)
-    {
-        AssignChunk(pRenderChunk, (CREMeshImpl*) pRenderChunk->pRE);
-    }
-    CRY_ASSERT(!pRenderChunk->pRE || pRenderChunk->pRE->m_pChunk->nFirstIndexId < 60000); // TODO: do we need to compare with 60000 if vertex indices are 32-bit?
-    CRY_ASSERT(pRenderChunk->nFirstIndexId + pRenderChunk->nNumIndices <= m_nInds);
-}
-
-void CRenderMesh::SetChunk(_smart_ptr<IMaterial> pNewMat, int nFirstVertId, int nVertCount, int nFirstIndexId, int nIndexCount, float texelAreaDensity, const AZ::Vertex::Format& vertexFormat, int nIndex)
-{
-    CRenderChunk chunk;
-
-    if (pNewMat)
-    {
-        chunk.m_nMatFlags = pNewMat->GetFlags();
-    }
-
-    if (nIndex < 0 || nIndex >= m_Chunks.size())
-    {
-        chunk.m_nMatID = m_Chunks.size();
-    }
-    else
-    {
-        chunk.m_nMatID = nIndex;
-    }
-
-    chunk.nFirstVertId = nFirstVertId;
-    chunk.nNumVerts = nVertCount;
-
-    chunk.nFirstIndexId = nFirstIndexId;
-    chunk.nNumIndices = nIndexCount;
-
-    chunk.m_texelAreaDensity = texelAreaDensity;
-    chunk.m_vertexFormat = vertexFormat;
-    SetChunk(nIndex, chunk);
-}
-
-//================================================================================================================
-
-bool CRenderMesh::PrepareCachePos()
-{
-    if (!m_pCachePos && m_vertexFormat.Has16BitFloatPosition())
-    {
-        m_pCachePos = AllocateMeshData<Vec3>(m_nVerts);
-        if (m_pCachePos)
-        {
-            m_nFrameRequestCachePos = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-            return true;
-        }
-    }
-    return false;
-}
-
-bool CRenderMesh::CreateCachePos(byte* pSrc, uint32 nStrideSrc, uint nFlags)
-{
-    PROFILE_FRAME(Mesh_CreateCachePos);
-    if (m_vertexFormat.Has16BitFloatPosition())
-    {
-    #ifdef USE_VBIB_PUSH_DOWN
-        SREC_AUTO_LOCK(m_sResLock);//on USE_VBIB_PUSH_DOWN tick is executed in renderthread
-    #endif
-        m_nFlagsCachePos = (nFlags & FSL_WRITE) != 0;
-        m_nFrameRequestCachePos = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-        if ((nFlags & FSL_READ) && m_pCachePos)
-        {
-            return true;
-        }
-        if ((nFlags == FSL_SYSTEM_CREATE) && m_pCachePos)
-        {
-            return true;
-        }
-        if (!m_pCachePos)
-        {
-            m_pCachePos = AllocateMeshData<Vec3>(m_nVerts);
-        }
-        if (m_pCachePos)
-        {
-            if (nFlags == FSL_SYSTEM_UPDATE || (nFlags & FSL_READ))
-            {
-                for (uint32 i = 0; i < m_nVerts; i++)
-                {
-                    Vec3f16* pVSrc = (Vec3f16*)pSrc;
-                    m_pCachePos[i] = pVSrc->ToVec3();
-                    pSrc += nStrideSrc;
-                }
-            }
-            return true;
-        }
-    }
-    return false;
-}
-
-bool CRenderMesh::CreateUVCache(byte* source, uint32 sourceStride, uint flags, uint32 uvSetIndex)
-{
-    PROFILE_FRAME(Mesh_CreateUVCache);
-
-    AZ::Vertex::AttributeType attributeType = AZ::Vertex::AttributeType::NumTypes;
-    uint offset = 0;
-    bool hasUVSetAtIndex = m_vertexFormat.TryGetAttributeOffsetAndType(AZ::Vertex::AttributeUsage::TexCoord, uvSetIndex, offset, attributeType);
-
-    // If the vertex format has a uv set at the given index
-    // And the vertex format uses 16 bit floats to represent that uv set
-    if (hasUVSetAtIndex && (attributeType == AZ::Vertex::AttributeType::Float16_2))
-    {
-        m_nFlagsCacheUVs = (flags & FSL_WRITE) != 0;
-        m_nFrameRequestCacheUVs = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nFillThreadID].m_nFrameUpdateID;
-        // Increase the size of the cached uvs vector if it is not big enough for the given uv set, and fill any new slots with nullptr
-        if (uvSetIndex >= m_UVCache.size())
-        {
-            m_UVCache.resize(uvSetIndex + 1, nullptr);
-        }
-
-        // Return true if the uv cache has already been created and does not need to be updated
-        if ((flags & FSL_READ) && m_UVCache[uvSetIndex])
-        {
-            return true;
-        }
-        if ((flags == FSL_SYSTEM_CREATE) && m_UVCache[uvSetIndex])
-        {
-            return true;
-        }
-
-        // If the cache doesn't exist yet, allocate memory for it
-        if (!m_UVCache[uvSetIndex])
-        {
-            m_UVCache[uvSetIndex] = AllocateMeshData<Vec2>(m_nVerts);
-        }
-
-        if (m_UVCache[uvSetIndex])
-        {
-            // If the new or existing cache needs to be updated, fill it with the source data
-            if (flags == FSL_SYSTEM_UPDATE || (flags & FSL_READ))
-            {
-                source += offset;
-
-                for (uint32 i = 0; i < m_nVerts; i++)
-                {
-                    Vec2f16* pVSrc = (Vec2f16*)source;
-                    m_UVCache[uvSetIndex][i] = pVSrc->ToVec2();
-                    source += sourceStride;
-                }
-            }
-            return true;
-        }
-    }
-    return false;
-}
-
-byte* CRenderMesh::GetPosPtrNoCache(int32& nStride, uint32 nFlags)
-{
-    int nStr = 0;
-    byte* pData = NULL;
-    pData = (byte*)LockVB(VSF_GENERAL, nFlags, 0, &nStr, true);
-    ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    return pData;
-}
-
-byte* CRenderMesh::GetPosPtr(int32& nStride, uint32 nFlags)
-{
-    PROFILE_FRAME(Mesh_GetPosPtr);
-    int nStr = 0;
-    byte* pData = NULL;
-    pData = (byte*)LockVB(VSF_GENERAL, nFlags, 0, &nStr, true, true);
-    ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-
-    if (!CreateCachePos(pData, nStr, nFlags))
-    {
-        nStride = nStr;
-        return pData;
-    }
-
-    pData = (byte*)m_pCachePos;
-    nStride = sizeof(Vec3);
-    return pData;
-}
-
-vtx_idx* CRenderMesh::GetIndexPtr(uint32 nFlags, int32 nOffset)
-{
-    vtx_idx* pData = LockIB(nFlags, nOffset, 0);
-    assert((m_nInds == 0) || pData);
-    return pData;
-}
-
-byte* CRenderMesh::GetColorPtr(int32& nStride, uint32 nFlags)
-{
-    PROFILE_FRAME(Mesh_GetColorPtr);
-    int nStr = 0;
-    byte* pData = (byte*)LockVB(VSF_GENERAL, nFlags, 0, &nStr);
-    ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    uint colorOffset = 0;
-    if (_GetVertexFormat().TryCalculateOffset(colorOffset, AZ::Vertex::AttributeUsage::Color))
-    {
-        return &pData[colorOffset];
-    }
-    return NULL;
-}
-byte* CRenderMesh::GetNormPtr(int32& nStride, uint32 nFlags)
-{
-    PROFILE_FRAME(Mesh_GetNormPtr);
-    int nStr = 0;
-    byte* pData = 0;
-# if ENABLE_NORMALSTREAM_SUPPORT
-    pData = (byte*)LockVB(VSF_NORMALS, nFlags, 0, &nStr);
-    if (pData)
-    {
-        nStride = sizeof(Vec3);
-        return pData;
-    }
-# endif
-    pData = (byte*)LockVB(VSF_GENERAL, nFlags, 0, &nStr);
-    ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    uint normalOffset = 0;
-    if (_GetVertexFormat().TryCalculateOffset(normalOffset, AZ::Vertex::AttributeUsage::Normal))
-    {
-        return &pData[normalOffset];
-    }
-    return NULL;
-}
-byte* CRenderMesh::GetUVPtrNoCache(int32& nStride, uint32 nFlags, uint32 uvSetIndex)
-{
-    PROFILE_FRAME(Mesh_GetUVPtrNoCache);
-    int nStr = 0;
-    byte* pData = (byte*)LockVB(VSF_GENERAL, nFlags, 0, &nStr);
-    ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    uint texCoordOffset = 0;
-    if (_GetVertexFormat().TryCalculateOffset(texCoordOffset, AZ::Vertex::AttributeUsage::TexCoord, uvSetIndex))
-    {
-        return &pData[texCoordOffset];
-    }
-    return NULL;
-}
-byte* CRenderMesh::GetUVPtr(int32& nStride, uint32 nFlags, uint32 uvSetIndex)
-{
-    PROFILE_FRAME(Mesh_GetUVPtr);
-    int nStr = 0;
-    byte* pData = (byte*)LockVB(VSF_GENERAL, nFlags, 0, &nStr);
-    ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-
-    bool result;
-    {
-        SREC_AUTO_LOCK(m_sResLock);
-        result = CreateUVCache(pData, nStr, nFlags, uvSetIndex);
-    }
-
-    if (!result)
-    {
-        nStride = nStr;
-        uint texCoordOffset = 0;
-        if (_GetVertexFormat().TryCalculateOffset(texCoordOffset, AZ::Vertex::AttributeUsage::TexCoord, uvSetIndex))
-        {
-            return &pData[texCoordOffset];
-        }
-    }
-    else
-    {
-        pData = (byte*)m_UVCache[uvSetIndex];
-        nStride = sizeof(Vec2);
-        return pData;
-    }
-
-    return NULL;
-}
-
-byte* CRenderMesh::GetTangentPtr(int32& nStride, uint32 nFlags)
-{
-    PROFILE_FRAME(Mesh_GetTangentPtr);
-    int nStr = 0;
-    byte* pData = (byte*)LockVB(VSF_TANGENTS, nFlags, 0, &nStr);
-    //ASSERT_LOCK;
-    if (!pData)
-    {
-        pData = (byte*)LockVB(VSF_QTANGENTS, nFlags, 0, &nStr);
-    }
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    return pData;
-}
-byte* CRenderMesh::GetQTangentPtr(int32& nStride, uint32 nFlags)
-{
-    PROFILE_FRAME(Mesh_GetQTangentPtr);
-    int nStr = 0;
-    byte* pData = (byte*)LockVB(VSF_QTANGENTS, nFlags, 0, &nStr);
-    //ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    return pData;
-}
-
-byte* CRenderMesh::GetHWSkinPtr(int32& nStride, uint32 nFlags, [[maybe_unused]] bool remapped)
-{
-    PROFILE_FRAME(Mesh_GetHWSkinPtr);
-    int nStr = 0;
-    byte* pData = (byte*)LockVB(VSF_HWSKIN_INFO, nFlags, 0, &nStr);
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    return pData;
-}
-
-byte* CRenderMesh::GetVelocityPtr(int32& nStride, uint32 nFlags)
-{
-    PROFILE_FRAME(Mesh_GetMorphTargetPtr);
-    int nStr = 0;
-    byte* pData = (byte*)LockVB(VSF_VERTEX_VELOCITY, nFlags, 0, &nStr);
-    ASSERT_LOCK;
-    if (!pData)
-    {
-        return NULL;
-    }
-    nStride = nStr;
-    return pData;
-}
-
-bool CRenderMesh::IsEmpty()
-{
-    ASSERT_IS_MAIN_THREAD(gRenDev->m_pRT)
-    SMeshStream * pMS = GetVertexStream(VSF_GENERAL, 0);
-    return (!m_nVerts || (!pMS || pMS->m_nID == ~0u || !pMS->m_pUpdateData) || (!_HasIBStream() && !m_IBStream.m_pUpdateData));
-}
-
-//================================================================================================================
-
-bool CRenderMesh::CheckUpdate(uint32 nStreamMask)
-{
-    CRenderMesh* pRM = _GetVertexContainer();
-    if (pRM)
-    {
-        return gRenDev->m_pRT->RC_CheckUpdate2(this, pRM, nStreamMask);
-    }
-    return false;
-}
-
-void CRenderMesh::RT_AllocationFailure([[maybe_unused]] const char* sPurpose, [[maybe_unused]] uint32 nSize)
-{
-    SREC_AUTO_LOCK(m_sResLock);
-    Cleanup();
-    m_nVerts = 0;
-    m_nInds = 0;
-    m_nFlags |= FRM_ALLOCFAILURE;
-# if !defined(_RELEASE) && !defined(NULL_RENDERER)
-    CryLogAlways("rendermesh '%s(%s)' suffered from a buffer allocation failure for \"%s\" size %d bytes on thread 0x%" PRI_THREADID, m_sSource.c_str(), m_sType.c_str(), sPurpose, nSize, CryGetCurrentThreadId());
-# endif
-}
-
-
-#ifdef MESH_TESSELLATION_RENDERER
-namespace
-{
-    template<class VecPos>
-    class SAdjVertCompare
-    {
-    public:
-        SAdjVertCompare(const AZ::Vertex::Format& vertexFormat)
-            : m_vertexFormat(vertexFormat)
-        {}
-        inline bool operator()(const int i1, const int i2) const
-        {
-            uint stride = m_vertexFormat.GetStride();
-            uint offset = 0;
-            m_vertexFormat.TryCalculateOffset(offset, AZ::Vertex::AttributeUsage::Position);
-            const VecPos* pVert1 = (const VecPos*)&m_pVerts[i1 * stride + offset];
-            const VecPos* pVert2 = (const VecPos*)&m_pVerts[i2 * stride + offset];
-            if (pVert1->x < pVert2->x)
-            {
-                return true;
-            }
-            if (pVert1->x > pVert2->x)
-            {
-                return false;
-            }
-            if (pVert1->y < pVert2->y)
-            {
-                return true;
-            }
-            if (pVert1->y > pVert2->y)
-            {
-                return false;
-            }
-            return pVert1->z < pVert2->z;
-        }
-        const byte* m_pVerts;
-        AZ::Vertex::Format m_vertexFormat;
-    };
-}
-
-template<class VecPos, class VecUV>
-void CRenderMesh::BuildAdjacency(const byte* pVerts, const AZ::Vertex::Format& vertexFormat, unsigned int nVerts, const vtx_idx* pIndexBuffer, uint nTrgs, std::vector<VecUV>& pTxtAdjBuffer)
-{
-    SAdjVertCompare<VecPos> compare(vertexFormat);
-    compare.m_pVerts = pVerts;
-
-    // this array will contain indices of vertices sorted by float3 position - so that we could find vertices with equal positions (they have to be adjacent in the array)
-    std::vector<int> arrSortedVertIDs;
-    // we allocate a bit more (by one) because we will need extra element for scan operation (lower)
-    arrSortedVertIDs.resize(nVerts + 1);
-    for (int iv = 0; iv < nVerts; ++iv)
-    {
-        arrSortedVertIDs[iv] = iv;
-    }
-
-    std::sort(arrSortedVertIDs.begin(), arrSortedVertIDs.end() - 1, compare);
-
-    // Get vertex stride, offset, and bytelength for position and texture coordinates
-    uint stride = vertexFormat.GetStride();
-    uint positionOffset = 0;
-    vertexFormat.TryCalculateOffset(positionOffset, AZ::Vertex::AttributeUsage::Position);
-    uint texCoordOffset = 0;
-    vertexFormat.TryCalculateOffset(texCoordOffset, AZ::Vertex::AttributeUsage::TexCoord);
-    uint texCoordByteLength = vertexFormat.GetAttributeByteLength(AZ::Vertex::AttributeUsage::TexCoord);
-
-    // compute how many unique vertices are there, also setup links from each vertex to master vertex
-    std::vector<int> arrLinkToMaster;
-    arrLinkToMaster.resize(nVerts);
-    int nUniqueVertices = 0;
-    for (int iv0 = 0; iv0 < nVerts; )
-    {
-        int iMaster = arrSortedVertIDs[iv0];
-        arrLinkToMaster[iMaster] = iMaster;
-        int iv1 = iv0 + 1;
-        for (; iv1 < nVerts; ++iv1)
-        {
-            // if slave vertex != master vertex
-            if (*(VecPos*)&pVerts[arrSortedVertIDs[iv1] * stride + positionOffset] != *(VecPos*)&pVerts[iMaster * stride + positionOffset])
-            {
-                break;
-            }
-            arrLinkToMaster[arrSortedVertIDs[iv1]] = iMaster;
-        }
-        iv0 = iv1;
-        ++nUniqueVertices;
-    }
-    if (nUniqueVertices == nVerts)
-    { // no need to recode anything - the mesh is perfect
-        return;
-    }
-    // compute how many triangles connect to every master vertex
-    std::vector<int>& arrConnectedTrianglesCount = arrSortedVertIDs;
-    for (int i = 0; i < arrConnectedTrianglesCount.size(); ++i)
-    {
-        arrConnectedTrianglesCount[i] = 0;
-    }
-    for (int it = 0; it < nTrgs; ++it)
-    {
-        const vtx_idx* pTrg = &pIndexBuffer[it * 3];
-        int iMasterVertex0 = arrLinkToMaster[pTrg[0]];
-        int iMasterVertex1 = arrLinkToMaster[pTrg[1]];
-        int iMasterVertex2 = arrLinkToMaster[pTrg[2]];
-        if (iMasterVertex0 == iMasterVertex1 || iMasterVertex0 == iMasterVertex2 || iMasterVertex1 == iMasterVertex2)
-        {
-            continue; // degenerate triangle - skip it
-        }
-        ++arrConnectedTrianglesCount[iMasterVertex0];
-        ++arrConnectedTrianglesCount[iMasterVertex1];
-        ++arrConnectedTrianglesCount[iMasterVertex2];
-    }
-    // scan
-    std::vector<int>& arrFirstConnectedTriangle = arrSortedVertIDs;
-    for (int iv = 0; iv < nVerts; ++iv)
-    {
-        arrFirstConnectedTriangle[iv + 1] += arrFirstConnectedTriangle[iv];
-    }
-    {
-        int iTmp = arrFirstConnectedTriangle[0];
-        arrFirstConnectedTriangle[0] = 0;
-        for (int iv = 0; iv < nVerts; ++iv)
-        {
-            int iTmp1 = arrFirstConnectedTriangle[iv + 1];
-            arrFirstConnectedTriangle[iv + 1] = iTmp;
-            iTmp = iTmp1;
-        }
-    }
-    // create a list of triangles for each master vertex
-    std::vector<int> arrConnectedTriangles;
-    arrConnectedTriangles.resize(arrFirstConnectedTriangle[nVerts]);
-    for (int it = 0; it < nTrgs; ++it)
-    {
-        const vtx_idx* pTrg = &pIndexBuffer[it * 3];
-        int iMasterVertex0 = arrLinkToMaster[pTrg[0]];
-        int iMasterVertex1 = arrLinkToMaster[pTrg[1]];
-        int iMasterVertex2 = arrLinkToMaster[pTrg[2]];
-        if (iMasterVertex0 == iMasterVertex1 || iMasterVertex0 == iMasterVertex2 || iMasterVertex1 == iMasterVertex2)
-        {
-            continue; // degenerate triangle - skip it
-        }
-        arrConnectedTriangles[arrFirstConnectedTriangle[iMasterVertex0]++] = it;
-        arrConnectedTriangles[arrFirstConnectedTriangle[iMasterVertex1]++] = it;
-        arrConnectedTriangles[arrFirstConnectedTriangle[iMasterVertex2]++] = it;
-    }
-    // return scan array to initial state
-    {
-        int iTmp = arrFirstConnectedTriangle[0];
-        arrFirstConnectedTriangle[0] = 0;
-        for (int iv = 0; iv < nVerts; ++iv)
-        {
-            int iTmp1 = arrFirstConnectedTriangle[iv + 1];
-            arrFirstConnectedTriangle[iv + 1] = iTmp;
-            iTmp = iTmp1;
-        }
-    }
-    // find matches for boundary edges
-    for (int it = 0; it < nTrgs; ++it)
-    {
-        const vtx_idx* pTrg = &pIndexBuffer[it * 3];
-        for (int ie = 0; ie < 3; ++ie)
-        {
-            // fix the corner here
-            {
-                int ivCorner = pTrg[ie];
-                memcpy(&pTxtAdjBuffer[it * 12 + 9 + ie], &pVerts[arrLinkToMaster[ivCorner] * stride + texCoordOffset], texCoordByteLength);
-            }
-            // proceed with fixing the edges
-            int iv0 = pTrg[ie];
-            int iMasterVertex0 = arrLinkToMaster[iv0];
-
-            int iv1 = pTrg[(ie + 1) % 3];
-            int iMasterVertex1 = arrLinkToMaster[iv1];
-            if (iMasterVertex0 == iMasterVertex1)
-            { // some degenerate case - skip it
-                continue;
-            }
-            // find a triangle that has both iMasterVertex0 and iMasterVertex1
-            for (int i0 = arrFirstConnectedTriangle[iMasterVertex0]; i0 < arrFirstConnectedTriangle[iMasterVertex0 + 1]; ++i0)
-            {
-                int iOtherTriangle = arrConnectedTriangles[i0];
-                if (iOtherTriangle >= it) // we are going to stick to this other triangle only if it's index is less than ours
-                {
-                    continue;
-                }
-                const vtx_idx* pOtherTrg = &pIndexBuffer[iOtherTriangle * 3];
-                int iRecode0 = -1;
-                int iRecode1 = -1;
-                // setup recode indices
-                for (int ieOther = 0; ieOther < 3; ++ieOther)
-                {
-                    if (arrLinkToMaster[pOtherTrg[ieOther]] == iMasterVertex0)
-                    {
-                        iRecode0 = pOtherTrg[ieOther];
-                    }
-                    else if (arrLinkToMaster[pOtherTrg[ieOther]] == iMasterVertex1)
-                    {
-                        iRecode1 = pOtherTrg[ieOther];
-                    }
-                }
-                if (iRecode0 != -1 && iRecode1 != -1)
-                { // this triangle is our neighbor
-                    memcpy(&pTxtAdjBuffer[it * 12 + 3 + ie * 2], &pVerts[iRecode0 * stride + texCoordOffset], texCoordByteLength);
-                    memcpy(&pTxtAdjBuffer[it * 12 + 3 + ie * 2 + 1], &pVerts[iRecode1 * stride + texCoordOffset], texCoordByteLength);
-                }
-            }
-        }
-    }
-}
-#endif //#ifdef MESH_TESSELLATION_RENDERER
-
-bool CRenderMesh::RT_CheckUpdate(CRenderMesh* pVContainer, uint32 nStreamMask, [[maybe_unused]] bool bTessellation, bool stall)
-{
-    PrefetchLine(&m_IBStream, 0);
-
-    CRenderer* rd = gRenDev;
-    int nThreadID = rd->m_RP.m_nProcessThreadID;
-    int nFrame = rd->m_RP.m_TI[nThreadID].m_nFrameUpdateID;
-    bool bSkinned = (m_nFlags & (FRM_SKINNED | FRM_SKINNEDNEXTDRAW)) != 0;
-
-    if (nStreamMask & 0x80000000) // Disable skinning in instancing mode
-    {
-        bSkinned = false;
-    }
-
-    m_nFlags &= ~FRM_SKINNEDNEXTDRAW;
-
-    IF (!CanRender(), 0)
-    {
-        return false;
-    }
-
-    FUNCTION_PROFILER_RENDER_FLAT
-    AZ_TRACE_METHOD();
-    PrefetchVertexStreams();
-
-    PrefetchLine(pVContainer->m_VBStream, 0);
-    SMeshStream* pMS = pVContainer->GetVertexStream(VSF_GENERAL, 0);
-
-    if ((m_pVertexContainer || m_nVerts > 2) && pMS)
-    {
-        PrefetchLine(pVContainer->m_VBStream, 128);
-        if (pMS->m_pUpdateData && pMS->m_nFrameAccess != nFrame)
-        {
-            pMS->m_nFrameAccess = nFrame;
-            if (pMS->m_nFrameRequest > pMS->m_nFrameUpdate)
-            {
-                {
-                    PROFILE_FRAME(Mesh_CheckUpdateUpdateGBuf);
-                    if (!(pMS->m_nLockFlags & FSL_WRITE))
-                    {
-                        if (!pVContainer->UpdateVidVertices(VSF_GENERAL, stall))
-                        {
-                            RT_AllocationFailure("Update General Stream", GetStreamSize(VSF_GENERAL, m_nVerts));
-                            return false;
-                        }
-                        pMS->m_nFrameUpdate = nFrame;
-                    }
-                    else
-                    {
-                        if (pMS->m_nID == ~0u)
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        // Set both tangent flags
-        if (nStreamMask & VSM_TANGENTS)
-        {
-            nStreamMask |= VSM_TANGENTS;
-        }
-
-        // Additional streams updating
-        if (nStreamMask & VSM_MASK)
-        {
-            int i;
-            uint32 iMask = 1;
-
-            for (i = 1; i < VSF_NUM; i++)
-            {
-                iMask = iMask << 1;
-
-                pMS = pVContainer->GetVertexStream(i, 0);
-                if ((nStreamMask & iMask) && pMS)
-                {
-                    if (pMS->m_pUpdateData && pMS->m_nFrameAccess != nFrame)
-                    {
-                        pMS->m_nFrameAccess = nFrame;
-                        if (pMS->m_nFrameRequest > pMS->m_nFrameUpdate)
-                        {
-                            // Update the device buffer
-                            PROFILE_FRAME(Mesh_CheckUpdateUpdateGBuf);
-                            if (!(pMS->m_nLockFlags & FSL_WRITE))
-                            {
-                                if (!pVContainer->UpdateVidVertices(i, stall))
-                                {
-                                    RT_AllocationFailure("Update VB Stream", GetStreamSize(i, m_nVerts));
-                                    return false;
-                                }
-                                if (i == VSF_HWSKIN_INFO && pVContainer->m_RemappedBoneIndices.size() == 1)
-                                {
-                                    // Just locking the VB stream doesn't store any information about the GUID so
-                                    // if the HWSKIN_INFO has been locked and we only have one set of remapped bone
-                                    // indices we will assume they are the same set. This is a valid assumption in non
-                                    // legacy code, as we will only have the one set loaded from the asset.
-                                    if (!gRenDev->m_DevBufMan.UpdateBuffer(pVContainer->m_RemappedBoneIndices[0].buffer,
-                                        pMS->m_pUpdateData,
-                                        pVContainer->GetVerticesCount() * pVContainer->GetStreamStride(VSF_HWSKIN_INFO)))
-                                    {
-                                        RT_AllocationFailure("Update VB Stream", GetStreamSize(i, m_nVerts));
-                                        return false;
-                                    }
-                                }
-                                pMS->m_nFrameUpdate = nFrame;
-                            }
-                            else
-                            if (i != VSF_HWSKIN_INFO)
-                            {
-                                if (pMS->m_nID == ~0u)
-                                {
-                                    return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }//if (m_pVertexContainer || m_nVerts > 2)
-
-    m_IBStream.m_nFrameAccess = nFrame;
-    const bool bIndUpdateNeeded = (m_IBStream.m_pUpdateData != NULL) && (m_IBStream.m_nFrameRequest > m_IBStream.m_nFrameUpdate);
-    if (bIndUpdateNeeded)
-    {
-        PROFILE_FRAME(Mesh_CheckUpdate_UpdateInds);
-        if (!(pVContainer->m_IBStream.m_nLockFlags & FSL_WRITE))
-        {
-            if (!UpdateVidIndices(m_IBStream, stall))
-            {
-                RT_AllocationFailure("Update IB Stream", m_nInds * sizeof(vtx_idx));
-                return false;
-            }
-            m_IBStream.m_nFrameUpdate = nFrame;
-        }
-        else if (pVContainer->m_IBStream.m_nID == ~0u)
-        {
-            return false;
-        }
-    }
-
-#ifdef MESH_TESSELLATION_RENDERER
-    // Build UV adjacency
-    if ((bTessellation && m_adjBuffer.m_numElements == 0)       // if needed and not built already
-        || (bIndUpdateNeeded && m_adjBuffer.m_numElements > 0)) // if already built but needs update
-    {
-        if (!(pVContainer->m_IBStream.m_nLockFlags & FSL_WRITE)
-            && (pVContainer->_HasVBStream(VSF_NORMALS)))
-        {
-            if (m_vertexFormat.Has16BitFloatTextureCoordinates())
-            {
-                UpdateUVCoordsAdjacency<Vec3f16, Vec2f16>(m_IBStream, m_vertexFormat);
-            }
-            else if (m_vertexFormat.Has32BitFloatTextureCoordinates())
-            {
-                UpdateUVCoordsAdjacency<Vec3, Vec2>(m_IBStream, m_vertexFormat);
-            }
-        }
-    }
-#endif
-
-    const int threadId = gRenDev->m_RP.m_nProcessThreadID;
-    for (size_t i = 0, end0 = pVContainer->m_DeletedBoneIndices[threadId].size(); i < end0; ++i)
-    {
-        for (size_t j = 0, end1 = pVContainer->m_RemappedBoneIndices.size(); j < end1; ++j)
-        {
-            if (pVContainer->m_RemappedBoneIndices[j].guid == pVContainer->m_DeletedBoneIndices[threadId][i])
-            {
-                SBoneIndexStream& stream = pVContainer->m_RemappedBoneIndices[j];
-                if (stream.buffer != ~0u)
-                {
-                    // Unregister the allocation with the VRAM driller
-                    void* address = reinterpret_cast<void*>(stream.buffer);
-                    EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, address);
-
-                    gRenDev->m_DevBufMan.Destroy(stream.buffer);
-                }
-                pVContainer->m_RemappedBoneIndices.erase(pVContainer->m_RemappedBoneIndices.begin() + j);
-                break;
-            }
-        }
-    }
-    pVContainer->m_DeletedBoneIndices[threadId].clear();
-    for (size_t i = 0, end = pVContainer->m_CreatedBoneIndices[threadId].size(); i < end; ++i)
-    {
-        bool bFound = false;
-        SBoneIndexStreamRequest& rBoneIndexStreamRequest = pVContainer->m_CreatedBoneIndices[threadId][i];
-        const uint32 guid = rBoneIndexStreamRequest.guid;
-        for (size_t j = 0, numIndices = m_RemappedBoneIndices.size(); j < numIndices; ++j)
-        {
-            if (m_RemappedBoneIndices[j].guid == guid && m_RemappedBoneIndices[j].refcount)
-            {
-                bFound = true;
-                ++m_RemappedBoneIndices[j].refcount;
-            }
-        }
-
-        if (bFound == false)
-        {
-            size_t bufferSize = pVContainer->GetVerticesCount() * pVContainer->GetStreamStride(VSF_HWSKIN_INFO);
-            SBoneIndexStream stream;
-            stream.buffer = gRenDev->m_DevBufMan.Create(BBT_VERTEX_BUFFER, BU_STATIC, bufferSize);
-            stream.guid = guid;
-            stream.refcount = rBoneIndexStreamRequest.refcount;
-            gRenDev->m_DevBufMan.UpdateBuffer(stream.buffer, rBoneIndexStreamRequest.pStream, pVContainer->GetVerticesCount() * pVContainer->GetStreamStride(VSF_HWSKIN_INFO));
-            pVContainer->m_RemappedBoneIndices.push_back(stream);
-
-            // Register the allocation with the VRAM driller
-            void* address = reinterpret_cast<void*>(stream.buffer);
-            const char* bufferName = GetSourceName();
-            EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, bufferSize, bufferName, Render::Debug::VRAM_CATEGORY_BUFFER, Render::Debug::VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER);
-        }
-
-        delete[] rBoneIndexStreamRequest.pStream;
-    }
-    pVContainer->m_CreatedBoneIndices[threadId].clear();
-
-    return true;
-}
-
-void CRenderMesh::ReleaseVB(int nStream)
-{
-    UnlockVB(nStream);
-    if (SMeshStream* pMS = GetVertexStream(nStream, 0))
-    {
-        if (pMS->m_nID != ~0u)
-        {
-            // Unregister the allocation with the VRAM driller
-            void* address = reinterpret_cast<void*>(pMS->m_nID);
-            EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, address);
-
-            gRenDev->m_DevBufMan.Destroy(pMS->m_nID);
-            pMS->m_nID = ~0u;
-        }
-        pMS->m_nElements = 0;
-        pMS->m_nFrameUpdate = -1;
-        pMS->m_nFrameCreate = -1;
-    }
-}
-
-void CRenderMesh::ReleaseIB()
-{
-    UnlockIB();
-    if (m_IBStream.m_nID != ~0u)
-    {
-        // Unregister the allocation with the VRAM driller
-        void* address = reinterpret_cast<void*>(m_IBStream.m_nID);
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, address);
-
-        gRenDev->m_DevBufMan.Destroy(m_IBStream.m_nID);
-        m_IBStream.m_nID = ~0u;
-    }
-    m_IBStream.m_nElements = 0;
-    m_IBStream.m_nFrameUpdate = -1;
-    m_IBStream.m_nFrameCreate = -1;
-}
-
-bool CRenderMesh::UpdateIndices_Int(
-    const vtx_idx* pNewInds
-    , int nInds
-    , int nOffsInd
-    , uint32 copyFlags)
-{
-    AZ_TRACE_METHOD();
-
-    //LockVB operates now on a per mesh lock, any thread may access
-    //ASSERT_IS_MAIN_THREAD(gRenDev->m_pRT)
-
-    //SREC_AUTO_LOCK(m_sResLock);
-
-    // Resize the index buffer
-    if (m_nInds != nInds)
-    {
-        FreeIB();
-        m_nInds = nInds;
-    }
-    if (!nInds)
-    {
-        assert(!m_IBStream.m_pUpdateData);
-        return true;
-    }
-
-    vtx_idx* pDst = LockIB(FSL_VIDEO_CREATE, 0, nInds);
-    if (pDst && pNewInds)
-    {
-        if (copyFlags & FSL_ASYNC_DEFER_COPY && nInds * sizeof(vtx_idx) < RENDERMESH_ASYNC_MEMCPY_THRESHOLD)
-        {
-            cryAsyncMemcpy(
-                &pDst[nOffsInd],
-                pNewInds,
-                nInds * sizeof(vtx_idx),
-                MC_CPU_TO_GPU | copyFlags,
-                SetAsyncUpdateState());
-        }
-        else
-        {
-            cryMemcpy(
-                &pDst[nOffsInd],
-                pNewInds,
-                nInds * sizeof(vtx_idx),
-                MC_CPU_TO_GPU);
-            UnlockIndexStream();
-        }
-    }
-    else
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool CRenderMesh::UpdateVertices_Int(
-    const void* pVertBuffer
-    , int nVertCount
-    , int nOffset
-    , int nStream
-    , uint32 copyFlags)
-{
-    AZ_TRACE_METHOD();
-    //LockVB operates now on a per mesh lock, any thread may access
-    //  ASSERT_IS_MAIN_THREAD(gRenDev->m_pRT)
-
-    int nStride;
-
-    //SREC_AUTO_LOCK(m_sResLock);
-
-    // Resize the vertex buffer
-    if (m_nVerts != nVertCount)
-    {
-        for (int i = 0; i < VSF_NUM; i++)
-        {
-            FreeVB(i);
-        }
-        m_nVerts = nVertCount;
-    }
-    if (!m_nVerts)
-    {
-        return true;
-    }
-
-    byte* pDstVB = (byte*)LockVB(nStream, FSL_VIDEO_CREATE, nVertCount, &nStride);
-    assert((nVertCount == 0) || pDstVB);
-    if (pDstVB && pVertBuffer)
-    {
-        if (copyFlags & FSL_ASYNC_DEFER_COPY && nStride * nVertCount < RENDERMESH_ASYNC_MEMCPY_THRESHOLD)
-        {
-            cryAsyncMemcpy(
-                &pDstVB[nOffset],
-                pVertBuffer,
-                nStride * nVertCount,
-                MC_CPU_TO_GPU | copyFlags,
-                SetAsyncUpdateState());
-        }
-        else
-        {
-            cryMemcpy(
-                &pDstVB[nOffset],
-                pVertBuffer,
-                nStride * nVertCount,
-                MC_CPU_TO_GPU);
-            UnlockStream(nStream);
-        }
-    }
-    else
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool CRenderMesh::UpdateVertices(
-    const void* pVertBuffer
-    , int nVertCount
-    , int nOffset
-    , int nStream
-    , uint32 copyFlags
-    , bool requiresLock)
-{
-    bool result = false;
-    if (requiresLock)
-    {
-        SREC_AUTO_LOCK(m_sResLock);
-        result = UpdateVertices_Int(pVertBuffer, nVertCount, nOffset, nStream, copyFlags);
-    }
-    else
-    {
-        result = UpdateVertices_Int(pVertBuffer, nVertCount, nOffset, nStream, copyFlags);
-    }
-    return result;
-}
-
-bool CRenderMesh::UpdateIndices(
-    const vtx_idx* pNewInds
-    , int nInds
-    , int nOffsInd
-    , uint32 copyFlags
-    , bool requiresLock)
-{
-    bool result = false;
-    if (requiresLock)
-    {
-        SREC_AUTO_LOCK(m_sResLock);
-        result = UpdateIndices_Int(pNewInds, nInds, nOffsInd, copyFlags);
-    }
-    else
-    {
-        result = UpdateIndices_Int(pNewInds, nInds, nOffsInd, copyFlags);
-    }
-    return result;
-}
-
-bool CRenderMesh::UpdateVidIndices(SMeshStream& IBStream, [[maybe_unused]] bool stall)
-{
-    SCOPED_RENDERER_ALLOCATION_NAME_HINT(GetSourceName());
-    AZ_TRACE_METHOD();
-
-    assert(gRenDev->m_pRT->IsRenderThread());
-
-    SREC_AUTO_LOCK(m_sResLock);
-
-    assert(gRenDev->m_pRT->IsRenderThread());
-
-    int nInds = m_nInds;
-
-    if (!nInds)
-    {
-        // 0 size index buffer creation crashes on deprecated platform
-        assert(nInds);
-        return false;
-    }
-
-    if (IBStream.m_nElements != m_nInds && _HasIBStream())
-    {
-        ReleaseIB();
-    }
-
-    if (IBStream.m_nID == ~0u)
-    {
-        const size_t bufferSize = nInds * sizeof(vtx_idx);
-        IBStream.m_nID = gRenDev->m_DevBufMan.Create(BBT_INDEX_BUFFER, (BUFFER_USAGE)m_eType, bufferSize);
-        IBStream.m_nElements = m_nInds;
-        IBStream.m_nFrameCreate =  gRenDev->m_RP.m_TI[gRenDev->m_pRT->IsMainThread()    ? gRenDev->m_RP.m_nFillThreadID : gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-        // Register the allocation with the VRAM driller
-        void* address = reinterpret_cast<void*>(IBStream.m_nID);
-        const char* bufferName = GetSourceName();
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, bufferSize, bufferName, Render::Debug::VRAM_CATEGORY_BUFFER, Render::Debug::VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER);
-    }
-    if (IBStream.m_nID != ~0u)
-    {
-        UnlockIndexStream();
-        if (m_IBStream.m_pUpdateData)
-        {
-            return gRenDev->m_DevBufMan.UpdateBuffer(IBStream.m_nID, IBStream.m_pUpdateData, m_nInds * sizeof(vtx_idx));
-        }
-    }
-    return false;
-}
-
-bool CRenderMesh::CreateVidVertices(int nStream)
-{
-    SCOPED_RENDERER_ALLOCATION_NAME_HINT(GetSourceName());
-    AZ_TRACE_METHOD();
-
-    SREC_AUTO_LOCK(m_sResLock);
-
-    if (gRenDev->m_bDeviceLost)
-    {
-        return false;
-    }
-
-    assert (!_HasVBStream(nStream));
-    SMeshStream* pMS = GetVertexStream(nStream, FSL_WRITE);
-    int nSize = GetStreamSize(nStream, m_nVerts);
-    pMS->m_nID = gRenDev->m_DevBufMan.Create(BBT_VERTEX_BUFFER, (BUFFER_USAGE)m_eType, nSize);
-    pMS->m_nElements = m_nVerts;
-    pMS->m_nFrameCreate = gRenDev->m_RP.m_TI
-        [gRenDev->m_pRT->IsMainThread()
-         ? gRenDev->m_RP.m_nFillThreadID
-         : gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-    // Register the allocation with the VRAM driller
-    void* address = reinterpret_cast<void*>(pMS->m_nID);
-    const char* bufferName = GetSourceName();
-    EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, nSize, bufferName, Render::Debug::VRAM_CATEGORY_BUFFER, Render::Debug::VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER);
-
-    return (pMS->m_nID != ~0u);
-}
-
-bool CRenderMesh::UpdateVidVertices(int nStream, [[maybe_unused]] bool stall)
-{
-    AZ_TRACE_METHOD();
-
-    assert(gRenDev->m_pRT->IsRenderThread());
-
-    SREC_AUTO_LOCK(m_sResLock);
-
-    assert(nStream < VSF_NUM);
-    SMeshStream* pMS = GetVertexStream(nStream, FSL_WRITE);
-
-    if (m_nVerts != pMS->m_nElements && _HasVBStream(nStream))
-    {
-        ReleaseVB(nStream);
-    }
-
-    if (pMS->m_nID == ~0u)
-    {
-        if (!CreateVidVertices(nStream))
-        {
-            return false;
-        }
-    }
-    if (pMS->m_nID != ~0u)
-    {
-        UnlockStream(nStream);
-        if (pMS->m_pUpdateData)
-        {
-            return gRenDev->m_DevBufMan.UpdateBuffer(pMS->m_nID, pMS->m_pUpdateData, GetStreamSize(nStream));
-            ;
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-    return false;
-}
-
-#ifdef MESH_TESSELLATION_RENDERER
-template<class VecPos, class VecUV>
-bool CRenderMesh::UpdateUVCoordsAdjacency(SMeshStream& IBStream, const AZ::Vertex::Format& vertexFormat)
-{
-    SCOPED_RENDERER_ALLOCATION_NAME_HINT(GetSourceName());
-    AZ_TRACE_METHOD();
-
-    assert(gRenDev->m_pRT->IsRenderThread());
-
-    SREC_AUTO_LOCK(m_sResLock);
-
-    int nInds = m_nInds * 4;
-
-    if (!nInds)
-    {
-        // 0 size index buffer creation crashes on deprecated platform
-        assert(nInds);
-        return false;
-    }
-
-    SMeshStream* pMS = GetVertexStream(VSF_GENERAL);
-
-    if (IBStream.m_nID != ~0u && pMS)
-    {
-        if (m_IBStream.m_pUpdateData)
-        {
-            bool bRes = true;
-            std::vector<VecUV> pTxtAdjBuffer;
-
-            // create triangles with adjacency
-            byte* pVertexStream = (byte*)pMS->m_pUpdateData;
-            uint stride = vertexFormat.GetStride();
-            uint offset = 0;
-            // Only handle one uv set for now.
-            if ((m_vertexFormat.TryCalculateOffset(offset, AZ::Vertex::AttributeUsage::TexCoord)) && pVertexStream)
-            {
-                int nTrgs = m_nInds / 3;
-                pTxtAdjBuffer.resize(nTrgs * 12);
-                int nVerts = GetNumVerts();
-                for (int n = 0; n < nTrgs; ++n)
-                {
-                    // fill in the dummy adjacency first
-                    VecUV* pDst = &pTxtAdjBuffer[n * 12];
-                    vtx_idx* pSrc = (vtx_idx*)m_IBStream.m_pUpdateData + n * 3;
-                    // triangle itself
-                    memcpy(&pDst[0], &pVertexStream[pSrc[0] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[1], &pVertexStream[pSrc[1] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[2], &pVertexStream[pSrc[2] * stride + offset], sizeof(VecUV));
-
-                    // adjacency by edges
-                    memcpy(&pDst[3], &pVertexStream[pSrc[0] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[4], &pVertexStream[pSrc[1] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[5], &pVertexStream[pSrc[1] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[6], &pVertexStream[pSrc[2] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[7], &pVertexStream[pSrc[2] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[8], &pVertexStream[pSrc[0] * stride + offset], sizeof(VecUV));
-                    // adjacency by corners
-                    memcpy(&pDst[9], &pVertexStream[pSrc[0] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[10], &pVertexStream[pSrc[1] * stride + offset], sizeof(VecUV));
-                    memcpy(&pDst[11], &pVertexStream[pSrc[2] * stride + offset], sizeof(VecUV));
-                }
-
-                // now real adjacency is computed
-                BuildAdjacency<VecPos, VecUV>(pVertexStream, vertexFormat, nVerts, (vtx_idx*)m_IBStream.m_pUpdateData, nTrgs, pTxtAdjBuffer);
-
-                m_adjBuffer.Create(pTxtAdjBuffer.size(), sizeof(Vec2f16), DXGI_FORMAT_R16G16_FLOAT, DX11BUF_BIND_SRV, &pTxtAdjBuffer[0]);
-
-                if constexpr (sizeof(VecUV) == sizeof(Vec2f16))
-                {
-                    m_adjBuffer.Create(pTxtAdjBuffer.size(), sizeof(VecUV), DXGI_FORMAT_R16G16_FLOAT, DX11BUF_BIND_SRV, &pTxtAdjBuffer[0]);
-                }
-                else
-                {
-                    m_adjBuffer.Create(pTxtAdjBuffer.size(), sizeof(VecUV), DXGI_FORMAT_R32G32_FLOAT, DX11BUF_BIND_SRV, &pTxtAdjBuffer[0]);
-                }
-
-                // HS needs to know iPatchID offset for each drawcall, so we pass this offset in the constant buffer
-                // currently texture buffer is created, but when parser support for cbuffer is added (AI: AndreyK), we
-                // need to change the below call to:
-                // ((CREMeshImpl*) m_Chunks[iChunk].pRE)->m_tessCB.Create(4, sizeof(int), (DXGI_FORMAT)0, &myBuffer[0], D3D11_BIND_CONSTANT_BUFFER);
-                for (int iChunk = 0; iChunk < m_Chunks.size(); ++iChunk)
-                {
-                    int myBuffer[4];
-                    myBuffer[0] = m_Chunks[iChunk].nFirstIndexId / 3;
-                    ((CREMeshImpl*) m_Chunks[iChunk].pRE)->m_tessCB.Create(4, sizeof(int), DXGI_FORMAT_R32_SINT, DX11BUF_BIND_SRV, &myBuffer[0]);
-                }
-            }
-
-            return bRes;
-        }
-    }
-
-    return false;
-}
-#endif //#ifdef MESH_TESSELLATION_RENDERER
-
-void CRenderMesh::Render(const SRendParams& rParams, CRenderObject* pObj, _smart_ptr<IMaterial> pMaterial, const SRenderingPassInfo& passInfo, bool bSkinned)
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    IF (!CanRender(), 0)
-    {
-        return;
-    }
-
-    int nList = rParams.nRenderList;
-    int nAW = rParams.nAfterWater;
-    CRenderer* rd = gRenDev;
-
-#if !defined(_RELEASE)
-    const char* szExcl = CRenderer::CV_r_excludemesh->GetString();
-    if (szExcl[0] && m_sSource)
-    {
-        char szMesh[1024];
-        cry_strcpy(szMesh, this->m_sSource);
-        azstrlwr(szMesh, AZ_ARRAY_SIZE(szMesh));
-        if (szExcl[0] == '!')
-        {
-            if (!strstr(&szExcl[1], m_sSource))
-            {
-                return;
-            }
-        }
-        else
-        if (strstr(szExcl, m_sSource))
-        {
-            return;
-        }
-    }
-#endif
-
-    if (rd->m_pDefaultMaterial && pMaterial)
-    {
-        pMaterial = rd->m_pDefaultMaterial;
-    }
-
-    assert(pMaterial);
-
-    if (!pMaterial || !m_nVerts || !m_nInds || m_Chunks.empty())
-    {
-        return;
-    }
-
-    pObj->m_pRenderNode = rParams.pRenderNode;
-    pObj->m_pCurrMaterial = pMaterial;
-
-    if (rParams.nHUDSilhouettesParams || rParams.nVisionParams || rParams.pInstance)
-    {
-        SRenderObjData* pOD = rd->EF_GetObjData(pObj, true, passInfo.ThreadID());
-
-        pOD->m_nHUDSilhouetteParams = rParams.nHUDSilhouettesParams;
-        pOD->m_uniqueObjectId = reinterpret_cast<uintptr_t>(rParams.pInstance);
-    }
-
-
-    assert(!(pObj->m_ObjFlags & FOB_BENDED));
-
-    const bool bSG = passInfo.IsShadowPass();
-
-    if (gRenDev->CV_r_MotionVectors && passInfo.IsGeneralPass() && ((pObj->m_ObjFlags & FOB_DYNAMIC_OBJECT) != 0))
-    {
-        CMotionBlur::SetupObject(pObj, passInfo);
-    }
-
-    TRenderChunkArray* pChunks = bSkinned ? &m_ChunksSkinned : &m_Chunks;
-
-    if (pChunks)
-    {
-        const uint32 ni = (uint32)pChunks->size();
-        for (uint32 i = 0; i < ni; i++)
-        {
-            CRenderChunk* pChunk = &pChunks->at(i);
-            CRendElementBase* pREMesh = pChunk->pRE;
-
-            SShaderItem& ShaderItem = pMaterial->GetShaderItem(pChunk->m_nMatID);
-
-            CShaderResources* pR = (CShaderResources*)ShaderItem.m_pShaderResources;
-            CShader* pS = (CShader*)ShaderItem.m_pShader;
-            if (pREMesh && pS && pR)
-            {
-                if (pS->m_Flags2 & EF2_NODRAW)
-                {
-                    continue;
-                }
-
-                if (bSG && (pMaterial->GetSafeSubMtl(pChunk->m_nMatID)->GetFlags() & MTL_FLAG_NOSHADOW))
-                {
-                    continue;
-                }
-
-                rd->EF_AddEf_NotVirtual(pREMesh, ShaderItem, pObj, passInfo, nList, nAW, SRendItemSorter(rParams.rendItemSorter));
-            }
-        }
-    }
-}
-
-
-void CRenderMesh::SetREUserData(float* pfCustomData, [[maybe_unused]] float fFogScale, [[maybe_unused]] float fAlpha)
-{
-    for (int i = 0; i < m_Chunks.size(); i++)
-    {
-        if (m_Chunks[i].pRE)
-        {
-            m_Chunks[i].pRE->m_CustomData = pfCustomData;
-        }
-    }
-}
-
-void CRenderMesh::AddRenderElements(_smart_ptr<IMaterial> pIMatInfo, CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nList, int nAW)
-{
-    SRendItemSorter rendItemSorter = passInfo.IsShadowPass() ? SRendItemSorter::CreateShadowPassRendItemSorter(passInfo) : SRendItemSorter::CreateRendItemSorter(passInfo);
-
-    assert(!(pObj->m_ObjFlags & FOB_BENDED));
-    //assert (!pObj->GetInstanceInfo(0));
-    assert(pIMatInfo);
-
-    if (!_GetVertexContainer()->m_nVerts || !m_Chunks.size() || !pIMatInfo)
-    {
-        return;
-    }
-
-    if (gRenDev->m_pDefaultMaterial && gRenDev->m_pTerrainDefaultMaterial)
-    {
-        pIMatInfo = gRenDev->m_pDefaultMaterial;
-    }
-
-    for (int i = 0; i < m_Chunks.size(); i++)
-    {
-        CRenderChunk* pChunk = &m_Chunks[i];
-        CREMeshImpl* pOrigRE = (CREMeshImpl*) pChunk->pRE;
-
-        // get material
-
-        SShaderItem& shaderItem = pIMatInfo->GetShaderItem(pChunk->m_nMatID);
-
-        //    if (nTechniqueID > 0)
-        //    shaderItem.m_nTechnique = shaderItem.m_pShader->GetTechniqueID(shaderItem.m_nTechnique, nTechniqueID);
-
-        if (shaderItem.m_pShader && pOrigRE)// && pMat->nNumIndices)
-        {
-            TArray<CRendElementBase*>* pREs = shaderItem.m_pShader->GetREs(shaderItem.m_nTechnique);
-
-            assert(pOrigRE->m_pChunk->nFirstIndexId < 60000);
-
-            if (!pREs || !pREs->Num())
-            {
-                gRenDev->EF_AddEf_NotVirtual(pOrigRE, shaderItem, pObj, passInfo, nList, nAW, rendItemSorter);
-            }
-            else
-            {
-                gRenDev->EF_AddEf_NotVirtual(pREs->Get(0), shaderItem, pObj, passInfo, nList, nAW, rendItemSorter);
-            }
-        }
-    } //i
-}
-
-void CRenderMesh::AddRE(_smart_ptr<IMaterial> pMaterial, CRenderObject* obj, IShader* ef, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter)
-{
-    if (!m_nVerts || !m_Chunks.size())
-    {
-        return;
-    }
-
-    assert(!(obj->m_ObjFlags & FOB_BENDED));
-
-    for (int i = 0; i < m_Chunks.size(); i++)
-    {
-        if (!m_Chunks[i].pRE)
-        {
-            continue;
-        }
-
-        SShaderItem& SH = pMaterial->GetShaderItem();
-        if (ef)
-        {
-            SH.m_pShader = ef;
-        }
-        if (SH.m_pShader)
-        {
-            assert(m_Chunks[i].pRE->m_pChunk->nFirstIndexId < 60000);
-
-            TArray<CRendElementBase*>* pRE = SH.m_pShader->GetREs(SH.m_nTechnique);
-            if (!pRE || !pRE->Num())
-            {
-                gRenDev->EF_AddEf_NotVirtual(m_Chunks[i].pRE, SH, obj, passInfo, nList, nAW, rendItemSorter);
-            }
-            else
-            {
-                gRenDev->EF_AddEf_NotVirtual(SH.m_pShader->GetREs(SH.m_nTechnique)->Get(0), SH, obj, passInfo, nList, nAW, rendItemSorter);
-            }
-        }
-    }
-}
-
-size_t CRenderMesh::GetMemoryUsage(ICrySizer* pSizer, EMemoryUsageArgument nType) const
-{
-    size_t nSize = 0;
-    switch (nType)
-    {
-    case MEM_USAGE_COMBINED:
-        nSize = Size(SIZE_ONLY_SYSTEM) + Size(SIZE_VB | SIZE_IB);
-        break;
-    case MEM_USAGE_ONLY_SYSTEM:
-        nSize = Size(SIZE_ONLY_SYSTEM);
-        break;
-    case MEM_USAGE_ONLY_VIDEO:
-        nSize = Size(SIZE_VB | SIZE_IB);
-        return nSize;
-        break;
-    case MEM_USAGE_ONLY_STREAMS:
-        nSize = Size(SIZE_ONLY_SYSTEM) + Size(SIZE_VB | SIZE_IB);
-
-        if (pSizer)
-        {
-            SIZER_COMPONENT_NAME(pSizer, "STREAM MESH");
-            pSizer->AddObject((void*)this, nSize);
-        }
-
-        // Not add overhead allocations.
-        return nSize;
-        break;
-    }
-
-    {
-        nSize += sizeof(*this);
-        for (int i = 0; i < (int)m_Chunks.capacity(); i++)
-        {
-            if (i < m_Chunks.size())
-            {
-                nSize += m_Chunks[i].Size();
-            }
-            else
-            {
-                nSize += sizeof(CRenderChunk);
-            }
-        }
-        for (int i = 0; i < (int)m_ChunksSkinned.capacity(); i++)
-        {
-            if (i < m_ChunksSkinned.size())
-            {
-                nSize += m_ChunksSkinned.at(i).Size();
-            }
-            else
-            {
-                nSize += sizeof(CRenderChunk);
-            }
-        }
-    }
-
-    if (pSizer)
-    {
-        pSizer->AddObject((void*)this, nSize);
-
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-        if (m_pTrisMap)
-        {
-            SIZER_COMPONENT_NAME(pSizer, "Hash map");
-            nSize += stl::size_of_map(*m_pTrisMap);
-        }
-#endif
-
-        for (MeshSubSetIndices::const_iterator it = m_meshSubSetIndices.begin(); it != m_meshSubSetIndices.end(); ++it)
-        {
-            // Collect memory usage for index sub-meshes.
-            it->second->GetMemoryUsage(pSizer, nType);
-        }
-    }
-
-    return nSize;
-}
-
-void CRenderMesh::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Vertex Data");
-        for (uint32 i = 0; i < VSF_NUM; i++)
-        {
-            if (SMeshStream* pMS = GetVertexStream(i, 0))
-            {
-                if (pMS->m_pUpdateData)
-                {
-                    pSizer->AddObject(pMS->m_pUpdateData, GetStreamSize(i));
-                }
-            }
-        }
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "FP16 Cache");
-        if (m_pCachePos)
-        {
-            pSizer->AddObject(m_pCachePos, m_nVerts * sizeof(Vec3));
-        }
-        for (int i = 0; i < m_UVCache.size(); ++i)
-        {
-            if (m_UVCache[i])
-            {
-                pSizer->AddObject(m_UVCache[i], m_nVerts * sizeof(Vec2));
-            }
-        }
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Mesh Chunks");
-        pSizer->AddObject(m_Chunks);
-    }
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Mesh Skinned Chunks");
-        pSizer->AddObject(m_ChunksSkinned);
-    }
-
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Hash map");
-        pSizer->AddObject(m_pTrisMap);
-    }
-#endif
-    for (MeshSubSetIndices::const_iterator it = m_meshSubSetIndices.begin(); it != m_meshSubSetIndices.end(); ++it)
-    {
-        // Collect memory usage for index sub-meshes.
-        it->second->GetMemoryUsage(pSizer);
-    }
-}
-
-int CRenderMesh::GetAllocatedBytes(bool bVideoMem) const
-{
-    if (!bVideoMem)
-    {
-        return Size(SIZE_ONLY_SYSTEM);
-    }
-    else
-    {
-        return Size(SIZE_VB | SIZE_IB);
-    }
-}
-
-int CRenderMesh::GetTextureMemoryUsage(const _smart_ptr<IMaterial> pMaterial, ICrySizer* pSizer, bool bStreamedIn) const
-{
-    // If no input material use internal render mesh material.
-    if (!pMaterial)
-    {
-        return 0;
-    }
-
-    int textureSize = 0;
-    std::set<const CTexture*>   used;
-    for (int a = 0; a < m_Chunks.size(); a++)
-    {
-        const CRenderChunk* pChunk = &m_Chunks[a];
-
-        // Override default material
-        const SShaderItem& shaderItem = pMaterial->GetShaderItem(pChunk->m_nMatID);
-        if (!shaderItem.m_pShaderResources)
-        {
-            continue;
-        }
-
-        const CShaderResources*     pRes = (const CShaderResources*)shaderItem.m_pShaderResources;
-        for (auto iter = pRes->m_TexturesResourcesMap.begin(); iter != pRes->m_TexturesResourcesMap.end(); ++iter)
-        {
-            const CTexture*     pTexture = iter->second.m_Sampler.m_pTex;
-            if (!pTexture)
-            {
-                continue;
-            }
-
-            if (used.find(pTexture) != used.end()) // Already used in size calculation.
-            {
-                continue;
-            }
-            used.insert(pTexture);
-
-            int nTexSize = bStreamedIn ? pTexture->GetDeviceDataSize() : pTexture->GetDataSize();
-            textureSize += nTexSize;
-
-            if (pSizer)
-            {
-                pSizer->AddObject(pTexture, nTexSize);
-            }
-        }
-    }
-    return textureSize;
-}
-
-float CRenderMesh::GetAverageTrisNumPerChunk(_smart_ptr<IMaterial> pMat)
-{
-    float fTrisNum = 0;
-    float fChunksNum = 0;
-
-    for (int m = 0; m < m_Chunks.size(); m++)
-    {
-        const CRenderChunk& chunk = m_Chunks[m];
-        if ((chunk.m_nMatFlags & MTL_FLAG_NODRAW) || !chunk.pRE)
-        {
-            continue;
-        }
-
-        _smart_ptr<IMaterial> pCustMat;
-        if (pMat && chunk.m_nMatID < pMat->GetSubMtlCount())
-        {
-            pCustMat = pMat->GetSubMtl(chunk.m_nMatID);
-        }
-        else
-        {
-            pCustMat = pMat;
-        }
-
-        if (!pCustMat)
-        {
-            continue;
-        }
-
-        const IShader* pShader = pCustMat->GetShaderItem().m_pShader;
-
-        if (!pShader)
-        {
-            continue;
-        }
-
-        if (pShader->GetFlags2() & EF2_NODRAW)
-        {
-            continue;
-        }
-
-        fTrisNum += chunk.nNumIndices / 3;
-        fChunksNum++;
-    }
-
-    return fChunksNum ? (fTrisNum / fChunksNum) : 0;
-}
-
-void CRenderMesh::InitTriHash(_smart_ptr<IMaterial> pMaterial)
-{
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-
-    SAFE_DELETE(m_pTrisMap);
-    m_pTrisMap = new TrisMap;
-
-    int nPosStride = 0;
-    int nIndCount = m_nInds;
-    const byte* pPositions = GetPosPtr(nPosStride, FSL_READ);
-    const vtx_idx* pIndices = GetIndexPtr(FSL_READ);
-
-    iLog->Log("CRenderMesh::InitTriHash: Tris=%d, Verts=%d, Name=%s ...", nIndCount / 3, GetVerticesCount(), GetSourceName() ? GetSourceName() : "Null");
-
-    if (pIndices && pPositions && m_Chunks.size() && nIndCount && GetVerticesCount())
-    {
-        for (uint32 ii = 0; ii < (uint32)m_Chunks.size(); ii++)
-        {
-            CRenderChunk* pChunk = &m_Chunks[ii];
-
-            if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-            {
-                continue;
-            }
-
-            // skip transparent and alpha test
-            const SShaderItem& shaderItem = pMaterial->GetShaderItem(pChunk->m_nMatID);
-            if (!shaderItem.IsZWrite() || !shaderItem.m_pShaderResources || shaderItem.m_pShaderResources->IsAlphaTested())
-            {
-                continue;
-            }
-
-            if (shaderItem.m_pShader && shaderItem.m_pShader->GetFlags() & EF_DECAL)
-            {
-                continue;
-            }
-
-            uint32 nFirstIndex = pChunk->nFirstIndexId;
-            uint32 nLastIndex = pChunk->nFirstIndexId + pChunk->nNumIndices;
-
-            for (uint32 i = nFirstIndex; i < nLastIndex; i += 3)
-            {
-                int32 I0    =   pIndices[i + 0];
-                int32 I1    =   pIndices[i + 1];
-                int32 I2    =   pIndices[i + 2];
-
-                Vec3 v0 = *(Vec3*)&pPositions[nPosStride * I0];
-                Vec3 v1 = *(Vec3*)&pPositions[nPosStride * I1];
-                Vec3 v2 = *(Vec3*)&pPositions[nPosStride * I2];
-
-                AABB triBox;
-                triBox.min = triBox.max = v0;
-                triBox.Add(v1);
-                triBox.Add(v2);
-
-                float fRayLen = CRenderer::CV_r_RenderMeshHashGridUnitSize / 2;
-                triBox.min -= Vec3(fRayLen, fRayLen, fRayLen);
-                triBox.max += Vec3(fRayLen, fRayLen, fRayLen);
-
-                AABB aabbCell;
-
-                aabbCell.min = triBox.min / CRenderer::CV_r_RenderMeshHashGridUnitSize;
-                aabbCell.min.x = floor(aabbCell.min.x);
-                aabbCell.min.y = floor(aabbCell.min.y);
-                aabbCell.min.z = floor(aabbCell.min.z);
-
-                aabbCell.max = triBox.max / CRenderer::CV_r_RenderMeshHashGridUnitSize;
-                aabbCell.max.x = ceil(aabbCell.max.x);
-                aabbCell.max.y = ceil(aabbCell.max.y);
-                aabbCell.max.z = ceil(aabbCell.max.z);
-
-                for (float x = aabbCell.min.x; x < aabbCell.max.x; x++)
-                {
-                    for (float y = aabbCell.min.y; y < aabbCell.max.y; y++)
-                    {
-                        for (float z = aabbCell.min.z; z < aabbCell.max.z; z++)
-                        {
-                            AABB cellBox;
-                            cellBox.min = Vec3(x, y, z) * CRenderer::CV_r_RenderMeshHashGridUnitSize;
-                            cellBox.max = cellBox.min + Vec3(CRenderer::CV_r_RenderMeshHashGridUnitSize, CRenderer::CV_r_RenderMeshHashGridUnitSize, CRenderer::CV_r_RenderMeshHashGridUnitSize);
-                            cellBox.min -= Vec3(fRayLen, fRayLen, fRayLen);
-                            cellBox.max += Vec3(fRayLen, fRayLen, fRayLen);
-                            if (!Overlap::AABB_Triangle(cellBox, v0, v1, v2))
-                            {
-                                continue;
-                            }
-
-                            int key = (int)(x * 256.f * 256.f + y * 256.f + z);
-                            PodArray<std::pair<int, int> >* pTris = &(*m_pTrisMap)[key];
-                            std::pair<int, int> t(i, pChunk->m_nMatID);
-                            if (pTris->Find(t) < 0)
-                            {
-                                pTris->Add(t);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    iLog->LogPlus(" ok (%" PRISIZE_T ")", m_pTrisMap->size());
-
-#endif
-}
-
-
-const PodArray<std::pair<int, int> >* CRenderMesh::GetTrisForPosition([[maybe_unused]] const Vec3& vPos, _smart_ptr<IMaterial> pMaterial)
-{
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-
-    if (!m_pTrisMap)
-    {
-        AUTO_LOCK(m_getTrisForPositionLock);
-        if (!m_pTrisMap)
-        {
-            InitTriHash(pMaterial);
-        }
-    }
-
-    Vec3 vCellMin = vPos / CRenderer::CV_r_RenderMeshHashGridUnitSize;
-    vCellMin.x = floor(vCellMin.x);
-    vCellMin.y = floor(vCellMin.y);
-    vCellMin.z = floor(vCellMin.z);
-
-    int key = (int)(vCellMin.x * 256.f * 256.f + vCellMin.y * 256.f + vCellMin.z);
-
-    const TrisMap::iterator& iter = (*m_pTrisMap).find(key);
-    if (iter != (*m_pTrisMap).end())
-    {
-        return &iter->second;
-    }
-#else
-    AZ_Assert(false, "NOT IMPLEMENTED: CRenderMesh::GetTrisForPosition(const Vec3& vPos, _smart_ptr<IMaterial> pMaterial)");
-#endif
-
-    return 0;
-}
-
-void CRenderMesh::UpdateBBoxFromMesh()
-{
-    PROFILE_FRAME(UpdateBBoxFromMesh);
-
-    AABB aabb;
-    aabb.Reset();
-
-    int nVertCount = _GetVertexContainer()->GetVerticesCount();
-    int nPosStride = 0;
-    const byte* pPositions = GetPosPtr(nPosStride, FSL_READ);
-    const vtx_idx* pIndices = GetIndexPtr(FSL_READ);
-
-    if (!pIndices || !pPositions)
-    {
-        assert(!"Mesh is not ready");
-        return;
-    }
-
-    for (int32 a = 0; a < m_Chunks.size(); a++)
-    {
-        CRenderChunk* pChunk = &m_Chunks[a];
-
-        if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-        {
-            continue;
-        }
-
-        uint32 nFirstIndex = pChunk->nFirstIndexId;
-        uint32 nLastIndex = pChunk->nFirstIndexId + pChunk->nNumIndices;
-
-        for (uint32 i = nFirstIndex; i < nLastIndex; i++)
-        {
-            int32 I0  =   pIndices[i];
-            if (I0 < nVertCount)
-            {
-                Vec3 v0 = *(Vec3*)&pPositions[nPosStride * I0];
-                aabb.Add(v0);
-            }
-            else
-            {
-                assert(!"Index is out of range");
-            }
-        }
-    }
-
-    if (!aabb.IsReset())
-    {
-        m_vBoxMax = aabb.max;
-        m_vBoxMin = aabb.min;
-    }
-}
-
-static void ExtractBoneIndicesAndWeights(uint16* outIndices, Vec4& outWeights, const JointIdType* aBoneRemap, const uint16* indices, UCol weights)
-{
-    // Get 8-bit weights as floats
-    outWeights[0] = weights.bcolor[0];
-    outWeights[1] = weights.bcolor[1];
-    outWeights[2] = weights.bcolor[2];
-    outWeights[3] = weights.bcolor[3];
-
-    // Get bone indices
-    if (aBoneRemap)
-    {
-        outIndices[0] = aBoneRemap[indices[0]];
-        outIndices[1] = aBoneRemap[indices[1]];
-        outIndices[2] = aBoneRemap[indices[2]];
-        outIndices[3] = aBoneRemap[indices[3]];
-    }
-    else
-    {
-        outIndices[0] = indices[0];
-        outIndices[1] = indices[1];
-        outIndices[2] = indices[2];
-        outIndices[3] = indices[3];
-    }
-}
-
-static void BlendDualQuats(DualQuat& outBone, Array<const DualQuat> aBoneLocs, const uint16* indices, const Vec4 outWeights)
-{
-    outBone = aBoneLocs[indices[0]] * outWeights[0] +
-              aBoneLocs[indices[1]] * outWeights[1] +
-              aBoneLocs[indices[2]] * outWeights[2] +
-              aBoneLocs[indices[3]] * outWeights[3];
-
-    outBone.Normalize();
-}
-
-static void BlendMatrices(Matrix34& outBone, Array<const Matrix34> aBoneLocs, const uint16* indices, const Vec4 outWeights)
-{
-    outBone = (aBoneLocs[indices[0]] * outWeights[0]) + 
-              (aBoneLocs[indices[1]] * outWeights[1]) + 
-              (aBoneLocs[indices[2]] * outWeights[2]) + 
-              (aBoneLocs[indices[3]] * outWeights[3]);
-}
-
-struct PosNormData
-{
-    strided_pointer<Vec3> aPos;
-    strided_pointer<Vec3> aNorm;
-    strided_pointer<SVF_P3S_N4B_C4B_T2S> aVert;
-    strided_pointer<SPipQTangents> aQTan;
-    strided_pointer<SPipTangents> aTan2;
-
-    void GetPosNorm(PosNorm& ran, int nV)
-    {
-        // Position
-        ran.vPos = aPos[nV];
-
-        // Normal
-        if (aNorm.data)
-        {
-            ran.vNorm = aNorm[nV];
-        }
-        else if (aVert.data)
-        {
-            ran.vNorm = aVert[nV].normal.GetN();
-        }
-        else if (aTan2.data)
-        {
-            ran.vNorm = aTan2[nV].GetN();
-        }
-        else if (aQTan.data)
-        {
-            ran.vNorm = aQTan[nV].GetN();
-        }
-    }
-};
-
-// To do: replace with VSF_MORPHBUDDY support
-#define SKIN_MORPHING 0
-
-struct SkinnedPosNormData
-    : PosNormData
-{
-    SSkinningData const* pSkinningData;
-
-#if SKIN_MORPHING
-    strided_pointer<SVF_P3F_P3F_I4B> aMorphing;
-#endif
-
-    strided_pointer<SVF_W4B_I4S> aSkinning;
-
-
-    SkinnedPosNormData() {}
-
-    void GetPosNorm(PosNorm& ran, int nV)
-    {
-        PosNormData::GetPosNorm(ran, nV);
-
-    #if SKIN_MORPHING
-        if (aShapeDeform && aMorphing)
-        {
-            SVF_P3F_P3F_I4B const& morph = aMorphing[nV];
-            uint8 idx = (uint8)morph.index.dcolor;
-            float fDeform = aShapeDeform[idx];
-            if (fDeform < 0.0f)
-            {
-                ran.vPos = morph.thin * (-fDeform) + ran.vPos * (fDeform + 1);
-            }
-            else if (fDeform > 0.f)
-            {
-                ran.vPos = ran.vPos * (1 - fDeform) + morph.fat * fDeform;
-            }
-        }
-
-        /*if (!g_arrExtMorphStream.empty())
-            ran.vPos += g_arrExtMorphStream[nV];*/
-    #endif
-
-        // Skinning
-        if (pSkinningData)
-        {
-            uint16 indices[4];
-            Vec4 weights;
-            ExtractBoneIndicesAndWeights(indices, weights, pSkinningData->pRemapTable, &aSkinning[nV].indices[0], aSkinning[nV].weights);
-
-            if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_Matrix)
-            {
-                Matrix34 m;
-                BlendMatrices(
-                    m,
-                    ArrayT(pSkinningData->pBoneMatrices, (int)pSkinningData->nNumBones),
-                    indices,
-                    weights);
-                ran <<= m;
-            }
-            else
-            {
-                // Transform the vertex with skinning.
-                DualQuat dq;
-                BlendDualQuats(
-                    dq,
-                    ArrayT(pSkinningData->pBoneQuatsS, (int)pSkinningData->nNumBones),
-                    indices,
-                    weights);
-                ran <<= dq;
-            }
-        }
-    }
-};
-
-float CRenderMesh::GetExtent(EGeomForm eForm)
-{
-    if (eForm == GeomForm_Vertices)
-    {
-        return (float)m_nVerts;
-    }
-    CGeomExtent& ext = m_Extents.Make(eForm);
-    if (!ext)
-    {
-        LockForThreadAccess();
-
-        vtx_idx* pInds = GetIndexPtr(FSL_READ);
-        strided_pointer<Vec3> aPos;
-        aPos.data = (Vec3*)GetPosPtr(aPos.iStride, FSL_READ);
-        if (pInds && aPos.data)
-        {
-            // Iterate chunks to track renderable verts
-            bool* aValidVerts = new bool[m_nVerts];
-            memset(aValidVerts, 0, m_nVerts);
-            TRenderChunkArray& aChunks = !m_ChunksSkinned.empty() ? m_ChunksSkinned : m_Chunks;
-            for (int c = 0; c < aChunks.size(); ++c)
-            {
-                const CRenderChunk& chunk = aChunks[c];
-                if (chunk.pRE && !(chunk.m_nMatFlags & (MTL_FLAG_NODRAW | MTL_FLAG_REQUIRE_FORWARD_RENDERING)))
-                {
-                    assert(uint32(chunk.nFirstVertId + chunk.nNumVerts) <= m_nVerts);
-                    memset(aValidVerts + chunk.nFirstVertId, 1, chunk.nNumVerts);
-                }
-            }
-
-            int nParts = TriMeshPartCount(eForm, GetIndicesCount());
-            ext.ReserveParts(nParts);
-            for (int i = 0; i < nParts; i++)
-            {
-                int aIndices[3];
-                Vec3 aVec[3];
-                for (int v = TriIndices(aIndices, i, eForm) - 1; v >= 0; v--)
-                {
-                    aVec[v] = aPos[ pInds[aIndices[v]] ];
-                }
-                ext.AddPart(aValidVerts[ pInds[aIndices[0]] ] ? max(TriExtent(eForm, aVec), 0.f) : 0.f);
-            }
-            delete[] aValidVerts;
-        }
-
-        UnlockStream(VSF_GENERAL);
-        UnlockIndexStream();
-        UnLockForThreadAccess();
-    }
-    return ext.TotalExtent();
-}
-
-void CRenderMesh::GetRandomPos(PosNorm& ran, EGeomForm eForm, SSkinningData const* pSkinning)
-{
-    LockForThreadAccess();
-
-    SkinnedPosNormData vdata;
-    vdata.aPos.data = (Vec3*)GetPosPtr(vdata.aPos.iStride, FSL_READ);
-    if (vdata.aPos.data)
-    {
-        // Check possible sources for normals.
-#if ENABLE_NORMALSTREAM_SUPPORT
-        if (!GetStridedArray(vdata.aNorm, VSF_NORMALS))
-#endif
-        if (_GetVertexFormat() != eVF_P3S_N4B_C4B_T2S || !GetStridedArray(vdata.aVert, VSF_GENERAL))
-        {
-            if (!GetStridedArray(vdata.aTan2, VSF_TANGENTS))
-            {
-                GetStridedArray(vdata.aQTan, VSF_QTANGENTS);
-            }
-        }
-
-        vtx_idx* pInds = GetIndexPtr(FSL_READ);
-
-        vdata.pSkinningData = pSkinning;
-        if (vdata.pSkinningData)
-        {
-            GetStridedArray(vdata.aSkinning, VSF_HWSKIN_INFO);
-        #if SKIN_MORPHING
-            GetStridedArray(vdata.aMorphing, VSF_HWSKIN_SHAPEDEFORM_INFO);
-        #endif
-        }
-
-        // Choose part.
-        if (eForm == GeomForm_Vertices)
-        {
-            if (m_nInds == 0)
-            {
-                ran.zero();
-            }
-            else
-            {
-                int nIndex = cry_random(0U, m_nInds - 1);
-                vdata.GetPosNorm(ran, pInds[nIndex]);
-            }
-        }
-        else
-        {
-            CGeomExtent const& extent = m_Extents[eForm];
-            if (!extent.NumParts())
-            {
-                ran.zero();
-            }
-            else
-            {
-                int aIndices[3];
-                int nPart = extent.RandomPart();
-                int nVerts = TriIndices(aIndices, nPart, eForm);
-
-                // Extract vertices, blend.
-                PosNorm aRan[3];
-                while (--nVerts >= 0)
-                {
-                    vdata.GetPosNorm(aRan[nVerts], pInds[aIndices[nVerts]]);
-                }
-                TriRandomPos(ran, eForm, aRan, true);
-            }
-        }
-    }
-
-    UnLockForThreadAccess();
-    UnlockStream(VSF_GENERAL);
-    UnlockStream(VSF_QTANGENTS);
-    UnlockStream(VSF_TANGENTS);
-    UnlockStream(VSF_HWSKIN_INFO);
-}
-
-int CRenderChunk::Size() const
-{
-    size_t nSize = sizeof(*this);
-    return static_cast<int>(nSize);
-}
-
-void CRenderMesh::Size(uint32 nFlags, ICrySizer* pSizer) const
-{
-    uint32 i;
-    if (!nFlags)  // System size
-    {
-        for (i = 0; i < VSF_NUM; i++)
-        {
-            if (SMeshStream* pMS = GetVertexStream(i))
-            {
-                if (pMS->m_pUpdateData)
-                {
-                    pSizer->AddObject(pMS->m_pUpdateData, GetStreamSize(i));
-                }
-            }
-        }
-        if (m_IBStream.m_pUpdateData)
-        {
-            pSizer->AddObject(m_IBStream.m_pUpdateData, m_nInds * sizeof(vtx_idx));
-        }
-
-        if (m_pCachePos)
-        {
-            pSizer->AddObject(m_pCachePos, m_nVerts * sizeof(Vec3));
-        }
-    }
-}
-
-size_t CRenderMesh::Size(uint32 nFlags) const
-{
-    size_t nSize = 0;
-    uint32 i;
-    if (nFlags == SIZE_ONLY_SYSTEM) // System size
-    {
-        for (i = 0; i < VSF_NUM; i++)
-        {
-            if (SMeshStream* pMS = GetVertexStream(i))
-            {
-                if (pMS->m_pUpdateData)
-                {
-                    nSize += GetStreamSize(i);
-                }
-            }
-        }
-        if (m_IBStream.m_pUpdateData)
-        {
-            nSize += m_nInds * sizeof(vtx_idx);
-        }
-
-        if (m_pCachePos)
-        {
-            nSize += m_nVerts * sizeof(Vec3);
-        }
-    }
-    if (nFlags & SIZE_VB) // VB size
-    {
-        for (i = 0; i < VSF_NUM; i++)
-        {
-            if (_HasVBStream(i))
-            {
-                nSize += GetStreamSize(i);
-            }
-        }
-    }
-    if (nFlags & SIZE_IB) // IB size
-    {
-        if (_HasIBStream())
-        {
-            nSize += m_nInds * sizeof(vtx_idx);
-        }
-    }
-
-    return nSize;
-}
-
-void CRenderMesh::FreeDeviceBuffers(bool bRestoreSys)
-{
-    uint32 i;
-
-    for (i = 0; i < VSF_NUM; i++)
-    {
-        if (_HasVBStream(i))
-        {
-            if (bRestoreSys)
-            {
-                LockForThreadAccess();
-                void* pSrc = LockVB(i, FSL_READ | FSL_VIDEO);
-                void* pDst = LockVB(i, FSL_SYSTEM_CREATE);
-                cryMemcpy(pDst, pSrc, GetStreamSize(i));
-                UnLockForThreadAccess();
-            }
-            ReleaseVB(i);
-        }
-    }
-
-    if (_HasIBStream())
-    {
-        if (bRestoreSys)
-        {
-            LockForThreadAccess();
-            void* pSrc = LockIB(FSL_READ | FSL_VIDEO);
-            void* pDst = LockIB(FSL_SYSTEM_CREATE);
-            cryMemcpy(pDst, pSrc, m_nInds * sizeof(vtx_idx));
-            UnLockForThreadAccess();
-        }
-        ReleaseIB();
-    }
-}
-
-void CRenderMesh::FreeVB(int nStream)
-{
-    if (SMeshStream* pMS = GetVertexStream(nStream))
-    {
-        if (pMS->m_pUpdateData)
-        {
-            FreeMeshData(pMS->m_pUpdateData);
-            pMS->m_pUpdateData = NULL;
-        }
-    }
-}
-
-void CRenderMesh::FreeIB()
-{
-    if (m_IBStream.m_pUpdateData)
-    {
-        FreeMeshData(m_IBStream.m_pUpdateData);
-        m_IBStream.m_pUpdateData = NULL;
-    }
-}
-
-void CRenderMesh::FreeSystemBuffers()
-{
-    uint32 i;
-
-    for (i = 0; i < VSF_NUM; i++)
-    {
-        FreeVB(i);
-    }
-    FreeIB();
-
-    FreeMeshData(m_pCachePos);
-    m_pCachePos = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMesh::DebugDraw(const struct SGeometryDebugDrawInfo& info, uint32 nVisibleChunksMask, [[maybe_unused]] float fExtrdueScale)
-{    
-    IRenderAuxGeom* pRenderAuxGeom = gEnv->pRenderer->GetIRenderAuxGeom();
-    LockForThreadAccess();
-
-    const Matrix34& mat = info.tm;
-
-    const bool bNoCull = info.bNoCull;
-    const bool bNoLines = info.bNoLines;
-    const bool bExtrude = info.bExtrude;
-
-    SAuxGeomRenderFlags prevRenderFlags = pRenderAuxGeom->GetRenderFlags();
-    SAuxGeomRenderFlags renderFlags = prevRenderFlags;
-    renderFlags.SetDepthWriteFlag(e_DepthWriteOff);
-    if (bNoCull)
-    {
-        renderFlags.SetCullMode(e_CullModeNone);
-    }
-    pRenderAuxGeom->SetRenderFlags(renderFlags);
-
-    const ColorB lineColor = info.lineColor;
-    const ColorB color = info.color;
-
-#ifdef WIN32
-    const unsigned int kMaxBatchSize = 20000;
-    static std::vector<Vec3> s_vertexBuffer;
-    static std::vector<vtx_idx> s_indexBuffer;
-    s_vertexBuffer.reserve(kMaxBatchSize);
-    s_indexBuffer.reserve(kMaxBatchSize * 2);
-    s_vertexBuffer.resize(0);
-    s_indexBuffer.resize(0);
-    uint32 currentIndexBase = 0;
-#endif
-
-    const int32 chunkCount = m_Chunks.size();
-    for (int32 currentChunkIndex = 0; currentChunkIndex < chunkCount; ++currentChunkIndex)
-    {
-        const CRenderChunk* pChunk = &m_Chunks[currentChunkIndex];
-
-        if (pChunk->m_nMatFlags & MTL_FLAG_NODRAW || !pChunk->pRE)
-        {
-            continue;
-        }
-
-        if (!((1 << currentChunkIndex) & nVisibleChunksMask))
-        {
-            continue;
-        }
-
-        int posStride = 1;
-        const byte* pPositions = GetPosPtr(posStride, FSL_READ);
-        const vtx_idx* pIndices = GetIndexPtr(FSL_READ);
-        const uint32 numVertices = GetVerticesCount();
-        const uint32 indexStep = 3;
-        uint32 numIndices = pChunk->nNumIndices;
-
-        // Make sure number of indices is a multiple of 3.
-        uint32 indexRemainder = numIndices % indexStep;
-        if (indexRemainder != 0)
-        {
-            numIndices -= indexRemainder;
-        }
-
-        const uint32 firstIndex = pChunk->nFirstIndexId;
-        const uint32 lastIndex = firstIndex + pChunk->nNumIndices;
-
-        for (uint32 i = firstIndex; i < lastIndex; i += indexStep)
-        {
-            int32 I0 = pIndices[ i ];
-            int32 I1 = pIndices[ i + 1 ];
-            int32 I2 = pIndices[ i + 2 ];
-
-            assert((uint32)I0 < numVertices);
-            assert((uint32)I1 < numVertices);
-            assert((uint32)I2 < numVertices);
-
-            Vec3 v0, v1, v2;
-            v0 = *(Vec3*)&pPositions[ posStride * I0 ];
-            v1 = *(Vec3*)&pPositions[ posStride * I1 ];
-            v2 = *(Vec3*)&pPositions[ posStride * I2 ];
-
-            v0 = mat.TransformPoint(v0);
-            v1 = mat.TransformPoint(v1);
-            v2 = mat.TransformPoint(v2);
-
-            if (bExtrude)
-            {
-                // Push vertices towards the camera to alleviate z-fighting.
-                Vec3 cameraPosition = gEnv->pRenderer->GetCamera().GetPosition();
-                const float VertexToCameraOffsetAmount = 0.02f;
-                v0 = Lerp(v0, cameraPosition, VertexToCameraOffsetAmount);
-                v1 = Lerp(v1, cameraPosition, VertexToCameraOffsetAmount);
-                v2 = Lerp(v2, cameraPosition, VertexToCameraOffsetAmount);
-            }
-
-#ifdef WIN32
-            s_vertexBuffer.push_back(v0);
-            s_vertexBuffer.push_back(v1);
-            s_vertexBuffer.push_back(v2);
-
-            if (!bNoLines)
-            {
-                s_indexBuffer.push_back(currentIndexBase);
-                s_indexBuffer.push_back(currentIndexBase + 1);
-                s_indexBuffer.push_back(currentIndexBase + 1);
-                s_indexBuffer.push_back(currentIndexBase + 2);
-                s_indexBuffer.push_back(currentIndexBase + 2);
-                s_indexBuffer.push_back(currentIndexBase);
-
-                currentIndexBase += indexStep;
-            }
-
-            // Need to limit batch size, because the D3D aux geometry renderer
-            // can only process 32768 vertices and 65536 indices
-            const size_t vertexBufferSize = s_vertexBuffer.size();
-            const bool bOverLimit = vertexBufferSize > kMaxBatchSize;
-            const bool bLastTriangle = (i == (lastIndex - indexStep));
-
-            if (bOverLimit || bLastTriangle)
-            {
-                // Draw all triangles of the chunk in one go for better batching
-                pRenderAuxGeom->DrawTriangles(&s_vertexBuffer[0], s_vertexBuffer.size(), color);
-
-                if (!bNoLines)
-                {
-                    const size_t indexBufferSize = s_indexBuffer.size();
-                    pRenderAuxGeom->DrawLines(&s_vertexBuffer[0], vertexBufferSize, &s_indexBuffer[0], indexBufferSize, lineColor);
-
-                    s_indexBuffer.resize(0);
-                    currentIndexBase = 0;
-                }
-
-                s_vertexBuffer.resize(0);
-            }
-#else
-            pRenderAuxGeom->DrawTriangle(v0, color, v1, color, v2, color);
-
-            if (!bNoLines)
-            {
-                pRenderAuxGeom->DrawLine(v0, lineColor, v1, lineColor);
-                pRenderAuxGeom->DrawLine(v1, lineColor, v2, lineColor);
-                pRenderAuxGeom->DrawLine(v2, lineColor, v0, lineColor);
-            }
-#endif
-        }
-    }
-
-    pRenderAuxGeom->SetRenderFlags(prevRenderFlags);
-    UnLockForThreadAccess();
-}
-
-
-//===========================================================================================================
-void CRenderMesh::PrintMeshLeaks()
-{    
-    AUTO_LOCK(m_sLinkLock);
-    for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-    {
-        CRenderMesh* pRM = iter->item<& CRenderMesh::m_Chain>();
-        Warning("--- CRenderMesh '%s' leak after level unload", (!pRM->m_sSource.empty() ? pRM->m_sSource.c_str() : "NO_NAME"));
-        __debugbreak();
-    }
-}
-
-bool CRenderMesh::ClearStaleMemory(bool bLocked, int threadId)
-{    
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    bool cleared = false;
-    bool bKeepSystem = false;
-    CConditionalLock lock(m_sLinkLock, !bLocked);
-    // Clean up the stale mesh temporary data
-    for (util::list<CRenderMesh>* iter = m_MeshDirtyList[threadId].next, * pos = iter->next; iter != &m_MeshDirtyList[threadId]; iter = pos, pos = pos->next)
-    {
-        CRenderMesh* pRM = iter->item<& CRenderMesh::m_Dirty>(threadId);
-        if (pRM->m_sResLock.TryLock() == false)
-        {
-            continue;
-        }
-        // If the mesh data is still being read, skip it. The stale data will be picked up at a later point
-        if (pRM->m_nThreadAccessCounter)
-        {
-#     if !defined(_RELEASE) && defined(RM_CATCH_EXCESSIVE_LOCKS)
-            if (gEnv->pTimer->GetAsyncTime().GetSeconds() - pRM->m_lockTime > 32.f)
-            {
-                CryError("data lock for mesh '%s:%s' held longer than 32 seconds", (pRM->m_sType ? pRM->m_sType : "unknown"), (pRM->m_sSource ? pRM->m_sSource : "unknown"));
-                if (CRenderer::CV_r_BreakOnError)
-                {
-                    __debugbreak();
-                }
-            }
-#     endif
-            goto dirty_done;
-        }
-
-        bKeepSystem = pRM->m_keepSysMesh;
-
-        if (!bKeepSystem && pRM->m_pCachePos)
-        {
-            FreeMeshData(pRM->m_pCachePos);
-            pRM->m_pCachePos = NULL;
-            cleared = true;
-        }
-
-        // In DX11 we cannot lock device buffers efficiently from the MT,
-        // so we have to keep system copy. On UMA systems we can clear the buffer
-        // and access VRAM directly
-        #if BUFFER_ENABLE_DIRECT_ACCESS && !defined(NULL_RENDERER)
-        if (!bKeepSystem)
-        {
-            for (int i = 0; i < VSF_NUM; i++)
-            {
-                pRM->FreeVB(i);
-            }
-            pRM->FreeIB();
-            cleared = true;
-        }
-        #endif
-
-        // ToDo: only remove this mesh from the dirty list if no stream contains dirty data anymore
-        pRM->m_Dirty[threadId].erase();
-dirty_done:
-        pRM->m_sResLock.Unlock();
-    }
-
-    return cleared;
-}
-
-void CRenderMesh::UpdateModifiedMeshes(bool bLocked, int threadId)
-{    
-    AZ_TRACE_METHOD();
-    FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_RENDERER);
-
-    //
-    // DX12 synchronizes render mesh updates at this point, because we can
-    // batch multiple copies together and potentially forward them off
-    // to a copy command list.
-    //
-#ifdef CRY_USE_DX12
-    const bool bBlock = true;
-#else
-    const bool bBlock = gRenDev->m_pRT->m_eVideoThreadMode != SRenderThread::eVTM_Disabled;
-#endif
-
-    CConditionalLock lock(m_sLinkLock, !bLocked);
-    // Update device buffers on modified meshes
-    for (util::list<CRenderMesh>* iter = m_MeshModifiedList[threadId].next, * pos = iter->next; iter != &m_MeshModifiedList[threadId]; iter = pos, pos = pos->next)
-    {
-        CRenderMesh* pRM = iter->item<& CRenderMesh::m_Modified>(threadId);
-
-#ifdef CRY_USE_DX12
-        pRM->m_sResLock.Lock();
-        const bool bDoUpdate = true;
-#else
-        if (pRM->m_sResLock.TryLock() == false)
-        {
-            continue;
-        }
-        const bool bDoUpdate = !pRM->m_nThreadAccessCounter;
-#endif
-
-        if (bDoUpdate)
-        {
-            if (pRM->SyncAsyncUpdate(gRenDev->m_RP.m_nProcessThreadID, bBlock) == true)
-            {
-                // ToDo :
-                // - mark the mesh to not update itself if depending on how the async update was scheduled
-                // - returns true if no streams need further processing
-                if (pRM->RT_CheckUpdate(pRM, VSM_MASK, false, true))
-                {
-                    pRM->m_Modified[threadId].erase();
-                }
-            }
-        }
-        pRM->m_sResLock.Unlock();
-    }
-}
-
-// Mesh garbage collector
-void CRenderMesh::UpdateModified()
-{    
-    SRenderThread* pRT = gRenDev->m_pRT;
-    ASSERT_IS_RENDER_THREAD(pRT);
-    const int threadId = gRenDev->m_RP.m_nProcessThreadID;
-
-    // Call the update and clear functions with bLocked == true even if the lock
-    // was previously released in the above scope. The resasoning behind this is
-    // that only the renderthread can access the below lists as they are double
-    // buffered. Note: As the Lock/Unlock functions can come from the mainthread
-    // and from any other thread, they still have guarded against contention!
-    // The only exception to this is if we have no render thread, as there is no
-    // double buffering in that case - so always lock.
-
-    UpdateModifiedMeshes(pRT->IsMultithreaded(), threadId);
-}
-
-
-// Mesh garbage collector
-void CRenderMesh::Tick()
-{    
-    ASSERT_IS_RENDER_THREAD(gRenDev->m_pRT)
-    const threadID threadId = gRenDev->m_pRT->IsMultithreaded() ? gRenDev->m_RP.m_nProcessThreadID : threadID(1);
-    int nFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-    // Remove deleted meshes from the list completely
-    bool deleted = false;
-    {
-        AUTO_LOCK(m_sLinkLock);
-        util::list<CRenderMesh>* garbage = &CRenderMesh::m_MeshGarbageList[nFrame & (MAX_RELEASED_MESH_FRAMES - 1)];
-        while (garbage != garbage->prev)
-        {
-            CRenderMesh* pRM = garbage->next->item<& CRenderMesh::m_Chain>();
-            SAFE_DELETE(pRM);
-            deleted = true;
-        }
-    }
-    // If an instance pool is used, try to reclaim any used pages if there are any
-    if (deleted && s_MeshPool.m_MeshInstancePool)
-    {
-        s_MeshPool.m_MeshInstancePool->Cleanup();
-    }
-
-    // Call the clear functions with bLocked == true even if the lock
-    // was previously released in the above scope. The resasoning behind this is
-    // that only the renderthread can access the below lists as they are double
-    // buffered. Note: As the Lock/Unlock functions can come from the mainthread
-    // and from any other thread, they still have guarded against contention!
-
-    ClearStaleMemory(true, threadId);
-}
-
-void CRenderMesh::Initialize()
-{
-    InitializePool();
-}
-
-void CRenderMesh::ShutDown()
-{
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_releaseallresourcesonexit)
-    {
-        AUTO_LOCK(m_sLinkLock);
-        while (&CRenderMesh::m_MeshList != CRenderMesh::m_MeshList.prev)
-        {
-            CRenderMesh* pRM = CRenderMesh::m_MeshList.next->item<& CRenderMesh::m_Chain>();
-            PREFAST_ASSUME(pRM);
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_printmemoryleaks)
-            {
-                float fSize = pRM->Size(SIZE_ONLY_SYSTEM) / 1024.0f / 1024.0f;
-                iLog->Log("Warning: CRenderMesh::ShutDown: RenderMesh leak %s: %0.3fMb", pRM->m_sSource.c_str(), fSize);
-            }
-            SAFE_RELEASE_FORCE(pRM);
-        }
-    }
-    new (&CRenderMesh::m_MeshList) util::list<CRenderMesh>();
-    new (&CRenderMesh::m_MeshGarbageList) util::list<CRenderMesh>();
-    new (&CRenderMesh::m_MeshDirtyList) util::list<CRenderMesh>();
-    new (&CRenderMesh::m_MeshModifiedList) util::list<CRenderMesh>();
-
-    ShutdownPool();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMesh::KeepSysMesh(bool keep)
-{
-    m_keepSysMesh = keep;
-}
-
-void CRenderMesh::UnKeepSysMesh()
-{
-    m_keepSysMesh = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMesh::SetVertexContainer(IRenderMesh* pBuf)
-{
-    if (m_pVertexContainer)
-    {
-        ((CRenderMesh*)m_pVertexContainer)->m_lstVertexContainerUsers.Delete(this);
-    }
-
-    m_pVertexContainer = (CRenderMesh*)pBuf;
-
-    if (m_pVertexContainer && ((CRenderMesh*)m_pVertexContainer)->m_lstVertexContainerUsers.Find(this) < 0)
-    {
-        ((CRenderMesh*)m_pVertexContainer)->m_lstVertexContainerUsers.Add(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMesh::AssignChunk(CRenderChunk* pChunk, CREMeshImpl* pRE)
-{
-    pRE->m_pChunk = pChunk;
-    pRE->m_pRenderMesh = this;
-    pRE->m_nFirstIndexId = pChunk->nFirstIndexId;
-    pRE->m_nNumIndices = pChunk->nNumIndices;
-    pRE->m_nFirstVertId = pChunk->nFirstVertId;
-    pRE->m_nNumVerts = pChunk->nNumVerts;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMesh::InitRenderChunk(CRenderChunk& rChunk)
-{
-    AZ_Assert(rChunk.nNumIndices > 0, "Render chunk must have > 0 indices");
-    AZ_Assert(rChunk.nNumVerts > 0, "Render chunk must have > 0 vertices");
-
-    if (!rChunk.pRE)
-    {
-        rChunk.pRE = (CREMeshImpl*) gRenDev->EF_CreateRE(eDATA_Mesh);
-        rChunk.pRE->m_CustomTexBind[0] = m_nClientTextureBindID;
-    }
-
-    // update chunk RE
-    if (rChunk.pRE)
-    {
-        AssignChunk(&rChunk, (CREMeshImpl*) rChunk.pRE);
-    }
-    AZ_Assert(rChunk.nFirstIndexId + rChunk.nNumIndices <= m_nInds, "First index of the chunk + number of indices for the chunk must be <= the total number of indices for the mesh.");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMesh::SetRenderChunks(CRenderChunk* pInputChunksArray, int nCount, bool bSubObjectChunks)
-{
-    TRenderChunkArray* pChunksArray = &m_Chunks;
-    if (bSubObjectChunks)
-    {
-        pChunksArray = &m_ChunksSubObjects;
-    }
-
-    ReleaseRenderChunks(pChunksArray);
-
-    pChunksArray->resize(nCount);
-    for (int i = 0; i < nCount; i++)
-    {
-        CRenderChunk& rChunk = (*pChunksArray)[i];
-        rChunk = pInputChunksArray[i];
-        InitRenderChunk(rChunk);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderMesh::GarbageCollectSubsetRenderMeshes()
-{
-    uint32 nFrameID = GetCurrentRenderFrameID();
-    m_nLastSubsetGCRenderFrameID = nFrameID;
-    for (MeshSubSetIndices::iterator it = m_meshSubSetIndices.begin(); it != m_meshSubSetIndices.end(); )
-    {
-        IRenderMesh* pRM = it->second;
-        if (abs((int)nFrameID - (int)((CRenderMesh*)pRM)->m_nLastRenderFrameID) > DELETE_SUBSET_MESHES_AFTER_NOTUSED_FRAMES)
-        {
-            // this mesh not relevant anymore.
-            it = m_meshSubSetIndices.erase(it);
-        }
-        else
-        {
-            ++it;
-        }
-    }
-}
-
-volatile int* CRenderMesh::SetAsyncUpdateState()
-{
-    SREC_AUTO_LOCK(m_sResLock);
-    ASSERT_IS_MAIN_THREAD(gRenDev->m_pRT);
-    int threadID = gRenDev->m_RP.m_nFillThreadID;
-    if (m_asyncUpdateStateCounter[threadID] == 0)
-    {
-        m_asyncUpdateStateCounter[threadID] = 1;
-        LockForThreadAccess();
-    }
-    CryInterlockedIncrement(&m_asyncUpdateState[threadID]);
-
-    for (auto& chunk : m_Chunks)
-    {
-        if (chunk.pRE)
-        {
-            chunk.pRE->mfUpdateFlags(FCEF_DIRTY);
-        }
-    }
-
-    return &m_asyncUpdateState[threadID];
-}
-
-bool CRenderMesh::SyncAsyncUpdate(int threadID, bool block)
-{
-    // If this mesh is being asynchronously prepared, wait for the job to finish prior to uploading
-    // the vertices to vram.
-    SREC_AUTO_LOCK(m_sResLock);
-    if (m_asyncUpdateStateCounter[threadID])
-    {
-        {
-            AZ_TRACE_METHOD();
-            FRAME_PROFILER_LEGACYONLY("CRenderMesh::SyncAsyncUpdate() sync", gEnv->pSystem, PROFILE_RENDERER);
-            int iter = 0;
-            while (m_asyncUpdateState[threadID])
-            {
-                if (!block)
-                {
-                    return false;
-                }
-                CrySleep(iter > 10 ? 1 : 0);
-                ++iter;
-            }
-        }
-        UnlockStream(VSF_GENERAL);
-        UnlockStream(VSF_TANGENTS);
-        UnlockStream(VSF_VERTEX_VELOCITY);
-#   if ENABLE_NORMALSTREAM_SUPPORT
-        UnlockStream(VSF_NORMALS);
-#   endif
-        UnlockIndexStream();
-        m_asyncUpdateStateCounter[threadID] = 0;
-        UnLockForThreadAccess();
-    }
-    return true;
-}
-
-void CRenderMesh::CreateRemappedBoneIndicesPair(const uint pairGuid, const TRenderChunkArray& Chunks)
-{
-    SREC_AUTO_LOCK(m_sResLock);
-    // check already created remapped bone indices
-    for (size_t i = 0, end = m_RemappedBoneIndices.size(); i < end; ++i)
-    {
-        if (m_RemappedBoneIndices[i].guid == pairGuid && m_RemappedBoneIndices[i].refcount)
-        {
-            ++m_RemappedBoneIndices[i].refcount;
-            return;
-        }
-    }
-
-    // check already currently in flight remapped bone indices
-    const int threadId = gRenDev->m_RP.m_nFillThreadID;
-    for (size_t i = 0, end = m_CreatedBoneIndices[threadId].size(); i < end; ++i)
-    {
-        if (m_CreatedBoneIndices[threadId][i].guid == pairGuid)
-        {
-            ++m_CreatedBoneIndices[threadId][i].refcount;
-            return;
-        }
-    }
-
-
-    IRenderMesh::ThreadAccessLock access_lock(this);
-
-    int32 stride;
-    vtx_idx* indices = GetIndexPtr(FSL_READ);
-    uint32 vtxCount = GetVerticesCount();
-    std::vector<bool> touched(vtxCount, false);
-    const SVF_W4B_I4S* pIndicesWeights = (SVF_W4B_I4S*)GetHWSkinPtr(stride, FSL_READ);
-    SVF_W4B_I4S* remappedIndices = new SVF_W4B_I4S[vtxCount];
-
-    for (size_t j = 0; j < Chunks.size(); ++j)
-    {
-        const CRenderChunk& chunk = Chunks[j];
-        for (size_t k = chunk.nFirstIndexId; k < chunk.nFirstIndexId + chunk.nNumIndices; ++k)
-        {
-            const vtx_idx vIdx = indices[k];
-            if (touched[vIdx])
-            {
-                continue;
-            }
-            touched[vIdx] = true;
-#if 1
-            for (int l = 0; l < 4; ++l)
-            {
-                remappedIndices[vIdx].weights.bcolor[l] = pIndicesWeights[vIdx].weights.bcolor[l];
-                remappedIndices[vIdx].indices[l] = pIndicesWeights[vIdx].indices[l];
-            }
-#else
-            // Sokov: The code below doesn't look really safe/logical:
-            // 1) Calling CreateRemappedBoneIndicesPair() assumes that bones are used,
-            // so why to check m_bUsesBones here? Do we have cases when some chunks use bones
-            // and some others do not use bones?
-            // 2) There is a risk, that some unaware code uses bones but forgets to
-            // set m_bUsesBones to 'true' so it leads to killing all linking (see '= 0;').
-            if (chunk.m_bUsesBones)
-            {
-                for (int l = 0; l < 4; ++l)
-                {
-                    remappedIndices[vIdx].weights.bcolor[l] = pIndicesWeights[vIdx].weights.bcolor[l];
-                    remappedIndices[vIdx].indices[l] = pIndicesWeights[vIdx].indices[l];
-                }
-            }
-            else
-            {
-                for (int l = 0; l < 4; ++l)
-                {
-                    remappedIndices[vIdx].weights.bcolor[l] = 0;
-                    remappedIndices[vIdx].indices[l] = 0;
-                }
-            }
-#endif
-        }
-    }
-    UnlockStream(VSF_HWSKIN_INFO);
-    UnlockIndexStream();
-
-    m_CreatedBoneIndices[threadId].push_back(SBoneIndexStreamRequest(pairGuid, remappedIndices));
-    RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-}
-
-
-void CRenderMesh::CreateRemappedBoneIndicesPair(const DynArray<JointIdType>& arrRemapTable, const uint pairGuid)
-{
-    SREC_AUTO_LOCK(m_sResLock);
-    // check already created remapped bone indices
-    for (size_t i = 0, end = m_RemappedBoneIndices.size(); i < end; ++i)
-    {
-        if (m_RemappedBoneIndices[i].guid == pairGuid && m_RemappedBoneIndices[i].refcount)
-        {
-            ++m_RemappedBoneIndices[i].refcount;
-            return;
-        }
-    }
-
-    // check already currently in flight remapped bone indices
-    const int threadId = gRenDev->m_RP.m_nFillThreadID;
-    for (size_t i = 0, end = m_CreatedBoneIndices[threadId].size(); i < end; ++i)
-    {
-        if (m_CreatedBoneIndices[threadId][i].guid == pairGuid)
-        {
-            ++m_CreatedBoneIndices[threadId][i].refcount;
-            return;
-        }
-    }
-
-    IRenderMesh::ThreadAccessLock access_lock(this);
-
-    int32 stride;
-    vtx_idx* const indices = GetIndexPtr(FSL_READ);
-    uint32 vtxCount = GetVerticesCount();
-    std::vector<bool> touched(vtxCount, false);
-    const SVF_W4B_I4S* pIndicesWeights = (const SVF_W4B_I4S*)GetHWSkinPtr(stride, FSL_READ);
-    SVF_W4B_I4S* remappedIndices = new SVF_W4B_I4S[vtxCount];
-
-    for (size_t j = 0; j < m_Chunks.size(); ++j)
-    {
-        const CRenderChunk& chunk = m_Chunks[j];
-        for (size_t k = chunk.nFirstIndexId; k < chunk.nFirstIndexId + chunk.nNumIndices; ++k)
-        {
-            const vtx_idx vIdx = indices[k];
-            if (touched[vIdx])
-            {
-                continue;
-            }
-            touched[vIdx] = true;
-#if 1
-            for (int l = 0; l < 4; ++l)
-            {
-                remappedIndices[vIdx].weights.bcolor[l] = pIndicesWeights[vIdx].weights.bcolor[l];
-                remappedIndices[vIdx].indices[l] = arrRemapTable[pIndicesWeights[vIdx].indices[l]];
-            }
-#else
-            // Sokov: The code below doesn't look really safe/logical:
-            // 1) Calling CreateRemappedBoneIndicesPair() assumes that bones are used,
-            // so why to check m_bUsesBones here? Do we have cases when some chunks use bones
-            // and some others do not use bones?
-            // 2) There is a risk, that some unaware code uses bones but forgets to
-            // set m_bUsesBones to 'true' so it leads to killing all linking (see '= 0;').
-            if (chunk.m_bUsesBones)
-            {
-                for (int l = 0; l < 4; ++l)
-                {
-                    remappedIndices[vIdx].weights.bcolor[l] = pIndicesWeights[vIdx].weights.bcolor[l];
-                    remappedIndices[vIdx].indices[l] = arrRemapTable[pIndicesWeights[vIdx].indices[l]];
-                }
-            }
-            else
-            {
-                for (int l = 0; l < 4; ++l)
-                {
-                    remappedIndices[vIdx].weights.bcolor[l] = 0;
-                    remappedIndices[vIdx].indices[l] = 0;
-                }
-            }
-#endif
-        }
-    }
-    UnlockStream(VSF_HWSKIN_INFO);
-    UnlockIndexStream();
-
-    m_CreatedBoneIndices[threadId].push_back(SBoneIndexStreamRequest(pairGuid, remappedIndices));
-    RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-}
-
-void CRenderMesh::ReleaseRemappedBoneIndicesPair(const uint pairGuid)
-{
-    if (gRenDev->m_pRT->IsMultithreaded() && gRenDev->m_pRT->IsMainThread(true))
-    {
-        gRenDev->m_pRT->RC_ReleaseRemappedBoneIndices(this, pairGuid);
-        return;
-    }
-
-    SREC_AUTO_LOCK(m_sResLock);
-    size_t deleted = ~0u;
-    const int threadId = gRenDev->m_RP.m_nProcessThreadID;
-    bool bFound = false;
-
-    for (size_t i = 0, end = m_RemappedBoneIndices.size(); i < end; ++i)
-    {
-        if (m_RemappedBoneIndices[i].guid == pairGuid)
-        {
-            bFound = true;
-            if (--m_RemappedBoneIndices[i].refcount == 0)
-            {
-                deleted = i;
-                break;
-            }
-        }
-    }
-
-    if (deleted != ~0u)
-    {
-        m_DeletedBoneIndices[threadId].push_back(pairGuid);
-        RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-    }
-
-    // Check for created but not yet remapped bone indices
-    if (!bFound)
-    {
-        for (size_t i = 0, end = m_CreatedBoneIndices[threadId].size(); i < end; ++i)
-        {
-            if (m_CreatedBoneIndices[threadId][i].guid == pairGuid)
-            {
-                bFound = true;
-                if (--m_CreatedBoneIndices[threadId][i].refcount == 0)
-                {
-                    deleted = i;
-                    break;
-                }
-            }
-        }
-
-        if (deleted != ~0u)
-        {
-            m_DeletedBoneIndices[threadId].push_back(pairGuid);
-            RelinkTail(m_Modified[threadId], m_MeshModifiedList[threadId], threadId);
-        }
-    }
-}
-// Notes: Cry's LockForThreadAccess is not locking anything here, it only increments m_nThreadAccessCounter but m_nThreadAccessCounter is not used to block multithreading access to CRenderMesh
-// This is dangerous as the name of function suggests a lock but it actually doesn't lock. There might be quite a few misuse of this function and as the result the data is not protected in multithread.
-// The system needs a deeper overhauling later. 
-void CRenderMesh::LockForThreadAccess()
-{
-    ++m_nThreadAccessCounter;
-
-# if !defined(_RELEASE) && defined(RM_CATCH_EXCESSIVE_LOCKS)
-    m_lockTime = (m_lockTime > 0.f) ? m_lockTime : gEnv->pTimer->GetAsyncTime().GetSeconds();
-# endif
-}
-void CRenderMesh::UnLockForThreadAccess()
-{
-    --m_nThreadAccessCounter;
-    if (m_nThreadAccessCounter < 0)
-    {
-        __debugbreak(); // if this triggers, a mismatch betweend rendermesh thread access lock/unlock has occured
-    }
-# if !defined(_RELEASE) && defined(RM_CATCH_EXCESSIVE_LOCKS)
-    m_lockTime = 0.f;
-# endif
-}
-void CRenderMesh::GetPoolStats(SMeshPoolStatistics* stats)
-{
-    memcpy(stats, &s_MeshPool.m_MeshDataPoolStats, sizeof(SMeshPoolStatistics));
-}
-
-void* CRenderMesh::operator new(size_t size)
-{
-    return AllocateMeshInstanceData(size, alignof(CRenderMesh));
-}
-
-void CRenderMesh::operator delete(void* ptr)
-{
-    FreeMeshInstanceData(ptr);
-}
-
-#if !defined(NULL_RENDERER)
-D3DBuffer* CRenderMesh::_GetD3DVB(int nStream, size_t* offs) const
-{
-    if (SMeshStream* pMS = GetVertexStream(nStream))
-    {
-        IF (pMS->m_nID != ~0u, 1)
-        {
-            return gRenDev->m_DevBufMan.GetD3D(pMS->m_nID, offs);
-        }
-    }
-    return NULL;
-}
-
-D3DBuffer* CRenderMesh::_GetD3DIB(size_t* offs) const
-{
-    IF (m_IBStream.m_nID != ~0u, 1)
-    {
-        return gRenDev->m_DevBufMan.GetD3D(m_IBStream.m_nID, offs);
-    }
-    return NULL;
-}
-#endif
-
-
-void CRenderMesh::BindStreamsToRenderPipeline()
-{
-#if !defined(NULL_RENDERER)
-    CRenderMesh *pRenderMesh = this;
-
-    HRESULT h;
-    CD3D9Renderer *rd = (CD3D9Renderer*)gRenDev;
-    CRenderMesh *pRM = pRenderMesh->_GetVertexContainer();
-    void* pIB = NULL;
-    size_t nOffs = 0;
-
-    size_t streamStride[VSF_NUM] = { 0 };
-    size_t offset[VSF_NUM] = { 0 };
-    const void *pVB[VSF_NUM] = { NULL };
-
-    pIB = rd->m_DevBufMan.GetD3D(pRenderMesh->GetIBStream(), &nOffs);
-    pVB[0] = rd->m_DevBufMan.GetD3D(pRM->GetVBStream(VSF_GENERAL), &offset[0]);
-    h = rd->FX_SetVStream(0, pVB[0], offset[0], pRM->GetStreamStride(VSF_GENERAL));
-
-    for (int i = 1, mask = 1 << 1; i < VSF_NUM; ++i, mask <<= 1)
-    {
-        if (rd->m_RP.m_FlagsStreams_Stream & (mask) && pRM->_HasVBStream(i))
-        {
-            streamStride[i] = pRM->GetStreamStride(i);
-            pVB[i] = rd->m_DevBufMan.GetD3D(pRM->GetVBStream(i), &offset[i]);
-        }
-    }
-
-    for (int i = 1, mask = 1 << 1; i < VSF_NUM; ++i, mask <<= 1)
-    {
-        if (rd->m_RP.m_FlagsStreams_Stream & (mask) && pVB[i])
-        {
-            rd->m_RP.m_PersFlags1 |= RBPF1_USESTREAM << i;
-            h = rd->FX_SetVStream(i, pVB[i], offset[i], streamStride[i]);
-        }
-        else if (rd->m_RP.m_PersFlags1 & (RBPF1_USESTREAM << i))
-        {
-            rd->m_RP.m_PersFlags1 &= ~(RBPF1_USESTREAM << i);
-            h = rd->FX_SetVStream(i, NULL, 0, 0);
-        }
-    }
-
-#ifdef MESH_TESSELLATION_RENDERER
-    if (CHWShader_D3D::s_pCurInstHS && pRenderMesh->m_adjBuffer.GetShaderResourceView())
-    {
-        // This buffer contains texture coordinates for triangle itself and its neighbors, in total 12 texture coordinates per triangle.
-        D3DShaderResourceView* SRVs[] = { pRenderMesh->m_adjBuffer.GetShaderResourceView() };
-        gcpRendD3D->GetDeviceContext().DSSetShaderResources(15, 1, SRVs);
-    }
-#endif
-
-    // 8 weights skinning. setting the last 4 weights
-    if (pRenderMesh->m_extraBonesBuffer.GetShaderResourceView())
-    {
-        D3DShaderResourceView* SRVs[] = { pRenderMesh->m_extraBonesBuffer.GetShaderResourceView() };
-        gcpRendD3D->GetDeviceContext().VSSetShaderResources(14, 1, SRVs);
-    }
-
-    assert(pIB);
-    h = rd->FX_SetIStream(pIB, nOffs, (sizeof(vtx_idx) == 2 ? Index16 : Index32));
-
-#endif //if !defined(NULL_RENDERER)
-}
-
-bool CRenderMesh::GetRemappedSkinningData([[maybe_unused]] uint32 guid, [[maybe_unused]] CRendElementBase::SGeometryStreamInfo &streamInfo)
-{
-#if !defined(NULL_RENDERER)
-    size_t offset = 0;
-    const void *pVB = 0;
-
-    for (size_t i = 0, end = m_RemappedBoneIndices.size(); i < end; ++i)
-    {
-        CRenderMesh::SBoneIndexStream &stream = m_RemappedBoneIndices[i];
-        if (stream.guid != guid)
-            continue;
-        if (stream.buffer != ~0u)
-        {
-            pVB = gRenDev->m_DevBufMan.GetD3D(stream.buffer, &offset);
-            streamInfo.nOffset = offset;
-            streamInfo.nStride = GetStreamStride(VSF_HWSKIN_INFO);
-            streamInfo.pStream = pVB;
-            return true;
-        }
-    }
-#endif //if !defined(NULL_RENDERER)
-    return m_RemappedBoneIndices.size() == 0u;
-}
-
-bool CRenderMesh::FillGeometryInfo([[maybe_unused]] CRendElementBase::SGeometryInfo &geom)
-{
-#if !defined(NULL_RENDERER)
-
-    CRenderMesh *pRenderMeshForVertices = _GetVertexContainer();
-    size_t nOffs = 0;
-
-    if (!_HasIBStream())
-        return false;
-
-    if (!pRenderMeshForVertices->CanRender())
-        return false;
-
-    geom.indexStream.pStream = gRenDev->m_DevBufMan.GetD3D(GetIBStream(), &nOffs);
-    geom.indexStream.nOffset = nOffs;
-    geom.indexStream.nStride = (sizeof(vtx_idx) == 2 ? Index16 : Index32);
-    geom.streamMask = 0;
-    geom.nMaxVertexStreams = 0;
-    for (int nStream = 0; nStream < VSF_NUM; ++nStream)
-    {
-        if (pRenderMeshForVertices->_HasVBStream(nStream))
-        {
-            nOffs = 0;
-            geom.vertexStream[nStream].pStream = gRenDev->m_DevBufMan.GetD3D(pRenderMeshForVertices->GetVBStream(nStream), &nOffs);
-            geom.vertexStream[nStream].nOffset = nOffs;
-            geom.vertexStream[nStream].nStride = pRenderMeshForVertices->GetStreamStride(nStream);
-
-            if (geom.vertexStream[nStream].pStream)
-            {
-                geom.nMaxVertexStreams = nStream + 1;
-            }
-
-            //geom.streamMask |= 1 << nStream;
-        }
-        else
-        {
-            geom.vertexStream[nStream].pStream = 0;
-            geom.vertexStream[nStream].nOffset = 0;
-            geom.vertexStream[nStream].nStride = 0;
-        }
-    }
-
-    if (m_RemappedBoneIndices.size() > 0)
-    {
-        if (GetRemappedSkinningData(geom.bonesRemapGUID, geom.vertexStream[VSF_HWSKIN_INFO]))
-        {
-            if (geom.nMaxVertexStreams <= VSF_HWSKIN_INFO)
-            {
-                geom.nMaxVertexStreams = VSF_HWSKIN_INFO + 1;
-            }
-        }
-    }
-
-    geom.pSkinningExtraBonesBuffer = &m_extraBonesBuffer;
-
-#ifdef MESH_TESSELLATION_RENDERER
-    geom.pTessellationAdjacencyBuffer = &m_adjBuffer;
-#else
-    geom.pTessellationAdjacencyBuffer = nullptr;
-#endif
-
-#endif //if !defined(NULL_RENDERER)
-
-    return true;
-}
-
-CThreadSafeRendererContainer<CRenderMesh*> CRenderMesh::m_deferredSubsetGarbageCollection[RT_COMMAND_BUF_COUNT];
-CThreadSafeRendererContainer<SMeshSubSetIndicesJobEntry> CRenderMesh::m_meshSubSetRenderMeshJobs[RT_COMMAND_BUF_COUNT];
-
-
-#if RENDERMESH_CPP_TRAIT_BUFFER_ENABLE_DIRECT_ACCESS || defined(CRY_USE_DX12)
-    #ifdef BUFFER_ENABLE_DIRECT_ACCESS
-        #undef BUFFER_ENABLE_DIRECT_ACCESS
-        #define BUFFER_ENABLE_DIRECT_ACCESS 1
-    #endif
-#endif
-
diff --git a/Code/CryEngine/RenderDll/Common/RenderMesh.h b/Code/CryEngine/RenderDll/Common/RenderMesh.h
deleted file mode 100644
index 2a5f6a1938..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderMesh.h
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __RENDERMESH_H__
-#define __RENDERMESH_H__
-
-#include <intrusive_list.hpp>
-#include <CryPool/PoolAlloc.h>
-#include <VectorMap.h>
-#include <VectorSet.h>
-#include <GeomQuery.h>
-#include "Shaders/Vertex.h"
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-// Enable the below to get fatal error is some holds a rendermesh buffer lock for longer than 1 second
-//#define RM_CATCH_EXCESSIVE_LOCKS
-
-#define DELETE_SUBSET_MESHES_AFTER_NOTUSED_FRAMES 30
-
-struct SMeshSubSetIndicesJobEntry
-{
-    AZ::LegacyJobExecutor jobExecutor;
-    _smart_ptr<IRenderMesh> m_pSrcRM;                           // source mesh to create a new index mesh from
-    _smart_ptr<IRenderMesh> m_pIndexRM;                     // when finished: newly created index mesh for this mask, else NULL
-    uint64 m_nMeshSubSetMask;                       // mask to use
-
-    void CreateSubSetRenderMesh();
-};
-
-class RenderMesh_hash_int32
-{
-public:
-    ILINE size_t operator()(int32 key) const
-    {
-        return stl::hash_uint32()((uint32)key);
-    }
-};
-
-struct SBufInfoTable
-{
-    int OffsTC;
-    int OffsColor;
-    int OffsNorm;
-};
-
-struct SMeshStream
-{
-    buffer_handle_t m_nID; // device buffer handle from device buffer manager
-    void* m_pUpdateData;   // system buffer for updating (used for async. mesh updates)
-    void* m_pLockedData;   // locked device buffer data (hmm, not a good idea to store)
-    uint32 m_nLockFlags : 16;
-    uint32 m_nLockCount : 16;
-    uint32 m_nElements;
-    int32  m_nFrameAccess;
-    int32  m_nFrameRequest;
-    int32  m_nFrameUpdate;
-    int32  m_nFrameCreate;
-
-    SMeshStream()
-    {
-        m_nID = ~0u;
-        m_pUpdateData = NULL;
-        m_pLockedData = NULL;
-        m_nFrameRequest = 0;
-        m_nFrameUpdate = -1;
-        m_nFrameAccess = -1;
-        m_nFrameCreate = -1;
-        m_nLockFlags = 0;
-        m_nLockCount = 0;
-        m_nElements = 0;
-    }
-
-    ~SMeshStream() { memset(this, 0x0, sizeof(*this)); }
-};
-
-// CRenderMesh::m_nFlags
-#define FRM_RELEASED 1
-#define FRM_DEPRECTATED_FLAG 2
-#define FRM_READYTOUPLOAD 4
-#define FRM_ALLOCFAILURE 8
-#define FRM_SKINNED 0x10
-#define FRM_SKINNEDNEXTDRAW 0x20 // no proper support yet for objects that can be skinned and not skinned.
-#define FRM_ENABLE_NORMALSTREAM 0x40
-
-#define MAX_RELEASED_MESH_FRAMES (2)
-
-struct SSetMeshIntData
-{
-    CMesh* m_pMesh;
-    char* m_pVBuff;
-    SPipTangents* m_pTBuff;
-    SPipQTangents* m_pQTBuff;
-    SVF_P3F* m_pVelocities;
-    uint32 m_nVerts;
-    uint32 m_nInds;
-    vtx_idx* m_pInds;
-    uint32 m_flags;
-    Vec3* m_pNormalsBuff;
-};
-
-
-class CRenderMesh
-    : public IRenderMesh
-{
-    friend class CREMeshImpl;
-
-public:
-
-    static void ClearJobResources();
-
-private:
-    friend class CD3D9Renderer;
-
-    SMeshStream  m_IBStream;
-    SMeshStream* m_VBStream[VSF_NUM];
-    struct SBoneIndexStream
-    {
-        buffer_handle_t buffer;
-        uint32 guid;
-        uint32 refcount;
-    };
-
-    struct SBoneIndexStreamRequest
-    {
-        SBoneIndexStreamRequest(uint32 _guid, SVF_W4B_I4S* _pStream)
-            : pStream(_pStream)
-            , guid(_guid)
-            , refcount(1) {}
-
-        SVF_W4B_I4S* pStream;
-        uint32 guid;
-        uint32 refcount;
-    };
-
-    std::vector<SBoneIndexStream> m_RemappedBoneIndices;
-    std::vector< SBoneIndexStreamRequest > m_CreatedBoneIndices[2];
-    std::vector< uint32 > m_DeletedBoneIndices[2];
-
-    uint32 m_nInds;
-    uint32 m_nVerts;
-    int   m_nRefCounter;
-    AZ::Vertex::Format m_vertexFormat;          // Base stream vertex format (optional streams are hardcoded: VSF_)
-
-    Vec3* m_pCachePos;       // float positions (cached)
-    int   m_nFrameRequestCachePos;
-
-    std::vector<Vec2*> m_UVCache;         // float UVs (cached)
-    int   m_nFrameRequestCacheUVs;
-
-    CRenderMesh* m_pVertexContainer;
-    PodArray<CRenderMesh*>  m_lstVertexContainerUsers;
-
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-    typedef AZStd::unordered_map<int, PodArray< std::pair<int, int> >, RenderMesh_hash_int32> TrisMap;
-    TrisMap* m_pTrisMap;
-#endif
-
-    SRecursiveSpinLock m_sResLock;
-
-    AZStd::atomic<int> m_nThreadAccessCounter;// counter to ensure that no system rendermesh streams are freed since they are in use
-    volatile int m_asyncUpdateState[2];
-    int m_asyncUpdateStateCounter[2];
-
-    eRenderPrimitiveType m_nPrimetiveType           : 8;
-    ERenderMeshType m_eType                   : 4;
-    uint16 m_nFlags                                                     : 8;          // FRM_
-    int16  m_nLod                             : 4;        // used for LOD debug visualization
-    bool m_keepSysMesh                        : 1;
-    bool m_nFlagsCachePos                     : 1;        // only checked for FSL_WRITE, which can be represented as a single bit
-    bool m_nFlagsCacheUVs                                           : 1;
-
-
-
-public:
-    enum ESizeUsageArg
-    {
-        SIZE_ONLY_SYSTEM = 0,
-        SIZE_VB = 1,
-        SIZE_IB = 2,
-    };
-
-private:
-    SMeshStream* GetVertexStream(int nStream, uint32 nFlags = 0);
-    SMeshStream* GetVertexStream(int nStream, [[maybe_unused]] uint32 nFlags = 0) const { return m_VBStream[nStream]; }
-    bool UpdateVidIndices(SMeshStream& IBStream, bool stall = true);
-
-    bool CreateVidVertices(int nStream = VSF_GENERAL);
-    bool UpdateVidVertices(int nStream, bool stall = true);
-
-    bool CopyStreamToSystemForUpdate(SMeshStream& MS, size_t nSize);
-
-    void ReleaseVB(int nStream);
-    void ReleaseIB();
-
-    void InitTriHash(_smart_ptr<IMaterial> pMaterial);
-
-    bool CreateCachePos(byte* pSrc, uint32 nStrideSrc, uint32 nFlags);
-    bool PrepareCachePos();
-    bool CreateUVCache(byte* pSrc, uint32 nStrideSrc, uint32 nFlags, uint32 uvSetIndex);
-
-    //Internal versions of funcs - no lock
-    bool UpdateVertices_Int(const void* pVertBuffer, int nVertCount, int nOffset, int nStream, uint32 copyFlags);
-    bool UpdateIndices_Int(const vtx_idx* pNewInds, int nInds, int nOffsInd, uint32 copyFlags);
-    size_t SetMesh_Int(CMesh& mesh, int nSecColorsSetOffset, uint32 flags);
-
-#ifdef MESH_TESSELLATION_RENDERER
-    template<class VecPos, class VecUV>
-    bool UpdateUVCoordsAdjacency(SMeshStream& IBStream, const AZ::Vertex::Format& vertexFormat);
-
-    template<class VecPos, class VecUV>
-    static void BuildAdjacency(const byte* pVerts, const AZ::Vertex::Format& vertexFormat, uint nVerts, const vtx_idx* pIndexBuffer, uint nTrgs, std::vector<VecUV>& pTxtAdjBuffer);
-#endif
-
-    void Cleanup();
-
-public:
-
-    void AddShadowPassMergedChunkIndicesAndVertices(CRenderChunk* pCurrentChunk, _smart_ptr<IMaterial> pMaterial, int& rNumVertices, int& rNumIndices);
-    static bool RenderChunkMergeAbleInShadowPass(CRenderChunk* pPreviousChunk, CRenderChunk* pCurrentChunk, _smart_ptr<IMaterial> pMaterial);
-
-    inline void PrefetchVertexStreams() const
-    {
-        for (int i = 0; i < VSF_NUM; CryPrefetch(m_VBStream[i++]))
-        {
-            ;
-        }
-    }
-
-    void SetMesh_IntImpl(SSetMeshIntData data);
-
-    //! constructor
-    //! /param szSource this pointer is stored - make sure the memory stays
-    CRenderMesh(const char* szType, const char* szSourceName, bool bLock = false);
-    CRenderMesh();
-
-    //! destructor
-    ~CRenderMesh();
-
-    virtual bool CanRender(){return (m_nFlags & FRM_ALLOCFAILURE) == 0; }
-
-    virtual void AddRef()
-    {
-#   if !defined(_RELEASE)
-        if (m_nFlags & FRM_RELEASED)
-        {
-            CryFatalError("CRenderMesh::AddRef() mesh already in the garbage list (resurrecting deleted mesh)");
-        }
-#   endif
-        CryInterlockedIncrement(&m_nRefCounter);
-    }
-    virtual int Release();
-    void ReleaseForce()
-    {
-        while (true)
-        {
-            int nRef = Release();
-            if (nRef <= 0)
-            {
-                return;
-            }
-        }
-    }
-
-    // ----------------------------------------------------------------
-    // Helper functions
-   _inline int GetStreamStride(int nStream) const override
-    {
-        if (nStream == VSF_GENERAL)
-        {
-            return m_vertexFormat.GetStride();
-        }
-        else
-        {
-            return m_cSizeStream[nStream];
-        }
-    }
-
-    _inline uint32 _GetFlags() const { return m_nFlags; }
-    _inline int GetStreamSize(int nStream, int nVerts = 0) const { return GetStreamStride(nStream) * (nVerts ? nVerts : m_nVerts); }
-    _inline const buffer_handle_t GetVBStream(int nStream) const
-    {
-        if (!m_VBStream[nStream])
-        {
-            return ~0u;
-        }
-        return m_VBStream[nStream]->m_nID;
-    }
-    _inline const buffer_handle_t GetIBStream() const { return m_IBStream.m_nID; }
-    _inline bool _HasVBStream(int nStream) const { return m_VBStream[nStream] && m_VBStream[nStream]->m_nID != ~0u; }
-    _inline bool _HasIBStream() const { return m_IBStream.m_nID != ~0u; }
-    _inline int _IsVBStreamLocked(int nStream) const
-    {
-        if (!m_VBStream[nStream])
-        {
-            return 0;
-        }
-        return (m_VBStream[nStream]->m_nLockFlags & FSL_LOCKED);
-    }
-    _inline int _IsIBStreamLocked() const { return m_IBStream.m_nLockFlags & FSL_LOCKED; }
-    _inline AZ::Vertex::Format _GetVertexFormat() const { return m_vertexFormat; }
-    _inline void _SetVertexFormat(const AZ::Vertex::Format& vertexFormat) { m_vertexFormat = vertexFormat; }
-    _inline int GetNumVerts() const override { return m_nVerts; }
-    _inline void _SetNumVerts(int nVerts) { m_nVerts = max(nVerts, 0); }
-    _inline int GetNumInds() const override { return m_nInds; }
-    _inline void _SetNumInds(int nInds) { m_nInds = nInds; }
-    _inline const eRenderPrimitiveType GetPrimitiveType() const override { return m_nPrimetiveType; }
-    _inline void _SetPrimitiveType(const eRenderPrimitiveType nPrimType) { m_nPrimetiveType = nPrimType; }
-    _inline void _SetRenderMeshType(ERenderMeshType eType) { m_eType = eType; }
-    _inline CRenderMesh* _GetVertexContainer()
-    {
-        if (m_pVertexContainer)
-        {
-            return m_pVertexContainer;
-        }
-        return this;
-    }
-#  if !defined(NULL_RENDERER)
-    D3DBuffer* _GetD3DVB(int nStream, size_t* offs) const;
-    D3DBuffer* _GetD3DIB(size_t* offs) const;
-# endif
-
-    size_t Size(uint32 nFlags) const;
-    void Size(uint32 nFlags, ICrySizer* pSizer) const;
-
-    void* LockVB(int nStream, uint32 nFlags, int nVerts = 0, int* nStride = NULL, bool prefetchIB = false, bool inplaceCachePos = false);
-
-    template<class T>
-    T* GetStridedArray(strided_pointer<T>& arr, EStreamIDs stream)
-    {
-        arr.data = (T*)LockVB(stream, FSL_READ, 0, &arr.iStride);
-        assert(!arr.data || arr.iStride >= sizeof(T));
-        return arr.data;
-    }
-
-    vtx_idx* LockIB(uint32 nFlags, int nOffset = 0, int nInds = 0);
-    void UnlockVB(int nStream);
-    void UnlockIB();
-
-    bool RT_CheckUpdate(CRenderMesh* pVContainer, uint32 nStreamMask, bool bTessellation = false, bool stall = true);
-    void RT_SetMeshCleanup();
-    void RT_AllocationFailure(const char* sPurpose, uint32 nSize);
-    bool CheckUpdate(uint32 nStreamMask) override;
-    void AssignChunk(CRenderChunk * pChunk, class CREMeshImpl * pRE);
-    void InitRenderChunk(CRenderChunk& rChunk);
-
-    void FreeVB(int nStream);
-    void FreeIB();
-    void FreeDeviceBuffers(bool bRestoreSys);
-    void FreeSystemBuffers();
-    void FreePreallocatedData();
-
-    bool SyncAsyncUpdate(int threadId, bool block = true);
-
-    //===========================================================================================
-    // IRenderMesh interface
-    virtual const char* GetTypeName()   { return m_sType; }
-    virtual const char* GetSourceName() const { return m_sSource; }
-
-    virtual int  GetIndicesCount()  { return m_nInds; }
-    virtual int  GetVerticesCount() { return m_nVerts; }
-
-    virtual AZ::Vertex::Format GetVertexFormat() { return m_vertexFormat; }
-    virtual ERenderMeshType GetMeshType() { return m_eType; }
-
-    virtual void SetSkinned(bool bSkinned = true) override
-    {
-        if (bSkinned)
-        {
-            m_nFlags |=  FRM_SKINNED;
-        }
-        else
-        {
-            m_nFlags &= ~FRM_SKINNED;
-        }
-    };
-    virtual uint GetSkinningWeightCount() const override;
-
-    virtual float GetGeometricMeanFaceArea() const{ return m_fGeometricMeanFaceArea; }
-
-    virtual void NextDrawSkinned() { m_nFlags |= FRM_SKINNEDNEXTDRAW; }
-
-    virtual void GenerateQTangents();
-    virtual void CreateChunksSkinned();
-    virtual void CopyTo(IRenderMesh* pDst, int nAppendVtx = 0, bool bDynamic = false, bool fullCopy = true);
-    virtual void SetSkinningDataVegetation(struct SMeshBoneMapping_uint8* pBoneMapping);
-    virtual void SetSkinningDataCharacter(CMesh& mesh, struct SMeshBoneMapping_uint16* pBoneMapping, struct SMeshBoneMapping_uint16* pExtraBoneMapping);
-    // Creates an indexed mesh from this render mesh (accepts an optional pointer to an IIndexedMesh object that should be used)
-    virtual IIndexedMesh* GetIndexedMesh(IIndexedMesh* pIdxMesh = 0);
-    virtual int GetRenderChunksCount(_smart_ptr<IMaterial> pMat, int& nRenderTrisCount);
-
-    virtual IRenderMesh* GenerateMorphWeights() { return NULL; }
-    virtual IRenderMesh* GetMorphBuddy() { return NULL; }
-    virtual void SetMorphBuddy([[maybe_unused]] IRenderMesh* pMorph) {}
-
-    // Create render buffers from render mesh. Returns the final size of the render mesh or ~0U on failure
-    virtual size_t SetMesh(CMesh& mesh, int nSecColorsSetOffset, uint32 flags, bool requiresLock);
-
-    // Update system vertices buffer
-    virtual bool UpdateVertices(const void* pVertBuffer, int nVertCount, int nOffset, int nStream, uint32 copyFlags, bool requiresLock = true);
-    // Update system indices buffer
-    virtual bool UpdateIndices(const vtx_idx* pNewInds, int nInds, int nOffsInd, uint32 copyFlags, bool requiresLock = true);
-
-    virtual void SetCustomTexID(int nCustomTID);
-    virtual void SetChunk(int nIndex, CRenderChunk& chunk);
-    virtual void SetChunk(_smart_ptr<IMaterial> pNewMat, int nFirstVertId, int nVertCount, int nFirstIndexId, int nIndexCount, float texelAreaDensity, const AZ::Vertex::Format& vertexFormat, int nMatID = 0);
-
-    virtual void SetRenderChunks(CRenderChunk* pChunksArray, int nCount, bool bSubObjectChunks);
-
-    virtual TRenderChunkArray& GetChunks() { return m_Chunks; }
-    virtual TRenderChunkArray& GetChunksSkinned() { return m_ChunksSkinned; }
-    virtual TRenderChunkArray& GetChunksSubObjects() { return m_ChunksSubObjects; }
-    virtual IRenderMesh* GetVertexContainer() { return _GetVertexContainer(); }
-    virtual void SetVertexContainer(IRenderMesh* pBuf);
-
-    virtual void Render(const struct SRendParams& rParams, CRenderObject* pObj, _smart_ptr<IMaterial> pMaterial, const SRenderingPassInfo& passInfo, bool bSkinned = false);
-    virtual void Render(CRenderObject* pObj, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-    virtual void AddRenderElements(_smart_ptr<IMaterial> pIMatInfo, CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nSortId = EFSLIST_GENERAL, int nAW = 1);
-    virtual void SetREUserData(float* pfCustomData, float fFogScale = 0, float fAlpha = 1);
-    virtual void AddRE(_smart_ptr<IMaterial> pMaterial, CRenderObject* pObj, IShader* pEf, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter);
-
-    virtual void DrawImmediately();
-
-    virtual byte* GetPosPtrNoCache(int32& nStride, uint32 nFlags);
-    virtual byte* GetPosPtr(int32& nStride, uint32 nFlags);
-    virtual byte* GetNormPtr(int32& nStride, uint32 nFlags);
-    virtual byte* GetColorPtr(int32& nStride, uint32 nFlags);
-    virtual byte* GetUVPtrNoCache(int32& nStride, uint32 nFlags, uint32 uvSetIndex = 0);
-    virtual byte* GetUVPtr(int32& nStride, uint32 nFlags, uint32 uvSetIndex = 0);
-
-    virtual byte* GetTangentPtr(int32& nStride, uint32 nFlags);
-    virtual byte* GetQTangentPtr(int32& nStride, uint32 nFlags);
-
-    virtual byte* GetHWSkinPtr(int32& nStride, uint32 nFlags, bool remapped = false);
-    virtual byte* GetVelocityPtr(int32& nStride, uint32 nFlags);
-
-    virtual void UnlockStream(int nStream);
-    virtual void UnlockIndexStream();
-
-    virtual vtx_idx* GetIndexPtr(uint32 nFlags, int32 nOffset = 0);
-    virtual const PodArray<std::pair<int, int> >* GetTrisForPosition(const Vec3& vPos, _smart_ptr<IMaterial> pMaterial);
-    virtual float GetExtent(EGeomForm eForm);
-    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm, SSkinningData const* pSkinning = NULL);
-    virtual uint32* GetPhysVertexMap() { return NULL; }
-    virtual bool IsEmpty();
-
-    virtual size_t GetMemoryUsage(ICrySizer* pSizer, EMemoryUsageArgument nType) const;
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual float GetAverageTrisNumPerChunk(_smart_ptr<IMaterial> pMat);
-    virtual int GetTextureMemoryUsage(const _smart_ptr<IMaterial> pMaterial, ICrySizer* pSizer = NULL, bool bStreamedIn = true) const;
-    // Get allocated only in video memory or only in system memory.
-    virtual int GetAllocatedBytes(bool bVideoMem) const;
-
-    virtual void SetBBox(const Vec3& vBoxMin, const Vec3& vBoxMax) { m_vBoxMin = vBoxMin; m_vBoxMax = vBoxMax; }
-    virtual void GetBBox(Vec3& vBoxMin, Vec3& vBoxMax) { vBoxMin = m_vBoxMin; vBoxMax = m_vBoxMax; };
-    virtual void UpdateBBoxFromMesh();
-
-    // Debug draw this render mesh.
-    virtual void DebugDraw(const struct SGeometryDebugDrawInfo& info, uint32 nVisibleChunksMask = ~0, float fExtrdueScale = 0.01f);
-    virtual void KeepSysMesh(bool keep);
-    virtual void UnKeepSysMesh();
-    virtual void LockForThreadAccess();
-    virtual void UnLockForThreadAccess();
-
-    virtual void SetMeshLod(int nLod) { m_nLod = nLod; }
-
-    virtual volatile int* SetAsyncUpdateState();
-    void CreateRemappedBoneIndicesPair(const uint pairGuid, const TRenderChunkArray& Chunks);
-    virtual void CreateRemappedBoneIndicesPair(const DynArray<JointIdType>& arrRemapTable, const uint pairGuid);
-    virtual void ReleaseRemappedBoneIndicesPair(const uint pairGuid);
-
-    virtual void OffsetPosition(const Vec3& delta) { m_vBoxMin += delta; m_vBoxMax += delta; }
-
-    IRenderMesh* GetRenderMeshForSubsetMask(SRenderObjData* pOD, uint64 nMeshSubSetMask, _smart_ptr<IMaterial> pMaterial, const SRenderingPassInfo& passInfo);
-    void GarbageCollectSubsetRenderMeshes();
-    void CreateSubSetRenderMesh();
-
-    void ReleaseRenderChunks(TRenderChunkArray* pChunks);
-
-    void BindStreamsToRenderPipeline();
-
-    bool GetRemappedSkinningData(uint32 guid, CRendElementBase::SGeometryStreamInfo &streamInfo);
-    bool FillGeometryInfo(CRendElementBase::SGeometryInfo &geomInfo);
-
-    // --------------------------------------------------------------
-    // Members
-
-    static int32 m_cSizeStream[VSF_NUM];
-
-    // When modifying or traversing any of the lists below, be sure to always hold the link lock
-    static CryCriticalSection m_sLinkLock;
-
-    // intrusive list entries - a mesh can be in multiple lists at the same time
-    util::list<CRenderMesh>          m_Chain; // mesh will either be in the mesh list or garbage mesh list
-    util::list<CRenderMesh>          m_Dirty[2]; // if linked, mesh has volatile data (data read back from vram)
-    util::list<CRenderMesh>          m_Modified[2]; // if linked, mesh has modified data (to be uploaded to vram)
-
-    // The static list heads, corresponds to the entries above
-    static util::list<CRenderMesh> m_MeshList;
-    static util::list<CRenderMesh> m_MeshGarbageList[MAX_RELEASED_MESH_FRAMES];
-    static util::list<CRenderMesh> m_MeshDirtyList[2];
-    static util::list<CRenderMesh> m_MeshModifiedList[2];
-
-    TRenderChunkArray  m_Chunks;
-    TRenderChunkArray  m_ChunksSubObjects; // Chunks of sub-objects.
-    TRenderChunkArray  m_ChunksSkinned;
-
-    int                     m_nClientTextureBindID;
-    Vec3                    m_vBoxMin;
-    Vec3                    m_vBoxMax;
-
-    float                   m_fGeometricMeanFaceArea;
-    CGeomExtents                        m_Extents;
-
-    // Frame id when this render mesh was last rendered.
-    uint32                  m_nLastRenderFrameID;
-    uint32                  m_nLastSubsetGCRenderFrameID;
-
-    string                                  m_sType;          //!< pointer to the type name in the constructor call
-    string                                  m_sSource;        //!< pointer to the source  name in the constructor call
-
-    // For debugging purposes to catch longstanding data accesses
-# if !defined(_RELEASE) && defined(RM_CATCH_EXCESSIVE_LOCKS)
-    AZStd::atomic<float> m_lockTime;
-# endif
-
-    typedef VectorMap<uint64, _smart_ptr<IRenderMesh> > MeshSubSetIndices;
-    MeshSubSetIndices m_meshSubSetIndices;
-
-    static TSRC_ALIGN CThreadSafeRendererContainer<SMeshSubSetIndicesJobEntry> m_meshSubSetRenderMeshJobs[RT_COMMAND_BUF_COUNT];
-    static TSRC_ALIGN CThreadSafeRendererContainer<CRenderMesh*> m_deferredSubsetGarbageCollection[RT_COMMAND_BUF_COUNT];
-
-#ifdef RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT
-    CryCriticalSection m_getTrisForPositionLock;
-#endif
-
-#if !defined(NULL_RENDERER)
-    WrappedDX11Buffer m_extraBonesBuffer;
-#ifdef MESH_TESSELLATION_RENDERER
-    WrappedDX11Buffer m_adjBuffer; // buffer containing adjacency information to fix displacement seams
-#endif
-#endif
-
-    static void Initialize();
-    static void ShutDown();
-    static void Tick();
-    static void UpdateModified();
-    static void UpdateModifiedMeshes(bool bLocked, int threadId);
-    static bool ClearStaleMemory(bool bLocked, int threadId);
-    static void PrintMeshLeaks();
-    static void GetPoolStats(SMeshPoolStatistics* stats);
-
-    void* operator new(size_t size);
-    void operator delete(void* ptr);
-
-    static void FinalizeRendItems(int nThreadID);
-};
-
-//////////////////////////////////////////////////////////////////////
-// General VertexBuffer created by CreateVertexBuffer() function
-class CVertexBuffer
-{
-public:
-    CVertexBuffer()
-    {
-        m_nVerts = 0;
-    }
-    CVertexBuffer(void* pData, const AZ::Vertex::Format& vertexFormat, int nVerts = 0)
-    {
-        m_VS.m_pLocalData = pData;
-        m_vertexFormat = vertexFormat;
-        m_nVerts = nVerts;
-    }
-#ifdef _RENDERER
-    ~CVertexBuffer();
-#endif
-
-    SBufferStream m_VS;
-    AZ::Vertex::Format m_vertexFormat;
-    int32 m_nVerts;
-};
-
-class CIndexBuffer
-{
-public:
-    CIndexBuffer()
-    {
-        m_nInds = 0;
-    }
-
-    CIndexBuffer(uint16* pData)
-    {
-        m_VS.m_pLocalData = pData;
-        m_nInds = 0;
-    }
-#ifdef _RENDERER
-    ~CIndexBuffer();
-#endif
-
-    SBufferStream m_VS;
-    int32 m_nInds;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RENDERMESH_H
diff --git a/Code/CryEngine/RenderDll/Common/RenderMesh_Render.cpp b/Code/CryEngine/RenderDll/Common/RenderMesh_Render.cpp
deleted file mode 100644
index 634a6eb8d0..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderMesh_Render.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include <AzCore/Debug/Profiler.h>
-
-#include "RenderMesh.h"
-
-#include "PostProcess/PostEffects.h"
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-namespace
-{
-    inline uint32 GetCurrentRenderFrameID(const SRenderingPassInfo& passInfo)
-    {
-        return gRenDev->m_RP.m_TI[passInfo.ThreadID()].m_nFrameUpdateID;
-    };
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderMesh::Render(CRenderObject* pObj, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    _smart_ptr<IMaterial> pMaterial = pObj->m_pCurrMaterial;
-
-    if (!pMaterial || !m_nVerts || !m_nInds || m_Chunks.empty() || (m_nFlags & FRM_ALLOCFAILURE) != 0)
-    {
-        return;
-    }
-
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    IF (!CanRender(), 0)
-    {
-        return;
-    }
-
-    CRenderer*  __restrict rd = gRenDev;
-    bool bSkinned = (GetChunksSkinned().size() && (pObj->m_ObjFlags & (FOB_SKINNED)));
-
-    uint64 nMeshSubSetMask = 0;
-#if !defined(_RELEASE)
-    const char* szExcl = CRenderer::CV_r_excludemesh->GetString();
-    if (szExcl[0] && m_sSource)
-    {
-        char szMesh[1024];
-        cry_strcpy(szMesh, this->m_sSource);
-        azstrlwr(szMesh, AZ_ARRAY_SIZE(szMesh));
-        if (szExcl[0] == '!')
-        {
-            if (!strstr(&szExcl[1], m_sSource))
-            {
-                return;
-            }
-        }
-        else
-        if (strstr(szExcl, m_sSource))
-        {
-            return;
-        }
-    }
-#endif
-
-    if (rd->m_pDefaultMaterial && pMaterial)
-    {
-        pMaterial = rd->m_pDefaultMaterial;
-    }
-
-    assert(pMaterial);
-
-    if (!pMaterial)
-    {
-        return;
-    }
-
-    m_nLastRenderFrameID = GetCurrentRenderFrameID(passInfo);
-
-    //////////////////////////////////////////////////////////////////////////
-    if (!m_meshSubSetIndices.empty() && abs((int)m_nLastRenderFrameID - (int)m_nLastSubsetGCRenderFrameID) > DELETE_SUBSET_MESHES_AFTER_NOTUSED_FRAMES)
-    {
-        m_deferredSubsetGarbageCollection[passInfo.ThreadID()].push_back(this);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    bool bRenderBreakableWithMultipleDrawCalls = false;
-    if (pObj->m_ObjFlags & FOB_MESH_SUBSET_INDICES && m_nVerts >= 3)
-    {
-        SRenderObjData* pOD = pObj->GetObjData();
-        if (pOD)
-        {
-            if (pOD->m_nSubObjHideMask != 0)
-            {
-                IRenderMesh* pRM = GetRenderMeshForSubsetMask(pOD, pOD->m_nSubObjHideMask, pMaterial, passInfo);
-                // if pRM is null, it means that this subset rendermesh is not computed yet, thus we render it with multiple draw calls
-                if (pRM)
-                {
-                    static_cast<CRenderMesh*>(pRM)->CRenderMesh::Render(pObj, passInfo, rendItemSorter);
-                    pOD->m_nSubObjHideMask = 0;
-                    return;
-                }
-                // compute the needed mask
-                const uint32 ni = m_ChunksSubObjects.size();
-                nMeshSubSetMask = pOD->m_nSubObjHideMask & (((uint64)1 << ni) - 1);
-                pOD->m_nSubObjHideMask = 0;
-                bRenderBreakableWithMultipleDrawCalls = true;
-            }
-        }
-    }
-
-    int nList = EFSLIST_GENERAL;
-
-    const int nAW = (pObj->m_ObjFlags & FOB_AFTER_WATER) || (pObj->m_ObjFlags & FOB_NEAREST) ? 1 : 0;
-
-    //////////////
-    if (gRenDev->CV_r_MotionVectors && passInfo.IsGeneralPass() && ((pObj->m_ObjFlags & FOB_DYNAMIC_OBJECT) != 0))
-    {
-        CMotionBlur::SetupObject(pObj, passInfo);
-    }
-
-    TRenderChunkArray* pChunks = bSkinned ? &m_ChunksSkinned : &m_Chunks;
-    // for rendering with multiple drawcalls, use ChunksSubObjects
-    if (bRenderBreakableWithMultipleDrawCalls)
-    {
-        pChunks = &m_ChunksSubObjects;
-    }
-
-    const uint32 ni = (uint32)pChunks->size();
-
-    CRenderChunk* pPrevChunk = NULL;
-    for (uint32 i = 0; i < ni; i++)
-    {
-        CRenderChunk* pChunk = &pChunks->at(i);
-        CRendElementBase*  __restrict pREMesh = pChunk->pRE;
-
-        SShaderItem& ShaderItem         = pMaterial->GetShaderItem(pChunk->m_nMatID);
-        CShaderResources* pR  = (CShaderResources*)ShaderItem.m_pShaderResources;
-        CShader*  __restrict pS        = (CShader*)ShaderItem.m_pShader;
-
-        if (pR && pR->IsDeforming())
-        {
-            pObj->m_ObjFlags |= FOB_MOTION_BLUR;
-        }
-
-        // don't render this chunk if the hide mask for it is set
-        if (bRenderBreakableWithMultipleDrawCalls && (nMeshSubSetMask & ((uint64)1 << pChunk->nSubObjectIndex)))
-        {
-            goto SkipChunk;
-        }
-
-        if (pREMesh == NULL || pS == NULL || pR == NULL)
-        {
-            goto SkipChunk;
-        }
-
-        if (pS->m_Flags2 & EF2_NODRAW)
-        {
-            goto SkipChunk;
-        }
-
-        if (passInfo.IsShadowPass() && (pR->m_ResFlags & MTL_FLAG_NOSHADOW))
-        {
-            goto SkipChunk;
-        }
-
-        if (passInfo.IsShadowPass() && !passInfo.IsDisableRenderChunkMerge() && CRenderMesh::RenderChunkMergeAbleInShadowPass(pPrevChunk, pChunk, pMaterial))
-        {
-            continue; // skip the merged chunk, but keep the PrevChunkReference for further merging
-        }
-        PrefetchLine(pREMesh, 0);
-        PrefetchLine(pObj, 0);
-        rd->EF_AddEf_NotVirtual(pREMesh, ShaderItem, pObj, passInfo, nList, nAW, rendItemSorter);
-
-        pPrevChunk = pChunk;
-        continue;
-SkipChunk:
-        pPrevChunk = NULL;
-    }
-}
-
-void CRenderMesh::AddShadowPassMergedChunkIndicesAndVertices(CRenderChunk* pCurrentChunk, _smart_ptr<IMaterial> pMaterial, int& rNumVertices, int& rNumIndices)
-{
-    if (m_Chunks.size() == 0)
-    {
-        return;
-    }
-
-    if (gRenDev->m_RP.m_pCurObject->m_ObjFlags & (FOB_SKINNED))
-    {
-        return;
-    }
-
-    if (pMaterial == NULL)
-    {
-        return;
-    }
-
-    AUTO_LOCK(pMaterial->GetSubMaterialResizeLock());
-    for (uint32 i = (uint32)(pCurrentChunk - &m_Chunks[0]) + 1; i < (uint32)m_Chunks.size(); ++i)
-    {
-        if (!CRenderMesh::RenderChunkMergeAbleInShadowPass(pCurrentChunk, &m_Chunks[i], pMaterial))
-        {
-            return;
-        }
-
-        rNumVertices += m_Chunks[i].nNumVerts;
-        rNumIndices += m_Chunks[i].nNumIndices;
-    }
-}
-
-bool CRenderMesh::RenderChunkMergeAbleInShadowPass(CRenderChunk* pPreviousChunk, CRenderChunk* pCurrentChunk, _smart_ptr<IMaterial> pMaterial)
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_MergeShadowDrawcalls)
-    {
-        return false;
-    }
-
-    if (pPreviousChunk == NULL || pCurrentChunk == NULL || pMaterial == NULL)
-    {
-        return false;
-    }
-
-    SShaderItem& rCurrentShaderItem     = pMaterial->GetShaderItem(pCurrentChunk->m_nMatID);
-    SShaderItem& rPreviousShaderItem    = pMaterial->GetShaderItem(pPreviousChunk->m_nMatID);
-
-    CShaderResources* pCurrentShaderResource  = (CShaderResources*)rCurrentShaderItem.m_pShaderResources;
-    CShaderResources* pPreviousShaderResource = (CShaderResources*)rPreviousShaderItem.m_pShaderResources;
-
-    CShader* pCurrentShader       = (CShader*)rCurrentShaderItem.m_pShader;
-    CShader* pPreviousShader    = (CShader*)rPreviousShaderItem.m_pShader;
-
-    if (!pCurrentShaderResource || !pPreviousShaderResource || !pCurrentShader || !pPreviousShader)
-    {
-        return false;
-    }
-
-    bool bCurrentAlphaTested        = pCurrentShaderResource->CShaderResources::IsAlphaTested();
-    bool bPreviousAlphaTested       = pPreviousShaderResource->CShaderResources::IsAlphaTested();
-
-    if (bCurrentAlphaTested != bPreviousAlphaTested)
-    {
-        return false;
-    }
-
-    if (bCurrentAlphaTested)
-    {
-        const SEfResTexture* pCurrentResTex =  pCurrentShaderResource->GetTextureResource(EFTT_DIFFUSE);
-        const SEfResTexture* pPreviousResTex =  pPreviousShaderResource->GetTextureResource(EFTT_DIFFUSE);
-
-        const CTexture* pCurrentDiffuseTex  = pCurrentResTex ? pCurrentResTex->m_Sampler.m_pTex : nullptr;
-        const CTexture* pPreviousDiffuseTex = pPreviousResTex ? pPreviousResTex->m_Sampler.m_pTex : nullptr;
-
-        if (pCurrentDiffuseTex != pPreviousDiffuseTex)
-        {
-            return false;
-        }
-    }
-
-    if (((pPreviousShaderResource->m_ResFlags & MTL_FLAG_NOSHADOW) != 0) || ((pCurrentShaderResource->m_ResFlags & MTL_FLAG_NOSHADOW) != 0))
-    {
-        return false;
-    }
-
-    if ((pPreviousShaderResource->m_ResFlags & MTL_FLAG_2SIDED) != (pCurrentShaderResource->m_ResFlags & MTL_FLAG_2SIDED))
-    {
-        return false;
-    }
-
-    if (((pPreviousShader->m_Flags & EF_NODRAW) != 0) || ((pCurrentShader->m_Flags & EF_NODRAW) != 0))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-// break-ability support
-IRenderMesh* CRenderMesh::GetRenderMeshForSubsetMask([[maybe_unused]] SRenderObjData* pOD, uint64 nMeshSubSetMask, _smart_ptr<IMaterial> pMaterial, const SRenderingPassInfo& passInfo)
-{
-    // TODO: If only one bit is set in mask - there is no need to build new index buffer - small part of main index buffer can be re-used
-    // TODO: Add auto releasing of not used for long time index buffers
-    // TODO: Take into account those induces when computing render mesh memory size for CGF streaming
-    // TODO: Support for multiple materials
-
-    assert(nMeshSubSetMask != 0);
-
-    IRenderMesh* pSrcRM = this;
-    TRenderChunkArray& renderChunks = m_ChunksSubObjects;
-
-    uint32 nChunkCount = renderChunks.size();
-    nMeshSubSetMask &= (((uint64)1 << nChunkCount) - 1);
-
-    // try to find the index mesh in the already finished list
-    const MeshSubSetIndices::iterator meshSubSet = m_meshSubSetIndices.find(nMeshSubSetMask);
-
-    if (meshSubSet != m_meshSubSetIndices.end())
-    {
-        return meshSubSet->second;
-    }
-
-    // subset mesh was not found, start job to create one
-    SMeshSubSetIndicesJobEntry* pSubSetJob = m_meshSubSetRenderMeshJobs[passInfo.ThreadID()].push_back_new();
-    pSubSetJob->m_pSrcRM = pSrcRM;
-    pSubSetJob->m_pIndexRM = NULL;
-    pSubSetJob->m_nMeshSubSetMask = nMeshSubSetMask;
-
-    pSubSetJob->jobExecutor.StartJob([pSubSetJob]()
-    {
-        pSubSetJob->CreateSubSetRenderMesh();
-    }); // Legacy JobManager used SJobState::SetBlocking
-
-    return NULL;
-}
-
-void CRenderMesh::FinalizeRendItems(int nThreadID)
-{
-    // perform all requiered garbage collections
-    m_deferredSubsetGarbageCollection[nThreadID].CoalesceMemory();
-    for (size_t i = 0; i < m_deferredSubsetGarbageCollection[nThreadID].size(); ++i)
-    {
-        if (m_deferredSubsetGarbageCollection[nThreadID][i])
-        {
-            m_deferredSubsetGarbageCollection[nThreadID][i]->GarbageCollectSubsetRenderMeshes();
-        }
-    }
-    m_deferredSubsetGarbageCollection[nThreadID].resize(0);
-
-    // add all newly generated subset meshes
-    bool bJobsStillRunning = false;
-    size_t nNumSubSetRenderMeshJobs = m_meshSubSetRenderMeshJobs[nThreadID].size();
-    for (size_t i = 0; i < nNumSubSetRenderMeshJobs; ++i)
-    {
-        SMeshSubSetIndicesJobEntry& rSubSetJob = m_meshSubSetRenderMeshJobs[nThreadID][i];
-        if (rSubSetJob.jobExecutor.IsRunning())
-        {
-            bJobsStillRunning = true;
-        }
-        else if (rSubSetJob.m_pSrcRM) // finished job, which needs to be assigned
-        {
-            CRenderMesh* pSrcMesh = static_cast<CRenderMesh*>(rSubSetJob.m_pSrcRM.get());
-            // check that we didn't create the same subset mesh twice, if we did, clean up the duplicate
-            if (pSrcMesh->m_meshSubSetIndices.find(rSubSetJob.m_nMeshSubSetMask) == pSrcMesh->m_meshSubSetIndices.end())
-            {
-                pSrcMesh->m_meshSubSetIndices.insert(std::make_pair(rSubSetJob.m_nMeshSubSetMask, rSubSetJob.m_pIndexRM));
-            }
-
-            // mark job as assigned
-            rSubSetJob.m_pIndexRM = NULL;
-            rSubSetJob.m_pSrcRM = NULL;
-        }
-    }
-    if (!bJobsStillRunning)
-    {
-        m_meshSubSetRenderMeshJobs[nThreadID].resize(0);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CRenderMesh::ClearJobResources()
-{
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        for (size_t j = 0; j < m_deferredSubsetGarbageCollection[i].size(); ++j)
-        {
-            if (m_deferredSubsetGarbageCollection[i][j])
-            {
-                m_deferredSubsetGarbageCollection[i][j]->GarbageCollectSubsetRenderMeshes();
-            }
-        }
-        stl::free_container(m_deferredSubsetGarbageCollection[i]);
-
-        for (size_t j = 0; j < m_deferredSubsetGarbageCollection[i].size(); ++j)
-        {
-            m_meshSubSetRenderMeshJobs[i][j].jobExecutor.WaitForCompletion();
-        }
-        stl::free_container(m_meshSubSetRenderMeshJobs[i]);
-    }
-}
-
-void SMeshSubSetIndicesJobEntry::CreateSubSetRenderMesh()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-    CRenderMesh* pSrcMesh = static_cast<CRenderMesh*>(m_pSrcRM.get());
-
-    TRenderChunkArray& renderChunks = pSrcMesh->m_ChunksSubObjects;
-    uint32 nChunkCount = renderChunks.size();
-
-
-    pSrcMesh->LockForThreadAccess();
-    if (vtx_idx* pInds = pSrcMesh->GetIndexPtr(FSL_READ))
-    {
-        TRenderChunkArray newChunks;
-        newChunks.reserve(3);
-
-        int nMatId = -1;
-        PodArray<vtx_idx> lstIndices;
-        for (uint32 c = 0; c < nChunkCount; c++)
-        {
-            CRenderChunk& srcChunk = renderChunks[c];
-            if (0 == (m_nMeshSubSetMask & ((uint64)1 << srcChunk.nSubObjectIndex)))
-            {
-                uint32 nLastIndex = lstIndices.size();
-                lstIndices.AddList(&pInds[srcChunk.nFirstIndexId], srcChunk.nNumIndices);
-                if (newChunks.empty() || nMatId != srcChunk.m_nMatID)
-                {
-                    // New chunk needed.
-                    newChunks.push_back(srcChunk);
-                    newChunks.back().nFirstIndexId = nLastIndex;
-                    newChunks.back().nNumIndices = 0;
-                    newChunks.back().nNumVerts = 0;
-                    newChunks.back().pRE = 0;
-                }
-                nMatId = srcChunk.m_nMatID;
-                newChunks.back().nNumIndices += srcChunk.nNumIndices;
-                newChunks.back().nNumVerts = max((int)srcChunk.nFirstVertId + (int)srcChunk.nNumVerts - (int)newChunks.back().nFirstVertId, (int)newChunks.back().nNumVerts);
-            }
-        }
-        pSrcMesh->UnLockForThreadAccess();
-
-        IRenderMesh::SInitParamerers params;
-        SVF_P3S_C4B_T2S tempVertex;
-        params.pVertBuffer = &tempVertex;
-        params.nVertexCount = 1;
-        params.vertexFormat = eVF_P3S_C4B_T2S;
-        params.pIndices = lstIndices.GetElements();
-        params.nIndexCount = lstIndices.Count();
-        params.nPrimetiveType = prtTriangleList;
-        params.eType = eRMT_Static;
-        params.nRenderChunkCount = 1;
-        params.bOnlyVideoBuffer = false;
-        params.bPrecache = false;
-        _smart_ptr<IRenderMesh> pIndexMesh = gRenDev->CreateRenderMesh(pSrcMesh->m_sType, pSrcMesh->m_sSource, &params);
-        pIndexMesh->SetVertexContainer(pSrcMesh);
-        if (!newChunks.empty())
-        {
-            pIndexMesh->SetRenderChunks(&newChunks.front(), newChunks.size(), false);
-            pIndexMesh->SetBBox(pSrcMesh->m_vBoxMin, pSrcMesh->m_vBoxMax);
-        }
-        m_pIndexRM = pIndexMesh;
-    }
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/RenderMesh_SetMesh.cpp b/Code/CryEngine/RenderDll/Common/RenderMesh_SetMesh.cpp
deleted file mode 100644
index b8e9c70632..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderMesh_SetMesh.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "RenderMesh.h"
-#include "IIndexedMesh.h"
-
-#define TRANSFER_ALIGNMENT  1
-
-static void transfer_writecombined(void* pDst, const void* pSrc, size_t size)
-{
-    cryMemcpy(pDst, pSrc, size, MC_CPU_TO_GPU);
-}
-
-template<EStreamIDs stream, size_t Size>
-struct StreamCompactor;
-
-template<EStreamIDs stream, size_t Size>
-uint32 CompactStream(uint8 (&buffer)[Size], SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end)
-{
-    return StreamCompactor<stream, Size>::Compact(buffer, data, mesh, beg, end);
-}
-
-// Override for the VSF_GENERAL stream that can be used with arbitrary vertex data
-template<EStreamIDs stream, size_t Size>
-uint32 CompactStream(uint8(&buffer)[Size], SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end, const AZ::Vertex::Format& vertexFormat)
-{
-    return StreamCompactor<stream, Size>::Compact(buffer, data, mesh, beg, end, vertexFormat);
-}
-
-template<size_t Size>
-struct StreamCompactor<VSF_GENERAL, Size>
-{
-    static void CompactPositions(uint8* stagingBuffer, [[maybe_unused]] SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end, uint32 streamIndex, uint32 vertexStride, uint32 attributeOffset, uint32 attributeByteLength)
-    {
-        if (mesh.Has32BitPositions())
-        {
-            Vec3* positions = mesh.GetStreamPtr<Vec3>(CMesh::POSITIONS, streamIndex);
-            AZ_Assert(attributeByteLength == sizeof(Vec3), "Mesh uses three 32 bit floats for positions, but vertex format is expecting a different size");
-            for (size_t i = 0; i < end; ++i)
-            {
-                memcpy(stagingBuffer + i * vertexStride + attributeOffset, &positions[beg + i], attributeByteLength);
-            }
-        }
-        else if (mesh.Has16BitPositions())
-        {
-            Vec3f16* positions = mesh.GetStreamPtr<Vec3f16>(CMesh::POSITIONSF16, streamIndex);
-            AZ_Assert(attributeByteLength == sizeof(Vec3f16), "Mesh uses three 16 bit floats for positions, but vertex format is expecting a different size");
-            for (size_t i = 0; i < end; ++i)
-            {
-                memcpy(stagingBuffer + i * vertexStride + attributeOffset, &positions[beg + i], attributeByteLength);
-            }
-        }
-        else
-        {
-            AZ_Assert(false, "Mesh has no per-vertex positions.");
-        }
-    }
-
-    static void CompactNormals(SVF_P3S_N4B_C4B_T2S* pVBuff, SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end)
-    {
-        SMeshNormal* normals = mesh.GetStreamPtr<SMeshNormal>(CMesh::NORMALS);
-        if (normals)
-        {
-            for (size_t i = 0; i < end; ++i)
-            {
-                Vec3 n = normals[beg + i].GetN();
-
-                pVBuff[i].normal.bcolor[0] = (byte)(n[0] * 127.5f + 128.0f);
-                pVBuff[i].normal.bcolor[1] = (byte)(n[1] * 127.5f + 128.0f);
-                pVBuff[i].normal.bcolor[2] = (byte)(n[2] * 127.5f + 128.0f);
-
-                SwapEndian(pVBuff[i].normal.dcolor);
-            }
-        }
-    }
-
-    static void CompactColors(uint8* stagingBuffer, [[maybe_unused]] SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end, uint32 streamIndex, uint32 vertexStride, uint32 attributeOffset, uint32 attributeByteLength)
-    {
-        SMeshColor* colors = mesh.GetStreamPtr<SMeshColor>(CMesh::COLORS, streamIndex);
-        if (colors)
-        {
-            for (size_t i = 0; i < end; ++i)
-            {
-                ColorB color = colors[beg + i].GetRGBA();
-                UCol uColor;
-                uColor.bcolor[0] = color.b;
-                uColor.bcolor[1] = color.g;
-                uColor.bcolor[2] = color.r;
-                uColor.bcolor[3] = color.a;
-                SwapEndian(uColor.dcolor);
-                memcpy(stagingBuffer + i * vertexStride + attributeOffset, &uColor, attributeByteLength);
-            }
-        }
-        else
-        {
-            for (size_t i = 0; i < end; ++i)
-            {
-                UCol defaultColor;
-                defaultColor.dcolor = ~0;
-                memcpy(stagingBuffer + i * vertexStride + attributeOffset, &defaultColor, attributeByteLength);
-            }
-        }
-    }
-
-    static void CompactUVs(uint8* stagingBuffer, [[maybe_unused]] SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end, uint32 streamIndex, uint32 vertexStride, uint32 attributeOffset, uint32 attributeByteLength)
-    {
-        SMeshTexCoord* texCoords = mesh.GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, streamIndex);
-        if (texCoords)
-        {
-            for (size_t i = 0; i < end; ++i)
-            {
-                SMeshTexCoord meshTexCoord = texCoords[beg + i];
-                // If the vertex format uses two 32 bit floats for texture coordinates, copy them to the staging buffer
-                if (attributeByteLength == sizeof(Vec2))
-                {
-                    Vec2 texCoord = meshTexCoord.GetUV();
-                    memcpy(stagingBuffer + i * vertexStride + attributeOffset, &texCoord, attributeByteLength);
-                }
-                // If the vertex format uses two 16 bit floats for texture coordinates, convert the CMesh texture coordinates to 16 bit floats and then copy them to the staging buffer
-                else if (attributeByteLength == sizeof(Vec2f16))
-                {
-                    Vec2f16 texCoord;
-                    meshTexCoord.ExportTo(texCoord);
-                    memcpy(stagingBuffer + i * vertexStride + attributeOffset, &texCoord, attributeByteLength);
-                }
-                else
-                {
-                    AZ_Assert(false, "Invalid byte length for texture coordinates");
-                }
-            }
-        }
-    }
-
-    static uint32 Compact(uint8 (&buffer)[Size], SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end, const AZ::Vertex::Format& vertexFormat)
-    {
-        if (data.m_pVBuff)
-        {
-
-            size_t dstPad = (size_t)&data.m_pVBuff[beg * vertexFormat.GetStride()] & (TRANSFER_ALIGNMENT - 1);
-            uint8* stagingBuffer = &buffer[dstPad];
-            uint32 amount = min((uint32)(end - beg), (uint32)(Size / vertexFormat.GetStride()));
-
-            if (mesh.m_pP3S_C4B_T2S)
-            {
-                // Do a straight copy of mesh data that has already been interleaved
-                memcpy(stagingBuffer, &mesh.m_pP3S_C4B_T2S[beg], sizeof(SVF_P3S_C4B_T2S) * amount);
-            }
-            else
-            {
-                uint32 attributeCount = 0;
-                const uint8* attributes = vertexFormat.GetAttributes(attributeCount);
-                int attributeCounter[(int)AZ::Vertex::AttributeUsage::NumUsages] = { 0 };
-                uint32 attributeOffset = 0;
-                // Iterate over each attribute in the vertex format and interleave that attribute into the staging buffer
-
-                for (uint ii = 0; ii < attributeCount; ++ii)
-                {
-                    const uint8 attribute = attributes[ii];
-                    const AZ::Vertex::AttributeUsage usage = AZ::Vertex::Attribute::GetUsage(attribute);
-                    switch (usage)
-                    {
-                    case AZ::Vertex::AttributeUsage::Position:
-                        CompactPositions(stagingBuffer, data, mesh, beg, amount, attributeCounter[(int)AZ::Vertex::AttributeUsage::Position], vertexFormat.GetStride(), attributeOffset, AZ::Vertex::Attribute::GetByteLength(attribute));
-                        break;
-                    case AZ::Vertex::AttributeUsage::Color:
-                        CompactColors(stagingBuffer, data, mesh, beg, amount, attributeCounter[(int)AZ::Vertex::AttributeUsage::Color], vertexFormat.GetStride(), attributeOffset, AZ::Vertex::Attribute::GetByteLength(attribute));
-                        break;
-                    case AZ::Vertex::AttributeUsage::TexCoord:
-                        CompactUVs(stagingBuffer, data, mesh, beg, amount, attributeCounter[(int)AZ::Vertex::AttributeUsage::TexCoord], vertexFormat.GetStride(), attributeOffset, AZ::Vertex::Attribute::GetByteLength(attribute));
-                        break;
-                    default:
-                        AZ_Assert(false, "No case to handle per vertex data in the VSF_GENERAL stream for usage %d.", AZ::Vertex::Attribute::GetUsage(attribute));
-                        break;
-                    }
-                    // Keep track of the offset of the current attribute
-                    attributeOffset += AZ::Vertex::Attribute::GetByteLength(attribute);
-                    // Keep track of the number of attributes with a given usage so we can use that to index into the CMesh's vertex streams for that usage
-                    attributeCounter[static_cast<uint8>(usage)]++;
-                }
-            }
-            transfer_writecombined(&data.m_pVBuff[beg * vertexFormat.GetStride()], &buffer[dstPad], amount * vertexFormat.GetStride());
-            return amount;
-        }
-
-        CryFatalError("CRenderMesh::SetMesh_Impl: invalid vertex format for general stream");
-        return 0;
-    }
-};
-
-template<size_t Size>
-struct StreamCompactor<VSF_TANGENTS, Size>
-{
-    static uint32 Compact(uint8 (&buffer)[Size], SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end)
-    {
-        if (mesh.m_pTangents == NULL || data.m_pTBuff == NULL)
-        {
-            return end;
-        }
-
-        uint32 dstPad = 0;
-
-        SPipTangents* pTBuff = alias_cast<SPipTangents*>(&buffer[dstPad]);
-        uint32 amount = min((uint32)(end - beg), (uint32)(Size / sizeof(pTBuff[0])));
-
-        for (size_t i = 0; i < amount; ++i)
-        {
-            mesh.m_pTangents[beg + i].ExportTo(pTBuff[i]);
-        }
-
-        transfer_writecombined(&data.m_pTBuff[beg], &buffer[dstPad], amount * sizeof(data.m_pTBuff[0]));
-
-        return amount;
-    }
-};
-
-template<size_t Size>
-struct StreamCompactor<VSF_QTANGENTS, Size>
-{
-    static uint32 Compact(uint8 (&buffer)[Size], SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end)
-    {
-        if (mesh.m_pQTangents == NULL || data.m_pQTBuff == NULL)
-        {
-            return end;
-        }
-
-        uint32 dstPad = 0;
-
-        SPipQTangents* pQTBuff = alias_cast<SPipQTangents*>(&buffer[dstPad]);
-        uint32 amount = min((uint32)(end - beg), (uint32)(Size / sizeof(pQTBuff[0])));
-
-        for (size_t i = 0; i < amount; ++i)
-        {
-            mesh.m_pQTangents[beg + i].ExportTo(pQTBuff[i]);
-        }
-
-        transfer_writecombined(&data.m_pQTBuff[beg], &buffer[dstPad], amount * sizeof(pQTBuff[0]));
-
-        return amount;
-    }
-};
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-template<size_t Size>
-struct StreamCompactor<VSF_NORMALS, Size>
-{
-    static uint32 Compact(uint8 (&buffer)[Size], SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end)
-    {
-        if (mesh.m_pNorms == NULL || data.m_pNormalsBuff == NULL)
-        {
-            return end;
-        }
-
-        uint32 dstPad = 0;
-
-        uint32 amount = min((uint32)(end - beg), (uint32)(Size / sizeof(data.m_pNormalsBuff[0])));
-        memcpy(&buffer[dstPad], &mesh.m_pNorms[beg], amount * sizeof(data.m_pNormalsBuff[0]));
-        transfer_writecombined(&data.m_pNormalsBuff[beg], &buffer[dstPad], amount * sizeof(data.m_pNormalsBuff[0]));
-
-        return amount;
-    }
-};
-#endif
-
-template<size_t Size>
-struct StreamCompactor<VSF_VERTEX_VELOCITY, Size>
-{
-    static uint32 Compact(uint8 (&buffer)[Size], SSetMeshIntData& data, [[maybe_unused]] CMesh& mesh, uint32 beg, uint32 end)
-    {
-        if (data.m_pVelocities == NULL)
-        {
-            return end;
-        }
-
-        uint32 dstPad = 0;
-
-        uint32 amount = min((uint32)(end - beg), (uint32)(Size / sizeof(data.m_pVelocities[0])));
-        memset(&buffer[dstPad], 0x0, amount * sizeof(data.m_pVelocities[0]));
-        transfer_writecombined(&data.m_pVelocities[beg], &buffer[dstPad], amount * sizeof(data.m_pVelocities[0]));
-
-        return amount;
-    }
-};
-
-
-template<size_t Size>
-uint32 CompactIndices(uint8 (&buffer)[Size], SSetMeshIntData& data, CMesh& mesh, uint32 beg, uint32 end)
-{
-    if (mesh.m_pIndices == NULL || data.m_pInds == NULL)
-    {
-        return end;
-    }
-
-    uint32 dstPad = 0;
-
-    uint32 amount = min((uint32)(end - beg), (uint32)(Size / sizeof(mesh.m_pIndices[0])));
-    memcpy(&buffer[dstPad], &mesh.m_pIndices[beg], amount * sizeof(mesh.m_pIndices[0]));
-    transfer_writecombined(&data.m_pInds[beg], &buffer[dstPad], amount * sizeof(data.m_pInds[0]));
-    return amount;
-}
-
-typedef _MS_ALIGN (128) uint8 AlignedStagingBufferT[(8 << 10) + 128];
-
-void CRenderMesh::SetMesh_IntImpl(SSetMeshIntData data)
-{
-    CMesh& mesh = *data.m_pMesh;
-    AlignedStagingBufferT stagingBuffer;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Compact the seperate streams from the CMesh instance into a general
-    //////////////////////////////////////////////////////////////////////////
-    for (uint32 iter = 0; iter < data.m_nVerts; iter += CompactStream<VSF_GENERAL>(stagingBuffer, data, mesh, iter, data.m_nVerts, m_vertexFormat))
-    {
-        ;
-    }
-    for (uint32 iter = 0; iter < data.m_nVerts; iter += CompactStream<VSF_TANGENTS>(stagingBuffer, data, mesh, iter, data.m_nVerts))
-    {
-        ;
-    }
-    for (uint32 iter = 0; iter < data.m_nVerts; iter += CompactStream<VSF_QTANGENTS>(stagingBuffer, data, mesh, iter, data.m_nVerts))
-    {
-        ;
-    }
-# if ENABLE_NORMALSTREAM_SUPPORT
-    for (uint32 iter = 0; iter < data.m_nVerts; iter += CompactStream<VSF_NORMALS>(stagingBuffer, data, mesh, iter, data.m_nVerts))
-    {
-        ;
-    }
-# endif
-    for (uint32 iter = 0; iter < data.m_nVerts; iter += CompactStream<VSF_VERTEX_VELOCITY>(stagingBuffer, data, mesh, iter, data.m_nVerts))
-    {
-        ;
-    }
-    for (uint32 iter = 0; iter < data.m_nInds; iter += CompactIndices(stagingBuffer, data, mesh, iter, data.m_nInds))
-    {
-        ;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RenderPipeline.cpp b/Code/CryEngine/RenderDll/Common/RenderPipeline.cpp
deleted file mode 100644
index e8331eec19..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderPipeline.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "Shadow_Renderer.h"
-#include "RenderView.h"
-
-int SRendItem::m_RecurseLevel[RT_COMMAND_BUF_COUNT];
-int SRendItem::m_StartFrust[RT_COMMAND_BUF_COUNT][MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS];
-int SRendItem::m_EndFrust[RT_COMMAND_BUF_COUNT][MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS];
-int SRendItem::m_ShadowsStartRI[RT_COMMAND_BUF_COUNT][MAX_SHADOWMAP_FRUSTUMS];
-int SRendItem::m_ShadowsEndRI[RT_COMMAND_BUF_COUNT][MAX_SHADOWMAP_FRUSTUMS];
diff --git a/Code/CryEngine/RenderDll/Common/RenderPipeline.h b/Code/CryEngine/RenderDll/Common/RenderPipeline.h
deleted file mode 100644
index d07bf7598b..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderPipeline.h
+++ /dev/null
@@ -1,1267 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <CryThreadSafeRendererContainer.h>
-#include <CryThreadSafeWorkerContainer.h>
-#include "Shadow_Renderer.h"
-#include "../Common/PerInstanceConstantBufferPool.h"
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/std/containers/vector.h>
-//====================================================================
-
-#define MAX_HWINST_PARAMS 32768
-
-#define MAX_REND_OBJECTS 16384
-#define TEMP_REND_OBJECTS_POOL 2048
-#define MAX_REND_GEOMS_IN_BATCH 16
-
-
-#define MAX_REND_SHADERS 4096
-#define MAX_REND_SHADER_RES 16384
-#define MAX_REND_LIGHTS  32
-#define MAX_DEFERRED_LIGHTS 256
-#define SG_SORT_GROUP 0
-#define MAX_SHADOWMAP_LOD 20
-#define MAX_SHADOWMAP_FRUSTUMS 1024
-#define MAX_SORT_GROUPS  64
-#define MAX_INSTANCES_THRESHOLD_HW  8
-#define MAX_LIST_ORDER   2                                  // 0 = before water, 1 = after water
-#define MAX_PREDICTION_ZONES MAX_STREAM_PREDICTION_ZONES
-
-#define CULLER_MAX_CAMS 4
-
-#define HW_INSTANCING_ENABLED
-
-class CRenderView;
-
-struct SViewport
-{
-    int nX, nY, nWidth, nHeight;
-    float fMinZ, fMaxZ;
-    SViewport()
-        : nX(0)
-        , nY(0)
-        , nWidth(0)
-        , nHeight(0)
-        , fMinZ(0.0f)
-        , fMaxZ(0.0f)
-    {}
-
-    SViewport(int nNewX, int nNewY, int nNewWidth, int nNewHeight)
-        : nX(nNewX)
-        , nY(nNewY)
-        , nWidth(nNewWidth)
-        , nHeight(nNewHeight)
-        , fMinZ(0.0f)
-        , fMaxZ(0.0f)
-    {
-    }
-    _inline friend bool operator != (const SViewport& m1, const SViewport& m2)
-    {
-        if (m1.nX != m2.nX || m1.nY != m2.nY || m1.nWidth != m2.nWidth || m1.nHeight != m2.nHeight || m1.fMinZ != m2.fMinZ || m1.fMaxZ != m2.fMaxZ)
-        {
-            return true;
-        }
-        return false;
-    }
-    _inline friend bool operator == (const SViewport& m1, const SViewport& m2)
-    {
-        return !(m1 != m2);
-    }
-};
-
-struct SRenderListDesc
-{
-    int m_nStartRI[MAX_LIST_ORDER][EFSLIST_NUM];
-    int m_nEndRI[MAX_LIST_ORDER][EFSLIST_NUM];
-    int m_nBatchFlags[MAX_LIST_ORDER][EFSLIST_NUM];
-};
-
-typedef union UnINT64
-{
-    uint64 SortVal;
-    struct
-    {
-        uint32 Low;
-        uint32 High;
-    }i;
-} UnINT64;
-
-#define FB_IGNORE_SG_MASK   0x100000
-
-// FIXME: probably better to sort by shaders (Currently sorted by resources)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(RenderPipeline_h)
-#endif
-struct SRendItem
-{
-    uint32 SortVal;
-    IRenderElement* pElem;
-    union
-    {
-        uint32 ObjSort;
-        float fDist;
-    };
-    CRenderObject* pObj;
-    uint32 nBatchFlags;
-    uint32 nOcclQuery : 16;
-    enum
-    {
-        kOcclQueryInvalid = 0xFFFFU
-    };
-    uint32 nStencRef  : 8;
-    uint8  nTextureID;
-    SRendItemSorter rendItemSorter;
-
-    union QuickCopy
-    {
-        uint64  data[4];
-        char        bytes[32];
-    };
-
-    //==================================================
-    static void* mfGetPointerCommon(ESrcPointer ePT, int* Stride, EParamType Type, ESrcPointer Dst, int Flags);
-
-    static _inline void mfGet(uint32 nVal, int& nTechnique, CShader*& Shader, CShaderResources*& Res)
-    {
-        Shader = (CShader*)CShaderMan::s_pContainer->m_RList[CBaseResource::RListIndexFromId((nVal >> 6) & (MAX_REND_SHADERS - 1))];
-        //Shader = (CShader *)CShaderMan::m_pContainer->m_RList[(nVal>>20) & (MAX_REND_SHADERS-1)];
-        nTechnique = (nVal & 0x3f);
-        if (nTechnique == 0x3f)
-        {
-            nTechnique = -1;
-        }
-        int nRes = (nVal >> 18) & (MAX_REND_SHADER_RES - 1);
-        //int nRes = (nVal>>6) & (MAX_REND_SHADER_RES-1);
-        Res = (nRes) ? CShader::s_ShaderResources_known[nRes] : NULL;
-    }
-    static _inline CShader* mfGetShader(uint32 flag)
-    {
-        return (CShader*)CShaderMan::s_pContainer->m_RList[CBaseResource::RListIndexFromId((flag >> 6) & (MAX_REND_SHADERS - 1))];
-        //return (CShader *)CShaderMan::m_pContainer->m_RList[(flag>>20) & (MAX_REND_SHADERS-1)];
-    }
-    static _inline CShaderResources* mfGetRes(uint32 nVal)
-    {
-        int nRes = (nVal >> 18) & (MAX_REND_SHADER_RES - 1);
-        return ((nRes) ? CShader::s_ShaderResources_known[nRes] : NULL);
-    }
-    static bool IsListEmpty(int nList, [[maybe_unused]] int nProcessID, SRenderListDesc* pRLD)
-    {
-        int nREs = pRLD->m_nEndRI[0][nList] - pRLD->m_nStartRI[0][nList];
-        nREs += pRLD->m_nEndRI[1][nList] - pRLD->m_nStartRI[1][nList];
-
-        if (!nREs)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    static bool IsListEmpty(int nList, [[maybe_unused]] int nProcessID, SRenderListDesc* pRLD, int nAW)
-    {
-        int nREs = pRLD->m_nEndRI[nAW][nList] - pRLD->m_nStartRI[nAW][nList];
-
-        if (!nREs)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    static uint32 BatchFlags(int nList, SRenderListDesc* pRLD)
-    {
-        uint32 nBatchFlags = 0;
-        int nREs = pRLD->m_nEndRI[0][nList] - pRLD->m_nStartRI[0][nList];
-        if (nREs)
-        {
-            nBatchFlags |= pRLD->m_nBatchFlags[0][nList];
-        }
-        nREs = pRLD->m_nEndRI[1][nList] - pRLD->m_nStartRI[1][nList];
-        if (nREs)
-        {
-            nBatchFlags |= pRLD->m_nBatchFlags[1][nList];
-        }
-        return nBatchFlags;
-    }
-
-    // Sort by SortVal member of RI
-    static void mfSortPreprocess(SRendItem* First, int Num);
-    // Sort by distance
-    static void mfSortByDist(SRendItem* First, int Num, bool bDecals, bool InvertedOrder = false);
-    // Sort by light
-    static void mfSortByLight(SRendItem* First, int Num, bool bSort, const bool bIgnoreRePtr, bool bSortDecals);
-    // Special sorting for ZPass (compromise between depth and batching)
-    static void mfSortForZPass(SRendItem* First, int Num);
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-    // Free all renditem lists. Renderer must be flushed.
-    static CThreadSafeWorkerContainer<SRendItem>& RendItems(int threadIndex, int listOrder, int listNum);
-
-    static int m_RecurseLevel[RT_COMMAND_BUF_COUNT];
-    static int m_StartFrust[RT_COMMAND_BUF_COUNT][MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS];
-    static int m_EndFrust[RT_COMMAND_BUF_COUNT][MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS];
-    static int m_ShadowsStartRI[RT_COMMAND_BUF_COUNT][MAX_SHADOWMAP_FRUSTUMS];
-    static int m_ShadowsEndRI[RT_COMMAND_BUF_COUNT][MAX_SHADOWMAP_FRUSTUMS];
-};
-
-//==================================================================
-
-struct SShaderPass;
-
-union UVertStreamPtr
-{
-    void* Ptr;
-    byte* PtrB;
-    SVF_P3F_C4B_T4B_N3F2* PtrVF_P3F_C4B_T4B_N3F2;
-};
-
-//==================================================================
-
-#define MAX_DYNVBS 4
-
-//==================================================================
-
-#define GS_HIZENABLE             0x00010000
-//==================================================================
-
-#if defined(NULL_RENDERER)
-struct SOnDemandD3DStreamProperties
-{
-};
-
-struct SOnDemandD3DVertexDeclaration
-{
-};
-
-struct SOnDemandD3DVertexDeclarationCache
-{
-};
-#else
-struct SOnDemandD3DStreamProperties
-{
-    D3D11_INPUT_ELEMENT_DESC* m_pElements;
-    uint32 m_nNumElements;
-};
-
-struct SOnDemandD3DVertexDeclaration
-{
-    AZStd::vector<D3D11_INPUT_ELEMENT_DESC> m_Declaration;
-};
-
-struct SOnDemandD3DVertexDeclarationCache
-{
-    ID3D11InputLayout* m_pDeclaration;
-};
-
-template <class IndexType>
-class FencedIB;
-template <class VertexType>
-class FencedVB;
-
-struct SVertexDeclaration
-{
-    int StreamMask;
-    AZ::Vertex::Format VertexFormat;
-    int InstAttrMask;
-    AZStd::vector<D3D11_INPUT_ELEMENT_DESC> m_Declaration;
-    ID3D11InputLayout* m_pDeclaration = nullptr;
-
-    // This caching structure is only used for auto-generated vertex formats for instanced renders.
-    // The caching format was previously invalid because it cached ID3D11InputLayout based only on the
-    // vertex format declaration, rather than based on the vertex format declaration with the vertex shader input
-    // table since a different IA layout will be generated whether a vertex shader uses different inputs or not
-    void* m_vertexShader = nullptr;
-
-    ~SVertexDeclaration()
-    {
-        SAFE_RELEASE(m_pDeclaration);
-    }
-};
-
-#endif
-
-struct SMSAA
-{
-    SMSAA()
-        : Type(0)
-        , Quality(0)
-        , m_pDepthTex(0)
-        , m_pZBuffer(0)
-    {
-    }
-
-    UINT Type;
-    DWORD Quality;
-#if defined(NULL_RENDERER)
-    void* m_pDepthTex;
-    void* m_pZBuffer;
-#else
-    D3DTexture* m_pDepthTex;
-    ID3D11DepthStencilView* m_pZBuffer;
-#endif
-};
-
-struct SProfInfo
-{
-    int NumPolys;
-    int NumDips;
-    CShader* pShader;
-    SShaderTechnique* pTechnique;
-    double Time;
-    int m_nItems;
-    SProfInfo()
-    {
-        NumPolys = 0;
-        NumDips = 0;
-        pShader = NULL;
-        pTechnique = NULL;
-        m_nItems = 0;
-    }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(pShader);
-        pSizer->AddObject(pTechnique);
-    }
-};
-
-struct SRTargetStat
-{
-    string m_Name;
-    uint32 m_nSize;
-    uint32 m_nWidth;
-    uint32 m_nHeight;
-    ETEX_Format m_eTF;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_Name);
-    }
-};
-
-
-struct SPipeStat
-{
-#if !defined(_RELEASE)
-    int m_NumRendHWInstances;
-    int m_RendHWInstancesPolysAll;
-    int m_RendHWInstancesPolysOne;
-    int m_RendHWInstancesDIPs;
-    int m_NumTextChanges;
-    int m_NumRTChanges;
-    int m_NumStateChanges;
-    int m_NumRendSkinnedObjects;
-    int m_NumVShadChanges;
-    int m_NumPShadChanges;
-    int m_NumGShadChanges;
-    int m_NumDShadChanges;
-    int m_NumHShadChanges;
-    int m_NumCShadChanges;
-    int m_NumVShaders;
-    int m_NumPShaders;
-    int m_NumGShaders;
-    int m_NumDShaders;
-    int m_NumHShaders;
-    int m_NumRTs;
-    int m_NumSprites;
-    int m_NumSpriteDIPS;
-    int m_NumSpritePolys;
-    int m_NumSpriteUpdates;
-    int m_NumSpriteAltasesUsed;
-    int m_NumSpriteCellsUsed;
-    int m_NumQIssued;
-    int m_NumQOccluded;
-    int m_NumQNotReady;
-    int m_NumQStallTime;
-    int m_NumImpostersUpdates;
-    int m_NumCloudImpostersUpdates;
-    int m_NumImpostersDraw;
-    int m_NumCloudImpostersDraw;
-    int m_NumTextures;
-    uint32 m_NumShadowPoolFrustums;
-    uint32 m_NumShadowPoolAllocsThisFrame;
-    uint32 m_NumShadowMaskChannels;
-    uint32 m_NumTiledShadingSkippedLights;
-#endif
-    int m_NumPSInstructions;
-    int m_NumVSInstructions;
-    int m_RTCleared;
-    int m_RTClearedSize;
-    int m_RTCopied;
-    int m_RTCopiedSize;
-    int m_RTSize;
-
-    CHWShader* m_pMaxPShader;
-    CHWShader* m_pMaxVShader;
-    void* m_pMaxPSInstance;
-    void* m_pMaxVSInstance;
-
-    size_t m_ManagedTexturesStreamSysSize;
-    size_t m_ManagedTexturesStreamVidSize;
-    size_t m_ManagedTexturesSysMemSize;
-    size_t m_ManagedTexturesVidMemSize;
-    size_t m_DynTexturesSize;
-    size_t m_MeshUpdateBytes;
-    size_t m_DynMeshUpdateBytes;
-    float m_fOverdraw;
-    float m_fSkinningTime;
-    float m_fPreprocessTime;
-    float m_fSceneTimeMT;
-    float m_fTexUploadTime;
-    float m_fTexRestoreTime;
-    float m_fOcclusionTime;
-    float m_fRenderTime;
-    float m_fEnvCMapUpdateTime;
-    float m_fEnvTextUpdateTime;
-
-    int m_ImpostersSizeUpdate;
-    int m_CloudImpostersSizeUpdate;
-
-#if REFRACTION_PARTIAL_RESOLVE_STATS
-    float m_fRefractionPartialResolveEstimatedCost;
-    int m_refractionPartialResolveCount;
-    int m_refractionPartialResolvePixelCount;
-#endif
-
-#if defined(ENABLE_PROFILING_CODE)
-    int m_NumRendMaterialBatches;
-    int m_NumRendGeomBatches;
-    int m_NumRendInstances;
-
-    int m_nDIPs[EFSLIST_NUM];
-    int m_nInsts;
-    int m_nInstCalls;
-    int m_nPolygons[EFSLIST_NUM];
-    int m_nPolygonsByTypes[EFSLIST_NUM][EVCT_NUM][2];
-#endif
-
-#if defined(ENABLE_ART_RT_TIME_ESTIMATE)
-    float m_actualRenderTimeMinusPost;
-#endif
-
-    float m_fTimeDIPs[EFSLIST_NUM];
-    float m_fTimeDIPsZ;
-    float m_fTimeDIPsAO;
-    float m_fTimeDIPsRAIN;
-    float m_fTimeDIPsDeferredLayers;
-    float m_fTimeDIPsSprites;
-} _ALIGN(128);
-
-
-//Batch flags.
-// - When adding/removing batch flags, please, update sBatchList static list in D3DRendPipeline.cpp
-enum EBatchFlags
-{
-    FB_GENERAL        = 0x1,
-    FB_TRANSPARENT    = 0x2,
-    FB_SKIN           = 0x4,
-    FB_Z              = 0x8,
-    FB_FUR            = 0x10,
-    FB_ZPREPASS       = 0x20,
-    FB_PREPROCESS     = 0x40,
-    FB_MOTIONBLUR     = 0x80,
-    FB_POST_3D_RENDER = 0x100,
-    FB_MULTILAYERS    = 0x200,
-    FB_COMPILED_OBJECT = 0x400,
-    FB_CUSTOM_RENDER  = 0x800,
-    FB_SOFTALPHATEST  = 0x1000,
-    FB_LAYER_EFFECT   = 0x2000,
-    FB_WATER_REFL     = 0x4000,
-    FB_WATER_CAUSTIC  = 0x8000,
-    FB_DEBUG          = 0x10000,
-    FB_PARTICLES_THICKNESS = 0x20000,
-    FB_TRANSPARENT_AFTER_DOF = 0x40000, // for transparent render element skip Depth of field effect
-    FB_EYE_OVERLAY    = 0x80000,
-
-    FB_MASK           = 0xfffff //! FB flags cannot exceed 0xfffff
-};
-
-
-// Commit flags
-#define FC_TARGETS        1
-#define FC_GLOBAL_PARAMS  2
-#define FC_PER_INSTANCE_PARAMS 4
-#define FC_MATERIAL_PARAMS     0x10
-#define FC_ALL            0x1f
-
-
-// m_RP.m_Flags
-#define RBF_NEAREST          0x10000
-
-// m_RP.m_TI.m_PersFlags
-#define RBPF_DRAWTOTEXTURE   (1 << 16)     // 0x10000
-#define RBPF_MIRRORCAMERA    (1 << 17)     // 0x20000
-#define RBPF_MIRRORCULL      (1 << 18)     // 0x40000
-
-#define RBPF_ZPASS             (1 << 19)   // 0x80000
-#define RBPF_SHADOWGEN         (1 << 20)   // 0x100000
-
-#define RBPF_FP_DIRTY          (1 << 21)   // 0x200000
-
-#define RBPF_NO_SHADOWGEN      (1 << 22)
-
-#define RBPF_IMPOSTERGEN       (1 << 23)
-#define RBPF_MAKESPRITE        (1 << 24)   // 0x1000000
-// CRY DX12
-#define RBPF_FP_MATRIXDIRTY    (1 << 25)
-
-#define RBPF_HDR               (1 << 26)
-#define RBPF_REVERSE_DEPTH     (1 << 27)
-#define RBPF_ENCODE_HDR        (1 << 29)
-#define RBPF_OBLIQUE_FRUSTUM_CLIPPING  (1 << 30)
-
-
-// m_RP.m_PersFlags1
-#define RBPF1_USESTREAM       (1 << 0)
-#define RBPF1_USESTREAM_MASK  ((1 << VSF_NUM) - 1)
-
-#define RBPF1_IN_CLEAR        (1 << 17)
-
-#define RBPF1_SKIP_AFTER_POST_PROCESS   (1 << 18)
-
-// m_RP.m_PersFlags2
-#define RBPF2_NOSHADERFOG      (1 << 0)
-#define RBPF2_RAINRIPPLES       (1 << 1)
-#define RBPF2_NOALPHABLEND     (1 << 2)
-#define RBPF2_SINGLE_FORWARD_LIGHT_PASS  (1 << 3)
-#define RBPF2_MSAA_RESTORE_SAMPLE_MASK         (1 << 4)
-#define RBPF2_READMASK_RESERVED_STENCIL_BIT      (1 << 5)
-#define RBPF2_POST_3D_RENDERER_PASS  (1 << 6)
-#define RBPF2_LENS_OPTICS_COMPOSITE  (1 << 7)
-#define RBPF2_HDR_FP16         (1 << 9)
-#define RBPF2_CUSTOM_SHADOW_PASS (1 << 10)
-#define RBPF2_CUSTOM_RENDER_PASS (1 << 11)
-// UNUSED: (1<<12)
-
-#define RBPF2_COMMIT_CM        (1 << 13)
-#define RBPF2_ZPREPASS         (1 << 14)
-
-#define RBPF2_FORWARD_SHADING_PASS  (1 << 15)
-
-#define RBPF2_MSAA_STENCILCULL  (1 << 16)
-
-#define RBPF2_THERMAL_RENDERMODE_TRANSPARENT_PASS (1 << 17)
-#define RBPF2_NOALPHATEST     (1 << 18)
-#define RBPF2_WATERRIPPLES    (1 << 19)
-#define RBPF2_ALLOW_DEFERREDSHADING  (1 << 20)
-
-#define RBPF2_COMMIT_PF       (1 << 21)
-#define RBPF2_MSAA_SAMPLEFREQ_PASS  (1 << 22)
-#define RBPF2_DRAWTOCUBE      (1 << 23)
-
-#define RBPF2_MOTIONBLURPASS     (1 << 24)
-#define RBPF2_MATERIALLAYERPASS  (1 << 25)
-#define RBPF2_DISABLECOLORWRITES (1 << 26)
-
-#define RBPF2_NOPOSTAA  (1 << 27)
-#define RBPF2_SKIN        (1 << 28)
-
-#define RBPF2_LIGHTSHAFTS        (1 << 29)
-#define RBPF2_WRITEMASK_RESERVED_STENCIL_BIT      (1 << 30)           // 0x010
-#define RBPF2_HALFRES_PARTICLES  (1 << 31)
-
-// m_RP.m_FlagsPerFlush
-#define RBSI_LOCKCULL                               0x2
-#define RBSI_EXTERN_VMEM_BUFFERS    0x800000
-#define RBSI_INSTANCED                          0x10000000
-#define RBSI_CUSTOM_PREVMATRIX    0x20000000
-
-// m_RP.m_ShaderLightMask
-#define SLMF_DIRECT       0
-#define SLMF_POINT        1
-#define SLMF_PROJECTED    2
-#define SLMF_TYPE_MASK    (SLMF_POINT | SLMF_PROJECTED)
-
-#define SLMF_LTYPE_SHIFT  8
-#define SLMF_LTYPE_BITS   4
-
-struct SLightPass
-{
-    SRenderLight* pLights[4];
-    uint32 nStencLTMask;
-    uint32 nLights;
-    uint32 nLTMask;
-    bool bRect;
-    RectI rc;
-};
-
-#define MAX_STREAMS 16
-
-struct SStreamInfo
-{
-    const void* pStream;
-    int nOffset;
-    int nStride;
-
-    SStreamInfo() {}
-    SStreamInfo(const void* stream, int offset, int stride)
-        : pStream(stream)
-        , nOffset(offset)
-        , nStride(stride) {}
-
-    SStreamInfo& operator=(const CRendElementBase::SGeometryStreamInfo& stream)
-    {
-        pStream = stream.pStream;
-        nOffset = stream.nOffset;
-        nStride = stream.nStride;
-        return *this;
-    }
-
-    inline bool operator==(const SStreamInfo& other) const
-    {
-        return pStream == other.pStream && nOffset == other.nOffset && nStride == other.nStride;
-    }
-};
-
-struct SFogState
-{
-    bool m_bEnable;
-    ColorF m_FogColor;
-    ColorF m_CurColor;
-
-    bool operator != (const SFogState& fs) const
-    {
-        return m_FogColor != fs.m_FogColor;
-    }
-};
-
-enum EShapeMeshType
-{
-    SHAPE_PROJECTOR = 0,
-    SHAPE_PROJECTOR1,
-    SHAPE_PROJECTOR2,
-    SHAPE_CLIP_PROJECTOR,
-    SHAPE_CLIP_PROJECTOR1,
-    SHAPE_CLIP_PROJECTOR2,
-    SHAPE_SIMPLE_PROJECTOR,
-    SHAPE_SPHERE,
-    SHAPE_BOX,
-    SHAPE_MAX,
-};
-
-struct SThreadInfo
-{
-    uint32 m_PersFlags;          // Never reset
-    float m_RealTime;
-
-    Matrix44A m_matView = Matrix44A(IDENTITY);
-    Matrix44A m_matProj = Matrix44A(IDENTITY);
-
-    CCamera m_cam;  // current camera
-    int m_nFrameID;                         // with recursive calls, access through GetFrameID(true)
-    uint32 m_nFrameUpdateID;    // without recursive calls, access through GetFrameID(false)
-    int     m_arrZonesRoundId[MAX_PREDICTION_ZONES];        // rounds ID from 3D engine, useful for texture streaming
-    SFogState m_FS;
-    CRenderObject* m_pIgnoreObject;
-
-    Plane m_pObliqueClipPlane;
-    bool m_bObliqueClipPlane;
-
-    byte m_eCurColorOp;
-    byte m_eCurAlphaOp;
-    byte m_eCurColorArg;
-    byte m_eCurAlphaArg;
-    bool m_sRGBWrite {
-        false
-    };
-
-    PerFrameParameters m_perFrameParameters;
-
-    ~SThreadInfo() {}
-    SThreadInfo& operator = (const SThreadInfo& ti)
-    {
-        if (&ti == this)
-        {
-            return *this;
-        }
-        m_PersFlags = ti.m_PersFlags;
-        m_RealTime = ti.m_RealTime;
-        m_matView = ti.m_matView;
-        m_matProj = ti.m_matProj;
-        m_cam = ti.m_cam;
-        m_nFrameID = ti.m_nFrameID;
-        m_nFrameUpdateID = ti.m_nFrameUpdateID;
-        for (int z = 0; z < MAX_PREDICTION_ZONES; z++)
-        {
-            m_arrZonesRoundId[z] = ti.m_arrZonesRoundId[z];
-        }
-        m_FS = ti.m_FS;
-        m_perFrameParameters = ti.m_perFrameParameters;
-        m_pIgnoreObject = ti.m_pIgnoreObject;
-        memcpy(&m_pObliqueClipPlane, &ti.m_pObliqueClipPlane, sizeof(m_pObliqueClipPlane));
-        m_bObliqueClipPlane = ti.m_bObliqueClipPlane;
-        m_eCurColorOp = ti.m_eCurColorOp;
-        m_eCurAlphaOp = ti.m_eCurAlphaOp;
-        m_eCurColorArg = ti.m_eCurColorArg;
-        m_eCurAlphaArg = ti.m_eCurAlphaArg;
-        m_sRGBWrite = ti.m_sRGBWrite;
-        return *this;
-    }
-};
-
-
-#ifdef STRIP_RENDER_THREAD
-struct SSingleThreadInfo
-    : public SThreadInfo
-{
-    SThreadInfo& operator[] (const int) {return *this; }
-    const SThreadInfo& operator[] (const int) const {return *this; }
-};
-#endif
-
-
-// Render pipeline structure
-struct SRenderPipeline
-{
-    CShader* m_pShader;
-    CShader* m_pReplacementShader;
-    CRenderObject* m_pCurObject;
-    CRenderObject* m_pIdendityRenderObject;
-    IRenderElement* m_pRE;
-    CRendElementBase* m_pEventRE;
-    int m_RendNumVerts;
-    uint32 m_nBatchFilter;           // Batch flags ( FB_ )
-    SShaderTechnique* m_pRootTechnique;
-    SShaderTechnique* m_pCurTechnique;
-    SShaderPass* m_pCurPass;
-    uint32 m_CurPassBitMask;
-    int m_nShaderTechnique;
-    int m_nShaderTechniqueType;
-    CShaderResources* m_pShaderResources;
-    CRenderObject* m_pPrevObject;
-    int m_nLastRE;
-    TArray<SRendItem*> m_RIs[MAX_REND_GEOMS_IN_BATCH];
-
-    ColorF m_CurGlobalColor;
-
-    float m_fMinDistance;               // min distance to texture
-    uint64 m_ObjFlags;             // Instances flag for batch (merged)
-    int m_Flags;                // Reset on start pipeline
-
-    EShapeMeshType m_nDeferredPrimitiveID;
-    int m_nZOcclusionBufferID;
-
-    threadID m_nFillThreadID;
-    threadID m_nProcessThreadID;
-    SThreadInfo m_TI[RT_COMMAND_BUF_COUNT];
-    SThreadInfo m_OldTI[MAX_RECURSION_LEVELS];
-    // SFogVolumeData container will be used to accumulate the fog volume influences.
-    CThreadSafeRendererContainer<SFogVolumeData> m_fogVolumeContibutionsData[RT_COMMAND_BUF_COUNT];
-   
-    uint32 m_PersFlags1;        // Persistent flags - never reset
-    uint32 m_PersFlags2;          // Persistent flags - never reset
-    int m_FlagsPerFlush;          // Flags which resets for each shader flush
-    uint32 m_nCommitFlags;
-    uint32 m_FlagsStreams_Decl;
-    uint32 m_FlagsStreams_Stream;
-    AZ::Vertex::Format m_CurVFormat;
-    uint32 m_FlagsShader_LT;      // Shader light mask
-    uint64 m_FlagsShader_RT;    // Shader runtime mask
-    uint32 m_FlagsShader_MD;      // Shader texture modificator mask
-    uint32 m_FlagsShader_MDV;     // Shader vertex modificator mask
-    uint32 m_nShaderQuality;
-
-    void (* m_pRenderFunc)();
-
-    uint32 m_CurGPRAllocStateCommit;
-    uint32 m_CurGPRAllocState;
-    int m_CurHiZState;
-
-    uint32 m_CurState;
-    uint32 m_StateOr;
-    uint32 m_StateAnd;
-    int m_CurAlphaRef;
-    uint32 m_MaterialStateOr;
-    uint32 m_MaterialStateAnd;
-    int m_MaterialAlphaRef;
-    uint32 m_ForceStateOr;
-    uint32 m_ForceStateAnd;
-    bool m_bIgnoreObjectAlpha;
-    ECull m_eCull;
-    uint32 m_previousPersFlags = 0;
-
-    int m_CurStencilState;
-    uint32 m_CurStencMask;
-    uint32 m_CurStencWriteMask;
-    uint32 m_CurStencRef;
-    int m_CurStencilRefAndMask;
-    int m_CurStencilCullFunc;
-
-    SStreamInfo m_VertexStreams[MAX_STREAMS];
-    void* m_pIndexStream;
-
-    uint32 m_IndexStreamOffset;
-    RenderIndexType m_IndexStreamType;
-
-    bool m_bFirstPass;
-    uint32 m_nNumRendPasses;
-    int m_NumShaderInstructions;
-
-    string m_sExcludeShader;
-
-    TArray<SProfInfo> m_Profile;
-
-    CCamera m_PrevCamera;
-
-    SRenderListDesc* m_pRLD;
-
-    uint32 m_nRendFlags;
-    bool m_bUseHDR;
-    int m_nPassGroupID;           // EFSLIST_ pass type
-    int m_nPassGroupDIP;          // EFSLIST_ pass type
-    int m_nSortGroupID;
-    uint32 m_nFlagsShaderBegin;
-    uint8 m_nCurrResolveBounds[4];
-
-    Vec2 m_CurDownscaleFactor;
-
-    ERenderQuality m_eQuality;
-
-    TArray<ShadowMapFrustum> m_SMFrustums[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-    TArray<int> m_SMCustomFrustumIDs[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-    CThreadSafeWorkerContainer<CustomShadowMapFrustumData> m_arrCustomShadowMapFrustumData[RT_COMMAND_BUF_COUNT];
-
-    struct SShadowFrustumToRender
-    {
-        ShadowMapFrustum* pFrustum;
-        int nRecursiveLevel;
-        int nLightID;
-        SRenderLight* pLight;
-    } _ALIGN(16);
-    TArray<SShadowFrustumToRender> SShadowFrustumToRenderList[RT_COMMAND_BUF_COUNT];
-    TArray<SRenderLight> m_DLights[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-    SLightPass m_LPasses[MAX_REND_LIGHTS];
-    float m_fProfileTime;
-
-    struct ShadowInfo
-    {
-        ShadowMapFrustum* m_pCurShadowFrustum;
-        Vec3 vViewerPos;
-        int m_nOmniLightSide;
-    } m_ShadowInfo;
-
-    DynArray<SDeferredDecal> m_DeferredDecals[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-    bool m_isDeferrredNormalDecals[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-
-    UVertStreamPtr m_StreamPtrTang;
-    UVertStreamPtr m_NextStreamPtrTang;
-
-    UVertStreamPtr m_StreamPtr;
-    UVertStreamPtr m_NextStreamPtr;
-    int m_StreamStride;
-    uint m_StreamOffsetTC;
-    uint m_StreamOffsetColor;
-
-    float m_fLastWaterFOVUpdate;
-    Vec3 m_LastWaterViewdirUpdate;
-    Vec3 m_LastWaterUpdirUpdate;
-    Vec3 m_LastWaterPosUpdate;
-    float m_fLastWaterUpdate;
-    int m_nLastWaterFrameID;
-
-    bool m_depthWriteStateUsed;
-
-#if !defined(NULL_RENDERER)
-    SMSAA   m_MSAAData;
-    bool IsMSAAEnabled() const { return m_MSAAData.Type > 0; }
-
-    enum
-    {
-        nNumParticleVertexIndexBuffer = 3
-    };
-
-    // particle date for writing directly to VMEM
-    FencedVB<byte>* m_pParticleVertexBuffer[nNumParticleVertexIndexBuffer];
-    FencedIB <uint16>* m_pParticleIndexBuffer[nNumParticleVertexIndexBuffer];
-
-    // During writing, we only expose the base Video Memory pointer
-    // and the offsets to the next free memory in this buffer
-    byte* m_pParticleVertexVideoMemoryBase[nNumParticleVertexIndexBuffer];
-    byte* m_pParticleindexVideoMemoryBase[nNumParticleVertexIndexBuffer];
-
-    uint32 m_nParticleVertexOffset[nNumParticleVertexIndexBuffer];
-    uint32 m_nParticleIndexOffset[nNumParticleVertexIndexBuffer];
-
-    // total amount of allocated memory for particle vertex/index buffers
-    uint32 m_nParticleVertexBufferAvailableMemory;
-    uint32 m_nParticleIndexBufferAvailableMemory;
-
-
-    int m_nStreamOffset[3]; // deprecated!
-
-    AZ::Vertex::Format m_vertexFormats[eVF_Max];
-    SOnDemandD3DVertexDeclaration m_D3DVertexDeclarations[eVF_Max];
-    AZStd::unordered_map<AZ::u32, SOnDemandD3DVertexDeclarationCache> m_D3DVertexDeclarationCache[1 << VSF_NUM][2]; // [StreamMask][Morph][VertexFormatCRC]
-    SOnDemandD3DStreamProperties m_D3DStreamProperties[VSF_NUM];
-
-    TArray<SVertexDeclaration*> m_CustomVD;
-#else
-    bool IsMSAAEnabled() const { return false; }
-#endif
-
-    uint16* m_RendIndices;
-    uint16* m_SysRendIndices;
-    byte* m_SysArray;
-    int    m_SizeSysArray;
-
-    TArray<byte> m_SysVertexPool[RT_COMMAND_BUF_COUNT];
-    TArray<uint16> m_SysIndexPool[RT_COMMAND_BUF_COUNT];
-
-    int m_RendNumGroup;
-    int m_RendNumIndices;
-    int m_FirstIndex;
-    int m_FirstVertex;
-
-    // members for external vertex/index buffers
-#if !defined(NULL_RENDERER)
-    FencedVB<byte>*            m_pExternalVertexBuffer;
-    FencedIB<uint16>*  m_pExternalIndexBuffer;
-    int m_nExternalVertexBufferFirstIndex;
-    int m_nExternalVertexBufferFirstVertex;
-#endif
-
-    // [Shader System TO DO] - change this so that we don't deal with static slots assignments
-    // The following  structure is practically used only once to set Instance texture coord matrix.
-    SEfResTexture* m_ShaderTexResources[MAX_TMU];
-
-    int m_Frame;
-    int m_FrameMerge;
-
-    float m_fCurOpacity;
-
-    SPipeStat m_PS[RT_COMMAND_BUF_COUNT];
-    DynArray<SRTargetStat> m_RTStats;
-
-    int m_MaxVerts;
-    int m_MaxTris;
-
-    int m_RECustomTexBind[8];
-    int m_ShadowCustomTexBind[8];
-    bool m_ShadowCustomComparisonSampling[8];
-
-    CRenderView* m_pCurrentFillView;
-    CRenderView* m_pCurrentRenderView;
-    std::shared_ptr<CRenderView> m_pRenderViews[RT_COMMAND_BUF_COUNT];
-    //===================================================================
-    // Input render data
-    SRenderLight* m_pSunLight;
-    CThreadSafeWorkerContainer <CRenderObject*> m_TempObjects[RT_COMMAND_BUF_COUNT];
-    CRenderObject* m_ObjectsPool;
-    uint32 m_nNumObjectsInPool;
-
-#if !defined(_RELEASE)
-    //===================================================================
-    // Drawcall count debug view - per Node - r_stats 6
-    IRenderer::RNDrawcallsMapNode m_pRNDrawCallsInfoPerNode[RT_COMMAND_BUF_COUNT];
-
-    // Functionality for retrieving previous frames stats to use this frame
-    IRenderer::RNDrawcallsMapNode m_pRNDrawCallsInfoPerNodePreviousFrame[RT_COMMAND_BUF_COUNT];
-
-    //===================================================================
-    // Drawcall count debug view - per mesh - perf hud renderBatchStats
-    IRenderer::RNDrawcallsMapMesh m_pRNDrawCallsInfoPerMesh[RT_COMMAND_BUF_COUNT];
-
-    // Functionality for retrieving previous frames stats to use this frame
-    IRenderer::RNDrawcallsMapMesh m_pRNDrawCallsInfoPerMeshPreviousFrame[RT_COMMAND_BUF_COUNT];
-#endif
-
-    //================================================================
-    // Render elements..
-
-    class CREHDRProcess* m_pREHDR;
-    class CREDeferredShading* m_pREDeferredShading;
-    class CREPostProcess* m_pREPostProcess;
-
-    //=================================================================
-    // WaveForm tables
-    static const uint32 sSinTableCount = 1024;
-    float m_tSinTable[sSinTableCount];
-
-    // For explicit geometry cache motion blur
-    Matrix44A* m_pPrevMatrix;
-
-public:
-    SRenderPipeline()
-        : m_pShader(0)
-        , m_nShaderTechnique(-1)
-        , m_pCurTechnique(NULL)
-        , m_pREPostProcess(NULL)
-        , m_CurDownscaleFactor(Vec2(1.0f, 1.0f))
-        , m_IndexStreamOffset(~0)
-        , m_IndexStreamType(Index16)
-        , m_ObjectsPool(NULL)
-    {}
-
-    ~SRenderPipeline()
-    {
-#if !defined(NULL_RENDERER)
-        for (unsigned int i = 0, n = m_CustomVD.Num(); i < n; i++)
-        {
-            delete m_CustomVD[i];
-        }
-#endif
-    }
-
-    _inline SShaderTechnique* GetStartTechnique() const
-    {
-        if (m_pShader)
-        {
-            return m_pShader->mfGetStartTechnique(m_nShaderTechnique);
-        }
-        return NULL;
-    }
-
-    static const uint32 sNumObjectsInPool = 1024;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        // don't add the following as these are intermediate members (might be NULL) and already accounted for
-        //pSizer->AddObject( m_pCurPass );
-        //pSizer->AddObject( m_pCurTechnique );
-        //pSizer->AddObject( m_pRootTechnique );
-
-        pSizer->AddObject(m_pSunLight);
-        pSizer->AddObject(m_sExcludeShader);
-        pSizer->AddObject(m_Profile);
-
-        pSizer->AddObject(m_SysArray, m_SizeSysArray);
-        for (uint32 i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            pSizer->AddObject(m_TempObjects[i]);
-            for (uint32 j = 0; j < MAX_RECURSION_LEVELS; ++j)
-            {
-                pSizer->AddObject(m_DLights[i][j]);
-            }
-            pSizer->AddObject(m_SysVertexPool[i]);
-            pSizer->AddObject(m_SysIndexPool[i]);
-            pSizer->AddObject(m_fogVolumeContibutionsData[i]);
-        }
-        pSizer->AddObject(m_RIs);
-        pSizer->AddObject(m_RTStats);
-    }
-
-    void SetRenderElement(IRenderElement* renderElement)
-    {
-        m_pRE = renderElement;
-    }
-};
-
-extern CryCriticalSection m_sREResLock;
-
-///////////////////////////////////////////////////////////////////////////////
-// sort opeartors for render items
-struct SCompareItemPreprocess
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        if (a.nBatchFlags != b.nBatchFlags)
-        {
-            return a.nBatchFlags < b.nBatchFlags;
-        }
-
-        return a.SortVal < b.SortVal;
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareRendItem
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        /// Nearest objects should be rendered first
-        int nNearA = (a.ObjSort & FOB_HAS_PREVMATRIX);
-        int nNearB = (b.ObjSort & FOB_HAS_PREVMATRIX);
-        if (nNearA != nNearB)               // Sort by nearest flag
-        {
-            return nNearA > nNearB;
-        }
-
-        if (a.SortVal != b.SortVal)         // Sort by shaders
-        {
-            return a.SortVal < b.SortVal;
-        }
-
-        if (a.nTextureID != b.nTextureID)
-        {
-            return a.nTextureID < b.nTextureID; // Sort by object custom texture (usually terrain sector texture)
-        }
-
-        if (a.pElem != b.pElem)               // Sort by geometry
-        {
-            return a.pElem < b.pElem;
-        }
-
-        return (a.ObjSort & 0xFFFF) < (b.ObjSort & 0xFFFF);   // Sort by distance
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareRendItemZPass
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        const int layerSize = 50;  // Note: ObjSort contains round(entityDist * 2) for meshes
-
-        // Sort by nearest flag
-        int nNearA = (a.ObjSort & FOB_HAS_PREVMATRIX);
-        int nNearB = (b.ObjSort & FOB_HAS_PREVMATRIX);
-        if (nNearA != nNearB)
-        {
-            return nNearA > nNearB;
-        }
-
-        if (a.SortVal != b.SortVal)    // Sort by shaders
-        {
-            return a.SortVal < b.SortVal;
-        }
-
-        // Sort by depth/distance layers
-        int depthLayerA = (a.ObjSort & 0xFFFF) / layerSize;
-        int depthLayerB = (b.ObjSort & 0xFFFF) / layerSize;
-        if (depthLayerA != depthLayerB)
-        {
-            return depthLayerA < depthLayerB;
-        }
-
-        if (a.nStencRef != b.nStencRef)
-        {
-            return a.nStencRef < b.nStencRef;
-        }
-        if (a.nTextureID != b.nTextureID)
-        {
-            return a.nTextureID < b.nTextureID; // Sort by object custom texture (usually terrain sector texture)
-        }
-
-        // Sorting by geometry less important than sorting by shaders
-        //if (a.Item != b.Item)    // Sort by geometry
-        //  return a.Item < b.Item;
-
-        return (a.ObjSort & 0xFFFF) < (b.ObjSort & 0xFFFF);    // Sort by distance
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareItem_Decal
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        uint32 objSortA_Low(a.ObjSort & 0xFFFF);
-        uint32 objSortA_High(a.ObjSort & ~0xFFFF);
-        uint32 objSortB_Low(b.ObjSort & 0xFFFF);
-        uint32 objSortB_High(b.ObjSort & ~0xFFFF);
-
-        if (objSortA_Low != objSortB_Low)
-        {
-            return objSortA_Low < objSortB_Low;
-        }
-
-        if (a.SortVal != b.SortVal)
-        {
-            return a.SortVal < b.SortVal;
-        }
-
-        return objSortA_High < objSortB_High;
-    }
-};
-
-struct SCompareItem_Terrain
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        IRenderElement* pREa = a.pElem;
-        IRenderElement* pREb = b.pElem;
-
-        if (pREa->GetCustomTexBind(0) != pREb->GetCustomTexBind(0))
-        {
-            return pREa->GetCustomTexBind(0) < pREb->GetCustomTexBind(0);
-        }
-
-        return a.ObjSort < b.ObjSort;
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareItem_TerrainLayers
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        //if (a.ObjSort != b.ObjSort)
-        //  return a.ObjSort < b.ObjSort;
-
-        float pSurfTypeA = ((float*)a.pElem->GetCustomData())[8];
-        float pSurfTypeB = ((float*)b.pElem->GetCustomData())[8];
-        if (pSurfTypeA != pSurfTypeB)
-        {
-            return (pSurfTypeA < pSurfTypeB);
-        }
-
-        pSurfTypeA = ((float*)a.pElem->GetCustomData())[9];
-        pSurfTypeB = ((float*)b.pElem->GetCustomData())[9];
-        if (pSurfTypeA != pSurfTypeB)
-        {
-            return (pSurfTypeA < pSurfTypeB);
-        }
-
-        pSurfTypeA = ((float*)a.pElem->GetCustomData())[11];
-        pSurfTypeB = ((float*)b.pElem->GetCustomData())[11];
-        return (pSurfTypeA < pSurfTypeB);
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareDist
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        if (fcmp(a.fDist, b.fDist))
-        {
-            return a.rendItemSorter.ParticleCounter() < b.rendItemSorter.ParticleCounter();
-        }
-
-        return (a.fDist > b.fDist);
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareDistInverted
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        if (fcmp(a.fDist, b.fDist))
-        {
-            return a.rendItemSorter.ParticleCounter() > b.rendItemSorter.ParticleCounter();
-        }
-
-        return (a.fDist < b.fDist);
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareByRenderingPass
-{
-    bool operator()(const SRendItem& rA, const SRendItem& rB) const
-    {
-        return rA.rendItemSorter.IsRecursivePass() < rB.rendItemSorter.IsRecursivePass();
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareByOnlyStableFlagsOctreeID
-{
-    bool operator()(const SRendItem& rA, const SRendItem& rB) const
-    {
-        return rA.rendItemSorter < rB.rendItemSorter;
-    }
-};
diff --git a/Code/CryEngine/RenderDll/Common/RenderThread.cpp b/Code/CryEngine/RenderDll/Common/RenderThread.cpp
deleted file mode 100644
index f90c8e58b2..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderThread.cpp
+++ /dev/null
@@ -1,3862 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include <I3DEngine.h>
-#include <IFont.h>
-#include "RenderAuxGeom.h"
-#include "IColorGradingControllerInt.h"
-#include "PostProcess/PostEffects.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define RENDERTHREAD_CPP_SECTION_1 1
-#define RENDERTHREAD_CPP_SECTION_2 2
-#define RENDERTHREAD_CPP_SECTION_3 3
-#define RENDERTHREAD_CPP_SECTION_4 4
-#define RENDERTHREAD_CPP_SECTION_5 5
-#define RENDERTHREAD_CPP_SECTION_6 6
-#define RENDERTHREAD_CPP_SECTION_7 7
-#define RENDERTHREAD_CPP_SECTION_8 8
-#endif
-
-#if !defined(NULL_RENDERER)
-#include <DriverD3D.h>
-#endif
-
-#include "MainThreadRenderRequestBus.h"
-#include "Common/RenderView.h"
-#include "Common/Textures/TextureManager.h"
-#include "GraphicsPipeline/FurBendData.h"
-
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/Archive/IArchive.h>
-#include <AzCore/Debug/EventTraceDrillerBus.h>
-#include <IVideoRenderer.h>
-
-#ifdef STRIP_RENDER_THREAD
-    #define m_nCurThreadFill 0
-    #define m_nCurThreadProcess 0
-#endif
-
-#define MULTITHREADED_RESOURCE_CREATION
-
-#ifdef WIN32
-HWND SRenderThread::GetRenderWindowHandle()
-{
-    return (HWND)gRenDev->GetHWND();
-}
-#endif
-
-CryCriticalSection SRenderThread::s_rcLock;
-
-# define LOADINGLOCK_COMMANDQUEUE (void)0;
-
-void CRenderThread::Run()
-{
-    //f_Log = fopen("Mouse.txt", "w");
-    //fclose(f_Log);
-
-    CryThreadSetName(threadID(THREADID_NULL), RENDER_THREAD_NAME);
-    gEnv->pSystem->GetIThreadTaskManager()->MarkThisThreadForDebugging(RENDER_THREAD_NAME, true);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(RenderThread_cpp)
-#endif
-    threadID renderThreadId = ::GetCurrentThreadId();
-    gRenDev->m_pRT->m_nRenderThread = renderThreadId;
-    CNameTableR::m_nRenderThread = renderThreadId;
-    gEnv->pCryPak->SetRenderThreadId(AZStd::this_thread::get_id());
-    //SetThreadAffinityMask(GetCurrentThread(), 2);
-    m_started.Set();
-
-    gRenDev->m_pRT->Process();
-
-    // Check pointers, it's not guaranteed that system is still valid.
-    if (gEnv && gEnv->pSystem && gEnv->pSystem->GetIThreadTaskManager())
-    {
-        gEnv->pSystem->GetIThreadTaskManager()->MarkThisThreadForDebugging(RENDER_THREAD_NAME, false);
-    }
-}
-
-void CRenderThreadLoading::Run()
-{
-    CryThreadSetName(threadID(THREADID_NULL), RENDER_LOADING_THREAD_NAME);
-    gEnv->pSystem->GetIThreadTaskManager()->MarkThisThreadForDebugging(RENDER_LOADING_THREAD_NAME, true);
-    threadID renderThreadId = ::GetCurrentThreadId();
-    gRenDev->m_pRT->m_nRenderThreadLoading = renderThreadId;
-    CNameTableR::m_nRenderThread = renderThreadId;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(RenderThread_cpp)
-#endif
-
-    // We aren't interested in file access from the render loading thread, and this
-    // would overwrite the real render thread id
-    //gEnv->pCryPak->SetRenderThreadId( renderThreadId );
-    m_started.Set();
-
-    gRenDev->m_pRT->ProcessLoading();
-
-    // Check pointers, it's not guaranteed that system is still valid.
-    if (gEnv && gEnv->pSystem && gEnv->pSystem->GetIThreadTaskManager())
-    {
-        gEnv->pSystem->GetIThreadTaskManager()->MarkThisThreadForDebugging(RENDER_LOADING_THREAD_NAME, false);
-    }
-}
-
-void SRenderThread::SwitchMode(bool bEnableVideo)
-{
-    if (bEnableVideo)
-    {
-        assert(IsRenderThread());
-        if (m_pThreadLoading)
-        {
-            return;
-        }
-#if !defined(STRIP_RENDER_THREAD)
-        SSystemGlobalEnvironment* pEnv = iSystem->GetGlobalEnvironment();
-        if (pEnv && !pEnv->bTesting && !pEnv->IsEditor() && pEnv->pi.numCoresAvailableToProcess > 1 && CRenderer::CV_r_multithreaded > 0)
-        {
-            m_pThreadLoading = new CRenderThreadLoading(1);
-        }
-        m_eVideoThreadMode = eVTM_Active;
-        m_bQuitLoading = false;
-        StartRenderLoadingThread();
-#endif
-    }
-    else
-    {
-        m_eVideoThreadMode = eVTM_ProcessingStop;
-    }
-}
-
-SRenderThread::SRenderThread()
-{
-    m_eVideoThreadMode = eVTM_Disabled;
-    m_nRenderThreadLoading = 0;
-    m_pThreadLoading = 0;
-    m_pLoadtimeCallback = 0;
-    m_bEndFrameCalled = false;
-    m_bBeginFrameCalled = false;
-    m_bQuitLoading = false;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(RenderThread_cpp)
-#endif
-#if defined(USE_HANDLE_FOR_FINAL_FLUSH_SYNC)
-    m_FlushFinishedCondition = CreateEvent(NULL, FALSE, FALSE, "FlushFinishedCondition");
-#endif
-    Init(2);
-}
-
-threadID CNameTableR::m_nRenderThread = 0;
-
-void SRenderThread::Init(int nCPU)
-{
-    m_bQuit = false;
-#ifndef STRIP_RENDER_THREAD
-    m_nCurThreadFill = 0;
-    m_nCurThreadProcess = 0;
-#endif
-    InitFlushCond();
-    m_nRenderThread = ::GetCurrentThreadId();
-    CNameTableR::m_nRenderThread = m_nRenderThread;
-    m_nMainThread = m_nRenderThread;
-    m_bSuccessful = true;
-    m_pThread = NULL;
-    m_fTimeIdleDuringLoading = 0;
-    m_fTimeBusyDuringLoading = 0;
-#if !defined(STRIP_RENDER_THREAD)
-    SSystemGlobalEnvironment* pEnv = iSystem->GetGlobalEnvironment();
-    if (pEnv && !pEnv->bTesting && !pEnv->IsDedicated() && !pEnv->IsEditor() && pEnv->pi.numCoresAvailableToProcess > 1 && CRenderer::CV_r_multithreaded > 0)
-    {
-        m_nCurThreadProcess = 1;
-        m_pThread = new CRenderThread(nCPU);
-    }
-#ifndef CONSOLE_CONST_CVAR_MODE
-    else
-    {
-        CRenderer::CV_r_multithreaded = 0;
-    }
-#endif
-#else//STRIP_RENDER_THREAD
-    #ifndef CONSOLE_CONST_CVAR_MODE
-    CRenderer::CV_r_multithreaded = 0;
-    #endif
-#endif//STRIP_RENDER_THREAD
-    gRenDev->m_RP.m_nProcessThreadID = threadID(m_nCurThreadProcess);
-    gRenDev->m_RP.m_nFillThreadID = threadID(m_nCurThreadFill);
-
-    for (uint32 i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_Commands[i].Free();
-        m_Commands[i].Create(300 * 1024); // 300 to stop growing in MP levels
-        m_Commands[i].SetUse(0);
-        gRenDev->m_fTimeWaitForMain[i]   = 0;
-        gRenDev->m_fTimeWaitForRender[i] = 0;
-        gRenDev->m_fTimeProcessedRT[i]   = 0;
-        gRenDev->m_fTimeProcessedGPU[i]  = 0;
-    }
-    m_eVideoThreadMode = eVTM_Disabled;
-}
-
-SRenderThread::~SRenderThread()
-{
-    QuitRenderLoadingThread();
-    QuitRenderThread();
-#if defined(USE_HANDLE_FOR_FINAL_FLUSH_SYNC)
-    CloseHandle(m_FlushFinishedCondition);
-#endif
-}
-
-void SRenderThread::ValidateThreadAccess(ERenderCommand eRC)
-{
-    if (!IsMainThread() && !gRenDev->m_bStartLevelLoading)
-    {
-        CryFatalError("Trying to add a render command from a non-main thread, eRC = %d", (int)eRC);
-    }
-}
-
-//==============================================================================================
-// NOTE: Render commands can be added from main thread only
-
-bool SRenderThread::RC_CreateDevice()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    AZ_TRACE_METHOD();
-
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX) || defined(CREATE_DEVICE_ON_MAIN_THREAD)
-    return gRenDev->RT_CreateDevice();
-#else
-    if (IsRenderThread())
-    {
-        return gRenDev->RT_CreateDevice();
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CreateDevice, 0);
-    EndCommand(p);
-
-    FlushAndWait();
-
-    return !IsFailed();
-#endif
-}
-
-void SRenderThread::RC_ResetDevice()
-{
-    AZ_TRACE_METHOD();
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE) || defined(CREATE_DEVICE_ON_MAIN_THREAD)
-    gRenDev->RT_Reset();
-#else
-    if (IsRenderThread())
-    {
-        gRenDev->RT_Reset();
-        return;
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ResetDevice, 0);
-    EndCommand(p);
-
-    FlushAndWait();
-#endif
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(RenderThread_cpp)
-#endif
-
-void SRenderThread::RC_PreloadTextures()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return CTexture::RT_Precache();
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    {
-        byte* p = AddCommand(eRC_PreloadTextures, 0);
-        EndCommand(p);
-        FlushAndWait();
-    }
-}
-
-void SRenderThread::RC_Init()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    AZ_TRACE_METHOD();
-
-    if (IsRenderThread())
-    {
-        return gRenDev->RT_Init();
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_Init, 0);
-    EndCommand(p);
-
-    FlushAndWait();
-}
-void SRenderThread::RC_ShutDown(uint32 nFlags)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return gRenDev->RT_ShutDown(nFlags);
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ShutDown, 4);
-    AddDWORD(p, nFlags);
-
-    FlushAndWait();
-}
-
-
-void SRenderThread::RC_ResetGlass()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_ResetGlass();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ResetGlass, 0);
-    EndCommand(p);
-}
-
-
-void SRenderThread::RC_ResetToDefault()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->ResetToDefault();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ResetToDefault, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ParseShader (CShader* pSH, uint64 nMaskGen, uint32 flags, CShaderResources* pRes)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread(true))
-    {
-        return gRenDev->m_cEF.RT_ParseShader(pSH, nMaskGen, flags, pRes);
-    }
-
-    if (!IsMainThread(true))
-    {
-        pSH->AddRef();
-        if (pRes)
-        {
-            pRes->AddRef();
-        }
-
-        AZStd::function<void()> runOnMainThread = [this, pSH, nMaskGen, flags, pRes]()
-            {
-                RC_ParseShader(pSH, nMaskGen, flags, pRes);
-
-                pSH->Release();
-                if (pRes)
-                {
-                    pRes->Release();
-                }
-
-                // Make sure any materials using this shader get updated appropriately.
-                if (gEnv && gEnv->p3DEngine)
-                {
-                    gEnv->p3DEngine->UpdateShaderItems();
-                }
-            };
-
-        EBUS_QUEUE_FUNCTION(AZ::MainThreadRenderRequestBus, runOnMainThread);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    pSH->AddRef();
-    if (pRes)
-    {
-        pRes->AddRef();
-    }
-    byte* p = AddCommand(eRC_ParseShader, 12 + 2 * sizeof(void*));
-    AddPointer(p, pSH);
-    AddPointer(p, pRes);
-    AddDWORD64(p, nMaskGen);
-    AddDWORD(p, flags);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_UpdateShaderItem (SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread(true))
-    {
-        return gRenDev->RT_UpdateShaderItem(pShaderItem, pMaterial.get());
-    }
-
-    if (!IsMainThread(true))
-    {
-        AZStd::function<void()> runOnMainThread = [this, pShaderItem, pMaterial]()
-            {
-                RC_UpdateShaderItem(pShaderItem, pMaterial);
-            };
-
-        EBUS_QUEUE_FUNCTION(AZ::MainThreadRenderRequestBus, runOnMainThread);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    // We pass the raw pointer instead of the smart_ptr because writing/reading smart pointers from
-    // the render thread queue causes the ref count to be increased incorrectly in some platforms (e.g. 32 bit architectures). 
-    // Because of this we manually increment the reference count before adding it to the queue and decrement it when we finish using it in the RenderThread.
-    IMaterial* materialRawPointer = pMaterial.get();
-    if (materialRawPointer)
-    {
-        // Add a reference to prevent it from getting deleted before the RenderThread process the message.
-        materialRawPointer->AddRef();
-    }
-
-    if (m_eVideoThreadMode == eVTM_Disabled)
-    {
-        byte* p = AddCommand(eRC_UpdateShaderItem, sizeof(pShaderItem) + sizeof(materialRawPointer));
-        AddPointer(p, pShaderItem);
-        AddPointer(p, materialRawPointer);
-        EndCommand(p);
-    }
-    else
-    {
-        // Move command into loading queue, which will be executed in first render frame after loading is done
-        byte* p = AddCommandTo(eRC_UpdateShaderItem, sizeof(pShaderItem) + sizeof(materialRawPointer), m_CommandsLoading);
-        AddPointer(p, pShaderItem);
-        AddPointer(p, pMaterial);
-        EndCommandTo(p, m_CommandsLoading);
-    }
-}
-
-void SRenderThread::RC_RefreshShaderResourceConstants(SShaderItem* shaderItem, IMaterial* material)
-{
-    if (IsRenderThread())
-    {
-        return gRenDev->RT_RefreshShaderResourceConstants(shaderItem);
-    }
-
-    LOADINGLOCK_COMMANDQUEUE;
-
-    if (material)
-    {
-        // Add a reference to prevent it from getting deleted before the RenderThread process the message.
-        material->AddRef();
-    }
-
-    if (m_eVideoThreadMode == eVTM_Disabled)
-    {
-        byte* p = AddCommand(eRC_RefreshShaderResourceConstants, sizeof(SShaderItem*) + sizeof(IMaterial*));
-        AddPointer(p, shaderItem);
-        AddPointer(p, material);
-        EndCommand(p);
-    }
-    else
-    {
-        // Move command into loading queue, which will be executed in first render frame after loading is done
-        byte* p = AddCommandTo(eRC_RefreshShaderResourceConstants, sizeof(SShaderItem*) + sizeof(IMaterial*), m_CommandsLoading);
-        AddPointer(p, shaderItem);
-        AddPointer(p, material);
-        EndCommandTo(p, m_CommandsLoading);
-    }
-}
-
-void SRenderThread::RC_SetShaderQuality(EShaderType eST, EShaderQuality eSQ)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return gRenDev->m_cEF.RT_SetShaderQuality(eST, eSQ);
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetShaderQuality, 8);
-    AddDWORD(p, eST);
-    AddDWORD(p, eSQ);
-    EndCommand(p);
-}
-
-
-
-void SRenderThread::RC_ReleaseVBStream(void* pVB, int nStream)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_ReleaseVBStream(pVB, nStream);
-        return;
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReleaseVBStream, 4 + sizeof(void*));
-    AddPointer(p, pVB);
-    AddDWORD(p, nStream);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ForceMeshGC(bool instant, bool wait)
-{
-    AZ_TRACE_METHOD();
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (IsRenderThread())
-    {
-        CRenderMesh::Tick();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ForceMeshGC, 0);
-    EndCommand(p);
-
-    if (instant)
-    {
-        if (wait)
-        {
-            FlushAndWait();
-        }
-        else
-        {
-            SyncMainWithRender();
-        }
-    }
-}
-
-
-void SRenderThread::RC_DevBufferSync()
-{
-    AZ_TRACE_METHOD();
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (IsRenderThread())
-    {
-        gRenDev->m_DevBufMan.Sync(gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_DevBufferSync, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ReleasePostEffects()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        if (gRenDev->m_pPostProcessMgr)
-        {
-            gRenDev->m_pPostProcessMgr->ReleaseResources();
-        }
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReleasePostEffects, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ResetPostEffects(bool bOnSpecChange)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        if (gRenDev->m_RP.m_pREPostProcess)
-        {
-            gRenDev->m_RP.m_pREPostProcess->Reset(bOnSpecChange);
-        }
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(bOnSpecChange ? eRC_ResetPostEffectsOnSpecChange : eRC_ResetPostEffects, 0);
-    EndCommand(p);
-    FlushAndWait();
-}
-
-void SRenderThread::RC_DisableTemporalEffects()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return gRenDev->RT_DisableTemporalEffects();
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_DisableTemporalEffects, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_UpdateTextureRegion(CTexture* pTex, const byte* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return pTex->RT_UpdateTextureRegion(data, nX, nY, nZ, USize, VSize, ZSize, eTFSrc);
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    int nSize = CTexture::TextureDataSize(USize, VSize, ZSize, pTex->GetNumMips(), 1, eTFSrc);
-    byte* pData = new byte[nSize];
-    cryMemcpy(pData, data, nSize);
-    pTex->AddRef();
-
-    if (m_eVideoThreadMode == eVTM_Disabled)
-    {
-        byte* p = AddCommand(eRC_UpdateTexture, 28 + 2 * sizeof(void*));
-        AddPointer(p, pTex);
-        AddPointer(p, pData);
-        AddDWORD(p, nX);
-        AddDWORD(p, nY);
-        AddDWORD(p, nZ);
-        AddDWORD(p, USize);
-        AddDWORD(p, VSize);
-        AddDWORD(p, ZSize);
-        AddDWORD(p, eTFSrc);
-        EndCommand(p);
-    }
-    else
-    {
-        // Move command into loading queue, which will be executed in first render frame after loading is done
-        byte* p = AddCommandTo(eRC_UpdateTexture, 28 + 2 * sizeof(void*), m_CommandsLoading);
-        AddPointer(p, pTex);
-        AddPointer(p, pData);
-        AddDWORD(p, nX);
-        AddDWORD(p, nY);
-        AddDWORD(p, nZ);
-        AddDWORD(p, USize);
-        AddDWORD(p, VSize);
-        AddDWORD(p, ZSize);
-        AddDWORD(p, eTFSrc);
-        EndCommandTo(p, m_CommandsLoading);
-    }
-}
-
-bool SRenderThread::RC_DynTexUpdate(SDynTexture* pTex, int nNewWidth, int nNewHeight)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return pTex->RT_Update(nNewWidth, nNewHeight);
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_DynTexUpdate, 8 + sizeof(void*));
-    AddPointer(p, pTex);
-    AddDWORD(p, nNewWidth);
-    AddDWORD(p, nNewHeight);
-    EndCommand(p);
-
-    return true;
-}
-
-void SRenderThread::RC_EntityDelete(IRenderNode* pRenderNode)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return SDynTexture_Shadow::RT_EntityDelete(pRenderNode);
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_EntityDelete, sizeof(void*));
-    AddPointer(p, pRenderNode);
-    EndCommand(p);
-}
-
-void TexBlurAnisotropicVertical(CTexture* pTex, int nAmount, float fScale, float fDistribution, bool bAlphaOnly);
-
-void SRenderThread::RC_TexBlurAnisotropicVertical(CTexture* Tex, float fAnisoScale)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        TexBlurAnisotropicVertical(Tex, 1, 8 * max(1.0f - min(fAnisoScale / 100.0f, 1.0f), 0.2f), 1, false);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_TexBlurAnisotropicVertical, 4 + sizeof(void*));
-    AddPointer(p, Tex);
-    AddFloat(p, fAnisoScale);
-    EndCommand(p);
-}
-
-bool SRenderThread::RC_CreateDeviceTexture(CTexture* pTex, const byte* pData[6])
-{
-    AZ_TRACE_METHOD();
-#if !defined(MULTITHREADED_RESOURCE_CREATION)
-    if (IsRenderThread())
-#endif
-    {
-        return pTex->RT_CreateDeviceTexture(pData);
-    }
-
-#if !defined(MULTITHREADED_RESOURCE_CREATION)
-    if (pTex->IsAsyncDevTexCreation())
-    {
-        return !IsFailed();
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CreateDeviceTexture, 7 * sizeof(void*));
-    AddPointer(p, pTex);
-    for (int i = 0; i < 6; i++)
-    {
-        AddPointer(p, pData[i]);
-    }
-    EndCommand(p);
-    FlushAndWait();
-
-    return !IsFailed();
-#endif
-}
-
-void SRenderThread::RC_CopyDataToTexture(
-    void* pkVoid, unsigned int uiStartMip, unsigned int uiEndMip)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        CTexture* pkTexture = (CTexture*) pkVoid;
-        pkTexture->StreamCopyMipsTexToMem(uiStartMip, uiEndMip, true, NULL);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CopyDataToTexture, 8 + sizeof(void*));
-    AddPointer(p, pkVoid);
-    AddDWORD(p, uiStartMip);
-    AddDWORD(p, uiEndMip);
-    EndCommand(p);
-    // -- kenzo: removing this causes crashes because the texture
-    // might have already been destroyed. This needs to be fixed
-    // somehow that the createtexture doesn't require the renderthread
-    // (PC only issue)
-    FlushAndWait();
-}
-
-void SRenderThread::RC_ClearTarget(void* pkVoid, const ColorF& kColor)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        CTexture* pkTexture = (CTexture*) pkVoid;
-        gRenDev->RT_ClearTarget(pkTexture, kColor);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ClearTarget, sizeof(void*) + sizeof(ColorF));
-    AddPointer(p, pkVoid);
-    AddColor(p, kColor);
-    EndCommand(p);
-    FlushAndWait();
-}
-
-void SRenderThread::RC_CreateResource(SResourceAsync* pRes)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_CreateResource(pRes);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CreateResource, sizeof(void*));
-    AddPointer(p, pRes);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_StartVideoThread()
-{
-    AZ_TRACE_METHOD();
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_StartVideoThread, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_StopVideoThread()
-{
-    AZ_TRACE_METHOD();
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_StopVideoThread, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PreactivateShaders()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        CHWShader::RT_PreactivateShaders();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PreactivateShaders, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PrecacheShader(CShader* pShader, SShaderCombination& cmb, bool bForce, bool bCompressedOnly, CShaderResources* pRes)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderLoadingThread())
-    {
-        // Move command into loading queue, which will be executed in first render frame after loading is done
-        byte* p = AddCommandTo(eRC_PrecacheShader, sizeof(void*) * 2 + 8 + sizeof(SShaderCombination), m_CommandsLoading);
-        pShader->AddRef();
-        if (pRes)
-        {
-            pRes->AddRef();
-        }
-        AddPointer(p, pShader);
-        memcpy(p, &cmb, sizeof(cmb));
-        p += sizeof(SShaderCombination);
-        AddDWORD(p, bForce);
-        AddDWORD(p, bCompressedOnly);
-        AddPointer(p, pRes);
-        EndCommandTo(p, m_CommandsLoading);
-    }
-    else if (IsRenderThread())
-    {
-        pShader->mfPrecache(cmb, bForce, bCompressedOnly, pRes);
-        return;
-    }
-    else
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_PrecacheShader, sizeof(void*) * 2 + 8 + sizeof(SShaderCombination));
-        pShader->AddRef();
-        if (pRes)
-        {
-            pRes->AddRef();
-        }
-        AddPointer(p, pShader);
-        memcpy(p, &cmb, sizeof(cmb));
-        p += sizeof(SShaderCombination);
-        AddDWORD(p, bForce);
-        AddDWORD(p, bCompressedOnly);
-        AddPointer(p, pRes);
-        EndCommand(p);
-    }
-}
-
-void SRenderThread::RC_ReleaseBaseResource(CBaseResource* pRes)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderLoadingThread())
-    {
-        // Move command into loading queue, which will be executed in first render frame after loading is done
-        byte* p = AddCommandTo(eRC_ReleaseBaseResource, sizeof(void*), m_CommandsLoading);
-        AddPointer(p, pRes);
-        EndCommandTo(p, m_CommandsLoading);
-    }
-    else if (IsRenderThread())
-    {
-        SAFE_DELETE(pRes);
-        return;
-    }
-    else
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_ReleaseBaseResource, sizeof(void*));
-        AddPointer(p, pRes);
-        EndCommand(p);
-    }
-}
-
-void SRenderThread::RC_ReleaseFont(IFFont* font)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderLoadingThread())
-    {
-        // Move command into loading queue, which will be executed in first render frame after loading is done
-        byte* p = AddCommandTo(eRC_ReleaseFont, sizeof(void*), m_CommandsLoading);
-        AddPointer(p, font);
-        EndCommandTo(p, m_CommandsLoading);
-    }
-    else if (IsRenderThread())
-    {
-        SAFE_DELETE(font);
-        return;
-    }
-    else
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_ReleaseFont, sizeof(void*));
-        AddPointer(p, font);
-        EndCommand(p);
-    }
-}
-
-void SRenderThread::RC_ReleaseSurfaceResource(SDepthTexture* pRes)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        if (pRes)
-        {
-            pRes->Release(true);
-        }
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReleaseSurfaceResource, sizeof(void*));
-    AddPointer(p, pRes);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ReleaseResource(SResourceAsync* pRes)
-{
-    RC_ReleaseResource(AZStd::unique_ptr<SResourceAsync>(pRes));
-}
-
-void SRenderThread::RC_ReleaseResource(AZStd::unique_ptr<SResourceAsync> pRes)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_ReleaseResource(pRes.release());
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_ReleaseResource, sizeof(void*));
-    // Move owner over the SResourceAsync over to the renderer command queue
-    AddPointer(p, pRes.release());
-    EndCommand(p);
-}
-
-void SRenderThread::RC_UnbindTMUs()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_UnbindTMUs();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_UnbindTMUs, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_UnbindResources()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_UnbindResources();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_UnbindResources, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ReleaseRenderResources()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_ReleaseRenderResources();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReleaseRenderResources, 0);
-    EndCommand(p);
-}
-void SRenderThread::RC_CreateRenderResources()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_CreateRenderResources();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CreateRenderResources, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_CreateSystemTargets()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        CTexture::CreateSystemTargets();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CreateSystemTargets, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PrecacheDefaultShaders()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_PrecacheDefaultShaders();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PrecacheDefaultShaders, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_RelinkTexture(CTexture* pTex)
-{
-    if (IsRenderThread(true))
-    {
-        pTex->RT_Relink();
-        return;
-    }
-
-    if (!IsMainThread(true))
-    {
-        AZStd::function<void()> runOnMainThread = [this, pTex]()
-            {
-                RC_RelinkTexture(pTex);
-            };
-
-        EBUS_QUEUE_FUNCTION(AZ::MainThreadRenderRequestBus, runOnMainThread);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_RelinkTexture, sizeof(void*));
-    AddPointer(p, pTex);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_UnlinkTexture(CTexture* pTex)
-{
-    if (IsRenderThread())
-    {
-        pTex->RT_Unlink();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_UnlinkTexture, sizeof(void*));
-    AddPointer(p, pTex);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_CreateREPostProcess(CRendElementBase** re)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return gRenDev->RT_CreateREPostProcess(re);
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CreateREPostProcess, sizeof(void*));
-    AddPointer(p, re);
-    EndCommand(p);
-
-    FlushAndWait();
-}
-
-bool SRenderThread::RC_CheckUpdate2(CRenderMesh* pMesh, CRenderMesh* pVContainer, uint32 nStreamMask)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return pMesh->RT_CheckUpdate(pVContainer, nStreamMask);
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_UpdateMesh2, 8 + 2 * sizeof(void*));
-    AddPointer(p, pMesh);
-    AddPointer(p, pVContainer);
-    AddDWORD(p, nStreamMask);
-    EndCommand(p);
-
-    FlushAndWait();
-
-    return !IsFailed();
-}
-
-void SRenderThread::RC_ReleaseVB(buffer_handle_t  nID)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->m_DevBufMan.Destroy(nID);
-        return;
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReleaseVB, sizeof(buffer_handle_t));
-    AddDWORD64(p, nID);
-    EndCommand(p);
-}
-void SRenderThread::RC_ReleaseIB(buffer_handle_t  nID)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->m_DevBufMan.Destroy(nID);
-        return;
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReleaseIB, sizeof(buffer_handle_t));
-    AddDWORD64(p, nID);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, int nVerts, int nInds, const PublicRenderPrimitiveType nPrimType)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_DrawDynVB(pBuf, pInds, nVerts, nInds, nPrimType);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_DrawDynVB, Align4(20 + sizeof(SVF_P3F_C4B_T2F) * nVerts + sizeof(uint16) * nInds));
-    AddData(p, pBuf, sizeof(SVF_P3F_C4B_T2F) * nVerts);
-    AddData(p, pInds, sizeof(uint16) * nInds);
-    AddDWORD(p, nVerts);
-    AddDWORD(p, nInds);
-    AddDWORD(p, (int)nPrimType);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_DrawDynUiPrimitiveList(IRenderer::DynUiPrimitiveList& primitives, int totalNumVertices, int totalNumIndices)
-{
-    AZ_TRACE_METHOD();
-
-    if (IsRenderThread())
-    {
-        // When this is called on the render thread we do not currently combine the draw calls since we would
-        // have to allocate a new buffer to do so using RT_DrawDynVBUI.
-        // We could avoid the allocate by having a RT_DrawDynUiPrimitiveList which was only used
-        // when RC_DrawDynUiPrimitiveList is called on the render thread. It would have to do some
-        // fancy stuff with TempDynVB. Currently we are optimizing the case where there is a separate
-        // render thread so this is not a priority.
-        for (const IRenderer::DynUiPrimitive& primitive : primitives)
-        {
-            gRenDev->RT_DrawDynVBUI(primitive.m_vertices, primitive.m_indices, primitive.m_numVertices, primitive.m_numIndices, prtTriangleList);
-        }
-        return;
-    }
-
-    size_t vertsSizeInBytes = Align4(sizeof(SVF_P2F_C4B_T2F_F4B) * totalNumVertices);
-    size_t indsSizeInBytes = Align4(sizeof(uint16) * totalNumIndices);
-
-    LOADINGLOCK_COMMANDQUEUE
-    const size_t fixedCommandSize = 5 * sizeof(uint32);  // accounts for the 5 calls to AddDWORD below
-    byte* p = AddCommand(eRC_DrawDynVBUI, fixedCommandSize + vertsSizeInBytes + indsSizeInBytes);
-
-    // we can't use AddPtr for each primitive since that adds a length then memcpy's the pointer
-    // we want all the vertices added to the queue as one length plus one data chunk.
-    // Same for indices.
-
-    // We know SVF_P2F_C4B_T2F_F4B is a multiple of 4 bytes so no padding needed
-    AddDWORD(p, vertsSizeInBytes);
-    for (const IRenderer::DynUiPrimitive& primitive : primitives)
-    {
-        memcpy(p, primitive.m_vertices, sizeof(SVF_P2F_C4B_T2F_F4B) * primitive.m_numVertices);
-        p += sizeof(SVF_P2F_C4B_T2F_F4B) * primitive.m_numVertices;
-    }
-
-    AddDWORD(p, indsSizeInBytes);
-    // when copying the indicies we have to adjust them to be the correct index in the combined vertex buffer
-    uint16 vbOffset = 0;
-    for (const IRenderer::DynUiPrimitive& primitive : primitives)
-    {
-        uint16* pIndex = reinterpret_cast<uint16*>(p);
-        for (int i = 0; i < primitive.m_numIndices; ++i)
-        {
-            pIndex[i] = primitive.m_indices[i] + vbOffset;
-        }
-        p += sizeof(uint16) * primitive.m_numIndices;
-        vbOffset += primitive.m_numVertices;
-    }
-    // uint16 is not a multiple of 4 bytes so if there is an odd number of indices we need to pad
-    unsigned pad = indsSizeInBytes - sizeof(uint16) * totalNumIndices;
-    p += pad;
-
-    AddDWORD(p, totalNumVertices);
-    AddDWORD(p, totalNumIndices);
-    AddDWORD(p, (int)prtTriangleList);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_Draw2dImageStretchMode(bool bStretch)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_Draw2dImageStretchMode(bStretch);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_Draw2dImageStretchMode, sizeof(DWORD));
-    AddDWORD(p, (DWORD)bStretch);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_Draw2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, float r, float g, float b, float a, float z)
-{
-    AZ_TRACE_METHOD();
-    DWORD col = D3DRGBA(r, g, b, a);
-
-    if (IsRenderThread())
-    {
-        // don't render using fixed function pipeline when video mode is active
-        if (m_eVideoThreadMode == eVTM_Disabled)
-        {
-            gRenDev->RT_Draw2dImage(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, col, z);
-        }
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_Draw2dImage, 44 + sizeof(void*));
-    AddFloat(p, xpos);
-    AddFloat(p, ypos);
-    AddFloat(p, w);
-    AddFloat(p, h);
-    AddPointer(p, pTexture);
-    AddFloat(p, s0);
-    AddFloat(p, t0);
-    AddFloat(p, s1);
-    AddFloat(p, t1);
-    AddFloat(p, angle);
-    AddDWORD(p, col);
-    AddFloat(p, z);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_Push2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, float r, float g, float b, float a, float z, float stereoDepth)
-{
-    AZ_TRACE_METHOD();
-    DWORD col = D3DRGBA(r, g, b, a);
-
-    if (IsRenderThread())
-    {
-        gRenDev->RT_Push2dImage(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, col, z, stereoDepth);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_Push2dImage, 48 + sizeof(void*));
-    AddFloat(p, xpos);
-    AddFloat(p, ypos);
-    AddFloat(p, w);
-    AddFloat(p, h);
-    AddPointer(p, pTexture);
-    AddFloat(p, s0);
-    AddFloat(p, t0);
-    AddFloat(p, s1);
-    AddFloat(p, t1);
-    AddFloat(p, angle);
-    AddDWORD(p, col);
-    AddFloat(p, z);
-    AddFloat(p, stereoDepth);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_Draw2dImageList()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_Draw2dImageList();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_Draw2dImageList, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int textureid, float* s, float* t, float r, float g, float b, float a, bool filtered)
-{
-    AZ_TRACE_METHOD();
-    DWORD col = D3DRGBA(r, g, b, a);
-    if (IsRenderThread())
-    {
-        gRenDev->RT_DrawImageWithUV(xpos, ypos, z, w, h, textureid, s, t, col, filtered);
-        return;
-    }
-
-    int i;
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_DrawImageWithUV, 32 + 8 * 4);
-    AddFloat(p, xpos);
-    AddFloat(p, ypos);
-    AddFloat(p, z);
-    AddFloat(p, w);
-    AddFloat(p, h);
-    AddDWORD(p, textureid);
-    for (i = 0; i < 4; i++)
-    {
-        AddFloat(p, s[i]);
-    }
-    for (i = 0; i < 4; i++)
-    {
-        AddFloat(p, t[i]);
-    }
-    AddDWORD(p, col);
-    AddDWORD(p, filtered);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SetState(int State, int AlphaRef)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->FX_SetState(State, AlphaRef);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetState, 8);
-    AddDWORD(p, State);
-    AddDWORD(p, AlphaRef);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SetStencilState(int st, uint32 nStencRef, uint32 nStencMask, uint32 nStencWriteMask, bool bForceFullReadMask)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->FX_SetStencilState(st, nStencRef, nStencMask, nStencWriteMask, bForceFullReadMask);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetStencilState, 20);
-    AddDWORD(p, st);
-    AddDWORD(p, nStencRef);
-    AddDWORD(p, nStencMask);
-    AddDWORD(p, nStencWriteMask);
-    AddDWORD(p, bForceFullReadMask);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->EF_SetColorOp(eCo, eAo, eCa, eAa);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetColorOp, 16);
-
-    AddDWORD(p, eCo);
-    AddDWORD(p, eAo);
-    AddDWORD(p, eCa);
-    AddDWORD(p, eAa);
-
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SetSrgbWrite(bool srgbWrite)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->EF_SetSrgbWrite(srgbWrite);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetSrgbWrite, 4);
-
-    AddDWORD(p, srgbWrite);
-
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PushWireframeMode(int nMode)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->FX_PushWireframeMode(nMode);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PushWireframeMode, 4);
-    AddDWORD(p, nMode);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PopWireframeMode()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->FX_PopWireframeMode();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PopWireframeMode, 0);
-    EndCommand(p);
-}
-
-
-void SRenderThread::RC_SetCull(int nMode)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_SetCull(nMode);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetCull, 4);
-    AddDWORD(p, nMode);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SetScissor(bool bEnable, int sX, int sY, int sWdt, int sHgt)
-{
-    if (IsRenderThread())
-    {
-        gRenDev->RT_SetScissor(bEnable, sX, sY, sWdt, sHgt);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetScissor, sizeof(DWORD) * 5);
-    AddDWORD(p, bEnable);
-    AddDWORD(p, sX);
-    AddDWORD(p, sY);
-    AddDWORD(p, sWdt);
-    AddDWORD(p, sHgt);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PushProfileMarker(const char* label)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderLoadingThread())
-    {
-        return;
-    }
-    if (IsRenderThread())
-    {
-        gRenDev->SetProfileMarker(label, CRenderer::ESPM_PUSH);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PushProfileMarker, sizeof(void*));
-    AddPointer(p, label);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PopProfileMarker(const char* label)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderLoadingThread())
-    {
-        return;
-    }
-    if (IsRenderThread())
-    {
-        gRenDev->SetProfileMarker(label, CRenderer::ESPM_POP);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PopProfileMarker, sizeof(void*));
-    AddPointer(p, label);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX, int nScaledY)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_ReadFrameBuffer(pRGB, nImageX, nSizeX, nSizeY, eRBType, bRGBA, nScaledX, nScaledY);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReadFrameBuffer, 28 + sizeof(void*));
-    AddPointer(p, pRGB);
-    AddDWORD(p, nImageX);
-    AddDWORD(p, nSizeX);
-    AddDWORD(p, nSizeY);
-    AddDWORD(p, eRBType);
-    AddDWORD(p, bRGBA);
-    AddDWORD(p, nScaledX);
-    AddDWORD(p, nScaledY);
-    EndCommand(p);
-
-    FlushAndWait();
-}
-
-void SRenderThread::RC_SetCamera()
-{
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        size_t commandSize = sizeof(Matrix44) * 3 + sizeof(CameraViewParameters);
-        byte* pData = AddCommand(eRC_SetCamera, Align4(commandSize));
-
-        gRenDev->GetProjectionMatrix((float*)&pData[0]);
-        gRenDev->GetModelViewMatrix((float*)&pData[sizeof(Matrix44)]);
-        *(Matrix44*)((float*)&pData[sizeof(Matrix44) * 2]) = gRenDev->m_CameraZeroMatrix[m_nCurThreadFill];
-        *(CameraViewParameters*)(&pData[sizeof(Matrix44) * 3]) = gRenDev->GetViewParameters();
-
-        if (gRenDev->m_RP.m_TI[m_nCurThreadFill].m_PersFlags & RBPF_OBLIQUE_FRUSTUM_CLIPPING)
-        {
-            Matrix44A mObliqueProjMatrix;
-            mObliqueProjMatrix.SetIdentity();
-
-            Plane pPlane = gRenDev->m_RP.m_TI[m_nCurThreadFill].m_pObliqueClipPlane;
-
-            mObliqueProjMatrix.m02 = pPlane.n[0];
-            mObliqueProjMatrix.m12 = pPlane.n[1];
-            mObliqueProjMatrix.m22 = pPlane.n[2];
-            mObliqueProjMatrix.m32 = pPlane.d;
-
-            Matrix44* mProj = (Matrix44*)&pData[0];
-            *mProj = (*mProj) * mObliqueProjMatrix;
-
-            gRenDev->m_RP.m_TI[m_nCurThreadFill].m_PersFlags &= ~RBPF_OBLIQUE_FRUSTUM_CLIPPING;
-        }
-
-        pData += Align4(commandSize);
-        EndCommand(pData);
-    }
-    else
-    {
-        gRenDev->RT_SetCameraInfo();
-    }
-}
-
-void SRenderThread::RC_PostLoadLevel()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_PostLevelLoading();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PostLevelLoading, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PushFog()
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_PushFog, 0);
-        EndCommand(p);
-    }
-    else
-    {
-        gRenDev->EF_PushFog();
-    }
-}
-
-void SRenderThread::RC_PopFog()
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_PopFog, 0);
-        EndCommand(p);
-    }
-    else
-    {
-        gRenDev->EF_PopFog();
-    }
-}
-
-void SRenderThread::RC_PushVP()
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_PushVP, 0);
-        EndCommand(p);
-    }
-    else
-    {
-        gRenDev->FX_PushVP();
-    }
-}
-
-void SRenderThread::RC_PopVP()
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_PopVP, 0);
-        EndCommand(p);
-    }
-    else
-    {
-        gRenDev->FX_PopVP();
-    }
-}
-
-void SRenderThread::RC_RenderTextMessages()
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_RenderTextMessages, 0);
-        EndCommand(p);
-    }
-    else
-    {
-        gRenDev->RT_RenderTextMessages();
-    }
-}
-
-void SRenderThread::RC_FlushTextureStreaming(bool bAbort)
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_FlushTextureStreaming, sizeof(DWORD));
-        AddDWORD(p, bAbort);
-        EndCommand(p);
-    }
-    else
-    {
-        CTexture::RT_FlushStreaming(bAbort);
-    }
-}
-
-void SRenderThread::RC_ReleaseSystemTextures()
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_ReleaseSystemTextures, 0);
-        EndCommand(p);
-    }
-    else
-    {
-        CTextureManager::Instance()->Release();
-        CTexture::ReleaseSystemTextures();
-    }
-}
-
-void SRenderThread::RC_SetEnvTexRT(SEnvTexture* pEnvTex, int nWidth, int nHeight, bool bPush)
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_SetEnvTexRT, 12 + sizeof(void*));
-        AddPointer(p, pEnvTex);
-        AddDWORD(p, nWidth);
-        AddDWORD(p, nHeight);
-        AddDWORD(p, bPush);
-        EndCommand(p);
-    }
-    else
-    {
-        pEnvTex->m_pTex->RT_SetRT(0, nWidth, nHeight, bPush);
-    }
-}
-
-
-void SRenderThread::RC_SetEnvTexMatrix(SEnvTexture* pEnvTex)
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_SetEnvTexMatrix, sizeof(void*));
-        AddPointer(p, pEnvTex);
-        EndCommand(p);
-    }
-    else
-    {
-        pEnvTex->RT_SetMatrix();
-    }
-}
-
-void SRenderThread::RC_PushRT(int nTarget, CTexture* pTex, SDepthTexture* pDS, int nS)
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_PushRT, 8 + 2 * sizeof(void*));
-        AddDWORD(p, nTarget);
-        AddPointer(p, pTex);
-        AddPointer(p, pDS);
-        AddDWORD(p, nS);
-        EndCommand(p);
-    }
-    else
-    {
-        gRenDev->RT_PushRenderTarget(nTarget, pTex, pDS, nS);
-    }
-}
-void SRenderThread::RC_PopRT(int nTarget)
-{
-    AZ_TRACE_METHOD();
-    if (!IsRenderThread())
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        byte* p = AddCommand(eRC_PopRT, 4);
-        AddDWORD(p, nTarget);
-        EndCommand(p);
-    }
-    else
-    {
-        gRenDev->RT_PopRenderTarget(nTarget);
-    }
-}
-
-void SRenderThread::RC_ForceSwapBuffers()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_ForceSwapBuffers();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ForceSwapBuffers, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SwitchToNativeResolutionBackbuffer()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_SwitchToNativeResolutionBackbuffer(true);
-        return;
-    }
-    else
-    {
-        gRenDev->SetViewport(0, 0, gRenDev->GetOverlayWidth(), gRenDev->GetOverlayHeight());
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SwitchToNativeResolutionBackbuffer, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_BeginFrame()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_BeginFrame();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_BeginFrame, 0);
-    EndCommand(p);
-}
-void SRenderThread::RC_EndFrame(bool bWait)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_EndFrame();
-        SyncMainWithRender();
-        return;
-    }
-    if (!bWait && CheckFlushCond())
-    {
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    gRenDev->GetIRenderAuxGeom()->Commit(); // need to issue flush of main thread's aux cb before EndFrame (otherwise it is processed after p3dDev->EndScene())
-    byte* p = AddCommand(eRC_EndFrame, 0);
-    EndCommand(p);
-    SyncMainWithRender();
-}
-
-void SRenderThread::RC_PrecacheResource(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter)
-{
-    if (IsRenderThread())
-    {
-        gRenDev->PrecacheTexture(pTP, fMipFactor, fTimeToReady, Flags, nUpdateId, nCounter);
-        return;
-    }
-
-    if (pTP == NULL)
-    {
-        return;
-    }
-
-    pTP->AddRef();
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PrecacheTexture, 20 + sizeof(void*));
-    AddPointer(p, pTP);
-    AddFloat(p, fMipFactor);
-    AddFloat(p, fTimeToReady);
-    AddDWORD(p, Flags);
-    AddDWORD(p, nUpdateId);
-    AddDWORD(p, nCounter);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ReleaseDeviceTexture(CTexture* pTexture)
-{
-    AZ_TRACE_METHOD();
-    if (!strcmp(pTexture->GetName(), "EngineAssets/TextureMsg/ReplaceMe.tif"))
-    {
-        pTexture = pTexture;
-    }
-
-    if (IsRenderThread())
-    {
-        CryOptionalAutoLock<CryMutex> lock(m_lockRenderLoading, m_eVideoThreadMode != eVTM_Disabled);
-        pTexture->RT_ReleaseDevice();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ReleaseDeviceTexture, sizeof(void*));
-    AddPointer(p, pTexture);
-    EndCommand(p);
-
-    FlushAndWait();
-}
-
-void SRenderThread::RC_TryFlush()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return;
-    }
-
-    // do nothing if the render thread is still busy
-    if (CheckFlushCond())
-    {
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    gRenDev->GetIRenderAuxGeom()->Flush(); // need to issue flush of main thread's aux cb before EndFrame (otherwise it is processed after p3dDev->EndScene())
-    SyncMainWithRender();
-}
-
-void SRenderThread::RC_DrawLines(Vec3 v[], int nump, ColorF& col, int flags, float fGround)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_DrawLines(v, nump, col, flags, fGround);
-    }
-    else
-    {
-        LOADINGLOCK_COMMANDQUEUE
-        // since we use AddData(...) - we need to allocate 4 bytes (DWORD) more because AddData(...) adds hidden data size into command buffer
-        byte* p = AddCommand(eRC_DrawLines, Align4(sizeof(int) + 2 * sizeof(int) + sizeof(float) + nump * sizeof(Vec3) + sizeof(ColorF)));
-        AddDWORD(p, nump);
-        AddColor(p, col);
-        AddDWORD(p, flags);
-        AddFloat(p, fGround);
-        AddData (p, v, nump * sizeof(Vec3));
-        EndCommand(p);
-    }
-}
-
-void SRenderThread::RC_DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_DrawStringU(pFont, x, y, z, pStr, asciiMultiLine, ctx);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_DrawStringU, Align4(16 + sizeof(void*) + sizeof(STextDrawContext) + TextCommandSize(pStr)));
-    AddPointer(p, pFont);
-    AddFloat(p, x);
-    AddFloat(p, y);
-    AddFloat(p, z);
-    AddDWORD(p, asciiMultiLine ? 1 : 0);
-    new(p) STextDrawContext(ctx);
-    p += sizeof(STextDrawContext);
-    AddText(p, pStr);
-    EndCommand(p);
-}
-void SRenderThread::RC_ClearTargetsImmediately(int8 nType, uint32 nFlags, const ColorF& vColor, float depth)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        switch (nType)
-        {
-        case 0:
-            gRenDev->EF_ClearTargetsImmediately(nFlags);
-            return;
-        case 1:
-            gRenDev->EF_ClearTargetsImmediately(nFlags, vColor, depth, 0);
-            return;
-        case 2:
-            gRenDev->EF_ClearTargetsImmediately(nFlags, vColor);
-            return;
-        case 3:
-            gRenDev->EF_ClearTargetsImmediately(nFlags, depth, 0);
-            return;
-        }
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_ClearTargetsImmediately, Align4(12 + sizeof(ColorF)));
-    AddDWORD(p, nType);
-    AddDWORD(p, nFlags);
-    AddColor(p, vColor);
-    AddFloat(p, depth);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SetViewport(int x, int y, int width, int height, int id)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_SetViewport(x, y, width, height, id);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetViewport, 20);
-    AddDWORD(p, x);
-    AddDWORD(p, y);
-    AddDWORD(p, width);
-    AddDWORD(p, height);
-    AddDWORD(p, id);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_RenderScene(int nFlags, RenderFunc pRenderFunc)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_RenderScene(nFlags, gRenDev->m_RP.m_TI[m_nCurThreadProcess], pRenderFunc);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_RenderScene, Align4(8 + sizeof(void*) + sizeof(SThreadInfo)));
-    AddDWORD(p, nFlags);
-    AddTI(p, gRenDev->m_RP.m_TI[m_nCurThreadFill]);
-    AddPointer(p, (void*)pRenderFunc);
-    AddDWORD(p, SRendItem::m_RecurseLevel[m_nCurThreadFill]);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PrepareStereo(int mode, int output)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_PrepareStereo(mode, output);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PrepareStereo, 8);
-    AddDWORD(p, mode);
-    AddDWORD(p, output);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_CopyToStereoTex(int channel)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_CopyToStereoTex(channel);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CopyToStereoTex, 4);
-    AddDWORD(p, channel);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_SetStereoEye(int eye)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->m_CurRenderEye = eye;
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetStereoEye, 4);
-    AddDWORD(p, eye);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_AuxFlush([[maybe_unused]] IRenderAuxGeomImpl* pAux, [[maybe_unused]] SAuxGeomCBRawDataPackaged& data, [[maybe_unused]] size_t begin, [[maybe_unused]] size_t end, [[maybe_unused]] bool reset)
-{
-    AZ_TRACE_METHOD();
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (IsRenderThread())
-    {
-        pAux->RT_Flush(data, begin, end);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_AuxFlush, 4 * sizeof(void*) + sizeof(uint32));
-    AddPointer(p, pAux);
-    AddPointer(p, data.m_pData);
-    AddPointer(p, (void*) begin);
-    AddPointer(p, (void*) end);
-    AddDWORD  (p, (uint32) reset);
-    EndCommand(p);
-#endif
-}
-
-void SRenderThread::RC_SetTexture(int nTex, int nUnit)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        CTexture::ApplyForID(nUnit, nTex, -1, -1);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    int nState = CTexture::GetByID(nTex)->GetDefState();
-    byte* p = AddCommand(eRC_SetTexture, 12);
-    AddDWORD(p, nTex);
-    AddDWORD(p, nUnit);
-    AddDWORD(p, nState);
-    EndCommand(p);
-}
-
-bool SRenderThread::RC_OC_ReadResult_Try(uint32 nDefaultNumSamples, CREOcclusionQuery* pRE)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return pRE->RT_ReadResult_Try(nDefaultNumSamples);
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_OC_ReadResult_Try, 4 + sizeof(void*));
-    AddDWORD(p, (uint32)nDefaultNumSamples);
-    AddPointer(p, pRE);
-    EndCommand(p);
-
-    return true;
-}
-
-void SRenderThread::RC_CGCSetLayers(IColorGradingControllerInt* pController, const SColorChartLayer* pLayers, uint32 numLayers)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        pController->RT_SetLayers(pLayers, numLayers);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_CGCSetLayers, 4 + sizeof(void*));
-    AddPointer(p, pController);
-    AddDWORD(p, (uint32)numLayers);
-    EndCommand(p);
-
-    if (numLayers)
-    {
-        const size_t copySize = sizeof(SColorChartLayer) * numLayers;
-        SColorChartLayer* pLayersDst = (SColorChartLayer*) m_Commands[m_nCurThreadFill].Grow(copySize);
-        memcpy(pLayersDst, pLayers, copySize);
-    }
-}
-
-void SRenderThread::RC_GenerateSkyDomeTextures(CREHDRSky* pSky, int32 width, int32 height)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        pSky->GenerateSkyDomeTextures(width, height);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-
-    if (m_eVideoThreadMode == eVTM_Disabled)
-    {
-        byte* p = AddCommand(eRC_GenerateSkyDomeTextures, sizeof(void*) + sizeof(int32) * 2);
-        AddPointer(p, pSky);
-        AddDWORD(p, width);
-        AddDWORD(p, height);
-        EndCommand(p);
-    }
-    else
-    {
-        // Move command into loading queue, which will be executed in first render frame after loading is done
-        byte* p = AddCommandTo(eRC_GenerateSkyDomeTextures, sizeof(void*) + sizeof(int32) * 2, m_CommandsLoading);
-        AddPointer(p, pSky);
-        AddDWORD(p, width);
-        AddDWORD(p, height);
-        EndCommandTo(p, m_CommandsLoading);
-    }
-}
-
-void SRenderThread::RC_SetRendererCVar(ICVar* pCVar, const char* pArgText, const bool bSilentMode)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_SetRendererCVar(pCVar, pArgText, bSilentMode);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_SetRendererCVar, sizeof(void*) + TextCommandSize(pArgText) + 4);
-    AddPointer(p, pCVar);
-    AddText(p, pArgText);
-    AddDWORD(p, bSilentMode ? 1 : 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_RenderDebug(bool bRenderStats)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_RenderDebug(bRenderStats);
-        return;
-    }
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_RenderDebug, 0);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_PushSkinningPoolId(uint32 poolId)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        gRenDev->RT_SetSkinningPoolId(poolId);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_PushSkinningPoolId, 4);
-    AddDWORD(p, poolId);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_ReleaseRemappedBoneIndices(IRenderMesh* pRenderMesh, uint32 guid)
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        pRenderMesh->ReleaseRemappedBoneIndicesPair(guid);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    pRenderMesh->AddRef(); // don't allow mesh deletion while this command is pending
-    byte* p = AddCommand(eRC_ReleaseRemappedBoneIndices, sizeof(void*) + 4);
-    AddPointer(p, pRenderMesh);
-    AddDWORD(p, guid);
-    EndCommand(p);
-}
-
-void SRenderThread::RC_InitializeVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer)
-{
-    AZ_TRACE_METHOD();
-
-    if (IsRenderThread())
-    {
-        gRenDev->RT_InitializeVideoRenderer(pVideoRenderer);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE;
-    byte* p = AddCommand(eRC_InitializeVideoRenderer, sizeof(AZ::VideoRenderer::IVideoRenderer*));
-    AddPointer(p, pVideoRenderer);
-    EndCommand(p);
-
-    // We want to block until the resources have been created.
-    SyncMainWithRender();
-}
-
-void SRenderThread::RC_CleanupVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer)
-{
-    AZ_TRACE_METHOD();
-
-    if (IsRenderThread())
-    {
-        gRenDev->RT_CleanupVideoRenderer(pVideoRenderer);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE;
-    byte* p = AddCommand(eRC_CleanupVideoRenderer, sizeof(AZ::VideoRenderer::IVideoRenderer*));
-    AddPointer(p, pVideoRenderer);
-    EndCommand(p);
-
-    // We want to block until the cleanup is complete.
-    SyncMainWithRender();
-}
-
-void SRenderThread::RC_DrawVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer, const AZ::VideoRenderer::DrawArguments& drawArguments)
-{
-    AZ_TRACE_METHOD();
-
-    if (IsRenderThread())
-    {
-        gRenDev->RT_DrawVideoRenderer(pVideoRenderer, drawArguments);
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE;
-    byte* p = AddCommand(eRC_DrawVideoRenderer, sizeof(AZ::VideoRenderer::IVideoRenderer*) + sizeof(AZ::VideoRenderer::DrawArguments));
-    AddPointer(p, pVideoRenderer);
-    memcpy(p, &drawArguments, sizeof(AZ::VideoRenderer::DrawArguments));
-    p += sizeof(AZ::VideoRenderer::DrawArguments);
-    EndCommand(p);
-}
-
-void SRenderThread::EnqueueRenderCommand(RenderCommandCB command)
-{
-    if (IsRenderThread())
-    {
-        command();
-        return;
-    }
-
-    LOADINGLOCK_COMMANDQUEUE
-    byte* p = AddCommand(eRC_AzFunction, sizeof(RenderCommandCB));
-    new (p) RenderCommandCB(AZStd::move(command));
-    p += sizeof(RenderCommandCB);
-    EndCommand(p);
-}
-
-//===========================================================================================
-
-#ifdef DO_RENDERSTATS
-#define START_PROFILE_RT Time = iTimer->GetAsyncTime();
-#define END_PROFILE_PLUS_RT(Dst) Dst += iTimer->GetAsyncTime().GetDifferenceInSeconds(Time);
-#define END_PROFILE_RT(Dst) Dst = iTimer->GetAsyncTime().GetDifferenceInSeconds(Time);
-#else
-#define START_PROFILE_RT
-#define END_PROFILE_PLUS_RT(Dst)
-#define END_PROFILE_RT(Dst)
-#endif
-
-#if defined(AZ_PROFILE_TELEMETRY)
-static const char* GetRenderCommandName(ERenderCommand renderCommand)
-{
-    switch (renderCommand)
-    {
-    // Please add to this list if you have a case that needs watching
-    case eRC_PreloadTextures:
-        return "PreloadTextures";
-    case eRC_ParseShader:
-        return "ParseShader";
-    case eRC_RenderScene:
-        return "RenderScene";
-    case eRC_AzFunction:
-        return "AzFunction";
-    }
-    return "<unknown>";
-}
-#endif
-
-void SRenderThread::ProcessCommands(bool loadTimeProcessing)
-{
-    AZ_TRACE_METHOD();
-#ifndef STRIP_RENDER_THREAD
-    assert (IsRenderThread());
-    if (!CheckFlushCond())
-    {
-        return;
-    }
-
-#if !defined (NULL_RENDERER)
-    DWORD nDeviceOwningThreadID = gcpRendD3D->GetBoundThreadID();
-    if (m_eVideoThreadMode == eVTM_Disabled)
-    {
-        gcpRendD3D->BindContextToThread(CryGetCurrentThreadId());
-    }
-# endif
-#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    if (CRenderer::CV_r_multithreaded)
-    {
-        m_kDXGLContextHandle.Set(&gcpRendD3D->GetDevice());
-    }
-    if (m_eVideoThreadMode == eVTM_Disabled)
-    {
-        m_kDXGLDeviceContextHandle.Set(&gcpRendD3D->GetDeviceContext(), !CRenderer::CV_r_multithreaded);
-    }
-#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
-
-
-#ifdef DO_RENDERSTATS
-    CTimeValue Time;
-#endif
-
-    int threadId = m_nCurThreadProcess;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(RenderThread_cpp)
-#endif
-    int n = 0;
-    m_bSuccessful = true;
-    m_hResult = S_OK;
-    byte* pP;
-    while (n < (int)m_Commands[threadId].Num())
-    {
-        pP = &m_Commands[threadId][n];
-        n += sizeof(int);
-        byte nC = (byte) * ((int*)pP);
-
-#if !defined(_RELEASE)
-        // Ensure that the command hasn't been processed already
-        int* pProcessed = (int*)(pP + sizeof(int));
-        IF_UNLIKELY (*pProcessed)
-        {
-            __debugbreak();
-        }
-        *pProcessed = 1;
-        n += sizeof(int);
-#endif
-
-        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::RendererDetailed, "SRenderThread::ProcessCommands::Command: %s (%d)", GetRenderCommandName(static_cast<ERenderCommand>(nC)), nC);
-
-        switch (nC)
-        {
-        case eRC_CreateDevice:
-            m_bSuccessful &= gRenDev->RT_CreateDevice();
-            break;
-        case eRC_ResetDevice:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_Reset();
-            }
-            break;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(RenderThread_cpp)
-#endif
-        case eRC_ReleasePostEffects:
-            if (gRenDev->m_pPostProcessMgr)
-            {
-                gRenDev->m_pPostProcessMgr->ReleaseResources();
-            }
-            break;
-        case eRC_ResetPostEffects:
-            if (gRenDev->m_RP.m_pREPostProcess)
-            {
-                gRenDev->m_RP.m_pREPostProcess->mfReset();
-            }
-            break;
-        case eRC_ResetPostEffectsOnSpecChange:
-            if (gRenDev->m_RP.m_pREPostProcess)
-            {
-                gRenDev->m_RP.m_pREPostProcess->Reset(true);
-            }
-            break;
-        case eRC_DisableTemporalEffects:
-            gRenDev->RT_DisableTemporalEffects();
-            break;
-        case eRC_ResetGlass:
-            gRenDev->RT_ResetGlass();
-            break;
-        case eRC_ResetToDefault:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->ResetToDefault();
-            }
-            break;
-        case eRC_Init:
-            gRenDev->RT_Init();
-            break;
-        case eRC_ShutDown:
-        {
-            uint32 nFlags = ReadCommand<uint32>(n);
-            gRenDev->RT_ShutDown(nFlags);
-        }
-        break;
-        case eRC_ForceSwapBuffers:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_ForceSwapBuffers();
-            }
-            break;
-        case eRC_SwitchToNativeResolutionBackbuffer:
-        {
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_SwitchToNativeResolutionBackbuffer(true);
-            }
-        }
-        break;
-        case eRC_BeginFrame:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_BeginFrame();
-            }
-            else
-            {
-                m_bBeginFrameCalled = true;
-            }
-            break;
-        case eRC_EndFrame:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_EndFrame();
-            }
-            else
-            {
-                // RLT handles precache commands - so all texture streaming prioritisation
-                // needs to happen here. Scheduling and device texture management will happen
-                // on the RT later.
-                CTexture::RLT_LoadingUpdate();
-
-                m_bEndFrameCalled = true;
-                gRenDev->m_nFrameSwapID++;
-            }
-            break;
-        case eRC_PreloadTextures:
-            CTexture::RT_Precache();
-            break;
-        case eRC_PrecacheTexture:
-        {
-            ITexture* pTP = ReadCommand<ITexture*>(n);
-
-            float fMipFactor = ReadCommand<float>(n);
-            float fTimeToReady = ReadCommand<float>(n);
-            int Flags = ReadCommand<int>(n);
-            int nUpdateId = ReadCommand<int>(n);
-            int nCounter = ReadCommand<int>(n);
-            gRenDev->PrecacheTexture(pTP, fMipFactor, fTimeToReady, Flags, nUpdateId, nCounter);
-
-            pTP->Release();
-        }
-        break;
-        case eRC_ClearTargetsImmediately:
-        {
-            uint32 nType = ReadCommand<uint32>(n);
-            uint32 nFlags = ReadCommand<uint32>(n);
-            ColorF vColor = ReadCommand<ColorF>(n);
-            float fDepth = ReadCommand<float>(n);
-            if (m_eVideoThreadMode != eVTM_Disabled)
-            {
-                nFlags &= ~FRT_CLEAR_IMMEDIATE;
-                switch (nType)
-                {
-                case 0:
-                    gRenDev->EF_ClearTargetsLater(nFlags);
-                    break;
-                case 1:
-                    gRenDev->EF_ClearTargetsLater(nFlags, vColor, fDepth, 0);
-                    break;
-                case 2:
-                    gRenDev->EF_ClearTargetsLater(nFlags, vColor);
-                    break;
-                case 3:
-                    gRenDev->EF_ClearTargetsLater(nFlags, fDepth, 0);
-                    break;
-                }
-            }
-            switch (nType)
-            {
-            case 0:
-                gRenDev->EF_ClearTargetsImmediately(nFlags);
-                break;
-            case 1:
-                gRenDev->EF_ClearTargetsImmediately(nFlags, vColor, fDepth, 0);
-                break;
-            case 2:
-                gRenDev->EF_ClearTargetsImmediately(nFlags, vColor);
-                break;
-            case 3:
-                gRenDev->EF_ClearTargetsImmediately(nFlags, fDepth, 0);
-                break;
-            }
-        }
-        break;
-        case eRC_ReadFrameBuffer:
-        {
-            byte* pRGB = ReadCommand<byte*>(n);
-            int nImageX = ReadCommand<int>(n);
-            int nSizeX = ReadCommand<int>(n);
-            int nSizeY = ReadCommand<int>(n);
-            ERB_Type RBType = ReadCommand<ERB_Type>(n);
-            int bRGBA = ReadCommand<int>(n);
-            int nScaledX = ReadCommand<int>(n);
-            int nScaledY = ReadCommand<int>(n);
-            gRenDev->RT_ReadFrameBuffer(pRGB, nImageX, nSizeX, nSizeY, RBType, bRGBA, nScaledX, nScaledY);
-        }
-        break;
-        case eRC_UpdateShaderItem:
-        {
-            SShaderItem* pShaderItem = ReadCommand<SShaderItem*>(n);
-            // The material is necessary at this point because an UpdateShaderItem may have been queued 
-            // for a material that was subsequently released and would have been deleted, thus resulting in a
-            // dangling pointer and a crash; this keeps it alive until this render command can complete
-            IMaterial* pMaterial = ReadCommand<IMaterial*>(n);
-            gRenDev->RT_UpdateShaderItem(pShaderItem, pMaterial);
-            if (pMaterial)
-            {
-                // Release the reference we added when we submitted the command.
-                pMaterial->Release();
-            }
-        }
-        break;
-        case eRC_RefreshShaderResourceConstants:
-        {
-            SShaderItem* shaderItem = ReadCommand<SShaderItem*>(n);
-            // The material is necessary at this point because an RefreshShaderResourceConstants may have been queued 
-            // for a material that was subsequently released and would have been deleted, thus resulting in a
-            // dangling pointer and a crash; this keeps it alive until this render command can complete
-            IMaterial* material = ReadCommand<IMaterial*>(n);
-            gRenDev->RT_RefreshShaderResourceConstants(shaderItem);
-            if (material)
-            {
-                // Release the reference we added when we submitted the command.
-                material->Release();
-            }
-        }
-        break;
-        case eRC_ReleaseDeviceTexture:
-            assert (m_eVideoThreadMode == eVTM_Disabled);
-            {
-                CTexture* pTexture = ReadCommand<CTexture*>(n);
-                pTexture->RT_ReleaseDevice();
-            }
-            break;
-        case eRC_AuxFlush:
-        {
-#if defined(ENABLE_RENDER_AUX_GEOM)
-            IRenderAuxGeomImpl* pAux = ReadCommand<IRenderAuxGeomImpl*>(n);
-            CAuxGeomCB::SAuxGeomCBRawData* pData = ReadCommand<CAuxGeomCB::SAuxGeomCBRawData*>(n);
-            size_t begin = ReadCommand<size_t>(n);
-            size_t end = ReadCommand<size_t>(n);
-            bool reset = ReadCommand<uint32>(n) != 0;
-
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                SAuxGeomCBRawDataPackaged data = SAuxGeomCBRawDataPackaged(pData);
-                pAux->RT_Flush(data, begin, end, reset);
-            }
-#endif
-        }
-        break;
-        case eRC_SetTexture:
-            assert (m_eVideoThreadMode == eVTM_Disabled);
-            {
-                int nTex = ReadCommand<int>(n);
-                int nUnit = ReadCommand<int>(n);
-                int nState = ReadCommand<int>(n);
-                CTexture::ApplyForID(nUnit, nTex, nState, -1);
-            }
-            break;
-        case eRC_DrawLines:
-        {
-            int    nump    = ReadCommand<int>(n);
-            ColorF col     = ReadCommand<ColorF>(n);
-            int    flags   = ReadCommand<int>(n);
-            float  fGround = ReadCommand<float>(n);
-
-
-            Vec3* pv = (Vec3*)&m_Commands[threadId][n += 4];
-            n += nump * sizeof(Vec3);
-
-            gRenDev->RT_DrawLines(pv, nump, col, flags, fGround);
-        }
-        break;
-        case eRC_DrawStringU:
-        {
-            IFFont_RenderProxy* pFont = ReadCommand<IFFont_RenderProxy*>(n);
-            float x = ReadCommand<float>(n);
-            float y = ReadCommand<float>(n);
-            float z = ReadCommand<float>(n);
-            bool asciiMultiLine = ReadCommand<int>(n) != 0;
-            const STextDrawContext* pCtx = (const STextDrawContext*) &m_Commands[threadId][n];
-            n += sizeof(STextDrawContext);
-            const char* pStr = ReadTextCommand<const char*>(n);
-
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_DrawStringU(pFont, x, y, z, pStr, asciiMultiLine, *pCtx);
-            }
-        }
-        break;
-        case eRC_SetState:
-        {
-            int nState = ReadCommand<int>(n);
-            int nAlphaRef = ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->FX_SetState(nState, nAlphaRef);
-            }
-        }
-        break;
-        case eRC_PushWireframeMode:
-        {
-            int nMode = ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->FX_PushWireframeMode(nMode);
-            }
-        }
-        break;
-        case eRC_PopWireframeMode:
-        {
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->FX_PopWireframeMode();
-            }
-        }
-        break;
-        case eRC_SetCull:
-        {
-            int nMode = ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_SetCull(nMode); // nMode
-            }
-        }
-        break;
-        case eRC_SetScissor:
-        {
-            bool bEnable = ReadCommand<DWORD>(n) != 0;
-            int sX = (int)ReadCommand<DWORD>(n);
-            int sY = (int)ReadCommand<DWORD>(n);
-            int sWdt = (int)ReadCommand<DWORD>(n);
-            int sHgt = (int)ReadCommand<DWORD>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_SetScissor(bEnable, sX, sY, sWdt, sHgt);
-            }
-        }
-        break;
-        case eRC_SetStencilState:
-        {
-            int st = ReadCommand<DWORD>(n);
-            uint32 nStencRef = ReadCommand<DWORD>(n);
-            uint32 nStencMask = ReadCommand<DWORD>(n);
-            uint32 nStencWriteMask = ReadCommand<DWORD>(n);
-            bool bForceFullReadMask = ReadCommand<DWORD>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->FX_SetStencilState(st, nStencRef, nStencMask, nStencWriteMask, bForceFullReadMask);
-            }
-        }
-        break;
-        case eRC_UpdateTexture:
-        {
-            CTexture* pTexture = ReadCommand<CTexture*>(n);
-            byte* pData = ReadCommand<byte*>(n);
-            int nX = ReadCommand<int>(n);
-            int nY = ReadCommand<int>(n);
-            int nZ = ReadCommand<int>(n);
-            int nUSize = ReadCommand<int>(n);
-            int nVSize = ReadCommand<int>(n);
-            int nZSize = ReadCommand<int>(n);
-            ETEX_Format eTFSrc = (ETEX_Format)ReadCommand<uint32>(n);
-            pTexture->RT_UpdateTextureRegion(pData, nX, nY, nZ, nUSize, nVSize, nZSize, eTFSrc);
-            delete [] pData;
-            pTexture->Release();
-        }
-        break;
-        case eRC_CreateResource:
-        {
-            SResourceAsync* pRA = ReadCommand<SResourceAsync*>(n);
-            gRenDev->RT_CreateResource(pRA);
-        }
-        break;
-        case eRC_ReleaseResource:
-        {
-            SResourceAsync* pRes = ReadCommand<SResourceAsync*>(n);
-            gRenDev->RT_ReleaseResource(pRes);
-        }
-        break;
-        case eRC_ReleaseRenderResources:
-            gRenDev->RT_ReleaseRenderResources();
-            break;
-        case eRC_UnbindTMUs:
-            gRenDev->RT_UnbindTMUs();
-            break;
-        case eRC_UnbindResources:
-            gRenDev->RT_UnbindResources();
-            break;
-        case eRC_CreateRenderResources:
-            gRenDev->RT_CreateRenderResources();
-            break;
-        case eRC_CreateSystemTargets:
-            CTexture::CreateSystemTargets();
-            break;
-        case eRC_PrecacheDefaultShaders:
-            gRenDev->RT_PrecacheDefaultShaders();
-            break;
-        case eRC_ReleaseSurfaceResource:
-        {
-            SDepthTexture* pRes = ReadCommand<SDepthTexture*>(n);
-            if (pRes)
-            {
-                pRes->Release(true);
-            }
-        }
-        break;
-        case eRC_ReleaseBaseResource:
-        {
-            CBaseResource* pRes = ReadCommand<CBaseResource*>(n);
-            RC_ReleaseBaseResource(pRes);
-        }
-        break;
-        case eRC_ReleaseFont:
-        {
-            IFFont* font = ReadCommand<IFFont*>(n);
-            RC_ReleaseFont(font);
-        }
-        break;
-        case eRC_UpdateMesh2:
-            assert(m_eVideoThreadMode == eVTM_Disabled);
-            {
-                CRenderMesh* pMesh = ReadCommand<CRenderMesh*>(n);
-                CRenderMesh* pVContainer = ReadCommand<CRenderMesh*>(n);
-                uint32 nStreamMask = ReadCommand<uint32>(n);
-                pMesh->RT_CheckUpdate(pVContainer, nStreamMask);
-            }
-            break;
-        case eRC_CreateDeviceTexture:
-        {
-            CryOptionalAutoLock<CryMutex> lock(m_lockRenderLoading, loadTimeProcessing);
-            CTexture* pTex = ReadCommand<CTexture*>(n);
-            const byte* pData[6];
-            for (int i = 0; i < 6; i++)
-            {
-                pData[i] = ReadCommand<byte*>(n);
-            }
-            m_bSuccessful = pTex->RT_CreateDeviceTexture(pData);
-        }
-        break;
-        case eRC_CopyDataToTexture:
-        {
-            void* pkTexture = ReadCommand<void*>(n);
-            unsigned int uiStartMip = ReadCommand<unsigned int>(n);
-            unsigned int uiEndMip = ReadCommand<unsigned int>(n);
-
-            RC_CopyDataToTexture(pkTexture, uiStartMip, uiEndMip);
-        }
-        break;
-        case eRC_ClearTarget:
-        {
-            void* pkTexture = ReadCommand<void*>(n);
-            ColorF kColor = ReadCommand<ColorF>(n);
-
-            RC_ClearTarget(pkTexture, kColor);
-        }
-        break;
-        case eRC_CreateREPostProcess:
-        {
-            CRendElementBase** pRE = ReadCommand<CRendElementBase**>(n);
-            gRenDev->RT_CreateREPostProcess(pRE);
-        }
-        break;
-
-        case eRC_DrawDynVB:
-        {
-            pP = &m_Commands[threadId][0];
-            uint32 nSize = *(uint32*)&pP[n];
-            SVF_P3F_C4B_T2F* pBuf = (SVF_P3F_C4B_T2F*)&pP[n + 4];
-            n += nSize + 4;
-            nSize = *(uint32*)&pP[n];
-            uint16* pInds = (nSize > 0) ? (uint16*)&pP[n + 4] : nullptr;
-            n += nSize + 4;
-            int nVerts = ReadCommand<int>(n);
-            int nInds = ReadCommand<int>(n);
-            const PublicRenderPrimitiveType nPrimType = (PublicRenderPrimitiveType)ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_DrawDynVB(pBuf, pInds, nVerts, nInds, nPrimType);
-            }
-        }
-        break;
-        case eRC_Draw2dImage:
-        {
-            START_PROFILE_RT;
-
-            float xpos = ReadCommand<float>(n);
-            float ypos = ReadCommand<float>(n);
-            float w = ReadCommand<float>(n);
-            float h = ReadCommand<float>(n);
-            CTexture* pTexture = ReadCommand<CTexture*>(n);
-            float s0 = ReadCommand<float>(n);
-            float t0 = ReadCommand<float>(n);
-            float s1 = ReadCommand<float>(n);
-            float t1 = ReadCommand<float>(n);
-            float angle = ReadCommand<float>(n);
-            int col = ReadCommand<int>(n);
-            float z = ReadCommand<float>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_Draw2dImage(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, col, z);
-            }
-            END_PROFILE_PLUS_RT(gRenDev->m_fRTTimeMiscRender);
-        }
-        break;
-        case eRC_DrawDynVBUI:
-            {
-                pP = &m_Commands[threadId][0];
-                uint32 nSize = *(uint32*)&pP[n];
-                SVF_P2F_C4B_T2F_F4B* pBuf = (SVF_P2F_C4B_T2F_F4B*)&pP[n + 4];
-                n += nSize + 4;
-                nSize = *(uint32*)&pP[n];
-                uint16* pInds = (nSize > 0) ? (uint16*)&pP[n + 4] : nullptr;
-                n += nSize + 4;
-                int nVerts = ReadCommand<int>(n);
-                int nInds = ReadCommand<int>(n);
-                const PublicRenderPrimitiveType nPrimType = (PublicRenderPrimitiveType)ReadCommand<int>(n);
-                if (m_eVideoThreadMode == eVTM_Disabled)
-                {
-                    gRenDev->RT_DrawDynVBUI(pBuf, pInds, nVerts, nInds, nPrimType);
-                }
-            }
-        break;
-
-        case eRC_Draw2dImageStretchMode:
-        {
-            START_PROFILE_RT;
-
-            int mode = ReadCommand<int>(n);
-            gRenDev->RT_Draw2dImageStretchMode(mode);
-            END_PROFILE_PLUS_RT(gRenDev->m_fRTTimeMiscRender);
-        }
-        break;
-        case eRC_Push2dImage:
-        {
-            float xpos = ReadCommand<float>(n);
-            float ypos = ReadCommand<float>(n);
-            float w = ReadCommand<float>(n);
-            float h = ReadCommand<float>(n);
-            CTexture* pTexture = ReadCommand<CTexture*>(n);
-            float s0 = ReadCommand<float>(n);
-            float t0 = ReadCommand<float>(n);
-            float s1 = ReadCommand<float>(n);
-            float t1 = ReadCommand<float>(n);
-            float angle = ReadCommand<float>(n);
-            int col = ReadCommand<int>(n);
-            float z = ReadCommand<float>(n);
-            float stereoDepth = ReadCommand<float>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_Push2dImage(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, col, z, stereoDepth);
-            }
-        }
-        break;
-        case eRC_Draw2dImageList:
-        {
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_Draw2dImageList();
-            }
-        }
-        break;
-        case eRC_DrawImageWithUV:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                pP = &m_Commands[threadId][n];
-                gRenDev->RT_DrawImageWithUV(*(float*)pP, // xpos
-                    *(float*)&pP[4], // ypos
-                    *(float*)&pP[8], // z
-                    *(float*)&pP[12], // w
-                    *(float*)&pP[16], // h
-                    *(int*)&pP[20], // textureid
-                    (float*)&pP[24], // s
-                    (float*)&pP[40], // t
-                    *(int*)&pP[56], // col
-                    *(int*)&pP[60] != 0); // filtered
-            }
-            n += 64;
-            break;
-        case eRC_PushProfileMarker:
-        {
-            char* label = ReadCommand<char*>(n);
-            gRenDev->PushProfileMarker(label);
-        }
-        break;
-        case eRC_PopProfileMarker:
-        {
-            char* label = ReadCommand<char*>(n);
-            gRenDev->PopProfileMarker(label);
-        }
-        break;
-        case eRC_SetCamera:
-        {
-            START_PROFILE_RT;
-
-            Matrix44A ProjMat = ReadCommand<Matrix44>(n);
-            Matrix44A ViewMat = ReadCommand<Matrix44>(n);
-            Matrix44A CameraZeroMat = ReadCommand<Matrix44>(n);
-            CameraViewParameters viewParameters = ReadCommand<CameraViewParameters>(n);
-
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->SetMatrices(ProjMat.GetData(), ViewMat.GetData());
-                gRenDev->m_CameraZeroMatrix[threadId] = CameraZeroMat;
-                gRenDev->SetViewParameters(viewParameters);
-
-                gRenDev->RT_SetCameraInfo();
-            }
-
-            END_PROFILE_PLUS_RT(gRenDev->m_fRTTimeMiscRender);
-        }
-        break;
-        case eRC_AzFunction:
-        {
-            // Lock only when processing on the RenderLoadThread - multiple AzFunctions make calls that cause crashes if invoked concurrently with render
-            CryOptionalAutoLock<CryMutex> lock(m_lockRenderLoading, loadTimeProcessing);
-
-            // We "build" the command from the buffer memory (instead of copying it)
-            RenderCommandCB* command = alias_cast<RenderCommandCB*>(reinterpret_cast<uint32*>(&m_Commands[threadId][n]));
-            (*command)();
-            // We need to destroy the object that we created using placement new.
-            command->~RenderCommandCB();
-            n += Align4(sizeof(RenderCommandCB));
-        }
-        break;
-        case eRC_ReleaseVBStream:
-            assert (m_eVideoThreadMode == eVTM_Disabled);
-            {
-                void* pVB = ReadCommand<void*>(n);
-                int nStream = ReadCommand<int>(n);
-                gRenDev->RT_ReleaseVBStream(pVB, nStream);
-            }
-            break;
-        case eRC_ReleaseVB:
-            assert (m_eVideoThreadMode == eVTM_Disabled);
-            {
-                buffer_handle_t nID = ReadCommand<buffer_handle_t>(n);
-                gRenDev->m_DevBufMan.Destroy(nID);
-            }
-            break;
-        case eRC_ReleaseIB:
-            assert (m_eVideoThreadMode == eVTM_Disabled);
-            {
-                buffer_handle_t nID = ReadCommand<buffer_handle_t>(n);
-                gRenDev->m_DevBufMan.Destroy(nID);
-            }
-            break;
-        case eRC_RenderScene:
-        {
-            START_PROFILE_RT;
-
-            int nFlags = ReadCommand<int>(n);
-            SThreadInfo TI;
-            LoadUnaligned((uint32*)&m_Commands[threadId][n], TI);
-            n += sizeof(SThreadInfo);
-            RenderFunc pRenderFunc = ReadCommand<RenderFunc>(n);
-            int nR = ReadCommand<int>(n);
-            int nROld = SRendItem::m_RecurseLevel[threadId];
-            SRendItem::m_RecurseLevel[threadId] = nR;
-            // when we are in video mode, don't execute the command
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_RenderScene(nFlags, TI, pRenderFunc);
-            }
-            else
-            {
-                // cleanup when showing loading render screen
-                if (nR == 1)
-                {
-                    ////////////////////////////////////////////////
-                    // wait till all SRendItems for this frame have finished preparing
-                    gRenDev->GetFinalizeRendItemJobExecutor(gRenDev->m_RP.m_nProcessThreadID)->WaitForCompletion();
-                    gRenDev->GetFinalizeShadowRendItemJobExecutor(gRenDev->m_RP.m_nProcessThreadID)->WaitForCompletion();
-
-                    ////////////////////////////////////////////////
-                    // to non-thread safe remaing work for *::Render functions
-                    CRenderMesh::FinalizeRendItems(gRenDev->m_RP.m_nProcessThreadID);
-                    CMotionBlur::InsertNewElements();
-                    FurBendData::Get().InsertNewElements();
-                }
-            }
-            SRendItem::m_RecurseLevel[threadId] = nROld;
-
-            END_PROFILE_PLUS_RT(gRenDev->m_fRTTimeSceneRender);
-        }
-        break;
-        case eRC_PrepareStereo:
-        {
-            int mode = ReadCommand<int>(n);
-            int output = ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_PrepareStereo(mode, output);
-            }
-        }
-        break;
-        case eRC_CopyToStereoTex:
-        {
-            int channel = ReadCommand<int>(n);
-            gRenDev->RT_CopyToStereoTex(channel);
-        }
-        break;
-        case eRC_SetStereoEye:
-        {
-            int eye = ReadCommand<int>(n);
-            gRenDev->m_CurRenderEye = eye;
-        }
-        break;
-        case eRC_DynTexUpdate:
-            assert (m_eVideoThreadMode == eVTM_Disabled);
-            {
-                SDynTexture* pTex = ReadCommand<SDynTexture*>(n);
-                int nNewWidth = ReadCommand<int>(n);
-                int nNewHeight = ReadCommand<int>(n);
-                pTex->RT_Update(nNewWidth, nNewHeight);
-            }
-            break;
-        case eRC_ParseShader:
-        {
-            CShader* pSH = ReadCommand<CShader*>(n);
-            CShaderResources* pRes = ReadCommand<CShaderResources*>(n);
-            uint64 nMaskGen = ReadCommand<uint64>(n);
-            uint32 nFlags = ReadCommand<uint32>(n);
-
-            gRenDev->m_cEF.RT_ParseShader(pSH, nMaskGen, nFlags, pRes);
-            pSH->Release();
-            if (pRes)
-            {
-                pRes->Release();
-            }
-        }
-        break;
-        case eRC_SetShaderQuality:
-        {
-            EShaderType eST = (EShaderType) ReadCommand<uint32>(n);
-            EShaderQuality eSQ = (EShaderQuality) ReadCommand<uint32>(n);
-            gRenDev->m_cEF.RT_SetShaderQuality(eST, eSQ);
-        }
-        break;
-        case eRC_PushFog:
-            gRenDev->EF_PushFog();
-            break;
-        case eRC_PopFog:
-            gRenDev->EF_PopFog();
-            break;
-        case eRC_PushVP:
-            gRenDev->FX_PushVP();
-            break;
-        case eRC_PopVP:
-            gRenDev->FX_PopVP();
-            break;
-        case eRC_RenderTextMessages:
-            gRenDev->RT_RenderTextMessages();
-            break;
-        case eRC_FlushTextureStreaming:
-        {
-            bool bAbort = ReadCommand<DWORD>(n) != 0;
-            CTexture::RT_FlushStreaming(bAbort);
-        }
-        break;
-        case eRC_ReleaseSystemTextures:
-            CTextureManager::Instance()->Release();
-            CTexture::ReleaseSystemTextures();
-            break;
-        case eRC_SetEnvTexRT:
-        {
-            SEnvTexture* pTex = ReadCommand<SEnvTexture*>(n);
-            int nWidth = ReadCommand<int>(n);
-            int nHeight = ReadCommand<int>(n);
-            int bPush = ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                pTex->m_pTex->RT_SetRT(0, nWidth, nHeight, bPush);
-            }
-        }
-        break;
-        case eRC_SetEnvTexMatrix:
-        {
-            SEnvTexture* pTex = ReadCommand<SEnvTexture*>(n);
-            pTex->RT_SetMatrix();
-        }
-        break;
-        case eRC_PushRT:
-            assert (m_eVideoThreadMode == eVTM_Disabled);
-            {
-                int nTarget = ReadCommand<int>(n);
-                CTexture* pTex = ReadCommand<CTexture*>(n);
-                SDepthTexture* pDS = ReadCommand<SDepthTexture*>(n);
-                int nS = ReadCommand<int>(n);
-                if (m_eVideoThreadMode == eVTM_Disabled)
-                {
-                    gRenDev->RT_PushRenderTarget(nTarget, pTex, pDS, nS);
-                }
-            }
-            break;
-        case eRC_PopRT:
-        {
-            int nTarget = ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_PopRenderTarget(nTarget);
-            }
-        }
-        break;
-        case eRC_EntityDelete:
-        {
-            IRenderNode* pRN = ReadCommand<IRenderNode*>(n);
-            SDynTexture_Shadow::RT_EntityDelete(pRN);
-        }
-        break;
-        case eRC_PreactivateShaders:
-        {
-            CHWShader::RT_PreactivateShaders();
-        }
-        break;
-        case eRC_PrecacheShader:
-        {
-            CShader* pShader = ReadCommand<CShader*>(n);
-            SShaderCombination cmb = ReadCommand<SShaderCombination>(n);
-            bool bForce = ReadCommand<DWORD>(n) != 0;
-            bool bCompressedOnly = ReadCommand<DWORD>(n) != 0;
-            CShaderResources* pRes = ReadCommand<CShaderResources*>(n);
-
-            pShader->mfPrecache(cmb, bForce, bCompressedOnly, pRes);
-
-            SAFE_RELEASE(pRes);
-            pShader->Release();
-        }
-        break;
-        case eRC_SetViewport:
-        {
-            int nX = ReadCommand<int>(n);
-            int nY = ReadCommand<int>(n);
-            int nWidth = ReadCommand<int>(n);
-            int nHeight = ReadCommand<int>(n);
-            int nID = ReadCommand<int>(n);
-            // when we are in video mode, don't execute the command
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_SetViewport(nX, nY, nWidth, nHeight, nID);
-            }
-        }
-        break;
-        case eRC_TexBlurAnisotropicVertical:
-        {
-            CTexture* pTex = ReadCommand<CTexture*>(n);
-            float fAnisoScale = ReadCommand<float>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                TexBlurAnisotropicVertical(pTex, 1, 8 * max(1.0f - min(fAnisoScale / 100.0f, 1.0f), 0.2f), 1, false);
-            }
-        }
-        break;
-
-        case eRC_OC_ReadResult_Try:
-        {
-            uint32 nDefaultNumSamples = ReadCommand<uint32>(n);
-            CREOcclusionQuery* pRE = ReadCommand<CREOcclusionQuery*>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                pRE->RT_ReadResult_Try(nDefaultNumSamples);
-            }
-        }
-        break;
-
-        case eRC_PostLevelLoading:
-        {
-            gRenDev->RT_PostLevelLoading();
-        }
-        break;
-
-        case eRC_StartVideoThread:
-            m_eVideoThreadMode = eVTM_RequestStart;
-            break;
-        case eRC_StopVideoThread:
-            m_eVideoThreadMode = eVTM_RequestStop;
-            break;
-
-        case eRC_CGCSetLayers:
-        {
-            IColorGradingControllerInt* pController = ReadCommand<IColorGradingControllerInt*>(n);
-            uint32 numLayers = ReadCommand<uint32>(n);
-            const SColorChartLayer* pLayers = numLayers ? (const SColorChartLayer*) &m_Commands[threadId][n] : 0;
-            n += sizeof(SColorChartLayer) * numLayers;
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                pController->RT_SetLayers(pLayers, numLayers);
-            }
-        }
-        break;
-
-        case eRC_GenerateSkyDomeTextures:
-        {
-            CREHDRSky* pSky = ReadCommand<CREHDRSky*>(n);
-            int32 width = ReadCommand<int32>(n);
-            int32 height = ReadCommand<int32>(n);
-            pSky->GenerateSkyDomeTextures(width, height);
-        }
-        break;
-
-        case eRC_SetRendererCVar:
-        {
-            ICVar* pCVar = ReadCommand<ICVar*>(n);
-            const char* pArgText = ReadTextCommand<const char*>(n);
-            const bool bSilentMode = ReadCommand<int>(n) != 0;
-
-            gRenDev->RT_SetRendererCVar(pCVar, pArgText, bSilentMode);
-        }
-        break;
-
-        case eRC_RenderDebug:
-        {
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->RT_RenderDebug();
-            }
-            else
-            {
-                gRenDev->RT_RenderTextMessages();
-            }
-        }
-        break;
-
-        case eRC_ForceMeshGC:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                CRenderMesh::Tick();
-            }
-            break;
-
-        case eRC_DevBufferSync:
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->m_DevBufMan.Sync(gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID);
-            }
-            break;
-
-        case eRC_UnlinkTexture:
-        {
-            CTexture* tex = ReadCommand<CTexture*>(n);
-            tex->RT_Unlink();
-        }
-        break;
-
-        case eRC_RelinkTexture:
-        {
-            CTexture* tex = ReadCommand<CTexture*>(n);
-            tex->RT_Relink();
-        }
-        break;
-
-        case eRC_PushSkinningPoolId:
-            gRenDev->RT_SetSkinningPoolId(ReadCommand< uint32 >(n));
-            break;
-        case eRC_ReleaseRemappedBoneIndices:
-        {
-            IRenderMesh* pRenderMesh = ReadCommand<IRenderMesh*>(n);
-            uint32 guid = ReadCommand<uint32>(n);
-            pRenderMesh->ReleaseRemappedBoneIndicesPair(guid);
-            pRenderMesh->Release();
-        }
-        break;
-
-        case eRC_SetColorOp:
-        {
-            int eCo = ReadCommand<int>(n);
-            int eAo = ReadCommand<int>(n);
-            int eCa = ReadCommand<int>(n);
-            int eAa = ReadCommand<int>(n);
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->EF_SetColorOp(eCo, eAo, eCa, eAa);
-            }
-        }
-        break;
-
-        case eRC_SetSrgbWrite:
-        {
-            bool srgbWrite = ReadCommand<int>(n) != 0;
-            if (m_eVideoThreadMode == eVTM_Disabled)
-            {
-                gRenDev->EF_SetSrgbWrite(srgbWrite);
-            }
-        }
-        break;
-
-        case eRC_InitializeVideoRenderer:
-        {
-            AZ::VideoRenderer::IVideoRenderer* pVideoRenderer = ReadCommand<AZ::VideoRenderer::IVideoRenderer*>(n);
-            gRenDev->RT_InitializeVideoRenderer(pVideoRenderer);
-        }
-        break;
-
-        case eRC_CleanupVideoRenderer:
-        {
-            AZ::VideoRenderer::IVideoRenderer* pVideoRenderer = ReadCommand<AZ::VideoRenderer::IVideoRenderer*>(n);
-            gRenDev->RT_CleanupVideoRenderer(pVideoRenderer);
-        }
-        break;
-
-        case eRC_DrawVideoRenderer:
-        {
-            AZ::VideoRenderer::IVideoRenderer* pVideoRenderer = ReadCommand<AZ::VideoRenderer::IVideoRenderer*>(n);
-            const AZ::VideoRenderer::DrawArguments drawArguments = ReadCommand<AZ::VideoRenderer::DrawArguments>(n);
-            gRenDev->RT_DrawVideoRenderer(pVideoRenderer, drawArguments);
-        }
-        break;
-
-        default:
-        {
-            assert(0);
-        }
-        break;
-        }
-    }
-
-#if !defined (NULL_RENDERER)
-    if (m_eVideoThreadMode == eVTM_Disabled)
-    {
-        gcpRendD3D->BindContextToThread(nDeviceOwningThreadID);
-    }
-# endif
-
-#endif//STRIP_RENDER_THREAD
-}
-
-void SRenderThread::Process()
-{
-    AZ_TRACE_METHOD();
-    while (true)
-    {
-        CTimeValue Time = iTimer->GetAsyncTime();
-
-        if (m_bQuit)
-        {
-            SignalFlushFinishedCond();
-            break;//put it here to safely shut down
-        }
-
-        WaitFlushCond();
-
-        const uint64 start = CryGetTicks();
-
-        CTimeValue TimeAfterWait = iTimer->GetAsyncTime();
-        gRenDev->m_fTimeWaitForMain[m_nCurThreadProcess] += TimeAfterWait.GetDifferenceInSeconds(Time);
-        if (gRenDev->m_bStartLevelLoading)
-        {
-            m_fTimeIdleDuringLoading += TimeAfterWait.GetDifferenceInSeconds(Time);
-        }
-
-        float fT = 0.f;
-
-        if (m_eVideoThreadMode == eVTM_Disabled)
-        {
-            //gRenDev->m_fRTTimeBeginFrame = 0;
-            //gRenDev->m_fRTTimeEndFrame = 0;
-            gRenDev->m_fRTTimeSceneRender = 0;
-            gRenDev->m_fRTTimeMiscRender = 0;
-
-            ProcessCommands(false /*loadTimeProcessing*/);
-
-            CTimeValue TimeAfterProcess = iTimer->GetAsyncTime();
-            fT = TimeAfterProcess.GetDifferenceInSeconds(TimeAfterWait);
-            gRenDev->m_fTimeProcessedRT[m_nCurThreadProcess] += fT;
-
-            if (m_eVideoThreadMode == eVTM_RequestStart)
-            {
-            }
-
-            SignalFlushFinishedCond();
-        }
-
-        if (gRenDev->m_bStartLevelLoading)
-        {
-            m_fTimeBusyDuringLoading += fT;
-        }
-#if !defined (NULL_RENDERER)
-        if (m_eVideoThreadMode == eVTM_RequestStart)
-        {
-            uint32 frameId = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-            DWORD nDeviceOwningThreadID = gcpRendD3D->GetBoundThreadID();
-            gcpRendD3D->BindContextToThread(CryGetCurrentThreadId());
-            gRenDev->m_DevBufMan.Sync(frameId); // make sure no request are flying when switching to render loading thread
-
-            // Guarantee default resources
-            gRenDev->InitSystemResources(0);
-
-            // Create another render thread;
-            SwitchMode(true);
-
-            {
-                CTimeValue lastTime = gEnv->pTimer->GetAsyncTime();
-                CTimeValue workingStart = lastTime;
-                CTimeValue workingEnd = lastTime;
-
-                while (m_eVideoThreadMode != eVTM_ProcessingStop)
-                {
-                    AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Renderer, "Loading Frame");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(RenderThread_cpp)
-#endif
-                    frameId += 1;
-
-                    const CTimeValue curTime = gEnv->pTimer->GetAsyncTime();
-                    const CTimeValue deltaTime = curTime - lastTime;
-                    const CTimeValue workingTime = workingEnd - workingStart;
-
-                    const float deltaTimeInSeconds = AZStd::max<float>(deltaTime.GetSeconds(), 0.0f);
-
-                    lastTime = curTime;
-
-                    // If we spent less than half of the last frame doing anything, try to spend most of that time sleeping this frame.
-                    // This will help us spend less time in the lock while presenting when vsync is enabled.
-                    if (workingTime.GetValue() < (deltaTime.GetValue() / 2))
-                    {
-                        const uint32_t sleepTime = AZStd::min<uint32_t>(aznumeric_cast<uint32_t>(deltaTime.GetMilliSeconds()) / 2, 16);
-                        CrySleep(sleepTime);
-                    }
-
-                    workingStart = gEnv->pTimer->GetAsyncTime();
-
-                    {
-                        CryAutoLock<CryMutex> lock(m_lockRenderLoading);
-                        gRenDev->m_DevBufMan.Update(frameId, true);
-                    }
-
-                    if (m_pLoadtimeCallback)
-                    {
-                        CryAutoLock<CryMutex> lock(m_lockRenderLoading);
-                        m_pLoadtimeCallback->LoadtimeUpdate(deltaTimeInSeconds);
-                    }
-
-                    {
-                        ////////////////////////////////////////////////
-                        // wait till all SRendItems for this frame have finished preparing
-                        const threadID processThreadID = gRenDev->m_RP.m_nProcessThreadID;
-                        gRenDev->GetFinalizeRendItemJobExecutor(processThreadID)->WaitForCompletion();
-                        gRenDev->GetFinalizeShadowRendItemJobExecutor(processThreadID)->WaitForCompletion();
-
-                        {
-                            CryAutoLock<CryMutex> lock(m_lockRenderLoading);
-
-                            gRenDev->SetViewport(0, 0, gRenDev->GetOverlayWidth(), gRenDev->GetOverlayHeight());
-
-                            SPostEffectsUtils::AcquireFinalCompositeTarget(false);
-
-                            if (m_pLoadtimeCallback)
-                            {
-                                m_pLoadtimeCallback->LoadtimeRender();
-                            }
-
-                            gRenDev->m_DevBufMan.ReleaseEmptyBanks(frameId);
-
-                            workingEnd = gEnv->pTimer->GetAsyncTime();
-
-                            gRenDev->RT_PresentFast();
-
-                            CRenderMesh::Tick();
-                            CTexture::RT_LoadingUpdate();
-                        }
-                    }
-
-                    // Make sure we aren't running with thousands of FPS with VSync disabled
-                    gRenDev->LimitFramerate(120, true);
-
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-                    gcpRendD3D->DevInfo().ProcessSystemEventQueue();
-#endif
-                }
-            }
-            if (m_pThreadLoading)
-            {
-                QuitRenderLoadingThread();
-            }
-            m_eVideoThreadMode = eVTM_Disabled;
-
-            if (m_bBeginFrameCalled)
-            {
-                m_bBeginFrameCalled = false;
-                gRenDev->RT_BeginFrame();
-            }
-            if (m_bEndFrameCalled)
-            {
-                m_bEndFrameCalled = false;
-                gRenDev->RT_EndFrame();
-            }
-            gcpRendD3D->BindContextToThread(nDeviceOwningThreadID);
-        }
-#endif
-        const uint64 elapsed = CryGetTicks() - start;
-        gEnv->pSystem->GetCurrentUpdateTimeStats().RenderTime = elapsed;
-    }
-#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    m_kDXGLDeviceContextHandle.Set(NULL, !CRenderer::CV_r_multithreaded);
-    m_kDXGLContextHandle.Set(NULL);
-#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
-}
-
-void SRenderThread::ProcessLoading()
-{
-    AZ_TRACE_METHOD();
-    while (true)
-    {
-        float fTime = iTimer->GetAsyncCurTime();
-        WaitFlushCond();
-        if (m_bQuitLoading)
-        {
-            SignalFlushFinishedCond();
-            break;//put it here to safely shut down
-        }
-        float fTimeAfterWait = iTimer->GetAsyncCurTime();
-        gRenDev->m_fTimeWaitForMain[m_nCurThreadProcess] += fTimeAfterWait - fTime;
-        if (gRenDev->m_bStartLevelLoading)
-        {
-            m_fTimeIdleDuringLoading += fTimeAfterWait - fTime;
-        }
-
-        ProcessCommands(true /*loadTimeProcessing*/);
-
-        SignalFlushFinishedCond();
-        float fTimeAfterProcess = iTimer->GetAsyncCurTime();
-        gRenDev->m_fTimeProcessedRT[m_nCurThreadProcess] += fTimeAfterProcess - fTimeAfterWait;
-        if (gRenDev->m_bStartLevelLoading)
-        {
-            m_fTimeBusyDuringLoading += fTimeAfterProcess - fTimeAfterWait;
-        }
-        if (m_eVideoThreadMode == eVTM_RequestStop)
-        {
-            // Switch to general render thread
-            SwitchMode(false);
-        }
-    }
-#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    m_kDXGLDeviceContextHandle.Set(NULL, !CRenderer::CV_r_multithreaded);
-    m_kDXGLContextHandle.Set(NULL);
-#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
-}
-
-#ifndef STRIP_RENDER_THREAD
-// Flush current frame and wait for result (main thread only)
-void SRenderThread::FlushAndWait()
-{
-    AZ_TRACE_METHOD();
-    if (IsRenderThread())
-    {
-        return;
-    }
-
-    FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_RENDERER);
-
-    if (!m_pThread)
-    {
-        return;
-    }
-
-    SyncMainWithRender();
-    SyncMainWithRender();
-}
-#endif//STRIP_RENDER_THREAD
-
-// Flush current frame without waiting (should be called from main thread)
-void SRenderThread::SyncMainWithRender()
-{
-    AZ_PROFILE_FUNCTION_STALL(AZ::Debug::ProfileCategory::Renderer);
-    FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_RENDERER);
-
-#if defined(USE_HANDLE_FOR_FINAL_FLUSH_SYNC)
-    if (m_bQuit && m_pThread && !m_pThread->IsRunning())
-    {
-        // We're in shutdown and the render thread is not running.
-        // We should not attempt to wait for the render thread to signal us.
-        return;
-    }
-#endif // defined(USE_HANDLE_FOR_FINAL_FLUSH_SYNC)
-
-    if (!IsMultithreaded())
-    {
-        gRenDev->SyncMainWithRender();
-        gRenDev->m_fTimeProcessedRT[m_nCurThreadProcess] = 0;
-        gRenDev->m_fTimeWaitForMain[m_nCurThreadProcess] = 0;
-        gRenDev->m_fTimeWaitForGPU[m_nCurThreadProcess] = 0;
-        return;
-    }
-
-#ifndef STRIP_RENDER_THREAD
-    CTimeValue time = iTimer->GetAsyncTime();
-    WaitFlushFinishedCond();
-
-    CPostEffectsMgr* pPostEffectMgr = PostEffectMgr();
-    if (pPostEffectMgr)
-    {
-        // Must be called before the thread ID's get swapped
-        pPostEffectMgr->SyncMainWithRender();
-    }
-
-    gRenDev->SyncMainWithRender();
-
-    gRenDev->m_fTimeWaitForRender[m_nCurThreadFill] = iTimer->GetAsyncTime().GetDifferenceInSeconds(time);
-    //  gRenDev->ToggleMainThreadAuxGeomCB();
-    gRenDev->m_RP.m_TI[m_nCurThreadProcess].m_nFrameUpdateID = gRenDev->m_RP.m_TI[m_nCurThreadFill].m_nFrameUpdateID;
-    gRenDev->m_RP.m_TI[m_nCurThreadProcess].m_nFrameID = gRenDev->m_RP.m_TI[m_nCurThreadFill].m_nFrameID;
-    m_nCurThreadProcess = m_nCurThreadFill;
-    m_nCurThreadFill = (m_nCurThreadProcess + 1) & 1;
-    gRenDev->m_RP.m_nProcessThreadID = threadID(m_nCurThreadProcess);
-    gRenDev->m_RP.m_nFillThreadID = threadID(m_nCurThreadFill);
-    m_Commands[m_nCurThreadFill].SetUse(0);
-    gRenDev->m_fTimeProcessedRT[m_nCurThreadProcess] = 0;
-    gRenDev->m_fTimeWaitForMain[m_nCurThreadProcess] = 0;
-    gRenDev->m_fTimeWaitForGPU[m_nCurThreadProcess] = 0;
-
-    gRenDev->m_RP.m_pCurrentRenderView = gRenDev->m_RP.m_pRenderViews[gRenDev->m_RP.m_nProcessThreadID].get();
-    gRenDev->m_RP.m_pCurrentFillView = gRenDev->m_RP.m_pRenderViews[gRenDev->m_RP.m_nFillThreadID].get();
-    gRenDev->m_RP.m_pCurrentRenderView->PrepareForRendering();
-
-    SignalFlushCond();
-#endif
-}
-
-void SRenderThread::QuitRenderThread()
-{
-    AZ_TRACE_METHOD();
-    if (IsMultithreaded() && m_pThread)
-    {
-        SignalQuitCond();
-#if defined(USE_LOCKS_FOR_FLUSH_SYNC)
-        FlushAndWait();
-#endif
-        m_pThread->WaitForThread();
-        SAFE_DELETE(m_pThread);
-
-#if !defined(STRIP_RENDER_THREAD)
-        m_nCurThreadProcess = m_nCurThreadFill;
-#endif
-    }
-    m_bQuit = 1;
-}
-
-void SRenderThread::QuitRenderLoadingThread()
-{
-    AZ_TRACE_METHOD();
-    if (IsMultithreaded() && m_pThreadLoading)
-    {
-        FlushAndWait();
-        m_bQuitLoading = true;
-        m_pThreadLoading->WaitForThread();
-        SAFE_DELETE(m_pThreadLoading);
-        m_nRenderThreadLoading = 0;
-        CNameTableR::m_nRenderThread = m_nRenderThread;
-    }
-}
-
-bool SRenderThread::IsFailed()
-{
-    AZ_TRACE_METHOD();
-    return !m_bSuccessful;
-}
-
-bool CRenderer::FlushRTCommands(bool bWait, bool bImmediatelly, bool bForce)
-{
-    AZ_TRACE_METHOD();
-    SRenderThread* pRT = m_pRT;
-    IF (!pRT, 0)
-    {
-        return true;
-    }
-    if (pRT->IsRenderThread(true))
-    {
-        SSystemGlobalEnvironment* pEnv = iSystem->GetGlobalEnvironment();
-        if (pEnv && pEnv->IsEditor())
-        {
-            CPostEffectsMgr* pPostEffectMgr = PostEffectMgr();
-            if (pPostEffectMgr)
-            {
-                pPostEffectMgr->SyncMainWithRender();
-            }
-        }
-        return true;
-    }
-    if (!bForce && (!m_bStartLevelLoading || !pRT->IsMultithreaded()))
-    {
-        return false;
-    }
-    if (!bImmediatelly && pRT->CheckFlushCond())
-    {
-        return false;
-    }
-    if (bWait)
-    {
-        pRT->FlushAndWait();
-    }
-
-    return true;
-}
-
-bool CRenderer::ForceFlushRTCommands()
-{
-    AZ_TRACE_METHOD();
-    LOADING_TIME_PROFILE_SECTION;
-    return FlushRTCommands(true, true, true);
-}
-
-// Must be executed from main thread
-void SRenderThread::WaitFlushFinishedCond()
-{
-    AZ_TRACE_METHOD();
-    CTimeValue time = iTimer->GetAsyncTime();
-
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-    m_LockFlushNotify.Lock();
-    while (*(volatile int*)&m_nFlush)
-    {
-#if defined(USE_HANDLE_FOR_FINAL_FLUSH_SYNC)
-        m_LockFlushNotify.Unlock();
-        MsgWaitForMultipleObjects(1, &m_FlushFinishedCondition, FALSE, 1, QS_ALLINPUT);
-        m_LockFlushNotify.Lock();
-        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
-        if (m_bQuit && m_pThread && !m_pThread->IsRunning())
-        {
-            // We're in shutdown and the render thread is not running.
-            // We should not attempt to wait for the render thread to signal us -
-            // we force signal the flush condition to exit out of this wait loop.
-            m_nFlush = 0;
-        }
-#else
-        const int OneHunderdMilliseconds = 100;
-        bool timedOut = !(m_FlushFinishedCondition.TimedWait(m_LockFlushNotify, OneHunderdMilliseconds));
-#if defined(AZ_PLATFORM_IOS) && !defined(_RELEASE)
-        // When we trigger asserts or warnings from a thread other than the main thread, the dialog box has to be
-        // presented from the main thread. So, we need to pump the system event loop while the main thread is waiting.
-        // We're using locks for waiting on iOS. This means that once the main thread goes into the wait, it's not
-        // going to be able to pump system events. To handle this, we use a timed wait with 100ms. In most cases,
-        // the render thread will complete within 100ms. But, when we need to display a dialog from the render thread,
-        // it times out and pumps the system event loop so we can display the dialog. After that, since m_nFlush is still
-        // true, we will go back into the wait and let the render thread complete.
-        if (timedOut)
-        {
-            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
-        }
-#endif
-#endif
-    }
-    m_LockFlushNotify.Unlock();
-#else
-    READ_WRITE_BARRIER
-    while (*(volatile int*)&m_nFlush)
-    {
-#ifdef WIN32
-        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
-        Sleep(0);
-#elif defined(AZ_PLATFORM_MAC) && !defined(_RELEASE)
-        // On MacOS, we display blocking alerts(dialogs) to provide notifications to users(eg: assert failed).
-        // These alerts(NSAlert) can be triggered only from the main thread. If we run into an assert on the render thread,
-        // this block of code ensures that the alert is displayed on the main thread and we're not deadlocked with render thread.
-        if (!gEnv->IsEditor())
-        {
-            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
-        }
-#endif
-        READ_WRITE_BARRIER
-    }
-#endif
-}
-
-// Must be executed from render thread
-void SRenderThread::WaitFlushCond()
-{
-    AZ_TRACE_METHOD();
-    AZ_PROFILE_FUNCTION_STALL(AZ::Debug::ProfileCategory::Renderer);
-    FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_RENDERER);
-
-    CTimeValue time = iTimer->GetAsyncTime();
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-    m_LockFlushNotify.Lock();
-    while (!*(volatile int*)&m_nFlush)
-    {
-        m_FlushCondition.Wait(m_LockFlushNotify);
-    }
-    m_LockFlushNotify.Unlock();
-#else
-    READ_WRITE_BARRIER
-    while (!*(volatile int*)&m_nFlush)
-    {
-        if (m_bQuit)
-        {
-            break;
-        }
-        ::Sleep(0);
-        READ_WRITE_BARRIER
-    }
-#endif
-}
-
-#undef m_nCurThreadFill
-#undef m_nCurThreadProcess
diff --git a/Code/CryEngine/RenderDll/Common/RenderThread.h b/Code/CryEngine/RenderDll/Common/RenderThread.h
deleted file mode 100644
index ca5514b405..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderThread.h
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Render thread commands processing.
-
-
-#pragma once
-
-#include <AzCore/std/parallel/mutex.h>
-#include "UnalignedBlit.h"
-
-// Remove this include once the restricted platform separation process is complete
-#include "RendererDefs.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define RENDERTHREAD_H_SECTION_1 1
-#define RENDERTHREAD_H_SECTION_2 2
-#define RENDERTHREAD_H_SECTION_3 3
-#endif
-
-#if defined(ANDROID)
-#include <sched.h>
-#include <unistd.h>
-#endif
-
-#define RENDER_THREAD_NAME "RenderThread"
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(RenderThread_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #define RENDER_THREAD_PRIORITY THREAD_PRIORITY_NORMAL
-#endif
-
-#define RENDER_LOADING_THREAD_NAME "RenderLoadingThread"
-
-typedef void (* RenderFunc)(void);
-
-//====================================================================
-
-struct IRenderAuxGeomImpl;
-struct SAuxGeomCBRawDataPackaged;
-struct IColorGradingControllerInt;
-struct SColorChartLayer;
-class CRenderMesh;
-struct SDynTexture;
-struct STexStreamInState;
-struct SDepthTexture;
-
-#if RENDERTHREAD_H_TRAIT_USE_LOCKS_FOR_FLUSH_SYNC
-#define USE_LOCKS_FOR_FLUSH_SYNC
-#elif defined(WIN32)
-#define USE_LOCKS_FOR_FLUSH_SYNC
-#define USE_HANDLE_FOR_FINAL_FLUSH_SYNC
-#endif
-
-enum ERenderCommand
-{
-    eRC_Unknown = 0,
-    eRC_Init,
-    eRC_ShutDown,
-    eRC_CreateDevice,
-    eRC_ResetDevice,
-    eRC_SuspendDevice,
-    eRC_ResumeDevice,
-    eRC_BeginFrame,
-    eRC_EndFrame,
-    eRC_ClearTargetsImmediately,
-    eRC_RenderTextMessages,
-    eRC_FlushTextureStreaming,
-    eRC_ReleaseSystemTextures,
-    eRC_PreloadTextures,
-    eRC_ReadFrameBuffer,
-    eRC_ForceSwapBuffers,
-    eRC_SwitchToNativeResolutionBackbuffer,
-
-    eRC_DrawLines,
-    eRC_DrawStringU,
-    eRC_UpdateTexture,
-    eRC_UpdateMesh2,
-    eRC_ReleaseBaseResource,
-    eRC_ReleaseFont,
-    eRC_ReleaseSurfaceResource,
-    eRC_ReleaseIB,
-    eRC_ReleaseVB,
-    eRC_ReleaseVBStream,
-    eRC_CreateResource,
-    eRC_ReleaseResource,
-    eRC_ReleaseRenderResources,
-    eRC_PrecacheDefaultShaders,
-    eRC_UnbindTMUs,
-    eRC_UnbindResources,
-    eRC_CreateRenderResources,
-    eRC_CreateSystemTargets,
-    eRC_CreateDeviceTexture,
-    eRC_CopyDataToTexture,
-    eRC_ClearTarget,
-    eRC_CreateREPostProcess,
-    eRC_ParseShader,
-    eRC_SetShaderQuality,
-    eRC_UpdateShaderItem,
-    eRC_RefreshShaderResourceConstants,
-    eRC_ReleaseDeviceTexture,
-    eRC_FlashRender,
-    eRC_FlashRenderLockless,
-    eRC_AuxFlush,
-    eRC_RenderScene,
-    eRC_PrepareStereo,
-    eRC_CopyToStereoTex,
-    eRC_SetStereoEye,
-    eRC_SetCamera,
-
-    eRC_PushProfileMarker,
-    eRC_PopProfileMarker,
-
-    eRC_PostLevelLoading,
-    eRC_SetState,
-    eRC_PushWireframeMode,
-    eRC_PopWireframeMode,
-    eRC_SetCull,
-    eRC_SetScissor,
-    eRC_SetStencilState,
-    eRC_SelectGPU,
-    eRC_DrawDynVB,
-    eRC_DrawDynVBUI,
-    eRC_Draw2dImage,
-    eRC_Draw2dImageStretchMode,
-    eRC_Push2dImage,
-    eRC_PushUITexture,
-    eRC_Draw2dImageList,
-    eRC_DrawImageWithUV,
-
-    eRC_PreprGenerateFarTrees,
-    eRC_DynTexUpdate,
-    eRC_PushFog,
-    eRC_PopFog,
-    eRC_PushVP,
-    eRC_PopVP,
-    eRC_SetEnvTexRT,
-    eRC_SetEnvTexMatrix,
-    eRC_PushRT,
-    eRC_PopRT,
-    eRC_SetViewport,
-    eRC_TexBlurAnisotropicVertical,
-
-    eRC_OC_ReadResult_Try,
-
-    eRC_CGCSetLayers,
-    eRC_EntityDelete,
-    eRC_ForceMeshGC,
-    eRC_DevBufferSync,
-
-    // streaming queries
-    eRC_PrecacheTexture,
-    eRC_SetTexture,
-
-    eRC_StartVideoThread,
-    eRC_StopVideoThread,
-
-    eRC_RenderDebug,
-    eRC_PreactivateShaders,
-    eRC_PrecacheShader,
-
-    eRC_RelinkTexture,
-    eRC_UnlinkTexture,
-
-    eRC_ReleasePostEffects,
-    eRC_ResetPostEffects,
-    eRC_ResetPostEffectsOnSpecChange,
-    eRC_DisableTemporalEffects,
-
-    eRC_ResetGlass,
-    eRC_ResetToDefault,
-
-    eRC_GenerateSkyDomeTextures,
-
-    eRC_PushSkinningPoolId,
-
-    eRC_ReleaseRemappedBoneIndices,
-
-    eRC_SetRendererCVar,
-    eRC_SetColorOp,
-    eRC_SetSrgbWrite,
-
-    eRC_InitializeVideoRenderer,
-    eRC_CleanupVideoRenderer,
-    eRC_DrawVideoRenderer,
-
-    eRC_AzFunction
-};
-
-//====================================================================
-
-struct CRenderThread
-    : CrySimpleThread<>
-{
-    int m_nCPU;
-    CRenderThread(int nCPU)
-    {
-        m_nCPU = CLAMP(nCPU, 1, 5);
-    }
-
-    virtual ~CRenderThread()
-    {
-        // Stop thread task.
-        Stop();
-    }
-
-    CryEvent    m_started;
-
-protected:
-    virtual void Run();
-};
-struct CRenderThreadLoading
-    : public CRenderThread
-{
-    CRenderThreadLoading(int nCPU)
-        : CRenderThread(nCPU) {}
-protected:
-    virtual void Run();
-};
-
-struct SRenderThread
-{
-    CRenderThread* m_pThread;
-    CRenderThreadLoading* m_pThreadLoading;
-    ILoadtimeCallback* m_pLoadtimeCallback;
-    CryMutex m_lockRenderLoading;
-    AZStd::mutex m_CommandsMutex;
-    bool m_bQuit;
-    bool m_bQuitLoading;
-    bool m_bSuccessful;
-    bool m_bBeginFrameCalled;
-    bool m_bEndFrameCalled;
-#ifndef STRIP_RENDER_THREAD
-    int m_nCurThreadProcess;
-    int m_nCurThreadFill;
-#endif
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-    int m_nFlush;
-    CryMutex                            m_LockFlushNotify;
-    CryConditionVariable    m_FlushCondition;
-#if defined(USE_HANDLE_FOR_FINAL_FLUSH_SYNC)
-    HANDLE m_FlushFinishedCondition;
-#else
-    CryConditionVariable    m_FlushFinishedCondition;
-#endif
-#else
-    volatile int m_nFlush;
-#endif
-    threadID m_nRenderThread;
-    threadID m_nRenderThreadLoading;
-    threadID m_nMainThread;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(RenderThread_h)
-#endif
-    HRESULT m_hResult;
-#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    SDXGLContextThreadLocalHandle m_kDXGLContextHandle;
-    SDXGLDeviceContextThreadLocalHandle m_kDXGLDeviceContextHandle;
-#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
-    float m_fTimeIdleDuringLoading;
-    float m_fTimeBusyDuringLoading;
-    TArray<byte> m_Commands[RT_COMMAND_BUF_COUNT]; // m_nCurThreadFill shows which commands are filled by main thread
-
-    // The below loading queue contains all commands that were submitted and require full device access during loading.
-    // Will be blit into the first render frame's command queue after loading and subsequently resized to 0.
-    TArray<byte> m_CommandsLoading;
-
-    static CryCriticalSection s_rcLock;
-
-    enum EVideoThreadMode
-    {
-        eVTM_Disabled = 0,
-        eVTM_RequestStart,
-        eVTM_Active,
-        eVTM_RequestStop,
-        eVTM_ProcessingStop,
-    };
-    EVideoThreadMode m_eVideoThreadMode;
-
-    SRenderThread();
-    ~SRenderThread();
-
-    inline void SignalFlushFinishedCond()
-    {
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-        m_LockFlushNotify.Lock();
-#endif
-        m_nFlush = 0;
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-#if defined(USE_HANDLE_FOR_FINAL_FLUSH_SYNC)
-        SetEvent(m_FlushFinishedCondition);
-#else
-        m_FlushFinishedCondition.Notify();
-#endif
-        m_LockFlushNotify.Unlock();
-#else
-        READ_WRITE_BARRIER
-#endif
-    }
-
-    inline void SignalFlushCond()
-    {
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-        m_LockFlushNotify.Lock();
-#endif
-        m_nFlush = 1;
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-        m_FlushCondition.Notify();
-        m_LockFlushNotify.Unlock();
-#else
-        READ_WRITE_BARRIER
-#endif
-    }
-
-    inline void SignalQuitCond()
-    {
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-        m_LockFlushNotify.Lock();
-#endif
-        m_bQuit = 1;
-#ifdef USE_LOCKS_FOR_FLUSH_SYNC
-        m_FlushCondition.Notify();
-        m_LockFlushNotify.Unlock();
-#else
-        READ_WRITE_BARRIER
-#endif
-    }
-
-    void WaitFlushCond();
-
-#ifdef WIN32
-    HWND GetRenderWindowHandle();
-#endif
-
-    void WaitFlushFinishedCond();
-
-    inline void InitFlushCond()
-    {
-        m_nFlush = 0;
-#if !defined(USE_LOCKS_FOR_FLUSH_SYNC)
-        READ_WRITE_BARRIER
-#endif
-    }
-
-    inline bool CheckFlushCond()
-    {
-#if !defined(USE_LOCKS_FOR_FLUSH_SYNC)
-        READ_WRITE_BARRIER
-#endif
-        return *(int*)&m_nFlush != 0;
-    }
-
-    static constexpr size_t RenderThreadStackSize = 128ull * 1024ull;
-
-    void StartRenderThread()
-    {
-        if (m_pThread != NULL)
-        {
-            int32 renderThreadPriority = RENDER_THREAD_PRIORITY;
-#if defined(AZ_PLATFORM_IOS) || defined(AZ_PLATFORM_MAC)
-            //Apple recommends to never use 0 as a render thread priority.
-            //In this case we are getting the max thread priority and going 2 levels below for ideal performance.
-            int thread_policy;
-            sched_param thread_sched_param;
-            pthread_getschedparam(pthread_self(), &thread_policy, &thread_sched_param);
-            renderThreadPriority = sched_get_priority_max(thread_policy) - 2;
-#endif
-            
-            m_pThread->Start(AFFINITY_MASK_RENDERTHREAD, RENDER_THREAD_NAME, renderThreadPriority, RenderThreadStackSize);
-            m_pThread->m_started.Wait();
-        }
-    }
-
-    void StartRenderLoadingThread()
-    {
-        if (m_pThreadLoading != NULL)
-        {
-            m_pThreadLoading->Start(AFFINITY_MASK_USERTHREADS, RENDER_THREAD_NAME, RENDER_THREAD_PRIORITY + 1, RenderThreadStackSize);
-            m_pThreadLoading->m_started.Wait();
-        }
-    }
-
-    bool IsFailed();
-    void ValidateThreadAccess(ERenderCommand eRC);
-
-    _inline size_t Align4(size_t value)
-    {
-        return (value + 3) & ~((size_t)3);
-    }
-
-    _inline byte* AddCommandTo(ERenderCommand eRC, size_t nParamBytes, TArray<byte>& queue)
-    {
-        AZ_Assert(nParamBytes == Align4(nParamBytes), "Input nParamBytes is %" PRISIZE_T " bytes, which not aligned to 4 bytes.", nParamBytes);
-
-        m_CommandsMutex.lock();
-
-        assert(m_pThread != NULL);
-        uint32 cmdSize = sizeof(uint32) + nParamBytes;
-#if !defined(_RELEASE)
-        cmdSize += sizeof(uint32);
-#endif
-        byte* ptr = queue.Grow(cmdSize);
-        AddDWORD(ptr, eRC);
-#if !defined(_RELEASE)
-        // Processed flag
-        AddDWORD(ptr, 0);
-#endif
-        return ptr;
-    }
-
-    _inline void EndCommandTo([[maybe_unused]] byte* ptr, [[maybe_unused]] TArray<byte>& queue)
-    {
-#ifndef _RELEASE
-        if (ptr - queue.Data() != queue.Num())
-        {
-            CryFatalError("Bad render command size - check the parameters and round each up to 4-byte boundaries [expected queue size = %" PRISIZE_T ", actual size = %u]", (size_t)(ptr - queue.Data()), queue.Num());
-        }
-#endif
-        m_CommandsMutex.unlock();
-    }
-
-    _inline byte* AddCommand(ERenderCommand eRC, size_t nParamBytes)
-    {
-        AZ_Assert(nParamBytes == Align4(nParamBytes), "Input nParamBytes is %" PRISIZE_T " bytes, which not aligned to 4 bytes.", nParamBytes);
-
-#ifdef STRIP_RENDER_THREAD
-        return NULL;
-#else
-        return AddCommandTo(eRC, nParamBytes, m_Commands[m_nCurThreadFill]);
-#endif
-    }
-
-    _inline void EndCommand(byte* ptr)
-    {
-#ifndef STRIP_RENDER_THREAD
-        EndCommandTo(ptr, m_Commands[m_nCurThreadFill]);
-#endif
-    }
-
-    _inline void AddDWORD(byte*& ptr, uint32 nVal)
-    {
-        *(uint32*)ptr = nVal;
-        ptr += sizeof(uint32);
-    }
-    _inline void AddDWORD64(byte*& ptr, uint64 nVal)
-    {
-        StoreUnaligned((uint32*)ptr, nVal); // uint32 because command list maintains 4-byte alignment
-        ptr += sizeof(uint64);
-    }
-    _inline void AddTI(byte*& ptr, SThreadInfo& TI)
-    {
-        memcpy((SThreadInfo*)ptr, &TI, sizeof(SThreadInfo));
-        ptr += sizeof(SThreadInfo);
-    }
-    _inline void AddRenderingPassInfo(byte*& ptr, SRenderingPassInfo* pPassInfo)
-    {
-        memcpy((SRenderingPassInfo*)ptr, pPassInfo, sizeof(SRenderingPassInfo));
-        ptr += sizeof(SRenderingPassInfo);
-    }
-    _inline void AddFloat(byte*& ptr, const float fVal)
-    {
-        *(float*)ptr = fVal;
-        ptr += sizeof(float);
-    }
-    _inline void AddVec3(byte*& ptr, const Vec3& cVal)
-    {
-        *(Vec3*)ptr = cVal;
-        ptr += sizeof(Vec3);
-    }
-    _inline void AddColor(byte*& ptr, const ColorF& cVal)
-    {
-        float* fData = (float*)ptr;
-        fData[0] = cVal[0];
-        fData[1] = cVal[1];
-        fData[2] = cVal[2];
-        fData[3] = cVal[3];
-        ptr += sizeof(ColorF);
-    }
-    _inline void AddColorB(byte*& ptr, const ColorB& cVal)
-    {
-        ptr[0] = cVal[0];
-        ptr[1] = cVal[1];
-        ptr[2] = cVal[2];
-        ptr[3] = cVal[3];
-        ptr += sizeof(ColorB);
-    }
-    _inline void AddPointer(byte*& ptr, const void* pVal)
-    {
-        StoreUnaligned((uint32*)ptr, pVal); // uint32 because command list maintains 4-byte alignment
-        ptr += sizeof(void*);
-    }
-    _inline void AddData(byte*& ptr, const void* pData, int nLen)
-    {
-        unsigned pad = (unsigned)-nLen % 4;
-        AddDWORD(ptr, nLen + pad);
-        memcpy(ptr, pData, nLen);
-        ptr += nLen + pad;
-    }
-    _inline void AddText(byte*& ptr, const char* pText)
-    {
-        int nLen = strlen(pText) + 1;
-        unsigned pad = (unsigned)-nLen % 4;
-        AddDWORD(ptr, nLen);
-        memcpy(ptr, pText, nLen);
-        ptr += nLen + pad;
-    }
-    _inline size_t TextCommandSize(const char* pText)
-    {
-        return 4 + Align4(strlen(pText) + 1);
-    }
-    _inline void AddText(byte*& ptr, const wchar_t* pText)
-    {
-        int nLen = (wcslen(pText) + 1) * sizeof(wchar_t);
-        unsigned pad = (unsigned)-nLen % 4;
-        AddDWORD(ptr, nLen);
-        memcpy(ptr, pText, nLen);
-        ptr += nLen + pad;
-    }
-    _inline size_t TextCommandSize(const wchar_t* pText)
-    {
-        return 4 + Align4((wcslen(pText) + 1) * sizeof(wchar_t));
-    }
-    template<class T>
-    T ReadCommand(int& nIndex)
-    {
-        T Res;
-        LoadUnaligned((uint32*)&m_Commands[m_nCurThreadProcess][nIndex], Res);
-        nIndex += (sizeof(T) + 3) & ~((size_t)3);
-        return Res;
-    }
-    template<class T>
-    T ReadTextCommand(int& nIndex)
-    {
-        unsigned int strLen = ReadCommand<unsigned int>(nIndex);
-        T Res = (T)&m_Commands[m_nCurThreadProcess][nIndex];
-        nIndex += strLen;
-        nIndex = (nIndex + 3) & ~((size_t)3);
-        return Res;
-    }
-
-    _inline threadID GetCurrentThreadId(bool bAlwaysCheck = false)
-    {
-#ifdef STRIP_RENDER_THREAD
-        return m_nRenderThread;
-#else
-        if (!bAlwaysCheck && m_nRenderThread == m_nMainThread)
-        {
-            return m_nRenderThread;
-        }
-
-        return ::GetCurrentThreadId();
-#endif
-    }
-    void SwitchMode(bool enableVideo);
-
-    void Init(int nCPU);
-    void QuitRenderThread();
-    void QuitRenderLoadingThread();
-    void SyncMainWithRender();
-    void FlushAndWait();
-    void ProcessCommands(bool loadTimeProcessing);
-    void Process();         // Render thread
-    void ProcessLoading();  // Loading thread
-    int  GetThreadList();
-#if defined(AZ_PLATFORM_ANDROID)
-    bool IsRenderThread(bool bAlwaysCheck = true);
-    bool IsRenderLoadingThread(bool bAlwaysCheck = true);
-#else
-    bool IsRenderThread(bool bAlwaysCheck = false);
-    bool IsRenderLoadingThread(bool bAlwaysCheck = false);
-#endif
-    bool IsMainThread(bool bAlwaysCheck = false);
-    bool IsMultithreaded();
-    int  CurThreadFill() const;
-    void    RC_Init();
-    void    RC_ShutDown(uint32 nFlags);
-    bool    RC_CreateDevice();
-    void    RC_ResetDevice();
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERTHREAD_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(RenderThread_h)
-#endif
-    void    RC_PreloadTextures();
-    void    RC_ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX, int nScaledY);
-    bool    RC_CreateDeviceTexture(CTexture* pTex, const byte* pData[6]);
-    void    RC_CopyDataToTexture(void* pkTexture, unsigned int uiStartMip, unsigned int uiEndMip);
-    void    RC_ClearTarget(void* pkTexture, const ColorF& kColor);
-    void    RC_CreateResource(SResourceAsync* pRes);
-    void    RC_ReleaseRenderResources();
-    void        RC_PrecacheDefaultShaders();
-    void    RC_UnbindResources();
-    void    RC_UnbindTMUs();
-    void    RC_FreeObject(CRenderObject* pObj);
-    void    RC_CreateRenderResources();
-    void    RC_CreateSystemTargets();
-    void    RC_ReleaseBaseResource(CBaseResource* pRes);
-    void    RC_ReleaseFont(IFFont* font);
-    void    RC_ReleaseSurfaceResource(SDepthTexture* pRes);
-    void    RC_ReleaseResource(SResourceAsync* pRes);
-    void    RC_ReleaseResource(AZStd::unique_ptr<SResourceAsync> pRes);
-    void        RC_RelinkTexture(CTexture* pTex);
-    void        RC_UnlinkTexture(CTexture* pTex);
-    void    RC_CreateREPostProcess(CRendElementBase** re);
-    bool    RC_CheckUpdate2(CRenderMesh* pMesh, CRenderMesh* pVContainer, uint32 nStreamMask);
-    void    RC_ReleaseVB(buffer_handle_t nID);
-    void    RC_ReleaseIB(buffer_handle_t nID);
-    void    RC_DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, int nVerts, int nInds, const PublicRenderPrimitiveType nPrimType);
-    void    RC_DrawDynUiPrimitiveList(IRenderer::DynUiPrimitiveList& primitives, int totalNumVertices, int totalNumIndices);
-    void    RC_Draw2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, float r, float g, float b, float a, float z);
-    void    RC_Draw2dImageStretchMode(bool bStretch);
-    void    RC_Push2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, float r, float g, float b, float a, float z, float stereoDepth);
-    void    RC_PushUITexture(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, CTexture* pTarget, float r, float g, float b, float a);
-    void    RC_Draw2dImageList();
-    void    RC_DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int texture_id, float s[4], float t[4], float r, float g, float b, float a, bool filtered = true);
-    void        RC_UpdateTextureRegion(CTexture* pTex, const byte* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc);
-    void    RC_SetState(int State, int AlphaRef);
-    void    RC_SetStencilState(int st, uint32 nStencRef, uint32 nStencMask, uint32 nStencWriteMask, bool bForceFullReadMask);
-    void    RC_SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa);
-    void    RC_SetSrgbWrite(bool srgbWrite);
-    void        RC_PushWireframeMode(int nMode);
-    void        RC_PopWireframeMode();
-    void    RC_SetCull(int nMode);
-    void        RC_SetScissor(bool bEnable, int sX, int sY, int sWdt, int sHgt);
-    void    RC_PreactivateShaders();
-    void        RC_PrecacheShader(CShader* pShader, SShaderCombination& cmb, bool bForce, bool bCompressedOnly, CShaderResources* pRes);
-    void        RC_PushProfileMarker(const char* label);
-    void        RC_PopProfileMarker(const char* label);
-    void    RC_DrawLines(Vec3 v[], int nump, ColorF& col, int flags, float fGround);
-    void    RC_DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx);
-    void    RC_ReleaseDeviceTexture(CTexture* pTex);
-    void        RC_PrecacheResource(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter = 1);
-    void RC_ClearTargetsImmediately(int8 nType, uint32 nFlags, const ColorF& vColor, float depth);
-    void    RC_RenderTextMessages();
-    void    RC_FlushTextureStreaming(bool bAbort);
-    void    RC_ReleaseSystemTextures();
-    void     RC_AuxFlush(IRenderAuxGeomImpl* pAux, SAuxGeomCBRawDataPackaged& data, size_t begin, size_t end, bool reset);
-    void    RC_ParseShader (CShader* pSH, uint64 nMaskGen, uint32 flags, CShaderResources* pRes);
-    void        RC_SetShaderQuality(EShaderType eST, EShaderQuality eSQ);
-    void    RC_UpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial);
-    void    RC_RefreshShaderResourceConstants(SShaderItem* pShaderItem, IMaterial* pMaterial);
-    void    RC_SetCamera();
-    void    RC_RenderScene(int nFlags, RenderFunc pRenderFunc);
-    void    RC_BeginFrame();
-    void    RC_EndFrame(bool bWait);
-    void    RC_TryFlush();
-    void    RC_PrepareStereo(int mode, int output);
-    void    RC_CopyToStereoTex(int channel);
-    void    RC_SetStereoEye(int eye);
-    bool    RC_DynTexUpdate(SDynTexture* pTex, int nNewWidth, int nNewHeight);
-    void    RC_PushFog();
-    void    RC_PopFog();
-    void    RC_PushVP();
-    void    RC_PopVP();
-    void        RC_ForceSwapBuffers();
-    void    RC_SwitchToNativeResolutionBackbuffer();
-
-    void    RC_StartVideoThread();
-    void    RC_StopVideoThread();
-    void    RT_StartVideoThread();
-    void    RT_StopVideoThread();
-
-    void    RC_PostLoadLevel();
-    void    RC_SetEnvTexRT(SEnvTexture* pEnvTex, int nWidth, int nHeight, bool bPush);
-    void    RC_SetEnvTexMatrix(SEnvTexture* pEnvTex);
-    void    RC_PushRT(int nTarget, CTexture* pTex, SDepthTexture* pDS, int nS);
-    void    RC_PopRT(int nTarget);
-    void    RC_TexBlurAnisotropicVertical(CTexture* Tex, float fAnisoScale);
-    void    RC_EntityDelete(IRenderNode* pRenderNode);
-    void    RC_SetTexture(int nTex, int nUnit);
-
-    bool    RC_OC_ReadResult_Try(uint32 nDefaultNumSamples, CREOcclusionQuery* pRE);
-
-    void    RC_SetViewport(int x, int y, int width, int height, int id = 0);
-
-    void    RC_ReleaseVBStream(void* pVB, int nStream);
-    void    RC_ForceMeshGC(bool instant = false, bool wait = false);
-    void    RC_DevBufferSync();
-
-    void    RC_ReleasePostEffects();
-    void    RC_ResetPostEffects(bool bOnSpecChange = false);
-    void        RC_ResetGlass();
-    void        RC_DisableTemporalEffects();
-    void    RC_ResetToDefault();
-
-    void RC_CGCSetLayers(IColorGradingControllerInt* pController, const SColorChartLayer* pLayers, uint32 numLayers);
-
-    void        RC_GenerateSkyDomeTextures(CREHDRSky* pSky, int32 width, int32 height);
-
-    void        RC_SetRendererCVar(ICVar* pCVar, const char* pArgText, const bool bSilentMode = false);
-
-    void        RC_RenderDebug(bool bRenderStats = true);
-    void    RC_PushSkinningPoolId(uint32);
-    void        RC_ReleaseRemappedBoneIndices(IRenderMesh* pRenderMesh, uint32 guid);
-
-    void RC_InitializeVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer);
-    void RC_CleanupVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer);
-    void RC_DrawVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer, const AZ::VideoRenderer::DrawArguments& drawArguments);
-
-    using RenderCommandCB = AZStd::function<void()>;
-    void EnqueueRenderCommand(RenderCommandCB command);
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        for (uint32 i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            pSizer->AddObject(m_Commands[i]);
-        }
-    }
-} _ALIGN(128);//align to cache line
-
-_inline int SRenderThread::GetThreadList()
-{
-#ifdef STRIP_RENDER_THREAD
-    return m_nCurThreadFill;
-#else
-    if (IsRenderThread())
-    {
-        return m_nCurThreadProcess;
-    }
-
-    return m_nCurThreadFill;
-#endif
-}
-
-_inline bool SRenderThread::IsRenderThread(bool bAlwaysCheck)
-{
-#ifdef STRIP_RENDER_THREAD
-    return true;
-#else
-    threadID threadId = this->GetCurrentThreadId(bAlwaysCheck);
-
-    return (threadId == m_nRenderThreadLoading || threadId == m_nRenderThread);
-#endif
-}
-
-_inline bool SRenderThread::IsRenderLoadingThread(bool bAlwaysCheck)
-{
-#ifdef STRIP_RENDER_THREAD
-    return false;
-#else
-    threadID threadId = this->GetCurrentThreadId(bAlwaysCheck);
-
-    return threadId == m_nRenderThreadLoading;
-#endif
-}
-
-_inline bool SRenderThread::IsMainThread(bool bAlwaysCheck)
-{
-#ifdef STRIP_RENDER_THREAD
-    return false;
-#else
-    threadID threadId = this->GetCurrentThreadId(bAlwaysCheck);
-
-    return threadId == m_nMainThread;
-#endif
-}
-
-_inline bool SRenderThread::IsMultithreaded()
-{
-#ifdef STRIP_RENDER_THREAD
-    return false;
-#else
-    return m_pThread != NULL;
-#endif
-}
-
-_inline int SRenderThread::CurThreadFill() const
-{
-#ifdef STRIP_RENDER_THREAD
-    return 0;
-#else
-    return m_nCurThreadFill;
-#endif
-}
-
-#ifdef STRIP_RENDER_THREAD
-_inline void SRenderThread::FlushAndWait()
-{
-    return;
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/RenderView.cpp b/Code/CryEngine/RenderDll/Common/RenderView.cpp
deleted file mode 100644
index 3eafcaef8c..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderView.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "RenderView.h"
-
-CRenderView::CRenderView()
-{
-    InitRenderItems();
-}
-
-CRenderView::~CRenderView()
-{
-    FreeRenderItems();
-}
-
-void CRenderView::ClearRenderItems()
-{
-
-    for (int i = 0; i < MAX_LIST_ORDER; i++)
-    {
-        for (int j = 0; j < EFSLIST_NUM; j++)
-        {
-            m_renderItems[i][j].clear();
-        }
-    }
-}
-
-void CRenderView::FreeRenderItems()
-{
-    for (int i = 0; i < MAX_LIST_ORDER; i++)
-    {
-        for (int j = 0; j < EFSLIST_NUM; j++)
-        {
-            m_renderItems[i][j].resize(0);
-        }
-    }
-}
-
-void CRenderView::InitRenderItems()
-{
-    threadID nThreadId = CryGetCurrentThreadId();
-
-    for (int i = 0; i < MAX_LIST_ORDER; i++)
-    {
-        for (int j = 0; j < EFSLIST_NUM; j++)
-        {
-            m_renderItems[i][j].Init();
-            m_renderItems[i][j].SetNonWorkerThreadID(nThreadId);
-        }
-    }
-}
-
-void CRenderView::PrepareForRendering()
-{
-    for (int i = 0; i < MAX_LIST_ORDER; i++)
-    {
-        for (int j = 0; j < EFSLIST_NUM; j++)
-        {
-            //m_renderItems[i][j].CoalesceMemory();
-            //m_RenderListDesc[0].m_nEndRI[i][j] = m_renderItems[i][j].size();
-        }
-    }
-    //ClearBatchFlags();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderView::PrepareForWriting()
-{
-    // Clear batch flags.
-    ZeroStruct(m_BatchFlags);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CThreadSafeWorkerContainer<SRendItem>& CRenderView::GetRenderItems(int nAfterWater, int nRenderList)
-{
-    m_renderItems[nAfterWater][nRenderList].CoalesceMemory();
-    return m_renderItems[nAfterWater][nRenderList];
-}
-
-uint32 CRenderView::GetBatchFlags(int recusrion, int nAfterWater, int nRenderList) const
-{
-    return m_BatchFlags[recusrion][nAfterWater][nRenderList];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderView::AddRenderItem(IRenderElement* pElem, CRenderObject* RESTRICT_POINTER pObj, const SShaderItem& pSH,
-    uint32 nList, int nAafterWater, uint32 nBatchFlags, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    nBatchFlags |= (pSH.m_nPreprocessFlags & FSPR_MASK);
-
-    size_t nIndex = ~0;
-    SRendItem* ri = m_renderItems[nAafterWater][nList].push_back_new(nIndex);
-
-    ri->pObj = pObj;
-
-    ri->nOcclQuery = SRendItem::kOcclQueryInvalid;
-    if (nList == EFSLIST_TRANSP || nList == EFSLIST_HALFRES_PARTICLES)
-    {
-        ri->fDist = pObj->m_fDistance + pObj->m_fSort;
-    }
-    else
-    {
-        ri->ObjSort = (pObj->m_ObjFlags & 0xffff0000) | pObj->m_nSort;
-    }
-    ri->nBatchFlags = nBatchFlags;
-    ri->nStencRef = pObj->m_nClipVolumeStencilRef + 1; // + 1, we start at 1. 0 is reserved for MSAAed areas.
-
-    ri->rendItemSorter = rendItemSorter;
-
-    CShader* pShader = (CShader*)pSH.m_pShader;
-    uint32 nResID = pSH.m_pShaderResources ? ((CShaderResources*)(pSH.m_pShaderResources))->m_Id : 0;
-    assert(nResID < CShader::s_ShaderResources_known.size());
-
-    ri->SortVal = (nResID << 18) | (pShader->mfGetID() << 6) | (pSH.m_nTechnique & 0x3f);
-    ri->pElem = pElem;
-
-    // add flags atomically, if this one is not set already
-    volatile LONG* pBatchFlags = reinterpret_cast<volatile LONG*>(&m_BatchFlags[passInfo.GetRecursiveLevel()][nAafterWater][nList]);
-    CryInterlockedOr(pBatchFlags, nBatchFlags);
-
-    // update shadow pass flags if needed
-    if (nList == EFSLIST_SHADOW_GEN && !(nBatchFlags & FB_IGNORE_SG_MASK))
-    {
-        volatile LONG* pShadowGenMask = reinterpret_cast<volatile LONG*>(passInfo.ShadowGenMaskAddress());
-        uint32 nOrFlags = 1 << passInfo.ShadowFrustumSide();
-        CryInterlockedOr(pShadowGenMask, nOrFlags);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/RenderView.h b/Code/CryEngine/RenderDll/Common/RenderView.h
deleted file mode 100644
index 08e133226b..0000000000
--- a/Code/CryEngine/RenderDll/Common/RenderView.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <CryThreadSafeRendererContainer.h>
-#include <CryThreadSafeWorkerContainer.h>
-
-#include "RenderPipeline.h"
-
-// This class encapsulate all renderbale information to render a camera view.
-// It stores list of render items added by 3D engine
-class CRenderView
-{
-public:
-    CRenderView();
-    ~CRenderView();
-
-    void FreeRenderItems();
-    void ClearRenderItems();
-    void InitRenderItems();
-
-    CThreadSafeWorkerContainer<SRendItem>& GetRenderItems(int nAfterWater, int nRenderList);
-    uint32 GetBatchFlags(int recusrion, int nAfterWater, int nRenderList) const;
-
-    void AddRenderItem(IRenderElement* pElem, CRenderObject* RESTRICT_POINTER pObj, const SShaderItem& pSH,
-        uint32 nList, int nAafterWater, uint32 nBatchFlags, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-
-    void PrepareForRendering();
-
-    void PrepareForWriting();
-
-    static CRenderView* CurrentRenderView() { return gRenDev->m_RP.m_pCurrentRenderView; }
-    static CRenderView* CurrentFillView()    { return gRenDev->m_RP.m_pCurrentFillView; }
-    static CRenderView* GetRenderViewForThread(int thread) { return gRenDev->GetRenderViewForThread(thread); }
-
-private:
-    CThreadSafeWorkerContainer<SRendItem> m_renderItems[MAX_LIST_ORDER][EFSLIST_NUM];
-    
-    uint32 m_BatchFlags[MAX_REND_RECURSION_LEVELS][MAX_LIST_ORDER][EFSLIST_NUM];
-
-public:
-    SRenderListDesc m_RenderListDesc[MAX_REND_RECURSION_LEVELS];
-
-private:
-    CCamera m_camera;                       // Current camera
-    CameraViewParameters m_viewParameters;
-
-};
-
-typedef std::shared_ptr<CRenderView> CRenderViewPtr;
diff --git a/Code/CryEngine/RenderDll/Common/Renderer.cpp b/Code/CryEngine/RenderDll/Common/Renderer.cpp
deleted file mode 100644
index 9a548283a7..0000000000
--- a/Code/CryEngine/RenderDll/Common/Renderer.cpp
+++ /dev/null
@@ -1,8561 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Abstract renderer API
-
-
-#include "RenderDll_precompiled.h"
-
-#include <AzCore/Debug/Profiler.h>
-#include <AzCore/PlatformId/PlatformId.h>
-#include "Shadow_Renderer.h"
-#include "IStatObj.h"
-#include "I3DEngine.h"
-#include "IMovieSystem.h"
-#include "IIndexedMesh.h"
-#include "BitFiddling.h"                                                    // IntegerLog2()
-#include "ImageExtensionHelper.h"                                           // CImageExtensionHelper
-#include "Textures/Image/CImage.h"
-#include "Textures/TextureManager.h"
-#include "Textures/TextureStreamPool.h"
-#include "PostProcess/PostEffects.h"
-#include "RendElements/CRELensOptics.h"
-#include "IStereoRenderer.h"
-#include "../../Cry3DEngine/Environment/OceanEnvironmentBus.h"
-#include <Pak/CryPakUtils.h>
-
-#include <LoadScreenBus.h>
-#include <IVideoRenderer.h>
-
-#include "RendElements/OpticsFactory.h"
-
-#include "GraphicsPipeline/FurBendData.h"
-
-#include "IGeomCache.h"
-#include "ITimeOfDay.h"
-#include <AzCore/Math/Crc.h>
-
-#include "StatObjBus.h"
-#include "RenderBus.h"
-
-#include "RenderCapabilities.h"
-#include "RenderView.h"
-
-#if !defined(NULL_RENDERER)
-#include "DriverD3D.h"  //Needed for eGT_256bpp_PATH
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define RENDERER_CPP_SECTION_1 1
-#define RENDERER_CPP_SECTION_2 2
-#define RENDERER_CPP_SECTION_4 4
-#define RENDERER_CPP_SECTION_5 5
-#define RENDERER_CPP_SECTION_7 7
-#define RENDERER_CPP_SECTION_8 8
-#define RENDERER_CPP_SECTION_9 9
-#define RENDERER_CPP_SECTION_10 10
-#define RENDERER_CPP_SECTION_11 11
-#define RENDERER_CPP_SECTION_12 12
-#define RENDERER_CPP_SECTION_13 13
-#define RENDERER_CPP_SECTION_14 14
-#define RENDERER_CPP_SECTION_15 15
-#define RENDERER_CPP_SECTION_16 16
-#define RENDERER_CPP_SECTION_17 17
-#endif
-
-#if defined(LINUX)
-#include "ILog.h"
-#endif
-#include "IShader.h"
-#include "Renderer.h"
-
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <Common/Memory/VRAMDriller.h>
-#include "Maestro/Types/AnimParamType.h"
-#include <MainThreadRenderRequestBus.h>
-
-#if defined(AZ_PLATFORM_WINDOWS) // Scrubber friendly define negation
-    #if defined(OPENGL) // Scrubber friendly define negation
-    #else
-        #ifdef ENABLE_FRAME_PROFILER_LABELS
-        // This is need for D3DPERF_ functions
-        __pragma(comment(lib, "d3d9.lib"))
-        #endif
-    #endif
-#endif
-
-namespace
-{
-    class CConditonalLock
-    {
-        CryCriticalSection& _lock;
-        bool _bActive;
-    public:
-        CConditonalLock(CryCriticalSection& lock, bool bActive)
-            : _lock(lock)
-            , _bActive(bActive)
-        {
-            if (_bActive)
-            {
-                _lock.Lock();
-            }
-        }
-        ~CConditonalLock()
-        {
-            if (_bActive)
-            {
-                _lock.Unlock();
-            }
-        }
-    };
-}
-
-
-bool QueryIsFullscreen();
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-string D3DDebug_GetLastMessage();
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Globals.
-//////////////////////////////////////////////////////////////////////////
-CRenderer* gRenDev = nullptr;
-
-#define RENDERER_DEFAULT_FONT "Fonts/default.xml"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-#if !defined(RENDERER_DEFAULT_MESHPOOLSIZE)
-# define RENDERER_DEFAULT_MESHPOOLSIZE (0U)
-#endif
-#if !defined(RENDERER_DEFAULT_MESHINSTANCEPOOLSIZE)
-# define RENDERER_DEFAULT_MESHINSTANCEPOOLSIZE (0U)
-#endif
-
-int g_CpuFlags = 0;
-
-CNameTableR* CCryNameR::ms_table = nullptr;
-
-//////////////////////////////////////////////////////////////////////////
-// Pool allocators.
-//////////////////////////////////////////////////////////////////////////
-SDynTexture_PoolAlloc* g_pSDynTexture_PoolAlloc = 0;
-//////////////////////////////////////////////////////////////////////////
-
-// per-frame profilers: collect the information for each frame for
-// displaying statistics at the beginning of each frame
-//#define PROFILER(ID,NAME) DEFINE_FRAME_PROFILER(ID,NAME)
-//#include "FrameProfilers-list.h"
-//#undef PROFILER
-
-/// Used to delete none pre-allocated RenderObject pool elements
-struct SDeleteNonePoolRenderObjs
-{
-    SDeleteNonePoolRenderObjs(CRenderObject* pPoolStart, CRenderObject* pPoolEnd)
-        : m_pPoolStart(pPoolStart)
-        , m_pPoolEnd(pPoolEnd)   {}
-
-    void operator()(CRenderObject** pData) const
-    {
-        // Delete elements outside of pool range
-        if (*pData && (*pData < m_pPoolStart || *pData > m_pPoolEnd))
-        {
-            delete *pData;
-        }
-    }
-
-    CRenderObject* m_pPoolStart;
-    CRenderObject* m_pPoolEnd;
-};
-
-/// Used by console auto completion.
-struct STextureNameAutoComplete
-    : public IConsoleArgumentAutoComplete
-{
-    virtual int GetCount() const
-    {
-        SResourceContainer* pRC = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (!pRC)
-        {
-            return 0;
-        }
-        return pRC->m_RMap.size();
-    }
-    virtual const char* GetValue(int nIndex) const
-    {
-        SResourceContainer* pRC = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (!pRC || pRC->m_RMap.empty())
-        {
-            return "";
-        }
-        nIndex %= pRC->m_RMap.size();
-        ResourcesMap::const_iterator it = pRC->m_RMap.begin();
-        std::advance(it, nIndex);
-        CTexture* pTex = (CTexture*)it->second;
-        if (pTex)
-        {
-            return pTex->GetSourceName();
-        }
-        return "";
-    }
-} g_TextureNameAutoComplete;
-
-// Common render console variables
-int CRenderer::CV_r_ApplyToonShading;
-int CRenderer::CV_r_GraphicsPipeline;
-int CRenderer::CV_r_PostProcess_CB;
-int CRenderer::CV_r_PostProcess;
-float CRenderer::CV_r_dofMinZ;
-float CRenderer::CV_r_dofMinZScale;
-float CRenderer::CV_r_dofMinZBlendMult;
-int CRenderer::CV_r_vsync;
-int CRenderer::CV_r_OldBackendSkip;
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-float CRenderer::CV_r_overrideRefreshRate = 0;
-int CRenderer::CV_r_overrideScanlineOrder = 0;
-int CRenderer::CV_r_overrideDXGIOutput = 0;
-int CRenderer::CV_r_overrideDXGIOutputFS = 0;
-#endif
-#if defined(WIN32) || defined(WIN64)
-int CRenderer::CV_r_FullscreenPreemption = 1;
-#endif
-AllocateConstIntCVar(CRenderer, CV_e_DebugTexelDensity);
-int CRenderer::CV_r_flush;
-int CRenderer::CV_r_minimizeLatency = 0;
-AllocateConstIntCVar(CRenderer, CV_r_statsMinDrawcalls);
-AllocateConstIntCVar(CRenderer, CV_r_stats);
-AllocateConstIntCVar(CRenderer, CV_r_profiler);
-float CRenderer::CV_r_profilerTargetFPS;
-int CRenderer::CV_r_log = 0;
-AllocateConstIntCVar(CRenderer, CV_r_logTexStreaming);
-AllocateConstIntCVar(CRenderer, CV_r_logShaders);
-int CRenderer::CV_r_logVBuffers;
-AllocateConstIntCVar(CRenderer, CV_r_logVidMem);
-AllocateConstIntCVar(CRenderer, CV_r_predicatedtiling);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-int CRenderer::CV_r_DeferredShadingSortLights;
-int CRenderer::CV_r_DeferredShadingAmbientSClear;
-int CRenderer::CV_r_msaa;
-int CRenderer::CV_r_msaa_samples;
-int CRenderer::CV_r_msaa_quality;
-int CRenderer::CV_r_msaa_debug;
-float CRenderer::CV_r_msaa_threshold_normal;
-float CRenderer::CV_r_msaa_threshold_depth;
-
-int CRenderer::CV_r_BreakOnError;
-int CRenderer::CV_r_D3D12SubmissionThread;
-int CRenderer::CV_r_ReprojectOnlyStaticObjects;
-int CRenderer::CV_r_ReverseDepth;
-
-int CRenderer::CV_r_EnableDebugLayer;
-int CRenderer::CV_r_NoDraw;
-
-AllocateConstIntCVar(CRenderer, CV_r_multithreaded);
-// CRY DX12
-AllocateConstIntCVar(CRenderer, CV_r_multithreadedDrawing);
-AllocateConstIntCVar(CRenderer, CV_r_multithreadedDrawingActiveThreshold);
-
-int CRenderer::CV_r_multigpu;
-AllocateConstIntCVar(CRenderer, CV_r_texturecompiling);
-AllocateConstIntCVar(CRenderer, CV_r_texturecompilingIndicator);
-AllocateConstIntCVar(CRenderer, CV_r_TexturesDebugBandwidth);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreaming);
-AllocateConstIntCVar(CRenderer, CV_r_TexturesStreamingDebug);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingnoupload);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingonlyvideo);
-int CRenderer::CV_r_texturesstreamingsync;
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingResidencyEnabled);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingUpdateType);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingPrecacheRounds);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingSuppress);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingPostponeMips);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingPostponeThresholdKB);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingPostponeThresholdMip);
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingMinReadSizeKB);
-int CRenderer::CV_r_texturesstreamingSkipMips;
-int CRenderer::CV_r_texturesstreamingMinUsableMips;
-int CRenderer::CV_r_texturesstreamingJobUpdate;
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-int CRenderer::CV_r_texturesstreamingDeferred;
-#endif
-#if defined(SUPPORTS_INPLACE_TEXTURE_STREAMING)
-int CRenderer::CV_r_texturesstreamingInPlace;
-#endif
-float CRenderer::CV_r_texturesstreamingResidencyTimeTestLimit;
-float CRenderer::CV_r_rain_maxviewdist;
-float CRenderer::CV_r_rain_maxviewdist_deferred;
-float CRenderer::CV_r_measureoverdrawscale;
-float CRenderer::CV_r_texturesstreamingResidencyTime;
-float CRenderer::CV_r_texturesstreamingResidencyThrottle;
-AllocateConstIntCVar(CRenderer, CV_r_texturesstreamingmipfading);
-int CRenderer::CV_r_TexturesStreamPoolSize;
-int CRenderer::CV_r_TexturesStreamPoolSecondarySize;
-int CRenderer::CV_r_texturesskiplowermips;
-int CRenderer::CV_r_rendertargetpoolsize;
-float CRenderer::CV_r_TexturesStreamingMaxRequestedMB;
-int CRenderer::CV_r_TexturesStreamingMaxRequestedJobs;
-float CRenderer::CV_r_TexturesStreamingMipBias;
-int CRenderer::CV_r_TexturesStreamingMipClampDVD;
-int CRenderer::CV_r_TexturesStreamingDisableNoStreamDuringLoad;
-float CRenderer::CV_r_TextureLodDistanceRatio;
-
-
-int CRenderer::CV_r_buffer_banksize;
-int CRenderer::CV_r_constantbuffer_banksize;
-int CRenderer::CV_r_constantbuffer_watermark;
-int CRenderer::CV_r_buffer_sli_workaround;
-int CRenderer::CV_r_transient_pool_size;
-AllocateConstIntCVar(CRenderer, CV_r_buffer_enable_lockless_updates);
-AllocateConstIntCVar(CRenderer, CV_r_enable_full_gpu_sync);
-int CRenderer::CV_r_buffer_pool_max_allocs;
-int CRenderer::CV_r_buffer_pool_defrag_static;
-int CRenderer::CV_r_buffer_pool_defrag_dynamic;
-int CRenderer::CV_r_buffer_pool_defrag_max_moves;
-
-int CRenderer::CV_r_dyntexmaxsize;
-int CRenderer::CV_r_dyntexatlascloudsmaxsize;
-
-AllocateConstIntCVar(CRenderer, CV_r_texpostponeloading);
-AllocateConstIntCVar(CRenderer, CV_r_texpreallocateatlases);
-int CRenderer::CV_r_texatlassize;
-int CRenderer::CV_r_texminanisotropy;
-int CRenderer::CV_r_texmaxanisotropy;
-AllocateConstIntCVar(CRenderer, CV_r_texlog);
-AllocateConstIntCVar(CRenderer, CV_r_texnoload);
-AllocateConstIntCVar(CRenderer, CV_r_texBlockOnLoad);
-
-AllocateConstIntCVar(CRenderer, CV_r_debugrendermode);
-AllocateConstIntCVar(CRenderer, CV_r_debugrefraction);
-
-int CRenderer::CV_r_VRAMDebug;
-int CRenderer::CV_r_DebugLightLayers;
-
-int CRenderer::CV_r_DeferredShadingTiled;
-int CRenderer::CV_r_DeferredShadingTiledHairQuality;
-int CRenderer::CV_r_DeferredShadingTiledDebugDirect;
-int CRenderer::CV_r_DeferredShadingTiledDebugIndirect;
-int CRenderer::CV_r_DeferredShadingTiledDebugAccumulation;
-int CRenderer::CV_r_DeferredShadingTiledDebugAlbedo;
-int CRenderer::CV_r_DeferredShadingSSS;
-int CRenderer::CV_r_DeferredShadingFilterGBuffer;
-
-int CRenderer::CV_r_UsePersistentRTForModelHUD;
-
-AllocateConstIntCVar(CRenderer, CV_r_deferredshadingLightVolumes);
-AllocateConstIntCVar(CRenderer, CV_r_deferredDecals);
-AllocateConstIntCVar(CRenderer, CV_r_deferredDecalsDebug);
-AllocateConstIntCVar(CRenderer, CV_r_deferredDecalsOnDynamicObjects);
-
-AllocateConstIntCVar(CRenderer, CV_r_deferredshadingDBTstencil);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingScissor);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingLBuffersFmt);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingDepthBoundsTest);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingDebug);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingDebugGBuffer);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingAmbient);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingEnvProbes);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingAmbientLights);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingLights);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingAreaLights);
-AllocateConstIntCVar(CRenderer, CV_r_DeferredShadingStencilPrepass);
-int CRenderer::CV_r_CBufferUseNativeDepth;
-
-
-float CRenderer::CV_r_DeferredShadingLightLodRatio;
-float CRenderer::CV_r_DeferredShadingLightStencilRatio;
-
-int CRenderer::CV_r_HDRDebug;
-int CRenderer::CV_r_HDRBloom;
-int CRenderer::CV_r_HDRBloomQuality;
-
-int CRenderer::CV_r_ToneMapTechnique;
-int CRenderer::CV_r_ColorSpace;
-int CRenderer::CV_r_ToneMapExposureType;
-float CRenderer::CV_r_ToneMapManualExposureValue;
-
-AllocateConstIntCVar(CRenderer, CV_r_HDRVignetting);
-AllocateConstIntCVar(CRenderer, CV_r_HDRTexFormat);
-
-int CRenderer::CV_r_HDRDolbyDynamicMetadata;
-
-int CRenderer::CV_r_HDRDolbyScurve;
-float CRenderer::CV_r_HDRDolbyScurveSourceMin;
-float CRenderer::CV_r_HDRDolbyScurveSourceMid;
-float CRenderer::CV_r_HDRDolbyScurveSourceMax;
-float CRenderer::CV_r_HDRDolbyScurveSlope;
-float CRenderer::CV_r_HDRDolbyScurveScale;
-float CRenderer::CV_r_HDRDolbyScurveRGBPQTargetMin;
-float CRenderer::CV_r_HDRDolbyScurveRGBPQTargetMid;
-float CRenderer::CV_r_HDRDolbyScurveRGBPQTargetMax;
-float CRenderer::CV_r_HDRDolbyScurveVisionTargetMin;
-float CRenderer::CV_r_HDRDolbyScurveVisionTargetMid;
-float CRenderer::CV_r_HDRDolbyScurveVisionTargetMax;
-
-float CRenderer::CV_r_HDREyeAdaptationSpeed;
-int CRenderer::CV_r_HDREyeAdaptationMode;
-float CRenderer::CV_r_HDRGrainAmount;
-
-float CRenderer::CV_r_Sharpening;
-float CRenderer::CV_r_ChromaticAberration;
-
-AllocateConstIntCVar(CRenderer, CV_r_geominstancing);
-AllocateConstIntCVar(CRenderer, CV_r_geominstancingdebug);
-AllocateConstIntCVar(CRenderer, CV_r_materialsbatching);
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX) || defined(USE_SILHOUETTEPOM_CVAR)
-int CRenderer::CV_r_SilhouettePOM;
-#endif
-#ifdef WATER_TESSELLATION_RENDERER
-int CRenderer::CV_r_WaterTessellationHW;
-#endif
-int CRenderer::CV_r_tessellationdebug;
-float CRenderer::CV_r_tessellationtrianglesize;
-float CRenderer::CV_r_displacementfactor;
-
-int CRenderer::CV_r_batchtype;
-int CRenderer::CV_r_geominstancingthreshold;
-int CRenderer::m_iGeomInstancingThreshold = 0;        // 0 means not set yet
-
-int CRenderer::CV_r_beams;
-
-AllocateConstIntCVar(CRenderer, CV_r_DebugLightVolumes);
-
-AllocateConstIntCVar(CRenderer, CV_r_UseShadowsPool);
-
-float CRenderer::CV_r_ShadowsBias;
-float CRenderer::CV_r_ShadowsAdaptionRangeClamp;
-float CRenderer::CV_r_ShadowsAdaptionSize;
-float CRenderer::CV_r_ShadowsAdaptionMin;
-float CRenderer::CV_r_ShadowsParticleKernelSize;
-float CRenderer::CV_r_ShadowsParticleJitterAmount;
-float CRenderer::CV_r_ShadowsParticleAnimJitterAmount;
-float CRenderer::CV_r_ShadowsParticleNormalEffect;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_16
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-
-AllocateConstIntCVar(CRenderer, CV_r_ShadowGenMode);
-
-AllocateConstIntCVar(CRenderer, CV_r_ShadowsUseClipVolume);
-AllocateConstIntCVar(CRenderer, CV_r_shadowtexformat);
-AllocateConstIntCVar(CRenderer, CV_r_ShadowsMaskResolution);
-AllocateConstIntCVar(CRenderer, CV_r_ShadowsMaskDownScale);
-AllocateConstIntCVar(CRenderer, CV_r_ShadowsStencilPrePass);
-int CRenderer::CV_r_ShadowsDepthBoundNV;
-int CRenderer::CV_r_ShadowsPCFiltering;
-float CRenderer::CV_r_shadow_jittering;
-int CRenderer::CV_r_ShadowPoolMaxTimeslicedUpdatesPerFrame;
-int CRenderer::CV_r_ShadowCastingLightsMaxCount;
-AllocateConstIntCVar(CRenderer, CV_r_ShadowsGridAligned);
-AllocateConstIntCVar(CRenderer, CV_r_ShadowPass);
-AllocateConstIntCVar(CRenderer, CV_r_ShadowGen);
-AllocateConstIntCVar(CRenderer, CV_r_ShadowPoolMaxFrames);
-int CRenderer::CV_r_ShadowsCache;
-int CRenderer::CV_r_ShadowsCacheFormat;
-int CRenderer::CV_r_ShadowsScreenSpace;
-int CRenderer::CV_r_ShadowsNearestMapResolution;
-int CRenderer::CV_r_HeightMapAO;
-float CRenderer::CV_r_HeightMapAOAmount;
-float CRenderer::CV_r_HeightMapAORange;
-float CRenderer::CV_r_HeightMapAOResolution;
-float   CRenderer::CV_r_RenderMeshHashGridUnitSize;
-
-AllocateConstIntCVar(CRenderer, CV_r_TerrainAO);
-AllocateConstIntCVar(CRenderer, CV_r_TerrainAO_FadeDist);
-
-AllocateConstIntCVar(CRenderer, CV_r_debuglights);
-AllocateConstIntCVar(CRenderer, CV_r_lightssinglepass);
-
-AllocateConstIntCVar(CRenderer, CV_r_impostersdraw);
-float CRenderer::CV_r_imposterratio;
-int CRenderer::CV_r_impostersupdateperframe;
-AllocateConstIntCVar(CRenderer, CV_r_shaderslazyunload);
-AllocateConstIntCVar(CRenderer, CV_r_shadersdebug);
-#if !defined(CONSOLE)
-int CRenderer::CV_r_shadersorbis;
-int CRenderer::CV_r_shadersdx10;
-int CRenderer::CV_r_shadersdx11;
-int CRenderer::CV_r_shadersGL4;
-int CRenderer::CV_r_shadersGLES3;
-int CRenderer::CV_r_shadersMETAL;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_14
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-
-int CRenderer::CV_r_shadersPlatform;
-#endif
-AllocateConstIntCVar(CRenderer, CV_r_shadersignoreincludeschanging);
-int CRenderer::CV_r_shaderspreactivate;
-int CRenderer::CV_r_shadersAllowCompilation;
-AllocateConstIntCVar(CRenderer, CV_r_shadersediting);
-AllocateConstIntCVar(CRenderer, CV_r_shaderscompileautoactivate);
-AllocateConstIntCVar(CRenderer, CV_r_shadersremotecompiler);
-int CRenderer::CV_r_shadersasynccompiling;
-int CRenderer::CV_r_shadersasyncactivation;
-int CRenderer::CV_r_shadersasyncmaxthreads;
-int CRenderer::CV_r_shaderscachedeterministic;
-AllocateConstIntCVar(CRenderer, CV_r_shadersprecachealllights);
-AllocateConstIntCVar(CRenderer, CV_r_ReflectTextureSlots);
-int CRenderer::CV_r_shaderssubmitrequestline;
-int CRenderer::CV_r_shadersuseinstancelookuptable;
-int CRenderer::CV_r_shaderslogcachemisses;
-int CRenderer::CV_r_shadersImport;
-int CRenderer::CV_r_shadersExport;
-int CRenderer::CV_r_shadersCacheUnavailableShaders;
-AllocateConstIntCVar(CRenderer, CV_r_ShadersUseLLVMDirectXCompiler);
-
-AllocateConstIntCVar(CRenderer, CV_r_meshprecache);
-int CRenderer::CV_r_meshpoolsize;
-int CRenderer::CV_r_meshinstancepoolsize;
-
-AllocateConstIntCVar(CRenderer, CV_r_ZPassDepthSorting);
-float CRenderer::CV_r_ZPrepassMaxDist;
-int CRenderer::CV_r_usezpass;
-
-AllocateConstIntCVar(CRenderer, CV_r_TransparentPasses);
-AllocateConstIntCVar(CRenderer, CV_r_TranspDepthFixup);
-AllocateConstIntCVar(CRenderer, CV_r_SoftAlphaTest);
-AllocateConstIntCVar(CRenderer, CV_r_usehwskinning);
-AllocateConstIntCVar(CRenderer, CV_r_usemateriallayers);
-AllocateConstIntCVar(CRenderer, CV_r_ParticlesSoftIsec);
-AllocateConstIntCVar(CRenderer, CV_r_ParticlesRefraction);
-int CRenderer::CV_r_ParticlesHalfRes;
-AllocateConstIntCVar(CRenderer, CV_r_ParticlesHalfResAmount);
-AllocateConstIntCVar(CRenderer, CV_r_ParticlesHalfResBlendMode);
-AllocateConstIntCVar(CRenderer, CV_r_ParticlesInstanceVertices);
-float CRenderer::CV_r_ParticlesAmountGI;
-int CRenderer::CV_r_ParticlesGpuMaxEmitCount;
-
-int CRenderer::CV_r_AntialiasingMode_CB;
-int CRenderer::CV_r_AntialiasingMode;
-float CRenderer::CV_r_AntialiasingNonTAASharpening;
-int CRenderer::CV_r_AntialiasingTAAJitterPattern;
-float CRenderer::CV_r_AntialiasingTAAClampingFactor;
-float CRenderer::CV_r_AntialiasingTAANewFrameWeight;
-float CRenderer::CV_r_AntialiasingTAASharpening;
-AllocateConstIntCVar(CRenderer, CV_r_AntialiasingTAAUseAntiFlickerFilter);
-AllocateConstIntCVar(CRenderer, CV_r_AntialiasingTAAUseJitterMipBias);
-AllocateConstIntCVar(CRenderer, CV_r_AntialiasingTAAUseVarianceClamping);
-AllocateConstIntCVar(CRenderer, CV_r_AntialiasingModeDebug);
-AllocateConstIntCVar(CRenderer, CV_r_AntialiasingModeEditor);
-
-
-Vec2 CRenderer::s_overscanBorders(0, 0);
-
-AllocateConstIntCVar(CRenderer, CV_r_MotionVectors);
-AllocateConstIntCVar(CRenderer, CV_r_MotionVectorsTransparency);
-AllocateConstIntCVar(CRenderer, CV_r_MotionVectorsDebug);
-float CRenderer::CV_r_MotionVectorsTransparencyAlphaThreshold;
-int CRenderer::CV_r_MotionBlur;
-int CRenderer::CV_r_RenderMotionBlurAfterHDR;
-int CRenderer::CV_r_MotionBlurScreenShot;
-int CRenderer::CV_r_MotionBlurQuality;
-int CRenderer::CV_r_MotionBlurGBufferVelocity;
-float CRenderer::CV_r_MotionBlurThreshold;
-float CRenderer::CV_r_MotionBlurShutterSpeed;
-float CRenderer::CV_r_MotionBlurCameraMotionScale;
-float CRenderer::CV_r_MotionBlurMaxViewDist;
-
-AllocateConstIntCVar(CRenderer, CV_r_customvisions);
-
-AllocateConstIntCVar(CRenderer, CV_r_snow);
-AllocateConstIntCVar(CRenderer, CV_r_snow_halfres);
-AllocateConstIntCVar(CRenderer, CV_r_snow_displacement);
-AllocateConstIntCVar(CRenderer, CV_r_snowFlakeClusters);
-
-AllocateConstIntCVar(CRenderer, CV_r_rain);
-AllocateConstIntCVar(CRenderer, CV_r_rain_ignore_nearest);
-float CRenderer::CV_r_rainamount;
-float CRenderer::CV_r_rainDistMultiplier;
-float CRenderer::CV_r_rainOccluderSizeTreshold;
-
-int CRenderer::CV_r_SSReflections;
-int CRenderer::CV_r_SSReflHalfRes;
-int CRenderer::CV_r_ssdo;
-int CRenderer::CV_r_ssdoHalfRes;
-int CRenderer::CV_r_ssdoColorBleeding;
-float CRenderer::CV_r_ssdoRadius;
-float CRenderer::CV_r_ssdoRadiusMin;
-float CRenderer::CV_r_ssdoRadiusMax;
-float CRenderer::CV_r_ssdoAmountDirect;
-float CRenderer::CV_r_ssdoAmountAmbient;
-float CRenderer::CV_r_ssdoAmountReflection;
-
-AllocateConstIntCVar(CRenderer, CV_r_dof);
-
-AllocateConstIntCVar(CRenderer, CV_r_measureoverdraw);
-AllocateConstIntCVar(CRenderer, CV_r_printmemoryleaks);
-AllocateConstIntCVar(CRenderer, CV_r_releaseallresourcesonexit);
-
-int   CRenderer::CV_r_rc_autoinvoke;
-
-int CRenderer::CV_r_Refraction;
-int CRenderer::CV_r_sunshafts;
-
-AllocateConstIntCVar(CRenderer, CV_r_MergeShadowDrawcalls);
-
-int CRenderer::CV_r_PostProcessReset;
-AllocateConstIntCVar(CRenderer, CV_r_PostProcessFilters);
-AllocateConstIntCVar(CRenderer, CV_r_PostProcessGameFx);
-
-int CRenderer::CV_r_colorRangeCompression;
-
-int CRenderer::CV_r_colorgrading;
-int CRenderer::CV_r_colorgrading_selectivecolor;
-AllocateConstIntCVar(CRenderer, CV_r_colorgrading_levels);
-AllocateConstIntCVar(CRenderer, CV_r_colorgrading_filters);
-int CRenderer::CV_r_colorgrading_charts;
-int CRenderer::CV_r_ColorgradingChartsCache;
-
-AllocateConstIntCVar(CRenderer, CV_r_cloudsupdatealways);
-AllocateConstIntCVar(CRenderer, CV_r_cloudsdebug);
-
-AllocateConstIntCVar(CRenderer, CV_r_showdyntextures);
-int CRenderer::CV_r_ShowDynTexturesMaxCount;
-ICVar* CRenderer::CV_r_ShowDynTexturesFilter;
-AllocateConstIntCVar(CRenderer, CV_r_shownormals);
-AllocateConstIntCVar(CRenderer, CV_r_showlines);
-float CRenderer::CV_r_normalslength;
-AllocateConstIntCVar(CRenderer, CV_r_showtangents);
-AllocateConstIntCVar(CRenderer, CV_r_showtimegraph);
-AllocateConstIntCVar(CRenderer, CV_r_DebugFontRendering);
-AllocateConstIntCVar(CRenderer, CV_profileStreaming);
-AllocateConstIntCVar(CRenderer, CV_r_graphstyle);
-AllocateConstIntCVar(CRenderer, CV_r_showbufferusage);
-
-ICVar* CRenderer::CV_r_ShaderCompilerServer;
-ICVar* CRenderer::CV_r_ShaderEmailTags;
-ICVar* CRenderer::CV_r_ShaderEmailCCs;
-int CRenderer::CV_r_ShaderCompilerPort;
-int CRenderer::CV_r_ShaderCompilerDontCache;
-int CRenderer::CV_r_AssetProcessorShaderCompiler = 0;
-
-int CRenderer::CV_r_flares = FLARES_DEFAULT_VAL;
-AllocateConstIntCVar(CRenderer, CV_r_flareHqShafts);
-float CRenderer::CV_r_FlaresChromaShift;
-int CRenderer::CV_r_FlaresIrisShaftMaxPolyNum;
-float CRenderer::CV_r_FlaresTessellationRatio;
-
-int CRenderer::CV_r_envcmresolution;
-int CRenderer::CV_r_envtexresolution;
-float CRenderer::CV_r_waterupdateFactor;
-float CRenderer::CV_r_waterupdateDistance;
-float CRenderer::CV_r_envcmupdateinterval;
-float CRenderer::CV_r_envtexupdateinterval;
-int CRenderer::CV_r_SlimGBuffer;
-AllocateConstIntCVar(CRenderer, CV_r_waterreflections);
-AllocateConstIntCVar(CRenderer, CV_r_waterreflections_quality);
-float CRenderer::CV_r_waterreflections_min_visible_pixels_update;
-float CRenderer::CV_r_waterreflections_minvis_updatefactormul;
-float CRenderer::CV_r_waterreflections_minvis_updatedistancemul;
-int CRenderer::CV_r_watercaustics; //@NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
-float CRenderer::CV_r_watercausticsdistance;
-int CRenderer::CV_r_watervolumecaustics;
-int CRenderer::CV_r_watervolumecausticsdensity;
-int CRenderer::CV_r_watervolumecausticsresolution;
-float CRenderer::CV_r_watervolumecausticssnapfactor;
-float CRenderer::CV_r_watervolumecausticsmaxdistance;
-AllocateConstIntCVar(CRenderer, CV_r_water_godrays);
-float CRenderer::CV_r_water_godrays_distortion;
-AllocateConstIntCVar(CRenderer, CV_r_texNoAnisoAlphaTest);
-AllocateConstIntCVar(CRenderer, CV_r_reflections);
-AllocateConstIntCVar(CRenderer, CV_r_reflections_quality);
-float CRenderer::CV_r_waterreflections_offset;
-AllocateConstIntCVar(CRenderer, CV_r_reloadshaders);
-AllocateConstIntCVar(CRenderer, CV_r_detailtextures);
-float CRenderer::CV_r_detaildistance;
-AllocateConstIntCVar(CRenderer, CV_r_texbindmode);
-AllocateConstIntCVar(CRenderer, CV_r_nodrawshaders);
-int CRenderer::CV_r_nodrawnear;
-float CRenderer::CV_r_DrawNearZRange;
-float CRenderer::CV_r_DrawNearFarPlane;
-float CRenderer::CV_r_drawnearfov;
-int CRenderer::CV_r_DrawNearShadows;
-AllocateConstIntCVar(CRenderer, CV_r_profileshaders);
-AllocateConstIntCVar(CRenderer, CV_r_ProfileShadersSmooth);
-AllocateConstIntCVar(CRenderer, CV_r_ProfileShadersGroupByName);
-ICVar* CRenderer::CV_r_excludeshader;
-ICVar* CRenderer::CV_r_excludemesh;
-
-float CRenderer::CV_r_gamma;
-float CRenderer::CV_r_contrast;
-float CRenderer::CV_r_brightness;
-
-AllocateConstIntCVar(CRenderer, CV_r_nohwgamma);
-
-int CRenderer::CV_r_scissor;
-
-AllocateConstIntCVar(CRenderer, CV_r_wireframe);
-int CRenderer::CV_r_GetScreenShot;
-
-AllocateConstIntCVar(CRenderer, CV_r_character_nodeform);
-
-AllocateConstIntCVar(CRenderer, CV_r_ZPassOnly);
-
-int CRenderer::CV_r_ShowVideoMemoryStats;
-
-ICVar* CRenderer::CV_r_ShowTexture = NULL;
-ICVar* CRenderer::CV_r_TexturesStreamingDebugfilter = NULL;
-int CRenderer::CV_r_TexturesStreamingDebugMinSize;
-int CRenderer::CV_r_TexturesStreamingDebugMinMip;
-AllocateConstIntCVar(CRenderer, CV_r_TexturesStreamingDebugDumpIntoLog);
-
-AllocateConstIntCVar(CRenderer, CV_r_ShowLightBounds);
-
-AllocateConstIntCVar(CRenderer, CV_r_MergeRenderChunks);
-AllocateConstIntCVar(CRenderer, CV_r_TextureCompressor);
-
-int CRenderer::CV_r_ParticlesTessellation;
-int CRenderer::CV_r_ParticlesTessellationTriSize;
-
-float CRenderer::CV_r_ZFightingDepthScale;
-float CRenderer::CV_r_ZFightingExtrude;
-
-float CRenderer::CV_r_TexelsPerMeter;
-float CRenderer::s_previousTexelsPerMeter = -1.0f;
-
-int CRenderer::CV_r_ConditionalRendering;
-int CRenderer::CV_r_enableAltTab;
-int CRenderer::CV_r_StereoDevice;
-int CRenderer::CV_r_StereoMode;
-int CRenderer::CV_r_StereoOutput;
-int CRenderer::CV_r_StereoFlipEyes;
-float CRenderer::CV_r_StereoStrength;
-float CRenderer::CV_r_StereoEyeDist;
-float CRenderer::CV_r_StereoScreenDist;
-float CRenderer::CV_r_StereoNearGeoScale;
-float CRenderer::CV_r_StereoHudScreenDist;
-float CRenderer::CV_r_StereoGammaAdjustment;
-int CRenderer::CV_r_ConsoleBackbufferWidth;
-int CRenderer::CV_r_ConsoleBackbufferHeight;
-
-// constant used to indicate that CustomResMax should be set to the maximum allowable by device resources
-const int CRenderer::s_CustomResMaxSize_USE_MAX_RESOURCES = -1;
-int CRenderer::CV_r_CustomResMaxSize;
-int CRenderer::CV_r_CustomResWidth;
-int CRenderer::CV_r_CustomResHeight;
-int CRenderer::CV_r_CustomResPreview;
-int CRenderer::CV_r_Supersampling;
-int CRenderer::CV_r_SupersamplingFilter;
-
-float CRenderer::CV_r_FogDepthTest;
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-int CRenderer::CV_r_FogShadows;
-int CRenderer::CV_r_FogShadowsMode;
-#endif
-int CRenderer::CV_r_FogShadowsWater;
-
-AllocateConstIntCVar(CRenderer, CV_r_RainDropsEffect);
-
-AllocateConstIntCVar(CRenderer, CV_r_RefractionPartialResolves);
-AllocateConstIntCVar(CRenderer, CV_r_RefractionPartialResolvesDebug);
-
-AllocateConstIntCVar(CRenderer, CV_r_Batching);
-
-AllocateConstIntCVar(CRenderer, CV_r_Unlit);
-AllocateConstIntCVar(CRenderer, CV_r_HideSunInCubemaps);
-
-AllocateConstIntCVar(CRenderer, CV_r_ParticlesDebug);
-
-// Confetti David Srour: Upscaling Quality for Metal
-AllocateConstIntCVar(CRenderer, CV_r_UpscalingQuality);
-
-//Clears GMEM G-Buffer
-AllocateConstIntCVar(CRenderer, CV_r_ClearGMEMGBuffer);
-
-// Enables fast math for metal shaders
-AllocateConstIntCVar(CRenderer, CV_r_MetalShadersFastMath);
-
-int CRenderer::CV_r_CubeDepthMapResolution;
-
-int CRenderer::CV_r_SkipNativeUpscale;
-int CRenderer::CV_r_SkipRenderComposites;
-
-// Confetti David Srour: Global VisArea/Portals blend weight for GMEM path
-float CRenderer::CV_r_GMEMVisAreasBlendWeight;
-
-// Confetti David Srour: 0 = disable, 1= 256bpp GMEM path, 2 = 128bpp GMEM path
-int CRenderer::CV_r_EnableGMEMPath;
-
-// Confetti David Srour: 0 = regular postproc, 1 = mobile pipeline with compute
-int CRenderer::CV_r_EnableGMEMPostProcCS;
-
-// Confetti David Srour: Used to reduce draw calls during DOF's gathers
-int CRenderer::CV_r_GMEM_DOF_Gather1_Quality;
-int CRenderer::CV_r_GMEM_DOF_Gather2_Quality;
-
-int CRenderer::CV_r_RainUseStencilMasking;
-
-// Confetti Thomas Zeng: 0 = diable, 1 = enable
-int CRenderer::CV_r_EnableComputeDownSampling;
-
-// Confetti Vera
-float CRenderer::CV_r_CubeDepthMapFarPlane;
-
-int CRenderer::CV_r_ForceFixedPointRenderTargets;
-
-// Fur control parameters
-int CRenderer::CV_r_Fur;
-int CRenderer::CV_r_FurShellPassCount;
-int CRenderer::CV_r_FurShowBending;
-int CRenderer::CV_r_FurDebug;
-int CRenderer::CV_r_FurDebugOneShell;
-int CRenderer::CV_r_FurFinPass;
-int CRenderer::CV_r_FurFinShadowPass;
-float CRenderer::CV_r_FurMovementBendingBias;
-float CRenderer::CV_r_FurMaxViewDist;
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-int CRenderer::CV_r_enableauxgeom;
-#endif
-
-int CRenderer::CV_r_ParticleVerticePoolSize;
-int CRenderer::CV_r_GeomCacheInstanceThreshold;
-int CRenderer::CV_r_VisAreaClipLightsPerPixel;
-
-int CRenderer::CV_r_VolumetricFog = 0;
-int CRenderer::CV_r_VolumetricFogTexScale;
-int CRenderer::CV_r_VolumetricFogTexDepth;
-float CRenderer::CV_r_VolumetricFogReprojectionBlendFactor;
-int CRenderer::CV_r_VolumetricFogSample;
-int CRenderer::CV_r_VolumetricFogShadow;
-int CRenderer::CV_r_VolumetricFogDownscaledSunShadow;
-int CRenderer::CV_r_VolumetricFogDownscaledSunShadowRatio;
-int CRenderer::CV_r_VolumetricFogReprojectionMode;
-float CRenderer::CV_r_VolumetricFogMinimumLightBulbSize;
-float CRenderer::CV_r_ResolutionScale = 1.0f;
-int CRenderer::CV_r_OutputShaderSourceFiles = 0;
-
-// Specular antialiasing
-int CRenderer::CV_r_SpecularAntialiasing = 1;
-
-// Console
-float CRenderer::CV_r_minConsoleFontSize;
-float CRenderer::CV_r_maxConsoleFontSize;
-
-// Linux
-int CRenderer::CV_r_linuxSkipWindowCreation = 0;
-
-// Graphics programmers: Use these in your code for local tests/debugging.
-// Delete all references in your code before you submit
-int CRenderer::CV_r_GraphicsTest00;
-int CRenderer::CV_r_GraphicsTest01;
-int CRenderer::CV_r_GraphicsTest02;
-int CRenderer::CV_r_GraphicsTest03;
-int CRenderer::CV_r_GraphicsTest04;
-int CRenderer::CV_r_GraphicsTest05;
-int CRenderer::CV_r_GraphicsTest06;
-int CRenderer::CV_r_GraphicsTest07;
-int CRenderer::CV_r_GraphicsTest08;
-int CRenderer::CV_r_GraphicsTest09;
-
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-
-static void ShadersPrecacheList([[maybe_unused]] IConsoleCmdArgs* Cmd)
-{
-    gRenDev->m_cEF.mfPrecacheShaders(false);
-}
-static void ShadersStatsList([[maybe_unused]] IConsoleCmdArgs* Cmd)
-{
-    gRenDev->m_cEF.mfPrecacheShaders(true);
-}
-static void GetShaderList([[maybe_unused]] IConsoleCmdArgs* Cmd)
-{
-    gRenDev->m_cEF.mfGetShaderList();
-}
-
-template<typename CallableT>
-void ShadersOptimizeHelper(CallableT setupParserBin, const char* logString)
-{
-    setupParserBin();
-    CryLogAlways("\nStarting shaders optimizing for %s...", logString);
-    AZStd::string str = "@usercache@/" + gRenDev->m_cEF.m_ShadersCache;
-    iLog->Log("Optimize shader cache folder: '%s'", gRenDev->m_cEF.m_ShadersCache.c_str());
-    gRenDev->m_cEF.mfOptimiseShaders(str.c_str(), false);
-}
-
-static void ShadersOptimise([[maybe_unused]] IConsoleCmdArgs* Cmd)
-{
-    if (CRenderer::CV_r_shadersdx11)
-    {
-        ShadersOptimizeHelper(CParserBin::SetupForD3D11, "DX11");
-    }
-    if (CRenderer::CV_r_shadersGL4)
-    {
-        ShadersOptimizeHelper(CParserBin::SetupForGL4, "GLSL 4");
-    }
-    if (CRenderer::CV_r_shadersGLES3)
-    {
-        ShadersOptimizeHelper(CParserBin::SetupForGLES3, " GLSL-ES 3");
-    }
-    if (CRenderer::CV_r_shadersorbis)
-    {
-        ShadersOptimizeHelper(CParserBin::SetupForOrbis, "Orbis");
-    }
-    if (CRenderer::CV_r_shadersMETAL)
-    {
-        ShadersOptimizeHelper(CParserBin::SetupForMETAL, "METAL");
-    }
-}
-
-#endif
-
-static void OnChange_CV_r_PostProcess(ICVar* pCVar)
-{
-    if (!pCVar)
-    {
-        return;
-    }
-
-    if (gRenDev->m_pRT && !gRenDev->m_pRT->IsRenderThread())
-    {
-        gRenDev->m_pRT->FlushAndWait();
-    }
-
-    gRenDev->CV_r_PostProcess = pCVar->GetIVal();
-}
-
-// Track all AA conditions/dependencies in one place. Set corresponding cvars.
-static void OnChange_CV_r_AntialiasingMode(ICVar* pCVar)
-{
-    if (!pCVar)
-    {
-        return;
-    }
-
-    if (gRenDev->m_pRT && !gRenDev->m_pRT->IsRenderThread())
-    {
-        gRenDev->m_pRT->FlushAndWait();
-    }
-
-
-    int32 nVal = pCVar->GetIVal();
-    nVal = min(eAT_AAMODES_COUNT - 1, nVal);
-#if defined(OPENGL_ES)
-    if ((nVal == static_cast<int32>(eAT_SMAA1TX)) || (nVal == static_cast<int32>(eAT_TAA)))
-    {
-        AZ_Warning("Rendering", false, "SMAA and TAA are not supported on this platform. Fallback to FXAA");
-        nVal = eAT_FXAA;
-    }
-#endif
-
-#if defined (CRY_USE_METAL) || defined (OPENGL_ES)
-    // We don't support switching to 128bpp after initialization of the gmem path.
-    if (CD3D9Renderer::EGmemPath::eGT_256bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && nVal == static_cast<int32>(eAT_TAA))
-    {
-        AZ_Warning("Rendering", pCVar->GetIVal() == 0, "TAA is not supported on 256bpp mode. Either switch to 128bpp or enable TAA at init so that the correct gmem mode is picked during initialization");
-        nVal = eAT_FXAA;
-    }
-#endif
-
-    ICVar* pMSAA = gEnv->pConsole->GetCVar("r_MSAA");
-    ICVar* pMSAASamples = gEnv->pConsole->GetCVar("r_MSAA_samples");
-    AZ_Assert(pMSAA, "r_MSAA is not a valid cvar");
-    AZ_Assert(pMSAASamples, "r_MSAA_samples is not a valid cvar");
-    pMSAA->Set(0);
-    pMSAASamples->Set(0);
-
-    pCVar->Set(nVal);
-    gRenDev->CV_r_AntialiasingMode = nVal;
-}
-
-static const char* showRenderTargetHelp =
-    "Displays render targets - for debug purpose\n"
-    "[Usage]\n"
-    "r_ShowRenderTarget -l : list all available render targets\n"
-    "r_ShowRenderTarget -l hdr : list all available render targets whose name contain 'hdr'\n"
-    "r_ShowRenderTarget -nf zpass : show any render targets whose name contain 'zpass' with no filtering in 2x2(default) table\n"
-    "r_ShowRenderTarget -c:3 pass : show any render targets whose name contain 'pass' in 3x3 table\n"
-    "r_ShowRenderTarget z hdr : show any render targets whose name contain either 'z' or 'hdr'\n"
-    "r_ShowRenderTarget scene:rg scene:b : show any render targets whose name contain 'scene' first with red-green channels only and then with a blue channel only\n"
-    "r_ShowRenderTarget scenetarget:rgba:2 : show any render targets whose name contain 'scenetarget' with all channels multiplied by 2\n"
-    "r_ShowRenderTarget scene:b hdr:a : show any render targets whose name contain 'scene' with a blue channel only and ones whose name contain 'hdr' with an alpha channel only\n"
-    "r_ShowRenderTarget -e $ztarget : show a render target whose name exactly matches '$ztarget'\n"
-    "r_ShowRenderTarget -s scene : separately shows each channel of any 'scene' render targets\n"
-    "r_ShowRenderTarget -k scene : shows any 'scene' render targets with RGBK decoding\n"
-    "r_ShowRenderTarget -a scene : shows any 'scene' render targets with 101110/8888 aliasing";
-
-void CRenderer::Cmd_ShowRenderTarget(IConsoleCmdArgs* pArgs)
-{
-    int argCount = pArgs->GetArgCount();
-
-    gRenDev->m_showRenderTargetInfo.Reset();
-
-    if (argCount <= 1)
-    {
-        string help = showRenderTargetHelp;
-        int curPos = 0;
-        string line = help.Tokenize("\n", curPos);
-        while (false == line.empty())
-        {
-            gEnv->pLog->Log(line);
-            line = help.Tokenize("\n", curPos);
-        }
-        return;
-    }
-
-    // Check for '-l'.
-    for (int i = 1; i < argCount; ++i)
-    {
-        if (strcmp(pArgs->GetArg(i), "-l") == 0)
-        {
-            gRenDev->m_showRenderTargetInfo.bShowList = true;
-            break;
-        }
-    }
-
-    // Check for '-c:*'.
-    for (int i = 1; i < argCount; ++i)
-    {
-        if (strlen(pArgs->GetArg(i)) > 3 && strncmp(pArgs->GetArg(i), "-c:", 3) == 0)
-        {
-            gRenDev->m_showRenderTargetInfo.col = atoi(pArgs->GetArg(i) + 3);
-            if (gRenDev->m_showRenderTargetInfo.col <= 0)
-            {
-                gRenDev->m_showRenderTargetInfo.col = 2;
-            }
-        }
-    }
-
-    // Now gather all render targets.
-    std::vector<CTexture*> allRTs;
-    SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-    ResourcesMapItor it;
-    for (it = pRL->m_RMap.begin(); it != pRL->m_RMap.end(); ++it)
-    {
-        CTexture* tp = (CTexture*)it->second;
-        if (tp && !tp->IsNoTexture())
-        {
-            if ((tp->GetFlags() & (FT_USAGE_RENDERTARGET | FT_USAGE_DYNAMIC)) && tp->GetDevTexture())
-            {
-                allRTs.push_back(tp);
-            }
-        }
-    }
-
-    // Process actual arguments with possible '-nf', '-f', '-e' options.
-    bool bNoRegularArgs = true;
-    bool bFiltered = true;
-    bool bExactMatch = false;
-    bool bRGBKEncoded = false;
-    bool bAliased = false;
-    bool bWeightedChannels = false;
-    bool bSplitChannels = false;
-
-    for (int i = 1; i < argCount; ++i)
-    {
-        const char* pCurArg = pArgs->GetArg(i);
-
-        bool bColOption = strlen(pCurArg) > 3 && strncmp(pCurArg, "-c:", 3) == 0;
-        if (strcmp(pCurArg, "-l") == 0 || bColOption)
-        {
-            continue;
-        }
-
-        if (strcmp(pCurArg, "-nf") == 0)
-        {
-            bFiltered = false;
-        }
-        else if (strcmp(pCurArg, "-f") == 0)
-        {
-            bFiltered = true;
-        }
-        else if (strcmp(pCurArg, "-e") == 0)
-        {
-            bExactMatch = true;
-        }
-        else if (strcmp(pCurArg, "-k") == 0)
-        {
-            bRGBKEncoded = true;
-        }
-        else if (strcmp(pCurArg, "-a") == 0)
-        {
-            bAliased = true;
-        }
-        else if (strcmp(pCurArg, "-s") == 0)
-        {
-            bSplitChannels = true;
-        }
-        else
-        {
-            bNoRegularArgs = false;
-            string argTxt = pCurArg, nameTxt, channelTxt, mulTxt;
-            argTxt.MakeLower();
-            float multiplier = 1.0f;
-            size_t pos = argTxt.find(':');
-            if (pos == string::npos)
-            {
-                nameTxt = argTxt;
-                channelTxt = "rgba";
-            }
-            else
-            {
-                nameTxt = argTxt.substr(0, pos);
-                channelTxt = argTxt.substr(pos + 1, string::npos);
-                pos = channelTxt.find(':');
-                if (pos != string::npos)
-                {
-                    mulTxt = channelTxt.substr(pos + 1, string::npos);
-                    multiplier = static_cast<float>(atof(mulTxt.c_str()));
-                    if (multiplier <= 0)
-                    {
-                        multiplier = 1.0f;
-                    }
-                }
-                bWeightedChannels = true;
-            }
-
-            Vec4 channelWeight(0, 0, 0, 0);
-            if (channelTxt.find('r') != string::npos)
-            {
-                channelWeight.x = 1.0f;
-            }
-            if (channelTxt.find('g') != string::npos)
-            {
-                channelWeight.y = 1.0f;
-            }
-            if (channelTxt.find('b') != string::npos)
-            {
-                channelWeight.z = 1.0f;
-            }
-            if (channelTxt.find('a') != string::npos)
-            {
-                channelWeight.w = 1.0f;
-            }
-
-            channelWeight *= multiplier;
-
-            for (size_t k = 0; k < allRTs.size(); ++k)
-            {
-                string texName = allRTs[k]->GetName();
-                texName.MakeLower();
-                bool bMatch = false;
-                if (bExactMatch)
-                {
-                    bMatch = texName == nameTxt;
-                }
-                else
-                {
-                    bMatch = texName.find(nameTxt.c_str()) != string::npos;
-                }
-                if (bMatch)
-                {
-                    SShowRenderTargetInfo::RT rt;
-                    rt.bFiltered = bFiltered;
-                    rt.bRGBKEncoded = bRGBKEncoded;
-                    rt.bAliased = bAliased;
-                    rt.textureID = allRTs[k]->GetID();
-                    rt.channelWeight = channelWeight;
-
-                    if (bSplitChannels)
-                    {
-                        const Vec4 channels[4] = { Vec4(1, 0, 0, 0), Vec4(0, 1, 0, 0), Vec4(0, 0, 1, 0), Vec4(0, 0, 0, 1) };
-
-                        for (int j = 0; j < 4; ++j)
-                        {
-                            rt.channelWeight = bWeightedChannels ? channelWeight : Vec4(1, 1, 1, 1);
-                            rt.channelWeight.x *= channels[j].x;
-                            rt.channelWeight.y *= channels[j].y;
-                            rt.channelWeight.z *= channels[j].z;
-                            rt.channelWeight.w *= channels[j].w;
-
-                            if (rt.channelWeight[j] > 0.0f)
-                            {
-                                gRenDev->m_showRenderTargetInfo.rtList.push_back(rt);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        gRenDev->m_showRenderTargetInfo.rtList.push_back(rt);
-                    }
-                }
-            }
-        }
-    }
-
-    if (bNoRegularArgs && gRenDev->m_showRenderTargetInfo.bShowList) // This means showing all items.
-    {
-        for (size_t k = 0; k < allRTs.size(); ++k)
-        {
-            SShowRenderTargetInfo::RT rt;
-            rt.bFiltered = true; // Doesn't matter, actually.
-            rt.textureID = allRTs[k]->GetID();
-            gRenDev->m_showRenderTargetInfo.rtList.push_back(rt);
-        }
-    }
-}
-
-static void cmd_OverscanBorders(IConsoleCmdArgs* pParams)
-{
-    int argCount = pParams->GetArgCount();
-
-    if (argCount > 1)
-    {
-        CRenderer::s_overscanBorders.x = clamp_tpl((float)atof(pParams->GetArg(1)), 0.0f, 25.0f) * 0.01f;
-
-        if (argCount > 2)
-        {
-            CRenderer::s_overscanBorders.y = clamp_tpl((float)atof(pParams->GetArg(2)), 0.0f, 25.0f) * 0.01f;
-        }
-        else
-        {
-            CRenderer::s_overscanBorders.y = CRenderer::s_overscanBorders.x;
-        }
-    }
-    else
-    {
-        gEnv->pLog->LogWithType(ILog::eInputResponse, "Overscan Borders: Left/Right %G %% , Top/Bottom %G %%",
-            CRenderer::s_overscanBorders.x * 100.0f, CRenderer::s_overscanBorders.y * 100.0f);
-    }
-}
-
-static void OnChange_r_OverscanBorderScale([[maybe_unused]] ICVar* pCVar)
-{
-    const float maxOverscanBorderScale = 0.5f;
-    CRenderer::s_overscanBorders.x = clamp_tpl(CRenderer::s_overscanBorders.x, 0.0f, maxOverscanBorderScale);
-    CRenderer::s_overscanBorders.y = clamp_tpl(CRenderer::s_overscanBorders.y, 0.0f, maxOverscanBorderScale);
-}
-
-static void OnChange_CV_r_CubeDepthMapResolution(ICVar* /*pCVar*/)
-{
-}
-
-static void OnChange_CV_r_SkipRenderComposites([[maybe_unused]] ICVar* pCVar)
-{
-    AZ_Warning("Rendering", pCVar->GetIVal() == 0 || (pCVar->GetIVal() == 1 && CRenderer::CV_r_flares == 0), "r_SkipRenderComposites was set to 1 while r_Flares was enabled, setting r_Flares to 0.");
-    CRenderer::CV_r_flares = 0;
-}
-
-static void OnChange_CV_r_DebugLightLayers(ICVar* pCVar)
-{
-    int value = pCVar->GetIVal();
-
-    CRenderer::CV_r_DeferredShadingTiledDebugDirect = 0;
-    CRenderer::CV_r_DeferredShadingTiledDebugIndirect = 0;
-    CRenderer::CV_r_DeferredShadingTiledDebugAlbedo = 0;
-    CRenderer::CV_r_DeferredShadingTiledDebugAccumulation = 0;
-
-    // Reset HDR to defaults
-    CRenderer::CV_r_HDRDebug = 0;
-
-    ICVar* pFogVar = gEnv->pConsole->GetCVar("e_Fog");
-    AZ_Assert(pFogVar, "Fog CVar is missing");
-    pFogVar->Set(1);
-
-    enum TiledDebugIndirect
-    {
-        TILED_DEBUG_INDIRECT_NONE = 3,
-        TILED_DEBUG_INDIRECT_DIFF = 2,
-        TILED_DEBUG_INDIRECT_DIFF_SPEC = 1
-    };
-
-    enum TiledDebugAccum
-    {
-        TILED_DEBUG_ACCUM_DIFF = 1
-    };
-
-    enum DebugLayer
-    {
-        DEBUG_LAYER_DIRECT_DIFFUSE = 1,
-        DEBUG_LAYER_INDIRECT_DIFFUSE,
-        DEBUG_LAYER_SPECULAR,
-        DEBUG_LAYER_AO,
-        DEBUG_LAYER_TEXTURES,
-        DEBUG_LAYER_FOG,
-        DEBUG_LAYER_HDR
-    };
-
-    if (value >= DEBUG_LAYER_DIRECT_DIFFUSE)
-    {
-        CRenderer::CV_r_DeferredShadingTiledDebugIndirect = TILED_DEBUG_INDIRECT_NONE;
-        CRenderer::CV_r_DeferredShadingTiledDebugAlbedo = 1;
-        CRenderer::CV_r_DeferredShadingTiledDebugAccumulation = TILED_DEBUG_ACCUM_DIFF;
-
-        pFogVar->Set(0);
-
-        CRenderer::CV_r_HDRDebug = 1;
-        CRenderer::CV_r_HDREyeAdaptationMode = 1;
-    }
-    if (value >= DEBUG_LAYER_INDIRECT_DIFFUSE)
-    {
-        CRenderer::CV_r_DeferredShadingTiledDebugIndirect = TILED_DEBUG_INDIRECT_DIFF;
-    }
-    if (value >= DEBUG_LAYER_SPECULAR)
-    {
-        CRenderer::CV_r_DeferredShadingTiledDebugIndirect = TILED_DEBUG_INDIRECT_DIFF_SPEC;
-        CRenderer::CV_r_DeferredShadingTiledDebugAccumulation = 0;
-    }
-    if (value >= DEBUG_LAYER_AO)
-    {
-        CRenderer::CV_r_DeferredShadingTiledDebugIndirect = 0;
-    }
-    if (value >= DEBUG_LAYER_TEXTURES)
-    {
-        CRenderer::CV_r_DeferredShadingTiledDebugAlbedo = 0;
-    }
-    if (value >= DEBUG_LAYER_FOG)
-    {
-        pFogVar->Set(1);
-    }
-    if (value >= DEBUG_LAYER_HDR)
-    {
-        CRenderer::CV_r_HDRDebug = 0;
-    }
-}
-
-static void OnChange_CV_r_DeferredShadingTiled([[maybe_unused]] ICVar* pCVar)
-{
-#if defined (AZ_PLATFORM_MAC)
-    // We don't support deferred shading tiled on macOS yet so always force the cvar to 0
-    AZ_Warning("Rendering", pCVar->GetIVal() == 0, "Deferred Shading Tiled is not supported on macOS");
-    CRenderer::CV_r_DeferredShadingTiled = 0;
-#elif defined(OPENGL)
-    // We don't support deferred shading tiled on any OpenGL targets yet so always force the cvar to 0
-    AZ_Warning("Rendering", pCVar->GetIVal() == 0, "Deferred Shading Tiled is not supported when using OpenGL");
-    CRenderer::CV_r_DeferredShadingTiled = 0;
-#endif
-}
-
-static void OnChange_CV_r_Fur([[maybe_unused]] ICVar* pCVar)
-{
-
-#if defined (CRY_USE_METAL) || defined (OPENGL_ES)
-    // We don't support fur on gmem/pls path yet so always force the cvar to 0
-    if (CD3D9Renderer::EGmemPath::eGT_REGULAR_PATH != gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        AZ_Warning("Rendering", pCVar->GetIVal() == 0, "Fur is not supported on gmem/pls for mobile");
-        CRenderer::CV_r_Fur = 0;
-    }
-#endif
-}
-
-static void OnChange_CV_r_SunShafts([[maybe_unused]] ICVar* pCVar)
-{
-#if defined (AZ_PLATFORM_MAC)
-    // We don't support sunshaft settings greater than 1 on macOS yet so always force the cvar to 1
-    AZ_Warning("Rendering", pCVar->GetIVal() > 1, "Sunshaft value settings above 1 are not supported on macOS");
-    if (pCVar->GetIVal() >= 1)
-    {
-        CRenderer::CV_r_sunshafts = 1;
-    }
-    else
-    {
-        CRenderer::CV_r_sunshafts = 0;
-    }
-#endif
-}
-
-static void OnChange_CV_r_SSDO([[maybe_unused]] ICVar* pCVar)
-{
-    
-#if defined (CRY_USE_METAL) || defined (OPENGL_ES)
-    // We don't support switching to 128bpp after initialization of the gmem path.
-    if (CD3D9Renderer::EGmemPath::eGT_256bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        AZ_Warning("Rendering", pCVar->GetIVal() == 0, "SSDO is not supported on 256bpp mode. Either switch to 128bpp or enable r_ssdo at init so that the correct gmem mode is picked during initialization");
-        CRenderer::CV_r_ssdo = 0;
-    }
-#endif
-}
-
-static void OnChange_CV_r_SSReflections([[maybe_unused]] ICVar* pCVar)
-{
-
-#if defined (CRY_USE_METAL) || defined (OPENGL_ES)
-    // We don't support switching to 128bpp after initialization of the gmem path.
-    if (CD3D9Renderer::EGmemPath::eGT_256bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        AZ_Warning("Rendering", pCVar->GetIVal() == 0, "SSReflections are not supported on 256bpp mode. Either switch to 128bpp or enable r_SSReflections at init so that the correct gmem mode is picked during initialization");
-        CRenderer::CV_r_SSReflections = 0;
-    }
-#endif
-}
-
-static void OnChange_CV_r_MotionBlur([[maybe_unused]] ICVar* pCVar)
-{
-
-#if defined (CRY_USE_METAL) || defined (OPENGL_ES)
-    // We don't support switching to 128bpp after initialization of the gmem path.
-    if (CD3D9Renderer::EGmemPath::eGT_256bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        AZ_Warning("Rendering", pCVar->GetIVal() == 0, "MotionBlur is not supported on 256bpp mode. Either switch to 128bpp or enable r_MotionBlur at init so that the correct gmem mode is picked during initialization");
-        CRenderer::CV_r_MotionBlur = 0;
-    }
-#endif
-}
-
-static void OnChange_CV_r_TexelsPerMeter(ICVar* pCVar)
-{
-    if (pCVar && pCVar->GetFVal() == CRenderer::s_previousTexelsPerMeter)
-    {
-        CRenderer::CV_r_TexelsPerMeter = 0.0f;
-    }
-
-    ICVar* pCV_e_sketch_mode = gEnv->pConsole->GetCVar("e_sketch_mode");
-    if (pCV_e_sketch_mode)
-    {
-        pCV_e_sketch_mode->Set(CRenderer::CV_r_TexelsPerMeter > 0.0f ? 4 : 0);
-    }
-    CRenderer::s_previousTexelsPerMeter = CRenderer::CV_r_TexelsPerMeter;
-}
-
-static void OnChange_CV_r_ShadersAllowCompiliation([[maybe_unused]] ICVar* pCVar)
-{
-    // disable async activation. Can be a problem though if some shader cache files were opened async/streamed
-    // before this.
-    CRenderer::CV_r_shadersasyncactivation = 0;
-    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Changing r_ShadersAllowCompilation at runtime can cause problems. Please set it in your system.cfg or user.cfg instead.");
-}
-
-static void OnChange_CV_r_flares([[maybe_unused]] ICVar* pCVar)
-{
-    AZ_Warning("Rendering", pCVar->GetIVal() == 0 || (pCVar->GetIVal() == 1 && CRenderer::CV_r_SkipRenderComposites == 0), "r_SkipRenderComposites is set to 1, r_flares will have no effect.");
-}
-
-static void OnChange_CV_r_FlaresTessellationRatio([[maybe_unused]] ICVar* pCVar)
-{
-    gEnv->pOpticsManager->Invalidate();
-}
-
-static void GetLogVBuffersStatic([[maybe_unused]] ICVar* pCVar)
-{
-    gRenDev->GetLogVBuffers();
-}
-
-static void OnChangeShadowJitteringCVar(ICVar* pCVar)
-{
-    gRenDev->SetShadowJittering(pCVar->GetFVal());
-}
-
-static void OnChange_CachedShadows([[maybe_unused]] ICVar* pCVar)
-{
-    CTexture::GenerateCachedShadowMaps();
-    if (gEnv && gEnv->p3DEngine)
-    {
-        gEnv->p3DEngine->SetShadowsGSMCache(true);
-        gEnv->p3DEngine->SetRecomputeCachedShadows(ShadowMapFrustum::ShadowCacheData::eFullUpdate);
-    }
-}
-
-void CRenderer::ChangeGeomInstancingThreshold([[maybe_unused]] ICVar* pVar)
-{
-    // get user value
-    m_iGeomInstancingThreshold = CV_r_geominstancingthreshold;
-
-    // auto
-    if (m_iGeomInstancingThreshold < 0)
-    {
-        int nGPU = gRenDev->GetFeatures() & RFT_HW_MASK;
-
-        if (nGPU == RFT_HW_ATI)
-        {
-            CRenderer::m_iGeomInstancingThreshold = 2;              // seems to help in performance on all cards
-        }
-        else
-        if (nGPU == RFT_HW_NVIDIA)
-        {
-            CRenderer::m_iGeomInstancingThreshold = 8;                  //
-        }
-        else
-        {
-            CRenderer::m_iGeomInstancingThreshold = 7;                  // might be a good start - can be tweaked further
-        }
-    }
-
-    iLog->Log(" Used GeomInstancingThreshold is %d", m_iGeomInstancingThreshold);
-}
-
-RendererAssetListener::RendererAssetListener(IRenderer* renderer)
-    : m_renderer(renderer)
-{
-}
-
-void RendererAssetListener::Connect()
-{
-    BusConnect(AZ_CRC("dds", 0x780234cb));
-    BusConnect(AZ_CRC("cgf", 0x3bbd9566));
-    BusConnect(AZ_CRC("cfx", 0xd8a99944));
-    BusConnect(AZ_CRC("cfi", 0xb219b9b6));
-}
-
-void RendererAssetListener::Disconnect()
-{
-    BusDisconnect();
-}
-
-void RendererAssetListener::OnFileChanged(AZStd::string assetName)
-{
-    // Do not pass on resource updates until the engine is up and running
-    if (gEnv->pSystem && gEnv->p3DEngine)
-    {
-        m_renderer->EF_ReloadFile_Request(assetName.c_str());
-    }
-}
-
-CRenderer::CRenderer()
-    : m_assetListener(this)
-{
-    static_assert(LegacyInternal::JobExecutorPool::NumPools == AZ_ARRAY_SIZE(CRenderer::m_SkinningDataPool), "JobExecutorPool and Skinning data pool size mismatch");
-    CCryNameR::CreateNameTable();
-}
-
-void CRenderer::InitRenderer()
-{
-    if (!gRenDev)
-    {
-        gRenDev = this;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-
-    m_cEF.m_Bin.m_pCEF = &m_cEF;
-
-    m_bDualStereoSupport = false;
-
-    m_bShaderCacheGen = false;
-    m_bSystemResourcesInit = 0;
-
-    m_bSystemTargetsInit = 0;
-    m_bIsWindowActive = true;
-
-    m_bShadowsEnabled = true;
-    m_bCloudShadowsEnabled = true;
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    m_bVolFogShadowsEnabled = false;
-    m_bVolFogCloudShadowsEnabled = false;
-#endif
-
-    m_nDisableTemporalEffects = 0;
-
-    m_nPoolIndex = 0;
-    m_nPoolIndexRT = 0;
-
-    m_ReqViewportScale = m_CurViewportScale = m_PrevViewportScale = Vec2(1, 1);
-
-    m_UseGlobalMipBias = 0;
-    m_nCurMinAniso = 1;
-    m_nCurMaxAniso = 16;
-    m_wireframe_mode = R_SOLID_MODE;
-    m_wireframe_mode_prev = R_SOLID_MODE;
-    m_RP.m_StateOr = 0;
-    m_RP.m_StateAnd = -1;
-
-    m_pSpriteVerts = NULL;
-    m_pSpriteInds = NULL;
-
-    m_nativeWidth = 0;
-    m_nativeHeight = 0;
-    m_backbufferWidth = 0;
-    m_backbufferHeight = 0;
-    m_numSSAASamples = 1;
-
-    m_screenShotType = 0;
-
-    REGISTER_CVAR3("r_ApplyToonShading", CV_r_ApplyToonShading, 0, VF_NULL,
-        "Disable/Enable Toon Shading render mode\n"
-        "  0: Off\n"
-        "  1: Toon Shading on\n");
-
-    REGISTER_CVAR3("r_GraphicsPipeline", CV_r_GraphicsPipeline, 0, VF_NULL,
-        "Toggles new optimized graphics pipeline\n"
-        "  0: Off\n"
-        "  1: Just fullscreen passes\n"
-        "  2: Just scene passes\n"
-        "  3: All passes\n");
-
-    REGISTER_CVAR3_CB("r_DebugLightLayers", CV_r_DebugLightLayers, 0, VF_DUMPTODISK,
-        "1 - Direct lighting, diffuse only.\n"
-        "2 - Add environment ambient lighting, diffuse only.\n"
-        "3 - Add specular term.\n"
-        "4 - Add AO.\n"
-        "5 - Add textures.\n"
-        "6 - Add fog.\n"
-        "7 - Add tone mapping / bloom / color grading.\n",
-        OnChange_CV_r_DebugLightLayers);
-
-    REGISTER_CVAR3_CB("r_DeferredShadingTiled", CV_r_DeferredShadingTiled, 0, VF_DUMPTODISK,
-        "Toggles tiled shading using a compute shader\n"
-        "1 - Tiled forward shading for transparent objects\n"
-        "2 - Tiled deferred and forward shading\n"
-        "3 - Tiled deferred and forward shading with debug info\n"
-        "4 - Light coverage visualization\n",
-        OnChange_CV_r_DeferredShadingTiled);
-
-    REGISTER_CVAR3("r_DeferredShadingTiledHairQuality", CV_r_DeferredShadingTiledHairQuality, 2, VF_DUMPTODISK,
-        "Tiled shading hair quality\n"
-        "0 - Regular forward shading\n"
-        "1 - Tiled shading on selected assets and more accurate probe blending\n"
-        "2 - Full tiled shading with high quality shadow filter\n");
-
-    REGISTER_CVAR3("r_DeferredShadingTiledDebugDirect", CV_r_DeferredShadingTiledDebugDirect, 0, VF_DUMPTODISK,
-        "1 - Disables translucent BRDF.\n"
-        "2 - Disables all direct lighting.\n");
-
-    REGISTER_CVAR3("r_DeferredShadingTiledDebugIndirect", CV_r_DeferredShadingTiledDebugIndirect, 0, VF_DUMPTODISK,
-        "Incrementally disables stages of the indirect lighting pipeline.\n"
-        "3 - Disables Ambient Diffuse\n"
-        "2 - Disables Ambient Specular\n"
-        "1 - Disables AO and SSR\n");
-
-    REGISTER_CVAR3("r_DeferredShadingTiledDebugAccumulation", CV_r_DeferredShadingTiledDebugAccumulation, 0, VF_DUMPTODISK,
-        "Toggles layered debug visualization of deferred lighting contributions\n"
-        "1 - Show Only Accumulated Diffuse\n"
-        "2 - Show Only Accumulated Specular\n");
-
-    REGISTER_CVAR3("r_DeferredShadingTiledDebugAlbedo", CV_r_DeferredShadingTiledDebugAlbedo, 0, VF_DUMPTODISK,
-        "Toggles layered debug visualization of deferred lighting contributions\n"
-        "1 - Force white albedo value\n");
-
-    REGISTER_CVAR3("r_DeferredShadingSSS", CV_r_DeferredShadingSSS, DEF_SHAD_SSS_DEFAULT_VAL, VF_DUMPTODISK,
-        "Toggles deferred subsurface scattering (requires full deferred shading)");
-
-    REGISTER_CVAR3("r_DeferredShadingFilterGBuffer", CV_r_DeferredShadingFilterGBuffer, 0, VF_DUMPTODISK,
-        "Enables filtering of GBuffer to reduce specular aliasing.\n");
-
-    DefineConstIntCVar3("r_DeferredShadingLightVolumes", CV_r_deferredshadingLightVolumes, 1, VF_DUMPTODISK,
-        "Toggles Light volumes for deferred shading.\n"
-        "Usage: r_DeferredShadingLightVolumes [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredDecals", CV_r_deferredDecals, 1, VF_DUMPTODISK,
-        "Toggles deferred decals.\n"
-        "Usage: r_DeferredDecals [0/1]\n"
-        "Default is 1 (enabled), 0 Disabled. ");
-
-    DefineConstIntCVar3("r_deferredDecalsDebug", CV_r_deferredDecalsDebug, 0, VF_DUMPTODISK,
-        "Display decals debug info.\n"
-        "Usage: r_deferredDecalsDebug [0/1]");
-
-    DefineConstIntCVar3("r_deferredDecalsOnDynamicObjects", CV_r_deferredDecalsOnDynamicObjects, 0, VF_DUMPTODISK,
-        "Render deferred decals on dynamic objects.\n"
-        "Usage: r_deferredDecalsOnDynamicObjects [0/1]");
-
-    DefineConstIntCVar3("r_DeferredShadingEnvProbes", CV_r_DeferredShadingEnvProbes, 1, VF_DUMPTODISK,
-        "Toggles deferred environment probes rendering.\n"
-        "Usage: r_DeferredShadingEnvProbes [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingStencilPrepass", CV_r_DeferredShadingStencilPrepass, 1, VF_DUMPTODISK,
-        "Toggles deferred shading stencil pre pass.\n"
-        "Usage: r_DeferredShadingStencilPrepass [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingScissor", CV_r_DeferredShadingScissor, 1, VF_DUMPTODISK,
-        "Toggles deferred shading scissor test.\n"
-        "Usage: r_DeferredShadingScissor [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingLBuffersFmt", CV_r_DeferredShadingLBuffersFmt, 1, VF_NULL,
-        "Toggles light buffers format.\n"
-        "Usage: r_DeferredShadingLBuffersFmt [0/1/2] \n"
-        "Default is 1 (R11G11B10F), 0: R16G16B16A16F 2: Use optimized format for gmem : diffuseAcc 8 (R8) bits instead of 64 and SpeculaAcc 32 bits (R10G10B10A2) instead of 64.");
-
-
-    DefineConstIntCVar3("r_DeferredShadingDepthBoundsTest", CV_r_DeferredShadingDepthBoundsTest, DEF_SHAD_DBT_DEFAULT_VAL,
-        VF_DUMPTODISK,
-        "Toggles deferred shading depth bounds test.\n"
-        "Usage: r_DeferredShadingDepthBoundsTest [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingDBTstencil", CV_r_deferredshadingDBTstencil, DEF_SHAD_DBT_STENCIL_DEFAULT_VAL,
-        VF_DUMPTODISK,
-        "Toggles deferred shading combined depth bounds test + stencil test.\n"
-        "Usage: r_DeferredShadingDBTstencil [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingDebug", CV_r_DeferredShadingDebug, 0, VF_DUMPTODISK,
-        "Toggles deferred shading debug.\n"
-        "Usage: r_DeferredShadingDebug [0/1]\n"
-        "  0 disabled (Default)\n"
-        "  1: Visualize g-buffer and l-buffers\n"
-        "  2: Debug deferred lighting fillrate (brighter colors means more expensive)\n");
-
-    DefineConstIntCVar3("r_DebugGBuffer", CV_r_DeferredShadingDebugGBuffer, 0, VF_DEV_ONLY,
-        "Debug view for gbuffer attributes\n"
-        "  0 - Disabled\n"
-        "  1 - Normals\n"
-        "  2 - Smoothness\n"
-        "  3 - Reflectance\n"
-        "  4 - Albedo\n"
-        "  5 - Lighting model\n"
-        "  6 - Translucency\n"
-        "  7 - Sun self-shadowing\n"
-        "  8 - Subsurface scattering\n"
-        "  9 - Specular validation overlay\n"
-        );
-
-    DefineConstIntCVar3("r_DeferredShadingLights", CV_r_DeferredShadingLights, 1, VF_DUMPTODISK,
-        "Enables/Disables lights processing.\n"
-        "Usage: r_DeferredShadingLights [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingAmbientLights", CV_r_DeferredShadingAmbientLights, 1, VF_DUMPTODISK,
-        "Enables/Disables ambient lights.\n"
-        "Usage: r_DeferredShadingAmbientLights [0/1]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingAreaLights", CV_r_DeferredShadingAreaLights, 1, VF_DUMPTODISK,
-        "Enables/Disables more complex area lights processing.\n"
-        "Usage: r_DeferredShadingAreaLights [0/1]\n"
-        "Default is 0 (disabled)");
-
-    DefineConstIntCVar3("r_DeferredShadingAmbient", CV_r_DeferredShadingAmbient, 1, VF_DUMPTODISK,
-        "Enables/Disables ambient processing.\n"
-        "Usage: r_DeferredShadingAmbient [0/1/2]\n"
-        "  0: no ambient passes (disabled)\n"
-        "  1: vis areas and outdoor ambient  (default)\n"
-        "  2: only outdoor (debug vis areas mode)\n");
-
-    REGISTER_CVAR3("r_DeferredShadingLightLodRatio", CV_r_DeferredShadingLightLodRatio, 1.0f, VF_DUMPTODISK,
-        "Sets deferred shading light intensity threshold.\n"
-        "Usage: r_DeferredShadingLightLodRatio [value]\n"
-        "Default is 0.1");
-
-    REGISTER_CVAR3("r_DeferredShadingLightStencilRatio", CV_r_DeferredShadingLightStencilRatio, 0.21f, VF_DUMPTODISK,
-        "Sets screen ratio for deferred lights to use stencil (eg: 0.2 - 20% of screen).\n"
-        "Usage: r_DeferredShadingLightStencilRatio [value]\n"
-        "Default is 0.2");
-
-
-    REGISTER_CVAR3("r_DeferredShadingSortLights", CV_r_DeferredShadingSortLights, 0, VF_CHEAT,
-        "Sorts deferred lights\n"
-        "Usage: r_DeferredShadingSortLights [0/1/2/3]\n"
-        " 0: no sorting\n"
-        " 1: sort by screen space influence area\n"
-        " 2: lights that are already in the shadowmap pool are processed first\n"
-        " 3: first sort by presence in the shadowmap pool and then by screen space influence area\n"
-        "Default is 0 (off)");
-
-    REGISTER_CVAR3("r_DeferredShadingAmbientSClear", CV_r_DeferredShadingAmbientSClear, 1, VF_NULL,
-        "Clear stencil buffer after ambient pass (prevents artifacts on Nvidia hw)\n");
-
-    ICVar* hdrDebug = REGISTER_CVAR3("r_HDRDebug", CV_r_HDRDebug, 0, VF_NULL,
-            "Toggles HDR debugging info (to debug HDR/eye adaptation)\n"
-            "Usage: r_HDRDebug\n"
-            "0 off (default)\n"
-            "1 show gamma-corrected scene target without HDR processing\n"
-            "2 identify illegal colors (grey=normal, red=NotANumber, green=negative)\n"
-            "3 display internal HDR textures\n"
-            "4 display HDR range adaptation\n"
-            "5 debug merged posts composition mask\n");
-    if (hdrDebug)
-    {
-        hdrDebug->SetLimits(0.0f, 5.0f);
-    }
-
-    REGISTER_CVAR3("r_ToneMapTechnique", CV_r_ToneMapTechnique, 0, VF_NULL,
-        "Toggles Tonemapping technique\n"
-        "Usage: r_ToneMapTechnique\n"        
-        "0 Uncharted 2 Filmic curve by J Hable (default)\n"
-        "1 Linear operator\n"
-        "2 Exponential operator\n"
-        "3 Reinhard operator\n"
-        "4 Cheap ALU based filmic curve from John Hable\n");
-   
-    REGISTER_CVAR3("r_ColorSpace", CV_r_ColorSpace, 0, VF_NULL,
-        "Toggles Color Space conversion\n"
-        "Usage: r_ColorSpace\n"
-        "0 sRGB0 - Most accurate (default)\n"
-        "1 sRGB1 - Cheap approximation\n"
-        "2 sRGB2 - Cheapest approximation\n");
-    
-    REGISTER_CVAR3("r_ToneMapManualExposureValue", CV_r_ToneMapManualExposureValue, 1, VF_NULL,
-        "Set the manual exposure value for cheaper tonemap techniques\n"
-        "Usage: r_ToneMapManualExposureValue\n"
-        "Default is 1.0\n");
-
-    REGISTER_CVAR3("r_ToneMapExposureType", CV_r_ToneMapExposureType, 0, VF_NULL,
-        "Set the type of exposure to be used by tonemap operators\n"
-        "Usage: r_ToneMapExposureType\n"
-        "Default is 0\n"
-        "0 Auto exposure\n"
-        "1 Manual exposure\n");
-
-    REGISTER_CVAR3("r_HDRBloom", CV_r_HDRBloom, 1, VF_NULL,
-        "Enables bloom/glare.\n"
-        "Usage: r_HDRBloom [0/1]\n");
-
-    REGISTER_CVAR3("r_HDRBloomQuality", CV_r_HDRBloomQuality, 2, VF_NULL,
-        "Set bloom quality (0: low, 1: medium, 2: high)\n");
-
-    DefineConstIntCVar3("r_HDRVignetting", CV_r_HDRVignetting, 1, VF_DUMPTODISK,
-        "HDR viggneting\n"
-        "Usage: r_HDRVignetting [Value]\n"
-        "Default is 1 (enabled)");
-
-    DefineConstIntCVar3("r_HDRTexFormat", CV_r_HDRTexFormat, 0, VF_DUMPTODISK,
-        "HDR texture format. \n"
-        "Usage: r_HDRTexFormat [Value] 0:(low precision - cheaper/faster), 1:(high precision)\n"
-        "Default is 0");
-
-    // Dolby Parameters
-    REGISTER_CVAR3("r_HDRDolbyDynamicMetadata", CV_r_HDRDolbyDynamicMetadata, 1, VF_DUMPTODISK, "Enable Dolby Dynamic Metadata (provides Dolby Vision screen with min/max/mid of the current image, in order to improve image quality)");
-    REGISTER_CVAR3("r_HDRDolbyScurve", CV_r_HDRDolbyScurve, 1, VF_DUMPTODISK, "Enable Dolby S-Curve (transformation from source intensity range to cd/m^2).");
-    REGISTER_CVAR3("r_HDRDolbyScurveSourceMin", CV_r_HDRDolbyScurveSourceMin, 0.001f, VF_DUMPTODISK, "Set Dolby S-Curve Source minimum intensity (in source units).");
-    REGISTER_CVAR3("r_HDRDolbyScurveSourceMid", CV_r_HDRDolbyScurveSourceMid, 0.4f, VF_DUMPTODISK, "Set Dolby S-Curve Source midpoint intensity (in source units).");
-    REGISTER_CVAR3("r_HDRDolbyScurveSourceMax", CV_r_HDRDolbyScurveSourceMax, 10000.0f,  VF_DUMPTODISK, "Set Dolby S-Curve Source maximum intensity (in source units).");
-    REGISTER_CVAR3("r_HDRDolbyScurveSlope", CV_r_HDRDolbyScurveSlope, 1.0f, VF_DUMPTODISK, "Set Dolby S-Curve Slope (similar to gamma).");
-    REGISTER_CVAR3("r_HDRDolbyScurveScale", CV_r_HDRDolbyScurveScale, 1.0f, VF_DUMPTODISK, "Set Dolby S-Curve Multiplier (similar to brightness).");
-    REGISTER_CVAR3("r_HDRDolbyScurveRGBPQTargetMin", CV_r_HDRDolbyScurveRGBPQTargetMin, 0.001f, VF_DUMPTODISK, "Set Dolby S-Curve RGBPQ (e.g. Maui) Target minimum intensity (in cd/m^2).");
-    REGISTER_CVAR3("r_HDRDolbyScurveRGBPQTargetMid", CV_r_HDRDolbyScurveRGBPQTargetMid, 50.0f, VF_DUMPTODISK, "Set Dolby S-Curve RGBPQ (e.g. Maui) Target midpoint intensity (in cd/m^2).");
-    REGISTER_CVAR3("r_HDRDolbyScurveRGBPQTargetMax", CV_r_HDRDolbyScurveRGBPQTargetMax, 2000.0f, VF_DUMPTODISK, "Set Dolby S-Curve RGBPQ (e.g. Maui) Target midpoint (average) intensity (in cd/m^2).");
-    REGISTER_CVAR3("r_HDRDolbyScurveVisionTargetMin", CV_r_HDRDolbyScurveVisionTargetMin, 0.001f, VF_DUMPTODISK, "Set Dolby S-Curve Vision (e.g. Vizio) Target minimum intensity (in cd/m^2).");
-    REGISTER_CVAR3("r_HDRDolbyScurveVisionTargetMid", CV_r_HDRDolbyScurveVisionTargetMid, 50.0f, VF_DUMPTODISK, "Set Dolby S-Curve Vision (e.g. Vizio) Target midpoint intensity (in cd/m^2).");
-    REGISTER_CVAR3("r_HDRDolbyScurveVisionTargetMax", CV_r_HDRDolbyScurveVisionTargetMax, 800.0f, VF_DUMPTODISK, "Set Dolby S-Curve Vision (e.g. Vizio) Target maximum intensity (in cd/m^2).");
-
-    // Eye Adaptation
-    REGISTER_CVAR3("r_HDREyeAdaptationSpeed", CV_r_HDREyeAdaptationSpeed, 1.0f, VF_NULL,
-        "HDR rendering eye adaptation speed\n"
-        "Usage: r_EyeAdaptationSpeed [Value]");
-
-    REGISTER_CVAR3("r_HDREyeAdaptationMode", CV_r_HDREyeAdaptationMode, 2, VF_DUMPTODISK,
-        "Set the eye adaptation (auto exposure) mode.\n"
-        "  1: Standard auto exposure (using EV values)\n"
-        "  2: Legacy auto exposure for backwards compatibility (CE 3.6 to 3.8.1)");
-
-    REGISTER_CVAR3("r_HDRGrainAmount", CV_r_HDRGrainAmount, 0.0f, VF_NULL,
-        "HDR camera grain amount\n"
-        "Usage: r_HDRGrainAmount [Value]");
-
-    REGISTER_CVAR3("r_ChromaticAberration", CV_r_ChromaticAberration, 0.0f, VF_NULL,
-        "Chromatic aberration amount\n"
-        "Usage: r_ChromaticAberration [Value]");
-
-    REGISTER_CVAR3("r_Sharpening", CV_r_Sharpening, 0.0f, VF_NULL,
-        "Image sharpening amount\n"
-        "Usage: r_Sharpening [Value]");
-
-    REGISTER_CVAR3("r_Beams", CV_r_beams, 1, VF_NULL,
-        "Toggles volumetric light beams.\n"
-        "Usage: r_Beams [0/1]\n");
-
-    REGISTER_CVAR3_CB("r_GeomInstancingThreshold", CV_r_geominstancingthreshold, -1, VF_NULL,
-        "If the instance count gets bigger than the specified value the instancing feature is used.\n"
-        "Usage: r_GeomInstancingThreshold [Num]\n"
-        "Default is -1 (automatic depending on hardware, used value can be found in the log)",
-        ChangeGeomInstancingThreshold);
-
-    REGISTER_CVAR3("r_BatchType", CV_r_batchtype, 0, VF_NULL,
-        "0 - CPU friendly.\n"
-        "1 - GPU friendly.\n"
-        "2 - Automatic.\n");
-
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX) || defined(USE_SILHOUETTEPOM_CVAR)
-    REGISTER_CVAR3("r_SilhouettePOM", CV_r_SilhouettePOM, 0, VF_NULL,
-        "Enables use of silhouette parallax occlusion mapping.\n"
-        "Usage: r_SilhouettePOM [0/1]");
-#endif
-#ifdef WATER_TESSELLATION_RENDERER
-    REGISTER_CVAR3("r_WaterTessellationHW", CV_r_WaterTessellationHW, 0, VF_NULL,
-        "Enables hw water tessellation.\n"
-        "Usage: r_WaterTessellationHW [0/1]");
-#endif
-
-    REGISTER_CVAR3("r_TessellationDebug", CV_r_tessellationdebug, 0, VF_NULL,
-        "1 - Factor visualizing.\n"
-        "Default is 0");
-    REGISTER_CVAR3("r_TessellationTriangleSize", CV_r_tessellationtrianglesize, 8.0f, VF_NULL,
-        "Desired triangle size for screen-space tessellation.\n"
-        "Default is 10.");
-    REGISTER_CVAR3("r_UseDisplacementFactor", CV_r_displacementfactor, 0.2f, VF_NULL,
-        "Global displacement amount.\n"
-        "Default is 0.4f.");
-
-    DefineConstIntCVar3("r_GeomInstancing", CV_r_geominstancing, GEOM_INSTANCING_DEFAULT_VAL, VF_NULL,
-        "Toggles HW geometry instancing.\n"
-        "Usage: r_GeomInstancing [0/1]\n"
-        "Default is 1 (on). Set to 0 to disable geom. instancing.");
-
-    DefineConstIntCVar3("r_GeomInstancingDebug", CV_r_geominstancingdebug, 0, VF_NULL,
-        "Toggles HW geometry instancing debug display.\n"
-        "Usage: r_GeomInstancingDebug [0/1/2]\n"
-        "Default is 0 (off). Set to 1 to add GPU markers around instanced objects. 2 will visually highlight them as well.");
-
-    DefineConstIntCVar3("r_MaterialsBatching", CV_r_materialsbatching, 1, VF_NULL,
-        "Toggles materials batching.\n"
-        "Usage: r_MaterialsBatching [0/1]\n"
-        "Default is 1 (on). Set to 0 to disable.");
-
-    DefineConstIntCVar3("r_ImpostersDraw", CV_r_impostersdraw, 1, VF_NULL,
-        "Toggles imposters drawing.\n"
-        "Usage: r_ImpostersDraw [0/1]\n"
-        "Default is 1 (on). Set to 0 to disable imposters.");
-    REGISTER_CVAR3("r_ImposterRatio", CV_r_imposterratio, 1, VF_NULL,
-        "Allows to scale the texture resolution of imposters (clouds)\n"
-        "Usage: r_ImposterRatio [1..]\n"
-        "Default is 1 (1:1 normal). Bigger values can help to save texture space\n"
-        "(e.g. value 2 results in 1/4 texture memory usage)");
-    REGISTER_CVAR3("r_ImpostersUpdatePerFrame", CV_r_impostersupdateperframe, 6000, VF_NULL,
-        "How many kilobytes to update per-frame.\n"
-        "Usage: r_ImpostersUpdatePerFrame [1000-30000]\n"
-        "Default is 6000 (6 megabytes)");
-
-    DefineConstIntCVar3("r_ZPassDepthSorting", CV_r_ZPassDepthSorting, ZPASS_DEPTH_SORT_DEFAULT_VAL, VF_NULL,
-        "Toggles Z pass depth sorting.\n"
-        "Usage: r_ZPassDepthSorting [0/1/2]\n"
-        "0: No depth sorting\n"
-        "1: Sort by depth layers (default)\n"
-        "2: Sort by distance\n");
-
-    REGISTER_CVAR3("r_ZPrepassMaxDist", CV_r_ZPrepassMaxDist, 16.0f, VF_NULL,
-        "Set ZPrepass max dist.\n"
-        "Usage: r_ZPrepassMaxDist (16.0f default) [distance in meters]\n");
-
-    REGISTER_CVAR3("r_UseZPass", CV_r_usezpass, 2, VF_RENDERER_CVAR,
-        "Toggles g-buffer pass.\n"
-        "Usage: r_UseZPass [0/1/2]\n"
-        "0: Disable Z-pass (not recommended, this disables any g-buffer rendering)\n"
-        "1: Enable Z-pass (g-buffer only)\n"
-        "2: Enable Z-pass (g-buffer and additional Z-prepass)");
-
-    DefineConstIntCVar3("r_TransparentPasses", CV_r_TransparentPasses, 1, VF_NULL,
-        "Toggles rendering of transparent/alpha blended objects.\n");
-
-    DefineConstIntCVar3("r_TranspDepthFixup", CV_r_TranspDepthFixup, 1, VF_NULL,
-        "Write approximate depth for certain transparent objects before post effects\n"
-        "Usage: r_TranspDepthFixup [0/1]\n"
-        "Default is 1 (enabled)\n");
-
-    DefineConstIntCVar3("r_SoftAlphaTest", CV_r_SoftAlphaTest, 1, VF_NULL,
-        "Toggles post processed soft alpha test for shaders supporting this\n"
-        "Usage: r_SoftAlphaTest [0/1]\n"
-        "Default is 1 (enabled)\n");
-
-    DefineConstIntCVar3("r_UseHWSkinning", CV_r_usehwskinning, 1, VF_NULL,
-        "Toggles HW skinning.\n"
-        "Usage: r_UseHWSkinning [0/1]\n"
-        "Default is 1 (on). Set to 0 to disable HW-skinning.");
-    DefineConstIntCVar3("r_UseMaterialLayers", CV_r_usemateriallayers, 2, VF_NULL,
-        "Enables material layers rendering.\n"
-        "Usage: r_UseMaterialLayers [0/1/2]\n"
-        "Default is 2 (optimized). Set to 1 for enabling but with optimization disabled (for debug).");
-
-    DefineConstIntCVar3("r_ParticlesSoftIsec", CV_r_ParticlesSoftIsec, 1, VF_NULL,
-        "Enables particles soft intersections.\n"
-        "Usage: r_ParticlesSoftIsec [0/1]");
-
-    DefineConstIntCVar3("r_ParticlesRefraction", CV_r_ParticlesRefraction, 1, VF_NULL,
-        "Enables refractive particles.\n"
-        "Usage: r_ParticlesRefraction [0/1]");
-
-    REGISTER_CVAR3("r_ParticlesHalfRes", CV_r_ParticlesHalfRes, 0, VF_NULL,
-        "Enables (1) or forces (2) rendering of particles in a half-resolution buffer.\n"
-        "Usage: r_ParticlesHalfRes [0/1/2]");
-
-    DefineConstIntCVar3("r_ParticlesHalfResBlendMode", CV_r_ParticlesHalfResBlendMode, 0, VF_NULL,
-        "Specifies which particles can be rendered in half resolution.\n"
-        "Usage: r_ParticlesHalfResBlendMode [0=alpha / 1=additive]");
-
-    DefineConstIntCVar3("r_ParticlesHalfResAmount", CV_r_ParticlesHalfResAmount, 0, VF_NULL,
-        "Sets particle half-res buffer to half (0) or quarter (1) screen size.\n"
-        "Usage: r_ParticlesHalfResForce [0/1]");
-
-    DefineConstIntCVar3("r_ParticlesInstanceVertices", CV_r_ParticlesInstanceVertices, 1, VF_NULL,
-        "Enable instanced-vertex rendering.\n"
-        "Usage: r_ParticlesInstanceVertices [0/1]");
-
-    REGISTER_CVAR3("r_ParticlesAmountGI", CV_r_ParticlesAmountGI, 0.15f, VF_NULL,
-        "Global illumination amount for particles without material.\n"
-        "Usage: r_ParticlesAmountGI [n]");
-
-    REGISTER_CVAR3("r_MSAA", CV_r_msaa, 0, VF_NULL,
-        "Enables hw multisampling antialiasing.\n"
-        "Usage: r_MSAA [0/1]\n"
-        "Default: 0 (off).\n"
-        "1: enabled + default reference quality mode\n");
-    REGISTER_CVAR3("r_MSAA_samples", CV_r_msaa_samples, 0, VF_NULL,
-        "Number of subsamples used when hw multisampled antialiasing is enabled.\n"
-        "Usage: r_MSAA_samples N (where N is a number >= 0). Attention, N must be supported by given video hardware!\n"
-        "Default: 0. Please note that various hardware implements special MSAA modes via certain combinations of\n"
-        "r_MSAA_quality and r_MSAA_samples.");
-    REGISTER_CVAR3("r_MSAA_quality", CV_r_msaa_quality, 0, VF_NULL,
-        "Quality level used when multisampled antialiasing is enabled.\n"
-        "Usage: r_MSAA_quality N (where N is a number >= 0). Attention, N must be supported by given video hardware!\n"
-        "Default: 0. Please note that various hardware implements special MSAA modes via certain combinations of\n"
-        "r_MSAA_quality and r_MSAA_samples.");
-    REGISTER_CVAR3("r_MSAA_debug", CV_r_msaa_debug, 0, VF_NULL,
-        "Enable debugging mode for msaa.\n"
-        "Usage: r_MSAA_debug N (where N is debug mode > 0)\n"
-        "Default: 0. disabled. Note debug modes share target with post processing, disable post processing for correct visualization. \n"
-        "1 disable sample frequency pass\n"
-        "2 visualize sample frequency mask\n");
-
-    // This values seem a good performance/quality balance for a Crysis style level (note that they might need re-adjust for different projects)
-    REGISTER_CVAR3("r_MSAA_threshold_depth", CV_r_msaa_threshold_depth, 0.1f, VF_NULL,
-        "Set depth threshold to be used for custom resolve sub-samples masking\n");
-    REGISTER_CVAR3("r_MSAA_threshold_normal", CV_r_msaa_threshold_normal, 0.9f, VF_NULL,
-        "Set normals threshold to be used for custom resolve sub-samples masking\n");
-
-    REGISTER_CVAR3("r_UseSpecularAntialiasing", CV_r_SpecularAntialiasing, 1, VF_NULL,
-        "Enable specular antialiasing.\n"
-        "Usage: r_UseSpecularAntialiasing [0/1]");
-
-    static string aaModesDesc = "Enables post process based anti-aliasing modes.\nUsage: r_AntialiasingMode [n]\n";
-
-    for (int i = 0; i < eAT_AAMODES_COUNT; ++i)
-    {
-        string mode;
-        mode.Format("%d: %s\n", i, s_pszAAModes[i]);
-        aaModesDesc.append(mode);
-    }
-
-    REGISTER_CVAR3_CB("r_AntialiasingMode", CV_r_AntialiasingMode_CB, eAT_DEFAULT_AA, VF_NULL, aaModesDesc.c_str(), OnChange_CV_r_AntialiasingMode);
-    CV_r_AntialiasingMode = CV_r_AntialiasingMode_CB;
-
-    REGISTER_CVAR3("r_AntialiasingNonTAASharpening", CV_r_AntialiasingNonTAASharpening, 0.f, VF_NULL,
-        "Enables non-TAA sharpening.\n");
-
-    REGISTER_CVAR3("r_AntialiasingTAAJitterPattern", CV_r_AntialiasingTAAJitterPattern, 7, VF_NULL,
-        "Selects TAA sampling pattern.\n"
-        "  0: no subsamples\n  1: 2x\n  2: 3x\n  3: 4x\n  4: 8x\n  5: sparse grid 8x8\n  6: random\n  7: Halton 8x\n  8: Halton random");
-
-    DefineConstIntCVar3("r_AntialiasingTAAUseJitterMipBias", CV_r_AntialiasingTAAUseJitterMipBias, 1, VF_NULL,
-        "Allows mip map biasing on textures when jitter is enabled\n");
-
-    DefineConstIntCVar3("r_AntialiasingTAAUseVarianceClamping", CV_r_AntialiasingTAAUseVarianceClamping, 0, VF_NULL,
-        "Allows variance-based color clipping. Decreases ghosting but may increase flickering artifacts.\n");
-
-    DefineConstIntCVar3("r_AntialiasingModeDebug", CV_r_AntialiasingModeDebug, 0, VF_NULL,
-        "Enables AA debugging views\n"
-        "Usage: r_AntialiasingModeDebug [n]"
-        "1: Display edge detection"
-        "2: Zoom image 2x"
-        "3: Zoom image 2x + display edge detection"
-        "4: Zoom image 4x, etc");
-
-    DefineConstIntCVar3("r_AntialiasingTAAUseAntiFlickerFilter", CV_r_AntialiasingTAAUseAntiFlickerFilter, 1, VF_NULL,
-        "Enables TAA anti-flicker filtering.\n");
-
-    REGISTER_CVAR3("r_AntialiasingTAAClampingFactor", CV_r_AntialiasingTAAClampingFactor, 1.25f, VF_NULL,
-        "Controls the history clamping factor for TAA. Higher values will cause more ghosting but less flickering. Acceptable values between 0.75 and 2.0\n");
-
-    REGISTER_CVAR3("r_AntialiasingTAANewFrameWeight", CV_r_AntialiasingTAANewFrameWeight, 0.05f, VF_NULL,
-        "The weight controlling how much of the current frame is used when integrating with the exponential history buffer.\n");
-
-    REGISTER_CVAR3("r_AntialiasingTAASharpening", CV_r_AntialiasingTAASharpening, 0.1f, VF_NULL,
-        "Enables TAA sharpening.\n");
-
-    DefineConstIntCVar3("CV_r_AntialiasingModeEditor", CV_r_AntialiasingModeEditor, 1, VF_NULL,
-        "Sets antialiasing modes to editing mode (disables jitter on modes using camera jitter which can cause flickering of helper objects)\n"
-        "Usage: CV_r_AntialiasingModeEditor [0/1]");
-
-    DefineConstIntCVar3("r_MotionVectors", CV_r_MotionVectors, 1, VF_NULL,
-        "Enables generation of motion vectors for dynamic objects\n");
-
-    DefineConstIntCVar3("r_MotionVectorsTransparency", CV_r_MotionVectorsTransparency, 1, VF_NULL,
-        "Enables generation of motion vectors for transparent objects\n");
-
-    REGISTER_CVAR3("r_MotionVectorsTransparencyAlphaThreshold", CV_r_MotionVectorsTransparencyAlphaThreshold, 0.25f, VF_NULL,
-        "Transparent object alpha threshold. If the alpha is above this threshold the object will generate motion vectors.\n"
-        "Usage: r_MotionVectorsTransparencyAlphaThreshold (val)\n"
-        "Default is 0.25.  0 - disabled\n");
-
-    DefineConstIntCVar3("r_MotionVectorsDebug", CV_r_MotionVectorsDebug, 0, VF_NULL,
-        "Enables motion vector debug visualization.\n");
-
-    REGISTER_CVAR3_CB("r_MotionBlur", CV_r_MotionBlur, 2, VF_NULL,
-        "Enables per object and camera motion blur.\n"
-        "Usage: r_MotionBlur [0/1/2/3]\n"
-        "Default is 1 (camera motion blur on).\n"
-        "1: camera motion blur\n"
-        "2: camera and object motion blur\n"
-        "3: debug mode\n", OnChange_CV_r_MotionBlur);
-
-    REGISTER_CVAR3("r_RenderMotionBlurAfterHDR", CV_r_RenderMotionBlurAfterHDR, 0, VF_NULL,
-        "Forces Motion Blur To Render After HDR processing.\n"
-        "Usage: r_MotionBlur [0/1]\n"
-        "Default is 0 (Motion Blur Before HDR).\n"
-        "0: Motion Blur Applied Before HDR Processing (Luminance Measurement, Bloom, Tonemapping)\n"
-        "1: Motion Blur Applied After HDR Processing (Luminance Measurement, Bloom, Tonemapping)\n");
-
-    REGISTER_CVAR3("r_MotionBlurScreenShot", CV_r_MotionBlurScreenShot, 0, VF_NULL,
-        "Enables motion blur during high res screen captures"
-        "Usage: r_MotionBlur [0/1]\n"
-        "0: motion blur disabled for screen shot (default)\n"
-        "1: motion blur enabled for screen shot\n");
-
-    REGISTER_CVAR3("r_MotionBlurQuality", CV_r_MotionBlurQuality, 1, VF_NULL,
-        "Set motion blur sample count.\n"
-        "Usage: r_MotionBlurQuality [0/1]\n"
-        "0 - low quality, 1 - medium quality, 2 - high quality\n");
-
-    REGISTER_CVAR3("r_MotionBlurGBufferVelocity", CV_r_MotionBlurGBufferVelocity, 1, VF_NULL,
-        "Pack velocity output in g-buffer.\n"
-        "Usage: r_MotionBlurGBufferVelocity [0/1]\n"
-        "Default is 1 (enabled). 0 - disabled\n");
-
-    REGISTER_CVAR3("r_MotionBlurThreshold", CV_r_MotionBlurThreshold, 0.0001f, VF_NULL,
-        "Object motion blur velocity threshold.\n"
-        "Usage: r_MotionBlurThreshold (val)\n"
-        "Default is 0.0001.  0 - disabled\n");
-
-    REGISTER_CVAR3("r_MotionBlurShutterSpeed", CV_r_MotionBlurShutterSpeed, 250.0f, 0,
-        "Sets camera exposure time for motion blur as 1/x seconds.\n"
-        "Default: 250 (1/250 of a second)");
-
-    REGISTER_CVAR3("r_MotionBlurCameraMotionScale", CV_r_MotionBlurCameraMotionScale, 0.2f, 0,
-        "Reduces motion blur for camera movements to account for a fixed focus point of the viewer.\n"
-        "Default: 0.2");
-
-    REGISTER_CVAR3("r_MotionBlurMaxViewDist", CV_r_MotionBlurMaxViewDist, 16.0f, 0,
-        "Sets motion blur max view distance for objects.\n"
-        "Usage: r_MotionBlurMaxViewDist [0...1]\n"
-        "Default is 16 meters");
-
-    DefineConstIntCVar3("r_CustomVisions", CV_r_customvisions, CUSTOMVISIONS_DEFAULT_VAL, VF_NULL,
-        "Enables custom visions, like heatvision, binocular view, etc.\n"
-        "Usage: r_CustomVisions [0/1/2/3]\n"
-        "Default is 0 (disabled). 1 enables. 2 - cheaper version, no post processing. 3 - cheaper post version");
-
-    DefineConstIntCVar3("r_Snow", CV_r_snow, 2, VF_NULL,
-        "Enables snow rendering\n"
-        "Usage: r_Snow [0/1/2]\n"
-        "0 - disabled\n"
-        "1 - enabled\n"
-        "2 - enabled with snow occlusion");
-
-    DefineConstIntCVar3("r_SnowHalfRes", CV_r_snow_halfres, 0, VF_NULL,
-        "When enabled, snow renders at half resolution to conserve fill rate.\n"
-        "Usage: r_SnowHalfRes [0/1]\n"
-        "0 - disabled\n"
-        "1 - enabled\n");
-
-    DefineConstIntCVar3("r_SnowDisplacement", CV_r_snow_displacement, 0, VF_NULL,
-        "Enables displacement for snow accumulation\n"
-        "Usage: r_SnowDisplacement [0/1]\n"
-        "0 - disabled\n"
-        "1 - enabled");
-
-    DefineConstIntCVar3("r_SnowFlakeClusters", CV_r_snowFlakeClusters, 100, VF_NULL,
-        "Number of snow flake clusters.\n"
-        "Usage: r_SnowFlakeClusters [n]");
-
-    DefineConstIntCVar3("r_Rain", CV_r_rain, 2, VF_NULL,
-        "Enables rain rendering\n"
-        "Usage: r_Rain [0/1/2]\n"
-        "0 - disabled"
-        "1 - enabled"
-        "2 - enabled with rain occlusion");
-
-    REGISTER_CVAR3("r_RainAmount", CV_r_rainamount, 1.0f, VF_NULL,
-        "Sets rain amount\n"
-        "Usage: r_RainAmount");
-
-    REGISTER_CVAR3("r_RainMaxViewDist", CV_r_rain_maxviewdist, 32.0f, VF_NULL,
-        "Sets rain max view distance\n"
-        "Usage: r_RainMaxViewDist");
-
-    REGISTER_CVAR3("r_RainMaxViewDist_Deferred", CV_r_rain_maxviewdist_deferred, 40.f, VF_NULL,
-        "Sets maximum view distance (in meters) for deferred rain reflection layer\n"
-        "Usage: r_RainMaxViewDist_Deferred [n]");
-
-    REGISTER_CVAR3("r_RainDistMultiplier", CV_r_rainDistMultiplier, 2.f, VF_NULL, "Rain layer distance from camera multiplier");
-
-    REGISTER_CVAR3("r_RainOccluderSizeTreshold", CV_r_rainOccluderSizeTreshold, 25.f, VF_NULL, "Only objects bigger than this size will occlude rain");
-
-    REGISTER_CVAR3_CB("r_SSReflections", CV_r_SSReflections, 0, VF_NULL,
-        "Glossy screen space reflections [0/1]\n", OnChange_CV_r_SSReflections);
-    REGISTER_CVAR3("r_SSReflHalfRes", CV_r_SSReflHalfRes, 1, VF_NULL,
-        "Toggles rendering reflections in half resolution\n");
-    REGISTER_CVAR3_CB("r_ssdo", CV_r_ssdo, 1, VF_NULL, "Screen Space Directional Occlusion [0/1]\n", OnChange_CV_r_SSDO);
-    REGISTER_CVAR3("r_ssdoHalfRes", CV_r_ssdoHalfRes, 2, VF_NULL,
-        "Apply SSDO bandwidth optimizations\n"
-        "0 - Full resolution (not recommended)\n"
-        "1 - Use lower resolution depth\n"
-        "2 - Low res depth except for small camera FOVs to avoid artifacts\n"
-        "3 - Half resolution output");
-    REGISTER_CVAR3("r_ssdoColorBleeding", CV_r_ssdoColorBleeding, 1, VF_NULL,
-        "Enables AO color bleeding to avoid overly dark occlusion on bright surfaces (requires tiled deferred shading)\n"
-        "Usage: r_ssdoColorBleeding [0/1]\n");
-    REGISTER_CVAR3("r_ssdoRadius", CV_r_ssdoRadius, 1.2f, VF_NULL, "SSDO radius");
-    REGISTER_CVAR3("r_ssdoRadiusMin", CV_r_ssdoRadiusMin, 0.04f, VF_NULL, "Min clamped SSDO radius");
-    REGISTER_CVAR3("r_ssdoRadiusMax", CV_r_ssdoRadiusMax, 0.20f, VF_NULL, "Max clamped SSDO radius");
-    REGISTER_CVAR3("r_ssdoAmountDirect", CV_r_ssdoAmountDirect, 2.0f, VF_NULL, "Strength of occlusion applied to light sources");
-    REGISTER_CVAR3("r_ssdoAmountAmbient", CV_r_ssdoAmountAmbient, 1.0f, VF_NULL, "Strength of occlusion applied to probe irradiance");
-    REGISTER_CVAR3("r_ssdoAmountReflection", CV_r_ssdoAmountReflection, 1.5f, VF_NULL, "Strength of occlusion applied to probe specular");
-
-    DefineConstIntCVar3("r_RainIgnoreNearest", CV_r_rain_ignore_nearest, 1, VF_NULL,
-        "Disables rain wet/reflection layer for nearest objects\n"
-        "Usage: r_RainIgnoreNearest [0/1]\n");
-
-    DefineConstIntCVar3("r_DepthOfField", CV_r_dof, DOF_DEFAULT_VAL, VF_NULL,
-        "Enables depth of field.\n"
-        "Usage: r_DepthOfField [0/1/2]\n"
-        "Default is 0 (disabled). 1 enables, 2 hdr time of day dof enabled");
-
-    DefineConstIntCVar3("r_DebugLightVolumes", CV_r_DebugLightVolumes, 0, VF_NULL,
-        "0=Disable\n"
-        "1=Enable\n"
-        "Usage: r_DebugLightVolumes[0/1]");
-
-    DefineConstIntCVar3("r_UseShadowsPool", CV_r_UseShadowsPool, SHADOWS_POOL_DEFAULT_VAL, VF_NULL,
-        "0=Disable\n"
-        "1=Enable\n"
-        "Usage: r_UseShadowsPool[0/1]");
-
-    REGISTER_CVAR3("r_ShadowsBias", CV_r_ShadowsBias, 0.00008f, VF_DUMPTODISK, //-0.00002
-        "Select shadow map blurriness if r_ShadowsBias is activated.\n"
-        "Usage: r_ShadowsBias [0.1 - 16]");
-
-    REGISTER_CVAR3("r_ShadowsAdaptionRangeClamp", CV_r_ShadowsAdaptionRangeClamp, 0.02f, VF_DUMPTODISK, //-0.00002
-        "maximum range between caster and reciever to take into account.\n"
-        "Usage: r_ShadowsAdaptionRangeClamp [0.0 - 1.0], default 0.01");
-
-    REGISTER_CVAR3("r_ShadowsAdaptionSize", CV_r_ShadowsAdaptionSize, 0.3f, VF_DUMPTODISK, //-0.00002
-        "Select shadow map blurriness if r_ShadowsBias is activated.\n"
-        "Usage: r_ShadowsAdaptoinSize [0 for none - 10 for rapidly changing]");
-
-    REGISTER_CVAR3("r_ShadowsAdaptionMin", CV_r_ShadowsAdaptionMin, 0.35f, VF_DUMPTODISK, //-0.00002
-        "starting kernel size, to avoid blocky shadows.\n"
-        "Usage: r_ShadowsAdaptionMin [0.0 for blocky - 1.0 for blury], 0.35 is default");
-
-    REGISTER_CVAR3("r_ShadowsParticleKernelSize", CV_r_ShadowsParticleKernelSize, 1.f, VF_DUMPTODISK,
-        "Blur kernel size for particles shadows.\n"
-        "Usage: r_ShadowsParticleKernelSize [0.0 hard edge - x for blur], 1. is default");
-
-    REGISTER_CVAR3("r_ShadowsParticleJitterAmount", CV_r_ShadowsParticleJitterAmount, 0.5f, VF_DUMPTODISK,
-        "Amount of jittering for particles shadows.\n"
-        "Usage: r_ShadowsParticleJitterAmount [x], 0.5 is default");
-
-    REGISTER_CVAR3("r_ShadowsParticleAnimJitterAmount", CV_r_ShadowsParticleAnimJitterAmount, 1.f, VF_DUMPTODISK,
-        "Amount of animated jittering for particles shadows.\n"
-        "Usage: r_ShadowsParticleJitterAmount [x], 1. is default");
-
-    REGISTER_CVAR3("r_ShadowsParticleNormalEffect", CV_r_ShadowsParticleNormalEffect, 1.f, VF_DUMPTODISK,
-        "Shadow taps on particles affected by normal and intensity (breaks lines and uniformity of shadows).\n"
-        "Usage: r_ShadowsParticleNormalEffect [x], 1. is default");
-
-    DefineConstIntCVar3("r_ShadowGenMode", CV_r_ShadowGenMode, 1, VF_NULL,
-        "0=Use Frustums Mask\n"
-        "1=Regenerate all sides\n"
-        "Usage: r_ShadowGenMode [0/1]");
-
-    REGISTER_CVAR3_CB("r_ShadowsCache", CV_r_ShadowsCache, 0, VF_NULL,
-        "Replace all sun cascades above cvar value with cached (static) shadow map: 0=no cached shadows, 1=replace first cascade and up, 2=replace second cascade and up,...",
-        OnChange_CachedShadows);
-
-    REGISTER_CVAR3_CB("r_ShadowsCacheFormat", CV_r_ShadowsCacheFormat, 1, VF_NULL,
-        "0=use D32 texture format for shadow cache\n"
-        "1=use D16 texture format for shadow cache\n",
-        OnChange_CachedShadows);
-
-    REGISTER_STRING_CB("r_ShadowsCacheResolutions", "", VF_RENDERER_CVAR, "Shadow cache resolution per cascade. ", OnChange_CachedShadows);
-
-    REGISTER_CVAR3("r_ShadowsNearestMapResolution", CV_r_ShadowsNearestMapResolution, 4096, VF_REQUIRE_APP_RESTART,
-        "Nearest shadow map resolution. Default: 4096");
-
-    REGISTER_CVAR3("r_ShadowsScreenSpace", CV_r_ShadowsScreenSpace, 0, VF_NULL,
-        "Include screen space tracing into shadow computations\n"
-        "Helps reducing artifacts caused by limited shadow map resolution and biasing\n"
-        "Applied only in the near range and supposed to be used mostly in the cutscenes for better shadows on character faces");
-
-    DefineConstIntCVar3("r_ShadowsUseClipVolume", CV_r_ShadowsUseClipVolume, SHADOWS_CLIP_VOL_DEFAULT_VAL, VF_DUMPTODISK,
-        ".\n"
-        "Usage: r_ShadowsUseClipVolume [0=Disable/1=Enable");
-
-    DefineConstIntCVar3("r_ShadowTexFormat", CV_r_shadowtexformat, 0, VF_NULL,
-        "0=use D32 texture format for depth map\n"
-        "1=use D16 texture format for depth map\n"
-        "2=use D24S8 texture format for depth map\n"
-        "Usage: r_ShadowTexFormat [0-2]");
-
-    DefineConstIntCVar3("r_ShadowsMaskResolution", CV_r_ShadowsMaskResolution, 0, VF_NULL,
-        "0=per pixel shadow mask\n"
-        "1=horizontal half resolution shadow mask\n"
-        "2=horizontal and vertical half resolution shadow mask\n"
-        "Usage: r_ShadowsMaskResolution [0/1/2]");
-    DefineConstIntCVar3("r_ShadowsMaskDownScale", CV_r_ShadowsMaskDownScale, 0, VF_NULL,
-        "Saves video memory by using lower resolution for shadow masks except first one\n"
-        "0=per pixel shadow mask\n"
-        "1=half resolution shadow mask\n"
-        "Usage: r_ShadowsMaskDownScale [0/1]");
-    REGISTER_CVAR3("r_CBufferUseNativeDepth", CV_r_CBufferUseNativeDepth,   CBUFFER_NATIVE_DEPTH_DEAFULT_VAL, VF_NULL,
-        "1= enable, 0 = disable\n"
-        "Usage: r_CBufferUseNativeDepth [0/1]");
-    DefineConstIntCVar3("r_ShadowsStencilPrePass", CV_r_ShadowsStencilPrePass, 1, VF_NULL,
-        "1=Use Stencil pre-pass for shadows\n"
-        "Usage: r_ShadowsStencilPrePass [0/1]");
-    REGISTER_CVAR3("r_ShadowsDepthBoundNV", CV_r_ShadowsDepthBoundNV, 0, VF_NULL,
-        "1=use NV Depth Bound extension\n"
-        "Usage: r_ShadowsDepthBoundNV [0/1]");
-    REGISTER_CVAR3("r_ShadowsPCFiltering", CV_r_ShadowsPCFiltering, 1, VF_NULL,
-        "1=use PCF for shadows\n"
-        "Usage: r_ShadowsPCFiltering [0/1]");
-    REGISTER_CVAR3_CB("r_ShadowJittering", CV_r_shadow_jittering, 3.4f, VF_NULL,
-        "Shadow map jittering radius.\n"
-        "In PC the only use of this cvar is to instantly see the effects of diferent jittering values,\n"
-        "because any value set here will be overwritten by ToD animation (only in PC) as soon as ToD changes.\n"
-        "Usage: r_ShadowJittering [0=off]", OnChangeShadowJitteringCVar);
-    SetShadowJittering(CV_r_shadow_jittering);   // need to do this because the registering process can modify the default value (getting it from the .cfg) and will not notify the call back
-    DefineConstIntCVar3("r_DebugLights", CV_r_debuglights, 0, VF_CHEAT,
-        "Display dynamic lights for debugging.\n"
-        "Usage: r_DebugLights [0/1/2/3]\n"
-        "Default is 0 (off). Set to 1 to display centers of light sources,\n"
-        "or set to 2 to display light centers and attenuation spheres, 3 to get light properties to the screen");
-    DefineConstIntCVar3("r_ShadowsGridAligned", CV_r_ShadowsGridAligned, 1, VF_DUMPTODISK,
-        "Selects algorithm to use for shadow mask generation:\n"
-        "0 - Disable shadows snapping\n"
-        "1 - Enable shadows snapping");
-    DefineConstIntCVar3("r_ShadowPass", CV_r_ShadowPass, 1, VF_NULL,
-        "Process shadow pass");
-    DefineConstIntCVar3("r_ShadowGen", CV_r_ShadowGen, 1, VF_NULL,
-        "0=disable shadow map updates, 1=enable shadow map updates");
-    DefineConstIntCVar3("r_ShadowPoolMaxFrames", CV_r_ShadowPoolMaxFrames, 30, VF_NULL,
-        "Maximum number of frames a shadow can exist in the pool");
-    REGISTER_CVAR3("r_ShadowPoolMaxTimeslicedUpdatesPerFrame", CV_r_ShadowPoolMaxTimeslicedUpdatesPerFrame, 1, VF_NULL,
-        "Max number of time sliced shadow pool updates allowed per frame");
-    REGISTER_CVAR3("r_ShadowCastingLightsMaxCount", CV_r_ShadowCastingLightsMaxCount, 32, VF_REQUIRE_APP_RESTART,
-        "Maximum number of simultaneously visible shadow casting lights");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_17
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-
-    REGISTER_CVAR3_CB("r_HeightMapAO", CV_r_HeightMapAO, 1, VF_NULL,
-        "Large Scale Ambient Occlusion based on height map approximation of the scene\n"
-        "0=off, 1=quarter resolution, 2=half resolution, 3=full resolution",
-        OnChange_CachedShadows);
-    REGISTER_CVAR3("r_HeightMapAOAmount", CV_r_HeightMapAOAmount, 1.0f, VF_NULL,
-        "Height Map Ambient Occlusion Amount");
-    REGISTER_CVAR3_CB("r_HeightMapAOResolution", CV_r_HeightMapAOResolution, 2048, VF_NULL,
-        "Texture resolution of the height map used for HeightMapAO", OnChange_CachedShadows);
-    REGISTER_CVAR3_CB("r_HeightMapAORange", CV_r_HeightMapAORange, 1000.f, VF_NULL,
-        "Range of height map AO around viewer in meters", OnChange_CachedShadows);
-
-    REGISTER_CVAR3("r_RenderMeshHashGridUnitSize", CV_r_RenderMeshHashGridUnitSize, .5f, VF_NULL, "Controls density of render mesh triangle indexing structures");
-
-    DefineConstIntCVar3("r_TerrainAO", CV_r_TerrainAO, 7, 0, "7=Activate terrain AO deferred passes");
-    DefineConstIntCVar3("r_TerrainAO_FadeDist", CV_r_TerrainAO_FadeDist, 8, 0, "Controls sky light fading in tree canopy in Z direction");
-
-    DefineConstIntCVar3("r_LightsSinglePass", CV_r_lightssinglepass, 1, VF_NULL, "");
-
-    DefineConstIntCVar3("r_ShowDynTextures", CV_r_showdyntextures, 0, VF_NULL,
-        "Display a dyn. textures, filtered by r_ShowDynTexturesFilter\n"
-        "Usage: r_ShowDynTextures 0/1/2\n"
-        "Default is 0. Set to 1 to show all dynamic textures or 2 to display only the ones used in this frame\n"
-        "Textures are sorted by memory usage");
-
-    REGISTER_CVAR3("r_ShowDynTexturesMaxCount", CV_r_ShowDynTexturesMaxCount, 36, VF_NULL,
-        "Allows to adjust number of textures shown on the screen\n"
-        "Usage: r_ShowDynTexturesMaxCount [1...36]\n"
-        "Default is 36");
-
-    CV_r_ShowDynTexturesFilter = REGISTER_STRING("r_ShowDynTexturesFilter", "*", VF_NULL,
-            "Usage: r_ShowDynTexturesFilter *end\n"
-            "Usage: r_ShowDynTexturesFilter *mid*\n"
-            "Usage: r_ShowDynTexturesFilter start*\n"
-            "Default is *. Set to 'pattern' to show only specific textures (activate r_ShowDynTextures)");
-
-    CV_r_ShaderCompilerServer = REGISTER_STRING("r_ShaderCompilerServer", "127.0.0.1", VF_NULL,
-            "Usage: r_ShaderCompilerServer 127.0.0.1 \n"
-            "Default is 127.0.0.1 ");
-
-    {
-        const SFileVersion& ver = gEnv->pSystem->GetFileVersion();
-
-        char versionString[128];
-        memset(versionString, 0, sizeof(versionString));
-        azsprintf(versionString, "Build Version: %d.%d.%d.%d", ver.v[3], ver.v[2], ver.v[1], ver.v[0]);
-
-        CV_r_ShaderEmailTags = REGISTER_STRING("r_ShaderEmailTags", versionString, VF_NULL,
-                "Adds optional tags to shader error emails e.g. own name or build run\n"
-                "Usage: r_ShaderEmailTags \"some set of tags or text\" \n"
-                "Default is build version ");
-    }
-
-    {
-        CV_r_ShaderEmailCCs = REGISTER_STRING("r_ShaderEmailCCs", "", VF_NULL,
-                "Adds optional CC addresses to shader error emails\n"
-                "Usage: r_ShaderEmailCCs \"email1@your_domain.com;email2@your_domain.com\" \n"
-                "Default is empty ");
-    }
-
-    REGISTER_CVAR3("r_ShaderCompilerPort", CV_r_ShaderCompilerPort, 61453, VF_NULL,
-        "set user defined port of the shader compile server.\n"
-        "Usage: r_ShaderCompilerPort 61453 #\n"
-        "Default is 61453");
-
-    REGISTER_CVAR3("r_ShaderCompilerDontCache", CV_r_ShaderCompilerDontCache, 0, VF_NULL,
-        "Disables caching on server side.\n"
-        "Usage: r_ShaderCompilerDontCache 0 #\n"
-        "Default is 0");
-
-    REGISTER_CVAR3("r_RC_AutoInvoke", CV_r_rc_autoinvoke, (gEnv->pSystem->IsDevMode() ? 1 : 0), VF_NULL,
-        "Enable calling the resource compiler (rc.exe) to compile assets at run-time if the date check\n"
-        "shows that the destination is older or does not exist.\n"
-        "Usage: r_RC_AutoInvoke 0 (default is 1)");
-
-    REGISTER_CVAR3("r_dofMinZ", CV_r_dofMinZ, 0.0f, VF_NULL,
-        "Set dof min z distance, anything behind this distance will get out focus. (good default value 0.4) \n");
-
-    REGISTER_CVAR3("r_dofMinZScale", CV_r_dofMinZScale, 0.0f, VF_NULL,
-        "Set dof min z out of focus strenght (good default value - 1.0f)\n");
-
-    REGISTER_CVAR3("r_dofMinZBlendMult", CV_r_dofMinZBlendMult, 1.0f, VF_NULL,
-        "Set dof min z blend multiplier (bigger value means faster blendind transition)\n");
-
-    REGISTER_CVAR3("r_Refraction", CV_r_Refraction, 1, VF_NULL,
-        "Enables refraction.\n"
-        "Usage: r_Refraction [0/1]\n"
-        "Default is 1 (on). Set to 0 to disable.");
-
-    REGISTER_CVAR3_CB("r_sunshafts", CV_r_sunshafts, SUNSHAFTS_DEFAULT_VAL, VF_NULL,
-        "Enables sun shafts.\n"
-        "Usage: r_sunshafts [0/1/2]\n"
-        "Usage: r_sunshafts = 2: enabled with occlusion\n"
-        "Default is 1 (on). Set to 0 to disable.",
-        OnChange_CV_r_SunShafts);
-
-    REGISTER_CVAR3_CB("r_PostProcessEffects", CV_r_PostProcess_CB, 1, VF_NULL,
-        "Enables post processing special effects.\n"
-        "Usage: r_PostProcessEffects [0/1/2]\n"
-        "Default is 1 (enabled). 2 enables and displays active effects",
-        OnChange_CV_r_PostProcess);
-    CV_r_PostProcess = CV_r_PostProcess_CB;
-
-    DefineConstIntCVar3("r_PostProcessFilters", CV_r_PostProcessFilters, 1, VF_CHEAT,
-        "Enables post processing special effects filters.\n"
-        "Usage: r_PostProcessEffectsFilters [0/1]\n"
-        "Default is 1 (enabled). 0 disabled");
-
-    DefineConstIntCVar3("r_PostProcessGameFx", CV_r_PostProcessGameFx, 1, VF_CHEAT,
-        "Enables post processing special effects game fx.\n"
-        "Usage: r_PostProcessEffectsGameFx [0/1]\n"
-        "Default is 1 (enabled). 0 disabled");
-
-    REGISTER_CVAR3("r_PostProcessReset", CV_r_PostProcessReset, 0, VF_CHEAT,
-        "Enables post processing special effects reset.\n"
-        "Usage: r_PostProcessEffectsReset [0/1]\n"
-        "Default is 0 (disabled). 1 enabled");
-
-
-    DefineConstIntCVar3("r_MergeShadowDrawcalls", CV_r_MergeShadowDrawcalls, 1, VF_NULL,
-        "Enabled Merging of RenderChunks for ShadowRendering\n"
-        "Default is 1 (enabled). 0 disabled");
-
-    REGISTER_CVAR3("r_ColorRangeCompression", CV_r_colorRangeCompression, 0, VF_NULL,
-        "Enables color range compression to account for the limited RGB range of TVs.\n"
-        "  0: Disabled (full extended range)\n"
-        "  1: Range 16-235\n");
-
-    REGISTER_CVAR3("r_ColorGrading", CV_r_colorgrading, COLOR_GRADING_DEFAULT_VAL, VF_NULL,
-        "Enables color grading.\n"
-        "Usage: r_ColorGrading [0/1]");
-
-    REGISTER_CVAR3("r_ColorGradingSelectiveColor", CV_r_colorgrading_selectivecolor, 1, VF_NULL,
-        "Enables color grading.\n"
-        "Usage: r_ColorGradingSelectiveColor [0/1]");
-
-    DefineConstIntCVar3("r_ColorGradingLevels", CV_r_colorgrading_levels, 1, VF_NULL,
-        "Enables color grading.\n"
-        "Usage: r_ColorGradingLevels [0/1]");
-
-    DefineConstIntCVar3("r_ColorGradingFilters", CV_r_colorgrading_filters, 1, VF_NULL,
-        "Enables color grading.\n"
-        "Usage: r_ColorGradingFilters [0/1]");
-
-    REGISTER_CVAR3("r_ColorGradingCharts", CV_r_colorgrading_charts, 1, VF_NULL,
-        "Enables color grading via color charts.\n"
-        "Usage: r_ColorGradingCharts [0/1]");
-
-    REGISTER_CVAR3("r_ColorGradingChartsCache", CV_r_ColorgradingChartsCache, 4, VF_CVARGRP_IGNOREINREALVAL, // Needs to be ignored from cvar group state otherwise some adv graphic options will show as custom when using multi GPU due to mgpu.cfg being reloaded after changing syspec and graphic options have changed
-        "Enables color grading charts update caching.\n"
-        "Usage: r_ColorGradingCharts [0/1/2/etc]\n"
-        "Default is 4 (update every 4 frames), 0 - always update, 1- update every other frame");
-
-    DefineConstIntCVar3("r_CloudsUpdateAlways", CV_r_cloudsupdatealways, 0, VF_NULL,
-        "Toggles updating of clouds each frame.\n"
-        "Usage: r_CloudsUpdateAlways [0/1]\n"
-        "Default is 0 (off)");
-    DefineConstIntCVar3("r_CloudsDebug", CV_r_cloudsdebug, 0, VF_NULL,
-        "Toggles debugging mode for clouds."
-        "Usage: r_CloudsDebug [0/1/2]\n"
-        "Usage: r_CloudsDebug = 1: render just screen imposters\n"
-        "Usage: r_CloudsDebug = 2: render just non-screen imposters\n"
-        "Default is 0 (off)");
-
-    REGISTER_CVAR3("r_DynTexMaxSize", CV_r_dyntexmaxsize, 48, VF_NULL, ""); // 48 Mb
-    DefineConstIntCVar3("r_TexPreallocateAtlases", CV_r_texpreallocateatlases, TEXPREALLOCATLAS_DEFAULT_VAL, VF_NULL, "");
-    REGISTER_CVAR3("r_TexAtlasSize", CV_r_texatlassize, 1024, VF_NULL, ""); // 1024x1024
-
-    DefineConstIntCVar3("r_TexPostponeLoading", CV_r_texpostponeloading, 1, VF_NULL, "");
-    REGISTER_CVAR3("r_DynTexAtlasCloudsMaxSize", CV_r_dyntexatlascloudsmaxsize, 32, VF_NULL, ""); // 32 Mb
-
-    const int defaultbuffer_bank_size = 4;
-    const int default_transient_bank_size = 4;
-    const int default_cb_bank_size = 4;
-    const int defaultt_cb_watermark = 64;
-    const int defaultbuffer_pool_max_allocs = 0xfff0;
-    const int defaultbuffer_pool_defrag = 0;
-
-    REGISTER_CVAR3("r_buffer_banksize", CV_r_buffer_banksize, defaultbuffer_bank_size, VF_CHEAT, "the bank size in MB for buffer pooling");
-    REGISTER_CVAR3("r_constantbuffer_banksize", CV_r_constantbuffer_banksize, default_cb_bank_size, VF_CHEAT, "the bank size in MB for constant buffers pooling");
-    REGISTER_CVAR3("r_constantbuffer_watermarm", CV_r_constantbuffer_watermark, defaultt_cb_watermark, VF_CHEAT, "the threshold aftyer which constants buffers will reclaim memory");
-    REGISTER_CVAR3("r_buffer_sli_workaround", CV_r_buffer_sli_workaround, 0, VF_NULL, "enable SLI workaround for buffer pooling");
-    REGISTER_CVAR3("r_transient_pool_size", CV_r_transient_pool_size, default_transient_bank_size, VF_CHEAT, "the bank size in MB for the transient pool");
-    DefineConstIntCVar3("r_buffer_enable_lockless_updates", CV_r_buffer_enable_lockless_updates, 1, VF_CHEAT, "enable/disable lockless buffer updates on platforms that support them");
-    DefineConstIntCVar3("r_enable_full_gpu_sync", CV_r_enable_full_gpu_sync, 0, VF_CHEAT, "enable full gpu synchronization for debugging purposes on the every buffer I/O operation (debugging only)");
-    REGISTER_CVAR3("r_buffer_pool_max_allocs", CV_r_buffer_pool_max_allocs, defaultbuffer_pool_max_allocs, VF_CHEAT, "the maximum number of allocations per buffer pool if defragmentation is enabled");
-    REGISTER_CVAR3("r_buffer_pool_defrag_static", CV_r_buffer_pool_defrag_static, defaultbuffer_pool_defrag, VF_CHEAT, "enable/disable runtime defragmentation of static buffers");
-    REGISTER_CVAR3("r_buffer_pool_defrag_dynamic", CV_r_buffer_pool_defrag_dynamic, defaultbuffer_pool_defrag, VF_CHEAT, "enable/disable runtime defragmentation of dynamic buffers");
-    REGISTER_CVAR3("r_buffer_pool_defrag_max_moves", CV_r_buffer_pool_defrag_max_moves, 64, VF_CHEAT, "maximum number of moves the defragmentation system is allowed to perform per frame");
-
-    REGISTER_CVAR3("r_TexMinAnisotropy", CV_r_texminanisotropy, 0, VF_REQUIRE_LEVEL_RELOAD,
-        "Specifies the minimum level allowed for anisotropic texture filtering.\n"
-        "0(default) means abiding by the filtering setting in each material, except possibly being capped by r_TexMaxAnisotropy.");
-    REGISTER_CVAR3("r_TexMaxAnisotropy", CV_r_texmaxanisotropy, TEXMAXANISOTROPY_DEFAULT_VAL, VF_REQUIRE_LEVEL_RELOAD,
-        "Specifies the maximum level allowed for anisotropic texture filtering.");
-    DefineConstIntCVar3("r_TexNoAnisoAlphaTest", CV_r_texNoAnisoAlphaTest, TEXNOANISOALPHATEST_DEFAULT_VAL, VF_DUMPTODISK,
-        "Disables anisotropic filtering on alpha-tested geometry like vegetation.\n");
-    DefineConstIntCVar3("r_TexLog", CV_r_texlog, 0, VF_NULL,
-        "Configures texture information logging.\n"
-        "Usage: r_TexLog #\n"
-        "where # represents:\n"
-        " 0: Texture logging off\n"
-        " 1: Texture information logged to screen\n"
-        " 2: All loaded textures logged to 'UsedTextures.txt'\n"
-        " 3: Missing textures logged to 'MissingTextures.txt");
-    DefineConstIntCVar3("r_TexNoLoad", CV_r_texnoload, 0, VF_NULL,
-        "Disables loading of textures.\n"
-        "Usage: r_TexNoLoad [0/1]\n"
-        "When 1 texture loading is disabled.");
-    DefineConstIntCVar3("r_TexBlockOnLoad", CV_r_texBlockOnLoad, 0, VF_NULL,
-        "When loading a texture, block until resource compiler has finished compiling it.\n"
-        "Usage: r_TexBlockOnLoad [0/1]\n"
-        "When 1 renderer will block and wait on the resource compiler.");
-
-    REGISTER_CVAR3("r_RenderTargetPoolSize", CV_r_rendertargetpoolsize, 0, VF_NULL,
-        "Size of pool for render targets in MB.\n"
-        "Default is 50(MB).");
-
-    REGISTER_CVAR3("r_texturesskiplowermips", CV_r_texturesskiplowermips, 0, VF_NULL,
-        "Enabled skipping lower mips for deprecated platform.\n");
-
-    int nDefaultTexPoolSize = 512;
-
-    REGISTER_CVAR3("r_TexturesStreamPoolSize", CV_r_TexturesStreamPoolSize, nDefaultTexPoolSize, VF_NULL,
-        "Size of texture streaming pool in MB.\n");
-
-    REGISTER_CVAR3("r_TexturesStreamPoolSecondarySize", CV_r_TexturesStreamPoolSecondarySize, 0, VF_NULL,
-        "Size of secondary pool for textures in MB.");
-
-    REGISTER_CVAR3("r_TexturesStreamingSync", CV_r_texturesstreamingsync, 0, VF_RENDERER_CVAR,
-        "Force only synchronous texture streaming.\n"
-        "All textures will be streamed in the main thread. Useful for debug purposes.\n"
-        "Usage: r_TexturesStreamingSync [0/1]\n"
-        "Default is 0 (off).");
-    DefineConstIntCVar3("r_TexturesStreamingResidencyEnabled", CV_r_texturesstreamingResidencyEnabled, 1, VF_NULL,
-        "Toggle for resident textures streaming support.\n"
-        "Usage: r_TexturesStreamingResidencyEnabled [toggle]"
-        "Default is 0, 1 for enabled");
-    REGISTER_CVAR3("r_TexturesStreamingResidencyTimeTestLimit", CV_r_texturesstreamingResidencyTimeTestLimit, 5.0f, VF_NULL,
-        "Time limit to use for mip thrashing calculation in seconds.\n"
-        "Usage: r_TexturesStreamingResidencyTimeTestLimit [time]"
-        "Default is 5 seconds");
-    REGISTER_CVAR3("r_TexturesStreamingResidencyTime", CV_r_texturesstreamingResidencyTime, 10.0f, VF_NULL,
-        "Time to keep textures resident for before allowing them to be removed from memory.\n"
-        "Usage: r_TexturesStreamingResidencyTime [Time]\n"
-        "Default is 10 seconds");
-    REGISTER_CVAR3("r_TexturesStreamingResidencyThrottle", CV_r_texturesstreamingResidencyThrottle, 0.5f, VF_NULL,
-        "Ratio for textures to become resident.\n"
-        "Usage: r_TexturesStreamingResidencyThrottle [ratio]"
-        "Default is 0.5"
-        "Max is 1.0 means textures will become resident sooner, Min 0.0 means textures will not become resident");
-    REGISTER_CVAR3("r_TexturesStreamingMaxRequestedMB", CV_r_TexturesStreamingMaxRequestedMB, 2.f, VF_NULL,
-        "Maximum amount of texture data requested from streaming system in MB.\n"
-        "Usage: r_TexturesStreamingMaxRequestedMB [size]\n"
-        "Default is 2.0(MB)");
-
-    DefineConstIntCVar3("r_TexturesStreamingPostponeMips", CV_r_texturesstreamingPostponeMips, 0, VF_NULL,
-        "Postpone loading of high res mipmaps to improve resolution ballance of texture streaming.\n"
-        "Usage: r_TexturesStreamingPostponeMips [0/1]\n"
-        "Default is 1 (on).");
-
-    DefineConstIntCVar3("r_TexturesStreamingPostponeThresholdKB", CV_r_texturesstreamingPostponeThresholdKB, 1024, VF_NULL,
-        "Threshold used to postpone high resolution mipmap loads in KB.\n"
-        "Usage: r_TexturesStreamingPostponeThresholdKB [size]\n"
-        "Default is 1024(KB)");
-    DefineConstIntCVar3("r_texturesstreamingPostponeThresholdMip", CV_r_texturesstreamingPostponeThresholdMip, 1, VF_NULL,
-        "Threshold used to postpone high resolution mipmaps.\n"
-        "Usage: r_texturesstreamingPostponeThresholdMip [count]\n"
-        "Default is 1");
-    DefineConstIntCVar3("r_TexturesStreamingMinReadSizeKB", CV_r_texturesstreamingMinReadSizeKB, 64, VF_NULL,
-        "Minimal read portion in KB.\n"
-        "Usage: r_TexturesStreamingMinReadSizeKB [size]\n"
-        "Default is 32(KB)");
-    REGISTER_CVAR3("r_texturesstreamingSkipMips", CV_r_texturesstreamingSkipMips, 0, VF_NULL,
-        "Number of top mips to ignore when streaming.\n");
-    REGISTER_CVAR3("r_texturesstreamingMinUsableMips", CV_r_texturesstreamingMinUsableMips, 7, VF_NULL,
-        "Minimum number of mips a texture should be able to use after applying r_texturesstreamingSkipMips.\n");
-    REGISTER_CVAR3("r_texturesstreamingJobUpdate", CV_r_texturesstreamingJobUpdate, 1, VF_NULL,
-        "Enable texture streaming update job");
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    REGISTER_CVAR3("r_texturesstreamingDeferred", CV_r_texturesstreamingDeferred, 1, VF_NULL,
-        "When enabled textures will be uploaded through a deferred context.\n");
-#endif
-#if defined(SUPPORTS_INPLACE_TEXTURE_STREAMING)
-    REGISTER_CVAR3("r_texturesstreamingInPlace", CV_r_texturesstreamingInPlace, 1, VF_NULL,
-        "When enabled textures will stream directly into video memory.\n");
-#endif
-    REGISTER_CVAR3("r_TexturesStreamingMaxRequestedJobs", CV_r_TexturesStreamingMaxRequestedJobs, 32, VF_NULL,
-        "Maximum number of tasks submitted to streaming system.\n"
-        "Usage: r_TexturesStreamingMaxRequestedJobs [jobs number]\n"
-        "Default is 32 jobs");
-    DefineConstIntCVar3("r_TexturesStreamingUpdateType", CV_r_texturesstreamingUpdateType, TEXSTREAMING_UPDATETYPE_DEFAULT_VAL, VF_NULL,
-        "Texture streaming update type.\n"
-        "Default is 0");
-    DefineConstIntCVar3("r_TexturesStreamingPrecacheRounds", CV_r_texturesstreamingPrecacheRounds, 1, VF_NULL,
-        "Number of precache rounds to include in active streamed texture lists.\n"
-        "Default is 1");
-    DefineConstIntCVar3("r_TexturesStreamingSuppress", CV_r_texturesstreamingSuppress, 0, VF_NULL,
-        "Force unloading of all textures and suppress new stream tasks.\n"
-        "Default is 0");
-    REGISTER_CVAR3("r_TexturesStreamingMipBias", CV_r_TexturesStreamingMipBias, 0, VF_NULL,
-        "Controls how texture LOD depends from distance to the objects.\n"
-        "Increasing this value will reduce amount of memory required for textures.\n"
-        "Usage: r_TexturesStreamingMipBias [-4..0..4]\n"
-        "Default is 0.");
-    REGISTER_CVAR3("r_TexturesStreamingMipClampDVD", CV_r_TexturesStreamingMipClampDVD, 1, VF_NULL,
-        "Clamp the texture mip level to certain value when streaming from DVD. 1 will never allow highest mips to be loaded for example.\n"
-        "Usage: r_TexturesStreamingMipClampDVD [0..4]\n"
-        "Default is 1.");
-    REGISTER_CVAR3("r_TexturesStreamingDisableNoStreamDuringLoad", CV_r_TexturesStreamingDisableNoStreamDuringLoad, 0, VF_NULL,
-        "Load time optimisation. When enabled, textures flagged as non-streaming will still be streamed during level load, but will have a "
-        "high priority stream request added in RT_Precache. Once streamed in, the texture will remain resident\n");
-    DefineConstIntCVar3("r_TexturesStreamingMipFading", CV_r_texturesstreamingmipfading, 1, VF_NULL,
-        "Controls how the new texture MIP appears after being streamed in.\n"
-        "This variable influences only a visual quality of appearing texture details.\n"
-        "Usage: r_TexturesStreamingMipFading [0/1]\n"
-        "Default is 1 (enabled).");
-    DefineConstIntCVar3("r_TexturesStreamingNoUpload", CV_r_texturesstreamingnoupload, 0, VF_NULL,
-        "Disable uploading data into texture from system memory. Useful for debug purposes.\n"
-        "Usage: r_TexturesStreamingNoUpload [0/1]\n"
-        "Default is 0 (off).");
-    DefineConstIntCVar3("r_TexturesStreamingOnlyVideo", CV_r_texturesstreamingonlyvideo, 0, VF_NULL,
-        "Don't store system memory copy of texture. Applicable only for PC.\n"
-        "Usage: r_TexturesStreamingOnlyVideo [0/1]\n"
-        "Default is 0 (off).");
-
-    DefineConstIntCVar3("r_TexturesDebugBandwidth", CV_r_TexturesDebugBandwidth, 0, VF_CHEAT,
-        "Replaces all material textures with a small white texture to debug texture bandwidth utilization\n");
-
-    DefineConstIntCVar3("r_TexturesStreaming", CV_r_texturesstreaming, TEXSTREAMING_DEFAULT_VAL, VF_REQUIRE_APP_RESTART,
-        "Enables direct streaming of textures from disk during game.\n"
-        "Usage: r_TexturesStreaming [0/1/2]\n"
-        "Default is 0 (off). All textures save in native format with mips in a\n"
-        "cache file. Textures are then loaded into texture memory from the cache.");
-
-    DefineConstIntCVar3("r_TexturesStreamingDebug", CV_r_TexturesStreamingDebug, 0, VF_CHEAT,
-        "Enables textures streaming debug mode. (Log uploads and remove unnecessary mip levels)\n"
-        "Usage: r_TexturesStreamingDebug [0/1/2]\n"
-        "Default is 0 (off)."
-        "1 - texture streaming log."
-        "2 - Show textures hit-parade based on streaming priorities"
-        "3 - Show textures hit-parade based on the memory consumed");
-    CV_r_TexturesStreamingDebugfilter = REGISTER_STRING("r_TexturesStreamingDebugFilter", "", VF_CHEAT, "Filters displayed textures by name in texture streaming debug mode\n");
-    REGISTER_CVAR3("r_TexturesStreamingDebugMinSize", CV_r_TexturesStreamingDebugMinSize, 100, VF_NULL,
-        "Filters displayed textures by size in texture streaming debug mode");
-    REGISTER_CVAR3("r_TexturesStreamingDebugMinMip", CV_r_TexturesStreamingDebugMinMip, 100, VF_NULL,
-        "Filters displayed textures by loaded mip in texture streaming debug mode");
-    DefineConstIntCVar3("r_TexturesStreamingDebugDumpIntoLog", CV_r_TexturesStreamingDebugDumpIntoLog, 0, VF_NULL,
-        "Dump content of current texture streaming debug screen into log");
-    REGISTER_CVAR3("r_TextureLodDistanceRatio", CV_r_TextureLodDistanceRatio, -1, VF_NULL,
-        "Controls dynamic LOD system for textures used in materials.\n"
-        "Usage: r_TextureLodDistanceRatio [-1, 0 and bigger]\n"
-        "Default is -1 (completely off). Value 0 will set full LOD to all textures used in frame.\n"
-        "Values bigger than 0 will activate texture LOD selection depending on distance to the objects.");
-
-    DefineConstIntCVar3("r_TextureCompiling", CV_r_texturecompiling, 1, VF_NULL,
-        "Enables Run-time compilation and subsequent injection of changed textures from disk during editing.\n"
-        "Usage: r_TextureCompiling [0/1]\n"
-        "Default is 1 (on). Changes are tracked and passed through to the rendering.\n"
-        "Compilation can also be muted by the r_RC_AutoInvoke config.");
-    DefineConstIntCVar3("r_TextureCompilingIndicator", CV_r_texturecompilingIndicator, 0, VF_NULL,
-        "Replaces the textures which are currently compiled by a violet indicator-texture.\n"
-        "Usage: r_TextureCompilingIndicator [-1/0/1]\n"
-        "Default is 0 (off). Textures are silently replaced by their updated versions without any indication.\n"
-        "Negative values will also stop show indicators for compilation errors.\n"
-        "Positive values will show indicators whenever a texture is subject to imminent changes.\n");
-
-#ifndef STRIP_RENDER_THREAD
-    DefineConstIntCVar3("r_MultiThreaded", CV_r_multithreaded, MULTITHREADED_DEFAULT_VAL, VF_NULL,
-        "0=disabled, 1=enabling rendering in separate thread,\n"
-        "2(default)=automatic detection\n"
-        "should be activated before rendering");
-#endif
-    DefineConstIntCVar3("r_MultiThreadedDrawing", CV_r_multithreadedDrawing, 0, VF_NULL,
-        "  0=disabled,\n"
-        "  N=number of concurrent draw recording jobs,\n"
-        " -1=Number is as large as the number of available worker threads");
-    DefineConstIntCVar3("r_MultiThreadedDrawingActiveThreshold", CV_r_multithreadedDrawingActiveThreshold, 0, VF_NULL,
-        "  0=disabled,\n"
-        "  N=minimum number of draws per job,\n"
-        "If there are not enough draws for all jobs it will dial down the number of jobs.");
-    REGISTER_CVAR3("r_MultiGPU", CV_r_multigpu, 1, VF_NULL,
-        "Toggles MGPU support. Should usually be set before startup.\n"
-        "  0: force off\n"
-        "  1: automatic detection (reliable with SLI, does not respect driver app profiles with Crossfire)\n");
-
-    DefineConstIntCVar3("r_ShowNormals", CV_r_shownormals, 0, VF_CHEAT,
-        "Toggles visibility of normal vectors.\n"
-        "Usage: r_ShowNormals [0/1]"
-        "Default is 0 (off).");
-    DefineConstIntCVar3("r_ShowLines", CV_r_showlines, 0, VF_CHEAT,
-        "Toggles visibility of wireframe overlay.\n"
-        "Usage: r_ShowLines [0/1]\n"
-        "Default is 0 (off).");
-    REGISTER_CVAR3("r_NormalsLength", CV_r_normalslength, 0.2f, VF_CHEAT,
-        "Sets the length of displayed vectors.\n"
-        "r_NormalsLength 0.2\n"
-        "Default is 0.2 (meters). Used with r_ShowTangents and r_ShowNormals.");
-    DefineConstIntCVar3("r_ShowTangents", CV_r_showtangents, 0, VF_CHEAT,
-        "Toggles visibility of three tangent space vectors.\n"
-        "Usage: r_ShowTangents [0/1]\n"
-        "Default is 0 (off).");
-    DefineConstIntCVar3("r_ShowTimeGraph", CV_r_showtimegraph, 0, VF_NULL,
-        "Configures graphic display of frame-times.\n"
-        "Usage: r_ShowTimeGraph [0/1/2]\n"
-        "\t1: Graph displayed as points."
-        "\t2: Graph displayed as lines."
-        "Default is 0 (off).");
-#ifndef EXCLUDE_DOCUMENTATION_PURPOSE
-    DefineConstIntCVar3("r_DebugFontRendering", CV_r_DebugFontRendering, 0, VF_CHEAT,
-        "0=off, 1=display various features of the font rendering to verify function and to document usage");
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-    DefineConstIntCVar3("profileStreaming", CV_profileStreaming, 0, VF_NULL,
-        "Profiles streaming of different assets.\n"
-        "Usage: profileStreaming [0/1/2]\n"
-        "\t1: Graph displayed as points."
-        "\t2: Graph displayed as lines."
-        "Default is 0 (off).");
-    DefineConstIntCVar3("r_GraphStyle", CV_r_graphstyle, 0, VF_NULL, "");
-    DefineConstIntCVar3("r_ShowBufferUsage", CV_r_showbufferusage, 0, VF_NULL,
-        "Shows usage of statically allocated buffers.\n"
-        "Usage: r_ShowBufferUSage [0/1]\n"
-        "Default is 0 (off).");
-    REGISTER_CVAR3_CB("r_LogVBuffers", CV_r_logVBuffers, 0, VF_CHEAT | VF_CONST_CVAR,
-        "Logs vertex buffers in memory to 'LogVBuffers.txt'.\n"
-        "Usage: r_LogVBuffers [0/1]\n"
-        "Default is 0 (off).",
-        GetLogVBuffersStatic);
-    DefineConstIntCVar3("r_LogTexStreaming", CV_r_logTexStreaming, 0, VF_CHEAT,
-        "Logs streaming info to Direct3DLogStreaming.txt\n"
-        "0: off\n"
-        "1: normal\n"
-        "2: extended");
-    DefineConstIntCVar3("r_LogShaders", CV_r_logShaders, 0, VF_CHEAT,
-        "Logs shaders info to Direct3DLogShaders.txt\n"
-        "0: off\n"
-        "1: normal\n"
-        "2: extended");
-
-#if defined(WIN32) || defined(WIN64)
-    const int r_flush_default = 0;
-#else
-    const int r_flush_default = 1;  // TODO: Check if r_flush should be disabled on other platforms as well
-#endif
-    REGISTER_CVAR3("r_Flush", CV_r_flush, r_flush_default, VF_NULL, "");
-
-    REGISTER_CVAR3("r_minimizeLatency", CV_r_minimizeLatency, 0, VF_REQUIRE_APP_RESTART,
-        "Initializes and drives renderer to minimize display latency as much as possible.\n"
-        "As such only a double buffer swap chain will be created.\n"
-        "Maximum frame latency will be set to 1 on DXGI-supporting platforms\n"
-        "as well as frames flushed after Present() if r_Flush is enabled.");
-
-    DefineConstIntCVar3("r_ShadersDebug", CV_r_shadersdebug, 0, VF_DUMPTODISK,
-        "Enable special logging when shaders become compiled\n"
-        "Usage: r_ShadersDebug [0/1/2/3/4]\n"
-        " 1 = assembly into directory Main/{Game}/shaders/cache/d3d9\n"
-        " 2 = compiler input into directory Main/{Game}/testcg\n"
-        " 3 = compiler input with debug information (useful for PIX etc./{Game}/testcg_1pass\n"
-        " 4 = compiler input with debug information, but optimized shaders\n"
-        "Default is 0 (off)");
-
-#if !defined(CONSOLE)
-    REGISTER_CVAR3("r_ShadersOrbis", CV_r_shadersorbis, 0, VF_NULL, "");
-    REGISTER_CVAR3("r_ShadersDX11", CV_r_shadersdx11, 0, VF_NULL, "");
-    REGISTER_CVAR3("r_ShadersGL4", CV_r_shadersGL4, 0, VF_NULL, "");
-    REGISTER_CVAR3("r_ShadersGLES3", CV_r_shadersGLES3, 0, VF_NULL, "");
-    REGISTER_CVAR3("r_ShadersMETAL", CV_r_shadersMETAL, 0, VF_NULL, "");
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_15
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-    REGISTER_CVAR3("r_ShadersPlatform", CV_r_shadersPlatform, static_cast<int>(AZ::PlatformID::PLATFORM_MAX), VF_NULL, "");
-#endif
-
-    DefineConstIntCVar3("r_ShadersIgnoreIncludesChanging", CV_r_shadersignoreincludeschanging, 0, VF_NULL, "");
-    DefineConstIntCVar3("r_ShadersLazyUnload", CV_r_shaderslazyunload, 0, VF_NULL, "");
-
-    REGISTER_CVAR3("r_ShadersPreactivate", CV_r_shaderspreactivate, SHADERS_PREACTIVATE_DEFAULT_VAL, VF_DUMPTODISK, "");
-
-    REGISTER_CVAR3_CB("r_ShadersAllowCompilation", CV_r_shadersAllowCompilation, SHADERS_ALLOW_COMPILATION_DEFAULT_VAL, VF_NULL, "", OnChange_CV_r_ShadersAllowCompiliation);
-
-    DefineConstIntCVar3("r_ShadersRemoteCompiler", CV_r_shadersremotecompiler, 0, VF_DUMPTODISK, "Enables remote shader compilation on dedicated machine");
-    REGISTER_CVAR3("r_ShadersAsyncCompiling", CV_r_shadersasynccompiling, 1, VF_NULL,
-        "Enable asynchronous shader compiling\n"
-        "Usage: r_ShadersAsyncCompiling [0/1/2/3]\n"
-        " 0 = off, (stalling) shaders compiling\n"
-        " 1 = on, shaders are compiled in parallel, missing shaders are rendered in yellow\n"
-        " 2 = on, shaders are compiled in parallel, missing shaders are not rendered\n"
-        " 3 = on, shaders are compiled in parallel in precache mode");
-    REGISTER_CVAR3("r_ShadersAsyncActivation", CV_r_shadersasyncactivation, 1, VF_NULL,
-        "Enable asynchronous shader activation\n"
-        "Usage: r_ShadersAsyncActivation [0/1]\n"
-        " 0 = off, (stalling) synchronous shaders activation\n"
-        " 1 = on, shaders are activated/streamed asynchronously\n");
-
-    DefineConstIntCVar3("r_ShadersEditing", CV_r_shadersediting, 0, VF_NULL, "Force all cvars to settings, which allow shader editing");
-
-    DefineConstIntCVar3("r_ShadersCompileAutoActivate", CV_r_shaderscompileautoactivate, 0, VF_NULL, "Automatically reenable shader compilation if outdated shader is detected");
-
-    REGISTER_CVAR3("r_AssetProcessorShaderCompiler", CV_r_AssetProcessorShaderCompiler, 0, VF_NULL,
-        "Enables using the Asset Processor as a proxy for the shader compiler if its not reachable directly.\n"
-        "Usage: r_AssetProcessorShaderCompiler 1\n"
-        "Default is 0 (disabled)");
-
-    DefineConstIntCVar3("r_ReflectTextureSlots", CV_r_ReflectTextureSlots, 1, VF_NULL, "Reflect texture slot information from shader");
-
-    REGISTER_CVAR3("r_ShadersAsyncMaxThreads", CV_r_shadersasyncmaxthreads, 1, VF_DUMPTODISK, "");
-    REGISTER_CVAR3("r_ShadersCacheDeterministic", CV_r_shaderscachedeterministic, 1, VF_NULL, "Ensures that 2 shaderCaches built from the same source are binary equal");
-    DefineConstIntCVar3("r_ShadersPrecacheAllLights", CV_r_shadersprecachealllights, 1, VF_NULL, "");
-    REGISTER_CVAR3("r_ShadersSubmitRequestline", CV_r_shaderssubmitrequestline, 1, VF_NULL, "");
-    REGISTER_CVAR3("r_ShadersUseInstanceLookUpTable", CV_r_shadersuseinstancelookuptable, 0, VF_NULL,
-        "Use lookup table to search for shader instances. Speeds up the process, but uses more memory. Handy for shader generation.");
-
-    bool bShaderLogCacheMisses = true;
-#if defined(_RELEASE)
-    bShaderLogCacheMisses = false;
-#endif
-    REGISTER_CVAR3("r_ShadersLogCacheMisses", CV_r_shaderslogcachemisses, bShaderLogCacheMisses ? 2 : 0, VF_NULL,
-        "Log all shader caches misses on HD (both level and global shader cache misses).\n" 
-        "0 = No logging to disk or TTY\n"
-        "1 = Logging to disk only\n"
-        "2 = Logging to disk and TTY (default)");
-
-    REGISTER_CVAR3("r_ShadersImport", CV_r_shadersImport, 0, VF_NULL,
-        "0 = Off\n"
-        "1 = Import pre-parsed shader reflection information from .fxb files if they exist for a related .cfx which skips expensive parsing of .cfx files in RT_ParseShader. If a .fxb exists for a shader but an individual permutation is missing, then fallback to the slow .cfx parsing for that permutation."
-        "2 = Import from the .fxb files, but do not fallback if import fails.  Missing shader permutations from .fxb files will be ignored."
-        "3 = Same behavior as 1, but only when running Performance/Release configurations.  Debug/Profile builds will disable this and set it to 0 (for an improved development experience).  This allows us to continue compiling shaders in Debug/Profile configurations and run optimally in Performance/Release");
-
-    REGISTER_CVAR3("r_ShadersExport", CV_r_shadersExport, 1, VF_NULL,
-        "0 off, 1 allow export of .fxb files during shader cache generation.");
-
-    REGISTER_CVAR3("r_ShadersCacheUnavailableShaders", CV_r_shadersCacheUnavailableShaders, 0, VF_NULL,
-        "0 off (default), 1 cache unavailable shaders to avoid requesting their compilation in future executions.");
-
-    DefineConstIntCVar3("r_ShadersUseLLVMDirectXCompiler", CV_r_ShadersUseLLVMDirectXCompiler, 0, VF_NULL,
-        "Shaders will be compiled using the LLVM DirectX Shader Compiler (GL4, GLES3 and METAL).\n"
-        "Usage: r_ShadersUseLLVMDirectXCompiler 1\n"
-        "Default is 0 (disabled)");
-
-    DefineConstIntCVar3("r_DebugRenderMode", CV_r_debugrendermode, 0, VF_CHEAT, "");
-    DefineConstIntCVar3("r_DebugRefraction", CV_r_debugrefraction, 0, VF_CHEAT,
-        "Debug refraction usage. Displays red instead of refraction\n"
-        "Usage: r_DebugRefraction\n"
-        "Default is 0 (off)");
-
-    DefineConstIntCVar3("r_MeshPrecache", CV_r_meshprecache, 1, VF_NULL, "");
-    REGISTER_CVAR3("r_MeshPoolSize", CV_r_meshpoolsize, RENDERER_DEFAULT_MESHPOOLSIZE, VF_NULL,
-        "The size of the pool for render data in kilobytes. "
-        "Disabled by default on PC (mesh data allocated on heap)."
-        "Enabled by default on consoles. Requires app restart to change.");
-    REGISTER_CVAR3("r_MeshInstancePoolSize", CV_r_meshinstancepoolsize, RENDERER_DEFAULT_MESHINSTANCEPOOLSIZE, VF_NULL,
-        "The size of the pool for volatile render data in kilobytes. "
-        "Disabled by default on PC (mesh data allocated on heap)."
-        "Enabled by default on consoles. Requires app restart to change.");
-
-    CV_r_excludeshader = REGISTER_STRING("r_ExcludeShader", "0", VF_CHEAT,
-            "Exclude the named shader from the render list.\n"
-            "Usage: r_ExcludeShader ShaderName\n"
-            "Sometimes this is useful when debugging.");
-
-    CV_r_excludemesh = REGISTER_STRING("r_ExcludeMesh", "", VF_CHEAT,
-            "Exclude or ShowOnly the named mesh from the render list.\n"
-            "Usage: r_ExcludeShader Name\n"
-            "Usage: r_ExcludeShader !Name\n"
-            "Sometimes this is useful when debugging.");
-
-    DefineConstIntCVar3("r_ProfileShaders", CV_r_profileshaders, 0, VF_CHEAT,
-        "Enables display of render profiling information.\n"
-        "Usage: r_ProfileShaders [0/1]\n"
-        "Default is 0 (off). Set to 1 to display profiling\n"
-        "of rendered shaders.");
-    DefineConstIntCVar3("r_ProfileShadersSmooth", CV_r_ProfileShadersSmooth, 4, VF_CHEAT,
-        "Smooth time information.\n"
-        "Usage: r_ProfileShadersSmooth [0-10]");
-    DefineConstIntCVar3("r_ProfileShadersGroupByName", CV_r_ProfileShadersGroupByName, 1, VF_CHEAT,
-        "Group items by name ignoring RT flags.\n"
-        "Usage: r_ProfileShaders [0/1]");
-
-    /*  REGISTER_CVAR3("r_EnvCMWrite", CV_r_envcmwrite, 0, VF_NULL,
-            "Writes cube-map textures to disk.\n"
-            "Usage: r_EnvCMWrite [0/1]\n"
-            "Default is 0 (off). The textures are written to 'Cube_posx.jpg'\n"
-            "'Cube_negx.jpg',...,'Cube_negz.jpg'. At least one of the real-time\n"
-            "cube-map shaders should be present in the current scene.");
-            */
-    REGISTER_CVAR3("r_EnvCMResolution", CV_r_envcmresolution, 1, VF_DUMPTODISK,
-        "Sets resolution for target environment cubemap, in pixels.\n"
-        "Usage: r_EnvCMResolution #\n"
-        "where # represents:\n"
-        "\t0: 64\n"
-        "\t1: 128\n"
-        "\t2: 256\n"
-        "Default is 2 (256 by 256 pixels).");
-
-    REGISTER_CVAR3("r_EnvTexResolution", CV_r_envtexresolution, ENVTEXRES_DEFAULT_VAL, VF_DUMPTODISK,
-        "Sets resolution for 2d target environment texture, in pixels.\n"
-        "Usage: r_EnvTexResolution #\n"
-        "where # represents:\n"
-        " 0: 64\n"
-        " 1: 128\n"
-        " 2: 256\n"
-        " 3: 512\n"
-        "Default is 3 (512 by 512 pixels).");
-
-    REGISTER_CVAR3("r_WaterUpdateDistance", CV_r_waterupdateDistance, 2.0f, VF_NULL, "");
-
-    REGISTER_CVAR3("r_WaterUpdateFactor", CV_r_waterupdateFactor, 0.01f, VF_DUMPTODISK | VF_CVARGRP_IGNOREINREALVAL, // Needs to be ignored from cvar group state otherwise some adv graphic options will show as custom when using multi GPU due to mgpu.cfg being reloaded after changing syspec and graphic options have changed,
-        "Distance factor for water reflected texture updating.\n"
-        "Usage: r_WaterUpdateFactor 0.01\n"
-        "Default is 0.01. 0 means update every frame");
-
-    REGISTER_CVAR3("r_EnvCMupdateInterval", CV_r_envcmupdateinterval, 0.04f, VF_DUMPTODISK,
-        "Sets the interval between environmental cube map texture updates.\n"
-        "Usage: r_EnvCMupdateInterval #\n"
-        "Default is 0.1.");
-    REGISTER_CVAR3("r_EnvTexUpdateInterval", CV_r_envtexupdateinterval, 0.001f, VF_DUMPTODISK,
-        "Sets the interval between environmental 2d texture updates.\n"
-        "Usage: r_EnvTexUpdateInterval 0.001\n"
-        "Default is 0.001.");
-    
-    // Slimming of GBuffers by encoding full RGB channels into more efficient YCbCr channels which require
-    // less storage for the CbCr channels (ie. 24(8+8+8) bits to 16(8+4+4) bits).
-    // This allows the packing of different component channels into the G-Buffers, saving the cost of 3 extra channels.
-    // 4 + 4 + 4 = 12 bytes of saving per pixel in the G-Buffer, assuming RGBA8 format
-    // Slimmed down GBuffer encoding scheme:
-    // Texture Channels:            R               G               B                   A   
-    //
-    // Normal Map Texture           Normal.x        Normal.y        Specular Y (YCrCb)  Smoothness (6bit) + Light (2bit)
-    // Diffuse Texture              Albedo.x        Albedo.y        Albedo.z            Specular CrCb (4+4 bit)
-    // Specular (One Channel Only)  Occlusion       N/A             N/A                 N/A
-    REGISTER_CVAR3("r_SlimGBuffer", CV_r_SlimGBuffer,0, VF_REQUIRE_APP_RESTART,
-        "Optimize the gbuffer render targets use.\n"
-        "Usage:r_SlimGBuffer 1\n");
-      
-    DefineConstIntCVar3("r_WaterReflections", CV_r_waterreflections, 1, VF_DUMPTODISK,
-        "Toggles water reflections.\n"
-        "Usage: r_WaterReflections [0/1]\n"
-        "Default is 1 (water reflects).");
-
-    DefineConstIntCVar3("r_WaterReflectionsQuality", CV_r_waterreflections_quality, WATERREFLQUAL_DEFAULT_VAL, VF_DUMPTODISK,
-        "Activates water reflections quality setting.\n"
-        "Usage: r_WaterReflectionsQuality [0/1/2/3]\n"
-        "Default is 0 (terrain only), 1 (terrain + particles), 2 (terrain + particles + brushes), 3 (everything)");
-
-    REGISTER_CVAR3("r_WaterReflectionsMinVisiblePixelsUpdate", CV_r_waterreflections_min_visible_pixels_update, 0.05f, VF_DUMPTODISK,
-        "Activates water reflections if visible pixels above a certain threshold.");
-
-    REGISTER_CVAR3("r_WaterReflectionsMinVisUpdateFactorMul", CV_r_waterreflections_minvis_updatefactormul, 20.0f, VF_DUMPTODISK,
-        "Activates update factor multiplier when water mostly occluded.");
-    REGISTER_CVAR3("r_WaterReflectionsMinVisUpdateDistanceMul", CV_r_waterreflections_minvis_updatedistancemul, 10.0f, VF_DUMPTODISK,
-        "Activates update distance multiplier when water mostly occluded.");
-
-    REGISTER_CVAR3("r_WaterCaustics", CV_r_watercaustics, 1, VF_RENDERER_CVAR, // deprecating soon, moving to the Water Gem
-        "Toggles under water caustics.\n"
-        "Usage: r_WaterCaustics [0/1]\n"
-        "Default is 1 (enabled).");
-
-    REGISTER_CVAR3("r_WaterCausticsDistance", CV_r_watercausticsdistance, 100.0f, VF_NULL,
-        "Toggles under water caustics max distance.\n"
-        "Usage: r_WaterCausticsDistance\n"
-        "Default is 100.0 meters");
-
-    REGISTER_CVAR3("r_WaterVolumeCaustics", CV_r_watervolumecaustics, WATERVOLCAUSTICS_DEFAULT_VAL, VF_NULL,
-        "Toggles advanced water caustics for watervolumes.\n"
-        "Usage: r_WaterVolumeCaustics [0/1]\n"
-        "Default is 0 (disabled). 1 - enables.");
-
-    REGISTER_CVAR3("r_WaterVolumeCausticsDensity", CV_r_watervolumecausticsdensity, 128, VF_NULL,
-        "Density/resolution of watervolume caustic grid.\n"
-        "Usage: r_WaterVolumeCausticsDensity [16/256]\n"
-        "Default is 256");
-
-    REGISTER_CVAR3("r_WaterVolumeCausticsRes", CV_r_watervolumecausticsresolution, 512, VF_NULL,
-        "Resolution of watervoluem caustics texture.\n"
-        "Usage: r_WaterVolumeCausticsRes [n]\n"
-        "Default is 1024");
-
-    REGISTER_CVAR3("r_WaterVolumeCausticsSnapFactor", CV_r_watervolumecausticssnapfactor, 1.0f, VF_NULL,
-        "Distance in which to snap the vertex grid/projection (to avoid aliasing).\n"
-        "Usage: r_WaterVolumeCausticsSnapFactor [n]\n"
-        "Default is 1.0");
-
-    REGISTER_CVAR3("r_WaterVolumeCausticsMaxDist", CV_r_watervolumecausticsmaxdistance, 35.0f, VF_NULL,
-        "Maximum distance in which caustics are visible.\n"
-        "Usage: r_WaterVolumeCausticsMaxDist [n]\n"
-        "Default is 35");
-
-    if (!OceanToggle::IsActive())
-    {
-        DefineConstIntCVar3("r_WaterGodRays", CV_r_water_godrays, 1, VF_NULL,
-            "Enables under water god rays.\n"
-            "Usage: r_WaterGodRays [0/1]\n"
-            "Default is 1 (enabled).");
-
-        REGISTER_CVAR3("r_WaterGodRaysDistortion", CV_r_water_godrays_distortion, 1, VF_NULL,
-            "Set the amount of distortion when underwater.\n"
-            "Usage: r_WaterGodRaysDistortion [n]\n"
-            "Default is 1.");
-    }
-
-
-    DefineConstIntCVar3("r_Reflections", CV_r_reflections, 1, VF_DUMPTODISK,
-        "Toggles reflections.\n"
-        "Usage: r_Reflections [0/1]\n"
-        "Default is 1 (reflects).");
-
-    REGISTER_CVAR3("r_ReflectionsOffset", CV_r_waterreflections_offset, 0.0f, VF_NULL, "");
-
-    DefineConstIntCVar3("r_ReflectionsQuality", CV_r_reflections_quality, 3, VF_DUMPTODISK,
-        "Toggles reflections quality.\n"
-        "Usage: r_ReflectionsQuality [0/1/2/3]\n"
-        "Default is 0 (terrain only), 1 (terrain + particles), 2 (terrain + particles + brushes), 3 (everything)");
-
-    DefineConstIntCVar3("r_DetailTextures", CV_r_detailtextures, 1, VF_DUMPTODISK,
-        "Toggles detail texture overlays.\n"
-        "Usage: r_DetailTextures [0/1]\n"
-        "Default is 1 (detail textures on).");
-
-    DefineConstIntCVar3("r_ReloadShaders", CV_r_reloadshaders, 0, VF_CHEAT,
-        "Reloads shaders.\n"
-        "Usage: r_ReloadShaders [0/1]\n"
-        "Default is 0. Set to 1 to reload shaders.");
-
-    REGISTER_CVAR3("r_DetailDistance", CV_r_detaildistance, 6.0f, VF_DUMPTODISK,
-        "Distance used for per-pixel detail layers blending.\n"
-        "Usage: r_DetailDistance (1-20)\n"
-        "Default is 6.");
-
-    DefineConstIntCVar3("r_TexBindMode", CV_r_texbindmode, 0, VF_CHEAT,
-        "Enable texture overrides.\n"
-        "Usage: r_TexBindMode [0/1/2/4/5/6/7/8/9/10/11]\n"
-        "\t1 - Force gray non-font maps\n"
-        "\t5 - Force flat normal maps\n"
-        "\t6 - Force white diffuse maps\n"
-        "\t7 - Force diffuse maps to use mipmapdebug texture\n"
-        "\t8 - Colour code diffuse maps to show minimum uploaded mip [0:green,1:cyan,2:blue,3:purple,4:magenta,5:yellow,6:orange,7:red,higher:white]\n"
-        "\t9 - Colour code diffuse maps to show textures streaming in in green and out in red\n"
-        "\t10 - Colour code diffuse maps that have requested a lower mip than the lowest available [-3: red, -2: yellow, -1: green]\n"
-        "\t11 - Force white diffuse map and flat normal map\n"
-        "\t12 - Visualise textures that have more or less mips in memory than needed\n"
-        "Default is 0 (disabled).");
-    DefineConstIntCVar3("r_NoDrawShaders", CV_r_nodrawshaders, 0, VF_CHEAT,
-        "Disable entire render pipeline.\n"
-        "Usage: r_NoDrawShaders [0/1]\n"
-        "Default is 0 (render pipeline enabled). Used for debugging and profiling.");
-    REGISTER_CVAR3("r_DrawNearShadows", CV_r_DrawNearShadows, 0, VF_NULL,
-        "Enable shadows for near objects.\n"
-        "Usage: r_DrawNearShadows [0/1]\n");
-    REGISTER_CVAR3("r_NoDrawNear", CV_r_nodrawnear, 0, VF_RENDERER_CVAR,
-        "Disable drawing of near objects.\n"
-        "Usage: r_NoDrawNear [0/1]\n"
-        "Default is 0 (near objects are drawn).");
-    REGISTER_CVAR3("r_DrawNearZRange", CV_r_DrawNearZRange, 0.12f, VF_NULL,
-        "Default is 0.1.");
-    REGISTER_CVAR3("r_DrawNearFarPlane", CV_r_DrawNearFarPlane, 40.0f, VF_NULL,
-        "Default is 40.");
-    REGISTER_CVAR3("r_DrawNearFoV", CV_r_drawnearfov, 60.0f, VF_NULL,
-        "Sets the FoV for drawing of near objects.\n"
-        "Usage: r_DrawNearFoV [n]\n"
-        "Default is 60.");
-
-    REGISTER_CVAR3_CB("r_Flares", CV_r_flares, FLARES_DEFAULT_VAL, VF_DUMPTODISK,
-        "Toggles lens flare effect.\n"
-        "Usage: r_Flares [0/1]\n"
-        "Default is 1 (on).",
-        OnChange_CV_r_flares);
-
-    DefineConstIntCVar3("r_FlareHqShafts", CV_r_flareHqShafts, FLARES_HQSHAFTS_DEFAULT_VAL, VF_DUMPTODISK,
-        "Toggles high quality mode for point light shafts.\n"
-        "Usage: r_FlareHqShafts [0/1]\n"
-        "Default is 1 (on).");
-
-    REGISTER_CVAR3("r_FlaresChromaShift", CV_r_FlaresChromaShift, 6.0f, VF_NULL,
-        "Set flares chroma shift amount.\n"
-        "Usage: r_FlaresChromaShift [n]\n"
-        "Default is 6\n"
-        "0 Disables");
-
-    REGISTER_CVAR3("r_FlaresIrisShaftMaxPolyNum", CV_r_FlaresIrisShaftMaxPolyNum, 200, VF_NULL,
-        "Set the maximum number of polygon of IrisShaft.\n"
-        "Usage : r_FlaresIrisShaftMaxPolyNum [n]\n"
-        "Default is 200\n"
-        "0 Infinite");
-
-    REGISTER_CVAR3_CB("r_FlaresTessellationRatio", CV_r_FlaresTessellationRatio, 1, VF_NULL,
-        "Set the tessellation rate of flares. 1 is the original mesh.\n"
-        "Usage : r_FlaresTessellationRatio 0.5\n"
-        "Default is 1.0\n"
-        "Range is from 0 to 1", OnChange_CV_r_FlaresTessellationRatio);
-
-    REGISTER_CVAR3("r_Gamma", CV_r_gamma, 1.0f, VF_DUMPTODISK,
-        "Adjusts the graphics card gamma correction (fast, needs hardware support, also affects HUD and desktop)\n"
-        "r_NoHWGamma must be set to 0 for this to have an effect.\n"
-        "Usage: r_Gamma 1.0\n"
-        "1 off (default)");
-    REGISTER_CVAR3("r_Brightness", CV_r_brightness, 0.5f, VF_DUMPTODISK,
-        "Sets the display brightness (fast, needs hardware support, also affects HUD and desktop)\n"
-        "r_NoHWGamma must be set to 0 for this to have an effect.\n"
-        "Usage: r_Brightness 0.5\n"
-        "Default is 0.5.");
-    REGISTER_CVAR3("r_Contrast", CV_r_contrast, 0.5f, VF_DUMPTODISK,
-        "Sets the display contrast (fast, needs hardware support, also affects HUD and desktop)\n"
-        "r_NoHWGamma must be set to 0 for this to have an effect.\n"
-        "Usage: r_Contrast 0.5\n"
-        "Default is 0.5.");
-
-    DefineConstIntCVar3("r_NoHWGamma", CV_r_nohwgamma, 2, VF_DUMPTODISK,
-        "Sets renderer to ignore hardware gamma correction.\n"
-        "Usage: r_NoHWGamma [0/1/2]\n"
-        "0 - allow hardware gamma correction\n"
-        "1 - disable hardware gamma correction\n"
-        "2 - disable hardware gamma correction in Editor\n");
-
-    REGISTER_CVAR3("r_Scissor", CV_r_scissor, 1, VF_RENDERER_CVAR, "Enables scissor test");
-
-    DefineConstIntCVar3("r_wireframe", CV_r_wireframe, R_SOLID_MODE, VF_CHEAT, "Toggles wireframe rendering mode");
-
-    REGISTER_CVAR3_CB("r_GetScreenShot", CV_r_GetScreenShot, 0, VF_NULL,
-        AZStd::string::format
-        (
-            "To capture one screenshot (variable is set to 0 after capturing)\n"
-            "%d = do not take a screenshot (default)\n"
-            "%d = take a screenshot and another HDR screenshot if HDR is enabled\n"
-            "%d = take a screenshot\n",
-            static_cast<int>(ScreenshotType::None),
-            static_cast<int>(ScreenshotType::HdrAndNormal),
-            static_cast<int>(ScreenshotType::Normal)
-        ).c_str(),
-        []([[maybe_unused]] ICVar* pArgs)
-        {
-            // Do not accept other values, since ScreenshotType::NormalWithFilepath = 3 is reserved for internal use.
-            if (CV_r_GetScreenShot != static_cast<int>(ScreenshotType::None) &&
-                CV_r_GetScreenShot != static_cast<int>(ScreenshotType::HdrAndNormal) &&
-                CV_r_GetScreenShot != static_cast<int>(ScreenshotType::Normal))
-            {
-                CV_r_GetScreenShot = static_cast<int>(ScreenshotType::None);
-                iLog->LogWarning("Screenshot type not supported!");
-            }
-        }
-    );
-
-    DefineConstIntCVar3("r_Character_NoDeform", CV_r_character_nodeform, 0, VF_NULL, "");
-
-    REGISTER_CVAR3("r_Log", CV_r_log, 0, VF_CHEAT,
-        "Logs rendering information to Direct3DLog.txt.\n"
-        "Use negative values to log a single frame.\n"
-        "Usage: r_Log +/-[0/1/2/3/4]\n"
-        "\t1: Logs a list of all shaders without profile info.\n"
-        "\t2: Log contains a list of all shaders with profile info.\n"
-        "\t3: Logs all API function calls.\n"
-        "\t4: Highly detailed pipeline log, including all passes,\n"
-        "\t\t\tstates, lights and pixel/vertex shaders.\n"
-        "Default is 0 (off). Use this function carefully, because\n"
-        "log files grow very quickly.");
-
-    DefineConstIntCVar3("r_LogVidMem", CV_r_logVidMem, 0, VF_CHEAT,
-        "Logs vid mem information to VidMemLog.txt.");
-
-    DefineConstIntCVar3("r_Stats", CV_r_stats, 0, VF_CHEAT,
-        "Toggles render statistics.\n"
-        "0=disabled,\n"
-        "1=global render stats,\n"
-        "2=print shaders for selected object,\n"
-        "3=CPU times of render passes and video memory usage,\n"
-        "4=CPU times of render passes,\n"
-        "5=Occlusion query calls (calls to mfDraw/mfReadResult_Now/mfReadResult_Try),\n"
-        "6=display per-instance drawcall count,\n"
-        "8=Info about instanced DIPs,\n"
-        "13=print info about cleared RT's,\n"
-        "Usage: r_Stats [0/1/n]");
-
-    DefineConstIntCVar3("r_statsMinDrawCalls", CV_r_statsMinDrawcalls, 0, VF_CHEAT,
-        "Minimum drawcall amount to display for use with r_Stats 6");
-
-    DefineConstIntCVar3("r_profiler", CV_r_profiler, 0, VF_NULL,
-        "Display render pipeline profiler.\n"
-        "  0: Disabled\n"
-        "  1: Basic overview\n"
-        "  2: Detailed pass stats\n");
-
-    REGISTER_CVAR3("r_profilerTargetFPS", CV_r_profilerTargetFPS, 30.0f, VF_NULL,
-        "Target framerate for application.");
-
-    REGISTER_CVAR3("r_VSync", CV_r_vsync, 1, VF_RESTRICTEDMODE | VF_DUMPTODISK,
-        "Toggles vertical sync.\n"
-        "0: Disabled\n"
-        "1: Enabled\n"
-        "2: Enabled, use asynchronous swaps on deprecated platform");
-
-    REGISTER_CVAR3("r_OldBackendSkip", CV_r_OldBackendSkip, 0, VF_RESTRICTEDMODE | VF_DUMPTODISK,
-        "Ignores old backend processing.\n"
-        "0: Old backend is on\n"
-        "1: Old backend is skipped\n"
-        "2: Old backend shadows are skipped\n");
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-    REGISTER_CVAR3("r_overrideRefreshRate", CV_r_overrideRefreshRate, 0, VF_RESTRICTEDMODE | VF_DUMPTODISK,
-        "Enforces specified refresh rate when running in fullscreen (0=off).");
-    REGISTER_CVAR3("r_overrideScanlineOrder", CV_r_overrideScanlineOrder, 0, VF_RESTRICTEDMODE | VF_DUMPTODISK,
-        "Enforces specified scanline order when running in fullscreen.\n"
-        "0=off,\n"
-        "1=progressive,\n"
-        "2=interlaced (upper field first),\n"
-        "3=interlaced (lower field first)\n"
-        "Usage: r_overrideScanlineOrder [0/1/2/3]");
-    REGISTER_CVAR3("r_overrideDXGIOutput", CV_r_overrideDXGIOutput, 0, VF_REQUIRE_APP_RESTART,
-        "Specifies index of display to use for output (0=primary display).");
-    REGISTER_CVAR3("r_overrideDXGIOutputFS", CV_r_overrideDXGIOutputFS, 0, VF_NULL,
-        "Specifies index of display to use for full screen output (0=primary display).");
-#endif
-#if defined(WIN32) || defined(WIN64)
-    REGISTER_CVAR3("r_FullscreenPreemption", CV_r_FullscreenPreemption, 1, VF_NULL,
-        "While in fullscreen activities like notification pop ups of other applications won't cause a mode switch back into windowed mode.");
-#endif
-    DefineConstIntCVar3("r_PredicatedTiling", CV_r_predicatedtiling, 0, VF_REQUIRE_APP_RESTART,
-        "Toggles predicated tiling mode (deprecated platform only)\n"
-        "Usage: r_PredicatedTiling [0/1]");
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-    DefineConstIntCVar3("r_MeasureOverdraw", CV_r_measureoverdraw, 0, VF_CHEAT,
-        "Activate a special rendering mode that visualize the rendering cost of each pixel by color.\n"
-        "0=off,\n"
-        "1=pixel shader instructions,\n"
-        "2=pass count,\n"
-        "3=vertex shader instructions,\n"
-        "4=overdraw estimation with Hi-Z (deprecated),\n"
-        "Usage: r_MeasureOverdraw [0/1/2/3/4]");
-    REGISTER_CVAR3("r_MeasureOverdrawScale", CV_r_measureoverdrawscale, 1.5f, VF_CHEAT, "");
-
-    DefineConstIntCVar3("r_PrintMemoryLeaks", CV_r_printmemoryleaks, 0, VF_NULL, "");
-    DefineConstIntCVar3("r_ReleaseAllResourcesOnExit", CV_r_releaseallresourcesonexit, 1, VF_NULL, "");
-
-    REGISTER_CVAR3("r_ShowVideoMemoryStats", CV_r_ShowVideoMemoryStats, 0, VF_NULL, "");
-    REGISTER_COMMAND("r_ShowRenderTarget", &Cmd_ShowRenderTarget, VF_CHEAT, showRenderTargetHelp);
-
-    REGISTER_CVAR3("r_VRAMDebug", CV_r_VRAMDebug, 0, VF_NULL,
-        "Display debug information for VRAM heaps on platforms where we have direct access to video memory\n"
-        "\t0: Disabled\n"
-        "\t1: VRAM heap statistics and occupancy visualization enabled");
-
-    REGISTER_CVAR3("r_BreakOnError", CV_r_BreakOnError, 0, VF_NULL, "calls debugbreak on illegal behaviour");
-    REGISTER_CVAR3("r_D3D12SubmissionThread", CV_r_D3D12SubmissionThread, 1, VF_NULL, "run DX12 command queue submission tasks from a dedicated thread");
-
-    REGISTER_CVAR3("r_ReprojectOnlyStaticObjects", CV_r_ReprojectOnlyStaticObjects, 1, VF_NULL, "Forces a split in the zpass, to prevent moving object from beeing reprojected");
-    REGISTER_CVAR3("r_ReverseDepth", CV_r_ReverseDepth, 1, VF_NULL, "Use 1-z depth rendering for increased depth precision");
-
-    REGISTER_CVAR3("r_EnableDebugLayer", CV_r_EnableDebugLayer, 0, VF_NULL, "DX12: Enable Debug Layer");
-    REGISTER_CVAR3("r_NoDraw", CV_r_NoDraw, 0, VF_NULL, "Disable submitting of certain draw operations: 1-(Do not process render objects at all), 2-(Do not submit individual render objects), 3-(No DrawIndexed)");
-
-    // show texture debug routine + auto completion
-    CV_r_ShowTexture = REGISTER_STRING("r_ShowTexture", "", VF_CHEAT, "Displays loaded texture - for debug purpose\n");
-    gEnv->pConsole->RegisterAutoComplete("r_ShowTexture", &g_TextureNameAutoComplete);
-
-    DefineConstIntCVar3("r_ShowLightBounds", CV_r_ShowLightBounds, 0, VF_CHEAT,
-        "Display light bounds - for debug purpose\n"
-        "Usage: r_ShowLightBounds [0=off/1=on]");
-    DefineConstIntCVar3("r_MergeRenderChunks", CV_r_MergeRenderChunks, 1, VF_NULL, "");
-
-    REGISTER_CVAR3("r_ParticlesTessellation", CV_r_ParticlesTessellation, 1, VF_NULL, "Enables particle tessellation for higher quality lighting. (DX11 only)");
-    REGISTER_CVAR3("r_ParticlesTessellationTriSize", CV_r_ParticlesTessellationTriSize, 16, VF_NULL, "Sets particles tessellation triangle screen space size in pixels (DX11 only)");
-
-    REGISTER_CVAR3("r_ZFightingDepthScale", CV_r_ZFightingDepthScale, 0.995f, VF_CHEAT, "Controls anti z-fighting measures in shaders (scaling homogeneous z).");
-    REGISTER_CVAR3("r_ZFightingExtrude", CV_r_ZFightingExtrude, 0.001f, VF_CHEAT, "Controls anti z-fighting measures in shaders (extrusion along normal in world units).");
-
-    REGISTER_CVAR3_CB("r_TexelsPerMeter", CV_r_TexelsPerMeter, 0, VF_ALWAYSONCHANGE,
-        "Enables visualization of the color coded \"texels per meter\" ratio for objects in view.\n"
-        "The checkerboard pattern displayed represents the mapping of the assigned diffuse\n"
-        "texture onto the object's uv space. One block in the pattern represents 8x8 texels.\n"
-        "Usage: r_TexelsPerMeter [n] (where n is the desired number of texels per meter; 0 = off)",
-        OnChange_CV_r_TexelsPerMeter);
-
-    REGISTER_CVAR3("r_enableAltTab", CV_r_enableAltTab, 1, VF_NULL,
-        "Toggles alt tabbing in and out of fullscreen when the game is not in devmode.\n"
-        "Usage: r_enableAltTab [toggle]\n"
-        "Notes: Should only be added to system.cfg and requires a restart");
-
-    REGISTER_CVAR3("r_StereoDevice", CV_r_StereoDevice, 0, VF_REQUIRE_APP_RESTART | VF_DUMPTODISK,
-        "Sets stereo device (only possible before app start)\n"
-        "Usage: r_StereoDevice [0/1/2/3/4]\n"
-        "0: No stereo support (default)\n"
-        "1: Frame compatible formats (side-by-side, interlaced, anaglyph)\n"
-        "2: HDMI 1.4\n"
-        "3: Stereo driver (PC only, NVidia or AMD)\n"
-        "4: Dualhead (PC only, two projectors or iZ3D screen)\n"
-        "100: Auto-detect device for platform");
-
-    REGISTER_CVAR3("r_StereoMode", CV_r_StereoMode, 0, VF_DUMPTODISK,
-        "Sets stereo rendering mode.\n"
-        "Usage: r_StereoMode [0=off/1]\n"
-        "1: Dual rendering\n");
-
-    REGISTER_CVAR3("r_StereoOutput", CV_r_StereoOutput, 0, VF_DUMPTODISK,
-        "Sets stereo output. Output depends on the stereo monitor\n"
-        "Usage: r_StereoOutput [0=off/1/2/3/4/5/6/...]\n"
-        "0: Standard\n"
-        "1: IZ3D\n"
-        "2: Checkerboard\n"
-        "3: Above and Below (not supported)\n"
-        "4: Side by Side\n"
-        "5: Line by Line (Interlaced)\n"
-        "6: Anaglyph\n"
-        "7: VR Device (Oculus/Vive)\n"
-        );
-
-    REGISTER_CVAR3("r_StereoFlipEyes", CV_r_StereoFlipEyes, 0, VF_DUMPTODISK,
-        "Flip eyes in stereo mode.\n"
-        "Usage: r_StereoFlipEyes [0=off/1=on]\n"
-        "0: don't flip\n"
-        "1: flip\n");
-
-    REGISTER_CVAR3("r_StereoStrength", CV_r_StereoStrength, 1.0f, VF_DUMPTODISK,
-        "Multiplier which influences the strength of the stereo effect.");
-
-    REGISTER_CVAR3("r_StereoEyeDist", CV_r_StereoEyeDist, 0.02f, VF_DUMPTODISK,
-        "[For 3D TV] Maximum separation between stereo images in percentage of the screen.");
-
-    REGISTER_CVAR3("r_StereoScreenDist", CV_r_StereoScreenDist, 0.25f, VF_DUMPTODISK,
-        "Distance to plane where stereo parallax converges to zero.");
-
-    REGISTER_CVAR3("r_StereoNearGeoScale", CV_r_StereoNearGeoScale, 0.65f, VF_DUMPTODISK,
-        "Scale for near geometry (weapon) that gets pushed into the screen");
-
-    REGISTER_CVAR3("r_StereoHudScreenDist", CV_r_StereoHudScreenDist, 0.5f, VF_DUMPTODISK,
-        "Distance to plane where hud stereo parallax converges to zero.\n"
-        "If not zero, HUD needs to be rendered two times.");
-
-    REGISTER_CVAR3("r_StereoGammaAdjustment", CV_r_StereoGammaAdjustment, 0.12f, VF_DUMPTODISK,
-        "Additional adjustment to the graphics card gamma correction when Stereo is enabled.\n"
-        "Usage: r_StereoGammaAdjustment [offset]"
-        "0: off");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    const int DEVICE_WIDTH  =   1152;
-    const int   DEVICE_HEIGHT   =   720;
-#endif
-
-    REGISTER_CVAR3("r_ConsoleBackbufferWidth", CV_r_ConsoleBackbufferWidth, DEVICE_WIDTH, VF_DUMPTODISK,
-        "console specific backbuffer resolution - width");
-    REGISTER_CVAR3("r_ConsoleBackbufferHeight", CV_r_ConsoleBackbufferHeight, DEVICE_HEIGHT, VF_DUMPTODISK,
-        "console specific backbuffer resolution - height");
-
-    REGISTER_CVAR3("r_ConditionalRendering", CV_r_ConditionalRendering, 0, VF_NULL, "Enables conditional rendering .");
-
-    REGISTER_CVAR3("r_CustomResMaxSize", CV_r_CustomResMaxSize, s_CustomResMaxSize_USE_MAX_RESOURCES, VF_NULL, "Maximum resolution of custom resolution rendering. A value of -1 sets the maximum to the upper limit of the device.");
-    REGISTER_CVAR3("r_CustomResWidth", CV_r_CustomResWidth, 0, VF_NULL, "Width of custom resolution rendering");
-    REGISTER_CVAR3("r_CustomResHeight", CV_r_CustomResHeight, 0, VF_NULL, "Height of custom resolution rendering");
-    REGISTER_CVAR3("r_CustomResPreview", CV_r_CustomResPreview, 1, VF_NULL, "Enable/disable preview of custom resolution rendering in viewport"
-        "(0 - no preview, 1 - scaled to match viewport, 2 - custom resolution clipped to viewport");
-    REGISTER_CVAR3("r_Supersampling", CV_r_Supersampling, 1, VF_NULL, "Use supersampled antialiasing"
-        "(1 - 1x1 no SSAA, 2 - 2x2, 3 - 3x3 ...)");
-    REGISTER_CVAR3("r_SupersamplingFilter", CV_r_SupersamplingFilter, 0, VF_NULL, "Filter method to use when resolving supersampled output"
-        "\n0 - Box filter"
-        "\n1 - Tent filter"
-        "\n2 - Gaussian filter"
-        "\n3 - Lanczos filter");
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-    REGISTER_COMMAND("r_PrecacheShaderList", &ShadersPrecacheList, VF_NULL, "");
-    REGISTER_COMMAND("r_StatsShaderList", &ShadersStatsList, VF_NULL, "");
-    REGISTER_COMMAND("r_OptimiseShaders", &ShadersOptimise, VF_NULL, "");
-    REGISTER_COMMAND("r_GetShaderList", &GetShaderList, VF_NULL, "");
-#endif
-
-    DefineConstIntCVar3("r_TextureCompressor", CV_r_TextureCompressor, 1, VF_DUMPTODISK,
-        "Defines which texture compressor is used (fallback is DirectX)\n"
-        "Usage: r_TextureCompressor [0/1]\n"
-        "0 uses DirectX, 1 uses squish if possible");
-
-    REGISTER_CVAR3("r_FogDepthTest", CV_r_FogDepthTest, -0.0005f, VF_NULL,
-        "Enables per-pixel culling for deferred volumetric fog pass.\n"
-        "Fog computations for all pixels closer than a given depth value will be skipped.\n"
-        "Usage: r_FogDepthTest z with...\n"
-        "  z = 0, culling disabled\n"
-        "  z > 0, fixed linear world space culling depth\n"
-        "  z < 0, optimal culling depth will be computed automatically based on camera direction and fog settings");
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    REGISTER_CVAR3("r_FogShadows", CV_r_FogShadows, 0, VF_NULL,
-        "Enables deferred volumetric fog shadows\n"
-        "Usage: r_FogShadows [0/1/2]\n"
-        "  0: off\n"
-        "  1: standard resolution\n"
-        "  2: reduced resolution\n");
-    REGISTER_CVAR3("r_FogShadowsMode", CV_r_FogShadowsMode, 0, VF_NULL,
-        "Ray-casting mode for shadowed fog\n"
-        "Usage: r_FogShadowsMode [0/1]\n"
-        "  0: brute force shadowmap sampling\n"
-        "  1: optimized shadowmap sampling\n");
-#endif
-    REGISTER_CVAR3("r_FogShadowsWater", CV_r_FogShadowsWater, 1, VF_NULL, "Enables volumetric fog shadows for watervolumes");
-
-    DefineConstIntCVar3("r_RainDropsEffect", CV_r_RainDropsEffect, 1, VF_CHEAT,
-        "Enable RainDrops effect.\n"
-        "Usage: r_RainDropEffect [0/1/2]\n"
-        "0: force off\n"
-        "1: on (default)\n"
-        "2: on (forced)");
-
-    DefineConstIntCVar3("r_RefractionPartialResolves", CV_r_RefractionPartialResolves, 2, VF_NULL,
-        "Do a partial screen resolve before refraction\n"
-        "Usage: r_RefractionPartialResolves [0/1]\n"
-        "0: disable \n"
-        "1: enable conservatively (non-optimal)\n"
-        "2: enable (default)");
-
-    DefineConstIntCVar3("r_RefractionPartialResolvesDebug", CV_r_RefractionPartialResolvesDebug, 0, VF_NULL,
-        "Toggle refraction partial resolves debug display\n"
-        "Usage: r_RefractionPartialResolvesDebug [0/1]\n"
-        "0: disable \n"
-        "1: Additive 2d area \n"
-        "2: Bounding boxes \n"
-        "3: Alpha overlay with varying colours \n");
-
-    DefineConstIntCVar3("r_Batching", CV_r_Batching, 1, VF_NULL,
-        "Enable/disable render items batching\n"
-        "Usage: r_Batching [0/1]\n");
-
-    DefineConstIntCVar3("r_Unlit", CV_r_Unlit, 0, VF_CHEAT,
-        "Render just diffuse texture with no lighting (for most materials).");
-
-    DefineConstIntCVar3("r_HideSunInCubemaps", CV_r_HideSunInCubemaps, 1, VF_NULL,
-        "Stops the sun being drawn during cubemap generation.\n");
-
-    // more details: http://en.wikipedia.org/wiki/Overscan
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_8
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-    REGISTER_COMMAND("r_OverscanBorders", &cmd_OverscanBorders, VF_NULL,
-        "Changes the size of the overscan borders for the left/right and top/bottom\n"
-        "of the screen for adjusting the title safe area. This is for logo placements\n"
-        "and text printout to account for the TV overscan and is mostly needed for consoles.\n"
-        "If only one value is specified, the overscan borders for left/right and top/bottom\n"
-        "are set simultaneously, but you may also specify different percentages for left/right\n"
-        "and top/bottom.\n"
-        "Usage: r_OverscanBorders [0..25]\n"
-        "       r_OverscanBorders [0..25] [0..25]\n"
-        "Default is 0=off, >0 defines the size of the overscan borders for left/right\n"
-        "or top/bottom as percentages of the whole screen size (e.g. 7.5).");
-
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX)
-    float overscanBorderScale = 0.0f;
-#else
-    float overscanBorderScale = 0.03f; // Default consoles to sensible overscan border
-#endif
-    REGISTER_CVAR3_CB("r_OverscanBorderScaleX", s_overscanBorders.x, overscanBorderScale, VF_NULL,
-        "Sets the overscan border width scale\n"
-        "Usage: r_OverscanBorderScaleX [0.0->0.25]",
-        OnChange_r_OverscanBorderScale);
-
-    REGISTER_CVAR3_CB("r_OverscanBorderScaleY", s_overscanBorders.y, overscanBorderScale, VF_NULL,
-        "Sets the overscan border height scale\n"
-        "Usage: r_OverscanBorderScaleY [0.0->0.25]",
-        OnChange_r_OverscanBorderScale);
-
-    REGISTER_CVAR2("r_UsePersistentRTForModelHUD", &CV_r_UsePersistentRTForModelHUD, 0, VF_NULL,
-        "Uses a seperate RT to render models for the ModelHud Renderer");
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    const int defValAuxGeomEnable = 1;
-    REGISTER_CVAR2("r_enableAuxGeom", &CV_r_enableauxgeom, defValAuxGeomEnable, VF_REQUIRE_APP_RESTART, "Enables aux geometry rendering.");
-#endif
-
-    REGISTER_CVAR2("r_ParticleVerticePoolSize", &CV_r_ParticleVerticePoolSize, 15360, VF_REQUIRE_APP_RESTART, "Max Number of Particle Vertices to support");
-
-    DefineConstIntCVar3("r_ParticlesDebug", CV_r_ParticlesDebug, 0, VF_NULL,
-        "Particles debugging\n"
-        "Usage: \n"
-        "0 disabled\n"
-        "1 particles screen coverage (red = bad, blue = good)\n"
-        "2 particles overdraw (white = really bad, red = bad, blue = good)");
-
-    REGISTER_CVAR3("r_GeomCacheInstanceThreshold", CV_r_GeomCacheInstanceThreshold, 10, VF_NULL, "Threshold after which instancing is used to draw geometry cache pieces");
-
-    REGISTER_CVAR3("r_VisAreaClipLightsPerPixel", CV_r_VisAreaClipLightsPerPixel, 1, VF_NULL, "Per pixel light/cubemap culling for vis areas: 0=off, 1=on");
-    REGISTER_CVAR3("r_OutputShaderSourceFiles", CV_r_OutputShaderSourceFiles, 0, VF_NULL, "If true, HLSL and GLSL files will be saved in the USER\\Shader\\* folders during shader compilation.  Does not work on console or mobile targets.");
-
-    REGISTER_CVAR3("r_VolumetricFogTexScale", CV_r_VolumetricFogTexScale, 10, VF_NULL,
-        "Width and height scale factor (divided by screen resolution) for volume texture.\n"
-        "Acceptable value is more than equal 2.\n"
-        );
-    REGISTER_CVAR3("r_VolumetricFogTexDepth", CV_r_VolumetricFogTexDepth, 32, VF_NULL,
-        "Depth resolution of volume texture.\n"
-        "Huge value runs out of performance and video memory.\n"
-        );
-    REGISTER_CVAR3("r_VolumetricFogReprojectionBlendFactor", CV_r_VolumetricFogReprojectionBlendFactor, 0.9f, VF_NULL,
-        "Adjust the blend factor of temporal reprojection.\n"
-        "Acceptable value is between 0 and 1.\n"
-        "0 means temporal reprojecton is off.\n"
-        );
-    REGISTER_CVAR3("r_VolumetricFogSample", CV_r_VolumetricFogSample, 0, VF_NULL,
-        "Adjust number of sample points.\n"
-        "0: 1 sample point in a voxel\n"
-        "1: 2 sample points in a voxel\n"
-        "2: 4 sample points in a voxel\n"
-        );
-    REGISTER_CVAR3("r_VolumetricFogShadow", CV_r_VolumetricFogShadow, 1, VF_NULL,
-        "Adjust shadow sample count per sample point.\n"
-        "0: 1 shadow sample per sample point\n"
-        "1: 2 shadow samples per sample point \n"
-        "2: 3 shadow samples per sample point\n"
-        "3: 4 shadow samples per sample point\n"
-        );
-
-    // Confetti David Srour: Upscaling Quality for Metal
-    DefineConstIntCVar3("r_UpscalingQuality", CV_r_UpscalingQuality, 0, VF_NULL,
-        "iOS Metal Upscaling Quality\n"
-        "Usage: \n"
-        "0 Point\n"
-        "1 Bilinear\n"
-        "2 Bicubic\n"
-        "3 Lanczos\n");
-
-    //Clears GMEM G-Buffer through a shader. Has support for fixed point
-    DefineConstIntCVar3("r_ClearGMEMGBuffer", CV_r_ClearGMEMGBuffer, 0, VF_NULL,
-        "GMEM G-Buffer Clear\n"
-        "Usage: \n"
-        "0 no clearing\n"
-        "1 full screen clear pass before Z-Pass. Done through a shader and supports fixed point\n"
-        "2 full screen clear pass before Z-Pass. Done through loadactions (faster)\n");
-    
-    // Enables fast math for metal shaders
-    DefineConstIntCVar3("r_MetalShadersFastMath", CV_r_MetalShadersFastMath, 1, VF_NULL,
-        "Metal shaders fast math. Default is 1.\n"
-        "Usage: \n"
-        "0 Dont use fast math\n"
-        "1 Use fast math\n");
-
-    
-    // Confetti David Srour: GMEM paths
-    REGISTER_CVAR3("r_EnableGMEMPath", CV_r_EnableGMEMPath, 0, VF_REQUIRE_APP_RESTART,
-        "Mobile GMEM Paths\n"
-        "Usage: \n"
-        "0 Standard Rendering\n"
-        "1 256bpp GMEM Path\n"
-        "2 128bpp GMEM Path\n");
-
-    REGISTER_CVAR3("r_GMEM_DOF_Gather1_Quality", CV_r_GMEM_DOF_Gather1_Quality, 3, VF_REQUIRE_APP_RESTART,
-        "Value represents # of taps squared for 1st gather pass.\n"
-        "Usage: \n"
-        "Clamped between 1 & 7 (default is 3)\n");
-
-    REGISTER_CVAR3("r_GMEM_DOF_Gather2_Quality", CV_r_GMEM_DOF_Gather2_Quality, 2, VF_REQUIRE_APP_RESTART,
-        "Value represents # of taps squared for second gather pass.\n"
-        "Usage: \n"
-        "Clamped between 1 & 7 (default is 2)\n");
-
-    REGISTER_CVAR3("r_EnableGMEMPostProcCS", CV_r_EnableGMEMPostProcCS, 0, VF_REQUIRE_APP_RESTART,
-        "GMEM Compute Postprocess Pipeline\n"
-        "Usage: \n"
-        "0 Compute disabled with postprocessing on GMEM path\n"
-        "1 Compute enabled with postprocessing on GMEM path\n");
-
-    REGISTER_CVAR3("r_RainUseStencilMasking", CV_r_RainUseStencilMasking, 0, VF_REQUIRE_APP_RESTART,
-        "GMEM Deferred Rain enable stencil masking\n"
-        "Usage: \n"
-        "0 Use single pass rain on GMEM path\n"
-        "1 Generate stencil mask for rain on GMEM path\n");
-
-    // Confetti David Srour: Global VisArea/Portals blend weight for GMEM path
-    REGISTER_CVAR3("r_GMEMVisAreasBlendWeight", CV_r_GMEMVisAreasBlendWeight, 1, VF_NULL,
-        "Global VisArea/Portal Blend Weight for GMEM Render Path\n"
-        "GMEM render path doesn't support per-portal blend weight.\n"
-        "0.f to 1.f weight\n");
-
-    REGISTER_CVAR3("r_ForceFixedPointRenderTargets", CV_r_ForceFixedPointRenderTargets, 0, VF_NULL,
-        "Forces the engine to use fixed point render targets instead of floating point ones.\n"
-        "This variable is respected on Android OpenGL ES only\n"
-        "0 Off\n"
-        "1 ON\n");
-
-    REGISTER_CVAR3_CB("r_Fur", CV_r_Fur, 1, VF_NULL,
-        "Specifies how fur is rendered:\n"
-        "0: Fur is disabled - objects using Fur shader appear similar to Illum\n"
-        "1: Alpha blended transparent passes\n"
-        "2: Alpha tested opaque passes",
-    OnChange_CV_r_Fur);
-
-    REGISTER_CVAR3("r_FurShellPassCount", CV_r_FurShellPassCount, 64, VF_NULL,
-        "Number of passes to perform for rendering fur shells");
-
-    REGISTER_CVAR3("r_FurShowBending", CV_r_FurShowBending, 0, VF_DEV_ONLY,
-        "Toggles visibility of fur bending vectors.");
-
-    REGISTER_CVAR3("r_FurDebug", CV_r_FurDebug, 0, VF_DEV_ONLY,
-        "Debug visualizers for fur.\n"
-        "0: off\n"
-        "1: base/tip sample validity (red = base valid; green = tip valid; yellow = both valid)\n"
-        "2: base/tip selection (red = base chosen; green = tip chosen)\n"
-        "3: show offscreen UVs for base deferred sample (gray = onscreen)\n"
-        "4: show offscreen UVs for tip deferred sample (gray = onscreen)\n"
-        "5: show final lighting with all base lighting selected\n"
-        "6: show final lighting with all tip lighting selected\n"
-        "7: visualize fur length scaling\n"
-        "8: visualize fur animation bending velocity");
-
-    REGISTER_CVAR3("r_FurDebugOneShell", CV_r_FurDebugOneShell, 0, VF_DEV_ONLY,
-        "Debug cvar to draw only the specified shell number for fur. 0 = disabled.");
-
-    REGISTER_CVAR3("r_FurFinPass", CV_r_FurFinPass, 0, VF_NULL,
-        "Toggles view orthogonal fin pass for fur. 0 = disabled.");
-
-    REGISTER_CVAR3("r_FurFinShadowPass", CV_r_FurFinShadowPass, 1, VF_NULL,
-        "Toggles view orthogonal fin pass for fur in shadow passes. 0 = disabled.");
-
-    REGISTER_CVAR3("r_FurMovementBendingBias", CV_r_FurMovementBendingBias, 0.1f, VF_NULL,
-        "Bias for fur bending from animation & movement. Closer to 1 causes fur to bend back faster.");
-
-    REGISTER_CVAR3("r_FurMaxViewDist", CV_r_FurMaxViewDist, 32.0f, VF_NULL,
-        "Maximum view distance for fur shell passes.");
-
-    REGISTER_CVAR3("r_EnableComputeDownSampling", CV_r_EnableComputeDownSampling, 0, VF_NULL,
-        "Metal compute down sample\n"
-        "Usage: \n"
-        "0 Off\n"
-        "1 ON\n");
-
-    REGISTER_CVAR3("r_VolumetricFogDownscaledSunShadow", CV_r_VolumetricFogDownscaledSunShadow, 1, VF_NULL,
-        "Enable replacing sun shadow maps with downscaled shadow maps or static shadow map if possible.\n"
-        "0: disabled\n"
-        "1: replace first and second cascades with downscaled shadow maps. the others are replaced with static shadow map if possible.\n"
-        "2: replace first, second, and third cascades with downscaled shadow maps. the others are replaced with static shadow map if possible.\n"
-        );
-    REGISTER_CVAR3("r_VolumetricFogDownscaledSunShadowRatio", CV_r_VolumetricFogDownscaledSunShadowRatio, 1, VF_NULL,
-        "Set downscale ratio for sun shadow maps\n"
-        "0: 1/4 downscaled sun shadow maps\n"
-        "1: 1/8 downscaled sun shadow maps\n"
-        "2: 1/16 downscaled sun shadow maps\n"
-        );
-    REGISTER_CVAR3("r_VolumetricFogReprojectionMode", CV_r_VolumetricFogReprojectionMode, 1, VF_NULL,
-        "Set the mode of ghost reduction for temporal reprojection.\n"
-        "0: conservative\n"
-        "1: advanced"
-        );
-    REGISTER_CVAR3("r_VolumetricFogMinimumLightBulbSize", CV_r_VolumetricFogMinimumLightBulbSize, 0.4f, VF_NULL,
-        "Adjust the minimum size threshold for light attenuation bulb size. Small bulb size causes the light flicker."
-        );
-
-    REGISTER_CVAR2("r_ResolutionScale", &CV_r_ResolutionScale, CV_r_ResolutionScale, VF_NULL,
-        "Scales the resolution for better performance. A value of 1 indicates no scaling.\n"
-        "Minimum value 0.25: Scale resolution by 25% in width and height (retains the aspect ratio).\n"
-        "Maximum value 4: Scale resolution by 400%\n"
-        );
-
-    REGISTER_CVAR3_CB("r_GPUParticleDepthCubemapResolution", CV_r_CubeDepthMapResolution, 256, VF_EXPERIMENTAL,
-        "The resolution for the cubemaps used by the cubemap depth collision feature for GPU particles",
-        OnChange_CV_r_CubeDepthMapResolution);
-    
-    REGISTER_CVAR3("r_SkipNativeUpscale", CV_r_SkipNativeUpscale, 0, VF_NULL,
-        "Renders to the back buffer during the final post processing step and skips the native upscale.\n"
-        "Used when a second upscale already exists to avoid having two upscales.\n"
-        "0: Does not skip native upscale. \n"
-        "1: Skips native upscale."
-        );
-    
-    REGISTER_CVAR3_CB("r_SkipRenderComposites", CV_r_SkipRenderComposites, 0, VF_NULL,
-        "Skips the RenderComposites call for rendering Flares and Grain. Can be used as an\n"
-        "optimization to avoid a full screen render when these effects are not being used."
-        "0: Does not skip RenderComposites. \n"
-        "1: Skips RenderComposites",
-        OnChange_CV_r_SkipRenderComposites);
-
-    REGISTER_CVAR3("r_minConsoleFontSize", CV_r_minConsoleFontSize, 19.0f, VF_NULL,
-        "Minimum size used for scaling the font when rendering the console"
-    );
-
-    REGISTER_CVAR3("r_maxConsoleFontSize", CV_r_maxConsoleFontSize, 24.0f, VF_NULL,
-        "Maximum size used for scaling the font when rendering the console"
-    );
-
-    REGISTER_CVAR3("r_linuxSkipWindowCreation", CV_r_linuxSkipWindowCreation, 0, VF_NULL,
-        "0: Create a rendering window like normal"
-        "1: (Linux Only) Skip window creation and only render to an offscreen pixel buffer surface.  Screenshots can still be captured with r_GetScreenShot."
-    );
-
-    REGISTER_CVAR3("r_GraphicsTest00", CV_r_GraphicsTest00, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest01", CV_r_GraphicsTest01, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest02", CV_r_GraphicsTest02, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest03", CV_r_GraphicsTest03, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest04", CV_r_GraphicsTest04, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest05", CV_r_GraphicsTest05, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest06", CV_r_GraphicsTest06, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest07", CV_r_GraphicsTest07, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest08", CV_r_GraphicsTest08, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-    REGISTER_CVAR3("r_GraphicsTest09", CV_r_GraphicsTest09, 0, VF_DEV_ONLY, "Graphics programmers: Use in your code for misc graphics tests/debugging.");
-
-#ifndef NULL_RENDERER
-    AZ::Debug::DrillerManager* drillerManager = nullptr;
-    EBUS_EVENT_RESULT(drillerManager, AZ::ComponentApplicationBus, GetDrillerManager);
-    if (drillerManager && !gEnv->IsEditor())
-    {
-        // Create the VRAM driller
-        m_vramDriller = aznew Render::Debug::VRAMDriller();
-        m_vramDriller->CreateAllocationRecords(false, false, false);
-        drillerManager->Register(m_vramDriller);
-
-        // Register categories and subcategories
-        Render::Debug::VRAMSubCategoryType textureSubcategories;
-        textureSubcategories.push_back(Render::Debug::VRAMSubcategory(Render::Debug::VRAM_SUBCATEGORY_TEXTURE_TEXTURE, "Texture Assets"));
-        textureSubcategories.push_back(Render::Debug::VRAMSubcategory(Render::Debug::VRAM_SUBCATEGORY_TEXTURE_RENDERTARGET, "Rendertargets"));
-        textureSubcategories.push_back(Render::Debug::VRAMSubcategory(Render::Debug::VRAM_SUBCATEGORY_TEXTURE_DYNAMIC, "Dynamic Textures"));
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterCategory, Render::Debug::VRAM_CATEGORY_TEXTURE, "Texture", textureSubcategories);
-
-        Render::Debug::VRAMSubCategoryType meshSubcategories;
-        meshSubcategories.push_back(Render::Debug::VRAMSubcategory(Render::Debug::VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER, "Vertex Buffers"));
-        meshSubcategories.push_back(Render::Debug::VRAMSubcategory(Render::Debug::VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER, "Index Buffers"));
-        meshSubcategories.push_back(Render::Debug::VRAMSubcategory(Render::Debug::VRAM_SUBCATEGORY_BUFFER_CONSTANT_BUFFER, "Constant Buffers"));
-        meshSubcategories.push_back(Render::Debug::VRAMSubcategory(Render::Debug::VRAM_SUBCATEGORY_BUFFER_OTHER_BUFFER, "Other Buffers"));
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterCategory, Render::Debug::VRAM_CATEGORY_BUFFER, "Buffer", meshSubcategories);
-    }
-
-    m_DevMan.Init();
-#endif
-
-    m_cClearColor = ColorF(0, 0, 0, 128.0f / 255.0f);       // 128 is default GBuffer value
-    m_clearBackground = false;
-    m_pDefaultFont = NULL;
-    m_TexGenID = 1;
-    m_VSync = CV_r_vsync;
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-    m_overrideRefreshRate = CV_r_overrideRefreshRate;
-    m_overrideScanlineOrder = CV_r_overrideScanlineOrder;
-#endif
-    m_Features = 0;
-    m_bVendorLibInitialized = false;
-
-    // Initialize SThreadInfo and PerFrameParameters
-    for (uint32 id = 0; id < RT_COMMAND_BUF_COUNT; ++id)
-    {
-        memset(&m_RP.m_TI[id].m_perFrameParameters, 0, sizeof(PerFrameParameters));
-        m_RP.m_TI[id].m_nFrameID = -2;
-        m_RP.m_TI[id].m_FS.m_bEnable = true;
-    }
-
-    m_bPauseTimer = 0;
-    m_fPrevTime = -1.0f;
-
-    m_CurFontColor = Col_White;
-
-    m_bUseHWSkinning = CV_r_usehwskinning != 0;
-
-    m_bSwapBuffers = true;
-
-#if defined(_DEBUG) && defined(WIN32)
-    if (CV_r_printmemoryleaks)
-    {
-        _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-    }
-#endif
-
-    m_nUseZpass = CV_r_usezpass;
-
-    m_nShadowPoolHeight = m_nShadowPoolWidth = 0;
-
-    m_cloudShadowTexId = 0;
-    m_cloudShadowSpeed = Vec3(0, 0, 0);
-    m_cloudShadowTiling = 1;
-    m_cloudShadowInvert = false;
-    m_cloudShadowBrightness = 1;
-
-    m_nGPUs = 1;
-
-    //assert(!(FOB_MASK_AFFECTS_MERGING & 0xffff));
-    //assert(sizeof(CRenderObject) == 256);
-#if !defined(PLATFORM_64BIT) && !defined(ANDROID)
-    // Disabled this check for ShaderCache Gen, it is only a performacne thingy for last gen consoles anyway
-    //STATIC_CHECK(sizeof(CRenderObject) == 128, CRenderObject);
-#endif
-    STATIC_CHECK(!(FOB_MASK_AFFECTS_MERGING & 0xffff), FOB_MASK_AFFECTS_MERGING);
-
-    if (!g_pSDynTexture_PoolAlloc)
-    {
-        g_pSDynTexture_PoolAlloc = new SDynTexture_PoolAlloc(stl::FHeap().FreeWhenEmpty(true));
-    }
-
-    //m_RP.m_VertPosCache.m_nBufSize = 500000 * sizeof(Vec3);
-    //m_RP.m_VertPosCache.m_pBuf = new byte [gRenDev->m_RP.m_VertPosCache.m_nBufSize];
-
-    m_pDefaultMaterial = NULL;
-    m_pTerrainDefaultMaterial = NULL;
-
-    m_ViewMatrix.SetIdentity();
-    m_CameraMatrix.SetIdentity();
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_CameraZeroMatrix[i].SetIdentity();
-    }
-
-    for (int i = 0; i < MAX_NUM_VIEWPORTS; ++i)
-    {
-        for (int j = 0; j < 2; ++j)
-        {
-            m_PreviousFrameMatrixSets[i][j].m_ViewMatrix.SetIdentity();
-            m_PreviousFrameMatrixSets[i][j].m_ProjMatrix.SetIdentity();
-            m_PreviousFrameMatrixSets[i][j].m_ViewProjMatrix.SetIdentity();
-            m_PreviousFrameMatrixSets[i][j].m_ViewNoTranslateMatrix.SetIdentity();
-            m_PreviousFrameMatrixSets[i][j].m_ViewProjNoTranslateMatrix.SetIdentity();
-            m_PreviousFrameMatrixSets[i][j].m_WorldViewPosition.zero();
-        }
-    }
-
-    m_CameraMatrixNearest.SetIdentity();
-
-    m_ProjMatrix.SetIdentity();
-    m_TranspOrigCameraProjMatrix.SetIdentity();
-    m_ViewProjMatrix.SetIdentity();
-    m_ViewProjNoTranslateMatrix.SetIdentity();
-    m_ViewProjInverseMatrix.SetIdentity();
-    m_IdentityMatrix.SetIdentity();
-
-    m_TemporalJitterClipSpace = Vec4(0.0f);
-    
-    m_RP.m_nZOcclusionBufferID = -1;
-
-    m_RP.m_nCurrResolveBounds[0] = m_RP.m_nCurrResolveBounds[1] = m_RP.m_nCurrResolveBounds[2] = m_RP.m_nCurrResolveBounds[3] = 0;
-
-    for (int i = 0; i < SIZEOF_ARRAY(m_TempMatrices); i++)
-    {
-        for (int j = 0; j < SIZEOF_ARRAY(m_TempMatrices[0]); j++)
-        {
-            m_TempMatrices[i][j].SetIdentity();
-        }
-    }
-
-    CParserBin::m_bParseFX = true;
-    //CParserBin::m_bEmbeddedSearchInfo = false;
-    if (gEnv->IsEditor())
-    {
-        CParserBin::m_bEditable = true;
-    }
-#ifndef CONSOLE_CONST_CVAR_MODE
-    CV_e_DebugTexelDensity = 0;
-#endif
-    m_nFlushAllPendingTextureStreamingJobs = 0;
-    m_fTexturesStreamingGlobalMipFactor = 0.f;
-
-    m_fogCullDistance = 0.0f;
-
-    m_pDebugRenderNode = NULL;
-
-    m_bCollectDrawCallsInfo = false;
-    m_bCollectDrawCallsInfoPerNode = false;
-
-    m_nMeshPoolTimeoutCounter = nMeshPoolMaxTimeoutCounter;
-
-    // Init Thread Safe Worker Containers
-    threadID nThreadId = CryGetCurrentThreadId();
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_RP.m_arrCustomShadowMapFrustumData[i].Init();
-        m_RP.m_arrCustomShadowMapFrustumData[i].SetNonWorkerThreadID(nThreadId);
-        m_RP.m_TempObjects[i].Init();
-        m_RP.m_TempObjects[i].SetNonWorkerThreadID(nThreadId);
-    }
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-    {
-        m_RP.m_pRenderViews[i].reset(new CRenderView);
-    }
-    m_RP.m_pCurrentRenderView = m_RP.m_pRenderViews[0].get();
-    m_RP.m_pCurrentFillView = m_RP.m_pRenderViews[0].get();
-    m_pRT = new SRenderThread;
-    m_pRT->StartRenderThread();
-
-    m_ShadowFrustumMGPUCache.Init();
-    RegisterSyncWithMainListener(&m_ShadowFrustumMGPUCache);
-
-    // on console some float values in vertex formats can be 16 bit
-    iLog->Log("CRenderer sizeof(Vec2f16)=%" PRISIZE_T " sizeof(Vec3f16)=%" PRISIZE_T "", sizeof(Vec2f16), sizeof(Vec3f16));
-    CRenderMesh::Initialize();
-}
-
-CRenderer::~CRenderer()
-{
-    //Code now moved to Release()
-
-    CCryNameR::ReleaseNameTable();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::PostInit()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Initialize the shader system
-    //////////////////////////////////////////////////////////////////////////
-    m_cEF.mfPostInit();
-
-    // Initialize asset messaging listener
-    m_assetListener.Connect();
-
-#if !defined(NULL_RENDERER)
-    //////////////////////////////////////////////////////////////////////////
-    // Load internal renderer font.
-    //////////////////////////////////////////////////////////////////////////
-    if (gEnv->pCryFont)
-    {
-        m_pDefaultFont = gEnv->pCryFont->GetFont("default");
-        if (!m_pDefaultFont)
-        {
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Error getting default font");
-        }
-    }
-
-    if (!m_bShaderCacheGen)
-    {
-        // Create system resources while in fast load phase
-        gEnv->pRenderer->InitSystemResources(FRR_SYSTEM_RESOURCES);
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CRenderer::Release()
-{
-    m_assetListener.Disconnect();
-
-    // Reminder for Andrey/AntonKap: this needs to be properly handled
-    //SAFE_DELETE(g_pSDynTexture_PoolAlloc)
-    //g_pSDynTexture_PoolAlloc = NULL;
-
-    RemoveSyncWithMainListener(&m_ShadowFrustumMGPUCache);
-    m_ShadowFrustumMGPUCache.Release();
-    CRenderMesh::ShutDown();
-    CHWShader::mfCleanupCache();
-
-    if (!m_DevBufMan.Shutdown())
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR_DBGBRK, "could not free all buffers from CDevBufferMan!");
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_9
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-
-    if (g_shaderGeneralHeap)
-    {
-        g_shaderGeneralHeap->Release();
-    }
-
-    // Shutdown the VRAM driller
-    if (m_vramDriller)
-    {
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllCategories);
-
-        AZ::Debug::DrillerManager* drillerManager = nullptr;
-        EBUS_EVENT_RESULT(drillerManager, AZ::ComponentApplicationBus, GetDrillerManager);
-        if (drillerManager)
-        {
-            drillerManager->Unregister(m_vramDriller);
-            delete m_vramDriller;
-            m_vramDriller = nullptr;
-        }
-    }
-
-    gRenDev = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////
-void CRenderer::AddRenderDebugListener(IRenderDebugListener* pRenderDebugListener)
-{
-    stl::push_back_unique(m_listRenderDebugListeners, pRenderDebugListener);
-}
-
-//////////////////////////////////////////////////////////////////////
-void CRenderer::RemoveRenderDebugListener(IRenderDebugListener* pRenderDebugListener)
-{
-    stl::find_and_erase(m_listRenderDebugListeners, pRenderDebugListener);
-}
-
-//////////////////////////////////////////////////////////////////////
-void CRenderer::TextToScreenColor(int x, int y, float r, float g, float b, float a, const char* format, ...)
-{
-    //  if(!cVars->e_text_info)
-    //  return;
-
-    char buffer[512];
-    va_list args;
-    va_start(args, format);
-    if (azvsnprintf(buffer, sizeof(buffer), format, args) == -1)
-    {
-        buffer[sizeof(buffer) - 1] = 0;
-    }
-    va_end(args);
-
-    WriteXY((int)(8 * x), (int)(6 * y), 1, 1, r, g, b, a, buffer);
-}
-
-//////////////////////////////////////////////////////////////////////
-void CRenderer::TextToScreen(float x, float y, const char* format, ...)
-{
-    //  if(!cVars->e_text_info)
-    //  return;
-
-    char buffer[512];
-    va_list args;
-    va_start(args, format);
-    if (azvsnprintf(buffer, sizeof(buffer), format, args) == -1)
-    {
-        buffer[sizeof(buffer) - 1] = 0;
-    }
-    va_end(args);
-
-    WriteXY((int)(8 * x), (int)(6 * y), 1, 1, 1, 1, 1, 1, buffer);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::Draw2dText(float posX, float posY, const char* pStr, const SDrawTextInfo& ti)
-{
-    Draw2dTextWithDepth(posX, posY, 1.0f, pStr, ti);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::Draw2dTextWithDepth(float posX, float posY, float posZ, const char* pStr, const SDrawTextInfo& ti)
-{
-    IF (!m_pDefaultFont, 0)
-    {
-        return;
-    }
-
-    IFFont* pFont = m_pDefaultFont;
-
-    const float r = CLAMP(ti.color[0], 0.0f, 1.0f);
-    const float g = CLAMP(ti.color[1], 0.0f, 1.0f);
-    const float b = CLAMP(ti.color[2], 0.0f, 1.0f);
-    const float a = CLAMP(ti.color[3], 0.0f, 1.0f);
-
-    STextDrawContext ctx;
-    ctx.SetBaseState(GS_NODEPTHTEST);
-    ctx.SetColor(ColorF(r, g, b, a));
-    ctx.SetCharWidthScale(1.0f);
-    ctx.EnableFrame((ti.flags & eDrawText_Framed) != 0);
-
-    if (ti.flags & eDrawText_Monospace)
-    {
-        if (ti.flags & eDrawText_FixedSize)
-        {
-            ctx.SetSizeIn800x600(false);
-        }
-        ctx.SetSize(Vec2(UIDRAW_TEXTSIZEFACTOR * ti.xscale, UIDRAW_TEXTSIZEFACTOR * ti.yscale));
-        ctx.SetCharWidthScale(0.5f);
-        ctx.SetProportional(false);
-
-        if (ti.flags & eDrawText_800x600)
-        {
-            ScaleCoordInternal(posX, posY);
-        }
-    }
-    else if (ti.flags & eDrawText_FixedSize)
-    {
-        ctx.SetSizeIn800x600(false);
-        ctx.SetSize(Vec2(UIDRAW_TEXTSIZEFACTOR * ti.xscale, UIDRAW_TEXTSIZEFACTOR * ti.yscale));
-        ctx.SetProportional(true);
-
-        if (ti.flags & eDrawText_800x600)
-        {
-            ScaleCoordInternal(posX, posY);
-        }
-    }
-    else
-    {
-        ctx.SetSizeIn800x600(true);
-        ctx.SetProportional(false);
-        ctx.SetCharWidthScale(0.5f);
-        ctx.SetSize(Vec2(UIDRAW_TEXTSIZEFACTOR * ti.xscale, UIDRAW_TEXTSIZEFACTOR * ti.yscale));
-    }
-
-    // align left/right/center
-    if (ti.flags & (eDrawText_Center | eDrawText_CenterV | eDrawText_Right))
-    {
-        Vec2 textSize = pFont->GetTextSize(pStr, true, ctx);
-
-        // If we're using virtual 800x600 coordinates, convert the text size from
-        // pixels to that before using it as an offset.
-        if (ctx.m_sizeIn800x600)
-        {
-            float width = 1.0f;
-            float height = 1.0f;
-            ScaleCoordInternal(width, height);
-            textSize.x /= width;
-            textSize.y /= height;
-        }
-
-        if (ti.flags & eDrawText_Center)
-        {
-            posX -= textSize.x * 0.5f;
-        }
-        else if (ti.flags & eDrawText_Right)
-        {
-            posX -= textSize.x;
-        }
-
-        if (ti.flags & eDrawText_CenterV)
-        {
-            posY -= textSize.y * 0.5f;
-        }
-    }
-
-    // Pass flags so that overscan borders can be applied if necessary
-    ctx.SetFlags(ti.flags);
-
-    pFont->DrawString(posX, posY, posZ, pStr, true, ctx);
-}
-
-void CRenderer::PrintToScreen(float x, float y, float size, const char* buf)
-{
-    SDrawTextInfo ti;
-    ti.xscale = size * 0.5f / 8;
-    ti.yscale = size * 1.f / 8;
-    ti.color[0] = 1;
-    ti.color[1] = 1;
-    ti.color[2] = 1;
-    ti.color[3] = 1;
-    ti.flags = eDrawText_800x600 | eDrawText_2D;
-    Draw2dText(x, y, buf, ti);
-}
-
-void CRenderer::WriteXY(int x, int y, float xscale, float yscale, float r, float g, float b, float a, const char* format, ...)
-{
-    //////////////////////////////////////////////////////////////////////
-    // Write a string to the screen
-    //////////////////////////////////////////////////////////////////////
-
-    va_list args;
-
-    char buffer[512];
-
-    // Check for the presence of a D3D device
-    // Format the string
-    va_start(args, format);
-    if (azvsnprintf(buffer, sizeof(buffer), format, args) == -1)
-    {
-        buffer[sizeof(buffer) - 1] = 0;
-    }
-    va_end(args);
-
-    SDrawTextInfo ti;
-    ti.xscale = xscale;
-    ti.yscale = yscale;
-    ti.color[0] = r;
-    ti.color[1] = g;
-    ti.color[2] = b;
-    ti.color[3] = a;
-    ti.flags = eDrawText_800x600 | eDrawText_2D;
-    Draw2dText((float)x, (float)y, buffer, ti);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* text)
-{
-    int nT = m_pRT->GetThreadList();
-    if (text && !gEnv->IsDedicated())
-    {
-        // ti.yscale is currently ignored, input struct can be refactored
-
-        ColorB col(ColorF(ti.color[0], ti.color[1], ti.color[2], ti.color[3]));
-
-        m_TextMessages[nT].PushEntry_Text(pos, col, ti.xscale, ti.flags, text);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args)
-{
-    int nT = m_pRT->GetThreadList();
-    if (format && !gEnv->IsDedicated())
-    {
-        char str[512];
-
-        vsnprintf_s(str, sizeof(str), sizeof(str) - 1, format, args);
-        str[sizeof(str) - 1] = 0;
-
-        // ti.yscale is currently ignored, input struct can be refactored
-
-        ColorB col(ColorF(ti.color[0], ti.color[1], ti.color[2], ti.color[3]));
-
-        m_TextMessages[nT].PushEntry_Text(pos, col, ti.xscale, ti.flags, str);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-void CRenderer::EF_RenderTextMessages()
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-
-    CTextMessages& textMessage = m_TextMessages[m_RP.m_nFillThreadID];
-    if (!textMessage.empty())
-    {
-        RenderTextMessages(textMessage);
-        textMessage.Clear(false);
-    }
-}
-
-void CRenderer::RenderTextMessages(CTextMessages& messages)
-{
-    bool prevFog = EnableFog(false);    //save previous fog value returned by EnableFog
-    int vx, vy, vw, vh;
-    GetViewport(&vx, &vy, &vw, &vh);
-
-    while (const CTextMessages::CTextMessageHeader* pEntry = messages.GetNextEntry())
-    {
-        const CTextMessages::SText* pText = pEntry->CastTo_Text();
-
-        Vec3 vPos(0, 0, 0);
-        int nDrawFlags = 0;
-        const char* szText = 0;
-        Vec4 vColor(1, 1, 1, 1);
-        float fSize = 0;
-
-        if (pText)
-        {
-            nDrawFlags = pText->m_nDrawFlags;
-            szText = pText->GetText();
-            vPos = pText->m_vPos;
-            vColor = pText->m_Color.toVec4() * 1.0f / 255.0f;
-            fSize = pText->m_fFontSize;
-        }
-
-        bool b800x600 = (nDrawFlags & eDrawText_800x600) != 0;
-
-        float fMaxPosX = 100.0f;
-        float fMaxPosY = 100.0f;
-
-        if (!b800x600)
-        {
-            fMaxPosX = (float)vw;
-            fMaxPosY = (float)vh;
-        }
-
-        float sx, sy, sz;
-
-        if (!(nDrawFlags & eDrawText_2D))
-        {
-            float fDist = 1; //GetDistance(pTextInfo->pos,GetCamera().GetPosition());
-
-            float K = GetCamera().GetFarPlane() / fDist;
-            if (fDist > GetCamera().GetFarPlane() * 0.5)
-            {
-                vPos = GetCamera().GetPosition() + K * (vPos - GetCamera().GetPosition());
-            }
-
-            ProjectToScreen(vPos.x, vPos.y, vPos.z, &sx, &sy, &sz);
-
-            if (!b800x600)
-            {
-                // ProjectToScreen() returns virtual screen values in range [0-100], while the Draw2dTextWithDepth() method expects screen coords.
-                // Correcting sx, sy values if not in virtual screen mode (sz is depth in range [0-1], and does not need to be altered).
-                sx = vw ? (sx / 100.f) * vw : sx;
-                sy = vh ? (sy / 100.f) * vh : sy;
-            }
-        }
-        else
-        {
-            if (b800x600)
-            {
-                // Make 2D coords in range 0-100
-                sx = (vPos.x) / vw * 100;
-                sy = (vPos.y) / vh * 100;
-            }
-            else
-            {
-                sx = vPos.x;
-                sy = vPos.y;
-            }
-
-            sz = vPos.z;
-        }
-
-        if (sx >= 0 && sx <= fMaxPosX)
-        {
-            if (sy >= 0 && sy <= fMaxPosY)
-            {
-                if (sz >= 0 && sz <= 1)
-                {
-                    // calculate size
-                    float sizeX;
-                    float sizeY;
-                    if (nDrawFlags & eDrawText_FixedSize)
-                    {
-                        sizeX = fSize;
-                        sizeY = fSize;
-                        //sizeX = pTextInfo->font_size * 800.0f/vw;
-                        //sizeY = pTextInfo->font_size * 500.0f/vh;
-                    }
-                    else
-                    {
-                        sizeX = sizeY = (1.0f - (float)(sz)) * 32.f * fSize;
-                        sizeX *= 0.5f;
-                    }
-
-                    if (szText)
-                    {
-                        // print
-                        SDrawTextInfo ti;
-                        ti.flags = nDrawFlags;
-                        ti.color[0] = vColor.x;
-                        ti.color[1] = vColor.y;
-                        ti.color[2] = vColor.z;
-                        ti.color[3] = vColor.w;
-                        ti.xscale = sizeX;
-                        ti.yscale = sizeY;
-                        if (nDrawFlags & eDrawText_DepthTest)
-                        {
-                            sz = 1.0f - 2.0f * sz;
-                        }
-                        else
-                        {
-                            sz = 1.0f;
-                        }
-                        if (b800x600)
-                        {
-                            Draw2dTextWithDepth(0.01f * 800 * sx, 0.01f * 600 * sy, sz, szText, ti);
-                        }
-                        else
-                        {
-                            Draw2dTextWithDepth(sx, sy, sz, szText, ti);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    //If fog was enabled before we disabled it here, re-enable it
-    if (prevFog)
-    {
-        EnableFog(true);
-    }
-}
-
-void CRenderer::RT_RenderTextMessages()
-{
-    ASSERT_IS_RENDER_THREAD(m_pRT)
-    FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_RENDERER);
-    AZ_TRACE_METHOD();
-
-    int nT = m_pRT->GetThreadList();
-
-    if (gEnv->IsDedicated() || (m_pRT && m_pRT->m_eVideoThreadMode != SRenderThread::eVTM_Disabled))
-    {
-        m_TextMessages[nT].Clear();
-        return;
-    }
-
-    bool resetTextMessages = true;
-
-    // If stereo is enabled then we don't want to reset the flush position UNLESS we're rendering the second eye. Otherwise,
-    // the text will only get drawn to the first eye.
-    if (gEnv->pRenderer->IsStereoEnabled())
-    {
-        if (gEnv->pRenderer->GetIStereoRenderer()->GetStatus() == IStereoRenderer::Status::kRenderingFirstEye)
-        {
-            resetTextMessages = false;
-        }
-    }
-
-    RenderTextMessages(m_TextMessages[nT]);
-    m_TextMessages[nT].Clear(!resetTextMessages);
-}
-
-#if !defined(LINUX) && !defined(APPLE)
-#pragma pack (push)
-#pragma pack (1)
-typedef struct
-{
-    unsigned char  id_length, colormap_type, image_type;
-    unsigned short colormap_index, colormap_length;
-    unsigned char  colormap_size;
-    unsigned short x_origin, y_origin, width, height;
-    unsigned char  pixel_size, attributes;
-}   TargaHeader_t;
-#pragma pack (pop)
-#else
-typedef struct
-{
-    unsigned char  id_length, colormap_type, image_type;
-    unsigned short colormap_index _PACK, colormap_length _PACK;
-    unsigned char  colormap_size;
-    unsigned short x_origin _PACK, y_origin _PACK, width _PACK, height _PACK;
-    unsigned char  pixel_size, attributes;
-}   TargaHeader_t;
-#endif
-
-bool    CRenderer::SaveTga(unsigned char* sourcedata, int sourceformat, int w, int h, const char* filename, bool flip) const
-{
-    //assert(0);
-    //  return CImage::SaveTga(sourcedata,sourceformat,w,h,filename,flip);
-
-    if (flip)
-    {
-        int size = w * (sourceformat / 8);
-        unsigned char* tempw = new unsigned char[size];
-        unsigned char* src1 = sourcedata;
-        unsigned char* src2 = sourcedata + (w * (sourceformat / 8)) * (h - 1);
-        for (int k = 0; k < h / 2; k++)
-        {
-            memcpy(tempw, src1, size);
-            memcpy(src1, src2, size);
-            memcpy(src2, tempw, size);
-            src1 += size;
-            src2 -= size;
-        }
-        delete[] tempw;
-    }
-
-
-    unsigned char* oldsourcedata = sourcedata;
-
-    if (sourceformat == FORMAT_8_BIT)
-    {
-        unsigned char* desttemp = new unsigned char[w * h * 3];
-        memset(desttemp, 0, w * h * 3);
-
-        unsigned char* destptr = desttemp;
-        unsigned char* srcptr = sourcedata;
-
-        unsigned char col;
-
-        for (int k = 0; k < w * h; k++)
-        {
-            col = *srcptr++;
-            *destptr++ = col;
-            *destptr++ = col;
-            *destptr++ = col;
-        }
-
-        sourcedata = desttemp;
-
-        sourceformat = FORMAT_24_BIT;
-    }
-
-    TargaHeader_t header;
-
-    memset(&header, 0, sizeof(header));
-    header.image_type = 2;
-    header.width = w;
-    header.height = h;
-    header.pixel_size = sourceformat;
-
-    unsigned char* data = new unsigned char[w * h * (sourceformat >> 3)];
-    unsigned char* dest = data;
-    unsigned char* source = sourcedata;
-
-    //memcpy(dest,source,w*h*(sourceformat>>3));
-
-    for (int ax = 0; ax < h; ax++)
-    {
-        for (int by = 0; by < w; by++)
-        {
-            unsigned char r, g, b, a;
-            r = *source;
-            source++;
-            g = *source;
-            source++;
-            b = *source;
-            source++;
-            if (sourceformat == FORMAT_32_BIT)
-            {
-                a = *source;
-                source++;
-            }
-            *dest = b;
-            dest++;
-            *dest = g;
-            dest++;
-            *dest = r;
-            dest++;
-            if (sourceformat == FORMAT_32_BIT)
-            {
-                *dest = a;
-                dest++;
-            }
-        }
-    }
-
-    AZ::IO::HandleType fileHandle = fxopen(filename, "wb");
-    if (fileHandle == AZ::IO::InvalidHandle)
-    {
-        //("Cannot save %s\n",filename);
-        delete[] data;
-        return (false);
-    }
-
-    if (!gEnv->pFileIO->Write(fileHandle, &header, sizeof(header)))
-    {
-        //CLog::LogToFile("Cannot save %s\n",filename);
-        delete[] data;
-        gEnv->pFileIO->Close(fileHandle);
-        return (false);
-    }
-
-    if (!gEnv->pFileIO->Write(fileHandle, data, w * h * (sourceformat >> 3)))
-    {
-        //CLog::LogToFile("Cannot save %s\n",filename);
-        delete[] data;
-        gEnv->pFileIO->Close(fileHandle);
-        return (false);
-    }
-
-    gEnv->pFileIO->Close(fileHandle);
-
-    delete[] data;
-    if (sourcedata != oldsourcedata)
-    {
-        delete[] sourcedata;
-    }
-
-
-    return (true);
-}
-
-//================================================================
-
-void CRenderer::EF_ReleaseInputShaderResource(SInputShaderResources* pRes)
-{
-    pRes->Cleanup();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-//#include "../Common/Character/CryModel.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_10
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-void CRenderer::ForceSwapBuffers()
-{
-    m_pRT->RC_ForceSwapBuffers();
-    ForceFlushRTCommands();
-}
-
-// Initializes the default textures as well as texture semantics
-void CRenderer::InitTexturesSemantics()
-{
-    CTextureManager::Instance()->LoadMaterialTexturesSemantics();
-}
-
-void CRenderer::InitSystemResources([[maybe_unused]] int nFlags)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    if (!m_bSystemResourcesInit || m_bDeviceLost == 2)
-    {
-        iLog->Log("*** Init system render resources ***");
-
-        bool bPrecache = CTexture::s_bPrecachePhase;
-        CTexture::s_bPrecachePhase = false;
-
-        ForceFlushRTCommands();
-        m_cEF.mfPreloadBinaryShaders();
-        m_cEF.mfLoadBasicSystemShaders();
-        m_cEF.mfLoadDefaultSystemShaders();
-
-        // The following two lines will initiate the Texture manager instance and load all 
-        // default textures and create engine textures
-        CTextureManager::Instance()->Init();
-        CTexture::LoadDefaultSystemTextures();
-
-        m_pRT->RC_CreateRenderResources();
-        m_pRT->RC_PrecacheDefaultShaders();
-        m_pRT->RC_CreateSystemTargets();
-        ForceFlushRTCommands();
-
-        CTexture::s_bPrecachePhase = bPrecache;
-
-        if (m_bDeviceLost == 2)
-        {
-            m_bDeviceLost = 0;
-        }
-        m_bSystemResourcesInit = 1;
-    }
-}
-
-void CRenderer::FreeResources(int nFlags)
-{
-    if (iLog)
-    {
-        iLog->Log("*** Start clearing render resources ***");
-    }
-
-    if (m_bEditor)
-    {
-        return;
-    }
-
-    CTimeValue tBegin = gEnv->pTimer->GetAsyncTime();
-
-    // Throughout this function, we are queuing up a lot of work to execute on the render thread while also manipulating 
-    // global state on both the render and main threads.  We need to call ForceFlushRTCommands to synchronize the main and
-    // render threads whenever we are manipulating global state on either of these threads.
-    ForceFlushRTCommands();
-
-    AZ::RenderNotificationsBus::Broadcast(&AZ::RenderNotifications::OnRendererFreeResources, nFlags);
-
-#if !defined(_RELEASE)
-    ClearDrawCallsInfo();
-#endif
-    CHWShader::mfFlushPendedShadersWait(-1);
-
-    EF_ReleaseDeferredData();
-
-    if (nFlags & FRR_FLUSH_TEXTURESTREAMING)
-    {
-        m_pRT->RC_FlushTextureStreaming(true);
-    }
-
-    if (nFlags & FRR_DELETED_MESHES)
-    {
-        for (size_t i = 0; i < MAX_RELEASED_MESH_FRAMES; ++i)
-        {
-            m_pRT->RC_ForceMeshGC(false, false);
-        }
-        ForceFlushRTCommands();
-    }
-
-    if (nFlags & FRR_SHADERS)
-    {
-        gRenDev->m_cEF.ShutDown();
-    }
-
-    if (nFlags & FRR_RP_BUFFERS)
-    {
-        ForceFlushRTCommands();
-
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            for (int j = 0; j < MAX_REND_RECURSION_LEVELS; ++j)
-            {
-                TArray<CREClientPoly*>& storage = CREClientPoly::m_PolysStorage[i][j];
-                storage.SetUse(storage.Capacity());
-                for (size_t poly = 0, polyCount = storage.Capacity(); poly != polyCount; ++poly)
-                {
-                    if (storage[poly])
-                    {
-                        storage[poly]->Release(false);
-                    }
-                }
-                storage.Free();
-
-                m_RP.m_SMFrustums[i][j].Free();
-                m_RP.m_SMCustomFrustumIDs[i][j].Free();
-                m_RP.m_DLights[i][j].Free();
-                m_RP.m_DeferredDecals[i][j].clear();
-            }
-
-            m_RP.m_arrCustomShadowMapFrustumData[i].clear();
-            m_RP.m_fogVolumeContibutionsData[i].clear();
-        }
-
-        for (int i = 0; i < sizeof(m_RP.m_RIs) / sizeof(m_RP.m_RIs[0]); ++i)
-        {
-            m_RP.m_RIs[i].Free();
-        }
-
-        stl::for_each_array(m_RP.m_SysVertexPool, stl::container_freer());
-        stl::for_each_array(m_RP.m_SysIndexPool, stl::container_freer());
-
-        // Reset render views
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-        {
-            m_RP.m_pRenderViews[i]->FreeRenderItems();
-        }
-
-        for (ShadowFrustumListsCache::iterator it = m_FrustumsCache.begin();
-             it != m_FrustumsCache.end(); ++it)
-        {
-            SAFE_DELETE(it->second);
-        }
-    }
-
-    if (nFlags & (FRR_SYSTEM | FRR_OBJECTS))
-    {
-        CMotionBlur::FreeData();
-        FurBendData::Get().FreeData();
-
-        for (int i = 0; i < 3; ++i)
-        {
-            m_SkinningDataPool[i].FreePoolMemory();
-        }
-
-        ForceFlushRTCommands();
-
-        // Get object pool range
-        CRenderObject* pObjPoolStart = &m_RP.m_ObjectsPool[0];
-        CRenderObject* pObjPoolEnd = &m_RP.m_ObjectsPool[m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT];
-
-        // Delete all items that have not been allocated from the object pool
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-        {
-            m_RP.m_TempObjects[i].clear(SDeleteNonePoolRenderObjs(pObjPoolStart, pObjPoolEnd));
-        }
-    }
-
-    if (nFlags & FRR_TEXTURES)
-    {
-        // Release the system textures on the render thread and then force that task to be completed
-        // before shutting down the texture system
-        m_pRT->RC_ReleaseSystemTextures();
-        ForceFlushRTCommands();
-
-        CTexture::ShutDown();
-    }
-
-    if (nFlags & FRR_OBJECTS)
-    {
-        for (uint32 j = 0; j < RT_COMMAND_BUF_COUNT; j++)
-        {
-            m_RP.m_TempObjects[j].clear();
-        }
-        if (m_RP.m_ObjectsPool)
-        {
-            for (int j = 0; j < (int)(m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT); j++)
-            {
-                CRenderObject* pRendObj = &m_RP.m_ObjectsPool[j];
-                pRendObj->~CRenderObject();
-            }
-
-            CryModuleMemalignFree(m_RP.m_ObjectsPool);
-            m_RP.m_ObjectsPool = NULL;
-            SAFE_DELETE(m_RP.m_pIdendityRenderObject);
-            m_RP.m_nNumObjectsInPool = 0;
-        }
-    }
-
-    if (nFlags == FRR_ALL)
-    {
-        ForceFlushRTCommands();
-        CRendElementBase::ShutDown();
-    }
-    else
-    if (nFlags & FRR_RENDERELEMENTS)
-    {
-        CRendElement::Cleanup();
-    }
-
-    if (nFlags & FRR_POST_EFFECTS)
-    {
-        m_pRT->RC_ReleasePostEffects();
-        ForceFlushRTCommands();
-    }
-
-    if (nFlags & FRR_SYSTEM_RESOURCES)
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            stl::free_container(m_RP.SShadowFrustumToRenderList[i]);
-        }
-
-        // Free sprite vertices (indices are packed into the same buffer so no need to free them explicitly);
-        CryModuleMemalignFree(m_pSpriteVerts);
-        m_pSpriteVerts = NULL;
-        m_pSpriteInds = NULL;
-
-        m_p3DEngineCommon.m_RainOccluders.Release(true);
-        m_p3DEngineCommon.m_CausticInfo.Release();
-
-        m_pRT->RC_UnbindResources();
-        m_pRT->RC_ResetGlass();        
-        m_pRT->RC_ForceMeshGC(false, false);
-        m_cEF.mfReleaseSystemShaders();
-        ForceFlushRTCommands();
-
-        m_pRT->RC_ReleaseRenderResources();
-        ForceFlushRTCommands();
-
-        if (m_pPostProcessMgr)
-        {
-            m_pPostProcessMgr->ReleaseResources();
-        }
-        ForceFlushRTCommands();
-
-        m_pRT->RC_FlushTextureStreaming(true);
-        ForceFlushRTCommands();
-
-        m_pRT->RC_ReleaseSystemTextures();
-        ForceFlushRTCommands();
-
-        m_pRT->RC_UnbindTMUs();
-
-        // This function calls FlushAndWait internally in order to synchronize the main and render threads
-        CRendElement::Cleanup();
-
-        // sync dev buffer only once per frame, to prevent syncing to the currently rendered frame
-        // which would result in a deadlock
-        if (nFlags & (FRR_SYSTEM_RESOURCES | FRR_DELETED_MESHES))
-        {
-            m_pRT->RC_DevBufferSync();
-            ForceFlushRTCommands();
-        }
-
-        PrintResourcesLeaks();
-
-        if (!m_bDeviceLost)
-        {
-            m_bDeviceLost = 2;
-        }
-        m_bSystemResourcesInit = 0;
-    }
-
-
-
-    // free flare queries
-    CRELensOptics::ClearResources();
-
-    if ((nFlags & FRR_RESTORE) && !(nFlags & FRR_SYSTEM))
-    {
-        m_cEF.mfInit();
-    }
-
-    CTimeValue tDeltaTime = gEnv->pTimer->GetAsyncTime() - tBegin;
-    if (iLog)
-    {
-        iLog->Log("*** Clearing render resources took %.1f msec ***", tDeltaTime.GetMilliSeconds());
-    }
-}
-
-Vec2 CRenderer::SetViewportDownscale(float xscale, float yscale)
-{
-#ifdef WIN32
-    // refuse to downscale in editor or if MSAA is enabled
-    if (gEnv->IsEditor() || m_RP.IsMSAAEnabled())
-    {
-        m_ReqViewportScale = Vec2(1, 1);
-        return m_ReqViewportScale;
-    }
-
-    // PC can have awkward resolutions. When setting to full scale, take it as literal (below rounding
-    // to multiple of 8 might not work as intended for some resolutions).
-    if (xscale >= 1.0f && yscale >= 1.0f)
-    {
-        m_ReqViewportScale = Vec2(1, 1);
-        return m_ReqViewportScale;
-    }
-#endif
-
-    float fWidth = float(GetWidth());
-    float fHeight = float(GetHeight());
-
-    int xres = int(fWidth * xscale);
-    int yres = int(fHeight * yscale);
-
-    // clamp to valid value
-    xres = CLAMP(xres, 128, GetWidth());
-    yres = CLAMP(yres, 128, GetHeight());
-
-    // round down to multiple of 8
-    xres &= ~0x7;
-    yres &= ~0x7;
-
-    m_ReqViewportScale.x = float(xres) / fWidth;
-    m_ReqViewportScale.y = float(yres) / fHeight;
-
-    return m_ReqViewportScale;
-}
-
-EScreenAspectRatio CRenderer::GetScreenAspect(int nWidth, int nHeight)
-{
-    EScreenAspectRatio eSA = eAspect_Unknown;
-
-    float fNeed16_9 = 16.0f / 9.0f;
-    float fNeed16_10 = 16.0f / 10.0f;
-    float fNeed4_3 = 4.0f / 3.0f;
-
-    float fCur = (float)nWidth / (float)nHeight;
-    if (fabs(fCur - fNeed16_9) < 0.1f)
-    {
-        eSA = eAspect_16_9;
-    }
-
-    if (fabs(fCur - fNeed4_3) < 0.1f)
-    {
-        eSA = eAspect_4_3;
-    }
-
-    if (fabs(fCur - fNeed16_10) < 0.1f)
-    {
-        eSA = eAspect_16_10;
-    }
-
-    return eSA;
-}
-
-bool CRenderer::WriteTGA(const byte* dat, int wdt, int hgt, const char* name, int src_bits_per_pixel, int dest_bits_per_pixel)
-{
-    return ::WriteTGA(dat, wdt, hgt, name, src_bits_per_pixel, dest_bits_per_pixel);
-}
-
-bool CRenderer::WriteDDS([[maybe_unused]] const byte* dat, [[maybe_unused]] int wdt, [[maybe_unused]] int hgt, [[maybe_unused]] int Size, [[maybe_unused]] const char* nam, [[maybe_unused]] ETEX_Format eFDst, [[maybe_unused]] int NumMips)
-{
-#if (defined(WIN32) || defined(WIN64)) && !defined(NULL_RENDERER)
-    bool bRet = true;
-
-    byte* data = NULL;
-    if (Size == 3)
-    {
-        data = new byte[wdt * hgt * 4];
-        for (int i = 0; i < wdt * hgt; i++)
-        {
-            data[i * 4 + 0] = dat[i * 3 + 0];
-            data[i * 4 + 1] = dat[i * 3 + 1];
-            data[i * 4 + 2] = dat[i * 3 + 2];
-            data[i * 4 + 3] = 255;
-        }
-        dat = data;
-    }
-    char name[256];
-    fpStripExtension(nam, name);
-    cry_strcat(name, ".dds");
-
-    bool bMips = false;
-    if (NumMips != 1)
-    {
-        bMips = true;
-    }
-    int nDxtSize;
-    byte* dst = CTexture::Convert(dat, wdt, hgt, NumMips, eTF_R8G8B8A8, eFDst, nDxtSize, true);
-    if (dst)
-    {
-        ::WriteDDS(dst, wdt, hgt, 1, name, eFDst, NumMips, eTT_2D);
-        delete[] dst;
-    }
-    if (data)
-    {
-        delete[] data;
-    }
-
-    return bRet;
-#else
-    return false;
-#endif
-}
-
-void CRenderer::EF_SetShaderMissCallback(ShaderCacheMissCallback callback)
-{
-    m_cEF.m_ShaderCacheMissCallback = callback;
-}
-
-const char* CRenderer::EF_GetShaderMissLogPath()
-{
-    return m_cEF.m_ShaderCacheMissPath.c_str();
-}
-
-string* CRenderer::EF_GetShaderNames(int& nNumShaders)
-{
-    nNumShaders = m_cEF.m_ShaderNames.size();
-    return nNumShaders ? &m_cEF.m_ShaderNames[0] : NULL;
-}
-
-IShader* CRenderer::EF_LoadShader([[maybe_unused]] const char* name, [[maybe_unused]] int flags, [[maybe_unused]] uint64 nMaskGen)
-{
-#ifdef NULL_RENDERER
-    return m_cEF.s_DefaultShader;
-#else
-    return m_cEF.mfForName(name, flags, NULL, nMaskGen);
-#endif
-}
-
-void CRenderer::EF_SetShaderQuality(EShaderType eST, EShaderQuality eSQ)
-{
-    m_pRT->RC_SetShaderQuality(eST, eSQ);
-
-    if (gEnv->p3DEngine)
-    {
-        gEnv->p3DEngine->GetMaterialManager()->RefreshMaterialRuntime();
-    }
-}
-
-uint64 CRenderer::EF_GetRemapedShaderMaskGen(const char* name, uint64 nMaskGen, bool bFixup)
-{
-    return m_cEF.mfGetRemapedShaderMaskGen(name, nMaskGen, bFixup);
-}
-
-uint64 CRenderer::EF_GetShaderGlobalMaskGenFromString(const char* szShaderName, const char* szShaderGen, uint64 nMaskGen)
-{
-    if (!m_cEF.mfUsesGlobalFlags(szShaderName))
-    {
-        return nMaskGen;
-    }
-
-    return m_cEF.mfGetShaderGlobalMaskGenFromString(szShaderGen);
-}
-
-// inverse of EF_GetShaderMaskGenFromString
-AZStd::string CRenderer::EF_GetStringFromShaderGlobalMaskGen(const char* szShaderName, uint64 nMaskGen)
-{
-    if (!m_cEF.mfUsesGlobalFlags(szShaderName))
-    {
-        return "\0";
-    }
-
-    return m_cEF.mfGetShaderBitNamesFromGlobalMaskGen(nMaskGen);
-}
-
-SShaderItem CRenderer::EF_LoadShaderItem([[maybe_unused]] const char* szName, [[maybe_unused]] bool bShare, [[maybe_unused]] int flags, [[maybe_unused]] SInputShaderResources* Res, [[maybe_unused]] uint64 nMaskGen)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-#ifdef NULL_RENDERER
-    return m_cEF.s_DefaultShaderItem;
-#else
-    return m_cEF.mfShaderItemForName(szName, bShare, flags, Res, nMaskGen);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderer::EF_ReloadFile_Request(const char* szFileName)
-{
-    // if its a source or destination texture, then post it into the queue to avoid render deadlocks:
-    if (IResourceCompilerHelper::IsSourceImageFormatSupported(szFileName))
-    {
-        // Replace image extensions with .dds extensions.
-        char realName[MAX_PATH + 1];
-        azstrncpy(realName, MAX_PATH, szFileName, MAX_PATH);
-        char* szExt = (char*)fpGetExtension(realName);
-        azstrncpy(szExt, MAX_PATH - (szExt - realName), ".dds", 4);
-        return CTexture::ReloadFile_Request(realName); // post in queue
-    }
-    else if (IResourceCompilerHelper::IsGameImageFormatSupported(szFileName))
-    {
-        return CTexture::ReloadFile_Request(szFileName); // post in queue
-    }
-
-    // the texture reader did not queue it, so try reloading it directly :
-    return EF_ReloadFile(szFileName);
-}
-
-bool CRenderer::EF_ReloadFile(const char* szFileName)
-{
-    if (!szFileName)
-    {
-        return false; //might want to check this it hits
-    }
-    char realName[MAX_PATH + 1];
-    azstrncpy(realName, MAX_PATH, szFileName, MAX_PATH);
-    const char* szExt = fpGetExtension(realName);
-
-    if (IResourceCompilerHelper::IsSourceImageFormatSupported(szExt) ||
-        IResourceCompilerHelper::IsGameImageFormatSupported(szExt)) //note: it was also looking for .pcx... removed it
-    {
-        CRY_ASSERT_MESSAGE(false, "You must call EF_ReloadFile_Request for texture assets.");
-    }
-    else if (szExt && !azstricmp(szExt, ".cgf"))
-    {
-        IStatObj* pStatObjectToReload = (gEnv && gEnv->p3DEngine) ? gEnv->p3DEngine->FindStatObjectByFilename(realName) : nullptr;
-        if (pStatObjectToReload)
-        {
-            pStatObjectToReload->Refresh(FRO_GEOMETRY | FRO_SHADERS | FRO_TEXTURES);
-            return true;
-        }
-        return false;
-    }
-    else if (szExt && (!azstricmp(szExt, ".cfx") || (!CV_r_shadersignoreincludeschanging && !azstricmp(szExt, ".cfi"))))
-    {
-        gRenDev->m_cEF.m_Bin.InvalidateCache();
-        // This is a temporary fix so that shaders would reload during hot update.
-        bool bRet = gRenDev->m_cEF.mfReloadAllShaders(FRO_SHADERS, 0);
-        if (gEnv && gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->UpdateShaderItems();
-        }
-        return bRet;
-        //    return gRenDev->m_cEF.mfReloadFile(drn, nmf, FRO_SHADERS);
-    }
-#if defined(USE_GEOM_CACHES)
-    else if (szExt && !azstricmp(szExt, ".cax"))
-    {
-        IGeomCache* pGeomCache = (gEnv && gEnv->p3DEngine) ? gEnv->p3DEngine->FindGeomCacheByFilename(realName) : nullptr;
-        if (pGeomCache)
-        {
-            pGeomCache->Reload();
-        }
-    }
-#endif //defined(USE_GEOM_CACHES)
-    return false;
-}
-
-void CRenderer::EF_ReloadShaderFiles([[maybe_unused]] int nCategory)
-{
-    //gRenDev->m_cEF.mfLoadFromFiles(nCategory);
-}
-
-void CRenderer::EF_ReloadTextures()
-{
-    CTexture::ReloadTextures();
-}
-
-_smart_ptr<IImageFile> CRenderer::EF_LoadImage(const char* szFileName, uint32 nFlags)
-{
-    return CImageFile::mfLoad_file(szFileName, nFlags);
-}
-
-bool CRenderer::EF_RenderEnvironmentCubeHDR(int size, Vec3& Pos, TArray<unsigned short>& vecData)
-{
-    return CTexture::RenderEnvironmentCMHDR(size, Pos, vecData);
-}
-
-int CRenderer::EF_LoadLightmap(const char* name)
-{
-    CTexture* tp = (CTexture*)EF_LoadTexture(name, FT_DONT_STREAM | FT_STATE_CLAMP | FT_NOMIPS);
-    if (tp->IsTextureLoaded())
-    {
-        return tp->GetID();
-    }
-    else
-    {
-        return -1;
-    }
-}
-
-ITexture* CRenderer::EF_GetTextureByID(int Id)
-{
-    if (Id > 0)
-    {
-        CTexture* tp = CTexture::GetByID(Id);
-        if (tp)
-        {
-            return tp;
-        }
-    }
-    return NULL;
-}
-
-ITexture* CRenderer::EF_GetTextureByName(const char* nameTex, uint32 flags)
-{
-    if (nameTex)
-    {
-        INDENT_LOG_DURING_SCOPE(true, "While trying to find texture '%s' flags=0x%x...", nameTex, flags);
-
-        const char* ext = fpGetExtension(nameTex);
-        if (ext != 0 && (azstricmp(ext, ".tif") == 0 || azstricmp(ext, ".hdr") == 0 || azstricmp(ext, ".png") == 0))
-        {
-            // for compilable files, register by the dds file name (to not load it twice)
-            char nameDDS[256];
-            fpStripExtension(nameTex, nameDDS);
-            cry_strcat(nameDDS, ".dds");
-
-            return CTexture::GetByName(nameDDS, flags);
-        }
-        else
-        {
-            return CTexture::GetByName(nameTex, flags);
-        }
-    }
-
-    return NULL;
-}
-
-ITexture* CRenderer::EF_LoadTexture(const char* nameTex, const uint32 flags)
-{
-    if (nameTex)
-    {
-        INDENT_LOG_DURING_SCOPE(true, "While trying to load texture '%s' flags=0x%x...", nameTex, flags);
-
-        //if its a source image format try to load the dds
-        const char* ext = fpGetExtension(nameTex);
-        if (ext != 0 && (azstricmp(ext, ".tif") == 0 || azstricmp(ext, ".hdr") == 0 || azstricmp(ext, ".png") == 0))
-        {
-            // for compilable files, register by the dds file name (to not load it twice)
-            char nameDDS[256];
-            fpStripExtension(nameTex, nameDDS);
-            cry_strcat(nameDDS, ".dds");
-
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-            if (GetISystem() && GetISystem()->GetGlobalEnvironment() && GetISystem()->GetGlobalEnvironment()->mMainThreadId == CryGetCurrentThreadId())
-            {
-                EBUS_EVENT(LoadScreenBus, UpdateAndRender);
-            }
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-            return CTexture::ForName(nameDDS, flags, eTF_Unknown);
-        }
-        else
-        {
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-            if (GetISystem() && GetISystem()->GetGlobalEnvironment() && GetISystem()->GetGlobalEnvironment()->mMainThreadId == CryGetCurrentThreadId())
-            {
-                EBUS_EVENT(LoadScreenBus, UpdateAndRender);
-            }
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-            return CTexture::ForName(nameTex, flags, eTF_Unknown);
-        }
-    }
-
-    return NULL;
-}
-
-ITexture* CRenderer::EF_LoadDefaultTexture(const char* nameTex)
-{
-    if (nameTex)
-    {
-        return CTextureManager::Instance()->GetDefaultTexture(nameTex);
-    }
-    return nullptr;
-}
-
-ITexture* CRenderer::EF_LoadCubemapTexture(const char* nameTex, const uint32 flags)
-{
-    ITexture* cubeMap = EF_LoadTexture(nameTex, flags);
-    // Explicitly set the texture type for the texture for the cases where it is not loaded
-    // at this time but the renderer still tries to bind it. On devices running Metal not doing this
-    // causes the metal validation to fail as the texture uses black, a 2D texture, as a replacement
-    // for an unloaded cubemap. Now the texture can choose to use black cubemap instead and make
-    // the validation layer happy.
-    if (cubeMap)
-    {
-        cubeMap->SetTextureType(eTT_Cube);
-    }
-    return cubeMap;
-}
-
-bool SShaderItem::Update()
-{
-    if (!(m_pShader->GetFlags() & EF_LOADED))
-    {
-        return false;
-    }
-    if ((uint32)m_nTechnique > 1000 && m_nTechnique != -1) // HACK HACK HACK
-    {
-        CCryNameTSCRC Name(m_nTechnique);
-        if (!gRenDev->m_cEF.mfUpdateTechnik(*this, Name))
-        {
-            return false;
-        }
-    }
-
-    uint32 nPreprocessFlags = PostLoad();
-
-    // force the write to m_nPreprocessFlags to be last
-    // to ensure the main thread has all correct data when the shaderitem is used
-    // (m_nPreprocessFlags can indicate a not yet initialized shaderitem)
-    MemoryBarrier();
-    m_nPreprocessFlags = nPreprocessFlags;
-    return true;
-}
-
-bool SShaderItem::RefreshResourceConstants()
-{
-    return gRenDev->m_cEF.mfRefreshResourceConstants(*this);
-}
-void CRenderer::EF_StartEf(const SRenderingPassInfo& passInfo)
-{
-    FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_RENDERER);
-    AZ_TRACE_METHOD();
-    int i;
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    int nThreadID = passInfo.ThreadID();
-    int nR = passInfo.GetRecursiveLevel();
-    assert(nR < MAX_REND_RECURSION_LEVELS);
-    if (nR == 0)
-    {
-        SRendItem::m_RecurseLevel[nThreadID] = -1;
-        CRenderView::CurrentFillView()->ClearRenderItems();
-
-        m_RP.m_TempObjects[nThreadID].resize(0);
-        m_nShadowGenId[nThreadID] = 0;
-
-        //SG frustums
-        for (i = 0; i < MAX_SHADOWMAP_FRUSTUMS; i++)
-        {
-            SRendItem::m_ShadowsStartRI[nThreadID][i] = 0;
-            SRendItem::m_ShadowsEndRI[nThreadID][i] = 0;
-        }
-
-        for (i = 0; i < (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS); i++)
-        {
-            SRendItem::m_StartFrust[nThreadID][i] = 0;
-            SRendItem::m_EndFrust[nThreadID][i] = 0;
-        }
-
-        // Clear all cached lists of shadow frustums
-        for (ShadowFrustumListsCache::iterator it = m_FrustumsCache.begin(); it != m_FrustumsCache.end(); ++it)
-        {
-            if (it->second)
-            {
-                it->second->Clear();
-            }
-        }
-
-        EF_RemovePolysFromScene();
-        m_RP.m_fogVolumeContibutionsData[nThreadID].resize(0);
-        //If we clear these flags during the recursion pass, it causes flickering and popping of objects.
-        passInfo.GetRenderView()->PrepareForWriting();
-    }
-
-#ifndef _RELEASE
-    if (nR >= MAX_REND_RECURSION_LEVELS)
-    {
-        CryLogAlways("nR (%d) >= MAX_REND_RECURSION_LEVELS (%d)\n", nR, MAX_REND_RECURSION_LEVELS);
-        __debugbreak(); // otherwise about to go out of bounds in the loop below
-    }
-#endif
-
-    m_RP.m_DeferredDecals[nThreadID][nR].clear();
-    m_RP.m_isDeferrredNormalDecals[nThreadID][nR] = false;
-
-    FurBendData::Get().OnBeginFrame();
-
-    CPostEffectsMgr* pPostEffectMgr = PostEffectMgr();
-
-    if (pPostEffectMgr)
-    {
-        pPostEffectMgr->OnBeginFrame();
-    }
-
-    SRendItem::m_RecurseLevel[nThreadID]++;
-
-    EF_ClearLightsList();
-    EF_ClearDeferredLightsList();
-}
-
-void CRenderer::RT_PostLevelLoading()
-{
-    int nThreadID = m_pRT->GetThreadList();
-    m_RP.m_fogVolumeContibutionsData[nThreadID].reserve(2048);
-   
-    m_cEF.m_Bin.InvalidateCache();
-    CHWShader::mfCleanupCache();
-    CResFile::m_nMaxOpenResFiles = 4;
-}
-
-void CRenderer::RT_DisableTemporalEffects()
-{
-    m_nDisableTemporalEffects = GetActiveGPUCount();
-}
-
-void CRenderer::DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) const
-{
-    m_pRT->RC_DrawStringU(pFont, x, y, z, pStr, asciiMultiLine, ctx);
-}
-
-void CRenderer::RT_CreateREPostProcess(CRendElementBase** re)
-{
-    *re = new CREPostProcess;
-}
-
-IRenderElement* CRenderer::EF_CreateRE(EDataType edt)
-{
-    CRendElementBase* re = NULL;
-    switch (edt)
-    {
-    case eDATA_Mesh:
-        re = new CREMeshImpl;
-        break;
-    case eDATA_Imposter:
-        re = new CREImposter;
-        break;
-    case eDATA_HDRProcess:
-        re = new CREHDRProcess;
-        break;
-
-    case eDATA_DeferredShading:
-        re = new CREDeferredShading;
-        break;
-
-    case eDATA_OcclusionQuery:
-        re = new CREOcclusionQuery;
-        break;
-
-    case eDATA_LensOptics:
-        re = new CRELensOptics;
-        break;
-    case eDATA_Cloud:
-        re = new CRECloud;
-        break;
-    case eDATA_Sky:
-        re = new CRESky;
-        break;
-
-    case eDATA_HDRSky:
-        re = new CREHDRSky;
-        break;
-
-    case eDATA_Beam:
-        re = new CREBeam;
-        break;
-
-    case eDATA_PostProcess:
-        re = new CREPostProcess;
-        break;
-
-    case eDATA_FogVolume:
-        re = new CREFogVolume;
-        break;
-
-    case eDATA_WaterVolume:
-        re = new CREWaterVolume;
-        break;
-
-    case eDATA_WaterOcean:
-        re = new CREWaterOcean;
-        break;
-    case eDATA_VolumeObject:
-        re = new CREVolumeObject;
-        break;
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-    case eDATA_PrismObject:
-        re = new CREPrismObject;
-        break;
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-    case eDATA_GameEffect:
-        re = new CREGameEffect;
-        break;
-#if defined(USE_GEOM_CACHES)
-    case eDATA_GeomCache:
-        re = new CREGeomCache;
-        break;
-#endif
-    case eDATA_Gem:
-        // For gems we return a base element which will be accessed through the IRenderElement interface.
-        // The gem is expected to provide a delegate that implement the IRenderElementDelegate interface
-        re = new CRendElementBase();
-        break;
-    }
-    return re;
-}
-
-void CRenderer::EF_RemovePolysFromScene()
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-
-    for (int i = 0; i < MAX_RECURSION_LEVELS; i++)
-    {
-        CREClientPoly::m_PolysStorage[m_RP.m_nFillThreadID][i].SetUse(0);
-    }
-    m_RP.m_SysVertexPool[m_RP.m_nFillThreadID].SetUse(0);
-    m_RP.m_SysIndexPool[m_RP.m_nFillThreadID].SetUse(0);
-}
-
-CRenderObject* CRenderer::EF_AddPolygonToScene(SShaderItem& si, int numPts, const SVF_P3F_C4B_T2F* verts, const SPipTangents* tangs, CRenderObject* obj, const SRenderingPassInfo& passInfo, uint16* inds, int ninds, int nAW, const SRendItemSorter& rendItemSorter)
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    int nThreadID = m_RP.m_nFillThreadID;
-    const uint32 nPersFlags = m_RP.m_TI[nThreadID].m_PersFlags;
-
-    assert(si.m_pShader && si.m_pShaderResources);
-    if (!si.m_pShader || !si.m_pShaderResources)
-    {
-        Warning("CRenderer::EF_AddPolygonToScene without shader...");
-        return NULL;
-    }
-    if (si.m_nPreprocessFlags == -1)
-    {
-        if (!si.Update())
-        {
-            return obj;
-        }
-    }
-
-    int recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    if (recursiveLevel < 0)
-    {
-        return NULL;
-    }
-
-    int num = CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel].Num();
-    CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel].GrowReset(1);
-
-    CREClientPoly* pl = CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel][num];
-    if (!pl)
-    {
-        pl = new CREClientPoly;
-        CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel][num] = pl;
-    }
-
-    pl->m_Shader = si;
-    pl->m_sNumVerts = numPts;
-    pl->m_pObject = obj;
-    pl->m_nCPFlags = 0;
-    pl->rendItemSorter = rendItemSorter;
-    if (nAW)
-    {
-        pl->m_nCPFlags |= CREClientPoly::efAfterWater;
-    }
-    if (passInfo.IsShadowPass())
-    {
-        pl->m_nCPFlags |= CREClientPoly::efShadowGen;
-    }
-
-    int nSize = AZ::Vertex::Format(eVF_P3F_C4B_T2F).GetStride() * numPts;
-    int nOffs = m_RP.m_SysVertexPool[nThreadID].Num();
-    SVF_P3F_C4B_T2F* vt = (SVF_P3F_C4B_T2F*)m_RP.m_SysVertexPool[nThreadID].GrowReset(nSize);
-    pl->m_nOffsVert = nOffs;
-    for (int i = 0; i < numPts; i++, vt++)
-    {
-        vt->xyz = verts[i].xyz;
-        vt->st = verts[i].st;
-        vt->color.dcolor = verts[i].color.dcolor;
-    }
-    if (tangs)
-    {
-        nSize = sizeof(SPipTangents) * numPts;
-        nOffs = m_RP.m_SysVertexPool[nThreadID].Num();
-        SPipTangents* t = (SPipTangents*)m_RP.m_SysVertexPool[nThreadID].GrowReset(nSize);
-        pl->m_nOffsTang = nOffs;
-        for (int i = 0; i < numPts; i++, t++)
-        {
-            *t = tangs[i];
-        }
-    }
-    else
-    {
-        pl->m_nOffsTang = -1;
-    }
-
-
-    pl->m_nOffsInd = m_RP.m_SysIndexPool[nThreadID].Num();
-
-    if (inds && ninds)
-    {
-        uint16* dstind = m_RP.m_SysIndexPool[nThreadID].Grow(ninds);
-        memcpy(dstind, inds, ninds * sizeof(uint16));
-        pl->m_sNumIndices = ninds;
-    }
-    else
-    {
-        uint16* dstind = m_RP.m_SysIndexPool[nThreadID].Grow((numPts - 2) * 3);
-        for (int i = 0; i < numPts - 2; i++, dstind += 3)
-        {
-            dstind[0] = 0;
-            dstind[1] = i + 1;
-            dstind[2] = i + 2;
-        }
-        pl->m_sNumIndices = (numPts - 2) * 3;
-    }
-
-    return obj;
-}
-
-CRenderObject* CRenderer::EF_AddPolygonToScene(SShaderItem& si, CRenderObject* obj, const SRenderingPassInfo& passInfo, int numPts, int ninds, SVF_P3F_C4B_T2F*& verts, SPipTangents*& tangs, uint16*& inds, int nAW, [[maybe_unused]] const SRendItemSorter& rendItemSorter)
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    int nThreadID = m_RP.m_nFillThreadID;
-    const uint32 nPersFlags = m_RP.m_TI[nThreadID].m_PersFlags;
-
-    assert(si.m_pShader && si.m_pShaderResources);
-    if (!si.m_pShader || !si.m_pShaderResources)
-    {
-        Warning("CRenderer::EF_AddPolygonToScene without shader...");
-        return NULL;
-    }
-    if (si.m_nPreprocessFlags == -1)
-    {
-        if (!si.Update())
-        {
-            return obj;
-        }
-    }
-
-    int recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(recursiveLevel >= 0);
-
-    int num = CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel].Num();
-    CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel].GrowReset(1);
-
-    CREClientPoly* pl = CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel][num];
-    if (!pl)
-    {
-        pl = new CREClientPoly;
-        CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel][num] = pl;
-    }
-
-    pl->m_Shader = si;
-    pl->m_pObject = obj;
-    if (nAW)
-    {
-        pl->m_nCPFlags |= CREClientPoly::efAfterWater;
-    }
-    if (passInfo.IsShadowPass())
-    {
-        pl->m_nCPFlags |= CREClientPoly::efShadowGen;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // allocate buffer space for caller to fill
-
-    pl->m_sNumVerts = numPts;
-    pl->m_nOffsVert = m_RP.m_SysVertexPool[nThreadID].Num();
-    pl->m_nOffsTang = m_RP.m_SysVertexPool[nThreadID].Num() + sizeof(SVF_P3F_C4B_T2F) * numPts;
-    m_RP.m_SysVertexPool[nThreadID].GrowReset((sizeof(SVF_P3F_C4B_T2F) + sizeof(SPipTangents)) * numPts);
-    verts = (SVF_P3F_C4B_T2F*)&m_RP.m_SysVertexPool[nThreadID][pl->m_nOffsVert];
-    tangs = (SPipTangents*)&m_RP.m_SysVertexPool[nThreadID][pl->m_nOffsTang];
-
-    pl->m_sNumIndices = ninds;
-    pl->m_nOffsInd = m_RP.m_SysIndexPool[nThreadID].Num();
-    inds = m_RP.m_SysIndexPool[nThreadID].Grow(ninds);
-
-    //////////////////////////////////////////////////////////////////////////
-
-    return obj;
-}
-
-void CRenderer::EF_AddClientPolys([[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-#if !defined(NULL_RENDERER)
-    AZ_TRACE_METHOD();
-    uint32 i;
-    CREClientPoly* pl;
-
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    int nThreadID = m_pRT->GetThreadList();
-    int recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(recursiveLevel >= 0);
-
-    const SThreadInfo& rTI = m_RP.m_TI[nThreadID];
-    const uint32 nPersFlags = rTI.m_PersFlags;
-
-    for (i = 0; i < CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel].Num(); i++)
-    {
-        pl = CREClientPoly::m_PolysStorage[nThreadID][recursiveLevel][i];
-
-        CShader* pShader = (CShader*)pl->m_Shader.m_pShader;
-        CShaderResources* const __restrict pShaderResources = static_cast<CShaderResources*>(pl->m_Shader.m_pShaderResources);
-        SShaderTechnique* pTech = pl->m_Shader.GetTechnique();
-
-        uint32 nBatchFlags = FB_GENERAL;
-
-        if (pl->m_Shader.m_nPreprocessFlags & FSPR_MASK)
-        {
-            passInfo.GetRenderView()->AddRenderItem(pl, pl->m_pObject, pl->m_Shader, EFSLIST_PREPROCESS, 0, FB_GENERAL, passInfo, pl->rendItemSorter);
-        }
-
-        if (pShader->GetFlags() & EF_DECAL) // || pl->m_pObject && (pl->m_pObject->m_ObjFlags & FOB_DECAL))
-        {
-            if (pTech && pTech->m_nTechnique[TTYPE_Z] > 0 && (pShader && (pShader->m_Flags & EF_SUPPORTSDEFERREDSHADING)))
-            {
-                nBatchFlags |= FB_Z;
-            }
-
-            if (!passInfo.IsShadowPass() && !(pl->m_nCPFlags & CREClientPoly::efShadowGen))
-            {
-                passInfo.GetRenderView()->AddRenderItem(pl, pl->m_pObject, pl->m_Shader, EFSLIST_DECAL, pl->m_nCPFlags & CREClientPoly::efAfterWater, nBatchFlags, passInfo, pl->rendItemSorter);
-            }
-            else if (passInfo.IsShadowPass() && (pl->m_nCPFlags & CREClientPoly::efShadowGen))
-            {
-                passInfo.GetRenderView()->AddRenderItem(pl, pl->m_pObject, pl->m_Shader, EFSLIST_SHADOW_GEN, SG_SORT_GROUP, FB_GENERAL, passInfo, pl->rendItemSorter);
-            }
-        }
-        else
-        {
-            uint32 list = EFSLIST_GENERAL;
-            if (pl->m_pObject->m_fAlpha < 1.0f || (pShaderResources && pShaderResources->IsTransparent()))
-            {
-                list = EFSLIST_TRANSP;
-            }
-            nBatchFlags |= FB_TRANSPARENT;
-            passInfo.GetRenderView()->AddRenderItem(pl, pl->m_pObject, pl->m_Shader, list, pl->m_nCPFlags & CREClientPoly::efAfterWater, nBatchFlags, passInfo, pl->rendItemSorter);
-        }
-    }
-#endif
-}
-
-
-// Dynamic lights
-bool CRenderer::EF_IsFakeDLight(const CDLight* Source)
-{
-    if (!Source)
-    {
-        iLog->Log("Warning: EF_IsFakeDLight: NULL light source\n");
-        return true;
-    }
-
-    bool bIgnore = false;
-    if (Source->m_Flags & (DLF_FAKE))
-    {
-        bIgnore = true;
-    }
-
-    return bIgnore;
-}
-
-void CRenderer::EF_CheckLightMaterial(CDLight* pLight, uint16 nRenderLightID, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT);
-    const int32 nThreadID = m_RP.m_nFillThreadID;
-    const int32 recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(recursiveLevel >= 0);
-
-    if (!(m_RP.m_TI[nThreadID].m_PersFlags & RBPF_IMPOSTERGEN))
-    {
-        // Add render element if light has mtl bound
-        IShader* pShader = pLight->m_Shader.m_pShader;
-        TArray<CRendElementBase*>* pRendElemBase = pShader ? pLight->m_Shader.m_pShader->GetREs(pLight->m_Shader.m_nTechnique) : 0;
-        if (pRendElemBase && !pRendElemBase->empty())
-        {
-            pLight->m_pObject[recursiveLevel] = EF_GetObject_Temp(passInfo.ThreadID());
-            pLight->m_pObject[recursiveLevel]->m_fAlpha = 1.0f;
-            pLight->m_pObject[recursiveLevel]->m_II.m_AmbColor = Vec3(0, 0, 0);
-
-            SRenderObjData* pOD = EF_GetObjData(pLight->m_pObject[recursiveLevel], true, passInfo.ThreadID());
-
-            pOD->m_fTempVars[0] = 0;
-            pOD->m_fTempVars[1] = 0;
-            pOD->m_fTempVars[3] = pLight->m_fRadius;
-            pOD->m_nLightID = nRenderLightID;
-
-            pLight->m_pObject[recursiveLevel]->m_II.m_AmbColor = pLight->m_Color;
-            pLight->m_pObject[recursiveLevel]->m_II.m_Matrix = pLight->m_ObjMatrix;
-
-            CRendElementBase* pRE = pRendElemBase->Get(0);
-            const int32 nList = (pRE->mfGetType() != eDATA_LensOptics) ? EFSLIST_TRANSP : EFSLIST_LENSOPTICS;
-
-            if (pRE->mfGetType() == eDATA_Beam)
-            {
-                pLight->m_Flags |= DLF_LIGHT_BEAM;
-            }
-
-            int32 nAW;
-            if (OceanToggle::IsActive() && !OceanRequest::OceanIsEnabled())
-            {
-                nAW = 1;
-            }
-            else
-            {
-                const float fWaterLevel = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : gEnv->p3DEngine->GetWaterLevel();
-                const float fCamZ = m_RP.m_TI[nThreadID].m_cam.GetPosition().z;
-                nAW = ((fCamZ - fWaterLevel) * (pLight->m_Origin.z - fWaterLevel) > 0) ? 1 : 0;
-            }
-
-            EF_AddEf(pRE, pLight->m_Shader, pLight->m_pObject[recursiveLevel], passInfo, nList, nAW, rendItemSorter);
-        }
-    }
-}
-
-void CRenderer::EF_ADDDlight(CDLight* Source, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-    if (!Source)
-    {
-        iLog->Log("Warning: EF_ADDDlight: NULL light source\n");
-        return;
-    }
-
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-
-    bool bIgnore = EF_IsFakeDLight(Source);
-
-    int nThreadID = m_RP.m_nFillThreadID;
-    int recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(recursiveLevel >= 0);
-
-    SRenderLight* pNew = NULL;
-    if (bIgnore)
-    {
-        Source->m_Id = -1;
-    }
-    else
-    {
-        assert((Source->m_Flags & DLF_LIGHTTYPE_MASK) != 0);
-        Source->m_Id = (int16)m_RP.m_DLights[nThreadID][recursiveLevel].Num();
-        if (Source->m_Id >= 32)
-        {
-            Source->m_Id = -1;
-            return;
-        }
-        pNew = m_RP.m_DLights[nThreadID][recursiveLevel].AddIndex(1);
-        memcpy(pNew, Source, sizeof(SRenderLight));
-    }
-    EF_PrecacheResource(Source, (m_RP.m_TI[nThreadID].m_cam.GetPosition() - Source->m_Origin).GetLengthSquared() / max(0.001f, Source->m_fRadius * Source->m_fRadius), 0.1f, 0, 0);
-}
-
-bool CRenderer::EF_AddDeferredDecal(const SDeferredDecal& rDecal)
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-
-    int nThreadID = m_RP.m_nFillThreadID;
-    int recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(recursiveLevel >= 0);
-    if (recursiveLevel < 0)
-    {
-        iLog->Log("Warning: CRenderer::EF_AddDeferredDecal: decal adding before calling EF_StartEf");
-        return false;
-    }
-
-    if (m_RP.m_DeferredDecals[nThreadID][recursiveLevel].size() < 1024)
-    {
-        m_RP.m_DeferredDecals[nThreadID][recursiveLevel].push_back(rDecal);
-        int nLastElem = m_RP.m_DeferredDecals[nThreadID][recursiveLevel].size() - 1;
-
-        SDeferredDecal& rDecalCopy = m_RP.m_DeferredDecals[nThreadID][recursiveLevel].at(nLastElem);
-
-        //////////////////////////////////////////////////////////////////////////
-        _smart_ptr<IMaterial> pDecalMaterial = rDecalCopy.pMaterial;
-        if (pDecalMaterial == NULL)
-        {
-            AZ_WarningOnce("Renderer", pDecalMaterial == NULL, "Decal missing material.");
-            return false;
-        }
-
-        SShaderItem& sItem = pDecalMaterial->GetShaderItem(0);
-        if (sItem.m_pShaderResources == NULL)
-        {
-            assert(0);
-            return false;
-        }
-
-        if (SEfResTexture* pNormalRes0 = sItem.m_pShaderResources->GetTextureResource((uint16)EFTT_NORMALS))
-        {
-            if (pNormalRes0->m_Sampler.m_pITex)
-            {
-                rDecalCopy.nFlags |= DECAL_HAS_NORMAL_MAP;
-                m_RP.m_isDeferrredNormalDecals[nThreadID][recursiveLevel] = true;
-            }
-            else
-            {
-                rDecalCopy.nFlags &= ~DECAL_HAS_NORMAL_MAP;
-            }
-        }
-
-        if (SEfResTexture* pSpecularRes0 = sItem.m_pShaderResources->GetTextureResource((uint16)EFTT_SPECULAR))
-        {
-            if (pSpecularRes0->m_Sampler.m_pITex)
-            {
-                rDecalCopy.nFlags |= DECAL_HAS_SPECULAR_MAP;
-            }
-            else
-            {
-                rDecalCopy.nFlags &= ~DECAL_HAS_SPECULAR_MAP;
-            }
-        }
-        //////////////////////////////////////////////////////////////////////////
-
-        if IsCVarConstAccess(constexpr) (CV_r_deferredDecalsDebug)
-        {
-            Vec3 vCenter = rDecalCopy.projMatrix.GetTranslation();
-            float fSize = rDecalCopy.projMatrix.GetColumn(2).GetLength();
-            Vec3 vSize(fSize, fSize, fSize);
-            AABB aabbCenter(vCenter - vSize * 0.05f, vCenter + vSize * 0.05f);
-            GetIRenderAuxGeom()->DrawAABB(aabbCenter, false, Col_Yellow, eBBD_Faceted);
-            GetIRenderAuxGeom()->DrawLine(vCenter, Col_Red, vCenter + rDecalCopy.projMatrix.GetColumn(0), Col_Red);
-            GetIRenderAuxGeom()->DrawLine(vCenter, Col_Green, vCenter + rDecalCopy.projMatrix.GetColumn(1), Col_Green);
-            GetIRenderAuxGeom()->DrawLine(vCenter, Col_Blue, vCenter + rDecalCopy.projMatrix.GetColumn(2), Col_Blue);
-        }
-
-        return true;
-    }
-    return false;
-}
-
-void CRenderer::EF_ClearLightsList()
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    assert(SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID] >= 0);
-    m_RP.m_DLights[m_RP.m_nFillThreadID][SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID]].SetUse(0);
-    m_RP.m_SMFrustums[m_RP.m_nFillThreadID][SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID]].SetUse(0);
-    m_RP.m_SMCustomFrustumIDs[m_RP.m_nFillThreadID][SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID]].SetUse(0);
-
-    if (SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID] == 0)
-    {
-        m_RP.m_arrCustomShadowMapFrustumData[m_RP.m_nFillThreadID].resize(0);
-    }
-}
-
-inline Matrix44 ToLightMatrix(const Ang3& angle)
-{
-    Matrix33 ViewMatZ = Matrix33::CreateRotationZ(-angle.x);
-    Matrix33 ViewMatX = Matrix33::CreateRotationX(-angle.y);
-    Matrix33 ViewMatY = Matrix33::CreateRotationY(+angle.z);
-    return Matrix44(ViewMatX * ViewMatY * ViewMatZ).GetTransposed();
-}
-
-bool CRenderer::EF_UpdateDLight(SRenderLight* dl)
-{
-    if (!dl)
-    {
-        return false;
-    }
-
-    float fTime = iTimer->GetCurrTime() * dl->GetAnimSpeed();
-
-    const uint32 nStyle = dl->m_nLightStyle;
-
-    const IAnimNode* pLightAnimNode = 0;
-
-    ILightAnimWrapper* pLightAnimWrapper = dl->m_pLightAnim;
-    IF (pLightAnimWrapper, 0)
-    {
-        pLightAnimNode = pLightAnimWrapper->GetNode();
-        IF (!pLightAnimNode, 0)
-        {
-            pLightAnimWrapper->Resolve();
-            pLightAnimNode = pLightAnimWrapper->GetNode();
-        }
-    }
-
-    IF (pLightAnimNode, 0)
-    {
-        //TODO: This may require further optimizations.
-        IAnimTrack* pPosTrack = pLightAnimNode->GetTrackForParameter(AnimParamType::Position);
-        IAnimTrack* pRotTrack = pLightAnimNode->GetTrackForParameter(AnimParamType::Rotation);
-        IAnimTrack* pColorTrack = pLightAnimNode->GetTrackForParameter(AnimParamType::LightDiffuse);
-        IAnimTrack* pDiffMultTrack = pLightAnimNode->GetTrackForParameter(AnimParamType::LightDiffuseMult);
-        IAnimTrack* pRadiusTrack = pLightAnimNode->GetTrackForParameter(AnimParamType::LightRadius);
-        IAnimTrack* pSpecMultTrack = pLightAnimNode->GetTrackForParameter(AnimParamType::LightSpecularMult);
-        IAnimTrack* pHDRDynamicTrack = pLightAnimNode->GetTrackForParameter(AnimParamType::LightHDRDynamic);
-
-        Range timeRange = const_cast<IAnimNode*>(pLightAnimNode)->GetSequence()->GetTimeRange();
-        float time = (dl->m_Flags & DLF_TRACKVIEW_TIMESCRUBBING) ? dl->m_fTimeScrubbed : fTime;
-        float phase = static_cast<float>(dl->m_nLightPhase) / 100.0f;
-
-        if (pPosTrack && pPosTrack->GetNumKeys() > 0 &&
-            !(pPosTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled))
-        {
-            Vec3 vOffset(0, 0, 0);
-            float duration = max(pPosTrack->GetKeyTime(pPosTrack->GetNumKeys() - 1), 0.001f);
-            float timeNormalized = static_cast<float>(fmod(time + phase * duration, duration));
-            pPosTrack->GetValue(timeNormalized, vOffset);
-            dl->m_Origin = dl->m_BaseOrigin + vOffset;
-        }
-
-        if (pRotTrack && pRotTrack->GetNumKeys() > 0 &&
-            !(pRotTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled))
-        {
-            Vec3 vRot(0, 0, 0);
-            float duration = max(pRotTrack->GetKeyTime(pRotTrack->GetNumKeys() - 1), 0.001f);
-            float timeNormalized = static_cast<float>(fmod(time + phase * duration, duration));
-            pRotTrack->GetValue(timeNormalized, vRot);
-            static_cast<CDLight*>(dl)->SetMatrix(
-                dl->m_BaseObjMatrix * Matrix34::CreateRotationXYZ(Ang3(DEG2RAD(vRot.x), DEG2RAD(vRot.y), DEG2RAD(vRot.z))),
-                false);
-        }
-
-        if (pColorTrack && pColorTrack->GetNumKeys() > 0 &&
-            !(pColorTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled))
-        {
-            Vec3 vColor(dl->m_Color.r, dl->m_Color.g, dl->m_Color.b);
-            float duration = max(pColorTrack->GetKeyTime(pColorTrack->GetNumKeys() - 1), 0.001f);
-            float timeNormalized = static_cast<float>(fmod(time + phase * duration, duration));
-            pColorTrack->GetValue(timeNormalized, vColor);
-            dl->m_Color = ColorF(vColor.x / 255.0f, vColor.y / 255.0f, vColor.z / 255.0f);
-        }
-        else
-        {
-            dl->m_Color = dl->m_BaseColor;
-        }
-
-        if (pDiffMultTrack && pDiffMultTrack->GetNumKeys() > 0 &&
-            !(pDiffMultTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled))
-        {
-            float diffMult = 1.0;
-            float duration = max(pDiffMultTrack->GetKeyTime(pDiffMultTrack->GetNumKeys() - 1), 0.001f);
-            float timeNormalized = static_cast<float>(fmod(time + phase * duration, duration));
-            pDiffMultTrack->GetValue(timeNormalized, diffMult);
-            dl->m_Color *= diffMult;
-        }
-
-        if (pRadiusTrack && pRadiusTrack->GetNumKeys() > 0 &&
-            !(pRadiusTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled))
-        {
-            float radius = dl->m_fRadius;
-            float duration = max(pRadiusTrack->GetKeyTime(pRadiusTrack->GetNumKeys() - 1), 0.001f);
-            float timeNormalized = static_cast<float>(fmod(time + phase * duration, duration));
-            pRadiusTrack->GetValue(timeNormalized, radius);
-            dl->m_fRadius = radius;
-        }
-
-        if (pSpecMultTrack && pSpecMultTrack->GetNumKeys() > 0 &&
-            !(pSpecMultTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled))
-        {
-            float specMult = dl->m_SpecMult;
-            float duration = max(pSpecMultTrack->GetKeyTime(pSpecMultTrack->GetNumKeys() - 1), 0.001f);
-            float timeNormalized = static_cast<float>(fmod(time + phase * duration, duration));
-            pSpecMultTrack->GetValue(timeNormalized, specMult);
-            dl->m_SpecMult = specMult;
-        }
-
-        if (pHDRDynamicTrack && pHDRDynamicTrack->GetNumKeys() > 0 &&
-            !(pHDRDynamicTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled))
-        {
-            float hdrDynamic = dl->m_fHDRDynamic;
-            float duration = max(pHDRDynamicTrack->GetKeyTime(pHDRDynamicTrack->GetNumKeys() - 1), 0.001f);
-            float timeNormalized = static_cast<float>(fmod(time + phase * duration, duration));
-            pHDRDynamicTrack->GetValue(timeNormalized, hdrDynamic);
-            dl->m_fHDRDynamic = hdrDynamic;
-        }
-    }
-    else if (nStyle > 0 && nStyle < CLightStyle::s_LStyles.Num() && CLightStyle::s_LStyles[nStyle])
-    {
-        CLightStyle* ls = CLightStyle::s_LStyles[nStyle];
-
-        const float fRecipMaxInt8 = 1.0f / 255.0f;
-
-        // Add user light phase
-        float fPhaseFromID = ((float)dl->m_nLightPhase) * fRecipMaxInt8;
-        fTime += (fPhaseFromID - floorf(fPhaseFromID)) * ls->m_TimeIncr;
-
-        ls->mfUpdate(fTime);
-
-        // It's possible the use of m_Color could be broken if ls->m_Color.a is being used for blending/fading, 
-        // because we moved probe blending out of the alpha channel into m_fProbeAttenuation. This code wasn't tested 
-        // after those changes as it only appears to be used in legacy code paths (light animation via old ScriptBind
-        // system and/or legacy LensFlareComponent). (9/20/2017, see LY-64767)
-        dl->m_Color = dl->m_BaseColor * ls->m_Color;
-        dl->m_SpecMult = dl->m_BaseSpecMult * ls->m_Color.a;
-        dl->m_Origin = dl->m_BaseOrigin + ls->m_vPosOffset;
-    }
-    else
-    {
-        dl->m_Color = dl->m_BaseColor;
-    }
-
-    return false;
-}
-
-void CRenderer::FX_ApplyShaderQuality(const EShaderType eST)
-{
-    SShaderProfile* const pSP = &m_cEF.m_ShaderProfiles[eST];
-    const uint64 quality = g_HWSR_MaskBit[HWSR_QUALITY];
-    const uint64 quality1 = g_HWSR_MaskBit[HWSR_QUALITY1];
-    m_RP.m_FlagsShader_RT &= ~(quality | quality1);
-    int nQuality = (int)pSP->GetShaderQuality();
-    m_RP.m_nShaderQuality = nQuality;
-    switch (nQuality)
-    {
-    case eSQ_Medium:
-        m_RP.m_FlagsShader_RT |= quality;
-        break;
-    case eSQ_High:
-        m_RP.m_FlagsShader_RT |= quality1;
-        break;
-    case eSQ_VeryHigh:
-        m_RP.m_FlagsShader_RT |= (quality | quality1);
-        break;
-    }
-}
-
-EShaderQuality CRenderer::EF_GetShaderQuality(EShaderType eST)
-{
-    SShaderProfile* pSP = &m_cEF.m_ShaderProfiles[eST];
-    int nQuality = (int)pSP->GetShaderQuality();
-
-    switch (nQuality)
-    {
-    case eSQ_Low:
-        return eSQ_Low;
-    case eSQ_Medium:
-        return eSQ_Medium;
-    case eSQ_High:
-        return eSQ_High;
-    case eSQ_VeryHigh:
-        return eSQ_VeryHigh;
-    }
-
-    return eSQ_Low;
-}
-
-ERenderQuality CRenderer::EF_GetRenderQuality() const
-{
-    return (ERenderQuality)m_RP.m_eQuality;
-}
-
-int CRenderer::RT_CurThreadList()
-{
-    return m_pRT->GetThreadList();
-}
-
-namespace {
-    // util funtion to write to the provided output memory
-    template<typename T>
-    void WriteQueryResult(void* pOutput, [[maybe_unused]] uint32 nOutputSize, const T& rQueryResult)
-    {
-#if !defined(_RELEASE)
-        if (pOutput == NULL)
-        {
-            CryFatalError("No Output Storage Specified");
-        }
-        if (sizeof(T) != nOutputSize)
-        {
-            CryFatalError("Insufficient storage for EF_Query Output");
-        }
-#endif
-        *alias_cast<T*>(pOutput) = rQueryResult;
-    }
-
-    // util function to read POD types from query parameters
-    template<typename T>
-    T ReadQueryParameter(void* pInput, [[maybe_unused]] uint32 nInputSize)
-    {
-#if !defined(_RELEASE)
-        if (pInput == NULL)
-        {
-            CryFatalError("No Input Storage Specified");
-        }
-        if (sizeof(T) != nInputSize)
-        {
-            CryFatalError("Insufficient storage for EF_Query Input");
-        }
-#endif
-        return *alias_cast<T*>(pInput);
-    }
-}
-
-void CRenderer::EF_QueryImpl(ERenderQueryTypes eQuery, void* pInOut0, uint32 nInOutSize0, void* pInOut1, uint32 nInOutSize1)
-{
-    switch (eQuery)
-    {
-    case EFQ_DeleteMemoryArrayPtr:
-    {
-        char* pPtr = ReadQueryParameter<char*>(pInOut0, nInOutSize0);
-        delete[] pPtr;
-    }
-    break;
-
-    case EFQ_DeleteMemoryPtr:
-    {
-        char* pPtr = ReadQueryParameter<char*>(pInOut0, nInOutSize0);
-        delete pPtr;
-    }
-    break;
-
-    case EFQ_LightSource:
-    {
-        assert(SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID] >= 0);
-        uint16 nLightId = ReadQueryParameter<uint16>(pInOut0, nInOutSize0);
-        if (m_RP.m_DLights[m_RP.m_nFillThreadID][SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID]].Num() > nLightId)
-        {
-            WriteQueryResult(pInOut1, nInOutSize1, &m_RP.m_DLights[m_RP.m_nFillThreadID][SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID]][nLightId]);
-        }
-    }
-    break;
-
-    case EFQ_MainThreadList:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_RP.m_nFillThreadID);
-    }
-    break;
-
-    case EFQ_RenderThreadList:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_RP.m_nProcessThreadID);
-    }
-    break;
-
-    case EFQ_RenderMultithreaded:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(m_pRT->IsMultithreaded()));
-    }
-    break;
-
-    case EFQ_IncrementFrameID:
-    {
-        m_RP.m_TI[m_pRT->GetThreadList()].m_nFrameID += 1;
-    }
-    break;
-
-    case EFQ_DeviceLost:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(m_bDeviceLost != 0));
-    }
-    break;
-
-    case EFQ_RecurseLevel:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, SRendItem::m_RecurseLevel[m_pRT->GetThreadList()]);
-    }
-    break;
-
-    case EFQ_Alloc_APITextures:
-    {
-        int nSize = 0;
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (pRL)
-        {
-            ResourcesMapItor itor;
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (!tp || tp->IsNoTexture())
-                {
-                    continue;
-                }
-                if (!(tp->GetFlags() & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET)))
-                {
-                    nSize += tp->GetDeviceDataSize();
-                }
-            }
-        }
-        WriteQueryResult(pInOut0, nInOutSize0, nSize);
-    }
-    break;
-
-    case EFQ_Alloc_APIMesh:
-    {
-        uint32 nSize = 0;
-        for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-        {
-            CRenderMesh* pRM = iter->item<&CRenderMesh::m_Chain>();
-            nSize += static_cast<uint32>(pRM->Size(CRenderMesh::SIZE_VB));
-            nSize += static_cast<uint32>(pRM->Size(CRenderMesh::SIZE_IB));
-        }
-        WriteQueryResult(pInOut0, nInOutSize0, nSize);
-    }
-    break;
-
-    case EFQ_Alloc_Mesh_SysMem:
-    {
-        uint32 nSize = 0;
-        for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-        {
-            CRenderMesh* pRM = iter->item<&CRenderMesh::m_Chain>();
-            nSize += static_cast<uint32>(pRM->Size(CRenderMesh::SIZE_ONLY_SYSTEM));
-        }
-        WriteQueryResult(pInOut0, nInOutSize0, nSize);
-    }
-    break;
-
-    case EFQ_Mesh_Count:
-    {
-        uint32 nCount = 0;
-        AUTO_LOCK(CRenderMesh::m_sLinkLock);
-        for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-        {
-            ++nCount;
-        }
-        WriteQueryResult(pInOut0, nInOutSize0, nCount);
-    }
-    break;
-
-    case EFQ_GetAllMeshes:
-    {
-        //Get render mesh lock, to ensure that the mesh list doesn't change while we're copying
-        AUTO_LOCK(CRenderMesh::m_sLinkLock);
-        IRenderMesh** ppMeshes = NULL;
-        uint32 nSize = 0;
-        for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-        {
-            ++nSize;
-        }
-        if (pInOut0 && nSize)
-        {
-            //allocate the array. The calling function is responsible for cleaning it up.
-            ppMeshes = new IRenderMesh*[nSize];
-            nSize = 0;
-            for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-            {
-                ppMeshes[nSize] = iter->item<&CRenderMesh::m_Chain>();
-                ;
-                nSize++;
-            }
-        }
-        WriteQueryResult(pInOut0, nInOutSize0, ppMeshes);
-        WriteQueryResult(pInOut1, nInOutSize1, nSize);
-    }
-    break;
-
-    case EFQ_GetAllTextures:
-    {
-        AUTO_LOCK(CBaseResource::s_cResLock);
-
-        SRendererQueryGetAllTexturesParam* pParam = (SRendererQueryGetAllTexturesParam*)(pInOut0);
-        pParam->pTextures = NULL;
-        pParam->numTextures = 0;
-
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (pRL)
-        {
-            for (ResourcesMapItor itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (!tp || tp->IsNoTexture())
-                {
-                    continue;
-                }
-                ++pParam->numTextures;
-            }
-
-            if (pParam->numTextures > 0)
-            {
-                pParam->pTextures = new _smart_ptr<ITexture>[pParam->numTextures];
-
-                uint32 texIdx = 0;
-                for (ResourcesMapItor itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-                {
-                    CTexture* tp = (CTexture*)itor->second;
-                    if (!tp || tp->IsNoTexture())
-                    {
-                        continue;
-                    }
-                    pParam->pTextures[texIdx++] = tp;
-                }
-            }
-        }
-    }
-    break;
-
-    case EFQ_GetAllTexturesRelease:
-    {
-        SRendererQueryGetAllTexturesParam* pParam = (SRendererQueryGetAllTexturesParam*)(pInOut0);
-        SAFE_DELETE_ARRAY(pParam->pTextures);
-    }
-    break;
-
-    case EFQ_TexturesPoolSize:
-    {
-        uint32 streamPoolSize = (uint32)(CRenderer::GetTexturesStreamPoolSize() * 1024 * 1024);
-        WriteQueryResult(pInOut0, nInOutSize0, streamPoolSize);
-    }
-    break;
-
-    case EFQ_RenderTargetPoolSize:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, (CRenderer::CV_r_rendertargetpoolsize + 2) * 1024 * 1024);
-    }
-    break;
-
-    case EFQ_HDRModeEnabled:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(IsHDRModeEnabled() ? 1 : 0));
-    }
-    break;
-
-    case EFQ_ParticlesTessellation:
-    {
-#if defined(PARTICLES_TESSELLATION_RENDERER)
-        WriteQueryResult<bool>(pInOut0, nInOutSize0, m_bDeviceSupportsTessellation && CV_r_ParticlesTessellation != 0);
-#else
-        WriteQueryResult<bool>(pInOut0, nInOutSize0, false);
-#endif
-    }
-    break;
-
-    case EFQ_WaterTessellation:
-    {
-#if defined(WATER_TESSELLATION_RENDERER)
-        WriteQueryResult<bool>(pInOut0, nInOutSize0, m_bDeviceSupportsTessellation && CV_r_WaterTessellationHW != 0);
-#else
-        WriteQueryResult<bool>(pInOut0, nInOutSize0, false);
-#endif
-    }
-    break;
-
-    case EFQ_MeshTessellation:
-    {
-#if defined(MESH_TESSELLATION_RENDERER)
-        WriteQueryResult<bool>(pInOut0, nInOutSize0, m_bDeviceSupportsTessellation);
-#else
-        WriteQueryResult<bool>(pInOut0, nInOutSize0, false);
-#endif
-    }
-    break;
-
-#ifndef _RELEASE
-    case EFQ_GetShadowPoolFrustumsNum:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_RP.m_PS[m_RP.m_nFillThreadID].m_NumShadowPoolFrustums);
-    }
-    break;
-
-    case EFQ_GetShadowPoolAllocThisFrameNum:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_RP.m_PS[m_RP.m_nFillThreadID].m_NumShadowPoolAllocsThisFrame);
-    }
-    break;
-
-    case EFQ_GetShadowMaskChannelsNum:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_RP.m_PS[m_RP.m_nFillThreadID].m_NumShadowMaskChannels);
-    }
-    break;
-
-    case EFQ_GetTiledShadingSkippedLightsNum:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_RP.m_PS[m_RP.m_nFillThreadID].m_NumTiledShadingSkippedLights);
-    }
-    break;
-#endif
-
-    case EFQ_MultiGPUEnabled:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(GetActiveGPUCount() > 1 ? 1 : 0));
-    }
-    break;
-
-    // deprecated, always enabled
-    case EFQ_sLinearSpaceShadingEnabled:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(1));
-    }
-    break;
-
-    case EFQ_SetDrawNearFov:
-    {
-        CV_r_drawnearfov = ReadQueryParameter<float>(pInOut0, nInOutSize0);
-    }
-    break;
-
-    case EFQ_GetDrawNearFov:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, CV_r_drawnearfov);
-    }
-    break;
-
-    case EFQ_TextureStreamingEnabled:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(CRenderer::CV_r_texturesstreaming ? 1 : 0));
-    }
-    break;
-
-    case EFQ_MSAAEnabled:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(m_RP.IsMSAAEnabled() ? 1 : 0));
-    }
-    break;
-
-    case EFQ_AAMode:
-    {
-        const uint32 nMode = CRenderer::CV_r_AntialiasingMode;
-        WriteQueryResult(pInOut0, nInOutSize0, s_pszAAModes[nMode]);
-    }
-    break;
-
-    case EFQ_GetShaderCombinations:
-    case EFQ_SetShaderCombinations:
-    case EFQ_CloseShaderCombinations:
-    {
-        // no longer used, can be ignored
-    }
-    break;
-
-    case EFQ_Fullscreen:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(QueryIsFullscreen() ? 1 : 0));
-    }
-    break;
-
-    case EFQ_GetTexStreamingInfo:
-    {
-#ifndef NULL_RENDERER
-        STextureStreamingStats* stats = (STextureStreamingStats*)(pInOut0);
-        if (stats)
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_11
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            stats->nCurrentPoolSize = CTexture::s_pPoolMgr->GetReservedSize();    // s_nStatsStreamPoolInUseMem;
-#endif
-            stats->nStreamedTexturesSize = CTexture::s_nStatsStreamPoolInUseMem;
-
-            stats->nStaticTexturesSize = CTexture::s_nStatsCurManagedNonStreamedTexMem;
-            stats->bPoolOverflow = CTexture::s_pTextureStreamer->IsOverflowing();
-            stats->bPoolOverflowTotally = CTexture::s_bOutOfMemoryTotally;
-            CTexture::s_bOutOfMemoryTotally = false;
-            stats->nMaxPoolSize = CRenderer::GetTexturesStreamPoolSize() * 1024 * 1024;
-            stats->nThroughput = (CTexture::s_nStreamingTotalTime > 0.f) ? size_t((double)CTexture::s_nStreamingThroughput / CTexture::s_nStreamingTotalTime) : 0;
-
-#ifndef _RELEASE
-            stats->nNumTexturesPerFrame = gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_NumTextures;
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_12
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-
-            if (stats->bComputeReuquiredTexturesPerFrame)
-            {
-                stats->nRequiredStreamedTexturesCount = 0;
-                stats->nRequiredStreamedTexturesSize = 0;
-
-                AUTO_LOCK(CBaseResource::s_cResLock);
-
-                // compute all sizes
-                SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-                if (pRL)
-                {
-                    ResourcesMapItor itor;
-                    for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-                    {
-                        CTexture* tp = (CTexture*)itor->second;
-                        if (!tp || tp->IsNoTexture() || !tp->IsStreamed())
-                        {
-                            continue;
-                        }
-
-                        const STexStreamingInfo* pTSI = tp->GetStreamingInfo();
-                        if (!pTSI)
-                        {
-                            continue;
-                        }
-
-                        int nPersMip = tp->GetNumMipsNonVirtual() - tp->GetNumPersistentMips();
-                        bool bStale = CTexture::s_pTextureStreamer->StatsWouldUnload(tp);
-                        int nCurMip = bStale ? nPersMip : tp->GetRequiredMipNonVirtual();
-                        if (tp->IsForceStreamHighRes())
-                        {
-                            nCurMip = 0;
-                        }
-                        nCurMip = min(nCurMip, nPersMip);
-
-                        int nTexSize = tp->StreamComputeDevDataSize(nCurMip);
-
-                        stats->nRequiredStreamedTexturesSize += nTexSize;
-                        ++stats->nRequiredStreamedTexturesCount;
-                    }
-                }
-            }
-
-            stats->bPoolOverflow = CTexture::s_pTextureStreamer->IsOverflowing();
-            stats->bPoolOverflowTotally = CTexture::s_bOutOfMemoryTotally;
-            CTexture::s_bOutOfMemoryTotally = 0;
-        }
-        if (pInOut1)
-        {
-            WriteQueryResult(pInOut1, nInOutSize1, static_cast<bool>(CTexture::s_nStreamingTotalTime > 0.f && stats != NULL));
-        }
-#endif // NULL_RENDERER
-    }
-    break;
-
-    case EFQ_GetShaderCacheInfo:
-    {
-        SShaderCacheStatistics* pStats = (SShaderCacheStatistics*)(pInOut0);
-        if (pStats)
-        {
-            memcpy(pStats, &m_cEF.m_ShaderCacheStats, sizeof(SShaderCacheStatistics));
-            pStats->m_bShaderCompileActive = CV_r_shadersAllowCompilation != 0;
-        }
-    }
-    break;
-
-    case EFQ_OverscanBorders:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, s_overscanBorders);
-    }
-    break;
-
-    case EFQ_NumActivePostEffects:
-    {
-        int nSize = 0;
-        if (CV_r_PostProcess && PostEffectMgr())
-        {
-            //assume query is from main thread
-            nSize = PostEffectMgr()->GetActiveEffects(m_RP.m_nFillThreadID).size();
-        }
-
-        WriteQueryResult(pInOut0, nInOutSize0, nSize);
-    }
-    break;
-
-    case EFQ_GetFogCullDistance:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_fogCullDistance);
-    }
-    break;
-
-    case EFQ_GetMaxRenderObjectsNum:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, MAX_REND_OBJECTS);
-    }
-    break;
-
-    case EFQ_IsRenderLoadingThreadActive:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, static_cast<bool>(m_pRT && m_pRT->m_pThreadLoading ? 1 : 0));
-    }
-    break;
-
-    case EFQ_GetSkinningDataPoolSize:
-    {
-        int nSkinningPoolSize = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            nSkinningPoolSize += m_SkinningDataPool[i].AllocatedMemory();
-        }
-        WriteQueryResult(pInOut0, nInOutSize0, nSkinningPoolSize);
-    }
-    break;
-
-    case EFQ_GetMeshPoolInfo:
-    {
-        if (SMeshPoolStatistics* stats = (SMeshPoolStatistics*)(pInOut0))
-        {
-            CRenderMesh::GetPoolStats(stats);
-        }
-    }
-    break;
-
-    case EFQ_GetViewportDownscaleFactor:
-    {
-        WriteQueryResult(pInOut0, nInOutSize0, m_CurViewportScale);
-    }
-    break;
-    case EFQ_ReverseDepthEnabled:
-    {
-        const uint32 nThreadID = m_pRT->GetThreadList();
-        uint32 nReverseDepth = gRenDev->m_RP.m_TI[nThreadID].m_PersFlags & RBPF_REVERSE_DEPTH;
-
-        WriteQueryResult(pInOut0, nInOutSize0, nReverseDepth);
-    }
-    break;
-    case EFQ_GetLastD3DDebugMessage:
-    {
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-        class D3DDebugMessage
-            : public ID3DDebugMessage
-        {
-        public:
-            D3DDebugMessage(const char* pMsg)
-                : m_msg(pMsg) {}
-
-            virtual void Release() { delete this; }
-            virtual const char* GetMessage() const { return m_msg.c_str(); }
-
-        protected:
-            string m_msg;
-        };
-
-        if (pInOut0)
-        {
-            *((ID3DDebugMessage**) pInOut0) = new D3DDebugMessage(D3DDebug_GetLastMessage());
-        }
-#endif
-        break;
-    }
-
-    default:
-        assert(0);
-    }
-}
-
-void CRenderer::ForceGC(){ gRenDev->m_pRT->RC_ForceMeshGC(false); }
-
-//================================================================================================================
-
-_smart_ptr<IRenderMesh> CRenderer::CreateRenderMesh(const char* szType, const char* szSourceName, IRenderMesh::SInitParamerers* pInitParams, ERenderMeshType eBufType)
-{
-    if (pInitParams)
-    {
-        return CreateRenderMeshInitialized(pInitParams->pVertBuffer, pInitParams->nVertexCount, pInitParams->vertexFormat, pInitParams->pIndices, pInitParams->nIndexCount, pInitParams->nPrimetiveType, szType, szSourceName,
-            pInitParams->eType, pInitParams->nRenderChunkCount, pInitParams->nClientTextureBindID, 0, 0, pInitParams->bOnlyVideoBuffer, pInitParams->bPrecache, pInitParams->pTangents, pInitParams->bLockForThreadAccess, pInitParams->pNormals);
-    }
-
-    // make material table with clean elements
-    _smart_ptr<CRenderMesh> pRenderMesh = new CRenderMesh(szType, szSourceName);
-    pRenderMesh->_SetRenderMeshType(eBufType);
-
-    return pRenderMesh.get();
-}
-
-// Creates the RenderMesh with the materials, secondary buffer (system buffer)
-// indices and perhaps some other stuff initialized.
-// NOTE: if the pVertBuffer is NULL, the system buffer doesn't get initialized with any values
-// (trash may be in it)
-_smart_ptr<IRenderMesh> CRenderer::CreateRenderMeshInitialized(
-    const void* pVertBuffer, int nVertCount, const AZ::Vertex::Format& vertexFormat,
-    const vtx_idx* pIndices, int nIndices,
-    const PublicRenderPrimitiveType nPrimetiveType, const char* szType, const char* szSourceName, ERenderMeshType eBufType,
-    int nMatInfoCount, int nClientTextureBindID,
-    bool(* PrepareBufferCallback)(IRenderMesh*, bool),
-    void* CustomData, bool bOnlyVideoBuffer, bool bPrecache,
-    const SPipTangents* pTangents, bool bLockForThreadAcc, Vec3* pNormals)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    _smart_ptr<CRenderMesh> pRenderMesh = new CRenderMesh(szType, szSourceName, bLockForThreadAcc);
-    pRenderMesh->_SetRenderMeshType(eBufType);
-    pRenderMesh->LockForThreadAccess();
-
-    // make mats info list
-    pRenderMesh->m_Chunks.reserve(nMatInfoCount);
-    pRenderMesh->_SetVertexFormat(vertexFormat);
-    pRenderMesh->_SetNumVerts(nVertCount);
-    pRenderMesh->_SetNumInds(nIndices);
-
-    // copy vert buffer
-    if (pVertBuffer && !PrepareBufferCallback && !bOnlyVideoBuffer)
-    {
-        pRenderMesh->UpdateVertices(pVertBuffer, nVertCount, 0, VSF_GENERAL, 0u, false);
-        if (pTangents)
-        {
-            pRenderMesh->UpdateVertices(pTangents, nVertCount, 0, VSF_TANGENTS, 0u, false);
-        }
-#if ENABLE_NORMALSTREAM_SUPPORT
-        if (pNormals)
-        {
-            pRenderMesh->UpdateVertices(pNormals, nVertCount, 0, VSF_NORMALS, 0u, false);
-        }
-#endif
-    }
-
-    if (CustomData)
-    {
-        CryFatalError("CRenderMesh::CustomData not supported anymore. Will be removed from interface");
-    }
-
-    if (pIndices)
-    {
-        pRenderMesh->UpdateIndices(pIndices, nIndices, 0, 0u, false);
-    }
-    pRenderMesh->_SetPrimitiveType(GetInternalPrimitiveType(nPrimetiveType));
-
-    pRenderMesh->m_nClientTextureBindID = nClientTextureBindID;
-
-    // Precache for static buffers
-    if (CV_r_meshprecache && pRenderMesh->GetNumVerts() && bPrecache && !m_bDeviceLost && m_pRT->IsRenderThread())
-    {
-        pRenderMesh->CheckUpdate(-1);
-    }
-
-    pRenderMesh->UnLockForThreadAccess();
-    return pRenderMesh.get();
-}
-
-//=======================================================================
-
-void CRenderer::SetWhiteTexture()
-{
-    m_pRT->RC_SetTexture(CTextureManager::Instance()->GetWhiteTexture()->GetID(), 0);
-}
-
-int CRenderer::GetWhiteTextureId() const
-{
-    const int textureId = (CTextureManager::Instance()->GetWhiteTexture()) ? CTextureManager::Instance()->GetWhiteTexture()->GetID() : -1;
-    return textureId;
-}
-
-int CRenderer::GetBlackTextureId() const
-{
-    const int textureId = (CTextureManager::Instance()->GetBlackTexture()) ? CTextureManager::Instance()->GetBlackTexture()->GetID() : -1;
-    return textureId;
-}
-
-void CRenderer::SetTexture(int tnum)
-{
-    m_pRT->RC_SetTexture(tnum, 0);
-}
-
-void CRenderer::SetTexture(int tnum, int nUnit)
-{
-    m_pRT->RC_SetTexture(tnum, nUnit);
-}
-
-// used for sprite generation
-void CRenderer::SetTextureAlphaChannelFromRGB(byte* pMemBuffer, int nTexSize)
-{
-    // set alpha channel
-    for (int y = 0; y < nTexSize; y++)
-    {
-        for (int x = 0; x < nTexSize; x++)
-        {
-            int t = (x + nTexSize * y) * 4;
-            if (abs(pMemBuffer[t + 0] - pMemBuffer[0 + 0]) < 2 &&
-                abs(pMemBuffer[t + 1] - pMemBuffer[0 + 1]) < 2 &&
-                abs(pMemBuffer[t + 2] - pMemBuffer[0 + 2]) < 2)
-            {
-                pMemBuffer[t + 3] = 0;
-            }
-            else
-            {
-                pMemBuffer[t + 3] = 255;
-            }
-
-            // set border alpha to 0
-            if (x == 0 || y == 0 || x == nTexSize - 1 || y == nTexSize - 1)
-            {
-                pMemBuffer[t + 3] = 0;
-            }
-        }
-    }
-}
-
-//=============================================================================
-// Precaching
-bool CRenderer::EF_PrecacheResource(IRenderMesh* _pPB, _smart_ptr<IMaterial> pMaterial, float fMipFactor, [[maybe_unused]] float fTimeToReady, int nFlags, int nUpdateId)
-{
-    int i;
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_texturesstreaming)
-    {
-        return true;
-    }
-
-    CRenderMesh* pPB = (CRenderMesh*)_pPB;
-
-    for (i = 0; i < pPB->m_Chunks.size(); i++)
-    {
-        CRenderChunk* pChunk = &pPB->m_Chunks[i];
-        assert(!"do pre-cache with real materials");
-
-        assert(0);
-
-        //@TODO: Timur
-        assert(pMaterial && "RenderMesh must have material");
-        CShaderResources* pSR = (CShaderResources*)pMaterial->GetShaderItem(pChunk->m_nMatID).m_pShaderResources;
-        if (!pSR)
-        {
-            continue;
-        }
-        if (pSR->m_nFrameLoad != m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameID)
-        {
-            pSR->m_nFrameLoad = m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameID;
-            pSR->m_fMinMipFactorLoad = 999999.0f;
-        }
-        else
-        if (fMipFactor >= pSR->m_fMinMipFactorLoad)
-        {
-            continue;
-        }
-
-        pSR->m_fMinMipFactorLoad = fMipFactor;
-        for (auto& iter : pSR->m_TexturesResourcesMap )
-        {
-            SEfResTexture*      pTexture = &(iter.second);
-            CTexture*           tp = static_cast<CTexture*> (pTexture->m_Sampler.m_pITex);
-            if (!tp)
-            {
-                continue;
-            }
-            fMipFactor *= pTexture->GetTiling(0) * pTexture->GetTiling(1);
-            m_pRT->RC_PrecacheResource(tp, fMipFactor, 0, nFlags, nUpdateId);
-        }
-    }
-    return true;
-}
-
-bool CRenderer::EF_PrecacheResource(CDLight* pLS, float fMipFactor, [[maybe_unused]] float fTimeToReady, int Flags, int nUpdateId)
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_texturesstreaming)
-    {
-        return true;
-    }
-
-    ITexture* pLightTexture = pLS->m_pLightImage ? pLS->m_pLightImage : NULL;
-    if (pLightTexture)
-    {
-        m_pRT->RC_PrecacheResource(pLightTexture, fMipFactor, 0, Flags, nUpdateId);
-    }
-    if (pLS->GetDiffuseCubemap())
-    {
-        m_pRT->RC_PrecacheResource(pLS->GetDiffuseCubemap(), fMipFactor, 0, Flags, nUpdateId);
-    }
-    if (pLS->GetSpecularCubemap())
-    {
-        m_pRT->RC_PrecacheResource(pLS->GetSpecularCubemap(), fMipFactor, 0, Flags, nUpdateId);
-    }
-    return true;
-}
-
-void CRenderer::PrecacheTexture(ITexture* pTP, float fMipFactor, [[maybe_unused]] float fTimeToReady, int Flags, int nUpdateId, int nCounter)
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_texturesstreaming)
-    {
-        return;
-    }
-
-    assert(m_pRT->IsRenderThread());
-
-    if (pTP)
-    {
-        ((CTexture*)pTP)->CTexture::PrecacheAsynchronously(fMipFactor, Flags, nUpdateId, nCounter);
-    }
-}
-
-bool CRenderer::EF_PrecacheResource([[maybe_unused]] IShader* pSH, [[maybe_unused]] float fMipFactor, [[maybe_unused]] float fTimeToReady, [[maybe_unused]] int Flags)
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_texturesstreaming)
-    {
-        return true;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// HDR_UPPERNORM -> factor used when converting from [0,32768] high dynamic range images
-//                  to [0,1] low dynamic range images; 32768 = 2^(2^4-1), 4 exponent bits
-// LDR_UPPERNORM -> factor used when converting from [0,1] low dynamic range images
-//                  to 8bit outputs
-
-#define HDR_UPPERNORM   1.0f    // factor set to 1.0, to be able to see content in our rather dark HDR images
-#define LDR_UPPERNORM   255.0f
-
-//////////////////////////////////////////////////////////////////////////
-// NOTE: AMD64 port: implement
-#define PROCESS_IN_PARALLEL
-
-// Squish uses non-standard inline friend templates which Recode cannot parse
-#if !defined(__RECODE__) && defined(USING_SQUISH_SDK)
-#include <squish-ccr/squish.h>
-#endif
-
-// number of bytes per block per type
-#define BLOCKSIZE_BC1   8
-#define BLOCKSIZE_BC2   16
-#define BLOCKSIZE_BC3   16
-#define BLOCKSIZE_BC4   8
-#define BLOCKSIZE_BC5   16
-#define BLOCKSIZE_BC6   16
-#define BLOCKSIZE_BC7   16
-
-#if !defined(__RECODE__) && defined(USING_SQUISH_SDK)
-struct SCompressRowData
-{
-    struct squish::sqio* pSqio;
-    byte* destinationData;
-    const byte* sourceData;
-    int row;
-    int width;
-    int height;
-    int blockWidth;
-    int blockHeight;
-    int pixelStride;
-    int rowStride;
-    int blockStride;
-    int sourceChannels;
-    int destinationChannels;
-    int offs;
-};
-
-static void DXTDecompressRow(SCompressRowData data)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-#if defined(WIN32)
-    SCOPED_DISABLE_FLOAT_EXCEPTIONS;
-#endif
-
-    byte* dst = data.destinationData + (data.row * data.rowStride);
-    const byte* src = data.sourceData + ((data.row >> 2) * data.blockStride);
-
-    for (int x = 0; x < data.width; x += data.blockWidth)
-    {
-        uint8 values[4][4][4];
-
-        // decode
-        data.pSqio->decoder((uint8*)values, const_cast<void*>(static_cast<const void*>(src)), data.pSqio->flags);
-
-        // transfer
-        for (int by = 0; by < data.blockHeight; by += 1)
-        {
-            byte* bdst = ((uint8*)dst) + (by * data.rowStride);
-
-            for (int bx = 0; bx < data.blockWidth; bx += 1)
-            {
-                bdst[bx * data.pixelStride + 0] = data.sourceChannels <= 0 ? 0U : (values[by][bx][0] + data.offs);
-                bdst[bx * data.pixelStride + 1] = data.sourceChannels <= 1 ? bdst[bx * data.pixelStride + 0] : (values[by][bx][1] + data.offs);
-                bdst[bx * data.pixelStride + 2] = data.sourceChannels <= 1 ? bdst[bx * data.pixelStride + 0] : (values[by][bx][2] + data.offs);
-                bdst[bx * data.pixelStride + 3] = data.sourceChannels <= 3 ? 255U : (values[by][bx][3]);
-            }
-        }
-
-        dst += data.blockWidth * data.pixelStride;
-        src += data.pSqio->blocksize;
-    }
-}
-
-static void DXTDecompressRowFloat(SCompressRowData data)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-#if defined(WIN32)
-    SCOPED_DISABLE_FLOAT_EXCEPTIONS;
-#endif
-
-    byte* dst = data.destinationData + (data.row * data.rowStride);
-    const byte* src = data.sourceData + ((data.row >> 2) * data.blockStride);
-
-    for (int x = 0; x < data.width; x += data.blockWidth)
-    {
-        byte values[4][4][4];
-
-        // decode
-        data.pSqio->decoder((byte*)values, const_cast<void*>(static_cast<const void*>(src)), data.pSqio->flags);
-
-        // transfer
-        for (int by = 0; by < data.blockHeight; by += 1)
-        {
-            byte* bdst = ((byte*)dst) + (by * data.rowStride);
-
-            for (int bx = 0; bx < data.blockWidth; bx += 1)
-            {
-                bdst[bx * data.pixelStride + 0] = data.sourceChannels <= 0 ? 0U : std::min((byte)255, (byte)floorf(values[by][bx][0] * LDR_UPPERNORM / HDR_UPPERNORM + 0.5f));
-                bdst[bx * data.pixelStride + 1] = data.sourceChannels <= 1 ? bdst[bx * data.pixelStride + 0] : std::min((uint8)255, (uint8)floorf(values[by][bx][1] * LDR_UPPERNORM / HDR_UPPERNORM + 0.5f));
-                bdst[bx * data.pixelStride + 2] = data.sourceChannels <= 1 ? bdst[bx * data.pixelStride + 0] : std::min((uint8)255, (uint8)floorf(values[by][bx][2] * LDR_UPPERNORM / HDR_UPPERNORM + 0.5f));
-                bdst[bx * data.pixelStride + 3] = data.sourceChannels <= 3 ? 255U : 255U;
-            }
-        }
-
-        dst += data.blockWidth * data.pixelStride;
-        src += data.pSqio->blocksize;
-    }
-}
-
-static void DXTCompressRow(SCompressRowData data)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-#if defined(WIN32)
-    SCOPED_DISABLE_FLOAT_EXCEPTIONS;
-#endif
-
-    byte* dst = data.destinationData + ((data.row >> 2) * data.blockStride);
-    const byte* src = data.sourceData + (data.row * data.rowStride);
-
-    for (int x = 0; x < data.width; x += data.blockWidth)
-    {
-        byte values[4][4][4];
-
-        // transfer
-        for (int by = 0; by < data.blockHeight; by += 1)
-        {
-            const byte* bsrc = src + (by * data.rowStride);
-
-            for (int bx = 0; bx < data.blockWidth; bx += 1)
-            {
-                values[by][bx][0] = data.destinationChannels <= 0 ? 0U : bsrc[bx * data.pixelStride + 0] - data.offs;
-                values[by][bx][1] = data.destinationChannels <= 1 ? values[by][bx][0] : bsrc[bx * data.pixelStride + 1] - data.offs;
-                values[by][bx][2] = data.destinationChannels <= 1 ? values[by][bx][0] : bsrc[bx * data.pixelStride + 2] - data.offs;
-                values[by][bx][3] = data.destinationChannels <= 3 ? 255U : bsrc[bx * data.pixelStride + 3];
-            }
-        }
-        // encode
-        data.pSqio->encoder((float*)values, 0xFFFF, (void*)dst, data.pSqio->flags);
-
-        src += data.blockWidth * data.pixelStride;
-        dst += data.pSqio->blocksize;
-    }
-}
-
-static void DXTCompressRowFloat(SCompressRowData data)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-#if defined(WIN32)
-    SCOPED_DISABLE_FLOAT_EXCEPTIONS;
-#endif
-
-    byte* dst = data.destinationData + ((data.row >> 2) * data.blockStride);
-    const byte* src = data.sourceData + (data.row * data.rowStride);
-
-    for (int x = 0; x < data.width; x += data.blockWidth)
-    {
-        float values[4][4][4];
-
-        // transfer
-        for (int by = 0; by < data.blockHeight; by += 1)
-        {
-            const byte* bsrc = src + (by * data.rowStride);
-
-            for (int bx = 0; bx < data.blockWidth; bx += 1)
-            {
-                values[by][bx][0] = data.destinationChannels <= 0 ? 0U : bsrc[bx * data.pixelStride + 0] * HDR_UPPERNORM / LDR_UPPERNORM;
-                values[by][bx][1] = data.destinationChannels <= 1 ? values[by][bx][0] : bsrc[bx * data.pixelStride + 1] * HDR_UPPERNORM / LDR_UPPERNORM;
-                values[by][bx][2] = data.destinationChannels <= 1 ? values[by][bx][0] : bsrc[bx * data.pixelStride + 2] * HDR_UPPERNORM / LDR_UPPERNORM;
-                values[by][bx][3] = data.destinationChannels <= 3 ? 255U : 1.0f;
-            }
-        }
-
-        // encode
-        data.pSqio->encoder((float*)values, 0xFFFF, (void*)dst, data.pSqio->flags);
-
-        src += data.blockWidth * data.pixelStride;
-        dst += data.pSqio->blocksize;
-    }
-}
-
-#endif // #if !defined(__RECODE__) && defined(USING_SQUISH_SDK)
-
-bool CRenderer::DXTDecompress([[maybe_unused]] const byte* sourceData, [[maybe_unused]] const size_t srcFileSize, [[maybe_unused]] byte* destinationData, [[maybe_unused]] int width, [[maybe_unused]] int height, [[maybe_unused]] int mips, [[maybe_unused]] ETEX_Format sourceFormat, bool bUseHW, [[maybe_unused]] int nDstBytesPerPix)
-{
-    if (bUseHW)
-    {
-        return false;
-    }
-
-    // Squish uses non-standard inline friend templates which Recode cannot parse
-#if !defined(__RECODE__) && defined(USING_SQUISH_SDK)
-    int flags = 0;
-    int offs = 0;
-    int sourceChannels = 4;
-    switch (sourceFormat)
-    {
-    case eTF_BC1:
-        sourceChannels = 4;
-        flags = squish::kBtc1;
-        break;
-    case eTF_BC2:
-        sourceChannels = 4;
-        flags = squish::kBtc2;
-        break;
-    case eTF_BC3:
-        sourceChannels = 4;
-        flags = squish::kBtc3;
-        break;
-    case eTF_BC4U:
-        sourceChannels = 1;
-        flags = squish::kBtc4;
-        break;
-    case eTF_BC5U:
-        sourceChannels = 2;
-        flags = squish::kBtc5 + squish::kColourMetricUnit;
-        break;
-    case eTF_BC6UH:
-        sourceChannels = 3;
-        flags = squish::kBtc6;
-        break;
-    case eTF_BC7:
-        sourceChannels = 4;
-        flags = squish::kBtc7;
-        break;
-
-    case eTF_BC4S:
-        sourceChannels = 1;
-        flags = squish::kBtc4 + squish::kSignedInternal + squish::kSignedExternal;
-        offs = 0x80;
-        break;
-    case eTF_BC5S:
-        sourceChannels = 2;
-        flags = squish::kBtc5 + squish::kSignedInternal + squish::kSignedExternal + squish::kColourMetricUnit;
-        offs = 0x80;
-        break;
-    case eTF_BC6SH:
-        sourceChannels = 3;
-        flags = squish::kBtc6 + squish::kSignedInternal + squish::kSignedExternal;
-        offs = 0x80;
-        break;
-
-    // unsupported input
-    default:
-        return false;
-    }
-
-    squish::sqio::dtp datatype = !CImageExtensionHelper::IsRangeless(sourceFormat) ? squish::sqio::DT_U8 : squish::sqio::DT_F23;
-
-    if (nDstBytesPerPix == 4)
-    {
-        datatype = squish::sqio::DT_U8;
-    }
-    //  else if (nDstBytesPerPix == 8)
-    //      datatype = squish::sqio::DT_U16;
-    //  else if (nDstBytesPerPix == 16)
-    //      datatype = squish::sqio::DT_F23;
-    else
-    {
-        // unsupported output
-        return false;
-    }
-
-    struct squish::sqio sqio = squish::GetSquishIO(width, height, datatype, flags);
-
-    const int blockChannels = 4;
-    const int blockWidth = 4;
-    const int blockHeight = 4;
-
-    SCompressRowData data;
-    data.pSqio = &sqio;
-    data.destinationData = destinationData;
-    data.sourceData = sourceData;
-    data.width = width;
-    data.height = height;
-    data.blockWidth = blockWidth;
-    data.blockHeight = blockHeight;
-    data.pixelStride = blockChannels * sizeof(uint8);
-    data.rowStride = data.pixelStride * width;
-    data.blockStride = sqio.blocksize * (width >> 2);
-    data.sourceChannels = sourceChannels;
-    data.offs = offs;
-
-    if ((datatype == squish::sqio::DT_U8) && (nDstBytesPerPix == 4))
-    {
-        for (int y = 0; y < height; y += blockHeight)
-        {
-            data.row = y;
-            DXTDecompressRow(data);
-        }
-    }
-    else if ((datatype == squish::sqio::DT_F23) && (nDstBytesPerPix == 4))
-    {
-        for (int y = 0; y < height; y += blockHeight)
-        {
-            data.row = y;
-            DXTDecompressRowFloat(data);
-        }
-    }
-    else
-    {
-        // implement decode to 16bit and floats
-        assert(0);
-        delete[] destinationData;
-        return false;
-    }
-
-    return true;
-#else
-    return false;
-#endif
-}
-
-bool CRenderer::DXTCompress(const byte* sourceData, int width, int height, [[maybe_unused]] ETEX_Format destinationFormat, bool bUseHW, bool bGenMips, int nSrcBytesPerPix, [[maybe_unused]] MIPDXTcallback callback)
-{
-    if (bUseHW)
-    {
-        return false;
-    }
-    if (bGenMips)
-    {
-        return false;
-    }
-    if IsCVarConstAccess(constexpr) (CV_r_TextureCompressor == 0)
-    {
-        return false;
-    }
-
-#ifdef WIN32
-    if (IsBadReadPtr(sourceData, width * height * nSrcBytesPerPix))
-    {
-        assert(0);
-        iLog->Log("Warning: CRenderer::DXTCompress: invalid data passed to the function");
-        return false;
-    }
-#endif
-
-#if !defined(__RECODE__) && defined(USING_SQUISH_SDK)
-    int flags = 0;
-    int offs = 0;
-    int destinationChannels = 4;
-    switch (destinationFormat)
-    {
-    // fastest encoding parameters possible
-    case eTF_BC1:
-        destinationChannels = 4;
-        flags = squish::kBtc1 + squish::kColourMetricPerceptual + squish::kColourRangeFit + squish::kExcludeAlphaFromPalette;
-        break;
-    case eTF_BC2:
-        destinationChannels = 4;
-        flags = squish::kBtc2 + squish::kColourMetricPerceptual + squish::kColourRangeFit /*squish::kWeightColourByAlpha*/;
-        break;
-    case eTF_BC3:
-        destinationChannels = 4;
-        flags = squish::kBtc3 + squish::kColourMetricPerceptual + squish::kColourRangeFit /*squish::kWeightColourByAlpha*/;
-        break;
-    case eTF_BC4U:
-        destinationChannels = 1;
-        flags = squish::kBtc4 + squish::kColourMetricUniform;
-        break;
-    case eTF_BC5U:
-        destinationChannels = 2;
-        flags = squish::kBtc5 + squish::kColourMetricUnit;
-        break;
-    case eTF_BC6UH:
-        destinationChannels = 3;
-        flags = squish::kBtc6 + squish::kColourMetricPerceptual + squish::kColourRangeFit;
-        break;
-    case eTF_BC7:
-        destinationChannels = 4;
-        flags = squish::kBtc7 + squish::kColourMetricPerceptual + squish::kColourRangeFit;
-        break;
-
-    case eTF_BC4S:
-        destinationChannels = 1;
-        flags = squish::kBtc4 + squish::kSignedInternal + squish::kSignedExternal + squish::kColourMetricUniform;
-        offs = 0x80;
-        break;
-    case eTF_BC5S:
-        destinationChannels = 2;
-        flags = squish::kBtc5 + squish::kSignedInternal + squish::kSignedExternal + squish::kColourMetricUnit;
-        offs = 0x80;
-        break;
-    case eTF_BC6SH:
-        destinationChannels = 3;
-        flags = squish::kBtc6 + squish::kSignedInternal + squish::kSignedExternal;
-        offs = 0x80;
-        break;
-
-    // unsupported output
-    default:
-        return false;
-    }
-
-    squish::sqio::dtp datatype = !CImageExtensionHelper::IsRangeless(destinationFormat) ? squish::sqio::DT_U8 : squish::sqio::DT_F23;
-
-    if (nSrcBytesPerPix == 4)
-    {
-        datatype = squish::sqio::DT_U8;
-    }
-    //  else if (nSrcBytesPerPix == 8)
-    //      datatype = squish::sqio::DT_U16;
-    //  else if (nSrcBytesPerPix == 16)
-    //      datatype = squish::sqio::DT_F23;
-    else
-    {
-        // unsupported input
-        return false;
-    }
-
-    struct squish::sqio sqio = squish::GetSquishIO(width, height, datatype, flags);
-
-    uint8* destinationData = new uint8[sqio.compressedsize];
-    if (!destinationData)
-    {
-        return false;
-    }
-
-    const int blockChannels = 4;
-    const int blockWidth = 4;
-    const int blockHeight = 4;
-
-    SCompressRowData data;
-    data.pSqio = &sqio;
-    data.destinationData = destinationData;
-    data.sourceData = sourceData;
-    data.width = width;
-    data.height = height;
-    data.blockWidth = blockWidth;
-    data.blockHeight = blockHeight;
-    data.pixelStride = blockChannels * sizeof(uint8);
-    data.rowStride = data.pixelStride * width;
-    data.blockStride = sqio.blocksize * (width >> 2);
-    data.destinationChannels = destinationChannels;
-    data.offs = offs;
-
-    if ((datatype == squish::sqio::DT_U8) && (nSrcBytesPerPix == 4))
-    {
-        for (int y = 0; y < height; y += blockHeight)
-        {
-            data.row = y;
-            DXTCompressRow(data);
-        }
-    }
-    else if ((datatype == squish::sqio::DT_F23) && (nSrcBytesPerPix == 4))
-    {
-        for (int y = 0; y < height; y += blockHeight)
-        {
-            data.row = y;
-            DXTCompressRowFloat(data);
-        }
-    }
-    else
-    {
-        // implement encode from 16bit and floats
-        assert(0);
-        delete[] destinationData;
-        return false;
-    }
-
-
-    (*callback)(destinationData, sqio.compressedsize, NULL);
-    delete[] destinationData;
-
-    return true;
-#else
-    return false;
-#endif
-}
-bool CRenderer::WriteJPG(const byte* dat, int wdt, int hgt, char* name, int src_bits_per_pixel, int nQuality)
-{
-    return ::WriteJPG(dat, wdt, hgt, name, src_bits_per_pixel, nQuality);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::GetThreadIDs(threadID& mainThreadID, threadID& renderThreadID) const
-{
-    if (m_pRT)
-    {
-        mainThreadID = m_pRT->m_nMainThread;
-        renderThreadID = m_pRT->m_nRenderThread;
-    }
-    else
-    {
-        mainThreadID = renderThreadID = gEnv->mMainThreadId;
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::PostLevelLoading()
-{
-    int nThreadID = m_pRT->GetThreadList();
-    m_RP.m_fogVolumeContibutionsData[nThreadID].reserve(2048);
-}
-
-const char* CRenderer::GetTextureFormatName(ETEX_Format eTF)
-{
-    return CTexture::NameForTextureFormat(eTF);
-}
-
-int CRenderer::GetTextureFormatDataSize(int nWidth, int nHeight, int nDepth, int nMips, ETEX_Format eTF)
-{
-    return CTexture::TextureDataSize(nWidth, nHeight, nDepth, nMips, 1, eTF);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-ERenderType CRenderer::GetRenderType() const
-{
-#if defined(NULL_RENDERER)
-    return eRT_Null;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_CPP_SECTION_13
-    #include AZ_RESTRICTED_FILE(Renderer_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(CRY_USE_METAL)
-    return eRT_Metal;
-#elif defined(OPENGL)
-    return eRT_OpenGL;
-#elif defined(CRY_USE_DX12)
-    return eRT_DX12;
-#else
-    return eRT_DX11;
-#endif
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void IRenderer::SDrawCallCountInfo::Update(CRenderObject* pObj, IRenderMesh* pRM)
-{
-    SRenderPipeline& RESTRICT_REFERENCE rRP = gRenDev->m_RP;
-    if (((IRenderNode*)pObj->m_pRenderNode))
-    {
-        pPos = pObj->GetTranslation();
-
-        if (meshName[0] == '\0')
-        {
-            const char* pMeshName = pRM->GetSourceName();
-            if (pMeshName)
-            {
-                const size_t nameLen = strlen(pMeshName);
-
-                // truncate if necessary
-                if (nameLen >= sizeof(meshName))
-                {
-                    pMeshName += nameLen - (sizeof(meshName) - 1);
-                }
-                cry_strcpy(meshName, pMeshName);
-            }
-
-            const char* pTypeName = pRM->GetTypeName();
-            if (pTypeName)
-            {
-                cry_strcpy(typeName, pTypeName);
-            }
-        }
-
-        if (rRP.m_nBatchFilter & (FB_MOTIONBLUR | FB_CUSTOM_RENDER | FB_POST_3D_RENDER | FB_SOFTALPHATEST | FB_DEBUG))
-        {
-            nMisc++;
-        }
-        else
-        if (!(rRP.m_TI[rRP.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN))
-        {
-            if (rRP.m_nBatchFilter & FB_GENERAL)
-            {
-                if (rRP.m_nPassGroupID == EFSLIST_TRANSP)
-                {
-                    nTransparent++;
-                }
-                else
-                {
-                    nGeneral++;
-                }
-            }
-            else if (rRP.m_nBatchFilter & (FB_Z | FB_ZPREPASS))
-            {
-                nZpass++;
-            }
-        }
-        else
-        {
-            nShadows++;
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void S3DEngineCommon::Update(threadID nThreadID)
-{
-    I3DEngine* p3DEngine = gEnv->p3DEngine;
-
-    // Camera vis area
-    IVisArea* pCamVisArea = p3DEngine->GetVisAreaFromPos(gRenDev->GetViewParameters().vOrigin);
-    m_pCamVisAreaInfo.nFlags &= ~VAF_MASK;
-    if (pCamVisArea)
-    {
-        m_pCamVisAreaInfo.nFlags |= VAF_EXISTS_FOR_POSITION;
-        if (pCamVisArea->IsConnectedToOutdoor())
-        {
-            m_pCamVisAreaInfo.nFlags |= VAF_CONNECTED_TO_OUTDOOR;
-        }
-        if (pCamVisArea->IsAffectedByOutLights())
-        {
-            m_pCamVisAreaInfo.nFlags |= VAF_AFFECTED_BY_OUT_LIGHTS;
-        }
-    }
-
-    // Update ocean info
-    m_OceanInfo.m_fWaterLevel = OceanToggle::IsActive() ? OceanRequest::GetWaterLevel(gRenDev->GetViewParameters().vOrigin) : p3DEngine->GetWaterLevel(&gRenDev->GetViewParameters().vOrigin);
-    m_OceanInfo.m_nOceanRenderFlags = p3DEngine->GetOceanRenderFlags();
-
-    if IsCVarConstAccess(constexpr) (bool( CRenderer::CV_r_rain))
-    {
-        const int nFrmID = gRenDev->GetFrameID();
-        if (m_RainInfo.nUpdateFrameID != nFrmID)
-        {
-            UpdateRainInfo(nThreadID);
-            UpdateSnowInfo(nThreadID);
-            m_RainInfo.nUpdateFrameID = nFrmID;
-        }
-    }
-
-    // Release rain occluders
-    if (CRenderer::CV_r_rain < 2 || m_RainInfo.bDisableOcclusion)
-    {
-        m_RainOccluders.Release();
-        stl::free_container(m_RainOccluders.m_arrCurrOccluders[nThreadID]);
-        m_RainInfo.bApplyOcclusion = false;
-    }
-}
-
-void S3DEngineCommon::UpdateRainInfo(threadID nThreadID)
-{
-    gEnv->p3DEngine->GetRainParams(m_RainInfo);
-
-    bool bProcessedAll = true;
-    const uint32 numGPUs = gRenDev->GetActiveGPUCount();
-    for (uint32 i = 0; i < numGPUs; ++i)
-    {
-        bProcessedAll &= m_RainOccluders.m_bProcessed[i];
-    }
-    const bool bUpdateOcc = bProcessedAll;
-    if (bUpdateOcc)
-    {
-        m_RainOccluders.Release();
-    }
-
-    const Vec3 vCamPos = gRenDev->GetViewParameters().vOrigin;
-    const float fUnderWaterAtten = clamp_tpl(vCamPos.z - m_OceanInfo.m_fWaterLevel + 1.f, 0.f, 1.f);
-    m_RainInfo.fCurrentAmount *= fUnderWaterAtten;
-
-    //#define RAIN_DEBUG
-#ifndef RAIN_DEBUG
-    if (m_RainInfo.fCurrentAmount < 0.05f)
-    {
-        return;
-    }
-#endif
-
-#ifdef RAIN_DEBUG
-    m_RainInfo.fAmount = 1.f;
-    m_RainInfo.fCurrentAmount = 1.f;
-    m_RainInfo.fRadius = 2000.f;
-    m_RainInfo.fFakeGlossiness = 0.5f;
-    m_RainInfo.fFakeReflectionAmount = 1.5f;
-    m_RainInfo.fDiffuseDarkening = 0.5f;
-    m_RainInfo.fRainDropsAmount = 0.5f;
-    m_RainInfo.fRainDropsSpeed = 1.f;
-    m_RainInfo.fRainDropsLighting = 1.f;
-    m_RainInfo.fMistAmount = 3.f;
-    m_RainInfo.fMistHeight = 8.f;
-    m_RainInfo.fPuddlesAmount = 1.5f;
-    m_RainInfo.fPuddlesMaskAmount = 1.0f;
-    m_RainInfo.fPuddlesRippleAmount = 2.0f;
-    m_RainInfo.fSplashesAmount = 1.3f;
-
-    m_RainInfo.vColor.Set(1, 1, 1);
-    m_RainInfo.vWorldPos.Set(0, 0, 0);
-#endif
-
-    UpdateRainOccInfo(nThreadID);
-}
-
-void S3DEngineCommon::UpdateSnowInfo(int nThreadID)
-{
-    gEnv->p3DEngine->GetSnowSurfaceParams(m_SnowInfo.m_vWorldPos, m_SnowInfo.m_fRadius, m_SnowInfo.m_fSnowAmount, m_SnowInfo.m_fFrostAmount, m_SnowInfo.m_fSurfaceFreezing);
-    gEnv->p3DEngine->GetSnowFallParams(m_SnowInfo.m_nSnowFlakeCount, m_SnowInfo.m_fSnowFlakeSize, m_SnowInfo.m_fSnowFallBrightness, m_SnowInfo.m_fSnowFallGravityScale, m_SnowInfo.m_fSnowFallWindScale, m_SnowInfo.m_fSnowFallTurbulence, m_SnowInfo.m_fSnowFallTurbulenceFreq);
-
-    //#define RAIN_DEBUG
-#ifndef RAIN_DEBUG
-    if (m_SnowInfo.m_fSnowAmount < 0.05f && m_SnowInfo.m_fFrostAmount < 0.05f)
-    {
-        return;
-    }
-#endif
-
-    UpdateRainOccInfo(nThreadID);
-}
-
-
-void S3DEngineCommon::UpdateRainOccInfo(int nThreadID)
-{
-    bool bSnowEnabled = (m_SnowInfo.m_fSnowAmount > 0.05f || m_SnowInfo.m_fFrostAmount > 0.05f) && m_SnowInfo.m_fRadius > 0.05f;
-
-    bool bProcessedAll = true;
-    const uint32 numGPUs = gRenDev->GetActiveGPUCount();
-    for (uint32 i = 0; i < numGPUs; ++i)
-    {
-        bProcessedAll &= m_RainOccluders.m_bProcessed[i];
-    }
-    const bool bUpdateOcc = bProcessedAll; // there is no field called bForecedUpdate in RainOccluders - m_RainOccluders.bForceUpdate || bProcessedAll;
-    if (bUpdateOcc)
-    {
-        m_RainOccluders.Release();
-    }
-
-    // Get the rendering camera position from the renderer
-    const Vec3 vCamPos = gEnv->p3DEngine->GetRenderingCamera().GetPosition();
-    bool bDisableOcclusion = m_RainInfo.bDisableOcclusion;
-    static bool bOldDisableOcclusion = true;    // set to true to allow update at first run
-
-    if (CRenderer::CV_r_rain == 2 && !bDisableOcclusion)
-    {
-        N3DEngineCommon::ArrOccluders& arrOccluders = m_RainOccluders.m_arrOccluders;
-        static const unsigned int nMAX_OCCLUDERS = bSnowEnabled ? 768 : 512;
-        static const float rainBBHalfSize = 18.f;
-
-        if (bUpdateOcc)
-        {
-            // Choose world position and radius.
-            // Snow takes priority since occlusion has a much stronger impact on it.
-            Vec3 vWorldPos = bSnowEnabled ? m_SnowInfo.m_vWorldPos : m_RainInfo.vWorldPos;
-            float fRadius = bSnowEnabled ? m_SnowInfo.m_fRadius : m_RainInfo.fRadius;
-            float fViewerArea = bSnowEnabled ? 128.f : 32.f; // Snow requires further view distance, otherwise obvious "unoccluded" snow regions become visible.
-            float fOccArea = fViewerArea;
-
-            // Rain volume BB
-            AABB bbRainVol(fRadius);
-            bbRainVol.Move(vWorldPos);
-
-            // Visible area BB (Expanded to BB diagonal length to allow rotation)
-            AABB bbViewer(fViewerArea);
-            bbViewer.Move(vCamPos);
-
-            // Area around viewer/rain source BB
-            AABB bbArea(bbViewer);
-            bbArea.ClipToBox(bbRainVol);
-
-            // Snap BB to grid
-            Vec3 vSnapped = bbArea.min / rainBBHalfSize;
-            bbArea.min.Set(floor_tpl(vSnapped.x), floor_tpl(vSnapped.y), floor_tpl(vSnapped.z));
-            bbArea.min *= rainBBHalfSize;
-            vSnapped = bbArea.max / rainBBHalfSize;
-            bbArea.max.Set(ceil_tpl(vSnapped.x), ceil_tpl(vSnapped.y), ceil_tpl(vSnapped.z));
-            bbArea.max *= rainBBHalfSize;
-
-            // If occlusion map info dirty
-            static float fOccTreshold = CRenderer::CV_r_rainOccluderSizeTreshold;
-            static float fOldRadius = fRadius;
-            const AABB& oldAreaBounds = m_RainInfo.areaAABB;
-            if (!oldAreaBounds.min.IsEquivalent(bbArea.min)
-                || !oldAreaBounds.max.IsEquivalent(bbArea.max)
-                || fOldRadius != fRadius //m_RainInfo.fRadius
-                || bOldDisableOcclusion != bDisableOcclusion
-                || fOccTreshold != CRenderer::CV_r_rainOccluderSizeTreshold)
-            {
-                // Get occluders inside area
-                AZ::u32 numAllOccluders = 0;
-                const AZ::u32 numAZStaticMeshOccluders = gEnv->p3DEngine->GetObjectsByTypeInBox(eERType_StaticMeshRenderComponent, bbArea);
-                const AZ::u32 numAZSkinnedMeshOccluders = gEnv->p3DEngine->GetObjectsByTypeInBox(eERType_SkinnedMeshRenderComponent, bbArea);
-
-                numAllOccluders = numAZStaticMeshOccluders + numAZSkinnedMeshOccluders;
-
-                AZStd::vector<IRenderNode*> occluders(numAllOccluders);
-
-                //Retrieve all AZ static mesh components in the bounding box
-                if (numAZStaticMeshOccluders > 0)
-                {
-                    gEnv->p3DEngine->GetObjectsByTypeInBox(eERType_StaticMeshRenderComponent, bbArea, &occluders[0]);
-                }
-                //Retrieve all AZ skinned mesh components in the bounding box
-                if (numAZSkinnedMeshOccluders > 0)
-                {
-                    gEnv->p3DEngine->GetObjectsByTypeInBox(eERType_SkinnedMeshRenderComponent, bbArea, &occluders[numAZStaticMeshOccluders]);
-                }
-
-                // Set to new values, will be needed for other rain passes
-                m_RainInfo.areaAABB = bbArea;
-                fOccTreshold = CRenderer::CV_r_rainOccluderSizeTreshold;
-                fOldRadius = fRadius;
-
-                AABB geomBB(AABB::RESET);
-                const size_t occluderLimit = min(numAllOccluders, nMAX_OCCLUDERS);
-                arrOccluders.resize(occluderLimit);
-                // Filter occluders and get bounding box
-                for (AZStd::vector<IRenderNode*>::const_iterator it = occluders.begin();
-                     it != occluders.end() && m_RainOccluders.m_nNumOccluders < occluderLimit;
-                     it++)
-                {
-                    IRenderNode* pRndNode = *it;
-                    if (pRndNode)
-                    {
-                        const AABB& aabb = pRndNode->GetBBox();
-                        const Vec3 vDiag = aabb.max - aabb.min;
-                        const float fSqrFlatRadius = Vec2(vDiag.x, vDiag.y).GetLength2();
-                        const unsigned nRndNodeFlags = pRndNode->GetRndFlags();
-                        // TODO: rainoccluder should be the only flag tested
-                        // (ie. enabled ONLY for small subset of geometry assets - means going through all assets affected by rain)
-                        if ((fSqrFlatRadius < CRenderer::CV_r_rainOccluderSizeTreshold)
-                            || !(nRndNodeFlags & ERF_RAIN_OCCLUDER)
-                            || (nRndNodeFlags & (ERF_COLLISION_PROXY | ERF_RAYCAST_PROXY | ERF_HIDDEN)))
-                        {
-                            continue;
-                        }
-
-                        N3DEngineCommon::SRainOccluder rainOccluder;
-                        IStatObj* pObj = pRndNode->GetEntityStatObj(0, 0, &rainOccluder.m_WorldMat);
-                        if (pObj)
-                        {
-                            const size_t nPrevIdx = m_RainOccluders.m_nNumOccluders;
-                            if (pObj->GetFlags() & STATIC_OBJECT_COMPOUND)
-                            {
-                                const Matrix34A matParentTM = rainOccluder.m_WorldMat;
-                                int nSubCount = pObj->GetSubObjectCount();
-                                for (int nSubId = 0; nSubId < nSubCount && m_RainOccluders.m_nNumOccluders < occluderLimit; nSubId++)
-                                {
-                                    IStatObj::SSubObject* pSubObj = pObj->GetSubObject(nSubId);
-                                    if (pSubObj->bIdentityMatrix)
-                                    {
-                                        rainOccluder.m_WorldMat = matParentTM;
-                                    }
-                                    else
-                                    {
-                                        rainOccluder.m_WorldMat = matParentTM * pSubObj->localTM;
-                                    }
-
-                                    IStatObj* pSubStatObj = pSubObj->pStatObj;
-                                    if (pSubStatObj && pSubStatObj->GetRenderMesh())
-                                    {
-                                        rainOccluder.m_RndMesh = pSubStatObj->GetRenderMesh();
-                                        arrOccluders[m_RainOccluders.m_nNumOccluders++] = rainOccluder;
-                                    }
-                                }
-                            }
-                            else if (pObj->GetRenderMesh())
-                            {
-                                rainOccluder.m_RndMesh = pObj->GetRenderMesh();
-                                arrOccluders[m_RainOccluders.m_nNumOccluders++] = rainOccluder;
-                            }
-
-                            if (m_RainOccluders.m_nNumOccluders > nPrevIdx)
-                            {
-                                geomBB.Add(pRndNode->GetBBox());
-                            }
-                        }
-                    }
-                }
-                const bool bProcess = m_RainOccluders.m_nNumOccluders == 0;
-                for (uint32 i = 0; i < numGPUs; ++i)
-                {
-                    m_RainOccluders.m_bProcessed[i] = bProcess;
-                }
-                m_RainInfo.bApplyOcclusion = m_RainOccluders.m_nNumOccluders > 0;
-
-                geomBB.ClipToBox(bbArea);
-
-                // Clip to ocean level
-                if (OceanToggle::IsActive())
-                {
-                    if (OceanRequest::OceanIsEnabled())
-                    {
-                        geomBB.min.z = max(geomBB.min.z, OceanRequest::GetOceanLevel()) - 0.5f;
-                    }
-                }
-                else
-                {
-                    geomBB.min.z = max(geomBB.min.z, gEnv->p3DEngine->GetWaterLevel()) - 0.5f;
-                }
-
-                float fWaterOffset = m_OceanInfo.m_fWaterLevel - geomBB.min.z;
-                fWaterOffset = (float)fsel(fWaterOffset, fWaterOffset, 0.0f);
-
-                geomBB.min.z += fWaterOffset - 0.5f;
-                geomBB.max.z += fWaterOffset;
-
-                Vec3 vSnappedCenter = bbArea.GetCenter() / rainBBHalfSize;
-                vSnappedCenter.Set(floor_tpl(vSnappedCenter.x), floor_tpl(vSnappedCenter.y), floor_tpl(vSnappedCenter.z));
-                vSnappedCenter *= rainBBHalfSize;
-
-                AABB occBB(fOccArea);
-                occBB.Move(vSnappedCenter);
-                occBB.min.z = max(occBB.min.z, geomBB.min.z);
-                occBB.max.z = min(occBB.max.z, geomBB.max.z);
-
-                // Generate rotation matrix part-way from identity
-                //  - Typical shadow filtering issues at grazing angles
-                Quat qOcc = m_RainInfo.qRainRotation;
-                qOcc.SetSlerp(qOcc, Quat::CreateIdentity(), 0.75f);
-                Matrix44 matRot(Matrix33(qOcc.GetInverted()));
-
-                // Get occlusion transformation matrix
-                Matrix44& matOccTrans = m_RainInfo.matOccTrans;
-                Matrix44 matScale;
-                matOccTrans.SetIdentity();
-                matOccTrans.SetTranslation(-occBB.min);
-                matScale.SetIdentity();
-                const Vec3 vScale(occBB.max - occBB.min);
-                matScale.m00 = 1.f / vScale.x;
-                matScale.m11 = 1.f / vScale.y;
-                matScale.m22 = 1.f / vScale.z;
-                matOccTrans = matRot * matScale * matOccTrans;
-            }
-        }
-
-#if (defined(WIN32) || defined(WIN64)) && !defined(_RELEASE)
-        if (m_RainOccluders.m_nNumOccluders >= nMAX_OCCLUDERS)
-        {
-            CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING,
-                "Reached max rain occluder limit (Max: %i), some objects may have been discarded!", nMAX_OCCLUDERS);
-        }
-#endif
-
-        m_RainOccluders.m_arrCurrOccluders[nThreadID].resize(m_RainOccluders.m_nNumOccluders);
-        std::copy(arrOccluders.begin(), arrOccluders.begin() + m_RainOccluders.m_nNumOccluders, m_RainOccluders.m_arrCurrOccluders[nThreadID].begin());
-    }
-
-    bOldDisableOcclusion = bDisableOcclusion;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-namespace WaterVolumeStaticData {
-    void GetMemoryUsage(ICrySizer* pSizer);
-}
-
-void CRenderer::GetMemoryUsage(ICrySizer* pSizer)
-{
-    // should be called by all derived classes
-    for (uint32 i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        pSizer->AddObject(m_TextMessages[i]);
-    }
-    pSizer->AddObject(m_RP);
-    pSizer->AddObject(m_pRT);
-# if 0 //XXXXXXXXXXXXXXXXXXXXXXX
-    pSizer->AddObject(m_DevBufMan);
-# endif
-    WaterVolumeStaticData::GetMemoryUsage(pSizer);
-}
-
-// retrieves the bandwidth calculations for the audio streaming
-void CRenderer::GetBandwidthStats([[maybe_unused]] float* fBandwidthRequested)
-{
-#if !defined (_RELEASE)
-    if (fBandwidthRequested)
-    {
-        *fBandwidthRequested = (CTexture::s_nBytesSubmittedToStreaming + CTexture::s_nBytesRequiredNotSubmitted) / 1024.0f;
-    }
-#endif
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::SetTextureStreamListener([[maybe_unused]] ITextureStreamListener* pListener)
-{
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-    CTexture::s_pStreamListener = pListener;
-#endif
-}
-//////////////////////////////////////////////////////////////////////////
-float CRenderer::GetGPUFrameTime()
-{
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    //  TODO: if this won't work consider different frame time calculation
-    return gEnv->pTimer->GetRealFrameTime();
-#else
-#if 0
-    //If we are CPU bound and the GPU is starved for data, this causes idle time on the GPU
-    //between events, so the gpu timer events cannot be relied upon
-
-    if (GpuTimerEvent::s_eventCount[GpuTimerEvent::s_readIdx] > 0)
-    {
-        LARGE_INTEGER ticksPerSecond;
-        QueryPerformanceFrequency(&ticksPerSecond);
-
-        //Grab GPU frame time - assume first event
-        return GpuTimerEvent::s_events[GpuTimerEvent::s_readIdx][0].totalTime / (double)ticksPerSecond.QuadPart;
-    }
-    return 0.f;
-#else
-    int nThr = m_pRT->GetThreadList();
-    float fGPUidle = m_fTimeGPUIdlePercent[nThr] * 0.01f; // normalise %
-    float fGPUload = 1.0f - fGPUidle; // normalised non-idle time
-    float fGPUtime = (m_fTimeProcessedGPU[nThr] * fGPUload); //GPU time in seconds
-    return fGPUtime;
-#endif
-#endif
-}
-
-void CRenderer::GetRenderTimes(SRenderTimes& outTimes)
-{
-    int nThr = m_pRT->GetThreadList();
-    //Query render times on main thread
-    outTimes.fWaitForMain = m_fTimeWaitForMain[nThr];
-    outTimes.fWaitForRender = m_fTimeWaitForRender[nThr];
-    outTimes.fWaitForGPU = m_fTimeWaitForGPU[nThr];
-    outTimes.fTimeProcessedRT = m_fTimeProcessedRT[nThr];
-    outTimes.fTimeProcessedRTScene = m_RP.m_PS[nThr].m_fRenderTime;
-    outTimes.fTimeProcessedGPU = m_fTimeProcessedGPU[nThr];
-    outTimes.fTimeGPUIdlePercent = m_fTimeGPUIdlePercent[nThr];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::PreShutDown()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::PostShutDown()
-{
-    if (CTextureManager::InstanceExists())
-        CTextureManager::Instance()->Release();
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-bool CRenderer::IsCustomRenderModeEnabled([[maybe_unused]] uint32 nRenderModeMask)
-{
-    assert(nRenderModeMask);
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderer::IsPost3DRendererEnabled() const
-{
-    CPostEffectsMgr* pPostEffectMgr = PostEffectMgr();
-    if (!pPostEffectMgr || !pPostEffectMgr->IsCreated())
-    {
-        return false;
-    }
-
-    CPostEffect* pPost3DRenderer = pPostEffectMgr->GetEffect(ePFX_Post3DRenderer);
-    if (pPost3DRenderer)
-    {
-        return pPost3DRenderer->IsActive();
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_SetPostEffectParam(const char* pParam, float fValue, bool bForceValue)
-{
-    if (pParam && m_RP.m_pREPostProcess)
-    {
-        m_RP.m_pREPostProcess->mfSetParameter(pParam, fValue, bForceValue);
-    }
-}
-
-void CRenderer::EF_SetPostEffectParamVec4(const char* pParam, const Vec4& pValue, bool bForceValue)
-{
-    if (pParam && m_RP.m_pREPostProcess)
-    {
-        m_RP.m_pREPostProcess->mfSetParameterVec4(pParam, pValue, bForceValue);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_SetPostEffectParamString(const char* pParam, const char* pszArg)
-{
-    if (pParam && pszArg && m_RP.m_pREPostProcess)
-    {
-        m_RP.m_pREPostProcess->mfSetParameterString(pParam, pszArg);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_GetPostEffectParam(const char* pParam, float& fValue)
-{
-    if (pParam && m_RP.m_pREPostProcess)
-    {
-        m_RP.m_pREPostProcess->mfGetParameter(pParam, fValue);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_GetPostEffectParamVec4(const char* pParam, Vec4& pValue)
-{
-    if (pParam && m_RP.m_pREPostProcess)
-    {
-        m_RP.m_pREPostProcess->mfGetParameterVec4(pParam, pValue);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_GetPostEffectParamString(const char* pParam, const char*& pszArg)
-{
-    if (pParam && m_RP.m_pREPostProcess)
-    {
-        m_RP.m_pREPostProcess->mfGetParameterString(pParam, pszArg);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int32 CRenderer::EF_GetPostEffectID(const char* pPostEffectName)
-{
-    if (pPostEffectName && m_RP.m_pREPostProcess)
-    {
-        return m_RP.m_pREPostProcess->mfGetPostEffectID(pPostEffectName);
-    }
-    return ePFX_Invalid;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_ResetPostEffects(bool bOnSpecChange)
-{
-    m_pRT->RC_ResetPostEffects(bOnSpecChange);
-}
-
-void CRenderer::SyncPostEffects()
-{
-    if (PostEffectMgr())
-    {
-        PostEffectMgr()->SyncMainWithRender();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_DisableTemporalEffects()
-{
-    m_pRT->RC_DisableTemporalEffects();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-void CRenderer::EF_AddWaterSimHit(const Vec3& vPos, const float scale, const float strength)
-{
-    CPostEffectsMgr* pPostEffectsMgr = PostEffectMgr();
-    if (pPostEffectsMgr)
-    {
-        CWaterRipples* pWaterRipplesTech = (CWaterRipples*)pPostEffectsMgr->GetEffect(ePFX_WaterRipples);
-        if (pWaterRipplesTech)
-        {
-            pWaterRipplesTech->AddHit(vPos, scale, strength);
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CRenderer::EF_DrawWaterSimHits()
-{
-    if (CPostEffectsMgr* pPostEffectsMgr = PostEffectMgr())
-    {
-        if (CWaterRipples* pWaterRipplesTech = (CWaterRipples*)pPostEffectsMgr->GetEffect(ePFX_WaterRipples))
-        {
-            pWaterRipplesTech->DEBUG_DrawWaterHits();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CRenderer::SetTexturePrecaching(bool stat)
-{
-    CTexture::s_bPrecachePhase = stat;
-}
-
-IOpticsElementBase* CRenderer::CreateOptics([[maybe_unused]] EFlareType type) const
-{
-#ifdef NULL_RENDERER
-    return NULL;
-#else
-    return COpticsFactory::GetInstance()->Create(type);
-#endif
-}
-
-void CRenderer::RT_UpdateLightVolumes([[maybe_unused]] int32 nFlags, [[maybe_unused]] int32 nRecurseLevel)
-{
-    AZ_TRACE_METHOD();
-    gEnv->p3DEngine->GetLightVolumes(m_RP.m_nProcessThreadID, m_pLightVols, m_nNumVols);
-}
-//////////////////////////////////////////////////////////////////////////
-
-SSkinningData* CRenderer::EF_CreateSkinningData(uint32 nNumBones, bool bNeedJobSyncVar, bool bUseMatrixSkinning)
-{
-    AZ_TRACE_METHOD();
-    int nList = m_nPoolIndex % 3;
-
-    uint32 skinningFlags = bUseMatrixSkinning ? eHWS_Skinning_Matrix : 0;
-
-    uint32 nNeededSize = Align(sizeof(SSkinningData), 16);
-
-    size_t boneSize = bUseMatrixSkinning ? sizeof(Matrix34) : sizeof(DualQuat);
-
-    nNeededSize += Align(nNumBones * boneSize, 16);
-    byte* pData = m_SkinningDataPool[nList].Allocate(nNeededSize);
-
-    SSkinningData* pSkinningRenderData = alias_cast<SSkinningData*>(pData);
-    pData += Align(sizeof(SSkinningData), 16);
-
-    pSkinningRenderData->pAsyncJobExecutor = bNeedJobSyncVar ? m_jobExecutorPool.Allocate() : nullptr;
-    pSkinningRenderData->pAsyncDataJobExecutor = bNeedJobSyncVar ? m_jobExecutorPool.Allocate() : nullptr;
-
-    if (bUseMatrixSkinning)
-    {
-        pSkinningRenderData->pBoneMatrices = alias_cast<Matrix34*>(pData);
-        pSkinningRenderData->pBoneQuatsS = nullptr;
-    }
-    else
-    {
-        pSkinningRenderData->pBoneQuatsS = alias_cast<DualQuat*>(pData);
-        pSkinningRenderData->pBoneMatrices = nullptr;
-    }
-
-    pData += Align(nNumBones * boneSize, 16);
-
-    pSkinningRenderData->pRemapTable = NULL;
-    pSkinningRenderData->pCustomData = NULL;
-    pSkinningRenderData->nNumBones = nNumBones;
-    pSkinningRenderData->nHWSkinningFlags = skinningFlags;
-    pSkinningRenderData->pPreviousSkinningRenderData = NULL;
-    pSkinningRenderData->pCharInstCB = FX_AllocateCharInstCB(pSkinningRenderData, m_nPoolIndex);
-    pSkinningRenderData->remapGUID = ~0u;
-
-    pSkinningRenderData->pNextSkinningData = NULL;
-    pSkinningRenderData->pMasterSkinningDataList = &pSkinningRenderData->pNextSkinningData;
-
-    return pSkinningRenderData;
-}
-
-SSkinningData* CRenderer::EF_CreateRemappedSkinningData(uint32 nNumBones, SSkinningData* pSourceSkinningData, uint32 nCustomDataSize, uint32 pairGuid)
-{
-    assert(pSourceSkinningData);
-    assert(pSourceSkinningData->nNumBones >= nNumBones); // don't try to remap more bones than exist
-
-    int nList = m_nPoolIndex % 3;
-
-    uint32 nNeededSize = Align(sizeof(SSkinningData), 16);
-    nNeededSize += Align(nCustomDataSize, 16);
-
-    byte* pData = m_SkinningDataPool[nList].Allocate(nNeededSize);
-
-    SSkinningData* pSkinningRenderData = alias_cast<SSkinningData*>(pData);
-    pData += Align(sizeof(SSkinningData), 16);
-
-    pSkinningRenderData->pRemapTable = NULL;
-
-    pSkinningRenderData->pCustomData = nCustomDataSize ? alias_cast<void*>(pData) : NULL;
-    pData += nCustomDataSize ? Align(nCustomDataSize, 16) : 0;
-
-    pSkinningRenderData->nNumBones = nNumBones;
-    pSkinningRenderData->nHWSkinningFlags = pSourceSkinningData->nHWSkinningFlags;
-    pSkinningRenderData->pPreviousSkinningRenderData = NULL;
-
-    // use actual bone information from original skinning data
-    pSkinningRenderData->pBoneQuatsS = pSourceSkinningData->pBoneQuatsS;
-    pSkinningRenderData->pBoneMatrices = pSourceSkinningData->pBoneMatrices;
-    pSkinningRenderData->pAsyncJobExecutor = pSourceSkinningData->pAsyncJobExecutor;
-    pSkinningRenderData->pAsyncDataJobExecutor = pSourceSkinningData->pAsyncDataJobExecutor;
-
-    pSkinningRenderData->pCharInstCB = pSourceSkinningData->pCharInstCB;
-
-    pSkinningRenderData->remapGUID = pairGuid;
-    pSkinningRenderData->pNextSkinningData = NULL;
-    pSkinningRenderData->pMasterSkinningDataList = &pSourceSkinningData->pNextSkinningData;
-
-    return pSkinningRenderData;
-}
-
-void CRenderer::RT_SetSkinningPoolId(uint32 poolId)
-{
-    m_nPoolIndexRT = poolId;
-}
-
-void CRenderer::EF_ClearSkinningDataPool()
-{
-    AZ_TRACE_METHOD();
-    m_pRT->RC_PushSkinningPoolId(++m_nPoolIndex);
-    m_SkinningDataPool[m_nPoolIndex % 3].ClearPool();
-    FX_ClearCharInstCB(m_nPoolIndex);
-
-    m_jobExecutorPool.AdvanceCurrent();
-}
-
-int CRenderer::EF_GetSkinningPoolID()
-{
-    return m_nPoolIndex;
-}
-
-// If the render pipeline has a reference to this shader item, set it to nullptr to avoid a dangling pointer
-void CRenderer::ClearShaderItem(SShaderItem* pShaderItem)
-{
-    if (pShaderItem->m_pShaderResources && gRenDev->m_pRT && gRenDev->m_pRT->IsRenderThread())
-    {
-        CShaderResources* shaderResources = static_cast<CShaderResources*>(pShaderItem->m_pShaderResources);
-        if (gRenDev->m_RP.m_pShaderResources == shaderResources)
-        {
-            gRenDev->m_RP.m_pShaderResources = nullptr;
-        }
-
-        for (int i = 0; i < EFTT_MAX; ++i)
-        {
-            SEfResTexture*      pTexture = shaderResources->GetTextureResource(i);
-            if (gRenDev->m_RP.m_ShaderTexResources[i] == pTexture)
-            {
-                gRenDev->m_RP.m_ShaderTexResources[i] = nullptr;
-            }
-        }
-/* @barled - adibugbug - put back in place!!!
-        for (auto iter = shaderResources->m_TexturesResourcesMap.begin(); iter != shaderResources->m_TexturesResourcesMap.end(); ++iter)
-        {
-            SEfResTexture*      pTexture = &iter->second;
-            uint16              nSlot = iter->first;
-            if (gRenDev->m_RP.m_ShaderTexResources[nSlot] == pTexture)
-            {   // Notice the usage of pointer for the comparison - should be revisited?
-                gRenDev->m_RP.m_ShaderTexResources[nSlot] = nullptr;
-            }
-        }
-*/
-    }
-}
-
-void CRenderer::UpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial)
-{
-    bool bShaderReloaded = false;
-#if !defined(_RELEASE) || (defined(WIN32) || defined(WIN64))
-    IShader* pShader = pShaderItem->m_pShader;
-    if (pShader)
-    {
-        bShaderReloaded = (pShader->GetFlags() & EF_RELOADED) != 0;
-    }
-#endif
-
-    if (pShaderItem->m_nPreprocessFlags == -1 || bShaderReloaded)
-    {
-        CRenderer::ForceUpdateShaderItem(pShaderItem, pMaterial);
-    }
-}
-
-void CRenderer::RefreshShaderResourceConstants(SShaderItem* pShaderItem, IMaterial* pMaterial)
-{
-    m_pRT->RC_RefreshShaderResourceConstants(pShaderItem, pMaterial);
-}
-
-void CRenderer::ForceUpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial)
-{
-    m_pRT->RC_UpdateShaderItem(pShaderItem, pMaterial);
-}
-
-void CRenderer::RT_UpdateShaderItem(SShaderItem* pShaderItem, IMaterial* material)
-{
-    AZ_TRACE_METHOD();
-    CShader* pShader = static_cast<CShader*>(pShaderItem->m_pShader);
-    if (pShader)
-    {
-        pShader->m_Flags &= ~EF_RELOADED;
-        pShaderItem->Update();
-    }
-
-    if (material)
-    {
-        // We received a raw pointer to the material instead of a smart_ptr because writing/reading smart pointers from
-        // the render thread queue causes the ref count to be increased incorrectly in some platforms (e.g. 32 bit architectures). 
-        // In order to keep the material reference "alive" we manually increment the reference count and decrement it when we finish using it.
-        material->AddRef();
-        AZStd::function<void()> runOnMainThread = [material]()
-        {
-            // Updating the material flags after the shader has been parse and loaded.
-            material->UpdateFlags();
-            // Remove reference that we added.
-            material->Release();
-        };
-
-        EBUS_QUEUE_FUNCTION(AZ::MainThreadRenderRequestBus, runOnMainThread);
-    }
-}
-
-void CRenderer::RT_RefreshShaderResourceConstants(SShaderItem* shaderItem) const
-{
-    if (CShader* shader = static_cast<CShader*>(shaderItem->m_pShader))
-    {
-        if (shaderItem->RefreshResourceConstants())
-        {
-            shaderItem->m_pShaderResources->UpdateConstants(shader);
-        }
-    }
-}
-
-void CRenderer::GetClampedWindowSize(int& widthPixels, int& heightPixels)
-{
-    const int maxWidth = gEnv->pConsole->GetCVar("r_maxWidth")->GetIVal();
-    const int maxHeight = gEnv->pConsole->GetCVar("r_maxheight")->GetIVal();
-
-    if (maxWidth > 0 && maxWidth < widthPixels)
-    {
-        const float widthScaleFactor = static_cast<float>(maxWidth) / static_cast<float>(widthPixels);
-        widthPixels = aznumeric_cast<int>(widthPixels * widthScaleFactor);
-        heightPixels = aznumeric_cast<int>(heightPixels * widthScaleFactor); 
-    }
-
-    if (maxHeight > 0 && maxHeight < heightPixels)
-    {
-        const float heightScaleFactor = static_cast<float>(maxHeight) / static_cast<float>(heightPixels);
-        widthPixels = aznumeric_cast<int>(widthPixels * heightScaleFactor);
-        heightPixels = aznumeric_cast<int>(heightPixels * heightScaleFactor);
-    }
-}
-
-CRenderView* CRenderer::GetRenderViewForThread(int nThreadID)
-{
-    return m_RP.m_pRenderViews[nThreadID].get();
-}
-
-bool CRenderer::UseHalfFloatRenderTargets()
-{
-#if defined(OPENGL_ES) && !defined(AZ_PLATFORM_LINUX)
-    // When using OpenGL ES on Linux, DXGL_GL_EXTENSION_SUPPORTED(EXT_color_buffer_half_float) returns false,
-    // however with at least the Mesa driver, half float render targets are natively supported.
-    return RenderCapabilities::SupportsHalfFloatRendering() && (!CRenderer::CV_r_ForceFixedPointRenderTargets);
-#else
-    return true;
-#endif
-}
-
-Matrix44A CRenderer::GetCameraMatrix()
-{
-    return m_CameraMatrix;
-}
-
-void CRenderer::SyncMainWithRender()
-{
-    const uint numListeners = m_syncMainWithRenderListeners.size();
-    for (uint i = 0; i < numListeners; ++i)
-    {
-        m_syncMainWithRenderListeners[i]->SyncMainWithRender();
-    }
-}
-
-void CRenderer::RegisterSyncWithMainListener(ISyncMainWithRenderListener* pListener)
-{
-    stl::push_back_unique(m_syncMainWithRenderListeners, pListener);
-}
-
-void CRenderer::RemoveSyncWithMainListener(const ISyncMainWithRenderListener* pListener)
-{
-    stl::find_and_erase(m_syncMainWithRenderListeners, pListener);
-}
-
-void CRenderer::UpdateCachedShadowsLodCount([[maybe_unused]] int nGsmLods) const
-{
-    OnChange_CachedShadows(NULL);
-}
-
-ITexture* CRenderer::GetWhiteTexture()
-{
-    return CTextureManager::Instance()->GetWhiteTexture();
-}
-
-ITexture* CRenderer::GetTextureForName(const char* name, uint32 nFlags, ETEX_Format eFormat)
-{
-    return CTexture::ForName(name, nFlags, eFormat);
-}
-
-int CRenderer::GetRecursionLevel()
-{
-    return SRendItem::m_RecurseLevel[GetRenderPipeline()->m_nProcessThreadID];
-}
-
-int CRenderer::GetIntegerConfigurationValue(const char* varName, int defaultValue)
-{
-    ICVar* var = varName ? gEnv->pConsole->GetCVar(varName) : nullptr;
-    AZ_Assert(var, "Unable to find cvar: %s", varName)
-    return var ? var->GetIVal() : defaultValue;
-}
-
-float CRenderer::GetFloatConfigurationValue(const char* varName, float defaultValue)
-{
-    ICVar* var = varName ? gEnv->pConsole->GetCVar(varName) : nullptr;
-    AZ_Assert(var, "Unable to find cvar: %s", varName)
-    return var ? var->GetFVal() : defaultValue;
-}
-
-bool CRenderer::GetBooleanConfigurationValue(const char* varName, bool defaultValue)
-{
-    ICVar* var = varName ? gEnv->pConsole->GetCVar(varName) : nullptr;
-    AZ_Assert(var, "Unable to find cvar: %s", varName)
-    return var ? (var->GetIVal() != 0) : defaultValue;
-}
-
-// Methods exposed to external libraries
-void CRenderer::ApplyDepthTextureState(int unit, int nFilter, bool clamp)
-{
-    CTexture::ApplyDepthTextureState(unit, nFilter, clamp);
-}
-
-ITexture* CRenderer::GetZTargetTexture()
-{
-    return CTexture::GetZTargetTexture();
-}
-
-int CRenderer::GetTextureState(const STexState& TS)
-{
-    return CTexture::GetTextureState(TS);
-}
-
-uint32 CRenderer::TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, const ETEX_Format eTF, ETEX_TileMode eTM)
-{
-    return CTexture::TextureDataSize(nWidth, nHeight, nDepth, nMips, nSlices, eTF, eTM);
-}
-
-void CRenderer::ApplyForID(int nID, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault)
-{
-    CTexture::ApplyForID(nID, nTUnit, nTState, nTexMaterialSlot, nSUnit, useWhiteDefault);
-}
-
-ITexture* CRenderer::Create3DTexture(const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst)
-{
-    return CTexture::Create3DTexture(szName, nWidth, nHeight, nDepth, nMips, nFlags, pData, eTFSrc, eTFDst);
-}
-
-bool CRenderer::IsTextureExist(const ITexture* pTex)
-{
-    return CTexture::IsTextureExist(pTex);
-}
-
-const char* CRenderer::NameForTextureFormat(ETEX_Format eTF)
-{
-    return CTexture::NameForTextureFormat(eTF);
-}
-
-const char* CRenderer::NameForTextureType(ETEX_Type eTT)
-{
-    return CTexture::NameForTextureType(eTT);
-}
-
-bool CRenderer::IsVideoThreadModeEnabled()
-{
-    return m_pRT->m_eVideoThreadMode != SRenderThread::eVTM_Disabled;
-}
-
-IDynTexture* CRenderer::CreateDynTexture2(uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool)
-{
-    return new SDynTexture2(nWidth, nHeight, nTexFlags, szSource, eTexPool);
-}
-
-uint32 CRenderer::GetCurrentTextureAtlasSize()
-{
-    return SDynTexture::s_CurTexAtlasSize;
-}
-
-void CRenderer::RT_InitializeVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer)
-{
-    AZ_Assert(pVideoRenderer != nullptr, "Expected video player to be passed in");
-
-    AZ::VideoRenderer::VideoTexturesDesc videoTexturesDesc;
-    if (pVideoRenderer && pVideoRenderer->GetVideoTexturesDesc(videoTexturesDesc))
-    {
-        AZ::VideoRenderer::VideoTextures videoTextures;
-
-        auto InitVideoTexture = [](const AZ::VideoRenderer::VideoTextureDesc& videoTextureDesc, uint32 flags) -> uint32
-        {
-            uint32 resultTextureId = 0;
-            if (videoTextureDesc.m_used)
-            {
-                CTexture* pCreatedPlaneTexture = CTexture::Create2DTexture(videoTextureDesc.m_name, videoTextureDesc.m_width, videoTextureDesc.m_height, 1, flags, nullptr, videoTextureDesc.m_format, videoTextureDesc.m_format);
-                if (pCreatedPlaneTexture != nullptr)
-                {
-                    resultTextureId = pCreatedPlaneTexture->GetTextureID();
-                }
-            }
-            return resultTextureId;
-        };
-
-        videoTextures.m_outputTextureId = InitVideoTexture(videoTexturesDesc.m_outputTextureDesc, FT_USAGE_RENDERTARGET);
-
-        for (uint32 videoIndex = 0; videoIndex < AZ::VideoRenderer::MaxInputTextureCount; videoIndex++)
-        {
-            videoTextures.m_inputTextureIds[videoIndex] = InitVideoTexture(videoTexturesDesc.m_inputTextureDescs[videoIndex], 0);
-        }
-
-        pVideoRenderer->NotifyTexturesCreated(videoTextures);
-    }
-}
-
-void CRenderer::RT_CleanupVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer)
-{
-    AZ_Assert(pVideoRenderer != nullptr, "Expected video player to be passed in");
-
-    AZ::VideoRenderer::VideoTextures videoTextures;
-    if (pVideoRenderer && pVideoRenderer->GetVideoTextures(videoTextures))
-    {
-        auto ReleaseVideoTexture = [](uint32 textureId)
-        {
-            if (textureId != 0)
-            {
-                if (CTexture* pTexture = CTexture::GetByID(textureId))
-                {
-                    pTexture->Release();
-                }
-            }
-        };
-
-        ReleaseVideoTexture(videoTextures.m_outputTextureId);
-
-        for (uint32 textureId : videoTextures.m_inputTextureIds)
-        {
-            ReleaseVideoTexture(textureId);
-        }
-
-        pVideoRenderer->NotifyTexturesDestroyed();
-    }
-}
-
-#ifndef _RELEASE
-int CRenderer::GetDrawCallsPerNode(IRenderNode* pRenderNode)
-{
-    uint32 t = m_RP.m_nFillThreadID;
-    IRenderer::RNDrawcallsMapNodeItor iter = m_RP.m_pRNDrawCallsInfoPerNode[t].find(pRenderNode);
-    if (iter != m_RP.m_pRNDrawCallsInfoPerNode[t].end())
-    {
-        SDrawCallCountInfo& pInfo = iter->second;
-        uint32 nDrawcalls = pInfo.nShadows + pInfo.nZpass + pInfo.nGeneral + pInfo.nTransparent + pInfo.nMisc;
-        return nDrawcalls;
-    }
-
-    return 0;
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/Renderer.h b/Code/CryEngine/RenderDll/Common/Renderer.h
deleted file mode 100644
index 7f731ec623..0000000000
--- a/Code/CryEngine/RenderDll/Common/Renderer.h
+++ /dev/null
@@ -1,2733 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <CryPool/PoolAlloc.h>
-#include "TextMessages.h"                                                           // CTextMessages
-#include "RenderAuxGeom.h"
-#include "Shaders/Vertex.h"
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzFramework/IO/FileOperations.h>
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-#include <AzFramework/Viewport/ViewportBus.h>
-#include <MathConversion.h>
-
-#include <LoadScreenBus.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define RENDERER_H_SECTION_1 1
-#define RENDERER_H_SECTION_2 2
-#define RENDERER_H_SECTION_3 3
-#define RENDERER_H_SECTION_4 4
-#define RENDERER_H_SECTION_5 5
-#define RENDERER_H_SECTION_6 6
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(Renderer_h)
-#endif
-
-typedef void (PROCRENDEF)(SShaderPass* l, int nPrimType);
-
-#define USE_NATIVE_DEPTH 1
-
-enum eAntialiasingType
-{
-    eAT_NOAA = 0,
-    eAT_FXAA,
-    eAT_SMAA1TX,
-    eAT_TAA,
-    eAT_AAMODES_COUNT,
-
-    eAT_DEFAULT_AA = eAT_TAA,
-
-    eAT_NOAA_MASK = (1 << eAT_NOAA),
-    eAT_FXAA_MASK = (1 << eAT_FXAA),
-    eAT_SMAA_MASK = (1 << eAT_SMAA1TX),
-    eAT_TAA_MASK  = (1 << eAT_TAA),
-
-    eAT_TEMPORAL_MASK = (eAT_TAA_MASK | eAT_SMAA_MASK),
-    eAT_JITTER_MASK = (eAT_TAA_MASK)
-};
-
-static const char* s_pszAAModes[eAT_AAMODES_COUNT] =
-{
-    "NO AA",
-    "FXAA",
-    "SMAA 1tx",
-    "TAA"
-};
-
-struct ICVar;
-struct ShadowMapFrustum;
-struct IStatObj;
-struct SShaderPass;
-class CD3DStereoRenderer;
-class IOpticsManager;
-struct SDynTexture2;
-struct SDepthTexture;
-namespace Render
-{
-    namespace Debug
-    {
-        class VRAMDriller;
-    }
-}
-
-typedef int (* pDrawModelFunc)(void);
-
-#define RENDER_LOCK_CS(csLock) CryAutoCriticalSection __AL__##__FILE__##_LINE(csLock)
-
-//=============================================================
-
-#define D3DRGBA(r, g, b, a)                                  \
-    ((((int)((a) * 255)) << 24) | (((int)((r) * 255)) << 16) \
-     |   (((int)((g) * 255)) << 8) | (int)((b) * 255)        \
-    )
-
-#define CONSOLES_BACKBUFFER_WIDTH CRenderer::CV_r_ConsoleBackbufferWidth
-#define CONSOLES_BACKBUFFER_HEIGHT CRenderer::CV_r_ConsoleBackbufferHeight
-
-// Assuming 24 bits of depth precision
-#define DBT_SKY_CULL_DEPTH  0.99999994f
-
-#define DEF_SHAD_DBT_DEFAULT_VAL 1
-
-#if defined(AZ_PLATFORM_IOS) || defined (AZ_PLATFORM_ANDROID)
-    #define TEXSTREAMING_DEFAULT_VAL 0
-#else
-    #define TEXSTREAMING_DEFAULT_VAL 1
-#endif
-
-
-#define GEOM_INSTANCING_DEFAULT_VAL 1
-#define COLOR_GRADING_DEFAULT_VAL 1
-#define SUNSHAFTS_DEFAULT_VAL 2
-#define HDR_RANGE_ADAPT_DEFAULT_VAL 0
-#define HDR_RENDERING_DEFAULT_VAL 1
-#define SHADOWS_POOL_DEFAULT_VAL 1
-#define SHADOWS_CLIP_VOL_DEFAULT_VAL 1
-#define SHADOWS_BLUR_DEFAULT_VAL 3
-#define TEXPREALLOCATLAS_DEFAULT_VAL 0
-#define TEXMAXANISOTROPY_DEFAULT_VAL 8
-#if defined(CONSOLE)
-    #define TEXNOANISOALPHATEST_DEFAULT_VAL 1
-#else
-    #define TEXNOANISOALPHATEST_DEFAULT_VAL 0
-#endif
-#define ENVTEXRES_DEFAULT_VAL 3
-#define WATERREFLQUAL_DEFAULT_VAL 4
-#define DOF_DEFAULT_VAL 2
-#define SHADERS_ALLOW_COMPILATION_DEFAULT_VAL 1
-#define SHADERS_PREACTIVATE_DEFAULT_VAL 3
-#define CUSTOMVISIONS_DEFAULT_VAL 3
-#define FLARES_DEFAULT_VAL 1
-#define WATERVOLCAUSTICS_DEFAULT_VAL 1
-#define FLARES_HQSHAFTS_DEFAULT_VAL 1
-#define DEF_SHAD_DBT_STENCIL_DEFAULT_VAL 1
-#define DEF_SHAD_SSS_DEFAULT_VAL 1
-
-#define MULTITHREADED_DEFAULT_VAL 1
-#define ZPASS_DEPTH_SORT_DEFAULT_VAL 1
-#define TEXSTREAMING_UPDATETYPE_DEFAULT_VAL 1
-
-#if defined(WIN32) || defined(APPLE) || defined(LINUX) || defined(SET_CBUFFER_NATIVE_DEPTH_DEAFULT_VAL_TO_1)
-    #define CBUFFER_NATIVE_DEPTH_DEAFULT_VAL 1
-#else
-    #define CBUFFER_NATIVE_DEPTH_DEAFULT_VAL 0
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(Renderer_h)
-#endif
-
-//////////////////////////////////////////////////////////////////////
-// Class to manage memory for Skinning Renderer Data
-class CSkinningDataPool
-{
-public:
-    CSkinningDataPool()
-        : m_pPool(NULL)
-        , m_pPages(NULL)
-        , m_nPoolSize(0)
-        , m_nPoolUsed(0)
-        , m_nPageAllocated(0)
-    {}
-
-    ~CSkinningDataPool()
-    {
-        // free temp pages
-        SPage* pPage = m_pPages;
-        while (pPage)
-        {
-            SPage* pPageToDelete = pPage;
-            pPage = pPage->pNext;
-
-            CryModuleMemalignFree(pPageToDelete);
-        }
-
-        // free pool
-        CryModuleMemalignFree(m_pPool);
-    }
-
-    byte* Allocate(size_t nBytes)
-    {
-        // If available use allocated page space
-        uint32 nPoolUsed = ~0;
-        do
-        {
-            nPoolUsed = *const_cast<volatile size_t*>(&m_nPoolUsed);
-            size_t nPoolFree = m_nPoolSize - nPoolUsed;
-            if (nPoolFree < nBytes)
-            {
-                break; // not enough memory, use fallback
-            }
-            if (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nPoolUsed), nPoolUsed + nBytes, nPoolUsed) == nPoolUsed)
-            {
-                return &m_pPool[nPoolUsed];
-            }
-        } while (true);
-
-        // Create memory
-        byte* pMemory = alias_cast<byte*>(CryModuleMemalign(Align(nBytes, 16) + 16, 16));
-        SPage* pNewPage = alias_cast<SPage*>(pMemory);
-
-        // Assign page
-        volatile SPage* pPages = 0;
-        do
-        {
-            pPages = *(const_cast<volatile SPage**>(&m_pPages));
-            pNewPage->pNext = alias_cast<SPage*>(pPages);
-        } while (CryInterlockedCompareExchangePointer(alias_cast<void* volatile*>(&m_pPages), pNewPage, (void*)pPages) != pPages);
-
-        CryInterlockedAdd((volatile int*)&m_nPageAllocated, nBytes);
-
-        return pMemory + 16;
-    }
-
-    void ClearPool()
-    {
-        m_nPoolUsed = 0;
-        if (m_nPageAllocated)
-        {
-            // free temp pages
-            SPage* pPage = m_pPages;
-            while (pPage)
-            {
-                SPage* pPageToDelete = pPage;
-                pPage = pPage->pNext;
-
-                CryModuleMemalignFree(pPageToDelete);
-            }
-
-            // adjust pool size
-            CryModuleMemalignFree(m_pPool);
-            m_nPoolSize += m_nPageAllocated;
-            m_pPool = alias_cast<byte*>(CryModuleMemalign(m_nPoolSize, 16));
-
-            // reset state
-            m_pPages = NULL;
-            m_nPageAllocated = 0;
-        }
-    }
-
-    void FreePoolMemory()
-    {
-        // free temp pages
-        SPage* pPage = m_pPages;
-        while (pPage)
-        {
-            SPage* pPageToDelete = pPage;
-            pPage = pPage->pNext;
-
-            CryModuleMemalignFree(pPageToDelete);
-        }
-
-        // free pool
-        CryModuleMemalignFree(m_pPool);
-
-        m_pPool = NULL;
-        m_pPages = NULL;
-        m_nPoolSize = 0;
-        m_nPoolUsed = 0;
-        m_nPageAllocated = 0;
-    }
-
-    size_t AllocatedMemory()
-    {
-        return m_nPoolSize + m_nPageAllocated;
-    }
-private:
-    struct SPage
-    {
-        SPage* pNext;
-    };
-
-    byte* m_pPool;
-    SPage* m_pPages;
-    size_t m_nPoolSize;
-    size_t m_nPoolUsed;
-    size_t m_nPageAllocated;
-};
-
-namespace LegacyInternal
-{
-    class JobExecutorPool final
-    {
-    public:
-        static const AZ::u32 NumPools = 3; // Skinning data is triple buffered, see usage of m_SkinningDataPool
-
-        void AdvanceCurrent()
-        {
-            m_current = (m_current + 1) % JobExecutorPool::NumPools;
-            auto& currentAllocatedList = m_allocated[m_current];
-
-            // Move all current instances to the free list
-            m_freeList.reserve(m_freeList.size() + currentAllocatedList.size());
-            for (auto& allocatedEntry : currentAllocatedList)
-            {
-                m_freeList.emplace_back(std::move(allocatedEntry));
-            }
-            currentAllocatedList.clear();
-        }
-
-        AZ::LegacyJobExecutor* Allocate()
-        {
-            auto& currentAllocatedList = m_allocated[m_current];
-
-            if (!m_freeList.empty())
-            {
-                // move from the freelist
-                currentAllocatedList.emplace_back(std::move(m_freeList.back()));
-                m_freeList.pop_back();
-            }
-            else
-            {
-                currentAllocatedList.emplace_back(AZStd::make_unique<AZ::LegacyJobExecutor>());
-            }
-
-            return currentAllocatedList.back().get();
-        }
-
-    private:
-        // We point to instances because LegacyJobExecutor instances are not movable
-        using JobExecutorList = AZStd::vector<AZStd::unique_ptr<AZ::LegacyJobExecutor>>;
-
-        JobExecutorList m_allocated[JobExecutorPool::NumPools];
-        JobExecutorList m_freeList;
-        AZ::u32 m_current = 0;
-    };
-}
-
-//////////////////////////////////////////////////////////////////////
-class CFillRateManager
-    : private stl::PSyncDebug
-{
-public:
-    CFillRateManager()
-        : m_fTotalPixels(0.f)
-        , m_fMaxPixels(1e9f)
-    {}
-    void Reset()
-    {
-        m_fTotalPixels = 0.f;
-        m_afPixels.resize(0);
-    }
-    float GetMaxPixels() const
-    {
-        return m_fMaxPixels;
-    }
-    void AddPixelCount(float fPixels);
-    void ComputeMaxPixels();
-
-private:
-    float m_fTotalPixels;
-    float m_fMaxPixels;
-    FastDynArray<float> m_afPixels;
-};
-
-//////////////////////////////////////////////////////////////////////
-// 3D engine duplicated data for non-thread safe data
-namespace N3DEngineCommon
-{
-    struct SOceanInfo
-    {
-        SOceanInfo()
-            : m_nOceanRenderFlags(0)
-            , m_fWaterLevel(0.0f)
-            , m_vMeshParams(0.0f, 0.0f, 0.0f, 0.0f) { };
-        Vec4 m_vMeshParams;
-        float m_fWaterLevel;
-        uint8 m_nOceanRenderFlags;
-    };
-
-    struct SVisAreaInfo
-    {
-        SVisAreaInfo()
-            : nFlags(0)
-        {
-        };
-        uint32 nFlags;
-    };
-
-    struct SRainOccluder
-    {
-        SRainOccluder()
-            : m_RndMesh(0)
-            , m_WorldMat(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0) {}
-        _smart_ptr<IRenderMesh> m_RndMesh;
-        Matrix34 m_WorldMat;
-    };
-
-    typedef std::vector<SRainOccluder> ArrOccluders;
-
-    struct SRainOccluders
-    {
-        ArrOccluders m_arrOccluders;
-        ArrOccluders m_arrCurrOccluders[RT_COMMAND_BUF_COUNT];
-        size_t m_nNumOccluders;
-        bool m_bProcessed[MAX_GPU_NUM];
-
-        SRainOccluders()
-            : m_nNumOccluders(0)
-        {
-            for (int i = 0; i < MAX_GPU_NUM; ++i)
-            {
-                m_bProcessed[i] = true;
-            }
-        }
-        ~SRainOccluders()                                                  { Release(); }
-        void Release(bool bAll = false)
-        {
-            stl::free_container(m_arrOccluders);
-            m_nNumOccluders = 0;
-            if (bAll)
-            {
-                for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-                {
-                    stl::free_container(m_arrCurrOccluders[i]);
-                }
-            }
-            for (int i = 0; i < MAX_GPU_NUM; ++i)
-            {
-                m_bProcessed[i] = true;
-            }
-        }
-    };
-
-    struct SCausticInfo
-    {
-        SCausticInfo()
-            : m_pCausticQuadMesh(0)
-            , m_nCausticMeshWidth(0)
-            , m_nCausticMeshHeight(0)
-            , m_nCausticQuadTaps(0)
-            , m_nVertexCount(0)
-            , m_nIndexCount(0)
-        {
-        }
-
-        ~SCausticInfo() { Release(); }
-        void Release()
-        {
-            m_pCausticQuadMesh = NULL;
-        }
-
-        _smart_ptr<IRenderMesh> m_pCausticQuadMesh;
-        uint32 m_nCausticMeshWidth;
-        uint32 m_nCausticMeshHeight;
-        uint32 m_nCausticQuadTaps;
-        uint32 m_nVertexCount;
-        uint32 m_nIndexCount;
-
-        Matrix44A m_mCausticMatr;
-        Matrix34 m_mCausticViewMatr;
-    };
-}
-
-struct S3DEngineCommon
-{
-    enum EVisAreaFlags
-    {
-        VAF_EXISTS_FOR_POSITION = (1 << 0),
-        VAF_CONNECTED_TO_OUTDOOR = (1 << 1),
-        VAF_AFFECTED_BY_OUT_LIGHTS = (1 << 2),
-        VAF_MASK = VAF_EXISTS_FOR_POSITION | VAF_CONNECTED_TO_OUTDOOR | VAF_AFFECTED_BY_OUT_LIGHTS
-    };
-
-    N3DEngineCommon::SVisAreaInfo m_pCamVisAreaInfo;
-    N3DEngineCommon::SOceanInfo m_OceanInfo;
-    N3DEngineCommon::SRainOccluders m_RainOccluders;
-    N3DEngineCommon::SCausticInfo m_CausticInfo;
-    SRainParams                                         m_RainInfo;
-    SSnowParams                                         m_SnowInfo;
-
-    void Update(threadID nThreadID);
-    void UpdateRainInfo(threadID nThreadID);
-    void UpdateRainOccInfo(int nThreadID);
-    void UpdateSnowInfo(int nThreadID);
-};
-
-struct SShowRenderTargetInfo
-{
-    SShowRenderTargetInfo() { Reset(); }
-    void Reset()
-    {
-        bShowList = false;
-        bDisplayTransparent = false;
-        col = 2;
-        rtList.clear();
-    }
-
-    bool bShowList;
-    bool bDisplayTransparent;
-    int col;
-    struct RT
-    {
-        int textureID;
-        Vec4 channelWeight;
-        bool bFiltered;
-        bool bRGBKEncoded;
-        bool bAliased;
-    };
-    std::vector<RT> rtList;
-};
-
-struct SRenderTileInfo
-{
-    SRenderTileInfo() { nPosX = nPosY = nGridSizeX = nGridSizeY = 0.f; }
-    f32 nPosX, nPosY, nGridSizeX, nGridSizeY;
-};
-
-class RendererAssetListener
-    : public AzFramework::LegacyAssetEventBus::MultiHandler
-{
-public:
-    RendererAssetListener(IRenderer* renderer);
-    void Connect();
-    void Disconnect();
-
-    void OnFileChanged(AZStd::string assetName) override;
-private:
-    IRenderer* m_renderer;
-};
-
-
-//////////////////////////////////////////////////////////////////////
-struct SRenderPipeline;
-class CRenderer
-    : public IRenderer
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(Renderer_h)
-#endif
-{
-public:
-
-    DEFINE_ALIGNED_DATA(Matrix44A, m_IdentityMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_ViewMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_CameraMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_CameraZeroMatrix[RT_COMMAND_BUF_COUNT], 16);
-
-    DEFINE_ALIGNED_DATA(Matrix44A, m_ProjMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_ProjNoJitterMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_TranspOrigCameraProjMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_ViewProjMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_ViewProjNoJitterMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_ViewProjNoTranslateMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_ViewProjInverseMatrix, 16);
-    DEFINE_ALIGNED_DATA(Matrix44A, m_TempMatrices[4][8], 16);
-
-    struct PreviousFrameMatrixSet
-    {
-        Vec3 m_WorldViewPosition;
-
-        Matrix44A m_ViewMatrix;
-        Matrix44A m_ViewNoTranslateMatrix;
-
-        // These are always de-jittered.
-        Matrix44A m_ProjMatrix;
-        Matrix44A m_ViewProjMatrix;
-        Matrix44A m_ViewProjNoTranslateMatrix;
-    };
-
-    PreviousFrameMatrixSet m_PreviousFrameMatrixSets[MAX_NUM_VIEWPORTS][2];
-
-    const PreviousFrameMatrixSet& GetPreviousFrameMatrixSet() const
-    {
-        return m_PreviousFrameMatrixSets[m_CurViewportID][m_CurRenderEye];
-    }
-
-    static float GetRealTime()
-    {
-        const auto& renderPipeline = gRenDev->m_RP;
-        return renderPipeline.m_TI[renderPipeline.m_nProcessThreadID].m_RealTime;
-    }
-
-    static float GetElapsedTime()
-    {
-        return gEnv->pTimer->GetFrameTime();
-    }
-
-    DEFINE_ALIGNED_DATA(Matrix44A, m_CameraMatrixNearest, 16); //[RT_COMMAND_BUF_COUNT][2], 16);
-
-    float m_TemporalJitterMipBias;
-    Vec4 m_TemporalJitterClipSpace;
-
-    byte              m_bDeviceLost;
-    byte              m_bSystemResourcesInit;
-    byte              m_bSystemTargetsInit;
-    bool              m_bAquireDeviceThread;
-    bool              m_bInitialized;
-    bool              m_bDualStereoSupport;
-
-    SRenderThread* m_pRT;
-
-    virtual SRenderPipeline* GetRenderPipeline() override { return &m_RP; }
-    virtual SRenderThread* GetRenderThread() override { return m_pRT; }
-    virtual CShaderMan* GetShaderManager() override { return &m_cEF; }
-    virtual uint32 GetFrameReset() override { return m_nFrameReset; }
-    virtual CDeviceBufferManager* GetDeviceBufferManager() override { return &m_DevBufMan; }
-
-    // Shaders pipeline states
-    //=============================================================================================================
-    CDeviceManager m_DevMan;
-    CDeviceBufferManager m_DevBufMan;
-    SRenderPipeline m_RP;
-    //=============================================================================================================
-
-    float m_fTimeWaitForMain[RT_COMMAND_BUF_COUNT];
-    float m_fTimeWaitForRender[RT_COMMAND_BUF_COUNT];
-    float m_fTimeProcessedRT[RT_COMMAND_BUF_COUNT];
-    float m_fTimeProcessedGPU[RT_COMMAND_BUF_COUNT];
-    float m_fTimeWaitForGPU[RT_COMMAND_BUF_COUNT];
-    float m_fTimeGPUIdlePercent[RT_COMMAND_BUF_COUNT];
-
-    float m_fRTTimeEndFrame;
-    float m_fRTTimeSceneRender;
-    float m_fRTTimeMiscRender;
-
-    int              m_CurVertBufferSize;
-    int              m_CurIndexBufferSize;
-
-    int  m_VSync;
-    int  m_Predicated;
-    int  m_MSAA;
-    int  m_MSAA_quality;
-    int  m_MSAA_samples;
-    int  m_deskwidth, m_deskheight;
-    int  m_nHDRType;
-
-    // Index of the current viewport used for rendering.
-    int m_CurViewportID;
-    // Index of the current eye used for rendering.
-    int m_CurRenderEye;
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-    float m_overrideRefreshRate;
-    int m_overrideScanlineOrder;
-#endif
-
-#if defined(WIN32) || defined(WIN64)
-    int m_prefMonX, m_prefMonY, m_prefMonWidth, m_prefMonHeight;
-#endif
-
-    int m_nStencilMaskRef;
-
-    byte  m_bDeviceSupportsInstancing;
-
-    uint32  m_bDeviceSupports_NVDBT : 1;
-
-    uint32  m_bDeviceSupportsFP16Separate : 1;
-    uint32  m_bDeviceSupportsFP16Filter : 1;
-    uint32  m_bDeviceSupportsR32FRendertarget : 1;
-    uint32  m_bDeviceSupportsVertexTexture : 1;
-    uint32  m_bDeviceSupportsTessellation : 1;
-    uint32  m_bDeviceSupportsGeometryShaders : 1;
-
-    uint32 m_bEditor : 1; // Render instance created from editor
-    uint32 m_bShaderCacheGen : 1; // Render instance create from shader cache gen mode
-    uint32 m_bUseHWSkinning : 1;
-    uint32 m_bShadersPresort : 1;
-    uint32 m_bEndLevelLoading : 1;
-    uint32 m_bLevelUnloading : 1;
-    uint32 m_bStartLevelLoading : 1;
-    uint32 m_bInLevel : 1;
-    uint32 m_bUseWaterTessHW : 1;
-    uint32 m_bUseSilhouettePOM : 1;
-    uint32 m_bUseSpecularAntialiasing : 1;
-    uint32 m_UseGlobalMipBias : 1;
-    uint32 m_bIsWindowActive : 1;
-    uint32 m_bInShutdown : 1;
-    uint32 m_bDeferredDecals : 1;
-    uint32 m_bShadowsEnabled : 1;
-    uint32 m_bCloudShadowsEnabled : 1;
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    uint32 m_bVolFogShadowsEnabled : 1;
-    uint32 m_bVolFogCloudShadowsEnabled : 1;
-#endif
-
-    uint8 m_nDisableTemporalEffects;
-    bool m_bUseGPUFriendlyBatching[2];
-    uint32 m_nGPULimited;  // How many frames we are GPU limited
-    int8 m_nCurMinAniso;
-    int8 m_nCurMaxAniso;
-
-    uint32 m_nShadowPoolHeight;
-    uint32 m_nShadowPoolWidth;
-
-    ICVar* m_CVWidth;
-    ICVar* m_CVHeight;
-    ICVar* m_CVFullScreen;
-    ICVar* m_CVColorBits;
-    ICVar* m_CVDisplayInfo;
-
-    ColorF m_CurFontColor;
-
-    SFogState m_FSStack[8];
-    int m_nCurFSStackLevel;
-
-    AZStd::string m_apiVersion;
-    AZStd::string m_adapterDescription;
-    DWORD m_Features;
-    int m_MaxTextureSize;
-    size_t m_MaxTextureMemory;
-    int m_nShadowTexSize;
-
-    float m_fLastGamma;
-    float m_fLastBrightness;
-    float m_fLastContrast;
-    float m_fDeltaGamma;
-    uint32 m_nLastNoHWGamma;
-
-    float m_fogCullDistance;
-
-    static Vec2 s_overscanBorders;
-    static float s_previousTexelsPerMeter;
-
-    static int CV_r_UsePersistentRTForModelHUD;
-
-    enum
-    {
-        nMeshPoolMaxTimeoutCounter = 150    /*150 ms*/
-    };
-    int m_nMeshPoolTimeoutCounter;
-
-    // Cached verts/inds used for sprites
-    SVF_P3F_C4B_T2F* m_pSpriteVerts;
-    uint16* m_pSpriteInds;
-
-    // Rendering Drillers
-    Render::Debug::VRAMDriller* m_vramDriller = nullptr;
-
-protected:
-
-    typedef std::list<IRenderDebugListener*> TListRenderDebugListeners;
-    TListRenderDebugListeners m_listRenderDebugListeners;
-
-    SShowRenderTargetInfo m_showRenderTargetInfo;
-
-    static void Cmd_ShowRenderTarget(IConsoleCmdArgs* pArgs);
-
-public:
-
-
-    // ----
-    virtual ITexture* GetWhiteTexture() override;// { return CTexture::s_ptexWhite; }
-    virtual ITexture* GetTextureForName(const char* name, uint32 nFlags, ETEX_Format eFormat) override;// { return CTexture::ForName(name, nFlags, eFormat); }
-
-    virtual Matrix44A& GetViewProjectionMatrix() override { return m_ViewProjMatrix; }
-    virtual void SetTranspOrigCameraProjMatrix(Matrix44A& matrix) { m_TranspOrigCameraProjMatrix = matrix; }
-
-
-    //
-
-    CRenderer();
-    virtual ~CRenderer();
-
-    virtual void InitRenderer();
-
-    virtual void PostInit();
-
-    virtual void PostLevelLoading();
-
-    void PreShutDown();
-    void PostShutDown();
-
-    // Multithreading support
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_H_SECTION_4
-    #include AZ_RESTRICTED_FILE(Renderer_h)
-#endif
-
-    virtual void DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, bool asciiMultiLine, const STextDrawContext& ctx) const;
-    virtual void RT_DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, bool asciiMultiLine, const STextDrawContext& ctx) const = 0;
-
-    virtual void RT_DrawLines(Vec3 v[], int nump, ColorF& col, int flags, float fGround) = 0;
-
-    virtual void RT_PresentFast() = 0;
-
-    virtual int  RT_CurThreadList();
-    virtual void RT_BeginFrame() = 0;
-    virtual void RT_EndFrame() = 0;
-    virtual void RT_EndFrame([[maybe_unused]] bool isLoading) {};
-    virtual void RT_ForceSwapBuffers() = 0;
-    virtual void RT_SwitchToNativeResolutionBackbuffer(bool resolveBackBuffer) = 0;
-    virtual void RT_Init() = 0;
-    virtual void RT_ShutDown(uint32 nFlags) = 0;
-    virtual bool RT_CreateDevice() = 0;
-    virtual void RT_Reset() = 0;
-    virtual void RT_RenderTextMessages();
-    virtual void RT_SetCull(int nMode) = 0;
-    virtual void RT_SetScissor(bool bEnable, int x, int y, int width, int height) = 0;
-    virtual void RT_RenderScene(int nFlags, SThreadInfo& TI, RenderFunc pRenderFunc) = 0;
-    virtual void RT_PrepareStereo(int mode, int output) = 0;
-    virtual void RT_CopyToStereoTex(int channel) = 0;
-    virtual void RT_UpdateTrackingStates() = 0;
-    virtual void RT_DisplayStereo() = 0;
-    virtual void RT_SetCameraInfo() = 0;
-    virtual void RT_SetStereoCamera() = 0;
-    virtual void RT_CreateResource(SResourceAsync* pRes) = 0;
-    virtual void RT_ReleaseResource(SResourceAsync* pRes) = 0;
-    virtual void RT_ReleaseRenderResources() = 0;
-    virtual void RT_UnbindResources() = 0;
-    virtual void RT_UnbindTMUs() = 0;
-    virtual void RT_CreateRenderResources() = 0;
-    virtual void RT_PrecacheDefaultShaders() = 0;
-    virtual void RT_ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX, int nScaledY) = 0;
-    virtual void RT_CreateREPostProcess(CRendElementBase** re);
-    virtual void RT_ReleaseVBStream(void* pVB, int nStream) = 0;
-    virtual void RT_ReleaseCB(void* pCB) = 0;
-    virtual void RT_DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, uint32 nVerts, uint32 nInds, const PublicRenderPrimitiveType nPrimType) = 0;
-    virtual void RT_DrawDynVBUI(SVF_P2F_C4B_T2F_F4B* pBuf, uint16* pInds, uint32 nVerts, uint32 nInds, const PublicRenderPrimitiveType nPrimType) = 0;
-    virtual void RT_Draw2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, DWORD col, float z) = 0;
-    virtual void RT_Draw2dImageStretchMode(bool bStretch) = 0;
-    virtual void RT_Push2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, DWORD col, float z, float stereoDepth) = 0;
-    virtual void RT_Draw2dImageList() = 0;
-    virtual void RT_DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int texture_id, float* s, float* t, DWORD col, bool filtered = true) = 0;
-
-    virtual void RT_PushRenderTarget(int nTarget, CTexture* pTex, SDepthTexture* pDS, int nS) = 0;
-    virtual void RT_PopRenderTarget(int nTarget) = 0;
-    virtual void RT_SetViewport(int x, int y, int width, int height, int id = 0) = 0;
-    virtual void RT_ClearTarget(ITexture* pTex, const ColorF& color) = 0;
-    virtual void RT_RenderDebug(bool bRenderStats = true) = 0;
-    virtual void RT_SetRendererCVar(ICVar* pCVar, const char* pArgText, const bool bSilentMode = false) = 0;
-
-    virtual void RT_PostLevelLoading();
-
-    void RT_DisableTemporalEffects();
-
-    virtual bool FlushRTCommands(bool bWait, bool bImmediatelly, bool bForce);
-    virtual bool ForceFlushRTCommands();
-
-    virtual int GetOcclusionBuffer(uint16* pOutOcclBuffer, Matrix44* pmCamBuffer) = 0;
-    virtual void WaitForParticleBuffer(threadID nThreadId) = 0;
-
-    virtual void RequestFlushAllPendingTextureStreamingJobs(int nFrames) { m_nFlushAllPendingTextureStreamingJobs = nFrames; }
-    virtual void SetTexturesStreamingGlobalMipFactor(float fFactor) { m_fTexturesStreamingGlobalMipFactor = fFactor; }
-
-    virtual void SetRendererCVar(ICVar* pCVar, const char* pArgText, bool bSilentMode = false) = 0;
-
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags) = 0;
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth, uint8 nStencil) = 0;
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors) = 0;
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags, float fDepth, uint8 nStencil) = 0;
-
-    virtual void EF_ClearTargetsLater(uint32 nFlags) = 0;
-    virtual void EF_ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth, uint8 nStencil) = 0;
-    virtual void EF_ClearTargetsLater(uint32 nFlags, const ColorF& Colors) = 0;
-    virtual void EF_ClearTargetsLater(uint32 nFlags, float fDepth, uint8 nStencil) = 0;
-
-    virtual void EF_SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa) = 0;
-    virtual void EF_SetSrgbWrite(bool sRGBWrite) = 0;
-
-    virtual Matrix44A GetIdentityMatrix() { return m_IdentityMatrix; }
-
-
-    //===============================================================================
-
-    virtual void AddRenderDebugListener(IRenderDebugListener* pRenderDebugListener);
-    virtual void RemoveRenderDebugListener(IRenderDebugListener* pRenderDebugListener);
-
-    virtual ERenderType GetRenderType() const;
-
-    virtual WIN_HWND Init(int x, int y, int width, int height, unsigned int cbpp, int zbpp, int sbits, bool fullscreen, bool isEditor, WIN_HINSTANCE hinst, WIN_HWND Glhwnd = 0, bool bReInit = false, const SCustomRenderInitArgs* pCustomArgs = 0, bool bShaderCacheGen = false) = 0;
-
-    virtual WIN_HWND GetCurrentContextHWND() {  return GetHWND();   };
-    virtual bool IsCurrentContextMainVP() { return true; }
-
-    virtual int GetFeatures() {return m_Features; }
-    virtual const void SetApiVersion(const AZStd::string& apiVersion) { m_apiVersion = apiVersion; }
-    virtual const void SetAdapterDescription(const AZStd::string& adapterDescription) { m_adapterDescription = adapterDescription; }
-    virtual const AZStd::string& GetApiVersion() const { return m_apiVersion; }
-    virtual const AZStd::string& GetAdapterDescription() const { return m_adapterDescription; }
-    
-    unsigned long GetNvidiaDriverVersion() const { return m_nvidiaDriverVersion; }
-    void SetNvidiaDriverVersion(unsigned long version) { m_nvidiaDriverVersion = version; }
-
-    virtual int GetNumGeomInstances() const
-    {
-#if !defined(RELEASE)
-        return m_RP.m_PS[m_RP.m_nProcessThreadID].m_nInsts;
-#else
-        return 0;
-#endif
-    };
-
-    virtual int GetNumGeomInstanceDrawCalls() const
-    {
-#if !defined(RELEASE)
-        return m_RP.m_PS[m_RP.m_nProcessThreadID].m_nInstCalls;
-#else
-        return 0;
-#endif
-    };
-
-    virtual int GetCurrentNumberOfDrawCalls() const
-    {
-        int nDIPs = 0;
-#if defined(ENABLE_PROFILING_CODE)
-        int nThr = m_pRT->GetThreadList();
-        for (int i = 0; i < EFSLIST_NUM; i++)
-        {
-            nDIPs += m_RP.m_PS[nThr].m_nDIPs[i];
-        }
-#endif
-        return nDIPs;
-    }
-
-    virtual void GetCurrentNumberOfDrawCalls([[maybe_unused]] int& nGeneral, [[maybe_unused]] int& nShadowGen) const
-    {
-#if defined(ENABLE_PROFILING_CODE)
-        int nDIPs = 0;
-        int nThr = m_pRT->GetThreadList();
-        for (int i = 0; i < EFSLIST_NUM; i++)
-        {
-            if (i == EFSLIST_SHADOW_GEN)
-            {
-                continue;
-            }
-            nDIPs += m_RP.m_PS[nThr].m_nDIPs[i];
-        }
-        nGeneral = nDIPs;
-        nShadowGen = m_RP.m_PS[nThr].m_nDIPs[EFSLIST_SHADOW_GEN];
-#endif
-    }
-
-    virtual int GetCurrentNumberOfDrawCalls([[maybe_unused]] uint32 EFSListMask) const
-    {
-        int nDIPs = 0;
-#if defined(ENABLE_PROFILING_CODE)
-        int nThr = m_pRT->GetThreadList();
-        for (uint32 i = 0; i < EFSLIST_NUM; i++)
-        {
-            if ((1 << i) & EFSListMask)
-            {
-                nDIPs += m_RP.m_PS[nThr].m_nDIPs[i];
-            }
-        }
-#endif
-        return nDIPs;
-    }
-
-    virtual float GetCurrentDrawCallRTTimes(uint32 EFSListMask) const
-    {
-        float fDIPTimes = 0.0f;
-        int nThr = m_pRT->GetThreadList();
-        for (uint32 i = 0; i < EFSLIST_NUM; i++)
-        {
-            if ((1 << i) & EFSListMask)
-            {
-                fDIPTimes += m_RP.m_PS[nThr].m_fTimeDIPs[i];
-            }
-        }
-        return fDIPTimes;
-    }
-
-    virtual void SetDebugRenderNode(IRenderNode* pRenderNode)
-    {
-        m_pDebugRenderNode = pRenderNode;
-    }
-
-    virtual bool IsDebugRenderNode(IRenderNode* pRenderNode) const
-    {
-        return (m_pDebugRenderNode && m_pDebugRenderNode == pRenderNode);
-    }
-
-    //! Fills array of all supported video formats (except low resolution formats)
-    //! Returns number of formats, also when called with NULL
-    virtual int EnumDisplayFormats(SDispFormat* formats) = 0;
-
-    //! Return all supported by video card video AA formats
-    virtual int EnumAAFormats(SAAFormat* formats) = 0;
-
-    //! Changes resolution of the window/device (doen't require to reload the level
-    virtual bool    ChangeResolution(int nNewWidth, int nNewHeight, int nNewColDepth, int nNewRefreshHZ, bool bFullScreen, bool bForceReset) = 0;
-    virtual bool CheckDeviceLost() { return false; };
-
-    virtual EScreenAspectRatio GetScreenAspect(int nWidth, int nHeight);
-
-    virtual Vec2 SetViewportDownscale(float xscale, float yscale);
-
-    virtual void  Release();
-    virtual void  FreeResources(int nFlags);
-    virtual void  InitSystemResources(int nFlags);
-    virtual void  InitTexturesSemantics();
-
-    bool HasLoadedDefaultResources() override { return m_bSystemResourcesInit == 1; }
-
-    virtual void    BeginFrame() = 0;
-    virtual void    RenderDebug(bool bRenderStats = true) = 0;
-    virtual void    EndFrame() = 0;
-    virtual void    LimitFramerate(const int maxFPS, const bool bUseSleep) = 0;
-
-    virtual void    ForceSwapBuffers();
-
-    virtual void    TryFlush() = 0;
-
-    virtual void    Reset (void) = 0;
-
-    virtual void    SetCamera(const CCamera& cam) = 0;
-    virtual void    SetViewport(int x, int y, int width, int height, int id = 0) = 0;
-    virtual void    SetScissor(int x = 0, int y = 0, int width = 0, int height = 0) = 0;
-    virtual void  GetViewport(int* x, int* y, int* width, int* height) const = 0;
-
-    virtual void    SetState(int State, int AlphaRef = -1)
-    {
-        m_pRT->RC_SetState(State, AlphaRef);
-    }
-
-    virtual void SetStencilState(int st, uint32 nStencRef, uint32 nStencMask, uint32 nStencWriteMask, bool bForceFullReadMask)
-    {
-        m_pRT->RC_SetStencilState(st, nStencRef, nStencMask, nStencWriteMask, bForceFullReadMask);
-    }
-
-    virtual void PushWireframeMode(int mode)
-    {
-        m_pRT->RC_PushWireframeMode(mode);
-    }
-    virtual void PopWireframeMode()
-    {
-        m_pRT->RC_PopWireframeMode();
-    }
-
-    virtual void FX_PushWireframeMode(int mode) = 0;
-    virtual void FX_PopWireframeMode() = 0;
-
-    virtual void    SetCullMode (int mode = R_CULL_BACK) = 0;
-    virtual void    EnableVSync(bool enable) = 0;
-
-    virtual void  DrawPrimitivesInternal(CVertexBuffer* src, int vert_num, const eRenderPrimitiveType prim_type) = 0;
-
-    virtual bool    ChangeDisplay(unsigned int width, unsigned int height, unsigned int cbpp) = 0;
-    virtual void  ChangeViewport(unsigned int x, unsigned int y, unsigned int width, unsigned int height, bool bMainViewport = false, float scaleWidth = 1.0f, float scaleHeight = 1.0f) = 0;
-
-    virtual bool    SaveTga(unsigned char* sourcedata, int sourceformat, int w, int h, const char* filename, bool flip) const;
-
-    //download an image to video memory. 0 in case of failure
-    virtual unsigned int DownLoadToVideoMemory(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
-    virtual void UpdateTextureInVideoMemory(uint32 tnum, const byte* newdata, int posx, int posy, int w, int h, ETEX_Format eTFSrc = eTF_R8G8B8A8, int posz = 0, int sizez = 1) = 0;
-    virtual unsigned int DownLoadToVideoMemory3D(const byte* data, int w, int h, int d, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
-    virtual unsigned int DownLoadToVideoMemoryCube(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
-
-    virtual bool DXTCompress(const byte* raw_data, int nWidth, int nHeight, ETEX_Format eTF, bool bUseHW, bool bGenMips, int nSrcBytesPerPix, MIPDXTcallback callback);
-    virtual bool DXTDecompress(const byte* srcData, size_t srcFileSize, byte* dstData, int nWidth, int nHeight, int nMips, ETEX_Format eSrcTF, bool bUseHW, int nDstBytesPerPix);
-    virtual bool    SetGammaDelta(float fGamma) = 0;
-
-    virtual void    RemoveTexture(unsigned int TextureId) = 0;
-
-    virtual void    SetTexture(int tnum);
-    virtual void    SetTexture(int tnum, int nUnit);
-    virtual void    SetWhiteTexture();
-    virtual int     GetWhiteTextureId() const;
-    virtual int     GetBlackTextureId() const;
-
-    // Methods exposed to external libraries
-    virtual void ApplyDepthTextureState(int unit, int nFilter, bool clamp) override;
-    virtual ITexture* GetZTargetTexture() override;
-    virtual int GetTextureState(const STexState& TS) override;
-    virtual uint32 TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, const ETEX_Format eTF, ETEX_TileMode eTM = eTM_None) override;
-    virtual void ApplyForID(int nID, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault) override;
-    virtual ITexture* Create3DTexture(const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst) override;
-    virtual bool IsTextureExist(const ITexture* pTex) override;
-    virtual const char* NameForTextureFormat(ETEX_Format eTF) override;
-    virtual const char* NameForTextureType(ETEX_Type eTT) override;
-    virtual bool IsVideoThreadModeEnabled() override;
-    virtual IDynTexture* CreateDynTexture2(uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool) override;
-    virtual uint32 GetCurrentTextureAtlasSize() override;
-
-    virtual void  PrintToScreen(float x, float y, float size, const char* buf);
-    virtual void TextToScreen(float x, float y, const char* format, ...);
-    virtual void TextToScreenColor(int x, int y, float r, float g, float b, float a, const char* format, ...);
-
-    int GetRecursionLevel() override;
-
-    int GetIntegerConfigurationValue(const char* varName, int defaultValue) override;
-    float GetFloatConfigurationValue(const char* varName, float defaultValue) override;
-    bool GetBooleanConfigurationValue(const char* varName, bool defaultValue) override;
-
-    void  WriteXY(int x, int y, float xscale, float yscale, float r, float g, float b, float a, const char* message, ...) PRINTF_PARAMS(10, 11);
-    void    Draw2dText(float posX, float posY, const char* pStr, const SDrawTextInfo& ti);
-    void    Draw2dTextWithDepth(float posX, float posY, float posZ, const char* pStr, const SDrawTextInfo& ti);
-
-    virtual void DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* text);
-    virtual void DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args);
-
-    virtual void Draw2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1) = 0;
-    virtual void Push2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0,
-        float r = 1, float g = 1, float b = 1, float a = 1, float z = 1, float stereoDepth = 0) = 0;
-    virtual void Draw2dImageList() = 0;
-
-    virtual void ResetToDefault() = 0;
-
-    virtual void PrintResourcesLeaks() = 0;
-
-    ILINE const bool IsEditorMode() const
-    {
-#if defined(CONSOLE)
-        return false;
-#else
-        return (m_bEditor != 0);
-#endif
-    }
-
-    ILINE const bool IsShaderCacheGenMode() const
-    {
-#if defined(CONSOLE)
-        return false;
-#else
-        return (m_bShaderCacheGen != 0);
-#endif
-    }
-
-    inline float ScaleCoordXInternal(float value) const
-    {
-        value *= float(m_CurViewport.nWidth) / 800.0f;
-        return (value);
-    }
-    virtual float ScaleCoordX(float value) const
-    {
-        return ScaleCoordXInternal(value);
-    }
-    inline float ScaleCoordYInternal(float value) const
-    {
-        value *= float(m_CurViewport.nHeight) / 600.0f;
-        return (value);
-    }
-    virtual float ScaleCoordY(float value) const
-    {
-        return ScaleCoordYInternal(value);
-    }
-    inline void ScaleCoordInternal(float& x, float& y) const
-    {
-        int viewPortX, viewPortY, viewPortW, viewPortH;
-        GetViewport(&viewPortX, &viewPortY, &viewPortW, &viewPortH);
-        x *= viewPortW / 800.0f;
-        y *= viewPortH / 600.0f;
-    }
-    virtual void ScaleCoord(float& x, float& y) const
-    {
-        ScaleCoordInternal(x, y);
-    }
-
-    void SetWidth(int nW) { m_width = nW; }
-    void SetHeight(int nH) { m_height = nH; }
-
-    virtual int     GetWidth() const { return (m_width); }
-    virtual int     GetHeight() const { return (m_height); }
-
-    virtual int GetOverlayWidth() const { return m_nativeWidth; }
-    virtual int GetOverlayHeight() const { return m_nativeHeight; }
-
-    void SetPixelAspectRatio(float fPAR) {m_pixelAspectRatio = fPAR; }
-    virtual float GetPixelAspectRatio() const { return (m_pixelAspectRatio); }
-
-    int GetBackbufferWidth() { return m_backbufferWidth; }
-    int GetBackbufferHeight() { return m_backbufferHeight; }
-
-    void GetClampedWindowSize(int& widthPixels, int& heightPixels);
-
-    inline int GetMaxSquareRasterDimension() const override
-    {
-        // m_MaxTextureSize is actually maxTextureDimension. Since MaxResolution refers to a 2D raster, the upper limit on a square raster is (m_MaxTextureSize/2)
-        return (CV_r_CustomResMaxSize == s_CustomResMaxSize_USE_MAX_RESOURCES) ? (m_MaxTextureSize / 2) : clamp_tpl(CV_r_CustomResMaxSize, 32, (m_MaxTextureSize / 2));
-    }
-
-    virtual bool IsStereoEnabled() const { return false; }
-
-    virtual float   GetNearestRangeMax() const { return (CV_r_DrawNearZRange); }
-
-    //  Get mipmap distance factor (depends on screen width, screen height and aspect ratio)
-
-    _inline float GetMipDistFactor() { return TANGENT30_2 * TANGENT30_2 / (GetHeight() * GetHeight()); }
-
-    virtual int     GetWireframeMode() { return(m_wireframe_mode); }
-
-
-    _inline const CCamera& GetCamera(void) { return(m_RP.m_TI[m_pRT->GetThreadList()].m_cam);  }
-
-    virtual const CameraViewParameters& GetViewParameters() override
-    {
-        return(m_RP.m_TI[m_pRT->GetThreadList()].m_cam.m_viewParameters);
-    }
-
-    virtual void SetViewParameters(const CameraViewParameters& viewParameters) override
-    {
-        m_RP.m_TI[m_pRT->GetThreadList()].m_cam.m_viewParameters = viewParameters;
-    }
-
-    virtual CRenderView* GetRenderViewForThread(int nThreadID) final;
-    Matrix44A GetCameraMatrix();
-
-    void GetPolyCount([[maybe_unused]] int& nPolygons, [[maybe_unused]] int& nShadowPolys) const
-    {
-#if defined(ENABLE_PROFILING_CODE)
-        nPolygons = GetPolyCount();
-        nShadowPolys = m_RP.m_PS[m_RP.m_nFillThreadID].m_nPolygons[EFSLIST_SHADOW_GEN];
-        nShadowPolys += m_RP.m_PS[m_RP.m_nFillThreadID].m_nPolygons[EFSLIST_SHADOW_PASS];
-        nPolygons -= nShadowPolys;
-#endif
-    }
-
-    int GetPolyCount() const
-    {
-#if defined(ENABLE_PROFILING_CODE)
-        int nPolys = 0;
-        for (int i = 0; i < EFSLIST_NUM; i++)
-        {
-            nPolys += m_RP.m_PS[m_pRT->IsMainThread()?m_RP.m_nFillThreadID:m_RP.m_nProcessThreadID].m_nPolygons[i];
-        }
-        return nPolys;
-#else
-        return 0;
-#endif
-    }
-
-    virtual void SetMaterialColor(float r, float g, float b, float a) = 0;
-
-    virtual bool WriteDDS(const byte* dat, int wdt, int hgt, int Size, const char* name, ETEX_Format eF, int NumMips);
-    virtual bool WriteTGA(const byte* dat, int wdt, int hgt, const char* name, int src_bits_per_pixel, int dest_bits_per_pixel);
-    virtual bool WriteJPG(const byte* dat, int wdt, int hgt, char* name, int src_bits_per_pixel, int nQuality = 100);
-
-    virtual void GetMemoryUsage(ICrySizer* Sizer);
-
-    virtual void GetBandwidthStats(float* fBandwidthRequested);
-
-    virtual void SetTextureStreamListener(ITextureStreamListener* pListener);
-
-    virtual void GetLogVBuffers() = 0;
-
-    virtual int GetFrameID(bool bIncludeRecursiveCalls = true)
-    {
-        int nThreadID = m_pRT ? m_pRT->GetThreadList() : 0;
-        if (bIncludeRecursiveCalls)
-        {
-            return m_RP.m_TI[nThreadID].m_nFrameID;
-        }
-        return m_RP.m_TI[nThreadID].m_nFrameUpdateID;
-    }
-
-    // GPU being updated
-    virtual int32 RT_GetCurrGpuID() const override
-    {
-        return gRenDev->m_nFrameSwapID % gRenDev->GetActiveGPUCount();
-    }
-
-    // Project/UnProject.  Returns true if successful.
-    virtual bool ProjectToScreen(float ptx, float pty, float ptz,
-        float* sx, float* sy, float* sz) = 0;
-    virtual int UnProject(float sx, float sy, float sz,
-        float* px, float* py, float* pz,
-        const float modelMatrix[16],
-        const float projMatrix[16],
-        const int    viewport[4]) = 0;
-    virtual int UnProjectFromScreen(float  sx, float  sy, float  sz,
-        float* px, float* py, float* pz) = 0;
-
-    virtual void EF_RenderTextMessages();
-    void RenderTextMessages(CTextMessages& messages);
-
-    // Shadow Mapping
-    virtual bool PrepareDepthMap(ShadowMapFrustum* SMSource, int nFrustumLOD = 0, bool bClearPool = false) = 0;
-    virtual void DrawAllShadowsOnTheScreen() = 0;
-    virtual void OnEntityDeleted(IRenderNode* pRenderNode) = 0;
-
-    //for editor
-    virtual void  GetModelViewMatrix(float* mat) = 0;
-    virtual void  GetProjectionMatrix(float* mat) = 0;
-    virtual void SetMatrices(float* pProjMat, float* pViewMat) = 0;
-
-    virtual void ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX = -1, int nScaledY = -1) = 0;
-
-    //misc
-    virtual bool ScreenShot(const char* filename = NULL, int width = 0) = 0;
-
-    virtual int GetColorBpp()       { return m_cbpp; }
-    virtual int GetDepthBpp()       { return m_zbpp; }
-    virtual int GetStencilBpp()     { return m_sbpp; }
-
-    virtual int ScreenToTexture(int nTexID) = 0;
-
-    virtual void LockParticleVideoMemory([[maybe_unused]] uint32 nId) {}
-    virtual void UnLockParticleVideoMemory([[maybe_unused]] uint32 nId){}
-
-    virtual void ActivateLayer([[maybe_unused]] const char* pLayerName, [[maybe_unused]] bool activate) {}
-
-    virtual void FlushPendingTextureTasks()
-    {
-        if (m_pRT)
-        {
-            m_pRT->RC_FlushTextureStreaming(true);
-            FlushRTCommands(true, true, true);
-        }
-    }
-
-    void SetShadowJittering (float shadowJittering)
-    {
-        m_shadowJittering = shadowJittering;
-    }
-    float GetShadowJittering() const { return m_shadowJittering; }
-
-    // Shaders/Shaders support
-    // RE - RenderElement
-    bool m_bTimeProfileUpdated;
-    int m_PrevProfiler;
-    int m_nCurSlotProfiler;
-
-    AZ::IO::HandleType m_logFileHandle;
-    AZ::IO::HandleType m_logFileStrHandle;
-    AZ::IO::HandleType m_logFileShHandle;
-    inline void Logv(int RecLevel, const char* format, ...)
-    {
-        va_list argptr;
-
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            for (int i = 0; i < RecLevel; i++)
-            {
-                AZ::IO::Print(m_logFileHandle, "  ");
-            }
-            va_start (argptr, format);
-            AZ::IO::PrintV(m_logFileHandle, format, argptr);
-            va_end (argptr);
-        }
-    }
-    inline void LogStrv(int RecLevel, const char* format, ...)
-    {
-        va_list argptr;
-
-        if (m_logFileStrHandle != AZ::IO::InvalidHandle)
-        {
-            for (int i = 0; i < RecLevel; i++)
-            {
-                AZ::IO::Print(m_logFileStrHandle, "  ");
-            }
-            va_start (argptr, format);
-            AZ::IO::PrintV(m_logFileStrHandle, format, argptr);
-            va_end (argptr);
-        }
-    }
-    inline void LogShv(int RecLevel, const char* format, ...)
-    {
-        va_list argptr;
-
-        if (m_logFileShHandle != AZ::IO::InvalidHandle)
-        {
-            for (int i = 0; i < RecLevel; i++)
-            {
-                AZ::IO::Print(m_logFileShHandle, "  ");
-            }
-            va_start (argptr, format);
-            AZ::IO::PrintV(m_logFileShHandle, format, argptr);
-            va_end (argptr);
-            gEnv->pFileIO->Flush(m_logFileShHandle);
-        }
-    }
-    _inline void Log(const char* str)
-    {
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            AZ::IO::Print(m_logFileHandle, str);
-        }
-    }
-
-    void EF_AddClientPolys(const SRenderingPassInfo& passInfo);
-    void EF_RemovePolysFromScene();
-
-    bool FX_TryToMerge(CRenderObject* pNewObject, CRenderObject* pOldObject, IRenderElement* pRE, bool bResIdentical);
-    virtual void* FX_AllocateCharInstCB(SSkinningData*, uint32) { return NULL; }
-    virtual void  FX_ClearCharInstCB(uint32) {}
-
-    void EF_TransformDLights();
-    void EF_IdentityDLights();
-
-    _inline void* EF_GetPointer(ESrcPointer ePT, int* Stride, EParamType Type, ESrcPointer Dst, int Flags)
-    {
-        void* p;
-
-        if (m_RP.m_pRE)
-        {
-            p = m_RP.m_pRE->mfGetPointer(ePT, Stride, Type, Dst, Flags);
-        }
-        else
-        {
-            p = SRendItem::mfGetPointerCommon(ePT, Stride, Type, Dst, Flags);
-        }
-
-        return p;
-    }
-    inline void FX_StartMerging()
-    {
-        if (m_RP.m_FrameMerge != m_RP.m_Frame)
-        {
-            m_RP.m_FrameMerge = m_RP.m_Frame;
-            int Size = m_RP.m_CurVFormat.GetStride();
-            m_RP.m_StreamStride = Size;
-            m_RP.m_CurVFormat.TryCalculateOffset(m_RP.m_StreamOffsetColor, AZ::Vertex::AttributeUsage::Color);
-            m_RP.m_CurVFormat.TryCalculateOffset(m_RP.m_StreamOffsetTC, AZ::Vertex::AttributeUsage::TexCoord);
-            m_RP.m_NextStreamPtr = m_RP.m_StreamPtr;
-            m_RP.m_NextStreamPtrTang = m_RP.m_StreamPtrTang;
-        }
-    }
-
-    _inline void EF_PushFog()
-    {
-        assert(m_pRT->IsRenderThread());
-        int nLevel = m_nCurFSStackLevel;
-        if (nLevel >= 8)
-        {
-            return;
-        }
-        memcpy(&m_FSStack[nLevel], &m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS, sizeof(SFogState));
-        m_nCurFSStackLevel++;
-    }
-    _inline void EF_PopFog()
-    {
-        assert(m_pRT->IsRenderThread());
-        int nLevel = m_nCurFSStackLevel;
-        if (nLevel <= 0)
-        {
-            return;
-        }
-        nLevel--;
-        bool bFog = m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS.m_bEnable;
-        if (m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS != m_FSStack[nLevel])
-        {
-            memcpy(&m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS, &m_FSStack[nLevel], sizeof(SFogState));
-            SetFogColor(m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS.m_FogColor);
-        }
-        else
-        {
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS.m_bEnable = m_FSStack[nLevel].m_bEnable;
-        }
-        bool bNewFog = m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS.m_bEnable;
-        m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS.m_bEnable = bFog;
-        EnableFog(bNewFog);
-        m_nCurFSStackLevel--;
-    }
-
-    //================================================================================
-    SViewport m_MainRTViewport;
-    SViewport m_MainViewport;
-
-    SViewport m_CurViewport;
-    SViewport m_NewViewport;
-    bool m_bViewportDirty;
-    bool m_bViewportDisabled;
-
-    int m_nCurVPStackLevel;
-    SViewport m_VPStack[8];
-    _inline void FX_PushVP()
-    {
-        int nLevel = m_nCurVPStackLevel;
-        if (nLevel >= 8)
-        {
-            return;
-        }
-        memcpy(&m_VPStack[nLevel], &m_NewViewport, sizeof(SViewport));
-        m_nCurVPStackLevel++;
-    }
-    _inline void FX_PopVP()
-    {
-        int nLevel = m_nCurVPStackLevel;
-        if (nLevel <= 0)
-        {
-            return;
-        }
-        nLevel--;
-        if (m_NewViewport != m_VPStack[nLevel])
-        {
-            memcpy(&m_NewViewport, &m_VPStack[nLevel], sizeof(SViewport));
-            m_bViewportDirty = true;
-        }
-        m_nCurVPStackLevel--;
-    }
-
-
-    void EF_AddRTStat(CTexture* pTex, int nFlags = 0, int nW = -1, int nH = -1);
-    void EF_PrintRTStats(const char* szName);
-
-    int FX_ApplyShadowQuality();
-
-    static eAntialiasingType FX_GetAntialiasingType()
-    {
-        return (eAntialiasingType) ((uint32)1 << min(CV_r_AntialiasingMode, eAT_AAMODES_COUNT - 1));
-    }
-
-    inline float GetTemporalJitterMipBias() const
-    {
-        return m_TemporalJitterMipBias;
-    }
-
-    void FX_ApplyShaderQuality(const EShaderType eST);
-
-    virtual EShaderQuality EF_GetShaderQuality(EShaderType eST);
-    virtual ERenderQuality EF_GetRenderQuality() const;
-
-    void RefreshSystemShaders();
-    uint32 EF_BatchFlags(SShaderItem& SH, CRenderObject* pObj, IRenderElement* re, const SRenderingPassInfo& passInfo);
-
-    virtual void FX_PipelineShutdown(bool bFastShutdown = false) = 0;
-
-    virtual IOpticsElementBase* CreateOptics(EFlareType type) const;
-
-    virtual bool EF_PrecacheResource(IShader* pSH, float fMipFactor, float fTimeToReady, int Flags);
-    virtual bool EF_PrecacheResource(SShaderItem* pSI, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter) = 0;
-    virtual bool EF_PrecacheResource(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter) = 0;
-    virtual bool EF_PrecacheResource(IRenderMesh* pPB, _smart_ptr<IMaterial> pMaterial, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId);
-    virtual bool EF_PrecacheResource(CDLight* pLS, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId);
-
-    virtual CRenderObject* EF_AddPolygonToScene(SShaderItem& si, int numPts, const SVF_P3F_C4B_T2F* verts, const SPipTangents* tangs, CRenderObject* obj, const SRenderingPassInfo& passInfo, uint16* inds, int ninds, int nAW, const SRendItemSorter& rendItemSorter);
-    virtual CRenderObject* EF_AddPolygonToScene(SShaderItem& si, CRenderObject* obj, const SRenderingPassInfo& passInfo, int numPts, int ninds, SVF_P3F_C4B_T2F*& verts, SPipTangents*& tangs, uint16*& inds, int nAW, const SRendItemSorter& rendItemSorter);
-
-    virtual void FX_CheckOverflow(int nVerts, int nInds, IRenderElement* re, int* nNewVerts = NULL, int* nNewInds = NULL) override;
-    virtual void FX_Start(CShader* ef, int nTech, CShaderResources* Res, IRenderElement* re) override;
-
-    virtual int GenerateTextureId() override { return m_TexGenID++; }
-
-    //==========================================================
-    // external interface for shaders
-    //==========================================================
-
-    AZ::LegacyJobExecutor m_ComputeVerticesJobExecutors[RT_COMMAND_BUF_COUNT];
-
-    CFillRateManager m_FillRateManager;
-
-    void FinalizeRendItems(int nThreadID);
-    void FinalizeRendItems_ReorderShadowRendItems(int nThreadID);
-    void FinalizeRendItems_FindShadowFrustums(int nThreadID);
-    void FinalizeRendItems_ReorderRendItems(int nThreadID);
-    void FinalizeRendItems_ReorderRendItemList(int nAW, int nList, int nThreadID);
-    void FinalizeRendItems_SortRenderLists(int nThreadID);
-
-    void FinalizeShadowRendItems(int nThreadID);
-    void RegisterFinalizeShadowJobs(int nThreadID);
-
-    // Summary:
-    virtual void BeginSpawningGeneratingRendItemJobs(int nThreadID);
-    virtual void BeginSpawningShadowGeneratingRendItemJobs(int nThreadID);
-    virtual void EndSpawningGeneratingRendItemJobs();
-
-    AZ::LegacyJobExecutor* GetGenerateRendItemJobExecutor() override;
-    AZ::LegacyJobExecutor* GetGenerateShadowRendItemJobExecutor() override;
-    AZ::LegacyJobExecutor* GetGenerateRendItemJobExecutorPreProcess() override;
-    AZ::LegacyJobExecutor* GetFinalizeRendItemJobExecutor(int nThreadID) override;
-    AZ::LegacyJobExecutor* GetFinalizeShadowRendItemJobExecutor(int nThreadID) override;
-
-
-    // Shaders management
-    virtual void                EF_SetShaderMissCallback(ShaderCacheMissCallback callback);
-    virtual const char* EF_GetShaderMissLogPath();
-    virtual string*        EF_GetShaderNames(int& nNumShaders);
-    virtual IShader*       EF_LoadShader (const char* name, int flags = 0, uint64 nMaskGen = 0);
-    virtual SShaderItem EF_LoadShaderItem (const char* name, bool bShare, int flags = 0, SInputShaderResources* Res = NULL, uint64 nMaskGen = 0);
-    virtual uint64          EF_GetRemapedShaderMaskGen(const char* name, uint64 nMaskGen = 0, bool bFixup = 0);
-
-    virtual uint64      EF_GetShaderGlobalMaskGenFromString(const char* szShaderName, const char* szShaderGen, uint64 nMaskGen = 0);
-    virtual AZStd::string EF_GetStringFromShaderGlobalMaskGen(const char* szShaderName, uint64 nMaskGen = 0);
-
-    // reload file
-    virtual bool EF_ReloadFile(const char* szFileName);
-    virtual bool EF_ReloadFile_Request(const char* szFileName);
-    virtual void EF_ReloadShaderFiles (int nCategory);
-    virtual void EF_ReloadTextures();
-    virtual int EF_LoadLightmap(const char* nameTex);
-    virtual bool  EF_RenderEnvironmentCubeHDR (int size, Vec3& Pos, TArray<unsigned short>& vecData);
-    virtual ITexture* EF_GetTextureByID(int Id);
-    virtual ITexture* EF_GetTextureByName(const char* name, uint32 flags = 0);
-    virtual ITexture* EF_LoadTexture(const char* nameTex, uint32 flags = 0);
-    virtual ITexture* EF_LoadCubemapTexture(const char* nameTex, uint32 flags = 0);
-    virtual ITexture* EF_LoadDefaultTexture(const char* nameTex);
-
-    virtual const SShaderProfile& GetShaderProfile(EShaderType eST) const;
-    virtual void EF_SetShaderQuality(EShaderType eST, EShaderQuality eSQ);
-
-    virtual _smart_ptr<IImageFile> EF_LoadImage(const char* szFileName, uint32 nFlags);
-
-    // Create new RE of type (edt)
-    virtual IRenderElement* EF_CreateRE (EDataType edt);
-
-    // Begin using shaders
-    virtual void EF_StartEf (const SRenderingPassInfo& passInfo);
-
-    virtual SRenderObjData* EF_GetObjData(CRenderObject* pObj, bool bCreate, int nThreadID);
-    SRenderObjData* FX_GetObjData(CRenderObject* pObj, int nThreadID);
-
-    // Get Object for RE transformation
-    virtual CRenderObject* EF_GetObject_Temp (int nThreadID);
-    CRenderObject* EF_DuplicateRO(CRenderObject* pObj, const SRenderingPassInfo& passInfo);
-
-    // Add shader to the list (virtual)
-    virtual void EF_AddEf (IRenderElement* pRE, SShaderItem& pSH,  CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter);
-
-    // Add shader to the list
-    void EF_AddEf_NotVirtual (IRenderElement* pRE, SShaderItem& pSH, CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter);
-
-    // Draw all shaded REs in the list
-    virtual void EF_EndEf3D (int nFlags, int nPrecacheUpdateId, int nNearPrecacheUpdateId, const SRenderingPassInfo& passInfo) = 0;
-
-    virtual void EF_InvokeShadowMapRenderJobs(int nFlags) = 0;
-    // 2d interface for shaders
-    virtual void EF_EndEf2D(bool bSort) = 0;
-
-    // Dynamic lights
-    virtual bool EF_IsFakeDLight (const CDLight* Source);
-    virtual void EF_ADDDlight(CDLight* Source, const SRenderingPassInfo& passInfo);
-    virtual bool EF_AddDeferredDecal(const SDeferredDecal& rDecal);
-    virtual uint32 EF_GetDeferredLightsNum(eDeferredLightType eLightType = eDLT_DeferredLight);
-    virtual int EF_AddDeferredLight(const CDLight& pLight, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-    virtual TArray<SRenderLight>* EF_GetDeferredLights(const SRenderingPassInfo& passInfo, eDeferredLightType eLightType = eDLT_DeferredLight);
-    SRenderLight* EF_GetDeferredLightByID(const uint16 nLightID, const eDeferredLightType eLightType = eDLT_DeferredLight);
-    virtual void EF_ClearDeferredLightsList();
-    virtual void EF_ReleaseDeferredData();
-    virtual void EF_ReleaseInputShaderResource(SInputShaderResources* pRes);
-    virtual void EF_ClearLightsList();
-    virtual bool EF_UpdateDLight(SRenderLight* pDL);
-    void EF_CheckLightMaterial(CDLight* pLight, uint16 nRenderLightID, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-
-    // Water sim hits
-    virtual void EF_AddWaterSimHit(const Vec3& vPos, float scale, float strength);
-    virtual void EF_DrawWaterSimHits();
-
-    virtual void EF_QueryImpl(ERenderQueryTypes eQuery, void* pInOut0, uint32 nInOutSize0, void* pInOut1, uint32 nInOutSize1);
-    virtual void FX_SetState(int st, int AlphaRef = -1, int RestoreState = 0) = 0;
-    void FX_SetStencilState(int st, uint32 nStencRef, uint32 nStencMask, uint32 nStencWriteMask, bool bForceFullReadMask = false);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Deferred ambient passes
-
-    virtual uint8 EF_AddDeferredClipVolume(const IClipVolume* pClipVolume);
-    virtual bool EF_SetDeferredClipVolumeBlendData(const IClipVolume* pVolume, const SClipVolumeBlendInfo& blendInfo);
-
-    virtual void EF_ClearDeferredClipVolumesList();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Post processing effects interfaces
-
-    virtual void EF_SetPostEffectParam(const char* pParam, float fValue, bool bForceValue = false);
-    virtual void EF_SetPostEffectParamVec4(const char* pParam, const Vec4& pValue, bool bForceValue = false);
-    virtual void EF_SetPostEffectParamString(const char* pParam, const char* pszArg);
-
-    virtual void EF_GetPostEffectParam(const char* pParam, float& fValue);
-    virtual void EF_GetPostEffectParamVec4(const char* pParam, Vec4& pValue);
-    virtual void EF_GetPostEffectParamString(const char* pParam, const char*& pszArg);
-
-    virtual int32 EF_GetPostEffectID(const char* pPostEffectName);
-
-    virtual void EF_ResetPostEffects(bool bOnSpecChange = false);
-
-    virtual void SyncPostEffects();
-
-    virtual void EF_DisableTemporalEffects();
-
-    virtual void ForceGC();
-
-    virtual void RT_ResetGlass() {}
-
-    // create/delete RenderMesh object
-    virtual _smart_ptr<IRenderMesh> CreateRenderMesh(
-        const char* szType
-        , const char* szSourceName
-        , IRenderMesh::SInitParamerers* pInitParams = NULL
-        , ERenderMeshType eBufType = eRMT_Static
-        );
-
-    virtual _smart_ptr<IRenderMesh> CreateRenderMeshInitialized(
-        const void* pVertBuffer, int nVertCount, const AZ::Vertex::Format& vertexFormat,
-        const vtx_idx* pIndices, int nIndices,
-        const PublicRenderPrimitiveType nPrimetiveType, const char* szType, const char* szSourceName, ERenderMeshType eBufType = eRMT_Static,
-        int nMatInfoCount = 1, int nClientTextureBindID = 0,
-        bool (* PrepareBufferCallback)(IRenderMesh*, bool) = NULL,
-        void* CustomData = NULL,
-        bool bOnlyVideoBuffer = false, bool bPrecache = true, const SPipTangents* pTangents = NULL, bool bLockForThreadAcc = false, Vec3* pNormals = NULL);
-
-    virtual int GetMaxActiveTexturesARB() { return 0; }
-
-    //////////////////////////////////////////////////////////////////////
-    // Replacement functions for the Font engine ( vlad: for font can be used old functions )
-    virtual bool FontUpdateTexture(int nTexId, int X, int Y, int USize, int VSize, byte* pData) = 0;
-    virtual void FontSetTexture(int nTexId, int nFilterMode) = 0;
-    virtual void FontSetRenderingState(bool overrideViewProjMatrices, TransformationMatrices& backupMatrices) = 0;
-    virtual void FontSetBlending(int src, int dst, int baseState) = 0;
-    virtual void FontRestoreRenderingState(bool overrideViewProjMatrices, const TransformationMatrices& restoringMatrices) = 0;
-
-    //////////////////////////////////////////////////////////////////////
-    // Used for pausing timer related stuff (eg: for texture animations, and shader 'time' parameter)
-    void PauseTimer(bool bPause) {  m_bPauseTimer = bPause; }
-    virtual IShaderPublicParams* CreateShaderPublicParams();
-
-    virtual void GetThreadIDs(threadID& mainThreadID, threadID& renderThreadID) const;
-
-    enum ESPM
-    {
-        ESPM_PUSH = 0, ESPM_POP = 1
-    };
-    virtual void SetProfileMarker([[maybe_unused]] const char* label, [[maybe_unused]] ESPM mode) const {};
-
-    virtual uint16 PushFogVolumeContribution(const SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo);
-    void GetFogVolumeContribution(uint16 idx, SFogVolumeData& fogVolData) const;
-    virtual void PushFogVolume([[maybe_unused]] class CREFogVolume* pFogVolume, [[maybe_unused]] const SRenderingPassInfo& passInfo) {assert(false); }
-
-    virtual int GetMaxTextureSize() { return m_MaxTextureSize; }
-
-    virtual void SetCloudShadowsParams(int nTexID, const Vec3& speed, float tiling, bool invert, float brightness)
-    {
-        m_cloudShadowTexId = nTexID;
-        m_cloudShadowSpeed = speed;
-        m_cloudShadowTiling = tiling;
-        m_cloudShadowInvert = invert;
-        m_cloudShadowBrightness = brightness;
-    }
-    int GetCloudShadowTextureId() const { return m_cloudShadowTexId; }
-
-    virtual ShadowFrustumMGPUCache* GetShadowFrustumMGPUCache() { return &m_ShadowFrustumMGPUCache; }
-
-    virtual const StaticArray<int, MAX_GSM_LODS_NUM>& GetCachedShadowsResolution() const { return m_CachedShadowsResolution; }
-    virtual void SetCachedShadowsResolution(const StaticArray<int, MAX_GSM_LODS_NUM>& arrResolutions) { m_CachedShadowsResolution = arrResolutions; }
-    virtual void UpdateCachedShadowsLodCount(int nGsmLods) const override;
-
-    bool IsHDRModeEnabled() const
-    {
-        // If there's no support for floating point render targets, we disable HDR.
-        return (gRenDev && gRenDev->UseHalfFloatRenderTargets()) && !CV_r_measureoverdraw && !m_wireframe_mode;
-    }
-
-    bool IsShadowPassEnabled() const
-    {
-        return (CV_r_ShadowPass && CV_r_usezpass && !m_wireframe_mode) ? true : false;
-    }
-
-    bool IsCustomRenderModeEnabled(uint32 nRenderModeMask);
-    virtual bool IsPost3DRendererEnabled() const;
-
-    virtual const char* GetTextureFormatName(ETEX_Format eTF);
-    virtual int GetTextureFormatDataSize(int nWidth, int nHeight, int nDepth, int nMips, ETEX_Format eTF);
-    virtual void SetDefaultMaterials(_smart_ptr<IMaterial> pDefMat, _smart_ptr<IMaterial> pTerrainDefMat) { m_pDefaultMaterial = pDefMat; m_pTerrainDefaultMaterial = pTerrainDefMat; }
-    virtual byte* GetTextureSubImageData32([[maybe_unused]] byte* pData, [[maybe_unused]] int nDataSize, [[maybe_unused]] int nX, [[maybe_unused]] int nY, [[maybe_unused]] int nW, [[maybe_unused]] int nH, [[maybe_unused]] CTexture* pTex){return 0; }
-
-    virtual void PrecacheTexture(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter = 1);
-
-    virtual SSkinningData* EF_CreateSkinningData(uint32 nNumBones, bool bNeedJobSyncVar, bool bUseMatrixSkinning = false);
-    virtual SSkinningData* EF_CreateRemappedSkinningData(uint32 nNumBones, SSkinningData* pSourceSkinningData, uint32 nCustomDataSize, uint32 pairGuid);
-    virtual void EF_ClearSkinningDataPool();
-    virtual int EF_GetSkinningPoolID();
-
-
-    bool EF_GetParticleListAndBatchFlags(uint32& nBatchFlags, int& nList, SShaderItem& shaderItem, CRenderObject* pRO, const SRenderingPassInfo& passInfo);
-    virtual void ClearShaderItem(SShaderItem* pShaderItem);
-    virtual void UpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial);
-    virtual void ForceUpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial);
-    virtual void RefreshShaderResourceConstants(SShaderItem* pShaderItem, IMaterial* pMaterial);
-
-    void RT_UpdateShaderItem (SShaderItem* pShaderItem, IMaterial* material);
-    void RT_RefreshShaderResourceConstants(SShaderItem* shaderItem) const;
-
-    bool UseHalfFloatRenderTargets();
-
-    virtual bool LoadShaderStartupCache()
-    {
-        return m_cEF.LoadShaderStartupCache();
-    }
-
-    virtual void UnloadShaderStartupCache()
-    {
-        m_cEF.UnloadShaderStartupCache();
-    }
-
-    virtual bool LoadShaderLevelCache() { return false; }
-    virtual void UnloadShaderLevelCache() {}
-
-    void SyncMainWithRender();
-
-    virtual void RegisterSyncWithMainListener(ISyncMainWithRenderListener* pListener);
-    virtual void RemoveSyncWithMainListener(const ISyncMainWithRenderListener* pListener);
-
-    void InitializeVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer) final
-    {
-        m_pRT->RC_InitializeVideoRenderer(pVideoRenderer);
-    }
-    void RT_InitializeVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer);
-
-    void CleanupVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer) final
-    {
-        m_pRT->RC_CleanupVideoRenderer(pVideoRenderer);
-    }
-    void RT_CleanupVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer);
-
-    void DrawVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer, const AZ::VideoRenderer::DrawArguments& drawArguments) final
-    {
-        m_pRT->RC_DrawVideoRenderer(pVideoRenderer, drawArguments);
-    }
-    virtual void RT_DrawVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer, const AZ::VideoRenderer::DrawArguments& drawArguments) = 0;
-
-protected:
-    int m_width, m_height, m_cbpp, m_zbpp, m_sbpp;
-    int m_nativeWidth, m_nativeHeight;
-    int m_backbufferWidth, m_backbufferHeight;
-    int m_numSSAASamples;
-    int m_wireframe_mode, m_wireframe_mode_prev;
-    uint32 m_nGPUs;  // Use GetActiveGPUCount() to read
-    float m_drawNearFov;
-    float m_pixelAspectRatio;
-    float m_shadowJittering;
-    StaticArray<int, MAX_GSM_LODS_NUM> m_CachedShadowsResolution;
-    CTextMessages m_TextMessages[RT_COMMAND_BUF_COUNT];     // [ThreadID], temporary stores 2d/3d text messages to render them at the end of the frame
-
-    CSkinningDataPool m_SkinningDataPool[3]; // Tripple Buffered for motion blur
-    LegacyInternal::JobExecutorPool m_jobExecutorPool;
-
-    uint32 m_nShadowGenId[RT_COMMAND_BUF_COUNT];
-
-    int m_cloudShadowTexId;
-    Vec3 m_cloudShadowSpeed;
-    float m_cloudShadowTiling;
-    bool m_cloudShadowInvert;
-    float m_cloudShadowBrightness;
-
-public:
-    // these ids can be used for tripple (or more) buffered structures
-    // they are incremented in RenderWorld on the mainthread
-    // use m_nPoolIndex from the mainthread (or jobs which are synced before Renderworld)
-    // and m_nPoolIndexRT from the renderthread
-    // right now the skinning data pool and particle are using this id
-    uint32 m_nPoolIndex;
-    uint32 m_nPoolIndexRT;
-
-
-    bool m_bVendorLibInitialized;
-
-    _inline uint32 GetActiveGPUCount() const
-    {
-        return CV_r_multigpu > 0 ? m_nGPUs : 1;
-    }
-
-    CCamera m_prevCamera;                               // camera from previous frame
-
-    uint32 m_nFrameLoad;
-    uint32 m_nFrameReset;
-    uint32 m_nFrameSwapID;                          // without recursive calls, access through GetFrameID(false)
-
-    ColorF m_cClearColor;
-    bool m_clearBackground;
-    int  m_NumResourceSlots;
-    int  m_NumSamplerSlots;
-
-    ////////////////////////////////////////////////////////
-    // downscaling viewport information.
-
-    // Set from CrySystem via IRenderer interface
-    Vec2 m_ReqViewportScale;
-
-    // Updated in RT_EndFrame. Fixed across the whole frame.
-    Vec2 m_CurViewportScale;
-    Vec2 m_PrevViewportScale;
-
-    // a RECT that represents the full screen size, accounting for above scaling
-    RECT m_FullResRect;
-    // same, but half resolution in each direction
-    RECT m_HalfResRect;
-
-    virtual void SetCurDownscaleFactor(Vec2 sf) = 0;
-
-    ////////////////////////////////////////////////////////
-
-    class CPostEffectsMgr* m_pPostProcessMgr;
-    class CWater* m_pWaterSimMgr;
-
-    // Used for pausing timer related stuff (eg: for texture animations, and shader 'time' parameter)
-    bool m_bPauseTimer;
-    float m_fPrevTime;
-    uint8 m_nUseZpass : 2;
-    bool m_bCollectDrawCallsInfo;
-    bool m_bCollectDrawCallsInfoPerNode;
-
-    // HDR rendering stuff
-    int m_dwHDRCropWidth;
-    int m_dwHDRCropHeight;
-
-    S3DEngineCommon m_p3DEngineCommon;
-
-    typedef std::map< uint64, PodArray<uint16>* > ShadowFrustumListsCache;
-    ShadowFrustumListsCache m_FrustumsCache;
-
-    ShadowFrustumMGPUCache m_ShadowFrustumMGPUCache;
-
-    //Debug Gun
-    IRenderNode* m_pDebugRenderNode;
-
-    //=====================================================================
-    // Shaders interface
-    CShaderMan m_cEF;
-    _smart_ptr<IMaterial> m_pDefaultMaterial;
-    _smart_ptr<IMaterial> m_pTerrainDefaultMaterial;
-
-    int m_TexGenID;
-
-    IFFont* m_pDefaultFont;
-
-    //=================================================================
-    // Light volumes data
-
-    struct SLightVolume* m_pLightVols;
-    uint32 m_nNumVols;
-
-    void RT_UpdateLightVolumes(int32 nFlags, int32 nRecurseLevel);
-    void RT_SetSkinningPoolId(uint32);
-
-    _inline void RT_SetLightVolumeShaderFlags(uint8 nNumLights)
-    {
-        const uint64 lightVolume = g_HWSR_MaskBit[HWSR_LIGHTVOLUME0];
-        m_RP.m_FlagsShader_RT &= ~lightVolume;
-        IF (nNumLights > 0, 1)
-        {
-            m_RP.m_FlagsShader_RT |= lightVolume;
-        }
-    }
-
-    //=================================================================
-    // High res screen shot
-
-    int m_screenShotType;
-    virtual void StartScreenShot(int e_ScreenShotType) { m_screenShotType = e_ScreenShotType; }
-    virtual void EndScreenShot([[maybe_unused]] int e_ScreenShotType) { m_screenShotType = 0; }
-
-    //=================================================================
-
-    virtual void SetClearColor(const Vec3& vColor) { m_cClearColor.r = vColor[0]; m_cClearColor.g = vColor[1]; m_cClearColor.b = vColor[2]; }
-    
-    virtual void SetClearBackground(bool clearBackground) { m_clearBackground = clearBackground; }
-
-    static void ChangeGeomInstancingThreshold(ICVar* pVar = 0);
-
-    static int m_iGeomInstancingThreshold;      // internal value, auto mapped depending on GPU hardware, 0 means not set yet
-
-    //////////////////////////////////////////////////////////////////////
-    // console variables
-    //////////////////////////////////////////////////////////////////////
-
-    //------------------int cvars-------------------------------
-
-    static ICVar* CV_r_ShowDynTexturesFilter;
-    static ICVar*   CV_r_ShaderCompilerServer;
-    static int CV_r_AssetProcessorShaderCompiler; // If true, will forward requests for shader compilation to the Asset Processor instead of the server directly.
-    static ICVar* CV_r_ShaderEmailTags;
-    static ICVar* CV_r_ShaderEmailCCs;
-    static ICVar* CV_r_excludeshader;
-    static ICVar* CV_r_excludemesh;
-    static ICVar* CV_r_ShowTexture;
-    static ICVar* CV_r_TexturesStreamingDebugfilter;
-
-    //declare cvars differing on platforms
-    static int CV_r_vsync;
-    static int CV_r_OldBackendSkip;
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-    static float CV_r_overrideRefreshRate;
-    static int CV_r_overrideScanlineOrder;
-    static int CV_r_overrideDXGIOutput;
-    static int CV_r_overrideDXGIOutputFS;
-#endif
-#if defined(WIN32) || defined(WIN64)
-    static int CV_r_FullscreenPreemption;
-#endif
-
-    static int CV_r_DebugLightLayers;
-
-    static int CV_r_ApplyToonShading;
-    static int CV_r_GraphicsPipeline;
-
-    static int CV_r_DeferredShadingTiled;
-    static int CV_r_DeferredShadingTiledHairQuality;
-    static int CV_r_DeferredShadingTiledDebugDirect;
-    static int CV_r_DeferredShadingTiledDebugIndirect;
-    static int CV_r_DeferredShadingTiledDebugAccumulation;
-    static int CV_r_DeferredShadingTiledDebugAlbedo;
-    static int CV_r_DeferredShadingSSS;
-    static int CV_r_DeferredShadingFilterGBuffer;
-
-    DeclareStaticConstIntCVar(CV_r_MotionVectors, 1);
-    DeclareStaticConstIntCVar(CV_r_MotionVectorsTransparency, 1);
-    DeclareStaticConstIntCVar(CV_r_MotionVectorsDebug, 0);
-    static float CV_r_MotionVectorsTransparencyAlphaThreshold;
-    static int CV_r_MotionBlur;
-    static int CV_r_RenderMotionBlurAfterHDR;
-    static int CV_r_MotionBlurScreenShot;
-    static int CV_r_MotionBlurQuality;
-    static int CV_r_MotionBlurGBufferVelocity;
-    static float CV_r_MotionBlurThreshold;
-    static int CV_r_flush;
-    static int CV_r_minimizeLatency;
-    static int CV_r_texatlassize;
-    static int CV_r_DeferredShadingSortLights;
-    static int CV_r_DeferredShadingAmbientSClear;
-    static int CV_r_batchtype;
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE) || defined(USE_SILHOUETTEPOM_CVAR)
-    //HACK: make sure we can only use it for dx11
-    static int CV_r_SilhouettePOM;
-#else
-    enum
-    {
-        CV_r_SilhouettePOM = 0
-    };
-#endif
-#ifdef WATER_TESSELLATION_RENDERER
-    static int CV_r_WaterTessellationHW;
-#else
-    enum
-    {
-        CV_r_WaterTessellationHW = 0
-    };
-#endif
-    static int CV_r_tessellationdebug;
-    static float CV_r_tessellationtrianglesize;
-    static float CV_r_displacementfactor;
-    static int CV_r_geominstancingthreshold;
-    static int CV_r_ShadowsDepthBoundNV;
-    static int CV_r_ShadowsPCFiltering;
-    static int CV_r_rc_autoinvoke;
-    static int CV_r_Refraction;
-    static int CV_r_PostProcessReset;
-    static int CV_r_colorRangeCompression;
-    static int CV_r_colorgrading_selectivecolor;
-    static int CV_r_colorgrading_charts;
-    static int CV_r_ColorgradingChartsCache;
-    static int CV_r_ShaderCompilerPort;
-    static int CV_r_ShowDynTexturesMaxCount;
-    static int CV_r_ShaderCompilerDontCache;
-    static int CV_r_dyntexmaxsize;
-    static int CV_r_dyntexatlascloudsmaxsize;
-    static int CV_r_texminanisotropy;
-    static int CV_r_texmaxanisotropy;
-    static int CV_r_texturesskiplowermips;
-    static int CV_r_rendertargetpoolsize;
-    static int CV_r_texturesstreamingsync;
-    static int CV_r_ConditionalRendering;
-    static int CV_r_watercaustics; //@NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
-    static int CV_r_watervolumecaustics;
-    static int CV_r_watervolumecausticsdensity;
-    static int CV_r_watervolumecausticsresolution;
-#if !defined(CONSOLE)
-    static int CV_r_shadersorbis;
-    static int CV_r_shadersdx10;
-    static int CV_r_shadersdx11;
-    static int CV_r_shadersGL4;
-    static int CV_r_shadersGLES3;
-    static int CV_r_shadersMETAL;
-    
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_H_SECTION_5
-    #include AZ_RESTRICTED_FILE(Renderer_h)
-#endif
-
-    static int CV_r_shadersPlatform;
-#endif
-    //  static int CV_r_envcmwrite;
-    static int CV_r_shaderspreactivate;
-    DeclareStaticConstIntCVar(CV_r_shadersremotecompiler, 0);
-    static int CV_r_shadersasynccompiling;
-    static int CV_r_shadersasyncactivation;
-    static int CV_r_shadersasyncmaxthreads;
-    static int CV_r_shaderscachedeterministic;
-    static int CV_r_shaderssubmitrequestline;
-    static int CV_r_shadersuseinstancelookuptable;
-    static int CV_r_shaderslogcachemisses;
-    static int CV_r_shadersImport;
-    static int CV_r_shadersExport;
-    static int CV_r_shadersCacheUnavailableShaders;
-    DeclareStaticConstIntCVar(CV_r_ShadersUseLLVMDirectXCompiler, 0);
-    static int CV_r_meshpoolsize;
-    static int CV_r_meshinstancepoolsize;
-    static int CV_r_multigpu;
-    static int CV_r_msaa;
-    static int CV_r_msaa_samples;
-    static int CV_r_msaa_quality;
-    static int CV_r_msaa_debug;
-    static int CV_r_impostersupdateperframe;
-    static int CV_r_beams;
-    static int CV_r_nodrawnear;
-    static int CV_r_DrawNearShadows;
-    static int CV_r_scissor;
-    static int CV_r_usezpass;
-    static int CV_r_ShowVideoMemoryStats;
-    static int CV_r_TexturesStreamingDebugMinSize;
-    static int CV_r_TexturesStreamingDebugMinMip;
-    static int CV_r_enableAltTab;
-    static int CV_r_StereoDevice;
-    static int CV_r_StereoMode;
-    static int CV_r_StereoOutput;
-    static int CV_r_StereoFlipEyes;
-    static int CV_r_GetScreenShot;
-    enum class ScreenshotType : int // define as int to match the CVar
-    {
-        None               = 0,
-        HdrAndNormal       = 1,
-        Normal             = 2,
-        // Now for internal ScreenshotRequestBus use only.
-        NormalWithFilepath = 3,
-        NormalToBuffer     = 4
-    };
-
-    static int CV_r_BreakOnError;
-
-    static int CV_r_TexturesStreamPoolSize; //plz do not access directly, always by GetTexturesStreamPoolSize()
-    static int CV_r_TexturesStreamPoolSecondarySize;
-    static inline int GetTexturesStreamPoolSize()
-    {
-        int poolSize = CV_r_TexturesStreamPoolSize + CV_r_TexturesStreamPoolSecondarySize;
-        return gEnv->IsEditor()
-               ? max(poolSize, 512)
-               : poolSize;
-    }
-
-    static int CV_r_ReprojectOnlyStaticObjects;
-    static int CV_r_D3D12SubmissionThread;
-    static int CV_r_ReverseDepth;
-
-    // DX12 related cvars
-    static int CV_r_EnableDebugLayer;
-    static int CV_r_NoDraw;
-
-    //declare in release mode constant cvars
-    DeclareStaticConstIntCVar(CV_r_stats, 0);
-    DeclareStaticConstIntCVar(CV_r_statsMinDrawcalls, 0);
-    DeclareStaticConstIntCVar(CV_r_profiler, 0);
-    static float CV_r_profilerTargetFPS;
-    DeclareStaticConstIntCVar(CV_r_ShadowPoolMaxFrames, 30);
-    static int CV_r_log;
-    static int CV_r_VRAMDebug;
-    DeclareStaticConstIntCVar(CV_r_logTexStreaming, 0);
-    DeclareStaticConstIntCVar(CV_r_logShaders, 0);
-    static int CV_r_logVBuffers;
-    DeclareStaticConstIntCVar(CV_r_logVidMem, 0);
-    DeclareStaticConstIntCVar(CV_r_predicatedtiling, 0);
-    DeclareStaticConstIntCVar(CV_r_useESRAM, 1);
-    DeclareStaticConstIntCVar(CV_r_multithreaded, MULTITHREADED_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_multithreadedDrawing, 0);
-    DeclareStaticConstIntCVar(CV_r_multithreadedDrawingActiveThreshold, 0);
-    DeclareStaticConstIntCVar(CV_r_deferredshadingLightVolumes, 1);
-    DeclareStaticConstIntCVar(CV_r_deferredDecals, 1);
-    DeclareStaticConstIntCVar(CV_r_deferredDecalsDebug, 0);
-    DeclareStaticConstIntCVar(CV_r_deferredDecalsOnDynamicObjects, 0);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingLBuffersFmt, 1);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingScissor, 1);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingDebug, 0);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingDebugGBuffer, 0);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingEnvProbes, 1);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingAmbient, 1);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingAmbientLights, 1);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingLights, 1);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingAreaLights, 1);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingStencilPrepass, 1);
-    static int CV_r_HDRDebug;
-    static int CV_r_HDRBloom;
-    static int CV_r_HDRBloomQuality;
-    static int CV_r_ToneMapTechnique;
-    static int CV_r_ColorSpace;
-    static int CV_r_ToneMapExposureType;
-    static float CV_r_ToneMapManualExposureValue;    
-    DeclareStaticConstIntCVar(CV_r_HDRVignetting, 1);
-    DeclareStaticConstIntCVar(CV_r_HDRTexFormat, 0);
-    static int CV_r_HDREyeAdaptationMode;
-    DeclareStaticConstIntCVar(CV_r_geominstancing, GEOM_INSTANCING_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_geominstancingdebug, 0);
-    DeclareStaticConstIntCVar(CV_r_materialsbatching, 1);
-    DeclareStaticConstIntCVar(CV_r_DebugLightVolumes, 0);
-    DeclareStaticConstIntCVar(CV_r_UseShadowsPool, SHADOWS_POOL_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_shadowtexformat, 0);
-    DeclareStaticConstIntCVar(CV_r_ShadowsMaskResolution, 0);
-    DeclareStaticConstIntCVar(CV_r_ShadowsMaskDownScale, 0);
-    static int CV_r_CBufferUseNativeDepth;
-    DeclareStaticConstIntCVar(CV_r_ShadowsStencilPrePass, 1);
-    DeclareStaticConstIntCVar(CV_r_ShadowsGridAligned, 1);
-    DeclareStaticConstIntCVar(CV_r_ShadowPass, 1);
-    DeclareStaticConstIntCVar(CV_r_ShadowGen, 1);
-    DeclareStaticConstIntCVar(CV_r_ShadowsUseClipVolume, SHADOWS_CLIP_VOL_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_ShadowGenMode, 1);
-    static int CV_r_ShadowsCache;
-    static int CV_r_ShadowsCacheFormat;
-    static int CV_r_ShadowsNearestMapResolution;
-    static int CV_r_ShadowsScreenSpace;
-    DeclareStaticConstIntCVar(CV_r_TerrainAO, 7);
-    DeclareStaticConstIntCVar(CV_r_TerrainAO_FadeDist, 8);
-    DeclareStaticConstIntCVar(CV_r_debuglights, 0);
-    DeclareStaticConstIntCVar(CV_r_DeferredShadingDepthBoundsTest, DEF_SHAD_DBT_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_deferredshadingDBTstencil, DEF_SHAD_DBT_STENCIL_DEFAULT_VAL);
-    static int CV_r_sunshafts;
-    DeclareStaticConstIntCVar(CV_r_MergeShadowDrawcalls, 1);
-    static int CV_r_PostProcess_CB;
-    static int CV_r_PostProcess;
-    DeclareStaticConstIntCVar(CV_r_PostProcessFilters, 1);
-    DeclareStaticConstIntCVar(CV_r_PostProcessGameFx, 1);
-    static int CV_r_colorgrading;
-    DeclareStaticConstIntCVar(CV_r_colorgrading_levels, 1);
-    DeclareStaticConstIntCVar(CV_r_colorgrading_filters, 1);
-    DeclareStaticConstIntCVar(CV_r_cloudsupdatealways, 0);
-    DeclareStaticConstIntCVar(CV_r_cloudsdebug, 0);
-    DeclareStaticConstIntCVar(CV_r_showdyntextures, 0);
-    DeclareStaticConstIntCVar(CV_r_shownormals, 0);
-    DeclareStaticConstIntCVar(CV_r_showlines, 0);
-    DeclareStaticConstIntCVar(CV_r_showtangents, 0);
-    DeclareStaticConstIntCVar(CV_r_showtimegraph, 0);
-    DeclareStaticConstIntCVar(CV_r_DebugFontRendering, 0);
-    DeclareStaticConstIntCVar(CV_profileStreaming, 0);
-    DeclareStaticConstIntCVar(CV_r_graphstyle, 0);
-    DeclareStaticConstIntCVar(CV_r_showbufferusage, 0);
-    DeclareStaticConstIntCVar(CV_r_profileshaders, 0);
-    DeclareStaticConstIntCVar(CV_r_ProfileShadersSmooth, 4);
-    DeclareStaticConstIntCVar(CV_r_ProfileShadersGroupByName, 1);
-    DeclareStaticConstIntCVar(CV_r_texpostponeloading, 1);
-    DeclareStaticConstIntCVar(CV_r_texpreallocateatlases, TEXPREALLOCATLAS_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_texlog, 0);
-    DeclareStaticConstIntCVar(CV_r_texnoload, 0);
-    DeclareStaticConstIntCVar(CV_r_texturecompiling, 1);
-    DeclareStaticConstIntCVar(CV_r_texBlockOnLoad, 0);
-    DeclareStaticConstIntCVar(CV_r_texturecompilingIndicator, 0);
-    DeclareStaticConstIntCVar(CV_r_TexturesDebugBandwidth, 0);
-    DeclareStaticConstIntCVar(CV_r_texturesstreaming, TEXSTREAMING_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_TexturesStreamingDebug, 0);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingnoupload, 0);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingonlyvideo, 0);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingResidencyEnabled, 1);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingmipfading, 1);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingUpdateType, TEXSTREAMING_UPDATETYPE_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingPrecacheRounds, 1);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingSuppress, 0);
-    static int CV_r_texturesstreamingSkipMips;
-    static int CV_r_texturesstreamingMinUsableMips;
-    static int CV_r_texturesstreamingJobUpdate;
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    static int CV_r_texturesstreamingDeferred;
-#endif
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingPostponeMips, 0);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingPostponeThresholdKB, 1024);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingPostponeThresholdMip, 1);
-    DeclareStaticConstIntCVar(CV_r_texturesstreamingMinReadSizeKB, 64);
-#if defined(SUPPORTS_INPLACE_TEXTURE_STREAMING)
-    static int CV_r_texturesstreamingInPlace;
-#endif
-    DeclareStaticConstIntCVar(CV_r_lightssinglepass, 1);
-    static int CV_r_envcmresolution;
-    static int CV_r_envtexresolution;
-    DeclareStaticConstIntCVar(CV_r_waterreflections, 1);
-    DeclareStaticConstIntCVar(CV_r_waterreflections_quality, WATERREFLQUAL_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_water_godrays, 1);
-    DeclareStaticConstIntCVar(CV_r_reflections, 1);
-    DeclareStaticConstIntCVar(CV_r_reflections_quality, 3);
-    DeclareStaticConstIntCVar(CV_r_dof, DOF_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_texNoAnisoAlphaTest, TEXNOANISOALPHATEST_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_reloadshaders, 0);
-    DeclareStaticConstIntCVar(CV_r_detailtextures, 1);
-    DeclareStaticConstIntCVar(CV_r_texbindmode, 0);
-    DeclareStaticConstIntCVar(CV_r_nodrawshaders, 0);
-    DeclareStaticConstIntCVar(CV_r_shadersdebug, 0);
-    DeclareStaticConstIntCVar(CV_r_shadersignoreincludeschanging, 0);
-    DeclareStaticConstIntCVar(CV_r_shaderslazyunload, 0);
-    static int CV_r_shadersAllowCompilation;
-    DeclareStaticConstIntCVar(CV_r_shaderscompileautoactivate, 0);
-    DeclareStaticConstIntCVar(CV_r_shadersediting, 0);
-    DeclareStaticConstIntCVar(CV_r_shadersprecachealllights, 1);
-    DeclareStaticConstIntCVar(CV_r_ReflectTextureSlots, 1);
-    DeclareStaticConstIntCVar(CV_r_debugrendermode, 0);
-    DeclareStaticConstIntCVar(CV_r_debugrefraction, 0);
-    DeclareStaticConstIntCVar(CV_r_meshprecache, 1);
-    DeclareStaticConstIntCVar(CV_r_impostersdraw, 1);
-    static int CV_r_flares;
-    DeclareStaticConstIntCVar(CV_r_flareHqShafts, FLARES_HQSHAFTS_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_ZPassDepthSorting, ZPASS_DEPTH_SORT_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_TransparentPasses, 1);
-    DeclareStaticConstIntCVar(CV_r_TranspDepthFixup, 1);
-    DeclareStaticConstIntCVar(CV_r_SoftAlphaTest, 1);
-    DeclareStaticConstIntCVar(CV_r_usehwskinning, 1);
-    DeclareStaticConstIntCVar(CV_r_usemateriallayers, 2);
-    DeclareStaticConstIntCVar(CV_r_ParticlesSoftIsec, 1);
-    DeclareStaticConstIntCVar(CV_r_ParticlesRefraction, 1);
-    static int CV_r_ParticlesTessellation;
-    static int CV_r_ParticlesTessellationTriSize;
-    static float CV_r_ParticlesAmountGI;
-    static int CV_r_ParticlesGpuMaxEmitCount;
-    static int CV_r_ParticlesHalfRes;
-    DeclareStaticConstIntCVar(CV_r_ParticlesHalfResAmount, 0);
-    DeclareStaticConstIntCVar(CV_r_ParticlesHalfResBlendMode, 0);
-    DeclareStaticConstIntCVar(CV_r_ParticlesInstanceVertices, 1);
-    DeclareStaticConstIntCVar(CV_r_AntialiasingModeEditor, 1);
-    DeclareStaticConstIntCVar(CV_r_AntialiasingModeDebug, 0);
-    DeclareStaticConstIntCVar(CV_r_rain, 2);
-    DeclareStaticConstIntCVar(CV_r_rain_ignore_nearest, 1);
-    DeclareStaticConstIntCVar(CV_r_snow, 2);
-    DeclareStaticConstIntCVar(CV_r_snow_halfres, 0);
-    DeclareStaticConstIntCVar(CV_r_snow_displacement, 0);
-    DeclareStaticConstIntCVar(CV_r_snowFlakeClusters, 100);
-    DeclareStaticConstIntCVar(CV_r_customvisions, CUSTOMVISIONS_DEFAULT_VAL);
-    DeclareStaticConstIntCVar(CV_r_nohwgamma, 2);
-    DeclareStaticConstIntCVar(CV_r_wireframe, 0);
-    DeclareStaticConstIntCVar(CV_r_printmemoryleaks, 0);
-    DeclareStaticConstIntCVar(CV_r_releaseallresourcesonexit, 1);
-    DeclareStaticConstIntCVar(CV_r_character_nodeform, 0);
-    DeclareStaticConstIntCVar(CV_r_ZPassOnly, 0);
-    DeclareStaticConstIntCVar(CV_r_measureoverdraw, 0);
-    DeclareStaticConstIntCVar(CV_r_ShowLightBounds, 0);
-    DeclareStaticConstIntCVar(CV_r_MergeRenderChunks, 1);
-    DeclareStaticConstIntCVar(CV_r_TextureCompressor, 1);
-    DeclareStaticConstIntCVar(CV_r_TexturesStreamingDebugDumpIntoLog, 0);
-    DeclareStaticConstIntCVar(CV_e_DebugTexelDensity, 0);
-    DeclareStaticConstIntCVar(CV_r_RainDropsEffect, 1);
-    DeclareStaticConstIntCVar(CV_r_RefractionPartialResolves, 2);
-    DeclareStaticConstIntCVar(CV_r_RefractionPartialResolvesDebug, 0);
-    DeclareStaticConstIntCVar(CV_r_Batching, 1);
-    DeclareStaticConstIntCVar(CV_r_Unlit, 0);
-    DeclareStaticConstIntCVar(CV_r_HideSunInCubemaps, 1);
-    DeclareStaticConstIntCVar(CV_r_ParticlesDebug, 0);
-
-    // Confetti David Srour: Upscaling Quality (Metal only at the moment)
-    DeclareStaticConstIntCVar(CV_r_UpscalingQuality, 0);
-    //Clears GMEM G-Buffer
-    DeclareStaticConstIntCVar(CV_r_ClearGMEMGBuffer, 0);
-
-    // 0 = disable, 1 = enables fast math for metal shaders
-    DeclareStaticConstIntCVar(CV_r_MetalShadersFastMath, 1);
-    // Confetti Vera
-    static int CV_r_CubeDepthMapResolution;
-
-    // Specular Antialiasing
-    static int CV_r_SpecularAntialiasing;
-
-    //--------------float cvars----------------------
-
-
-    static float CV_r_ZPrepassMaxDist;
-    static float CV_r_FlaresChromaShift;
-    static int CV_r_FlaresIrisShaftMaxPolyNum;
-    static float CV_r_FlaresTessellationRatio;
-
-    static float CV_r_msaa_threshold_normal;
-    static float CV_r_msaa_threshold_depth;
-
-    static float CV_r_drawnearfov;
-    static float CV_r_measureoverdrawscale;
-    static float CV_r_DeferredShadingLightLodRatio;
-    static float CV_r_DeferredShadingLightStencilRatio;
-    static float CV_r_rainDistMultiplier;
-    static float CV_r_rainOccluderSizeTreshold;
-
-    static float CV_r_HDREyeAdaptationSpeed;
-    static float CV_r_HDRGrainAmount;
-
-    static int CV_r_HDRDolbyDynamicMetadata;
-    static int CV_r_HDRDolbyScurve;
-    static float CV_r_HDRDolbyScurveSourceMin;
-    static float CV_r_HDRDolbyScurveSourceMid;
-    static float CV_r_HDRDolbyScurveSourceMax;
-    static float CV_r_HDRDolbyScurveSlope;
-    static float CV_r_HDRDolbyScurveScale;
-    static float CV_r_HDRDolbyScurveRGBPQTargetMin;
-    static float CV_r_HDRDolbyScurveRGBPQTargetMax;
-    static float CV_r_HDRDolbyScurveRGBPQTargetMid;
-    static float CV_r_HDRDolbyScurveVisionTargetMin;
-    static float CV_r_HDRDolbyScurveVisionTargetMax;
-    static float CV_r_HDRDolbyScurveVisionTargetMid;
-
-    static float CV_r_Sharpening;
-    static float CV_r_ChromaticAberration;
-    static float CV_r_dofMinZ;
-    static float CV_r_dofMinZScale;
-    static float CV_r_dofMinZBlendMult;
-    static float CV_r_ShadowsBias;
-    static float CV_r_ShadowsAdaptionRangeClamp;
-    static float CV_r_ShadowsAdaptionSize;
-    static float CV_r_ShadowsAdaptionMin;
-    static float CV_r_ShadowsParticleKernelSize;
-    static float CV_r_ShadowsParticleJitterAmount;
-    static float CV_r_ShadowsParticleAnimJitterAmount;
-    static float CV_r_ShadowsParticleNormalEffect;
-private:
-    static float CV_r_shadow_jittering; // dont use this directly for rendering. use m_shadowJittering or GetShadowJittering() instead;
-public:
-    static int   CV_r_ShadowPoolMaxTimeslicedUpdatesPerFrame;
-    static int   CV_r_ShadowCastingLightsMaxCount;
-    static int   CV_r_HeightMapAO;
-    static float CV_r_HeightMapAOAmount;
-    static float CV_r_HeightMapAOResolution;
-    static float CV_r_HeightMapAORange;
-    static float CV_r_RenderMeshHashGridUnitSize;
-    static float CV_r_normalslength;
-    static float CV_r_TexelsPerMeter;
-    static float CV_r_TexturesStreamingMaxRequestedMB;
-    static int CV_r_TexturesStreamingMaxRequestedJobs;
-    static float CV_r_TexturesStreamingMipBias;
-    static int CV_r_TexturesStreamingMipClampDVD;
-    static int CV_r_TexturesStreamingDisableNoStreamDuringLoad;
-    static float CV_r_texturesstreamingResidencyTimeTestLimit;
-    static float CV_r_texturesstreamingResidencyTime;
-    static float CV_r_texturesstreamingResidencyThrottle;
-    static float CV_r_envcmupdateinterval;
-    static float CV_r_envtexupdateinterval;
-    static int   CV_r_SlimGBuffer;
-    static float CV_r_TextureLodDistanceRatio;
-    static float CV_r_water_godrays_distortion;
-    static float CV_r_waterupdateFactor;
-    static float CV_r_waterupdateDistance;
-    static float CV_r_waterreflections_min_visible_pixels_update;
-    static float CV_r_waterreflections_minvis_updatefactormul;
-    static float CV_r_waterreflections_minvis_updatedistancemul;
-    static float CV_r_waterreflections_offset;
-    static float CV_r_watercausticsdistance;
-    static float CV_r_watervolumecausticssnapfactor;
-    static float CV_r_watervolumecausticsmaxdistance;
-    static float CV_r_detaildistance;
-    static float CV_r_DrawNearZRange;
-    static float CV_r_DrawNearFarPlane;
-    static float CV_r_imposterratio;
-    static float CV_r_rainamount;
-    static float CV_r_MotionBlurShutterSpeed;
-    static float CV_r_MotionBlurCameraMotionScale;
-    static float CV_r_MotionBlurMaxViewDist;
-    static float CV_r_gamma;
-    static float CV_r_contrast;
-    static float CV_r_brightness;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERER_H_SECTION_6
-    #include AZ_RESTRICTED_FILE(Renderer_h)
-#endif
-    static float CV_r_ZFightingDepthScale;
-    static float CV_r_ZFightingExtrude;
-    static float CV_r_StereoStrength;
-    static float CV_r_StereoEyeDist;
-    static float CV_r_StereoScreenDist;
-    static float CV_r_StereoNearGeoScale;
-    static float CV_r_StereoHudScreenDist;
-    static float CV_r_StereoGammaAdjustment;
-    static int CV_r_ConsoleBackbufferWidth;
-    static int CV_r_ConsoleBackbufferHeight;
-
-    static int CV_r_AntialiasingMode_CB;
-    static int CV_r_AntialiasingMode;
-    static float CV_r_AntialiasingNonTAASharpening;
-    static int CV_r_AntialiasingTAAJitterPattern;
-    DeclareStaticConstIntCVar(CV_r_AntialiasingTAAUseAntiFlickerFilter, 1);
-    DeclareStaticConstIntCVar(CV_r_AntialiasingTAAUseJitterMipBias, 1);
-    DeclareStaticConstIntCVar(CV_r_AntialiasingTAAUseVarianceClamping, 0);
-    static float CV_r_AntialiasingTAAClampingFactor;
-    static float CV_r_AntialiasingTAANewFrameWeight;
-    static float CV_r_AntialiasingTAASharpening;
-    static float CV_r_FogDepthTest;
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    static int CV_r_FogShadows;
-    static int CV_r_FogShadowsMode;
-#endif
-    static int CV_r_FogShadowsWater;
-
-    static float CV_r_rain_maxviewdist;
-    static float CV_r_rain_maxviewdist_deferred;
-
-    static int CV_r_SSReflections;
-    static int CV_r_SSReflHalfRes;
-    static int CV_r_ssdo;
-    static int CV_r_ssdoHalfRes;
-    static int CV_r_ssdoColorBleeding;
-    static float CV_r_ssdoRadius;
-    static float CV_r_ssdoRadiusMin;
-    static float CV_r_ssdoRadiusMax;
-    static float CV_r_ssdoAmountDirect;
-    static float CV_r_ssdoAmountAmbient;
-    static float CV_r_ssdoAmountReflection;
-
-    // constant used to indicate that CustomResMax should be set to the maximum allowable by device resources
-    static const int s_CustomResMaxSize_USE_MAX_RESOURCES;
-    static int CV_r_CustomResMaxSize;
-    static int CV_r_CustomResWidth;
-    static int CV_r_CustomResHeight;
-    static int CV_r_CustomResPreview;
-    static int CV_r_Supersampling;
-    static int CV_r_SupersamplingFilter;
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    static int CV_r_enableauxgeom;
-#endif
-
-    static int CV_r_buffer_banksize;
-    static int CV_r_constantbuffer_banksize;
-    static int CV_r_constantbuffer_watermark;
-    static int CV_r_transient_pool_size;
-    static int CV_r_buffer_sli_workaround;
-    DeclareStaticConstIntCVar(CV_r_buffer_enable_lockless_updates, 1);
-    DeclareStaticConstIntCVar(CV_r_enable_full_gpu_sync, 0);
-    static int CV_r_buffer_pool_max_allocs;
-    static int CV_r_buffer_pool_defrag_static;
-    static int CV_r_buffer_pool_defrag_dynamic;
-    static int CV_r_buffer_pool_defrag_max_moves;
-
-    static int CV_r_ParticleVerticePoolSize;
-
-    static int CV_r_GeomCacheInstanceThreshold;
-
-    static int CV_r_VisAreaClipLightsPerPixel;
-    static int CV_r_OutputShaderSourceFiles;
-
-    static int CV_r_VolumetricFog;
-    static int CV_r_VolumetricFogTexScale;
-    static int CV_r_VolumetricFogTexDepth;
-    static float CV_r_VolumetricFogReprojectionBlendFactor;
-    static int CV_r_VolumetricFogSample;
-    static int CV_r_VolumetricFogShadow;
-    static int CV_r_VolumetricFogDownscaledSunShadow;
-    static int CV_r_VolumetricFogDownscaledSunShadowRatio;
-    static int CV_r_VolumetricFogReprojectionMode;
-    static float CV_r_VolumetricFogMinimumLightBulbSize;
-
-    static float CV_r_ResolutionScale;
-
-    // Confetti David Srour: Global VisArea/Portals blend weight for GMEM path
-    static float CV_r_GMEMVisAreasBlendWeight;
-
-    // Confetti David Srour: 0 = disable, 1= 256bpp GMEM path, 2 = 128bpp GMEM path
-    static int CV_r_EnableGMEMPath;
-
-    // Confetti David Srour: 0 = GMEM postproc w/out CS, 1 = GMEM postproc w/ CS
-    static int CV_r_EnableGMEMPostProcCS;
-
-    // Confetti David Srour: Used to reduce draw calls during DOF's gathers
-    static int CV_r_GMEM_DOF_Gather1_Quality;
-    static int CV_r_GMEM_DOF_Gather2_Quality;
-
-    static int CV_r_RainUseStencilMasking;
-
-    // Confetti Thomas Zeng: 0 = disable, 1 = enable
-    static int CV_r_EnableComputeDownSampling;
-
-    static int CV_r_ForceFixedPointRenderTargets;
-
-    // Confetti Vera
-    static float CV_r_CubeDepthMapFarPlane;
-
-    // Fur control parameters
-    static int CV_r_Fur;
-    static int CV_r_FurShellPassCount;
-    static int CV_r_FurShowBending;
-    static int CV_r_FurDebug;
-    static int CV_r_FurDebugOneShell;
-    static int CV_r_FurFinPass;
-    static int CV_r_FurFinShadowPass;
-    static float CV_r_FurMovementBendingBias;
-    static float CV_r_FurMaxViewDist;
-    
-    static int CV_r_SkipNativeUpscale;
-    static int CV_r_SkipRenderComposites;
-
-    static float CV_r_minConsoleFontSize;
-    static float CV_r_maxConsoleFontSize;
-
-    // Linux CVARS
-    static int CV_r_linuxSkipWindowCreation;
-
-    // Graphics programmers: Use these in your code for local tests/debugging.
-    // Delete all references in your code before you submit
-    static int CV_r_GraphicsTest00;
-    static int CV_r_GraphicsTest01;
-    static int CV_r_GraphicsTest02;
-    static int CV_r_GraphicsTest03;
-    static int CV_r_GraphicsTest04;
-    static int CV_r_GraphicsTest05;
-    static int CV_r_GraphicsTest06;
-    static int CV_r_GraphicsTest07;
-    static int CV_r_GraphicsTest08;
-    static int CV_r_GraphicsTest09;
-
-    //--------------end cvars------------------------
-
-
-    virtual void MakeMatrix([[maybe_unused]] const Vec3& pos, [[maybe_unused]] const Vec3& angles, [[maybe_unused]] const Vec3& scale, [[maybe_unused]] Matrix34* mat){assert(0); };
-
-
-    virtual WIN_HWND GetHWND() = 0;
-
-    void SetTextureAlphaChannelFromRGB(byte* pMemBuffer, int nTexSize);
-
-    void EnableSwapBuffers(bool bEnable) { m_bSwapBuffers = bEnable; }
-    bool m_bSwapBuffers;
-
-    virtual void SetTexturePrecaching(bool stat);
-
-    virtual void EnableGPUTimers2([[maybe_unused]] bool bEnabled) {};
-    virtual void AllowGPUTimers2([[maybe_unused]] bool bAllow) {}
-
-    virtual const RPProfilerStats* GetRPPStats([[maybe_unused]] ERenderPipelineProfilerStats eStat, [[maybe_unused]] bool bCalledFromMainThread = true) const { return nullptr; }
-    virtual const RPProfilerStats* GetRPPStatsArray([[maybe_unused]] bool bCalledFromMainThread = true) const { return nullptr; }
-
-    virtual int GetPolygonCountByType([[maybe_unused]] uint32 EFSList, [[maybe_unused]] EVertexCostTypes vct, [[maybe_unused]] uint32 z, [[maybe_unused]] bool bCalledFromMainThread = true) { return 0; }
-
-    //platform specific
-    virtual void    RT_InsertGpuCallback([[maybe_unused]] uint32 context, [[maybe_unused]] GpuCallbackFunc callback) {}
-    virtual void EnablePipelineProfiler(bool bEnable) = 0;
-
-    virtual float GetGPUFrameTime();
-    virtual void GetRenderTimes(SRenderTimes& outTimes);
-
-    virtual void LogShaderImportMiss([[maybe_unused]] const CShader* pShader) {}
-
-#if !defined(_RELEASE)
-    //Get debug draw call stats stat
-    virtual RNDrawcallsMapMesh& GetDrawCallsInfoPerMesh(bool mainThread = true)
-    {
-        if (mainThread)
-        {
-            return m_RP.m_pRNDrawCallsInfoPerMesh[m_RP.m_nFillThreadID];
-        }
-        else
-        {
-            return m_RP.m_pRNDrawCallsInfoPerMesh[m_RP.m_nProcessThreadID];
-        }
-    }
-    
-    // Added functionality for retrieving previous frames stats to use this frame
-    virtual RNDrawcallsMapMesh& GetDrawCallsInfoPerMeshPreviousFrame(bool mainThread = true)
-    {
-        if (mainThread)
-        {
-            return m_RP.m_pRNDrawCallsInfoPerMeshPreviousFrame[m_RP.m_nFillThreadID];
-        }
-        else
-        {
-            return m_RP.m_pRNDrawCallsInfoPerMeshPreviousFrame[m_RP.m_nProcessThreadID];
-        }
-    }
-    virtual RNDrawcallsMapNode& GetDrawCallsInfoPerNodePreviousFrame(bool mainThread = true)
-    {
-        if (mainThread)
-        {
-            return m_RP.m_pRNDrawCallsInfoPerNodePreviousFrame[m_RP.m_nFillThreadID];
-        }
-        else
-        {
-            return m_RP.m_pRNDrawCallsInfoPerNodePreviousFrame[m_RP.m_nProcessThreadID];
-        }
-    }
-
-    virtual int GetDrawCallsPerNode(IRenderNode* pRenderNode);
-
-    //Routine to perform an emergency flush of a particular render node from the stats, as not all render node holders are delay-deleted
-    virtual void ForceRemoveNodeFromDrawCallsMap(IRenderNode* pNode)
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-        {
-            IRenderer::RNDrawcallsMapNodeItor pItor = m_RP.m_pRNDrawCallsInfoPerNode[ i ].find(pNode);
-            if (pItor != m_RP.m_pRNDrawCallsInfoPerNode[ i ].end())
-            {
-                m_RP.m_pRNDrawCallsInfoPerNode[ i ].erase(pItor);
-            }
-        }
-    }
-
-    void ClearDrawCallsInfo()
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-        {
-            m_RP.m_pRNDrawCallsInfoPerMesh[i].swap(m_RP.m_pRNDrawCallsInfoPerMeshPreviousFrame[i]);
-            m_RP.m_pRNDrawCallsInfoPerMesh[i].clear();
-            m_RP.m_pRNDrawCallsInfoPerNode[i].swap(m_RP.m_pRNDrawCallsInfoPerNodePreviousFrame[i]);
-            m_RP.m_pRNDrawCallsInfoPerNode[i].clear();
-        }
-    }
-#endif
-
-    virtual void CollectDrawCallsInfo(bool status)
-    {
-        m_bCollectDrawCallsInfo = status;
-    }
-
-    virtual void CollectDrawCallsInfoPerNode(bool status)
-    {
-        m_bCollectDrawCallsInfoPerNode = status;
-    }
-
-    virtual void EnableLevelUnloading(bool enable)
-    {
-        gRenDev->m_bLevelUnloading = enable;
-    }
-
-    virtual void EnableBatchMode(bool enable)
-    {
-        RENDER_LOCK_CS(SRenderThread::s_rcLock);
-        if (enable)
-        {
-            gRenDev->m_bEndLevelLoading = false;
-            gRenDev->m_bStartLevelLoading = true;
-        }
-        else
-        {
-            gRenDev->m_bEndLevelLoading = true;
-            gRenDev->m_bStartLevelLoading = false;
-        }
-    }
-
-    // When a level load fails, the system event for ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END will not be called, so we need to do some cleanup here.
-    // This is to ensure the renderer no longer thinks we are rendering a loading screen after the level load failed.
-    virtual void OnLevelLoadFailed()
-    {
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-        EBUS_EVENT(LoadScreenBus, Stop);
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-
-        gRenDev->m_bEndLevelLoading = true;
-        gRenDev->m_bStartLevelLoading = false;
-    }
-
-    virtual bool IsStereoModeChangePending()
-    {
-        return false;
-    }
-
-    int m_nFlushAllPendingTextureStreamingJobs;
-    float m_fTexturesStreamingGlobalMipFactor;
-
-protected:
-
-    AZ::LegacyJobExecutor m_generateRendItemJobExecutor;
-    AZ::LegacyJobExecutor m_generateRendItemPreProcessJobExecutor;
-    AZ::LegacyJobExecutor m_generateShadowRendItemJobExecutor;
-    AZ::LegacyJobExecutor m_finalizeRendItemsJobExecutor[RT_COMMAND_BUF_COUNT];
-    AZ::LegacyJobExecutor m_finalizeShadowRendItemsJobExecutor[RT_COMMAND_BUF_COUNT];
-
-private:
-    std::vector<ISyncMainWithRenderListener*> m_syncMainWithRenderListeners;
-    RendererAssetListener m_assetListener;
-
-    unsigned long m_nvidiaDriverVersion = 0;
-};
-
-
-#include "CommonRender.h"
-
-#define SKY_BOX_SIZE 32.f
diff --git a/Code/CryEngine/RenderDll/Common/RendererAPI.h b/Code/CryEngine/RenderDll/Common/RendererAPI.h
deleted file mode 100644
index 1035851dd4..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendererAPI.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Main header included by every file in Renderer.
-
-#pragma once
-
-#if defined(RENDERER_API)
-#error RENDERER_API should only be defined in this header
-#endif
-
-#if defined(RENDERER_EXPORTS)
-    #define RENDERER_API __declspec(dllexport)
-    #define RENDERER_API_EXTERN
-#else
-    #define RENDERER_API __declspec(dllimport)
-    #define RENDERER_API_EXTERN extern
-#endif
-
diff --git a/Code/CryEngine/RenderDll/Common/RendererDefs.h b/Code/CryEngine/RenderDll/Common/RendererDefs.h
deleted file mode 100644
index 9dad69f471..0000000000
--- a/Code/CryEngine/RenderDll/Common/RendererDefs.h
+++ /dev/null
@@ -1,815 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#ifndef _WINSOCKAPI_
-#   define _WINSOCKAPI_
-#   define _DID_SKIP_WINSOCK_
-#endif
-
-#include <vector>
-#include <array>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-#include <memory>
-
-#include <platform.h>
-#include <CrySizer.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Casting/lossy_cast.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define RENDERERDEFS_H_SECTION_1 1
-#define RENDERERDEFS_H_SECTION_2 2
-#define RENDERERDEFS_H_SECTION_3 3
-#define RENDERERDEFS_H_SECTION_4 4
-#define RENDERERDEFS_H_SECTION_5 5
-#define RENDERERDEFS_H_SECTION_6 6
-#define RENDERERDEFS_H_SECTION_7 7
-#define RENDERERDEFS_H_SECTION_8 8
-#define RENDERERDEFS_H_SECTION_9 9
-#define RENDERERDEFS_H_SECTION_10 10
-#define RENDERERDEFS_H_SECTION_11 11
-#define RENDERERDEFS_H_SECTION_12 12
-#define RENDERERDEFS_H_SECTION_13 13
-#define RENDERERDEFS_H_SECTION_14 14
-#define RENDERERDEFS_H_SECTION_15 15
-#define RENDERERDEFS_H_SECTION_16 16
-#define RENDERERDEFS_H_SECTION_17 17
-#define RENDERERDEFS_H_SECTION_18 18
-#define RENDERERDEFS_H_SECTION_19 19
-#define RENDERERDEFS_H_SECTION_20 20
-#endif
-
-#define SUPPORTS_WINDOWS_10_SDK false
-#if _MSC_VER
-#include <ntverp.h>
-#undef SUPPORTS_WINDOWS_10_SDK
-#define SUPPORTS_WINDOWS_10_SDK (VER_PRODUCTBUILD > 9600)
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#else
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE)
-#define RENDERERDEFS_H_TRAIT_SUPPORT_BAKED_MESHES_AND_DECALS 1
-#endif
-
-#define RENDERERDEFS_H_TRAIT_CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS 0
-
-#if defined(WIN32) || defined(WIN64)
-#define RENDERERDEFS_H_TRAIT_SUPPORT_D3D_DEBUG_RUNTIME 1
-#endif
-
-#if defined(APPLE)
-#define RENDERERDEFS_H_TRAIT_DEFINE_D3DPOOL 1
-#endif
-
-#define RENDERERDEFS_H_TRAIT_ALIAS_D3DOK 0
-#define RENDERMESH_CPP_TRAIT_BUFFER_ENABLE_DIRECT_ACCESS 0
-
-#if defined(MOBILE)
-#define RENDERTHREAD_H_TRAIT_USE_LOCKS_FOR_FLUSH_SYNC 1
-#endif
-
-#if defined(WIN64)
-#define PLANNINGTEXTURESTREAMER_JOBS_CPP_TRAIT_JOB_INITKEYS_PREFETCH 1
-#endif
-
-#define TEXTURESTREAMING_CPP_TRAIT_CANSTREAMINPLACE_ETT_2D_EARLY_OUT 1
-#define TEXTURESTREAMING_CPP_TRAIT_CANSTREAMINPLACE_FORMATCOMPATIBLE 1
-#define TEXTURESTREAMING_CPP_TRAIT_TRYCOMMIT_COPYMIPS 1
-#define TEXTURESTREAMING_CPP_TRAIT_COPYMIPS_MOVEENGINE 0
-#define TEXTURESTREAMING_CPP_TRAIT_CANSTREAMINPLACE_SRCTILEMODE_CHECK 0
-
-#define D3DFXPIPELINE_CPP_TRAIT_CLEARVIEW 1
-
-#if defined(IOS)
-#define D3DGPUPARTICLEENGINE_CPP_TRAIT_BEGINUPDATE_INIT_COMPUTE 1
-#endif
-
-#define D3DHWSHADER_H_TRAIT_DEFINE_D3D_BLOB 0
-
-#if defined(OPENGL) || defined(CRY_USE_METAL)
-#define D3DHWSHADERCOMPILING_CPP_TRAIT_VERTEX_FORMAT 1
-#else
-#define D3DHWSHADERCOMPILING_CPP_TRAIT_VERTEX_FORMAT 0
-#endif
-
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX)
-#define D3DRENDERRE_CPP_TRAIT_MFDRAW_SETDEPTHSURF 1
-#endif
-
-#define D3DRENDERRE_CPP_TRAIT_MFDRAW_USEINSTANCING 1
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#define D3DSTEREO_CPP_TRAIT_SELECTDEFAULTDEVICE_STEREODEVICEDRIVER 1
-#endif
-
-#if defined(WIN32)
-#define D3DSYSTEM_CPP_TRAIT_SETWINDOW_REGISTERWINDOWMESSAGEHANDLER 1
-#endif
-
-#define DRIVERD3D_CPP_TRAIT_CALCULATERESOLUTIONS_1080 0
-
-#if defined(IOS) || defined(ANDROID)
-#define DRIVERD3D_CPP_TRAIT_HANDLEDISPLAYPROPERTYCHANGES_FULLSCREEN 1
-#endif
-
-#if defined(IOS) || defined(ANDROID)
-#define DRIVERD3D_CPP_TRAIT_HANDLEDISPLAYPROPERTYCHANGES_NATIVERES 1
-#endif
-
-#define DRIVERD3D_CPP_TRAIT_HANDLEDISPLAYPROPERTYCHANGES_CALCRESOLUTIONS 1
-
-#define DRIVERD3D_CPP_TRAIT_RT_ENDFRAME_NOTIMPL 0
-
-#if defined(_WIN32)
-#define DRIVERD3D_CPP_TRAIT_ONSYSTEMEVENT_EVENTMOVE 1
-#endif
-
-#if defined (WIN32)
-#define DRIVERD3D_H_TRAIT_DEFSAVETEXTURE 1
-#endif
-
-#if defined(WIN32)
-#define DRIVERD3D_H_TRAIT_DEFREGISTEREDWINDOWHANDLER 1
-#endif
-
-#if defined (WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX)
-#define DRIVERD3D_H_TRAIT_DEFOCCLUSIONTEXTURESVALID 1
-#endif
-
-#if defined(WIN32)
-#define GPUTIMER_CPP_TRAIT_CSIMPLEGPUTIMER_SETQUERYSTART 1
-#endif
-
-#if defined(WIN32)
-#define GPUTIMER_CPP_TRAIT_RELEASE_RELEASEQUERY 1
-#endif
-
-#if defined(WIN32)
-#define GPUTIMER_CPP_TRAIT_INIT_CREATEQUERY 1
-#endif
-
-#if defined(WIN32)
-#define GPUTIMER_CPP_TRAIT_START_PRIMEQUERY 1
-#endif
-
-#if defined(WIN32)
-#define GPUTIMER_CPP_TRAIT_STOP_ENDQUERY 1
-#endif
-
-#if defined(WIN32)
-#define GPUTIMER_CPP_TRAIT_UPDATETIME_GETDATA 1
-#endif
-
-#if defined(WIN32)
-#define GPUTIMER_H_TRAIT_DEFINEQUERIES 1
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#define NULL_SYSTEM_TRAIT_INIT_RETURNTHIS 1
-#endif
-
-#endif
-
-#if defined(WIN64) && defined (CRY_USE_DX12)
-#define CRY_INTEGRATE_DX12
-#endif
-
-#ifdef _DEBUG
-#define GFX_DEBUG
-#endif
-
-//defined in DX9, but not DX10
-#if RENDERERDEFS_H_TRAIT_ALIAS_D3DOK || defined(OPENGL)
-#define D3D_OK  S_OK
-#endif
-
-#if !defined(CRY_USE_DX12) && !defined(OPENGL) && !defined(_RELEASE)        
-# define RENDERER_ENABLE_BREAK_ON_ERROR 0       ///< Define causes compile errors on DX12 and OpenGL
-#endif
-#if !defined(RENDERER_ENABLE_BREAK_ON_ERROR)
-# define RENDERER_ENABLE_BREAK_ON_ERROR 0
-#endif
-#if RENDERER_ENABLE_BREAK_ON_ERROR
-# include <winerror.h>
-namespace detail
-{
-    const char* ToString(long const hr);
-    bool CheckHResult(long const hr, bool breakOnError, const char* file, const int line);
-}
-//# undef FAILED
-//# define FAILED(x) (detail::CheckHResult((x), false, __FILE__, __LINE__))
-# define CHECK_HRESULT(x) (detail::CheckHResult((x), true, __FILE__, __LINE__))
-#else
-# define CHECK_HRESULT(x) (!FAILED(x))
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_6
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-
-#if defined(OPENGL) && (defined(DEBUG) || defined(_DEBUG))
-#define LY_ENABLE_OPENGL_ERROR_CHECKING
-#endif
-namespace O3de
-{
-    namespace OpenGL
-    {
-#if defined(LY_ENABLE_OPENGL_ERROR_CHECKING)
-        unsigned int CheckError();
-        void ClearErrors();
-#else
-        inline unsigned int CheckError() { return 0; }
-        inline void ClearErrors() {}
-#endif
-    }
-}
-
-// enable support for D3D11.1 features if the platform supports it
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(CRY_USE_DX12)
-#   define DEVICE_SUPPORTS_D3D11_1
-#endif
-
-#ifdef _DEBUG
-#define CRTDBG_MAP_ALLOC
-#endif //_DEBUG
-
-#undef USE_STATIC_NAME_TABLE
-#define USE_STATIC_NAME_TABLE
-
-#if !defined(_RELEASE)
-#define ENABLE_FRAME_PROFILER
-#endif
-
-#if !defined(NULL_RENDERER) && (!defined(_RELEASE) || defined(PERFORMANCE_BUILD))
-#define ENABLE_PROFILING_GPU_TIMERS
-#define ENABLE_FRAME_PROFILER_LABELS
-#endif
-
-#ifdef ENABLE_FRAME_PROFILER
-#   define PROFILE 1
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_7
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-
-#ifdef ENABLE_SCUE_VALIDATION
-enum EVerifyType
-{
-    eVerify_Normal,
-    eVerify_ConstantBuffer,
-    eVerify_VertexBuffer,
-    eVerify_SRVTexture,
-    eVerify_SRVBuffer,
-    eVerify_UAVTexture,
-    eVerify_UAVBuffer,
-};
-#endif
-
-#if __HAS_SSE__
-// <fvec.h> includes <assert.h>, include it before platform.h
-#include <fvec.h>
-#define CONST_INT32_PS(N, V3, V2, V1, V0)                                 \
-    const _MM_ALIGN16 int _##N[] = { V0, V1, V2, V3 }; /*little endian!*/ \
-    const F32vec4 N = _mm_load_ps((float*)_##N);
-#endif
-
-// enable support for baked meshes and decals on PC
-#if RENDERERDEFS_H_TRAIT_SUPPORT_BAKED_MESHES_AND_DECALS
-//#define RENDER_MESH_TRIANGLE_HASH_MAP_SUPPORT // CryTek removed this #define in 3.8.  Not sure if we should strip out all related code or not, or if it may be a useful feature.
-#define TEXTURE_GET_SYSTEM_COPY_SUPPORT
-#endif
-
-#if defined(_CPU_SSE) && !defined(WIN64)
-#define __HAS_SSE__ 1
-#endif
-
-#define MAX_REND_RECURSION_LEVELS 2
-
-#if defined(OPENGL)
-#define CRY_OPENGL_ADAPT_CLIP_SPACE 1
-#define CRY_OPENGL_FLIP_Y 1
-#define CRY_OPENGL_MODIFY_PROJECTIONS !CRY_OPENGL_ADAPT_CLIP_SPACE
-#endif // defined(OPENGL)
-
-#ifdef STRIP_RENDER_THREAD
-#define m_nCurThreadFill 0
-#define m_nCurThreadProcess 0
-#endif
-
-#ifdef STRIP_RENDER_THREAD
-#define ASSERT_IS_RENDER_THREAD(rt)
-#define ASSERT_IS_MAIN_THREAD(rt)
-#else
-#define ASSERT_IS_RENDER_THREAD(rt) assert((rt)->IsRenderThread());
-#define ASSERT_IS_MAIN_THREAD(rt) assert((rt)->IsMainThread());
-#define ASSERT_IS_MAIN_OR_RENDER_THREAD(rt) assert((rt)->IsMainThread() || (rt)->IsRenderThread());
-#endif
-
-//#define ASSERT_IN_SHADER( expr ) assert( expr );
-#define ASSERT_IN_SHADER(expr)
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-
-// windows desktop API available for usage
-#if defined(WIN32) || defined(WIN64)
-#define WINDOWS_DESKTOP_API
-#endif
-
-#if (defined(WIN32) || defined(WIN64)) && !defined(OPENGL)
-#define LEGACY_D3D9_INCLUDE
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-
-#if !defined(NULL_RENDERER)
-
-// all D3D10 blob related functions and struct will be deprecated in next DirectX APIs
-// and replaced with regular D3DBlob counterparts
-#define D3D10CreateBlob                                      D3DCreateBlob
-
-// Direct3D11 includes
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_9
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(OPENGL)
-#include "CryLibrary.h"
-//  enable metal for ios device only. Emulator is not supported for now.
-#if TARGET_OS_IPHONE || TARGET_OS_TV
-#ifndef __IPHONE_9_0
-#define __IPHONE_9_0    90000
-#endif  //  __IPHONE_9_0
-#endif
-
-#if defined(CRY_USE_METAL)
-#include <RenderDll/XRenderD3D9/DXMETAL/CryDXMETAL.hpp>
-#else
-#include "XRenderD3D9/DXGL/CryDXGL.hpp"
-#endif
-#elif defined(CRY_USE_DX12)
-#include "CryLibrary.h"
-typedef uintptr_t SOCKET;
-#else
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_4
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#elif defined(WIN32) || defined(WIN64)
-#include "d3d11.h"
-#endif
-
-#if defined(LEGACY_D3D9_INCLUDE)
-#include "d3d9.h"
-#endif
-
-#endif
-#else //defined(NULL_RENDERER)
-#if defined(WIN32)
-#include "windows.h"
-#endif
-#if (defined(LINUX) || defined(APPLE)) && !defined(DXGI_FORMAT_DEFINED)
-#include <AzDXGIFormat.h>
-#endif
-#endif
-
-#ifdef _DID_SKIP_WINSOCK_
-#   undef _WINSOCKAPI_
-#   undef _DID_SKIP_WINSOCK_
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_5
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-
-#if !defined(_RELEASE)
-#define ENABLE_TEXTURE_STREAM_LISTENER
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-/* BUFFER ACCESS
-* Confetti Note -- David:
-* Buffer access related defines have been moved down as some preproc. if-branches rely on CRY_USE_METAL.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// BUFFER_ENABLE_DIRECT_ACCESS
-// stores pointers to actual backing storage of vertex buffers. Can only be used on architectures
-// that have a unified memory architecture and further guarantee that buffer storage does not change
-// on repeated accesses.
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_10
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(CRY_USE_DX12) || defined(CRY_USE_METAL)
-# define BUFFER_ENABLE_DIRECT_ACCESS 1
-#endif
-
-// BUFFER_USE_STAGED_UPDATES
-// On platforms that support staging buffers, special buffers are allocated that act as a staging area
-// for updating buffer contents on the fly.
-
-// when staged updates are disabled CPU will have direct access to the pool's buffers' content
-//  and update data directly. This cuts memory consumption and reduces the number of copies.
-//  GPU won't be used to update buffer content but it will be used to perform defragmentation.
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_11
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-# undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(CRY_USE_METAL)
-# define BUFFER_USE_STAGED_UPDATES 0
-#else
-# define BUFFER_USE_STAGED_UPDATES 1
-#endif
-
-// BUFFER_SUPPORT_TRANSIENT_POOLS
-// On d3d11 we want to separate the fire-and-forget allocations from the longer lived dynamic ones
-#if !defined(NULL_RENDERER) && ((!defined(CONSOLE) && !defined(CRY_USE_DX12)) || defined(CRY_USE_METAL))
-# define BUFFER_SUPPORT_TRANSIENT_POOLS 1
-#else
-# define BUFFER_SUPPORT_TRANSIENT_POOLS 0
-#endif
-
-#ifndef BUFFER_ENABLE_DIRECT_ACCESS
-# define BUFFER_ENABLE_DIRECT_ACCESS 0
-#endif
-
-// CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-// Enable if we have direct access to video memory and the device manager
-// should manage constant buffers
-#if BUFFER_ENABLE_DIRECT_ACCESS == 1
-#   if RENDERERDEFS_H_TRAIT_CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS || defined (CRY_USE_DX12)
-#       define CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS 1
-#   else
-#       define CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS 0
-#   endif
-#else
-#   define CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS 0
-#endif
-
-#if BUFFER_ENABLE_DIRECT_ACCESS && (defined(WIN32) || defined(WIN64)) && !defined(CRY_USE_DX12)
-# error BUFFER_ENABLE_DIRECT_ACCESS is not supported on windows platforms
-#endif
-
-#if defined(WIN32)
-# define FEATURE_SILHOUETTE_POM
-#elif defined(WIN64)
-# define FEATURE_SILHOUETTE_POM
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_12
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#elif defined(LINUX)
-# define FEATURE_SILHOUETTE_POM
-#elif defined(APPLE)
-# define FEATURE_SILHOUETTE_POM
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_13
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-
-#if !defined(_RELEASE) && !defined(NULL_RENDERER) && RENDERERDEFS_H_TRAIT_SUPPORT_D3D_DEBUG_RUNTIME && !defined(OPENGL)
-#   define SUPPORT_D3D_DEBUG_RUNTIME
-#endif
-
-#if defined(NULL_RENDERER)
-#   define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_14
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#   undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-#   define SUPPORT_DEVICE_INFO
-#   if defined(WIN32) || defined(WIN64)
-#       define SUPPORT_DEVICE_INFO_MSG_PROCESSING
-#       define SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES
-#   endif
-#endif
-
-#include <I3DEngine.h>
-
-#if !defined(NULL_RENDERER)
-#   if defined(CRY_USE_DX12)
-#       include "XRenderD3D9/DX12/CryDX12.hpp"
-#   elif defined(DEVICE_SUPPORTS_D3D11_1)
-#       if defined(AZ_RESTRICTED_PLATFORM)
-#           define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_15
-#           include AZ_RESTRICTED_FILE(RendererDefs_h)
-#       endif
-#       if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#           undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#       else
-            typedef IDXGIFactory1           DXGIFactory;
-            typedef IDXGIDevice1            DXGIDevice;
-            typedef IDXGIAdapter1           DXGIAdapter;
-            typedef IDXGIOutput             DXGIOutput;
-            typedef IDXGISwapChain          DXGISwapChain;
-            typedef ID3D11DeviceContextX    D3DDeviceContext;
-            typedef ID3D11DeviceX           D3DDevice;
-#       endif
-#   else
-        typedef IDXGIFactory1           DXGIFactory;
-#       if !defined(ANDROID) && !defined(APPLE) && !defined(LINUX) && !defined(SKIP_TYPEDEF_OF_IDXGIDEVICE1)
-            typedef IDXGIDevice1        DXGIDevice;
-#       endif
-        typedef IDXGIAdapter1           DXGIAdapter;
-        typedef IDXGIOutput             DXGIOutput;
-        typedef IDXGISwapChain          DXGISwapChain;
-        typedef ID3D11DeviceContext     D3DDeviceContext;
-        typedef ID3D11Device            D3DDevice;
-#   endif
-
-typedef ID3D11InputLayout       D3DVertexDeclaration;
-typedef ID3D11VertexShader      D3DVertexShader;
-typedef ID3D11PixelShader       D3DPixelShader;
-typedef ID3D11Resource          D3DResource;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_16
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-typedef ID3D11Resource          D3DBaseTexture;
-#endif
-
-typedef ID3D11Texture2D         D3DTexture;
-typedef ID3D11Texture3D         D3DVolumeTexture;
-typedef ID3D11Texture2D         D3DCubeTexture;
-typedef ID3D11Buffer            D3DBuffer;
-typedef ID3D11ShaderResourceView    D3DShaderResourceView;
-typedef ID3D11UnorderedAccessView   D3DUnorderedAccessView;
-typedef ID3D11RenderTargetView  D3DSurface;
-typedef ID3D11DepthStencilView  D3DDepthSurface;
-typedef ID3D11View              D3DBaseView;
-typedef ID3D11Query             D3DQuery;
-typedef D3D11_VIEWPORT          D3DViewPort;
-typedef D3D11_RECT              D3DRectangle;
-typedef DXGI_FORMAT             D3DFormat;
-typedef D3D11_PRIMITIVE_TOPOLOGY    D3DPrimitiveType;
-typedef ID3D10Blob              D3DBlob;
-typedef ID3D11SamplerState      D3DSamplerState;
-
-#if !defined(USE_D3DX)
-
-// this should be moved into seperate D3DX defintion file which should still be used
-// for console builds, until everything in the engine has been cleaned up which still
-// references this
-
-#if defined(APPLE)
-//interface is also a objective c keyword
-typedef struct ID3DXConstTable       ID3DXConstTable;
-typedef struct ID3DXConstTable*  LPD3DXCONSTANTTABLE;
-#else
-typedef interface ID3DXConstTable       ID3DXConstTable;
-typedef interface ID3DXConstTable*  LPD3DXCONSTANTTABLE;
-#endif
-
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_19
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-
-#if RENDERERDEFS_H_TRAIT_DEFINE_D3DPOOL || defined(CRY_USE_DX12)
-// D3DPOOL define still used as function parameters, so defined to backwards compatible with D3D9
-typedef enum _D3DPOOL
-{
-    D3DPOOL_DEFAULT = 0,
-    D3DPOOL_MANAGED = 1,
-    D3DPOOL_SYSTEMMEM = 2,
-    D3DPOOL_SCRATCH = 3,
-    D3DPOOL_FORCE_DWORD = 0x7fffffff
-} D3DPOOL;
-#endif
-
-#endif
-
-#ifndef MAKEFOURCC
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)                                                \
-    ((unsigned int)(unsigned char)(ch0) | ((unsigned int)(unsigned char)(ch1) << 8) | \
-     ((unsigned int)(unsigned char)(ch2) << 16) | ((unsigned int)(unsigned char)(ch3) << 24))
-#endif // defined(MAKEFOURCC)
-
-#endif // !defined(WIN32) && !defined(WIN64)
-
-const int32 g_nD3D10MaxSupportedSubres = (6 * 15);
-//////////////////////////////////////////////////////////////////////////
-#else
-typedef void D3DTexture;
-typedef void D3DSurface;
-typedef void D3DShaderResourceView;
-typedef void D3DUnorderedAccessView;
-typedef void D3DDepthSurface;
-typedef void D3DSamplerState;
-typedef int D3DFormat;
-typedef void D3DBuffer;
-#endif // NULL_RENDERER
-//////////////////////////////////////////////////////////////////////////
-
-#define USAGE_WRITEONLY 8
-
-//////////////////////////////////////////////////////////////////////////
-// Linux specific defines for Renderer.
-//////////////////////////////////////////////////////////////////////////
-
-#if defined(_AMD64_) && !defined(LINUX)
-#include <io.h>
-#endif
-
-#define SIZEOF_ARRAY(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-#ifdef DEBUGALLOC
-
-#include <crtdbg.h>
-#define DEBUG_CLIENTBLOCK new(_NORMAL_BLOCK, __FILE__, __LINE__)
-#define new DEBUG_CLIENTBLOCK
-
-// memman
-#define   calloc(s, t)       _calloc_dbg(s, t, _NORMAL_BLOCK, __FILE__, __LINE__)
-#define   malloc(s)         _malloc_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
-#define   realloc(p, s)     _realloc_dbg(p, s, _NORMAL_BLOCK, __FILE__, __LINE__)
-
-#endif
-
-#include <CryName.h>
-#include <RenderDll/Common/CryNameR.h>
-
-#define MAX_TMU 32
-#define MAX_STREAMS 16
-
-//! Include main interfaces.
-#include <IProcess.h>
-#include <ITimer.h>
-#include <ISystem.h>
-#include <ILog.h>
-#include <IConsole.h>
-#include <IRenderer.h>
-#include <IStreamEngine.h>
-#include <CrySizer.h>
-#include <smartptr.h>
-#include <CryArray.h>
-#include <PoolAllocator.h>
-
-#include <CryArray.h>
-
-enum eRenderPrimitiveType : int8
-{
-#if defined(NULL_RENDERER)
-    eptUnknown = -1,
-    eptTriangleList,
-    eptTriangleStrip,
-    eptLineList,
-    eptLineStrip,
-    eptPointList,
-#else
-    eptUnknown = -1,
-    eptTriangleList = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST,
-    eptTriangleStrip = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-    eptLineList = D3D11_PRIMITIVE_TOPOLOGY_LINELIST,
-    eptLineStrip = D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP,
-    eptPointList = D3D11_PRIMITIVE_TOPOLOGY_POINTLIST,
-    ept1ControlPointPatchList = D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST,
-    ept2ControlPointPatchList = D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST,
-    ept3ControlPointPatchList = D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST,
-    ept4ControlPointPatchList = D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST,
-#endif
-
-    // non-real primitives, used for logical batching
-    eptHWSkinGroups = 0x3f
-};
-
-inline eRenderPrimitiveType GetInternalPrimitiveType(PublicRenderPrimitiveType t)
-{
-    switch (t)
-    {
-    case prtTriangleList:
-    default:
-        return eptTriangleList;
-    case prtTriangleStrip:
-        return eptTriangleStrip;
-    case prtLineList:
-        return eptLineList;
-    case prtLineStrip:
-        return eptLineStrip;
-    }
-}
-
-#if !defined(NULL_RENDERER)
-#   if defined(WIN32)
-#       define SUPPORT_FLEXIBLE_INDEXBUFFER // supports 16 as well as 32 bit indices AND index buffer bind offset
-#   elif defined(WIN64)
-#       define SUPPORT_FLEXIBLE_INDEXBUFFER // supports 16 as well as 32 bit indices AND index buffer bind offset
-#   elif defined(AZ_RESTRICTED_PLATFORM)
-#       define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_17
-#       include AZ_RESTRICTED_FILE(RendererDefs_h)
-#   elif defined(LINUX)
-#       define SUPPORT_FLEXIBLE_INDEXBUFFER // supports 16 as well as 32 bit indices AND index buffer bind offset
-#   elif defined(APPLE)
-#       define SUPPORT_FLEXIBLE_INDEXBUFFER // supports 16 as well as 32 bit indices AND index buffer bind offset
-#   endif
-#endif
-
-enum RenderIndexType : int
-{
-#if defined(SUPPORT_FLEXIBLE_INDEXBUFFER)
-    Index16 = DXGI_FORMAT_R16_UINT,
-    Index32 = DXGI_FORMAT_R32_UINT
-#else
-    Index16,
-    Index32
-#endif
-};
-
-// Interfaces from the Game
-extern ILog* iLog;
-extern IConsole* iConsole;
-extern ITimer* iTimer;
-extern ISystem* iSystem;
-
-
-
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE)
-#   define VOLUMETRIC_FOG_SHADOWS
-#endif
-
-#if ((defined(AZ_PLATFORM_WINDOWS) && !defined(OPENGL)) || defined(AZ_PLATFORM_MAC)) && !defined(CRY_USE_DX12) && !defined(RELEASE)
-#   define ENABLE_NULL_D3D11DEVICE
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_18
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-
-
-// Enable to eliminate DevTextureDataSize calls during stream updates - costs 4 bytes per mip header
-#define TEXSTRM_STORE_DEVSIZES
-
-#ifndef TEXSTRM_BYTECENTRIC_MEMORY
-#define TEXSTRM_TEXTURECENTRIC_MEMORY
-#endif
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER) && !defined(OPENGL) && !defined(CRY_INTEGRATE_DX12)
-#define TEXSTRM_DEFERRED_UPLOAD
-#endif
-
-#if !defined(CONSOLE)
-#define TEXSTRM_COMMIT_COOLDOWN
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION RENDERERDEFS_H_SECTION_20
-    #include AZ_RESTRICTED_FILE(RendererDefs_h)
-#endif
-
-#if defined(_RELEASE)
-#   define EXCLUDE_RARELY_USED_R_STATS
-#endif
-
-#include <RenderDll/Common/DevBuffer.h>
-#include <RenderDll/XRenderD3D9/DeviceManager/DeviceManager.h>
diff --git a/Code/CryEngine/RenderDll/Common/Renderer_Jobs.cpp b/Code/CryEngine/RenderDll/Common/Renderer_Jobs.cpp
deleted file mode 100644
index 6d692087f4..0000000000
--- a/Code/CryEngine/RenderDll/Common/Renderer_Jobs.cpp
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Abstract renderer API
-
-
-#include "RenderDll_precompiled.h"
-
-#include "Shadow_Renderer.h"
-#include "IStatObj.h"
-#include "I3DEngine.h"
-#include "IMovieSystem.h"
-#include "IIndexedMesh.h"
-#include "BitFiddling.h"                                                            // IntegerLog2()
-#include "ImageExtensionHelper.h"                                           // CImageExtensionHelper
-#include "IResourceCompilerHelper.h"
-
-#include "Textures/Image/CImage.h"
-#include "Textures/TextureManager.h"
-#include "PostProcess/PostEffects.h"
-#include "RendElements/CRELensOptics.h"
-
-#include "RendElements/OpticsFactory.h"
-
-#include "XRenderD3D9/GraphicsPipeline/FurBendData.h"
-#include "XRenderD3D9/GraphicsPipeline/FurPasses.h"
-#include "RenderView.h"
-
-///////////////////////////////////////////
-// moved from "../CryCommon/branchmask.h"
-// helper functions for branch elimination
-//
-// msb/lsb - most/less significant byte
-//
-// mask - 0xFFFFFFFF
-// nz   - not zero
-// zr   - is zero
-
-ILINE const uint32 nz2msb(const uint32 x)
-{
-    return -(int32)x | x;
-}
-
-ILINE const uint32 msb2mask(const uint32 x)
-{
-    return (int32)(x) >> 31;
-}
-
-ILINE const uint32 nz2one(const uint32 x)
-{
-    return nz2msb(x) >> 31; // int((bool)x);
-}
-
-ILINE const uint32 nz2mask(const uint32 x)
-{
-    return (int32)msb2mask(nz2msb(x)); // -(int32)(bool)x;
-}
-
-ILINE const uint32 iselmask(const uint32 mask, uint32 x, const uint32 y)// select integer with mask (0xFFFFFFFF or 0x0 only!!!)
-{
-    return (x & mask) | (y & ~mask);
-}
-
-
-ILINE const uint32 mask_nz_nz(const uint32 x, const uint32 y)// mask if( x != 0 && y != 0)
-{
-    return msb2mask(nz2msb(x) & nz2msb(y));
-}
-
-ILINE const uint32 mask_nz_zr(const uint32 x, const uint32 y)// mask if( x != 0 && y == 0)
-{
-    return msb2mask(nz2msb(x) & ~nz2msb(y));
-}
-
-
-ILINE const uint32 mask_zr_zr(const uint32 x, const uint32 y)// mask if( x == 0 && y == 0)
-{
-    return ~nz2mask(x | y);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareByShadowFrustumID
-{
-    bool operator()(const SRendItem& rA, const SRendItem& rB) const
-    {
-        return rA.rendItemSorter.ShadowFrustumID() < rB.rendItemSorter.ShadowFrustumID();
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-struct SCompareByLightIds
-{
-    bool operator()(const SRenderPipeline::SShadowFrustumToRender& rA, const SRenderPipeline::SShadowFrustumToRender& rB) const
-    {
-        if (rA.nLightID != rB.nLightID)
-        {
-            return rA.nLightID < rB.nLightID;
-        }
-        else
-        {
-            if (rA.pFrustum->m_eFrustumType != rB.pFrustum->m_eFrustumType)
-            {
-                return int(rA.pFrustum->m_eFrustumType) < int(rB.pFrustum->m_eFrustumType);
-            }
-            else
-            {
-                return rA.pFrustum->nShadowMapLod < rB.pFrustum->nShadowMapLod;
-            }
-        }
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-static inline void HandleForceFlags(int& nList, int& nAW, uint32& nBatchFlags, const uint32 nShaderFlags, const uint32 nShaderFlags2, CRenderObject* obj)
-{
-    // Force rendering in last place
-    // branchless
-
-    const int32 sort1 = nz2mask(nShaderFlags2 & EF2_FORCE_DRAWLAST);
-    const int32 sort2 = nz2one(nShaderFlags2 & EF2_FORCE_DRAWFIRST);
-    float fSort = static_cast<float>(100000 * (sort1 + sort2));
-
-    if (nShaderFlags2 & EF2_FORCE_ZPASS && !((nShaderFlags & EF_REFRACTIVE) && (nBatchFlags & FB_MULTILAYERS)))
-    {
-        nBatchFlags |= FB_Z;
-    }
-
-    {
-        // below branchlessw version of:
-        //if      (nShaderFlags2 & EF2_FORCE_TRANSPASS  ) nList = EFSLIST_TRANSP;
-        //else if (nShaderFlags2 & EF2_FORCE_GENERALPASS) nList = EFSLIST_GENERAL;
-        //else if (nShaderFlags2 & EF2_FORCE_WATERPASS  ) nList = EFSLIST_WATER;
-
-        uint32 mb1 = nShaderFlags2 & EF2_FORCE_TRANSPASS;
-        uint32 mb2 = nShaderFlags2 & EF2_FORCE_GENERALPASS;
-        uint32 mb3 = nShaderFlags2 & EF2_FORCE_WATERPASS;
-
-        mb1 = nz2msb(mb1);
-        mb2 = nz2msb(mb2) & ~mb1;
-        mb3 = nz2msb(mb3) & ~(mb1 ^ mb2);
-
-        mb1 = msb2mask(mb1);
-        mb2 = msb2mask(mb2);
-        mb3 = msb2mask(mb3);
-
-        const uint32 mask = mb1 | mb2 | mb3;
-        mb1 &= EFSLIST_TRANSP;
-        mb2 &= EFSLIST_GENERAL;
-        mb3 &= EFSLIST_WATER;
-
-        nList = iselmask(mask, mb1 | mb2 | mb3, nList);
-    }
-
-
-    // if (nShaderFlags2 & EF2_AFTERHDRPOSTPROCESS) // now it's branchless
-    {
-        uint32 predicate = nz2mask(nShaderFlags2 & EF2_AFTERHDRPOSTPROCESS);
-
-        const uint32 mask = nz2mask(nShaderFlags2 & EF2_FORCE_DRAWLAST);
-        nList = iselmask(predicate, iselmask(mask, EFSLIST_AFTER_POSTPROCESS, EFSLIST_AFTER_HDRPOSTPROCESS), nList);
-    }
-
-    if (nShaderFlags2 & EF2_AFTERPOSTPROCESS)
-    {
-        nList = EFSLIST_AFTER_POSTPROCESS;
-    }
-
-    //if (nShaderFlags2 & EF2_FORCE_DRAWAFTERWATER) nAW = 1;   -> branchless
-    nAW |= nz2one(nShaderFlags2 & EF2_FORCE_DRAWAFTERWATER);
-
-    obj->m_fSort += fSort;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#if !defined(NULL_RENDERER)
-static void HandleOldRTMask(CRenderObject* obj)
-{
-    const uint64 objFlags = obj->m_ObjFlags;
-    obj->m_nRTMask = 0;
-    if (objFlags & (FOB_NEAREST | FOB_DECAL_TEXGEN_2D | FOB_DISSOLVE | FOB_GLOBAL_ILLUMINATION | FOB_SOFT_PARTICLE))
-    {
-        if (objFlags & FOB_DECAL_TEXGEN_2D)
-        {
-            obj->m_nRTMask |= g_HWSR_MaskBit[HWSR_DECAL_TEXGEN_2D];
-        }
-
-        if (objFlags & FOB_NEAREST)
-        {
-            obj->m_nRTMask |= g_HWSR_MaskBit[HWSR_NEAREST];
-        }
-
-        if (objFlags & FOB_DISSOLVE)
-        {
-            obj->m_nRTMask |= g_HWSR_MaskBit[HWSR_DISSOLVE];
-        }
-
-        if (objFlags & FOB_GLOBAL_ILLUMINATION)
-        {
-            obj->m_nRTMask |= g_HWSR_MaskBit[HWSR_GLOBAL_ILLUMINATION];
-        }
-
-        if (gRenDev->CV_r_ParticlesSoftIsec && (objFlags & FOB_SOFT_PARTICLE))
-        {
-            obj->m_nRTMask |= g_HWSR_MaskBit[HWSR_SOFT_PARTICLE];
-        }
-    }
-
-    obj->m_ObjFlags |= FOB_UPDATED_RTMASK;
-}
-#endif
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_AddEf_NotVirtual([[maybe_unused]] IRenderElement* re, [[maybe_unused]] SShaderItem& SH, [[maybe_unused]] CRenderObject* obj, [[maybe_unused]] const SRenderingPassInfo& passInfo, [[maybe_unused]] int nList, [[maybe_unused]] int nAW, [[maybe_unused]] const SRendItemSorter& rendItemSorter)
-{
-#ifndef NULL_RENDERER
-    int nThreadID = passInfo.ThreadID();
-    assert(nList > 0 && nList < EFSLIST_NUM);
-
-    if (!re || !SH.m_pShader)
-    {
-        return;
-    }
-
-    // shader item is not set up yet
-    if (SH.m_nPreprocessFlags == -1)
-    {
-        return;
-    }
-
-    CShader* const __restrict pSH = (CShader*)SH.m_pShader;
-    const uint32 nShaderFlags = pSH->m_Flags;
-    if (nShaderFlags & EF_NODRAW)
-    {
-        return;
-    }
-    const uint32 nMaterialLayers = obj->m_nMaterialLayers;
-
-    CShaderResources* const __restrict pShaderResources = (CShaderResources*)SH.m_pShaderResources;
-    // Need to differentiate between something rendered with cloak layer material, and sorted with cloak.
-    // e.g. ironsight glows on gun should be sorted with cloak to not write depth - can be inconsistent with no depth from gun.
-
-
-    // store AABBs for all FOB_NEAREST objects for r_DrawNearest
-    // TODO (bethelz) TRENDRIL: Remove draw nearest shadow hackery.
-    IF (CV_r_DrawNearShadows && obj->m_ObjFlags & FOB_NEAREST, 0)
-    {
-        if (IRenderNode* pRenderNode = static_cast<IRenderNode*>(obj->m_pRenderNode))
-        {
-            size_t nID = ~0;
-            CustomShadowMapFrustumData* pCustomShadowFrustumData = m_RP.m_arrCustomShadowMapFrustumData[nThreadID].push_back_new(nID);
-            // The local bounds already contain rotated so just apply translation to that
-            pRenderNode->GetLocalBounds(pCustomShadowFrustumData->aabb);
-            pCustomShadowFrustumData->aabb.min += obj->GetTranslation();
-            pCustomShadowFrustumData->aabb.max += obj->GetTranslation();
-        }
-    }
-
-    if (passInfo.IsShadowPass())
-    {
-        if (pSH->m_HWTechniques.Num() && pSH->m_HWTechniques[0]->m_nTechnique[TTYPE_SHADOWGEN] >= 0)
-        {
-            passInfo.GetRenderView()->AddRenderItem(re, obj, SH, EFSLIST_SHADOW_GEN, SG_SORT_GROUP, FB_GENERAL, passInfo, rendItemSorter);
-        }
-        return;
-    }
-
-    // Discard 0 alpha blended geometry - this should be discarded earlier on 3dengine side preferably
-    if (fzero(obj->m_fAlpha))
-    {
-        return;
-    }
-    if (pShaderResources && pShaderResources->::CShaderResources::IsInvisible())
-    {
-        return;
-    }
-
-    if (!(obj->m_ObjFlags & FOB_UPDATED_RTMASK))
-    {
-        HandleOldRTMask(obj);
-    }
-
-    uint32 nBatchFlags = EF_BatchFlags(SH, obj, re, passInfo);
-
-    const uint32 nRenderlistsFlags = (FB_PREPROCESS | FB_TRANSPARENT);
-    if (nBatchFlags & nRenderlistsFlags)
-    {
-        if (nBatchFlags & FB_PREPROCESS)
-        {
-            EShaderType eSHType = pSH->GetShaderType();
-
-            // Prevent water usage on non-water specific meshes (it causes reflections updates). Todo: this should be checked in editor side and not allow such usage
-            if (eSHType != eST_Water || (eSHType == eST_Water && nList == EFSLIST_WATER))
-            {
-                passInfo.GetRenderView()->AddRenderItem(re, obj, SH, EFSLIST_PREPROCESS, 0, nBatchFlags, passInfo, rendItemSorter);
-            }
-        }
-
-        if ((nBatchFlags & FB_TRANSPARENT) && nList == EFSLIST_GENERAL)
-        {
-            // Refractive objects go into same list as transparent objects - partial resolves support
-            // arbitrary ordering between transparent and refractive correctly.
-            nList = EFSLIST_TRANSP;
-        }
-    }
-     
-    // FogVolume contribution for transparencies isn't needed when volumetric fog is turned on.
-    // TODO (bethelz) Not a great place for this.
-    if ((((nBatchFlags & FB_TRANSPARENT) || (pSH->GetFlags2() & EF2_HAIR)) && CRenderer::CV_r_VolumetricFog == 0)
-        || passInfo.IsRecursivePass() /* account for recursive scene traversal done in forward fashion*/)
-    {
-        // Check if we need high fog volume shading quality 
-        static ICVar* pCVarFogVolumeShadingQuality = gEnv->pConsole->GetCVar("e_FogVolumeShadingQuality");
-        bool fogVolumeShadingQuality = pShaderResources && (pShaderResources->GetResFlags() & MTL_FLAG_FOG_VOLUME_SHADING_QUALITY_HIGH) && (pCVarFogVolumeShadingQuality->GetIVal() > 0);
-
-
-        SRenderObjData* pOD = obj->GetObjData();
-        if (pOD && ( fogVolumeShadingQuality || (pOD->m_FogVolumeContribIdx[nThreadID] == (uint16) - 1) ) )
-        {
-            I3DEngine* pEng = gEnv->p3DEngine;
-  
-            SFogVolumeData fogVolData;
-            if (obj->m_pRenderNode)
-            {
-                // Pass the AABB of the object to in order to retrieve fog contribution.
-                pEng->TraceFogVolumes(obj->m_pRenderNode->GetBBox().GetCenter(), obj->m_pRenderNode->GetBBox(), fogVolData, passInfo, fogVolumeShadingQuality);
-            }
-            // TODO (bethelz) Decouple fog volume color from renderer. Just store in render obj data.
-            pOD->m_FogVolumeContribIdx[nThreadID] = CRenderer::PushFogVolumeContribution(fogVolData, passInfo);
-        }
-    }
-
-    nBatchFlags &= ~(FB_Z & (nList ^ EFSLIST_GENERAL));
-
-    nList = (nBatchFlags & FB_SKIN) ? EFSLIST_SKIN : nList;
-    nList = (nBatchFlags & FB_EYE_OVERLAY) ? EFSLIST_EYE_OVERLAY : nList;
-
-    if (pSH->GetShaderDrawType() == eSHDT_Fur)
-    {
-        nList = FurPasses::GetInstance().GetFurRenderList();
-        nBatchFlags |= FB_FUR | FB_Z;
-
-        // Opacity and emissive cause incorrect fur rendering, as transparency for shell passes
-        // is set up elsewhere. Override the material/objects settings for opacity and emissive.
-        nBatchFlags &= ~FB_TRANSPARENT;
-        pShaderResources->SetStrengthValue(EFTT_EMITTANCE, 0.0f);
-        pShaderResources->SetStrengthValue(EFTT_OPACITY, 1.0f);
-        obj->m_fAlpha = 1.0f;
-
-        FurBendData::Get().SetupObject(*obj, passInfo);
-    }
-
-    const uint32 nShaderFlags2 = pSH->m_Flags2;
-    const uint32 ObjDecalFlag = obj->m_ObjFlags & FOB_DECAL;
-
-    // make sure decals go into proper render list
-    if ((ObjDecalFlag || (nShaderFlags & EF_DECAL)))
-    {
-        nBatchFlags |= FB_Z;
-        nList = EFSLIST_DECAL;
-
-        if (ObjDecalFlag == 0 && pShaderResources)
-        {
-            obj->m_nSort = pShaderResources->m_SortPrio;
-        }
-    }
-
-    // Enable tessellation for water geometry
-    obj->m_ObjFlags |= (pSH->m_Flags2 & EF2_HW_TESSELLATION && pSH->m_eShaderType == eST_Water) ? FOB_ALLOW_TESSELLATION : 0;
-
-    const uint32 nForceFlags = (EF2_FORCE_DRAWLAST | EF2_FORCE_DRAWFIRST | EF2_FORCE_ZPASS | EF2_FORCE_TRANSPASS | EF2_FORCE_GENERALPASS | EF2_FORCE_DRAWAFTERWATER | EF2_FORCE_WATERPASS | EF2_AFTERHDRPOSTPROCESS | EF2_AFTERPOSTPROCESS);
-
-    if (nShaderFlags2 & nForceFlags)
-    {
-        HandleForceFlags(nList, nAW, nBatchFlags, nShaderFlags, nShaderFlags2, obj);
-    }
-
-    {
-        if (nShaderFlags & (EF_REFRACTIVE | EF_FORCEREFRACTIONUPDATE))
-        {
-            SRenderObjData* pOD = EF_GetObjData(obj, CRenderer::CV_r_RefractionPartialResolves == 2, passInfo.ThreadID());  // Creating objData for objs without one
-
-            if (obj->m_pRenderNode && pOD)
-            {
-                const int32 align16 = (16 - 1);
-                const int32 shift16 = 4;
-                if IsCVarConstAccess(constexpr) (bool(CRenderer::CV_r_RefractionPartialResolves))
-                {
-                    AABB aabb;
-                    IRenderNode* pRenderNode = static_cast<IRenderNode*>(obj->m_pRenderNode);
-                    pRenderNode->FillBBox(aabb);
-
-                    int iOut[4];
-
-                    passInfo.GetCamera().CalcScreenBounds(&iOut[0], &aabb, CRenderer::GetWidth(), CRenderer::GetHeight());
-                    pOD->m_screenBounds[0] = min(iOut[0] >> shift16, 255);
-                    pOD->m_screenBounds[1] = min(iOut[1] >> shift16, 255);
-                    pOD->m_screenBounds[2] = min((iOut[2] + align16) >> shift16, 255);
-                    pOD->m_screenBounds[3] = min((iOut[3] + align16) >> shift16, 255);
-
-#if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS
-                    if (CRenderer::CV_r_RefractionPartialResolvesDebug == eRPR_DEBUG_VIEW_3D_BOUNDS)
-                    {
-                        // Debug bounding box view for refraction partial resolves
-                        IRenderAuxGeom* pAuxRenderer = gEnv->pRenderer->GetIRenderAuxGeom();
-                        if (pAuxRenderer)
-                        {
-                            SAuxGeomRenderFlags oldRenderFlags = pAuxRenderer->GetRenderFlags();
-
-                            SAuxGeomRenderFlags newRenderFlags;
-                            newRenderFlags.SetDepthTestFlag(e_DepthTestOff);
-                            newRenderFlags.SetAlphaBlendMode(e_AlphaBlended);
-                            pAuxRenderer->SetRenderFlags(newRenderFlags);
-
-                            const bool bSolid = true;
-                            const ColorB solidColor(64, 64, 255, 64);
-                            pAuxRenderer->DrawAABB(aabb, bSolid, solidColor, eBBD_Faceted);
-
-                            const ColorB wireframeColor(255, 0, 0, 255);
-                            pAuxRenderer->DrawAABB(aabb, !bSolid, wireframeColor, eBBD_Faceted);
-
-                            // Set previous Aux render flags back again
-                            pAuxRenderer->SetRenderFlags(oldRenderFlags);
-                        }
-                    }
-#endif
-                }
-                else if (nShaderFlags & EF_FORCEREFRACTIONUPDATE)
-                {
-                    pOD->m_screenBounds[0] = 0;
-                    pOD->m_screenBounds[1] = 0;
-                    pOD->m_screenBounds[2] = min((CRenderer::GetWidth()) >> shift16, 255);
-                    pOD->m_screenBounds[3] = min((CRenderer::GetHeight()) >> shift16, 255);
-                }
-            }
-        }
-
-        // final step, for post 3d items, remove them from any other list than POST_3D_RENDER
-        // (have to do this here as the batch needed to go through the normal nList assign path first)
-        nBatchFlags = iselmask(nz2mask(nBatchFlags & FB_POST_3D_RENDER), FB_POST_3D_RENDER, nBatchFlags);
-
-        // No need to sort opaque passes by water/after water. Ensure always on same list for more coherent sorting
-        nAW |= nz2one((nList == EFSLIST_GENERAL) | (nList == EFSLIST_DECAL));
-        m_RP.m_pRenderViews[nThreadID]->AddRenderItem(re, obj, SH, nList, nAW, nBatchFlags, passInfo, rendItemSorter);
-    }
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_AddEf (IRenderElement* re, SShaderItem& pSH, CRenderObject* obj, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter)
-{
-    EF_AddEf_NotVirtual (re, pSH, obj, passInfo, nList, nAW, rendItemSorter);
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint16 CRenderer::PushFogVolumeContribution(const SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo)
-{
-    int nThreadID = passInfo.ThreadID();
-
-    const size_t maxElems((1 << (sizeof(uint16) * 8)) - 1);
-    size_t numElems(m_RP.m_fogVolumeContibutionsData[nThreadID].size());
-    assert(numElems < maxElems);
-    if (numElems >= maxElems)
-    {
-        return (uint16) - 1;
-    }
-
-    size_t nIndex = ~0;
-    m_RP.m_fogVolumeContibutionsData[nThreadID].push_back(fogVolData, nIndex);
-  
-    return static_cast<uint16>(nIndex);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::GetFogVolumeContribution(uint16 idx, SFogVolumeData& fogVolData ) const
-{
-    int nThreadID = m_RP.m_nProcessThreadID;
-    if (idx >= m_RP.m_fogVolumeContibutionsData[nThreadID].size())
-    {
-        fogVolData.fogColor= ColorF(0.0f, 0.0f, 0.0f, 1.0f);
-    }
-    else
-    {
-        fogVolData = m_RP.m_fogVolumeContibutionsData[nThreadID][idx];
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 CRenderer::EF_BatchFlags(SShaderItem& SH, CRenderObject* pObj, [[maybe_unused]] IRenderElement* renderElement, const SRenderingPassInfo& passInfo)
-{
-
-    uint32 nFlags = SH.m_nPreprocessFlags & FB_MASK;
-    SShaderTechnique* const __restrict pTech = SH.GetTechnique();
-    CShaderResources* const __restrict pR = (CShaderResources*)SH.m_pShaderResources;
-    CShader* const __restrict pS = (CShader*)SH.m_pShader;
-
-    float  fAlpha = pObj->m_fAlpha;
-    uint32 uTransparent = (bool)(fAlpha < 1.0f);
-    const uint64 ObjFlags = pObj->m_ObjFlags;
-
-    if (!passInfo.IsRecursivePass() && pTech)
-    {
-        CryPrefetch(pTech->m_nTechnique);
-        CryPrefetch(pR);
-
-        //if (pObj->m_fAlpha < 1.0f) nFlags |= FB_TRANSPARENT;
-        nFlags |= FB_TRANSPARENT * uTransparent;
-
-        if (!((nFlags & FB_Z) && (!(pObj->m_RState & OS_NODEPTH_WRITE) || (pS->m_Flags2 & EF2_FORCE_ZPASS))))
-        {
-            nFlags &= ~FB_Z;
-        }
-
-        if ((ObjFlags & FOB_DISSOLVE) || (ObjFlags & FOB_DECAL) || CRenderer::CV_r_usezpass != 2 || pObj->m_fDistance > CRenderer::CV_r_ZPrepassMaxDist)
-        {
-            nFlags &= ~FB_ZPREPASS;
-        }
-
-        if (ObjFlags & FOB_RENDER_TRANS_AFTER_DOF)
-        {
-            nFlags |= FB_TRANSPARENT_AFTER_DOF;
-        }
-
-        pObj->m_ObjFlags |= (nFlags & FB_ZPREPASS) ? FOB_ZPREPASS : 0;
-
-        if (pTech->m_nTechnique[TTYPE_DEBUG] > 0 && 0 != (ObjFlags & FOB_SELECTED))
-        {
-            nFlags |= FB_DEBUG;
-        }
-
-        const uint32 nMaterialLayers = pObj->m_nMaterialLayers;
-        const uint32 DecalFlags = pS->m_Flags & EF_DECAL;
-
-        if (passInfo.IsShadowPass())
-        {
-            nFlags &= ~FB_PREPROCESS;
-        }
-
-        nFlags &= ~(FB_PREPROCESS & uTransparent);
-
-        AZ_PUSH_DISABLE_WARNING(, "-Wconstant-logical-operand")
-        if ((nMaterialLayers & ~uTransparent) && CV_r_usemateriallayers)
-        AZ_POP_DISABLE_WARNING
-        {
-            const uint32 nResourcesNoDrawFlags = static_cast<CShaderResources*>(pR)->CShaderResources::GetMtlLayerNoDrawFlags();
-
-            // if ((nMaterialLayers & MTL_LAYER_BLEND_DYNAMICFROZEN) && !(nResourcesNoDrawFlags & MTL_LAYER_FROZEN))
-            uint32 uMask = mask_nz_zr(nMaterialLayers & MTL_LAYER_BLEND_DYNAMICFROZEN, nResourcesNoDrawFlags & MTL_LAYER_FROZEN);
-            nFlags |= FB_MULTILAYERS & uMask;
-        }
-
-        if (pTech->m_nTechnique[TTYPE_MOTIONBLURPASS] > 0 && CV_r_MotionVectors && CV_r_MotionVectorsTransparency)
-        {
-            // Combine material and runtime opacity.
-            const float opacity = pR->GetStrengthValue(EFTT_OPACITY) * fAlpha;
-            const bool isNotADecal = ((ObjFlags & FOB_DECAL) | DecalFlags) == 0;
-            const bool isAboveAlphaThreshold = opacity >= CV_r_MotionVectorsTransparencyAlphaThreshold;
-
-            // We do not want to generate motion for decals, since they adhere to surfaces.
-            if (isNotADecal && isAboveAlphaThreshold)
-            {
-                nFlags |= FB_MOTIONBLUR;
-            }
-        }
-
-        SRenderObjData* pOD = pObj->GetObjData();
-        if (pTech->m_nTechnique[TTYPE_CUSTOMRENDERPASS] > 0)
-        {
-            const uint32 customvisions = CRenderer::CV_r_customvisions;
-            const uint32 nHUDSilhouettesParams = (pOD && pOD->m_nHUDSilhouetteParams);
-            if (customvisions && nHUDSilhouettesParams)
-            {
-                nFlags |= FB_CUSTOM_RENDER;
-            }
-        }
-    }
-    else
-    if (passInfo.IsRecursivePass() && pTech && m_RP.m_TI[passInfo.ThreadID()].m_PersFlags & RBPF_MIRRORCAMERA)
-    {
-        nFlags &= (FB_TRANSPARENT | FB_GENERAL);
-        nFlags |= FB_TRANSPARENT * uTransparent;                                        // if (pObj->m_fAlpha < 1.0f)                   nFlags |= FB_TRANSPARENT;
-    }
-
-    {
-        //if ( (objFlags & FOB_ONLY_Z_PASS) || CV_r_ZPassOnly) && !(nFlags & (FB_TRANSPARENT))) - put it to the mask
-        const uint32 mask =  mask_nz_zr((uint32)CV_r_ZPassOnly, nFlags & (FB_TRANSPARENT));
-
-        nFlags = iselmask(mask, FB_Z, nFlags);
-    }
-
-    int nShaderFlags = (SH.m_pShader ? SH.m_pShader->GetFlags() : 0);
-    if ((CRenderer::CV_r_RefractionPartialResolves && nShaderFlags & EF_REFRACTIVE) ||   (nShaderFlags & EF_FORCEREFRACTIONUPDATE))
-    {
-        pObj->m_ObjFlags |= FOB_REQUIRES_RESOLVE;
-    }
-
-    return nFlags;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-SRenderObjData* CRenderer::EF_GetObjData(CRenderObject* pObj, [[maybe_unused]] bool bCreate, [[maybe_unused]] int nThreadID)
-{
-    return pObj->GetObjData();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-SRenderObjData* CRenderer::FX_GetObjData(CRenderObject* pObj, [[maybe_unused]] int nThreadID)
-{
-    return pObj->GetObjData();
-}
-///////////////////////////////////////////////////////////////////////////////
-CRenderObject* CRenderer::EF_GetObject_Temp(int nThreadID)
-{
-    CThreadSafeWorkerContainer <CRenderObject*>& Objs = m_RP.m_TempObjects[nThreadID];
-
-    size_t nId = ~0;
-    CRenderObject** ppObj = Objs.push_back_new(nId);
-    CRenderObject* pObj = NULL;
-
-    if (*ppObj == NULL)
-    {
-        *ppObj = aznew CRenderObject();
-    }
-    pObj = *ppObj;
-
-
-    pObj->AssignId(nId);
-    pObj->Init();
-    return pObj;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-CRenderObject* CRenderer::EF_DuplicateRO(CRenderObject* pObj, const SRenderingPassInfo& passInfo)
-{
-    CRenderObject* pObjNew = CRenderer::EF_GetObject_Temp(passInfo.ThreadID());
-    pObjNew->CloneObject(pObj);
-    return pObjNew;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::FinalizeRendItems_ReorderShadowRendItems([[maybe_unused]] int nThreadID)
-{
-#ifndef NULL_RENDERER
-    ////////////////////////////////////////////////
-    // shadow rend items
-    auto& rShadowRI = CRenderView::GetRenderViewForThread(nThreadID)->GetRenderItems(SG_SORT_GROUP, EFSLIST_SHADOW_GEN);
-    size_t nShadowRISize = rShadowRI.size();
-    if (nShadowRISize)
-    {
-        SRendItem* pShadowRI = &rShadowRI[0];
-        std::sort(pShadowRI, pShadowRI + nShadowRISize, SCompareByShadowFrustumID());
-
-        int nCurrentShadowRecur = 0;
-        for (size_t i  = 0; i < nShadowRISize; ++i)
-        {
-            if (rShadowRI[i].rendItemSorter.ShadowFrustumID() != nCurrentShadowRecur)
-            {
-                assert(nCurrentShadowRecur < MAX_SHADOWMAP_FRUSTUMS);
-                SRendItem::m_ShadowsEndRI[nThreadID][nCurrentShadowRecur] = i;
-                SRendItem::m_ShadowsStartRI[nThreadID][rShadowRI[i].rendItemSorter.ShadowFrustumID()] = i;
-
-                nCurrentShadowRecur = rShadowRI[i].rendItemSorter.ShadowFrustumID();
-            }
-        }
-
-        assert(nCurrentShadowRecur < MAX_SHADOWMAP_FRUSTUMS);
-        SRendItem::m_ShadowsEndRI[nThreadID][nCurrentShadowRecur] = nShadowRISize;
-    }
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::FinalizeRendItems_FindShadowFrustums(int nThreadID)
-{
-    ////////////////////////////////////////////////
-    // shadow frustums
-    for (int nRecursionLevel = 0; nRecursionLevel < MAX_REND_RECURSION_LEVELS; ++nRecursionLevel)
-    {
-        m_RP.m_SMFrustums[nThreadID][nRecursionLevel].SetUse(0);
-        m_RP.m_SMCustomFrustumIDs[nThreadID][nRecursionLevel].SetUse(0);
-    }
-
-    if (m_RP.SShadowFrustumToRenderList[nThreadID].size())
-    {
-        std::sort(m_RP.SShadowFrustumToRenderList[nThreadID].begin(), m_RP.SShadowFrustumToRenderList[nThreadID].end(), SCompareByLightIds());
-
-        int nCurrentLightId = m_RP.SShadowFrustumToRenderList[nThreadID][0].nLightID;
-        int nCurRecusiveLevel = m_RP.SShadowFrustumToRenderList[nThreadID][0].nRecursiveLevel;
-        SRendItem::m_StartFrust[nThreadID][nCurrentLightId] = m_RP.m_SMFrustums[nThreadID][nCurRecusiveLevel].Num();
-        for (int i = 0; i < (int)m_RP.SShadowFrustumToRenderList[nThreadID].size(); ++i)
-        {
-            SRenderPipeline::SShadowFrustumToRender& rToRender = m_RP.SShadowFrustumToRenderList[nThreadID][i];
-            if (rToRender.pFrustum->nShadowGenMask != 0)
-            {
-                ShadowMapFrustum* pCopyFrustumTo = m_RP.m_SMFrustums[nThreadID][rToRender.nRecursiveLevel].AddIndex(1);
-                memcpy(pCopyFrustumTo, rToRender.pFrustum, sizeof(ShadowMapFrustum));
-
-                const int nFrustumIndex = m_RP.m_SMFrustums[nThreadID][nCurRecusiveLevel].Num() - 1;
-                // put shadow frustum into right ligh id group
-                if (rToRender.pFrustum->m_eFrustumType != ShadowMapFrustum::e_PerObject && rToRender.pFrustum->m_eFrustumType != ShadowMapFrustum::e_Nearest)
-                {
-                    if (rToRender.nLightID != nCurrentLightId)
-                    {
-                        SRendItem::m_EndFrust[nThreadID][nCurrentLightId] = nFrustumIndex;
-                        SRendItem::m_StartFrust[nThreadID][rToRender.nLightID] = nFrustumIndex;
-
-                        nCurrentLightId = rToRender.nLightID;
-                        nCurRecusiveLevel = rToRender.nRecursiveLevel;
-                    }
-                }
-                else
-                {
-                    m_RP.m_SMCustomFrustumIDs[nThreadID][rToRender.nRecursiveLevel].Add(nFrustumIndex);
-                }
-            }
-        }
-
-        // Store the end index to use when iterating over the shadow frustums.
-        SRendItem::m_EndFrust[nThreadID][nCurrentLightId] = m_RP.m_SMFrustums[nThreadID][nCurRecusiveLevel].Num();
-        m_RP.SShadowFrustumToRenderList[nThreadID].SetUse(0);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-AZ::LegacyJobExecutor* CRenderer::GetGenerateRendItemJobExecutor()
-{
-    return &m_generateRendItemJobExecutor;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-AZ::LegacyJobExecutor* CRenderer::GetGenerateShadowRendItemJobExecutor()
-{
-    return &m_generateShadowRendItemJobExecutor;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-AZ::LegacyJobExecutor* CRenderer::GetGenerateRendItemJobExecutorPreProcess()
-{
-    return &m_generateRendItemPreProcessJobExecutor;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-AZ::LegacyJobExecutor* CRenderer::GetFinalizeRendItemJobExecutor(int nThreadID)
-{
-    return &m_finalizeRendItemsJobExecutor[nThreadID];
-}
-
-///////////////////////////////////////////////////////////////////////////////
-AZ::LegacyJobExecutor* CRenderer::GetFinalizeShadowRendItemJobExecutor(int nThreadID)
-{
-    return &m_finalizeShadowRendItemsJobExecutor[nThreadID];
-}
-
-//////////////////////////////////////////////////////////////////////////
-// IShaderPublicParams implementation class.
-//////////////////////////////////////////////////////////////////////////
-
-struct CShaderPublicParams
-    : public IShaderPublicParams
-{
-    CShaderPublicParams()
-    {
-        m_nRefCount = 0;
-    }
-
-    virtual void AddRef() { m_nRefCount++; };
-    virtual void Release()
-    {
-        if (--m_nRefCount <= 0)
-        {
-            delete this;
-        }
-    };
-
-    virtual void SetParamCount(int nParam) { m_shaderParams.resize(nParam); }
-    virtual int  GetParamCount() const { return m_shaderParams.size(); };
-
-    virtual SShaderParam& GetParam(int nIndex)
-    {
-        assert(nIndex >= 0 && nIndex < (int)m_shaderParams.size());
-        return m_shaderParams[nIndex];
-    }
-
-    virtual const SShaderParam& GetParam(int nIndex) const
-    {
-        assert(nIndex >= 0 && nIndex < (int)m_shaderParams.size());
-        return m_shaderParams[nIndex];
-    }
-
-    virtual SShaderParam* GetParamByName(const char* pszName)
-    {
-        for (int32 i = 0; i < m_shaderParams.size(); i++)
-        {
-            if (azstricmp(pszName, m_shaderParams[i].m_Name.c_str()) == 0)
-            {
-                return &m_shaderParams[i];
-            }
-        }
-
-        return 0;
-    }
-
-    virtual const SShaderParam* GetParamByName(const char* pszName) const
-    {
-        for (int32 i = 0; i < m_shaderParams.size(); i++)
-        {
-            if (azstricmp(pszName, m_shaderParams[i].m_Name.c_str()) == 0)
-            {
-                return &m_shaderParams[i];
-            }
-        }
-
-        return 0;
-    }
-
-    virtual SShaderParam* GetParamBySemantic(uint8 eParamSemantic)
-    {
-        for (int i = 0; i < m_shaderParams.size(); ++i)
-        {
-            if (m_shaderParams[i].m_eSemantic == eParamSemantic)
-            {
-                return &m_shaderParams[i];
-            }
-        }
-
-        return NULL;
-    }
-
-
-    virtual const SShaderParam* GetParamBySemantic(uint8 eParamSemantic) const
-    {
-        for (int i = 0; i < m_shaderParams.size(); ++i)
-        {
-            if (m_shaderParams[i].m_eSemantic == eParamSemantic)
-            {
-                return &m_shaderParams[i];
-            }
-        }
-
-        return NULL;
-    }
-
-    virtual void SetParam(int nIndex, const SShaderParam& param)
-    {
-        assert(nIndex >= 0 && nIndex < (int)m_shaderParams.size());
-
-        m_shaderParams[nIndex] = param;
-    }
-
-    virtual void AddParam(const SShaderParam& param)
-    {
-        // shouldn't add existing parameter ?
-        m_shaderParams.push_back(param);
-    }
-
-    virtual void RemoveParamByName(const char* pszName)
-    {
-        for (int32 i = 0; i < m_shaderParams.size(); i++)
-        {
-            if (azstricmp(pszName, m_shaderParams[i].m_Name.c_str()) == 0)
-            {
-                m_shaderParams.erase(m_shaderParams.begin() + i);
-            }
-        }
-    }
-
-    virtual void RemoveParamBySemantic(uint8 eParamSemantic)
-    {
-        for (int i = 0; i < m_shaderParams.size(); ++i)
-        {
-            if (eParamSemantic == m_shaderParams[i].m_eSemantic)
-            {
-                m_shaderParams.erase(m_shaderParams.begin() + i);
-            }
-        }
-    }
-
-    virtual void SetParam(const char* pszName, UParamVal& pParam, EParamType nType = eType_FLOAT, uint8 eSemantic = 0)
-    {
-        int32 i;
-
-        for (i = 0; i < m_shaderParams.size(); i++)
-        {
-            if (azstricmp(pszName, m_shaderParams[i].m_Name.c_str()) == 0)
-            {
-                break;
-            }
-        }
-
-        if (i == m_shaderParams.size())
-        {
-            SShaderParam pr;
-            pr.m_Name = pszName;
-            pr.m_Type = nType;
-            pr.m_eSemantic = eSemantic;
-            m_shaderParams.push_back(pr);
-        }
-
-        SShaderParam::SetParam(pszName, &m_shaderParams, pParam);
-    }
-
-    virtual void SetShaderParams(const AZStd::vector<SShaderParam>& pParams)
-    {
-        m_shaderParams = pParams;
-    }
-
-    virtual void AssignToRenderParams(struct SRendParams& rParams)
-    {
-        if (!m_shaderParams.empty())
-        {
-            rParams.pShaderParams = &m_shaderParams;
-        }
-    }
-
-    virtual AZStd::vector<SShaderParam>* GetShaderParams()
-    {
-        if (m_shaderParams.empty())
-        {
-            return 0;
-        }
-
-        return &m_shaderParams;
-    }
-
-    virtual const AZStd::vector<SShaderParam>* GetShaderParams() const
-    {
-        if (m_shaderParams.empty())
-        {
-            return 0;
-        }
-
-        return &m_shaderParams;
-    }
-
-    virtual uint8 GetSemanticByName(const char* szName)
-    {
-        static_assert(ECGP_COUNT <= 0xff, "8 bits are not enough to store all ECGParam values");
-
-        if (strcmp(szName, "WrinkleMask0") == 0)
-        {
-            return ECGP_PI_WrinklesMask0;
-        }
-        if (strcmp(szName, "WrinkleMask1") == 0)
-        {
-            return ECGP_PI_WrinklesMask1;
-        }
-        if (strcmp(szName, "WrinkleMask2") == 0)
-        {
-            return ECGP_PI_WrinklesMask2;
-        }
-
-        return ECGP_Unknown;
-    }
-
-private:
-    int m_nRefCount;
-    AZStd::vector<SShaderParam> m_shaderParams;
-};
-
-//////////////////////////////////////////////////////////////////////////
-IShaderPublicParams* CRenderer::CreateShaderPublicParams()
-{
-    return new CShaderPublicParams;
-}
-
-void CMotionBlur::SetupObject(CRenderObject* renderObject, const SRenderingPassInfo& passInfo)
-{
-    assert(renderObject);
-
-    uint32 fillThreadId = passInfo.ThreadID();
-
-    if (passInfo.IsRecursivePass())
-    {
-        return;
-    }
-
-    SRenderObjData* const __restrict renderObjectData =  renderObject->GetObjData();
-    if (!renderObjectData)
-    {
-        return;
-    }
-
-    renderObject->m_ObjFlags &= ~FOB_HAS_PREVMATRIX;
-    if (renderObjectData->m_uniqueObjectId != 0 && renderObject->m_fDistance < CRenderer::CV_r_MotionBlurMaxViewDist)
-    {
-        const AZ::u32 currentFrameId = passInfo.GetMainFrameID();
-        const AZ::u32 bufferIndex = (currentFrameId) % CMotionBlur::s_maxObjectBuffers;
-        const uintptr_t objectId = renderObjectData ? renderObjectData->m_uniqueObjectId : 0;
-        if (!m_Objects[bufferIndex])
-        {
-            return;
-        }
-
-        auto currentIt = m_Objects[bufferIndex]->find(objectId);
-        if (currentIt != m_Objects[bufferIndex]->end())
-        {
-            const AZ::u32 lastBufferIndex = (currentFrameId - 1) % CMotionBlur::s_maxObjectBuffers;
-
-            auto historyIt = m_Objects[lastBufferIndex]->find(objectId);
-            if (historyIt != m_Objects[lastBufferIndex]->end())
-            {
-                MotionBlurObjectParameters* currentParameters = &currentIt->second;
-                MotionBlurObjectParameters* historyParameters = &historyIt->second;
-                currentParameters->m_worldMatrix = renderObject->m_II.m_Matrix;
-
-                const float fThreshold = CRenderer::CV_r_MotionBlurThreshold;
-                if (renderObject->m_ObjFlags & (FOB_NEAREST | FOB_MOTION_BLUR) ||
-                    !Matrix34::IsEquivalent(historyParameters->m_worldMatrix, currentParameters->m_worldMatrix, fThreshold))
-                {
-                    renderObject->m_ObjFlags |= FOB_HAS_PREVMATRIX;
-                }
-
-                currentParameters->m_updateFrameId = currentFrameId;
-                currentParameters->m_renderObject = renderObject;
-                return;
-            }
-        }
-
-        m_FillData[fillThreadId].push_back(ObjectMap::value_type(objectId, MotionBlurObjectParameters(renderObject, renderObject->m_II.m_Matrix, currentFrameId)));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void SRendItem::mfSortPreprocess(SRendItem* First, int Num)
-{
-    std::sort(First, First + Num, SCompareItemPreprocess());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SRendItem::mfSortForZPass(SRendItem* First, int Num)
-{
-    std::sort(First, First + Num, SCompareRendItemZPass());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SRendItem::mfSortByLight(SRendItem* First, int Num, bool bSort, const bool bIgnoreRePtr, bool bSortDecals)
-{
-    if (bSort)
-    {
-        if (bIgnoreRePtr)
-        {
-            std::sort(First, First + Num, SCompareItem_TerrainLayers());
-        }
-        else
-        {
-            if (bSortDecals)
-            {
-                std::sort(First, First + Num, SCompareItem_Decal());
-            }
-            else
-            {
-                std::sort(First, First + Num, SCompareRendItem());
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SRendItem::mfSortByDist(SRendItem* First, int Num, bool bDecals, bool InvertedOrder)
-{
-    //Note: Temporary use stable sort for flickering hair (meshes within the same skin attachment don't have a deterministic sort order)
-    int i;
-    if (!bDecals)
-    {
-        //Pre-pass to bring in the first 8 entries. 8 cache requests can be in flight
-        const int iPrefetchLoopLastIndex = min_branchless(8, Num);
-        for (i = 0; i < iPrefetchLoopLastIndex; i++)
-        {
-            //It's safe to prefetch NULL
-            PrefetchLine(First[i].pObj, offsetof(CRenderObject, m_fSort));
-        }
-
-        const int iLastValidIndex = Num - 1;
-
-        //Note: this seems like quite a bit of work to do some prefetching but this code was generating a
-        //          level 2 cache miss per iteration of the loop - Rich S
-        for (i = 0; i < Num; i++)
-        {
-            SRendItem* pRI = &First[i];
-            int iPrefetchIndex = min_branchless(i + 8, iLastValidIndex);
-            PrefetchLine(First[iPrefetchIndex].pObj, offsetof(CRenderObject, m_fSort));
-            CRenderObject* pObj = pRI->pObj; // no need to flush, data is only read
-            assert(pObj);
-
-            // We're prefetching on m_fSort, we're still getting some L2 cache misses on access to m_fDistance,
-            // but moving them closer in memory is complicated due to an aligned array that's nestled in there...
-            float fAddDist = pObj->m_fSort;
-            pRI->fDist = pObj->m_fDistance + fAddDist;
-        }
-
-
-        if (InvertedOrder)
-        {
-            std::stable_sort(First, First + Num, SCompareDistInverted());
-        }
-        else
-        {
-            std::stable_sort(First, First + Num, SCompareDist());
-        }
-    }
-    else
-    {
-        std::stable_sort(First, First + Num, SCompareItem_Decal());
-    }
-}
-
-int16 CTexture::StreamCalculateMipsSignedFP(float fMipFactor) const
-{
-    assert(IsStreamed());
-    const uint32 nMaxExtent = max(m_nWidth, m_nHeight);
-    float currentMipFactor = fMipFactor * nMaxExtent * nMaxExtent * gRenDev->GetMipDistFactor();
-    float fMip = (0.5f * logf(max(currentMipFactor, 0.1f)) / LN2 + (CRenderer::CV_r_TexturesStreamingMipBias + gRenDev->m_fTexturesStreamingGlobalMipFactor));
-    int nMip = static_cast<int>(floorf(fMip * 256.0f));
-    const int nNewMip = min(nMip, (m_nMips - m_CacheFileHeader.m_nMipsPersistent) << 8);
-    return (int16)nNewMip;
-}
-
-float CTexture::StreamCalculateMipFactor(int16 nMipsSigned) const
-{
-    float fMip = nMipsSigned / 256.0f;
-    float currentMipFactor = expf((fMip - (CRenderer::CV_r_TexturesStreamingMipBias + gRenDev->m_fTexturesStreamingGlobalMipFactor)) * 2.0f * LN2);
-
-    const uint32 nMaxExtent = max(m_nWidth, m_nHeight);
-    float fMipFactor = currentMipFactor / (nMaxExtent * nMaxExtent * gRenDev->GetMipDistFactor());
-
-    return fMipFactor;
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
diff --git a/Code/CryEngine/RenderDll/Common/ResFile.cpp b/Code/CryEngine/RenderDll/Common/ResFile.cpp
deleted file mode 100644
index 64ce7e7f06..0000000000
--- a/Code/CryEngine/RenderDll/Common/ResFile.cpp
+++ /dev/null
@@ -1,2044 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : implementation file
-
-
-#include "RenderDll_precompiled.h"
-#include "ResFile.h"
-#include "Pak/CryPakUtils.h"
-
-CResFile CResFile::m_Root(nullptr);
-CResFile CResFile::m_RootStream(nullptr);
-int CResFile::m_nNumOpenResources = 0;
-uint32 CResFile::m_nSizeComprDir;
-uint32 CResFile::m_nMaxOpenResFiles = MAX_OPEN_RESFILES;
-
-namespace
-{
-    CryCriticalSection g_cResLock;
-    CryCriticalSection g_cAsyncResLock;
-}
-
-bool CResFile::IsStreaming()
-{
-    if (m_RootStream.m_NextStream &&
-        m_RootStream.m_NextStream != m_RootStream.m_PrevStream)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-// Directory garbage collector (must be executed in render thread)
-void CResFile::Tick()
-{
-    if (!m_RootStream.m_NextStream)
-    {
-        m_RootStream.m_NextStream = &m_RootStream;
-        m_RootStream.m_PrevStream = &m_RootStream;
-    }
-    //return;
-
-    AUTO_LOCK(g_cAsyncResLock);
-
-    int nCurFrame = gRenDev->m_nFrameSwapID;
-    uint32 nFrameDif = 300; // Release the directories in 300 frames (approx 10 secs)
-    CResFile* pRF, * pNext;
-    for (pRF = m_RootStream.m_PrevStream; pRF != &m_RootStream; pRF = pNext)
-    {
-        pNext = pRF->m_PrevStream;
-        assert(pRF->m_pStreamInfo);
-        if (!pRF->m_pStreamInfo)
-        {
-            pRF->UnlinkStream();
-            continue;
-        }
-        if (pRF->m_bDirStreaming || pRF->m_pStreamInfo->m_EntriesQueue.size())
-        {
-            continue; // Still streaming
-        }
-        if (nCurFrame - pRF->m_nLastTickStreamed > nFrameDif)
-        {
-            pRF->UnlinkStream();
-            pRF->mfReleaseDir();
-        }
-    }
-}
-
-void CResFile::mfTickStreaming()
-{
-    m_nLastTickStreamed = gRenDev->m_nFrameSwapID;
-    UnlinkStream();
-    LinkStream(&m_RootStream);
-}
-
-void CResFile::mfDeactivate([[maybe_unused]] bool bReleaseDir)
-{
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    if (m_fileHandle != AZ::IO::InvalidHandle)
-    {
-        mfFlush();
-        gEnv->pCryPak->FClose(m_fileHandle);
-        m_fileHandle = AZ::IO::InvalidHandle;
-    }
-
-    if (m_bActive)
-    {
-        m_nNumOpenResources--;
-    }
-    m_bActive = false;
-
-    Unlink();
-}
-
-bool CResFile::mfActivate(bool bFirstTime)
-{
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    if (!m_bActive)
-    {
-        Relink(&m_Root);
-        if (m_nNumOpenResources >= (int)m_nMaxOpenResFiles)
-        {
-            if (m_nNumOpenResources)
-            {
-                CResFile* rf = m_Root.m_Prev;
-                assert(rf && (rf->m_fileHandle != AZ::IO::InvalidHandle || m_pStreamInfo));
-                rf->mfDeactivate(false);
-            }
-        }
-
-        LOADING_TIME_PROFILE_SECTION(iSystem);
-        CDebugAllowFileAccess dafa;
-
-        int nFlags = !m_pLookupDataMan || m_pLookupDataMan->IsReadOnly() ? 0 : AZ::IO::IArchive::FLAGS_NEVER_IN_PAK | AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FOPEN_ONDISK;
-
-        // don't open the file if we are trying to stream the data, defeats the idea of streaming it
-        if (!m_pStreamInfo)
-        {
-            if (!bFirstTime && m_szAccess[0] == 'w')
-            {
-                char szAcc[16];
-                azstrcpy(szAcc, AZ_ARRAY_SIZE(szAcc), m_szAccess);
-                szAcc[0] = 'r';
-                m_fileHandle = gEnv->pCryPak->FOpen(m_name.c_str(), szAcc, nFlags | AZ::IO::IArchive::FOPEN_HINT_DIRECT_OPERATION);
-            }
-            else
-            {
-                m_fileHandle = gEnv->pCryPak->FOpen(m_name.c_str(), m_szAccess, nFlags | AZ::IO::IArchive::FOPEN_HINT_DIRECT_OPERATION);
-            }
-
-            if (m_fileHandle == AZ::IO::InvalidHandle)
-            {
-                mfSetError("CResFile::Activate - Can't open resource file <%s>", m_name.c_str());
-                Unlink();
-                return false;
-            }
-        }
-
-        m_nNumOpenResources++;
-        m_bActive = true;
-    }
-    if (!bFirstTime && !m_bDirValid)
-    {
-        mfPrepareDir();
-    }
-
-    return true;
-}
-
-CResFile::CResFile(const char* name)
-{
-    m_name = name;
-    m_fileHandle = AZ::IO::InvalidHandle;
-    m_bActive = false;
-    m_nOffsDir = 0;
-    m_bSwapEndianRead = false;
-    m_bSwapEndianWrite = false;
-    m_pLookupData = NULL;
-    m_pLookupDataMan = NULL;
-
-    m_Next = m_Prev = NULL;
-    m_NextStream = m_PrevStream = NULL;
-    m_pStreamInfo = NULL;
-    m_bDirty = false;
-    m_bDirValid = false;
-    m_bDirCompressed = false;
-    m_bDirStreaming = false;
-    m_pCompressedDir = NULL;
-    m_nComprDirSize = 0;
-    m_nNumFilesUnique = 0;
-    m_nNumFilesRef = 0;
-    m_bDirCompressed = false;
-    m_nOffset = OFFSET_BIG_POSITIVE;
-
-    // If the root hasn't been set up before and this isn't a statically created
-    // CResFile (like the root/root stream), then lazy init the resource list
-    if (!m_Root.m_Next && name)
-    {
-        m_Root.m_name = "Root";
-        m_RootStream.m_name = "RootStream";
-        m_Root.m_Next = &m_Root;
-        m_Root.m_Prev = &m_Root;
-        m_RootStream.m_NextStream = &m_RootStream;
-        m_RootStream.m_PrevStream = &m_RootStream;
-    }
-}
-
-CResFile::~CResFile()
-{
-    if (this != &m_Root && this != &m_RootStream)
-    {
-        mfClose();
-    }
-    else
-    {
-        assert(CResFile::m_nNumOpenResources == 0);
-    }
-}
-
-void CResFile::mfSetError(const char* er, ...)
-{
-    char buffer[1024];
-    va_list args;
-    va_start(args, er);
-    if (azvsnprintf(buffer, sizeof(buffer), er, args) == -1)
-    {
-        buffer[sizeof(buffer) - 1] = 0;
-    }
-    m_ermes = buffer;
-    va_end(args);
-}
-
-SResFileLookupData* CResFile::GetLookupData(bool bCreate, uint32 CRC, float fVersion) const
-{
-    if (m_pLookupDataMan)
-    {
-        CCryNameTSCRC name = m_pLookupDataMan->AdjustName(m_name.c_str());
-        SResFileLookupData* pData = m_pLookupDataMan->GetData(name);
-        uint32 nMinor = (int)(((float)fVersion - (float)(int)fVersion) * 10.1f);
-        uint32 nMajor = (int)fVersion;
-
-        if (bCreate && (!pData || (CRC && pData->m_CRC32 != CRC) || pData->m_CacheMinorVer != nMinor || pData->m_CacheMajorVer != nMajor || pData->m_OffsetDir != m_nOffsDir || pData->m_NumOfFilesUnique != m_nNumFilesUnique || pData->m_NumOfFilesRef != m_nNumFilesRef))
-        {
-            m_pLookupDataMan->AddData(this, CRC);
-            pData = m_pLookupDataMan->GetData(name);
-            m_pLookupDataMan->MarkDirty(true);
-            assert(pData);
-        }
-
-        return pData;
-    }
-
-    return NULL;
-}
-
-const char* CResFile::mfGetError(void)
-{
-    if (m_ermes.size())
-    {
-        return m_ermes.c_str();
-    }
-    else
-    {
-        return NULL;
-    }
-}
-
-int CResFile::mfGetResourceSize()
-{
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        return 0;
-    }
-
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    gEnv->pCryPak->FSeek(m_fileHandle, 0, SEEK_END);
-    uint64_t length = gEnv->pCryPak->FTell(m_fileHandle);
-    gEnv->pCryPak->FSeek(m_fileHandle, 0, SEEK_SET);
-
-    return aznumeric_cast<int>(length);
-}
-
-uint64 CResFile::mfGetModifTime()
-{
-    if (!mfActivate(false))
-    {
-        return 0;
-    }
-
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        return 0;
-    }
-
-    return gEnv->pCryPak->GetModificationTime(m_fileHandle);
-}
-
-bool CResFile::mfFileExist(CCryNameTSCRC name)
-{
-    SDirEntry* de = mfGetEntry(name);
-    if (!de)
-    {
-        return false;
-    }
-    assert(name == de->Name);
-    return true;
-}
-
-bool CResFile::mfFileExist(const char* name)
-{
-    return mfFileExist(CCryNameTSCRC(name));
-}
-
-void CResStreamDirCallback::StreamAsyncOnComplete([[maybe_unused]] IReadStream* pStream, [[maybe_unused]] unsigned nError)
-{
-    /*
-  SResStreamInfo *pStreamInfo = (SResStreamInfo*)pStream->GetUserData();
-  assert(pStreamInfo);
-  if (!pStreamInfo)
-  return;
-  SShaderCache *pCache = pStreamInfo->m_pCache;
-  CResFile *pRes = pStreamInfo->m_pRes;
-  IF(!pRes,0)return;
-  assert(pRes->m_bDirStreaming);
-
-  if (nError == )
-  pStreamInfo->m_nRequestCount--;
-
-  // are all requests processed ?
-  if (pStreamInfo->m_nRequestCount == 0)
-  {
-  // check if both requests were valid !
-  pRes->m_bDirValid = true;
-  }
-  */
-}
-
-void CResStreamDirCallback::StreamOnComplete(IReadStream* pStream, unsigned nError)
-{
-    SResStreamInfo* pStreamInfo = (SResStreamInfo*)pStream->GetUserData();
-    assert(pStreamInfo);
-    if (!pStreamInfo)
-    {
-        return;
-    }
-
-    CryAutoLock<CryCriticalSection> lock(pStreamInfo->m_StreamLock);
-
-    CResFile* pRes = pStreamInfo->m_pRes;
-    IF (!pRes, 0)
-    {
-        return;
-    }
-    assert(pRes->m_bDirStreaming);
-
-    if (!nError)
-    {
-        pStreamInfo->m_nDirRequestCount--;
-    }
-
-    for (std::vector<IReadStreamPtr>::iterator it = pStreamInfo->m_dirReadStreams.begin();
-         it != pStreamInfo->m_dirReadStreams.end(); ++it)
-    {
-        if (pStream == *it)
-        {
-            pStreamInfo->m_dirReadStreams.erase(it);
-            break;
-        }
-    }
-
-    // all requests processed ?
-    if (pStreamInfo->m_dirReadStreams.size() == 0)
-    {
-        // were all requests processed successfully
-        if (pStreamInfo->m_nDirRequestCount == 0)
-        {
-            // check if both requests were valid !
-            pRes->m_bDirValid = true;
-        }
-
-        pRes->m_bDirStreaming = false;
-    }
-
-    SShaderCache* pCache = pStreamInfo->m_pCache;
-    pCache->Release();
-}
-
-int CResFile::mfLoadDir(SResStreamInfo* pStreamInfo)
-{
-    int nRes = 1;
-    if (pStreamInfo)
-    {
-        // if we are streaming the data, we need the lookup data to be valid!
-        if (m_pLookupData == NULL)
-        {
-            return -1;
-        }
-
-        mfTickStreaming();
-        if (m_bDirStreaming)
-        {
-            return -1;
-        }
-        m_bDirStreaming = true;
-
-        int nSizeDir = m_nNumFilesUnique * sizeof(SDirEntry);
-        int nSizeDirRef = m_nNumFilesRef * sizeof(SDirEntry);
-
-        if (nSizeDir)
-        {
-            m_Dir.resize(m_nNumFilesUnique);
-
-            StreamReadParams StrParams;
-            StrParams.nFlags = 0;
-            StrParams.dwUserData = (DWORD_PTR)pStreamInfo;
-            StrParams.nLoadTime = 1;
-            StrParams.nMaxLoadTime = 4;
-            StrParams.pBuffer = &m_Dir[0];
-            StrParams.nOffset = m_nOffsDir;
-            StrParams.nSize = nSizeDir;
-            pStreamInfo->m_pCache->AddRef();
-
-            CryAutoLock<CryCriticalSection> lock(pStreamInfo->m_StreamLock);
-            pStreamInfo->m_dirReadStreams.push_back(iSystem->GetStreamEngine()->StartRead(
-                    eStreamTaskTypeShader, m_name.c_str(), &pStreamInfo->m_CallbackDir, &StrParams));
-            pStreamInfo->m_nDirRequestCount++;
-        }
-
-        if (nSizeDirRef)
-        {
-            m_DirRef.resize(m_nNumFilesRef);
-
-            StreamReadParams StrParams;
-            StrParams.nFlags = 0;
-            StrParams.dwUserData = (DWORD_PTR)pStreamInfo;
-            StrParams.nLoadTime = 1;
-            StrParams.nMaxLoadTime = 4;
-            StrParams.pBuffer = &m_DirRef[0];
-            StrParams.nOffset = m_nOffsDir + nSizeDir;
-            StrParams.nSize = nSizeDirRef;
-            pStreamInfo->m_pCache->AddRef();
-
-            CryAutoLock<CryCriticalSection> lock(pStreamInfo->m_StreamLock);
-            pStreamInfo->m_dirReadStreams.push_back(iSystem->GetStreamEngine()->StartRead(
-                    eStreamTaskTypeShader, m_name.c_str(), &pStreamInfo->m_CallbackDir, &StrParams));
-            pStreamInfo->m_nDirRequestCount++;
-        }
-
-        nRes = -1;
-    }
-    else
-    {
-        if (gEnv->pCryPak->FSeek(m_fileHandle, m_nOffsDir, SEEK_SET) > 0)
-        {
-            mfSetError("Open - Directory reading error");
-            return 0;
-        }
-
-        int nSize = m_nNumFilesUnique * sizeof(SDirEntry);
-        //int nSizeDir = m_nComprDirSize ? m_nComprDirSize : nSize;
-        if (m_nNumFilesUnique)
-        {
-            m_Dir.resize(m_nNumFilesUnique);
-            if (gEnv->pCryPak->FReadRaw(&m_Dir[0], 1, nSize, m_fileHandle) != nSize)
-            {
-                mfSetError("Open - Directory reading error");
-                m_Dir.clear();
-                return 0;
-            }
-        }
-
-        if (m_nNumFilesRef)
-        {
-            nSize = m_nNumFilesRef * sizeof(SDirEntryRef);
-            //int nSizeDir = m_nComprDirSize ? m_nComprDirSize : nSize;
-            m_DirRef.resize(m_nNumFilesRef);
-            if (gEnv->pCryPak->FReadRaw(&m_DirRef[0], 1, nSize, m_fileHandle) != nSize)
-            {
-                mfSetError("Open - Directory reading error");
-                m_DirRef.clear();
-                return 0;
-            }
-        }
-    }
-    m_bDirValid = false;
-    if (!m_nComprDirSize && nRes == 1)
-    {
-        m_bDirValid = true;
-        if (m_bSwapEndianRead)
-        {
-            if (m_nNumFilesUnique)
-            {
-                SwapEndian(&m_Dir[0], (size_t)m_nNumFilesUnique, eBigEndian);
-            }
-            if (m_nNumFilesRef)
-            {
-                SwapEndian(&m_DirRef[0], (size_t)m_nNumFilesRef, eBigEndian);
-            }
-        }
-    }
-    return nRes;
-}
-
-bool CResFile::mfPrepareDir()
-{
-    if (m_bDirValid)
-    {
-        return true;
-    }
-    assert(!m_Dir.size());
-    SDirEntry* pFileDir = NULL;
-    if (m_pCompressedDir)
-    {
-        assert(!m_Dir.size());
-        pFileDir = new SDirEntry[m_nNumFilesUnique];
-        if (m_version == RESVERSION_DEBUG)
-        {
-            memcpy(pFileDir, m_pCompressedDir, sizeof(SDirEntry) * m_nNumFilesUnique);
-        }
-        else
-        {
-            CryFatalError("Bad Version: %d!", m_version);
-        }
-        m_Dir.resize(m_nNumFilesUnique);
-        for (uint32 i = 0; i < m_nNumFilesUnique; i++)
-        {
-            SDirEntry* deS = &m_Dir[i];
-            SDirEntry& fdent = pFileDir[i];
-            if (m_bSwapEndianRead)
-            {
-                SwapEndian(fdent, eBigEndian);
-            }
-            deS->Name = fdent.Name;
-            deS->size = fdent.size;
-            deS->offset = fdent.offset;
-            deS->flags = fdent.flags;
-        }
-        m_nSizeComprDir += m_nComprDirSize;
-        m_bDirValid = true;
-    }
-    else
-    {
-#ifndef NDEBUG
-        int nRes =
-#endif
-            mfLoadDir(m_pStreamInfo);
-        assert(nRes);
-    }
-
-    return true;
-}
-
-void CResFile::mfReleaseDir()
-{
-    // Never unload directory which wasn't flushed yet
-    if (m_bDirty)
-    {
-        return;
-    }
-    if (m_bDirStreaming)
-    {
-        return;
-    }
-    if (m_pStreamInfo && m_pStreamInfo->m_EntriesQueue.size())
-    {
-        return;
-    }
-
-    if (m_bDirValid)
-    {
-        uint32 i;
-        for (i = 0; i < m_Dir.size(); i++)
-        {
-            SDirEntry* de = &m_Dir[i];
-            assert(!(de->flags & RF_NOTSAVED));
-            mfCloseEntry(de, false);
-        }
-
-        m_DirOpen.clear();
-        //m_Dir.clear();
-        ResDir r;
-        m_Dir.swap(r);
-
-        m_bDirValid = false;
-    }
-    else
-    {
-        assert(!m_Dir.size());
-    }
-}
-
-int CResFile::mfOpen(int type, CResFileLookupDataMan* pMan, SResStreamInfo* pStreamInfo)
-{
-    SFileResHeader frh;
-    SDirEntry fden;
-
-    PROFILE_FRAME(Resource_Open);
-
-    if (m_name.c_str()[0] == 0)
-    {
-        mfSetError("Open - No Resource name");
-        return 0;
-    }
-    int nRes = 1;
-    m_bSwapEndianWrite = (type & RA_ENDIANS) != 0;
-    m_bSwapEndianRead = m_bSwapEndianWrite;
-    m_pLookupDataMan = pMan;
-    type &= ~RA_ENDIANS;
-    if (type == RA_READ)
-    {
-        m_szAccess = "rb";
-    }
-    else
-    if (type == (RA_WRITE | RA_READ))
-    {
-        m_szAccess = "r+b";
-    }
-    else
-    if (type & RA_CREATE)
-    {
-        m_szAccess = "w+b";
-    }
-    else
-    {
-        mfSetError("Open - Wrong access mode");
-        return 0;
-    }
-    m_typeaccess = type;
-
-    if (type & RA_READ)
-    {
-        m_pStreamInfo = pStreamInfo;
-    }
-
-    mfActivate(true);
-
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    if (!m_bActive)
-    {
-        if (type & (RA_WRITE | RA_CREATE))
-        {
-            bool fileExists = gEnv->pCryPak->IsFileExist(m_name.c_str());
-            if (fileExists)
-            {
-                m_ermes.clear();
-
-                mfActivate(true);
-            }
-        }
-        if (m_fileHandle == AZ::IO::InvalidHandle)
-        {
-            mfSetError("Open - Can't open resource file <%s>", m_name.c_str());
-            return 0;
-        }
-    }
-
-    if (type & RA_READ)
-    {
-        // check the preloaded dir data, to see if we can get the dir data from there
-        CCryNameTSCRC name = m_pLookupDataMan->AdjustName(m_name.c_str());
-        if (m_pLookupDataMan)
-        {
-            m_pLookupData = m_pLookupDataMan->GetData(name);
-        }
-        if (m_pLookupData)
-        {
-            m_version = m_pLookupDataMan->GetResVersion();
-            m_nNumFilesUnique = m_pLookupData->m_NumOfFilesUnique;
-            m_nNumFilesRef = m_pLookupData->m_NumOfFilesRef;
-            m_nOffsDir = m_pLookupData->m_OffsetDir;
-            m_nComprDirSize = 0;//m_pResDirData->size_dir;
-        }
-        else
-        {
-            // make sure lookupdata is available when we are streaming the data
-            if (m_fileHandle == AZ::IO::InvalidHandle)
-            {
-                mfSetError("Open - no file handle (lookupdata not found, while streaming data?)");
-                return 0;
-            }
-
-            // Detect file endianness automatically.
-            if (gEnv->pCryPak->FReadRaw(&frh, 1, sizeof(frh), m_fileHandle) != sizeof(frh))
-            {
-                mfSetError("Open - Reading fault");
-                return 0;
-            }
-            if (m_bSwapEndianRead)
-            {
-                SwapEndian(frh, eBigEndian);
-            }
-            if (frh.hid != IDRESHEADER)
-            {
-                mfSetError("Open - Wrong header MagicID");
-                return 0;
-            }
-            if (frh.ver != RESVERSION_DEBUG)
-            {
-                mfSetError("Open - Wrong version number");
-                return 0;
-            }
-            m_version = frh.ver;
-            if (!frh.num_files)
-            {
-                mfSetError("Open - Empty resource file");
-                return 0;
-            }
-
-            m_nNumFilesUnique = frh.num_files;
-            m_nNumFilesRef = frh.num_files_ref;
-            m_nOffsDir = frh.ofs_dir;
-            m_nComprDirSize = 0; //frh.size_dir;
-        }
-
-        if (pStreamInfo)
-        {
-            m_pStreamInfo->m_pRes = this;
-        }
-
-        m_bDirCompressed = false;
-        nRes = mfLoadDir(pStreamInfo);
-    }
-    else
-    {
-        frh.hid = IDRESHEADER;
-        int ver = RES_COMPRESSION;
-        frh.ver = ver;
-        frh.num_files = 0;
-        frh.ofs_dir = -1;
-        frh.num_files_ref = 0;
-        m_version = ver;
-        m_nOffsDir = sizeof(frh);
-        SFileResHeader frhTemp, * pFrh;
-        pFrh = &frh;
-        if (m_bSwapEndianWrite)
-        {
-            frhTemp = frh;
-            SwapEndian(frhTemp, eBigEndian);
-            pFrh = &frhTemp;
-        }
-        if (gEnv->pCryPak->FWrite(pFrh, 1, sizeof(frh), m_fileHandle) != sizeof(frh))
-        {
-            mfSetError("Open - Writing fault");
-            return 0;
-        }
-        m_nComprDirSize = 0;
-        m_bDirCompressed = false;
-        m_nNumFilesUnique = 0;
-        m_nNumFilesRef = 0;
-        m_pCompressedDir = NULL;
-        m_bDirValid = true;
-    }
-
-    return nRes;
-}
-
-bool CResFile::mfClose(void)
-{
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    assert(!m_bDirStreaming);
-    assert(!m_pStreamInfo || !m_pStreamInfo->m_EntriesQueue.size());
-
-    //if (m_bDirStreaming || (m_pStreamInfo && m_pStreamInfo->m_EntriesQueue.size()))
-    //  Warning("Warning: CResFile::mfClose: Streaming task is in progress!");
-    UnlinkStream();
-
-    if (m_typeaccess != RA_READ)
-    {
-        mfFlush();
-    }
-
-    // Close the handle and release directory
-    mfDeactivate(true);
-    assert(!m_bDirty);
-    mfReleaseDir();
-
-    SAFE_DELETE_ARRAY(m_pCompressedDir);
-
-    return true;
-}
-
-struct ResDirSortByName
-{
-    bool operator () (const SDirEntry& left, const SDirEntry& right) const
-    {
-        return left.Name < right.Name;
-    }
-    bool operator () (const CCryNameTSCRC left, const SDirEntry& right) const
-    {
-        return left < right.Name;
-    }
-    bool operator () (const SDirEntry& left, CCryNameTSCRC right) const
-    {
-        return left.Name < right;
-    }
-};
-struct ResDirRefSortByName
-{
-    bool operator () (const SDirEntryRef& left, const SDirEntryRef& right) const
-    {
-        return left.Name < right.Name;
-    }
-    bool operator () (const CCryNameTSCRC left, const SDirEntryRef& right) const
-    {
-        return left < right.Name;
-    }
-    bool operator () (const SDirEntryRef& left, CCryNameTSCRC right) const
-    {
-        return left.Name < right;
-    }
-};
-struct ResDirOpenSortByName
-{
-    bool operator () (const SDirEntryOpen& left, const SDirEntryOpen& right) const
-    {
-        return left.Name < right.Name;
-    }
-    bool operator () (const CCryNameTSCRC left, const SDirEntryOpen& right) const
-    {
-        return left < right.Name;
-    }
-    bool operator () (const SDirEntryOpen& left, CCryNameTSCRC right) const
-    {
-        return left.Name < right;
-    }
-};
-
-SDirEntryOpen* CResFile::mfGetOpenEntry(SDirEntry* de)
-{
-    ResDirOpenIt it = std::lower_bound(m_DirOpen.begin(), m_DirOpen.end(), de->Name, ResDirOpenSortByName());
-    if (it != m_DirOpen.end() && de->Name == (*it).Name)
-    {
-        return &(*it);
-    }
-    return NULL;
-}
-SDirEntryOpen* CResFile::mfOpenEntry(SDirEntry* de, [[maybe_unused]] bool readingIntoEntryData)
-{
-    SDirEntryOpen* pOE = NULL;
-    ResDirOpenIt it = std::lower_bound(m_DirOpen.begin(), m_DirOpen.end(), de->Name, ResDirOpenSortByName());
-    if (it == m_DirOpen.end() || de->Name != (*it).Name)
-    {
-        AUTO_LOCK(g_cAsyncResLock);
-        SDirEntryOpen OE;
-        OE.Name = de->Name;
-        OE.curOffset = 0;
-        OE.pData = NULL;
-        m_DirOpen.insert(it, OE);
-        it = std::lower_bound(m_DirOpen.begin(), m_DirOpen.end(), de->Name, ResDirOpenSortByName());
-        return &(*it);
-    }
-    pOE = &(*it);
-    pOE->curOffset = 0;
-    assert(pOE->pData || !readingIntoEntryData);
-    //SAFE_DELETE_ARRAY(pOE->pData);
-
-    return pOE;
-}
-bool CResFile::mfCloseEntry(SDirEntry* de, bool bEraseOpenEntry)
-{
-    ResDirOpenIt it = std::lower_bound(m_DirOpen.begin(), m_DirOpen.end(), de->Name, ResDirOpenSortByName());
-    if (it == m_DirOpen.end() || de->Name != (*it).Name)
-    {
-        return false;
-    }
-    SDirEntryOpen& OE = (*it);
-    OE.curOffset = 0;
-    if (de->flags & RF_TEMPDATA)
-    {
-        if (OE.pData)
-        {
-            delete[] (char*)OE.pData;
-            OE.pData = NULL;
-        }
-    }
-    if (bEraseOpenEntry)
-    {
-        AUTO_LOCK(g_cAsyncResLock);
-        m_DirOpen.erase(it);
-    }
-
-    return true;
-}
-
-SDirEntry* CResFile::mfGetEntry(CCryNameTSCRC name, bool* pAsync)
-{
-    if (pAsync)
-    {
-        *pAsync = m_bDirStreaming;
-        if (m_bDirStreaming)
-        {
-            return 0;
-        }
-    }
-
-    if (!m_Dir.size() || m_bDirStreaming)
-    {
-        if (!mfActivate(false))
-        {
-            return NULL;
-        }
-        if (!m_Dir.size() || m_bDirStreaming)
-        {
-            if (pAsync && m_bDirStreaming)
-            {
-                *pAsync = true;
-            }
-            return NULL;
-        }
-    }
-
-    ResDirIt it = std::lower_bound(m_Dir.begin(), m_Dir.end(), name, ResDirSortByName());
-    if (it != m_Dir.end() && name == (*it).Name)
-    {
-        assert(m_bDirValid);
-        return &(*it);
-    }
-    ResDirRefIt itRef = std::lower_bound(m_DirRef.begin(), m_DirRef.end(), name, ResDirRefSortByName());
-    if (itRef != m_DirRef.end() && name == (*itRef).Name)
-    {
-        assert(m_bDirValid);
-        SDirEntryRef& rref = (*itRef);
-        return &m_Dir[rref.ref];
-    }
-    return NULL;
-}
-
-int CResFile::mfFileClose(SDirEntry* de)
-{
-    if (!(de->flags & RF_NOTSAVED))
-    {
-        mfCloseEntry(de);
-    }
-
-    return 0;
-}
-int CResFile::mfFileAdd(SDirEntry* de)
-{
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    assert(!m_pStreamInfo);
-
-    if (m_typeaccess == RA_READ)
-    {
-        mfSetError("FileAdd - wrong access mode");
-        return 0;
-    }
-    CCryNameTSCRC name = de->Name;
-    ResDirIt it = std::lower_bound(m_Dir.begin(), m_Dir.end(), name, ResDirSortByName());
-    if (it != m_Dir.end() && name == (*it).Name)
-    {
-        return m_Dir.size();
-    }
-
-    if (de->offset == 0)
-    {
-        de->offset = m_nOffset++;
-    }
-
-    if (de->size != 0)
-    {
-        if (!m_Dir.size())
-        {
-            mfActivate(false);
-        }
-
-        it = std::lower_bound(m_Dir.begin(), m_Dir.end(), name, ResDirSortByName());
-        if (it != m_Dir.end() && name == (*it).Name)
-        {
-            return m_Dir.size();
-        }
-
-        SDirEntry newDE;
-        newDE = *de;
-        newDE.flags |= RF_NOTSAVED;
-        m_Dir.insert(it, newDE);
-        m_bDirty = true;
-    }
-    return m_Dir.size();
-}
-
-// Lets unpack the entry asynchronously
-void CResStreamCallback::StreamAsyncOnComplete(IReadStream* pStream, unsigned nError)
-{
-    SResStreamEntry* pEntry = (SResStreamEntry*)pStream->GetUserData();
-    SResStreamInfo* pStreamInfo = pEntry->m_pParent;
-    assert(pStreamInfo);
-    if (!pStreamInfo)
-    {
-        return;
-    }
-    //CryHeapCheck();
-    CResFile* pRes = pStreamInfo->m_pRes;
-    assert(pRes->m_bDirValid);
-
-    if (nError)
-    {
-        pRes->mfSetError("FileRead - Error during streaming data");
-        return;
-    }
-
-    SDirEntry* pDE = pRes->mfGetEntry(pEntry->m_Name);
-    byte* pBuf = (byte*)pStream->GetBuffer();
-    assert(pBuf);
-    byte* pData = NULL;
-
-    int32 size;
-    {
-        size = pDE->size;
-        pData = new byte[size];
-        if (!pData)
-        {
-            pRes->mfSetError("FileRead - Allocation fault");
-        }
-        else
-        {
-            memcpy(pData, pBuf, size);
-        }
-    }
-    {
-        AUTO_LOCK(g_cAsyncResLock);
-
-        SDirEntryOpen* pOE = pRes->mfGetOpenEntry(pDE);
-        if (pOE)
-        {
-            pDE->flags |= RF_TEMPDATA;
-            pOE->nSize = size;
-            pOE->pData = pData;
-        }
-        else
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "mfGetOpenEntry() returned NULL, possibly because r_shadersAllowCompilation=1 and r_shadersAsyncActivation=1. Try r_shadersAsyncActivation=0 in your user.cfg.");
-        }
-    }
-}
-// Release the data synchronously
-void CResStreamCallback::StreamOnComplete(IReadStream* pStream, unsigned nError)
-{
-    SResStreamEntry* pEntry = (SResStreamEntry*)pStream->GetUserData();
-    SResStreamInfo* pStreamInfo = pEntry->m_pParent;
-    assert(pStreamInfo);
-    if (!pStreamInfo)
-    {
-        return;
-    }
-    SShaderCache* pCache = pStreamInfo->m_pCache;
-    uint32 i;
-    bool bFound = false;
-
-    CryAutoLock<CryCriticalSection> lock(pStreamInfo->m_StreamLock);
-
-    //CryHeapCheck();
-    if (!nError)
-    {
-        for (i = 0; i < pStreamInfo->m_EntriesQueue.size(); i++)
-        {
-            SResStreamEntry* pE = pStreamInfo->m_EntriesQueue[i];
-            if (pE == pEntry)
-            {
-                SAFE_DELETE(pE);
-                pStreamInfo->m_EntriesQueue.erase(pStreamInfo->m_EntriesQueue.begin() + i);
-                bFound = true;
-                break;
-            }
-        }
-        assert(bFound);
-    }
-    pCache->Release();
-}
-
-int CResFile::mfFileRead(SDirEntry* de)
-{
-    uint32 size = 0;
-
-    SDirEntryOpen* pOE = mfOpenEntry(de);
-
-    if (pOE->pData)
-    {
-        return pOE->nSize;
-    }
-
-    if (!mfActivate(false))
-    {
-        return 0;
-    }
-
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    //if (strstr(m_name, "FPVS") && m_Dir.size()==3)
-    {
-        //int nnn = 0;
-    }
-    if (m_pStreamInfo)
-    {
-        mfTickStreaming();
-        if (!m_bDirValid)
-        {
-            assert(m_bDirStreaming);
-            return -1;
-        }
-
-        CryAutoLock<CryCriticalSection> lock(m_pStreamInfo->m_StreamLock);
-
-        SResStreamEntry* pEntry;
-        {
-            //AUTO_LOCK(g_cAsyncResLock);
-            pEntry = m_pStreamInfo->AddEntry(de->Name);
-            if (!pEntry)  // Already processing
-            {
-                return -1;
-            }
-        }
-        if (pOE->pData)
-        {
-            return pOE->nSize;
-        }
-        StreamReadParams StrParams;
-        StrParams.nFlags = 0;
-        StrParams.dwUserData = (DWORD_PTR)pEntry;
-        StrParams.nLoadTime = 1;
-        StrParams.nMaxLoadTime = 4;
-        //    StrParams.nPriority = 0;
-        StrParams.pBuffer = NULL;
-        StrParams.nOffset = de->offset;
-        StrParams.nSize = de->size;
-        m_pStreamInfo->m_pCache->AddRef();
-        //Warning("Warning: CResFile::mfFileRead: '%s' Ref: %d", m_name.c_str(), n);
-        pEntry->m_readStream = iSystem->GetStreamEngine()->StartRead(eStreamTaskTypeShader, m_name.c_str(), &m_pStreamInfo->m_Callback, &StrParams);
-        return -1;
-    }
-    else
-    if (de->flags & RF_COMPRESS)
-    {
-        if (gEnv->pCryPak->FSeek(m_fileHandle, de->offset, SEEK_SET) > 0)
-        {
-            mfSetError("FileRead - Seek error");
-            return 0;
-        }
-
-        byte* buf = new byte[de->size];
-        if (!buf)
-        {
-            mfSetError("FileRead - Allocation fault");
-            return 0;
-        }
-        if (m_version == RESVERSION_DEBUG)
-        {
-            gEnv->pCryPak->FReadRaw(buf, de->size, 1, m_fileHandle);
-            pOE->pData = new byte[de->size - 20];
-            de->flags |= RF_TEMPDATA;
-            if (!pOE->pData)
-            {
-                SAFE_DELETE_ARRAY(buf);
-                mfSetError("FileRead - Allocation fault");
-                return 0;
-            }
-            memcpy(pOE->pData, &buf[10], de->size - 20);
-        }
-        else
-        {
-            CryFatalError("Bad Version: %d!", m_version);
-            return 0;
-        }
-
-        delete[] buf;
-
-        pOE->nSize = size;
-        return size;
-    }
-
-    pOE->pData = new byte[de->size];
-    pOE->nSize = de->size;
-    de->flags |= RF_TEMPDATA;
-    if (!pOE->pData)
-    {
-        mfSetError("FileRead - Allocation fault");
-        return 0;
-    }
-
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        mfSetError("FileRead - Invalid file handle");
-        return 0;
-    }
-
-    if (gEnv->pCryPak->FSeek(m_fileHandle, de->offset, SEEK_SET) > 0)
-    {
-        mfSetError("FileRead - Seek error");
-        return 0;
-    }
-
-    if (gEnv->pCryPak->FReadRaw(pOE->pData, 1, de->size, m_fileHandle) != de->size)
-    {
-        mfSetError("FileRead - Reading fault");
-        return 0;
-    }
-
-    //if (strstr(m_name, "FPVS") && m_Dir.size()==3)
-    {
-        //gEnv->pCryPak->FSeek(m_fileHandle, 0, SEEK_END);
-        //int nSize = gEnv->pCryPak->FTell(m_fileHandle);
-        //int nnn = 0;
-    }
-
-    return de->size;
-}
-
-byte* CResFile::mfFileReadCompressed(SDirEntry* de, uint32& nSizeDecomp, uint32& nSizeComp)
-{
-    if (!mfActivate(false))
-    {
-        return NULL;
-    }
-
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        mfSetError("FileReadCompressed - Invalid file handle");
-        return 0;
-    }
-
-    if (de->flags & RF_COMPRESS)
-    {
-        if (de->offset >= 0x10000000)
-        {
-            return NULL;
-        }
-
-        if (gEnv->pCryPak->FSeek(m_fileHandle, de->offset, SEEK_SET) > 0)
-        {
-            mfSetError("FileReadCompressed - Seek error");
-            return 0;
-        }
-
-        byte* buf = new byte[de->size];
-        if (!buf)
-        {
-            mfSetError("FileRead - Allocation fault");
-            return 0;
-        }
-        if (m_version == RESVERSION_DEBUG)
-        {
-            gEnv->pCryPak->FReadRaw(buf, 10, 1, m_fileHandle);
-            gEnv->pCryPak->FReadRaw(buf, de->size - 20, 1, m_fileHandle);
-            nSizeDecomp = de->size - 20;
-            nSizeComp = de->size - 20;
-        }
-        else
-        {
-            CryFatalError("Bad Version: %d!", m_version);
-            return 0;
-        }
-        return buf;
-    }
-
-    nSizeComp = nSizeDecomp = de->size;
-    byte* buf = new byte[de->size];
-
-    if (gEnv->pCryPak->FSeek(m_fileHandle, de->offset, SEEK_SET) > 0)
-    {
-        mfSetError("FileReadCompressed - Seek error");
-        delete[] buf;
-        return 0;
-    }
-
-    if (gEnv->pCryPak->FReadRaw(buf, 1, de->size, m_fileHandle) != de->size)
-    {
-        mfSetError("FileRead - Reading fault");
-        delete[] buf;
-        return 0;
-    }
-    return buf;
-}
-
-int CResFile::mfFileRead(CCryNameTSCRC name)
-{
-    SDirEntry* de = mfGetEntry(name);
-
-    if (!de)
-    {
-        mfSetError("FileRead - Wrong FileId");
-        return 0;
-    }
-    return mfFileRead(de);
-}
-
-int CResFile::mfFileRead(const char* name)
-{
-    return mfFileRead(CCryNameTSCRC(name));
-}
-
-int CResFile::mfFileWrite(CCryNameTSCRC name, void* data)
-{
-    SDirEntry* de = mfGetEntry(name);
-
-    if (!de)
-    {
-        mfSetError("FileWrite - Wrong FileId");
-        return 0;
-    }
-    if (!data)
-    {
-        mfSetError("FileWrite - Wrong data");
-        return 0;
-    }
-
-    if (!mfActivate(false))
-    {
-        return 0;
-    }
-
-    if (de->flags & RF_COMPRESS)
-    {
-        assert(0);
-        return 0;
-    }
-
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        mfSetError("FileWrite - Invalid file handle");
-        return 0;
-    }
-
-    if (gEnv->pCryPak->FSeek(m_fileHandle, de->offset, SEEK_SET) > 0)
-    {
-        mfSetError("FileWrite - Seek error");
-        return 0;
-    }
-
-    if (gEnv->pCryPak->FWrite(data, 1, de->size, m_fileHandle) != de->size)
-    {
-        mfSetError("FileWrite - Writing fault");
-        return 0;
-    }
-
-    return de->size;
-}
-
-void CResFile::mfFileRead2(SDirEntry* de, int size, void* buf)
-{
-    if (!buf)
-    {
-        mfSetError("FileRead - Wrong data");
-        return;
-    }
-    SDirEntryOpen* pOE = mfOpenEntry(de, false);
-
-    if (pOE->pData)
-    {
-        memcpy(buf, (byte*)(pOE->pData) + pOE->curOffset, size);
-        pOE->curOffset += size;
-        return;
-    }
-    if (!mfActivate(false))
-    {
-        return;
-    }
-
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        mfSetError("FileRead2 - Invalid file handle");
-        return;
-    }
-
-    if (gEnv->pCryPak->FSeek(m_fileHandle, de->offset + pOE->curOffset, SEEK_SET) > 0)
-    {
-        mfSetError("FileRead2 - Seek error");
-        return;
-    }
-
-    if (gEnv->pCryPak->FReadRaw(buf, 1, size, m_fileHandle) != size)
-    {
-        mfSetError("FileRead - Reading fault");
-        return;
-    }
-    pOE->curOffset += size;
-}
-
-void CResFile::mfFileRead2(CCryNameTSCRC name, int size, void* buf)
-{
-    SDirEntry* de = mfGetEntry(name);
-    if (!de)
-    {
-        mfSetError("FileRead2 - wrong file id");
-        return;
-    }
-    return mfFileRead2(de, size, buf);
-}
-
-void* CResFile::mfFileGetBuf(SDirEntry* de)
-{
-    SDirEntryOpen* pOE = mfGetOpenEntry(de);
-    if (!pOE)
-    {
-        return NULL;
-    }
-    return pOE->pData;
-}
-
-void* CResFile::mfFileGetBuf(CCryNameTSCRC name)
-{
-    SDirEntry* de = mfGetEntry(name);
-    if (!de)
-    {
-        mfSetError("FileGetBuf - wrong file id");
-        return NULL;
-    }
-    return mfFileGetBuf(de);
-}
-
-int CResFile::mfFileSeek(SDirEntry* de, int ofs, int type)
-{
-    int m;
-
-    mfActivate(false);
-
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        mfSetError("FileSeek - Invalid file handle");
-        return -1;
-    }
-
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    SDirEntryOpen* pOE = mfOpenEntry(de, false);
-
-    switch (type)
-    {
-    case SEEK_CUR:
-        pOE->curOffset += ofs;
-        m = gEnv->pCryPak->FSeek(m_fileHandle, de->offset + pOE->curOffset, SEEK_SET);
-        break;
-
-    case SEEK_SET:
-        m = gEnv->pCryPak->FSeek(m_fileHandle, de->offset + ofs, SEEK_SET);
-        pOE->curOffset = ofs;
-        break;
-
-    case SEEK_END:
-        pOE->curOffset = de->size - ofs;
-        m = gEnv->pCryPak->FSeek(m_fileHandle, de->offset + pOE->curOffset, SEEK_SET);
-        break;
-
-    default:
-        mfSetError("FileSeek - wrong seek type");
-        return -1;
-    }
-
-    return m;
-}
-
-int CResFile::mfFileSeek(CCryNameTSCRC name, int ofs, int type)
-{
-    SDirEntry* de = mfGetEntry(name);
-
-    if (!de)
-    {
-        mfSetError("FileSeek - invalid file id");
-        return -1;
-    }
-    return mfFileSeek(de, ofs, type);
-}
-
-int CResFile::mfFileSeek(char* name, int ofs, int type)
-{
-    return mfFileSeek(CCryNameTSCRC(name), ofs, type);
-}
-
-int CResFile::mfFileLength(SDirEntry* de)
-{
-    return de->size;
-}
-
-int CResFile::mfFileLength(CCryNameTSCRC name)
-{
-    SDirEntry* de = mfGetEntry(name);
-
-    if (!de)
-    {
-        mfSetError("FileLength - invalid file id");
-        return -1;
-    }
-    return mfFileLength(de);
-}
-
-int CResFile::mfFileLength(char* name)
-{
-    return mfFileLength(CCryNameTSCRC(name));
-}
-
-int CResFile::mfFlushDir(long nOffset, [[maybe_unused]] bool bOptimise)
-{
-    uint32 i;
-#ifdef _DEBUG
-    // Check for sorted array and duplicated values
-    ResDir Sorted;
-    for (i = 0; i < m_Dir.size(); i++)
-    {
-        SDirEntry& DE = m_Dir[i];
-        ResDirIt it = std::lower_bound(Sorted.begin(), Sorted.end(), DE.Name, ResDirSortByName());
-        if (it != Sorted.end() && DE.Name == (*it).Name)
-        {
-            assert(0);  // Duplicated value
-            continue;
-        }
-        Sorted.insert(it, DE);
-    }
-    assert(Sorted.size() == m_Dir.size());
-    for (i = 0; i < m_Dir.size(); i++)
-    {
-        SDirEntry& DE1 = m_Dir[i];
-        SDirEntry& DE2 = Sorted[i];
-        assert(DE1.Name == DE2.Name);
-    }
-
-    ResDirRef SortedRef;
-    for (i = 0; i < m_DirRef.size(); i++)
-    {
-        SDirEntryRef& DE = m_DirRef[i];
-        ResDirRefIt it = std::lower_bound(SortedRef.begin(), SortedRef.end(), DE.Name, ResDirRefSortByName());
-        if (it != SortedRef.end() && DE.Name == (*it).Name)
-        {
-            assert(0);  // Duplicated value
-            continue;
-        }
-        SortedRef.insert(it, DE);
-    }
-    assert(SortedRef.size() == m_DirRef.size());
-    for (i = 0; i < m_DirRef.size(); i++)
-    {
-        SDirEntryRef& DE1 = m_DirRef[i];
-        SDirEntryRef& DE2 = SortedRef[i];
-        assert(DE1.Name == DE2.Name);
-    }
-
-    // Make sure references are correct
-    if (bOptimise)
-    {
-        for (i = 0; i < m_DirRef.size(); i++)
-        {
-            SDirEntryRef& r = m_DirRef[i];
-            assert(r.ref < m_Dir.size());
-        }
-    }
-#endif
-
-    TArray<SDirEntry> FDir;
-    TArray<SDirEntryRef> FDirRef;
-    FDir.ReserveNoClear(m_Dir.size());
-    FDirRef.ReserveNoClear(m_DirRef.size());
-
-    for (i = 0; i < (int)m_Dir.size(); i++)
-    {
-        SDirEntry* de = &m_Dir[i];
-        SDirEntry& fden = FDir[i];
-        fden.Name = de->Name;
-        fden.size = de->size;
-        assert(de->offset > 0);
-        fden.offset = de->offset;
-        fden.flags = de->flags;
-        if (m_bSwapEndianWrite)
-        {
-            SwapEndian(fden, eBigEndian);
-        }
-    }
-    for (i = 0; i < (int)m_DirRef.size(); i++)
-    {
-        SDirEntryRef* de = &m_DirRef[i];
-        SDirEntryRef& fden = FDirRef[i];
-        fden.Name = de->Name;
-        fden.ref = de->ref;
-        assert(de->ref >= 0);
-        if (m_bSwapEndianWrite)
-        {
-            SwapEndian(fden, eBigEndian);
-        }
-    }
-    gEnv->pCryPak->FSeek(m_fileHandle, nOffset, SEEK_SET);
-    int sizeUn = FDir.Num() * sizeof(SDirEntry);
-    int sizeRef = FDirRef.Num() * sizeof(SDirEntryRef);
-    byte* buf = NULL;
-    if (m_bDirCompressed)
-    {
-#if RES_COMPRESSION == RESVERSION_DEBUG
-        buf = new byte [sizeUn];
-        memcpy(buf, (byte*)&FDir[0], sizeUn);
-#else
-        COMPILE_TIME_ASSERT(0);
-#endif
-    }
-    else
-    {
-        buf = new byte[sizeUn + sizeRef];
-        memcpy(buf, &FDir[0], sizeUn);
-        if (sizeRef)
-        {
-            memcpy(&buf[sizeUn], &FDirRef[0], sizeRef);
-        }
-    }
-    if (gEnv->pCryPak->FWrite(buf, 1, sizeUn + sizeRef, m_fileHandle) != sizeUn + sizeRef)
-    {
-        mfSetError("FlushDir - Writing fault");
-        return false;
-    }
-    m_nOffsDir = nOffset;
-    m_nNumFilesUnique = FDir.Num();
-    m_nNumFilesRef = FDirRef.Num();
-    SAFE_DELETE_ARRAY(m_pCompressedDir);
-    if (m_bDirCompressed)
-    {
-        m_nComprDirSize = sizeUn;
-        m_pCompressedDir = new byte[sizeUn];
-        memcpy(m_pCompressedDir, buf, sizeUn);
-    }
-    SAFE_DELETE_ARRAY(buf);
-    m_bDirValid = true;
-
-    SResFileLookupData* pLookup = GetLookupData(false, 0, 0);
-
-    if (pLookup)
-    {
-        pLookup->m_NumOfFilesRef = m_nNumFilesRef;
-        pLookup->m_NumOfFilesUnique = m_nNumFilesUnique;
-        pLookup->m_OffsetDir = nOffset;
-        m_pLookupDataMan->MarkDirty(true);
-        m_pLookupDataMan->Flush();
-    }
-    return sizeUn + sizeRef;
-}
-
-int CResFile::mfFlush(bool bOptimise)
-{
-    SFileResHeader frh;
-
-    PROFILE_FRAME(Resource_Flush);
-
-    // For compatibility with old builds
-    bOptimise = false;
-
-    int nSizeDir = m_DirRef.size() * sizeof(SDirEntryRef) + m_Dir.size() * sizeof(SDirEntry);
-
-    if (m_typeaccess == RA_READ)
-    {
-        mfSetError("Flush - wrong access mode");
-        return nSizeDir;
-    }
-    AUTO_LOCK(g_cResLock); // Not thread safe without this
-
-    if (m_pLookupDataMan)
-    {
-        m_pLookupDataMan->Flush();
-    }
-
-    if (!m_bDirty)
-    {
-        return nSizeDir;
-    }
-    m_bDirty = false;
-    if (!mfActivate(false))
-    {
-        return nSizeDir;
-    }
-
-    if (m_fileHandle == AZ::IO::InvalidHandle)
-    {
-        mfSetError("Flush - Invalid file handle");
-        return 0;
-    }
-
-    int i;
-    uint32 j;
-
-    int nSizeCompr = 0;
-
-    int nUpdate = 0;
-    int nSizeUpdate = 0;
-
-    const size_t numDirRefs = m_Dir.size();
-    TArray<int>* pRefs = NULL;
-    if (!bOptimise)
-    {
-        pRefs = new TArray<int>[numDirRefs];
-    }
-
-    // Make a list of all references
-    for (i = 0; i < (int)m_Dir.size(); i++)
-    {
-        SDirEntry* de = &m_Dir[i];
-        if (de->offset < 0)
-        {
-            assert(de->flags & RF_NOTSAVED);
-            bool bFound = false;
-            for (j = 0; j < m_Dir.size(); j++)
-            {
-                if (i == j)
-                {
-                    continue;
-                }
-                SDirEntry* d = &m_Dir[j];
-                if (d->offset == -de->offset)
-                {
-                    if (bOptimise)
-                    {
-                        SDirEntryRef r;
-                        r.Name = de->Name;
-                        r.ref = d->offset;
-                        m_DirRef.push_back(r);
-                        mfCloseEntry(de);
-                        m_Dir.erase(m_Dir.begin() + i);
-                        i--;
-                    }
-                    else
-                    {
-                        pRefs[j].AddElem(i);
-                    }
-                    bFound = true;
-                    break;
-                }
-            }
-            assert(bFound);
-        }
-    }
-
-    nSizeDir = m_DirRef.size() * sizeof(SDirEntryRef) + m_Dir.size() * sizeof(SDirEntry);
-
-    const int nFiles = m_Dir.size();
-    long nSeek = m_nOffsDir;
-    for (i = 0; i < nFiles; i++)
-    {
-        SDirEntry* de = &m_Dir[i];
-        assert(de->offset >= 0);
-        if (de->flags & RF_NOTSAVED)
-        {
-            SDirEntryOpen* pOE = mfGetOpenEntry(de);
-            de->flags &= ~RF_NOTSAVED;
-            nUpdate++;
-            nSizeUpdate += de->size;
-
-            if (de->offset >= 0)
-            {
-                assert(pOE && pOE->pData);
-                if (!pOE || !pOE->pData)
-                {
-                    continue;
-                }
-                gEnv->pCryPak->FSeek(m_fileHandle, nSeek, SEEK_SET);
-                if (de->flags & RF_COMPRESS)
-                {
-                    byte* buf = NULL;
-#if RES_COMPRESSION == RESVERSION_DEBUG
-                    buf = new byte [de->size + 20];
-                    memcpy(buf, ">>rawbuf>>", 10);
-                    memcpy(buf + 10, (byte*)pOE->pData, de->size);
-                    memcpy(buf + 10 + de->size, "<<rawbuf<<", 10);
-                    de->size += 20;
-#else
-                    COMPILE_TIME_ASSERT(0);
-#endif
-                    if (gEnv->pCryPak->FWrite(buf, 1, de->size, m_fileHandle) != de->size)
-                    {
-                        mfSetError("Flush - Writing fault");
-                    }
-                    if (!(de->flags & RF_COMPRESSED))
-                    {
-                        delete[] buf;
-                    }
-                    nSizeCompr += de->size;
-                }
-                else
-                if (!pOE->pData || (gEnv->pCryPak->FWrite(pOE->pData, 1, de->size, m_fileHandle) != de->size))
-                {
-                    mfSetError("Flush - Writing fault");
-                    continue;
-                }
-
-                mfCloseEntry(de);
-                if (bOptimise)
-                {
-                    for (j = 0; j < m_DirRef.size(); j++)
-                    {
-                        SDirEntryRef& r = m_DirRef[j];
-                        if (r.ref == de->offset)
-                        {
-                            nUpdate++;
-                            r.ref = i;
-                        }
-                    }
-                }
-                de->offset = nSeek;
-                nSeek += de->size;
-            }
-        }
-        // Update reference entries
-        if (pRefs)
-        {
-            PREFAST_ASSUME(i < numDirRefs);
-            for (j = 0; j < pRefs[i].Num(); j++)
-            {
-                nUpdate++;
-                SDirEntry* d = &m_Dir[pRefs[i][j]];
-                d->offset = de->offset;
-                d->size = de->size;
-                d->flags = de->flags;
-                d->flags &= ~RF_NOTSAVED;
-            }
-        }
-    }
-    SAFE_DELETE_ARRAY(pRefs);
-
-    if (!nUpdate)
-    {
-        return nSizeDir;
-    }
-    m_bDirCompressed = false; //bCompressDir;
-    int sizeDir = mfFlushDir(nSeek, bOptimise);
-    assert(sizeDir == nSizeDir);
-
-    frh.hid = IDRESHEADER;
-    int ver = RES_COMPRESSION;
-    frh.ver = ver;
-    frh.num_files = m_Dir.size();
-    frh.num_files_ref = m_DirRef.size();
-    frh.ofs_dir = nSeek;
-    //frh.size_dir = sizeDir;
-    m_version = ver;
-    SFileResHeader frhTemp, * pFrh;
-    pFrh = &frh;
-    if (m_bSwapEndianWrite)
-    {
-        frhTemp = frh;
-        SwapEndian(frhTemp, eBigEndian);
-        pFrh = &frhTemp;
-    }
-    gEnv->pCryPak->FSeek(m_fileHandle, 0, SEEK_SET);
-    if (gEnv->pCryPak->FWrite(pFrh, 1, sizeof(frh), m_fileHandle) != sizeof(frh))
-    {
-        mfSetError("Flush - Writing fault");
-        return nSizeDir;
-    }
-    gEnv->pCryPak->FFlush(m_fileHandle);
-    //if (strstr(m_name, "FPVS") && frh.num_files==4)
-    {
-        //gEnv->pCryPak->FSeek(m_fileHandle, 0, SEEK_END);
-        //int nSize = gEnv->pCryPak->FTell(m_fileHandle);
-        //mfDeactivate();
-        //int nnn = 0;
-    }
-
-    return sizeDir;
-}
-
-int CResFile::Size()
-{
-    int nSize = sizeof(CResFile);
-
-    uint32 i;
-    for (i = 0; i < m_Dir.size(); i++)
-    {
-        SDirEntry& DE = m_Dir[i];
-        nSize += sizeof(SDirEntry);
-        SDirEntryOpen* pOE = mfGetOpenEntry(&DE);
-        if (pOE)
-        {
-            nSize += sizeof(SDirEntryOpen);
-            if (pOE->pData && (DE.flags & RF_TEMPDATA))
-            {
-                nSize += DE.size;
-            }
-        }
-    }
-
-    return nSize;
-}
-
-void CResFile::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_Dir);
-    pSizer->AddObject(m_DirOpen);
-}
-
-ResDir* CResFile::mfGetDirectory()
-{
-    return &m_Dir;
-}
-
-//======================================================================
-
-void fpStripExtension (const char* const in, char* const out, const size_t bytes)
-{
-    assert(in && out && (bytes || in == out)); // if this hits, check the call site
-    const size_t inlen = strlen(in);
-    ptrdiff_t len = inlen - 1;
-
-    if (len <= 1)
-    {
-        assert(bytes >= 2); // if this hits, bad buffer was passed in
-        cry_strcpy(out, bytes, in);
-        return;
-    }
-
-    while (in[len])
-    {
-        if (in[len] == '.')
-        {
-            int n = (int)len;
-            while (in[n] != 0)
-            {
-                if (in[n] == '+')
-                {
-                    assert(bytes > inlen); // if this hits, bad buffer was passed in
-                    cry_strcpy(out, bytes, in);
-                    return;
-                }
-                n++;
-            }
-            break;
-        }
-        len--;
-        if (!len)
-        {
-            assert(bytes > inlen); // if this hits, bad buffer was passed in
-            cry_strcpy(out, bytes, in);
-            return;
-        }
-    }
-    assert(bytes > len); // if this hits, bad buffer was passed in
-    cry_strcpy(out, bytes, in, len);
-}
-
-//return a pointer to the last dot after the last slash
-const char* fpGetExtension(const char* in)
-{
-    if (!in)
-    {
-        return nullptr;
-    }
-
-    const char* ls1 = strrchr(in, '\\');
-    const char* ls2 = strrchr(in, '/');
-    const char* sb = in;
-
-    if (ls1)
-    {
-        sb = ls1;
-    }
-
-    if (ls2 > sb)
-    {
-        sb = ls2;
-    }
-
-    return strrchr(sb, '.');
-}
-
-void fpAddExtension(char* path, const char* extension, size_t bytes)
-{
-    assert(path && extension && bytes); // if this hits, check the call site
-    char* src;
-
-    assert(*path); // if this hits, src underflow
-    src = path + strlen(path) - 1;
-
-    while (*src != '/' && src != path)
-    {
-        if (*src == '.')
-        {
-            return;                 // it has an extension
-        }
-        src--;
-    }
-
-    assert(bytes > strlen(path) + strlen(extension)); // if this hits, bad buffer was passed in
-    azstrcat(path, bytes, extension);
-}
-
-void fpConvertDOSToUnixName(char* dst, const char* src, [[maybe_unused]] size_t bytes)
-{
-    assert(dst && src && bytes); // if this hits, check the call site
-    assert(bytes > strlen(src)); // if this hits, bad buffer was passed in
-    while (*src)
-    {
-        if (*src == '\\')
-        {
-            *dst = '/';
-        }
-        else
-        {
-            *dst = *src;
-        }
-        dst++;
-        src++;
-    }
-    *dst = 0;
-}
-
-void fpConvertUnixToDosName(char* dst, const char* src, [[maybe_unused]] size_t bytes)
-{
-    assert(dst && src && bytes); // if this hits, check the call site
-    assert(bytes > strlen(src)); // if this hits, bad buffer was passed in
-    while (*src)
-    {
-        if (*src == '/')
-        {
-            *dst = '\\';
-        }
-        else
-        {
-            *dst = *src;
-        }
-        dst++;
-        src++;
-    }
-    *dst = 0;
-}
-
-void fpUsePath(const char* name, const char* path, char* dst, size_t bytes)
-{
-    assert(name && dst && bytes); // if this hits, check the call site
-
-    if (!path)
-    {
-        assert(bytes > strlen(name)); // if this hits, bad buffer was passed in
-        azstrcpy(dst, bytes, name);
-        return;
-    }
-
-    assert(bytes > strlen(path)); // if this hits, bad buffer was passed in
-    azstrcpy(dst, bytes, path);
-
-    assert(*path); // if this hits, path underflow
-    char c = path[strlen(path) - 1];
-    if (c != '/' && c != '\\')
-    {
-        assert(bytes > strlen(path) + strlen(name) + 1); // it this hits, bad buffer was passed in
-        azstrcat(dst, bytes, "/");
-    }
-    else
-    {
-        assert(bytes > strlen(path) + strlen(name)); // it this hits, bad buffer was passed in
-    }
-    azstrcat(dst, bytes, name);
-}
-
-#include "TypeInfo_impl.h"
-#include "ResFile_info.h"
-#ifndef AZ_MONOLITHIC_BUILD
-#include "Name_TypeInfo.h"
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/ResFile.h b/Code/CryEngine/RenderDll/Common/ResFile.h
deleted file mode 100644
index 0908f01f01..0000000000
--- a/Code/CryEngine/RenderDll/Common/ResFile.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __RESFILE_H__
-#define __RESFILE_H__
-
-#include "CryName.h"
-
-#define IDRESHEADER     (('K' << 24) + ('C' << 16) + ('P' << 8) + 'C')
-#define RESVERSION_DEBUG  12 // Uncompressed
-
-// defines the current compression for any files written
-#define RES_COMPRESSION RESVERSION_DEBUG
-
-// Resource files flags
-#define RF_NOTSAVED 1
-#define RF_COMPRESS 4
-#define RF_TEMPDATA 8
-#define RF_COMPRESSED 0x80
-#define RF_RES_$TOKENS 0x20
-#define RF_RES_$ (RF_RES_$TOKENS)
-
-struct SResFileLookupData;
-class CResFileLookupDataMan;
-
-// Resource header
-struct SFileResHeader
-{
-    uint32 hid;
-    int  ver;
-    int num_files;
-    //int num_files_ref;
-    uint32 ofs_dir;
-    uint32 num_files_ref;
-    AUTO_STRUCT_INFO
-};
-
-#define MAX_FILE_NAME 256
-
-#define OFFSET_BIG_POSITIVE 0x20000000
-
-struct SDirEntryOpen
-{
-    CCryNameTSCRC Name;
-    uint32 curOffset;
-    void* pData;
-    int nSize;
-
-    SDirEntryOpen()
-    {
-        pData = NULL;
-        nSize = 0;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-};
-
-// Internal file entry
-struct SDirEntry
-{
-    CCryNameTSCRC Name;
-    uint32 size : 24;
-    uint32 flags : 8;   // RF_
-    int32 offset;
-
-    SDirEntry()
-    {
-        size = 0;
-        flags = 0;
-        offset = 0;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-
-    AUTO_STRUCT_INFO
-};
-
-struct SDirEntryRef
-{
-    CCryNameTSCRC Name;
-    uint32 ref;
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-
-    AUTO_STRUCT_INFO
-};
-
-//typedef std::map<CCryNameTSCRC, int> ResFilesMap;
-//typedef ResFilesMap::iterator ResFilesMapItor;
-
-// Resource access types
-#define RA_READ   1
-#define RA_WRITE  2
-#define RA_CREATE 4
-#define RA_ENDIANS 8
-
-
-// Resource optimize flags
-#define RO_HEADERS_IN_BEGIN 1
-#define RO_HEADERS_IN_END 2
-#define RO_HEADER_FILE 4
-#define RO_SORT_ALPHA_ASC 8
-#define RO_SORT_ALPHA_DESC 0x10
-
-#define MAX_OPEN_RESFILES 64
-typedef AZStd::vector<SDirEntry, AZ::StdLegacyAllocator> ResDir;
-typedef ResDir::iterator ResDirIt;
-
-typedef AZStd::vector<SDirEntryRef, AZ::StdLegacyAllocator> ResDirRef;
-typedef ResDirRef::iterator ResDirRefIt;
-
-typedef AZStd::vector<SDirEntryOpen, AZ::StdLegacyAllocator> ResDirOpen;
-typedef ResDirOpen::iterator ResDirOpenIt;
-
-#define MAX_DIR_SIZE      (2 * 1024 * 1024)   // Directory size in memory (consoles only)
-
-class CResFile
-{
-    friend class CResStreamCallback;
-    friend class CResStreamDirCallback;
-    friend class CResFileLookupDataMan;
-    friend class CShaderSerialize;
-
-private:
-    string m_name;
-    const char* m_szAccess;
-    AZ::IO::HandleType m_fileHandle;
-    ResDir m_Dir;
-    ResDirRef m_DirRef;
-    ResDirOpen m_DirOpen;
-    byte* m_pCompressedDir;
-    int m_typeaccess;
-    uint32 m_nNumFilesUnique;
-    uint32 m_nNumFilesRef;
-    uint32 m_nOffsDir;
-    uint32 m_nComprDirSize;
-    int32  m_nOffset;
-    byte m_bSwapEndianRead : 1;
-    byte m_bSwapEndianWrite : 1;
-    byte m_bDirty : 1;
-    byte m_bDirValid : 1;
-    byte m_bDirStreaming : 1;
-    byte m_bDirCompressed : 1;
-    byte m_bActive : 1;
-    uint32 m_nLastTickStreamed;
-    string m_ermes;
-    int m_version;
-    SResStreamInfo* m_pStreamInfo;
-
-    const SResFileLookupData* m_pLookupData;
-    class CResFileLookupDataMan* m_pLookupDataMan;
-
-    static CResFile m_Root;
-    static CResFile m_RootStream;
-    static uint32 m_nSizeComprDir;
-    CResFile* m_Next;
-    CResFile* m_Prev;
-    CResFile* m_NextStream;
-    CResFile* m_PrevStream;
-
-    bool mfActivate(bool bFirstTime);
-
-    _inline void Relink(CResFile* Before)
-    {
-        if (m_Next && m_Prev)
-        {
-            m_Next->m_Prev = m_Prev;
-            m_Prev->m_Next = m_Next;
-        }
-        m_Next = Before->m_Next;
-        Before->m_Next->m_Prev = this;
-        Before->m_Next = this;
-        m_Prev = Before;
-    }
-    _inline void Unlink()
-    {
-        if (!m_Next || !m_Prev)
-        {
-            return;
-        }
-        m_Next->m_Prev = m_Prev;
-        m_Prev->m_Next = m_Next;
-        m_Next = m_Prev = NULL;
-    }
-    _inline void Link(CResFile* Before)
-    {
-        if (m_Next || m_Prev)
-        {
-            return;
-        }
-        m_Next = Before->m_Next;
-        Before->m_Next->m_Prev = this;
-        Before->m_Next = this;
-        m_Prev = Before;
-    }
-
-    _inline void UnlinkStream()
-    {
-        if (!m_NextStream || !m_PrevStream)
-        {
-            return;
-        }
-        m_NextStream->m_PrevStream = m_PrevStream;
-        m_PrevStream->m_NextStream = m_NextStream;
-        m_NextStream = m_PrevStream = NULL;
-    }
-    _inline void LinkStream(CResFile* Before)
-    {
-        if (m_NextStream || m_PrevStream)
-        {
-            return;
-        }
-        m_NextStream = Before->m_NextStream;
-        Before->m_NextStream->m_PrevStream = this;
-        Before->m_NextStream = this;
-        m_PrevStream = Before;
-    }
-
-public:
-    CResFile(const char* name);
-    ~CResFile();
-
-    _inline CResFileLookupDataMan* GetLookupMan() const
-    {
-        return m_pLookupDataMan;
-    }
-
-    SResFileLookupData* GetLookupData(bool bCreate, uint32 CRC, float fVersion) const;
-
-    const char* mfGetError(void);
-    void mfSetError(const char* er, ...);
-    const char* mfGetFileName() const {return m_name.c_str(); }
-    int mfGetVersion() { return m_version; }
-    void mfDeactivate(bool bReleaseDir);
-
-    void mfTickStreaming();
-
-    int mfOpen(int type, CResFileLookupDataMan* pMan, SResStreamInfo* pStreamInfo = NULL);
-    bool mfClose();
-    int mfFlush(bool bCompressDir = false);
-    int mfFlushDir(long nSeek, bool bOptimise);
-    bool mfPrepareDir();
-    int mfLoadDir(SResStreamInfo* pStreamInfo);
-    void mfReleaseDir();
-
-    int mfGetNumFiles() { return m_Dir.size(); }
-
-    byte* mfFileReadCompressed(SDirEntry* de, uint32& nSizeDecomp, uint32& nSizeComp);
-
-    int mfFileRead(SDirEntry* de);
-    int mfFileRead(const char* name);
-    int mfFileRead(CCryNameTSCRC name);
-
-    int mfFileWrite(CCryNameTSCRC name, void* data);
-
-    void  mfFileRead2(SDirEntry* de, int size, void* buf);
-    void  mfFileRead2(CCryNameTSCRC name, int size, void* buf);
-
-    void* mfFileGetBuf(SDirEntry* de);
-    void* mfFileGetBuf(CCryNameTSCRC name);
-
-    int mfFileSeek(SDirEntry* de, int offs, int type);
-    int mfFileSeek(CCryNameTSCRC name, int offs, int type);
-    int mfFileSeek(char* name, int offs, int type);
-
-    int mfFileLength(SDirEntry* de);
-    int mfFileLength(CCryNameTSCRC name);
-    int mfFileLength(char* name);
-
-    int mfFileAdd(SDirEntry* de);
-
-    bool mfIsDirty() { return m_bDirty; }
-    bool mfIsDirStreaming() { return m_bDirStreaming; }
-
-    //int mfFileDelete(SDirEntry *de);
-    //int mfFileDelete(CCryNameTSCRC name);
-    //int mfFileDelete(char* name);
-
-    bool mfFileExist(CCryNameTSCRC name);
-    bool mfFileExist(const char* name);
-
-    int mfFileClose(SDirEntry* de);
-    bool mfCloseEntry(SDirEntry* de, bool bEraseOpenEntry = true);
-    SDirEntryOpen* mfOpenEntry(SDirEntry* de, bool readingIntoEntryData = true);
-    SDirEntryOpen* mfGetOpenEntry(SDirEntry* de);
-    SDirEntry* mfGetEntry(CCryNameTSCRC name, bool* bAsync = NULL);
-    ResDir* mfGetDirectory();
-
-    AZ::IO::HandleType mfGetHandle() { return m_fileHandle; }
-    int mfGetResourceSize();
-
-    uint64 mfGetModifTime();
-
-    int Size();
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    static void Tick();
-    static bool IsStreaming();
-
-    static uint32 m_nMaxOpenResFiles;
-    static int m_nNumOpenResources;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RESFILE_H
diff --git a/Code/CryEngine/RenderDll/Common/ResFileLookupDataMan.cpp b/Code/CryEngine/RenderDll/Common/ResFileLookupDataMan.cpp
deleted file mode 100644
index 8c0b859591..0000000000
--- a/Code/CryEngine/RenderDll/Common/ResFileLookupDataMan.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "Pak/CryPakUtils.h"
-#include "ResFileLookupDataMan.h"
-#include "ResFile.h"
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/IO/ByteContainerStream.h>
-
-#include "Shaders/Shader.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-SResFileLookupDataDisk::SResFileLookupDataDisk(const struct SResFileLookupData& inLookup)
-{
-    m_NumOfFilesUnique = inLookup.m_NumOfFilesUnique;
-    m_NumOfFilesRef = inLookup.m_NumOfFilesRef;
-    m_OffsetDir = inLookup.m_OffsetDir;
-    m_CRC32 = inLookup.m_CRC32;
-    m_CacheMajorVer = inLookup.m_CacheMajorVer;
-    m_CacheMinorVer = inLookup.m_CacheMinorVer;
-}
-
-#ifdef USE_PARTIAL_ACTIVATION
-unsigned int SResFileLookupData::GetDirOffset(
-    const CCryNameTSCRC& dirEntryName) const
-{
-    if (m_resdirlookup.size() == 0)
-    {
-        return 0;
-    }
-
-    /*
-    if (m_resdirlookup.size() > 0)
-    {
-    char acTmp[1024];
-    sprintf(acTmp, "dir values: ");
-    OutputDebugString(acTmp);
-    for (unsigned int ui = 0; ui < m_resdirlookup.size(); ++ui)
-    {
-    sprintf(acTmp, " %u ", m_resdirlookup[ui]);
-    OutputDebugString(acTmp);
-    }
-    sprintf(acTmp, " \n");
-    OutputDebugString(acTmp);
-    }
-    */
-
-    unsigned int uiOffset = 0;
-    for (; uiOffset < m_resdirlookup.size() - 1; ++uiOffset)
-    {
-        if (m_resdirlookup[uiOffset + 1] > dirEntryName)
-        {
-            break;
-        }
-    }
-
-    return uiOffset;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-
-CResFileLookupDataMan::CResFileLookupDataMan()
-    : m_TotalDirStored(0)
-{
-    m_bDirty = false;
-    m_bReadOnly = true;
-
-    m_VersionInfo.m_ResVersion = RES_COMPRESSION;
-
-    float fVersion = FX_CACHE_VER;
-    azsprintf(m_VersionInfo.m_szCacheVer, "Ver: %.1f", fVersion);
-}
-
-CResFileLookupDataMan::~CResFileLookupDataMan()
-{
-    if (m_bDirty)
-    {
-        Flush();
-    }
-    Clear();
-}
-
-CCryNameTSCRC CResFileLookupDataMan::AdjustName(const char* szName)
-{
-    char acTmp[1024];
-    int nSize = gRenDev->m_cEF.m_szCachePath.size();
-    if (!_strnicmp(szName, gRenDev->m_cEF.m_szCachePath.c_str(), nSize))
-    {
-        azstrcpy(acTmp, AZ_ARRAY_SIZE(acTmp), &szName[nSize]);
-    }
-    else if (!_strnicmp(szName, "Levels", 6))
-    {
-        const char* acNewName = strstr(szName, "ShaderCache");
-        assert(acNewName);
-        PREFAST_ASSUME(acNewName);
-        azstrcpy(acTmp, AZ_ARRAY_SIZE(acTmp), acNewName);
-    }
-    else
-    {
-        azstrcpy(acTmp, AZ_ARRAY_SIZE(acTmp), szName);
-    }
-
-    return acTmp;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-
-void CResFileLookupDataMan::Clear()
-{
-    m_Data.clear();
-}
-
-void CResFileLookupDataMan::Flush()
-{
-    if (!m_bDirty)
-    {
-        return;
-    }
-    SaveData(m_Path.c_str(), CParserBin::m_bEndians);
-    m_bDirty = false;
-}
-
-bool CResFileLookupDataMan::LoadData(
-    const char* acFilename, bool bSwapEndianRead, bool bReadOnly)
-{
-    m_Path = acFilename;
-
-    m_bReadOnly = bReadOnly;
-
-    int nFlags = bReadOnly ? 0 : AZ::IO::IArchive::FLAGS_NEVER_IN_PAK | AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FOPEN_ONDISK;
-
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(acFilename, "rb", nFlags);
-    if (fileHandle == AZ::IO::InvalidHandle)
-    {
-        return false;
-    }
-
-    uint32 hid;
-
-    SVersionInfo versionInfo;
-
-    gEnv->pCryPak->FReadRaw(&hid, sizeof(uint32), 1, fileHandle);
-    gEnv->pCryPak->FReadRaw(&versionInfo, sizeof(SVersionInfo), 1, fileHandle);
-
-    if (bSwapEndianRead)
-    {
-        SwapEndian(hid, eBigEndian);
-        SwapEndian(versionInfo, eBigEndian);
-    }
-
-    if (hid != IDRESHEADER)
-    {
-        gEnv->pCryPak->FClose(fileHandle);
-        return false;
-    }
-    if (versionInfo.m_ResVersion != RESVERSION_DEBUG)
-    {
-        gEnv->pCryPak->FClose(fileHandle);
-        return false;
-    }
-
-    float fVersion = FX_CACHE_VER;
-    char cacheVer[16] = {0};
-    azsprintf(cacheVer, "Ver: %.1f", fVersion);
-    if (strcmp(cacheVer, versionInfo.m_szCacheVer))
-    {
-        gEnv->pCryPak->FClose(fileHandle);
-        return false;
-    }
-
-    m_VersionInfo = versionInfo;
-
-    unsigned int uiCount;
-    gEnv->pCryPak->FReadRaw(&uiCount, sizeof(unsigned int), 1, fileHandle);
-
-    if (bSwapEndianRead)
-    {
-        SwapEndian(uiCount, eBigEndian);
-    }
-
-    CCryNameTSCRC name;
-    SDirEntry dirEntry;
-    CCryNameTSCRC dirEntryName;
-    unsigned int ui;
-    for (ui = 0; ui < uiCount; ++ui)
-    {
-        gEnv->pCryPak->FReadRaw(&name, sizeof(CCryNameTSCRC), 1, fileHandle);
-        if (bSwapEndianRead)
-        {
-            SwapEndian(name, eBigEndian);
-        }
-
-        SResFileLookupDataDisk dirDataDisk;
-
-#ifndef USE_PARTIAL_ACTIVATION
-
-        gEnv->pCryPak->FReadRaw(&dirDataDisk, sizeof(SResFileLookupDataDisk), 1, fileHandle);
-        if (bSwapEndianRead)
-        {
-            SwapEndian(dirDataDisk, eBigEndian);
-        }
-        SResFileLookupData dirData(dirDataDisk);
-
-#else
-
-        gEnv->pCryPak->FReadRaw(&dirData.m_NumOfFilesUnique, sizeof(int), 1, fileHandle);
-        gEnv->pCryPak->FReadRaw(&dirData.m_NumOfFilesRef, sizeof(int), 1, fileHandle);
-        gEnv->pCryPak->FReadRaw(&dirData.m_OffsetDir, sizeof(uint32), 1, fileHandle);
-        gEnv->pCryPak->FReadRaw(&dirData.m_CRC32, sizeof(uint32), 1, fileHandle);
-
-        if (bSwapEndianRead)
-        {
-            SwapEndian(dirData.m_NumOfFilesUnique, eBigEndian);
-            SwapEndian(dirData.m_NumOfFilesRef, eBigEndian);
-            SwapEndian(dirData.m_OffsetDir, eBigEndian);
-            SwapEndian(dirData.m_CRC32, eBigEndian);
-        }
-
-        gEnv->pCryPak->FReadRaw(&dirData.m_ContainsResDir, sizeof(bool), 1, fileHandle);
-        unsigned int uiDirSize;
-        gEnv->pCryPak->FReadRaw(&uiDirSize, sizeof(unsigned int), 1, fileHandle);
-        if (bSwapEndianRead)
-        {
-            SwapEndian(uiDirSize, eBigEndian);
-        }
-        if (dirData.m_ContainsResDir)
-        {
-            dirData.m_resdir.reserve(uiDirSize);
-            for (unsigned int uj = 0; uj < uiDirSize; ++uj)
-            {
-                gEnv->pCryPak->FReadRaw(&dirEntry, sizeof(SDirEntry), 1, fileHandle);
-                if (bSwapEndianRead)
-                {
-                    SwapEndian(dirEntry, eBigEndian);
-                }
-                dirData.m_resdir.push_back(dirEntry);
-            }
-        }
-        else
-        {
-            dirData.m_resdirlookup.reserve(uiDirSize);
-            for (unsigned int uj = 0; uj < uiDirSize; ++uj)
-            {
-                gEnv->pCryPak->FReadRaw(&dirEntryName, sizeof(CCryNameTSCRC), 1, fileHandle);
-                if (bSwapEndianRead)
-                {
-                    SwapEndian(dirEntryName, eBigEndian);
-                }
-                dirData.m_resdirlookup.push_back(dirEntryName);
-            }
-        }
-#endif
-
-        m_Data[name] = dirData;
-    }
-
-    gEnv->pCryPak->FReadRaw(&uiCount, sizeof(unsigned int), 1, fileHandle);
-    if (bSwapEndianRead)
-    {
-        SwapEndian(uiCount, eBigEndian);
-    }
-    for (ui = 0; ui < uiCount; ++ui)
-    {
-        gEnv->pCryPak->FReadRaw(&name, sizeof(CCryNameTSCRC), 1, fileHandle);
-        if (bSwapEndianRead)
-        {
-            SwapEndian(name, eBigEndian);
-        }
-
-        SCFXLookupData CFXData;
-        gEnv->pCryPak->FReadRaw(&CFXData, sizeof(CFXData), 1, fileHandle);
-        if (bSwapEndianRead)
-        {
-            SwapEndian(CFXData, eBigEndian);
-        }
-
-        m_CFXData[name] = CFXData;
-    }
-
-    gEnv->pCryPak->FClose(fileHandle);
-
-    return true;
-}
-
-void CResFileLookupDataMan::SaveData(
-    const char* acFilename, bool bSwapEndianWrite) const
-{
-    // ignore invalid file access for lookupdata because it shouldn't be written
-    // when shaders no compile is set anyway
-    CDebugAllowFileAccess ignoreInvalidFileAccess;
-
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(acFilename, "w+b");
-    if (fileHandle == AZ::IO::InvalidHandle)
-    {
-        return;
-    }
-
-    using ByteStoreType = AZStd::vector<char>;
-    ByteStoreType byteStore;
-    AZ::IO::ByteContainerStream<ByteStoreType> byteStream(&byteStore);
-
-    uint32 hid = IDRESHEADER;
-
-    SVersionInfo versionInfo;
-    versionInfo.m_ResVersion = RES_COMPRESSION;
-
-    float fVersion = FX_CACHE_VER;
-    azsprintf(versionInfo.m_szCacheVer, "Ver: %.1f", fVersion);
-
-    if (bSwapEndianWrite)
-    {
-        SwapEndian(hid, eBigEndian);
-        SwapEndian(versionInfo, eBigEndian);
-    }
-
-    byteStream.Write(&hid);
-    byteStream.Write(&versionInfo);
-
-    unsigned int uiCount = m_Data.size();
-    if (bSwapEndianWrite)
-    {
-        SwapEndian(uiCount, eBigEndian);
-    }
-    byteStream.Write(&uiCount);
-
-    for (TFileResDirDataMap::const_iterator it = m_Data.begin(); it != m_Data.end(); ++it)
-    {
-        CCryNameTSCRC name = it->first;
-        if (bSwapEndianWrite)
-        {
-            SwapEndian(name, eBigEndian);
-        }
-        byteStream.Write(&name);
-
-#ifndef USE_PARTIAL_ACTIVATION
-        SResFileLookupDataDisk header(it->second);
-        if (bSwapEndianWrite)
-        {
-            SwapEndian(header, eBigEndian);
-        }
-        byteStream.Write(&header);
-#else
-        const SResFileLookupData& header = it->second;
-        int numOfFilesUnique = header.m_NumOfFilesUnique;
-        int numOfFilesRef = header.m_NumOfFilesRef;
-        uint32 offsetDir = header.m_OffsetDir;
-        uint32 crc = header.m_CRC32;
-        if (bSwapEndianWrite)
-        {
-            SwapEndian(numOfFilesUnique, eBigEndian);
-            SwapEndian(numOfFilesRef, eBigEndian);
-            SwapEndian(offsetDir, eBigEndian);
-            SwapEndian(crc, eBigEndian);
-        }
-        byteStream.Write(&numOfFilesUnique);
-        byteStream.Write(&numOfFilesRef);
-        byteStream.Write(&offsetDir);
-        byteStream.Write(&crc);
-
-        byteStream.Write(&header.m_ContainsResDir);
-
-        if (header.m_ContainsResDir)
-        {
-            unsigned int uiDirSize = header.m_resdir.size();
-            if (bSwapEndianWrite)
-            {
-                SwapEndian(uiDirSize, eBigEndian);
-            }
-            byteStream.Write(&uiDirSize);
-
-            for (ResDir::const_iterator it2 = header.m_resdir.begin(); it2 != header.m_resdir.end(); ++it2)
-            {
-                SDirEntry dirEntry = *it2;
-                if (bSwapEndianWrite)
-                {
-                    SwapEndian(dirEntry, eBigEndian);
-                }
-                byteStream.Write(&dirEntry);
-            }
-        }
-        else
-        {
-            unsigned int uiDirSize = header.m_resdirlookup.size();
-            if (bSwapEndianWrite)
-            {
-                SwapEndian(uiDirSize, eBigEndian);
-            }
-            byteStream.Write(&uiDirSize);
-
-            for (TResDirNames::const_iterator it2 = header.m_resdirlookup.begin(); it2 != header.m_resdirlookup.end(); ++it2)
-            {
-                CCryNameTSCRC dirEntryName = *it2;
-                if (bSwapEndianWrite)
-                {
-                    SwapEndian(dirEntryName, eBigEndian);
-                }
-                byteStream.Write(&dirEntryName);
-            }
-        }
-#endif
-    }
-
-    uiCount = m_CFXData.size();
-    if (bSwapEndianWrite)
-    {
-        SwapEndian(uiCount, eBigEndian);
-    }
-    byteStream.Write(&uiCount);
-    for (TFileCFXDataMap::const_iterator it = m_CFXData.begin(); it != m_CFXData.end(); ++it)
-    {
-        CCryNameTSCRC name = it->first;
-        if (bSwapEndianWrite)
-        {
-            SwapEndian(name, eBigEndian);
-        }
-        byteStream.Write(&name);
-        SCFXLookupData CFXData = it->second;
-        if (bSwapEndianWrite)
-        {
-            SwapEndian(CFXData, eBigEndian);
-        }
-        byteStream.Write(&CFXData);
-    }
-
-    gEnv->pCryPak->FWrite(byteStream.GetData()->data(), byteStream.GetLength(), 1, fileHandle);
-    gEnv->pCryPak->FClose(fileHandle);
-}
-
-void CResFileLookupDataMan::AddData(const CResFile* pResFile, uint32 CRC)
-{
-    if (pResFile == 0)
-    {
-        return;
-    }
-
-    SResFileLookupData data;
-
-    // store the dir data
-    data.m_OffsetDir = pResFile->m_nOffsDir;
-    data.m_NumOfFilesUnique = pResFile->m_nNumFilesUnique;
-    data.m_NumOfFilesRef = pResFile->m_nNumFilesRef;
-
-    float fVersion = FX_CACHE_VER;
-    uint32 nMinor = (int)(((float)fVersion - (float)(int)fVersion) * 10.1f);
-    uint32 nMajor = (int)fVersion;
-    data.m_CacheMinorVer = nMinor;
-    data.m_CacheMajorVer = nMajor;
-
-    data.m_CRC32 = CRC;
-
-#ifdef USE_PARTIAL_ACTIVATION
-    // create the lookup data for the resdir
-    if (pResFile->m_Dir.size() < 128)
-    {
-        data.m_ContainsResDir = true;
-
-        m_TotalDirStored++;
-
-        // just copy the whole vector
-        data.m_resdir = pResFile->m_Dir;
-        /*
-        data.m_resdir.reserve(pResFile->m_Dir.size());
-        for (unsigned int ui = 0; ui < pResFile->m_Dir.size(); ++ui)
-        {
-        data.m_resdir.push_back(pResFile->m_Dir[0]);
-        }
-        memcpy(&data.m_resdir[0], &pResFile->m_Dir[0], sizeof(SDirEntry) * pResFile->m_Dir.size());
-        */
-    }
-    else
-    {
-        data.m_ContainsResDir = false;
-
-        unsigned int entries = 0;
-        unsigned int entriesPerSlice = MAX_DIR_BUFFER_SIZE / sizeof(SDirEntry);
-        while ((entries * entriesPerSlice) < pResFile->m_Dir.size())
-        {
-            data.m_resdirlookup.push_back(pResFile->m_Dir[entries * entriesPerSlice].Name);
-            entries++;
-        }
-    }
-#endif
-
-    const char* acOrigFilename = pResFile->mfGetFileName();
-    AddDataCFX(acOrigFilename, CRC);
-
-    // remove the user info, if available
-    CCryNameTSCRC name = AdjustName(acOrigFilename);
-
-    // simply overwrite the data if it was already in here
-    m_Data[name] = data;
-}
-
-void CResFileLookupDataMan::AddDataCFX(const char* acOrigFilename, uint32 CRC)
-{
-    char nm[256], nmDir[512];
-#ifdef AZ_COMPILER_MSVC
-    _splitpath_s(acOrigFilename, NULL, 0, nmDir, AZ_ARRAY_SIZE(nmDir), nm, AZ_ARRAY_SIZE(nm), NULL, 0);
-#else
-    _splitpath(acOrigFilename, NULL, nmDir, nm, NULL);
-#endif
-    {
-        char* s = strchr(nm, '@');
-        //assert(s);
-        if (s)
-        {
-            s[0] = 0;
-        }
-    }
-
-    CCryNameTSCRC nameCFX = nm;
-    SCFXLookupData CFX;
-    CFX.m_CRC32 = CRC;
-    m_CFXData[nameCFX] = CFX;
-}
-
-void CResFileLookupDataMan::RemoveData(uint32 CRC)
-{
-    {
-        TFileResDirDataMap tmpData;
-        for (TFileResDirDataMap::iterator it = m_Data.begin(); it != m_Data.end(); ++it)
-        {
-            SResFileLookupData& data = it->second;
-            if (data.m_CRC32 != CRC)
-            {
-                tmpData[it->first] = data;
-            }
-        }
-        m_Data.swap(tmpData);
-    }
-
-    {
-        TFileCFXDataMap tmpData;
-        for (TFileCFXDataMap::iterator it = m_CFXData.begin(); it != m_CFXData.end(); ++it)
-        {
-            SCFXLookupData& data = it->second;
-            if (data.m_CRC32 != CRC)
-            {
-                tmpData[it->first] = data;
-            }
-        }
-        m_CFXData.swap(tmpData);
-    }
-}
-
-SResFileLookupData* CResFileLookupDataMan::GetData(
-    const CCryNameTSCRC& name)
-{
-    TFileResDirDataMap::iterator it = m_Data.find(name);
-    if (it == m_Data.end())
-    {
-        return 0;
-    }
-
-    return &it->second;
-}
-SCFXLookupData* CResFileLookupDataMan::GetDataCFX(
-    const char* szPath)
-{
-    char nm[256];
-#ifdef AZ_COMPILER_MSVC
-    _splitpath_s(szPath, NULL, 0, NULL, 0, nm, AZ_ARRAY_SIZE(nm), NULL, 0);
-#else
-    _splitpath(szPath, NULL, NULL, nm, NULL);
-#endif
-    CCryNameTSCRC name = nm;
-    TFileCFXDataMap::iterator it = m_CFXData.find(name);
-    if (it == m_CFXData.end())
-    {
-        return 0;
-    }
-
-    return &it->second;
-}
-
-//////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/Common/ResFileLookupDataMan.h b/Code/CryEngine/RenderDll/Common/ResFileLookupDataMan.h
deleted file mode 100644
index 6089d7d86e..0000000000
--- a/Code/CryEngine/RenderDll/Common/ResFileLookupDataMan.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __RESFILELOOKUPDATAMAN_H__
-#define __RESFILELOOKUPDATAMAN_H__
-
-#include "ResFile.h"
-
-typedef std::vector<CCryNameTSCRC> TResDirNames;
-
-struct SResFileLookupDataDisk
-{
-    int m_NumOfFilesUnique;
-    int m_NumOfFilesRef;
-    uint32 m_OffsetDir;
-    uint32 m_CRC32;
-    uint16 m_CacheMajorVer;
-    uint16 m_CacheMinorVer;
-
-    SResFileLookupDataDisk() {}
-    SResFileLookupDataDisk(const struct SResFileLookupData& inLookup);
-
-    AUTO_STRUCT_INFO
-};
-struct SResFileLookupData
-{
-    int m_NumOfFilesUnique;
-    int m_NumOfFilesRef;
-    uint32 m_OffsetDir;
-    uint32 m_CRC32;
-    uint16 m_CacheMajorVer;
-    uint16 m_CacheMinorVer;
-
-    SResFileLookupData() {}
-    SResFileLookupData(const SResFileLookupDataDisk& inLookup)
-    {
-        m_NumOfFilesUnique = inLookup.m_NumOfFilesUnique;
-        m_NumOfFilesRef = inLookup.m_NumOfFilesRef;
-        m_OffsetDir = inLookup.m_OffsetDir;
-        m_CRC32 = inLookup.m_CRC32;
-        m_CacheMajorVer = inLookup.m_CacheMajorVer;
-        m_CacheMinorVer = inLookup.m_CacheMinorVer;
-    }
-
-#ifdef USE_PARTIAL_ACTIVATION
-    bool m_ContainsResDir;
-
-    TResDirNames m_resdirlookup;
-    ResDir m_resdir;
-
-    unsigned int GetDirOffset(const CCryNameTSCRC& dirEntryName) const;
-#endif
-};
-
-struct SCFXLookupData
-{
-    uint32 m_CRC32;
-    SCFXLookupData() {}
-    AUTO_STRUCT_INFO
-};
-
-#define MAX_DIR_BUFFER_SIZE 300000
-
-typedef std::map<CCryNameTSCRC, SResFileLookupData> TFileResDirDataMap;
-typedef std::map<CCryNameTSCRC, SCFXLookupData> TFileCFXDataMap;
-
-class CResFile;
-
-struct SVersionInfo
-{
-    SVersionInfo()
-        : m_ResVersion(0)
-    { memset(m_szCacheVer, 0, sizeof(m_szCacheVer)); }
-
-    int m_ResVersion;
-    char m_szCacheVer[16];
-
-    AUTO_STRUCT_INFO
-};
-
-class CResFileLookupDataMan
-{
-public:
-    CResFileLookupDataMan();
-    ~CResFileLookupDataMan();
-
-    void Clear();
-    void Flush();
-
-    CCryNameTSCRC AdjustName(const char* szName);
-    int GetResVersion() const { return m_VersionInfo.m_ResVersion; }
-
-    bool LoadData(const char* acFilename, bool bSwapEndianRead, bool bReadOnly);
-    void SaveData(const char* acFilename, bool bSwapEndianWrite) const;
-
-    bool IsReadOnly() { return m_bReadOnly; }
-
-    void AddData(const CResFile* pResFile, uint32 CRC);
-    void AddDataCFX(const char* szPath, uint32 CRC);
-    void RemoveData(uint32 CRC);
-
-    SResFileLookupData* GetData(const CCryNameTSCRC& name);
-    SCFXLookupData* GetDataCFX(const char* szPath);
-    void MarkDirty(bool bDirty) { m_bDirty = bDirty; }
-
-
-protected:
-
-    string m_Path;
-    SVersionInfo m_VersionInfo;
-    TFileResDirDataMap m_Data;
-    TFileCFXDataMap m_CFXData;
-    unsigned int m_TotalDirStored;
-    byte m_bDirty : 1;
-    byte m_bReadOnly : 1;
-};
-
-#endif //  __RESFILELOOKUPDATAMAN_H__
diff --git a/Code/CryEngine/RenderDll/Common/ResFile_info.h b/Code/CryEngine/RenderDll/Common/ResFile_info.h
deleted file mode 100644
index 9390eccd1a..0000000000
--- a/Code/CryEngine/RenderDll/Common/ResFile_info.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RESFILE_INFO_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RESFILE_INFO_H
-#pragma once
-
-#include "ResFile.h"
-
-STRUCT_INFO_BEGIN(SFileResHeader)
-STRUCT_VAR_INFO(hid, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(ver, TYPE_INFO(int))
-STRUCT_VAR_INFO(num_files, TYPE_INFO(int))
-//STRUCT_VAR_INFO(num_files_ref, TYPE_INFO(int))
-STRUCT_VAR_INFO(ofs_dir, TYPE_INFO(int))
-STRUCT_VAR_INFO(num_files_ref, TYPE_INFO(uint32))
-STRUCT_INFO_END(SFileResHeader)
-
-STRUCT_INFO_BEGIN(SResFileLookupDataDisk)
-STRUCT_VAR_INFO(m_NumOfFilesUnique, TYPE_INFO(int))
-STRUCT_VAR_INFO(m_NumOfFilesRef, TYPE_INFO(int))
-STRUCT_VAR_INFO(m_OffsetDir, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_CRC32, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_CacheMajorVer, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_CacheMinorVer, TYPE_INFO(uint16))
-STRUCT_INFO_END(SResFileLookupDataDisk)
-
-STRUCT_INFO_BEGIN(SCFXLookupData)
-STRUCT_VAR_INFO(m_CRC32, TYPE_INFO(uint32))
-STRUCT_INFO_END(SCFXLookupData)
-
-STRUCT_INFO_BEGIN(CCryNameTSCRC)
-STRUCT_VAR_INFO(m_nID, TYPE_INFO(int))
-STRUCT_INFO_END(CCryNameTSCRC)
-
-STRUCT_INFO_BEGIN(SDirEntry)
-STRUCT_VAR_INFO(Name, TYPE_INFO(CCryNameTSCRC))
-STRUCT_BITFIELD_INFO(size, TYPE_INFO(uint32), 24)
-STRUCT_BITFIELD_INFO(flags, TYPE_INFO(uint32), 8)
-STRUCT_VAR_INFO(offset, TYPE_INFO(int32))
-STRUCT_INFO_END(SDirEntry)
-
-STRUCT_INFO_BEGIN(SDirEntryRef)
-STRUCT_VAR_INFO(Name, TYPE_INFO(CCryNameTSCRC))
-STRUCT_VAR_INFO(ref, TYPE_INFO(uint32))
-STRUCT_INFO_END(SDirEntryRef)
-
-STRUCT_INFO_BEGIN(SShaderBinHeader)
-STRUCT_VAR_INFO(m_Magic, TYPE_INFO(FOURCC))
-STRUCT_VAR_INFO(m_CRC32, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_VersionLow, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_VersionHigh, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_nOffsetStringTable, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_nOffsetParamsLocal, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_nTokens, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_nSourceCRC32, TYPE_INFO(uint32))
-STRUCT_INFO_END(SShaderBinHeader)
-
-STRUCT_INFO_BEGIN(SShaderBinParamsHeader)
-STRUCT_VAR_INFO(nMask, TYPE_INFO(uint64))
-STRUCT_VAR_INFO(nstaticMask, TYPE_INFO(uint64))
-STRUCT_VAR_INFO(nName, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(nParams, TYPE_INFO(int32))
-STRUCT_VAR_INFO(nFuncs, TYPE_INFO(int32))
-STRUCT_INFO_END(SShaderBinParamsHeader)
-
-STRUCT_INFO_BEGIN(SVersionInfo)
-STRUCT_VAR_INFO(m_ResVersion, TYPE_INFO(int))
-STRUCT_VAR_INFO(m_szCacheVer, TYPE_ARRAY(16, TYPE_INFO(char)))
-STRUCT_INFO_END(SVersionInfo)
-
-#if defined(SHADERS_SERIALIZING)
-
-STRUCT_INFO_BEGIN(SSShaderCacheHeader)
-STRUCT_VAR_INFO(m_SizeOf, TYPE_INFO(int))
-STRUCT_VAR_INFO(m_szVer, TYPE_ARRAY(16, TYPE_INFO(char)))
-STRUCT_VAR_INFO(m_MajorVer, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_MinorVer, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_CRC32, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(m_SourceCRC32, TYPE_INFO(uint32))
-STRUCT_INFO_END(SSShaderCacheHeader)
-
-#endif
-
-STRUCT_INFO_BEGIN(SShaderCacheHeaderItem)
-STRUCT_VAR_INFO(m_nVertexFormat, TYPE_INFO(byte))
-STRUCT_VAR_INFO(m_Class, TYPE_INFO(byte))
-STRUCT_VAR_INFO(m_nInstBinds, TYPE_INFO(byte))
-STRUCT_VAR_INFO(m_StreamMask_Stream, TYPE_INFO(byte))
-STRUCT_VAR_INFO(m_StreamMask_Decl, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(m_nInstructions, TYPE_INFO(short))
-STRUCT_VAR_INFO(m_CRC32, TYPE_INFO(uint32))
-//STRUCT_VAR_INFO(m_DeviceObjectID, TYPE_INFO(int))
-STRUCT_INFO_END(SShaderCacheHeaderItem)
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_RESFILE_INFO_H
diff --git a/Code/CryEngine/RenderDll/Common/ReverseDepth.h b/Code/CryEngine/RenderDll/Common/ReverseDepth.h
deleted file mode 100644
index f5107b8483..0000000000
--- a/Code/CryEngine/RenderDll/Common/ReverseDepth.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __REVERSE_DEPTH_H__
-#define __REVERSE_DEPTH_H__
-
-//#include "Cry_Matrix44.h"
-
-struct ReverseDepthHelper
-{
-    static Matrix44 Convert(const Matrix44& m)
-    {
-        Matrix44 result = m;
-        result.m02 = -m.m02 + m.m03;
-        result.m12 = -m.m12 + m.m13;
-        result.m22 = -m.m22 + m.m23;
-        result.m32 = -m.m32 + m.m33;
-
-        return result;
-    }
-
-    static D3DViewPort Convert(const D3DViewPort& vp)
-    {
-        D3DViewPort result = vp;
-        result.MinDepth = 1.0f - vp.MaxDepth;
-        result.MaxDepth = 1.0f - vp.MinDepth;
-
-        return result;
-    }
-
-    static uint32 ConvertDepthFunc(uint32 nState)
-    {
-        uint32 nDepthFuncRemapped = nState & GS_DEPTHFUNC_MASK;
-
-        switch (nState & GS_DEPTHFUNC_MASK)
-        {
-        case GS_DEPTHFUNC_LESS:
-            nDepthFuncRemapped = GS_DEPTHFUNC_GREAT;
-            break;
-
-        case GS_DEPTHFUNC_LEQUAL:
-            nDepthFuncRemapped = GS_DEPTHFUNC_GEQUAL;
-            break;
-
-        case GS_DEPTHFUNC_GREAT:
-            nDepthFuncRemapped = GS_DEPTHFUNC_LESS;
-            break;
-
-        case GS_DEPTHFUNC_GEQUAL:
-            nDepthFuncRemapped = GS_DEPTHFUNC_LEQUAL;
-            break;
-        }
-
-        nState &= ~GS_DEPTHFUNC_MASK;
-        nState |= nDepthFuncRemapped;
-
-        return nState;
-    }
-};
-
-#endif // __REVERSE_DEPTH_H__
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/CShader.h b/Code/CryEngine/RenderDll/Common/Shaders/CShader.h
deleted file mode 100644
index ea47769e6d..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/CShader.h
+++ /dev/null
@@ -1,702 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __CSHADER_H__
-#define __CSHADER_H__
-
-#include "CShaderBin.h"
-#include "ShaderSerialize.h"
-#include "ShaderCache.h"
-#include "../ResFileLookupDataMan.h"
-
-#include <unordered_map>
-#include <AzCore/std/parallel/mutex.h>
-
-#include <Terrain/Bus/TerrainBus.h>
-
-struct SRenderBuf;
-class CRendElementBase;
-struct SEmitter;
-struct SParticleInfo;
-struct SPartMoveStage;
-struct SSunFlare;
-
-//===================================================================
-
-#define MAX_ENVLIGHTCUBEMAPS 16
-#define ENVLIGHTCUBEMAP_SIZE 16
-#define MAX_ENVLIGHTCUBEMAPSCANDIST_UPDATE 16
-#define MAX_ENVLIGHTCUBEMAPSCANDIST_THRESHOLD 2
-
-#define MAX_ENVCUBEMAPS 16
-#define MAX_ENVCUBEMAPSCANDIST_THRESHOLD 1
-
-#define MAX_ENVTEXTURES 16
-#define MAX_ENVTEXSCANDIST 0.1f
-
-//===============================================================================
-
-struct SMacroFX
-{
-    string m_szMacro;
-    uint32 m_nMask;
-};
-
-typedef AZStd::unordered_map<string, SMacroFX, stl::hash_string<const char*>, stl::equality_string<const char*> > FXMacro;
-
-typedef FXMacro::iterator FXMacroItor;
-
-//////////////////////////////////////////////////////////////////////////
-// Helper class for shader parser, holds temporary strings vector etc...
-//////////////////////////////////////////////////////////////////////////
-struct CShaderParserHelper
-{
-    CShaderParserHelper()
-    {
-    }
-    ~CShaderParserHelper()
-    {
-    }
-
-    char* GetTempStringArray(int nIndex, int nLen)
-    {
-        m_tempString.reserve(nLen + 1);
-        return (char*)&(m_tempStringArray[nIndex])[0];
-    }
-
-    std::vector<char> m_tempStringArray[32];
-    std::vector<char> m_tempString;
-};
-extern CShaderParserHelper* g_pShaderParserHelper;
-
-enum EShaderFlagType
-{
-    eSFT_Global = 0,
-    eSFT_Runtime,
-    eSFT_MDV,
-    eSFT_LT,
-};
-
-enum EShaderFilterOperation
-{
-    eSFO_Expand = 0, // expand all permutations of the mask
-    eSFO_And,       // and against the mask
-    eSFO_Eq,        // set the mask
-};
-
-// includes or excludes
-struct CShaderListFilter
-{
-    CShaderListFilter()
-        : m_bInclude(true)
-    {}
-
-    bool m_bInclude;
-    string m_ShaderName;
-
-    struct Predicate
-    {
-        Predicate()
-            : m_Negated(false)
-            , m_Flags(eSFT_Global)
-            , m_Op(eSFO_And)
-            , m_Mask(0)
-        {}
-
-        bool m_Negated;
-        EShaderFlagType m_Flags;
-        EShaderFilterOperation m_Op;
-        uint64 m_Mask;
-    };
-    std::vector<Predicate> m_Predicates;
-};
-
-//==============================================================================
-
-#define PD_INDEXED 1
-#define PD_MERGED  4
-
-//==============================================================================
-// [Shader System] - the following structures represent the raw data parsed from 
-// the shaders.  It is in a way part of a processor semi reflection mechanism.
-// To Do:   inherit and share usage
-//------------------------------------------------------------------------------
-struct SParamDB
-{
-    const char* szName;
-    const char* szAliasName;
-    ECGParam eParamType;
-    uint32 nFlags;
-    void (* ParserFunc)(const char* szScr, const char* szAnnotations, std::vector<STexSamplerFX>* pSamplers, SCGParam* vpp, int nComp, CShader* ef);
-    SParamDB()
-        : szName(nullptr)
-        , szAliasName(nullptr)
-        , eParamType(ECGP_Unknown)
-        , nFlags(0)
-        , ParserFunc(nullptr)
-    {
-    }
-    SParamDB(const char* inName, ECGParam ePrmType, uint32 inFlags)
-    {
-        szName = inName;
-        szAliasName = NULL;
-        nFlags = inFlags;
-        ParserFunc = NULL;
-        eParamType = ePrmType;
-    }
-    SParamDB(const char* inName, ECGParam ePrmType, uint32 inFlags, void (*InParserFunc)(const char* szScr, const char* szAnnotations, std::vector<STexSamplerFX>* pSamplers, SCGParam * vpp, int nComp, CShader * ef))
-    {
-        szName = inName;
-        szAliasName = NULL;
-        nFlags = inFlags;
-        ParserFunc = InParserFunc;
-        eParamType = ePrmType;
-    }
-};
-
-struct SSamplerDB
-{
-    const char* szName;
-    ECGSampler eSamplerType;
-    uint32 nFlags;
-    void (* ParserFunc)(const char* szScr, const char* szAnnotations, std::vector<SFXSampler>* pSamplers, SCGSampler* vpp, CShader* ef);
-    SSamplerDB()
-    {
-        szName = NULL;
-        nFlags = 0;
-        ParserFunc = NULL;
-        eSamplerType = ECGS_Unknown;
-    }
-    SSamplerDB(const char* inName, ECGSampler ePrmType, uint32 inFlags)
-    {
-        szName = inName;
-        nFlags = inFlags;
-        ParserFunc = NULL;
-        eSamplerType = ePrmType;
-    }
-    SSamplerDB(const char* inName, ECGSampler ePrmType, uint32 inFlags, void (*InParserFunc)(const char* szScr, const char* szAnnotations, std::vector<SFXSampler>* pSamplers, SCGSampler * vpp, CShader * ef))
-    {
-        szName = inName;
-        nFlags = inFlags;
-        ParserFunc = InParserFunc;
-        eSamplerType = ePrmType;
-    }
-};
-
-//------------------------------------------------------------------------------
-// [Shaders System]
-// szName- a texture functional name which is only used here - possibly obsolete.
-// The texture type is not a type but a slot mapping - should be changed
-// nFlags- does not seem to be in use.  Should be tested if used / removed if possible.
-// ParserFunc - is not set anywhere and should be removed.
-//------------------------------------------------------------------------------
-struct STextureDB
-{
-    const char* szName;
-    ECGTexture eTextureType;
-    uint32 nFlags;
-    void (* ParserFunc)(const char* szScr, const char* szAnnotations, std::vector<SFXTexture>* pSamplers, SCGTexture* vpp, CShader* ef);
-    STextureDB()
-    {
-        szName = NULL;
-        nFlags = 0;
-        ParserFunc = NULL;
-        eTextureType = ECGT_Unknown;
-    }
-    STextureDB(const char* inName, ECGTexture ePrmType, uint32 inFlags)
-    {
-        szName = inName;
-        nFlags = inFlags;
-        ParserFunc = NULL;
-        eTextureType = ePrmType;
-    }
-    STextureDB(const char* inName, ECGTexture ePrmType, uint32 inFlags, void (*InParserFunc)(const char* szScr, const char* szAnnotations, std::vector<SFXTexture>* pSamplers, SCGTexture * vpp, CShader * ef))
-    {
-        szName = inName;
-        nFlags = inFlags;
-        ParserFunc = InParserFunc;
-        eTextureType = ePrmType;
-    }
-};
-
-
-enum EShaderCacheMode
-{
-    eSC_Normal = 0,
-    eSC_BuildGlobal = 2,
-    eSC_BuildGlobalList = 3,
-    eSC_Preactivate = 4,
-};
-
-enum EShaderLanguage
-{
-    eSL_Unknown,
-    eSL_Orbis,
-    eSL_D3D11,
-    eSL_GL4_1,
-    eSL_GL4_4,
-    eSL_GLES3_0,
-    eSL_GLES3_1,
-    eSL_METAL,
-    eSL_Jasper,
-
-    eSL_MAX
-};
-
-EShaderLanguage GetShaderLanguage();
-
-const char *GetShaderLanguageName();
-
-const char *GetShaderLanguageResourceName();
-
-AZStd::string GetShaderListFilename();
-
-//////////////////////////////////////////////////////////////////////////
-class CShaderMan
-    : public ISystemEventListener
-#if defined(SHADERS_SERIALIZING)
-    , public CShaderSerialize
-#endif
-    , public Terrain::TerrainShaderRequestBus::Handler
-    , public AZ::MaterialNotificationEventBus::Handler
-{
-    friend class CShader;
-    friend class CParserBin;
-
-    //////////////////////////////////////////////////////////////////////////
-    // ISystemEventListener interface implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-    //////////////////////////////////////////////////////////////////////////
-
-    void OnShaderLoaded(IShader* shader) override;
-
-private:
-    CTexAnim* mfReadTexSequence(const char *name, int Flags, bool bFindOnly);
-    int mfReadTexSequence(STexSamplerRT* smp, const char* name, int Flags, bool bFindOnly);
-
-    CShader* mfNewShader(const char* szName);
-
-    void mfCompileLevelsList(std::vector<string>& List, char* scr);
-    bool mfCompileShaderLevelPolicies(SShaderLevelPolicies* pPL, char* scr);
-    bool mfCompileShaderGen(SShaderGen* shg, char* scr);
-    SShaderGenBit* mfCompileShaderGenProperty(char* scr);
-
-    void mfSetResourceTexState(SEfResTexture* Tex);
-    CTexture* mfTryToLoadTexture(const char* nameTex, STexSamplerRT* smp, int Flags, bool bFindOnly);
-    CTexture* mfFindResourceTexture(const char* nameTex, const char* path, int Flags, SEfResTexture* Tex);
-    CTexture* mfLoadResourceTexture(const char* nameTex, const char* path, int Flags, SEfResTexture* Tex);
-
-
-    bool mfLoadResourceTexture(ResourceSlotIndex Id, SInputShaderResources& RS, uint32 CustomFlags, bool bReplaceMeOnFail = false);
-    bool mfLoadResourceTexture(ResourceSlotIndex Id, CShaderResources& RS, uint32 CustomFlags, bool bReplaceMeOnFail = false);
-
-    void mfLoadDefaultTexture(ResourceSlotIndex Id, CShaderResources& RS, EEfResTextures Alias);
-
-    void mfCheckShaderResTextures(TArray<SShaderPass>& Dst, CShader* ef, CShaderResources* Res);
-    void mfCheckShaderResTexturesHW(TArray<SShaderPass>& Dst, CShader* ef, CShaderResources* Res);
-    CTexture* mfCheckTemplateTexName(const char* mapname, ETEX_Type eTT);
-
-    CShader* mfCompile(CShader* ef, char* scr);
-
-    bool mfUpdateMergeStatus(SShaderTechnique* hs, std::vector<SCGParam>* p);
-    void mfRefreshResources(CShaderResources* Res);
-
-    bool mfReloadShaderFile(const char* szName, int nFlags);
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-    bool CheckAllFilesAreWritable(const char* szDir) const;
-#endif
-
-    AZStd::mutex m_shaderLoadMutex;
-
-public:
-    char* m_pCurScript;
-    CShaderManBin m_Bin;
-    CResFileLookupDataMan m_ResLookupDataMan[2];  // CACHE_READONLY, CACHE_USER
-
-    const char* mfTemplateTexIdToName(int Id);
-    SShaderGenComb* mfGetShaderGenInfo(const char* nmFX);
-
-    bool mfReloadShaderIncludes(const char* szPath, int nFlags);
-    bool mfReloadAllShaders(int nFlags, uint32 nFlagsHW);
-    bool mfReloadFile(const char* szPath, const char* szName, int nFlags);
-
-    void ParseShaderProfiles();
-    void ParseShaderProfile(char* scr, SShaderProfile* pr);
-
-    EEfResTextures mfCheckTextureSlotName(const char* mapname);
-    SParamDB* mfGetShaderParamDB(const char* szSemantic);
-    const char* mfGetShaderParamName(ECGParam ePR);
-
-    bool mfParseParamComp(int comp, SCGParam* pCurParam, const char* szSemantic, char* params, const char* szAnnotations, SShaderFXParams& FXParams, CShader* ef, uint32 nParamFlags, EHWShaderClass eSHClass, bool bExpressionOperand);
-    bool mfParseCGParam(char* scr, const char* szAnnotations, SShaderFXParams& FXParams, CShader* ef, std::vector<SCGParam>* pParams, int nComps, uint32 nParamFlags, EHWShaderClass eSHClass, bool bExpressionOperand);
-    bool mfParseFXParameter(SShaderFXParams& FXParams, SFXParam* pr, const char* ParamName, CShader* ef, bool bInstParam, int nParams, std::vector<SCGParam>* pParams, EHWShaderClass eSHClass, bool bExpressionOperand);
-
-    bool mfParseFXTexture(SShaderFXParams& FXParams, SFXTexture* pr, const char* ParamName, CShader* ef, int nParams, std::vector<SCGTexture>* pParams, EHWShaderClass eSHClass);
-    bool mfParseFXSampler(SShaderFXParams& FXParams, SFXSampler* pr, const char* ParamName, CShader* ef, int nParams, std::vector<SCGSampler>* pParams, EHWShaderClass eSHClass);
-
-    void mfCheckObjectDependParams(std::vector<SCGParam>& PNoObj, std::vector<SCGParam>& PObj, EHWShaderClass eSH, CShader* pFXShader);
-
-    void mfBeginFrame();
-
-    void mfGetShaderListPath(stack_string& nameOut, int nType);
-
-public:
-    bool m_bInitialized;
-    bool m_bLoadedSystem;
-
-    AZStd::string m_ShadersPath;
-    AZStd::string m_ShadersCache;
-    AZStd::string m_ShadersFilter;
-    AZStd::string m_ShadersMergeCachePath;
-    AZStd::string m_szCachePath;
-
-    int m_nFrameForceReload;
-
-    char m_HWPath[128];
-
-    CShader* m_pCurShader;
-    static SResourceContainer* s_pContainer; // List/Map of objects for shaders resource class
-
-    std::vector<string> m_ShaderNames;
-
-    static CCryNameTSCRC s_cNameHEAD;
-
-    static CShader* s_DefaultShader;
-    static CShader* s_shPostEffects;    // engine specific post process effects
-    static CShader* s_shPostDepthOfField; // depth of field
-    static CShader* s_shPostMotionBlur;
-    static CShader* s_shPostSunShafts;
-
-    // Deferred rendering passes
-    static CShader* s_shDeferredShading;
-    static CShader* s_ShaderDeferredCaustics;
-    static CShader* s_ShaderDeferredRain;
-    static CShader* s_ShaderDeferredSnow;
-
-#ifndef NULL_RENDERER
-    static CShader* s_ShaderFPEmu;
-    static CShader* s_ShaderUI;
-    static CShader* s_ShaderFallback;
-    static CShader* s_ShaderStars;
-    static CShader* s_ShaderShadowBlur;
-    static CShader* s_ShaderShadowMaskGen;
-#if defined(FEATURE_SVO_GI)
-    static CShader* s_ShaderSVOGI;
-#endif
-    static CShader* s_shHDRPostProcess;
-    static CShader* s_shPostEffectsGame;  // game specific post process effects
-    static CShader* s_shPostAA;
-    static CShader* s_ShaderDebug;
-    static CShader* s_ShaderLensOptics;
-    static CShader* s_ShaderSoftOcclusionQuery;
-    static CShader* s_ShaderLightStyles;
-    static CShader* s_ShaderCommon;
-    static CShader* s_ShaderOcclTest;
-    static CShader* s_ShaderDXTCompress;
-    static CShader* s_ShaderStereo;
-    static CShader* s_ShaderFur;
-    static CShader* s_ShaderVideo;
-#else
-    static SShaderItem s_DefaultShaderItem;
-#endif
-
-    AZStd::unordered_set<IShader*> m_systemShaders;
-
-    const SInputShaderResources* m_pCurInputResources;
-    SShaderGen* m_pGlobalExt;
-    SShaderGen* m_staticExt;    // Shader gen info for static flags (Statics.ext)
-    uint64 m_staticFlags;       // Enabled global flags used for generating the shaders.
-    SShaderLevelPolicies* m_pLevelsPolicies;
-
-    Vec4 m_TempVecs[16];
-    Vec4 m_RTRect;
-    std::vector<SShaderGenComb> m_SGC;
-
-    int m_nCombinationsProcess;
-    int m_nCombinationsProcessOverall;
-    int m_nCombinationsCompiled;
-    int m_nCombinationsEmpty;
-
-    EShaderCacheMode m_eCacheMode;
-
-    bool m_bActivatePhase;
-    const char* m_szShaderPrecache;
-
-    FXShaderCacheCombinations m_ShaderCacheCombinations[2];
-    FXShaderCacheCombinations m_ShaderCacheExportCombinations;
-    AZ::IO::HandleType m_FPCacheCombinations[2];
-
-    typedef std::vector<CCryNameTSCRC> ShaderCacheMissesVec;
-    ShaderCacheMissesVec m_ShaderCacheMisses;
-    string m_ShaderCacheMissPath;
-    ShaderCacheMissCallback m_ShaderCacheMissCallback;
-
-    SShaderCacheStatistics m_ShaderCacheStats;
-
-    uint32 m_nFrameLastSubmitted;
-    uint32 m_nFrameSubmit;
-    SShaderProfile m_ShaderProfiles[eST_Max];
-    SShaderProfile m_ShaderFixedProfiles[eSQ_Max];
-
-    int m_bActivated;
-
-    CShaderParserHelper m_shaderParserHelper;
-
-    bool m_bReload;
-
-
-    // Shared common global flags data
-
-    // Map used for storing automatically-generated flags and mapping old shader names masks to generated ones
-    //  map< shader flag names, mask >
-    typedef std::map< string, uint64 > MapNameFlags;
-    typedef MapNameFlags::iterator MapNameFlagsItor;
-    MapNameFlags m_pShaderCommonGlobalFlag;
-
-    MapNameFlags m_pSCGFlagLegacyFix;
-    uint64 m_nSGFlagsFix;
-
-    // Map stored for convenience mapping betweens old flags and new ones
-    //  map < shader name , map< shader flag names, mask > >
-    typedef std::map< string, MapNameFlags* > ShaderMapNameFlags;
-    typedef ShaderMapNameFlags::iterator ShaderMapNameFlagsItor;
-    ShaderMapNameFlags m_pShadersGlobalFlags;
-
-    typedef std::map<CCryNameTSCRC, SShaderGen*> ShaderExt;
-    typedef ShaderExt::iterator ShaderExtItor;
-    ShaderExt m_ShaderExts;
-    PerFrameParameters m_PF;
-
-    // Concatenated list of shader names using automatic masks generation
-    string m_pShadersRemapList;
-
-    // Helper functors for cleaning up
-
-    struct SShaderMapNameFlagsContainerDelete
-    {
-        void operator()(ShaderMapNameFlags::value_type& pObj)
-        {
-            SAFE_DELETE(pObj.second);
-        }
-    };
-
-public:
-    CShaderMan()
-    {
-        m_bInitialized = false;
-        m_bLoadedSystem = false;
-        s_DefaultShader = NULL;
-        m_pGlobalExt = NULL;
-        m_staticExt = nullptr;
-        m_staticFlags = 0;
-        g_pShaderParserHelper = &m_shaderParserHelper;
-        m_nCombinationsProcess = -1;
-        m_nCombinationsProcessOverall = -1;
-        m_nCombinationsCompiled = -1;
-        m_nCombinationsEmpty = -1;
-        m_szShaderPrecache = NULL;
-        memset(m_TempVecs, 0, sizeof(Vec4) * 16);
-        memset(&m_RTRect, 0, sizeof(Vec4));
-        m_eCacheMode = eSC_Normal;
-        m_nFrameSubmit = 1;
-
-        Terrain::TerrainShaderRequestBus::Handler::BusConnect();
-        AZ::MaterialNotificationEventBus::Handler::BusConnect();
-    }
-
-    void ShutDown();
-    void mfReleaseShaders();
-
-    SShaderGen* mfCreateShaderGenInfo(const char* szName, bool bRuntime);
-    void mfRemapShaderGenInfoBits(const char* szName, SShaderGen* pShGen);
-
-    uint64 mfGetRemapedShaderMaskGen(const char* szName, uint64 nMaskGen = 0, bool bFixup = 0);
-    string mfGetShaderBitNamesFromMaskGen(const char* szName, uint64 nMaskGen);
-
-    bool mfUsesGlobalFlags(const char* szShaderName);
-    AZStd::string mfGetShaderBitNamesFromGlobalMaskGen(uint64 nMaskGen);
-    uint64 mfGetShaderGlobalMaskGenFromString(const char* szShaderGen);
-
-    void mfInitGlobal(void);
-    void mfInitLevelPolicies(void);
-    void mfInitLookups(void);
-
-    void InitStaticFlags();
-    void AddStaticFlag(EHWSSTFlag flag);
-    void RemoveStaticFlag(EHWSSTFlag flag);
-    bool HasStaticFlag(EHWSSTFlag flag);
-
-    void mfPreloadShaderExts(void);
-    void mfInitCommonGlobalFlags(void);
-    void mfInitCommonGlobalFlagsLegacyFix(void);
-    bool mfRemapCommonGlobalFlagsWithLegacy(void);
-    void mfCreateCommonGlobalFlags(const char* szName);
-    void mfSaveCommonGlobalFlagsToDisk(const char* szName, uint32 nMaskCount);
-
-    void mfInit(void);
-    void mfPostInit(void);
-    void mfSortResources();
-    CShaderResources* mfCreateShaderResources(const SInputShaderResources* Res, bool bShare);
-    bool mfRefreshResourceConstants(CShaderResources* Res);
-    inline bool mfRefreshResourceConstants(SShaderItem& SI) { return mfRefreshResourceConstants((CShaderResources*)SI.m_pShaderResources); }
-    bool mfUpdateTechnik (SShaderItem& SI, CCryNameTSCRC& Name);
-    SShaderItem mfShaderItemForName (const char* szName, bool bShare, int flags, SInputShaderResources* Res = NULL, uint64 nMaskGen = 0);
-    CShader* mfForName (const char* name, int flags, const CShaderResources* Res = NULL, uint64 nMaskGen = 0);
-
-    bool mfRefreshSystemShader(const char* szName, CShader*& pSysShader)
-    {
-        if (!pSysShader)
-        {
-            CryComment("Load System Shader (refresh) '%s'...", szName);
-
-            pSysShader = mfForName(szName, EF_SYSTEM);
-            if (pSysShader)
-            {
-                if (pSysShader->m_Flags & EF_NOTFOUND)
-                {
-                    pSysShader = NULL;
-                    CryComment("Load System Shader Failed %s", szName);
-                    return false;
-                }
-                CryComment("ok");
-                m_systemShaders.emplace(pSysShader);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    void RT_ParseShader(CShader* pSH, uint64 nMaskGen, uint32 flags, CShaderResources* Res);
-    void RT_SetShaderQuality(EShaderType eST, EShaderQuality eSQ);
-
-    void CreateShaderMaskGenString(const CShader* pSH, stack_string& flagString);
-    void CreateShaderExportRequestLine(const CShader* pSH, stack_string& exportString);
-
-    SFXParam* mfGetFXParameter(std::vector<SFXParam>& Params, const char* param);
-    SFXSampler* mfGetFXSampler(std::vector<SFXSampler>& Params, const char* param);
-    SFXTexture* mfGetFXTexture(std::vector<SFXTexture>& Params, const char* param);
-    const char* mfParseFX_Parameter (const string& buf, EParamType eType, const char* szName);
-    void    mfParseFX_Annotations_Script (char* buf, CShader * ef, std::vector<SFXStruct>&Structs, bool* bPublic, CCryNameR techStart[2]);
-    void    mfParseFX_Annotations (char* buf, CShader * ef, std::vector<SFXStruct>&Structs, bool* bPublic, CCryNameR techStart[2]);
-    void    mfParseFXTechnique_Annotations_Script (char* buf, CShader* ef, std::vector<SFXStruct>& Structs, SShaderTechnique* pShTech, bool* bPublic, std::vector<SShaderTechParseParams>& techParams);
-    void    mfParseFXTechnique_Annotations (char* buf, CShader* ef, std::vector<SFXStruct>& Structs, SShaderTechnique* pShTech, bool* bPublic, std::vector<SShaderTechParseParams>& techParams);
-    void    mfParseFXSampler_Annotations_Script (char* buf, CShader* ef, std::vector<SFXStruct>& Structs, STexSamplerFX* pSamp);
-    void    mfParseFXSampler_Annotations (char* buf, CShader* ef, std::vector<SFXStruct>& Structs, STexSamplerFX* pSamp);
-    void    mfParseFX_Global (SFXParam & pr, CShader * ef, std::vector<SFXStruct>&Structs, CCryNameR techStart[2]);
-    bool    mfParseDummyFX_Global (std::vector<SFXStruct>&Structs, char* annot, CCryNameR techStart[2]);
-    const string& mfParseFXTechnique_GenerateShaderScript (std::vector<SFXStruct>& Structs, FXMacro& Macros, std::vector<SFXParam>& Params, std::vector<SFXParam>& AffectedParams, const char* szEntryFunc, CShader* ef, EHWShaderClass eSHClass, const char* szShaderName, uint32& nAffectMask, const char* szType);
-    bool    mfParseFXTechnique_MergeParameters (std::vector<SFXStruct>& Structs, std::vector<SFXParam>& Params, std::vector<int>& AffectedFunc, SFXStruct* pMainFunc, CShader* ef, EHWShaderClass eSHClass, const char* szShaderName, std::vector<SFXParam>& NewParams);
-    CTexture* mfParseFXTechnique_LoadShaderTexture (STexSamplerRT* smp, const char* szName, SShaderPass* pShPass, CShader* ef, int nIndex, byte ColorOp, byte AlphaOp, byte ColorArg, byte AlphaArg);
-    bool    mfParseFXTechnique_LoadShader (const char* szShaderCom, SShaderPass* pShPass, CShader* ef, std::vector<STexSamplerFX>& Samplers, std::vector<SFXStruct>& Structs, std::vector<SFXParam>& Params, FXMacro& Macros, EHWShaderClass eSHClass);
-    bool    mfParseFXTechniquePass (char* buf, char* annotations, SShaderTechnique* pShTech, CShader* ef, std::vector<STexSamplerFX>& Samplers, std::vector<SFXStruct>& Structs, std::vector<SFXParam>& Params);
-    bool    mfParseFXTechnique_CustomRE (char* buf, const char* name, SShaderTechnique* pShTech, CShader* ef);
-    SShaderTechnique* mfParseFXTechnique (char* buf, char* annotations, CShader* ef, std::vector<STexSamplerFX>& Samplers, std::vector<SFXStruct>& Structs, std::vector<SFXParam>& Params, bool* bPublic, std::vector<SShaderTechParseParams>& techParams);
-    bool    mfParseFXSampler(char* buf, char* name, char* annotations, CShader* ef, std::vector<STexSamplerFX>& Samplers, std::vector<SFXStruct>& Structs);
-    bool    mfParseLightStyle(CLightStyle* ls, char* buf);
-    bool    mfParseFXLightStyle(char* buf, int nID, CShader* ef, std::vector<SFXStruct>& Structs);
-    CShader* mfParseFX (char* buf, CShader* ef, CShader* efGen, uint64 nMaskGen);
-    void    mfPostLoadFX(CShader * efT, std::vector<SShaderTechParseParams>&techParams, CCryNameR techStart[2]);
-    bool     mfParseDummyFX(char* buf, std::vector<string>& ShaderNames, const char* szName);
-    bool     mfAddFXShaderNames(const char* szName, std::vector<string>* ShaderNames, bool bUpdateCRC);
-    bool     mfInitShadersDummy(bool bUpdateCRC);
-
-    uint64   mfGetRTForName(char* buf);
-    uint32     mfGetGLForName(char* buf, CShader* ef);
-
-    void mfFillGenMacroses(SShaderGen* shG, TArray<char>& buf, uint64 nMaskGen);
-    bool mfModifyGenFlags(CShader* efGen, const CShaderResources* pRes, uint64& nMaskGen, uint64& nMaskGenHW);
-
-    bool mfGatherShadersList(const char* szPath, bool bCheckIncludes, bool bUpdateCRC, std::vector<string>* Names);
-    void mfGatherFilesList(const char* szPath, std::vector<CCryNameR>& Names, int nLevel, bool bUseFilter, bool bMaterial = false);
-    int  mfInitShadersList(std::vector<string>* ShaderNames);
-    void mfSetDefaults(void);
-    void mfLoadSystemShader(const char* szName, CShader*& pStorage);
-    void mfReleaseSystemShaders ();
-    void mfLoadBasicSystemShaders ();
-    void mfLoadDefaultSystemShaders ();
-    void mfCloseShadersCache(int nID);
-    void mfInitShadersCacheMissLog();
-
-    void mfInitShadersCache(byte bForLevel, FXShaderCacheCombinations* Combinations = NULL, const char* pCombinations = NULL, int nType = 0);
-    void mfMergeShadersCombinations(FXShaderCacheCombinations* Combinations, int nType);
-    void mfInsertNewCombination(SShaderCombIdent& Ident, EHWShaderClass eCL, const char* name, int nID, string* Str = NULL, byte bStore = 1);
-    const char* mfGetLevelListName() const;
-    void mfExportShaders();
-
-    bool mfReleasePreactivatedShaderData();
-    bool mfPreactivateShaders2(const char* szPak, const char* szPath, bool bPersistent, const char* szBindRoot);
-    bool mfPreactivate2(CResFileLookupDataMan& LevelLookup, const AZStd::string& pathPerLevel, const AZStd::string& pathGlobal, bool bVS, bool bPersistent);
-
-    bool mfPreloadBinaryShaders();
-
-    bool LoadShaderStartupCache();
-    void UnloadShaderStartupCache();
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-    void AddCombination(SCacheCombination& cmb,  FXShaderCacheCombinations& CmbsMap, CHWShader* pHWS);
-    void AddGLCombinations(CShader* pSH, std::vector<SCacheCombination>& CmbsGL);
-    void AddLTCombinations(SCacheCombination& cmb, FXShaderCacheCombinations& CmbsMap, CHWShader* pHWS);
-    void AddRTCombinations(FXShaderCacheCombinations& CmbsMap, CHWShader* pHWS, CShader* pSH, FXShaderCacheCombinations* Combinations);
-    void AddGLCombination(FXShaderCacheCombinations& CmbsMap, SCacheCombination& cc);
-    void FilterShaderCombinations(std::vector<SCacheCombination>& Cmbs, const std::vector<CShaderListFilter>& Filters);
-    void mfPrecacheShaders(bool bStatsOnly);
-    void mfGetShaderList();
-    void _PrecacheShaderList(bool bStatsOnly);
-    void mfOptimiseShaders(const char* szFolder, bool bForce);
-    void mfMergeShaders();
-    void _MergeShaders();
-    void mfAddRTCombinations(FXShaderCacheCombinations& CmbsMapSrc, FXShaderCacheCombinations& CmbsMapDst, CHWShader* pSH, bool bListOnly);
-    void mfAddRTCombination_r(int nComb, FXShaderCacheCombinations& CmbsMapDst, SCacheCombination* cmb, CHWShader* pSH, bool bAutoPrecache);
-    void mfAddLTCombinations(SCacheCombination* cmb, FXShaderCacheCombinations& CmbsMapDst);
-    void mfAddLTCombination(SCacheCombination* cmb, FXShaderCacheCombinations& CmbsMapDst, DWORD dwL);
-#endif
-
-    int Size()
-    {
-        int nSize = sizeof(*this);
-
-        nSize += m_SGC.capacity();
-        nSize += m_Bin.Size();
-
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_Bin);
-        pSizer->AddObject(m_SGC);
-        pSizer->AddObject(m_ShaderNames);
-        pSizer->AddObject(m_ShaderCacheCombinations[0]);
-        pSizer->AddObject(m_ShaderCacheCombinations[1]);
-    }
-
-    void RefreshShader(const AZStd::string_view name, CShader* shader) override
-    {
-        mfRefreshSystemShader(name.data(), shader);
-    }
-
-    void ReleaseShader(CShader* shader) const override
-    {
-        SAFE_RELEASE_FORCE(shader);
-    }
-
-    static float EvalWaveForm(SWaveForm* wf);
-    static float EvalWaveForm(SWaveForm2* wf);
-    static float EvalWaveForm2(SWaveForm* wf, float frac);
-};
-
-//=====================================================================
-
-#endif  // __CSHADER_H__
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/CShaderBin.h b/Code/CryEngine/RenderDll/Common/Shaders/CShaderBin.h
deleted file mode 100644
index 274a412283..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/CShaderBin.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __CSHADERBIN_H__
-#define __CSHADERBIN_H__
-
-#include <map>
-#include <RenderDll/Common/Shaders/ParserBin.h>
-
-#ifndef FOURCC
-typedef DWORD FOURCC;
-#endif
-
-struct SShaderTechParseParams
-{
-    CCryNameR techName[TTYPE_MAX];
-};
-
-class CShaderMan;
-
-struct SShaderBinHeader
-{
-    FOURCC m_Magic;
-    uint32 m_CRC32;
-    uint16 m_VersionLow;
-    uint16 m_VersionHigh;
-    uint32 m_nOffsetStringTable;
-    uint32 m_nOffsetParamsLocal;
-    uint32 m_nTokens;
-    uint32 m_nSourceCRC32;
-
-    SShaderBinHeader()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-struct SShaderBinParamsHeader
-{
-    uint64 nMask;
-    uint64 nstaticMask;
-    uint32 nName;
-    int32 nParams;
-    int32 nSamplers;
-    int32 nTextures;
-    int32 nFuncs;
-
-    SShaderBinParamsHeader()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-struct SParamCacheInfo
-{
-    typedef std::vector<int32, STLShaderAllocator<int32> > AffectedFuncsVec;
-    typedef std::vector<int32, STLShaderAllocator<int32> > AffectedParamsVec;
-
-    uint32 m_dwName;
-    uint64 m_nMaskGenFX;
-    uint64 m_maskGenStatic;
-    AffectedFuncsVec m_AffectedFuncs;
-    AffectedParamsVec m_AffectedParams;
-    AffectedParamsVec m_AffectedSamplers;
-    AffectedParamsVec m_AffectedTextures;
-
-    SParamCacheInfo()
-        : m_dwName(0)
-        , m_nMaskGenFX(0)
-        , m_maskGenStatic(0)
-    {};
-
-    int Size()
-    {
-        return sizeof(SParamCacheInfo) + sizeofVector(m_AffectedFuncs) + sizeofVector(m_AffectedParams) + sizeofVector(m_AffectedSamplers) + sizeofVector(m_AffectedTextures);
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_AffectedFuncs);
-        pSizer->AddObject(m_AffectedParams);
-        pSizer->AddObject(m_AffectedSamplers);
-        pSizer->AddObject(m_AffectedTextures);
-    }
-};
-
-# define MAX_FXBIN_CACHE 32
-
-struct SShaderBin
-{
-    typedef AZStd::vector<SParamCacheInfo, AZ::StdLegacyAllocator> ParamsCacheVec;
-    static SShaderBin s_Root;
-    static uint32 s_nCache;
-    static uint32 s_nMaxFXBinCache;
-
-    SShaderBin* m_Next;
-    SShaderBin* m_Prev;
-
-    uint32 m_CRC32;
-    uint32 m_dwName;
-    char* m_szName;
-    uint32 m_SourceCRC32;
-    bool m_bLocked;
-    bool m_bReadOnly;
-    bool m_bInclude;
-    FXShaderToken m_TokenTable;
-    ShaderTokensVec m_Tokens;
-
-    // Local shader info (after parsing)
-    uint32 m_nOffsetLocalInfo;
-    uint32 m_nCurCacheParamsID;
-    uint32 m_nCurParamsID;
-    ParamsCacheVec m_ParamsCache;
-
-    SShaderBin()
-        : m_Next(nullptr)
-        , m_Prev(nullptr)
-        , m_CRC32(0)
-        , m_dwName(0)
-        , m_szName(nullptr)
-        , m_SourceCRC32(0)
-        , m_bLocked(false)
-        , m_bReadOnly(true)
-        , m_bInclude(false)
-        , m_nOffsetLocalInfo(0)
-        , m_nCurCacheParamsID(-1)
-        , m_nCurParamsID(-1)
-    {
-        if (!s_Root.m_Next)
-        {
-            s_Root.m_Next = &s_Root;
-            s_Root.m_Prev = &s_Root;
-        }
-    }
-
-    ~SShaderBin()
-    {
-        if (m_szName)
-        {
-            g_shaderBucketAllocator.deallocate((void*) m_szName);
-        }
-    }
-
-    void SetName(const char* name)
-    {
-        if (m_szName)
-        {
-            g_shaderBucketAllocator.deallocate((void*) m_szName);
-            m_szName = nullptr;
-        }
-
-        if (name[0])
-        {
-            m_szName = (char*) g_shaderBucketAllocator.allocate(strlen(name) + 1);
-            azstrcpy(m_szName, strlen(name) + 1, name);
-        }
-    }
-
-    _inline void Unlink()
-    {
-        if (!m_Next || !m_Prev)
-        {
-            return;
-        }
-        m_Next->m_Prev = m_Prev;
-        m_Prev->m_Next = m_Next;
-        m_Next = m_Prev = NULL;
-    }
-    _inline void Link(SShaderBin* Before)
-    {
-        if (m_Next || m_Prev)
-        {
-            return;
-        }
-        m_Next = Before->m_Next;
-        Before->m_Next->m_Prev = this;
-        Before->m_Next = this;
-        m_Prev = Before;
-    }
-    _inline bool IsReadOnly() { return m_bReadOnly; }
-    _inline void Lock() { m_bLocked = true; }
-    _inline void Unlock() { m_bLocked = false; }
-
-    uint32 ComputeCRC();
-    void SetCRC(uint32 nCRC) { m_CRC32 = nCRC; }
-
-    int Size()
-    {
-        int nSize = sizeof(SShaderBin);
-        nSize += sizeOfV(m_TokenTable);
-        nSize += sizeofVector(m_Tokens);
-        nSize += sizeOfV(m_ParamsCache);
-
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_TokenTable);
-        pSizer->AddObject(m_Tokens);
-        pSizer->AddObject(m_ParamsCache);
-    }
-
-    void* operator new (size_t sz)
-    {
-        return g_shaderBucketAllocator.allocate(sz);
-    }
-
-    void operator delete (void* p)
-    {
-        g_shaderBucketAllocator.deallocate(p);
-    }
-
-private:
-    SShaderBin(const SShaderBin&);
-    SShaderBin& operator = (const SShaderBin&);
-};
-
-
-#define FXP_PARAMS_DIRTY   1
-#define FXP_SAMPLERS_DIRTY 2
-#define FXP_TEXTURES_DIRTY 4
-
-typedef std::vector<SFXParam>::iterator FXParamsIt;
-typedef std::vector<STexSamplerFX>::iterator FXSamplersOldIt;
-typedef std::vector<SFXSampler>::iterator FXSamplersIt;
-typedef std::vector<SFXTexture>::iterator FXTexturesIt;
-struct SShaderFXParams
-{
-    uint32 m_nFlags;                // FXP_DIRTY
-
-    std::vector<SFXParam> m_FXParams;
-    std::vector<SFXSampler> m_FXSamplers;
-    std::vector<SFXTexture> m_FXTextures;
-    std::vector<STexSamplerFX> m_FXSamplersOld; // Equivalent to FXTexSamplers elsewhere
-
-    AZStd::vector<SShaderParam> m_PublicParams;
-
-    SShaderFXParams()
-    {
-        m_nFlags = 0;
-    }
-    int Size()
-    {
-        int nSize = sizeOfV(m_FXParams);
-        nSize += sizeOfV(m_FXSamplers);
-        nSize += sizeOfV(m_FXTextures);
-        nSize += sizeOfV(m_PublicParams);
-
-        nSize += sizeOfV(m_FXSamplersOld);
-
-        return nSize;
-    }
-};
-
-
-typedef std::map<uint32, bool> FXShaderBinValidCRC;
-typedef FXShaderBinValidCRC::iterator FXShaderBinValidCRCItor;
-
-typedef std::map<CCryNameTSCRC, string> FXShaderBinPath;
-typedef FXShaderBinPath::iterator FXShaderBinPathItor;
-
-class CShaderManBin
-{
-    friend class CShaderMan;
-
-    SShaderBin* LoadBinShader(AZ::IO::HandleType binFileHandle, const char* szName, const char* szNameBin, bool bReadParams);
-    SShaderBin* SaveBinShader(uint32 nSourceCRC32, const char* szName, bool bInclude, AZ::IO::HandleType srcFileHandle);
-    bool SaveBinShaderLocalInfo(SShaderBin* pBin, uint32 dwName, uint64 nMaskGenFX, uint64 maskGenStatic, TArray<int32>& Funcs, std::vector<SFXParam>& Params, std::vector<SFXSampler>& Samplers, std::vector<SFXTexture>& Textures);
-    SParamCacheInfo* GetParamInfo(SShaderBin* pBin, uint32 dwName, uint64 nMaskGenFX, uint64 maskGenStatic);
-
-    void AddGenMacroses(SShaderGen* shG, CParserBin& Parser, uint64 nMaskGen, bool ignoreShaderGenMask = false);
-
-    bool ParseBinFX_Global_Annotations(CParserBin & Parser, SParserFrame & Frame, bool* bPublic, CCryNameR techStart[2]);
-    bool ParseBinFX_Global(CParserBin & Parser, SParserFrame & Frame, bool* bPublic, CCryNameR techStart[2]);
-    bool ParseBinFX_Sampler_Annotations_Script(CParserBin& Parser, SParserFrame& Frame, STexSamplerFX* pSampler);
-    bool ParseBinFX_Sampler_Annotations(CParserBin& Parser, SParserFrame& Frame, STexSamplerFX* pSampler);
-    bool ParseBinFX_Sampler(CParserBin& Parser, SParserFrame& Data, uint32 dwName, SParserFrame Annotations, EToken samplerType);
-    bool ParseBinFX_Sampler(CParserBin& Parser, SParserFrame& Data, SFXSampler& Sampl);
-    bool ParseBinFX_Texture(CParserBin& Parser, SParserFrame& Data, SFXTexture& Sampl);
-
-    void InitShaderDependenciesList(CParserBin& Parser, SCodeFragment* pFunc, TArray<byte>& bChecked, TArray<int>& AffectedFuncs);
-    void CheckFragmentsDependencies(CParserBin& Parser, TArray<byte>& bChecked, TArray<int>& AffectedFuncs);
-    void CheckStructuresDependencies(CParserBin& Parser, SCodeFragment* pFrag, TArray<byte>& bChecked, TArray<int>& AffectedFunc);
-
-    void AddParameterToScript(CParserBin& Parser, SFXParam* pr, PodArray<uint32>& SHData, EHWShaderClass eSHClass, int nCB);
-    void AddSamplerToScript(CParserBin& Parser, SFXSampler* pr, PodArray<uint32>& SHData, EHWShaderClass eSHClass);
-    void AddTextureToScript(CParserBin& Parser, SFXTexture* pr, PodArray<uint32>& SHData, EHWShaderClass eSHClass);
-    void AddAffectedParameter(CParserBin& Parser, std::vector<SFXParam>& AffectedParams, TArray<int>& AffectedFunc, SFXParam* pParam, EHWShaderClass eSHClass, uint32 dwType, SShaderTechnique* pShTech);
-    void AddAffectedSampler(CParserBin& Parser, std::vector<SFXSampler>& AffectedSamplers, TArray<int>& AffectedFunc, SFXSampler* pParam, EHWShaderClass eSHClass, uint32 dwType, SShaderTechnique* pShTech);
-    void AddAffectedTexture(CParserBin& Parser, std::vector<SFXTexture>& AffectedTextures, TArray<int>& AffectedFunc, SFXTexture* pParam, EHWShaderClass eSHClass, uint32 dwType, SShaderTechnique* pShTech);
-    bool ParseBinFX_Technique_Pass_PackParameters (CParserBin& Parser, std::vector<SFXParam>& AffectedParams, TArray<int>& AffectedFunc, SCodeFragment* pFunc, EHWShaderClass eSHClass, uint32 dwSHName, std::vector<SFXParam>& PackedParams, TArray<SCodeFragment>& Replaces, TArray<uint32>& NewTokens, TArray<byte>& bMerged);
-    bool ParseBinFX_Technique_Pass_GenerateShaderData(CParserBin& Parser, FXMacroBin& Macros, SShaderFXParams& FXParams, uint32 dwSHName, EHWShaderClass eSHClass, uint64& nGenMask, uint32 dwSHType, PodArray<uint32>& SHData, SShaderTechnique* pShTech);
-    bool ParseBinFX_Technique_Pass_LoadShader(CParserBin& Parser, FXMacroBin& Macros, SParserFrame& SHFrame, SShaderTechnique* pShTech, SShaderPass* pPass, EHWShaderClass eSHClass, SShaderFXParams& FXParams);
-    bool ParseBinFX_Technique_Pass(CParserBin& Parser, SParserFrame& Frame, SShaderTechnique* pTech);
-    bool ParseBinFX_Technique_Annotations_String(CParserBin& Parser, SParserFrame& Frame, SShaderTechnique* pSHTech, std::vector<SShaderTechParseParams>& techParams, bool* bPublic);
-    bool ParseBinFX_Technique_Annotations(CParserBin& Parser, SParserFrame& Frame, SShaderTechnique* pSHTech, std::vector<SShaderTechParseParams>& techParams, bool* bPublic);
-    bool ParseBinFX_Technique_CustomRE(CParserBin& Parser, SParserFrame& Frame, SParserFrame& Name, SShaderTechnique* pShTech);
-    SShaderTechnique* ParseBinFX_Technique(CParserBin& Parser, SParserFrame& Data, SParserFrame Annotations, std::vector<SShaderTechParseParams>& techParams, bool* bPublic);
-    bool ParseBinFX_LightStyle_Val(CParserBin& Parser, SParserFrame& Frame, CLightStyle* ls);
-    bool ParseBinFX_LightStyle(CParserBin& Parser, SParserFrame& Frame, int nStyle);
-
-    void MergeTextureSlots(SShaderTexSlots* master, SShaderTexSlots* overlay);
-    SShaderTexSlots* GetTextureSlots(CParserBin& Parser, SShaderBin* pBin, CShader* ef, int nTech = 0, int nPass = 0);
-
-    SShaderBin* SearchInCache(const char* szName, bool bInclude);
-    bool AddToCache(SShaderBin* pSB, bool bInclude);
-    bool DeleteFromCache(SShaderBin* pSB);
-
-    SFXParam* mfAddFXParam(SShaderFXParams& FXP, const SFXParam* pParam);
-    SFXParam* mfAddFXParam(CShader* pSH, const SFXParam* pParam);
-
-    void mfAddFXSampler(CShader* pSH, const SFXSampler* pParam);
-    void mfAddFXTexture(CShader* pSH, const SFXTexture* pParam);
-
-    void mfAddFXSampler(CShader* pSH, const STexSamplerFX* pSamp);
-    void mfGeneratePublicFXParams(CShader* pSH, CParserBin& Parser);
-
-public:
-    CShaderManBin();
-    SShaderBin* GetBinShader(const char* szName, bool bInclude, uint32 nRefCRC32, bool* pbChanged = NULL);
-    bool ParseBinFX(SShaderBin* pBin, CShader* ef, uint64 nMaskGen);
-    bool ParseBinFX_Dummy(SShaderBin* pBin, std::vector<string>& ShaderNames, const char* szName);
-
-    SShaderFXParams& mfGetFXParams(CShader* pSH);
-    void mfRemoveFXParams(CShader* pSH);
-    int mfSizeFXParams(uint32& nCount);
-    void mfReleaseFXParams();
-
-    void InvalidateCache(bool bIncludesOnly = false);
-
-    CShaderMan* m_pCEF;
-    FXShaderBinPath m_BinPaths;
-    FXShaderBinValidCRC m_BinValidCRCs;
-
-    bool m_bBinaryShadersLoaded;
-
-    typedef std::map<CCryNameTSCRC, SShaderFXParams> ShaderFXParams;
-    typedef ShaderFXParams::iterator ShaderFXParamsItor;
-    ShaderFXParams m_ShaderFXParams;
-
-
-    int Size();
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-};
-
-//=====================================================================
-
-#endif  // __CSHADERBIN_H__
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/Parser.cpp b/Code/CryEngine/RenderDll/Common/Shaders/Parser.cpp
deleted file mode 100644
index 22e66c393c..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/Parser.cpp
+++ /dev/null
@@ -1,1322 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-const char* kWhiteSpace = " ,";
-char* pCurCommand;
-
-void SkipCharacters (char** buf, const char* toSkip)
-{
-    char theChar;
-    char* skip;
-
-    while ((theChar = **buf) != 0)
-    {
-        if (theChar >= 0x20)
-        {
-            skip = (char*) toSkip;
-            while (*skip)
-            {
-                if (theChar == *skip)
-                {
-                    break;
-                }
-                ++skip;
-            }
-            if (*skip == 0)
-            {
-                return;
-            }
-        }
-        ++*buf;
-    }
-}
-
-void RemoveCR(char* pbuf)
-{
-    while (*pbuf)
-    {
-        if (*pbuf == 0xd)
-        {
-            *pbuf = 0x20;
-        }
-        pbuf++;
-    }
-}
-
-FXMacro sStaticMacros;
-
-bool SkipChar(unsigned int ch)
-{
-    // Return true if ch is any of the first 0x20 ascii characters
-    bool res = ch <= 0x20;
-
-    // Also return true if ch is any of the following commented characters
-    res |= (ch - 0x21) <  2; // !"
-    res |= (ch - 0x26) < 10; // &'()*+,-./
-    res |= (ch - 0x3A) <  6; // :;<=>?
-    res |= ch == 0x5B; // [
-    res |= ch == 0x5D; // ]
-    res |= (ch - 0x7B) <  3; // {|}
-
-    return res;
-}
-
-// Determine is this preprocessor directive belongs to first pass or second one
-bool fxIsFirstPass(char* buf)
-{
-    char com[1024];
-    char tok[256];
-    fxFillCR(&buf, com);
-    char* s = com;
-    while (*s != 0)
-    {
-        fxFillPr(&s, tok);
-        if (tok[0] == '%' && tok[1] == '_')
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-static void fxAddMacro(const char* Name, const char* Macro, FXMacro& Macros)
-{
-    SMacroFX pr;
-
-    if (Name[0] == '%')
-    {
-        pr.m_nMask = shGetHex(&Macro[0]);
-#ifdef _DEBUG
-        FXMacroItor it = Macros.find(CONST_TEMP_STRING(Name));
-        if (it != Macros.end())
-        {
-            assert(0);
-        }
-#endif
-    }
-    else
-    {
-        pr.m_nMask = 0;
-    }
-    pr.m_szMacro = Macro ? Macro : "";
-    FXMacroItor it = Macros.find(CONST_TEMP_STRING(Name));
-    if (it != Macros.end())
-    {
-        Macros.erase(Name);
-    }
-    Macros.insert(FXMacroItor::value_type(Name, pr));
-
-    /*it = Macros.find(Name);
-    if (it != Macros.end())
-    {
-      int nnn = 0;
-    }*/
-}
-
-void fxParserInit(void)
-{
-#if !defined(NULL_RENDERER) && defined(D3DX_SDK_VERSION)
-    // Needed for a workaround for the optimization rule problem of DXSDKJune10's HLSL Compiler (9.29.952.3111)
-    // See: http://support.microsoft.com/kb/2448404
-    // Causes cracks in tessellated meshes
-    char sdkVer[4];
-    azitoa(D3DX_SDK_VERSION, sdkVer, 4);
-    fxAddMacro("D3DX_SDK_VERSION", sdkVer, sStaticMacros);
-#else
-    fxAddMacro("D3DX_SDK_VERSION", "0", sStaticMacros);
-#endif
-}
-
-void fxRegisterEnv([[maybe_unused]] const char* szStr)
-{
-    // deprecated
-}
-
-char* fxFillPr (char** buf, char* dst)
-{
-    int n = 0;
-    char ch;
-    while ((ch = **buf) != 0)
-    {
-        if (!SkipChar(ch))
-        {
-            break;
-        }
-        ++*buf;
-    }
-    char* pStart = *buf;
-    while ((ch = **buf) != 0)
-    {
-        if (SkipChar(ch))
-        {
-            break;
-        }
-        dst[n++] = ch;
-        ++*buf;
-    }
-    dst[n] = 0;
-    return pStart;
-}
-
-char* fxFillPrC (char** buf, char* dst)
-{
-    int n = 0;
-    char ch;
-    while ((ch = **buf) != 0)
-    {
-        if (!SkipChar(ch))
-        {
-            break;
-        }
-        ++*buf;
-    }
-    char* pStart = *buf;
-    while ((ch = **buf) != 0)
-    {
-        if (ch != ',' && SkipChar(ch))
-        {
-            break;
-        }
-        dst[n++] = ch;
-        ++*buf;
-    }
-    dst[n] = 0;
-    return pStart;
-}
-
-char* fxFillNumber (char** buf, char* dst)
-{
-    int n = 0;
-    char ch;
-    while ((ch = **buf) != 0)
-    {
-        if (!SkipChar(ch))
-        {
-            break;
-        }
-        ++*buf;
-    }
-    char* pStart = *buf;
-    while ((ch = **buf) != 0)
-    {
-        if (ch != '.' && SkipChar(ch))
-        {
-            break;
-        }
-        dst[n++] = ch;
-        ++*buf;
-    }
-    dst[n] = 0;
-    return pStart;
-}
-
-int shFill(char** buf, char* dst, int nSize)
-{
-    int n = 0;
-    SkipCharacters (buf, kWhiteSpace);
-
-    while (**buf > 0x20)
-    {
-        dst[n++] = **buf;
-        ++*buf;
-
-        if (nSize > 0 && n == nSize)
-        {
-            break;
-        }
-    }
-
-    dst[n] = 0;
-    return n;
-}
-int fxFill(char** buf, char* dst, int nSize)
-{
-    int n = 0;
-    SkipCharacters (buf, kWhiteSpace);
-
-    while (**buf != ';')
-    {
-        if (**buf == 0)
-        {
-            break;
-        }
-        dst[n++] = **buf;
-        ++*buf;
-
-        if (nSize > 0 && n == nSize)
-        {
-            dst[n - 1] = 0;
-            return 1;
-        }
-    }
-
-    PREFAST_ASSUME(*buf);
-    dst[n] = 0;
-    if (**buf == ';')
-    {
-        ++*buf;
-    }
-    return n;
-}
-
-int fxFillCR(char** buf, char* dst)
-{
-    int n = 0;
-    SkipCharacters (buf, kWhiteSpace);
-    while (**buf != 0xa)
-    {
-        if (**buf == 0)
-        {
-            break;
-        }
-        dst[n++] = **buf;
-        ++*buf;
-    }
-    dst[n] = 0;
-    return n;
-}
-
-//================================================================================
-
-bool shGetBool(char* buf)
-{
-    if (!buf)
-    {
-        return false;
-    }
-
-    if (!_strnicmp(buf, "yes", 3))
-    {
-        return true;
-    }
-
-    if (!_strnicmp(buf, "true", 4))
-    {
-        return true;
-    }
-
-    if (!_strnicmp(buf, "on", 2))
-    {
-        return true;
-    }
-
-    if (!strncmp(buf, "1", 1))
-    {
-        return true;
-    }
-
-    return false;
-}
-
-float shGetFloat(const char* buf)
-{
-    if (!buf)
-    {
-        return 0;
-    }
-    float f = 0;
-
-#ifndef NDEBUG
-    int res =
-#endif
-        azsscanf(buf, "%f", &f);
-    assert(res);
-
-    return f;
-}
-
-void shGetFloat(const char* buf, float* v1, float* v2)
-{
-    if (!buf)
-    {
-        return;
-    }
-    float f = 0, f1 = 0;
-
-    int n = azsscanf(buf, "%f %f", &f, &f1);
-    if (n == 1)
-    {
-        *v1 = f;
-        *v2 = f;
-    }
-    else
-    {
-        *v1 = f;
-        *v2 = f1;
-    }
-}
-
-int shGetInt(const char* buf)
-{
-    if (!buf)
-    {
-        return 0;
-    }
-    int i = 0;
-
-    if (buf[0] == '0' && buf[1] == 'x')
-    {
-#ifndef NDEBUG
-        int res =
-#endif
-            azsscanf(&buf[2], "%x", &i);
-        assert(res);
-    }
-    else
-    {
-#ifndef NDEBUG
-        int res =
-#endif
-            azsscanf(buf, "%i", &i);
-        assert(res);
-    }
-
-    return i;
-}
-
-int shGetHex(const char* buf)
-{
-    if (!buf)
-    {
-        return 0;
-    }
-    int i = 0;
-#ifndef NDEBUG
-    int res =
-#endif
-        azsscanf(buf, "%x", &i);
-    assert(res);
-
-    return i;
-}
-
-uint64 shGetHex64(const char* buf)
-{
-    if (!buf)
-    {
-        return 0;
-    }
-#if defined(__GNUC__)
-    unsigned long long i = 0;
-#ifndef NDEBUG
-    int res =
-#endif
-        azsscanf(buf, "%llx", &i);
-    assert(res);
-    return (uint64)i;
-#else
-    uint64 i = 0;
-#ifndef NDEBUG
-    int res =
-#endif
-        azsscanf(buf, "%I64x", &i);
-    assert(res);
-    return i;
-#endif
-}
-
-void shGetVector(char* buf, Vec3& v)
-{
-    if (!buf)
-    {
-        return;
-    }
-#ifndef NDEBUG
-    int res =
-#endif
-        azsscanf(buf, "%f %f %f", &v[0], &v[1], &v[2]);
-    assert(res);
-}
-
-void shGetVector(char* buf, float v[3])
-{
-    if (!buf)
-    {
-        return;
-    }
-#ifndef NDEBUG
-    int res =
-#endif
-        azsscanf(buf, "%f %f %f", &v[0], &v[1], &v[2]);
-    assert(res);
-}
-
-void shGetVector4(char* buf, Vec4& v)
-{
-    if (!buf)
-    {
-        return;
-    }
-#ifndef NDEBUG
-    int res =
-#endif
-        azsscanf(buf, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w);
-    assert(res);
-}
-
-static struct SColAsc
-{
-    const char* nam;
-    ColorF col;
-
-    SColAsc(const char* name, const ColorF& c)
-    {
-        nam = name;
-        col = c;
-    }
-} sCols[] =
-{
-    SColAsc("Aquamarine", Col_Aquamarine),
-    SColAsc("Black", Col_Black),
-    SColAsc("Blue", Col_Blue),
-    SColAsc("BlueViolet", Col_BlueViolet),
-    SColAsc("Brown", Col_Brown),
-    SColAsc("CadetBlue", Col_CadetBlue),
-    SColAsc("Coral", Col_Coral),
-    SColAsc("CornflowerBlue", Col_CornflowerBlue),
-    SColAsc("Cyan", Col_Cyan),
-    SColAsc("DarkGray", Col_DarkGray),
-    SColAsc("DarkGrey", Col_DarkGrey),
-    SColAsc("DarkGreen", Col_DarkGreen),
-    SColAsc("DarkOliveGreen", Col_DarkOliveGreen),
-    SColAsc("DarkOrchid", Col_DarkOrchid),
-    SColAsc("DarkSlateBlue", Col_DarkSlateBlue),
-    SColAsc("DarkSlateGray", Col_DarkSlateGray),
-    SColAsc("DarkSlateGrey", Col_DarkSlateGrey),
-    SColAsc("DarkTurquoise", Col_DarkTurquoise),
-    SColAsc("DarkWood", Col_DarkWood),
-    SColAsc("DeepPink", Col_DeepPink),
-    SColAsc("DimGray", Col_DimGray),
-    SColAsc("DimGrey", Col_DimGrey),
-    SColAsc("FireBrick", Col_FireBrick),
-    SColAsc("ForestGreen", Col_ForestGreen),
-    SColAsc("Gold", Col_Gold),
-    SColAsc("Goldenrod", Col_Goldenrod),
-    SColAsc("Gray", Col_Gray),
-    SColAsc("Grey", Col_Grey),
-    SColAsc("Green", Col_Green),
-    SColAsc("GreenYellow", Col_GreenYellow),
-    SColAsc("IndianRed", Col_IndianRed),
-    SColAsc("Khaki", Col_Khaki),
-    SColAsc("LightBlue", Col_LightBlue),
-    SColAsc("LightGray", Col_LightGray),
-    SColAsc("LightGrey", Col_LightGrey),
-    SColAsc("LightSteelBlue", Col_LightSteelBlue),
-    SColAsc("LightWood", Col_LightWood),
-    SColAsc("Lime", Col_Lime),
-    SColAsc("LimeGreen", Col_LimeGreen),
-    SColAsc("Magenta", Col_Magenta),
-    SColAsc("Maroon", Col_Maroon),
-    SColAsc("MedianWood", Col_MedianWood),
-    SColAsc("MediumAquamarine", Col_MediumAquamarine),
-    SColAsc("MediumBlue", Col_MediumBlue),
-    SColAsc("MediumForestGreen", Col_MediumForestGreen),
-    SColAsc("MediumGoldenrod", Col_MediumGoldenrod),
-    SColAsc("MediumOrchid", Col_MediumOrchid),
-    SColAsc("MediumSeaGreen", Col_MediumSeaGreen),
-    SColAsc("MediumSlateBlue", Col_MediumSlateBlue),
-    SColAsc("MediumSpringGreen", Col_MediumSpringGreen),
-    SColAsc("MediumTurquoise", Col_MediumTurquoise),
-    SColAsc("MediumVioletRed", Col_MediumVioletRed),
-    SColAsc("MidnightBlue", Col_MidnightBlue),
-    SColAsc("Navy", Col_Navy),
-    SColAsc("NavyBlue", Col_NavyBlue),
-    SColAsc("Orange", Col_Orange),
-    SColAsc("OrangeRed", Col_OrangeRed),
-    SColAsc("Orchid", Col_Orchid),
-    SColAsc("PaleGreen", Col_PaleGreen),
-    SColAsc("Pink", Col_Pink),
-    SColAsc("Plum", Col_Plum),
-    SColAsc("Red", Col_Red),
-    SColAsc("Salmon", Col_Salmon),
-    SColAsc("SeaGreen", Col_SeaGreen),
-    SColAsc("Sienna", Col_Sienna),
-    SColAsc("SkyBlue", Col_SkyBlue),
-    SColAsc("SlateBlue", Col_SlateBlue),
-    SColAsc("SpringGreen", Col_SpringGreen),
-    SColAsc("SteelBlue", Col_SteelBlue),
-    SColAsc("Tan", Col_Tan),
-    SColAsc("Thistle", Col_Thistle),
-    SColAsc("Turquoise", Col_Turquoise),
-    SColAsc("Violet", Col_Violet),
-    SColAsc("VioletRed", Col_VioletRed),
-    SColAsc("Wheat", Col_Wheat),
-    SColAsc("White", Col_White),
-    SColAsc("Yellow", Col_Yellow),
-    SColAsc("YellowGreen", Col_YellowGreen),
-
-    SColAsc(NULL, ColorF(1.0f, 1.0f, 1.0f))
-};
-
-#include <ctype.h>
-
-void shGetColor(const char* buf, ColorF& v)
-{
-    char name[64];
-    int n;
-
-    if (!buf)
-    {
-        v = Col_White;
-        return;
-    }
-    if (buf[0] == '{')
-    {
-        buf++;
-    }
-    if (isalpha((unsigned char)buf[0]))
-    {
-        n = 0;
-        float scal = 1;
-        azstrcpy(name, AZ_ARRAY_SIZE(name), buf);
-        char nm[64];
-        if (strchr(buf, '*'))
-        {
-            while (buf[n] != '*')
-            {
-                if (buf[n] == 0x20)
-                {
-                    break;
-                }
-                nm[n] = buf[n];
-                n++;
-            }
-            nm[n] = 0;
-            if (buf[n] == 0x20)
-            {
-                while (buf[n] != '*')
-                {
-                    n++;
-                }
-            }
-            n++;
-            while (buf[n] == 0x20)
-            {
-                n++;
-            }
-            scal = shGetFloat(&buf[n]);
-            azstrcpy(name, AZ_ARRAY_SIZE(name), nm);
-        }
-        n = 0;
-        while (sCols[n].nam)
-        {
-            if (!azstricmp(sCols[n].nam, name))
-            {
-                v = sCols[n].col;
-                if (scal != 1)
-                {
-                    v.ScaleCol(scal);
-                }
-                return;
-            }
-            n++;
-        }
-    }
-    n = 0;
-    while (true)
-    {
-        if (n == 4)
-        {
-            break;
-        }
-        char par[64];
-        par[0] = 0;
-        fxFillNumber((char**)&buf, par);
-        if (!par[0])
-        {
-            break;
-        }
-        v[n++] = (float)atof(par);
-    }
-
-    //v.Clamp();
-}
-
-void shGetColor(char* buf, float v[4])
-{
-    char name[64];
-
-    if (!buf)
-    {
-        v[0] = 1.0f;
-        v[1] = 1.0f;
-        v[2] = 1.0f;
-        v[3] = 1.0f;
-        return;
-    }
-    if (isalpha((unsigned char)buf[0]))
-    {
-        int n = 0;
-        float scal = 1;
-        azstrcpy(name, AZ_ARRAY_SIZE(name), buf);
-        char nm[64];
-        if (strchr(buf, '*'))
-        {
-            while (buf[n] != '*')
-            {
-                if (buf[n] == 0x20)
-                {
-                    break;
-                }
-                nm[n] = buf[n];
-                n++;
-            }
-            nm[n] = 0;
-            if (buf[n] == 0x20)
-            {
-                while (buf[n] != '*')
-                {
-                    n++;
-                }
-            }
-            n++;
-            while (buf[n] == 0x20)
-            {
-                n++;
-            }
-            scal = shGetFloat(&buf[n]);
-            azstrcpy(name, AZ_ARRAY_SIZE(name), nm);
-        }
-        n = 0;
-        while (sCols[n].nam)
-        {
-            if (!azstricmp(sCols[n].nam, name))
-            {
-                v[0] = sCols[n].col[0];
-                v[1] = sCols[n].col[1];
-                v[2] = sCols[n].col[2];
-                v[3] = sCols[n].col[3];
-                if (scal != 1)
-                {
-                    v[0] *= scal;
-                    v[1] *= scal;
-                    v[2] *= scal;
-                }
-                return;
-            }
-            n++;
-        }
-    }
-    int n = azsscanf(buf, "%f %f %f %f", &v[0], &v[1], &v[2], &v[3]);
-    switch (n)
-    {
-    case 0:
-        v[0] = v[1] = v[2] = v[3] = 1.0f;
-        break;
-
-    case 1:
-        v[1] = v[2] = v[3] = 1.0f;
-        break;
-
-    case 2:
-        v[2] = v[3] = 1.0f;
-        break;
-
-    case 3:
-        v[3] = 1.0f;
-        break;
-    }
-    //v.Clamp();
-}
-
-//=========================================================================================
-
-char* GetAssignmentText (char** buf)
-{
-    SkipCharacters (buf, kWhiteSpace);
-    char* result = *buf;
-
-    char theChar;
-
-    PREFAST_SUPPRESS_WARNING(28182)
-    while ((theChar = **buf) != 0)
-    {
-        if (theChar == '[')
-        {
-            while ((theChar = **buf) != ']')
-            {
-                if (theChar == 0 || theChar == ';')
-                {
-                    break;
-                }
-                ++*buf;
-            }
-            continue;
-        }
-        if (theChar <= 0x20 || theChar == ';')
-        {
-            break;
-        }
-        ++*buf;
-    }
-
-    PREFAST_ASSUME(*buf);
-    **buf = 0;
-    if (theChar)
-    {
-        ++*buf;
-    }
-    return result;
-}
-
-char* GetSubText (char** buf, char open, char close)
-{
-    if (**buf == 0 || **buf != open)
-    {
-        return 0;
-    }
-    ++*buf;
-    char* result = *buf;
-
-    char theChar;
-    long skip = 1;
-
-    if (open == close)
-    {
-        open = 0;
-    }
-    while ((theChar = **buf) != 0)
-    {
-        if (theChar == open)
-        {
-            ++skip;
-        }
-        if (theChar == close)
-        {
-            if (--skip == 0)
-            {
-                **buf = 0;
-                ++*buf;
-                break;
-            }
-        }
-        ++*buf;
-    }
-    return result;
-}
-
-_inline static int IsComment(char** buf)
-{
-    if (!(*buf))
-    {
-        return 0;
-    }
-
-    if ((*buf)[0] == '/' && (*buf)[1] == '/')
-    {
-        return 2;
-    }
-
-    if ((*buf)[0] == '/' && (*buf)[1] == '*')
-    {
-        return 3;
-    }
-
-    return 0;
-}
-
-void SkipComments(char** buf, bool bSkipWhiteSpace)
-{
-    int n;
-    static int m;
-
-    n = IsComment(buf);
-    while (n)
-    {
-        switch (n)
-        {
-        case 2:
-            // skip comment lines.
-            *buf = strchr (*buf, '\n');
-            if (*buf && bSkipWhiteSpace)
-            {
-                SkipCharacters (buf, kWhiteSpace);
-            }
-            break;
-
-        case 3:
-            // skip comment blocks.
-            m = 0;
-            do
-            {
-                *buf = strchr (*buf, '*');
-                if (!(*buf))
-                {
-                    break;
-                }
-                if ((*buf)[-1] == '/')
-                {
-                    *buf += 1;
-                    m++;
-                }
-                else
-                if ((*buf)[1] == '/')
-                {
-                    *buf += 2;
-                    m--;
-                }
-                else
-                {
-                    *buf += 1;
-                }
-            } while (m);
-            if (!(*buf))
-            {
-                iLog->Log ("Warning: Comment lines aren't closed\n");
-                break;
-            }
-            if (bSkipWhiteSpace)
-            {
-                SkipCharacters (buf, kWhiteSpace);
-            }
-            break;
-        }
-        n = IsComment(buf);
-    }
-}
-
-void fxSkipTillCR(char** buf)
-{
-    char ch;
-    while ((ch = **buf) != 0)
-    {
-        if (ch == 0xa)
-        {
-            break;
-        }
-        ++*buf;
-    }
-}
-
-bool fxCheckMacroses(char** str, int nPass)
-{
-    char tmpBuf[1024];
-    byte bRes[64];
-    byte bOr[64];
-    int nLevel = 0;
-    int i;
-    while (true)
-    {
-        SkipCharacters(str, kWhiteSpace);
-        if (**str == '(')
-        {
-            ++*str;
-            int n = 0;
-            int nD = 0;
-            while (true)
-            {
-                if (**str == '(')
-                {
-                    n++;
-                }
-                else
-                if (**str == ')')
-                {
-                    if (!n)
-                    {
-                        tmpBuf[nD] = 0;
-                        ++*str;
-                        break;
-                    }
-                    n--;
-                }
-                else
-                if (**str == 0)
-                {
-                    return false;
-                }
-                tmpBuf[nD++] = **str;
-                ++*str;
-            }
-            char* s = &tmpBuf[0];
-            bRes[nLevel] = fxCheckMacroses(&s, nPass);
-            nLevel++;
-            bOr[nLevel] = 255;
-        }
-        else
-        {
-            int n = 0;
-            while (true)
-            {
-                if (**str == '|' || **str == '&' || **str == 0)
-                {
-                    break;
-                }
-                if (**str <= 0x20)
-                {
-                    break;
-                }
-                tmpBuf[n++] = **str;
-                ++*str;
-            }
-            tmpBuf[n] = 0;
-            if (tmpBuf[0] != 0)
-            {
-                char* s = tmpBuf;
-                bool bNeg = false;
-                if (s[0] == '!')
-                {
-                    bNeg = true;
-                    s++;
-                }
-                const SMacroBinFX* pFound;
-                if (isdigit((unsigned)s[0]))
-                {
-                    if ((s[0] == '0' && s[1] == 'x') || s[0] != 0)
-                    {
-                        pFound = (SMacroBinFX*)1;
-                    }
-                    else
-                    {
-                        pFound = NULL;
-                    }
-                }
-                else
-                {
-                    bool bKey = false;
-                    uint32 nTok = CParserBin::NextToken(s, tmpBuf, bKey);
-                    if (nTok == eT_unknown)
-                    {
-                        nTok = CParserBin::GetCRC32(tmpBuf);
-                    }
-                    pFound = CParserBin::FindMacro(nTok, CParserBin::GetStaticMacroses());
-                }
-                bRes[nLevel] = (pFound) ? true : false;
-                if (bNeg)
-                {
-                    bRes[nLevel] = !bRes[nLevel];
-                }
-                nLevel++;
-                bOr[nLevel] = 255;
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-        SkipCharacters(str, kWhiteSpace);
-        if (**str == 0)
-        {
-            break;
-        }
-        char* s = *str;
-        if (s[0] == '|' && s[1] == '|')
-        {
-            bOr[nLevel] = true;
-            *str = s + 2;
-        }
-        else
-        if (s[0] == '&' && s[1] == '&')
-        {
-            bOr[nLevel] = false;
-            *str = s + 2;
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-    byte Res = false;
-    for (i = 0; i < nLevel; i++)
-    {
-        if (!i)
-        {
-            Res = bRes[i];
-        }
-        else
-        {
-            assert(bOr[i] != 255);
-            if (bOr[i])
-            {
-                Res = Res | bRes[i];
-            }
-            else
-            {
-                Res = Res & bRes[i];
-            }
-        }
-    }
-    return Res != 0;
-}
-
-bool fxIgnorePreprBlock(char** buf)
-{
-    int nLevel = 0;
-    bool bEnded = false;
-    SkipCharacters (buf, kWhiteSpace);
-    SkipComments(buf, true);
-    PREFAST_SUPPRESS_WARNING(6011)
-    while (**buf != 0)
-    {
-        char ch = **buf;
-        while (ch && SkipChar((unsigned)ch))
-        {
-            while ((ch = **buf) != 0)
-            {
-                if (ch == '/' && IsComment(buf))
-                {
-                    break;
-                }
-                if (!SkipChar(ch))
-                {
-                    break;
-                }
-                ++*buf;
-            }
-            SkipComments(buf, true);
-            ch = **buf;
-        }
-        char* posS = *buf;
-        char* st = posS;
-        PREFAST_ASSUME(posS);
-        if (*posS == '#')
-        {
-            posS++;
-            if (SkipChar(posS[0]))
-            {
-                while ((ch = *posS) != 0)
-                {
-                    if (!SkipChar(ch))
-                    {
-                        break;
-                    }
-                    posS++;
-                }
-            }
-            if (posS[0] == 'i' && posS[1] == 'f')
-            {
-                nLevel++;
-                *buf = posS + 2;
-                continue;
-            }
-            if (!strncmp(posS, "endif", 5))
-            {
-                if (!nLevel)
-                {
-                    *buf = st;
-                    bEnded = true;
-                    break;
-                }
-                nLevel--;
-                *buf = posS + 4;
-            }
-            else
-            if (!strncmp(posS, "else", 4) || !strncmp(posS, "elif", 4))
-            {
-                if (!nLevel)
-                {
-                    *buf = st;
-                    break;
-                }
-                *buf = posS + 4;
-            }
-        }
-        ch = **buf;
-        while (ch)
-        {
-            if (ch == '/' && IsComment(buf))
-            {
-                break;
-            }
-            if (SkipChar((unsigned)ch))
-            {
-                break;
-            }
-            ++*buf;
-            ch = **buf;
-        }
-    }
-    PREFAST_ASSUME(*buf);
-    if (!**buf)
-    {
-        assert(0);
-        Warning("Couldn't find #endif directive for associated #ifdef");
-        return false;
-    }
-
-    return bEnded;
-}
-
-int shGetObject (char** buf, STokenDesc* tokens, char** name, char** data)
-{
-start:
-    if (!*buf)
-    {
-        return 0;
-    }
-    SkipCharacters (buf, kWhiteSpace);
-    SkipComments(buf, true);
-
-    if (!(*buf) || !**buf)
-    {
-        return -2;
-    }
-
-    char* b = *buf;
-    if (b[0] == '#')
-    {
-        char nam[1024];
-        bool bPrepr = false;
-        if (!strncmp(b, "#if", 3))
-        {
-            bPrepr = true;
-            fxFillPr(buf, nam);
-            fxFillCR(buf, nam);
-            char* s = &nam[0];
-            bool bRes = fxCheckMacroses(&s, 0);
-            if (b[2] == 'n')
-            {
-                bRes = !bRes;
-            }
-            if (!bRes)
-            {
-                sfxIFDef.AddElem(false);
-                fxIgnorePreprBlock(buf);
-            }
-            else
-            {
-                sfxIFDef.AddElem(false);
-            }
-        }
-        else
-        if (!strncmp(b, "#else", 5))
-        {
-            fxFillPr(buf, nam);
-            bPrepr = true;
-            int nLevel = sfxIFDef.Num() - 1;
-            if (nLevel < 0)
-            {
-                assert(0);
-                Warning("#else without #ifdef");
-                return false;
-            }
-            if (sfxIFDef[nLevel] == true)
-            {
-                bool bEnded = fxIgnorePreprBlock(buf);
-                if (!bEnded)
-                {
-                    assert(0);
-                    Warning("#else or #elif after #else");
-                    return -1;
-                }
-            }
-        }
-        else
-        if (!strncmp(b, "#elif", 5))
-        {
-            fxFillPr(buf, nam);
-            bPrepr = true;
-            int nLevel = sfxIFDef.Num() - 1;
-            if (nLevel < 0)
-            {
-                assert(0);
-                Warning("#elif without #ifdef");
-                return -1;
-            }
-            if (sfxIFDef[nLevel] == true)
-            {
-                fxIgnorePreprBlock(buf);
-            }
-            else
-            {
-                fxFillCR(buf, nam);
-                char* s = &nam[0];
-                bool bRes = fxCheckMacroses(&s, 0);
-                if (!bRes)
-                {
-                    fxIgnorePreprBlock(buf);
-                }
-                else
-                {
-                    sfxIFDef[nLevel] = true;
-                }
-            }
-        }
-        else
-        if (!strncmp(b, "#endif", 6))
-        {
-            fxFillPr(buf, nam);
-            bPrepr = true;
-            int nLevel = sfxIFDef.Num() - 1;
-            if (nLevel < 0)
-            {
-                assert(0);
-                Warning("#endif without #ifdef");
-                return -1;
-            }
-            sfxIFDef.Remove(nLevel);
-        }
-        if (bPrepr)
-        {
-            goto start;
-        }
-    }
-
-    STokenDesc* ptokens = tokens;
-    while (tokens->id != 0)
-    {
-        if (!_strnicmp(tokens->token, *buf, strlen(tokens->token)))
-        {
-            pCurCommand = *buf;
-            break;
-        }
-        ++tokens;
-    }
-    if (tokens->id == 0)
-    {
-        char* p = strchr (*buf, '\n');
-
-        char pp[1024];
-        if (p)
-        {
-            cry_strcpy(pp, *buf, (size_t)(p - *buf));
-            *buf = p;
-        }
-        else
-        {
-            cry_strcpy(pp, *buf);
-        }
-
-        iLog->Log ("Warning: Found token '%s' which was not one of the list (Skipping).\n", pp);
-        while (ptokens->id != 0)
-        {
-            iLog->Log ("    %s\n", ptokens->token);
-            ptokens++;
-        }
-        return 0;
-    }
-    *buf += strlen (tokens->token);
-    SkipCharacters (buf, kWhiteSpace);
-
-    *name = GetSubText (buf, 0x27, 0x27);
-    SkipCharacters (buf, kWhiteSpace);
-
-    if (**buf == '=')
-    {
-        ++*buf;
-        *data = GetAssignmentText (buf);
-    }
-    else
-    {
-        *data = GetSubText (buf, '(', ')');
-        if (!*data)
-        {
-            *data = GetSubText (buf, '{', '}');
-        }
-    }
-
-
-    return tokens->id;
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/Parser.h b/Code/CryEngine/RenderDll/Common/Shaders/Parser.h
deleted file mode 100644
index 8a21c49375..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/Parser.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-struct STokenDesc
-{
-    int  id;
-    const char* token;
-};
-int shGetObject(char** buf, STokenDesc* tokens, char** name, char** data);
-
-
-extern const char* kWhiteSpace;
-extern FXMacro sStaticMacros;
-
-bool SkipChar(unsigned int ch);
-
-void fxParserInit(void);
-
-void SkipCharacters(char** buf, const char* toSkip);
-void RemoveCR(char* buf);
-void SkipComments(char** buf, bool bSkipWhiteSpace);
-
-bool fxIsFirstPass(char* buf);
-void fxRegisterEnv(const char* szStr);
-
-int shFill(char** buf, char* dst, int nSize = -1);
-int fxFill(char** buf, char* dst, int nSize = -1);
-char* fxFillPr (char** buf, char* dst);
-char* fxFillPrC (char** buf, char* dst);
-char* fxFillNumber (char** buf, char* dst);
-int fxFillCR(char** buf, char* dst);
-
-bool shGetBool(char* buf);
-float shGetFloat(const char* buf);
-void shGetFloat(const char* buf, float* v1, float* v2);
-int shGetInt(const char* buf);
-int shGetHex(const char* buf);
-uint64 shGetHex64(const char* buf);
-void shGetVector(char* buf, Vec3& v);
-void shGetVector(char* buf, float v[3]);
-void shGetVector4(char* buf, vec4_t& v);
-void shGetColor(const char* buf, ColorF& v);
-void shGetColor(char* buf, float v[4]);
-int shGetVar (char** buf, char** vr, char** val);
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ParserBin.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ParserBin.cpp
deleted file mode 100644
index 71c99907f9..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ParserBin.cpp
+++ /dev/null
@@ -1,3730 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Script parser implementations.
-
-
-#include "RenderDll_precompiled.h"
-#include "CryCrc32.h"
-#include "../RenderCapabilities.h"
-#include <AzCore/std/string/string.h>
-#include <AzCore/PlatformId/PlatformId.h>
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define PARSERBIN_CPP_SECTION_1 1
-#define PARSERBIN_CPP_SECTION_2 2
-#endif
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-#include "../../XRenderD3D9/DriverD3D.h" // for gcpRendD3D
-#endif
-
-const char* g_KeyTokens[eT_max];
-TArray<bool> sfxIFDef;
-
-bool CParserBin::m_bEditable;
-uint32 CParserBin::m_nPlatform;
-AZ::PlatformID CParserBin::m_targetPlatform = AZ::PlatformID::PLATFORM_MAX;
-bool CParserBin::m_bEndians;
-bool CParserBin::m_bParseFX = true;
-bool CParserBin::m_bShaderCacheGen = false;
-
-ShaderBucketAllocator g_shaderBucketAllocator;
-
-IGeneralMemoryHeap* g_shaderGeneralHeap = nullptr;
-
-CParserBin::CParserBin(SShaderBin* pBin)
-{
-    m_pCurBinShader = pBin;
-    m_pCurShader = NULL;
-    GetISystem()->GetISystemEventDispatcher()->RegisterListener(this);
-}
-CParserBin::CParserBin(SShaderBin* pBin, CShader* pSH)
-{
-    m_pCurBinShader = pBin;
-    m_pCurShader = pSH;
-    GetISystem()->GetISystemEventDispatcher()->RegisterListener(this);
-}
-
-CParserBin::~CParserBin()
-{
-    sfxIFIgnore.clear();
-    sfxIFDef.clear();
-    GetISystem()->GetISystemEventDispatcher()->RemoveListener(this);
-}
-
-void CParserBin::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-    switch (event)
-    {
-        case ESYSTEM_EVENT_FULL_SHUTDOWN:
-        {
-            sfxIFIgnore.clear();
-            sfxIFDef.clear();
-        }
-        break;
-    }
-}
-
-uint32 CParserBin::GetCRC32(const char* szStr)
-{
-    uint32 nGen = CCrc32::Compute(szStr);
-    assert(nGen >= eT_user_first);
-
-    return nGen;
-}
-
-FXMacroBin CParserBin::m_StaticMacros;
-
-void CParserBin::Init()
-{
-    // Register key tokens
-    fxTokenKey("#include", eT_include);
-    fxTokenKey("#define", eT_define);
-    fxTokenKey("#undefine", eT_undefine);
-    fxTokenKey("#define", eT_define_2);
-    fxTokenKey("#fetchinst", eT_fetchinst);
-    fxTokenKey("#if", eT_if);
-    fxTokenKey("#ifdef", eT_ifdef);
-    fxTokenKey("#ifndef", eT_ifndef);
-    fxTokenKey("#if", eT_if_2);
-    fxTokenKey("#ifdef", eT_ifdef_2);
-    fxTokenKey("#ifndef", eT_ifndef_2);
-    fxTokenKey("#endif", eT_endif);
-    fxTokenKey("#else", eT_else);
-    fxTokenKey("#elif", eT_elif);
-    fxTokenKey("#warning", eT_warning);
-    fxTokenKey("#register_env", eT_register_env);
-    fxTokenKey("#ifcvar", eT_ifcvar);
-    fxTokenKey("#ifncvar", eT_ifncvar);
-    fxTokenKey("#elifcvar", eT_elifcvar);
-    fxTokenKey("#skip", eT_skip);
-    fxTokenKey("#skip_(", eT_skip_1);
-    fxTokenKey("#skip_)", eT_skip_2);
-
-    fxTokenKey("|", eT_or);
-    fxTokenKey("&", eT_and);
-
-    fxTokenKey("(", eT_br_rnd_1);
-    fxTokenKey(")", eT_br_rnd_2);
-    fxTokenKey("[", eT_br_sq_1);
-    fxTokenKey("]", eT_br_sq_2);
-    fxTokenKey("{", eT_br_cv_1);
-    fxTokenKey("}", eT_br_cv_2);
-    fxTokenKey("<", eT_br_tr_1);
-    fxTokenKey(">", eT_br_tr_2);
-    fxTokenKey(",", eT_comma);
-    fxTokenKey(".", eT_dot);
-    fxTokenKey(":", eT_colon);
-    fxTokenKey(";", eT_semicolumn);
-    fxTokenKey("!", eT_excl);
-    fxTokenKey("\"", eT_quote);
-    fxTokenKey("'", eT_sing_quote);
-
-    fxTokenKey("s0", eT_s0);
-    fxTokenKey("s1", eT_s1);
-    fxTokenKey("s2", eT_s2);
-    fxTokenKey("s3", eT_s3);
-    fxTokenKey("s4", eT_s4);
-    fxTokenKey("s5", eT_s5);
-    fxTokenKey("s6", eT_s6);
-    fxTokenKey("s7", eT_s7);
-    fxTokenKey("s8", eT_s8);
-    fxTokenKey("s9", eT_s9);
-    fxTokenKey("s10", eT_s10);
-    fxTokenKey("s11", eT_s11);
-    fxTokenKey("s12", eT_s12);
-    fxTokenKey("s13", eT_s13);
-    fxTokenKey("s14", eT_s14);
-    fxTokenKey("s15", eT_s15);
-
-    fxTokenKey("t0", eT_t0);
-    fxTokenKey("t1", eT_t1);
-    fxTokenKey("t2", eT_t2);
-    fxTokenKey("t3", eT_t3);
-    fxTokenKey("t4", eT_t4);
-    fxTokenKey("t5", eT_t5);
-    fxTokenKey("t6", eT_t6);
-    fxTokenKey("t7", eT_t7);
-    fxTokenKey("t8", eT_t8);
-    fxTokenKey("t9", eT_t9);
-    fxTokenKey("t10", eT_t10);
-    fxTokenKey("t11", eT_t11);
-    fxTokenKey("t12", eT_t12);
-    fxTokenKey("t13", eT_t13);
-    fxTokenKey("t14", eT_t14);
-    fxTokenKey("t15", eT_t15);
-
-    fxTokenKey("//", eT_comment);
-
-    fxTokenKey("?", eT_question);
-    fxTokenKey("=", eT_eq);
-    fxTokenKey("+", eT_plus);
-    fxTokenKey("-", eT_minus);
-    fxTokenKey("/", eT_div);
-    fxTokenKey("*", eT_mul);
-    fxTokenKey("dot", eT_dot_math);
-    fxTokenKey("mul", eT_mul_math);
-    fxTokenKey("sqrt", eT_sqrt_math);
-    fxTokenKey("exp", eT_exp_math);
-    fxTokenKey("log", eT_log_math);
-    fxTokenKey("log2", eT_log2_math);
-    fxTokenKey("sin", eT_sin_math);
-    fxTokenKey("cos", eT_cos_math);
-    fxTokenKey("sincos", eT_sincos_math);
-    fxTokenKey("floor", eT_floor_math);
-    fxTokenKey("floor", eT_ceil_math);
-    fxTokenKey("frac", eT_frac_math);
-    fxTokenKey("lerp", eT_lerp_math);
-    fxTokenKey("abs", eT_abs_math);
-    fxTokenKey("clamp", eT_clamp_math);
-    fxTokenKey("min", eT_min_math);
-    fxTokenKey("max", eT_max_math);
-    fxTokenKey("length", eT_length_math);
-
-    fxTokenKey("%_LT_LIGHTS", eT__LT_LIGHTS);
-    fxTokenKey("%_LT_NUM", eT__LT_NUM);
-    fxTokenKey("%_LT_HASPROJ", eT__LT_HASPROJ);
-    fxTokenKey("%_LT_0_TYPE", eT__LT_0_TYPE);
-    fxTokenKey("%_LT_1_TYPE", eT__LT_1_TYPE);
-    fxTokenKey("%_LT_2_TYPE", eT__LT_2_TYPE);
-    fxTokenKey("%_LT_3_TYPE", eT__LT_3_TYPE);
-    fxTokenKey("%_TT_TEXCOORD_MATRIX", eT__TT_TEXCOORD_MATRIX);
-    fxTokenKey("%_TT_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE", eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE);
-    fxTokenKey("%_TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE", eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE);
-    fxTokenKey("%_TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT", eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT);
-    fxTokenKey("%_TT_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL", eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL);
-    fxTokenKey("%_TT_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM", eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM);
-    fxTokenKey("%_TT_TEXCOORD_PROJ", eT__TT_TEXCOORD_PROJ);
-    fxTokenKey("%_VT_TYPE", eT__VT_TYPE);
-    fxTokenKey("%_VT_TYPE_MODIF", eT__VT_TYPE_MODIF);
-    fxTokenKey("%_VT_BEND", eT__VT_BEND);
-    fxTokenKey("%_VT_DET_BEND", eT__VT_DET_BEND);
-    fxTokenKey("%_VT_GRASS", eT__VT_GRASS);
-    fxTokenKey("%_VT_WIND", eT__VT_WIND);
-    fxTokenKey("%_VT_DEPTH_OFFSET", eT__VT_DEPTH_OFFSET);
-    fxTokenKey("%_FT_TEXTURE", eT__FT_TEXTURE);
-    fxTokenKey("%_FT_TEXTURE1", eT__FT_TEXTURE1);
-    fxTokenKey("%_FT_NORMAL", eT__FT_NORMAL);
-    fxTokenKey("%_FT_PSIZE", eT__FT_PSIZE);
-    fxTokenKey("%_FT_DIFFUSE", eT__FT_DIFFUSE);
-    fxTokenKey("%_FT_SPECULAR", eT__FT_SPECULAR);
-    fxTokenKey("%_FT_TANGENT_STREAM", eT__FT_TANGENT_STREAM);
-    fxTokenKey("%_FT_QTANGENT_STREAM", eT__FT_QTANGENT_STREAM);
-    fxTokenKey("%_FT_SKIN_STREAM", eT__FT_SKIN_STREAM);
-    fxTokenKey("%_FT_VERTEX_VELOCITY_STREAM", eT__FT_VERTEX_VELOCITY_STREAM);
-    fxTokenKey("%_FT_SRGBWRITE", eT__FT_SRGBWRITE);
-    fxTokenKey("%_FT0_COP", eT__FT0_COP);
-    fxTokenKey("%_FT0_AOP", eT__FT0_AOP);
-    fxTokenKey("%_FT0_CARG1", eT__FT0_CARG1);
-    fxTokenKey("%_FT0_CARG2", eT__FT0_CARG2);
-    fxTokenKey("%_FT0_AARG1", eT__FT0_AARG1);
-    fxTokenKey("%_FT0_AARG2", eT__FT0_AARG2);
-
-    fxTokenKey("%_VS", eT__VS);
-    fxTokenKey("%_PS", eT__PS);
-    fxTokenKey("%_GS", eT__GS);
-    fxTokenKey("%_HS", eT__HS);
-    fxTokenKey("%_DS", eT__DS);
-    fxTokenKey("%_CS", eT__CS);
-
-    FX_REGISTER_TOKEN(_g_SkinQuat);
-
-    FX_REGISTER_TOKEN(tex2D);
-    FX_REGISTER_TOKEN(tex2Dproj);
-    FX_REGISTER_TOKEN(tex3D);
-    FX_REGISTER_TOKEN(texCUBE);
-    FX_REGISTER_TOKEN(sampler1D);
-    FX_REGISTER_TOKEN(sampler2D);
-    FX_REGISTER_TOKEN(sampler3D);
-    FX_REGISTER_TOKEN(samplerCUBE);
-    FX_REGISTER_TOKEN(SamplerState);
-    FX_REGISTER_TOKEN(SamplerComparisonState);
-    FX_REGISTER_TOKEN(sampler_state);
-    FX_REGISTER_TOKEN(Texture2D);
-    FX_REGISTER_TOKEN(Texture2DArray);
-    FX_REGISTER_TOKEN(Texture2DMS);
-    FX_REGISTER_TOKEN(RWTexture2D);
-    FX_REGISTER_TOKEN(RWTexture2DArray);
-    FX_REGISTER_TOKEN(TextureCube);
-    FX_REGISTER_TOKEN(TextureCubeArray);
-    FX_REGISTER_TOKEN(Texture3D);
-    FX_REGISTER_TOKEN(RWTexture3D);
-
-    FX_REGISTER_TOKEN(float);
-    FX_REGISTER_TOKEN(float2);
-    FX_REGISTER_TOKEN(float3);
-    FX_REGISTER_TOKEN(float4);
-    FX_REGISTER_TOKEN(float4x4);
-    FX_REGISTER_TOKEN(float3x4);
-    FX_REGISTER_TOKEN(float2x4);
-    FX_REGISTER_TOKEN(float3x3);
-    FX_REGISTER_TOKEN(half);
-    FX_REGISTER_TOKEN(half2);
-    FX_REGISTER_TOKEN(half3);
-    FX_REGISTER_TOKEN(half4);
-    FX_REGISTER_TOKEN(half4x4);
-    FX_REGISTER_TOKEN(half3x4);
-    FX_REGISTER_TOKEN(half2x4);
-    FX_REGISTER_TOKEN(half3x3);
-    FX_REGISTER_TOKEN(bool);
-    FX_REGISTER_TOKEN(int);
-    FX_REGISTER_TOKEN(int2);
-    FX_REGISTER_TOKEN(int4);
-    FX_REGISTER_TOKEN(uint);
-    FX_REGISTER_TOKEN(uint2);
-    FX_REGISTER_TOKEN(uint4);
-
-    FX_REGISTER_TOKEN(inout);
-    FX_REGISTER_TOKEN(asm);
-
-    FX_REGISTER_TOKEN(struct);
-    FX_REGISTER_TOKEN(sampler);
-    FX_REGISTER_TOKEN(const);
-    FX_REGISTER_TOKEN(static);
-    FX_REGISTER_TOKEN(groupshared);
-    FX_REGISTER_TOKEN(TEXCOORDN);
-    FX_REGISTER_TOKEN(TEXCOORD0);
-    FX_REGISTER_TOKEN(TEXCOORD1);
-    FX_REGISTER_TOKEN(TEXCOORD2);
-    FX_REGISTER_TOKEN(TEXCOORD3);
-    FX_REGISTER_TOKEN(TEXCOORD4);
-    FX_REGISTER_TOKEN(TEXCOORD5);
-    FX_REGISTER_TOKEN(TEXCOORD6);
-    FX_REGISTER_TOKEN(TEXCOORD7);
-    FX_REGISTER_TOKEN(TEXCOORD8);
-    FX_REGISTER_TOKEN(TEXCOORD9);
-    FX_REGISTER_TOKEN(TEXCOORD10);
-    FX_REGISTER_TOKEN(TEXCOORD11);
-    FX_REGISTER_TOKEN(TEXCOORD12);
-    FX_REGISTER_TOKEN(TEXCOORD13);
-    FX_REGISTER_TOKEN(TEXCOORD14);
-    FX_REGISTER_TOKEN(TEXCOORD15);
-    FX_REGISTER_TOKEN(TEXCOORD16);
-    FX_REGISTER_TOKEN(TEXCOORD17);
-    FX_REGISTER_TOKEN(TEXCOORD18);
-    FX_REGISTER_TOKEN(TEXCOORD19);
-    FX_REGISTER_TOKEN(TEXCOORD20);
-    FX_REGISTER_TOKEN(TEXCOORD21);
-    FX_REGISTER_TOKEN(TEXCOORD22);
-    FX_REGISTER_TOKEN(TEXCOORD23);
-    FX_REGISTER_TOKEN(TEXCOORD24);
-    FX_REGISTER_TOKEN(TEXCOORD25);
-    FX_REGISTER_TOKEN(TEXCOORD26);
-    FX_REGISTER_TOKEN(TEXCOORD27);
-    FX_REGISTER_TOKEN(TEXCOORD28);
-    FX_REGISTER_TOKEN(TEXCOORD29);
-    FX_REGISTER_TOKEN(TEXCOORD30);
-    FX_REGISTER_TOKEN(TEXCOORD31);
-    FX_REGISTER_TOKEN(TEXCOORDN_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD0_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD1_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD2_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD3_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD4_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD5_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD6_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD7_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD8_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD9_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD10_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD11_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD12_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD13_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD14_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD15_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD16_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD17_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD18_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD19_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD20_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD21_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD22_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD23_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD24_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD25_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD26_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD27_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD28_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD29_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD30_centroid);
-    FX_REGISTER_TOKEN(TEXCOORD31_centroid);
-    FX_REGISTER_TOKEN(COLOR0);
-
-    FX_REGISTER_TOKEN(packoffset);
-    FX_REGISTER_TOKEN(register);
-    FX_REGISTER_TOKEN(return );
-    FX_REGISTER_TOKEN(vsregister);
-    FX_REGISTER_TOKEN(psregister);
-    FX_REGISTER_TOKEN(gsregister);
-    FX_REGISTER_TOKEN(dsregister);
-    FX_REGISTER_TOKEN(hsregister);
-    FX_REGISTER_TOKEN(csregister);
-    FX_REGISTER_TOKEN(slot);
-    FX_REGISTER_TOKEN(vsslot);
-    FX_REGISTER_TOKEN(psslot);
-    FX_REGISTER_TOKEN(gsslot);
-    FX_REGISTER_TOKEN(dsslot);
-    FX_REGISTER_TOKEN(hsslot);
-    FX_REGISTER_TOKEN(csslot);
-    FX_REGISTER_TOKEN(color);
-
-    FX_REGISTER_TOKEN(Buffer);
-    FX_REGISTER_TOKEN(RWBuffer);
-    FX_REGISTER_TOKEN(StructuredBuffer);
-    FX_REGISTER_TOKEN(RWStructuredBuffer);
-    FX_REGISTER_TOKEN(ByteAddressBuffer);
-    FX_REGISTER_TOKEN(RWByteAddressBuffer);
-    FX_REGISTER_TOKEN(RasterizerOrderedBuffer);
-    FX_REGISTER_TOKEN(RasterizerOrderedByteAddressBuffer);
-    FX_REGISTER_TOKEN(RasterizerOrderedStructuredBuffer);
-
-    FX_REGISTER_TOKEN(Position);
-    FX_REGISTER_TOKEN(Allways);
-
-    FX_REGISTER_TOKEN(STANDARDSGLOBAL);
-
-    FX_REGISTER_TOKEN(technique);
-    FX_REGISTER_TOKEN(string);
-    FX_REGISTER_TOKEN(UIName);
-    FX_REGISTER_TOKEN(UIDescription);
-    FX_REGISTER_TOKEN(UIWidget);
-    FX_REGISTER_TOKEN(UIWidget0);
-    FX_REGISTER_TOKEN(UIWidget1);
-    FX_REGISTER_TOKEN(UIWidget2);
-    FX_REGISTER_TOKEN(UIWidget3);
-
-    FX_REGISTER_TOKEN(Texture);
-    FX_REGISTER_TOKEN(Filter);
-    FX_REGISTER_TOKEN(MinFilter);
-    FX_REGISTER_TOKEN(MagFilter);
-    FX_REGISTER_TOKEN(MipFilter);
-    FX_REGISTER_TOKEN(AddressU);
-    FX_REGISTER_TOKEN(AddressV);
-    FX_REGISTER_TOKEN(AddressW);
-    FX_REGISTER_TOKEN(BorderColor);
-    FX_REGISTER_TOKEN(AnisotropyLevel);
-    FX_REGISTER_TOKEN(sRGBLookup);
-    FX_REGISTER_TOKEN(Global);
-
-    FX_REGISTER_TOKEN(LINEAR);
-    FX_REGISTER_TOKEN(POINT);
-    FX_REGISTER_TOKEN(NONE);
-    FX_REGISTER_TOKEN(ANISOTROPIC);
-    FX_REGISTER_TOKEN(MIN_MAG_MIP_POINT);
-    FX_REGISTER_TOKEN(MIN_MAG_MIP_LINEAR);
-    FX_REGISTER_TOKEN(MIN_MAG_LINEAR_MIP_POINT);
-    FX_REGISTER_TOKEN(COMPARISON_MIN_MAG_LINEAR_MIP_POINT);
-    FX_REGISTER_TOKEN(MINIMUM_MIN_MAG_MIP_LINEAR);
-    FX_REGISTER_TOKEN(MAXIMUM_MIN_MAG_MIP_LINEAR);
-
-    FX_REGISTER_TOKEN(Clamp);
-    FX_REGISTER_TOKEN(Border);
-    FX_REGISTER_TOKEN(Wrap);
-    FX_REGISTER_TOKEN(Mirror);
-
-    FX_REGISTER_TOKEN(Script);
-
-    FX_REGISTER_TOKEN(RenderOrder);
-    FX_REGISTER_TOKEN(ProcessOrder);
-    FX_REGISTER_TOKEN(RenderCamera);
-    FX_REGISTER_TOKEN(RenderType);
-    FX_REGISTER_TOKEN(RenderFilter);
-    FX_REGISTER_TOKEN(RenderColorTarget1);
-    FX_REGISTER_TOKEN(RenderDepthStencilTarget);
-    FX_REGISTER_TOKEN(ClearSetColor);
-    FX_REGISTER_TOKEN(ClearSetDepth);
-    FX_REGISTER_TOKEN(ClearTarget);
-    FX_REGISTER_TOKEN(RenderTarget_IDPool);
-    FX_REGISTER_TOKEN(RenderTarget_UpdateType);
-    FX_REGISTER_TOKEN(RenderTarget_Width);
-    FX_REGISTER_TOKEN(RenderTarget_Height);
-    FX_REGISTER_TOKEN(GenerateMips);
-
-    FX_REGISTER_TOKEN(PreProcess);
-    FX_REGISTER_TOKEN(PostProcess);
-    FX_REGISTER_TOKEN(PreDraw);
-
-    FX_REGISTER_TOKEN(WaterReflection);
-    FX_REGISTER_TOKEN(Panorama);
-
-    FX_REGISTER_TOKEN(WaterPlaneReflected);
-    FX_REGISTER_TOKEN(PlaneReflected);
-    FX_REGISTER_TOKEN(Current);
-
-    FX_REGISTER_TOKEN(CurObject);
-    FX_REGISTER_TOKEN(CurScene);
-    FX_REGISTER_TOKEN(RecursiveScene);
-    FX_REGISTER_TOKEN(CopyScene);
-
-    FX_REGISTER_TOKEN(Refractive);
-    FX_REGISTER_TOKEN(ForceRefractionUpdate);
-    FX_REGISTER_TOKEN(Heat);
-
-    FX_REGISTER_TOKEN(DepthBuffer);
-    FX_REGISTER_TOKEN(DepthBufferTemp);
-    FX_REGISTER_TOKEN(DepthBufferOrig);
-
-    FX_REGISTER_TOKEN($ScreenSize);
-    FX_REGISTER_TOKEN(WaterReflect);
-    FX_REGISTER_TOKEN(FogColor);
-
-    FX_REGISTER_TOKEN(Color);
-    FX_REGISTER_TOKEN(Depth);
-
-    FX_REGISTER_TOKEN($RT_2D);
-    FX_REGISTER_TOKEN($RT_Cube);
-
-    FX_REGISTER_TOKEN(pass);
-    FX_REGISTER_TOKEN(CustomRE);
-    FX_REGISTER_TOKEN(Style);
-
-    FX_REGISTER_TOKEN(VertexShader);
-    FX_REGISTER_TOKEN(PixelShader);
-    FX_REGISTER_TOKEN(GeometryShader);
-    FX_REGISTER_TOKEN(DomainShader);
-    FX_REGISTER_TOKEN(HullShader);
-    FX_REGISTER_TOKEN(ComputeShader);
-    FX_REGISTER_TOKEN(ZEnable);
-    FX_REGISTER_TOKEN(ZWriteEnable);
-    FX_REGISTER_TOKEN(CullMode);
-    FX_REGISTER_TOKEN(SrcBlend);
-    FX_REGISTER_TOKEN(DestBlend);
-    FX_REGISTER_TOKEN(AlphaBlendEnable);
-    FX_REGISTER_TOKEN(AlphaFunc);
-    FX_REGISTER_TOKEN(AlphaRef);
-    FX_REGISTER_TOKEN(ZFunc);
-    FX_REGISTER_TOKEN(ColorWriteEnable);
-    FX_REGISTER_TOKEN(IgnoreMaterialState);
-
-    FX_REGISTER_TOKEN(None);
-    FX_REGISTER_TOKEN(Disable);
-    FX_REGISTER_TOKEN(CCW);
-    FX_REGISTER_TOKEN(CW);
-    FX_REGISTER_TOKEN(Back);
-    FX_REGISTER_TOKEN(Front);
-
-    FX_REGISTER_TOKEN(Never);
-    FX_REGISTER_TOKEN(Less);
-    FX_REGISTER_TOKEN(Equal);
-    FX_REGISTER_TOKEN(LEqual);
-    FX_REGISTER_TOKEN(LessEqual);
-    FX_REGISTER_TOKEN(NotEqual);
-    FX_REGISTER_TOKEN(GEqual);
-    FX_REGISTER_TOKEN(GreaterEqual);
-    FX_REGISTER_TOKEN(Greater)
-    FX_REGISTER_TOKEN(Always);
-
-    FX_REGISTER_TOKEN(RED);
-    FX_REGISTER_TOKEN(GREEN);
-    FX_REGISTER_TOKEN(BLUE);
-    FX_REGISTER_TOKEN(ALPHA);
-
-    FX_REGISTER_TOKEN(ONE);
-    FX_REGISTER_TOKEN(ZERO);
-    FX_REGISTER_TOKEN(SRC_COLOR);
-    FX_REGISTER_TOKEN(SrcColor);
-    FX_REGISTER_TOKEN(ONE_MINUS_SRC_COLOR);
-    FX_REGISTER_TOKEN(InvSrcColor);
-    FX_REGISTER_TOKEN(SRC_ALPHA);
-    FX_REGISTER_TOKEN(SrcAlpha);
-    FX_REGISTER_TOKEN(ONE_MINUS_SRC_ALPHA);
-    FX_REGISTER_TOKEN(InvSrcAlpha);
-    FX_REGISTER_TOKEN(DST_ALPHA);
-    FX_REGISTER_TOKEN(DestAlpha);
-    FX_REGISTER_TOKEN(ONE_MINUS_DST_ALPHA);
-    FX_REGISTER_TOKEN(InvDestAlpha);
-    FX_REGISTER_TOKEN(DST_COLOR);
-    FX_REGISTER_TOKEN(DestColor);
-    FX_REGISTER_TOKEN(ONE_MINUS_DST_COLOR);
-    FX_REGISTER_TOKEN(InvDestColor);
-    FX_REGISTER_TOKEN(SRC_ALPHA_SATURATE);
-
-    FX_REGISTER_TOKEN(NULL);
-
-    FX_REGISTER_TOKEN(cbuffer);
-    FX_REGISTER_TOKEN(PER_BATCH);
-    FX_REGISTER_TOKEN(PER_INSTANCE);
-    FX_REGISTER_TOKEN(PER_FRAME);
-    FX_REGISTER_TOKEN(PER_MATERIAL);
-    FX_REGISTER_TOKEN(PER_SHADOWGEN);
-
-    FX_REGISTER_TOKEN(ShaderType);
-    FX_REGISTER_TOKEN(ShaderDrawType);
-    FX_REGISTER_TOKEN(PreprType);
-    FX_REGISTER_TOKEN(Public);
-    FX_REGISTER_TOKEN(NoPreview);
-    FX_REGISTER_TOKEN(LocalConstants);
-    FX_REGISTER_TOKEN(Cull);
-    FX_REGISTER_TOKEN(SupportsAttrInstancing);
-    FX_REGISTER_TOKEN(SupportsConstInstancing);
-    FX_REGISTER_TOKEN(SupportsDeferredShading);
-    FX_REGISTER_TOKEN(SupportsFullDeferredShading);
-    FX_REGISTER_TOKEN(Decal);
-    FX_REGISTER_TOKEN(DecalNoDepthOffset);
-    FX_REGISTER_TOKEN(NoChunkMerging);
-    FX_REGISTER_TOKEN(ForceTransPass);
-    FX_REGISTER_TOKEN(AfterHDRPostProcess);
-    FX_REGISTER_TOKEN(AfterPostProcess);
-    FX_REGISTER_TOKEN(ForceZpass);
-    FX_REGISTER_TOKEN(ForceWaterPass);
-    FX_REGISTER_TOKEN(ForceDrawLast);
-    FX_REGISTER_TOKEN(ForceDrawFirst);
-    FX_REGISTER_TOKEN(ForceDrawAfterWater);
-    FX_REGISTER_TOKEN(DepthFixup);
-    FX_REGISTER_TOKEN(SingleLightPass);
-    FX_REGISTER_TOKEN(HWTessellation);
-    FX_REGISTER_TOKEN(VertexColors);
-    FX_REGISTER_TOKEN(WaterParticle);
-    FX_REGISTER_TOKEN(AlphaBlendShadows);
-    FX_REGISTER_TOKEN(ZPrePass);
-
-    FX_REGISTER_TOKEN(VT_DetailBendingGrass);
-    FX_REGISTER_TOKEN(VT_DetailBending);
-    FX_REGISTER_TOKEN(VT_WindBending);
-
-    FX_REGISTER_TOKEN(Light);
-    FX_REGISTER_TOKEN(Shadow);
-    FX_REGISTER_TOKEN(Fur);
-    FX_REGISTER_TOKEN(General);
-    FX_REGISTER_TOKEN(Terrain);
-    FX_REGISTER_TOKEN(Overlay);
-    FX_REGISTER_TOKEN(NoDraw);
-    FX_REGISTER_TOKEN(Custom);
-    FX_REGISTER_TOKEN(Sky);
-    FX_REGISTER_TOKEN(OceanShore);
-    FX_REGISTER_TOKEN(Hair);
-    FX_REGISTER_TOKEN(Compute);
-    FX_REGISTER_TOKEN(SkinPass);
-    FX_REGISTER_TOKEN(ForceGeneralPass);
-    FX_REGISTER_TOKEN(EyeOverlay);
-
-    FX_REGISTER_TOKEN(Metal);
-    FX_REGISTER_TOKEN(Ice);
-    FX_REGISTER_TOKEN(Water);
-    FX_REGISTER_TOKEN(FX);
-    FX_REGISTER_TOKEN(HDR);
-    FX_REGISTER_TOKEN(Glass);
-    FX_REGISTER_TOKEN(Vegetation);
-    FX_REGISTER_TOKEN(Particle);
-    FX_REGISTER_TOKEN(GenerateSprites);
-    FX_REGISTER_TOKEN(GenerateClouds);
-    FX_REGISTER_TOKEN(ScanWater);
-
-    FX_REGISTER_TOKEN(NoLights);
-    FX_REGISTER_TOKEN(NoMaterialState);
-    FX_REGISTER_TOKEN(PositionInvariant);
-    FX_REGISTER_TOKEN(TechniqueZ);
-    FX_REGISTER_TOKEN(TechniqueZPrepass);
-    FX_REGISTER_TOKEN(TechniqueShadowGen);
-    FX_REGISTER_TOKEN(TechniqueMotionBlur);
-    FX_REGISTER_TOKEN(TechniqueCustomRender);
-    FX_REGISTER_TOKEN(TechniqueEffectLayer);
-    FX_REGISTER_TOKEN(TechniqueDebug);
-    FX_REGISTER_TOKEN(TechniqueSoftAlphaTest);
-    FX_REGISTER_TOKEN(TechniqueWaterRefl);
-    FX_REGISTER_TOKEN(TechniqueWaterCaustic);
-    FX_REGISTER_TOKEN(TechniqueThickness);
-
-    FX_REGISTER_TOKEN(KeyFrameParams);
-    FX_REGISTER_TOKEN(KeyFrameRandColor);
-    FX_REGISTER_TOKEN(KeyFrameRandIntensity);
-    FX_REGISTER_TOKEN(KeyFrameRandSpecMult);
-    FX_REGISTER_TOKEN(KeyFrameRandPosOffset);
-    FX_REGISTER_TOKEN(Speed);
-
-    FX_REGISTER_TOKEN(Beam);
-    FX_REGISTER_TOKEN(LensOptics);
-    FX_REGISTER_TOKEN(Cloud);
-    FX_REGISTER_TOKEN(Ocean);
-
-    FX_REGISTER_TOKEN(Model);
-    FX_REGISTER_TOKEN(StartRadius);
-    FX_REGISTER_TOKEN(EndRadius);
-    FX_REGISTER_TOKEN(StartColor);
-    FX_REGISTER_TOKEN(EndColor);
-    FX_REGISTER_TOKEN(LightStyle);
-    FX_REGISTER_TOKEN(Length);
-
-    FX_REGISTER_TOKEN(RGBStyle);
-    FX_REGISTER_TOKEN(Scale);
-    FX_REGISTER_TOKEN(Blind);
-    FX_REGISTER_TOKEN(SizeBlindScale);
-    FX_REGISTER_TOKEN(SizeBlindBias);
-    FX_REGISTER_TOKEN(IntensBlindScale);
-    FX_REGISTER_TOKEN(IntensBlindBias);
-    FX_REGISTER_TOKEN(MinLight);
-    FX_REGISTER_TOKEN(DistFactor);
-    FX_REGISTER_TOKEN(DistIntensityFactor);
-    FX_REGISTER_TOKEN(FadeTime);
-    FX_REGISTER_TOKEN(Layer);
-    FX_REGISTER_TOKEN(Importance);
-    FX_REGISTER_TOKEN(VisAreaScale);
-
-    FX_REGISTER_TOKEN(Poly);
-    FX_REGISTER_TOKEN(Identity);
-    FX_REGISTER_TOKEN(FromObj);
-    FX_REGISTER_TOKEN(FromLight);
-    FX_REGISTER_TOKEN(Fixed);
-
-    FX_REGISTER_TOKEN(ParticlesFile);
-
-    FX_REGISTER_TOKEN(Gravity);
-    FX_REGISTER_TOKEN(WindDirection);
-    FX_REGISTER_TOKEN(WindSpeed);
-    FX_REGISTER_TOKEN(WaveHeight);
-    FX_REGISTER_TOKEN(DirectionalDependence);
-    FX_REGISTER_TOKEN(ChoppyWaveFactor);
-    FX_REGISTER_TOKEN(SuppressSmallWavesFactor);
-
-    FX_REGISTER_TOKEN(x);
-    FX_REGISTER_TOKEN(y);
-    FX_REGISTER_TOKEN(z);
-    FX_REGISTER_TOKEN(w);
-    FX_REGISTER_TOKEN(r);
-    FX_REGISTER_TOKEN(g);
-    FX_REGISTER_TOKEN(b);
-    FX_REGISTER_TOKEN(a);
-
-    FX_REGISTER_TOKEN(true);
-    FX_REGISTER_TOKEN(false);
-
-    FX_REGISTER_TOKEN(0);
-    FX_REGISTER_TOKEN(1);
-    FX_REGISTER_TOKEN(2);
-    FX_REGISTER_TOKEN(3);
-    FX_REGISTER_TOKEN(4);
-    FX_REGISTER_TOKEN(5);
-    FX_REGISTER_TOKEN(6);
-    FX_REGISTER_TOKEN(7);
-    FX_REGISTER_TOKEN(8);
-    FX_REGISTER_TOKEN(9);
-    FX_REGISTER_TOKEN(10);
-    FX_REGISTER_TOKEN(11);
-    FX_REGISTER_TOKEN(12);
-    FX_REGISTER_TOKEN(13);
-    FX_REGISTER_TOKEN(14);
-    FX_REGISTER_TOKEN(15);
-    FX_REGISTER_TOKEN(16);
-    FX_REGISTER_TOKEN(17);
-    FX_REGISTER_TOKEN(18);
-    FX_REGISTER_TOKEN(19);
-    FX_REGISTER_TOKEN(20);
-    FX_REGISTER_TOKEN(21);
-    FX_REGISTER_TOKEN(22);
-    FX_REGISTER_TOKEN(23);
-    FX_REGISTER_TOKEN(24);
-
-    FX_REGISTER_TOKEN(ORBIS);
-    FX_REGISTER_TOKEN(PCDX11);
-    FX_REGISTER_TOKEN(GL4);
-    FX_REGISTER_TOKEN(GLES3);
-    FX_REGISTER_TOKEN(METAL);
-    FX_REGISTER_TOKEN(OSXMETAL);
-    FX_REGISTER_TOKEN(IOSMETAL);
-
-    FX_REGISTER_TOKEN(STANDARDSGLOBAL);
-
-    FX_REGISTER_TOKEN(GLES3_0);
-
-    FX_REGISTER_TOKEN(Load);
-    FX_REGISTER_TOKEN(Sample);
-    FX_REGISTER_TOKEN(Gather);
-    FX_REGISTER_TOKEN(GatherRed);
-    FX_REGISTER_TOKEN(GatherGreen);
-    FX_REGISTER_TOKEN(GatherBlue);
-    FX_REGISTER_TOKEN(GatherAlpha);
- 
-    FXMacroItor it;
-    for (it = sStaticMacros.begin(); it != sStaticMacros.end(); it++)
-    {
-        bool bKey = false;
-        uint32 nName = CParserBin::fxToken(it->first.c_str(), &bKey);
-        if (!bKey)
-        {
-            nName = GetCRC32(it->first.c_str());
-        }
-        SMacroFX* pr = &it->second;
-        uint32 nMacros = 0;
-        uint32 Macro[64];
-        if (pr->m_szMacro[0])
-        {
-            char* szBuf = (char*)pr->m_szMacro.c_str();
-            SkipCharacters (&szBuf, " ");
-            if (!szBuf[0])
-            {
-                break;
-            }
-            char com[1024];
-            bKey = false;
-            uint32 dwToken = CParserBin::NextToken(szBuf, com, bKey);
-            if (!bKey)
-            {
-                dwToken = GetCRC32(com);
-            }
-            Macro[nMacros++] = dwToken;
-        }
-        AddMacro(nName, Macro, nMacros, pr->m_nMask, m_StaticMacros);
-    }
-    sStaticMacros.clear();
-
-    if (!CParserBin::m_bShaderCacheGen)
-    {
-#if defined(CRY_USE_METAL)
-        SetupForMETAL();
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PARSERBIN_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(ParserBin_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(OPENGL_ES) && DXGL_INPUT_GLSL
-        SetupForGLES3();
-#elif defined(OPENGL) && DXGL_INPUT_GLSL
-        SetupForGL4();
-#else
-        SetupForD3D11();
-#endif
-    }
-}
-
-void CParserBin::SetupTargetPlatform()
-{
-#if !defined(CONSOLE)
-    if (CParserBin::m_bShaderCacheGen)
-    {
-        m_targetPlatform = static_cast<AZ::PlatformID>(CRenderer::CV_r_shadersPlatform);
-    }
-    else
-#endif // !defined(CONSOLE)
-    {
-        m_targetPlatform = AZ::g_currentPlatform;
-    }
-}
-
-void CParserBin::SetupForD3D11()
-{
-    CleanPlatformMacros();
-    SetupTargetPlatform();
-
-    uint32 nMacro[1] = {eT_1};
-
-    AddMacro(CParserBin::fxToken("PCDX11"), nMacro, 1, 0, m_StaticMacros);
-
-    m_nPlatform = SF_D3D11;
-
-    SetupShadersCacheAndFilter();
-
-    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);
-}
-
-void CParserBin::SetupForGL4()
-{
-    CleanPlatformMacros();
-    SetupTargetPlatform();
-    uint32 nMacro[1] = {eT_1};
-
-    AddMacro(CParserBin::fxToken("GL4"), nMacro, 1, 0, m_StaticMacros);
-
-    if (!gRenDev->IsShaderCacheGenMode())
-    {
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_ShadersUseLLVMDirectXCompiler)
-        {
-            gRenDev->m_cEF.AddStaticFlag(HWSST_LLVM_DIRECTX_SHADER_COMPILER);
-        }
-    }
-
-    m_nPlatform = SF_GL4;
-
-    SetupShadersCacheAndFilter();
-
-    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);
-}
-
-void CParserBin::SetupForGLES3()
-{
-    CleanPlatformMacros();
-    SetupTargetPlatform();
-    uint32 nMacro[1] = {eT_1};
-
-    AddMacro(CParserBin::fxToken("GLES3"), nMacro, 1, 0, m_StaticMacros);
-    // Forcing small uniform buffers since  OpenGLES only guarantees 16k of space for uniform blocks.
-    // We don't do it per device because that would add extra permutations.
-    AddMacro(CParserBin::GetCRC32("SMALL_UNIFORM_BUFFERS"), nMacro, 1, 0, m_StaticMacros);
-
-    m_nPlatform = SF_GLES3;
-    if (!gRenDev->IsShaderCacheGenMode())
-    {
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_ShadersUseLLVMDirectXCompiler)
-        {
-            gRenDev->m_cEF.AddStaticFlag(HWSST_LLVM_DIRECTX_SHADER_COMPILER);
-        }
-#if defined(OPENGL_ES)
-        AZ_Assert(gcpRendD3D, "Null CD3D9Renderer");
-        uint32 glVersion = RenderCapabilities::GetDeviceGLVersion();
-        AZ_Assert(glVersion >= DXGLES_VERSION_30, "Invalid OpenGL version %lu", static_cast<unsigned long>(glVersion));
-        if (glVersion == DXGLES_VERSION_30)
-        {
-            gRenDev->m_cEF.AddStaticFlag(HWSST_GLES3_0);
-        }
-
-        if (!gcpRendD3D->UseHalfFloatRenderTargets())
-        {
-            gRenDev->m_cEF.AddStaticFlag(HWSST_FIXED_POINT);
-        }
-#endif // defined(OPENGL_ES)
-    }
-
-    SetupShadersCacheAndFilter();
-    SetupFeatureDefines();
-    SetupForGMEM(CRenderer::CV_r_EnableGMEMPath);
-    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);
-}
-
-
-void CParserBin::RemoveGMEMStaticFlags()
-{
-    gRenDev->m_cEF.RemoveStaticFlag(HWSST_GMEM_256BPP);
-    gRenDev->m_cEF.RemoveStaticFlag(HWSST_GMEM_128BPP);
-    gRenDev->m_cEF.RemoveStaticFlag(HWSST_GMEM_PLS);
-    gRenDev->m_cEF.RemoveStaticFlag(HWSST_GMEM_VELOCITY_BUFFER);
-    gRenDev->m_cEF.RemoveStaticFlag(HWSST_GMEM_RT_GREATER_FOUR);
-    gRenDev->m_cEF.RemoveStaticFlag(HWSST_FEATURE_FETCH_DEPTHSTENCIL);
-}
-
-void CParserBin::SetupGMEMCommonStaticFlags()
-{
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-    if (RenderCapabilities::SupportsPLSExtension())
-    {
-        gRenDev->m_cEF.AddStaticFlag(HWSST_GMEM_PLS);
-    }
-
-    // TAA and motion blur need an extra render target to write the objects velocity.
-    if (CRenderer::CV_r_MotionBlur > 0 || (gRenDev->FX_GetAntialiasingType() & eAT_TEMPORAL_MASK) != 0)
-    {
-        gRenDev->m_cEF.AddStaticFlag(HWSST_GMEM_VELOCITY_BUFFER);
-    }
-    
-    // Ensure that the device can support at least 5 render targets - GBUFFER A, GBUFFER B, GBUFFER C, Lin Depth/Stencil and Velocity
-    if (RenderCapabilities::SupportsRenderTargets(CD3D9Renderer::s_gmemLargeRTCount))
-    {
-        gRenDev->m_cEF.AddStaticFlag(HWSST_GMEM_RT_GREATER_FOUR);
-    }
-
-    RenderCapabilities::FrameBufferFetchMask fetchCapabilities = RenderCapabilities::GetFrameBufferFetchCapabilities();
-    if (fetchCapabilities.test(RenderCapabilities::FBF_DEPTH) && fetchCapabilities.test(RenderCapabilities::FBF_STENCIL))
-    {
-        gRenDev->m_cEF.AddStaticFlag(HWSST_FEATURE_FETCH_DEPTHSTENCIL);
-    }
-#endif // defined(OPENGL_ES) || defined(CRY_USE_METAL)
-}
-
-void CParserBin::SetupForMETAL()
-{
-    CleanPlatformMacros();
-    SetupTargetPlatform();
-    uint32 nMacro[1] = {eT_1};
-
-    AddMacro(CParserBin::fxToken("METAL"), nMacro, 1, 0, m_StaticMacros);
-
-    switch (m_targetPlatform)
-    {
-    case AZ::PlatformID::PLATFORM_APPLE_OSX:
-        AddMacro(CParserBin::fxToken("OSXMETAL"), nMacro, 1, 0, m_StaticMacros);
-        break;
-    case AZ::PlatformID::PLATFORM_APPLE_IOS:
-        AddMacro(CParserBin::fxToken("IOSMETAL"), nMacro, 1, 0, m_StaticMacros);
-        break;
-    default:
-        AZ_Assert(false, "Invalid platform id (%s) for Metal shader setup", AZ::GetPlatformName(m_targetPlatform));
-        return;
-    }
-
-
-    if (!gRenDev->IsShaderCacheGenMode())
-    {
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_ShadersUseLLVMDirectXCompiler)
-        {
-            gRenDev->m_cEF.AddStaticFlag(HWSST_LLVM_DIRECTX_SHADER_COMPILER);
-        }
-    }
-
-    m_nPlatform = SF_METAL;
-    SetupShadersCacheAndFilter();
-    SetupFeatureDefines();
-    SetupForGMEM(CRenderer::CV_r_EnableGMEMPath);
-    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);
-}
-
-void CParserBin::SetupForGMEM([[maybe_unused]] int const gmemPath)
-{
-    AZ_Assert(m_nPlatform == SF_METAL || m_nPlatform == SF_GLES3, "Invalid platform (%d) for setup up GMEM");
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-    uint32 nMacro[1] = { eT_1 };
-
-    CD3D9Renderer::EGmemPath enabledGmemPath;
-    CD3D9Renderer::EGmemPathState gmemState;
-    assert(gcpRendD3D);
-    enabledGmemPath = gcpRendD3D->FX_GetEnabledGmemPath(&gmemState);
-    const char* strUnsupportedFeats = "CParserBin::SetupForGMEM: cannot use 256bpp GMEM path due to SSDO or SSR being used! It is recommended to disable these features on mobile platforms. Forcing 128bpp path instead.";
-    const char* strUnsupportedGmem256 = "CParserBin::SetupForGMEM: 256bpp GMEM path not supported on this device! Forcing 128bpp GMEM path instead.";
-    const char* strUnsupportedGmem128 = "CParserBin::SetupForGMEM: 128bpp GMEM path not supported on this device! Forcing regular render path instead.";    
-
-    switch (gmemPath)
-    {
-    case 0:
-        RemoveGMEMStaticFlags();
-        break;
-    case 1:
-    {
-        // Does devices allow this path?
-        if (CD3D9Renderer::eGT_DEV_UNSUPPORTED == gmemState)
-        {
-            CryLogAlways(strUnsupportedGmem256);
-            SetupForGMEM(2);
-            return;
-        }
-
-        // Some deferred passes don't fit in the 256bpp path and must be resolved.
-        // We can delay these passes until after the GMEM section, however the effect will be a frame behind.
-        // This causes ghosting artifacts. Since the 128bpp path must resolve after the G-Buffer pass anyways,
-        // it can also process the data for these deferred passes in time.
-        // This will obviously set back performance... but the following effects are very performance heavy and
-        // should not be used on mobile devices in most cases.
-        if (CD3D9Renderer::eGT_OK != gmemState && CD3D9Renderer::eGT_128bpp_PATH == enabledGmemPath)
-        {
-            CryLogAlways(strUnsupportedFeats);
-            SetupForGMEM(2);
-            return;
-        }
-        else
-        {
-            assert(CD3D9Renderer::eGT_OK == gmemState);
-        }
-
-        RemoveGMEMStaticFlags();
-        SetupGMEMCommonStaticFlags();
-        gRenDev->m_cEF.AddStaticFlag(HWSST_GMEM_256BPP);
-        break;
-    }
-    case 2:
-    {
-        // Does devices allow this path?
-        if (CD3D9Renderer::eGT_DEV_UNSUPPORTED == gmemState && CD3D9Renderer::eGT_REGULAR_PATH == enabledGmemPath)
-        {
-            CryLogAlways(strUnsupportedGmem128);
-            SetupForGMEM(0);
-            return;
-        }
-        else
-        {
-            assert(CD3D9Renderer::eGT_128bpp_PATH == enabledGmemPath);
-        }
-
-        RemoveGMEMStaticFlags();
-        SetupGMEMCommonStaticFlags();
-        gRenDev->m_cEF.AddStaticFlag(HWSST_GMEM_128BPP);
-        break;
-    }
-    default:
-        CRY_ASSERT(0);
-    }
-#endif
-}
-
-void CParserBin::SetupForOrbis()
-{
-    CleanPlatformMacros();
-    SetupTargetPlatform();
-    uint32 nMacro[1] = {eT_1};
-    AddMacro(CParserBin::fxToken("ORBIS"), nMacro, 1, 0, m_StaticMacros);
-    m_nPlatform = SF_ORBIS;
-
-    SetupShadersCacheAndFilter();
-
-    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);
-}
-
-void CParserBin::SetupForJasper() 
-{
-    CleanPlatformMacros();
-    SetupTargetPlatform();
-    uint32 nMacro[1] = { eT_1 };
-
-    m_nPlatform = SF_JASPER; 
-
-    SetupShadersCacheAndFilter();
-
-    AddMacro(CParserBin::fxToken("JASPER"), 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;
-    if (CParserBin::m_nPlatform == SF_D3D11)
-    {
-        nmTemp.add(0x200);
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_GL4)
-    {
-        nmTemp.add(0x300);
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_GLES3)
-    {
-        nmTemp.add(0x800);
-    }
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PARSERBIN_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(ParserBin_cpp)
-#endif
-    // Confetti Nicholas Baldwin: adding metal shader language support
-    else
-    if (CParserBin::m_nPlatform == SF_METAL)
-    {
-        nmTemp.add(0x900);
-    }
-    else
-    if (CParserBin::m_bEndians)
-    {
-        nmTemp.add(0x500);
-    }
-
-    return nmTemp;
-}
-
-uint32 CParserBin::fxTokenKey(const char* szToken, EToken eTC)
-{
-    g_KeyTokens[eTC] = szToken;
-    return eTC;
-}
-
-uint32 CParserBin::fxToken(const char* szToken, bool* bKey)
-{
-    for (int i = 0; i < eT_max; i++)
-    {
-        if (!g_KeyTokens[i])
-        {
-            continue;
-        }
-        if (!strcmp(szToken, g_KeyTokens[i]))
-        {
-            if (bKey)
-            {
-                *bKey = true;
-            }
-            return i;
-        }
-    }
-    if (bKey)
-    {
-        *bKey = false;
-    }
-    return eT_unknown;
-}
-/*uint32 CParserBin::NewUserToken(uint32 nToken, const char* psToken, bool bUseFinalTable)
-{
-    const string tmpstr = psToken;
-    return NewUserToken(nToken,tmpstr,bUseFinalTable);
-}*/
-uint32 CParserBin::NewUserToken(uint32 nToken, const char* psToken, bool bUseFinalTable)
-{
-    if (nToken != eT_unknown)
-    {
-        return nToken;
-    }
-    nToken = GetCRC32(psToken);
-
-    if (bUseFinalTable)
-    {
-        FXShaderTokenItor itor = std::lower_bound(m_TokenTable.begin(), m_TokenTable.end(), nToken, SortByToken());
-        if (itor != m_TokenTable.end() && (*itor).Token == nToken)
-        {
-            assert(!strcmp((*itor).SToken.c_str(), psToken));
-            return nToken;
-        }
-        STokenD TD;
-        TD.SToken = psToken;
-        TD.Token = nToken;
-        m_TokenTable.insert(itor, TD);
-    }
-    else
-    {
-        SShaderBin* pBin = m_pCurBinShader;
-        assert(pBin);
-        FXShaderTokenItor itor = std::lower_bound(pBin->m_TokenTable.begin(), pBin->m_TokenTable.end(), nToken, SortByToken());
-        if (itor != pBin->m_TokenTable.end() && (*itor).Token == nToken)
-        {
-            assert(!strcmp((*itor).SToken.c_str(), psToken));
-            return nToken;
-        }
-        STokenD TD;
-        TD.SToken = psToken;
-        TD.Token = nToken;
-        pBin->m_TokenTable.insert(itor, TD);
-    }
-
-    return nToken;
-}
-
-uint32 CParserBin::NextToken(char*& buf, char* com, bool& bKey)
-{
-    char ch;
-    int n = 0;
-    while ((ch = *buf) != 0)
-    {
-        // Iterate until a special character that indicates we've reached the end of a token is found
-        if (SkipChar(ch))
-        {
-            break;
-        }
-        com[n++] = ch;
-        ++buf;
-        if (ch == '/')
-        {
-            break;
-        }
-    }
-    // If the first character of buf returns true for SkipChar (or buf is zero-length)
-    if (!n)
-    {
-        // And that character is not a space
-        if (ch != ' ')
-        {
-            // The special character is the token that needs to be returned
-            com[n++] = ch;
-            ++buf;
-        }
-    }
-    com[n] = 0;
-    // Check to see if com is a key token, and return the enum for that token
-    uint32 dwToken = fxToken(com, &bKey);
-    return dwToken;
-}
-
-bool CParserBin::AddMacro(uint32 dwName, const uint32* pMacro, int nMacroTokens, uint64 nMask, FXMacroBin& Macro)
-{
-    // Use 'lower_bound' instead of 'find' to avoid double traversal of the
-    // underlying tree.  Iterator reused as insertion hint to 'insert()'.
-    FXMacroBinItor it = Macro.lower_bound(dwName);
-
-    SMacroBinFX* macro;
-    if (it != Macro.end() && it->first == dwName)
-    {
-        macro = &it->second;
-    }
-    else
-    {
-        // Creates empty vector - no allocation.
-        macro = &Macro.insert(it, FXMacroBinItor::value_type(dwName, SMacroBinFX()))->second;
-    }
-    macro->m_nMask = nMask;
-    if (nMacroTokens)
-    {
-        macro->m_Macro.resize(nMacroTokens);
-        memcpy(&macro->m_Macro[0], pMacro, nMacroTokens * sizeof(uint32));
-    }
-    else
-    {
-        macro->m_Macro.clear();
-    }
-    return true;
-}
-
-bool CParserBin::RemoveMacro(uint32 dwName, FXMacroBin& Macro)
-{
-    FXMacroBinItor it = Macro.find(dwName);
-    if (it == Macro.end())
-    {
-        return false;
-    }
-    else
-    {
-        Macro.erase(dwName);
-    }
-    return true;
-}
-
-void CParserBin::CleanPlatformMacros()
-{
-    RemoveMacro(CParserBin::fxToken("ORBIS"), m_StaticMacros);
-    RemoveMacro(CParserBin::fxToken("PCDX11"), m_StaticMacros);
-    RemoveMacro(CParserBin::fxToken("GL4"), m_StaticMacros);
-    RemoveMacro(CParserBin::fxToken("GLES3"), m_StaticMacros);
-    RemoveMacro(CParserBin::fxToken("METAL"), m_StaticMacros);
-    RemoveMacro(CParserBin::fxToken("OSXMETAL"), m_StaticMacros);
-    RemoveMacro(CParserBin::fxToken("IOSMETAL"), m_StaticMacros);   
-}
-
-const SMacroBinFX* CParserBin::FindMacro(uint32 dwName, FXMacroBin& Macro)
-{
-    FXMacroBinItor it = Macro.find(dwName);
-    if (it != Macro.end())
-    {
-        return &it->second;
-    }
-    return NULL;
-}
-
-bool CParserBin::GetBool(SParserFrame& Frame)
-{
-    if (Frame.IsEmpty())
-    {
-        return true;
-    }
-    EToken eT = GetToken(Frame);
-    if (eT == eT_true || eT == eT_1)
-    {
-        return true;
-    }
-    if (eT == eT_false || eT == eT_0)
-    {
-        return false;
-    }
-    CRY_ASSERT(0);
-    return false;
-}
-
-CCryNameR CParserBin::GetNameString(SParserFrame& Frame)
-{
-    if (Frame.IsEmpty())
-    {
-        return CCryNameR("");
-    }
-
-    stack_string Str;
-    int nCur = Frame.m_nFirstToken;
-    int nLast = Frame.m_nLastToken;
-    while (nCur <= nLast)
-    {
-        int nTok = m_Tokens[nCur++];
-        const char* szStr = GetString(nTok);
-        if (Str.size() && !SkipChar(Str[Str.size() - 1]) && !SkipChar(szStr[0]))
-        {
-            Str += " ";
-        }
-        Str += szStr;
-    }
-    return CCryNameR(Str.c_str());
-}
-
-string CParserBin::GetString(SParserFrame& Frame)
-{
-    if (Frame.IsEmpty())
-    {
-        return "";
-    }
-
-    stack_string Str;
-    int nCur = Frame.m_nFirstToken;
-    int nLast = Frame.m_nLastToken;
-    while (nCur <= nLast)
-    {
-        int nTok = m_Tokens[nCur++];
-        const char* szStr = GetString(nTok);
-        if (Str.size() && !SkipChar(Str[Str.size() - 1]) && !SkipChar(szStr[0]))
-        {
-            Str += " ";
-        }
-        Str += szStr;
-    }
-    return string(Str.c_str());
-}
-
-const char* CParserBin::GetString(uint32 nToken, FXShaderToken& Table, bool bOnlyKey)
-{
-    FXShaderTokenItor it;
-    if (nToken < eT_max)
-    {
-        assert(g_KeyTokens[nToken]);
-        return g_KeyTokens[nToken];
-    }
-    if (!bOnlyKey)
-    {
-        it = std::lower_bound(Table.begin(), Table.end(), nToken, SortByToken());
-        if (it != Table.end() && (*it).Token == nToken)
-        {
-            return (*it).SToken.c_str();
-        }
-    }
-
-    CRY_ASSERT(0);
-    return "";
-}
-
-const char* CParserBin::GetString(uint32 nToken, bool bOnlyKey)
-{
-    return GetString(nToken, m_TokenTable, bOnlyKey);
-}
-
-static void sCR(TArray<char>& Text, int nLevel)
-{
-    Text.AddElem('\n');
-    for (int i = 0; i < nLevel; i++)
-    {
-        Text.AddElem(' ');
-        Text.AddElem(' ');
-    }
-}
-
-bool CParserBin::CorrectScript(uint32* pTokens, uint32& i, uint32 nT, TArray<char>& Text)
-{
-
-    int nTex = Text.Num() - 1;
-    int nTT = nTex;
-    while (nTex > 0)
-    {
-        char c = Text[nTex];
-        if (c <= 32)
-        {
-            nTex++;
-            break;
-        }
-        nTex--;
-    }
-    if (strncmp(&Text[nTex], "float", 5))
-    {
-        CRY_ASSERT(0);
-        iLog->Log("Wrong script tokens...");
-        return false;
-    }
-    memset(&Text[nTex], 0x20202020, nTT - nTex + 1);
-    i++;
-    while (i < nT)
-    {
-        uint32 nTok = pTokens[i];
-        if (nTok == eT_semicolumn)
-        {
-            return true;
-        }
-        i++;
-    }
-    return false;
-}
-
-bool CParserBin::ConvertToAscii(uint32* pTokens, uint32 nT, FXShaderToken& Table, TArray<char>& Text, bool bInclSkipTokens)
-{
-    uint32 i;
-    bool bRes = true;
-
-    int nLevel = 0;
-    for (i = 0; i < nT; i++)
-    {
-        uint32 nToken = pTokens[i];
-        if (nToken == 0)
-        {
-            Text.Copy("\n", 1);
-            continue;
-        }
-        if (!bInclSkipTokens)
-        {
-            if (nToken == eT_skip)
-            {
-                i++;
-                continue;
-            }
-            if (nToken == eT_skip_1)
-            {
-                while (i < nT)
-                {
-                    nToken = pTokens[i];
-                    if (nToken == eT_skip_2)
-                    {
-                        break;
-                    }
-                    i++;
-                }
-                assert(i < nT);
-                continue;
-            }
-        }
-        const char* szStr = GetString(nToken, Table, false);
-        assert(szStr);
-        if (!szStr || !szStr[0])
-        {
-            bRes = CParserBin::CorrectScript(pTokens, i, nT, Text);
-        }
-        else
-        {
-            if (nToken == eT_semicolumn || nToken == eT_br_cv_1)
-            {
-                if (nToken == eT_br_cv_1)
-                {
-                    sCR(Text, nLevel);
-                    nLevel++;
-                }
-                Text.Copy(szStr, strlen(szStr));
-                if (nToken == eT_semicolumn)
-                {
-                    if (i + 1 < nT && pTokens[i + 1] == eT_br_cv_2)
-                    {
-                        sCR(Text, nLevel - 1);
-                    }
-                    else
-                    {
-                        sCR(Text, nLevel);
-                    }
-                }
-                else
-                if (i + 1 < nT)
-                {
-                    if (pTokens[i + 1] < eT_br_rnd_1 || pTokens[i + 1] >= eT_float)
-                    {
-                        sCR(Text, nLevel);
-                    }
-                }
-            }
-            else
-            {
-                if (i + 1 < nT)
-                {
-                    if (Text.Num())
-                    {
-                        char cPrev = Text[Text.Num() - 1];
-                        if (!SkipChar((uint8)cPrev) && !SkipChar((uint8)szStr[0]))
-                        {
-                            Text.AddElem(' ');
-                        }
-                    }
-                }
-                Text.Copy(szStr, strlen(szStr));
-                if (nToken == eT_br_cv_2)
-                {
-                    nLevel--;
-                    if (i + 1 < nT && pTokens[i + 1] != eT_semicolumn)
-                    {
-                        sCR(Text, nLevel);
-                    }
-                }
-            }
-        }
-    }
-    Text.AddElem(0);
-
-    return bRes;
-}
-
-void CParserBin::MergeTable(SShaderBin* pBin)
-{
-    FXShaderTokenItor it = m_TokenTable.begin();
-    FXShaderTokenItor end = m_TokenTable.end();
-    FXShaderTokenItor bit = pBin->m_TokenTable.begin();
-    FXShaderTokenItor bend = pBin->m_TokenTable.end();
-
-    FXShaderToken newTable;
-    newTable.reserve(m_TokenTable.size() + pBin->m_TokenTable.size());
-    while (true)
-    {
-        STokenD* last = newTable.size() ? &(*newTable.rbegin()) : NULL;
-
-        unsigned mask = 0;
-        mask |= (bit != bend) << 0;
-        mask |= (it != end) << 1;
-
-        switch (mask)
-        {
-        // No iterators valid anymore, nothing left to do
-        case 0x0:
-            goto done;
-
-        // Other iterator valid, internal iterator invalid
-        case 0x1:
-            if (!last || bit->Token != last->Token)
-            {
-                newTable.push_back(*bit);
-            }
-            ++bit;
-            break;
-
-        // Other iterator invalid, internal iterator valid
-        case 0x2:
-            if (!last || it->Token != last->Token)
-            {
-                newTable.push_back(*it);
-            }
-            ++it;
-            break;
-
-        // Noth iterators valid
-        case 0x3:
-        {
-            STokenD& iTD = (*it);
-            STokenD& oTD = (*bit);
-            if (iTD.Token < oTD.Token)
-            {
-                if (!last || it->Token != last->Token)
-                {
-                    newTable.push_back(*it);
-                }
-                ++it;
-            }
-            else
-            {
-                if (!last || bit->Token != last->Token)
-                {
-                    newTable.push_back(*bit);
-                }
-                ++bit;
-            }
-        }
-        break;
-        }
-        ;
-    }
-
-    // Verify that the merging results in a sorted table
-# if defined _DEBUG
-    for (std::size_t i = 1; i < newTable.size(); ++i)
-    {
-        assert (newTable[i - 1].Token <= newTable[i].Token);
-    }
-# endif
-
-done:
-    swap(newTable, m_TokenTable);
-}
-
-bool CParserBin::IgnorePreprocessBlock(const uint32* pTokens, uint32& nT, int nMaxTokens, PodArray<uint32>& tokensBuffer, int nPass)
-{
-    int nLevel = 0;
-    bool bEnded = false;
-    while (*pTokens != 0)
-    {
-        if ((int)nT >= nMaxTokens)
-        {
-            break;
-        }
-        uint32 nToken = NextToken(pTokens, nT, nMaxTokens - 1);
-        if (nToken >= eT_if && nToken <= eT_ifndef_2)
-        {
-            if (!nPass)
-            {
-                InsertSkipTokens(pTokens, nT - 1, nMaxTokens, false, tokensBuffer);
-            }
-            nLevel++;
-            continue;
-        }
-        if (nToken == eT_endif)
-        {
-            if (!nLevel)
-            {
-                bEnded = true;
-                nT--;
-                break;
-            }
-            if (!nPass)
-            {
-                InsertSkipTokens(pTokens, nT - 1, nMaxTokens, true, tokensBuffer);
-            }
-            nLevel--;
-        }
-        else
-        if (nToken == eT_else || nToken == eT_elif)
-        {
-            if (!nLevel)
-            {
-                nT--;
-                break;
-            }
-            if (!nPass)
-            {
-                InsertSkipTokens(pTokens, nT - 1, nMaxTokens, nToken == eT_else, tokensBuffer);
-            }
-        }
-    }
-    if ((int)nT >= nMaxTokens)
-    {
-        CRY_ASSERT(0);
-        Warning("Couldn't find #endif directive for associated #ifdef");
-        return false;
-    }
-
-    return bEnded;
-}
-
-void CParserBin::InsertSkipTokens(const uint32* pTokens, uint32 nStart, [[maybe_unused]] uint32 nTokens, bool bSingle, PodArray<uint32>& tokensBuffer)
-{
-    SParserFrame Fr;
-    Fr.m_nFirstToken = nStart;
-    Fr.m_nLastToken = nStart;
-
-    if (!bSingle)
-    {
-        uint32 nS = nStart + 1;
-        CheckIfExpression(pTokens, nS, 0);
-        Fr.m_nLastToken = nS - 1;
-    }
-
-    if (Fr.m_nLastToken - Fr.m_nFirstToken == 0)
-    {
-        tokensBuffer.push_back(eT_skip);
-        tokensBuffer.push_back(pTokens[Fr.m_nFirstToken]);
-    }
-    else
-    {
-        tokensBuffer.push_back(eT_skip_1);
-        while (Fr.m_nFirstToken <= Fr.m_nLastToken)
-        {
-            tokensBuffer.push_back(pTokens[Fr.m_nFirstToken]);
-            Fr.m_nFirstToken++;
-        }
-        tokensBuffer.push_back(eT_skip_2);
-    }
-}
-
-bool CParserBin::CheckIfExpression(const uint32* pTokens, uint32& nT, int nPass, uint64* nMask)
-{
-    uint32 tmpBuf[64] = {0};
-    byte bRes[64] = {0};
-    byte bOr[64] = {0};
-    int nLevel = 0;
-    int i;
-    while (true)
-    {
-        uint32 nToken = pTokens[nT];
-        if (nToken == eT_br_rnd_1) // check for '('
-        {
-            nT++;
-            int n = 0;
-            int nD = 0;
-            while (true)
-            {
-                int nTok = pTokens[nT];
-                if (nTok == eT_br_rnd_1) // check for '('
-                {
-                    n++;
-                }
-                else
-                if (nTok == eT_br_rnd_2) // check for ')'
-                {
-                    if (!n)
-                    {
-                        tmpBuf[nD] = 0;
-                        nT++;
-                        break;
-                    }
-                    n--;
-                }
-                else
-                if (nTok == 0)
-                {
-                    return false;
-                }
-                tmpBuf[nD++] = nTok;
-                nT++;
-            }
-            uint32 nT2 = 0;
-            bRes[nLevel] = CheckIfExpression(&tmpBuf[0], nT2, nPass, nMask);
-            nLevel++;
-            bOr[nLevel] = 255;
-        }
-        else
-        {
-            uint32 nTok = pTokens[nT++];
-            bool bNeg = false;
-            if (nTok == eT_excl)
-            {
-                bNeg = true;
-                nTok = pTokens[nT++];
-            }
-            const SMacroBinFX* pFound = FindMacro(nTok, m_Macros[nPass]);
-            if (!pFound)
-            {
-                pFound = FindMacro(nTok, m_StaticMacros);
-            }
-            if (!pFound && !nPass)
-            {
-                pFound = FindMacro(nTok, m_Macros[1]);
-            }
-            bRes[nLevel] = (pFound) ? true : false;
-
-            if (pFound && nMask)
-            {
-                *nMask |= pFound->m_nMask;
-            }
-
-            if (nTok == eT_1)
-            {
-                bRes[nLevel] = true;
-            }
-            if (bNeg)
-            {
-                bRes[nLevel] = !bRes[nLevel];
-            }
-            nLevel++;
-            bOr[nLevel] = 255;
-        }
-        uint32 nTok = pTokens[nT];
-        if (nTok == eT_or)
-        {
-            bOr[nLevel] = true;
-            nT++;
-            assert (pTokens[nT] == eT_or);
-            if (pTokens[nT] == eT_or)
-            {
-                nT++;
-            }
-        }
-        else
-        if (nTok == eT_and)
-        {
-            bOr[nLevel] = false;
-            nT++;
-            assert (pTokens[nT] == eT_and);
-            if (pTokens[nT] == eT_and)
-            {
-                nT++;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-    byte Res = false;
-    for (i = 0; i < nLevel; i++)
-    {
-        if (!i)
-        {
-            Res = bRes[i];
-        }
-        else
-        {
-            assert(bOr[i] != 255);
-            if (bOr[i])
-            {
-                Res = Res | bRes[i];
-            }
-            else
-            {
-                Res = Res & bRes[i];
-            }
-        }
-    }
-    return Res != 0;
-}
-
-void CParserBin::BuildSearchInfo()
-{
-    /*  int i;
-      for (i=0; i<m_Tokens.size(); i++)
-      {
-        uint32 nToken = m_Tokens[i];
-        if (nToken < eT_max)
-        {
-          if (m_KeyOffsets.size() <= nToken)
-            m_KeyOffsets.resize(nToken+1);
-          std::vector<int>& Dst = m_KeyOffsets[nToken];
-          Dst.push_back(i);
-        }
-        else
-        {
-          FXShaderTokenItor itor = m_Table.find(nToken);
-          if (itor != m_Table.end())
-            itor->second.Offsets.push_back(i);
-          else
-          {
-            CRY_ASSERT(0);
-          }
-        }
-      }
-      m_bEmbeddedSearchInfo = true;*/
-}
-
-bool CParserBin::PreprocessTokens(ShaderTokensVec& Tokens, int nPass, PodArray<uint32>& tokensBuffer)
-{
-    bool bRet = true;
-    uint32 nTokenParam;
-
-    uint32 nT = 0;
-    const uint32* pTokens = &Tokens[0];
-    const uint32 nTSize = Tokens.size();
-    while (nT < nTSize)
-    {
-        uint32 nToken = NextToken(pTokens, nT, nTSize - 1);
-        if (!nToken)
-        {
-            break;
-        }
-        bool bFirst = false;
-        switch (nToken)
-        {
-        case eT_include:
-        {
-            nTokenParam = pTokens[nT++];
-            const char* szName = GetString(nTokenParam, false);
-            assert(szName);
-            SShaderBin* pBin = gRenDev->m_cEF.m_Bin.GetBinShader(szName, true, 0);
-            if (!pBin)
-            {
-                AZ_Assert(false, "Fatal error: could not find required shader include file '%s'", szName);
-                return false;
-            }
-            else
-            {
-                assert(pBin);
-                MergeTable(pBin);
-                pBin->Lock();
-                bool result  = PreprocessTokens(pBin->m_Tokens, nPass, tokensBuffer);
-                pBin->Unlock();
-
-                if(!result)
-                {
-                    // PreprocessTokens will output an error message, no need for one here
-                    return false;
-                }
-            }
-        }
-        break;
-        case eT_define:
-        case eT_define_2:
-        {
-            uint32 nMacro = 0;
-            int n = nPass;
-            uint64 nMask = 0;
-            nTokenParam = pTokens[nT++];
-            /*const char *szname = GetString(nTokenParam);
-            if (!_stricmp(szname, "%_SHADOW_GEN"))
-            {
-              int nnn = 0;
-            }*/
-            const uint32* pMacro = &pTokens[nT];
-            while (pMacro[nMacro])
-            {
-                nMacro++;
-            }
-            if (nToken == eT_define_2)
-            {
-                n = 1;
-                if (nMacro)
-                {
-                    nMask = GetInt(pMacro[0]);
-                }
-            }
-            else
-            {
-                for (uint32 i = 0; i < m_IfAffectMask.Num(); i++)
-                {
-                    nMask |= m_IfAffectMask[i];
-                }
-            }
-            AddMacro(nTokenParam, pMacro, nMacro, nMask, m_Macros[n]);
-
-            if (nPass == 0)
-            {
-                if (sfxIFDef.Num())
-                {
-                    AddMacro(nTokenParam, pMacro, nMacro, nMask, m_Macros[1]);
-                }
-
-                tokensBuffer.push_back(eT_define_2);
-                tokensBuffer.push_back(nTokenParam);
-                tokensBuffer.AddList((uint32*)pMacro, nMacro + 1);
-            }
-            nT += nMacro + 1;
-        }
-        break;
-        case eT_undefine:
-        {
-            nTokenParam = pTokens[nT++];
-            int n = nPass;
-            FXMacroBinItor it = m_Macros[nPass].find(nTokenParam);
-            if (it == m_Macros[n].end() && !nPass)
-            {
-                it = m_Macros[1].find(nTokenParam);
-                n = 1;
-            }
-            if (it == m_Macros[n].end())
-            {
-                Warning("Couldn't find macro '%s'", GetString(nTokenParam));
-            }
-            else
-            {
-                m_Macros[n].erase(nTokenParam);
-            }
-        }
-        break;
-        case eT_if:
-        case eT_ifdef:
-        case eT_ifndef:
-            bFirst = true;
-        case eT_if_2:
-        case eT_ifdef_2:
-        case eT_ifndef_2:
-            if ((nPass == 0 && !bFirst) || (nPass == 1 && bFirst))
-            {
-                if (nPass == 1)
-                {
-                    CRY_ASSERT(0);
-                }
-
-                sfxIFIgnore.AddElem(true);
-                sfxIFDef.AddElem(false);
-                tokensBuffer.push_back(nToken);
-
-                uint64 nIfMask = 0;
-                uint32 nS = nT;
-                CheckIfExpression(pTokens, nT, 0, &nIfMask);
-                tokensBuffer.AddList((uint32*)pTokens + nS, nT - nS);
-
-                m_IfAffectMask.AddElem(nIfMask);
-            }
-            else
-            {
-                uint64 nIfMask = 0;
-                sfxIFIgnore.AddElem(false);
-                if (!nPass)
-                {
-                    InsertSkipTokens(pTokens, nT - 1, nTSize, false, tokensBuffer);
-                }
-                bool bRes = CheckIfExpression(pTokens, nT, nPass, &nIfMask);
-                m_IfAffectMask.AddElem(nIfMask);
-                if (nToken == eT_ifndef || nToken == eT_ifndef_2)
-                {
-                    bRes = !bRes;
-                }
-                if (!bRes)
-                {
-                    IgnorePreprocessBlock(pTokens, nT, nTSize, tokensBuffer, nPass);
-                    sfxIFDef.AddElem(false);
-                }
-                else
-                {
-                    sfxIFDef.AddElem(true);
-                }
-            }
-            break;
-        case eT_elif:
-        {
-            int nLevel = sfxIFDef.Num() - 1;
-            if (nLevel < 0)
-            {
-                CRY_ASSERT(0);
-                Warning("#elif without #ifdef");
-                return false;
-            }
-            if (sfxIFIgnore[nLevel] == true)
-            {
-                tokensBuffer.push_back(nToken);
-            }
-            else
-            {
-                if (!nPass)
-                {
-                    InsertSkipTokens(pTokens, nT - 1, Tokens.size(), false, tokensBuffer);
-                }
-                if (sfxIFDef[nLevel] == true)
-                {
-                    IgnorePreprocessBlock(pTokens, nT, Tokens.size(), tokensBuffer, nPass);
-                }
-                else
-                {
-                    uint64 nIfMask = 0;
-                    bool bRes = CheckIfExpression(pTokens, nT, nPass, &nIfMask);
-                    if (!bRes)
-                    {
-                        IgnorePreprocessBlock(pTokens, nT, Tokens.size(), tokensBuffer, nPass);
-                    }
-                    else
-                    {
-                        sfxIFDef[nLevel] = true;
-                    }
-
-                    m_IfAffectMask[nLevel] = nIfMask;
-                }
-            }
-        }
-        break;
-        case eT_else:
-        {
-            int nLevel = sfxIFDef.Num() - 1;
-            if (nLevel < 0)
-            {
-                CRY_ASSERT(0);
-                Warning("#else without #ifdef");
-                return false;
-            }
-            if (sfxIFIgnore[nLevel] == true)
-            {
-                tokensBuffer.push_back(nToken);
-            }
-            else
-            {
-                if (!nPass)
-                {
-                    InsertSkipTokens(pTokens, nT - 1, Tokens.size(), true, tokensBuffer);
-                }
-                if (sfxIFDef[nLevel] == true)
-                {
-                    bool bEnded = IgnorePreprocessBlock(pTokens, nT, Tokens.size(), tokensBuffer, nPass);
-                    if (!bEnded)
-                    {
-                        CRY_ASSERT(0);
-                        Warning("#else or #elif after #else");
-                        return false;
-                    }
-                }
-            }
-        }
-        break;
-        case eT_endif:
-        {
-            int nLevel = sfxIFDef.Num() - 1;
-            if (nLevel < 0)
-            {
-                CRY_ASSERT(0);
-                Warning("#endif without #ifdef");
-                return false;
-            }
-            if (sfxIFIgnore[nLevel] == true)
-            {
-                tokensBuffer.push_back(nToken);
-            }
-            else
-            if (!nPass)
-            {
-                InsertSkipTokens(pTokens, nT - 1, Tokens.size(), true, tokensBuffer);
-            }
-            sfxIFDef.Remove(nLevel);
-            sfxIFIgnore.Remove(nLevel);
-            m_IfAffectMask.Remove(nLevel);
-        }
-        break;
-        case eT_warning:
-        {
-            const char* szStr = GetString(pTokens[nT++]);
-            Warning(szStr);
-        }
-        break;
-        case eT_register_env:
-        {
-            const char* szStr = GetString(pTokens[nT++]);
-            fxRegisterEnv(szStr);
-        }
-        break;
-        case eT_ifcvar:
-        case eT_ifncvar:
-        {
-            const char* szStr = GetString(pTokens[nT++]);
-            sfxIFIgnore.AddElem(false);
-            ICVar* pVar = iConsole->GetCVar(szStr);
-            int nVal = 0;
-            if (!pVar)
-            {
-                iLog->Log("Warning: couldn't find variable '%s'", szStr);
-            }
-            else
-            {
-                nVal = pVar->GetIVal();
-            }
-            if (nToken == eT_ifncvar)
-            {
-                nVal = !nVal;
-            }
-            if (!nVal)
-            {
-                IgnorePreprocessBlock(pTokens, nT, Tokens.size(), tokensBuffer, nPass);
-                sfxIFDef.AddElem(false);
-            }
-            else
-            {
-                sfxIFDef.AddElem(true);
-            }
-        }
-        break;
-        case eT_elifcvar:
-        {
-            int nLevel = sfxIFDef.Num() - 1;
-            if (nLevel < 0)
-            {
-                CRY_ASSERT(0);
-                Warning("#elifcvar without #ifcvar or #ifdef");
-                return false;
-            }
-            sfxIFIgnore.AddElem(false);
-            if (sfxIFDef[nLevel] == true)
-            {
-                IgnorePreprocessBlock(pTokens, nT, Tokens.size(), tokensBuffer, nPass);
-            }
-            else
-            {
-                const char* szStr = GetString(pTokens[nT++]);
-                ICVar* pVar = iConsole->GetCVar(szStr);
-                int nVal = 0;
-                if (!pVar)
-                {
-                    iLog->Log("Warning: couldn't find variable '%s'", szStr);
-                }
-                else
-                {
-                    nVal = pVar->GetIVal();
-                }
-                if (!nVal)
-                {
-                    IgnorePreprocessBlock(pTokens, nT, Tokens.size(), tokensBuffer, nPass);
-                }
-                else
-                {
-                    sfxIFDef[nLevel] = true;
-                }
-            }
-        }
-        break;
-        default:
-        {
-            FXMacroBinItor it = m_Macros[nPass].find(nToken);
-            if (it != m_Macros[nPass].end())
-            {
-                // Found macro
-                SMacroBinFX* pM = &it->second;
-                for (uint32 i = 0; i < pM->m_Macro.size(); i++)
-                {
-                    tokensBuffer.push_back(pM->m_Macro[i]);
-                }
-            }
-            else
-            {
-                tokensBuffer.push_back(nToken);
-            }
-        }
-        break;
-        }
-    }
-
-    return bRet;
-}
-
-bool CParserBin::Preprocess(int nPass, ShaderTokensVec& Tokens, FXShaderToken* pSrcTable)
-{
-    bool bRes = true;
-
-    m_IfAffectMask.Reserve(5);
-    m_IfAffectMask.SetUse(0);
-    sfxIFDef.SetUse(0);
-    sfxIFIgnore.SetUse(0);
-
-    m_Macros[nPass].clear();
-
-    // Use a buffer to process tokens, transfer to the
-    // real storage in Tokens once we know the full quantity
-    enum
-    {
-        TOKENS_BUFFER_SIZE = 90000
-    };
-
-    PodArray<uint32> tokensBuffer(TOKENS_BUFFER_SIZE);
-
-    m_TokenTable = *pSrcTable;
-    bRes = PreprocessTokens(Tokens, nPass, tokensBuffer);
-#ifndef _RELEASE
-    if (tokensBuffer.Size() > TOKENS_BUFFER_SIZE)
-    {
-        CryLogAlways("CParserBin::Preprocess: tokenBuffer has been exceeded (buffer=%u, count=%u). Adjust buffer size to remove unnecessary allocs.", TOKENS_BUFFER_SIZE, tokensBuffer.Size());
-    }
-#endif
-    m_Tokens.reserve(tokensBuffer.Size());
-    m_Tokens.SetUse(0);
-    m_Tokens.Copy(tokensBuffer.GetElements(), tokensBuffer.Count());
-
-    if (!nPass)
-    {
-        BuildSearchInfo();
-    }
-
-    assert(!sfxIFDef.Num());
-    assert(!sfxIFIgnore.Num());
-    return bRes;
-}
-
-int CParserBin::CopyTokens(SParserFrame& Fragment, std::vector<uint32>& NewTokens)
-{
-    if (Fragment.IsEmpty())
-    {
-        return 0;
-    }
-    int nCopy = Fragment.m_nLastToken - Fragment.m_nFirstToken + 1;
-    int nStart = NewTokens.size();
-    NewTokens.resize(nStart + nCopy);
-    memcpy(&NewTokens[nStart], &m_Tokens[Fragment.m_nFirstToken], nCopy * sizeof(uint32));
-
-    return nCopy;
-}
-
-int CParserBin::CopyTokens(SCodeFragment* pCF, PodArray<uint32>& SHData, TArray<SCodeFragment>& Replaces, TArray<uint32>& NewTokens, uint32 nID)
-{
-    int nRepl = -1;
-    uint32 i;
-
-    for (i = 0; i < Replaces.size(); i++)
-    {
-        SCodeFragment* pFR = &Replaces[i];
-
-        if (pFR->m_dwName == nID)
-        {
-            break;
-        }
-    }
-    if (i != Replaces.size())
-    {
-        assert (!(i & 1));
-        nRepl = i;
-    }
-    int nDst = SHData.size();
-    int nSrc = pCF->m_nFirstToken;
-    uint32* pSrc = &m_Tokens[0];
-    int nSize = pCF->m_nLastToken - nSrc + 1;
-    if (nRepl >= 0)
-    {
-        int nDstStart = nDst;
-        uint32* pSrc2 = &NewTokens[0];
-        while (nSrc <= (int)pCF->m_nLastToken)
-        {
-            if (nRepl >= (int)Replaces.size() || Replaces[nRepl].m_dwName != nID)
-            {
-                int nCopy = pCF->m_nLastToken - nSrc + 1;
-                SHData.resize(nDst + nCopy);
-                memcpy(&SHData[nDst], &pSrc[nSrc], nCopy * sizeof(uint32));
-                nSrc += nCopy;
-                nDst += nCopy;
-            }
-            else
-            {
-                int nCopy = Replaces[nRepl].m_nFirstToken - nSrc;
-                if (nCopy)
-                {
-                    assert(nCopy > 0);
-                    SHData.resize(nDst + nCopy);
-                    memcpy(&SHData[nDst], &pSrc[nSrc], nCopy * sizeof(uint32));
-                    nSrc += nCopy + (Replaces[nRepl].m_nLastToken - Replaces[nRepl].m_nFirstToken + 1);
-                    nDst += nCopy;
-                }
-                nRepl++;
-                nCopy = Replaces[nRepl].m_nLastToken - Replaces[nRepl].m_nFirstToken + 1;
-                SHData.resize(nDst + nCopy);
-                memcpy(&SHData[nDst], &pSrc2[Replaces[nRepl].m_nFirstToken], nCopy * sizeof(uint32));
-                nDst += nCopy;
-                nRepl++;
-            }
-        }
-        return SHData.size() - nDstStart;
-    }
-    else
-    {
-        SHData.resize(nDst + nSize);
-        memcpy(&SHData[nDst], &pSrc[nSrc], nSize * sizeof(uint32));
-        return nSize;
-    }
-}
-
-int32 CParserBin::FindToken(uint32 nStart, uint32 nLast, const uint32* pTokens, uint32 nToken)
-{
-    while (nStart <= nLast)
-    {
-        if (pTokens[nStart] == nToken)
-        {
-            return nStart;
-        }
-        nStart++;
-    }
-    return -1;
-}
-
-int32 CParserBin::FindToken(uint32 nStart, uint32 nLast, uint32 nToken)
-{
-    if (nStart >= m_Tokens.size() || nLast >= m_Tokens.size())
-    {
-        return -1;
-    }
-
-    //if (!m_bEmbeddedSearchInfo)
-    return FindToken(nStart, nLast, &m_Tokens[0], nToken);
-    /*std::vector<int> *pSI;
-    if (nToken < eT_max)
-    {
-      if (nToken >= m_KeyOffsets.size())
-        return -1;
-      pSI = &m_KeyOffsets[nToken];
-  }
-    else
-    {
-      FXShaderTokenItor itor = m_Table.find(nToken);
-      if (itor == m_Table.end())
-        return -1;
-      pSI = &itor->second.Offsets;
-    }
-    for (int i=0; i<pSI->size(); i++)
-    {
-      int nOffs = (*pSI)[i];
-      if (nOffs>=nStart && nOffs<=nLast)
-        return nOffs;
-    }
-    return -1;*/
-}
-
-int32 CParserBin::FindToken(uint32 nStart, uint32 nLast, const uint32* pToks)
-{
-    uint32* pTokens = &m_Tokens[0];
-    while (nStart <= nLast)
-    {
-        int n = 0;
-        uint32 nTok = pToks[n];
-        while (nTok)
-        {
-            if (pTokens[nStart] == nTok)
-            {
-                return nStart;
-            }
-            n++;
-            nTok = pToks[n];
-        }
-        nStart++;
-    }
-    return -1;
-}
-
-static ETokenStorageClass sCheckForModificator(uint32 nToken)
-{
-    switch (nToken)
-    {
-    case eT_const:
-        return eTS_const;
-    case eT_static:
-        return eTS_static;
-    case eT_shared:
-        return eTS_shared;
-    case eT_groupshared:
-        return eTS_groupshared;
-    default:
-        return eTS_default;
-    }
-}
-int CParserBin::GetNextToken(uint32& nStart, ETokenStorageClass& nTokenStorageClass)
-{
-    uint32* pTokens = &m_Tokens[0];
-    uint32 nTokensSize = m_Tokens.size();
-    ETokenStorageClass nNewTokenStorageClass = eTS_default;
-    while (true)
-    {
-        bool bFunction = false;
-
-        if (m_CurFrame.m_nCurToken >= m_CurFrame.m_nLastToken)
-        {
-            return -1;
-        }
-
-        uint32 nToken;
-        if ((nToken = pTokens[m_CurFrame.m_nCurToken]) == eT_unknown)
-        {
-            return -2;
-        }
-
-        nStart = m_CurFrame.m_nCurToken;
-
-        if (nToken == eT_quote)
-        {
-            m_CurFrame.m_nCurToken++;
-            continue;
-        }
-        if (nToken == eT_skip)
-        {
-            m_CurFrame.m_nCurToken += 2;
-            continue;
-        }
-        if (nToken == eT_skip_1)
-        {
-            while (m_CurFrame.m_nCurToken <= m_CurFrame.m_nLastToken)
-            {
-                nToken = pTokens[m_CurFrame.m_nCurToken++];
-                if (nToken == eT_skip_2)
-                {
-                    break;
-                }
-            }
-            continue;
-        }
-
-        // Check for storage class- if existing, add all tokens in line (its global constant - should not go to any constant buffer)
-        nNewTokenStorageClass = sCheckForModificator(nToken);
-        if (nNewTokenStorageClass != eTS_default)
-        {
-            nTokenStorageClass = nNewTokenStorageClass;
-
-            SCodeFragment Fr;
-            Fr.m_eType = eFT_StorageClass;                        // Set code fragment type
-            Fr.m_nFirstToken = m_CurFrame.m_nCurToken;            // Set first token offset for code fragment
-            while (pTokens[m_CurFrame.m_nCurToken] != eT_semicolumn)
-            {
-                if (m_CurFrame.m_nCurToken + 1 == nTokensSize)
-                {
-                    break;
-                }
-                //const char *pszToken0 = GetString( pTokens[m_CurFrame.m_nCurToken]  );  // handy for debugging - do not remove for now plz
-                m_CurFrame.m_nCurToken++;
-            }
-
-            Fr.m_nLastToken = m_CurFrame.m_nCurToken++;           // Set last token offset to code fragment
-            Fr.m_dwName = pTokens[Fr.m_nLastToken - 1];           // Set fragment name (this is used for parser to search and discard fragments of code if not used in functions or structures)
-            m_CodeFragments.push_back(Fr);                        // Finally add to list
-
-            //const char *pszToken0 = GetString( Fr.m_dwName  );  // handy for debugging - do not remove for now plz
-
-            continue;
-        }
-
-        // if preprocessor
-        if (nToken >= eT_include && nToken <= eT_elifcvar)
-        {
-            SCodeFragment Fr;
-            Fr.m_nFirstToken = m_CurFrame.m_nCurToken;
-            if (nToken >= eT_if && nToken <= eT_elif || nToken == eT_define || nToken == eT_define_2)
-            {
-                while (pTokens[m_CurFrame.m_nCurToken])
-                {
-                    if (m_CurFrame.m_nCurToken + 1 == nTokensSize)
-                    {
-                        break;
-                    }
-                    m_CurFrame.m_nCurToken++;
-                }
-            }
-            Fr.m_nLastToken = m_CurFrame.m_nCurToken++;
-            m_CodeFragments.push_back(Fr);
-        }
-        else
-        {
-            m_CurFrame.m_nCurToken = nStart;
-            // Check for function
-            uint32 nLastTok = nStart;
-            uint32 nFnName;
-            int nBrIndex = -1;
-            if (m_CurFrame.m_nCurToken + 4 < m_CurFrame.m_nLastToken)
-            {
-                uint32 nFnRet = pTokens[m_CurFrame.m_nCurToken];
-                // DX11 stuff
-                uint32 nCur = m_CurFrame.m_nCurToken + 1;
-                uint32 nCount = 0;
-                while (nFnRet == eT_br_sq_1)
-                {
-                    nCount++;
-                    nLastTok = FindToken(nCur, m_CurFrame.m_nLastToken, eT_br_sq_2);
-                    if (nLastTok > 0)
-                    {
-                        nLastTok++;
-                        nFnRet = pTokens[nLastTok];
-                        if (nFnRet == eT_skip)
-                        {
-                            pTokens[nLastTok + 1] = eT_skip;
-                            nLastTok += 2;
-                            nFnRet = pTokens[nLastTok];
-                        }
-                        nCur = nLastTok + 1;
-                    }
-                }
-                nFnName = pTokens[nLastTok + 1];
-                //const char *szFn = GetString(nFnName);
-                if (pTokens[nLastTok + 2] == eT_br_rnd_1)
-                {
-                    nBrIndex = nLastTok + 3;
-                    nLastTok = FindToken(nLastTok + 3, m_CurFrame.m_nLastToken, eT_br_cv_1);
-                    int nRecurse = 0;
-                    while (nLastTok <= m_CurFrame.m_nLastToken)
-                    {
-                        uint32 nT = pTokens[nLastTok];
-                        if (nT == eT_br_cv_1)
-                        {
-                            nRecurse++;
-                        }
-                        else
-                        if (nT == eT_br_cv_2)
-                        {
-                            nRecurse--;
-                            if (nRecurse == 0)
-                            {
-                                bFunction = true;
-                                break;
-                            }
-                        }
-                        nLastTok++;
-                    }
-                }
-            }
-            if (bFunction)
-            {
-                // check for function if expressions
-                assert (nBrIndex > 0);
-                uint32 nIdTok = FindToken(nBrIndex, m_CurFrame.m_nLastToken, eT_br_rnd_2);
-                assert(nIdTok > 0);
-                if (nIdTok > 0 && pTokens[nIdTok + 1] != eT_br_cv_1)
-                {
-                    nIdTok++;
-                    while (pTokens[nIdTok] != eT_br_cv_1)
-                    {
-                        if (pTokens[nIdTok] == eT_skip)
-                        {
-                            pTokens[nIdTok + 1] = eT_skip;
-                            nIdTok += 2;
-                        }
-                        else
-                        if (pTokens[nIdTok] == eT_skip_1)
-                        {
-                            while (pTokens[nIdTok] != eT_skip_2)
-                            {
-                                pTokens[nIdTok++] = eT_skip;
-                            }
-                            pTokens[nIdTok++] = eT_skip;
-                        }
-                        else
-                        {
-                            nIdTok++;
-                        }
-                    }
-                }
-
-                SCodeFragment Fr;
-                Fr.m_nFirstToken = m_CurFrame.m_nCurToken;
-                Fr.m_nLastToken = nLastTok;
-                Fr.m_dwName = nFnName;
-#ifdef _DEBUG
-                //Fr.m_Name = GetString(nFnName);
-#endif
-                Fr.m_eType = eFT_Function;
-                m_CodeFragments.push_back(Fr);
-                m_CurFrame.m_nCurToken = nLastTok + 1;
-            }
-            else
-            {
-                m_eToken = (EToken)nToken;
-                assert(m_eToken < eT_user_first);
-                m_CurFrame.m_nCurToken++;
-                break;
-            }
-        }
-    }
-    return 1;
-}
-
-bool CParserBin::FXGetAssignmentData(SParserFrame& Frame)
-{
-    bool bRes = true;
-
-    Frame.m_nFirstToken = m_CurFrame.m_nCurToken;
-    uint32 nLastToken = m_CurFrame.m_nCurToken;
-    while (nLastToken <= m_CurFrame.m_nLastToken)
-    {
-        uint32 nTok = m_Tokens[nLastToken++];
-        if (nTok == eT_quote)
-        {
-            while (nLastToken <= m_CurFrame.m_nLastToken)
-            {
-                nTok = m_Tokens[nLastToken++];
-                if (nTok == eT_quote)
-                {
-                    break;
-                }
-            }
-        }
-        else
-        if (nTok == eT_semicolumn)
-        {
-            break;
-        }
-    }
-    Frame.m_nLastToken = nLastToken - 2;
-    if (m_Tokens[nLastToken] == eT_semicolumn)
-    {
-        m_CurFrame.m_nCurToken = nLastToken + 1;
-    }
-    else
-    {
-        m_CurFrame.m_nCurToken = nLastToken;
-    }
-
-    return bRes;
-}
-
-bool CParserBin::FXGetAssignmentData2(SParserFrame& Frame)
-{
-    bool bRes = true;
-
-    Frame.m_nFirstToken = m_CurFrame.m_nCurToken;
-    uint32 nLastToken = m_CurFrame.m_nCurToken;
-    uint32 nTok = m_Tokens[nLastToken];
-    if (nTok == eT_br_cv_1)
-    {
-        nLastToken++;
-        while (nLastToken + 1 <= m_CurFrame.m_nLastToken)
-        {
-            nTok = m_Tokens[nLastToken];
-            if (nTok == eT_semicolumn)
-            {
-                break;
-            }
-            nLastToken++;
-        }
-    }
-    else
-    if (nTok == eT_br_rnd_1)
-    {
-        nLastToken++;
-        int n = 1;
-        while (nLastToken + 1 <= m_CurFrame.m_nLastToken)
-        {
-            nTok = m_Tokens[nLastToken];
-            if (nTok == eT_semicolumn || nTok == eT_br_tr_1 || nTok == eT_eq)
-            {
-                assert(!n);
-                break;
-            }
-            if (nTok == eT_br_rnd_1)
-            {
-                n++;
-            }
-            else
-            if (nTok == eT_br_rnd_2)
-            {
-                n--;
-            }
-            nLastToken++;
-        }
-    }
-    else
-    {
-        while (nLastToken <= m_CurFrame.m_nLastToken)
-        {
-            nTok = m_Tokens[nLastToken];
-            if (nTok == eT_semicolumn || nTok == eT_br_rnd_1 || nTok == eT_br_cv_1 || nTok == eT_br_tr_1)
-            {
-                break;
-            }
-            nLastToken++;
-        }
-    }
-
-    Frame.m_nLastToken = nLastToken - 1;
-    if (m_Tokens[nLastToken] == eT_semicolumn)
-    {
-        m_CurFrame.m_nCurToken = nLastToken + 1;
-    }
-    else
-    {
-        m_CurFrame.m_nCurToken = nLastToken;
-    }
-
-    return bRes;
-}
-
-
-bool CParserBin::GetAssignmentData(SParserFrame& Frame)
-{
-    bool bRes = true;
-
-    Frame.m_nFirstToken = m_CurFrame.m_nCurToken;
-    uint32 nLastToken = m_CurFrame.m_nCurToken;
-    uint32* pTokens = &m_Tokens[0];
-    uint32 nTok = pTokens[nLastToken + 1];
-    if (nTok == eT_br_sq_1 || nTok == eT_br_rnd_1)
-    {
-        EToken eTClose = nTok == eT_br_sq_1 ? eT_br_sq_2 : eT_br_rnd_2;
-        nLastToken += 2;
-        while (nLastToken <= m_CurFrame.m_nLastToken)
-        {
-            nTok = pTokens[nLastToken];
-            if (nTok == eTClose || nTok == eT_semicolumn)
-            {
-                if (nTok == eT_semicolumn)
-                {
-                    nLastToken--;
-                }
-                break;
-            }
-            nLastToken++;
-        }
-    }
-    Frame.m_nLastToken = nLastToken;
-
-    nLastToken++;
-
-    if (pTokens[nLastToken] == eT_semicolumn)
-    {
-        m_CurFrame.m_nCurToken = nLastToken + 1;
-    }
-    else
-    {
-        m_CurFrame.m_nCurToken = nLastToken;
-    }
-
-    return bRes;
-}
-
-bool CParserBin::GetSubData(SParserFrame& Frame, EToken eT1, EToken eT2)
-{
-
-    Frame.m_nFirstToken = 0;
-    Frame.m_nLastToken = 0;
-    uint32 nTok = m_Tokens[m_CurFrame.m_nCurToken];
-    if (nTok != eT1)
-    {
-        return false;
-    }
-    m_CurFrame.m_nCurToken++;
-    Frame.m_nFirstToken = m_CurFrame.m_nCurToken;
-    uint32 nCurToken = m_CurFrame.m_nCurToken;
-    int skip = 1;
-    while (nCurToken <= m_CurFrame.m_nLastToken)
-    {
-        nTok = m_Tokens[nCurToken];
-        if (nTok == eT1)
-        {
-            skip++;
-        }
-        else
-        if (nTok == eT2)
-        {
-            if (--skip == 0)
-            {
-                Frame.m_nLastToken = nCurToken - 1;
-                nCurToken++;
-                break;
-            }
-        }
-        nCurToken++;
-    }
-    if (Frame.IsEmpty())
-    {
-        Frame.Reset();
-    }
-    if (nCurToken <= m_CurFrame.m_nLastToken && m_Tokens[nCurToken] == eT_semicolumn)
-    {
-        m_CurFrame.m_nCurToken = nCurToken + 1;
-    }
-    else
-    {
-        m_CurFrame.m_nCurToken = nCurToken;
-    }
-
-    return (Frame.m_nFirstToken <= Frame.m_nLastToken);
-}
-
-
-ETokenStorageClass CParserBin::ParseObject(SFXTokenBin* pTokens)
-{
-    assert(m_CurFrame.m_nFirstToken <= m_CurFrame.m_nLastToken);
-
-    if (m_CurFrame.m_nCurToken + 1 >= m_CurFrame.m_nLastToken)
-    {
-        return eTS_invalid;
-    }
-    if (m_Tokens.size() <= m_CurFrame.m_nCurToken)
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Attempted out-of-bounds access in CParserBin::ParseObject");
-        return eTS_invalid;
-    }
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_unknown)
-    {
-        return eTS_invalid;
-    }
-
-    ETokenStorageClass nTokenStorageClass = eTS_default;
-    int nRes = GetNextToken(m_nFirstToken, nTokenStorageClass);
-    if (nRes < 0)
-    {
-        return eTS_invalid;
-    }
-
-    m_Name.Reset();
-    m_Assign.Reset();
-    m_Value.Reset();
-    m_Data.Reset();
-    m_Annotations.Reset();
-
-    SFXTokenBin* pT = pTokens;
-    while (pTokens->id != 0)
-    {
-        if (pTokens->id == m_eToken)
-        {
-            break;
-        }
-        pTokens++;
-    }
-    if (pTokens->id == 0)
-    {
-        pTokens = pT;
-        const char* tokenName = GetString(m_eToken);
-        Warning ("FXBin parser found token '%s' which was not one of the list (Skipping).\n", tokenName);
-        while (pTokens->id != 0)
-        {
-            Warning("    %s\n", GetString(pTokens->id));
-            pTokens++;
-        }
-        AZ_Assert(false, "FXBin parser found token '%s' which was not one of the list (Skipping).\n", tokenName);
-#ifdef _DEBUG
-        TArray<char> Text;
-        SParserFrame Fr;
-        Fr.m_nFirstToken = max(m_CurFrame.m_nFirstToken, m_CurFrame.m_nCurToken - 5);
-        Fr.m_nLastToken = m_CurFrame.m_nLastToken;
-        ConvertToAscii(&m_Tokens[Fr.m_nFirstToken], Fr.m_nLastToken - Fr.m_nFirstToken + 1, m_TokenTable, Text);
-#endif
-        return eTS_invalid;
-    }
-
-    bool bAnnot = false;
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_br_tr_1)
-    {
-        GetSubData(m_Annotations, eT_br_tr_1, eT_br_tr_2);
-        bAnnot = true;
-    }
-
-    GetAssignmentData(m_Name);
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_colon)
-    {
-        m_CurFrame.m_nCurToken++;                   // skip the ':'
-        GetAssignmentData(m_Assign);
-    }
-
-    if (!bAnnot)
-    {
-        GetSubData(m_Annotations, eT_br_tr_1, eT_br_tr_2);
-    }
-    if (m_CurFrame.m_nCurToken <= m_CurFrame.m_nLastToken)
-    {
-        if (m_Tokens[m_CurFrame.m_nCurToken] == eT_eq)
-        {
-            m_CurFrame.m_nCurToken++;                 // skip the '='
-            FXGetAssignmentData2(m_Value);
-        }
-
-        GetSubData(m_Data, eT_br_cv_1, eT_br_cv_2);
-    }
-
-    if (m_CurFrame.m_nCurToken <= m_CurFrame.m_nLastToken && m_Tokens[m_CurFrame.m_nCurToken] == eT_semicolumn)
-    {
-        m_CurFrame.m_nCurToken++;
-    }
-
-    return nTokenStorageClass;
-}
-
-ETokenStorageClass CParserBin::ParseObject(SFXTokenBin* pTokens, int& nIndex)
-{
-    assert(m_CurFrame.m_nFirstToken <= m_CurFrame.m_nLastToken);
-
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_unknown)
-    {
-        return eTS_invalid;
-    }
-    if (m_CurFrame.m_nCurToken + 1 >= m_CurFrame.m_nLastToken)
-    {
-        return eTS_invalid;
-    }
-
-    ETokenStorageClass nTokenStorageClass = eTS_default;
-    int nRes = GetNextToken(m_nFirstToken, nTokenStorageClass);
-    if (nRes < 0)
-    {
-        return eTS_invalid;
-    }
-
-    m_Name.Reset();
-    m_Assign.Reset();
-    m_Value.Reset();
-    m_Data.Reset();
-    m_Annotations.Reset();
-
-    SFXTokenBin* pT = pTokens;
-    while (pTokens->id != 0)
-    {
-        if (pTokens->id == m_eToken)
-        {
-            break;
-        }
-        pTokens++;
-    }
-    if (pTokens->id == 0)
-    {
-        pTokens = pT;
-        Warning ("Warning: FXBin parser found token '%s' which was not one of the list (Skipping).\n", GetString(m_eToken));
-        while (pTokens->id != 0)
-        {
-            Warning("    %s\n", GetString(pTokens->id));
-            pTokens++;
-        }
-        CRY_ASSERT(0);
-#ifdef _DEBUG
-        TArray<char> Text;
-        SParserFrame Fr;
-        Fr.m_nFirstToken = max(m_CurFrame.m_nFirstToken, m_CurFrame.m_nCurToken - 5);
-        Fr.m_nLastToken = m_CurFrame.m_nLastToken;
-        ConvertToAscii(&m_Tokens[Fr.m_nFirstToken], Fr.m_nLastToken - Fr.m_nFirstToken + 1, m_TokenTable, Text);
-#endif
-        return eTS_invalid;
-    }
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_br_sq_1)
-    {
-        m_CurFrame.m_nCurToken++;
-        nIndex = GetInt(m_Tokens[m_CurFrame.m_nCurToken++]);
-    }
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_sing_quote)
-    {
-        GetSubData(m_Name, eT_sing_quote, eT_sing_quote);
-    }
-    else
-    if (m_Tokens[m_CurFrame.m_nCurToken] != eT_eq)
-    {
-        m_Name.m_nFirstToken = m_Name.m_nLastToken = m_CurFrame.m_nCurToken++;
-    }
-
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_eq)
-    {
-        m_CurFrame.m_nCurToken++;
-        FXGetAssignmentData(m_Data);
-    }
-    else
-    {
-        GetSubData(m_Data, eT_br_cv_1, eT_br_cv_2);
-    }
-
-    if (m_Tokens[m_CurFrame.m_nCurToken] == eT_semicolumn || m_Tokens[m_CurFrame.m_nCurToken] == eT_quote)
-    {
-        m_CurFrame.m_nCurToken++;
-    }
-
-    return nTokenStorageClass;
-}
-
-bool CParserBin::JumpSemicolumn(uint32& nStart, uint32 nEnd)
-{
-    while (nStart <= nEnd)
-    {
-        uint32 nTok = m_Tokens[nStart++];
-        if (nTok == eT_semicolumn)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-SParserFrame CParserBin::BeginFrame(SParserFrame& Frame)
-{
-    SParserFrame RetFrame = m_CurFrame;
-    m_CurFrame = Frame;
-    m_eToken = eT_unknown;
-    m_CurFrame.m_nCurToken = Frame.m_nFirstToken;
-
-    return RetFrame;
-}
-
-void CParserBin::EndFrame(SParserFrame& Frame)
-{
-    m_CurFrame = Frame;
-}
-
-void SFXParam::PostLoad(CParserBin& Parser, SParserFrame& Name, SParserFrame& Annotations, SParserFrame& Values, SParserFrame& Assign)
-{
-    m_Annotations = Parser.GetNameString(Annotations);
-    if (!Values.IsEmpty())
-    {
-        if (Parser.GetToken(Values) == eT_br_cv_1)
-        {
-            Values.m_nFirstToken++;
-            int32 nFind = Parser.FindToken(Values.m_nFirstToken, Values.m_nLastToken, eT_br_cv_2);
-            assert(nFind > 0 && Values.m_nLastToken == nFind);
-            if (nFind > 0)
-            {
-                Values.m_nLastToken--;
-            }
-        }
-        m_Values = Parser.GetString(Values);
-    }
-    m_Semantic = Parser.GetNameString(Assign);
-    m_Name = Parser.GetString(Name);
-
-    m_nFlags = 0;
-    if (m_ComponentCount == 1 && m_RegisterCount <= 1)
-    {
-        m_nFlags |= PF_SCALAR;
-    }
-    if (m_eType == eType_INT)
-    {
-        m_nFlags |= PF_INTEGER;
-    }
-    else
-    if (m_eType == eType_BOOL)
-    {
-        m_nFlags |= PF_BOOL;
-    }
-    else
-    if (m_eType != eType_FLOAT && m_eType != eType_HALF)
-    {
-        CRY_ASSERT(0);
-    }
-
-    if (Annotations.IsEmpty())
-    {
-        return;
-    }
-
-    bool bIsUniformRegisterOffset = false;
-
-    uint32 nCur  = Annotations.m_nFirstToken;
-    uint32 nLast = Annotations.m_nLastToken;
-    uint32* pTokens = &Parser.m_Tokens[0];
-    while (nCur <= nLast)
-    {
-        uint32 nTok = pTokens[nCur++];
-        if (nTok == eT_register || nTok == eT_psregister || nTok == eT_vsregister || nTok == eT_gsregister || nTok == eT_dsregister || nTok == eT_hsregister || nTok == eT_csregister)
-        {
-            m_nFlags |= PF_CUSTOM_BINDED;
-            {
-                uint32 nTok2 = pTokens[nCur++];
-                if (nTok2 != eT_eq)
-                {
-                    CRY_ASSERT(0);
-                }
-                else
-                {
-                    nTok2 = pTokens[nCur++];
-                    const char* szReg = Parser.GetString(nTok2);
-                    assert(szReg[0] == 'c');
-
-                    int registerOffset = atoi(&szReg[1]);
-
-                    if (nTok == eT_register)
-                    {
-                        m_Register[eHWSC_Vertex] = registerOffset;
-                        m_Register[eHWSC_Pixel] = m_Register[eHWSC_Vertex];
-                        if (CParserBin::PlatformSupportsGeometryShaders())
-                        {
-                            m_Register[eHWSC_Geometry] = m_Register[eHWSC_Vertex];
-                        }
-                        if (CParserBin::PlatformSupportsDomainShaders())
-                        {
-                            m_Register[eHWSC_Domain] = m_Register[eHWSC_Vertex];
-                        }
-                        if (CParserBin::PlatformSupportsHullShaders())
-                        {
-                            m_Register[eHWSC_Hull] = m_Register[eHWSC_Vertex];
-                        }
-                        if (CParserBin::PlatformSupportsComputeShaders())
-                        {
-                            m_Register[eHWSC_Compute] = m_Register[eHWSC_Vertex];
-                        }
-                        bIsUniformRegisterOffset = true;
-                    }
-                    else
-                    if (nTok == eT_vsregister)
-                    {
-                        m_Register[eHWSC_Vertex] = registerOffset;
-                    }
-                    else
-                    if (nTok == eT_psregister)
-                    {
-                        m_Register[eHWSC_Pixel] = registerOffset;
-                    }
-                    else
-                    if (CParserBin::PlatformSupportsGeometryShaders() && nTok == eT_gsregister)
-                    {
-                        m_Register[eHWSC_Geometry] = registerOffset;
-                    }
-                    else
-                    if (CParserBin::PlatformSupportsDomainShaders() && nTok == eT_dsregister)
-                    {
-                        m_Register[eHWSC_Domain] = registerOffset;
-                        m_Register[eHWSC_Vertex] = m_Register[eHWSC_Domain];
-                    }
-                    else
-                    if (CParserBin::PlatformSupportsHullShaders() && nTok == eT_hsregister)
-                    {
-                        m_Register[eHWSC_Hull] = registerOffset;
-                        m_Register[eHWSC_Vertex] = m_Register[eHWSC_Hull];
-                    }
-                    else
-                    if (CParserBin::PlatformSupportsComputeShaders() && nTok == eT_csregister)
-                    {
-                        m_Register[eHWSC_Compute] = registerOffset;
-                        m_Register[eHWSC_Vertex] = m_Register[eHWSC_Compute];
-                    }
-                }
-            }
-        }
-        else
-        if (nTok == eT_Position)
-        {
-            m_nFlags |= PF_POSITION;
-        }
-        else
-        {
-            if (nTok == eT_string)
-            {
-                uint32 nTokName = pTokens[nCur++];
-                if (nTokName == eT_UIWidget || nTokName == eT_UIWidget0)
-                {
-                    uint32 nTok0 = pTokens[nCur++];
-                    uint32 nTok1 = pTokens[nCur++];
-                    if (nTok0 == eT_eq && nTok1 == eT_quote)
-                    {
-                        nTok = pTokens[nCur++];
-                        if (nTok == eT_color)
-                        {
-                            m_nFlags |= PF_TWEAKABLE_MASK;
-                        }
-                        else
-                        {
-                            m_nFlags |= PF_TWEAKABLE_0;
-                        }
-                    }
-                }
-                else
-                if (nTokName == eT_UIWidget1)
-                {
-                    m_nFlags |= PF_TWEAKABLE_1;
-                }
-                else
-                if (nTokName == eT_UIWidget2)
-                {
-                    m_nFlags |= PF_TWEAKABLE_2;
-                }
-                else
-                if (nTokName == eT_UIWidget3)
-                {
-                    m_nFlags |= PF_TWEAKABLE_3;
-                }
-            }
-        }
-        if (!Parser.JumpSemicolumn(nCur, nLast))
-        {
-            return;
-        }
-    }
-
-    if ((m_nFlags & PF_TWEAKABLE_MASK) && !bIsUniformRegisterOffset)
-    {
-        AZ_Assert(false, "Tweakables must use 'register'. They cannot have different register offsets per stage.");
-    }
-}
-
-void SFXSampler::PostLoad(CParserBin& Parser, SParserFrame& Name, SParserFrame& Annotations, SParserFrame& Values, SParserFrame& Assign)
-{
-    m_Annotations = Parser.GetNameString(Annotations);
-    if (!Values.IsEmpty())
-    {
-        if (Parser.GetToken(Values) == eT_br_cv_1)
-        {
-            Values.m_nFirstToken++;
-            int32 nFind = Parser.FindToken(Values.m_nFirstToken, Values.m_nLastToken, eT_br_cv_2);
-            assert(nFind > 0 && Values.m_nLastToken == nFind);
-            if (nFind > 0)
-            {
-                Values.m_nLastToken--;
-            }
-        }
-        m_Values = Parser.GetString(Values);
-    }
-    m_Semantic = Parser.GetNameString(Assign);
-    m_Name = Parser.GetString(Name);
-    m_nFlags = 0;
-
-    if (!Assign.IsEmpty())
-    {
-        uint32 nCur  = Assign.m_nFirstToken;
-        uint32 nLast = Assign.m_nLastToken;
-        uint32* pTokens = &Parser.m_Tokens[0];
-        while (nCur <= nLast)
-        {
-            uint32 nTok = pTokens[nCur++];
-            if (nTok == eT_register)
-            {
-                m_nFlags |= PF_CUSTOM_BINDED;
-                {
-                    uint32 nTok2 = pTokens[nCur++];
-                    if (nTok2 != eT_br_rnd_1)
-                    {
-                        CRY_ASSERT(0);
-                    }
-                    else
-                    {
-                        nTok2 = pTokens[nCur++];
-                        const char* szReg = Parser.GetString(nTok2);
-                        while (szReg[0] == 's' || szReg[0] == 't')
-                        {
-                            ++szReg;
-                        }
-                        assert(isdigit(szReg[0]));
-                        m_Register[eHWSC_Vertex] =
-                            m_Register[eHWSC_Pixel] =
-                                m_Register[eHWSC_Geometry] =
-                                    m_Register[eHWSC_Domain] =
-                                        m_Register[eHWSC_Hull] =
-                                            m_Register[eHWSC_Compute] = atoi(&szReg[0]);
-
-                        uint32 tok2 = pTokens[nCur++];
-                        if (tok2 != eT_br_rnd_2)
-                        {
-                            CRY_ASSERT(0);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (!Annotations.IsEmpty())
-    {
-        uint32 nCur  = Annotations.m_nFirstToken;
-        uint32 nLast = Annotations.m_nLastToken;
-        uint32* pTokens = &Parser.m_Tokens[0];
-        while (nCur <= nLast)
-        {
-            uint32 nTok = pTokens[nCur++];
-            if (nTok == eT_psslot || nTok == eT_vsslot || nTok == eT_gsslot || nTok == eT_dsslot || nTok == eT_hsslot || nTok == eT_csslot || nTok == eT_slot)
-            {
-                m_nFlags |= PF_CUSTOM_BINDED;
-                {
-                    uint32 nTok2 = pTokens[nCur++];
-                    if (nTok2 != eT_eq)
-                    {
-                        CRY_ASSERT(0);
-                    }
-                    else
-                    {
-                        nTok2 = pTokens[nCur++];
-                        const char* szReg = Parser.GetString(nTok2);
-                        assert(isdigit(szReg[0]));
-                        if (nTok == eT_vsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Vertex] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (nTok == eT_psslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Pixel] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsGeometryShaders() && nTok == eT_gsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Geometry] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsDomainShaders() && nTok == eT_dsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Domain] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsHullShaders() && nTok == eT_hsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Hull] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsComputeShaders() && nTok == eT_csslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Compute] = atoi(&szReg[0]);
-                        }
-                    }
-                }
-            }
-            if (!Parser.JumpSemicolumn(nCur, nLast))
-            {
-                break;
-            }
-        }
-    }
-}
-
-void SFXTexture::PostLoad(CParserBin& Parser, SParserFrame& Name, SParserFrame& Annotations, SParserFrame& Values, SParserFrame& Assign)
-{
-    m_Annotations = Parser.GetNameString(Annotations);
-    if (!Values.IsEmpty())
-    {
-        if (Parser.GetToken(Values) == eT_br_cv_1)
-        {
-            Values.m_nFirstToken++;
-            int32 nFind = Parser.FindToken(Values.m_nFirstToken, Values.m_nLastToken, eT_br_cv_2);
-
-            assert(nFind > 0 && Values.m_nLastToken == nFind);
-            if (nFind > 0)
-                Values.m_nLastToken--;
-        }
-        if (Parser.GetToken(Values) == eT_quote)
-        {
-            Values.m_nFirstToken++;
-            int32 nFind = Parser.FindToken(Values.m_nFirstToken, Values.m_nLastToken, eT_quote);
-            assert(nFind > 0 && Values.m_nLastToken == nFind);
-            if (nFind > 0)
-            {
-                Values.m_nLastToken--;
-            }
-        }
-        m_Values = Parser.GetString(Values);
-    }
-    m_Semantic = Parser.GetNameString(Assign);
-    m_Name = Parser.GetString(Name);
-    m_nFlags = 0;
-
-    if (!Assign.IsEmpty())
-    {
-        uint32 nCur  = Assign.m_nFirstToken;
-        uint32 nLast = Assign.m_nLastToken;
-        uint32* pTokens = &Parser.m_Tokens[0];
-        while (nCur <= nLast)
-        {
-            uint32 nTok = pTokens[nCur++];
-            if (nTok == eT_register)
-            {
-                m_nFlags |= PF_CUSTOM_BINDED;
-                {
-                    uint32 nTok2 = pTokens[nCur++];
-                    if (nTok2 != eT_br_rnd_1)
-                    {
-                        CRY_ASSERT(0);
-                    }
-                    else
-                    {
-                        nTok2 = pTokens[nCur++];
-                        const char* szReg = Parser.GetString(nTok2);
-                        while (szReg[0] == 's' || szReg[0] == 't')
-                        {
-                            ++szReg;
-                        }
-                        assert(isdigit(szReg[0]));
-                        m_Register[eHWSC_Vertex] =
-                            m_Register[eHWSC_Pixel] =
-                                m_Register[eHWSC_Geometry] =
-                                    m_Register[eHWSC_Domain] =
-                                        m_Register[eHWSC_Hull] =
-                                            m_Register[eHWSC_Compute] = atoi(&szReg[0]);
-
-                        uint32 tok2 = pTokens[nCur++];
-                        if (tok2 != eT_br_rnd_2)
-                        {
-                            CRY_ASSERT(0);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (!Annotations.IsEmpty())
-    {
-        uint32 nCur  = Annotations.m_nFirstToken;
-        uint32 nLast = Annotations.m_nLastToken;
-        uint32* pTokens = &Parser.m_Tokens[0];
-        while (nCur <= nLast)
-        {
-            uint32 nTok = pTokens[nCur++];
-            if (nTok == eT_psslot || nTok == eT_vsslot || nTok == eT_gsslot || nTok == eT_dsslot || nTok == eT_hsslot || nTok == eT_csslot || nTok == eT_slot)
-            {
-                m_nFlags |= PF_CUSTOM_BINDED;
-                {
-                    uint32 nTok2 = pTokens[nCur++];
-                    if (nTok2 != eT_eq)
-                    {
-                        CRY_ASSERT(0);
-                    }
-                    else
-                    {
-                        nTok2 = pTokens[nCur++];
-                        const char* szReg = Parser.GetString(nTok2);
-                        assert(isdigit(szReg[0]));
-                        if (nTok == eT_vsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Vertex] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (nTok == eT_psslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Pixel] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsGeometryShaders() && nTok == eT_gsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Geometry] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsDomainShaders() && nTok == eT_dsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Domain] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsHullShaders() && nTok == eT_hsslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Hull] = atoi(&szReg[0]);
-                        }
-                        else
-                        if (CParserBin::PlatformSupportsComputeShaders() && nTok == eT_csslot || nTok == eT_slot)
-                        {
-                            m_Register[eHWSC_Compute] = atoi(&szReg[0]);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                switch (nTok)
-                {
-                case eT_float:
-                case eT_float2:
-                case eT_float3:
-                case eT_float4:
-                case eT_uint:
-                case eT_uint2:
-                case eT_uint4:
-                case eT_int:
-                case eT_int2:
-                case eT_int4:
-                    m_Type = nTok;
-                    break;
-                default:
-                    break;
-                }
-            }
-
-            if (!Parser.JumpSemicolumn(nCur, nLast))
-            {
-                break;
-            }
-        }
-    }
-}
-
-byte CParserBin::GetCompareFunc(EToken eT)
-{
-    switch (eT)
-    {
-    case eT_None:
-    case eT_Disable:
-        return eCF_Disable;
-    case eT_Never:
-        return eCF_Never;
-    case eT_Less:
-        return eCF_Less;
-    case eT_Equal:
-        return eCF_Equal;
-    case eT_LEqual:
-    case eT_LessEqual:
-        return eCF_LEqual;
-    case eT_Greater:
-        return eCF_Greater;
-    case eT_NotEqual:
-        return eCF_NotEqual;
-    case eT_GEqual:
-    case eT_GreaterEqual:
-        return eCF_NotEqual;
-    case eT_Always:
-        return eCF_Always;
-    default:
-        Warning("unknown CompareFunc parameter '%s' (Skipping)\n", GetString(eT));
-    }
-    return eCF_Less;
-}
-
-int CParserBin::GetSrcBlend(EToken eT)
-{
-    switch (eT)
-    {
-    case eT_ONE:
-        return GS_BLSRC_ONE;
-    case eT_ZERO:
-        return GS_BLSRC_ZERO;
-    case eT_DST_COLOR:
-    case eT_DestColor:
-        return GS_BLSRC_DSTCOL;
-    case eT_ONE_MINUS_DST_COLOR:
-    case eT_InvDestColor:
-        return GS_BLSRC_ONEMINUSDSTCOL;
-    case eT_SRC_ALPHA:
-    case eT_SrcAlpha:
-        return GS_BLSRC_SRCALPHA;
-    case eT_ONE_MINUS_SRC_ALPHA:
-    case eT_InvSrcAlpha:
-        return GS_BLSRC_ONEMINUSSRCALPHA;
-    case eT_DST_ALPHA:
-    case eT_DestAlpha:
-        return GS_BLSRC_DSTALPHA;
-    case eT_ONE_MINUS_DST_ALPHA:
-    case eT_InvDestAlpha:
-        return GS_BLSRC_ONEMINUSDSTALPHA;
-    case eT_SRC_ALPHA_SATURATE:
-        return GS_BLSRC_ALPHASATURATE;
-
-    default:
-    {
-        Warning("unknown SrcBlend parameter '%s' (Skipping)\n", GetString(eT));
-        CRY_ASSERT(0);
-    }
-    }
-    return GS_BLSRC_ONE;
-}
-
-int CParserBin::GetDstBlend(EToken eT)
-{
-    switch (eT)
-    {
-    case eT_ONE:
-        return GS_BLDST_ONE;
-    case eT_ZERO:
-        return GS_BLDST_ZERO;
-    case eT_SRC_COLOR:
-    case eT_SrcColor:
-        return GS_BLDST_SRCCOL;
-    case eT_ONE_MINUS_SRC_COLOR:
-    case eT_InvSrcColor:
-        return GS_BLDST_ONEMINUSSRCCOL;
-    case eT_SRC_ALPHA:
-    case eT_SrcAlpha:
-        return GS_BLDST_SRCALPHA;
-    case eT_ONE_MINUS_SRC_ALPHA:
-    case eT_InvSrcAlpha:
-        return GS_BLDST_ONEMINUSSRCALPHA;
-    case eT_DST_ALPHA:
-    case eT_DestAlpha:
-        return GS_BLDST_DSTALPHA;
-    case eT_ONE_MINUS_DST_ALPHA:
-    case eT_InvDestAlpha:
-        return GS_BLDST_ONEMINUSDSTALPHA;
-
-    default:
-    {
-        Warning("unknown DstBlend parameter '%s' (Skipping)\n", GetString(eT));
-        CRY_ASSERT(0);
-    }
-    }
-    return GS_BLDST_ONE;
-}
-
-void CParserBin::SetupFeatureDefines()
-{
-    // globally remove all features here and selectively re-enable them based on project defines and platform validation
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_MESH_TESSELLATION"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_SELF_SHADOWS"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_PARTICLES_TESSELLATION"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_SPI_CONSTANT_BUFFERS"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_SPI_INDEXED_CB"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_GEOMETRY_SHADERS"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_SVO_GI"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_8_BONE_SKINNING"), m_StaticMacros);
-    RemoveMacro(CParserBin::GetCRC32("FEATURE_DUAL_SOURCE_BLENDING"), m_StaticMacros);
-
-    uint32 nEnable[1] = { eT_1 };
-#if defined(MESH_TESSELLATION)
-    if (m_nPlatform == SF_D3D11 || m_nPlatform == SF_GL4)
-    {
-        AddMacro(CParserBin::GetCRC32("FEATURE_MESH_TESSELLATION"), nEnable, 1, 0, m_StaticMacros);
-    }
-#endif
-
-#if defined(FEATURE_DEFERRED_SHADING_SELF_SHADOWS)
-    // Confetti Nicholas Baldwin: adding metal shader language support
-    if (m_nPlatform == SF_D3D11 || m_nPlatform == SF_GL4 || m_nPlatform == SF_GLES3 || m_nPlatform == SF_METAL)
-    {
-        AddMacro(CParserBin::GetCRC32("FEATURE_SELF_SHADOWS"), nEnable, 1, 0, m_StaticMacros);
-    }
-#endif
-#if defined(PARTICLES_TESSELLATION)
-    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_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);
-    }
-
-    if (m_nPlatform == SF_D3D11 || m_nPlatform == SF_GL4 || m_nPlatform == SF_GLES3 || m_nPlatform == SF_METAL)
-    {
-#if defined(FEATURE_SPI_INDEXED_CB)
-        AddMacro(CParserBin::GetCRC32("FEATURE_SPI_INDEXED_CB"), nEnable, 1, 0, m_StaticMacros);
-#endif
-    }
-
-    if (m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_JASPER | SF_GL4))
-    {
-        AddMacro(CParserBin::GetCRC32("FEATURE_GEOMETRY_SHADERS"), nEnable, 1, 0, m_StaticMacros);
-    }
-
-#if defined(FEATURE_SVO_GI)
-    AddMacro(CParserBin::GetCRC32("FEATURE_SVO_GI"), nEnable, 1, 0, m_StaticMacros);
-#endif
-
-    if (m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_JASPER | SF_GL4))
-    {
-        AddMacro(CParserBin::GetCRC32("FEATURE_DUAL_SOURCE_BLENDING"), nEnable, 1, 0, m_StaticMacros);
-    }
-
-#if defined(AZ_PLATFORM_MAC)
-    const bool isMacOpenGl = true;
-#else
-    const bool isMacOpenGl = false;
-#endif
-
-    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);
-    }
-
-#if !defined(NULL_RENDERER)
-    if (!gRenDev->IsShaderCacheGenMode())
-    {
-        if (!RenderCapabilities::SupportsDepthClipping())
-        {
-            gRenDev->m_cEF.AddStaticFlag(HWSST_NO_DEPTH_CLIPPING);
-        }
-    }
-#endif // !defined(NULL_RENDERER)
-}
-
-void CParserBin::SetupShadersCacheAndFilter()
-{
-    const char* shaderLanguageName = GetShaderLanguageName();
-
-    gRenDev->m_cEF.m_ShadersCache  = AZStd::string::format("%s%s/", g_shaderCache, shaderLanguageName);
-    gRenDev->m_cEF.m_ShadersFilter = shaderLanguageName;
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ParserBin.h b/Code/CryEngine/RenderDll/Common/Shaders/ParserBin.h
deleted file mode 100644
index eae9e0559c..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ParserBin.h
+++ /dev/null
@@ -1,1045 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Script parser declarations.
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_PARSERBIN_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_PARSERBIN_H
-#pragma once
-
-#include "ShaderCache.h"
-#include "ShaderAllocator.h"
-
-namespace AZ
-{
-    enum class PlatformID;
-}
-
-extern TArray<bool> sfxIFDef;
-
-typedef TArray<uint32> ShaderTokensVec;
-
-// key tokens
-enum EToken
-{
-    eT_unknown = 0,
-    eT_include = 1,
-    eT_define  = 2,
-    eT_define_2 = 3,
-    eT_undefine = 4,
-
-    eT_fetchinst = 5,
-    eT_if      = 6,
-    eT_ifdef   = 7,
-    eT_ifndef  = 8,
-    eT_if_2    = 9,
-    eT_ifdef_2 = 10,
-    eT_ifndef_2 = 11,
-    eT_elif    = 12,
-
-    eT_endif   = 13,
-    eT_else    = 14,
-    eT_or      = 15,
-    eT_and     = 16,
-    eT_warning = 17,
-    eT_register_env = 18,
-    eT_ifcvar  = 19,
-    eT_ifncvar = 20,
-    eT_elifcvar = 21,
-    eT_skip     = 22,
-    eT_skip_1   = 23,
-    eT_skip_2   = 24,
-
-    eT_br_rnd_1 = 25,
-    eT_br_rnd_2 = 26,
-    eT_br_sq_1  = 27,
-    eT_br_sq_2  = 28,
-    eT_br_cv_1  = 29,
-    eT_br_cv_2  = 30,
-    eT_br_tr_1  = 31,
-    eT_br_tr_2  = 32,
-    eT_comma    = 33,
-    eT_dot      = 34,
-    eT_colon    = 35,
-    eT_semicolumn = 36,
-    eT_excl     = 37,  // !
-    eT_quote    = 38,
-    eT_sing_quote = 39,
-
-    eT_question = 40,
-    eT_eq       = 41,
-    eT_plus     = 42,
-    eT_minus    = 43,
-    eT_div      = 44,
-    eT_mul      = 45,
-    eT_dot_math = 46,
-    eT_mul_math = 47,
-    eT_sqrt_math = 48,
-    eT_exp_math = 49,
-    eT_log_math = 50,
-    eT_log2_math = 51,
-    eT_sin_math = 52,
-    eT_cos_math = 53,
-    eT_sincos_math = 54,
-    eT_floor_math  = 55,
-    eT_ceil_math   = 56,
-    eT_frac_math   = 57,
-    eT_lerp_math   = 58,
-    eT_abs_math    = 59,
-    eT_clamp_math  = 60,
-    eT_min_math    = 61,
-    eT_max_math    = 62,
-    eT_length_math = 63,
-
-    eT_tex2D,
-    eT_tex2Dproj,
-    eT_tex3D,
-    eT_texCUBE,
-    eT_SamplerState,
-    eT_SamplerComparisonState,
-    eT_sampler_state,
-    eT_Texture2D,
-    eT_RWTexture2D,
-    eT_RWTexture2DArray,
-    eT_Texture2DArray,
-    eT_Texture2DMS,
-    eT_TextureCube,
-    eT_TextureCubeArray,
-    eT_Texture3D,
-    eT_RWTexture3D,
-
-    eT_float,
-    eT_float2,
-    eT_float3,
-    eT_float4,
-    eT_float4x4,
-    eT_float3x4,
-    eT_float2x4,
-    eT_float3x3,
-    eT_half,
-    eT_half2,
-    eT_half3,
-    eT_half4,
-    eT_half4x4,
-    eT_half3x4,
-    eT_half2x4,
-    eT_half3x3,
-    eT_bool,
-    eT_int,
-    eT_int2,
-    eT_int4,
-    eT_uint,
-    eT_uint2,
-    eT_uint4,
-    eT_sampler1D,
-    eT_sampler2D,
-    eT_sampler3D,
-    eT_samplerCUBE,
-    eT_const,
-
-    eT_inout,
-
-    eT_struct,
-    eT_sampler,
-    eT_TEXCOORDN,
-    eT_TEXCOORD0,
-    eT_TEXCOORD1,
-    eT_TEXCOORD2,
-    eT_TEXCOORD3,
-    eT_TEXCOORD4,
-    eT_TEXCOORD5,
-    eT_TEXCOORD6,
-    eT_TEXCOORD7,
-    eT_TEXCOORD8,
-    eT_TEXCOORD9,
-    eT_TEXCOORD10,
-    eT_TEXCOORD11,
-    eT_TEXCOORD12,
-    eT_TEXCOORD13,
-    eT_TEXCOORD14,
-    eT_TEXCOORD15,
-    eT_TEXCOORD16,
-    eT_TEXCOORD17,
-    eT_TEXCOORD18,
-    eT_TEXCOORD19,
-    eT_TEXCOORD20,
-    eT_TEXCOORD21,
-    eT_TEXCOORD22,
-    eT_TEXCOORD23,
-    eT_TEXCOORD24,
-    eT_TEXCOORD25,
-    eT_TEXCOORD26,
-    eT_TEXCOORD27,
-    eT_TEXCOORD28,
-    eT_TEXCOORD29,
-    eT_TEXCOORD30,
-    eT_TEXCOORD31,
-    eT_TEXCOORDN_centroid,
-    eT_TEXCOORD0_centroid,
-    eT_TEXCOORD1_centroid,
-    eT_TEXCOORD2_centroid,
-    eT_TEXCOORD3_centroid,
-    eT_TEXCOORD4_centroid,
-    eT_TEXCOORD5_centroid,
-    eT_TEXCOORD6_centroid,
-    eT_TEXCOORD7_centroid,
-    eT_TEXCOORD8_centroid,
-    eT_TEXCOORD9_centroid,
-    eT_TEXCOORD10_centroid,
-    eT_TEXCOORD11_centroid,
-    eT_TEXCOORD12_centroid,
-    eT_TEXCOORD13_centroid,
-    eT_TEXCOORD14_centroid,
-    eT_TEXCOORD15_centroid,
-    eT_TEXCOORD16_centroid,
-    eT_TEXCOORD17_centroid,
-    eT_TEXCOORD18_centroid,
-    eT_TEXCOORD19_centroid,
-    eT_TEXCOORD20_centroid,
-    eT_TEXCOORD21_centroid,
-    eT_TEXCOORD22_centroid,
-    eT_TEXCOORD23_centroid,
-    eT_TEXCOORD24_centroid,
-    eT_TEXCOORD25_centroid,
-    eT_TEXCOORD26_centroid,
-    eT_TEXCOORD27_centroid,
-    eT_TEXCOORD28_centroid,
-    eT_TEXCOORD29_centroid,
-    eT_TEXCOORD30_centroid,
-    eT_TEXCOORD31_centroid,
-    eT_COLOR0,
-    eT_static,
-    eT_shared,
-    eT_groupshared,
-    eT_packoffset,
-    eT_register,
-    eT_return,
-    eT_vsregister,
-    eT_psregister,
-    eT_gsregister,
-    eT_dsregister,
-    eT_hsregister,
-    eT_csregister,
-
-    eT_slot,
-    eT_vsslot,
-    eT_psslot,
-    eT_gsslot,
-    eT_dsslot,
-    eT_hsslot,
-    eT_csslot,
-
-
-    eT_StructuredBuffer,
-    eT_RWStructuredBuffer,
-    eT_ByteAddressBuffer,
-    eT_RWByteAddressBuffer,
-    eT_Buffer,
-    eT_RWBuffer,
-    eT_RasterizerOrderedBuffer,
-    eT_RasterizerOrderedByteAddressBuffer,
-    eT_RasterizerOrderedStructuredBuffer,
-
-    eT_color,
-    eT_Position,
-    eT_Allways,
-
-    eT_STANDARDSGLOBAL,
-
-    eT_technique,
-    eT_string,
-    eT_UIName,
-    eT_UIDescription,
-    eT_UIWidget,
-    eT_UIWidget0,
-    eT_UIWidget1,
-    eT_UIWidget2,
-    eT_UIWidget3,
-
-    eT_Texture,
-    eT_Filter,
-    eT_MinFilter,
-    eT_MagFilter,
-    eT_MipFilter,
-    eT_AddressU,
-    eT_AddressV,
-    eT_AddressW,
-    eT_BorderColor,
-    eT_sRGBLookup,
-
-    eT_LINEAR,
-    eT_POINT,
-    eT_NONE,
-    eT_ANISOTROPIC,
-    eT_MIN_MAG_MIP_POINT,
-    eT_MIN_MAG_MIP_LINEAR,
-    eT_MIN_MAG_LINEAR_MIP_POINT,
-    eT_COMPARISON_MIN_MAG_LINEAR_MIP_POINT,
-    eT_MINIMUM_MIN_MAG_MIP_LINEAR,
-    eT_MAXIMUM_MIN_MAG_MIP_LINEAR,
-
-    eT_Clamp,
-    eT_Border,
-    eT_Wrap,
-    eT_Mirror,
-
-    eT_Script,
-    eT_comment,
-    eT_asm,
-
-    eT_RenderOrder,
-    eT_ProcessOrder,
-    eT_RenderCamera,
-    eT_RenderType,
-    eT_RenderFilter,
-    eT_RenderColorTarget1,
-    eT_RenderDepthStencilTarget,
-    eT_ClearSetColor,
-    eT_ClearSetDepth,
-    eT_ClearTarget,
-    eT_RenderTarget_IDPool,
-    eT_RenderTarget_UpdateType,
-    eT_RenderTarget_Width,
-    eT_RenderTarget_Height,
-    eT_GenerateMips,
-
-    eT_PreProcess,
-    eT_PostProcess,
-    eT_PreDraw,
-
-    eT_WaterReflection,
-    eT_Panorama,
-
-    eT_WaterPlaneReflected,
-    eT_PlaneReflected,
-    eT_Current,
-
-    eT_CurObject,
-    eT_CurScene,
-    eT_RecursiveScene,
-    eT_CopyScene,
-
-    eT_Refractive,
-    eT_ForceRefractionUpdate,
-    eT_Heat,
-
-    eT_DepthBuffer,
-    eT_DepthBufferTemp,
-    eT_DepthBufferOrig,
-
-    eT_$ScreenSize,
-    eT_WaterReflect,
-    eT_FogColor,
-
-    eT_Color,
-    eT_Depth,
-
-    eT_$RT_2D,
-    eT_$RT_Cube,
-
-    eT_pass,
-    eT_CustomRE,
-    eT_Style,
-
-    eT_VertexShader,
-    eT_PixelShader,
-    eT_GeometryShader,
-    eT_HullShader,
-    eT_DomainShader,
-    eT_ComputeShader,
-    eT_ZEnable,
-    eT_ZWriteEnable,
-    eT_CullMode,
-    eT_SrcBlend,
-    eT_DestBlend,
-    eT_AlphaBlendEnable,
-    eT_AlphaFunc,
-    eT_AlphaRef,
-    eT_ZFunc,
-    eT_ColorWriteEnable,
-    eT_IgnoreMaterialState,
-
-    eT_None,
-    eT_Disable,
-    eT_CCW,
-    eT_CW,
-    eT_Back,
-    eT_Front,
-
-    eT_Never,
-    eT_Less,
-    eT_Equal,
-    eT_LEqual,
-    eT_LessEqual,
-    eT_NotEqual,
-    eT_GEqual,
-    eT_GreaterEqual,
-    eT_Greater,
-    eT_Always,
-
-    eT_RED,
-    eT_GREEN,
-    eT_BLUE,
-    eT_ALPHA,
-
-    eT_ONE,
-    eT_ZERO,
-    eT_SRC_COLOR,
-    eT_SrcColor,
-    eT_ONE_MINUS_SRC_COLOR,
-    eT_InvSrcColor,
-    eT_SRC_ALPHA,
-    eT_SrcAlpha,
-    eT_ONE_MINUS_SRC_ALPHA,
-    eT_InvSrcAlpha,
-    eT_DST_ALPHA,
-    eT_DestAlpha,
-    eT_ONE_MINUS_DST_ALPHA,
-    eT_InvDestAlpha,
-    eT_DST_COLOR,
-    eT_DestColor,
-    eT_ONE_MINUS_DST_COLOR,
-    eT_InvDestColor,
-    eT_SRC_ALPHA_SATURATE,
-
-    eT_NULL,
-
-    eT_cbuffer,
-    eT_PER_BATCH,
-    eT_PER_INSTANCE,
-    eT_PER_FRAME,
-    eT_PER_MATERIAL,
-    eT_PER_SHADOWGEN,
-
-    eT_ShaderType,
-    eT_ShaderDrawType,
-    eT_PreprType,
-    eT_Public,
-    eT_NoPreview,
-    eT_LocalConstants,
-    eT_Cull,
-    eT_SupportsAttrInstancing,
-    eT_SupportsConstInstancing,
-    eT_SupportsDeferredShading,
-    eT_SupportsFullDeferredShading,
-    eT_Decal,
-    eT_DecalNoDepthOffset,
-    eT_NoChunkMerging,
-    eT_ForceTransPass,
-    eT_AfterHDRPostProcess,
-    eT_AfterPostProcess,
-    eT_ForceZpass,
-    eT_ForceWaterPass,
-    eT_ForceDrawLast,
-    eT_ForceDrawFirst,
-    eT_ForceDrawAfterWater,
-    eT_DepthFixup,
-    eT_SingleLightPass,
-    eT_HWTessellation,
-    eT_WaterParticle,
-    eT_AlphaBlendShadows,
-    eT_ZPrePass,
-
-    eT_Light,
-    eT_Shadow,
-    eT_Fur,
-    eT_General,
-    eT_Terrain,
-    eT_Overlay,
-    eT_NoDraw,
-    eT_Custom,
-    eT_Sky,
-    eT_OceanShore,
-    eT_Hair,
-    eT_Compute,
-    eT_ForceGeneralPass,
-    eT_SkinPass,
-    eT_EyeOverlay,
-
-    eT_Metal,
-    eT_Ice,
-    eT_Water,
-    eT_FX,
-    eT_HDR,
-    eT_Glass,
-    eT_Vegetation,
-    eT_Particle,
-    eT_GenerateSprites,
-    eT_GenerateClouds,
-    eT_ScanWater,
-
-    eT_NoLights,
-    eT_NoMaterialState,
-    eT_PositionInvariant,
-
-    //-------------------------------------------------------------------------
-    // Technique Order
-    //-------------------------------------------------------------------------
-    // Remark:  The following technique has to be first Technique as we are subtracting it to get 
-    // index of technique's slots.
-    // Warning: if technique slots order is changed they should be well reflected in other files 
-    // such as 'IShader.h' which defines the order of the techniques' slots as per 'EShaderTechniqueID'.  
-    // This is all matched in the method 'CShaderMan::mfPostLoadFX' during load.
-    //-------------------------------------------------------------------------
-    eT_TechniqueZ,
-    eT_TechniqueShadowGen,
-    eT_TechniqueMotionBlur,
-    eT_TechniqueCustomRender,
-    eT_TechniqueEffectLayer,
-    eT_TechniqueDebug,
-    eT_TechniqueSoftAlphaTest,
-    eT_TechniqueWaterRefl,
-    eT_TechniqueWaterCaustic,
-    eT_TechniqueZPrepass,
-    eT_TechniqueThickness,
-
-    eT_TechniqueMax,
-    //-------------------------------------------------------------------------
-
-    eT_KeyFrameParams,
-    eT_KeyFrameRandColor,
-    eT_KeyFrameRandIntensity,
-    eT_KeyFrameRandSpecMult,
-    eT_KeyFrameRandPosOffset,
-    eT_Speed,
-
-    eT_Beam,
-    eT_LensOptics,
-    eT_Cloud,
-    eT_Ocean,
-
-    eT_Model,
-    eT_StartRadius,
-    eT_EndRadius,
-    eT_StartColor,
-    eT_EndColor,
-    eT_LightStyle,
-    eT_Length,
-
-    eT_RGBStyle,
-    eT_Scale,
-    eT_Blind,
-    eT_SizeBlindScale,
-    eT_SizeBlindBias,
-    eT_IntensBlindScale,
-    eT_IntensBlindBias,
-    eT_MinLight,
-    eT_DistFactor,
-    eT_DistIntensityFactor,
-    eT_FadeTime,
-    eT_Layer,
-    eT_Importance,
-    eT_VisAreaScale,
-
-    eT_Poly,
-    eT_Identity,
-    eT_FromObj,
-    eT_FromLight,
-    eT_Fixed,
-
-    eT_ParticlesFile,
-
-    eT_Gravity,
-    eT_WindDirection,
-    eT_WindSpeed,
-    eT_WaveHeight,
-    eT_DirectionalDependence,
-    eT_ChoppyWaveFactor,
-    eT_SuppressSmallWavesFactor,
-
-    eT__LT_LIGHTS,
-    eT__LT_NUM,
-    eT__LT_HASPROJ,
-    eT__LT_0_TYPE,
-    eT__LT_1_TYPE,
-    eT__LT_2_TYPE,
-    eT__LT_3_TYPE,
-    eT__TT_TEXCOORD_MATRIX,
-    eT__TT_TEXCOORD_PROJ,
-    eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE,
-    eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE,
-    eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT,
-    eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL,
-    eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM,
-    eT__VT_TYPE,
-    eT__VT_TYPE_MODIF,
-    eT__VT_BEND,
-    eT__VT_DET_BEND,
-    eT__VT_GRASS,
-    eT__VT_WIND,
-    eT__VT_DEPTH_OFFSET,
-    eT__FT_TEXTURE,
-    eT__FT_TEXTURE1,
-    eT__FT_NORMAL,
-    eT__FT_PSIZE,
-    eT__FT_DIFFUSE,
-    eT__FT_SPECULAR,
-    eT__FT_TANGENT_STREAM,
-    eT__FT_QTANGENT_STREAM,
-    eT__FT_SKIN_STREAM,
-    eT__FT_VERTEX_VELOCITY_STREAM,
-    eT__FT_SRGBWRITE,
-    eT__FT0_COP,
-    eT__FT0_AOP,
-    eT__FT0_CARG1,
-    eT__FT0_CARG2,
-    eT__FT0_AARG1,
-    eT__FT0_AARG2,
-
-    eT__VS,
-    eT__PS,
-    eT__GS,
-    eT__HS,
-    eT__DS,
-    eT__CS,
-
-    eT__g_SkinQuat,
-
-    eT_x,
-    eT_y,
-    eT_z,
-    eT_w,
-    eT_r,
-    eT_g,
-    eT_b,
-    eT_a,
-
-    eT_true,
-    eT_false,
-
-    eT_0,
-    eT_1,
-    eT_2,
-    eT_3,
-    eT_4,
-    eT_5,
-    eT_6,
-    eT_7,
-    eT_8,
-    eT_9,
-    eT_10,
-    eT_11,
-    eT_12,
-    eT_13,
-    eT_14,
-    eT_15,
-    eT_16,
-    eT_17,
-    eT_18,
-    eT_19,
-    eT_20,
-    eT_21,
-    eT_22,
-    eT_23,
-    eT_24,
-
-    eT_AnisotropyLevel,
-
-    eT_ORBIS,
-    eT_PCDX11,
-    eT_GL4,
-    eT_GLES3,
-    eT_METAL,
-    eT_OSXMETAL,
-    eT_IOSMETAL,
-
-    eT_VT_DetailBendingGrass,
-    eT_VT_DetailBending,
-    eT_VT_WindBending,
-    eT_VertexColors,
-
-    eT_s0,
-    eT_s1,
-    eT_s2,
-    eT_s3,
-    eT_s4,
-    eT_s5,
-    eT_s6,
-    eT_s7,
-    eT_s8,
-    eT_s9,
-    eT_s10,
-    eT_s11,
-    eT_s12,
-    eT_s13,
-    eT_s14,
-    eT_s15,
-
-    eT_t0,
-    eT_t1,
-    eT_t2,
-    eT_t3,
-    eT_t4,
-    eT_t5,
-    eT_t6,
-    eT_t7,
-    eT_t8,
-    eT_t9,
-    eT_t10,
-    eT_t11,
-    eT_t12,
-    eT_t13,
-    eT_t14,
-    eT_t15,
-
-    eT_Global,
-
-    eT_GLES3_0,
-
-    eT_Load,
-    eT_Sample,
-    eT_Gather,
-    eT_GatherRed,
-    eT_GatherGreen,
-    eT_GatherBlue,
-    eT_GatherAlpha,
-
-    eT_max,
-    eT_user_first = eT_max + 1
-};
-
-enum ETokenStorageClass
-{
-    eTS_invalid = 0,
-    eTS_default,
-    eTS_static,
-    eTS_const,
-    eTS_shared,
-    eTS_groupshared
-};
-
-struct SFXTokenBin
-{
-    uint32 id;
-};
-
-#define FX_BEGIN_TOKENS \
-    static SFXTokenBin sCommands[] = {
-#define FX_END_TOKENS \
-    { eT_unknown }    \
-    };
-
-#define FX_TOKEN(id) \
-    { Parser.fxTokenKey(#id, eT_##id) },
-
-#define FX_REGISTER_TOKEN(id) fxTokenKey(#id, eT_##id);
-
-
-extern const char* g_KeyTokens[];
-
-struct SMacroBinFX
-{
-    AZStd::vector<uint32, AZ::StdLegacyAllocator> m_Macro;
-    uint64 m_nMask;
-};
-
-class CParserBin;
-
-typedef AZStd::unordered_map<uint32, SMacroBinFX, AZStd::hash<uint32>, AZStd::equal_to<uint32>, AZ::StdLegacyAllocator> FXMacroBin;
-typedef FXMacroBin::iterator FXMacroBinItor;
-
-struct SParserFrame
-{
-    uint32 m_nFirstToken;
-    uint32 m_nLastToken;
-    uint32 m_nCurToken;
-    SParserFrame(uint32 nFirstToken, uint32 nLastToken)
-    {
-        m_nFirstToken = nFirstToken;
-        m_nLastToken = nLastToken;
-        m_nCurToken = m_nFirstToken;
-    }
-    SParserFrame()
-    {
-        m_nFirstToken = 0;
-        m_nLastToken = 0;
-        m_nCurToken = m_nFirstToken;
-    }
-    _inline void Reset()
-    {
-        m_nFirstToken = 0;
-        m_nLastToken = 0;
-        m_nCurToken = m_nFirstToken;
-    }
-    _inline bool IsEmpty()
-    {
-        if (!m_nFirstToken && !m_nLastToken)
-        {
-            return true;
-        }
-        return (m_nLastToken < m_nFirstToken);
-    }
-};
-
-enum EFragmentType
-{
-    eFT_Unknown,
-    eFT_Function,
-    eFT_Structure,
-    eFT_Sampler,
-    eFT_ConstBuffer,
-    eFT_StorageClass
-};
-
-struct SCodeFragment
-{
-    uint32 m_nFirstToken;
-    uint32 m_nLastToken;
-    uint32 m_dwName;
-    EFragmentType m_eType;
-#ifdef _DEBUG
-    //string m_Name;
-#endif
-    SCodeFragment()
-    {
-        m_nFirstToken = 0;
-        m_nLastToken = 0;
-        m_dwName = 0;
-        m_eType = eFT_Unknown;
-    }
-};
-
-struct SortByToken
-{
-    bool operator () (const STokenD& left, const STokenD& right) const
-    {
-        return left.Token < right.Token;
-    }
-    bool operator () (const uint32 left, const STokenD& right) const
-    {
-        return left < right.Token;
-    }
-    bool operator () (const STokenD& left, uint32 right) const
-    {
-        return left.Token < right;
-    }
-};
-
-// Confetti Nicholas Baldwin: adding metal shader language support
-#define SF_JASPER 0x0200000 
-#define SF_METAL 0x04000000
-#define SF_GLES3 0x08000000
-#define SF_D3D11 0x10000000
-#define SF_ORBIS 0x20000000
-#define SF_GL4 0x80000000
-#define SF_PLATFORM 0xfc000000
-
-class CParserBin
-    : public ISystemEventListener
-{
-    //////////////////////////////////////////////////////////////////////////
-    // ISystemEventListener interface implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-    //////////////////////////////////////////////////////////////////////////
-
-    friend class CShaderManBin;
-    friend class CHWShader_D3D;
-    friend struct SFXParam;
-    friend struct SFXSampler;
-    friend struct SFXTexture;
-    friend class CREBeam;
-    friend class CRECloud;
-
-    //bool m_bEmbeddedSearchInfo;
-    struct SShaderBin* m_pCurBinShader;
-    CShader* m_pCurShader;
-    TArray<uint32> m_Tokens;
-    FXMacroBin m_Macros[2];
-    FXShaderToken m_TokenTable;
-    TArray<uint64> m_IfAffectMask;
-    //std::vector<std::vector<int>> m_KeyOffsets;
-    EToken m_eToken;
-    uint32 m_nFirstToken;
-    TArray<SCodeFragment> m_CodeFragments;
-    //std::vector<SFXParam> m_Parameters;
-    //std::vector<STexSamplerFX> m_Samplers;
-
-    SParserFrame m_CurFrame;
-
-    SParserFrame m_Name;
-    SParserFrame m_Assign;
-    SParserFrame m_Annotations;
-    SParserFrame m_Value;
-    SParserFrame m_Data;
-
-    static FXMacroBin m_StaticMacros;
-
-    TArray<bool> sfxIFIgnore;
-
-public:
-    CParserBin(SShaderBin* pBin);
-    CParserBin(SShaderBin* pBin, CShader* pSH);
-    ~CParserBin();
-    SParserFrame& GetData() {return m_Data; }
-    const char* GetString(uint32 nToken, bool bOnlyKey = false);
-    string GetString(SParserFrame& Frame);
-    SParserFrame BeginFrame(SParserFrame& Frame);
-    void EndFrame(SParserFrame& Frame);
-    ETokenStorageClass ParseObject(SFXTokenBin* pTokens, int& nIndex);
-    ETokenStorageClass ParseObject(SFXTokenBin* pTokens);
-
-    static FXMacroBin& GetStaticMacroses() { return m_StaticMacros; }
-    static const char* GetString(uint32 nToken, FXShaderToken& Table, bool bOnlyKey = false);
-    CCryNameR GetNameString(SParserFrame& Frame);
-    void BuildSearchInfo();
-    bool PreprocessTokens(ShaderTokensVec& Tokens, int nPass, PodArray<uint32>& tokensBuffer);
-    bool Preprocess(int nPass, ShaderTokensVec& Tokens, FXShaderToken* pSrcTable);
-    static const SMacroBinFX* FindMacro(uint32 dwName, FXMacroBin& Macro);
-    static bool AddMacro(uint32 dwToken, const uint32* pMacro, int nMacroTokens, uint64 nMask, FXMacroBin& Macro);
-    static bool RemoveMacro(uint32 dwToken, FXMacroBin& Macro);
-    static void CleanPlatformMacros();
-    uint32 NewUserToken(uint32 nToken, const char* psToken, bool bUseFinalTable);
-    //uint32 NewUserToken(uint32 nToken, const string& sToken, bool bUseFinalTable);
-    void MergeTable(SShaderBin* pBin);
-    bool CheckIfExpression(const uint32* pTokens, uint32& nT, int nPass, uint64* nMask = 0);
-    bool IgnorePreprocessBlock(const uint32* pTokens, uint32& nT, int nMaxTokens, PodArray<uint32>& tokensBuffer, int nPass);
-    static bool CorrectScript(uint32* pTokens, uint32& i, uint32 nT, TArray<char>& Text);
-    static bool ConvertToAscii(uint32* pTokens, uint32 nT, FXShaderToken& Table, TArray<char>& Text, bool bInclSkipTokens = false);
-    bool GetBool(SParserFrame& Frame);
-    _inline uint32* GetTokens(int nStart) { return &m_Tokens[nStart]; }
-    _inline int GetNumTokens() { return m_Tokens.size(); }
-    _inline EToken GetToken() { return m_eToken; }
-    _inline EToken GetToken(SParserFrame& Frame)
-    {
-        assert(!Frame.IsEmpty());
-        return (EToken)m_Tokens[Frame.m_nFirstToken];
-    }
-    _inline uint32 FirstToken() { return m_nFirstToken; }
-    _inline int GetInt(uint32 nToken)
-    {
-        const char* szStr = GetString(nToken);
-        if (szStr[0] == '0' && szStr[1] == 'x')
-        {
-            int i = 0;
-#ifndef NDEBUG
-            int res =
-#endif
-                azsscanf(&szStr[2], "%x", &i);
-            assert(res != 0);
-            return i;
-        }
-        return atoi(szStr);
-    }
-    _inline float GetFloat(SParserFrame& Frame)
-    {
-        return (float)atof(GetString(Frame).c_str());
-    }
-    static _inline uint32 NextToken(const uint32* pTokens, uint32& nCur, uint32 nLast)
-    {
-        while (nCur <= nLast)
-        {
-            uint32 nToken = pTokens[nCur++];
-            if (nToken == eT_skip)
-            {
-                nCur++;
-                continue;
-            }
-            if (nToken == eT_skip_1)
-            {
-                while (nCur <= nLast)
-                {
-                    nToken = pTokens[nCur++];
-                    if (nToken == eT_skip_2)
-                    {
-                        break;
-                    }
-                }
-                continue;
-            }
-            return nToken;
-        }
-        return 0;
-    }
-
-    byte GetCompareFunc(EToken eT);
-    int  GetSrcBlend(EToken eT);
-    int  GetDstBlend(EToken eT);
-
-    void InsertSkipTokens(const uint32* pTokens, uint32 nStart, uint32 nTokens, bool bSingle, PodArray<uint32>& tokensBuffer);
-    int  GetNextToken(uint32& nStart, ETokenStorageClass& nTokenStorageClass);
-    bool FXGetAssignmentData(SParserFrame& Frame);
-    bool FXGetAssignmentData2(SParserFrame& Frame);
-    bool GetAssignmentData(SParserFrame& Frame);
-    bool GetSubData(SParserFrame& Frame, EToken eT1, EToken eT2);
-    static int32 FindToken(uint32 nStart, uint32 nLast, const uint32* pTokens, uint32 nToken);
-    int32 FindToken(uint32 nStart, uint32 nLast, uint32 nToken);
-    int32 FindToken(uint32 nStart, uint32 nLast, const uint32* pTokens);
-    int  CopyTokens(SParserFrame& Fragment, std::vector<uint32>& NewTokens);
-    int  CopyTokens(SCodeFragment* pCF, PodArray<uint32>& SHData, TArray<SCodeFragment>& Replaces, TArray<uint32>& NewTokens, uint32 nID);
-    static _inline void AddDefineToken(uint32 dwToken, ShaderTokensVec& Tokens)
-    {
-        Tokens.push_back(eT_define);
-        Tokens.push_back(dwToken);
-        Tokens.push_back(0);
-    }
-    static _inline void AddDefineToken(uint32 dwToken, uint32 dwToken2, ShaderTokensVec& Tokens)
-    {
-        Tokens.push_back(eT_define);
-        Tokens.push_back(dwToken);
-        Tokens.push_back(dwToken2);
-        Tokens.push_back(0);
-    }
-    bool JumpSemicolumn(uint32& nStart, uint32 nEnd);
-
-    static uint32 fxToken(const char* szToken, bool* bKey = NULL);
-    static uint32 fxTokenKey(const char* szToken, EToken eT = eT_unknown);
-    static uint32 GetCRC32(const char* szStr);
-    //! Gets the next token from the buffer
-    //! @param buf The buffer that is being parsed
-    //! @param com Buffer into which the complete token is written
-    //! @param bKey Set to true if the token is a 'key' token, false otherwise. Key tokens are enumerated by EToken, with corresponding string values set int CParserBin::Init().
-    //! @return Returns the enum of the key token if bKey is true, eT_unknown otherwise
-    static uint32 NextToken(char*& buf, char* com, bool& bKey);
-    static void Init();
-    static void RemovePlatformDefines();
-    static void SetupForOrbis();
-    static void SetupForD3D9();
-    static void SetupForD3D11();
-    static void SetupForGL4();
-    static void SetupForGLES3();
-    static void SetupForMETAL();
-    static void SetupTargetPlatform();
-    // Confetti David Srour: sets up GMEM path related macros
-    // 0 = no gmem, 1 = 256bpp, 2 = 128bpp (matches the r_enableGMEMPath cvar)
-    static void SetupForGMEM(int gmemPath);
-    static void SetupGMEMCommonStaticFlags();
-    static void RemoveGMEMStaticFlags();
-    static void SetupForJasper(); 
-    static void SetupFeatureDefines();
-    static void SetupShadersCacheAndFilter();
-    static CCryNameTSCRC GetPlatformSpecName(CCryNameTSCRC orgName);
-
-    static bool PlatformSupportsConstantBuffers(){return (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4 || CParserBin::m_nPlatform == SF_GLES3 || CParserBin::m_nPlatform == SF_METAL); };
-    static bool PlatformSupportsGeometryShaders(){return (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4); }
-    static bool PlatformSupportsHullShaders(){return (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4); }
-    static bool PlatformSupportsDomainShaders(){return (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4); }
-    static bool PlatformSupportsComputeShaders()
-    {
-        bool ret = (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4 || CParserBin::m_nPlatform == SF_METAL || CParserBin::m_nPlatform == SF_GLES3);
-        return ret;
-    }
-    static bool PlatformIsConsole(){return (CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER); };
-
-    static bool m_bEditable;
-    static uint32 m_nPlatform;                  // Shader language
-    static AZ::PlatformID m_targetPlatform;     // Platform
-    static bool m_bEndians;
-    static bool m_bParseFX;
-    static bool m_bShaderCacheGen;
-};
-
-char* fxFillPr (char** buf, char* dst);
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_PARSERBIN_H
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/PoundPoundParser.cpp b/Code/CryEngine/RenderDll/Common/Shaders/PoundPoundParser.cpp
deleted file mode 100644
index 874dec6c48..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/PoundPoundParser.cpp
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "PoundPoundParser.h"
-#include <AzCore/std/string/regex.h>
-
-class PoundPoundContext::Impl
-{
-public:
-    Impl() : m_ownedLayer(nullptr)
-    {}
-    ~Impl()
-    {
-        delete m_ownedLayer;
-    }
-
-    void Preprocess(char** buf);
-    bool IsEndOfBuffer(char** buf, bool* layerSwitch);
-    void SetDefine(const AZStd::string &name, const AZStd::string &value)
-    {
-        m_macros[name] = value;
-    }
-
-private:
-    class Layer {
-    public:
-        Layer* m_ownedNextLayer;
-        enum struct IfState {
-            noIf,
-            activeIf,
-            triggeredIf,
-            dormantIf,
-            activeElse,
-            dormantElse
-        };
-        IfState m_ifState;
-
-        enum struct InterdictionState {
-            interdictionActive,
-            interdictionPaused
-        };
-        InterdictionState m_interdictionState;
-
-        char* m_oldBuffer;
-        char* m_ownedIncludeBuffer;
-
-        Layer(Layer* layer)
-            : m_ownedNextLayer(layer)
-            , m_ifState(IfState::noIf)
-            , m_interdictionState(InterdictionState::interdictionActive)
-            , m_oldBuffer(nullptr)
-            , m_ownedIncludeBuffer(nullptr)
-        {
-        }
-
-        ~Layer()
-        {
-            delete[] m_ownedIncludeBuffer;
-            delete m_ownedNextLayer;
-        }
-    };
-
-    AZStd::string ConsumeLine(char** buf);
-    using Tokens = AZStd::vector<AZStd::string>;
-    Tokens TokenizeLine(char** buf, const char* regex);
-
-    void EvaluateIf(const Tokens& tokens);
-
-    void ProcessIf(char** buf);
-    void ProcessElif(char** buf);
-    void ProcessElse(char** buf);
-    void ProcessEndif(char** buf);
-    void ProcessDefine(char** buf);
-    void ProcessUndef(char** buf);
-    void ProcessInclude(char** buf);
-
-    Layer *m_ownedLayer;
-    using Macros = AZStd::unordered_map<AZStd::string, AZStd::string>;
-    Macros m_macros;
-};
-
-void PoundPoundContext::Impl::Preprocess(char** buf)
-{
-    bool layerSwitch;
-
-    // We should only get called when the buffer is pointing at a ## directive
-    do 
-    {
-        // Handle the if/elif/else/endif directives. These always need to be processed because of scope stacking
-        if (!strncmp(*buf, "##if", 4))
-        {
-            *buf += 4;
-            ProcessIf(buf);
-        }
-        else if (!strncmp(*buf, "##elif", 6))
-        {
-            *buf += 6;
-            ProcessElif(buf);
-        }
-        else if (!strncmp(*buf, "##else", 6))
-        {
-            *buf += 6;
-            ProcessElse(buf);
-        }
-        else if (!strncmp(*buf, "##endif", 7))
-        {
-            *buf += 7;
-            ProcessEndif(buf);
-        }
-
-        // If the interdiction is active, these ## directives can be ignored
-        else if (m_ownedLayer != nullptr && m_ownedLayer->m_interdictionState == Layer::InterdictionState::interdictionActive)
-        {
-            if (!strncmp(*buf, "##define", 8) || !strncmp(*buf, "##undef", 7) || !strncmp(*buf, "##include_restricted", 20))
-            {
-                ConsumeLine(buf);
-            }
-            else
-            {
-                AZ_Assert(false, "unknown ## directive");
-            }
-        }
-
-        // Otherwise, process the non-if related tokens
-        else
-        {
-            if (!strncmp(*buf, "##define", 8))
-            {
-                *buf += 8;
-                ProcessDefine(buf);
-            }
-            else if (!strncmp(*buf, "##undef", 7))
-            {
-                *buf += 7;
-                ProcessUndef(buf);
-            }
-            else if (!strncmp(*buf, "##include_restricted", 20))
-            {
-                *buf += 20;
-                ProcessInclude(buf);
-            }
-            else
-            {
-                AZ_Assert(false, "unknown ## directive");
-            }
-        }
-
-        // We've processed the token line. If we aren't interdicting the text, let the caller process normally
-        if (!m_ownedLayer
-            || m_ownedLayer->m_interdictionState == Layer::InterdictionState::interdictionPaused)
-        {
-            return;
-        }
-
-        // We are interdicting, so keep going until we find another ## directive or we run out of buffer
-        while (!IsEndOfBuffer(buf, &layerSwitch))
-        {
-            if (**buf == '#' && (*buf)[1] == '#')
-            {
-                break;
-            }
-            ++(*buf);
-        }
-
-        // Return if we are at EOB, otherwise start parsing the next ## directive.
-    } while (!IsEndOfBuffer(buf, &layerSwitch));
-}
-
-bool PoundPoundContext::Impl::IsEndOfBuffer(char** buf, bool* layerSwitch)
-{
-    // Standard non-variant EOB cases
-    if (*buf == nullptr)
-    {
-        return true;
-    }
-    if (**buf != 0)
-    {
-        return false;
-    }
-
-    // At this point we have hit a zero in the buffer. If there are no layers active, then we are truly
-    // at the end of parseable text
-    if (m_ownedLayer == nullptr)
-    {
-        return true;
-    }
-
-    // Otherwise, we must be at the end of a ##include file. Indicate a layer switch (because the caller may need to
-    // reparse past comments/whitespace), then restore the previous layer and delete this one.
-    AZ_Assert(m_ownedLayer->m_ownedIncludeBuffer != nullptr, "#include buffer is missing");
-    AZ_Assert(m_ownedLayer->m_ifState == Layer::IfState::noIf, "Reached end of #include buffer while #if was still in scope");
-    *layerSwitch = true;
-    auto next = m_ownedLayer->m_ownedNextLayer;
-    *buf = m_ownedLayer->m_oldBuffer;
-    m_ownedLayer->m_ownedNextLayer = nullptr;
-    delete m_ownedLayer;
-    m_ownedLayer = next;
-
-    // We don't know whether the new layer is at EOB, so we now have to check it.
-    return IsEndOfBuffer(buf, layerSwitch);
-}
-
-AZStd::string PoundPoundContext::Impl::ConsumeLine(char** buf)
-{
-    // Copy the remainder of the line into a scratch buffer, consuming the text including the EOL in the buffer
-    auto start = *buf;
-    char ch;
-    while ((ch = **buf) != 0)
-    {
-        if (ch == '\n')
-        {
-            break;
-        }
-        ++(*buf);
-    }
-    auto lineLen = *buf - start;
-    auto lineBuf = new char[lineLen + 1];
-    azstrncpy(lineBuf, lineLen + 1, start, lineLen);
-    // Make sure to have a null-terminated buffer
-    lineBuf[lineLen] = '\0';
-
-    if (**buf == '\n')
-    {
-        ++(*buf);
-    }
-
-    AZStd::string result(lineBuf);
-    delete[] lineBuf;
-    return result;
-}
-
-// Use regex to parse text into tokens
-PoundPoundContext::Impl::Tokens PoundPoundContext::Impl::TokenizeLine(char** buf, const char* pattern)
-{
-    AZStd::vector<AZStd::string> tokens;
-
-    auto lineBuf = ConsumeLine(buf);
-    AZStd::cmatch match;
-    if (AZStd::regex_search(lineBuf.c_str(), match, AZStd::regex(pattern)))
-    {
-        // First pattern is always the entire string
-        for (unsigned i = 1; i < match.size(); ++i)
-        {
-            if (match[i].matched)
-            {
-                tokens.push_back(match[i].str().c_str());
-            }
-        }
-    }
-
-    return tokens;
-}
-
-// Handles evaluating the conditional we support. ##if NAME will simply test for the existance of the NAME macro, pausing the
-// interdiction if it is true. ## NAME == VALUE will convert either both sides to values (if they are macros) and then compare,
-// pausing interdiction if the two sides equate. Everything is done as strings.
-void PoundPoundContext::Impl::EvaluateIf(const Tokens& tokens)
-{
-    auto tokenCount = tokens.size();
-    switch (tokenCount)
-    {
-    case 1:
-    {
-        auto finder = m_macros.find(tokens[0]);
-        if (finder != m_macros.end())
-        {
-            m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionPaused;
-            m_ownedLayer->m_ifState = Layer::IfState::triggeredIf;
-        }
-    }
-    break;
-
-    case 3:
-    {
-        AZ_Assert(tokens[1] == "==", "Unknown operator %s in ##if/##elif", tokens[1].c_str());
-
-        // Expand both sides of the file as needed
-        auto finder = m_macros.find(tokens[0]);
-        AZStd::string value1 = (finder == m_macros.end()) ? tokens[0] : finder->second;
-        finder = m_macros.find(tokens[2]);
-        AZStd::string value2 = (finder == m_macros.end()) ? tokens[2] : finder->second;
-
-        // start reading again if true
-        if (value1 == value2)
-        {
-            m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionPaused;
-            m_ownedLayer->m_ifState = Layer::IfState::triggeredIf;
-        }
-    }
-    break;
-
-    default:
-        AZ_Assert(false, "Malformed ##if/##elif condition");
-        break;
-    }
-}
-
-void PoundPoundContext::Impl::ProcessIf(char** buf)
-{
-    auto oldLayer = m_ownedLayer;
-    m_ownedLayer = new Layer(oldLayer);
-
-    // Initialize the layer state based on parent state
-    m_ownedLayer->m_ifState = Layer::IfState::activeIf;
-    bool parseIf = true;
-    if (oldLayer != nullptr)
-    {
-        // Look at the parent's if state (if the parent is an #include file, we know it is active so no
-        // need to test for weird combos there) and make sure to start disabled if the parent is disabled.
-        // There are possible modes of nesting here that haven't been handled...
-        switch (oldLayer->m_ifState)
-        {
-        case Layer::IfState::activeIf:
-        case Layer::IfState::triggeredIf:
-            AZ_Assert(false, "unimplemented ##if state");
-            break;
-
-        case Layer::IfState::dormantIf:
-        case Layer::IfState::dormantElse:
-            m_ownedLayer->m_ifState = Layer::IfState::dormantIf;
-            parseIf = false;
-            break;
-        }
-    }
-
-    // Mark the layer as interdicted until we know it isn't
-    m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionActive;
-    auto tokens = TokenizeLine(buf, "\\s*(\\w+)\\s*(==)?\\s*(\\w+)?\\s*$");
-    if (parseIf)
-    {
-        EvaluateIf(tokens);
-    }
-}
-
-void PoundPoundContext::Impl::ProcessElif(char** buf)
-{
-    AZ_Assert(m_ownedLayer != nullptr, "missing ##if state");
-    switch (m_ownedLayer->m_ifState)
-    {
-    case Layer::IfState::dormantIf:
-    case Layer::IfState::triggeredIf:
-        ConsumeLine(buf);
-        m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionActive;
-        break;
-
-    case Layer::IfState::activeIf:
-    {
-        m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionActive;
-        auto tokens = TokenizeLine(buf, "\\s*(\\w+)\\s*(==)?\\s*(\\w+)?\\s*$");
-        EvaluateIf(tokens);
-        break;
-    }
-
-    case Layer::IfState::dormantElse:
-    case Layer::IfState::activeElse:
-    case Layer::IfState::noIf:
-        AZ_Assert(false, "##elif not permitted here");
-        break;
-    }
-}
-
-void PoundPoundContext::Impl::ProcessElse(char** buf)
-{
-    ConsumeLine(buf);
-
-    AZ_Assert(m_ownedLayer != nullptr, "missing ##if state");
-    switch (m_ownedLayer->m_ifState)
-    {
-    case Layer::IfState::activeIf:
-        m_ownedLayer->m_ifState = Layer::IfState::activeElse;
-        m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionPaused;
-        break;
-
-    case Layer::IfState::dormantIf:
-    case Layer::IfState::triggeredIf:
-        m_ownedLayer->m_ifState = Layer::IfState::dormantElse;
-        m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionActive;
-        break;
-
-    case Layer::IfState::noIf:
-    case Layer::IfState::activeElse:
-    case Layer::IfState::dormantElse:
-        AZ_Assert(false, "##else not permitted here");
-        break;
-    }
-}
-
-void PoundPoundContext::Impl::ProcessEndif(char** buf)
-{
-    ConsumeLine(buf);
-
-    AZ_Assert(m_ownedLayer != nullptr, "missing ##if state");
-    AZ_Assert(m_ownedLayer != nullptr, "##else not permitted");
-    AZ_Assert(m_ownedLayer->m_ifState != Layer::IfState::noIf, "##else not permitted");
-
-    auto next = m_ownedLayer->m_ownedNextLayer;
-    m_ownedLayer->m_ownedNextLayer = nullptr;
-    delete m_ownedLayer;
-    m_ownedLayer = next;
-}
-
-void PoundPoundContext::Impl::ProcessDefine(char** buf)
-{
-    auto tokens = TokenizeLine(buf, "\\s*(\\w+)\\s+(\\w+)?\\s*$");
-    auto count = tokens.size();
-    AZ_Assert(count == 1 || count == 2, "malformed ##define");
-
-    auto finder = m_macros.find(tokens[0]);
-    AZ_Assert(finder == m_macros.end(), "duplicate ##define %s", tokens[0].c_str());
-
-    m_macros[tokens[0]] = (count == 2) ? tokens[1] : "1";
-}
-
-void PoundPoundContext::Impl::ProcessUndef(char** buf)
-{
-    auto tokens = TokenizeLine(buf, "\\s*(\\w+)\\s*$");
-    AZ_Assert(tokens.size() == 1, "malformed ##undef");
-
-    auto finder = m_macros.find(tokens[0]);
-    if (finder != m_macros.end())
-    {
-        m_macros.erase(finder);
-    }
-}
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#   define AZ_PATH_SEPARATOR_TOKEN  "\\"
-#else
-#   define AZ_PATH_SEPARATOR_TOKEN  "/"
-#endif
-
-void PoundPoundContext::Impl::ProcessInclude(char** buf)
-{
-    auto tokens = TokenizeLine(buf, "\\s*\\(\\s*(\\w+)\\s*,\\s*(\\w+)\\s*\\)\\s*$");
-
-    m_ownedLayer = new Layer(m_ownedLayer);
-    m_ownedLayer->m_interdictionState = Layer::InterdictionState::interdictionPaused;
-
-    // Look for our root file and platform tokens
-    AZ_Assert(tokens.size() == 2, "Malformed ##include_restricted");
-    auto platform = m_macros.find(tokens[1]);
-    AZ_Assert(platform != m_macros.end(), "Can't expand %s", tokens[1].c_str());
-
-    // Compute and open the filename
-    auto restrictedFile = platform->second + AZ_PATH_SEPARATOR_TOKEN + tokens[0] + "_" + platform->second + ".cfr";
-    char nameFile[256];
-    sprintf_s(nameFile, "%sCryFX/%s", gRenDev->m_cEF.m_ShadersPath.c_str(), restrictedFile.c_str());
-    AZ::IO::HandleType includeFileHandle = gEnv->pCryPak->FOpen(nameFile, "rb");
-    AZ_Assert(includeFileHandle != AZ::IO::InvalidHandle, "Couldn't open file %s", nameFile);
-
-    // Read the file into a new buffer which we will substitute back into the stream.
-    gEnv->pCryPak->FSeek(includeFileHandle, 0, SEEK_END);
-    auto readSize = gEnv->pCryPak->FTell(includeFileHandle);
-    m_ownedLayer->m_ownedIncludeBuffer = new char[readSize + 1];
-    m_ownedLayer->m_ownedIncludeBuffer[readSize] = 0;
-    gEnv->pCryPak->FSeek(includeFileHandle, 0, SEEK_SET);
-    gEnv->pCryPak->FRead(m_ownedLayer->m_ownedIncludeBuffer, readSize, includeFileHandle);
-    gEnv->pCryPak->FClose(includeFileHandle);
-
-    // Remember the old buffer pointer, then insert our new pointer
-    m_ownedLayer->m_oldBuffer = *buf;
-    *buf = m_ownedLayer->m_ownedIncludeBuffer;
-
-    // Prepare the file just as the calling file had been prepared
-    RemoveCR(m_ownedLayer->m_ownedIncludeBuffer);
-}
-
-
-PoundPoundContext::PoundPoundContext([[maybe_unused]] const AZStd::string& shadersFilter)
-    : m_impl(new Impl)
-{
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
-        if (shadersFilter == #PrivateName)                              \
-        {                                                               \
-            m_impl->SetDefine("AZ_RESTRICTED_PLATFORM", #privatename);  \
-        }
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM)
-    AZ_EXPAND_FOR_RESTRICTED_PLATFORM
-#else
-    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#endif
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-}
-
-PoundPoundContext::~PoundPoundContext()
-{
-    delete m_impl;
-}
-
-void PoundPoundContext::PreprocessLines(char** buf)
-{
-    m_impl->Preprocess(buf);
-}
-
-bool PoundPoundContext::IsEndOfBuffer(char** buf, bool* layerSwitch)
-{
-    return m_impl->IsEndOfBuffer(buf, layerSwitch);
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/PoundPoundParser.h b/Code/CryEngine/RenderDll/Common/Shaders/PoundPoundParser.h
deleted file mode 100644
index 0ffa726283..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/PoundPoundParser.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// This is the interface object that handles the ## directive processing in the shader files. It
-// pre-processes the text stream in a C-like manner, removing chunks of text from the input stream
-// so that they never enter the token stream.
-//
-// supported directives:
-//   ##if - works like C #if, currently supports only the following tests:
-//          ##if token - enables the branch if token is defined
-//          ##if token1 == token2 - will first try to expand the two tokens, then will string compare the result.
-//                                  If a token isn't expanded, it will be used as the string to compare.
-//   ##elif - just like C #if, same caveats as ##if
-//   ##else - just like C #else
-//   ##endif - just like C #endif
-//   ##define - just like C define, but doesn't support parenthesis so it is just the token
-//   ##undef - just like C undef
-//   ##include_restricted(rootfile, macro) -
-//       This will build a filename using macro and rootfile and then process it. For example, given
-//       ##include_restricted(shader_cfx, AZ_RESTRICTED_PLATFORM) and AZ_RESTRICTED_PLATFORM set to "banana",
-//       it will open and process a file called "banana/shader_cfx_banana.cfr".
-
-class PoundPoundContext
-{
-public:
-    explicit PoundPoundContext(const AZStd::string& shadersFilter);
-    PoundPoundContext(const PoundPoundContext& other) = delete;
-    void operator=(const PoundPoundContext& other) = delete;
-    ~PoundPoundContext();
-
-    // Call this function when encountering ## in the input stream. It will consume all text starting with the ##
-    // until it reaches a state where regular token parsing might be enabled again
-    void PreprocessLines(char** buf);
-
-    // Callers need to use this function to test for the end of the buffer because we handle switching from an
-    // include file back to the #including file inside this function. The layerSwitch bool is needed so that the
-    // caller can know that they need to possibly start scanning for comments/whitespace again due to the change
-    // in which buffer is being scanned
-    bool IsEndOfBuffer(char** buf, bool* layerSwitch);
-
-private:
-    class Impl;
-    Impl *m_impl;
-};
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/RemoteCompiler.cpp b/Code/CryEngine/RenderDll/Common/Shaders/RemoteCompiler.cpp
deleted file mode 100644
index f1eb11d9ce..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/RemoteCompiler.cpp
+++ /dev/null
@@ -1,1481 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "RemoteCompiler.h"
-#include "../RenderCapabilities.h"
-
-#include <unordered_map>
-
-#include <AzCore/Socket/AzSocket.h>
-#include <AzCore/NativeUI/NativeUIRequests.h>
-#include <AzCore/PlatformId/PlatformId.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzFramework/Network/SocketConnection.h>
-#include <AzFramework/Asset/AssetSystemTypes.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define REMOTECOMPILER_CPP_SECTION_1 1
-#define REMOTECOMPILER_CPP_SECTION_2 2
-#define REMOTECOMPILER_CPP_SECTION_3 3
-#define REMOTECOMPILER_CPP_SECTION_4 4
-#endif
-
-#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#undef AZ_RESTRICTED_SECTION
-#define REMOTECOMPILER_CPP_SECTION_2 2
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(RemoteCompiler_cpp)
-#endif
-
-namespace NRemoteCompiler
-{
-    //Debugging the network connection problems can be tricky without verbose logging, more verbose
-    //than anyone would like on by default. This is a special situation in which if logging is off by default
-    //we would normally use a define or cvar to turn verbose logging on. However you really can't do
-    //that here because of networking, you can't easily break or open the console and enter the
-    //cvar command to turn verbose logging on fast enough to catch logs around the error condition without
-    //causing different code paths due to breaking. So this is an automatic verbose logging var that is off
-    //by default and turns on for a limited number of log lines after the error is logged then automaticly
-    //turns itself off so we are not spammed for to long so as to not adversely affect the rest of the systems.
-    int s_verboselogging = 0;
-    bool VerboseLogging(bool start = false)
-    {
-        if(start)
-        {
-            s_verboselogging = 100;
-            return true;
-        }
-
-        if(s_verboselogging > 0)
-        {
-            s_verboselogging--;
-            return true;
-        }
-        return false;
-    }
-
-    // Note:  Cry's original source uses little endian as their internal communication endianness
-    // so this new code will do the same.
-
-
-    // RemoteProxyState: store the current state of things required to communicate to the remote server
-    // via the Engine Connection, so that its outside this interface and protected from the details of it.
-    class RemoteProxyState
-    {
-    public:
-        unsigned int m_remoteRequestCRC;
-        unsigned int m_remoteResponseCRC;
-        unsigned int m_nextAssignedToken;
-        bool m_unitTestMode;
-        bool m_engineConnectionCallbackInstalled; // lazy-install it.
-
-        typedef AZStd::function<void(const void* payload, unsigned int payloadSize)> TResponseCallback;
-
-        RemoteProxyState()
-        {
-            m_engineConnectionCallbackInstalled = false;
-            m_unitTestMode = false;
-            m_remoteRequestCRC = AZ_CRC("ShaderCompilerProxyRequest");
-            m_remoteResponseCRC = AZ_CRC("ShaderCompilerProxyResponse");
-            m_nextAssignedToken = 0;
-        }
-
-        void SetUnitTestMode(bool newMode)
-        {
-            m_unitTestMode = newMode;
-        }
-
-        bool SubmitRequestAndBlockForResponse(std::vector<uint8>& inout)
-        {
-            unsigned int chosenToken = m_nextAssignedToken++;
-            AzFramework::SocketConnection* engineConnection = AzFramework::SocketConnection::GetInstance();
-
-            if (!m_unitTestMode)
-            {
-                // if we're not in unit test mode, we NEED an engine connection
-                if (!engineConnection)
-                {
-                    AZ_Error("RemoteCompiler", false, "CShaderSrv::Compile: no engine connection present, but r_AssetProcessorShaderCompiler is set in config!\n");
-                    VerboseLogging(true);
-                    return false;
-                }
-
-                // install the callback the first time its needed:
-                if (!m_engineConnectionCallbackInstalled)
-                {
-                    // (AddTypeCallback is assumed to be thread safe.)
-
-                    m_engineConnectionCallbackInstalled = true;
-                    engineConnection->AddMessageHandler(m_remoteResponseCRC, std::bind(&RemoteProxyState::OnReceiveRemoteResponse, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-                }
-            }
-
-            // the plan:  Create a wait event
-            // then raise the event when we get a response from the server
-            // then wait for the event to be raised.
-
-            CryEvent waitEvent;
-
-            {
-                CryAutoLock<CryMutex> protector(m_mapProtector); // scoped lock on the map
-
-                // now create an anonymous function that will copy the data and set the waitevent when the callback is triggered:
-                m_responsesAwaitingCallback[chosenToken] = [&inout, &waitEvent](const void* payload, unsigned int payloadSize)
-                    {
-                        inout.resize(payloadSize);
-                        memcpy(inout.data(), payload, payloadSize);
-                        waitEvent.Set();
-                    };
-            }
-
-            if (m_unitTestMode)
-            {
-                // if we're unit testing, there WILL BE NO ENGINE CONNECTION
-                // we must respond as if we're the engine connection
-                // you can assume the payload has already been unit tested to conform.
-                // instead, just write the data to the buffer as expected:
-
-                std::vector<uint8> newData;
-
-                if (memcmp(inout.data(), "empty", 5) == 0)
-                {
-                    // unit test to send empty
-                }
-                else if (memcmp(inout.data(), "incomplete", 10) == 0)
-                {
-                    // unit test to send incomplete data.
-                    newData.push_back('x');
-                }
-                else if (memcmp(inout.data(), "corrupt", 7) == 0)
-                {
-                    // unit test to send corrupt data
-                    std::string testString("CDCDCDCDCDCDCDCD");
-                    newData.assign(testString.begin(), testString.end());
-                }
-                else if ((memcmp(inout.data(), "compile_failure", 15) == 0) || (memcmp(inout.data(), "success", 7) == 0))
-                {
-                    // simulate compile failure response
-                    // [payload length 4 bytes (LITTLE ENDIAN) ] [status 1 byte] [payload]
-                    // and payload consists of
-                    //   [ uncompressed size (NETWORK BYTE ORDER) ] [payload (compressed)]
-                    bool isFail = (memcmp(inout.data(), "compile_failure", 15) == 0);
-                    std::string failreason("decompressed_plaintext");
-
-                    size_t uncompressed_size = failreason.size();
-                    size_t compressed_size = uncompressed_size;
-                    std::vector<char> compressedData;
-                    compressed_size = uncompressed_size * 2;
-                    compressedData.resize(compressed_size);
-
-                    gEnv->pSystem->CompressDataBlock(failreason.data(), failreason.size(), compressedData.data(), compressed_size);
-                    compressedData.resize(compressed_size);
-
-                    // first four bytes are payload size.
-                    // firth byte is status
-                    unsigned int payloadSize = 4 + compressed_size;
-                    newData.resize(4 + 1 + payloadSize);
-                    uint8 status_code = isFail ? 0x05 : 0x01; // 5 is fail, 1 is ok
-
-                    unsigned int uncompressed_size_le = uncompressed_size;
-                    SwapEndian(uncompressed_size_le);
-
-                    memcpy(newData.data(), &payloadSize, 4);
-                    memcpy(newData.data() + 4, &status_code, 0x01); // 0x05 = error compiling
-
-                    memcpy(newData.data() + 4 + 1, &uncompressed_size_le, 4);
-                    memcpy(newData.data() + 4 + 1 + 4, compressedData.data(), compressedData.size());
-                }
-                else
-                {
-                    newData.clear();
-                }
-
-                // place the messageID at the end:
-                newData.resize(newData.size() + 4); // for the messageID
-                unsigned int swappedToken = chosenToken;
-                SwapEndian(swappedToken);
-                memcpy(newData.data() + newData.size() - 4, &swappedToken, 4);
-
-                OnReceiveRemoteResponse(m_remoteResponseCRC, AzFramework::AssetSystem::DEFAULT_SERIAL, newData.data(), newData.size());
-            }
-            else // note:  This else is inside the endif so that it only takes the second branch if UNIT TEST MODE is present.
-            {
-                // append the messageID:
-                inout.resize(inout.size() + 4); // for the messageID
-                unsigned int swappedToken = chosenToken;
-                SwapEndian(swappedToken);
-                memcpy(inout.data() + inout.size() - 4, &swappedToken, 4);
-
-                if (!engineConnection->SendMsg(m_remoteRequestCRC, inout.data(), inout.size()))
-                {
-                    AZ_Error("RemoteCompiler", false, "CShaderSrv::SubmitRequestAndBlockForResponse() : unable to send via engine connection, but r_AssetProcessorShaderCompiler is set in config!\n");
-                    VerboseLogging(true);
-                    return false;
-                }
-            }
-
-            if (!waitEvent.Wait(10000))
-            {
-                // failure to get response!
-                AZ_Error("RemoteCompiler", false, "CShaderSrv::SubmitRequestAndBlockForResponse() : no response received!\n");
-                VerboseLogging(true);
-                CryAutoLock<CryMutex> protector(m_mapProtector);
-                m_responsesAwaitingCallback.erase(chosenToken);
-
-                if(!gEnv->IsInToolMode())
-                {
-                    EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "Remote Shader Compiler", "Unable to connect to Remote Shader Compiler", false);
-                }
-                return false;
-            }
-
-            // wait succeeded! We got a response!  Unblock and return!
-            return true;
-        }
-
-    private:
-
-        CryMutex m_mapProtector;
-        std::unordered_map<unsigned int, TResponseCallback> m_responsesAwaitingCallback;
-
-        void OnReceiveRemoteResponse([[maybe_unused]] unsigned int messageID, unsigned int /*serial*/, const void* payload, unsigned int payloadSize)
-        {
-            // peel back to inner payload:
-            if (payloadSize < 4)
-            {
-                // indicate error!
-                AZ_Error("RemoteCompiler", false, " CShaderSrv::OnReceiveRemoteREsponse() : truncated message from shader compiler proxy");
-                VerboseLogging(true);
-                return;
-            }
-
-            // last four bytes are expected to be the response ID
-            const uint8* payload_start = reinterpret_cast<const uint8*>(payload);
-            const uint8* end_payload = payload_start + payloadSize;
-            const uint8* messageIDPtr = end_payload - 4;
-
-            unsigned int responseId = *reinterpret_cast<const unsigned int*>(messageIDPtr);
-            SwapEndian(responseId);
-
-            CryAutoLock<CryMutex> protector(m_mapProtector);
-            auto callbackToCall = m_responsesAwaitingCallback.find(responseId);
-            if (callbackToCall == m_responsesAwaitingCallback.end())
-            {
-                AZ_Error("RemoteCompiler", false, "CShaderSrv::OnReceiveRemoteResponse() : Unexpected response from shader compiler proxy.");
-                VerboseLogging(true);
-                return;
-            }
-            // give only the inner payload back to the callee!
-
-            callbackToCall->second(payload_start, payloadSize - sizeof(unsigned int));
-            m_responsesAwaitingCallback.erase(callbackToCall);
-        }
-    };
-    CShaderSrv::CShaderSrv()
-    {
-        m_unitTestMode = false;
-        Init();
-    }
-
-    void CShaderSrv::Init()
-    {
-        static RemoteProxyState proxyState;
-        m_remoteState = &proxyState;
-
-        int result = AZ::AzSock::Startup();
-        if (AZ::AzSock::SocketErrorOccured(result))
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::Init() : Could not init root socket\n");
-            VerboseLogging(true);
-            return;
-        }
-
-        m_RequestLineRootFolder = "";
-
-        AZ::IO::FixedMaxPathString projectUserPath;
-        if (auto settingsRegistry{ AZ::SettingsRegistry::Get() }; settingsRegistry != nullptr)
-        {
-            settingsRegistry->Get(projectUserPath, AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectUserPath);
-        }
-
-        if (!projectUserPath.empty())
-        {
-            m_RequestLineRootFolder.assign(projectUserPath.c_str(), projectUserPath.size());
-        }
-
-        if (m_RequestLineRootFolder.empty())
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::Init() : Game folder has not been specified\n");
-            VerboseLogging(true);
-        }
-    }
-
-    CShaderSrv& CShaderSrv::Instance()
-    {
-        static CShaderSrv g_ShaderSrv;
-        return g_ShaderSrv;
-    }
-    
-    EShaderCompiler CShaderSrv::GetShaderCompiler() const
-    {
-        EShaderCompiler shaderCompiler = eSC_Unknown;
-
-        EShaderLanguage shaderLanguage = GetShaderLanguage();
-        switch (shaderLanguage)
-        {
-        case eSL_Orbis:
-            shaderCompiler = eSC_Orbis_DXC;
-            break;
-
-        case eSL_Jasper:
-            shaderCompiler = eSC_Jasper_FXC;
-            break;
-
-        case eSL_D3D11:
-            shaderCompiler = eSC_D3D11_FXC;
-            break;
-
-        case eSL_GL4_1:
-        case eSL_GL4_4:
-        case eSL_GLES3_0:
-        case eSL_GLES3_1:
-            shaderCompiler = gRenDev->m_cEF.HasStaticFlag(HWSST_LLVM_DIRECTX_SHADER_COMPILER) ? eSC_GLSL_LLVM_DXC : eSC_GLSL_HLSLcc;
-            break;
-
-        case eSL_METAL:
-            shaderCompiler = gRenDev->m_cEF.HasStaticFlag(HWSST_LLVM_DIRECTX_SHADER_COMPILER) ? eSC_METAL_LLVM_DXC : eSC_METAL_HLSLcc;
-            break;
-        }
-
-        return shaderCompiler;
-    }
-
-    const char *CShaderSrv::GetShaderCompilerName() const
-    {
-        // NOTE: These strings are used in the CrySCompilerServer tool as IDs.
-        static const char *shaderCompilerNames[eSC_MAX] =
-        {
-            "Unknown",
-            "Orbis_DXC",
-            "D3D11_FXC",
-            "GLSL_HLSLcc",
-            "METAL_HLSLcc",
-            "GLSL_LLVM_DXC",
-            "METAL_LLVM_DXC",
-            "Jasper_FXC"
-        };
-
-        EShaderCompiler shaderCompiler = GetShaderCompiler();
-        return shaderCompilerNames[shaderCompiler];
-    }
-
-    const char* CShaderSrv::GetPlatformName() const
-    {
-        const char *platformName = "Unknown";
-
-        switch (CParserBin::m_targetPlatform)
-        {
-        case AZ::PlatformID::PLATFORM_WINDOWS_64:
-            platformName = "PC";
-            break;
-        case AZ::PlatformID::PLATFORM_ANDROID_64:
-            platformName = "Android";
-            break;
-        case AZ::PlatformID::PLATFORM_APPLE_OSX:
-            platformName = "Mac";
-            break;
-        case AZ::PlatformID::PLATFORM_APPLE_IOS:
-            platformName = "iOS";
-            break;
-        case AZ::PlatformID::PLATFORM_LINUX_64:
-            platformName = "Linux";
-            break;
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
-        case AZ::PlatformID::PLATFORM_##PUBLICNAME: \
-            platformName = #PrivateName;\
-            break;
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM)
-            AZ_EXPAND_FOR_RESTRICTED_PLATFORM
-#else
-            AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#endif
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-        default:
-            AZ_Assert(false, "Unknown shader platform");
-            break;
-        }
-
-        return platformName;
-    }
-
-    AZStd::string CShaderSrv::GetShaderCompilerFlags([[maybe_unused]] EHWShaderClass eClass, [[maybe_unused]] UPipelineState pipelineState, [[maybe_unused]] uint32 MDVMask) const
-    {
-        AZStd::string flags = "";
-
-        EShaderCompiler shaderCompiler = GetShaderCompiler();
-        switch (shaderCompiler)
-        {
-        // ----------------------------------------
-        case eSC_Orbis_DXC:
-        {
-            flags = "%s %s \"%s\" \"%s\"";
-
-            #if defined(AZ_RESTRICTED_PLATFORM)
-                #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_1
-                #include AZ_RESTRICTED_FILE(RemoteCompiler_cpp)
-            #endif
-
-            #if defined(AZ_RESTRICTED_PLATFORM)
-                #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_2
-                #include AZ_RESTRICTED_FILE(RemoteCompiler_cpp)
-            #endif
-
-            #if defined(TOOLS_SUPPORT_PROVO)
-                #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_2
-                #include AZ_RESTRICTED_FILE_EXPLICIT(Shaders/RemoteCompiler_cpp, provo)
-            #endif
-            #if defined(TOOLS_SUPPORT_JASPER)
-                #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_2
-                #include AZ_RESTRICTED_FILE_EXPLICIT(Shaders/RemoteCompiler_cpp, jasper)
-            #endif
-            #if defined(TOOLS_SUPPORT_SALEM)
-                #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_2
-                #include AZ_RESTRICTED_FILE_EXPLICIT(Shaders/RemoteCompiler_cpp, salem)
-            #endif
-        }
-        break;
-
-        // ----------------------------------------
-        case eSC_Jasper_FXC:
-        case eSC_D3D11_FXC:
-        {
-            const char* extraFlags = "";
-
-            const char* debugFlags = "";
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 3)
-            {
-                debugFlags = " /Zi /Od";  // Debug information
-            }
-            else if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 4)
-            {
-                debugFlags = " /Zi /O3";  // Debug information, optimized shaders
-            }
-
-            flags = AZStd::move(AZStd::string::format("/nologo /E %%s /T %%s /Zpr /Gec %s %s /Fo \"%%s\" \"%%s\"", extraFlags, debugFlags));
-        }
-        break;
-
-        // ----------------------------------------
-        case eSC_GLSL_HLSLcc:
-        {
-            // Translate flags for HLSLCrossCompiler compiler. All flags come from 'Code\Tools\HLSLCrossCompiler\include\hlslcc.h'
-            unsigned int translateFlags =
-                0x1 |    // Each constant buffer will have its own uniform block
-                0x100 |  // Invert clip space position Y
-                0x200 |  // Convert clip sapce position Z
-                0x400 |  // Avoid resource bindings and locations
-                0x800 |  // Do not use an array for temporary registers
-                0x8000 | // Do not add GLSL version macro
-                0x10000; // Avoid shader image load store extension
-
-            EShaderLanguage shaderLanguage = GetShaderLanguage();
-            switch (shaderLanguage)
-            {
-            case eSL_GL4_1:
-            case eSL_GL4_4:
-            {
-                const char* glVer = (shaderLanguage == eSL_GL4_1) ? "410" : "440";
-                flags = AZStd::move(AZStd::string::format("-lang=%s -flags=%u -fxc=\"%%s /nologo /E %%s /T %%s /Zpr /Gec /Fo\" -out=\"%%s\" -in=\"%%s\"", glVer, translateFlags));
-            }
-            break;
-
-            case eSL_GLES3_0:
-            {
-                translateFlags |=
-                    0x20000 | // Syntactic workarounds for driver bugs found in Qualcomm devices running OpenGL ES 3.0
-                    0x40000;  // Add half support
-
-                flags = AZStd::move(AZStd::string::format("-lang=es300 -flags=%u -fxc=\"%%s /nologo /E %%s /T %%s /Zpr /Gec /Fo\" -out=\"%%s\" -in=\"%%s\"", translateFlags));
-            }
-            break;
-
-            case eSL_GLES3_1:
-            {
-                translateFlags |=
-                    0x40000;  // Add half support
-
-                flags = AZStd::move(AZStd::string::format("-lang=es310 -flags=%u -fxc=\"%%s /nologo /E %%s /T %%s /Zpr /Gec /Fo\" -out=\"%%s\" -in=\"%%s\"", translateFlags));
-            }
-            break;
-
-            default:
-                AZ_Assert(false, "Non-GLSL shader language used with the GLSL HLSLcc compiler.");
-                break;
-            }
-        }
-        break;
-
-        // ----------------------------------------
-        case eSC_METAL_HLSLcc:
-        {
-            // Translate flags for HLSLCrossCompilerMETAL compiler. All flags come from 'Code\Tools\HLSLCrossCompilerMETAL\include\hlslcc.h'
-            unsigned int translateFlags =
-                //0x40000 |// Add half support
-                0x1 |    // Each constant buffer will have its own uniform block
-                0x100 |  // Declare inputs and outputs with their semantic name appended
-                0x200 |  // Combine texture/sampler pairs used together into samplers named "texturename_X_samplernamC"
-                0x400 |  // Attribute and uniform explicit location qualifiers are disabled (even if the language version supports that)
-                0x800;   // Global uniforms are not stored in a struct
-
-            flags = AZStd::move(AZStd::string::format("-lang=metal -flags=%u -fxc=\"%%s /nologo /E %%s /T %%s /Zpr /Gec /Fo\" -out=\"%%s\" -in=\"%%s\"", translateFlags));
-        }
-        break;
-
-        // ----------------------------------------
-        case eSC_GLSL_LLVM_DXC:
-        {
-            // Translate flags for DirectXShaderCompiler GLSL compiler. All flags come from 'DirectXShaderCompiler\src\tools\clang\tools\dxcGL\HLSLCrossCompiler\include\hlslcc.h'
-            unsigned int translateFlags =
-                0x1 |    // Each constant buffer will have its own uniform block
-                0x100 |  // Invert clip space position Y
-                0x200 |  // Convert clip sapce position Z
-                0x400 |  // Avoid resource bindings and locations
-                0x800 |  // Do not use an array for temporary registers
-                0x8000 | // Do not add GLSL version macro
-                0x10000| // Avoid shader image load store extension
-                0x20000; // Declare dynamically indexed constant buffers as an array of floats
-
-            EShaderLanguage shaderLanguage = GetShaderLanguage();
-            switch (shaderLanguage)
-            {
-            case eSL_GL4_1:
-            case eSL_GL4_4:
-            {
-                const char* glVer = (shaderLanguage == eSL_GL4_1) ? "410" : "440";
-                flags = AZStd::move(AZStd::string::format("-translate_flags %u -translate %s -E %%s -T %%s -Zpr -not_use_legacy_cbuf_load -Gfa -Fo \"%%s\" \"%%s\"", translateFlags, glVer));
-            }
-            break;
-
-            case eSL_GLES3_0:
-            case eSL_GLES3_1:
-            {
-                const char* glesVer = (shaderLanguage == eSL_GLES3_0) ? "es300" : "es310";
-                flags = AZStd::move(AZStd::string::format("-translate_flags %u -translate %s -E %%s -T %%s -Zpr -not_use_legacy_cbuf_load -Gfa -Fo \"%%s\" \"%%s\"", translateFlags, glesVer));
-            }
-            break;
-
-            default:
-                AZ_Assert(false, "Non-GLSL shader language used with the LLVM DXC compiler.");
-                break;
-            }
-        }
-        break;
-
-        // ----------------------------------------
-        case eSC_METAL_LLVM_DXC:
-        {
-            // Translate flags for DirectXShaderCompiler Metal compiler. All flags come from 'DirectXShaderCompiler\src\tools\clang\tools\dxcMetal\HLSLCrossCompilerMETAL\include\hlslcc.h'
-            unsigned int translateFlags =
-                0x1 |    // Each constant buffer will have its own uniform block
-                0x100 |  // Declare inputs and outputs with their semantic name appended
-                0x200 |  // Combine texture/sampler pairs used together into samplers named "texturename_X_samplername"
-                0x400 |  // Attribute and uniform explicit location qualifiers are disabled (even if the language version supports that)
-                0x800 |  // Global uniforms are not stored in a struct
-                0x2000;  // Do not use an array for temporary registers
-
-            #if defined(AZ_PLATFORM_MAC)
-                translateFlags |= 0x1000; // Declare dynamically indexed constant buffers as an array of floats
-            #endif
-
-            flags = AZStd::move(AZStd::string::format("-translate_flags %u -translate metal -E %%s -T %%s -Zpr -not_use_legacy_cbuf_load -Gfa -Fo \"%%s\" \"%%s\"", translateFlags));
-        }
-        break;
-
-        // ----------------------------------------
-        case eSC_Unknown:
-        default:
-            AZ_Assert(false, "Unknown shader compiler");
-            break;
-        }
-
-        return flags;
-    }
-
-    string CShaderSrv::CreateXMLNode(const string& rTag, const string& rValue)   const
-    {
-        string Tag = rTag;
-        Tag += "=\"";
-        Tag += rValue;
-        Tag += "\" ";
-        return Tag;
-    }
-
-    string CShaderSrv::TransformToXML(const string& rIn)    const
-    {
-        string Out;
-        for (size_t a = 0, Size = rIn.size(); a < Size; a++)
-        {
-            const char C = rIn.c_str()[a];
-            if (C == '&')
-            {
-                Out += "&amp;";
-            }
-            else
-            if (C == '<')
-            {
-                Out += "&lt;";
-            }
-            else
-            if (C == '>')
-            {
-                Out += "&gt;";
-            }
-            else
-            if (C == '\"')
-            {
-                Out += "&quot;";
-            }
-            else
-            if (C == '\'')
-            {
-                Out += "&apos;";
-            }
-            else
-            {
-                Out += C;
-            }
-        }
-        return Out;
-    }
-
-    bool CShaderSrv::CreateRequest(std::vector<uint8>& rVec,
-        std::vector<std::pair<string, string> >& rNodes) const
-    {
-        string Request = "<?xml version=\"1.0\"?><Compile ";
-        Request +=  CreateXMLNode("Version", TransformToXML("2.3"));
-        for (size_t a = 0; a < rNodes.size(); a++)
-        {
-            Request +=  CreateXMLNode(rNodes[a].first, TransformToXML(rNodes[a].second));
-        }
-
-        Request +=  " />";
-        rVec    =   std::vector<uint8>(Request.c_str(), &Request.c_str()[Request.size() + 1]);
-        return true;
-    }
-
-    bool CShaderSrv::RequestLine(const SCacheCombination& cmb, const string& rLine) const
-    {
-        const string List(string(GetShaderLanguageName()) + "/" + cmb.Name.c_str() + "ShaderList.txt");
-        return RequestLine(List, rLine);
-    }
-
-    bool CShaderSrv::CommitPLCombinations(std::vector<SCacheCombination>&   rVec)
-    {
-        const uint32 STEPSIZE = 32;
-#if defined(AZ_ENABLE_TRACING)
-        float T0 = iTimer->GetAsyncCurTime();
-#endif
-        for (uint32 i = 0; i < rVec.size(); i += STEPSIZE)
-        {
-            string Line;
-            string levelRequest;
-
-            levelRequest.Format("<%d>%s", rVec[i].nCount, rVec[i].CacheName.c_str());
-            Line = levelRequest;
-            for (uint32 j = 1; j < STEPSIZE && i + j < rVec.size(); j++)
-            {
-                Line += string(";");
-                levelRequest.Format("<%d>%s", rVec[i + j].nCount, rVec[i + j].CacheName.c_str());
-                Line += levelRequest;
-            }
-            if (!RequestLine(rVec[i], Line))
-            {
-                return false;
-            }
-        }
-#if defined(AZ_ENABLE_TRACING)
-        float T1    =   iTimer->GetAsyncCurTime();
-#endif
-        if(VerboseLogging())
-        {
-            AZ_TracePrintf("RemoteCompiler", "CShaderSrv::CommitPLCombinations() : %3.3f to commit %" PRISIZE_T " Combinations\n", T1 - T0, rVec.size());
-        }
-
-        return true;
-    }
-
-    EServerError CShaderSrv::Compile(std::vector<uint8>& rVec,
-        const char* pProfile,
-        const char* pProgram,
-        const char* pEntry,
-        const char* pCompileFlags,
-        const char* pIdent) const
-    {
-        std::vector<uint8>  CompileData;
-        std::vector<std::pair<string, string> > Nodes;
-
-        Nodes.push_back(std::pair<string, string>(string("JobType"), string("Compile")));
-        Nodes.push_back(std::pair<string, string>(string("Profile"), string(pProfile)));
-        Nodes.push_back(std::pair<string, string>(string("Program"), string(pProgram)));
-        Nodes.push_back(std::pair<string, string>(string("Entry"), string(pEntry)));
-        Nodes.push_back(std::pair<string, string>(string("CompileFlags"), string(pCompileFlags)));
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(RemoteCompiler_cpp)
-#endif
-
-        // Any fields coming after "HashStop" will not contribute to the hash calculated on the Remote Shader Compiler Server for its local cache.
-        Nodes.push_back(std::pair<string, string>(string("HashStop"), string("1")));
-        Nodes.push_back(std::pair<string, string>(string("ShaderRequest"), string(pIdent)));
-        Nodes.push_back(std::pair<string, string>(string("Project"), string(m_RequestLineRootFolder.c_str())));
-        Nodes.push_back(std::pair<string, string>(string("Platform"), string(GetPlatformName())));
-        Nodes.push_back(std::pair<string, string>(string("Compiler"), string(GetShaderCompilerName())));
-        Nodes.push_back(std::pair<string, string>(string("Language"), string(GetShaderLanguageName())));
-
-        if (gRenDev->CV_r_ShaderEmailTags && gRenDev->CV_r_ShaderEmailTags->GetString() &&
-            strlen(gRenDev->CV_r_ShaderEmailTags->GetString()) > 0)
-        {
-            Nodes.push_back(std::pair<string, string>(string("Tags"), string(gRenDev->CV_r_ShaderEmailTags->GetString())));
-        }
-
-        if (gRenDev->CV_r_ShaderEmailCCs && gRenDev->CV_r_ShaderEmailCCs->GetString() &&
-            strlen(gRenDev->CV_r_ShaderEmailCCs->GetString()) > 0)
-        {
-            Nodes.push_back(std::pair<string, string>(string("EmailCCs"), string(gRenDev->CV_r_ShaderEmailCCs->GetString())));
-        }
-
-        if (gRenDev->CV_r_ShaderCompilerDontCache)
-        {
-            Nodes.push_back(std::pair<string, string>(string("Caching"), string("0")));
-        }
-
-        //Nodes.push_back(std::pair<string,string>(string("ShaderRequest",string(pShaderRequestLine)));
-
-        EServerError errCompile = ESOK;
-        int nRetries = 3;
-        do
-        {
-            if (errCompile != ESOK)
-            {
-                Sleep(5000);
-            }
-
-            if (!CreateRequest(CompileData, Nodes))
-            {
-                AZ_Error("RemoteCompiler", false, "CShaderSrv::Compile() : failed composing Request XML\n");
-                VerboseLogging(true);
-                return ESFailed;
-            }
-
-            errCompile = Send(CompileData);
-        } while (errCompile == ESRecvFailed && nRetries-- > 0);
-
-        rVec    =   CompileData;
-
-        if (errCompile != ESOK)
-        {
-            bool logError = true;
-            const char* why = "";
-            switch (errCompile)
-            {
-            case ESNetworkError:
-                why = "Network Error";
-                break;
-            case ESSendFailed:
-                why = "Send Failed";
-                break;
-            case ESRecvFailed:
-                why = "Receive Failed";
-                break;
-            case ESInvalidState:
-                why = "Invalid Return State (compile issue ?!?)";
-                break;
-            case ESCompileError:
-                logError = false;
-                why = "";
-                break;
-            case ESFailed:
-                why = "";
-                break;
-            }
-            if (logError)
-            {
-                AZ_Error("RemoteCompiler", false, "CShaderSrv::Compile() : failed to compile %s (%s)", pEntry, why);
-                VerboseLogging(true);
-            }
-        }
-        return errCompile;
-    }
-
-    EServerError CShaderSrv::GetShaderList(std::vector<uint8>& rVec) const
-    {
-        std::vector<uint8>  GetShaderListData;
-        std::vector<std::pair<string, string> > Nodes;
-
-        Nodes.push_back(std::pair<string, string>(string("JobType"), string("GetShaderList")));
-        Nodes.push_back(std::pair<string, string>(string("Project"), string(m_RequestLineRootFolder.c_str())));
-        Nodes.push_back(std::pair<string, string>(string("Platform"), string(GetPlatformName())));
-        Nodes.push_back(std::pair<string, string>(string("Compiler"), string(GetShaderCompilerName())));
-        Nodes.push_back(std::pair<string, string>(string("Language"), string(GetShaderLanguageName())));
-        Nodes.push_back(std::pair<string, string>(string("ShaderList"), string(GetShaderListFilename().c_str())));
-
-        #if defined(AZ_RESTRICTED_PLATFORM)
-            #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_4
-            #include AZ_RESTRICTED_FILE(RemoteCompiler_cpp)
-        #endif
-
-        EServerError errShaderGetList = ESOK;
-        int nRetries = 3;
-        do
-        {
-            if (errShaderGetList != ESOK)
-            {
-                Sleep(5000);
-            }
-
-            if (!CreateRequest(GetShaderListData, Nodes))
-            {
-                AZ_Error("RemoteCompler", false, "ERROR: CShaderSrv::GetShaderList(): failed composing Request XML\n");
-                VerboseLogging(true);
-                return ESFailed;
-            }
-
-            errShaderGetList = Send(GetShaderListData);
-        } while (errShaderGetList == ESRecvFailed && nRetries-- > 0);
-
-        rVec = GetShaderListData;
-
-        if (errShaderGetList != ESOK)
-        {
-            bool logError = true;
-            const char* why = "";
-            switch (errShaderGetList)
-            {
-            case ESNetworkError:
-                why = "Network Error";
-                break;
-            case ESSendFailed:
-                why = "Send Failed";
-                break;
-            case ESRecvFailed:
-                why = "Receive Failed";
-                break;
-            case ESInvalidState:
-                why = "Invalid Return State (compile issue ?!?)";
-                break;
-            case ESFailed:
-                why = "";
-                break;
-            }
-            if (logError)
-            {
-                AZ_Error("RemoteCompiler", false, "ERROR: CShaderSrv::GetShaderList(): failed to get shader list (%s)", why);
-                VerboseLogging(true);
-            }
-        }
-        return errShaderGetList;
-    }
-
-    bool CShaderSrv::RequestLine(const string& rList, const string& rString) const
-    {
-        if (!gRenDev->CV_r_shaderssubmitrequestline)
-        {
-            return true;
-        }
-
-        std::vector<uint8>  CompileData;
-        std::vector<std::pair<string, string> > Nodes;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION REMOTECOMPILER_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(RemoteCompiler_cpp)
-#endif
-
-        Nodes.push_back(std::pair<string, string>(string("JobType"), string("RequestLine")));
-        Nodes.push_back(std::pair<string, string>(string("ShaderRequest"), rString));
-        Nodes.push_back(std::pair<string, string>(string("Project"), m_RequestLineRootFolder));
-        Nodes.push_back(std::pair<string, string>(string("Platform"), string(GetPlatformName())));
-        Nodes.push_back(std::pair<string, string>(string("Compiler"), string(GetShaderCompilerName())));
-        Nodes.push_back(std::pair<string, string>(string("Language"), string(GetShaderLanguageName())));
-        Nodes.push_back(std::pair<string, string>(string("ShaderList"), rList));
-
-        if (!CreateRequest(CompileData, Nodes))
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::RequestLine() : failed composing Request XML\n");
-            VerboseLogging(true);
-            return false;
-        }
-
-        return (Send(CompileData) == ESOK);
-    }
-
-    bool CShaderSrv::Send(AZSOCKET Socket, const char* pBuffer, uint32 Size) const
-    {
-        //size_t w;
-        size_t wTotal = 0;
-        while (wTotal < Size)
-        {
-            int result = AZ::AzSock::Send(Socket, pBuffer + wTotal, Size - wTotal, 0);
-            if (AZ::AzSock::SocketErrorOccured(result))
-            {
-                AZ_Error("RemoteCompiler", false, "CShaderSrv::Send() : failed (%s)\n", AZ::AzSock::GetStringForError(result));
-                VerboseLogging(true);
-                return false;
-            }
-            wTotal += (size_t)result;
-        }
-        return true;
-    }
-
-    bool CShaderSrv::Send(AZSOCKET Socket, std::vector<uint8>& rCompileData)   const
-    {
-        const uint64 Size   =   static_cast<uint32>(rCompileData.size());
-        if(Size == 0)
-        {
-            return Send(Socket, (const char*) &Size, sizeof(Size));//send 0... if Size is 0 then (const char*)&rCompileData[0] cannot be accessed.
-        }
-
-        return Send(Socket, (const char*)&Size, sizeof(Size)) &&
-               Send(Socket, (const char*)&rCompileData[0], static_cast<uint32>(Size));
-    }
-
-#define MAX_TIME_TO_WAIT 100000
-
-    EServerError CShaderSrv::Recv(AZSOCKET Socket, std::vector<uint8>& rCompileData)   const
-    {
-        const size_t Offset =   5;//version 2 has 4byte size and 1 byte state
-        //  const uint32 Size   =   static_cast<uint32>(rCompileData.size());
-        //  return  Send(Socket,(const char*)&Size,4) ||
-        //      Send(Socket,(const char*)&rCompileData[0],Size);
-
-
-        //  delete[] optionsBuffer;
-        uint32 nMsgLength = 0;
-        uint32 nTotalRecived = 0;
-        const size_t    BLOCKSIZE   =   4 * 1024;
-        const size_t    SIZELIMIT   =   1024 * 1024;
-        rCompileData.resize(0);
-        rCompileData.reserve(64 * 1024);
-        int CurrentPos  =   0;
-        while (rCompileData.size() < SIZELIMIT)
-        {
-            rCompileData.resize(CurrentPos + BLOCKSIZE);
-
-            int Recived = SOCKET_ERROR;
-            int waitingtime = 0;
-            while (Recived < 0)
-            {
-                Recived = AZ::AzSock::Recv(Socket, reinterpret_cast<char*>(&rCompileData[CurrentPos]), BLOCKSIZE, 0);
-                if (AZ::AzSock::SocketErrorOccured(Recived))
-                {
-                    AZ::AzSock::AzSockError error = AZ::AzSock::AzSockError(Recived);
-                    if (error == AZ::AzSock::AzSockError::eASE_EWOULDBLOCK)
-                    {
-                        // are we out of time
-                        if (waitingtime > MAX_TIME_TO_WAIT)
-                        {
-                            AZ_Error("RemoteCompiler", false, "CShaderSrv::Recv() : Out of time during waiting %d seconds on block, sys_net_errno=%s\n", MAX_TIME_TO_WAIT, AZ::AzSock::GetStringForError(Recived));
-                            VerboseLogging(true);
-                            return ESRecvFailed;
-                        }
-
-                        waitingtime += 5;
-
-                        // sleep a bit and try again
-                        Sleep(5);
-                    }
-                    else
-                    {
-                        // count on retry to fix this after a small sleep
-                        AZ_Error("RemoteCompiler", false, "CShaderSrv::Recv() : at offset %lu: sys_net_errno=%s\n", (unsigned long)rCompileData.size(), AZ::AzSock::GetStringForError(Recived));
-                        VerboseLogging(true);
-                        return ESRecvFailed;
-                    }
-                }
-            }
-
-            if (Recived >= 0)
-            {
-                nTotalRecived += Recived;
-            }
-
-            if (nTotalRecived >= 4)
-            {
-                nMsgLength = *(uint32*)&rCompileData[0] + Offset;
-            }
-
-            if (Recived == 0 || nTotalRecived == nMsgLength)
-            {
-                rCompileData.resize(nTotalRecived);
-                break;
-            }
-            CurrentPos  +=  Recived;
-        }
-
-        return ProcessResponse(rCompileData);
-    }
-
-    // given a data vector, check to see if its an error or a success situation.
-    // if its an error, replace the buffer with the uncompressed error string if possible.
-    EServerError CShaderSrv::ProcessResponse(std::vector<uint8>& rCompileData) const
-    {
-        // so internally the message is like this
-        // [payload length 4 bytes] [status 1 byte] [payload]
-        // note that the length of the payload is given, not the total length of the message
-        // which is actually payload length + [4 bytes + 1 byte status]
-
-        const size_t OffsetToPayload = sizeof(unsigned int) + sizeof(uint8); // probably 5 bytes
-
-        if (rCompileData.size() < OffsetToPayload)
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::ProcessResponse() : data incomplete from server (only %i bytes received)\n", static_cast<int>(rCompileData.size()));
-            VerboseLogging(true);
-            rCompileData.clear();
-            return ESRecvFailed;
-        }
-
-        uint32 payloadSize = *(uint32*)&rCompileData[0];
-        uint8 state = rCompileData[4];
-
-        if (payloadSize + OffsetToPayload != rCompileData.size())
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::ProcessResponse() : data incomplete from server - expected %i bytes, got %i bytes\n", static_cast<int>(payloadSize + OffsetToPayload), static_cast<int>(rCompileData.size()));
-            VerboseLogging(true);
-            rCompileData.clear();
-            return ESRecvFailed;
-        }
-
-        if (rCompileData.size() > OffsetToPayload) // ie, not a zero-byte payload
-        {
-            // move the payload to the beginning of the array, so that the first byte is the first byte of the payload
-            memmove(&rCompileData[0], &rCompileData[OffsetToPayload], rCompileData.size() - OffsetToPayload);
-            rCompileData.resize(rCompileData.size() - OffsetToPayload);
-        }
-        else
-        {
-            rCompileData.clear();
-        }
-
-        // decompress datablock if available.
-        if (rCompileData.size() > sizeof(unsigned int)) // theres a datablock, which is compressed and there's enough data in there for a header of 4 bytes and payload
-        {
-            // [4 bytes - size of uncompressed message in network order][compressed payload message]
-            // Decompress incoming payload
-            std::vector<uint8> rCompressedData;
-            rCompressedData.swap(rCompileData);
-
-            uint32 nSrcUncompressedLen = *(uint32*)&rCompressedData[0];
-            SwapEndian(nSrcUncompressedLen);
-
-            size_t nUncompressedLen = (size_t)nSrcUncompressedLen;
-
-            // Maximum size allowed for a shader in bytes
-            static const size_t maxShaderSize = 10ull * (1024ull * 1024ull); // 10 MB
-
-            if (nUncompressedLen > maxShaderSize)
-            {
-                // Shader too big, something is wrong.
-                rCompileData.clear(); // don't propogate "something is wrong" data
-                return ESFailed;
-            }
-
-            rCompileData.resize(nUncompressedLen);
-            if (nUncompressedLen > 0)
-            {
-                if (!gEnv->pSystem->DecompressDataBlock(&rCompressedData[4], rCompressedData.size() - 4, &rCompileData[0], nUncompressedLen))
-                {
-                    rCompileData.clear(); // don't propogate corrupted data
-                    return ESFailed;
-                }
-            }
-        }
-
-        if (state != 1) //1==ECSJS_DONE state on server, dont change!
-        {
-            // getting here means SOME sort of error occurred.
-            // don't print compile errors here, they'll be handled later
-            if (state == 5) //5==ECSJS_COMPILE_ERROR state on server, dont change!
-            {
-                return ESCompileError;
-            }
-
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::ProcessResponse() : data contains invalid return status: state = %d \n", state);
-            VerboseLogging(true);
-
-            return ESInvalidState;
-        }
-        return ESOK;
-    }
-
-    void CShaderSrv::Tokenize(tdEntryVec& rRet, const string& Tokens, const string& Separator)    const
-    {
-        rRet.clear();
-        string::size_type Pt;
-        string::size_type Start = 0;
-        string::size_type SSize =   Separator.size();
-
-        while ((Pt = Tokens.find(Separator, Start)) != string::npos)
-        {
-            string  SubStr  =   Tokens.substr(Start, Pt - Start);
-            rRet.push_back(SubStr);
-            Start = Pt + SSize;
-        }
-
-        rRet.push_back(Tokens.substr(Start));
-    }
-
-    EServerError CShaderSrv::Send(std::vector<uint8>& rCompileData) const
-    {
-        if (rCompileData.size() > std::numeric_limits<int>::max())
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::Send() : compile data too big to send.\n");
-            VerboseLogging(true);
-            return ESFailed;
-        }
-
-        // this function expects to block until a response is received or failure occurs.
-        AzFramework::SocketConnection* engineConnection = AzFramework::SocketConnection::GetInstance();
-        bool useAssetProcessor = ((CRenderer::CV_r_AssetProcessorShaderCompiler != 0) && (engineConnection) && (engineConnection->IsConnected()));
-
-        if (m_unitTestMode)
-        {
-            useAssetProcessor = true; // always test asset processor-based code
-        }
-
-        if (useAssetProcessor)
-        {
-            EServerError resultFromConnection = SendRequestViaEngineConnection(rCompileData);
-            if (resultFromConnection != ESOK)
-            {
-                return resultFromConnection;
-            }
-        }
-        else
-        {
-            EServerError resultFromSocket = SendRequestViaSocket(rCompileData);
-
-            if (resultFromSocket != ESOK)
-            {
-                return resultFromSocket;
-            }
-        }
-
-        if (rCompileData.size() < 4)
-        {
-            return ESFailed;
-        }
-
-        return ESOK;
-    }
-
-    EServerError CShaderSrv::SendRequestViaSocket(std::vector<uint8>& rCompileData) const
-    {
-        AZSOCKET Socket = AZ_SOCKET_INVALID;
-        int Err = SOCKET_ERROR;
-
-        // generate the list of servers to make the request to:
-        tdEntryVec ServerVec;
-        if (gEnv->pConsole->GetCVar("r_ShaderCompilerServer"))
-        {
-            Tokenize(ServerVec, gEnv->pConsole->GetCVar("r_ShaderCompilerServer")->GetString(), ",");
-        }
-
-        if (ServerVec.empty())
-        {
-            ServerVec.push_back("localhost");
-        }
-
-        if(VerboseLogging())
-        {
-            AZ_TracePrintf("RemoteCompler", "INFO: CShaderSrv::SendRequestViaSocket(): connect to remote shader compiler server: %s...\n", gRenDev->CV_r_ShaderCompilerServer->GetString());
-        }
-
-        //connect
-        //try each entry in the list from front to back
-        bool didconnect = false;
-        bool sent = false;
-        bool received = false;
-        for (uint32 nServer = 0; nServer < ServerVec.size(); nServer++)
-        {
-            string Server = ServerVec[nServer];
-
-            //try 3 times each in turn
-            for (uint32 nRetries = 0; nRetries < 3; nRetries++)
-            {
-                if(nRetries)
-                {
-                    AZ_Warning("RemoteCompiler", false, "WARN: CShaderSrv::SendRequestViaSocket(): retry % i to connect to: %s...\n", nRetries, Server.c_str());
-                    VerboseLogging(true);
-                }
-                else
-                {
-                    if(VerboseLogging())
-                    {
-                        AZ_TracePrintf("RemoteCompler", "INFO: CShaderSrv::SendRequestViaSocket(): connect to: %s...\n", Server.c_str());
-                    }
-                }
-
-                //create the socket
-                Socket = AZ::AzSock::Socket();
-
-                //if anything went wrong creating the socket, this was not a valid try, so try again
-                if (!AZ::AzSock::IsAzSocketValid(Socket))
-                {
-                    if (nRetries)
-                    {
-                        nRetries--;
-                    }
-                    AZ_Warning("RemoteCompiler", false, "WARN: CShaderSrv::SendRequestViaSocket(): can't create client socket: error %s\n", AZ::AzSock::GetStringForError(Socket));
-                    VerboseLogging(true);
-                }
-                else
-                {
-                    //we have a socket, try to connect
-                    AZ::AzSock::SetSocketOption(Socket, AZ::AzSock::AzSocketOption::REUSEADDR, true);
-                    AZ::AzSock::AzSocketAddress socketAddress;
-                    socketAddress.SetAddress(Server.c_str(), gRenDev->CV_r_ShaderCompilerPort);
-
-                    Err = AZ::AzSock::Connect(Socket, socketAddress);
-                    if (AZ::AzSock::SocketErrorOccured(Err))
-                    {
-                        //connect failed, see if it failed because we don't have enough buffer, if so its not a legit fail of this server, retry
-
-                        // if buffer is full try sleeping a bit before retrying
-                        // (if you keep getting this issue then try using same shutdown mechanism as server is doing (see server code))
-                        // (for more info on windows side check : http://www.proxyplus.cz/faq/articles/EN/art10002.htm)
-                        if (Err == static_cast<AZ::s32>(AZ::AzSock::AzSockError::eASE_ENOBUFS))
-                        {
-                            AZ_Warning("RemoteCompiler", false, "WARN: CShaderSrv::SendRequestViaSocket(): ENOBUFS: the buffer is full, try again in 5 seconds. %s (sys_net_errno=%s, retrying %d)\n", Server.c_str(), AZ::AzSock::GetStringForError(Err), nRetries);
-                            VerboseLogging(true);
-                            if (nRetries)
-                            {
-                                nRetries--;
-                            }
-                            //wait 5 seconds before retry
-                            Sleep(5000);
-                        }
-                        else
-                        {
-                            //legit fail to connect, retry
-                            AZ_Warning("RemoteCompiler", false, "WARN: CShaderSrv::SendRequestViaSocket(): could not connect to %s (sys_net_errno=%s, retrying %d)\n", Server.c_str(), AZ::AzSock::GetStringForError(Err), nRetries);
-                            VerboseLogging(true);
-
-                            //wait 1 second before retry
-                            Sleep(1000);
-                        }
-
-                        //close the socket for a retry
-                        AZ::AzSock::CloseSocket(Socket);
-                        Socket = AZ_SOCKET_INVALID;
-                    }
-                    else
-                    {
-                        if(VerboseLogging())
-                        {
-                            AZ_TracePrintf("RemoteCompiler", "INFO: CShaderSrv::SendRequestViaSocket(): connected to: %s...\n", Server.c_str());
-                        }
-
-                        didconnect = true;
-                        //we connected, send
-                        if (!Send(Socket, rCompileData))
-                        {
-                            //send failed
-                            AZ_Warning("RemoteCompiler", false, "WARN: CShaderSrv::SendRequestViaSocket(): failed to send: sys_net_errno=%s\n", AZ::AzSock::GetStringForError(Err));
-                            VerboseLogging(true);
-
-                            //wait 1 second before retry
-                            Sleep(1000);
-                            
-                            AZ::AzSock::CloseSocket(Socket);
-                            Socket = AZ_SOCKET_INVALID;
-                        }
-                        else
-                        {
-                            sent = true;
-                            //send succeeded, wait for recv
-                            EServerError Error = Recv(Socket, rCompileData);
-                            if (Error != ESOK)
-                            {
-                                //recv failed
-                                AZ_Warning("RemoteCompiler", false, "WARN: CShaderSrv::SendRequestViaSocket(): failed to recv: EServerError=%i\n", Error);
-                                VerboseLogging(true);
-
-                                //wait 1 second before retry
-                                Sleep(1000);
-
-                                AZ::AzSock::CloseSocket(Socket);
-                                Socket = AZ_SOCKET_INVALID;
-                            }
-                            else
-                            {
-                                received = true;
-                                //we are done, it succeeded
-                                //shutdown the client side of the socket because we are done listening
-                                if(VerboseLogging())
-                                {
-                                    AZ_TracePrintf("RemoteCompler", "INFO: CShaderSrv::SendRequestViaSocket(): shader request succeeded.\n");
-                                }
-
-                                Err = AZ::AzSock::Shutdown(Socket, SD_BOTH);
-                                if (Err == SOCKET_ERROR)
-                                {
-                                    AZ_Warning("RemoteCompiler", false, "WARN: CShaderSrv::SendRequestViaSocket(): succeeded but and got error shutting down socket: sys_net_errno=%s\n", AZ::AzSock::GetStringForError(Err));
-                                    VerboseLogging(true);
-                                }
-                                else
-                                {
-                                    //put this in the else because OSX can have a problem calling closesocket on a failed shutdown of a socket
-                                    AZ::AzSock::CloseSocket(Socket);
-                                }
-                                Socket = AZ_SOCKET_INVALID;
-                                return ESOK;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        //we failed
-        AZ::AzSock::CloseSocket(Socket);
-        Socket = AZ_SOCKET_INVALID;
-        rCompileData.resize(0);
-        
-        if (didconnect)
-        {
-            const AZStd::string title = "Remote Shader Compiler";
-            const AZStd::string message = AZStd::string::format("We connected to the server but failed to compile the shader!");
-            AZ_Error("RemoteCompiler", false, "ERROR: CShaderSrv::SendRequestViaSocket(): %s\n", message.c_str());
-            VerboseLogging(true);
-            if(!gEnv->IsInToolMode())
-            {
-                EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, title, message, false);
-            }
-        }
-        else
-        {
-            const AZStd::string title = "Remote Shader Compiler";
-            const AZStd::string message = AZStd::string::format("Unable to connect to Remote Shader Compiler at %s", gRenDev->CV_r_ShaderCompilerServer->GetString());
-            AZ_Error("RemoteCompiler", false, "ERROR: CShaderSrv::SendRequestViaSocket(): %s\n", message.c_str());
-            VerboseLogging(true);
-            if(!gEnv->IsInToolMode())
-            {
-                AZStd::vector<AZStd::string> options;
-                options.push_back("OK");
-                EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayBlockingDialog, title, message, options);
-            }
-        }
-        return ESNetworkError;
-    }
-
-    bool CShaderSrv::EncapsulateRequestInEngineConnectionProtocol(std::vector<uint8>& rCompileData) const
-    {
-        if (rCompileData.empty())
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::EncapsulateRequestInEngineConnectionProtocol() : Engine Connection was unable to send the message - zero bytes size.");
-            VerboseLogging(true);
-            return false;
-        }
-
-        string serverList = gEnv->pConsole->GetCVar("r_ShaderCompilerServer")->GetString();
-        unsigned int serverListLength = static_cast<unsigned int>(serverList.size());
-        unsigned short serverPort = static_cast<unsigned short>(gEnv->pConsole->GetCVar("r_ShaderCompilerPort")->GetIVal());
-
-        if (serverListLength == 0)
-        {
-            AZ_Error("RemoteCompiler", false, "r_ShaderCompilerServer cvar is empty - no servers to send to.  This CVAR should contain the list of servers to send shader compiler requests to.");
-            return false;
-        }
-
-        // we're packing at the end because sometimes, you don't need to copy the data in that case.
-        std::size_t originalSize = rCompileData.size();
-
-        //                                 a null     the string        a null       the  port         the length of the string
-        rCompileData.resize(originalSize +   1    + serverListLength +    1    +  sizeof(serverPort) + sizeof(unsigned int));
-        uint8* dataStart = rCompileData.data() + originalSize;
-        *dataStart = 0; // null
-        ++dataStart;
-        memcpy(dataStart, serverList.c_str(), serverList.size()); // server list data
-        dataStart += serverList.size();
-        *dataStart = 0; // null
-        ++dataStart;
-
-        SwapEndian(serverPort);
-        SwapEndian(serverListLength);
-
-        memcpy(dataStart, &serverPort, sizeof(serverPort)); // server port
-        dataStart += sizeof(serverPort);
-        memcpy(dataStart, &serverListLength, sizeof(serverListLength)); // server list length
-        dataStart += sizeof(serverListLength);
-
-        // check for buffer overrun
-        assert(reinterpret_cast<ptrdiff_t>(dataStart) - reinterpret_cast<ptrdiff_t>(rCompileData.data()) == rCompileData.size());
-        return true;
-    }
-
-    EServerError CShaderSrv::SendRequestViaEngineConnection(std::vector<uint8>& rCompileData)   const
-    {
-        // use the asset processor instead of direct socket.
-        // wrap it up in a protocol structure - very straight forward - the requestID followed by the data
-        // the protocol already takes care of the data size, underneath, so no need to send that
-
-        // what we need include the information about what server(s) to connect to.
-        // we can append to the end of the compile data so as to avoid copying unless we need to
-
-        if (!EncapsulateRequestInEngineConnectionProtocol(rCompileData))
-        {
-            return ESFailed;
-        }
-
-        if (!m_remoteState->SubmitRequestAndBlockForResponse(rCompileData))
-        {
-            rCompileData.clear();
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::SendRequestViaEngineConnection() : Engine Connection was unable to send the message.");
-            VerboseLogging(true);
-            return ESNetworkError;
-        }
-
-        if (rCompileData.empty())
-        {
-            AZ_Error("RemoteCompiler", false, "CShaderSrv::SendRequestViaEngineConnection() : Recv data empty from server (didn't receive anything)\n");
-            VerboseLogging(true);
-
-            const AZStd::string title = "Remote Shader Compiler";
-            const AZStd::string message = "Unable to connect to Remote Shader Compiler";
-            if(!gEnv->IsInToolMode())
-            {
-                EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, title, message, false);
-            }
-            return ESRecvFailed;
-        }
-
-        // Check for error embedded in the response!
-        return ProcessResponse(rCompileData);
-    }
-
-    void CShaderSrv::EnableUnitTestingMode(bool mode)
-    {
-        m_unitTestMode = mode;
-        m_remoteState->SetUnitTestMode(mode);
-    }
-
-} // end namespace
-
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/RemoteCompiler.h b/Code/CryEngine/RenderDll/Common/Shaders/RemoteCompiler.h
deleted file mode 100644
index 9d413a5138..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/RemoteCompiler.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_REMOTECOMPILER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_REMOTECOMPILER_H
-#pragma once
-
-#include <AzCore/Socket/AzSocket_fwd.h>
-
-namespace NRemoteCompiler
-{
-    typedef std::vector<string> tdEntryVec;
-
-    enum EServerError
-    {
-        ESOK,
-        ESFailed,
-        ESInvalidState,
-        ESCompileError,
-        ESNetworkError,
-        ESSendFailed,
-        ESRecvFailed,
-    };
-
-    enum EShaderCompiler
-    {
-        eSC_Unknown,
-        eSC_Orbis_DXC,
-        eSC_D3D11_FXC,
-        eSC_GLSL_HLSLcc,
-        eSC_METAL_HLSLcc,
-        eSC_GLSL_LLVM_DXC,
-        eSC_METAL_LLVM_DXC,
-        eSC_Jasper_FXC,
-        eSC_MAX
-    };
-
-    class RemoteProxyState;
-
-    class CShaderSrv
-    {
-    public:
-        // the main entry into this system
-        // on return, rVec contains the response vector, or an error string, if failed
-        EServerError Compile(std::vector<uint8>& rVec, const char* pProfile, const char* pProgram, const char* pEntry, const char* pCompileFlags, const char* pIdent) const;
-
-        EServerError GetShaderList(std::vector<uint8>& rVec) const;
-
-        bool CommitPLCombinations(std::vector<SCacheCombination>& rVec);
-
-        // RequestLine causes the remote compiler to compile without expecting a response.
-        bool RequestLine(const string& rList, const string& rString) const;
-
-        EShaderCompiler GetShaderCompiler() const;
-        const char *GetShaderCompilerName() const;
-
-        AZStd::string GetShaderCompilerFlags(EHWShaderClass eClass, UPipelineState pipelineState, uint32 MDVMask) const;
-
-        static CShaderSrv& Instance();
-
-
-    private:
-        // UNIT TEST things can go here.
-        friend class ShaderSrvUnitTestAccessor;
-
-        bool m_unitTestMode;
-        void EnableUnitTestingMode(bool mode); // used during cry unit test launcher
-
-        EServerError SendRequestViaEngineConnection(std::vector<uint8>&  rCompileData) const;
-
-        // socket implementation here
-        EServerError SendRequestViaSocket(std::vector<uint8>& rCompileData) const;
-        bool Send(AZSOCKET Socket, const char* pBuffer, uint32 Size) const;
-        bool Send(AZSOCKET Socket, std::vector<uint8>& rCompileData) const;
-        EServerError Recv(AZSOCKET Socket, std::vector<uint8>& rCompileData) const;
-
-        // internal utilities
-        bool CreateRequest(std::vector<uint8>& rVec, std::vector<std::pair<string, string> >& rNodes) const;
-
-        bool EncapsulateRequestInEngineConnectionProtocol(std::vector<uint8>& rCompileData) const;
-
-        const char* GetPlatformName() const;
-
-        RemoteProxyState* m_remoteState;
-
-        // root path added to each request line to store the data per game (eg. MyGame\)
-        string m_RequestLineRootFolder;
-
-        CShaderSrv();
-        EServerError Send(std::vector<uint8>& rCompileData) const;
-
-        void Tokenize(tdEntryVec& rRet, const string& Tokens, const string& Separator) const;
-        string TransformToXML(const string& rIn) const;
-        string CreateXMLNode(const string& rTag, const string& rValue)  const;
-        bool RequestLine(const SCacheCombination& cmb, const string& rLine) const;
-
-        void Init();
-        void Terminate();
-
-        // given a payload of response data from the actual shader server
-        // decompress and parse it.
-        EServerError ProcessResponse(std::vector<uint8>& rCompileData) const;
-    };
-}
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_REMOTECOMPILER_H
-
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/RemoteShaderCompilerUnitTests.cpp b/Code/CryEngine/RenderDll/Common/Shaders/RemoteShaderCompilerUnitTests.cpp
deleted file mode 100644
index b0bcf1e702..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/RemoteShaderCompilerUnitTests.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <AzCore/Memory/AllocatorScope.h>
-#include <AzCore/Settings/SettingsRegistry.h>
-#include <AzCore/UnitTest/UnitTest.h>
-#include "Mocks/IConsoleMock.h"
-#include "Mocks/ICVarMock.h"
-#include "Mocks/ISystemMock.h"
-#include "RemoteCompiler.h"
-
-
-namespace AZ
-{
-    class SettingsRegistrySimpleMock;
-    using NiceSettingsRegistrySimpleMock = ::testing::NiceMock<SettingsRegistrySimpleMock>;
-
-    class SettingsRegistrySimpleMock : public AZ::SettingsRegistryInterface
-    {
-    public:
-        MOCK_CONST_METHOD1(GetType, Type(AZStd::string_view));
-        MOCK_CONST_METHOD2(Visit, bool(Visitor&, AZStd::string_view));
-        MOCK_CONST_METHOD2(Visit, bool(const VisitorCallback&, AZStd::string_view));
-        MOCK_METHOD1(RegisterNotifier, NotifyEventHandler(const NotifyCallback&));
-        MOCK_METHOD1(RegisterNotifier, NotifyEventHandler(NotifyCallback&&));
-
-        MOCK_CONST_METHOD2(Get, bool(bool&, AZStd::string_view));
-        MOCK_CONST_METHOD2(Get, bool(s64&, AZStd::string_view));
-        MOCK_CONST_METHOD2(Get, bool(u64&, AZStd::string_view));
-        MOCK_CONST_METHOD2(Get, bool(double&, AZStd::string_view));
-        MOCK_CONST_METHOD2(Get, bool(AZStd::string&, AZStd::string_view));
-        MOCK_CONST_METHOD2(Get, bool(FixedValueString&, AZStd::string_view));
-        MOCK_CONST_METHOD3(GetObject, bool(void*, Uuid, AZStd::string_view));
-
-        MOCK_METHOD2(Set, bool(AZStd::string_view, bool));
-        MOCK_METHOD2(Set, bool(AZStd::string_view, s64));
-        MOCK_METHOD2(Set, bool(AZStd::string_view, u64));
-        MOCK_METHOD2(Set, bool(AZStd::string_view, double));
-        MOCK_METHOD2(Set, bool(AZStd::string_view, AZStd::string_view));
-        MOCK_METHOD2(Set, bool(AZStd::string_view, const char*));
-        MOCK_METHOD3(SetObject, bool(AZStd::string_view, const void*, Uuid));
-
-        MOCK_METHOD1(Remove, bool(AZStd::string_view));
-
-        MOCK_METHOD3(MergeCommandLineArgument, bool(AZStd::string_view, AZStd::string_view, const CommandLineArgumentSettings&));
-        MOCK_METHOD2(MergeSettings, bool(AZStd::string_view, Format));
-        MOCK_METHOD4(MergeSettingsFile, bool(AZStd::string_view, Format, AZStd::string_view, AZStd::vector<char>*));
-        MOCK_METHOD5(
-            MergeSettingsFolder,
-            bool(AZStd::string_view, const Specializations&, AZStd::string_view, AZStd::string_view, AZStd::vector<char>*));
-    };
-} // namespace AZ
-
-
-namespace NRemoteCompiler
-{
-    using ::testing::NiceMock;
-    using ::testing::Return;
-    using ::testing::DoAll;
-
-    using SystemAllocatorScope = AZ::AllocatorScope<AZ::LegacyAllocator, CryStringAllocator>;
-
-    // define a dummy compressor decompressor that simply does nothing.
-    // the actual ISystem::Decompress / Compress should be tested in isolation in the unit it lives in.
-    // this is expected to fit both of these functions:
-    //virtual bool CompressDataBlock(const void* input, size_t inputSize, void* output, size_t& outputSize, int level = 3) = 0;
-    //virtual bool DecompressDataBlock(const void* input, size_t inputSize, void* output, size_t& outputSize) = 0;
-    // it operates by copying the input into the output and the input size into the output size and always returning true.
-    AZ_PUSH_DISABLE_WARNING(4100, "-Wunknown-warning-option")
-    ACTION(MockCompressDecompress)
-    {
-        AZ_Assert(arg3 >= arg1, "MockCompressDecompress would overrun buffer (%i must be >= %i)", (int)arg3, (int)arg1);
-        if (arg3 < arg1)
-        {
-            return false;
-        }
-
-        memcpy(arg2, arg0, arg1);
-        arg3 = arg1;
-        return true;
-    };
-    AZ_POP_DISABLE_WARNING
-
-    using ::UnitTest::AllocatorsTestFixture;
-
-    class RemoteCompilerTest
-        : public AllocatorsTestFixture
-        , public SystemAllocatorScope 
-    {
-    public:
-
-        const int m_fakePortNumber = 12345;
-
-        void SetUp() override
-        {
-            using namespace ::testing;
-
-            AllocatorsTestFixture::SetUp();
-            SystemAllocatorScope::ActivateAllocators();
-
-            m_priorEnv = gEnv;
-            m_priorSettingsRegistry = AZ::SettingsRegistry::Get();
-
-            m_data.reset(new DataMembers);
-
-            AZ::SettingsRegistry::Register(&m_data->m_settings);
-
-            ON_CALL(m_data->m_console, GetCVar(_))
-                .WillByDefault(Return(&m_data->m_cvarMock));
-
-            ON_CALL(m_data->m_system, CompressDataBlock(_, _, _, _, _))
-                .WillByDefault(MockCompressDecompress());
-
-            ON_CALL(m_data->m_system, DecompressDataBlock(_, _, _, _))
-                .WillByDefault(MockCompressDecompress());
-
-            ON_CALL(m_data->m_cvarMock, GetIVal())
-                .WillByDefault(Return(m_fakePortNumber));
-
-            memset(&m_data->m_stubEnv, 0, sizeof(SSystemGlobalEnvironment));
-            m_data->m_stubEnv.pConsole = &m_data->m_console;
-            m_data->m_stubEnv.pSystem = &m_data->m_system;
-            gEnv = &m_data->m_stubEnv;
-        }
-
-        void TearDown() override
-        {
-            gEnv = m_priorEnv;
-            AZ::SettingsRegistry::Unregister(&m_data->m_settings);
-            if (m_priorSettingsRegistry)
-            {
-                AZ::SettingsRegistry::Register(m_priorSettingsRegistry);
-            }
-            m_data.reset();
-            SystemAllocatorScope::DeactivateAllocators();
-            AllocatorsTestFixture::TearDown();
-        }
-
-        struct DataMembers
-        {
-            NiceMock<SystemMock> m_system;
-            NiceMock<ConsoleMock> m_console;
-            NiceMock<CVarMock> m_cvarMock;
-            AZ::NiceSettingsRegistrySimpleMock m_settings;
-            SSystemGlobalEnvironment m_stubEnv;
-        };
-
-        AZStd::unique_ptr<DataMembers> m_data;
-
-        SSystemGlobalEnvironment* m_priorEnv = nullptr;
-        AZ::SettingsRegistryInterface* m_priorSettingsRegistry = nullptr;
-    };
-
-    // allow punch through to PRIVATE functions so that they do not need to be made PUBLIC.
-    class ShaderSrvUnitTestAccessor
-        : public CShaderSrv
-    {
-    public:
-        ShaderSrvUnitTestAccessor()
-            : CShaderSrv()
-        {
-            CShaderSrv::EnableUnitTestingMode(true);
-        }
-        EServerError SendRequestViaEngineConnection(std::vector<uint8>& rCompileData)   const
-        {
-            return CShaderSrv::SendRequestViaEngineConnection(rCompileData);
-        }
-
-        bool EncapsulateRequestInEngineConnectionProtocol(std::vector<uint8>& rCompileData) const
-        {
-            return CShaderSrv::EncapsulateRequestInEngineConnectionProtocol(rCompileData);
-        }
-    };
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_Constructor_WithNoGameName_Fails)
-    {
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString regResult;
-        EXPECT_CALL(m_data->m_settings, Get(regResult, _));
-
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        ShaderSrvUnitTestAccessor srv;
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_Constructor_WithValidGameName_Succeeds)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_EncapsulateRequestInEngineConnectionProtocol_EmptyData_Fails)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        std::vector<uint8> testVector;
-
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        EXPECT_FALSE(srv.EncapsulateRequestInEngineConnectionProtocol(testVector)); // empty vector error condition
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above to have thrown an AZ_ERROR
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_EncapsulateRequestInEngineConnectionProtocol_ValidData_EmptyServerList_Fails)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        EXPECT_CALL(m_data->m_cvarMock, GetString())
-            .WillRepeatedly(Return("")); // empty server list
-
-        std::vector<uint8> testVector;
-        std::string testString("_-=!-");
-        testVector.insert(testVector.begin(), testString.begin(), testString.end());
-
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        EXPECT_FALSE(srv.EncapsulateRequestInEngineConnectionProtocol(testVector)); // empty vector error condition
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above to have thrown an AZ_ERROR
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_EncapsulateRequestInEngineConnectionProtocol_ValidInputs_Succeeds)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        // After this, it will repeatedly call get cvar to get the server address:
-        const char* testList = "10.20.30.40";
-        EXPECT_CALL(m_data->m_cvarMock, GetString())
-            .WillRepeatedly(Return(testList));
-
-        std::vector<uint8> testVector;
-        std::string testString("_-=!-");
-        testVector.insert(testVector.begin(), testString.begin(), testString.end());
-
-        EXPECT_TRUE(srv.EncapsulateRequestInEngineConnectionProtocol(testVector));
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_SendRequestViaEngineConnection_EmptyData_Fails)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        // After this, it will repeatedly call get cvar to get the server address:
-        const char* testList = "10.20.30.40";
-        EXPECT_CALL(m_data->m_cvarMock, GetString())
-            .WillRepeatedly(Return(testList));
-
-        std::vector<uint8> testVector;
-        std::string testString("empty");
-
-        // test for empty data - RecvFailed expected (error emitted)
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        testString = "empty";
-        testVector.assign(testString.begin(), testString.end());
-        EXPECT_EQ(srv.SendRequestViaEngineConnection(testVector), EServerError::ESRecvFailed);
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_SendRequestViaEngineConnection_IncompleteData_Fails)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        // After this, it will repeatedly call get cvar to get the server address:
-        const char* testList = "10.20.30.40";
-        EXPECT_CALL(m_data->m_cvarMock, GetString())
-            .WillRepeatedly(Return(testList));
-
-        std::vector<uint8> testVector;
-        std::string testString("incomplete");
-        testVector.assign(testString.begin(), testString.end());
-
-        // test for incomplete data - RecvFailed expected
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        EXPECT_EQ(srv.SendRequestViaEngineConnection(testVector), EServerError::ESRecvFailed);
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_SendRequestViaEngineConnection_CorruptData_Fails)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        // After this, it will repeatedly call get cvar to get the server address:
-        const char* testList = "10.20.30.40";
-        EXPECT_CALL(m_data->m_cvarMock, GetString())
-            .WillRepeatedly(Return(testList));
-
-        std::vector<uint8> testVector;
-        std::string testString("corrupt");
-        testVector.assign(testString.begin(), testString.end());
-
-        // test for incomplete data - RecvFailed expected
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        EXPECT_EQ(srv.SendRequestViaEngineConnection(testVector), EServerError::ESRecvFailed);
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_SendRequestViaEngineConnection_CompileError_Fails_ReturnsText)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        // After this, it will repeatedly call get cvar to get the server address:
-        const char* testList = "10.20.30.40";
-        EXPECT_CALL(m_data->m_cvarMock, GetString())
-            .WillRepeatedly(Return(testList));
-
-        std::vector<uint8> testVector;
-        std::string testString("corrupt");
-        testVector.assign(testString.begin(), testString.end());
-        // test for an actual compile error - decompressed compile error expected to be attached.
-        testString = "compile_failure";
-        testVector.assign(testString.begin(), testString.end());
-        EXPECT_EQ(srv.SendRequestViaEngineConnection(testVector), EServerError::ESCompileError);
-        // validate the compile error decompressed successfully
-        const char* expected_decode = "decompressed_plaintext";
-        EXPECT_EQ(testVector.size(), strlen(expected_decode));
-        EXPECT_EQ(memcmp(testVector.data(), expected_decode, strlen(expected_decode)), 0);
-    }
-
-    TEST_F(RemoteCompilerTest, CShaderSrv_SendRequestViaEngineConnection_ValidInput_Succeeds_ReturnsText)
-    {
-        // when we construct the server it calls get on the game name
-        using namespace ::testing;
-        AZ::SettingsRegistryInterface::FixedValueString projectName;
-        EXPECT_CALL(m_data->m_settings, Get(projectName, _))
-            .WillOnce(DoAll(testing::SetArgReferee<0>("StarterGame"), Return(true)));
-
-        ShaderSrvUnitTestAccessor srv;
-
-        // After this, it will repeatedly call get cvar to get the server address:
-        const char* testList = "10.20.30.40";
-        EXPECT_CALL(m_data->m_cvarMock, GetString())
-            .WillRepeatedly(Return(testList));
-
-        AZStd::string testString = "success";
-        std::vector<uint8> testVector;
-        testVector.assign(testString.begin(), testString.end());
-
-        EXPECT_EQ(srv.SendRequestViaEngineConnection(testVector), EServerError::ESOK);
-
-        // validate that the result decompressed successfully - its expected to contain "decompressed_plaintext"
-        const char* expected_decode = "decompressed_plaintext";
-        EXPECT_EQ(testVector.size(), strlen(expected_decode));
-        EXPECT_EQ(memcmp(testVector.data(), expected_decode, strlen(expected_decode)), 0);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/Shader.h b/Code/CryEngine/RenderDll/Common/Shaders/Shader.h
deleted file mode 100644
index d4825bfaa2..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/Shader.h
+++ /dev/null
@@ -1,1515 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Shaders declarations.
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_SHADER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_SHADER_H
-#pragma once
-
-
-#include "../Defs.h"
-#include "Vertex.h"
-
-#include <CryName.h>
-#include <IShader.h>
-#include "ShaderResources.h"
-
-// bump this value up if you want to invalidate shader cache (e.g. changed some code or .ext file)
-// #### VIP NOTE ####: DON'T USE MORE THAN ONE DECIMAL PLACE!!!! else it doesn't work...
-#define FX_CACHE_VER       10.5f
-#define FX_SER_CACHE_VER   1.4f  // Shader serialization version (FX_CACHE_VER + FX_SER_CACHE_VER)
-
-// Maximum 1 digit here
-// The version determines the parse logic in the shader cache gen, these values cannot overlap
-#define SHADER_LIST_VER 4
-#define SHADER_SERIALISE_VER (SHADER_LIST_VER + 1)
-
-//#define SHADER_NO_SOURCES 1 // If this defined all binary shaders (.fxb) should be located in Game folder (not user)
-#if !defined(NULL_RENDERER)
-#define SHADERS_SERIALIZING 1 // Enables shaders serializing (Export/Import) to/from .fxb files
-#endif
-
-struct SShaderPass;
-class CShader;
-class CRendElementBase;
-class CResFile;
-struct SEnvTexture;
-struct SParserFrame;
-struct SPreprocessTree;
-struct SEmptyCombination;
-struct SShaderCombination;
-struct SShaderCache;
-struct SShaderDevCache;
-struct SCGParam;
-struct SSFXParam;
-struct SSFXSampler;
-struct SSFXTexture;
-
-
-enum eCompareFunc
-{
-    eCF_Disable,
-    eCF_Never,
-    eCF_Less,
-    eCF_Equal,
-    eCF_LEqual,
-    eCF_Greater,
-    eCF_NotEqual,
-    eCF_GEqual,
-    eCF_Always
-};
-
-
-struct SPair
-{
-    string m_szMacroName;
-    string m_szMacro;
-    uint32 m_nMask;
-};
-
-#if defined(MOBILE)
-    #define GEOMETRYSHADER_SUPPORT  false
-#else
-    #define GEOMETRYSHADER_SUPPORT  true
-#endif
-
-//------------------------------------------------------------------------------
-// SFX structures are the structures gathered from the shader during shader parsing 
-// and associated later on to a binding slot / buffer.
-// They represent constants, textures and samplers.
-//------------------------------------------------------------------------------
-struct SFXBaseParam
-{
-    CCryNameR               m_Name;                 // Parameter name
-    std::vector <uint32>    m_dwName;
-    uint32                  m_nFlags;
-    short                   m_nArray;               // Number of parameters
-    CCryNameR               m_Annotations;          // Additional parameters (between <>)
-    CCryNameR               m_Semantic;             // Parameter semantic type (after ':')
-    CCryNameR               m_Values;               // Parameter values (after '=')
-    byte                    m_eType;                // Type per usage
-
-    // [Shader System] register offset per shader stage (class) - VS, PS, GS...
-    // This needs to be unified for all stages (and renamed as m_RegisterOffset)
-    short                   m_Register[eHWSC_Num]; 
-
-    SFXBaseParam()
-    {
-        m_nArray = 0;
-        m_nFlags = 0;
-        for (int i = 0; i < eHWSC_Num; i++)
-        {
-            m_Register[i] = 10000;
-        }
-    }
-
-    uint32   GetFlags() { return m_nFlags; }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_dwName);
-    }
-};
-
-//------------------------------------------------------------------------------
-// An SFXParam is the constant data gathered from the shader parsing.
-// Example of usage - In Matrix 3x4: m_nParams = 3, m_nComps = 4
-// Needs some more refactor to fully use SFXBaseParam.
-//------------------------------------------------------------------------------
-struct SFXParam : SFXBaseParam
-{
-    short       m_RegisterCount;
-    short       m_ComponentCount;
-    int8        m_BindingSlot;              // the CB slot
-
-    // [Shaders System] - the following needs to be removed as part of the unified offset.
-    // The next two parameters are only valid after the gather stage for final parameters
-    AZ::u8      m_OffsetStageSetter;        // which stage set the offset
-    AZ::u8      m_StagesUsage;              // Adding visibility to who's using the param
-
-    SFXParam()
-    {
-        m_RegisterCount = 0;
-        m_ComponentCount = 0;
-        m_BindingSlot = -1;
-        m_OffsetStageSetter = eHWSC_Vertex;
-        m_StagesUsage = (1 << eHWSC_Vertex);
-    }
-
-    ~SFXParam() {}
-
-    void GetParamComp(uint32 nOffset, CryFixedStringT<128>& param);
-    void GetCompName(uint32 nId, CryFixedStringT<128>& name);
-    string GetValueForName(const char* szName, EParamType& eType);
-    void PostLoad(class CParserBin& Parser, SParserFrame& Name, SParserFrame& Annotations, SParserFrame& Values, SParserFrame& Assign);
-    void PostLoad();
-    bool Export(SShaderSerializeContext& SC);
-    bool Import(SShaderSerializeContext& SC, SSFXParam* pPR);
-
-    uint32 Size()
-    {
-        uint32 nSize = sizeof(SFXParam);
-        nSize += sizeofVector(m_dwName);
-        return nSize;
-    }
-
-    inline bool operator == (const SFXParam& m) const
-    {
-        if (m_Name == m.m_Name && m_Annotations == m.m_Annotations && m_Semantic == m.m_Semantic && m_Values == m.m_Values &&
-            m_RegisterCount == m.m_RegisterCount && m_ComponentCount == m.m_ComponentCount && m_nFlags == m.m_nFlags && m_Register[0] == m.m_Register[0] && m_Register[1] == m.m_Register[1] &&
-            m_eType == m.m_eType)
-        {
-            return true;
-        }
-        return false;
-    }
-};
-
-//------------------------------------------------------------------------------
-// An SFX structure is the structure gathered from the shader during
-// parsing and associated later on.   
-//------------------------------------------------------------------------------
-struct SFXSampler : SFXBaseParam
-{
-    int         m_nTexState;
-
-    SFXSampler()
-    {
-        m_nTexState = -1;
-    }
-    ~SFXSampler()    {}
-
-    void PostLoad(class CParserBin& Parser, SParserFrame& Name, SParserFrame& Annotations, SParserFrame& Values, SParserFrame& Assign);
-    void PostLoad();
-    bool Export(SShaderSerializeContext& SC);
-    bool Import(SShaderSerializeContext& SC, SSFXSampler* pPR);
-
-    uint32 Size()
-    {
-        uint32 nSize = sizeof(SFXSampler);
-        nSize += sizeofVector(m_dwName);
-        return nSize;
-    }
-
-    inline bool operator == (const SFXSampler& m) const
-    {
-        if (m_Name == m.m_Name && m_Annotations == m.m_Annotations && m_Semantic == m.m_Semantic && m_Values == m.m_Values &&
-            m_nArray == m.m_nArray && m_nFlags == m.m_nFlags && m_Register[0] == m.m_Register[0] && m_Register[1] == m.m_Register[1] &&
-            m_eType == m.m_eType && m_nTexState == m.m_nTexState)
-        {
-            return true;
-        }
-        return false;
-    }
-};
-
-//------------------------------------------------------------------------------
-// An SFX structure is the structure gathered from the shader during
-// parsing and associated later on.   
-// SFXTexture - This structure contains a meta data gathered during shader parsing.
-// It doesn't contain the actual texture data and doesn't apply to the binding directly 
-// but used as the data associated with the SCGTexture binding structure.
-//------------------------------------------------------------------------------
-struct SFXTexture : SFXBaseParam
-{
-    uint32      m_nTexFlags;
-    string      m_szTexture;    // Texture source name
-    string      m_szUIName;     // UI name
-    string      m_szUIDesc;     // UI description
-    bool        m_bSRGBLookup;  // Lookup
-    byte        m_Type;         // Data type (float, float4, etc)
-
-    SFXTexture()
-    {
-        m_bSRGBLookup = false;
-        m_Type = 0;
-        m_nTexFlags = 0;
-    }
-
-    ~SFXTexture()    {}
-
-    uint32 GetTexFlags() { return m_nTexFlags; }
-    void PostLoad(class CParserBin& Parser, SParserFrame& Name, SParserFrame& Annotations, SParserFrame& Values, SParserFrame& Assign);
-    void PostLoad();
-    bool Export(SShaderSerializeContext& SC);
-    bool Import(SShaderSerializeContext& SC, SSFXTexture* pPR);
-
-    uint32 Size()
-    {
-        uint32 nSize = sizeof(SFXTexture);
-        //nSize += m_Name.capacity();
-        nSize += sizeofVector(m_dwName);
-        //nSize += m_Values.capacity();
-        return nSize;
-    }
-
-    inline bool operator == (const SFXTexture& m) const
-    {
-        if (m_Name == m.m_Name && m_Annotations == m.m_Annotations && m_Semantic == m.m_Semantic && m_Values == m.m_Values &&
-            m_nArray == m.m_nArray && m_nFlags == m.m_nFlags && m_Register[0] == m.m_Register[0] && m_Register[1] == m.m_Register[1] &&
-            m_eType == m.m_eType && m_bSRGBLookup == m.m_bSRGBLookup && m_szTexture == m.m_szTexture)
-        {
-            return true;
-        }
-        return false;
-    }
-};
-
-//------------------------------------------------------------------------------
-struct STokenD
-{
-    //std::vector<int> Offsets;
-    uint32 Token;
-    string SToken;
-    unsigned Size() { return sizeof(STokenD) /*+ sizeofVector(Offsets)*/ + SToken.capacity(); }
-    void GetMemoryUsage(ICrySizer* pSizer) const { pSizer->AddObject(SToken); }
-};
-typedef AZStd::vector<STokenD, AZ::StdLegacyAllocator> FXShaderToken;
-typedef FXShaderToken::iterator FXShaderTokenItor;
-
-struct SFXStruct
-{
-    string m_Name;
-    string m_Struct;
-    SFXStruct()
-    {
-    }
-};
-
-enum ETexFilter
-{
-    eTEXF_None,
-    eTEXF_Point,
-    eTEXF_Linear,
-    eTEXF_Anisotropic,
-};
-
-//=============================================================================
-// Vertex programms / Vertex shaders (VP/VS)
-
-static _inline float* sfparam(Vec3 param)
-{
-    static float sparam[4];
-    sparam[0] = param.x;
-    sparam[1] = param.y;
-    sparam[2] = param.z;
-    sparam[3] = 1.0f;
-
-    return &sparam[0];
-}
-
-static _inline float* sfparam(float param)
-{
-    static float sparam[4];
-    sparam[0] = param;
-    sparam[1] = 0;
-    sparam[2] = 0;
-    sparam[3] = 1.0f;
-    return &sparam[0];
-}
-
-static _inline float* sfparam(float param0, float param1, float param2, float param3)
-{
-    static float sparam[4];
-    sparam[0] = param0;
-    sparam[1] = param1;
-    sparam[2] = param2;
-    sparam[3] = param3;
-    return &sparam[0];
-}
-
-_inline char* sGetFuncName(const char* pFunc)
-{
-    static char func[128];
-    const char* b = pFunc;
-    if (*b == '[')
-    {
-        const char* s = strchr(b, ']');
-        if (s)
-        {
-            b = s + 1;
-        }
-        while (*b <= 0x20)
-        {
-            b++;
-        }
-    }
-    while (*b > 0x20)
-    {
-        b++;
-    }
-    while (*b <= 0x20)
-    {
-        b++;
-    }
-    int n = 0;
-    while (*b > 0x20 && *b != '(')
-    {
-        func[n++] = *b++;
-    }
-    func[n] = 0;
-
-    return func;
-}
-
-enum ERenderOrder
-{
-    eRO_PreProcess,
-    eRO_PostProcess,
-    eRO_PreDraw
-};
-
-enum ERTUpdate
-{
-    eRTUpdate_Unknown,
-    eRTUpdate_Always,
-    eRTUpdate_WaterReflect
-};
-
-struct SHRenderTarget
-    : public IRenderTarget
-{
-    int m_nRefCount;
-    ERenderOrder m_eOrder;
-    int m_nProcessFlags;   // FSPR_ flags
-    string m_TargetName;
-    int m_nWidth;
-    int m_nHeight;
-    ETEX_Format m_eTF;
-    int m_nIDInPool;
-    ERTUpdate m_eUpdateType;
-    CTexture* m_pTarget[2];
-    bool m_bTempDepth;
-    ColorF m_ClearColor;
-    float m_fClearDepth;
-    uint32 m_nFlags;
-    uint32 m_nFilterFlags;
-    int m_refSamplerID;
-
-    SHRenderTarget()
-    {
-        m_nRefCount = 1;
-        m_eOrder = eRO_PreProcess;
-        m_pTarget[0] = NULL;
-        m_pTarget[1] = NULL;
-        m_bTempDepth = true;
-        m_ClearColor = Col_Black;
-        m_fClearDepth = 1.f;
-        m_nFlags = 0;
-        m_nFilterFlags = 0xffffffff;
-        m_nProcessFlags = 0;
-        m_nIDInPool = -1;
-        m_nWidth = 256;
-        m_nHeight = 256;
-        m_eTF = eTF_R8G8B8A8;
-        m_eUpdateType = eRTUpdate_Unknown;
-        m_refSamplerID = -1;
-    }
-    virtual void Release()
-    {
-        m_nRefCount--;
-        if (m_nRefCount)
-        {
-            return;
-        }
-        delete this;
-    }
-    virtual void AddRef()
-    {
-        m_nRefCount++;
-    }
-    SEnvTexture* GetEnv2D();
-    SEnvTexture* GetEnvCM();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-};
-
-//=============================================================================
-// Hardware shaders
-
-#define SHADER_BIND_TEXTURE 0x2000
-#define SHADER_BIND_SAMPLER 0x4000
-
-//=============================================================================
-
-struct SShaderCacheHeaderItem
-{
-    AZ::u32 m_nVertexFormat;
-    byte m_Class;
-    byte m_nInstBinds;
-    byte m_StreamMask_Stream;
-    uint32 m_CRC32;
-    uint16 m_StreamMask_Decl;
-    int16  m_nInstructions;
-    SShaderCacheHeaderItem()
-    {
-        memset(this, 0, sizeof(SShaderCacheHeaderItem));
-    }
-    AUTO_STRUCT_INFO
-};
-
-#define MAX_VAR_NAME 512
-struct SShaderCacheHeaderItemVar
-{
-    int m_Reg;
-    short m_nCount;
-    char m_Name[MAX_VAR_NAME];
-    SShaderCacheHeaderItemVar()
-    {
-        memset(this, 0, sizeof(SShaderCacheHeaderItemVar));
-    }
-};
-
-struct SCompressedData
-{
-    byte* m_pCompressedShader;
-    uint32 m_nSizeCompressedShader;
-    uint32 m_nSizeDecompressedShader;
-
-    SCompressedData()
-    {
-        m_pCompressedShader = NULL;
-        m_nSizeCompressedShader = 0;
-        m_nSizeDecompressedShader = 0;
-    }
-    int Size()
-    {
-        int nSize = sizeof(SCompressedData);
-        if (m_pCompressedShader)
-        {
-            nSize += m_nSizeCompressedShader;
-        }
-        return nSize;
-    }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        //pSizer->AddObject(this, sizeof(SCompressedData));
-        if (m_pCompressedShader)
-        {
-            pSizer->AddObject(m_pCompressedShader, m_nSizeCompressedShader);
-        }
-    }
-};
-
-typedef AZStd::unordered_map<int, struct SD3DShader*, AZStd::hash<int>, AZStd::equal_to<int>, AZ::StdLegacyAllocator> FXDeviceShader;
-typedef FXDeviceShader::iterator FXDeviceShaderItor;
-
-typedef AZStd::unordered_map<int, SCompressedData, AZStd::hash<int>, AZStd::equal_to<int>, AZ::StdLegacyAllocator> FXCompressedShader;
-typedef FXCompressedShader::iterator FXCompressedShaderItor;
-typedef AZStd::unordered_map<CCryNameTSCRC, int, AZStd::hash<CCryNameTSCRC>, AZStd::equal_to<CCryNameTSCRC>, AZ::StdLegacyAllocator> FXCompressedShaderRemap;
-typedef FXCompressedShaderRemap::iterator FXCompressedShaderRemapItor;
-struct SHWActivatedShader
-{
-    bool m_bPersistent;
-    FXCompressedShader m_CompressedShaders;
-    FXCompressedShaderRemap m_Remap;
-    ~SHWActivatedShader();
-
-    int Size();
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-};
-typedef AZStd::unordered_map<CCryNameTSCRC, SHWActivatedShader*, AZStd::hash<CCryNameTSCRC>, AZStd::equal_to<CCryNameTSCRC>, AZ::StdLegacyAllocator> FXCompressedShaders;
-typedef FXCompressedShaders::iterator FXCompressedShadersItor;
-
-#define CACHE_READONLY 0
-#define CACHE_USER     1
-
-struct SOptimiseStats
-{
-    int nEntries;
-    int nUniqueEntries;
-    int nSizeUncompressed;
-    int nSizeCompressed;
-    int nTokenDataSize;
-    int nDirDataSize;
-    SOptimiseStats()
-    {
-        nEntries = 0;
-        nUniqueEntries = 0;
-        nSizeUncompressed = 0;
-        nSizeCompressed = 0;
-        nTokenDataSize = 0;
-        nDirDataSize = 0;
-    }
-};
-
-typedef AZStd::unordered_map<CCryNameR, SShaderCache*, AZStd::hash<CCryNameR>, AZStd::equal_to<CCryNameR>, AZ::StdLegacyAllocator> FXShaderCache;
-typedef FXShaderCache::iterator FXShaderCacheItor;
-
-typedef AZStd::unordered_map<CCryNameR, SShaderDevCache*, AZStd::hash<CCryNameR>, AZStd::equal_to<CCryNameR>, AZ::StdLegacyAllocator> FXShaderDevCache;
-typedef FXShaderDevCache::iterator FXShaderDevCacheItor;
-
-typedef AZStd::unordered_map<string, uint32, AZStd::hash<string>, AZStd::equal_to<string>, AZ::StdLegacyAllocator> FXShaderCacheNames;
-typedef FXShaderCacheNames::iterator FXShaderCacheNamesItor;
-
-
-//====================================================================
-// HWShader run-time flags
-
-enum EHWSRMaskBit
-{
-    HWSR_FOG = 0,
-
-    HWSR_AMBIENT,
-
-    HWSR_ALPHATEST,
-    HWSR_ALPHABLEND,
-
-    HWSR_HDR_MODE,      // deprecated: this flag is redundant and can be dropped, since rendering always HDR since CE3
-    HWSR_HDR_ENCODE,
-
-    HWSR_INSTANCING_ATTR,
-
-    HWSR_VERTEX_VELOCITY,
-    HWSR_SKINNING_DUAL_QUAT,
-    HWSR_SKINNING_DQ_LINEAR,
-    HWSR_SKINNING_MATRIX,
-
-    HWSR_OBJ_IDENTITY,
-    HWSR_DETAIL_OVERLAY,
-    HWSR_NEAREST,
-    HWSR_NOZPASS,
-    HWSR_DISSOLVE,
-    HWSR_APPLY_TOON_SHADING,
-    HWSR_NO_TESSELLATION,
-    HWSR_PER_INSTANCE_CB_TEMP,
-
-    HWSR_QUALITY,
-    HWSR_QUALITY1,
-
-    HWSR_SAMPLE0,
-    HWSR_SAMPLE1,
-    HWSR_SAMPLE2,
-    HWSR_SAMPLE3,
-    HWSR_SAMPLE4,
-    HWSR_SAMPLE5,
-
-    HWSR_DEBUG0,
-    HWSR_DEBUG1,
-    HWSR_DEBUG2,
-    HWSR_DEBUG3,
-
-    HWSR_CUBEMAP0,
-
-    HWSR_DECAL_TEXGEN_2D,
-
-    HWSR_SHADOW_MIXED_MAP_G16R16,
-    HWSR_HW_PCF_COMPARE,
-    HWSR_SHADOW_JITTERING,
-    HWSR_POINT_LIGHT,
-    HWSR_LIGHT_TEX_PROJ,
-
-    HWSR_PARTICLE_SHADOW,
-    HWSR_SOFT_PARTICLE,
-    HWSR_OCEAN_PARTICLE,
-    HWSR_GLOBAL_ILLUMINATION,
-    HWSR_ANIM_BLEND,
-    HWSR_ENVIRONMENT_CUBEMAP,
-    HWSR_MOTION_BLUR,
-
-    HWSR_SPRITE,
-
-    HWSR_LIGHTVOLUME0,
-    HWSR_LIGHTVOLUME1,
-
-    HWSR_TILED_SHADING,
-
-    HWSR_VOLUMETRIC_FOG,
-
-    HWSR_REVERSE_DEPTH,
-    HWSR_GPU_PARTICLE_SHADOW_PASS,
-    HWSR_GPU_PARTICLE_DEPTH_COLLISION,
-    HWSR_GPU_PARTICLE_TURBULENCE,
-    HWSR_GPU_PARTICLE_UV_ANIMATION,
-    HWSR_GPU_PARTICLE_NORMAL_MAP,
-    HWSR_GPU_PARTICLE_GLOW_MAP,
-    HWSR_GPU_PARTICLE_CUBEMAP_DEPTH_COLLISION,
-    HWSR_GPU_PARTICLE_WRITEBACK_DEATH_LOCATIONS,
-    HWSR_GPU_PARTICLE_TARGET_ATTRACTION,
-    HWSR_GPU_PARTICLE_SHAPE_ANGLE,
-    HWSR_GPU_PARTICLE_SHAPE_BOX,
-    HWSR_GPU_PARTICLE_SHAPE_POINT,
-    HWSR_GPU_PARTICLE_SHAPE_CIRCLE,
-    HWSR_GPU_PARTICLE_SHAPE_SPHERE,
-    HWSR_GPU_PARTICLE_WIND,
-
-    HWSR_MULTI_LAYER_ALPHA_BLEND,
-    HWSR_ADDITIVE_BLENDING,
-    HWSR_APPLY_SSDO,
-    HWSR_FOG_VOLUME_HIGH_QUALITY_SHADER,
-
-
-    HWSR_SRGB0,
-    HWSR_SRGB1,
-    HWSR_SRGB2,
-
-    HWSR_DEPTHFIXUP,
-    HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION,
-    HWSR_SLIM_GBUFFER,
-
-    HWSR_MAX
-};
-
-extern uint64 g_HWSR_MaskBit[HWSR_MAX];
-
-// HWShader global flags (m_Flags)
-#define HWSG_SUPPORTS_LIGHTING    0x20
-#define HWSG_SUPPORTS_MULTILIGHTS 0x40
-#define HWSG_SUPPORTS_MODIF  0x80
-#define HWSG_SUPPORTS_VMODIF 0x100
-#define HWSG_WASGENERATED    0x200
-#define HWSG_NOSPECULAR      0x400
-#define HWSG_SYNC            0x800
-#define HWSG_CACHE_USER      0x1000
-//#define HWSG_AUTOENUMTC      0x1000
-#define HWSG_UNIFIEDPOS      0x2000
-#define HWSG_DEFAULTPOS      0x4000
-#define HWSG_PROJECTED       0x8000
-#define HWSG_NOISE           0x10000
-#define HWSG_PRECACHEPHASE   0x20000
-#define HWSG_FP_EMULATION    0x40000
-
-// HWShader per-instance Modificator flags (SHWSInstance::m_MDMask)
-// Vertex shader specific
-
-// Texture projected flags
-#define HWMD_TEXCOORD_PROJ                          0x1
-// Texture transform flag
-#define HWMD_TEXCOORD_MATRIX                        0x100
-// Object linear texgen flag
-#define HWMD_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE         0x1000
-#define HWMD_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE       0x2000
-#define HWMD_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT  0x4000
-#define HWMD_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL          0x8000
-#define HWMD_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM          0x10000
-
-
-#define HWMD_TEXCOORD_FLAG_MASK    (0xfffff000 | 0xf00)
-
-// HWShader per-instance vertex modificator flags (SHWSInstance::m_MDVMask)
-// Texture projected flags (4 bits)
-#define HWMDV_TYPE      0
-
-
-// HWShader input flags (passed via mfSet function)
-#define HWSF_SETPOINTERSFORSHADER 1
-#define HWSF_SETPOINTERSFORPASS   2
-#define HWSF_PRECACHE             4
-#define HWSF_SETTEXTURES          8
-#define HWSF_FAKE                 0x10
-
-#define HWSF_INSTANCED            0x20
-#define HWSF_NEXT                 0x100
-#define HWSF_PRECACHE_INST        0x200
-#define HWSF_STORECOMBINATION     0x400
-#define HWSF_STOREDATA            0x800
-
-// Static flags
-enum EHWSSTFlag
-{
-    HWSST_Invalid = -1,
-#undef FX_STATIC_FLAG
-#define FX_STATIC_FLAG(flag) HWSST_##flag,
-#include "ShaderStaticFlags.inl"
-    HWSST_MAX
-};
-
-class CHWShader
-    : public CBaseResource
-{
-    static CCryNameTSCRC s_sClassNameVS;
-    static CCryNameTSCRC s_sClassNamePS;
-
-public:
-    EHWShaderClass m_eSHClass;
-    //EHWSProfile m_eHWProfile;
-    SShaderCache* m_pGlobalCache;
-
-    static struct SD3DShader* s_pCurPS;
-    static struct SD3DShader* s_pCurVS;
-    static struct SD3DShader* s_pCurGS;
-    static struct SD3DShader* s_pCurDS;
-    static struct SD3DShader* s_pCurHS;
-    static struct SD3DShader* s_pCurCS;
-
-    string m_Name;
-    string m_NameSourceFX;
-    string m_EntryFunc;
-    uint64 m_nMaskAnd_RT;
-    uint64 m_nMaskOr_RT;
-    uint64 m_nMaskGenShader;        // Masked/Optimised m_nMaskGenFX for this specific HW shader
-    uint64 m_nMaskGenFX;            // FX Shader should be parsed with this flags
-    uint64 m_nMaskSetFX;            // AffectMask GL for parser tree
-    uint64 m_maskGenStatic;         // Mask for global static flags used for generating the shader.
-
-    uint32 m_nPreprocessFlags;
-    int m_nFrame;
-    int m_nFrameLoad;
-    int m_Flags;
-    uint32 m_CRC32;
-    uint32 m_dwShaderType;
-
-public:
-    CHWShader()
-    {
-        m_nFrame = 0;
-        m_nFrameLoad = 0;
-        m_Flags = 0;
-        m_nMaskGenShader = 0;
-        m_nMaskAnd_RT = -1;
-        m_nMaskOr_RT = 0;
-        m_CRC32 = 0;
-        m_nMaskGenFX = 0;
-        m_nMaskSetFX = 0;
-        m_eSHClass = eHWSC_Vertex;
-        m_pGlobalCache = NULL;
-    }
-    virtual ~CHWShader() {}
-
-    //EHWSProfile mfGetHWProfile(uint32 nFlags);
-
-#if !defined (NULL_RENDERER)
-
-    static CHWShader* mfForName(const char* name, const char* nameSource, uint32 CRC32, const char* szEntryFunc, EHWShaderClass eClass, TArray<uint32>& SHData, FXShaderToken* pTable, uint32 dwType, CShader* pFX, uint64 nMaskGen = 0, uint64 nMaskGenFX = 0);
-#endif
-    static void mfReloadScript(const char* szPath, const char* szName, int nFlags, uint64 nMaskGen);
-    static void mfFlushPendedShadersWait(int nMaxAllowed);
-    inline const char* GetName()
-    {
-        return m_Name.c_str();
-    }
-    virtual int  Size() = 0;
-    virtual void GetMemoryUsage(ICrySizer* Sizer) const = 0;
-    virtual void mfReset([[maybe_unused]] uint32 CRC32) {}
-    virtual bool mfSetV(int nFlags = 0) = 0;
-    virtual bool mfAddEmptyCombination(CShader* pSH, uint64 nRT, uint64 nGL, uint32 nLT) = 0;
-    virtual bool mfStoreEmptyCombination(SEmptyCombination& Comb) = 0;
-    virtual const char* mfGetCurScript() {return NULL; }
-    virtual const char* mfGetEntryName() = 0;
-    virtual void mfUpdatePreprocessFlags(SShaderTechnique* pTech) = 0;
-    virtual bool mfFlushCacheFile() = 0;
-    virtual bool mfPrecache(SShaderCombination& cmb, bool bForce, bool bFallback, bool bCompressedOnly, CShader* pSH, CShaderResources* pRes) = 0;
-
-    virtual bool Export(SShaderSerializeContext& SC) = 0;
-    static CHWShader* Import(SShaderSerializeContext& SC, int nOffs, uint32 CRC32, CShader* pSH);
-
-    // Vertex shader specific functions
-    virtual AZ::Vertex::Format mfVertexFormat(bool& bUseTangents, bool& bUseLM, bool& bUseHWSkin, bool& bUseVertexVelocity) = 0;
-
-    virtual const char* mfGetActivatedCombinations(bool bForLevel) = 0;
-
-    static const char* mfProfileString(EHWShaderClass eClass);
-    static const char* mfClassString(EHWShaderClass eClass);
-    static EHWShaderClass mfStringProfile(const char* profile);
-    static EHWShaderClass mfStringClass(const char* szClass);
-    static void mfGenName(uint64 GLMask, uint64 RTMask, uint32 LightMask, uint32 MDMask, uint32 MDVMask, uint64 PSS, uint64 STMask, EHWShaderClass eClass, char* dstname, int nSize, byte bType);
-
-    static void mfCleanupCache();
-
-    static CCryNameTSCRC mfGetClassName(EHWShaderClass eClass)
-    {
-        if (eClass == eHWSC_Vertex)
-        {
-            return s_sClassNameVS;
-        }
-        else
-        {
-            return s_sClassNamePS;
-        }
-    }
-
-    static const char* GetCurrentShaderCombinations(bool bForLevel);
-    static bool PreactivateShaders();
-    static void RT_PreactivateShaders();
-
-    static byte* mfIgnoreRemapsFromCache(int nRemaps, byte* pP);
-    static byte* mfIgnoreBindsFromCache(int nParams, byte* pP);
-#if !defined(CONSOLE)
-    static bool mfOptimiseCacheFile(SShaderCache* pCache, bool bForce, SOptimiseStats* Stats);
-#endif
-    static SShaderDevCache* mfInitDevCache(const char* name, CHWShader* pSH);
-    static SShaderCache* mfInitCache(const char* name, CHWShader* pSH, bool bCheckValid, uint32 CRC32, bool bReadOnly, bool bAsync = false);
-    static bool _OpenCacheFile(float fVersion, SShaderCache* pCache, CHWShader* pSH, bool bCheckValid, uint32 CRC32, int nCache, CResFile* pRF, bool bReadOnly);
-    static bool mfOpenCacheFile(const char* szName, float fVersion, SShaderCache* pCache, CHWShader* pSH, bool bCheckValid, uint32 CRC32, bool bReadOnly);
-    static void mfValidateTokenData(CResFile* pRF);
-    static FXShaderCacheNames m_ShaderCacheList;
-    static FXShaderCache m_ShaderCache;
-
-    // Import/Export
-    static bool ImportSamplers(SShaderSerializeContext& SC, struct SCHWShader* pSHW, byte*& pData, std::vector<STexSamplerRT>& Samplers);
-    static bool ImportParams(SShaderSerializeContext& SC, SCHWShader* pSHW, byte*& pData, std::vector<SFXParam>& Params);
-
-    static FXCompressedShaders m_CompressedShaders;
-};
-
-_inline void SortLightTypes(int Types[4], int nCount)
-{
-    switch (nCount)
-    {
-    case 2:
-        if (Types[0] > Types[1])
-        {
-            Exchange(Types[0], Types[1]);
-        }
-        break;
-    case 3:
-        if (Types[0] > Types[1])
-        {
-            Exchange(Types[0], Types[1]);
-        }
-        if (Types[0] > Types[2])
-        {
-            Exchange(Types[0], Types[2]);
-        }
-        if (Types[1] > Types[2])
-        {
-            Exchange(Types[1], Types[2]);
-        }
-        break;
-    case 4:
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            for (int j = i; j < 4; j++)
-            {
-                if (Types[i] > Types[j])
-                {
-                    Exchange(Types[i], Types[j]);
-                }
-            }
-        }
-    }
-    break;
-    }
-}
-
-//=========================================================================
-// Dynamic lights evaluating via shaders
-
-enum ELightStyle
-{
-    eLS_Intensity,
-    eLS_RGB,
-};
-
-enum ELightMoveType
-{
-    eLMT_Wave,
-    eLMT_Patch,
-};
-
-struct SLightMove
-{
-    ELightMoveType m_eLMType;
-    SWaveForm m_Wave;
-    Vec3 m_Dir;
-    float m_fSpeed;
-
-    int Size()
-    {
-        int nSize = sizeof(SLightMove);
-        return nSize;
-    }
-};
-
-struct SLightStyleKeyFrame
-{
-    ColorF cColor; // xyz: color, w: spec mult
-    Vec3 vPosOffset;    // position offset
-
-    SLightStyleKeyFrame()
-    {
-        cColor = ColorF(Col_Black);
-        vPosOffset = Vec3(ZERO);
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-};
-
-class CLightStyle
-{
-public:
-
-    CLightStyle()
-        :  m_Color(Col_White)
-        , m_vPosOffset(ZERO)
-        , m_LastTime(0.0f)
-        , m_TimeIncr(60.0f)
-        , m_bRandColor(0)
-        , m_bRandIntensity(0)
-        , m_bRandPosOffset(0)
-        , m_bRandSpecMult(0)
-    {
-    }
-
-    static TArray <CLightStyle*> s_LStyles;
-    TArray<SLightStyleKeyFrame> m_Map;
-
-    ColorF m_Color;             // xyz: color, w: spec mult
-    Vec3 m_vPosOffset;      // position offset
-
-    float m_TimeIncr;
-    float m_LastTime;
-
-    uint8 m_bRandColor : 1;
-    uint8 m_bRandIntensity : 1;
-    uint8 m_bRandPosOffset : 1;
-    uint8 m_bRandSpecMult : 1;
-
-    int Size()
-    {
-        int nSize = sizeof(CLightStyle);
-        nSize += m_Map.GetMemoryUsage();
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->Add(*this);
-        pSizer->AddObject(m_Map);
-    }
-
-    static _inline CLightStyle* mfGetStyle(uint32 nStyle, float fTime)
-    {
-        if (nStyle >= s_LStyles.Num() || !s_LStyles[nStyle])
-        {
-            return NULL;
-        }
-        s_LStyles[nStyle]->mfUpdate(fTime);
-        return s_LStyles[nStyle];
-    }
-
-    void mfUpdate(float fTime);
-};
-
-
-//=========================================================================
-// HW Shader Layer
-
-#define SHPF_AMBIENT         0x100
-#define SHPF_HASLM           0x200
-#define SHPF_SHADOW          0x400
-#define SHPF_RADIOSITY       0x800
-#define SHPF_ALLOW_SPECANTIALIAS 0x1000
-#define SHPF_BUMP            0x2000
-#define SHPF_NOMATSTATE      0x4000
-#define SHPF_FORCEZFUNC      0x8000
-
-
-// Shader pass definition for HW shaders
-struct SShaderPass
-{
-    uint32 m_RenderState;        // Render state flags
-    signed char m_eCull;
-    uint8 m_AlphaRef;
-
-    uint16 m_PassFlags;            // Different usefull Pass flags (SHPF_)
-
-    CHWShader* m_VShader;       // Pointer to the vertex shader for the current pass
-    CHWShader* m_PShader;       // Pointer to fragment shader
-    CHWShader* m_GShader;       // Pointer to the geometry shader for the current pass
-    CHWShader* m_HShader;       // Pointer to the hull shader for the current pass
-    CHWShader* m_DShader;       // Pointer to the domain shader for the current pass
-    CHWShader* m_CShader;       // Pointer to the compute shader for the current pass
-    SShaderPass();
-
-    int Size()
-    {
-        int nSize = sizeof(SShaderPass);
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_VShader);
-        pSizer->AddObject(m_PShader);
-        pSizer->AddObject(m_GShader);
-        pSizer->AddObject(m_HShader);
-        pSizer->AddObject(m_DShader);
-        pSizer->AddObject(m_CShader);
-    }
-    void mfFree()
-    {
-        SAFE_RELEASE(m_VShader);
-        SAFE_RELEASE(m_PShader);
-        SAFE_RELEASE(m_GShader);
-        SAFE_RELEASE(m_HShader);
-        SAFE_RELEASE(m_DShader);
-        SAFE_RELEASE(m_CShader);
-    }
-
-    void AddRefsToShaders()
-    {
-        if (m_VShader)
-        {
-            m_VShader->AddRef();
-        }
-        if (m_PShader)
-        {
-            m_PShader->AddRef();
-        }
-        if (m_GShader)
-        {
-            m_GShader->AddRef();
-        }
-        if (m_DShader)
-        {
-            m_DShader->AddRef();
-        }
-        if (m_HShader)
-        {
-            m_HShader->AddRef();
-        }
-        if (m_CShader)
-        {
-            m_CShader->AddRef();
-        }
-    }
-
-private:
-    SShaderPass& operator = (const SShaderPass& sl);
-};
-
-//===================================================================================
-// Hardware Stage for HW only Shaders
-
-#define FHF_FIRSTLIGHT   8
-#define FHF_FORANIM      0x10
-#define FHF_TERRAIN      0x20
-#define FHF_NOMERGE      0x40
-#define FHF_DETAILPASS   0x80
-#define FHF_LIGHTPASS    0x100
-#define FHF_FOGPASS      0x200
-#define FHF_PUBLIC       0x400
-#define FHF_NOLIGHTS     0x800
-#define FHF_POSITION_INVARIANT 0x1000
-#define FHF_RE_CLOUD     0x20000
-#define FHF_TRANSPARENT  0x40000
-#define FHF_WASZWRITE    0x80000
-#define FHF_USE_GEOMETRY_SHADER 0x100000
-#define FHF_USE_HULL_SHADER     0x200000
-#define FHF_USE_DOMAIN_SHADER   0x400000
-#define FHF_RE_LENSOPTICS 0x1000000
-
-
-struct SShaderTechnique
-{
-    CShader*  m_shader;
-    CCryNameR m_NameStr;
-    CCryNameTSCRC m_NameCRC;
-    TArray <SShaderPass> m_Passes;       // General passes
-    int m_Flags;                         // Different flags (FHF_)
-    uint32 m_nPreprocessFlags;
-    int8 m_nTechnique[TTYPE_MAX];        // Next technique in sequence
-    TArray<CRendElementBase*> m_REs;         // List of all render elements registered in the shader
-    TArray<SHRenderTarget*> m_RTargets;
-    float m_fProfileTime;
-
-    int Size()
-    {
-        uint32 i;
-        int nSize = sizeof(SShaderTechnique);
-        for (i = 0; i < m_Passes.Num(); i++)
-        {
-            nSize += m_Passes[i].Size();
-        }
-        nSize += m_RTargets.GetMemoryUsage();
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->Add(*this);
-        pSizer->AddObject(m_Passes);
-        pSizer->AddObject(m_REs);
-        pSizer->AddObject(m_RTargets);
-    }
-
-    SShaderTechnique(CShader* shader)
-    {
-        m_shader = shader;
-        uint32 i;
-        for (i = 0; i < TTYPE_MAX; i++)
-        {
-            m_nTechnique[i] = -1;
-        }
-        for (i = 0; i < m_REs.Num(); i++)
-        {
-            SAFE_DELETE(m_REs[i]);
-        }
-        m_REs.Free();
-
-        m_Flags = 0;
-        m_nPreprocessFlags = 0;
-        m_fProfileTime = 0;
-    }
-    SShaderTechnique& operator = (const SShaderTechnique& sl)
-    {
-        memcpy(this, &sl, sizeof(SShaderTechnique));
-        if (sl.m_Passes.Num())
-        {
-            m_Passes.Copy(sl.m_Passes);
-            for (uint32 i = 0; i < sl.m_Passes.Num(); i++)
-            {
-                SShaderPass* d = &m_Passes[i];
-                d->AddRefsToShaders();
-            }
-        }
-        if (sl.m_REs.Num())
-        {
-            m_REs.Create(sl.m_REs.Num());
-            for (uint32 i = 0; i < sl.m_REs.Num(); i++)
-            {
-                if (sl.m_REs[i])
-                {
-                    m_REs[i] = sl.m_REs[i]->mfCopyConstruct();
-                }
-            }
-        }
-
-        return *this;
-    }
-
-    ~SShaderTechnique()
-    {
-        for (uint32 i = 0; i < m_Passes.Num(); i++)
-        {
-            SShaderPass* sl = &m_Passes[i];
-
-            sl->mfFree();
-        }
-        for (uint32 i = 0; i < m_REs.Num(); i++)
-        {
-            CRendElementBase* pRE = m_REs[i];
-            pRE->Release(false);
-        }
-        m_REs.Free();
-        m_Passes.Free();
-    }
-    void UpdatePreprocessFlags(CShader* pSH);
-
-    void* operator new(size_t Size) { void* ptr = CryModuleMalloc(Size); memset(ptr, 0, Size); return ptr; }
-    void* operator new(size_t Size, [[maybe_unused]] const std::nothrow_t& nothrow)
-    {
-        void* ptr = CryModuleMalloc(Size);
-        if (ptr)
-        {
-            memset(ptr, 0, Size);
-        }
-        return ptr;
-    }
-    void operator delete(void* Ptr) { CryModuleFree(Ptr); }
-};
-
-//===============================================================================
-
-// General Shader structure
-class CShader
-    : public IShader
-    , public CBaseResource
-{
-    static CCryNameTSCRC    s_sClassName;
-
-public:
-    string                  m_NameFile;   // } FIXME: This fields order is very important
-    string                  m_NameShader;
-    EShaderDrawType         m_eSHDType;   // } Check CShader::operator = in ShaderCore.cpp for more info
-
-    uint32                  m_Flags;            // Different flags EF_  (see IShader.h)
-    uint32                  m_Flags2;           // Different flags EF2_ (see IShader.h)
-    uint32                  m_nMDV;          // Vertex modificator flags
-    uint32                  m_NameShaderICRC;
-
-    AZ::Vertex::Format      m_vertexFormat;   // Base vertex format for the shader (see VertexFormats.h)
-    ECull                   m_eCull;          // Global culling type
-
-    TArray <SShaderTechnique*> m_HWTechniques;              // Hardware techniques
-    int                     m_nMaskCB;
-
-    EShaderType             m_eShaderType;                  // [Shader System TO DO] - possibly change to be data driven
-
-    uint64                  m_nMaskGenFX;
-    uint64                  m_maskGenStatic;                // Static global flags used for generating the shader.
-    SShaderGen*             m_ShaderGenParams;              // BitMask params used in automatic script generation
-    SShaderGen*             m_ShaderGenStaticParams;
-    SShaderTexSlots*        m_ShaderTexSlots[TTYPE_MAX];    // filled out with data of the used texture slots for a given technique
-                                                            // (might be NULL if this data isn't gathered)
-    std::vector<CShader*>*  m_DerivedShaders;
-    CShader*                m_pGenShader;
-
-    int                     m_nRefreshFrame; // Current frame for shader reloading (to avoid multiple reloading)
-    uint32                  m_SourceCRC32;
-    uint32                  m_CRC32;
-
-    //============================================================================
-
-    inline int mfGetID() { return CBaseResource::GetID(); }
-
-    void mfFree();
-    CShader()
-        : m_eSHDType(eSHDT_General)
-        , m_Flags(0)
-        , m_Flags2(0)
-        , m_nMDV(0)
-        , m_NameShaderICRC(0)
-        , m_vertexFormat(eVF_P3F_C4B_T2F)
-        , m_eCull((ECull) - 1)
-        , m_nMaskCB(0)
-        , m_eShaderType(eST_General)
-        , m_nMaskGenFX(0)
-        , m_ShaderGenParams(nullptr)
-        , m_DerivedShaders(nullptr)
-        , m_pGenShader(nullptr)
-        , m_nRefreshFrame(0)
-        , m_SourceCRC32(0)
-        , m_CRC32(0)
-        , m_ShaderGenStaticParams(nullptr)
-        , m_maskGenStatic(0)
-    {
-        memset(m_ShaderTexSlots, 0, sizeof(m_ShaderTexSlots));
-    }
-    virtual ~CShader();
-
-    //===================================================================================
-
-    // IShader interface
-    virtual int AddRef() { return CBaseResource::AddRef(); }
-    virtual int Release()
-    {
-        if (m_Flags & EF_SYSTEM)
-        {
-            return -1;
-        }
-        return CBaseResource::Release();
-    }
-    virtual int ReleaseForce()
-    {
-        m_Flags &= ~EF_SYSTEM;
-        int nRef = 0;
-        while (true)
-        {
-            nRef = Release();
-            if (nRef <= 0)
-            {
-                break;
-            }
-        }
-        return nRef;
-    }
-
-    virtual int GetID() { return CBaseResource::GetID(); }
-    virtual int GetRefCounter() const { return CBaseResource::GetRefCounter(); }
-    virtual const char* GetName() { return m_NameShader.c_str(); }
-    virtual const char* GetName() const { return m_NameShader.c_str(); }
-
-    // D3D Effects interface
-    virtual bool FXSetTechnique(const CCryNameTSCRC& Name);
-    virtual bool FXSetPSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) override;
-    virtual bool FXSetCSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) override;
-    virtual bool FXSetVSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) override;
-    virtual bool FXSetGSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) override;
-    
-    virtual bool FXSetPSFloat(const char* NameParam, const Vec4 fParams[], int nParams) override;
-    virtual bool FXSetCSFloat(const char* NameParam, const Vec4 fParams[], int nParams) override;
-    virtual bool FXSetVSFloat(const char* NameParam, const Vec4 fParams[], int nParams) override;
-    virtual bool FXSetGSFloat(const char* NameParam, const Vec4 fParams[], int nParams) override;
-
-    virtual bool FXBegin(uint32* uiPassCount, uint32 nFlags) override;
-    virtual bool FXBeginPass(uint32 uiPass) override;
-    virtual bool FXCommit(const uint32 nFlags) override;
-    virtual bool FXEndPass() override;
-    virtual bool FXEnd() override;
-
-    virtual int GetFlags() const { return m_Flags; }
-    virtual int GetFlags2() const { return m_Flags2; }
-    virtual void SetFlags2(int Flags) { m_Flags2 |= Flags; }
-    virtual void ClearFlags2(int Flags) { m_Flags2 &= ~Flags; }
-
-    virtual bool Reload(int nFlags, const char* szShaderName);
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-    virtual void mfFlushCache();
-#endif
-
-    void mfFlushPendedShaders();
-
-    virtual int GetTechniqueID(int nTechnique, int nRegisteredTechnique)
-    {
-        if (nTechnique < 0)
-        {
-            nTechnique = 0;
-        }
-        if ((int)m_HWTechniques.Num() <= nTechnique)
-        {
-            return -1;
-        }
-        SShaderTechnique* pTech = m_HWTechniques[nTechnique];
-        return pTech->m_nTechnique[nRegisteredTechnique];
-    }
-    virtual TArray<CRendElementBase*>* GetREs (int nTech)
-    {
-        if (nTech < 0)
-        {
-            nTech = 0;
-        }
-        if (nTech < (int)m_HWTechniques.Num())
-        {
-            SShaderTechnique* pTech = m_HWTechniques[nTech];
-            return &pTech->m_REs;
-        }
-        return NULL;
-    }
-    virtual int GetTexId ();
-    virtual unsigned int GetUsedTextureTypes (void);
-    virtual AZ::Vertex::Format GetVertexFormat(void) { return m_vertexFormat; }
-    virtual uint64 GetGenerationMask() { return m_nMaskGenFX; }
-    virtual ECull GetCull(void)
-    {
-        if (m_HWTechniques.Num())
-        {
-            SShaderTechnique* pTech = m_HWTechniques[0];
-            if (pTech->m_Passes.Num())
-            {
-                return (ECull)pTech->m_Passes[0].m_eCull;
-            }
-        }
-        return eCULL_None;
-    }
-    virtual SShaderGen* GetGenerationParams()
-    {
-        if (m_ShaderGenParams)
-        {
-            return m_ShaderGenParams;
-        }
-        if (m_pGenShader)
-        {
-            return m_pGenShader->m_ShaderGenParams;
-        }
-        return NULL;
-    }
-
-    size_t GetNumberOfUVSets() override
-    {
-        SShaderGen* shaderGenParams = GetGenerationParams();
-        if (shaderGenParams)
-        {
-            for (int i = 0; i < shaderGenParams->m_BitMask.Num(); i++)
-            {
-                // A material with any of the following shader gen params is using 2 uv sets
-                if (shaderGenParams->m_BitMask[i]->m_ParamName == "%BLENDLAYER_UV_SET_2" ||
-                    shaderGenParams->m_BitMask[i]->m_ParamName == "%EMITTANCE_MAP_UV_SET_2" ||
-                    shaderGenParams->m_BitMask[i]->m_ParamName == "%DETAIL_MAPPING_UV_SET_2")
-                {
-                    if (shaderGenParams->m_BitMask[i]->m_Mask & m_nMaskGenFX)
-                    {
-                        return 2;
-                    }
-                }
-            }
-        }
-
-        return 1;
-    }
-
-    virtual SShaderTexSlots* GetUsedTextureSlots(int nTechnique);
-
-    virtual AZStd::vector<SShaderParam>& GetPublicParams();
-    virtual EShaderType GetShaderType() { return m_eShaderType; }
-    virtual EShaderDrawType GetShaderDrawType() const { return m_eSHDType; }
-    virtual uint32 GetVertexModificator() { return m_nMDV; }
-
-    //=======================================================================================
-
-    bool mfPrecache(SShaderCombination& cmb, bool bForce, bool bCompressedOnly, CShaderResources* pRes);
-
-    SShaderTechnique* mfFindTechnique(const CCryNameTSCRC& name)
-    {
-        uint32 i;
-        for (i = 0; i < m_HWTechniques.Num(); i++)
-        {
-            SShaderTechnique* pTech = m_HWTechniques[i];
-            if (pTech->m_NameCRC == name)
-            {
-                return pTech;
-            }
-        }
-        return NULL;
-    }
-    SShaderTechnique* mfGetStartTechnique(int nTechnique);
-    // CRY DX12
-    SShaderTechnique* GetTechnique(int nStartTechnique, int nRequestedTechnique);
-
-    virtual ITexture* GetBaseTexture(int* nPass, int* nTU);
-
-    CShader& operator = (const CShader& src);
-    CTexture* mfFindBaseTexture(TArray<SShaderPass>& Passes, int* nPass, int* nTU);
-
-    int mfSize();
-
-    // All loaded shaders resources list
-    static TArray<CShaderResources*> s_ShaderResources_known;
-
-    virtual int Size([[maybe_unused]] int Flags)
-    {
-        return mfSize();
-    }
-
-    virtual void GetMemoryUsage(ICrySizer* Sizer) const;
-    void* operator new(size_t Size) { void* ptr = CryModuleMalloc(Size); memset(ptr, 0, Size); return ptr; }
-    void* operator new(size_t Size, [[maybe_unused]] const std::nothrow_t& nothrow)
-    {
-        void* ptr = CryModuleMalloc(Size);
-        if (ptr)
-        {
-            memset(ptr, 0, Size);
-        }
-        return ptr;
-    }
-    void operator delete(void* Ptr) { CryModuleFree(Ptr); }
-
-    static CCryNameTSCRC mfGetClassName()
-    {
-        return s_sClassName;
-    }
-};
-
-inline SShaderTechnique* SShaderItem::GetTechnique() const
-{
-    int nTech = m_nTechnique;
-    if (nTech < 0)
-    {
-        nTech = 0;
-    }
-    CShader* pSH = (CShader*)m_pShader;
-
-    if (pSH && !pSH->m_HWTechniques.empty())
-    {
-        CryPrefetch(&pSH->m_HWTechniques[0]);
-
-        assert(m_nTechnique < 0 || pSH->m_HWTechniques.Num() == 0 || nTech < (int)pSH->m_HWTechniques.Num());
-        if (nTech < (int)pSH->m_HWTechniques.Num())
-        {
-            return pSH->m_HWTechniques[nTech];
-        }
-    }
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_SHADER_H
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderAllocator.h b/Code/CryEngine/RenderDll/Common/Shaders/ShaderAllocator.h
deleted file mode 100644
index 0c66626d0d..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderAllocator.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_SHADERALLOCATOR_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_SHADERS_SHADERALLOCATOR_H
-#pragma once
-
-#include "CryMemoryAllocator.h"
-#include "IMemory.h"
-
-typedef cry_crt_node_allocator ShaderBucketAllocator;
-
-extern ShaderBucketAllocator g_shaderBucketAllocator;
-extern IGeneralMemoryHeap* g_shaderGeneralHeap;
-
-template <class T>
-class STLShaderAllocator
-{
-public:
-    typedef size_t    size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T*        pointer;
-    typedef const T*  const_pointer;
-    typedef T&        reference;
-    typedef const T&  const_reference;
-    typedef T         value_type;
-
-    template <class U>
-    struct rebind
-    {
-        typedef STLShaderAllocator<U> other;
-    };
-
-    STLShaderAllocator() throw() { }
-    STLShaderAllocator(const STLShaderAllocator&) throw() { }
-    template <class U>
-    STLShaderAllocator(const STLShaderAllocator<U>&) throw() { }
-
-    pointer address(reference x) const
-    {
-        return &x;
-    }
-
-    const_pointer address(const_reference x) const
-    {
-        return &x;
-    }
-
-    pointer allocate(size_type n = 1, const void* hint = 0)
-    {
-        pointer ret = NULL;
-
-        (void)hint;
-        size_t sz = std::max<size_type>(n * sizeof(T), 1);
-        if (sz <= ShaderBucketAllocator::MaxSize)
-        {
-            ret = static_cast<pointer>(g_shaderBucketAllocator.allocate(sz));
-        }
-        else
-        {
-            ret = static_cast<pointer>(g_shaderGeneralHeap->Malloc(sz, NULL));
-        }
-
-        return ret;
-    }
-
-    void deallocate(pointer p, size_type n = 1)
-    {
-        (void)n;
-        if (p)
-        {
-            if (g_shaderGeneralHeap && !g_shaderGeneralHeap->Free(p))
-            {
-                g_shaderBucketAllocator.deallocate(p);
-            }
-        }
-    }
-
-    size_type max_size() const throw()
-    {
-        return INT_MAX;
-    }
-
-    void construct(pointer p, const T& val)
-    {
-        new(static_cast<void*>(p))T(val);
-    }
-
-    void construct(pointer p)
-    {
-        new(static_cast<void*>(p))T();
-    }
-
-    void destroy(pointer p)
-    {
-        p->~T();
-    }
-
-    pointer new_pointer()
-    {
-        return new(allocate())T();
-    }
-
-    pointer new_pointer(const T& val)
-    {
-        return new(allocate())T(val);
-    }
-
-    void delete_pointer(pointer p)
-    {
-        p->~T();
-        deallocate(p);
-    }
-
-    bool operator==(const STLShaderAllocator&) const {return true; }
-    bool operator!=(const STLShaderAllocator&) const {return false; }
-
-    static void GetMemoryUsage(ICrySizer* pSizer) { }
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.cpp
deleted file mode 100644
index 9963685743..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.cpp
+++ /dev/null
@@ -1,2612 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "RemoteCompiler.h"
-#include "../RenderCapabilities.h"
-
-#include <AzCore/PlatformId/PlatformId.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/Archive/IArchive.h>
-
-uint32 SShaderCombIdent::PostCreate()
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    // using actual CRC is to expensive,  so replace with cheaper version with
-    // has more changes of hits
-    //uint32 hash = CCrc32::Compute(&m_RTMask, sizeof(SShaderCombIdent)-sizeof(uint32));
-    const uint32* acBuffer = alias_cast<uint32*>(&m_RTMask);
-    int len = (sizeof(SShaderCombIdent) - sizeof(uint32)) / sizeof(uint32);
-    uint32 hash = 5381;
-    while (len--)
-    {
-        int c = *acBuffer++;
-        // hash = hash*33 + c
-        hash = ((hash << 5) + hash) + c;
-    }
-
-    m_nHash = hash;
-    m_MDVMask &= ~SF_PLATFORM;
-    return hash;
-}
-
-bool CShader::mfPrecache(SShaderCombination& cmb, bool bForce, bool bCompressedOnly, CShaderResources* pRes)
-{
-    bool bRes = true;
-
-    if (!CRenderer::CV_r_shadersAllowCompilation && !bForce)
-    {
-        return bRes;
-    }
-
-    int nAsync = CRenderer::CV_r_shadersasynccompiling;
-    CRenderer::CV_r_shadersasynccompiling = 0;
-
-    uint32 i, j;
-
-    //is this required? Messing with the global render state?
-    //gRenDev->m_RP.m_pShader = this;
-    //gRenDev->m_RP.m_pCurTechnique = NULL;
-
-    for (i = 0; i < m_HWTechniques.Num(); i++)
-    {
-        SShaderTechnique* pTech = m_HWTechniques[i];
-        for (j = 0; j < pTech->m_Passes.Num(); j++)
-        {
-            SShaderPass& Pass = pTech->m_Passes[j];
-            SShaderCombination c = cmb;
-            gRenDev->m_RP.m_FlagsShader_MD = cmb.m_MDMask;
-            if (Pass.m_PShader)
-            {
-                bRes &= Pass.m_PShader->mfPrecache(cmb, bForce, false, bCompressedOnly, this, pRes);
-            }
-            cmb.m_MDMask = gRenDev->m_RP.m_FlagsShader_MD;
-            if (Pass.m_VShader)
-            {
-                bRes &= Pass.m_VShader->mfPrecache(cmb, bForce, false, bCompressedOnly, this, pRes);
-            }
-            cmb = c;
-        }
-    }
-    CRenderer::CV_r_shadersasynccompiling = nAsync;
-
-    return bRes;
-}
-
-SShaderGenComb* CShaderMan::mfGetShaderGenInfo(const char* nmFX)
-{
-    SShaderGenComb* c = NULL;
-    uint32 i;
-    for (i = 0; i < m_SGC.size(); i++)
-    {
-        c = &m_SGC[i];
-        if (!azstricmp(c->Name.c_str(), nmFX))
-        {
-            break;
-        }
-    }
-    SShaderGenComb cmb;
-    if (i == m_SGC.size())
-    {
-        c = NULL;
-        cmb.pGen = mfCreateShaderGenInfo(nmFX, false);
-        cmb.Name = CCryNameR(nmFX);
-        m_SGC.push_back(cmb);
-        c = &m_SGC[i];
-    }
-    return c;
-}
-
-static uint64 sGetGL(char** s, CCryNameR& name, uint32& nHWFlags)
-{
-    uint32 i;
-
-    nHWFlags = 0;
-    SShaderGenComb* c = NULL;
-    const char* m = strchr(name.c_str(), '@');
-    if (!m)
-    {
-        m = strchr(name.c_str(), '/');
-    }
-    assert(m);
-    if (!m)
-    {
-        return -1;
-    }
-    char nmFX[128];
-    char nameExt[128];
-    nameExt[0] = 0;
-    cry_strcpy(nmFX, name.c_str(), (size_t)(m - name.c_str()));
-    c = gRenDev->m_cEF.mfGetShaderGenInfo(nmFX);
-    if (!c || !c->pGen || !c->pGen->m_BitMask.Num())
-    {
-        return 0;
-    }
-    uint64 nGL = 0;
-    SShaderGen* pG = c->pGen;
-    for (i = 0; i < pG->m_BitMask.Num(); i++)
-    {
-        SShaderGenBit* pBit = pG->m_BitMask[i];
-        if (pBit->m_nDependencySet & (SHGD_HW_BILINEARFP16 | SHGD_HW_SEPARATEFP16))
-        {
-            nHWFlags |= pBit->m_nDependencySet;
-        }
-    }
-    while (true)
-    {
-        char theChar;
-        int n = 0;
-        while ((theChar = **s) != 0)
-        {
-            if (theChar == ')' || theChar == '|')
-            {
-                nameExt[n] = 0;
-                break;
-            }
-            nameExt[n++] = theChar;
-            ++*s;
-        }
-        if (!nameExt[0])
-        {
-            break;
-        }
-        for (i = 0; i < pG->m_BitMask.Num(); i++)
-        {
-            SShaderGenBit* pBit = pG->m_BitMask[i];
-            if (!azstricmp(pBit->m_ParamName.c_str(), nameExt))
-            {
-                nGL |= pBit->m_Mask;
-                break;
-            }
-        }
-        if (i == pG->m_BitMask.Num())
-        {
-            if (!strncmp(nameExt, "0x", 2))
-            {
-                //nGL |= shGetHex(&nameExt[2]);
-            }
-            else
-            {
-                //assert(0);
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug)
-                {
-                    iLog->Log("WARNING: Couldn't find global flag '%s' in shader '%s' (skipped)", nameExt, c->Name.c_str());
-                }
-            }
-        }
-        if (**s == '|')
-        {
-            ++*s;
-        }
-    }
-    return nGL;
-}
-
-static uint64 sGetFlag(char** s, SShaderGen* shaderGenInfo)
-{
-    if (!shaderGenInfo)
-    {
-        return 0;
-    }
-
-    uint32 i = 0;
-    uint64 mask = 0;
-    char name[128] = {0};
-    while (true)
-    {
-        char theChar;
-        int n = 0;
-        while ((theChar = **s) != 0)
-        {
-            if (theChar == ')' || theChar == '|')
-            {
-                name[n] = 0;
-                break;
-            }
-            name[n++] = theChar;
-            ++*s;
-        }
-        if (!name[0])
-        {
-            break;
-        }
-        for (i = 0; i < shaderGenInfo->m_BitMask.Num(); i++)
-        {
-            SShaderGenBit* pBit = shaderGenInfo->m_BitMask[i];
-            if (!azstricmp(pBit->m_ParamName.c_str(), name))
-            {
-                mask |= pBit->m_Mask;
-                break;
-            }
-        }
-
-        if (i == shaderGenInfo->m_BitMask.Num())
-        {
-            AZ_Warning("ShaderCache", false, "Couldn't find runtime flag '%s' (skipped)", name);
-        }
-
-        if (**s == '|')
-        {
-            ++*s;
-        }
-    }
-    return mask;
-}
-
-static int sEOF(bool bFromFile, char* pPtr, AZ::IO::HandleType fileHandle)
-{
-    int nStatus;
-    if (bFromFile)
-    {
-        nStatus = gEnv->pCryPak->FEof(fileHandle);
-    }
-    else
-    {
-        SkipCharacters(&pPtr, kWhiteSpace);
-        if (!*pPtr)
-        {
-            nStatus = 1;
-        }
-        else
-        {
-            nStatus = 0;
-        }
-    }
-    return nStatus;
-}
-
-void CShaderMan::mfCloseShadersCache(int nID)
-{
-    if (m_FPCacheCombinations[nID])
-    {
-        gEnv->pCryPak->FClose(m_FPCacheCombinations[nID]);
-        m_FPCacheCombinations[nID] = 0;
-    }
-}
-
-void sSkipLine(char*& s)
-{
-    if (!s)
-    {
-        return;
-    }
-
-    char* sEnd = strchr(s, '\n');
-    if (sEnd)
-    {
-        sEnd++;
-        s = sEnd;
-    }
-}
-
-static void sIterateHW_r(FXShaderCacheCombinations* Combinations, SCacheCombination& cmb, int i, uint64 nHW, const char* szName)
-{
-    string str;
-    gRenDev->m_cEF.mfInsertNewCombination(cmb.Ident, cmb.eCL, szName, 0, &str, false);
-    CCryNameR nm = CCryNameR(str.c_str());
-    FXShaderCacheCombinationsItor it = Combinations->find(nm);
-    if (it == Combinations->end())
-    {
-        cmb.CacheName = str.c_str();
-        Combinations->insert(FXShaderCacheCombinationsItor::value_type(nm, cmb));
-    }
-    for (int j = i; j < 64; j++)
-    {
-        if (((uint64)1 << j) & nHW)
-        {
-            cmb.Ident.m_GLMask &= ~((uint64)1 << j);
-            sIterateHW_r(Combinations, cmb, j + 1, nHW, szName);
-            cmb.Ident.m_GLMask |= ((uint64)1 << j);
-            sIterateHW_r(Combinations, cmb, j + 1, nHW, szName);
-        }
-    }
-}
-
-void CShaderMan::mfGetShaderListPath(stack_string& nameOut, int nType)
-{
-    if (nType == 0)
-    {
-        nameOut = stack_string(m_szCachePath.c_str()) + stack_string("shaders/shaderlist.txt");
-    }
-    else
-    {
-        nameOut = stack_string(m_szCachePath.c_str()) + stack_string("shaders/cache/shaderlistactivate.txt");
-    }
-}
-
-void CShaderMan::mfMergeShadersCombinations(FXShaderCacheCombinations* Combinations, int nType)
-{
-    FXShaderCacheCombinationsItor itor;
-    for (itor = m_ShaderCacheCombinations[nType].begin(); itor != m_ShaderCacheCombinations[nType].end(); itor++)
-    {
-        SCacheCombination* cmb = &itor->second;
-        FXShaderCacheCombinationsItor it = Combinations->find(cmb->CacheName);
-        if (it == Combinations->end())
-        {
-            Combinations->insert(FXShaderCacheCombinationsItor::value_type(cmb->CacheName, *cmb));
-        }
-    }
-}
-
-//==========================================================================================================================================
-
-struct CompareCombItem
-{
-    bool operator()(const SCacheCombination& p1, const SCacheCombination& p2) const
-    {
-        int n = azstricmp(p1.Name.c_str(), p2.Name.c_str());
-        if (n)
-        {
-            return n < 0;
-        }
-        n = p1.nCount - p2.nCount;
-        if (n)
-        {
-            return n > 0;
-        }
-        return (azstricmp(p1.CacheName.c_str(), p2.CacheName.c_str()) < 0);
-    }
-};
-
-#define g_szTestResults "TestResults"
-
-void CShaderMan::mfInitShadersCacheMissLog()
-{
-    m_ShaderCacheMissCallback = 0;
-    m_ShaderCacheMissPath = "";
-
-    // don't access the HD if we don't have any logging to file enabled
-    if (!CRenderer::CV_r_shaderslogcachemisses)
-    {
-        return;
-    }
-
-    // create valid path
-    gEnv->pCryPak->MakeDir(g_szTestResults);
-
-    m_ShaderCacheMissPath = string("@usercache@\\Shaders\\ShaderCacheMisses.txt");  // do we want this here, or maybe in @log@ ?
-
-    // load data which is already stored
-    AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
-    gEnv->pFileIO->Open(m_ShaderCacheMissPath.c_str(), AZ::IO::OpenMode::ModeRead, fileHandle);
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        char str[2048];
-        int nLine = 0;
-
-        while (!gEnv->pFileIO->Eof(fileHandle))
-        {
-            nLine++;
-            str[0] = 0;
-            AZ::IO::FGetS(str, 2047, fileHandle);
-            if (!str[0])
-            {
-                continue;
-            }
-
-            // remove new line at end
-            int len = strlen(str);
-            if (len > 0)
-            {
-                str[strlen(str) - 1] = 0;
-            }
-
-            m_ShaderCacheMisses.push_back(str);
-        }
-
-        std::sort(m_ShaderCacheMisses.begin(), m_ShaderCacheMisses.end());
-
-        gEnv->pFileIO->Close(fileHandle);
-        fileHandle = AZ::IO::InvalidHandle;
-    }
-}
-
-void CShaderMan::mfInitShadersCache(byte bForLevel, FXShaderCacheCombinations* Combinations, const char* pCombinations, int nType)
-{
-    COMPILE_TIME_ASSERT(SHADER_LIST_VER != SHADER_SERIALISE_VER);
-
-    char str[2048];
-    bool bFromFile = (Combinations == NULL);
-    stack_string nameComb;
-    m_ShaderCacheExportCombinations.clear();
-    AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
-    if (bFromFile)
-    {
-        if (!gRenDev->IsEditorMode() && !CRenderer::CV_r_shadersdebug && !gRenDev->IsShaderCacheGenMode())
-        {
-            return;
-        }
-        mfGetShaderListPath(nameComb, nType);
-        fileHandle = gEnv->pCryPak->FOpen(nameComb.c_str(), "r+");
-        if (fileHandle == AZ::IO::InvalidHandle)
-        {
-            fileHandle = gEnv->pCryPak->FOpen(nameComb.c_str(), "w+");
-        }
-        if (fileHandle == AZ::IO::InvalidHandle)
-        {
-            AZ::IO::HandleType statusdstFileHandle = AZ::IO::InvalidHandle;
-            gEnv->pFileIO->Open(nameComb.c_str(), AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, statusdstFileHandle);
-
-            if (statusdstFileHandle != AZ::IO::InvalidHandle)
-            {
-                gEnv->pFileIO->Close(statusdstFileHandle);
-                CrySetFileAttributes(str, FILE_ATTRIBUTE_ARCHIVE);
-                fileHandle = gEnv->pCryPak->FOpen(nameComb.c_str(), "r+");
-            }
-        }
-        m_FPCacheCombinations[nType] = fileHandle;
-        Combinations = &m_ShaderCacheCombinations[nType];
-    }
-
-    int nLine = 0;
-    char* pPtr = (char*)pCombinations;
-    char* ss;
-    if (fileHandle != AZ::IO::InvalidHandle || !bFromFile)
-    {
-        while (!sEOF(bFromFile, pPtr, fileHandle))
-        {
-            nLine++;
-
-            str[0] = 0;
-            if (bFromFile)
-            {
-                gEnv->pCryPak->FGets(str, 2047, fileHandle);
-            }
-            else
-            {
-                fxFillCR(&pPtr, str);
-            }
-            if (!str[0])
-            {
-                continue;
-            }
-
-            if (str[0] == '/' && str[1] == '/') // commented line e.g. // BadLine: Metal@Common_ShadowPS(%BIllum@IlluminationPS(%DIFFUSE|%ENVCMAMB|%ALPHAGLOW|%STAT_BRANCHING)(%_RT_AMBIENT|%_RT_BUMP|%_RT_GLOW)(101)(0)(0)(ps_2_0)
-            {
-                continue;
-            }
-
-            bool bExportEntry = false;
-            int size = strlen(str);
-            if (str[size - 1] == 0xa)
-            {
-                str[size - 1] = 0;
-            }
-            SCacheCombination cmb;
-            char* s = str;
-            SkipCharacters(&s, kWhiteSpace);
-            if (s[0] != '<')
-            {
-                continue;
-            }
-            char* st;
-            if (!bForLevel)
-            {
-                int nVer = atoi(&s[1]);
-                if (nVer != SHADER_LIST_VER)
-                {
-                    if (nVer == SHADER_SERIALISE_VER && bFromFile)
-                    {
-                        bExportEntry = true;
-                    }
-                    else
-                    {
-                        continue;
-                    }
-                }
-                if (s[2] != '>')
-                {
-                    continue;
-                }
-                s += 3;
-            }
-            else
-            {
-                st = s;
-                s = strchr(&st[1], '>');
-                if (!s)
-                {
-                    continue;
-                }
-                cmb.nCount = atoi(st);
-                s++;
-            }
-            if (bForLevel == 2)
-            {
-                st = s;
-                if (s[0] != '<')
-                {
-                    continue;
-                }
-                s = strchr(st, '>');
-                if (!s)
-                {
-                    continue;
-                }
-                int nVer = atoi(&st[1]);
-
-                if (nVer != SHADER_LIST_VER)
-                {
-                    if (nVer == SHADER_SERIALISE_VER)
-                    {
-                        bExportEntry = true;
-                    }
-                    else
-                    {
-                        continue;
-                    }
-                }
-                s++;
-            }
-            st = s;
-            s = strchr(s, '(');
-            char name[128];
-            if (s)
-            {
-                memcpy(name, st, s - st);
-                name[s - st] = 0;
-                cmb.Name = name;
-                s++;
-            }
-            else
-            {
-                continue;
-            }
-            uint32 nHW = 0;
-            cmb.Ident.m_GLMask = sGetGL(&s, cmb.Name, nHW);
-            if (cmb.Ident.m_GLMask == -1)
-            {
-                const char* szFileName = nameComb.c_str();
-                if (szFileName)
-                {
-                    iLog->Log("Error: Error in '%s' file (Line: %d)", szFileName, nLine);
-                }
-                else
-                {
-                    assert(!bFromFile);
-                    iLog->Log("Error: Error in non-file shader (Line: %d)", nLine);
-                }
-                sSkipLine(s);
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-                return;
-            }
-
-            ss = strchr(s, '(');
-            if (!ss)
-            {
-                sSkipLine(s);
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-                return;
-            }
-            s = ++ss;
-            cmb.Ident.m_RTMask = sGetFlag(&s, gRenDev->m_cEF.m_pGlobalExt);
-
-            ss = strchr(s, '(');
-            if (!ss)
-            {
-                sSkipLine(s);
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-                return;
-            }
-            s = ++ss;
-            cmb.Ident.m_LightMask = shGetHex(s);
-
-            ss = strchr(s, '(');
-            if (!ss)
-            {
-                sSkipLine(s);
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-                return;
-            }
-            s = ++ss;
-            cmb.Ident.m_MDMask = shGetHex(s);
-
-            ss = strchr(s, '(');
-            if (!ss)
-            {
-                sSkipLine(s);
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-                return;
-            }
-            s = ++ss;
-            cmb.Ident.m_MDVMask = shGetHex(s);
-
-            ss = strchr(s, '(');
-            if (!ss)
-            {
-                sSkipLine(s);
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-                return;
-            }
-            s = ss + 1;
-            cmb.Ident.m_pipelineState.opaque = shGetHex64(s);
-
-            ss = strchr(s, '(');
-            if (!ss)
-            {
-                sSkipLine(s);
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-                return;
-            }
-            s = ss + 1;
-            cmb.Ident.m_STMask = sGetFlag(&s, gRenDev->m_cEF.m_staticExt);
-
-            s = strchr(s, '(');
-            if (s)
-            {
-                s++;
-                cmb.eCL = CHWShader::mfStringClass(s);
-                assert (cmb.eCL < eHWSC_Num);
-            }
-            else
-            {
-                cmb.eCL = eHWSC_Num;
-            }
-            if constexpr (true || cmb.eCL < eHWSC_Num)
-            {
-                CCryNameR nm = CCryNameR(st);
-                if (bExportEntry)
-                {
-                    FXShaderCacheCombinationsItor it = m_ShaderCacheExportCombinations.find(nm);
-                    if (it == m_ShaderCacheExportCombinations.end())
-                    {
-                        cmb.CacheName = nm;
-                        m_ShaderCacheExportCombinations.insert(FXShaderCacheCombinationsItor::value_type(nm, cmb));
-                    }
-                }
-                else
-                {
-                    FXShaderCacheCombinationsItor it = Combinations->find(nm);
-                    if (it != Combinations->end())
-                    {
-                        //assert(false);
-                    }
-                    else
-                    {
-                        cmb.CacheName = nm;
-                        Combinations->insert(FXShaderCacheCombinationsItor::value_type(nm, cmb));
-                    }
-                    if (nHW)
-                    {
-                        for (int j = 0; j < 64; j++)
-                        {
-                            if (((uint64)1 << j) & nHW)
-                            {
-                                cmb.Ident.m_GLMask &= ~((uint64)1 << j);
-                                sIterateHW_r(Combinations, cmb, j + 1, nHW, name);
-                                cmb.Ident.m_GLMask |= ((uint64)1 << j);
-                                sIterateHW_r(Combinations, cmb, j + 1, nHW, name);
-                                cmb.Ident.m_GLMask &= ~((uint64)1 << j);
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                iLog->Log("Error: Error in '%s' file (Line: %d)", nameComb.c_str(), nLine);
-            }
-        }
-    }
-}
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-static void sResetDepend_r(SShaderGen* pGen, SShaderGenBit* pBit, SCacheCombination& cm)
-{
-    if (!pBit->m_DependResets.size())
-    {
-        return;
-    }
-    uint32 i, j;
-
-    for (i = 0; i < pBit->m_DependResets.size(); i++)
-    {
-        const char* c = pBit->m_DependResets[i].c_str();
-        for (j = 0; j < pGen->m_BitMask.Num(); j++)
-        {
-            SShaderGenBit* pBit1 = pGen->m_BitMask[j];
-            if (!azstricmp(pBit1->m_ParamName.c_str(), c))
-            {
-                cm.Ident.m_RTMask &= ~pBit1->m_Mask;
-                sResetDepend_r(pGen, pBit1, cm);
-                break;
-            }
-        }
-    }
-}
-
-static void sSetDepend_r(SShaderGen* pGen, SShaderGenBit* pBit, SCacheCombination& cm)
-{
-    if (!pBit->m_DependSets.size())
-    {
-        return;
-    }
-    uint32 i, j;
-
-    for (i = 0; i < pBit->m_DependSets.size(); i++)
-    {
-        const char* c = pBit->m_DependSets[i].c_str();
-        for (j = 0; j < pGen->m_BitMask.Num(); j++)
-        {
-            SShaderGenBit* pBit1 = pGen->m_BitMask[j];
-            if (!azstricmp(pBit1->m_ParamName.c_str(), c))
-            {
-                cm.Ident.m_RTMask |= pBit1->m_Mask;
-                sSetDepend_r(pGen, pBit1, cm);
-                break;
-            }
-        }
-    }
-}
-
-// Support for single light only
-static bool sIterateDL(DWORD& dwDL)
-{
-    int nLights = dwDL & 0xf;
-    int nType[4];
-    int i;
-
-    if (!nLights)
-    {
-        dwDL = 1;
-        return true;
-    }
-    for (i = 0; i < nLights; i++)
-    {
-        nType[i] = (dwDL >> (SLMF_LTYPE_SHIFT + (i * SLMF_LTYPE_BITS))) & ((1 << SLMF_LTYPE_BITS) - 1);
-    }
-    switch (nLights)
-    {
-    case 1:
-        if ((nType[0] & 3) < 2)
-        {
-            nType[0]++;
-        }
-        else
-        {
-            return false;
-        }
-        break;
-    case 2:
-        if ((nType[0] & 3) == SLMF_DIRECT)
-        {
-            nType[0] = SLMF_POINT;
-            nType[1] = SLMF_POINT;
-        }
-        else
-        {
-            nLights = 3;
-            nType[0] = SLMF_DIRECT;
-            nType[1] = SLMF_POINT;
-            nType[2] = SLMF_POINT;
-        }
-        break;
-    case 3:
-        if ((nType[0] & 3) == SLMF_DIRECT)
-        {
-            nType[0] = SLMF_POINT;
-            nType[1] = SLMF_POINT;
-            nType[2] = SLMF_POINT;
-        }
-        else
-        {
-            nLights = 4;
-            nType[0] = SLMF_DIRECT;
-            nType[1] = SLMF_POINT;
-            nType[2] = SLMF_POINT;
-            nType[3] = SLMF_POINT;
-        }
-        break;
-    case 4:
-        if ((nType[0] & 3) == SLMF_DIRECT)
-        {
-            nType[0] = SLMF_POINT;
-            nType[1] = SLMF_POINT;
-            nType[2] = SLMF_POINT;
-            nType[3] = SLMF_POINT;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    dwDL = nLights;
-    for (i = 0; i < nLights; i++)
-    {
-        dwDL |= nType[i] << (SLMF_LTYPE_SHIFT + i * SLMF_LTYPE_BITS);
-    }
-    return true;
-}
-
-/*static bool sIterateDL(DWORD& dwDL)
-{
-  int nLights = dwDL & 0xf;
-  int nType[4];
-  int i;
-
-  if (!nLights)
-  {
-    dwDL = 1;
-    return true;
-  }
-  for (i=0; i<nLights; i++)
-  {
-    nType[i] = (dwDL >> (SLMF_LTYPE_SHIFT + (i*SLMF_LTYPE_BITS))) & ((1<<SLMF_LTYPE_BITS)-1);
-  }
-  switch (nLights)
-  {
-  case 1:
-    if (!(nType[0] & SLMF_RAE_ENABLED))
-      nType[0] |= SLMF_RAE_ENABLED;
-    else
-      if (nType[0]<2)
-        nType[0]++;
-      else
-      {
-        nLights = 2;
-        nType[0] = SLMF_DIRECT;
-        nType[1] = SLMF_POINT;
-      }
-      break;
-  case 2:
-    if (!(nType[0] & SLMF_RAE_ENABLED))
-      nType[0] |= SLMF_RAE_ENABLED;
-    else
-      if (!(nType[1] & SLMF_RAE_ENABLED))
-        nType[1] |= SLMF_RAE_ENABLED;
-      else
-        if (nType[0] == SLMF_DIRECT)
-          nType[0] = SLMF_POINT;
-        else
-        {
-          nLights = 3;
-          nType[0] = SLMF_DIRECT;
-          nType[1] = SLMF_POINT;
-          nType[2] = SLMF_POINT;
-        }
-        break;
-  case 3:
-    if (!(nType[0] & SLMF_RAE_ENABLED))
-      nType[0] |= SLMF_RAE_ENABLED;
-    else
-      if (!(nType[1] & SLMF_RAE_ENABLED))
-        nType[1] |= SLMF_RAE_ENABLED;
-      else
-        if (!(nType[2] & SLMF_RAE_ENABLED))
-          nType[2] |= SLMF_RAE_ENABLED;
-        else
-          if (nType[0] == SLMF_DIRECT)
-            nType[0] = SLMF_POINT;
-          else
-          {
-            nLights = 4;
-            nType[0] = SLMF_DIRECT;
-            nType[1] = SLMF_POINT;
-            nType[2] = SLMF_POINT;
-            nType[3] = SLMF_POINT;
-          }
-          break;
-  case 4:
-    if (!(nType[0] & SLMF_RAE_ENABLED))
-      nType[0] |= SLMF_RAE_ENABLED;
-    else
-      if (!(nType[1] & SLMF_RAE_ENABLED))
-        nType[1] |= SLMF_RAE_ENABLED;
-      else
-        if (!(nType[2] & SLMF_RAE_ENABLED))
-          nType[2] |= SLMF_RAE_ENABLED;
-        else
-          if (!(nType[3] & SLMF_RAE_ENABLED))
-            nType[3] |= SLMF_RAE_ENABLED;
-          else
-            if (nType[0] == SLMF_DIRECT)
-              nType[0] = SLMF_POINT;
-            else
-              return false;
-  }
-  dwDL = nLights;
-  for (i=0; i<nLights; i++)
-  {
-    dwDL |= nType[i] << (SLMF_LTYPE_SHIFT + i*SLMF_LTYPE_BITS);
-  }
-  return true;
-}*/
-
-void CShaderMan::mfAddLTCombination(SCacheCombination* cmb, FXShaderCacheCombinations& CmbsMapDst, DWORD dwL)
-{
-    char str[1024];
-    char sLT[64];
-
-    SCacheCombination cm;
-    cm = *cmb;
-    cm.Ident.m_LightMask = dwL;
-
-    const char* c = strchr(cmb->CacheName.c_str(), ')');
-    c = strchr(&c[1], ')');
-    int len = (int)(c - cmb->CacheName.c_str() + 1);
-    assert(len < sizeof(str));
-    cry_strcpy(str, cmb->CacheName.c_str(), len);
-    cry_strcat(str, "(");
-    azsprintf(sLT, "%x", (uint32)dwL);
-    cry_strcat(str, sLT);
-    c = strchr(&c[2], ')');
-    cry_strcat(str, c);
-    CCryNameR nm = CCryNameR(str);
-    cm.CacheName = nm;
-    FXShaderCacheCombinationsItor it = CmbsMapDst.find(nm);
-    if (it == CmbsMapDst.end())
-    {
-        CmbsMapDst.insert(FXShaderCacheCombinationsItor::value_type(nm, cm));
-    }
-}
-
-void CShaderMan::mfAddLTCombinations(SCacheCombination* cmb, FXShaderCacheCombinations& CmbsMapDst)
-{
-    if (!CRenderer::CV_r_shadersprecachealllights)
-    {
-        return;
-    }
-
-    DWORD dwL = 0; // 0 lights
-    bool bRes = false;
-    do
-    {
-        // !HACK: Do not iterate multiple lights for low spec
-        if ((cmb->Ident.m_RTMask & (g_HWSR_MaskBit[HWSR_QUALITY] | g_HWSR_MaskBit[HWSR_QUALITY1])) || (dwL & 0xf) <= 1)
-        {
-            mfAddLTCombination(cmb, CmbsMapDst, dwL);
-        }
-        bRes = sIterateDL(dwL);
-    } while (bRes);
-}
-
-
-void CShaderMan::mfAddRTCombination_r(int nComb, FXShaderCacheCombinations& CmbsMapDst, SCacheCombination* cmb, CHWShader* pSH, bool bAutoPrecache)
-{
-    uint32 i, j, n;
-    uint32 dwType = pSH->m_dwShaderType;
-    if (!dwType)
-    {
-        return;
-    }
-    for (i = nComb; i < m_pGlobalExt->m_BitMask.Num(); i++)
-    {
-        SShaderGenBit* pBit = m_pGlobalExt->m_BitMask[i];
-        if (bAutoPrecache && !(pBit->m_Flags & (SHGF_AUTO_PRECACHE | SHGF_LOWSPEC_AUTO_PRECACHE)))
-        {
-            continue;
-        }
-
-        // Precache this flag on low-spec only
-        if (pBit->m_Flags & SHGF_LOWSPEC_AUTO_PRECACHE)
-        {
-            if (cmb->Ident.m_RTMask & (g_HWSR_MaskBit[HWSR_QUALITY] | g_HWSR_MaskBit[HWSR_QUALITY1]))
-            {
-                continue;
-            }
-        }
-        // Only in runtime used
-        if (pBit->m_Flags & SHGF_RUNTIME)
-        {
-            continue;
-        }
-        for (n = 0; n < pBit->m_PrecacheNames.size(); n++)
-        {
-            if (pBit->m_PrecacheNames[n] == dwType)
-            {
-                break;
-            }
-        }
-        if (n < pBit->m_PrecacheNames.size())
-        {
-            SCacheCombination cm;
-            cm = *cmb;
-            cm.Ident.m_RTMask &= ~pBit->m_Mask;
-            cm.Ident.m_RTMask |= (pBit->m_Mask ^ cmb->Ident.m_RTMask) & pBit->m_Mask;
-            if (!bAutoPrecache)
-            {
-                uint64 nBitSet = pBit->m_Mask & cmb->Ident.m_RTMask;
-                if (nBitSet)
-                {
-                    sSetDepend_r(m_pGlobalExt, pBit, cm);
-                }
-                else
-                {
-                    sResetDepend_r(m_pGlobalExt, pBit, cm);
-                }
-            }
-
-            char str[1024];
-            const char* c = strchr(cmb->CacheName.c_str(), '(');
-            const size_t len = (size_t)(c - cmb->CacheName.c_str());
-            cry_strcpy(str, cmb->CacheName.c_str(), len);
-            const char* c1 = strchr(&c[1], '(');
-            cry_strcat(str, c, (size_t)(c1 - c));
-            cry_strcat(str, "(");
-            SShaderGen* pG = m_pGlobalExt;
-            stack_string sRT;
-            for (j = 0; j < pG->m_BitMask.Num(); j++)
-            {
-                SShaderGenBit* pBit2 = pG->m_BitMask[j];
-                if (pBit2->m_Mask & cm.Ident.m_RTMask)
-                {
-                    if (!sRT.empty())
-                    {
-                        sRT += "|";
-                    }
-                    sRT += pBit2->m_ParamName.c_str();
-                }
-            }
-            cry_strcat(str, sRT.c_str());
-            c1 = strchr(&c1[1], ')');
-            cry_strcat(str, c1);
-            CCryNameR nm = CCryNameR(str);
-            cm.CacheName = nm;
-            // HACK: don't allow unsupported quality mode
-            uint64 nQMask = g_HWSR_MaskBit[HWSR_QUALITY] | g_HWSR_MaskBit[HWSR_QUALITY1];
-            if ((cm.Ident.m_RTMask & nQMask) != nQMask)
-            {
-                FXShaderCacheCombinationsItor it = CmbsMapDst.find(nm);
-                if (it == CmbsMapDst.end())
-                {
-                    CmbsMapDst.insert(FXShaderCacheCombinationsItor::value_type(nm, cm));
-                }
-            }
-            if (pSH->m_Flags & (HWSG_SUPPORTS_MULTILIGHTS | HWSG_SUPPORTS_LIGHTING))
-            {
-                mfAddLTCombinations(&cm, CmbsMapDst);
-            }
-            mfAddRTCombination_r(i + 1, CmbsMapDst, &cm, pSH, bAutoPrecache);
-        }
-    }
-}
-
-void CShaderMan::mfAddRTCombinations(FXShaderCacheCombinations& CmbsMapSrc, FXShaderCacheCombinations& CmbsMapDst, CHWShader* pSH, bool bListOnly)
-{
-    if (pSH->m_nFrameLoad == gRenDev->GetFrameID())
-    {
-        return;
-    }
-    pSH->m_nFrameLoad = gRenDev->GetFrameID();
-    uint32 dwType = pSH->m_dwShaderType;
-    if (!dwType)
-    {
-        return;
-    }
-    const char* str2 = pSH->mfGetEntryName();
-    FXShaderCacheCombinationsItor itor;
-    for (itor = CmbsMapSrc.begin(); itor != CmbsMapSrc.end(); itor++)
-    {
-        SCacheCombination* cmb = &itor->second;
-        const char* c = strchr(cmb->Name.c_str(), '@');
-        if (!c)
-        {
-            c = strchr(cmb->Name.c_str(), '/');
-        }
-        assert(c);
-        if (!c)
-        {
-            continue;
-        }
-        if (azstricmp(&c[1], str2))
-        {
-            continue;
-        }
-        /*if (!azstricmp(str2, "MetalReflVS"))
-        {
-          if (cmb->nGL == 0x1093)
-          {
-            int nnn = 0;
-          }
-        }*/
-        if (bListOnly)
-        {
-            if (pSH->m_Flags & (HWSG_SUPPORTS_MULTILIGHTS | HWSG_SUPPORTS_LIGHTING))
-            {
-                mfAddLTCombinations(cmb, CmbsMapDst);
-            }
-            mfAddRTCombination_r(0, CmbsMapDst, cmb, pSH, true);
-        }
-        else
-        {
-            mfAddRTCombination_r(0, CmbsMapDst, cmb, pSH, false);
-        }
-    }
-}
-#endif // CONSOLE
-
-void GenerateMaskString(SShaderGen* shaderInfo, uint64 mask, stack_string& maskStr)
-{
-    if (!shaderInfo || !mask)
-    {
-        return;
-    }
-
-    for (unsigned i = 0; i < shaderInfo->m_BitMask.Num(); ++i)
-    {
-        SShaderGenBit* pBit = shaderInfo->m_BitMask[i];
-        if (pBit->m_Mask & mask)
-        {
-            if (!maskStr.empty())
-            {
-                maskStr += "|";
-            }
-            maskStr += pBit->m_ParamName.c_str();
-        }
-    }
-}
-
-
-void CShaderMan::mfInsertNewCombination(SShaderCombIdent& Ident, EHWShaderClass eCL, const char* name, int nID, string* Str, byte bStore)
-{
-    char str[2048];
-    if (!m_FPCacheCombinations[nID] && bStore)
-    {
-        return;
-    }
-
-    stack_string sGL;
-    stack_string sRT;
-    stack_string staticMask;
-    uint32 i, j;
-    SShaderGenComb* c = NULL;
-    if (Ident.m_GLMask)
-    {
-        const char* m = strchr(name, '@');
-        if (!m)
-        {
-            m = strchr(name, '/');
-        }
-        assert(m);
-        char nmFX[128];
-        if (m)
-        {
-            cry_strcpy(nmFX, name, (size_t)(m - name));
-            c = mfGetShaderGenInfo(nmFX);
-            if (c && c->pGen && c->pGen->m_BitMask.Num())
-            {
-                SShaderGen* pG = c->pGen;
-                for (i = 0; i < 64; i++)
-                {
-                    if (Ident.m_GLMask & ((uint64)1 << i))
-                    {
-                        for (j = 0; j < pG->m_BitMask.Num(); j++)
-                        {
-                            SShaderGenBit* pBit = pG->m_BitMask[j];
-                            if (pBit->m_Mask & (Ident.m_GLMask & ((uint64)1 << i)))
-                            {
-                                if (!sGL.empty())
-                                {
-                                    sGL += "|";
-                                }
-                                sGL += pBit->m_ParamName.c_str();
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    GenerateMaskString(m_pGlobalExt, Ident.m_RTMask, sRT);
-    GenerateMaskString(m_staticExt, Ident.m_STMask, staticMask);
-
-    uint32 nLT = Ident.m_LightMask;
-    if (bStore == 1 && Ident.m_LightMask)
-    {
-        nLT = 1;
-    }
-    azsprintf(str, "<%d>%s(%s)(%s)(%x)(%x)(%x)(%llx)(%s)(%s)", SHADER_LIST_VER, name, sGL.c_str(), sRT.c_str(), nLT, Ident.m_MDMask, Ident.m_MDVMask, Ident.m_pipelineState.opaque, staticMask.c_str(), CHWShader::mfClassString(eCL));
-    if (!bStore)
-    {
-        if (Str)
-        {
-            *Str = str;
-        }
-        return;
-    }
-    CCryNameR nm;
-    if (str[0] == '<' && str[2] == '>')
-    {
-        nm = CCryNameR(&str[3]);
-    }
-    else
-    {
-        nm = CCryNameR(str);
-    }
-    FXShaderCacheCombinationsItor it = m_ShaderCacheCombinations[nID].find(nm);
-    if (it != m_ShaderCacheCombinations[nID].end())
-    {
-        return;
-    }
-    SCacheCombination cmb;
-    cmb.Name = name;
-    cmb.CacheName = nm;
-    cmb.Ident = Ident;
-    cmb.eCL = eCL;
-    {
-        stack_string nameOut;
-        mfGetShaderListPath(nameOut, nID);
-
-        static CryCriticalSection s_cResLock;
-        AUTO_LOCK(s_cResLock); // Not thread safe without this
-
-        if (m_FPCacheCombinations[nID])
-        {
-            m_ShaderCacheCombinations[nID].insert(FXShaderCacheCombinationsItor::value_type(nm, cmb));
-            gEnv->pCryPak->FPrintf(m_FPCacheCombinations[nID], "%s\n", str);
-            gEnv->pCryPak->FFlush(m_FPCacheCombinations[nID]);
-        }
-    }
-    if (Str)
-    {
-        *Str = str;
-    }
-}
-
-inline bool sCompareComb(const SCacheCombination& a, const SCacheCombination& b)
-{
-    int32 dif;
-
-    char shader1[128], shader2[128];
-    char* tech1 = NULL, * tech2 = NULL;
-    azstrcpy(shader1, 128, a.Name.c_str());
-    azstrcpy(shader2, 128, b.Name.c_str());
-    char* c = strchr(shader1, '@');
-    if (!c)
-    {
-        c = strchr(shader1, '/');
-    }
-    //assert(c);
-    if (c)
-    {
-        *c = 0;
-        tech1 = c + 1;
-    }
-    c = strchr(shader2, '@');
-    if (!c)
-    {
-        c = strchr(shader2, '/');
-    }
-    //assert(c);
-    if (c)
-    {
-        *c = 0;
-        tech2 = c + 1;
-    }
-
-    dif = azstricmp(shader1, shader2);
-    if (dif != 0)
-    {
-        return dif < 0;
-    }
-
-    if (tech1 == NULL && tech2 != NULL)
-    {
-        return true;
-    }
-    if (tech1 != NULL && tech2 == NULL)
-    {
-        return false;
-    }
-
-    if (tech1 != NULL && tech2 != NULL)
-    {
-        dif = azstricmp(tech1, tech2);
-        if (dif != 0)
-        {
-            return dif < 0;
-        }
-    }
-
-    if (a.Ident.m_GLMask != b.Ident.m_GLMask)
-    {
-        return a.Ident.m_GLMask < b.Ident.m_GLMask;
-    }
-
-    if (a.Ident.m_STMask != b.Ident.m_STMask)
-    {
-        return a.Ident.m_STMask < b.Ident.m_STMask;
-    }
-
-    if (a.Ident.m_RTMask != b.Ident.m_RTMask)
-    {
-        return a.Ident.m_RTMask < b.Ident.m_RTMask;
-    }
-
-    if (a.Ident.m_pipelineState.opaque != b.Ident.m_pipelineState.opaque)
-    {
-        return a.Ident.m_pipelineState.opaque < b.Ident.m_pipelineState.opaque;
-    }
-
-    if (a.Ident.m_FastCompare1 != b.Ident.m_FastCompare1)
-    {
-        return a.Ident.m_FastCompare1 < b.Ident.m_FastCompare1;
-    }
-
-    if (a.Ident.m_FastCompare2 != b.Ident.m_FastCompare2)
-    {
-        return a.Ident.m_FastCompare2 < b.Ident.m_FastCompare2;
-    }
-
-    return false;
-}
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-
-void CShaderMan::AddGLCombinations(CShader* pSH, std::vector<SCacheCombination>& CmbsGL)
-{
-    int i, j;
-    uint64 nMask = 0;
-    if (pSH->m_pGenShader)
-    {
-        SShaderGen* pG = pSH->m_pGenShader->m_ShaderGenParams;
-        for (i = 0; i < pG->m_BitMask.size(); i++)
-        {
-            SShaderGenBit* pB = pG->m_BitMask[i];
-            SCacheCombination cc;
-            cc.Name = pB->m_ParamName;
-            for (j = 0; j < m_pGlobalExt->m_BitMask.size(); j++)
-            {
-                SShaderGenBit* pB1 = m_pGlobalExt->m_BitMask[j];
-                if (pB1->m_ParamName == pB->m_ParamName)
-                {
-                    nMask |= pB1->m_Mask;
-                    break;
-                }
-            }
-        }
-    }
-    else
-    {
-        SCacheCombination cc;
-        cc.Ident.m_GLMask = 0;
-        CmbsGL.push_back(cc);
-    }
-}
-
-void CShaderMan::AddGLCombination(FXShaderCacheCombinations& CmbsMap, SCacheCombination& cmb)
-{
-    char str[1024];
-    const char* st = cmb.CacheName.c_str();
-    if (st[0] == '<')
-    {
-        st += 3;
-    }
-    const char* s = strchr(st, '@');
-    char name[128];
-    if (!s)
-    {
-        s = strchr(st, '/');
-    }
-    if (s)
-    {
-        memcpy(name, st, s - st);
-        name[s - st] = 0;
-    }
-    else
-    {
-        azstrcpy(name, 128, st);
-    }
-#ifdef __GNUC__
-    sprintf(str, "%s(%llx)(%x)(%x)", name, cmb.Ident.m_GLMask, cmb.Ident.m_MDMask, cmb.Ident.m_MDVMask);
-#else
-    azsprintf(str, "%s(%I64x)(%x)(%x)", name, cmb.Ident.m_GLMask, cmb.Ident.m_MDMask, cmb.Ident.m_MDVMask);
-#endif
-    CCryNameR nm = CCryNameR(str);
-    FXShaderCacheCombinationsItor it = CmbsMap.find(nm);
-    if (it == CmbsMap.end())
-    {
-        cmb.CacheName = nm;
-        cmb.Name = nm;
-        CmbsMap.insert(FXShaderCacheCombinationsItor::value_type(nm, cmb));
-    }
-}
-
-void CShaderMan::AddCombination(SCacheCombination& cmb,  FXShaderCacheCombinations& CmbsMap, [[maybe_unused]] CHWShader* pHWS)
-{
-    char str[2048];
-    azsprintf(str, "%s(%llx)(%llx)(%d)(%d)(%d)(%llx)(%llx)", cmb.Name.c_str(), cmb.Ident.m_GLMask, cmb.Ident.m_RTMask, cmb.Ident.m_LightMask, cmb.Ident.m_MDMask, cmb.Ident.m_MDVMask, cmb.Ident.m_pipelineState.opaque, cmb.Ident.m_STMask);
-    CCryNameR nm = CCryNameR(str);
-    FXShaderCacheCombinationsItor it = CmbsMap.find(nm);
-    if (it == CmbsMap.end())
-    {
-        cmb.CacheName = nm;
-        CmbsMap.insert(FXShaderCacheCombinationsItor::value_type(nm, cmb));
-    }
-}
-
-void CShaderMan::AddLTCombinations(SCacheCombination& cmb, FXShaderCacheCombinations& CmbsMap, CHWShader* pHWS)
-{
-    assert(pHWS->m_Flags & HWSG_SUPPORTS_LIGHTING);
-
-    // Just single light support
-
-    // Directional light
-    cmb.Ident.m_LightMask = 1;
-    AddCombination(cmb, CmbsMap, pHWS);
-
-    // Point light
-    cmb.Ident.m_LightMask = 0x101;
-    AddCombination(cmb, CmbsMap, pHWS);
-
-    // Projected light
-    cmb.Ident.m_LightMask = 0x201;
-    AddCombination(cmb, CmbsMap, pHWS);
-}
-
-void CShaderMan::AddRTCombinations(FXShaderCacheCombinations& CmbsMap, CHWShader* pHWS, CShader* pSH, FXShaderCacheCombinations* Combinations)
-{
-    SCacheCombination cmb;
-
-    uint32 nType = pHWS->m_dwShaderType;
-
-    uint32 i, j;
-    SShaderGen* pGen = m_pGlobalExt;
-    int nBits = 0;
-
-    uint32 nBitsPlatform = 0;
-    if (CParserBin::m_nPlatform == SF_ORBIS)
-    {
-        nBitsPlatform |= SHGD_HW_ORBIS;
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_D3D11)
-    {
-        nBitsPlatform |= SHGD_HW_DX11;
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_GL4)
-    {
-        nBitsPlatform |= SHGD_HW_GL4;
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_GLES3)
-    {
-        nBitsPlatform |= SHGD_HW_GLES3;
-    }
-    // Confetti Nicholas Baldwin: adding metal shader language support
-    else
-    if (CParserBin::m_nPlatform == SF_METAL)
-    {
-        nBitsPlatform |= SHGD_HW_METAL;
-    }
-
-    uint64 BitMask[64];
-    memset(BitMask, 0, sizeof(BitMask));
-
-    // Make a mask of flags affected by this type of shader
-    uint64 nRTMask = 0;
-    uint64 nSetMask = 0;
-
-    if (nType)
-    {
-        for (i = 0; i < pGen->m_BitMask.size(); i++)
-        {
-            SShaderGenBit* pBit = pGen->m_BitMask[i];
-            if (!pBit->m_Mask)
-            {
-                continue;
-            }
-            if (pBit->m_Flags & SHGF_RUNTIME)
-            {
-                continue;
-            }
-            if (nBitsPlatform & pBit->m_nDependencyReset)
-            {
-                continue;
-            }
-            for (j = 0; j < pBit->m_PrecacheNames.size(); j++)
-            {
-                if (pBit->m_PrecacheNames[j] == nType)
-                {
-                    if (nBitsPlatform & pBit->m_nDependencySet)
-                    {
-                        nSetMask |= pBit->m_Mask;
-                        continue;
-                    }
-                    BitMask[nBits++] = pBit->m_Mask;
-                    nRTMask |= pBit->m_Mask;
-                    break;
-                }
-            }
-        }
-    }
-    if (nBits > 10)
-    {
-        CryLog("WARNING: Number of runtime bits for shader '%s' - %d: exceed 10 (too many combinations will be produced)...", pHWS->GetName(), nBits);
-    }
-    if (nBits > 30)
-    {
-        CryLog("Error: Ignore...");
-        return;
-    }
-
-    cmb.eCL = pHWS->m_eSHClass;
-    string szName = string(pSH->GetName());
-    szName += string("@") + string(pHWS->m_EntryFunc.c_str());
-    cmb.Name = szName;
-    cmb.Ident.m_GLMask = pHWS->m_nMaskGenShader;
-
-    // For unknown shader type just add combinations from the list
-    if (!nType)
-    {
-        FXShaderCacheCombinationsItor itor;
-        for (itor = Combinations->begin(); itor != Combinations->end(); itor++)
-        {
-            SCacheCombination* c = &itor->second;
-            if (c->Name == cmb.Name && c->Ident.m_GLMask == pHWS->m_nMaskGenFX)
-            {
-                cmb = *c;
-                AddCombination(cmb, CmbsMap, pHWS);
-            }
-        }
-        return;
-    }
-
-    cmb.Ident.m_LightMask = 0;
-    cmb.Ident.m_MDMask = 0;
-    cmb.Ident.m_MDVMask = 0;
-    cmb.Ident.m_RTMask = 0;
-    cmb.Ident.m_STMask = 0;
-
-    int nIterations = 1 << nBits;
-    for (i = 0; i < nIterations; i++)
-    {
-        cmb.Ident.m_RTMask = nSetMask;
-        cmb.Ident.m_LightMask = 0;
-        for (j = 0; j < nBits; j++)
-        {
-            if ((1 << j) & i)
-            {
-                cmb.Ident.m_RTMask |= BitMask[j];
-            }
-        }
-        /*if (cmb.nRT == 0x40002)
-        {
-          int nnn = 0;
-        }*/
-        AddCombination(cmb, CmbsMap, pHWS);
-        if (pHWS->m_Flags & HWSG_SUPPORTS_LIGHTING)
-        {
-            AddLTCombinations(cmb, CmbsMap, pHWS);
-        }
-    }
-}
-
-void CShaderMan::_PrecacheShaderList(bool bStatsOnly)
-{
-    float t0 = gEnv->pTimer->GetAsyncCurTime();
-
-    if (!m_pGlobalExt)
-    {
-        return;
-    }
-
-    m_eCacheMode = eSC_BuildGlobalList;
-
-    uint32 nSaveFeatures = gRenDev->m_Features;
-    int nAsync = CRenderer::CV_r_shadersasynccompiling;
-    if (nAsync != 3)
-    {
-        CRenderer::CV_r_shadersasynccompiling = 0;
-    }
-
-    // Command line shaders precaching
-    gRenDev->m_Features |= RFT_HW_SM20 | RFT_HW_SM2X | RFT_HW_SM30;
-    m_bActivatePhase = false;
-    FXShaderCacheCombinations* Combinations = &m_ShaderCacheCombinations[0];
-
-    std::vector<SCacheCombination> Cmbs;
-    std::vector<SCacheCombination> CmbsRT;
-    FXShaderCacheCombinations CmbsMap;
-    char str1[128], str2[128];
-
-    // Extract global combinations only (including MD and MDV)
-    for (FXShaderCacheCombinationsItor itor = Combinations->begin(); itor != Combinations->end(); itor++)
-    {
-        SCacheCombination* cmb = &itor->second;
-        FXShaderCacheCombinationsItor it = CmbsMap.find(cmb->CacheName);
-        if (it == CmbsMap.end())
-        {
-            CmbsMap.insert(FXShaderCacheCombinationsItor::value_type(cmb->CacheName, *cmb));
-        }
-    }
-    for (FXShaderCacheCombinationsItor itor = CmbsMap.begin(); itor != CmbsMap.end(); itor++)
-    {
-        SCacheCombination* cmb = &itor->second;
-        Cmbs.push_back(*cmb);
-    }
-
-    mfExportShaders();
-
-    int nEmpty = 0;
-    int nProcessed = 0;
-    int nCompiled = 0;
-    int nMaterialCombinations = 0;
-
-    if (Cmbs.size() >= 1)
-    {
-        std::stable_sort(Cmbs.begin(), Cmbs.end(), sCompareComb);
-
-        nMaterialCombinations = Cmbs.size();
-
-        m_nCombinationsProcess = Cmbs.size();
-        m_bReload = true;
-        m_nCombinationsCompiled = 0;
-        m_nCombinationsEmpty = 0;
-        for (int i = 0; i < Cmbs.size(); i++)
-        {
-            SCacheCombination* cmb = &Cmbs[i];
-            azstrcpy(str1, 128, cmb->Name.c_str());
-            char* c = strchr(str1, '@');
-            if (!c)
-            {
-                c = strchr(str1, '/');
-            }
-            //assert(c);
-            if (c)
-            {
-                *c = 0;
-                m_szShaderPrecache = &c[1];
-            }
-            else
-            {
-                c = strchr(str1, '(');
-                if (c)
-                {
-                    *c = 0;
-                    m_szShaderPrecache = "";
-                }
-            }
-            gRenDev->m_RP.m_FlagsShader_RT = 0;
-            gRenDev->m_RP.m_FlagsShader_LT = 0;
-            gRenDev->m_RP.m_FlagsShader_MD = 0;
-            gRenDev->m_RP.m_FlagsShader_MDV = 0;
-            m_staticFlags = cmb->Ident.m_STMask;
-            CShader* pSH = CShaderMan::mfForName(str1, 0, NULL, cmb->Ident.m_GLMask);
-
-            gRenDev->m_RP.m_pShader = pSH;
-            assert(gRenDev->m_RP.m_pShader != 0);
-
-            std::vector<SCacheCombination>* pCmbs = &Cmbs;
-            FXShaderCacheCombinations CmbsMapRTSrc;
-            FXShaderCacheCombinations CmbsMapRTDst;
-
-            for (int m = 0; m < pSH->m_HWTechniques.Num(); m++)
-            {
-                SShaderTechnique* pTech = pSH->m_HWTechniques[m];
-                for (int n = 0; n < pTech->m_Passes.Num(); n++)
-                {
-                    SShaderPass* pPass = &pTech->m_Passes[n];
-                    if (pPass->m_PShader)
-                    {
-                        pPass->m_PShader->m_nFrameLoad = -10;
-                    }
-                    if (pPass->m_VShader)
-                    {
-                        pPass->m_VShader->m_nFrameLoad = -10;
-                    }
-                }
-            }
-
-            for (; i < Cmbs.size(); i++)
-            {
-                SCacheCombination* cmba = &Cmbs[i];
-                azstrcpy(str2, 128, cmba->Name.c_str());
-                c = strchr(str2, '@');
-                if (!c)
-                {
-                    c = strchr(str2, '/');
-                }
-                assert(c);
-                if (c)
-                {
-                    *c = 0;
-                }
-                if (azstricmp(str1, str2) || cmb->Ident.m_GLMask != cmba->Ident.m_GLMask || cmb->Ident.m_STMask != cmba->Ident.m_STMask)
-                {
-                    break;
-                }
-                CmbsMapRTSrc.insert(FXShaderCacheCombinationsItor::value_type(cmba->CacheName, *cmba));
-            }
-            // surrounding for(;;i++) will increment this again
-            i--;
-            m_nCombinationsProcess -= CmbsMapRTSrc.size();
-
-            for (FXShaderCacheCombinationsItor itor = CmbsMapRTSrc.begin(); itor != CmbsMapRTSrc.end(); itor++)
-            {
-                SCacheCombination* cmb2 = &itor->second;
-                azstrcpy(str2, 128, cmb2->Name.c_str());
-                FXShaderCacheCombinationsItor it = CmbsMapRTDst.find(cmb2->CacheName);
-                if (it == CmbsMapRTDst.end())
-                {
-                    CmbsMapRTDst.insert(FXShaderCacheCombinationsItor::value_type(cmb2->CacheName, *cmb2));
-                }
-            }
-
-            for (int m = 0; m < pSH->m_HWTechniques.Num(); m++)
-            {
-                SShaderTechnique* pTech = pSH->m_HWTechniques[m];
-                for (int n = 0; n < pTech->m_Passes.Num(); n++)
-                {
-                    SShaderPass* pPass = &pTech->m_Passes[n];
-                    if (pPass->m_PShader)
-                    {
-                        mfAddRTCombinations(CmbsMapRTSrc, CmbsMapRTDst, pPass->m_PShader, true);
-                    }
-                    if (pPass->m_VShader)
-                    {
-                        mfAddRTCombinations(CmbsMapRTSrc, CmbsMapRTDst, pPass->m_VShader, true);
-                    }
-                }
-            }
-
-            CmbsRT.clear();
-            for (FXShaderCacheCombinationsItor itor = CmbsMapRTDst.begin(); itor != CmbsMapRTDst.end(); itor++)
-            {
-                SCacheCombination* cmb2 = &itor->second;
-                CmbsRT.push_back(*cmb2);
-            }
-            pCmbs = &CmbsRT;
-            m_nCombinationsProcessOverall = CmbsRT.size();
-            m_nCombinationsProcess = 0;
-
-            CmbsMapRTDst.clear();
-            CmbsMapRTSrc.clear();
-            uint32 nFlags = HWSF_PRECACHE | HWSF_STOREDATA;
-            if (bStatsOnly)
-            {
-                nFlags |= HWSF_FAKE;
-            }
-            for (int jj = 0; jj < pCmbs->size(); jj++)
-            {
-                m_nCombinationsProcess++;
-                SCacheCombination* cmba = &(*pCmbs)[jj];
-                c = (char*)strchr(cmba->Name.c_str(), '@');
-                if (!c)
-                {
-                    c = (char*)strchr(cmba->Name.c_str(), '/');
-                }
-                assert(c);
-                if (!c)
-                {
-                    continue;
-                }
-                m_szShaderPrecache = &c[1];
-                for (int m = 0; m < pSH->m_HWTechniques.Num(); m++)
-                {
-                    SShaderTechnique* pTech = pSH->m_HWTechniques[m];
-                    for (int n = 0; n < pTech->m_Passes.Num(); n++)
-                    {
-                        SShaderPass* pPass = &pTech->m_Passes[n];
-                        gRenDev->m_RP.m_FlagsShader_RT = cmba->Ident.m_RTMask;
-                        gRenDev->m_RP.m_FlagsShader_LT = cmba->Ident.m_LightMask;
-                        gRenDev->m_RP.m_FlagsShader_MD = cmba->Ident.m_MDMask;
-                        gRenDev->m_RP.m_FlagsShader_MDV = cmba->Ident.m_MDVMask;
-                        // Adjust some flags for low spec
-                        CHWShader* shaders[] = { pPass->m_PShader, pPass->m_VShader };
-                        for (int i2 = 0; i2 < 2; i2++)
-                        {
-                            CHWShader* shader = shaders[i2];
-                            if (shader && (!m_szShaderPrecache || !azstricmp(m_szShaderPrecache, shader->m_EntryFunc.c_str()) != 0))
-                            {
-                                uint64 nFlagsOrigShader_RT = gRenDev->m_RP.m_FlagsShader_RT & shader->m_nMaskAnd_RT | shader->m_nMaskOr_RT;
-                                uint64 nFlagsOrigShader_GL = shader->m_nMaskGenShader;
-                                uint32 nFlagsOrigShader_LT = gRenDev->m_RP.m_FlagsShader_LT;
-
-                                shader->mfSetV(nFlags);
-
-                                if (nFlagsOrigShader_RT != gRenDev->m_RP.m_FlagsShader_RT || nFlagsOrigShader_GL != shader->m_nMaskGenShader || nFlagsOrigShader_LT != gRenDev->m_RP.m_FlagsShader_LT)
-                                {
-                                    m_nCombinationsEmpty++;
-                                    if (!bStatsOnly)
-                                    {
-                                        shader->mfAddEmptyCombination(pSH, nFlagsOrigShader_RT, nFlagsOrigShader_GL, nFlagsOrigShader_LT);
-                                    }
-                                    shader->m_nMaskGenShader = nFlagsOrigShader_GL;
-                                }
-                            }
-                        }
-
-                        if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_GL4)
-                        {
-                            CHWShader* d3d11Shaders[] = { pPass->m_GShader, pPass->m_HShader, pPass->m_CShader, pPass->m_DShader };
-                            for (int i2 = 0; i2 < 4; i2++)
-                            {
-                                CHWShader* shader = d3d11Shaders[i2];
-                                if (shader && (!m_szShaderPrecache || !azstricmp(m_szShaderPrecache, shader->m_EntryFunc.c_str()) != 0))
-                                {
-                                    shader->mfSetV(nFlags);
-                                }
-                            }
-                        }
-
-                        if (bStatsOnly)
-                        {
-                            static int nLastCombs = 0;
-                            if (m_nCombinationsCompiled != nLastCombs && !(m_nCombinationsCompiled & 0x7f))
-                            {
-                                nLastCombs = m_nCombinationsCompiled;
-                                CryLog("-- Processed: %d, Compiled: %d, Referenced (Empty): %d...", m_nCombinationsProcess, m_nCombinationsCompiled, m_nCombinationsEmpty);
-                            }
-                        }
-#ifdef WIN32
-                        if (!m_bActivatePhase)
-                        {
-                            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
-                        }
-#endif
-                    }
-                }
-                pSH->mfFlushPendedShaders();
-                iLog->Update();
-                IRenderer* pRenderer = gEnv->pRenderer;
-                if (pRenderer)
-                {
-                    pRenderer->FlushRTCommands(true, true, true);
-                }
-            }
-
-            pSH->mfFlushCache();
-
-            // HACK HACK HACK:
-            // should be bigger than 0, but could cause issues right now when checking for RT
-            // combinations when no shadertype is defined and the previous shader line
-            // was still async compiling -- needs fix in HWShader for m_nMaskGenFX
-            CHWShader::mfFlushPendedShadersWait(0);
-            if (!m_bActivatePhase)
-            {
-                SAFE_RELEASE(pSH);
-            }
-
-            nProcessed += m_nCombinationsProcess;
-            nCompiled += m_nCombinationsCompiled;
-            nEmpty += m_nCombinationsEmpty;
-
-            m_nCombinationsProcess = 0;
-            m_nCombinationsCompiled = 0;
-            m_nCombinationsEmpty = 0;
-        }
-    }
-    CHWShader::mfFlushPendedShadersWait(-1);
-
-
-    // Optimise shader resources
-    SOptimiseStats Stats;
-    for (FXShaderCacheNamesItor it = CHWShader::m_ShaderCacheList.begin(); it != CHWShader::m_ShaderCacheList.end(); it++)
-    {
-        const char* szName = it->first.c_str();
-        SShaderCache* c = CHWShader::mfInitCache(szName, NULL, false, it->second, false);
-        if (c)
-        {
-            SOptimiseStats _Stats;
-            CHWShader::mfOptimiseCacheFile(c, false, &_Stats);
-            Stats.nEntries += _Stats.nEntries;
-            Stats.nUniqueEntries += _Stats.nUniqueEntries;
-            Stats.nSizeCompressed += _Stats.nSizeCompressed;
-            Stats.nSizeUncompressed += _Stats.nSizeUncompressed;
-            Stats.nTokenDataSize += _Stats.nTokenDataSize;
-        }
-        c->Release();
-    }
-
-    CHWShader::m_ShaderCacheList.clear();
-
-    m_eCacheMode = eSC_Normal;
-    m_bReload = false;
-    m_szShaderPrecache = NULL;
-    m_bActivatePhase = false;
-    CRenderer::CV_r_shadersasynccompiling = nAsync;
-
-    gRenDev->m_Features = nSaveFeatures;
-
-    float t1 = gEnv->pTimer->GetAsyncCurTime();
-    CryLogAlways("All shaders combinations compiled in %.2f seconds", (t1 - t0));
-    CryLogAlways("Combinations: (Material: %d, Processed: %d; Compiled: %d; Removed: %d)", nMaterialCombinations, nProcessed, nCompiled, nEmpty);
-    CryLogAlways("-- Shader cache overall stats: Entries: %d, Unique Entries: %d, Size: %d, Compressed Size: %d, Token data size: %d", Stats.nEntries, Stats.nUniqueEntries, Stats.nSizeUncompressed, Stats.nSizeCompressed, Stats.nTokenDataSize);
-
-    m_nCombinationsProcess = -1;
-    m_nCombinationsCompiled = -1;
-    m_nCombinationsEmpty = -1;
-}
-
-#endif
-
-void CHWShader::mfGenName(uint64 GLMask, uint64 RTMask, uint32 LightMask, uint32 MDMask, uint32 MDVMask, uint64 PSS, uint64 STMask, EHWShaderClass eClass, char* dstname, int nSize, byte bType)
-{
-    assert(dstname);
-    dstname[0] = 0;
-
-    char str[32];
-    if (bType != 0 && GLMask)
-    {
-        azsprintf(str, "(GL%llx)", GLMask);
-        cry_strcat(dstname, nSize, str);
-    }
-    if (bType != 0)
-    {
-        azsprintf(str, "(RT%llx)", RTMask);
-        cry_strcat(dstname, nSize, str);
-    }
-    if (bType != 0 && LightMask)
-    {
-        azsprintf(str, "(LT%x)", LightMask);
-        cry_strcat(dstname, nSize, str);
-    }
-    if (bType != 0 && MDMask)
-    {
-        azsprintf(str, "(MD%x)", MDMask);
-        cry_strcat(dstname, nSize, str);
-    }
-    if (bType != 0 && MDVMask)
-    {
-        azsprintf(str, "(MDV%x)", MDVMask);
-        cry_strcat(dstname, nSize, str);
-    }
-    if (bType != 0 && PSS)
-    {
-        azsprintf(str, "(PSS%llx)", PSS);
-        cry_strcat(dstname, nSize, str);
-    }
-    if (bType != 0 && STMask)
-    {
-        azsprintf(str, "(ST%llx)", STMask);
-        cry_strcat(dstname, nSize, str);
-    }
-    if (bType != 0)
-    {
-        azsprintf(str, "(%s)", mfClassString(eClass));
-        cry_strcat(dstname, nSize, str);
-    }
-}
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-
-void CShaderMan::mfPrecacheShaders(bool bStatsOnly)
-{
-    AZ_Assert(CRenderer::CV_r_shadersPlatform != static_cast<int>(AZ::PlatformID::PLATFORM_MAX), "You must set a shaders platform (r_shadersPlatform) before precaching the shaders");
-    CHWShader::mfFlushPendedShadersWait(-1);
-
-    if (CRenderer::CV_r_shadersorbis)
-    {
-#ifdef WATER_TESSELLATION_RENDERER
-        CRenderer::CV_r_WaterTessellationHW = 0;
-#endif
-        gRenDev->m_bDeviceSupportsFP16Filter = true;
-        gRenDev->m_bDeviceSupportsFP16Separate = false;
-        gRenDev->m_bDeviceSupportsGeometryShaders = true;
-        gRenDev->m_Features |= RFT_HW_SM30;
-
-        CParserBin::m_bShaderCacheGen = true;
-
-        gRenDev->m_Features |= RFT_HW_SM50;
-        CParserBin::SetupForOrbis();
-        CryLogAlways("\nStarting shader compilation for Orbis...");
-        mfInitShadersList(NULL);
-        mfPreloadShaderExts();
-        _PrecacheShaderList(bStatsOnly);
-    }
-    else
-    if (CRenderer::CV_r_shadersdx11)
-    {
-        gRenDev->m_bDeviceSupportsFP16Filter = true;
-        gRenDev->m_bDeviceSupportsFP16Separate = false;
-        gRenDev->m_bDeviceSupportsTessellation = true;
-        gRenDev->m_bDeviceSupportsGeometryShaders = true;
-        gRenDev->m_Features |= RFT_HW_SM30;
-
-        CParserBin::m_bShaderCacheGen = true;
-
-        gRenDev->m_Features |= RFT_HW_SM50;
-        CParserBin::SetupForD3D11();
-        CryLogAlways("\nStarting shader compilation for D3D11...");
-        mfInitShadersList(NULL);
-        mfPreloadShaderExts();
-        _PrecacheShaderList(bStatsOnly);
-    }
-    else
-    if (CRenderer::CV_r_shadersGL4)
-    {
-        gRenDev->m_bDeviceSupportsFP16Filter = true;
-        gRenDev->m_bDeviceSupportsFP16Separate = false;
-        gRenDev->m_bDeviceSupportsTessellation = true;
-        gRenDev->m_bDeviceSupportsGeometryShaders = true;
-        gRenDev->m_Features |= RFT_HW_SM30;
-
-        CParserBin::m_bShaderCacheGen = true;
-
-        gRenDev->m_Features |= RFT_HW_SM50;
-        CParserBin::SetupForGL4();
-        CryLogAlways("\nStarting shader compilation for GLSL 4...");
-        mfInitShadersList(NULL);
-        mfPreloadShaderExts();
-        _PrecacheShaderList(bStatsOnly);
-    }
-    else
-    if (CRenderer::CV_r_shadersGLES3)
-    {
-        gRenDev->m_bDeviceSupportsFP16Filter = true;
-        gRenDev->m_bDeviceSupportsFP16Separate = false;
-        gRenDev->m_bDeviceSupportsTessellation = false;
-        gRenDev->m_bDeviceSupportsGeometryShaders = false;
-        gRenDev->m_Features |= RFT_HW_SM30;
-
-        CParserBin::m_bShaderCacheGen = true;
-
-        gRenDev->m_Features |= RFT_HW_SM50;
-        CParserBin::SetupForGLES3();
-        CryLogAlways("\nStarting shader compilation for GLSL-ES 3...");
-        mfInitShadersList(NULL);
-        mfPreloadShaderExts();
-        _PrecacheShaderList(bStatsOnly);
-    }
-    else
-    if (CRenderer::CV_r_shadersMETAL)
-    {
-        AZ_Assert(CRenderer::CV_r_shadersPlatform == static_cast<int>(AZ::PlatformID::PLATFORM_APPLE_OSX) || CRenderer::CV_r_shadersPlatform == static_cast<int>(AZ::PlatformID::PLATFORM_APPLE_IOS), "Invalid platform (%d) for metal shaders", CRenderer::CV_r_shadersPlatform);
-        gRenDev->m_bDeviceSupportsFP16Filter = true;
-        gRenDev->m_bDeviceSupportsFP16Separate = false;
-        gRenDev->m_bDeviceSupportsTessellation = false;
-        gRenDev->m_bDeviceSupportsGeometryShaders = false;
-        gRenDev->m_Features |= RFT_HW_SM30;
-
-        CParserBin::m_bShaderCacheGen = true;
-
-        gRenDev->m_Features |= RFT_HW_SM50;
-        CParserBin::SetupForMETAL();
-        CryLogAlways("\nStarting shader compilation for METAL...");
-        mfInitShadersList(NULL);
-        mfPreloadShaderExts();
-        _PrecacheShaderList(bStatsOnly);
-    }
-    
-#if defined(AZ_PLATFORM_WINDOWS)
-    CRenderer::CV_r_shadersPlatform = static_cast<int>(AZ::PlatformID::PLATFORM_WINDOWS_64);
-    CParserBin::SetupForD3D11();
-#elif defined(AZ_PLATFORM_MAC)
-    CRenderer::CV_r_shadersPlatform = static_cast<int>(AZ::PlatformID::PLATFORM_APPLE_OSX);
-    CParserBin::SetupForMETAL();
-#endif
-
-    gRenDev->m_cEF.m_Bin.InvalidateCache();
-}
-
-void CShaderMan::mfGetShaderList()
-{
-    if (CRenderer::CV_r_shadersorbis)
-    {
-        CParserBin::m_bShaderCacheGen = true;
-        CParserBin::SetupForOrbis();
-    }
-    else
-    if (CRenderer::CV_r_shadersdx11)
-    {
-        CParserBin::m_bShaderCacheGen = true;
-        CParserBin::SetupForD3D11();
-        CryLogAlways("\nGet shader list for D3D11...");
-    }
-    else
-    if (CRenderer::CV_r_shadersGL4)
-    {
-        CParserBin::m_bShaderCacheGen = true;
-        CParserBin::SetupForGL4();
-        CryLogAlways("\nGet shader list for GLSL 4...");
-    }
-    else
-    if (CRenderer::CV_r_shadersGLES3)
-    {
-        CParserBin::m_bShaderCacheGen = true;
-        CParserBin::SetupForGLES3();
-        CryLogAlways("\nGet shader list for GLSL-ES 3...");
-    }
-    else
-    if (CRenderer::CV_r_shadersMETAL)
-    {
-        CParserBin::m_bShaderCacheGen = true;
-        CParserBin::SetupForMETAL();
-        CryLogAlways("\nGet shader list for METAL...");
-    }
-
-    std::vector<uint8> Data;
-    if (NRemoteCompiler::ESOK == NRemoteCompiler::CShaderSrv::Instance().GetShaderList(Data))
-    {
-        CryLogAlways("\nGet shader list Succeeded...\nStart Writing shader list to @user@\\cache\\shaders\\shaderlist.txt ...");
-        mfCloseShadersCache(0);
-        mfCloseShadersCache(1);
-        AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen("@user@\\cache\\shaders\\shaderlist.txt", "w+b");
-        if (fileHandle != AZ::IO::InvalidHandle)
-        {
-            size_t writtenSoFar = 0;
-            size_t remaining = Data.size();
-            while (remaining)
-            {
-                writtenSoFar += gEnv->pCryPak->FWrite(Data.data() + writtenSoFar, 1, remaining, fileHandle);
-                remaining -= writtenSoFar;
-            }
-            gEnv->pCryPak->FClose(fileHandle);
-            CryLogAlways("\nFinished writing shader list to @user@\\cache\\shaders\\shaderlist.txt ...");
-        }
-        else
-        {
-            CryLogAlways("\nFailed writing shader list to @user@\\cache\\shaders\\shaderlist.txt ...");
-        }
-    }
-    else
-    {
-        CryLogAlways("\nGet shader list Failed...");
-    }
-    
-    CParserBin::SetupForD3D11();
-}
-
-void CShaderMan::mfExportShaders()
-{
-}
-
-void CShaderMan::mfOptimiseShaders(const char* szFolder, bool bForce)
-{
-    CHWShader::mfFlushPendedShadersWait(-1);
-
-    float t0 = gEnv->pTimer->GetAsyncCurTime();
-    SShaderCache* pCache;
-    uint32 i;
-
-    std::vector<CCryNameR> Names;
-    mfGatherFilesList(szFolder, Names, 0, false);
-
-    SOptimiseStats Stats;
-    for (i = 0; i < Names.size(); i++)
-    {
-        const char* szName = Names[i].c_str();
-        constexpr AZStd::string_view userCache = "@usercache@/";
-        if (szName == userCache)
-        {
-            szName += userCache.size();
-        }
-        pCache = CHWShader::mfInitCache(szName, NULL, false, 0, false);
-        if (!pCache || !pCache->m_pRes[CACHE_USER])
-        {
-            continue;
-        }
-        SOptimiseStats _Stats;
-        CHWShader::mfOptimiseCacheFile(pCache, bForce, &_Stats);
-        Stats.nEntries += _Stats.nEntries;
-        Stats.nUniqueEntries += _Stats.nUniqueEntries;
-        Stats.nSizeCompressed += _Stats.nSizeCompressed;
-        Stats.nSizeUncompressed += _Stats.nSizeUncompressed;
-        Stats.nTokenDataSize += _Stats.nTokenDataSize;
-        Stats.nDirDataSize += _Stats.nDirDataSize;
-        pCache->Release();
-    }
-
-    float t1 = gEnv->pTimer->GetAsyncCurTime();
-    CryLog("-- All shaders combinations optimized in %.2f seconds", t1 - t0);
-    CryLog("-- Shader cache overall stats: Entries: %d, Unique Entries: %d, Size: %.3f, Compressed Size: %.3f, Token data size: %.3f, Directory Size: %.3f Mb", Stats.nEntries, Stats.nUniqueEntries, Stats.nSizeUncompressed / 1024.0f / 1024.0f, Stats.nSizeCompressed / 1024.0f / 1024.0f, Stats.nTokenDataSize / 1024.0f / 1024.0f, Stats.nDirDataSize / 1024.0f / 1024.0f);
-}
-
-struct SMgData
-{
-    CCryNameTSCRC Name;
-    int nSize;
-    uint32 CRC;
-    uint32 flags;
-    byte* pData;
-    int nID;
-    byte bProcessed;
-};
-
-static int snCurListID;
-typedef std::map<CCryNameTSCRC, SMgData> ShaderData;
-typedef ShaderData::iterator ShaderDataItor;
-
-static void sAddToList(SShaderCache* pCache, ShaderData& Data)
-{
-    uint32 i;
-    CResFile* pRes = pCache->m_pRes[CACHE_USER];
-    ResDir* Dir = pRes->mfGetDirectory();
-    for (i = 0; i < Dir->size(); i++)
-    {
-        SDirEntry* pDE = &(*Dir)[i];
-        if (pDE->Name == CShaderMan::s_cNameHEAD)
-        {
-            continue;
-        }
-        ShaderDataItor it = Data.find(pDE->Name);
-        if (it == Data.end())
-        {
-            SMgData d;
-            d.nSize = pRes->mfFileRead(pDE);
-            SDirEntryOpen* pOE = pRes->mfGetOpenEntry(pDE);
-            assert(pOE);
-            if (!pOE)
-            {
-                continue;
-            }
-            d.flags = pDE->flags;
-            if (pDE->flags & RF_RES_$)
-            {
-                d.pData = new byte[d.nSize];
-                memcpy(d.pData, pOE->pData, d.nSize);
-                d.bProcessed = 0;
-                d.Name = pDE->Name;
-                d.CRC = 0;
-                d.nID = snCurListID++;
-                Data.insert(ShaderDataItor::value_type(d.Name, d));
-                continue;
-            }
-            if (d.nSize < sizeof(SShaderCacheHeaderItem))
-            {
-                assert(0);
-                continue;
-            }
-            d.pData = new byte[d.nSize];
-            memcpy(d.pData, pOE->pData, d.nSize);
-            SShaderCacheHeaderItem* pItem = (SShaderCacheHeaderItem*)d.pData;
-            d.bProcessed = 0;
-            d.Name = pDE->Name;
-            d.CRC = pItem->m_CRC32;
-            d.nID = snCurListID++;
-            Data.insert(ShaderDataItor::value_type(d.Name, d));
-        }
-    }
-}
-
-struct SNameData
-{
-    CCryNameR Name;
-    bool bProcessed;
-};
-
-void CShaderMan::_MergeShaders()
-{
-    float t0 = gEnv->pTimer->GetAsyncCurTime();
-    SShaderCache* pCache;
-    uint32 i, j;
-
-    std::vector<CCryNameR> NM;
-    std::vector<SNameData> Names;
-    mfGatherFilesList(m_ShadersMergeCachePath.c_str(), NM, 0, true);
-    for (i = 0; i < NM.size(); i++)
-    {
-        SNameData dt;
-        dt.bProcessed = false;
-        dt.Name = NM[i];
-        Names.push_back(dt);
-    }
-
-    uint32 CRC32 = 0;
-    for (i = 0; i < Names.size(); i++)
-    {
-        if (Names[i].bProcessed)
-        {
-            continue;
-        }
-        Names[i].bProcessed = true;
-        const char* szNameA = Names[i].Name.c_str();
-        iLog->Log(" Merging shader resource '%s'...", szNameA);
-        char szDrv[16], szDir[256], szName[256], szExt[32], szName1[256], szName2[256];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(szNameA, szDrv, szDir, szName, szExt);
-#else
-        _splitpath(szNameA, szDrv, szDir, szName, szExt);
-#endif
-        azsprintf(szName1, "%s%s", szName, szExt);
-        uint32 nLen = strlen(szName1);
-        pCache = CHWShader::mfInitCache(szNameA, NULL, false, CRC32, false);
-        SResFileLookupData* pData;
-        if (pCache->m_pRes[CACHE_USER])
-        {
-            pData = pCache->m_pRes[CACHE_USER]->GetLookupData(false, 0, 0);
-            if (pData)
-            {
-                CRC32 = pData->m_CRC32;
-            }
-        }
-        else
-        if (pCache->m_pRes[CACHE_READONLY])
-        {
-            pData = pCache->m_pRes[CACHE_READONLY]->GetLookupData(false, 0, 0);
-            if (pData)
-            {
-                CRC32 = pData->m_CRC32;
-            }
-        }
-        else
-        {
-            assert(0);
-        }
-        ShaderData Data;
-        snCurListID = 0;
-        sAddToList(pCache, Data);
-        SAFE_RELEASE(pCache);
-        for (j = i + 1; j < Names.size(); j++)
-        {
-            if (Names[j].bProcessed)
-            {
-                continue;
-            }
-            const char* szNameB = Names[j].Name.c_str();
-#ifdef AZ_COMPILER_MSVC
-            _splitpath_s(szNameB, szDrv, szDir, szName, szExt);
-#else
-            _splitpath(szNameB, szDrv, szDir, szName, szExt);
-#endif
-            azsprintf(szName2, "%s%s", szName, szExt);
-            if (!azstricmp(szName1, szName2))
-            {
-                Names[j].bProcessed = true;
-                SShaderCache* pCache1 = CHWShader::mfInitCache(szNameB, NULL, false, 0, false);
-                pData = pCache1->m_pRes[CACHE_USER]->GetLookupData(false, 0, 0);
-                assert(pData && pData->m_CRC32 == CRC32);
-                if (!pData || pData->m_CRC32 != CRC32)
-                {
-                    Warning("WARNING: CRC mismatch for %s", szNameB);
-                }
-                sAddToList(pCache1, Data);
-                SAFE_RELEASE(pCache1);
-            }
-        }
-        char szDest[256];
-        cry_strcpy(szDest, m_ShadersCache.c_str());
-        const char* p = &szNameA[strlen(szNameA) - nLen - 2];
-        while (*p != '/' && *p != '\\')
-        {
-            p--;
-        }
-        cry_strcat(szDest, p + 1);
-        pCache = CHWShader::mfInitCache(szDest, NULL, true, CRC32, false);
-        CResFile* pRes = pCache->m_pRes[CACHE_USER];
-        pRes->mfClose();
-        pRes->mfOpen(RA_CREATE, &gRenDev->m_cEF.m_ResLookupDataMan[CACHE_USER]);
-
-        pRes->GetLookupData(true, CRC32, FX_CACHE_VER);
-        pRes->mfFlush();
-
-        int nDeviceShadersCounter = 0x10000000;
-        ShaderDataItor it;
-        for (it = Data.begin(); it != Data.end(); it++)
-        {
-            SMgData* pD = &it->second;
-            SDirEntry de;
-            de.Name = pD->Name;
-            de.size = pD->nSize;
-            de.flags = pD->flags;
-            if (pD->flags & RF_RES_$)
-            {
-                de.flags &= ~RF_COMPRESS;
-            }
-            else
-            {
-                de.flags |= RF_COMPRESS;
-                de.offset = nDeviceShadersCounter++;
-            }
-            byte* pNew = new byte[de.size];
-            memcpy(pNew, pD->pData, pD->nSize);
-            de.flags |= RF_TEMPDATA;
-            pRes->mfFileAdd(&de);
-            SDirEntryOpen* pOE = pRes->mfOpenEntry(&de);
-            pOE->pData = pNew;
-        }
-        for (it = Data.begin(); it != Data.end(); it++)
-        {
-            SMgData* pD = &it->second;
-            delete [] pD->pData;
-        }
-        Data.clear();
-        pRes->mfFlush();
-        iLog->Log(" ...%d result items...", pRes->mfGetNumFiles());
-        pCache->Release();
-    }
-
-    mfOptimiseShaders(gRenDev->m_cEF.m_ShadersCache.c_str(), true);
-
-    float t1 = gEnv->pTimer->GetAsyncCurTime();
-    CryLog("All shaders files merged in %.2f seconds", t1 - t0);
-}
-
-void CShaderMan::mfMergeShaders()
-{
-    CHWShader::mfFlushPendedShadersWait(-1);
-
-    CParserBin::SetupForD3D11();
-    _MergeShaders();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CShaderMan::CheckAllFilesAreWritable(const char* szDir) const
-{
-#if (defined(WIN32) || defined(WIN64))
-    assert(szDir);
-
-    auto pack = gEnv->pCryPak;
-    assert(pack);
-
-    string sPathWithFilter = string(szDir) + "/*";
-
-    // Search files that match filter specification.
-    AZ::IO::ArchiveFileIterator handle;
-    if (handle = pack->FindFirst(sPathWithFilter.c_str()); handle)
-    {
-        do
-        {
-            if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) != AZ::IO::FileDesc::Attribute::Subdirectory)
-            {
-                string fullpath = string(szDir) + "/" + string(handle.m_filename.data(), handle.m_filename.size());
-
-                AZ::IO::HandleType outFileHandle = pack->FOpen(fullpath.c_str(), "rb");
-                if (outFileHandle == AZ::IO::InvalidHandle)
-                {
-                    handle = pack->FindNext(handle);
-                    continue;
-                }
-                if (pack->IsInPak(outFileHandle))
-                {
-                    pack->FClose(outFileHandle);
-                    handle = pack->FindNext(handle);
-                    continue;
-                }
-                pack->FClose(outFileHandle);
-
-                outFileHandle = pack->FOpen(fullpath.c_str(), "ab");
-
-                if (outFileHandle != AZ::IO::InvalidHandle)
-                {
-                    pack->FClose(outFileHandle);
-                }
-                else
-                {
-                    gEnv->pLog->LogError("ERROR: Shader cache is not writable (file: '%s')", fullpath.c_str());
-                    return false;
-                }
-            }
-
-            handle = pack->FindNext(handle);
-        } while (handle);
-
-        pack->FindClose(handle);
-
-        gEnv->pLog->LogToFile("Shader cache directory '%s' was successfully tested for being writable", szDir);
-    }
-    else
-    {
-        CryLog("Shader cache directory '%s' does not exist", szDir);
-    }
-
-#endif
-
-    return true;
-}
-
-#endif // CONSOLE
-
-bool CShaderMan::mfPreloadBinaryShaders()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    AZ_TRACE_METHOD();
-    // don't preload binary shaders if we are in editing mode
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersediting)
-    {
-        return false;
-    }
-
-    // don't load all binary shaders twice
-    if (m_Bin.m_bBinaryShadersLoaded)
-    {
-        return true;
-    }
-
-    bool bFound = iSystem->GetIPak()->LoadPakToMemory("Engine/ShadersBin.pak", AZ::IO::IArchive::eInMemoryPakLocale_CPU);
-    if (!bFound)
-    {
-        return false;
-    }
-
-#ifndef _RELEASE
-    // also load shaders pak file to memory because shaders are also read, when data not found in bin, and to check the CRC
-    // of the source shaders against the binary shaders in non release mode
-    iSystem->GetIPak()->LoadPakToMemory("Engine/Shaders.pak", AZ::IO::IArchive::eInMemoryPakLocale_CPU);
-#endif
-
-    AZStd::string allFilesPath = m_ShadersCache + "/*";
-
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst (allFilesPath.c_str());
-    if (!handle)
-    {
-        return false;
-    }
-    std::vector<string> FilesCFX;
-    std::vector<string> FilesCFI;
-
-    do
-    {
-        if (gEnv->pSystem && gEnv->pSystem->IsQuitting())
-        {
-            return false;
-        }
-        if (handle.m_filename.front() == '.')
-        {
-            continue;
-        }
-        if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-        {
-            continue;
-        }
-        const char* szExt = fpGetExtension(handle.m_filename.data());
-        if (!azstricmp(szExt, ".cfib"))
-        {
-            FilesCFI.emplace_back(handle.m_filename.data(), handle.m_filename.size());
-        }
-        else
-        if (!azstricmp(szExt, ".cfxb"))
-        {
-            FilesCFX.emplace_back(handle.m_filename.data(), handle.m_filename.size());
-        }
-    } while (handle = gEnv->pCryPak->FindNext(handle));
-
-    if (FilesCFX.size() + FilesCFI.size() > MAX_FXBIN_CACHE)
-    {
-        SShaderBin::s_nMaxFXBinCache = FilesCFX.size() + FilesCFI.size();
-    }
-    uint32 i;
-    char sName[256];
-
-    {
-        LOADING_TIME_PROFILE_SECTION_NAMED("CShaderMan::mfPreloadBinaryShaders(): FilesCFI");
-        for (i = 0; i < FilesCFI.size(); i++)
-        {
-            if (gEnv->pSystem && gEnv->pSystem->IsQuitting())
-            {
-                return false;
-            }
-
-            const string& file = FilesCFI[i];
-            cry_strcpy(sName, file.c_str());
-            fpStripExtension(sName, sName);
-            [[maybe_unused]] SShaderBin* pBin = m_Bin.GetBinShader(sName, true, 0);
-            AZ_Error("Rendering", pBin, "Error pre-loading binary shader %s", file.c_str());
-        }
-    }
-
-    {
-        LOADING_TIME_PROFILE_SECTION_NAMED("CShaderMan::mfPreloadBinaryShaders(): FilesCFX");
-        for (i = 0; i < FilesCFX.size(); i++)
-        {
-            if (gEnv->pSystem && gEnv->pSystem->IsQuitting())
-            {
-                return false;
-            }
-
-            const string& file = FilesCFX[i];
-            cry_strcpy(sName, file.c_str());
-            fpStripExtension(sName, sName);
-            [[maybe_unused]] SShaderBin* pBin = m_Bin.GetBinShader(sName, false, 0);
-            AZ_Error("Rendering", pBin, "Error pre-loading binary shader %s", file.c_str());
-        }
-    }
-
-    gEnv->pCryPak->FindClose (handle);
-
-    // Unload pak from memory.
-    iSystem->GetIPak()->LoadPakToMemory("Engine/ShadersBin.pak", AZ::IO::IArchive::eInMemoryPakLocale_Unload);
-
-#ifndef _RELEASE
-    iSystem->GetIPak()->LoadPakToMemory("Engine/Shaders.pak", AZ::IO::IArchive::eInMemoryPakLocale_Unload);
-#endif
-
-    m_Bin.m_bBinaryShadersLoaded = true;
-
-    return SShaderBin::s_nMaxFXBinCache > 0;
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.h b/Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.h
deleted file mode 100644
index 55e6c9f9b4..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-// Shader cache directory
-#define g_shaderCache "Shaders/Cache/"
-
-#define CONCAT_PATHS(a, b) a b
-
-struct SPreprocessMasks
-{
-    uint64 nRT, nRTSet;
-    uint64 nGL, nGLSet;
-    uint32 nLT, nLTSet;
-    uint32 nMD, nMDSet;
-    uint32 nMDV, nMDVSet;
-};
-
-typedef std::map<uint32, uint32> MapPreprocessFlags;
-typedef MapPreprocessFlags::iterator MapPreprocessFlagsItor;
-
-struct SPreprocessNode
-{
-    TArray<uint32> m_Expression;
-    int m_nNode;
-    uint64 m_RTMask;
-    uint64 m_GLMask;
-    uint32 m_LTMask;
-    uint32 m_MDMask;
-    uint32 m_MDVMask;
-    std::vector<SPreprocessNode*> m_Nodes[2];
-    short m_nCode[2]; // 0 - No Code, 1 - Has Code, -1 - Depends
-    SPreprocessNode()
-    {
-        m_nNode = 0;
-        m_RTMask = 0;
-        m_GLMask = 0;
-        m_LTMask = 0;
-        m_MDMask = 0;
-        m_MDVMask = 0;
-        m_nCode[0] = m_nCode[1] = 0;
-    }
-    ~SPreprocessNode()
-    {
-        uint32 i;
-        for (i = 0; i < m_Nodes[0].size(); i++)
-        {
-            SAFE_DELETE(m_Nodes[0][i]);
-        }
-        for (i = 0; i < m_Nodes[1].size(); i++)
-        {
-            SAFE_DELETE(m_Nodes[1][i]);
-        }
-    }
-};
-
-struct SPreprocessFlagDesc
-{
-    CCryNameR m_Name;
-    uint64 m_nFlag;
-    bool m_bWasReferenced;
-    SPreprocessFlagDesc() { m_nFlag = 0; m_bWasReferenced = true; }
-};
-
-struct SPreprocessTree
-{
-    static std::vector<SPreprocessFlagDesc> s_GLDescs;
-    static std::vector<SPreprocessFlagDesc> s_RTDescs;
-    static std::vector<SPreprocessFlagDesc> s_LTDescs;
-    std::vector<SPreprocessFlagDesc> m_GLDescsLocal;
-    std::vector<SPreprocessFlagDesc> m_MDDescs;
-    std::vector<SPreprocessFlagDesc> m_MDVDescs;
-
-    static MapPreprocessFlags s_MapFlags;
-    MapPreprocessFlags m_MapFlagsLocal;
-
-    std::vector<SPreprocessNode*> m_Root;
-    ~SPreprocessTree()
-    {
-        uint32 i;
-        for (i = 0; i < m_Root.size(); i++)
-        {
-            SAFE_DELETE(m_Root[i]);
-        }
-        m_Root.clear();
-    }
-    CShader* m_pSH;
-};
-
-//=======================================================================================================
-
-struct SShaderLevelPolicies
-{
-    std::vector<string> m_WhiteGlobalList;
-    std::vector<string> m_WhitePerLevelList;
-};
-// CRY DX12
-union UPipelineState // Pipeline state relevant for shader instantiation
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(ShaderCache_h)
-#endif
-    uint64 opaque;
-    UPipelineState()
-        : opaque(0) {
-    }
-};
-static_assert(sizeof(UPipelineState) == sizeof(uint64), "UPipelineState needs to be 64 bit");
-
-struct SShaderCombIdent
-{
-    uint64 m_RTMask;    // run-time mask
-    uint64 m_GLMask;    // global mask
-    uint64 m_STMask;    // static mask
-    UPipelineState m_pipelineState;
-    union
-    {
-        struct
-        {
-            uint32 m_LightMask;   // light mask
-            uint32 m_MDMask;      // texture coordinates modifier mask
-            uint32 m_MDVMask;     // vertex modifier mask | SF_PLATFORM
-            uint32 m_nHash;
-        };
-        struct
-        {
-            uint64 m_FastCompare1;
-            uint64 m_FastCompare2;
-        };
-    };
-
-    SShaderCombIdent(uint64 nRT, uint64 nGL, uint32 nLT, uint32 nMD, uint32 nMDV)
-    {
-        m_RTMask = nRT;
-        m_GLMask = nGL;
-        m_LightMask = nLT;
-        m_MDMask = nMD;
-        m_MDVMask = nMDV;
-        m_nHash = 0;
-        m_STMask = 0;
-    }
-    SShaderCombIdent(uint64 nGL, const SShaderCombIdent& Ident)
-    {
-        *this = Ident;
-        m_GLMask = nGL;
-    }
-
-    SShaderCombIdent()
-    {
-        m_RTMask = 0;
-        m_GLMask = 0;
-        m_LightMask = 0;
-        m_MDMask = 0;
-        m_MDVMask = 0;
-        m_nHash = 0;
-        m_STMask = 0;
-    }
-
-    uint32 PostCreate();
-};
-
-//==========================================================================================================================
-
-class CResStreamDirCallback
-    : public IStreamCallback
-{
-    virtual void StreamOnComplete (IReadStream* pStream, unsigned nError);
-    virtual void StreamAsyncOnComplete (IReadStream* pStream, unsigned nError);
-};
-class CResStreamCallback
-    : public IStreamCallback
-{
-    virtual void StreamOnComplete (IReadStream* pStream, unsigned nError);
-    virtual void StreamAsyncOnComplete (IReadStream* pStream, unsigned nError);
-};
-
-struct SResStreamEntry
-{
-    struct SResStreamInfo* m_pParent;
-    CCryNameTSCRC m_Name;
-    IReadStreamPtr m_readStream;
-};
-
-struct SResStreamInfo
-{
-    SShaderCache* m_pCache;
-    CResFile* m_pRes;
-    CResStreamCallback m_Callback;
-    CResStreamDirCallback m_CallbackDir;
-
-    CryCriticalSection m_StreamLock;
-    std::vector<SResStreamEntry*> m_EntriesQueue;
-
-    std::vector<IReadStreamPtr> m_dirReadStreams;
-    int m_nDirRequestCount;
-
-    SResStreamInfo(SShaderCache* pCache)
-    {
-        m_pCache = pCache;
-        m_pRes = NULL;
-        m_nDirRequestCount = 0;
-    }
-    ~SResStreamInfo()
-    {
-        assert (m_EntriesQueue.empty() && m_dirReadStreams.empty());
-    }
-    void AbortJobs()
-    {
-        using std::swap;
-
-        CryAutoLock<CryCriticalSection> lock(m_StreamLock);
-
-        // Copy the list here, as the streaming callback can modify the list
-        std::vector<SResStreamEntry*> entries = m_EntriesQueue;
-
-        for (size_t i = 0, c = entries.size(); i != c; ++i)
-        {
-            SResStreamEntry* pEntry = entries[i];
-            if (pEntry->m_readStream)
-            {
-                pEntry->m_readStream->Abort();
-            }
-        }
-
-
-        // Copy the list here, as the streaming callback can modify the list
-        std::vector<IReadStreamPtr> dirStreams = m_dirReadStreams;
-
-        for (size_t i = 0, c = dirStreams.size(); i != c; ++i)
-        {
-            IReadStream* pReadStream = dirStreams[i];
-            if (pReadStream)
-            {
-                pReadStream->Abort();
-            }
-        }
-    }
-    SResStreamEntry* AddEntry(CCryNameTSCRC Name)
-    {
-        uint32 i;
-        for (i = 0; i < m_EntriesQueue.size(); i++)
-        {
-            SResStreamEntry* pE = m_EntriesQueue[i];
-            if (pE->m_Name == Name)
-            {
-                break;
-            }
-        }
-        if (i == m_EntriesQueue.size())
-        {
-            SResStreamEntry* pEntry = new SResStreamEntry;
-            pEntry->m_pParent = this;
-            pEntry->m_Name = Name;
-            m_EntriesQueue.push_back(pEntry);
-            return pEntry;
-        }
-        return NULL;
-    }
-    void Release()
-    {
-        assert(m_EntriesQueue.empty());
-        delete this;
-    }
-
-private:
-    SResStreamInfo(const SResStreamInfo&);
-    SResStreamInfo& operator = (const SResStreamInfo&);
-};
-
-struct SShaderDevCache
-{
-    int m_nRefCount;
-    CCryNameR m_Name;
-
-    FXDeviceShader m_DeviceShaders;
-
-    SShaderDevCache()
-    {
-        m_nRefCount = 1;
-    }
-    SShaderDevCache(const CCryNameR& name)
-        :m_Name(name)
-    {
-        m_nRefCount = 1;
-    }
-    int Size();
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    int Release()
-    {
-        m_nRefCount--;
-        if (m_nRefCount)
-        {
-            return m_nRefCount;
-        }
-        delete this;
-        return 0;
-    }
-    ~SShaderDevCache() {};
-};
-
-
-struct SShaderCache
-{
-    volatile int32 m_nRefCount;
-    CCryNameR m_Name;
-    class CResFile* m_pRes[2];
-    SResStreamInfo* m_pStreamInfo;
-    uint32 m_nPlatform;
-    bool m_bReadOnly[2];
-    bool m_bValid[2];
-    bool m_bNeedPrecache;
-    SShaderCache()
-    {
-        m_nPlatform = 0;
-        m_nRefCount = 1;
-        m_pStreamInfo = NULL;
-        m_pRes[0] = m_pRes[1] = NULL;
-        m_bValid[0] = m_bValid[1] = false;
-        m_bReadOnly[0] = m_bReadOnly[1] = false;
-        m_bNeedPrecache = false;
-    }
-    bool isValid();
-    int Size();
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    void Cleanup();
-    int AddRef() { return CryInterlockedIncrement(&m_nRefCount); }
-    int Release(bool bDelete = true)
-    {
-        int nRef = CryInterlockedDecrement(&m_nRefCount);
-        if (nRef || !bDelete)
-        {
-            return nRef;
-        }
-        delete this;
-        return 0;
-    }
-    ~SShaderCache();
-};
-
-struct SEmptyCombination
-{
-    uint64 nRTOrg;
-    uint64 nGLOrg;
-    uint32 nLTOrg;
-    uint64 nRTNew;
-    uint64 nGLNew;
-    uint32 nLTNew;
-    uint32 nMD;
-    uint32 nMDV;
-    uint64 nST;
-    class CHWShader* pShader;
-
-    using Combinations = AZStd::vector<SEmptyCombination, AZ::StdLegacyAllocator>;
-    static Combinations s_Combinations;
-};
-
-//==========================================================================================================================
-
-struct SShaderCombination
-{
-    uint64 m_RTMask;
-    uint32 m_LTMask;
-    uint32 m_MDMask;
-    uint32 m_MDVMask;
-    UPipelineState m_pipelineState;
-    SShaderCombination()
-    {
-        m_RTMask = 0;
-        m_LTMask = 0;
-        m_MDMask = 0;
-        m_MDVMask = 0;
-    }
-};
-
-
-struct SCacheCombination
-{
-    CCryNameR Name;
-    CCryNameR CacheName;
-    SShaderCombIdent Ident;
-    uint32 nCount;
-    EHWShaderClass eCL;
-    SCacheCombination()
-    {
-        nCount = 0;
-        eCL = eHWSC_Vertex;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-};
-
-struct SShaderGenComb
-{
-    CCryNameR Name;
-    SShaderGen* pGen;
-
-    SShaderGenComb()
-        : Name()
-        , pGen(nullptr)
-    {
-    }
-
-    ~SShaderGenComb()
-    {
-        //SAFE_RELEASE(pGen);
-    }
-
-    _inline SShaderGenComb (const SShaderGenComb& src)
-        : Name(src.Name)
-        , pGen(src.pGen)
-    {
-        if (pGen)
-        {
-            pGen->m_nRefCount++;
-        }
-    }
-
-    _inline SShaderGenComb& operator = (const SShaderGenComb& src)
-    {
-        this->~SShaderGenComb();
-        new(this)SShaderGenComb(src);
-        return *this;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(Name);
-        pSizer->AddObject(pGen);
-    }
-};
-
-typedef std::map<CCryNameR, SCacheCombination> FXShaderCacheCombinations;
-typedef FXShaderCacheCombinations::iterator FXShaderCacheCombinationsItor;
-typedef std::map<CCryNameR, std::vector<SCacheCombination> > FXShaderCacheCombinationsList;
-typedef FXShaderCacheCombinationsList::iterator FXShaderCacheCombinationsListItor;
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderComponents.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderComponents.cpp
deleted file mode 100644
index b6a6119cfa..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderComponents.cpp
+++ /dev/null
@@ -1,908 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "CryHeaders.h"
-#include "../Shadow_Renderer.h"
-
-#if defined(WIN32) || defined(WIN64)
-#include <direct.h>
-#include <io.h>
-#elif defined(LINUX)
-#endif
-
-static void sParseTexMatrix([[maybe_unused]] const char* szScr, const char* szAnnotations, std::vector<STexSamplerFX>* pSamplers, SCGParam* vpp, [[maybe_unused]] int nComp, [[maybe_unused]] CShader* ef)
-{
-    uint32 i;
-    const char* szSampler = gRenDev->m_cEF.mfParseFX_Parameter(szAnnotations, eType_STRING, "Sampler");
-    assert (szSampler);
-    if (szSampler)
-    {
-        for (i = 0; i < pSamplers->size(); i++)
-        {
-            STexSamplerFX* sm = &(*pSamplers)[i];
-            if (!azstricmp(sm->m_szName.c_str(), szSampler))
-            {
-                vpp->m_nID = (UINT_PTR)sm->m_pTarget;
-                break;
-            }
-        }
-    }
-}
-
-//======================================================================================
-
-// PB = Per-Batch
-// PI = Per-Instance
-// SI = Per-Instance Static
-// PF = Per-Frame
-// PM = Per-Material
-// SG = Shadow-Generation
-
-#define PARAM(a, b) #a, b
-static SParamDB sParams[] =
-{
-    SParamDB(PARAM(SI_AlphaTest, ECGP_SI_AlphaTest), 0),
-    SParamDB(PARAM(SI_AmbientOpacity, ECGP_SI_AmbientOpacity), 0),
-    SParamDB(PARAM(SI_ObjectAmbColComp, ECGP_SI_ObjectAmbColComp), 0),
-    SParamDB(PARAM(SI_BendInfo, ECGP_SI_BendInfo), 0),
-    SParamDB(PARAM(SI_PrevBendInfo, ECGP_SI_PrevBendInfo), 0),
-
-    SParamDB(PARAM(PI_ViewProjection, ECGP_Matr_PI_ViewProj), 0),
-
-    SParamDB(PARAM(PI_Composite, ECGP_Matr_PI_Composite), 0),
-    SParamDB(PARAM(PB_UnProjMatrix, ECGP_Matr_PB_UnProjMatrix), 0),
-    SParamDB(PARAM(PB_ProjMatrix, ECGP_Matr_PB_ProjMatrix), 0),
-    SParamDB(PARAM(PB_TerrainBaseMatrix, ECGP_Matr_PB_TerrainBase), 0),
-    SParamDB(PARAM(PB_TerrainLayerGen, ECGP_Matr_PB_TerrainLayerGen), 0),
-    SParamDB(PARAM(PI_TransObjMatrix, ECGP_Matr_PI_Obj_T), 0), // Due to some bug in Parser, ObjMatrix_T or something
-
-    SParamDB(PARAM(PB_GmemStencilValue, ECGP_PB_GmemStencilValue), 0),
-    SParamDB(PARAM(PI_MotionBlurData, ECGP_PI_MotionBlurData), 0),
-
-    SParamDB(PARAM(PI_TessParams, ECGP_PI_TessParams), 0),
-
-    SParamDB(PARAM(PB_TempMatr0, ECGP_Matr_PB_Temp4_0), PD_INDEXED),
-    SParamDB(PARAM(PB_TempMatr1, ECGP_Matr_PB_Temp4_1), PD_INDEXED),
-    SParamDB(PARAM(PB_TempMatr2, ECGP_Matr_PB_Temp4_2), PD_INDEXED),
-    SParamDB(PARAM(PB_TempMatr3, ECGP_Matr_PB_Temp4_3), PD_INDEXED),
-    SParamDB(PARAM(PI_TexMatrix, ECGP_Matr_PI_TexMatrix), 0, sParseTexMatrix),  // used for reflections (water) matrix
-    SParamDB(PARAM(PI_TCGMatrix, ECGP_Matr_PI_TCGMatrix), PD_INDEXED),
-    SParamDB(PARAM(PB_DLightsInfo, ECGP_PB_DLightsInfo), 0),
-
-    SParamDB(PARAM(PM_DiffuseColor, ECGP_PM_DiffuseColor), 0),
-    SParamDB(PARAM(PM_SpecularColor, ECGP_PM_SpecularColor), 0),
-    SParamDB(PARAM(PM_EmissiveColor, ECGP_PM_EmissiveColor), 0),
-    SParamDB(PARAM(PM_DeformWave, ECGP_PM_DeformWave), 0),
-    SParamDB(PARAM(PM_DetailTiling, ECGP_PM_DetailTiling), 0),
-    SParamDB(PARAM(PM_TexelDensity, ECGP_PM_TexelDensity), 0),
-    SParamDB(PARAM(PM_UVMatrixDiffuse, ECGP_PM_UVMatrixDiffuse), 0),
-    SParamDB(PARAM(PM_UVMatrixCustom, ECGP_PM_UVMatrixCustom), 0),
-    SParamDB(PARAM(PM_UVMatrixEmissiveMultiplier, ECGP_PM_UVMatrixEmissiveMultiplier), 0),
-    SParamDB(PARAM(PM_UVMatrixEmittance, ECGP_PM_UVMatrixEmittance), 0),
-    SParamDB(PARAM(PM_UVMatrixDetail, ECGP_PM_UVMatrixDetail), 0),
-
-    SParamDB(PARAM(PI_OSCameraPos, ECGP_PI_OSCameraPos), 0),
-    SParamDB(PARAM(PB_BlendTerrainColInfo, ECGP_PB_BlendTerrainColInfo), 0),
-    SParamDB(PARAM(PI_Ambient, ECGP_PI_Ambient), 0),
-    SParamDB(PARAM(PI_VisionParams, ECGP_PI_VisionParams), 0),
-    SParamDB(PARAM(PB_VisionMtlParams, ECGP_PB_VisionMtlParams), 0),
-
-    SParamDB(PARAM(PB_IrregKernel, ECGP_PB_IrregKernel), 0),
-
-    SParamDB(PARAM(PB_TFactor, ECGP_PB_TFactor), 0),
-    SParamDB(PARAM(PB_TempData, ECGP_PB_TempData), PD_INDEXED | 0),
-    SParamDB(PARAM(PB_RTRect, ECGP_PB_RTRect), 0),
-    SParamDB(PARAM(PI_AvgFogVolumeContrib, ECGP_PI_AvgFogVolumeContrib), 0),
-    SParamDB(PARAM(PI_NumInstructions, ECGP_PI_NumInstructions), PD_INDEXED),
-    SParamDB(PARAM(PB_FromRE, ECGP_PB_FromRE), PD_INDEXED | 0),
-    SParamDB(PARAM(PB_ObjVal, ECGP_PB_ObjVal), PD_INDEXED),
-    SParamDB(PARAM(PI_TextureTileSize, ECGP_PI_TextureTileSize), 0),
-    SParamDB(PARAM(PI_MotionBlurInfo, ECGP_PI_MotionBlurInfo), 0),
-    SParamDB(PARAM(PI_ParticleParams, ECGP_PI_ParticleParams), 0),
-    SParamDB(PARAM(PI_ParticleSoftParams, ECGP_PI_ParticleSoftParams), 0),
-    SParamDB(PARAM(PI_ParticleExtParams, ECGP_PI_ParticleExtParams), 0),
-    SParamDB(PARAM(PI_ParticleAlphaTest, ECGP_PI_ParticleAlphaTest), 0),
-    SParamDB(PARAM(PI_ParticleEmissiveColor, ECGP_PI_ParticleEmissiveColor), 0),
-    SParamDB(PARAM(PB_ScreenSize, ECGP_PB_ScreenSize), 0),
-
-    SParamDB(PARAM(PI_OceanMat, ECGP_Matr_PI_OceanMat), 0),
-
-    SParamDB(PARAM(PI_WrinklesMask0, ECGP_PI_WrinklesMask0), 0),
-    SParamDB(PARAM(PI_WrinklesMask1, ECGP_PI_WrinklesMask1), 0),
-    SParamDB(PARAM(PI_WrinklesMask2, ECGP_PI_WrinklesMask2), 0),
-
-    SParamDB(PARAM(PB_ClipVolumeParams, ECGP_PB_ClipVolumeParams), 0),
-    
-    SParamDB(PARAM(PB_ResInfoDiffuse, ECGP_PB_ResInfoDiffuse), 0),
-    SParamDB(PARAM(PB_FromObjSB, ECGP_PB_FromObjSB), 0),
-    SParamDB(PARAM(PB_TexelDensityParam, ECGP_PB_TexelDensityParam), 0),
-    SParamDB(PARAM(PB_TexelDensityColor, ECGP_PB_TexelDensityColor), 0),
-    SParamDB(PARAM(PB_TexelsPerMeterInfo, ECGP_PB_TexelsPerMeterInfo), 0),
-
-    SParamDB(PARAM(PB_WaterRipplesLookupParams, ECGP_PB_WaterRipplesLookupParams), 0),
-    SParamDB(PARAM(PB_SkinningExtraWeights, ECGP_PB_SkinningExtraWeights), 0),
-
-    SParamDB(PARAM(PI_FurLODInfo, ECGP_PI_FurLODInfo), 0),
-    SParamDB(PARAM(PI_FurParams, ECGP_PI_FurParams), 0),
-    SParamDB(PARAM(PI_PrevObjWorldMatrix, ECGP_PI_PrevObjWorldMatrix), 0),
-
-    SParamDB()
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const char* CShaderMan::mfGetShaderParamName(ECGParam ePR)
-{
-    int n = 0;
-    const char* szName;
-    szName = sParams[n].szName;
-    while (szName)
-    {
-        if (sParams[n].eParamType == ePR)
-        {
-            return szName;
-        }
-        n++;
-        szName = sParams[n].szName;
-    }
-    if (ePR == ECGP_PM_Tweakable)
-    {
-        return "PM_Tweakable";
-    }
-    return NULL;
-}
-
-SParamDB* CShaderMan::mfGetShaderParamDB(const char* szSemantic)
-{
-    const char* szName;
-    int n = 0;
-    szName = sParams[n].szName;
-    while (szName)
-    {
-        int nLen = strlen(szName);
-        if (!_strnicmp(szName, szSemantic, nLen) || (sParams[n].szAliasName && !_strnicmp(sParams[n].szAliasName, szSemantic, strlen(sParams[n].szAliasName))))
-        {
-            return &sParams[n];
-        }
-        n++;
-        szName = sParams[n].szName;
-    }
-    return NULL;
-}
-
-bool CShaderMan::mfParseParamComp(int comp, SCGParam* pCurParam, const char* szSemantic, char* params, const char* szAnnotations, SShaderFXParams& FXParams, CShader* ef, uint32 nParamFlags, [[maybe_unused]] EHWShaderClass eSHClass, bool bExpressionOperand)
-{
-    if (comp >= 4 || comp < -1)
-    {
-        return false;
-    }
-    if (!pCurParam)
-    {
-        return false;
-    }
-    if (comp > 0)
-    {
-        pCurParam->m_Flags &= ~PF_SINGLE_COMP;
-    }
-    else
-    {
-        pCurParam->m_Flags |= PF_SINGLE_COMP;
-    }
-    if (!szSemantic || !szSemantic[0])
-    {
-        if (!pCurParam->m_pData)
-        {
-            pCurParam->m_pData = new SParamData;
-        }
-        pCurParam->m_pData->d.fData[comp] = shGetFloat(params);
-        if (!((nParamFlags >> comp) & PF_TWEAKABLE_0))
-        {
-            pCurParam->m_eCGParamType = (ECGParam)((int)pCurParam->m_eCGParamType | (int)(ECGP_PB_Scalar << (comp * 8)));
-        }
-        else
-        {
-            pCurParam->m_eCGParamType = (ECGParam)((int)pCurParam->m_eCGParamType | (int)(ECGP_PM_Tweakable << (comp * 8)));
-            if (!bExpressionOperand)
-            {
-                pCurParam->m_eCGParamType = (ECGParam)((int)pCurParam->m_eCGParamType | (int)ECGP_PM_Tweakable);
-                pCurParam->m_Flags |= PF_MATERIAL | PF_SINGLE_COMP;
-            }
-        }
-        return true;
-    }
-    if (!azstricmp(szSemantic, "NULL"))
-    {
-        return true;
-    }
-    if (szSemantic[0] == '(')
-    {
-        pCurParam->m_eCGParamType = ECGP_PM_Tweakable;
-        pCurParam->m_Flags |= PF_SINGLE_COMP | PF_MATERIAL;
-        return true;
-    }
-    const char* szName;
-    int n = 0;
-    szName = sParams[n].szName;
-    while (szName)
-    {
-        int nLen = strlen(szName);
-        if (!_strnicmp(szName, szSemantic, nLen) || (sParams[n].szAliasName && !_strnicmp(sParams[n].szAliasName, szSemantic, strlen(sParams[n].szAliasName))))
-        {
-            if (sParams[n].nFlags & PD_MERGED)
-            {
-                pCurParam->m_Flags |= PF_CANMERGED;
-            }
-            if (!_strnicmp(szName, "PI_", 3))
-            {
-                pCurParam->m_Flags |= PF_INSTANCE;
-            }
-            else
-            if (!_strnicmp(szName, "SI_", 3))
-            {
-                pCurParam->m_Flags |= PF_INSTANCE;
-            }
-            else
-            if (!_strnicmp(szName, "PF_", 3))
-            {
-                AZ_Assert(false, "PF_ no longer supported");
-            }
-            else
-            if (!_strnicmp(szName, "PM_", 3))
-            {
-                pCurParam->m_Flags |= PF_MATERIAL;
-            }
-            else
-            if (!_strnicmp(szName, "SG_", 3))
-            {
-                AZ_Assert(false, "SG_ no longer supported");
-            }
-            static_assert(ECGP_COUNT <= 256, "ECGParam does not fit into 1 byte.");
-            if (comp > 0)
-            {
-                pCurParam->m_eCGParamType = (ECGParam)((int)pCurParam->m_eCGParamType | (int)(sParams[n].eParamType << (comp * 8)));
-            }
-            else
-            {
-                pCurParam->m_eCGParamType = sParams[n].eParamType;
-            }
-            AZ_Assert(pCurParam->m_RegisterCount == 1, "Should be in default value as pCurParam is just initialized");
-
-            if (sParams[n].nFlags & PD_INDEXED)
-            {
-                if (szSemantic[nLen] == '[')
-                {
-                    int nID = shGetInt(&szSemantic[nLen + 1]);
-                    assert(nID < 256);
-                    if (comp > 0)
-                    {
-                        nID <<= (comp * 8);
-                    }
-                    pCurParam->m_nID |= nID;
-                }
-            }
-            if (sParams[n].ParserFunc)
-            {
-                sParams[n].ParserFunc(params ? params : szSemantic, szAnnotations, &FXParams.m_FXSamplersOld, pCurParam, comp, ef);
-            }
-            break;
-        }
-        n++;
-        szName = sParams[n].szName;
-    }
-    if (!szName)
-    {
-        return false;
-    }
-    return true;
-}
-
-bool CShaderMan::mfParseCGParam(char* scr, const char* szAnnotations, SShaderFXParams& FXParams, CShader* ef, std::vector<SCGParam>* pParams, [[maybe_unused]] int nComps, uint32 nParamFlags, EHWShaderClass eSHClass, bool bExpressionOperand)
-{
-    char* name;
-    long cmd;
-    char* params;
-    char* data;
-
-    int nComp = 0;
-
-    enum
-    {
-        eComp = 1, eParam, eName
-    };
-    static STokenDesc commands[] =
-    {
-        {eName, "Name"},
-        {eComp, "Comp"},
-        {eParam, "Param"},
-        {0, 0}
-    };
-    SCGParam vpp;
-#if defined(AZ_ENABLE_TRACING)
-    int n = pParams->size();
-#endif
-    bool bRes = true;
-
-    while ((cmd = shGetObject (&scr, commands, &name, &params)) > 0)
-    {
-        data = NULL;
-        if (name)
-        {
-            data = name;
-        }
-        else
-        if (params)
-        {
-            data = params;
-        }
-
-        switch (cmd)
-        {
-        case eName:
-            vpp.m_Name = data;
-            break;
-        case eComp:
-        {
-            if (nComp < 4)
-            {
-                bRes &= mfParseParamComp(nComp, &vpp, name, params, szAnnotations, FXParams, ef, nParamFlags, eSHClass, bExpressionOperand);
-                nComp++;
-            }
-        }
-        break;
-        case eParam:
-            if (!name)
-            {
-                name = params;
-            }
-            bRes &= mfParseParamComp(-1, &vpp, name, params, szAnnotations, FXParams, ef, nParamFlags, eSHClass, bExpressionOperand);
-            break;
-        }
-    }
-
-    AZ_Assert(n == pParams->size(), "");
-    pParams->push_back(vpp);
-
-    AZ_Assert(bRes, "Error: CShaderMan::mfParseCGParam - bRes is false");
-    return bRes;
-}
-
-bool CShaderMan::mfParseFXParameter(SShaderFXParams& FXParams, SFXParam* pr, const char* ParamName, CShader* ef, [[maybe_unused]] bool bInstParam, int nParams, std::vector<SCGParam>* pParams, EHWShaderClass eSHClass, bool bExpressionOperand)
-{
-    SCGParam CGpr;
-    char scr[256];
-
-    uint32 nParamFlags = pr->GetFlags();
-
-    CryFixedStringT<512> Semantic = "Name=";
-    Semantic += ParamName;
-    Semantic += " ";
-    int nComps = 0;
-    if (!pr->m_Semantic.empty())
-    {
-        Semantic += "Param=";
-        Semantic += pr->m_Semantic.c_str();
-        nComps = pr->m_ComponentCount;
-    }
-    else
-    {
-        for (int i = 0; i < pr->m_ComponentCount; i++)
-        {
-            if (i)
-            {
-                Semantic += " ";
-            }
-            CryFixedStringT<128> cur;
-            pr->GetParamComp(i, cur);
-            if (cur.empty())
-            {
-                break;
-            }
-            nComps++;
-            if ((cur.at(0) == '-' && isdigit(uint8(cur.at(1)))) || isdigit(uint8(cur.at(0))))
-            {
-                azsprintf(scr, "Comp = %s", cur.c_str());
-            }
-            else
-            {
-                azsprintf(scr, "Comp '%s'", cur.c_str());
-            }
-            Semantic += scr;
-        }
-    }
-    // Process parameters only with semantics
-    if (nComps)
-    {
-        uint32 nOffs = pParams->size();
-        bool bRes = mfParseCGParam((char*)Semantic.c_str(), pr->m_Annotations.c_str(), FXParams, ef, pParams, nComps, nParamFlags, eSHClass, bExpressionOperand);
-        AZ_Assert(bRes, "Error: CShaderMan::mfParseFXParameter - bRes is false");
-
-        // pParams->size() > nOffs means we Added 1 new param into pParams in mfParseCGParam 
-        if (pParams->size() > nOffs)
-        {
-            //assert(pBind->m_nComponents == 1);
-            SCGParam& p = (*pParams)[nOffs];
-            p.m_RegisterOffset = -1;
-            p.m_RegisterCount = nParams;
-            p.m_Flags |= nParamFlags;
-            if (p.m_Flags & PF_AUTOMERGED)
-            {
-                if (!p.m_pData)
-                {
-                    p.m_pData = new SParamData;
-                }
-                const char* src = p.m_Name.c_str();
-                for (uint32 i = 0; i < 4; i++)
-                {
-                    char param[128];
-                    char dig = i + 0x30;
-                    while (*src)
-                    {
-                        if (src[0] == '_' && src[1] == '_' && src[2] == dig)
-                        {
-                            int n = 0;
-                            src += 3;
-                            while (src[n])
-                            {
-                                if (src[n] == '_' && src[n + 1] == '_')
-                                {
-                                    break;
-                                }
-                                param[n] = src[n];
-                                n++;
-                            }
-                            param[n] = 0;
-                            src += n;
-                            if (param[0])
-                            {
-                                p.m_pData->m_CompNames[i] = param;
-                            }
-                            break;
-                        }
-                        else
-                        {
-                            src++;
-                        }
-                    }
-                }
-            }
-        }
-        return bRes;
-    }
-    // Parameter without semantic
-    return false;
-}
-
-// SM_ - material slots
-// SR_ - global engine RT's
-static SSamplerDB sSamplers[] =
-{
-    SSamplerDB(PARAM(SM_Diffuse, ECGS_MatSlot_Diffuse), 0),
-    SSamplerDB(PARAM(SM_Normalmap, ECGS_MatSlot_Normalmap), 0),
-    SSamplerDB(PARAM(SM_Glossmap, ECGS_MatSlot_Gloss), 0),
-    SSamplerDB(PARAM(SM_Env, ECGS_MatSlot_Env), 0),
-    SSamplerDB(PARAM(SS_Shadow0, ECGS_Shadow0), 0),
-    SSamplerDB(PARAM(SS_Shadow1, ECGS_Shadow1), 0),
-    SSamplerDB(PARAM(SS_Shadow2, ECGS_Shadow2), 0),
-    SSamplerDB(PARAM(SS_Shadow3, ECGS_Shadow3), 0),
-    SSamplerDB(PARAM(SS_Shadow4, ECGS_Shadow4), 0),
-    SSamplerDB(PARAM(SS_Shadow5, ECGS_Shadow5), 0),
-    SSamplerDB(PARAM(SS_Shadow6, ECGS_Shadow6), 0),
-    SSamplerDB(PARAM(SS_Shadow7, ECGS_Shadow7), 0),
-    SSamplerDB(PARAM(SS_TrilinearClamp, ECGS_TrilinearClamp), 0),
-    SSamplerDB(PARAM(SS_MaterialAnisoHighWrap, ECGS_MatAnisoHighWrap), 0),
-    SSamplerDB(PARAM(SS_MaterialAnisoLowWrap, ECGS_MatAnisoLowWrap), 0),
-    SSamplerDB(PARAM(SS_MaterialTrilinearWrap, ECGS_MatTrilinearWrap), 0),
-    SSamplerDB(PARAM(SS_MaterialBilinearWrap, ECGS_MatBilinearWrap), 0),
-    SSamplerDB(PARAM(SS_MaterialTrilinearClamp, ECGS_MatTrilinearClamp), 0),
-    SSamplerDB(PARAM(SS_MaterialBilinearClamp, ECGS_MatBilinearClamp), 0),
-    SSamplerDB(PARAM(SS_MaterialAnisoHighBorder, ECGS_MatAnisoHighBorder), 0),
-    SSamplerDB(PARAM(SS_MaterialTrilinearBorder, ECGS_MatTrilinearBorder), 0),
-    SSamplerDB()
-};
-
-bool CShaderMan::mfParseFXSampler([[maybe_unused]] SShaderFXParams& FXParams, SFXSampler* pr, [[maybe_unused]] const char* ParamName, [[maybe_unused]] CShader* ef, [[maybe_unused]] int nParams, std::vector<SCGSampler>* pParams, [[maybe_unused]] EHWShaderClass eSHClass)
-{
-    SCGSampler CGpr;
-    CGpr.m_nStateHandle = pr->m_nTexState;
-    if (pr->m_Semantic.empty() && pr->m_Values.empty())
-    {
-        if (CGpr.m_nStateHandle >= 0)
-        {
-            pParams->push_back(CGpr);
-            return true;
-        }
-        return false;
-    }
-    const char* szSemantic = pr->m_Semantic.c_str();
-    const char* szName;
-    int n = 0;
-    szName = sSamplers[n].szName;
-    while (szName)
-    {
-        if (!azstricmp(szName, szSemantic))
-        {
-            AZ_PUSH_DISABLE_WARNING(,"-Wtautological-constant-out-of-range-compare")
-            assert(sSamplers[n].eSamplerType < 256);
-            AZ_POP_DISABLE_WARNING
-            CGpr.m_eCGSamplerType = sSamplers[n].eSamplerType;
-            pParams->push_back(CGpr);
-            break;
-        }
-        n++;
-        szName = sSamplers[n].szName;
-    }
-    if (!szName)
-    {
-        return false;
-    }
-    return true;
-}
-
-
-// TM_ - material slots
-// TR_ - global engine RT's
-static STextureDB sTextures[] =
-{
-    STextureDB(PARAM(TM_Diffuse, ECGT_MatSlot_Diffuse), 0),
-    STextureDB(PARAM(TM_Normalmap, ECGT_MatSlot_Normals), 0),
-    STextureDB(PARAM(TM_BumpHeight, ECGT_MatSlot_Height), 0),
-    STextureDB(PARAM(TM_Glossmap, ECGT_MatSlot_Specular), 0),
-    STextureDB(PARAM(TM_Env, ECGT_MatSlot_Env), 0),
-    STextureDB(PARAM(TM_SubSurface, ECGT_MatSlot_SubSurface), 0),
-    STextureDB(PARAM(TM_GlossNormalA, ECGT_MatSlot_Smoothness), 0),
-    STextureDB(PARAM(TM_DecalOverlay, ECGT_MatSlot_DecalOverlay), 0),
-    STextureDB(PARAM(TM_Custom, ECGT_MatSlot_Custom), 0),
-    STextureDB(PARAM(TM_CustomSecondary, ECGT_MatSlot_CustomSecondary), 0),
-    STextureDB(PARAM(TM_Opacity, ECGT_MatSlot_Opacity), 0),
-    STextureDB(PARAM(TM_Detail, ECGT_MatSlot_Detail), 0),
-    STextureDB(PARAM(TM_Emittance, ECGT_MatSlot_Emittance), 0),
-    STextureDB(PARAM(TM_Occlusion, ECGT_MatSlot_Occlusion), 0),
-    STextureDB(PARAM(TM_Specular2, ECGT_MatSlot_Specular2), 0),
-    STextureDB(PARAM(TSF_Slot0, ECGT_SF_Slot0), 0),
-    STextureDB(PARAM(TSF_Slot1, ECGT_SF_Slot1), 0),
-    STextureDB(PARAM(TSF_SlotY, ECGT_SF_SlotY), 0),
-    STextureDB(PARAM(TSF_SlotU, ECGT_SF_SlotU), 0),
-    STextureDB(PARAM(TSF_SlotV, ECGT_SF_SlotV), 0),
-    STextureDB(PARAM(TSF_SlotA, ECGT_SF_SlotA), 0),
-    STextureDB(PARAM(TS_Shadow0, ECGT_Shadow0), 0),
-    STextureDB(PARAM(TS_Shadow1, ECGT_Shadow1), 0),
-    STextureDB(PARAM(TS_Shadow2, ECGT_Shadow2), 0),
-    STextureDB(PARAM(TS_Shadow3, ECGT_Shadow3), 0),
-    STextureDB(PARAM(TS_Shadow4, ECGT_Shadow4), 0),
-    STextureDB(PARAM(TS_Shadow5, ECGT_Shadow5), 0),
-    STextureDB(PARAM(TS_Shadow6, ECGT_Shadow6), 0),
-    STextureDB(PARAM(TS_Shadow7, ECGT_Shadow7), 0),
-    STextureDB(PARAM(TS_ShadowMask, ECGT_ShadowMask), 0),
-    STextureDB(PARAM(TS_ZTarget, ECGT_ZTarget), 0),
-    STextureDB(PARAM(TS_ZTargetScaled, ECGT_ZTargetScaled), 0),
-    STextureDB(PARAM(TS_ZTargetMS, ECGT_ZTargetMS), 0),
-    STextureDB(PARAM(TS_ShadowMaskZTarget, ECGT_ShadowMaskZTarget), 0),
-    STextureDB(PARAM(TS_SceneNormalsBent, ECGT_SceneNormalsBent), 0),
-    STextureDB(PARAM(TS_SceneNormals, ECGT_SceneNormals), 0),
-    STextureDB(PARAM(TS_SceneDiffuse, ECGT_SceneDiffuse), 0),
-    STextureDB(PARAM(TS_SceneSpecular, ECGT_SceneSpecular), 0),
-    STextureDB(PARAM(TS_SceneDiffuseAcc, ECGT_SceneDiffuseAcc), 0),
-    STextureDB(PARAM(TS_SceneSpecularAcc, ECGT_SceneSpecularAcc), 0),
-    STextureDB(PARAM(TS_SceneNormalsMapMS, ECGT_SceneNormalsMapMS), 0),
-    STextureDB(PARAM(TS_SceneDiffuseAccMS, ECGT_SceneDiffuseAccMS), 0),
-    STextureDB(PARAM(TS_SceneSpecularAccMS, ECGT_SceneSpecularAccMS), 0),
-    STextureDB(PARAM(TS_VolumetricClipVolumeStencil, ECGT_VolumetricClipVolumeStencil), 0),
-    STextureDB(PARAM(TS_VolumetricFog, ECGT_VolumetricFog), 0),
-    STextureDB(PARAM(TS_VolumetricFogGlobalEnvProbe0, ECGT_VolumetricFogGlobalEnvProbe0), 0),
-    STextureDB(PARAM(TS_VolumetricFogGlobalEnvProbe1, ECGT_VolumetricFogGlobalEnvProbe1), 0),
-
-    STextureDB()
-};
-
-
-//------------------------------------------------------------------------------
-// Starting point for texture data during shader parse stage.
-// Based on the texture name, this function will prepare the binding data (SCGTexture)
-// that will be held within the list of parameters to be bound to the shader.
-// 
-// Important - the resources are loaded according to the order of arrival.
-//
-// Texture Structures and Their Usage:
-// SCGTexture - texture binding structure used for the bind of the resource to the HW
-// SFXTexture - Any SFX structure will be the structure gathered from the shader during
-//      parsing and associated later on.   This structure contains a meta data regarding the 
-//      texture such as UI name and hints, usage, type and other flags.    
-//      It doesn't contain the actual texture data and doesn't apply to the binding directly 
-//      but used as the data associated with the SCGTexture binding structure.
-// SEfResTexture - the actual data representing a texture and its associated sampler.
-//------------------------------------------------------------------------------
-bool CShaderMan::mfParseFXTexture(
-    [[maybe_unused]] SShaderFXParams& FXParams, SFXTexture* pr, [[maybe_unused]] const char* ParamName, 
-    [[maybe_unused]] CShader* ef, [[maybe_unused]] int nParams, std::vector<SCGTexture>* pParams, [[maybe_unused]] EHWShaderClass eSHClass)
-{
-    SCGTexture CGpr;
-    if (pr->m_Semantic.empty())
-    {   // No texture semantic is assigned - assign textures according to usage ($, # or name)
-        // Semantic is the name text associated with the resource in the shader right after 
-        // the name of the resource.
-        // Example:   
-        //  Texture2D <uint> sceneDepthSampler : TS_ZTarget; - here TS_ZTarget is the semantic
-        if (pr->m_szTexture.size())
-        {
-            const char* nameTex = pr->m_szTexture.c_str();
-
-            // FT_DONT_STREAM = disable streaming for explicitly specified textures
-            if (nameTex[0] == '$')
-            {   // Maps the name to the pointer in the static array it will be stored at.
-                // [Shaders System] - refactor to use map to store any dynamic name usage.
-                CGpr.m_pTexture = mfCheckTemplateTexName(nameTex, eTT_MaxTexType /*unused*/);
-            }
-            else if (strchr(nameTex, '#')) // test for " #" to skip max material names
-            {
-                CGpr.m_pAnimInfo = mfReadTexSequence(nameTex, pr->GetTexFlags() | FT_DONT_STREAM, false);
-            }
-
-            // load texture by name (no context)
-            if (!CGpr.m_pTexture && !CGpr.m_pAnimInfo)
-            {
-                CGpr.m_pTexture = (CTexture*)gRenDev->EF_LoadTexture(nameTex, pr->GetTexFlags() | FT_DONT_STREAM);
-            }
-
-            if (CGpr.m_pTexture)
-            {
-                CGpr.m_pTexture->AddRef();
-            }
-
-            CGpr.m_bSRGBLookup = pr->m_bSRGBLookup;
-            CGpr.m_bGlobal = false;
-
-            pParams->push_back(CGpr);
-            return true;
-        }
-
-        return false;
-    }
-
-    const char* szSemantic = pr->m_Semantic.c_str();
-    const char* szName;
-    int n = 0;
-
-    // Texture semantic exists and will be used to compare to the semantic texture table
-    // Handling textures that are not material based textures, but parsed from the shader.
-    // An example of this will be:  Texture2D<float4> sceneGBufferA : TS_SceneNormals;
-    szName = sTextures[n].szName;
-    while (szName)
-    {   // Run over all slots and try to associates the semantic name.
-        // The semantic enum will be used in 'mfSetTexture' for setting texture 
-        // loading and default properties.
-        if (!azstricmp(szName, szSemantic))
-        {
-            static_assert(ECGT_COUNT <= 256, "ECGTexture does not fit into 1 byte.");
-            // Set the association with the texture enum as per above
-            CGpr.m_eCGTextureType = sTextures[n].eTextureType;
-            CGpr.m_bSRGBLookup = pr->m_bSRGBLookup;
-            CGpr.m_bGlobal = false;
-            pParams->push_back(CGpr);
-            break;
-        }
-        n++;
-        szName = sTextures[n].szName;
-    }
-    return szName != nullptr;
-}
-
-//===========================================================================================
-bool SShaderParam::GetValue(const char* szName, AZStd::vector<SShaderParam>* Params, float* v, int nID)
-{
-    bool bRes = false;
-
-    for (int i = 0; i < Params->size(); i++)
-    {
-        SShaderParam* sp = &(*Params)[i];
-        if (!sp)
-        {
-            continue;
-        }
-
-        if (azstricmp(sp->m_Name.c_str(), szName) == 0)
-        {
-            bRes = true;
-            switch (sp->m_Type)
-            {
-            case eType_HALF:
-            case eType_FLOAT:
-                v[nID] = sp->m_Value.m_Float;
-                break;
-            case eType_SHORT:
-                v[nID] = (float)sp->m_Value.m_Short;
-                break;
-            case eType_INT:
-            case eType_TEXTURE_HANDLE:
-                v[nID] = (float)sp->m_Value.m_Int;
-                break;
-
-            case eType_VECTOR:
-                v[0] = sp->m_Value.m_Vector[0];
-                v[1] = sp->m_Value.m_Vector[1];
-                v[2] = sp->m_Value.m_Vector[2];
-                break;
-
-            case eType_FCOLOR:
-            case eType_FCOLORA:
-                v[0] = sp->m_Value.m_Color[0];
-                v[1] = sp->m_Value.m_Color[1];
-                v[2] = sp->m_Value.m_Color[2];
-                v[3] = sp->m_Value.m_Color[3];
-                break;
-
-            case eType_STRING:
-                assert(0);
-                bRes = false;
-                break;
-            case eType_UNKNOWN:
-                assert(0);
-                bRes = false;
-                break;
-            }
-
-            break;
-        }
-    }
-
-    return bRes;
-}
-
-bool SShaderParam::GetValue(uint8 eSemantic, AZStd::vector<SShaderParam>* Params, float* v, int nID)
-{
-    bool bRes = false;
-    for (int i = 0; i < Params->size(); i++)
-    {
-        SShaderParam* sp = &(*Params)[i];
-        if (!sp)
-        {
-            continue;
-        }
-
-        if (sp->m_eSemantic == eSemantic)
-        {
-            bRes = true;
-            switch (sp->m_Type)
-            {
-            case eType_HALF:
-            case eType_FLOAT:
-                v[nID] = sp->m_Value.m_Float;
-                break;
-            case eType_SHORT:
-                v[nID] = (float)sp->m_Value.m_Short;
-                break;
-            case eType_INT:
-            case eType_TEXTURE_HANDLE:
-                v[nID] = (float)sp->m_Value.m_Int;
-                break;
-
-            case eType_VECTOR:
-                v[0] = sp->m_Value.m_Vector[0];
-                v[1] = sp->m_Value.m_Vector[1];
-                v[2] = sp->m_Value.m_Vector[2];
-                break;
-
-            case eType_FCOLOR:
-                v[0] = sp->m_Value.m_Color[0];
-                v[1] = sp->m_Value.m_Color[1];
-                v[2] = sp->m_Value.m_Color[2];
-                v[3] = sp->m_Value.m_Color[3];
-                break;
-
-            case eType_STRING:
-                assert(0);
-                bRes = false;
-                break;
-
-            case eType_UNKNOWN:
-                assert(0);
-                bRes = false;
-                break;
-            }
-
-            break;
-        }
-    }
-
-    return bRes;
-}
-
-bool sGetPublic(const CCryNameR& n, float* v, int nID)
-{
-    CRenderer* rd = gRenDev;
-    bool bFound = false;
-    CShaderResources* pRS;
-    const char* cName = n.c_str();
-    pRS = rd->m_RP.m_pShaderResources;
-    if (pRS)
-    {
-        bFound = SShaderParam::GetValue(cName, &pRS->m_ShaderParams, v, nID);
-    }
-    if (!bFound && rd->m_RP.m_pShader)
-    {
-        auto& PublicParams = rd->m_cEF.m_Bin.mfGetFXParams(rd->m_RP.m_pShader).m_PublicParams;
-        bFound = SShaderParam::GetValue(cName, &PublicParams, v, nID);
-    }
-
-    return bFound;
-}
-
-SParamData::~SParamData()
-{
-}
-
-SParamData::SParamData(const SParamData& sp)
-{
-    for (int i = 0; i < 4; i++)
-    {
-        m_CompNames[i] = sp.m_CompNames[i];
-        d.nData64[i] = sp.d.nData64[i];
-    }
-}
-
-SCGTexture::~SCGTexture()
-{
-    if (!m_pAnimInfo)
-    {
-        SAFE_RELEASE(m_pTexture);
-        m_pAnimInfo = nullptr;
-    }
-    else
-    {
-        SAFE_RELEASE(m_pAnimInfo);
-        m_pTexture = nullptr;
-    }
-}
-SCGTexture::SCGTexture(const SCGTexture& sp)
-    : SCGBind(sp)
-{
-    if (!sp.m_pAnimInfo)
-    {
-        m_pAnimInfo = nullptr;
-        m_pTexture = sp.m_pTexture;
-        if (m_pTexture)
-        {
-            m_pTexture->AddRef();
-        }
-    }
-    else
-    {
-        m_pTexture = nullptr;
-        m_pAnimInfo = sp.m_pAnimInfo;
-        if (m_pAnimInfo)
-        {
-            m_pAnimInfo->AddRef();
-        }
-    }
-
-    m_eCGTextureType = sp.m_eCGTextureType;
-    m_bSRGBLookup = sp.m_bSRGBLookup;
-    m_bGlobal = sp.m_bGlobal;
-}
-
-CTexture* SCGTexture::GetTexture() const
-{
-    if (m_pAnimInfo && m_pAnimInfo->m_Time && gRenDev->m_bPauseTimer == 0)
-    {
-        assert(gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime >= 0);
-        uint32 m = (uint32)(gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime / m_pAnimInfo->m_Time) % (m_pAnimInfo->m_NumAnimTexs);
-        assert(m < (uint32)m_pAnimInfo->m_TexPics.Num());
-
-        return m_pAnimInfo->m_TexPics[m];
-    }
-
-    return m_pTexture;
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderComponents.h b/Code/CryEngine/RenderDll/Common/Shaders/ShaderComponents.h
deleted file mode 100644
index a4bb2255fd..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderComponents.h
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "../Defs.h"
-#include "ShadersResourcesGroups/PerFrame.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(ShaderComponents_h)
-#endif
-
-#define PF_SINGLE_COMP 2
-#define PF_DONTALLOW_DYNMERGE 4
-#define PF_INTEGER    8
-#define PF_BOOL       0x10
-#define PF_POSITION   0x20
-#define PF_MATRIX     0x40
-#define PF_SCALAR     0x80
-#define PF_TWEAKABLE_0 0x100
-#define PF_TWEAKABLE_1 0x200
-#define PF_TWEAKABLE_2 0x400
-#define PF_TWEAKABLE_3 0x800
-#define PF_TWEAKABLE_MASK 0xf00
-#define PF_MERGE_MASK    0xff000
-#define PF_MERGE         0x1000
-#define PF_INSTANCE      0x100000
-#define PF_MATERIAL      0x200000
-#define PF_CUSTOM_BINDED 0x1000000
-#define PF_CANMERGED     0x2000000
-#define PF_AUTOMERGED    0x4000000
-#define PF_GLOBAL        0x10000000
-
-enum ECGParam
-{
-    ECGP_Unknown,
-
-    ECGP_SI_AmbientOpacity,
-    ECGP_SI_ObjectAmbColComp,
-    ECGP_SI_BendInfo,
-    ECGP_SI_PrevBendInfo,
-    ECGP_SI_AlphaTest,
-    ECGP_Matr_PI_Obj_T,
-    ECGP_PB_GmemStencilValue,
-    ECGP_PI_MotionBlurData,
-    ECGP_PI_TessParams,
-    ECGP_Matr_PI_ViewProj,
-    ECGP_Matr_PI_Composite,
-    ECGP_Matr_PI_ObjOrigComposite,
-    ECGP_PI_OSCameraPos,
-    ECGP_PI_Ambient,
-    ECGP_PI_VisionParams,
-    ECGP_PB_VisionMtlParams,
-    ECGP_PI_AvgFogVolumeContrib,
-    ECGP_PI_NumInstructions,
-    ECGP_PI_TextureTileSize,
-    ECGP_PI_MotionBlurInfo,
-    ECGP_PI_ParticleParams,
-    ECGP_PI_ParticleSoftParams,
-    ECGP_PI_ParticleExtParams,
-    ECGP_PI_ParticleAlphaTest,
-    ECGP_PI_ParticleEmissiveColor,
-    ECGP_PI_WrinklesMask0,
-    ECGP_PI_WrinklesMask1,
-    ECGP_PI_WrinklesMask2,
-    ECGP_Matr_PI_OceanMat,
-
-    ECGP_PB_Scalar,
-    ECGP_Matr_PB_ProjMatrix,
-    ECGP_Matr_PB_UnProjMatrix,
-
-    ECGP_Matr_PB_Camera,
-    ECGP_Matr_PB_Camera_I,
-    ECGP_Matr_PB_Camera_T,
-    ECGP_Matr_PB_Camera_IT,
-
-    ECGP_Matr_PB_Temp4_0,
-    ECGP_Matr_PB_Temp4_1,
-    ECGP_Matr_PB_Temp4_2,
-    ECGP_Matr_PB_Temp4_3,
-    ECGP_Matr_PB_TerrainBase,
-    ECGP_Matr_PB_TerrainLayerGen,
-    ECGP_Matr_PI_TexMatrix,
-    ECGP_Matr_PI_TCGMatrix,
-
-    ECGP_PM_Tweakable,
-    ECGP_PM_DiffuseColor,
-    ECGP_PM_SpecularColor,
-    ECGP_PM_EmissiveColor,
-    ECGP_PM_DeformWave,
-    ECGP_PM_DetailTiling,
-    ECGP_PM_TexelDensity,
-    ECGP_PM_UVMatrixDiffuse,
-    ECGP_PM_UVMatrixCustom,
-    ECGP_PM_UVMatrixEmissiveMultiplier,
-    ECGP_PM_UVMatrixEmittance,
-    ECGP_PM_UVMatrixDetail,
-
-    ECGP_PB_BlendTerrainColInfo,
-
-    ECGP_PB_DLightsInfo,
-    ECGP_PB_IrregKernel,
-    ECGP_PB_TFactor,
-    ECGP_PB_TempData,
-    ECGP_PB_RTRect,
-    ECGP_PB_FromRE,
-    ECGP_PB_ObjVal,
-    ECGP_PB_ScreenSize,
-
-    ECGP_PB_ClipVolumeParams,
-
-    ECGP_PB_ResInfoDiffuse,
-    ECGP_PB_FromObjSB,
-    ECGP_PB_TexelDensityParam,
-    ECGP_PB_TexelDensityColor,
-    ECGP_PB_TexelsPerMeterInfo,
-
-    ECGP_PB_WaterRipplesLookupParams,
-    ECGP_PB_SkinningExtraWeights,
-
-    ECGP_PI_FurLODInfo,
-    ECGP_PI_FurParams,
-    ECGP_PI_PrevObjWorldMatrix,
-
-    ECGP_COUNT,
-};
-
-enum EOperation
-{
-    eOp_Unknown,
-    eOp_Add,
-    eOp_Sub,
-    eOp_Div,
-    eOp_Mul,
-    eOp_Log,
-};
-
-//-----------------------------------------------------------------------------
-// This is the binding structure that represents any parameter parsed by the shader parser 
-// and is to be bound in the shader.
-//-----------------------------------------------------------------------------
-struct SCGBind
-{
-    CCryNameR   m_Name;
-    uint32      m_Flags;
-
-    // m_BindingSlot - For constants it represents the buffer binding slot, for example B0, B1..
-    // For textures and samplers it is the actual binding slot / offset.
-    short       m_BindingSlot;
-
-    // m_RegisterOffset - For constants it is the register offset within the binding slot group
-    // For textures and samplers the offset simply uses the MSB to indicate the usage.   
-    // A texture will be SHADER_BIND_TEXTURE while a sampler will be SHADER_BIND_SAMPLER
-    // [Shader System] - possibly change / remove MSB usage.
-    short       m_RegisterOffset;   
-    
-    // m_RegisterCount - number of vectors used by the parameters.  
-    // Example: matrix 4x4 will require 4 vectors.
-    int         m_RegisterCount;    
-
-    SCGBind()
-    {
-        m_RegisterCount = 1;
-        m_RegisterOffset = -2;
-        m_BindingSlot = 0;
-        m_Flags = 0;
-    }
-    SCGBind (const SCGBind& sb)
-    {
-        m_Name = sb.m_Name;
-        m_RegisterOffset = sb.m_RegisterOffset;
-        m_BindingSlot = sb.m_BindingSlot;
-        m_RegisterCount = sb.m_RegisterCount;
-        m_Flags = sb.m_Flags;
-    }
-    SCGBind& operator = (const SCGBind& sb)
-    {
-        this->~SCGBind();
-        new(this)SCGBind(sb);
-        return *this;
-    }
-    int Size()
-    {
-        return sizeof(SCGBind);
-    }
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-};
-
-struct SParamData
-{
-    CCryNameR m_CompNames[4];
-    union UData
-    {
-        uint64 nData64[4];
-        uint32 nData32[4];
-        float fData[4];
-    } d;
-    SParamData()
-    {
-        memset(&d, 0, sizeof(UData));
-    }
-    ~SParamData();
-    SParamData(const SParamData& sp);
-    SParamData& operator = (const SParamData& sp)
-    {
-        this->~SParamData();
-        new(this)SParamData(sp);
-        return *this;
-    }
-    unsigned Size() { return sizeof(SParamData); }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-};
-
-struct SCGLiteral
-{
-    int m_nIndex;
-    //Vec4 m_vVec;
-    unsigned Size() { return sizeof(SCGLiteral); }
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-};
-
-//-----------------------------------------------------------------------------
-// This is the binding structure for constant data parsed by the shader parser 
-// and is to be bound in the shader.
-//-----------------------------------------------------------------------------
-struct SCGParam
-    : SCGBind
-{
-    ECGParam m_eCGParamType;
-    SParamData* m_pData;
-    UINT_PTR m_nID;
-    SCGParam()
-    {
-        m_eCGParamType = ECGP_Unknown;
-        m_pData = NULL;
-        m_nID = 0;
-    }
-    ~SCGParam()
-    {
-        SAFE_DELETE(m_pData);
-    }
-    SCGParam(const SCGParam& sp)
-        : SCGBind(sp)
-    {
-        m_eCGParamType = sp.m_eCGParamType;
-        m_nID = sp.m_nID;
-        if (sp.m_pData)
-        {
-            m_pData = new SParamData;
-            *m_pData = *sp.m_pData;
-        }
-        else
-        {
-            m_pData = NULL;
-        }
-    }
-    SCGParam& operator = (const SCGParam& sp)
-    {
-        this->~SCGParam();
-        new(this)SCGParam(sp);
-        return *this;
-    }
-    bool operator != (const SCGParam& sp) const
-    {
-        if (sp.m_RegisterOffset == m_RegisterOffset &&
-            sp.m_Name == m_Name &&
-            sp.m_nID == m_nID &&
-            sp.m_RegisterCount == m_RegisterCount &&
-            sp.m_eCGParamType == m_eCGParamType &&
-            sp.m_BindingSlot == m_BindingSlot &&
-            sp.m_Flags == m_Flags &&
-            !sp.m_pData && !m_pData)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    const CCryNameR GetParamCompName(int nComp) const
-    {
-        if (!m_pData)
-        {
-            return CCryNameR("None");
-        }
-        return m_pData->m_CompNames[nComp];
-    }
-
-    int Size()
-    {
-        int nSize = sizeof(SCGParam);
-        if (m_pData)
-        {
-            nSize += m_pData->Size();
-        }
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_pData);
-    }
-};
-
-
-enum ECGSampler
-{
-    ECGS_Unknown,
-    ECGS_MatSlot_Diffuse,
-    ECGS_MatSlot_Normalmap,
-    ECGS_MatSlot_Gloss,
-    ECGS_MatSlot_Env,
-    ECGS_Shadow0,
-    ECGS_Shadow1,
-    ECGS_Shadow2,
-    ECGS_Shadow3,
-    ECGS_Shadow4,
-    ECGS_Shadow5,
-    ECGS_Shadow6,
-    ECGS_Shadow7,
-    ECGS_TrilinearClamp,
-    ECGS_MatAnisoHighWrap,
-    ECGS_MatAnisoLowWrap,
-    ECGS_MatTrilinearWrap,
-    ECGS_MatBilinearWrap,
-    ECGS_MatTrilinearClamp,
-    ECGS_MatBilinearClamp,
-    ECGS_MatAnisoHighBorder,
-    ECGS_MatTrilinearBorder,
-    ECGS_COUNT
-};
-
-struct SCGSampler
-    : SCGBind
-{
-    int m_nStateHandle;
-    ECGSampler m_eCGSamplerType;
-    SCGSampler()
-    {
-        m_nStateHandle = -1;
-        m_eCGSamplerType = ECGS_Unknown;
-    }
-    ~SCGSampler()
-    {
-    }
-    SCGSampler(const SCGSampler& sp)
-        : SCGBind(sp)
-    {
-        m_eCGSamplerType = sp.m_eCGSamplerType;
-        m_nStateHandle = sp.m_nStateHandle;
-    }
-    SCGSampler& operator = (const SCGSampler& sp)
-    {
-        this->~SCGSampler();
-        new(this)SCGSampler(sp);
-        return *this;
-    }
-    bool operator != (const SCGSampler& sp) const
-    {
-        if (sp.m_RegisterOffset == m_RegisterOffset &&
-            sp.m_Name == m_Name &&
-            sp.m_nStateHandle == m_nStateHandle &&
-            sp.m_RegisterCount == m_RegisterCount &&
-            sp.m_eCGSamplerType == m_eCGSamplerType &&
-            sp.m_BindingSlot == m_BindingSlot &&
-            sp.m_Flags == m_Flags)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    int Size()
-    {
-        int nSize = sizeof(SCGSampler);
-        return nSize;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-    {
-    }
-};
-
-
-
-enum ECGTexture
-{
-    ECGT_Unknown,
-    ECGT_MatSlot_Diffuse,   // @adiblev - move this to the end in order to support dynamically growing number
-    ECGT_MatSlot_Normals,
-    ECGT_MatSlot_Height,
-    ECGT_MatSlot_Specular,
-    ECGT_MatSlot_Env,
-    ECGT_MatSlot_SubSurface,
-    ECGT_MatSlot_Smoothness,
-    ECGT_MatSlot_DecalOverlay,
-    ECGT_MatSlot_Custom,
-    ECGT_MatSlot_CustomSecondary,
-    ECGT_MatSlot_Opacity,
-    ECGT_MatSlot_Detail,
-    ECGT_MatSlot_Emittance,
-    ECGT_MatSlot_Occlusion,
-    ECGT_MatSlot_Specular2,
-    ECGT_SF_Slot0,
-    ECGT_SF_Slot1,
-    ECGT_SF_SlotY,
-    ECGT_SF_SlotU,
-    ECGT_SF_SlotV,
-    ECGT_SF_SlotA,
-    ECGT_Shadow0,
-    ECGT_Shadow1,
-    ECGT_Shadow2,
-    ECGT_Shadow3,
-    ECGT_Shadow4,
-    ECGT_Shadow5,
-    ECGT_Shadow6,
-    ECGT_Shadow7,
-    ECGT_ShadowMask,
-    ECGT_ZTarget,
-    ECGT_ZTargetScaled,
-    ECGT_ZTargetMS,
-    ECGT_ShadowMaskZTarget,
-    ECGT_SceneNormalsBent,
-    ECGT_SceneNormals,
-    ECGT_SceneDiffuse,
-    ECGT_SceneSpecular,
-    ECGT_SceneDiffuseAcc,
-    ECGT_SceneSpecularAcc,
-    ECGT_SceneNormalsMapMS,
-    ECGT_SceneDiffuseAccMS,
-    ECGT_SceneSpecularAccMS,
-    ECGT_VolumetricClipVolumeStencil,
-    ECGT_VolumetricFog,
-    ECGT_VolumetricFogGlobalEnvProbe0,
-    ECGT_VolumetricFogGlobalEnvProbe1,
-    ECGT_COUNT
-};
-
-class CTexAnim;
-
-//-----------------------------------------------------------------------------
-// This is the binding structure for texture data parsed by the shader parser 
-// as well as its binding to the shader (bind slot).
-//-----------------------------------------------------------------------------
-struct SCGTexture : SCGBind
-{
-    CTexture* m_pTexture;
-    CTexAnim* m_pAnimInfo;
-    ECGTexture m_eCGTextureType;
-    bool m_bSRGBLookup;
-    bool m_bGlobal;
-
-    SCGTexture()
-    {
-        m_pTexture = nullptr;
-        m_pAnimInfo = nullptr;
-        m_eCGTextureType = ECGT_Unknown;
-        m_bSRGBLookup = false;
-        m_bGlobal = false;
-    }
-    ~SCGTexture();
-    SCGTexture(const SCGTexture& sp);
-    SCGTexture& operator = (const SCGTexture& sp)
-    {
-        this->~SCGTexture();
-        new(this)SCGTexture(sp);
-        return *this;
-    }
-    bool operator != (const SCGTexture& sp) const
-    {
-        if (sp.m_RegisterOffset == m_RegisterOffset &&
-            sp.m_Name == m_Name &&
-            sp.m_pTexture == m_pTexture &&
-            sp.m_RegisterCount == m_RegisterCount &&
-            sp.m_eCGTextureType == m_eCGTextureType &&
-            sp.m_BindingSlot == m_BindingSlot &&
-            sp.m_Flags == m_Flags &&
-            sp.m_pAnimInfo == m_pAnimInfo &&
-            sp.m_bSRGBLookup == m_bSRGBLookup &&
-            sp.m_bGlobal == m_bGlobal)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    CTexture* GetTexture() const;
-
-    int Size()
-    {
-        int nSize = sizeof(SCGTexture);
-        return nSize;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-    {
-    }
-};
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderCore.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderCore.cpp
deleted file mode 100644
index 237d33d2aa..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderCore.cpp
+++ /dev/null
@@ -1,3763 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : implementation of the Shaders manager.
-
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "CryHeaders.h"
-#include "CryPath.h"
-#include <Common/RenderCapabilities.h>
-#include <AzCore/std/algorithm.h>
-#include <AzFramework/Archive/IArchive.h>
-#include <AzCore/NativeUI/NativeUIRequests.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define SHADERCORE_CPP_SECTION_1 1
-#define SHADERCORE_CPP_SECTION_2 2
-#endif
-
-CShader* CShaderMan::s_DefaultShader;
-CShader* CShaderMan::s_shPostEffects;
-CShader* CShaderMan::s_shPostDepthOfField;
-CShader* CShaderMan::s_shPostMotionBlur;
-CShader* CShaderMan::s_shPostSunShafts;
-CShader* CShaderMan::s_shDeferredShading;
-CShader* CShaderMan::s_ShaderDeferredCaustics;
-CShader* CShaderMan::s_ShaderDeferredRain;
-CShader* CShaderMan::s_ShaderDeferredSnow;
-#ifndef NULL_RENDERER
-CShader* CShaderMan::s_ShaderFPEmu;
-CShader* CShaderMan::s_ShaderUI;
-CShader* CShaderMan::s_ShaderFallback;
-CShader* CShaderMan::s_ShaderStars;
-
-CShader* CShaderMan::s_ShaderShadowBlur;
-CShader* CShaderMan::s_ShaderShadowMaskGen;
-#if defined(FEATURE_SVO_GI)
-CShader* CShaderMan::s_ShaderSVOGI;
-#endif
-CShader* CShaderMan::s_shHDRPostProcess;
-CShader* CShaderMan::s_ShaderDebug;
-CShader* CShaderMan::s_ShaderLensOptics;
-CShader* CShaderMan::s_ShaderSoftOcclusionQuery;
-CShader* CShaderMan::s_ShaderLightStyles;
-CShader* CShaderMan::s_shPostEffectsGame;
-CShader* CShaderMan::s_shPostAA;
-CShader* CShaderMan::s_ShaderCommon;
-CShader* CShaderMan::s_ShaderOcclTest;
-CShader* CShaderMan::s_ShaderDXTCompress = nullptr;
-CShader* CShaderMan::s_ShaderStereo = nullptr;
-CShader* CShaderMan::s_ShaderFur = nullptr;
-CShader* CShaderMan::s_ShaderVideo = nullptr;
-#else
-SShaderItem CShaderMan::s_DefaultShaderItem;
-#endif
-
-CCryNameTSCRC CShaderMan::s_cNameHEAD;
-
-TArray<CShaderResources*> CShader::s_ShaderResources_known;  // Based on BatteryPark
-TArray <CLightStyle*> CLightStyle::s_LStyles;
-
-SResourceContainer* CShaderMan::s_pContainer;  // List/Map of objects for shaders resource class
-FXCompressedShaders CHWShader::m_CompressedShaders;
-
-uint64 g_HWSR_MaskBit[HWSR_MAX];
-AZStd::pair<const char*, uint64> g_HWSST_Flags[] =
-{
-#undef FX_STATIC_FLAG
-#define FX_STATIC_FLAG(flag) AZStd::make_pair("%ST_"#flag, 0),
-#include "ShaderStaticFlags.inl"
-};
-
-bool gbRgb;
-
-////////////////////////////////////////////////////////////////////////////////
-// Pool for texture modificators
-
-#if POOL_TEXMODIFICATORS
-
-SEfTexModPool::ModificatorList SEfTexModPool::s_pool;
-volatile int SEfTexModPool::s_lockState = 0;
-
-SEfTexModificator* SEfTexModPool::Add(SEfTexModificator& mod)
-{
-    mod.m_crc = CCrc32::Compute((const char*)&mod, sizeof(SEfTexModificator) - sizeof(uint16) - sizeof(uint32));
-    ModificatorList::iterator it = s_pool.find(mod.m_crc);
-    if (it != s_pool.end())
-    {
-        ++((*it).second->m_refs);
-        return it->second;
-    }
-    mod.m_refs = 1;
-    SEfTexModificator* pMod = new SEfTexModificator(mod);
-    s_pool.insert(std::pair<uint32, SEfTexModificator*>(mod.m_crc, pMod));
-
-    return pMod;
-}
-
-void SEfTexModPool::AddRef(SEfTexModificator* pMod)
-{
-    Lock();
-    if (pMod)
-    {
-        ++(pMod->m_refs);
-    }
-    Unlock();
-}
-
-void SEfTexModPool::Remove(SEfTexModificator* pMod)
-{
-    Lock();
-    Remove_NoLock(pMod);
-    Unlock();
-}
-
-void SEfTexModPool::Remove_NoLock(SEfTexModificator* pMod)
-{
-    if (pMod)
-    {
-        if (pMod->m_refs > 1)
-        {
-            --(pMod->m_refs);
-        }
-        else
-        {
-            ModificatorList::iterator it = s_pool.find(pMod->m_crc);
-            if (it != s_pool.end())
-            {
-                delete pMod;
-                s_pool.erase(it);
-            }
-        }
-    }
-}
-
-void SEfTexModPool::Update(SEfTexModificator*& pMod, SEfTexModificator& newMod)
-{
-    Lock();
-    if (pMod)
-    {
-        if (pMod->m_refs == 1)
-        {
-            *pMod = newMod;
-        }
-        else if (memcmp(pMod, &newMod, sizeof(SEfTexModificator) - sizeof(uint16) - sizeof(uint32)))            // Ignore reference count and crc
-        {
-            Remove_NoLock(pMod);
-            pMod = Add(newMod);
-        }
-    }
-    else
-    {
-        pMod = Add(newMod);
-    }
-    Unlock();
-}
-
-void SEfTexModPool::Lock(void)
-{
-    CrySpinLock(&s_lockState, 0, 1);
-    // Locked
-}
-
-void SEfTexModPool::Unlock(void)
-{
-    CrySpinLock(&s_lockState, 1, 0);
-    // Unlocked
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-
-EShaderLanguage GetShaderLanguage()
-{
-    EShaderLanguage shaderLanguage = eSL_Unknown;
-    if (CParserBin::m_nPlatform == SF_ORBIS)
-    {
-        shaderLanguage = eSL_Orbis;
-    }
-    else if (CParserBin::m_nPlatform == SF_D3D11)
-    {
-        shaderLanguage = eSL_D3D11;
-    }
-    else if (CParserBin::m_nPlatform == SF_GL4)
-    {
-        shaderLanguage = eSL_GL4_4;
-    }
-    else if (CParserBin::m_nPlatform == SF_GLES3)
-    {
-        shaderLanguage = gRenDev->m_cEF.HasStaticFlag(HWSST_GLES3_0) ? eSL_GLES3_0 : eSL_GLES3_1;
-    }
-    else if (CParserBin::m_nPlatform == SF_METAL)
-    {
-        shaderLanguage = eSL_METAL;
-    }
-    else if (CParserBin::m_nPlatform == SF_JASPER)
-    {
-        shaderLanguage = eSL_Jasper;
-    }
-
-    return shaderLanguage;
-}
-
-const char* GetShaderLanguageName()
-{
-    static const char *platformNames[eSL_MAX] =
-    {
-        "Unknown",
-        "Orbis",
-        "D3D11",
-        "GL4",
-        "GL4",
-        "GLES3",
-        "GLES3",
-        "METAL",
-        "Jasper"
-    };
-
-    EShaderLanguage shaderLanguage = GetShaderLanguage();
-    return platformNames[shaderLanguage];
-}
-
-const char* GetShaderLanguageResourceName()
-{
-    static const char *platformResourceNames[eSL_MAX] =
-    {
-        "(UNK)",
-        "(O)",
-        "(DX1)",
-        "(G4)",
-        "(G4)",
-        "(E3)",
-        "(E3)",
-        "(MET)",
-        "(JAS)"
-    };
-
-    EShaderLanguage shaderLanguage = GetShaderLanguage();
-    return platformResourceNames[shaderLanguage];
-}
-
-AZStd::string GetShaderListFilename()
-{
-    return AZStd::string::format("ShaderList_%s.txt", GetShaderLanguageName());
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// Global shader parser helper pointer.
-CShaderParserHelper* g_pShaderParserHelper = 0;
-
-//=================================================================================================
-
-int CShader::GetTexId()
-{
-    CTexture* tp = (CTexture*)GetBaseTexture(NULL, NULL);
-    if (!tp)
-    {
-        return -1;
-    }
-    return tp->GetTextureID();
-}
-
-int CShader::mfSize()
-{
-    uint32 i;
-
-    int nSize = sizeof(CShader);
-    nSize += m_NameFile.capacity();
-    nSize += m_NameShader.capacity();
-    nSize += m_HWTechniques.GetMemoryUsage();
-    for (i = 0; i < m_HWTechniques.Num(); i++)
-    {
-        nSize += m_HWTechniques[i]->Size();
-    }
-
-    return nSize;
-}
-
-void CShader::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->Add(*this);
-    pSizer->AddObject(m_NameFile);
-    pSizer->AddObject(m_NameShader);
-    pSizer->AddObject(m_HWTechniques);
-}
-
-void CShader::mfFree()
-{
-    uint32 i;
-
-    for (i = 0; i < m_HWTechniques.Num(); i++)
-    {
-        SShaderTechnique* pTech = m_HWTechniques[i];
-        SAFE_DELETE(pTech);
-    }
-    m_HWTechniques.Free();
-
-    //SAFE_DELETE(m_ShaderGenParams);
-    m_Flags &= ~(EF_PARSE_MASK | EF_NODRAW);
-    m_nMDV = 0;
-}
-
-CShader::~CShader()
-{
-    gRenDev->m_cEF.m_Bin.mfRemoveFXParams(this);
-
-    if (m_pGenShader && m_pGenShader->m_DerivedShaders)
-    {
-        uint32 i;
-        for (i = 0; i < m_pGenShader->m_DerivedShaders->size(); i++)
-        {
-            CShader* pSH = (*m_pGenShader->m_DerivedShaders)[i];
-            if (pSH == this)
-            {
-                (*m_pGenShader->m_DerivedShaders)[i] = NULL;
-                break;
-            }
-        }
-        assert(i != m_pGenShader->m_DerivedShaders->size());
-    }
-    mfFree();
-
-    SAFE_RELEASE(m_pGenShader);
-    SAFE_DELETE(m_DerivedShaders);
-}
-
-CShader& CShader::operator = (const CShader& src)
-{
-    uint32 i;
-
-    mfFree();
-
-    int Offs = (int)(INT_PTR)&(((CShader*)0)->m_eSHDType);
-    byte* d = (byte*)this;
-    byte* s = (byte*)&src;
-    memcpy(&d[Offs], &s[Offs], sizeof(CShader) - Offs);
-
-    m_NameShader = src.m_NameShader;
-    m_NameFile = src.m_NameFile;
-    m_NameShaderICRC = src.m_NameShaderICRC;
-
-    if (src.m_HWTechniques.Num())
-    {
-        m_HWTechniques.Create(src.m_HWTechniques.Num());
-        for (i = 0; i < src.m_HWTechniques.Num(); i++)
-        {
-            m_HWTechniques[i] = new SShaderTechnique(this);
-            *m_HWTechniques[i] = *src.m_HWTechniques[i];
-            m_HWTechniques[i]->m_shader = this; // copy operator will override m_shader
-        }
-    }
-
-    return *this;
-}
-
-SShaderPass::SShaderPass()
-{
-    m_RenderState = GS_DEPTHWRITE;
-
-    m_PassFlags = 0;
-    m_AlphaRef = ~0;
-
-    m_VShader = NULL;
-    m_PShader = NULL;
-    m_GShader = NULL;
-    m_DShader = NULL;
-    m_HShader = NULL;
-}
-
-
-bool SShaderItem::IsMergable(SShaderItem& PrevSI)
-{
-    if (!PrevSI.m_pShader)
-    {
-        return true;
-    }
-    CShaderResources* pRP = (CShaderResources*)PrevSI.m_pShaderResources;
-    CShaderResources* pR = (CShaderResources*)m_pShaderResources;
-    if (pRP && pR)
-    {
-        if (pRP->m_AlphaRef != pR->m_AlphaRef)
-        {
-            return false;
-        }
-        if (pRP->GetStrengthValue(EFTT_OPACITY) != pR->GetStrengthValue(EFTT_OPACITY))
-        {
-            return false;
-        }
-        if (pRP->m_pDeformInfo != pR->m_pDeformInfo)
-        {
-            return false;
-        }
-        if ((pRP->m_ResFlags & MTL_FLAG_2SIDED) != (pR->m_ResFlags & MTL_FLAG_2SIDED))
-        {
-            return false;
-        }
-        if ((pRP->m_ResFlags & MTL_FLAG_NOSHADOW) != (pR->m_ResFlags & MTL_FLAG_NOSHADOW))
-        {
-            return false;
-        }
-        if (m_pShader->GetCull() != PrevSI.m_pShader->GetCull())
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-void SShaderTechnique::UpdatePreprocessFlags([[maybe_unused]] CShader* pSH)
-{
-    uint32 i;
-    for (i = 0; i < m_Passes.Num(); i++)
-    {
-        SShaderPass* pPass = &m_Passes[i];
-        if (pPass->m_PShader)
-        {
-            pPass->m_PShader->mfUpdatePreprocessFlags(this);
-        }
-    }
-}
-
-SShaderTechnique* CShader::mfGetStartTechnique(int nTechnique)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    SShaderTechnique* pTech;
-    if (m_HWTechniques.Num())
-    {
-        pTech = m_HWTechniques[0];
-        if (nTechnique > 0)
-        {
-            assert(nTechnique < (int)m_HWTechniques.Num());
-            if (nTechnique < (int)m_HWTechniques.Num())
-            {
-                pTech = m_HWTechniques[nTechnique];
-            }
-            else
-            {
-                iLog->Log("ERROR: CShader::mfGetStartTechnique: Technique %d for shader '%s' is out of range", nTechnique, GetName());
-            }
-        }
-    }
-    else
-    {
-        pTech = NULL;
-    }
-
-    return pTech;
-}
-SShaderTechnique* CShader::GetTechnique(int nStartTechnique, int nRequestedTechnique)
-{
-    SShaderTechnique* pTech = 0;
-    if (m_HWTechniques.Num())
-    {
-        pTech = m_HWTechniques[0];
-        if (nStartTechnique > 0)
-        {
-            assert(nStartTechnique < (int)m_HWTechniques.Num());
-            if (nStartTechnique < (int)m_HWTechniques.Num())
-            {
-                pTech = m_HWTechniques[nStartTechnique];
-            }
-            else
-            {
-                LogWarning("ERROR: CShader::GetTechnique: Technique %d for shader '%s' is out of range", nStartTechnique, GetName());
-            }
-        }
-    }
-    else
-    {
-        pTech = nullptr;
-    }
-
-    if (!pTech ||
-        pTech->m_nTechnique[nRequestedTechnique] < 0 ||
-        pTech->m_nTechnique[nRequestedTechnique] >= (int)m_HWTechniques.Num())
-    {
-        LogWarning("ERROR: CShader::GetTechnique: No Technique (%d,%d) for shader '%s' ", nStartTechnique, nRequestedTechnique, GetName());
-        return nullptr;
-    }
-    pTech = m_HWTechniques[pTech->m_nTechnique[nRequestedTechnique]];
-
-    return pTech;
-}
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-void CShader::mfFlushCache()
-{
-    uint32 n, m;
-
-    mfFlushPendedShaders();
-
-    if (SEmptyCombination::s_Combinations.size())
-    {
-        // Flush the cache before storing any empty combinations
-        CHWShader::mfFlushPendedShadersWait(-1);
-        for (m = 0; m < SEmptyCombination::s_Combinations.size(); m++)
-        {
-            SEmptyCombination& Comb = SEmptyCombination::s_Combinations[m];
-            Comb.pShader->mfStoreEmptyCombination(Comb);
-        }
-        SEmptyCombination::s_Combinations.clear();
-    }
-
-    for (m = 0; m < m_HWTechniques.Num(); m++)
-    {
-        SShaderTechnique* pTech = m_HWTechniques[m];
-        for (n = 0; n < pTech->m_Passes.Num(); n++)
-        {
-            SShaderPass* pPass = &pTech->m_Passes[n];
-            if (pPass->m_PShader)
-            {
-                pPass->m_PShader->mfFlushCacheFile();
-            }
-            if (pPass->m_VShader)
-            {
-                pPass->m_VShader->mfFlushCacheFile();
-            }
-        }
-    }
-}
-#endif
-
-void CShaderResources::PostLoad(CShader* pSH)
-{
-    AdjustForSpec();
-    if (pSH && (pSH->m_Flags & EF_SKY))
-    {
-        SEfResTexture*      pTextureRes = GetTextureResource(EFTT_DIFFUSE);
-        if (pTextureRes && !pTextureRes->m_Name.empty())
-        {
-            char    sky[128];
-            char    path[1024];
-
-            azstrcpy(sky, AZ_ARRAY_SIZE(sky), pTextureRes->m_Name.c_str());
-            int size = strlen(sky);
-            const char* ext = fpGetExtension(sky);
-            if (size > 0)
-            {
-                while (sky[size] != '_')   
-                {
-                    size--;
-                    if (!size)
-                    {
-                        break;
-                    }
-                }
-            }
-            sky[size] = 0;
-            if (size)
-            {
-                m_pSky = new SSkyInfo;
-                sprintf_s(path, "%s_12%s", sky, ext);
-                m_pSky->m_SkyBox[0] = CTexture::ForName(path, 0, eTF_Unknown);
-                sprintf_s(path, "%s_34%s", sky, ext);
-                m_pSky->m_SkyBox[1] = CTexture::ForName(path, 0, eTF_Unknown);
-                sprintf_s(path, "%s_5%s", sky, ext);
-                m_pSky->m_SkyBox[2] = CTexture::ForName(path, 0, eTF_Unknown);
-            }
-        }
-    }
-
-    UpdateConstants(pSH);
-}
-
-SShaderTexSlots* CShader::GetUsedTextureSlots(int nTechnique)
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_ReflectTextureSlots)
-    {
-        return NULL;
-    }
-    if (nTechnique < 0 || nTechnique >= TTYPE_MAX)
-    {
-        return NULL;
-    }
-    return m_ShaderTexSlots[nTechnique];
-}
-
-AZStd::vector<SShaderParam>& CShader::GetPublicParams()
-{
-    SShaderFXParams& FXP = gRenDev->m_cEF.m_Bin.mfGetFXParams(this);
-    return FXP.m_PublicParams;
-}
-
-CTexture* CShader::mfFindBaseTexture([[maybe_unused]] TArray<SShaderPass>& Passes, [[maybe_unused]] int* nPass, [[maybe_unused]] int* nTU)
-{
-    return NULL;
-}
-
-ITexture* CShader::GetBaseTexture(int* nPass, int* nTU)
-{
-    for (uint32 i = 0; i < m_HWTechniques.Num(); i++)
-    {
-        SShaderTechnique* hw = m_HWTechniques[i];
-        CTexture* tx = mfFindBaseTexture(hw->m_Passes, nPass, nTU);
-        if (tx)
-        {
-            return tx;
-        }
-    }
-    if (nPass)
-    {
-        *nPass = -1;
-    }
-    if (nTU)
-    {
-        *nTU = -1;
-    }
-    return NULL;
-}
-
-unsigned int CShader::GetUsedTextureTypes (void)
-{
-    uint32 nMask = 0xffffffff;
-
-    return nMask;
-}
-
-//================================================================================
-
-void CShaderMan::mfReleaseShaders ()
-{
-    CCryNameTSCRC Name = CShader::mfGetClassName();
-
-    AUTO_LOCK(CBaseResource::s_cResLock);
-
-    SResourceContainer* pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        int n = 0;
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); )
-        {
-            CShader* sh = (CShader*)itor->second;
-            itor++;
-            if (!sh)
-            {
-                continue;
-            }
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_printmemoryleaks && !(sh->m_Flags & EF_SYSTEM))
-            {
-                iLog->Log("Warning: CShaderMan::mfClearAll: Shader %s was not deleted (%d)", sh->GetName(), sh->GetRefCounter());
-            }
-            SAFE_RELEASE(sh);
-            n++;
-        }
-    }
-}
-
-void CShaderMan::ShutDown(void)
-{
-    uint32 i;
-
-    m_Bin.InvalidateCache();
-
-    mfReleaseSystemShaders();
-    gRenDev->ForceFlushRTCommands();
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_releaseallresourcesonexit)
-    {
-        //if (gRenDev->m_cEF.m_bInitialized)
-        //  mfReleaseShaders();
-
-        for (i = 0; i < CShader::s_ShaderResources_known.Num(); i++)
-        {
-            CShaderResources* pSR = CShader::s_ShaderResources_known[i];
-            if (!pSR)
-            {
-                continue;
-            }
-            if (i)
-            {
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_printmemoryleaks)
-                {
-                    iLog->Log("Warning: CShaderMan::mfClearAll: Shader resource %p was not deleted", pSR);
-                }
-            }
-            delete pSR;
-        }
-        CShader::s_ShaderResources_known.Free();
-    }
-
-    {
-        AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-        m_ShaderNames.clear();
-
-        std::for_each(m_pShadersGlobalFlags.begin(), m_pShadersGlobalFlags.end(), SShaderMapNameFlagsContainerDelete());
-
-        m_pShadersGlobalFlags.clear();
-        m_pShaderCommonGlobalFlag.clear();
-    }
-
-
-    CCryNameTSCRC Name;
-
-    SAFE_DELETE(m_pGlobalExt);
-
-    for (i = 0; i < CLightStyle::s_LStyles.Num(); i++)
-    {
-        delete CLightStyle::s_LStyles[i];
-    }
-    CLightStyle::s_LStyles.Free();
-    m_SGC.clear();
-    m_ShaderCacheCombinations[0].clear();
-    m_ShaderCacheCombinations[1].clear();
-    m_ShaderCacheExportCombinations.clear();
-    SAFE_DELETE(m_pGlobalExt);
-    mfCloseShadersCache(0);
-    mfCloseShadersCache(1);
-
-    m_bInitialized = false;
-
-    Terrain::TerrainShaderRequestBus::Handler::BusDisconnect();
-    AZ::MaterialNotificationEventBus::Handler::BusDisconnect();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CShaderMan:: mfCreateCommonGlobalFlags([[maybe_unused]] const char* szName)
-{
-    // Create globals.txt
-
-    assert(szName);
-    uint32 nCurrMaskCount = 0;
-    const char* pszShaderExtPath = "Shaders/";
-
-    char dirn[256];
-    cry_strcpy(dirn, pszShaderExtPath);
-    cry_strcat(dirn, "*");
-
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst (dirn);
-    if (!handle)// failed search
-    {
-        return;
-    }
-
-    do
-    {
-        // Scan for extension script files - add common flags names into globals list
-
-        if (handle.m_filename.front() == '.' || (handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-        {
-            continue;
-        }
-
-        const char* pszExt = PathUtil::GetExt(handle.m_filename.data());
-        if (azstricmp(pszExt, "ext"))
-        {
-            continue;
-        }
-
-
-        char pszFileName[256];
-        azsnprintf(pszFileName, AZ_ARRAY_SIZE(pszFileName), "%s%.*s", pszShaderExtPath, aznumeric_cast<int>(handle.m_filename.size()), handle.m_filename.data());
-
-        AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
-        if (AZ::IO::FileIOBase::GetInstance()->Open(pszFileName, AZ::IO::OpenMode::ModeRead, fileHandle))
-        {
-            
-            AZ::u64 fileSize = 0;
-            AZ::u64 bytesRead = 0;
-            AZ::IO::FileIOBase::GetInstance()->Size(fileHandle, fileSize);
-            char* buf = new char [fileSize + 1];
-            AZ::IO::FileIOBase::GetInstance()->Read(fileHandle, buf, fileSize, false, &bytesRead);
-            AZ::IO::FileIOBase::GetInstance()->Close(fileHandle);
-            buf[bytesRead] = 0;
-
-            // Check if global flags are common
-            char* pCurrOffset = strstr(buf, "UsesCommonGlobalFlags");
-            if (pCurrOffset)
-            {
-                AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-                // add shader to list
-                string pszShaderName = PathUtil::GetFileName(handle.m_filename.data());
-                pszShaderName.MakeUpper();
-                m_pShadersRemapList += string("%") + pszShaderName;
-
-                pCurrOffset = strstr(pCurrOffset, "Name");
-                while (pCurrOffset)
-                {
-                    pCurrOffset += 4;
-                    char dummy[256] = "\n";
-                    char name[256] = "\n";
-#ifndef NDEBUG
-                    int res =
-#endif
-                        azsscanf(pCurrOffset, "%s %s", dummy
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-                    , (unsigned int)AZ_ARRAY_SIZE(dummy)
-#endif
-                    , name
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-                    , (unsigned int)AZ_ARRAY_SIZE(name)
-#endif
-                    ); // Get flag name..
-                    assert(res);
-
-                    string pszNameFlag = name;
-                    pszNameFlag.MakeUpper();
-
-                    MapNameFlagsItor pCheck = m_pShaderCommonGlobalFlag.find(pszNameFlag);
-                    if (pCheck == m_pShaderCommonGlobalFlag.end())
-                    {
-                        m_pShaderCommonGlobalFlag.insert(MapNameFlagsItor::value_type(pszNameFlag, 0));
-                        if (++nCurrMaskCount >= 64) // sanity check
-                        {
-                            assert(0);
-                            break;
-                        }
-                    }
-                    pCurrOffset = strstr(pCurrOffset, "Name");
-                }
-            }
-
-            SAFE_DELETE_ARRAY(buf);
-        }
-
-        if (nCurrMaskCount >= 64)
-        {
-            break;
-        }
-    } while (handle = gEnv->pCryPak->FindNext(handle));
-
-    gEnv->pCryPak->FindClose (handle);
-
-    if (nCurrMaskCount >= 64)
-    {
-        iLog->Log("ERROR: CShaderMan::mfCreateCommonGlobalFlags: too many common global flags");
-    }
-
-    uint64 nCurrGenMask = 0;
-
-    {
-        AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-        MapNameFlagsItor pIter = m_pShaderCommonGlobalFlag.begin();
-        MapNameFlagsItor pEnd = m_pShaderCommonGlobalFlag.end();
-        for (; pIter != pEnd; ++pIter, ++nCurrGenMask)
-        {
-            // Set mask value
-            pIter->second = ((uint64)1) << nCurrGenMask;
-        }
-    }
-
-    mfRemapCommonGlobalFlagsWithLegacy();
-#if !defined (_RELEASE)
-    if (nCurrMaskCount > 0)
-    {
-        mfSaveCommonGlobalFlagsToDisk(szName, nCurrMaskCount);
-    }
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CShaderMan::mfSaveCommonGlobalFlagsToDisk(const char* szName, [[maybe_unused]] uint32 nMaskCount)
-{
-    // Write all flags
-    assert(nMaskCount);
-
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(szName, "w");
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        gEnv->pCryPak->FPrintf(fileHandle, "FX_CACHE_VER %f\n", FX_CACHE_VER);
-        gEnv->pCryPak->FPrintf(fileHandle, "%s\n\n", m_pShadersRemapList.c_str());
-
-        MapNameFlagsItor pIter = m_pShaderCommonGlobalFlag.begin();
-        MapNameFlagsItor pEnd = m_pShaderCommonGlobalFlag.end();
-
-        for (; pIter != pEnd; ++pIter)
-        {
-            gEnv->pCryPak->FPrintf(fileHandle, "%s "
-#if defined(__GNUC__)
-                "%llx\n"
-#else
-                "%I64x\n"
-#endif
-                , (pIter->first).c_str(), pIter->second);
-        }
-
-        gEnv->pCryPak->FClose(fileHandle);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CShaderMan::mfInitCommonGlobalFlagsLegacyFix(void)
-{
-    // Store original values since common material flags where introduced
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%ALPHAGLOW", (uint64)0x2));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%ALPHAMASK_DETAILMAP", (uint64)0x4));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%ANISO_SPECULAR", (uint64)0x8));
-
-    // 0x10 is unused
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%BUMP_DIFFUSE", (uint64)0x20));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%CHARACTER_DECAL", (uint64)0x40));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%CUSTOM_SPECULAR", (uint64)0x400));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%DECAL", (uint64)0x800));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%DETAIL_BENDING", (uint64)0x1000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%DETAIL_BUMP_MAPPING", (uint64)0x2000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%DISABLE_RAIN_PASS", (uint64)0x4000));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%ENVIRONMENT_MAP", (uint64)0x10000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%EYE_OVERLAY", (uint64)0x20000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%GLOSS_DIFFUSEALPHA", (uint64)0x40000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%GLOSS_MAP", (uint64)0x80000));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%GRADIENT_COLORING", (uint64)0x100000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%GRASS", (uint64)0x200000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%IRIS", (uint64)0x400000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%LEAVES", (uint64)0x800000));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%NANOSUIT_EFFECTS", (uint64)0x1000000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%OFFSET_BUMP_MAPPING", (uint64)0x2000000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%PARALLAX_OCCLUSION_MAPPING", (uint64)0x8000000));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%REALTIME_MIRROR_REFLECTION", (uint64)0x10000000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%REFRACTION_MAP", (uint64)0x20000000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%RIM_LIGHTING", (uint64)0x40000000));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%SPECULARPOW_GLOSSALPHA", (uint64)0x80000000));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%TEMP_TERRAIN", (uint64)0x200000000ULL));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%TEMP_VEGETATION", (uint64)0x400000000ULL));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%TERRAINHEIGHTADAPTION", (uint64)0x800000000ULL));
-
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%TWO_SIDED_SORTING", (uint64)0x1000000000ULL));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%VERTCOLORS", (uint64)0x2000000000ULL));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%WIND_BENDING", (uint64)0x4000000000ULL));
-    m_pSCGFlagLegacyFix.insert(MapNameFlagsItor::value_type("%WRINKLE_BLENDING", (uint64)0x8000000000ULL));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CShaderMan::mfRemapCommonGlobalFlagsWithLegacy(void)
-{
-    MapNameFlagsItor pFixIter = m_pSCGFlagLegacyFix.begin();
-    MapNameFlagsItor pFixEnd = m_pSCGFlagLegacyFix.end();
-
-    AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-    MapNameFlagsItor pCommonGlobalsEnd = m_pShaderCommonGlobalFlag.end();
-
-    bool bRemaped = false;
-    for (; pFixIter != pFixEnd; ++pFixIter)
-    {
-        MapNameFlagsItor pFoundMatch = m_pShaderCommonGlobalFlag.find(pFixIter->first);
-        if (pFoundMatch != pCommonGlobalsEnd)
-        {
-            // Found a match, replace value
-            uint64 nRemapedMask = pFixIter->second;
-            uint64 nOldMask = pFoundMatch->second;
-            pFoundMatch->second = nRemapedMask;
-
-            // Search for duplicates and swap with old mask
-            MapNameFlagsItor pCommonGlobalsIter = m_pShaderCommonGlobalFlag.begin();
-            for (; pCommonGlobalsIter != pCommonGlobalsEnd; ++pCommonGlobalsIter)
-            {
-                if (pFoundMatch != pCommonGlobalsIter && pCommonGlobalsIter->second == nRemapedMask)
-                {
-                    pCommonGlobalsIter->second = nOldMask;
-                    bRemaped = true;
-                    break;
-                }
-            }
-        }
-    }
-
-    // Create existing flags mask
-    MapNameFlagsItor pIter = m_pShaderCommonGlobalFlag.begin();
-    MapNameFlagsItor pEnd = m_pShaderCommonGlobalFlag.end();
-    m_nSGFlagsFix = 0;
-    for (; pIter != pEnd; ++pIter)
-    {
-        m_nSGFlagsFix |= (pIter->second);
-    }
-
-    return bRemaped;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CShaderMan::mfInitCommonGlobalFlags(void)
-{
-    mfInitCommonGlobalFlagsLegacyFix();
-
-    AZStd::string pszGlobalsPath = m_szCachePath + CONCAT_PATHS(g_shaderCache,"globals.txt");
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(pszGlobalsPath.c_str(), "r", AZ::IO::IArchive::FOPEN_HINT_QUIET);
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        char str[256] = "\n";
-        char name[128] = "\n";
-
-        gEnv->pCryPak->FGets(str, 256, fileHandle);
-        if (strstr(str, "FX_CACHE_VER"))
-        {
-            float fCacheVer = 0.0f;
-#ifndef NDEBUG
-            int res =
-#endif
-                azsscanf(str, "%s %f",
-            name,
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-            (unsigned int)AZ_ARRAY_SIZE(name),
-#endif
-            &fCacheVer);
-            assert(res);
-            if (!azstricmp(name, "FX_CACHE_VER") && fabs(FX_CACHE_VER - fCacheVer) >= 0.01f)
-            {
-                gEnv->pCryPak->FClose(fileHandle);
-                // re-create common global flags (shader cache bumped)
-                mfCreateCommonGlobalFlags(pszGlobalsPath.c_str());
-
-                return;
-            }
-        }
-
-        // get shader that need remapping slist
-        gEnv->pCryPak->FGets(str, 256, fileHandle);
-
-        uint32 nCurrMaskCount = 0;
-        {
-            AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-            m_pShadersRemapList = str;
-
-            while (!gEnv->pCryPak->FEof(fileHandle))
-            {
-                uint64 nGenMask = 0;
-                gEnv->pCryPak->FGets(str, 256, fileHandle);
-
-                if (azsscanf(str, "%s "
-#if defined(__GNUC__)
-                    "%llx"
-#else
-                    "%I64x"
-#endif
-                    , name,
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-                    (unsigned int)AZ_ARRAY_SIZE(name),
-#endif
-                    &nGenMask) > 1)
-                {
-                    m_pShaderCommonGlobalFlag.insert(MapNameFlagsItor::value_type(name, nGenMask));
-                    nCurrMaskCount++;
-                }
-            }
-        }
-
-        gEnv->pCryPak->FClose(fileHandle);
-
-        if (mfRemapCommonGlobalFlagsWithLegacy())
-        {
-            mfSaveCommonGlobalFlagsToDisk(pszGlobalsPath.c_str(), nCurrMaskCount);
-        }
-
-        return;
-    }
-
-    // create common global flags - not existing globals.txt
-    mfCreateCommonGlobalFlags(pszGlobalsPath.c_str());
-}
-
-void CShaderMan::mfInitLookups()
-{
-    m_ResLookupDataMan[CACHE_READONLY].Clear();
-    AZStd::string dirdatafilename(m_ShadersCache);
-    dirdatafilename += "lookupdata.bin";
-    m_ResLookupDataMan[CACHE_READONLY].LoadData(dirdatafilename.c_str(), CParserBin::m_bEndians, true);
-
-    m_ResLookupDataMan[CACHE_USER].Clear();
-    dirdatafilename = m_szCachePath + m_ShadersCache;
-    dirdatafilename += "lookupdata.bin";
-    m_ResLookupDataMan[CACHE_USER].LoadData(dirdatafilename.c_str(), CParserBin::m_bEndians, false);
-}
-void CShaderMan::mfInitLevelPolicies(void)
-{
-    SAFE_DELETE(m_pLevelsPolicies);
-
-    SShaderLevelPolicies* pPL = NULL;
-    char szN[256];
-    cry_strcpy(szN, "Shaders/");
-    cry_strcat(szN, "Levels.txt");
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(szN, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET);
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        pPL = new SShaderLevelPolicies;
-        AZ::u64 fileSize = 0;
-        AZ::IO::FileIOBase::GetInstance()->Size(fileHandle, fileSize);
-        char* buf = new char [fileSize + 1];
-        if (buf)
-        {
-            buf[fileSize] = 0;
-            gEnv->pCryPak->FRead(buf, fileSize, fileHandle);
-            mfCompileShaderLevelPolicies(pPL, buf);
-            delete [] buf;
-        }
-        gEnv->pCryPak->FClose(fileHandle);
-    }
-    m_pLevelsPolicies = pPL;
-}
-
-void CShaderMan::mfInitGlobal (void)
-{
-    SAFE_DELETE(m_pGlobalExt);
-    SShaderGen* pShGen = mfCreateShaderGenInfo("RunTime", true);
-
-#if defined(_RELEASE)
-    AZ_Assert(pShGen, "Fatal error: could not find required shader 'RunTime'.  This is typically placed in @assets@/shaders.pak for release builds.  Make sure BuildReleaseAuxiliaryContent.py has been run and all shaders have been included in the release packaging build.");
-#endif
-    
-    m_pGlobalExt = pShGen;
-    if (pShGen)
-    {
-        uint32 i;
-
-        for (i = 0; i < pShGen->m_BitMask.Num(); i++)
-        {
-            SShaderGenBit* gb = pShGen->m_BitMask[i];
-            if (!gb)
-            {
-                continue;
-            }
-            if (gb->m_ParamName == "%_RT_FOG")
-            {
-                g_HWSR_MaskBit[HWSR_FOG] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_AMBIENT")
-            {
-                g_HWSR_MaskBit[HWSR_AMBIENT] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_HDR_ENCODE")
-            {
-                g_HWSR_MaskBit[HWSR_HDR_ENCODE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_ALPHATEST")
-            {
-                g_HWSR_MaskBit[HWSR_ALPHATEST] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_HDR_MODE")
-            {
-                g_HWSR_MaskBit[HWSR_HDR_MODE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_NEAREST")
-            {
-                g_HWSR_MaskBit[HWSR_NEAREST] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SHADOW_MIXED_MAP_G16R16")
-            {
-                g_HWSR_MaskBit[HWSR_SHADOW_MIXED_MAP_G16R16] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_HW_PCF_COMPARE")
-            {
-                g_HWSR_MaskBit[HWSR_HW_PCF_COMPARE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SAMPLE0")
-            {
-                g_HWSR_MaskBit[HWSR_SAMPLE0] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SAMPLE1")
-            {
-                g_HWSR_MaskBit[HWSR_SAMPLE1] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SAMPLE2")
-            {
-                g_HWSR_MaskBit[HWSR_SAMPLE2] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SAMPLE3")
-            {
-                g_HWSR_MaskBit[HWSR_SAMPLE3] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_ALPHABLEND")
-            {
-                g_HWSR_MaskBit[HWSR_ALPHABLEND] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_QUALITY")
-            {
-                g_HWSR_MaskBit[HWSR_QUALITY] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_QUALITY1")
-            {
-                g_HWSR_MaskBit[HWSR_QUALITY1] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_INSTANCING_ATTR")
-            {
-                g_HWSR_MaskBit[HWSR_INSTANCING_ATTR] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_NOZPASS")
-            {
-                g_HWSR_MaskBit[HWSR_NOZPASS] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_NO_TESSELLATION")
-            {
-                g_HWSR_MaskBit[HWSR_NO_TESSELLATION] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_APPLY_TOON_SHADING")
-            {
-                g_HWSR_MaskBit[HWSR_APPLY_TOON_SHADING] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_VERTEX_VELOCITY")
-            {
-                g_HWSR_MaskBit[HWSR_VERTEX_VELOCITY] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_OBJ_IDENTITY")
-            {
-                g_HWSR_MaskBit[HWSR_OBJ_IDENTITY] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SKINNING_DUAL_QUAT")
-            {
-                g_HWSR_MaskBit[HWSR_SKINNING_DUAL_QUAT] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SKINNING_DQ_LINEAR")
-            {
-                g_HWSR_MaskBit[HWSR_SKINNING_DQ_LINEAR] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SKINNING_MATRIX")
-            {
-                g_HWSR_MaskBit[HWSR_SKINNING_MATRIX] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DISSOLVE")
-            {
-                g_HWSR_MaskBit[HWSR_DISSOLVE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SOFT_PARTICLE")
-            {
-                g_HWSR_MaskBit[HWSR_SOFT_PARTICLE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_LIGHT_TEX_PROJ")
-            {
-                g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SHADOW_JITTERING")
-            {
-                g_HWSR_MaskBit[HWSR_SHADOW_JITTERING] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_PARTICLE_SHADOW")
-            {
-                g_HWSR_MaskBit[HWSR_PARTICLE_SHADOW] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_BLEND_WITH_TERRAIN_COLOR")
-            {
-                // Just leaving this here for backwards compatibility - nothing to do
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SPRITE")
-            {
-                g_HWSR_MaskBit[HWSR_SPRITE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DEBUG0")
-            {
-                g_HWSR_MaskBit[HWSR_DEBUG0] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DEBUG1")
-            {
-                g_HWSR_MaskBit[HWSR_DEBUG1] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DEBUG2")
-            {
-                g_HWSR_MaskBit[HWSR_DEBUG2] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DEBUG3")
-            {
-                g_HWSR_MaskBit[HWSR_DEBUG3] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_POINT_LIGHT")
-            {
-                g_HWSR_MaskBit[HWSR_POINT_LIGHT] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_CUBEMAP0")
-            {
-                g_HWSR_MaskBit[HWSR_CUBEMAP0] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DECAL_TEXGEN_2D")
-            {
-                g_HWSR_MaskBit[HWSR_DECAL_TEXGEN_2D] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_OCEAN_PARTICLE")
-            {
-                g_HWSR_MaskBit[HWSR_OCEAN_PARTICLE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SAMPLE4")
-            {
-                g_HWSR_MaskBit[HWSR_SAMPLE4] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SAMPLE5")
-            {
-                g_HWSR_MaskBit[HWSR_SAMPLE5] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_FOG_VOLUME_HIGH_QUALITY_SHADER")
-            {
-                g_HWSR_MaskBit[HWSR_FOG_VOLUME_HIGH_QUALITY_SHADER] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_APPLY_SSDO")
-            {
-                g_HWSR_MaskBit[HWSR_APPLY_SSDO] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_GLOBAL_ILLUMINATION")
-            {
-                g_HWSR_MaskBit[HWSR_GLOBAL_ILLUMINATION] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_ANIM_BLEND")
-            {
-                g_HWSR_MaskBit[HWSR_ANIM_BLEND] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_MOTION_BLUR")
-            {
-                g_HWSR_MaskBit[HWSR_MOTION_BLUR] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_ENVIRONMENT_CUBEMAP")
-            {
-                g_HWSR_MaskBit[HWSR_ENVIRONMENT_CUBEMAP] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_LIGHTVOLUME0")
-            {
-                g_HWSR_MaskBit[HWSR_LIGHTVOLUME0] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_LIGHTVOLUME1")
-            {
-                g_HWSR_MaskBit[HWSR_LIGHTVOLUME1] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_TILED_SHADING")
-            {
-                g_HWSR_MaskBit[HWSR_TILED_SHADING] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_VOLUMETRIC_FOG")
-            {
-                g_HWSR_MaskBit[HWSR_VOLUMETRIC_FOG] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_REVERSE_DEPTH")
-            {
-                g_HWSR_MaskBit[HWSR_REVERSE_DEPTH] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_GPU_PARTICLE_SHADOW_PASS")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_SHADOW_PASS] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_GPU_PARTICLE_DEPTH_COLLISION")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_DEPTH_COLLISION] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_GPU_PARTICLE_TURBULENCE")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_TURBULENCE] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_GPU_PARTICLE_UV_ANIMATION")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_UV_ANIMATION] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_NORMAL_MAP")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_NORMAL_MAP] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_GLOW_MAP")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_GLOW_MAP] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_CUBEMAP_DEPTH_COLLISION")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_CUBEMAP_DEPTH_COLLISION] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_WRITEBACK_DEATH_LOCATIONS")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_WRITEBACK_DEATH_LOCATIONS] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_TARGET_ATTRACTION")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_TARGET_ATTRACTION] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_SHAPE_ANGLE")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_SHAPE_ANGLE] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_SHAPE_BOX")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_SHAPE_BOX] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_SHAPE_POINT")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_SHAPE_POINT] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_SHAPE_CIRCLE")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_SHAPE_CIRCLE] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_SHAPE_SPHERE")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_SHAPE_SPHERE] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_GPU_PARTICLE_WIND")
-            {
-                g_HWSR_MaskBit[HWSR_GPU_PARTICLE_WIND] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_MULTI_LAYER_ALPHA_BLEND")
-            {
-                g_HWSR_MaskBit[HWSR_MULTI_LAYER_ALPHA_BLEND] = gb->m_Mask;
-            }
-            else if (gb->m_ParamName == "%_RT_ADDITIVE_BLENDING")
-            {
-                g_HWSR_MaskBit[HWSR_ADDITIVE_BLENDING] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SRGB0")
-            {
-                g_HWSR_MaskBit[HWSR_SRGB0] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SRGB1")
-            {
-                g_HWSR_MaskBit[HWSR_SRGB1] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SRGB2")
-            {
-                g_HWSR_MaskBit[HWSR_SRGB2] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_SLIM_GBUFFER")
-            {
-                g_HWSR_MaskBit[HWSR_SLIM_GBUFFER] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DEFERRED_RENDER_TARGET_OPTIMIZATION")
-            {
-                g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION] = gb->m_Mask;
-            }
-            else
-            if (gb->m_ParamName == "%_RT_DEPTHFIXUP")
-            {
-                g_HWSR_MaskBit[HWSR_DEPTHFIXUP] = gb->m_Mask;
-            }
-            else
-            {
-                AZ_Assert(false, "Invalid shader param %s", gb->m_ParamName.c_str());
-            }
-        }
-    }
-}
-
-void CShaderMan::InitStaticFlags()
-{
-    SAFE_DELETE(m_staticExt);
-    m_staticExt = mfCreateShaderGenInfo("Statics", true);
-    if (m_staticExt)
-    {
-        AZ_Assert(m_staticExt->m_BitMask.Num() == AZ_ARRAY_SIZE(g_HWSST_Flags), "Mismatch static flags count. Expected %u flags but got %u instead", AZ_ARRAY_SIZE(g_HWSST_Flags), m_staticExt->m_BitMask.Num());
-        for (unsigned i = 0; i < m_staticExt->m_BitMask.Num(); ++i)
-        {
-            SShaderGenBit* gb = m_staticExt->m_BitMask[i];
-            if (!gb)
-            {
-                continue;
-            }
-
-            auto found = AZStd::find_if(std::begin(g_HWSST_Flags), std::end(g_HWSST_Flags), [&gb](const AZStd::pair<const char*, uint64>& element) { return azstricmp(element.first, gb->m_ParamName) == 0; });
-            if (found != std::end(g_HWSST_Flags))
-            {
-                found->second = gb->m_Mask;
-            }
-            else
-            {
-                AZ_Error("Renderer", false, "Invalid static flag param %s", gb->m_ParamName.c_str());
-            }
-        }
-    }
-}
-
-void CShaderMan::AddStaticFlag(EHWSSTFlag flag)
-{
-    if (!m_staticExt)
-    {
-        InitStaticFlags();
-    }
-
-    AZ_Assert(static_cast<int>(flag) >= 0 && static_cast<int>(flag) < AZ_ARRAY_SIZE(g_HWSST_Flags), "Invalid static flag %d", static_cast<int>(flag));
-    m_staticFlags |= g_HWSST_Flags[flag].second;
-}
-
-void CShaderMan::RemoveStaticFlag(EHWSSTFlag flag)
-{
-    if (!m_staticExt)
-    {
-        InitStaticFlags();
-    }
-
-    AZ_Assert(static_cast<int>(flag) >= 0 && static_cast<int>(flag) < AZ_ARRAY_SIZE(g_HWSST_Flags), "Invalid static flag %d", static_cast<int>(flag));
-    m_staticFlags &= ~g_HWSST_Flags[flag].second;
-}
-
-bool CShaderMan::HasStaticFlag(EHWSSTFlag flag)
-{
-    if (!m_staticExt)
-    {
-        InitStaticFlags();
-    }
-
-    AZ_Assert(static_cast<int>(flag) >= 0 && static_cast<int>(flag) < AZ_ARRAY_SIZE(g_HWSST_Flags), "Invalid static flag %d", static_cast<int>(flag));
-    return (m_staticFlags & g_HWSST_Flags[flag].second) != 0;
-}
-
-void CShaderMan::mfInit (void)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    s_cNameHEAD = CCryNameTSCRC("HEAD");
-
-    CTexture::Init();
-
-    if (!m_bInitialized)
-    {
-        GetISystem()->GetISystemEventDispatcher()->RegisterListener(this);
-
-        m_ShadersPath = "Shaders/HWScripts/";
-        m_ShadersMergeCachePath = "Shaders/MergeCache/";
-#if defined(LINUX32)
-        m_ShadersCache = CONCAT_PATHS(g_shaderCache, "LINUX32/");
-#elif defined(LINUX64)
-        m_ShadersCache = CONCAT_PATHS(g_shaderCache, "LINUX64/");
-#elif defined(MAC)
-        m_ShadersCache = CONCAT_PATHS(g_shaderCache, "Mac/");
-#elif defined(IOS)
-        m_ShadersCache = CONCAT_PATHS(g_shaderCache, "iOS/");
-#else
-        m_ShadersCache = CONCAT_PATHS(g_shaderCache, "D3D11");
-#endif
-        m_szCachePath = "@usercache@/";
-        
-        if (CRenderer::CV_r_shadersImport == 3)
-        {
-#if defined(PERFORMANCE_BUILD) || defined(_RELEASE)
-            // Disable all runtime shader compilation and force use of the shader importing system in Performance and Release builds only
-            // We want to still build shaders in Profile builds so we do not miss generating new permutations
-            CRenderer::CV_r_shadersAllowCompilation = 0;
-#else
-            // Disable shader importing and allow r_shadersAllowCompilation and r_shadersremotecompiler to be used to compile shaders at runtime 
-            CRenderer::CV_r_shadersImport = 0;
-#endif
-        }
-
-#ifndef CONSOLE_CONST_CVAR_MODE
-        if (CRenderer::CV_r_shadersediting)
-        {
-            CRenderer::CV_r_shadersAllowCompilation = 1; // allow compilation
-            CRenderer::CV_r_shaderslogcachemisses = 0; // don't bother about cache misses
-            CRenderer::CV_r_shaderspreactivate = 0; // don't load the level caches
-            CParserBin::m_bEditable = true;
-            CRenderer::CV_r_shadersImport = 0; // don't allow shader importing
-
-            ICVar* pPakPriortyCVar = gEnv->pConsole->GetCVar("sys_PakPriority");
-            if (pPakPriortyCVar)
-            {
-                pPakPriortyCVar->Set(0); // shaders are loaded from disc, always
-            }
-            ICVar* pInvalidFileAccessCVar = gEnv->pConsole->GetCVar("sys_PakLogInvalidFileAccess");
-            if (pInvalidFileAccessCVar)
-            {
-                pInvalidFileAccessCVar->Set(0); // don't bother logging invalid access when editing shaders
-            }
-        }
-#endif
-        if (CRenderer::CV_r_shadersAllowCompilation)
-        {
-            CRenderer::CV_r_shadersasyncactivation = 0;
-            
-            // don't allow shader importing when shader compilation is enabled.
-            AZ_Warning("Rendering", CRenderer::CV_r_shadersImport == 0, "Warning: Shader compilation is enabled, but shader importing was requested.  Disabling r_shadersImport.");
-            CRenderer::CV_r_shadersImport = 0;
-        }
-
-        // make sure correct paks are open - shaders.pak will be unloaded from memory after init
-        gEnv->pCryPak->OpenPack("@assets@", "Shaders.pak", AZ::IO::IArchive::FLAGS_PAK_IN_MEMORY);
-#if defined(AZ_PLATFORM_ANDROID)
-        // When the ShaderCache.pak is inside the APK the initialization process takes for ever (around 4 minutes to initialize the engine).
-        // Loading it into memory during the initialization seems to bypass the issue.
-        // All paks are unloaded from memory after the game init (during the ESYSTEM_EVENT_GAME_POST_INIT_DONE event).
-        // LY-40729 is tracking the problem. Once that's fixed this need to be removed.
-        gEnv->pCryPak->OpenPack("@assets@", "shaderCache.pak", AZ::IO::IArchive::FLAGS_PAK_IN_MEMORY);
-#endif
-        ParseShaderProfiles();
-
-        fxParserInit();
-        CParserBin::Init();
-        CResFile::Tick();
-
-        //CShader::m_Shaders_known.Alloc(MAX_SHADERS);
-        //memset(&CShader::m_Shaders_known[0], 0, sizeof(CShader *)*MAX_SHADERS);
-
-        mfInitGlobal();
-        InitStaticFlags();
-        mfInitLevelPolicies();
-
-        //mfInitLookups();
-
-        // Generate/or load globals.txt - if not existing or shader cache version bumped
-        mfInitCommonGlobalFlags();
-
-        mfPreloadShaderExts();
-
-        if (CRenderer::CV_r_shadersAllowCompilation && !gRenDev->IsShaderCacheGenMode())
-        {
-            mfInitShadersList(&m_ShaderNames);
-        }
-
-        mfInitShadersCacheMissLog();
-
-#if !defined(NULL_RENDERER)
-        if (!gRenDev->IsEditorMode() && !gRenDev->IsShaderCacheGenMode())
-        {
-            const char* shaderPakDir = "@assets@";
-            const char* shaderPakPath = "shaderCache.pak";
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION SHADERCORE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(ShaderCore_cpp)
-#endif
-
-            if (CRenderer::CV_r_shaderspreactivate == 3)
-            {
-                gEnv->pCryPak->LoadPakToMemory(shaderPakPath, AZ::IO::IArchive::eInMemoryPakLocale_CPU);
-
-                mfPreactivateShaders2("", "shaders/cache/", true, shaderPakDir);
-
-                gEnv->pCryPak->LoadPakToMemory(shaderPakPath, AZ::IO::IArchive::eInMemoryPakLocale_Unload);
-            }
-            else if (CRenderer::CV_r_shaderspreactivate)
-            {
-                mfPreactivateShaders2("", "shadercache/", true, shaderPakDir);
-            }
-        }
-
-#endif
-
-        if (CRenderer::CV_r_shadersAllowCompilation)
-        {
-            mfInitShadersCache(false, NULL, NULL, 0);
-            if (CRenderer::CV_r_shaderspreactivate == 2)
-            {
-                mfInitShadersCache(false, NULL, NULL, 1);
-            }
-        }
-
-#if !defined(CONSOLE) && !defined(NULL_RENDERER)
-        if (!CRenderer::CV_r_shadersAllowCompilation)
-        {
-            AZStd::string cgpShaders = m_ShadersCache + "cgpshaders";
-            AZStd::string cgvShaders = m_ShadersCache + "cgvshaders";
-            
-            // make sure we can write to the shader cache
-            if (!CheckAllFilesAreWritable(cgpShaders.c_str()) ||
-                !CheckAllFilesAreWritable(cgvShaders.c_str()))
-            {
-                // message box causes problems in fullscreen
-                //          MessageBox(0,"WARNING: Shader cache cannot be updated\n\n"
-                //              "files are write protected / media is read only / windows user setting don't allow file changes","CryEngine",MB_ICONEXCLAMATION|MB_OK);
-                gEnv->pLog->LogError("ERROR: Shader cache cannot be updated (files are write protected / media is read only / windows user setting don't allow file changes)");
-            }
-        }
-#endif  // WIN
-
-        mfSetDefaults();
-
-        //mfPrecacheShaders(NULL);
-
-        // flash all the current commands (parse default shaders)
-        gRenDev->m_pRT->FlushAndWait();
-
-        m_bInitialized = true;
-    }
-    //mfPrecacheShaders();
-}
-
-bool CShaderMan::LoadShaderStartupCache()
-{
-    const char* shaderPakDir = "@assets@/ShaderCacheStartup.pak";
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION SHADERCORE_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(ShaderCore_cpp)
-#endif
-    
-    return gEnv->pCryPak->OpenPack("@assets@", shaderPakDir, AZ::IO::IArchive::FLAGS_PAK_IN_MEMORY | AZ::IO::IArchive::FLAGS_PATH_REAL);
-}
-
-void CShaderMan::UnloadShaderStartupCache()
-{
-    // Called from the MT so need to flush RT
-    IF (gRenDev->m_pRT, 1)
-    {
-        gRenDev->m_pRT->FlushAndWait();
-    }
-
-#if defined(SHADERS_SERIALIZING)
-    // Free all import data allowing us to close the startup pack
-    ClearSResourceCache();
-#endif
-
-    gEnv->pCryPak->ClosePack("ShaderCacheStartup.pak");
-}
-
-void CShaderMan::mfPostInit()
-{
-    LOADING_TIME_PROFILE_SECTION;
-#if !defined(NULL_RENDERER)
-    CTexture::PostInit();
-
-    if (!gRenDev->IsEditorMode() && !gRenDev->IsShaderCacheGenMode())
-    {
-        mfPreloadBinaryShaders();
-    }
-#endif
-
-    // (enabled also for NULL Renderer, so at least the default shader is initialized)
-    if (!gRenDev->IsShaderCacheGenMode())
-    {
-        mfLoadDefaultSystemShaders();
-    }
-}
-
-void CShaderMan::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-    switch (event)
-    {
-    case ESYSTEM_EVENT_LEVEL_LOAD_END:
-    {
-        break;
-    }
-    }
-}
-
-void CShaderMan::ParseShaderProfile(char* scr, SShaderProfile* pr)
-{
-    char* name;
-    long cmd;
-    char* params;
-    char* data;
-
-    enum
-    {
-        eUseNormalAlpha = 1
-    };
-    static STokenDesc commands[] =
-    {
-        {eUseNormalAlpha, "UseNormalAlpha"},
-
-        {0, 0}
-    };
-
-    while ((cmd = shGetObject (&scr, commands, &name, &params)) > 0)
-    {
-        data = NULL;
-        if (name)
-        {
-            data = name;
-        }
-        else
-        if (params)
-        {
-            data = params;
-        }
-
-        switch (cmd)
-        {
-        case eUseNormalAlpha:
-            pr->m_nShaderProfileFlags |= SPF_LOADNORMALALPHA;
-            break;
-        }
-    }
-}
-
-void CShaderMan::ParseShaderProfiles()
-{
-    int i;
-
-    for (i = 0; i < eSQ_Max; i++)
-    {
-        m_ShaderFixedProfiles[i].m_iShaderProfileQuality = i;
-        m_ShaderFixedProfiles[i].m_nShaderProfileFlags = 0;
-    }
-
-    char* name;
-    long cmd;
-    char* params;
-    char* data;
-
-    enum
-    {
-        eProfile = 1, eVersion
-    };
-    static STokenDesc commands[] =
-    {
-        {eProfile, "Profile"},
-        {eVersion, "Version"},
-
-        {0, 0}
-    };
-
-    char* scr = NULL;
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen("Shaders/ShaderProfiles.txt", "rb");
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        AZ::u64 fileSize = 0;
-        AZ::IO::FileIOBase::GetInstance()->Size(fileHandle, fileSize);
-        scr = new char [fileSize + 1];
-        if (scr)
-        {
-            scr[fileSize] = 0;
-            gEnv->pCryPak->FRead(scr, fileSize, fileHandle);
-            gEnv->pCryPak->FClose(fileHandle);
-        }
-    }
-    char* pScr = scr;
-    if (scr)
-    {
-        while ((cmd = shGetObject (&scr, commands, &name, &params)) > 0)
-        {
-            data = NULL;
-            if (name)
-            {
-                data = name;
-            }
-            else
-            if (params)
-            {
-                data = params;
-            }
-
-            switch (cmd)
-            {
-            case eProfile:
-            {
-                SShaderProfile* pr = NULL;
-                assert(name);
-                PREFAST_ASSUME(name);
-                if (!azstricmp(name, "Low"))
-                {
-                    pr = &m_ShaderFixedProfiles[eSQ_Low];
-                }
-                else
-                {
-                    pr = &m_ShaderFixedProfiles[eSQ_High];
-                }
-                if (pr)
-                {
-                    ParseShaderProfile(params, pr);
-                }
-                break;
-            }
-            case eVersion:
-                break;
-            }
-        }
-    }
-    SAFE_DELETE_ARRAY(pScr);
-}
-
-const SShaderProfile& CRenderer::GetShaderProfile(EShaderType eST) const
-{
-    assert((int)eST < sizeof(m_cEF.m_ShaderProfiles) / sizeof(SShaderProfile));
-
-    return m_cEF.m_ShaderProfiles[eST];
-}
-
-void CShaderMan::RT_SetShaderQuality(EShaderType eST, EShaderQuality eSQ)
-{
-    eSQ = CLAMP(eSQ, eSQ_Low, eSQ_VeryHigh);
-    if (eST == eST_All)
-    {
-        for (int i = 0; i < eST_Max; i++)
-        {
-            m_ShaderProfiles[i] = m_ShaderFixedProfiles[eSQ];
-            m_ShaderProfiles[i].m_iShaderProfileQuality = eSQ;      // good?
-        }
-    }
-    else
-    {
-        m_ShaderProfiles[eST] = m_ShaderFixedProfiles[eSQ];
-        m_ShaderProfiles[eST].m_iShaderProfileQuality = eSQ;      // good?
-    }
-    if (eST == eST_All || eST == eST_General)
-    {
-        m_Bin.InvalidateCache();
-        mfReloadAllShaders(FRO_FORCERELOAD, 0);
-    }
-}
-
-#if !defined(NULL_RENDERER)
-static byte bFirst = 1;
-
-static bool sLoadShader(const char* szName, CShader*& pStorage)
-{
-    CShader* ef = NULL;
-    bool bRes = true;
-    if (bFirst)
-    {
-        CryComment("Load System Shader '%s'...", szName);
-    }
-    ef = gRenDev->m_cEF.mfForName(szName, EF_SYSTEM);
-    if (bFirst)
-    {
-        if (!ef || (ef->m_Flags & EF_NOTFOUND))
-        {
-            Warning("Load System Shader Failed %s", szName);
-            bRes = false;
-        }
-        else
-        {
-            CryComment("ok");
-        }
-    }
-    pStorage = ef;
-    return bRes;
-}
-#endif
-
-void CShaderMan::mfReleaseSystemShaders ()
-{
-#ifndef NULL_RENDERER
-    SAFE_RELEASE_FORCE(s_DefaultShader);
-    SAFE_RELEASE_FORCE(s_ShaderDebug);
-    SAFE_RELEASE_FORCE(s_ShaderLensOptics);
-    SAFE_RELEASE_FORCE(s_ShaderSoftOcclusionQuery);
-    SAFE_RELEASE_FORCE(s_ShaderOcclTest);
-    SAFE_RELEASE_FORCE(s_ShaderStereo);
-    SAFE_RELEASE_FORCE(s_ShaderDXTCompress);
-    SAFE_RELEASE_FORCE(s_ShaderCommon);
-#if defined(FEATURE_SVO_GI)
-    SAFE_RELEASE_FORCE(s_ShaderSVOGI);
-#endif
-    SAFE_RELEASE_FORCE(s_ShaderShadowBlur);
-    SAFE_RELEASE_FORCE(s_shPostEffectsGame);
-    SAFE_RELEASE_FORCE(s_shPostAA);
-    SAFE_RELEASE_FORCE(s_shPostEffects);
-    SAFE_RELEASE_FORCE(s_ShaderFallback);
-    SAFE_RELEASE_FORCE(s_ShaderFPEmu);
-    SAFE_RELEASE_FORCE(s_ShaderUI);
-    SAFE_RELEASE_FORCE(s_ShaderLightStyles);
-    SAFE_RELEASE_FORCE(s_ShaderShadowMaskGen);
-    SAFE_RELEASE_FORCE(s_shHDRPostProcess);
-    SAFE_RELEASE_FORCE(s_shPostDepthOfField);
-    SAFE_RELEASE_FORCE(s_shPostMotionBlur);
-    SAFE_RELEASE_FORCE(s_shPostSunShafts);
-    SAFE_RELEASE_FORCE(s_ShaderDeferredCaustics);
-    SAFE_RELEASE_FORCE(s_shDeferredShading);
-    SAFE_RELEASE_FORCE(s_ShaderDeferredRain);
-    SAFE_RELEASE_FORCE(s_ShaderDeferredSnow);
-    SAFE_RELEASE_FORCE(s_ShaderStars);
-    SAFE_RELEASE_FORCE(s_ShaderFur);
-    SAFE_RELEASE_FORCE(s_ShaderVideo);
-    m_bLoadedSystem = false;
-    m_systemShaders.clear();
-#endif
-}
-
-void CShaderMan::OnShaderLoaded([[maybe_unused]] IShader* shader)
-{
-#if defined(AZ_ENABLE_TRACING) && defined(_RELEASE)
-    static bool displayedErrorOnce = false;
-
-    if((shader->GetFlags() & EF_NOTFOUND) && m_systemShaders.find(shader) != m_systemShaders.end())
-    {
-        static constexpr char message[] = "Unable to find system shader '%s'.  This will likely cause rendering issues, including a black screen.  Please make sure all required shaders are included in your pak files.";
-
-        AZ_Error("ShaderCore", false, message, shader->GetName());
-
-        if(!displayedErrorOnce)
-        {
-            displayedErrorOnce = true;
-
-            AZStd::string displayMessage = AZStd::string::format(message, shader->GetName());
-            displayMessage.append("  Check Game.log for the complete list of missing shaders.");
-
-            AZ::NativeUI::NativeUIRequestBus::Broadcast(&AZ::NativeUI::NativeUIRequestBus::Events::DisplayOkDialog, "Missing System Shader", displayMessage.c_str(), false);
-        }
-    }
-#endif
-}
-
-#if !defined(NULL_RENDERER)
-void CShaderMan::mfLoadSystemShader(const char* szName, CShader*& pStorage)
-{
-    sLoadShader(szName, pStorage);
-    m_systemShaders.emplace(pStorage);
-}
-#endif
-
-void CShaderMan::mfLoadBasicSystemShaders()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    if (!s_DefaultShader)
-    {
-        s_DefaultShader = mfNewShader("<Default>");
-        s_DefaultShader->m_NameShader = "<Default>";
-        s_DefaultShader->m_Flags |= EF_SYSTEM;
-    }
-#ifndef NULL_RENDERER
-    if (!m_bLoadedSystem && !gRenDev->IsShaderCacheGenMode())
-    {
-        mfLoadSystemShader("Fallback", s_ShaderFallback);
-        mfLoadSystemShader("FixedPipelineEmu", s_ShaderFPEmu);
-        mfLoadSystemShader("UI", s_ShaderUI);
-
-        mfRefreshSystemShader("Stereo", CShaderMan::s_ShaderStereo);
-        mfRefreshSystemShader("Video", CShaderMan::s_ShaderVideo);
-    }
-#endif
-}
-
-void CShaderMan::mfLoadDefaultSystemShaders()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    if (!s_DefaultShader)
-    {
-        s_DefaultShader = mfNewShader("<Default>");
-        s_DefaultShader->m_NameShader = "<Default>";
-        s_DefaultShader->m_Flags |= EF_SYSTEM;
-    }
-#ifndef NULL_RENDERER
-    if (!m_bLoadedSystem)
-    {
-        m_bLoadedSystem = true;
-
-        mfLoadSystemShader("Fallback", s_ShaderFallback);
-        mfLoadSystemShader("FixedPipelineEmu", s_ShaderFPEmu);
-        mfLoadSystemShader("UI", s_ShaderUI);
-        mfLoadSystemShader("Light", s_ShaderLightStyles);
-
-        mfLoadSystemShader("ShadowMaskGen", s_ShaderShadowMaskGen);
-        mfLoadSystemShader("HDRPostProcess", s_shHDRPostProcess);
-
-        mfLoadSystemShader("PostEffects", s_shPostEffects);
-
-#if defined(FEATURE_SVO_GI)
-        mfRefreshSystemShader("Total_Illumination", CShaderMan::s_ShaderSVOGI);
-#endif
-        mfRefreshSystemShader("Common", CShaderMan::s_ShaderCommon);
-        mfRefreshSystemShader("Debug",  CShaderMan::s_ShaderDebug);
-        mfRefreshSystemShader("DeferredCaustics",   CShaderMan::s_ShaderDeferredCaustics);
-        mfRefreshSystemShader("DeferredRain",   CShaderMan::s_ShaderDeferredRain);
-        mfRefreshSystemShader("DeferredSnow",   CShaderMan::s_ShaderDeferredSnow);
-        mfRefreshSystemShader("DeferredShading",    CShaderMan::s_shDeferredShading);
-        mfRefreshSystemShader("DepthOfField",   CShaderMan::s_shPostDepthOfField);
-        mfRefreshSystemShader("DXTCompress",    CShaderMan::s_ShaderDXTCompress);
-        mfRefreshSystemShader("LensOptics", CShaderMan::s_ShaderLensOptics);
-        mfRefreshSystemShader("SoftOcclusionQuery", CShaderMan::s_ShaderSoftOcclusionQuery);
-        mfRefreshSystemShader("MotionBlur", CShaderMan::s_shPostMotionBlur);
-        mfRefreshSystemShader("OcclusionTest",  CShaderMan::s_ShaderOcclTest);
-        mfRefreshSystemShader("PostEffectsGame",    CShaderMan::s_shPostEffectsGame);
-        mfRefreshSystemShader("PostAA", CShaderMan::s_shPostAA);
-        mfRefreshSystemShader("ShadowBlur", CShaderMan::s_ShaderShadowBlur);
-        mfRefreshSystemShader("Sunshafts", CShaderMan::s_shPostSunShafts);
-        mfRefreshSystemShader("Fur", CShaderMan::s_ShaderFur);
-    }
-#endif
-}
-
-void CShaderMan::mfSetDefaults (void)
-{
-#ifndef NULL_RENDERER
-    mfReleaseSystemShaders();
-    mfLoadBasicSystemShaders();
-#else
-    mfLoadBasicSystemShaders();
-    s_DefaultShaderItem.m_pShader = s_DefaultShader;
-    SInputShaderResources ShR;
-    s_DefaultShaderItem.m_pShaderResources = new CShaderResources(&ShR);
-#endif
-
-    memset(&gRenDev->m_cEF.m_PF, 0, sizeof(PerFrameParameters));
-
-    if (gRenDev->IsEditorMode())
-    {
-        gRenDev->RefreshSystemShaders();
-    }
-
-#if !defined(NULL_RENDERER)
-    bFirst = 0;
-#endif
-
-    m_bInitialized = true;
-}
-
-bool CShaderMan::mfGatherShadersList(const char* szPath, bool bCheckIncludes, bool bUpdateCRC, std::vector<string>* Names)
-{
-    char nmf[256];
-    char dirn[256];
-
-    cry_strcpy(dirn, szPath);
-    cry_strcat(dirn, "*");
-
-    bool bChanged = false;
-
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst(dirn);
-    if (!handle)
-    {
-        return bChanged;
-    }
-    do
-    {
-        if (handle.m_filename.front() == '.')
-        {
-            continue;
-        }
-        if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-        {
-            char ddd[256];
-            azsnprintf(ddd, AZ_ARRAY_SIZE(ddd), "%s%.*s/", szPath, aznumeric_cast<int>(handle.m_filename.size()), handle.m_filename.data());
-
-            bChanged = mfGatherShadersList(ddd, bCheckIncludes, bUpdateCRC, Names);
-            if (bChanged)
-            {
-                break;
-            }
-            continue;
-        }
-        cry_strcpy(nmf, szPath);
-        cry_strcat(nmf, handle.m_filename.data());
-        int len = strlen(nmf) - 1;
-        while (len >= 0 && nmf[len] != '.')
-        {
-            len--;
-        }
-        if (len <= 0)
-        {
-            continue;
-        }
-        if (bCheckIncludes)
-        {
-            if (!azstricmp(&nmf[len], ".cfi"))
-            {
-                fpStripExtension(handle.m_filename.data(), nmf);
-                SShaderBin* pBin = m_Bin.GetBinShader(nmf, true, 0, &bChanged);
-
-                // If any include file was not found in the read only cache, we'll need to update the CRCs
-                if (pBin && pBin->IsReadOnly() == false)
-                {
-                    bChanged = true;
-                }
-
-                if (bChanged)
-                {
-                    break;
-                }
-            }
-            continue;
-        }
-        if (azstricmp(&nmf[len], ".cfx"))
-        {
-            continue;
-        }
-        fpStripExtension(handle.m_filename.data(), nmf);
-        mfAddFXShaderNames(nmf, Names, bUpdateCRC);
-    } while (handle = gEnv->pCryPak->FindNext(handle));
-
-    gEnv->pCryPak->FindClose (handle);
-
-    return bChanged;
-}
-
-void CShaderMan::mfGatherFilesList(const char* szPath, std::vector<CCryNameR>& Names, int nLevel, bool bUseFilter, bool bMaterial)
-{
-    char nmf[256];
-    char dirn[256];
-
-    cry_strcpy(dirn, szPath);
-    cry_strcat(dirn, "*");
-
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst(dirn);
-    if (!handle)
-    {
-        return;
-    }
-    do
-    {
-        if (handle.m_filename.front() == '.')
-        {
-            continue;
-        }
-        if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-        {
-            if (!bUseFilter || nLevel != 1 || !azstricmp(handle.m_filename.data(), m_ShadersFilter.c_str()))
-            {
-                char ddd[256];
-                azsnprintf(ddd, AZ_ARRAY_SIZE(ddd), "%s%.*s/", szPath, aznumeric_cast<int>(handle.m_filename.size()), handle.m_filename.data());
-
-                mfGatherFilesList(ddd, Names, nLevel + 1, bUseFilter, bMaterial);
-            }
-            continue;
-        }
-        cry_strcpy(nmf, szPath);
-        cry_strcat(nmf, handle.m_filename.data());
-        int len = strlen(nmf) - 1;
-        while (len >= 0 && nmf[len] != '.')
-        {
-            len--;
-        }
-        if (len <= 0)
-        {
-            continue;
-        }
-        if (!bMaterial && azstricmp(&nmf[len], ".fxcb"))
-        {
-            continue;
-        }
-        if (bMaterial && azstricmp(&nmf[len], ".mtl"))
-        {
-            continue;
-        }
-        Names.push_back(CCryNameR(nmf));
-    } while (handle = gEnv->pCryPak->FindNext(handle));
-
-    gEnv->pCryPak->FindClose (handle);
-}
-
-int CShaderMan::mfInitShadersList(std::vector<string>* Names)
-{
-    // Detect include changes
-#ifndef NULL_RENDERER
-    bool bChanged =
-#endif
-        mfGatherShadersList(m_ShadersPath.c_str(), true, false, Names);
-
-    if (gRenDev->m_bShaderCacheGen)
-    {
-        // flush out EXT files, so we reload them again after proper per-platform setup
-        for (ShaderExtItor it = gRenDev->m_cEF.m_ShaderExts.begin(); it != gRenDev->m_cEF.m_ShaderExts.end(); ++it)
-        {
-            delete it->second;
-        }
-        gRenDev->m_cEF.m_ShaderExts.clear();
-        gRenDev->m_cEF.m_SGC.clear();
-
-        m_ShaderCacheCombinations[0].clear();
-        m_ShaderCacheCombinations[1].clear();
-        m_ShaderCacheExportCombinations.clear();
-        mfCloseShadersCache(0);
-        mfInitShadersCache(false, NULL, NULL, 0);
-    }
-
-#ifndef NULL_RENDERER
-    mfGatherShadersList(m_ShadersPath.c_str(), false, bChanged, Names);
-    return m_ShaderNames.size();
-#else
-    return 0;
-#endif
-}
-
-void CShaderMan::mfPreloadShaderExts(void)
-{
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst ("Shaders/*.ext");
-    if (!handle)
-    {
-        return;
-    }
-    do
-    {
-        if (handle.m_filename.front() == '.')
-        {
-            continue;
-        }
-        if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-        {
-            continue;
-        }
-
-        if (!azstricmp(handle.m_filename.data(), "runtime.ext") || !azstricmp(handle.m_filename.data(), "statics.ext"))
-        {
-            continue;
-        }
-        char s[256];
-        fpStripExtension(handle.m_filename.data(), s);
-#ifndef NDEBUG
-        SShaderGen* pShGen =
-#endif
-            mfCreateShaderGenInfo(s, false);
-        assert(pShGen);
-    } while (handle = gEnv->pCryPak->FindNext(handle));
-
-    gEnv->pCryPak->FindClose (handle);
-}
-
-
-//===================================================================
-
-CShader* CShaderMan::mfNewShader(const char* szName)
-{
-    CShader* pSH;
-
-    CCryNameTSCRC className = CShader::mfGetClassName();
-    CCryNameTSCRC Name = szName;
-    CBaseResource* pBR = CBaseResource::GetResource(className, Name, false);
-    if (!pBR)
-    {
-        pSH = new CShader;
-        pSH->Register(className, Name);
-    }
-    else
-    {
-        pSH = (CShader*)pBR;
-        pSH->AddRef();
-    }
-    if (!s_pContainer)
-    {
-        s_pContainer = CBaseResource::GetResourcesForClass(className);
-    }
-
-    if (pSH->GetID() >= MAX_REND_SHADERS)
-    {
-        SAFE_RELEASE(pSH);
-        iLog->Log("ERROR: MAX_REND_SHADERS hit\n");
-        return NULL;
-    }
-
-    return pSH;
-}
-
-//=========================================================
-
-bool CShaderMan::mfUpdateMergeStatus(SShaderTechnique* hs, std::vector<SCGParam>* p)
-{
-    if (!p)
-    {
-        return false;
-    }
-    for (uint32 n = 0; n < p->size(); n++)
-    {
-        if ((*p)[n].m_Flags & PF_DONTALLOW_DYNMERGE)
-        {
-            hs->m_Flags |= FHF_NOMERGE;
-            break;
-        }
-    }
-    if (hs->m_Flags & FHF_NOMERGE)
-    {
-        return true;
-    }
-    return false;
-}
-
-
-//=================================================================================================
-
-SEnvTexture* SHRenderTarget::GetEnv2D()
-{
-    CRenderer* rd = gRenDev;
-    SEnvTexture* pEnvTex = NULL;
-    if (m_nIDInPool >= 0)
-    {
-        assert(m_nIDInPool < (int)CTexture::s_CustomRT_2D->Num());
-        if (m_nIDInPool < (int)CTexture::s_CustomRT_2D->Num())
-        {
-            pEnvTex = &(*CTexture::s_CustomRT_2D)[m_nIDInPool];
-        }
-    }
-    else
-    {
-        const CCamera& cam = rd->GetCamera();
-        Matrix33 orientation = Matrix33(cam.GetMatrix());
-        Ang3 Angs = CCamera::CreateAnglesYPR(orientation);
-        Vec3 Pos = cam.GetPosition();
-        bool bReflect = false;
-        if (m_nFlags & (FRT_CAMERA_REFLECTED_PLANE | FRT_CAMERA_REFLECTED_WATERPLANE))
-        {
-            bReflect = true;
-        }
-        pEnvTex = CTexture::FindSuitableEnvTex(Pos, Angs, true, 0, false, rd->m_RP.m_pShader, rd->m_RP.m_pShaderResources, rd->m_RP.m_pCurObject, bReflect, rd->m_RP.m_pRE, NULL);
-    }
-    return pEnvTex;
-}
-
-void SHRenderTarget::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->Add(*this);
-    pSizer->AddObject(m_TargetName);
-    pSizer->AddObject(m_pTarget[0]);
-    pSizer->AddObject(m_pTarget[1]);
-}
-
-void CShaderResources::CreateModifiers(SInputShaderResources* pInRes)
-{
-    for (auto iter = m_TexturesResourcesMap.begin(); iter != m_TexturesResourcesMap.end(); ++iter)
-    {
-        uint            slotIdx = iter->first;
-        SEfResTexture*  pDst = &(iter->second);  
-
-        pDst->m_Ext.m_nUpdateFlags = 0;
-
-        SEfResTexture*  pInTex = pInRes->GetTextureResource(slotIdx);
-        if (!pInTex || !pInTex->m_Ext.m_pTexModifier)
-        {
-            continue;
-        }
-
-        pInTex->m_Ext.m_nUpdateFlags = 0;
-        pInTex->m_Ext.m_nLastRecursionLevel = -1;
-        SEfTexModificator* pMod = pInTex->m_Ext.m_pTexModifier;
-
-
-            if (pMod->m_eTGType >= ETG_Max)
-            {
-                pMod->m_eTGType = ETG_Stream;
-            }
-            if (pMod->m_eRotType >= ETMR_Max)
-            {
-                pMod->m_eRotType = ETMR_NoChange;
-            }
-
-            if (pMod->m_eMoveType[0] >= ETMM_Max)
-            {
-                pMod->m_eMoveType[0] = ETMM_NoChange;
-            }
-            if (pMod->m_eMoveType[1] >= ETMM_Max)
-            {
-                pMod->m_eMoveType[1] = ETMM_NoChange;
-            }
-
-            if (pMod->m_eMoveType[0] == ETMM_Pan && (pMod->m_OscAmplitude[0] == 0 || pMod->m_OscRate[0] == 0))
-            {
-                pMod->m_eMoveType[0] = ETMM_NoChange;
-            }
-            if (pMod->m_eMoveType[1] == ETMM_Pan && (pMod->m_OscAmplitude[1] == 0 || pMod->m_OscRate[1] == 0))
-            {
-                pMod->m_eMoveType[1] = ETMM_NoChange;
-            }
-
-            if (pMod->m_eMoveType[0] == ETMM_Fixed && pMod->m_OscRate[0] == 0)
-            {
-                pMod->m_eMoveType[0] = ETMM_NoChange;
-            }
-            if (pMod->m_eMoveType[1] == ETMM_Fixed && pMod->m_OscRate[1] == 0)
-            {
-                pMod->m_eMoveType[1] = ETMM_NoChange;
-            }
-
-            if (pMod->m_eMoveType[0] == ETMM_Constant && (pMod->m_OscAmplitude[0] == 0 || pMod->m_OscRate[0] == 0))
-            {
-                pMod->m_eMoveType[0] = ETMM_NoChange;
-            }
-            if (pMod->m_eMoveType[1] == ETMM_Constant && (pMod->m_OscAmplitude[1] == 0 || pMod->m_OscRate[1] == 0))
-            {
-                pMod->m_eMoveType[1] = ETMM_NoChange;
-            }
-
-            if (pMod->m_eMoveType[0] == ETMM_Stretch && (pMod->m_OscAmplitude[0] == 0 || pMod->m_OscRate[0] == 0))
-            {
-                pMod->m_eMoveType[0] = ETMM_NoChange;
-            }
-            if (pMod->m_eMoveType[1] == ETMM_Stretch && (pMod->m_OscAmplitude[1] == 0 || pMod->m_OscRate[1] == 0))
-            {
-                pMod->m_eMoveType[1] = ETMM_NoChange;
-            }
-
-            if (pMod->m_eMoveType[0] == ETMM_StretchRepeat && (pMod->m_OscAmplitude[0] == 0 || pMod->m_OscRate[0] == 0))
-            {
-                pMod->m_eMoveType[0] = ETMM_NoChange;
-            }
-            if (pMod->m_eMoveType[1] == ETMM_StretchRepeat && (pMod->m_OscAmplitude[1] == 0 || pMod->m_OscRate[1] == 0))
-            {
-                pMod->m_eMoveType[1] = ETMM_NoChange;
-            }
-
-            if (pMod->m_eTGType != ETG_Stream)
-            {
-                m_ResFlags |= MTL_FLAG_NOTINSTANCED;
-            }
-
-        pInTex->UpdateForCreate(slotIdx);
-        if (pInTex->m_Ext.m_nUpdateFlags & HWMD_TEXCOORD_FLAG_MASK)
-        {
-            SEfTexModificator* pDstMod = new SEfTexModificator;
-            *pDstMod = *pMod;
-            SAFE_DELETE(pDst->m_Ext.m_pTexModifier);
-            pDst->m_Ext.m_pTexModifier = pDstMod;
-        }
-        else
-        {
-            if (pDst->m_Sampler.m_eTexType == eTT_Auto2D)
-            {
-                if (!pDst->m_Ext.m_pTexModifier)
-                {
-                    m_ResFlags |= MTL_FLAG_NOTINSTANCED;
-                    SEfTexModificator* pDstMod = new SEfTexModificator;
-                    *pDstMod = *pMod;
-                    pDst->m_Ext.m_pTexModifier = pDstMod;
-                }
-            }
-
-            if (pMod->m_bTexGenProjected)
-            {
-                pDst->m_Ext.m_nUpdateFlags |= HWMD_TEXCOORD_PROJ;
-            }
-        }
-    }
-}
-
-int32 GetTextCoordGenObjLinearFlag(int textSlot)
-{
-    switch (static_cast<EEfResTextures>(textSlot))
-    {
-    case EFTT_DIFFUSE:
-        return HWMD_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE;
-    case  EFTT_DETAIL_OVERLAY:
-        return HWMD_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL;
-    case EFTT_DECAL_OVERLAY:
-        return HWMD_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT;
-    case EFTT_EMITTANCE:
-        return HWMD_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE;
-    case EFTT_CUSTOM:
-        return HWMD_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM;
-    default:
-        return 0;
-    }
-}
-
-void SEfResTexture::UpdateForCreate(int textSlot)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    SEfTexModificator* pMod = m_Ext.m_pTexModifier;
-    if (!pMod)
-    {
-        return;
-    }
-
-    m_Ext.m_nUpdateFlags = 0;
-
-    ETEX_Type eTT = (ETEX_Type)m_Sampler.m_eTexType;
-    if (eTT == eTT_Auto2D && m_Sampler.m_pTarget)
-    {
-        SEnvTexture* pEnv = m_Sampler.m_pTarget->GetEnv2D();
-        assert(pEnv);
-        if (pEnv && pEnv->m_pTex)
-        {
-            m_Ext.m_nUpdateFlags |= HWMD_TEXCOORD_PROJ | GetTextCoordGenObjLinearFlag(textSlot);
-        }
-    }
-
-    bool bTr = false;
-
-    if (pMod->m_Tiling[0] == 0)
-    {
-        pMod->m_Tiling[0] = 1.0f;
-    }
-    if (pMod->m_Tiling[1] == 0)
-    {
-        pMod->m_Tiling[1] = 1.0f;
-    }
-
-    bTr = pMod->isModified();
-
-    if (pMod->m_eTGType != ETG_Stream)
-    {
-        switch (pMod->m_eTGType)
-        {
-        case ETG_World:
-        case ETG_Camera:
-            m_Ext.m_nUpdateFlags |= GetTextCoordGenObjLinearFlag(textSlot);
-            break;
-        }
-    }
-
-    if (bTr)
-    {
-        m_Ext.m_nUpdateFlags |= HWMD_TEXCOORD_MATRIX;
-    }
-
-
-    if (pMod->m_bTexGenProjected)
-    {
-        m_Ext.m_nUpdateFlags |= HWMD_TEXCOORD_PROJ;
-    }
-}
-
-// Update TexGen and TexTransform matrices for current material texture
-void SEfResTexture::Update(int nTSlot)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-        PrefetchLine(m_Sampler.m_pTex, 0);
-    CRenderer* rd = gRenDev;
-
-    assert(nTSlot < MAX_TMU);
-    rd->m_RP.m_ShaderTexResources[nTSlot] = this;
-
-    const SEfTexModificator* const pMod = m_Ext.m_pTexModifier;
-
-    if(!pMod)
-    {
-        if (IsTextureModifierSupportedForTextureMap(static_cast<EEfResTextures>(nTSlot)))
-        {
-            rd->m_RP.m_FlagsShader_MD |= m_Ext.m_nUpdateFlags;
-        }
-    }
-    else
-    {
-        UpdateWithModifier(nTSlot);
-    }
-}
-
-void SEfResTexture::UpdateWithModifier(int nTSlot)
-{
-    CRenderer* rd = gRenDev;
-    int nFrameID = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameID;
-
-    // Skip update if the modifier was updated (same frame id, except frame id with default value -1,  and same recursion level) 
-    if (m_Ext.m_nFrameUpdated != -1 && m_Ext.m_nFrameUpdated == nFrameID && m_Ext.m_nLastRecursionLevel == SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID])
-    {
-        if (IsTextureModifierSupportedForTextureMap(static_cast<EEfResTextures>(nTSlot)))
-        {
-            rd->m_RP.m_FlagsShader_MD |= m_Ext.m_nUpdateFlags;
-        }
-
-        return;
-    }
-
-    m_Ext.m_nFrameUpdated = nFrameID;
-    m_Ext.m_nLastRecursionLevel = SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID];
-    m_Ext.m_nUpdateFlags = 0;
-
-    ETEX_Type eTT = (ETEX_Type)m_Sampler.m_eTexType;
-    SEfTexModificator* pMod = m_Ext.m_pTexModifier;
-    if (eTT == eTT_Auto2D && m_Sampler.m_pTarget)
-    {
-        SEnvTexture* pEnv = m_Sampler.m_pTarget->GetEnv2D();
-        assert(pEnv);
-        if (pEnv && pEnv->m_pTex)
-        {
-            pMod->m_TexGenMatrix = Matrix44A(rd->m_RP.m_pCurObject->m_II.m_Matrix).GetTransposed() * pEnv->m_Matrix;
-            pMod->m_TexGenMatrix = pMod->m_TexGenMatrix.GetTransposed();
-            m_Ext.m_nUpdateFlags |= HWMD_TEXCOORD_PROJ | GetTextCoordGenObjLinearFlag(nTSlot);
-        }
-    }
-
-    bool bTr = false;
-    Plane Pl;
-    Plane PlTr;
-
-    const float fTiling0 = pMod->m_Tiling[0];
-    const float fTiling1 = pMod->m_Tiling[1];
-    pMod->m_Tiling[0] = (float)fsel(-fabsf(fTiling0), 1.0f, fTiling0);
-    pMod->m_Tiling[1] = (float)fsel(-fabsf(fTiling1), 1.0f, fTiling1);
-
-    if (pMod->isModified())
-    {
-        pMod->m_TexMatrix.SetIdentity();
-        float fTime = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime;
-
-        bTr = true;
-
-        switch (pMod->m_eRotType)
-        {
-        case ETMR_Fixed:
-        {
-            //translation matrix for rotation center
-            pMod->m_TexMatrix = pMod->m_TexMatrix *
-                Matrix44(1, 0, 0, 0,
-                    0, 1, 0, 0,
-                    0, 0, 1, 0,
-                    -pMod->m_RotOscCenter[0], -pMod->m_RotOscCenter[1], -pMod->m_RotOscCenter[2], 1);
-
-            if (pMod->m_RotOscAmplitude[0])
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationX(Word2Degr(pMod->m_RotOscAmplitude[0]) * PI / 180.0f);
-            }
-            if (pMod->m_RotOscAmplitude[1])
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationY(Word2Degr(pMod->m_RotOscAmplitude[1]) * PI / 180.0f);
-            }
-            if (pMod->m_RotOscAmplitude[2])
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationZ(Word2Degr(pMod->m_RotOscAmplitude[2]) * PI / 180.0f);
-            }
-
-            //translation matrix for rotation center
-            pMod->m_TexMatrix =  pMod->m_TexMatrix *
-                Matrix44(1, 0, 0, 0,
-                    0, 1, 0, 0,
-                    0, 0, 1, 0,
-                    pMod->m_RotOscCenter[0], pMod->m_RotOscCenter[1], pMod->m_RotOscCenter[2], 1);
-        }
-        break;
-
-        case ETMR_Constant:
-        {
-            fTime *= 1000.0f;
-            float fxAmp = Word2Degr(pMod->m_RotOscAmplitude[0]) * fTime * PI / 180.0f + Word2Degr(pMod->m_RotOscPhase[0]);
-            float fyAmp = Word2Degr(pMod->m_RotOscAmplitude[1]) * fTime * PI / 180.0f + Word2Degr(pMod->m_RotOscPhase[1]);
-            float fzAmp = Word2Degr(pMod->m_RotOscAmplitude[2]) * fTime * PI / 180.0f + Word2Degr(pMod->m_RotOscPhase[2]);
-
-            //translation matrix for rotation center
-            pMod->m_TexMatrix = pMod->m_TexMatrix *
-                Matrix44(1, 0, 0, 0,
-                    0, 1, 0, 0,
-                    0, 0, 1, 0,
-                    -pMod->m_RotOscCenter[0], -pMod->m_RotOscCenter[1], -pMod->m_RotOscCenter[2], 1);
-
-            //rotation matrix
-            if (fxAmp)
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix44A(Matrix33::CreateRotationX(fxAmp)).GetTransposed();
-            }
-            if (fyAmp)
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix44A(Matrix33::CreateRotationY(fyAmp)).GetTransposed();
-            }
-            if (fzAmp)
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix44A(Matrix33::CreateRotationZ(fzAmp)).GetTransposed();
-            }
-
-            //translation matrix for rotation center
-            pMod->m_TexMatrix =  pMod->m_TexMatrix *
-                Matrix44(1, 0, 0, 0,
-                    0, 1, 0, 0,
-                    0, 0, 1, 0,
-                    pMod->m_RotOscCenter[0], pMod->m_RotOscCenter[1], pMod->m_RotOscCenter[2], 1);
-        }
-        break;
-
-        case ETMR_Oscillated:
-        {
-            //translation matrix for rotation center
-            pMod->m_TexMatrix = pMod->m_TexMatrix *
-                Matrix44(1, 0, 0, 0,
-                    0, 1, 0, 0,
-                    0, 0, 1, 0,
-                    -pMod->m_RotOscCenter[0], -pMod->m_RotOscCenter[1], -pMod->m_RotOscCenter[2], 1);
-
-            float S_X = fTime * Word2Degr(pMod->m_RotOscRate[0]);
-            float S_Y = fTime * Word2Degr(pMod->m_RotOscRate[1]);
-            float S_Z = fTime * Word2Degr(pMod->m_RotOscRate[2]);
-
-            float d_X = Word2Degr(pMod->m_RotOscAmplitude[0]) * sin_tpl(2.0f * PI * ((S_X - floor_tpl(S_X)) + Word2Degr(pMod->m_RotOscPhase[0])));
-            float d_Y = Word2Degr(pMod->m_RotOscAmplitude[1]) * sin_tpl(2.0f * PI * ((S_Y - floor_tpl(S_Y)) + Word2Degr(pMod->m_RotOscPhase[1])));
-            float d_Z = Word2Degr(pMod->m_RotOscAmplitude[2]) * sin_tpl(2.0f * PI * ((S_Z - floor_tpl(S_Z)) + Word2Degr(pMod->m_RotOscPhase[2])));
-
-            if (d_X)
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationX(d_X);
-            }
-            if (d_Y)
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationY(d_Y);
-            }
-            if (d_Z)
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationZ(d_Z);
-            }
-
-            //translation matrix for rotation center
-            pMod->m_TexMatrix =  pMod->m_TexMatrix *
-                Matrix44(1, 0, 0, 0,
-                    0, 1, 0, 0,
-                    0, 0, 1, 0,
-                    pMod->m_RotOscCenter[0], pMod->m_RotOscCenter[1], pMod->m_RotOscCenter[2], 1);
-        }
-        break;
-        }
-
-
-        float Su = rd->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime * pMod->m_OscRate[0];
-        float Sv = rd->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime * pMod->m_OscRate[1];
-        switch (pMod->m_eMoveType[0])
-        {
-        case ETMM_Pan:
-        {
-            float  du = pMod->m_OscAmplitude[0] * sin_tpl(2.0f * PI * (Su - floor_tpl(Su)) + 2.f * PI * pMod->m_OscPhase[0]);
-            pMod->m_TexMatrix(3, 0) = du;
-        }
-        break;
-        case ETMM_Fixed:
-        {
-            float du = pMod->m_OscRate[0];
-            pMod->m_TexMatrix(3, 0) = du;
-        }
-        break;
-        case ETMM_Constant:
-        {
-            float du = pMod->m_OscAmplitude[0] * Su;         //(Su - floor_tpl(Su));
-            pMod->m_TexMatrix(3, 0) = du;
-        }
-        break;
-        case ETMM_Jitter:
-        {
-            if (pMod->m_LastTime[0] < 1.0f || pMod->m_LastTime[0] > Su + 1.0f)
-            {
-                pMod->m_LastTime[0] = pMod->m_OscPhase[0] + floor_tpl(Su);
-            }
-            if (Su - pMod->m_LastTime[0] > 1.0f)
-            {
-                pMod->m_CurrentJitter[0] = cry_random(0.0f, pMod->m_OscAmplitude[0]);
-                pMod->m_LastTime[0] = pMod->m_OscPhase[0] + floor_tpl(Su);
-            }
-            pMod->m_TexMatrix(3, 0) = pMod->m_CurrentJitter[0];
-        }
-        break;
-        case ETMM_Stretch:
-        {
-            float du = pMod->m_OscAmplitude[0] * sin_tpl(2.0f * PI * (Su - floor_tpl(Su)) + 2.0f * PI * pMod->m_OscPhase[0]);
-            pMod->m_TexMatrix(0, 0) = 1.0f + du;
-        }
-        break;
-        case ETMM_StretchRepeat:
-        {
-            float du = pMod->m_OscAmplitude[0] * sin_tpl(0.5f * PI * (Su - floor_tpl(Su)) + 2.0f * PI * pMod->m_OscPhase[0]);
-            pMod->m_TexMatrix(0, 0) = 1.0f + du;
-        }
-        break;
-        }
-
-        switch (pMod->m_eMoveType[1])
-        {
-        case ETMM_Pan:
-        {
-            float dv = pMod->m_OscAmplitude[1] * sin_tpl(2.0f * PI * (Sv - floor_tpl(Sv)) + 2.0f * PI * pMod->m_OscPhase[1]);
-            pMod->m_TexMatrix(3, 1) = dv;
-        }
-        break;
-        case ETMM_Fixed:
-        {
-            float dv = pMod->m_OscRate[1];
-            pMod->m_TexMatrix(3, 1) = dv;
-        }
-        break;
-        case ETMM_Constant:
-        {
-            float dv = pMod->m_OscAmplitude[1] * Sv;         //(Sv - floor_tpl(Sv));
-            pMod->m_TexMatrix(3, 1) = dv;
-        }
-        break;
-        case ETMM_Jitter:
-        {
-            if (pMod->m_LastTime[1] < 1.0f || pMod->m_LastTime[1] > Sv + 1.0f)
-            {
-                pMod->m_LastTime[1] = pMod->m_OscPhase[1] + floor_tpl(Sv);
-            }
-            if (Sv - pMod->m_LastTime[1] > 1.0f)
-            {
-                pMod->m_CurrentJitter[1] = cry_random(0.0f, pMod->m_OscAmplitude[1]);
-                pMod->m_LastTime[1] = pMod->m_OscPhase[1] + floor_tpl(Sv);
-            }
-            pMod->m_TexMatrix(3, 1) = pMod->m_CurrentJitter[1];
-        }
-        break;
-        case ETMM_Stretch:
-        {
-            float dv = pMod->m_OscAmplitude[1] * sin_tpl(2.0f * PI * (Sv - floor_tpl(Sv)) + 2.0f * PI * pMod->m_OscPhase[1]);
-            pMod->m_TexMatrix(1, 1) = 1.0f + dv;
-        }
-        break;
-        case ETMM_StretchRepeat:
-        {
-            float dv = pMod->m_OscAmplitude[1] * sin_tpl(0.5f * PI * (Sv - floor_tpl(Sv)) + 2.0f * PI * pMod->m_OscPhase[1]);
-            pMod->m_TexMatrix(1, 1) = 1.0f + dv;
-        }
-        break;
-        }
-
-        if (pMod->m_Offs[0] != 0.0f ||
-            pMod->m_Offs[1] != 0.0f ||
-            pMod->m_Tiling[0] != 1.0f ||
-            pMod->m_Tiling[1] != 1.0f ||
-            pMod->m_Rot[0] != 0.0f ||
-            pMod->m_Rot[1] != 0.0f ||
-            pMod->m_Rot[2] != 0.0f)
-        {
-            float du = pMod->m_Offs[0];
-            float dv = pMod->m_Offs[1];
-            float su = pMod->m_Tiling[0];
-            float sv = pMod->m_Tiling[1];
-
-            if (pMod->m_Rot[0])
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationX(Word2Degr(pMod->m_Rot[0]) * PI / 180.0f);
-            }
-            if (pMod->m_Rot[1])
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationY(Word2Degr(pMod->m_Rot[1]) * PI / 180.0f);
-            }
-            if (pMod->m_Rot[2])
-            {
-                pMod->m_TexMatrix = pMod->m_TexMatrix * Matrix33::CreateRotationZ(Word2Degr(pMod->m_Rot[2]) * PI / 180.0f);
-            }
-
-            pMod->m_TexMatrix = pMod->m_TexMatrix *
-                Matrix44(su, 0, 0, 0,
-                    0, sv, 0, 0,
-                    0, 0, 1, 0,
-                    du, dv, 0, 1);
-        }
-    }
-    else
-    {   // This can be avoided - why would you have an empty modulator?
-        pMod->m_TexMatrix.SetIdentity();
-    }
-
-    if (pMod->m_eTGType != ETG_Stream)
-    {
-        switch (pMod->m_eTGType)
-        {
-        case ETG_World:
-        {
-            m_Ext.m_nUpdateFlags |= GetTextCoordGenObjLinearFlag(nTSlot);
-            for (int i = 0; i < 4; i++)
-            {
-                memset(&Pl, 0, sizeof(Pl));
-                float* fPl = (float*)&Pl;
-                fPl[i] = 1.0f;
-                if (rd->m_RP.m_pCurObject)
-                {
-                    PlTr = TransformPlane2_NoTrans(Matrix44A(rd->m_RP.m_pCurObject->m_II.m_Matrix).GetTransposed(), Pl);
-                }
-                else
-                {
-                    // LY-60094 - TexGenType of "World" will give incorrect results
-                    AZ_Warning("Rendering", false, "Warning: Material has TexGenType of 'World', but the requested object is unavailable while generating the TexGen Matrix.  Results may be incorrect.");
-                    PlTr = TransformPlane2_NoTrans(Matrix44A(rd->m_RP.m_pIdendityRenderObject->m_II.m_Matrix).GetTransposed(), Pl);
-                }
-                pMod->m_TexGenMatrix(i, 0) = PlTr.n.x;
-                pMod->m_TexGenMatrix(i, 1) = PlTr.n.y;
-                pMod->m_TexGenMatrix(i, 2) = PlTr.n.z;
-                pMod->m_TexGenMatrix(i, 3) = PlTr.d;
-            }
-        }
-        break;
-        case ETG_Camera:
-        {
-            m_Ext.m_nUpdateFlags |= GetTextCoordGenObjLinearFlag(nTSlot);
-            for (int i = 0; i < 4; i++)
-            {
-                memset(&Pl, 0, sizeof(Pl));
-                float* fPl = (float*)&Pl;
-                fPl[i] = 1.0f;
-                PlTr = TransformPlane2_NoTrans(rd->m_ViewMatrix, Pl);
-                pMod->m_TexGenMatrix(i, 0) = PlTr.n.x;
-                pMod->m_TexGenMatrix(i, 1) = PlTr.n.y;
-                pMod->m_TexGenMatrix(i, 2) = PlTr.n.z;
-                pMod->m_TexGenMatrix(i, 3) = PlTr.d;
-            }
-        }
-        break;
-        }
-    }
-
-    if (bTr)
-    {
-        m_Ext.m_nUpdateFlags |= HWMD_TEXCOORD_MATRIX;
-        pMod->m_TexMatrix(0, 3) = pMod->m_TexMatrix(0, 2);
-        pMod->m_TexMatrix(1, 3) = pMod->m_TexMatrix(1, 2);
-        pMod->m_TexMatrix(2, 3) = pMod->m_TexMatrix(2, 2);
-    }
-
-
-    if (pMod->m_bTexGenProjected)
-    {
-        m_Ext.m_nUpdateFlags |= HWMD_TEXCOORD_PROJ;
-    }
-
-    if (IsTextureModifierSupportedForTextureMap(static_cast<EEfResTextures>(nTSlot)))
-    {
-        rd->m_RP.m_FlagsShader_MD |= m_Ext.m_nUpdateFlags;
-    }
-}
-
-//---------------------------------------------------------------------------
-// Wave evaluator
-
-float CShaderMan::EvalWaveForm(SWaveForm* wf)
-{
-    int val;
-
-    float Amp;
-    float Freq;
-    float Phase;
-    float Level;
-
-    if (wf->m_Flags & WFF_LERP)
-    {
-        val = (int)(gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime * 597.0f);
-        val &= SRenderPipeline::sSinTableCount - 1;
-        float fLerp = gRenDev->m_RP.m_tSinTable[val] * 0.5f + 0.5f;
-
-        if (wf->m_Amp != wf->m_Amp1)
-        {
-            Amp = LERP(wf->m_Amp, wf->m_Amp1, fLerp);
-        }
-        else
-        {
-            Amp = wf->m_Amp;
-        }
-
-        if (wf->m_Freq != wf->m_Freq1)
-        {
-            Freq = LERP(wf->m_Freq, wf->m_Freq1, fLerp);
-        }
-        else
-        {
-            Freq = wf->m_Freq;
-        }
-
-        if (wf->m_Phase != wf->m_Phase1)
-        {
-            Phase = LERP(wf->m_Phase, wf->m_Phase1, fLerp);
-        }
-        else
-        {
-            Phase = wf->m_Phase;
-        }
-
-        if (wf->m_Level != wf->m_Level1)
-        {
-            Level = LERP(wf->m_Level, wf->m_Level1, fLerp);
-        }
-        else
-        {
-            Level = wf->m_Level;
-        }
-    }
-    else
-    {
-        Level = wf->m_Level;
-        Amp = wf->m_Amp;
-        Phase = wf->m_Phase;
-        Freq = wf->m_Freq;
-    }
-
-    switch (wf->m_eWFType)
-    {
-    case eWF_None:
-        Warning("WARNING: CShaderMan::EvalWaveForm called with 'EWF_None' in Shader '%s'\n", gRenDev->m_RP.m_pShader->GetName());
-        break;
-
-    case eWF_Sin:
-        val = (int)((gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime * Freq + Phase) * (float)SRenderPipeline::sSinTableCount);
-        return Amp * gRenDev->m_RP.m_tSinTable[val & (SRenderPipeline::sSinTableCount - 1)] + Level;
-
-    // Other wave types aren't supported anymore
-    case eWF_HalfSin:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_InvHalfSin:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_SawTooth:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_InvSawTooth:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_Square:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_Triangle:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_Hill:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_InvHill:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    default:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        break;
-    }
-    return 1;
-}
-
-float CShaderMan::EvalWaveForm(SWaveForm2* wf)
-{
-    int val;
-
-    switch (wf->m_eWFType)
-    {
-    case eWF_None:
-        //Warning( 0,0,"WARNING: CShaderMan::EvalWaveForm called with 'EWF_None' in Shader '%s'\n", gRenDev->m_RP.m_pShader->GetName());
-        break;
-
-    case eWF_Sin:
-        val = (int)((gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime * wf->m_Freq + wf->m_Phase) * (float)SRenderPipeline::sSinTableCount);
-        return wf->m_Amp * gRenDev->m_RP.m_tSinTable[val & (SRenderPipeline::sSinTableCount - 1)] + wf->m_Level;
-
-    // Other wave types aren't supported anymore
-    case eWF_HalfSin:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_InvHalfSin:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_SawTooth:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_InvSawTooth:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_Square:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_Triangle:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_Hill:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    case eWF_InvHill:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        assert(0);
-        return 0;
-
-    default:
-        Warning("WARNING: CShaderMan::EvalWaveForm: bad WaveType '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-        break;
-    }
-    return 1;
-}
-
-float CShaderMan::EvalWaveForm2(SWaveForm* wf, float frac)
-{
-    int val;
-
-    if (!(wf->m_Flags & WFF_CLAMP))
-    {
-        switch (wf->m_eWFType)
-        {
-        case eWF_None:
-            Warning("CShaderMan::EvalWaveForm2 called with 'EWF_None' in Shader '%s'\n", gRenDev->m_RP.m_pShader->GetName());
-            break;
-
-        case eWF_Sin:
-            val = QRound((frac * wf->m_Freq + wf->m_Phase) * (float)SRenderPipeline::sSinTableCount);
-            val &= (SRenderPipeline::sSinTableCount - 1);
-            return wf->m_Amp * gRenDev->m_RP.m_tSinTable[val] + wf->m_Level;
-
-        // Other wave types aren't supported anymore
-        case eWF_SawTooth:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_InvSawTooth:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_Square:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_Triangle:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_Hill:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_InvHill:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        default:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            break;
-        }
-    }
-    else
-    {
-        switch (wf->m_eWFType)
-        {
-        case eWF_None:
-            Warning("Warning: CShaderMan::EvalWaveForm2 called with 'EWF_None' in Shader '%s'\n", gRenDev->m_RP.m_pShader->GetName());
-            break;
-
-        case eWF_Sin:
-            val = QRound((frac * wf->m_Freq + wf->m_Phase) * (float)SRenderPipeline::sSinTableCount);
-            val &= (SRenderPipeline::sSinTableCount - 1);
-            return wf->m_Amp * gRenDev->m_RP.m_tSinTable[val] + wf->m_Level;
-
-        // Other wave types aren't supported anymore
-        case eWF_SawTooth:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_InvSawTooth:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_Square:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_Triangle:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_Hill:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        case eWF_InvHill:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            assert(0);
-            return 0;
-
-        default:
-            Warning("Warning: CShaderMan::EvalWaveForm2: bad EWF '%d' in Shader '%s'\n", wf->m_eWFType, gRenDev->m_RP.m_pShader->GetName());
-            break;
-        }
-    }
-    return 1;
-}
-
-
-void CShaderMan::mfBeginFrame()
-{
-    LOADING_TIME_PROFILE_SECTION;
-}
-
-void CHWShader::mfCleanupCache()
-{
-    FXShaderCacheItor FXitor;
-    for (FXitor = m_ShaderCache.begin(); FXitor != m_ShaderCache.end(); FXitor++)
-    {
-        SShaderCache* sc = FXitor->second;
-        if (!sc)
-        {
-            continue;
-        }
-        sc->Cleanup();
-    }
-    assert (CResFile::m_nNumOpenResources == 0);
-    CResFile::m_nMaxOpenResFiles = 4;
-}
-
-EHWShaderClass CHWShader::mfStringProfile(const char* profile)
-{
-    EHWShaderClass Profile = eHWSC_Num;
-    if (!strncmp(profile, "vs_5_0", 6) || !strncmp(profile, "vs_4_0", 6) || !strncmp(profile, "vs_3_0", 6))
-    {
-        Profile = eHWSC_Vertex;
-    }
-    else
-    if (!strncmp(profile, "ps_5_0", 6) || !strncmp(profile, "ps_4_0", 6) || !strncmp(profile, "ps_3_0", 6))
-    {
-        Profile = eHWSC_Pixel;
-    }
-    else
-    if (!strncmp(profile, "gs_5_0", 6) || !strncmp(profile, "gs_4_0", 6))
-    {
-        Profile = eHWSC_Geometry;
-    }
-    else
-    if (!strncmp(profile, "hs_5_0", 6))
-    {
-        Profile = eHWSC_Hull;
-    }
-    else
-    if (!strncmp(profile, "ds_5_0", 6))
-    {
-        Profile = eHWSC_Domain;
-    }
-    else
-    if (!strncmp(profile, "cs_5_0", 6))
-    {
-        Profile = eHWSC_Compute;
-    }
-    else
-    {
-        assert(0);
-    }
-
-    return Profile;
-}
-EHWShaderClass CHWShader::mfStringClass(const char* szClass)
-{
-    EHWShaderClass Profile = eHWSC_Num;
-    if (!_strnicmp(szClass, "VS", 2))
-    {
-        Profile = eHWSC_Vertex;
-    }
-    else
-    if (!_strnicmp(szClass, "PS", 2))
-    {
-        Profile = eHWSC_Pixel;
-    }
-    else
-    if (!_strnicmp(szClass, "GS", 2))
-    {
-        Profile = eHWSC_Geometry;
-    }
-    else
-    if (!_strnicmp(szClass, "HS", 2))
-    {
-        Profile = eHWSC_Hull;
-    }
-    else
-    if (!_strnicmp(szClass, "DS", 2))
-    {
-        Profile = eHWSC_Domain;
-    }
-    else
-    if (!_strnicmp(szClass, "CS", 2))
-    {
-        Profile = eHWSC_Compute;
-    }
-    else
-    {
-        assert(0);
-    }
-
-    return Profile;
-}
-const char* CHWShader::mfProfileString(EHWShaderClass eClass)
-{
-    const char* szProfile = "Unknown";
-    switch (eClass)
-    {
-    case eHWSC_Vertex:
-        szProfile = "vs_5_0";
-        break;
-    case eHWSC_Pixel:
-        szProfile = "ps_5_0";
-        break;
-    case eHWSC_Geometry:
-        if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4)
-        {
-            szProfile = "gs_5_0";
-        }
-        else
-        {
-            assert(0);
-        }
-        break;
-    case eHWSC_Domain:
-        if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4)
-        {
-            szProfile = "ds_5_0";
-        }
-        else
-        {
-            assert(0);
-        }
-        break;
-    case eHWSC_Hull:
-        if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4)
-        {
-            szProfile = "hs_5_0";
-        }
-        else
-        {
-            assert(0);
-        }
-        break;
-    case eHWSC_Compute:
-        if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4 || CParserBin::m_nPlatform == SF_METAL || CParserBin::m_nPlatform == SF_GLES3)
-        {
-            szProfile = "cs_5_0";
-        }
-        else
-        {
-            assert(0);
-        }
-        break;
-    default:
-        assert(0);
-    }
-    return szProfile;
-}
-const char* CHWShader::mfClassString(EHWShaderClass eClass)
-{
-    const char* szClass = "Unknown";
-    switch (eClass)
-    {
-    case eHWSC_Vertex:
-        szClass = "VS";
-        break;
-    case eHWSC_Pixel:
-        szClass = "PS";
-        break;
-    case eHWSC_Geometry:
-        szClass = "GS";
-        break;
-    case eHWSC_Domain:
-        szClass = "DS";
-        break;
-    case eHWSC_Hull:
-        szClass = "HS";
-        break;
-    case eHWSC_Compute:
-        szClass = "CS";
-        break;
-    default:
-        assert(0);
-    }
-    return szClass;
-}
-
-//==========================================================================================================
-
-inline bool sCompareRes(CShaderResources* a, CShaderResources* b)
-{
-    if (!a || !b)
-    {
-        return a < b;
-    }
-
-    if (a->m_AlphaRef != b->m_AlphaRef)
-    {
-        return a->m_AlphaRef < b->m_AlphaRef;
-    }
-
-    if (a->GetStrengthValue(EFTT_OPACITY) != b->GetStrengthValue(EFTT_OPACITY))
-    {
-        return a->GetStrengthValue(EFTT_OPACITY) < b->GetStrengthValue(EFTT_OPACITY);
-    }
-
-    if (a->m_pDeformInfo != b->m_pDeformInfo)
-    {
-        return a->m_pDeformInfo < b->m_pDeformInfo;
-    }
-
-    if (a->m_RTargets.Num() != b->m_RTargets.Num())
-    {
-        return a->m_RTargets.Num() < b->m_RTargets.Num();
-    }
-
-    if ((a->m_ResFlags & MTL_FLAG_2SIDED) != (b->m_ResFlags & MTL_FLAG_2SIDED))
-    {
-        return (a->m_ResFlags & MTL_FLAG_2SIDED) < (b->m_ResFlags & MTL_FLAG_2SIDED);
-    }
-
-    // [Shader System TO DO] - optimize - should be data driven based on marked slots only
-
-    uint16      testSlots[] = { 
-        EFTT_SPECULAR , 
-        EFTT_DIFFUSE , 
-        EFTT_NORMALS ,
-        EFTT_ENV , 
-        EFTT_DECAL_OVERLAY , 
-        EFTT_DETAIL_OVERLAY , 
-        EFTT_MAX 
-    };
-
-    ITexture        *pTA = nullptr, *pTB = nullptr;
-    for (int i=0 ; testSlots[i] != EFTT_MAX; i++)
-    {
-        uint16          texSlot = testSlots[i];
-        SEfResTexture*  pTexResA = a->GetTextureResource(texSlot);
-        SEfResTexture*  pTexResB = b->GetTextureResource(texSlot);
-        pTA = pTexResA ? pTexResA->m_Sampler.m_pITex : nullptr;
-        pTB = pTexResB ? pTexResB->m_Sampler.m_pITex : nullptr;
-
-        if (pTA != pTB)
-        {
-            return pTA < pTB;
-        }
-    }
-    return (pTA < pTB);
-}
-
-inline bool sIdenticalRes(CShaderResources* a, CShaderResources* b)
-{
-    if (a->m_AlphaRef != b->m_AlphaRef)
-    {
-        return false;
-    }
-
-    if (a->GetStrengthValue(EFTT_OPACITY) != b->GetStrengthValue(EFTT_OPACITY))
-    {
-        return false;
-    }
-
-    if (a->m_pDeformInfo != b->m_pDeformInfo)
-    {
-        return false;
-    }
-
-    if (a->m_RTargets.Num() != b->m_RTargets.Num())
-    {
-        return false;
-    }
-
-    if ((a->m_ResFlags & (MTL_FLAG_2SIDED | MTL_FLAG_ADDITIVE)) != (b->m_ResFlags & (MTL_FLAG_2SIDED | MTL_FLAG_ADDITIVE)))
-    {
-        return false;
-    }
-
-    // [Shader System TO DO] - revisit this comparison!!!
-    for (int texSlot = 0; texSlot < EFTT_MAX; texSlot++)
-    {
-        SEfResTexture*      pTextureA = a->GetTextureResource(texSlot);
-        if (pTextureA && pTextureA->IsHasModificators())
-            return false;
-
-        SEfResTexture*      pTextureB = b->GetTextureResource(texSlot);
-        if (pTextureB && pTextureB->IsHasModificators())
-            return false;
-
-        // [Shader System] - To Do - test and add this for being more correct 
-        // Finally compare the pointer to the texture resource itself
-//        if (pTextureA->m_Sampler.m_pITex != pTextureB->m_Sampler.m_pITex)     
-//            return false;
-    }
-
-    const float emissiveIntensity = a->GetStrengthValue(EFTT_EMITTANCE);
-    if (emissiveIntensity != b->GetStrengthValue(EFTT_EMITTANCE))
-    {
-        return false;
-    }
-    if (emissiveIntensity > 0)
-    {
-        if (a->GetColorValue(EFTT_EMITTANCE) != b->GetColorValue(EFTT_EMITTANCE))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-inline bool sCompareShd(CBaseResource* a, CBaseResource* b)
-{
-    if (!a || !b)
-    {
-        return a < b;
-    }
-
-    CShader* pA = (CShader*)a;
-    CShader* pB = (CShader*)b;
-    SShaderPass* pPA = NULL;
-    SShaderPass* pPB = NULL;
-    if (pA->m_HWTechniques.Num() && pA->m_HWTechniques[0]->m_Passes.Num())
-    {
-        pPA = &pA->m_HWTechniques[0]->m_Passes[0];
-    }
-    if (pB->m_HWTechniques.Num() && pB->m_HWTechniques[0]->m_Passes.Num())
-    {
-        pPB = &pB->m_HWTechniques[0]->m_Passes[0];
-    }
-    if (!pPA || !pPB)
-    {
-        return pPA < pPB;
-    }
-
-    if (pPA->m_VShader != pPB->m_VShader)
-    {
-        return pPA->m_VShader < pPB->m_VShader;
-    }
-    return (pPA->m_PShader < pPB->m_PShader);
-}
-
-void CShaderMan::mfSortResources()
-{
-    uint32 i;
-    for (i = 0; i < MAX_TMU; i++)
-    {
-        gRenDev->m_RP.m_ShaderTexResources[i] = NULL;
-    }
-    iLog->Log("-- Presort shaders by states...");
-    //return;
-    std::sort(&CShader::s_ShaderResources_known.begin()[1], CShader::s_ShaderResources_known.end(), sCompareRes);
-
-    int                 nGroups = 20000;
-    CShaderResources*   pPrev = nullptr;
-
-    // Now that the shader resources has been sorted, run over them and create groups of 
-    // identical resources.
-    for (i = 1; i < CShader::s_ShaderResources_known.Num(); i++)
-    {
-        CShaderResources* pRes = CShader::s_ShaderResources_known[i];
-        if (pRes)
-        {
-            pRes->m_Id = i;
-            pRes->m_IdGroup = i;
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_materialsbatching)
-            {
-                if (pPrev)
-                {
-                    if (!sIdenticalRes(pRes, pPrev))
-                    {
-                        nGroups++;
-                    }
-                }
-                pRes->m_IdGroup = nGroups;
-            }
-            pPrev = pRes;
-        }
-    }
-    iLog->Log("--- [Shaders System] : %d Shaders Resources, %d Shaders Resource groups.", CShader::s_ShaderResources_known.Num(), nGroups - 20000);
-
-    // now run over the list of active (compiled binary) shaders
-    {
-        AUTO_LOCK(CBaseResource::s_cResLock);
-
-        SResourceContainer* pRL = CShaderMan::s_pContainer;
-        assert(pRL);
-        if (pRL)
-        {
-            std::sort(pRL->m_RList.begin(), pRL->m_RList.end(), sCompareShd);
-            for (i = 0; i < pRL->m_RList.size(); i++)
-            {
-                CShader* pSH = (CShader*)pRL->m_RList[i];
-                if (pSH)
-                {
-                    pSH->SetID(CBaseResource::IdFromRListIndex(i));
-                }
-            }
-
-            pRL->m_AvailableIDs.clear();
-            for (i = 0; i < pRL->m_RList.size(); i++)
-            {
-                CShader* pSH = (CShader*)pRL->m_RList[i];
-                if (!pSH)
-                {
-                    pRL->m_AvailableIDs.push_back(CBaseResource::IdFromRListIndex(i));
-                }
-            }
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-
-void CLightStyle::mfUpdate(float fTime)
-{
-    float m = fTime * m_TimeIncr;
-    //    if (m != m_LastTime)
-    {
-        m_LastTime = m;
-        if (m_Map.Num())
-        {
-            if (m_Map.Num() == 1)
-            {
-                m_Color = m_Map[0].cColor;
-            }
-            else
-            {
-                int first = (int)QInt(m);
-                int second = (first + 1);
-                float fLerp = m - (float)first;
-
-                // Interpolate between key-frames
-                // todo: try different interpolation method
-
-                ColorF& cColA = m_Map[first % m_Map.Num()].cColor;
-                ColorF& cColB = m_Map[second % m_Map.Num()].cColor;
-                m_Color = LERP(cColA, cColB, fLerp);
-
-                Vec3& vPosA = m_Map[first % m_Map.Num()].vPosOffset;
-                Vec3& vPosB = m_Map[second % m_Map.Num()].vPosOffset;
-                m_vPosOffset = LERP(vPosA, vPosB, fLerp);
-            }
-        }
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderFXParseBin.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderFXParseBin.cpp
deleted file mode 100644
index 5ee836ede0..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderFXParseBin.cpp
+++ /dev/null
@@ -1,6356 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include <AzCore/NativeUI/NativeUIRequests.h>
-#include <AzFramework/Archive/IArchive.h>
-#include "UnalignedBlit.h"
-
-#include "DeviceManager/Enums.h"
-#include "PoundPoundParser.h"
-
-static FOURCC FOURCC_SHADERBIN = MAKEFOURCC('F', 'X', 'B', '0');
-
-
-SShaderBin SShaderBin::s_Root;
-uint32 SShaderBin::s_nCache = 0;
-uint32 SShaderBin::s_nMaxFXBinCache = MAX_FXBIN_CACHE;
-CShaderManBin::CShaderManBin()
-{
-    m_pCEF = gRenDev ? &gRenDev->m_cEF : nullptr;
-}
-
-int CShaderManBin::Size()
-{
-    SShaderBin* pSB;
-    int nSize = 0;
-    nSize += sizeOfMapStr(m_BinPaths);
-    nSize += m_BinValidCRCs.size() * sizeof(bool) * sizeof(stl::MapLikeStruct);
-
-    for (pSB = SShaderBin::s_Root.m_Prev; pSB != &SShaderBin::s_Root; pSB = pSB->m_Prev)
-    {
-        nSize += pSB->Size();
-    }
-    return nSize;
-}
-
-void CShaderManBin::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(m_BinPaths);
-    pSizer->AddObject(m_BinValidCRCs);
-
-    SShaderBin* pSB;
-    for (pSB = SShaderBin::s_Root.m_Prev; pSB != &SShaderBin::s_Root; pSB = pSB->m_Prev)
-    {
-        pSB->GetMemoryUsage(pSizer);
-    }
-}
-
-uint32 SShaderBin::ComputeCRC()
-{
-    if (!m_Tokens.size())
-    {
-        return 0;
-    }
-    uint32 CRC32;
-    if (CParserBin::m_bEndians)
-    {
-        DWORD* pT = new DWORD [m_Tokens.size()];
-        memcpy(pT, &m_Tokens[0], m_Tokens.size() * sizeof(uint32));
-        SwapEndian(pT, (size_t)m_Tokens.size(), eBigEndian);
-        CRC32 = CCrc32::Compute((char*)pT, m_Tokens.size() * sizeof(uint32));
-        delete [] pT;
-    }
-    else
-    {
-        CRC32 = CCrc32::Compute((char*)&m_Tokens[0], m_Tokens.size() * sizeof(uint32));
-    }
-    int nCur = 0;
-    Lock();
-    while (nCur >= 0)
-    {
-        nCur = CParserBin::FindToken(nCur, m_Tokens.size() - 1, &m_Tokens[0], eT_include);
-        if (nCur >= 0)
-        {
-            nCur++;
-            uint32 nTokName = m_Tokens[nCur];
-            const char* szNameInc = CParserBin::GetString(nTokName, m_TokenTable);
-            SShaderBin* pBinIncl = gRenDev->m_cEF.m_Bin.GetBinShader(szNameInc, true, 0);
-            AZ_Assert(pBinIncl, "Error loading shader '%s' while trying to compute the shader CRC.", szNameInc);
-            if (pBinIncl)
-            {
-                CRC32 += pBinIncl->ComputeCRC();
-            }
-        }
-    }
-    Unlock();
-
-    return CRC32;
-}
-
-SShaderBin* CShaderManBin::SaveBinShader(
-    uint32 nSourceCRC32, const char* szName, bool bInclude, AZ::IO::HandleType srcFileHandle)
-{
-    SShaderBin* pBin = new SShaderBin;
-
-    CParserBin Parser(pBin);
-
-    int nSize = gEnv->pCryPak->FGetSize(srcFileHandle);
-    char* buf = new char [nSize + 1];
-    char* pBuf = buf;
-    buf[nSize] = 0;
-    gEnv->pCryPak->FSeek(srcFileHandle, 0, SEEK_SET);
-    gEnv->pCryPak->FRead(buf, nSize, srcFileHandle);
-
-    RemoveCR(buf);
-    const char* whiteSpace = " ";
-
-    {
-        // Hold the parsing context used to get rid of the ## directives. The constructor will
-        // take care of setting AZ_RESTRICTED_PLATFORM appropriately
-        PoundPoundContext poundPoundContext(m_pCEF->m_ShadersFilter);
-
-        // Keep parsing until we hit the real EOB.
-        bool layerSwitch;
-        while (!poundPoundContext.IsEndOfBuffer(&buf, &layerSwitch))
-        {
-            // This loop handles stripping the input text of comments, whitespace, and the
-            // ## include directives
-            do 
-            {
-                SkipCharacters(&buf, whiteSpace);
-                SkipComments(&buf, true);
-
-                // If we find the ## characters, preprocess the token lines, allowing it to consume
-                // any disabled text between ## directives and then whitespace and comments again
-                while (buf[0] == '#' && buf[1] == '#')
-                {
-                    poundPoundContext.PreprocessLines(&buf);
-                    SkipCharacters(&buf, whiteSpace);
-                    SkipComments(&buf, true);
-                }
-
-                // We need to be able to catch the case where a ##include file has hit end of buffer,
-                // but not the parent buffer, in which case we have to keep skipping whitespace and
-                // comments again
-                layerSwitch = false;
-            } while (!poundPoundContext.IsEndOfBuffer(&buf, &layerSwitch) && layerSwitch);
-
-            // Quit parsing if we have hit the real EOB.
-            if (poundPoundContext.IsEndOfBuffer(&buf, &layerSwitch))
-            {
-                break;
-            }
-
-            char com[1024];
-            bool bKey = false;
-            uint32 dwToken = CParserBin::NextToken(buf, com, bKey);
-            // If the token is not a key token, find/create a user token for it.
-            dwToken = Parser.NewUserToken(dwToken, com, false);
-            pBin->m_Tokens.push_back(dwToken);
-
-            SkipCharacters (&buf, whiteSpace);
-            SkipComments (&buf, true);
-            if (dwToken == eT_include)
-            {
-                // Skip whitespace to get to the < or " bracket for the include
-                SkipCharacters(&buf, whiteSpace);
-                AZ_Assert(*buf == '"' || *buf == '<', "Error saving shader %s. Include should be followed by \" or <.", szName);
-                char brak = *buf;
-                ++buf;
-                int n = 0;
-
-                // Get the value in-between the include brackets
-                while (*buf != brak)
-                {
-                    if (*buf <= 0x20)
-                    {
-                        AZ_Assert(false, "Error saving shader %s. Invalid special character found between include brackets.", szName);
-                        break;
-                    }
-                    com[n++] = *buf;
-                    ++buf;
-                }
-                if (*buf == brak)
-                {
-                    ++buf;
-                }
-                com[n] = 0;
-
-                fpStripExtension(com, com);
-
-                // Get or load the included shader
-                GetBinShader(com, true, 0);
-
-                dwToken = CParserBin::fxToken(com, NULL);
-                dwToken = Parser.NewUserToken(dwToken, com, false);
-                pBin->m_Tokens.push_back(dwToken);
-            }
-            else if (dwToken == eT_if || dwToken == eT_ifdef || dwToken == eT_ifndef)
-            {
-                bool bFirst = fxIsFirstPass(buf);
-                if (!bFirst)
-                {
-                    if (dwToken == eT_if)
-                    {
-                        dwToken = eT_if_2;
-                    }
-                    else if (dwToken == eT_ifdef)
-                    {
-                        dwToken = eT_ifdef_2;
-                    }
-                    else
-                    {
-                        dwToken = eT_ifndef_2;
-                    }
-                    pBin->m_Tokens[pBin->m_Tokens.size() - 1] = dwToken;
-                }
-            }
-            else if (dwToken == eT_define)
-            {
-                shFill(&buf, com);
-                if (com[0] == '%')
-                {
-                    pBin->m_Tokens[pBin->m_Tokens.size() - 1] = eT_define_2;
-                }
-                dwToken = Parser.NewUserToken(eT_unknown, com, false);
-                pBin->m_Tokens.push_back(dwToken);
-
-                TArray<char> macro;
-                while (*buf == 0x20 || *buf == 0x9)
-                {
-                    buf++;
-                }
-                while (*buf != 0xa)
-                {
-                    if (*buf == '\\')
-                    {
-                        macro.AddElem('\n');
-                        while (*buf != '\n')
-                        {
-                            buf++;
-                        }
-                        buf++;
-                        continue;
-                    }
-                    macro.AddElem(*buf);
-                    buf++;
-                }
-                macro.AddElem(0);
-                int n = macro.Num() - 2;
-                while (n >= 0 && macro[n] <= 0x20)
-                {
-                    macro[n] = 0;
-                    n--;
-                }
-                char* b = &macro[0];
-                while (*b)
-                {
-                    SkipCharacters (&b, whiteSpace);
-                    SkipComments (&b, true);
-                    if (!b || !b[0])
-                    {
-                        break;
-                    }
-                    bKey = false;
-                    dwToken = CParserBin::NextToken(b, com, bKey);
-                    dwToken = Parser.NewUserToken(dwToken, com, false);
-                    if (dwToken == eT_if || dwToken == eT_ifdef || dwToken == eT_ifndef)
-                    {
-                        bool bFirst = fxIsFirstPass(b);
-                        if (!bFirst)
-                        {
-                            if (dwToken == eT_if)
-                            {
-                                dwToken = eT_if_2;
-                            }
-                            else
-                            if (dwToken == eT_ifdef)
-                            {
-                                dwToken = eT_ifdef_2;
-                            }
-                            else
-                            {
-                                dwToken = eT_ifndef_2;
-                            }
-                        }
-                    }
-                    pBin->m_Tokens.push_back(dwToken);
-                }
-                pBin->m_Tokens.push_back(0);
-            }
-        }
-    }
-    if (pBin->m_Tokens.size() == 0 || !pBin->m_Tokens[0])
-    {
-        pBin->m_Tokens.push_back(eT_skip);
-    }
-
-    pBin->SetCRC(pBin->ComputeCRC());
-    pBin->m_bReadOnly = false;
-
-    char nameFile[256];
-    sprintf_s(nameFile, "%s%s.%s", m_pCEF->m_ShadersCache.c_str(), szName, bInclude ? "cfib" : "cfxb");
-    stack_string szDst = stack_string(m_pCEF->m_szCachePath.c_str()) + stack_string(nameFile);
-    const char* szFileName = szDst;
-
-    AZ::IO::HandleType dstFileHandle = gEnv->pCryPak->FOpen(szFileName, "wb", AZ::IO::IArchive::FLAGS_NEVER_IN_PAK | AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FOPEN_ONDISK);
-    if (dstFileHandle != AZ::IO::InvalidHandle)
-    {
-        SShaderBinHeader Header;
-        Header.m_nTokens = pBin->m_Tokens.size();
-        Header.m_Magic = FOURCC_SHADERBIN;
-        Header.m_CRC32 = pBin->m_CRC32;
-        float fVersion = FX_CACHE_VER;
-        Header.m_VersionLow = (uint16)(((float)fVersion - (float)(int)fVersion) * 10.1f);
-        Header.m_VersionHigh = (uint16)fVersion;
-        Header.m_nOffsetStringTable = pBin->m_Tokens.size() * sizeof(DWORD) + sizeof(Header);
-        Header.m_nOffsetParamsLocal = 0;
-        Header.m_nSourceCRC32 = nSourceCRC32;
-        SShaderBinHeader hdTemp, * pHD;
-        pHD = &Header;
-        if (CParserBin::m_bEndians)
-        {
-            hdTemp = Header;
-            SwapEndian(hdTemp, eBigEndian);
-            pHD = &hdTemp;
-        }
-        gEnv->pCryPak->FWrite((void*)pHD, sizeof(Header), 1, dstFileHandle);
-        if (CParserBin::m_bEndians)
-        {
-            DWORD* pT = new DWORD [pBin->m_Tokens.size()];
-            memcpy(pT, &pBin->m_Tokens[0], pBin->m_Tokens.size() * sizeof(DWORD));
-            SwapEndian(pT, (size_t)pBin->m_Tokens.size(), eBigEndian);
-            gEnv->pCryPak->FWrite((void*)pT, pBin->m_Tokens.size() * sizeof(DWORD), 1, dstFileHandle);
-            delete [] pT;
-        }
-        else
-        {
-            gEnv->pCryPak->FWrite(&pBin->m_Tokens[0], pBin->m_Tokens.size() * sizeof(DWORD), 1, dstFileHandle);
-        }
-        FXShaderTokenItor itor;
-        for (itor = pBin->m_TokenTable.begin(); itor != pBin->m_TokenTable.end(); itor++)
-        {
-            STokenD T = *itor;
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(T.Token, eBigEndian);
-            }
-            gEnv->pCryPak->FWrite(&T.Token, sizeof(DWORD), 1, dstFileHandle);
-            gEnv->pCryPak->FWrite(T.SToken.c_str(), T.SToken.size() + 1, 1, dstFileHandle);
-        }
-        Header.m_nOffsetParamsLocal = aznumeric_caster(gEnv->pCryPak->FTell(dstFileHandle));
-        gEnv->pCryPak->FSeek(dstFileHandle, 0, SEEK_SET);
-        if (CParserBin::m_bEndians)
-        {
-            hdTemp = Header;
-            SwapEndian(hdTemp, eBigEndian);
-            pHD = &hdTemp;
-        }
-        gEnv->pCryPak->FWrite((void*)pHD, sizeof(Header), 1, dstFileHandle);
-        gEnv->pCryPak->FClose(dstFileHandle);
-    }
-    else
-    {
-        iLog->LogWarning("WARN: CShaderManBin::SaveBinShader: Cannot write shader to file '%s'.", nameFile);
-        pBin->m_bReadOnly = true;
-    }
-
-    SAFE_DELETE_ARRAY(pBuf);
-
-    return pBin;
-}
-
-//=========================================================================================================================================
-
-static void sParseCSV(string& sFlt, std::vector<string>& Filters)
-{
-    const char* cFlt = sFlt.c_str();
-    char Flt[64];
-    int nFlt = 0;
-    while (true)
-    {
-        char c = *cFlt++;
-        if (!c)
-        {
-            break;
-        }
-        if (SkipChar((unsigned char)c))
-        {
-            if (nFlt)
-            {
-                Flt[nFlt] = 0;
-                Filters.push_back(string(Flt));
-                nFlt = 0;
-            }
-            continue;
-        }
-        Flt[nFlt++] = c;
-    }
-    if (nFlt)
-    {
-        Flt[nFlt] = 0;
-        Filters.push_back(string(Flt));
-    }
-}
-
-//===========================================================================================================================
-
-struct FXParamsSortByName
-{
-    bool operator () (const SFXParam& left, const SFXParam& right) const
-    {
-        return left.m_dwName[0] < right.m_dwName[0];
-    }
-    bool operator () (const uint32 left, const SFXParam& right) const
-    {
-        return left < right.m_dwName[0];
-    }
-    bool operator () (const SFXParam& left, uint32 right) const
-    {
-        return left.m_dwName[0] < right;
-    }
-};
-struct FXSamplersOldSortByName
-{
-    bool operator () (const STexSamplerFX& left, const STexSamplerFX& right) const
-    {
-        return left.m_szName < right.m_szName;
-    }
-    bool operator () (const string left, const STexSamplerFX& right) const
-    {
-        return left < right.m_szName;
-    }
-    bool operator () (const STexSamplerFX& left, string right) const
-    {
-        return left.m_szName < right;
-    }
-};
-struct FXSamplersSortByName
-{
-    bool operator () (const SFXSampler& left, const SFXSampler& right) const
-    {
-        return left.m_dwName[0] < right.m_dwName[0];
-    }
-    bool operator () (const uint32 left, const SFXSampler& right) const
-    {
-        return left < right.m_dwName[0];
-    }
-    bool operator () (const SFXSampler& left, const uint32 right) const
-    {
-        return left.m_dwName[0] < right;
-    }
-};
-struct FXTexturesSortByName
-{
-    bool operator () (const SFXTexture& left, const SFXTexture& right) const
-    {
-        return left.m_dwName[0] < right.m_dwName[0];
-    }
-    bool operator () (const uint32 left, const SFXTexture& right) const
-    {
-        return left < right.m_dwName[0];
-    }
-    bool operator () (const SFXTexture& left, const uint32 right) const
-    {
-        return left.m_dwName[0] < right;
-    }
-};
-
-int CShaderManBin::mfSizeFXParams(uint32& nCount)
-{
-    nCount = m_ShaderFXParams.size();
-    int nSize = sizeOfMap(m_ShaderFXParams);
-    return nSize;
-}
-
-void CShaderManBin::mfReleaseFXParams()
-{
-    m_ShaderFXParams.clear();
-}
-
-SShaderFXParams& CShaderManBin::mfGetFXParams(CShader* pSH)
-{
-    CCryNameTSCRC s = pSH->GetNameCRC();
-    ShaderFXParamsItor it = m_ShaderFXParams.find(s);
-    if (it != m_ShaderFXParams.end())
-    {
-        return it->second;
-    }
-    SShaderFXParams pr;
-    std::pair<ShaderFXParams::iterator, bool> insertLocation =
-        m_ShaderFXParams.insert(std::pair<CCryNameTSCRC, SShaderFXParams>(s, pr));
-    CRY_ASSERT(insertLocation.second);
-    return insertLocation.first->second;
-}
-
-void CShaderManBin::mfRemoveFXParams(CShader* pSH)
-{
-    CCryNameTSCRC s = pSH->GetNameCRC();
-    ShaderFXParamsItor it = m_ShaderFXParams.find(s);
-    if (it != m_ShaderFXParams.end())
-    {
-        m_ShaderFXParams.erase(it);
-    }
-}
-
-SFXParam* CShaderManBin::mfAddFXParam(SShaderFXParams& FXP, const SFXParam* pParam)
-{
-    FXParamsIt it = std::lower_bound(FXP.m_FXParams.begin(), FXP.m_FXParams.end(), pParam->m_dwName[0], FXParamsSortByName());
-    if (it != FXP.m_FXParams.end() && pParam->m_dwName[0] == (*it).m_dwName[0])
-    {
-        SFXParam& pr = *it;
-        pr.m_nFlags = pParam->m_nFlags;
-        int n = 6;
-        SFXParam& p = *it;
-        for (int i = 0; i < n; i++)
-        {
-            if (p.m_Register[i] == 10000)
-            {
-                p.m_Register[i] = pParam->m_Register[i];
-            }
-        }
-        //CRY_ASSERT(p == *pParam);
-        return &(*it);
-    }
-    FXP.m_FXParams.insert(it, *pParam);
-    it = std::lower_bound(FXP.m_FXParams.begin(), FXP.m_FXParams.end(), pParam->m_dwName[0], FXParamsSortByName());
-    SFXParam* pFX = &(*it);
-    if (pFX->m_Semantic.empty() && pFX->m_Values.c_str()[0] == '(')
-    {
-        pFX->m_BindingSlot = eConstantBufferShaderSlot_PerMaterial;
-    }
-    FXP.m_nFlags |= FXP_PARAMS_DIRTY;
-
-    return pFX;
-}
-SFXParam* CShaderManBin::mfAddFXParam(CShader* pSH, const SFXParam* pParam)
-{
-    if (!pParam)
-    {
-        return NULL;
-    }
-
-    SShaderFXParams& FXP = mfGetFXParams(pSH);
-    return mfAddFXParam(FXP, pParam);
-}
-void CShaderManBin::mfAddFXSampler(CShader* pSH, const STexSamplerFX* pSamp)
-{
-    if (!pSamp)
-    {
-        return;
-    }
-
-    SShaderFXParams& FXP = mfGetFXParams(pSH);
-
-    FXSamplersOldIt it = std::lower_bound(FXP.m_FXSamplersOld.begin(), FXP.m_FXSamplersOld.end(), pSamp->m_szName, FXSamplersOldSortByName());
-    if (it != FXP.m_FXSamplersOld.end() && pSamp->m_szName == (*it).m_szName)
-    {
-        CRY_ASSERT(*it == *pSamp);
-        return;
-    }
-    FXP.m_FXSamplersOld.insert(it, *pSamp);
-    FXP.m_nFlags |= FXP_SAMPLERS_DIRTY;
-}
-void CShaderManBin::mfAddFXSampler(CShader* pSH, const SFXSampler* pSamp)
-{
-    if (!pSamp)
-    {
-        return;
-    }
-
-    SShaderFXParams& FXP = mfGetFXParams(pSH);
-
-    FXSamplersIt it = std::lower_bound(FXP.m_FXSamplers.begin(), FXP.m_FXSamplers.end(), pSamp->m_dwName[0], FXSamplersSortByName());
-    if (it != FXP.m_FXSamplers.end() && pSamp->m_dwName[0] == (*it).m_dwName[0])
-    {
-        CRY_ASSERT(*it == *pSamp);
-        return;
-    }
-    FXP.m_FXSamplers.insert(it, *pSamp);
-    FXP.m_nFlags |= FXP_SAMPLERS_DIRTY;
-}
-
-//------------------------------------------------------------------------------
-// Add a new texture to the shader's textures array based on the texture name
-//------------------------------------------------------------------------------
-void CShaderManBin::mfAddFXTexture(CShader* pSH, const SFXTexture* pTexture)
-{
-    if (!pTexture)
-    {
-        return;
-    }
-
-    SShaderFXParams&    FXP = mfGetFXParams(pSH);
-    FXTexturesIt        it = std::lower_bound(FXP.m_FXTextures.begin(), FXP.m_FXTextures.end(), pTexture->m_dwName[0], FXTexturesSortByName());
-
-    if (it != FXP.m_FXTextures.end() && pTexture->m_dwName[0] == (*it).m_dwName[0])
-    {
-        CRY_ASSERT(*it == *pTexture);
-        return;
-    }
-    FXP.m_FXTextures.insert(it, *pTexture);
-    FXP.m_nFlags |= FXP_TEXTURES_DIRTY;
-}
-
-void CShaderManBin::mfGeneratePublicFXParams(CShader* pSH, CParserBin& Parser)
-{
-    SShaderFXParams& FXP = mfGetFXParams(pSH);
-    if (!(FXP.m_nFlags & FXP_PARAMS_DIRTY))
-    {
-        return;
-    }
-    FXP.m_nFlags &= ~FXP_PARAMS_DIRTY;
-
-    uint32 i;
-    // Generate public parameters
-    for (i = 0; i < FXP.m_FXParams.size(); i++)
-    {
-        SFXParam* pr = &FXP.m_FXParams[i];
-        uint32 nFlags = pr->GetFlags();
-        if (nFlags & PF_AUTOMERGED)
-        {
-            continue;
-        }
-        if (nFlags & PF_TWEAKABLE_MASK)
-        {
-            const char* szName = Parser.GetString(pr->m_dwName[0]);
-            // Avoid duplicating of public parameters
-            int32 j;
-            for (j = 0; j < FXP.m_PublicParams.size(); j++)
-            {
-                SShaderParam* p = &FXP.m_PublicParams[j];
-                if (azstricmp(p->m_Name.c_str(), szName) == 0)
-                {
-                    break;
-                }
-            }
-            if (j == FXP.m_PublicParams.size())
-            {
-                SShaderParam sp;
-                sp.m_Name = szName;
-                EParamType eType;
-                string szWidget = pr->GetValueForName("UIWidget", eType);
-                const char* szVal = pr->m_Values.c_str();
-                if (szWidget == "color")
-                {
-                    sp.m_Type = eType_FCOLOR;
-                    if (szVal[0] == '{')
-                    {
-                        szVal++;
-                    }
-                    [[maybe_unused]] int n = azsscanf(szVal, "%f, %f, %f, %f", &sp.m_Value.m_Color[0], &sp.m_Value.m_Color[1], &sp.m_Value.m_Color[2], &sp.m_Value.m_Color[3]);
-                    AZ_Warning("Shaders", n == 4, "color value only has %d components", n);
-                }
-                else if (szWidget == "colora")
-                {
-                    sp.m_Type = eType_FCOLORA;
-                    if (szVal[0] == '{')
-                    {
-                        szVal++;
-                    }
-                    [[maybe_unused]] int n = azsscanf(szVal, "%f, %f, %f, %f", &sp.m_Value.m_Color[0], &sp.m_Value.m_Color[1], &sp.m_Value.m_Color[2], &sp.m_Value.m_Color[3]);
-                    AZ_Warning("Shaders", n == 4, "color value only has %d components", n);
-                }
-                else
-                {
-                    sp.m_Type = eType_FLOAT;
-                    sp.m_Value.m_Float = (float)atof(szVal);
-                }
-
-                bool bAdd = true;
-                if (!pr->m_Annotations.empty() && gRenDev->IsEditorMode())
-                {
-                    //EParamType eType;
-                    string sFlt = pr->GetValueForName("Filter", eType);
-                    bool bUseScript = true;
-                    if (!sFlt.empty())
-                    {
-                        std::vector<string> Filters;
-                        sParseCSV(sFlt, Filters);
-                        string strShader = Parser.m_pCurShader->GetName();
-                        uint32 h;
-                        for (h = 0; h < Filters.size(); h++)
-                        {
-                            if (!_strnicmp(Filters[h].c_str(), strShader.c_str(), Filters[h].size()))
-                            {
-                                break;
-                            }
-                        }
-                        if (h == Filters.size())
-                        {
-                            bUseScript = false;
-                            bAdd = false;
-                        }
-                    }
-
-                    if (bUseScript)
-                    {
-                        sp.m_Script = pr->m_Annotations.c_str();
-                    }
-                }
-
-                if (bAdd)
-                {
-                    FXP.m_PublicParams.push_back(sp);
-                }
-            }
-        }
-    }
-}
-
-SParamCacheInfo* CShaderManBin::GetParamInfo(SShaderBin* pBin, uint32 dwName, uint64 nMaskGenFX, uint64 maskGenStatic)
-{
-    const int n = pBin->m_ParamsCache.size();
-    for (int i = 0; i < n; i++)
-    {
-        SParamCacheInfo* pInf = &pBin->m_ParamsCache[i];
-        if (pInf->m_dwName == dwName && pInf->m_nMaskGenFX == nMaskGenFX && pInf->m_maskGenStatic == maskGenStatic)
-        {
-            pBin->m_nCurParamsID = i;
-            return pInf;
-        }
-    }
-    pBin->m_nCurParamsID = -1;
-    return NULL;
-}
-
-bool CShaderManBin::SaveBinShaderLocalInfo(SShaderBin* pBin, uint32 dwName, uint64 nMaskGenFX, uint64 maskGenStatic, TArray<int32>& Funcs, std::vector<SFXParam>& Params, std::vector<SFXSampler>& Samplers, std::vector<SFXTexture>& Textures)
-{
-    if (GetParamInfo(pBin, dwName, nMaskGenFX, maskGenStatic))
-    {
-        return true;
-    }
-
-    if (pBin->IsReadOnly() && !gEnv->IsEditor()) // if in the editor, allow params to be added in-memory, but not saved to disk
-    {
-        return false;
-    }
-    TArray<int32> EParams;
-    TArray<int32> ESamplers;
-    TArray<int32> ETextures;
-    TArray<int32> EFuncs;
-    for (uint32 i = 0; i < Params.size(); i++)
-    {
-        SFXParam& pr = Params[i];
-        CRY_ASSERT(pr.m_dwName.size());
-        if (pr.m_dwName.size())
-        {
-            EParams.push_back(pr.m_dwName[0]);
-        }
-    }
-    for (uint32 i = 0; i < Samplers.size(); i++)
-    {
-        SFXSampler& pr = Samplers[i];
-        CRY_ASSERT(pr.m_dwName.size());
-        if (pr.m_dwName.size())
-        {
-            ESamplers.push_back(pr.m_dwName[0]);
-        }
-    }
-    for (uint32 i = 0; i < Textures.size(); i++)
-    {
-        SFXTexture& pr = Textures[i];
-        CRY_ASSERT(pr.m_dwName.size());
-        if (pr.m_dwName.size())
-        {
-            ETextures.push_back(pr.m_dwName[0]);
-        }
-    }
-    pBin->m_nCurParamsID = pBin->m_ParamsCache.size();
-    pBin->m_ParamsCache.push_back(SParamCacheInfo());
-    SParamCacheInfo& pr = pBin->m_ParamsCache.back();
-    pr.m_nMaskGenFX = nMaskGenFX;
-    pr.m_maskGenStatic = maskGenStatic;
-    pr.m_dwName = dwName;
-    pr.m_AffectedFuncs.assign(Funcs.begin(), Funcs.end());
-    pr.m_AffectedParams.assign(EParams.begin(), EParams.end());
-    pr.m_AffectedSamplers.assign(ESamplers.begin(), ESamplers.end());
-    pr.m_AffectedTextures.assign(ETextures.begin(), ETextures.end());
-    if (pBin->IsReadOnly())
-    {
-        return false;
-    }
-    AZ::IO::HandleType binFileHandle = gEnv->pCryPak->FOpen(pBin->m_szName, "r+b", AZ::IO::IArchive::FLAGS_NEVER_IN_PAK | AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FOPEN_ONDISK);
-    CRY_ASSERT(binFileHandle != AZ::IO::InvalidHandle);
-    if (binFileHandle == AZ::IO::InvalidHandle)
-    {
-        return false;
-    }
-    gEnv->pCryPak->FSeek(binFileHandle, 0, SEEK_END);
-    uint64_t nSeek = gEnv->pCryPak->FTell(binFileHandle);
-    CRY_ASSERT(nSeek > 0);
-    if (nSeek == 0)
-    {
-        return false;
-    }
-    SShaderBinParamsHeader sd;
-    int32* pFuncs = &Funcs[0];
-    int32* pParams = EParams.size() ? &EParams[0] : NULL;
-    int32* pSamplers = ESamplers.size() ? &ESamplers[0] : NULL;
-    int32* pTextures = ETextures.size() ? &ETextures[0] : NULL;
-    sd.nMask = nMaskGenFX;
-    sd.nstaticMask = maskGenStatic;
-    sd.nName = dwName;
-    sd.nFuncs = Funcs.size();
-    sd.nParams = EParams.size();
-    sd.nSamplers = ESamplers.size();
-    sd.nTextures = ETextures.size();
-    if (CParserBin::m_bEndians)
-    {
-        SwapEndian(sd, eBigEndian);
-        EFuncs = Funcs;
-        if (EParams.size())
-        {
-            SwapEndian(&EParams[0], (size_t)EParams.size(), eBigEndian);
-        }
-        if (ESamplers.size())
-        {
-            SwapEndian(&ESamplers[0], (size_t)ESamplers.size(), eBigEndian);
-        }
-        if (ETextures.size())
-        {
-            SwapEndian(&ETextures[0], (size_t)ETextures.size(), eBigEndian);
-        }
-        SwapEndian(&EFuncs[0], (size_t)EFuncs.size(), eBigEndian);
-        pFuncs = &EFuncs[0];
-    }
-    gEnv->pCryPak->FWrite(&sd, sizeof(sd), 1, binFileHandle);
-
-    if (EParams.size())
-    {
-        gEnv->pCryPak->FWrite(pParams, EParams.size(), sizeof(int32), binFileHandle);
-    }
-    if (ESamplers.size())
-    {
-        gEnv->pCryPak->FWrite(pSamplers, ESamplers.size(), sizeof(int32), binFileHandle);
-    }
-    if (ETextures.size())
-    {
-        gEnv->pCryPak->FWrite(pTextures, ETextures.size(), sizeof(int32), binFileHandle);
-    }
-    gEnv->pCryPak->FWrite(pFuncs, Funcs.size(), sizeof(int32), binFileHandle);
-    gEnv->pCryPak->FClose(binFileHandle);
-
-    return true;
-}
-
-SShaderBin* CShaderManBin::LoadBinShader(AZ::IO::HandleType fpBin, const char* szName, const char* szNameBin, bool bReadParams)
-{
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-
-    gEnv->pCryPak->FSeek(fpBin, 0, SEEK_SET);
-    SShaderBinHeader Header;
-    size_t sizeRead = gEnv->pCryPak->FReadRaw(&Header, 1, sizeof(SShaderBinHeader), fpBin);
-    if (sizeRead != sizeof(SShaderBinHeader))
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Failed to read header for %s in CShaderManBin::LoadBinShader. Expected %" PRISIZE_T ", got %" PRISIZE_T "", szName, sizeof(SShaderBinHeader), sizeRead);
-        return NULL;
-    }
-
-    if (CParserBin::m_bEndians)
-    {
-        SwapEndian(Header, eBigEndian);
-    }
-    float fVersion = FX_CACHE_VER;
-    uint16 MinorVer = (uint16)(((float)fVersion - (float)(int)fVersion) * 10.1f);
-    uint16 MajorVer = (uint16)fVersion;
-    bool bCheckValid = CRenderer::CV_r_shadersAllowCompilation != 0;
-    if (bCheckValid && (Header.m_VersionLow != MinorVer || Header.m_VersionHigh != MajorVer || Header.m_Magic != FOURCC_SHADERBIN))
-    {
-        return NULL;
-    }
-    if (Header.m_VersionHigh > 10)
-    {
-        return NULL;
-    }
-    SShaderBin* pBin = new SShaderBin;
-
-    pBin->m_SourceCRC32 = Header.m_nSourceCRC32;
-    pBin->m_nOffsetLocalInfo = Header.m_nOffsetParamsLocal;
-
-    uint32 CRC32 = Header.m_CRC32;
-    pBin->m_CRC32 = CRC32;
-    pBin->m_Tokens.resize(Header.m_nTokens);
-    sizeRead = gEnv->pCryPak->FReadRaw(&pBin->m_Tokens[0], sizeof(uint32), Header.m_nTokens, fpBin);
-    if (sizeRead != Header.m_nTokens)
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Failed to read Tokens for %s in CShaderManBin::LoadBinShader. Expected %d, got %" PRISIZE_T "", szName, Header.m_nTokens, sizeRead);
-        return NULL;
-    }
-    if (CParserBin::m_bEndians)
-    {
-        SwapEndian(&pBin->m_Tokens[0], (size_t)Header.m_nTokens, eBigEndian);
-    }
-
-    int nSizeTable = Header.m_nOffsetParamsLocal - Header.m_nOffsetStringTable;
-    if (nSizeTable < 0)
-    {
-        return NULL;
-    }
-    else if (nSizeTable > 0)
-    {
-        char* bufTable = new char[nSizeTable];
-        char* bufT = bufTable;
-        sizeRead = gEnv->pCryPak->FReadRaw(bufTable, 1, nSizeTable, fpBin);
-        if (sizeRead != nSizeTable)
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Failed to read bufTable for %s in CShaderManBin::LoadBinShader. Expected %d, got %" PRISIZE_T "", szName, nSizeTable, sizeRead);
-            return NULL;
-        }
-        char* bufEnd = &bufTable[nSizeTable];
-
-        // First pass to count the tokens
-        uint32 nTokens(0);
-        while (bufTable < bufEnd)
-        {
-            STokenD TD;
-            LoadUnaligned(bufTable, TD.Token);
-            int nIncr = 4 + strlen(&bufTable[4]) + 1;
-            bufTable += nIncr;
-            ++nTokens;
-        }
-
-        pBin->m_TokenTable.reserve(nTokens);
-        bufTable = bufT;
-        while (bufTable < bufEnd)
-        {
-            STokenD TD;
-            LoadUnaligned(bufTable, TD.Token);
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(TD.Token, eBigEndian);
-            }
-            FXShaderTokenItor itor = std::lower_bound(pBin->m_TokenTable.begin(), pBin->m_TokenTable.end(), TD.Token, SortByToken());
-            assert (itor == pBin->m_TokenTable.end() || (*itor).Token != TD.Token);
-            TD.SToken = &bufTable[4];
-            pBin->m_TokenTable.insert(itor, TD);
-            int nIncr = 4 + strlen(&bufTable[4]) + 1;
-            bufTable += nIncr;
-        }
-        SAFE_DELETE_ARRAY(bufT);
-    }
-
-    //if (CRenderer::CV_r_shadersnocompile)
-    //  bReadParams = false;
-    if (bReadParams)
-    {
-        int nSeek = pBin->m_nOffsetLocalInfo;
-        gEnv->pCryPak->FSeek(fpBin, nSeek, SEEK_SET);
-        while (true)
-        {
-            SShaderBinParamsHeader sd;
-            int nSize = gEnv->pCryPak->FReadRaw(&sd, 1, sizeof(sd), fpBin);
-            if (nSize != sizeof(sd))
-            {
-                break;
-            }
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(sd, eBigEndian);
-            }
-
-            if (sd.nParams < 0 || sd.nSamplers < 0 || sd.nTextures < 0 || sd.nFuncs < 0)
-            {
-                AZ_Assert(false, "Error attempting to read shader binary %s. You may need to delete and re-compile this shader binary from your cache folder.", szNameBin);
-                return nullptr;
-            }
-
-            SParamCacheInfo pr;
-            int n = pBin->m_ParamsCache.size();
-            pBin->m_ParamsCache.push_back(pr);
-            SParamCacheInfo& prc = pBin->m_ParamsCache[n];
-            prc.m_dwName = sd.nName;
-            prc.m_nMaskGenFX = sd.nMask;
-            prc.m_maskGenStatic = sd.nstaticMask;
-            prc.m_AffectedParams.resize(sd.nParams);
-            prc.m_AffectedSamplers.resize(sd.nSamplers);
-            prc.m_AffectedTextures.resize(sd.nTextures);
-            prc.m_AffectedFuncs.resize(sd.nFuncs);
-
-            if (sd.nParams)
-            {
-                nSize = gEnv->pCryPak->FReadRaw(&prc.m_AffectedParams[0], sizeof(int32), sd.nParams, fpBin);
-                if (nSize != sd.nParams)
-                {
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Failed to read m_AffectedParams for %s in CShaderManBin::LoadBinShader. Expected %d, got %" PRISIZE_T "", szName, sd.nParams, sizeRead);
-                    return NULL;
-                }
-                if (CParserBin::m_bEndians)
-                {
-                    SwapEndian(&prc.m_AffectedParams[0], sd.nParams, eBigEndian);
-                }
-            }
-            if (sd.nSamplers)
-            {
-                nSize = gEnv->pCryPak->FReadRaw(&prc.m_AffectedSamplers[0], sizeof(int32), sd.nSamplers, fpBin);
-                if (nSize != sd.nSamplers)
-                {
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Failed to read m_AffectedSamplers for %s in CShaderManBin::LoadBinShader. Expected %d, got %" PRISIZE_T, szName, sd.nSamplers, sizeRead);
-                    return NULL;
-                }
-                if (CParserBin::m_bEndians)
-                {
-                    SwapEndian(&prc.m_AffectedSamplers[0], sd.nSamplers, eBigEndian);
-                }
-            }
-            if (sd.nTextures)
-            {
-                nSize = gEnv->pCryPak->FReadRaw(&prc.m_AffectedTextures[0], sizeof(int32), sd.nTextures, fpBin);
-                if (nSize != sd.nTextures)
-                {
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Failed to read m_AffectedTextures for %s in CShaderManBin::LoadBinShader. Expected %d, got %" PRISIZE_T, szName, sd.nTextures, sizeRead);
-                    return NULL;
-                }
-                if (CParserBin::m_bEndians)
-                {
-                    SwapEndian(&prc.m_AffectedTextures[0], sd.nTextures, eBigEndian);
-                }
-            }
-
-            CRY_ASSERT(sd.nFuncs > 0);
-            nSize = gEnv->pCryPak->FReadRaw(&prc.m_AffectedFuncs[0], sizeof(int32), sd.nFuncs, fpBin);
-            if (nSize != sd.nFuncs)
-            {
-                CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Failed to read nFuncs for %s in CShaderManBin::LoadBinShader. Expected %d, got %" PRISIZE_T "", szName, sd.nFuncs, sizeRead);
-                return NULL;
-            }
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(&prc.m_AffectedFuncs[0], sd.nFuncs, eBigEndian);
-            }
-
-            nSeek += (sd.nFuncs) * sizeof(int32) + sizeof(sd);
-        }
-    }
-
-    char nameLwr[256];
-    cry_strcpy(nameLwr, szName);
-    azstrlwr(nameLwr, AZ_ARRAY_SIZE(nameLwr));
-    pBin->SetName(szNameBin);
-    pBin->m_dwName = CParserBin::GetCRC32(nameLwr);
-
-    return pBin;
-}
-
-SShaderBin* CShaderManBin::SearchInCache(const char* szName, bool bInclude)
-{
-    char nameFile[256], nameLwr[256];
-    cry_strcpy(nameLwr, szName);
-    azstrlwr(nameLwr, AZ_ARRAY_SIZE(nameLwr));
-    sprintf_s(nameFile, "%s.%s", nameLwr, bInclude ? "cfi" : "cfx");
-    uint32 dwName = CParserBin::GetCRC32(nameFile);
-
-    SShaderBin* pSB;
-    for (pSB = SShaderBin::s_Root.m_Prev; pSB != &SShaderBin::s_Root; pSB = pSB->m_Prev)
-    {
-        if (pSB->m_dwName == dwName)
-        {
-            pSB->Unlink();
-            pSB->Link(&SShaderBin::s_Root);
-            return pSB;
-        }
-    }
-    return NULL;
-}
-
-bool CShaderManBin::AddToCache(SShaderBin* pSB, bool bInclude)
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_shadersediting)
-    {
-        if (SShaderBin::s_nCache >= SShaderBin::s_nMaxFXBinCache)
-        {
-            SShaderBin* pS;
-            for (pS = SShaderBin::s_Root.m_Prev; pS != &SShaderBin::s_Root; pS = pS->m_Prev)
-            {
-                if (!pS->m_bLocked)
-                {
-                    DeleteFromCache(pS);
-                    break;
-                }
-            }
-        }
-        CRY_ASSERT(SShaderBin::s_nCache < SShaderBin::s_nMaxFXBinCache);
-    }
-
-    pSB->m_bInclude = bInclude;
-    pSB->Link(&SShaderBin::s_Root);
-    SShaderBin::s_nCache++;
-
-    return true;
-}
-
-bool CShaderManBin::DeleteFromCache(SShaderBin* pSB)
-{
-    CRY_ASSERT(pSB != &SShaderBin::s_Root);
-    pSB->Unlink();
-    SAFE_DELETE(pSB);
-    SShaderBin::s_nCache--;
-
-    return true;
-}
-
-void CShaderManBin::InvalidateCache(bool bIncludesOnly)
-{
-    SShaderBin* pSB, * Next;
-    for (pSB = SShaderBin::s_Root.m_Next; pSB != &SShaderBin::s_Root; pSB = Next)
-    {
-        Next = pSB->m_Next;
-        if (bIncludesOnly && !pSB->m_bInclude)
-        {
-            continue;
-        }
-        DeleteFromCache(pSB);
-    }
-    SShaderBin::s_nMaxFXBinCache = MAX_FXBIN_CACHE;
-    m_bBinaryShadersLoaded = false;
-
-    g_shaderBucketAllocator.cleanup();
-    
-#if defined(SHADERS_SERIALIZING)
-    // Clear our .fxb cache if we are deleting our shader binary cache.
-    // We end up initializing part of the shader system with D3D11 as the platform
-    // and then switch to the real platform soon after, so make sure this cache is clean.
-    gRenDev->m_cEF.ClearSResourceCache();
-#endif    
-}
-
-#define SEC5_FILETIME 10*1000*1000*5
-
-
-SShaderBin* CShaderManBin::GetBinShader(const char* szName, bool bInclude, uint32 nRefCRC, bool* pbChanged)
-{
-    //static float sfTotalTime = 0.0f;
-
-    if (pbChanged)
-    {
-        if (gRenDev->IsEditorMode())
-        {
-            *pbChanged = false;
-        }
-    }
-
-    //float fTime0 = iTimer->GetAsyncCurTime();
-
-    SShaderBin* pSHB = SearchInCache(szName, bInclude);
-    if (pSHB)
-    {
-        return pSHB;
-    }
-    SShaderBinHeader Header[2];
-    memset(&Header, 0, 2 * sizeof(SShaderBinHeader));
-    char nameFile[256], nameBin[256];
-    AZ::IO::HandleType srcFileHandle = AZ::IO::InvalidHandle;
-    sprintf_s(nameFile, "%sCryFX/%s.%s", gRenDev->m_cEF.m_ShadersPath.c_str(), szName, bInclude ? "cfi" : "cfx");
-#if !defined(_RELEASE)
-    uint32 nSourceCRC32 = 0;
-    {
-        srcFileHandle = gEnv->pCryPak->FOpen(nameFile, "rb");
-        nSourceCRC32 = srcFileHandle != AZ::IO::InvalidHandle ? gEnv->pCryPak->ComputeCRC(nameFile) : 0;
-    }
-#endif
-    //char szPath[1024];
-    //getcwd(szPath, 1024);
-    sprintf_s(nameBin, "%s%s.%s", m_pCEF->m_ShadersCache.c_str(), szName, bInclude ? "cfib" : "cfxb");
-    AZ::IO::HandleType dstFileHandle = AZ::IO::InvalidHandle;
-    int i = 0, n = 2;
-
-    // don't load from the shadercache.pak when in editing mode
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersediting)
-    {
-        i = 1;
-    }
-
-    AZStd::string szDst = m_pCEF->m_szCachePath + nameBin;
-    byte bValid = 0;
-    float fVersion = FX_CACHE_VER;
-    for (; i < n; i++)
-    {
-        if (dstFileHandle != AZ::IO::InvalidHandle)
-        {
-            gEnv->pCryPak->FClose(dstFileHandle);
-        }
-        if (!i)
-        {
-            if (n == 2)
-            {
-                char nameLwr[256];
-                sprintf_s(nameLwr, "%s.%s", szName, bInclude ? "cfi" : "cfx");
-                azstrlwr(nameLwr, AZ_ARRAY_SIZE(nameLwr));
-                uint32 dwName = CParserBin::GetCRC32(nameLwr);
-                FXShaderBinValidCRCItor itor = m_BinValidCRCs.find(dwName);
-                if (itor != m_BinValidCRCs.end())
-                {
-                    CRY_ASSERT(itor->second == false);
-                    continue;
-                }
-            }
-            dstFileHandle = gEnv->pCryPak->FOpen(nameBin, "rb");
-        }
-        else
-        {
-            dstFileHandle = gEnv->pCryPak->FOpen(szDst.c_str(), "rb", AZ::IO::IArchive::FLAGS_NEVER_IN_PAK | AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FOPEN_ONDISK);
-        }
-        if (dstFileHandle == AZ::IO::InvalidHandle)
-        {
-            continue;
-        }
-        else
-        {
-            gEnv->pCryPak->FReadRaw(&Header[i], 1, sizeof(SShaderBinHeader), dstFileHandle);
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(Header[i], eBigEndian);
-            }
-
-#if !defined(_RELEASE)
-            // check source crc changes
-            if (nSourceCRC32 && nSourceCRC32 != Header[i].m_nSourceCRC32)
-            {
-                bValid |= 1 << i;
-            }
-            else
-#endif
-            {
-                uint16 MinorVer = (uint16)(((float)fVersion - (float)(int)fVersion) * 10.1f);
-                uint16 MajorVer = (uint16)fVersion;
-                if (Header[i].m_VersionLow != MinorVer || Header[i].m_VersionHigh != MajorVer || Header[i].m_Magic != FOURCC_SHADERBIN)
-                {
-                    bValid |= 4 << i;
-                }
-                else
-                if (nRefCRC && Header[i].m_CRC32 != nRefCRC)
-                {
-                    bValid |= 0x10 << i;
-                }
-            }
-        }
-        if (!(bValid & (0x15 << i)))
-        {
-            break;
-        }
-    }
-    if (i == n)
-    {
-#if !defined(_RELEASE) && !defined(CONSOLE_CONST_CVAR_MODE)
-        {
-            char acTemp[512];
-            if (bValid & 1)
-            {
-                sprintf_s(acTemp, 512, "WARNING: Bin FXShader '%s' source crc mismatch", nameBin);
-            }
-            if (bValid & 4)
-            {
-                sprintf_s(acTemp, 512, "WARNING: Bin FXShader '%s' version mismatch (Cache: %d.%d, Expected: %.1f)", nameBin, Header[0].m_VersionHigh, Header[0].m_VersionLow, fVersion);
-            }
-            if (bValid & 0x10)
-            {
-                sprintf_s(acTemp, 512, "WARNING: Bin FXShader '%s' CRC mismatch", nameBin);
-            }
-
-            if (bValid & 2)
-            {
-                sprintf_s(acTemp, 512, "WARNING: Bin FXShader USER '%s' source crc mismatch", nameBin);
-            }
-            if (bValid & 8)
-            {
-                sprintf_s(acTemp, 512, "WARNING: Bin FXShader USER '%s' version mismatch (Cache: %d.%d, Expected: %.1f)", nameBin, Header[1].m_VersionHigh, Header[1].m_VersionLow, fVersion);
-            }
-            if (bValid & 0x20)
-            {
-                sprintf_s(acTemp, 512, "WARNING: Bin FXShader USER '%s' CRC mismatch", nameBin);
-            }
-
-            if (bValid)
-            {
-                LogWarningEngineOnly(acTemp);
-            }
-
-            if (dstFileHandle != AZ::IO::InvalidHandle)
-            {
-                gEnv->pCryPak->FClose(dstFileHandle);
-                dstFileHandle = AZ::IO::InvalidHandle;
-            }
-
-            if (srcFileHandle != AZ::IO::InvalidHandle)
-            {
-                // enable shader compilation again, and show big error message
-                if (!CRenderer::CV_r_shadersAllowCompilation)
-                {
-                    if (CRenderer::CV_r_shaderscompileautoactivate)
-                    {
-                        CRenderer::CV_r_shadersAllowCompilation = 1;
-                        CRenderer::CV_r_shadersasyncactivation = 0;
-
-                        gEnv->pLog->LogError("ERROR: LOADING BIN SHADER - REACTIVATING SHADER COMPILATION !");
-                    }
-                    else
-                    {
-                        static bool bShowMessageBox = true;
-
-                        if (bShowMessageBox)
-                        {
-                            AZStd::string result;
-                            EBUS_EVENT_RESULT(result, AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "Invalid ShaderCache", acTemp, true);
-                            if (result == "Cancel")
-                            {
-                                DebugBreak();
-                            }
-                            else if (!result.empty())
-                            {
-                                bShowMessageBox = false;
-                                Sleep(33);
-                            }
-                            else
-                            {
-                                Warning("Invalid ShaderCache");
-                            }
-                        }
-                    }
-                }
-
-                if (CRenderer::CV_r_shadersAllowCompilation)
-                {
-                    pSHB = SaveBinShader(nSourceCRC32, szName, bInclude, srcFileHandle);
-                    CRY_ASSERT(!pSHB->m_Next);
-                    if (pbChanged)
-                    {
-                        *pbChanged = true;
-                    }
-
-                    // remove the entries in the looupdata, to be sure that level and global caches have also become invalid for these shaders!
-                    gRenDev->m_cEF.m_ResLookupDataMan[CACHE_READONLY].RemoveData(Header[0].m_CRC32);
-                    gRenDev->m_cEF.m_ResLookupDataMan[CACHE_USER].RemoveData(Header[1].m_CRC32);
-
-                    // has the shader been successfully written to the dest address
-                    dstFileHandle = gEnv->pCryPak->FOpen(szDst.c_str(), "rb", AZ::IO::IArchive::FLAGS_NEVER_IN_PAK | AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FOPEN_ONDISK);
-                    if (dstFileHandle != AZ::IO::InvalidHandle)
-                    {
-                        SAFE_DELETE(pSHB);
-                        i = 1;
-                    }
-                }
-            }
-        }
-#endif
-    }
-    if (srcFileHandle != AZ::IO::InvalidHandle)
-    {
-        gEnv->pCryPak->FClose(srcFileHandle);
-        srcFileHandle = AZ::IO::InvalidHandle;
-    }
-
-    if (!CRenderer::CV_r_shadersAllowCompilation)
-    {
-        if (pSHB == 0 && dstFileHandle == AZ::IO::InvalidHandle)
-        {
-            //do only perform the necessary stuff
-            dstFileHandle = gEnv->pCryPak->FOpen(nameBin, "rb");
-        }
-    }
-    if (pSHB == 0 && dstFileHandle != AZ::IO::InvalidHandle)
-    {
-        sprintf_s(nameFile, "%s.%s", szName, bInclude ? "cfi" : "cfx");
-        pSHB = LoadBinShader(dstFileHandle, nameFile, i == 0 ? nameBin : szDst.c_str(), !bInclude);
-        gEnv->pCryPak->FClose(dstFileHandle);
-        dstFileHandle = AZ::IO::InvalidHandle;
-        AZ_Assert(pSHB, "Error loading binary shader '%s'.", nameFile);
-    }
-
-    if (pSHB)
-    {
-        if (i == 0)
-        {
-            pSHB->m_bReadOnly = true;
-        }
-        else
-        {
-            pSHB->m_bReadOnly = false;
-        }
-
-        AddToCache(pSHB, bInclude);
-        if (!bInclude)
-        {
-            char nm[128];
-            nm[0] = '$';
-            azstrcpy(&nm[1], AZ_ARRAY_SIZE(nm) - 1, szName);
-            CCryNameTSCRC NM = CParserBin::GetPlatformSpecName(nm);
-            FXShaderBinPathItor it = m_BinPaths.find(NM);
-            if (it == m_BinPaths.end())
-            {
-                m_BinPaths.insert(FXShaderBinPath::value_type(NM, i == 0 ? nameBin : szDst.c_str()));
-            }
-            else
-            {
-                it->second = (i == 0) ? nameBin : szDst.c_str();
-            }
-        }
-    }
-    else
-    {
-        if (dstFileHandle != AZ::IO::InvalidHandle)
-        {
-            Warning("Error: Failed to get binary shader '%s'", nameFile);
-        }
-        else
-        {
-            sprintf_s(nameFile, "%s.%s", szName, bInclude ? "cfi" : "cfx");
-            const char* matName = 0;
-            if (m_pCEF && m_pCEF->m_pCurInputResources)
-            {
-                matName = m_pCEF->m_pCurInputResources->m_szMaterialName;
-            }
-            iLog->LogWarning("WARN: Shader \"%s\" doesn't exist (used in material \"%s\")", nameFile, matName != 0 ? matName : "$unknown$");
-        }
-    }
-
-    /*
-    sfTotalTime += iTimer->GetAsyncCurTime() - fTime0;
-
-    {
-        char acTmp[1024];
-        sprintf_s(acTmp, "Parsing of bin took: %f \n", sfTotalTime);
-        OutputDebugString(acTmp);
-    }
-    */
-
-    return pSHB;
-}
-
-void CShaderManBin::AddGenMacroses(SShaderGen* shG, CParserBin& Parser, uint64 nMaskGen, bool ignoreShaderGenMask /*=false*/)
-{
-    if (!nMaskGen || !shG)
-    {
-        return;
-    }
-
-    uint32 dwMacro = eT_1;
-    for (uint32 i = 0; i < shG->m_BitMask.Num(); i++)
-    {
-        if (shG->m_BitMask[i]->m_Mask & nMaskGen)
-        {
-            Parser.AddMacro(shG->m_BitMask[i]->m_dwToken, &dwMacro, 1, ignoreShaderGenMask ? 0 : shG->m_BitMask[i]->m_Mask, Parser.m_Macros[1]);
-        }
-    }
-}
-
-bool CShaderManBin::ParseBinFX_Global_Annotations(CParserBin& Parser, SParserFrame& Frame, bool* bPublic, [[maybe_unused]] CCryNameR techStart[2])
-{
-    bool bRes = true;
-
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(ShaderType)
-    FX_TOKEN(ShaderDrawType)
-    FX_TOKEN(PreprType)
-    FX_TOKEN(Public)
-    FX_TOKEN(NoPreview)
-    FX_TOKEN(LocalConstants)
-    FX_TOKEN(Cull)
-    FX_TOKEN(SupportsAttrInstancing)
-    FX_TOKEN(SupportsConstInstancing)
-    FX_TOKEN(SupportsDeferredShading)
-    FX_TOKEN(SupportsFullDeferredShading)
-    FX_TOKEN(Decal)
-    FX_TOKEN(DecalNoDepthOffset)
-    FX_TOKEN(HWTessellation)
-    FX_TOKEN(ZPrePass)
-    FX_TOKEN(VertexColors)
-    FX_TOKEN(NoChunkMerging)
-    FX_TOKEN(ForceTransPass)
-    FX_TOKEN(AfterHDRPostProcess)
-    FX_TOKEN(AfterPostProcess)
-    FX_TOKEN(ForceZpass)
-    FX_TOKEN(ForceWaterPass)
-    FX_TOKEN(ForceDrawLast)
-    FX_TOKEN(ForceDrawFirst)
-    FX_TOKEN(Hair)
-    FX_TOKEN(SkinPass)
-    FX_TOKEN(ForceGeneralPass)
-    FX_TOKEN(ForceDrawAfterWater)
-    FX_TOKEN(DepthFixup)
-    FX_TOKEN(SingleLightPass)
-    FX_TOKEN(Refractive)
-    FX_TOKEN(ForceRefractionUpdate)
-    FX_TOKEN(WaterParticle)
-    FX_TOKEN(VT_DetailBending)
-    FX_TOKEN(VT_DetailBendingGrass)
-    FX_TOKEN(VT_WindBending)
-    FX_TOKEN(AlphaBlendShadows)
-    FX_TOKEN(EyeOverlay)
-    FX_END_TOKENS
-
-    int nIndex;
-    CShader* ef = Parser.m_pCurShader;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_Public:
-            if (bPublic)
-            {
-                *bPublic = true;
-            }
-            break;
-
-        case eT_NoPreview:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_NOPREVIEW;
-            break;
-
-        case eT_Decal:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_DECAL;
-            ef->m_nMDV |= MDV_DEPTH_OFFSET;
-            break;
-
-        case eT_DecalNoDepthOffset:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_DECAL;
-            break;
-
-
-        case eT_LocalConstants:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_LOCALCONSTANTS;
-            break;
-
-        case eT_VT_DetailBending:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_nMDV |= MDV_DET_BENDING;
-            break;
-        case eT_VT_DetailBendingGrass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_nMDV |= MDV_DET_BENDING | MDV_DET_BENDING_GRASS;
-            break;
-        case eT_VT_WindBending:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_nMDV |= MDV_WIND;
-            break;
-
-        case eT_NoChunkMerging:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_NOCHUNKMERGING;
-            break;
-
-        case eT_SupportsAttrInstancing:
-            if (!ef)
-            {
-                break;
-            }
-            if (gRenDev->m_bDeviceSupportsInstancing)
-            {
-                ef->m_Flags |= EF_SUPPORTSINSTANCING_ATTR;
-            }
-            break;
-        case eT_SupportsConstInstancing:
-            if (!ef)
-            {
-                break;
-            }
-            if (gRenDev->m_bDeviceSupportsInstancing)
-            {
-                ef->m_Flags |= EF_SUPPORTSINSTANCING_CONST;
-            }
-            break;
-
-        case eT_SupportsDeferredShading:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_SUPPORTSDEFERREDSHADING_MIXED;
-            break;
-
-        case eT_SupportsFullDeferredShading:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_SUPPORTSDEFERREDSHADING_FULL;
-            break;
-
-        case eT_ForceTransPass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_FORCE_TRANSPASS;
-            break;
-
-        case eT_AfterHDRPostProcess:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_AFTERHDRPOSTPROCESS;
-            break;
-
-        case eT_AfterPostProcess:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_AFTERPOSTPROCESS;
-            break;
-
-        case eT_ForceZpass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_FORCE_ZPASS;
-            break;
-
-        case eT_ForceWaterPass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_FORCE_WATERPASS;
-            break;
-
-        case eT_ForceDrawLast:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_FORCE_DRAWLAST;
-            break;
-        case eT_ForceDrawFirst:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_FORCE_DRAWFIRST;
-            break;
-
-        case eT_Hair:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_HAIR;
-            break;
-
-        case eT_ForceGeneralPass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_FORCE_GENERALPASS;
-            break;
-
-        case eT_ForceDrawAfterWater:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_FORCE_DRAWAFTERWATER;
-            break;
-        case eT_DepthFixup:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_DEPTH_FIXUP;
-            break;
-        case eT_SingleLightPass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_SINGLELIGHTPASS;
-            break;
-        case eT_WaterParticle:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_WATERPARTICLE;
-            break;
-        case eT_Refractive:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_REFRACTIVE;
-            break;
-        case eT_ForceRefractionUpdate:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags |= EF_FORCEREFRACTIONUPDATE;
-            break;
-
-        case eT_ZPrePass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_ZPREPASS;
-            break;
-
-        case eT_HWTessellation:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_HW_TESSELLATION;
-            break;
-
-        case eT_AlphaBlendShadows:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_ALPHABLENDSHADOWS;
-            break;
-
-        case eT_SkinPass:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_SKINPASS;
-            break;
-
-        case eT_EyeOverlay:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_EYE_OVERLAY;
-            break;
-
-        case eT_VertexColors:
-            if (!ef)
-            {
-                break;
-            }
-            ef->m_Flags2 |= EF2_VERTEXCOLORS;
-            break;
-
-        case eT_ShaderDrawType:
-        {
-            if (!ef)
-            {
-                break;
-            }
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_Light)
-            {
-                ef->m_eSHDType = eSHDT_Light;
-            }
-            else
-            if (eT == eT_Shadow)
-            {
-                ef->m_eSHDType = eSHDT_Shadow;
-            }
-            else
-            if (eT == eT_Fur)
-            {
-                ef->m_eSHDType = eSHDT_Fur;
-            }
-            else
-            if (eT == eT_General)
-            {
-                ef->m_eSHDType = eSHDT_General;
-            }
-            else
-            if (eT == eT_Terrain)
-            {
-                ef->m_eSHDType = eSHDT_Terrain;
-            }
-            else
-            if (eT == eT_Overlay)
-            {
-                ef->m_eSHDType = eSHDT_Overlay;
-            }
-            else
-            if (eT == eT_NoDraw)
-            {
-                ef->m_eSHDType = eSHDT_NoDraw;
-                ef->m_Flags |= EF_NODRAW;
-            }
-            else
-            if (eT == eT_Custom)
-            {
-                ef->m_eSHDType = eSHDT_CustomDraw;
-            }
-            else
-            if (eT == eT_Sky)
-            {
-                ef->m_eSHDType = eSHDT_Sky;
-                ef->m_Flags |= EF_SKY;
-            }
-            else
-            if (eT == eT_OceanShore)
-            {
-                ef->m_eSHDType = eSHDT_OceanShore;
-            }
-            else
-            {
-                Warning("Unknown shader draw type '%s'", Parser.GetString(eT));
-                CRY_ASSERT(0);
-            }
-        }
-        break;
-
-        case eT_ShaderType:
-        {
-            if (!ef)
-            {
-                break;
-            }
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_General)
-            {
-                ef->m_eShaderType = eST_General;
-            }
-            else
-            if (eT == eT_Metal)
-            {
-                ef->m_eShaderType = eST_Metal;
-            }
-            else
-            if (eT == eT_Ice)
-            {
-                ef->m_eShaderType = eST_Ice;
-            }
-            else
-            if (eT == eT_Shadow)
-            {
-                ef->m_eShaderType = eST_Shadow;
-            }
-            else
-            if (eT == eT_Water)
-            {
-                ef->m_eShaderType = eST_Water;
-            }
-            else
-            if (eT == eT_FX)
-            {
-                ef->m_eShaderType = eST_FX;
-            }
-            else
-            if (eT == eT_PostProcess)
-            {
-                ef->m_eShaderType = eST_PostProcess;
-            }
-            else
-            if (eT == eT_HDR)
-            {
-                ef->m_eShaderType = eST_HDR;
-            }
-            else
-            if (eT == eT_Sky)
-            {
-                ef->m_eShaderType = eST_Sky;
-            }
-            else
-            if (eT == eT_Glass)
-            {
-                ef->m_eShaderType = eST_Glass;
-            }
-            else
-            if (eT == eT_Vegetation)
-            {
-                // Do nothing here
-            }
-            else
-            if (eT == eT_Particle)
-            {
-                // Do nothing here
-            }
-            else
-            if (eT == eT_Terrain)
-            {
-                 //Do nothing here
-            }
-            else
-            if (eT == eT_Compute)
-            {
-                ef->m_eShaderType = eST_Compute;
-            }
-            else
-            {
-                Warning("Unknown shader type '%s'", Parser.GetString(eT));
-                CRY_ASSERT(0);
-            }
-        }
-        break;
-
-        case eT_PreprType:
-        {
-            if (!ef)
-            {
-                break;
-            }
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_GenerateSprites)
-            {
-                ; // We can't get of the token without cleaning out all the content but we can make it not do anything;
-            }
-            else
-            if (eT == eT_GenerateClouds)
-            {
-                ef->m_Flags2 |= EF2_PREPR_GENCLOUDS;
-            }
-            else
-            if (eT == eT_ScanWater)
-            {
-                ef->m_Flags2 |= EF2_PREPR_SCANWATER;
-            }
-            else
-            {
-                Warning("Unknown preprocess type '%s'", Parser.GetString(eT));
-                CRY_ASSERT(0);
-            }
-        }
-        break;
-
-        case eT_Cull:
-        {
-            if (!ef)
-            {
-                break;
-            }
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_None || eT == eT_NONE)
-            {
-                ef->m_eCull = eCULL_None;
-            }
-            else
-            if (eT == eT_CCW || eT == eT_Back)
-            {
-                ef->m_eCull = eCULL_Back;
-            }
-            else
-            if (eT == eT_CW || eT == eT_Front)
-            {
-                ef->m_eCull = eCULL_Front;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-            }
-        }
-        break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Global(CParserBin& Parser, SParserFrame& Frame, bool* bPublic, CCryNameR techStart[2])
-{
-    bool bRes = true;
-
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(string)
-    FX_END_TOKENS
-
-    int nIndex;
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_string:
-        {
-            eT = Parser.GetToken(Parser.m_Name);
-            CRY_ASSERT(eT == eT_Script);
-            bRes &= ParseBinFX_Global_Annotations(Parser, Parser.m_Data, bPublic, techStart);
-        }
-        break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-static int sGetTAddress(uint32 nToken)
-{
-    switch (nToken)
-    {
-    case eT_Clamp:
-        return TADDR_CLAMP;
-    case eT_Border:
-        return TADDR_BORDER;
-    case eT_Wrap:
-        return TADDR_WRAP;
-    case eT_Mirror:
-        return TADDR_MIRROR;
-    default:
-        CRY_ASSERT(0);
-    }
-    return -1;
-}
-
-void STexSamplerFX::PostLoad()
-{
-    SHRenderTarget* pRt = m_pTarget;
-    if (!pRt)
-    {
-        return;
-    }
-    if (!_strnicmp(m_szTexture.c_str(), "$RT_2D", 6))
-    {
-        if (pRt->m_nIDInPool >= 0)
-        {
-            if ((int)CTexture::s_CustomRT_2D->Num() <= pRt->m_nIDInPool)
-            {
-                CTexture::s_CustomRT_2D->Expand(pRt->m_nIDInPool + 1);
-            }
-        }
-        pRt->m_pTarget[0] = CTexture::s_ptexRT_2D;
-    }
-}
-
-bool CShaderManBin::ParseBinFX_Sampler_Annotations_Script(CParserBin& Parser, SParserFrame& Frame, STexSamplerFX* pSampler)
-{
-    bool bRes = true;
-
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(RenderOrder)
-    FX_TOKEN(ProcessOrder)
-    FX_TOKEN(RenderCamera)
-    FX_TOKEN(RenderType)
-    FX_TOKEN(RenderFilter)
-    FX_TOKEN(RenderColorTarget1)
-    FX_TOKEN(RenderDepthStencilTarget)
-    FX_TOKEN(ClearSetColor)
-    FX_TOKEN(ClearSetDepth)
-    FX_TOKEN(ClearTarget)
-    FX_TOKEN(RenderTarget_IDPool)
-    FX_TOKEN(RenderTarget_UpdateType)
-    FX_TOKEN(RenderTarget_Width)
-    FX_TOKEN(RenderTarget_Height)
-    FX_TOKEN(GenerateMips)
-    FX_END_TOKENS
-
-    SHRenderTarget * pRt = new SHRenderTarget;
-    int nIndex;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_RenderOrder:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_PreProcess)
-            {
-                pRt->m_eOrder = eRO_PreProcess;
-            }
-            else
-            if (eT == eT_PostProcess)
-            {
-                pRt->m_eOrder = eRO_PostProcess;
-            }
-            else
-            if (eT == eT_PreDraw)
-            {
-                pRt->m_eOrder = eRO_PreDraw;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-                Warning("Unknown RenderOrder type '%s'", Parser.GetString(eT));
-            }
-        }
-        break;
-
-        case eT_ProcessOrder:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_WaterReflection)
-            {
-                pRt->m_nProcessFlags = FSPR_SCANTEXWATER;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-                Warning("Unknown ProcessOrder type '%s'", Parser.GetString(eT));
-            }
-        }
-        break;
-
-        case eT_RenderCamera:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_WaterPlaneReflected)
-            {
-                pRt->m_nFlags |= FRT_CAMERA_REFLECTED_WATERPLANE;
-            }
-            else
-            if (eT == eT_PlaneReflected)
-            {
-                pRt->m_nFlags |= FRT_CAMERA_REFLECTED_PLANE;
-            }
-            else
-            if (eT == eT_Current)
-            {
-                pRt->m_nFlags |= FRT_CAMERA_CURRENT;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-                Warning("Unknown RenderCamera type '%s'", Parser.GetString(eT));
-            }
-        }
-        break;
-
-        case eT_GenerateMips:
-            pRt->m_nFlags |= FRT_GENERATE_MIPS;
-            break;
-
-        case eT_RenderType:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_CurObject)
-            {
-                pRt->m_nFlags |= FRT_RENDTYPE_CUROBJECT;
-            }
-            else
-            if (eT == eT_CurScene)
-            {
-                pRt->m_nFlags |= FRT_RENDTYPE_CURSCENE;
-            }
-            else
-            if (eT == eT_RecursiveScene)
-            {
-                pRt->m_nFlags |= FRT_RENDTYPE_RECURSIVECURSCENE;
-            }
-            else
-            if (eT == eT_CopyScene)
-            {
-                pRt->m_nFlags |= FRT_RENDTYPE_COPYSCENE;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-                Warning("Unknown RenderType type '%s'", Parser.GetString(eT));
-            }
-        }
-        break;
-
-        case eT_RenderFilter:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_Refractive)
-            {
-                pRt->m_nFilterFlags |= FRF_REFRACTIVE;
-            }
-            else
-            if (eT == eT_Heat)
-            {
-                pRt->m_nFilterFlags |= FRF_HEAT;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-                Warning("Unknown RenderFilter type '%s'", Parser.GetString(eT));
-            }
-        }
-        break;
-
-        case eT_RenderDepthStencilTarget:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_DepthBuffer || eT == eT_DepthBufferTemp)
-            {
-                pRt->m_bTempDepth = true;
-            }
-            else
-            if (eT == eT_DepthBufferOrig)
-            {
-                pRt->m_bTempDepth = false;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-                Warning("Unknown RenderDepthStencilTarget type '%s'", Parser.GetString(eT));
-            }
-        }
-        break;
-
-        case eT_RenderTarget_IDPool:
-            pRt->m_nIDInPool = Parser.GetInt(Parser.GetToken(Parser.m_Data));
-            CRY_ASSERT(pRt->m_nIDInPool >= 0 && pRt->m_nIDInPool < 64);
-            break;
-
-        case eT_RenderTarget_Width:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_$ScreenSize)
-            {
-                pRt->m_nWidth = -1;
-            }
-            else
-            {
-                pRt->m_nWidth = Parser.GetInt(eT);
-            }
-        }
-        break;
-
-        case eT_RenderTarget_Height:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_$ScreenSize)
-            {
-                pRt->m_nHeight = -1;
-            }
-            else
-            {
-                pRt->m_nHeight = Parser.GetInt(eT);
-            }
-        }
-        break;
-
-        case eT_RenderTarget_UpdateType:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_WaterReflect)
-            {
-                pRt->m_eUpdateType = eRTUpdate_WaterReflect;
-            }
-            else
-            if (eT == eT_Allways)
-            {
-                pRt->m_eUpdateType = eRTUpdate_Always;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-            }
-        }
-        break;
-
-        case eT_ClearSetColor:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_FogColor)
-            {
-                pRt->m_nFlags |= FRT_CLEAR_FOGCOLOR;
-            }
-            else
-            {
-                string sStr = Parser.GetString(Parser.m_Data);
-                shGetColor(sStr.c_str(), pRt->m_ClearColor);
-            }
-        }
-        break;
-
-        case eT_ClearSetDepth:
-            pRt->m_fClearDepth = Parser.GetFloat(Parser.m_Data);
-            break;
-
-        case eT_ClearTarget:
-        {
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_Color)
-            {
-                pRt->m_nFlags |= FRT_CLEAR_COLOR;
-            }
-            else
-            if (eT == eT_Depth)
-            {
-                pRt->m_nFlags |= FRT_CLEAR_DEPTH;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-                Warning("Unknown ClearTarget type '%s'", Parser.GetString(eT));
-            }
-        }
-        break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-    if (pRt->m_eOrder == eRO_PreProcess)
-    {
-        Parser.m_pCurShader->m_Flags |= EF_PRECACHESHADER;
-    }
-    pSampler->m_pTarget = pRt;
-    pSampler->PostLoad();
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Sampler_Annotations(CParserBin& Parser, SParserFrame& Annotations, STexSamplerFX* pSampler)
-{
-    bool bRes = true;
-
-    SParserFrame OldFrame = Parser.BeginFrame(Annotations);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(string)
-    FX_END_TOKENS
-
-    int nIndex = 0;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        SCodeFragment Fr;
-        switch (eT)
-        {
-        case eT_string:
-        {
-            eT = Parser.GetToken(Parser.m_Name);
-            CRY_ASSERT(eT == eT_Script);
-            bRes &= ParseBinFX_Sampler_Annotations_Script(Parser, Parser.m_Data, pSampler);
-        }
-        break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Sampler(CParserBin& Parser, SParserFrame& Frame, uint32 dwName, SParserFrame Annotations, EToken samplerType)
-{
-    bool bRes = true;
-
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-    FX_TOKEN(string)
-    FX_TOKEN(Texture)
-    FX_TOKEN(MinFilter)
-    FX_TOKEN(MagFilter)
-    FX_TOKEN(MipFilter)
-    FX_TOKEN(AddressU)
-    FX_TOKEN(AddressV)
-    FX_TOKEN(AddressW)
-    FX_TOKEN(BorderColor)
-    FX_TOKEN(AnisotropyLevel)
-    FX_TOKEN(sRGBLookup)
-    FX_TOKEN(Global)
-    FX_END_TOKENS
-
-    STexSamplerFX samp;
-    STexState ST;
-    DWORD dwBorderColor = 0;
-    uint32 nFilter = 0;
-    uint32 nFiltMin = 0;
-    uint32 nFiltMip = 0;
-    uint32 nFiltMag = 0;
-    uint32 nAddressU = 0;
-    uint32 nAddressV = 0;
-    uint32 nAddressW = 0;
-    uint32 nAnisotropyLevel = 0;
-
-    int nIndex = -1;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_string:
-        {
-            eT = Parser.GetToken(Parser.m_Name);
-
-            SParserFrame stringData = Parser.m_Data;
-
-            // string could have ""s still, if so trim them off.
-            if (Parser.GetToken(stringData) == eT_quote)
-            {
-                stringData.m_nFirstToken++;
-                stringData.m_nLastToken--;
-            }
-
-#if SHADER_REFLECT_TEXTURE_SLOTS
-            if (eT == eT_UIName)
-            {
-                samp.m_szUIName = Parser.GetString(stringData);
-            }
-            else if (eT == eT_UIDescription)
-            {
-                samp.m_szUIDescription = Parser.GetString(stringData);
-            }
-#endif
-        }
-        break;
-
-        case eT_Texture:
-            samp.m_szTexture = Parser.GetString(Parser.m_Data);
-            break;
-
-        case eT_BorderColor:
-        {
-            string Str = Parser.GetString(Parser.m_Data);
-            ColorF colBorder = Col_Black;
-            shGetColor(Str.c_str(), colBorder);
-            dwBorderColor = colBorder.pack_argb8888();
-            ST.m_bActive = true;
-        }
-        break;
-
-        case eT_sRGBLookup:
-            ST.m_bSRGBLookup = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_Global:
-            break;
-
-        case eT_AnisotropyLevel:
-            nAnisotropyLevel = Parser.GetToken(Parser.m_Data);
-            break;
-
-        case eT_Filter:
-            nFilter = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-        case eT_MinFilter:
-            nFiltMin = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-        case eT_MagFilter:
-            nFiltMag = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-        case eT_MipFilter:
-            nFiltMip = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-        case eT_AddressU:
-            nAddressU = sGetTAddress(Parser.GetToken(Parser.m_Data));
-            ST.m_bActive = true;
-            break;
-        case eT_AddressV:
-            nAddressV = sGetTAddress(Parser.GetToken(Parser.m_Data));
-            ST.m_bActive = true;
-            break;
-        case eT_AddressW:
-            nAddressW = sGetTAddress(Parser.GetToken(Parser.m_Data));
-            ST.m_bActive = true;
-            break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    samp.m_szName = Parser.GetString(dwName);
-    if (nFilter > 0)
-    {
-        switch (nFilter)
-        {
-        case eT_MIN_MAG_MIP_POINT:
-            ST.SetFilterMode(FILTER_POINT);
-            break;
-        case eT_MIN_MAG_MIP_LINEAR:
-            ST.SetFilterMode(FILTER_TRILINEAR);
-            break;
-        case eT_MIN_MAG_LINEAR_MIP_POINT:
-            ST.SetFilterMode(FILTER_BILINEAR);
-            break;
-        case eT_COMPARISON_MIN_MAG_LINEAR_MIP_POINT:
-            ST.SetFilterMode(FILTER_BILINEAR);
-            ST.SetComparisonFilter(true);
-            break;
-        default:
-        {
-            assert(0);
-        }
-        break;
-        }
-    }
-
-    if (nFiltMag > 0 && nFiltMin > 0 && nFiltMip > 0)
-    {
-        if (nFiltMag == eT_LINEAR && nFiltMin == eT_LINEAR && nFiltMip == eT_LINEAR)
-        {
-            ST.SetFilterMode(FILTER_TRILINEAR);
-        }
-        else
-        if (nFiltMag == eT_LINEAR && nFiltMin == eT_LINEAR && nFiltMip == eT_POINT)
-        {
-            ST.SetFilterMode(FILTER_BILINEAR);
-        }
-        else
-        if (nFiltMag == eT_LINEAR && nFiltMin == eT_LINEAR && nFiltMip == eT_NONE)
-        {
-            ST.SetFilterMode(FILTER_LINEAR);
-        }
-        else
-        if (nFiltMag == eT_POINT && nFiltMin == eT_POINT && nFiltMip == eT_POINT)
-        {
-            ST.SetFilterMode(FILTER_POINT);
-        }
-        else
-        if (nFiltMag == eT_POINT && nFiltMin == eT_POINT && nFiltMip == eT_NONE)
-        {
-            ST.SetFilterMode(FILTER_NONE);
-        }
-        else
-        if (nFiltMag == eT_ANISOTROPIC || nFiltMin == eT_ANISOTROPIC)
-        {
-            if (nAnisotropyLevel == eT_0 + 4)
-            {
-                ST.SetFilterMode(FILTER_ANISO4X);
-            }
-            else
-            if (nAnisotropyLevel == eT_0 + 8)
-            {
-                ST.SetFilterMode(FILTER_ANISO8X);
-            }
-            else
-            if (nAnisotropyLevel == eT_0 + 16)
-            {
-                ST.SetFilterMode(FILTER_ANISO16X);
-            }
-            else
-            {
-                ST.SetFilterMode(FILTER_ANISO2X);
-            }
-        }
-        else
-        {
-            Warning("!Unknown sampler filter mode (Min=%s, Mag=%s, Mip=%s) for sampler '%s'", Parser.GetString(nFiltMin), Parser.GetString(nFiltMag), Parser.GetString(nFiltMip), samp.m_szName.c_str());
-            CRY_ASSERT(0);
-        }
-    }
-    else
-    {
-        ST.SetFilterMode(-1);
-    }
-
-    ST.SetClampMode(nAddressU, nAddressV, nAddressW);
-    ST.SetBorderColor(dwBorderColor);
-
-    samp.m_nTexState = CTexture::GetTexState(ST);
-    samp.m_nSlotId = m_pCEF->mfCheckTextureSlotName(samp.m_szTexture);
-
-    if (!Annotations.IsEmpty())
-    {
-        bRes &= ParseBinFX_Sampler_Annotations(Parser, Annotations, &samp);
-    }
-
-    switch (samplerType)
-    {
-    case eT_sampler1D:
-        samp.m_eTexType = eTT_1D;
-        break;
-    case eT_sampler2D:
-    case eT_Texture2D:
-        samp.m_eTexType = eTT_2D;
-        break;
-    case eT_Texture2DArray:
-        samp.m_eTexType = eTT_2DArray;
-        break;
-    case eT_Texture2DMS:
-        samp.m_eTexType = eTT_2DMS;
-        break;
-    case eT_sampler3D:
-    case eT_Texture3D:
-        samp.m_eTexType = eTT_3D;
-        break;
-    case eT_samplerCUBE:
-    case eT_TextureCube:
-        samp.m_eTexType = eTT_Cube;
-        break;
-    case eT_TextureCubeArray:
-        samp.m_eTexType = eTT_CubeArray;
-        break;
-    default:
-#if !defined(_RELEASE)
-        __debugbreak();
-#endif
-        samp.m_eTexType = eTT_2D;
-        break;
-    }
-
-    mfAddFXSampler(Parser.m_pCurShader, &samp);
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Sampler(CParserBin& Parser, SParserFrame& Frame, SFXSampler& Sampl)
-{
-    bool bRes = true;
-
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(string)
-    FX_TOKEN(Filter)
-    FX_TOKEN(MinFilter)
-    FX_TOKEN(MagFilter)
-    FX_TOKEN(MipFilter)
-    FX_TOKEN(AddressU)
-    FX_TOKEN(AddressV)
-    FX_TOKEN(AddressW)
-    FX_TOKEN(BorderColor)
-    FX_TOKEN(AnisotropyLevel)
-    FX_TOKEN(sRGBLookup)
-    FX_TOKEN(Global)
-    FX_END_TOKENS
-
-    STexState ST;
-    DWORD dwBorderColor = 0;
-    uint32 nFilter = 0;
-    uint32 nFiltMin = 0;
-    uint32 nFiltMip = 0;
-    uint32 nFiltMag = 0;
-    uint32 nAddressU = 0;
-    uint32 nAddressV = 0;
-    uint32 nAddressW = 0;
-    uint32 nAnisotropyLevel = 0;
-
-    int nIndex = -1;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_BorderColor:
-        {
-            string Str = Parser.GetString(Parser.m_Data);
-            ColorF colBorder = Col_Black;
-            shGetColor(Str.c_str(), colBorder);
-            dwBorderColor = colBorder.pack_argb8888();
-            ST.m_bActive = true;
-        }
-        break;
-
-        case eT_sRGBLookup:
-            ST.m_bSRGBLookup = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_AnisotropyLevel:
-            nAnisotropyLevel = Parser.GetToken(Parser.m_Data);
-            break;
-
-        case eT_Filter:
-            nFilter = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-
-        case eT_MinFilter:
-            nFiltMin = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-        case eT_MagFilter:
-            nFiltMag = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-        case eT_MipFilter:
-            nFiltMip = Parser.GetToken(Parser.m_Data);
-            ST.m_bActive = true;
-            break;
-        case eT_AddressU:
-            nAddressU = sGetTAddress(Parser.GetToken(Parser.m_Data));
-            ST.m_bActive = true;
-            break;
-        case eT_AddressV:
-            nAddressV = sGetTAddress(Parser.GetToken(Parser.m_Data));
-            ST.m_bActive = true;
-            break;
-        case eT_AddressW:
-            nAddressW = sGetTAddress(Parser.GetToken(Parser.m_Data));
-            ST.m_bActive = true;
-            break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    if (nFilter > 0)
-    {
-        switch (nFilter)
-        {
-        case eT_MIN_MAG_MIP_POINT:
-            ST.SetFilterMode(FILTER_POINT);
-            break;
-        case eT_MIN_MAG_LINEAR_MIP_POINT:
-            ST.SetFilterMode(FILTER_BILINEAR);
-            break;
-        case eT_MIN_MAG_MIP_LINEAR:
-            ST.SetFilterMode(FILTER_TRILINEAR);
-            break;
-        case eT_COMPARISON_MIN_MAG_LINEAR_MIP_POINT:
-            ST.SetFilterMode(FILTER_BILINEAR);
-            ST.SetComparisonFilter(true);
-            break;
-        default:
-        {
-            CRY_ASSERT(0);
-        }
-        break;
-        }
-    }
-    if (nFiltMag > 0 && nFiltMin > 0 && nFiltMip > 0)
-    {
-        if (nFiltMag == eT_LINEAR && nFiltMin == eT_LINEAR && nFiltMip == eT_LINEAR)
-        {
-            ST.SetFilterMode(FILTER_TRILINEAR);
-        }
-        else
-        if (nFiltMag == eT_LINEAR && nFiltMin == eT_LINEAR && nFiltMip == eT_POINT)
-        {
-            ST.SetFilterMode(FILTER_BILINEAR);
-        }
-        else
-        if (nFiltMag == eT_LINEAR && nFiltMin == eT_LINEAR && nFiltMip == eT_NONE)
-        {
-            ST.SetFilterMode(FILTER_LINEAR);
-        }
-        else
-        if (nFiltMag == eT_POINT && nFiltMin == eT_POINT && nFiltMip == eT_POINT)
-        {
-            ST.SetFilterMode(FILTER_POINT);
-        }
-        else
-        if (nFiltMag == eT_POINT && nFiltMin == eT_POINT && nFiltMip == eT_NONE)
-        {
-            ST.SetFilterMode(FILTER_NONE);
-        }
-        else
-        if (nFiltMag == eT_ANISOTROPIC || nFiltMin == eT_ANISOTROPIC)
-        {
-            if (nAnisotropyLevel == eT_0 + 4)
-            {
-                ST.SetFilterMode(FILTER_ANISO4X);
-            }
-            else
-            if (nAnisotropyLevel == eT_0 + 8)
-            {
-                ST.SetFilterMode(FILTER_ANISO8X);
-            }
-            else
-            if (nAnisotropyLevel == eT_0 + 16)
-            {
-                ST.SetFilterMode(FILTER_ANISO16X);
-            }
-            else
-            {
-                ST.SetFilterMode(FILTER_ANISO2X);
-            }
-        }
-        else
-        {
-            Warning("!Unknown sampler filter mode (Min=%s, Mag=%s, Mip=%s) for sampler '%s'", Parser.GetString(nFiltMin), Parser.GetString(nFiltMag), Parser.GetString(nFiltMip), Sampl.m_Name.c_str());
-            CRY_ASSERT(0);
-        }
-    }
-    else
-    {
-        ST.SetFilterMode(-1);
-    }
-
-    if (ST.m_bActive)
-    {
-        ST.SetClampMode(nAddressU, nAddressV, nAddressW);
-        ST.SetBorderColor(dwBorderColor);
-
-        Sampl.m_nTexState = CTexture::GetTexState(ST);
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Texture(CParserBin& Parser, SParserFrame& Frame, SFXTexture& Tex)
-{
-    bool bRes = true;
-
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(Texture)
-    FX_TOKEN(UIName)
-    FX_TOKEN(UIDescription)
-    FX_TOKEN(sRGBLookup)
-    FX_TOKEN(Global)
-    FX_TOKEN(slot)
-    FX_TOKEN(vsslot)
-    FX_TOKEN(psslot)
-    FX_TOKEN(hsslot)
-    FX_TOKEN(dsslot)
-    FX_TOKEN(gsslot)
-    FX_TOKEN(csslot)
-    FX_END_TOKENS
-
-    int nIndex = -1;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_Texture:
-        {
-            Tex.m_szTexture = Parser.GetString(Parser.m_Data);
-        }
-        break;
-        case eT_UIName:
-        {
-            if (Parser.GetToken(Parser.m_Data) == eT_quote)
-            {
-                Parser.m_Data.m_nFirstToken++;
-                Parser.m_Data.m_nLastToken--;
-            }
-            Tex.m_szUIName = Parser.GetString(Parser.m_Data);
-        }
-        break;
-        case eT_UIDescription:
-        {
-            if (Parser.GetToken(Parser.m_Data) == eT_quote)
-            {
-                Parser.m_Data.m_nFirstToken++;
-                Parser.m_Data.m_nLastToken--;
-            }
-            Tex.m_szUIDesc = Parser.GetString(Parser.m_Data);
-        }
-        break;
-
-        case eT_sRGBLookup:
-            Tex.m_bSRGBLookup = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_Global:
-            Tex.m_nFlags |= PF_GLOBAL;
-            break;
-
-        case eT_slot:
-        case eT_vsslot:
-        case eT_psslot:
-        case eT_hsslot:
-        case eT_dsslot:
-        case eT_gsslot:
-        case eT_csslot:
-            break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-void CShaderManBin::AddAffectedParameter(CParserBin& Parser, std::vector<SFXParam>& AffectedParams, TArray<int>& AffectedFunc, SFXParam* pParam, EHWShaderClass eSHClass, [[maybe_unused]] uint32 dwType, SShaderTechnique* pShTech)
-{
-    static uint32 eT_ShadowGen[] = {CParserBin::GetCRC32("ShadowGenVS"), CParserBin::GetCRC32("ShadowGenPS"), CParserBin::GetCRC32("ShadowGenGS")};
-    if (!CParserBin::PlatformSupportsConstantBuffers())
-    {
-        //if (pParam->m_Name.c_str()[0] != '_')
-        {
-            if (!(Parser.m_pCurShader->m_Flags & EF_LOCALCONSTANTS))
-            {
-                if (pParam->m_Register[eSHClass] >= 0 && pParam->m_Register[eSHClass] < 10000)
-                {
-                    if ((pShTech->m_Flags & FHF_NOLIGHTS) && pParam->m_BindingSlot == eConstantBufferShaderSlot_PerMaterial && !(pParam->m_nFlags & PF_TWEAKABLE_MASK))
-                    {
-                        return;
-                    }
-                    if (pParam->m_Semantic.empty() && pParam->m_Values.c_str()[0] == '(')
-                    {
-                        pParam->m_BindingSlot = eConstantBufferShaderSlot_PerMaterial;
-                    }
-                    AffectedParams.push_back(*pParam);
-                    return;
-                }
-            }
-        }
-    }
-    else
-    if (pParam->m_BindingSlot == eConstantBufferShaderSlot_PerMaterial)
-    {
-        if (pParam->m_Register[eSHClass] < 0 || pParam->m_Register[eSHClass] >= 1000)
-        {
-            return;
-        }
-    }
-
-    int nFlags = pParam->GetFlags();
-    bool bCheckAffect = CParserBin::m_bParseFX ? true : false;
-
-    if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_GL4 || CParserBin::m_nPlatform == SF_GLES3 || CParserBin::m_nPlatform == SF_METAL)
-    {
-        CRY_ASSERT(eSHClass < eHWSC_Num);
-        if (((nFlags & PF_TWEAKABLE_MASK) || pParam->m_Values.c_str()[0] == '(') && pParam->m_Register[eSHClass] >= 0 && pParam->m_Register[eSHClass] < 1000)
-        {
-            bCheckAffect = false;
-        }
-    }
-    for (uint32 j = 0; j < AffectedFunc.size(); j++)
-    {
-        SCodeFragment* pCF = &Parser.m_CodeFragments[AffectedFunc[j]];
-        if (!bCheckAffect || Parser.FindToken(pCF->m_nFirstToken, pCF->m_nLastToken, pParam->m_dwName[0]) >= 0)
-        {
-            AffectedParams.push_back(*pParam);
-            break;
-        }
-    }
-}
-
-void CShaderManBin::InitShaderDependenciesList(CParserBin& Parser, SCodeFragment* pFunc, TArray<byte>& bChecked, TArray<int>& AffectedFunc)
-{
-    uint32 i;
-    const uint32 numFrags = Parser.m_CodeFragments.size();
-
-    for (i = 0; i < numFrags; ++i)
-    {
-        if (bChecked[i])
-        {
-            continue;
-        }
-        SCodeFragment* s = &Parser.m_CodeFragments[i];
-        if (!s->m_dwName)
-        {
-            bChecked[i] = 1;
-            continue;
-        }
-        if (s->m_eType == eFT_Function || s->m_eType == eFT_StorageClass)
-        {
-            if (Parser.FindToken(pFunc->m_nFirstToken, pFunc->m_nLastToken, s->m_dwName) >= 0)
-            {
-                bChecked[i] = 1;
-                AffectedFunc.push_back(i);
-                InitShaderDependenciesList(Parser, s, bChecked, AffectedFunc);
-            }
-        }
-    }
-}
-
-void CShaderManBin::AddAffectedSampler(CParserBin& Parser, std::vector<SFXSampler>& AffectedSamplers, TArray<int>& AffectedFunc, SFXSampler* pSampler, [[maybe_unused]] EHWShaderClass eSHClass, [[maybe_unused]] uint32 dwType, [[maybe_unused]] SShaderTechnique* pShTech)
-{
-    for (uint32 j = 0; j < AffectedFunc.size(); j++)
-    {
-        SCodeFragment* pCF = &Parser.m_CodeFragments[AffectedFunc[j]];
-        if (Parser.FindToken(pCF->m_nFirstToken, pCF->m_nLastToken, pSampler->m_dwName[0]) >= 0)
-        {
-            AffectedSamplers.push_back(*pSampler);
-            break;
-        }
-    }
-}
-void CShaderManBin::AddAffectedTexture(CParserBin& Parser, std::vector<SFXTexture>& AffectedTextures, TArray<int>& AffectedFunc, SFXTexture* pTexture, [[maybe_unused]] EHWShaderClass eSHClass, [[maybe_unused]] uint32 dwType, [[maybe_unused]] SShaderTechnique* pShTech)
-{
-    for (uint32 j = 0; j < AffectedFunc.size(); j++)
-    {
-        SCodeFragment* pCF = &Parser.m_CodeFragments[AffectedFunc[j]];
-        if (Parser.FindToken(pCF->m_nFirstToken, pCF->m_nLastToken, pTexture->m_dwName[0]) >= 0)
-        {
-            AffectedTextures.push_back(*pTexture);
-            break;
-        }
-    }
-}
-
-void CShaderManBin::CheckStructuresDependencies(CParserBin& Parser, SCodeFragment* pFrag, TArray<byte>& bChecked, TArray<int>& AffectedFunc)
-{
-    uint32 i;
-    const uint32 numFrags = Parser.m_CodeFragments.size();
-
-    for (i = 0; i < numFrags; ++i)
-    {
-        if (bChecked[i])
-        {
-            continue;
-        }
-        SCodeFragment* s = &Parser.m_CodeFragments[i];
-        if (s->m_eType == eFT_Structure)
-        {
-            if (Parser.FindToken(pFrag->m_nFirstToken, pFrag->m_nLastToken, s->m_dwName) >= 0)
-            {
-                bChecked[i] = 1;
-                AffectedFunc.push_back(i);
-                CheckStructuresDependencies(Parser, s, bChecked, AffectedFunc);
-            }
-        }
-    }
-}
-
-void CShaderManBin::CheckFragmentsDependencies(CParserBin& Parser, TArray<byte>& bChecked, TArray<int>& AffectedFrags)
-{
-    uint32 i, j;
-    const uint32 numFuncs = AffectedFrags.size();
-    const uint32 numFrags = Parser.m_CodeFragments.size();
-
-    for (i = 0; i < numFuncs; ++i)
-    {
-        int nFunc = AffectedFrags[i];
-        SCodeFragment* pFunc = &Parser.m_CodeFragments[nFunc];
-        for (j = 0; j < numFrags; j++)
-        {
-            SCodeFragment* s = &Parser.m_CodeFragments[j];
-            if (bChecked[j])
-            {
-                continue;
-            }
-
-            if (s->m_eType == eFT_Sampler || s->m_eType == eFT_Structure)
-            {
-                if (Parser.FindToken(pFunc->m_nFirstToken, pFunc->m_nLastToken, s->m_dwName) >= 0)
-                {
-                    bChecked[j] = 1;
-                    AffectedFrags.push_back(j);
-                    if (s->m_eType == eFT_Structure)
-                    {
-                        CheckStructuresDependencies(Parser, s, bChecked, AffectedFrags);
-                    }
-                }
-            }
-            else if (s->m_eType == eFT_ConstBuffer)
-            {
-                // Make sure cbuffer declaration does not get stripped
-                bChecked[j] = 1;
-                AffectedFrags.push_back(j);
-            }
-        }
-    }
-}
-
-//=================================================================================================
-
-struct SFXRegisterBin
-{
-    int nReg;
-    int nComp;
-    int m_nCB;
-    uint32 m_nFlags;
-    EParamType eType;
-    uint32 dwName;
-    CCryNameR m_Value;
-    SFXRegisterBin()
-    {
-        eType = eType_UNKNOWN;
-        m_nCB = -1;
-    }
-};
-
-struct SFXPackedName
-{
-    uint32 dwName[4];
-
-    SFXPackedName()
-    {
-        dwName[0] = dwName[1] = dwName[2] = dwName[3] = 0;
-    }
-};
-
-inline bool Compar(const SFXRegisterBin& a, const SFXRegisterBin& b)
-{
-    if (CParserBin::PlatformSupportsConstantBuffers())
-    {
-        if (a.m_nCB != b.m_nCB)
-        {
-            return a.m_nCB < b.m_nCB;
-        }
-    }
-    if (a.nReg != b.nReg)
-    {
-        return a.nReg < b.nReg;
-    }
-    if (a.nComp != b.nComp)
-    {
-        return a.nComp < b.nComp;
-    }
-    return false;
-}
-
-static void sFlushRegs(CParserBin& Parser, int nReg, SFXRegisterBin* MergedRegs[4], std::vector<SFXParam>& NewParams, EHWShaderClass eSHClass, std::vector<SFXPackedName>& PackedNames)
-{
-    NewParams.resize(NewParams.size() + 1);
-    PackedNames.resize(PackedNames.size() + 1);
-    SFXParam& p = NewParams[NewParams.size() - 1];
-    SFXPackedName& pN = PackedNames[PackedNames.size() - 1];
-    int nMaxComp = -1;
-    int j;
-
-    int nCompMerged = 0;
-    EParamType eType = eType_UNKNOWN;
-    int nCB = -1; 
-    for (j = 0; j < 4; j++)
-    {
-        if (MergedRegs[j] && MergedRegs[j]->eType != eType_UNKNOWN)
-        {
-            if (nCB == -1)
-            {
-                nCB = MergedRegs[j]->m_nCB;
-            }
-            else
-            if (nCB != MergedRegs[j]->m_nCB)
-            {
-                CRY_ASSERT(0);
-            }
-            if (eType == eType_UNKNOWN)
-            {
-                eType = MergedRegs[j]->eType;
-            }
-            else
-            if (eType != MergedRegs[j]->eType)
-            {
-                //CRY_ASSERT(0);
-            }
-        }
-    }
-    for (j = 0; j < 4; j++)
-    {
-        char s[16];
-        sprintf_s(s, "__%d", j);
-        p.m_Name = stack_string(p.m_Name.c_str()) + s;
-        if (MergedRegs[j])
-        {
-            if (MergedRegs[j]->m_nFlags & PF_TWEAKABLE_MASK)
-            {
-                p.m_nFlags |= (PF_TWEAKABLE_0 << j);
-            }
-            p.m_nFlags |= MergedRegs[j]->m_nFlags & ~(PF_TWEAKABLE_MASK | PF_SCALAR | PF_SINGLE_COMP | PF_MERGE_MASK);
-            nMaxComp = max(nMaxComp, j);
-            pN.dwName[j] = MergedRegs[j]->dwName;
-            if (nCompMerged)
-            {
-                p.m_Values = stack_string(p.m_Values.c_str()) += ", ";
-            }
-            p.m_Name = stack_string(p.m_Name.c_str()) + Parser.GetString(pN.dwName[j]);
-            p.m_Values = stack_string(p.m_Values.c_str()) + MergedRegs[j]->m_Value.c_str();
-            nCompMerged++;
-        }
-        else
-        {
-            if (nCompMerged)
-            {
-                p.m_Values = stack_string(p.m_Values.c_str()) + ", ";
-            }
-            p.m_Values = stack_string(p.m_Values.c_str()) + "NULL";
-            nCompMerged++;
-        }
-    }
-    p.m_ComponentCount = nMaxComp + 1;
-    if (eSHClass == eHWSC_Geometry && !CParserBin::PlatformSupportsGeometryShaders())
-    {
-        return;
-    }
-    if (eSHClass == eHWSC_Domain && !CParserBin::PlatformSupportsDomainShaders())
-    {
-        return;
-    }
-    if (eSHClass == eHWSC_Hull && !CParserBin::PlatformSupportsHullShaders())
-    {
-        return;
-    }
-    if (eSHClass == eHWSC_Compute && !CParserBin::PlatformSupportsComputeShaders())
-    {
-        return;
-    }
-
-    // Get packed name token.
-    p.m_dwName.push_back(Parser.NewUserToken(eT_unknown, p.m_Name.c_str(), true)); //pass by crysting so that string references work.
-    CRY_ASSERT(eSHClass < eHWSC_Num);
-    p.m_Register[eSHClass] = nReg;
-    if (eSHClass == eHWSC_Domain || eSHClass == eHWSC_Hull || eSHClass == eHWSC_Compute)
-    {
-        p.m_Register[eHWSC_Vertex] = nReg;
-    }
-    p.m_RegisterCount = 1;
-    if (eType == eType_HALF)
-    {
-        eType = eType_FLOAT;
-    }
-    p.m_eType = eType;
-    CRY_ASSERT(eType != eType_UNKNOWN);
-    p.m_BindingSlot = nCB;
-    p.m_nFlags |= PF_AUTOMERGED;
-}
-
-static EToken sCompToken[4] = {eT_x, eT_y, eT_z, eT_w};
-bool CShaderManBin::ParseBinFX_Technique_Pass_PackParameters (CParserBin& Parser, std::vector<SFXParam>& AffectedParams, TArray<int>& AffectedFunc, [[maybe_unused]] SCodeFragment* pFunc, EHWShaderClass eSHClass, uint32 dwSHName, std::vector<SFXParam>& PackedParams, TArray<SCodeFragment>& Replaces, TArray<uint32>& NewTokens, TArray<byte>& bMerged)
-{
-    bool bRes = true;
-
-    uint32 i, j;
-
-    std::vector<SFXRegisterBin> Registers;
-    std::vector<SFXPackedName> PackedNames;
-    for (i = 0; i < AffectedParams.size(); i++)
-    {
-        SFXParam* pr = &AffectedParams[i];
-        if (pr->m_Annotations.empty())
-        {
-            continue; // Parameter doesn't have custom register definition
-        }
-        const char* src = strstr(pr->m_Annotations.c_str(), "register");
-        if (src)
-        {
-            char* b = (char*)&src[8];
-            SkipCharacters (&b, kWhiteSpace);
-            CRY_ASSERT(b[0] == '=');
-            b++;
-            SkipCharacters (&b, kWhiteSpace);
-            CRY_ASSERT(b[0] == 'c');
-            if (b[0] == 'c')
-            {
-                int nReg = atoi(&b[1]);
-                b++;
-                while (*b != '.' && *b != ';')
-                {
-                    if (*b == 0) // Vector without swizzling
-                    {
-                        break;
-                    }
-                    b++;
-                }
-                if (*b == '.')
-                {
-                    bMerged[i] = 0xff;
-                    b++;
-                    int nComp = -1;
-                    switch (b[0])
-                    {
-                    case 'x':
-                    case 'r':
-                        nComp = 0;
-                        break;
-                    case 'y':
-                    case 'g':
-                        nComp = 1;
-                        break;
-                    case 'z':
-                    case 'b':
-                        nComp = 2;
-                        break;
-                    case 'w':
-                    case 'a':
-                        nComp = 3;
-                        break;
-                    default:
-                        CRY_ASSERT(0);
-                    }
-                    if (nComp >= 0)
-                    {
-                        pr->m_nFlags |= PF_MERGE;
-                        SFXRegisterBin rg;
-                        rg.nReg = nReg;
-                        rg.nComp = nComp;
-                        rg.dwName = pr->m_dwName[0];
-                        rg.m_Value = pr->m_Values;
-                        rg.m_nFlags = pr->m_nFlags;
-                        rg.eType = (EParamType)pr->m_eType;
-                        rg.m_nCB = pr->m_BindingSlot;
-                        CRY_ASSERT(rg.m_Value.c_str()[0]);
-                        Registers.push_back(rg);
-                    }
-                }
-            }
-        }
-    }
-    if (Registers.empty())
-    {
-        return false;
-    }
-    std::sort(Registers.begin(), Registers.end(), Compar);
-    int nReg = -1;
-    int nCB = -1;
-    SFXRegisterBin* MergedRegs[4];
-    MergedRegs[0] = MergedRegs[1] = MergedRegs[2] = MergedRegs[3] = NULL;
-    for (i = 0; i < Registers.size(); i++)
-    {
-        SFXRegisterBin* rg = &Registers[i];
-        if ((!CParserBin::PlatformSupportsConstantBuffers() && rg->nReg != nReg) || (CParserBin::PlatformSupportsConstantBuffers() && (rg->m_nCB != nCB || rg->nReg != nReg)))
-        {
-            if (nReg >= 0)
-            {
-                sFlushRegs(Parser, nReg, MergedRegs, PackedParams, eSHClass, PackedNames);
-            }
-            nReg = rg->nReg;
-            nCB = rg->m_nCB;
-            MergedRegs[0] = MergedRegs[1] = MergedRegs[2] = MergedRegs[3] = NULL;
-        }
-        CRY_ASSERT(!MergedRegs[rg->nComp]);
-        if (MergedRegs[rg->nComp])
-        {
-            Warning("register c%d (comp: %d) is used by the %s shader '%s' already", rg->nReg, rg->nComp, eSHClass == eHWSC_Pixel ? "pixel" : "vertex", Parser.GetString(dwSHName));
-            CRY_ASSERT(0);
-        }
-        MergedRegs[rg->nComp] = rg;
-    }
-    if (MergedRegs[0] || MergedRegs[1] || MergedRegs[2] || MergedRegs[3])
-    {
-        sFlushRegs(Parser, nReg, MergedRegs, PackedParams, eSHClass, PackedNames);
-    }
-
-    // Replace new parameters in shader tokens
-    for (uint32 n = 0; n < AffectedFunc.size(); n++)
-    {
-        SCodeFragment* st = &Parser.m_CodeFragments[AffectedFunc[n]];
-        //const char *szName = Parser.GetString(st->m_dwName);
-
-        for (i = 0; i < PackedParams.size(); i++)
-        {
-            SFXParam* pr = &PackedParams[i];
-            SFXPackedName* pn = &PackedNames[i];
-            for (j = 0; j < 4; j++)
-            {
-                uint32 nP = pn->dwName[j];
-                if (nP == 0)
-                {
-                    continue;
-                }
-                int32 nPos = st->m_nFirstToken;
-                while (true)
-                {
-                    nPos = Parser.FindToken(nPos, st->m_nLastToken, nP);
-                    if (nPos < 0)
-                    {
-                        break;
-                    }
-                    SCodeFragment Fr;
-                    Fr.m_nFirstToken = Fr.m_nLastToken = nPos;
-                    Fr.m_dwName = n;
-                    Replaces.push_back(Fr);
-
-                    Fr.m_nFirstToken = NewTokens.size();
-                    NewTokens.push_back(pr->m_dwName[0]);
-                    NewTokens.push_back(eT_dot);
-                    NewTokens.push_back(sCompToken[j]);
-                    Fr.m_nLastToken = NewTokens.size() - 1;
-                    Replaces.push_back(Fr);
-                    nPos++;
-                }
-            }
-        }
-    }
-
-    for (i = 0; i < Replaces.size(); i += 2)
-    {
-        SCodeFragment* pFR1 = &Replaces[i];
-        for (j = i + 2; j < Replaces.size(); j += 2)
-        {
-            SCodeFragment* pFR2 = &Replaces[j];
-            if (pFR1->m_dwName != pFR2->m_dwName)
-            {
-                continue;
-            }
-            if (pFR2->m_nFirstToken < pFR1->m_nFirstToken)
-            {
-                std::swap(Replaces[i], Replaces[j]);
-                std::swap(Replaces[i + 1], Replaces[j + 1]);
-            }
-        }
-    }
-
-    return bRes;
-}
-
-//===================================================================================================
-
-void CShaderManBin::AddParameterToScript(CParserBin& Parser, SFXParam* pr, PodArray<uint32>& SHData, EHWShaderClass eSHClass, int nCB)
-{
-    char str[256];
-    int nReg = pr->m_Register[eSHClass];
-    if (pr->m_eType == eType_BOOL)
-    {
-        SHData.push_back(eT_bool);
-    }
-    else
-    if (pr->m_eType == eType_INT)
-    {
-        SHData.push_back(eT_int);
-    }
-    else
-    {
-        int nVal = pr->m_RegisterCount * 4 + pr->m_ComponentCount;
-        EToken eT = eT_unknown;
-        switch (nVal)
-        {
-        case 4 + 1:
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float : eT_half;
-            break;
-        case 4 + 2:
-            //eT = eT_float2;
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float2 : eT_half2;
-            break;
-        case 4 + 3:
-            //eT = eT_float3;
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float3 : eT_half3;
-            break;
-        case 4 + 4:
-            //eT = eT_float4;
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float4 : eT_half4;
-            break;
-        case 2 * 4 + 4:
-            //eT = eT_float2x4;
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float2x4 : eT_half2x4;
-            break;
-        case 3 * 4 + 4:
-            //eT = eT_float3x4;
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float3x4 : eT_half3x4;
-            break;
-        case 4 * 4 + 4:
-            //eT = eT_float4x4;
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float4x4 : eT_half4x4;
-            break;
-        case 3 * 4 + 3:
-            //eT = eT_float3x3;
-            eT = (pr->m_eType == eType_FLOAT) ? eT_float3x3 : eT_half3x3;
-            break;
-        }
-        CRY_ASSERT(eT != eT_unknown);
-        if (eT == eT_unknown)
-        {
-            return;
-        }
-        SHData.push_back(eT);
-    }
-    for (uint32 i = 0; i < pr->m_dwName.size(); i++)
-    {
-        SHData.push_back(pr->m_dwName[i]);
-    }
-
-    if (nReg >= 0 && nReg < 10000)
-    {
-        SHData.push_back(eT_colon);
-        if (nCB == eConstantBufferShaderSlot_PerMaterial)
-        {
-            SHData.push_back(eT_packoffset);
-        }
-        else
-        {
-            SHData.push_back(eT_register);
-        }
-        SHData.push_back(eT_br_rnd_1);
-        sprintf_s(str, "c%d", nReg);
-        SHData.push_back(Parser.NewUserToken(eT_unknown, str, true));
-        SHData.push_back(eT_br_rnd_2);
-    }
-    SHData.push_back(eT_semicolumn);
-}
-
-void CShaderManBin::AddSamplerToScript(CParserBin& Parser, SFXSampler* pr, PodArray<uint32>& SHData, EHWShaderClass eSHClass)
-{
-    char str[256];
-    int nReg = pr->m_Register[eSHClass];
-    if (pr->m_eType == eSType_Sampler)
-    {
-        SHData.push_back(eT_SamplerState);
-    }
-    else
-    if (pr->m_eType == eSType_SamplerComp)
-    {
-        SHData.push_back(eT_SamplerComparisonState);
-    }
-    else
-    {
-        CRY_ASSERT(0);
-    }
-    for (uint32 i = 0; i < pr->m_dwName.size(); i++)
-    {
-        SHData.push_back(pr->m_dwName[i]);
-    }
-
-    if (nReg >= 0 && nReg < 10000)
-    {
-        SHData.push_back(eT_colon);
-        SHData.push_back(eT_register);
-        SHData.push_back(eT_br_rnd_1);
-        azsprintf(str, "s%d", nReg);
-        SHData.push_back(Parser.NewUserToken(eT_unknown, str, true));
-        SHData.push_back(eT_br_rnd_2);
-    }
-    SHData.push_back(eT_semicolumn);
-}
-void CShaderManBin::AddTextureToScript(CParserBin& Parser, SFXTexture* pr, PodArray<uint32>& SHData, EHWShaderClass eSHClass)
-{
-    char str[256];
-    int nReg = pr->m_Register[eSHClass];
-    if (pr->m_eType == eTT_2D)
-    {
-        SHData.push_back(eT_Texture2D);
-    }
-    else
-    if (pr->m_eType == eTT_3D)
-    {
-        SHData.push_back(eT_Texture3D);
-    }
-    else
-    if (pr->m_eType == eTT_2DArray)
-    {
-        SHData.push_back(eT_Texture2DArray);
-    }
-    else
-    if (pr->m_eType == eTT_2DMS)
-    {
-        SHData.push_back(eT_Texture2DMS);
-    }
-    else
-    if (pr->m_eType == eTT_Cube)
-    {
-        SHData.push_back(eT_TextureCube);
-    }
-    else
-    if (pr->m_eType == eTT_CubeArray)
-    {
-        SHData.push_back(eT_TextureCubeArray);
-    }
-    else
-    {
-        CRY_ASSERT(0);
-    }
-    if (pr->m_Type != eT_unknown)
-    {
-        SHData.push_back(eT_br_tr_1);
-        SHData.push_back(pr->m_Type);
-        SHData.push_back(eT_br_tr_2);
-    }
-    for (uint32 i = 0; i < pr->m_dwName.size(); i++)
-    {
-        SHData.push_back(pr->m_dwName[i]);
-    }
-
-    if (nReg >= 0 && nReg < 10000)
-    {
-        SHData.push_back(eT_colon);
-        SHData.push_back(eT_register);
-        SHData.push_back(eT_br_rnd_1);
-        azsprintf(str, "t%d", nReg);
-        SHData.push_back(Parser.NewUserToken(eT_unknown, str, true));
-        SHData.push_back(eT_br_rnd_2);
-    }
-    SHData.push_back(eT_semicolumn);
-}
-
-static EToken GeneratedConstantBufferNames[] = { eT_PER_BATCH, eT_PER_INSTANCE, eT_PER_MATERIAL };
-
-bool CShaderManBin::ParseBinFX_Technique_Pass_GenerateShaderData(CParserBin& Parser, FXMacroBin& Macros, SShaderFXParams& FXParams, uint32 dwSHName, EHWShaderClass eSHClass, uint64& nAffectMask, uint32 dwSHType, PodArray<uint32>& SHData, SShaderTechnique* pShTech)
-{
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-    CRY_ASSERT(gRenDev->m_pRT->IsRenderThread());
-
-    bool bRes = true;
-
-    std::vector<SFXParam> AffectedParams;
-    std::vector<SFXSampler> AffectedSamplers;
-    std::vector<SFXTexture> AffectedTextures;
-
-    uint32 i, j;
-    uint32 nNum;
-    static TArray<int> AffectedFragments;
-    AffectedFragments.reserve(120);
-    AffectedFragments.SetUse(0);
-
-    for (nNum = 0; nNum < Parser.m_CodeFragments.size(); nNum++)
-    {
-        if (dwSHName == Parser.m_CodeFragments[nNum].m_dwName)
-        {
-            break;
-        }
-    }
-    if (nNum == Parser.m_CodeFragments.size())
-    {
-        AZ_Assert(false, "Couldn't find entry function '%s'", Parser.GetString(dwSHName));
-        return false;
-    }
-
-    SCodeFragment* pFunc = &Parser.m_CodeFragments[nNum];
-    SShaderBin* pBin = Parser.m_pCurBinShader;
-    SParamCacheInfo* pCache = GetParamInfo(pBin, pFunc->m_dwName, Parser.m_pCurShader->m_nMaskGenFX, Parser.m_pCurShader->m_maskGenStatic);
-    if (pCache)
-    {
-        AffectedFragments.SetUse(0);
-        AffectedFragments.reserve(pCache->m_AffectedFuncs.size());
-        if (pCache->m_AffectedFuncs.empty() == false)
-        {
-            AffectedFragments.Copy(&pCache->m_AffectedFuncs[0], pCache->m_AffectedFuncs.size());
-        }
-    }
-    else
-    {
-        AffectedFragments.push_back(nNum);
-        if (CParserBin::m_bParseFX)
-        {
-            TArray<byte> bChecked;
-            bChecked.resize(Parser.m_CodeFragments.size());
-            if (bChecked.size() > 0)
-            {
-                memset(&bChecked[0], 0, sizeof(byte) * bChecked.size());
-            }
-            bChecked[nNum] = 1;
-            InitShaderDependenciesList(Parser, pFunc, bChecked, AffectedFragments);
-            CheckFragmentsDependencies(Parser, bChecked, AffectedFragments);
-        }
-        else
-        {
-            for (i = 0; i < Parser.m_CodeFragments.size(); i++)
-            {
-                if (i != nNum)
-                {
-                    AffectedFragments.push_back(i);
-                }
-            }
-        }
-    }
-
-    nAffectMask = 0;
-    for (i = 0; i < AffectedFragments.size(); i++)
-    {
-        SCodeFragment* s = &Parser.m_CodeFragments[AffectedFragments[i]];
-        if (s->m_eType != eFT_Function && s->m_eType != eFT_Structure && s->m_eType != eFT_ConstBuffer && s->m_eType != eFT_StorageClass)
-        {
-            continue;
-        }
-        FXMacroBinItor itor;
-        for (itor = Macros.begin(); itor != Macros.end(); ++itor)
-        {
-            SMacroBinFX* pr = &itor->second;
-            if (!pr->m_nMask)
-            {
-                continue;
-            }
-            if ((pr->m_nMask & nAffectMask) == pr->m_nMask)
-            {
-                continue;
-            }
-            uint32 dwName = itor->first;
-            if (Parser.FindToken(s->m_nFirstToken, s->m_nLastToken, dwName) >= 0)
-            {
-                nAffectMask |= pr->m_nMask;
-            }
-        }
-    }
-
-    // Generate list of params before first preprocessor pass for affected functions
-    TArray<byte> bMerged;
-    bMerged.Reserve(FXParams.m_FXParams.size());
-    if (pCache)
-    {
-        for (i = 0; i < pCache->m_AffectedParams.size(); i++)
-        {
-            uint32 nParam = pCache->m_AffectedParams[i];
-            FXParamsIt it = std::lower_bound(FXParams.m_FXParams.begin(), FXParams.m_FXParams.end(), nParam, FXParamsSortByName());
-            if (it != FXParams.m_FXParams.end() && nParam == (*it).m_dwName[0])
-            {
-                SFXParam& pr = (*it);
-                if (!(pr.GetFlags() & PF_AUTOMERGED))
-                {
-                    if (pr.m_Semantic.empty() && pr.m_Values.c_str()[0] == '(')
-                    {
-                        pr.m_BindingSlot = eConstantBufferShaderSlot_PerMaterial;
-                    }
-                    AffectedParams.push_back(pr);
-                }
-            }
-        }
-        for (i = 0; i < pCache->m_AffectedSamplers.size(); i++)
-        {
-            uint32 nParam = pCache->m_AffectedSamplers[i];
-            FXSamplersIt it = std::lower_bound(FXParams.m_FXSamplers.begin(), FXParams.m_FXSamplers.end(), nParam, FXSamplersSortByName());
-            if (it != FXParams.m_FXSamplers.end() && nParam == (*it).m_dwName[0])
-            {
-                SFXSampler& pr = (*it);
-                AffectedSamplers.push_back(pr);
-            }
-        }
-        for (i = 0; i < pCache->m_AffectedTextures.size(); i++)
-        {
-            uint32 nParam = pCache->m_AffectedTextures[i];
-            FXTexturesIt it = std::lower_bound(FXParams.m_FXTextures.begin(), FXParams.m_FXTextures.end(), nParam, FXTexturesSortByName());
-            if (it != FXParams.m_FXTextures.end() && nParam == (*it).m_dwName[0])
-            {
-                SFXTexture& pr = (*it);
-                AffectedTextures.push_back(pr);
-            }
-        }
-    }
-    else
-    {
-        for (i = 0; i < FXParams.m_FXParams.size(); i++)
-        {
-            SFXParam* pr = &FXParams.m_FXParams[i];
-            if (!(pr->GetFlags() & PF_AUTOMERGED))
-            {
-                AddAffectedParameter(Parser, AffectedParams, AffectedFragments, pr, eSHClass, dwSHType, pShTech);
-            }
-        }
-        for (i = 0; i < FXParams.m_FXSamplers.size(); i++)
-        {
-            SFXSampler* pr = &FXParams.m_FXSamplers[i];
-            AddAffectedSampler(Parser, AffectedSamplers, AffectedFragments, pr, eSHClass, dwSHType, pShTech);
-        }
-        for (i = 0; i < FXParams.m_FXTextures.size(); i++)
-        {
-            SFXTexture* pr = &FXParams.m_FXTextures[i];
-            AddAffectedTexture(Parser, AffectedTextures, AffectedFragments, pr, eSHClass, dwSHType, pShTech);
-        }
-    }
-
-    if (CParserBin::m_bParseFX)
-    {
-        FXMacroBinItor itor;
-        for (itor = Macros.begin(); itor != Macros.end(); ++itor)
-        {
-            if (itor->second.m_nMask && !(itor->second.m_nMask & nAffectMask))
-            {
-                continue;
-            }
-            SHData.push_back(eT_define);
-            SHData.push_back(itor->first);
-            SHData.push_back(0);
-        }
-        std::vector<SFXParam> PackedParams;
-        TArray<SCodeFragment> Replaces;
-        TArray<uint32> NewTokens;
-        ParseBinFX_Technique_Pass_PackParameters (Parser, AffectedParams, AffectedFragments, pFunc, eSHClass, dwSHName, PackedParams, Replaces, NewTokens, bMerged);
-
-        if (!pCache)
-        {
-            // Update new parameters in shader structures
-            for (i = 0; i < PackedParams.size(); i++)
-            {
-                SFXParam* pr = &PackedParams[i];
-                AffectedParams.push_back(*pr);
-            }
-            if (CRenderer::CV_r_shadersAllowCompilation)
-            {
-                SaveBinShaderLocalInfo(pBin, pFunc->m_dwName, Parser.m_pCurShader->m_nMaskGenFX, Parser.m_pCurShader->m_maskGenStatic, AffectedFragments, AffectedParams, AffectedSamplers, AffectedTextures);
-            }
-        }
-        else
-        {
-            for (i = 0; i < pCache->m_AffectedParams.size(); i++)
-            {
-                int32 nParam = pCache->m_AffectedParams[i];
-                for (j = 0; j < PackedParams.size(); j++)
-                {
-                    SFXParam& pr = PackedParams[j];
-                    if (pr.m_dwName[0] == nParam)
-                    {
-                        AffectedParams.push_back(pr);
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Update FX parameters
-        for (i = 0; i < AffectedParams.size(); i++)
-        {
-            SFXParam* pr = &AffectedParams[i];
-            mfAddFXParam(FXParams, pr);
-        }
-
-        // Include all affected functions/structures/parameters in the final script
-        if (CParserBin::PlatformSupportsConstantBuffers()) // use CB scopes for D3D10 shaders
-        {
-            int8 nPrevCB = -1;
-            std::vector<SFXParam*> ParamsData;
-
-            for (i = 0; i < AffectedParams.size(); i++)
-            {
-                SFXParam& pr = AffectedParams[i];
-                if (bMerged[i] == 0xff)
-                {
-                    continue;
-                }
-                if (pr.m_BindingSlot >= 0)
-                {
-                    ParamsData.push_back(&pr);
-                }
-            }
-
-            const int shaderClassIndex = (eSHClass == eHWSC_Vertex) ? 0 : (eSHClass == eHWSC_Pixel) ? 1 : 2;
-
-            std::sort(ParamsData.begin(), ParamsData.end(),
-                [shaderClassIndex](const SFXParam* a, const SFXParam* b)
-                {
-                    const uint16 bindSlot0 = a->m_BindingSlot;
-                    const uint16 bindSlot1 = b->m_BindingSlot;
-                    const int16 register0 = a->m_Register[shaderClassIndex];
-                    const int16 register1 = b->m_Register[shaderClassIndex];
-
-                    if (bindSlot0 != bindSlot1)
-                    {
-                        return (bindSlot0 < bindSlot1);
-                    }
-                    return (register0 < register1);
-                });
-
-            // First we need to declare semantic variables (in CB scopes in case of DX11)
-            for (i = 0; i < ParamsData.size(); i++)
-            {
-                SFXParam* pPr = ParamsData[i];
-                int nCB = pPr->m_BindingSlot;
-                nCB = pPr->m_BindingSlot;
-                if (nPrevCB != nCB)
-                {
-                    if (nPrevCB != -1)
-                    {
-                        SHData.push_back(eT_br_cv_2);
-                        SHData.push_back(eT_semicolumn);
-                    }
-                    SHData.push_back(eT_cbuffer);
-
-                    AZ_Assert(nCB < AZ_ARRAY_SIZE(GeneratedConstantBufferNames), "Trying to generate a constant buffer at an invalid slot");
-                    SHData.push_back(GeneratedConstantBufferNames[nCB]);
-                    SHData.push_back(eT_colon);
-                    SHData.push_back(eT_register);
-                    char str[32];
-                    sprintf_s(str, "b%d", nCB);
-                    SHData.push_back(eT_br_rnd_1);
-                    SHData.push_back(Parser.NewUserToken(eT_unknown, str, true));
-                    SHData.push_back(eT_br_rnd_2);
-                    SHData.push_back(eT_br_cv_1);
-                }
-                nPrevCB = nCB;
-                AddParameterToScript(Parser, pPr, SHData, eSHClass, nCB);
-            }
-            if (nPrevCB >= 0)
-            {
-                nPrevCB = -1;
-                SHData.push_back(eT_br_cv_2);
-                SHData.push_back(eT_semicolumn);
-            }
-
-            for (i = 0; i < AffectedSamplers.size(); i++)
-            {
-                SFXSampler* pr = &AffectedSamplers[i];
-                AddSamplerToScript(Parser, pr, SHData, eSHClass);
-            }
-            for (i = 0; i < AffectedTextures.size(); i++)
-            {
-                SFXTexture* pr = &AffectedTextures[i];
-                AddTextureToScript(Parser, pr, SHData, eSHClass);
-            }
-        }
-        else
-        {
-            // Update affected parameters in script
-#ifdef _DEBUG
-            for (i = 0; i < AffectedParams.size(); i++)
-            {
-                SFXParam* pr = &AffectedParams[i];
-                for (j = i + 1; j < AffectedParams.size(); j++)
-                {
-                    SFXParam* pr1 = &AffectedParams[j];
-                    if (pr->m_dwName[0] == pr1->m_dwName[0])
-                    {
-                        CRY_ASSERT(0);
-                    }
-                }
-            }
-#endif
-            for (i = 0; i < AffectedParams.size(); i++)
-            {
-                SFXParam* pr = &AffectedParams[i];
-                // Ignore parameters which where packed
-                if (bMerged[i] == 0xff)
-                {
-                    continue;
-                }
-                AddParameterToScript(Parser, pr, SHData, eSHClass, -1);
-            }
-        }
-
-        // Generate fragment tokens
-        for (i = 0; i < Parser.m_CodeFragments.size(); i++)
-        {
-            int h = -1;
-            SCodeFragment* cf = &Parser.m_CodeFragments[i];
-            if (cf->m_dwName)
-            {
-                for (h = 0; h < (int)AffectedFragments.size(); h++)
-                {
-                    if (AffectedFragments[h] == i)
-                    {
-                        break;
-                    }
-                }
-                if (h == AffectedFragments.size())
-                {
-                    continue;
-                }
-            }
-
-            Parser.CopyTokens(cf, SHData, Replaces, NewTokens, h);
-            if (cf->m_eType == eFT_Sampler)
-            {
-                if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4 || CParserBin::m_nPlatform == SF_GLES3 || CParserBin::m_nPlatform == SF_METAL)
-                {
-                    int nT = Parser.m_Tokens[cf->m_nLastToken - 1];
-                    //CRY_ASSERT(nT >= eT_s0 && nT <= eT_s15);
-                    if (nT >= eT_s0 && nT <= eT_s15)
-                    {
-                        nT = nT - eT_s0 + eT_t0;
-                        SHData.push_back(eT_colon);
-                        SHData.push_back(eT_register);
-                        SHData.push_back(eT_br_rnd_1);
-                        SHData.push_back(nT);
-                        SHData.push_back(eT_br_rnd_2);
-                    }
-                }
-                SHData.push_back(eT_semicolumn);
-            }
-        }
-    }
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Technique_Pass_LoadShader([[maybe_unused]] CParserBin& Parser, [[maybe_unused]] FXMacroBin& Macros, [[maybe_unused]] SParserFrame& SHFrame, [[maybe_unused]] SShaderTechnique* pShTech, [[maybe_unused]] SShaderPass* pPass, [[maybe_unused]] EHWShaderClass eSHClass, [[maybe_unused]] SShaderFXParams& FXParams)
-{
-    assert (gRenDev->m_pRT->IsRenderThread());
-
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-    bool bRes = true;
-
-#ifndef NULL_RENDERER
-
-    CRY_ASSERT(!SHFrame.IsEmpty());
-
-    uint32 dwSHName;
-    uint32 dwSHType = 0;
-
-    uint32* pTokens = &Parser.m_Tokens[0];
-
-    dwSHName = pTokens[SHFrame.m_nFirstToken];
-    uint32 nCur = SHFrame.m_nFirstToken + 1;
-    uint32 nTok = pTokens[nCur];
-    if (nTok != eT_br_rnd_1)
-    {
-        nCur += 2;
-        nTok = pTokens[nCur];
-    }
-    nCur++;
-    assert (nTok == eT_br_rnd_1);
-    if (nTok == eT_br_rnd_1)
-    {
-        nTok = pTokens[nCur];
-        if (nTok != eT_br_rnd_2)
-        {
-            CRY_ASSERT(!"Local function parameters aren't supported anymore");
-        }
-    }
-    nCur++;
-    if (nCur <= SHFrame.m_nLastToken)
-    {
-        dwSHType = pTokens[nCur];
-    }
-
-    enum
-    {
-        SHDATA_BUFFER_SIZE = 131072
-    };
-
-    uint64 nGenMask = 0;
-    PodArray<uint32> SHDataBuffer(SHDATA_BUFFER_SIZE);
-    bRes &= ParseBinFX_Technique_Pass_GenerateShaderData(Parser, Macros, FXParams, dwSHName, eSHClass, nGenMask, dwSHType, SHDataBuffer, pShTech);
-#if !defined(_RELEASE)
-    if (SHDataBuffer.size() > SHDATA_BUFFER_SIZE)
-    {
-        CryLogAlways("CShaderManBin::ParseBinFX_Technique_Pass_LoadShader: SHDataBuffer has been exceeded (buffer=%u, count=%u). Adjust buffer size to remove unnecessary allocs", SHDATA_BUFFER_SIZE, SHDataBuffer.Size());
-    }
-#endif
-    TArray<uint32> SHData(0, SHDataBuffer.Size());
-    SHData.Copy(SHDataBuffer.GetElements(), SHDataBuffer.size());
-
-    CHWShader* pSH = NULL;
-    bool bValidShader = false;
-
-    CShader* efSave = gRenDev->m_RP.m_pShader;
-    gRenDev->m_RP.m_pShader = Parser.m_pCurShader;
-    CRY_ASSERT(gRenDev->m_RP.m_pShader != 0);
-    if (bRes && (!CParserBin::m_bParseFX || !SHData.empty()))
-    {
-        const char* szName = Parser.GetString(dwSHName);
-        char str[1024];
-        sprintf_s(str, "%s@%s", Parser.m_pCurShader->m_NameShader.c_str(), szName);
-        pSH = CHWShader::mfForName(str, Parser.m_pCurShader->m_NameFile, Parser.m_pCurShader->m_CRC32, szName, eSHClass, SHData, &Parser.m_TokenTable, dwSHType, Parser.m_pCurShader, nGenMask, Parser.m_pCurShader->m_nMaskGenFX);
-    }
-    if (pSH)
-    {
-        bValidShader = true;
-
-        if (eSHClass == eHWSC_Vertex)
-        {
-            pPass->m_VShader = pSH;
-        }
-        else
-        if (eSHClass == eHWSC_Pixel)
-        {
-            pPass->m_PShader = pSH;
-        }
-        else
-        if (CParserBin::PlatformSupportsGeometryShaders() && eSHClass == eHWSC_Geometry)
-        {
-            pPass->m_GShader = pSH;
-        }
-        else
-        if (CParserBin::PlatformSupportsDomainShaders() && eSHClass == eHWSC_Domain)
-        {
-            pPass->m_DShader = pSH;
-        }
-        else
-        if (CParserBin::PlatformSupportsHullShaders() && eSHClass == eHWSC_Hull)
-        {
-            pPass->m_HShader = pSH;
-        }
-        else
-        if (CParserBin::PlatformSupportsComputeShaders() && eSHClass == eHWSC_Compute)
-        {
-            pPass->m_CShader = pSH;
-        }
-        else
-        {
-            CryLog("Unsupported/unrecognised shader: %s[%d]", pSH->m_Name.c_str(), eSHClass);
-        }
-    }
-
-    gRenDev->m_RP.m_pShader = efSave;
-#endif
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Technique_Pass(CParserBin& Parser, SParserFrame& Frame, SShaderTechnique* pShTech)
-{
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(VertexShader)
-    FX_TOKEN(PixelShader)
-    FX_TOKEN(GeometryShader)
-    FX_TOKEN(DomainShader)
-    FX_TOKEN(HullShader)
-    FX_TOKEN(ComputeShader)
-    FX_TOKEN(ZEnable)
-    FX_TOKEN(ZWriteEnable)
-    FX_TOKEN(CullMode)
-    FX_TOKEN(SrcBlend)
-    FX_TOKEN(DestBlend)
-    FX_TOKEN(AlphaBlendEnable)
-    FX_TOKEN(AlphaFunc)
-    FX_TOKEN(AlphaRef)
-    FX_TOKEN(ZFunc)
-    FX_TOKEN(ColorWriteEnable)
-    FX_TOKEN(IgnoreMaterialState)
-    FX_END_TOKENS
-
-    bool bRes = true;
-    int n = pShTech->m_Passes.Num();
-    pShTech->m_Passes.ReserveNew(n + 1);
-    SShaderPass* sm = &pShTech->m_Passes[n];
-    sm->m_eCull = -1;
-    sm->m_AlphaRef = ~0;
-
-    SParserFrame VS, PS, GS, DS, HS, CS;
-    FXMacroBin VSMacro, PSMacro, GSMacro, DSMacro, HSMacro, CSMacro;
-
-    byte ZFunc = eCF_LEqual;
-
-    byte ColorWriteMask = 0xff;
-
-    byte AlphaFunc = eCF_Disable;
-    byte AlphaRef = 0;
-    int State = GS_DEPTHWRITE;
-
-    signed char Cull = -1;
-    int nIndex;
-    EToken eSrcBlend = eT_unknown;
-    EToken eDstBlend = eT_unknown;
-    bool bBlend = false;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_VertexShader:
-            VS = Parser.m_Data;
-            VSMacro = Parser.m_Macros[1];
-            break;
-        case eT_PixelShader:
-            PS = Parser.m_Data;
-            PSMacro = Parser.m_Macros[1];
-            break;
-        case eT_GeometryShader:
-            GS = Parser.m_Data;
-            GSMacro = Parser.m_Macros[1];
-            break;
-        case eT_DomainShader:
-            DS = Parser.m_Data;
-            DSMacro = Parser.m_Macros[1];
-            break;
-        case eT_HullShader:
-            HS = Parser.m_Data;
-            HSMacro = Parser.m_Macros[1];
-            break;
-        case eT_ComputeShader:
-            CS = Parser.m_Data;
-            CSMacro = Parser.m_Macros[1];
-            break;
-
-        case eT_ZEnable:
-            if (Parser.GetBool(Parser.m_Data))
-            {
-                State &= ~GS_NODEPTHTEST;
-            }
-            else
-            {
-                State |= GS_NODEPTHTEST;
-            }
-            break;
-        case eT_ZWriteEnable:
-            if (Parser.GetBool(Parser.m_Data))
-            {
-                State |= GS_DEPTHWRITE;
-            }
-            else
-            {
-                State &= ~GS_DEPTHWRITE;
-            }
-            break;
-        case eT_CullMode:
-            eT = Parser.GetToken(Parser.m_Data);
-            if (eT == eT_None)
-            {
-                Cull = eCULL_None;
-            }
-            else
-            if (eT == eT_CCW || eT == eT_Back)
-            {
-                Cull = eCULL_Back;
-            }
-            else
-            if (eT == eT_CW || eT == eT_Front)
-            {
-                Cull = eCULL_Front;
-            }
-            else
-            {
-                Warning("unknown CullMode parameter '%s' (Skipping)\n", Parser.GetString(eT));
-                CRY_ASSERT(0);
-            }
-            break;
-        case eT_AlphaFunc:
-            AlphaFunc = Parser.GetCompareFunc(Parser.GetToken(Parser.m_Data));
-            break;
-        case eT_ColorWriteEnable:
-        {
-            if (ColorWriteMask == 0xff)
-            {
-                ColorWriteMask = 0;
-            }
-            uint32 nCur = Parser.m_Data.m_nFirstToken;
-            while (nCur <= Parser.m_Data.m_nLastToken)
-            {
-                uint32 nT = Parser.m_Tokens[nCur++];
-                if (nT == eT_or)
-                {
-                    continue;
-                }
-                if (nT == eT_0)
-                {
-                    ColorWriteMask |= 0;
-                }
-                else
-                if (nT == eT_RED)
-                {
-                    ColorWriteMask |= 1;
-                }
-                else
-                if (nT == eT_GREEN)
-                {
-                    ColorWriteMask |= 2;
-                }
-                else
-                if (nT == eT_BLUE)
-                {
-                    ColorWriteMask |= 4;
-                }
-                else
-                if (nT == eT_ALPHA)
-                {
-                    ColorWriteMask |= 8;
-                }
-                else
-                {
-                    Warning("unknown WriteMask parameter '%s' (Skipping)\n", Parser.GetString(eT));
-                }
-            }
-        }
-        break;
-        case eT_ZFunc:
-            ZFunc = Parser.GetCompareFunc(Parser.GetToken(Parser.m_Data));
-            sm->m_PassFlags |= SHPF_FORCEZFUNC;
-            break;
-        case eT_AlphaRef:
-            AlphaRef = Parser.GetInt(Parser.GetToken(Parser.m_Data));
-            break;
-        case eT_SrcBlend:
-            eSrcBlend = Parser.GetToken(Parser.m_Data);
-            break;
-        case eT_DestBlend:
-            eDstBlend = Parser.GetToken(Parser.m_Data);
-            break;
-        case eT_AlphaBlendEnable:
-            bBlend = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_IgnoreMaterialState:
-            sm->m_PassFlags |= SHPF_NOMATSTATE;
-            break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    if (bBlend && eSrcBlend && eDstBlend)
-    {
-        int nSrc = Parser.GetSrcBlend(eSrcBlend);
-        int nDst = Parser.GetDstBlend(eDstBlend);
-        if (nSrc >= 0 && nDst >= 0)
-        {
-            State |= nSrc;
-            State |= nDst;
-        }
-    }
-    if (ColorWriteMask != 0xff)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            if (!(ColorWriteMask & (1 << i)))
-            {
-                State |= GS_NOCOLMASK_R << i;
-            }
-        }
-    }
-
-    if (AlphaFunc)
-    {
-        switch (AlphaFunc)
-        {
-        case eCF_Greater:
-            State |= GS_ALPHATEST_GREATER;
-            break;
-        case eCF_GEqual:
-            State |= GS_ALPHATEST_GEQUAL;
-            break;
-        case eCF_Less:
-            State |= GS_ALPHATEST_LESS;
-            break;
-        case eCF_LEqual:
-            State |= GS_ALPHATEST_LEQUAL;
-            break;
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    switch (ZFunc)
-    {
-    case eCF_Equal:
-        State |= GS_DEPTHFUNC_EQUAL;
-        break;
-    case eCF_Greater:
-        State |= GS_DEPTHFUNC_GREAT;
-        break;
-    case eCF_GEqual:
-        State |= GS_DEPTHFUNC_GEQUAL;
-        break;
-    case eCF_Less:
-        State |= GS_DEPTHFUNC_LESS;
-        break;
-    case eCF_NotEqual:
-        State |= GS_DEPTHFUNC_NOTEQUAL;
-        break;
-    case eCF_LEqual:
-        State |= GS_DEPTHFUNC_LEQUAL;
-        break;
-    case eCF_Always:
-        State |= GS_DEPTHFUNC_ALWAYS;
-        break;
-    default:
-        CRY_ASSERT(0);
-    }
-
-    sm->m_RenderState = State;
-    sm->m_eCull = Cull;
-
-    mfGeneratePublicFXParams(Parser.m_pCurShader, Parser);
-    SShaderFXParams& FXParams = mfGetFXParams(Parser.m_pCurShader);
-
-    if (!VS.IsEmpty())
-    {
-        bRes &= ParseBinFX_Technique_Pass_LoadShader(Parser, VSMacro, VS, pShTech, sm, eHWSC_Vertex, FXParams);
-    }
-    if (!PS.IsEmpty())
-    {
-        bRes &= ParseBinFX_Technique_Pass_LoadShader(Parser, PSMacro, PS, pShTech, sm, eHWSC_Pixel, FXParams);
-    }
-    if (CParserBin::PlatformSupportsGeometryShaders() && !GS.IsEmpty())
-    {
-        bRes &= ParseBinFX_Technique_Pass_LoadShader(Parser, GSMacro, GS, pShTech, sm, eHWSC_Geometry, FXParams);
-    }
-    if (CParserBin::PlatformSupportsHullShaders() && !HS.IsEmpty())
-    {
-        bRes &= ParseBinFX_Technique_Pass_LoadShader(Parser, HSMacro, HS, pShTech, sm, eHWSC_Hull, FXParams);
-    }
-    if (CParserBin::PlatformSupportsDomainShaders() && !DS.IsEmpty())
-    {
-        bRes &= ParseBinFX_Technique_Pass_LoadShader(Parser, DSMacro, DS, pShTech, sm, eHWSC_Domain, FXParams);
-    }
-    if (CParserBin::PlatformSupportsComputeShaders() && !CS.IsEmpty())
-    {
-        bRes &= ParseBinFX_Technique_Pass_LoadShader(Parser, CSMacro, CS, pShTech, sm, eHWSC_Compute, FXParams);
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_LightStyle_Val(CParserBin& Parser, SParserFrame& Frame, CLightStyle* ls)
-{
-    int i;
-    char str[64];
-    const char* pstr1, * pstr2;
-    SLightStyleKeyFrame pKeyFrame;
-
-    ls->m_Map.Free();
-    string sr = Parser.GetString(Frame);
-    const char* lstr = sr.c_str();
-
-    // First count the keyframes
-    size_t nKeyFrames = 0;
-    while (true)
-    {
-        pstr1 = strchr(lstr, '|');
-        if (!pstr1)
-        {
-            break;
-        }
-        pstr2 = strchr(pstr1 + 1, '|');
-        if (!pstr2)
-        {
-            break;
-        }
-        if (pstr2 - pstr1 - 1 > 0)
-        {
-            ++nKeyFrames;
-        }
-        lstr = pstr2;
-    }
-    ls->m_Map.reserve(nKeyFrames);
-
-    lstr = sr.c_str();
-    int n = 0;
-    while (true)
-    {
-        pstr1 = strchr(lstr, '|');
-        if (!pstr1)
-        {
-            break;
-        }
-        pstr2 = strchr(pstr1 + 1, '|');
-        if (!pstr2)
-        {
-            break;
-        }
-        if (pstr2 - pstr1 - 1 > 0)
-        {
-            azstrncpy(str, AZ_ARRAY_SIZE(str), pstr1 + 1, pstr2 - pstr1 - 1);
-            str[pstr2 - pstr1 - 1] = 0;
-            i = azsscanf(str, "%f %f %f %f %f %f %f", &pKeyFrame.cColor.r, &pKeyFrame.cColor.g, &pKeyFrame.cColor.b, &pKeyFrame.cColor.a,
-                    &pKeyFrame.vPosOffset.x, &pKeyFrame.vPosOffset.y, &pKeyFrame.vPosOffset.z);
-            switch (i)
-            {
-            case 1:
-            {
-                // Only luminance updates
-                pKeyFrame.cColor.g = pKeyFrame.cColor.b = pKeyFrame.cColor.r;
-                pKeyFrame.cColor.a = 1.0f;
-                pKeyFrame.vPosOffset = Vec3(0);
-            }
-            break;
-
-            case 3:
-            {
-                // No position/spec mult updates
-                pKeyFrame.cColor.a = 1.0f;
-                pKeyFrame.vPosOffset = Vec3(0);
-            }
-            break;
-
-            case 4:
-            {
-                // No position
-                pKeyFrame.vPosOffset = Vec3(0);
-            }
-            break;
-
-            default:
-                break;
-            }
-            ls->m_Map.AddElem(pKeyFrame);
-            n++;
-        }
-
-        lstr = pstr2;
-    }
-    ls->m_Map.Shrink();
-    CRY_ASSERT(ls->m_Map.Num() == n);
-    if (ls->m_Map.Num() == n)
-    {
-        return true;
-    }
-    return false;
-}
-
-bool CShaderManBin::ParseBinFX_LightStyle(CParserBin& Parser, SParserFrame& Frame, int nStyle)
-{
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(KeyFrameParams)
-    FX_TOKEN(KeyFrameRandColor)
-    FX_TOKEN(KeyFrameRandIntensity)
-    FX_TOKEN(KeyFrameRandSpecMult)
-    FX_TOKEN(KeyFrameRandPosOffset)
-    FX_TOKEN(Speed)
-    FX_END_TOKENS
-
-    bool bRes = true;
-
-    Parser.m_pCurShader->m_Flags |= EF_LIGHTSTYLE;
-    if (CLightStyle::s_LStyles.Num() <= (uint32)nStyle)
-    {
-        CLightStyle::s_LStyles.ReserveNew(nStyle + 1);
-    }
-    CLightStyle* ls = CLightStyle::s_LStyles[nStyle];
-    if (!ls)
-    {
-        ls = new CLightStyle;
-        ls->m_LastTime = 0;
-        ls->m_Color = Col_White;
-        CLightStyle::s_LStyles[nStyle] = ls;
-    }
-    ls->m_TimeIncr = 60;
-    int nIndex;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_KeyFrameRandColor:
-            ls->m_bRandColor = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_KeyFrameRandIntensity:
-            ls->m_bRandIntensity = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_KeyFrameRandSpecMult:
-            ls->m_bRandSpecMult = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_KeyFrameRandPosOffset:
-            ls->m_bRandPosOffset = Parser.GetBool(Parser.m_Data);
-            break;
-
-        case eT_KeyFrameParams:
-            bRes &= ParseBinFX_LightStyle_Val(Parser, Parser.m_Data, ls);
-            break;
-
-        case eT_Speed:
-            ls->m_TimeIncr = Parser.GetFloat(Parser.m_Data);
-            break;
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    if (ls->m_Map.Num() && (ls->m_bRandPosOffset || ls->m_bRandIntensity || ls->m_bRandSpecMult || ls->m_bRandColor))
-    {
-        int32 nCount = ls->m_Map.Num();
-        for (int f = 0; f < nCount; ++f)
-        {
-            SLightStyleKeyFrame& pKeyFrame = ls->m_Map[f];
-            if (ls->m_bRandPosOffset)
-            {
-                pKeyFrame.vPosOffset = Vec3(cry_random(-1.0f, 1.0f), cry_random(-1.0f, 1.0f), cry_random(-1.0f, 1.0f));
-            }
-
-            if (ls->m_bRandColor)
-            {
-                pKeyFrame.cColor *= ColorF(cry_random(0.0f, 1.0f), cry_random(0.0f, 1.0f), cry_random(0.0f, 1.0f), 1.0f);
-            }
-
-            if (ls->m_bRandIntensity)
-            {
-                pKeyFrame.cColor *= cry_random(0.0f, 1.0f);
-            }
-
-            if (ls->m_bRandSpecMult)
-            {
-                pKeyFrame.cColor.a = cry_random(0.0f, 1.0f);
-            }
-        }
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Technique_Annotations_String(CParserBin& Parser, SParserFrame& Frame, SShaderTechnique* pShTech, std::vector<SShaderTechParseParams>& techParams, bool* bPublic)
-{
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(Public)
-    FX_TOKEN(NoLights)
-    FX_TOKEN(NoMaterialState)
-    FX_TOKEN(PositionInvariant)
-    FX_TOKEN(TechniqueZ)
-    FX_TOKEN(TechniqueZPrepass)
-    FX_TOKEN(TechniqueShadowGen)
-    FX_TOKEN(TechniqueMotionBlur)
-    FX_TOKEN(TechniqueCustomRender)
-    FX_TOKEN(TechniqueEffectLayer)
-    FX_TOKEN(TechniqueDebug)
-    FX_TOKEN(TechniqueSoftAlphaTest)
-    FX_TOKEN(TechniqueWaterRefl)
-    FX_TOKEN(TechniqueWaterCaustic)
-    FX_TOKEN(TechniqueThickness)
-    FX_END_TOKENS
-
-    bool bRes = true;
-    int nIndex;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_Public:
-            if (pShTech)
-            {
-                pShTech->m_Flags |= FHF_PUBLIC;
-            }
-            else
-            if (bPublic)
-            {
-                *bPublic = true;
-            }
-            break;
-
-        case eT_PositionInvariant:
-            if (pShTech)
-            {
-                pShTech->m_Flags |= FHF_POSITION_INVARIANT;
-            }
-            break;
-
-        case eT_NoLights:
-            if (pShTech)
-            {
-                pShTech->m_Flags |= FHF_NOLIGHTS;
-            }
-            break;
-
-        case eT_NoMaterialState:
-            if (Parser.m_pCurShader)
-            {
-                Parser.m_pCurShader->m_Flags2 |= EF2_IGNORERESOURCESTATES;
-            }
-            break;
-
-        // Note: When adding/removing batch flags, please, update sDescList in D3DRendPipeline.cpp
-        case eT_TechniqueDebug:
-        {
-        }
-
-        case eT_TechniqueZ:
-        case eT_TechniqueZPrepass:
-        case eT_TechniqueShadowGen:
-        case eT_TechniqueMotionBlur:
-        case eT_TechniqueCustomRender:
-        case eT_TechniqueEffectLayer:
-        case eT_TechniqueSoftAlphaTest:
-        case eT_TechniqueWaterRefl:
-        case eT_TechniqueWaterCaustic:
-        case eT_TechniqueThickness:
-        {
-            if (!Parser.m_pCurShader)
-            {
-                break;
-            }
-
-            static const uint32 pTechTable[eT_TechniqueMax - eT_TechniqueZ] =
-            {
-                TTYPE_Z,                                            //eT_TechniqueZ
-                TTYPE_SHADOWGEN,                            //eT_TechniqueShadowGen
-                TTYPE_MOTIONBLURPASS,                   //eT_TechniqueMotionBlur
-                TTYPE_CUSTOMRENDERPASS,             //eT_TechniqueCustomRender
-                TTYPE_EFFECTLAYER,                      //eT_TechniqueEffectLayer
-                TTYPE_DEBUG,                                    //eT_TechniqueDebug
-                TTYPE_SOFTALPHATESTPASS,            //eT_TechniqueSoftAlphaTest
-                TTYPE_WATERREFLPASS,                        //eT_TechniqueWaterRefl
-                TTYPE_WATERCAUSTICPASS,                 //eT_TechniqueWaterCaustic
-                TTYPE_ZPREPASS,                                 //eT_TechniqueZPrepass
-                TTYPE_PARTICLESTHICKNESSPASS         //eT_TechniqueThickness
-            };
-
-            const CCryNameR pszNameTech = Parser.GetNameString(Parser.m_Data);
-            int idx = techParams.size() - 1;
-            CRY_ASSERT(idx >= 0);
-            CRY_ASSERT(eT - eT_TechniqueZ >= 0);
-            techParams[idx].techName[ pTechTable[eT - eT_TechniqueZ] ] = pszNameTech;
-        }
-        break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Technique_Annotations(CParserBin& Parser, SParserFrame& Frame, SShaderTechnique* pShTech, std::vector<SShaderTechParseParams>& techParams, bool* bPublic)
-{
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(string)
-    FX_END_TOKENS
-
-    bool bRes = true;
-    int nIndex;
-
-    while (Parser.ParseObject(sCommands, nIndex))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_string:
-        {
-            eT = Parser.GetToken(Parser.m_Name);
-            CRY_ASSERT(eT == eT_Script);
-            bRes &= ParseBinFX_Technique_Annotations_String(Parser, Parser.m_Data, pShTech, techParams, bPublic);
-        }
-        break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return bRes;
-}
-
-bool CShaderManBin::ParseBinFX_Technique_CustomRE(CParserBin& Parser, SParserFrame& Frame, SParserFrame& Name, SShaderTechnique* pShTech)
-{
-    uint32 nName = Parser.GetToken(Name);
-
-    if (nName == eT_LensOptics)
-    {
-        CRELensOptics* ps = new CRELensOptics;
-        if (ps->mfCompile(Parser, Frame))
-        {
-            pShTech->m_REs.AddElem(ps);
-            pShTech->m_Flags |= FHF_RE_LENSOPTICS;
-            return true;
-        }
-        else
-        {
-            delete ps;
-        }
-    }
-#if 0
-    else
-    if (nName == eT_Cloud)
-    {
-        CRECloud* ps = new CRECloud;
-        if (ps->mfCompile(Parser, Frame))
-        {
-            pShTech->m_REs.AddElem(ps);
-            pShTech->m_Flags |= FHF_RE_CLOUD;
-            return true;
-        }
-        else
-        {
-            delete ps;
-        }
-    }
-#endif
-    else
-    if (nName == eT_Beam)
-    {
-        CREBeam* ps = new CREBeam;
-        if (ps->mfCompile(Parser, Frame))
-        {
-            pShTech->m_REs.AddElem(ps);
-        }
-        else
-        {
-            delete ps;
-        }
-    }
-    else
-    if (nName == eT_Ocean)
-    {
-        CRY_ASSERT(0);
-    }
-
-    return true;
-}
-
-SShaderTechnique* CShaderManBin::ParseBinFX_Technique(CParserBin& Parser, SParserFrame& Frame, SParserFrame Annotations, std::vector<SShaderTechParseParams>& techParams, bool* bPublic)
-{
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-
-    SParserFrame OldFrame = Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(pass)
-    FX_TOKEN(CustomRE)
-    FX_TOKEN(Style)
-    FX_END_TOKENS
-
-    bool bRes = true;
-    SShaderTechnique* pShTech = NULL;
-    if (Parser.m_pCurShader)
-    {
-        pShTech = new SShaderTechnique(Parser.m_pCurShader);
-    }
-
-    if (Parser.m_pCurShader)
-    {
-        SShaderTechParseParams ps;
-        techParams.push_back(ps);
-    }
-
-    if (!Annotations.IsEmpty())
-    {
-        ParseBinFX_Technique_Annotations(Parser, Annotations, pShTech, techParams, bPublic);
-    }
-
-    while (Parser.ParseObject(sCommands))
-    {
-        EToken eT = Parser.GetToken();
-        switch (eT)
-        {
-        case eT_pass:
-            if (pShTech)
-            {
-                bRes &= ParseBinFX_Technique_Pass(Parser, Parser.m_Data, pShTech);
-            }
-            break;
-
-        case eT_Style:
-            if (pShTech)
-            {
-                ParseBinFX_LightStyle(Parser, Parser.m_Data, Parser.GetInt(Parser.GetToken(Parser.m_Name)));
-            }
-            break;
-
-        case eT_CustomRE:
-            if (pShTech)
-            {
-                bRes &= ParseBinFX_Technique_CustomRE(Parser, Parser.m_Data, Parser.m_Name, pShTech);
-            }
-            break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-    }
-
-    if (bRes)
-    {
-        if (Parser.m_pCurShader && pShTech)
-        {
-            Parser.m_pCurShader->m_HWTechniques.AddElem(pShTech);
-        }
-    }
-    else
-    {
-        techParams.pop_back();
-    }
-
-    Parser.EndFrame(OldFrame);
-
-    return pShTech;
-}
-
-float g_fTimeA;
-
-bool CShaderManBin::ParseBinFX(SShaderBin* pBin, CShader* ef, uint64 nMaskGen)
-{
-    LOADING_TIME_PROFILE_SECTION_ARGS(pBin->m_szName);
-
-    bool bRes = true;
-
-    float fTimeA = iTimer->GetAsyncCurTime();
-
-#if !defined(SHADER_NO_SOURCES)
-    CParserBin Parser(pBin, ef);
-
-    CShader* efGen = ef->m_pGenShader;
-
-    if (efGen && efGen->m_ShaderGenParams)
-    {
-        AddGenMacroses(efGen->m_ShaderGenParams, Parser, nMaskGen);
-    }
-
-    if (ef->m_ShaderGenStaticParams)
-    {
-        // Just add the defines and not the masks because they could clash with the gen params masks.
-        AddGenMacroses(ef->m_ShaderGenStaticParams, Parser, ef->m_maskGenStatic, true);
-    }
-
-    pBin->Lock();
-    Parser.Preprocess(0, pBin->m_Tokens, &pBin->m_TokenTable);
-    ef->m_CRC32 = pBin->m_CRC32;
-    ef->m_SourceCRC32 = pBin->m_SourceCRC32;
-    pBin->Unlock();
-#endif
-
-#if defined(SHADER_NO_SOURCES)
-    iLog->LogError("ERROR: Couldn't find binary shader '%s' (0x%x)", ef->GetName(), ef->m_nMaskGenFX);
-    return false;
-#else
-    SParserFrame Frame(0, (Parser.m_Tokens.size() > 0 ? Parser.m_Tokens.size() - 1 : 0));
-    Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-    FX_TOKEN(static)
-    FX_TOKEN(half)
-    FX_TOKEN(half2)
-    FX_TOKEN(half3)
-    FX_TOKEN(half4)
-    FX_TOKEN(half2x4)
-    FX_TOKEN(half3x4)
-    FX_TOKEN(half4x4)
-    FX_TOKEN(float)
-    FX_TOKEN(float2)
-    FX_TOKEN(float3)
-    FX_TOKEN(float4)
-    FX_TOKEN(float2x4)
-    FX_TOKEN(float3x4)
-    FX_TOKEN(float4x4)
-    FX_TOKEN(bool)
-    FX_TOKEN(int)
-    FX_TOKEN(struct)
-    FX_TOKEN(sampler1D)
-    FX_TOKEN(sampler2D)
-    FX_TOKEN(sampler3D)
-    FX_TOKEN(samplerCUBE)
-    FX_TOKEN(Texture2D)
-    FX_TOKEN(RWTexture2D)
-    FX_TOKEN(RWTexture2DArray)
-    FX_TOKEN(Texture2DArray)
-    FX_TOKEN(Texture2DMS)
-    FX_TOKEN(TextureCube)
-    FX_TOKEN(TextureCubeArray)
-    FX_TOKEN(Texture3D)
-    FX_TOKEN(RWTexture3D)
-    FX_TOKEN(technique)
-    FX_TOKEN(SamplerState)
-    FX_TOKEN(SamplerComparisonState)
-    FX_TOKEN(Buffer)
-    FX_TOKEN(RWBuffer)
-    FX_TOKEN(StructuredBuffer)
-    FX_TOKEN(RWStructuredBuffer)
-    FX_TOKEN(ByteAddressBuffer)
-    FX_TOKEN(RWByteAddressBuffer)
-    FX_TOKEN(cbuffer)
-    FX_TOKEN(RasterizerOrderedBuffer)
-    FX_TOKEN(RasterizerOrderedByteAddressBuffer)
-    FX_TOKEN(RasterizerOrderedStructuredBuffer)
-    FX_END_TOKENS
-
-    std::vector<SShaderTechParseParams> techParams;
-    CCryNameR techStart[2];
-
-    // From MemReplay analysis of shader params, 200 should be more than enough space
-    static decltype(SShaderFXParams::m_FXParams) s_tempFXParams;
-    s_tempFXParams.reserve(200);
-    s_tempFXParams.clear();
-
-    SShaderFXParams& FXP = mfGetFXParams(Parser.m_pCurShader);
-    FXP.m_FXParams.swap(s_tempFXParams);
-
-    ef->mfFree();
-
-    assert (ef->m_HWTechniques.Num() == 0);
-
-    ETokenStorageClass nTokenStorageClass = Parser.ParseObject(sCommands);
-    while (nTokenStorageClass)
-    {
-        EToken eT = Parser.GetToken();
-        SCodeFragment Fr;
-        SFXParam P;
-        string szR;
-        switch (eT)
-        {
-        case eT_struct:
-        case eT_cbuffer:
-            Fr.m_nFirstToken = Parser.FirstToken();
-            Fr.m_nLastToken = Parser.m_CurFrame.m_nCurToken - 1;
-            Fr.m_dwName = Parser.m_Tokens[Fr.m_nFirstToken + 1];
-#ifdef _DEBUG
-            //Fr.m_Name = Parser.GetString(Fr.m_dwName);
-#endif
-            Fr.m_eType = (eT == eT_cbuffer) ? eFT_ConstBuffer : eFT_Structure;
-            Parser.m_CodeFragments.push_back(Fr);
-            break;
-
-        case eT_SamplerState:
-        case eT_SamplerComparisonState:
-        {
-            SFXSampler Pr;
-            Parser.CopyTokens(Parser.m_Name, Pr.m_dwName);
-            if (eT == eT_SamplerState)
-            {
-                Pr.m_eType = eSType_Sampler;
-            }
-            else
-            if (eT == eT_SamplerComparisonState)
-            {
-                Pr.m_eType = eSType_SamplerComp;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-            }
-
-            uint32 nTokAssign = 0;
-            if (Parser.m_Assign.IsEmpty() && !Parser.m_Value.IsEmpty())
-            {
-                nTokAssign = Parser.m_Tokens[Parser.m_Value.m_nFirstToken];
-                if (nTokAssign == eT_br_cv_1)
-                {
-                    nTokAssign = Parser.m_Tokens[Parser.m_Value.m_nFirstToken + 1];
-                }
-            }
-            else
-            if (!Parser.m_Assign.IsEmpty())
-            {
-                nTokAssign = Parser.m_Tokens[Parser.m_Assign.m_nFirstToken];
-            }
-            Pr.PostLoad(Parser, Parser.m_Name, Parser.m_Annotations, Parser.m_Value, Parser.m_Assign);
-
-            bRes &= ParseBinFX_Sampler(Parser, Parser.m_Data, Pr);
-
-            mfAddFXSampler(Parser.m_pCurShader, &Pr);
-        }
-        break;
-
-        case eT_Texture2D:
-        case eT_Texture2DMS:
-        case eT_Texture2DArray:
-        case eT_TextureCube:
-        case eT_TextureCubeArray:
-        case eT_Texture3D:
-        {
-            SFXTexture Pr;
-            Parser.CopyTokens(Parser.m_Name, Pr.m_dwName);
-
-            if (eT == eT_Texture2D)
-            {
-                Pr.m_eType = eTT_2D;
-            }
-            else
-            if (eT == eT_Texture2DMS)
-            {
-                Pr.m_eType = eTT_2DMS;
-            }
-            else
-            if (eT == eT_Texture2DArray)
-            {
-                Pr.m_eType = eTT_2DArray;
-            }
-            else
-            if (eT == eT_Texture3D)
-            {
-                Pr.m_eType = eTT_3D;
-            }
-            else
-            if (eT == eT_TextureCube)
-            {
-                Pr.m_eType = eTT_Cube;
-            }
-            else
-            if (eT == eT_TextureCubeArray)
-            {
-                Pr.m_eType = eTT_CubeArray;
-            }
-            else
-            {
-                CRY_ASSERT(0);
-            }
-
-            Pr.PostLoad(Parser, Parser.m_Name, Parser.m_Annotations, Parser.m_Value, Parser.m_Assign);
-
-            bRes &= ParseBinFX_Texture(Parser, Parser.m_Data, Pr);
-            bRes &= ParseBinFX_Texture(Parser, Parser.m_Annotations, Pr);
-
-            // Texture2D something = TS_identifiersearch;
-            if (!azstrnicmp(Pr.m_Values.c_str(), "TM_", 3) ||
-                !azstrnicmp(Pr.m_Values.c_str(), "TS_", 3) ||
-                !azstrnicmp(Pr.m_Values.c_str(), "TP_", 3))
-            {
-                Pr.m_Semantic = Pr.m_Values;
-                Pr.m_szTexture = "";
-                Pr.m_Values = "";
-            }
-
-            // Texture2D something = "filepathsearch";
-            // Texture2D something = $databasesearch;
-            if (Pr.m_Values.c_str()[0])
-            {
-                Pr.m_Semantic = "";
-                Pr.m_szTexture = Pr.m_Values.c_str();
-                Pr.m_Values = "";
-            }
-
-            mfAddFXTexture(Parser.m_pCurShader, &Pr);
-        }
-        break;
-
-        case eT_int:
-        case eT_bool:
-        case eT_half:
-        case eT_half2:
-        case eT_half3:
-        case eT_half4:
-        case eT_half2x4:
-        case eT_half3x4:
-        case eT_half4x4:
-        case eT_float:
-        case eT_float2:
-        case eT_float3:
-        case eT_float4:
-        case eT_float2x4:
-        case eT_float3x4:
-        case eT_float4x4:
-        {
-            SFXParam Pr;
-            Parser.CopyTokens(Parser.m_Name, Pr.m_dwName);
-
-            if (eT == eT_float2x4 || eT == eT_half2x4)
-            {
-                Pr.m_RegisterCount = 2;
-            }
-            else
-            if (eT == eT_float3x4 || eT == eT_half3x4)
-            {
-                Pr.m_RegisterCount = 3;
-            }
-            else
-            if (eT == eT_float4x4 || eT == eT_half4x4)
-            {
-                Pr.m_RegisterCount = 4;
-            }
-            else
-            {
-                Pr.m_RegisterCount = 1;
-            }
-
-            if (eT == eT_float || eT == eT_half || eT == eT_int || eT == eT_bool)
-            {
-                Pr.m_ComponentCount = 1;
-            }
-            else
-            if (eT == eT_float2 || eT == eT_half2)
-            {
-                Pr.m_ComponentCount = 2;
-            }
-            else
-            if (eT == eT_float3 || eT == eT_half3)
-            {
-                Pr.m_ComponentCount = 3;
-            }
-            else
-            if (eT == eT_float4 || eT == eT_float2x4 || eT == eT_float3x4 || eT == eT_float4x4 ||
-                eT == eT_half4 || eT == eT_half2x4 || eT == eT_half3x4 || eT == eT_half4x4)
-            {
-                Pr.m_ComponentCount = 4;
-            }
-
-            if (eT == eT_int)
-            {
-                Pr.m_eType = eType_INT;
-            }
-            else
-            if (eT == eT_bool)
-            {
-                Pr.m_eType = eType_BOOL;
-            }
-            else
-            if (eT >= eT_half && eT <= eT_half3x3)
-            {
-                Pr.m_eType = eType_HALF;
-            }
-            else
-            {
-                Pr.m_eType = eType_FLOAT;
-            }
-
-            if (!Parser.m_Assign.IsEmpty() && Parser.GetToken(Parser.m_Assign) == eT_STANDARDSGLOBAL)
-            {
-                ParseBinFX_Global(Parser, Parser.m_Annotations, NULL, techStart);
-            }
-            else
-            {
-                uint32 nTokAssign = 0;
-                if (Parser.m_Assign.IsEmpty() && !Parser.m_Value.IsEmpty())
-                {
-                    nTokAssign = Parser.m_Tokens[Parser.m_Value.m_nFirstToken];
-                    if (nTokAssign == eT_br_cv_1)
-                    {
-                        nTokAssign = Parser.m_Tokens[Parser.m_Value.m_nFirstToken + 1];
-                    }
-                }
-                else
-                if (!Parser.m_Assign.IsEmpty())
-                {
-                    nTokAssign = Parser.m_Tokens[Parser.m_Assign.m_nFirstToken];
-                }
-                if (nTokAssign)
-                {
-                    const char* assign = Parser.GetString(nTokAssign);
-                    if (!assign[0] || !_strnicmp(assign, "PB_", 3))
-                    {
-                        Pr.m_BindingSlot = eConstantBufferShaderSlot_PerBatch;
-                    }
-                    else
-                    if (!_strnicmp(assign, "PI_", 3) || !_strnicmp(assign, "SI_", 3))
-                    {
-                        Pr.m_BindingSlot = eConstantBufferShaderSlot_PerInstanceLegacy;
-                    }
-                    else
-                    if (!_strnicmp(assign, "PM_", 3))
-                    {
-                        Pr.m_BindingSlot = eConstantBufferShaderSlot_PerMaterial;
-                    }
-                    else
-                    if (!_strnicmp(assign, "register", 8))
-                    {
-                        Pr.m_BindingSlot = eConstantBufferShaderSlot_PerBatch;
-                    }
-                    else
-                    {
-                        Pr.m_BindingSlot = eConstantBufferShaderSlot_PerBatch;
-                    }
-                }
-                else
-                if (CParserBin::m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_JASPER | SF_GL4 | SF_GLES3 | SF_METAL))
-                {
-                    uint32 nTokName = Parser.GetToken(Parser.m_Name);
-                    const char* name = Parser.GetString(nTokName);
-                    if (!strncmp(name, "PI_", 3))
-                    {
-                        Pr.m_BindingSlot = eConstantBufferShaderSlot_PerInstanceLegacy;
-                    }
-                    else
-                    {
-                        Pr.m_BindingSlot = eConstantBufferShaderSlot_PerBatch;
-                    }
-                }
-
-                Pr.PostLoad(Parser, Parser.m_Name, Parser.m_Annotations, Parser.m_Value, Parser.m_Assign);
-
-                EParamType eType;
-                string szReg = Pr.GetValueForName("register", eType);
-                if (!szReg.empty())
-                {
-                    CRY_ASSERT(szReg[0] == 'c');
-                    Pr.m_Register[eHWSC_Vertex] = atoi(&szReg[1]);
-                    Pr.m_Register[eHWSC_Pixel] = Pr.m_Register[eHWSC_Vertex];
-
-                    if (CParserBin::PlatformSupportsGeometryShaders())
-                    {
-                        Pr.m_Register[eHWSC_Geometry] = Pr.m_Register[eHWSC_Vertex];
-                    }
-                    if (CParserBin::PlatformSupportsDomainShaders())
-                    {
-                        Pr.m_Register[eHWSC_Domain] = Pr.m_Register[eHWSC_Vertex];
-                    }
-                }
-                uint32 prFlags = Pr.GetFlags();
-                if (prFlags & PF_TWEAKABLE_MASK)
-                {
-                    Pr.m_BindingSlot = eConstantBufferShaderSlot_PerMaterial;
-                    CRY_ASSERT(prFlags & PF_CUSTOM_BINDED);
-                }
-                mfAddFXParam(Parser.m_pCurShader, &Pr);
-            }
-        }
-        break;
-
-        case eT_sampler1D:
-        case eT_sampler2D:
-        case eT_sampler3D:
-        case eT_samplerCUBE:
-        {
-            Fr.m_nFirstToken = Parser.FirstToken();
-
-            uint32 nTokenOffset = 1;
-
-            // For DX11 style texture definitions, need to parse out templated type. Also unlike HLSL we *require* it.
-            if (eT == eT_Texture2DMS || eT == eT_Texture2D || eT == eT_Texture2DArray || eT == eT_TextureCube || eT == eT_TextureCubeArray || eT == eT_Texture3D)
-            {
-                // Texture2DMS is particular case, requires (at minimum) type to be specified - parse Texture2DMS<type> tokens
-                // Texture2D for typeless resources, is also a particular case, type has to explicitly be specified - parse Texture2D<type> tokens
-                nTokenOffset = 4;
-
-                if (Parser.m_Tokens[Fr.m_nFirstToken + 1] != eT_br_tr_1 ||        // <
-                    Parser.m_Tokens[Fr.m_nFirstToken + 3] != eT_br_tr_2)          // >
-                {
-                    // Parser.m_Tokens[Fr.m_nFirstToken + 2] is the templated type, e.g. float4
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR_DBGBRK, "[SHADERS] FAILED TO PARSE '%s': Invalid Texture definition without templated type:", ef->GetName());
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR_DBGBRK, "[SHADERS] %s %s %s %s"
-                        , Parser.GetString(Parser.m_Tokens[Fr.m_nFirstToken])
-                        , Parser.GetString(Parser.m_Tokens[Fr.m_nFirstToken + 1])
-                        , Parser.GetString(Parser.m_Tokens[Fr.m_nFirstToken + 2])
-                        , Parser.GetString(Parser.m_Tokens[Fr.m_nFirstToken + 3])
-                        );
-                    break;
-                }
-            }
-
-            Fr.m_nLastToken = Fr.m_nFirstToken + nTokenOffset;
-            if (!Parser.m_Assign.IsEmpty())
-            {
-                Fr.m_nLastToken = Parser.m_Assign.m_nLastToken;
-            }
-            Fr.m_dwName = Parser.m_Tokens[Fr.m_nFirstToken + nTokenOffset];
-            Fr.m_eType = eFT_Sampler;
-            Parser.m_CodeFragments.push_back(Fr);
-
-            //// handy for debugging - do not remove plz
-            //const char *pszToken0 = Parser.GetString( Parser.m_Tokens[Fr.m_nFirstToken]  );
-            //const char *pszToken1 = Parser.GetString( Parser.m_Tokens[Fr.m_nFirstToken+1] );
-            //const char *pszToken2 = Parser.GetString( Parser.m_Tokens[Fr.m_nFirstToken+2] );
-
-            bRes &= ParseBinFX_Sampler(Parser, Parser.m_Data, Fr.m_dwName, Parser.m_Annotations, eT);
-        }
-        break;
-
-        case eT_Buffer:
-        case eT_RWBuffer:
-        case eT_StructuredBuffer:
-        case eT_RWStructuredBuffer:
-        case eT_ByteAddressBuffer:
-        case eT_RWByteAddressBuffer:
-        case eT_RWTexture2D:
-        case eT_RWTexture2DArray:
-        case eT_RWTexture3D:
-        case eT_RasterizerOrderedBuffer:
-        case eT_RasterizerOrderedByteAddressBuffer:
-        case eT_RasterizerOrderedStructuredBuffer:
-        {
-            Fr.m_nFirstToken = Parser.FirstToken();
-            Fr.m_nLastToken = Fr.m_nFirstToken + 1;
-            if (!Parser.m_Assign.IsEmpty())
-            {
-                Fr.m_nLastToken = Parser.m_Assign.m_nLastToken + 1;
-            }
-            Fr.m_dwName = Parser.m_Tokens[Parser.m_Name.m_nFirstToken];
-            Fr.m_eType = eFT_Structure;
-            Parser.m_CodeFragments.push_back(Fr);
-        }
-        break;
-
-        case eT_technique:
-        {
-            uint32 nToken = Parser.m_Tokens[Parser.m_Name.m_nFirstToken];
-            const char* szName = Parser.GetString(nToken);
-            SShaderTechnique* pShTech = ParseBinFX_Technique(Parser, Parser.m_Data, Parser.m_Annotations, techParams, NULL);
-            if (szName)
-            {
-                pShTech->m_NameStr = szName;
-                pShTech->m_NameCRC = szName;
-            }
-        }
-        break;
-
-        default:
-            //CRY_ASSERT(0);
-            break;
-        }
-
-        nTokenStorageClass = Parser.ParseObject(sCommands);
-    }
-
-    FXP.m_FXParams.swap(s_tempFXParams);
-    FXP.m_FXParams.reserve(FXP.m_FXParams.size() + s_tempFXParams.size());
-    FXP.m_FXParams.insert(FXP.m_FXParams.end(), s_tempFXParams.begin(), s_tempFXParams.end());
-
-    m_pCEF->mfPostLoadFX(ef, techParams, techStart);
-
-#if SHADER_REFLECT_TEXTURE_SLOTS
-    for (uint32 i = 0; i < min((uint32)TTYPE_MAX, ef->m_HWTechniques.size()); i++)
-    {
-        if (!ef->GetUsedTextureSlots(i))
-        {
-            ef->m_ShaderTexSlots[i] = GetTextureSlots(Parser, pBin, ef, i, -1);
-        }
-    }
-
-    for (uint32 i = 0; i < min((uint32)TTYPE_MAX, ef->m_HWTechniques.size()); i++)
-    {
-        if (ef->m_ShaderTexSlots[i])
-        {
-            SShaderTechParseParams* linkedTechs = &techParams[i];
-
-            // look through linked techniques (e.g. general has links to zpass, shadowgen, etc)
-            for (int j = 0; j < TTYPE_MAX; j++)
-            {
-                // if we have a linked technique
-                if (!linkedTechs->techName[j].empty())
-                {
-                    // find it in our technique list
-                    for (int k = 0; k < ef->m_HWTechniques.size(); k++)
-                    {
-                        if (linkedTechs->techName[j] == ef->m_HWTechniques[k]->m_NameStr)
-                        {
-                            // merge slots - any slots that are empty in the master will be filled with the overlay
-                            // This leaves the general/main technique authoratitve on slots, but stops slots disappearing
-                            // if they're still used in some sub-pass
-                            MergeTextureSlots(ef->m_ShaderTexSlots[i], ef->m_ShaderTexSlots[k]);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-#endif
-
-    g_fTimeA += iTimer->GetAsyncCurTime() - fTimeA;
-
-    return bRes;
-#endif
-}
-
-void CShaderManBin::MergeTextureSlots(SShaderTexSlots* master, SShaderTexSlots* overlay)
-{
-    if (!master || !overlay)
-    {
-        return;
-    }
- /* [Shader System] - TO DO: switch back to the map usage and replace with this
-    for (auto& iter : overlay->m_UsedTextureSlots)
-    {
-        auto    masterIter = master->m_UsedTextureSlots.find(iter->first);
-        if (masterIter == master->m_UsedTextureSlots.end()) // slot was not found - insert the overlay one
-        {
-            // these structures are never deleted so we can safely share pointers
-            // without ref counting. See below in GetTextureSlots for the allocation
-            master->m_UsedTextureSlots[iter->first] = iter->second;
-        }
-    }
-*/
-    // [Shader System] - TO DO - replace this part with code above after testing
-    for (int i = 0; i < EFTT_MAX; i++)
-    {
-        // these structures are never deleted so we can safely share pointers
-        // without ref counting. See below in GetTextureSlots for the allocation
-        if (master->m_UsedTextureSlots[i] == NULL && overlay->m_UsedTextureSlots[i] != NULL)
-        {
-            master->m_UsedTextureSlots[i] = overlay->m_UsedTextureSlots[i];
-        }
-    }
-}
-
-// [Shader System TO DO] - this methods needs to be either removed or become full data driven
-SShaderTexSlots* CShaderManBin::GetTextureSlots([[maybe_unused]] CParserBin& Parser, [[maybe_unused]] SShaderBin* pBin, [[maybe_unused]] CShader* ef, [[maybe_unused]] int nTech, int nPass)
-{
-#if !SHADER_REFLECT_TEXTURE_SLOTS
-    return NULL;
-#else
-    TArray<uint32> referencedSamplers;
-
-    bool bIterPasses    = false;
-    int nMaxPasses      = 1;
-
-    if (nPass == -1)
-    {
-        bIterPasses = true;
-        nPass = 0;
-    }
-
-    if (nTech < 0 || nPass < 0)
-    {
-        return NULL;
-    }
-
-    // if the technique's pixel shader exists
-    if (ef->m_HWTechniques.size() && nTech < ef->m_HWTechniques.size() &&
-        ef->m_HWTechniques[nTech]->m_Passes.size() && nPass < ef->m_HWTechniques[nTech]->m_Passes.size() &&
-        ef->m_HWTechniques[nTech]->m_Passes[nPass].m_PShader)
-    {
-        if (bIterPasses)
-        {
-            nMaxPasses = ef->m_HWTechniques[nTech]->m_Passes.size();
-        }
-
-        for (int nPassIter = nPass; nPassIter < nMaxPasses; nPassIter++)
-        {
-            uint32 dwEntryFuncName = Parser.GetCRC32(ef->m_HWTechniques[nTech]->m_Passes[nPassIter].m_PShader->m_EntryFunc);
-
-            // get the cached info for the entry func
-            SParamCacheInfo* pCache = GetParamInfo(pBin, dwEntryFuncName, ef->m_nMaskGenFX, ef->m_maskGenStatic);
-
-            if (pCache)
-            {
-                // loop over affected fragments from this entry func
-                SParamCacheInfo::AffectedFuncsVec& AffectedFragments = pCache->m_AffectedFuncs;
-                for (uint32 i = 0; i < AffectedFragments.size(); i++)
-                {
-                    SCodeFragment* s = &Parser.m_CodeFragments[AffectedFragments[i]];
-
-                    // if it's a sampler, include this sampler name CRC
-                    if (s->m_eType == eFT_Sampler)
-                    {
-                        referencedSamplers.AddElem(s->m_dwName);
-                    }
-                }
-            }
-            else
-            {
-                return NULL;
-            }
-        }
-    }
-    else
-    {
-        return NULL;
-    }
-
-    uint32 dependencySlots = 0;
-
-    // check the gen params
-    SShaderGen* genParams = ef->GetGenerationParams();
-    if (genParams)
-    {
-        for (uint32 i = 0; i < genParams->m_BitMask.Num(); i++)
-        {
-            SShaderGenBit* pBit = genParams->m_BitMask[i];
-            if (!pBit || (!pBit->m_nDependencySet && !pBit->m_nDependencyReset))
-            {
-                continue;
-            }
-
-            // if any dependency set/reset is allowed for a texture, we must be conservative
-            // and count this slot as used
-            uint32 setReset = pBit->m_nDependencySet | pBit->m_nDependencyReset;
-
-            // bitmask will fail if we have > 32 fixed texture slots
-            CRY_ASSERT(EFTT_MAX <= 32);
-
-            if (setReset & SHGD_TEX_MASK)
-            {
-                if (setReset & SHGD_TEX_NORMALS)
-                {
-                    dependencySlots |= 1 << EFTT_NORMALS;
-                }
-
-                if (setReset & SHGD_TEX_HEIGHT)
-                {
-                    dependencySlots |= 1 << EFTT_HEIGHT;
-                }
-
-                if (setReset & SHGD_TEX_DETAIL)
-                {
-                    dependencySlots |= 1 << EFTT_DETAIL_OVERLAY;
-                }
-
-                if (setReset & SHGD_TEX_SECOND_SMOOTHNESS)
-                {
-                    dependencySlots |= 1 << EFTT_SECOND_SMOOTHNESS;
-                }
-
-                if (setReset & SHGD_TEX_SPECULAR)
-                {
-                    dependencySlots |= 1 << EFTT_SPECULAR;
-                }
-
-                if (setReset & SHGD_TEX_ENVCM)
-                {
-                    dependencySlots |= 1 << EFTT_ENV;
-                }
-
-                if (setReset & SHGD_TEX_SUBSURFACE)
-                {
-                    dependencySlots |= 1 << EFTT_SUBSURFACE;
-                }
-
-                if (setReset & SHGD_TEX_DECAL)
-                {
-                    dependencySlots |= 1 << EFTT_DECAL_OVERLAY;
-                }
-
-                if (setReset & SHGD_TEX_CUSTOM)
-                {
-                    dependencySlots |= 1 << EFTT_CUSTOM;
-                }
-
-                if (setReset & SHGD_TEX_CUSTOM_SECONDARY)
-                {
-                    dependencySlots |= 1 << EFTT_CUSTOM_SECONDARY;
-                }
-
-                if (setReset & SHGD_TEX_OCC)
-                {
-                    dependencySlots |= 1 << EFTT_OCCLUSION;
-                }
-
-                if (setReset & SHGD_TEX_SPECULAR_2)
-                {
-                    dependencySlots |= 1 << EFTT_SPECULAR_2;
-                }
-
-                if (setReset & SHGD_TEX_EMITTANCE)
-                {
-                    // Both emittance and decal overlay (emissive intensity) are set by SHGD_TEX_EMITTANCE
-                    dependencySlots |= 1 << EFTT_EMITTANCE;
-                    dependencySlots |= 1 << EFTT_DECAL_OVERLAY;
-                }
-            }
-        }
-    }
-    else
-    {
-        return NULL;
-    }
-
-    // since we might find samplers referencing a slot more than once,
-    // keep track of the priority of each sampler found.
-    int namePriority[EFTT_MAX];     // [Shader System TO DO] - data driven please!
-    memset(namePriority, 0, sizeof(namePriority));
-
-    // deliberately 'leaking', these are kept around permanently (this info is only gathered in the editor),
-    // and cleaned up at shutdown when the app memory is released.
-    SShaderTexSlots*    pSlots = new SShaderTexSlots;
-
-    // Priority order:
-    // 0 = forced in because of the dependency set as above, can be overridden if we find a better sampler
-    // 1 = referenced from the shader but doesn't include a UIName
-    // 2 = includes a UIName but isn't directly referenced. In the case we've forced the sampler because of dependency,
-    //     this is probably more descriptive than a priority=1 sampler
-    // 3 = both from above, referenced and has UIName. We shouldn't find multiple samplers like this, shader samplers
-    //     should be set up so only ever one sampler using a slot has a UIName.
-    enum
-    {
-        PRIORITY_REFERENCED = 0x1, PRIORITY_HASUINAME = 0x2
-    };
-
-    SShaderFXParams& FXP = mfGetFXParams(ef);
-
-    // loop over all samplers for this shader
-    FXSamplersOldIt it = FXP.m_FXSamplersOld.begin();
-    FXSamplersOldIt end = FXP.m_FXSamplersOld.end();
-    for (; it != end; ++it)
-    {
-        int slot = it->m_nSlotId;
-
-        // if the slot is invalid this texture refers something else, skip it
-        if (slot == EFTT_MAX)   // [Shader System TO DO] - data driven
-        {
-            continue;
-        }
-
-        uint32 dwName = Parser.GetCRC32(it->m_szName);
-
-        // check if this sampler must be included for dependency set/reset reasons
-        bool dependency = (dependencySlots & (1 << slot)) > 0;
-
-        // check if this sampler is referenced from the shader
-        bool referenced = referencedSamplers.Find(dwName) >= 0;
-
-        if (dependency || referenced)
-        {
-            // calculate priority. See above.
-            int                     priority = (referenced ? PRIORITY_REFERENCED : 0) | (it->m_szUIName.length() ? PRIORITY_HASUINAME : 0);
-            SShaderTextureSlot*     pUsedTexSlot = pSlots->m_UsedTextureSlots[slot];
-
-            // if we don't have this slot filled yet, create a new slot
-            if (!pUsedTexSlot)
-            {
-                // !!IMPORTANT!! - if these slots are deleted/cleaned instead of being allowed to live forever,
-                // MAKE SURE you refcount or refactor MergeTextureSlots above - as it will share pointers.
-                pUsedTexSlot = new SShaderTextureSlot;
-
-                pUsedTexSlot->m_Name =  it->m_szUIName;
-                pUsedTexSlot->m_Description = it->m_szUIDescription;
-                pUsedTexSlot->m_TexType = it->m_eTexType;
-
-                // store current priority
-                namePriority[slot] = priority;
-                pSlots->m_UsedTextureSlots[slot] = pUsedTexSlot;   //  insertion to the map
-            }
-            else
-            {
-                // we shouldn't encounter two samplers that are used and have a UIName for the same slot,
-                // error in this case
-                if (priority == (PRIORITY_REFERENCED | PRIORITY_HASUINAME) && priority == namePriority[slot])
-                {
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Encountered two samplers with UINames referenced for same slot in shader '%s': '%s' and '%s'\n",
-                        ef->GetName(), pUsedTexSlot->m_Name.c_str(), it->m_szUIName.c_str());
-                    CRY_ASSERT(0);
-                }
-                // override if we have a higher priority
-                else if (priority > namePriority[slot])
-                {
-                    pUsedTexSlot->m_Name = it->m_szUIName;
-                    pUsedTexSlot->m_Description = it->m_szUIDescription;
-                    pUsedTexSlot->m_TexType = it->m_eTexType;
-
-                    namePriority[slot] = priority;
-                }
-            }
-        }
-    }
-
-    return pSlots;
-#endif
-}
-
-bool CShaderManBin::ParseBinFX_Dummy(SShaderBin* pBin, std::vector<string>& ShaderNames, const char* szName)
-{
-    bool bRes = true;
-    CParserBin Parser(pBin, NULL);
-
-    pBin->Lock();
-    bool preprocessResult = Parser.Preprocess(0, pBin->m_Tokens, &pBin->m_TokenTable);
-    pBin->Unlock();
-
-    if(!preprocessResult)
-    {
-        // Preprocess already outputs an error, no need to do so here.
-        return false;
-    }
-
-    SParserFrame Frame(0, Parser.m_Tokens.size() - 1);
-    Parser.BeginFrame(Frame);
-
-    FX_BEGIN_TOKENS
-        FX_TOKEN(static)
-    FX_TOKEN(half)
-    FX_TOKEN(half2)
-    FX_TOKEN(half3)
-    FX_TOKEN(half4)
-    FX_TOKEN(half2x4)
-    FX_TOKEN(half3x4)
-    FX_TOKEN(half4x4)
-    FX_TOKEN(float)
-    FX_TOKEN(float2)
-    FX_TOKEN(float3)
-    FX_TOKEN(float4)
-    FX_TOKEN(float2x4)
-    FX_TOKEN(float3x4)
-    FX_TOKEN(float4x4)
-    FX_TOKEN(bool)
-    FX_TOKEN(int)
-    FX_TOKEN(Buffer)
-    FX_TOKEN(RWBuffer)
-    FX_TOKEN(StructuredBuffer)
-    FX_TOKEN(RWStructuredBuffer)
-    FX_TOKEN(cbuffer)
-    FX_TOKEN(struct)
-    FX_TOKEN(sampler1D)
-    FX_TOKEN(sampler2D)
-    FX_TOKEN(sampler3D)
-    FX_TOKEN(samplerCUBE)
-    FX_TOKEN(technique)
-    FX_TOKEN(SamplerState)
-    FX_TOKEN(SamplerComparisonState)
-    FX_TOKEN(Texture2D)
-    FX_TOKEN(RWTexture2D)
-    FX_TOKEN(RWTexture2DArray)
-    FX_TOKEN(Texture2DArray)
-    FX_TOKEN(Texture2DMS)
-    FX_TOKEN(TextureCube)
-    FX_TOKEN(TextureCubeArray)
-    FX_TOKEN(Texture3D)
-    FX_TOKEN(RWTexture3D)
-    FX_TOKEN(RasterizerOrderedBuffer)
-    FX_TOKEN(RasterizerOrderedByteAddressBuffer)
-    FX_TOKEN(RasterizerOrderedStructuredBuffer)
-    FX_END_TOKENS
-
-    std::vector<SShaderTechParseParams> techParams;
-    CCryNameR techStart[2];
-    bool bPublic = false;
-    std::vector<string> PubTechniques;
-
-    ETokenStorageClass nTokenStorageClass;
-
-    nTokenStorageClass = Parser.ParseObject(sCommands);
-    while (nTokenStorageClass)
-    {
-        EToken eT = Parser.GetToken();
-        SCodeFragment Fr;
-        switch (eT)
-        {
-        case eT_half:
-        case eT_float:
-            if (!Parser.m_Assign.IsEmpty() && Parser.GetToken(Parser.m_Assign) == eT_STANDARDSGLOBAL)
-            {
-                ParseBinFX_Global(Parser, Parser.m_Annotations, &bPublic, techStart);
-            }
-            break;
-        case eT_Buffer:
-        case eT_RWBuffer:
-        case eT_StructuredBuffer:
-        case eT_RWStructuredBuffer:
-        case eT_cbuffer:
-        case eT_struct:
-        case eT_SamplerState:
-        case eT_SamplerComparisonState:
-        case eT_int:
-        case eT_bool:
-
-        case eT_half2:
-        case eT_half3:
-        case eT_half4:
-        case eT_half2x4:
-        case eT_half3x4:
-        case eT_half4x4:
-
-        case eT_float2:
-        case eT_float3:
-        case eT_float4:
-        case eT_float2x4:
-        case eT_float3x4:
-        case eT_float4x4:
-
-        case eT_Texture2D:
-        case eT_RWTexture2D:
-        case eT_Texture2DMS:
-        case eT_Texture2DArray:
-        case eT_RWTexture2DArray:
-        case eT_TextureCube:
-        case eT_TextureCubeArray:
-        case eT_Texture3D:
-        case eT_RWTexture3D:
-        case eT_sampler1D:
-        case eT_sampler2D:
-        case eT_sampler3D:
-        case eT_samplerCUBE:
-        case eT_RasterizerOrderedBuffer:
-        case eT_RasterizerOrderedByteAddressBuffer:
-        case eT_RasterizerOrderedStructuredBuffer:
-            break;
-
-        case eT_technique:
-        {
-            uint32 nToken = Parser.m_Tokens[Parser.m_Name.m_nFirstToken];
-            bool bPublicTechnique = false;
-            ParseBinFX_Technique(Parser, Parser.m_Data, Parser.m_Annotations, techParams, &bPublicTechnique);
-            if (bPublicTechnique)
-            {
-                const char* name = Parser.GetString(nToken);
-                PubTechniques.push_back(name);
-            }
-        }
-        break;
-
-        default:
-            CRY_ASSERT(0);
-        }
-        nTokenStorageClass = Parser.ParseObject(sCommands);
-    }
-
-    if (bPublic)
-    {
-        ShaderNames.push_back(szName);
-    }
-    if (PubTechniques.size())
-    {
-        uint32 i;
-        for (i = 0; i < PubTechniques.size(); i++)
-        {
-            string str = szName;
-            str += ".";
-            str += PubTechniques[i];
-            ShaderNames.push_back(str);
-        }
-    }
-
-    return bRes;
-}
-
-inline bool CompareInstParams(const SCGParam& a, const SCGParam& b)
-{
-    return (a.m_RegisterOffset < b.m_RegisterOffset);
-}
-
-void CShaderMan::mfPostLoadFX(CShader* ef, std::vector<SShaderTechParseParams>& techParams, [[maybe_unused]] CCryNameR techStart[2])
-{
-    ef->m_HWTechniques.Shrink();
-
-    uint32 i;
-
-    CRY_ASSERT(techParams.size() == ef->m_HWTechniques.Num());
-    for (i = 0; i < ef->m_HWTechniques.Num(); i++)
-    {
-        SShaderTechnique* hw = ef->m_HWTechniques[i];
-        SShaderTechParseParams* ps = &techParams[i];
-        uint32 n;
-        for (n = 0; n < TTYPE_MAX; n++)
-        {
-            if (ps->techName[n].c_str()[0])
-            {
-                if (hw->m_NameStr == ps->techName[n])
-                {
-                    iLog->LogWarning("WARN: technique '%s' refers to itself as the next technique (ignored)", hw->m_NameStr.c_str());
-                }
-                else
-                {
-                    uint32 j;
-                    for (j = 0; j < ef->m_HWTechniques.Num(); j++)
-                    {
-                        SShaderTechnique* hw2 = ef->m_HWTechniques[j];
-                        if (hw2->m_NameStr == ps->techName[n])
-                        {
-                            hw->m_nTechnique[n] = j;
-                            break;
-                        }
-                    }
-                    if (j == ef->m_HWTechniques.Num())
-                    {
-                        iLog->LogWarning("WARN: couldn't find technique '%s' in the sequence for technique '%s' (ignored)", ps->techName[n].c_str(), hw->m_NameStr.c_str());
-                    }
-                }
-            }
-        }
-
-        SShaderTechnique* hwZWrite = (hw->m_nTechnique[TTYPE_Z] >= 0) ? ef->m_HWTechniques[hw->m_nTechnique[TTYPE_Z]] : NULL;
-        hwZWrite = (hw->m_nTechnique[TTYPE_ZPREPASS] >= 0) ? ef->m_HWTechniques[hw->m_nTechnique[TTYPE_ZPREPASS]] : hwZWrite;
-        if (hwZWrite && hwZWrite->m_Passes.Num())
-        {
-            SShaderPass* pass = &hwZWrite->m_Passes[0];
-            if (pass->m_RenderState & GS_DEPTHWRITE)
-            {
-                hw->m_Flags |= FHF_WASZWRITE;
-            }
-        }
-
-        bool bTransparent = true;
-        for (uint32 j = 0; j < hw->m_Passes.Num(); j++)
-        {
-            SShaderPass* pass = &hw->m_Passes[j];
-            if (CParserBin::PlatformSupportsGeometryShaders() && pass->m_GShader)
-            {
-                hw->m_Flags |= FHF_USE_GEOMETRY_SHADER;
-            }
-            if (CParserBin::PlatformSupportsHullShaders() && pass->m_HShader)
-            {
-                hw->m_Flags |= FHF_USE_HULL_SHADER;
-            }
-            if (CParserBin::PlatformSupportsDomainShaders() && pass->m_DShader)
-            {
-                hw->m_Flags |= FHF_USE_DOMAIN_SHADER;
-            }
-            if (!(pass->m_RenderState & GS_BLEND_MASK))
-            {
-                bTransparent = false;
-            }
-        }
-        if (bTransparent)
-        {
-            hw->m_Flags |= FHF_TRANSPARENT;
-        }
-    }
-}
-
-//===========================================================================================
-
-void STexSamplerRT::Update()
-{
-    if (m_pAnimInfo && m_pAnimInfo->m_Time && gRenDev->m_bPauseTimer == 0)
-    {
-        CRY_ASSERT(gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime >= 0);
-        uint32 m = (uint32)(gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime / m_pAnimInfo->m_Time) % (m_pAnimInfo->m_NumAnimTexs);
-        CRY_ASSERT(m < (uint32)m_pAnimInfo->m_TexPics.Num());
-
-        if (m_pTex && (m_pTex != m_pAnimInfo->m_TexPics[m]))
-        {
-            m_pTex->Release();
-
-            m_pTex = m_pAnimInfo->m_TexPics[m];
-
-            m_pTex->AddRef();
-        }
-    }
-}
-
-void SFXParam::GetCompName(uint32 nId, CryFixedStringT<128>& name)
-{
-    if (nId < 0 || nId > 3)
-    {
-        name = "";
-        return;
-    }
-
-    char nm[16];
-    sprintf_s(nm, "__%d", nId);
-    const char* s = strstr(m_Name.c_str(), nm);
-
-    if (!s)
-    {
-        name = "";
-        return;
-    }
-
-    s += 3;
-
-    uint32 n;
-    for (n = 0; s[n] != 0; ++n)
-    {
-        if (s[n] <= 0x20 || (s[n] == '_' && s[n + 1] == '_'))
-        {
-            break;
-        }
-    }
-    name.append(s, n);
-}
-
-void SFXParam::GetParamComp(uint32 nOffset, CryFixedStringT<128>& param)
-{
-    const char* szValue = m_Values.c_str();
-
-    if (!szValue[0])
-    {
-        param = "";
-        return;
-    }
-
-    if (szValue[0] == '{')
-    {
-        ++szValue;
-    }
-
-    for (uint32 n = 0; n != nOffset; ++n)
-    {
-        while (szValue[0] != ',' && szValue[0] != ';' && szValue[0] != '}' && szValue[0] != 0)
-        {
-            ++szValue;
-        }
-
-        if (szValue[0] == ';' || szValue[0] == '}' || szValue[0] == 0)
-        {
-            param = "";
-            return;
-        }
-
-        ++szValue;
-    }
-
-    while (*szValue == ' ' || *szValue == 8)
-    {
-        ++szValue;
-    }
-
-    uint32 n;
-    for (n = 0; szValue[n] != 0; ++n)
-    {
-        if (szValue[n] == ',' || szValue[n] == ';' || szValue[n] == '}')
-        {
-            break;
-        }
-    }
-    param.append(szValue, n);
-}
-
-string SFXParam::GetValueForName(const char* szName, EParamType& eType)
-{
-    eType = eType_UNKNOWN;
-    if (m_Annotations.empty())
-    {
-        return "";
-    }
-
-    char buf[256];
-    char tok[128];
-    char* szA = (char*)m_Annotations.c_str();
-    SkipCharacters(&szA, kWhiteSpace);
-    while (true)
-    {
-        if (!fxFill(&szA, buf))
-        {
-            break;
-        }
-        char* b = buf;
-        fxFillPr(&b, tok);
-        eType = eType_UNKNOWN;
-        if (!azstricmp(tok, "string"))
-        {
-            eType = eType_STRING;
-        }
-        else
-        if (!azstricmp(tok, "float"))
-        {
-            eType = eType_FLOAT;
-        }
-        else
-        if (!azstricmp(tok, "half"))
-        {
-            eType = eType_HALF;
-        }
-
-        if (eType != eType_UNKNOWN)
-        {
-            if (!fxFillPr(&b, tok))
-            {
-                continue;
-            }
-            if (azstricmp(tok, szName))
-            {
-                continue;
-            }
-            SkipCharacters(&b, kWhiteSpace);
-            if (b[0] == '=')
-            {
-                b++;
-                if (!fxFillPrC(&b, tok))
-                {
-                    break;
-                }
-            }
-            return tok;
-        }
-        else
-        {
-            if (azstricmp(tok, szName))
-            {
-                continue;
-            }
-            eType = eType_STRING;
-            if (!fxFillPr(&b, tok))
-            {
-                continue;
-            }
-            if (tok[0] == '=')
-            {
-                if (!fxFillPr(&b, tok))
-                {
-                    break;
-                }
-            }
-            return tok;
-        }
-    }
-
-    return "";
-}
-
-const char* CShaderMan::mfParseFX_Parameter (const string& script, EParamType eType, const char* szName)
-{
-    static char sRet[128];
-    int nLen = script.length();
-    char* pTemp = new char [nLen + 1];
-    azstrcpy(pTemp, nLen + 1, script.c_str());
-    sRet[0] = 0;
-    char* buf = pTemp;
-
-    char* name;
-    long cmd;
-    char* data;
-
-    enum
-    {
-        eString = 1
-    };
-
-    static STokenDesc commands[] =
-    {
-        {eString, "String"},
-
-        {0, 0}
-    };
-
-    while ((cmd = shGetObject (&buf, commands, &name, &data)) > 0)
-    {
-        switch (cmd)
-        {
-        case eString:
-        {
-            if (eType != eType_STRING)
-            {
-                break;
-            }
-            char* szScr = data;
-            if (*szScr == '"')
-            {
-                szScr++;
-            }
-            int n = 0;
-            while (szScr[n] != 0)
-            {
-                if (szScr[n] == '"')
-                {
-                    szScr[n] = ' ';
-                }
-                n++;
-            }
-            if (!azstricmp(szName, name))
-            {
-                azstrcpy(sRet, AZ_ARRAY_SIZE(sRet), data);
-                break;
-            }
-        }
-        break;
-        }
-    }
-
-    SAFE_DELETE_ARRAY(pTemp);
-
-    if (sRet[0])
-    {
-        return sRet;
-    }
-    else
-    {
-        return NULL;
-    }
-}
-
-//------------------------------------------------------------------------------
-// Searches the constant params array for a desired constant based on name.
-// Can be optimized if has performance hit.
-//------------------------------------------------------------------------------
-SFXParam* CShaderMan::mfGetFXParameter(std::vector<SFXParam>& Params, const char* param)
-{
-    uint32 j;
-    for (j = 0; j < Params.size(); j++)
-    {
-        SFXParam* pr = &Params[j];
-        char nameParam[256];
-        int n = 0;
-        const char* szSrc = pr->m_Name.c_str();
-        while (*szSrc != 0)
-        {
-            if (*szSrc == '[')
-            {
-                break;
-            }
-            nameParam[n++] = *szSrc;
-            szSrc++;
-        }
-        nameParam[n] = 0;
-        if (!azstricmp(nameParam, param))
-        {
-            return pr;
-        }
-    }
-    return NULL;
-}
-
-//------------------------------------------------------------------------------
-// Searches the samplers params array for a desired sampler based on name.
-// Can be optimized if has performance hit.
-//------------------------------------------------------------------------------
-SFXSampler* CShaderMan::mfGetFXSampler(std::vector<SFXSampler>& Params, const char* param)
-{
-    uint32 j;
-    for (j = 0; j < Params.size(); j++)
-    {
-        SFXSampler* pr = &Params[j];
-        char nameParam[256];
-        int n = 0;
-        const char* szSrc = pr->m_Name.c_str();
-        while (*szSrc != 0)
-        {
-            if (*szSrc == '[')
-            {
-                break;
-            }
-            nameParam[n++] = *szSrc;
-            szSrc++;
-        }
-        nameParam[n] = 0;
-        if (!azstricmp(nameParam, param))
-        {
-            return pr;
-        }
-    }
-    return NULL;
-}
-
-//------------------------------------------------------------------------------
-// Searches the texture params array for a desired texture based on name.
-// Can be optimized if has performance hit.
-//------------------------------------------------------------------------------
-SFXTexture* CShaderMan::mfGetFXTexture(std::vector<SFXTexture>& Params, const char* param)
-{
-    uint32 j;
-    for (j = 0; j < Params.size(); j++)
-    {
-        SFXTexture* pr = &Params[j];
-        char nameParam[256];
-        int n = 0;
-        const char* szSrc = pr->m_Name.c_str();
-        while (*szSrc != 0)
-        {
-            if (*szSrc == '[')
-            {
-                break;
-            }
-            nameParam[n++] = *szSrc;
-            szSrc++;
-        }
-        nameParam[n] = 0;
-        if (!azstricmp(nameParam, param))
-        {
-            return pr;
-        }
-    }
-    return NULL;
-}
-
-
-// We have to parse part of the shader to enumerate public techniques
-bool CShaderMan::mfAddFXShaderNames(const char* szName, std::vector<string>* ShaderNames, bool bUpdateCRC)
-{
-    bool bRes = true;
-    SShaderBin* pBin = m_Bin.GetBinShader(szName, false, 0);
-    if (!pBin)
-    {
-        return false;
-    }
-    if (bUpdateCRC)
-    {
-        uint32 nCRC32 = pBin->ComputeCRC();
-        if (nCRC32 != pBin->m_CRC32)
-        {
-            FXShaderBinValidCRCItor itor = gRenDev->m_cEF.m_Bin.m_BinValidCRCs.find(pBin->m_dwName);
-            if (itor == gRenDev->m_cEF.m_Bin.m_BinValidCRCs.end())
-            {
-                gRenDev->m_cEF.m_Bin.m_BinValidCRCs.insert(FXShaderBinValidCRCItor::value_type(pBin->m_dwName, false));
-            }
-
-            m_Bin.DeleteFromCache(pBin);
-            pBin = m_Bin.GetBinShader(szName, false, nCRC32);
-            if (!pBin)
-            {
-                return false;
-            }
-        }
-    }
-
-    // Do not parse techniques for consoles
-    if (ShaderNames)
-    {
-        bRes &= m_Bin.ParseBinFX_Dummy(pBin, *ShaderNames, szName);
-    }
-
-    return bRes;
-}
-
-CTexture* CShaderMan::mfParseFXTechnique_LoadShaderTexture (STexSamplerRT* smp, const char* szName, [[maybe_unused]] SShaderPass* pShPass, [[maybe_unused]] CShader* ef, [[maybe_unused]] int nIndex, [[maybe_unused]] byte ColorOp, [[maybe_unused]] byte AlphaOp, [[maybe_unused]] byte ColorArg, [[maybe_unused]] byte AlphaArg)
-{
-    CTexture* tp = NULL;
-    if (!szName || !szName[0] || gRenDev->m_bShaderCacheGen) // Sampler without texture specified
-    {
-        return NULL;
-    }
-
-    if (szName[0] == '$')
-    {
-        tp = mfCheckTemplateTexName(szName, (ETEX_Type)smp->m_eTexType);
-        if (tp)
-        {
-            tp->AddRef();
-        }
-    }
-    else
-    {
-        smp->m_nTexFlags |= FT_DONT_STREAM;    // disable streaming for explicitly specified textures
-    }
-    if (!tp)
-    {
-        tp = mfTryToLoadTexture(szName, smp, smp->GetTexFlags(), false);
-    }
-
-    return tp;
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderParse.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderParse.cpp
deleted file mode 100644
index 9ba4abc9a8..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderParse.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : implementation of the Shaders parser part of shaders manager.
-
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "CryHeaders.h"
-#include "CryPath.h"
-#include <AzFramework/Archive/IArchive.h>
-
-#if defined(WIN32) || defined(WIN64)
-#include <direct.h>
-#include <io.h>
-#elif defined(LINUX)
-#endif
-
-
-//============================================================
-// Compile functions
-//============================================================
-
-SShaderGenBit* CShaderMan::mfCompileShaderGenProperty(char* scr)
-{
-    char* name;
-    long cmd;
-    char* params;
-    char* data;
-
-    SShaderGenBit* shgm = new SShaderGenBit;
-
-    enum
-    {
-        eName = 1, eProperty, eDescription, eMask, eHidden, eRuntime, ePrecache, eDependencySet, eDependencyReset, eDependFlagSet, eDependFlagReset, eAutoPrecache, eLowSpecAutoPrecache
-    };
-    static STokenDesc commands[] =
-    {
-        {eName, "Name"},
-        {eProperty, "Property"},
-        {eDescription, "Description"},
-        {eMask, "Mask"},
-        {eHidden, "Hidden"},
-        {ePrecache, "Precache"},
-        {eRuntime, "Runtime"},
-        {eAutoPrecache, "AutoPrecache"},
-        {eLowSpecAutoPrecache, "LowSpecAutoPrecache"},
-        {eDependencySet, "DependencySet"},
-        {eDependencyReset, "DependencyReset"},
-        {eDependFlagSet, "DependFlagSet"},
-        {eDependFlagReset, "DependFlagReset"},
-
-        {0, 0}
-    };
-
-    shgm->m_PrecacheNames.reserve(45);
-
-    while ((cmd = shGetObject (&scr, commands, &name, &params)) > 0)
-    {
-        data = NULL;
-        if (name)
-        {
-            data = name;
-        }
-        else
-        if (params)
-        {
-            data = params;
-        }
-
-        switch (cmd)
-        {
-        case eName:
-            shgm->m_ParamName = data;
-            shgm->m_dwToken = CCrc32::Compute(data);
-            break;
-
-        case eProperty:
-            if (gRenDev->IsEditorMode())
-            {
-                shgm->m_ParamProp = data;
-            }
-            break;
-
-        case eDescription:
-            if (gRenDev->IsEditorMode())
-            {
-                shgm->m_ParamDesc = data;
-            }
-            break;
-
-        case eHidden:
-            shgm->m_Flags |= SHGF_HIDDEN;
-            break;
-
-        case eRuntime:
-            shgm->m_Flags |= SHGF_RUNTIME;
-            break;
-
-        case eAutoPrecache:
-            shgm->m_Flags |= SHGF_AUTO_PRECACHE;
-            break;
-        case eLowSpecAutoPrecache:
-            shgm->m_Flags |= SHGF_LOWSPEC_AUTO_PRECACHE;
-            break;
-
-        case ePrecache:
-            shgm->m_PrecacheNames.push_back(CParserBin::GetCRC32(data));
-            shgm->m_Flags |= SHGF_PRECACHE;
-            break;
-
-        case eDependFlagSet:
-            shgm->m_DependSets.push_back(data);
-            break;
-
-        case eDependFlagReset:
-            shgm->m_DependResets.push_back(data);
-            break;
-
-        case eMask:
-            if (data && data[0])
-            {
-                if (data[0] == '0' && (data[1] == 'x' || data[1] == 'X'))
-                {
-                    shgm->m_Mask = shGetHex64(&data[2]);
-                }
-                else
-                {
-                    shgm->m_Mask = shGetInt(data);
-                }
-            }
-            break;
-
-        case eDependencySet:
-            if (data && data[0])
-            {
-                if (!azstricmp(data, "$LM_Diffuse"))
-                {
-                    shgm->m_nDependencySet |= SHGD_LM_DIFFUSE;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Detail"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_DETAIL;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Normals"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_NORMALS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Height"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_HEIGHT;
-                }
-                else
-                if (!azstricmp(data, "$TEX_SecondSmoothness"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SECOND_SMOOTHNESS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Specular"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SPECULAR;
-                }
-                else
-                if (!azstricmp(data, "$TEX_EnvCM"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_ENVCM;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Subsurface"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SUBSURFACE;
-                }
-                else
-                if (!azstricmp(data, "$HW_BilinearFP16"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_BILINEARFP16;
-                }
-                else
-                if (!azstricmp(data, "$HW_SeparateFP16"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_SEPARATEFP16;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Custom"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_CUSTOM;
-                }
-                else
-                if (!azstricmp(data, "$TEX_CustomSecondary"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_CUSTOM_SECONDARY;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Occ"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_OCC;
-                }
-                else
-                if (!azstricmp(data, "$HW_WaterTessellation"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_WATER_TESSELLATION;
-                }
-                else
-                if (!azstricmp(data, "$HW_SilhouettePom"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_SILHOUETTE_POM;
-                }
-                else
-                if (!azstricmp(data, "$HW_SpecularAntialiasing"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_SAA;
-                }
-                else
-                if (!azstricmp(data, "$UserEnabled"))
-                {
-                    shgm->m_nDependencySet |= SHGD_USER_ENABLED;
-                }
-                else
-                if (!azstricmp(data, "$HW_ORBIS"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_ORBIS;
-                }
-                else
-                if (!azstricmp(data, "$HW_DX11"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_DX11;
-                }
-                else
-                if (!azstricmp(data, "$HW_GL4"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_GL4;
-                }
-                else
-                if (!azstricmp(data, "$HW_GLES3"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_GLES3;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Emittance"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_EMITTANCE;
-                }
-
-                // backwards compatible names
-                else if (!azstricmp(data, "$HW_METAL"))
-                {
-                    shgm->m_nDependencySet |= SHGD_HW_METAL;
-                }
-                else if (!azstricmp(data, "$TEX_Bump"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_NORMALS;
-                }
-                else if (!azstricmp(data, "$TEX_BumpHeight"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_HEIGHT;
-                }
-                else if (!azstricmp(data, "$TEX_Translucency"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SECOND_SMOOTHNESS;
-                }
-                else if (!azstricmp(data, "$TEX_BumpDif"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SECOND_SMOOTHNESS;
-                }
-                else if (!azstricmp(data, "$TEX_Gloss"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SPECULAR;
-                }
-
-                else
-                {
-                    assert(0);
-                }
-            }
-            break;
-
-        case eDependencyReset:
-            if (data && data[0])
-            {
-                if (!azstricmp(data, "$LM_Diffuse"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_LM_DIFFUSE;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Detail"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_DETAIL;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Normals"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_NORMALS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Height"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_HEIGHT;
-                }
-                else
-                if (!azstricmp(data, "$TEX_SecondSmoothness"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_SECOND_SMOOTHNESS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Specular"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_SPECULAR;
-                }
-                else
-                if (!azstricmp(data, "$TEX_EnvCM"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_ENVCM;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Subsurface"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_SUBSURFACE;
-                }
-                else
-                if (!azstricmp(data, "$HW_BilinearFP16"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_BILINEARFP16;
-                }
-                else
-                if (!azstricmp(data, "$HW_SeparateFP16"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_SEPARATEFP16;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Custom"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_CUSTOM;
-                }
-                else
-                if (!azstricmp(data, "$TEX_CustomSecondary"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_CUSTOM_SECONDARY;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Occ"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_OCC;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Decal"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_DECAL;
-                }
-                else
-                if (!azstricmp(data, "$HW_WaterTessellation"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_WATER_TESSELLATION;
-                }
-                else
-                if (!azstricmp(data, "$HW_SilhouettePom"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_SILHOUETTE_POM;
-                }
-                else
-                if (!azstricmp(data, "$HW_SpecularAntialiasing"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_SAA;
-                }
-                else
-                if (!azstricmp(data, "$UserEnabled"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_USER_ENABLED;
-                }
-                else
-                if (!azstricmp(data, "$HW_DX11"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_DX11;
-                }
-                else
-                if (!azstricmp(data, "$HW_GL4"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_GL4;
-                }
-                else
-                if (!azstricmp(data, "$HW_GLES3"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_GLES3;
-                }
-                else
-                if (!azstricmp(data, "$HW_METAL"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_METAL;
-                }
-                else
-                if (!azstricmp(data, "$HW_ORBIS"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_HW_ORBIS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Emittance"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_EMITTANCE;
-                }
-
-                // backwards compatible names
-                else
-                if (!azstricmp(data, "$TEX_Bump"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_NORMALS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_BumpHeight"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_HEIGHT;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Translucency"))
-                {
-                    shgm->m_nDependencyReset |= SHGD_TEX_SECOND_SMOOTHNESS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_BumpDif"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SECOND_SMOOTHNESS;
-                }
-                else
-                if (!azstricmp(data, "$TEX_Gloss"))
-                {
-                    shgm->m_nDependencySet |= SHGD_TEX_SPECULAR;
-                }
-
-                else
-                {
-                    assert(0);
-                }
-            }
-            break;
-        }
-    }
-    shgm->m_NameLength = strlen(shgm->m_ParamName.c_str());
-
-    return shgm;
-}
-
-bool CShaderMan::mfCompileShaderGen(SShaderGen* shg, char* scr)
-{
-    char* name;
-    long cmd;
-    char* params;
-    char* data;
-
-    SShaderGenBit* shgm;
-
-    enum
-    {
-        eProperty = 1, eVersion, eUsesCommonGlobalFlags
-    };
-    static STokenDesc commands[] =
-    {
-        {eProperty, "Property"},
-        {eVersion, "Version"},
-        {eUsesCommonGlobalFlags, "UsesCommonGlobalFlags"},
-        {0, 0}
-    };
-
-    while ((cmd = shGetObject (&scr, commands, &name, &params)) > 0)
-    {
-        data = NULL;
-        if (name)
-        {
-            data = name;
-        }
-        else
-        if (params)
-        {
-            data = params;
-        }
-
-        switch (cmd)
-        {
-        case eProperty:
-            shgm = mfCompileShaderGenProperty(params);
-            if (shgm)
-            {
-                shg->m_BitMask.AddElem(shgm);
-            }
-            break;
-
-        case eUsesCommonGlobalFlags:
-            break;
-
-        case eVersion:
-            break;
-        }
-    }
-
-    return shg->m_BitMask.Num() != 0;
-}
-
-void CShaderMan::mfCompileLevelsList(std::vector<string>& List, char* scr)
-{
-    char* name;
-    long cmd;
-    char* params;
-    char* data;
-
-    enum
-    {
-        eName = 1, eVersion
-    };
-    static STokenDesc commands[] =
-    {
-        {eName, "Name"},
-        {0, 0}
-    };
-
-    while ((cmd = shGetObject (&scr, commands, &name, &params)) > 0)
-    {
-        data = NULL;
-        if (name)
-        {
-            data = name;
-        }
-        else
-        if (params)
-        {
-            data = params;
-        }
-
-        switch (cmd)
-        {
-        case eName:
-            if (data && data[0])
-            {
-                List.push_back(string("Levels/") + string(data) + string("/"));
-            }
-            break;
-        }
-    }
-}
-
-bool CShaderMan::mfCompileShaderLevelPolicies(SShaderLevelPolicies* pPL, char* scr)
-{
-    char* name;
-    long cmd;
-    char* params;
-    char* data;
-
-    enum
-    {
-        eGlobalList = 1, ePerLevelList, eVersion
-    };
-    static STokenDesc commands[] =
-    {
-        {eGlobalList, "GlobalList"},
-        {ePerLevelList, "PerLevelList"},
-        {eVersion, "Version"},
-        {0, 0}
-    };
-
-    while ((cmd = shGetObject (&scr, commands, &name, &params)) > 0)
-    {
-        data = NULL;
-        if (name)
-        {
-            data = name;
-        }
-        else
-        if (params)
-        {
-            data = params;
-        }
-
-        switch (cmd)
-        {
-        case eGlobalList:
-            mfCompileLevelsList(pPL->m_WhiteGlobalList, params);
-            break;
-        case ePerLevelList:
-            mfCompileLevelsList(pPL->m_WhitePerLevelList, params);
-            break;
-
-        case eVersion:
-            break;
-        }
-    }
-
-    return pPL->m_WhiteGlobalList.size() != 0;
-}
-
-string CShaderMan::mfGetShaderBitNamesFromMaskGen(const char* szFileName, uint64 nMaskGen)
-{
-    // debug/helper function: returns ShaderGen bit names string based on nMaskGen
-
-    if (!nMaskGen)
-    {
-        return "NO_FLAGS";
-    }
-
-    string pszShaderName = PathUtil::GetFileName(szFileName);
-    pszShaderName.MakeUpper();
-
-    ShaderMapNameFlagsItor pShaderRmp = m_pShadersGlobalFlags.find(pszShaderName.c_str());
-    if (pShaderRmp == m_pShadersGlobalFlags.end() || !pShaderRmp->second)
-    {
-        return "NO_FLAGS";
-    }
-
-    string pszShaderBitNames;
-
-    // get shader bit names
-    MapNameFlagsItor pIter = m_pShaderCommonGlobalFlag.begin();
-    MapNameFlagsItor pEnd = m_pShaderCommonGlobalFlag.end();
-    for (; pIter != pEnd; ++pIter)
-    {
-        if (nMaskGen & pIter->second)
-        {
-            pszShaderBitNames += pIter->first.c_str();
-        }
-    }
-
-    return pszShaderBitNames;
-}
-
-void CShaderMan::mfRemapShaderGenInfoBits(const char* szName, SShaderGen* pShGen)
-{
-    // No data to proceed
-    if (!pShGen || pShGen->m_BitMask.empty())
-    {
-        return;
-    }
-
-    // Check if shader uses common flags at all
-    string pszShaderName = PathUtil::GetFileName(szName);
-    pszShaderName.MakeUpper();
-    if ((int32) m_pShadersRemapList.find(pszShaderName.c_str()) < 0)
-    {
-        return;
-    }
-
-    MapNameFlags* pOldShaderFlags = 0;
-    if (m_pShadersGlobalFlags.find(pszShaderName.c_str()) == m_pShadersGlobalFlags.end())
-    {
-        AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-        pOldShaderFlags = new MapNameFlags;
-        m_pShadersGlobalFlags.insert(ShaderMapNameFlagsItor::value_type(pszShaderName.c_str(),    pOldShaderFlags));
-    }
-
-    uint32 nBitCount = pShGen->m_BitMask.size();
-    for (uint32 b = 0; b < nBitCount; ++b)
-    {
-        SShaderGenBit* pGenBit = pShGen->m_BitMask[b];
-        if (!pGenBit)
-        {
-            continue;
-        }
-
-        // Store old shader flags
-        if (pOldShaderFlags)
-        {
-            pOldShaderFlags->insert(MapNameFlagsItor::value_type(pGenBit->m_ParamName.c_str(), pGenBit->m_Mask));
-        }
-
-        // lookup for name - and update mask value
-        MapNameFlagsItor pRemaped = m_pShaderCommonGlobalFlag.find(pGenBit->m_ParamName.c_str());
-        if (pRemaped != m_pShaderCommonGlobalFlag.end())
-        {
-            pGenBit->m_Mask = pRemaped->second;
-        }
-
-    }
-}
-
-bool CShaderMan::mfUsesGlobalFlags(const char* szShaderName)
-{
-    // Check if shader uses common flags at all
-    string pszName = PathUtil::GetFileName(szShaderName);
-
-    AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-    string pszShaderNameUC = pszName;
-    pszShaderNameUC.MakeUpper();
-    if ((int32) m_pShadersRemapList.find(pszShaderNameUC.c_str()) < 0)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-uint64 CShaderMan::mfGetShaderGlobalMaskGenFromString(const char* szShaderGen)
-{
-    assert(szShaderGen);
-    if (!szShaderGen || szShaderGen[0] == '\0')
-    {
-        return 0;
-    }
-
-    AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-    uint64 nMaskGen = 0;
-    MapNameFlagsItor pEnd = m_pShaderCommonGlobalFlag.end();
-
-    char* pCurrOffset = (char*)szShaderGen;
-    while (pCurrOffset)
-    {
-        char* pBeginOffset = (char*)strstr(pCurrOffset, "%");
-        assert(pBeginOffset);
-        PREFAST_ASSUME(pBeginOffset);
-        pCurrOffset = (char*)strstr(pBeginOffset + 1, "%");
-
-        char pCurrFlag[64] = "\0";
-        int nLen = pCurrOffset ? pCurrOffset - pBeginOffset : strlen(pBeginOffset);
-        memcpy(pCurrFlag, pBeginOffset, nLen);
-
-        MapNameFlagsItor pIter = m_pShaderCommonGlobalFlag.find(pCurrFlag);
-        if (pIter != pEnd)
-        {
-            nMaskGen |= pIter->second;
-        }
-    }
-
-    return nMaskGen;
-}
-
-AZStd::string CShaderMan::mfGetShaderBitNamesFromGlobalMaskGen(uint64 nMaskGen)
-{
-    if (!nMaskGen)
-    {
-        return "\0";
-    }
-
-    AZStd::string shaderBitNames = "\0";
-    MapNameFlagsItor pIter = m_pShaderCommonGlobalFlag.begin();
-    MapNameFlagsItor pEnd = m_pShaderCommonGlobalFlag.end();
-    for (; pIter != pEnd; ++pIter)
-    {
-        if (nMaskGen & pIter->second)
-        {
-            shaderBitNames += pIter->first.c_str();
-        }
-    }
-
-    return shaderBitNames;
-}
-
-uint64 CShaderMan::mfGetRemapedShaderMaskGen(const char* szName, uint64 nMaskGen, bool bFixup)
-{
-    if (!nMaskGen)
-    {
-        return 0;
-    }
-
-    AZStd::unique_lock<AZStd::mutex> lock(m_shaderLoadMutex);
-
-    uint64 nMaskGenRemaped = 0;
-    string szShaderName = PathUtil::GetFileName(szName);// some shaders might be using concatenated names (eg: terrain.layer), get only first name
-    szShaderName.MakeUpper();
-    ShaderMapNameFlagsItor pShaderRmp = m_pShadersGlobalFlags.find(szShaderName.c_str());
-
-    if (pShaderRmp == m_pShadersGlobalFlags.end() || !pShaderRmp->second)
-    {
-        return nMaskGen;
-    }
-
-    if (bFixup)
-    {
-        // if some flag was removed, disable in mask
-        nMaskGen = nMaskGen & m_nSGFlagsFix;
-        return nMaskGen;
-    }
-
-    // old bitmask - remap to common shared bitmasks
-    for (uint64 j = 0; j < 64; ++j)
-    {
-        uint64 nMask = (((uint64)1) << j);
-        if (nMaskGen & nMask)
-        {
-            MapNameFlagsItor pIter = pShaderRmp->second->begin();
-            MapNameFlagsItor pEnd = pShaderRmp->second->end();
-            for (; pIter != pEnd; ++pIter)
-            {
-                // found match - enable bit for remapped mask
-                if ((pIter->second) & nMask)
-                {
-                    MapNameFlagsItor pMatchIter = m_pShaderCommonGlobalFlag.find(pIter->first);
-                    if (pMatchIter != m_pShaderCommonGlobalFlag.end())
-                    {
-                        nMaskGenRemaped |= pMatchIter->second;
-                    }
-
-                    break;
-                }
-            }
-        }
-    }
-
-    return nMaskGenRemaped;
-}
-
-
-SShaderGen* CShaderMan::mfCreateShaderGenInfo(const char* szName, bool bRuntime)
-{
-    CCryNameTSCRC s = szName;
-    if (!bRuntime)
-    {
-        ShaderExtItor it = m_ShaderExts.find(s);
-        if (it != m_ShaderExts.end())
-        {
-            return it->second;
-        }
-    }
-    SShaderGen* pShGen = NULL;
-    char szN[256];
-    cry_strcpy(szN, "Shaders/");
-    cry_strcat(szN, szName);
-    cry_strcat(szN, ".ext");
-    AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(szN, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET);
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        pShGen = new SShaderGen;
-        AZ::u64 fileSize = 0;
-        AZ::IO::FileIOBase::GetInstance()->Size(fileHandle, fileSize);
-        char* buf = new char [fileSize + 1];
-        if (buf)
-        {
-            buf[fileSize] = 0;
-            gEnv->pCryPak->FRead(buf, fileSize, fileHandle);
-            mfCompileShaderGen(pShGen, buf);
-            mfRemapShaderGenInfoBits(szName, pShGen);
-            delete [] buf;
-        }
-        gEnv->pCryPak->FClose(fileHandle);
-    }
-    if (pShGen && !bRuntime)
-    {
-        pShGen->m_BitMask.Shrink();
-        m_ShaderExts.insert(std::pair<CCryNameTSCRC, SShaderGen*>(s, pShGen));
-    }
-
-    return pShGen;
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderResources.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderResources.cpp
deleted file mode 100644
index 7f4c6478df..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderResources.cpp
+++ /dev/null
@@ -1,859 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ShaderResources.h"
-#include "GraphicsPipeline/Common/GraphicsPipelineStateSet.h"
-
-#include <AzCore/std/sort.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-
-#ifndef  NULL_RENDERER
-    #include "DriverD3D.h"
-#endif // ! NULL_RENDERER
-
-enum MaterialRegister
-{
-    MaterialRegister_DiffuseColor       = 0, // float4
-    MaterialRegister_SpecularColor      = 1, // float4
-    MaterialRegister_EmissiveColor      = 2, // float4
-    MaterialRegister_DeformWave         = 3, // float2x4
-    MaterialRegister_DetailTiling       = 5, // float4
-    MaterialRegister_TexelDensity       = 6, // float4
-    MaterialRegister_UVMatrixDiffuse    = 7, // float4x4
-    MaterialRegister_UVMatrixCustom     = 11,// float4x4
-    MaterialRegister_UVMatrixEmissiveMultiplier = 15,// float4x4
-    MaterialRegister_UVMatrixEmittance  = 19,// float4x4
-    MaterialRegister_UVMatrixDetail     = 23,// float4x4
-
-    // Reflected constants are appended after the fixed ones.
-    MaterialRegister_MaxFixed = 27
-};
-
-namespace UVTransform
-{
-    struct TextureSlot
-    {
-        EEfResTextures m_Slot;
-        MaterialRegister m_RegisterOffset;
-    };
-
-    TextureSlot g_SupportedSlots[] =
-    {
-        { EFTT_DIFFUSE, MaterialRegister_UVMatrixDiffuse },
-        { EFTT_CUSTOM, MaterialRegister_UVMatrixCustom },
-        { EFTT_DECAL_OVERLAY, MaterialRegister_UVMatrixEmissiveMultiplier },
-        { EFTT_EMITTANCE, MaterialRegister_UVMatrixEmittance },
-        { EFTT_DETAIL_OVERLAY, MaterialRegister_UVMatrixDetail }
-    };
-
-    inline TextureSlot GetSupportedSlot(AZ::u32 index)
-    {
-        return g_SupportedSlots[index];
-    }
-
-    inline AZ::u32 GetSupportedSlotCount()
-    {
-        return AZ_ARRAY_SIZE(g_SupportedSlots);
-    }
-}
-
-void CShaderResources::Reset()
-{
-    m_TexturesResourcesMap.clear();
-    m_Id = 0;
-    m_IdGroup = 0;
-    m_pDeformInfo = NULL;
-    m_pSky = NULL;
-    m_ConstantBuffer = NULL;
-    m_nMtlLayerNoDrawFlags = 0;
-
-    m_Constants.resize(MaterialRegister_MaxFixed);
-}
-
-void CShaderResources::ConvertToInputResource(SInputShaderResources* pDst)
-{
-    pDst->m_ResFlags = m_ResFlags;
-    pDst->m_AlphaRef = m_AlphaRef;
-    pDst->m_VoxelCoverage = m_VoxelCoverage;
-
-    pDst->m_SortPrio = m_SortPrio;
-    if (m_pDeformInfo)
-    {
-        pDst->m_DeformInfo = *m_pDeformInfo;
-    }
-    else
-    {
-        pDst->m_DeformInfo.m_eType = eDT_Unknown;
-    }
-
-    pDst->m_TexturePath = m_TexturePath;
-    if (m_pDeformInfo)
-    {
-        pDst->m_DeformInfo = *m_pDeformInfo;
-    }
-
-    // Copy all used textures data
-    pDst->m_TexturesResourcesMap = m_TexturesResourcesMap;
-
-    ToInputLM(pDst->m_LMaterial);
-}
-
-size_t CShaderResources::GetResourceMemoryUsage(ICrySizer*  pSizer)
-{
-    size_t  nCurrentElementSize(0);
-    size_t  nTotalSize(0);
-
-    SIZER_COMPONENT_NAME(pSizer, "CShaderResources");
-    for (auto &iter : m_TexturesResourcesMap )
-    {
-        SEfResTexture* pTexture = &(iter.second);
-        if (pTexture->m_Sampler.m_pITex)
-        {
-            nCurrentElementSize = pTexture->m_Sampler.m_pITex->GetDataSize();
-            pSizer->AddObject(pTexture->m_Sampler.m_pITex, nCurrentElementSize);
-            nTotalSize += nCurrentElementSize;
-            IResourceCollector* pColl = pSizer->GetResourceCollector();
-            if (pColl)
-            {
-                pColl->AddResource(pTexture->m_Sampler.m_pITex->GetName(), nCurrentElementSize);
-            }
-        }
-    }
-
-    return nTotalSize;
-}
-
-void CShaderResources::Release()
-{
-#ifndef NULL_RENDERER
-    AZ_Assert(gRenDev && gRenDev->m_pRT, "renderer not initialized");
-    gRenDev->m_pRT->EnqueueRenderCommand([this]()
-    {
-        if (!CryInterlockedDecrement(&m_nRefCounter))
-        {
-            delete this;
-        }
-    });
-#endif
-}
-
-void CShaderResources::Cleanup()
-{
-    m_TexturesResourcesMap.clear();
-
-    SAFE_DELETE(m_pDeformInfo);
-
-    if (m_pSky)
-    {
-        for (size_t i = 0; i < sizeof(m_pSky->m_SkyBox) / sizeof(m_pSky->m_SkyBox[0]); ++i)
-        {
-            SAFE_RELEASE(m_pSky->m_SkyBox[i]);
-        }
-        SAFE_DELETE(m_pSky);
-    }
-    ReleaseConstants();
-
-    // Not thread safe main thread can potentially access this destroyed entry in mfCreateShaderResources()
-    // (if flushing of unloaded textures (UnloadLevel) is not complete before pre-loading of new materials)
-    // [Shader System TO DO] - test and fix
-    if (CShader::s_ShaderResources_known.Num() > m_Id && CShader::s_ShaderResources_known[m_Id] == this)
-    {
-        CShader::s_ShaderResources_known[m_Id] = NULL;
-    }
-}
-
-CShaderResources::~CShaderResources()
-{
-    Cleanup();
-
-    if (gRenDev->m_RP.m_pShaderResources == this)
-    {
-        gRenDev->m_RP.m_pShaderResources = NULL;
-    }
-}
-
-CShaderResources::CShaderResources()
-{
-    // Only do expensive DX12 resource set building for PC DX12
-#if defined(CRY_USE_DX12)
-    m_pipelineStateCache = AZStd::make_shared<CGraphicsPipelineStateLocalCache>();
-#endif
-    Reset();
-}
-
-CShaderResources::CShaderResources(SInputShaderResources* pSrc)
-{
-    assert(pSrc);
-    PREFAST_ASSUME(pSrc);
-
-    // Only do expensive DX12 resource set building for PC DX12
-#if defined(CRY_USE_DX12)
-    m_pipelineStateCache = AZStd::make_shared<CGraphicsPipelineStateLocalCache>();
-#endif
-    Reset();
-
-    if (!pSrc)
-        return;
-
-    m_szMaterialName = pSrc->m_szMaterialName;
-    m_TexturePath = pSrc->m_TexturePath;
-    m_ResFlags = pSrc->m_ResFlags;
-    m_AlphaRef = pSrc->m_AlphaRef;
-    m_VoxelCoverage = pSrc->m_VoxelCoverage;
-
-    m_SortPrio = pSrc->m_SortPrio;
-    m_ShaderParams = pSrc->m_ShaderParams;
-    if (pSrc->m_DeformInfo.m_eType)
-    {
-        m_pDeformInfo = new SDeformInfo;
-        *m_pDeformInfo = pSrc->m_DeformInfo;
-    }
-
-    for (auto it = pSrc->m_TexturesResourcesMap.begin(), end = pSrc->m_TexturesResourcesMap.end(); it != end; ++it)
-    {
-        const SEfResTexture& texture = it->second;
-        // Omit any resources with no texture present
-        if (!texture.m_Name.empty() || texture.m_Sampler.m_pTex)
-        {
-            m_TexturesResourcesMap[it->first] = texture;
-        }
-    }
-
-    SetInputLM(pSrc->m_LMaterial);
-}
-
-CShaderResources& CShaderResources::operator=(const CShaderResources& src)
-{
-    Cleanup();
-    SBaseShaderResources::operator = (src);
-
-    m_TexturesResourcesMap = src.m_TexturesResourcesMap;
-    m_Constants = src.m_Constants;
-    m_IdGroup = src.m_IdGroup;
-    return *this;
-}
-
-CShaderResources* CShaderResources::Clone() const
-{
-    CShaderResources* pSR = new CShaderResources();
-    *pSR = *this;
-    pSR->m_nRefCounter = 1;
-    for (uint32 i = 0; i < CShader::s_ShaderResources_known.Num(); i++)
-    {
-        if (!CShader::s_ShaderResources_known[i])
-        {
-            pSR->m_Id = i;
-            CShader::s_ShaderResources_known[i] = pSR;
-            return pSR;
-        }
-    }
-    if (CShader::s_ShaderResources_known.Num() >= MAX_REND_SHADER_RES)
-    {
-        Warning("ERROR: CShaderMan::mfCreateShaderResources: MAX_REND_SHADER_RESOURCES hit");
-        pSR->Release();
-        return CShader::s_ShaderResources_known[1];
-    }
-    pSR->m_Id = CShader::s_ShaderResources_known.Num();
-    CShader::s_ShaderResources_known.AddElem(pSR);
-
-    return pSR;
-}
-
-void CShaderResources::SetInputLM(const CInputLightMaterial& lm)
-{
-    ColorF* pDst = (ColorF*)&m_Constants[0];
-
-    memcpy(pDst, lm.m_Channels, min(int(EFTT_MAX), MaterialRegister_DiffuseColor / 2) * sizeof(lm.m_Channels[0]));
-
-    const float fMinStepSignedFmt = (1.0f / 127.0f) * 255.0f;
-    const float fSmoothness = max(fMinStepSignedFmt, lm.m_Smoothness) / 255.0f;
-    const float fAlpha = lm.m_Opacity;
-
-    pDst[MaterialRegister_DiffuseColor] = lm.m_Diffuse;
-    pDst[MaterialRegister_SpecularColor] = lm.m_Specular;
-    pDst[MaterialRegister_EmissiveColor] = lm.m_Emittance;
-
-    pDst[MaterialRegister_DiffuseColor][3] = fAlpha;
-    pDst[MaterialRegister_SpecularColor][3] = fSmoothness;
-}
-
-void CShaderResources::ToInputLM(CInputLightMaterial& lm)
-{
-    if (!m_Constants.size())
-    {
-        return;
-    }
-
-    ColorF* pDst = (ColorF*)&m_Constants[0];
-
-    lm.m_Diffuse = pDst[MaterialRegister_DiffuseColor];
-    lm.m_Specular = pDst[MaterialRegister_SpecularColor];
-    lm.m_Emittance = pDst[MaterialRegister_EmissiveColor];
-
-    lm.m_Opacity = pDst[MaterialRegister_DiffuseColor][3];
-    lm.m_Smoothness = pDst[MaterialRegister_SpecularColor][3] * 255.0f;
-}
-
-ColorF CShaderResources::GetColorValue(EEfResTextures slot) const
-{
-    if (!m_Constants.size())
-    {
-        return Col_Black;
-    }
-
-    int majoroffs;
-    switch (slot)
-    {
-    case EFTT_DIFFUSE:
-        majoroffs = MaterialRegister_DiffuseColor;
-        break;
-    case EFTT_SPECULAR:
-        majoroffs = MaterialRegister_SpecularColor;
-        break;
-    case EFTT_OPACITY:
-        return Col_White;
-    case EFTT_SMOOTHNESS:
-        return Col_White;
-    case EFTT_EMITTANCE:
-        majoroffs = MaterialRegister_EmissiveColor;
-        break;
-    default:
-        return Col_White;
-    }
-
-    return reinterpret_cast<const ColorF&>(m_Constants[majoroffs]);
-}
-
-float CShaderResources::GetStrengthValue(EEfResTextures slot) const
-{
-    if (!m_Constants.size())
-    {
-        return Col_Black.a;
-    }
-
-    int majoroffs, minoroffs;
-    switch (slot)
-    {
-    case EFTT_DIFFUSE:
-        return 1.0f;
-    case EFTT_SPECULAR:
-        return 1.0f;
-    case EFTT_OPACITY:
-        majoroffs = MaterialRegister_DiffuseColor;
-        minoroffs = 3;
-        break;
-    case EFTT_SMOOTHNESS:
-        majoroffs = MaterialRegister_SpecularColor;
-        minoroffs = 3;
-        break;
-    case EFTT_EMITTANCE:
-        majoroffs = MaterialRegister_EmissiveColor;
-        minoroffs = 3;
-        break;
-    default:
-        return 1.0f;
-    }
-
-    ColorF* pDst = (ColorF*)&m_Constants[0];
-    return pDst[majoroffs][minoroffs];
-}
-
-void CShaderResources::SetColorValue(EEfResTextures slot, const ColorF& color)
-{
-    if (!m_Constants.size())
-    {
-        return;
-    }
-
-    // NOTE: ideally the switch goes away and values are indexed directly
-    int majoroffs;
-    switch (slot)
-    {
-    case EFTT_DIFFUSE:
-        majoroffs = MaterialRegister_DiffuseColor;
-        break;
-    case EFTT_SPECULAR:
-        majoroffs = MaterialRegister_SpecularColor;
-        break;
-    case EFTT_OPACITY:
-        return;
-    case EFTT_SMOOTHNESS:
-        return;
-    case EFTT_EMITTANCE:
-        majoroffs = MaterialRegister_EmissiveColor;
-        break;
-    default:
-        return;
-    }
-
-    ColorF* pDst = (ColorF*)&m_Constants[0];
-    pDst[majoroffs] = ColorF(color.toVec3(), pDst[majoroffs][3]);
-}
-
-void CShaderResources::SetStrengthValue(EEfResTextures slot, float value)
-{
-    if (!m_Constants.size())
-    {
-        return;
-    }
-
-    // NOTE: ideally the switch goes away and values are indexed directly
-    int majoroffs, minoroffs;
-    switch (slot)
-    {
-    case EFTT_DIFFUSE:
-        return;
-    case EFTT_SPECULAR:
-        return;
-    case EFTT_OPACITY:
-        majoroffs = MaterialRegister_DiffuseColor;
-        minoroffs = 3;
-        break;
-    case EFTT_SMOOTHNESS:
-        majoroffs = MaterialRegister_SpecularColor;
-        minoroffs = 3;
-        break;
-    case EFTT_EMITTANCE:
-        majoroffs = MaterialRegister_EmissiveColor;
-        minoroffs = 3;
-        break;
-    default:
-        return;
-    }
-
-    ColorF* pDst = (ColorF*)&m_Constants[0];
-    pDst[majoroffs][minoroffs] = value;
-}
-#ifndef NULL_RENDERER
-void CShaderResources::UpdateConstants(IShader* pISH)
-{
-    if (gRenDev && gRenDev->m_pRT)
-    {
-        pISH->AddRef();
-        this->AddRef();
-
-        gRenDev->m_pRT->EnqueueRenderCommand([this, pISH]()
-        {
-            
-#if defined(CRY_USE_METAL)
-            //On metal the dynamic constant buffer usage assumes it will be updated every frame
-            //Since that is not the case with material properties use static option.
-            AzRHI::ConstantBufferUsage usage = AzRHI::ConstantBufferUsage::Static;
-#else
-            AzRHI::ConstantBufferUsage usage = AzRHI::ConstantBufferUsage::Dynamic;
-#endif
-            
-            Rebuild(pISH, usage);
-            pISH->Release();
-            this->Release();
-        });
-    }
-}
-
-namespace
-{
-    void WriteConstants(SFXParam* requestedParameter, AZStd::vector<SShaderParam>& parameters, AZStd::vector<Vec4>& outConstants)
-    {
-        const AZ::u32 parameterFlags = requestedParameter->GetFlags();
-        const AZ::u8  paramStageSetter = requestedParameter->m_OffsetStageSetter;
-        const AZ::u32 registerOffset = requestedParameter->m_Register[paramStageSetter];
-        AZ_Assert(registerOffset < outConstants.size(), "Requested parameter beyond the bounds of the constant buffer.");
-        float* outputData = &outConstants[registerOffset][0];
-
-        for (AZ::u32 componentIdx = 0; componentIdx < 4; componentIdx++)
-        {
-            if (parameterFlags & PF_AUTOMERGED)
-            {
-                CryFixedStringT<128> name;
-                requestedParameter->GetCompName(componentIdx, name);
-                SShaderParam::GetValue(name.c_str(), &parameters, outputData, componentIdx);
-            }
-            else
-            {
-                SShaderParam::GetValue(requestedParameter->m_Name.c_str(), &parameters, outputData, componentIdx);
-            }
-        }
-    }
-
-    // Creates a parameters list for populating the constants in the Constant Buffer and returns the minimum and maximum slot offset 
-    // of the newly added parameters taking their size into account for the maximum offset.
-    // NOTE:  the minimum and maximum slot offsets MUST be initialized outside (min=10000, max=0) for the gathering to be valid.
-    void AddShaderParamToArray( 
-        SShaderFXParams& inParameters, FixedDynArray<SFXParam*>& outParameters, 
-        EHWShaderClass shaderClass, AZ::s32 &minSlotOffset, AZ::s32 &maxSlotOffset )
-    {
-        for (int n = 0; n < inParameters.m_FXParams.size(); n++)
-        {
-            SFXParam* parameter = &inParameters.m_FXParams[n];
-            if (parameter->m_nFlags & PF_MERGE)
-            {
-                continue;
-            }
-
-            if (parameter->m_BindingSlot == eConstantBufferShaderSlot_PerMaterial)
-            {
-                if (parameter->m_Register[shaderClass] < 0 || parameter->m_Register[shaderClass] >= 10000)
-                {
-                    continue;
-                }
-
-                // Run over all existing parameters and look for the name entry
-                size_t findIdx = 0;
-                for (; findIdx < outParameters.size(); findIdx++)
-                {
-                    // The name entry was found - break with its index to prevent double insertion
-                    if (outParameters[findIdx]->m_Name == parameter->m_Name)
-                    {   
-                        // Add the current usage to the marked usage
-                        outParameters[findIdx]->m_StagesUsage |= ((0x1 << shaderClass) & 0xff);
-                        break;
-                    }
-                }
-
-                // No existing entry for that name was found - add it. (otherwise ignore to avoid adding twice)
-                // Taking the first occurrence is not the optimal solution as it might leave gaps in constants offsets.  
-                // A better solution would be to eliminate duplicates first with close grouping heuristics.
-                if (findIdx == outParameters.size())
-                {
-                    outParameters.push_back(parameter);
-                    parameter->m_OffsetStageSetter = shaderClass;
-                    parameter->m_StagesUsage = ((0x1 << shaderClass) & 0xff);
-                    minSlotOffset = AZStd::GetMin(minSlotOffset, static_cast<AZ::s32>(parameter->m_Register[shaderClass]));
-                    maxSlotOffset = AZStd::GetMax(maxSlotOffset, static_cast<AZ::s32>(parameter->m_Register[shaderClass] + parameter->m_RegisterCount));
-                }
-            }
-        }
-    }
-}
-
-void CShaderResources::Rebuild(IShader* abstractShader, AzRHI::ConstantBufferUsage usage)
-{
-    AZ_TRACE_METHOD();
-    CShader* shader = (CShader*)abstractShader;
-    
-    // Do not attempt to update constant buffers for shaders that are not compiled or parsed.
-    // We can hit this case easily when r_shadersImport >= 2 under two primary scenarios:
-    // 1) We want to render an object with a shader that was never compiled because it was never added to the shader list from the Remote Shader Compiler.
-    // This is resolved by running the game in Debug or Profile and properly building your shader permutation list and rebuilding your shader paks.
-    // 2) The shader permutation was never compiled because it was never intended to render, but it is still loaded into memory and active.
-    // This occurs when a material's submaterial is unused, for example when a nodraw shader is attached as a submaterial.
-    // The material system naively attempts to update shader constants for all submaterial's shader techniques/passes 
-    // via CMatInfo::RefreshShaderResourceConstants(), so we do not want to attempt to upload shader constants for shader permutations that will never be used.
-    if (!(shader->m_Flags & EF_LOADED))
-    {
-        return;
-    }
-
-    // Build list of used parameters and fill constant buffer scratchpad
-    SShaderFXParams& parameterRegistry = gRenDev->m_cEF.m_Bin.mfGetFXParams(shader);
-    const size_t parameterCount = parameterRegistry.m_FXParams.size();
-    const size_t parameterByteCount = parameterCount * sizeof(SFXParam*);
-
-    // Added this as a precaution 
-    AZ_Assert((eHWSC_Num < 8), "More than 8 shader stages - m_StagesUsage can only represent 8, please adjust it to AZ::u16" );
-
-    FixedDynArray<SFXParam*> usedParameters;
-    PREFAST_SUPPRESS_WARNING(6255) usedParameters.set(ArrayT((SFXParam**)alloca((int)parameterByteCount), (int)parameterCount));
-
-    AZ::s32 registerStart = 10000;
-    AZ::s32 registerCountMax = 0;
-    for (AZ::u32 techniqueIdx = 0; techniqueIdx < (int)shader->m_HWTechniques.Num(); techniqueIdx++)
-    {
-        SShaderTechnique* technique = shader->m_HWTechniques[techniqueIdx];
-        for (AZ::u32 passIdx = 0; passIdx < technique->m_Passes.Num(); passIdx++)
-        {
-            const SShaderPass* pass = &technique->m_Passes[passIdx];
-            const CHWShader* shaders[] = { pass->m_VShader, pass->m_PShader, pass->m_GShader, pass->m_HShader, pass->m_DShader, pass->m_CShader };
-
-            for (EHWShaderClass shaderClass = EHWShaderClass(0); shaderClass < eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-            {
-                if (shaders[shaderClass])
-                {
-                    AddShaderParamToArray(parameterRegistry, usedParameters, shaderClass, registerStart, registerCountMax);
-                }
-            }
-        }
-    }
-
-    // Ordering the slots according to the Vertex Shader's slots offsets.  The order is valid in most cases with 
-    // the exception when the different stages have different slots offsets, however the slots' offsets range 
-    // is always valid since it's covered by the minimum and maximum gathering that happens during the 
-    // slots go over.
-    AZStd::sort(usedParameters.begin(), usedParameters.end(), [] (const SFXParam* lhs, const SFXParam* rhs)
-    {
-        return lhs->m_Register[0] < rhs->m_Register[0];
-    });
-
-    if (usedParameters.size())
-    {
-        // Validate and resize constant buffer scratchpad to match our reflection data.
-        {
-            AZ_Assert(registerStart < registerCountMax, "invalid constant buffer register interval");
-
-            if(registerCountMax > m_Constants.size())
-            {
-                m_Constants.resize(registerCountMax);
-            }
-        }
-
-        // Copies local shader tweakable values to the shaders local scratchpad. Then for each used parameter
-        // copies that data into the constant buffer.
-        {
-            AZStd::vector<SShaderParam> publicParameters = shader->GetPublicParams();
-            if (publicParameters.size())
-            {
-                for (AZ::u32 techniqueIdx = 0; techniqueIdx < m_ShaderParams.size(); techniqueIdx++)
-                {
-                    SShaderParam& tweakable = m_ShaderParams[techniqueIdx];
-                    for (AZ::u32 j = 0; j < publicParameters.size(); j++)
-                    {
-                        SShaderParam& outParameter = publicParameters[j];
-                        if (outParameter.m_Name == tweakable.m_Name)
-                        {
-                            tweakable.CopyType(outParameter);
-                            outParameter.CopyValueNoString(tweakable); // there should not be 'string' values set to shader
-                            break;
-                        }
-                    }
-                }
-
-                for (AZ::u32 i = 0; i < usedParameters.size(); i++)
-                {
-                    WriteConstants(usedParameters[i], publicParameters, m_Constants);
-                }
-            }
-        }
-    }
-
-    // Update common parameters
-    {
-        // Updating the texture modifiers
-        SEfResTexture*          pTextureRes = nullptr;
-        for (AZ::u32 i = 0; i < UVTransform::GetSupportedSlotCount(); ++i)
-        {
-            const EEfResTextures    slot = UVTransform::GetSupportedSlot(i).m_Slot;
-            const AZ::u32           registerOffset = UVTransform::GetSupportedSlot(i).m_RegisterOffset;
-            Matrix44                matrix(IDENTITY);
-
-            pTextureRes = GetTextureResource (slot);
-            if (pTextureRes && pTextureRes->m_Ext.m_pTexModifier)
-            {
-                pTextureRes->Update(slot);
-                matrix = pTextureRes->m_Ext.m_pTexModifier->m_TexMatrix;
-            }
-            *reinterpret_cast<Matrix44*>(&m_Constants[registerOffset]) = matrix;
-        }
-
-        Vec4            texelDensity(0.0f, 0.0f, 1.0f, 1.0f);
-        Vec4            detailTiling(1.0f);
-
-        // [Shader System TO DO] - move that to be data driven
-        pTextureRes = GetTextureResource(EFTT_NORMALS);
-        if (pTextureRes && pTextureRes->m_Sampler.m_pTex)
-        {
-            texelDensity.x = (float)pTextureRes->m_Sampler.m_pTex->GetWidth();
-            texelDensity.y = (float)pTextureRes->m_Sampler.m_pTex->GetHeight();
-            texelDensity.z = 1.0f / std::max(1.0f, texelDensity.x);
-            texelDensity.w = 1.0f / std::max(1.0f, texelDensity.y);
-        }
-
-        pTextureRes = GetTextureResource(EFTT_DETAIL_OVERLAY);
-        if (pTextureRes && pTextureRes->m_Ext.m_pTexModifier)
-        {
-            pTextureRes->Update(EFTT_DETAIL_OVERLAY);
-            detailTiling.x = pTextureRes->m_Ext.m_pTexModifier->m_Tiling[0];
-            detailTiling.y = pTextureRes->m_Ext.m_pTexModifier->m_Tiling[1];
-            detailTiling.z = 1.0f / detailTiling.x;
-            detailTiling.w = 1.0f / detailTiling.y;
-        }
-
-        Vec4 deformWave0(0);
-        Vec4 deformWave1(0);
-        if (IsDeforming())
-        {
-            deformWave0.x = m_pDeformInfo->m_WaveX.m_Freq;
-            deformWave0.y = m_pDeformInfo->m_WaveX.m_Phase;
-            deformWave0.z = m_pDeformInfo->m_WaveX.m_Amp;
-            deformWave0.w = m_pDeformInfo->m_WaveX.m_Level;
-            deformWave1.x = 1.0f / m_pDeformInfo->m_fDividerX;
-        }
-
-        // We store the alpha test value into the last channel of deform wave (see GetMaterial_AlphaTest()).
-        deformWave1.w = m_AlphaRef;
-
-        m_Constants[MaterialRegister_TexelDensity] = texelDensity;
-        m_Constants[MaterialRegister_DetailTiling] = detailTiling;
-        m_Constants[MaterialRegister_DeformWave + 0] = deformWave0;
-        m_Constants[MaterialRegister_DeformWave + 1] = deformWave1;
-    }
-
-    SAFE_RELEASE(m_ConstantBuffer);
-
-    if (m_Constants.size())
-    {
-        m_ConstantBuffer = gcpRendD3D->m_DevBufMan.CreateConstantBuffer(
-            "PerMaterial",
-            m_Constants.size() * sizeof(Vec4),
-            usage,
-            AzRHI::ConstantBufferFlags::None);
-
-        m_ConstantBuffer->UpdateBuffer(&m_Constants[0], m_Constants.size() * sizeof(Vec4));
-
-    // Only do expensive DX12 resource set building for PC DX12
-#if defined(CRY_USE_DX12)
-        if (!m_pCompiledResourceSet)
-        {
-            m_pCompiledResourceSet = CDeviceObjectFactory::GetInstance().CreateResourceSet();
-        }
-
-        m_pCompiledResourceSet->Clear();
-        m_pCompiledResourceSet->Fill(shader, this, EShaderStage_AllWithoutCompute);
-        m_pCompiledResourceSet->Build();
-#endif
-    }
-}
-
-void CShaderResources::CloneConstants(const IRenderShaderResources* pISrc)
-{
-    CShaderResources* pSrc = (CShaderResources*)pISrc;
-
-    if (!pSrc)
-    {
-        m_Constants.clear();
-        SAFE_RELEASE(m_ConstantBuffer);
-        return;
-    }
-    else
-    {
-        m_Constants = pSrc->m_Constants;
-        {
-            AzRHI::ConstantBuffer*& pCB0Dst = m_ConstantBuffer;
-            AzRHI::ConstantBuffer*& pCB0Src = pSrc->m_ConstantBuffer;
-            if (pCB0Src)
-            {
-                pCB0Src->AddRef();
-            }
-            if (pCB0Dst)
-            {
-                pCB0Dst->Release();
-            }
-            pCB0Dst = pCB0Src;
-        }
-    }
-}
-
-void CShaderResources::ReleaseConstants()
-{
-    m_Constants.clear();
-
-    if (m_ConstantBuffer)
-    {
-        AzRHI::ConstantBuffer* constantBuffer = m_ConstantBuffer;
-        m_ConstantBuffer = nullptr;
-
-        gRenDev->m_pRT->EnqueueRenderCommand([constantBuffer]()
-        {
-            constantBuffer->Release();
-        });
-    }
-}
-
-static void AdjustSamplerState(SEfResTexture* pTex, bool bUseGlobalMipBias)
-{
-    int nTS = pTex->m_Sampler.m_nTexState;
-    if (nTS < 0 || nTS >= (int)CTexture::s_TexStates.size())
-    {
-        return;
-    }
-    int8 nAniso = min(CRenderer::CV_r_texminanisotropy, CRenderer::CV_r_texmaxanisotropy);
-    if (nAniso < 1)
-    {
-        return;
-    }
-    STexState* pTS = &CTexture::s_TexStates[nTS];
-    STexState ST = *pTS;
-
-    float mipBias = 0.0f;
-    if (bUseGlobalMipBias)
-    {
-        mipBias = gRenDev->GetTemporalJitterMipBias();
-    }
-
-    if (ST.m_nAnisotropy == nAniso && ST.m_MipBias == mipBias)
-    {
-        return;
-    }
-    ST.m_pDeviceState = NULL;   //otherwise state change is not applied
-    ST.m_MipBias = mipBias;
-
-    if (nAniso >= 16)
-    {
-        ST.m_nMipFilter =
-            ST.m_nMinFilter =
-                ST.m_nMagFilter = FILTER_ANISO16X;
-    }
-    else if (nAniso >= 8)
-    {
-        ST.m_nMipFilter =
-            ST.m_nMinFilter =
-                ST.m_nMagFilter = FILTER_ANISO8X;
-    }
-    else if (nAniso >= 4)
-    {
-        ST.m_nMipFilter =
-            ST.m_nMinFilter =
-                ST.m_nMagFilter = FILTER_ANISO4X;
-    }
-    else if (nAniso >= 2)
-    {
-        ST.m_nMipFilter =
-            ST.m_nMinFilter =
-                ST.m_nMagFilter = FILTER_ANISO2X;
-    }
-    else
-    {
-        ST.m_nMipFilter =
-            ST.m_nMinFilter =
-                ST.m_nMagFilter = FILTER_TRILINEAR;
-    }
-
-    ST.m_nAnisotropy = nAniso;
-    pTex->m_Sampler.m_nTexState = CTexture::GetTexState(ST);
-}
-
-// [Shader System TO DO] - delete this hard coded method.   Move to data driven
-void CShaderResources::AdjustForSpec()
-{
-    // Note: Anisotropic filtering for smoothness maps is deliberately disabled, otherwise
-    //       mip transitions become too obvious when using maps pre-filtered with normal variance
-    uint16       SamplersModulatorsIdx[] = {
-        EFTT_DIFFUSE,
-        EFTT_NORMALS,
-        EFTT_SPECULAR,
-        EFTT_CUSTOM,
-        EFTT_CUSTOM_SECONDARY,
-        EFTT_EMITTANCE,
-        0xffff,
-    };
-
-    for (uint32 pos = 0; SamplersModulatorsIdx[pos] != 0xffff ; pos++)
-    {
-        SEfResTexture*  pTextureRes = GetTextureResource(SamplersModulatorsIdx[pos]);
-        if (pTextureRes)
-        {
-            AdjustSamplerState(pTextureRes, true);
-        }
-    }
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderResources.h b/Code/CryEngine/RenderDll/Common/Shaders/ShaderResources.h
deleted file mode 100644
index 763f2b9670..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderResources.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <AzCore/std/containers/map.h>
-#include "DeviceManager/Enums.h"
-
-//==============================================================================
-//! This class provide all necessary resources to the shader extracted from material definition.
-//------------------------------------------------------------------------------
-class CShaderResources
-    : public IRenderShaderResources
-    , public SBaseShaderResources
-{
-private:
-    // Dynamically managed vector of all required shaders constants  - 
-    // This array will be copied to the (Per Material) constant buffer when ready.
-    AZStd::vector<Vec4>                 m_Constants;
-
-    // The actual constant buffer to be binded as the Per material CB
-    AzRHI::ConstantBuffer*              m_ConstantBuffer;       
-
-public:
-    TexturesResourcesMap                m_TexturesResourcesMap;          // A map of texture used by the shader
-    SDeformInfo*                        m_pDeformInfo;          // 4 bytes - Per Texture modulator info
-    TArray<struct SHRenderTarget*>      m_RTargets;             // 4
-    SSkyInfo*                           m_pSky;                 // [Shader System TO DO] - disconnect and remove!
-    uint16                              m_Id;                   // Id of the shader resource in the frame's SR list - s_ShaderResources_known
-    uint16                              m_IdGroup;              // Id of the SR group for this SR in the frame's SR list.  Starts at 20,000
-
-    /////////////////////////////////////////////////////
-    float                               m_fMinMipFactorLoad;
-    int                                 m_nRefCounter;
-    int                                 m_nFrameLoad;
-
-    // Only do expensive DX12 resource set building for PC DX12
-#if defined(CRY_USE_DX12)
-    // Compiled resource set.
-    // For DX12 will prepare list of textures in the global heap.
-    AZStd::shared_ptr<class CDeviceResourceSet>               m_pCompiledResourceSet;
-    AZStd::shared_ptr<class CGraphicsPipelineStateLocalCache> m_pipelineStateCache;
-#endif
-
-    uint8 m_nMtlLayerNoDrawFlags;
-
-public:
-
-    bool TextureSlotExists(ResourceSlotIndex slotId) const
-    {
-        auto    iter = m_TexturesResourcesMap.find(slotId);
-        return (iter != m_TexturesResourcesMap.end()) ? true : false;
-    }
-
-    SEfResTexture* GetTextureResource(ResourceSlotIndex slotId)
-    {
-        auto    iter = m_TexturesResourcesMap.find(slotId);
-        return (iter != m_TexturesResourcesMap.end()) ? &iter->second : nullptr;
-    }
-
-    TexturesResourcesMap* GetTexturesResourceMap()
-    {
-        return &m_TexturesResourcesMap;
-    }
-
-    inline AzRHI::ConstantBuffer* GetConstantBuffer() 
-    {
-        return m_ConstantBuffer;
-    }
-
-    int Size() const
-    {
-        int     nSize = sizeof(CShaderResources);
-        for ( auto iter=m_TexturesResourcesMap.begin() ; iter != m_TexturesResourcesMap.end() ; ++iter )
-        {
-            nSize += iter->second.Size();
-        }
-
-        nSize += sizeofVector(m_Constants);
-        nSize += m_RTargets.GetMemoryUsage();
-        if (m_pDeformInfo)
-        {
-            nSize += m_pDeformInfo->Size();
-        }
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const final
-    {
-        pSizer->AddObject(this, sizeof(*this));
-
-        for ( auto iter=m_TexturesResourcesMap.begin() ; iter != m_TexturesResourcesMap.end() ; ++iter )
-        {
-            pSizer->AddObject(iter->second);
-        }
-
-
-        pSizer->AddObject(m_Constants);
-        pSizer->AddObject(m_RTargets);
-        pSizer->AddObject(m_pDeformInfo);
-        SBaseShaderResources::GetMemoryUsage(pSizer);
-    }
-
-    CShaderResources();
-    CShaderResources& operator=(const CShaderResources& src);
-    CShaderResources(struct SInputShaderResources* pSrc);
-
-    void PostLoad(CShader* pSH);
-    void AdjustForSpec();
-    void CreateModifiers(SInputShaderResources* pInRes);
-    virtual void UpdateConstants(IShader* pSH) final;
-    virtual void CloneConstants(const IRenderShaderResources* pSrc) final;
-    virtual int GetResFlags() final { return m_ResFlags; }
-    virtual void SetMaterialName(const char* szName) final { m_szMaterialName = szName; }
-    virtual SSkyInfo* GetSkyInfo() final { return m_pSky; }
-    virtual const float& GetAlphaRef() const final { return m_AlphaRef; }
-    virtual void SetAlphaRef(float alphaRef) final { m_AlphaRef = alphaRef; }
-
-    virtual AZStd::vector<SShaderParam>& GetParameters() final { return m_ShaderParams; }
-    virtual ColorF GetFinalEmittance() final
-    {
-        const float kKiloScale = 1000.0f;
-        return GetColorValue(EFTT_EMITTANCE) * GetStrengthValue(EFTT_EMITTANCE) * (kKiloScale / RENDERER_LIGHT_UNIT_SCALE);
-    }
-    virtual float GetVoxelCoverage() final { return ((float)m_VoxelCoverage) * (1.0f / 255.0f); }
-
-    virtual void SetMtlLayerNoDrawFlags(uint8 nFlags) final { m_nMtlLayerNoDrawFlags = nFlags; }
-    virtual uint8 GetMtlLayerNoDrawFlags() const final { return m_nMtlLayerNoDrawFlags; }
-
-    void Rebuild(IShader* pSH, AzRHI::ConstantBufferUsage usage = AzRHI::ConstantBufferUsage::Dynamic);
-    void ReleaseConstants();
-
-    void Reset();
-
-    bool IsDeforming() const
-    {
-        return (m_pDeformInfo && m_pDeformInfo->m_fDividerX != 0);
-    }
-
-    bool HasLMConstants() const { return (m_Constants.size() > 0); }
-    virtual void SetInputLM(const CInputLightMaterial& lm) final;
-    virtual void ToInputLM(CInputLightMaterial& lm) final;
-
-    virtual ColorF GetColorValue(EEfResTextures slot) const final;
-    virtual float GetStrengthValue(EEfResTextures slot) const final;
-
-    virtual void SetColorValue(EEfResTextures slot, const ColorF& color) final;
-    virtual void SetStrengthValue(EEfResTextures slot, float value) final;
-
-    ~CShaderResources();
-    virtual void Release() final;
-    virtual void AddRef() final { CryInterlockedIncrement(&m_nRefCounter); }
-    virtual void ConvertToInputResource(SInputShaderResources* pDst) final;
-    virtual CShaderResources* Clone() const final;
-    virtual void SetShaderParams(SInputShaderResources* pDst, IShader* pSH) final;
-
-    virtual size_t GetResourceMemoryUsage(ICrySizer* pSizer) final;
-
-    void Cleanup();
-};
-typedef _smart_ptr<CShaderResources> CShaderResourcesPtr;
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderScript.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderScript.cpp
deleted file mode 100644
index f1d0cacc45..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderScript.cpp
+++ /dev/null
@@ -1,1198 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "CryHeaders.h"
-#include "../Common/Shaders/RemoteCompiler.h"
-#include <MainThreadRenderRequestBus.h>
-#include <Pak/CryPakUtils.h>
-
-#include <IMaterial.h>
-
-#ifndef NULL_RENDERER
-#include "DriverD3D.h"
-#endif
-
-#if defined(WIN32) || defined(WIN64)
-#include <direct.h>
-#include <io.h>
-#endif
-
-extern char* gShObjectNotFound;
-
-//=================================================================================================
-
-bool CShader::Reload(int nFlags, const char* szShaderName)
-{
-    CShader* pShaderGen = NULL;
-    if (m_ShaderGenParams)
-    {
-        pShaderGen = this;
-    }
-    else
-    if (m_pGenShader)
-    {
-        pShaderGen = m_pGenShader;
-    }
-    uint32 nFl = EF_RELOAD;
-    if (nFlags & FRO_FORCERELOAD)
-    {
-        nFl |= EF_FORCE_RELOAD;
-    }
-    if (pShaderGen && pShaderGen->m_DerivedShaders)
-    {
-        for (uint32 i = 0; i < pShaderGen->m_DerivedShaders->size(); i++)
-        {
-            CShader* pShader = (*pShaderGen->m_DerivedShaders)[i];
-            if (!pShader)
-            {
-                continue;
-            }
-            if (pShader->m_nRefreshFrame == gRenDev->m_cEF.m_nFrameForceReload)
-            {
-                continue;
-            }
-            pShader->m_nRefreshFrame = gRenDev->m_cEF.m_nFrameForceReload;
-
-            gRenDev->m_cEF.mfForName(szShaderName, pShader->m_Flags | nFl, NULL, pShader->m_nMaskGenFX);
-        }
-    }
-    else
-    {
-        assert(!m_nMaskGenFX);
-        gRenDev->m_cEF.mfForName(szShaderName, m_Flags | nFl, NULL, m_nMaskGenFX);
-    }
-
-    return true;
-}
-
-bool CShaderMan::mfReloadShaderIncludes(const char* szPath, int nFlags)
-{
-    assert(szPath);
-
-    bool bChanged = false;
-    char dirn[256];
-    cry_strcpy(dirn, szPath);
-    cry_strcat(dirn, "*");
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst (dirn);
-    if (handle)
-    {
-        do
-        {
-            if (handle.m_filename.front() == '.')
-            {
-                continue;
-            }
-            if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-            {
-                char ddd[256];
-                azsnprintf(ddd, AZ_ARRAY_SIZE(ddd), "%s%.*s/", szPath, aznumeric_cast<int>(handle.m_filename.size()), handle.m_filename.data());
-
-                bChanged = mfReloadShaderIncludes(ddd, nFlags);
-                continue;
-            }
-            char nmf[256];
-            cry_strcpy(nmf, szPath);
-            cry_strcat(nmf, handle.m_filename.data());
-            int len = strlen(nmf) - 1;
-            while (len >= 0 && nmf[len] != '.')
-            {
-                len--;
-            }
-            if (len <= 0)
-            {
-                continue;
-            }
-            if (!azstricmp(&nmf[len], ".cfi"))
-            {
-                fpStripExtension(handle.m_filename.data(), nmf);
-                bool bCh = false;
-                m_Bin.GetBinShader(nmf, true, 0, &bCh);
-                if (bCh)
-                {
-                    bChanged = true;
-                    mfReloadFile(szPath, handle.m_filename.data(), nFlags);
-                }
-            }
-        } while (handle = gEnv->pCryPak->FindNext(handle));
-
-        gEnv->pCryPak->FindClose (handle);
-    }
-    return bChanged;
-}
-
-bool CShaderMan::mfReloadAllShaders([[maybe_unused]] int nFlags, [[maybe_unused]] uint32 nFlagsHW)
-{
-    bool bState = true;
-    m_nFrameForceReload++;
-
-    gRenDev->FlushRTCommands(true, true, true);
-    m_Bin.InvalidateCache();
-    CHWShader::mfFlushPendedShadersWait(-1);
-    
-#ifndef NULL_RENDERER
-    // Ensure all shaders are unbound before forcing a reload of all shaders
-    gRenDev->m_pRT->RC_UnbindResources();
-    if (!gRenDev->IsShaderCacheGenMode())
-    {
-        gRenDev->m_pRT->RC_ResetToDefault();
-    }
-    gRenDev->FlushRTCommands(true, true, true);
-    
-    CDebugAllowFileAccess ignoreInvalidFileAccess;
-
-    // Check include changing
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_shadersignoreincludeschanging)
-    {
-        mfReloadShaderIncludes(m_ShadersPath.c_str(), nFlags);
-    }
-    CCryNameTSCRC Name = CShader::mfGetClassName();
-    SResourceContainer* pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CShader* pS = (CShader*)itor->second;
-            if (!pS)
-            {
-                continue;
-            }
-            if (nFlagsHW)
-            {
-                if (!pS->m_pGenShader)
-                {
-                    continue;
-                }
-                SShaderGen* pGen = pS->m_pGenShader->m_ShaderGenParams;
-                assert(pGen);
-                if (!pGen)
-                {
-                    continue;
-                }
-                uint32 i;
-                SShaderGenBit* pBit;
-                for (i = 0; i < pGen->m_BitMask.Num(); i++)
-                {
-                    pBit = pGen->m_BitMask[i];
-                    if ((pBit->m_nDependencySet | pBit->m_nDependencyReset) & nFlagsHW)
-                    {
-                        break;
-                    }
-                }
-                if (i == pGen->m_BitMask.Num())
-                {
-                    continue;
-                }
-                pS->Reload(nFlags | FRO_FORCERELOAD, pS->GetName());
-            }
-            else
-            {
-                char name[256];
-                sprintf_s(name, "%sCryFX/%s.cfx", m_ShadersPath.c_str(), pS->GetName());
-                AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(name, "rb");
-                if (fileHandle != AZ::IO::InvalidHandle)
-                {
-                    uint32 nSourceCRC32 = gEnv->pCryPak->ComputeCRC(name);
-                    gEnv->pCryPak->FClose(fileHandle);
-                    if ((nFlags & FRO_FORCERELOAD) || nSourceCRC32 != pS->m_SourceCRC32)
-                    {
-                        pS->m_SourceCRC32 = nSourceCRC32;
-                        pS->Reload(nFlags, pS->GetName());
-                    }
-                }
-            }
-        }
-    }
-
-    //Force all PSOs to be rebuilt
-    CDeviceObjectFactory::GetInstance().InvalidatePSOCache();
-    //Tell the graphics pipeline to reset and throw out existing PSOs since they're now invalid
-    gcpRendD3D->GetGraphicsPipeline().Reset();
-
-#endif
-
-    gRenDev->FlushRTCommands(true, true, true);
-    CHWShader::mfFlushPendedShadersWait(-1);
-
-    return bState;
-}
-
-// Recursively iterate through all the shaders included by pBin to see if any match szShaderName
-// Returns true if there is a match, meaning pBin is affected by szShaderName.
-static bool sCheckAffecting_r(SShaderBin* pBin, const char* szShaderName)
-{
-    pBin->Lock();
-    int nTok = 0;
-    // Check first level
-    while (nTok >= 0)
-    {
-        // For each include that is found, check to see if it matches szShaderName
-        nTok = CParserBin::FindToken(nTok, pBin->m_Tokens.size() - 1, &pBin->m_Tokens[0], eT_include);
-        if (nTok >= 0)
-        {
-            // If an include was found, check to see if it matches szShaderName
-            nTok++;
-            uint32 nTokName = pBin->m_Tokens[nTok];
-            const char* szNameInc = CParserBin::GetString(nTokName, pBin->m_TokenTable);
-            if (!azstricmp(szNameInc, szShaderName))
-            {
-                // If szShaderName matches the included shader, then pBin is affected by that shader
-                // Since nTok is >= 0, breaking here will result in returning 'true'
-                break;
-            }
-        }
-    }
-    // Check each of the included shaders recursively
-    if (nTok < 0)
-    {
-        nTok = 0;
-        while (nTok >= 0)
-        {
-            nTok = CParserBin::FindToken(nTok, pBin->m_Tokens.size() - 1, &pBin->m_Tokens[0], eT_include);
-            if (nTok >= 0)
-            {
-                // For each include that is found, check to see if it matches szShaderName
-                nTok++;
-                uint32 nTokName = pBin->m_Tokens[nTok];
-                const char* szNameInc = CParserBin::GetString(nTokName, pBin->m_TokenTable);
-                if (!azstricmp(szNameInc, szShaderName))
-                {
-                    // If szShaderName matches the included shader, then pBin is affected by that shader
-                    // Since nTok is >= 0, breaking here will result in returning 'true'
-                    break;
-                }
-                SShaderBin* pBinIncl = gRenDev->m_cEF.m_Bin.GetBinShader(szNameInc, true, 0);
-                if (!pBinIncl)
-                {
-                    AZ_Assert(false, "Error attempting to load shader %s while checking all the shaders included by %s.", szNameInc, pBin->m_szName);
-                    break;
-                }
-                // Since the included file did not match szShaderName, recursively check all of its included shaders to see if they match
-                bool bAffect = sCheckAffecting_r(pBinIncl, szShaderName);
-                if (bAffect)
-                {
-                    // One of the included shaders matched szShaderName
-                    // Since nTok is >= 0, breaking here will result in returning 'true'
-                    break;
-                }
-            }
-        }
-    }
-    pBin->Unlock();
-    // Return true if a shader was found that matched szShaderName, false otherwise
-    return (nTok >= 0);
-}
-
-bool CShaderMan::mfReloadFile([[maybe_unused]] const char* szPath, const char* szName, int nFlags)
-{
-    CHWShader::mfFlushPendedShadersWait(-1);
-
-    m_nFrameForceReload++;
-
-    const char* szExt = fpGetExtension(szName);
-    if (!azstricmp(szExt, ".cfx"))
-    {
-        m_bReload = true;
-        char szShaderName[256];
-        cry_strcpy(szShaderName, szName, (size_t)(szExt - szName));
-        azstrlwr(szShaderName, AZ_ARRAY_SIZE(szShaderName));
-
-        // Check if this shader already loaded
-        CBaseResource* pBR = CBaseResource::GetResource(CShader::mfGetClassName(), szShaderName, false);
-        if (pBR)
-        {
-            CShader* pShader = (CShader*)pBR;
-            pShader->Reload(nFlags, szShaderName);
-        }
-        m_bReload = false;
-    }
-    else
-    if (!azstricmp(szExt, ".cfi"))
-    {
-        CCryNameTSCRC Name = CShader::mfGetClassName();
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(Name);
-        if (pRL)
-        {
-            m_bReload = true;
-            char szShaderName[256];
-            cry_strcpy(szShaderName, szName, (size_t)(szExt - szName));
-            azstrlwr(szShaderName, AZ_ARRAY_SIZE(szShaderName));
-            SShaderBin* pBin = m_Bin.GetBinShader(szShaderName, true, 0);
-            bool bAffect = false;
-
-            // Since this is a .cfi file, iterate through the existing resources to see if any of them are including it and consequently must be re-loaded
-            ResourcesMapItor itor;
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CShader* sh = (CShader*)itor->second;
-                if (!sh || !sh->GetName()[0])
-                {
-                    continue;
-                }
-                pBin = m_Bin.GetBinShader(sh->GetName(), false, 0);
-                if (!pBin)
-                {
-                    continue;
-                }
-
-                // Recursively check to see if sh is affected by the .cfi that is being reloaded
-                bAffect = sCheckAffecting_r(pBin, szShaderName);
-                if (bAffect)
-                {
-                    // If sh is affected, it also needs to be reloaded
-                    sh->Reload(nFlags | FRO_FORCERELOAD, sh->GetName());
-                }
-            }
-        }
-        m_bReload = false;
-    }
-
-
-    return false;
-}
-
-//=============================================================================
-
-void CShaderMan::mfFillGenMacroses(SShaderGen* shG, TArray<char>& buf, uint64 nMaskGen)
-{
-    uint32 i;
-
-    if (!nMaskGen || !shG)
-    {
-        return;
-    }
-
-    for (i = 0; i < shG->m_BitMask.Num(); i++)
-    {
-        if (shG->m_BitMask[i]->m_Mask & nMaskGen)
-        {
-            char macro[256];
-#if defined(__GNUC__)
-            sprintf_s(macro, "#define %s 0x%llx\n", shG->m_BitMask[i]->m_ParamName.c_str(), (unsigned long long)shG->m_BitMask[i]->m_Mask);
-#else
-            sprintf_s(macro, "#define %s 0x%I64x\n", shG->m_BitMask[i]->m_ParamName.c_str(), (uint64)shG->m_BitMask[i]->m_Mask);
-#endif
-            int size = strlen(macro);
-            int nOffs = buf.Num();
-            buf.Grow(size);
-            memcpy(&buf[nOffs], macro, size);
-        }
-    }
-}
-
-
-bool CShaderMan::mfModifyGenFlags(CShader* efGen, const CShaderResources* pRes, uint64& nMaskGen, uint64& nMaskGenH)
-{
-    if (!efGen || !efGen->m_ShaderGenParams)
-    {
-        return false;
-    }
-    uint64 nAndMaskHW = -1;
-    uint64 nMaskGenHW = 0;
-
-    // Remove non-used flags first
-    unsigned int i = 0;
-    SShaderGen* pGen = efGen->m_ShaderGenParams;
-    int j;
-
-    //char _debug_[256];
-    //sprintf_s( _debug_, "curr shadergen %I64x %I64x\n", nMaskGen, nMaskGenH);
-    //OutputDebugString(_debug_);
-
-    if (nMaskGen)
-    {
-        for (j = 0; j < 64; j++)
-        {
-            uint64 nMask = (((uint64)1) << j);
-            if (nMaskGen & nMask)
-            {
-                for (i = 0; i < pGen->m_BitMask.Num(); i++)
-                {
-                    SShaderGenBit* pBit = pGen->m_BitMask[i];
-                    if (pBit->m_Mask & nMask)
-                    {
-                        break;
-                    }
-                }
-
-                if (i == pGen->m_BitMask.Num())
-                {
-                    nMaskGen &= ~nMask;
-                }
-            }
-        }
-    }
-
-    for (i = 0; i < pGen->m_BitMask.Num(); i++)
-    {
-        SShaderGenBit* pBit = pGen->m_BitMask[i];
-        if (!pBit || (!pBit->m_nDependencySet && !pBit->m_nDependencyReset))
-        {
-            continue;
-        }
-        if (pRes)
-        {
-            if (pBit->m_nDependencySet & SHGD_TEX_NORMALS)
-            {
-                if (pRes->TextureSlotExists(EFTT_NORMALS))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_NORMALS)
-            {
-                if (!pRes->TextureSlotExists(EFTT_NORMALS))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencySet & SHGD_TEX_HEIGHT)
-            {
-                if (pRes->TextureSlotExists(EFTT_HEIGHT))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_HEIGHT)
-            {
-                if (!pRes->TextureSlotExists(EFTT_HEIGHT))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_DETAIL)
-            {
-                if (pRes->TextureSlotExists(EFTT_DETAIL_OVERLAY))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_DETAIL)
-            {
-                if (!pRes->TextureSlotExists(EFTT_DETAIL_OVERLAY))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_SECOND_SMOOTHNESS)
-            {
-                if (pRes->TextureSlotExists(EFTT_SECOND_SMOOTHNESS))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_SECOND_SMOOTHNESS)
-            {
-                if (!pRes->TextureSlotExists(EFTT_SECOND_SMOOTHNESS))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_SPECULAR)
-            {
-                if (pRes->TextureSlotExists(EFTT_SPECULAR))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_SPECULAR)
-            {
-                if (!pRes->TextureSlotExists(EFTT_SPECULAR))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_ENVCM)
-            {
-                if (pRes->TextureSlotExists(EFTT_ENV))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_ENVCM)
-            {
-                if (!pRes->TextureSlotExists(EFTT_ENV))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_SUBSURFACE)
-            {
-                if (pRes->TextureSlotExists(EFTT_SUBSURFACE))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_SUBSURFACE)
-            {
-                if (!pRes->TextureSlotExists(EFTT_SUBSURFACE))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_DECAL)
-            {
-                if (pRes->TextureSlotExists(EFTT_DECAL_OVERLAY))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_DECAL)
-            {
-                if (!pRes->TextureSlotExists(EFTT_DECAL_OVERLAY))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_CUSTOM)
-            {
-                if (pRes->TextureSlotExists(EFTT_CUSTOM))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_CUSTOM)
-            {
-                if (!pRes->TextureSlotExists(EFTT_CUSTOM))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_CUSTOM_SECONDARY)
-            {
-                if (pRes->TextureSlotExists(EFTT_CUSTOM_SECONDARY))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_CUSTOM_SECONDARY)
-            {
-                if (!pRes->TextureSlotExists(EFTT_CUSTOM_SECONDARY))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_SPECULAR_2)
-            {
-                if (pRes->TextureSlotExists(EFTT_SPECULAR_2))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_SPECULAR_2)
-            {
-                if (!pRes->TextureSlotExists(EFTT_SPECULAR_2))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-            if (pBit->m_nDependencySet & SHGD_TEX_EMITTANCE)
-            {
-                // If either the emittance or the decal overlay (emissive intensity) are used, SHGD_TEX_EMITTANCE should be defined
-                if (pRes->TextureSlotExists(EFTT_EMITTANCE) || pRes->TextureSlotExists(EFTT_DECAL_OVERLAY))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_EMITTANCE)
-            {
-                // If neither the emittance nor the decal overlay (emissive intensity) are used, SHGD_TEX_EMITTANCE should not be defined
-                if (!pRes->TextureSlotExists(EFTT_EMITTANCE) && !pRes->TextureSlotExists(EFTT_DECAL_OVERLAY))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-
-
-            if (pBit->m_nDependencySet & SHGD_TEX_OCC)
-            {
-                if (pRes->TextureSlotExists(EFTT_OCCLUSION))
-                {
-                    nMaskGen |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_TEX_OCC)
-            {
-                if (!pRes->TextureSlotExists(EFTT_OCCLUSION))
-                {
-                    nMaskGen &= ~pBit->m_Mask;
-                }
-            }
-        }
-
-        // Specific case - for user gl flags (eg: TEMP_TERRAIN, TEMP_VEGETATION)
-        // this is needed since we now use common shader global flags - else define inside shader.cfi will override correct shared value
-        if (pBit->m_nDependencySet & SHGD_USER_ENABLED)
-        {
-            nMaskGen |= pBit->m_Mask;
-        }
-
-        //if (m_nCombinationsProcess < 0 || m_bActivatePhase)
-        {
-            if (pBit->m_nDependencySet & SHGD_HW_BILINEARFP16)
-            {
-                nAndMaskHW &= ~pBit->m_Mask;
-                if (gRenDev->m_bDeviceSupportsFP16Filter)
-                {
-                    nMaskGenHW |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_HW_BILINEARFP16)
-            {
-                nAndMaskHW &= ~pBit->m_Mask;
-                if (!gRenDev->m_bDeviceSupportsFP16Filter)
-                {
-                    nMaskGenHW &= ~pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencySet & SHGD_HW_SEPARATEFP16)
-            {
-                nAndMaskHW &= ~pBit->m_Mask;
-                if (gRenDev->m_bDeviceSupportsFP16Separate)
-                {
-                    nMaskGenHW |= pBit->m_Mask;
-                }
-            }
-            if (pBit->m_nDependencyReset & SHGD_HW_SEPARATEFP16)
-            {
-                nAndMaskHW &= ~pBit->m_Mask;
-                if (!gRenDev->m_bDeviceSupportsFP16Separate)
-                {
-                    nMaskGenHW &= ~pBit->m_Mask;
-                }
-            }
-
-            if (CParserBin::m_bShaderCacheGen)
-            {
-                // during shader cache gen, disable the special features in non D3D11 mode, and just accept
-                // the lines as they come in D3D11 mode
-                if (CParserBin::m_nPlatform != SF_D3D11 && CParserBin::m_nPlatform != SF_JASPER && CParserBin::m_nPlatform != SF_GL4 && CParserBin::m_nPlatform != SF_ORBIS)
-                {
-                    if (pBit->m_nDependencySet & SHGD_HW_WATER_TESSELLATION)
-                    {
-                        nAndMaskHW &= ~pBit->m_Mask;
-                    }
-                    if (pBit->m_nDependencySet & SHGD_HW_SILHOUETTE_POM)
-                    {
-                        nAndMaskHW &= ~pBit->m_Mask;
-                    }
-                }
-            }
-            else
-            {
-                PREFAST_SUPPRESS_WARNING(6326)
-                bool bWaterTessHW = CRenderer::CV_r_WaterTessellationHW != 0 && gRenDev->m_bDeviceSupportsTessellation;
-                if (pBit->m_nDependencySet & SHGD_HW_WATER_TESSELLATION)
-                {
-                    nAndMaskHW &= ~pBit->m_Mask;
-                    if (bWaterTessHW)
-                    {
-                        nMaskGenHW |= pBit->m_Mask;
-                    }
-                }
-                if (pBit->m_nDependencyReset & SHGD_HW_WATER_TESSELLATION)
-                {
-                    nAndMaskHW &= ~pBit->m_Mask;
-                    if (!bWaterTessHW)
-                    {
-                        nMaskGenHW &= ~pBit->m_Mask;
-                    }
-                }
-
-                PREFAST_SUPPRESS_WARNING(6326)
-                const bool useSilhouettePOM = CRenderer::CV_r_SilhouettePOM != 0;
-                if (pBit->m_nDependencySet & SHGD_HW_SILHOUETTE_POM)
-                {
-                    nAndMaskHW &= ~pBit->m_Mask;
-                    if (useSilhouettePOM)
-                    {
-                        nMaskGenHW |= pBit->m_Mask;
-                    }
-                }
-                if (pBit->m_nDependencyReset & SHGD_HW_SILHOUETTE_POM)
-                {
-                    nAndMaskHW &= ~pBit->m_Mask;
-                    if (!useSilhouettePOM)
-                    {
-                        nMaskGenHW &= ~pBit->m_Mask;
-                    }
-                }
-
-                PREFAST_SUPPRESS_WARNING(6326)
-                const bool useSAA = CRenderer::CV_r_SpecularAntialiasing != 0;
-                if (pBit->m_nDependencySet & SHGD_HW_SAA)
-                {
-                    nAndMaskHW &= ~pBit->m_Mask;
-                    if (useSAA)
-                    {
-                        nMaskGenHW |= pBit->m_Mask;
-                    }
-                }
-                if (pBit->m_nDependencyReset & SHGD_HW_SAA)
-                {
-                    nAndMaskHW &= ~pBit->m_Mask;
-                    if (!useSAA)
-                    {
-                        nMaskGenHW &= ~pBit->m_Mask;
-                    }
-                }
-            }
-        }
-    }
-    nMaskGen &= nAndMaskHW;
-    nMaskGenH |= nMaskGenHW;
-
-    //sprintf_s( _debug_, "remap shadergen %I64x %I64x\n", nMaskGen, nMaskGenH);
-    //OutputDebugString(_debug_);
-
-
-    return true;
-}
-
-bool CShaderMan::mfUpdateTechnik (SShaderItem& SI, CCryNameTSCRC& Name)
-{
-    CShader* pSH = (CShader*)SI.m_pShader;
-    if (!(pSH->m_Flags & EF_LOADED))
-    {
-        return false;
-    }
-    uint32 i;
-    for (i = 0; i < pSH->m_HWTechniques.Num(); i++)
-    {
-        SShaderTechnique* pTech = pSH->m_HWTechniques[i];
-        //if (!(pTech->m_Flags & FHF_PUBLIC))
-        //  continue;
-        if (pTech->m_NameCRC == Name)
-        {
-            break;
-        }
-    }
-    if (i == pSH->m_HWTechniques.Num())
-    {
-        SI.m_nTechnique = -1;
-        Warning("ERROR: CShaderMan::mfUpdateTechnik: couldn't find public technique for shader '%s'", pSH->GetName());
-    }
-    else
-    {
-        SI.m_nTechnique = i;
-    }
-
-    return true;
-}
-
-SShaderItem CShaderMan::mfShaderItemForName (const char* nameEf, bool bShare, int flags, SInputShaderResources* Res, uint64 nMaskGen)
-{
-    SShaderItem SI;
-
-    CShaderResources* pResource = NULL;
-    if (Res)
-    {
-        SI.m_pShaderResources = mfCreateShaderResources(Res, bShare);
-        pResource = (CShaderResources*)SI.m_pShaderResources;
-        pResource->m_ShaderParams = Res->m_ShaderParams;
-        m_pCurInputResources = Res;
-    }
-
-    string strShader = nameEf;
-    string strTechnique;
-    string strNew = strShader.SpanExcluding(".");
-    if (strNew.size() != strShader.size())
-    {
-        string second = string(&strShader.c_str()[strNew.size() + 1]);
-        strShader = strNew;
-        strTechnique = second;
-    }
-
-    if (SI.m_pShaderResources)
-    {
-        const threadID currentThread = CryGetCurrentThreadId();
-        threadID renderThread, mainThread;
-         
-        gEnv->pRenderer->GetThreadIDs(mainThread, renderThread);
-         
-        if (currentThread == mainThread)
-        {
-            mfRefreshResources((CShaderResources*)SI.m_pShaderResources);
-        }
-        else
-        {
-            AZStd::function<void()> runOnMainThread = [this, SI]()
-            {
-                mfRefreshResources((CShaderResources*)SI.m_pShaderResources);
-            };
-         
-            EBUS_QUEUE_FUNCTION(AZ::MainThreadRenderRequestBus, runOnMainThread);
-        }
-    }
-
-    char shadName[256];
-    if (nameEf && nameEf[0])
-    {
-        cry_strcpy(shadName, strShader.c_str());
-    }
-    else
-    {
-        shadName[0] = 0;
-    }
-
-    SI.m_pShader = mfForName(shadName, flags, (CShaderResources*)SI.m_pShaderResources, nMaskGen);
-
-    // Get technique
-    if (strTechnique.size())
-    {
-        CCryNameTSCRC nTech(strTechnique.c_str());
-        if (!mfUpdateTechnik(SI, nTech))
-        {
-            SI.m_nTechnique = nTech.get(); // Postpone
-        }
-    }
-    SI.m_nPreprocessFlags = -1;
-    if (Res)
-    {
-        SI.m_pShaderResources = pResource;
-        if (pResource)
-        {
-            pResource->CreateModifiers(Res);
-        }
-    }
-    m_pCurInputResources = NULL;
-    return SI;
-}
-
-
-CShader* CShaderMan::mfForName (const char* nameSh, int flags, const CShaderResources* Res, uint64 nMaskGen)
-{
-    CShader* ef, * efGen;
-    int id;
-
-    if (!nameSh || !nameSh[0])
-    {
-        Warning("Warning: CShaderMan::mfForName: NULL name\n");
-        s_DefaultShader->AddRef();
-        return s_DefaultShader;
-    }
-
-    char nameEf[256];
-    char nameNew[256];
-    char nameRes[256];
-
-    uint64 nMaskGenHW = 0;
-    uint64 maskGenStatic = m_staticFlags;
-
-    cry_strcpy(nameEf, nameSh);
-
-    cry_strcpy(nameRes, nameEf);
-
-    cry_strcat(nameRes, GetShaderLanguageResourceName());
-
-    if (maskGenStatic)
-    {
-        cry_strcat(nameRes, AZStd::string::format("(ST%llx)", maskGenStatic).c_str());
-    }
-
-    ef = NULL;
-    efGen = NULL;
-
-    // Check if this shader already loaded
-    CBaseResource* pBR = CBaseResource::GetResource(CShader::mfGetClassName(), nameRes, false);
-    bool bGenModified = false;
-    ef = (CShader*)pBR;
-    if (ef && ef->m_ShaderGenParams)
-    {
-        efGen = ef;
-
-        mfModifyGenFlags(efGen, Res, nMaskGen, nMaskGenHW);
-        bGenModified = true;
-        azsprintf(nameNew, "%s(%llx)", nameRes, nMaskGen);
-        pBR = CBaseResource::GetResource(CShader::mfGetClassName(), nameNew, false);
-        ef = (CShader*)pBR;
-        if (ef)
-        {
-            // Update the flags if HW specs changed
-            ef->m_nMaskGenFX = nMaskGen | nMaskGenHW;
-            assert(ef->m_pGenShader == efGen);
-        }
-    }
-
-    if (ef)
-    {
-        if (!(flags & EF_RELOAD))
-        {
-            ef->AddRef();
-            ef->m_Flags |= flags;
-            return ef;
-        }
-        else
-        {
-            ef->mfFree();
-            ef->m_Flags |= EF_RELOADED;
-        }
-    }
-
-    if (!efGen)
-    {
-        sprintf_s(nameNew, "Shaders/%s.ext", nameEf);
-        SShaderGen* pShGen = mfCreateShaderGenInfo(nameEf, false);
-
-        if (pShGen)
-        {
-            efGen = mfNewShader(nameRes);
-            efGen->SetRefCounter(0); // Hack: to avoid leaks in shader-gen's
-            efGen->m_NameShader = nameRes;
-            efGen->m_ShaderGenParams = pShGen;
-        }
-    }
-    if (!(flags & EF_RELOAD) || !ef)
-    {
-        if (efGen)
-        {
-            // Change gen flags based on dependency on resources info
-            if (!bGenModified)
-            {
-                //nMaskGen = gRenDev->EF_GetRemapedShaderMaskGen(nameSh, nMaskGen | nMaskGenHW);
-                mfModifyGenFlags(efGen, Res, nMaskGen, nMaskGenHW);
-            }
-            sprintf_s(nameNew, "%s(%llx)", nameRes, nMaskGen);
-            ef = mfNewShader(nameNew);
-            if (!ef)
-            {
-                return s_DefaultShader;
-            }
-
-            ef->m_nMaskGenFX = nMaskGen | nMaskGenHW;
-            ef->m_maskGenStatic = maskGenStatic;
-            ef->m_ShaderGenStaticParams = m_staticExt;
-            ef->m_pGenShader = efGen;
-        }
-        if (efGen && ef)
-        {
-            assert(efGen != ef);
-            if (!efGen->m_DerivedShaders)
-            {
-                efGen->m_DerivedShaders = new std::vector<CShader*>;
-            }
-            efGen->m_DerivedShaders->push_back(ef);
-            efGen->AddRef();
-        }
-        if (!ef)
-        {
-            ef = mfNewShader(nameRes);
-            if (!ef)
-            {
-                return s_DefaultShader;
-            }
-
-            ef->m_maskGenStatic = maskGenStatic;
-            ef->m_ShaderGenStaticParams = m_staticExt;
-        }
-    }
-    id = ef->GetID();
-    ef->m_NameShader = nameEf;
-    ef->m_NameShaderICRC = CCrc32::ComputeLowercase(nameEf);
-
-#ifndef NULL_RENDERER
-    // Check for the new cryFX format
-    sprintf_s(nameNew, "%sCryFX/%s.cfx", m_ShadersPath.c_str(), nameEf);
-    ef->m_NameFile = nameNew;
-    ef->m_Flags |= flags;
-    gRenDev->m_pRT->RC_ParseShader(ef, nMaskGen | nMaskGenHW, flags, (CShaderResources*)Res);
-    return ef;
-#endif
-
-    return ef;
-}
-
-void CShaderMan::CreateShaderExportRequestLine(const CShader* pSH, stack_string& exportString)
-{
-    if (pSH)
-    {
-        exportString.Format("<%d>%s/%s(", SHADER_SERIALISE_VER, pSH->GetName(), pSH->GetName());
-        CreateShaderMaskGenString(pSH, exportString);
-        exportString += ")()(0)(0)(0)(VS)"; //fake normal request line format
-    }
-}
-
-void CShaderMan::CreateShaderMaskGenString(const CShader* pSH, stack_string& flagString)
-{
-    uint64 glMask = pSH->m_nMaskGenFX;
-
-    if (glMask)
-    {
-        SShaderGenComb* c = NULL;
-        c = mfGetShaderGenInfo(pSH->GetName());
-        if (c && c->pGen && c->pGen->m_BitMask.Num())
-        {
-            bool bFirstTime = true;
-            SShaderGen* pG = c->pGen;
-            for (uint32 i = 0; i < 64; i++)
-            {
-                if (glMask & ((uint64)1 << i))
-                {
-                    for (uint32 j = 0; j < pG->m_BitMask.Num(); j++)
-                    {
-                        SShaderGenBit* pBit = pG->m_BitMask[j];
-                        if (pBit->m_Mask & (glMask & ((uint64)1 << i)))
-                        {
-                            if (bFirstTime)
-                            {
-                                bFirstTime = false;
-                            }
-                            else
-                            {
-                                flagString += "|";
-                            }
-
-                            flagString += pBit->m_ParamName.c_str();
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-void CShaderMan::RT_ParseShader(CShader* pSH, uint64 nMaskGen, uint32 flags, [[maybe_unused]] CShaderResources* pRes)
-{
-    CDebugAllowFileAccess ignoreInvalidFileAccess;
-
-    bool bSuccess = false;
-#ifdef SHADERS_SERIALIZING
-    if (CRenderer::CV_r_shadersImport)
-    {
-        // Do not try and import fxb during cache generation
-        // PC would need to support import of console data
-        if (!gRenDev->IsShaderCacheGenMode())
-        {
-            ShaderImportResults importResults = ImportShader(pSH, m_Bin);
-
-            if (importResults == SHADER_IMPORT_SUCCESS)
-            {
-                bSuccess = true;
-            }
-            else
-            {
-#ifdef SHADER_SERIALIZE_VERBOSE
-                {
-                    stack_string flagString;
-                    CreateShaderMaskGenString(pSH, flagString);
-                    
-                    CryLog("[CShaderSerialize] Failed to import shader %s (0x%p) flags: 0x%llx 0x%x (%s)\n", pSH->GetName(), pSH, pSH->m_nMaskGenFX, pSH->m_nMDV, flagString.empty() ? "0" : flagString.c_str());
-                }
-#endif
-
-                pSH->m_Flags |= EF_FAILED_IMPORT;
-
-                if (CRenderer::CV_r_shadersImport == 2)
-                {
-                    // Do not fallback to the slow path unless we have a valid permutation in our lookup table (most optimal path)
-                    return;
-                }
-                else
-                {
-                    // If importResults == SHADER_IMPORT_MISSING_ENTRY, then allow the fallback path if we have a valid .fxb file 
-                    // for this shader, but the current permutation is missing from the lookup table.
-                    // This will fallback to the slow path to parse the .cfx for this shader permutation
-                    if (importResults == SHADER_IMPORT_FAILURE)
-                    {
-                        // No .fxb was exported for this .cfx, so do not fallback.
-                        return;
-                    }
-                }
-            }
-        }
-    }
-#endif
-    if (!bSuccess)
-    {
-#if !defined(SHADER_NO_SOURCES)
-        SShaderBin* pBin = m_Bin.GetBinShader(pSH->m_NameShader, false, 0);
-        if (pBin)
-#endif
-        {
-#if !defined(SHADER_NO_SOURCES)
-            if (flags & EF_FORCE_RELOAD)
-            {
-                uint32 nCRC32 = pBin->ComputeCRC();
-                if (nCRC32 != pBin->m_CRC32)
-                {
-                    FXShaderBinValidCRCItor itor = gRenDev->m_cEF.m_Bin.m_BinValidCRCs.find(pBin->m_dwName);
-                    if (itor == gRenDev->m_cEF.m_Bin.m_BinValidCRCs.end())
-                    {
-                        gRenDev->m_cEF.m_Bin.m_BinValidCRCs.insert(FXShaderBinValidCRCItor::value_type(pBin->m_dwName, false));
-                    }
-
-                    m_Bin.DeleteFromCache(pBin);
-                    pBin = m_Bin.GetBinShader(pSH->m_NameShader, false, nCRC32);
-                }
-            }
-#endif
-            bSuccess = m_Bin.ParseBinFX(pBin, pSH, nMaskGen);
-#ifdef SHADERS_SERIALIZING
-            if (CRenderer::CV_r_shadersExport && gRenDev->IsShaderCacheGenMode())
-            {
-                //Shader compilation must be enabled for export, to allow reading the token table from the fxcbs in the USER dir
-                int oldAllowCompilation = CRenderer::CV_r_shadersAllowCompilation;
-                CRenderer::CV_r_shadersAllowCompilation = 1;
-
-                if (bSuccess)
-                {
-                    // CheckFXBExists() used to only be queried here; however, that function will create the SResource under certain
-                    // conditions if it does not exist and can erroneously cause ExportShader to not be called on the first time a shader .fxb
-                    // is created.
-                    if (!DoesSResourceExist(pSH) || !CheckFXBExists(pSH))
-                    {
-                        bool shaderExported = ExportShader(pSH, m_Bin);
-#ifdef SHADER_SERIALIZE_VERBOSE
-                        if (!shaderExported)
-                        {
-                            CryLog("[CShaderSerialize] ExportShader failed for shader %s\n", pSH->GetName());
-                        }
-#else
-                        AZ_UNUSED(shaderExported);
-#endif
-                    }
-#ifdef SHADER_SERIALIZE_VERBOSE
-                    else
-                    {
-                        CryLog("[CShaderSerialize] Not exporting shader %s, it already exists\n", pSH->GetName());
-                    }
-#endif
-                }
-
-                CRenderer::CV_r_shadersAllowCompilation = oldAllowCompilation;
-            }
-#endif
-        }
-        else
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "[SHADERS] Failed to load shader '%s'!", pSH->m_NameShader.c_str());
-            pSH->m_Flags |= EF_NOTFOUND;
-        }
-    }
-    pSH->m_Flags |= EF_LOADED;
-
-    EBUS_QUEUE_EVENT(AZ::MaterialNotificationEventBus, OnShaderLoaded, pSH);
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderSerialize.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderSerialize.cpp
deleted file mode 100644
index 28904ff7c2..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderSerialize.cpp
+++ /dev/null
@@ -1,999 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#ifdef SHADERS_SERIALIZING
-
-bool CShaderSerialize::_OpenSResource(float fVersion, SSShaderRes* pSR, CShader* pSH, int nCache, CResFile* pRF, bool bReadOnly)
-{
-    assert(nCache == CACHE_USER || nCache == CACHE_READONLY);
-
-    SSShaderCacheHeader hd;
-    ZeroStruct(hd);
-    bool bValid = true;
-    bool bCheckValid = true;
-    if (!CRenderer::CV_r_shadersAllowCompilation)
-    {
-        bCheckValid = false;
-    }
-
-    //uint64 writeTimeCFX=0;
-
-    //See if resfile is in assets dir
-    if (!pRF->mfOpen(RA_READ | (CParserBin::m_bEndians ? RA_ENDIANS : 0), NULL, NULL))
-    {
-        pRF->mfClose();
-        bValid = false;
-    }
-
-    if (bValid)
-    {
-        pRF->mfFileSeek(CShaderMan::s_cNameHEAD, 0, SEEK_SET);
-        pRF->mfFileRead2(CShaderMan::s_cNameHEAD, sizeof(SSShaderCacheHeader), &hd);
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(hd, eBigEndian);
-        }
-
-        if (hd.m_SizeOf != sizeof(SSShaderCacheHeader))
-        {
-            bValid = false;
-        }
-        else if (fVersion && (hd.m_MajorVer != (int)fVersion || hd.m_MinorVer != (int)(((float)fVersion - (float)(int)fVersion) * 10.1f)))
-        {
-            bValid = false;
-
-            //if (CRenderer::CV_r_shadersdebug==2)
-            {
-                LogWarning("WARNING: Shader resource '%s' version mismatch (Resource: %s, Expected: %.1f)", pRF->mfGetFileName(), hd.m_szVer, fVersion);
-            }
-        }
-
-        if (bCheckValid)
-        {
-            char nameSrc[256];
-            sprintf_s(nameSrc, "%sCryFX/%s.%s", gRenDev->m_cEF.m_ShadersPath.c_str(), pSH->GetName(), "cfx");
-            uint32 srcCRC = pSH->m_SourceCRC32;
-
-            if (!srcCRC)
-            {
-                srcCRC = gEnv->pCryPak->ComputeCRC(nameSrc);
-                pSH->m_SourceCRC32 = srcCRC; //Propagate to shader, prevent recalculation
-            }
-
-            if (srcCRC && srcCRC != hd.m_SourceCRC32)
-            {
-                bValid = false;
-
-                //if (CRenderer::CV_r_shadersdebug==2)
-                {
-                    LogWarning("WARNING: Shader resource '%s' src CRC mismatch", pRF->mfGetFileName());
-                }
-            }
-        }
-
-        // If we failed a version or CRC check, close our resource file since we may try opening it again later
-        if (!bValid)
-        {
-            pRF->mfClose();
-        }
-
-        if (bValid && nCache == CACHE_USER)
-        {
-            pRF->mfClose();
-            if (!pRF->mfOpen(RA_READ | (CParserBin::m_bEndians ? RA_ENDIANS : 0) | RA_WRITE, NULL, NULL))
-            {
-                pRF->mfClose();
-                bValid = false;
-            }
-        }
-    }
-    if (!bValid && nCache == CACHE_USER && !bReadOnly && pSH->m_CRC32) //Create ResFile
-    {
-        if (!pRF->mfOpen(RA_CREATE | (CParserBin::m_bEndians ? RA_ENDIANS : 0), NULL, NULL))
-        {
-            return false;
-        }
-
-        SDirEntry de;
-        de.Name = CShaderMan::s_cNameHEAD;
-        de.size = sizeof(SSShaderCacheHeader);
-        hd.m_SizeOf = sizeof(SSShaderCacheHeader);
-        hd.m_MinorVer = (int)(((float)fVersion - (float)(int)fVersion) * 10.1f);
-        hd.m_MajorVer = (int)fVersion;
-        hd.m_CRC32 = pSH->m_CRC32;
-        hd.m_SourceCRC32 = pSH->m_SourceCRC32;
-        sprintf_s(hd.m_szVer, "Ver: %.1f", fVersion);
-        SSShaderCacheHeader hdTemp, * pHD;
-        pHD = &hd;
-        if (CParserBin::m_bEndians)
-        {
-            hdTemp = hd;
-            SwapEndian(hdTemp, eBigEndian);
-            pHD = &hdTemp;
-        }
-
-        //create dir
-        pRF->mfFileAdd(&de);
-        //open dir and populate data
-        SDirEntryOpen* pOpenDir = pRF->mfOpenEntry(&de);
-        pOpenDir->pData = pHD;
-        pOpenDir->nSize = de.size;
-
-        pRF->mfFlush();
-        bValid = true;
-    }
-
-    if (!bValid)
-    {
-        SAFE_DELETE(pRF);
-    }
-
-    if (pSR->m_pRes[nCache] && (pSR->m_pRes[nCache] != pRF))
-    {
-        SAFE_DELETE(pSR->m_pRes[nCache]);
-    }
-
-    pSR->m_pRes[nCache] = pRF;
-    pSR->m_Header[nCache] = hd;
-    pSR->m_bReadOnly[nCache] = bReadOnly;
-
-    if (bValid && !pSH->m_CRC32)
-    {
-        pSH->m_CRC32 = hd.m_CRC32;
-    }
-
-    return bValid;
-}
-
-bool CShaderSerialize::OpenSResource(const char* szName,  SSShaderRes* pSR, CShader* pSH, bool bDontUseUserFolder, bool bReadOnly)
-{
-    stack_string szReadOnly = szName;
-
-    // ShaderCacheGen behavior:
-    // CACHE_READONLY is not really used when exporting the .fxb, so we append the @usercache@ alias to the relative shader path
-    // here as well.  We cannot just leave this as the relative Shaders/Cache/Foo.fxb value because then it creates a new
-    // file in the asset cache as @assets@/Shaders/Cache/Foo.fxb, which is illegal (since only AP has the authority to write here)
-    // Game runtime behavior:
-    // We can't simply set both the CACHE_READONLY and CACHE_USER entries to be the same file path because then the shader caching 
-    // system treats these entries the same. CACHE_READONLY acts more as a template while CACHE_USER is the actual file with all 
-    // of the shader permutation entries.  They need different file names (that have the same relative shader path) in order
-    // for the CResFiles to be treated differently by the caching system.
-    if (gRenDev->IsShaderCacheGenMode())
-    {
-        szReadOnly = stack_string(gRenDev->m_cEF.m_szCachePath.c_str()) + stack_string(szName);
-    }
-
-    CResFile* rfRO = new CResFile(szReadOnly);
-    float fVersion = FX_CACHE_VER + FX_SER_CACHE_VER;
-    bool bValidRO = _OpenSResource(fVersion, pSR, pSH, bDontUseUserFolder ? CACHE_READONLY : CACHE_USER, rfRO, bReadOnly);
-
-    bool bValidUser = false;
-#if !defined(SHADER_NO_SOURCES)
-    CResFile* rfUser;
-    if (!bDontUseUserFolder)
-    {
-        stack_string szUser = stack_string(gRenDev->m_cEF.m_szCachePath.c_str()) + stack_string(szName);
-        rfUser = new CResFile(szUser.c_str());
-        bValidUser = _OpenSResource(fVersion, pSR, pSH, CACHE_USER, rfUser, bReadOnly);
-    }
-#endif
-
-    return (bValidRO || bValidUser);
-}
-
-bool CShaderSerialize::CreateSResource(CShader* pSH, SSShaderRes* pSR, [[maybe_unused]] CCryNameTSCRC& SName, bool bDontUseUserFolder, bool bReadOnly)
-{
-    AZStd::string dstName;
-    dstName.reserve(512);
-
-    if (m_customSerialisePath.size())
-    {
-        dstName = m_customSerialisePath.c_str();
-    }
-    dstName += gRenDev->m_cEF.m_ShadersCache;
-    dstName += pSH->GetName();
-    dstName += ".fxb";
-
-    bool bRes = OpenSResource(dstName.c_str(), pSR, pSH, bDontUseUserFolder, bReadOnly);
-    AZ_Error("CShaderSerialize", bRes, "Failed to open '%s' with bDontUseUserFolder=%s and bReadOnly=%s", dstName.c_str(), bDontUseUserFolder ? "True" : "False", bReadOnly ? "True" : "False");
-
-    return bRes;
-}
-
-SSShaderRes* CShaderSerialize::InitSResource(CShader* pSH, bool bDontUseUserFolder, bool bReadOnly)
-{
-    SSShaderRes* pSR = NULL;
-    stack_string shaderName = pSH->GetName();
-    shaderName += "_GLOBAL";
-    CCryNameTSCRC SName = CCryNameTSCRC(shaderName.c_str());
-    FXSShaderResItor itS = m_SShaderResources.find(SName);
-#if SHADER_NO_SOURCES
-    bool bCheckValid = false;
-#else
-    bool bCheckValid = true;
-#endif
-    if (itS != m_SShaderResources.end())
-    {
-        pSR = itS->second;
-        pSR->m_nRefCount++;
-        if (bCheckValid)
-        {
-            int nCache[2] = {-1, -1};
-            if (!bReadOnly || bDontUseUserFolder)
-            {
-                nCache[0] = CACHE_USER;
-            }
-            else
-            if (!bDontUseUserFolder || bReadOnly)
-            {
-                nCache[0] = CACHE_USER;
-                nCache[1] = CACHE_READONLY;
-            }
-            for (int i = 0; i < 2; i++)
-            {
-                if (nCache[i] < 0 || !pSR->m_pRes[i])
-                {
-                    continue;
-                }
-
-                //if the shader has a CRC then we can test, generally it is only valid during cache gen
-                if (pSH->m_CRC32 != 0 && pSR->m_Header[i].m_CRC32 != pSH->m_CRC32)
-                {
-                    //CryLogAlways("CRC check failed in serialise: 0x%x source: 0x%x\n", pSR->m_Header[i].m_CRC32, pSH->m_CRC32);
-                    SAFE_DELETE(pSR->m_pRes[i]);
-                }
-            }
-            bool bValid = true;
-            if (!bReadOnly && !pSR->m_pRes[CACHE_USER])
-            {
-                bValid = false;
-            }
-            else
-            if ((!bDontUseUserFolder || bReadOnly) && !pSR->m_pRes[CACHE_READONLY] && !pSR->m_pRes[CACHE_USER])
-            {
-                bValid = false;
-            }
-            if (!bValid)
-            {
-                CreateSResource(pSH, pSR, SName, bDontUseUserFolder, bReadOnly);
-            }
-            else
-            {
-                //printf("Reusing existing .fxb for %s\n", pSH->GetName() );
-            }
-        }
-    }
-    else
-    {
-        pSR = new SSShaderRes;
-        bool bRes = CreateSResource(pSH, pSR, SName, bDontUseUserFolder, bReadOnly);
-
-        if (bRes)
-        {
-            m_SShaderResources.insert(FXSShaderResItor::value_type(SName, pSR));
-        }
-        else
-        {
-            SAFE_DELETE(pSR);
-        }
-    }
-
-    if (pSH->m_CRC32 == 0 && pSR)
-    {
-        if (pSR->m_pRes[CACHE_READONLY])
-        {
-            pSH->m_CRC32 = pSR->m_Header[CACHE_READONLY].m_CRC32;
-        }
-        else if (pSR->m_pRes[CACHE_USER])
-        {
-            pSH->m_CRC32 = pSR->m_Header[CACHE_USER].m_CRC32;
-        }
-    }
-
-    return pSR;
-}
-
-void CShaderSerialize::ClearSResourceCache()
-{
-    const FXSShaderResItor end_it = m_SShaderResources.end();
-    FXSShaderResItor it = m_SShaderResources.begin();
-
-    for (; it != end_it; it++)
-    {
-        SAFE_DELETE(it->second);
-    }
-
-    m_SShaderResources.clear();
-}
-
-bool CShaderSerialize::DoesSResourceExist(CShader* pSH)
-{
-    stack_string shaderName = pSH->GetName();
-    shaderName += "_GLOBAL";
-    CCryNameTSCRC SName = CCryNameTSCRC(shaderName.c_str());
-    FXSShaderResItor itS = m_SShaderResources.find(SName);
-    if (itS != m_SShaderResources.end())
-    {
-        return true;
-    }
-    
-    return false;
-}
-
-bool CShaderSerialize::ExportHWShader(CHWShader* pShader, SShaderSerializeContext& SC)
-{
-    if (!pShader)
-    {
-        return false;
-    }
-
-    bool bRes = pShader->Export(SC);
-
-    return bRes;
-}
-CHWShader* CShaderSerialize::ImportHWShader(SShaderSerializeContext& SC, int nOffs, uint32 CRC32, CShader* pSH)
-{
-    CHWShader* pRes = CHWShader::Import(SC, nOffs, CRC32, pSH);
-
-    return pRes;
-}
-
-void CShaderSerialize::ExportHWShaderStage(SShaderSerializeContext& SC, CHWShader* shader, uint32& outShaderOffset)
-{
-    if ( shader )
-    {
-        outShaderOffset = SC.Data.Num();
-        if ( !ExportHWShader(shader,SC) )
-        {
-            outShaderOffset = -1;
-            CryFatalError("Shader export failed.");
-        }
-    }
-    else
-    {
-        outShaderOffset = -1;
-    }
-}
-
-bool CShaderSerialize::ExportShader(CShader* pSH, CShaderManBin& binShaderMgr)
-{
-#ifdef SHADER_SERIALIZE_VERBOSE
-    CryLogAlways("[CShaderSerialize] ExportShader: %s flags: 0x%llx mdvFlags: 0x%x\n", pSH->GetName(), pSH->m_nMaskGenFX, pSH->m_nMDV);
-#endif
-
-    bool bRes = true;
-
-    //Use user folder on export?
-    SSShaderRes* pSR = InitSResource(pSH, false /*((gRenDev->m_cEF.m_nCombinations > 0) || !CRenderer::CV_r_shadersuserfolder)*/, false);
-
-    uint32 i;
-    int j;
-
-    if (!pSR || !pSR->m_pRes[CACHE_USER])
-    {
-        return false;
-    }
-
-    SShaderSerializeContext SC;
-
-    SC.SSR.m_eSHDType = pSH->m_eSHDType;
-    SC.SSR.m_Flags = pSH->m_Flags;
-    SC.SSR.m_Flags2 = pSH->m_Flags2;
-    SC.SSR.m_nMDV = pSH->m_nMDV;
-    SC.SSR.m_vertexFormatEnum = pSH->m_vertexFormat.GetEnum();
-    SC.SSR.m_eCull = pSH->m_eCull;
-    //SC.SSR.m_nMaskCB = pSH->m_nMaskCB; //maskCB generated on HW shader activation
-    SC.SSR.m_eShaderType = pSH->m_eShaderType;
-    SC.SSR.m_nMaskGenFX = pSH->m_nMaskGenFX;
-
-    SC.SSR.m_nTechniques = pSH->m_HWTechniques.Num();
-
-    SShaderFXParams& params = binShaderMgr.mfGetFXParams(pSH);
-
-    SC.SSR.m_nPublicParams = params.m_PublicParams.size();
-    for (i = 0; i < SC.SSR.m_nPublicParams; i++)
-    {
-        SSShaderParam PR;
-        SShaderParam& P = params.m_PublicParams[i];
-        PR.m_nameIdx = SC.AddString(P.m_Name.c_str());
-        PR.m_Type = P.m_Type;
-        PR.m_Value = P.m_Value;
-        PR.m_nScriptOffs = SC.AddString(P.m_Script.c_str());
-        PR.m_eSemantic = P.m_eSemantic;
-        SC.Params.Add(PR);
-    }
-
-    SC.SSR.m_nFXParams = params.m_FXParams.size();
-    for (i = 0; i < SC.SSR.m_nFXParams; i++)
-    {
-        params.m_FXParams[i].Export(SC);
-    }
-
-    SC.SSR.m_nFXSamplers = params.m_FXSamplers.size();
-    for (i = 0; i < SC.SSR.m_nFXSamplers; i++)
-    {
-        params.m_FXSamplers[i].Export(SC);
-    }
-
-    SC.SSR.m_nFXTextures = params.m_FXTextures.size();
-    for (i = 0; i < SC.SSR.m_nFXTextures; i++)
-    {
-        params.m_FXTextures[i].Export(SC);
-    }
-
-    SC.SSR.m_nFXTexSamplers = params.m_FXSamplersOld.size();
-    for (i = 0; i < SC.SSR.m_nFXTexSamplers; i++)
-    {
-        params.m_FXSamplersOld[i].Export(SC);
-    }
-
-    SC.SSR.m_nFXTexRTs = SC.FXTexRTs.Num();
-
-    for (i = 0; i < SC.SSR.m_nTechniques; i++)
-    {
-        SSShaderTechnique ST;
-        SShaderTechnique* pT = pSH->m_HWTechniques[i];
-        ST.m_nPreprocessFlags = pT->m_nPreprocessFlags;
-        ST.m_nNameOffs = SC.AddString(pT->m_NameStr.c_str());
-        ST.m_Flags = pT->m_Flags;
-
-        int TECH_MAX = TTYPE_MAX;
-
-        for (j = 0; j < TECH_MAX; j++)
-        {
-            ST.m_nTechnique[j] = pT->m_nTechnique[j];
-        }
-        ST.m_nREs = pT->m_REs.Num();
-
-        ST.m_nPassesOffs = SC.Passes.Num();
-        ST.m_nPasses = pT->m_Passes.Num();
-        SC.SSR.m_nPasses += ST.m_nPasses;
-        for (j = 0; j < ST.m_nPasses; j++)
-        {
-            SSShaderPass PS;
-            SShaderPass& P = pT->m_Passes[j];
-            PS.m_RenderState = P.m_RenderState;
-            PS.m_eCull = P.m_eCull;
-            PS.m_AlphaRef = P.m_AlphaRef;
-            PS.m_PassFlags = P.m_PassFlags;
-
-            assert(!(SC.Data.Num() & 0x3));
-
-            ExportHWShaderStage( SC, P.m_VShader, PS.m_nVShaderOffs );
-            ExportHWShaderStage( SC, P.m_HShader, PS.m_nHShaderOffs );
-            ExportHWShaderStage( SC, P.m_DShader, PS.m_nDShaderOffs );
-            ExportHWShaderStage( SC, P.m_GShader, PS.m_nGShaderOffs );
-            ExportHWShaderStage( SC, P.m_PShader, PS.m_nPShaderOffs );
-            ExportHWShaderStage( SC, P.m_CShader, PS.m_nCShaderOffs );
-
-
-            SC.Passes.Add(PS);
-        }
-
-        ST.m_nREsOffs = (ST.m_nREs > 0) ? SC.Data.Num() : -1;
-        for (j = 0; j < ST.m_nREs; j++)
-        {
-            CRendElementBase* pRE = pT->m_REs[j];
-            uint32 type = pRE->m_Type;
-            sAddData(SC.Data, type);
-            pRE->mfExport(SC);
-            sAlignData(SC.Data, 4);
-        }
-        SC.Techniques.AddElem(ST);
-    }
-
-    TArray<byte> Data;
-
-    //DEBUG - prevent Data reallocs
-    //Data.Alloc(1024*1024);
-
-    uint32 nPublicParamsOffset;
-    uint32 nFXParamsOffset;
-    uint32 nFXSamplersOffset;
-    uint32 nFXTexturesOffset;
-    uint32 nFXTexSamplersOffset;
-    uint32 nFXTexRTsOffset;
-    uint32 nTechOffset;
-    uint32 nPassOffset;
-    uint32 nStringsOffset;
-    uint32 nDataOffset;
-
-    //sAddData(Data, SC.SSR);
-    SC.SSR.Export(Data);
-    sAddDataArray(Data, SC.Params, nPublicParamsOffset);
-    sAddDataArray(Data, SC.FXParams, nFXParamsOffset);
-    sAddDataArray(Data, SC.FXSamplers, nFXSamplersOffset);
-    sAddDataArray(Data, SC.FXTextures, nFXTexturesOffset);
-    sAddDataArray(Data, SC.FXTexSamplers, nFXTexSamplersOffset);
-    sAddDataArray(Data, SC.FXTexRTs, nFXTexRTsOffset);
-    sAddDataArray(Data, SC.Techniques, nTechOffset);
-    sAddDataArray(Data, SC.Passes, nPassOffset);
-    sAddDataArray_POD(Data, SC.Strings, nStringsOffset);
-    sAddDataArray_POD(Data, SC.Data, nDataOffset);
-
-    SSShader* pSSR = (SSShader*)&Data[0];
-    pSSR->m_nPublicParamsOffset = nPublicParamsOffset;
-    pSSR->m_nFXParamsOffset = nFXParamsOffset;
-    pSSR->m_nFXSamplersOffset = nFXSamplersOffset;
-    pSSR->m_nFXTexturesOffset = nFXTexturesOffset;
-    pSSR->m_nFXTexSamplersOffset = nFXTexSamplersOffset;
-    pSSR->m_nFXTexRTsOffset = nFXTexRTsOffset;
-    pSSR->m_nTechOffset = nTechOffset;
-    pSSR->m_nPassOffset = nPassOffset;
-    pSSR->m_nStringsOffset = nStringsOffset;
-    pSSR->m_nDataOffset = nDataOffset;
-    pSSR->m_nDataSize = SC.Data.Num();
-    pSSR->m_nStringsSize = SC.Strings.Num();
-
-    if (CParserBin::m_bEndians)
-    {
-        SwapEndian(pSSR->m_nPublicParamsOffset, eBigEndian);
-        SwapEndian(pSSR->m_nFXParamsOffset, eBigEndian);
-        SwapEndian(pSSR->m_nFXSamplersOffset, eBigEndian);
-        SwapEndian(pSSR->m_nFXTexturesOffset, eBigEndian);
-        SwapEndian(pSSR->m_nFXTexRTsOffset, eBigEndian);
-        SwapEndian(pSSR->m_nTechOffset, eBigEndian);
-        SwapEndian(pSSR->m_nPassOffset, eBigEndian);
-        SwapEndian(pSSR->m_nStringsOffset, eBigEndian);
-        SwapEndian(pSSR->m_nDataOffset, eBigEndian);
-        SwapEndian(pSSR->m_nDataSize, eBigEndian);
-        SwapEndian(pSSR->m_nStringsSize, eBigEndian);
-    }
-
-    int nLen = Data.Num();
-    SDirEntry de;
-    char sName[128];
-    sprintf_s(sName, "(%llx)(%llx)", pSH->m_nMaskGenFX, pSH->m_maskGenStatic);
-    de.Name = CCryNameTSCRC(sName);
-    de.size = nLen;
-
-    de.flags |= RF_COMPRESS;
-    pSR->m_pRes[CACHE_USER]->mfFileAdd(&de);
-
-    //create open dir and populate data
-    SDirEntryOpen* pOpenDir = pSR->m_pRes[CACHE_USER]->mfOpenEntry(&de);
-    pOpenDir->pData = &Data[0];
-    pOpenDir->nSize = de.size;
-
-    //Preserve modification time
-
-    pSR->m_pRes[CACHE_USER]->mfFlush();
-
-    return bRes;
-}
-
-float g_fTime0;
-float g_fTime1;
-float g_fTime2;
-
-bool CShaderSerialize::CheckFXBExists(CShader* pSH)
-{
-    SSShaderRes* pSR = InitSResource(pSH, false, true);
-    if (!pSR || (!pSR->m_Header[CACHE_USER].m_CRC32 && !pSR->m_Header[CACHE_READONLY].m_CRC32))
-    {
-        return false;
-    }
-
-    char sName[128];
-    sprintf_s(sName, "(%llx)(%llx)", pSH->m_nMaskGenFX, pSH->m_maskGenStatic);
-
-    CCryNameTSCRC CName = CCryNameTSCRC(sName);
-    SDirEntry* pDE = NULL;
-    CResFile* pRes = NULL;
-
-    for (int i = 0; i < 2; i++)
-    {
-        pRes = pSR->m_pRes[i];
-        if (!pRes)
-        {
-            continue;
-        }
-        pDE = pRes->mfGetEntry(CName);
-
-        if (pDE)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-CShaderSerialize::ShaderImportResults CShaderSerialize::ImportShader(CShader* pSH, CShaderManBin& binShaderMgr)
-{
-    if (CParserBin::m_bEndians)
-    {
-        CryFatalError("CShaderSerialize - cross platform import not supported");
-    }
-
-    float fTime0 = iTimer->GetAsyncCurTime();
-
-    SSShaderRes* pSR = NULL;
-    uint32 i;
-    int j;
-    char sName[128];
-    sprintf_s(sName, "(%llx)(%llx)", pSH->m_nMaskGenFX, pSH->m_maskGenStatic);
-    CCryNameTSCRC CName = CCryNameTSCRC(sName);
-    SDirEntry* pDE = NULL;
-    CResFile* pRes = NULL;
-
-    // Not found yet
-    if (!pDE || !pRes)
-    {
-        //try global cache
-        pSR = InitSResource(pSH, !CRenderer::CV_r_shadersAllowCompilation, true);
-
-        if (pSR && (pSR->m_Header[CACHE_USER].m_CRC32 != 0 || pSR->m_Header[CACHE_READONLY].m_CRC32 != 0))
-        {
-            for (i = 0; i < 2; i++)
-            {
-                pRes = pSR->m_pRes[i];
-                if (!pRes)
-                {
-                    continue;
-                }
-                pDE = pRes->mfGetEntry(CName);
-                if (pDE)
-                {
-                    break;
-                }
-            }
-        }
-
-        if (!pDE && !pSR)
-        {
-            // The .cfx has no associated .fxb, so this is a guaranteed failure on import.
-            return SHADER_IMPORT_FAILURE;
-        }
-        else if (!pDE)
-        {
-            // We have a shader import table but this specific permutation is missing
-            return SHADER_IMPORT_MISSING_ENTRY;
-        }
-    }
-
-    CShader* pSave = gRenDev->m_RP.m_pShader;
-    gRenDev->m_RP.m_pShader = pSH;
-    assert(gRenDev->m_RP.m_pShader != 0);
-
-    pRes->mfFileRead(pDE);
-    byte* pData = (byte*)pRes->mfFileGetBuf(pDE);
-    if (!pData)
-    {
-        // Malformed fxb
-        return SHADER_IMPORT_FAILURE;
-    }
-
-    //printf("[CShaderSerialize] Import Shader: %s flags: 0x%llx mdvFlags: 0x%x from %s cache %s\n", pSH->GetName(), pSH->m_nMaskGenFX, pSH->m_nMDV, bLoadedFromLevel ? "LEVEL" : "GLOBAL", pSR->m_pRes[i]->mfGetFileName());
-
-    byte* pSrc = pData;
-    g_fTime0 += iTimer->GetAsyncCurTime() - fTime0;
-
-    float fTime1 = iTimer->GetAsyncCurTime();
-
-    SShaderFXParams& fxParams = binShaderMgr.mfGetFXParams(pSH);
-
-    SShaderSerializeContext SC;
-    SC.SSR.Import(pSrc);
-    
-#ifdef SHADER_SERIALIZE_VERBOSE
-    CryLog("[CShaderSerialize] Import Shader: %s flags: 0x%llx mdvFlags: 0x%x from global cache %s\n", pSH->GetName(), pSH->m_nMaskGenFX, pSH->m_nMDV, pSR->m_pRes[i]->mfGetFileName());
-#endif
-
-    if (SC.SSR.m_nPublicParams)
-    {
-        SC.Params.ReserveNoClear(SC.SSR.m_nPublicParams);
-
-        if (!CParserBin::m_bEndians)
-        {
-            memcpy(&SC.Params[0], &pSrc[SC.SSR.m_nPublicParamsOffset], sizeof(SSShaderParam) * SC.SSR.m_nPublicParams);
-        }
-        else
-        {
-            uint32 offset = SC.SSR.m_nPublicParamsOffset;
-            for (i = 0; i < SC.SSR.m_nPublicParams; i++)
-            {
-                SC.Params[i].Import(&pSrc[offset]);
-                offset += sizeof(SSShaderParam);
-            }
-        }
-    }
-
-    if (SC.SSR.m_nFXParams)
-    {
-        SC.FXParams.ReserveNoClear(SC.SSR.m_nFXParams);
-
-        if (!CParserBin::m_bEndians)
-        {
-            memcpy(&SC.FXParams[0], &pSrc[SC.SSR.m_nFXParamsOffset], sizeof(SSFXParam) * SC.SSR.m_nFXParams);
-        }
-        else
-        {
-            uint32 offset = SC.SSR.m_nFXParamsOffset;
-            for (i = 0; i < SC.SSR.m_nFXParams; i++)
-            {
-                SC.FXParams[i].Import(&pSrc[offset]);
-                offset += sizeof(SSFXParam);
-            }
-        }
-    }
-       
-    if (SC.SSR.m_nFXSamplers)
-    {
-        SC.FXSamplers.ReserveNoClear(SC.SSR.m_nFXSamplers);
-
-        if (!CParserBin::m_bEndians)
-        {
-            memcpy(&SC.FXSamplers[0], &pSrc[SC.SSR.m_nFXSamplersOffset], sizeof(SSFXSampler) * SC.SSR.m_nFXSamplers);
-        }
-        else
-        {
-            uint32 offset = SC.SSR.m_nFXSamplersOffset;
-            for (i = 0; i < SC.SSR.m_nFXSamplers; i++)
-            {
-                SC.FXSamplers[i].Import(&pSrc[offset]);
-                offset += sizeof(SSTexSamplerFX);
-            }
-        }
-    }
-        
-    if (SC.SSR.m_nFXTextures)
-    {
-        SC.FXTextures.ReserveNoClear(SC.SSR.m_nFXTextures);
-        memcpy(&SC.FXTextures[0], &pSrc[SC.SSR.m_nFXTexturesOffset], sizeof(SSFXTexture) * SC.SSR.m_nFXTextures);
-    }
-
-    if (SC.SSR.m_nFXTexSamplers)
-    {
-        SC.FXTexSamplers.ReserveNoClear(SC.SSR.m_nFXTexSamplers);
-
-        if (!CParserBin::m_bEndians)
-        {
-            memcpy(&SC.FXTexSamplers[0], &pSrc[SC.SSR.m_nFXTexSamplersOffset], sizeof(SSTexSamplerFX) * SC.SSR.m_nFXTexSamplers);
-        }
-        else
-        {
-            uint32 offset = SC.SSR.m_nFXTexSamplersOffset;
-            for (i = 0; i < SC.SSR.m_nFXTexSamplers; i++)
-            {
-                SC.FXTexSamplers[i].Import(&pSrc[offset]);
-                offset += sizeof(SSTexSamplerFX);
-            }
-        }
-    }
-
-    if (SC.SSR.m_nFXTexRTs)
-    {
-        SC.FXTexRTs.ReserveNoClear(SC.SSR.m_nFXTexRTs);
-
-        if (!CParserBin::m_bEndians)
-        {
-            memcpy(&SC.FXTexRTs[0], &pSrc[SC.SSR.m_nFXTexRTsOffset], sizeof(SSHRenderTarget) * SC.SSR.m_nFXTexRTs);
-        }
-        else
-        {
-            uint32 offset = SC.SSR.m_nFXTexRTsOffset;
-            for (i = 0; i < SC.SSR.m_nFXTexRTs; i++)
-            {
-                SC.FXTexRTs[i].Import(&pSrc[offset]);
-                offset += sizeof(SSHRenderTarget);
-            }
-        }
-    }
-
-    if (SC.SSR.m_nTechniques)
-    {
-        SC.Techniques.ReserveNoClear(SC.SSR.m_nTechniques);
-
-        if (!CParserBin::m_bEndians)
-        {
-            memcpy(&SC.Techniques[0], &pSrc[SC.SSR.m_nTechOffset], sizeof(SSShaderTechnique) * SC.SSR.m_nTechniques);
-        }
-        else
-        {
-            uint32 offset = SC.SSR.m_nTechOffset;
-            for (i = 0; i < SC.SSR.m_nTechniques; i++)
-            {
-                SC.Techniques[i].Import(&pSrc[offset]);
-                offset += sizeof(SSShaderTechnique);
-            }
-        }
-    }
-
-    if (SC.SSR.m_nPasses)
-    {
-        SC.Passes.ReserveNoClear(SC.SSR.m_nPasses);
-
-        if (!CParserBin::m_bEndians)
-        {
-            memcpy(&SC.Passes[0], &pSrc[SC.SSR.m_nPassOffset], sizeof(SSShaderPass) * SC.SSR.m_nPasses);
-        }
-        else
-        {
-            uint32 offset = SC.SSR.m_nPassOffset;
-            for (i = 0; i < SC.SSR.m_nPasses; i++)
-            {
-                SC.Passes[i].Import(&pSrc[offset]);
-                offset += sizeof(SSShaderPass);
-            }
-        }
-    }
-
-    if (SC.SSR.m_nStringsSize)
-    {
-        SC.Strings.ReserveNoClear(SC.SSR.m_nStringsSize);
-        memcpy(&SC.Strings[0], &pSrc[SC.SSR.m_nStringsOffset], SC.SSR.m_nStringsSize);
-    }
-
-    if (SC.SSR.m_nDataSize)
-    {
-        SC.Data.ReserveNoClear(SC.SSR.m_nDataSize);
-        memcpy(&SC.Data[0], &pSrc[SC.SSR.m_nDataOffset], SC.SSR.m_nDataSize);
-    }
-
-    pRes->mfFileClose(pDE);
-
-    g_fTime1 += iTimer->GetAsyncCurTime() - fTime1;
-
-    float fTime2 = iTimer->GetAsyncCurTime();
-
-    pSH->m_eSHDType = SC.SSR.m_eSHDType;
-
-    //TODO |= on flags? will we lose flags at runtime
-    pSH->m_Flags = SC.SSR.m_Flags;
-    pSH->m_Flags2 = SC.SSR.m_Flags2;
-    pSH->m_nMDV = SC.SSR.m_nMDV;
-
-    AZ_Assert(SC.SSR.m_vertexFormatEnum < eVF_Max, "Bad vertex format index. Is the shader cache out of date?");
-    pSH->m_vertexFormat = gRenDev->m_RP.m_vertexFormats[SC.SSR.m_vertexFormatEnum];
-
-    pSH->m_eCull = SC.SSR.m_eCull;
-    pSH->m_eShaderType = SC.SSR.m_eShaderType;
-    pSH->m_nMaskGenFX = SC.SSR.m_nMaskGenFX;
-
-    fxParams.m_PublicParams.reserve(fxParams.m_PublicParams.size() + SC.SSR.m_nPublicParams);
-
-    for (i = 0; i < SC.SSR.m_nPublicParams; i++)
-    {
-        SSShaderParam& PR = SC.Params[i];
-        SShaderParam P;
-        const char* pName = sString(PR.m_nameIdx, SC.Strings);
-        P.m_Name = pName;
-        P.m_Type = PR.m_Type;
-        P.m_Value = PR.m_Value;
-        P.m_Script = sString(PR.m_nScriptOffs, SC.Strings);
-        fxParams.m_PublicParams.push_back(P);
-    }
-
-    fxParams.m_FXParams.reserve(fxParams.m_FXParams.size() + SC.SSR.m_nFXParams);
-
-    for (i = 0; i < SC.SSR.m_nFXParams; i++)
-    {
-        SFXParam fxParam;
-        fxParam.Import(SC, &SC.FXParams[i]);
-        fxParams.m_FXParams.push_back(fxParam);
-    }
-
-    fxParams.m_FXSamplersOld.reserve(fxParams.m_FXSamplersOld.size() + SC.SSR.m_nFXTexSamplers);
-
-    for (i = 0; i < SC.SSR.m_nFXTexSamplers; i++)
-    {
-        STexSamplerFX fxTexSampler;
-        fxTexSampler.Import(SC, &SC.FXTexSamplers[i]);
-        fxParams.m_FXSamplersOld.push_back(fxTexSampler);
-    }
-
-    fxParams.m_FXSamplers.reserve(fxParams.m_FXSamplers.size() + SC.SSR.m_nFXSamplers);
-
-    for (i = 0; i < SC.SSR.m_nFXSamplers; i++)
-    {
-        SFXSampler fxSampler;
-        fxSampler.Import(SC, &SC.FXSamplers[i]);
-        fxParams.m_FXSamplers.push_back(fxSampler);
-    }
-
-    fxParams.m_FXTextures.reserve(fxParams.m_FXTextures.size() + SC.SSR.m_nFXTextures);
-
-    for (i = 0; i < SC.SSR.m_nFXTextures; i++)
-    {
-        SFXTexture fxTexture;
-        fxTexture.Import(SC, &SC.FXTextures[i]);
-        fxParams.m_FXTextures.push_back(fxTexture);
-    }
-
-    for (i = 0; i < SC.SSR.m_nTechniques; i++)
-    {
-        SSShaderTechnique& ST = SC.Techniques[i];
-        SShaderTechnique* pT = new SShaderTechnique(pSH);
-        pT->m_NameStr = sString(ST.m_nNameOffs, SC.Strings);
-        pT->m_NameCRC = pT->m_NameStr.c_str();
-        pT->m_Flags = ST.m_Flags;
-        pT->m_nPreprocessFlags = ST.m_nPreprocessFlags;
-        for (j = 0; j < TTYPE_MAX; j++)
-        {
-            pT->m_nTechnique[j] = ST.m_nTechnique[j];
-        }
-
-        if (ST.m_nPasses)
-        {
-            int nOffs = ST.m_nPassesOffs;
-            pT->m_Passes.reserve(ST.m_nPasses);
-            for (j = 0; j < ST.m_nPasses; j++)
-            {
-                SSShaderPass& PS = SC.Passes[j + nOffs];
-                SShaderPass* P = pT->m_Passes.AddIndex(1);
-                P->m_RenderState = PS.m_RenderState;
-                P->m_eCull = PS.m_eCull;
-                P->m_AlphaRef = PS.m_AlphaRef;
-                P->m_PassFlags = PS.m_PassFlags;
-
-                P->m_VShader = ImportHWShader(SC, PS.m_nVShaderOffs, pSH->m_CRC32, pSH);
-                P->m_PShader = ImportHWShader(SC, PS.m_nPShaderOffs, pSH->m_CRC32, pSH);
-                P->m_GShader = ImportHWShader(SC, PS.m_nGShaderOffs, pSH->m_CRC32, pSH);
-                P->m_HShader = ImportHWShader(SC, PS.m_nHShaderOffs, pSH->m_CRC32, pSH);
-                P->m_DShader = ImportHWShader(SC, PS.m_nDShaderOffs, pSH->m_CRC32, pSH);
-                P->m_CShader = ImportHWShader(SC, PS.m_nCShaderOffs, pSH->m_CRC32, pSH);
-            }
-        }
-
-        uint32 nREOffset = ST.m_nREsOffs;
-
-        for (j = 0; j < ST.m_nREs; j++)
-        {
-            EDataType dataType = *((EDataType*)&SC.Data[nREOffset]);
-
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndianEnum(dataType, eBigEndian);
-            }
-
-            nREOffset += sizeof(EDataType);
-
-            switch (dataType)
-            {
-            case eDATA_LensOptics:
-            {
-                CRELensOptics* pLensOptics = new CRELensOptics;
-                pLensOptics->mfImport(SC, nREOffset);
-                pT->m_REs.push_back(pLensOptics);
-            }
-            break;
-            case eDATA_Beam:
-            {
-                CREBeam* pBeam = new CREBeam;
-                pBeam->mfImport(SC, nREOffset);
-                pT->m_REs.push_back(pBeam);
-            }
-            break;
-
-            default:
-                CryFatalError("Render element not supported for shader serialising");
-                break;
-            }
-
-            //expects 4 byte aligned
-            assert(!(nREOffset & 3));
-        }
-
-        pSH->m_HWTechniques.AddElem(pT);
-    }
-    gRenDev->m_RP.m_pShader = pSave;
-
-    g_fTime2 += iTimer->GetAsyncCurTime() - fTime2;
-
-    return SHADER_IMPORT_SUCCESS;
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderSerialize.h b/Code/CryEngine/RenderDll/Common/Shaders/ShaderSerialize.h
deleted file mode 100644
index a6d3f92fbb..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderSerialize.h
+++ /dev/null
@@ -1,1118 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __SHADERSERIALIZE_H__
-#define __SHADERSERIALIZE_H__
-
-#if defined(SHADERS_SERIALIZING)
-
-#include "../ResFile.h"
-
-// Enable this for verbose messages related to r_shadersExport and r_shadersImport
-//#define SHADER_SERIALIZE_VERBOSE
-
-//
-//  console enums taken from d3d9types.h
-//
-
-enum X360AddressModes
-{
-    X360TADDRESS_WRAP                    = 0,
-    X360TADDRESS_MIRROR                  = 1,
-    X360TADDRESS_CLAMP                   = 2,
-    X360TADDRESS_MIRRORONCE              = 3,
-    X360TADDRESS_BORDER_HALF             = 4,
-    X360TADDRESS_MIRRORONCE_BORDER_HALF  = 5,
-    X360TADDRESS_BORDER                  = 6,
-    X360TADDRESS_MIRRORONCE_BORDER       = 7,
-};
-
-enum X360FilterType
-{
-    X360TEXF_NONE            = 2,
-    X360TEXF_POINT           = 0,
-    X360TEXF_LINEAR          = 1,
-    X360TEXF_ANISOTROPIC     = 4,
-};
-
-inline void sAlignData(TArray<byte>& Dst, uint32 align)
-{
-    if (align > 0 && (Dst.Num() & (align - 1)))
-    {
-        const byte PAD = 0;
-        int pad = align - (Dst.Num() & (align - 1));
-
-        for (int i = 0; i < pad; i++)
-        {
-            Dst.push_back(PAD);
-        }
-    }
-}
-
-template <typename T>
-void sAddData(TArray<byte>& Dst, T Src, uint32 align = 0)
-{
-    int nSize = sizeof(T);
-    byte* pDst = Dst.Grow(nSize);
-
-    if (CParserBin::m_bEndians)
-    {
-        T data = Src;
-        SwapEndian(data, eBigEndian);
-        memcpy(pDst, &data, nSize);
-    }
-    else
-    {
-        memcpy(pDst, &Src, nSize);
-    }
-
-    if (align > 0)
-    {
-        sAlignData(Dst, align);
-    }
-}
-
-template <typename T>
-void sAddDataArray_POD(TArray<byte>& Dst, TArray<T>& Src, uint32& nOffs, uint32 align = 0)
-{
-    nOffs = Dst.Num();
-    int nSize = sizeof(T) * Src.Num();
-    if (!nSize)
-    {
-        return;
-    }
-    T* pDst = (T*)Dst.Grow(nSize);
-
-    if (CParserBin::m_bEndians)
-    {
-        for (uint32 i = 0; i < Src.size(); i++)
-        {
-            T d = Src[i];
-            SwapEndian(d, eBigEndian);
-            memcpy(pDst, &d, sizeof(T));
-            pDst++;
-        }
-    }
-    else
-    {
-        memcpy(pDst, &Src[0], nSize);
-    }
-
-    if (align > 0)
-    {
-        sAlignData(Dst, align);
-    }
-}
-
-template <typename T>
-void sExport(TArray<byte>& dst, T& data)
-{
-#if defined(AZ_ENABLE_TRACING)
-    int startNum = dst.Num();
-#endif
-
-    data.Export(dst);
-    
-    // DEBUG: Check we wrote the data we expected
-    // Only works on native export since structures are different sizes on console :(
-    if (!CParserBin::m_bEndians)
-    {
-        AZ_Assert(dst.Num() - startNum == sizeof(T), "ShaderSerialize export size mismatch");
-    }
-}
-
-template <typename T>
-void sAddDataArray(TArray<byte>& Dst, TArray<T>& Src, uint32& nOffs, uint32 align = 0)
-{
-    nOffs = Dst.Num();
-    int nSize = sizeof(T) * Src.Num();
-    if (!nSize)
-    {
-        return;
-    }
-
-    if (CParserBin::m_bEndians)
-    {
-        int startNum = Dst.Num();
-
-        for (uint32 i = 0; i < Src.size(); i++)
-        {
-            sExport(Dst, Src[i]);
-        }
-
-        // DEBUG - compare src and dest, check export was successful
-        if (!CParserBin::m_bEndians)
-        {
-            if (memcmp(&Src[0], &Dst[startNum], nSize) != 0)
-            {
-                CryFatalError("Copy failed");
-            }
-        }
-    }
-    else
-    {
-        byte* pDst = Dst.Grow(nSize);
-        memcpy(pDst, &Src[0], nSize);
-    }
-
-    if (align > 0)
-    {
-        sAlignData(Dst, align);
-    }
-}
-
-template <typename T>
-void SwapEndianEnum(T& e, bool bSwapEndian)
-{
-    uint32 enumConv = e;
-    SwapEndian(enumConv, bSwapEndian);
-    e = (T)enumConv;
-}
-
-struct SSShaderCacheHeader
-{
-    int m_SizeOf;
-    char m_szVer[16];
-    int m_MajorVer;
-    int m_MinorVer;
-    uint32 m_CRC32;
-    uint32 m_SourceCRC32;
-    SSShaderCacheHeader()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-    AUTO_STRUCT_INFO
-};
-
-
-struct SSShaderRes
-{
-    int m_nRefCount;
-    CResFile* m_pRes[2];
-    SSShaderCacheHeader m_Header[2];
-    bool m_bReadOnly[2];
-    SSShaderRes()
-    {
-        m_nRefCount = 1;
-        m_pRes[0] = NULL;
-        m_pRes[1] = NULL;
-        m_bReadOnly[0] = true;
-        m_bReadOnly[1] = true;
-    }
-    ~SSShaderRes()
-    {
-        SAFE_DELETE(m_pRes[0]);
-        SAFE_DELETE(m_pRes[1]);
-    }
-};
-typedef std::map<CCryNameTSCRC, SSShaderRes*> FXSShaderRes;
-typedef FXSShaderRes::iterator FXSShaderResItor;
-
-struct SSShader
-{
-    uint64 m_nMaskGenFX;
-
-    EShaderDrawType m_eSHDType;
-
-    uint32 m_Flags;
-    uint32 m_Flags2;
-    uint32 m_nMDV;
-
-    uint32 m_vertexFormatEnum;   // Base vertex format for the shader (see VertexFormats.h)
-    ECull m_eCull;                   // Global culling type
-
-    EShaderType m_eShaderType;
-
-    uint32 m_nTechniques;
-    uint32 m_nPasses;
-    uint32 m_nPublicParams;
-    uint32 m_nFXParams;
-    uint32 m_nFXSamplers;
-    uint32 m_nFXTextures;
-    uint32 m_nFXTexSamplers;
-    uint32 m_nFXTexRTs;
-    uint32 m_nDataSize;
-    uint32 m_nStringsSize;
-
-    uint32 m_nPublicParamsOffset;
-    uint32 m_nFXParamsOffset;
-    uint32 m_nFXSamplersOffset;
-    uint32 m_nFXTexturesOffset;
-    uint32 m_nFXTexSamplersOffset;
-    uint32 m_nFXTexRTsOffset;
-    uint32 m_nTechOffset;
-    uint32 m_nPassOffset;
-    uint32 m_nStringsOffset;
-    uint32 m_nDataOffset;
-
-    SSShader()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        [[maybe_unused]] uint32 startOffset = dst.Num();
-
-        sAddData(dst, m_nMaskGenFX);
-        sAddData(dst, (uint32)m_eSHDType);
-        sAddData(dst, m_Flags);
-        sAddData(dst, m_Flags2);
-        sAddData(dst, m_nMDV);
-        sAddData(dst, m_vertexFormatEnum);
-        sAddData(dst, (uint32)m_eCull);
-        sAddData(dst, (uint32)m_eShaderType);
-        sAddData(dst, m_nTechniques);
-        sAddData(dst, m_nPasses);
-        sAddData(dst, m_nPublicParams);
-        sAddData(dst, m_nFXParams);
-        sAddData(dst, m_nFXSamplers);
-        sAddData(dst, m_nFXTextures);
-        sAddData(dst, m_nFXTexSamplers);
-        sAddData(dst, m_nFXTexRTs);
-        sAddData(dst, m_nDataSize);
-        sAddData(dst, m_nStringsSize);
-
-        sAddData(dst, m_nPublicParamsOffset);
-        sAddData(dst, m_nFXParamsOffset);
-        sAddData(dst, m_nFXSamplersOffset);
-        sAddData(dst, m_nFXTexturesOffset);
-        sAddData(dst, m_nFXTexSamplersOffset);
-        sAddData(dst, m_nFXTexRTsOffset);
-        sAddData(dst, m_nTechOffset);
-        sAddData(dst, m_nPassOffset);
-        sAddData(dst, m_nStringsOffset);
-        sAddData(dst, m_nDataOffset);
-
-        uint32 PAD = 0;
-        sAddData(dst, PAD); //pad to 64bit
-        
-        AZ_Assert(dst.Num() - startOffset == sizeof(*this), "ShaderSerialize export size mismatch");
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_nMaskGenFX, eBigEndian);
-            SwapEndianEnum(m_eSHDType, eBigEndian);
-            ;
-            SwapEndian(m_Flags, eBigEndian);
-            ;
-            SwapEndian(m_Flags2, eBigEndian);
-            SwapEndian(m_nMDV, eBigEndian);
-            SwapEndianEnum(m_vertexFormatEnum, eBigEndian);
-            SwapEndianEnum(m_eCull, eBigEndian);
-            SwapEndianEnum(m_eShaderType, eBigEndian);
-            SwapEndian(m_nTechniques, eBigEndian);
-            SwapEndian(m_nPasses, eBigEndian);
-            SwapEndian(m_nPublicParams, eBigEndian);
-            SwapEndian(m_nFXParams, eBigEndian);
-            SwapEndian(m_nFXSamplers, eBigEndian);
-            SwapEndian(m_nFXTextures, eBigEndian);
-            SwapEndian(m_nFXTexSamplers, eBigEndian);
-            SwapEndian(m_nFXTexRTs, eBigEndian);
-            SwapEndian(m_nDataSize, eBigEndian);
-            SwapEndian(m_nStringsSize, eBigEndian);
-            SwapEndian(m_nPublicParamsOffset, eBigEndian);
-            SwapEndian(m_nFXParamsOffset, eBigEndian);
-            SwapEndian(m_nFXSamplersOffset, eBigEndian);
-            SwapEndian(m_nFXTexturesOffset, eBigEndian);
-            SwapEndian(m_nFXTexSamplersOffset, eBigEndian);
-            SwapEndian(m_nFXTexRTsOffset, eBigEndian);
-            SwapEndian(m_nTechOffset, eBigEndian);
-            SwapEndian(m_nPassOffset, eBigEndian);
-            SwapEndian(m_nStringsOffset, eBigEndian);
-            SwapEndian(m_nDataOffset, eBigEndian);
-        }
-    }
-};
-
-struct SSShaderParam
-{
-    uint32 m_nameIdx;
-    EParamType m_Type;
-    UParamVal m_Value;
-    int m_nScriptOffs;
-    uint8 m_eSemantic;
-
-    SSShaderParam()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        [[maybe_unused]] uint32 startOffset = dst.Num();
-
-        sAddData(dst, m_nameIdx);
-        sAddData(dst, (uint32)m_Type);
-
-        int sizeWritten = 0;
-
-        switch (m_Type)
-        {
-        case eType_BYTE:
-            sAddData(dst, m_Value.m_Byte);
-            sizeWritten = sizeof(m_Value.m_Byte);
-            break;
-        case eType_BOOL:
-            sAddData(dst, m_Value.m_Bool);
-            sizeWritten = sizeof(m_Value.m_Bool);
-            break;
-        case eType_SHORT:
-            sAddData(dst, m_Value.m_Short);
-            sizeWritten = sizeof(m_Value.m_Short);
-            break;
-        case eType_INT:
-            sAddData(dst, m_Value.m_Int);
-            sizeWritten = sizeof(m_Value.m_Int);
-            break;
-        case eType_HALF:
-            //half behaves like float?
-            sAddData(dst, m_Value.m_Float);
-            sizeWritten = sizeof(m_Value.m_Float);
-            break;
-        case eType_FLOAT:
-            sAddData(dst, m_Value.m_Float);
-            sizeWritten = sizeof(m_Value.m_Float);
-            break;
-        case eType_FCOLOR:
-        {
-            for (int i = 0; i < 4; i++)
-            {
-                sAddData(dst, m_Value.m_Color[i]);
-            }
-            sizeWritten = sizeof(m_Value.m_Color);
-        }
-        break;
-        case eType_VECTOR:
-        {
-            for (int i = 0; i < 3; i++)
-            {
-                sAddData(dst, m_Value.m_Vector[i]);
-            }
-            sizeWritten = sizeof(m_Value.m_Vector);
-        }
-        break;
-
-        //case eType_STRING,
-        //case eType_TEXTURE_HANDLE:
-        //case eType_CAMERA:
-        //case eType_UNKNOWN:
-        default:
-            CryFatalError("Shader param type not valid for export\n");
-            break;
-        }
-
-        //Pad to union size
-        byte PAD = 0;
-        uint32 nPadding = sizeof(UParamVal) - sizeWritten;
-
-        for (uint32 i = 0; i < nPadding; i++)
-        {
-            sAddData(dst, PAD);
-        }
-
-        sAddData(dst, m_nScriptOffs);
-        sAddData(dst, m_eSemantic);
-
-        // Align for struct padding
-        sAlignData(dst, 8);
-        
-        AZ_Assert(dst.Num() - startOffset == sizeof(*this), "ShaderSerialize export size mismatch");
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_nameIdx, eBigEndian);
-            SwapEndianEnum(m_Type, eBigEndian);
-
-            for (int i = 0; i < 4; i++)
-            {
-                SwapEndian(m_Value.m_Color[i], eBigEndian);
-            }
-            SwapEndian(m_nScriptOffs, eBigEndian);
-            SwapEndian(m_eSemantic, eBigEndian);
-        }
-    }
-};
-
-struct SSShaderTechnique
-{
-    int m_nNameOffs;
-    int m_nPassesOffs;
-    int m_nPasses;
-    int m_Flags;
-    int8 m_nTechnique[TTYPE_MAX]; //use CONSOLE_MAX for now, PC not supported
-    int m_nREsOffs;
-    int m_nREs;
-    uint32 m_nPreprocessFlags;
-
-    SSShaderTechnique()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        sAddData(dst, m_nNameOffs);
-        sAddData(dst, m_nPassesOffs);
-        sAddData(dst, m_nPasses);
-        sAddData(dst, m_Flags);
-
-        // TTYPE_MAX is different on console!
-        int TECH_MAX = TTYPE_MAX;
-
-        for (int i = 0; i < TECH_MAX; i++)
-        {
-            sAddData(dst, m_nTechnique[i]);
-        }
-
-        sAlignData(dst, 4);
-
-        sAddData(dst, m_nREsOffs);
-        sAddData(dst, m_nREs);
-        sAddData(dst, m_nPreprocessFlags);
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            //Cannot import non native data due to TTYPE_MAX being different on different platforms
-            CryFatalError("SSShaderTechnique non-native import not supported");
-
-            SwapEndian(m_nNameOffs, eBigEndian);
-            SwapEndian(m_nPassesOffs, eBigEndian);
-            SwapEndian(m_nPasses, eBigEndian);
-            SwapEndian(m_Flags, eBigEndian);
-
-            for (int i = 0; i < TTYPE_MAX; i++)
-            {
-                SwapEndian(m_nTechnique[i], eBigEndian);
-            }
-
-            SwapEndian(m_nREsOffs, eBigEndian);
-            SwapEndian(m_nREs, eBigEndian);
-            SwapEndian(m_nPreprocessFlags, eBigEndian);
-        }
-    }
-};
-
-struct SSShaderPass
-{
-    uint32 m_RenderState;
-    int8 m_eCull;
-    uint8 m_AlphaRef;
-    uint16 m_PassFlags;
-
-    uint32 m_nVShaderOffs;
-    uint32 m_nPShaderOffs;
-    uint32 m_nGShaderOffs;
-    uint32 m_nDShaderOffs;
-    uint32 m_nCShaderOffs;
-    uint32 m_nHShaderOffs;
-
-    uint32 m_nRenderElemOffset;
-
-    void Export(TArray<byte>& dst)
-    {
-        sAddData(dst, m_RenderState);
-        sAddData(dst, m_eCull);
-        sAddData(dst, m_AlphaRef);
-        sAddData(dst, m_PassFlags);
-
-        sAddData(dst, m_nVShaderOffs);
-        sAddData(dst, m_nPShaderOffs);
-
-#if 1
-        //if (CParserBin::PlatformSupportsGeometryShaders() &&
-        //    CParserBin::PlatformSupportsHullShaders() &&
-        //    CParserBin::PlatformSupportsDomainShaders() &&
-        //    CParserBin::PlatformSupportsComputeShaders())
-        {
-            sAddData(dst, m_nGShaderOffs);
-            sAddData(dst, m_nDShaderOffs);
-            sAddData(dst, m_nCShaderOffs);
-            sAddData(dst, m_nHShaderOffs);
-        }
-#endif
-
-        sAddData(dst, m_nRenderElemOffset);
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_RenderState, eBigEndian);
-            SwapEndian(m_eCull, eBigEndian);
-            SwapEndian(m_AlphaRef, eBigEndian);
-            SwapEndian(m_PassFlags, eBigEndian);
-
-            SwapEndian(m_nVShaderOffs, eBigEndian);
-            SwapEndian(m_nPShaderOffs, eBigEndian);
-            SwapEndian(m_nGShaderOffs, eBigEndian);
-            SwapEndian(m_nDShaderOffs, eBigEndian);
-            SwapEndian(m_nCShaderOffs, eBigEndian);
-            SwapEndian(m_nHShaderOffs, eBigEndian);
-
-            SwapEndian(m_nRenderElemOffset, eBigEndian);
-        }
-    }
-};
-
-struct SSLightEval
-{};
-
-struct SCHWShader
-{
-    uint64 m_nMaskGenShader;
-    uint64 m_nMaskGenFX;
-    uint64 m_nMaskAnd_RT;
-    uint64 m_nMaskOr_RT;
-
-    int m_Flags;
-    uint32 m_nsNameSourceFX;
-    uint32 m_nsName;
-    uint32 m_nsEntryFunc;
-    EHWShaderClass m_eSHClass;
-    uint32 m_nTokens;
-    uint32 m_nTableEntries;
-    uint32 m_nSamplers;
-    uint32 m_nParams;
-    uint32 m_dwShaderType;
-
-    SCHWShader()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        [[maybe_unused]] uint32 startOffset = dst.Num();
-
-        sAddData(dst, m_nMaskGenShader);
-        sAddData(dst, m_nMaskGenFX);
-        sAddData(dst, m_nMaskAnd_RT);
-        sAddData(dst, m_nMaskOr_RT);
-        sAddData(dst, m_Flags);
-        sAddData(dst, m_nsNameSourceFX);
-        sAddData(dst, m_nsName);
-        sAddData(dst, m_nsEntryFunc);
-        sAddData(dst, (uint32)m_eSHClass);
-        sAddData(dst, m_nTokens);
-        sAddData(dst, m_nTableEntries);
-        sAddData(dst, m_nSamplers);
-        sAddData(dst, m_nParams);
-        sAddData(dst, m_dwShaderType);
-
-        //uint32 PAD=0;
-        //sAddData(dst, PAD); //pad up to 64bit align due to uint64
-
-        AZ_Assert(dst.Num() - startOffset == sizeof(*this), "ShaderSerialize export size mismatch");
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_nMaskGenShader, eBigEndian);
-            SwapEndian(m_nMaskGenFX, eBigEndian);
-            SwapEndian(m_nsNameSourceFX, eBigEndian);
-            SwapEndian(m_nsName, eBigEndian);
-            SwapEndian(m_nsEntryFunc, eBigEndian);
-            SwapEndianEnum(m_eSHClass, eBigEndian);
-            SwapEndian(m_nTokens, eBigEndian);
-            SwapEndian(m_nTableEntries, eBigEndian);
-            SwapEndian(m_nSamplers, eBigEndian);
-            SwapEndian(m_nParams, eBigEndian);
-            SwapEndian(m_dwShaderType, eBigEndian);
-        }
-    }
-};
-
-struct SSTexSamplerFX
-{
-    int m_nsName;
-    int m_nsNameTexture;
-
-    int m_eTexType;
-    int m_nSamplerSlot;
-    uint32 m_nFlags;
-    uint32 m_nTexFlags;
-    int m_nRTIdx;
-    uint32 m_bTexState;
-    STexState ST;
-
-    SSTexSamplerFX()
-    {
-        // if any of these assert fails it means the platform headers have changed
-        // we must update the cached equivalents (see top of file)
-
-        memset(this, 0, sizeof(SSTexSamplerFX));
-    }
-
-    SSTexSamplerFX(const SSTexSamplerFX& rhs)
-    {
-        memcpy(this, &rhs, sizeof(SSTexSamplerFX));
-    }
-
-    SSTexSamplerFX& operator = (const SSTexSamplerFX& rhs)
-    {
-        memcpy(this, &rhs, sizeof(SSTexSamplerFX));
-        return *this;
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        [[maybe_unused]] uint32 startOffset = dst.Num();
-
-        sAddData(dst, m_nsName);
-        sAddData(dst, m_nsNameTexture);
-        sAddData(dst, m_eTexType);
-        sAddData(dst, m_nSamplerSlot);
-        sAddData(dst, m_nFlags);
-        sAddData(dst, m_nTexFlags);
-        sAddData(dst, m_nRTIdx);
-        sAddData(dst, m_bTexState);
-
-        sAddData(dst, ST.m_nMinFilter);
-        sAddData(dst, ST.m_nMagFilter);
-        sAddData(dst, ST.m_nMipFilter);
-        sAddData(dst, ST.m_nAddressU);
-        sAddData(dst, ST.m_nAddressV);
-        sAddData(dst, ST.m_nAddressW);
-        sAddData(dst, ST.m_nAnisotropy);
-        sAddData(dst, ST.padding);
-        sAddData(dst, ST.m_dwBorderColor);
-
-        sAddData(dst, ST.m_MipBias);
-
-        uint64 iPad = 0;
-        sAddData(dst, iPad); //m_pDeviceState
-        sAddData(dst, ST.m_bActive);
-        sAddData(dst, ST.m_bComparison);
-        sAddData(dst, ST.m_bSRGBLookup);
-        byte bPad = 0;
-        sAddData(dst, bPad);
-
-        AZ_Assert(dst.Num() - startOffset == sizeof(*this), "ShaderSerialize export size mismatch");
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_nsName, eBigEndian);
-            SwapEndian(m_nsNameTexture, eBigEndian);
-            SwapEndian(m_eTexType, eBigEndian);
-            SwapEndian(m_nSamplerSlot, eBigEndian);
-            SwapEndian(m_nFlags, eBigEndian);
-            SwapEndian(m_nTexFlags, eBigEndian);
-            SwapEndian(m_nRTIdx, eBigEndian);
-            SwapEndian(m_bTexState, eBigEndian);
-            SwapEndian(ST.m_dwBorderColor, eBigEndian);
-            SwapEndian(ST.m_bActive, eBigEndian);
-            SwapEndian(ST.m_bComparison, eBigEndian);
-            SwapEndian(ST.m_bSRGBLookup, eBigEndian);
-        }
-
-        ST.PostCreate();
-    }
-};
-
-struct SSHRenderTarget
-{
-    ERenderOrder m_eOrder;
-    int m_nProcessFlags;   // FSPR_ flags
-    uint32 m_nsTargetName;
-    int m_nWidth;
-    int m_nHeight;
-    ETEX_Format m_eTF;
-    int m_nIDInPool;
-    ERTUpdate m_eUpdateType;
-    uint32 m_bTempDepth;
-    ColorF m_ClearColor;
-    float m_fClearDepth;
-    uint32 m_nFlags;
-    uint32 m_nFilterFlags;
-
-    SSHRenderTarget()
-    {
-        memset(this, 0, sizeof(SSHRenderTarget));
-    }
-
-    // = operator to ensure padding is copied
-    SSHRenderTarget& operator = (const SSHRenderTarget& rhs)
-    {
-        memcpy(this, &rhs, sizeof(SSHRenderTarget));
-        return *this;
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        sAddData(dst, (uint32)m_eOrder);
-        sAddData(dst, m_nProcessFlags);
-        sAddData(dst, m_nsTargetName);
-        sAddData(dst, m_nWidth);
-        sAddData(dst, m_nHeight);
-
-        sAddData(dst, (uint8)m_eTF);
-        byte PAD = 0;
-        sAddData(dst, PAD);
-        sAddData(dst, PAD);
-        sAddData(dst, PAD);
-
-        sAddData(dst, m_nIDInPool);
-        sAddData(dst, (uint32)m_eUpdateType);
-        sAddData(dst, m_bTempDepth);
-        sAddData(dst, m_ClearColor.r);
-        sAddData(dst, m_ClearColor.g);
-        sAddData(dst, m_ClearColor.b);
-        sAddData(dst, m_ClearColor.a);
-        sAddData(dst, m_fClearDepth);
-        sAddData(dst, m_nFlags);
-        sAddData(dst, m_nFilterFlags);
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndianEnum(m_eOrder, eBigEndian);
-            SwapEndian(m_nProcessFlags, eBigEndian);
-            SwapEndian(m_nsTargetName, eBigEndian);
-            SwapEndian(m_nWidth, eBigEndian);
-            SwapEndian(m_nHeight, eBigEndian);
-            SwapEndianEnum(m_eTF, eBigEndian);
-            SwapEndian(m_nIDInPool, eBigEndian);
-            SwapEndianEnum(m_eUpdateType, eBigEndian);
-            SwapEndian(m_bTempDepth, eBigEndian);
-            SwapEndian(m_ClearColor.r, eBigEndian);
-            SwapEndian(m_ClearColor.g, eBigEndian);
-            SwapEndian(m_ClearColor.b, eBigEndian);
-            SwapEndian(m_ClearColor.a, eBigEndian);
-            SwapEndian(m_fClearDepth, eBigEndian);
-            SwapEndian(m_nFlags, eBigEndian);
-            SwapEndian(m_nFilterFlags, eBigEndian);
-        }
-    }
-};
-
-struct SSFXParam
-{
-    int m_nsName;      // Parameter name
-    uint32 m_nFlags;
-    short m_nParameters; // Number of paramters
-    short m_nComps;     // Number of components in single parameter
-    uint32 m_nsAnnotations; // Additional parameters (between <>)
-    uint32 m_nsSemantic;    // Parameter app handling type (after ':')
-    uint32 m_nsValues;    // Parameter values (after '=')
-    byte   m_eType;     // EParamType
-    int8   m_nCB;
-
-    short  m_nRegister[eHWSC_Num];
-
-    SSFXParam()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        [[maybe_unused]] uint32 startOffset = dst.Num();
-
-        sAddData(dst, m_nsName);
-        sAddData(dst, m_nFlags);
-        sAddData(dst, m_nParameters);
-        sAddData(dst, m_nComps);
-        sAddData(dst, m_nsAnnotations);
-        sAddData(dst, m_nsSemantic);
-        sAddData(dst, m_nsValues);
-        sAddData(dst, m_eType);
-        sAddData(dst, m_nCB);
-
-        for (int i = 0; i < eHWSC_Num; i++)
-        {
-            sAddData(dst, m_nRegister[i]);
-        }
-
-        // Align for struct padding
-        sAlignData(dst, 8);
-
-        AZ_Assert(dst.Num() - startOffset == sizeof(*this), "ShaderSerialize export size mismatch");
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_nsName, eBigEndian);
-            SwapEndian(m_nFlags, eBigEndian);
-            SwapEndian(m_nParameters, eBigEndian);
-            SwapEndian(m_nComps, eBigEndian);
-            SwapEndian(m_nsAnnotations, eBigEndian);
-            SwapEndian(m_nsSemantic, eBigEndian);
-            SwapEndian(m_nsValues, eBigEndian);
-            SwapEndian(m_eType, eBigEndian);
-            SwapEndian(m_nCB, eBigEndian);
-
-            for (int i = 0; i < eHWSC_Num; i++)
-            {
-                SwapEndian(m_nRegister[i], eBigEndian);
-            }
-        }
-    }
-};
-
-struct SSFXSampler
-{
-    int m_nsName;      // Parameter name
-    uint32 m_nFlags;
-    short m_nArray;       // Number of paramters
-    uint32 m_nsAnnotations; // Additional parameters (between <>)
-    uint32 m_nsSemantic;    // Parameter app handling type (after ':')
-    uint32 m_nsValues;    // Parameter values (after '=')
-    byte   m_eType;     // EParamType
-
-    short  m_nRegister[eHWSC_Num];
-
-    SSFXSampler()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        [[maybe_unused]] uint32 startOffset = dst.Num();
-
-        sAddData(dst, m_nsName);
-        sAddData(dst, m_nFlags);
-        sAddData(dst, m_nArray);
-        sAddData(dst, m_nsAnnotations);
-        sAddData(dst, m_nsSemantic);
-        sAddData(dst, m_nsValues);
-        sAddData(dst, m_eType);
-
-        for (int i = 0; i < eHWSC_Num; i++)
-        {
-            sAddData(dst, m_nRegister[i]);
-        }
-        
-        // Align for struct padding
-        sAlignData(dst, 8);
-
-        AZ_Assert(dst.Num() - startOffset == sizeof(*this), "ShaderSerialize export size mismatch");
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_nsName, eBigEndian);
-            SwapEndian(m_nFlags, eBigEndian);
-            SwapEndian(m_nArray, eBigEndian);
-            SwapEndian(m_nsAnnotations, eBigEndian);
-            SwapEndian(m_nsSemantic, eBigEndian);
-            SwapEndian(m_nsValues, eBigEndian);
-            SwapEndian(m_eType, eBigEndian);
-
-            for (int i = 0; i < eHWSC_Num; i++)
-            {
-                SwapEndian(m_nRegister[i], eBigEndian);
-            }
-        }
-    }
-};
-struct SSFXTexture
-{
-    int m_nsName;      // Parameter name
-    int m_nsNameTexture;
-    uint32 m_nFlags;
-    short m_nArray;       // Number of paramters
-    uint32 m_nsAnnotations; // Additional parameters (between <>)
-    uint32 m_nsSemantic;    // Parameter app handling type (after ':')
-    uint32 m_nsValues;    // Parameter values (after '=')
-    bool   m_bSRGBLookup;
-    byte   m_eType;     // EParamType
-
-    short  m_nRegister[eHWSC_Num];
-
-    SSFXTexture()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    void Export(TArray<byte>& dst)
-    {
-        [[maybe_unused]] uint32 startOffset = dst.Num();
-
-        sAddData(dst, m_nsName);
-        sAddData(dst, m_nsNameTexture);
-        sAddData(dst, m_nFlags);
-        sAddData(dst, m_nArray);
-        sAddData(dst, m_nsAnnotations);
-        sAddData(dst, m_nsSemantic);
-        sAddData(dst, m_nsValues);
-        sAddData(dst, m_eType);
-        sAddData(dst, m_bSRGBLookup);
-
-        for (int i = 0; i < eHWSC_Num; i++)
-        {
-            sAddData(dst, m_nRegister[i]);
-        }
-        
-        // Align for struct padding
-        sAlignData(dst, 8);
-
-        AZ_Assert(dst.Num() - startOffset == sizeof(*this), "ShaderSerialize export size mismatch");
-    }
-
-    void Import(const byte* pData)
-    {
-        memcpy(this, pData, sizeof(*this));
-
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(m_nsName, eBigEndian);
-            SwapEndian(m_nsNameTexture, eBigEndian);
-            SwapEndian(m_nFlags, eBigEndian);
-            SwapEndian(m_nArray, eBigEndian);
-            SwapEndian(m_nsAnnotations, eBigEndian);
-            SwapEndian(m_nsSemantic, eBigEndian);
-            SwapEndian(m_nsValues, eBigEndian);
-            SwapEndian(m_eType, eBigEndian);
-            SwapEndian(m_bSRGBLookup, eBigEndian);
-
-            for (int i = 0; i < eHWSC_Num; i++)
-            {
-                SwapEndian(m_nRegister[i], eBigEndian);
-            }
-        }
-    }
-};
-
-struct SShaderSerializeContext
-{
-    SSShader SSR;
-    TArray<SSShaderParam> Params;
-    TArray<SSFXParam> FXParams;
-    TArray<SSFXSampler> FXSamplers;
-    TArray<SSFXTexture> FXTextures;
-    TArray<SSTexSamplerFX> FXTexSamplers;
-    TArray<SSHRenderTarget> FXTexRTs;
-    TArray<SSShaderTechnique> Techniques;
-    TArray<SSShaderPass> Passes;
-    TArray<char> Strings;
-    TArray<byte> Data;
-
-    std::map<uint32, uint32> m_strTable;
-
-    uint32 AddString(const char* pStr)
-    {
-        uint32 crc = CCrc32::Compute(pStr);
-
-        std::map<uint32, uint32>::iterator strIt = m_strTable.find(crc);
-
-        if (strIt != m_strTable.end())
-        {
-            uint32 offset = strIt->second;
-
-            // Debug, check strings are correct
-#if 0
-            if (strcmp(&Strings[offset], pStr))
-            {
-                CryLogAlways("Error: %s is not %s\n", pStr, &Strings[offset]);
-            }
-#endif
-
-            return offset;
-        }
-
-        uint32 nChars = Strings.Num();
-        m_strTable[crc] = nChars;
-        Strings.AddString(pStr);
-        return nChars;
-    }
-};
-
-class CShaderSerialize
-{
-    friend class CShaderMan;
-    friend class CShaderManBin;
-
-public:
-    enum ShaderImportResults
-    {
-        SHADER_IMPORT_SUCCESS,          // Shader mask exists in the fxb lookup table
-        SHADER_IMPORT_MISSING_ENTRY,    // We have a valid fxb lookup table, but the current permutation is missing
-        SHADER_IMPORT_FAILURE,          // No fxb table exists for this entire shader
-    };
-
-    void ClearSResourceCache();
-
-private:
-    bool _OpenSResource(float fVersion, SSShaderRes* pSR, CShader* pSH, int nCache, CResFile* pRF, bool bReadOnly);
-    bool OpenSResource(const char* szName,  SSShaderRes* pSR, CShader* pSH, bool bDontUseUserFolder, bool bReadOnly);
-    bool CreateSResource(CShader* pSH, SSShaderRes* pSR, CCryNameTSCRC& SName, bool bDontUseUserFolder, bool bReadOnly);
-    SSShaderRes* InitSResource(CShader* pSH, bool bDontUseUserFolder, bool bReadOnly);
-    
-    // Simple query to see if the SResource exists in the hash table
-    bool DoesSResourceExist(CShader* pSH);
-
-    // Helper function to abstract calling ExportHWShader per shader stage  
-    void ExportHWShaderStage(SShaderSerializeContext& SC, CHWShader* shader, uint32& outShaderOffset);
-
-    bool ExportHWShader(CHWShader* pShader, struct SShaderSerializeContext& SC);
-
-    CHWShader* ImportHWShader(SShaderSerializeContext& SC, int nOffs, uint32 CRC32, CShader* pSH);
-
-    bool ExportShader(CShader* pSH, CShaderManBin& binShaderMgr);
-    ShaderImportResults ImportShader(CShader* pSH, CShaderManBin& binShaderMgr);
-    bool CheckFXBExists(CShader* pSH);
-
-    FXSShaderRes m_SShaderResources;
-    string m_customSerialisePath;
-};
-
-_inline const char* sString(int nOffs, TArray<char>& Strings)
-{
-    return &Strings[nOffs];
-}
-
-#endif // SHADERS_SERIALIZING
-
-#endif
-
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderStaticFlags.inl b/Code/CryEngine/RenderDll/Common/Shaders/ShaderStaticFlags.inl
deleted file mode 100644
index 84c122fbba..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderStaticFlags.inl
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-FX_STATIC_FLAG(GMEM_128BPP)
-FX_STATIC_FLAG(GMEM_256BPP)
-FX_STATIC_FLAG(GMEM_PLS)
-FX_STATIC_FLAG(LLVM_DIRECTX_SHADER_COMPILER)
-FX_STATIC_FLAG(FIXED_POINT)
-FX_STATIC_FLAG(GMEM_RT_GREATER_FOUR)
-FX_STATIC_FLAG(NO_DEPTH_CLIPPING)
-FX_STATIC_FLAG(FEATURE_FETCH_DEPTHSTENCIL)
-FX_STATIC_FLAG(GMEM_VELOCITY_BUFFER)
-FX_STATIC_FLAG(GLES3_0)
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShaderTemplate.cpp b/Code/CryEngine/RenderDll/Common/Shaders/ShaderTemplate.cpp
deleted file mode 100644
index 79a74c35a9..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShaderTemplate.cpp
+++ /dev/null
@@ -1,1239 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "I3DEngine.h"
-#include "CryHeaders.h"
-#include "StringUtils.h"                                // stristr()
-#include "../Common/Textures/TextureHelpers.h"
-#include "../Common/Textures/TextureManager.h"
-
-#if defined(WIN32) || defined(WIN64)
-#include <direct.h>
-#include <io.h>
-#elif defined(LINUX)
-
-#endif
-
-//===============================================================================
-#if !defined(_RELEASE)
-    // Texture names to be used for error / process loading indications
-    static const char* szReplaceMe = "EngineAssets/TextureMsg/ReplaceMe.tif";
-#else
-    // Some of the textures here will direct to the regular DefaultSolids_diff to prevent eye catching
-    // bug textures in release mode
-    static const char* szReplaceMe = "EngineAssets/TextureMsg/ReplaceMeRelease.tif";
-#endif
-
-//===============================================================================
-CShaderResources* CShaderMan::mfCreateShaderResources(const SInputShaderResources* Res, bool bShare)
-{
-    uint16      i, j;
-    SInputShaderResources localCopySR = *Res;    // pay attention to this local copy
-
-    // prepare local resources for cache-check, textures are looked up but not triggered for load
-    for ( auto& iter : localCopySR.m_TexturesResourcesMap )
-    {
-        SEfResTexture*      pTextureRes = &(iter.second);
-
-        // Store off the previous texture's flags before we clean up the sampler slot
-        uint32              textureFlags = (pTextureRes->m_Sampler.m_pTex) ? pTextureRes->m_Sampler.m_pTex->GetFlags() : 0;
-
-        pTextureRes->m_Sampler.Cleanup();
-        if (!pTextureRes->m_Name.empty())
-        {   // If the texture that used to exist in this resource slot was created as an alpha texture
-            // e.g. - a gloss map stored in the alpha channel of a normal map (see CShaderMan::mfRefreshResources for some
-            // extra details on the texture slots that use the FT_ALPHA texture path), we need to pass the FT_ALPHA flag
-            // into mfFindResourceTexture so it can find the actual texture resource.
-            const uint32    alphaTextureFlags = textureFlags & FT_ALPHA;
-
-            // Find the actual texture resource according to the given name
-            pTextureRes->m_Sampler.m_pTex = mfFindResourceTexture(
-                pTextureRes->m_Name.c_str(), localCopySR.m_TexturePath.c_str(),
-                pTextureRes->m_Sampler.GetTexFlags() | alphaTextureFlags, pTextureRes);
-
-            if (pTextureRes->m_Sampler.m_pTex)
-            {   // increase usage counter if texture was found
-                pTextureRes->m_Sampler.m_pTex->AddRef();
-            }
-        }
-/*      [Shader System TO DO] - verify if possible to remove slot
-        else
-        {
-            AZ_Warning( "ShadersSystem", false, "CShaderMan::mfCreateShaderResources - texture name does not exist at slot %d - removing slot", iter->first);
-            pLocalCopySR.m_TexturesResourcesMap.erase(iter);
-        }
-*/
-    }
-
-    // check local resources vs' global cache
-    int      nFree = -1;
-    for (i = 1; i < CShader::s_ShaderResources_known.Num(); i++)    // first entry is a null entry
-    {
-        // NOT thread safe can be modified from render thread in SRenderShaderResources dtor ()
-        // (if flushing of unloaded textures (UnloadLevel) is not complete before pre-loading of new materials)
-        CShaderResources*   pLoadedSRes = CShader::s_ShaderResources_known[i];
-        if (!pLoadedSRes)
-        {
-            nFree = i;  // find the first free slot in the bank
-            if (!bShare || Res->m_ShaderParams.size())
-            {
-                break;
-            }
-            continue;
-        }
-        if (!bShare || Res->m_ShaderParams.size())
-        {
-            continue;
-        }
-
-        // [Shader System TO DO] - see if can be replaced with unified compare function
-        if (localCopySR.m_ResFlags == pLoadedSRes->GetResFlags() &&
-            localCopySR.m_LMaterial.m_Opacity == pLoadedSRes->GetStrengthValue(EFTT_OPACITY) &&
-            localCopySR.m_LMaterial.m_Emittance.a == pLoadedSRes->GetStrengthValue(EFTT_EMITTANCE) &&
-            localCopySR.m_AlphaRef == pLoadedSRes->GetAlphaRef() &&
-            localCopySR.m_TexturePath == pLoadedSRes->m_TexturePath)
-        {
-            // if there is not shader deformation or both deformations are identical
-            if ((!pLoadedSRes->m_pDeformInfo && !localCopySR.m_DeformInfo.m_eType) || (pLoadedSRes->m_pDeformInfo && *pLoadedSRes->m_pDeformInfo == localCopySR.m_DeformInfo))
-            {
-                // [Shader System TO DO] - optimize
-                // The following code runs over all slots and verify a match between current shader and
-                // loaded shaders If no match - break and add to the loaded.
-                for (j = 0; j < EFTT_MAX; j++)
-                {
-                    SEfResTexture*  pLoadedTexRes = pLoadedSRes->GetTextureResource(j);
-                    SEfResTexture*  pShaderTexRes = localCopySR.GetTextureResource(j);
-
-                    // No loaded (cached) texture slot or no texture name for this slot
-                    if (!pLoadedTexRes || pLoadedTexRes->m_Name.empty())
-                    {
-                        if (!pShaderTexRes || pShaderTexRes->m_Name.empty())
-                        {   // match - no texture slot or texture name - move to the next slot
-                            continue;
-                        }
-
-                        // slot exists but cannot be found in the resource - no shaders match - try the next cached shader
-                        break;
-                    }
-                    // Cached slot entry with texture name exists - test to see if exists for the current shader
-                    else if (!pShaderTexRes || pShaderTexRes->m_Name.empty())
-                    {
-                        break;  // texture slot doesn't exist / no texture name for current shader - no match - move to next cached shader
-                    }
-
-                    // both slots exist - run a full comparison between the two shaders (current and cached)
-                    if (*pLoadedTexRes != *pShaderTexRes)
-                    {
-                        break;  // no match - move to the next cached shader
-                    }
-                }
-
-                // The two shader resources fully match - return the cached shader resource (no need to load)
-                if (j == EFTT_MAX)
-                {
-                    pLoadedSRes->AddRef();      // add usage count to this loaded shader resource
-                    return pLoadedSRes;
-                }
-            }
-        }
-    }
-
-    // The current shader resource does not exist - create a dynamic copy to be loaded and
-    // insert to the cached resources bank.
-    CShaderResources*   pSR = new CShaderResources(&localCopySR);
-    pSR->m_nRefCounter = 1;
-    if (!CShader::s_ShaderResources_known.Num())
-    {
-        CShader::s_ShaderResources_known.AddIndex(1);
-        CShaderResources* pSRNULL = new CShaderResources;
-        pSRNULL->m_nRefCounter = 1;
-        CShader::s_ShaderResources_known[0] = pSRNULL;
-    }
-    else if (nFree < 0 && CShader::s_ShaderResources_known.Num() >= MAX_REND_SHADER_RES)
-    {
-        Warning("ERROR: CShaderMan::mfCreateShaderResources: MAX_REND_SHADER_RESOURCES hit");
-        pSR->Release();
-        return CShader::s_ShaderResources_known[1];
-    }
-    if (nFree > 0)
-    {
-        pSR->m_Id = nFree;
-        pSR->m_IdGroup = pSR->m_Id;
-        CShader::s_ShaderResources_known[nFree] = pSR;
-    }
-    else
-    {
-        pSR->m_Id = CShader::s_ShaderResources_known.Num();
-        pSR->m_IdGroup = pSR->m_Id;
-        CShader::s_ShaderResources_known.AddElem(pSR);
-    }
-
-    return pSR;
-}
-
-void CShaderResources::SetShaderParams(SInputShaderResources* pDst, IShader* pSH)
-{
-    ReleaseParams();
-    m_ShaderParams = pDst->m_ShaderParams;
-
-    UpdateConstants(pSH);
-}
-
-
-uint32 SShaderItem::PostLoad()
-{
-    uint32 nPreprocessFlags = 0;
-    CShader* pSH = (CShader*)m_pShader;
-    CShaderResources* pR = (CShaderResources*)m_pShaderResources;
-
-    if (pSH->m_Flags2 & EF2_PREPR_GENCLOUDS)
-    {
-        nPreprocessFlags |= FSPR_GENCLOUDS;
-    }
-    if (pSH->m_Flags2 & EF2_PREPR_SCANWATER)
-    {
-        nPreprocessFlags |= FSPR_SCANTEXWATER | FB_PREPROCESS;
-    }
-
-    nPreprocessFlags |= FB_GENERAL;
-    const SShaderTechnique* pTech = GetTechnique();
-    if (pR)
-    {
-        pR->PostLoad(pSH);
-
-        for (auto& iter : pR->m_TexturesResourcesMap )
-        {
-            SEfResTexture*  pTexture = &(iter.second);
-            bool            is2DTexture = (pTexture->m_Sampler.m_eTexType == eTT_Auto2D || pTexture->m_Sampler.m_eTexType == eTT_Dyn2D);
-
-            if (!pTexture->m_Sampler.m_pTarget)
-            {
-                continue;
-            }
-
-            if (is2DTexture)
-            {
-                if (gRenDev->m_RP.m_eQuality == eRQ_Low)
-                {
-                    pTexture->m_Sampler.m_eTexType = eTT_2D;
-                }
-                pR->m_ResFlags |= MTL_FLAG_NOTINSTANCED;
-                nPreprocessFlags |= FSPR_SCANTEX;
-            }
-            pR->m_RTargets.AddElem(pTexture->m_Sampler.m_pTarget);
-        }
-    }
-
-    if (pTech && pTech->m_Passes.Num() && (pTech->m_Passes[0].m_RenderState & GS_ALPHATEST_MASK))
-    {
-        if (pR && !pR->m_AlphaRef)
-        {
-            pR->m_AlphaRef = 0.5f;
-        }
-    }
-
-    // Update persistent batch flags
-    if (pTech)
-    {
-        if (pTech->m_nTechnique[TTYPE_Z] > 0)
-        {
-            nPreprocessFlags |= FB_Z;
-
-            // ZPrepass only for non-alpha tested/blended geometry (decals, terrain).
-            // We assume vegetation is special case due to potential massive overdraw
-            if (pTech->m_nTechnique[TTYPE_ZPREPASS] > 0)
-            {
-                const bool bAlphaTested = (pR && pR->IsAlphaTested());
-                if (!bAlphaTested)
-                {
-                    nPreprocessFlags |= FB_ZPREPASS;
-                }
-            }
-        }
-
-        if (!(pTech->m_Flags & FHF_POSITION_INVARIANT) && ((pTech->m_Flags & FHF_TRANSPARENT) || (pR && pR->IsTransparent())))
-        {
-            nPreprocessFlags |= FB_TRANSPARENT;
-        }
-
-        if (pTech->m_nTechnique[TTYPE_WATERREFLPASS] > 0)
-        {
-            nPreprocessFlags |= FB_WATER_REFL;
-        }
-
-        if (pTech->m_nTechnique[TTYPE_WATERCAUSTICPASS] > 0)
-        {
-            nPreprocessFlags |= FB_WATER_CAUSTIC;
-        }
-
-        if ((pSH->m_Flags2 & EF2_SKINPASS))
-        {
-            nPreprocessFlags |= FB_SKIN;
-        }
-
-        if (CRenderer::CV_r_SoftAlphaTest && pTech->m_nTechnique[TTYPE_SOFTALPHATESTPASS] > 0)
-        {
-            nPreprocessFlags |= FB_SOFTALPHATEST;
-        }
-
-        if (pSH->m_Flags2 & EF2_EYE_OVERLAY)
-        {
-            nPreprocessFlags |= FB_EYE_OVERLAY;
-        }
-
-        if (pSH->m_Flags & EF_REFRACTIVE)
-        {
-            if (CRenderer::CV_r_Refraction)
-            {
-                nPreprocessFlags |= FB_TRANSPARENT;
-            }
-            else
-            {
-                AZ_Warning("ShadersSystem", false,
-                    "Shader %s use refraction but it's not enabled for this configuration. Check the value of the CVAR r_Refraction.",
-                    pSH->m_NameShader.c_str());
-            }
-        }
-    }
-
-    if (pTech)
-    {
-        nPreprocessFlags |= pTech->m_nPreprocessFlags;
-    }
-
-    if (nPreprocessFlags & FSPR_MASK)
-    {
-        nPreprocessFlags |= FB_PREPROCESS;
-    }
-
-    return nPreprocessFlags;
-}
-
-//------------------------------------------------------------------------------
-// [Shader System TO DO] - remove and replace with data driven from the shader files
-// This method should be per shader type and not generic to the entire engine.
-
-// This method associates fixed slots with known contextual material textures
-// The engine slots are left unhandled and will be assigned through the
-// shader and engine side - explore how!
-//------------------------------------------------------------------------------
-EEfResTextures CShaderMan::mfCheckTextureSlotName(const char* mapname)
-{
-    EEfResTextures slot = EFTT_UNKNOWN;
-
-    if (!azstricmp(mapname, "$Diffuse"))
-    {
-        slot = EFTT_DIFFUSE;
-    }
-    else if (!azstricmp(mapname, "$Normal"))
-    {
-        slot = EFTT_NORMALS;
-    }
-    else if (!azstricmp(mapname, "$Specular"))
-    {
-        slot = EFTT_SPECULAR;
-    }
-    else if (!azstricmp(mapname, "$Env"))
-    {
-        slot = EFTT_ENV;
-    }
-    else if (!azstricmp(mapname, "$Detail"))
-    {
-        slot = EFTT_DETAIL_OVERLAY;
-    }
-    else if (!azstricmp(mapname, "$SecondSmoothness"))
-    {
-        slot = EFTT_SECOND_SMOOTHNESS;
-    }
-    else if (!azstricmp(mapname, "$Height"))
-    {
-        slot = EFTT_HEIGHT;
-    }
-    else if (!azstricmp(mapname, "$DecalOverlay"))
-    {
-        slot = EFTT_DECAL_OVERLAY;
-    }
-    else if (!azstricmp(mapname, "$Subsurface"))
-    {
-        slot = EFTT_SUBSURFACE;
-    }
-    else if (!azstricmp(mapname, "$CustomMap"))
-    {   // Used as Diffuse 2 when BlendLayer is enabled
-        slot = EFTT_CUSTOM;
-    }
-    else if (!azstricmp(mapname, "$Specular2"))
-    {   // Used as Specular 2 when BlendLayer is enabled
-        slot = EFTT_SPECULAR_2;
-    }
-    else if (!azstricmp(mapname, "$CustomSecondaryMap"))
-    {   // Used as Normal 2 when BlendLayer is enabled
-        slot = EFTT_CUSTOM_SECONDARY;
-    }
-    else if (!azstricmp(mapname, "$Opacity"))
-    {   // Used as Blend Map for BlendLayer is enabled
-        slot = EFTT_OPACITY;
-    }
-    else if (!azstricmp(mapname, "$Smoothness"))
-    {
-        slot = EFTT_SMOOTHNESS;
-    }
-    else if (!azstricmp(mapname, "$Emittance"))
-    {
-        slot = EFTT_EMITTANCE;
-    }
-    else if (!azstricmp(mapname, "$Occlusion"))
-    {
-        slot = EFTT_OCCLUSION;
-    }
-    // backwards compatible names
-    else if (!azstricmp(mapname, "$Cubemap"))
-    {
-        slot = EFTT_ENV;
-    }
-    else if (!azstricmp(mapname, "$Translucency"))
-    {
-        slot = EFTT_SECOND_SMOOTHNESS;
-    }
-    else if (!azstricmp(mapname, "$BumpDiffuse"))
-    {
-        slot = EFTT_SECOND_SMOOTHNESS;                                                //EFTT_BUMP_DIFFUSE;
-    }
-    else if (!azstricmp(mapname, "$BumpHeight"))
-    {
-        slot = EFTT_HEIGHT;                                                //EFTT_BUMP_HEIGHT;
-    }
-    else if (!azstricmp(mapname, "$Bump"))
-    {
-        slot = EFTT_NORMALS;                                                //EFTT_BUMP;
-    }
-    else if (!azstricmp(mapname, "$Gloss"))
-    {
-        slot = EFTT_SPECULAR;                                                //EFTT_GLOSS;
-    }
-    else if (!azstricmp(mapname, "$GlossNormalA"))
-    {
-        slot = EFTT_SMOOTHNESS;                                                //EFTT_GLOSS_NORMAL_A;
-    }
-
-    return slot;
-}
-
-//------------------------------------------------------------------------------
-// [Shader System TO DO] - data driven per update frequencies and the slots map
-//------------------------------------------------------------------------------
-CTexture* CShaderMan::mfCheckTemplateTexName(const char* mapname, [[maybe_unused]] ETEX_Type eTT)
-{
-    CTexture* TexPic = NULL;
-    if (mapname[0] != '$')
-    {
-        return NULL;
-    }
-
-    {
-        EEfResTextures slot = mfCheckTextureSlotName(mapname);
-
-        if (slot != EFTT_MAX)
-        {
-            return &(*CTexture::s_ShaderTemplates)[slot];
-        }
-    }
-
-    if (!azstricmp(mapname, "$ShadowPoolAtlas"))
-    {
-        TexPic = CTexture::s_ptexRT_ShadowPool;
-    }
-    else
-    if (!azstrnicmp(mapname, "$ShadowID", 9))
-    {
-        int n = atoi(&mapname[9]);
-        TexPic = CTexture::s_ptexShadowID[n];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE") || !azstricmp(mapname, "$FromRE0"))
-    {
-        TexPic = CTexture::s_ptexFromRE[0];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE1"))
-    {
-        TexPic = CTexture::s_ptexFromRE[1];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE2"))
-    {
-        TexPic = CTexture::s_ptexFromRE[2];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE3"))
-    {
-        TexPic = CTexture::s_ptexFromRE[3];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE4"))
-    {
-        TexPic = CTexture::s_ptexFromRE[4];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE5"))
-    {
-        TexPic = CTexture::s_ptexFromRE[5];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE6"))
-    {
-        TexPic = CTexture::s_ptexFromRE[6];
-    }
-    else
-    if (!azstricmp(mapname, "$FromRE7"))
-    {
-        TexPic = CTexture::s_ptexFromRE[7];
-    }
-    else
-    if (!azstricmp(mapname, "$VolObj_Density"))
-    {
-        TexPic = CTexture::s_ptexVolObj_Density;
-    }
-    else
-    if (!azstricmp(mapname, "$VolObj_Shadow"))
-    {
-        TexPic = CTexture::s_ptexVolObj_Shadow;
-    }
-    else
-    if (!azstricmp(mapname, "$ColorChart"))
-    {
-        TexPic = CTexture::s_ptexColorChart;
-    }
-    else
-    if (!azstricmp(mapname, "$FromObj"))
-    {
-        TexPic = CTexture::s_ptexFromObj;
-    }
-    else
-    if (!azstricmp(mapname, "$SvoTree"))
-    {
-        TexPic = CTexture::s_ptexSvoTree;
-    }
-    else
-    if (!azstricmp(mapname, "$SvoTris"))
-    {
-        TexPic = CTexture::s_ptexSvoTris;
-    }
-    else
-    if (!azstricmp(mapname, "$SvoGlobalCM"))
-    {
-        TexPic = CTexture::s_ptexSvoGlobalCM;
-    }
-    else
-    if (!azstricmp(mapname, "$SvoRgbs"))
-    {
-        TexPic = CTexture::s_ptexSvoRgbs;
-    }
-    else
-    if (!azstricmp(mapname, "$SvoNorm"))
-    {
-        TexPic = CTexture::s_ptexSvoNorm;
-    }
-    else
-    if (!azstricmp(mapname, "$SvoOpac"))
-    {
-        TexPic = CTexture::s_ptexSvoOpac;
-    }
-    else
-    if (!azstricmp(mapname, "$FromObjCM"))
-    {
-        TexPic = CTexture::s_ptexFromObjCM;
-    }
-    else
-    if (!azstrnicmp(mapname, "$White", 6))
-    {
-        TexPic = CTextureManager::Instance()->GetWhiteTexture();
-    }
-    else
-    if (!azstrnicmp(mapname, "$RT_2D", 6))
-    {
-        TexPic = CTexture::s_ptexRT_2D;
-    }
-    else
-    if (!azstricmp(mapname, "$PrevFrameScaled"))
-    {
-        TexPic = CTexture::s_ptexPrevFrameScaled;
-    }
-    else
-    if (!azstricmp(mapname, "$BackBuffer"))
-    {
-        TexPic = CTexture::s_ptexBackBuffer;
-    }
-    else
-    if (!azstricmp(mapname, "$ModelHUD"))
-    {
-        TexPic = CTexture::s_ptexModelHudBuffer;
-    }
-    else
-    if (!azstricmp(mapname, "$BackBufferScaled_d2"))
-    {
-        TexPic = CTexture::s_ptexBackBufferScaled[0];
-    }
-    else
-    if (!azstricmp(mapname, "$BackBufferScaled_d4"))
-    {
-        TexPic = CTexture::s_ptexBackBufferScaled[1];
-    }
-    else
-    if (!azstricmp(mapname, "$BackBufferScaled_d8"))
-    {
-        TexPic = CTexture::s_ptexBackBufferScaled[2];
-    }
-    else
-    if (!azstricmp(mapname, "$HDR_BackBuffer"))
-    {
-        TexPic = CTexture::s_ptexSceneTarget;
-    }
-    else
-    if (!azstricmp(mapname, "$HDR_BackBufferScaled_d2"))
-    {
-        TexPic = CTexture::s_ptexHDRTargetScaled[0];
-    }
-    else
-    if (!azstricmp(mapname, "$HDR_BackBufferScaled_d4"))
-    {
-        TexPic = CTexture::s_ptexHDRTargetScaled[1];
-    }
-    else
-    if (!azstricmp(mapname, "$HDR_BackBufferScaled_d8"))
-    {
-        TexPic = CTexture::s_ptexHDRTargetScaled[2];
-    }
-    else
-    if (!azstricmp(mapname, "$HDR_FinalBloom"))
-    {
-        TexPic = CTexture::s_ptexHDRFinalBloom;
-    }
-    else
-    if (!azstricmp(mapname, "$HDR_TargetPrev"))
-    {
-        TexPic = CTexture::s_ptexHDRTargetPrev;
-    }
-    else
-    if (!azstricmp(mapname, "$HDR_AverageLuminance"))
-    {
-        TexPic = CTexture::s_ptexHDRMeasuredLuminanceDummy;
-    }
-    else
-    if (!azstricmp(mapname, "$ZTarget"))
-    {
-        TexPic = CTexture::s_ptexZTarget;
-    }
-    else
-    if (!azstricmp(mapname, "$ZTargetScaled"))
-    {
-        TexPic = CTexture::s_ptexZTargetScaled;
-    }
-    else
-    if (!azstricmp(mapname, "$ZTargetScaled2"))
-    {
-        TexPic = CTexture::s_ptexZTargetScaled2;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneTarget"))
-    {
-        TexPic = CTexture::s_ptexSceneTarget;
-    }
-    else
-    if (!azstricmp(mapname, "$CloudsLM"))
-    {
-        TexPic = CTexture::s_ptexCloudsLM;
-    }
-    else
-    if (!azstricmp(mapname, "$WaterVolumeDDN"))
-    {
-        TexPic = CTexture::s_ptexWaterVolumeDDN;
-    }
-    else
-    if (!azstricmp(mapname, "$WaterVolumeReflPrev"))
-    {
-        TexPic = CTexture::s_ptexWaterVolumeRefl[1];
-    }
-    else
-    if (!azstricmp(mapname, "$WaterVolumeRefl"))
-    {
-        TexPic = CTexture::s_ptexWaterVolumeRefl[0];
-    }
-    else
-    if (!azstricmp(mapname, "$WaterVolumeCaustics"))
-    {
-        TexPic = CTexture::s_ptexWaterCaustics[0];
-    }
-    else
-    if (!azstricmp(mapname, "$WaterVolumeCausticsTemp"))
-    {
-        TexPic = CTexture::s_ptexWaterCaustics[1];
-    }
-    else
-    if (!azstricmp(mapname, "$SceneNormalsMap"))
-    {
-        TexPic = CTexture::s_ptexSceneNormalsMap;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneNormalsMapMS"))
-    {
-        TexPic = CTexture::s_ptexSceneNormalsMapMS;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneDiffuse"))
-    {
-        TexPic = CTexture::s_ptexSceneDiffuse;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneSpecular"))
-    {
-        TexPic = CTexture::s_ptexSceneSpecular;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneNormalsBent"))
-    {
-        TexPic = CTexture::s_ptexSceneNormalsBent;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneDiffuseAcc"))
-    {
-        TexPic = CTexture::s_ptexCurrentSceneDiffuseAccMap;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneSpecularAcc"))
-    {
-        TexPic = CTexture::s_ptexSceneSpecularAccMap;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneDiffuseAccMS"))
-    {
-        TexPic = CTexture::s_ptexSceneDiffuseAccMapMS;
-    }
-    else
-    if (!azstricmp(mapname, "$SceneSpecularAccMS"))
-    {
-        TexPic = CTexture::s_ptexSceneSpecularAccMapMS;
-    }
-    else
-    if (!azstricmp(mapname, "$DefaultEnvironmentProbe"))
-    {
-        TexPic = CTexture::s_defaultEnvironmentProbeDummy;
-    }
-
-    return TexPic;
-}
-
-//------------------------------------------------------------------------------
-// [Shader System TO DO] - remove and replace with data driven from the shader files
-//------------------------------------------------------------------------------
-const char* CShaderMan::mfTemplateTexIdToName(int Id)
-{
-    switch (Id)
-    {
-    case EFTT_DIFFUSE:
-        return "Diffuse";
-    case EFTT_SPECULAR:
-        return "Gloss";
-    case EFTT_NORMALS:
-        return "Bump";
-    case EFTT_ENV:
-        return "Environment";
-    case EFTT_SUBSURFACE:
-        return "SubSurface";
-    case EFTT_CUSTOM:
-        return "CustomMap";
-    case EFTT_CUSTOM_SECONDARY:
-        return "CustomSecondaryMap";
-    case EFTT_DETAIL_OVERLAY:
-        return "Detail";
-    case EFTT_OPACITY:
-        return "Opacity";
-    case EFTT_DECAL_OVERLAY:
-        return "Decal";
-    case EFTT_OCCLUSION:
-        return "Occlusion";
-    case EFTT_SPECULAR_2:
-        return "Specular2";
-    case EFTT_SMOOTHNESS:
-        return "GlossNormalA";
-    case EFTT_EMITTANCE:
-        return "Emittance";
-    default:
-        return "Unknown";
-    }
-}
-
-CTexAnim* CShaderMan::mfReadTexSequence(const char* na, int Flags, [[maybe_unused]] bool bFindOnly)
-{
-    char prefix[_MAX_PATH];
-    char postfix[_MAX_PATH];
-    char* nm;
-    int i, j, l, m;
-    char nam[_MAX_PATH];
-    int n;
-    CTexture* tx, * tp;
-    int startn, endn, nums;
-    char name[_MAX_PATH];
-
-    tx = NULL;
-
-    cry_strcpy(name, na);
-    const char* ext = fpGetExtension (na);
-    fpStripExtension(name, name);
-
-    char chSep = '#';
-    nm = strchr(name, chSep);
-    if (!nm)
-    {
-        nm = strchr(name, '$');
-        if (!nm)
-        {
-            return 0;
-        }
-        chSep = '$';
-    }
-
-    float fSpeed = 0.05f;
-    {
-        char nName[_MAX_PATH];
-        azstrcpy(nName, _MAX_PATH, name);
-        nm = strchr(nName, '(');
-        if (nm)
-        {
-            name[nm - nName] = 0;
-            char* speed = &nName[nm - nName + 1];
-            nm = strchr(speed, ')');
-            if (nm)
-            {
-                speed[nm - speed] = 0;
-            }
-            fSpeed = (float)atof(speed);
-        }
-    }
-
-    j = 0;
-    n = 0;
-    l = -1;
-    m = -1;
-    while (name[n])
-    {
-        if (name[n] == chSep)
-        {
-            j++;
-            if (l == -1)
-            {
-                l = n;
-            }
-        }
-        else
-        if (l >= 0 && m < 0)
-        {
-            m = n;
-        }
-        n++;
-    }
-    if (!j)
-    {
-        return 0;
-    }
-
-    cry_strcpy(prefix, name, l);
-
-    char dig[_MAX_PATH];
-    l = 0;
-    if (m < 0)
-    {
-        startn = 0;
-        endn = 999;
-        postfix[0] = 0;
-    }
-    else
-    {
-        while (isdigit((unsigned char)name[m]))
-        {
-            dig[l++] = name[m];
-            m++;
-        }
-        dig[l] = 0;
-        startn = strtol(dig, NULL, 10);
-        m++;
-
-        l = 0;
-        while (isdigit((unsigned char)name[m]))
-        {
-            dig[l++] = name[m];
-            m++;
-        }
-        dig[l] = 0;
-        endn = strtol(dig, NULL, 10);
-
-        azstrcpy(postfix, AZ_ARRAY_SIZE(postfix), &name[m]);
-    }
-
-    nums = endn - startn + 1;
-
-    n = 0;
-    char frm[256];
-    char frd[4];
-
-    frd[0] = j + '0';
-    frd[1] = 0;
-
-    cry_strcpy(frm, "%s%.");
-    cry_strcat(frm, frd);
-    cry_strcat(frm, "d%s%s");
-    CTexAnim* ta = NULL;
-    for (i = 0; i < nums; i++)
-    {
-        sprintf_s(nam, frm, prefix, startn + i, postfix, ext);
-        tp = (CTexture*)gRenDev->EF_LoadTexture(nam, Flags);
-        if (!tp || !tp->IsLoaded())
-        {
-            if (tp)
-            {
-                tp->Release();
-            }
-            break;
-        }
-        if (!ta)
-        {
-            ta = new CTexAnim;
-            ta->m_bLoop = true;
-            ta->m_Time = fSpeed;
-        }
-
-        ta->m_TexPics.AddElem(tp);
-        n++;
-    }
-
-    if (ta)
-    {
-        ta->m_NumAnimTexs = ta->m_TexPics.Num();
-    }
-
-    return ta;
-}
-
-int CShaderMan::mfReadTexSequence(STexSamplerRT *smp, const char *na, int Flags, bool bFindOnly)
-{
-    if (smp->m_pAnimInfo)
-    {
-        assert(0);
-        return 0;
-    }
-
-    CTexAnim* ta = mfReadTexSequence(na, Flags, bFindOnly);
-    if (ta)
-    {
-        smp->m_pAnimInfo = ta;
-        SAFE_RELEASE(smp->m_pTex);
-        return ta->m_NumAnimTexs;
-    }
-
-    return 0;
-}
-
-void CShaderMan::mfSetResourceTexState(SEfResTexture* Tex)
-{
-    if (Tex)
-    {
-        STexState ST;
-        ST.SetFilterMode(Tex->m_Filter);
-        ST.SetClampMode(Tex->m_bUTile ? TADDR_WRAP : TADDR_CLAMP, Tex->m_bVTile ? TADDR_WRAP : TADDR_CLAMP, Tex->m_bUTile ? TADDR_WRAP : TADDR_CLAMP);
-        Tex->m_Sampler.m_nTexState = CTexture::GetTexState(ST);
-    }
-}
-
-CTexture* CShaderMan::mfTryToLoadTexture(const char* nameTex, STexSamplerRT* smp, int Flags, bool bFindOnly)
-{
-    CTexture* tx = NULL;
-    if (nameTex && strchr(nameTex, '#')) // test for " #" to skip max material names
-    {
-        int n = mfReadTexSequence(smp, nameTex, Flags, bFindOnly);
-        //If we were able to read the texture animation, those textures will all be loaded and set into smp->m_pAnimInfo->m_TexPics by mfReadTexSequence.
-        //Other code is dependent on some texture being returned here though, so Just return the first one in the animation.
-        if (n > 0 && smp->m_pAnimInfo && !smp->m_pAnimInfo->m_TexPics.empty())
-        {
-            smp->m_pAnimInfo->m_TexPics[0]->AddRef();
-            return smp->m_pAnimInfo->m_TexPics[0];
-        }
-    }
-    if (!tx)
-    {
-        if (bFindOnly)
-        {
-            tx = (CTexture*)gRenDev->EF_GetTextureByName(nameTex, Flags);
-        }
-        else
-        {
-            tx = (CTexture*)gRenDev->EF_LoadTexture(nameTex, Flags);
-        }
-    }
-
-    return tx;
-}
-
-CTexture* CShaderMan::mfFindResourceTexture(const char* nameTex, [[maybe_unused]] const char* path, int Flags, SEfResTexture* Tex)
-{
-    mfSetResourceTexState(Tex);
-
-    return mfTryToLoadTexture(nameTex, Tex ? &Tex->m_Sampler : NULL, Flags, true);
-}
-
-CTexture* CShaderMan::mfLoadResourceTexture(const char* nameTex, [[maybe_unused]] const char* path, int Flags, SEfResTexture* Tex)
-{
-    mfSetResourceTexState(Tex);
-
-    return mfTryToLoadTexture(nameTex, Tex ? &Tex->m_Sampler : NULL, Flags, false);
-}
-
-
-bool CShaderMan::mfLoadResourceTexture(ResourceSlotIndex Id, SInputShaderResources& RS, uint32 CustomFlags, bool bReplaceMeOnFail)
-{
-    SEfResTexture*  pTextureRes = RS.GetTextureResource(Id);
-
-    if (!pTextureRes || pTextureRes->m_Name.empty())
-        return false;
-
-    // Texture slot and texture name exist
-    STexSamplerRT&  texSampler(pTextureRes->m_Sampler);
-
-    // No texture or texture not loaded - try to load it
-    if (!texSampler.m_pTex || !texSampler.m_pTex->IsTextureLoaded())
-    {
-        texSampler.m_pTex = mfLoadResourceTexture( pTextureRes->m_Name.c_str(), RS.m_TexturePath.c_str(), texSampler.GetTexFlags() | CustomFlags, pTextureRes);
-    }
-
-    bool    bTextureLoadSuccess = texSampler.m_pTex->IsTextureLoaded();
-    // Texture was not successfully loaded but is marked for placeholder loading on fail
-    if (!bTextureLoadSuccess && bReplaceMeOnFail)
-    {
-        texSampler.m_pTex = mfLoadResourceTexture( szReplaceMe, RS.m_TexturePath.c_str(), texSampler.GetTexFlags() | CustomFlags, pTextureRes);
-    }
-    return bTextureLoadSuccess;
-}
-
-bool CShaderMan::mfLoadResourceTexture(ResourceSlotIndex Id, CShaderResources& RS, uint32 CustomFlags, bool bReplaceMeOnFail)
-{
-    SEfResTexture*  pTextureRes = RS.GetTextureResource(Id);
-
-    // Texture slot does not exist
-    if (!pTextureRes)
-        return false;
-
-    STexSamplerRT&  texSampler(pTextureRes->m_Sampler);
-    bool            bTextureLoaded = texSampler.m_pTex && texSampler.m_pTex->IsTextureLoaded();
-
-    if (!pTextureRes->m_Name.empty())
-    {   // texture can be retrieved
-        if (!bTextureLoaded || (CustomFlags & FT_ALPHA))
-        {
-            SAFE_RELEASE(texSampler.m_pTex);
-            texSampler.m_pTex = mfLoadResourceTexture(pTextureRes->m_Name.c_str(), RS.m_TexturePath.c_str(), texSampler.GetTexFlags() | CustomFlags, pTextureRes);
-        }
-
-        if (!bTextureLoaded && texSampler.m_pTex->IsTextureMissing())
-        {
-            TextureWarning(pTextureRes->m_Name.c_str(), "Texture file is missing: '%s%s' in material \'%s\'", RS.m_TexturePath.c_str(), pTextureRes->m_Name.c_str(), RS.m_szMaterialName);
-        }
-
-        bTextureLoaded = texSampler.m_pTex->IsTextureLoaded();
-        if (!bTextureLoaded && bReplaceMeOnFail)
-        {
-            texSampler.m_pTex = mfLoadResourceTexture("EngineAssets/TextureMsg/ReplaceMe.tif", RS.m_TexturePath.c_str(), texSampler.GetTexFlags() | CustomFlags, pTextureRes);
-        }
-    }
-
-    return bTextureLoaded;
-}
-
-//------------------------------------------------------------------------------
-// Notice - the function will actively add the marked slot if it does not exist.
-//------------------------------------------------------------------------------
-void CShaderMan::mfLoadDefaultTexture(ResourceSlotIndex Id, CShaderResources& RS, EEfResTextures Def)
-{
-    RS.m_TexturesResourcesMap[Id].m_Sampler.m_pTex = TextureHelpers::LookupTexDefault(Def);
-}
-
-//------------------------------------------------------------------------------
-// Mark refresh required if any texture slot contains a texture
-bool CShaderMan::mfRefreshResourceConstants(CShaderResources* Res)
-{
-    if (!Res)
-        return false;
-
-    for (auto iter = Res->m_TexturesResourcesMap.begin(); iter != Res->m_TexturesResourcesMap.end(); ++iter)
-    {
-        SEfResTexture*  pTexture = &iter->second;
-        if (pTexture->m_Sampler.m_pTex)
-        {   // marked changed if the sampler contains pointer to a texture
-            return true;
-        }
-    }
-    return false;
-}
-
-//------------------------------------------------------------------------------
-// [Shader System] - TO DO : be very careful when optimizing this as it can lead
-// to loss / uncorrelated  of texture slots.
-//------------------------------------------------------------------------------
-void CShaderMan::mfRefreshResources(CShaderResources* Res)
-{
-    if (Res)
-    {
-        for (int i = 0; i < EFTT_MAX; i++)
-        {
-            int Flags = 0;
-            if (i == EFTT_NORMALS)
-            {
-                if ((!Res->TextureSlotExists(i) || Res->m_TexturesResourcesMap[i].m_Name.empty()))
-                {
-                    continue;
-                }
-
-                Flags |= FT_TEX_NORMAL_MAP;
-                if (!Res->TextureSlotExists(i))     // add a slot
-                {
-                    Res->m_TexturesResourcesMap[i].Cleanup();
-                }
-
-                if (!mfLoadResourceTexture((EEfResTextures)i, *Res, Flags))
-                {
-                    mfLoadDefaultTexture((EEfResTextures)i, *Res, (EEfResTextures)i);
-                }
-
-                // Support for gloss in regular normal map
-                CTexture* pTexN = (Res->TextureSlotExists(i) ? Res->m_TexturesResourcesMap[i].m_Sampler.m_pTex : NULL);
-                if (pTexN && (pTexN->GetFlags() & FT_HAS_ATTACHED_ALPHA))
-                {
-                    Res->m_TexturesResourcesMap[EFTT_SMOOTHNESS].m_Name = pTexN->GetSourceName();
-                    if (!mfLoadResourceTexture(EFTT_SMOOTHNESS, *Res, Flags | FT_ALPHA))
-                    {
-                        mfLoadDefaultTexture(EFTT_SMOOTHNESS, *Res, (EEfResTextures)i);
-                    }
-                }
-
-                continue;
-            }
-            else
-                if (i == EFTT_HEIGHT)
-                {
-                    if (!Res->TextureSlotExists(EFTT_NORMALS) || !Res->m_TexturesResourcesMap[EFTT_NORMALS].m_Sampler.m_pTex)
-                    {
-                        continue;
-                    }
-                    if (!Res->TextureSlotExists(i))
-                    {
-                        continue; //Res->AddTextureMap(i);
-                    }
-                    mfLoadResourceTexture((EEfResTextures)i, *Res, Flags);
-                }
-                else
-                    if (i == EFTT_CUSTOM_SECONDARY)
-                    {
-                        if ((!Res->TextureSlotExists(i) || Res->m_TexturesResourcesMap[i].m_Name.empty()))
-                        {
-                            continue;
-                        }
-
-                        if (!Res->TextureSlotExists(i))
-                        {   // adds the slot
-                            Res->m_TexturesResourcesMap[i].Cleanup();
-                        }
-
-                        if (!mfLoadResourceTexture((EEfResTextures)i, *Res, Flags))
-                        {
-                            mfLoadDefaultTexture((EEfResTextures)i, *Res, (EEfResTextures)i);
-                        }
-
-                        // Support for gloss in blend layer normal map
-                        CTexture* pTexN = (Res->TextureSlotExists(i) ? Res->m_TexturesResourcesMap[i].m_Sampler.m_pTex : NULL);
-                        if (pTexN && (pTexN->GetFlags() & FT_HAS_ATTACHED_ALPHA))
-                        {
-                            Res->m_TexturesResourcesMap[EFTT_SECOND_SMOOTHNESS].m_Name = pTexN->GetSourceName();
-                            if (!mfLoadResourceTexture(EFTT_SECOND_SMOOTHNESS, *Res, Flags | FT_ALPHA))
-                            {
-                                mfLoadDefaultTexture(EFTT_SECOND_SMOOTHNESS, *Res, EFTT_SMOOTHNESS);
-                            }
-                        }
-
-                        continue;
-                    }
-
-            SEfResTexture* Tex = Res->GetTextureResource(i);
-            if (!Tex)
-            {
-                continue;
-            }
-
-            // TODO: fix this bug at the root, a texture is allocated even though "nearest_cubemap"-named textures should be NULL
-            if (Tex->m_Sampler.m_eTexType == eTT_NearestCube)
-            {
-                SAFE_RELEASE(Tex->m_Sampler.m_pTex);
-                Tex->m_Sampler.m_pTex = CTexture::s_ptexFromObjCM;
-            }
-
-            if (!Tex->m_Sampler.m_pTex)
-            {
-                if (Tex->m_Sampler.m_eTexType == eTT_NearestCube)
-                {
-                    Tex->m_Sampler.m_pTex = CTexture::s_ptexFromObjCM;
-                }
-                else
-                    if (Tex->m_Sampler.m_eTexType == eTT_Dyn2D)
-                    {
-                        // This block was for loading Flash files
-                    }
-                    else
-                        if (Tex->m_Sampler.m_eTexType == eTT_Auto2D)
-                        {
-                            if (i == EFTT_ENV)
-                            {
-                                mfSetResourceTexState(Tex);
-
-                                SAFE_RELEASE(Tex->m_Sampler.m_pTarget);
-                                Tex->m_Sampler.m_pTarget = new SHRenderTarget;
-
-                                Tex->m_Sampler.m_pTex = CTexture::s_ptexRT_2D;
-                                Tex->m_Sampler.m_pTarget->m_pTarget[0] = CTexture::s_ptexRT_2D;
-
-                                Tex->m_Sampler.m_pTarget->m_bTempDepth = true;
-                                Tex->m_Sampler.m_pTarget->m_eOrder = eRO_PreProcess;
-                                Tex->m_Sampler.m_pTarget->m_eTF = eTF_R8G8B8A8;
-                                Tex->m_Sampler.m_pTarget->m_nIDInPool = -1;
-                                Tex->m_Sampler.m_pTarget->m_nFlags |= FRT_RENDTYPE_RECURSIVECURSCENE | FRT_CAMERA_CURRENT;
-                                Tex->m_Sampler.m_pTarget->m_nFlags |= FRT_CLEAR_DEPTH | FRT_CLEAR_STENCIL | FRT_CLEAR_COLOR;
-                            }
-                        }
-                        else
-                            if (Tex->m_Sampler.m_eTexType == eTT_User)
-                            {
-                                Tex->m_Sampler.m_pTex = NULL;
-                            }
-                            else
-                            {
-                                mfLoadResourceTexture((EEfResTextures)i, *Res, Flags);
-                            }
-            }
-
-            // assign streaming priority based on the importance (sampler slot)
-            if (Tex && Tex->m_Sampler.m_pITex && Tex->m_Sampler.m_pITex->IsTextureLoaded() && Tex->m_Sampler.m_pITex->IsStreamedVirtual())
-            {
-                CTexture* tp = (CTexture*)Tex->m_Sampler.m_pITex;
-                tp->SetStreamingPriority(EFTT_MAX - i);
-            }
-        }
-    }
-
-    mfRefreshResourceConstants(Res);
-}
diff --git a/Code/CryEngine/RenderDll/Common/Shaders/ShadersResourcesGroups/PerFrame.h b/Code/CryEngine/RenderDll/Common/Shaders/ShadersResourcesGroups/PerFrame.h
deleted file mode 100644
index 209b2021a2..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shaders/ShadersResourcesGroups/PerFrame.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#ifndef _PER_FRAME_RESOURCE_GROUP_
-#define _PER_FRAME_RESOURCE_GROUP_
-
-struct PerFrameParameters
-{
-    int m_FrameID;
-
-    Vec3 m_WaterLevel;
-    Vec4 m_HDRParams;
-
-    float m_SunSpecularMultiplier;
-    float m_MidDayIndicator;      // during day [0..1] where noon is 1.0 and going towards 0 at night
-
-    Vec3 m_DecalZFightingRemedy;
-
-    Vec3 m_CloudShadingColorSun;
-    Vec3 m_CloudShadingColorSky;
-    Vec4 m_CloudShadowParams;
-    Vec4 m_CloudShadowAnimParams;
-
-    Vec4 m_CausticsParams;
-    Vec3 m_CausticsSunDirection;
-
-    Vec4 m_VolumetricFogParams;
-    Vec4 m_VolumetricFogRampParams;
-    Vec4 m_VolumetricFogColorGradientBase;
-    Vec4 m_VolumetricFogColorGradientDelta;
-    Vec4 m_VolumetricFogColorGradientParams;
-    Vec4 m_VolumetricFogColorGradientRadial;
-    Vec4 m_VolumetricFogSamplingParams;
-    Vec4 m_VolumetricFogDistributionParams;
-    Vec4 m_VolumetricFogScatteringParams;
-    Vec4 m_VolumetricFogScatteringBlendParams;
-    Vec4 m_VolumetricFogScatteringColor;
-    Vec4 m_VolumetricFogScatteringSecondaryColor;
-    Vec4 m_VolumetricFogHeightDensityParams;
-    Vec4 m_VolumetricFogHeightDensityRampParams;
-    Vec4 m_VolumetricFogDistanceParams;
-};
-
-#endif // _PER_FRAME_RESOURCE_GROUP_
diff --git a/Code/CryEngine/RenderDll/Common/ShadowUtils.cpp b/Code/CryEngine/RenderDll/Common/ShadowUtils.cpp
deleted file mode 100644
index 73fc5e2a1b..0000000000
--- a/Code/CryEngine/RenderDll/Common/ShadowUtils.cpp
+++ /dev/null
@@ -1,797 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ShadowUtils.h"
-
-bool CShadowUtils::bShadowFrustumCacheValid = false;
-
-void CShadowUtils::CalcDifferentials(const CCamera& cam, float fViewWidth, [[maybe_unused]] float fViewHeight, float& fFragSizeX)
-{
-    Vec3 vNearEdge = cam.GetEdgeN();
-
-    float fWorldWidthDiv2 = abs(vNearEdge.x);
-
-    fFragSizeX = (fWorldWidthDiv2 * 2.0f) / fViewWidth;
-}
-
-void CShadowUtils::CalcScreenToWorldExpansionBasis(const CCamera& cam, const Vec2& vJitter, float fViewWidth, float fViewHeight, Vec3& vWBasisX, Vec3& vWBasisY, Vec3& vWBasisZ, bool bWPos)
-{
-    const Matrix34& camMatrix = cam.GetMatrix();
-
-    Vec3 vNearEdge = cam.GetEdgeN();
-
-    //all values are in camera space
-    float fFar = cam.GetFarPlane();
-    float fNear = abs(vNearEdge.y);
-    float fWorldWidthDiv2 = abs(vNearEdge.x);
-    float fWorldHeightDiv2 = abs(vNearEdge.z);
-
-    float k = fFar / fNear;
-
-    Vec3 vNearX = camMatrix.GetColumn0().GetNormalized() * fWorldWidthDiv2;
-    Vec3 vNearY = camMatrix.GetColumn2().GetNormalized() * fWorldHeightDiv2;
-
-    Vec3 vJitterShiftX = vNearX * vJitter.x;
-    Vec3 vJitterShiftY = vNearY * vJitter.y;
-
-    Vec3 vStereoShift = camMatrix.GetColumn0().GetNormalized() * cam.GetAsymL() + camMatrix.GetColumn2() * cam.GetAsymB();
-
-    Vec3 vZ = (camMatrix.GetColumn1().GetNormalized() * fNear + vStereoShift + vJitterShiftX + vJitterShiftY) * k; // size of vZ is the distance from camera pos to near plane
-    Vec3 vX = camMatrix.GetColumn0().GetNormalized() * (fWorldWidthDiv2 * k);
-    Vec3 vY = camMatrix.GetColumn2().GetNormalized() * (fWorldHeightDiv2 * k);
-
-    //WPos basis adjustments
-    if (bWPos)
-    {
-        vZ = vZ - vX;
-        vX *= (2.0f / fViewWidth);
-
-        vZ = vZ + vY;
-        vY *= -(2.0f / fViewHeight);
-    }
-
-    vWBasisX = vX;
-    vWBasisY = vY;
-    vWBasisZ = vZ;
-}
-
-void CShadowUtils::ProjectScreenToWorldExpansionBasis(const Matrix44r& mShadowTexGen, const CCamera& cam, const Vec2& vJitter, float fViewWidth, float fViewHeight, Vec4r& vWBasisX, Vec4r& vWBasisY, Vec4r& vWBasisZ, Vec4r& vCamPos, bool bWPos, SRenderTileInfo* pSTileInfo)
-{
-    const Matrix34& camMatrix = cam.GetMatrix();
-    const bool bTileRendering = pSTileInfo && (pSTileInfo->nGridSizeX > 1 || pSTileInfo->nGridSizeY > 1);
-
-    Vec3 vNearEdge = cam.GetEdgeN();
-
-    //all values are in camera space
-    float fFar = cam.GetFarPlane();
-    float fNear = abs(vNearEdge.y);
-    float fWorldWidthDiv2 = abs(vNearEdge.x);
-    float fWorldHeightDiv2 = abs(vNearEdge.z);
-
-    float k = fFar / fNear;
-
-    //simple non-general hack to shift stereo with off center projection
-    Vec3 vStereoShift = camMatrix.GetColumn0().GetNormalized() * cam.GetAsymL() + camMatrix.GetColumn2() * cam.GetAsymB();
-
-    Vec3 vNearX = camMatrix.GetColumn0().GetNormalized() * fWorldWidthDiv2;
-    Vec3 vNearY = camMatrix.GetColumn2().GetNormalized() * fWorldHeightDiv2;
-    Vec3 vNearZ = camMatrix.GetColumn1().GetNormalized() * fNear;
-
-    Vec3 vJitterShiftX = vNearX * vJitter.x;
-    Vec3 vJitterShiftY = vNearY * vJitter.y;
-
-    Vec3 vZ = (vNearZ + vJitterShiftX + vJitterShiftY + vStereoShift) * k; // size of vZ is the distance from camera pos to near plane
-
-    Vec3 vX = camMatrix.GetColumn0().GetNormalized() * fWorldWidthDiv2 * k;
-    Vec3 vY = camMatrix.GetColumn2().GetNormalized() * fWorldHeightDiv2 * k;
-
-    //multi-tiled render handling
-    if (bTileRendering)
-    {
-        vZ = vZ + (vX * (2.0f * (pSTileInfo->nGridSizeX - 1.0f - pSTileInfo->nPosX) / pSTileInfo->nGridSizeX));
-        vZ = vZ - (vY * (2.0f * (pSTileInfo->nGridSizeY - 1.0f - pSTileInfo->nPosY) / pSTileInfo->nGridSizeY));
-    }
-
-    //WPos basis adjustments
-    if (bWPos)
-    {
-        vZ = vZ - vX;
-        vX *= (2.0f / fViewWidth);
-
-        vZ = vZ + vY;
-        vY *= -(2.0f / fViewHeight);
-    }
-
-    //multi-tiled render handling
-    if (bTileRendering)
-    {
-        vX *= 1.0f / pSTileInfo->nGridSizeX;
-        vY *= 1.0f / pSTileInfo->nGridSizeY;
-    }
-
-    //creating common projection matrix for depth reconstruction
-    vWBasisX = mShadowTexGen * Vec4r(vX, 0.0f);
-    vWBasisY = mShadowTexGen * Vec4r(vY, 0.0f);
-    vWBasisZ = mShadowTexGen * Vec4r(vZ, 0.0f);
-    vCamPos =  mShadowTexGen * Vec4r(cam.GetPosition(), 1.0f);
-}
-
-void CShadowUtils::CalcLightBoundRect(const SRenderLight* pLight, const CameraViewParameters& RCam, Matrix44A& mView, Matrix44A& mProj, Vec2* pvMin, Vec2* pvMax, IRenderAuxGeom* pAuxRend)
-{
-    Vec3 vViewVec = Vec3(pLight->m_Origin - RCam.vOrigin);
-    float fDistToLS =  vViewVec.GetLength();
-
-    if (fDistToLS <= pLight->m_fRadius)
-    {
-        //optimization when we are inside light frustum
-        *pvMin = Vec2(0, 0);
-        *pvMax = Vec2(1, 1);
-        return;
-    }
-
-
-    float fRadiusSquared = pLight->m_fRadius * pLight->m_fRadius;
-    float fDistToBoundPlane = fRadiusSquared / fDistToLS;
-
-    float fQuadEdge = sqrtf(fRadiusSquared - fDistToBoundPlane * fDistToBoundPlane);
-
-    vViewVec.SetLength(fDistToLS - fDistToBoundPlane);
-
-    Vec3 vCenter = RCam.vOrigin +  vViewVec;
-
-    Vec3 vUp = vViewVec.Cross(RCam.vY.Cross(vViewVec));
-    Vec3 vRight = vViewVec.Cross(RCam.vX.Cross(vViewVec));
-
-    vUp.normalize();
-    vRight.normalize();
-
-    float fRadius = pLight->m_fRadius;
-
-    Vec3 pBRectVertices[4] =
-    {
-        vCenter + (vUp * fQuadEdge) -  (vRight * fQuadEdge),
-        vCenter + (vUp * fQuadEdge) +  (vRight * fQuadEdge),
-        vCenter - (vUp * fQuadEdge) +  (vRight * fQuadEdge),
-        vCenter - (vUp * fQuadEdge) -  (vRight * fQuadEdge)
-    };
-
-    Vec3 pBBoxVertices[8] =
-    {
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(-fRadius, -fRadius, fRadius)),
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(-fRadius, fRadius, fRadius)),
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(fRadius, -fRadius, fRadius)),
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(fRadius, fRadius, fRadius)),
-
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(-fRadius, -fRadius, -fRadius)),
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(-fRadius, fRadius, -fRadius)),
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(fRadius, -fRadius, -fRadius)),
-        Vec3(Vec3(vCenter.x, vCenter.y, vCenter.z) + Vec3(fRadius, fRadius, -fRadius))
-    };
-
-    Matrix44A mInvView = mView.GetInverted();
-
-    *pvMin = Vec2(1, 1);
-    *pvMax = Vec2(0, 0);
-
-    for (int i = 0; i < 4; i++)
-    {
-        if (pAuxRend != NULL)
-        {
-            pAuxRend->DrawPoint(pBRectVertices[i], RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-
-            int32 nPrevVert = (i - 1) < 0 ? 3 : (i - 1);
-
-            pAuxRend->DrawLine(pBRectVertices[nPrevVert], RGBA8(0xff, 0xff, 0x0, 0xff), pBRectVertices[i], RGBA8(0xff, 0xff, 0x0, 0xff), 3.0f);
-        }
-
-
-        Vec4 vScreenPoint = Vec4(pBRectVertices[i], 1.0) * mProj;
-
-        //projection space clamping
-        vScreenPoint.w = max(vScreenPoint.w, 0.00000000000001f);
-
-        vScreenPoint.x = max(vScreenPoint.x, -(vScreenPoint.w));
-        vScreenPoint.x = min(vScreenPoint.x, vScreenPoint.w);
-        vScreenPoint.y = max(vScreenPoint.y, -(vScreenPoint.w));
-        vScreenPoint.y = min(vScreenPoint.y, vScreenPoint.w);
-        vScreenPoint /= vScreenPoint.w;
-
-        Vec2 vWin;
-        vWin.x = (1 + vScreenPoint.x) / 2;
-        vWin.y = (1 + vScreenPoint.y) / 2;
-
-        assert(vWin.x >= 0.0f && vWin.x <= 1.0f);
-        assert(vWin.y >= 0.0f && vWin.y <= 1.0f);
-
-        pvMin->x = min(pvMin->x, vWin.x);
-        pvMin->y = min(pvMin->y, vWin.y);
-        pvMax->x = max(pvMax->x, vWin.x);
-        pvMax->y = max(pvMax->y, vWin.y);
-    }
-}
-
-void CShadowUtils::GetProjectiveTexGen(const SRenderLight* pLight, int nFace, Matrix44A* mTexGen)
-{
-    assert(pLight != NULL);
-    float fOffsetX = 0.5f;
-    float fOffsetY = 0.5f;
-    Matrix44A mTexScaleBiasMat = Matrix44A(0.5f,     0.0f,     0.0f,    0.0f,
-            0.0f,    -0.5f,     0.0f,    0.0f,
-            0.0f,     0.0f,     1.0f,    0.0f,
-            fOffsetX, fOffsetY, 0.0f,    1.0f);
-
-    Matrix44A mLightProj, mLightView;
-    CShadowUtils::GetCubemapFrustumForLight(pLight, nFace, pLight->m_fLightFrustumAngle * 2.f, &mLightProj, &mLightView, true);
-
-    Matrix44 mLightViewProj = mLightView * mLightProj;
-
-    *mTexGen = mLightViewProj * mTexScaleBiasMat;
-}
-
-void CShadowUtils::GetCubemapFrustumForLight(const SRenderLight* pLight, int nS, float fFov, Matrix44A* pmProj, Matrix44A* pmView, bool bProjLight)
-{
-    Vec3 zaxis, yaxis, xaxis;
-
-    //new cubemap calculation
-    float sCubeVector[6][7] =
-    {
-        {1, 0, 0,  0, 0, -1, -90},//posx
-        {-1, 0, 0, 0, 0, 1,  90},//negx
-        {0, 1, 0,  -1, 0, 0, 0},//posy
-        {0, -1, 0, 1, 0, 0,  0},//negy
-        {0, 0, 1,  0, -1, 0,  0},//posz
-        {0, 0, -1, 0, 1, 0,  0},//negz
-    };
-
-    Vec3 vForward = Vec3(sCubeVector[nS][0], sCubeVector[nS][1], sCubeVector[nS][2]);
-    Vec3 vUp      = Vec3(sCubeVector[nS][3], sCubeVector[nS][4], sCubeVector[nS][5]);
-    Vec3 vEyePt = pLight->m_Origin;
-    vForward = vForward + vEyePt;
-
-    //adjust light rotation
-    Matrix34 mLightRot = pLight->m_ObjMatrix;
-
-    //coord systems conversion(from orientation to shader matrix)
-    if (bProjLight)
-    {
-        zaxis = mLightRot.GetColumn1().GetNormalized();
-        yaxis = -mLightRot.GetColumn0().GetNormalized();
-        xaxis = -mLightRot.GetColumn2().GetNormalized();
-    }
-    else
-    {
-        zaxis = mLightRot.GetColumn2().GetNormalized();
-        yaxis = -mLightRot.GetColumn0().GetNormalized();
-        xaxis = mLightRot.GetColumn1().GetNormalized();
-    }
-
-    (*pmView)(0, 0) = xaxis.x;
-    (*pmView)(0, 1) = zaxis.x;
-    (*pmView)(0, 2) = yaxis.x;
-    (*pmView)(0, 3) = 0;
-    (*pmView)(1, 0) = xaxis.y;
-    (*pmView)(1, 1) = zaxis.y;
-    (*pmView)(1, 2) = yaxis.y;
-    (*pmView)(1, 3) = 0;
-    (*pmView)(2, 0) = xaxis.z;
-    (*pmView)(2, 1) = zaxis.z;
-    (*pmView)(2, 2) = yaxis.z;
-    (*pmView)(2, 3) = 0;
-    (*pmView)(3, 0) = -xaxis.Dot(vEyePt);
-    (*pmView)(3, 1) = -zaxis.Dot(vEyePt);
-    (*pmView)(3, 2) = -yaxis.Dot(vEyePt);
-    (*pmView)(3, 3) = 1;
-
-    float zn = max(pLight->m_fProjectorNearPlane, 0.01f);
-    float zf = max(pLight->m_fRadius, zn + 0.01f);
-    mathMatrixPerspectiveFov(pmProj, (float)DEG2RAD_R(fFov), 1.f, zn, zf);
-}
-
-void CShadowUtils::GetCubemapFrustum(EFrustum_Type eFrustumType, ShadowMapFrustum* pFrust, int nS, Matrix44A* pmProj, Matrix44A* pmView, Matrix33* pmLightRot)
-{
-    float sCubeVector[6][7] =
-    {
-        {1, 0, 0,  0, 0, -1, -90},//posx
-        {-1, 0, 0, 0, 0, 1,  90},//negx
-        {0, 1, 0,  -1, 0, 0, 0},//posy
-        {0, -1, 0, 1, 0, 0,  0},//negy
-        {0, 0, 1,  0, -1, 0,  0},//posz
-        {0, 0, -1, 0, 1, 0,  0},//negz
-    };
-
-    Vec3 vForward = Vec3(sCubeVector[nS][0], sCubeVector[nS][1], sCubeVector[nS][2]);
-    Vec3 vUp      = Vec3(sCubeVector[nS][3], sCubeVector[nS][4], sCubeVector[nS][5]);
-    float fMinDist = max(pFrust->fNearDist, 0.03f);
-    float fMaxDist = pFrust->fFarDist;
-
-    Vec3 vEyePt = Vec3(
-            pFrust->vLightSrcRelPos.x + pFrust->vProjTranslation.x,
-            pFrust->vLightSrcRelPos.y + pFrust->vProjTranslation.y,
-            pFrust->vLightSrcRelPos.z + pFrust->vProjTranslation.z
-            );
-    Vec3 At = vEyePt;
-
-    if (eFrustumType == FTYP_OMNILIGHTVOLUME)
-    {
-        vEyePt -= (2.0f * fMinDist) * vForward.GetNormalized();
-    }
-
-    vForward = vForward + At;
-
-    //mathMatrixTranslation(&mLightTranslate, -vPos.x, -vPos.y, -vPos.z);2
-    mathMatrixLookAt(pmView, vEyePt, vForward, vUp);
-
-    //adjust light rotation
-    if (pmLightRot)
-    {
-        (*pmView) = (*pmView) * (*pmLightRot);
-    }
-    if (eFrustumType == FTYP_SHADOWOMNIPROJECTION)
-    {
-        //near plane does have big influence on the precision (depth distribution) for non linear frustums
-        mathMatrixPerspectiveFov(pmProj, (float)DEG2RAD_R(g_fOmniShadowFov), 1.f, fMinDist, fMaxDist);
-    }
-    else
-    if (eFrustumType == FTYP_OMNILIGHTVOLUME)
-    {
-        //near plane should be extremely small in order to avoid  seams on between frustums
-        mathMatrixPerspectiveFov(pmProj, (float)DEG2RAD_R(g_fOmniLightFov), 1.f, fMinDist, fMaxDist);
-    }
-}
-
-Matrix34 CShadowUtils::GetAreaLightMatrix(const SRenderLight* pLight, Vec3 vScale)
-{
-    // Box needs to be scaled by 2x for correct radius.
-    vScale *= 2.0f;
-
-    // Add width and height to scale.
-    float fFOVScale = 2.16f * (max(0.001f, pLight->m_fLightFrustumAngle * 2.0f) / 180.0f);
-    vScale.y += pLight->m_fAreaWidth * fFOVScale;
-    vScale.z += pLight->m_fAreaHeight * fFOVScale;
-
-    Matrix34 mAreaMatr;
-    mAreaMatr.SetIdentity();
-    mAreaMatr.SetScale(vScale, pLight->m_Origin);
-
-    // Apply rotation.
-    mAreaMatr = pLight->m_ObjMatrix * mAreaMatr;
-
-    // Move box center to light center and pull it back slightly.
-    Vec3 vOffsetDir = vScale.y * 0.5f * pLight->m_ObjMatrix.GetColumn1().GetNormalized() +
-        vScale.z * 0.5f * pLight->m_ObjMatrix.GetColumn2().GetNormalized() +
-        0.1f * pLight->m_ObjMatrix.GetColumn0().GetNormalized();
-
-    mAreaMatr.SetTranslation(pLight->m_Origin - vOffsetDir);
-
-    return mAreaMatr;
-}
-
-static _inline Vec3 frac(Vec3 in)
-{
-    Vec3 out;
-    out.x = in.x - (float)(int)in.x;
-    out.y = in.y - (float)(int)in.y;
-    out.z = in.z - (float)(int)in.z;
-
-    return out;
-}
-
-float snap_frac2(float fVal, float fSnap)
-{
-    float fValSnapped = fSnap * int64(fVal / fSnap);
-    return fValSnapped;
-}
-
-//Right Handed
-void CShadowUtils::mathMatrixLookAtSnap(Matrix44A* pMatr, const Vec3& Eye, const Vec3& At, ShadowMapFrustum* pFrust)
-{
-    const Vec3 vZ(0.f, 0.f, 1.f);
-    const Vec3 vY(0.f, 1.f, 0.f);
-
-    Vec3 vUp;
-    Vec3 vEye = Eye;
-    Vec3 vAt = At;
-
-    Vec3 vLightDir = (vEye - vAt);
-    vLightDir.Normalize();
-
-    if (fabsf(vLightDir.Dot(vZ)) > 0.9995f)
-    {
-        vUp = vY;
-    }
-    else
-    {
-        vUp = vZ;
-    }
-
-    float fKatetSize = 1000000.0f  * tan_tpl(DEG2RAD(pFrust->fFOV) * 0.5f);
-
-    assert(pFrust->nTexSize > 0);
-    float fSnapXY = fKatetSize * 2.f / pFrust->nTexSize; //texture size should be valid already
-
-    //TD - add ratios to the frustum
-    fSnapXY *= 2.0f;
-
-    Vec3 zaxis = vLightDir.GetNormalized();
-    Vec3 xaxis = (vUp.Cross(zaxis)).GetNormalized();
-    Vec3 yaxis = zaxis.Cross(xaxis);
-
-    (*pMatr)(0, 0) = xaxis.x;
-    (*pMatr)(0, 1) = yaxis.x;
-    (*pMatr)(0, 2) = zaxis.x;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) = xaxis.y;
-    (*pMatr)(1, 1) = yaxis.y;
-    (*pMatr)(1, 2) = zaxis.y;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) = xaxis.z;
-    (*pMatr)(2, 1) = yaxis.z;
-    (*pMatr)(2, 2) = zaxis.z;
-    (*pMatr)(2, 3) = 0;
-    (*pMatr)(3, 0) = -xaxis.Dot(vEye);
-    (*pMatr)(3, 1) = -yaxis.Dot(vEye);
-    (*pMatr)(3, 2) = -zaxis.Dot(vEye);
-    (*pMatr)(3, 3) = 1;
-
-    float fTranslX = (*pMatr)(3, 0);
-    float fTranslY = (*pMatr)(3, 1);
-
-    (*pMatr)(3, 0) = snap_frac2(fTranslX, fSnapXY);
-    (*pMatr)(3, 1) = snap_frac2(fTranslY, fSnapXY);
-}
-
-//todo move frustum computations to the 3d engine
-void CShadowUtils::GetShadowMatrixOrtho(Matrix44A& mLightProj, Matrix44A& mLightView, const Matrix44A& mViewMatrix, ShadowMapFrustum* lof, bool bViewDependent)
-{
-    mathMatrixPerspectiveFov(&mLightProj, (float)DEG2RAD_R(max(lof->fFOV, 0.0000001f)), max(lof->fProjRatio, 0.0001f), lof->fNearDist, lof->fFarDist);
-
-    const Vec3 zAxis(0.f, 0.f, 1.f);
-    const Vec3 yAxis(0.f, 1.f, 0.f);
-    Vec3 Up;
-    Vec3 Eye = Vec3(
-            lof->vLightSrcRelPos.x + lof->vProjTranslation.x,
-            lof->vLightSrcRelPos.y + lof->vProjTranslation.y,
-            lof->vLightSrcRelPos.z + lof->vProjTranslation.z);
-    Vec3 At = Vec3(lof->vProjTranslation.x, lof->vProjTranslation.y, lof->vProjTranslation.z);
-
-    Vec3 vLightDir = At - Eye;
-    vLightDir.Normalize();
-
-    if (bViewDependent)
-    {
-        Eye = mViewMatrix.GetTransposed().TransformPoint(Eye);
-        At = (mViewMatrix.GetTransposed()).TransformPoint(At);
-        vLightDir = (mViewMatrix.GetTransposed()).TransformVector(vLightDir);
-    }
-
-    //get look-at matrix
-    if (CRenderer::CV_r_ShadowsGridAligned && lof->m_Flags & DLF_DIRECTIONAL)
-    {
-        mathMatrixLookAtSnap(&mLightView, Eye, At, lof);
-    }
-    else
-    {
-        if (fabsf(vLightDir.Dot(zAxis)) > 0.9995f)
-        {
-            Up = yAxis;
-        }
-        else
-        {
-            Up = zAxis;
-        }
-
-        mathMatrixLookAt(&mLightView, Eye, At, Up);
-    }
-
-    //we should transform coords to the view space, so shadows are oriented according to camera always
-    if (bViewDependent)
-    {
-        mLightView = mViewMatrix * mLightView;
-    }
-}
-
-//todo move frustum computations to the 3d engine
-void CShadowUtils::GetShadowMatrixForObject(Matrix44A& mLightProj, Matrix44A& mLightView, ShadowMapFrustum* lof)
-{
-    const AABB& aabb = lof->aabbCasters;
-
-    if (aabb.GetRadius() < 0.001f)
-    {
-        mLightProj.SetIdentity();
-        mLightView.SetIdentity();
-        lof->fNearDist = 0.1f;
-        lof->fFarDist = 100.0f;
-        lof->fDepthTestBias = 0.00001f;
-        return;
-    }
-
-    //Ortho
-    f32 yScale = aabb.GetRadius() * 1.11f;
-    f32 xScale = yScale;
-    f32 fNear = lof->vLightSrcRelPos.GetLength();
-    f32 fFar = fNear;
-    fNear -= aabb.GetRadius();
-    fFar  += aabb.GetRadius();
-    mathMatrixOrtho(&mLightProj, yScale, xScale, fNear, fFar);
-    const Vec3 zAxis(0.f, 0.f, 1.f);
-    const Vec3 yAxis(0.f, 1.f, 0.f);
-    Vec3 Up;
-    Vec3 At = aabb.GetCenter();
-    Vec3 vLightDir = -lof->vLightSrcRelPos;
-    vLightDir.Normalize();
-
-    Vec3 Eye = At - lof->vLightSrcRelPos.len() * vLightDir;
-
-    if (fabsf(vLightDir.Dot(zAxis)) > 0.9995f)
-    {
-        Up = yAxis;
-    }
-    else
-    {
-        Up = zAxis;
-    }
-
-    mathMatrixLookAt(&mLightView, Eye, At, Up);
-
-    lof->fNearDist = fNear;
-    lof->fFarDist = fFar;
-    lof->fDepthTestBias = 0.00001f;
-}
-
-AABB CShadowUtils::GetShadowMatrixForCasterBox(Matrix44A& mLightProj, Matrix44A& mLightView, ShadowMapFrustum* lof, float fFarPlaneOffset)
-{
-    GetShadowMatrixForObject(mLightProj, mLightView, lof);
-
-    AABB lightSpaceBounds = AABB::CreateTransformedAABB(Matrix34(mLightView.GetTransposed()), lof->aabbCasters);
-    Vec3 lightSpaceRange = lightSpaceBounds.GetSize();
-
-    const float fNear = -lightSpaceBounds.max.z;
-    const float fFar =  -lightSpaceBounds.min.z + fFarPlaneOffset;
-
-    const float yfov = atan_tpl(lightSpaceRange.y * 0.5f / fNear) * 2.f;
-    const float aspect = lightSpaceRange.x / lightSpaceRange.y;
-
-    mathMatrixPerspectiveFov(&mLightProj, yfov, aspect, fNear, fFar);
-
-    return lightSpaceBounds;
-}
-
-
-CShadowUtils::CShadowUtils()
-{
-}
-
-CShadowUtils::~CShadowUtils()
-{
-}
-
-
-Vec2& CPoissonDiskGen::GetSample(int ind)
-{
-    assert(ind < m_vSamples.size() && ind >= 0);
-    return m_vSamples[ind];
-}
-
-// the size of the kernel for each entry is the index in this vector
-StaticInstance<std::vector<CPoissonDiskGen>> s_kernelSizeGens;
-CPoissonDiskGen& CPoissonDiskGen::GetGenForKernelSize(int size)
-{
-    if ((int)s_kernelSizeGens.size() <= size)
-    {
-        s_kernelSizeGens.resize(size + 1);
-    }
-
-    CPoissonDiskGen& pdg = s_kernelSizeGens[size];
-
-    if (pdg.m_vSamples.size() == 0)
-    {
-        pdg.m_vSamples.resize(size);
-        pdg.InitSamples();
-    }
-
-    return pdg;
-}
-
-void CPoissonDiskGen::FreeMemory()
-{
-    s_kernelSizeGens.clear();
-}
-
-void CPoissonDiskGen::RandomPoint(CRndGen& rand, Vec2& p)
-{
-    //generate random point inside circle
-    do
-    {
-        p.x = rand.GenerateFloat() - 0.5f;
-        p.y = rand.GenerateFloat() - 0.5f;
-    } while (p.x * p.x + p.y * p.y > 0.25f);
-
-    return;
-}
-
-//samples distance-based sorting
-struct SamplesDistaceSort
-{
-    bool operator()(const Vec2& samplA, const Vec2& samplB) const
-    {
-        float R2sampleA = samplA.x * samplA.x + samplA.y * samplA.y;
-        float R2sampleB = samplB.x * samplB.x + samplB.y * samplB.y;
-
-        return
-            (R2sampleA < R2sampleB);
-    }
-};
-
-void CPoissonDiskGen::InitSamples()
-{
-    //Use a random generator with a fixed seed, so code changes(someone adding a new call to rnd() somehwhere) doesn't cause feature tests to fail.
-    CRndGen rand;
-
-    const int nQ = 1000;
-
-    RandomPoint(rand, m_vSamples[0]);
-
-    for (int i = 1; i < (int)m_vSamples.size(); i++)
-    {
-        float dmax = -1.0;
-
-        for (int c = 0; c < i * nQ; c++)
-        {
-            Vec2 curSample;
-            RandomPoint(rand, curSample);
-
-            float dc = 2.0;
-            for (int j = 0; j < i; j++)
-            {
-                float dj =
-                    (m_vSamples[j].x - curSample.x) * (m_vSamples[j].x - curSample.x) +
-                    (m_vSamples[j].y - curSample.y) * (m_vSamples[j].y - curSample.y);
-                if (dc > dj)
-                {
-                    dc = dj;
-                }
-            }
-
-            if (dc > dmax)
-            {
-                m_vSamples[i] = curSample;
-                dmax = dc;
-            }
-        }
-    }
-
-    for (int i = 0; i < (int)m_vSamples.size(); i++)
-    {
-        m_vSamples[i] *= 2.0f;
-    }
-
-    //samples sorting
-    std::stable_sort(m_vSamples.begin(), m_vSamples.end(), SamplesDistaceSort());
-}
-
-void CShadowUtils::GetIrregKernel(float sData[][4], int nSamplesNum)
-{
-    CPoissonDiskGen& pdg = CPoissonDiskGen::GetGenForKernelSize(nSamplesNum);
-
-    for (int i = 0, nIdx = 0; i < nSamplesNum; i += 2, nIdx++)
-    {
-        Vec2 vSample = pdg.GetSample(i);
-        sData[nIdx][0] = vSample.x;
-        sData[nIdx][1] = vSample.y;
-        vSample = pdg.GetSample(i + 1);
-        sData[nIdx][2] = vSample.x;
-        sData[nIdx][3] = vSample.y;
-    }
-}
-
-ShadowMapFrustum* CShadowUtils::GetFrustum(ShadowFrustumID nFrustumID)
-{
-    int nLOD = 0;
-    const int nLightID = GetShadowLightID(nLOD, nFrustumID);
-    const int nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-    const int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-
-    const int nDLights = gRenDev->m_RP.m_DLights[nThreadID][nCurRecLevel].size();
-
-    const int nFrustumIdx = nLightID;
-    assert((unsigned int) nFrustumIdx < (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS));
-    const int nStartIdx = SRendItem::m_StartFrust[nThreadID][nFrustumIdx];
-    const int nEndIdx = SRendItem::m_EndFrust[nThreadID][nFrustumIdx];
-
-    const int nSize = gRenDev->m_RP.m_SMFrustums[nThreadID][nCurRecLevel].size();
-    for (int nFrIdx = nStartIdx; nFrIdx < nEndIdx && nFrIdx < nSize; ++nFrIdx)
-    {
-        ShadowMapFrustum* frustum = &gRenDev->m_RP.m_SMFrustums[nThreadID][nCurRecLevel][nFrIdx];
-        if (frustum->nShadowMapLod == nLOD)
-        {
-            return frustum;
-        }
-    }
-
-    assert(0);
-    return NULL;
-}
-
-ShadowMapFrustum& CShadowUtils::GetFirstFrustum(int nLightID)
-{
-    const int nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-    const int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-    const int nDLights = gRenDev->m_RP.m_DLights[nThreadID][nCurRecLevel].size();
-
-    const int nFrustumIdx = nLightID + nDLights;
-    assert((unsigned int) nFrustumIdx < (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS));
-    const int nStartIdx = SRendItem::m_StartFrust[nThreadID][nFrustumIdx];
-
-    ShadowMapFrustum& firstFrustum = gRenDev->m_RP.m_SMFrustums[nThreadID][nCurRecLevel][nStartIdx];
-    return firstFrustum;
-}
-
-const CShadowUtils::ShadowFrustumIDs* CShadowUtils::GetShadowFrustumList(uint64 nMask)
-{
-    // TODO: proper fix for per render object shadow light mask
-    return NULL;
-
-    if (!nMask)
-    {
-        return NULL;
-    }
-
-    if (!bShadowFrustumCacheValid)
-    {
-        // clear all allocated lists
-        for (CRenderer::ShadowFrustumListsCache::iterator it = gRenDev->m_FrustumsCache.begin();
-             it != gRenDev->m_FrustumsCache.end(); ++it)
-        {
-            (it->second)->Clear();
-        }
-        bShadowFrustumCacheValid = true;
-    }
-
-    CShadowUtils::ShadowFrustumIDs* pList = stl::find_in_map(gRenDev->m_FrustumsCache, nMask, NULL);
-    if (!pList)
-    {
-        pList = new CShadowUtils::ShadowFrustumIDs;
-    }
-    if (pList->empty())
-    {
-        assert(nSunLightID <= 0xFF);
-        // add sun index and lods encoded in higher bits
-        for (int i = 0; i < 8; ++i)
-        {
-            if (nMask & (uint64(1) << i))
-            {
-                pList->Add((i << 8) | (nSunLightID & 0xFF));
-            }
-        }
-        // other lights have 1 lod and index encoded in low bits
-        for (int i = 8; i < 64 && (uint64(1) << i) <= nMask; ++i)
-        {
-            if (nMask & (uint64(1) << i))
-            {
-                pList->Add(i);
-            }
-        }
-        gRenDev->m_FrustumsCache[nMask] = pList;
-    }
-    return pList;
-}
-
-void ShadowMapFrustum::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(pFrustumOwner);
-    pSizer->AddObject(pDepthTex);
-}
diff --git a/Code/CryEngine/RenderDll/Common/ShadowUtils.h b/Code/CryEngine/RenderDll/Common/ShadowUtils.h
deleted file mode 100644
index fce023b2ee..0000000000
--- a/Code/CryEngine/RenderDll/Common/ShadowUtils.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __SHADOWUTILS_H__
-#define __SHADOWUTILS_H__
-
-#define DEG2RAD_R(a) (f64(a) * (g_PI / 180.0))
-#define RAD2DEG_R(a) float((f64)(a) * (180.0 / g_PI))
-
-static const float g_fOmniShadowFov = 95.0f;
-static const float g_fOmniLightFov = 90.5f;
-
-class CRndGen;
-
-class CPoissonDiskGen
-{
-    std::vector<Vec2> m_vSamples;
-
-private:
-    static void RandomPoint(CRndGen& rand, Vec2& p);
-    void InitSamples();
-
-public:
-    Vec2& GetSample(int ind);
-
-    static CPoissonDiskGen& GetGenForKernelSize(int num);
-    static void FreeMemory();
-};
-
-enum EFrustum_Type
-{
-    FTYP_SHADOWOMNIPROJECTION,
-    FTYP_SHADOWPROJECTION,
-    FTYP_OMNILIGHTVOLUME,
-    FTYP_LIGHTVOLUME,
-    FTYP_MAX,
-    FTYP_UNKNOWN
-};
-
-struct SRenderTileInfo;
-
-class CShadowUtils
-{
-public:
-    typedef uint16 ShadowFrustumID;
-    typedef PodArray<ShadowFrustumID> ShadowFrustumIDs;
-
-public:
-    static void CalcDifferentials(const CCamera& cam, float fViewWidth, float fViewHeight, float& fFragSizeX);
-    static void ProjectScreenToWorldExpansionBasis(const Matrix44r& mShadowTexGen, const CCamera& cam, const Vec2& vJitter, float fViewWidth, float fViewHeight, Vec4r& vWBasisX, Vec4r& vWBasisY, Vec4r& vWBasisZ, Vec4r& vCamPos, bool bWPos, SRenderTileInfo* pSTileInfo);
-    static void CalcScreenToWorldExpansionBasis(const CCamera& cam, const Vec2& vJitter, float fViewWidth, float fViewHeight, Vec3& vWBasisX, Vec3& vWBasisY, Vec3& vWBasisZ, bool bWPos);
-
-    static void CalcLightBoundRect(const SRenderLight* pLight, const CameraViewParameters& RCam, Matrix44A& mView, Matrix44A& mProj, Vec2* pvMin, Vec2* pvMax, IRenderAuxGeom* pAuxRend);
-    static void GetProjectiveTexGen(const SRenderLight* pLight, int nFace, Matrix44A* mTexGen);
-    static void GetCubemapFrustumForLight(const SRenderLight* pLight, int nS, float fFov, Matrix44A* pmProj, Matrix44A* pmView, bool bProjLight);
-
-    static void GetShadowMatrixForObject(Matrix44A& mLightProj, Matrix44A& mLightView, ShadowMapFrustum* lof);
-    static AABB GetShadowMatrixForCasterBox(Matrix44A& mLightProj, Matrix44A& mLightView, ShadowMapFrustum* lof, float fFarPlaneOffset = 0);
-    static void GetCubemapFrustum(EFrustum_Type eFrustumType, ShadowMapFrustum* pFrust, int nS, Matrix44A* pmProj, Matrix44A* pmView, Matrix33* pmLightRot = NULL);
-
-    static Matrix34 GetAreaLightMatrix(const SRenderLight* pLight, Vec3 vScale);
-
-    static void mathMatrixLookAtSnap(Matrix44A* pMatr, const Vec3& Eye, const Vec3& At, ShadowMapFrustum* pFrust);
-    static void GetShadowMatrixOrtho(Matrix44A& mLightProj, Matrix44A& mLightView, const Matrix44A& mViewMatrix, ShadowMapFrustum* lof, bool bViewDependent);
-
-    static void GetIrregKernel(float sData[][4], int nSamplesNum);
-
-    static ShadowMapFrustum* GetFrustum(ShadowFrustumID nFrustumID);
-    static ShadowMapFrustum& GetFirstFrustum(int nLightID);
-
-    // Get list of encoded frustum ids for given mask
-    static const ShadowFrustumIDs* GetShadowFrustumList(uint64 nMask);
-    // Get light id and LOD id from encoded id in shadow frustum cache
-    static int32 GetShadowLightID(int32& nLod, ShadowFrustumID nFrustumID)
-    {
-        nLod = int32((nFrustumID >> 8) & 0xFF);
-        return int32(nFrustumID & 0xFF);
-    }
-    static void InvalidateShadowFrustumCache()
-    {
-        bShadowFrustumCacheValid = false;
-    }
-
-    CShadowUtils();
-    ~CShadowUtils();
-
-private:
-    static bool bShadowFrustumCacheValid;
-    // Currently forced to use always ID 0 for sun (if sun present)
-    static const int nSunLightID = 0;
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/Shadow_Renderer.h b/Code/CryEngine/RenderDll/Common/Shadow_Renderer.h
deleted file mode 100644
index f238c5d065..0000000000
--- a/Code/CryEngine/RenderDll/Common/Shadow_Renderer.h
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#if !defined(SHADOWRENDERER_H)
-#define SHADOWRENDERER_H
-
-
-#include "ShadowUtils.h"
-#include <IRenderAuxGeom.h>
-#include <VectorSet.h>
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-#define OMNI_SIDES_NUM 6
-
-// data used to compute a custom shadow frustum for near shadows
-struct CustomShadowMapFrustumData
-{
-    AABB aabb;
-};
-
-struct ShadowMapFrustum
-{
-    enum eFrustumType // NOTE: Be careful when modifying the enum as it is used for sorting frustums in SCompareByLightIds
-    {
-        e_GsmDynamic         = 0,
-        e_GsmDynamicDistance = 1,
-        e_GsmCached          = 2,
-        e_HeightMapAO        = 3,
-        e_Nearest            = 4,
-        e_PerObject          = 5,
-
-        e_NumTypes
-    };
-
-    eFrustumType m_eFrustumType;
-
-    Matrix44A mLightProjMatrix;
-    Matrix44A mLightViewMatrix;
-
-    // flags
-    bool    bUseAdditiveBlending;
-    bool    bIncrementalUpdate;
-
-    // if set to true - m_castersList contains all casters in light radius
-    // and all other members related only to single frustum projection case are undefined
-    bool    bOmniDirectionalShadow;
-    uint8   nOmniFrustumMask;
-    uint8   nInvalidatedFrustMask[MAX_GPU_NUM]; //for each GPU
-    bool    bBlendFrustum;
-    float fBlendVal;
-
-    uint32 nShadowGenMask;
-    bool    bIsMGPUCopy;
-
-    bool bHWPCFCompare;
-
-    uint8 nShadowPoolUpdateRate;
-
-    //sampling parameters
-    f32 fWidthS, fWidthT;
-    f32 fBlurS, fBlurT;
-
-    //fading distance per light source
-    float fShadowFadingDist;
-
-    ETEX_Format             m_eReqTF;
-    ETEX_Type               m_eReqTT;
-
-    //texture in pool
-    bool bUseShadowsPool;
-    struct ShadowMapFrustum* pPrevFrustum = nullptr;
-    struct ShadowMapFrustum* pFrustumOwner = nullptr;
-    class CTexture* pDepthTex;
-
-    //3d engine parameters
-    float fFOV;
-    float fNearDist;
-    float fFarDist;
-    int   nTexSize;
-
-    //shadow renderer parameters - should be in separate structure
-    //atlas parameters
-    int   nTextureWidth;
-    int   nTextureHeight;
-    bool  bUnwrapedOmniDirectional;
-    int   nShadowMapSize;
-
-    //packer params
-    uint nPackID[OMNI_SIDES_NUM];
-    int packX[OMNI_SIDES_NUM];
-    int packY[OMNI_SIDES_NUM];
-    int packWidth[OMNI_SIDES_NUM];
-    int packHeight[OMNI_SIDES_NUM];
-
-    int   nResetID;
-    float fFrustrumSize;
-    float fProjRatio;
-    float fDepthTestBias;
-    float fDepthConstBias;
-    float fDepthSlopeBias;
-    PodArray<struct IShadowCaster*> m_castersList;
-    PodArray<struct IShadowCaster*> m_jobExecutedCastersList;
-
-    CCamera FrustumPlanes[OMNI_SIDES_NUM];
-    uint32 nShadowGenID[RT_COMMAND_BUF_COUNT][OMNI_SIDES_NUM];
-    AABB aabbCasters; //casters bbox in world space
-    Vec3 vLightSrcRelPos; // relative world space
-    Vec3 vProjTranslation; // dst position
-    float fRadius;
-    int nUpdateFrameId;
-    IRenderNode* pLightOwner = nullptr;
-    uint32 uCastersListCheckSum;
-    int nShadowMapLod;          // currently use as GSMLod, can be used as cubemap side, -1 means this variable is not used
-
-    uint32  m_Flags;
-
-    struct ShadowCacheData
-    {
-        enum eUpdateStrategy
-        {
-            // Renders the entire cached shadowmap in one pass.
-            // Generally used for a single frame when an event (script, level load, proximity to frustum border, etc.) requests an update of the cache.
-            // Will revert to one of the other methods after the update occurs.
-            eFullUpdate,
-
-            // Cached shadow frustums will constantly check if updates are required due to moving objects or proximity to the frustum border.
-            // Has potentially very high CPU overhead because each cached shadow map frustum culls the octree each frame.
-            // Potentially higher GPU overhead because may render extra dynamic or distant objects each frame.
-            eIncrementalUpdate, 
-
-            // Updates must triggered manually via script.  Most optimal solution, but requires manual setup.
-            eManualUpdate, 
-
-            // Updates may either be triggered manually by script or when the camera moves too close to the border of the shadow frustum
-            eManualOrDistanceUpdate 
-        };
-
-        ShadowCacheData() { Reset(); }
-
-        void Reset()
-        {
-            memset(mOctreePath, 0x0, sizeof(mOctreePath));
-            memset(mOctreePathNodeProcessed, 0x0, sizeof(mOctreePathNodeProcessed));
-            mProcessedCasters.clear();
-            mProcessedTerrainCasters.clear();
-        }
-
-        static const int MAX_TRAVERSAL_PATH_LENGTH = 32;
-        uint8 mOctreePath[MAX_TRAVERSAL_PATH_LENGTH];
-        uint8 mOctreePathNodeProcessed[MAX_TRAVERSAL_PATH_LENGTH];
-
-        VectorSet<struct IShadowCaster*> mProcessedCasters;
-        VectorSet<uint64> mProcessedTerrainCasters;
-    }* pShadowCacheData = nullptr;
-
-
-    ShadowMapFrustum()
-    {
-        ZeroStruct(*this);
-        fProjRatio = 1.f;
-
-        //initial frustum position should be outside of the visible map
-        vProjTranslation = Vec3(-1000.0f, -1000.0f, -1000.0f);
-
-        bUnwrapedOmniDirectional = false;
-        nShadowMapSize = 0;
-
-        nUpdateFrameId = -1000;
-
-        pPrevFrustum = nullptr;
-        aabbCasters.Reset();
-    }
-
-    ShadowMapFrustum(const ShadowMapFrustum& rOther)
-    {
-        (*this) = rOther;
-    }
-
-    ~ShadowMapFrustum()
-    {
-        // make sure that the renderer isn't using this shadow frustum anymore
-        threadID nThreadID = 0;
-        gEnv->pRenderer->EF_Query(EFQ_RenderThreadList, nThreadID);
-        gEnv->pRenderer->GetFinalizeShadowRendItemJobExecutor(nThreadID)->WaitForCompletion();
-
-        SAFE_DELETE(pShadowCacheData);
-    }
-
-    ShadowMapFrustum& operator=(const ShadowMapFrustum& rOther)
-    {
-        m_eFrustumType = rOther.m_eFrustumType;
-        mLightProjMatrix = rOther.mLightProjMatrix;
-        mLightViewMatrix = rOther.mLightViewMatrix;
-
-        bUseAdditiveBlending = rOther.bUseAdditiveBlending;
-        bOmniDirectionalShadow = rOther.bOmniDirectionalShadow;
-        bBlendFrustum = rOther.bBlendFrustum;
-        fBlendVal = rOther.fBlendVal;
-        bIncrementalUpdate = rOther.bIncrementalUpdate;
-        nOmniFrustumMask = rOther.nOmniFrustumMask;
-        memcpy(nInvalidatedFrustMask, rOther.nInvalidatedFrustMask, sizeof(nInvalidatedFrustMask));
-        nShadowGenMask = rOther.nShadowGenMask;
-
-        bHWPCFCompare = rOther.bHWPCFCompare;
-
-        nShadowPoolUpdateRate = rOther.nShadowPoolUpdateRate;
-
-        fWidthS = rOther.fWidthS;
-        fWidthT = rOther.fWidthT;
-        fBlurS = rOther.fBlurS;
-        fBlurT = rOther.fBlurT;
-
-        fShadowFadingDist = rOther.fShadowFadingDist;
-
-        m_eReqTF = rOther.m_eReqTF;
-        m_eReqTT = rOther.m_eReqTT;
-
-        bUseShadowsPool = rOther.bUseShadowsPool;
-
-        // those pointer are not owned by the shadowfrustum, so we don't need a deep copy
-        pFrustumOwner = rOther.pFrustumOwner;
-        pDepthTex = rOther.pDepthTex;
-        pLightOwner = rOther.pLightOwner;
-
-        fFOV = rOther.fFOV;
-        fNearDist = rOther.fNearDist;
-        fFarDist = rOther.fFarDist;
-        nTexSize = rOther.nTexSize;
-
-        nTextureWidth = rOther.nTextureWidth;
-        nTextureHeight = rOther.nTextureHeight;
-        bUnwrapedOmniDirectional = rOther.bUnwrapedOmniDirectional;
-        nShadowMapSize = rOther.nShadowMapSize;
-
-        memcpy(nPackID, rOther.nPackID, sizeof(nPackID));
-        memcpy(packX, rOther.packX, sizeof(packX));
-        memcpy(packY, rOther.packY, sizeof(packY));
-        memcpy(packWidth, rOther.packWidth, sizeof(packWidth));
-        memcpy(packHeight, rOther.packHeight, sizeof(packHeight));
-
-        nResetID = rOther.nResetID;
-        fFrustrumSize = rOther.fFrustrumSize;
-        fProjRatio = rOther.fProjRatio;
-        fDepthTestBias = rOther.fDepthTestBias;
-        fDepthConstBias = rOther.fDepthConstBias;
-        fDepthSlopeBias = rOther.fDepthSlopeBias;
-
-        m_castersList = rOther.m_castersList;
-        m_jobExecutedCastersList = rOther.m_jobExecutedCastersList;
-
-        memcpy(FrustumPlanes, rOther.FrustumPlanes, sizeof(FrustumPlanes));
-        memcpy(nShadowGenID, rOther.nShadowGenID, sizeof(nShadowGenID));
-
-        aabbCasters = rOther.aabbCasters;
-        vLightSrcRelPos = rOther.vLightSrcRelPos;
-        vProjTranslation = rOther.vProjTranslation;
-        fRadius = rOther.fRadius;
-        nUpdateFrameId = rOther.nUpdateFrameId;
-
-        uCastersListCheckSum = rOther.uCastersListCheckSum;
-        nShadowMapLod = rOther.nShadowMapLod;
-        m_Flags = rOther.m_Flags;
-
-        bIsMGPUCopy = rOther.bIsMGPUCopy;
-        if (rOther.pShadowCacheData != nullptr)
-        {
-            if (pShadowCacheData == nullptr)
-            {
-                pShadowCacheData = new ShadowCacheData();
-            }
-            *pShadowCacheData = *rOther.pShadowCacheData;
-        }
-        else
-        {
-            SAFE_DELETE(pShadowCacheData);
-        }
-
-        return *this;
-    }
-
-    void GetSideViewport(int nSide, int* pViewport)
-    {
-        if (bUseShadowsPool)
-        {
-            pViewport[0] = packX[nSide];
-            pViewport[1] = packY[nSide];
-            pViewport[2] = packWidth[nSide];
-            pViewport[3] = packHeight[nSide];
-        }
-        else
-        {
-            //simplest cubemap 6 faces unwrap
-            pViewport[0] = nShadowMapSize * (nSide % 3);
-            pViewport[1] = nShadowMapSize * (nSide / 3);
-            pViewport[2] = nShadowMapSize;
-            pViewport[3] = nShadowMapSize;
-        }
-    }
-
-    void GetTexOffset(int nSide, float* pOffset, float* pScale, int nShadowsPoolSizeX, int nShadowsPoolSizeY)
-    {
-        if (bUseShadowsPool)
-        {
-            pScale[0] = float(nShadowMapSize) / nShadowsPoolSizeX; //SHADOWS_POOL_SZ 1024
-            pScale[1] = float(nShadowMapSize) / nShadowsPoolSizeY;
-            pOffset[0] = float(packX[nSide]) / nShadowsPoolSizeX;
-            pOffset[1] = float(packY[nSide]) / nShadowsPoolSizeY;
-        }
-        else
-        {
-            pOffset[0] = 1.0f / 3.0f * (nSide % 3);
-            pOffset[1] = 1.0f / 2.0f * (nSide / 3);
-            pScale[0] = 1.0f / 3.0f;
-            pScale[1] = 1.0f / 2.0f;
-        }
-    }
-
-    void RequestUpdate()
-    {
-        for (int i = 0; i < MAX_GPU_NUM; i++)
-        {
-            nInvalidatedFrustMask[i] = 0x3F;
-        }
-    }
-
-    bool isUpdateRequested(int nMaskNum)
-    {
-        assert(nMaskNum >= 0 && nMaskNum < MAX_GPU_NUM);
-        /*if (nMaskNum==-1) //request from 3dengine
-        {
-          for (int i=0; i<MAX_GPU_NUM; i++)
-          {
-            if(nInvalidatedFrustMask[i]>0)
-              return true;
-          }
-          return false;
-        }*/
-
-        return (nInvalidatedFrustMask[nMaskNum] > 0);
-    }
-
-    bool IsCached() const
-    {
-        return m_eFrustumType == e_GsmCached || m_eFrustumType == e_HeightMapAO;
-    }
-
-    ILINE bool IntersectAABB(const AABB& bbox, bool* pAllIn) const
-    {
-        if (bOmniDirectionalShadow)
-        {
-            return bbox.IsOverlapSphereBounds(vLightSrcRelPos + vProjTranslation, fFarDist);
-        }
-        else
-        {
-            bool bDummy = false;
-            if (bBlendFrustum)
-            {
-                if (FrustumPlanes[1].IsAABBVisible_EH(bbox, pAllIn) > 0)
-                {
-                    return true;
-                }
-            }
-
-            return FrustumPlanes[0].IsAABBVisible_EH(bbox, bBlendFrustum ? &bDummy : pAllIn) > 0;
-        }
-    }
-
-    ILINE bool IntersectSphere(const Sphere& sp, bool* pAllIn)
-    {
-        if (bOmniDirectionalShadow)
-        {
-            return Distance::Point_PointSq(sp.center, vLightSrcRelPos + vProjTranslation) < sqr(fFarDist + sp.radius);
-        }
-        else
-        {
-            uint8 res = 0;
-            if (bBlendFrustum)
-            {
-                res = FrustumPlanes[1].IsSphereVisible_FH(sp);
-                * pAllIn = (res == CULL_INCLUSION);
-                if (res != CULL_EXCLUSION)
-                {
-                    return true;
-                }
-            }
-            res = FrustumPlanes[0].IsSphereVisible_FH(sp);
-            * pAllIn = bBlendFrustum ? false : (res == CULL_INCLUSION);
-            return res != CULL_EXCLUSION;
-        }
-    }
-
-    void UnProject(float sx, float sy, float sz, float* px, float* py, float* pz, IRenderer* pRend)
-    {
-        const int shadowViewport[4] = {0, 0, 1, 1};
-
-        Matrix44A mIden;
-        mIden.SetIdentity();
-
-        //FIX remove float arrays
-        pRend->UnProject(sx, sy, sz,
-            px, py, pz,
-            (float*)&mLightViewMatrix,
-            (float*)&mIden,
-            shadowViewport);
-    }
-
-    Vec3& UnProjectVertex3d(int sx, int sy, int sz, Vec3& vert, IRenderer* pRend)
-    {
-        float px;
-        float py;
-        float pz;
-        UnProject((float)sx, (float)sy, (float)sz, &px, &py, &pz, pRend);
-        vert.x = (float)px;
-        vert.y = (float)py;
-        vert.z = (float)pz;
-
-        //      pRend->DrawBall(vert,10);
-
-        return vert;
-    }
-
-    void UpdateOmniFrustums()
-    {
-        const float sCubeVector[6][7] =
-        {
-            {1, 0, 0,  0, 0, 1, -90}, //posx
-            {-1, 0, 0, 0, 0, 1,  90}, //negx
-            {0, 1, 0,  0, 0, -1, 0},  //posy
-            {0, -1, 0, 0, 0, 1,  0},  //negy
-            {0, 0, 1,  0, 1, 0,  0},  //posz
-            {0, 0, -1, 0, 1, 0,  0},  //negz
-        };
-
-        const Vec3 vPos = vLightSrcRelPos + vProjTranslation;
-        for (int nS = 0; nS < OMNI_SIDES_NUM; ++nS)
-        {
-            const Vec3 vForward   = Vec3(sCubeVector[nS][0], sCubeVector[nS][1], sCubeVector[nS][2]);
-            const Vec3 vUp        = Vec3(sCubeVector[nS][3], sCubeVector[nS][4], sCubeVector[nS][5]);
-            const Matrix33 matRot = Matrix33::CreateOrientation(vForward, vUp, DEG2RAD(sCubeVector[nS][6]));
-            const float fov = bUnwrapedOmniDirectional ? (float)DEG2RAD_R(g_fOmniShadowFov) : (float)DEG2RAD_R(90.0f);
-
-            FrustumPlanes[nS].SetMatrix(Matrix34(matRot, vPos));
-            FrustumPlanes[nS].SetFrustum(nTexSize, nTexSize, fov, fNearDist, fFarDist);
-        }
-    }
-
-    void DrawFrustum(IRenderer* pRend, int nFrames = 1)
-    {
-        if (abs(nUpdateFrameId - pRend->GetFrameID()) > nFrames)
-        {
-            return;
-        }
-
-        //if(!arrLightViewMatrix[0] && !arrLightViewMatrix[5] && !arrLightViewMatrix[10])
-        //return;
-
-        IRenderAuxGeom* pRendAux = pRend->GetIRenderAuxGeom();
-        const ColorF cCascadeColors[] = { Col_Red, Col_Green, Col_Blue, Col_Yellow, Col_Magenta, Col_Cyan, Col_Black, Col_White };
-        const uint nColorCount = sizeof(cCascadeColors) / sizeof(cCascadeColors[0]);
-
-        Vec3 vert1, vert2;
-        ColorB c0 = cCascadeColors[nShadowMapLod % nColorCount];
-        {
-            pRendAux->DrawLine(
-                UnProjectVertex3d(0, 0, 0, vert1, pRend), c0,
-                UnProjectVertex3d(0, 0, 1, vert2, pRend), c0);
-
-            pRendAux->DrawLine(
-                UnProjectVertex3d(1, 0, 0, vert1, pRend), c0,
-                UnProjectVertex3d(1, 0, 1, vert2, pRend), c0);
-
-            pRendAux->DrawLine(
-                UnProjectVertex3d(1, 1, 0, vert1, pRend), c0,
-                UnProjectVertex3d(1, 1, 1, vert2, pRend), c0);
-
-            pRendAux->DrawLine(
-                UnProjectVertex3d(0, 1, 0, vert1, pRend), c0,
-                UnProjectVertex3d(0, 1, 1, vert2, pRend), c0);
-        }
-
-        for (int i = 0; i <= 1; i++)
-        {
-            pRendAux->DrawLine(
-                UnProjectVertex3d(0, 0, i, vert1, pRend), c0,
-                UnProjectVertex3d(1, 0, i, vert2, pRend), c0);
-
-            pRendAux->DrawLine(
-                UnProjectVertex3d(1, 0, i, vert1, pRend), c0,
-                UnProjectVertex3d(1, 1, i, vert2, pRend), c0);
-
-            pRendAux->DrawLine(
-                UnProjectVertex3d(1, 1, i, vert1, pRend), c0,
-                UnProjectVertex3d(0, 1, i, vert2, pRend), c0);
-
-            pRendAux->DrawLine(
-                UnProjectVertex3d(0, 1, i, vert1, pRend), c0,
-                UnProjectVertex3d(0, 0, i, vert2, pRend), c0);
-        }
-    }
-
-    void ResetCasterLists()
-    {
-        m_castersList.Clear();
-        m_jobExecutedCastersList.Clear();
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-};
-
-struct ShadowFrustumMGPUCache
-    : public ISyncMainWithRenderListener
-{
-    StaticArray<ShadowMapFrustum*, MAX_GSM_LODS_NUM> m_pStaticShadowMapFrustums;
-    ShadowMapFrustum* m_pHeightMapAOFrustum;
-
-    uint32 nUpdateMaskMT;
-    uint32 nUpdateMaskRT;
-
-    ShadowFrustumMGPUCache()
-        : nUpdateMaskMT(0)
-        , nUpdateMaskRT(0)
-    {
-        m_pHeightMapAOFrustum = NULL;
-        m_pStaticShadowMapFrustums.fill(NULL);
-    };
-
-    void Init()
-    {
-        m_pHeightMapAOFrustum = new ShadowMapFrustum;
-        m_pHeightMapAOFrustum->pShadowCacheData = new ShadowMapFrustum::ShadowCacheData;
-
-        for (int i = 0; i < m_pStaticShadowMapFrustums.size(); ++i)
-        {
-            m_pStaticShadowMapFrustums[i] = new ShadowMapFrustum;
-            m_pStaticShadowMapFrustums[i]->pShadowCacheData = new ShadowMapFrustum::ShadowCacheData;
-        }
-
-        nUpdateMaskMT = nUpdateMaskRT = 0;
-    }
-
-    void Release()
-    {
-        SAFE_DELETE(m_pHeightMapAOFrustum);
-        for (int i = 0; i < m_pStaticShadowMapFrustums.size(); ++i)
-        {
-            SAFE_DELETE(m_pStaticShadowMapFrustums[i]);
-        }
-    }
-
-    void DeleteFromCache(IShadowCaster* pCaster)
-    {
-        for (int i = 0; i < m_pStaticShadowMapFrustums.size(); ++i)
-        {
-            ShadowMapFrustum* pFr = m_pStaticShadowMapFrustums[i];
-            if (pFr)
-            {
-                pFr->m_castersList.Delete(pCaster);
-                pFr->m_jobExecutedCastersList.Delete(pCaster);
-            }
-        }
-
-        if (m_pHeightMapAOFrustum)
-        {
-            m_pHeightMapAOFrustum->m_castersList.Delete(pCaster);
-            m_pHeightMapAOFrustum->m_jobExecutedCastersList.Delete(pCaster);
-        }
-    }
-
-    virtual void SyncMainWithRender()
-    {
-        /** What we need here is the renderer telling the main thread to update the shadow frustum cache when all GPUs are done
-        * with the current frustum.
-        *
-        * So in case the main thread has done a full update (nUpdateMaskMT has bits for all GPUs set) we need to copy
-        * the update mask to the renderer. Note that we reset the main thread update mask in the same spot to avoid doing it in
-        * the next frame again.
-        *
-        * Otherwise just copy the renderer's progress back to the main thread. The main thread will automatically do a full update
-        * when nUpdateMaskMT reaches 0                                                                                                                                                                                  */
-        const int nFullUpdateMask = (1 << gEnv->pRenderer->GetActiveGPUCount()) - 1;
-        if (nUpdateMaskMT == nFullUpdateMask)
-        {
-            nUpdateMaskRT = nUpdateMaskMT;
-            nUpdateMaskMT = 0xFFFFFFFF;
-        }
-        else
-        {
-            nUpdateMaskMT = nUpdateMaskRT;
-        }
-    }
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/TextMessages.cpp b/Code/CryEngine/RenderDll/Common/TextMessages.cpp
deleted file mode 100644
index f318636a62..0000000000
--- a/Code/CryEngine/RenderDll/Common/TextMessages.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "TextMessages.h"
-
-const uint32 g_dwTextMessageMaxSizeInKB = 128;
-
-void CTextMessages::PushEntry_Text(const Vec3& vPos, const ColorB col, const float fFontSize, const int nDrawFlags, const char* szText)
-{
-    AUTO_LOCK(m_TextMessageLock); // Not thread safe without this
-
-    assert(szText);
-    assert(!m_dwCurrentReadPos);        // iteration should not be started
-
-    size_t texlen = strlen(szText);
-    size_t size = sizeof(SText) + texlen + 1;
-
-    if (size > 1020)
-    {
-        size = 1020;
-        texlen = size - sizeof(SText) - 1;
-    }
-
-    size_t paddedSize = (size + 3) & ~3;
-    uint8* pData = PushData((uint32) paddedSize);
-
-    if (!pData)
-    {
-        return;
-    }
-
-    memcpy((char*)pData + sizeof(SText), szText, texlen);
-    pData[sizeof(SText) + texlen] = '\0';
-
-    SText& rHeader = *(SText*)pData;
-
-    rHeader.Init((uint32) paddedSize);
-    rHeader.m_vPos = vPos;
-    rHeader.m_Color = col;
-    rHeader.m_fFontSize = fFontSize;
-    rHeader.m_nDrawFlags = nDrawFlags;
-}
-
-void CTextMessages::Clear(bool posonly)
-{
-    if (!posonly)
-    {
-        m_TextMessageData.clear();
-        // TODO: ideally we should not reconstruct memory
-        m_TextMessageData.shrink_to_fit();
-    }
-
-    m_dwCurrentReadPos = 0;
-}
-
-const CTextMessages::CTextMessageHeader* CTextMessages::GetNextEntry()
-{
-    uint32 dwSize = (uint32)m_TextMessageData.size();
-
-    if (m_dwCurrentReadPos >= dwSize)
-    {
-        return 0;       // end reached
-    }
-    const CTextMessageHeader* pHeader = (const CTextMessageHeader*)&m_TextMessageData[m_dwCurrentReadPos];
-
-    m_dwCurrentReadPos += pHeader->GetSize();
-
-    return pHeader;
-}
-
-uint8* CTextMessages::PushData(const uint32 dwBytes)
-{
-    assert(dwBytes);
-    assert(dwBytes % 4 == 0);
-
-    uint32 dwSize = (uint32)m_TextMessageData.size();
-
-    if (dwSize + dwBytes > g_dwTextMessageMaxSizeInKB * 1024)
-    {
-        return 0;
-    }
-
-    m_TextMessageData.resize(dwSize + dwBytes);
-
-    return (uint8*)&m_TextMessageData[dwSize];
-}
-
-uint32 CTextMessages::ComputeSizeInMemory() const
-{
-    return (uint32)(sizeof(*this) + m_TextMessageData.size());
-}
diff --git a/Code/CryEngine/RenderDll/Common/TextMessages.h b/Code/CryEngine/RenderDll/Common/TextMessages.h
deleted file mode 100644
index 69199ffcc8..0000000000
--- a/Code/CryEngine/RenderDll/Common/TextMessages.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef _TEXTMESSAGES_H_
-#define _TEXTMESSAGES_H_
-
-// compact buffer to store text messages for a frame and render them each frame
-// (replacement for the former PodArray<text_info_struct> m_listMessages[2], cleaner/more cache friendly,less memory,faster,typesafe)
-// todo: can release memory in case this is needed
-class CTextMessages
-{
-public:
-    CTextMessages()
-        : m_dwCurrentReadPos() {}
-
-    class CTextMessageHeader;
-
-    // iteration should not be started yet
-    // Arguments
-    //   vPos - WorldSpace position
-    //   szText - must not be 0
-    //   nDrawFlags - EDrawTextFlags
-    void PushEntry_Text(const Vec3& vPos, const ColorB col, const float fFontSize, const int nDrawFlags, const char* szText);
-
-    // usually called every frame
-    // resets/ends iteration
-    void Clear(bool posonly = false);
-
-    // todo: improve interface
-    // starts the iteration
-    // Returns
-    //   0 if there are no more entries
-    const CTextMessageHeader* GetNextEntry();
-
-    uint32 ComputeSizeInMemory() const;
-
-    //
-    bool empty() const { return m_TextMessageData.empty(); }
-
-    // -------------------------------------------------------------
-
-    struct SText;
-
-    class CTextMessageHeader
-    {
-    public:
-        const SText* CastTo_Text() const { return (SText*)this; }
-
-        uint16 GetSize() const { return m_Size; }
-
-    protected: // ---------------------------------------------
-        uint16      m_Size; // including attached text
-    };
-
-    // ---------------------------------------------
-
-    struct SText
-        : public CTextMessageHeader
-    {
-        void Init(const uint32 paddedSize) { assert(paddedSize < 65535); m_Size = paddedSize; }
-        const char* GetText() const { return (char*)this + sizeof(*this); }
-
-        Vec3            m_vPos;
-        ColorB      m_Color;
-        float           m_fFontSize;
-        uint32      m_nDrawFlags;       // EDrawTextFlags
-    };
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_TextMessageData);
-    }
-private: // ------------------------------------------------------
-
-    // each call the former returned pointer might be invalid
-    // Arguments
-    //   dwBytes >0 and dividable by 4
-    // Returns
-    //   0 if there is not enough space
-    uint8* PushData(const uint32 dwBytes);
-
-    // ------------------------------------------------------
-
-    std::vector<uint8>              m_TextMessageData;      // consists of many 4 byte aligned STextMessageHeader+ZeroTermintedText
-    uint32                                      m_dwCurrentReadPos;     // in bytes, !=0 interation started
-
-    CryCriticalSection              m_TextMessageLock;
-};
-
-
-#endif // #ifndef _TEXTMESSAGES_H_
diff --git a/Code/CryEngine/RenderDll/Common/Textures/DynTexture.cpp b/Code/CryEngine/RenderDll/Common/Textures/DynTexture.cpp
deleted file mode 100644
index 4f2784b1bb..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/DynTexture.cpp
+++ /dev/null
@@ -1,1741 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Common dynamic texture manager implementation.
-
-
-#include "RenderDll_precompiled.h"
-
-//======================================================================
-// Dynamic textures
-SDynTexture SDynTexture::s_Root("Root");
-uint32 SDynTexture::s_nMemoryOccupied = 0;
-
-uint32 SDynTexture::s_iNumTextureBytesCheckedOut;
-uint32 SDynTexture::s_iNumTextureBytesCheckedIn;
-
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_BC1;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_BC1;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R8G8B8A8;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R8G8B8A8;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R32F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R32F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R16F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R16G16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R16G16F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R8G8B8A8S;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R8G8B8A8S;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R16G16B16A16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R16G16B16A16F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R10G10B10A2;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R10G10B10A2;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R11G11B10F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R11G11B10F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R11G11B10F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R11G11B10F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_R8G8S;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_R8G8S;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R8G8S;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R8G8S;
-
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2D_Shadows[SBP_MAX];
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2D_Shadows[SBP_MAX];
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_Shadows[SBP_MAX];
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_Shadows[SBP_MAX];
-
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePool2DCustom_R16G16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePool2DCustom_R16G16F;
-
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_BC1;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_BC1;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R8G8B8A8;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R8G8B8A8;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R32F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R32F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R16F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R16G16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R16G16F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R8G8B8A8S;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R8G8B8A8S;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R16G16B16A16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R16G16B16A16F;
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCube_R10G10B10A2;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCube_R10G10B10A2;
-
-SDynTexture::TextureSet    SDynTexture::s_availableTexturePoolCubeCustom_R16G16F;
-SDynTexture::TextureSubset SDynTexture::s_checkedOutTexturePoolCubeCustom_R16G16F;
-
-int SDynTexture2::s_nMemoryOccupied[eTP_Max];
-
-uint32 SDynTexture::s_SuggestedDynTexAtlasCloudsMaxsize;
-uint32 SDynTexture::s_SuggestedTexAtlasSize;
-uint32 SDynTexture::s_SuggestedDynTexMaxSize;
-uint32 SDynTexture::s_CurDynTexAtlasCloudsMaxsize;
-uint32 SDynTexture::s_CurTexAtlasSize;
-uint32 SDynTexture::s_CurDynTexMaxSize;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define SDYNTEXTURE_CPP_SECTION_1 1
-#endif
-
-SDynTexture::SDynTexture(const char* szSource)
-{
-    m_nWidth = 0;
-    m_nHeight = 0;
-    m_nReqWidth = m_nWidth;
-    m_nReqHeight = m_nHeight;
-    m_pTexture = NULL;
-    m_eTF = eTF_Unknown;
-    m_eTT = eTT_2D;
-    m_nTexFlags = 0;
-    cry_strcpy(m_sSource, szSource);
-    m_bLocked = false;
-    m_nUpdateMask = 0;
-    if (gRenDev)
-    {
-        m_nFrameReset = gRenDev->m_nFrameReset;
-    }
-
-    m_Next = NULL;
-    m_Prev = NULL;
-    if (!s_Root.m_Next)
-    {
-        s_Root.m_Next = &s_Root;
-        s_Root.m_Prev = &s_Root;
-    }
-    AdjustRealSize();
-}
-
-SDynTexture::SDynTexture(int nWidth, int nHeight, ETEX_Format eTF, ETEX_Type eTT, int nTexFlags, const char* szSource)
-{
-    m_nWidth =  nWidth;
-    m_nHeight = nHeight;
-    m_nReqWidth = m_nWidth;
-    m_nReqHeight = m_nHeight;
-    m_eTF = eTF;
-    m_eTT = eTT;
-    m_nTexFlags = nTexFlags | FT_USAGE_RENDERTARGET;
-    cry_strcpy(m_sSource, szSource);
-    m_bLocked = false;
-    m_nUpdateMask = 0;
-    m_pFrustumOwner = NULL;
-    if (gRenDev)
-    {
-        m_nFrameReset = gRenDev->m_nFrameReset;
-    }
-
-    m_pTexture = NULL;
-    m_Next = NULL;
-    m_Prev = NULL;
-    if (!s_Root.m_Next)
-    {
-        s_Root.m_Next = &s_Root;
-        s_Root.m_Prev = &s_Root;
-    }
-    Link();
-
-    AdjustRealSize();
-}
-
-SDynTexture::~SDynTexture()
-{
-    if (m_pTexture)
-    {
-        ReleaseDynamicRT(false);
-    }
-    m_pTexture = NULL;
-    Unlink();
-}
-
-int SDynTexture::GetTextureID()
-{
-    return m_pTexture ? m_pTexture->GetTextureID() : 0;
-}
-
-bool SDynTexture::FreeTextures(bool bOldOnly, int nNeedSpace)
-{
-    bool bFreed = false;
-    if (bOldOnly)
-    {
-        SDynTexture* pTX = SDynTexture::s_Root.m_Prev;
-        int nFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID - 400;
-        while (nNeedSpace + s_nMemoryOccupied > (int)SDynTexture::s_CurDynTexMaxSize * 1024 * 1024)
-        {
-            if (pTX == &SDynTexture::s_Root)
-            {
-                break;
-            }
-            SDynTexture* pNext = pTX->m_Prev;
-            {
-                // We cannot unload locked texture or texture used in current frame
-                // Better to increase pool size temporarily
-                if (pTX->m_pTexture && !pTX->m_pTexture->IsActiveRenderTarget())
-                {
-                    if (pTX->m_pTexture->m_nAccessFrameID < nFrame && pTX->m_pTexture->m_nUpdateFrameID < nFrame && !pTX->m_bLocked)
-                    {
-                        pTX->ReleaseDynamicRT(true);
-                    }
-                }
-            }
-            pTX = pNext;
-        }
-        if (nNeedSpace + s_nMemoryOccupied < (int)SDynTexture::s_CurDynTexMaxSize * 1024 * 1024)
-        {
-            return true;
-        }
-    }
-    bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8B8A8 : &s_availableTexturePoolCube_R8G8B8A8, bOldOnly);
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePool2D_BC1 : &s_availableTexturePoolCube_BC1, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePool2D_R32F : &s_availableTexturePoolCube_R32F, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16F : &s_availableTexturePoolCube_R16G16F, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16B16A16F : &s_availableTexturePoolCube_R16G16B16A16F, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePool2D_R11G11B10F : &s_availableTexturePoolCube_R11G11B10F, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8S : &s_availableTexturePoolCube_R8G8S, bOldOnly);
-    }
-
-    //if (!bFreed && m_eTT==eTT_2D)
-    //bFreed = FreeAvailableDynamicRT(nNeedSpace, &m_availableTexturePool2D_ATIDF24);
-
-    //First pass - Free textures from the pools with the same texture types
-    //shadows pools
-    for (int nPool = SBP_D16; nPool < SBP_MAX; nPool++)
-    {
-        if (!bFreed && m_eTT == eTT_2D)
-        {
-            bFreed = FreeAvailableDynamicRT(nNeedSpace, &s_availableTexturePool2D_Shadows[nPool], bOldOnly);
-        }
-    }
-    for (int nPool = SBP_D16; nPool < SBP_MAX; nPool++)
-    {
-        if (!bFreed && m_eTT != eTT_2D)
-        {
-            bFreed = FreeAvailableDynamicRT(nNeedSpace, &s_availableTexturePoolCube_Shadows[nPool], bOldOnly);
-        }
-    }
-
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePoolCube_R8G8B8A8 : &s_availableTexturePool2D_R8G8B8A8, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePoolCube_BC1 : &s_availableTexturePool2D_BC1, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePoolCube_R32F : &s_availableTexturePool2D_R32F, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePoolCube_R16G16F : &s_availableTexturePool2D_R16G16F, bOldOnly);
-    }
-    if (!bFreed)
-    {
-        bFreed = FreeAvailableDynamicRT(nNeedSpace, m_eTT == eTT_2D ? &s_availableTexturePoolCube_R16G16B16A16F : &s_availableTexturePool2D_R16G16B16A16F, bOldOnly);
-    }
-    //if (!bFreed && m_eTT!=eTT_2D)
-    //  bFreed = FreeAvailableDynamicRT(nNeedSpace, &m_availableTexturePool2D_ATIDF24);
-
-
-    //Second pass - Free textures from the pools with the different texture types
-    //shadows pools
-    for (int nPool = SBP_D16; nPool < SBP_MAX; nPool++)
-    {
-        if (!bFreed && m_eTT != eTT_2D)
-        {
-            bFreed = FreeAvailableDynamicRT(nNeedSpace, &s_availableTexturePool2D_Shadows[nPool], bOldOnly);
-        }
-    }
-    for (int nPool = SBP_D16; nPool < SBP_MAX; nPool++)
-    {
-        if (!bFreed && m_eTT == eTT_2D)
-        {
-            bFreed = FreeAvailableDynamicRT(nNeedSpace, &s_availableTexturePoolCube_Shadows[nPool], bOldOnly);
-        }
-    }
-    return bFreed;
-}
-
-bool SDynTexture::Update(int nNewWidth, int nNewHeight)
-{
-    return gRenDev->m_pRT->RC_DynTexUpdate(this, nNewWidth, nNewHeight);
-}
-
-void SDynTexture::AdjustRealSize()
-{
-    m_nWidth = m_nReqWidth;
-    m_nHeight = m_nReqHeight;
-}
-
-void SDynTexture::GetImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight)
-{
-    nX = 0;
-    nY = 0;
-    nWidth = m_nWidth;
-    nHeight = m_nHeight;
-}
-
-void SDynTexture::Apply(int nTUnit, int nTS)
-{
-    if (!m_pTexture)
-    {
-        Update(m_nWidth, m_nHeight);
-    }
-    if (m_pTexture)
-    {
-        m_pTexture->Apply(nTUnit, nTS);
-    }
-    gRenDev->m_cEF.m_RTRect.x = 0;
-    gRenDev->m_cEF.m_RTRect.y = 0;
-    gRenDev->m_cEF.m_RTRect.z = 1;
-    gRenDev->m_cEF.m_RTRect.w = 1;
-}
-
-void SDynTexture::ShutDown()
-{
-    SDynTexture* pTX, * pTXNext;
-    for (pTX = SDynTexture::s_Root.m_Next; pTX != &SDynTexture::s_Root; pTX = pTXNext)
-    {
-        pTXNext = pTX->m_Next;
-        SAFE_RELEASE_FORCE(pTX);
-    }
-    SDynTexture Tex("Release");
-    Tex.m_eTT = eTT_2D;
-    Tex.FreeTextures(false, 1024 * 1024 * 1024);
-
-    Tex.m_eTT = eTT_Cube;
-    Tex.FreeTextures(false, 1024 * 1024 * 1024);
-}
-
-bool SDynTexture::FreeAvailableDynamicRT(int nNeedSpace, TextureSet* pSet, bool bOldOnly)
-{
-    assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-    int nSpace = s_nMemoryOccupied;
-    int nFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID - 400;
-    while (nNeedSpace + nSpace > (int)SDynTexture::s_CurDynTexMaxSize * 1024 * 1024)
-    {
-        TextureSetItor itor = pSet->begin();
-        while (itor != pSet->end())
-        {
-            TextureSubset* pSubset = itor->second;
-            TextureSubsetItor itorss = pSubset->begin();
-            while (itorss != pSubset->end())
-            {
-                CTexture* pTex = itorss->second;
-                PREFAST_ASSUME(pTex);
-                if (!bOldOnly || (pTex->m_nAccessFrameID < nFrame && pTex->m_nUpdateFrameID < nFrame))
-                {
-                    itorss->second = NULL;
-                    pSubset->erase(itorss);
-                    itorss = pSubset->begin();
-                    nSpace -= pTex->GetDataSize();
-                    s_iNumTextureBytesCheckedIn -= pTex->GetDataSize();
-                    SAFE_RELEASE(pTex);
-                    if (nNeedSpace + nSpace < (int)SDynTexture::s_CurDynTexMaxSize * 1024 * 1024)
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    itorss++;
-                }
-            }
-            if (pSubset->size() == 0)
-            {
-                delete pSubset;
-                pSet->erase(itor);
-                itor = pSet->begin();
-            }
-            else
-            {
-                itor++;
-            }
-            if (nNeedSpace + nSpace < (int)SDynTexture::s_CurDynTexMaxSize * 1024 * 1024)
-            {
-                break;
-            }
-        }
-        if (itor == pSet->end())
-        {
-            break;
-        }
-    }
-    s_nMemoryOccupied = nSpace;
-
-    assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-    if (nNeedSpace + nSpace > (int)SDynTexture::s_CurDynTexMaxSize * 1024 * 1024)
-    {
-        return false;
-    }
-    return true;
-}
-
-void SDynTexture::ReleaseDynamicRT(bool bForce)
-{
-    if (!m_pTexture)
-    {
-        return;
-    }
-    m_nUpdateMask = 0;
-
-    // first see if the texture is in the checked out pool.
-    TextureSubset* pSubset;
-    if (m_eTF == eTF_R8G8B8A8)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8B8A8 : &s_checkedOutTexturePoolCube_R8G8B8A8;
-    }
-    else
-    if (m_eTF == eTF_BC1)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_BC1 : &s_checkedOutTexturePoolCube_BC1;
-    }
-    else
-    if (m_eTF == eTF_R32F)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R32F : &s_checkedOutTexturePoolCube_R32F;
-    }
-    else
-    if (m_eTF == eTF_R16F)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16F : &s_checkedOutTexturePoolCube_R16F;
-    }
-    else
-    if (m_eTF == eTF_R16G16F)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16G16F : &s_checkedOutTexturePoolCube_R16G16F;
-    }
-    else
-    if (m_eTF == eTF_R8G8B8A8S)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8B8A8S : &s_checkedOutTexturePoolCube_R8G8B8A8S;
-    }
-    else
-    if (m_eTF == eTF_R16G16B16A16F)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16G16B16A16F : &s_checkedOutTexturePoolCube_R16G16B16A16F;
-    }
-    else
-#if defined(WIN32) || defined(APPLE) || defined(LINUX) || defined(SUPPORTS_DEFERRED_SHADING_L_BUFFERS_FORMAT)
-    if (m_eTF == eTF_R11G11B10F)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R11G11B10F : &s_checkedOutTexturePoolCube_R11G11B10F;
-    }
-    else
-#endif
-    if (m_eTF == eTF_R8G8S)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8S : &s_checkedOutTexturePoolCube_R8G8S;
-    }
-    else
-    if (m_eTF == eTF_R10G10B10A2)
-    {
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R10G10B10A2 : &s_checkedOutTexturePoolCube_R10G10B10A2;
-    }
-    else
-    if (ConvertTexFormatToShadowsPool(m_eTF) != SBP_UNKNOWN)
-    {
-        if (m_eTT == eTT_2D)
-        {
-            pSubset = &s_checkedOutTexturePool2D_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else if (m_eTT == eTT_Cube)
-        {
-            pSubset = &s_checkedOutTexturePoolCube_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else
-        {
-            pSubset = NULL;
-            assert(0);
-        }
-    }
-    else
-    {
-        pSubset = NULL;
-        assert(0);
-    }
-
-    PREFAST_ASSUME(pSubset);
-
-    TextureSubsetItor coTexture = pSubset->find(m_pTexture->GetID());
-    if (coTexture != pSubset->end())
-    { // if it is there, remove it.
-        pSubset->erase(coTexture);
-        s_iNumTextureBytesCheckedOut -= m_pTexture->GetDataSize();
-    }
-
-    // Don't cache too many unused textures.
-    if (bForce)
-    {
-        s_nMemoryOccupied -= m_pTexture->GetDataSize();
-        assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-#ifndef NDEBUG
-        int refCount =
-#endif
-            m_pTexture->Release();
-        assert(refCount <= 0);
-        m_pTexture = NULL;
-        Unlink();
-        return;
-    }
-
-    TextureSet* pSet;
-    if (m_eTF == eTF_R8G8B8A8)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8B8A8 : &s_availableTexturePoolCube_R8G8B8A8;
-    }
-    else
-    if (m_eTF == eTF_BC1)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_BC1 : &s_availableTexturePoolCube_BC1;
-    }
-    else
-    if (m_eTF == eTF_R32F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R32F : &s_availableTexturePoolCube_R32F;
-    }
-    else
-    if (m_eTF == eTF_R16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16F : &s_availableTexturePoolCube_R16F;
-    }
-    else
-    if (m_eTF == eTF_R16G16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16F : &s_availableTexturePoolCube_R16G16F;
-    }
-    else
-    if (m_eTF == eTF_R8G8B8A8S)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8B8A8S : &s_availableTexturePoolCube_R8G8B8A8S;
-    }
-    else
-    if (m_eTF == eTF_R16G16B16A16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16B16A16F : &s_availableTexturePoolCube_R16G16B16A16F;
-    }
-    else
-    if (m_eTF == eTF_R11G11B10F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R11G11B10F : &s_availableTexturePoolCube_R11G11B10F;
-    }
-    else
-    if (m_eTF == eTF_R8G8S)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8S : &s_availableTexturePoolCube_R8G8S;
-    }
-    else
-    if (m_eTF == eTF_R10G10B10A2)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R10G10B10A2 : &s_availableTexturePoolCube_R10G10B10A2;
-    }
-    else
-    if (ConvertTexFormatToShadowsPool(m_eTF) != SBP_UNKNOWN)
-    {
-        if (m_eTT == eTT_2D)
-        {
-            pSet = &s_availableTexturePool2D_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else if (m_eTT == eTT_Cube)
-        {
-            pSet = &s_availableTexturePoolCube_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else
-        {
-            pSet = NULL;
-            assert(0);
-        }
-    }
-    else
-    {
-        pSet = NULL;
-        assert(0);
-    }
-
-    PREFAST_ASSUME(pSet);
-
-    TextureSetItor subset = pSet->find(m_nWidth);
-    if (subset != pSet->end())
-    {
-        subset->second->insert(TextureSubset::value_type(m_nHeight, m_pTexture));
-        s_iNumTextureBytesCheckedIn += m_pTexture->GetDataSize();
-    }
-    else
-    {
-        pSubset = new TextureSubset;
-        pSet->insert(TextureSet::value_type(m_nWidth, pSubset));
-        pSubset->insert(TextureSubset::value_type(m_nHeight, m_pTexture));
-        s_iNumTextureBytesCheckedIn += m_pTexture->GetDataSize();
-    }
-    m_pTexture = NULL;
-    Unlink();
-}
-
-CTexture* SDynTexture::GetDynamicRT()
-{
-    TextureSet* pSet;
-    TextureSubset* pSubset;
-
-    assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-    if (m_eTF == eTF_R8G8B8A8)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8B8A8 : &s_availableTexturePoolCube_R8G8B8A8;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8B8A8 : &s_checkedOutTexturePoolCube_R8G8B8A8;
-    }
-    else
-    if (m_eTF == eTF_BC1)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_BC1 : &s_availableTexturePoolCube_BC1;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_BC1 : &s_checkedOutTexturePoolCube_BC1;
-    }
-    else
-    if (m_eTF == eTF_R32F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R32F : &s_availableTexturePoolCube_R32F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R32F : &s_checkedOutTexturePoolCube_R32F;
-    }
-    else
-    if (m_eTF == eTF_R16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16F : &s_availableTexturePoolCube_R16F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16F : &s_checkedOutTexturePoolCube_R16F;
-    }
-    else
-    if (m_eTF == eTF_R16G16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16F : &s_availableTexturePoolCube_R16G16F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16G16F : &s_checkedOutTexturePoolCube_R16G16F;
-    }
-    else
-    if (m_eTF == eTF_R8G8B8A8S)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8B8A8S : &s_availableTexturePoolCube_R8G8B8A8S;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8B8A8S : &s_checkedOutTexturePoolCube_R8G8B8A8S;
-    }
-    else
-    if (m_eTF == eTF_R16G16B16A16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16B16A16F : &s_availableTexturePoolCube_R16G16B16A16F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16G16B16A16F : &s_checkedOutTexturePoolCube_R16G16B16A16F;
-    }
-    else
-    if (m_eTF == eTF_R11G11B10F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R11G11B10F : &s_availableTexturePoolCube_R11G11B10F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R11G11B10F : &s_checkedOutTexturePoolCube_R11G11B10F;
-    }
-    else
-    if (m_eTF == eTF_R8G8S)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8S : &s_availableTexturePoolCube_R8G8S;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8S : &s_checkedOutTexturePoolCube_R8G8S;
-    }
-    else
-    if (m_eTF == eTF_R10G10B10A2)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R10G10B10A2 : &s_availableTexturePoolCube_R10G10B10A2;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R10G10B10A2 : &s_checkedOutTexturePoolCube_R10G10B10A2;
-    }
-    else
-    if (ConvertTexFormatToShadowsPool(m_eTF) != SBP_UNKNOWN)
-    {
-        if (m_eTT == eTT_2D)
-        {
-            pSet = &s_availableTexturePool2D_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-            pSubset = &s_checkedOutTexturePool2D_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else if (m_eTT == eTT_Cube)
-        {
-            pSet = &s_availableTexturePoolCube_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-            pSubset = &s_checkedOutTexturePoolCube_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else
-        {
-            pSet = NULL;
-            pSubset = NULL;
-            assert(0);
-        }
-    }
-    else
-    {
-        pSet = NULL;
-        pSubset = NULL;
-        assert(0);
-    }
-
-    PREFAST_ASSUME(pSet);
-
-    TextureSetItor subset = pSet->find(m_nWidth);
-    if (subset != pSet->end())
-    {
-        TextureSubsetItor texture = subset->second->find(m_nHeight);
-        if (texture != subset->second->end())
-        { //  found one!
-          // extract the texture
-            CTexture* pTexture = texture->second;
-            texture->second = NULL;
-            // first remove it from this set.
-            subset->second->erase(texture);
-            // now add it to the checked out texture set.
-            pSubset->insert(TextureSubset::value_type(pTexture->GetID(), pTexture));
-            s_iNumTextureBytesCheckedOut += pTexture->GetDataSize();
-            s_iNumTextureBytesCheckedIn -= pTexture->GetDataSize();
-
-            assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-            return pTexture;
-        }
-    }
-    return NULL;
-}
-
-CTexture* SDynTexture::CreateDynamicRT()
-{
-    //assert(m_eTF == eTF_A8R8G8B8 && m_eTT == eTT_2D);
-
-    assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-    char name[256];
-    CTexture* pTexture = GetDynamicRT();
-    if (pTexture)
-    {
-        return pTexture;
-    }
-
-    TextureSet* pSet;
-    TextureSubset* pSubset;
-    if (m_eTF == eTF_R8G8B8A8)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8B8A8 : &s_availableTexturePoolCube_R8G8B8A8;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8B8A8 : &s_checkedOutTexturePoolCube_R8G8B8A8;
-    }
-    else
-    if (m_eTF == eTF_BC1)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_BC1 : &s_availableTexturePoolCube_BC1;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_BC1 : &s_checkedOutTexturePoolCube_BC1;
-    }
-    else
-    if (m_eTF == eTF_R32F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R32F : &s_availableTexturePoolCube_R32F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R32F : &s_checkedOutTexturePoolCube_R32F;
-    }
-    else
-    if (m_eTF == eTF_R16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16F : &s_availableTexturePoolCube_R16F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16F : &s_checkedOutTexturePoolCube_R16F;
-    }
-    else
-    if (m_eTF == eTF_R16G16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16F : &s_availableTexturePoolCube_R16G16F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16G16F : &s_checkedOutTexturePoolCube_R16G16F;
-    }
-    else
-    if (m_eTF == eTF_R8G8B8A8S)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8B8A8S : &s_availableTexturePoolCube_R8G8B8A8S;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8B8A8S : &s_checkedOutTexturePoolCube_R8G8B8A8S;
-    }
-    else
-    if (m_eTF == eTF_R16G16B16A16F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R16G16B16A16F : &s_availableTexturePoolCube_R16G16B16A16F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R16G16B16A16F : &s_checkedOutTexturePoolCube_R16G16B16A16F;
-    }
-    else
-    if (m_eTF == eTF_R11G11B10F)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R11G11B10F : &s_availableTexturePoolCube_R11G11B10F;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R11G11B10F : &s_checkedOutTexturePoolCube_R11G11B10F;
-    }
-    else
-    if (m_eTF == eTF_R8G8S)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R8G8S : &s_availableTexturePoolCube_R8G8S;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R8G8S : &s_checkedOutTexturePoolCube_R8G8S;
-    }
-    else
-    if (m_eTF == eTF_R10G10B10A2)
-    {
-        pSet = m_eTT == eTT_2D ? &s_availableTexturePool2D_R10G10B10A2 : &s_availableTexturePoolCube_R10G10B10A2;
-        pSubset = m_eTT == eTT_2D ? &s_checkedOutTexturePool2D_R10G10B10A2 : &s_checkedOutTexturePoolCube_R10G10B10A2;
-    }
-    else
-    if (ConvertTexFormatToShadowsPool(m_eTF) != SBP_UNKNOWN)
-    {
-        if (m_eTT == eTT_2D)
-        {
-            pSet = &s_availableTexturePool2D_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-            pSubset = &s_checkedOutTexturePool2D_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else if (m_eTT == eTT_Cube)
-        {
-            pSet = &s_availableTexturePoolCube_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-            pSubset = &s_checkedOutTexturePoolCube_Shadows[ConvertTexFormatToShadowsPool(m_eTF)];
-        }
-        else
-        {
-            pSet = NULL;
-            pSubset = NULL;
-            assert(0);
-        }
-    }
-    else
-    {
-        pSet = NULL;
-        pSubset = NULL;
-        assert(0);
-    }
-
-    if (m_eTT == eTT_2D)
-    {
-        sprintf_s(name, "$Dyn_%s_2D_%s_%d", m_sSource, CTexture::NameForTextureFormat(m_eTF), gRenDev->m_TexGenID++);
-    }
-    else
-    {
-        sprintf_s(name, "$Dyn_%s_Cube_%s_%d", m_sSource, CTexture::NameForTextureFormat(m_eTF), gRenDev->m_TexGenID++);
-    }
-
-    PREFAST_ASSUME(pSet);
-
-    TextureSetItor subset = pSet->find(m_nWidth);
-    if (subset != pSet->end())
-    {
-        CTexture* pNewTexture = CTexture::CreateRenderTarget(name, m_nWidth, m_nHeight, Clr_Unknown, m_eTT, m_nTexFlags, m_eTF);
-        pSubset->insert(TextureSubset::value_type(pNewTexture->GetID(), pNewTexture));
-        s_nMemoryOccupied += pNewTexture->GetDataSize();
-        s_iNumTextureBytesCheckedOut += pNewTexture->GetDataSize();
-
-        assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-        return pNewTexture;
-    }
-    else
-    {
-        TextureSubset* pSSet = new TextureSubset;
-        pSet->insert(TextureSet::value_type(m_nWidth, pSSet));
-        CTexture* pNewTexture = CTexture::CreateRenderTarget(name, m_nWidth, m_nHeight, Clr_Unknown, m_eTT, m_nTexFlags, m_eTF);
-#ifndef CRY_USE_METAL
-        pNewTexture->Clear(ColorF(0.0f, 0.0f, 0.0f, 1.0f));
-#endif
-        pSubset->insert(TextureSubset::value_type(pNewTexture->GetID(), pNewTexture));
-        s_nMemoryOccupied += pNewTexture->GetDataSize();
-        s_iNumTextureBytesCheckedOut += pNewTexture->GetDataSize();
-
-        assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-        return pNewTexture;
-    }
-}
-
-void SDynTexture::ResetUpdateMask()
-{
-    m_nUpdateMask = 0;
-    if (gRenDev)
-    {
-        m_nFrameReset = gRenDev->m_nFrameReset;
-    }
-}
-
-void SDynTexture::SetUpdateMask()
-{
-    int nFrame = gRenDev->RT_GetCurrGpuID();
-    m_nUpdateMask |= 1 << nFrame;
-}
-
-void SDynTexture::ReleaseForce()
-{
-    ReleaseDynamicRT(true);
-    delete this;
-}
-
-bool SDynTexture::IsValid()
-{
-    if (!m_pTexture)
-    {
-        return false;
-    }
-    if (m_nFrameReset != gRenDev->m_nFrameReset)
-    {
-        m_nFrameReset = gRenDev->m_nFrameReset;
-        m_nUpdateMask = 0;
-        return false;
-    }
-    if (gRenDev->GetActiveGPUCount() > 1)
-    {
-        if ((gRenDev->GetFeatures() & RFT_HW_MASK) == RFT_HW_ATI)
-        {
-            uint32 nX, nY, nW, nH;
-            GetImageRect(nX, nY, nW, nH);
-            if (nW < 1024 && nH < 1024)
-            {
-                return true;
-            }
-        }
-
-        int nFrame = gRenDev->RT_GetCurrGpuID();
-        if (!((1 << nFrame) & m_nUpdateMask))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-void SDynTexture::Tick()
-{
-    if (s_SuggestedDynTexMaxSize != CRenderer::CV_r_dyntexmaxsize ||
-        s_SuggestedDynTexAtlasCloudsMaxsize != CRenderer::CV_r_dyntexatlascloudsmaxsize ||
-        s_SuggestedTexAtlasSize != CRenderer::CV_r_texatlassize)
-    {
-        Init();
-    }
-}
-
-void SDynTexture::Init()
-{
-    s_SuggestedDynTexAtlasCloudsMaxsize = CRenderer::CV_r_dyntexatlascloudsmaxsize;
-    s_SuggestedTexAtlasSize = CRenderer::CV_r_texatlassize;
-    s_SuggestedDynTexMaxSize = CRenderer::CV_r_dyntexmaxsize;
-
-    s_CurDynTexAtlasCloudsMaxsize = s_SuggestedDynTexAtlasCloudsMaxsize;
-    s_CurTexAtlasSize = s_SuggestedTexAtlasSize;
-    s_CurDynTexMaxSize = s_SuggestedDynTexMaxSize;
-}
-
-EShadowBuffers_Pool SDynTexture::ConvertTexFormatToShadowsPool(ETEX_Format e)
-{
-    switch (e)
-    {
-    case (eTF_D16):
-        return SBP_D16;
-    case (eTF_D24S8):
-        return SBP_D24S8;
-    case (eTF_D32F):
-    case (eTF_D32FS8):
-        return SBP_D32FS8;
-    case (eTF_R16G16):
-        return SBP_R16G16;
-
-    default:
-        break;
-    }
-    //assert( false );
-    return SBP_UNKNOWN;
-}
-
-
-int SDynTexture2::GetTextureID()
-{
-    return m_pTexture ? m_pTexture->GetTextureID() : 0;
-}
-
-void SDynTexture2::GetImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight)
-{
-    nX = 0;
-    nY = 0;
-    if (m_pTexture)
-    {
-        if (m_pTexture->GetWidth() != SDynTexture::s_CurTexAtlasSize || m_pTexture->GetHeight() != SDynTexture::s_CurTexAtlasSize)
-        {
-            UpdateAtlasSize(SDynTexture::s_CurTexAtlasSize, SDynTexture::s_CurTexAtlasSize);
-        }
-        assert (m_pTexture->GetWidth() == SDynTexture::s_CurTexAtlasSize || m_pTexture->GetHeight() == SDynTexture::s_CurTexAtlasSize);
-    }
-    nWidth  = SDynTexture::s_CurTexAtlasSize;
-    nHeight = SDynTexture::s_CurTexAtlasSize;
-}
-
-//====================================================================================
-
-SDynTexture_Shadow SDynTexture_Shadow::s_RootShadow("RootShadow");
-
-SDynTexture_Shadow::SDynTexture_Shadow(const char* szSource)
-    : SDynTexture(szSource)
-{
-    m_nUniqueID = 0;
-    m_NextShadow = NULL;
-    m_PrevShadow = NULL;
-    if (!s_RootShadow.m_NextShadow)
-    {
-        s_RootShadow.m_NextShadow = &s_RootShadow;
-        s_RootShadow.m_PrevShadow = &s_RootShadow;
-    }
-    if (this != &s_RootShadow)
-    {
-        LinkShadow(&s_RootShadow);
-    }
-}
-
-SDynTexture_Shadow::SDynTexture_Shadow(int nWidth, int nHeight, ETEX_Format eTF, ETEX_Type eTT, int nTexFlags, const char* szSource)
-    : SDynTexture(nWidth, nHeight, eTF, eTT, nTexFlags, szSource)
-{
-    m_nWidth = nWidth;
-    m_nHeight = nHeight;
-
-    if (gRenDev)
-    {
-        m_nUniqueID = gRenDev->m_TexGenID++;
-    }
-    else
-    {
-        m_nUniqueID = 0;
-    }
-
-    m_NextShadow = NULL;
-    m_PrevShadow = NULL;
-    if (!s_RootShadow.m_NextShadow)
-    {
-        s_RootShadow.m_NextShadow = &s_RootShadow;
-        s_RootShadow.m_PrevShadow = &s_RootShadow;
-    }
-    if (this != &s_RootShadow)
-    {
-        LinkShadow(&s_RootShadow);
-    }
-}
-
-void SDynTexture_Shadow::AdjustRealSize()
-{
-    if (m_eTT == eTT_2D)
-    {
-        if (m_nWidth < 256)
-        {
-            m_nWidth = 256;
-        }
-        else
-        if (m_nWidth > 2048)
-        {
-            m_nWidth = 2048;
-        }
-        m_nHeight = m_nWidth;
-    }
-    if (m_eTT == eTT_Cube)
-    {
-        if (m_nWidth < 256)
-        {
-            m_nWidth = 256;
-        }
-        else
-        if (m_nWidth > 512)
-        {
-            m_nWidth = 512;
-        }
-        m_nHeight = m_nWidth;
-    }
-}
-
-SDynTexture_Shadow::~SDynTexture_Shadow()
-{
-    UnlinkShadow();
-}
-
-void SDynTexture_Shadow::RT_EntityDelete(IRenderNode* pRenderNode)
-{
-    // remove references to the entity
-    SDynTexture_Shadow* pTX, * pNext;
-    for (pTX = SDynTexture_Shadow::s_RootShadow.m_NextShadow; pTX != &SDynTexture_Shadow::s_RootShadow; pTX = pNext)
-    {
-        pNext = pTX->m_NextShadow;
-        if (pTX->pLightOwner == pRenderNode)
-        {
-            delete pTX;
-        }
-    }
-}
-
-void SDynTexture_Shadow::ShutDown()
-{
-    SDynTexture_Shadow* pTX, * pNext;
-    for (pTX = SDynTexture_Shadow::s_RootShadow.m_NextShadow; pTX != &SDynTexture_Shadow::s_RootShadow; pTX = pNext)
-    {
-        pNext = pTX->m_NextShadow;
-        delete pTX;
-    }
-}
-
-SDynTexture_Shadow* SDynTexture_Shadow::GetForFrustum(ShadowMapFrustum* pFrustum)
-{
-    SDynTexture_Shadow* pDynTX = NULL;
-
-    for (SDynTexture_Shadow* pTX = SDynTexture_Shadow::s_RootShadow.m_NextShadow; pTX != &SDynTexture_Shadow::s_RootShadow; pTX = pTX->m_NextShadow)
-    {
-        if (pTX->m_pFrustumOwner == pFrustum->pFrustumOwner)
-        {
-            pDynTX = pTX;
-            break;
-        }
-    }
-
-    if (pDynTX)
-    {
-        if (pDynTX->m_eTF != pFrustum->m_eReqTF || pDynTX->m_eTT != pFrustum->m_eReqTT || pDynTX->pLightOwner != pFrustum->pLightOwner ||
-            pDynTX->m_nReqWidth != pFrustum->nTextureWidth ||  pDynTX->m_nReqHeight != pFrustum->nTextureHeight)
-        {
-            SAFE_DELETE(pDynTX);
-
-            //force all cubemap faces update
-            pFrustum->RequestUpdate();
-        }
-    }
-
-    //check after freeing texture
-    if (!pDynTX)
-    {
-        uint32_t flags = FT_USAGE_DEPTHSTENCIL | FT_STATE_CLAMP | FT_DONT_STREAM | FT_USE_HTILE;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION SDYNTEXTURE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DynTexture_cpp)
-#endif
-        pDynTX = new SDynTexture_Shadow(pFrustum->nTextureWidth, pFrustum->nTextureHeight, pFrustum->m_eReqTF, pFrustum->m_eReqTT, flags, "ShadowRT");
-        CRY_ASSERT(pFrustum->nTextureWidth == pDynTX->m_nWidth && pFrustum->nTextureHeight == pDynTX->m_nHeight);
-    }
-
-    pDynTX->RT_Update(pFrustum->nTextureWidth, pFrustum->nTextureHeight);
-    pDynTX->pLightOwner = pFrustum->pLightOwner;
-    pDynTX->m_pFrustumOwner = pFrustum->pFrustumOwner;
-
-    return pDynTX;
-}
-//====================================================================================
-
-AZStd::unique_ptr<SDynTexture2::TextureSet2> SDynTexture2::s_TexturePool[eTP_Max];
-
-SDynTexture2::SDynTexture2(const char* szSource, ETexPool eTexPool)
-{
-    m_nWidth = 0;
-    m_nHeight = 0;
-
-    m_pOwner = NULL;
-
-#ifndef _DEBUG
-    m_sSource = (char*)szSource;
-#else
-    azstrcpy(m_sSource, strlen(szSource) + 1, szSource);
-#endif
-    m_bLocked = false;
-
-    m_eTexPool = eTexPool;
-
-    m_nBlockID = ~0;
-    m_pAllocator = NULL;
-    m_Next = NULL;
-    m_PrevLink = NULL;
-    m_nUpdateMask = 0;
-    if (gRenDev)
-    {
-        m_nFrameReset = gRenDev->m_nFrameReset;
-    }
-    SetUpdateMask();
-
-    m_nFlags = 0;
-}
-
-void SDynTexture2::SetUpdateMask()
-{
-    if (gRenDev)
-    {
-        int nFrame = gRenDev->RT_GetCurrGpuID();
-        m_nUpdateMask |= 1 << nFrame;
-    }
-}
-
-void SDynTexture2::ResetUpdateMask()
-{
-    m_nUpdateMask = 0;
-    if (gRenDev)
-    {
-        m_nFrameReset = gRenDev->m_nFrameReset;
-    }
-}
-
-SDynTexture2::SDynTexture2(uint32 nWidth, uint32 nHeight, [[maybe_unused]] uint32 nTexFlags, const char* szSource, ETexPool eTexPool)
-{
-    m_nWidth = nWidth;
-    m_nHeight = nHeight;
-
-    m_eTexPool = eTexPool;
-
-    ETEX_Format eTF = GetPoolTexFormat(eTexPool);
-
-    TextureSet2Itor tset = s_TexturePool[eTexPool]->find(eTF);
-    if (tset == s_TexturePool[eTexPool]->end())
-    {
-        m_pOwner = new STextureSetFormat(eTF, eTexPool, FT_NOMIPS | FT_USAGE_ATLAS);
-        s_TexturePool[eTexPool]->insert(TextureSet2::value_type(eTF, m_pOwner));
-    }
-    else
-    {
-        m_pOwner = tset->second;
-    }
-
-    m_Next = NULL;
-    m_PrevLink = NULL;
-    m_bLocked = false;
-
-#ifndef _DEBUG
-    m_sSource = (char*)szSource;
-#else
-    azstrcpy(m_sSource, strlen(szSource) + 1, szSource);
-#endif
-
-    m_pTexture = NULL;
-    m_nBlockID = ~0;
-    m_pAllocator = NULL;
-    m_nUpdateMask = 0;
-    if (gRenDev)
-    {
-        m_nFrameReset = gRenDev->m_nFrameReset;
-    }
-    SetUpdateMask();
-    m_nFlags = 0;
-}
-
-SDynTexture2::~SDynTexture2()
-{
-    Remove();
-    m_bLocked = false;
-}
-
-int SDynTexture2::GetPoolMaxSize(ETexPool eTexPool)
-{
-    if (eTexPool == eTP_Clouds)
-    {
-        return SDynTexture::s_SuggestedDynTexAtlasCloudsMaxsize;
-    }
-    assert(0);
-    return 0;
-}
-void SDynTexture2::SetPoolMaxSize(ETexPool eTexPool, int nSize, bool bWarn)
-{
-    if (eTexPool == eTP_Clouds)
-    {
-        if (bWarn)
-        {
-            Warning("Increasing maximum Clouds atlas pool to %d Mb", nSize);
-        }
-        SDynTexture::s_SuggestedDynTexAtlasCloudsMaxsize = nSize;
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-const char* SDynTexture2::GetPoolName(ETexPool eTexPool)
-{
-    if (eTexPool == eTP_Clouds)
-    {
-        return "Clouds";
-    }
-
-    assert(0);
-    return 0;
-}
-
-ETEX_Format SDynTexture2::GetPoolTexFormat(ETexPool eTexPool)
-{
-    if (eTexPool == eTP_Clouds)
-    {
-        return eTF_R8G8B8A8;
-    }
-
-    assert(0);
-    return eTF_R8G8B8A8;
-}
-
-void SDynTexture2::Init(ETexPool eTexPool)
-{
-    if (!s_TexturePool[eTexPool])
-    {
-        s_TexturePool[eTexPool] = AZStd::make_unique<TextureSet2>();
-    }
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_texpreallocateatlases)
-    {
-        int nSize = CRenderer::CV_r_texatlassize;
-        TArray<SDynTexture2*> Texs;
-        int nMaxSize = GetPoolMaxSize(eTexPool);
-        const char* szName = GetPoolName(eTexPool);
-        nMaxSize *= 1024 * 1024;
-        while (true)
-        {
-            ETEX_Format eTF = GetPoolTexFormat(eTexPool);
-            int nNeedSpace = CTexture::TextureDataSize(nSize, nSize, 1, 1, 1, eTF);
-            if (nNeedSpace + s_nMemoryOccupied[eTexPool] > nMaxSize)
-            {
-                break;
-            }
-            SDynTexture2* pTex = new SDynTexture2(nSize, nSize,  FT_STATE_CLAMP | FT_NOMIPS, szName, eTexPool);
-            pTex->Update(nSize, nSize);
-            Texs.AddElem(pTex);
-        }
-        for (uint32 i = 0; i < Texs.Num(); i++)
-        {
-            SDynTexture2* pTex = Texs[i];
-            SAFE_DELETE(pTex);
-        }
-    }
-}
-
-bool SDynTexture2::UpdateAtlasSize(int nNewWidth, int nNewHeight)
-{
-    if (!m_pOwner)
-    {
-        return false;
-    }
-    if (!m_pTexture)
-    {
-        return false;
-    }
-    if (!m_pAllocator)
-    {
-        return false;
-    }
-    if (m_pTexture->GetWidth() != nNewWidth || m_pTexture->GetHeight() != nNewHeight)
-    {
-        SDynTexture2* pDT, * pNext;
-        for (pDT = m_pOwner->m_pRoot; pDT; pDT = pNext)
-        {
-            pNext = pDT->m_Next;
-            if (pDT == this)
-            {
-                continue;
-            }
-            assert(!pDT->m_bLocked);
-            pDT->Remove();
-            pDT->SetUpdateMask();
-        }
-        int nBlockW = (m_nWidth + TEX_POOL_BLOCKSIZE - 1) / TEX_POOL_BLOCKSIZE;
-        int nBlockH = (m_nHeight + TEX_POOL_BLOCKSIZE - 1) / TEX_POOL_BLOCKSIZE;
-        m_pAllocator->RemoveBlock(m_nBlockID);
-        assert (m_pAllocator && m_pAllocator->GetNumUsedBlocks() == 0);
-
-        int nW = (nNewWidth + TEX_POOL_BLOCKSIZE - 1) / TEX_POOL_BLOCKSIZE;
-        int nH = (nNewHeight + TEX_POOL_BLOCKSIZE - 1) / TEX_POOL_BLOCKSIZE;
-        m_pAllocator->UpdateSize(nW, nH);
-        m_nBlockID = m_pAllocator->AddBlock(nBlockW, nBlockH);
-        s_nMemoryOccupied[m_eTexPool] -= CTexture::TextureDataSize(m_pTexture->GetWidth(), m_pTexture->GetHeight(), 1, 1, 1, m_pOwner->m_eTF);
-        SAFE_RELEASE(m_pTexture);
-
-        char name[256];
-        sprintf_s(name, "$Dyn_2D_%s_%s_%d", CTexture::NameForTextureFormat(m_pOwner->m_eTF), GetPoolName(m_eTexPool), gRenDev->m_TexGenID++);
-        m_pAllocator->m_pTexture = CTexture::CreateRenderTarget(name, nNewWidth, nNewHeight, Clr_Transparent, m_pOwner->m_eTT, m_pOwner->m_nTexFlags, m_pOwner->m_eTF);
-        s_nMemoryOccupied[m_eTexPool] += CTexture::TextureDataSize(nNewWidth, nNewHeight, 1, 1, 1, m_pOwner->m_eTF);
-        m_pTexture = m_pAllocator->m_pTexture;
-    }
-    return true;
-}
-
-bool SDynTexture2::Update(int nNewWidth, int nNewHeight)
-{
-    int i;
-    if (!m_pOwner)
-    {
-        return false;
-    }
-    bool bRecreate = false;
-    if (!m_pAllocator)
-    {
-        bRecreate = true;
-    }
-    int nStage = -1;
-    m_nAccessFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-    SDynTexture2* pDT = NULL;
-
-    if (m_nWidth != nNewWidth || m_nHeight != nNewHeight)
-    {
-        bRecreate = true;
-        m_nWidth = nNewWidth;
-        m_nHeight = nNewHeight;
-    }
-    uint32 nFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-    if (bRecreate)
-    {
-        int nSize = CRenderer::CV_r_texatlassize;
-        if (nSize <= 512)
-        {
-            nSize = 512;
-        }
-        else
-        if (nSize <= 1024)
-        {
-            nSize = 1024;
-        }
-        else
-        if (nSize > 2048)
-        {
-            nSize = 2048;
-        }
-        CRenderer::CV_r_texatlassize = nSize;
-        int nMaxSize = GetPoolMaxSize(m_eTexPool);
-        int nNeedSpace = CTexture::TextureDataSize(nSize, nSize, 1, 1, 1, m_pOwner->m_eTF);
-        if (nNeedSpace > nMaxSize * 1024 * 1024)
-        {
-            SetPoolMaxSize(m_eTexPool, nNeedSpace / (1024 * 1024), true);
-        }
-
-        int nBlockW = (nNewWidth + TEX_POOL_BLOCKSIZE - 1) / TEX_POOL_BLOCKSIZE;
-        int nBlockH = (nNewHeight + TEX_POOL_BLOCKSIZE - 1) / TEX_POOL_BLOCKSIZE;
-        Remove();
-        SetUpdateMask();
-
-        uint32 nID = ~0;
-        CPowerOf2BlockPacker* pPack = NULL;
-        for (i = 0; i < (int)m_pOwner->m_TexPools.size(); i++)
-        {
-            pPack = m_pOwner->m_TexPools[i];
-            nID = pPack->AddBlock(LogBaseTwo(nBlockW), LogBaseTwo(nBlockH));
-            if (nID != -1)
-            {
-                break;
-            }
-        }
-        if (i == m_pOwner->m_TexPools.size())
-        {
-            nStage = 1;
-            nMaxSize = GetPoolMaxSize(m_eTexPool);
-            if (nNeedSpace + s_nMemoryOccupied[m_eTexPool] > nMaxSize * 1024 * 1024)
-            {
-                SDynTexture2* pDTBest = NULL;
-                SDynTexture2* pDTBestLarge = NULL;
-                int nError = 1000000;
-                uint32 nFr = INT_MAX;
-                uint32 nFrLarge = INT_MAX;
-                int n = 0;
-                for (pDT = m_pOwner->m_pRoot; pDT; pDT = pDT->m_Next)
-                {
-                    if (pDT == this || pDT->m_bLocked)
-                    {
-                        continue;
-                    }
-                    n++;
-                    assert (pDT->m_pAllocator && pDT->m_pTexture && pDT->m_nBlockID != -1);
-                    if (pDT->m_nWidth == m_nWidth && pDT->m_nHeight == m_nHeight)
-                    {
-                        if (nFr > pDT->m_nAccessFrame)
-                        {
-                            nFr = pDT->m_nAccessFrame;
-                            pDTBest = pDT;
-                        }
-                    }
-                    else
-                    if (pDT->m_nWidth >= m_nWidth && pDT->m_nHeight >= m_nHeight)
-                    {
-                        int nEr = pDT->m_nWidth - m_nWidth + pDT->m_nHeight - m_nHeight;
-                        int fEr = nEr + (nFrame - pDT->m_nAccessFrame);
-
-                        if (fEr < nError)
-                        {
-                            nFrLarge = pDT->m_nAccessFrame;
-                            nError = fEr;
-                            pDTBestLarge = pDT;
-                        }
-                    }
-                }
-                pDT = NULL;
-                if (pDTBest && nFr + 1 < nFrame && pDTBest->m_nBlockID != -1)
-                {
-                    nStage = 2;
-                    pDT = pDTBest;
-                    nID = pDT->m_nBlockID;
-                    pPack = pDT->m_pAllocator;
-                    pDT->m_pAllocator = NULL;
-                    pDT->m_pTexture = NULL;
-                    pDT->m_nBlockID = ~0;
-                    pDT->m_nUpdateMask = 0;
-                    pDT->SetUpdateMask();
-                    pDT->Unlink();
-                }
-                else
-                if (pDTBestLarge && nFrLarge + 1 < nFrame)
-                {
-                    nStage = 3;
-                    pDT = pDTBestLarge;
-                    CPowerOf2BlockPacker* pAllocator = pDT->m_pAllocator;
-                    pDT->Remove();
-                    pDT->SetUpdateMask();
-                    nID = pAllocator->AddBlock(LogBaseTwo(nBlockW), LogBaseTwo(nBlockH));
-                    assert (nID != -1);
-                    if (nID != -1)
-                    {
-                        pPack = pAllocator;
-                    }
-                    else
-                    {
-                        pDT = NULL;
-                    }
-                }
-                if (!pDT)
-                {
-                    nStage = 4;
-                    // Try to find oldest texture pool
-                    float fTime = FLT_MAX;
-                    CPowerOf2BlockPacker* pPackBest = NULL;
-                    for (i = 0; i < (int)m_pOwner->m_TexPools.size(); i++)
-                    {
-                        CPowerOf2BlockPacker* pNextPack = m_pOwner->m_TexPools[i];
-                        if (fTime > pNextPack->m_fLastUsed)
-                        {
-                            fTime = pNextPack->m_fLastUsed;
-                            pPackBest = pNextPack;
-                        }
-                    }
-                    if (!pPackBest || fTime + 0.5f > gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime)
-                    {
-                        nStage = 5;
-                        // Try to find most fragmented texture pool with less number of blocks
-                        uint32 nUsedBlocks = TEX_POOL_BLOCKSIZE * TEX_POOL_BLOCKSIZE + 1;
-                        pPackBest = NULL;
-                        for (i = 0; i < (int)m_pOwner->m_TexPools.size(); i++)
-                        {
-                            CPowerOf2BlockPacker* pNextPack = m_pOwner->m_TexPools[i];
-                            int nBlocks = pNextPack->GetNumUsedBlocks();
-                            if (nBlocks < (int)nUsedBlocks)
-                            {
-                                nUsedBlocks = nBlocks;
-                                pPackBest = pNextPack;
-                            }
-                        }
-                    }
-                    if (pPackBest)
-                    {
-                        SDynTexture2* pNext = NULL;
-                        for (pDT = m_pOwner->m_pRoot; pDT; pDT = pNext)
-                        {
-                            pNext = pDT->m_Next;
-                            if (pDT == this || pDT->m_bLocked)
-                            {
-                                continue;
-                            }
-                            if (pDT->m_pAllocator == pPackBest)
-                            {
-                                pDT->Remove();
-                            }
-                        }
-                        assert (pPackBest->GetNumUsedBlocks() == 0);
-                        pPack = pPackBest;
-                        nID = pPack->AddBlock(LogBaseTwo(nBlockW), LogBaseTwo(nBlockH));
-                        pPack->m_fLastUsed = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime;
-                        if (nID != -1)
-                        {
-                            pDT = this;
-                            pDT->m_nUpdateMask = 0;
-                        }
-                        else
-                        {
-                            assert(0);
-                            pDT = NULL;
-                        }
-                    }
-                    else
-                    {
-                        nStage = 6;
-                        assert(0); // there was no free spot in the texture pool - either the pools are too small or there are too many requests or reuse is not possible because some of them are not released when they could be
-                    }
-                }
-            }
-
-            if (!pDT)
-            {
-                nStage |= 0x100;
-                int n = (nSize + TEX_POOL_BLOCKSIZE - 1) / TEX_POOL_BLOCKSIZE;
-                pPack = new CPowerOf2BlockPacker(LogBaseTwo(n), LogBaseTwo(n));
-                m_pOwner->m_TexPools.push_back(pPack);
-                nID = pPack->AddBlock(LogBaseTwo(nBlockW), LogBaseTwo(nBlockH));
-                char name[256];
-                sprintf_s(name, "$Dyn_2D_%s_%s_%d", CTexture::NameForTextureFormat(m_pOwner->m_eTF), GetPoolName(m_eTexPool), gRenDev->m_TexGenID++);
-                pPack->m_pTexture = CTexture::CreateRenderTarget(name, nSize, nSize, Clr_Transparent, m_pOwner->m_eTT, m_pOwner->m_nTexFlags, m_pOwner->m_eTF);
-                s_nMemoryOccupied[m_eTexPool] += nNeedSpace;
-                if (nID == -1)
-                {
-                    assert(0);
-                    nID = (uint32) - 2;
-                }
-            }
-        }
-        assert(nID != -1 && nID != -2);
-        m_nBlockID = nID;
-        m_pAllocator = pPack;
-        if (pPack)
-        {
-            m_pTexture = pPack->m_pTexture;
-            uint32 nX1, nX2, nY1, nY2;
-            pPack->GetBlockInfo(nID, nX1, nY1, nX2, nY2);
-            m_nX = nX1 << TEX_POOL_BLOCKLOGSIZE;
-            m_nY = nY1 << TEX_POOL_BLOCKLOGSIZE;
-            m_nWidth  = (nX2 - nX1) << TEX_POOL_BLOCKLOGSIZE;
-            m_nHeight = (nY2 - nY1) << TEX_POOL_BLOCKLOGSIZE;
-            m_nUpdateMask = 0;
-            SetUpdateMask();
-        }
-    }
-    PREFAST_ASSUME(m_pAllocator);
-    m_pAllocator->m_fLastUsed = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime;
-    Unlink();
-    if (m_pTexture)
-    {
-        Link();
-        return true;
-    }
-    return false;
-}
-
-bool SDynTexture2::Remove()
-{
-    if (!m_pAllocator)
-    {
-        return false;
-    }
-    if (m_nBlockID != -1)
-    {
-        m_pAllocator->RemoveBlock(m_nBlockID);
-    }
-    m_nBlockID = ~0;
-    m_pTexture = NULL;
-    m_nUpdateMask = 0;
-    m_pAllocator = NULL;
-    Unlink();
-
-    return true;
-}
-
-void SDynTexture2::Apply(int nTUnit, int nTS)
-{
-    if (!m_pAllocator)
-    {
-        return;
-    }
-    m_pAllocator->m_fLastUsed = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime;
-
-    if (!m_pTexture)
-    {
-        Update(m_nWidth, m_nHeight);
-    }
-    if (m_pTexture)
-    {
-        m_pTexture->ApplyTexture(nTUnit, nTS);
-    }
-    gRenDev->m_cEF.m_RTRect.x = (float)m_nX / (float)m_pTexture->GetWidth();
-    gRenDev->m_cEF.m_RTRect.y = (float)m_nY / (float)m_pTexture->GetHeight();
-    gRenDev->m_cEF.m_RTRect.z = (float)m_nWidth / (float)m_pTexture->GetWidth();
-    gRenDev->m_cEF.m_RTRect.w = (float)m_nHeight / (float)m_pTexture->GetHeight();
-}
-
-bool SDynTexture2::IsValid()
-{
-    if (!m_pTexture)
-    {
-        return false;
-    }
-    CRenderer* rd = gRenDev;
-    m_nAccessFrame = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-    if (m_nFrameReset != rd->m_nFrameReset)
-    {
-        m_nFrameReset = rd->m_nFrameReset;
-        m_nUpdateMask = 0;
-        return false;
-    }
-    if (rd->GetActiveGPUCount() > 1)
-    {
-        if ((rd->GetFeatures() & RFT_HW_MASK) == RFT_HW_ATI)
-        {
-            uint32 nX, nY, nW, nH;
-            GetImageRect(nX, nY, nW, nH);
-            if (nW < 1024 && nH < 1024)
-            {
-                return true;
-            }
-        }
-
-        int nFrame = rd->RT_GetCurrGpuID();
-        if (!((1 << nFrame) & m_nUpdateMask))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-void SDynTexture2::ReleaseForce()
-{
-    delete this;
-}
-
-void SDynTexture2::ShutDown()
-{
-    uint32 i;
-    for (i = 0; i < eTP_Max; i++)
-    {
-        if (s_TexturePool[i])
-        {
-            for (TextureSet2Itor it = s_TexturePool[i]->begin(); it != s_TexturePool[i]->end(); it++)
-            {
-                STextureSetFormat* pF = it->second;
-                PREFAST_ASSUME(pF);
-                SDynTexture2* pDT, *pNext;
-                for (pDT = pF->m_pRoot; pDT; pDT = pNext)
-                {
-                    pNext = pDT->m_Next;
-                    SAFE_RELEASE_FORCE(pDT);
-                }
-                SAFE_DELETE(pF);
-            }
-            s_TexturePool[i]->clear();
-        }
-    }
-}
-
-STextureSetFormat::~STextureSetFormat()
-{
-    uint32 i;
-
-    for (i = 0; i < m_TexPools.size(); i++)
-    {
-        CPowerOf2BlockPacker* pP = m_TexPools[i];
-        PREFAST_ASSUME(pP);
-        if (pP->m_pTexture)
-        {
-            int nSize = CTexture::TextureDataSize(pP->m_pTexture->GetWidth(), pP->m_pTexture->GetHeight(), 1, 1, 1, pP->m_pTexture->GetTextureDstFormat());
-            SDynTexture2::s_nMemoryOccupied[m_eTexPool] = max(0, SDynTexture2::s_nMemoryOccupied[m_eTexPool] - nSize);
-        }
-
-        SAFE_DELETE(pP);
-    }
-    m_TexPools.clear();
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/ITextureStreamer.cpp b/Code/CryEngine/RenderDll/Common/Textures/ITextureStreamer.cpp
deleted file mode 100644
index 8f30b838df..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/ITextureStreamer.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ITextureStreamer.h"
-#include "Texture.h"
-
-ITextureStreamer::ITextureStreamer()
-{
-    m_pendingRelinks.reserve(4096);
-    m_pendingUnlinks.reserve(4096);
-    m_textures.reserve(4096);
-}
-
-void ITextureStreamer::BeginUpdateSchedule()
-{
-    SyncTextureList();
-
-    if (CTexture::s_bStatsComputeStreamPoolWanted || CTexture::s_pStatsTexWantedLists)
-    {
-        CTexture::s_nStatsStreamPoolWanted = StatsComputeRequiredMipMemUsage();
-    }
-
-#if !defined(_RELEASE) && !defined(NULL_RENDERER)
-    if (CRenderer::CV_r_TexturesStreamingDebug >= 3)
-    {
-        CTexture::OutputDebugInfo();
-    }
-#endif
-}
-
-void ITextureStreamer::ApplySchedule(EApplyScheduleFlags asf)
-{
-    AZ_TRACE_METHOD();
-    if (asf & eASF_InOut)
-    {
-        CTexture::StreamState_Update();
-    }
-
-    if (asf & eASF_Prep)
-    {
-        CTexture::StreamState_UpdatePrep();
-    }
-}
-
-void ITextureStreamer::Relink(CTexture* pTexture)
-{
-    m_pendingRelinks.push_back(pTexture);
-    pTexture->m_bInDistanceSortedList = true;
-}
-
-void ITextureStreamer::Unlink(CTexture* pTexture)
-{
-    using std::swap;
-
-    TStreamerTextureVec::iterator it = std::find(m_pendingRelinks.begin(), m_pendingRelinks.end(), pTexture);
-    if (it == m_pendingRelinks.end())
-    {
-        m_pendingUnlinks.push_back(pTexture);
-    }
-    else
-    {
-        swap(*it, m_pendingRelinks.back());
-        m_pendingRelinks.pop_back();
-    }
-
-    pTexture->m_bInDistanceSortedList = false;
-}
-
-int ITextureStreamer::GetMinStreamableMip() const
-{
-    return CTexture::s_bStreamingFromHDD ? 0 : CRenderer::CV_r_TexturesStreamingMipClampDVD;
-}
-
-int ITextureStreamer::GetMinStreamableMipWithSkip() const
-{
-    return (CTexture::s_bStreamingFromHDD ? 0 : CRenderer::CV_r_TexturesStreamingMipClampDVD);
-}
-
-size_t ITextureStreamer::StatsComputeRequiredMipMemUsage()
-{
-#ifdef STRIP_RENDER_THREAD
-    int nThreadList = m_nCurThreadProcess;
-#else
-    int nThreadList = gRenDev->m_pRT->m_nCurThreadProcess;
-#endif
-    std::vector<CTexture::WantedStat>* pLists = CTexture::s_pStatsTexWantedLists;
-    std::vector<CTexture::WantedStat>* pList = pLists ? &pLists[nThreadList] : NULL;
-
-    if (pList)
-    {
-        pList->clear();
-    }
-
-    SyncTextureList();
-
-    TStreamerTextureVec& textures = GetTextures();
-
-    size_t nSizeToLoad = 0;
-
-    TStreamerTextureVec::iterator item = textures.begin(), end = textures.end();
-    for (; item != end; ++item)
-    {
-        CTexture* tp = *item;
-
-        bool bStale = StatsWouldUnload(tp);
-        {
-            int nPersMip = tp->m_nMips - tp->m_CacheFileHeader.m_nMipsPersistent;
-            int nReqMip = tp->m_bForceStreamHighRes ? 0 : (bStale ? nPersMip : tp->GetRequiredMipNonVirtual());
-            nReqMip = min(nReqMip, nPersMip);
-
-            int nWantedSize = tp->StreamComputeDevDataSize(nReqMip);
-
-            nSizeToLoad += nWantedSize;
-            if (nWantedSize && pList)
-            {
-                if (tp->TryAddRef())
-                {
-                    CTexture::WantedStat ws;
-                    ws.pTex = tp;
-                    tp->Release();
-                    ws.nWanted = nWantedSize;
-                    pList->push_back(ws);
-                }
-            }
-        }
-    }
-
-    return nSizeToLoad;
-}
-
-void ITextureStreamer::StatsFetchTextures(std::vector<CTexture*>& out)
-{
-    SyncTextureList();
-
-    out.reserve(out.size() + m_textures.size());
-    std::copy(m_textures.begin(), m_textures.end(), std::back_inserter(out));
-}
-
-bool ITextureStreamer::StatsWouldUnload(const CTexture* pTexture)
-{
-    SThreadInfo& ti = gRenDev->m_RP.m_TI[gRenDev->m_pRT->GetThreadList()];
-    const int nCurrentFarZoneRoundId = ti.m_arrZonesRoundId[MAX_PREDICTION_ZONES - 1];
-    const int nCurrentNearZoneRoundId = ti.m_arrZonesRoundId[0];
-
-    return
-        (nCurrentFarZoneRoundId - pTexture->GetStreamRoundInfo(MAX_PREDICTION_ZONES - 1).nRoundUpdateId > 3) &&
-        (nCurrentNearZoneRoundId - pTexture->GetStreamRoundInfo(0).nRoundUpdateId > 3);
-}
-
-void ITextureStreamer::SyncTextureList()
-{
-    if (!m_pendingUnlinks.empty())
-    {
-        std::sort(m_pendingUnlinks.begin(), m_pendingUnlinks.end());
-        m_pendingUnlinks.resize((int)(std::unique(m_pendingUnlinks.begin(), m_pendingUnlinks.end()) - m_pendingUnlinks.begin()));
-
-        TStreamerTextureVec::iterator it = m_textures.begin(), wrIt = it, itEnd = m_textures.end();
-        for (; it != itEnd; ++it)
-        {
-            if (!std::binary_search(m_pendingUnlinks.begin(), m_pendingUnlinks.end(), *it))
-            {
-                *wrIt++ = *it;
-            }
-        }
-        m_textures.erase(wrIt, itEnd);
-
-        m_pendingUnlinks.resize(0);
-    }
-
-    if (!m_pendingRelinks.empty())
-    {
-        std::sort(m_pendingRelinks.begin(), m_pendingRelinks.end());
-        m_pendingRelinks.resize((int)(std::unique(m_pendingRelinks.begin(), m_pendingRelinks.end()) - m_pendingRelinks.begin()));
-        memcpy(m_textures.grow_raw(m_pendingRelinks.size()), &m_pendingRelinks[0], sizeof(m_pendingRelinks[0]) * m_pendingRelinks.size());
-
-        m_pendingRelinks.resize(0);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/ITextureStreamer.h b/Code/CryEngine/RenderDll/Common/Textures/ITextureStreamer.h
deleted file mode 100644
index a7d087bf8e..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/ITextureStreamer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_ITEXTURESTREAMER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_ITEXTURESTREAMER_H
-#pragma once
-
-
-struct STexStreamingInfo;
-struct STexStreamPrepState;
-
-typedef DynArray<CTexture*> TStreamerTextureVec;
-
-class ITextureStreamer
-{
-public:
-    enum EApplyScheduleFlags
-    {
-        eASF_InOut = 1,
-        eASF_Prep = 2,
-
-        eASF_Full = 3,
-    };
-
-public:
-    ITextureStreamer();
-    virtual ~ITextureStreamer() {}
-
-public:
-    virtual void BeginUpdateSchedule();
-    virtual void ApplySchedule(EApplyScheduleFlags asf);
-
-    virtual bool BeginPrepare(CTexture* pTexture, const char* sFilename, uint32 nFlags) = 0;
-    virtual void EndPrepare(STexStreamPrepState*& pState) = 0;
-
-    virtual void Precache(CTexture* pTexture) = 0;
-    virtual void UpdateMip(CTexture* pTexture, const float fMipFactor, const int nFlags, const int nUpdateId, const int nCounter) = 0;
-
-    virtual void OnTextureDestroy(CTexture* pTexture) = 0;
-
-    void Relink(CTexture* pTexture);
-    void Unlink(CTexture* pTexture);
-
-    virtual void FlagOutOfMemory() = 0;
-    virtual void Flush() = 0;
-
-    virtual bool IsOverflowing() const = 0;
-    virtual float GetBias() const { return 0.0f; }
-
-    int GetMinStreamableMip() const;
-    int GetMinStreamableMipWithSkip() const;
-
-    void StatsFetchTextures(std::vector<CTexture*>& out);
-    bool StatsWouldUnload(const CTexture* pTexture);
-
-protected:
-    void SyncTextureList();
-
-    TStreamerTextureVec& GetTextures()
-    {
-        return m_textures;
-    }
-
-private:
-    size_t StatsComputeRequiredMipMemUsage();
-
-private:
-    TStreamerTextureVec m_pendingRelinks;
-    TStreamerTextureVec m_pendingUnlinks;
-    TStreamerTextureVec m_textures;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_ITEXTURESTREAMER_H
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Image/CImage.cpp b/Code/CryEngine/RenderDll/Common/Textures/Image/CImage.cpp
deleted file mode 100644
index 9415223864..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Image/CImage.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "CImage.h"
-#include <CryPath.h>
-#include "DDSImage.h"
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include "IResourceCompilerHelper.h"
-
-CImageFile::CImageFile(const string& filename)
-    : m_FileName(filename)
-{
-    m_nRefCount = 0;
-    m_pByteImage[0] = NULL;
-    m_pByteImage[1] = NULL;
-    m_pByteImage[2] = NULL;
-    m_pByteImage[3] = NULL;
-    m_pByteImage[4] = NULL;
-    m_pByteImage[5] = NULL;
-
-    m_eError = eIFE_OK;
-    m_eFormat = eTF_Unknown;
-    m_eTileMode = eTM_None;
-    m_NumMips = 0;
-    m_NumPersistentMips = 0;
-    m_Flags = 0;
-    m_ImgSize = 0;
-    m_Depth = 1;
-    m_nStartSeek = 0;
-    m_Sides = 1;
-
-    m_pStreamState = NULL;
-}
-
-CImageFile::~CImageFile()
-{
-    mfAbortStreaming();
-
-    for (int i = 0; i < 6; i++)
-    {
-        mfFree_image(i);
-    }
-}
-
-void CImageFile::mfSet_dimensions(const int w, const int h)
-{
-    m_Width = w;
-    m_Height = h;
-}
-
-void CImageFile::mfSet_error(const EImFileError error, const char* detail)
-{
-    m_eError = error;
-    if (detail)
-    {
-        TextureWarning(m_FileName.c_str(), detail);
-    }
-}
-
-namespace
-{
-    struct DDSCallback
-        : public IImageFileStreamCallback
-    {
-        DDSCallback()
-            : ok(false)
-        {
-        }
-        virtual void OnImageFileStreamComplete(CImageFile* pImFile)
-        {
-            ok = pImFile != NULL;
-            waitEvent.Set();
-        };
-        CryEvent waitEvent;
-        volatile bool ok;
-    };
-
-    //This function return the appropriate replacement texture based on whether the source asset is missing,compiling etc and also
-    //takes into account whether the source asset was a cubemap,alpha texture etc.
-    const AZStd::string GetMissingTextureFileName(AZStd::string& inputFile, AzFramework::AssetSystem::AssetStatus status)
-    {
-        using namespace AzFramework::AssetSystem;
-
-        CRY_ASSERT(status != AssetStatus_Compiled);
-        AZStd::string sFileToLoad = "EngineAssets/TextureMsg/";
-        AZStd::string prefixName = "";
-        //Checking status of the source asset
-        if (status == AssetStatus_Missing)
-        {
-            prefixName = "NotFound";
-        }
-        else if (status == AssetStatus_Compiling || status == AssetStatus_Queued)
-        {
-            prefixName = "TextureCompiling";
-        }
-        else if (status == AssetStatus_Failed)
-        {
-            prefixName = "RCError";
-        }
-        else // fallback case.
-        {
-            prefixName = "NotFound";
-        }
-
-        if (inputFile.find("_ddna.") != string::npos)
-        {
-            sFileToLoad.append(prefixName + "_ddna.dds");
-        }
-        else if (inputFile.find("_ddn.") != string::npos)
-        {
-            sFileToLoad.append(prefixName + "_ddn.dds");
-        }
-        else if (inputFile.find("_a.") != string::npos)
-        {
-            sFileToLoad.append(prefixName + "_a.dds");
-        }
-        else if (inputFile.find("_cm.") != string::npos)
-        {
-            sFileToLoad.append(prefixName + "_cm.dds");
-        }
-        else if (inputFile.find("_cm_diff.") != string::npos)
-        {
-            sFileToLoad.append(prefixName + "_cm_diff.dds");
-        }
-        else
-        {
-            sFileToLoad.append(prefixName + ".dds");
-        }
-
-        if (!gEnv->pCryPak->IsFileExist(sFileToLoad.c_str()))
-        {
-            //if missing texture is not present than we send a request to asset processor to process it
-            AssetStatus assetStatus = AssetStatus_Unknown;
-            EBUS_EVENT_RESULT(assetStatus, AzFramework::AssetSystemRequestBus, CompileAssetSync, sFileToLoad);
-
-            if (assetStatus != AssetStatus_Compiled)
-            {
-                //if we are here ,it means we were not able to compile both the source asset as well the replacement asset
-                return AZStd::string();
-            }
-        }
-
-        return sFileToLoad;
-    }
-
-
-    //Textures in texturemsg,code coverage and editor folder need to be compiled immediately
-    bool DoesTextureRequireImmediateCompilation(const AZStd::string& fileName)
-    {
-        if (fileName.find("/texturemsg/") != string::npos || fileName.find("/codecoverage/") != string::npos || fileName.find("/editor/") != string::npos)
-        {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-_smart_ptr<CImageFile> CImageFile::mfLoad_file(const string& filename, const uint32 nFlags)
-{
-    AZStd::string sFileToLoad;
-    {
-        char buffer[512];
-        IResourceCompilerHelper::GetOutputFilename(filename, buffer, sizeof(buffer));   // change filename: e.g. instead of TIF, pass DDS
-        sFileToLoad = buffer;
-    }
-    AZStd::string originalFile(sFileToLoad);
-
-    bool fileIsMissing = false;
-    if (gEnv->pCryPak)
-    {
-        if (!gEnv->pCryPak->IsFileExist(sFileToLoad.c_str()))
-        {
-            fileIsMissing = true;
-        }
-    }
-    else
-    {
-        if (!gEnv->pFileIO->Exists(sFileToLoad.c_str()))
-        {
-            fileIsMissing = true;
-        }
-    }
-
-    if (fileIsMissing)
-    {
-        using namespace AzFramework::AssetSystem;
-        AssetStatus status = AssetStatus_Unknown;
-        // if the texture has been requested with no fallback support then we must try our best to compile it asap, blocking
-        if (CRenderer::CV_r_texBlockOnLoad || (nFlags & FIM_NOFALLBACKS) || DoesTextureRequireImmediateCompilation(originalFile))
-        {
-            EBUS_EVENT_RESULT(status, AzFramework::AssetSystemRequestBus, CompileAssetSync, originalFile);
-        }
-        else
-        {
-            EBUS_EVENT_RESULT(status, AzFramework::AssetSystemRequestBus, GetAssetStatus, originalFile);
-        }
-
-
-        if (status != AssetStatus_Compiled)
-        {
-            if (nFlags & FIM_NOFALLBACKS) // do not return a fallback image.
-            {
-                return _smart_ptr<CImageFile>();
-            }
-            if (status == AssetStatus_Missing)
-            {
-                TextureWarning(originalFile.c_str(), "Texture file is missing: '%s'", originalFile.c_str());
-            }
-            else if (status == AssetStatus_Failed)
-            {
-                TextureWarning(originalFile.c_str(), "Failed to compile texture: '%s'", originalFile.c_str());
-            }
-            sFileToLoad = GetMissingTextureFileName(originalFile, status);
-            if (sFileToLoad.empty())
-            {
-                //We were not able to replace the input texture file with a substitute texture file
-                CryLog("No Substitute Texture found for the file : %s", originalFile.c_str());
-            }
-        }
-    }
-
-    const char* ext = PathUtil::GetExt(sFileToLoad.c_str());
-    _smart_ptr<CImageFile> pImageFile;
-
-    // Try DDS first
-    if (!strcmp(ext, "dds"))
-    {
-        pImageFile = new CImageDDSFile(sFileToLoad.c_str(), nFlags);
-
-        if (fileIsMissing)
-        {
-            // masquerade the file as the original one so if the original changes, we reload.
-            pImageFile->mfChange_Filename(originalFile.c_str());
-            pImageFile->m_bIsImageMissing = true;
-        }
-    }
-    else
-    {
-#ifndef _RELEASE
-        ITextureLoadHandler* pTextureHandler = nullptr;
-
-        //suppress warning if a texture handler will be able to load this image later
-        if (I3DEngine* p3DEngine = gEnv->p3DEngine)
-        {
-            pTextureHandler = p3DEngine->GetTextureLoadHandlerForImage(filename.c_str());
-        }
-
-        if (!pTextureHandler)
-        {
-            TextureWarning(sFileToLoad.c_str(), "Unsupported texture extension '%s': '%s'", ext, filename.c_str());
-        }
-#endif
-    }
-
-    if (pImageFile && pImageFile->mfGet_error() != eIFE_OK)
-    {
-        return _smart_ptr<CImageFile>();
-    }
-
-    return pImageFile;
-}
-
-_smart_ptr<CImageFile> CImageFile::mfLoad_mem(const string& filename, void* data, int width, int height, ETEX_Format format, int numMips, const uint32 nFlags)
-{
-    _smart_ptr<CImageFile> pImageFile = new CImageFile(filename);
-
-    pImageFile->m_Width = width;
-    pImageFile->m_Height = height;
-    pImageFile->m_NumMips = numMips;
-    pImageFile->m_eFormat = format;
-    pImageFile->m_FileName = filename;
-    pImageFile->m_Flags = nFlags;
-    pImageFile->m_ImgSize =
-        CTexture::TextureDataSize(width, height, pImageFile->m_Depth, numMips, 1, format, pImageFile->m_eTileMode);
-
-    pImageFile->m_pByteImage[0] = static_cast<byte*>(data);
-
-    if (pImageFile && pImageFile->mfGet_error() != eIFE_OK)
-    {
-        return _smart_ptr<CImageFile>();
-    }
-
-    return pImageFile;
-}
-
-_smart_ptr<CImageFile> CImageFile::mfStream_File(const string& filename, const uint32 nFlags, IImageFileStreamCallback* pCallback)
-{
-    string sFileToLoad;
-    {
-        char buffer[512];
-        IResourceCompilerHelper::GetOutputFilename(filename, buffer, sizeof(buffer));   // change filename: e.g. instead of TIF, pass DDS
-        sFileToLoad = buffer;
-    }
-
-    const char* ext = PathUtil::GetExt(sFileToLoad);
-    _smart_ptr<CImageFile> pImageFile;
-
-    // Try DDS first
-    if (!strcmp(ext, "dds"))
-    {
-        CImageDDSFile* pDDS = new CImageDDSFile(sFileToLoad);
-        pImageFile = pDDS;
-        pDDS->Stream(nFlags, pCallback);
-    }
-    else
-    {
-        TextureWarning(sFileToLoad.c_str(), "Unsupported texture extension '%s'", ext);
-    }
-
-    return pImageFile;
-}
-
-void CImageFile::mfFree_image(const int nSide)
-{
-    SAFE_DELETE_ARRAY(m_pByteImage[nSide]);
-}
-
-byte* CImageFile::mfGet_image(const int nSide)
-{
-    if (!m_pByteImage[nSide] && m_ImgSize)
-    {
-        m_pByteImage[nSide] = new byte[m_ImgSize];
-    }
-    return m_pByteImage[nSide];
-}
-
-void CImageFile::mfAbortStreaming()
-{
-    if (m_pStreamState)
-    {
-        for (int i = 0; i < m_pStreamState->MaxStreams; ++i)
-        {
-            if (m_pStreamState->m_pStreams[i])
-            {
-                m_pStreamState->m_pStreams[i]->Abort();
-            }
-        }
-        delete m_pStreamState;
-        m_pStreamState = NULL;
-    }
-}
-
-DDSSplitted::DDSDesc CImageFile::mfGet_DDSDesc() const
-{
-    return DDSSplitted::DDSDesc();
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Image/CImage.h b/Code/CryEngine/RenderDll/Common/Textures/Image/CImage.h
deleted file mode 100644
index 2908b774fb..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Image/CImage.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_IMAGE_CIMAGE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_IMAGE_CIMAGE_H
-#pragma once
-
-
-#include "IImage.h"
-
-#define SH_LITTLE_ENDIAN
-
-// The mask for extracting just R/G/B from an ulong or SRGBPixel
-#ifdef SH_BIG_ENDIAN
-#  define RGB_MASK 0xffffff00
-#else
-#  define RGB_MASK 0x00ffffff
-#endif
-
-/**
- * An RGB pixel.
- */
-struct SRGBPixel
-{
-    uint8 blue, green, red, alpha;
-    SRGBPixel() /* : red(0), green(0), blue(0), alpha(255) {} */
-    {
-        *(unsigned int*)this = (unsigned int)~RGB_MASK;
-    }
-    SRGBPixel(int r, int g, int b)
-        : red(r)
-        , green(g)
-        , blue(b)
-        , alpha(255) {}
-    //bool eq (const SRGBPixel& p) const { return ((*(unsigned int *)this) & RGB_MASK) == ((*(unsigned int *)&p) & RGB_MASK); }
-};
-
-class CImageFile;
-namespace DDSSplitted {
-    struct DDSDesc;
-}
-
-struct IImageFileStreamCallback
-{
-    virtual void OnImageFileStreamComplete(CImageFile* pImFile) = 0;
-
-protected:
-    virtual ~IImageFileStreamCallback() {}
-};
-
-struct SImageFileStreamState
-{
-    enum
-    {
-        MaxStreams = 64
-    };
-
-    struct Request
-    {
-        void* pOut;
-        size_t nOffs;
-        size_t nSize;
-    };
-
-    void RaiseComplete(CImageFile* pFile)
-    {
-        if (m_pCallback)
-        {
-            m_pCallback->OnImageFileStreamComplete(pFile);
-            m_pCallback = NULL;
-        }
-    }
-
-    volatile int m_nPending;
-    uint32 m_nFlags;
-    IImageFileStreamCallback* m_pCallback;
-    IReadStreamPtr m_pStreams[MaxStreams];
-    Request m_requests[MaxStreams];
-};
-
-class CImageFile
-    : public IImageFile
-    , public IStreamCallback
-{
-private:
-    CImageFile(const CImageFile&);
-    CImageFile& operator = (const CImageFile&);
-
-private:
-    volatile int m_nRefCount;
-    bool m_bIsImageMissing = false;
-
-protected:
-    int m_Width;    // Width of image.
-    int m_Height;   // Height of image.
-    int m_Depth;    // Depth of image.
-    int m_Sides;    // Depth of image.
-
-    int m_ImgSize;
-
-    int m_NumMips;
-    int m_NumPersistentMips;
-    int m_Flags;                    // e.g. FIM_GREYSCALE|FIM_ALPHA
-    int m_nStartSeek;
-    float m_fAvgBrightness;
-    ColorF m_cMinColor;
-    ColorF m_cMaxColor;
-
-    union   // The image data.
-    {
-        byte*               m_pByteImage[6];
-        SRGBPixel*  m_pPixImage[6];
-    };
-
-    EImFileError    m_eError;       // Last error code.
-    string              m_FileName; // file name
-
-    ETEX_Format m_eFormat;
-    ETEX_TileMode m_eTileMode;
-
-    SImageFileStreamState* m_pStreamState;
-
-protected:
-    CImageFile(const string& filename);
-
-    void mfSet_error(const EImFileError error, const char* detail = NULL);
-    void mfSet_dimensions(const int w, const int h);
-public:
-    virtual ~CImageFile();
-
-    virtual int AddRef()
-    {
-        return CryInterlockedIncrement(&m_nRefCount);
-    }
-
-    virtual int Release()
-    {
-        int nRef = CryInterlockedDecrement(&m_nRefCount);
-        if (nRef == 0)
-        {
-            delete this;
-        }
-        else if (nRef < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-        return nRef;
-    }
-
-    const string& mfGet_filename() const  { return m_FileName; }
-    void mfChange_Filename(const string& newName)
-    {
-        // used when one texture (such as the 'missing texture') is masquerading as another one until reloaded.
-        m_FileName = newName;
-    }
-
-    int mfGet_width() const { return m_Width; }
-    int mfGet_height() const { return m_Height; }
-    int mfGet_depth() const { return m_Depth; }
-    int mfGet_NumSides() const { return m_Sides; }
-
-    bool mfGet_IsImageMissing() const
-    {
-        return m_bIsImageMissing;
-    }
-
-    EImFileError mfGet_error() const  { return m_eError; }
-
-    byte* mfGet_image(const int nSide);
-    void mfFree_image(const int nSide);
-    bool mfIs_image(const int nSide) const { return m_pByteImage[nSide] != NULL; }
-
-    int mfGet_StartSeek() const { return m_nStartSeek; }
-
-    void mfSet_ImageSize(int Size) { m_ImgSize = Size; }
-    int mfGet_ImageSize() const { return m_ImgSize; }
-
-    ETEX_Format mfGetFormat() const { return m_eFormat; }
-    ETEX_TileMode mfGetTileMode() const { return m_eTileMode; }
-
-    void mfSet_numMips(const int num) { m_NumMips = num; }
-    int  mfGet_numMips() const { return m_NumMips; }
-
-    void mfSet_numPersistentMips(const int num) { m_NumPersistentMips = num; }
-    int mfGet_numPersistentMips() const { return m_NumPersistentMips; }
-
-    void mfSet_avgBrightness(const float avgBrightness) { m_fAvgBrightness = avgBrightness; }
-    float mfGet_avgBrightness() const { return m_fAvgBrightness; }
-
-    void mfSet_minColor(const ColorF& minColor) { m_cMinColor = minColor; }
-    const ColorF& mfGet_minColor() const { return m_cMinColor; }
-
-    void mfSet_maxColor(const ColorF& maxColor) { m_cMaxColor = maxColor; }
-    const ColorF& mfGet_maxColor() const { return m_cMaxColor; }
-
-    void mfSet_Flags(const int Flags) { m_Flags |= Flags; }
-    int mfGet_Flags() const { return m_Flags; }
-
-    void mfAbortStreaming();
-
-    virtual DDSSplitted::DDSDesc mfGet_DDSDesc() const;
-
-public:
-    /**
-    * Load a image from memory by assigning the image byte data directly without copying.
-    *
-    * @param filename The image filename
-    * @param data byte image data, caller owns this data and is responsible for cleanup.
-    * @param width image width
-    * @param height image height
-    * @param format image format (eTF_R8G8B8A8, eTF_PVRTC4 etc.)
-    * @param numMips number of mip maps
-    * @param nFlags image flags (e.g. FIM_GREYSCALE|FIM_ALPHA)
-    */
-    static _smart_ptr<CImageFile> mfLoad_mem(const string& filename, void* data, int width, int height, ETEX_Format format, int numMips, const uint32 nFlags);
-    static _smart_ptr<CImageFile> mfLoad_file(const string& filename, const uint32 nFlags);
-    static _smart_ptr<CImageFile> mfStream_File(const string& filename, const uint32 nFlags, IImageFileStreamCallback* pCallback);
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_IMAGE_CIMAGE_H
-
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Image/DDSImage.cpp b/Code/CryEngine/RenderDll/Common/Textures/Image/DDSImage.cpp
deleted file mode 100644
index 86652af21b..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Image/DDSImage.cpp
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : DDS image file format implementation.
-
-
-#include "RenderDll_precompiled.h"
-#include "CImage.h"
-#include <CryFile.h>
-#include <CryPath.h>
-#include "DDSImage.h"
-#include "ImageExtensionHelper.h"               // CImageExtensionHelper
-#include "TypeInfo_impl.h"
-#include "ImageExtensionHelper_info.h"
-#include "StringUtils.h"
-#include "ILog.h"
-#include "../TextureHelpers.h"
-
-CImageDDSFile::CImageDDSFile(const string& filename)
-    : CImageFile(filename)
-{
-}
-
-CImageDDSFile::CImageDDSFile (const string& filename, uint32 nFlags)
-    : CImageFile (filename)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    m_pFileMemory = 0;
-    if (!Load(filename, nFlags) || NULL == m_pFileMemory)    // load data from file
-    {
-        if (mfGet_error() == eIFE_OK)
-        {
-            if (nFlags & FIM_ALPHA)
-            {
-                mfSet_error(eIFE_BadFormat, "Texture does not have alpha channel"); // Usually requested via FT_HAS_ATTACHED_ALPHA for POM / Offset Bump Mapping
-            }
-        }
-    }
-    else
-    {
-        PostLoad();
-    }
-}
-
-bool CImageDDSFile::Stream(uint32 nFlags, IImageFileStreamCallback* pStreamCallback)
-{
-    const string& filename = mfGet_filename();
-
-    DDSSplitted::TPath adjustedFileName;
-    AdjustFirstFileName(nFlags, filename.c_str(), adjustedFileName);
-
-    m_pStreamState = new SImageFileStreamState;
-    m_pStreamState->m_nPending = 1;
-    m_pStreamState->m_nFlags = nFlags;
-    m_pStreamState->m_pCallback = pStreamCallback;
-    AddRef();
-
-    IStreamEngine* pStreamEngine = gEnv->pSystem->GetStreamEngine();
-
-    StreamReadParams rp;
-    rp.nFlags |= IStreamEngine::FLAGS_NO_SYNC_CALLBACK;
-    rp.dwUserData = 0;
-    m_pStreamState->m_pStreams[0] = pStreamEngine->StartRead(eStreamTaskTypeTexture, adjustedFileName.c_str(), this, &rp);
-
-    return true;
-}
-
-DDSSplitted::DDSDesc CImageDDSFile::mfGet_DDSDesc() const
-{
-    DDSSplitted::DDSDesc d;
-    d.eFormat = m_eFormat;
-    d.eTileMode = m_eTileMode;
-    d.nBaseOffset = mfGet_StartSeek();
-    d.nDepth = m_DDSHeader.dwDepth;
-    d.nFlags = (m_Flags & (FIM_ALPHA | FIM_SPLITTED | FIM_DX10IO));
-    d.nHeight = m_DDSHeader.dwHeight;
-    d.nMips = m_DDSHeader.dwMipMapCount;
-    d.nMipsPersistent = m_NumPersistentMips;
-    d.nSides = m_Sides;
-    d.nWidth = m_DDSHeader.dwWidth;
-    return d;
-}
-
-//////////////////////////////////////////////////////////////////////
-bool CImageDDSFile::Load(const string& filename, uint32 nFlags)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    DDSSplitted::TPath adjustedFileName;
-    AdjustFirstFileName(nFlags, filename.c_str(), adjustedFileName);
-
-    DDSSplitted::RequestInfo otherMips[64];
-    size_t nOtherMips = 0;
-
-    // Read the file into memory regardless of split or un-split Mips
-    DDSSplitted::FileWrapper filew(adjustedFileName.c_str(), true);
-    if (!LoadFromFile(filew, nFlags, otherMips, nOtherMips, 64))
-    {
-        return false;
-    }
-
-    if (nOtherMips && !DDSSplitted::LoadMipsFromRequests(otherMips, nOtherMips))
-    {
-        AZ_Error("Render", false, "Failed to load mips for DDS asset %s", adjustedFileName.c_str());
-        return false;
-    }
-
-    return true;
-}
-
-int CImageDDSFile::AdjustHeader()
-{
-    int nDeltaMips = 0;
-
-    if (!(m_Flags & FIM_SUPPRESS_DOWNSCALING))
-    {
-        int nFinalMips = min(max(m_NumPersistentMips, max(CRenderer::CV_r_texturesstreamingMinUsableMips, m_NumMips - CRenderer::CV_r_texturesstreamingSkipMips)), m_NumMips);
-
-        nDeltaMips = m_NumMips - nFinalMips;
-        if (nDeltaMips > 0)
-        {
-            m_Width = max(1, m_Width >> nDeltaMips);
-            m_Height = max(1, m_Height >> nDeltaMips);
-            m_Depth = max(1, m_Depth >> nDeltaMips);
-            m_NumMips = nFinalMips;
-        }
-    }
-
-    return nDeltaMips;
-}
-
-bool CImageDDSFile::LoadFromFile(DDSSplitted::FileWrapper& file, uint32 nFlags, DDSSplitted::RequestInfo* pConts, size_t& nConts, [[maybe_unused]] size_t nContsCap)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (file.IsValid())
-    {
-        const size_t fileSize = file.GetLength();
-
-        AZStd::intrusive_ptr<AZ::IO::MemoryBlock> pImageMemory;
-
-        // alloc space for header
-        CImageExtensionHelper::DDS_FILE_DESC ddsHeader;
-        CImageExtensionHelper::DDS_HEADER_DXT10 ddsExtendedHeader;
-
-        if (nFlags & FIM_ALPHA)
-        {
-            // Requested alpha image.
-            ddsHeader.dwMagic = MAKEFOURCC('D', 'D', 'S', ' ');
-            if (!(nFlags & FIM_SPLITTED))
-            {
-                // Not split. Which means it's somewhere in this file. Go find it.
-                if (!DDSSplitted::SeekToAttachedImage(file))
-                {
-                    mfSet_error(eIFE_ChunkNotFound, "Failed to find attached image");
-                    return false;
-                }
-            }
-            else
-            {
-                file.ReadRaw(&ddsHeader.dwMagic, sizeof(ddsHeader.dwMagic));
-            }
-            file.ReadRaw(&ddsHeader.header, sizeof(CImageExtensionHelper::DDS_HEADER));
-            SwapEndian(ddsHeader.header);
-            ddsHeader.dwMagic = MAKEFOURCC('D', 'D', 'S', ' ');
-        }
-        else
-        {
-            file.ReadRaw(&ddsHeader, sizeof(CImageExtensionHelper::DDS_FILE_DESC));
-            SwapEndian(ddsHeader);
-        }
-
-        if (!ddsHeader.IsValid())
-        {
-            mfSet_error(eIFE_BadFormat, "Bad DDS header");
-            return false;
-        }
-
-        if (ddsHeader.header.IsDX10Ext())
-        {
-            file.ReadRaw(&ddsExtendedHeader, sizeof(CImageExtensionHelper::DDS_HEADER_DXT10));
-        }
-
-        m_nStartSeek = file.Tell();
-
-        if (!SetHeaderFromMemory((byte*)&ddsHeader, (byte*)&ddsExtendedHeader, nFlags))
-        {
-            return false;
-        }
-
-        // Grab a snapshot of the DDS layout before adjusting the header
-        DDSSplitted::DDSDesc desc;
-        desc.pName = m_FileName.c_str();
-        desc.nWidth = m_Width;
-        desc.nHeight = m_Height;
-        desc.nDepth = m_Depth;
-        desc.nMips = m_NumMips;
-        desc.nMipsPersistent = m_NumPersistentMips;
-        desc.nSides = m_Sides;
-        desc.eFormat = m_eFormat;
-        desc.eTileMode = m_eTileMode;
-        desc.nBaseOffset = m_nStartSeek;
-        desc.nFlags = m_Flags;
-
-        int nDeltaMips = AdjustHeader();
-
-        // If stream prepare, only allocate room for the pers mips
-
-        int nMipsToLoad = (m_Flags & FIM_STREAM_PREPARE)
-            ? m_NumPersistentMips
-            : m_NumMips;
-        int nImageIgnoreMips = m_NumMips - nMipsToLoad;
-        int nFirstPersistentMip = m_NumMips - m_NumPersistentMips;
-
-        auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
-
-        size_t nImageSideSize = CTexture::TextureDataSize(
-                max(1, m_Width >> nImageIgnoreMips),
-                max(1, m_Height >> nImageIgnoreMips),
-                max(1, m_Depth >> nImageIgnoreMips),
-                nMipsToLoad, 1, m_eFormat, m_eTileMode);
-        size_t nImageSize = nImageSideSize * m_Sides;
-        pImageMemory = gEnv->pCryPak->PoolAllocMemoryBlock(nImageSize, "CImageDDSFile::LoadFromFile",
-            streamer->GetRecommendations().m_memoryAlignment);
-
-        mfSet_ImageSize(nImageSideSize);
-
-        DDSSplitted::ChunkInfo chunks[16];
-        size_t numChunks = DDSSplitted::GetFilesToRead(chunks, 16, desc, nDeltaMips + nImageIgnoreMips, m_NumMips + nDeltaMips - 1);
-
-        uint32 nDstOffset = 0;
-        byte* pDst = (byte*)pImageMemory->m_address.get();
-
-        nConts = 0;
-
-        for (size_t chunkIdx = 0; chunkIdx < numChunks; ++chunkIdx)
-        {
-            const DDSSplitted::ChunkInfo& chunk = chunks[chunkIdx];
-
-            uint32 nSurfaceSize = CTexture::TextureDataSize(
-                    max(1u, (uint32)desc.nWidth >> chunk.nMipLevel),
-                    max(1u, (uint32)desc.nHeight >> chunk.nMipLevel),
-                    max(1u, (uint32)desc.nDepth >> chunk.nMipLevel),
-                    1, 1, desc.eFormat, desc.eTileMode);
-            uint32 nSidePitch = nSurfaceSize + chunk.nSideDelta;
-
-            // Only copy persistent mips now. Create continuations for any others.
-
-            int nChunkMip = chunk.nMipLevel - nDeltaMips;
-            if (nChunkMip < nFirstPersistentMip)
-            {
-                string chunkFileName(chunk.fileName);
-                for (uint32 sideIdx = 0; sideIdx < m_Sides; ++sideIdx)
-                {
-                    DDSSplitted::RequestInfo& cont = pConts[nConts++];
-                    cont.fileName = chunkFileName;
-                    cont.nOffs = chunk.nOffsetInFile + sideIdx * nSidePitch;
-                    cont.nRead = nSurfaceSize;
-                    cont.pOut = pDst + sideIdx * nImageSideSize + nDstOffset;
-                }
-            }
-            else
-            {
-                for (uint32 sideIdx = 0; sideIdx < m_Sides; ++sideIdx)
-                {
-                    file.Seek(chunk.nOffsetInFile + sideIdx * nSidePitch);
-                    file.ReadRaw(pDst + sideIdx * nImageSideSize + nDstOffset, nSurfaceSize);
-                }
-            }
-
-            nDstOffset += nSurfaceSize;
-        }
-
-        m_pFileMemory = pImageMemory;
-
-        return true;
-    }
-
-    return false;
-}
-
-void CImageDDSFile::StreamAsyncOnComplete(IReadStream* pStream, uint32 nError)
-{
-    assert (m_pStreamState);
-
-    int nPending = CryInterlockedDecrement(&m_pStreamState->m_nPending);
-
-    bool bIsComplete = false;
-    bool bWasSuccess = false;
-
-    if (!nError)
-    {
-        const StreamReadParams& rp = pStream->GetParams();
-
-        if (rp.dwUserData == 0)
-        {
-            DDSSplitted::FileWrapper file(pStream->GetBuffer(), pStream->GetBytesRead());
-
-            // Initial read.
-
-            DDSSplitted::RequestInfo otherMips[SImageFileStreamState::MaxStreams - 1];
-            const size_t nOtherMipsCap = sizeof(otherMips) / sizeof(otherMips[0]);
-            size_t nOtherMips = 0;
-
-            if (LoadFromFile(file, m_pStreamState->m_nFlags, otherMips, nOtherMips, nOtherMipsCap))
-            {
-                IStreamEngine* pStreamEngine = gEnv->pSystem->GetStreamEngine();
-
-                if (nOtherMips)
-                {
-                    // Write before starting extra tasks
-                    m_pStreamState->m_nPending = nOtherMips;
-
-                    // Issue stream requests for additional mips
-                    for (size_t nOtherMip = 0; nOtherMip < nOtherMips; ++nOtherMip)
-                    {
-                        const DDSSplitted::RequestInfo& req = otherMips[nOtherMip];
-
-                        StreamReadParams params;
-                        params.dwUserData = nOtherMip + 1;
-
-#if 0 // TODO Fix me at some point - was disabled due to issue with SPU. Should be enabled again
-                        params.nOffset = req.nOffs;
-                        params.nSize = req.nRead;
-                        params.pBuffer = req.pOut;
-#else
-                        m_pStreamState->m_requests[nOtherMip + 1].nOffs = req.nOffs;
-                        m_pStreamState->m_requests[nOtherMip + 1].nSize = req.nRead;
-                        m_pStreamState->m_requests[nOtherMip + 1].pOut = req.pOut;
-#endif
-
-                        params.nFlags |= IStreamEngine::FLAGS_NO_SYNC_CALLBACK;
-                        AddRef();
-
-                        m_pStreamState->m_pStreams[nOtherMip + 1] = pStreamEngine->StartRead(eStreamTaskTypeTexture, req.fileName.c_str(), this, &params);
-                    }
-                }
-                else
-                {
-                    bIsComplete = true;
-                }
-
-                bWasSuccess = true;
-            }
-        }
-        else
-        {
-#if 1
-            const char* pBase = (const char*)m_pFileMemory->m_address.get();
-            const char* pEnd = pBase + m_pFileMemory->m_size;
-
-            char* pDst = (char*)m_pStreamState->m_requests[rp.dwUserData].pOut;
-            char* pDstEnd = pDst + m_pStreamState->m_requests[rp.dwUserData].nSize;
-            const char* pSrc = reinterpret_cast<const char*>(pStream->GetBuffer()) + m_pStreamState->m_requests[rp.dwUserData].nOffs;
-            const char* pSrcEnd = pSrc + m_pStreamState->m_requests[rp.dwUserData].nSize;
-
-            if (pDst < pBase)
-            {
-                __debugbreak();
-            }
-            if (pDstEnd > pEnd)
-            {
-                __debugbreak();
-            }
-            if (pSrc < pStream->GetBuffer())
-            {
-                __debugbreak();
-            }
-            if (pSrcEnd > reinterpret_cast<const char*>(pStream->GetBuffer()) + pStream->GetBytesRead())
-            {
-                __debugbreak();
-            }
-            memcpy(pDst, pSrc, m_pStreamState->m_requests[rp.dwUserData].nSize);
-#endif
-
-            if (nPending == 0)
-            {
-                // Done!
-                bIsComplete = true;
-                bWasSuccess = true;
-            }
-        }
-    }
-    else
-    {
-        bIsComplete = true;
-    }
-
-    pStream->FreeTemporaryMemory();
-
-    if (bIsComplete)
-    {
-        if (bWasSuccess)
-        {
-            PostLoad();
-            m_pStreamState->RaiseComplete(this);
-        }
-        else
-        {
-            if (nPending)
-            {
-                __debugbreak();
-            }
-            m_pStreamState->RaiseComplete(NULL);
-        }
-    }
-
-    Release();
-}
-
-bool CImageDDSFile::SetHeaderFromMemory(byte* pFileStart, byte* pFileAfterHeader, uint32 nFlags)
-{
-    LOADING_TIME_PROFILE_SECTION
-
-
-    CImageExtensionHelper::DDS_FILE_DESC& dds = *(CImageExtensionHelper::DDS_FILE_DESC*)pFileStart;
-    CImageExtensionHelper::DDS_HEADER_DXT10& ddx = *(CImageExtensionHelper::DDS_HEADER_DXT10*)pFileAfterHeader;
-
-    SwapEndian(dds);
-    if (dds.header.IsDX10Ext())
-    {
-        SwapEndian(ddx);
-    }
-
-    if (!dds.IsValid())
-    {
-        mfSet_error (eIFE_BadFormat, "Bad DDS header");
-        return false;
-    }
-
-    m_DDSHeader = dds.header;
-    m_DDSHeaderExtension = ddx;
-
-    // check for nativeness of texture
-    const uint32 imageFlags = CImageExtensionHelper::GetImageFlags(&m_DDSHeader);
-    if (!CImageExtensionHelper::IsImageNative(imageFlags))
-    {
-        mfSet_error(eIFE_BadFormat, "Not converted for this platform");
-        return false;
-    }
-
-    // setup texture properties
-    m_Width = m_DDSHeader.dwWidth;
-    m_Height = m_DDSHeader.dwHeight;
-
-    m_Flags |= m_DDSHeader.IsDX10Ext() ? FIM_DX10IO : 0;
-
-    m_eFormat = DDSFormats::GetFormatByDesc(m_DDSHeader.ddspf, m_DDSHeaderExtension.dxgiFormat);
-    if (eTF_Unknown == m_eFormat)
-    {
-        mfSet_error (eIFE_BadFormat, "Unknown DDS pixel format!");
-        return false;
-    }
-
-    m_eTileMode = eTM_None;
-    if (imageFlags & CImageExtensionHelper::EIF_Tiled)
-    {
-        switch (m_DDSHeader.bTileMode)
-        {
-        case CImageExtensionHelper::eTM_LinearPadded:
-            m_eTileMode = eTM_LinearPadded;
-            break;
-
-        case CImageExtensionHelper::eTM_Optimal:
-            m_eTileMode = eTM_Optimal;
-            break;
-        }
-    }
-
-    mfSet_numMips(m_DDSHeader.GetMipCount());
-    m_Depth = max((uint32)1ul, (uint32)m_DDSHeader.dwDepth);
-
-    m_Sides = 1;
-    if ((m_DDSHeader.dwSurfaceFlags & DDS_SURFACE_FLAGS_CUBEMAP) && (m_DDSHeader.dwCubemapFlags & DDS_CUBEMAP_ALLFACES))
-    {
-        m_Sides = 6;
-    }
-
-    if (m_DDSHeader.dwTextureStage == 'CRYF')
-    {
-        m_NumPersistentMips = m_DDSHeader.bNumPersistentMips;
-    }
-    else
-    {
-        m_NumPersistentMips = 0;
-    }
-
-    m_NumPersistentMips = min(m_NumMips, max((int)DDSSplitted::etexNumLastMips, m_NumPersistentMips));
-
-    m_fAvgBrightness = m_DDSHeader.fAvgBrightness;
-    m_cMinColor = m_DDSHeader.cMinColor;
-    m_cMaxColor = m_DDSHeader.cMaxColor;
-#ifdef NEED_ENDIAN_SWAP
-    SwapEndianBase(&m_fAvgBrightness);
-    SwapEndianBase(&m_cMinColor);
-    SwapEndianBase(&m_cMaxColor);
-#endif
-
-    if (DDSFormats::IsNormalMap(m_eFormat))
-    {
-        const int nLastMipWidth = m_Width >> (m_NumMips - 1);
-        const int nLastMipHeight = m_Height >> (m_NumMips - 1);
-        if (nLastMipWidth < 4 || nLastMipHeight < 4)
-        {
-            mfSet_error (eIFE_BadFormat, "Texture has wrong number of mips");
-        }
-    }
-
-    bool bStreamable = (nFlags & FIM_STREAM_PREPARE) != 0;
-
-    // Can't stream volume textures and textures without mips
-    if (m_eFormat == eTF_Unknown || m_Depth > 1 || m_NumMips < 2)
-    {
-        bStreamable = false;
-    }
-
-    if (
-        (m_Width <= DDSSplitted::etexLowerMipMaxSize || m_Height <= DDSSplitted::etexLowerMipMaxSize) ||
-        m_NumMips <= m_NumPersistentMips ||
-        m_NumPersistentMips == 0)
-    {
-        bStreamable = false;
-    }
-
-    if (bStreamable)
-    {
-        m_Flags |= FIM_STREAM_PREPARE;
-    }
-    m_Flags |= nFlags & (FIM_SPLITTED | FIM_ALPHA);
-    if (imageFlags & CImageExtensionHelper::EIF_Splitted)
-    {
-        m_Flags |= FIM_SPLITTED;
-    }
-
-    // set up flags
-    if (!(nFlags & FIM_ALPHA))
-    {
-        if ((imageFlags & DDS_RESF1_NORMALMAP) || TextureHelpers::VerifyTexSuffix(EFTT_NORMALS, m_FileName) || DDSFormats::IsNormalMap(m_eFormat))
-        {
-            m_Flags |= FIM_NORMALMAP;
-        }
-    }
-
-    if (imageFlags & CImageExtensionHelper::EIF_Decal)
-    {
-        m_Flags |= FIM_DECAL;
-    }
-    if (imageFlags & CImageExtensionHelper::EIF_SRGBRead)
-    {
-        m_Flags |= FIM_SRGB_READ;
-    }
-    if (imageFlags & CImageExtensionHelper::EIF_Greyscale)
-    {
-        m_Flags |= FIM_GREYSCALE;
-    }
-#if defined(AZ_PLATFORM_PROVO) || defined(TOOLS_SUPPORT_PROVO)
-    #define AZ_RESTRICTED_SECTION IMAGEEXTENSIONHELPER_H_SECTION_ISNATIVE
-    #include AZ_RESTRICTED_FILE_EXPLICIT(Textures/Image/DDSImage_cpp, provo)
-#endif
-#if defined(AZ_PLATFORM_JASPER) || defined(TOOLS_SUPPORT_JASPER)
-    #define AZ_RESTRICTED_SECTION IMAGEEXTENSIONHELPER_H_SECTION_ISNATIVE
-    #include AZ_RESTRICTED_FILE_EXPLICIT(Textures/Image/DDSImage_cpp, jasper)
-#endif
-#if defined(AZ_PLATFORM_SALEM) || defined(TOOLS_SUPPORT_SALEM)
-    #define AZ_RESTRICTED_SECTION IMAGEEXTENSIONHELPER_H_SECTION_ISNATIVE
-    #include AZ_RESTRICTED_FILE_EXPLICIT(Textures/Image/DDSImage_cpp, salem)
-#endif    
-    if (imageFlags & CImageExtensionHelper::EIF_AttachedAlpha)
-    {
-        m_Flags |= FIM_HAS_ATTACHED_ALPHA;
-    }
-    if (imageFlags & CImageExtensionHelper::EIF_SupressEngineReduce)
-    {
-        m_Flags |= FIM_SUPPRESS_DOWNSCALING;
-    }
-    if (imageFlags & CImageExtensionHelper::EIF_RenormalizedTexture)
-    {
-        m_Flags |= FIM_RENORMALIZED_TEXTURE;
-    }
-
-    if (m_Flags & FIM_NORMALMAP)
-    {
-        if (DDSFormats::IsSigned(m_eFormat))
-        {
-            m_cMinColor = ColorF(0.0f,  0.0f,  0.0f,  0.0f);
-            m_cMaxColor = ColorF(1.0f,  1.0f,  1.0f,  1.0f);
-        }
-        else
-        {
-            m_cMinColor = ColorF(-1.0f, -1.0f, -1.0f, -1.0f);
-            m_cMaxColor = ColorF(1.0f,  1.0f,  1.0f,  1.0f);
-
-            //          mfSet_error(eIFE_BadFormat, "Texture has to have a signed format");
-        }
-    }
-
-    return true;
-}
-
-bool CImageDDSFile::PostLoad()
-{
-    const byte* ptrBuffer = (const byte*)m_pFileMemory->m_address.get();
-
-    int nSrcSideSize = mfGet_ImageSize();
-
-    for (int nS = 0; nS < m_Sides; nS++)
-    {
-        mfFree_image(nS);
-        mfGet_image(nS);
-
-        // stop of an allocation failed
-        if (m_pByteImage[nS] == NULL)
-        {
-            // free already allocated data
-            for (int i = 0; i < nS; ++i)
-            {
-                mfFree_image(i);
-            }
-            mfSet_ImageSize(0);
-            mfSet_error(eIFE_OutOfMemory, "Failed to allocate Memory");
-            return false;
-        }
-
-        memcpy(m_pByteImage[nS], ptrBuffer + nSrcSideSize * nS, nSrcSideSize);
-    }
-
-    // We don't need file memory anymore, free it.
-    m_pFileMemory = 0;
-
-    return true;
-}
-
-void CImageDDSFile::AdjustFirstFileName(uint32& nFlags, const char* pFileName, DDSSplitted::TPath& adjustedFileName)
-{
-    using namespace AZ::IO;
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    const bool bIsAttachedAlpha = (nFlags & FIM_ALPHA) != 0;
-    adjustedFileName = pFileName;
-
-    if (!bIsAttachedAlpha)
-    {
-        // First file for non attached mip chain is always just .dds
-        return;
-    }
-
-    DDSSplitted::TPath firstAttachedAlphaChunkName;
-    DDSSplitted::MakeName(firstAttachedAlphaChunkName, pFileName, 0, nFlags | FIM_SPLITTED);
-
-#if defined (RELEASE)
-    // In release we assume alpha is split if a .dds.a exists. This breaks loading from a .dds outside of PAKs that contains all data (non split).
-    if (gEnv->pCryPak->IsFileExist(firstAttachedAlphaChunkName.c_str()))
-    {
-        nFlags |= FIM_SPLITTED;
-        adjustedFileName = firstAttachedAlphaChunkName;
-    }
-#else
-    // Otherwise we check the .dds header which always works, but is slower (two reads from .dds and .dds.a on load)
-    CImageExtensionHelper::DDS_FILE_DESC ddsFileDesc;
-
-    auto streamer = AZ::Interface<IStreamer>::Get();
-    AZStd::binary_semaphore wait;
-    AZStd::atomic_bool success = true;
-
-    FileRequestPtr request = streamer->Read(pFileName, &ddsFileDesc, sizeof(ddsFileDesc), sizeof(ddsFileDesc), IStreamerTypes::s_deadlineNow);
-    streamer->SetRequestCompleteCallback(request, [&wait, &success](FileRequestHandle request)
-    {
-        auto streamer = AZ::Interface<IStreamer>::Get();
-        success = streamer->GetRequestStatus(request) == IStreamerTypes::RequestStatus::Completed;
-        wait.release();
-    });
-    streamer->QueueRequest(AZStd::move(request));
-    wait.acquire();
-
-    if (success)
-    {
-        const uint32 imageFlags = CImageExtensionHelper::GetImageFlags(&ddsFileDesc.header);
-        if ((imageFlags& CImageExtensionHelper::EIF_Splitted) != 0)
-        {
-            nFlags |= FIM_SPLITTED;
-            adjustedFileName = firstAttachedAlphaChunkName;
-        }
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////
-
-#if defined(WIN32) || defined(WIN64)
-byte* WriteDDS(const byte* dat, int wdt, int hgt, int dpth, const char* name, ETEX_Format eTF, int nMips, ETEX_Type eTT, bool bToMemory, int* pSize)
-{
-    CImageExtensionHelper::DDS_FILE_DESC fileDesc;
-    memset(&fileDesc, 0, sizeof(fileDesc));
-    byte* pData = NULL;
-    CCryFile file;
-    int nOffs = 0;
-    int nSize = CTexture::TextureDataSize(wdt, hgt, dpth, nMips, 1, eTF);
-
-    fileDesc.dwMagic = MAKEFOURCC('D', 'D', 'S', ' ');
-
-    if (!bToMemory)
-    {
-        if (!file.Open(name, "wb"))
-        {
-            return NULL;
-        }
-
-        file.Write(&fileDesc.dwMagic, sizeof(fileDesc.dwMagic));
-    }
-    else
-    {
-        pData = new byte[sizeof(fileDesc) + nSize];
-        *(DWORD*)pData = fileDesc.dwMagic;
-        nOffs += sizeof(fileDesc.dwMagic);
-    }
-
-    fileDesc.header.dwSize = sizeof(fileDesc.header);
-    fileDesc.header.dwWidth = wdt;
-    fileDesc.header.dwHeight = hgt;
-    fileDesc.header.dwMipMapCount = max(1, nMips);
-    fileDesc.header.dwHeaderFlags = DDS_HEADER_FLAGS_TEXTURE | DDS_HEADER_FLAGS_MIPMAP;
-    fileDesc.header.dwSurfaceFlags = DDS_SURFACE_FLAGS_TEXTURE | DDS_SURFACE_FLAGS_MIPMAP;
-    fileDesc.header.dwTextureStage = 'CRYF';
-    fileDesc.header.dwReserved1 = 0;
-    fileDesc.header.fAvgBrightness = 0.0f;
-    fileDesc.header.cMinColor = 0.0f;
-    fileDesc.header.cMaxColor = 1.0f;
-    int nSides = 1;
-    if (eTT == eTT_Cube)
-    {
-        fileDesc.header.dwSurfaceFlags |= DDS_SURFACE_FLAGS_CUBEMAP;
-        fileDesc.header.dwCubemapFlags |= DDS_CUBEMAP_ALLFACES;
-        nSides = 6;
-    }
-    else if (eTT == eTT_3D)
-    {
-        fileDesc.header.dwHeaderFlags |= DDS_HEADER_FLAGS_VOLUME;
-    }
-    if (eTT != eTT_3D)
-    {
-        dpth = 1;
-    }
-    fileDesc.header.dwDepth = dpth;
-    if (name)
-    {
-        size_t len = strlen(name);
-        if (len > 4)
-        {
-            if (!_stricmp(&name[len - 4], ".ddn"))
-            {
-                fileDesc.header.dwReserved1 = DDS_RESF1_NORMALMAP;
-            }
-        }
-    }
-    fileDesc.header.ddspf = DDSFormats::GetDescByFormat(eTF);
-    fileDesc.header.dwPitchOrLinearSize = CTexture::TextureDataSize(wdt, 1, 1, 1, 1, eTF);
-    if (!bToMemory)
-    {
-        file.Write(&fileDesc.header, sizeof(fileDesc.header));
-
-        nOffs = 0;
-        int nSide;
-        for (nSide = 0; nSide < nSides; nSide++)
-        {
-            file.Write(&dat[nOffs], nSize);
-            nOffs += nSize;
-        }
-    }
-    else
-    {
-        memcpy(&pData[nOffs], &fileDesc.header, sizeof(fileDesc.header));
-        nOffs += sizeof(fileDesc.header);
-
-        int nSide;
-        int nSrcOffs = 0;
-        for (nSide = 0; nSide < nSides; nSide++)
-        {
-            memcpy(&pData[nOffs], &dat[nSrcOffs], nSize);
-            nSrcOffs += nSize;
-            nOffs += nSize;
-        }
-
-        if (pSize)
-        {
-            *pSize = nOffs;
-        }
-        return pData;
-    }
-
-    return NULL;
-}
-#endif // #if defined(WIN32) || defined(WIN64)
-
-//////////////////////////////////////////////////////////////////////
-namespace DDSSplitted
-{
-    TPath& MakeName(TPath& sOut, const char* sOriginalName, const uint32 nChunk, const uint32 nFlags)
-    {
-        sOut = sOriginalName;
-
-        assert (nChunk < 100);
-
-        char buffer[10];
-        if ((nFlags & FIM_SPLITTED) && (nChunk > 0))
-        {
-            buffer[0] = '.';
-            if (nChunk < 10)
-            {
-                buffer[1] = '0' + nChunk;
-                buffer[2] = 0;
-            }
-            else
-            {
-                buffer[1] = '0' + (nChunk / 10);
-                buffer[2] = '0' + (nChunk % 10);
-                buffer[3] = 0;
-            }
-        }
-        else
-        {
-            buffer[0] = 0;
-        }
-
-        sOut.append(buffer);
-        if ((nFlags & (FIM_SPLITTED | FIM_ALPHA)) == (FIM_SPLITTED | FIM_ALPHA))
-        {
-            // additional suffix for attached alpha channel
-            if (buffer[0])
-            {
-                sOut.append("a");
-            }
-            else
-            {
-                sOut.append(".a");
-            }
-        }
-
-        return sOut;
-    }
-
-    size_t GetFilesToRead_Split(ChunkInfo* pFiles, [[maybe_unused]] size_t nFilesCapacity, const DDSDesc& desc, uint32 nStartMip, uint32 nEndMip)
-    {
-        FUNCTION_PROFILER_RENDERER;
-
-        assert(nStartMip <= nEndMip);
-        assert(desc.nFlags & FIM_SPLITTED);
-
-        if (nEndMip > desc.nMips)
-        {
-            nEndMip = desc.nMips - 1;
-        }
-
-        size_t nNumFiles = 0;
-
-        for (uint32 mip = nStartMip; mip <= nEndMip; ++mip)
-        {
-            const int chunkNumber = (mip >= (int)(desc.nMips - desc.nMipsPersistent))
-                ? 0
-                : desc.nMips - mip - desc.nMipsPersistent;
-
-            ChunkInfo& newChunk = pFiles[nNumFiles];
-            MakeName(newChunk.fileName, desc.pName, chunkNumber, desc.nFlags);
-
-            newChunk.nMipLevel = mip;
-
-            if (chunkNumber != 0)
-            {
-                newChunk.nOffsetInFile = 0;
-                newChunk.nSizeInFile = 0;
-                newChunk.nSideDelta = 0;
-            }
-            else
-            {
-                uint32 nFirstPersistentMip = desc.nMips - desc.nMipsPersistent;
-                uint32 nSurfaceSize = CTexture::TextureDataSize(
-                        max(1u, desc.nWidth >> mip), max(1u, desc.nHeight >> mip), max(1u, desc.nDepth >> mip),
-                        1, 1, desc.eFormat, desc.eTileMode);
-                uint32 nSidePitch = CTexture::TextureDataSize(
-                        max(1u, desc.nWidth >> nFirstPersistentMip), max(1u, desc.nHeight >> nFirstPersistentMip), max(1u, desc.nDepth >> nFirstPersistentMip),
-                        desc.nMipsPersistent, 1, desc.eFormat, desc.eTileMode);
-                uint32 nStartOffset = CTexture::TextureDataSize(
-                        max(1u, desc.nWidth >> nFirstPersistentMip), max(1u, desc.nHeight >> nFirstPersistentMip), max(1u, desc.nDepth >> nFirstPersistentMip),
-                        mip - nFirstPersistentMip, 1, desc.eFormat, desc.eTileMode);
-
-                newChunk.nOffsetInFile = desc.nBaseOffset + nStartOffset;
-                newChunk.nSizeInFile = nSidePitch * (desc.nSides - 1) + nSurfaceSize;
-                newChunk.nSideDelta = nSidePitch - nSurfaceSize;
-            }
-
-            ++nNumFiles;
-        }
-
-        return nNumFiles;
-    }
-
-    size_t GetFilesToRead_UnSplit(ChunkInfo* pFiles, size_t nFilesCapacity, const DDSDesc& desc, uint32 nStartMip, uint32 nEndMip)
-    {
-        FUNCTION_PROFILER_RENDERER;
-
-        assert(nStartMip <= nEndMip);
-        assert(nEndMip < desc.nMips);
-        assert(!(desc.nFlags & FIM_SPLITTED));
-
-        size_t nNumFiles = 0;
-
-        uint32 nSideStart = CTexture::TextureDataSize(desc.nWidth, desc.nHeight, desc.nDepth, nStartMip, 1, desc.eFormat, desc.eTileMode);
-        uint32 nSidePitch = CTexture::TextureDataSize(desc.nWidth, desc.nHeight, desc.nDepth, desc.nMips, 1, desc.eFormat, desc.eTileMode);
-
-        for (uint32 nMip = nStartMip; nMip <= nEndMip; ++nMip)
-        {
-            uint32 nOffset = desc.nBaseOffset + nSideStart;
-            uint32 nSurfaceSize = CTexture::TextureDataSize(
-                    max(1u, desc.nWidth >> nMip),
-                    max(1u, desc.nHeight >> nMip),
-                    max(1u, desc.nDepth >> nMip),
-                    1, 1, desc.eFormat, desc.eTileMode);
-
-            if (nNumFiles < nFilesCapacity)
-            {
-                pFiles[nNumFiles].fileName = desc.pName;
-                pFiles[nNumFiles].nMipLevel = nMip;
-                pFiles[nNumFiles].nOffsetInFile = nOffset;
-                pFiles[nNumFiles].nSizeInFile = nSidePitch * (desc.nSides - 1) + nSurfaceSize;
-                pFiles[nNumFiles].nSideDelta = nSidePitch - nSurfaceSize;
-            }
-
-            ++nNumFiles;
-            nSideStart += nSurfaceSize;
-        }
-
-        return nNumFiles;
-    }
-
-    size_t GetFilesToRead(ChunkInfo* pFiles, size_t nFilesCapacity, const DDSDesc& desc, uint32 nStartMip, uint32 nEndMip)
-    {
-        return (desc.nFlags & FIM_SPLITTED)
-               ? GetFilesToRead_Split(pFiles, nFilesCapacity, desc, nStartMip, nEndMip)
-               : GetFilesToRead_UnSplit(pFiles, nFilesCapacity, desc, nStartMip, nEndMip);
-    }
-
-    bool SeekToAttachedImage(FileWrapper& file)
-    {
-        CImageExtensionHelper::DDS_FILE_DESC ddsFileDesc;
-        CImageExtensionHelper::DDS_HEADER_DXT10 ddsExtendedHeader;
-
-        if (!file.ReadRaw(&ddsFileDesc, sizeof(ddsFileDesc)))
-        {
-            return false;
-        }
-
-        SwapEndian(ddsFileDesc);
-        if (!ddsFileDesc.IsValid())
-        {
-            return false;
-        }
-
-        if (ddsFileDesc.header.IsDX10Ext())
-        {
-            file.ReadRaw(&ddsExtendedHeader, sizeof(CImageExtensionHelper::DDS_HEADER_DXT10));
-        }
-        else
-        {
-            memset(&ddsExtendedHeader, 0, sizeof(CImageExtensionHelper::DDS_HEADER_DXT10));
-        }
-
-        const uint32 imageFlags = CImageExtensionHelper::GetImageFlags(&ddsFileDesc.header);
-
-        ETEX_Format eTF = DDSFormats::GetFormatByDesc(ddsFileDesc.header.ddspf, ddsExtendedHeader.dxgiFormat);
-        if (eTF_Unknown == eTF)
-        {
-            return false;
-        }
-
-        ETEX_TileMode eTM = eTM_None;
-        if (imageFlags & CImageExtensionHelper::EIF_Tiled)
-        {
-            switch (ddsFileDesc.header.bTileMode)
-            {
-            case CImageExtensionHelper::eTM_LinearPadded:
-                eTM = eTM_LinearPadded;
-                break;
-
-            case CImageExtensionHelper::eTM_Optimal:
-                eTM = eTM_Optimal;
-                break;
-            }
-        }
-
-        uint32 numSlices = (imageFlags& CImageExtensionHelper::EIF_Cubemap) ? 6 : 1;
-        uint32 ddsSize = CTexture::TextureDataSize(ddsFileDesc.header.dwWidth, ddsFileDesc.header.dwHeight, ddsFileDesc.header.dwDepth, max(static_cast<DWORD>(1), ddsFileDesc.header.dwMipMapCount), numSlices, eTF, eTM);
-
-        size_t headerEnd = file.Tell();
-
-        file.Seek(headerEnd + ddsSize);
-
-        uint8 tmp[1024];
-        file.ReadRaw(tmp, 1024);
-
-        const CImageExtensionHelper::DDS_HEADER* pHdr = CImageExtensionHelper::GetAttachedImage(tmp);
-        if (pHdr)
-        {
-            file.Seek(headerEnd + ddsSize + ((const uint8*)pHdr - tmp));
-            return true;
-        }
-
-        return false;
-    }
-
-    size_t LoadMipRequests(RequestInfo* pReqs, size_t nReqsCap, const DDSDesc& desc, byte* pBuffer, uint32 nStartMip, uint32 nEndMip)
-    {
-        size_t nReqs = 0;
-
-        ChunkInfo names[16];
-        size_t nNumNames = GetFilesToRead(names, 16, desc, nStartMip, nEndMip);
-        if (nNumNames)
-        {
-            if (nNumNames * desc.nSides > nReqsCap)
-            {
-                __debugbreak();
-            }
-
-            for (ChunkInfo* it = names, * itEnd = names + nNumNames; it != itEnd; ++it)
-            {
-                const ChunkInfo& chunk = *it;
-
-                uint32 nSideSize = CTexture::TextureDataSize(desc.nWidth, desc.nHeight, desc.nDepth, desc.nMips, 1, desc.eFormat, desc.eTileMode);
-                uint32 nSideSizeToRead = CTexture::TextureDataSize(
-                        max(1u, desc.nWidth >> chunk.nMipLevel),
-                        max(1u, desc.nHeight >> chunk.nMipLevel),
-                        max(1u, desc.nDepth >> chunk.nMipLevel),
-                        1, 1, desc.eFormat, desc.eTileMode);
-
-                string sFileName = string(it->fileName);
-
-                uint32 nSrcOffset = chunk.nOffsetInFile;
-                uint32 nDstOffset = 0;
-
-                for (uint32 iSide = 0; iSide < desc.nSides; ++iSide)
-                {
-                    pReqs[nReqs].fileName = sFileName;
-                    pReqs[nReqs].nOffs = nSrcOffset;
-                    pReqs[nReqs].nRead = nSideSizeToRead;
-                    pReqs[nReqs].pOut = pBuffer + (nSideSize * iSide) + nDstOffset;
-
-                    ++nReqs;
-                    nSrcOffset += nSideSizeToRead + chunk.nSideDelta;
-                }
-
-                nDstOffset += nSideSizeToRead;
-            }
-        }
-
-        return nReqs;
-    }
-
-    bool LoadMipsFromRequests(const RequestInfo* pReqs, size_t nReqs)
-    {
-        using namespace AZ::IO;
-
-        LOADING_TIME_PROFILE_SECTION;
-        auto streamer = AZ::Interface<IStreamer>::Get();
-
-        struct SharedRequestData
-        {
-            IStreamer* m_streamer;
-            AZStd::atomic_int m_numProcessingRequests;
-            AZStd::atomic_bool m_succeeded = true;
-            AZStd::binary_semaphore m_wait;
-        };
-        SharedRequestData sharedData;
-        sharedData.m_numProcessingRequests = nReqs;
-        sharedData.m_streamer = streamer;
-
-        AZStd::vector<FileRequestPtr> requests;
-        requests.reserve(nReqs);
-        streamer->CreateRequestBatch(requests, nReqs);
-
-        auto callback = [&sharedData](FileRequestHandle request)
-        {
-            if (sharedData.m_streamer->GetRequestStatus(request) != IStreamerTypes::RequestStatus::Completed)
-            {
-                sharedData.m_succeeded = false;
-            }
-            if (--sharedData.m_numProcessingRequests == 0)
-            {
-                sharedData.m_wait.release();
-            }
-        };
-
-        // load files
-        for (size_t i = 0; i < nReqs; ++i)
-        {
-            const RequestInfo& req = pReqs[i];
-            FileRequestPtr& request = requests[i];
-            streamer->Read(request, req.fileName.c_str(), req.pOut, req.nRead, req.nRead,
-                IStreamerTypes::s_deadlineNow, IStreamerTypes::s_priorityMedium, req.nOffs);
-            streamer->SetRequestCompleteCallback(request, callback);
-        }
-        streamer->QueueRequestBatch(AZStd::move(requests));
-
-        // Wait for all mips to finish loading
-        sharedData.m_wait.acquire();
-
-        if (!sharedData.m_succeeded)
-        {
-            AZ_Error("Render", false ,"Couldn't read one or more mip requests during async mip load");
-            return false;
-        }
-
-        return true;
-    }
-
-    bool LoadMips(byte* pBuffer, const DDSDesc& desc, uint32 nStartMip, uint32 nEndMip)
-    {
-        bool success = 0;
-
-        RequestInfo reqs[64];
-        size_t nReqs = LoadMipRequests(reqs, 64, desc, pBuffer, nStartMip, nEndMip);
-
-        if (nReqs)
-        {
-            success = LoadMipsFromRequests(reqs, nReqs);
-        }
-
-        return success;
-    }
-
-    int GetNumLastMips([[maybe_unused]] const int nWidth, [[maybe_unused]] const int nHeight, [[maybe_unused]] const int nNumMips, [[maybe_unused]] const int nSides, [[maybe_unused]] ETEX_Format eTF, [[maybe_unused]] const uint32 nFlags)
-    {
-        return (int)DDSSplitted::etexNumLastMips;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Image/DDSImage.h b/Code/CryEngine/RenderDll/Common/Textures/Image/DDSImage.h
deleted file mode 100644
index ec7fbf466e..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Image/DDSImage.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_IMAGE_DDSIMAGE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_IMAGE_DDSIMAGE_H
-#pragma once
-
-
-#include "ImageExtensionHelper.h"
-#include "CImage.h"
-#include <IMemory.h>
-
-#include <AzCore/Casting/lossy_cast.h>
-#include <AzCore/IO/IStreamer.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzFramework/Archive/IArchive.h>
-#include <AzCore/std/parallel/binary_semaphore.h>
-
-/**
- * An ImageFile subclass for reading DDS files.
- */
-namespace DDSSplitted
-{
-    enum
-    {
-        etexNumLastMips = 3,
-        etexLowerMipMaxSize = (1 << (etexNumLastMips + 2)),   // + 2 means we drop all the mips that are less than 4x4(two mips: 2x2 and 1x1)
-    };
-
-    struct DDSDesc
-    {
-        DDSDesc()
-        {
-            memset(this, 0, sizeof(*this));
-        }
-
-        const char* pName;
-        uint32 nBaseOffset;
-
-        uint32 nWidth;
-        uint32 nHeight;
-        uint32 nDepth;
-        uint32 nSides;
-        uint32 nMips;
-        uint32 nMipsPersistent;
-        ETEX_Format eFormat;
-        ETEX_TileMode eTileMode;
-        uint32 nFlags;
-    };
-
-    typedef CryStackStringT<char, 192> TPath;
-
-    struct ChunkInfo
-    {
-        TPath fileName;
-        uint32 nOffsetInFile;
-        uint32 nSizeInFile;
-        uint32 nMipLevel;
-        uint32 nSideDelta;
-    };
-
-    struct RequestInfo
-    {
-        string fileName;
-        void* pOut;
-        uint32 nOffs;
-        uint32 nRead;
-    };
-
-    struct FileWrapper
-    {
-        FileWrapper(const char* fileName, bool storeInMem)
-            : m_bInMem(storeInMem)
-            , m_fileName(fileName)
-            , m_isValid(false)
-            , m_nRawLen(0)
-            , m_nSeek(0)
-            , m_pRaw(nullptr)
-            , m_cleanup(storeInMem)
-        {
-            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzCore, "DDS FileWrapper AZ Streamer");
-            AZ::u64 fileSize = 0;
-            AZ::IO::Result result = AZ::IO::FileIOBase::GetInstance()->Size(fileName, fileSize);
-            m_nRawLen = (size_t)fileSize; // Cry DDS texture used 32 bits for filesize so cast here
-            if (result == AZ::IO::ResultCode::Success)
-            {
-                m_isValid = true;
-                if (m_bInMem)
-                {
-                    m_pRaw = new char[m_nRawLen];
-                    m_nRawLen = azlossy_caster(ReadBlock(const_cast<char*>(m_pRaw), m_nRawLen, 0));
-                }
-            }
-        }
-
-        ~FileWrapper()
-        {
-            if (m_bInMem && m_cleanup && m_pRaw)
-            {
-                delete[] m_pRaw;
-                m_pRaw = nullptr;
-            }
-        }
-        FileWrapper(const void* p, size_t nLen, bool cleanupData = false)
-            : m_bInMem(true)
-            , m_pRaw((const char*)p)
-            , m_nRawLen(nLen)
-            , m_nSeek(0)
-            , m_cleanup(cleanupData){}
-
-        bool IsValid() const
-        {
-            return m_bInMem
-                 ? m_pRaw != NULL
-                 : m_isValid;
-        }
-
-        size_t GetLength() const
-        {
-            return m_nRawLen;
-        }
-
-        size_t ReadRaw(void* p, size_t amount)
-        {
-            if (m_bInMem)
-            {
-                amount = min(m_nRawLen - m_nSeek, amount);
-                memcpy(p, m_pRaw + m_nSeek, amount);
-                m_nSeek += amount;
-
-                return amount;
-            }
-            else
-            {
-                amount = min(m_nRawLen - m_nSeek, amount);
-                AZ::u64 amountRead = ReadBlock(p, amount, m_nSeek);
-                m_nSeek += (size_t)amountRead; // Cry DDS texture used 32 bits for filesize so cast here
-                return amountRead;
-            }
-        }
-
-        AZ::u64 ReadBlock(void* address, AZ::u64 size, AZ::u64 offset)
-        {
-            auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
-            AZStd::binary_semaphore wait;
-            AZStd::atomic_bool success = true;
-
-            AZ::IO::FileRequestPtr request = streamer->Read(m_fileName, address, size, size,
-                AZ::IO::IStreamerTypes::s_deadlineNow, AZ::IO::IStreamerTypes::s_priorityMedium, offset);
-            streamer->SetRequestCompleteCallback(request, [&wait, &success](AZ::IO::FileRequestHandle request)
-            {
-                auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
-                success = streamer->GetRequestStatus(request) == AZ::IO::IStreamerTypes::RequestStatus::Completed;
-                wait.release();
-            });
-            streamer->QueueRequest(AZStd::move(request));
-            wait.acquire();
-
-            return success ? size : 0;
-        }
-
-        void Seek(size_t offs)
-        {
-            m_nSeek = min(offs, m_nRawLen);
-        }
-
-        size_t Tell()
-        {
-            return m_nSeek;
-        }
-
-        bool m_bInMem;
-        const char* m_fileName;
-
-        struct
-        {
-            bool m_isValid;
-            bool m_cleanup;
-            const char* m_pRaw;
-            size_t m_nRawLen;
-            size_t m_nSeek;
-        };
-    };
-
-    typedef std::vector<ChunkInfo> Chunks;
-
-    TPath& MakeName(TPath& sOut, const char* sOriginalName, const uint32 nChunk, const uint32 nFlags);
-
-    size_t GetFilesToRead(ChunkInfo* pFiles, size_t nFilesCapacity, const DDSDesc& desc, uint32 nStartMip, uint32 nEndMip);
-
-    bool SeekToAttachedImage(FileWrapper& file);
-
-    size_t LoadMipRequests(RequestInfo* pReqs, size_t nReqsCap, const DDSDesc& desc, byte* pBuffer, uint32 nStartMip, uint32 nEndMip);
-    bool LoadMipsFromRequests(const RequestInfo* pReqs, size_t nReqs);
-    bool LoadMips(byte* pBuffer, const DDSDesc& desc, uint32 nStartMip, uint32 nEndMip);
-
-    int GetNumLastMips(const int nWidth, const int nHeight, const int nNumMips, const int nSides, ETEX_Format eTF, const uint32 nFlags);
-};
-
-class CImageDDSFile
-    : public CImageFile
-{
-    friend class CImageFile; // For constructor
-public:
-    CImageDDSFile(const string& filename);
-    CImageDDSFile (const string& filename, uint32 nFlags);
-
-    bool Stream(uint32 nFlags, IImageFileStreamCallback* pStreamCallback);
-
-    virtual DDSSplitted::DDSDesc mfGet_DDSDesc() const;
-
-private: // ------------------------------------------------------------------------------
-    /// Read the DDS file from the file.
-    bool LoadFromFile(DDSSplitted::FileWrapper& file, uint32 nFlags, DDSSplitted::RequestInfo* pConts, size_t& nConts, size_t nContsCap);
-
-    /// Read the DDS file from the file.
-    bool Load(const string& filename, uint32 nFlags);
-
-    void StreamAsyncOnComplete (IReadStream* pStream, unsigned nError);
-
-    bool SetHeaderFromMemory(byte* pFileStart, byte* pFileAfterHeader, uint32 nFlags);
-    int AdjustHeader();
-
-    bool PostLoad();
-
-    void AdjustFirstFileName(uint32& nFlags, const char* pFileName, DDSSplitted::TPath& adjustedFileName);
-
-    CImageExtensionHelper::DDS_HEADER   m_DDSHeader;
-    CImageExtensionHelper::DDS_HEADER_DXT10 m_DDSHeaderExtension;
-
-    AZStd::intrusive_ptr<AZ::IO::MemoryBlock> m_pFileMemory;
-};
-
-void WriteDDS(const byte* dat, int wdt, int hgt, int dpth, int Size, char* name, ETEX_Format eF, int NumMips, ETEX_Type eTT);
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_IMAGE_DDSIMAGE_H
-
-
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Image/JpgImage.cpp b/Code/CryEngine/RenderDll/Common/Textures/Image/JpgImage.cpp
deleted file mode 100644
index d670fb6aaf..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Image/JpgImage.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include <AzFramework/Archive/IArchive.h>
-
-namespace ImageUtils
-{
-    string OutputPath(const char* filename);
-}
-
-namespace JpgImage {
-    /* public domain Simple, Minimalistic JPEG writer - http://jonolick.com
-     *
-     * Quick Notes:
-     *  Based on a javascript jpeg writer
-     *  JPEG baseline (no JPEG progressive)
-     *  Supports 1, 3 or 4 component input. (luminance, RGB or RGBX)
-     *
-     * Latest revisions:
-     *  1.52 (2012-22-11) Added support for specifying Luminance, RGB, or RGBA via comp(onents) argument (1, 3 and 4 respectively).
-     *  1.51 (2012-19-11) Fixed some warnings
-     *  1.50 (2012-18-11) MT safe. Simplified. Optimized. Reduced memory requirements. Zero allocations. No namespace polution. Approx 340 lines code.
-     *  1.10 (2012-16-11) compile fixes, added docs,
-     *      changed from .h to .cpp (simpler to bootstrap), etc
-     *  1.00 (2012-02-02) initial release
-     *
-     * Basic usage:
-     *  char *foo = new char[128*128*4]; // 4 component. RGBX format, where X is unused
-     *  jo_write_jpg("foo.jpg", foo, 128, 128, 4, 90); // comp can be 1, 3, or 4. Lum, RGB, or RGBX respectively.
-     *
-     * */
-
-
-    //#include <stdio.h>
-    //#include <stdlib.h>
-    //#include <math.h>
-
-    static const unsigned char s_jo_ZigZag[] = { 0, 1, 5, 6, 14, 15, 27, 28, 2, 4, 7, 13, 16, 26, 29, 42, 3, 8, 12, 17, 25, 30, 41, 43, 9, 11, 18, 24, 31, 40, 44, 53, 10, 19, 23, 32, 39, 45, 52, 54, 20, 22, 33, 38, 46, 51, 55, 60, 21, 34, 37, 47, 50, 56, 59, 61, 35, 36, 48, 49, 57, 58, 62, 63 };
-
-    struct joBufferedIO
-    {
-        AZ::IO::HandleType fileHandle;
-        int size;
-        char buffer[1024];
-    };
-
-    static void jo_flushBuffer(joBufferedIO* io)
-    {
-        gEnv->pCryPak->FWrite(io->buffer, io->size, io->fileHandle);
-        io->size = 0;
-    }
-
-    static void jo_bufferByte(joBufferedIO* io, unsigned char c)
-    {
-        io->buffer[io->size++] = c;
-        if (io->size == sizeof(io->buffer))
-        {
-            jo_flushBuffer(io);
-        }
-    }
-
-    static void jo_writeBits(joBufferedIO* fp, int& bitBuf, int& bitCnt, const unsigned short* bs)
-    {
-
-        bitCnt += bs[1];
-        bitBuf |= bs[0] << (24 - bitCnt);
-        while (bitCnt >= 8)
-        {
-            unsigned char c = (bitBuf >> 16) & 255;
-            jo_bufferByte(fp, c);
-            if (c == 255)
-            {
-                c = 0;
-                jo_bufferByte(fp, c);
-            }
-            bitBuf <<= 8;
-            bitCnt -= 8;
-        }
-    }
-
-    static void jo_DCT(float& d0, float& d1, float& d2, float& d3, float& d4, float& d5, float& d6, float& d7)
-    {
-        float tmp0 = d0 + d7;
-        float tmp7 = d0 - d7;
-        float tmp1 = d1 + d6;
-        float tmp6 = d1 - d6;
-        float tmp2 = d2 + d5;
-        float tmp5 = d2 - d5;
-        float tmp3 = d3 + d4;
-        float tmp4 = d3 - d4;
-
-        // Even part
-        float tmp10 = tmp0 + tmp3; // phase 2
-        float tmp13 = tmp0 - tmp3;
-        float tmp11 = tmp1 + tmp2;
-        float tmp12 = tmp1 - tmp2;
-
-        d0 = tmp10 + tmp11;     // phase 3
-        d4 = tmp10 - tmp11;
-
-        float z1 = (tmp12 + tmp13) * 0.707106781f; // c4
-        d2 = tmp13 + z1;    // phase 5
-        d6 = tmp13 - z1;
-
-        // Odd part
-        tmp10 = tmp4 + tmp5;    // phase 2
-        tmp11 = tmp5 + tmp6;
-        tmp12 = tmp6 + tmp7;
-
-        // The rotator is modified from fig 4-8 to avoid extra negations.
-        float z5 = (tmp10 - tmp12) * 0.382683433f; // c6
-        float z2 = tmp10 * 0.541196100f + z5; // c2-c6
-        float z4 = tmp12 * 1.306562965f + z5; // c2+c6
-        float z3 = tmp11 * 0.707106781f; // c4
-
-        float z11 = tmp7 + z3;  // phase 5
-        float z13 = tmp7 - z3;
-
-        d5 = z13 + z2;      // phase 6
-        d3 = z13 - z2;
-        d1 = z11 + z4;
-        d7 = z11 - z4;
-    }
-
-    static void jo_calcBits(int val, unsigned short bits[2])
-    {
-        int tmp1 = val < 0 ? -val : val;
-        val = val < 0 ? val - 1 : val;
-        bits[1] = 1;
-        while (tmp1 >>= 1)
-        {
-            ++bits[1];
-        }
-        bits[0] = val & ((1 << bits[1]) - 1);
-    }
-
-    static int jo_processDU(joBufferedIO* fp, int& bitBuf, int& bitCnt, float* CDU, float* fdtbl, int DC, const unsigned short HTDC[256][2], const unsigned short HTAC[256][2])
-    {
-        const unsigned short EOB[2] = { HTAC[0x00][0], HTAC[0x00][1] };
-        const unsigned short M16zeroes[2] = { HTAC[0xF0][0], HTAC[0xF0][1] };
-
-        // DCT rows
-        for (int dataOff = 0; dataOff < 64; dataOff += 8)
-        {
-            jo_DCT(CDU[dataOff], CDU[dataOff + 1], CDU[dataOff + 2], CDU[dataOff + 3], CDU[dataOff + 4], CDU[dataOff + 5], CDU[dataOff + 6], CDU[dataOff + 7]);
-        }
-        // DCT columns
-        for (int dataOff = 0; dataOff < 8; ++dataOff)
-        {
-            jo_DCT(CDU[dataOff], CDU[dataOff + 8], CDU[dataOff + 16], CDU[dataOff + 24], CDU[dataOff + 32], CDU[dataOff + 40], CDU[dataOff + 48], CDU[dataOff + 56]);
-        }
-        // Quantize/descale/zigzag the coefficients
-        int DU[64];
-        for (int i = 0; i < 64; ++i)
-        {
-            float v = CDU[i] * fdtbl[i];
-            DU[s_jo_ZigZag[i]] = (int)(v < 0 ? ceilf(v - 0.5f) : floorf(v + 0.5f));
-        }
-
-        // Encode DC
-        int diff = DU[0] - DC;
-        if (diff == 0)
-        {
-            jo_writeBits(fp, bitBuf, bitCnt, HTDC[0]);
-        }
-        else
-        {
-            unsigned short bits[2];
-            jo_calcBits(diff, bits);
-            jo_writeBits(fp, bitBuf, bitCnt, HTDC[bits[1]]);
-            jo_writeBits(fp, bitBuf, bitCnt, bits);
-        }
-        // Encode ACs
-        int end0pos = 63;
-        for (; (end0pos > 0) && (DU[end0pos] == 0); --end0pos)
-        {
-        }
-        // end0pos = first element in reverse order !=0
-        if (end0pos == 0)
-        {
-            jo_writeBits(fp, bitBuf, bitCnt, EOB);
-            return DU[0];
-        }
-        for (int i = 1; i <= end0pos; ++i)
-        {
-            int startpos = i;
-            for (; DU[i] == 0 && i <= end0pos; ++i)
-            {
-            }
-            int nrzeroes = i - startpos;
-            if (nrzeroes >= 16)
-            {
-                int lng = nrzeroes >> 4;
-                for (int nrmarker = 1; nrmarker <= lng; ++nrmarker)
-                {
-                    jo_writeBits(fp, bitBuf, bitCnt, M16zeroes);
-                }
-                nrzeroes &= 15;
-            }
-            unsigned short bits[2];
-            jo_calcBits(DU[i], bits);
-            jo_writeBits(fp, bitBuf, bitCnt, HTAC[(nrzeroes << 4) + bits[1]]);
-            jo_writeBits(fp, bitBuf, bitCnt, bits);
-        }
-        if (end0pos != 63)
-        {
-            jo_writeBits(fp, bitBuf, bitCnt, EOB);
-        }
-        return DU[0];
-    }
-
-    bool jo_write_jpg(const char* filename, const void* data, int width, int height, int comp, int quality)
-    {
-        // Constants that don't pollute global namespace
-        static const unsigned char std_dc_luminance_nrcodes[] = {0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0};
-        static const unsigned char std_dc_luminance_values[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
-        static const unsigned char std_ac_luminance_nrcodes[] = {0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d};
-        static const unsigned char std_ac_luminance_values[] = {
-            0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
-            0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
-            0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-            0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
-            0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-            0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
-            0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa
-        };
-        static const unsigned char std_dc_chrominance_nrcodes[] = {0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0};
-        static const unsigned char std_dc_chrominance_values[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
-        static const unsigned char std_ac_chrominance_nrcodes[] = {0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77};
-        static const unsigned char std_ac_chrominance_values[] = {
-            0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
-            0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
-            0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-            0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-            0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
-            0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
-            0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa
-        };
-        // Huffman tables
-        static const unsigned short YDC_HT[256][2] = {
-            {0, 2}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}, {14, 4}, {30, 5}, {62, 6}, {126, 7}, {254, 8}, {510, 9}
-        };
-        static const unsigned short UVDC_HT[256][2] = {
-            {0, 2}, {1, 2}, {2, 2}, {6, 3}, {14, 4}, {30, 5}, {62, 6}, {126, 7}, {254, 8}, {510, 9}, {1022, 10}, {2046, 11}
-        };
-        static const unsigned short YAC_HT[256][2] = {
-            {10, 4}, {0, 2}, {1, 2}, {4, 3}, {11, 4}, {26, 5}, {120, 7}, {248, 8}, {1014, 10}, {65410, 16}, {65411, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {12, 4}, {27, 5}, {121, 7}, {502, 9}, {2038, 11}, {65412, 16}, {65413, 16}, {65414, 16}, {65415, 16}, {65416, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {28, 5}, {249, 8}, {1015, 10}, {4084, 12}, {65417, 16}, {65418, 16}, {65419, 16}, {65420, 16}, {65421, 16}, {65422, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {58, 6}, {503, 9}, {4085, 12}, {65423, 16}, {65424, 16}, {65425, 16}, {65426, 16}, {65427, 16}, {65428, 16}, {65429, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {59, 6}, {1016, 10}, {65430, 16}, {65431, 16}, {65432, 16}, {65433, 16}, {65434, 16}, {65435, 16}, {65436, 16}, {65437, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {122, 7}, {2039, 11}, {65438, 16}, {65439, 16}, {65440, 16}, {65441, 16}, {65442, 16}, {65443, 16}, {65444, 16}, {65445, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {123, 7}, {4086, 12}, {65446, 16}, {65447, 16}, {65448, 16}, {65449, 16}, {65450, 16}, {65451, 16}, {65452, 16}, {65453, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {250, 8}, {4087, 12}, {65454, 16}, {65455, 16}, {65456, 16}, {65457, 16}, {65458, 16}, {65459, 16}, {65460, 16}, {65461, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {504, 9}, {32704, 15}, {65462, 16}, {65463, 16}, {65464, 16}, {65465, 16}, {65466, 16}, {65467, 16}, {65468, 16}, {65469, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {505, 9}, {65470, 16}, {65471, 16}, {65472, 16}, {65473, 16}, {65474, 16}, {65475, 16}, {65476, 16}, {65477, 16}, {65478, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {506, 9}, {65479, 16}, {65480, 16}, {65481, 16}, {65482, 16}, {65483, 16}, {65484, 16}, {65485, 16}, {65486, 16}, {65487, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {1017, 10}, {65488, 16}, {65489, 16}, {65490, 16}, {65491, 16}, {65492, 16}, {65493, 16}, {65494, 16}, {65495, 16}, {65496, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {1018, 10}, {65497, 16}, {65498, 16}, {65499, 16}, {65500, 16}, {65501, 16}, {65502, 16}, {65503, 16}, {65504, 16}, {65505, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {2040, 11}, {65506, 16}, {65507, 16}, {65508, 16}, {65509, 16}, {65510, 16}, {65511, 16}, {65512, 16}, {65513, 16}, {65514, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {65515, 16}, {65516, 16}, {65517, 16}, {65518, 16}, {65519, 16}, {65520, 16}, {65521, 16}, {65522, 16}, {65523, 16}, {65524, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {2041, 11}, {65525, 16}, {65526, 16}, {65527, 16}, {65528, 16}, {65529, 16}, {65530, 16}, {65531, 16}, {65532, 16}, {65533, 16}, {65534, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
-        };
-        static const unsigned short UVAC_HT[256][2] = {
-            {0, 2}, {1, 2}, {4, 3}, {10, 4}, {24, 5}, {25, 5}, {56, 6}, {120, 7}, {500, 9}, {1014, 10}, {4084, 12}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {11, 4}, {57, 6}, {246, 8}, {501, 9}, {2038, 11}, {4085, 12}, {65416, 16}, {65417, 16}, {65418, 16}, {65419, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {26, 5}, {247, 8}, {1015, 10}, {4086, 12}, {32706, 15}, {65420, 16}, {65421, 16}, {65422, 16}, {65423, 16}, {65424, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {27, 5}, {248, 8}, {1016, 10}, {4087, 12}, {65425, 16}, {65426, 16}, {65427, 16}, {65428, 16}, {65429, 16}, {65430, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {58, 6}, {502, 9}, {65431, 16}, {65432, 16}, {65433, 16}, {65434, 16}, {65435, 16}, {65436, 16}, {65437, 16}, {65438, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {59, 6}, {1017, 10}, {65439, 16}, {65440, 16}, {65441, 16}, {65442, 16}, {65443, 16}, {65444, 16}, {65445, 16}, {65446, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {121, 7}, {2039, 11}, {65447, 16}, {65448, 16}, {65449, 16}, {65450, 16}, {65451, 16}, {65452, 16}, {65453, 16}, {65454, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {122, 7}, {2040, 11}, {65455, 16}, {65456, 16}, {65457, 16}, {65458, 16}, {65459, 16}, {65460, 16}, {65461, 16}, {65462, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {249, 8}, {65463, 16}, {65464, 16}, {65465, 16}, {65466, 16}, {65467, 16}, {65468, 16}, {65469, 16}, {65470, 16}, {65471, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {503, 9}, {65472, 16}, {65473, 16}, {65474, 16}, {65475, 16}, {65476, 16}, {65477, 16}, {65478, 16}, {65479, 16}, {65480, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {504, 9}, {65481, 16}, {65482, 16}, {65483, 16}, {65484, 16}, {65485, 16}, {65486, 16}, {65487, 16}, {65488, 16}, {65489, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {505, 9}, {65490, 16}, {65491, 16}, {65492, 16}, {65493, 16}, {65494, 16}, {65495, 16}, {65496, 16}, {65497, 16}, {65498, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {506, 9}, {65499, 16}, {65500, 16}, {65501, 16}, {65502, 16}, {65503, 16}, {65504, 16}, {65505, 16}, {65506, 16}, {65507, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {2041, 11}, {65508, 16}, {65509, 16}, {65510, 16}, {65511, 16}, {65512, 16}, {65513, 16}, {65514, 16}, {65515, 16}, {65516, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {16352, 14}, {65517, 16}, {65518, 16}, {65519, 16}, {65520, 16}, {65521, 16}, {65522, 16}, {65523, 16}, {65524, 16}, {65525, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-            {1018, 10}, {32707, 15}, {65526, 16}, {65527, 16}, {65528, 16}, {65529, 16}, {65530, 16}, {65531, 16}, {65532, 16}, {65533, 16}, {65534, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
-        };
-        static const int YQT[] = {16, 11, 10, 16, 24, 40, 51, 61, 12, 12, 14, 19, 26, 58, 60, 55, 14, 13, 16, 24, 40, 57, 69, 56, 14, 17, 22, 29, 51, 87, 80, 62, 18, 22, 37, 56, 68, 109, 103, 77, 24, 35, 55, 64, 81, 104, 113, 92, 49, 64, 78, 87, 103, 121, 120, 101, 72, 92, 95, 98, 112, 100, 103, 99};
-        static const int UVQT[] = {17, 18, 24, 47, 99, 99, 99, 99, 18, 21, 26, 66, 99, 99, 99, 99, 24, 26, 56, 99, 99, 99, 99, 99, 47, 66, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99};
-        static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f, 1.0f * 2.828427125f, 0.785694958f * 2.828427125f, 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f };
-
-        if (!data || !filename || !width || !height || comp > 4 || comp < 1 || comp == 2)
-        {
-            return false;
-        }
-
-        auto pCryPak = gEnv->pCryPak;
-
-        string fullPath = ImageUtils::OutputPath(filename);
-        filename = fullPath.c_str();
-
-        AZ::IO::HandleType fileHandle = pCryPak->FOpen(filename, "wb");
-        if (fileHandle == AZ::IO::InvalidHandle)
-        {
-            return false;
-        }
-
-        quality = quality ? quality : 90;
-        quality = quality < 1 ? 1 : quality > 100 ? 100 : quality;
-        quality = quality < 50 ? 5000 / quality : 200 - quality * 2;
-
-        unsigned char YTable[64], UVTable[64];
-        for (int i = 0; i < 64; ++i)
-        {
-            int yti = (YQT[i] * quality + 50) / 100;
-            YTable[s_jo_ZigZag[i]] = yti < 1 ? 1 : yti > 255 ? 255 : yti;
-            int uvti  = (UVQT[i] * quality + 50) / 100;
-            UVTable[s_jo_ZigZag[i]] = uvti < 1 ? 1 : uvti > 255 ? 255 : uvti;
-        }
-
-        float fdtbl_Y[64], fdtbl_UV[64];
-        for (int row = 0, k = 0; row < 8; ++row)
-        {
-            for (int col = 0; col < 8; ++col, ++k)
-            {
-                fdtbl_Y[k]  = 1 / (YTable [s_jo_ZigZag[k]] * aasf[row] * aasf[col]);
-                fdtbl_UV[k] = 1 / (UVTable[s_jo_ZigZag[k]] * aasf[row] * aasf[col]);
-            }
-        }
-
-        // Write Headers
-        static const unsigned char head0[] = { 0xFF, 0xD8, 0xFF, 0xE0, 0, 0x10, 'J', 'F', 'I', 'F', 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0xFF, 0xDB, 0, 0x84, 0 };
-        pCryPak->FWrite(head0, sizeof(head0), 1, fileHandle);
-        pCryPak->FWrite(YTable, sizeof(YTable), 1, fileHandle);
-        unsigned char ch = 1;
-        pCryPak->FWrite(&ch, sizeof(ch), fileHandle);
-        pCryPak->FWrite(UVTable, sizeof(UVTable), 1, fileHandle);
-        const unsigned char head1[] = { 0xFF, 0xC0, 0, 0x11, 8, aznumeric_caster(height >> 8), aznumeric_caster(height & 0xFF), aznumeric_caster(width >> 8), aznumeric_caster(width & 0xFF), 3, 1, 0x11, 0, 2, 0x11, 1, 3, 0x11, 1, 0xFF, 0xC4, 0x01, 0xA2, 0 };
-        pCryPak->FWrite(head1, sizeof(head1), 1, fileHandle);
-        pCryPak->FWrite(std_dc_luminance_nrcodes + 1, sizeof(std_dc_luminance_nrcodes) - 1, 1, fileHandle);
-        pCryPak->FWrite(std_dc_luminance_values, sizeof(std_dc_luminance_values), 1, fileHandle);
-        ch = 0x10;
-        pCryPak->FWrite(&ch, sizeof(ch), fileHandle); // HTYACinfo
-        pCryPak->FWrite(std_ac_luminance_nrcodes + 1, sizeof(std_ac_luminance_nrcodes) - 1, 1, fileHandle);
-        pCryPak->FWrite(std_ac_luminance_values, sizeof(std_ac_luminance_values), 1, fileHandle);
-        ch = 1;
-        pCryPak->FWrite(&ch, sizeof(ch), fileHandle); // HTUDCinfo
-        pCryPak->FWrite(std_dc_chrominance_nrcodes + 1, sizeof(std_dc_chrominance_nrcodes) - 1, 1, fileHandle);
-        pCryPak->FWrite(std_dc_chrominance_values, sizeof(std_dc_chrominance_values), 1, fileHandle);
-        ch = 0x11;
-        pCryPak->FWrite(&ch, sizeof(ch), fileHandle); // HTUACinfo
-        pCryPak->FWrite(std_ac_chrominance_nrcodes + 1, sizeof(std_ac_chrominance_nrcodes) - 1, 1, fileHandle);
-        pCryPak->FWrite(std_ac_chrominance_values, sizeof(std_ac_chrominance_values), 1, fileHandle);
-        static const unsigned char head2[] = { 0xFF, 0xDA, 0, 0xC, 3, 1, 0, 2, 0x11, 3, 0x11, 0, 0x3F, 0 };
-        pCryPak->FWrite(head2, sizeof(head2), 1, fileHandle);
-
-        joBufferedIO io;
-        io.fileHandle = fileHandle;
-        io.size = 0;
-
-        // Encode 8x8 macroblocks
-        const unsigned char* imageData = (const unsigned char*)data;
-        int DCY = 0, DCU = 0, DCV = 0;
-        int bitBuf = 0, bitCnt = 0;
-        int ofsG = comp > 1 ? 1 : 0, ofsB = comp > 1 ? 2 : 0;
-        for (int y = 0; y < height; y += 8)
-        {
-            for (int x = 0; x < width; x += 8)
-            {
-                float YDU[64], UDU[64], VDU[64];
-                for (int row = y, pos = 0; row < y + 8; ++row)
-                {
-                    for (int col = x; col < x + 8; ++col, ++pos)
-                    {
-                        int p = row * width * comp + col * comp;
-                        if (row >= height)
-                        {
-                            p -= width * comp * (row + 1 - height);
-                        }
-                        if (col >= width)
-                        {
-                            p -= comp * (col + 1 - width);
-                        }
-
-                        float r = imageData[p + 0], g = imageData[p + ofsG], b = imageData[p + ofsB];
-                        YDU[pos] = +0.29900f * r + 0.58700f * g + 0.11400f * b - 128;
-                        UDU[pos] = -0.16874f * r - 0.33126f * g + 0.50000f * b;
-                        VDU[pos] = +0.50000f * r - 0.41869f * g - 0.08131f * b;
-                    }
-                }
-
-                DCY = jo_processDU(&io, bitBuf, bitCnt, YDU, fdtbl_Y, DCY, YDC_HT, YAC_HT);
-                DCU = jo_processDU(&io, bitBuf, bitCnt, UDU, fdtbl_UV, DCU, UVDC_HT, UVAC_HT);
-                DCV = jo_processDU(&io, bitBuf, bitCnt, VDU, fdtbl_UV, DCV, UVDC_HT, UVAC_HT);
-            }
-        }
-
-        // Do the bit alignment of the EOI marker
-        static const unsigned short fillBits[] = {0x7F, 7};
-        jo_writeBits(&io, bitBuf, bitCnt, fillBits);
-        jo_flushBuffer(&io);
-
-        // EOI
-        ch = 0xFF;
-        pCryPak->FWrite(&ch, sizeof(ch), fileHandle);
-        ch = 0xD9;
-        pCryPak->FWrite(&ch, sizeof(ch), fileHandle);
-
-        pCryPak->FClose(fileHandle);
-        return true;
-    }
-} // namespace JpgImage
-
-
-//////////////////////////////////////////////////////////////////////////
-
-bool WriteJPG(const byte* dat, int wdt, int hgt, const char* name, int bpp, int nQuality)
-{
-#if defined(AZ_PLATFORMS_APPLE_IOS)
-    return false;
-#else
-    return JpgImage::jo_write_jpg(name, dat, wdt, hgt, bpp >> 3, nQuality);
-#endif
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Image/TgaImage.cpp b/Code/CryEngine/RenderDll/Common/Textures/Image/TgaImage.cpp
deleted file mode 100644
index 5e1f2f3c1f..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Image/TgaImage.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
-#include <AzFramework/Archive/IArchive.h>
-
-static AZ::IO::HandleType sFileHandle;
-
-namespace ImageUtils
-{
-    string OutputPath(const char* filename)
-    {
-        char resolvedPath[AZ_MAX_PATH_LEN];
-        if (!AZ::IO::FileIOBase::GetInstance()->ResolvePath(filename, resolvedPath, AZ_MAX_PATH_LEN))
-        {
-            return "";
-        }
-        string fullPath(resolvedPath);
-        return fullPath;
-    }
-}
-
-static void bwrite(unsigned char data)
-{
-    byte d[2];
-    d[0] = data;
-
-    gEnv->pCryPak->FWrite(d, 1, 1, sFileHandle);
-}
-
-void wwrite(unsigned short data)
-{
-    unsigned char h, l;
-
-    l = data & 0xFF;
-    h = data >> 8;
-    bwrite(l);
-    bwrite(h);
-}
-
-
-static void WritePixel(int depth, unsigned long a, unsigned long r, unsigned long g, unsigned long b)
-{
-    DWORD color16;
-
-    switch (depth)
-    {
-    case 32:
-        bwrite((byte)b);    // b
-        bwrite((byte)g);    // g
-        bwrite((byte)r);    // r
-        bwrite((byte)a);    // a
-        break;
-
-    case 24:
-        bwrite((byte)b);    // b
-        bwrite((byte)g);    // g
-        bwrite((byte)r);    // r
-        break;
-
-    case 16:
-        r >>= 3;
-        g >>= 3;
-        b >>= 3;
-
-        r &= 0x1F;
-        g &= 0x1F;
-        b &= 0x1F;
-
-        color16 = (r << 10) | (g << 5) | b;
-
-        wwrite((unsigned short)color16);
-        break;
-    }
-}
-
-static void GetPixel(const byte* data, int depth,  unsigned long& a, unsigned long& r, unsigned long& g, unsigned long& b)
-{
-    switch (depth)
-    {
-    case 32:
-        r = *data++;
-        g = *data++;
-        b = *data++;
-        a = *data++;
-        break;
-
-    case 24:
-        r = *data++;
-        g = *data++;
-        b = *data++;
-        a = 0xFF;
-        break;
-
-    default:
-        assert(0);
-        break;
-    }
-}
-
-bool WriteTGA(const byte* data, int width, int height, const char* filename, int src_bits_per_pixel, int dest_bits_per_pixel)
-{
-#if defined(AZ_PLATFORMS_APPLE_IOS) || defined(AZ_PLATFORM_LINUX)
-    return false;
-#else
-    int i;
-    unsigned long r, g, b, a;
-
-    if ((sFileHandle = gEnv->pCryPak->FOpen(filename, "wb")) == AZ::IO::InvalidHandle)
-    {
-        return false;
-    }
-
-    int id_length = 0;
-    int x_org = 0;
-    int y_org = 0;
-    int desc = 0x20; // origin is upper left
-
-    // 32 bpp
-
-    int cm_index = 0;
-    int cm_length = 0;
-    int cm_entry_size = 0;
-    int color_map_type = 0;
-
-    int type = 2;
-
-    bwrite(id_length);
-    bwrite(color_map_type);
-    bwrite(type);
-
-    wwrite(cm_index);
-    wwrite(cm_length);
-
-    bwrite(cm_entry_size);
-
-    wwrite(x_org);
-    wwrite(y_org);
-    wwrite((unsigned short)width);
-    wwrite((unsigned short)height);
-
-    bwrite(dest_bits_per_pixel);
-
-    bwrite(desc);
-
-    int hxw = height * width;
-
-
-
-    const DWORD* swap = 0;
-
-    UINT src_bytes_per_pixel = src_bits_per_pixel / 8;
-
-
-    if (src_bits_per_pixel == dest_bits_per_pixel)
-    {
-#if defined(NEED_ENDIAN_SWAP)
-        byte* d = new byte [hxw * 4];
-        memcpy(d, data, hxw * 4);
-        SwapEndian((uint32*)d, hxw);
-        gEnv->pCryPak->FWrite(d, hxw, src_bytes_per_pixel, sFileHandle);
-        SAFE_DELETE_ARRAY(d);
-#else
-        gEnv->pCryPak->FWrite(data, hxw, src_bytes_per_pixel, sFileHandle);
-#endif
-    }
-    else
-    {
-        for (i = 0; i < hxw; i++)
-        {
-            GetPixel(data, src_bits_per_pixel, a, b, g, r);
-            WritePixel(dest_bits_per_pixel, a, b, g, r);
-            data += src_bytes_per_pixel;
-        }
-    }
-
-    gEnv->pCryPak->FClose(sFileHandle);
-
-    SAFE_DELETE_ARRAY(swap);
-    return true;
-#endif
-}
-
diff --git a/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer.cpp b/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer.cpp
deleted file mode 100644
index 1650063f27..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer.cpp
+++ /dev/null
@@ -1,887 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "PlanningTextureStreamer.h"
-
-#include "TextureStreamPool.h"
-
-#ifndef CHK_RENDTH
-#define CHK_RENDTH assert(gRenDev->m_pRT->IsRenderThread())
-#endif
-
-CPlanningTextureStreamer::CPlanningTextureStreamer()
-    : m_state(S_Idle)
-    , m_nRTList(0)
-    , m_nJobList(1)
-    , m_nBias(0)
-    , m_nStreamAllocFails(0)
-    , m_bOverBudget(false)
-    , m_nPrevListSize(0)
-{
-    m_schedule.requestList.reserve(1024);
-    m_schedule.trimmableList.reserve(4096);
-    m_schedule.unlinkList.reserve(4096);
-    m_schedule.actionList.reserve(4096);
-
-#if defined(TEXSTRM_DEFER_UMR)
-    m_updateMipRequests[0].reserve(8192);
-    m_updateMipRequests[1].reserve(8192);
-#endif
-
-    memset(m_umrState.arrRoundIds, 0, sizeof(m_umrState.arrRoundIds));
-    memset(&m_sortState, 0, sizeof(m_sortState));
-}
-
-void CPlanningTextureStreamer::BeginUpdateSchedule()
-{
-    CryAutoLock<CryCriticalSection> lock(m_lock);
-
-    if (m_state != S_Idle)
-    {
-        return;
-    }
-
-    ITextureStreamer::BeginUpdateSchedule();
-
-    TStreamerTextureVec& textures = GetTextures();
-
-    IF_UNLIKELY (textures.empty())
-    {
-        return;
-    }
-
-    SPlanningSortState& sortInput = m_sortState;
-
-    sortInput.pTextures = &textures;
-    sortInput.nTextures = textures.size();
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_texturesstreamingSuppress)
-    {
-        m_state = S_QueuedForSync;
-        return;
-    }
-
-    std::swap(m_nJobList, m_nRTList);
-
-    SPlanningMemoryState ms = GetMemoryState();
-
-    // set up the limits
-    const SThreadInfo& ti = gRenDev->m_RP.m_TI[gRenDev->m_pRT->GetThreadList()];
-
-    SPlanningScheduleState& schedule = m_schedule;
-
-    schedule.requestList.resize(0);
-    schedule.trimmableList.resize(0);
-    schedule.unlinkList.resize(0);
-    schedule.actionList.resize(0);
-
-    sortInput.nStreamLimit = ms.nStreamLimit;
-    for (int z = 0; z < sizeof(sortInput.arrRoundIds) / sizeof(sortInput.arrRoundIds[0]); ++z)
-    {
-        sortInput.arrRoundIds[z] = ti.m_arrZonesRoundId[z] - CRenderer::CV_r_texturesstreamingPrecacheRounds;
-    }
-    sortInput.nFrameId = ti.m_nFrameUpdateID;
-    sortInput.nBias = m_nBias;
-
-#if defined(TEXSTRM_BYTECENTRIC_MEMORY)
-    if (CTexture::s_bPrestreamPhase)
-    {
-        sortInput.fpMinBias = 1 << 8;
-        sortInput.fpMaxBias = 1 << 8;
-    }
-    else
-#endif
-    {
-        sortInput.fpMinBias = -(8 << 8);
-        sortInput.fpMaxBias = 1 << 8;
-    }
-
-    sortInput.fpMinMip = GetMinStreamableMip() << 8;
-    sortInput.memState = ms;
-
-    sortInput.nBalancePoint = 0;
-    sortInput.nOnScreenPoint = 0;
-    sortInput.nPrecachedTexs = 0;
-    sortInput.nListSize = 0;
-
-    sortInput.pRequestList = &schedule.requestList;
-    sortInput.pTrimmableList = &schedule.trimmableList;
-    sortInput.pUnlinkList = &schedule.unlinkList;
-    sortInput.pActionList = &schedule.actionList;
-
-    SPlanningUMRState& umrState = m_umrState;
-    for (int i = 0; i < MAX_PREDICTION_ZONES; ++i)
-    {
-        umrState.arrRoundIds[i] = ti.m_arrZonesRoundId[i];
-    }
-
-    m_state = S_QueuedForUpdate;
-
-    if (CRenderer::CV_r_texturesstreamingJobUpdate)
-    {
-        StartUpdateJob();
-    }
-    else
-    {
-        Job_UpdateEntry();
-    }
-
-#if defined(TEXSTRM_DEFER_UMR)
-    m_updateMipRequests[m_nRTList].resize(0);
-#endif
-}
-
-void CPlanningTextureStreamer::ApplySchedule(EApplyScheduleFlags asf)
-{
-    CHK_RENDTH;
-
-    FUNCTION_PROFILER_RENDERER;
-
-    CryAutoLock<CryCriticalSection> lock(m_lock);
-
-    SyncWithJob_Locked();
-
-    SPlanningScheduleState& schedule = m_schedule;
-
-    switch (m_state)
-    {
-    case S_QueuedForSchedule:
-        break;
-
-    case S_QueuedForScheduleDiscard:
-        schedule.trimmableList.resize(0);
-        schedule.unlinkList.resize(0);
-        schedule.requestList.resize(0);
-        schedule.actionList.resize(0);
-        m_state = S_Idle;
-        break;
-
-    default:
-        ITextureStreamer::ApplySchedule(asf);
-        return;
-    }
-
-    TStreamerTextureVec& textures = GetTextures();
-    TStreamerTextureVec& trimmable = schedule.trimmableList;
-    TStreamerTextureVec& unlinkList = schedule.unlinkList;
-    TPlanningActionVec& actions = schedule.actionList;
-    TPlanningTextureReqVec& requested = schedule.requestList;
-
-    for (TPlanningActionVec::iterator it = actions.begin(), itEnd = actions.end(); it != itEnd; ++it)
-    {
-        CTexture* pTex = textures[it->nTexture];
-
-        switch (it->eAction)
-        {
-        case SPlanningAction::Abort:
-        {
-            if (pTex->IsStreaming())
-            {
-                STexStreamInState* pSIS = CTexture::s_StreamInTasks.GetPtrFromIdx(pTex->m_nStreamSlot & CTexture::StreamIdxMask);
-                pSIS->m_bAborted = true;
-            }
-        }
-        break;
-        }
-    }
-
-    ITextureStreamer::ApplySchedule(asf);
-
-    {
-        bool bOverflow = m_nStreamAllocFails > 0;
-        m_nStreamAllocFails = 0;
-
-        int nMaxItemsToFree = bOverflow ? 1000 : 2;
-        size_t nGCLimit = schedule.memState.nMemLimit;
-#if !defined(CONSOLE)
-        nGCLimit = static_cast<size_t>(static_cast<int64>(nGCLimit) * 120 / 100);
-#endif
-        size_t nPoolSize = CTexture::s_pPoolMgr->GetReservedSize();
-        CTexture::s_pPoolMgr->GarbageCollect(&nPoolSize, nGCLimit, nMaxItemsToFree);
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_texturesstreamingSuppress)
-    {
-#ifndef NULL_RENDERER
-        ptrdiff_t nMemFreeUpper = schedule.memState.nMemFreeUpper;
-        ptrdiff_t nMemFreeLower = schedule.memState.nMemFreeLower;
-        int nBalancePoint = schedule.nBalancePoint;
-
-        // Everything < nBalancePoint can only be trimmed (trimmable list), everything >= nBalancePoint can be kicked
-        // We should be able to load everything in the requested list
-
-        int nKickIdx = (int)textures.size() - 1;
-        int nNumSubmittedLoad = CTexture::s_nMipsSubmittedToStreaming;
-        size_t nAmtSubmittedLoad = CTexture::s_nBytesSubmittedToStreaming;
-
-        if (!requested.empty())
-        {
-            size_t nMaxRequestedBytes = CTexture::s_bPrestreamPhase
-                ? 1024 * 1024 * 1024
-                : (size_t)(CRenderer::CV_r_TexturesStreamingMaxRequestedMB * 1024.f * 1024.f);
-            int nMaxRequestedJobs = CTexture::s_bPrestreamPhase
-                ? CTexture::MaxStreamTasks
-                : CRenderer::CV_r_TexturesStreamingMaxRequestedJobs;
-
-            const int posponeThresholdKB = (CRenderer::CV_r_texturesstreamingPostponeMips && !CTexture::s_bStreamingFromHDD) ? (CRenderer::CV_r_texturesstreamingPostponeThresholdKB * 1024) : INT_MAX;
-            const int posponeThresholdMip = (CRenderer::CV_r_texturesstreamingPostponeMips) ? CRenderer::CV_r_texturesstreamingPostponeThresholdMip : 0;
-            const int nMinimumMip = max(posponeThresholdMip, (int)(CRenderer::CV_r_TexturesStreamingMipBias + gRenDev->m_fTexturesStreamingGlobalMipFactor));
-
-            if (gRenDev->m_nFlushAllPendingTextureStreamingJobs && nMaxRequestedBytes && nMaxRequestedJobs)
-            {
-                nMaxRequestedBytes = 1024 * 1024 * 1024;
-                nMaxRequestedJobs = 1024 * 1024;
-                --gRenDev->m_nFlushAllPendingTextureStreamingJobs;
-            }
-
-            bool bPreStreamPhase = CTexture::s_bPrestreamPhase;
-
-            IStreamEngine* pStreamEngine = gEnv->pSystem->GetStreamEngine();
-
-            pStreamEngine->BeginReadGroup();
-
-            for (
-                int nReqIdx = 0, nReqCount = (int)requested.size();
-                nReqIdx < nReqCount &&
-                CTexture::s_StreamInTasks.GetNumFree() > 0 &&
-                nNumSubmittedLoad < nMaxRequestedJobs &&
-                nAmtSubmittedLoad < nMaxRequestedBytes
-                ;
-                ++nReqIdx)
-            {
-                CTexture* pTex = requested[nReqIdx].first;
-                IF_UNLIKELY (!pTex->m_bStreamed)
-                {
-                    continue;
-                }
-
-                int nTexRequestedMip = requested[nReqIdx].second;
-
-                int nTexPersMip = pTex->m_nMips - pTex->m_CacheFileHeader.m_nMipsPersistent;
-                int nTexWantedMip = min(nTexRequestedMip, nTexPersMip);
-                int nTexAvailMip = pTex->m_nMinMipVidUploaded;
-
-                STexMipHeader* pMH = pTex->m_pFileTexMips->m_pMipHeader;
-                int nSides = (pTex->m_nFlags & FT_REPLICATE_TO_ALL_SIDES) ? 1 : pTex->m_CacheFileHeader.m_nSides;
-
-                if (!bPreStreamPhase)
-                {
-                    // Don't load top mips unless the top mip is the only mip we want
-                    const int nMipSizeLargest = pMH[nTexWantedMip].m_SideSize * nSides;
-                    if ((nMipSizeLargest >= posponeThresholdKB || posponeThresholdMip > nTexWantedMip) && nTexWantedMip < min(nTexPersMip, nTexAvailMip - 1))
-                    {
-                        ++nTexWantedMip;
-                    }
-                }
-                else
-                {
-                    if (nTexWantedMip == 0)
-                    {
-                        ++nTexWantedMip;
-                    }
-                }
-
-                if (nTexWantedMip < nTexAvailMip)
-                {
-                    if (!(pTex->CTexture::GetFlags() & FT_COMPOSITE))
-                    {
-                        if (!TryBegin_FromDisk(
-                                pTex, nTexPersMip, nTexWantedMip, nTexAvailMip, schedule.nBias, nBalancePoint,
-                                textures, trimmable, nMemFreeLower, nMemFreeUpper, nKickIdx,
-                                nNumSubmittedLoad, nAmtSubmittedLoad))
-                        {
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        if (!TryBegin_Composite(
-                                pTex, nTexPersMip, nTexWantedMip, nTexAvailMip, schedule.nBias, nBalancePoint,
-                                textures, trimmable, nMemFreeLower, nMemFreeUpper, nKickIdx,
-                                nNumSubmittedLoad, nAmtSubmittedLoad))
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            pStreamEngine->EndReadGroup();
-        }
-
-        CTexture::s_nStatsAllocFails = m_nStreamAllocFails;
-#endif
-    }
-    else
-    {
-        for (TStreamerTextureVec::iterator it = textures.begin(), itEnd = textures.end(); it != itEnd; ++it)
-        {
-            CTexture* pTex = *it;
-            if (!pTex->IsStreamingInProgress())
-            {
-                int nPersMip = pTex->GetNumMipsNonVirtual() - pTex->GetNumPersistentMips();
-                if (pTex->StreamGetLoadedMip() < nPersMip)
-                {
-                    pTex->StreamTrim(nPersMip);
-                }
-            }
-        }
-    }
-
-    for (TStreamerTextureVec::const_iterator it = unlinkList.begin(), itEnd = unlinkList.end(); it != itEnd; ++it)
-    {
-        CTexture* pTexture = *it;
-        Unlink(pTexture);
-    }
-
-    trimmable.resize(0);
-    unlinkList.resize(0);
-    requested.resize(0);
-    actions.resize(0);
-
-    m_state = S_Idle;
-}
-
-#ifndef NULL_RENDERER
-bool CPlanningTextureStreamer::TryBegin_FromDisk(CTexture* pTex, uint32 nTexPersMip, uint32 nTexWantedMip, uint32 nTexAvailMip, int nBias, int nBalancePoint,
-    TStreamerTextureVec& textures, TStreamerTextureVec& trimmable,
-    ptrdiff_t& nMemFreeLower, ptrdiff_t& nMemFreeUpper, int& nKickIdx,
-    int& nNumSubmittedLoad, size_t& nAmtSubmittedLoad)
-{
-    uint32 nTexActivateMip = clamp_tpl((uint32)pTex->GetRequiredMipNonVirtual(), nTexWantedMip, nTexPersMip);
-    int estp = CTexture::s_bStreamingFromHDD ? estpNormal : estpBelowNormal;
-
-    if (pTex->IsStreamHighPriority())
-    {
-        --estp;
-    }
-
-    if (nTexActivateMip < nTexAvailMip)
-    {
-        // Split stream tasks so that mips needed for the working set are loaded first, then additional
-        // mips for caching can be loaded next time around.
-        nTexWantedMip = max(nTexWantedMip, nTexActivateMip);
-    }
-
-    if (nTexWantedMip < nTexActivateMip)
-    {
-        // Caching additional mips - no need to request urgently.
-        ++estp;
-    }
-
-
-    ptrdiff_t nRequired = pTex->StreamComputeDevDataSize(nTexWantedMip) - pTex->StreamComputeDevDataSize(nTexAvailMip);
-
-    STexPoolItem* pNewPoolItem = NULL;
-
-    int nTexWantedMips = pTex->m_nMips - nTexWantedMip;
-
-#if defined(TEXSTRM_TEXTURECENTRIC_MEMORY)
-    // First, try and allocate an existing texture that we own - don't allow D3D textures to be made yet
-    pNewPoolItem = pTex->StreamGetPoolItem(nTexWantedMip, nTexWantedMips, false, false, false);
-
-    if (!pNewPoolItem)
-    {
-        STexPool* pPrioritisePool = pTex->StreamGetPool(nTexWantedMip, pTex->m_nMips - nTexWantedMip);
-
-        // That failed, so try and find a trimmable texture with the dimensions we want
-        if (TrimTexture(nBias, trimmable, pPrioritisePool))
-        {
-            // Found a trimmable texture that matched - now wait for the next update, when it should be done
-            return true;
-        }
-    }
-#endif
-
-    bool bShouldStopRequesting = false;
-
-    if (!pNewPoolItem && nRequired > nMemFreeUpper)
-    {
-        // Not enough room in the pool. Can we trim some existing textures?
-        ptrdiff_t nFreed = TrimTextures(nRequired - nMemFreeLower, nBias, trimmable);
-        nMemFreeLower += nFreed;
-        nMemFreeUpper += nFreed;
-
-        if (nRequired > nMemFreeUpper)
-        {
-            ptrdiff_t nKicked = KickTextures(&textures[0], nRequired - nMemFreeLower, nBalancePoint, nKickIdx);
-
-            nMemFreeLower += nKicked;
-            nMemFreeUpper += nKicked;
-        }
-    }
-    else
-    {
-        // The requested job may be for a force-stream-high-res texture that only has persistent mips.
-        // However texture kicking may have already evicted it to make room for another texture, and as such,
-        // streaming may now be in progress, even though it wasn't when the request was queued.
-        if (!pTex->IsStreaming())
-        {
-            // There should be room in the pool, so try and start streaming.
-
-            bool bRequestStreaming = true;
-
-            if (!pNewPoolItem)
-            {
-                pNewPoolItem = pTex->StreamGetPoolItem(nTexWantedMip, nTexWantedMips, false);
-            }
-
-            if (!pNewPoolItem)
-            {
-                bRequestStreaming = false;
-            }
-
-            if (bRequestStreaming)
-            {
-                if (CTexture::StartStreaming(pTex, pNewPoolItem, nTexWantedMip, nTexAvailMip - 1, nTexActivateMip, static_cast<EStreamTaskPriority>(estp)))
-                {
-                    nMemFreeUpper -= nRequired;
-                    nMemFreeLower -= nRequired;
-
-                    ++nNumSubmittedLoad;
-                    nAmtSubmittedLoad += nRequired;
-                }
-
-                // StartStreaming takes ownership
-                pNewPoolItem = NULL;
-            }
-            else
-            {
-                bShouldStopRequesting = true;
-            }
-        }
-    }
-
-    if (pNewPoolItem)
-    {
-        CTexture::s_pPoolMgr->ReleaseItem(pNewPoolItem);
-    }
-
-    if (bShouldStopRequesting)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool CPlanningTextureStreamer::TryBegin_Composite(CTexture* pTex, [[maybe_unused]] uint32 nTexPersMip, uint32 nTexWantedMip, uint32 nTexAvailMip, int nBias, int nBalancePoint,
-    TStreamerTextureVec& textures, TStreamerTextureVec& trimmable,
-    ptrdiff_t& nMemFreeLower, ptrdiff_t& nMemFreeUpper, int& nKickIdx,
-    [[maybe_unused]] int& nNumSubmittedLoad, [[maybe_unused]] size_t& nAmtSubmittedLoad)
-{
-
-    ptrdiff_t nRequired = pTex->StreamComputeDevDataSize(nTexWantedMip) - pTex->StreamComputeDevDataSize(nTexAvailMip);
-
-    // Test source textures, to ensure they're all ready.
-
-    DynArray<STexComposition>& composite = pTex->m_composition;
-
-    for (int i = 0, c = composite.size(); i != c; ++i)
-    {
-        const STexComposition& tc = composite[i];
-        CTexture* p = (CTexture*)&*tc.pTexture;
-        if (p->StreamGetLoadedMip() > nTexWantedMip)
-        {
-            // Source isn't ready yet. Try again later.
-            return true;
-        }
-    }
-
-    STexPoolItem* pNewPoolItem = NULL;
-
-    int nTexWantedMips = pTex->m_nMips - nTexWantedMip;
-
-#if defined(TEXSTRM_TEXTURECENTRIC_MEMORY)
-    // First, try and allocate an existing texture that we own - don't allow D3D textures to be made yet
-    pNewPoolItem = pTex->StreamGetPoolItem(nTexWantedMip, nTexWantedMips, false, false, false);
-
-    if (!pNewPoolItem)
-    {
-        STexPool* pPrioritisePool = pTex->StreamGetPool(nTexWantedMip, pTex->m_nMips - nTexWantedMip);
-
-        // That failed, so try and find a trimmable texture with the dimensions we want
-        if (TrimTexture(nBias, trimmable, pPrioritisePool))
-        {
-            // Found a trimmable texture that matched - now wait for the next update, when it should be done
-            return true;
-        }
-    }
-#endif
-
-    if (!pNewPoolItem && nRequired > nMemFreeUpper)
-    {
-        // Not enough room in the pool. Can we trim some existing textures?
-        ptrdiff_t nFreed = TrimTextures(nRequired - nMemFreeLower, nBias, trimmable);
-        nMemFreeLower += nFreed;
-        nMemFreeUpper += nFreed;
-
-        if (nRequired > nMemFreeUpper)
-        {
-            ptrdiff_t nKicked = KickTextures(&textures[0], nRequired - nMemFreeLower, nBalancePoint, nKickIdx);
-
-            nMemFreeLower += nKicked;
-            nMemFreeUpper += nKicked;
-        }
-    }
-    else if (!pTex->IsStreaming())
-    {
-        // Bake!
-
-        if (!pNewPoolItem)
-        {
-            pNewPoolItem = pTex->StreamGetPoolItem(nTexWantedMip, nTexWantedMips, false);
-        }
-
-        if (pNewPoolItem)
-        {
-            for (int i = 0, c = composite.size(); i != c; ++i)
-            {
-                const STexComposition& tc = composite[i];
-                CTexture* p = (CTexture*)&*tc.pTexture;
-                CDeviceTexture* pSrcDevTex = p->m_pDevTexture;
-                uint32 nSrcDevMips = p->GetNumMipsNonVirtual() - p->StreamGetLoadedMip();
-
-                CTexture::CopySliceChain(
-                    pNewPoolItem->m_pDevTexture, pNewPoolItem->m_pOwner->m_nMips, tc.nDstSlice, 0,
-                    pSrcDevTex, tc.nSrcSlice, nTexWantedMip - (pTex->m_nMips - nSrcDevMips), nSrcDevMips,
-                    pTex->m_nMips - nTexWantedMip);
-            }
-
-            // Commit!
-
-            pTex->StreamAssignPoolItem(pNewPoolItem, nTexWantedMip);
-            pNewPoolItem = NULL;
-        }
-    }
-
-    if (pNewPoolItem)
-    {
-        CTexture::s_pPoolMgr->ReleaseItem(pNewPoolItem);
-    }
-
-    return true;
-}
-#endif
-
-bool CPlanningTextureStreamer::BeginPrepare(CTexture* pTexture, const char* sFilename, uint32 nFlags)
-{
-    CryAutoLock<CryCriticalSection> lock(m_lock);
-
-    STexStreamPrepState** pState = CTexture::s_StreamPrepTasks.Allocate();
-    if (pState)
-    {
-        // Initialise prep state privately, in case any concurrent prep updates are running.
-        STexStreamPrepState* state = new STexStreamPrepState;
-        state->m_pTexture = pTexture;
-        state->m_pImage = CImageFile::mfStream_File(sFilename, nFlags, state);
-        if (state->m_pImage)
-        {
-            *const_cast<STexStreamPrepState* volatile*>(pState) = state;
-            return true;
-        }
-
-        delete state;
-
-        CTexture::s_StreamPrepTasks.Release(pState);
-    }
-
-    return false;
-}
-
-void CPlanningTextureStreamer::EndPrepare(STexStreamPrepState*& pState)
-{
-    CryAutoLock<CryCriticalSection> lock(m_lock);
-
-    delete pState;
-    pState = NULL;
-
-    CTexture::s_StreamPrepTasks.Release(&pState);
-}
-
-void CPlanningTextureStreamer::Precache(CTexture* pTexture)
-{
-    if (pTexture->IsForceStreamHighRes())
-    {
-        for (int i = 0; i < MAX_PREDICTION_ZONES; ++i)
-        {
-            pTexture->m_streamRounds[i].nRoundUpdateId = (1 << 29) - 1;
-            pTexture->m_pFileTexMips->m_arrSPInfo[i].fMinMipFactor = 0;
-        }
-        if (pTexture->IsUnloaded())
-        {
-            pTexture->StreamLoadFromCache(0);
-        }
-    }
-}
-
-void CPlanningTextureStreamer::UpdateMip(CTexture* pTexture, const float fMipFactor, const int nFlags, const int nUpdateId, [[maybe_unused]] const int nCounter)
-{
-    CHK_RENDTH;
-
-#if defined(TEXSTRM_DEFER_UMR)
-
-    SPlanningUpdateMipRequest req;
-    req.pTexture = pTexture;
-    req.fMipFactor = fMipFactor;
-    req.nFlags = nFlags;
-    req.nUpdateId = nUpdateId;
-
-    m_updateMipRequests[m_nRTList].push_back(req);
-
-#else
-
-    Job_UpdateMip(pTexture, fMipFactor, nFlags, nUpdateId);
-
-#endif
-}
-
-void CPlanningTextureStreamer::OnTextureDestroy(CTexture* pTexture)
-{
-    if (!pTexture->IsStreamed())
-    {
-        return;
-    }
-
-    CryAutoLock<CryCriticalSection> lock(m_lock);
-
-    SyncWithJob_Locked();
-
-    switch (m_state)
-    {
-    case S_Idle:
-    case S_QueuedForScheduleDiscard:
-        break;
-
-    case S_QueuedForSchedule:
-        m_state = S_QueuedForScheduleDiscard;
-        break;
-
-#ifndef _RELEASE
-    default:
-        __debugbreak();
-        break;
-#endif
-    }
-
-    // Remove the texture from the pending list of mip updates
-    using std::swap;
-
-#if defined(TEXSTRM_DEFER_UMR)
-    UpdateMipRequestVec& umrv = m_updateMipRequests[m_nRTList];
-    for (int i = 0, c = umrv.size(); i != c; )
-    {
-        SPlanningUpdateMipRequest& umr = umrv[i];
-        if (umr.pTexture == pTexture)
-        {
-            swap(umrv.back(), umr);
-            umrv.pop_back();
-            --c;
-        }
-        else
-        {
-            ++i;
-        }
-    }
-#endif
-}
-
-void CPlanningTextureStreamer::FlagOutOfMemory()
-{
-#if defined(TEXSTRM_BYTECENTRIC_MEMORY)
-    ++m_nStreamAllocFails;
-#endif
-}
-
-void CPlanningTextureStreamer::Flush()
-{
-}
-
-bool CPlanningTextureStreamer::IsOverflowing() const
-{
-    return m_bOverBudget;
-}
-
-SPlanningMemoryState CPlanningTextureStreamer::GetMemoryState()
-{
-    SPlanningMemoryState ms = {0};
-
-    ms.nMemStreamed = CTexture::s_nStatsStreamPoolInUseMem;
-
-    ms.nPhysicalLimit = (ptrdiff_t)CRenderer::GetTexturesStreamPoolSize() * 1024 * 1024;
-
-    ms.nMemLimit = (ptrdiff_t)((int64)ms.nPhysicalLimit * 95 / 100);
-    ms.nMemFreeSlack = (ptrdiff_t)((int64)ms.nPhysicalLimit * 5 / 100);
-
-    ms.nMemBoundStreamed = CTexture::s_nStatsStreamPoolBoundMem;
-    ms.nMemTemp = ms.nMemStreamed - ms.nMemBoundStreamed;
-    ms.nMemFreeLower = ms.nMemLimit - ms.nMemStreamed;
-    ms.nMemFreeUpper = (ms.nMemLimit + ms.nMemFreeSlack) - ms.nMemStreamed;
-    ms.nStreamLimit = ms.nMemLimit - CTexture::s_nStatsStreamPoolBoundPersMem;
-
-    ms.nStreamMid = static_cast<ptrdiff_t>(ms.nStreamLimit + ms.nMemFreeSlack / 2);
-    ms.nStreamDelta = static_cast<ptrdiff_t>(m_nPrevListSize) - ms.nStreamMid;
-
-    return ms;
-}
-
-void CPlanningTextureStreamer::SyncWithJob_Locked()
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    m_jobExecutor.WaitForCompletion();
-
-    if (m_state == S_QueuedForSync)
-    {
-        SPlanningSortState& state = m_sortState;
-        TStreamerTextureVec& textures = GetTextures();
-
-        // Commit iteration state
-
-        bool bOverBudget = state.nBalancePoint < state.nPrecachedTexs;
-        m_bOverBudget = bOverBudget;
-
-        m_nBias = state.nBias;
-        m_nPrevListSize = state.nListSize;
-
-        textures.resize(state.nTextures);
-
-#ifdef TEXSTRM_DEFER_UMR
-        SyncTextureList();
-#endif
-
-        m_state = S_QueuedForSchedule;
-    }
-}
-
-#if defined(TEXSTRM_TEXTURECENTRIC_MEMORY)
-bool CPlanningTextureStreamer::TrimTexture(int nBias, TStreamerTextureVec& trimmable, STexPool* pPrioritise)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    size_t nBestTrimmableIdx = 0;
-    int nMostMipsToTrim = 0;
-    int nBestTrimTargetMip = 0;
-
-    for (size_t i = 0, c = trimmable.size(); i != c; ++i)
-    {
-        CTexture* pTrimTex = trimmable[i];
-
-
-        if (pTrimTex->m_bStreamPrepared)
-        {
-            STexPool* pTrimItemPool = pTrimTex->GetStreamingInfo()->m_pPoolItem->m_pOwner;
-
-            if (pTrimItemPool == pPrioritise)
-            {
-                int nPersMip = bsel(pTrimTex->m_bForceStreamHighRes, 0, pTrimTex->m_nMips - pTrimTex->m_CacheFileHeader.m_nMipsPersistent);
-                int nTrimMip = pTrimTex->m_nMinMipVidUploaded;
-                int nTrimTargetMip = max(0, min((int)(pTrimTex->m_fpMinMipCur + nBias) >> 8, nPersMip));
-
-                int nTrimMips = nTrimTargetMip - nTrimMip;
-
-                if (nTrimMips > nMostMipsToTrim)
-                {
-                    nBestTrimmableIdx = i;
-                    nMostMipsToTrim = nTrimMips;
-                    nBestTrimTargetMip = nTrimTargetMip;
-                }
-            }
-        }
-    }
-
-    if (nMostMipsToTrim > 0)
-    {
-        CTexture* pTrimTex = trimmable[nBestTrimmableIdx];
-
-        if (pTrimTex->StreamTrim(nBestTrimTargetMip))
-        {
-            trimmable[nBestTrimmableIdx] = trimmable.back();
-            trimmable.pop_back();
-
-            return true;
-        }
-    }
-
-    return false;
-}
-#endif
-
-ptrdiff_t CPlanningTextureStreamer::TrimTextures(ptrdiff_t nRequired, int nBias, TStreamerTextureVec& trimmable)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    ptrdiff_t nTrimmed = 0;
-
-    int nTrimIdx = (int)trimmable.size();
-    for (; nTrimIdx > 0 && nTrimmed < nRequired; --nTrimIdx)
-    {
-        CTexture* pTrimTex = trimmable[nTrimIdx - 1];
-
-        if (!pTrimTex->IsUnloaded())
-        {
-            int nPersMip = bsel(pTrimTex->m_bForceStreamHighRes, 0, pTrimTex->m_nMips - pTrimTex->m_CacheFileHeader.m_nMipsPersistent);
-            int nTrimMip = pTrimTex->m_nMinMipVidUploaded;
-            int nTrimTargetMip = max(0, min((int)(pTrimTex->m_fpMinMipCur + nBias) >> 8, nPersMip));
-            ptrdiff_t nProfit = pTrimTex->StreamComputeDevDataSize(nTrimMip) - pTrimTex->StreamComputeDevDataSize(nTrimTargetMip);
-
-            if (pTrimTex->StreamTrim(nTrimTargetMip))
-            {
-                nTrimmed += nProfit;
-            }
-        }
-    }
-
-    trimmable.resize(nTrimIdx);
-
-    return nTrimmed;
-}
-
-ptrdiff_t CPlanningTextureStreamer::KickTextures(CTexture** pTextures, ptrdiff_t nRequired, int nBalancePoint, int& nKickIdx)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    ptrdiff_t nKicked = 0;
-
-    SThreadInfo& ti = gRenDev->m_RP.m_TI[gRenDev->m_pRT->GetThreadList()];
-    const int nCurrentFarZoneRoundId = ti.m_arrZonesRoundId[MAX_PREDICTION_ZONES - 1];
-    const int nCurrentNearZoneRoundId = ti.m_arrZonesRoundId[0];
-
-    // If we're still lacking space, begin kicking old textures
-    for (; nKicked < nRequired && nKickIdx >= nBalancePoint; --nKickIdx)
-    {
-        CTexture* pKillTex = pTextures[nKickIdx];
-
-        if (!pKillTex->IsUnloaded())
-        {
-            int nKillMip = pKillTex->m_nMinMipVidUploaded;
-            int nKillPersMip = bsel(pKillTex->m_bForceStreamHighRes, 0, pKillTex->m_nMips - pKillTex->m_CacheFileHeader.m_nMipsPersistent);
-
-            // unload textures that are older than 4 update cycles
-            if (nKillPersMip > nKillMip)
-            {
-
-                // How much is available?
-                ptrdiff_t nProfit = pKillTex->StreamComputeDevDataSize(nKillMip) - pKillTex->StreamComputeDevDataSize(nKillPersMip);
-
-                // Begin freeing.
-                pKillTex->StreamTrim(nKillPersMip);
-
-                nKicked += nProfit;
-            }
-        }
-    }
-
-    return nKicked;
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer.h b/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer.h
deleted file mode 100644
index 30a3d66c3e..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_PLANNINGTEXTURESTREAMER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_PLANNINGTEXTURESTREAMER_H
-#pragma once
-
-
-#include "ITextureStreamer.h"
-
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-//#define TEXSTRM_DEFER_UMR
-
-ILINE int bsel(bool c, int t, int f)
-{
-    PREFAST_SUPPRESS_WARNING(6323)
-    return isel(-(int)c, f, t);
-}
-
-struct SPlanningMemoryState
-{
-    ptrdiff_t nMemStreamed;
-    ptrdiff_t nStaticTexUsage;
-    ptrdiff_t nPhysicalLimit;
-    ptrdiff_t nTargetPhysicalLimit;
-    ptrdiff_t nMemLimit;
-    ptrdiff_t nMemFreeSlack;
-    ptrdiff_t nUnknownPoolUsage;
-    ptrdiff_t nMemBoundStreamed;
-    ptrdiff_t nMemBoundStreamedPers;
-    ptrdiff_t nMemTemp;
-    ptrdiff_t nMemFreeLower;
-    ptrdiff_t nMemFreeUpper;
-    ptrdiff_t nStreamLimit;
-    ptrdiff_t nStreamMid;
-    ptrdiff_t nStreamDelta;
-};
-
-struct SPlanningUMRState
-{
-    int32 arrRoundIds[MAX_PREDICTION_ZONES];
-};
-
-struct SPlanningAction
-{
-    enum
-    {
-        Unknown,
-        Relink,
-        Abort,
-    };
-
-    SPlanningAction()
-        : eAction(Unknown)
-    {
-    }
-
-    SPlanningAction(int action, size_t texture, uint8 mip = 0)
-        : nTexture((uint16)texture)
-        , nMip(mip)
-        , eAction((uint8)action)
-    {
-    }
-
-    uint16 nTexture;
-    uint8 nMip;
-    uint8 eAction;
-};
-
-typedef DynArray<std::pair<CTexture*, int> > TPlanningTextureReqVec;
-typedef DynArray<SPlanningAction> TPlanningActionVec;
-
-struct SPlanningSortState
-{
-    // In
-    TStreamerTextureVec* pTextures;
-    size_t nStreamLimit;
-    int32 arrRoundIds[MAX_PREDICTION_ZONES];
-    int nFrameId;
-    int nBias;
-    int fpMinBias;
-    int fpMaxBias;
-    int fpMinMip;
-    SPlanningMemoryState memState;
-
-    // In/Out
-    size_t nTextures;
-
-    // Out
-    size_t nBalancePoint;
-    size_t nOnScreenPoint;
-    size_t nPrecachedTexs;
-    size_t nListSize;
-    TPlanningTextureReqVec* pRequestList;
-    TStreamerTextureVec* pTrimmableList;
-    TStreamerTextureVec* pUnlinkList;
-    TPlanningActionVec* pActionList;
-};
-
-struct SPlanningScheduleState
-{
-    int nFrameId;
-
-    int nBias;
-    SPlanningMemoryState memState;
-
-    TPlanningTextureReqVec requestList;
-    TStreamerTextureVec trimmableList;
-    TStreamerTextureVec unlinkList;
-    TPlanningActionVec actionList;
-    size_t nBalancePoint;
-    size_t nOnScreenPoint;
-};
-
-struct SPlanningUpdateMipRequest
-{
-    CTexture* pTexture;
-    float fMipFactor;
-    int nFlags;
-    int nUpdateId;
-};
-
-struct SPlanningTextureOrderKey
-{
-    // 1 force stream high res
-    // 1 high priority
-    // 1 is visible
-    // 1 is in zone[0]
-    // 1 is in zone[1]
-    // 16 fp min mip cur, biased
-    CTexture* pTexture;
-    uint32 nKey;
-
-    uint16 nWidth;
-    uint16 nHeight;
-
-    uint8 nMips : 4;
-    uint8 nMipsPersistent : 4;
-    uint8 nCurMip;
-    uint8 nFormatCode;
-    uint8 eTF;
-
-    uint32 nPersistentSize : 31;
-    uint32 bIsStreaming : 1;
-
-    uint32 bUnloaded : 1;
-    uint32 nIsComposite : 1;
-    uint32 nStreamPrio : 3;
-    uint32 nSlicesMinus1 : 9;
-    uint32 nSlicesPotMinus1 : 9;
-
-    enum
-    {
-        InBudgetMask = 0xffffffff ^ ((1 << 30) | (1 << 29)),
-        OverBudgetMask = 0xffffffff,
-        PackedFpBias = 0x7f00
-    };
-
-    bool IsForceStreamHighRes() const { return (nKey & (1 << 31)) == 0; }
-    bool IsHighPriority() const { return (nKey & (1 << 30)) == 0; }
-    bool IsVisible() const { return (nKey & (1 << 29)) == 0; }
-    bool IsInZone(int z) const { return (nKey & (1 << (28 - z))) == 0; }
-    bool IsPrecached() const { return (nKey & ((1 << 31) | (1 << 28) | (1 << 27))) != ((1 << 31) | (1 << 28) | (1 << 27)); }
-    int GetFpMinMipCur() const { return static_cast<int16>(static_cast<int>(nKey & 0xffff) - PackedFpBias); }
-    uint16 GetFpMinMipCurBiased() const { return (uint16)nKey; }
-
-    SPlanningTextureOrderKey() {}
-    SPlanningTextureOrderKey(CTexture* pTex, int nFrameId, const int nZoneIds[])
-    {
-        nKey =
-            (pTex->IsForceStreamHighRes() ? 0 : (1 << 31)) |
-            (pTex->IsStreamHighPriority() ? 0 : (1 << 30)) |
-            (pTex->GetAccessFrameIdNonVirtual() >= nFrameId ? 0 : (1 << 29)) |
-            (pTex->GetStreamRoundInfo(0).nRoundUpdateId >= nZoneIds[0] ? 0 : (1 << 28)) |
-            (pTex->GetStreamRoundInfo(1).nRoundUpdateId >= nZoneIds[1] ? 0 : (1 << 27)) |
-            static_cast<uint16>(pTex->GetRequiredMipNonVirtualFP() + PackedFpBias);
-
-        pTexture = pTex;
-
-        nWidth = pTex->GetWidthNonVirtual();
-        nHeight = pTex->GetHeightNonVirtual();
-        nMips = pTex->GetNumMipsNonVirtual();
-        nMipsPersistent = bsel(pTex->IsForceStreamHighRes(), pTex->GetNumMipsNonVirtual(), pTex->GetNumPersistentMips());
-        nFormatCode = pTex->StreamGetFormatCode();
-
-        uint32 nSlices = pTex->StreamGetNumSlices();
-        nSlicesMinus1 = nSlices - 1;
-        nSlicesPotMinus1 = (1u << (32 - (nSlices > 1 ? countLeadingZeros32(nSlices - 1) : 32))) - 1;
-
-        nCurMip = pTex->StreamGetLoadedMip();
-        eTF = pTex->GetDstFormat();
-        nPersistentSize = pTex->GetPersistentSize();
-        bIsStreaming = pTex->IsStreaming();
-        bUnloaded = pTex->IsUnloaded();
-        nStreamPrio = pTex->StreamGetPriority();
-        nIsComposite = 0;
-    }
-};
-
-struct SPlanningRequestIdent
-{
-    SPlanningRequestIdent() {}
-    SPlanningRequestIdent(uint32 sortKey, int key, int mip)
-        : nSortKey(sortKey)
-        , nKey(key)
-        , nMip(mip)
-    {
-    }
-
-    uint32 nSortKey;
-    int nKey : 27;
-    int nMip : 5;
-};
-
-class CPlanningTextureStreamer
-    : public ITextureStreamer
-{
-public:
-    CPlanningTextureStreamer();
-
-public:
-    virtual void BeginUpdateSchedule();
-    virtual void ApplySchedule(EApplyScheduleFlags asf);
-
-    virtual bool BeginPrepare(CTexture* pTexture, const char* sFilename, uint32 nFlags);
-    virtual void EndPrepare(STexStreamPrepState*& pState);
-
-    virtual void Precache(CTexture* pTexture);
-    virtual void UpdateMip(CTexture* pTexture, const float fMipFactor, const int nFlags, const int nUpdateId, const int nCounter);
-
-    virtual void OnTextureDestroy(CTexture* pTexture);
-
-    virtual void FlagOutOfMemory();
-    virtual void Flush();
-
-    virtual bool IsOverflowing() const;
-    virtual float GetBias() const { return m_nBias / 256.0f; }
-
-public: // Job entry points - do not call directly!
-    void Job_UpdateEntry();
-
-private:
-    enum State
-    {
-        S_Idle,
-        S_QueuedForUpdate,
-        S_Updating,
-        S_QueuedForSync,
-        S_QueuedForSchedule,
-        S_QueuedForScheduleDiscard,
-    };
-
-    typedef DynArray<SPlanningUpdateMipRequest> UpdateMipRequestVec;
-
-private:
-    SPlanningMemoryState GetMemoryState();
-
-    void StartUpdateJob();
-
-    void Job_UpdateMip(CTexture* pTexture, const float fMipFactor, const int nFlags, const int nUpdateId);
-    void Job_Sort();
-    int Job_Bias(SPlanningSortState& sortState, SPlanningTextureOrderKey* pKeys, size_t nNumPrecachedTexs, size_t nStreamLimit);
-    size_t Job_Plan(SPlanningSortState& sortState, const SPlanningTextureOrderKey* pKeys, size_t nTextures, size_t nNumPrecachedTexs, size_t nBalancePoint, int nMinMip, int fpSortStateBias);
-    void Job_InitKeys(SPlanningTextureOrderKey* pKeys, CTexture** pTexs, size_t nTextures, int nFrameId, const int nZoneIds[]);
-    void Job_CommitKeys(CTexture** pTextures, SPlanningTextureOrderKey* pKeys, size_t nTextures);
-    void Job_ConfigureSchedule();
-    void SyncWithJob_Locked();
-
-private:
-#ifndef NULL_RENDERER
-    bool TryBegin_FromDisk(CTexture* pTex, uint32 nTexPersMip, uint32 nTexWantedMip, uint32 nTexAvailMip, int nBias, int nBalancePoint,
-        TStreamerTextureVec& textures, TStreamerTextureVec& trimmable, ptrdiff_t& nMemFreeLower, ptrdiff_t& nMemFreeUpper, int& nKickIdx,
-        int& nNumSubmittedLoad, size_t& nAmtSubmittedLoad);
-    bool TryBegin_Composite(CTexture* pTex, uint32 nTexPersMip, uint32 nTexWantedMip, uint32 nTexAvailMip, int nBias, int nBalancePoint,
-        TStreamerTextureVec& textures, TStreamerTextureVec& trimmable, ptrdiff_t& nMemFreeLower, ptrdiff_t& nMemFreeUpper, int& nKickIdx,
-        int& nNumSubmittedLoad, size_t& nAmtSubmittedLoad);
-#endif
-
-#if defined(TEXSTRM_TEXTURECENTRIC_MEMORY)
-    bool TrimTexture(int nBias, TStreamerTextureVec& trimmable, STexPool* pPrioritise);
-#endif
-    ptrdiff_t TrimTextures(ptrdiff_t nRequired, int nBias, TStreamerTextureVec& trimmable);
-    ptrdiff_t KickTextures(CTexture** pTextures, ptrdiff_t nRequired, int nBalancePoint, int& nKickIdx);
-    void Job_CheckEnqueueForStreaming(CTexture* pTexture, const float fMipFactor, bool bHighPriority);
-
-private:
-    CryCriticalSection m_lock;
-    std::vector<SPlanningTextureOrderKey> m_keys;
-    int m_nRTList;
-    int m_nJobList;
-
-    volatile State m_state;
-
-    AZ::LegacyJobExecutor m_jobExecutor;
-    SPlanningUMRState m_umrState;
-    SPlanningSortState m_sortState;
-
-#if defined(TEXSTRM_DEFER_UMR)
-    UpdateMipRequestVec m_updateMipRequests[2];
-#endif
-
-    SPlanningScheduleState m_schedule;
-
-    int m_nBias;
-    int m_nStreamAllocFails;
-    bool m_bOverBudget;
-    size_t m_nPrevListSize;
-};
-
-struct SPlanningTextureRequestOrder
-{
-    bool operator () (const SPlanningRequestIdent& a, const SPlanningRequestIdent& b) const
-    {
-        return a.nSortKey < b.nSortKey;
-    }
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_PLANNINGTEXTURESTREAMER_H
diff --git a/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer_Jobs.cpp b/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer_Jobs.cpp
deleted file mode 100644
index 40a229876d..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/PlanningTextureStreamer_Jobs.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "PlanningTextureStreamer.h"
-
-//#define PLAN_TEXSTRM_DEBUG
-
-static int GetTexReqStreamSizePreClamped(const SPlanningTextureOrderKey& key, int reqMip)
-{
-    int nTotalSize = 0;
-
-    uint8 nFormatCode = key.nFormatCode;
-    if (nFormatCode)
-    {
-        const SStreamFormatCode& code = CTexture::s_formatCodes[nFormatCode];
-
-        uint32 nCodeMip = reqMip + (SStreamFormatCode::MaxMips - key.nMips);
-        uint32 nSlices = key.nSlicesMinus1 + 1;
-        uint32 nPoTSlices = key.nSlicesPotMinus1 + 1;
-
-        uint32 n1SliceSize = code.sizes[nCodeMip].size;
-        uint32 nFormatSlices = isel(-(int)code.sizes[nCodeMip].alignSlices, nSlices, nPoTSlices);
-        nTotalSize = n1SliceSize * nFormatSlices;
-
-#if defined(PLAN_TEXSTRM_DEBUG) && defined(TEXSTRM_STORE_DEVSIZES)
-        int nTotalSizeTest = key.pTexture->StreamComputeDevDataSize(reqMip);
-
-        if (nTotalSizeTest != nTotalSize)
-        {
-            __debugbreak();
-        }
-#endif
-    }
-    else
-    {
-#if defined(TEXSTRM_STORE_DEVSIZES)
-        nTotalSize = key.pTexture->StreamComputeDevDataSize(reqMip);
-#else
-        nTotalSize = CDeviceTexture::TextureDataSize(
-            max(1, key.nWidth >> reqMip),
-            max(1, key.nHeight >> reqMip),
-            1,
-            key.nMips - reqMip,
-            key.nSlicesMinus1 + 1,
-            (ETEX_Format)key.eTF);
-#endif
-    }
-
-    return nTotalSize - key.nPersistentSize;
-}
-
-struct CTextureStreamSize
-{
-    CTextureStreamSize(int nMinMip, int nBias)
-        : m_nMinMip(nMinMip)
-        , m_nBias(nBias)
-    {
-    }
-
-    ptrdiff_t operator () (const SPlanningTextureOrderKey& key) const
-    {
-        int numMips = key.nMips;
-        int numPersMips = key.nMipsPersistent;
-        int persMip = numMips - numPersMips;
-        int reqMip = min(max(static_cast<int>(key.GetFpMinMipCur() + m_nBias) >> 8, m_nMinMip), persMip);
-        return GetTexReqStreamSizePreClamped(key, reqMip);
-    }
-
-    int m_nMinMip;
-    int m_nBias;
-};
-
-struct CTexturePrecachedPred
-{
-    bool operator () (const SPlanningTextureOrderKey& key) const
-    {
-        return key.IsPrecached();
-    }
-};
-
-struct CTextureOnScreenPred
-{
-    bool operator () (const SPlanningTextureOrderKey& key) const
-    {
-        return key.IsVisible();
-    }
-};
-
-struct SPlanningTextureOrder
-{
-    explicit SPlanningTextureOrder(uint32 nKeyMask)
-    {
-        m_nKeyMask = nKeyMask;
-    }
-
-    bool operator () (const SPlanningTextureOrderKey& a, const SPlanningTextureOrderKey& b) const
-    {
-        uint32 nMask = m_nKeyMask;
-        uint32 nAKeyMasked = a.nKey & nMask;
-        uint32 nBKeyMasked = b.nKey & nMask;
-        if (nAKeyMasked != nBKeyMasked)
-        {
-            return nAKeyMasked < nBKeyMasked;
-        }
-
-        return a.pTexture < b.pTexture;
-    }
-
-    uint32 m_nKeyMask;
-};
-
-template <typename T, typename Pred>
-static void QuickSelectMedianOf3(T* table, size_t a, size_t b, size_t c, const Pred& p)
-{
-    using std::swap;
-
-    if (p(table[b], table[a]))
-    {
-        swap(table[b], table[a]);
-    }
-    if (p(table[c], table[b]))
-    {
-        swap(table[c], table[b]);
-    }
-    if (p(table[b], table[a]))
-    {
-        swap(table[b], table[a]);
-    }
-}
-
-template <typename T, typename Pred>
-static void QuickSelectMedian(T* table, size_t a, size_t m, size_t b, const Pred& p)
-{
-    if ((b - a) >= 40)
-    {
-        size_t step = (b - a + 1) / 8;
-        QuickSelectMedianOf3(table, a, a + step, a + step * 2, p);
-        QuickSelectMedianOf3(table, m - step, m, m + step, p);
-        QuickSelectMedianOf3(table, b - step * 2, b - step, b, p);
-        QuickSelectMedianOf3(table, a + step, m, b - step, p);
-    }
-    else
-    {
-        QuickSelectMedianOf3(table, a, m, b, p);
-    }
-}
-
-template <typename T, typename LessFunc, typename SizeFunc>
-static T* QuickSelectSum(T* p, size_t mn, size_t mx, ptrdiff_t targetSum, const LessFunc& less, const SizeFunc& size)
-{
-    using std::swap;
-
-    size_t rangeMin = mn, rangeMax = mx;
-
-    do
-    {
-        size_t pivotIdx = rangeMin + (rangeMax - rangeMin) / 2;
-        QuickSelectMedian(p, rangeMin, pivotIdx, rangeMax - 1, less);
-
-        ptrdiff_t leftSum = 0;
-
-        // Move pivot out of the way, so it can be placed at the right location at the end
-        T pivotVal = p[pivotIdx];
-        swap(p[rangeMax - 1], p[pivotIdx]);
-
-        // - 1 to account for the moved pivot
-        size_t left = rangeMin, right = rangeMax - 1;
-        while (left < right)
-        {
-            // Advance left edge past all vals <= pivot
-            while (left < right && !less(pivotVal, p[left]))
-            {
-                leftSum += size(p[left]);
-                ++left;
-            }
-
-            // Advance right edge past all vals >= pivot
-            while (right > left && !less(p[right - 1], pivotVal))
-            {
-                --right;
-            }
-
-            if (right > left)
-            {
-                // Swap the conflicting values
-                swap(p[left], p[right - 1]);
-            }
-        }
-
-        // Put the pivot back
-        swap(p[rangeMax - 1], p[left]);
-
-        if (leftSum >= targetSum)
-        {
-            rangeMax = left;
-        }
-        else if (leftSum < targetSum)
-        {
-            rangeMin = right;
-            targetSum -= leftSum;
-        }
-
-        if (rangeMax - rangeMin <= 1)
-        {
-            // Handle the case where the leftSum is under budget (such as the pivot being at the far right edge of the range)
-            if (leftSum < targetSum)
-            {
-                ptrdiff_t pivotSize = size(p[left]);
-                if (leftSum + pivotSize <= targetSum)
-                {
-                    ++left;
-                }
-            }
-            return &p[left];
-        }
-    }
-    while (1);
-}
-
-void CPlanningTextureStreamer::Job_UpdateEntry()
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    m_state = S_Updating;
-
-#ifdef TEXSTRM_DEFER_UMR
-    uint32 nList = m_nJobList;
-    UpdateMipRequestVec& umrv = m_updateMipRequests[nList];
-
-    for (UpdateMipRequestVec::iterator it = umrv.begin(), itEnd = umrv.end(); it != itEnd; ++it)
-    {
-        Job_UpdateMip(it->pTexture, it->fMipFactor, it->nFlags, it->nUpdateId);
-    }
-#endif
-
-    Job_Sort();
-    Job_ConfigureSchedule();
-
-    m_state = S_QueuedForSync;
-}
-
-void CPlanningTextureStreamer::StartUpdateJob()
-{
-    m_jobExecutor.Reset();
-    m_jobExecutor.StartJob(
-        [this]()
-        {
-            this->Job_UpdateEntry();
-        }
-    );
-}
-
-void CPlanningTextureStreamer::Job_UpdateMip(CTexture* pTexture, const float fMipFactor, const int nFlags, const int nUpdateId)
-{
-    assert(fMipFactor >= 0.f);
-
-    const int nZoneId = (nFlags & FPR_SINGLE_FRAME_PRIORITY_UPDATE) ? 0 : 1;
-
-    STexStreamingInfo* pStrmInfo = pTexture->m_pFileTexMips;
-
-    if (pStrmInfo && fMipFactor < pStrmInfo->m_fMinMipFactor)
-    {
-        STexStreamZoneInfo& rZoneInfo = pStrmInfo->m_arrSPInfo[nZoneId];
-        STexStreamRoundInfo& rRoundInfo = pTexture->m_streamRounds[nZoneId];
-
-        const int nCurrentRoundUpdateId = m_umrState.arrRoundIds[nZoneId];
-
-        if (rRoundInfo.nRoundUpdateId != nUpdateId)
-        {
-            STATIC_CHECK(MAX_PREDICTION_ZONES == 2, THIS_CODE_IS_OPTIMISED_ASSUMING_THIS_EQUALS_2);
-
-            // reset mip factor and save the accumulated value into history and compute final mip factor
-            float fFinalMipFactor = fMipFactor;
-            int nRoundUpdateId = (int)rRoundInfo.nRoundUpdateId;
-            if (nRoundUpdateId >= 0 && (nRoundUpdateId > nCurrentRoundUpdateId - 2))
-            {
-                fFinalMipFactor = min(fFinalMipFactor, rZoneInfo.fMinMipFactor);
-            }
-
-            // if the min mip factor is at its default value, initialise the entire history with the new mip factor
-            rZoneInfo.fLastMinMipFactor = (float)fsel(rZoneInfo.fMinMipFactor - 1000000.0f, fMipFactor, rZoneInfo.fMinMipFactor);
-            rZoneInfo.fMinMipFactor = fMipFactor;
-
-            // reset the high prio flags
-            rRoundInfo.bLastHighPriority = rRoundInfo.bHighPriority;
-            rRoundInfo.bHighPriority = false;
-
-            // update round id
-            rRoundInfo.nRoundUpdateId = max(nUpdateId, nCurrentRoundUpdateId);
-
-            // consider the alternate zone mip factor as well
-            const int nOtherZoneId = nZoneId ^ 1;
-            const STexStreamZoneInfo& rOtherZoneInfo = pStrmInfo->m_arrSPInfo[nOtherZoneId];
-            const STexStreamRoundInfo& rOtherRoundInfo = pTexture->m_streamRounds[nOtherZoneId];
-            int nOtherRoundUpdateId = (int)rOtherRoundInfo.nRoundUpdateId;
-            if (nOtherRoundUpdateId >= 0 && (nOtherRoundUpdateId > m_umrState.arrRoundIds[nOtherZoneId] - 2))
-            {
-                fFinalMipFactor = min(fFinalMipFactor, rOtherZoneInfo.fLastMinMipFactor);
-            }
-
-            Job_CheckEnqueueForStreaming(pTexture, fFinalMipFactor, rRoundInfo.bLastHighPriority);
-        }
-
-        rZoneInfo.fMinMipFactor = min(rZoneInfo.fMinMipFactor, fMipFactor);
-        rRoundInfo.bHighPriority = (rRoundInfo.bHighPriority || nFlags & FPR_HIGHPRIORITY);
-
-#if !defined (_RELEASE)
-        CTexture::s_TextureUpdates += 1;
-#endif
-    }
-
-    // And source textures for composition
-    if (pTexture->CTexture::GetFlags() & FT_COMPOSITE)
-    {
-        DynArray<STexComposition>& composition = pTexture->m_composition;
-
-        for (int i = 0, c = composition.size(); i != c; ++i)
-        {
-            CTexture* pTexFrame = (CTexture*)&*composition[i].pTexture;
-
-            if (pTexFrame->IsStreamed())
-            {
-                Job_UpdateMip(pTexFrame, fMipFactor, nFlags, nUpdateId);
-            }
-        }
-    }
-}
-
-int CPlanningTextureStreamer::Job_Bias(SPlanningSortState& sortState, SPlanningTextureOrderKey* pKeys, size_t nNumPrecachedTexs, size_t nStreamLimit)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    int fpSortStateBias = sortState.nBias;
-    const int fpSortStateMinBias = sortState.fpMinBias;
-    const int fpSortStateMaxBias = sortState.fpMaxBias;
-    const int fpSortStateMinMip = sortState.fpMinMip;
-
-    fpSortStateBias = clamp_tpl(fpSortStateBias, fpSortStateMinBias, fpSortStateMaxBias);
-
-    int fpMipBiasLow = fpSortStateMinBias;
-    int fpMipBiasHigh = max(fpSortStateMinBias, fpSortStateMaxBias);
-
-    const int nMaxBiasSteps = 8;
-
-    for (int nBiasStep = 0; nBiasStep < nMaxBiasSteps && (fpMipBiasHigh - fpMipBiasLow) > 1; ++nBiasStep)
-    {
-        int nMipBiasTest = (fpMipBiasLow + fpMipBiasHigh) / 2;
-
-        size_t nBiasedListStreamSize = 0;
-        for (size_t texIdx = 0, texCount = nNumPrecachedTexs; texIdx != texCount && nBiasedListStreamSize < nStreamLimit; ++texIdx)
-        {
-            const SPlanningTextureOrderKey& key = pKeys[texIdx];
-
-            int nMips = key.nMips;
-            int fpReqMip = max(fpSortStateMinMip, key.GetFpMinMipCur() + nMipBiasTest);
-            int nReqMip = min(fpReqMip >> 8, nMips - 1);
-
-            nBiasedListStreamSize += GetTexReqStreamSizePreClamped(key, nReqMip);
-        }
-
-        if (nBiasedListStreamSize < nStreamLimit)
-        {
-            fpMipBiasHigh = nMipBiasTest;
-        }
-        else
-        {
-            fpMipBiasLow = nMipBiasTest;
-        }
-    }
-
-    int nProspBias = (fpMipBiasLow + fpMipBiasHigh) / 2;
-    if (abs(fpSortStateBias - nProspBias) > 8)
-    {
-        fpSortStateBias = nProspBias;
-    }
-
-    return fpSortStateBias;
-}
-
-size_t CPlanningTextureStreamer::Job_Plan(SPlanningSortState& sortState, const SPlanningTextureOrderKey* pKeys, size_t nTextures, size_t nNumPrecachedTexs, size_t nBalancePoint, int nMinMip, int fpSortStateBias)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    COMPILE_TIME_ASSERT(MAX_PREDICTION_ZONES == 2);
-
-    size_t nListSize = 0;
-
-    enum
-    {
-        MaxRequests = 16384
-    };
-    SPlanningRequestIdent requests[MaxRequests];
-    size_t nRequests = 0;
-
-    for (size_t texIdx = 0, texCount = nBalancePoint; texIdx != texCount; ++texIdx)
-    {
-        const SPlanningTextureOrderKey& key = pKeys[texIdx];
-
-        int nMips = key.nMips;
-        int cachedMip = key.nCurMip;
-        int persMip = nMips - key.nMipsPersistent;
-        int cacheMip;
-
-        if (texIdx < nNumPrecachedTexs)
-        {
-            int16 fpMinMipCur = key.GetFpMinMipCur();
-
-            cacheMip = max((int)(fpMinMipCur + fpSortStateBias) >> 8, nMinMip);
-            cacheMip = min(cacheMip, persMip);
-        }
-        else
-        {
-            cacheMip = persMip;
-        }
-
-        int cacheMipSize = GetTexReqStreamSizePreClamped(key, cacheMip);
-
-        nListSize += cacheMipSize;
-
-        if (!key.bIsStreaming)
-        {
-            if (cacheMip > cachedMip)
-            {
-                sortState.pTrimmableList->push_back(key.pTexture);
-            }
-            else if (cachedMip > cacheMip)
-            {
-                if (nRequests < MaxRequests)
-                {
-                    bool bOnlyNeedsTopMip = cacheMip == 0 && cachedMip == 1;
-
-                    uint32 nSortKey =
-                        (!key.nIsComposite << 31)
-                        | ((int)(cachedMip < (max(0, key.GetFpMinMipCur()) >> 8)) << 30)
-                        | ((int)!key.IsHighPriority() << 29)
-                        | ((int)bOnlyNeedsTopMip << 28)
-                        | ((int)!key.IsVisible() << 27)
-                        | ((int)(7 - key.nStreamPrio) << 19)
-                        | ((int)!key.IsInZone(0) << 18)
-                        | ((int)!key.IsInZone(1) << 17)
-                        | (key.GetFpMinMipCurBiased() << 1)
-                    ;
-
-                    requests[nRequests++] = SPlanningRequestIdent(nSortKey, (int)texIdx, cacheMip);
-                }
-            }
-        }
-        else
-        {
-            uint32 nStreamSlot = key.pTexture->m_nStreamSlot;
-            if (!(nStreamSlot & (CTexture::StreamOutMask | CTexture::StreamPrepMask)))
-            {
-                STexStreamInState* pStreamInState = CTexture::s_StreamInTasks.GetPtrFromIdx(nStreamSlot & CTexture::StreamIdxMask);
-                if (cacheMip > pStreamInState->m_nLowerUploadedMip)
-                {
-                    sortState.pActionList->push_back(SPlanningAction(SPlanningAction::Abort, texIdx));
-                }
-            }
-        }
-    }
-
-    for (size_t texIdx = nBalancePoint, texCount = nTextures; texIdx != texCount; ++texIdx)
-    {
-        assert(nBalancePoint < nTextures);
-        PREFAST_ASSUME(nBalancePoint < nTextures);
-        const SPlanningTextureOrderKey& key = pKeys[texIdx];
-
-        int cachedMip = key.nCurMip;
-        int nMips = key.nMips;
-        int persMip = nMips - key.nMipsPersistent;
-        int16 fpMinMipCur = key.GetFpMinMipCur();
-        int cacheMip = texIdx < nNumPrecachedTexs
-            ? max((int)(fpMinMipCur + fpSortStateBias) >> 8, nMinMip)
-            : persMip;
-
-        cacheMip = min(cacheMip, persMip);
-
-        int cacheMipSize = GetTexReqStreamSizePreClamped(key, cacheMip);
-
-        nListSize += cacheMipSize;
-
-        if (!key.bIsStreaming && !key.bUnloaded)
-        {
-            if (cacheMip > cachedMip)
-            {
-                sortState.pTrimmableList->push_back(key.pTexture);
-            }
-            else if (cachedMip > persMip)
-            {
-                if (nRequests < MaxRequests)    // Persistent mips should always be present - needed in case stream unload occurred
-                {
-                    uint32 nSortKey =
-                        (!key.nIsComposite << 31)
-                        | ((int)(cachedMip < (max(0, key.GetFpMinMipCur()) >> 8)) << 30)
-                        | ((int)!key.IsHighPriority() << 29)
-                        | ((int)!key.IsVisible() << 27)
-                        | ((int)(7 - key.nStreamPrio) << 19)
-                        | ((int)!key.IsInZone(0) << 18)
-                        | ((int)!key.IsInZone(1) << 17)
-                        | (key.GetFpMinMipCurBiased() << 1)
-                    ;
-
-                    requests[nRequests++] = SPlanningRequestIdent(nSortKey, (int)texIdx, persMip);
-                }
-            }
-            else if (!key.IsPrecached() && cachedMip == persMip)
-            {
-                sortState.pUnlinkList->push_back(key.pTexture);
-            }
-        }
-    }
-
-    if (nRequests > 0)
-    {
-        // TODO - only sort the part of the list that can actually be submitted this update
-        SPlanningTextureRequestOrder sort_op;
-        std::sort(&requests[0], &requests[nRequests], sort_op);
-
-        for (size_t iRequest = 0; iRequest < nRequests; ++iRequest)
-        {
-            int nRequestMip = requests[iRequest].nMip;
-            sortState.pRequestList->push_back(std::make_pair(pKeys[requests[iRequest].nKey].pTexture, nRequestMip));
-        }
-    }
-
-    return nListSize;
-}
-
-void CPlanningTextureStreamer::Job_Sort()
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    SPlanningSortState& sortState = m_sortState;
-
-    CTexture** pTextures = &(*sortState.pTextures)[0];
-    size_t nTextures = sortState.nTextures;
-
-    int nMinMip = sortState.fpMinMip >> 8;
-
-    size_t const nStreamLimit = sortState.nStreamLimit;
-
-    m_keys.resize(nTextures);
-    SPlanningTextureOrderKey* pKeys = &m_keys[0];
-
-    int const nFrameId = sortState.nFrameId;
-    int const nZoneIds[] = { sortState.arrRoundIds[0], sortState.arrRoundIds[1] };
-    Job_InitKeys(pKeys, pTextures, nTextures, nFrameId - 8, nZoneIds);
-
-    SPlanningTextureOrderKey* pLastPrecachedKey = std::partition(pKeys, pKeys + nTextures, CTexturePrecachedPred());
-    size_t nNumPrecachedTexs = std::distance(pKeys, pLastPrecachedKey);
-
-    int fpSortStateBias = Job_Bias(sortState, pKeys, nNumPrecachedTexs, nStreamLimit);
-
-
-    SPlanningTextureOrderKey* pBalanceKey = pKeys + nNumPrecachedTexs;
-    if (fpSortStateBias >= 0 && nNumPrecachedTexs > 0)
-    {
-        SPlanningTextureOrder order(SPlanningTextureOrderKey::OverBudgetMask);
-        pBalanceKey = QuickSelectSum(pKeys, 0, nNumPrecachedTexs, nStreamLimit, order, CTextureStreamSize(nMinMip, fpSortStateBias));
-    }
-
-    size_t nBalancePoint = std::distance(pKeys, pBalanceKey);
-
-
-
-    SPlanningTextureOrderKey* pFirstOffScreenKey = std::partition(pKeys, pKeys + nBalancePoint, CTextureOnScreenPred());
-    size_t nOnScreenPoint = std::distance(pKeys, pFirstOffScreenKey);
-
-
-    size_t nListSize = Job_Plan(sortState, pKeys, nTextures, nNumPrecachedTexs, nBalancePoint, nMinMip, fpSortStateBias);
-
-
-    Job_CommitKeys(pTextures, pKeys, nTextures);
-
-    sortState.nListSize = nListSize;
-    sortState.nBalancePoint = nBalancePoint;
-    sortState.nOnScreenPoint = nOnScreenPoint;
-    sortState.nPrecachedTexs = nNumPrecachedTexs;
-    sortState.nBias = fpSortStateBias;
-}
-
-void CPlanningTextureStreamer::Job_InitKeys(SPlanningTextureOrderKey* pKeys, CTexture** pTexs, size_t nTextures, int nFrameId, const int nZoneIds[])
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    for (size_t i = 0; i < nTextures; ++i)
-    {
-#if PLANNINGTEXTURESTREAMER_JOBS_CPP_TRAIT_JOB_INITKEYS_PREFETCH
-        if ((i + 32) < nTextures)
-        {
-            _mm_prefetch((char*)(pTexs[i + 32]) + 0x40, 0);
-        }
-#endif
-        new (&pKeys[i])SPlanningTextureOrderKey(pTexs[i], nFrameId, nZoneIds);
-    }
-}
-
-void CPlanningTextureStreamer::Job_CommitKeys(CTexture** pTextures, SPlanningTextureOrderKey* pKeys, size_t nTextures)
-{
-    for (size_t i = 0; i < nTextures; ++i)
-    {
-        pTextures[i] = pKeys[i].pTexture;
-    }
-}
-
-void CPlanningTextureStreamer::Job_CheckEnqueueForStreaming(CTexture* pTexture, const float fMipFactor, bool bHighPriority)
-{
-
-    // calculate the new lod value
-    int fpMipIdSigned = pTexture->StreamCalculateMipsSignedFP(fMipFactor);
-    const int fpNewMip = max(0, fpMipIdSigned);
-    const int nNewMip = fpNewMip >> 8;
-    const int nMipIdSigned = fpMipIdSigned >> 8;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_TexturesStreamingDebug == 2)
-    {
-        iLog->Log("Updating mips: %s - Current: %i, Desired: %i", pTexture->m_SrcName.c_str(), pTexture->GetRequiredMipNonVirtual(), nNewMip);
-    }
-
-#if defined(ENABLE_TEXTURE_STREAM_LISTENER)
-    if (pTexture->GetRequiredMipNonVirtual() != nNewMip)
-    {
-        ITextureStreamListener* pListener = CTexture::s_pStreamListener;
-        if (pListener)
-        {
-            pListener->OnTextureWantsMip(pTexture, min(nNewMip, (int)pTexture->m_nMips));
-        }
-    }
-#endif
-
-    // update required mip for streaming
-    pTexture->m_fpMinMipCur = fpMipIdSigned;
-
-    // update high priority flag
-    pTexture->m_bStreamHighPriority |= bHighPriority ? 1 : 0;
-
-#if defined(TEXSTRM_DEFER_UMR)
-    __debugbreak();
-#else
-    pTexture->Relink();
-#endif
-}
-
-void CPlanningTextureStreamer::Job_ConfigureSchedule()
-{
-    SPlanningScheduleState& schedule = m_schedule;
-    SPlanningSortState& sortState = m_sortState;
-
-    schedule.nFrameId = sortState.nFrameId;
-    schedule.nBias = sortState.nBias;
-    schedule.memState = sortState.memState;
-    schedule.nBalancePoint = sortState.nBalancePoint;
-    schedule.nOnScreenPoint = sortState.nOnScreenPoint;
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.cpp b/Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.cpp
deleted file mode 100644
index 5dbffb30a5..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "PowerOf2BlockPacker.h"
-
-CPowerOf2BlockPacker::CPowerOf2BlockPacker(const uint32 dwLogWidth, const uint32 dwLogHeight)
-{
-    m_dwWidth = 1 << dwLogWidth;
-    m_dwHeight = 1 << dwLogHeight;
-
-    m_nUsedBlocks = 0;
-    m_pTexture = NULL;
-
-    m_BlockBitmap.resize(m_dwWidth * m_dwHeight, 0xffffffff);
-}
-
-CPowerOf2BlockPacker::~CPowerOf2BlockPacker()
-{
-    //Clear();
-    FreeContainers();
-    SAFE_RELEASE(m_pTexture);
-}
-
-void CPowerOf2BlockPacker::Clear()
-{
-    std::fill(m_BlockBitmap.begin(), m_BlockBitmap.end(), 0xffffffff);
-    m_Blocks.clear();
-    m_nUsedBlocks = 0;
-}
-
-uint32 CPowerOf2BlockPacker::GetBlockInfo(const uint32 dwBlockID, uint32& dwMinX, uint32& dwMinY, uint32& dwMaxX, uint32& dwMaxY)
-{
-    uint32 dwSize = (uint32)m_Blocks.size();
-
-    if (dwBlockID >= dwSize)
-    {
-        return 0xFFFFFFFF;      // to avoid crash
-    }
-    SBlockMinMax& ref = m_Blocks[dwBlockID];
-
-    dwMinX = ref.m_dwMinX;
-    dwMinY = ref.m_dwMinY;
-    dwMaxX = ref.m_dwMaxX;
-    dwMaxY = ref.m_dwMaxY;
-
-    if (ref.IsFree())
-    {
-        return 0xFFFFFFFF;
-    }
-    else
-    {
-        return dwBlockID;
-    }
-}
-
-void CPowerOf2BlockPacker::UpdateSize(int nW, int nH)
-{
-    assert(m_nUsedBlocks == 0);
-
-    m_dwWidth = nW;
-    m_dwHeight = nH;
-
-    m_nUsedBlocks = 0;
-
-    m_BlockBitmap.resize(m_dwWidth * m_dwHeight, 0xffffffff);
-}
-
-void CPowerOf2BlockPacker::RemoveBlock(const uint32 dwBlockID)
-{
-    uint32 dwSize = (uint32)m_Blocks.size();
-
-    assert(dwBlockID < dwSize);
-    if (dwBlockID >= dwSize)
-    {
-        return;     // to avoid crash
-    }
-    SBlockMinMax& ref = m_Blocks[dwBlockID];
-
-    assert(!ref.IsFree());
-
-    FillRect(ref, 0xffffffff);
-    m_nUsedBlocks -= (ref.m_dwMaxX - ref.m_dwMinX) * (ref.m_dwMaxY - ref.m_dwMinY);
-
-    ref.MarkFree();
-}
-
-uint32 CPowerOf2BlockPacker::AddBlock(const uint32 dwLogWidth, const uint32 dwLogHeight)
-{
-    uint32 dwLocalWidth = 1 << dwLogWidth;
-    uint32 dwLocalHeight = 1 << dwLogHeight;
-
-    for (uint32 dwY = 0; dwY < m_dwHeight; dwY += dwLocalHeight)
-    {
-        for (uint32 dwX = 0; dwX < m_dwWidth; dwX += dwLocalWidth)
-        {
-            SBlockMinMax testblock;
-
-            testblock.m_dwMinX = dwX;
-            testblock.m_dwMaxX = dwX + dwLocalWidth;
-            testblock.m_dwMinY = dwY;
-            testblock.m_dwMaxY = dwY + dwLocalHeight;
-
-            if (IsFree(testblock))
-            {
-                uint32 dwBlockID = FindFreeBlockIDOrCreateNew();
-
-                m_Blocks[dwBlockID] = testblock;
-
-                FillRect(testblock, dwBlockID);
-
-                m_nUsedBlocks += dwLocalWidth * dwLocalHeight;
-
-                return dwBlockID;
-            }
-        }
-    }
-
-    return 0xffffffff;  // no space left to this block
-}
-
-
-
-void CPowerOf2BlockPacker::FillRect(const SBlockMinMax& rect, uint32 dwValue)
-{
-    for (uint32 dwY = rect.m_dwMinY; dwY < rect.m_dwMaxY; ++dwY)
-    {
-        for (uint32 dwX = rect.m_dwMinX; dwX < rect.m_dwMaxX; ++dwX)
-        {
-            m_BlockBitmap[dwX + dwY * m_dwWidth] = dwValue;
-        }
-    }
-}
-
-bool CPowerOf2BlockPacker::IsFree(const SBlockMinMax& rect)
-{
-    for (uint32 dwY = rect.m_dwMinY; dwY < rect.m_dwMaxY; ++dwY)
-    {
-        for (uint32 dwX = rect.m_dwMinX; dwX < rect.m_dwMaxX; ++dwX)
-        {
-            if (m_BlockBitmap.size() <= dwX + dwY * m_dwWidth || m_BlockBitmap[dwX + dwY * m_dwWidth] != 0xffffffff)
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-uint32 CPowerOf2BlockPacker::GetRandomBlock() const
-{
-    std::vector<SBlockMinMax>::const_iterator it, end = m_Blocks.end();
-
-    uint32 dwCnt = 0;
-
-    for (it = m_Blocks.begin(); it != end; ++it)
-    {
-        const SBlockMinMax& ref = *it;
-
-        if (!ref.IsFree())
-        {
-            dwCnt++;
-        }
-    }
-
-    if (dwCnt == 0)
-    {
-        return 0xffffffff;
-    }
-
-    uint32 dwI = 0;
-    uint32 dwRndI = 0;
-    uint32 dwRnd = cry_random(0U, dwCnt - 1);
-
-    for (it = m_Blocks.begin(); it != end; ++it, ++dwI)
-    {
-        const SBlockMinMax& ref = *it;
-
-        if (!ref.IsFree())
-        {
-            if (dwRndI == dwRnd)
-            {
-                return dwI;
-            }
-
-            ++dwRndI;
-        }
-    }
-
-    assert(0);
-    return 0xffffffff;
-}
-
-
-uint32 CPowerOf2BlockPacker::FindFreeBlockIDOrCreateNew()
-{
-    std::vector<SBlockMinMax>::const_iterator it, end = m_Blocks.end();
-    uint32 dwI = 0;
-
-    for (it = m_Blocks.begin(); it != end; ++it, ++dwI)
-    {
-        const SBlockMinMax& ref = *it;
-
-        if (ref.IsFree())
-        {
-            return dwI;
-        }
-    }
-
-    m_Blocks.push_back(SBlockMinMax());
-
-    return (uint32)m_Blocks.size() - 1;
-}
-
-void CPowerOf2BlockPacker::FreeContainers()
-{
-    Clear();
-    stl::free_container(m_Blocks);
-    stl::free_container(m_BlockBitmap);
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.h b/Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.h
deleted file mode 100644
index 7c43cb92e3..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_POWEROF2BLOCKPACKER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_POWEROF2BLOCKPACKER_H
-#pragma once
-
-
-#include <vector>                       // STL vector<>
-
-class CPowerOf2BlockPacker
-{
-public:
-    CTexture* m_pTexture;
-    float m_fLastUsed;
-
-public:
-    // constructor
-    // Arguments:
-    //   dwLogHeight - e.g. specify 5 for 32, keep is small like ~ 5 or 6, don't use pixel size
-    //   dwLogHeight - e.g. specify 5 for 32, keep is small like ~ 5 or 6, don't use pixel size
-    CPowerOf2BlockPacker(const uint32 dwLogWidth = 0, const uint32 dwLogHeight = 0);
-
-    ~CPowerOf2BlockPacker();
-
-    // Arguments:
-    //   dwLogHeight - e.g. specify 5 for 32
-    //   dwLogHeight - e.g. specify 5 for 32
-    // Returns:
-    //   dwBlockID (to remove later), 0xffffffff if there was no free space
-    uint32 AddBlock(const uint32 dwLogWidth, const uint32 dwLogHeight);
-
-    // Arguments:
-    //   dwBlockID - as it was returned from AddBlock()
-    uint32 GetBlockInfo(const uint32 dwBlockID, uint32& dwMinX, uint32& dwMinY, uint32& dwMaxX, uint32& dwMaxY);
-
-    void UpdateSize(int nW, int nH);
-
-    // Arguments:
-    //   dwBlockID - as it was returned from AddBlock()
-    void RemoveBlock(const uint32 dwBlockID);
-
-    // used for debugging
-    // Return
-    //   0xffffffff if not block was found
-    uint32 GetRandomBlock() const;
-
-    uint32 GetNumUsedBlocks() const
-    {
-        return m_nUsedBlocks;
-    }
-
-    void Clear();
-
-    void FreeContainers();
-
-private: // ----------------------------------------------------------
-
-    struct SBlockMinMax
-    {
-        uint32      m_dwMinX;       // 0xffffffff if free, included
-        uint32      m_dwMinY;       // not defined if free, included
-        uint32      m_dwMaxX;       // not defined if free, not included
-        uint32      m_dwMaxY;       // not defined if free, not included
-
-        bool IsFree() const
-        {
-            return m_dwMinX == 0xffffffff;
-        }
-
-        void MarkFree()
-        {
-            m_dwMinX = 0xffffffff;
-        }
-
-        ~SBlockMinMax()
-        {
-            MarkFree();
-        }
-    };
-
-    // -----------------------------------------------------------------
-
-    std::vector<SBlockMinMax>               m_Blocks;                       //
-    std::vector<uint32>                         m_BlockBitmap;          // [m_dwWidth*m_dwHeight], elements are 0xffffffff if not used
-    uint32                                                  m_dwWidth;                  // >0
-    uint32                                                  m_dwHeight;                 // >0
-    uint32                          m_nUsedBlocks;
-
-    // -----------------------------------------------------------------
-
-    //
-    void FillRect(const SBlockMinMax& rect, uint32 dwValue);
-
-    bool IsFree(const SBlockMinMax& rect);
-
-    //
-    uint32 FindFreeBlockIDOrCreateNew();
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_POWEROF2BLOCKPACKER_H
diff --git a/Code/CryEngine/RenderDll/Common/Textures/StereoTexture.cpp b/Code/CryEngine/RenderDll/Common/Textures/StereoTexture.cpp
deleted file mode 100644
index 78611fa552..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/StereoTexture.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-#include "StereoTexture.h"
-
-#include <AzCore/std/string/string.h>
-
-CStereoTexture::CStereoTexture(const char* szName, ETEX_Format format, int nFlags)
-    : CTexture(nFlags)
-{
-    AZStd::string leftName = szName;
-    AZStd::string rightName = szName;
-    leftName = leftName.append("_Left");
-    rightName = rightName.append("_Right");
-
-    //Create internal textures
-    m_textures = AZStd::vector<CTexture*>(STEREO_EYE_COUNT);
-
-    //Create textures with no width or height; 
-    //When the VideoPlaybackComponent creates those it can specify an accurate width & height
-    m_textures[STEREO_EYE_LEFT] = CTexture::CreateTextureObject(leftName.c_str(), 0, 0, 1, eTT_2D, nFlags, format);
-    m_textures[STEREO_EYE_RIGHT] = CTexture::CreateTextureObject(rightName.c_str(), 0, 0, 1, eTT_2D, nFlags, format);
-}
-
-void CStereoTexture::Apply(int nTUnit, int nState, int nTexMatSlot, int nSUnit, SResourceView::KeyType nResViewKey, EHWShaderClass eHWSC)
-{
-    int eye = gRenDev->m_CurRenderEye;
-    if (eye < STEREO_EYE_COUNT)
-    {
-        m_textures[eye]->Apply(nTUnit, nState, nTexMatSlot, nSUnit, nResViewKey, eHWSC);
-    }
-    else
-    {
-        AZ_Assert(true, "Invalid eye provided for rendering");
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/StereoTexture.h b/Code/CryEngine/RenderDll/Common/Textures/StereoTexture.h
deleted file mode 100644
index d41250108f..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/StereoTexture.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-/*
-    This stereo texture does two things:
-    1) Extends the base CTexture class in order to provide information about 
-       the actual underlying textures.
-    2) Stores two underlying CTextures and returns their IDs based on whether
-       the system is presenting to the left eye or the right eye.
-*/
-
-#include "Texture.h"
-#include "IStereoRenderer.h"
-#include "../Common/CommonRender.h"
-#include <AzCore/std/containers/vector.h>
-
-class CStereoTexture 
-    : public CTexture
-{
-public:
-    CStereoTexture(const char* szName, ETEX_Format format, int nFlags);
-    virtual ~CStereoTexture() = default;
-    
-    //Based on which eye the renderer currently wants to use this apply
-    //either the left texture or the right texture
-    void Apply(int nTUnit, int nState = -1, int nTexMatSlot = EFTT_UNKNOWN, int nSUnit = -1, SResourceView::KeyType nResViewKey = SResourceView::DefaultView, EHWShaderClass eHWSC = eHWSC_Pixel) override;
-    
-    AZStd::vector<CTexture*> m_textures;
-};
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Texture.cpp b/Code/CryEngine/RenderDll/Common/Textures/Texture.cpp
deleted file mode 100644
index e210df7769..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Texture.cpp
+++ /dev/null
@@ -1,3457 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Common texture manager implementation.
-
-
-#include "RenderDll_precompiled.h"
-#include <CryPath.h>
-#include <ImageExtensionHelper.h>
-#include "Image/CImage.h"
-#include "Image/DDSImage.h"
-#include "TextureManager.h"
-#include <IResourceManager.h>
-#include "I3DEngine.h"
-#include <Pak/CryPakUtils.h>
-#include "StringUtils.h"                                // stristr()
-#include "TextureManager.h"
-#include "TextureStreamPool.h"
-#include "TextureHelpers.h"
-#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
-#include "StereoTexture.h"
-#include <AzCore/Debug/AssetTracking.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define TEXTURE_CPP_SECTION_1 1
-#define TEXTURE_CPP_SECTION_2 2
-#define TEXTURE_CPP_SECTION_3 3
-#define TEXTURE_CPP_SECTION_4 4
-#define TEXTURE_CPP_SECTION_5 5
-#define TEXTURE_CPP_SECTION_6 6
-#define TEXTURE_CPP_SECTION_7 7
-#endif
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-#include "../../XRenderD3D9/DriverD3D.h" // for gcpRendD3D
-#endif
-
-#define TEXTURE_LEVEL_CACHE_PAK "dds0.pak"
-
-STexState CTexture::s_sDefState;
-STexStageInfo CTexture::s_TexStages[MAX_TMU];
-int CTexture::s_nStreamingMode;
-int CTexture::s_nStreamingUpdateMode;
-bool CTexture::s_bPrecachePhase;
-bool CTexture::s_bInLevelPhase = false;
-bool CTexture::s_bPrestreamPhase;
-int CTexture::s_nStreamingThroughput = 0;
-float CTexture::s_nStreamingTotalTime = 0;
-AZStd::vector<STexState, AZ::StdLegacyAllocator> CTexture::s_TexStates;
-CTextureStreamPoolMgr* CTexture::s_pPoolMgr;
-AZStd::set<string, AZStd::less<string>, AZ::StdLegacyAllocator> CTexture::s_vTexReloadRequests;
-CryCriticalSection CTexture::s_xTexReloadLock;
-#ifdef TEXTURE_GET_SYSTEM_COPY_SUPPORT
-StaticInstance<CTexture::LowResSystemCopyType> CTexture::s_LowResSystemCopy;
-#endif
-
-StaticInstance<AZStd::mutex> CTexture::m_staticInvalidateCallbacksMutex;
-
-bool CTexture::m_bLoadedSystem;
-
-CTexture* CTexture::s_ptexMipColors_Diffuse;
-CTexture* CTexture::s_ptexMipColors_Bump;
-CTexture* CTexture::s_ptexFromRE[8];
-CTexture* CTexture::s_ptexShadowID[8];
-CTexture* CTexture::s_ptexShadowMask;
-CTexture* CTexture::s_ptexCachedShadowMap[MAX_GSM_LODS_NUM];
-CTexture* CTexture::s_ptexNearestShadowMap;
-CTexture* CTexture::s_ptexHeightMapAO[2];
-CTexture* CTexture::s_ptexHeightMapAODepth[2];
-CTexture* CTexture::s_ptexFromRE_FromContainer[2];
-CTexture* CTexture::s_ptexFromObj;
-CTexture* CTexture::s_ptexSvoTree;
-CTexture* CTexture::s_ptexSvoTris;
-CTexture* CTexture::s_ptexSvoGlobalCM;
-CTexture* CTexture::s_ptexSvoRgbs;
-CTexture* CTexture::s_ptexSvoNorm;
-CTexture* CTexture::s_ptexSvoOpac;
-CTexture* CTexture::s_ptexFromObjCM;
-CTexture* CTexture::s_ptexRT_2D;
-CTexture* CTexture::s_ptexSceneNormalsMap;
-CTexture* CTexture::s_ptexSceneNormalsMapMS;
-CTexture* CTexture::s_ptexSceneNormalsBent;
-CTexture* CTexture::s_ptexAOColorBleed;
-CTexture* CTexture::s_ptexSceneDiffuse;
-CTexture* CTexture::s_ptexSceneSpecular;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(Texture_cpp)
-#endif
-CTexture* CTexture::s_ptexAmbientLookup;
-
-// Post-process related textures
-CTexture* CTexture::s_ptexBackBuffer;
-CTexture* CTexture::s_ptexModelHudBuffer;
-CTexture* CTexture::s_ptexPrevBackBuffer[2][2] = {
-    {NULL}
-};
-CTexture* CTexture::s_ptexCached3DHud;
-CTexture* CTexture::s_ptexCached3DHudScaled;
-CTexture* CTexture::s_ptexBackBufferScaled[3];
-CTexture* CTexture::s_ptexBackBufferScaledTemp[2];
-CTexture* CTexture::s_ptexPrevFrameScaled;
-
-CTexture* CTexture::s_ptexDepthBufferQuarter;
-
-CTexture* CTexture::s_ptexWaterOcean;
-CTexture* CTexture::s_ptexWaterVolumeTemp;
-CTexture* CTexture::s_ptexWaterVolumeDDN;
-CTexture* CTexture::s_ptexWaterVolumeRefl[2];
-CTexture* CTexture::s_ptexWaterCaustics[2];
-CTexture* CTexture::s_ptexWaterRipplesDDN;
-CTexture* CTexture::s_ptexRainOcclusion;
-CTexture* CTexture::s_ptexRainSSOcclusion[2];
-
-CTexture* CTexture::s_ptexRainDropsRT[2];
-
-CTexture* CTexture::s_ptexRT_ShadowPool;
-CTexture* CTexture::s_ptexRT_ShadowStub;
-CTexture* CTexture::s_ptexCloudsLM;
-
-CTexture* CTexture::s_ptexSceneTarget = NULL;
-CTexture* CTexture::s_ptexSceneTargetR11G11B10F[2] = {NULL};
-CTexture* CTexture::s_ptexSceneTargetScaledR11G11B10F[4] = {NULL};
-CTexture* CTexture::s_ptexCurrSceneTarget;
-CTexture* CTexture::s_ptexCurrentSceneDiffuseAccMap;
-CTexture* CTexture::s_ptexSceneDiffuseAccMap;
-CTexture* CTexture::s_ptexSceneSpecularAccMap;
-CTexture* CTexture::s_ptexSceneDiffuseAccMapMS;
-CTexture* CTexture::s_ptexSceneSpecularAccMapMS;
-CTexture* CTexture::s_ptexZTarget;
-CTexture* CTexture::s_ptexZTargetDownSample[4];
-CTexture* CTexture::s_ptexZTargetScaled;
-CTexture* CTexture::s_ptexZTargetScaled2;
-CTexture* CTexture::s_ptexHDRTarget;
-CTexture* CTexture::s_ptexVelocity;
-CTexture* CTexture::s_ptexVelocityTiles[3] = {NULL};
-CTexture* CTexture::s_ptexVelocityObjects[2] = {NULL};
-
-CTexture* CTexture::s_ptexFurZTarget;
-CTexture* CTexture::s_ptexFurLightAcc;
-CTexture* CTexture::s_ptexFurPrepass;
-
-// Confetti Begin: David Srour
-CTexture* CTexture::s_ptexGmemStenLinDepth = NULL;
-// Confetti End
-CTexture* CTexture::s_ptexHDRTargetPrev = NULL;
-CTexture* CTexture::s_ptexHDRTargetScaled[4];
-CTexture* CTexture::s_ptexHDRTargetScaledTmp[4];
-CTexture* CTexture::s_ptexHDRTargetScaledTempRT[4];
-CTexture* CTexture::s_ptexHDRDofLayers[2];
-
-CTexture* CTexture::s_ptexSceneCoCHistory[2] = {};
-CTexture* CTexture::s_ptexSceneCoC[MIN_DOF_COC_K] = {};
-CTexture* CTexture::s_ptexSceneCoCTemp = NULL;
-CTexture* CTexture::s_ptexHDRTempBloom[2];
-CTexture* CTexture::s_ptexHDRFinalBloom;
-CTexture* CTexture::s_ptexHDRAdaptedLuminanceCur[8];
-int CTexture::s_nCurLumTextureIndex;
-CTexture* CTexture::s_ptexCurLumTexture;
-CTexture* CTexture::s_ptexHDRToneMaps[NUM_HDR_TONEMAP_TEXTURES];
-CTexture* CTexture::s_ptexHDRMeasuredLuminance[MAX_GPU_NUM];
-CTexture* CTexture::s_ptexHDRMeasuredLuminanceDummy;
-CTexture* CTexture::s_ptexSkyDomeMie;
-CTexture* CTexture::s_ptexSkyDomeRayleigh;
-CTexture* CTexture::s_ptexSkyDomeMoon;
-CTexture* CTexture::s_ptexVolObj_Density;
-CTexture* CTexture::s_ptexVolObj_Shadow;
-CTexture* CTexture::s_ptexColorChart;
-CTexture* CTexture::s_ptexSceneTargetScaled;
-CTexture* CTexture::s_ptexSceneTargetScaledBlurred;
-CTexture* CTexture::s_ptexStereoL = NULL;
-CTexture* CTexture::s_ptexStereoR = NULL;
-
-CTexture* CTexture::s_ptexFlaresOcclusionRing[MAX_OCCLUSION_READBACK_TEXTURES] = {NULL};
-CTexture* CTexture::s_ptexFlaresGather = NULL;
-
-SEnvTexture CTexture::s_EnvCMaps[MAX_ENVCUBEMAPS];
-SEnvTexture CTexture::s_EnvTexts[MAX_ENVTEXTURES];
-
-StaticInstance<TArray<SEnvTexture>> CTexture::s_CustomRT_2D;
-
-StaticInstance<TArray<CTexture>> CTexture::s_ShaderTemplates(EFTT_MAX);
-bool CTexture::s_ShaderTemplatesInitialized = false;
-
-CTexture* CTexture::s_pTexNULL = 0;
-
-CTexture* CTexture::s_pBackBuffer;
-CTexture* CTexture::s_FrontBufferTextures[2] = { NULL };
-
-CTexture* CTexture::s_ptexVolumetricFog = NULL;
-CTexture* CTexture::s_ptexVolumetricFogDensityColor = NULL;
-CTexture* CTexture::s_ptexVolumetricFogDensity = NULL;
-CTexture* CTexture::s_ptexVolumetricClipVolumeStencil = NULL;
-
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-ID3D11DeviceContext* CTexture::s_pStreamDeferredCtx;
-#endif
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-CTexture* CTexture::s_ptexVolFogShadowBuf[2] = {0};
-#endif
-
-CTexture* CTexture::s_defaultEnvironmentProbeDummy = nullptr;
-
-ETEX_Format CTexture::s_eTFZ = eTF_R32F;
-
-//============================================================
-
-SResourceView SResourceView::ShaderResourceView(ETEX_Format nFormat, int nFirstSlice, int nSliceCount, int nMostDetailedMip, int nMipCount, bool bSrgbRead, bool bMultisample)
-{
-    SResourceView result(0);
-
-    result.m_Desc.eViewType = eShaderResourceView;
-    result.m_Desc.nFormat = nFormat;
-    result.m_Desc.nFirstSlice = nFirstSlice;
-    result.m_Desc.nSliceCount = nSliceCount;
-    result.m_Desc.nMostDetailedMip = nMostDetailedMip;
-    result.m_Desc.nMipCount = nMipCount;
-    result.m_Desc.bSrgbRead = bSrgbRead ? 1 : 0;
-    result.m_Desc.bMultisample = bMultisample ? 1 : 0;
-
-    return result;
-}
-
-SResourceView SResourceView::RenderTargetView(ETEX_Format nFormat, int nFirstSlice, int nSliceCount, int nMipLevel, bool bMultisample)
-{
-    SResourceView result(0);
-
-    result.m_Desc.eViewType = eRenderTargetView;
-    result.m_Desc.nFormat = nFormat;
-    result.m_Desc.nFirstSlice = nFirstSlice;
-    result.m_Desc.nSliceCount = nSliceCount;
-    result.m_Desc.nMostDetailedMip = nMipLevel;
-    result.m_Desc.bMultisample = bMultisample ? 1 : 0;
-
-    return result;
-}
-
-SResourceView SResourceView::DepthStencilView(ETEX_Format nFormat, int nFirstSlice, int nSliceCount, int nMipLevel, int nFlags, bool bMultisample)
-{
-    SResourceView result(0);
-
-    result.m_Desc.eViewType = eDepthStencilView;
-    result.m_Desc.nFormat = nFormat;
-    result.m_Desc.nFirstSlice = nFirstSlice;
-    result.m_Desc.nSliceCount = nSliceCount;
-    result.m_Desc.nMostDetailedMip = nMipLevel;
-    result.m_Desc.nFlags = nFlags;
-    result.m_Desc.bMultisample = bMultisample ? 1 : 0;
-
-    return result;
-}
-
-SResourceView SResourceView::UnorderedAccessView(ETEX_Format nFormat, int nFirstSlice, int nSliceCount, int nMipLevel, int nFlags)
-{
-    SResourceView result(0);
-
-    result.m_Desc.eViewType = eUnorderedAccessView;
-    result.m_Desc.nFormat = nFormat;
-    result.m_Desc.nFirstSlice = nFirstSlice;
-    result.m_Desc.nSliceCount = nSliceCount;
-    result.m_Desc.nMostDetailedMip = nMipLevel;
-    result.m_Desc.nFlags = (nFlags & FT_USAGE_UAV_RWTEXTURE) ? 1 : 0;
-
-    return result;
-}
-
-//============================================================
-
-CTexture::~CTexture()
-{
-    // sizes of these structures should NOT exceed L2 cache line!
-    // offsetof with MSVC's crt and clang produces an error
-#if defined(PLATFORM_64BIT) && !(defined(AZ_PLATFORM_WINDOWS) && defined(AZ_COMPILER_CLANG))
-    COMPILE_TIME_ASSERT((offsetof(CTexture, m_composition) - offsetof(CTexture, m_pFileTexMips)) <= 64);
-    COMPILE_TIME_ASSERT((offsetof(CTexture, m_pFileTexMips) % 64) == 0);
-#endif
-
-#ifndef _RELEASE
-    if (!gRenDev->m_pRT->IsRenderThread() || gRenDev->m_pRT->IsRenderLoadingThread())
-    {
-        __debugbreak();
-    }
-#endif
-
-#ifndef _RELEASE
-    if (IsStreaming())
-    {
-        __debugbreak();
-    }
-#endif
-
-    if (gRenDev && gRenDev->m_pRT)
-    {
-        gRenDev->m_pRT->RC_ReleaseDeviceTexture(this);
-    }
-
-    if (m_pFileTexMips)
-    {
-        Unlink();
-        StreamState_ReleaseInfo(this, m_pFileTexMips);
-        m_pFileTexMips = NULL;
-    }
-
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-    if (s_pStreamListener)
-    {
-        s_pStreamListener->OnDestroyedStreamedTexture(this);
-    }
-#endif
-
-#ifndef _RELEASE
-    if (m_bInDistanceSortedList)
-    {
-        __debugbreak();
-    }
-#endif
-
-#ifdef TEXTURE_GET_SYSTEM_COPY_SUPPORT
-    s_LowResSystemCopy.erase(this);
-#endif
-
-#if defined(USE_UNIQUE_MUTEX_PER_TEXTURE)
-    if (gEnv->IsEditor())
-    {
-        // Only the editor allocated a unique mutex per texture.
-        delete m_invalidateCallbacksMutex;
-        m_invalidateCallbacksMutex = nullptr;
-    }
-#endif
-}
-
-void CTexture::RT_ReleaseDevice()
-{
-    ReleaseDeviceTexture(false);
-}
-
-const CCryNameTSCRC& CTexture::mfGetClassName()
-{
-    return s_sClassName;
-}
-
-CCryNameTSCRC CTexture::GenName(const char* name, uint32 nFlags)
-{
-    char buffer[AZ_MAX_PATH_LEN];
-    IResourceCompilerHelper::GetOutputFilename(name, buffer, sizeof(buffer));   // change texture filename extensions to dds before we compute the crc
-    stack_string strName = buffer;
-    strName.MakeLower();
-
-    //'\\' in texture names causing duplication
-    PathUtil::ToUnixPath(strName);
-
-    if (nFlags & FT_ALPHA)
-    {
-        strName += "_a";
-    }
-
-    return CCryNameTSCRC(strName.c_str());
-}
-
-class StrComp
-{
-public:
-    bool operator () (const char* s1, const char* s2) const {return strcmp(s1, s2) < 0; }
-};
-
-
-CTexture* CTexture::GetByID(int nID)
-{
-    CTexture* pTex = NULL;
-
-    const CCryNameTSCRC& className = mfGetClassName();
-    CBaseResource* pBR = CBaseResource::GetResource(className, nID, false);
-    if (!pBR)
-    {
-        return CTextureManager::Instance()->GetNoTexture();
-    }
-    pTex = (CTexture*)pBR;
-    return pTex;
-}
-
-CTexture* CTexture::GetByName(const char* szName, uint32 flags)
-{
-    CTexture* pTex = NULL;
-
-    CCryNameTSCRC Name = GenName(szName, flags);
-
-    CBaseResource* pBR = CBaseResource::GetResource(mfGetClassName(), Name, false);
-    if (!pBR)
-    {
-        return NULL;
-    }
-    pTex = (CTexture*)pBR;
-    return pTex;
-}
-
-CTexture* CTexture::GetByNameCRC(CCryNameTSCRC Name)
-{
-    CTexture* pTex = NULL;
-
-    CBaseResource* pBR = CBaseResource::GetResource(mfGetClassName(), Name, false);
-    if (!pBR)
-    {
-        return NULL;
-    }
-    pTex = (CTexture*)pBR;
-    return pTex;
-}
-
-CTexture* CTexture::NewTexture(const char* name, uint32 nFlags, ETEX_Format eTFDst, bool& bFound)
-{
-    AZ_ASSET_NAMED_SCOPE("CTexture::NewTexture: %s", name);
-
-    CTexture* pTex = NULL;
-    AZStd::string normalizedFile;
-    AZStd::string fileExtension;
-    AzFramework::StringFunc::Path::GetExtension(name, fileExtension);
-    if (name[0] == '$' || fileExtension.empty())
-    {
-        //If the name starts with $ or it does not have any extension then it is one of the special texture
-        // that the engine requires and we would not be modifying the name
-        normalizedFile = name;
-    }
-    else
-    {
-        char buffer[AZ_MAX_PATH_LEN];
-        IResourceCompilerHelper::GetOutputFilename(name, buffer, sizeof(buffer));   // change texture filename extensions to dds
-        normalizedFile = buffer;
-        AZStd::to_lower(normalizedFile.begin(), normalizedFile.end());
-        PathUtil::ToUnixPath(normalizedFile.c_str());
-    }
-
-    CCryNameTSCRC Name = GenName(normalizedFile.c_str(), nFlags);
-
-    CBaseResource* pBR = CBaseResource::GetResource(mfGetClassName(), Name, false);
-    if (!pBR)
-    {
-        //If a texture name ends in _stereo we want to create a stereo texture
-        const AZStd::string ending = "_stereo";
-        AZStd::string fullName = normalizedFile.c_str();
-        size_t nameLength = fullName.length();
-        size_t endingLength = ending.length();
-        if (nameLength > endingLength && fullName.compare(nameLength - endingLength, endingLength, ending) == 0)
-        {
-            pTex = new CStereoTexture(normalizedFile.c_str(), eTFDst, nFlags);
-        }
-        else
-        {
-            pTex = new CTexture(nFlags);
-        }
-        pTex->Register(mfGetClassName(), Name);
-        bFound = false;
-        pTex->m_nFlags = nFlags;
-        pTex->m_eTFDst = eTFDst;
-        pTex->m_SrcName = normalizedFile.c_str();
-    }
-    else
-    {
-        pTex = (CTexture*)pBR;
-        pTex->AddRef();
-        bFound = true;
-    }
-
-    return pTex;
-}
-
-void CTexture::SetDevTexture([[maybe_unused]] CDeviceTexture* pDeviceTex)
-{
-#if !defined(NULL_RENDERER)
-    SAFE_RELEASE(m_pDevTexture);
-    m_pDevTexture = pDeviceTex;
-    if (m_pDevTexture)
-    {
-        m_pDevTexture->SetNoDelete(!!(m_nFlags & FT_DONT_RELEASE));
-    }
-    InvalidateDeviceResource(eDeviceResourceDirty);
-#endif
-}
-
-void CTexture::PostCreate()
-{
-    m_nUpdateFrameID = gRenDev->GetFrameID(false);
-    m_bPostponed = false;
-}
-
-CTexture* CTexture::CreateTextureObject(const char* name, uint32 nWidth, uint32 nHeight, int nDepth, ETEX_Type eTT, uint32 nFlags, ETEX_Format eTF, int nCustomID)
-{
-    SYNCHRONOUS_LOADING_TICK();
-
-    bool bFound = false;
-
-    CTexture* pTex = NewTexture(name, nFlags, eTF, bFound);
-    if (bFound)
-    {
-        if (!pTex->m_nWidth)
-        {
-            pTex->m_nWidth = nWidth;
-        }
-        if (!pTex->m_nHeight)
-        {
-            pTex->m_nHeight = nHeight;
-        }
-        pTex->m_nFlags |= nFlags & (FT_DONT_RELEASE | FT_USAGE_RENDERTARGET);
-
-        return pTex;
-    }
-    pTex->m_nDepth = nDepth;
-    pTex->m_nWidth = nWidth;
-    pTex->m_nHeight = nHeight;
-    pTex->m_eTT = eTT;
-    pTex->m_eTFDst = eTF;
-    pTex->m_nCustomID = nCustomID;
-    pTex->m_SrcName = name;
-
-    return pTex;
-}
-
-void CTexture::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->Add(*this);
-    pSizer->AddObject(m_SrcName);
-
-#ifdef TEXTURE_GET_SYSTEM_COPY_SUPPORT
-    const LowResSystemCopyType::iterator& it = s_LowResSystemCopy.find(this);
-    if (it != CTexture::s_LowResSystemCopy.end())
-    {
-        pSizer->AddObject((*it).second.m_lowResSystemCopy);
-    }
-#endif
-
-    if (m_pFileTexMips)
-    {
-        m_pFileTexMips->GetMemoryUsage(pSizer, m_nMips, m_CacheFileHeader.m_nSides);
-    }
-}
-
-
-CTexture* CTexture::CreateTextureArray(const char* name, ETEX_Type eType, uint32 nWidth, uint32 nHeight, uint32 nArraySize, int nMips, uint32 nFlags, ETEX_Format eTF, int nCustomID)
-{
-    assert(eType == eTT_2D || eType == eTT_Cube);
-
-    if (nArraySize > 255)
-    {
-        assert(0);
-        return NULL;
-    }
-
-    if (nMips <= 0)
-    {
-        nMips = CTexture::CalcNumMips(nWidth, nHeight);
-    }
-
-    bool sRGB = (nFlags & FT_USAGE_ALLOWREADSRGB) != 0;
-    nFlags &= ~FT_USAGE_ALLOWREADSRGB;
-
-    CTexture* pTex = CreateTextureObject(name, nWidth, nHeight, 1, eType, nFlags, eTF, nCustomID);
-    pTex->m_nWidth = nWidth;
-    pTex->m_nHeight = nHeight;
-    pTex->m_nArraySize = nArraySize;
-    pTex->m_nFlags |= eType == eTT_Cube ? FT_REPLICATE_TO_ALL_SIDES : 0;
-
-    if (nFlags & FT_USAGE_RENDERTARGET)
-    {
-        bool bRes = pTex->CreateRenderTarget(eTF, Clr_Unknown);
-        if (!bRes)
-        {
-            pTex->m_nFlags |= FT_FAILED;
-        }
-        pTex->PostCreate();
-    }
-    else
-    {
-        STexData td;
-        td.m_eTF = eTF;
-        td.m_nDepth = 1;
-        td.m_nWidth = nWidth;
-        td.m_nHeight = nHeight;
-        td.m_nMips = nMips;
-        td.m_nFlags = sRGB ? FIM_SRGB_READ : 0;
-
-        bool bRes = pTex->CreateTexture(td);
-        if (!bRes)
-        {
-            pTex->m_nFlags |= FT_FAILED;
-        }
-        pTex->PostCreate();
-    }
-
-    pTex->m_nFlags &= ~FT_REPLICATE_TO_ALL_SIDES;
-
-    return pTex;
-}
-
-CTexture* CTexture::CreateRenderTarget(const char* name, uint32 nWidth, uint32 nHeight, const ColorF& cClear, ETEX_Type eTT, uint32 nFlags, ETEX_Format eTF, int nCustomID)
-{
-    AZ_ASSET_NAMED_SCOPE("CTexture::CreateRenderTarget: %s", name);
-
-    CTexture* pTex = CreateTextureObject(name, nWidth, nHeight, 1, eTT, nFlags | FT_USAGE_RENDERTARGET, eTF, nCustomID);
-    pTex->m_nWidth = nWidth;
-    pTex->m_nHeight = nHeight;
-    pTex->m_nFlags |= nFlags;
-
-    bool bRes = pTex->CreateRenderTarget(eTF, cClear);
-    if (!bRes)
-    {
-        pTex->m_nFlags |= FT_FAILED;
-    }
-    pTex->PostCreate();
-
-    return pTex;
-}
-
-// Create2DTextureWithMips is similar to Create2DTexture, but it also propagates the mip argument correctly.
-// The original Create2DTexture function force sets mips to 1.
-// This has been separated from Create2DTexture to ensure that we preserve backwards compatibility.
-bool CTexture::Create2DTextureWithMips(int nWidth, int nHeight, int nMips, [[maybe_unused]] int nFlags, const byte* pData, ETEX_Format eTFSrc, [[maybe_unused]] ETEX_Format eTFDst)
-{
-    if (nMips <= 0)
-    {
-        nMips = CTexture::CalcNumMips(nWidth, nHeight);
-    }
-    m_eTFSrc = eTFSrc;
-    m_nMips = nMips;
-
-    STexData td;
-    td.m_eTF = eTFSrc;
-    td.m_nDepth = 1;
-    td.m_nWidth = nWidth;
-    td.m_nHeight = nHeight;
-    // Propagate mips correctly.  (Create2DTexture always sets this to 1)
-    td.m_nMips = nMips; 
-    td.m_pData[0] = pData;
-
-    bool bRes = CreateTexture(td);
-    if (!bRes)
-    {
-        m_nFlags |= FT_FAILED;
-    }
-
-    PostCreate();
-
-    return bRes;
-}
-
-bool CTexture::Create2DTexture(int nWidth, int nHeight, int nMips, [[maybe_unused]] int nFlags, const byte* pData, ETEX_Format eTFSrc, [[maybe_unused]] ETEX_Format eTFDst)
-{
-    if (nMips <= 0)
-    {
-        nMips = CTexture::CalcNumMips(nWidth, nHeight);
-    }
-    m_eTFSrc = eTFSrc;
-    m_nMips = nMips;
-
-    STexData td;
-    td.m_eTF = eTFSrc;
-    td.m_nDepth = 1;
-    td.m_nWidth = nWidth;
-    td.m_nHeight = nHeight;
-    td.m_nMips = 1;
-    td.m_pData[0] = pData;
-
-    bool bRes = CreateTexture(td);
-    if (!bRes)
-    {
-        m_nFlags |= FT_FAILED;
-    }
-
-    PostCreate();
-
-    return bRes;
-}
-
-CTexture* CTexture::Create2DTexture(const char* szName, int nWidth, int nHeight, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst, bool bAsyncDevTexCreation)
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    CTexture* pTex = CreateTextureObject(szName, nWidth, nHeight, 1, eTT_2D, nFlags, eTFDst, -1);
-    pTex->m_bAsyncDevTexCreation = bAsyncDevTexCreation;
-
-    pTex->Create2DTexture(nWidth, nHeight, nMips, nFlags, pData, eTFSrc, eTFDst);
-
-    return pTex;
-}
-
-bool CTexture::Create3DTexture(int nWidth, int nHeight, int nDepth, int nMips, [[maybe_unused]] int nFlags, const byte* pData, ETEX_Format eTFSrc, [[maybe_unused]] ETEX_Format eTFDst)
-{
-    m_eTFSrc = eTFSrc;
-    m_nMips = nMips;
-
-    STexData td;
-    td.m_eTF = eTFSrc;
-    td.m_nWidth = nWidth;
-    td.m_nHeight = nHeight;
-    td.m_nDepth = nDepth;
-    td.m_nMips = nMips;
-    td.m_pData[0] = pData;
-
-    bool bRes = CreateTexture(td);
-    if (!bRes)
-    {
-        m_nFlags |= FT_FAILED;
-    }
-
-    PostCreate();
-
-    return bRes;
-}
-
-CTexture* CTexture::Create3DTexture(const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst)
-{
-    CTexture* pTex = CreateTextureObject(szName, nWidth, nHeight, nDepth, eTT_3D, nFlags, eTFDst, -1);
-
-    pTex->Create3DTexture(nWidth, nHeight, nDepth, nMips, nFlags, pData, eTFSrc, eTFDst);
-
-    return pTex;
-}
-
-CTexture* CTexture::Create2DCompositeTexture(const char* szName, int nWidth, int nHeight, int nMips, int nFlags, ETEX_Format eTFDst, const STexComposition* pCompositions, size_t nCompositions)
-{
-    nFlags |= FT_COMPOSITE;
-    nFlags &= ~FT_DONT_STREAM;
-
-    bool bFound = false;
-    CTexture* pTex = NewTexture(szName, nFlags, eTFDst, bFound);
-
-    if (!bFound)
-    {
-        pTex->m_nWidth = nWidth;
-        pTex->m_nHeight = nHeight;
-        pTex->m_nMips = nMips;
-        pTex->m_composition.assign(pCompositions, pCompositions + nCompositions);
-
-        // Strip all invalid textures from the composition
-
-        int w = 0;
-        for (int r = 0, c = pTex->m_composition.size(); r != c; ++r)
-        {
-            if (!pTex->m_composition[r].pTexture)
-            {
-                CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Composition %i for '%s' is missing", r, szName);
-                continue;
-            }
-
-            if (r != w)
-            {
-                pTex->m_composition[w] = pTex->m_composition[r];
-            }
-            ++w;
-        }
-        pTex->m_composition.resize(w);
-
-        if (CTexture::s_bPrecachePhase)
-        {
-            pTex->m_bPostponed = true;
-            pTex->m_bWasUnloaded = true;
-        }
-        else
-        {
-            pTex->StreamPrepareComposition();
-        }
-    }
-
-    return pTex;
-}
-
-bool CTexture::Reload()
-{
-    const byte* pData[6];
-    int i;
-    bool bOK = false;
-
-    if (IsStreamed())
-    {
-        ReleaseDeviceTexture(false);
-        return ToggleStreaming(true);
-    }
-
-    for (i = 0; i < 6; i++)
-    {
-        pData[i] = 0;
-    }
-    if (m_nFlags & FT_FROMIMAGE)
-    {
-        assert(!(m_nFlags & FT_USAGE_RENDERTARGET));
-        bOK = LoadFromImage(m_SrcName.c_str()); // true=reloading
-        if (!bOK)
-        {
-            SetNoTexture(m_eTT == eTT_Cube ? CTextureManager::Instance()->GetNoTextureCM() : CTextureManager::Instance()->GetNoTexture() );
-        }
-    }
-    else
-    if (m_nFlags & (FT_USAGE_RENDERTARGET | FT_USAGE_DYNAMIC))
-    {
-        bOK = CreateDeviceTexture(pData);
-        assert(bOK);
-    }
-
-    // Post Create assumes the texture loaded successfully so don't call it if that's not the case
-    if (bOK)
-    {
-        PostCreate();
-    }
-
-    return bOK;
-}
-
-CTexture* CTexture::ForName(const char* name, uint32 nFlags, ETEX_Format eTFDst)
-{
-    SLICE_AND_SLEEP();
-    AZ_ASSET_NAMED_SCOPE("CTexture::ForName: %s", name);
-
-    bool bFound = false;
-
-    CRY_DEFINE_ASSET_SCOPE("Texture", name);
-
-    CTexture* pTex = NewTexture(name, nFlags, eTFDst, bFound);
-    if (bFound || name[0] == '$')
-    {
-        if (!bFound)
-        {
-            pTex->m_SrcName = name;
-        }
-        else
-        {
-            // switch off streaming for the same texture with the same flags except DONT_STREAM
-            if ((nFlags & FT_DONT_STREAM) != 0 && (pTex->GetFlags() & FT_DONT_STREAM) == 0)
-            {
-                if (!pTex->m_bPostponed)
-                {
-                    pTex->ReleaseDeviceTexture(false);
-                }
-                pTex->m_nFlags |= FT_DONT_STREAM;
-                if (!pTex->m_bPostponed)
-                {
-                    pTex->Reload();
-                }
-            }
-        }
-
-        return pTex;
-    }
-    pTex->m_SrcName = name;
-
-#ifndef _RELEASE
-    pTex->m_sAssetScopeName = gEnv->pLog->GetAssetScopeString();
-#endif
-    bool bPrecachePhase = CTexture::s_bPrecachePhase && !(nFlags & FT_IGNORE_PRECACHE);
-
-    ESystemGlobalState currentGlobalState = GetISystem()->GetSystemGlobalState();
-    const bool levelLoading = currentGlobalState == ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START;
-
-    // Load textures immediately during level load since texture load
-    // requests during this phase are probably coming from a loading screen.
-    if (levelLoading || !bPrecachePhase)
-    {
-        pTex->Load(eTFDst);
-    }
-    else
-    {
-        // NOTE: attached alpha isn't detectable by flags before the header is loaded, so we do it by file-suffix
-        if (/*(nFlags & FT_TEX_NORMAL_MAP) &&*/ TextureHelpers::VerifyTexSuffix(EFTT_NORMALS, name) && TextureHelpers::VerifyTexSuffix(EFTT_SMOOTHNESS, name))
-        {
-            nFlags |= FT_HAS_ATTACHED_ALPHA;
-        }
-
-        pTex->m_eTFDst = eTFDst;
-        pTex->m_nFlags = nFlags;
-        pTex->m_bPostponed = true;
-        pTex->m_bWasUnloaded = true;
-    }
-
-    return pTex;
-}
-
-struct CompareTextures
-{
-    bool operator()(const CTexture* a, const CTexture* b)
-    {
-        return (azstricmp(a->GetSourceName(), b->GetSourceName()) < 0);
-    }
-};
-
-void CTexture::Precache()
-{
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-
-    if (!s_bPrecachePhase)
-    {
-        return;
-    }
-    if (!gRenDev)
-    {
-        return;
-    }
-
-    CryLog("Requesting textures precache ...");
-
-    gRenDev->m_pRT->RC_PreloadTextures();
-}
-
-void CTexture::RT_Precache()
-{
-    if (gRenDev->CheckDeviceLost())
-    {
-        return;
-    }
-
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-    AZ_TRACE_METHOD();
-
-    // Disable invalid file access logging if texture streaming is disabled
-    // If texture streaming is turned off, we will hit this on the renderthread
-    // and stall due to the invalid file access stalls
-    ICVar* sysPakLogInvalidAccess = NULL;
-    int pakLogFileAccess = 0;
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_texturesstreaming)
-    {
-        sysPakLogInvalidAccess = gEnv->pConsole->GetCVar("sys_PakLogInvalidFileAccess");
-        if (sysPakLogInvalidAccess)
-        {
-            pakLogFileAccess = sysPakLogInvalidAccess->GetIVal();
-        }
-    }
-
-    CTimeValue t0 = gEnv->pTimer->GetAsyncTime();
-    CryLog("-- Precaching textures...");
-    iLog->UpdateLoadingScreen(0);
-
-    std::vector<CTexture*> TexturesForPrecaching;
-    std::vector<CTexture*> TexturesForComposition;
-
-    bool bTextureCacheExists = false;
-
-    {
-        AUTO_LOCK(CBaseResource::s_cResLock);
-
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (pRL)
-        {
-            TexturesForPrecaching.reserve(pRL->m_RMap.size());
-
-            ResourcesMapItor itor;
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (!tp)
-                {
-                    continue;
-                }
-                if (tp->CTexture::IsPostponed())
-                {
-                    if (tp->CTexture::GetFlags() & FT_COMPOSITE)
-                    {
-                        TexturesForComposition.push_back(tp);
-                    }
-                    else
-                    {
-                        TexturesForPrecaching.push_back(tp);
-                    }
-                }
-            }
-        }
-    }
-
-    // Preload all the post poned textures
-    {
-        if (!gEnv->IsEditor())
-        {
-            CryLog("=============================== Loading textures ================================");
-        }
-
-        std::vector<CTexture*>& Textures = TexturesForPrecaching;
-        std::sort(Textures.begin(), Textures.end(), CompareTextures());
-
-        gEnv->pSystem->GetStreamEngine()->PauseStreaming(false, 1 << eStreamTaskTypeTexture);
-
-        for (uint32 i = 0; i < Textures.size(); i++)
-        {
-            CTexture* tp = Textures[i];
-
-            if (!CRenderer::CV_r_texturesstreaming || !tp->m_bStreamPrepared)
-            {
-                tp->m_bPostponed = false;
-                tp->Load(tp->m_eTFDst);
-            }
-        }
-
-        while (s_StreamPrepTasks.GetNumLive())
-        {
-            if (gRenDev->m_pRT->IsRenderThread() && !gRenDev->m_pRT->IsRenderLoadingThread())
-            {
-                StreamState_Update();
-                StreamState_UpdatePrep();
-            }
-            else if (gRenDev->m_pRT->IsRenderLoadingThread())
-            {
-                StreamState_UpdatePrep();
-            }
-
-            CrySleep(10);
-        }
-
-        for (uint32 i = 0; i < Textures.size(); i++)
-        {
-            CTexture* tp = Textures[i];
-
-            if (tp->m_bStreamed && tp->m_bForceStreamHighRes)
-            {
-                tp->m_bStreamHighPriority |= 1;
-                tp->m_fpMinMipCur = 0;
-                s_pTextureStreamer->Precache(tp);
-            }
-        }
-
-        if (!gEnv->IsEditor())
-        {
-            CryLog("========================== Finished loading textures ============================");
-        }
-    }
-
-    {
-        std::vector<CTexture*>& Textures = TexturesForComposition;
-
-        for (uint32 i = 0; i < Textures.size(); i++)
-        {
-            CTexture* tp = Textures[i];
-
-            if (!CRenderer::CV_r_texturesstreaming || !tp->m_bStreamPrepared)
-            {
-                tp->m_bPostponed = false;
-                tp->StreamPrepareComposition();
-            }
-        }
-
-        for (uint32 i = 0; i < Textures.size(); i++)
-        {
-            CTexture* tp = Textures[i];
-
-            if (tp->m_bStreamed && tp->m_bForceStreamHighRes)
-            {
-                tp->m_bStreamHighPriority |= 1;
-                tp->m_fpMinMipCur = 0;
-                s_pTextureStreamer->Precache(tp);
-            }
-        }
-    }
-
-    if (bTextureCacheExists)
-    {
-        //GetISystem()->GetIResourceManager()->UnloadLevelCachePak( TEXTURE_LEVEL_CACHE_PAK );
-    }
-
-    CTimeValue t1 = gEnv->pTimer->GetAsyncTime();
-    float dt = (t1 - t0).GetSeconds();
-    CryLog("Precaching textures done in %.2f seconds", dt);
-
-    s_bPrecachePhase = false;
-
-    // Restore pakLogFileAccess if it was disabled during precaching
-    // because texture precaching was disabled
-    if (pakLogFileAccess)
-    {
-        sysPakLogInvalidAccess->Set(pakLogFileAccess);
-    }
-}
-
-bool CTexture::Load([[maybe_unused]] ETEX_Format eTFDst)
-{
-    LOADING_TIME_PROFILE_SECTION_NAMED_ARGS("CTexture::Load(ETEX_Format eTFDst)", m_SrcName.c_str());
-    m_bWasUnloaded = false;
-    m_bStreamed = false;
-
-#if !defined(NULL_RENDERER)
-    bool bFound = LoadFromImage(m_SrcName.c_str(), eTFDst);     // false=not reloading
-#else
-    bool bFound = false;
-#endif
-
-    if (!bFound)
-    {
-        SetNoTexture(m_eTT == eTT_Cube ? CTextureManager::Instance()->GetNoTextureCM() : CTextureManager::Instance()->GetNoTexture());
-    }
-
-    m_nFlags |= FT_FROMIMAGE;
-    PostCreate();
-
-    return bFound;
-}
-
-bool CTexture::ToggleStreaming(const bool bEnable)
-{
-    if (!(m_nFlags & (FT_FROMIMAGE | FT_DONT_RELEASE)) || (m_nFlags & FT_DONT_STREAM))
-    {
-        return false;
-    }
-    AbortStreamingTasks(this);
-    if (bEnable)
-    {
-        if (IsStreamed())
-        {
-            return true;
-        }
-        ReleaseDeviceTexture(false);
-        m_bStreamed = true;
-        if (StreamPrepare(true))
-        {
-            return true;
-        }
-        if (m_pFileTexMips)
-        {
-            Unlink();
-            StreamState_ReleaseInfo(this, m_pFileTexMips);
-            m_pFileTexMips = NULL;
-        }
-        m_bStreamed = false;
-        if (m_bNoTexture)
-        {
-            return true;
-        }
-    }
-    ReleaseDeviceTexture(false);
-    return Reload();
-}
-
-bool CTexture::LoadFromImage(const char* name, ETEX_Format eTFDst)
-{
-    LOADING_TIME_PROFILE_SECTION_ARGS(name);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_texnoload)
-    {
-        if (SetNoTexture(CTextureManager::Instance()->GetNoTexture() ))
-        {
-            return true;
-        }
-    }
-
-    string sFileName(name);
-    sFileName.MakeLower();
-
-    m_eTFDst = eTFDst;
-
-    // try to stream-in the texture
-    if (CRenderer::CV_r_texturesstreaming && !(m_nFlags & FT_DONT_STREAM) && (m_eTT == eTT_2D || m_eTT == eTT_Cube))
-    {
-        m_bStreamed = true;
-        if (StreamPrepare(true))
-        {
-            assert(m_pDevTexture);
-            return true;
-        }
-        m_nFlags |= FT_DONT_STREAM;
-        m_bStreamed = false;
-        m_bForceStreamHighRes = false;
-        if (m_bNoTexture)
-        {
-            if (m_pFileTexMips)
-            {
-                Unlink();
-                StreamState_ReleaseInfo(this, m_pFileTexMips);
-                m_pFileTexMips = NULL;
-                m_bStreamed = false;
-            }
-            return true;
-        }
-    }
-
-#ifndef _RELEASE
-    CRY_DEFINE_ASSET_SCOPE("Texture", m_sAssetScopeName);
-#endif
-
-    if (m_bPostponed)
-    {
-        if (s_pTextureStreamer->BeginPrepare(this, sFileName, (m_nFlags & FT_ALPHA) ? FIM_ALPHA : 0))
-        {
-            return true;
-        }
-    }
-
-
-    uint32 nImageFlags = (m_nFlags & FT_ALPHA) ? FIM_ALPHA : 0;
-
-    if (I3DEngine* p3DEngine = gEnv->p3DEngine)
-    {
-        if (ITextureLoadHandler* pTextureHandler = p3DEngine->GetTextureLoadHandlerForImage(sFileName.c_str()))
-        {
-            STextureLoadData loadData;
-            loadData.m_pTexture = this;
-            loadData.m_nFlags = m_nFlags;
-            if (pTextureHandler->LoadTextureData(sFileName.c_str(), loadData))
-            {
-                bool bHasAlphaFlag = false;
-
-                //we must clear this or else our texture won't load properly
-                if ((m_nFlags & FT_ALPHA) == FT_ALPHA)
-                {
-                    m_nFlags &= ~FT_ALPHA;
-                    bHasAlphaFlag = true;
-                }
-
-                _smart_ptr<CImageFile> pImage = CImageFile::mfLoad_mem(sFileName, loadData.m_pData, loadData.m_Width, loadData.m_Height, loadData.m_Format, loadData.m_NumMips, loadData.m_nFlags);
-                m_bisTextureMissing = !pImage || pImage->mfGet_IsImageMissing();
-                loadData.m_pData = nullptr;
-                bool bLoadResult = Load(&*pImage);
-
-                if (bHasAlphaFlag)
-                {
-                    m_nFlags |= FT_ALPHA;
-                }
-
-                return bLoadResult;
-            }
-            SetNoTexture(CTextureManager::Instance()->GetNoTexture() );
-            return true;
-        }
-    }
-    _smart_ptr<CImageFile> pImage = CImageFile::mfLoad_file(sFileName, nImageFlags);
-    m_bisTextureMissing = !pImage || pImage->mfGet_IsImageMissing();
-    return Load(pImage);
-}
-
-bool CTexture::Load([[maybe_unused]] CImageFile* pImage)
-{
-#if !defined(NULL_RENDERER)
-    if (!pImage || pImage->mfGetFormat() == eTF_Unknown)
-    {
-        return false;
-    }
-
-    LOADING_TIME_PROFILE_SECTION_NAMED_ARGS("CTexture::Load(CImageFile* pImage)", pImage->mfGet_filename().c_str());
-
-    // DHX-104: If this failed previously (maybe because the DDS was being generated), we must unset the failure flag
-    // so it doesn't appear to have failed again.
-    m_nFlags &= ~FT_FAILED;
-    if ((m_nFlags & FT_ALPHA) && !pImage->mfIs_image(0))
-    {
-        SetNoTexture( CTextureManager::Instance()->GetWhiteTexture() );
-        return true;
-    }
-    const char* name = pImage->mfGet_filename().c_str();
-    if (pImage->mfGet_Flags() & FIM_SPLITTED)                            // propagate splitted file flag
-    {
-        m_nFlags |= FT_SPLITTED;
-    }
-    if (pImage->mfGet_Flags() & FIM_X360_NOT_PRETILED)
-    {
-        m_nFlags |= FT_TEX_WAS_NOT_PRE_TILED;
-    }
-    if (pImage->mfGet_Flags() & FIM_NORMALMAP)
-    {
-        if (!(m_nFlags & FT_TEX_NORMAL_MAP) && !CryStringUtils::stristr(name, "_ddn"))
-        {
-            // becomes reported as editor error
-            gEnv->pSystem->Warning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, VALIDATOR_FLAG_FILE | VALIDATOR_FLAG_TEXTURE,
-                name, "Not a normal map texture attempted to be used as a normal map: %s", name);
-        }
-    }
-
-    if (!(m_nFlags & FT_ALPHA) && !(
-            pImage->mfGetFormat() == eTF_BC5U || pImage->mfGetFormat() == eTF_BC5S || pImage->mfGetFormat() == eTF_BC7 || pImage->mfGetFormat() == eTF_EAC_RG11
-            ) && CryStringUtils::stristr(name, "_ddn") != 0 && GetDevTexture()) // improvable code
-    {
-        // becomes reported as editor error
-        gEnv->pSystem->Warning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, VALIDATOR_FLAG_FILE | VALIDATOR_FLAG_TEXTURE,
-            name, "Wrong format '%s' for normal map texture '%s'", CTexture::GetFormatName(), name);
-    }
-
-    if (pImage->mfGet_Flags() & FIM_NOTSUPPORTS_MIPS && !(m_nFlags & FT_NOMIPS))
-    {
-        m_nFlags |= FT_FORCE_MIPS;
-    }
-    if (pImage->mfGet_Flags() & FIM_HAS_ATTACHED_ALPHA)
-    {
-        m_nFlags |= FT_HAS_ATTACHED_ALPHA;      // if the image has alpha attached we store this in the CTexture
-    }
-    m_eSrcTileMode = pImage->mfGetTileMode();
-
-    STexData td;
-    td.m_nFlags = pImage->mfGet_Flags();
-    td.m_pData[0] = pImage->mfGet_image(0);
-    td.m_nWidth = pImage->mfGet_width();
-    td.m_nHeight = pImage->mfGet_height();
-    td.m_nDepth = pImage->mfGet_depth();
-    td.m_eTF = pImage->mfGetFormat();
-    td.m_nMips = pImage->mfGet_numMips();
-    td.m_fAvgBrightness = pImage->mfGet_avgBrightness();
-    td.m_cMinColor = pImage->mfGet_minColor();
-    td.m_cMaxColor = pImage->mfGet_maxColor();
-    if ((m_nFlags & FT_NOMIPS) || td.m_nMips <= 0)
-    {
-        td.m_nMips = 1;
-    }
-    td.m_pFilePath = pImage->mfGet_filename();
-
-    // base range after normalization, fe. [0,1] for 8bit images, or [0,2^15] for RGBE/HDR data
-    if ((td.m_eTF == eTF_R9G9B9E5) || (td.m_eTF == eTF_BC6UH) || (td.m_eTF == eTF_BC6SH))
-    {
-        td.m_cMinColor /= td.m_cMaxColor.a;
-        td.m_cMaxColor /= td.m_cMaxColor.a;
-    }
-
-    // check if it's a cubemap
-    if (pImage->mfIs_image(1))
-    {
-        for (int i = 1; i < 6; i++)
-        {
-            td.m_pData[i] = pImage->mfGet_image(i);
-        }
-    }
-
-    bool bRes = false;
-    if (pImage)
-    {
-        FormatFixup(td);
-        bRes = CreateTexture(td);
-    }
-
-    for (int i = 0; i < 6; i++)
-    {
-        if (td.m_pData[i] && td.WasReallocated(i))
-        {
-            SAFE_DELETE_ARRAY(td.m_pData[i]);
-        }
-    }
-
-    return bRes;
-#else
-    SetNoTexture(CTextureManager::Instance()->GetWhiteTexture() );
-    return true;
-#endif
-}
-
-bool CTexture::CreateTexture(STexData& td)
-{
-    m_nWidth = td.m_nWidth;
-    m_nHeight = td.m_nHeight;
-    m_nDepth = td.m_nDepth;
-    m_eTFSrc = td.m_eTF;
-    m_nMips = td.m_nMips;
-    m_fAvgBrightness = td.m_fAvgBrightness;
-    m_cMinColor = td.m_cMinColor;
-    m_cMaxColor = td.m_cMaxColor;
-    m_cClearColor = ColorF(0.0f, 0.0f, 0.0f, 1.0f);
-    m_bUseDecalBorderCol = (td.m_nFlags & FIM_DECAL) != 0;
-    m_bIsSRGB = (td.m_nFlags & FIM_SRGB_READ) != 0;
-
-    assert(m_nWidth && m_nHeight && m_nMips);
-
-    if (td.m_pData[1] || (m_nFlags & FT_REPLICATE_TO_ALL_SIDES))
-    {
-        m_eTT = eTT_Cube;
-    }
-    else
-    {
-        if (m_nDepth > 1 || m_eTT == eTT_3D)
-        {
-            m_eTT = eTT_3D;
-        }
-        else
-        {
-            m_eTT = eTT_2D;
-        }
-    }
-
-    if (m_eTFDst == eTF_Unknown)
-    {
-        m_eTFDst = m_eTFSrc;
-    }
-
-    if (!ImagePreprocessing(td))
-    {
-        return false;
-    }
-
-    assert(m_nWidth && m_nHeight && m_nMips);
-
-    const int nMaxTextureSize = gRenDev->GetMaxTextureSize();
-    if (nMaxTextureSize > 0)
-    {
-        if (m_nWidth > nMaxTextureSize || m_nHeight > nMaxTextureSize)
-        {
-            return false;
-        }
-    }
-
-    const byte* pData[6];
-    for (uint32 i = 0; i < 6; i++)
-    {
-        pData[i] = td.m_pData[i];
-    }
-
-    bool bRes = CreateDeviceTexture(pData);
-
-    return bRes;
-}
-
-ETEX_Format CTexture::FormatFixup(ETEX_Format src)
-{
-    switch (src)
-    {
-    case eTF_L8V8U8X8:
-        return eTF_R8G8B8A8S;
-    case eTF_B8G8R8:
-        return eTF_R8G8B8A8;
-    case eTF_L8V8U8:
-        return eTF_R8G8B8A8S;
-    case eTF_L8:
-        return eTF_R8G8B8A8;
-    case eTF_A8L8:
-        return eTF_R8G8B8A8;
-
-    case eTF_B5G5R5:
-        return eTF_R8G8B8A8;
-    case eTF_B5G6R5:
-        return eTF_R8G8B8A8;
-    case eTF_B4G4R4A4:
-        return eTF_R8G8B8A8;
-
-    default:
-        return src;
-    }
-}
-
-bool CTexture::FormatFixup(STexData& td)
-{
-    const ETEX_Format targetFmt = FormatFixup(td.m_eTF);
-
-    if (m_eSrcTileMode == eTM_None)
-    {
-        // Try and expand
-        int nSourceSize = CTexture::TextureDataSize(td.m_nWidth, td.m_nHeight, td.m_nDepth, td.m_nMips, 1, td.m_eTF);
-        int nTargetSize = CTexture::TextureDataSize(td.m_nWidth, td.m_nHeight, td.m_nDepth, td.m_nMips, 1, targetFmt);
-
-        for (int nImage = 0; nImage < sizeof(td.m_pData) / sizeof(td.m_pData[0]); ++nImage)
-        {
-            if (td.m_pData[nImage])
-            {
-                byte* pNewImage = new byte[nTargetSize];
-                CTexture::ExpandMipFromFile(pNewImage, nTargetSize, td.m_pData[nImage], nSourceSize, td.m_eTF);
-                td.AssignData(nImage, pNewImage);
-            }
-        }
-
-        td.m_eTF = targetFmt;
-    }
-    else
-    {
-#ifndef _RELEASE
-        if (targetFmt != td.m_eTF)
-        {
-            __debugbreak();
-        }
-#endif
-    }
-
-    return true;
-}
-
-bool CTexture::ImagePreprocessing(STexData& td)
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-#if !defined(_RELEASE)
-    const char* pTexFileName = td.m_pFilePath ? td.m_pFilePath : "$Unknown";
-#endif
-
-    const ETEX_Format eTFDst = ClosestFormatSupported(m_eTFDst);
-    if (eTFDst == eTF_Unknown)
-    {
-        td.m_pData[0] = td.m_pData[1] = td.m_pData[2] = td.m_pData[3] = td.m_pData[4] = td.m_pData[5] = 0;
-        m_nWidth = m_nHeight = m_nDepth = m_nMips = 0;
-
-#if !defined(_RELEASE)
-        TextureError(pTexFileName, "Trying to create a texture with unsupported target format %s!", NameForTextureFormat(eTFDst));
-#endif
-        return false;
-    }
-
-    const ETEX_Format eTF = td.m_eTF;
-    const bool fmtConversionNeeded = eTFDst != m_eTFDst || eTF != eTFDst;
-
-#if !(defined(WIN32) || defined(WIN64)) || defined(OPENGL) || defined(NULL_RENDERER)
-    if (fmtConversionNeeded)
-    {
-        td.m_pData[0] = td.m_pData[1] = td.m_pData[2] = td.m_pData[3] = td.m_pData[4] = td.m_pData[5] = 0;
-        m_nWidth = m_nHeight = m_nDepth = m_nMips = 0;
-
-#   if !defined(_RELEASE)
-        TextureError(pTexFileName, "Trying an image format conversion from %s to %s. This is not supported on this platform!", NameForTextureFormat(eTF), NameForTextureFormat(eTFDst));
-#   endif
-        return false;
-    }
-#else
-    const bool doProcessing = fmtConversionNeeded && (m_nFlags & FT_TEX_FONT) == 0; // we generate the font in native format
-    if (doProcessing)
-    {
-        m_eTFSrc = eTFDst;
-        m_eTFDst = eTFDst;
-
-        const int nSrcWidth = td.m_nWidth;
-        const int nSrcHeight = td.m_nHeight;
-
-        for (int i = 0; i < 6; i++)
-        {
-            const byte* pTexData = td.m_pData[i];
-            if (pTexData)
-            {
-                int nOutSize = 0;
-                const byte* pNewData = Convert(pTexData, nSrcWidth, nSrcHeight, td.m_nMips, eTF, eTFDst, nOutSize, true);
-                if (pNewData)
-                {
-                    td.AssignData(i, pNewData);
-                }
-            }
-        }
-    }
-#endif
-
-#if defined(TEXTURE_GET_SYSTEM_COPY_SUPPORT) && !defined(NULL_RENDERER)
-    if (m_nFlags & FT_KEEP_LOWRES_SYSCOPY)
-    {
-        PrepareLowResSystemCopy(td.m_pData[0], true);
-    }
-#endif
-
-    return true;
-}
-
-int CTexture::CalcNumMips(int nWidth, int nHeight)
-{
-    int nMips = 0;
-    while (nWidth || nHeight)
-    {
-        if (!nWidth)
-        {
-            nWidth = 1;
-        }
-        if (!nHeight)
-        {
-            nHeight = 1;
-        }
-        nWidth >>= 1;
-        nHeight >>= 1;
-        nMips++;
-    }
-    //For DX11 hardware, the number of mips must be between 1 and 7, inclusive
-    //0 is a valid result but means that D3D11 will generate a full series of mipmaps
-    if (nMips > 7)
-    {
-        return 7;
-    }
-
-    return nMips;
-}
-
-uint32 CTexture::TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, const ETEX_Format eTF, ETEX_TileMode eTM)
-{
-    if (eTF == eTF_Unknown)
-    {
-        return 0;
-    }
-
-    if (eTM != eTM_None)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(Texture_cpp)
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(Texture_cpp)
-#endif
-
-        __debugbreak();
-        return 0;
-    }
-    else
-    {
-        const Vec2i BlockDim = GetBlockDim(eTF);
-        const int nBytesPerBlock = CImageExtensionHelper::BytesPerBlock(eTF);
-        uint32 nSize = 0;
-
-        while ((nWidth || nHeight || nDepth) && nMips)
-        {
-            nWidth = max(1U, nWidth);
-            nHeight = max(1U, nHeight);
-            nDepth = max(1U, nDepth);
-
-            nSize += ((nWidth + BlockDim.x - 1) / BlockDim.x) * ((nHeight + BlockDim.y - 1) / BlockDim.y) * nDepth * nBytesPerBlock;
-
-            nWidth  >>= 1;
-            nHeight >>= 1;
-            nDepth  >>= 1;
-            --nMips;
-        }
-
-        return nSize * nSlices;
-    }
-}
-
-bool CTexture::IsInPlaceFormat(const ETEX_Format fmt)
-{
-    switch (fmt)
-    {
-    case eTF_R8G8B8A8S:
-    case eTF_R8G8B8A8:
-
-    case eTF_A8:
-    case eTF_R8:
-    case eTF_R8S:
-    case eTF_R16:
-    case eTF_R16U:
-    case eTF_R16G16U:
-    case eTF_R10G10B10A2UI:
-    case eTF_R16F:
-    case eTF_R32F:
-    case eTF_R8G8:
-    case eTF_R8G8S:
-    case eTF_R16G16:
-    case eTF_R16G16S:
-    case eTF_R16G16F:
-    case eTF_R11G11B10F:
-    case eTF_R10G10B10A2:
-    case eTF_R16G16B16A16:
-    case eTF_R16G16B16A16S:
-    case eTF_R16G16B16A16F:
-    case eTF_R32G32B32A32F:
-
-    case eTF_CTX1:
-    case eTF_BC1:
-    case eTF_BC2:
-    case eTF_BC3:
-    case eTF_BC4U:
-    case eTF_BC4S:
-    case eTF_BC5U:
-    case eTF_BC5S:
-#if defined(CRY_DDS_DX10_SUPPORT)
-    case eTF_BC6UH:
-    case eTF_BC6SH:
-    case eTF_BC7:
-    case eTF_R9G9B9E5:
-#endif
-    case eTF_EAC_R11:
-    case eTF_EAC_RG11:
-    case eTF_ETC2:
-    case eTF_ETC2A:
-
-    case eTF_B8G8R8A8:
-    case eTF_B8G8R8X8:
-#ifdef CRY_USE_METAL
-    case eTF_PVRTC2:
-    case eTF_PVRTC4:
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case eTF_ASTC_4x4:
-    case eTF_ASTC_5x4:
-    case eTF_ASTC_5x5:
-    case eTF_ASTC_6x5:
-    case eTF_ASTC_6x6:
-    case eTF_ASTC_8x5:
-    case eTF_ASTC_8x6:
-    case eTF_ASTC_8x8:
-    case eTF_ASTC_10x5:
-    case eTF_ASTC_10x6:
-    case eTF_ASTC_10x8:
-    case eTF_ASTC_10x10:
-    case eTF_ASTC_12x10:
-    case eTF_ASTC_12x12:
-#endif
-        return true;
-    default:
-        return false;
-    }
-}
-
-void CTexture::ExpandMipFromFile(byte* dest, [[maybe_unused]] const int destSize, const byte* src, const int srcSize, const ETEX_Format fmt)
-{
-    if (IsInPlaceFormat(fmt))
-    {
-        assert(destSize == srcSize);
-        if (dest != src)
-        {
-            cryMemcpy(dest, src, srcSize);
-        }
-
-        return;
-    }
-
-    // upload mip from file with conversions depending on format and platform specifics
-    switch (fmt)
-    {
-    case eTF_B8G8R8:
-        for (int i = srcSize / 3 - 1; i >= 0; --i)
-        {
-            dest[i * 4 + 0] = src[i * 3 + 2];
-            dest[i * 4 + 1] = src[i * 3 + 1];
-            dest[i * 4 + 2] = src[i * 3 + 0];
-            dest[i * 4 + 3] = 255;
-        }
-        break;
-    case eTF_L8V8U8X8:
-        assert(destSize == srcSize);
-        if (dest != src)
-        {
-            cryMemcpy(dest, src, srcSize);
-        }
-        for (int i = srcSize / 4 - 1; i >= 0; --i)
-        {
-            dest[i * 4 + 0] = src[i * 3 + 0];
-            dest[i * 4 + 1] = src[i * 3 + 1];
-            dest[i * 4 + 2] = src[i * 3 + 2];
-            dest[i * 4 + 3] = src[i * 3 + 3];
-        }
-        break;
-    case eTF_L8V8U8:
-        for (int i = srcSize / 3 - 1; i >= 0; --i)
-        {
-            dest[i * 4 + 0] = src[i * 3 + 0];
-            dest[i * 4 + 1] = src[i * 3 + 1];
-            dest[i * 4 + 2] = src[i * 3 + 2];
-            dest[i * 4 + 3] = 255;
-        }
-        break;
-    case eTF_L8:
-        for (int i = srcSize - 1; i >= 0; --i)
-        {
-            const byte bSrc = src[i];
-            dest[i * 4 + 0] = bSrc;
-            dest[i * 4 + 1] = bSrc;
-            dest[i * 4 + 2] = bSrc;
-            dest[i * 4 + 3] = 255;
-        }
-        break;
-    case eTF_A8L8:
-        for (int i = srcSize - 1; i >= 0; i -= 2)
-        {
-            const byte bSrcL = src[i - 1];
-            const byte bSrcA = src[i - 0];
-            dest[i * 4 + 0] = bSrcL;
-            dest[i * 4 + 1] = bSrcL;
-            dest[i * 4 + 2] = bSrcL;
-            dest[i * 4 + 3] = bSrcA;
-        }
-        break;
-    case eTF_B5G5R5:
-    case eTF_B5G6R5:
-    case eTF_B4G4R4A4:
-    default:
-        assert(0);
-    }
-}
-
-bool CTexture::Invalidate(int nNewWidth, int nNewHeight, ETEX_Format eTF)
-{
-    bool bRelease = false;
-    if (nNewWidth > 0 && nNewWidth != m_nWidth)
-    {
-        m_nWidth = nNewWidth;
-        bRelease = true;
-    }
-    if (nNewHeight > 0 && nNewHeight != m_nHeight)
-    {
-        m_nHeight = nNewHeight;
-        bRelease = true;
-    }
-    if (eTF != eTF_Unknown && eTF != m_eTFDst)
-    {
-        m_eTFDst = eTF;
-        bRelease = true;
-    }
-
-    if (!m_pDevTexture)
-    {
-        return false;
-    }
-
-    if (bRelease)
-    {
-        if (m_nFlags & FT_FORCE_MIPS)
-        {
-            m_nMips = 1;
-        }
-
-        ReleaseDeviceTexture(true);
-    }
-
-    return bRelease;
-}
-
-SResourceView& CTexture::GetResourceView(const SResourceView& rvDesc)
-{
-    assert(m_pRenderTargetData);
-
-    int nIndex = m_pRenderTargetData->m_ResourceViews.Find(rvDesc);
-
-    if (nIndex < 0)
-    {
-        SResourceView* pRvDesc = m_pRenderTargetData->m_ResourceViews.AddIndex(1);
-        pRvDesc->m_Desc = rvDesc.m_Desc;
-        pRvDesc->m_pDeviceResourceView = CreateDeviceResourceView(rvDesc);
-
-        nIndex = m_pRenderTargetData->m_ResourceViews.size() - 1;
-    }
-
-    return m_pRenderTargetData->m_ResourceViews[nIndex];
-}
-
-D3DShaderResourceView* CTexture::GetShaderResourceView(SResourceView::KeyType resourceViewID /*= SResourceView::DefaultView*/, bool bLegacySrgbLookup /*= false*/)
-{
-    if ((int64)resourceViewID <= (int64)SResourceView::DefaultView)
-    {
-        void* pResult = m_pDeviceShaderResource;
-
-        if (resourceViewID == SResourceView::DefaultViewMS && m_pRenderTargetData && m_pRenderTargetData->m_pDeviceTextureMSAA)
-        {
-            SResourceView& pMultisampledRV = GetResourceView(SResourceView::ShaderResourceView(m_eTFDst, 0, -1, 0, -1, false, true));
-            pResult = pMultisampledRV.m_pDeviceResourceView;
-        }
-
-        // NOTE: "m_pDeviceShaderResourceSRGB != nullptr" implies FT_USAGE_ALLOWREADSRGB
-        if ((resourceViewID == SResourceView::DefaultViewSRGB || bLegacySrgbLookup) && m_pDeviceShaderResourceSRGB)
-        {
-            pResult = m_pDeviceShaderResourceSRGB;
-        }
-
-        return (D3DShaderResourceView*)pResult;
-    }
-    else
-    {
-        return (D3DShaderResourceView*)GetResourceView(resourceViewID).m_pDeviceResourceView;
-    }
-}
-
-void CTexture::SetShaderResourceView(D3DShaderResourceView* pDeviceShaderResource, bool bMultisampled)
-{
-    if (bMultisampled && m_pRenderTargetData && m_pRenderTargetData->m_pDeviceTextureMSAA)
-    {
-        SResourceView& pMultisampledRV = GetResourceView(SResourceView::ShaderResourceView(m_eTFDst, 0, -1, 0, -1, false, true));
-
-        if (pMultisampledRV.m_pDeviceResourceView != pDeviceShaderResource)
-        {
-            pMultisampledRV.m_pDeviceResourceView = pDeviceShaderResource;
-            InvalidateDeviceResource(eDeviceResourceViewDirty);
-        }
-    }
-    else
-    {
-        if (m_pDeviceShaderResource != pDeviceShaderResource)
-        {
-            m_pDeviceShaderResource = pDeviceShaderResource;
-            InvalidateDeviceResource(eDeviceResourceViewDirty);
-        }
-    }
-}
-
-D3DUnorderedAccessView* CTexture::GetDeviceUAV()
-{
-    const SResourceView& rvDesc = m_pRenderTargetData ? GetResourceView(SResourceView::UnorderedAccessView(m_eTFDst, 0, -1, 0, m_nFlags)) : NULL;
-    return (D3DUnorderedAccessView*)rvDesc.m_pDeviceResourceView;
-}
-
-D3DDepthSurface* CTexture::GetDeviceDepthStencilSurf(int nFirstSlice, int nSliceCount)
-{
-    const SResourceView& rvDesc = GetResourceView(SResourceView::DepthStencilView(m_eTFDst, nFirstSlice, nSliceCount));
-    return (D3DDepthSurface*)rvDesc.m_pDeviceResourceView;
-}
-
-byte* CTexture::GetData32([[maybe_unused]] int nSide, [[maybe_unused]] int nLevel, [[maybe_unused]] byte* pDst, [[maybe_unused]] ETEX_Format eDstFormat)
-{
-#if (defined(WIN32) || defined(WIN64)) && !defined(NULL_RENDERER)
-    CDeviceTexture* pDevTexture = GetDevTexture();
-    pDevTexture->DownloadToStagingResource(D3D11CalcSubresource(nLevel, nSide, m_nMips), [&](void* pData, [[maybe_unused]] uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-        {
-            if (m_eTFDst != eTF_R8G8B8A8)
-            {
-                int nOutSize = 0;
-
-                if (m_eTFSrc == eDstFormat && pDst)
-                {
-                    memcpy(pDst, pData, GetDeviceDataSize());
-                }
-                else
-                {
-                    pDst = Convert((byte*)pData, m_nWidth, m_nHeight, 1, m_eTFSrc, eDstFormat, nOutSize, true);
-                }
-            }
-            else
-            {
-                if (!pDst)
-                {
-                    pDst = new byte[m_nWidth * m_nHeight * 4];
-                }
-
-                memcpy(pDst, pData, m_nWidth * m_nHeight * 4);
-            }
-
-            return true;
-        });
-
-    return pDst;
-#else
-    return 0;
-#endif
-}
-
-const int CTexture::GetSize(bool bIncludePool) const
-{
-    int nSize = sizeof(CTexture);
-    nSize += m_SrcName.capacity();
-    if (m_pRenderTargetData)
-    {
-        nSize +=  sizeof(*m_pRenderTargetData);
-    }
-    if (m_pFileTexMips)
-    {
-        nSize += m_pFileTexMips->GetSize(m_nMips, m_CacheFileHeader.m_nSides);
-        if (bIncludePool && m_pFileTexMips->m_pPoolItem)
-        {
-            nSize += m_pFileTexMips->m_pPoolItem->GetSize();
-        }
-    }
-
-    return nSize;
-}
-
-void CTexture::Init()
-{
-    SDynTexture::Init();
-    InitStreaming();
-    CTexture::s_TexStates.reserve(300); // this likes to expand, so it'd be nice if it didn't; 300 => ~6Kb, there were 171 after one level
-
-    SDynTexture2::Init(eTP_Clouds);
-}
-
-void CTexture::PostInit()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    if (!gRenDev->IsShaderCacheGenMode())
-    {
-        CTexture::LoadDefaultSystemTextures();
-    }
-}
-
-int __cdecl TexCallback(const VOID * arg1, const VOID * arg2)
-{
-    CTexture** pi1 = (CTexture**)arg1;
-    CTexture** pi2 = (CTexture**)arg2;
-    CTexture* ti1 = *pi1;
-    CTexture* ti2 = *pi2;
-
-    if (ti1->GetDeviceDataSize() > ti2->GetDeviceDataSize())
-    {
-        return -1;
-    }
-    if (ti1->GetDeviceDataSize() < ti2->GetDeviceDataSize())
-    {
-        return 1;
-    }
-    return azstricmp(ti1->GetSourceName(), ti2->GetSourceName());
-}
-
-int __cdecl TexCallbackMips(const VOID * arg1, const VOID * arg2)
-{
-    CTexture** pi1 = (CTexture**)arg1;
-    CTexture** pi2 = (CTexture**)arg2;
-    CTexture* ti1 = *pi1;
-    CTexture* ti2 = *pi2;
-
-    int nSize1, nSize2;
-
-    nSize1 = ti1->GetActualSize();
-    nSize2 = ti2->GetActualSize();
-
-    if (nSize1 > nSize2)
-    {
-        return -1;
-    }
-    if (nSize1 < nSize2)
-    {
-        return 1;
-    }
-    return azstricmp(ti1->GetSourceName(), ti2->GetSourceName());
-}
-
-void CTexture::Update()
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    CRenderer* rd = gRenDev;
-    char buf[256] = "";
-
-    // reload pending texture reload requests
-    {
-        AZStd::set<string, AZStd::less<string>, AZ::StdLegacyAllocator> queue;
-
-        s_xTexReloadLock.Lock();
-        s_vTexReloadRequests.swap(queue);
-        s_xTexReloadLock.Unlock();
-
-        for (auto i = queue.begin(); i != queue.end(); i++)
-        {
-            ReloadFile(*i);
-        }
-    }
-
-    CTexture::s_bStreamingFromHDD = gEnv->pSystem->GetStreamEngine()->IsStreamDataOnHDD();
-    CTexture::s_nStatsStreamPoolInUseMem = CTexture::s_pPoolMgr->GetInUseSize();
-
-    s_pTextureStreamer->ApplySchedule(ITextureStreamer::eASF_Full);
-    s_pTextureStreamer->BeginUpdateSchedule();
-
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-    StreamUpdateStats();
-#endif
-
-    SDynTexture::Tick();
-
-    SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-    ResourcesMapItor itor;
-
-    if ((s_nStreamingMode != CRenderer::CV_r_texturesstreaming) || (s_nStreamingUpdateMode != CRenderer::CV_r_texturesstreamingUpdateType))
-    {
-        InitStreaming();
-    }
-
-    if (pRL)
-    {
-#ifndef CONSOLE_CONST_CVAR_MODE
-        uint32 i;
-        if (CRenderer::CV_r_texlog == 2 || CRenderer::CV_r_texlog == 3 || CRenderer::CV_r_texlog == 4)
-        {
-            AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
-            TArray<CTexture*> Texs;
-            int Size = 0;
-            int PartSize = 0;
-            if (CRenderer::CV_r_texlog == 2 || CRenderer::CV_r_texlog == 3)
-            {
-                for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-                {
-                    CTexture* tp = (CTexture*)itor->second;
-                    if (CRenderer::CV_r_texlog == 3 && tp->IsNoTexture())
-                    {
-                        Texs.AddElem(tp);
-                    }
-                    else
-                    if (CRenderer::CV_r_texlog == 2 && !tp->IsNoTexture() && tp->m_pFileTexMips) // (tp->GetFlags() & FT_FROMIMAGE))
-                    {
-                        Texs.AddElem(tp);
-                    }
-                }
-                if (CRenderer::CV_r_texlog == 3)
-                {
-                    CryLogAlways("Logging to MissingTextures.txt...");
-                    fileHandle = fxopen("MissingTextures.txt", "w");
-                }
-                else
-                {
-                    CryLogAlways("Logging to UsedTextures.txt...");
-                    fileHandle = fxopen("UsedTextures.txt", "w");
-                }
-                AZ::IO::Print(fileHandle, "*** All textures: ***\n");
-
-                if (Texs.Num())
-                {
-                    qsort(&Texs[0], Texs.Num(), sizeof(CTexture*), TexCallbackMips);
-                }
-
-                for (i = 0; i < Texs.Num(); i++)
-                {
-                    int w = Texs[i]->GetWidth();
-                    int h = Texs[i]->GetHeight();
-
-                    int nTSize = Texs[i]->m_pFileTexMips->GetSize(Texs[i]->GetNumMips(), Texs[i]->GetNumSides());
-
-                    AZ::IO::Print(fileHandle, "%d\t\t%d x %d\t\tType: %s\t\tMips: %d\t\tFormat: %s\t\t(%s)\n", nTSize, w, h, Texs[i]->NameForTextureType(Texs[i]->GetTextureType()), Texs[i]->GetNumMips(), Texs[i]->NameForTextureFormat(Texs[i]->GetDstFormat()), Texs[i]->GetName());
-                    //Size += Texs[i]->GetDataSize();
-                    Size += nTSize;
-
-                    PartSize += Texs[i]->GetDeviceDataSize();
-                }
-                AZ::IO::Print(fileHandle, "*** Total Size: %d\n\n", Size /*, PartSize, PartSize */);
-
-                Texs.Free();
-            }
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (tp->m_nAccessFrameID == rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID)
-                {
-                    Texs.AddElem(tp);
-                }
-            }
-
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                gEnv->pFileIO->Close(fileHandle);
-                fileHandle = AZ::IO::InvalidHandle;
-            }
-
-            fileHandle = fxopen("UsedTextures_Frame.txt", "w");
-
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                AZ::IO::Print(fileHandle, "\n\n*** Textures used in current frame: ***\n");
-            }
-            else
-            {
-                rd->TextToScreenColor(4, 13, 1, 1, 0, 1, "*** Textures used in current frame: ***");
-            }
-            int nY = 17;
-
-            if (Texs.Num())
-            {
-                qsort(&Texs[0], Texs.Num(), sizeof(CTexture*), TexCallback);
-            }
-
-            Size = 0;
-            for (i = 0; i < Texs.Num(); i++)
-            {
-                if (fileHandle != AZ::IO::InvalidHandle)
-                {
-                    AZ::IO::Print(fileHandle, "%.3fKb\t\tType: %s\t\tFormat: %s\t\t(%s)\n", Texs[i]->GetDeviceDataSize() / 1024.0f, CTexture::NameForTextureType(Texs[i]->GetTextureType()), CTexture::NameForTextureFormat(Texs[i]->GetDstFormat()), Texs[i]->GetName());
-                }
-                else
-                {
-                    sprintf_s(buf, "%.3fKb  Type: %s  Format: %s  (%s)", Texs[i]->GetDeviceDataSize() / 1024.0f, CTexture::NameForTextureType(Texs[i]->GetTextureType()), CTexture::NameForTextureFormat(Texs[i]->GetDstFormat()), Texs[i]->GetName());
-                    rd->TextToScreenColor(4, nY, 0, 1, 0, 1, buf);
-                    nY += 3;
-                }
-                PartSize += Texs[i]->GetDeviceDataSize();
-                Size += Texs[i]->GetDataSize();
-            }
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                AZ::IO::Print(fileHandle, "*** Total Size: %.3fMb, Device Size: %.3fMb\n\n", Size / (1024.0f * 1024.0f), PartSize / (1024.0f * 1024.0f));
-            }
-            else
-            {
-                sprintf_s(buf, "*** Total Size: %.3fMb, Device Size: %.3fMb", Size / (1024.0f * 1024.0f), PartSize / (1024.0f * 1024.0f));
-                rd->TextToScreenColor(4, nY + 1, 0, 1, 1, 1, buf);
-            }
-
-            Texs.Free();
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (tp && !tp->IsNoTexture())
-                {
-                    Texs.AddElem(tp);
-                }
-            }
-
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                gEnv->pFileIO->Close(fileHandle);
-                fileHandle = AZ::IO::InvalidHandle;
-            }
-            fileHandle = fxopen("UsedTextures_All.txt", "w");
-
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                AZ::IO::Print(fileHandle, "\n\n*** All Existing Textures: ***\n");
-            }
-            else
-            {
-                rd->TextToScreenColor(4, 13, 1, 1, 0, 1, "*** Textures loaded: ***");
-            }
-
-            if (Texs.Num())
-            {
-                qsort(&Texs[0], Texs.Num(), sizeof(CTexture*), TexCallback);
-            }
-
-            Size = 0;
-            for (i = 0; i < Texs.Num(); i++)
-            {
-                if (fileHandle != AZ::IO::InvalidHandle)
-                {
-                    int w = Texs[i]->GetWidth();
-                    int h = Texs[i]->GetHeight();
-                    AZ::IO::Print(fileHandle, "%d\t\t%d x %d\t\t%d mips (%.3fKb)\t\tType: %s \t\tFormat: %s\t\t(%s)\n", Texs[i]->GetDataSize(), w, h, Texs[i]->GetNumMips(), Texs[i]->GetDeviceDataSize() / 1024.0f, CTexture::NameForTextureType(Texs[i]->GetTextureType()), CTexture::NameForTextureFormat(Texs[i]->GetDstFormat()), Texs[i]->GetName());
-                }
-                else
-                {
-                    sprintf_s(buf, "%.3fKb  Type: %s  Format: %s  (%s)", Texs[i]->GetDataSize() / 1024.0f, CTexture::NameForTextureType(Texs[i]->GetTextureType()), CTexture::NameForTextureFormat(Texs[i]->GetDstFormat()), Texs[i]->GetName());
-                    rd->TextToScreenColor(4, nY, 0, 1, 0, 1, buf);
-                    nY += 3;
-                }
-                Size += Texs[i]->GetDeviceDataSize();
-            }
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                AZ::IO::Print(fileHandle, "*** Total Size: %.3fMb\n\n", Size / (1024.0f * 1024.0f));
-            }
-            else
-            {
-                sprintf_s(buf, "*** Total Size: %.3fMb", Size / (1024.0f * 1024.0f));
-                rd->TextToScreenColor(4, nY + 1, 0, 1, 1, 1, buf);
-            }
-
-
-            Texs.Free();
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (tp && !tp->IsNoTexture() && !tp->IsStreamed())
-                {
-                    Texs.AddElem(tp);
-                }
-            }
-
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                gEnv->pFileIO->Close(fileHandle);
-                fileHandle = AZ::IO::InvalidHandle;
-            }
-
-            if (CRenderer::CV_r_texlog != 4)
-            {
-                CRenderer::CV_r_texlog = 0;
-            }
-        }
-        else
-        if (CRenderer::CV_r_texlog == 1)
-        {
-            //char *str = GetTexturesStatusText();
-
-            TArray<CTexture*> Texs;
-            //TArray<CTexture *> TexsNM;
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (tp && !tp->IsNoTexture())
-                {
-                    Texs.AddElem(tp);
-                    //if (tp->GetFlags() & FT_TEX_NORMAL_MAP)
-                    //  TexsNM.AddElem(tp);
-                }
-            }
-
-            if (Texs.Num())
-            {
-                qsort(&Texs[0], Texs.Num(), sizeof(CTexture*), TexCallback);
-            }
-
-            int64 AllSize = 0;
-            int64 Size = 0;
-            int64 PartSize = 0;
-            int64 NonStrSize = 0;
-            int nNoStr = 0;
-            int64 SizeNM = 0;
-            int64 SizeDynCom = 0;
-            int64 SizeDynAtl = 0;
-            int64 PartSizeNM = 0;
-            int nNumTex = 0;
-            int nNumTexNM = 0;
-            int nNumTexDynAtl = 0;
-            int nNumTexDynCom = 0;
-            for (i = 0; i < Texs.Num(); i++)
-            {
-                CTexture* tex = Texs[i];
-                const uint32 texFlags = tex->GetFlags();
-                const int texDataSize = tex->GetDataSize();
-                const int texDeviceDataSize = tex->GetDeviceDataSize();
-
-                if (tex->GetDevTexture() && !(texFlags & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET)))
-                {
-                    AllSize += texDataSize;
-                    if (!Texs[i]->IsStreamed())
-                    {
-                        NonStrSize += texDataSize;
-                        nNoStr++;
-                    }
-                }
-
-                if (texFlags & (FT_USAGE_RENDERTARGET | FT_USAGE_DYNAMIC))
-                {
-                    if (texFlags & FT_USAGE_ATLAS)
-                    {
-                        ++nNumTexDynAtl;
-                        SizeDynAtl += texDataSize;
-                    }
-                    else
-                    {
-                        ++nNumTexDynCom;
-                        SizeDynCom += texDataSize;
-                    }
-                }
-                else
-                if (0 == (texFlags & FT_TEX_NORMAL_MAP))
-                {
-                    if (!Texs[i]->IsUnloaded())
-                    {
-                        ++nNumTex;
-                        Size += texDataSize;
-                        PartSize += texDeviceDataSize;
-                    }
-                }
-                else
-                {
-                    if (!Texs[i]->IsUnloaded())
-                    {
-                        ++nNumTexNM;
-                        SizeNM += texDataSize;
-                        PartSizeNM += texDeviceDataSize;
-                    }
-                }
-            }
-
-            sprintf_s(buf, "All texture objects: %d (Size: %.3fMb), NonStreamed: %d (Size: %.3fMb)", Texs.Num(), AllSize / (1024.0 * 1024.0), nNoStr, NonStrSize / (1024.0 * 1024.0));
-            rd->TextToScreenColor(4, 13, 1, 1, 0, 1, buf);
-            sprintf_s(buf, "All Loaded Texture Maps: %d (All MIPS: %.3fMb, Loaded MIPS: %.3fMb)", nNumTex, Size / (1024.0f * 1024.0f), PartSize / (1024.0 * 1024.0));
-            rd->TextToScreenColor(4, 16, 1, 1, 0, 1, buf);
-            sprintf_s(buf, "All Loaded Normal Maps: %d (All MIPS: %.3fMb, Loaded MIPS: %.3fMb)", nNumTexNM, SizeNM / (1024.0 * 1024.0), PartSizeNM / (1024.0 * 1024.0));
-            rd->TextToScreenColor(4, 19, 1, 1, 0, 1, buf);
-            sprintf_s(buf, "All Dynamic textures: %d (%.3fMb), %d Atlases (%.3fMb), %d Separared (%.3fMb)", nNumTexDynAtl + nNumTexDynCom, (SizeDynAtl + SizeDynCom) / (1024.0 * 1024.0), nNumTexDynAtl, SizeDynAtl / (1024.0 * 1024.0), nNumTexDynCom, SizeDynCom / (1024.0 * 1024.0));
-            rd->TextToScreenColor(4, 22, 1, 1, 0, 1, buf);
-
-            Texs.Free();
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (tp && !tp->IsNoTexture() && tp->m_nAccessFrameID == rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID)
-                {
-                    Texs.AddElem(tp);
-                }
-            }
-
-            if (Texs.Num())
-            {
-                qsort(&Texs[0], Texs.Num(), sizeof(CTexture*), TexCallback);
-            }
-
-            Size = 0;
-            SizeDynAtl = 0;
-            SizeDynCom = 0;
-            PartSize = 0;
-            NonStrSize = 0;
-            for (i = 0; i < Texs.Num(); i++)
-            {
-                Size += Texs[i]->GetDataSize();
-                if (Texs[i]->GetFlags() & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET))
-                {
-                    if (Texs[i]->GetFlags() & FT_USAGE_ATLAS)
-                    {
-                        SizeDynAtl += Texs[i]->GetDataSize();
-                    }
-                    else
-                    {
-                        SizeDynCom += Texs[i]->GetDataSize();
-                    }
-                }
-                else
-                {
-                    PartSize += Texs[i]->GetDeviceDataSize();
-                }
-                if (!Texs[i]->IsStreamed())
-                {
-                    NonStrSize += Texs[i]->GetDataSize();
-                }
-            }
-            sprintf_s(buf, "Current tex. objects: %d (Size: %.3fMb, Dyn. Atlases: %.3f, Dyn. Separated: %.3f, Loaded: %.3f, NonStreamed: %.3f)", Texs.Num(), Size / (1024.0f * 1024.0f), SizeDynAtl / (1024.0f * 1024.0f), SizeDynCom / (1024.0f * 1024.0f), PartSize / (1024.0f * 1024.0f), NonStrSize / (1024.0f * 1024.0f));
-            rd->TextToScreenColor(4, 27, 1, 0, 0, 1, buf);
-        }
-#endif
-    }
-}
-
-void CTexture::RT_LoadingUpdate()
-{
-    CTexture::s_bStreamingFromHDD = gEnv->pSystem->GetStreamEngine()->IsStreamDataOnHDD();
-    CTexture::s_nStatsStreamPoolInUseMem = CTexture::s_pPoolMgr->GetInUseSize();
-
-    ITextureStreamer::EApplyScheduleFlags asf = CTexture::s_bPrecachePhase
-        ? ITextureStreamer::eASF_InOut // Exclude the prep update, as it will be done by the RLT (and can be expensive)
-        : ITextureStreamer::eASF_Full;
-
-    s_pTextureStreamer->ApplySchedule(asf);
-}
-
-void CTexture::RLT_LoadingUpdate()
-{
-    AZ_TRACE_METHOD();
-    s_pTextureStreamer->BeginUpdateSchedule();
-}
-
-Ang3 sDeltAngles(Ang3& Ang0, Ang3& Ang1)
-{
-    Ang3 out;
-    for (int i = 0; i < 3; i++)
-    {
-        float a0 = Ang0[i];
-        a0 = (float)((360.0 / 65536) * ((int)(a0 * (65536 / 360.0)) & 65535)); // angmod
-        float a1 = Ang1[i];
-        a1 = (float)((360.0 / 65536) * ((int)(a0 * (65536 / 360.0)) & 65535));
-        out[i] = a0 - a1;
-    }
-    return out;
-}
-
-SEnvTexture* CTexture::FindSuitableEnvTex(Vec3& Pos, Ang3& Angs, bool bMustExist, [[maybe_unused]] int RendFlags, [[maybe_unused]] bool bUseExistingREs, [[maybe_unused]] CShader* pSH, [[maybe_unused]] CShaderResources* pRes, CRenderObject* pObj, bool bReflect, IRenderElement* pRE, bool* bMustUpdate)
-{
-    float time0 = iTimer->GetAsyncCurTime();
-
-    int i;
-    float distO = 999999;
-    float adist = 999999;
-    int firstForUse = -1;
-    int firstFree = -1;
-    Vec3 objPos;
-    if (bMustUpdate)
-    {
-        *bMustUpdate = false;
-    }
-    if (!pObj)
-    {
-        bReflect = false;
-    }
-    else
-    {
-        if (bReflect)
-        {
-            Plane pl;
-            pRE->mfGetPlane(pl);
-            objPos = pl.MirrorPosition(Vec3(0, 0, 0));
-        }
-        else
-        if (pRE)
-        {
-            pRE->mfCenter(objPos, pObj);
-        }
-        else
-        {
-            objPos = pObj->GetTranslation();
-        }
-    }
-    float dist = 999999;
-    for (i = 0; i < MAX_ENVTEXTURES; i++)
-    {
-        SEnvTexture* cur = &CTexture::s_EnvTexts[i];
-        if (cur->m_bReflected != bReflect)
-        {
-            continue;
-        }
-        float s = (cur->m_CamPos - Pos).GetLengthSquared();
-        Ang3 angDelta = sDeltAngles(Angs, cur->m_Angle);
-        float a = angDelta.x * angDelta.x + angDelta.y * angDelta.y + angDelta.z * angDelta.z;
-        float so = 0;
-        if (bReflect)
-        {
-            so = (cur->m_ObjPos - objPos).GetLengthSquared();
-        }
-        if (s <= dist && a <= adist && so <= distO)
-        {
-            dist = s;
-            adist = a;
-            distO = so;
-            firstForUse = i;
-            if (!so && !s && !a)
-            {
-                break;
-            }
-        }
-        if (cur->m_pTex && !cur->m_pTex->m_pTexture && firstFree < 0)
-        {
-            firstFree = i;
-        }
-    }
-    if (bMustExist && firstForUse >= 0)
-    {
-        return &CTexture::s_EnvTexts[firstForUse];
-    }
-    if (bReflect)
-    {
-        dist = distO;
-    }
-
-    float curTime = iTimer->GetCurrTime();
-    int nUpdate = -2;
-    float fTimeInterval = dist * CRenderer::CV_r_envtexupdateinterval + CRenderer::CV_r_envtexupdateinterval * 0.5f;
-    float fDelta = curTime - CTexture::s_EnvTexts[firstForUse].m_TimeLastUpdated;
-    if (bMustExist)
-    {
-        nUpdate = -2;
-    }
-    else
-    if (dist > MAX_ENVTEXSCANDIST)
-    {
-        if (firstFree >= 0)
-        {
-            nUpdate = firstFree;
-        }
-        else
-        {
-            nUpdate = -1;
-        }
-    }
-    else
-    if (fDelta > fTimeInterval)
-    {
-        nUpdate = firstForUse;
-    }
-    if (nUpdate == -2)
-    {
-        // No need to update (Up to date)
-        return &CTexture::s_EnvTexts[firstForUse];
-    }
-    if (!CTexture::s_EnvTexts[nUpdate].m_pTex)
-    {
-        return NULL;
-    }
-    if (nUpdate >= 0)
-    {
-        if (!CTexture::s_EnvTexts[nUpdate].m_pTex->m_pTexture || gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_fEnvTextUpdateTime < 0.1f)
-        {
-            int n = nUpdate;
-            CTexture::s_EnvTexts[n].m_TimeLastUpdated = curTime;
-            CTexture::s_EnvTexts[n].m_CamPos = Pos;
-            CTexture::s_EnvTexts[n].m_Angle = Angs;
-            CTexture::s_EnvTexts[n].m_ObjPos = objPos;
-            CTexture::s_EnvTexts[n].m_bReflected = bReflect;
-            if (bMustUpdate)
-            {
-                *bMustUpdate = true;
-            }
-        }
-        gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_fEnvTextUpdateTime += iTimer->GetAsyncCurTime() - time0;
-        return &CTexture::s_EnvTexts[nUpdate];
-    }
-
-    dist = 0;
-    firstForUse = -1;
-    for (i = 0; i < MAX_ENVTEXTURES; i++)
-    {
-        SEnvTexture* cur = &CTexture::s_EnvTexts[i];
-        if (dist < curTime - cur->m_TimeLastUpdated && !cur->m_bInprogress)
-        {
-            dist = curTime - cur->m_TimeLastUpdated;
-            firstForUse = i;
-        }
-    }
-    if (firstForUse < 0)
-    {
-        return NULL;
-    }
-    int n = firstForUse;
-    CTexture::s_EnvTexts[n].m_TimeLastUpdated = curTime;
-    CTexture::s_EnvTexts[n].m_CamPos = Pos;
-    CTexture::s_EnvTexts[n].m_ObjPos = objPos;
-    CTexture::s_EnvTexts[n].m_Angle = Angs;
-    CTexture::s_EnvTexts[n].m_bReflected = bReflect;
-    if (bMustUpdate)
-    {
-        *bMustUpdate = true;
-    }
-
-    gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_fEnvTextUpdateTime += iTimer->GetAsyncCurTime() - time0;
-    return &CTexture::s_EnvTexts[n];
-}
-
-
-//===========================================================================
-
-void CTexture::ShutDown()
-{
-    uint32 i;
-
-    if (gRenDev->GetRenderType() == eRT_Null) // workaround to fix crash when quitting the dedicated server - because the textures are shared
-    {
-        return;                                                                                                     // should be fixed soon
-    }
-    RT_FlushAllStreamingTasks(true);
-
-    ReleaseSystemTextures();
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_releaseallresourcesonexit)
-    {
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (pRL)
-        {
-            int n = 0;
-            ResourcesMapItor itor;
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); )
-            {
-                CTexture* pTX = (CTexture*)itor->second;
-                itor++;
-                if (!pTX)
-                {
-                    continue;
-                }
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_printmemoryleaks)
-                {
-                    iLog->Log("Warning: CTexture::ShutDown: Texture %s was not deleted (%d)", pTX->GetName(), pTX->GetRefCounter());
-                }
-                SAFE_RELEASE_FORCE(pTX);
-                n++;
-            }
-        }
-    }
-
-    if (s_ShaderTemplatesInitialized)
-    {
-        for (i = 0; i < EFTT_MAX; i++)
-        {
-            (*s_ShaderTemplates)[i].~CTexture();
-        }
-    }
-    s_ShaderTemplates->Free();
-
-    SAFE_DELETE(s_pTexNULL);
-
-    s_pPoolMgr->Flush();
-}
-
-bool CTexture::ReloadFile_Request(const char* szFileName)
-{
-    s_xTexReloadLock.Lock();
-    s_vTexReloadRequests.insert(szFileName);
-    s_xTexReloadLock.Unlock();
-
-    return true;
-}
-
-bool CTexture::ReloadFile(const char* szFileName)
-{
-    char realNameBuffer[256];
-    fpConvertDOSToUnixName(realNameBuffer, szFileName);
-
-
-    bool bStatus = false;
-
-    SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-    if (pRL)
-    {
-        AUTO_LOCK(CBaseResource::s_cResLock);
-        AZStd::string normalizedFile;
-        AZStd::string fileExtension;
-        AzFramework::StringFunc::Path::GetExtension(szFileName, fileExtension);
-        if (szFileName[0] == '$' || fileExtension.empty())
-        {
-            //If the name starts with $ or it does not have any extension then it is one of the special texture that the engine requires and we would not be modifying the name
-            normalizedFile = szFileName;
-        }
-        else
-        {
-            char buffer[AZ_MAX_PATH_LEN];
-            IResourceCompilerHelper::GetOutputFilename(szFileName, buffer, sizeof(buffer));   // change texture filename extensions to dds
-            normalizedFile = buffer;
-            AZStd::to_lower(normalizedFile.begin(), normalizedFile.end());
-            PathUtil::ToUnixPath(normalizedFile.c_str());
-        }
-
-        CCryNameTSCRC Name = GenName(normalizedFile.c_str());
-
-        ResourcesMapItor itor = pRL->m_RMap.find(Name);
-        if (itor != pRL->m_RMap.end())
-        {
-            CTexture* tp = (CTexture*)itor->second;
-
-            if (tp->Reload())
-            {
-                bStatus = true;
-            }
-        }
-
-        // Since we do not have the information whether the modified file was also reloaded with the FT_ALPHA flag we will try to reload that as well
-        Name = GenName(normalizedFile.c_str(), FT_ALPHA);
-
-        itor = pRL->m_RMap.find(Name);
-        if (itor != pRL->m_RMap.end())
-        {
-            CTexture* tp = (CTexture*)itor->second;
-
-            if (tp->Reload())
-            {
-                bStatus = true;
-            }
-        }
-    }
-
-    return bStatus;
-}
-
-void CTexture::ReloadTextures()
-{
-    SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        int nID = 0;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++, nID++)
-        {
-            CTexture* tp = (CTexture*)itor->second;
-            if (!tp)
-            {
-                continue;
-            }
-            if (!(tp->m_nFlags & FT_FROMIMAGE))
-            {
-                continue;
-            }
-            tp->Reload();
-        }
-    }
-}
-
-bool CTexture::SetNoTexture( const CTexture* pDefaultTexture /* = "NoTexture" entry */)
-{
-    if (pDefaultTexture)
-    {
-        m_pDevTexture = pDefaultTexture->m_pDevTexture;
-        m_pDeviceShaderResource = pDefaultTexture->m_pDeviceShaderResource;
-        m_eTFSrc = pDefaultTexture->GetSrcFormat();
-        m_eTFDst = pDefaultTexture->GetDstFormat();
-        m_nMips = pDefaultTexture->GetNumMips();
-        m_nWidth = pDefaultTexture->GetWidth();
-        m_nHeight = pDefaultTexture->GetHeight();
-        m_nDepth = 1;
-        m_nDefState = pDefaultTexture->m_nDefState;
-        m_fAvgBrightness = 1.0f;
-        m_cMinColor = 0.0f;
-        m_cMaxColor = 1.0f;
-        m_cClearColor = ColorF(0.0f, 0.0f, 0.0f, 1.0f);
-
-        m_bNoTexture = true;
-        if (m_pFileTexMips)
-        {
-            Unlink();
-            StreamState_ReleaseInfo(this, m_pFileTexMips);
-            m_pFileTexMips = NULL;
-        }
-        m_bStreamed = false;
-        m_bPostponed = false;
-        m_nFlags |= FT_FAILED;
-        m_nActualSize = 0;
-        m_nPersistentSize = 0;
-        return true;
-    }
-    return false;
-}
-
-//===========================================================================
-
-void CTexture::ReleaseSystemTextures()
-{
-    if (s_pStatsTexWantedLists)
-    {
-        for (int i = 0; i < 2; ++i)
-        {
-            s_pStatsTexWantedLists[i].clear();
-        }
-    }
-
-    SAFE_RELEASE_FORCE(s_ptexRT_2D);
-    SAFE_RELEASE_FORCE(s_ptexCloudsLM);
-
-    SAFE_RELEASE_FORCE(s_ptexVolumetricFog);
-    SAFE_RELEASE_FORCE(s_ptexVolumetricFogDensityColor);
-    SAFE_RELEASE_FORCE(s_ptexVolumetricFogDensity);
-    SAFE_RELEASE_FORCE(s_ptexVolumetricClipVolumeStencil);
-
-    uint32 i;
-    for (i = 0; i < 8; i++)
-    {
-        SAFE_RELEASE_FORCE(s_ptexShadowID[i]);
-    }
-
-    SAFE_RELEASE_FORCE(s_ptexFromObj);
-    SAFE_RELEASE_FORCE(s_ptexSvoTree);
-    SAFE_RELEASE_FORCE(s_ptexSvoTris);
-    SAFE_RELEASE_FORCE(s_ptexSvoGlobalCM);
-    SAFE_RELEASE_FORCE(s_ptexSvoRgbs);
-    SAFE_RELEASE_FORCE(s_ptexSvoNorm);
-    SAFE_RELEASE_FORCE(s_ptexSvoOpac);
-    SAFE_RELEASE_FORCE(s_ptexFromObjCM);
-
-    SAFE_RELEASE_FORCE(s_ptexVolObj_Density);
-    SAFE_RELEASE_FORCE(s_ptexVolObj_Shadow);
-
-    SAFE_RELEASE_FORCE(s_ptexColorChart);
-
-    for (i = 0; i < MAX_ENVCUBEMAPS; i++)
-    {
-        s_EnvCMaps[i].Release();
-    }
-    for (i = 0; i < MAX_ENVTEXTURES; i++)
-    {
-        s_EnvTexts[i].Release();
-    }
-
-    SAFE_RELEASE_FORCE(s_ptexMipColors_Diffuse);
-    SAFE_RELEASE_FORCE(s_ptexMipColors_Bump);
-    SAFE_RELEASE_FORCE(s_ptexSkyDomeMie);
-    SAFE_RELEASE_FORCE(s_ptexSkyDomeRayleigh);
-    SAFE_RELEASE_FORCE(s_ptexSkyDomeMoon);
-    SAFE_RELEASE_FORCE(s_ptexRT_ShadowPool);
-    SAFE_RELEASE_FORCE(s_ptexRT_ShadowStub);
-
-    SAFE_RELEASE_FORCE(s_ptexSceneNormalsMapMS);
-    SAFE_RELEASE_FORCE(s_ptexSceneDiffuseAccMapMS);
-    SAFE_RELEASE_FORCE(s_ptexSceneSpecularAccMapMS);
-
-    SAFE_RELEASE_FORCE(s_defaultEnvironmentProbeDummy);
-
-    s_CustomRT_2D->Free();
-
-    s_pPoolMgr->Flush();
-
-    // release targets pools
-    SDynTexture::ShutDown();
-    SDynTexture2::ShutDown();
-
-    ReleaseMiscTargets();
-
-    m_bLoadedSystem = false;
-}
-
-void CTexture::LoadDefaultSystemTextures()
-{
-    LOADING_TIME_PROFILE_SECTION;
-#if !defined(NULL_RENDERER)
-    char str[256];
-    int i;
-
-    if (!m_bLoadedSystem)
-    {
-        
-
-        m_bLoadedSystem = true;
-
-        // Default Template textures
-        int nRTFlags =  FT_DONT_RELEASE | FT_DONT_STREAM | FT_STATE_CLAMP | FT_USAGE_RENDERTARGET;
-        s_ptexMipColors_Diffuse = CTexture::CreateTextureObject("$MipColors_Diffuse", 0, 0, 1, eTT_2D,  FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_MIPCOLORS_DIFFUSE);
-        s_ptexMipColors_Bump = CTexture::CreateTextureObject("$MipColors_Bump", 0, 0, 1, eTT_2D,  FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_MIPCOLORS_BUMP);
-
-        s_ptexRT_2D = CTexture::CreateTextureObject("$RT_2D", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_RT_2D);
-
-        s_ptexRainOcclusion = CTexture::CreateTextureObject("$RainOcclusion", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-        s_ptexRainSSOcclusion[0] = CTexture::CreateTextureObject("$RainSSOcclusion0", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-        s_ptexRainSSOcclusion[1] = CTexture::CreateTextureObject("$RainSSOcclusion1", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-
-        s_ptexFromObj = CTexture::CreateTextureObject("FromObj", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_FROMOBJ);
-        s_ptexSvoTree = CTexture::CreateTextureObject("SvoTree", 0, 0, 1, eTT_3D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SVOTREE);
-        s_ptexSvoTris = CTexture::CreateTextureObject("SvoTris", 0, 0, 1, eTT_3D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SVOTRIS);
-        s_ptexSvoGlobalCM = CTexture::CreateTextureObject("SvoGlobalCM", 0, 0, 1, eTT_Cube, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SVOGLCM);
-        s_ptexSvoRgbs = CTexture::CreateTextureObject("SvoRgbs", 0, 0, 1, eTT_3D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SVORGBS);
-        s_ptexSvoNorm = CTexture::CreateTextureObject("SvoNorm", 0, 0, 1, eTT_3D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SVONORM);
-        s_ptexSvoOpac = CTexture::CreateTextureObject("SvoOpac", 0, 0, 1, eTT_3D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SVOOPAC);
-        s_ptexFromObjCM = CTexture::CreateTextureObject("$FromObjCM", 0, 0, 1, eTT_Cube, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_FROMOBJ_CM);
-
-        s_ptexZTargetDownSample[0] = CTexture::CreateTextureObject("$ZTargetDownSample0", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown);
-        s_ptexZTargetDownSample[1] = CTexture::CreateTextureObject("$ZTargetDownSample1", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown);
-        s_ptexZTargetDownSample[2] = CTexture::CreateTextureObject("$ZTargetDownSample2", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown);
-        s_ptexZTargetDownSample[3] = CTexture::CreateTextureObject("$ZTargetDownSample3", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown);
-
-        s_ptexSceneNormalsMapMS = CTexture::CreateTextureObject("$SceneNormalsMapMS", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SCENE_NORMALMAP_MS);
-        s_ptexSceneDiffuseAccMapMS = CTexture::CreateTextureObject("$SceneDiffuseAccMS", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SCENE_DIFFUSE_ACC_MS);
-        s_ptexSceneSpecularAccMapMS = CTexture::CreateTextureObject("$SceneSpecularAccMS", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SCENE_SPECULAR_ACC_MS);
-
-        s_ptexSceneNormalsMapMS = CTexture::CreateTextureObject("$SceneNormalsMapMS", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SCENE_NORMALMAP_MS);
-        s_ptexSceneDiffuseAccMapMS = CTexture::CreateTextureObject("$SceneDiffuseAccMS", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SCENE_DIFFUSE_ACC_MS);
-        s_ptexSceneSpecularAccMapMS = CTexture::CreateTextureObject("$SceneSpecularAccMS", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SCENE_SPECULAR_ACC_MS);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(Texture_cpp)
-#endif
-        s_ptexRT_ShadowPool = CTexture::CreateTextureObject("$RT_ShadowPool", 0, 0, 1, eTT_2D, FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_USAGE_DEPTHSTENCIL, eTF_Unknown);
-        s_ptexRT_ShadowStub = CTexture::CreateTextureObject("$RT_ShadowStub", 0, 0, 1, eTT_2D, FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_USAGE_DEPTHSTENCIL, eTF_Unknown);
-
-        s_ptexDepthBufferQuarter = CTexture::CreateTextureObject("$DepthBufferQuarter", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_USAGE_DEPTHSTENCIL, eTF_Unknown);
-
-        if (!s_ptexModelHudBuffer)
-        {
-            s_ptexModelHudBuffer = CTexture::CreateTextureObject("$ModelHud", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_MODELHUD);
-        }
-
-        if (!s_ptexBackBuffer)
-        {
-            s_ptexSceneTarget = CTexture::CreateTextureObject("$SceneTarget", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SCENE_TARGET);
-            s_ptexCurrSceneTarget = s_ptexSceneTarget;
-
-            s_ptexSceneTargetR11G11B10F[0] = CTexture::CreateTextureObject("$SceneTargetR11G11B10F_0", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexSceneTargetR11G11B10F[1] = CTexture::CreateTextureObject("$SceneTargetR11G11B10F_1", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexSceneTargetScaledR11G11B10F[0] = CTexture::CreateTextureObject("$SceneTargetScaled0R11G11B10F", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexSceneTargetScaledR11G11B10F[1] = CTexture::CreateTextureObject("$SceneTargetScaled1R11G11B10F", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexSceneTargetScaledR11G11B10F[2] = CTexture::CreateTextureObject("$SceneTargetScaled2R11G11B10F", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexSceneTargetScaledR11G11B10F[3] = CTexture::CreateTextureObject("$SceneTargetScaled3R11G11B10F", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-
-            s_ptexVelocity = CTexture::CreateTextureObject("$Velocity", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexVelocityTiles[0] = CTexture::CreateTextureObject("$VelocityTilesTmp0", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexVelocityTiles[1] = CTexture::CreateTextureObject("$VelocityTilesTmp1", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexVelocityTiles[2] = CTexture::CreateTextureObject("$VelocityTiles", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexVelocityObjects[0] = CTexture::CreateTextureObject("$VelocityObjects", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            if (gRenDev->m_bDualStereoSupport)
-            {
-                s_ptexVelocityObjects[1] = CTexture::CreateTextureObject("$VelocityObjects_R", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            }
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-            if (gcpRendD3D && gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-            {
-                s_ptexGmemStenLinDepth = CTexture::CreateTextureObject("$GmemStenLinDepth", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            }
-#endif
-
-            s_ptexBackBuffer = CTexture::CreateTextureObject("$BackBuffer", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_BACKBUFFERMAP);
-
-            s_ptexPrevFrameScaled = CTexture::CreateTextureObject("$PrevFrameScale", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-            s_ptexWaterRipplesDDN = CTexture::CreateTextureObject("$WaterRipplesDDN_0", 256, 256, 1, eTT_2D, /*FT_DONT_RELEASE |*/ FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_FORCE_MIPS, eTF_Unknown, TO_WATERRIPPLESMAP);
-
-            s_ptexBackBufferScaled[0] = CTexture::CreateTextureObject("$BackBufferScaled_d2", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_BACKBUFFERSCALED_D2);
-            s_ptexBackBufferScaled[1] = CTexture::CreateTextureObject("$BackBufferScaled_d4", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_BACKBUFFERSCALED_D4);
-            s_ptexBackBufferScaled[2] = CTexture::CreateTextureObject("$BackBufferScaled_d8", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_BACKBUFFERSCALED_D8);
-
-            s_ptexBackBufferScaledTemp[0] = CTexture::CreateTextureObject("$BackBufferScaledTemp_d2", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-            s_ptexBackBufferScaledTemp[1] = CTexture::CreateTextureObject("$BackBufferScaledTemp_d4", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, -1);
-
-            s_ptexSceneNormalsMap = CTexture::CreateTextureObject("$SceneNormalsMap", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8, TO_SCENE_NORMALMAP);
-            s_ptexSceneNormalsBent = CTexture::CreateTextureObject("$SceneNormalsBent", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8);
-            s_ptexSceneDiffuse = CTexture::CreateTextureObject("$SceneDiffuse", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8);
-            ETEX_Format rtTextureFormat = eTF_R8G8B8A8;
-            
-            // Slimming GBuffer requires only one channel for specular due to packing of RGB values into YPbPr and
-            // specular components into less channels, thus saving bandwidth by not including G,B,A channels (75% saving)
-            if(CRenderer::CV_r_SlimGBuffer == 1)
-            {
-                rtTextureFormat = eTF_R8;
-            }
-            s_ptexSceneSpecular = CTexture::CreateTextureObject("$SceneSpecular", 0, 0, 1, eTT_2D, nRTFlags, rtTextureFormat);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(Texture_cpp)
-#endif
-            
-#if defined(AZ_PLATFORM_IOS)
-            int nRTSceneDiffuseFlags =  nRTFlags;
-            static ICVar* pVar = gEnv->pConsole->GetCVar("e_ShadowsClearShowMaskAtLoad");
-            if (pVar && !pVar->GetIVal())
-            {
-                nRTSceneDiffuseFlags |= FT_USAGE_MEMORYLESS;
-            }
-            s_ptexSceneDiffuseAccMap = CTexture::CreateTextureObject("$SceneDiffuseAcc", 0, 0, 1, eTT_2D, nRTSceneDiffuseFlags, eTF_R8G8B8A8, TO_SCENE_DIFFUSE_ACC);
-#else
-            s_ptexSceneDiffuseAccMap = CTexture::CreateTextureObject("$SceneDiffuseAcc", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8, TO_SCENE_DIFFUSE_ACC);
-#endif
-            s_ptexSceneSpecularAccMap = CTexture::CreateTextureObject("$SceneSpecularAcc", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8, TO_SCENE_SPECULAR_ACC);
-            s_ptexAmbientLookup = CTexture::CreateTextureObject("$AmbientLookup", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8);
-            s_ptexShadowMask = CTexture::CreateTextureObject("$ShadowMask", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8, TO_SHADOWMASK);
-
-            s_ptexFlaresGather = CTexture::CreateTextureObject("$FlaresGather", 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8);
-            for (i = 0; i < MAX_OCCLUSION_READBACK_TEXTURES; i++)
-            {
-                azsprintf(str, "$FlaresOcclusion_%d", i);
-                s_ptexFlaresOcclusionRing[i] = CTexture::CreateTextureObject(str, 0, 0, 1, eTT_2D, nRTFlags, eTF_R8G8B8A8);
-            }
-
-            // fixme: get texture resolution from CREWaterOcean
-            uint32 waterOceanMapFlags = FT_DONT_RELEASE | FT_NOMIPS | FT_USAGE_DYNAMIC | FT_DONT_STREAM;
-            uint32 waterVolumeTempFlags = FT_NOMIPS | FT_USAGE_DYNAMIC | FT_DONT_STREAM;
-#if CRY_USE_METAL
-            //We are now using the GPU to copy data into this texture. As a result we need to tag this texture as MtlTextureUsageRenderTarget so that on Metal can set the appropriate Usage flag.
-            waterOceanMapFlags |= FT_USAGE_RENDERTARGET;
-            waterVolumeTempFlags |= FT_USAGE_RENDERTARGET;
-#endif
-            s_ptexWaterOcean = CTexture::CreateTextureObject("$WaterOceanMap", 64, 64, 1, eTT_2D, waterOceanMapFlags, eTF_Unknown, TO_WATEROCEANMAP);
-            s_ptexWaterVolumeTemp = CTexture::CreateTextureObject("$WaterVolumeTemp", 64, 64, 1, eTT_2D, waterVolumeTempFlags, eTF_Unknown);
-
-            s_ptexWaterVolumeDDN = CTexture::CreateTextureObject("$WaterVolumeDDN", 64, 64, 1, eTT_2D, /*FT_DONT_RELEASE |*/ FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_FORCE_MIPS, eTF_Unknown,  TO_WATERVOLUMEMAP);
-            s_ptexWaterVolumeRefl[0] = CTexture::CreateTextureObject("$WaterVolumeRefl", 64, 64, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_FORCE_MIPS, eTF_Unknown, TO_WATERVOLUMEREFLMAP);
-            s_ptexWaterVolumeRefl[1] = CTexture::CreateTextureObject("$WaterVolumeReflPrev", 64, 64, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_FORCE_MIPS, eTF_Unknown, TO_WATERVOLUMEREFLMAPPREV);
-            s_ptexWaterCaustics[0] = CTexture::CreateTextureObject("$WaterVolumeCaustics", 512, 512, 1, eTT_2D, /*FT_DONT_RELEASE |*/ FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_WATERVOLUMECAUSTICSMAP);
-            s_ptexWaterCaustics[1] = CTexture::CreateTextureObject("$WaterVolumeCausticsTemp", 512, 512, 1, eTT_2D, /*FT_DONT_RELEASE |*/ FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_WATERVOLUMECAUSTICSMAPTEMP);
-
-            s_ptexRainDropsRT[0] = CTexture::CreateTextureObject("$RainDropsAccumRT_0", 512, 512, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-            s_ptexRainDropsRT[1] = CTexture::CreateTextureObject("$RainDropsAccumRT_1", 512, 512, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-
-            if (!s_ptexZTarget)
-            {
-                //for d3d10 we cannot free it during level transition, therefore allocate once and keep it
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-                // Custom Z-Target for GMEM render path
-                if (gcpRendD3D && gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-                {
-                    s_ptexZTarget = CTexture::s_ptexGmemStenLinDepth;
-                }
-                else
-#endif
-                {
-                    s_ptexZTarget = CTexture::CreateTextureObject("$ZTarget", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-                }
-            }
-
-            s_ptexFurZTarget = CTexture::CreateTextureObject("$FurZTarget", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown);
-
-            s_ptexZTargetScaled = CTexture::CreateTextureObject("$ZTargetScaled", 0, 0, 1, eTT_2D,
-                    FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_DOWNSCALED_ZTARGET_FOR_AO);
-
-            s_ptexZTargetScaled2 = CTexture::CreateTextureObject("$ZTargetScaled2", 0, 0, 1, eTT_2D,
-                    FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_QUARTER_ZTARGET_FOR_AO);
-        }
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-        // GMEM render path uses CTexture::s_ptexSceneSpecularAccMap as the HDR Target
-        // It gets set in CDeferredShading::CreateDeferredMaps()
-        if (gcpRendD3D && !gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            s_ptexHDRTarget = CTexture::CreateTextureObject("$HDRTarget", 0, 0, 1, eTT_2D, nRTFlags, eTF_Unknown);
-        }
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(Texture_cpp)
-#endif
-
-        // Create dummy texture object for terrain and clouds lightmap
-        s_ptexCloudsLM = CTexture::CreateTextureObject("$CloudsLM", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_CLOUDS_LM);
-
-        for (i = 0; i < 8; i++)
-        {
-            azsprintf(str, "$FromRE_%d", i);
-            if (!s_ptexFromRE[i])
-            {
-                s_ptexFromRE[i] = CTexture::CreateTextureObject(str, 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_FROMRE0 + i);
-            }
-        }
-
-        for (i = 0; i < 8; i++)
-        {
-            azsprintf(str, "$ShadowID_%d", i);
-            s_ptexShadowID[i] = CTexture::CreateTextureObject(str, 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SHADOWID0 + i);
-        }
-
-        for (i = 0; i < 2; i++)
-        {
-            azsprintf(str, "$FromRE%d_FromContainer", i);
-            if (!s_ptexFromRE_FromContainer[i])
-            {
-                s_ptexFromRE_FromContainer[i] = CTexture::CreateTextureObject(str, 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_FROMRE0_FROM_CONTAINER + i);
-            }
-        }
-
-        s_ptexVolObj_Density = CTexture::CreateTextureObject("$VolObj_Density", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_VOLOBJ_DENSITY);
-        s_ptexVolObj_Shadow = CTexture::CreateTextureObject("$VolObj_Shadow", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_VOLOBJ_SHADOW);
-
-        s_ptexColorChart = CTexture::CreateTextureObject("$ColorChart", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_COLORCHART);
-
-        s_ptexSkyDomeMie = CTexture::CreateTextureObject("$SkyDomeMie", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SKYDOME_MIE);
-        s_ptexSkyDomeRayleigh = CTexture::CreateTextureObject("$SkyDomeRayleigh", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SKYDOME_RAYLEIGH);
-        s_ptexSkyDomeMoon = CTexture::CreateTextureObject("$SkyDomeMoon", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_Unknown, TO_SKYDOME_MOON);
-
-        for (i = 0; i < EFTT_MAX; i++)
-        {
-            ::new(&((*s_ShaderTemplates)[i]))CTexture(FT_DONT_RELEASE);
-            (*s_ShaderTemplates)[i].SetCustomID(EFTT_DIFFUSE + i);
-            (*s_ShaderTemplates)[i].SetFlags(FT_DONT_RELEASE);
-        }
-        s_ShaderTemplatesInitialized = true;
-
-        s_pTexNULL = new CTexture(FT_DONT_RELEASE);
-
-        s_ptexVolumetricFog = CTexture::CreateTextureObject("$VolumetricInscattering", 0, 0, 0, eTT_3D, FT_NOMIPS | FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_UNORDERED_ACCESS, eTF_Unknown);
-        s_ptexVolumetricFogDensityColor = CTexture::CreateTextureObject("$DensityColorVolume", 0, 0, 0, eTT_3D, FT_NOMIPS | FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_USAGE_UNORDERED_ACCESS, eTF_Unknown);
-        s_ptexVolumetricFogDensity = CTexture::CreateTextureObject("$DensityVolume", 0, 0, 0, eTT_3D, FT_NOMIPS | FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_USAGE_UNORDERED_ACCESS, eTF_Unknown);
-        s_ptexVolumetricClipVolumeStencil = CTexture::CreateTextureObject("$ClipVolumeStencilVolume", 0, 0, 0, eTT_2D, FT_NOMIPS | FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_DEPTHSTENCIL | FT_USAGE_RENDERTARGET, eTF_Unknown);
-
-        // Create dummy texture object the "default environment probe".  This is only used for forward rendered passes that do not currently support tiled lighting.
-        // This texture object is solely used for the association between the string "$DefaultEnvironmentProbe" and the enum TO_DEFAULT_ENVIRONMENT_PROBE
-        if (!s_defaultEnvironmentProbeDummy)
-        {
-            s_defaultEnvironmentProbeDummy = CTexture::CreateTextureObject("$DefaultEnvironmentProbe", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM, eTF_Unknown, TO_DEFAULT_ENVIRONMENT_PROBE);
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(Texture_cpp)
-#endif
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CTexture::GetFormatName() const
-{
-    return NameForTextureFormat(GetDstFormat());
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CTexture::GetTypeName() const
-{
-    return NameForTextureType(GetTextureType());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderer::EF_AddRTStat(CTexture* pTex, int nFlags, int nW, int nH)
-{
-    SRTargetStat TS;
-    int nSize;
-    ETEX_Format eTF;
-    if (!pTex)
-    {
-        eTF = eTF_R8G8B8A8;
-        if (nW < 0)
-        {
-            nW = m_width;
-        }
-        if (nH < 0)
-        {
-            nH = m_height;
-        }
-        nSize = CTexture::TextureDataSize(nW, nH, 1, 1, 1, eTF);
-        TS.m_Name = "Back buffer";
-    }
-    else
-    {
-        eTF = pTex->GetDstFormat();
-        if (nW < 0)
-        {
-            nW = pTex->GetWidth();
-        }
-        if (nH < 0)
-        {
-            nH = pTex->GetHeight();
-        }
-        nSize = CTexture::TextureDataSize(nW, nH, 1, pTex->GetNumMips(), 1, eTF);
-        const char* szName = pTex->GetName();
-        if (szName && szName[0] == '$')
-        {
-            TS.m_Name = string("@") + string(&szName[1]);
-        }
-        else
-        {
-            TS.m_Name = szName;
-        }
-    }
-    TS.m_eTF = eTF;
-
-    if (nFlags > 0)
-    {
-        if (nFlags == 1)
-        {
-            TS.m_Name += " (Target)";
-        }
-        else
-        if (nFlags == 2)
-        {
-            TS.m_Name += " (Depth)";
-            nSize = nW * nH * 3;
-        }
-        else
-        if (nFlags == 4)
-        {
-            TS.m_Name += " (Stencil)";
-            nSize = nW * nH;
-        }
-        else
-        if (nFlags == 3)
-        {
-            TS.m_Name += " (Target + Depth)";
-            nSize += nW * nH * 3;
-        }
-        else
-        if (nFlags == 6)
-        {
-            TS.m_Name += " (Depth + Stencil)";
-            nSize = nW * nH * 4;
-        }
-        else
-        if (nFlags == 5)
-        {
-            TS.m_Name += " (Target + Stencil)";
-            nSize += nW * nH;
-        }
-        else
-        if (nFlags == 7)
-        {
-            TS.m_Name += " (Target + Depth + Stencil)";
-            nSize += nW * nH * 4;
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-    TS.m_nSize = nSize;
-    TS.m_nWidth = nW;
-    TS.m_nHeight = nH;
-
-    m_RP.m_RTStats.push_back(TS);
-}
-
-void CRenderer::EF_PrintRTStats(const char* szName)
-{
-    const int nYstep = 14;
-    int nY = 30; // initial Y pos
-    int nX = 20; // initial X pos
-    ColorF col = Col_Green;
-    Draw2dLabel((float)nX, (float)nY, 1.6f, &col.r, false, szName);
-    nX += 10;
-    nY += 25;
-
-    col = Col_White;
-    int nYstart = nY;
-    int nSize = 0;
-    for (int i = 0; i < m_RP.m_RTStats.size(); i++)
-    {
-        SRTargetStat* pRT = &m_RP.m_RTStats[i];
-
-        Draw2dLabel((float)nX, (float)nY, 1.4f, &col.r, false, "%s (%d x %d x %s), Size: %.3f Mb", pRT->m_Name.c_str(), pRT->m_nWidth, pRT->m_nHeight, CTexture::NameForTextureFormat(pRT->m_eTF), (float)pRT->m_nSize / 1024.0f / 1024.0f);
-        nY += nYstep;
-        if (nY >= m_height - 25)
-        {
-            nY = nYstart;
-            nX += 500;
-        }
-        nSize += pRT->m_nSize;
-    }
-    col = Col_Yellow;
-    Draw2dLabel((float)nX, (float)(nY + 10), 1.4f, &col.r, false, "Total: %d RT's, Size: %.3f Mb", m_RP.m_RTStats.size(), nSize / 1024.0f / 1024.0f);
-}
-
-bool CTexture::IsMSAAChanged()
-{
-#if defined(NULL_RENDERER)
-    return false;
-#else
-    const RenderTargetData* pRtdt = m_pRenderTargetData;
-    return pRtdt && (pRtdt->m_nMSAASamples != gRenDev->m_RP.m_MSAAData.Type || pRtdt->m_nMSAAQuality != gRenDev->m_RP.m_MSAAData.Quality);
-#endif
-}
-
-STexPool::~STexPool()
-{
-    STexPoolItemHdr* pITH = m_ItemsList.m_Next;
-
-    while (pITH != &m_ItemsList)
-    {
-        STexPoolItemHdr* pNext = pITH->m_Next;
-        STexPoolItem* pIT = static_cast<STexPoolItem*>(pITH);
-        CryLogAlways("***** Texture %p (%s) still in pool %p! Memory leak and crash will follow *****\n", pIT->m_pTex, pIT->m_pTex ? pIT->m_pTex->GetName() : "NULL", this);
-
-        if (pIT->m_pTex)
-        {
-            pIT->m_pTex->ReleaseDeviceTexture(true); // Try to recover in release
-        }
-
-        *const_cast<STexPool**>(&pIT->m_pOwner) = NULL;
-        pITH = pNext;
-    }
-}
-
-const ETEX_Type CTexture::GetTextureType() const
-{
-    return m_eTT;
-}
-
-void CTexture::SetTextureType(ETEX_Type type)
-{
-    // Only set the type if we have not loaded the file and created the device
-    // texture
-    if (!m_pDevTexture)
-    {
-        m_eTT = type;
-    }
-}
-
-const int CTexture::GetTextureID() const
-{
-    return GetID();
-}
-
-#ifdef TEXTURE_GET_SYSTEM_COPY_SUPPORT
-
-const ColorB* CTexture::GetLowResSystemCopy(uint16& nWidth, uint16& nHeight, int** ppLowResSystemCopyAtlasId)
-{
-    const LowResSystemCopyType::iterator& it = s_LowResSystemCopy.find(this);
-    if (it != CTexture::s_LowResSystemCopy.end())
-    {
-        nWidth = (*it).second.m_nLowResCopyWidth;
-        nHeight = (*it).second.m_nLowResCopyHeight;
-        *ppLowResSystemCopyAtlasId = &(*it).second.m_nLowResSystemCopyAtlasId;
-        return (*it).second.m_lowResSystemCopy.GetElements();
-    }
-
-    return NULL;
-}
-
-void CTexture::PrepareLowResSystemCopy(const byte* pTexData, bool bTexDataHasAllMips)
-{
-    if (m_eTT != eTT_2D || (m_nMips <= 1 && (m_nWidth > 16 || m_nHeight > 16)))
-    {
-        return;
-    }
-
-    // this function handles only compressed textures for now
-    if (m_eTFDst != eTF_BC3 && m_eTFDst != eTF_BC1 && m_eTFDst != eTF_BC2)
-    {
-        return;
-    }
-
-    // make sure we skip non diffuse textures
-    if (strstr(GetName(), "_ddn")
-        || strstr(GetName(), "_ddna")
-        || strstr(GetName(), "_mask")
-        || strstr(GetName(), "_spec.")
-        || strstr(GetName(), "_gloss")
-        || strstr(GetName(), "_displ")
-        || strstr(GetName(), "characters")
-        || strstr(GetName(), "$")
-        )
-    {
-        return;
-    }
-
-    if (pTexData)
-    {
-        SLowResSystemCopy& rSysCopy = s_LowResSystemCopy[this];
-
-        rSysCopy.m_nLowResCopyWidth = m_nWidth;
-        rSysCopy.m_nLowResCopyHeight = m_nHeight;
-
-        int nSrcOffset = 0;
-        int nMipId = 0;
-
-        while ((rSysCopy.m_nLowResCopyWidth > 16 || rSysCopy.m_nLowResCopyHeight > 16 || nMipId < 2) && (rSysCopy.m_nLowResCopyWidth >= 8 && rSysCopy.m_nLowResCopyHeight >= 8))
-        {
-            nSrcOffset += TextureDataSize(rSysCopy.m_nLowResCopyWidth, rSysCopy.m_nLowResCopyHeight, 1, 1, 1, m_eTFDst);
-            rSysCopy.m_nLowResCopyWidth /= 2;
-            rSysCopy.m_nLowResCopyHeight /= 2;
-            nMipId++;
-        }
-
-        int nSizeDxtMip = TextureDataSize(rSysCopy.m_nLowResCopyWidth, rSysCopy.m_nLowResCopyHeight, 1, 1, 1, m_eTFDst);
-        int nSizeRgbaMip = TextureDataSize(rSysCopy.m_nLowResCopyWidth, rSysCopy.m_nLowResCopyHeight, 1, 1, 1, eTF_R8G8B8A8);
-
-        rSysCopy.m_lowResSystemCopy.CheckAllocated(nSizeRgbaMip / sizeof(ColorB));
-
-        gRenDev->DXTDecompress(pTexData + (bTexDataHasAllMips ? nSrcOffset : 0), nSizeDxtMip,
-            (byte*)rSysCopy.m_lowResSystemCopy.GetElements(), rSysCopy.m_nLowResCopyWidth, rSysCopy.m_nLowResCopyHeight, 1, m_eTFDst, false, 4);
-    }
-}
-
-#endif // TEXTURE_GET_SYSTEM_COPY_SUPPORT
-
-void CTexture::InvalidateDeviceResource(uint32 dirtyFlags)
-{
-    //In the editor, multiple worker threads could destroy device resource sets
-    //which point to this texture. We need to lock to avoid a race-condition.
-    AZStd::lock_guard<AZStd::mutex> lockGuard(*m_invalidateCallbacksMutex);
-
-    for (const auto& cb : m_invalidateCallbacks)
-    {
-        cb.second(dirtyFlags);
-    }
-}
-
-void CTexture::AddInvalidateCallback(void* listener, InvalidateCallbackType callback)
-{
-    //In the editor, multiple worker threads could destroy device resource sets
-    //which point to this texture. We need to lock to avoid a race-condition.
-    AZStd::lock_guard<AZStd::mutex> lockGuard(*m_invalidateCallbacksMutex);
-
-    m_invalidateCallbacks.insert(AZStd::pair<void*, InvalidateCallbackType>(listener, callback));
-}
-
-void CTexture::RemoveInvalidateCallbacks(void* listener)
-{
-    //In the editor, multiple worker threads could destroy device resource sets
-    //which point to this texture. We need to lock to avoid a race-condition.
-    AZStd::lock_guard<AZStd::mutex> lockGuard(*m_invalidateCallbacksMutex);
-
-    m_invalidateCallbacks.erase(listener);
-}
-
-void CTexture::ApplyDepthTextureState(int unit, int nFilter, bool clamp)
-{
-    if (s_ptexZTarget != nullptr)
-    {
-        STexState depthTextState(nFilter, clamp);
-        s_ptexZTarget->Apply(unit, GetTexState(depthTextState));
-    }
-}
-
-CTexture* CTexture::GetZTargetTexture()
-{
-    return s_ptexZTarget;
-}
-
-int CTexture::GetTextureState(const STexState& TS)
-{
-    return GetTexState(TS);
-}
-
-void CTexture::ApplyForID(int id, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault)
-{
-    CTexture* pTex = id > 0 ? CTexture::GetByID(id) : nullptr;
-    if (pTex)
-    {
-        pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-    }
-    else if (useWhiteDefault)
-    {
-        CTextureManager::Instance()->GetWhiteTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-    }
-}
-
-CTexAnim::CTexAnim()
-{
-    m_nRefCount = 1;
-    m_Rand = 0;
-    m_NumAnimTexs = 0;
-    m_bLoop = false;
-    m_Time = 0.0f;
-}
-
-CTexAnim::~CTexAnim()
-{
-    for (uint32 i = 0; i < m_TexPics.Num(); i++)
-    {
-        ITexture* pTex = (ITexture*)m_TexPics[i];
-        SAFE_RELEASE(pTex);
-    }
-    m_TexPics.Free();
-}
-
-void CTexAnim::AddRef()
-{   
-    CryInterlockedIncrement(&m_nRefCount);
-}
-
-void CTexAnim::Release()
-{
-    long refCnt = CryInterlockedDecrement(&m_nRefCount);
-    if (refCnt > 0)
-    {
-        return;
-    }
-    delete this;
-}
-
-int CTexAnim::Size() const
-{
-    int nSize = sizeof(CTexAnim);
-    nSize += m_TexPics.GetMemoryUsage();
-    return nSize;
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/Texture.h b/Code/CryEngine/RenderDll/Common/Textures/Texture.h
deleted file mode 100644
index 77764fa80a..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/Texture.h
+++ /dev/null
@@ -1,2512 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// change file hash again
-
-#pragma once
-
-
-#include <set>
-#include "../ResFile.h"
-#include "PowerOf2BlockPacker.h"
-#include "STLPoolAllocator.h"
-
-#include "ITextureStreamer.h"
-
-#include "TextureArrayAlloc.h"
-#include "Image/DDSImage.h"
-
-#include "ImageExtensionHelper.h"
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-#include <AzCore/std/parallel/atomic.h>
-#include <AzCore/std/containers/map.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define TEXTURE_H_SECTION_1 1
-#define TEXTURE_H_SECTION_2 2
-#define TEXTURE_H_SECTION_3 3
-#define TEXTURE_H_SECTION_4 4
-#define TEXTURE_H_SECTION_5 5
-#define TEXTURE_H_SECTION_6 6
-#define TEXTURE_H_SECTION_7 7
-#endif
-
-// Only the editor needs to use a unique mutex per texture.
-// In the editor, multiple worker threads could destroy device resource sets which point to the same texture
-#if defined(AZ_PLATFORM_WINDOWS)
-    #define USE_UNIQUE_MUTEX_PER_TEXTURE
-#endif
-
-class CTexture;
-class CImageFile;
-class CTextureStreamPoolMgr;
-struct SDepthTexture;
-
-#define TEXPOOL_LOADSIZE 6 * 1024 * 1024
-#define MAX_MIP_LEVELS (100)
-#define CTEXTURE_RENDER_TARGET_USE_COUNT_NUMBER_BITS 2
-
-// Custom Textures IDs
-enum
-{
-    TO_RT_2D = 1,
-
-    TO_FOG,
-    TO_FROMOBJ,
-    TO_SVOTREE,
-    TO_SVOTRIS,
-    TO_SVOGLCM,
-    TO_SVORGBS,
-    TO_SVONORM,
-    TO_SVOOPAC,
-    TO_FROMOBJ_CM,
-
-    TO_SHADOWID0,
-    TO_SHADOWID1,
-    TO_SHADOWID2,
-    TO_SHADOWID3,
-    TO_SHADOWID4,
-    TO_SHADOWID5,
-    TO_SHADOWID6,
-    TO_SHADOWID7,
-
-    TO_FROMRE0,
-    TO_FROMRE1,
-
-    TO_FROMRE0_FROM_CONTAINER,
-    TO_FROMRE1_FROM_CONTAINER,
-
-    TO_SCREENMAP,
-    TO_SHADOWMASK,
-    TO_CLOUDS_LM,
-    TO_BACKBUFFERMAP,
-    TO_PREVBACKBUFFERMAP0,
-    TO_PREVBACKBUFFERMAP1,
-    TO_MIPCOLORS_DIFFUSE,
-    TO_MIPCOLORS_BUMP,
-
-    TO_DOWNSCALED_ZTARGET_FOR_AO,
-    TO_QUARTER_ZTARGET_FOR_AO,
-    TO_WATEROCEANMAP,
-    TO_WATERVOLUMEMAP,
-
-    TO_WATERVOLUMEREFLMAP,
-    TO_WATERVOLUMEREFLMAPPREV,
-    TO_WATERVOLUMECAUSTICSMAP,
-    TO_WATERVOLUMECAUSTICSMAPTEMP,
-
-    TO_WATERRIPPLESMAP,
-
-    TO_VOLOBJ_DENSITY,
-    TO_VOLOBJ_SHADOW,
-
-    TO_COLORCHART,
-
-    TO_ZTARGET_MS,
-
-    TO_SCENE_NORMALMAP,
-    TO_SCENE_NORMALMAP_MS,
-
-    TO_LPV_R,
-    TO_LPV_G,
-    TO_LPV_B,
-    TO_RSM_NORMAL,
-    TO_RSM_COLOR,
-    TO_RSM_DEPTH,
-
-    TO_SCENE_DIFFUSE_ACC,
-    TO_SCENE_SPECULAR_ACC,
-    TO_SCENE_DIFFUSE_ACC_MS,
-    TO_SCENE_SPECULAR_ACC_MS,
-    TO_SCENE_TEXTURES,
-    TO_SCENE_TARGET,
-
-    TO_BACKBUFFERSCALED_D2,
-    TO_BACKBUFFERSCALED_D4,
-    TO_BACKBUFFERSCALED_D8,
-
-    TO_SKYDOME_MIE,
-    TO_SKYDOME_RAYLEIGH,
-    TO_SKYDOME_MOON,
-
-    TO_VOLFOGSHADOW_BUF,
-
-    TO_HDR_MEASURED_LUMINANCE,
-    TO_MODELHUD,
-
-    TO_DEFAULT_ENVIRONMENT_PROBE,
-};
-
-
-#define NUM_HDR_TONEMAP_TEXTURES 4
-#define NUM_HDR_BLOOM_TEXTURES   3
-#define MIN_DOF_COC_K 6
-
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-#define MAX_OCCLUSION_READBACK_TEXTURES 2
-#else
-#define MAX_OCCLUSION_READBACK_TEXTURES 8
-#endif
-
-#define DYNTEXTURE_TEXCACHE_LIMIT 32
-
-inline int LogBaseTwo(int iNum)
-{
-    int i, n;
-    for (i = iNum - 1, n = 0; i > 0; i >>= 1, n++)
-    {
-        ;
-    }
-    return n;
-}
-
-enum EShadowBuffers_Pool
-{
-    SBP_D16,
-    SBP_D24S8,
-    SBP_D32FS8,
-    SBP_R16G16,
-    SBP_MAX,
-    SBP_UNKNOWN
-};
-
-//dx9 usages
-enum ETexture_Usage
-{
-    eTXUSAGE_AUTOGENMIPMAP,
-    eTXUSAGE_DEPTHSTENCIL,
-    eTXUSAGE_RENDERTARGET
-};
-
-
-
-#define SHADOWS_POOL_SIZE 1024//896 //768
-#define TEX_POOL_BLOCKLOGSIZE 5  // 32
-#define TEX_POOL_BLOCKSIZE   (1 << TEX_POOL_BLOCKLOGSIZE)
-
-struct SDynTexture_Shadow;
-struct SDepthTexture;
-
-//======================================================================
-// Dynamic textures
-struct SDynTexture
-    : public IDynTexture
-{
-    static uint32           s_nMemoryOccupied;
-    static SDynTexture      s_Root;
-
-    SDynTexture*           m_Next;          //!<
-    SDynTexture*           m_Prev;          //!<
-    char                    m_sSource[128]; //!< pointer to the given name in the constructor call
-
-    CTexture*              m_pTexture;
-    ETEX_Format             m_eTF;
-    ETEX_Type               m_eTT;
-    uint32                  m_nWidth;
-    uint32                  m_nHeight;
-    uint32                  m_nReqWidth;
-    uint32                  m_nReqHeight;
-    uint32                  m_nTexFlags;
-    uint32                  m_nFrameReset;
-
-
-    bool                    m_bLocked;
-    byte                    m_nUpdateMask;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Shadow specific vars.
-    //////////////////////////////////////////////////////////////////////////
-    int m_nUniqueID;
-
-    SDynTexture_Shadow* m_NextShadow;           //!<
-    SDynTexture_Shadow* m_PrevShadow;           //!<
-
-    ShadowMapFrustum* m_pFrustumOwner;
-    IRenderNode* pLightOwner;
-    int nObjectsRenderedCount;
-    //////////////////////////////////////////////////////////////////////////
-
-    SDynTexture(const char* szSource);
-    SDynTexture(int nWidth, int nHeight, ETEX_Format eTF, ETEX_Type eTT, int nTexFlags, const char* szSource);
-    ~SDynTexture();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Custom new/delete for pool allocator.
-    //////////////////////////////////////////////////////////////////////////
-    ILINE void* operator new(size_t nSize);
-    ILINE void operator delete(void* ptr);
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-
-
-    virtual int GetTextureID();
-    virtual bool Update(int nNewWidth, int nNewHeight);
-    bool RT_Update(int nNewWidth, int nNewHeight);
-    virtual void Apply(int nTUnit, int nTS = -1);
-    virtual bool ClearRT();
-    virtual bool SetRT(int nRT, bool bPush, struct SDepthTexture* pDepthSurf, bool bScreenVP = false);
-    virtual bool RT_SetRT(int nRT, int nWidth, int nHeight, bool bPush, bool bScreenVP = false);
-    virtual bool SetRectStates() { return true; }
-    virtual bool RestoreRT(int nRT, bool bPop);
-    virtual ITexture* GetTexture() { return (ITexture*)m_pTexture; }
-    virtual void Release() { delete this; }
-    virtual void ReleaseForce();
-    virtual void SetUpdateMask();
-    virtual void ResetUpdateMask();
-    virtual bool IsSecondFrame() { return m_nUpdateMask == 3; }
-    virtual byte GetFlags() const { return 0; }
-    virtual void GetSubImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight)
-    {
-        nX = 0;
-        nY = 0;
-        nWidth = m_nWidth;
-        nHeight = m_nHeight;
-    }
-    virtual void GetImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight);
-    virtual int GetWidth() { return m_nWidth; }
-    virtual int GetHeight() { return m_nHeight; }
-
-    void Lock() { m_bLocked = true; }
-    void UnLock() { m_bLocked = false; }
-
-    virtual void AdjustRealSize();
-    virtual bool IsValid();
-
-    _inline void UnlinkGlobal()
-    {
-        if (!m_Next || !m_Prev)
-        {
-            return;
-        }
-        m_Next->m_Prev = m_Prev;
-        m_Prev->m_Next = m_Next;
-        m_Next = m_Prev = NULL;
-    }
-    _inline void LinkGlobal(SDynTexture* Before)
-    {
-        if (m_Next || m_Prev)
-        {
-            return;
-        }
-        m_Next = Before->m_Next;
-        Before->m_Next->m_Prev = this;
-        Before->m_Next = this;
-        m_Prev = Before;
-    }
-    virtual void Unlink()
-    {
-        UnlinkGlobal();
-    }
-    virtual void Link()
-    {
-        LinkGlobal(&s_Root);
-    }
-    ETEX_Format GetFormat() { return m_eTF; }
-    bool FreeTextures(bool bOldOnly, int nNeedSpace);
-
-    typedef AZStd::multimap<unsigned int, CTexture*, AZStd::less<unsigned int>, AZ::AZStdAlloc<AZ::LegacyAllocator>> TextureSubset;
-    typedef TextureSubset::iterator TextureSubsetItor;
-    typedef AZStd::multimap<unsigned int, TextureSubset*, AZStd::less<unsigned int>, AZ::AZStdAlloc<AZ::LegacyAllocator>>  TextureSet;
-    typedef TextureSet::iterator TextureSetItor;
-
-    static TextureSet      s_availableTexturePool2D_BC1;
-    static TextureSubset   s_checkedOutTexturePool2D_BC1;
-    static TextureSet      s_availableTexturePool2D_R8G8B8A8;
-    static TextureSubset   s_checkedOutTexturePool2D_R8G8B8A8;
-    static TextureSet      s_availableTexturePool2D_R32F;
-    static TextureSubset   s_checkedOutTexturePool2D_R32F;
-    static TextureSet      s_availableTexturePool2D_R16F;
-    static TextureSubset   s_checkedOutTexturePool2D_R16F;
-
-    static TextureSet      s_availableTexturePool2D_R16G16F;
-    static TextureSubset   s_checkedOutTexturePool2D_R16G16F;
-    static TextureSet      s_availableTexturePool2D_R8G8B8A8S;
-    static TextureSubset   s_checkedOutTexturePool2D_R8G8B8A8S;
-    static TextureSet      s_availableTexturePool2D_R16G16B16A16F;
-    static TextureSubset   s_checkedOutTexturePool2D_R16G16B16A16F;
-    static TextureSet      s_availableTexturePool2D_R10G10B10A2;
-    static TextureSubset   s_checkedOutTexturePool2D_R10G10B10A2;
-
-    static TextureSet      s_availableTexturePool2D_R11G11B10F;
-    static TextureSubset   s_checkedOutTexturePool2D_R11G11B10F;
-    static TextureSet      s_availableTexturePoolCube_R11G11B10F;
-    static TextureSubset   s_checkedOutTexturePoolCube_R11G11B10F;
-    static TextureSet      s_availableTexturePool2D_R8G8S;
-    static TextureSubset   s_checkedOutTexturePool2D_R8G8S;
-    static TextureSet      s_availableTexturePoolCube_R8G8S;
-    static TextureSubset   s_checkedOutTexturePoolCube_R8G8S;
-
-    static TextureSet    s_availableTexturePool2D_Shadows[SBP_MAX];
-    static TextureSubset s_checkedOutTexturePool2D_Shadows[SBP_MAX];
-    static TextureSet    s_availableTexturePoolCube_Shadows[SBP_MAX];
-    static TextureSubset s_checkedOutTexturePoolCube_Shadows[SBP_MAX];
-
-    static TextureSet      s_availableTexturePool2DCustom_R16G16F;
-    static TextureSubset   s_checkedOutTexturePool2DCustom_R16G16F;
-
-    static TextureSet      s_availableTexturePoolCube_BC1;
-    static TextureSubset   s_checkedOutTexturePoolCube_BC1;
-    static TextureSet      s_availableTexturePoolCube_R8G8B8A8;
-    static TextureSubset   s_checkedOutTexturePoolCube_R8G8B8A8;
-    static TextureSet      s_availableTexturePoolCube_R32F;
-    static TextureSubset   s_checkedOutTexturePoolCube_R32F;
-    static TextureSet      s_availableTexturePoolCube_R16F;
-    static TextureSubset   s_checkedOutTexturePoolCube_R16F;
-    static TextureSet      s_availableTexturePoolCube_R16G16F;
-    static TextureSubset   s_checkedOutTexturePoolCube_R16G16F;
-    static TextureSet      s_availableTexturePoolCube_R8G8B8A8S;
-    static TextureSubset   s_checkedOutTexturePoolCube_R8G8B8A8S;
-    static TextureSet      s_availableTexturePoolCube_R16G16B16A16F;
-    static TextureSubset   s_checkedOutTexturePoolCube_R16G16B16A16F;
-
-    static TextureSet      s_availableTexturePoolCube_R10G10B10A2;
-    static TextureSubset   s_checkedOutTexturePoolCube_R10G10B10A2;
-
-    static TextureSet      s_availableTexturePoolCubeCustom_R16G16F;
-    static TextureSubset   s_checkedOutTexturePoolCubeCustom_R16G16F;
-
-    static uint32 s_iNumTextureBytesCheckedOut;
-    static uint32 s_iNumTextureBytesCheckedIn;
-
-    static uint32 s_SuggestedDynTexAtlasCloudsMaxsize;
-    static uint32 s_SuggestedTexAtlasSize;
-    static uint32 s_SuggestedDynTexMaxSize;
-    static uint32 s_CurDynTexAtlasCloudsMaxsize;
-    static uint32 s_CurTexAtlasSize;
-    static uint32 s_CurDynTexMaxSize;
-
-    CTexture* CreateDynamicRT();
-    CTexture* GetDynamicRT();
-    void ReleaseDynamicRT(bool bForce);
-
-    EShadowBuffers_Pool ConvertTexFormatToShadowsPool(ETEX_Format e);
-
-    static bool FreeAvailableDynamicRT(int nNeedSpace, TextureSet* pSet, bool bOldOnly);
-
-    static void ShutDown();
-
-    static void Init();
-    static void Tick();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-};
-
-
-typedef stl::PoolAllocatorNoMT<sizeof(SDynTexture)> SDynTexture_PoolAlloc;
-extern SDynTexture_PoolAlloc* g_pSDynTexture_PoolAlloc;
-
-//////////////////////////////////////////////////////////////////////////
-// Custom new/delete for pool allocator.
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-inline void* SDynTexture::operator new(size_t nSize)
-{
-    void* ptr = g_pSDynTexture_PoolAlloc->Allocate();
-    if (ptr)
-    {
-        memset(ptr, 0, nSize); // Clear objects memory.
-    }
-    return ptr;
-}
-//////////////////////////////////////////////////////////////////////////
-inline void SDynTexture::operator delete(void* ptr)
-{
-    if (ptr)
-    {
-        g_pSDynTexture_PoolAlloc->Deallocate(ptr);
-    }
-}
-
-
-//==============================================================================
-
-enum ETexPool : int
-{
-    eTP_Clouds,
-    eTP_Sprites,
-
-    eTP_Max
-};
-
-struct STextureSetFormat
-{
-    struct SDynTexture2*    m_pRoot;
-    ETEX_Format             m_eTF;
-    ETexPool                m_eTexPool;
-    ETEX_Type               m_eTT;
-    int                     m_nTexFlags;
-    std::vector<CPowerOf2BlockPacker*> m_TexPools;
-
-    STextureSetFormat(ETEX_Format eTF, ETexPool eTexPool, uint32 nTexFlags)
-    {
-        m_eTF = eTF;
-        m_eTexPool = eTexPool;
-        m_eTT = eTT_2D;
-        m_pRoot = NULL;
-        m_nTexFlags = nTexFlags;
-    }
-    ~STextureSetFormat();
-};
-
-struct SDynTexture2
-    : public IDynTexture
-{
-#ifndef _DEBUG
-    char* m_sSource;                        //!< pointer to the given name in the constructor call
-#else
-    char                   m_sSource[128];      //!< pointer to the given name in the constructor call
-#endif
-    STextureSetFormat* m_pOwner;
-    CPowerOf2BlockPacker* m_pAllocator;
-    CTexture* m_pTexture;
-    uint32                 m_nBlockID;
-    ETexPool               m_eTexPool;
-
-    SDynTexture2* m_Next;                   //!<
-    SDynTexture2** m_PrevLink;              //!<
-
-    void UnlinkGlobal()
-    {
-        if (m_Next)
-        {
-            m_Next->m_PrevLink = m_PrevLink;
-        }
-        if (m_PrevLink)
-        {
-            *m_PrevLink = m_Next;
-        }
-    }
-    void LinkGlobal(SDynTexture2*& Before)
-    {
-        if (Before)
-        {
-            Before->m_PrevLink = &m_Next;
-        }
-        m_Next = Before;
-        m_PrevLink = &Before;
-        Before = this;
-    }
-
-    void Link()
-    {
-        LinkGlobal(m_pOwner->m_pRoot);
-    }
-
-    void Unlink()
-    {
-        UnlinkGlobal();
-        m_Next = NULL;
-        m_PrevLink = NULL;
-    }
-
-    bool Remove();
-    virtual bool IsValid();
-    bool _IsValid() { return IsValid(); }
-
-    SDynTexture2(uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool);
-    SDynTexture2(const char* szSource, ETexPool eTexPool);
-    ~SDynTexture2();
-
-    bool UpdateAtlasSize(int nNewWidth, int nNewHeight);
-    void ReleaseForce();
-
-    virtual bool Update(int nNewWidth, int nNewHeight);
-    virtual void Apply(int nTUnit, int nTS = -1);
-    virtual bool ClearRT();
-    virtual bool SetRT(int nRT, bool bPush, SDepthTexture* pDepthSurf, bool bScreenVP = false);
-    virtual bool SetRectStates();
-    virtual bool RestoreRT(int nRT, bool bPop);
-    virtual ITexture* GetTexture() { return (ITexture*)m_pTexture; }
-    ETEX_Format GetFormat() { return m_pOwner->m_eTF; }
-    virtual void SetUpdateMask();
-    virtual void ResetUpdateMask();
-    virtual bool IsSecondFrame() { return m_nUpdateMask == 3; }
-    virtual byte GetFlags() const { return m_nFlags; }
-    virtual void SetFlags(byte flags) { m_nFlags = flags; }
-
-    // IDynTexture implementation
-    virtual void Release() { delete this; }
-    virtual void GetSubImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight)
-    {
-        nX = m_nX;
-        nY = m_nY;
-        nWidth = m_nWidth;
-        nHeight = m_nHeight;
-    }
-
-    virtual void GetImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight);
-    virtual int GetTextureID();
-    virtual void Lock() { m_bLocked = true; }
-    virtual void UnLock() { m_bLocked = false; }
-    virtual int GetWidth() { return m_nWidth; }
-    virtual int GetHeight() { return m_nHeight; }
-
-    typedef std::map<uint32, STextureSetFormat*>  TextureSet2;
-    typedef TextureSet2::iterator TextureSet2Itor;
-
-    static AZStd::unique_ptr<TextureSet2>      s_TexturePool[eTP_Max];
-    static int s_nMemoryOccupied[eTP_Max];
-
-    static void ShutDown();
-    static void Init(ETexPool eTexPool);
-
-    static int GetPoolMaxSize(ETexPool eTexPool);
-    static void SetPoolMaxSize(ETexPool eTexPool, int nSize, bool bWarn);
-    static const char* GetPoolName(ETexPool eTexPool);
-    static ETEX_Format GetPoolTexFormat(ETexPool eTexPool);
-    static int GetPoolTexNum(ETexPool eTexPool)
-    {
-        int nT = 0;
-        for (TextureSet2Itor it = s_TexturePool[eTexPool]->begin(); it != s_TexturePool[eTexPool]->end(); it++)
-        {
-            STextureSetFormat* pF = it->second;
-            nT += pF->m_TexPools.size();
-        }
-        return nT;
-    }
-
-    uint32 m_nX;
-    uint32 m_nY;
-    uint32 m_nWidth;
-    uint32 m_nHeight;
-
-    bool m_bLocked;
-    byte m_nFlags;
-    byte m_nUpdateMask;  // Crossfire odd/even frames
-    uint32 m_nFrameReset;
-    uint32 m_nAccessFrame;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Dynamic texture for the shadow.
-// This class must not contain any non static member variables,
-//  because SDynTexture allocated used constant size pool.
-//////////////////////////////////////////////////////////////////////////
-struct SDynTexture_Shadow
-    : public SDynTexture
-{
-    static SDynTexture_Shadow  s_RootShadow;
-
-    //////////////////////////////////////////////////////////////////////////
-    SDynTexture_Shadow(int nWidth, int nHeight, ETEX_Format eTF, ETEX_Type eTT, int nTexFlags, const char* szSource);
-    SDynTexture_Shadow(const char* szSource);
-    ~SDynTexture_Shadow();
-
-    _inline void UnlinkShadow()
-    {
-        //assert(gRenDev->m_pRT->IsRenderThread());
-        if (!m_NextShadow || !m_PrevShadow)
-        {
-            return;
-        }
-        m_NextShadow->m_PrevShadow = m_PrevShadow;
-        m_PrevShadow->m_NextShadow = m_NextShadow;
-        m_NextShadow = m_PrevShadow = NULL;
-    }
-    _inline void LinkShadow(SDynTexture_Shadow* Before)
-    {
-        assert(gRenDev->m_pRT->IsRenderThread());
-        if (m_NextShadow || m_PrevShadow)
-        {
-            return;
-        }
-        m_NextShadow = Before->m_NextShadow;
-        Before->m_NextShadow->m_PrevShadow = this;
-        Before->m_NextShadow = this;
-        m_PrevShadow = Before;
-    }
-
-    SDynTexture_Shadow* GetByID(int nID)
-    {
-        assert(gRenDev->m_pRT->IsRenderThread());
-        SDynTexture_Shadow* pTX = SDynTexture_Shadow::s_RootShadow.m_NextShadow;
-        for (pTX = SDynTexture_Shadow::s_RootShadow.m_NextShadow; pTX != &SDynTexture_Shadow::s_RootShadow; pTX = pTX->m_NextShadow)
-        {
-            if (pTX->m_nUniqueID == nID)
-            {
-                return pTX;
-            }
-        }
-        return NULL;
-    }
-    static void RT_EntityDelete(IRenderNode* pRenderNode);
-
-    virtual void Unlink()
-    {
-        assert(gRenDev->m_pRT->IsRenderThread());
-        UnlinkGlobal();
-        UnlinkShadow();
-    }
-    virtual void Link()
-    {
-        assert(gRenDev->m_pRT->IsRenderThread());
-        LinkGlobal(&s_Root);
-        LinkShadow(&s_RootShadow);
-    }
-    virtual void AdjustRealSize();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        SDynTexture::GetMemoryUsage(pSizer);
-    }
-
-    static SDynTexture_Shadow* GetForFrustum(ShadowMapFrustum* pFrustum);
-
-    static void ShutDown();
-};
-
-//==========================================================================
-// Texture
-
-struct STexCacheFileHeader
-{
-    int8 m_nSides;
-    int8 m_nMipsPersistent;
-    STexCacheFileHeader()
-    {
-        m_nSides = 0;
-        m_nMipsPersistent = 0;
-    }
-};
-
-struct SMipData
-{
-public:
-    byte* DataArray; // Data.
-    bool m_bNative : 1;
-
-    SMipData()
-        : m_bNative(false)
-        , DataArray(NULL)
-    {}
-    ~SMipData()
-    {
-        Free();
-    }
-
-    void Free()
-    {
-        SAFE_DELETE_ARRAY(DataArray);
-        m_bNative = false;
-    }
-    void Init(int InSize, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight)
-    {
-        assert(DataArray == NULL);
-        DataArray = new byte[InSize];
-        m_bNative = false;
-    }
-};
-
-struct STexPool;
-struct STexPoolItem;
-
-struct STexStreamRoundInfo
-{
-    STexStreamRoundInfo()
-    {
-        nRoundUpdateId = -1;
-        bHighPriority = false;
-        bLastHighPriority = false;
-    }
-
-    int32 nRoundUpdateId : 30;
-    uint32 bHighPriority : 1;
-    uint32 bLastHighPriority : 1;
-};
-
-struct STexStreamZoneInfo
-{
-    STexStreamZoneInfo()
-    {
-        fMinMipFactor = fLastMinMipFactor = 1000000.f;
-    }
-
-    float fMinMipFactor;
-    float fLastMinMipFactor;
-};
-
-struct STexMipHeader
-{
-    uint32 m_SideSizeWithMips : 31;
-    uint32 m_InPlaceStreamable : 1;
-    uint32 m_SideSize : 29;
-    uint32 m_eMediaType : 3;
-#if defined(TEXSTRM_STORE_DEVSIZES)
-    uint32 m_DevSideSizeWithMips;
-#endif
-    SMipData* m_Mips;
-    STexMipHeader()
-    {
-        m_SideSizeWithMips = 0;
-        m_InPlaceStreamable = 0;
-        m_SideSize = 0;
-        m_eMediaType = 0;
-#if defined(TEXSTRM_STORE_DEVSIZES)
-        m_DevSideSizeWithMips = 0;
-#endif
-        m_Mips = NULL;
-    }
-    ~STexMipHeader()
-    {
-        SAFE_DELETE_ARRAY(m_Mips);
-    }
-};
-
-struct STexStreamingInfo
-{
-    STexStreamZoneInfo m_arrSPInfo[MAX_PREDICTION_ZONES];
-
-    STexPoolItem* m_pPoolItem;
-
-    uint32 m_nSrcStart;
-
-    STexMipHeader* m_pMipHeader;
-    DDSSplitted::DDSDesc m_desc;
-    float m_fMinMipFactor;
-
-    STexStreamingInfo(){}
-    STexStreamingInfo(const uint8 nMips)
-    {
-        m_pPoolItem = NULL;
-        // +1 to accomodate queries for the size of the texture with no mips
-        m_pMipHeader = new STexMipHeader[nMips + 1];
-        m_nSrcStart = 0;
-        m_fMinMipFactor = 0.0f;
-    }
-
-    ~STexStreamingInfo()
-    {
-        SAFE_DELETE_ARRAY(m_pMipHeader);
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer, int nMips, int nSides) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_pMipHeader, sizeof(STexMipHeader) * nMips);
-        for (int i = 0; i < nMips; i++)
-        {
-            pSizer->AddObject(m_pMipHeader[i].m_Mips, sizeof(SMipData) * nSides);
-            for (int j = 0; j < nSides; j++)
-            {
-                pSizer->AddObject(m_pMipHeader[i].m_Mips[j].DataArray, m_pMipHeader[i].m_SideSize);
-            }
-        }
-    }
-
-    int GetSize(int nMips, int nSides)
-    {
-        int nSize = sizeof(*this);
-        for (int i = 0; i < nMips; i++)
-        {
-            nSize += sizeof(m_pMipHeader[i]);
-            for (int j = 0; j < nSides; j++)
-            {
-                nSize += sizeof(m_pMipHeader[i].m_Mips[j]);
-                if (m_pMipHeader[i].m_Mips[j].DataArray)
-                {
-                    nSize += m_pMipHeader[i].m_SideSize;
-                }
-            }
-        }
-        return nSize;
-    }
-
-    void* operator new ([[maybe_unused]] size_t sz, void* p){ return p; }
-    void operator delete ([[maybe_unused]] void* ptr, [[maybe_unused]] void* p){}
-
-private:
-    void* operator new (size_t sz);
-    void operator delete ([[maybe_unused]] void* ptr){__debugbreak(); }
-};
-
-struct STexStreamInMipState
-{
-    uint32 m_nSideDelta : 28;
-    bool m_bStreamInPlace : 1;
-    bool m_bExpanded : 1;
-    bool m_bUploaded : 1;
-
-    STexStreamInMipState()
-    {
-        m_nSideDelta = 0;
-        m_bStreamInPlace = false;
-        m_bExpanded = false;
-        m_bUploaded = false;
-    }
-};
-
-struct STexStreamInState
-    : public IStreamCallback
-{
-public:
-    enum
-    {
-        MaxMips = 12,
-        MaxStreams = MaxMips * 6,
-    };
-
-public:
-    STexStreamInState();
-
-    void Reset();
-    bool TryCommit();
-    virtual void StreamAsyncOnComplete (IReadStream* pStream, unsigned nError);
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-    void CopyMips();
-#endif
-
-public:
-    CTexture*              m_pTexture;
-    STexPoolItem*          m_pNewPoolItem;
-    volatile int                        m_nAsyncRefCount;
-    uint8                                     m_nHigherUploadedMip;
-    uint8                                     m_nLowerUploadedMip;
-    uint8                                     m_nActivateMip;
-    bool                                        m_bAborted;
-    bool                                        m_bValidLowMips;
-    volatile bool                       m_bAllStreamsComplete;
-#if defined(TEXSTRM_COMMIT_COOLDOWN)
-    int                                         m_nStallFrames;
-#endif
-
-#ifndef _RELEASE
-    float                                       m_fStartTime;
-#endif
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    ID3D11CommandList*          m_pCmdList;
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(Texture_h)
-#endif
-
-    IReadStreamPtr                  m_pStreams[MaxStreams];
-    STexStreamInMipState        m_mips[MaxMips];
-};
-
-struct STexStreamPrepState
-    : IImageFileStreamCallback
-{
-public:
-    STexStreamPrepState()
-        : m_bCompleted(false)
-        , m_bFailed(false)
-        , m_bNeedsFinalise(false)
-    {
-    }
-
-    bool Commit();
-
-public: // IImageFileStreamCallback Members
-    virtual void OnImageFileStreamComplete(CImageFile* pImFile);
-
-public:
-    _smart_ptr<CTexture> m_pTexture;
-    _smart_ptr<CImageFile> m_pImage;
-    volatile bool m_bCompleted;
-    volatile bool m_bFailed;
-    volatile bool m_bNeedsFinalise;
-
-private:
-    STexStreamPrepState(const STexStreamPrepState&);
-    STexStreamPrepState& operator = (const STexStreamPrepState&);
-};
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-struct STexStreamOutState
-{
-public:
-    void Reset();
-    bool TryCommit();
-
-    void CopyMips();
-
-public:
-    AZ::LegacyJobExecutor m_jobExecutor;
-
-    CTexture*                               m_pTexture;
-    STexPoolItem*                       m_pNewPoolItem;
-    uint8                                       m_nStartMip;
-    volatile bool                       m_bDone;
-    volatile bool                       m_bAborted;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(Texture_h)
-#endif
-};
-#endif
-
-//===================================================================
-
-struct SEnvTexture
-{
-    bool m_bInprogress;
-    bool m_bReady;
-    bool m_bWater;
-    bool m_bReflected;
-    bool m_bReserved;
-    int m_MaskReady;
-    int m_Id;
-    int m_TexSize;
-    // Result Cube-Map or 2D RT texture
-    SDynTexture* m_pTex;
-    float m_TimeLastUpdated;
-    Vec3 m_CamPos;
-    Vec3 m_ObjPos;
-    Ang3 m_Angle;
-    int m_nFrameReset;
-    Matrix44 m_Matrix;
-    //void *m_pQuery[6];
-    //void *m_pRenderTargets[6];
-
-    // Cube maps average colors (used for RT radiosity)
-    int m_nFrameCreated[6];
-    ColorF m_EnvColors[6];
-
-    SEnvTexture()
-    {
-        m_bInprogress = false;
-        m_bReady = false;
-        m_bWater = false;
-        m_bReflected = false;
-        m_bReserved = false;
-        m_MaskReady = 0;
-        m_Id = 0;
-        m_pTex = NULL;
-        m_nFrameReset = -1;
-        m_CamPos.Set(0.0f, 0.0f, 0.0f);
-        m_ObjPos.Set(0.0f, 0.0f, 0.0f);
-        m_Angle.Set(0.0f, 0.0f, 0.0f);
-
-        for (int i = 0; i < 6; i++)
-        {
-            //m_pQuery[i] = NULL;
-            m_nFrameCreated[i] = -1;
-            //m_pRenderTargets[i] = NULL;
-        }
-    }
-
-    void Release();
-    void ReleaseDeviceObjects();
-    void RT_SetMatrix();
-};
-
-
-//===============================================================================
-
-struct SPixFormat
-{
-    // Pixel format info.
-    D3DFormat       DeviceFormat;// Pixel format from Direct3D.
-    const char*     Desc;   // Stat: Human readable name for stats.
-    int8            BytesPerBlock;// Total bits per pixel.
-    uint8           bCanDS : 1;
-    uint8           bCanRT : 1;
-    uint8           bCanMultiSampleRT : 1;
-    uint8           bCanMipsAutoGen : 1;
-    uint8           bCanReadSRGB : 1;
-    uint8           bCanGather : 1;
-    uint8           bCanGatherCmp : 1;
-    uint8           bCanBlend : 1;
-    int16           MaxWidth;
-    int16           MaxHeight;
-    SPixFormat* Next;
-
-    SPixFormat()
-    {
-        Init();
-    }
-    void Init()
-    {
-        BytesPerBlock = 0;
-        DeviceFormat = (D3DFormat)0;
-        Desc = NULL;
-        Next = NULL;
-        bCanDS = false;
-        bCanRT = false;
-        bCanMultiSampleRT = false;
-        bCanMipsAutoGen = false;
-        bCanReadSRGB = false;
-        bCanGather = false;
-        bCanGatherCmp = false;
-        bCanBlend = false;
-    }
-    bool IsValid() const
-    {
-        if (BytesPerBlock)
-        {
-            return true;
-        }
-        return false;
-    }
-    bool CheckSupport(D3DFormat Format, const char* szDescr, ETexture_Usage eTxUsage = eTXUSAGE_AUTOGENMIPMAP);
-};
-
-struct SPixFormatSupport
-{
-    SPixFormat        m_FormatA8;                  //8 bit alpha
-    SPixFormat        m_FormatR8;
-    SPixFormat        m_FormatR8S;
-    SPixFormat        m_FormatR8G8;                //16 bit
-    SPixFormat        m_FormatR8G8S;               //16 bit
-    SPixFormat        m_FormatR8G8B8A8;            //32 bit
-    SPixFormat        m_FormatR8G8B8A8S;           //32 bit
-    SPixFormat        m_FormatR10G10B10A2;         //32 bit
-
-    SPixFormat        m_FormatR16;                 //16 bit
-    SPixFormat        m_FormatR16U;                //16 bit
-    SPixFormat        m_FormatR16G16U;             //32 bit
-    SPixFormat        m_FormatR10G10B10A2UI;       //32 bit
-    SPixFormat        m_FormatR16F;                //16 bit
-    SPixFormat        m_FormatR32F;                //32 bit
-    SPixFormat        m_FormatR16G16;              //32 bit
-    SPixFormat        m_FormatR16G16S;             //32 bit
-    SPixFormat        m_FormatR16G16F;             //32 bit
-    SPixFormat        m_FormatR11G11B10F;          //32 bit
-    SPixFormat        m_FormatR16G16B16A16F;       //64 bit
-    SPixFormat        m_FormatR16G16B16A16;        //64 bit
-    SPixFormat        m_FormatR16G16B16A16S;       //64 bit
-    SPixFormat        m_FormatR32G32B32A32F;       //128 bit
-
-    SPixFormat        m_FormatBC1;                 //Compressed RGB
-    SPixFormat        m_FormatBC2;                 //Compressed RGBA
-    SPixFormat        m_FormatBC3;                 //Compressed RGBA
-    SPixFormat        m_FormatBC4U;                // ATI1, single channel compression, unsigned
-    SPixFormat        m_FormatBC4S;                // ATI1, single channel compression, signed
-    SPixFormat        m_FormatBC5U;                //
-    SPixFormat        m_FormatBC5S;                //
-    SPixFormat        m_FormatBC6UH;               //Compressed RGB
-    SPixFormat        m_FormatBC6SH;               //Compressed RGB
-    SPixFormat        m_FormatBC7;                 //Compressed RGBA
-
-    SPixFormat        m_FormatR9G9B9E5;            //Shared exponent RGB
-
-    SPixFormat        m_FormatEAC_R11;             //EAC compressed single channel for mobile
-    SPixFormat        m_FormatEAC_RG11;            //EAC compressed dual channel for mobile
-    SPixFormat        m_FormatETC2;                //ETC2 compressed RGB for mobile
-    SPixFormat        m_FormatETC2A;               //ETC2a compressed RGBA for mobile
-
-    SPixFormat        m_FormatD16;         //16bit fixed point depth
-    SPixFormat        m_FormatD24S8;           //24bit fixed point depth + 8bit stencil
-    SPixFormat        m_FormatD32F;                //32bit floating point depth
-    SPixFormat        m_FormatD32FS8;              //32bit floating point depth + 8bit stencil
-
-    SPixFormat        m_FormatB5G6R5;              //16 bit
-    SPixFormat        m_FormatB5G5R5;              //16 bit
-    SPixFormat        m_FormatB4G4R4A4;            //16 bit
-    SPixFormat        m_FormatB8G8R8X8;            //32 bit
-    SPixFormat        m_FormatB8G8R8A8;            //32 bit
-
-#ifdef CRY_USE_METAL
-    SPixFormat        m_FormatPVRTC2;               //ETC2 compressed RGB for mobile
-    SPixFormat        m_FormatPVRTC4;               //ETC2a compressed RGBA for mobile
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    SPixFormat        m_FormatASTC_4x4;
-    SPixFormat        m_FormatASTC_5x4;
-    SPixFormat        m_FormatASTC_5x5;
-    SPixFormat        m_FormatASTC_6x5;
-    SPixFormat        m_FormatASTC_6x6;
-    SPixFormat        m_FormatASTC_8x5;
-    SPixFormat        m_FormatASTC_8x6;
-    SPixFormat        m_FormatASTC_8x8;
-    SPixFormat        m_FormatASTC_10x5;
-    SPixFormat        m_FormatASTC_10x6;
-    SPixFormat        m_FormatASTC_10x8;
-    SPixFormat        m_FormatASTC_10x10;
-    SPixFormat        m_FormatASTC_12x10;
-    SPixFormat        m_FormatASTC_12x12;
-#endif
-
-    SPixFormat*       m_FirstPixelFormat;
-
-    void CheckFormatSupport();
-};
-
-struct STexStageInfo
-{
-    int m_nCurState;
-    CDeviceTexture* m_DevTexture;
-
-    STexState  m_State;
-    float            m_fMipBias;
-#if !defined(NULL_RENDERER)
-    D3DShaderResourceView* m_pCurResView;
-    EHWShaderClass            m_eHWSC;
-#endif
-
-    STexStageInfo()
-    {
-        Flush();
-    }
-    void Flush()
-    {
-        m_nCurState = -1;
-        m_State.m_nMipFilter = -1;
-        m_State.m_nMinFilter = -1;
-        m_State.m_nMagFilter = -1;
-        m_State.m_nAddressU = -1;
-        m_State.m_nAddressV = -1;
-        m_State.m_nAddressW = -1;
-        m_State.m_nAnisotropy = 0;
-#if !defined(NULL_RENDERER)
-        m_pCurResView = NULL;
-        m_eHWSC = eHWSC_Pixel;
-#endif
-        m_DevTexture = NULL;
-        m_fMipBias = 0.f;
-    }
-};
-
-
-struct STexData
-{
-    const byte* m_pData[6];
-    uint16 m_nWidth;
-    uint16 m_nHeight;
-    uint16 m_nDepth;
-protected:
-    uint8 m_reallocated;
-public:
-    ETEX_Format m_eTF;
-    uint8 m_nMips;
-    int m_nFlags;
-    float m_fAvgBrightness;
-    ColorF m_cMinColor;
-    ColorF m_cMaxColor;
-    const char* m_pFilePath;
-
-    STexData()
-    {
-        m_pData[0] = m_pData[1] = m_pData[2] = m_pData[3] = m_pData[4] = m_pData[5] = 0;
-        m_nWidth = 0;
-        m_nHeight = 0;
-        m_nDepth = 1;
-        m_reallocated = 0;
-        m_eTF = eTF_Unknown;
-        m_nMips = 0;
-        m_nFlags = 0;
-        m_fAvgBrightness = 1.0f;
-        m_cMinColor = 0.0f;
-        m_cMaxColor = 1.0f;
-        m_pFilePath = 0;
-    }
-    void AssignData(unsigned int i, const byte* pNewData)
-    {
-        assert(i < 6);
-        if (WasReallocated(i))
-        {
-            delete [] m_pData[i];
-        }
-        m_pData[i] = pNewData;
-        SetReallocated(i);
-    }
-    bool WasReallocated(unsigned int i) const
-    {
-        return (m_reallocated & (1 << i)) != 0;
-    }
-    void SetReallocated(unsigned int i)
-    {
-        m_reallocated |= (1 << i);
-    }
-};
-
-struct SDepthTexture
-{
-    int nWidth;
-    int nHeight;
-    bool bBusy;
-    int nFrameAccess;
-    D3DTexture* pTarget;
-    D3DDepthSurface* pSurf;
-    CTexture* pTex;
-    SDepthTexture()
-        : nWidth(0)
-        , nHeight(0)
-        , bBusy(false)
-        , nFrameAccess(-1)
-        , pTarget(nullptr)
-        , pSurf(nullptr)
-        , pTex(nullptr)
-    {}
-
-    void Release(bool bReleaseTex = false);
-
-    ~SDepthTexture();
-};
-
-
-struct DirtyRECT
-{
-    RECT srcRect;
-    uint16 dstX;
-    uint16 dstY;
-};
-
-
-struct SResourceView
-{
-    typedef uint64 KeyType;
-
-    static const KeyType DefaultView = (KeyType) - 1LL;
-    static const KeyType DefaultViewMS = (KeyType) - 2LL;
-    static const KeyType DefaultViewSRGB = (KeyType) - 3LL;
-
-    enum ResourceViewType
-    {
-        eShaderResourceView = 0,
-        eRenderTargetView,
-        eDepthStencilView,
-        eUnorderedAccessView,
-
-        eNumResourceViews
-    };
-
-    union ResourceViewDesc
-    {
-        struct
-        {
-            uint64 eViewType        : 3;
-            uint64 nFormat          : 7;
-            uint64 nFirstSlice      : 11;
-            uint64 nSliceCount      : 11;
-            uint64 nMostDetailedMip : 4;
-            uint64 nMipCount        : 4;
-            uint64 bSrgbRead        : 1;
-            uint64 bMultisample     : 1;
-            uint64 nFlags           : 2;
-            uint64 nUnused          : 20;
-        };
-
-        KeyType Key;
-    };
-
-    SResourceView(uint64 nKey = DefaultView)
-    {
-        COMPILE_TIME_ASSERT(sizeof(m_Desc) <= sizeof(KeyType));
-
-        m_Desc.Key = nKey;
-        m_pDeviceResourceView = NULL;
-    }
-
-    static SResourceView ShaderResourceView(ETEX_Format nFormat, int nFirstSlice = 0, int nSliceCount = -1, int nMostDetailedMip = 0, int nMipCount = -1, bool bSrgbRead = false, bool bMultisample = false);
-    static SResourceView RenderTargetView(ETEX_Format nFormat, int nFirstSlice = 0, int nSliceCount = -1, int nMipLevel = 0, bool bMultisample = false);
-    static SResourceView DepthStencilView(ETEX_Format nFormat, int nFirstSlice = 0, int nSliceCount = -1, int nMipLevel = 0, int nFlags = 0, bool bMultisample = false);
-    static SResourceView UnorderedAccessView(ETEX_Format nFormat, int nFirstSlice = 0, int nSliceCount = -1, int nMipLevel = 0, int nFlags = 0);
-
-    bool operator==(const SResourceView& other) const
-    {
-        return m_Desc.Key == other.m_Desc.Key;
-    }
-
-    ResourceViewDesc m_Desc;
-    void* m_pDeviceResourceView;
-};
-
-// properties of the render targets ONLY
-struct RenderTargetData
-{
-    int m_nRTSetFrameID;                    // last read access, compare with GetFrameID(false)
-    struct
-    {
-        uint8 m_nMSAASamples : 4;
-        uint8 m_nMSAAQuality : 4;
-    };
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(Texture_h)
-#endif
-    TArray<SResourceView> m_ResourceViews;
-    CDeviceTexture* m_pDeviceTextureMSAA;
-
-    RenderTargetData()
-    {
-        memset(this, 0, sizeof(*this));
-        m_nRTSetFrameID = -1;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_H_SECTION_4
-    #include AZ_RESTRICTED_FILE(Texture_h)
-#endif
-    }
-    ~RenderTargetData();
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-struct SStreamFormatCodeKey
-{
-    union
-    {
-        struct
-        {
-            uint16 nWidth;
-            uint16 nHeight;
-            ETEX_Format fmt;
-            uint8 nTailMips;
-        } s;
-        uint64 u;
-    };
-
-    SStreamFormatCodeKey(uint32 nWidth, uint32 nHeight, ETEX_Format fmt, uint8 nTailMips)
-    {
-        u = 0;
-        s.nWidth = (uint16)nWidth;
-        s.nHeight = (uint16)nHeight;
-        s.fmt = fmt;
-        s.nTailMips = nTailMips;
-    }
-
-    friend bool operator < (const SStreamFormatCodeKey& a, const SStreamFormatCodeKey& b)
-    {
-        return a.u < b.u;
-    }
-};
-
-struct SStreamFormatSize
-{
-    uint32 size : 31;
-    uint32 alignSlices : 1;
-};
-
-struct SStreamFormatCode
-{
-    enum
-    {
-        MaxMips = 14
-    };
-    SStreamFormatSize sizes[MaxMips];
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-class CTexture
-    : public ITexture
-    , public CBaseResource
-{
-    friend struct SDynTexture;
-    friend struct SDynTexture2;
-    friend class CD3D9Renderer;
-    friend struct STexStreamInState;
-    friend struct STexStreamOutState;
-    friend class ITextureStreamer;
-    friend class CPlanningTextureStreamer;
-    friend struct SPlanningTextureOrder;
-    friend struct SPlanningTextureRequestOrder;
-    friend struct STexPoolItem;
-    friend struct CompareStreamingPrioriry;
-    friend struct CompareStreamingPrioriryInv;
-
-public:
-    virtual void ApplyTexture(int nTUnit, int nState = -1) override
-    {
-        Apply(nTUnit, nState);
-    }
-
-    virtual void Apply(int nTUnit, int nState = -1, int nTexMatSlot = EFTT_UNKNOWN, int nSUnit = -1, SResourceView::KeyType nResViewKey = SResourceView::DefaultView, EHWShaderClass eHWSC = eHWSC_Pixel);
-
-private:
-    D3DSurface* m_pDeviceRTV;
-    D3DSurface* m_pDeviceRTVMS;
-
-    CDeviceTexture* m_pDevTexture;
-    const SPixFormat* m_pPixelFormat;
-
-    // Start block that should fit in one cache-line
-    // Reason is to minimize cache misses during texture streaming update job
-    // Note: This is checked COMPILE_TIME_ASSERTS in ~CTexture implementation (Texture.cpp)
-
-    STexStreamingInfo* m_pFileTexMips;      // properties of the streamable texture ONLY
-
-    uint16 m_nWidth;
-    uint16 m_nHeight;
-    uint16 m_nDepth;
-    ETEX_Format m_eTFDst;
-    ETEX_TileMode m_eSrcTileMode;
-    uint8 m_nStreamFormatCode;
-
-    uint32 m_nFlags;                                // e.g. FT_USAGE_DYNAMIC
-
-    bool m_bStreamed : 1;
-    bool m_bStreamPrepared : 1;
-    bool m_bStreamRequested : 1;
-    bool m_bWasUnloaded : 1;
-    bool m_bPostponed : 1;
-    bool m_bForceStreamHighRes : 1;
-    bool m_bNeedRestoring : 1;
-    bool m_bNoDevTexture : 1;
-
-    bool m_bNoTexture : 1;
-    bool m_bResolved : 1;
-    bool m_bUseMultisampledRTV : 1; // Allows switching rendering between multisampled/non-multisampled rendertarget views
-    bool m_bHighQualityFiltering : 1;
-    bool m_bCustomFormat : 1;   // Allow custom texture formats - for faster texture fetches
-    bool m_bVertexTexture : 1;
-    bool m_bUseDecalBorderCol : 1;
-    bool m_bIsSRGB : 1;
-
-    bool m_bAsyncDevTexCreation : 1;
-    bool m_bInDistanceSortedList : 1;
-    bool m_bCreatedInLevel : 1;
-    bool m_bUsedRecently : 1;
-    bool m_bStatTracked : 1;
-    bool m_bStreamHighPriority : 1;
-    uint8 m_renderTargetUseCount : CTEXTURE_RENDER_TARGET_USE_COUNT_NUMBER_BITS; // Not a bool because a render target can be pushed on the RTStack multiple times
-
-    int8 m_nCustomID;
-
-    uint8 m_nArraySize;
-    int8 m_nMips;
-    ETEX_Type m_eTT;
-
-    ETEX_Format m_eTFSrc;
-    int8 m_nStreamingPriority;
-    int8 m_nMinMipVidUploaded;
-    int8 m_nMinMipVidActive;
-
-    uint16 m_nStreamSlot;
-    int16 m_fpMinMipCur;
-
-    STexCacheFileHeader m_CacheFileHeader;
-    uint16 m_nDefState;
-
-    int32 m_nActualSize;
-    int32 m_nPersistentSize;
-
-    int m_nAccessFrameID;                                   // last read access, compare with GetFrameID(false)
-    STexStreamRoundInfo m_streamRounds[MAX_PREDICTION_ZONES];
-
-    // End block that should fit in one cache-line
-
-    DynArray<STexComposition> m_composition;
-    float   m_fCurrentMipBias;                          // streaming mip fading
-    float m_fAvgBrightness;
-    ColorF m_cMinColor;
-    ColorF m_cMaxColor;
-    ColorF m_cClearColor;
-
-    RenderTargetData* m_pRenderTargetData;
-
-    string m_SrcName;
-
-#ifndef _RELEASE
-    string m_sAssetScopeName;
-#endif
-    D3DShaderResourceView* m_pDeviceShaderResource;
-    D3DShaderResourceView* m_pDeviceShaderResourceSRGB;
-
-    typedef AZStd::function<void(uint32)> InvalidateCallbackType;
-    AZStd::unordered_multimap<void*, InvalidateCallbackType> m_invalidateCallbacks;
-
-    AZStd::mutex* m_invalidateCallbacksMutex = nullptr;
-    static StaticInstance<AZStd::mutex> m_staticInvalidateCallbacksMutex;
-
-    bool m_bisTextureMissing = false;
-
-public:
-    int m_nUpdateFrameID;                   // last write access, compare with GetFrameID(false)
-
-private:
-
-#ifdef TEXTURE_GET_SYSTEM_COPY_SUPPORT
-    struct SLowResSystemCopy
-    {
-        SLowResSystemCopy()
-        {
-            m_nLowResSystemCopyAtlasId = 0;
-            m_nLowResCopyWidth = m_nLowResCopyHeight = 0;
-        }
-        PodArray<ColorB> m_lowResSystemCopy;
-        uint16 m_nLowResCopyWidth, m_nLowResCopyHeight;
-        int m_nLowResSystemCopyAtlasId;
-    };
-    typedef std::map<const CTexture*, SLowResSystemCopy> LowResSystemCopyType;
-    static StaticInstance<LowResSystemCopyType> s_LowResSystemCopy;
-    void PrepareLowResSystemCopy(const byte* pTexData, bool bTexDataHasAllMips);
-    const ColorB* GetLowResSystemCopy(uint16& nWidth, uint16& nHeight, int** ppLowResSystemCopyAtlasId);
-#endif
-
-    static CCryNameTSCRC GenName(const char* name, uint32 nFlags = 0);
-    static CTexture* NewTexture(const char* name, uint32 nFlags, ETEX_Format eTFDst, bool& bFound);
-
-    ETEX_Format FormatFixup(ETEX_Format src);
-    bool FormatFixup(STexData& td);
-    bool ImagePreprocessing(STexData& td);
-
-#ifndef _RELEASE
-    static void OutputDebugInfo();
-#endif
-
-    static CCryNameTSCRC    s_sClassName;
-
-protected:
-    virtual ~CTexture();
-
-public:
-    //! Dirty flags will indicate what kind of device data was invalidated
-    enum EDeviceDirtyFlags
-    {
-        eDeviceResourceDirty = BIT(0),
-        eDeviceResourceViewDirty = BIT(1),
-    };
-
-public:
-    CTexture(const uint32 nFlags)
-    {
-        m_nFlags = nFlags;
-        m_eTFDst = eTF_Unknown;
-        m_eTFSrc = eTF_Unknown;
-        m_nMips = 1;
-        m_nWidth = 0;
-        m_nHeight = 0;
-        m_eTT = eTT_2D;
-        m_nDepth = 1;
-        m_nArraySize = 1;
-        m_nActualSize = 0;
-        m_fAvgBrightness = 1.0f;
-        m_cMinColor = 0.0f;
-        m_cMaxColor = 1.0f;
-        m_cClearColor = ColorF(0.0f, 0.0f, 0.0f, 1.0f);
-        m_nPersistentSize = 0;
-        m_fAvgBrightness = 0.0f;
-
-        m_nUpdateFrameID = -1;
-        m_nAccessFrameID = -1;
-        m_nCustomID = -1;
-        m_pPixelFormat = NULL;
-        m_pDevTexture = NULL;
-        m_pDeviceRTV = NULL;
-        m_pDeviceRTVMS = NULL;
-        m_pDeviceShaderResource = NULL;
-        m_pDeviceShaderResourceSRGB = NULL;
-
-        m_bAsyncDevTexCreation = false;
-
-        m_renderTargetUseCount = 0;
-        m_bNeedRestoring = false;
-        m_bNoTexture = false;
-        m_bResolved = true;
-        m_bUseMultisampledRTV = true;
-        m_bHighQualityFiltering = false;
-        m_bCustomFormat = false;
-        m_eSrcTileMode = eTM_None;
-
-        m_bPostponed = false;
-        m_bForceStreamHighRes = false;
-        m_bWasUnloaded = false;
-        m_bStreamed = false;
-        m_bStreamPrepared = false;
-        m_bStreamRequested = false;
-        m_bVertexTexture = false;
-        m_bUseDecalBorderCol = false;
-        m_bIsSRGB = false;
-        m_bNoDevTexture = false;
-        m_bInDistanceSortedList = false;
-        m_bCreatedInLevel = gRenDev->m_bInLevel;
-        m_bUsedRecently = 0;
-        m_bStatTracked = 0;
-        m_bStreamHighPriority = 0;
-        m_nStreamingPriority = 0;
-        m_nMinMipVidUploaded = MAX_MIP_LEVELS;
-        m_nMinMipVidActive = MAX_MIP_LEVELS;
-        m_nStreamSlot = InvalidStreamSlot;
-        m_fpMinMipCur = MAX_MIP_LEVELS << 8;
-        m_nStreamFormatCode = 0;
-
-        m_nDefState = 0;
-        m_pFileTexMips = NULL;
-        m_fCurrentMipBias = 0.f;
-
-        m_pRenderTargetData = (nFlags & FT_USAGE_RENDERTARGET) ? new RenderTargetData : NULL;
-
-        COMPILE_TIME_ASSERT(MaxStreamTasks < 32767);
-
-#if defined(USE_UNIQUE_MUTEX_PER_TEXTURE)
-        // Only the editor needs to use a unique mutex per texture.
-        // In the editor, multiple worker threads could destroy device resource sets which point to the same texture
-        if (gEnv->IsEditor())
-        {
-            m_invalidateCallbacksMutex = new AZStd::mutex();
-        }
-#endif
-        // If we do not need a unique mutex per texture, use the StaticInstance
-        if (m_invalidateCallbacksMutex == nullptr)
-        {
-            m_invalidateCallbacksMutex = &m_staticInvalidateCallbacksMutex;
-        }
-    }
-
-
-
-    bool GetIsTextureMissing() const
-    {
-        return m_bisTextureMissing;
-    }
-
-    // ITexture interface
-    virtual int AddRef() { return CBaseResource::AddRef(); }
-    virtual int Release()
-    {
-        if (!(m_nFlags & FT_DONT_RELEASE) || IsActiveRenderTarget())
-        {
-            return CBaseResource::Release();
-        }
-
-        return -1;
-    }
-    virtual int ReleaseForce()
-    {
-        m_nFlags &= ~FT_DONT_RELEASE;
-        int nRef = 0;
-        while (true)
-        {
-            nRef = Release();
-            if (nRef <= 0)
-            {
-                break;
-            }
-        }
-        return nRef;
-    }
-
-    virtual const char* GetName() const { return GetSourceName(); }
-    virtual const int GetWidth() const { return m_nWidth; }
-    ILINE const int GetWidthNonVirtual() const { return m_nWidth; }
-    virtual const int GetHeight() const { return m_nHeight; }
-    ILINE const int GetHeightNonVirtual() const { return m_nHeight; }
-    virtual const int GetDepth() const { return m_nDepth; }
-    ILINE const int GetDepthNonVirtual() const { return m_nDepth; }
-    ILINE const int GetNumSides() const { return m_CacheFileHeader.m_nSides; }
-    ILINE const int8 GetNumPersistentMips() const { return m_CacheFileHeader.m_nMipsPersistent; }
-    ILINE const bool IsForceStreamHighRes() const { return m_bForceStreamHighRes; }
-    ILINE const bool IsStreamHighPriority() const { return m_bStreamHighPriority; }
-    virtual const int GetTextureID() const;
-    void SetFlags(uint32 nFlags) { m_nFlags = nFlags; }
-    virtual const uint32 GetFlags() const { return m_nFlags; }
-    ILINE const int GetNumMipsNonVirtual() const { return m_nMips; }
-    virtual const int GetNumMips() const { return m_nMips; }
-    virtual const int GetRequiredMip() const { return max(0, m_fpMinMipCur >> 8); }
-    ILINE const int GetRequiredMipNonVirtual() const { return max(0, m_fpMinMipCur >> 8); }
-    ILINE const int GetRequiredMipNonVirtualFP() const { return m_fpMinMipCur; }
-    virtual const ETEX_Type GetTextureType() const;
-    virtual void SetTextureType(ETEX_Type type);
-
-    ILINE const int GetDefState() const { return m_nDefState; }
-    virtual void SetClamp(bool bEnable)
-    {
-        int nMode = bEnable ? TADDR_CLAMP : TADDR_WRAP;
-        SetClampingMode(nMode, nMode, nMode);
-        UpdateTexStates();
-    }
-
-    ILINE const bool IsTextureMissing() const { return m_bisTextureMissing; }
-    virtual const bool IsTextureLoaded() const { return IsLoaded(); }
-    virtual void PrecacheAsynchronously(float fMipFactor, int nFlags, int nUpdateId, int nCounter = 1);
-    virtual byte* GetData32(int nSide = 0, int nLevel = 0, byte* pDst = NULL, ETEX_Format eDstFormat = eTF_R8G8B8A8);
-    virtual const int GetDeviceDataSize() const { return m_nActualSize; }
-    virtual const int GetDataSize() const
-    {
-        if (IsStreamed())
-        {
-            return StreamComputeDevDataSize(0);
-        }
-        return m_nActualSize;
-    }
-    virtual bool SetFilter(int nFilter) { return SetFilterMode(nFilter); }
-    virtual bool Clear();
-    virtual bool Clear(const ColorF& color);
-    virtual float GetAvgBrightness() const { return m_fAvgBrightness; }
-    virtual void SetAvgBrightness(float fBrightness)  { m_fAvgBrightness = fBrightness; }
-    virtual const ColorF& GetMinColor() const { return m_cMinColor; }
-    virtual void SetMinColor(const ColorF& cMinColor)  { m_cMinColor = cMinColor; }
-    virtual const ColorF& GetMaxColor() const { return m_cMaxColor; }
-    virtual void SetMaxColor(const ColorF& cMaxColor)  { m_cMaxColor = cMaxColor; }
-    virtual const ColorF& GetClearColor() const override { return m_cClearColor; }
-    virtual void SetClearColor(const ColorF& cClearColor) { m_cClearColor = cClearColor; }
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const;
-    virtual const char* GetFormatName() const;
-    virtual const char* GetTypeName() const;
-
-    virtual const bool IsShared() const
-    {
-        return CBaseResource::GetRefCounter() > 1;
-    }
-
-    virtual const ETEX_Format GetTextureDstFormat() const { return m_eTFDst; }
-    virtual const ETEX_Format GetTextureSrcFormat() const { return m_eTFSrc; }
-
-    virtual const bool IsParticularMipStreamed(float fMipFactor) const;
-
-    // Internal functions
-    const ETEX_Format GetDstFormat() const override { return m_eTFDst; }
-    const ETEX_Format GetSrcFormat() const override { return m_eTFSrc; }
-    const ETEX_Type GetTexType() const { return m_eTT; }
-    const uint32 StreamGetNumSlices() const
-    {
-        switch (m_eTT)
-        {
-        case eTT_2D:
-        case eTT_2DArray:
-            return m_nArraySize;
-
-        case eTT_Cube:
-            return 6 * m_nArraySize;
-
-        default:
-#ifndef _RELEASE
-            __debugbreak();
-#endif
-            return 1;
-        }
-    }
-
-    void RT_ReleaseDevice();
-
-    static _inline bool IsTextureExist(const ITexture* pTex) { return pTex && pTex->GetDevTexture(); }
-
-    const bool IsNoTexture() const { return m_bNoTexture; };
-    void SetNeedRestoring() { m_bNeedRestoring = true; }
-    void SetWasUnload(bool bSet) { m_bWasUnloaded = bSet; }
-    const bool IsPartiallyLoaded() const { return m_nMinMipVidUploaded != 0; }
-    const bool IsUnloaded(void) const { return m_bWasUnloaded; }
-    void SetKeepSystemCopy(bool bKeepSystemCopy)
-    {
-        if (bKeepSystemCopy)
-        {
-            m_nFlags |= FT_KEEP_LOWRES_SYSCOPY;
-        }
-        else
-        {
-            m_nFlags &= ~FT_KEEP_LOWRES_SYSCOPY;
-        }
-    }
-    void SetStreamingInProgress(uint16 nStreamSlot)
-    {
-        assert (nStreamSlot == InvalidStreamSlot || m_nStreamSlot == InvalidStreamSlot);
-        m_nStreamSlot = nStreamSlot;
-    }
-    void SetStreamingPriority(const uint8 nPriority) { m_nStreamingPriority = nPriority; }
-    ILINE const STexStreamRoundInfo& GetStreamRoundInfo(int zone) const { return m_streamRounds[zone]; }
-    void ResetNeedRestoring() { m_bNeedRestoring = false; }
-    const bool IsNeedRestoring() const { return m_bNeedRestoring; }
-    const int StreamGetLoadedMip() const { return m_nMinMipVidUploaded; }
-    const uint8 StreamGetFormatCode() const { return m_nStreamFormatCode; }
-    const int StreamGetActiveMip() const { return m_nMinMipVidActive; }
-    const int StreamGetPriority() const { return m_nStreamingPriority; }
-    const bool IsResolved() const { return m_bResolved; }
-    void SetUseMultisampledRTV(bool bSet) { m_bUseMultisampledRTV = bSet; }
-    const bool UseMultisampledRTV() const { return m_bUseMultisampledRTV; }
-    const bool IsVertexTexture() const { return m_bVertexTexture; }
-    void SetVertexTexture(bool bEnable) { m_bVertexTexture = bEnable; }
-    const bool IsDynamic() const { return ((m_nFlags & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET)) != 0); }
-    bool IsStillUsedByGPU();
-
-    // Render targets can be bound for write on the render target stack multiple times at once,
-    // so increment and decrement when it is pushed/popped from the stack
-    void IncrementRenderTargetUseCount()
-    {
-        assert(m_renderTargetUseCount < (1 << CTEXTURE_RENDER_TARGET_USE_COUNT_NUMBER_BITS));
-        m_renderTargetUseCount++;
-    }
-    void DecrementRenderTargetUseCount()
-    {
-        assert(m_renderTargetUseCount > 0);
-        m_renderTargetUseCount--;
-    }
-
-    // Is this texture bound on the render target stack?
-    const bool IsActiveRenderTarget() const { return m_renderTargetUseCount > 0; }
-
-    const bool IsLoaded() const { return (m_nFlags & FT_FAILED) == 0; }
-    ILINE const bool IsStreamed() const { return m_bStreamed; }
-    ILINE const bool IsInDistanceSortedList() const { return m_bInDistanceSortedList; }
-    bool IsPostponed() const { return m_bPostponed; }
-    ILINE const bool IsStreaming() const { return m_nStreamSlot != InvalidStreamSlot; }
-    virtual const bool IsStreamedVirtual() const { return IsStreamed(); }
-    virtual bool IsStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES]) const;
-    virtual const int GetAccessFrameId() const { return m_nAccessFrameID; }
-    ILINE const int GetAccessFrameIdNonVirtual() const { return m_nAccessFrameID; }
-    void SetResolved(bool bResolved) { m_bResolved = bResolved; }
-    const int GetCustomID() const { return m_nCustomID; }
-    void SetCustomID(int nID) { m_nCustomID = nID; }
-    const bool UseDecalBorderCol() const { return m_bUseDecalBorderCol; }
-    const bool IsSRGB() const { return m_bIsSRGB; }
-    void SRGBRead(bool bEnable = false) { m_bIsSRGB = bEnable; }
-    const bool IsCustomFormat() const { return m_bCustomFormat; }
-    void SetCustomFormat() { m_bCustomFormat = true; }
-    void SetWidth(short width) { m_nWidth = width; }
-    void SetHeight(short height) { m_nHeight = height; }
-    int GetUpdateFrameID() const { return m_nUpdateFrameID; }
-    ILINE const int32 GetActualSize() const { return m_nActualSize; }
-    ILINE const int32 GetPersistentSize() const { return m_nPersistentSize; }
-
-    ILINE void PrefetchStreamingInfo() const { PrefetchLine(m_pFileTexMips, 0); }
-    const STexStreamingInfo* GetStreamingInfo() const { return m_pFileTexMips; }
-
-    virtual const bool IsStreamable() const { return IsStreamed(); }
-
-    void Readback(AZ::u32 subresourceIndex, StagingHook callback) override;
-
-    const bool IsStreamableNonVirtual() const { return !(m_nFlags & FT_DONT_STREAM) && !(m_eTT == eTT_3D); }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_H_SECTION_5
-    #include AZ_RESTRICTED_FILE(Texture_h)
-#endif
-
-    bool IsFPFormat() const { return CImageExtensionHelper::IsRangeless(m_eTFDst); };
-
-    D3DSurface* GetDeviceRT() const { return m_pDeviceRTV; }
-
-    CDeviceTexture* GetDevTexture() const { return m_pDevTexture; }
-    void SetDevTexture(CDeviceTexture* pDeviceTex);
-    bool IsAsyncDevTexCreation() const { return m_bAsyncDevTexCreation; }
-
-    // note: render target should be created with FT_FORCE_MIPS flag
-    bool GenerateMipMaps(bool bSetOrthoProj = false, bool bUseHW = true, bool bNormalMap = false);
-
-    D3DShaderResourceView* GetShaderResourceView(SResourceView::KeyType resourceViewID = SResourceView::DefaultView, bool bLegacySrgbLookup = false);
-    void SetShaderResourceView(D3DShaderResourceView* pDeviceShaderResource, bool bMultisampled = false);
-
-    CDeviceTexture* GetDevTextureMSAA() const { return m_pRenderTargetData->m_pDeviceTextureMSAA; }
-    D3DUnorderedAccessView* GetDeviceUAV();
-
-    SResourceView& GetResourceView(const SResourceView& rvDesc);
-    void* CreateDeviceResourceView(const SResourceView& rvDesc);
-
-    D3DDepthSurface* GetDeviceDepthStencilSurf(int nFirstSlice = 0, int nSliceCount = -1);
-#ifndef NULL_RENDERER
-    D3DSurface* GetSurface(int nCMSide, int nLevel);
-#endif
-    const SPixFormat* GetPixelFormat() const { return m_pPixelFormat; }
-    bool Invalidate(int nNewWidth, int nNewHeight, ETEX_Format eTF);
-    const char* GetSourceName() const { return m_SrcName.c_str(); }
-    void SetSourceName( const char* srcName) { m_SrcName = srcName; }
-    const int GetSize(bool bIncludePool) const;
-    void PostCreate();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Will notify resource's user that some data of the the resource was invalidated.
-    // dirtyFlags - one or more of the EDeviceDirtyFlags enum bits
-    void InvalidateDeviceResource(uint32 dirtyFlags);
-    void AddInvalidateCallback(void* listener, InvalidateCallbackType callback);
-    void RemoveInvalidateCallbacks(void* listener);
-    //////////////////////////////////////////////////////////////////////////
-
-public:
-    //===================================================================
-    // Streaming support
-
-    // Global streaming constants
-    static int s_nStreamingMode;
-    static int s_nStreamingUpdateMode;
-    static int s_nStreamingThroughput;  // in bytes
-    static float s_nStreamingTotalTime; // in secs
-    static bool s_bStreamDontKeepSystem;
-    static bool s_bPrecachePhase;
-    static bool s_bInLevelPhase;
-    static bool s_bPrestreamPhase;
-    static bool s_bStreamingFromHDD;
-    static int s_nTexturesDataBytesLoaded;
-    static volatile int s_nTexturesDataBytesUploaded;
-    static int s_nStatsAllocFails;
-    static bool s_bOutOfMemoryTotally;
-
-    static volatile size_t s_nStatsStreamPoolInUseMem;                  // Amount of stream pool currently in use by texture streaming
-    static volatile size_t s_nStatsStreamPoolBoundMem;                  // Amount of stream pool currently bound and in use by textures (avail + non avail)
-    static volatile size_t s_nStatsStreamPoolBoundPersMem;          // Amount of stream pool currently bound and in use by persistent texture mem (avail + non avail)
-    static AZStd::atomic_uint s_nStatsCurManagedNonStreamedTexMem;
-    static AZStd::atomic_uint s_nStatsCurDynamicTexMem;
-    static volatile size_t s_nStatsStreamPoolWanted;
-    static bool s_bStatsComputeStreamPoolWanted;
-
-    struct WantedStat
-    {
-        _smart_ptr<ITexture> pTex;
-        uint32 nWanted;
-    };
-
-    static std::vector<WantedStat>* s_pStatsTexWantedLists;
-    static AZStd::set<string, AZStd::less<string>, AZ::StdLegacyAllocator> s_vTexReloadRequests;
-    static CryCriticalSection s_xTexReloadLock;
-
-    static CTextureStreamPoolMgr* s_pPoolMgr;
-
-    static ITextureStreamer* s_pTextureStreamer;
-
-    static CryCriticalSection s_streamFormatLock;
-    static SStreamFormatCode s_formatCodes[256];
-    static uint32 s_nFormatCodes;
-    typedef std::map<SStreamFormatCodeKey, uint32> TStreamFormatCodeKeyMap;
-    static StaticInstance<TStreamFormatCodeKeyMap> s_formatCodeMap;
-
-    static const int LOW_SPEC_PC;
-    static const int MEDIUM_SPEC_PC;
-    static const int HIGH_SPEC_PC;
-    static const int VERYHIGH_SPEC_PC;
-
-    enum
-    {
-        MaxStreamTasks = 512,
-        MaxStreamPrepTasks = 8192,
-        StreamOutMask = 0x8000,
-        StreamPrepMask = 0x4000,
-        StreamIdxMask = 0x4000 - 1,
-        InvalidStreamSlot = 0xffff,
-    };
-
-    static CTextureArrayAlloc<STexStreamInState, MaxStreamTasks> s_StreamInTasks;
-    static CTextureArrayAlloc<STexStreamPrepState*, MaxStreamPrepTasks> s_StreamPrepTasks;
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-    static CTextureArrayAlloc<STexStreamOutState, MaxStreamTasks> s_StreamOutTasks;
-#endif
-
-    static volatile TIntAtomic s_nBytesSubmittedToStreaming;
-    static volatile TIntAtomic s_nMipsSubmittedToStreaming;
-    static int s_nBytesRequiredNotSubmitted;
-
-#if !defined (_RELEASE)
-    static int s_TextureUpdates;
-    static float s_TextureUpdatesTime;
-    static int s_TexturesUpdatedRendered;
-    static float s_TextureUpdatedRenderedTime;
-    static int s_StreamingRequestsCount;
-    static float s_StreamingRequestsTime;
-    static int s_nStatsCurManagedStreamedTexMemRequired;
-#endif
-
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-    static ITextureStreamListener* s_pStreamListener;
-#endif
-
-    static void Precache();
-    static void RT_Precache();
-    static void StreamValidateTexSize();
-    static uint8 StreamComputeFormatCode(uint32 nWidth, uint32 nHeight, uint32 nMips, ETEX_Format fmt);
-
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-    static void StreamUpdateStats();
-#endif
-
-#if defined(TEXSTRM_STORE_DEVSIZES)
-    int StreamComputeDevDataSize(int nFromMip) const
-    {
-        if (m_pFileTexMips)
-        {
-            return m_pFileTexMips->m_pMipHeader[nFromMip].m_DevSideSizeWithMips;
-        }
-        else
-        {
-            return CDeviceTexture::TextureDataSize(
-                max(1, m_nWidth >> nFromMip),
-                max(1, m_nHeight >> nFromMip),
-                max(1, m_nDepth >> nFromMip),
-                m_nMips - nFromMip,
-                StreamGetNumSlices(),
-                m_eTFDst);
-        }
-    }
-#else
-    int StreamComputeDevDataSize(int nFromMip) const
-    {
-        return CDeviceTexture::TextureDataSize(
-            max(1, m_nWidth >> nFromMip),
-            max(1, m_nHeight >> nFromMip),
-            max(1, m_nDepth >> nFromMip),
-            m_nMips - nFromMip,
-            StreamGetNumSlices(),
-            m_eTFDst);
-    }
-#endif
-
-#ifndef NULL_RENDERER
-    void StreamUploadMip(IReadStream* pStream, int nMip, int nBaseMipOffset, STexPoolItem* pNewPoolItem, STexStreamInMipState& mipState);
-    void StreamUploadMipSide(
-        int const iSide, int const Sides, const byte* const pRawData, int nSrcPitch,
-        const STexMipHeader& mh, bool const bStreamInPlace,
-        int const nCurMipWidth, int const nCurMipHeight, int const nMip,
-        CDeviceTexture* pDeviceTexture, uint32 nBaseTexWidth, uint32 nBaseTexHeight, int nBaseMipOffset);
-#endif
-    void StreamExpandMip(const void* pRawData, int nMip, int nBaseMipOffset, int nSideDelta);
-    static void RT_FlushAllStreamingTasks(const bool bAbort = false);
-    static bool IsStreamingInProgress() { return s_StreamInTasks.GetNumLive() > 0; }
-    static void AbortStreamingTasks(CTexture* pTex);
-    static bool StartStreaming(CTexture* pTex, STexPoolItem* pNewPoolItem, const int nStartMip, const int nEndMip, const int nActivateMip, EStreamTaskPriority estp);
-    bool CanStreamInPlace(int nMip, STexPoolItem* pNewPoolItem);
-#if defined(TEXSTRM_ASYNC_TEXCOPY)
-    bool CanAsyncCopy();
-#endif
-    void StreamCopyMipsTexToMem(int nStartMip, int nEndMip, bool bToDevice, STexPoolItem* pNewPoolItem);
-    static void StreamCopyMipsTexToTex(STexPoolItem* pSrcItem, int nMipSrc, STexPoolItem* pDestItem, int nMipDest, int nNumMips);   // GPU-assisted platform-dependent
-    static void CopySliceChain(CDeviceTexture* const pDevTexture, int ownerMips, int nDstSlice, int nDstMip, CDeviceTexture* pSrcDevTex, int nSrcSlice, int nSrcMip, int nSrcMips, int nNumMips);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_H_SECTION_6
-    #include AZ_RESTRICTED_FILE(Texture_h)
-#endif
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    ID3D11CommandList* StreamCreateDeferred(int nStartMip, int nEndMip, STexPoolItem* pNewPoolItem, STexPoolItem* pSrcPoolItem);
-    void StreamApplyDeferred(ID3D11CommandList* pCmdList);
-#endif
-    void StreamReleaseMipsData(int nStartMip, int nEndMip);
-    int16 StreamCalculateMipsSignedFP(float fMipFactor) const;
-    float StreamCalculateMipFactor(int16 nMipsSigned) const;
-    virtual int StreamCalculateMipsSigned(float fMipFactor) const;
-    virtual int GetStreamableMipNumber()  const;
-    virtual int GetStreamableMemoryUsage(int nStartMip) const;
-    virtual int GetMinLoadedMip() const { return m_nMinMipVidUploaded; }
-    void SetMinLoadedMip(int nMinMip);
-    void StreamUploadMips(int nStartMip, int nEndMip, STexPoolItem* pNewPoolItem);
-    int StreamUnload();
-    int StreamTrim(int nToMip);
-    void StreamActivateLod(int nMinMip);
-    void StreamLoadFromCache(const int nFlags);
-    bool StreamPrepare(bool bFromLoad);
-    bool StreamPrepare(CImageFile* pImage);
-    bool StreamPrepareComposition();
-    bool StreamPrepare_Platform();
-    bool StreamPrepare_Finalise(bool bFromLoad);
-    STexPool* StreamGetPool(int nStartMip, int nMips);
-    STexPoolItem* StreamGetPoolItem(int nStartMip, int nMips, bool bShouldBeCreated, bool bCreateFromMipData = false, bool bCanCreate = true, bool bForStreamOut = false);
-    void StreamRemoveFromPool();
-    void StreamAssignPoolItem(STexPoolItem* pItem, int nMinMip);
-
-    static void StreamState_Update();
-    static void StreamState_UpdatePrep();
-
-    static STexStreamInState* StreamState_AllocateIn();
-    static void StreamState_ReleaseIn(STexStreamInState* pState);
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-    static STexStreamOutState* StreamState_AllocateOut();
-    static void StreamState_ReleaseOut(STexStreamOutState* pState);
-#endif
-    static STexStreamingInfo* StreamState_AllocateInfo(int nMips);
-    static void StreamState_ReleaseInfo(CTexture* pOwnerTex, STexStreamingInfo* pInfo);
-
-    ILINE void Relink()
-    {
-        gRenDev->m_pRT->RC_RelinkTexture(this);
-    }
-
-    ILINE void Unlink()
-    {
-        gRenDev->m_pRT->RC_UnlinkTexture(this);
-    }
-
-    _inline void RT_Relink()
-    {
-        if (!IsStreamed() || IsInDistanceSortedList())
-        {
-            return;
-        }
-
-        s_pTextureStreamer->Relink(this);
-    }
-    _inline void RT_Unlink()
-    {
-        if (IsInDistanceSortedList())
-        {
-            s_pTextureStreamer->Unlink(this);
-        }
-    }
-    //=======================================================
-
-    static void ApplyForID(int nTUnit, int nID, int nState, int nSUnit)
-    {
-        CTexture* pTex = GetByID(nID);
-        assert (pTex);
-        if (pTex)
-        {
-            pTex->Apply(nTUnit, nState, EFTT_UNKNOWN, nSUnit);
-        }
-    }
-
-    static void ApplyForID(int nID, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault);
-
-    static const CCryNameTSCRC& mfGetClassName();
-    static CTexture* GetByID(int nID);
-    static CTexture* GetByName(const char* szName, uint32 flags = 0);
-    static CTexture* GetByNameCRC(CCryNameTSCRC Name);
-    static CTexture* ForName(const char* name, uint32 nFlags, ETEX_Format eTFDst);
-    static CTexture* CreateTextureArray(const char* name, ETEX_Type eType, uint32 nWidth, uint32 nHeight, uint32 nArraySize, int nMips, uint32 nFlags, ETEX_Format eTF, int nCustomID = -1);
-    static CTexture* CreateTextureObject(const char* name, uint32 nWidth, uint32 nHeight, int nDepth, ETEX_Type eTT, uint32 nFlags, ETEX_Format eTF, int nCustomID = -1);
-
-    // Methods exposed to external libraries
-    static CTexture* CreateRenderTarget(const char* name, uint32 nWidth, uint32 nHeight, const ColorF& cClear, ETEX_Type eTT, uint32 nFlags, ETEX_Format eTF, int nCustomID = -1);
-    static void ApplyDepthTextureState(int unit, int nFilter, bool clamp);
-    static CTexture* GetZTargetTexture();
-    static int GetTextureState(const STexState& TS);
-    static uint32 TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, const ETEX_Format eTF, ETEX_TileMode eTM = eTM_None);
-
-    static void InitStreaming();
-    static void InitStreamingDev();
-    static void Init();
-    static void PostInit();
-    static void RT_FlushStreaming(bool bAbort);
-    static void ShutDown();
-
-    static void CreateSystemTargets();
-    static void ReleaseSystemTargets();
-    static void ReleaseMiscTargets();
-    static void ReleaseSystemTextures();
-    static void LoadDefaultSystemTextures();
-
-    static bool ReloadFile(const char* szFileName);
-    static bool ReloadFile_Request(const char* szFileName);
-    static void ReloadTextures();
-    static CTexture* Create2DTexture(const char* szName, int nWidth, int nHeight, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst, bool bAsyncDevTexCreation = false);
-    static CTexture* Create3DTexture(const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst);
-    static CTexture* Create2DCompositeTexture(const char* szName, int nWidth, int nHeight, int nMips, int nFlags, ETEX_Format eTFDst, const STexComposition* pCompositions, size_t nCompositions);
-    static void Update();
-    static void RT_LoadingUpdate();
-    static void RLT_LoadingUpdate();
-
-    // Loading/creating functions
-    bool Load(ETEX_Format eTFDst);
-    bool Load(CImageFile* pImage);
-    bool LoadFromImage(const char* name, ETEX_Format eTFDst = eTF_Unknown);
-    virtual bool Reload();
-    bool ToggleStreaming(const bool bEnable);
-    bool CreateTexture(STexData& td);
-
-    byte* GetSubImageData32(int nX, int nY, int nW, int nH, int& nOutTexDim);
-
-    // API depended functions
-    void Unbind();
-    bool Resolve(int nTarget = 0, bool bUseViewportSize = false);
-    bool CreateDeviceTexture(const byte* pData[6]);
-    bool RT_CreateDeviceTexture(const byte* pData[6]);
-    bool CreateRenderTarget(ETEX_Format eTF, const ColorF& cClear);
-    void ReleaseDeviceTexture(bool bKeepLastMips, bool bFromUnload = false);
-    void ApplySamplerState(int nSUnit, EHWShaderClass eHWSC = eHWSC_Pixel, int nState = -1);
-    void ApplyTexture(int nTUnit, EHWShaderClass eHWSC = eHWSC_Pixel, SResourceView::KeyType nResViewKey = SResourceView::DefaultView);
-    ETEX_Format ClosestFormatSupported(ETEX_Format eTFDst);
-    static ETEX_Format ClosestFormatSupported(ETEX_Format eTFDst, const SPixFormat*& pPF);
-    void SetTexStates();
-    void UpdateTexStates();
-    bool SetFilterMode(int nFilter);
-    bool SetClampingMode(int nAddressU, int nAddressV, int nAddressW);
-    void UpdateTextureRegion(const uint8_t* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc);
-    void RT_UpdateTextureRegion(const byte* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc);
-
-    // Create2DTextureWithMips is similar to Create2DTexture, but it also propagates the mip argument correctly.
-    // The original Create2DTexture function force sets mips to 1.
-    // This has been separated from Create2DTexture to ensure that we preserve backwards compatibility.
-    bool Create2DTextureWithMips(int nWidth, int nHeight, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst);
-
-    bool Create2DTexture(int nWidth, int nHeight, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst);
-    bool Create3DTexture(int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst);
-    bool SetNoTexture( const CTexture* pDefaultTexture );
-    bool IsMSAAChanged();
-
-    static byte* Convert(const byte* srcData, int width, int height, int srcMipCount, ETEX_Format srcFormat, ETEX_Format dstFormat, int& outSize, bool bLinear);
-
-    static void SetSamplerState(int nTS, int nSSlot, EHWShaderClass eHWSC = eHWSC_Pixel);
-
-    // Helper functions
-    static bool IsFormatSupported(ETEX_Format eTFDst);
-    static void GenerateZMaps();
-    static void DestroyZMaps();
-    static void GenerateHDRMaps();
-    // allocate or deallocate star maps
-    static void DestroyHDRMaps();
-
-    static void GenerateSceneMap(ETEX_Format eTF);
-    static void DestroySceneMap();
-    static void GenerateCachedShadowMaps();
-    static void DestroyCachedShadowMaps();
-    static void GenerateNearestShadowMap();
-    static void DestroyNearestShadowMap();
-
-    static ILINE Vec2i GetBlockDim(const ETEX_Format eTF)
-    {
-        return CImageExtensionHelper::GetBlockDim(eTF);
-    }
-
-    static int CalcNumMips(int nWidth, int nHeight);
-    // upload mip data from file regarding to platform specifics
-    static bool IsInPlaceFormat(const ETEX_Format fmt);
-    static void ExpandMipFromFile(byte* dest, const int destSize, const byte* src, const int srcSize, const ETEX_Format fmt);
-
-    static ILINE bool IsBlockCompressed(const ETEX_Format eTF) { return CImageExtensionHelper::IsBlockCompressed(eTF); }
-    static ILINE int BytesPerBlock(ETEX_Format eTF) { return CImageExtensionHelper::BytesPerBlock(eTF); }
-    static const char* NameForTextureFormat(ETEX_Format eTF) { return CImageExtensionHelper::NameForTextureFormat(eTF); }
-    static const char* NameForTextureType(ETEX_Type eTT) { return CImageExtensionHelper::NameForTextureType(eTT); }
-    static ETEX_Format TextureFormatForName(const char* str) { return CImageExtensionHelper::TextureFormatForName(str); }
-    static ETEX_Type TextureTypeForName(const char* str) { return CImageExtensionHelper::TextureTypeForName(str); }
-    static bool IsDeviceFormatTypeless(D3DFormat nFormat);
-    static bool IsDeviceFormatSRGBReadable(D3DFormat nFormat);
-    static D3DFormat DeviceFormatFromTexFormat(ETEX_Format eTF);
-    static ETEX_Format TexFormatFromDeviceFormat(D3DFormat nFormat);
-    static D3DFormat GetD3DLinFormat(D3DFormat nFormat);
-    static D3DFormat ConvertToDepthStencilFmt(D3DFormat nFormat);
-    static D3DFormat ConvertToStencilFmt(D3DFormat nFormat);
-    static D3DFormat ConvertToShaderResourceFmt(D3DFormat nFormat);
-
-    static D3DFormat ConvertToSRGBFmt(D3DFormat fmt);
-    static D3DFormat ConvertToSignedFmt(D3DFormat fmt);
-    static D3DFormat ConvertToTypelessFmt(D3DFormat fmt);
-
-    static SEnvTexture* FindSuitableEnvTex(Vec3& Pos, Ang3& Angs, bool bMustExist, int RendFlags, bool bUseExistingREs, CShader* pSH, CShaderResources* pRes, CRenderObject* pObj, bool bReflect, IRenderElement* pRE, bool* bMustUpdate);
-    static bool RenderEnvironmentCMHDR(int size, Vec3& Pos, TArray<unsigned short>& vecData);
-
-    static void DrawCubeSide(Vec3& Pos, int tex_size, int side, float fMaxDist);
-    static void DrawSceneToCubeSide(Vec3& Pos, int tex_size, int side);
-    static void GetAverageColor(SEnvTexture* cm, int nSide);
-
-public:
-
-    static AZStd::vector<STexState, AZ::StdLegacyAllocator> s_TexStates;
-    static int GetTexState(const STexState& TS)
-    {
-        uint32 i;
-
-        const uint32 nTexStatesSize = s_TexStates.size();
-        for (i = 0; i < nTexStatesSize; i++)
-        {
-            STexState* pTS = &s_TexStates[i];
-            if (*pTS == TS)
-            {
-                break;
-            }
-        }
-
-        if (i == nTexStatesSize)
-        {
-
-            s_TexStates.push_back(TS);
-            s_TexStates[i].PostCreate();
-        }
-
-        return i;
-    }
-
-    static void ComputeRootedTexturePath(const char* sourcePath, char* destPath, size_t destPathLength);
-
-    static bool m_bLoadedSystem;
-
-    static STexState s_sDefState;
-    static STexStageInfo s_TexStages[MAX_TMU];
-    static uint32 s_TexState_MipSRGBMask[MAX_TMU];
-
-    static ETEX_Format s_eTFZ;
-
-    // ==============================================================================
-    static CTexture* s_ptexMipColors_Diffuse;
-    static CTexture* s_ptexMipColors_Bump;
-    static CTexture* s_ptexFromRE[8];
-    static CTexture* s_ptexShadowID[8];
-    static CTexture* s_ptexShadowMask;
-    static CTexture* s_ptexFromRE_FromContainer[2];
-    static CTexture* s_ptexFromObj;
-    static CTexture* s_ptexSvoTree;
-    static CTexture* s_ptexSvoTris;
-    static CTexture* s_ptexSvoGlobalCM;
-    static CTexture* s_ptexSvoRgbs;
-    static CTexture* s_ptexSvoNorm;
-    static CTexture* s_ptexSvoOpac;
-    static CTexture* s_ptexFromObjCM;
-    static CTexture* s_ptexRT_2D;
-    static CTexture* s_ptexCachedShadowMap[MAX_GSM_LODS_NUM];
-    static CTexture* s_ptexNearestShadowMap;
-    static CTexture* s_ptexHeightMapAO[2];
-    static CTexture* s_ptexHeightMapAODepth[2];
-
-    static CTexture* s_ptexSceneNormalsMap;         // RT with normals for deferred shading
-    static CTexture* s_ptexSceneNormalsMapMS;         // Dummy normals target for binding multisampled rt
-    static CTexture* s_ptexSceneNormalsBent;
-    static CTexture* s_ptexAOColorBleed;
-    static CTexture* s_ptexSceneDiffuse;
-    static CTexture* s_ptexSceneSpecular;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURE_H_SECTION_7
-    #include AZ_RESTRICTED_FILE(Texture_h)
-#endif
-    static CTexture* s_ptexAmbientLookup;
-
-    static CTexture* s_ptexBackBuffer;              // back buffer copy
-    static CTexture* s_ptexModelHudBuffer;            // used by Menu3DModelRenderer to postprocess render models
-    static CTexture* s_ptexPrevBackBuffer[2][2];      // previous frame back buffer copies (for left and right eye)
-    static CTexture* s_ptexCached3DHud;               // 3d hud cached overframes
-    static CTexture* s_ptexCached3DHudScaled;                   // downsampled 3d hud cached overframes
-    static CTexture* s_ptexBackBufferScaled[3];     // backbuffer low-resolution/blurred version. 2x/4x/8x/16x smaller than screen
-    static CTexture* s_ptexBackBufferScaledTemp[2];   // backbuffer low-resolution/blurred version. 2x/4x/8x/16x smaller than screen, temp textures (used for blurring/ping-pong)
-
-    static CTexture* s_ptexPrevFrameScaled;                     // 2x
-
-    static CTexture* s_ptexDepthBufferQuarter;              //Quater res depth buffer
-
-    static CTexture* s_ptexWaterOcean;              // water ocean vertex texture
-    static CTexture* s_ptexWaterVolumeDDN;          // water volume heightmap
-    static CTexture* s_ptexWaterVolumeTemp;         // water volume heightmap
-    static CTexture* s_ptexWaterRipplesDDN;         // xy: wave propagation normals, z: frame t-2, w: frame t-1
-    static CTexture* s_ptexWaterVolumeRefl[2];        // water volume reflections buffer
-    static CTexture* s_ptexWaterCaustics[2];                    // caustics buffers
-    static CTexture* s_ptexRainOcclusion;                           // top-down rain occlusion
-    static CTexture* s_ptexRainSSOcclusion[2];              // screen-space rain occlusion accumulation
-
-    static CTexture* s_ptexRainDropsRT[2];
-
-    static CTexture* s_ptexRT_ShadowPool;
-    static CTexture* s_ptexRT_ShadowStub;
-    static CTexture* s_ptexCloudsLM;
-
-    static CTexture* s_ptexSceneTarget;  // Shared rt for generic usage (refraction/srgb/diffuse accumulation/hdr motionblur/etc)
-    static CTexture* s_ptexCurrSceneTarget; // Pointer to current scene target, mostly for reading from destination rt
-    static CTexture* s_ptexSceneTargetR11G11B10F[2];
-    static CTexture* s_ptexSceneTargetScaledR11G11B10F[4];
-
-    static CTexture* s_ptexSceneCoCHistory[2];
-
-    static CTexture* s_ptexCurrentSceneDiffuseAccMap;
-    static CTexture* s_ptexSceneDiffuseAccMap;
-    static CTexture* s_ptexSceneSpecularAccMap;
-    static CTexture* s_ptexSceneTexturesMap;
-    static CTexture* s_ptexSceneDiffuseAccMapMS;
-    static CTexture* s_ptexSceneSpecularAccMapMS;
-
-    static CTexture* s_ptexZTarget;
-
-    static CTexture* s_ptexZTargetDownSample[4];
-    static CTexture* s_ptexZTargetScaled;
-    static CTexture* s_ptexZTargetScaled2;
-
-    static CTexture* s_ptexHDRTarget;
-    static CTexture* s_ptexVelocityObjects[2];  // Dynamic object velocity (for left and right eye)
-    static CTexture* s_ptexVelocity;
-    static CTexture* s_ptexVelocityTiles[3];
-
-    // Intermediate textures used for fur rendering
-    static CTexture* s_ptexFurZTarget;  // Z target with outermost shell stipples. s_ptexZTarget has the stipples blurred out
-    static CTexture* s_ptexFurLightAcc; // Lighting accumulation after deferred shading
-    static CTexture* s_ptexFurPrepass;  // Packed diffuse, specular, and depth for shell passes
-
-    // Confetti Begin: David Srour
-    // Dedicated stencil & linear depth buffer for GMEM render path.
-    static CTexture* s_ptexGmemStenLinDepth;
-    // Confetti End
-
-    static CTexture* s_ptexHDRTargetPrev;
-    static CTexture* s_ptexHDRTargetScaled[4];
-    static CTexture* s_ptexHDRTargetScaledTmp[4];
-    static CTexture* s_ptexHDRTargetScaledTempRT[4];
-    static CTexture* s_ptexHDRDofLayers[2];
-    static CTexture* s_ptexSceneCoC[MIN_DOF_COC_K];
-    static CTexture* s_ptexSceneCoCTemp;
-    static CTexture* s_ptexHDRTempBloom[2];
-    static CTexture* s_ptexHDRFinalBloom;
-    static CTexture* s_ptexHDRAdaptedLuminanceCur[8];
-    static int       s_nCurLumTextureIndex;
-    static CTexture* s_ptexCurLumTexture;
-    static CTexture* s_ptexHDRToneMaps[NUM_HDR_TONEMAP_TEXTURES];
-    static CTexture* s_ptexHDRMeasuredLuminance[MAX_GPU_NUM];
-    static CTexture* s_ptexHDRMeasuredLuminanceDummy;
-    static CTexture* s_ptexSkyDomeMie;
-    static CTexture* s_ptexSkyDomeRayleigh;
-    static CTexture* s_ptexSkyDomeMoon;
-
-    static CTexture* s_ptexSceneTargetScaled;
-    static CTexture* s_ptexSceneTargetScaledBlurred;
-
-    static CTexture* s_ptexVolObj_Density;
-    static CTexture* s_ptexVolObj_Shadow;
-
-    static CTexture* s_ptexColorChart;
-
-    static CTexture* s_ptexStereoL;
-    static CTexture* s_ptexStereoR;
-
-    static CTexture* s_ptexFlaresOcclusionRing[MAX_OCCLUSION_READBACK_TEXTURES];
-    static CTexture* s_ptexFlaresGather;
-
-    static CTexture* s_ptexDepthStencilRemapped;
-    static SEnvTexture s_EnvCMaps[MAX_ENVCUBEMAPS];
-    static SEnvTexture s_EnvTexts[MAX_ENVTEXTURES];
-    static StaticInstance<TArray<SEnvTexture>> s_CustomRT_2D;
-    static StaticInstance<TArray<CTexture>> s_ShaderTemplates;      // [Shader System TO DO] bad design - change (or shoot)
-    static bool s_ShaderTemplatesInitialized;
-
-    static CTexture* s_pTexNULL;
-
-    static CTexture* s_pBackBuffer;
-    static CTexture* s_FrontBufferTextures[2];
-
-    static CTexture* s_ptexVolumetricFog;
-    static CTexture* s_ptexVolumetricFogDensityColor;
-    static CTexture* s_ptexVolumetricFogDensity;
-    static CTexture* s_ptexVolumetricClipVolumeStencil;
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    static CTexture* s_ptexVolFogShadowBuf[2];
-#endif
-
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    static ID3D11DeviceContext* s_pStreamDeferredCtx;
-#endif
-
-    static CTexture* s_defaultEnvironmentProbeDummy;
-    void* operator new(size_t sz)
-    {
-        return CryModuleMemalign(sz, std::alignment_of<CTexture>::value);
-    }
-
-    void operator delete(void* ptr)
-    {
-        CryModuleMemalignFree(ptr);
-    }
-} _ALIGN(128);
-
-////////////////////////////////////////////////////////////////
-
-class CTexAnim : public ITexAnim
-{
-    friend class CShaderMan;
-    friend struct SCGTexture;
-    friend struct STexSamplerRT;
-
-public:
-    CTexAnim();
-    ~CTexAnim();
-
-    AZ_DISABLE_COPY_MOVE(CTexAnim)
-
-    void Release() override;
-    void AddRef() override;
-
-    int Size() const;
-
-private:
-    int m_nRefCount;
-    TArray<CTexture*> m_TexPics;
-    int m_Rand;
-    int m_NumAnimTexs;
-    bool m_bLoop;
-    float m_Time;
-};
-
-
-
-bool WriteTGA(const byte* dat, int wdt, int hgt, const char* name, int src_bits_per_pixel, int dest_bits_per_pixel);
-bool WriteJPG(const byte* dat, int wdt, int hgt, const char* name, int bpp, int nQuality = 100);
-#if defined(WIN32) || defined(WIN64)
-byte* WriteDDS(const byte* dat, int wdt, int hgt, int dpth, const char* name, ETEX_Format eTF, int nMips, ETEX_Type eTT, bool bToMemory = false, int* nSize = NULL);
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/Textures/TextureArrayAlloc.h b/Code/CryEngine/RenderDll/Common/Textures/TextureArrayAlloc.h
deleted file mode 100644
index 040b559244..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/TextureArrayAlloc.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTUREARRAYALLOC_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTUREARRAYALLOC_H
-#pragma once
-
-
-template <bool LT256, bool LT65536>
-struct CTextureArrayAllocHlp
-{
-    typedef size_t T;
-};
-template <>
-struct CTextureArrayAllocHlp<true, true>
-{
-    typedef uint8 T;
-};
-template <>
-struct CTextureArrayAllocHlp<false, true>
-{
-    typedef uint16 T;
-};
-
-template <typename T, size_t Capacity>
-class CTextureArrayAlloc
-{
-public:
-    typedef typename CTextureArrayAllocHlp < Capacity < 256, Capacity < 65536>::T TId;
-
-public:
-    CTextureArrayAlloc()
-    {
-        for (TId i = 0; i < Capacity; ++i)
-        {
-            m_freeIDs[i] = i;
-        }
-        m_numFree = Capacity;
-        std::make_heap(m_freeIDs, m_freeIDs + Capacity, HeapComp());
-    }
-
-    T* Allocate()
-    {
-        if (m_numFree > 0)
-        {
-            TId idx = m_freeIDs[0];
-            std::pop_heap(m_freeIDs, m_freeIDs + m_numFree, HeapComp());
-            --m_numFree;
-            return &m_arr[idx];
-        }
-        return NULL;
-    }
-
-    void Release(T* p)
-    {
-        TId idx = static_cast<TId>(std::distance(m_arr, p));
-        m_freeIDs[m_numFree++] = idx;
-        std::push_heap(m_freeIDs, m_freeIDs + m_numFree, HeapComp());
-    }
-
-    T* GetArray() { return m_arr; }
-    const T* GetArray() const { return m_arr; }
-
-    T* GetPtrFromIdx(TId idx) { return &m_arr[idx]; }
-    TId GetIdxFromPtr(T* p) { return static_cast<TId>(p - &m_arr[0]); }
-
-    TId GetNumLive() const { return Capacity - m_numFree; }
-    TId GetNumFree() const { return m_numFree; }
-
-private:
-    struct HeapComp
-    {
-        bool operator () (TId a, TId b) const
-        {
-            return b < a;
-        }
-    };
-
-private:
-    T m_arr[Capacity];
-    TId m_freeIDs[Capacity];
-    TId m_numFree;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTUREARRAYALLOC_H
diff --git a/Code/CryEngine/RenderDll/Common/Textures/TextureHelpers.cpp b/Code/CryEngine/RenderDll/Common/Textures/TextureHelpers.cpp
deleted file mode 100644
index f5e9e120ad..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/TextureHelpers.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "TextureHelpers.h"
-#include "TextureManager.h"
-#include "StringUtils.h"
-
-/* -----------------------------------------------------------------------
-  * These functions are used in Cry3DEngine, CrySystem, CryRenderD3D11,
-  * Editor, ResourceCompilerMaterial and more
-  */
-
-//////////////////////////////////////////////////////////////////////////
-namespace  TextureHelpers
-{
-    // [Shader System TO DO] - to support data driven the following must support texture handling differently
-    bool VerifyTexSuffix(EEfResTextures texSlot, const char* texPath)
-    {
-        MaterialTextureSemantic&    texSemantic = CTextureManager::Instance()->GetTextureSemantic(texSlot);
-        return texSemantic.suffix && (strlen(texPath) > strlen(texSemantic.suffix) && (CryStringUtils::stristr(texPath, texSemantic.suffix)));
-    }
-
-    bool VerifyTexSuffix(EEfResTextures texSlot, const string& texPath)
-    {
-        MaterialTextureSemantic&    texSemantic = CTextureManager::Instance()->GetTextureSemantic(texSlot);
-        return texSemantic.suffix && (texPath.size() > strlen(texSemantic.suffix) && (CryStringUtils::stristr(texPath, texSemantic.suffix)));
-    }
-
-    const char* LookupTexSuffix(EEfResTextures texSlot)
-    {
-        MaterialTextureSemantic&    texSemantic = CTextureManager::Instance()->GetTextureSemantic(texSlot);
-        return texSemantic.suffix;
-    }
-
-    int8 LookupTexPriority(EEfResTextures texSlot)
-    {
-        MaterialTextureSemantic&    texSemantic = CTextureManager::Instance()->GetTextureSemantic(texSlot);
-        return texSemantic.priority;
-    }
-
-    CTexture* LookupTexDefault(EEfResTextures texSlot)
-    {
-        MaterialTextureSemantic&    texSemantic = CTextureManager::Instance()->GetTextureSemantic(texSlot);
-        return texSemantic.def;
-    }
-
-    // [Shader System] - To do: replace as part of data driven texture slots 
-    CTexture* LookupTexNeutral(EEfResTextures texSlot)
-    {
-        MaterialTextureSemantic&    texSemantic = CTextureManager::Instance()->GetTextureSemantic(texSlot);
-        return texSemantic.neutral;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/Common/Textures/TextureHelpers.h b/Code/CryEngine/RenderDll/Common/Textures/TextureHelpers.h
deleted file mode 100644
index 63d61dbd75..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/TextureHelpers.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __TextureHelpers_h__
-#define __TextureHelpers_h__
-#pragma once
-
-#include "Texture.h"
-
-namespace TextureHelpers
-{
-    //////////////////////////////////////////////////////////////////////////
-    bool VerifyTexSuffix(EEfResTextures texSlot, const char* texPath);
-    bool VerifyTexSuffix(EEfResTextures texSlot, const string& texPath);
-    const char* LookupTexSuffix(EEfResTextures texSlot);
-    int8 LookupTexPriority(EEfResTextures texSlot);
-    CTexture* LookupTexDefault(EEfResTextures texSlot);
-    CTexture* LookupTexNeutral(EEfResTextures texSlot);
-}
-
-#endif
-
diff --git a/Code/CryEngine/RenderDll/Common/Textures/TextureManager.cpp b/Code/CryEngine/RenderDll/Common/Textures/TextureManager.cpp
deleted file mode 100644
index 8af1faade7..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/TextureManager.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-
-#include "TextureManager.h"
-#include "Texture.h"
-#include "ISystem.h"
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/API/AtomActiveInterface.h>
-#include <AzCore/Interface/Interface.h>
-
-
-//////////////////////////////////////////////////////////////////////////
-CTextureManager* CTextureManager::s_Instance = nullptr;
-//------------------------------------------------------------------------------
-void CTextureManager::ReleaseTextureSemantics()
-{
-    for (int slot = 0; slot < EFTT_MAX; slot++)
-    {
-        delete[] m_TexSlotSemantics[slot].suffix;
-        m_TexSlotSemantics[slot].suffix = nullptr;
-        m_TexSlotSemantics[slot].def = nullptr;
-        m_TexSlotSemantics[slot].neutral = nullptr;
-    }
-}
-
-void CTextureManager::ReleaseTextures()
-{
-    AZ_Warning("[Shaders System]", false, "Textures Manager - releasing all textures");
-
-    // Remove fixed default textures
-    for (auto& iter : m_DefaultTextures)
-    {
-        SAFE_RELEASE(iter.second);
-    }
-    m_DefaultTextures.clear();
-
-    // Remove fixed engine textures
-    for (auto& iter : m_EngineTextures)
-    {
-        SAFE_RELEASE(iter.second);
-    }
-    m_EngineTextures.clear();
-
-    // Remove references to static engine textures
-    m_StaticEngineTextureReferences.clear();
-
-    // Material textures should be released by releasing the materials themselves.
-    m_MaterialTextures.clear();
-}
-
-//------------------------------------------------------------------------------
-// [Shaders System]
-// The following method should be enhanced to load the user defined default textures
-// from an XML file data 'defaultTextures.xml'
-// Sample code for the load is provided below to be followed in the future.
-//------------------------------------------------------------------------------
-void CTextureManager::LoadDefaultTextures()
-{
-    struct TextureEntry
-    {
-        const char* szTextureName;
-        const char* szFileName;
-        uint32 flags;
-    };
-
-    // The following texture names are the name by which the texture pointers will 
-    // be indexed.    Notice that they match to the previously stored textures with
-    // name pattern removing 's_ptex'[Name]. Example: 's_ptexWhite' will now be 'White'
-    const TextureEntry texturesFromFile[] =
-    {
-        {"NoTextureCM",                 "EngineAssets/TextureMsg/ReplaceMeCM.dds",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"White",                       "EngineAssets/Textures/White.dds",                         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"Gray",                        "EngineAssets/Textures/Grey.dds",                          FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"Black",                       "EngineAssets/Textures/Black.dds",                         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"BlackAlpha",                  "EngineAssets/Textures/BlackAlpha.dds",                    FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"BlackCM",                     "EngineAssets/Textures/BlackCM.dds",                       FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"DefaultProbeCM",              "EngineAssets/Shading/defaultProbe_cm.dds",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"FlatBump",                    "EngineAssets/Textures/White_ddn.dds",                     FT_DONT_RELEASE | FT_DONT_STREAM | FT_TEX_NORMAL_MAP },
-        {"PaletteDebug",                "EngineAssets/Textures/palletteInst.dds",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"PaletteTexelsPerMeter",       "EngineAssets/Textures/TexelsPerMeterGrad.dds",            FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconShaderCompiling",         "EngineAssets/Icons/ShaderCompiling.dds",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconStreaming",               "EngineAssets/Icons/Streaming.dds",                        FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconStreamingTerrainTexture", "EngineAssets/Icons/StreamingTerrain.dds",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconNullSoundSystem",         "EngineAssets/Icons/NullSoundSystem.dds",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconNavigationProcessing",    "EngineAssets/Icons/NavigationProcessing.dds",             FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ShadowJitterMap",             "EngineAssets/Textures/rotrandom.dds",                     FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"EnvironmentBRDF",             "EngineAssets/Shading/environmentBRDF.dds",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ScreenNoiseMap",              "EngineAssets/Textures/JumpNoiseHighFrequency_x27y19.dds", FT_DONT_RELEASE | FT_DONT_STREAM | FT_NOMIPS },
-        {"DissolveNoiseMap",            "EngineAssets/Textures/noise.dds",                         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"GrainFilterMap",              "EngineAssets/ScreenSpace/grain_bayer_mul.dds",            FT_DONT_RELEASE | FT_DONT_STREAM | FT_NOMIPS },
-        {"FilmGrainMap",                "EngineAssets/ScreenSpace/film_grain.dds",                 FT_DONT_RELEASE | FT_DONT_STREAM | FT_NOMIPS },
-        {"VignettingMap",               "EngineAssets/Shading/vignetting.dds",                     FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"AOJitter",                    "EngineAssets/ScreenSpace/PointsOnSphere4x4.dds",          FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"AOVOJitter",                  "EngineAssets/ScreenSpace/PointsOnSphereVO4x4.dds",        FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"NormalsFitting",              "EngineAssets/ScreenSpace/NormalsFitting.dds",             FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"AverageMemoryUsage",          "EngineAssets/Icons/AverageMemoryUsage.dds",               FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"LowMemoryUsage",              "EngineAssets/Icons/LowMemoryUsage.dds",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"HighMemoryUsage",             "EngineAssets/Icons/HighMemoryUsage.dds",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"LivePreview",                 "EngineAssets/Icons/LivePreview.dds",                      FT_DONT_RELEASE | FT_DONT_STREAM },
-#if !defined(_RELEASE)
-        {"NoTexture",                   "EngineAssets/TextureMsg/ReplaceMe.dds",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling",        "EngineAssets/TextureMsg/TextureCompiling.dds",            FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_a",      "EngineAssets/TextureMsg/TextureCompiling_a.dds",          FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_cm",     "EngineAssets/TextureMsg/TextureCompiling_cm.dds",         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_ddn",    "EngineAssets/TextureMsg/TextureCompiling_ddn.dds",        FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_ddna",   "EngineAssets/TextureMsg/TextureCompiling_ddna.dds",       FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"DefaultMergedDetail",         "EngineAssets/Textures/GreyAlpha.dds",                     FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"MipMapDebug",                 "EngineAssets/TextureMsg/MipMapDebug.dds",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorBlue",                   "EngineAssets/TextureMsg/color_Blue.dds",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorCyan",                   "EngineAssets/TextureMsg/color_Cyan.dds",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorGreen",                  "EngineAssets/TextureMsg/color_Green.dds",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorPurple",                 "EngineAssets/TextureMsg/color_Purple.dds",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorRed",                    "EngineAssets/TextureMsg/color_Red.dds",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorWhite",                  "EngineAssets/TextureMsg/color_White.dds",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorYellow",                 "EngineAssets/TextureMsg/color_Yellow.dds",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorOrange",                 "EngineAssets/TextureMsg/color_Orange.dds",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorMagenta",                "EngineAssets/TextureMsg/color_Magenta.dds",               FT_DONT_RELEASE | FT_DONT_STREAM },
-#else
-        {"NoTexture",                   "EngineAssets/TextureMsg/ReplaceMeRelease.dds",            FT_DONT_RELEASE | FT_DONT_STREAM },
-#endif
-    };
-
-    for (const TextureEntry& entry : texturesFromFile)
-    {
-        CTexture* pNewTexture = CTexture::ForName(entry.szFileName, entry.flags, eTF_Unknown);
-        if (pNewTexture)
-        {
-            CCryNameTSCRC texEntry(entry.szTextureName);
-            m_DefaultTextures[texEntry] = pNewTexture;
-        }
-        else
-        {
-            AZ_Assert(false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-            AZ_Warning("[Shaders System]", false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-        }
-    }
-
-    m_texNoTexture = GetDefaultTexture("NoTexture");
-    m_texNoTextureCM = GetDefaultTexture("NoTextureCM");
-    m_texWhite = GetDefaultTexture("White");
-    m_texBlack = GetDefaultTexture("Black");
-    m_texBlackCM = GetDefaultTexture("BlackCM");
-}
-
-void CTextureManager::LoadMaterialTexturesSemantics()
-{
-    // Shaders System] - To Do - replace the following with the actual pointers
-    CTexture*       pNoTexture = CTextureManager::Instance()->GetNoTexture();
-    CTexture*       pWhiteTexture = CTextureManager::Instance()->GetWhiteTexture();
-    CTexture*       pGrayTexture = CTextureManager::Instance()->GetDefaultTexture("Gray");
-    CTexture*       pFlatBumpTexture = CTextureManager::Instance()->GetDefaultTexture("FlatBump");
-
-    // [Shaders System] - this needs to move to shader code and be reflected, hence data driven per 
-    // texture usage / declaration in the shader.
-    MaterialTextureSemantic     texSlotSemantics[] =
-    {
-        // NOTE: must be in order with filled holes to allow direct lookup
-        MaterialTextureSemantic( EFTT_DIFFUSE,          4, pNoTexture,         pWhiteTexture,    "_diff" ),
-        MaterialTextureSemantic( EFTT_NORMALS,          2, pFlatBumpTexture,   pFlatBumpTexture, "_ddn" ),
-        MaterialTextureSemantic( EFTT_SPECULAR,         1, pWhiteTexture,      pWhiteTexture,    "_spec" ),
-        MaterialTextureSemantic( EFTT_ENV,              0, pWhiteTexture,      pWhiteTexture,    "_cm" ),
-        MaterialTextureSemantic( EFTT_DETAIL_OVERLAY,   3, pGrayTexture,       pWhiteTexture,    "_detail" ),
-        MaterialTextureSemantic( EFTT_SECOND_SMOOTHNESS, 2, pWhiteTexture,     pWhiteTexture,    "" ),
-        MaterialTextureSemantic( EFTT_HEIGHT,           2, pWhiteTexture,      pWhiteTexture,    "_displ" ),
-        MaterialTextureSemantic( EFTT_DECAL_OVERLAY,    3, pGrayTexture,       pWhiteTexture,    "" ),
-        MaterialTextureSemantic( EFTT_SUBSURFACE,       3, pWhiteTexture,      pWhiteTexture,    "_sss" ),
-        MaterialTextureSemantic( EFTT_CUSTOM,           4, pWhiteTexture,      pWhiteTexture,    "" ),
-        MaterialTextureSemantic( EFTT_CUSTOM_SECONDARY, 2, pFlatBumpTexture,   pFlatBumpTexture, "" ),
-        MaterialTextureSemantic( EFTT_OPACITY,          4, pWhiteTexture,      pWhiteTexture,    "" ),
-        MaterialTextureSemantic( EFTT_SMOOTHNESS,       2, pWhiteTexture,      pWhiteTexture,    "_ddna" ),
-        MaterialTextureSemantic( EFTT_EMITTANCE,        1, pWhiteTexture,      pWhiteTexture,    "_em" ),
-        MaterialTextureSemantic( EFTT_OCCLUSION,        4, pWhiteTexture,      pWhiteTexture,    "" ),
-        MaterialTextureSemantic( EFTT_SPECULAR_2,       4, pWhiteTexture,      pWhiteTexture,    "_spec" ),
-
-        // This is the terminator for the name-search
-        MaterialTextureSemantic( EFTT_UNKNOWN,          0, CTexture::s_pTexNULL,      CTexture::s_pTexNULL,     "" ),
-    };
-
-    for (int i = 0; i < EFTT_MAX; i++)
-    {
-        SAFE_DELETE_ARRAY(m_TexSlotSemantics[i].suffix);      // make sure we are not leaving snail marks
-        m_TexSlotSemantics[i] = texSlotSemantics[i];
-    }
-}
-
-void CTextureManager::CreateStaticEngineTextureReferences()
-{
-    struct textureReferenceEntry {
-        const char* textureName;
-        CTexture** staticTextureReference;
-    };
-
-    textureReferenceEntry staticTextureReferences[] =
-    {
-        { "$HDRTarget",                     &CTexture::s_ptexHDRTarget },
-        { "$HDRTargetPrev",                 &CTexture::s_ptexHDRTargetPrev },
-        // alias for shaders that use $HDR_TargetPrev see ShaderTemplate.cpp
-        { "$HDR_TargetPrev",                &CTexture::s_ptexHDRTargetPrev },
-        { "$SceneTarget",                   &CTexture::s_ptexSceneTarget },
-        { "$CurrSceneTarget",               &CTexture::s_ptexCurrSceneTarget },
-        { "$SceneNormalsMapMS",             &CTexture::s_ptexSceneNormalsMapMS},
-        { "$SceneDiffuseAccMS",             &CTexture::s_ptexSceneDiffuseAccMapMS },
-        { "$SceneSpecularAccMS",            &CTexture::s_ptexSceneSpecularAccMapMS },
-        { "$SceneTargetR11G11B10F_0",       &CTexture::s_ptexSceneTargetR11G11B10F[0] },
-        { "$SceneTargetR11G11B10F_1",       &CTexture::s_ptexSceneTargetR11G11B10F[1] },
-        { "$SceneTargetScaled0R11G11B10F",  &CTexture::s_ptexSceneTargetScaledR11G11B10F[0] },
-        { "$SceneTargetScaled1R11G11B10F",  &CTexture::s_ptexSceneTargetScaledR11G11B10F[1] },
-        { "$SceneTargetScaled2R11G11B10F",  &CTexture::s_ptexSceneTargetScaledR11G11B10F[2] },
-        { "$SceneTargetScaled3R11G11B10F",  &CTexture::s_ptexSceneTargetScaledR11G11B10F[3] },
-        { "$SceneNormalsMap",               &CTexture::s_ptexSceneNormalsMap },
-        { "$SceneNormalsBent",              &CTexture::s_ptexSceneNormalsBent },
-        { "$SceneDiffuse",                  &CTexture::s_ptexSceneDiffuse },
-        { "$SceneSpecular",                 &CTexture::s_ptexSceneSpecular },
-        { "$SceneDiffuseAcc",               &CTexture::s_ptexSceneDiffuseAccMap },
-        { "$SceneSpecularAcc",              &CTexture::s_ptexSceneSpecularAccMap },
-        { "$MipColors_Diffuse",             &CTexture::s_ptexMipColors_Diffuse },
-        { "$MipColors_Bump",                &CTexture::s_ptexMipColors_Bump },
-        { "$RT_2D",                         &CTexture::s_ptexRT_2D },
-        { "$RainOcclusion",                 &CTexture::s_ptexRainOcclusion },
-        { "$RainSSOcclusion0",              &CTexture::s_ptexRainSSOcclusion[0] },
-        { "$RainSSOcclusion1",              &CTexture::s_ptexRainSSOcclusion[1] },
-        { "$RainDropsAccumRT_0",            &CTexture::s_ptexRainDropsRT[0] },
-        { "$RainDropsAccumRT_1",            &CTexture::s_ptexRainDropsRT[1] },
-        { "FromObj",                        &CTexture::s_ptexFromObj },
-        { "SvoTree",                        &CTexture::s_ptexSvoTree },
-        { "SvoTris",                        &CTexture::s_ptexSvoTris },
-        { "SvoGlobalCM",                    &CTexture::s_ptexSvoGlobalCM },
-        { "SvoRgbs",                        &CTexture::s_ptexSvoRgbs },
-        { "SvoNorm",                        &CTexture::s_ptexSvoNorm },
-        { "SvoOpac",                        &CTexture::s_ptexSvoOpac },
-        { "$FromObjCM",                     &CTexture::s_ptexFromObjCM },
-        { "$RT_ShadowPool",                 &CTexture::s_ptexRT_ShadowPool },
-        { "$RT_ShadowStub",                 &CTexture::s_ptexRT_ShadowStub },
-        { "$ModelHud",                      &CTexture::s_ptexModelHudBuffer },
-        { "$Velocity",                      &CTexture::s_ptexVelocity },
-        { "$VelocityTilesTmp0",             &CTexture::s_ptexVelocityTiles[0] },
-        { "$VelocityTilesTmp1",             &CTexture::s_ptexVelocityTiles[1] },
-        { "$VelocityTiles",                 &CTexture::s_ptexVelocityTiles[2] },
-        { "$VelocityObjects",               &CTexture::s_ptexVelocityObjects[0] },
-        { "$VelocityObjects_R",             &CTexture::s_ptexVelocityObjects[1] },
-        { "$WaterRipplesDDN_0",             &CTexture::s_ptexWaterRipplesDDN },
-        { "$WaterOceanMap",                 &CTexture::s_ptexWaterOcean },
-        { "$WaterVolumeTemp",               &CTexture::s_ptexWaterVolumeTemp },
-        { "$WaterVolumeDDN",                &CTexture::s_ptexWaterVolumeDDN },
-        { "$WaterVolumeRefl",               &CTexture::s_ptexWaterVolumeRefl[0] },
-        { "$WaterVolumeReflPrev",           &CTexture::s_ptexWaterVolumeRefl[1] },
-        { "$WaterVolumeCaustics",           &CTexture::s_ptexWaterCaustics[0] },
-        { "$WaterVolumeCausticsTemp",       &CTexture::s_ptexWaterCaustics[0] },
-        { "$BackBuffer",                    &CTexture::s_ptexBackBuffer },
-        { "$PrevFrameScale",                &CTexture::s_ptexPrevFrameScaled },
-        { "$BackBufferScaled_d2",           &CTexture::s_ptexBackBufferScaled[0] },
-        { "$BackBufferScaled_d4",           &CTexture::s_ptexBackBufferScaled[1] },
-        { "$BackBufferScaled_d8",           &CTexture::s_ptexBackBufferScaled[2] },
-        { "$BackBufferScaledTemp_d2",       &CTexture::s_ptexBackBufferScaledTemp[0] },
-        { "$BackBufferScaledTemp_d4",       &CTexture::s_ptexBackBufferScaledTemp[1] },
-        { "$AmbientLookup",                 &CTexture::s_ptexAmbientLookup },
-        { "$ShadowMask",                    &CTexture::s_ptexShadowMask },
-        { "$FlaresGather",                  &CTexture::s_ptexFlaresGather },
-        { "$DepthBufferQuarter",            &CTexture::s_ptexDepthBufferQuarter },
-        { "$ZTarget",                       &CTexture::s_ptexZTarget },
-        { "$ZTargetDownSample0",            &CTexture::s_ptexZTargetDownSample[0]},
-        { "$ZTargetDownSample1",            &CTexture::s_ptexZTargetDownSample[1]},
-        { "$ZTargetDownSample2",            &CTexture::s_ptexZTargetDownSample[2]},
-        { "$ZTargetDownSample3",            &CTexture::s_ptexZTargetDownSample[3]},
-        { "$FurZTarget",                    &CTexture::s_ptexFurZTarget },
-        { "$ZTargetScaled",                 &CTexture::s_ptexZTargetScaled },
-        { "$ZTargetScaled2",                &CTexture::s_ptexZTargetScaled2 },
-        { "$CloudsLM",                      &CTexture::s_ptexCloudsLM },
-        { "$VolObj_Density",                &CTexture::s_ptexVolObj_Density },
-        { "$VolObj_Shadow",                 &CTexture::s_ptexVolObj_Shadow },
-        { "$ColorChart",                    &CTexture::s_ptexColorChart },
-        { "$SkyDomeMie",                    &CTexture::s_ptexSkyDomeMie },
-        { "$SkyDomeRayleigh",               &CTexture::s_ptexSkyDomeRayleigh },
-        { "$SkyDomeMoon",                   &CTexture::s_ptexSkyDomeMoon },
-        { "$VolumetricInscattering",        &CTexture::s_ptexVolumetricFog },
-        { "$DensityColorVolume",            &CTexture::s_ptexVolumetricFogDensityColor },
-        { "$DensityVolume",                 &CTexture::s_ptexVolumetricFogDensity },
-        { "$ClipVolumeStencilVolume",       &CTexture::s_ptexVolumetricClipVolumeStencil },
-        { "$DefaultEnvironmentProbe",       &CTexture::s_defaultEnvironmentProbeDummy },
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-        { "$GmemStenLinDepth",              &CTexture::s_ptexGmemStenLinDepth },
-#endif
-    };
-
-    for (textureReferenceEntry& entry : staticTextureReferences)
-    {
-        CCryNameTSCRC   hashEntry(entry.textureName);
-        m_StaticEngineTextureReferences[hashEntry] = entry.staticTextureReference;
-    }
-
-    char textureName[256];
-    int i;
-
-    for ( i = 0; i < MAX_OCCLUSION_READBACK_TEXTURES; i++)
-    {
-        azsprintf(textureName, "$FlaresOcclusion_%d", i);
-        CCryNameTSCRC   hashEntry(textureName);
-        m_StaticEngineTextureReferences[hashEntry] = &CTexture::s_ptexFlaresOcclusionRing[i];
-    }
-
-    for (i = 0; i < AZ_ARRAY_SIZE(CTexture::s_ptexFromRE); i++)
-    {
-        azsprintf(textureName, "$FromRE_%d", i);
-        CCryNameTSCRC   hashEntry(textureName);
-        m_StaticEngineTextureReferences[hashEntry] = &CTexture::s_ptexFromRE[i];
-    }
-
-    // The shader parser also accetps $FromRE as a valid alias for $FromRE_0
-    m_StaticEngineTextureReferences[CCryNameTSCRC("$FromRE")] = &CTexture::s_ptexFromRE[0];
-
-    for (i = 0; i < 8; i++)
-    {
-        azsprintf(textureName, "$ShadowID_%d", i);
-        CCryNameTSCRC   hashEntry(textureName);
-        m_StaticEngineTextureReferences[hashEntry] = &CTexture::s_ptexShadowID[i];
-    }
-
-    for (i = 0; i < 2; i++)
-    {
-        azsprintf(textureName, "$FromRE%d_FromContainer", i);
-        CCryNameTSCRC   hashEntry(textureName);
-        m_StaticEngineTextureReferences[hashEntry] = &CTexture::s_ptexFromRE_FromContainer[i];
-    }
-}
-
-/*
-//==============================================================================
-// The following two method should be implemented in order to finish rip off the rest
-// of the horrible CTexture slots management via static declarations in class CTexture!
-// The first one is the initialization method for all engine textures slots and
-// the second is a better candidate than LoadDefajultTextures that can replace it
-// in order to have it data driven.
-//------------------------------------------------------------------------------
-void CTextureManager::CreateEngineTextures()
-{
-    ...
-    Replace the code in CTexture::LoadDefaultSystemTextures() with a proper code to be 
-    placed here.
-    ...
-}
-
-void CTextureManager::LoadDefaultTexturesFromFile()
-{
-#if !defined(NULL_RENDERER)
-    if (m_DefaultTextures.size())
-    {
-        return;
-    }
-
-    uint32 nDefaultFlags = FT_DONT_STREAM;
-
-    XmlNodeRef root = GetISystem()->LoadXmlFromFile("EngineAssets/defaulttextures.xml");
-    if (root)
-    {
-        // we loop over this twice.
-        // we are looping from the back to the front to make sure that the order of the assets are correct ,when we try to load them the second time.
-        for (int i = root->getChildCount() - 1; i >= 0; i--)
-        {
-            XmlNodeRef      textureEntry = root->getChild(i);
-            if (!textureEntry->isTag("TextureEntry"))
-            {
-                continue;
-            }
-
-            // make an ASYNC request to move it to the top of the queue:
-            XmlString   fileName;
-            if (textureEntry->getAttr("FileName", fileName))
-            {
-                EBUS_EVENT(AzFramework::AssetSystemRequestBus, GetAssetStatus, fileName.c_str(), false );
-            }
-        }
-
-        for (int i = 0; i < root->getChildCount(); i++)
-        {
-            XmlNodeRef entry = root->getChild(i);
-            if (!entry->isTag("entry"))
-            {
-                continue;
-            }
-
-            if (entry->getAttr("nomips", nNoMips) && nNoMips)
-
-                uint32 nFlags = nDefaultFlags;
-
-            // check attributes to modify the loading flags
-            int nNoMips = 0;
-            if (entry->getAttr("nomips", nNoMips) && nNoMips)
-            {
-                nFlags |= FT_NOMIPS;
-            }
-
-            // default textures should be compiled synchronously:
-            const char*     texName = entry->getContent();
-            if (!gEnv->pCryPak->IsFileExist(texName))
-            {
-                // make a SYNC request to block until its ready.
-                EBUS_EVENT(AzFramework::AssetSystemRequestBus, CompileAssetSync, texName);
-            }
-
-            CTexture* pTexture = CTexture::ForName(texName, nFlags, eTF_Unknown);
-            if (pTexture)
-            {
-                CCryNameTSCRC nameID(texName);
-                m_DefaultTextures[nameID] = pTexture;
-            }
-        }
-    }
-#endif
-}
-*/
-
diff --git a/Code/CryEngine/RenderDll/Common/Textures/TextureManager.h b/Code/CryEngine/RenderDll/Common/Textures/TextureManager.h
deleted file mode 100644
index 55ac285d4d..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/TextureManager.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Common texture manager declarations.
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTUREMANAGER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTUREMANAGER_H
-#pragma once
-
-
-class CTexture;
-
-#include "CryName.h"
-
-//------------------------------------------------------------------------------
-// [Shaders System] - to replace CCryNameTSCRC by NameHashPair after new renderer 
-//  integration.
-//------------------------------------------------------------------------------
-struct MaterialTextureSemantic
-{
-    MaterialTextureSemantic(EEfResTextures texSlot, int8 pri, CTexture* defTex, CTexture* neutralTex, char const* suff)
-        : slot(texSlot), priority(pri), def(defTex), neutral(neutralTex) 
-    {
-        suffix = new char[strlen(suff)+1];  // added one to protect from empty strings.
-        azstrcpy(suffix, strlen(suff) + 1, suff);
-    };
-
-    MaterialTextureSemantic& operator=(MaterialTextureSemantic& srcSemantic)
-    {
-        SAFE_DELETE_ARRAY(suffix);
-
-        slot = srcSemantic.slot;
-        priority = srcSemantic.priority;
-        def = srcSemantic.def;
-        neutral = srcSemantic.neutral;
-        suffix = new char[strlen(srcSemantic.suffix) + 1];  // added one to protect from empty strings.
-        azstrcpy(suffix, strlen(srcSemantic.suffix) + 1, srcSemantic.suffix);
-
-        return *this;
-    }
-
-    MaterialTextureSemantic()
-    {
-        slot = EFTT_MAX;
-        def = nullptr;
-        neutral = nullptr;
-        suffix = nullptr;
-    };
-
-    ~MaterialTextureSemantic()
-    {
-        SAFE_DELETE_ARRAY(suffix);
-    };
-
-    EEfResTextures  slot;
-    int8            priority;
-    CTexture*       def;
-    CTexture*       neutral;
-    char*           suffix;
-};
-
-//==============================================================================
-// CTextureManager is a singleton class.  
-// It is NOT the texture resource manager but rather holds vital textures required 
-// by the engine and renderer.
-// These textures are the default textures (for example - missing resource, resource 
-//  compiling...), the render engine pipeline textures such as the textures that 
-// are used for noise, and finally, the material 'snapshot' textures which are 
-// assigned just before the shader's resources are bound.
-// 
-// Possible improvements on that are:
-// 1. Move the m_EngineTextures and m_MaterialTextures to ResourceGroupManager 
-//      that will manage the 'per frequency' resource snapshot.
-// 2. Keep only pointers / refs to the resources, while the resources themselves are 
-//      managed and held by the ResourceManager (currently carried out by CBaseResource..)
-// 3. Address the default textures via enum and not strings if turns out to be a hit.
-// 4. Move to use NameHashPair instead of CCryNameTSCRC for Amazon internal + allow 
-// s    having name debug info
-// 
-// Remarks:
-// 1. The work for moving all static Cry textures to the manager is NOT complete yet and
-//      should be continued and include changing usage of all default 'error textures' and
-//      removing all static CTextures from CTexture class and stop using it as 
-//      a static manager class.
-// 
-//------------------------------------------------------------------------------
-class CTextureManager
-{
-protected:
-
-    CTextureManager() 
-    {
-        s_Instance = nullptr;
-        m_texNoTexture = nullptr;
-        m_texNoTextureCM = nullptr;
-        m_texWhite = nullptr;
-        m_texBlack = nullptr;
-        m_texBlackCM = nullptr;
-    }
-
-    void ReleaseResources()
-    {
-        ReleaseTextures();
-        ReleaseTextureSemantics();
-    }
-
-    virtual ~CTextureManager()
-    {
-        ReleaseResources();
-    }
-
-    void ReleaseTextures();
-    void ReleaseTextureSemantics();
-
-public:
-
-    void Init( bool forceInit=false )
-    {
-        if (forceInit)
-        {
-            ReleaseResources();
-        }
-
-        // this will be carried out only if it is the first item or after force init.
-        if (!m_DefaultTextures.size() && !m_EngineTextures.size() && !m_MaterialTextures.size())
-        {
-            AZ_TracePrintf("[Shaders System]", "Textures Manager - allocating default resources");
-            // First load is for loading semantics but the texture slots will remain null as the default 
-            // textures were not loaded yet.   This is required as the semantics suffix will be used during
-            // the default texture load.
-            LoadMaterialTexturesSemantics();
-
-            // Default texture load
-            LoadDefaultTextures();
-            CreateEngineTextures();
-
-            // References to legacy static textures
-            CreateStaticEngineTextureReferences();
-
-            // Second time is for attaching the loaded textures to the semantics
-            LoadMaterialTexturesSemantics();
-        }
-    }
-
-    inline static CTextureManager* Instance()
-    {
-        if (!s_Instance)
-            s_Instance = new CTextureManager;
-
-        return s_Instance;
-    }
-
-    inline static bool InstanceExists()
-    {
-        return s_Instance ? true : false;
-    }
-
-    void Release()
-    {
-        SAFE_DELETE(s_Instance);
-    }
-
-    void LoadDefaultTextures();
-    void LoadMaterialTexturesSemantics();
-    void CreateEngineTextures() {};
-    void CreateStaticEngineTextureReferences();
-
-    inline MaterialTextureSemantic& GetTextureSemantic(int texSlot)
-    {
-        AZ_Assert(texSlot >= 0 && texSlot <= EFTT_MAX, "[CTextureManager::GetTextureSemantic] Slot is out of range: %d", texSlot);
-        //we need to correct the texSlot if by any chance there is an unexpected input value. 
-        if (texSlot < 0 || texSlot > EFTT_MAX)
-        {
-            texSlot = EFTT_UNKNOWN;
-        }
-        return m_TexSlotSemantics[texSlot];
-    }
-
-    inline CTexture* GetDefaultTexture( const char* sTextureName) const
-    {
-        CCryNameTSCRC   hashEntry(sTextureName);
-        auto            iter = m_DefaultTextures.find(hashEntry);
-        return (iter != m_DefaultTextures.end() ? iter->second : nullptr);
-    }
-
-    inline CTexture* GetEngineTexture( const char* sTextureName) const
-    {
-        CCryNameTSCRC hashEntry(sTextureName);
-        return GetEngineTexture(hashEntry);
-    }
-
-    inline CTexture* GetEngineTexture( const CCryNameTSCRC& crc) const
-    {
-        auto iter = m_EngineTextures.find(crc);
-        return iter != m_EngineTextures.end() ? iter->second : GetStaticEngineTexture(crc);
-    }
-
-    inline CTexture* GetMaterialTexture(const char* sTextureName) const
-    {
-        CCryNameTSCRC   hashEntry(sTextureName);
-        auto            iter = m_MaterialTextures.find(hashEntry);
-        return (iter != m_MaterialTextures.end() ? iter->second : nullptr);
-    }
-
-    inline CTexture* GetNoTexture()     { return m_texNoTexture;     }
-    inline CTexture* GetNoTextureCM()   { return m_texNoTextureCM;   }
-    inline CTexture* GetWhiteTexture()  { return m_texWhite;    }
-    inline CTexture* GetBlackTexture()  { return m_texBlack; }
-    inline CTexture* GetBlackTextureCM() { return m_texBlackCM; }
-
-private:
-    inline CTexture* GetStaticEngineTexture(const CCryNameTSCRC& crc) const
-    {
-        auto iter = m_StaticEngineTextureReferences.find(crc);
-        return iter != m_StaticEngineTextureReferences.end() ? *iter->second : nullptr;
-    }
-
-    MaterialTextureSemantic   m_TexSlotSemantics[EFTT_MAX];       // [Shaders System] - to do - replace with map
-
-    // [Shaders System] CCryNameTSCRC should be replaced by 
-    typedef std::map<CCryNameTSCRC, CTexture*>            OrderedTextureMap;
-    typedef std::map<CCryNameTSCRC, CTexture*>            TextureMap;
-    typedef std::map<CCryNameTSCRC, CTexture**>           TextureRefMap;
-
-    // Textures used as defaults for internal engine usage, place holders etc...
-    TextureMap    m_DefaultTextures;    
-
-    // The following two textures are set separately since they are called often
-    CTexture*     m_texWhite;
-    CTexture*     m_texBlack;
-    CTexture*     m_texBlackCM;
-    CTexture*     m_texNoTexture;
-    CTexture*     m_texNoTextureCM;
-
-    // Runtime engine textures used by the various shaders and represents last
-    // taken 'snapshot'
-    TextureMap          m_EngineTextures;       
-
-    // pending the move to using CTextureManager for all engine textures,
-    // provides access to existing static engine textures 
-    TextureRefMap       m_StaticEngineTextureReferences;       
-
-    // material 'snapshot' (most recent) textures to be used by the shader.
-    OrderedTextureMap   m_MaterialTextures;
-
-    // The CTextureManager is a singleton - this is its single instance
-    static CTextureManager*     s_Instance;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTUREMANAGER_H
diff --git a/Code/CryEngine/RenderDll/Common/Textures/TextureStreamPool.h b/Code/CryEngine/RenderDll/Common/Textures/TextureStreamPool.h
deleted file mode 100644
index 2ea9169ce2..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/TextureStreamPool.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTURESTREAMPOOL_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTURESTREAMPOOL_H
-#pragma once
-
-
-#define TEXSTRM_USE_FREEPOOL
-
-struct STexPool;
-
-struct STexPoolItemHdr
-{
-    static CryCriticalSection s_sSyncLock;
-
-    STexPoolItemHdr* m_Next;
-    STexPoolItemHdr* m_Prev;
-    STexPoolItemHdr* m_NextFree;
-    STexPoolItemHdr* m_PrevFree;
-
-    STexPoolItemHdr()
-        : m_Next(NULL)
-        , m_Prev(NULL)
-        , m_NextFree(NULL)
-        , m_PrevFree(NULL)
-    {
-    }
-
-    _inline void Unlink();
-    _inline void Link(STexPoolItemHdr* Before);
-    _inline void UnlinkFree();
-    _inline void LinkFree(STexPoolItemHdr* Before);
-};
-
-struct STexPoolItem
-    : STexPoolItemHdr
-{
-    STexPool* const m_pOwner;
-    CTexture* m_pTex;
-    CDeviceTexture* const m_pDevTexture;
-    size_t const m_nDeviceTexSize;
-
-    uint32 m_nFreeTick;
-    uint8 m_nActiveLod;
-
-    STexPoolItem (STexPool* pOwner, CDeviceTexture* pDevTexture, size_t devSize);
-    ~STexPoolItem();
-
-    bool IsFree() const { return m_NextFree != NULL; }
-
-    int GetSize()
-    {
-        int nSize = sizeof(*this);
-        return nSize;
-    }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_pDevTexture);
-    }
-    bool IsStillUsedByGPU(uint32 nCurTick);
-};
-
-struct STexPool
-{
-    uint16 m_Width;
-    uint16 m_Height;
-    uint16 m_nArraySize;
-    D3DFormat m_eFormat;
-    size_t m_Size;
-    STexPoolItemHdr m_ItemsList;
-    ETEX_Type m_eTT;
-    uint8 m_nMips;
-
-    int m_nItems;
-    int m_nItemsFree;
-
-    ~STexPool();
-
-    size_t GetSize()
-    {
-        size_t nSize = sizeof(*this);
-        STexPoolItemHdr* pIT = m_ItemsList.m_Next;
-        while (pIT != &m_ItemsList)
-        {
-            nSize += static_cast<STexPoolItem*>(pIT)->GetSize();
-            pIT = pIT->m_Next;
-        }
-
-        return nSize;
-    }
-
-    uint32 GetNumSlices() const
-    {
-        uint32 b = (m_eTT == eTT_Cube) ? 6 : 1;
-        return b * m_nArraySize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        STexPoolItemHdr* pIT = m_ItemsList.m_Next;
-        while (pIT != &m_ItemsList)
-        {
-            pSizer->AddObject(static_cast<STexPoolItem*>(pIT));
-            pIT = pIT->m_Next;
-        }
-    }
-};
-
-class CTextureStreamPoolMgr
-{
-public:
-    struct SFrameStats
-    {
-        SFrameStats()
-        {
-            memset(this, 0, sizeof(*this));
-        }
-
-        int nSoftCreates;
-        int nSoftFrees;
-        int nHardCreates;
-        int nHardFrees;
-    };
-
-    struct SPoolStats
-    {
-        int nWidth;
-        int nHeight;
-        int nMips;
-        uint32 nFormat;
-        ETEX_Type eTT;
-
-        int nInUse;
-        int nFree;
-
-        int nHardCreatesPerFrame;
-        int nSoftCreatesPerFrame;
-    };
-
-public:
-    CTextureStreamPoolMgr();
-    ~CTextureStreamPoolMgr();
-
-    void Flush();
-
-    // Fetch and reset last frame stats
-#if !defined(_RELEASE)
-    void EnableStatsComputation(bool bCompute) { m_bComputeStats = bCompute; }
-    SFrameStats FetchFrameStats()
-    {
-        SFrameStats frameStats = m_frameStats;
-        m_frameStats = SFrameStats();
-        return frameStats;
-    }
-
-    void FetchPoolStats(std::vector<SPoolStats>& poolStats)
-    {
-        CryAutoLock<CryCriticalSection> lock(m_statsLock);
-        poolStats = m_poolStats;
-        m_poolStats.clear();
-    }
-#endif
-
-    STexPool* GetPool(int nWidth, int nHeight, int nMips, int nArraySize, ETEX_Format eTF, bool bIsSRGB, ETEX_Type eTT);
-
-    STexPoolItem* GetPoolItem(int nWidth, int nHeight, int nMips, int nArraySize, ETEX_Format eTF, bool bIsSRGB, ETEX_Type eTT, bool bShouldBeCreated, const char* sName, STextureInfo* pTI = NULL, bool bCanCreate = true, bool bWaitForIdle = true);
-    void ReleaseItem(STexPoolItem* pItem);
-    void GarbageCollect(size_t* nCurTexPoolSize, size_t nLowerPoolLimit, int nMaxItemsToFree);
-
-    void GetMemoryUsage(ICrySizer* pSizer);
-
-    size_t GetInUseSize() const { return m_nDeviceMemInUse; }
-    size_t GetReservedSize() const { return m_nDeviceMemReserved; }
-
-private:
-    union TexturePoolKey
-    {
-        struct
-        {
-            uint64 a, b;
-        };
-        struct
-        {
-            uint16 nWidth;
-            uint16 nHeight;
-            uint32 nFormat;
-            uint8 nTexType;
-            uint8 nMips;
-            uint16 nArraySize;
-        };
-
-        TexturePoolKey(uint16 nWidth, uint16 nHeight, uint32 nFormat, uint8 nTexType, uint8 nMips, uint16 nArraySize)
-        {
-            memset(this, 0, sizeof(*this));
-            this->nWidth = nWidth;
-            this->nHeight = nHeight;
-            this->nFormat = nFormat;
-            this->nTexType = nTexType;
-            this->nMips = nMips;
-            this->nArraySize = nArraySize;
-        }
-
-        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-        friend bool operator < (const TexturePoolKey& a, const TexturePoolKey& b)
-        {
-            if (a.a != b.a)
-            {
-                return a.a < b.a;
-            }
-            return a.b < b.b;
-        }
-    };
-
-    enum
-    {
-        MaxFreePool = 64,
-    };
-
-    typedef VectorMap<TexturePoolKey, STexPool*> TexturePoolMap;
-
-private:
-    STexPool* CreatePool(int nWidth, int nHeight, int nMips, int nArraySize, D3DFormat eTF, ETEX_Type eTT);
-    void FlushFree();
-
-private:
-    volatile size_t m_nDeviceMemReserved;
-    volatile size_t m_nDeviceMemInUse;
-
-#if !defined(_RELEASE)
-    CryCriticalSection m_statsLock;
-    bool m_bComputeStats;
-    std::vector<SPoolStats> m_poolStats;
-    SFrameStats m_frameStats;
-#endif
-
-    uint32 m_nTick;
-
-    TexturePoolMap m_TexturesPools;
-    STexPoolItemHdr m_FreeTexPoolItems;
-
-#ifdef TEXSTRM_USE_FREEPOOL
-    void* m_FreePool[MaxFreePool];
-    size_t m_nFreePoolBegin;
-    size_t m_nFreePoolEnd;
-#endif
-};
-
-_inline void STexPoolItemHdr::Unlink()
-{
-    if (!m_Next || !m_Prev)
-    {
-        return;
-    }
-    m_Next->m_Prev = m_Prev;
-    m_Prev->m_Next = m_Next;
-    m_Next = m_Prev = NULL;
-}
-
-_inline void STexPoolItemHdr::Link(STexPoolItemHdr* pAfter)
-{
-    if (m_Next || m_Prev)
-    {
-        return;
-    }
-    m_Next = pAfter->m_Next;
-    pAfter->m_Next->m_Prev = this;
-    pAfter->m_Next = this;
-    m_Prev = pAfter;
-}
-
-_inline void STexPoolItemHdr::UnlinkFree()
-{
-    if (!m_NextFree || !m_PrevFree)
-    {
-        return;
-    }
-    m_NextFree->m_PrevFree = m_PrevFree;
-    m_PrevFree->m_NextFree = m_NextFree;
-    m_NextFree = m_PrevFree = NULL;
-}
-_inline void STexPoolItemHdr::LinkFree(STexPoolItemHdr* pAfter)
-{
-    if (m_NextFree || m_PrevFree)
-    {
-        return;
-    }
-    m_NextFree = pAfter->m_NextFree;
-    pAfter->m_NextFree->m_PrevFree = this;
-    pAfter->m_NextFree = this;
-    m_PrevFree = pAfter;
-}
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_TEXTURES_TEXTURESTREAMPOOL_H
diff --git a/Code/CryEngine/RenderDll/Common/Textures/TextureStreaming.cpp b/Code/CryEngine/RenderDll/Common/Textures/TextureStreaming.cpp
deleted file mode 100644
index fdaa862305..0000000000
--- a/Code/CryEngine/RenderDll/Common/Textures/TextureStreaming.cpp
+++ /dev/null
@@ -1,2081 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Common Texture Streaming manager implementation.
-
-
-#include "RenderDll_precompiled.h"
-#include "../CommonRender.h"
-#include <CryPath.h>
-#include "Image/DDSImage.h"
-#include "StringUtils.h"                                // stristr()
-#include "ILocalMemoryUsage.h"
-
-#include "TextureManager.h"
-#include "TextureStreamPool.h"
-#include "TextureHelpers.h"
-
-
-#include "PlanningTextureStreamer.h"
-
-// checks for MT-safety of called functions
-#define CHK_RENDTH assert(gRenDev->m_pRT->IsRenderThread())
-#define CHK_MAINTH assert(gRenDev->m_pRT->IsMainThread())
-#define CHK_MAINORRENDTH assert(gRenDev->m_pRT->IsMainThread() || gRenDev->m_pRT->IsRenderThread())
-
-bool CTexture::s_bStreamingFromHDD = true;
-CTextureArrayAlloc<STexStreamInState, CTexture::MaxStreamTasks> CTexture::s_StreamInTasks;
-CTextureArrayAlloc<STexStreamPrepState*, CTexture::MaxStreamPrepTasks> CTexture::s_StreamPrepTasks;
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define TEXTURESTREAMING_CPP_SECTION_1 1
-#define TEXTURESTREAMING_CPP_SECTION_2 2
-#define TEXTURESTREAMING_CPP_SECTION_3 3
-#define TEXTURESTREAMING_CPP_SECTION_4 4
-#define TEXTURESTREAMING_CPP_SECTION_5 5
-#define TEXTURESTREAMING_CPP_SECTION_6 6
-#define TEXTURESTREAMING_CPP_SECTION_7 7
-#endif
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-CTextureArrayAlloc<STexStreamOutState, CTexture::MaxStreamTasks> CTexture::s_StreamOutTasks;
-#endif
-
-volatile TIntAtomic CTexture::s_nBytesSubmittedToStreaming = {0};
-volatile TIntAtomic CTexture::s_nMipsSubmittedToStreaming = {0};
-int CTexture::s_nBytesRequiredNotSubmitted = 0;
-
-#if !defined (_RELEASE)
-int CTexture::s_TextureUpdates = 0;
-float CTexture::s_TextureUpdatesTime = 0.0f;
-int CTexture::s_TexturesUpdatedRendered = 0;
-float CTexture::s_TextureUpdatedRenderedTime = 0.0f;
-int CTexture::s_StreamingRequestsCount = 0;
-float CTexture::s_StreamingRequestsTime = 0.0f;
-#endif
-
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-ITextureStreamListener* CTexture::s_pStreamListener;
-#endif
-
-bool CTexture::s_bStreamDontKeepSystem = false;
-
-int CTexture::s_nTexturesDataBytesLoaded = 0;
-volatile int CTexture::s_nTexturesDataBytesUploaded = 0;
-int CTexture::s_nStatsAllocFails;
-bool CTexture::s_bOutOfMemoryTotally;
-volatile size_t CTexture::s_nStatsStreamPoolInUseMem;
-volatile size_t CTexture::s_nStatsStreamPoolBoundMem;
-volatile size_t CTexture::s_nStatsStreamPoolBoundPersMem;
-AZStd::atomic_uint CTexture::s_nStatsCurManagedNonStreamedTexMem = {0};
-AZStd::atomic_uint CTexture::s_nStatsCurDynamicTexMem = {0};
-volatile size_t CTexture::s_nStatsStreamPoolWanted = {0};
-bool CTexture::s_bStatsComputeStreamPoolWanted = false;
-std::vector<CTexture::WantedStat>* CTexture::s_pStatsTexWantedLists = NULL;
-
-ITextureStreamer* CTexture::s_pTextureStreamer;
-
-CryCriticalSection CTexture::s_streamFormatLock;
-SStreamFormatCode CTexture::s_formatCodes[256];
-uint32 CTexture::s_nFormatCodes = 1;
-StaticInstance<CTexture::TStreamFormatCodeKeyMap> CTexture::s_formatCodeMap;
-
-const int CTexture::LOW_SPEC_PC = 5;
-const int CTexture::MEDIUM_SPEC_PC = 6;
-const int CTexture::HIGH_SPEC_PC = 7;
-const int CTexture::VERYHIGH_SPEC_PC = 8;
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-void STexStreamInState::CopyMips()
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    CTexture* tp = m_pTexture;
-
-    if (!m_bAborted)
-    {
-        if (tp->m_pFileTexMips->m_pPoolItem)
-        {
-            const int nNewMipOffset = tp->m_nMinMipVidUploaded - m_nHigherUploadedMip;
-            const int nNumMips = tp->GetNumMipsNonVirtual() - tp->m_nMinMipVidUploaded;
-
-            if (0)
-            {
-            }
-#if TEXTURESTREAMING_CPP_TRAIT_COPYMIPS_MOVEENGINE && !defined(NULL_RENDERER)
-            else if (!gRenDev->m_pRT->IsRenderThread())
-            {
-                m_copyMipsFence = CTexture::StreamCopyMipsTexToTex_MoveEngine(tp->m_pFileTexMips->m_pPoolItem, 0, m_pNewPoolItem, 0 + nNewMipOffset, nNumMips);
-            }
-#endif
-            else
-            {
-                CTexture::StreamCopyMipsTexToTex(tp->m_pFileTexMips->m_pPoolItem, 0, m_pNewPoolItem, 0 + nNewMipOffset, nNumMips);
-            }
-
-            m_bValidLowMips = true;
-        }
-    }
-    else
-    {
-        m_bValidLowMips = true;
-    }
-}
-
-void STexStreamOutState::Reset()
-{
-    // if we have streaming error, release new pool item
-    if (m_pNewPoolItem)
-    {
-        CTexture::s_pPoolMgr->ReleaseItem(m_pNewPoolItem);
-    }
-
-    m_pNewPoolItem = NULL;
-    m_pTexture = 0;
-    m_bDone = false;
-    m_bAborted = false;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURESTREAMING_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(TextureStreaming_cpp)
-#endif
-}
-
-bool STexStreamOutState::TryCommit()
-{
-    if (m_bDone)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURESTREAMING_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(TextureStreaming_cpp)
-#endif
-
-        if (!m_bAborted)
-        {
-            if (m_nStartMip < MAX_MIP_LEVELS)
-            {
-                m_pTexture->StreamAssignPoolItem(m_pNewPoolItem, m_nStartMip);
-                m_pNewPoolItem = NULL;
-
-                m_pTexture->SetWasUnload(false);
-            }
-            else
-            {
-                // Stream unload
-                m_pTexture->ReleaseDeviceTexture(true, true);
-                m_pTexture->SetWasUnload(true);
-            }
-        }
-
-        m_pTexture->SetStreamingInProgress(CTexture::InvalidStreamSlot);
-        m_pTexture->Release();
-        m_pTexture = NULL;
-
-        return true;
-    }
-
-    return false;
-}
-#endif
-
-void CTexture::StreamReleaseMipsData(int nStartMip, int nEndMip)
-{
-    assert(m_pFileTexMips);
-    assert(nStartMip <= nEndMip);
-    nEndMip = min(nEndMip, m_nMips - 1);
-    nStartMip = min(nStartMip, nEndMip);
-    const int nSides = StreamGetNumSlices();
-    for (int i = 0; i < nSides; i++)
-    {
-        for (int j = nStartMip; j <= nEndMip; j++)
-        {
-            m_pFileTexMips->m_pMipHeader[j].m_Mips[i].Free();
-        }
-    }
-}
-
-STexStreamInState::STexStreamInState()
-{
-    m_pNewPoolItem = NULL;
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    m_pCmdList = NULL;
-#endif
-    Reset();
-}
-
-void STexStreamInState::Reset()
-{
-    if (m_pNewPoolItem)
-    {
-        CTexture::s_pPoolMgr->ReleaseItem(m_pNewPoolItem);
-
-        m_pNewPoolItem = NULL;
-    }
-
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    SAFE_RELEASE(m_pCmdList);
-#endif
-
-    for (size_t i = 0, c = m_nLowerUploadedMip - m_nHigherUploadedMip + 1; i != c; ++i)
-    {
-        m_pStreams[i] = NULL;
-    }
-
-    memset(&m_pTexture, 0, (char*)(this + 1) - (char*)&m_pTexture);
-}
-
-// streaming thread
-void STexStreamInState::StreamAsyncOnComplete(IReadStream* pStream, unsigned nError)
-{
-    PROFILE_FRAME(Texture_StreamAsyncOnComplete);
-
-    CTexture* tp = m_pTexture;
-
-    int nMip = (int)pStream->GetUserData();
-    STexStreamInMipState& mipState = m_mips[nMip];
-
-    if (!nError && tp->m_pFileTexMips)
-    {
-#if defined(TEXSTRM_ASYNC_UPLOAD)
-        tp->StreamUploadMip(pStream, nMip, m_nHigherUploadedMip, m_pNewPoolItem, mipState);
-        mipState.m_bUploaded = true;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURESTREAMING_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(TextureStreaming_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        if (!mipState.m_bStreamInPlace)
-        {
-            tp->StreamExpandMip(pStream->GetBuffer(), nMip, m_nHigherUploadedMip, mipState.m_nSideDelta);
-            mipState.m_bExpanded = true;
-        }
-        else
-        {
-            mipState.m_bUploaded = true;
-        }
-#endif
-
-        // Update the cached media type to optimise future requests
-        EStreamSourceMediaType eMT = pStream->GetMediaType();
-        int nAbsMip = m_nHigherUploadedMip + nMip;
-        tp->m_pFileTexMips->m_pMipHeader[nAbsMip].m_eMediaType = eMT;
-    }
-    else
-    {
-        m_bAborted = true;
-    }
-
-    pStream->FreeTemporaryMemory(); // We don't need internal stream loaded buffer anymore.
-
-    int nChunkSize = tp->m_pFileTexMips->m_pMipHeader[nMip + m_nHigherUploadedMip].m_SideSize * tp->GetNumSides();
-    CryInterlockedAdd(CTexture::s_nBytesSubmittedToStreaming.Addr(), -nChunkSize);
-    CryInterlockedDecrement(CTexture::s_nMipsSubmittedToStreaming.Addr());
-    assert(CTexture::s_nBytesSubmittedToStreaming >= 0);
-
-    const int nRef = CryInterlockedDecrement(&m_nAsyncRefCount);
-
-    // Check to see if this is the last mip (and thus owns the job)
-    if (nRef == 0)
-    {
-        if (!m_bAborted)
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURESTREAMING_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(TextureStreaming_cpp)
-#endif
-
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-            if (tp->m_pFileTexMips->m_pPoolItem)    ///< Don't upload if the source is nullptr it'll just cause an exception
-            {
-                ID3D11CommandList* pCmdList = tp->StreamCreateDeferred(m_nHigherUploadedMip, m_nLowerUploadedMip, m_pNewPoolItem, tp->m_pFileTexMips->m_pPoolItem);
-
-                if (pCmdList)
-                {
-                    m_pCmdList = pCmdList;
-                    m_bValidLowMips = true;
-
-                    for (int i = 0, c = m_nLowerUploadedMip - m_nHigherUploadedMip + 1; i != c; ++i)
-                    {
-                        m_mips[i].m_bExpanded = false;
-                    }
-
-                    if (CTexture::s_bStreamDontKeepSystem)
-                    {
-                        tp->StreamReleaseMipsData(m_nHigherUploadedMip, m_nLowerUploadedMip);
-                    }
-                }
-            }
-#endif
-
-#if defined(TEXSTRM_ASYNC_TEXCOPY)
-
-            if (!m_bValidLowMips && tp->CanAsyncCopy())
-            {
-                CopyMips();
-            }
-
-#endif
-        }
-
-#ifndef _RELEASE
-        // collect statistics
-        if (pStream->GetParams().nSize > 1024)
-        {
-            CTexture::s_nStreamingThroughput += pStream->GetParams().nSize;
-        }
-        const CTimeValue currentTime = iTimer->GetAsyncTime();
-        if (currentTime - m_fStartTime >  .01f)  // avoid measurement errors for small textures
-        {
-            CTexture::s_nStreamingTotalTime += currentTime.GetSeconds() - m_fStartTime;
-        }
-#endif
-
-        m_bAllStreamsComplete = true;
-    }
-}
-
-bool STexStreamInState::TryCommit()
-{
-    PROFILE_FRAME(Texture_StreamOnComplete_Render);
-
-    CHK_RENDTH;
-
-    CTexture* tp = m_pTexture;
-
-    if (!m_bAborted)
-    {
-        STexPoolItem*& pNewPoolItem = m_pNewPoolItem;
-
-#if !defined(TEXSTRM_ASYNC_UPLOAD) && TEXTURESTREAMING_CPP_TRAIT_TRYCOMMIT_COPYMIPS
-        for (size_t i = 0, c = m_nLowerUploadedMip - m_nHigherUploadedMip + 1; i != c; ++i)
-        {
-            STexStreamInMipState& mipState = m_mips[i];
-
-            if (mipState.m_bExpanded)
-            {
-                mipState.m_bUploaded = true;
-                mipState.m_bExpanded = false;
-
-                tp->StreamCopyMipsTexToMem(m_nHigherUploadedMip + i, m_nHigherUploadedMip + i, true, pNewPoolItem);
-                if (CTexture::s_bStreamDontKeepSystem)
-                {
-                    tp->StreamReleaseMipsData(m_nHigherUploadedMip + i, m_nHigherUploadedMip + i);
-                }
-            }
-        }
-#endif
-
-#ifdef TEXSTRM_DEFERRED_UPLOAD
-        if (m_pCmdList)
-        {
-            tp->StreamApplyDeferred(m_pCmdList);
-            m_pCmdList->Release();
-            m_pCmdList = NULL;
-        }
-#endif
-
-#if defined(TEXSTRM_COMMIT_COOLDOWN)
-        if ((m_nStallFrames++) < 4)
-        {
-            return false;
-        }
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURESTREAMING_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(TextureStreaming_cpp)
-#endif
-
-        if (!m_bValidLowMips)
-        {
-            STexPoolItem* pCurItem = tp->m_pFileTexMips->m_pPoolItem;
-
-            if (pCurItem)
-            {
-                // it is a sync operation anyway, so we do it in the render thread
-                // restore already loaded mips
-                const int nNumMips = pCurItem->m_pOwner->m_nMips;
-                const int nNewMipOffset = pNewPoolItem->m_pOwner->m_nMips - nNumMips;
-                CTexture::StreamCopyMipsTexToTex(pCurItem, 0, pNewPoolItem, nNewMipOffset, nNumMips);
-            }
-            else
-            {
-                m_pTexture->StreamCopyMipsTexToMem(m_pTexture->GetNumMipsNonVirtual() - m_pTexture->GetNumPersistentMips(), m_pTexture->GetNumMipsNonVirtual() - 1, true, pNewPoolItem);
-
-                if (CTexture::s_bStreamDontKeepSystem)
-                {
-                    m_pTexture->StreamReleaseMipsData(m_pTexture->GetNumMipsNonVirtual() - m_pTexture->GetNumPersistentMips(), m_pTexture->GetNumMipsNonVirtual() - 1);
-                }
-            }
-
-            m_bValidLowMips = true;
-        }
-
-        if (pNewPoolItem)
-        {
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_texturesstreamingmipfading)
-            {
-                tp->m_fCurrentMipBias = min(2.f, tp->m_fCurrentMipBias + float(m_nLowerUploadedMip - m_nHigherUploadedMip + 1));
-            }
-
-            // bind new texture
-            const int nNewNumMips = m_nHigherUploadedMip;
-            tp->StreamAssignPoolItem(pNewPoolItem, m_nActivateMip);
-            pNewPoolItem = NULL;
-            tp->SetWasUnload(false);
-        }
-    }
-    else
-    {
-        if (CTexture::s_bStreamDontKeepSystem)
-        {
-            tp->StreamReleaseMipsData(m_nHigherUploadedMip, m_nLowerUploadedMip);
-        }
-    }
-
-    tp->SetStreamingInProgress(CTexture::InvalidStreamSlot);
-
-    m_pTexture->Release();
-    m_pTexture = NULL;
-
-    CTexture::StreamValidateTexSize();
-
-    return true;
-}
-
-bool STexStreamPrepState::Commit()
-{
-    _smart_ptr<CImageFile> pNextImage;
-
-    if (!m_bFailed)
-    {
-        if (m_pImage)
-        {
-            if (m_pTexture->IsStreamed())
-            {
-                if (m_pTexture->StreamPrepare(&*m_pImage))
-                {
-                    m_bNeedsFinalise = true;
-                }
-                else
-                {
-                    m_bCompleted = false;
-
-                    // StreamPrepare failed, so presumably the image can't be streamed. Since we only have an image assuming it was streamed,
-                    // load it again, with all mips.
-                    // StreamPrepare failure will mark the texture as non-streamable.
-                    pNextImage = CImageFile::mfStream_File(m_pImage->mfGet_filename(), m_pImage->mfGet_Flags() & ~FIM_STREAM_PREPARE, this);
-                }
-            }
-            else
-            {
-                m_pTexture->Load(&*m_pImage);
-            }
-        }
-
-        if (m_bNeedsFinalise)
-        {
-            if (m_pTexture->IsStreamed())
-            {
-                m_bNeedsFinalise = !m_pTexture->StreamPrepare_Finalise(true);
-            }
-        }
-    }
-    else
-    {
-        m_pTexture->SetNoTexture( CTextureManager::Instance()->GetNoTexture() );
-    }
-
-    m_pImage = pNextImage;
-
-    if (!m_pImage && !m_bNeedsFinalise && m_pTexture)
-    {
-        m_pTexture->PostCreate();
-    }
-
-    return !m_pImage && !m_bNeedsFinalise;
-}
-
-void STexStreamPrepState::OnImageFileStreamComplete(CImageFile* pImFile)
-{
-    if (!pImFile)
-    {
-        m_pImage = NULL;
-        m_bFailed = true;
-    }
-
-    m_bCompleted = true;
-}
-
-int CTexture::StreamCalculateMipsSigned(float fMipFactor) const
-{
-    return StreamCalculateMipsSignedFP(fMipFactor) >> 8;
-}
-
-int CTexture::GetStreamableMipNumber() const
-{
-    assert(IsStreamed());
-    return max(0, m_nMips - m_CacheFileHeader.m_nMipsPersistent);
-}
-
-bool CTexture::IsStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES]) const
-{
-    if (IsStreamed())
-    {
-        for (int nZoneIdx = 0; nZoneIdx < MAX_STREAM_PREDICTION_ZONES; ++nZoneIdx)
-        {
-            if (m_streamRounds[nZoneIdx].nRoundUpdateId < nMinPrecacheRoundIds[nZoneIdx])
-            {
-                return false;
-            }
-        }
-
-        int nMinMip = s_pTextureStreamer->GetMinStreamableMipWithSkip();
-        return max(GetRequiredMipNonVirtual(), nMinMip) >= CTexture::GetMinLoadedMip();
-    }
-    return true;
-}
-
-int CTexture::GetStreamableMemoryUsage(int nStartMip) const
-{
-    assert(IsStreamed());
-    if (m_pFileTexMips == NULL)
-    {
-        assert(0);
-        return 0;
-    }
-
-    return m_pFileTexMips->m_pMipHeader[nStartMip].m_SideSizeWithMips;
-}
-
-void CTexture::SetMinLoadedMip(int nMinMip)
-{
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-    if (m_nMinMipVidUploaded != nMinMip)
-    {
-        ITextureStreamListener* pListener = s_pStreamListener;
-        if (pListener)
-        {
-            pListener->OnTextureHasMip(this, min(nMinMip, (int)m_nMips));
-        }
-    }
-#endif
-
-    m_nMinMipVidUploaded = nMinMip;
-}
-
-const bool CTexture::IsParticularMipStreamed(float fMipFactor) const
-{
-    if (!IsStreamed())
-    {
-        return true;
-    }
-
-    bool bHighPriority = false;
-    if (m_pFileTexMips)
-    {
-        bHighPriority = m_bStreamHighPriority != 0;
-    }
-    int nMipClamp = (s_bStreamingFromHDD || bHighPriority) ? 0 : CRenderer::CV_r_TexturesStreamingMipClampDVD;
-    const int nMip = max(nMipClamp, CTexture::StreamCalculateMipsSigned(fMipFactor));
-    return m_nMinMipVidUploaded <= nMip;
-}
-
-void CTexture::PrecacheAsynchronously(float fMipFactor, int nFlags, int nUpdateId, int nCounter)
-{
-    if (!IsStreamed())
-    {
-        return;     // already done
-    }
-    s_pTextureStreamer->UpdateMip(this, fMipFactor, nFlags, nUpdateId, nCounter);
-
-    // for distance streaming it's just the same as update rendering distance
-    StreamLoadFromCache(nFlags);
-}
-
-void CTexture::StreamLoadFromCache([[maybe_unused]] const int Flags)
-{
-    if (IsUnloaded())
-    {
-        if (!StreamPrepare(false))
-        {
-            // ignore error for optional attached alpha channel
-            if (!m_bNoTexture && !(m_nFlags & FT_ALPHA) && (m_nFlags & FT_FROMIMAGE))
-            {
-#ifndef NDEBUG
-                bool bRes =
-#endif
-                    Reload();
-                assert(bRes);
-            }
-        }
-    }
-}
-
-bool CTexture::StreamPrepare(bool bFromLoad)
-{
-    CHK_MAINORRENDTH;
-
-    if (!CRenderer::CV_r_texturesstreaming || m_nFlags & FT_DONT_STREAM)
-    {
-        return false;
-    }
-
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-    PROFILE_FRAME(Texture_StreamPrepare);
-
-    CRY_DEFINE_ASSET_SCOPE("Texture", m_sAssetScopeName);
-
-    // release the old texture
-    if (m_pDevTexture)
-    {
-        ReleaseDeviceTexture(false);
-    }
-
-    if (!m_pFileTexMips)
-    {
-        if (IResourceCompilerHelper::IsSourceImageFormatSupported(m_SrcName.c_str()) &&
-            !gEnv->pCryPak->IsFileExist(m_SrcName.c_str()))
-        {
-            m_SrcName = PathUtil::ReplaceExtension(m_SrcName, "dds");
-            if (!gEnv->pCryPak->IsFileExist(m_SrcName.c_str()))
-            {
-                return false;
-            }
-        }
-
-#if !defined(_RELEASE)
-        if ((m_nFlags & FT_TEX_NORMAL_MAP) && !TextureHelpers::VerifyTexSuffix(EFTT_NORMALS, m_SrcName))
-        {
-            FileWarning(m_SrcName.c_str(), "Normal map should have '%s' suffix in filename", TextureHelpers::LookupTexSuffix(EFTT_NORMALS));
-        }
-#endif
-
-        if (m_bPostponed)
-        {
-            if (CTexture::s_pTextureStreamer->BeginPrepare(this, m_SrcName.c_str(), ((m_nFlags & FT_ALPHA) ? FIM_ALPHA : 0) | FIM_STREAM_PREPARE))
-            {
-                return true;
-            }
-        }
-
-        uint32 nImageFlags = FIM_STREAM_PREPARE | ((m_nFlags & FT_ALPHA) ? FIM_ALPHA : 0);
-
-        _smart_ptr<CImageFile>  pIM(CImageFile::mfLoad_file(m_SrcName, nImageFlags));
-        m_bisTextureMissing = !pIM || pIM->mfGet_IsImageMissing();
-        if (!pIM || m_bisTextureMissing || !StreamPrepare(&*pIM))
-        {
-            return false;
-        }
-    }
-
-    return StreamPrepare_Finalise(bFromLoad);
-}
-
-bool CTexture::StreamPrepareComposition()
-{
-    CHK_MAINORRENDTH;
-
-    if (!CRenderer::CV_r_texturesstreaming || m_nFlags & FT_DONT_STREAM)
-    {
-        return false;
-    }
-
-    LOADING_TIME_PROFILE_SECTION(iSystem);
-    PROFILE_FRAME(Texture_StreamPrepare);
-
-    CRY_DEFINE_ASSET_SCOPE("Texture", m_sAssetScopeName);
-
-    int nWidth = m_nWidth;
-    int nHeight = m_nHeight;
-    int nMips = m_nMips;
-    ETEX_Format eTF = m_eTFDst;
-    const STexComposition* pCompositions = &m_composition[0];
-    size_t nCompositions = m_composition.size();
-
-    // release the old texture
-    if (m_pDevTexture)
-    {
-        ReleaseDeviceTexture(false);
-    }
-
-    int nSides = 1;
-    for (size_t i = 0; i < nCompositions; ++i)
-    {
-        nSides = max(nSides, pCompositions[i].nDstSlice + 1);
-    }
-
-    ETEX_Type eTT = nSides > 1 ? eTT_2DArray : eTT_2D;
-    ETEX_Format eTFSrc = eTF;
-    ETEX_Format eTFDst = eTF;
-    float fAvgBrightness = 1.0f;
-    ETEX_TileMode eTileMode = eTM_None;
-
-    int nMipsPersistent = DDSSplitted::GetNumLastMips(nWidth, nHeight, nMips, nSides, eTFSrc, 0);
-
-
-    m_nFlags &= ~(FT_SPLITTED | FT_TEX_WAS_NOT_PRE_TILED | FT_HAS_ATTACHED_ALPHA | FT_DONT_STREAM | FT_FROMIMAGE);
-
-    const SPixFormat* pPF = NULL;
-#ifndef NULL_RENDERER
-    ClosestFormatSupported(eTFDst, pPF);
-#endif
-    if (!pPF)
-    {
-        __debugbreak();
-        return false;
-    }
-
-    // Can't fail from this point on - commit everything.
-
-    STexCacheFileHeader& fh = m_CacheFileHeader;
-
-    // copy image properties
-    m_nWidth = nWidth;
-    m_nHeight = nHeight;
-    m_nDepth = 1;
-    m_nArraySize = nSides;
-    m_nMips = nMips;
-    m_eTT = eTT;
-    fh.m_nSides = nSides;
-    m_eTFSrc = eTFSrc;
-    m_eTFDst = eTFDst;
-    m_bIsSRGB = pPF->bCanReadSRGB; // OF FIXME: Probably ought to be supplied, and checked against the PF, rather than taken from the PF
-    assert (!m_pFileTexMips);
-    m_pFileTexMips = StreamState_AllocateInfo(m_nMips);
-    m_nStreamingPriority = 0;
-    SetMinLoadedMip(MAX_MIP_LEVELS);
-    m_nMinMipVidActive = MAX_MIP_LEVELS;
-    m_fCurrentMipBias = 0.0f;
-    m_fAvgBrightness = fAvgBrightness;
-    m_eSrcTileMode = eTileMode;
-    m_bStreamed = true;
-
-    // allocate and fill up streaming auxiliary structures
-    for (int iMip = 0; iMip < m_nMips; ++iMip)
-    {
-        m_pFileTexMips->m_pMipHeader[iMip].m_Mips = new SMipData[m_CacheFileHeader.m_nSides];
-    }
-
-    for (int iSide = 0; iSide < fh.m_nSides; ++iSide)
-    {
-        int nTopMipWidth = m_nWidth;
-        int nTopMipHeight = m_nHeight;
-
-        const Vec2i vMipAlign = CTexture::GetBlockDim(m_eTFDst);
-        nTopMipWidth = Align(nTopMipWidth, vMipAlign.x);
-        nTopMipHeight = Align(nTopMipHeight, vMipAlign.y);
-
-        for (int iMip = 0; iMip < m_nMips; ++iMip)
-        {
-            m_pFileTexMips->m_pMipHeader[iMip].m_SideSize = CTexture::TextureDataSize(
-                    max(1, nTopMipWidth >> iMip),
-                    max(1, nTopMipHeight >> iMip),
-                    1, 1, 1, m_eTFDst, eTileMode);
-        }
-    }
-
-#if defined(TEXSTRM_STORE_DEVSIZES)
-    for (int iMip = 0; iMip < m_nMips; ++iMip)
-    {
-        m_pFileTexMips->m_pMipHeader[iMip].m_DevSideSizeWithMips = CDeviceTexture::TextureDataSize(
-                max(1, m_nWidth >> iMip),
-                max(1, m_nHeight >> iMip),
-                max(1, m_nDepth >> iMip),
-                m_nMips - iMip,
-                StreamGetNumSlices(),
-                m_eTFDst);
-    }
-#endif
-
-    for (int iMip = 0; iMip < m_nMips; iMip++)
-    {
-        m_pFileTexMips->m_pMipHeader[iMip].m_SideSizeWithMips = 0;
-        for (int j = iMip; j < m_nMips; j++)
-        {
-            m_pFileTexMips->m_pMipHeader[iMip].m_SideSizeWithMips += m_pFileTexMips->m_pMipHeader[j].m_SideSize;
-        }
-    }
-
-    m_pPixelFormat = pPF;
-    fh.m_nMipsPersistent = nMipsPersistent;
-
-    m_pFileTexMips->m_fMinMipFactor = StreamCalculateMipFactor((m_nMips - m_CacheFileHeader.m_nMipsPersistent) << 8);
-    m_nStreamFormatCode = StreamComputeFormatCode(m_nWidth, m_nHeight, m_nMips, m_eTFDst);
-
-    assert (m_eTFDst != eTF_Unknown);
-
-    StreamPrepare_Platform();
-
-    SetTexStates();
-    PostCreate();
-
-    Relink();
-    m_bStreamPrepared = true;
-
-#if !defined(NULL_RENDERER)
-    if (gRenDev->m_pRT->IsRenderThread() && !gRenDev->m_pRT->IsRenderLoadingThread())
-    {
-        // create texture
-        assert(!m_pFileTexMips->m_pPoolItem);
-        assert(!IsStreaming());
-        STexPoolItem* pNewPoolItem = StreamGetPoolItem(m_nMips - m_CacheFileHeader.m_nMipsPersistent, m_CacheFileHeader.m_nMipsPersistent, true);
-        if (pNewPoolItem)
-        {
-            int nTexWantedMip = m_nMips - m_CacheFileHeader.m_nMipsPersistent;
-
-            // bake persistent mips
-            for (int i = 0, c = m_composition.size(); i != c; ++i)
-            {
-                const STexComposition& tc = m_composition[i];
-                CTexture* p = (CTexture*)&*tc.pTexture;
-                CDeviceTexture* pSrcDevTex = p->m_pDevTexture;
-                uint32 nSrcDevMips = p->GetNumMipsNonVirtual() - p->StreamGetLoadedMip();
-
-                CTexture::CopySliceChain(
-                    pNewPoolItem->m_pDevTexture, pNewPoolItem->m_pOwner->m_nMips, tc.nDstSlice, 0,
-                    pSrcDevTex, tc.nSrcSlice, nTexWantedMip - (m_nMips - nSrcDevMips), nSrcDevMips,
-                    m_nMips - nTexWantedMip);
-            }
-
-            // upload mips to texture
-            StreamAssignPoolItem(pNewPoolItem, m_nMips - m_CacheFileHeader.m_nMipsPersistent);
-            StreamReleaseMipsData(0, m_nMips - 1);
-            SetWasUnload(false);
-        }
-    }
-#endif
-
-    return true;
-}
-
-bool CTexture::StreamPrepare(CImageFile* pIM)
-{
-    if (!pIM)
-    {
-        return false;
-    }
-
-    int nWidth = pIM->mfGet_width();
-    int nHeight = pIM->mfGet_height();
-    int nDepth = pIM->mfGet_depth();
-    int nMips = pIM->mfGet_numMips();
-    ETEX_Type eTT = pIM->mfGet_NumSides() == 1 ? eTT_2D : eTT_Cube;
-    int nSides = eTT != eTT_Cube ? 1 : 6;
-    ETEX_Format eTFSrc = pIM->mfGetFormat();
-    ETEX_Format eTFDst = FormatFixup(eTFSrc);
-    const ColorF& cMinColor = pIM->mfGet_minColor();
-    const ColorF& cMaxColor = pIM->mfGet_maxColor();
-    ETEX_TileMode eTileMode = pIM->mfGetTileMode();
-
-#ifndef _RELEASE
-    if (eTileMode != eTM_None)
-    {
-        if (eTFSrc != eTFDst)
-        {
-            __debugbreak();
-        }
-    }
-#endif
-
-    int nMipsPersistent = max(pIM->mfGet_numPersistentMips(), DDSSplitted::GetNumLastMips(nWidth, nHeight, nMips, nSides, eTFSrc, (m_nFlags & FT_ALPHA) ? FIM_ALPHA : 0));
-
-    bool bStreamable = true;
-
-    // Can't stream volume textures and textures without mips
-    if (eTFDst == eTF_Unknown || nDepth > 1 || nMips < 2)
-    {
-        bStreamable = false;
-    }
-
-    if ((nWidth <= DDSSplitted::etexLowerMipMaxSize || nHeight <= DDSSplitted::etexLowerMipMaxSize) || nMips <= nMipsPersistent || nMipsPersistent == 0)
-    {
-        bStreamable = false;
-    }
-
-    const SPixFormat* pPF = NULL;
-#ifndef NULL_RENDERER
-    ClosestFormatSupported(eTFDst, pPF);
-#endif
-    if (!pPF && !DDSFormats::IsNormalMap(eTFDst)) // special case for 3DC and CTX1
-    {
-        assert(0);
-        gEnv->pLog->LogError("Failed to load texture '%s': format '%s' is not supported", m_SrcName.c_str(), NameForTextureFormat(m_eTFDst));
-        bStreamable = false;
-    }
-
-    if (!bStreamable)
-    {
-        if (m_pFileTexMips)
-        {
-            Unlink();
-            StreamState_ReleaseInfo(this, m_pFileTexMips);
-            m_pFileTexMips = NULL;
-        }
-        m_nFlags |= FT_DONT_STREAM;
-        m_bStreamed = false;
-        m_bStreamPrepared = false;
-        SetWasUnload(false);
-        SetStreamingInProgress(InvalidStreamSlot);
-        m_bStreamRequested = false;
-        m_bNoTexture = false;
-        return false;
-    }
-
-    // Can't fail from this point on - commit everything.
-    m_nFlags &= ~(FT_SPLITTED | FT_TEX_WAS_NOT_PRE_TILED | FT_HAS_ATTACHED_ALPHA | FT_DONT_STREAM | FT_FROMIMAGE);
-
-    STexCacheFileHeader& fh = m_CacheFileHeader;
-    if (pIM->mfGet_Flags() & FIM_SPLITTED)
-    {
-        m_nFlags |= FT_SPLITTED;
-    }
-    if (pIM->mfGet_Flags() & FIM_X360_NOT_PRETILED)
-    {
-        m_nFlags |= FT_TEX_WAS_NOT_PRE_TILED;
-    }
-    if (pIM->mfGet_Flags() & FIM_HAS_ATTACHED_ALPHA)
-    {
-        m_nFlags |= FT_HAS_ATTACHED_ALPHA;          // if the image has alpha attached we store this in the CTexture
-    }
-    // copy image properties
-    m_nWidth = nWidth;
-    m_nHeight = nHeight;
-    m_nDepth = nDepth;
-    m_nMips = nMips;
-    m_eTT = eTT;
-    fh.m_nSides = nSides;
-    m_eTFSrc = eTFSrc;
-    m_eTFDst = eTFDst;
-    m_nFlags |= FT_FROMIMAGE;
-    m_bUseDecalBorderCol = (pIM->mfGet_Flags() & FIM_DECAL) != 0;
-    m_bIsSRGB = (pIM->mfGet_Flags() & FIM_SRGB_READ) != 0;
-    m_SrcName = pIM->mfGet_filename();
-    assert (!m_pFileTexMips);
-    m_pFileTexMips = StreamState_AllocateInfo(m_nMips);
-    m_nStreamingPriority = 0;
-    SetMinLoadedMip(MAX_MIP_LEVELS);
-    m_nMinMipVidActive = MAX_MIP_LEVELS;
-    m_fCurrentMipBias = 0.0f;
-    m_cMinColor = cMinColor;
-    m_cMaxColor = cMaxColor;
-    m_cClearColor = ColorF(0.0f, 0.0f, 0.0f, 1.0f);
-    m_eSrcTileMode = eTileMode;
-    m_bStreamed = true;
-
-    // base range after normalization, fe. [0,1] for 8bit images, or [0,2^15] for RGBE/HDR data
-    if ((m_eTFSrc == eTF_R9G9B9E5) || (m_eTFSrc == eTF_BC6UH) || (m_eTFSrc == eTF_BC6SH))
-    {
-        m_cMinColor /= m_cMaxColor.a;
-        m_cMaxColor /= m_cMaxColor.a;
-    }
-
-    // allocate and fill up streaming auxiliary structures
-    for (int iMip = 0; iMip < m_nMips; ++iMip)
-    {
-        m_pFileTexMips->m_pMipHeader[iMip].m_Mips = new SMipData[m_CacheFileHeader.m_nSides];
-    }
-
-    m_pFileTexMips->m_desc = pIM->mfGet_DDSDesc();
-
-    for (int iSide = 0; iSide < fh.m_nSides; ++iSide)
-    {
-        int nTopMipWidth = m_nWidth;
-        int nTopMipHeight = m_nHeight;
-
-        const Vec2i vMipAlign = CTexture::GetBlockDim(m_eTFDst);
-        nTopMipWidth = Align(nTopMipWidth, vMipAlign.x);
-        nTopMipHeight = Align(nTopMipHeight, vMipAlign.y);
-
-        for (int iMip = 0; iMip < m_nMips; ++iMip)
-        {
-            m_pFileTexMips->m_pMipHeader[iMip].m_SideSize = CTexture::TextureDataSize(
-                    max(1, nTopMipWidth >> iMip),
-                    max(1, nTopMipHeight >> iMip),
-                    1, 1, 1, m_eTFDst, eTileMode);
-        }
-    }
-
-#if defined(TEXSTRM_STORE_DEVSIZES)
-    for (int iMip = 0; iMip < m_nMips; ++iMip)
-    {
-        m_pFileTexMips->m_pMipHeader[iMip].m_DevSideSizeWithMips = CDeviceTexture::TextureDataSize(
-                max(1, m_nWidth >> iMip),
-                max(1, m_nHeight >> iMip),
-                max(1, m_nDepth >> iMip),
-                m_nMips - iMip,
-                StreamGetNumSlices(),
-                m_eTFDst);
-    }
-#endif
-
-    m_pFileTexMips->m_nSrcStart = pIM->mfGet_StartSeek();
-
-    for (int iMip = 0; iMip < m_nMips; iMip++)
-    {
-        m_pFileTexMips->m_pMipHeader[iMip].m_SideSizeWithMips = 0;
-        for (int j = iMip; j < m_nMips; j++)
-        {
-            m_pFileTexMips->m_pMipHeader[iMip].m_SideSizeWithMips += m_pFileTexMips->m_pMipHeader[j].m_SideSize;
-        }
-    }
-
-    // set up pixel format and check if it's supported for
-    m_pPixelFormat = pPF;
-    if (m_pPixelFormat)
-    {
-        m_bIsSRGB &= m_pPixelFormat->bCanReadSRGB;
-    }
-    else
-    {
-        m_bIsSRGB = false;
-    }
-
-    fh.m_nMipsPersistent = nMipsPersistent;
-
-    assert (m_eTFDst != eTF_Unknown);
-
-    StreamPrepare_Platform();
-
-    SetTexStates();
-    PostCreate();
-
-    // Always load lowest nMipsPersistent mips synchronously
-    byte* buf = NULL;
-    if (m_nMips > 1)
-    {
-        int nSyncStartMip = -1;
-        int nSyncEndMip = -1;
-        int nStartLowestM = max(0, m_nMips - m_CacheFileHeader.m_nMipsPersistent);
-        if (nStartLowestM < m_nMinMipVidUploaded)
-        {
-            nSyncStartMip = nStartLowestM;
-            nSyncEndMip = m_nMips - 1;
-        }
-
-        int nOffs = 0;
-        assert(nSyncStartMip <= nSyncEndMip);
-
-        const Vec2i vMipAlign = CTexture::GetBlockDim(m_eTFDst);
-
-        for (int iSide = 0; iSide < m_CacheFileHeader.m_nSides; iSide++)
-        {
-            nOffs = 0;
-            for (int iMip = nSyncStartMip, nMipW = max(1, m_nWidth >> iMip), nMipH = max(1, m_nHeight >> iMip);
-                 iMip <= nSyncEndMip;
-                 ++iMip, nMipW = max(1, nMipW >> 1), nMipH = max(1, nMipH >> 1))
-            {
-                STexMipHeader& mh = m_pFileTexMips->m_pMipHeader[iMip];
-                SMipData* mp = &mh.m_Mips[iSide];
-                if (!mp->DataArray)
-                {
-                    mp->Init(mh.m_SideSize, Align(nMipW, vMipAlign.x), Align(nMipH, vMipAlign.y));
-                }
-
-                if (eTileMode != eTM_None)
-                {
-                    mp->m_bNative = 1;
-                }
-
-                int nSrcSideSize = CTexture::TextureDataSize(
-                        max(1, m_nWidth >> iMip),
-                        max(1, m_nHeight >> iMip),
-                        max(1, m_nDepth >> iMip),
-                        1, 1, m_eTFSrc, eTileMode);
-
-                CTexture::s_nTexturesDataBytesLoaded += nSrcSideSize;
-                if (iSide == 0 || (m_nFlags & FT_REPLICATE_TO_ALL_SIDES) == 0)
-                {
-                    assert(pIM->mfIs_image(iSide));
-                    buf = pIM->mfGet_image(iSide);
-                    cryMemcpy(&mp->DataArray[0], &buf[nOffs], nSrcSideSize);
-                    nOffs += nSrcSideSize;
-                }
-                else if (iSide > 0)
-                {
-                    if (m_nFlags & FT_REPLICATE_TO_ALL_SIDES)
-                    {
-                        memcpy(&mp->DataArray[0], &mh.m_Mips[0].DataArray[0], nSrcSideSize);
-                    }
-                    else
-                    {
-                        assert(0);
-                    }
-                }
-                else
-                {
-                    assert(0);
-                }
-            }
-        }
-    }
-
-    // store file position on DVD
-    {
-        if (m_nFlags & FT_SPLITTED)
-        {
-            for (int i = 0; i < m_nMips - m_CacheFileHeader.m_nMipsPersistent; ++i)
-            {
-                const int chunkNumber = i >= (m_nMips - m_CacheFileHeader.m_nMipsPersistent) ? 0 : m_nMips - i - m_CacheFileHeader.m_nMipsPersistent;
-
-                DDSSplitted::TPath sLastChunkName;
-                DDSSplitted::MakeName(sLastChunkName, m_SrcName.c_str(), chunkNumber, FIM_SPLITTED | ((GetFlags() & FT_ALPHA) ? FIM_ALPHA : 0));
-                m_pFileTexMips->m_pMipHeader[i].m_eMediaType = gEnv->pCryPak->GetFileMediaType(sLastChunkName.c_str());
-            }
-        }
-    }
-
-    m_pFileTexMips->m_fMinMipFactor = StreamCalculateMipFactor((m_nMips - m_CacheFileHeader.m_nMipsPersistent) << 8);
-    m_nStreamFormatCode = StreamComputeFormatCode(m_nWidth, m_nHeight, m_nMips, m_eTFDst);
-
-    Relink();
-
-#if defined(TEXTURE_GET_SYSTEM_COPY_SUPPORT) && !defined(NULL_RENDERER)
-    if (m_nFlags & FT_KEEP_LOWRES_SYSCOPY)
-    {
-        PrepareLowResSystemCopy(pIM->mfGet_image(0), false);
-    }
-#endif
-
-    return true;
-}
-
-bool CTexture::StreamPrepare_Finalise([[maybe_unused]] bool bFromLoad)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    assert(m_pFileTexMips);
-    for (int iSide = 0; iSide < m_CacheFileHeader.m_nSides; ++iSide)
-    {
-        for (int iMip = m_nMips - m_CacheFileHeader.m_nMipsPersistent; iMip < m_nMips; iMip++)
-        {
-            STexMipHeader& mh = m_pFileTexMips->m_pMipHeader[iMip];
-            SMipData* mp = &mh.m_Mips[iSide];
-            assert(mp->DataArray);
-
-            // If native, assume we're tiled and prepped for the device - we shouldn't need to expand.
-            if (!mp->m_bNative)
-            {
-                int nSrcSideSize = TextureDataSize(max(1, m_nWidth >> iMip), max(1, m_nHeight >> iMip), max(1, m_nDepth >> iMip), 1, 1, m_eTFSrc);
-                ExpandMipFromFile(mp->DataArray, mh.m_SideSize, mp->DataArray, nSrcSideSize, m_eTFSrc);
-            }
-        }
-    }
-
-    {
-        // create texture
-        assert(!m_pFileTexMips->m_pPoolItem);
-        assert(!IsStreaming());
-        STexPoolItem* pNewPoolItem = StreamGetPoolItem(m_nMips - m_CacheFileHeader.m_nMipsPersistent, m_CacheFileHeader.m_nMipsPersistent, true, true);
-        if (!pNewPoolItem)
-        {
-            gEnv->pLog->LogError("CTexture::StreamPrepare: Failed to allocate memory for persistent mip chain! Texture: '%s'", m_SrcName.c_str());
-            CRY_ASSERT(false);
-            CTexture::s_bOutOfMemoryTotally = true;
-            return false;
-        }
-
-        // upload mips to texture
-        StreamAssignPoolItem(pNewPoolItem, m_nMips - m_CacheFileHeader.m_nMipsPersistent);
-        StreamReleaseMipsData(0, m_nMips - 1);
-        SetWasUnload(false);
-    }
-
-    for (int z = 0; z < MAX_PREDICTION_ZONES; z++)
-    {
-        m_streamRounds[z].nRoundUpdateId = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_arrZonesRoundId[z];
-    }
-    m_bPostponed = false;
-    m_fCurrentMipBias = 0.f;
-
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-    if (!m_bStatTracked)
-    {
-        ITextureStreamListener* pListener = s_pStreamListener;
-        m_bStatTracked = 1;
-        if (pListener)
-        {
-            pListener->OnCreatedStreamedTexture(this, m_SrcName.c_str(), m_nMips, m_nMips - GetNumPersistentMips());
-        }
-    }
-#endif
-
-    m_bStreamPrepared = true;
-
-    return true;
-}
-
-//=========================================================================
-void CTexture::StreamValidateTexSize()
-{
-    return;
-}
-
-uint8 CTexture::StreamComputeFormatCode(uint32 nWidth, uint32 nHeight, uint32 nMips, ETEX_Format fmt)
-{
-    // Must have a dimension
-    if (nWidth == 0)
-    {
-        return 0;
-    }
-    if (nHeight == 0)
-    {
-        return 0;
-    }
-
-    // Must be PoT
-    if (nWidth & (nWidth - 1))
-    {
-        return 0;
-    }
-    if (nHeight & (nHeight - 1))
-    {
-        return 0;
-    }
-
-    uint32 nMaxDim = 1 << (SStreamFormatCode::MaxMips - 1);
-
-    // Determine how many missing tail mips there are
-    uint32 nFullMips = IntegerLog2(max(nWidth, nHeight)) + 1;
-    uint32 nTailMips = nFullMips - nMips;
-
-    // Shift upto find aspect
-    while ((nWidth != nMaxDim) && (nHeight != nMaxDim))
-    {
-        nWidth <<= 1;
-        nHeight <<= 1;
-    }
-
-    SStreamFormatCodeKey key(nWidth, nHeight, fmt, (uint8)nTailMips);
-
-    CryAutoLock<CryCriticalSection> lock(s_streamFormatLock);
-    TStreamFormatCodeKeyMap::iterator it = s_formatCodeMap.find(key);
-    if (it == s_formatCodeMap.end())
-    {
-        if (s_nFormatCodes == 256)
-        {
-            __debugbreak();
-        }
-
-        SStreamFormatCode code;
-        memset(&code, 0, sizeof(code));
-        for (uint32 nMip = nTailMips, nMipWidth = nWidth, nMipHeight = nHeight; nMip < SStreamFormatCode::MaxMips; ++nMip, nMipWidth = max(1u, nMipWidth >> 1), nMipHeight = max(1u, nMipHeight >> 1))
-        {
-            uint32 nMip1Size = CDeviceTexture::TextureDataSize(nMipWidth, nMipHeight, 1, SStreamFormatCode::MaxMips - nMip, 1, fmt);
-
-            bool bAppearsLinear = true;
-            bool bAppearsPoT = true;
-
-            // Determine how the size function varies with slices. Currently only supports linear, or aligning slices to next pot
-            for (uint32 nSlices = 1; nSlices <= 32; ++nSlices)
-            {
-                uint32 nMipSize = CDeviceTexture::TextureDataSize(nMipWidth, nMipHeight, 1, SStreamFormatCode::MaxMips - nMip, nSlices, fmt);
-
-                uint32 nExpectedLinearSize = nMip1Size * nSlices;
-                uint32 nAlignedSlices = 1u << (32 - (nSlices > 1 ? countLeadingZeros32(nSlices - 1) : 32));
-                uint32 nExpectedPoTSize = nMip1Size * nAlignedSlices;
-                if (nExpectedLinearSize != nMipSize)
-                {
-                    bAppearsLinear = false;
-                }
-                if (nExpectedPoTSize != nMipSize)
-                {
-                    bAppearsPoT = false;
-                }
-            }
-
-            // If this fires, we can't encode the size(slices) function
-            if (!bAppearsLinear && !bAppearsPoT)
-            {
-                __debugbreak();
-            }
-
-            code.sizes[nMip].size = nMip1Size;
-            code.sizes[nMip].alignSlices = !bAppearsLinear && bAppearsPoT;
-        }
-
-        it = s_formatCodeMap.insert(std::make_pair(key, s_nFormatCodes)).first;
-        s_formatCodes[s_nFormatCodes++] = code;
-    }
-    return it->second;
-}
-
-#ifdef ENABLE_TEXTURE_STREAM_LISTENER
-void CTexture::StreamUpdateStats()
-{
-    ITextureStreamListener* pListener = s_pStreamListener;
-    if (pListener)
-    {
-        void* pBegunUsing[512];
-        void* pStoppedUsing[512];
-
-        int nBegun = 0, nStopped = 0;
-        int curFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-        std::vector<CTexture*> texs;
-        s_pTextureStreamer->StatsFetchTextures(texs);
-
-        for (std::vector<CTexture*>::const_iterator it = texs.begin(), itEnd = texs.end(); it != itEnd; ++it)
-        {
-            CTexture* pTex = *it;
-            if (curFrame - pTex->m_nAccessFrameID <= 2)
-            {
-                // In use
-                if (!pTex->m_bUsedRecently)
-                {
-                    pTex->m_bUsedRecently = 1;
-                    pBegunUsing[nBegun++] = pTex;
-
-                    IF_UNLIKELY (nBegun == sizeof(pBegunUsing) / sizeof(pBegunUsing[0]))
-                    {
-                        pListener->OnBegunUsingTextures(pBegunUsing, nBegun);
-                        nBegun = 0;
-                    }
-                }
-            }
-            else
-            {
-                if (pTex->m_bUsedRecently)
-                {
-                    pTex->m_bUsedRecently = 0;
-                    pStoppedUsing[nStopped++] = pTex;
-
-                    IF_UNLIKELY (nStopped == sizeof(pStoppedUsing) / sizeof(pStoppedUsing[0]))
-                    {
-                        pListener->OnEndedUsingTextures(pStoppedUsing, nStopped);
-                        nStopped = 0;
-                    }
-                }
-            }
-        }
-
-        if (nBegun)
-        {
-            pListener->OnBegunUsingTextures(pBegunUsing, nBegun);
-        }
-        if (nStopped)
-        {
-            pListener->OnEndedUsingTextures(pStoppedUsing, nStopped);
-        }
-    }
-}
-#endif
-
-//the format on disk must match exactly the format in memory
-bool CTexture::CanStreamInPlace([[maybe_unused]] int nMip, [[maybe_unused]] STexPoolItem* pNewPoolItem)
-{
-#if defined(SUPPORTS_INPLACE_TEXTURE_STREAMING)
-    if (CRenderer::CV_r_texturesstreamingInPlace)
-    {
-#if TEXTURESTREAMING_CPP_TRAIT_CANSTREAMINPLACE_ETT_2D_EARLY_OUT
-        if (m_eTT != eTT_2D)
-        {
-            return false;
-        }
-#endif
-
-#if TEXTURESTREAMING_CPP_TRAIT_CANSTREAMINPLACE_FORMATCOMPATIBLE
-        bool bFormatCompatible = false;
-
-        switch (m_eTFSrc)
-        {
-        case eTF_DXT1:
-        case eTF_DXT3:
-        case eTF_DXT5:
-        case eTF_A8:
-        case eTF_R32F:
-        case eTF_R16G16F:
-        case eTF_R16G16S:
-        case eTF_B4G4R4A4:
-        case eTF_R16G16B16A16F:
-        case eTF_3DC:
-        case eTF_3DCP:
-        case eTF_CTX1:
-        case eTF_BC6UH:
-        case eTF_BC7:
-        case eTF_R9G9B9E5:
-        case eTF_EAC_R11:
-        case eTF_EAC_RG11:
-        case eTF_ETC2:
-        case eTF_ETC2A:
-#ifdef CRY_USE_METAL
-        case eTF_PVRTC2:
-        case eTF_PVRTC4:
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-        case eTF_ASTC_4x4:
-        case eTF_ASTC_5x4:
-        case eTF_ASTC_5x5:
-        case eTF_ASTC_6x5:
-        case eTF_ASTC_6x6:
-        case eTF_ASTC_8x5:
-        case eTF_ASTC_8x6:
-        case eTF_ASTC_8x8:
-        case eTF_ASTC_10x5:
-        case eTF_ASTC_10x6:
-        case eTF_ASTC_10x8:
-        case eTF_ASTC_10x10:
-        case eTF_ASTC_12x10:
-        case eTF_ASTC_12x12:
-#endif
-            bFormatCompatible = true;
-            break;
-
-        default:
-            bFormatCompatible = false;
-            break;
-        }
-
-        if (!bFormatCompatible)
-        {
-            return false;
-        }
-
-        if (m_nFlags & FT_TEX_WAS_NOT_PRE_TILED)
-        {
-            return false;
-        }
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURESTREAMING_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(TextureStreaming_cpp)
-#endif
-
-#if TEXTURESTREAMING_CPP_TRAIT_CANSTREAMINPLACE_SRCTILEMODE_CHECK && !defined(NULL_RENDERER)
-        CDeviceTexture* pDevTex = pNewPoolItem->m_pDevTexture;
-        if (m_eSrcTileMode != eTM_LinearPadded || !pDevTex->IsInPool() || !m_pFileTexMips->m_pMipHeader[nMip].m_InPlaceStreamable)
-        {
-            return false;
-        }
-#endif
-
-        return true;
-    }
-#endif
-    return false;
-}
-
-#if defined(TEXSTRM_ASYNC_TEXCOPY)
-bool CTexture::CanAsyncCopy()
-{
-#if defined(TEXSTRM_CUBE_DMA_BROKEN)
-    return m_eTT == eTT_2D;
-#else
-    return true;
-#endif
-}
-#endif
-
-bool CTexture::StartStreaming(CTexture* pTex, STexPoolItem* pNewPoolItem, const int nStartMip, const int nEndMip, const int nActivateMip, EStreamTaskPriority estp)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    CHK_RENDTH;
-
-    if (pTex->TryAddRef() > 0)
-    {
-        if (pTex->IsStreaming())
-        {
-            __debugbreak();
-        }
-
-        if (pTex->m_eTT != eTT_2D && pTex->m_eTT != eTT_Cube)
-        {
-            __debugbreak();
-        }
-
-        STexStreamInState* pStreamState = StreamState_AllocateIn();
-        if (pStreamState)
-        {
-            DDSSplitted::ChunkInfo chunks[16];
-
-            DDSSplitted::DDSDesc desc = pTex->m_pFileTexMips->m_desc;
-            desc.pName = pTex->m_SrcName.c_str();
-
-            int nDeltaMips = desc.nMips - pTex->m_nMips;
-
-            size_t nNumChunks = DDSSplitted::GetFilesToRead(chunks, 16, desc, nStartMip + nDeltaMips, nEndMip + nDeltaMips);
-
-            StreamReadBatchParams streamRequests[STexStreamInState::MaxStreams];
-
-            size_t nStreamRequests = 0;
-
-            pStreamState->m_pTexture = pTex;
-
-            pStreamState->m_pNewPoolItem =  pNewPoolItem;
-#ifndef _RELEASE
-            pStreamState->m_fStartTime = iTimer->GetAsyncTime().GetSeconds();
-#endif
-            pStreamState->m_nAsyncRefCount = 0;
-            pStreamState->m_nHigherUploadedMip = nStartMip;
-            pStreamState->m_nLowerUploadedMip = nStartMip + nNumChunks - 1;
-            pStreamState->m_nActivateMip = nActivateMip;
-
-            // update streaming frame ID
-            int nSizeToSubmit = 0;
-
-            int nSides = pTex->GetNumSides();
-
-            for (DDSSplitted::ChunkInfo* it = chunks, * itEnd = chunks + nNumChunks; it != itEnd; ++it)
-            {
-                const DDSSplitted::ChunkInfo& chunk = *it;
-
-                assert(chunk.nMipLevel >= nStartMip);
-
-                uint32 nChunkMip = chunk.nMipLevel - nDeltaMips;
-                uint16 nMipIdx = nChunkMip - nStartMip;
-
-                STexStreamInMipState& mipState = pStreamState->m_mips[nMipIdx];
-                mipState.m_nSideDelta = chunk.nSideDelta;
-
-                StreamReadParams baseParams;
-                baseParams.nFlags |= IStreamEngine::FLAGS_NO_SYNC_CALLBACK;
-                baseParams.dwUserData = nMipIdx;
-                baseParams.nLoadTime = 1;
-                baseParams.nMaxLoadTime = 4;
-                baseParams.ePriority = estp;
-                baseParams.nOffset = chunk.nOffsetInFile;
-                baseParams.nSize = chunk.nSizeInFile;
-                baseParams.nPerceptualImportance = nEndMip - nStartMip;
-                baseParams.eMediaType = (EStreamSourceMediaType)pTex->m_pFileTexMips->m_pMipHeader[nChunkMip].m_eMediaType;
-
-                if (pTex->CanStreamInPlace(nChunkMip, pNewPoolItem))
-                {
-                    streamRequests[nStreamRequests].params = baseParams;
-
-                    byte* pBaseAddress = NULL;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION TEXTURESTREAMING_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(TextureStreaming_cpp)
-#endif
-
-                    if (pBaseAddress)
-                    {
-                        streamRequests[nStreamRequests].params.pBuffer = pBaseAddress;
-                        mipState.m_bStreamInPlace = true;
-                    }
-
-                    streamRequests[nStreamRequests].pCallback = pStreamState;
-                    streamRequests[nStreamRequests].szFile = chunk.fileName.c_str();
-                    streamRequests[nStreamRequests].tSource = eStreamTaskTypeTexture;
-                    ++nStreamRequests;
-                    ++pStreamState->m_nAsyncRefCount;
-                }
-                else
-                {
-                    streamRequests[nStreamRequests].params = baseParams;
-                    streamRequests[nStreamRequests].pCallback = pStreamState;
-                    streamRequests[nStreamRequests].szFile = chunk.fileName.c_str();
-                    streamRequests[nStreamRequests].tSource = eStreamTaskTypeTexture;
-                    ++nStreamRequests;
-                    ++pStreamState->m_nAsyncRefCount;
-                }
-
-                nSizeToSubmit += pTex->m_pFileTexMips->m_pMipHeader[nChunkMip].m_SideSize * nSides;
-            }
-
-            AZStd::function<void()> updateTextureByteCounterAtomic = [&nSizeToSubmit]()
-                {
-                    CryInterlockedAdd(s_nBytesSubmittedToStreaming.Addr(), nSizeToSubmit);
-                };
-
-            size_t nStreams = gEnv->pSystem->GetStreamEngine()->StartBatchRead(pStreamState->m_pStreams, streamRequests, nStreamRequests, &updateTextureByteCounterAtomic);
-
-            if (nStreams)
-            {
-                pTex->SetStreamingInProgress(s_StreamInTasks.GetIdxFromPtr(pStreamState));
-
-                CryInterlockedAdd(s_nMipsSubmittedToStreaming.Addr(), (int)nStreams);
-
-                return true;
-            }
-            else
-            {
-                pStreamState->m_pTexture->Release();
-                pStreamState->m_pTexture = NULL;
-                StreamState_ReleaseIn(pStreamState);
-            }
-        }
-        else
-        {
-            s_pPoolMgr->ReleaseItem(pNewPoolItem);
-            pTex->Release();
-        }
-    }
-    else
-    {
-        s_pPoolMgr->ReleaseItem(pNewPoolItem);
-    }
-
-    return false;
-}
-
-void CTexture::StreamUploadMips(int nStartMip, int nEndMip, STexPoolItem* pNewPoolItem)
-{
-    assert (pNewPoolItem);
-    CTimeValue time0 = iTimer->GetAsyncTime();
-
-    StreamCopyMipsTexToMem(nStartMip, nEndMip, true, pNewPoolItem);
-
-    // Restore mips data from the device texture
-    if (s_bStreamDontKeepSystem && m_pFileTexMips && m_pFileTexMips->m_pPoolItem)
-    {
-        STexPoolItem* pSrcItem = m_pFileTexMips->m_pPoolItem;
-        int nSrcOffset = m_nMips - pSrcItem->m_pOwner->m_nMips;
-        int nDstOffset = m_nMips - pNewPoolItem->m_pOwner->m_nMips;
-        StreamCopyMipsTexToTex(pSrcItem, (nEndMip + 1) - nSrcOffset, pNewPoolItem, (nEndMip + 1) - nDstOffset, m_nMips - (nEndMip + 1));
-    }
-
-    if (s_bStreamDontKeepSystem)
-    {
-        StreamReleaseMipsData(nStartMip, nEndMip);
-    }
-
-    gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_fTexUploadTime += (iTimer->GetAsyncTime() - time0).GetSeconds();
-}
-
-void CTexture::InitStreaming()
-{
-    CHK_MAINORRENDTH;
-
-    iLog->Log("Init textures management (%" PRISIZE_T " Mb of video memory is available)...", gRenDev->m_MaxTextureMemory / 1024 / 1024);
-
-    // reset all statistics
-    s_nStreamingThroughput = 0;
-    s_nStreamingTotalTime = 0;
-
-    InitStreamingDev();
-
-    if (!s_pTextureStreamer || s_nStreamingUpdateMode != CRenderer::CV_r_texturesstreamingUpdateType)
-    {
-        delete s_pTextureStreamer;
-
-        switch (CRenderer::CV_r_texturesstreamingUpdateType)
-        {
-        default:
-        case 1:
-            s_pTextureStreamer = new CPlanningTextureStreamer();
-            break;
-        }
-
-        s_nStreamingUpdateMode = CRenderer::CV_r_texturesstreamingUpdateType;
-    }
-
-    if (!s_pPoolMgr)
-    {
-        s_pPoolMgr = new CTextureStreamPoolMgr();
-    }
-
-
-#if !defined(CONSOLE)
-    if (CRenderer::CV_r_texturesstreaming)
-    {
-        int nMinTexStreamPool = 192;
-#ifdef NULL_RENDERER
-        // Dedicated server uses CNULLRenderer, which doesn't report any available 
-        // memory via gRenDev->m_MaxTextureMemory, so use a magic number. It's OK 
-        // to use it here, as a dedicated server will not load textures anyway.
-        int nMaxTexStreamPool = 8192; 
-#else
-        int nMaxTexStreamPool = (gRenDev->m_MaxTextureMemory / 1024 / 1024);
-#endif
-
-        ICVar* pICVarTexRes = iConsole->GetCVar("sys_spec_TextureResolution");
-        if (pICVarTexRes)
-        {
-            const int valTexRes = pICVarTexRes->GetIVal();
-            if (valTexRes == 0)
-            {
-                // Some cards report slightly lower byte numbers than their spec in MB suggests, so we have to be conservative
-                // Note: On some MGPU systems the memory reported is the overall amount and not the memory available per GPU
-                if (gRenDev->m_MaxTextureMemory >= (size_t)2800 * 1024 * 1024)
-                {
-                    pICVarTexRes->Set(VERYHIGH_SPEC_PC);
-                }
-                else if (gRenDev->m_MaxTextureMemory >= (size_t)1900 * 1024 * 1024)
-                {
-                    pICVarTexRes->Set(HIGH_SPEC_PC);
-                }
-                else if (gRenDev->m_MaxTextureMemory >= (size_t)1450 * 1024 * 1024)
-                {
-                    pICVarTexRes->Set(MEDIUM_SPEC_PC);
-                }
-                else
-                {
-                    pICVarTexRes->Set(LOW_SPEC_PC);
-                }
-            }
-            else
-            {
-                pICVarTexRes->Set(valTexRes);
-            }
-        }
-
-        AZ_WarningOnce("TextureStreaming", CRenderer::CV_r_TexturesStreamPoolSize <= (nMaxTexStreamPool * 0.75f), "Warning!  You are assigning more than 75 percent of total available GPU memory to texture streaming!");
-
-        CRenderer::CV_r_TexturesStreamPoolSize = clamp_tpl(CRenderer::CV_r_TexturesStreamPoolSize, nMinTexStreamPool, nMaxTexStreamPool);
-
-        // Don't skip mips in the editor so that assets can be viewed in full resolution
-        if (gEnv->IsEditor())
-        {
-            CRenderer::CV_r_texturesstreamingSkipMips = 0;
-        }
-    }
-#endif
-
-    s_nStreamingMode = CRenderer::CV_r_texturesstreaming;
-
-    s_bStreamDontKeepSystem = CRenderer::CV_r_texturesstreamingonlyvideo == 0;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_texturesstreaming)
-    {
-        iLog->Log("  Enabling of textures streaming...");
-        iLog->Log("  Using %d Mb of textures pool for streaming...", CRenderer::GetTexturesStreamPoolSize());
-    }
-    else
-    {
-        iLog->Log("  Disabling of textures streaming...");
-    }
-
-    if (gRenDev->m_MaxTextureMemory <= 256 * 1024 * 1024)
-    {
-        SDynTexture::s_CurDynTexAtlasCloudsMaxsize = min(24u, SDynTexture::s_CurDynTexAtlasCloudsMaxsize);
-        SDynTexture::s_CurTexAtlasSize = min(128u, SDynTexture::s_CurTexAtlasSize);
-        SDynTexture::s_CurDynTexMaxSize = min(128u, SDynTexture::s_CurDynTexMaxSize);
-    }
-    iLog->Log("  Video textures: Atlas clouds max size: %d Mb", SDynTexture::s_CurDynTexAtlasCloudsMaxsize);
-    iLog->Log("  Video textures: Dynamic managed max size: %d Mb", SDynTexture::s_CurDynTexMaxSize);
-
-    // re-init all textures
-    iLog->Log("  Reloading all textures...");
-    {
-        AUTO_LOCK(CBaseResource::s_cResLock);
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (pRL)
-        {
-            for (ResourcesMapItor itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); ++itor)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (!tp)
-                {
-                    continue;
-                }
-                tp->ToggleStreaming(CRenderer::CV_r_texturesstreaming != 0);
-            }
-        }
-    }
-    iLog->Log("  Finished reloading textures...");
-    iLog->Log("  Finished initializing textures streaming...");
-
-    if (gEnv->pLocalMemoryUsage)
-    {
-        gEnv->pLocalMemoryUsage->DeleteGlobalData();
-    }
-}
-
-void CTexture::RT_FlushStreaming(bool bAbort)
-{
-    RT_FlushAllStreamingTasks(bAbort);
-
-    // flush all pool items
-    s_pPoolMgr->GarbageCollect(NULL, 0, 10000000);
-}
-
-void CTexture::RT_FlushAllStreamingTasks(const bool bAbort /* = false*/)
-{
-    // flush all tasks globally
-    AZ_TRACE_METHOD();
-    CHK_RENDTH;
-    iLog->Log("Flushing pended textures...");
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-    {
-        for (int i = 0; i < MaxStreamTasks; ++i)
-        {
-            STexStreamOutState& os = *s_StreamOutTasks.GetPtrFromIdx(i);
-            if (os.m_pTexture)
-            {
-                if (bAbort)
-                {
-                    os.m_bAborted = true;
-                }
-                os.m_jobExecutor.WaitForCompletion();
-            }
-        }
-    }
-#endif
-
-    if (bAbort)
-    {
-        for (int i = 0; i < MaxStreamPrepTasks; ++i)
-        {
-            STexStreamPrepState*& ps = *s_StreamPrepTasks.GetPtrFromIdx(i);
-            if (ps)
-            {
-                _smart_ptr<CImageFile> pFile = ps->m_pImage;
-
-                if (pFile)
-                {
-                    pFile->mfAbortStreaming();
-                }
-
-                delete ps;
-                ps = NULL;
-                s_StreamPrepTasks.Release(&ps);
-            }
-        }
-    }
-
-    {
-        for (int i = 0; i < MaxStreamTasks; ++i)
-        {
-            STexStreamInState& ins = *s_StreamInTasks.GetPtrFromIdx(i);
-            if (ins.m_pTexture)
-            {
-                if (bAbort)
-                {
-                    ins.m_bAborted = true;
-                }
-
-                for (int m = 0; m < (ins.m_nLowerUploadedMip - ins.m_nHigherUploadedMip) + 1; ++m)
-                {
-                    IReadStreamPtr pStream = ins.m_pStreams[m];
-                    if (pStream)
-                    {
-                        if (bAbort)
-                        {
-                            pStream->Abort();
-                        }
-                        else
-                        {
-                            pStream->Wait();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    StreamState_Update();
-    StreamState_UpdatePrep();
-
-    s_pTextureStreamer->Flush();
-
-    assert(s_nBytesSubmittedToStreaming == 0);
-    iLog->Log("Finished flushing pended textures...");
-}
-
-void CTexture::AbortStreamingTasks(CTexture* pTex)
-{
-    if (pTex->m_nStreamSlot != InvalidStreamSlot)
-    {
-        CHK_RENDTH;
-        if (pTex->m_nStreamSlot & StreamOutMask)
-        {
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-            STexStreamOutState& streamState = *s_StreamOutTasks.GetPtrFromIdx(pTex->m_nStreamSlot & StreamIdxMask);
-
-#ifndef _RELEASE
-            if (streamState.m_pTexture != pTex)
-            {
-                __debugbreak();
-            }
-#endif
-
-            streamState.m_bAborted = true;
-            if (!streamState.m_bDone)
-            {
-                streamState.m_jobExecutor.WaitForCompletion();
-            }
-            while (!streamState.TryCommit())
-            {
-                CrySleep(0);
-            }
-            StreamState_ReleaseOut(&streamState);
-#endif
-        }
-        else if (pTex->m_nStreamSlot & StreamPrepMask)
-        {
-            STexStreamPrepState*& pStreamState = *s_StreamPrepTasks.GetPtrFromIdx(pTex->m_nStreamSlot & StreamIdxMask);
-
-#ifndef _RELEASE
-            if (pStreamState->m_pTexture != pTex)
-            {
-                __debugbreak();
-            }
-#endif
-
-            delete pStreamState;
-            pStreamState = NULL;
-            s_StreamPrepTasks.Release(&pStreamState);
-        }
-        else
-        {
-            STexStreamInState& streamState = *s_StreamInTasks.GetPtrFromIdx(pTex->m_nStreamSlot & StreamIdxMask);
-
-#ifndef _RELEASE
-            if (streamState.m_pTexture != pTex)
-            {
-                __debugbreak();
-            }
-#endif
-
-            streamState.m_bAborted = true;
-
-            for (size_t i = 0, c = streamState.m_nLowerUploadedMip - streamState.m_nHigherUploadedMip + 1; i < c; ++i)
-            {
-                IReadStream* pStream = streamState.m_pStreams[i];
-                if (pStream)
-                {
-                    pStream->Abort();
-                    assert (streamState.m_pStreams[i] == NULL);
-                }
-            }
-
-#ifndef NDEBUG
-            bool bCommitted =
-#endif
-                streamState.TryCommit();
-            assert (bCommitted);
-
-            StreamState_ReleaseIn(&streamState);
-        }
-    }
-}
-
-void CTexture::StreamState_Update()
-{
-    CHK_RENDTH;
-
-    FUNCTION_PROFILER_RENDERER;
-
-    // Finalise and garbage collect the stream out tasks
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-    for (size_t i = 0, c = s_StreamOutTasks.GetNumLive(); i < MaxStreamTasks && c > 0; ++i)
-    {
-        STexStreamOutState& state = *s_StreamOutTasks.GetPtrFromIdx(i);
-        if (state.m_pTexture)
-        {
-            if (state.TryCommit())
-            {
-                StreamState_ReleaseOut(&state);
-            }
-
-            --c;
-        }
-    }
-#endif
-
-    // Garbage collect the stream in slots
-
-    for (size_t i = 0, c = s_StreamInTasks.GetNumLive(); i < MaxStreamTasks && c > 0; ++i)
-    {
-        STexStreamInState& state = *s_StreamInTasks.GetPtrFromIdx(i);
-        if (state.m_pTexture)
-        {
-            if (state.m_bAllStreamsComplete)
-            {
-                if (state.TryCommit())
-                {
-                    StreamState_ReleaseIn(&state);
-                }
-            }
-            else if (state.m_bAborted)
-            {
-                // An error occurred. Try and cancel all the stream tasks.
-                for (int mi = 0, mc = state.m_nLowerUploadedMip - state.m_nHigherUploadedMip + 1; mi != mc; ++mi)
-                {
-                    IReadStream* pStream = &*state.m_pStreams[mi];
-                    if (pStream != NULL)
-                    {
-                        pStream->TryAbort();
-                    }
-                }
-            }
-
-            --c;
-        }
-    }
-}
-
-void CTexture::StreamState_UpdatePrep()
-{
-    FUNCTION_PROFILER_RENDERER;
-    LOADING_TIME_PROFILE_SECTION;
-
-    // Garbage collect the stream prep slots
-
-    for (size_t i = 0, c = s_StreamPrepTasks.GetNumLive(); i < MaxStreamPrepTasks && c > 0; ++i)
-    {
-        STexStreamPrepState*& pState = *s_StreamPrepTasks.GetPtrFromIdx(i);
-        if (pState && pState->m_bCompleted && pState->Commit())
-        {
-            s_pTextureStreamer->EndPrepare(pState);
-        }
-    }
-}
-
-STexStreamInState* CTexture::StreamState_AllocateIn()
-{
-    CHK_RENDTH;
-    return s_StreamInTasks.Allocate();
-}
-
-void CTexture::StreamState_ReleaseIn(STexStreamInState* pState)
-{
-    CHK_RENDTH;
-
-    pState->Reset();
-    s_StreamInTasks.Release(pState);
-}
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-STexStreamOutState* CTexture::StreamState_AllocateOut()
-{
-    CHK_RENDTH;
-    return s_StreamOutTasks.Allocate();
-}
-
-void CTexture::StreamState_ReleaseOut(STexStreamOutState* pState)
-{
-    CHK_RENDTH;
-
-    pState->Reset();
-    s_StreamOutTasks.Release(pState);
-}
-#endif
-
-STexStreamingInfo* CTexture::StreamState_AllocateInfo(int nMips)
-{
-    // Temporary - will be replaced by custom allocator later.
-    STexStreamingInfo* pInfo = (STexStreamingInfo*)CryModuleMalloc(sizeof(STexStreamingInfo));
-    new (pInfo) STexStreamingInfo(nMips);
-    return pInfo;
-}
-
-void CTexture::StreamState_ReleaseInfo(CTexture* pOwnerTex, STexStreamingInfo* pInfo)
-{
-    // Make sure we the streamer is notified, so jobs can be synced with
-    s_pTextureStreamer->OnTextureDestroy(pOwnerTex);
-
-    pInfo->~STexStreamingInfo();
-    CryModuleFree(pInfo);
-}
diff --git a/Code/CryEngine/RenderDll/Common/TypedConstantBuffer.h b/Code/CryEngine/RenderDll/Common/TypedConstantBuffer.h
deleted file mode 100644
index 00a51227cd..0000000000
--- a/Code/CryEngine/RenderDll/Common/TypedConstantBuffer.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-#include "DevBuffer.h"
-
-#ifndef NULL_RENDERER
-#include "DriverD3D.h"
-#endif
-
-template <typename T>
-class CTypedConstantBuffer
-{
-    T m_hostBuffer;
-    AzRHI::ConstantBufferPtr m_constantBuffer;
-
-public:
-    CTypedConstantBuffer()
-        : m_constantBuffer(nullptr) {}
-    CTypedConstantBuffer(const CTypedConstantBuffer<T>& cb)
-        : m_constantBuffer(nullptr) { m_hostBuffer = cb.m_hostBuffer; }
-    CTypedConstantBuffer(AzRHI::ConstantBufferPtr incb)
-        : m_constantBuffer(incb) {}
-
-    bool IsDeviceBufferAllocated() { return m_constantBuffer != nullptr; }
-    AzRHI::ConstantBufferPtr GetDeviceConstantBuffer()
-    {
-        if (!m_constantBuffer)
-        {
-            CreateDeviceBuffer();
-        }
-        return m_constantBuffer;
-    }
-
-    void CreateDeviceBuffer()
-    {
-#ifndef NULL_RENDERER
-        int size = sizeof(T);
-        AzRHI::ConstantBuffer* cb = gcpRendD3D->m_DevBufMan.CreateConstantBuffer(
-            "TypedConstantBuffer",
-            size,
-            AzRHI::ConstantBufferUsage::Dynamic); // TODO: this could be a good candidate for dynamic=false
-        m_constantBuffer.attach(cb);
-        CopyToDevice();
-#endif
-    }
-
-    T& GetData()
-    {
-        return m_hostBuffer;
-    }
-
-    void CopyToDevice()
-    {
-        m_constantBuffer->UpdateBuffer(&m_hostBuffer, sizeof(m_hostBuffer));
-    }
-
-    T* operator->() { return &m_hostBuffer; }
-    T& operator=(const T& hostData)
-    {
-        return m_hostBuffer = hostData;
-    }
-};
diff --git a/Code/CryEngine/RenderDll/Common/WaterUtils.cpp b/Code/CryEngine/RenderDll/Common/WaterUtils.cpp
deleted file mode 100644
index 12997d780a..0000000000
--- a/Code/CryEngine/RenderDll/Common/WaterUtils.cpp
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define WATERUTILS_CPP_SECTION_1 1
-#define WATERUTILS_CPP_SECTION_2 2
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WATERUTILS_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(WaterUtils_cpp)
-#endif
-
-#include <complex>
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-
-#define WATER_UPDATE_THREAD_NAME "WaterUpdate"
-
-#define g_nGridSize 64
-#define g_nGridLogSize 6
-
-static float gaussian_y2;
-static int gaussian_use_last = 0;
-
-#define m_nGridSize (int)g_nGridSize
-#define m_nLogGridSize (int)g_nGridLogSize // log2(64)
-#define m_fG (9.81f)
-
-// potential todo list:
-//  - vectorizing/use intrinsics
-//  -   support for N sized grids
-//  - support for gpu update
-//  - tiled grid updates ?
-
-struct SWaterUpdateThreadInfo
-{
-    int nFrameID;
-    float fTime;
-    bool bOnlyHeight;
-};
-
-class CWaterSim
-{
-    typedef std::complex<float> complexF;
-
-public:
-
-    CWaterSim()
-        : m_fA(1.0f)
-        , m_fWorldSizeX(1.0f)
-        , m_fWorldSizeY(1.0f)
-        , m_fWorldSizeXInv(1.f)
-        , m_fWorldSizeYInv(1.0f)
-        , m_fMaxWaveSize(200.0f)
-        , m_fChoppyWaveScale(400.0f)
-        , m_nFrameID(0)
-    {
-        uint32 nSize = m_nGridSize * m_nGridSize * sizeof(complexF);
-        memset(&m_pFourierAmps[0], 0, nSize);
-        memset(&m_pHeightField[0], 0, nSize);
-        memset(&m_pDisplaceFieldX[0], 0, nSize);
-        memset(&m_pDisplaceFieldY[0], 0, nSize);
-
-        nSize = m_nGridSize * m_nGridSize * sizeof(Vec4);
-        memset(m_pDisplaceGrid[0], 0, nSize);
-        memset(m_pDisplaceGrid[1], 0, nSize);
-        memset(m_pLUTK, 0, nSize);
-
-        m_nWorkerThreadID = m_nFillThreadID = 0;
-        m_bQuit = false;
-    }
-
-    virtual ~CWaterSim()
-    {
-        Release();
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    virtual void Create(float fA, float fWorldSizeX, float fWorldSizeY)     // Create/Initialize water simulation
-    {
-        m_fA = fA;
-        m_fWorldSizeX = fWorldSizeX;
-        m_fWorldSizeY = fWorldSizeY;
-        m_fWorldSizeXInv = 1.f / m_fWorldSizeX;
-        m_fWorldSizeYInv = 1.f / m_fWorldSizeY;
-        InitTableK();
-        InitFourierAmps();
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    virtual void Release()
-    {
-        uint32 nSize = m_nGridSize * m_nGridSize * sizeof(std::complex<float>);
-        memset(&m_pFourierAmps[0], 0, nSize);
-        memset(&m_pHeightField[0], 0, nSize);
-        memset(&m_pDisplaceFieldX[0], 0, nSize);
-        memset(&m_pDisplaceFieldY[0], 0, nSize);
-
-        nSize = m_nGridSize * m_nGridSize * sizeof(Vec4);
-        memset(m_pDisplaceGrid, 0, nSize);
-        memset(m_pLUTK, 0, nSize);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    virtual void SaveToDisk([[maybe_unused]] const char* pszFileName)
-    {
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    // Returns (-1)^n
-    int powNeg1(int n)
-    {
-        int pow[2] = { 1, -1 };
-        return pow[n & 1];
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    // gaussian random number, using box muller technique
-    float frand_gaussian(float m = 0.0f, float s = 1.0f) // m- mean, s - standard deviation
-    {
-        float x1, x2, w, y1;
-        if (gaussian_use_last)  // use value from previous call
-        {
-            y1 = gaussian_y2;
-            gaussian_use_last = 0;
-        }
-        else
-        {
-            do
-            {
-                x1 = cry_random(-1.0f, 1.0f);
-                x2 = cry_random(-1.0f, 1.0f);
-
-                w = x1 * x1 + x2 * x2;
-            }
-            while (w >= 1.0f);
-
-            w = sqrt_fast_tpl((-2.0f * log_tpl(w)) / w);
-            y1 = x1 * w;
-            gaussian_y2 = x2 * w;
-
-            gaussian_use_last = 1;
-        }
-
-        return (m + y1 * s);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////u///////////////////////////////////////////////////////////////////
-
-    inline int GetGridOffset(const int& x, const int& y) const
-    {
-        return y * m_nGridSize + x;
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    int GetMirrowedGridOffset(const int& x, const int& y) const
-    {
-        return GetGridOffset((m_nGridSize - x) & (m_nGridSize - 1), (m_nGridSize - y) & (m_nGridSize - 1));
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    int GetGridOffsetWrapped(const int& x, const int& y) const
-    {
-        return GetGridOffset(x & (m_nGridSize - 1), y & (m_nGridSize - 1));
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    void ComputeFFT1D(int nDir, float* pReal, float* pImag)
-    {
-        // reference: "2 Dimensional FFT" - by Paul Bourke
-        long nn, i, i1, j, k, i2, l, l1, l2;
-        float c1, c2, fReal, fImag, t1, t2, u1, u2, z;
-
-        nn = m_nGridSize;
-        float fRecipNN = 1.0f / (float) nn;
-
-        // Do the bit reversal
-        i2 = nn >> 1;
-        j = 0;
-        for (i = 0; i < nn - 1; ++i)
-        {
-            if (i < j)
-            {
-                fReal = pReal[i];
-                fImag = pImag[i];
-                pReal[i] = pReal[j];
-                pImag[i] = pImag[j];
-                pReal[j] = fReal;
-                pImag[j] = fImag;
-            }
-
-            k = i2;
-            while (k <= j)
-            {
-                j -= k;
-                k >>= 1;
-            }
-
-            j += k;
-        }
-
-        // FFT computation
-        c1 = -1.0f;
-        c2 = 0.0f;
-        l2 = 1;
-        for (l = 0; l < m_nLogGridSize; ++l)
-        {
-            l1 = l2;
-            l2 <<= 1;
-            u1 = 1.0;
-            u2 = 0.0;
-            for (j = 0; j < l1; ++j)
-            {
-                for (i = j; i < nn; i += l2)
-                {
-                    i1 = i + l1;
-                    t1 = u1 * pReal[i1] - u2 * pImag[i1];
-                    t2 = u1 * pImag[i1] + u2 * pReal[i1];
-                    pReal[i1] = pReal[i] - t1;
-                    pImag[i1] = pImag[i] - t2;
-                    pReal[i] += t1;
-                    pImag[i] += t2;
-                }
-
-                z =  u1 * c1 - u2 * c2;
-                u2 = u1 * c2 + u2 * c1;
-                u1 = z;
-            }
-
-            c2 = sqrt_fast_tpl((1.0f - c1) * 0.5f);
-
-            if (nDir == 1)
-            {
-                c2 = -c2;
-            }
-
-            c1 = sqrt_fast_tpl((1.0f + c1) * 0.5f);
-        }
-
-        // Scaling for forward transform
-        if (nDir == 1)
-        {
-            for (i = 0; i < nn; ++i)
-            {
-                pReal[i] *= fRecipNN;
-                pImag[i] *= fRecipNN;
-            }
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    void ComputeFFT2D(int nDir, complexF* const __restrict c)
-    {
-        // reference: "2 Dimensional FFT" - by Paul Bourke
-        float pReal[ m_nGridSize ];
-        float pImag[ m_nGridSize ];
-
-        // Transform the rows
-        for (int y(0); y < m_nGridSize; ++y)
-        {
-            for (int x(0); x < m_nGridSize; ++x)
-            {
-                int nGridOffset = GetGridOffset(x, y);
-                const complexF& curC = c[ nGridOffset ];
-                pReal[x] = curC.real();
-                pImag[x] = curC.imag();
-            }
-
-            ComputeFFT1D(nDir, pReal, pImag);
-
-            for (int x(0); x < m_nGridSize; ++x)
-            {
-                int nGridOffset = GetGridOffset(x, y);
-                c[nGridOffset] = complexF(pReal[x], pImag[x]);
-            }
-        }
-
-        // Transform the columns
-        for (int x(0); x < m_nGridSize; ++x)
-        {
-            for (int y(0); y < m_nGridSize; ++y)
-            {
-                int nGridOffset = GetGridOffset(x, y);
-                const complexF& curC = c[ nGridOffset ];
-                pReal[y] = curC.real();
-                pImag[y] = curC.imag();
-            }
-
-            ComputeFFT1D(nDir, pReal, pImag);
-
-            for (int y(0); y < m_nGridSize; ++y)
-            {
-                int nGridOffset = GetGridOffset(x, y);
-                c[ nGridOffset ] = complexF(pReal[y], pImag[y]);
-            }
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    float GetIndexToWorldX(int x)
-    {
-        static const float PI2ByWorldSizeX = (2.0f * PI) / m_fWorldSizeX;
-        return (float(x) - ((float)m_nGridSize / 2.0f)) * PI2ByWorldSizeX;
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    float GetIndexToWorldY(int y)
-    {
-        static const float PI2ByWorldSizeY = (2.0f * PI) / m_fWorldSizeY;
-        return (float(y) - ((float)m_nGridSize / 2.0f)) * PI2ByWorldSizeY;
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    float GetTermAngularFreq(float k)
-    {
-        // reference: "Simulating Ocean Water" - by Jerry Tessendorf (3.2)
-        return sqrt_fast_tpl(k * m_fG);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    // a - constant, pK - wave dir (2d), pW - wind dir (2d)
-    float ComputePhillipsSpec(const Vec2& pK, const Vec2& pW) const
-    {
-        float fK2 = pK.GetLength2();
-        if (fK2 == 0)
-        {
-            return 0.0f;
-        }
-
-        float fW2 = pW.GetLength2();
-        float fL = fW2 / m_fG;
-        float fL2 = sqr(fL);
-
-        // reference: "Simulating Ocean Water" - by Jerry Tessendorf (3.3)
-        float fPhillips = m_fA * (exp_tpl(-1.0f / (fK2 * fL2)) / sqr(fK2)) * (sqr(pK.Dot(pW)) / fK2 * fW2);
-
-        assert(fPhillips >= 0);
-
-        // Return Phillips spectrum
-        return fPhillips;
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    void InitTableK()
-    {
-        for (int y(0); y < m_nGridSize; ++y)
-        {
-            float fKy = GetIndexToWorldY(y);
-            for (int x(0); x < m_nGridSize; ++x)
-            {
-                float fKx = GetIndexToWorldX(x);
-                float fKLen = sqrt_tpl(fKx * fKx + fKy * fKy);
-                float fAngularFreq = GetTermAngularFreq(fKLen);
-                m_pLUTK[GetGridOffset(x, y)] = Vec4(fKx, fKy, fKLen, fAngularFreq);
-            }
-        }
-    }
-
-    // Initialize Fourier amplitudes table
-    void InitFourierAmps()
-    {
-        const float recipSqrt2 = 1.0f / sqrt_fast_tpl(2.0f);
-
-        Vec2 vecWind = { cosf(0.0f), sinf(0.0f) }; // assume constant direction
-        vecWind = -vecWind; // meh - match with regular water animation
-
-        for (int y(0); y < m_nGridSize; ++y)
-        {
-            for (int x(0); x < m_nGridSize; ++x)
-            {
-                complexF e(frand_gaussian(), frand_gaussian());
-                int nGridOffset = GetGridOffset(x, y);
-
-                Vec4 pLookupK = m_pLUTK[nGridOffset];
-                Vec2 pK = Vec2(pLookupK.x, pLookupK.y);
-
-                // reference: "Simulating Ocean Water" - by Jerry Tessendorf (3.4)
-                e *= recipSqrt2 * sqrt_fast_tpl(ComputePhillipsSpec(pK, vecWind));
-                m_pFourierAmps[nGridOffset] = e;
-            }
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    // Update simulation
-    void Update(SWaterUpdateThreadInfo& pThreadInfo)
-    {
-        float fTime = pThreadInfo.fTime;
-        bool bOnlyHeight = pThreadInfo.bOnlyHeight;
-
-        PROFILE_FRAME(CWaterSim::Update);
-
-        // Optimization: only half grid is required to update, since we can use conjugate to the other half
-
-        float fHalfY = (m_nGridSize >> 1) + 1;
-        for (int y(0); y < fHalfY; ++y)
-        {
-            for (int x(0); x < m_nGridSize; ++x)
-            {
-                int offset = GetGridOffset(x, y);
-                int offsetMirrowed = GetMirrowedGridOffset(x, y);
-
-                Vec4 pK = m_pLUTK[offset];
-
-                float fKLen = pK.z; //pK.GetLength();
-                float fAngularFreq = pK.w * fTime; //GetTermAngularFreq(fKLen)
-
-                float fAngularFreqSin = 0, fAngularFreqCos = 0;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WATERUTILS_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(WaterUtils_cpp)
-#endif
-                sincos_tpl((f32)fAngularFreq, (f32*) &fAngularFreqSin, (f32*)&fAngularFreqCos);
-
-                complexF ep(fAngularFreqCos, fAngularFreqSin);
-                complexF em = conj(ep);
-
-                // reference: "Simulating Ocean Water" - by Jerry Tessendorf (3.4)
-                complexF currWaveField = m_pFourierAmps[offset] * ep + conj(m_pFourierAmps[offsetMirrowed]) * em;
-
-                m_pHeightField[offset] = currWaveField;
-                if (!bOnlyHeight && fKLen)
-                {
-                    m_pDisplaceFieldX[offset] = currWaveField * ((fKLen == 0) ? complexF(0) : complexF(0, (-pK.x - pK.y) / fKLen));
-                    m_pDisplaceFieldY[offset] = currWaveField * ((fKLen == 0) ? complexF(0) : complexF(0, -pK.y / fKLen));
-                }
-                else
-                {
-                    m_pDisplaceFieldX[offset] = 0;
-                    m_pDisplaceFieldY[offset] = 0;
-                }
-
-                // Set upper half using conjugate
-                if (y != fHalfY - 1)
-                {
-                    m_pHeightField[offsetMirrowed] = conj(m_pHeightField[offset]);
-                    if (!bOnlyHeight)
-                    {
-                        m_pDisplaceFieldX[offsetMirrowed] = conj(m_pDisplaceFieldX[offset]);
-                        m_pDisplaceFieldY[offsetMirrowed] = conj(m_pDisplaceFieldY[offset]);
-                    }
-                }
-            }
-        }
-
-        ComputeFFT2D(-1, m_pHeightField);
-        if (!bOnlyHeight)
-        {
-            ComputeFFT2D(-1, m_pDisplaceFieldX);
-            ComputeFFT2D(-1, m_pDisplaceFieldY);
-        }
-
-        for (int y(0); y < m_nGridSize; ++y)
-        {
-            for (int x(0); x < m_nGridSize; ++x)
-            {
-                int offset = GetGridOffset(x, y);
-                int currPowNeg1 = powNeg1(x + y);
-
-                m_pHeightField[offset] *= currPowNeg1 * m_fMaxWaveSize;
-                if (!bOnlyHeight)
-                {
-                    m_pDisplaceFieldX[offset] *= currPowNeg1 * m_fChoppyWaveScale;
-                    m_pDisplaceFieldY[offset] *= currPowNeg1 * m_fChoppyWaveScale;
-                }
-
-                m_pDisplaceGrid[m_nWorkerThreadID][offset] = Vec4(m_pDisplaceFieldX[offset].real(),
-                        m_pDisplaceFieldY[offset].real(),
-                        -m_pHeightField[offset].real(),
-                        0.0f);                                                                                                     // store encoded normal ?
-            }
-        }
-    }
-
-    void Update(int nFrameID, float fTime, bool bOnlyHeight)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-
-        m_nFillThreadID = m_nWorkerThreadID = 0;
-
-        SWaterUpdateThreadInfo& pThreadInfo = m_pThreadInfo[m_nFillThreadID];
-        pThreadInfo.nFrameID = nFrameID;
-        pThreadInfo.fTime = fTime;
-        pThreadInfo.bOnlyHeight = bOnlyHeight;
-
-        Update(pThreadInfo);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    Vec3 GetPositionAt(int x, int y) const
-    {
-        Vec4 pPos = m_pDisplaceGrid[m_nFillThreadID][ GetGridOffsetWrapped(x, y) ];
-        return Vec3(pPos.x, pPos.y, pPos.z);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    float GetHeightAt(int x, int y) const
-    {
-        return m_pDisplaceGrid[m_nFillThreadID][ GetGridOffsetWrapped(x, y) ].z;
-    }
-
-    Vec4* GetDisplaceGrid()
-    {
-        return m_pDisplaceGrid[m_nFillThreadID];
-    }
-
-    static CWaterSim* GetInstance()
-    {
-        static CWaterSim pInstance;
-        return &pInstance;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-
-    void SpawnUpdateJob(int nFrameID, float fTime, bool bOnlyHeight, void*)
-    {
-        if (nFrameID != m_nFrameID)
-        {
-            m_nFrameID = nFrameID;
-        }
-        else
-        {
-            return;
-        }
-
-        WaitForJob();
-        m_jobExecutor.Reset();
-        m_jobExecutor.StartJob(
-            [this, nFrameID, fTime, bOnlyHeight]()
-            {
-                this->Update(nFrameID, fTime, bOnlyHeight);
-            }
-        );
-    }
-
-    void WaitForJob()
-    {
-        m_jobExecutor.WaitForCompletion();
-    }
-
-protected:
-
-    // Double buffered displacement grid
-    Vec4 m_pDisplaceGrid[2][ g_nGridSize * g_nGridSize ] _ALIGN(128);
-    // Simulation constants
-    Vec4 m_pLUTK[ g_nGridSize * g_nGridSize ]  _ALIGN(128); // pre-computed K table
-    complexF m_pFourierAmps[m_nGridSize * m_nGridSize] _ALIGN(128);   // Fourier amplitudes at time 0 (aka. H0)
-    complexF m_pHeightField[m_nGridSize * m_nGridSize] _ALIGN(128);       // Current Fourier amplitudes height field
-    complexF m_pDisplaceFieldX[m_nGridSize * m_nGridSize] _ALIGN(128);    // Current Fourier amplitudes displace field
-    complexF m_pDisplaceFieldY[m_nGridSize * m_nGridSize] _ALIGN(128);    // Current Fourier amplitudes displace field
-
-    SWaterUpdateThreadInfo m_pThreadInfo[2];
-
-    int m_nFrameID;
-    uint32 m_nWorkerThreadID;
-    uint32 m_nFillThreadID;
-    CryEvent    m_Event;
-    bool    m_bQuit;
-
-    float m_fA; // constant value
-    float m_fWorldSizeX; // world dimensions
-    float m_fWorldSizeY; // world dimensions
-
-    float m_fWorldSizeXInv; // 1.f / world dimensions
-    float m_fWorldSizeYInv; // 1.f / world dimensions
-
-    float m_fMaxWaveSize;
-    float m_fChoppyWaveScale;
-
-    AZ::LegacyJobExecutor m_jobExecutor;
-} _ALIGN(128);
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWater::Create(float fA, float fWorldSizeX, float fWorldSizeY)
-{
-    Release();
-    m_pWaterSim = CryAlignedNew<CWaterSim>(); //::GetInstance();
-    m_pWaterSim->Create(fA, fWorldSizeX, fWorldSizeY);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWater::Release()
-{
-    if (m_pWaterSim)
-    {
-        m_pWaterSim->WaitForJob();
-    }
-
-    CryAlignedDelete(m_pWaterSim);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWater::SaveToDisk([[maybe_unused]] const char* pszFileName)
-{
-    assert(m_pWaterSim);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-void CWater::Update(int nFrameID, float fTime, bool bOnlyHeight, void* pRawPtr)
-{
-    if (m_pWaterSim)
-    {
-        m_pWaterSim->SpawnUpdateJob(nFrameID, fTime, bOnlyHeight, pRawPtr);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-Vec3 CWater::GetPositionAt(int x, int y) const
-{
-    if (m_pWaterSim)
-    {
-        return m_pWaterSim->GetPositionAt(x, y);
-    }
-
-    return Vec3(ZERO);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-float CWater::GetHeightAt(int x, int y) const
-{
-    if (m_pWaterSim)
-    {
-        return m_pWaterSim->GetHeightAt(x, y);
-    }
-
-    return 0.0f;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-Vec4* CWater::GetDisplaceGrid() const
-{
-    if (m_pWaterSim)
-    {
-        return m_pWaterSim->GetDisplaceGrid();
-    }
-    return NULL;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const int CWater::GetGridSize() const
-{
-    return g_nGridSize;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWater::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(m_pWaterSim);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CWater* WaterSimMgr()
-{
-    return gRenDev->m_pWaterSimMgr;
-}
diff --git a/Code/CryEngine/RenderDll/Common/WaterUtils.h b/Code/CryEngine/RenderDll/Common/WaterUtils.h
deleted file mode 100644
index 2bc8ebd0cb..0000000000
--- a/Code/CryEngine/RenderDll/Common/WaterUtils.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __WATERUTILS_H__
-#define __WATERUTILS_H__
-
-class CWaterSim;
-
-// todo. refactor me - should be more general
-
-class CWater
-{
-public:
-
-    CWater()
-        : m_pWaterSim(0)
-    {
-    }
-
-    ~CWater()
-    {
-        Release();
-    }
-
-    // Create/Initialize simulation
-    void Create(float fA, float fWorldSizeX, float fWorldSizeY);
-    void Release();
-    void SaveToDisk(const char* pszFileName);
-
-    // Update water simulation
-    void Update(int nFrameID, float fTime, bool bOnlyHeight = false, void* pRawPtr = NULL);
-
-    // Get water simulation data
-    Vec3 GetPositionAt(int x, int y) const;
-    float GetHeightAt(int x, int y) const;
-    Vec4* GetDisplaceGrid() const;
-
-    const int GetGridSize() const;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    bool NeedInit() const { return m_pWaterSim == NULL; }
-private:
-
-    CWaterSim* m_pWaterSim;
-};
-
-CWater* WaterSimMgr();
-
-#endif
diff --git a/Code/CryEngine/RenderDll/Common/tests/RenderDLLUnitTests.cpp b/Code/CryEngine/RenderDll/Common/tests/RenderDLLUnitTests.cpp
deleted file mode 100644
index b78d4d6803..0000000000
--- a/Code/CryEngine/RenderDll/Common/tests/RenderDLLUnitTests.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <AzTest/AzTest.h>
-
-TEST(RenderDllUnitTests, TestPathUtilityHelpers)
-{
-    //normal cases
-    const char* somefile = "some.tga";
-    const char* somefile_ext = somefile + 4;
-    const char* path_somefile = "path/some.tga";
-    const char* path_somefile_ext = path_somefile + 9;
-    const char* path_somefile2 = "path\\some.tga";
-    const char* path_somefile2_ext = path_somefile2 + 9;
-
-    EXPECT_TRUE(fpGetExtension(somefile) == somefile_ext);               //filename
-    EXPECT_TRUE(fpGetExtension(path_somefile) == path_somefile_ext);     //path + filename
-    EXPECT_TRUE(fpGetExtension(path_somefile2) == path_somefile2_ext);   //path + filename
-
-    //edge cases
-    const char* path_somefile3 = "path\\some.tga\\some";
-    const char* path_somefile4 = "path\\some.tga/some";
-    const char* path_somefile5 = "path/some.tga\\some";
-
-    EXPECT_TRUE(fpGetExtension(path_somefile3) == nullptr);          //malformed string
-    EXPECT_TRUE(fpGetExtension(path_somefile4) == nullptr);          //malformed string
-    EXPECT_TRUE(fpGetExtension(path_somefile5) == nullptr);          //malformed string
-    EXPECT_TRUE(fpGetExtension("") == nullptr);                      //empty string
-    EXPECT_TRUE(fpGetExtension(nullptr) == nullptr);                 //nullptr
-}
diff --git a/Code/CryEngine/RenderDll/Common/tests/Shaders/VertexTests.cpp b/Code/CryEngine/RenderDll/Common/tests/Shaders/VertexTests.cpp
deleted file mode 100644
index f36b95c574..0000000000
--- a/Code/CryEngine/RenderDll/Common/tests/Shaders/VertexTests.cpp
+++ /dev/null
@@ -1,1179 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <AzCore/UnitTest/UnitTest.h>
-#include "Common/Shaders/Vertex.h"
-#include "DriverD3D.h"
-
-// General vertex stream stride
-int32 m_cSizeVF[eVF_Max] =
-{
-    0,
-    
-    sizeof(SVF_P3F_C4B_T2F),
-    sizeof(SVF_P3F_C4B_T2F_T2F),
-    sizeof(SVF_P3S_C4B_T2S),
-    sizeof(SVF_P3S_C4B_T2S_T2S),
-    sizeof(SVF_P3S_N4B_C4B_T2S),
-
-    sizeof(SVF_P3F_C4B_T4B_N3F2),
-    sizeof(SVF_TP3F_C4B_T2F),
-    sizeof(SVF_TP3F_T2F_T3F),
-    sizeof(SVF_P3F_T3F),
-    sizeof(SVF_P3F_T2F_T3F),
-
-    sizeof(SVF_T2F),
-    sizeof(SVF_W4B_I4S),
-    sizeof(SVF_C4B_C4B),
-    sizeof(SVF_P3F_P3F_I4B),
-    sizeof(SVF_P3F),
-
-    sizeof(SVF_C4B_T2S),
-
-    sizeof(SVF_P2F_T4F_C4F),
-    sizeof(SVF_P2F_T4F_T4F_C4F),
-
-    sizeof(SVF_P2S_N4B_C4B_T1F),
-    sizeof(SVF_P3F_C4B_T2S),
-
-    sizeof(SVF_P2F_C4B_T2F_F4B),    
-    sizeof(SVF_P3F_C4B),
-
-    sizeof(SVF_P3F_C4F_T2F),  //format number 23 (for testing verification)
-    sizeof(SVF_P3F_C4F_T2F_T3F),
-    sizeof(SVF_P3F_C4F_T2F_T3F_T3F),
-    sizeof(SVF_P3F_C4F_T2F_T1F),
-    sizeof(SVF_P3F_C4F_T2F_T1F_T3F),
-    sizeof(SVF_P3F_C4F_T2F_T1F_T3F_T3F),
-    sizeof(SVF_P3F_C4F_T4F_T2F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T3F),  //30
-    sizeof(SVF_P3F_C4F_T4F_T2F_T3F_T3F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T3F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F),  //35
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T3F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F),  //40
-    sizeof(SVF_P4F_T2F_C4F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T3F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T1F_T4F),  //45
-    sizeof(SVF_P3F_C4F_T2F_T1F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F),  //50
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F),  //55
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F),
-    sizeof(SVF_P4F_T2F_C4F_T4F_T4F_T4F),  //60
-    sizeof(SVF_P3F_C4F_T2F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T1F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F),  //65
-    sizeof(SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F),  //70
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F),  //75
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F),
-    sizeof(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F),
-    sizeof(SVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F),
-};
-
-// Legacy table copied from RenderMesh.cpp
-#define OOFS(t, x) ((int)offsetof(t, x))
-
-SBufInfoTable m_cBufInfoTable[eVF_Max] =
-{
-    // { Texcoord, Color, Normal }
-    {
-        -1, -1, -1
-    },
-    {      //eVF_P3F_C4B_T2F
-        OOFS(SVF_P3F_C4B_T2F, st),
-        OOFS(SVF_P3F_C4B_T2F, color.dcolor),
-        -1
-    },
-
-    {      //eVF_P3F_C4B_T2F_T2F
-        OOFS(SVF_P3F_C4B_T2F_T2F, st),
-        OOFS(SVF_P3F_C4B_T2F_T2F, color.dcolor),
-        -1
-    },
-
-
-    {      //eVF_P3S_C4B_T2S
-        OOFS(SVF_P3S_C4B_T2S, st),
-        OOFS(SVF_P3S_C4B_T2S, color.dcolor),
--1
-    },
-
-    {      //eVF_P3S_C4B_T2S_T2S
-        OOFS(SVF_P3S_C4B_T2S_T2S, st),
-        OOFS(SVF_P3S_C4B_T2S_T2S, color.dcolor),
-        -1
-    },
-
-    {      //eVF_P3S_N4B_C4B_T2S
-        OOFS(SVF_P3S_N4B_C4B_T2S, st),
-        OOFS(SVF_P3S_N4B_C4B_T2S, color.dcolor),
-        OOFS(SVF_P3S_N4B_C4B_T2S, normal)
-    },
-    {     // eVF_P3F_C4B_T4B_N3F2
-        -1,
-        OOFS(SVF_P3F_C4B_T4B_N3F2, color.dcolor),
-        -1
-    },
-    {     // eVF_TP3F_C4B_T2F
-        OOFS(SVF_TP3F_C4B_T2F, st),
-        OOFS(SVF_TP3F_C4B_T2F, color.dcolor),
-        -1
-    },
-    {     // eVF_TP3F_T2F_T3F
-        OOFS(SVF_TP3F_T2F_T3F, st0),
-        -1,
-        -1
-    },
-    {     // eVF_P3F_T3F
-        OOFS(SVF_P3F_T3F, st),
-        -1,
-        -1
-    },
-    {     // eVF_P3F_T2F_T3F
-        OOFS(SVF_P3F_T2F_T3F, st0),
-        -1,
-        -1
-    },
-    {// eVF_T2F
-        OOFS(SVF_T2F, st),
-        -1,
-        -1
-    },
-    { -1, -1, -1 },// eVF_W4B_I4S
-    { -1, -1, -1 },// eVF_C4B_C4B
-    { -1, -1, -1 },// eVF_P3F_P3F_I4B
-
-    {
-        -1,
-        -1,
-        -1
-    },
-    {     // eVF_C4B_T2S
-        OOFS(SVF_C4B_T2S, st),
-        OOFS(SVF_C4B_T2S, color.dcolor),
-        -1
-    },
-    {    // eVF_P2F_T4F_C4F
-        OOFS(SVF_P2F_T4F_C4F, st),
-        OOFS(SVF_P2F_T4F_C4F, color),
-        -1
-    },
-    {   // eVF_P2F_T4F_T4F_C4F
-        OOFS(SVF_P2F_T4F_T4F_C4F, st),
-        OOFS(SVF_P2F_T4F_T4F_C4F, color),
-        -1
-    },
-    {     // eVF_P2S_N4B_C4B_T1F
-        OOFS(SVF_P2S_N4B_C4B_T1F, z),
-        OOFS(SVF_P2S_N4B_C4B_T1F, color.dcolor),
-        OOFS(SVF_P2S_N4B_C4B_T1F, normal)
-    },
-    {     // eVF_P3F_C4B_T2S
-        OOFS(SVF_P3F_C4B_T2S, st),
-        OOFS(SVF_P3F_C4B_T2S, color.dcolor),
-        -1
-    },
-    {     // SVF_P2F_C4B_T2F_F4B
-        OOFS(SVF_P2F_C4B_T2F_F4B, st),
-        OOFS(SVF_P2F_C4B_T2F_F4B, color.dcolor),
-        -1
-    },
-    {     // eVF_P3F_C4B
-        -1,
-        OOFS(SVF_P3F_C4B, color.dcolor),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F
-        OOFS(SVF_P3F_C4F_T2F, st),
-        OOFS(SVF_P3F_C4F_T2F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T3F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T3F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T3F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F
-        OOFS(SVF_P3F_C4F_T2F_T1F, st),
-        OOFS(SVF_P3F_C4F_T2F_T1F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T3F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F
-        OOFS(SVF_P3F_C4F_T4F_T2F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T3F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T3F_T3F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T3F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F, color),
-        -1
-    },
-    {     // eVF_P4F_T2F_C4F_T4F_T4F
-        OOFS(SVF_P4F_T2F_C4F_T4F_T4F, st0),
-        OOFS(SVF_P4F_T2F_C4F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T3F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T3F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T3F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F, color),
-        -1
-    },
-    {     // eVF_P4F_T2F_C4F_T4F_T4F_T4F
-        OOFS(SVF_P4F_T2F_C4F_T4F_T4F_T4F, st0),
-        OOFS(SVF_P4F_T2F_C4F_T4F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F, st0),
-        OOFS(SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F, color),
-        -1
-    },
-    {     // eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F
-        OOFS(SVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F, st0),
-        OOFS(SVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F, color),
-        -1
-    },
-};
-#undef OOFS
-
-AZStd::vector<D3D11_INPUT_ELEMENT_DESC> Legacy_InitBaseStreamD3DVertexDeclaration(EVertexFormat nFormat)
-{
-    //========================================================================================
-    // base stream declarations (stream 0)
-    D3D11_INPUT_ELEMENT_DESC elemPosHalf = { "POSITION", 0, DXGI_FORMAT_R16G16B16A16_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };
-    D3D11_INPUT_ELEMENT_DESC elemTCHalf = { "TEXCOORD", 0, DXGI_FORMAT_R16G16_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };
-
-    D3D11_INPUT_ELEMENT_DESC elemPos = { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };
-    D3D11_INPUT_ELEMENT_DESC elemPos2 = { "POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };
-    D3D11_INPUT_ELEMENT_DESC elemPosTR = { "POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };  // position
-    D3D11_INPUT_ELEMENT_DESC elemPos2Half = { "POSITION", 0, DXGI_FORMAT_R16G16_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };
-    D3D11_INPUT_ELEMENT_DESC elemPos1 = { "POSITION", 1, DXGI_FORMAT_R32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };
-
-    D3D11_INPUT_ELEMENT_DESC elemNormalB = { "NORMAL", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };
-    D3D11_INPUT_ELEMENT_DESC elemTan = { "TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };       // axis/size
-    D3D11_INPUT_ELEMENT_DESC elemBitan = { "TEXCOORD", 1, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };    // axis/size
-    D3D11_INPUT_ELEMENT_DESC elemColor = { "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };        // diffuse
-    D3D11_INPUT_ELEMENT_DESC elemColorF = { "COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };   // general color
-    D3D11_INPUT_ELEMENT_DESC elemTC0 = { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };      // texture
-    D3D11_INPUT_ELEMENT_DESC elemTC1 = { "TEXCOORD", 1, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };      // texture
-    D3D11_INPUT_ELEMENT_DESC elemTC2 = { "TEXCOORD", 2, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };      // texture
-    D3D11_INPUT_ELEMENT_DESC elemTC1_3 = { "TEXCOORD", 1, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };      // texture
-    D3D11_INPUT_ELEMENT_DESC elemTC0_4 = { "TEXCOORD", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };      // texture
-    D3D11_INPUT_ELEMENT_DESC elemTC0_1 = { "TEXCOORD", 0, DXGI_FORMAT_R32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };      // texture
-    D3D11_INPUT_ELEMENT_DESC elemTC3_4 = { "TEXCOORD", 3, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 };      // texture
-
-    AZ::Vertex::Format vertexFormat = AZ::Vertex::Format((EVertexFormat)nFormat);
-    AZStd::vector<D3D11_INPUT_ELEMENT_DESC> decl;
-
-    uint texCoordOffset = 0;
-    bool hasTexCoord = vertexFormat.TryCalculateOffset(texCoordOffset, AZ::Vertex::AttributeUsage::TexCoord);
-    uint colorOffset = 0;
-    bool hasColor = vertexFormat.TryCalculateOffset(colorOffset, AZ::Vertex::AttributeUsage::Color);
-    uint normalOffset = 0;
-    bool hasNormal = vertexFormat.TryCalculateOffset(normalOffset, AZ::Vertex::AttributeUsage::Normal);
-
-    // Position
-
-    switch (nFormat)
-    {
-    case eVF_TP3F_C4B_T2F:
-    case eVF_TP3F_T2F_T3F:
-        decl.push_back(elemPosTR);
-        break;
-    case eVF_P3S_C4B_T2S:
-    case eVF_P3S_N4B_C4B_T2S:
-        decl.push_back(elemPosHalf);
-        break;
-    case eVF_P2S_N4B_C4B_T1F:
-        decl.push_back(elemPos2Half);
-        break;
-    case eVF_P2F_T4F_C4F:
-        decl.push_back(elemPos2);
-        break;
-    case eVF_T2F:
-    case eVF_C4B_T2S:
-    case eVF_Unknown:
-        break;
-    default:
-        decl.push_back(elemPos);
-    }
-
-    // Normal
-    if (hasNormal)
-    {
-        elemNormalB.AlignedByteOffset = normalOffset;
-        decl.push_back(elemNormalB);
-    }
-
-#ifdef PARTICLE_MOTION_BLUR
-    if (nFormat == eVF_P3F_C4B_T4B_N3F2)
-    {
-        elemTC0_4.AlignedByteOffset = (int)offsetof(SVF_P3F_C4B_T4B_N3F2, prevXaxis);
-        elemTC0_4.SemanticIndex = 0;
-        decl.AddElem(elemTC0_4);
-    }
-#endif
-    // eVF_P2F_T4F_C4F has special case logic below, so ignore it here
-    if (hasColor && nFormat != eVF_P2F_T4F_C4F)
-    {
-        elemColor.AlignedByteOffset = colorOffset;
-        elemColor.SemanticIndex = 0;
-        decl.push_back(elemColor);
-    }
-    if (nFormat == eVF_P3F_C4B_T4B_N3F2)
-    {
-#ifdef PARTICLE_MOTION_BLUR
-        elemTC1_3.AlignedByteOffset = (int)offsetof(SVF_P3F_C4B_T4B_N3F2, prevPos);
-        elemTC1_3.SemanticIndex = 1;
-        decl.push_back(elemTC1_3);
-#endif
-        elemColor.AlignedByteOffset = (int)offsetof(SVF_P3F_C4B_T4B_N3F2, st);
-        elemColor.SemanticIndex = 1;
-        decl.push_back(elemColor);
-
-        elemTan.AlignedByteOffset = (int)offsetof(SVF_P3F_C4B_T4B_N3F2, xaxis);
-        decl.push_back(elemTan);
-
-        elemBitan.AlignedByteOffset = (int)offsetof(SVF_P3F_C4B_T4B_N3F2, yaxis);
-        decl.push_back(elemBitan);
-    }
-
-    if (nFormat == eVF_P2F_T4F_C4F)
-    {
-        elemTC0_4.AlignedByteOffset = (int)offsetof(SVF_P2F_T4F_C4F, st);
-        elemTC0_4.SemanticIndex = 0;
-        decl.push_back(elemTC0_4);
-
-        elemColorF.AlignedByteOffset = (int)offsetof(SVF_P2F_T4F_C4F, color);
-        elemColorF.SemanticIndex = 0;
-        decl.push_back(elemColorF);
-    }
-
-    //handle cases where 2D texture comes before 4F Color
-    if (nFormat == eVF_P4F_T2F_C4F_T4F_T4F || nFormat == eVF_P4F_T2F_C4F_T4F_T4F_T4F || nFormat == eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F)
-    {
-        elemTC2.AlignedByteOffset = (int)offsetof(SVF_P4F_T2F_C4F_T4F_T4F, st0);
-        elemTC2.SemanticIndex = 0;
-        decl.push_back(elemTC2);
-
-        elemColorF.AlignedByteOffset = (int)offsetof(SVF_P4F_T2F_C4F_T4F_T4F, color);
-        elemColorF.SemanticIndex = 0;
-        decl.push_back(elemColorF);
-    }
-
-    if (hasTexCoord)
-    {
-        elemTC0.AlignedByteOffset = texCoordOffset;
-        elemTC0.SemanticIndex = 0;
-        switch (nFormat)
-        {
-        case eVF_P2F_T4F_C4F:
-            // eVF_P2F_T4F_C4F has special case logic above, so ignore it here
-            break;
-        case eVF_P3S_C4B_T2S:
-        case eVF_P3S_N4B_C4B_T2S:
-        case eVF_C4B_T2S:
-        case eVF_P3F_C4B_T2S:
-            elemTCHalf.AlignedByteOffset = texCoordOffset;
-            elemTCHalf.SemanticIndex = 0;
-            decl.push_back(elemTCHalf);
-            break;
-        case eVF_P3F_T3F:
-            elemTC1_3.AlignedByteOffset = texCoordOffset;
-            elemTC1_3.SemanticIndex = 0;
-            decl.push_back(elemTC1_3);
-            break;
-        case eVF_P2S_N4B_C4B_T1F:
-            elemTC0_1.AlignedByteOffset = texCoordOffset;
-            elemTC0_1.SemanticIndex = 0;
-            decl.push_back(elemTC0_1);
-            break;
-        case eVF_TP3F_T2F_T3F:
-        case eVF_P3F_T2F_T3F:
-            decl.push_back(elemTC0);
-
-            //This case needs two TexCoord elements
-            elemTC1_3.AlignedByteOffset = texCoordOffset + 8;
-            elemTC1_3.SemanticIndex = 1;
-            decl.push_back(elemTC1_3);
-            break;
-        default:
-            decl.push_back(elemTC0);
-        }
-    }
-    if (nFormat == eVF_P2S_N4B_C4B_T1F)
-    {
-        elemPos1.AlignedByteOffset = (int)offsetof(SVF_P2S_N4B_C4B_T1F, z);
-        decl.push_back(elemPos1);
-    }
-    decl.shrink_to_fit();
-
-    return decl;
-}
-
-bool DeclarationsAreEqual(AZStd::vector<D3D11_INPUT_ELEMENT_DESC>& declarationA, AZStd::vector<D3D11_INPUT_ELEMENT_DESC>& declarationB)
-{
-    if (declarationA.size() != declarationB.size())
-    {
-        return false;
-    }
-
-    for (uint i = 0; i < declarationA.size(); ++i)
-    {
-        D3D11_INPUT_ELEMENT_DESC elementDescriptionA = declarationA[i];
-        D3D11_INPUT_ELEMENT_DESC elementDescriptionB = declarationB[i];
-        if (elementDescriptionA.SemanticIndex != elementDescriptionB.SemanticIndex ||
-            elementDescriptionA.Format != elementDescriptionB.Format ||
-            elementDescriptionA.InputSlot != elementDescriptionB.InputSlot ||
-            elementDescriptionA.AlignedByteOffset != elementDescriptionB.AlignedByteOffset ||
-            elementDescriptionA.InputSlotClass != elementDescriptionB.InputSlotClass ||
-            elementDescriptionA.InstanceDataStepRate != elementDescriptionB.InstanceDataStepRate ||
-            strcmp(elementDescriptionA.SemanticName, elementDescriptionB.SemanticName) != 0)
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-class VertexFormatAssertTest
-    : public ::testing::Test
-    , public UnitTest::AllocatorsBase
-{
-protected:
-    void SetUp() override
-    {
-        UnitTest::AllocatorsBase::SetupAllocator();
-    }
-    void TearDown() override
-    {
-        UnitTest::AllocatorsBase::TeardownAllocator();
-    }
-};
-
-TEST_F(VertexFormatAssertTest, VertexFormatConstructor_AssertsOnInvalidInput)
-{
-    // The vertex format constructor should assert when an invalid vertex format enum is used
-    AZ_TEST_START_TRACE_SUPPRESSION;
-    AZ::Vertex::Format(static_cast<EVertexFormat>(EVertexFormat::eVF_Max));
-    AZ::Vertex::Format(static_cast<EVertexFormat>(EVertexFormat::eVF_Max + 1));
-    // Expect 2 asserts
-    AZ_TEST_STOP_TRACE_SUPPRESSION(2);
-}
-
-class VertexFormatTest
-    : public ::testing::TestWithParam < int >
-    , public UnitTest::AllocatorsBase
-{
-public:
-    void SetUp() override
-    {
-        UnitTest::AllocatorsBase::SetupAllocator();
-    }
-
-    void TearDown() override
-    {
-        UnitTest::AllocatorsBase::TeardownAllocator();
-    }
-};
-
-TEST_P(VertexFormatTest, GetStride_MatchesExpected)
-{
-    EVertexFormat eVF = (EVertexFormat)GetParam();
-
-    AZ::Vertex::Format format(eVF);
-    uint actualSize = format.GetStride();
-    uint expectedSize = m_cSizeVF[eVF];
-    EXPECT_EQ(actualSize, expectedSize);
-}
-
-TEST_P(VertexFormatTest, CalculateOffset_MatchesExpected)
-{
-    EVertexFormat eVF = (EVertexFormat)GetParam();
-
-    AZ::Vertex::Format format(eVF);
-    // TexCoord
-    uint actualOffset = 0;
-    bool hasOffset = format.TryCalculateOffset(actualOffset, AZ::Vertex::AttributeUsage::TexCoord);
-    int expectedOffset = m_cBufInfoTable[eVF].OffsTC;
-    if (expectedOffset >= 0)
-    {
-        EXPECT_TRUE(hasOffset);
-        EXPECT_EQ(actualOffset, expectedOffset);
-    }
-    else
-    {
-        EXPECT_FALSE(hasOffset);
-    }
-
-    // Color
-    hasOffset = format.TryCalculateOffset(actualOffset, AZ::Vertex::AttributeUsage::Color);
-    expectedOffset = m_cBufInfoTable[eVF].OffsColor;
-    if (expectedOffset >= 0)
-    {
-        EXPECT_TRUE(hasOffset);
-        EXPECT_EQ(actualOffset, expectedOffset);
-    }
-    else
-    {
-        EXPECT_FALSE(hasOffset);
-    }
-
-    // Normal
-    hasOffset = format.TryCalculateOffset(actualOffset, AZ::Vertex::AttributeUsage::Normal);
-    expectedOffset = m_cBufInfoTable[eVF].OffsNorm;
-    if (expectedOffset >= 0)
-    {
-        EXPECT_TRUE(hasOffset);
-        EXPECT_EQ(actualOffset, expectedOffset);
-    }
-    else
-    {
-        EXPECT_FALSE(hasOffset);
-    }
-}
-
-TEST_F(VertexFormatTest, CalculateOffsetMultipleUVs_MatchesExpected)
-{
-    AZ::Vertex::Format vertexFormat(eVF_P3F_C4B_T2F_T2F);
-    uint offset = 0;
-    // The first uv set exists
-    EXPECT_TRUE(vertexFormat.TryCalculateOffset(offset, AZ::Vertex::AttributeUsage::TexCoord, 0));
-    // First Texture coordinate comes after the position, which has 3 32 bit floats, and the color, which has 4 bytes
-    EXPECT_EQ(offset, AZ::Vertex::AttributeTypeDataTable[(int)AZ::Vertex::AttributeType::Float32_3].byteSize + AZ::Vertex::AttributeTypeDataTable[(int)AZ::Vertex::AttributeType::Byte_4].byteSize);
-
-    // The second uv set exists
-    EXPECT_TRUE(vertexFormat.TryCalculateOffset(offset, AZ::Vertex::AttributeUsage::TexCoord, 1));
-    // Second Texture coordinate comes after the position + color + the first texture coordinate
-    EXPECT_EQ(offset, AZ::Vertex::AttributeTypeDataTable[(int)AZ::Vertex::AttributeType::Float32_3].byteSize + AZ::Vertex::AttributeTypeDataTable[(int)AZ::Vertex::AttributeType::Byte_4].byteSize + AZ::Vertex::AttributeTypeDataTable[(int)AZ::Vertex::AttributeType::Float32_2].byteSize);
-
-    // The third uv set does not exist
-    EXPECT_FALSE(vertexFormat.TryCalculateOffset(offset, AZ::Vertex::AttributeUsage::TexCoord, 2));
-}
-
-TEST_P(VertexFormatTest, D3DVertexDeclarations_MatchesLegacy)
-{
-    EVertexFormat eVF = (EVertexFormat)GetParam();
-    AZStd::vector<D3D11_INPUT_ELEMENT_DESC> expected = Legacy_InitBaseStreamD3DVertexDeclaration(eVF);
-    bool matchesLegacy = true;
-
-    //the new vertex definitions aren't legacy and never were a part of the legacy system in any way, and should be ignored for this test
-    //new definitions occur after entry number 22;
-    const unsigned int ignoredFormatsStart = aznumeric_cast<unsigned int>(eVF_P3F_C4F_T2F);  //23
-    const unsigned int ignoredFormatsEnd = aznumeric_cast<unsigned int>(eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F);  //61
-    if (aznumeric_cast<unsigned int>(eVF) >= ignoredFormatsStart && aznumeric_cast<unsigned int>(eVF) <= ignoredFormatsEnd)
-    {
-        EXPECT_TRUE(matchesLegacy);
-        return;
-    }
-
-    // The legacy result of EF_InitD3DVertexDeclarations for the following formats are flat out wrong (it defaults to one D3D11_INPUT_ELEMENT_DESC that is a position, which is clearly not the case for any of these)
-    // eVF_W4B_I4S is really blendweights + indices
-    // eVF_C4B_C4B is really two spherical harmonic coefficients
-    // eVF_P3F_P3F_I4B is really two positions and an index
-    // eVF_P2F_T4F_T4F_C4F doesn't actually exist in the engine anymore
-    // ignore these cases
-    // Also ignore eVF_P2S_N4B_C4B_T1F: the T1F attribute has a POSITION semantic name in the legacy declaration, even though both the engine and shader treat it as a TEXCOORD (despite the fact that it is eventually used for a position)
-    // eVF_P3F_C4B_T2F_T2F, eVF_P3S_C4B_T2S_T2S, and eVF_P2F_C4B_T2F_F4B are all new
-    else if (eVF != eVF_W4B_I4S && eVF != eVF_C4B_C4B && eVF != eVF_P3F_P3F_I4B && eVF != eVF_P2F_T4F_T4F_C4F && eVF != eVF_P2S_N4B_C4B_T1F && eVF != eVF_P2F_C4B_T2F_F4B && eVF != eVF_P3F_C4B_T2F_T2F && eVF != eVF_P3S_C4B_T2S_T2S)
-    {
-        AZStd::vector<D3D11_INPUT_ELEMENT_DESC> actual = GetD3D11Declaration(AZ::Vertex::Format(eVF));
-        matchesLegacy = DeclarationsAreEqual(actual, expected);
-    }
-    EXPECT_TRUE(matchesLegacy);
-}
-
-TEST_P(VertexFormatTest, GetStride_4ByteAligned)
-{
-    EVertexFormat eVF = (EVertexFormat)GetParam();
-    AZ::Vertex::Format format(eVF);
-    EXPECT_EQ(format.GetStride() % AZ::Vertex::VERTEX_BUFFER_ALIGNMENT, 0);
-}
-
-class VertexFormatComparisonTest
-    : public ::testing::TestWithParam < int >
-    , public UnitTest::AllocatorsBase
-{
-protected:
-    void SetUp() override
-    {
-        UnitTest::AllocatorsBase::SetupAllocator();
-        
-        m_vertexFormatEnum = static_cast<EVertexFormat>(GetParam());
-        m_vertexFormat = AZ::Vertex::Format(m_vertexFormatEnum);
-
-        m_nextVertexFormatEnum = static_cast<EVertexFormat>((m_vertexFormatEnum + 1) % eVF_Max);
-        m_nextVertexFormat = AZ::Vertex::Format(m_nextVertexFormatEnum);
-    }
-    void TearDown() override
-    {
-        UnitTest::AllocatorsBase::TeardownAllocator();
-    }
-
-    EVertexFormat m_vertexFormatEnum;
-    AZ::Vertex::Format m_vertexFormat;
-
-    AZ::Vertex::Format m_nextVertexFormat;
-    EVertexFormat m_nextVertexFormatEnum;
-};
-
-TEST_P(VertexFormatComparisonTest, EqualTo_SameVertexFormat_True)
-{
-    EXPECT_TRUE(m_vertexFormat == m_vertexFormatEnum);
-    EXPECT_TRUE(m_vertexFormat == m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, EqualTo_NextVertexFormat_False)
-{
-    EXPECT_FALSE(m_vertexFormat == m_nextVertexFormatEnum);
-    EXPECT_FALSE(m_vertexFormat == m_nextVertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, EqualTo_PreviousVertexFormat_False)
-{
-    EXPECT_FALSE(m_nextVertexFormat == m_vertexFormatEnum);
-    EXPECT_FALSE(m_nextVertexFormat == m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, NotEqualTo_SameVertexFormat_False)
-{
-    EXPECT_FALSE(m_vertexFormat != m_vertexFormatEnum);
-    EXPECT_FALSE(m_vertexFormat != m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, NotEqualTo_NextVertexFormat_True)
-{
-    EXPECT_TRUE(m_vertexFormat != m_nextVertexFormatEnum);
-    EXPECT_TRUE(m_vertexFormat != m_nextVertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, NotEqualTo_PreviousVertexFormat_True)
-{
-    EXPECT_TRUE(m_nextVertexFormat != m_vertexFormatEnum);
-    EXPECT_TRUE(m_nextVertexFormat != m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, GreaterThan_SameVertexFormat_False)
-{
-    EXPECT_FALSE(m_vertexFormat > m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, GreaterThan_NextVertexFormat_False)
-{
-    EXPECT_FALSE(m_vertexFormat > m_nextVertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, GreaterThan_PreviousVertexFormat_True)
-{
-    EXPECT_TRUE(m_nextVertexFormat > m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, GreaterThanOrEqualTo_SameVertexFormat_True)
-{
-    EXPECT_TRUE(m_vertexFormat >= m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, GreaterThanOrEqualTo_NextVertexFormat_False)
-{
-    EXPECT_FALSE(m_vertexFormat >= m_nextVertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, GreaterThanOrEqualTo_PreviousVertexFormat_True)
-{
-    EXPECT_TRUE(m_nextVertexFormat >= m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, LessThan_SameVertexFormat_False)
-{
-    EXPECT_FALSE(m_vertexFormat < m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, LessThan_NextVertexFormat_True)
-{
-    EXPECT_TRUE(m_vertexFormat < m_nextVertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, LessThan_PreviousVertexFormat_False)
-{
-    EXPECT_FALSE(m_nextVertexFormat < m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, LessThanOrEqualTo_SameVertexFormat_True)
-{
-    EXPECT_TRUE(m_vertexFormat <= m_vertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, LessThanOrEqualTo_NextVertexFormat_True)
-{
-    EXPECT_TRUE(m_vertexFormat <= m_nextVertexFormat);
-}
-
-TEST_P(VertexFormatComparisonTest, LessThanOrEqualTo_PreviousVertexFormat_False)
-{
-    EXPECT_FALSE(m_nextVertexFormat <= m_vertexFormat);
-}
-
-TEST_P(VertexFormatTest, GetEnum_MatchesExpected)
-{
-    EVertexFormat eVF = static_cast<EVertexFormat>(GetParam());
-    AZ::Vertex::Format vertexFormat(eVF);
-
-    EXPECT_EQ(vertexFormat.GetEnum(), eVF);
-}
-
-TEST_F(VertexFormatTest, GetAttributeUsageCount_MatchesExpected)
-{
-    AZ::Vertex::Format vertexFormatP3F_C4B_T2F(eVF_P3F_C4B_T2F);
-    // eVF_P3F_C4B_T2F has one position, one color, one uv set, and no normal attribute
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeUsageCount(AZ::Vertex::AttributeUsage::Position), 1);
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeUsageCount(AZ::Vertex::AttributeUsage::Color), 1);
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeUsageCount(AZ::Vertex::AttributeUsage::TexCoord), 1);
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeUsageCount(AZ::Vertex::AttributeUsage::Normal), 0);
-
-    // eVF_P3S_C4B_T2S and eVF_P3F_C4B_T2F_T2F actually have two uv sets
-    EXPECT_EQ(AZ::Vertex::Format(eVF_P3S_C4B_T2S_T2S).GetAttributeUsageCount(AZ::Vertex::AttributeUsage::TexCoord), 2);
-    EXPECT_EQ(AZ::Vertex::Format(eVF_P3F_C4B_T2F_T2F).GetAttributeUsageCount(AZ::Vertex::AttributeUsage::TexCoord), 2);
-}
-
-TEST_P(VertexFormatTest, IsSupersetOf_EquivalentVertexFormat_True)
-{
-    EVertexFormat eVF = static_cast<EVertexFormat>(GetParam());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF).IsSupersetOf(AZ::Vertex::Format(eVF)));
-}
-
-TEST_F(VertexFormatTest, IsSupersetOf_TargetHasExtraUVs_OnlyTargetIsSuperset)
-{
-    AZ::Vertex::Format vertexFormatP3F_C4B_T2F(eVF_P3F_C4B_T2F);
-    AZ::Vertex::Format vertexFormatP3F_C4B_T2F_T2F(eVF_P3F_C4B_T2F_T2F);
-
-    // eVF_P3F_C4B_T2F_T2F contains everything in eVF_P3F_C4B_T2F plus an extra uv set
-    EXPECT_TRUE(vertexFormatP3F_C4B_T2F_T2F.IsSupersetOf(vertexFormatP3F_C4B_T2F));
-    EXPECT_FALSE(vertexFormatP3F_C4B_T2F.IsSupersetOf(vertexFormatP3F_C4B_T2F_T2F));
-}
-
-TEST_F(VertexFormatTest, TryGetAttributeOffsetAndType_MatchesExpected)
-{
-    uint expectedOffset = 0;
-    uint offset = 0;
-    AZ::Vertex::AttributeType type = AZ::Vertex::AttributeType::NumTypes;
-    AZ::Vertex::Format vertexFormatP3F_C4B_T2F_T2F(eVF_P3F_C4B_T2F_T2F);
-
-    // eVF_P3F_C4B_T2F_T2F has a position at offset 0 that is a Float32_3
-    EXPECT_TRUE(vertexFormatP3F_C4B_T2F_T2F.TryGetAttributeOffsetAndType(AZ::Vertex::AttributeUsage::Position, 0, offset, type));
-    EXPECT_EQ(offset, expectedOffset);
-    EXPECT_EQ(type, AZ::Vertex::AttributeType::Float32_3);
-    expectedOffset += AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Float32_3)].byteSize;
-
-    // eVF_P3F_C4B_T2F_T2F does not have a second position
-    EXPECT_FALSE(vertexFormatP3F_C4B_T2F_T2F.TryGetAttributeOffsetAndType(AZ::Vertex::AttributeUsage::Position, 1, offset, type));
-
-    // eVF_P3F_C4B_T2F_T2F has a color, offset by 12 bytes, that is a Byte_4
-    EXPECT_TRUE(vertexFormatP3F_C4B_T2F_T2F.TryGetAttributeOffsetAndType(AZ::Vertex::AttributeUsage::Color, 0, offset, type));
-    EXPECT_EQ(offset, expectedOffset);
-    EXPECT_EQ(type, AZ::Vertex::AttributeType::Byte_4);
-    expectedOffset += AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Byte_4)].byteSize;
-
-    // eVF_P3F_C4B_T2F_T2F has a TexCoord, offset by 16 bytes, that is a Float32_2
-    EXPECT_TRUE(vertexFormatP3F_C4B_T2F_T2F.TryGetAttributeOffsetAndType(AZ::Vertex::AttributeUsage::TexCoord, 0, offset, type));
-    EXPECT_EQ(offset, expectedOffset);
-    EXPECT_EQ(type, AZ::Vertex::AttributeType::Float32_2);
-    expectedOffset += AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Float32_2)].byteSize;
-
-    // eVF_P3F_C4B_T2F_T2F has a second TexCoord, offset by 24 bytes, that is a Float32_2
-    EXPECT_TRUE(vertexFormatP3F_C4B_T2F_T2F.TryGetAttributeOffsetAndType(AZ::Vertex::AttributeUsage::TexCoord, 1, offset, type));
-    EXPECT_EQ(offset, expectedOffset);
-    EXPECT_EQ(type, AZ::Vertex::AttributeType::Float32_2);
-    expectedOffset += AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Float32_2)].byteSize;
-
-    // eVF_P3F_C4B_T2F_T2F does not have a third TexCoord
-    EXPECT_FALSE(vertexFormatP3F_C4B_T2F_T2F.TryGetAttributeOffsetAndType(AZ::Vertex::AttributeUsage::TexCoord, 2, offset, type));
-}
-
-TEST_F(VertexFormatTest, GetAttributeByteLength_MatchesExpected)
-{
-    AZ::Vertex::Format vertexFormatP3F_C4B_T2F(eVF_P3F_C4B_T2F);
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeByteLength(AZ::Vertex::AttributeUsage::Position), AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Float32_3)].byteSize);
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeByteLength(AZ::Vertex::AttributeUsage::Color), AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Byte_4)].byteSize);
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeByteLength(AZ::Vertex::AttributeUsage::TexCoord), AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Float32_2)].byteSize);
-    EXPECT_EQ(vertexFormatP3F_C4B_T2F.GetAttributeByteLength(AZ::Vertex::AttributeUsage::Normal), 0);
-
-    AZ::Vertex::Format vertexFormatP3S_C4B_T2S(eVF_P3S_C4B_T2S);
-    EXPECT_EQ(vertexFormatP3S_C4B_T2S.GetAttributeByteLength(AZ::Vertex::AttributeUsage::Position), AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Float16_4)].byteSize);// vec3f16 is backed by a CryHalf4, so 16 bit positions use Float16_4
-    EXPECT_EQ(vertexFormatP3S_C4B_T2S.GetAttributeByteLength(AZ::Vertex::AttributeUsage::Color), AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Byte_4)].byteSize);
-    EXPECT_EQ(vertexFormatP3S_C4B_T2S.GetAttributeByteLength(AZ::Vertex::AttributeUsage::TexCoord), AZ::Vertex::AttributeTypeDataTable[static_cast<uint8>(AZ::Vertex::AttributeType::Float16_2)].byteSize);
-    EXPECT_EQ(vertexFormatP3S_C4B_T2S.GetAttributeByteLength(AZ::Vertex::AttributeUsage::Normal), 0);
-}
-
-TEST_F(VertexFormatTest, Has16BitFloatPosition_MatchesExpected)
-{
-    // Vertex formats with 16 bit positions should return true
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3S_C4B_T2S).Has16BitFloatPosition());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3S_C4B_T2S_T2S).Has16BitFloatPosition());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3S_N4B_C4B_T2S).Has16BitFloatPosition());
-
-    // Vertex formats with 32 bit positions should return false
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_C4B_T2F).Has16BitFloatPosition());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_C4B_T2F_T2F).Has16BitFloatPosition());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_C4B_T4B_N3F2).Has16BitFloatPosition()); 
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_T3F).Has16BitFloatPosition());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_C4B_T2S).Has16BitFloatPosition());
-
-    // Vertex formats with no positions should return false
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_T2F).Has16BitFloatPosition());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_W4B_I4S).Has16BitFloatPosition());
-}
-
-TEST_F(VertexFormatTest, Has16BitFloatTextureCoordinates_MatchesExpected)
-{
-    // Vertex formats with 16 bit texture coordinates should return true
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3S_C4B_T2S).Has16BitFloatTextureCoordinates());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3S_C4B_T2S_T2S).Has16BitFloatTextureCoordinates());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3F_C4B_T2S).Has16BitFloatTextureCoordinates());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_C4B_T2S).Has16BitFloatTextureCoordinates());
-
-    // Vertex formats with 32 bit texture coordinates should return false
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_C4B_T2F).Has16BitFloatTextureCoordinates());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_C4B_T2F_T2F).Has16BitFloatTextureCoordinates());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_T2F).Has16BitFloatTextureCoordinates());
-    
-    // Vertex formats with no texture coordinates should return false
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_W4B_I4S).Has16BitFloatTextureCoordinates());
-}
-
-TEST_F(VertexFormatTest, Has32BitFloatTextureCoordinates_MatchesExpected)
-{
-    // Vertex formats with 16 bit texture coordinates should return false
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3S_C4B_T2S).Has32BitFloatTextureCoordinates());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3S_C4B_T2S_T2S).Has32BitFloatTextureCoordinates());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_P3F_C4B_T2S).Has32BitFloatTextureCoordinates());
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_C4B_T2S).Has32BitFloatTextureCoordinates());
-
-    // Vertex formats with 32 bit texture coordinates should return true
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3F_C4B_T2F).Has32BitFloatTextureCoordinates());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_P3F_C4B_T2F_T2F).Has32BitFloatTextureCoordinates());
-    EXPECT_TRUE(AZ::Vertex::Format(eVF_T2F).Has32BitFloatTextureCoordinates());
-
-    // Vertex formats with no texture coordinates should return false
-    EXPECT_FALSE(AZ::Vertex::Format(eVF_W4B_I4S).Has32BitFloatTextureCoordinates());
-}
-
-TEST_F(VertexFormatTest, VertFormatForComponents_StandardWithOneUVSet_eVF_P3S_C4B_T2S)
-{
-    // Standard vertex format
-    bool hasTextureCoordinate = true;
-    bool hasTextureCoordinate2 = false;
-    bool isParticle = false;
-    bool hasNormal = false;
-    EXPECT_EQ(AZ::Vertex::VertFormatForComponents(false, hasTextureCoordinate, hasTextureCoordinate2, isParticle, hasNormal), eVF_P3S_C4B_T2S);
-}
-
-TEST_F(VertexFormatTest, VertFormatForComponents_StandardWithTwoUVSets_eVF_P3F_C4B_T2F_T2F)
-{
-    // Multi-uv set vertex format
-    bool hasTextureCoordinate = true;
-    bool hasTextureCoordinate2 = true;
-    bool isParticle = false;
-    bool hasNormal = false;
-    EXPECT_EQ(AZ::Vertex::VertFormatForComponents(false, hasTextureCoordinate, hasTextureCoordinate2, isParticle, hasNormal), eVF_P3F_C4B_T2F_T2F);
-}
-
-TEST_F(VertexFormatTest, VertFormatForComponents_IsParticle_eVF_P3F_C4B_T4B_N3F2)
-{
-    // Particle vertex format
-    bool hasTextureCoordinate = true;
-    bool hasTextureCoordinate2 = false;
-    bool isParticle = true;
-    bool hasNormal = false;
-    EXPECT_EQ(AZ::Vertex::VertFormatForComponents(false, hasTextureCoordinate, hasTextureCoordinate2, isParticle, hasNormal), eVF_P3F_C4B_T4B_N3F2);
-}
-
-TEST_F(VertexFormatTest, VertFormatForComponents_HasNormal_eVF_P3S_N4B_C4B_T2S)
-{
-    // Vertex format with normals
-    bool hasTextureCoordinate = true;
-    bool hasTextureCoordinate2 = false;
-    bool isParticle = false;
-    bool hasNormal = true;
-    EXPECT_EQ(AZ::Vertex::VertFormatForComponents(false, hasTextureCoordinate, hasTextureCoordinate2, isParticle, hasNormal), eVF_P3S_N4B_C4B_T2S);
-}
-
-// Instantiate tests
-// Start with 1 to skip eVF_Unknown
-INSTANTIATE_TEST_CASE_P(EVertexFormatValues, VertexFormatTest, ::testing::Range<int>(1, eVF_Max));
-
-// Start with 1 to skip eVF_Unknown, up to but not including eVF_Max - 1 so we always know that the current value + 1 is within the range of valid vertex formats
-INSTANTIATE_TEST_CASE_P(EVertexFormatValues, VertexFormatComparisonTest, ::testing::Range<int>(1, eVF_Max - 1));
diff --git a/Code/CryEngine/RenderDll/RenderDll_precompiled.cpp b/Code/CryEngine/RenderDll/RenderDll_precompiled.cpp
deleted file mode 100644
index 7e27221229..0000000000
--- a/Code/CryEngine/RenderDll/RenderDll_precompiled.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
diff --git a/Code/CryEngine/RenderDll/RenderDll_precompiled.h b/Code/CryEngine/RenderDll/RenderDll_precompiled.h
deleted file mode 100644
index 3d5ab8c77d..0000000000
--- a/Code/CryEngine/RenderDll/RenderDll_precompiled.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-//on mac the precompiled header is auto included in every .c and .cpp file, no include line necessary.
-//.c files don't like the cpp things in here
-#ifdef __cplusplus
-
-#include <RenderDll/Common/RendererDefs.h>
-
-#include <Cry_Math.h>
-#include <Cry_Geo.h>
-#include <StlUtils.h>
-#include <RenderDll/Common/DevBuffer.h>
-
-#include <RenderDll/XRenderD3D9/DeviceManager/DeviceManager.h>
-
-#include <VertexFormats.h>
-
-#include <RenderDll/Common/CommonRender.h>
-#include <IRenderAuxGeom.h>
-#include <RenderDll/Common/Shaders/ShaderComponents.h>
-#include <RenderDll/Common/Shaders/Shader.h>
-#include <RenderDll/Common/Shaders/CShader.h>
-#include <RenderDll/Common/RenderMesh.h>
-#include <RenderDll/Common/RenderPipeline.h>
-#include <RenderDll/Common/RenderThread.h>
-
-#include <RenderDll/Common/Renderer.h>
-
-#include <RenderDll/Common/Textures/Texture.h>
-#include <RenderDll/Common/Shaders/Parser.h>
-
-#include <RenderDll/Common/FrameProfiler.h>
-#include <RenderDll/Common/Shadow_Renderer.h>
-#include <RenderDll/Common/DeferredRenderUtils.h>
-#include <RenderDll/Common/ShadowUtils.h>
-#include <RenderDll/Common/WaterUtils.h>
-
-#include <RenderDll/Common/OcclQuery.h>
-
-#include <RenderDll/Common/PostProcess/PostProcess.h>
-
-// All handled render elements (except common ones included in "RendElement.h")
-#include <RenderDll/Common/RendElements/CREBeam.h>
-#include <RenderDll/Common/RendElements/CREClientPoly.h>
-#include <RenderDll/Common/RendElements/CRELensOptics.h>
-#include <RenderDll/Common/RendElements/CREHDRProcess.h>
-#include <RenderDll/Common/RendElements/CRECloud.h>
-#include <RenderDll/Common/RendElements/CREDeferredShading.h>
-#include <RenderDll/Common/RendElements/CREMeshImpl.h>
-
-#if !defined(NULL_RENDERER)
-#include <RenderDll/XRenderD3D9/DeviceManager/ConstantBufferCache.h>
-#include <RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12.h>
-#endif
-
-#include <CryCommon/FrameProfiler.h>
-#include <AzCore/Debug/EventTrace.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define STDAFX_H_SECTION_1 1
-#define STDAFX_H_SECTION_2 2
-#define STDAFX_H_SECTION_3 3
-#endif
-
-/*-----------------------------------------------------------------------------
-    Vector transformations.
------------------------------------------------------------------------------*/
-
-_inline void TransformVector(Vec3& out, const Vec3& in, const Matrix44A& m)
-{
-    out.x = in.x * m(0, 0) + in.y * m(1, 0) + in.z * m(2, 0);
-    out.y = in.x * m(0, 1) + in.y * m(1, 1) + in.z * m(2, 1);
-    out.z = in.x * m(0, 2) + in.y * m(1, 2) + in.z * m(2, 2);
-}
-
-_inline void TransformPosition(Vec3& out, const Vec3& in, const Matrix44A& m)
-{
-    TransformVector (out, in, m);
-    out += m.GetRow(3);
-}
-
-
-inline Plane TransformPlaneByUsingAdjointT(const Matrix44A& M, const Matrix44A& TA, const Plane plSrc)
-{
-    Vec3 newNorm;
-    TransformVector (newNorm, plSrc.n, TA);
-    newNorm.Normalize();
-
-    if (M.Determinant() < 0.f)
-    {
-        newNorm *= -1;
-    }
-
-    Plane plane;
-    Vec3 p;
-    TransformPosition (p, plSrc.n * plSrc.d, M);
-    plane.Set(newNorm, p | newNorm);
-
-    return plane;
-}
-
-inline Matrix44 TransposeAdjoint(const Matrix44A& M)
-{
-    Matrix44 ta;
-
-    ta(0, 0) = M(1, 1) * M(2, 2) - M(2, 1) * M(1, 2);
-    ta(1, 0) = M(2, 1) * M(0, 2) - M(0, 1) * M(2, 2);
-    ta(2, 0) = M(0, 1) * M(1, 2) - M(1, 1) * M(0, 2);
-
-    ta(0, 1) = M(1, 2) * M(2, 0) - M(2, 2) * M(1, 0);
-    ta(1, 1) = M(2, 2) * M(0, 0) - M(0, 2) * M(2, 0);
-    ta(2, 1) = M(0, 2) * M(1, 0) - M(1, 2) * M(0, 0);
-
-    ta(0, 2) = M(1, 0) * M(2, 1) - M(2, 0) * M(1, 1);
-    ta(1, 2) = M(2, 0) * M(0, 1) - M(0, 0) * M(2, 1);
-    ta(2, 2) = M(0, 0) * M(1, 1) - M(1, 0) * M(0, 1);
-
-    ta(0, 3) = 0.f;
-    ta(1, 3) = 0.f;
-    ta(2, 3) = 0.f;
-
-
-    return ta;
-}
-
-inline Plane TransformPlane(const Matrix44A& M, const Plane& plSrc)
-{
-    Matrix44 tmpTA = TransposeAdjoint(M);
-    return TransformPlaneByUsingAdjointT(M, tmpTA, plSrc);
-}
-
-// Homogeneous plane transform.
-inline Plane TransformPlane2(const Matrix34A& m, const Plane& src)
-{
-    Plane plDst;
-
-    float v0 = src.n.x, v1 = src.n.y, v2 = src.n.z, v3 = src.d;
-    plDst.n.x = v0 * m(0, 0) + v1 * m(1, 0) + v2 * m(2, 0);
-    plDst.n.y = v0 * m(0, 1) + v1 * m(1, 1) + v2 * m(2, 1);
-    plDst.n.z = v0 * m(0, 2) + v1 * m(1, 2) + v2 * m(2, 2);
-
-    plDst.d = v0 * m(0, 3) + v1 * m(1, 3) + v2 * m(2, 3) + v3;
-
-    return plDst;
-}
-
-// Homogeneous plane transform.
-inline Plane TransformPlane2(const Matrix44A& m, const Plane& src)
-{
-    Plane plDst;
-
-    float v0 = src.n.x, v1 = src.n.y, v2 = src.n.z, v3 = src.d;
-    plDst.n.x = v0 * m(0, 0) + v1 * m(0, 1) + v2 * m(0, 2) + v3 * m(0, 3);
-    plDst.n.y = v0 * m(1, 0) + v1 * m(1, 1) + v2 * m(1, 2) + v3 * m(1, 3);
-    plDst.n.z = v0 * m(2, 0) + v1 * m(2, 1) + v2 * m(2, 2) + v3 * m(2, 3);
-
-    plDst.d = v0 * m(3, 0) + v1 * m(3, 1) + v2 * m(3, 2) + v3 * m(3, 3);
-
-    return plDst;
-}
-inline Plane TransformPlane2_NoTrans(const Matrix44A& m, const Plane& src)
-{
-    Plane plDst;
-    TransformVector(plDst.n, src.n, m);
-    plDst.d = src.d;
-
-    return plDst;
-}
-
-inline Plane TransformPlane2Transposed(const Matrix44A& m, const Plane& src)
-{
-    Plane plDst;
-
-    float v0 = src.n.x, v1 = src.n.y, v2 = src.n.z, v3 = src.d;
-    plDst.n.x = v0 * m(0, 0) + v1 * m(1, 0) + v2 * m(2, 0) + v3 * m(3, 0);
-    plDst.n.y = v0 * m(0, 1) + v1 * m(1, 1) + v2 * m(2, 1) + v3 * m(3, 1);
-    plDst.n.z = v0 * m(0, 2) + v1 * m(2, 1) + v2 * m(2, 2) + v3 * m(3, 2);
-
-    plDst.d   = v0 * m(0, 3) + v1 * m(1, 3) + v2 * m(2, 3) + v3 * m(3, 3);
-
-    return plDst;
-}
-
-//===============================================================================================
-
-#define MAX_PATH_LENGTH 512
-
-#if defined(LINUX) ||  defined(APPLE)
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION STDAFX_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(RenderDll_precompiled_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else   //than it does already exist
-inline int vsnprintf(char* buf, int size, const char* format, va_list& args)
-{
-    int res = azvsnprintf(buf, size, format, args);
-    assert(res >= 0 && res < size); // just to know if there was problems in past
-    buf[size - 1] = 0;
-    return res;
-}
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION STDAFX_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(RenderDll_precompiled_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else   //than it does already exist
-inline int snprintf(char* buf, int size, const char* format, ...)
-{
-    va_list arglist;
-    va_start(arglist, format);
-    int res = azvsnprintf(buf, size, format, arglist);
-    va_end(arglist);
-    return res;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Report warning to validator.
-//////////////////////////////////////////////////////////////////////////
-inline void Warning(const char* format, ...) PRINTF_PARAMS(1, 2);
-inline void Warning(const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    if (iSystem)
-    {
-        iSystem->WarningV(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, 0, NULL, format, args);
-    }
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Report warning to validator.
-//////////////////////////////////////////////////////////////////////////
-inline void LogWarning(const char* format, ...) PRINTF_PARAMS(1, 2);
-inline void LogWarning(const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    if (iSystem)
-    {
-        iSystem->WarningV(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, 0, NULL, format, args);
-    }
-    va_end(args);
-}
-
-inline void LogWarningEngineOnly(const char* format, ...) PRINTF_PARAMS(1, 2);
-inline void LogWarningEngineOnly(const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    if (iSystem)
-    {
-        iSystem->WarningV(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, VALIDATOR_FLAG_IGNORE_IN_EDITOR, NULL, format, args);
-    }
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Report warning to validator.
-//////////////////////////////////////////////////////////////////////////
-inline void FileWarning(const char* filename, const char* format, ...) PRINTF_PARAMS(2, 3);
-inline void FileWarning(const char* filename, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    if (iSystem)
-    {
-        iSystem->WarningV(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, VALIDATOR_FLAG_FILE, filename, format, args);
-    }
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Report warning to validator.
-//////////////////////////////////////////////////////////////////////////
-inline void TextureWarning(const char* filename, const char* format, ...) PRINTF_PARAMS(2, 3);
-inline void TextureWarning(const char* filename, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    if (iSystem)
-    {
-        iSystem->WarningV(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, (VALIDATOR_FLAG_FILE | VALIDATOR_FLAG_TEXTURE), filename, format, args);
-    }
-    va_end(args);
-}
-
-inline void TextureError(const char* filename, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    if (iSystem)
-    {
-        iSystem->WarningV(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, (VALIDATOR_FLAG_FILE | VALIDATOR_FLAG_TEXTURE), filename, format, args);
-    }
-    va_end(args);
-}
-
-_inline void _SetVar(const char* szVarName, int nVal)
-{
-    ICVar* var = iConsole->GetCVar(szVarName);
-    if (var)
-    {
-        var->Set(nVal);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-// Get the sub-string starting at the last . in the string, or NULL if the string contains no dot
-// Note: The returned pointer refers to a location inside the provided string, no allocation is performed
-const char* fpGetExtension (const char* in);
-
-// Remove extension from string, including the .
-// If the string has no extension, the whole string will be copied into the buffer
-// Note: The out buffer must have space to store a copy of the in-string and a null-terminator
-void fpStripExtension (const char* in, char* out, size_t bytes);
-template<size_t bytes>
-void fpStripExtension (const char* in, char (&out)[bytes]) { fpStripExtension(in, out, bytes); }
-
-// Adds an extension to the path, if an extension is already present the function does nothing
-// The extension should include the .
-// Note: The path buffer must have enough unused space to store a copy of the extension string
-void fpAddExtension (char* path, const char* extension, size_t bytes);
-template<size_t bytes>
-void fpAddExtension (char (&path)[bytes], const char* extension) { fpAddExtension(path, extension, bytes); }
-
-// Converts DOS slashes to UNIX slashes
-// Note: The dst buffer must have space to store a copy of src and a null-terminator
-void fpConvertDOSToUnixName (char* dst, const char* src, size_t bytes);
-template<size_t bytes>
-void fpConvertDOSToUnixName (char (&dst)[bytes], const char* src) { fpConvertDOSToUnixName(dst, src, bytes); }
-
-// Converts UNIX slashes to DOS slashes
-// Note: the dst buffer must have space to store a copy of src and a null-terminator
-void fpConvertUnixToDosName (char* dst, const char* src, size_t bytes);
-template<size_t bytes>
-void fpConvertUnixToDosName (char (&dst)[bytes], const char* src) { fpConvertUnixToDosName(dst, src, bytes); }
-
-// Combines the path and name strings, inserting a UNIX slash as required, and stores the result into the dst buffer
-// path may be NULL, in which case name will be copied into the dst buffer, and the UNIX slash is NOT inserted
-// Note: the dst buffer must have space to store: a copy of name, a copy of path (if not null), a UNIX slash (if path doesn't end with one) and a null-terminator
-void fpUsePath (const char* name, const char* path, char* dst, size_t bytes);
-template<size_t bytes>
-void fpUsePath (const char* name, const char* path, char (&dst)[bytes]) { fpUsePath(name, path, dst, bytes); }
-
-//=========================================================================================
-//
-// Normal timing.
-//
-#define ticks(Timer)   {Timer -= CryGetTicks(); }
-#define unticks(Timer) {Timer += CryGetTicks() + 34; }
-
-//=============================================================================
-
-// the int 3 call for 32-bit version for .l-generated files.
-#ifdef WIN64
-#define LEX_DBG_BREAK
-#else
-#define LEX_DBG_BREAK DEBUG_BREAK
-#endif
-
-#include <RenderDll/Common/Defs.h>
-
-#define FUNCTION_PROFILER_RENDERER FUNCTION_PROFILER_FAST(iSystem, PROFILE_RENDERER, g_bProfilerEnabled)
-
-#define SCOPED_RENDERER_ALLOCATION_NAME_HINT(str)
-
-#define SHADER_ASYNC_COMPILATION
-
-#if !defined(_RELEASE)
-//# define DETAILED_PROFILING_MARKERS
-#endif
-#if defined(DETAILED_PROFILING_MARKERS)
-# define DETAILED_PROFILE_MARKER(x) DETAILED_PROFILE_MARKER((x))
-#else
-# define DETAILED_PROFILE_MARKER(x) (void)0
-#endif
-
-#define RAIN_OCC_MAP_SIZE           256
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION STDAFX_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(RenderDll_precompiled_h)
-#endif
-
-#if defined(WIN32)
-
-#include <float.h>
-
-struct ScopedSetFloatExceptionMask
-{
-    ScopedSetFloatExceptionMask(unsigned int disable = _EM_INEXACT | _EM_UNDERFLOW | _EM_OVERFLOW | _EM_DENORMAL | _EM_INVALID)
-    {
-        _clearfp();
-        _controlfp_s(&oldMask, 0, 0);
-        unsigned temp;
-        _controlfp_s(&temp, disable, _MCW_EM);
-    }
-    ~ScopedSetFloatExceptionMask()
-    {
-        _clearfp();
-        unsigned temp;
-        _controlfp_s(&temp, oldMask, _MCW_EM);
-    }
-    unsigned oldMask;
-};
-
-#define SCOPED_ENABLE_FLOAT_EXCEPTIONS ScopedSetFloatExceptionMask scopedSetFloatExceptionMask(0)
-#define SCOPED_DISABLE_FLOAT_EXCEPTIONS ScopedSetFloatExceptionMask scopedSetFloatExceptionMask
-
-#endif  // defined(_MSC_VER)
-#include <RenderDll/XRenderD3D9/DeviceManager/DeviceManagerInline.h>
-#endif //__cplusplus
-
-/*-----------------------------------------------------------------------------
-    The End.
------------------------------------------------------------------------------*/
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/CMakeLists.txt b/Code/CryEngine/RenderDll/XRenderD3D9/CMakeLists.txt
deleted file mode 100644
index d6005617b3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/CMakeLists.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-add_subdirectory(DXGL)
-add_subdirectory(DXMETAL)
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-
-set(pal_tool_dirs "")
-ly_get_pal_tool_dirs(pal_tool_roots ${CMAKE_CURRENT_LIST_DIR}/Platform)
-foreach(include_path ${pal_tool_roots})
-    list(APPEND pal_tool_dirs ${include_path}/../Common)
-endforeach()
-
-
-include(${pal_dir}/CryRender_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-ly_add_target(
-    NAME CryRender.Headers HEADERONLY
-    NAMESPACE Legacy
-    FILES_CMAKE
-        core_renderer_header_files.cmake
-    PLATFORM_INCLUDE_FILES
-        ${pal_dir}/core_renderer_headers_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        INTERFACE
-            ..
-            .
-            ${pal_dir}
-)
-
-################################################################################
-# DX11
-################################################################################
-if(CRYRENDER_TRAIT_BUILD_DX11_SUPPORTED AND NOT LY_MONOLITHIC_GAME)  # only Atom is supported in monolithic
-    ly_add_target(
-        NAME CryRenderD3D11.Static STATIC
-        NAMESPACE Legacy
-        FILES_CMAKE
-            core_renderer_files.cmake
-            ${pal_dir}/core_renderer_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-            d3d11_files.cmake
-            ${pal_dir}/d3d11_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/core_renderer_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-            ${pal_dir}/d3d11_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        COMPILE_DEFINITIONS
-            PUBLIC
-                DIRECT3D10
-                #XRENDERD3D10_EXPORTS
-                DO_RENDERSTATS
-                _RENDERER
-                #EXCLUDE_CINEMIZER_SDK
-        INCLUDE_DIRECTORIES
-            PUBLIC
-                .
-                ../Common
-                ..
-                ${pal_dir}
-            PRIVATE
-                ${pal_tool_dirs}
-        BUILD_DEPENDENCIES
-            PUBLIC
-                Legacy::CryCommon
-                Legacy::CryCommon.EngineSettings.Static
-    )
-    ly_add_source_properties(
-        SOURCES
-            ../Common/Shaders/PoundPoundParser.cpp
-            ../Common/Renderer.cpp
-            ../Common/Shaders/ParserBin.cpp
-            ../Common/Shaders/RemoteCompiler.cpp
-            ../Common/Shaders/ShaderCache.cpp
-            ../Common/Textures/Image/DDSImage.cpp
-        PROPERTY COMPILE_DEFINITIONS 
-        VALUES ${LY_PAL_TOOLS_DEFINES}
-    )
-
-    ly_add_target(
-        NAME CryRenderD3D11 ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            d3d11_shared_files.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/d3d11_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        BUILD_DEPENDENCIES
-            PRIVATE
-                Legacy::CryRenderD3D11.Static
-    )
-
-    if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-        ly_add_target(
-            NAME CryRenderD3D11.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-            NAMESPACE Legacy
-            FILES_CMAKE
-                d3d11_test_files.cmake
-            PLATFORM_INCLUDE_FILES
-                ${pal_dir}/d3d11_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-            BUILD_DEPENDENCIES
-                PRIVATE
-                    AZ::AzTest
-                    Legacy::CryRenderD3D11.Static
-        )
-        ly_add_googletest(
-            NAME Legacy::CryRenderD3D11.Tests
-        )
-    endif()
-endif()
-
-################################################################################
-# DX12
-################################################################################
-if(CRYRENDER_TRAIT_BUILD_DX12_SUPPORTED AND NOT LY_MONOLITHIC_GAME) # only Atom is supported in monolithic
-
-    ly_add_target(
-        NAME CryRenderD3D12.Static STATIC
-        NAMESPACE Legacy
-        FILES_CMAKE
-            core_renderer_files.cmake
-            ${pal_dir}/core_renderer_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-            d3d12_files.cmake
-            ${pal_dir}/d3d12_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/core_renderer_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-            ${pal_dir}/d3d12_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        INCLUDE_DIRECTORIES
-            PUBLIC
-                .
-                ../Common
-                ..
-                DX12/Includes
-                ${pal_dir}
-            PRIVATE
-                ${pal_tool_dirs}
-        COMPILE_DEFINITIONS
-            PUBLIC
-                DIRECT3D10
-                CRY_USE_DX12
-                #XRENDERD3D10_EXPORTS
-                DO_RENDERSTATS
-                _RENDERER
-                #EXCLUDE_CINEMIZER_SDK
-        BUILD_DEPENDENCIES
-            PUBLIC
-                Legacy::CryCommon
-    )
-    ly_add_source_properties(
-        SOURCES
-            ../Common/Shaders/RemoteCompiler.cpp
-            ../Common/Textures/Image/DDSImage.cpp
-        PROPERTY COMPILE_DEFINITIONS 
-        VALUES ${LY_PAL_TOOLS_DEFINES}
-    )
-
-    ly_add_target(
-        NAME CryRenderD3D12 ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            d3d12_shared_files.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/d3d12_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        BUILD_DEPENDENCIES
-            PRIVATE
-                Legacy::CryRenderD3D12.Static
-    )
-
-    if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-        ly_add_target(
-            NAME CryRenderD3D12.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-            NAMESPACE Legacy
-            FILES_CMAKE
-                d3d12_test_files.cmake
-            PLATFORM_INCLUDE_FILES
-                ${pal_dir}/d3d12_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-            BUILD_DEPENDENCIES
-                PRIVATE
-                    AZ::AzTest
-                    Legacy::CryRenderD3D12.Static
-        )
-        # If the OS doesn't support DX12 runtime, a CTest test run will not be added as the shared library would fail to load
-        if(CRYRENDER_TRAIT_RUNTIME_DX12_SUPPORTED)
-                ly_add_googletest(
-                    NAME Legacy::CryRenderD3D12.Tests
-                )
-        endif()
-    endif()
-
-endif()
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/CRELensOpticsD3D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/CRELensOpticsD3D.cpp
deleted file mode 100644
index eb4b394ca2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/CRELensOpticsD3D.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "../Common/RendElements/OpticsElement.h"
-#include "../Common/RendElements/RootOpticsElement.h"
-#include "../Common/RendElements/FlareSoftOcclusionQuery.h"
-#include "../Common/RendElements/OpticsPredef.hpp"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-
-static CSoftOcclusionManager g_SoftOcclusionManager;
-
-CRELensOptics::CRELensOptics(void)
-{
-    mfSetType(eDATA_LensOptics);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-
-CRELensOptics::~CRELensOptics(void)
-{
-}
-
-bool CRELensOptics::mfCompile([[maybe_unused]] CParserBin& Parser, [[maybe_unused]] SParserFrame& Frame)
-{
-    return true;
-}
-
-void CRELensOptics::mfPrepare(bool bCheckOverflow)
-{
-    if (bCheckOverflow)
-    {
-        gRenDev->FX_CheckOverflow(0, 0, this);
-    }
-
-    gRenDev->m_RP.m_pRE = this;
-    gRenDev->m_RP.m_RendNumIndices = 0;
-    gRenDev->m_RP.m_RendNumVerts = 0;
-}
-
-void CRELensOptics::ProcessGlobalAction()
-{
-    PROFILE_LABEL_SCOPE("Soft Occlusion Query");
-
-    CFlareSoftOcclusionQuery::InitGlobalResources();
-    CFlareSoftOcclusionQuery::BatchReadResults(); // copy to system memory previous frame
-
-    CShader* pShader = CShaderMan::s_ShaderSoftOcclusionQuery;
-    static CCryNameTSCRC sTechName("Main");
-
-    uint32 nPass = 0;
-    pShader->FXSetTechnique(sTechName);
-    pShader->FXBegin(&nPass, FEF_DONTSETTEXTURES);
-
-    g_SoftOcclusionManager.ComputeVisibility();
-    g_SoftOcclusionManager.GatherOcclusions();
-
-    pShader->FXEnd();
-
-    CFlareSoftOcclusionQuery::ReadbackSoftOcclQuery(); // update current frame to staging buffer
-    for (int i = 0, iSize(g_SoftOcclusionManager.GetSize()); i < iSize; ++i)
-    {
-        CFlareSoftOcclusionQuery* pSoftOcclusion = g_SoftOcclusionManager.GetSoftOcclusionQuery(i);
-        if (pSoftOcclusion == NULL)
-        {
-            continue;
-        }
-        pSoftOcclusion->UpdateCachedResults();
-    }
-}
-
-static int prevFrameID = 0;
-
-bool CRELensOptics::mfDraw(CShader* pShader, [[maybe_unused]] SShaderPass* pass)
-{
-    if (!CRenderer::CV_r_flares || !CRenderer::CV_r_PostProcess)
-    {
-        return false;
-    }
-
-    CD3D9Renderer* pRD = gcpRendD3D;
-    CRenderObject* pObj = pRD->m_RP.m_pCurObject;
-    SRenderObjData* pOD = pObj->GetObjData();
-    const CameraViewParameters* cam = &pRD->GetViewParameters();
-
-    // Basically LensOptics should be rendered in only FB_TRANSPARENT phase currently so FB_GENERAL is ignored until it's needed.
-    if (pRD->m_RP.m_nBatchFilter == FB_GENERAL)
-    {
-        return false;
-    }
-
-    SRenderLight* pLight = pOD ? pRD->EF_GetDeferredLightByID(pOD->m_nLightID) : NULL;
-    RootOpticsElement* pRootElem = pLight ? (RootOpticsElement*)pLight->GetLensOpticsElement() : NULL;
-
-    if (!pRootElem || pRootElem->GetType() != eFT_Root)
-    {
-        return false;
-    }
-
-    CFlareSoftOcclusionQuery* pOcc = static_cast<CFlareSoftOcclusionQuery*>(pLight->m_pSoftOccQuery);
-    if (!pOcc)
-    {
-        return false;
-    }
-
-#if !defined(_RELEASE)
-    PROFILE_LABEL_SCOPE(pLight->m_sName);
-#endif
-
-    pRootElem->SetOcclusionQuery(pOcc);
-    pOcc->SetOccPlaneSizeRatio(pRootElem->GetOccSize());
-
-    RootOpticsElement::SFlareLight flareLight;
-    if (pLight->m_Flags & DLF_ATTACH_TO_SUN)
-    {
-        const float sunHeight = 20000.0f;
-        Vec3 sunDirNorm = gEnv->p3DEngine->GetSunDir();
-        sunDirNorm.Normalize();
-
-        flareLight.m_vPos = cam->vOrigin + sunDirNorm * sunHeight;
-        flareLight.m_cLdrClr = gEnv->p3DEngine->GetSunAnimColor();
-        flareLight.m_fRadius = sunHeight;
-        flareLight.m_bAttachToSun = true;
-        pLight->SetPosition(flareLight.m_vPos);
-    }
-    else
-    {
-        flareLight.m_vPos = pObj->GetTranslation();
-        ColorF& c = pLight->m_Color;
-        flareLight.m_cLdrClr.Set(c.r, c.g, c.b);
-        flareLight.m_fRadius = pLight->m_fRadius;
-        flareLight.m_bAttachToSun = false;
-    }
-
-    ColorF cNorm;
-    flareLight.m_fClrMultiplier = flareLight.m_cLdrClr.NormalizeCol(cNorm);
-    flareLight.m_cLdrClr = cNorm;
-
-    flareLight.m_opticsParams = pLight->GetOpticsParams();
-
-    flareLight.m_fViewAngleFalloff = 1.0;
-    if (pLight->m_LensOpticsFrustumAngle != 0)
-    {
-        Vec3 vDirLight2Camera = (cam->vOrigin - flareLight.m_vPos).GetNormalizedFast();
-        float viewCos = pLight->m_ProjMatrix.GetColumn(0).Dot(vDirLight2Camera) * 0.5f + 0.5f;
-        if (pLight->m_LensOpticsFrustumAngle < 255)
-        {
-            int angle = (int)((float)pLight->m_LensOpticsFrustumAngle * (360.0f / 255.0f));
-            float radAngle = DEG2RAD(angle);
-            float halfFrustumCos = cos_tpl(radAngle * 0.5f) * 0.5f + 0.5f;
-            float quarterFrustumCos = cos_tpl(radAngle * 0.25f) * 0.5f + 0.5f;
-            if (viewCos < quarterFrustumCos)
-            {
-                flareLight.m_fViewAngleFalloff = max(1.0f - (float)((quarterFrustumCos - viewCos) / (quarterFrustumCos - halfFrustumCos)), 0.0f);
-            }
-            else
-            {
-                flareLight.m_fViewAngleFalloff = 1;
-            }
-        }
-    }
-    else
-    {
-        flareLight.m_fViewAngleFalloff = 0.0;
-    }
-
-    int curFID = gRenDev->GetFrameID(false);
-    if (curFID != prevFrameID)
-    {
-        if (g_SoftOcclusionManager.Begin())
-        {
-            ProcessGlobalAction();
-            g_SoftOcclusionManager.End();
-        }
-        prevFrameID = curFID;
-    }
-
-    if (pRootElem->ProcessAll(pShader, flareLight))
-    {
-        g_SoftOcclusionManager.AddSoftOcclusionQuery(pOcc, pLight->GetPosition());
-    }
-
-    pRootElem->SetOcclusionQuery(NULL);
-
-    return true;
-}
-
-void CRELensOptics::ClearResources()
-{
-    g_SoftOcclusionManager.ClearResources();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderD3D11.rc b/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderD3D11.rc
deleted file mode 100644
index 6f4202b3ea..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderD3D11.rc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000904b0"
-        BEGIN
-            VALUE "CompanyName", "Amazon.com, Inc."
-            VALUE "FileVersion", "1, 0, 0, 1"
-			VALUE "FileDescription", "CryRenderD3D11"
-            VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
-            VALUE "ProductName", "Open 3D Engine"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x9, 1200
-    END
-END
-
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.props b/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.props
deleted file mode 100644
index 19ec66e8c3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SDKFolder)\glew\include;$(ProjectDir)..\..\..\Tools\HLSLCrossCompiler\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>opengl32.lib;libHLSLcc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SDKFolder)GLEW\lib\win$(PlatformArchitecture);$(ProjectDir)..\..\..\Tools\HLSLCrossCompiler\lib\win$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.rc b/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.rc
deleted file mode 100644
index 9cbf98627e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.rc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000904b0"
-        BEGIN
-            VALUE "CompanyName", "Amazon.com, Inc."
-            VALUE "FileVersion", "1, 0, 0, 1"
-			VALUE "FileDescription", "CryRenderGL"
-            VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
-            VALUE "ProductName", "Open 3D Engine"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x9, 1200
-    END
-END
-
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderMETAL.props b/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderMETAL.props
deleted file mode 100644
index 8e4213cec3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderMETAL.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>CRY_USE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\SDKs\glew\include;$(SolutionDir)..\Tools\HLSLCrossCompilerMETAL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>opengl32.lib;glew32s.lib;libHLSLcc.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\SDKs\GLEW\lib\win$(PlatformArchitecture);$(SolutionDir)..\Tools\HLSLCrossCompilerMETAL\lib\win$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderMETAL.rc b/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderMETAL.rc
deleted file mode 100644
index 69ddbaf3a3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/CryRenderMETAL.rc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000904b0"
-        BEGIN
-            VALUE "CompanyName", "Crytek GmbH"
-            VALUE "FileVersion", "1, 0, 0, 1"
-			VALUE "FileDescription", "CryRenderGL"
-            VALUE "LegalCopyright", "(c) 2014 Crytek GmbH"
-            VALUE "ProductName", "CryENGINE SDK"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x9, 1200
-    END
-END
-
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DAmbientOcclusion.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DAmbientOcclusion.cpp
deleted file mode 100644
index 8e1191ed9b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DAmbientOcclusion.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : implementation of ambient occlusion related features.
-
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "../Common/Textures/TextureHelpers.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DAMBIENTOCCLUSION_CPP_SECTION_1 1
-#define D3DAMBIENTOCCLUSION_CPP_SECTION_2 2
-#endif
-
-// TODO: Unify with other deferred primitive implementation
-const t_arrDeferredMeshVertBuff& CD3D9Renderer::GetDeferredUnitBoxVertexBuffer() const
-{
-    return m_arrDeferredVerts;
-}
-
-const t_arrDeferredMeshIndBuff& CD3D9Renderer::GetDeferredUnitBoxIndexBuffer() const
-{
-    return m_arrDeferredInds;
-}
-
-void CD3D9Renderer::CreateDeferredUnitBox(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff)
-{
-    SVF_P3F_C4B_T2F vert;
-    Vec3 vNDC;
-
-    indBuff.clear();
-    indBuff.reserve(36);
-
-    vertBuff.clear();
-    vertBuff.reserve(8);
-
-    //Create frustum
-    for (int i = 0; i < 8; i++)
-    {
-        //Generate screen space frustum (CCW faces)
-        vNDC = Vec3((i == 0 || i == 1 || i == 4 || i == 5) ? 0.0f : 1.0f,
-                (i == 0 || i == 3 || i == 4 || i == 7) ? 0.0f : 1.0f,
-                (i == 0 || i == 1 || i == 2 || i == 3) ? 0.0f : 1.0f
-                );
-        vert.xyz = vNDC;
-        vert.st = Vec2(0.0f, 0.0f);
-        vert.color.dcolor = -1;
-        vertBuff.push_back(vert);
-    }
-
-    //CCW faces
-    uint16 nFaces[6][4] = {
-        {0, 1, 2, 3},
-        {4, 7, 6, 5},
-        {0, 3, 7, 4},
-        {1, 5, 6, 2},
-        {0, 4, 5, 1},
-        {3, 2, 6, 7}
-    };
-
-    //init indices for triangles drawing
-    for (int i = 0; i < 6; i++)
-    {
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][1]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-
-        indBuff.push_back((uint16)  nFaces[i][0]);
-        indBuff.push_back((uint16)  nFaces[i][2]);
-        indBuff.push_back((uint16)  nFaces[i][3]);
-    }
-}
-
-void CD3D9Renderer::SetDepthBoundTest(float fMin, float fMax, bool bEnable)
-{
-    if (!m_bDeviceSupports_NVDBT)
-    {
-        return;
-    }
-
-    m_bDepthBoundsEnabled = bEnable;
-    if (bEnable)
-    {
-        m_fDepthBoundsMin = fMin;
-        m_fDepthBoundsMax = fMax;
-#if defined(OPENGL) && !DXGL_FULL_EMULATION
-        DXGLSetDepthBoundsTest(true, fMin, fMax);
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DAMBIENTOCCLUSION_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DAmbientOcclusion_cpp)
-#endif
-    }
-    else // disable depth bound test
-    {
-        m_fDepthBoundsMin = 0;
-        m_fDepthBoundsMax = 1.0f;
-#if defined(OPENGL) && !DXGL_FULL_EMULATION
-        DXGLSetDepthBoundsTest(false, 0.0f, 1.0f);
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DAMBIENTOCCLUSION_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DAmbientOcclusion_cpp)
-#endif
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DColorGradingController.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DColorGradingController.cpp
deleted file mode 100644
index 9017952b64..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DColorGradingController.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "D3DColorGradingController.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <StringUtils.h>
-
-
-const int COLORCHART_SIZE = 16;
-const int COLORCHART_ALIGNED_SIZE = 16;
-const int COLORCHART_WIDTH = COLORCHART_SIZE * COLORCHART_SIZE;
-const int COLORCHART_RENDERTARGET_WIDTH = COLORCHART_SIZE * COLORCHART_ALIGNED_SIZE;
-const int COLORCHART_HEIGHT = COLORCHART_SIZE;
-const uint32 COLORCHART_TEXFLAGS = FT_NOMIPS |  FT_DONT_STREAM | FT_STATE_CLAMP;
-const char* COLORCHART_DEF_TEX = "EngineAssets/Textures/default_cch.dds";
-
-const ETEX_Format COLORCHART_FORMAT = eTF_R8G8B8A8;
-
-CColorGradingControllerD3D::CColorGradingControllerD3D(CD3D9Renderer* pRenderer)
-    : m_layers()
-    , m_pRenderer(pRenderer)
-    , m_pSlicesVB(0)
-    , m_pChartIdentity(0)
-    , m_pChartStatic(0)
-    , m_pChartToUse(0)
-{
-    assert(m_pRenderer);
-    m_pMergeLayers[0] = 0;
-    m_pMergeLayers[1] = 0;
-
-    m_vecSlicesData.reserve(6 * COLORCHART_SIZE);
-}
-
-
-CColorGradingControllerD3D::~CColorGradingControllerD3D()
-{
-    ReleaseTextures();
-}
-
-void CColorGradingControllerD3D::ReleaseTextures()
-{
-    SAFE_RELEASE(m_pChartIdentity);
-    SAFE_RELEASE(m_pChartStatic);
-    SAFE_RELEASE(m_pMergeLayers[0]);
-    SAFE_RELEASE(m_pMergeLayers[1]);
-    SAFE_DELETE(m_pSlicesVB);
-    m_pChartToUse = 0;
-}
-
-void CColorGradingControllerD3D::FreeMemory()
-{
-    stl::reconstruct(m_layers);
-}
-
-bool CColorGradingControllerD3D::ValidateColorChart(const CTexture* pChart) const
-{
-    if (!CTexture::IsTextureExist(pChart))
-    {
-        return false;
-    }
-
-    if (pChart->IsNoTexture())
-    {
-        return false;
-    }
-
-    if (pChart->GetWidth() != COLORCHART_WIDTH || pChart->GetHeight() != COLORCHART_HEIGHT)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-
-CTexture* CColorGradingControllerD3D::LoadColorChartInt(const char* pChartFilePath) const
-{
-    if (!pChartFilePath || !pChartFilePath[0])
-    {
-        return 0;
-    }
-
-    // color charts don't currently support default fallbacks, so we'll force it to sync compile here if possible.
-    if (!gEnv->pCryPak->IsFileExist(pChartFilePath))
-    {
-        EBUS_EVENT(AzFramework::AssetSystemRequestBus, CompileAssetSync, pChartFilePath);
-    }
-
-    CTexture* pChart = (CTexture*) m_pRenderer->EF_LoadTexture(pChartFilePath, COLORCHART_TEXFLAGS);
-    if (!ValidateColorChart(pChart))
-    {
-        SAFE_RELEASE(pChart);
-        return 0;
-    }
-    return pChart;
-}
-
-
-int CColorGradingControllerD3D::LoadColorChart(const char* pChartFilePath) const
-{
-    CTexture* pChart = LoadColorChartInt(pChartFilePath);
-    return pChart ? pChart->GetID() : -1;
-}
-
-
-int CColorGradingControllerD3D::LoadDefaultColorChart() const
-{
-    CTexture* pChartIdentity = LoadColorChartInt(COLORCHART_DEF_TEX);
-    return pChartIdentity ? pChartIdentity->GetID() : -1;
-}
-
-
-void CColorGradingControllerD3D::UnloadColorChart(int texID) const
-{
-    CTexture* pChart = CTexture::GetByID(texID);
-    SAFE_RELEASE(pChart);
-}
-
-
-void CColorGradingControllerD3D::SetLayers(const SColorChartLayer* pLayers, uint32 numLayers)
-{
-    gRenDev->m_pRT->RC_CGCSetLayers(this, pLayers, numLayers);
-}
-
-
-void CColorGradingControllerD3D::RT_SetLayers(const SColorChartLayer* pLayerInfo, uint32 numLayers)
-{
-    m_layers.reserve(numLayers);
-    m_layers.resize(0);
-
-    if (numLayers)
-    {
-        float blendSum = 0;
-        for (size_t i = 0; i < numLayers; ++i)
-        {
-            const SColorChartLayer& l = pLayerInfo[i];
-            if (l.m_texID > 0 && l.m_blendAmount > 0)
-            {
-                const CTexture* pChart = CTexture::GetByID(l.m_texID);
-                if (ValidateColorChart(pChart))
-                {
-                    m_layers.push_back(l);
-                    blendSum += l.m_blendAmount;
-                }
-            }
-        }
-
-        const size_t numActualLayers = m_layers.size();
-        if (numActualLayers)
-        {
-            if (numActualLayers > 1)
-            {
-                float normalizeBlendAmount = (float) (1.0 / (double) blendSum);
-                for (size_t i = 0; i < numActualLayers; ++i)
-                {
-                    m_layers[i].m_blendAmount *= normalizeBlendAmount;
-                }
-            }
-            else
-            {
-                m_layers[0].m_blendAmount = 1;
-            }
-        }
-    }
-}
-
-
-bool CColorGradingControllerD3D::InitResources()
-{
-    if (!m_pChartIdentity)
-    {
-        m_pChartIdentity = LoadColorChartInt(COLORCHART_DEF_TEX);
-        if (!m_pChartIdentity)
-        {
-            static bool bPrint = true;
-            if (bPrint)
-            {
-                iLog->LogError("Failed to initialize Color Grading: Default color chart is missing");
-            }
-            bPrint = false;
-            return false;
-        }
-    }
-
-    if (!m_pMergeLayers[0])
-    {
-        m_pMergeLayers[0] = CTexture::CreateRenderTarget("ColorGradingMergeLayer0", COLORCHART_RENDERTARGET_WIDTH, COLORCHART_HEIGHT, Clr_Empty, eTT_2D, COLORCHART_TEXFLAGS, COLORCHART_FORMAT);
-        if (!CTexture::IsTextureExist(m_pMergeLayers[0]))
-        {
-            return false;
-        }
-    }
-
-    if (!m_pMergeLayers[1])
-    {
-        m_pMergeLayers[1] = CTexture::CreateRenderTarget("ColorGradingMergeLayer1", COLORCHART_RENDERTARGET_WIDTH, COLORCHART_HEIGHT, Clr_Empty, eTT_2D, COLORCHART_TEXFLAGS, COLORCHART_FORMAT);
-        if (!CTexture::IsTextureExist(m_pMergeLayers[1]))
-        {
-            return false;
-        }
-    }
-
-    if (!m_pSlicesVB)
-    {
-        //assert(m_vecSlicesData.empty());
-        m_vecSlicesData.resize(6 * COLORCHART_SIZE);
-
-        const float fQuadSize = (float)COLORCHART_SIZE / COLORCHART_RENDERTARGET_WIDTH;
-        const float fTexCoordSize = 1.f / COLORCHART_SIZE;
-        for (uint32 iQuad = 0; iQuad < COLORCHART_SIZE; ++iQuad)
-        {
-            const float fQuadShift = (float)iQuad / COLORCHART_SIZE;
-            const float fBlue = (float)iQuad / (COLORCHART_SIZE - 1.f);
-
-            m_vecSlicesData[iQuad * 6 + 0].xyz =    Vec3(fQuadShift + fQuadSize,           1.f, 0.f);
-            m_vecSlicesData[iQuad * 6 + 0].st =     Vec2(fQuadShift + fTexCoordSize,   1.f);
-            m_vecSlicesData[iQuad * 6 + 0].color.dcolor = ColorF(1.f, 1.f, fBlue).pack_argb8888();
-            m_vecSlicesData[iQuad * 6 + 1].xyz =    Vec3(fQuadShift + fQuadSize,           0.f, 0.f);
-            m_vecSlicesData[iQuad * 6 + 1].st =     Vec2(fQuadShift + fTexCoordSize,   0.f);
-            m_vecSlicesData[iQuad * 6 + 1].color.dcolor = ColorF(1.f, 0.f, fBlue).pack_argb8888();
-            m_vecSlicesData[iQuad * 6 + 2].xyz =    Vec3(fQuadShift + 0.f,                     1.f, 0.f);
-            m_vecSlicesData[iQuad * 6 + 2].st =     Vec2(fQuadShift + 0.f,                     1.f);
-            m_vecSlicesData[iQuad * 6 + 2].color.dcolor = ColorF(0.f, 1.f, fBlue).pack_argb8888();
-
-            m_vecSlicesData[iQuad * 6 + 3].xyz =    Vec3(fQuadShift + 0.f,                     1.f, 0.f);
-            m_vecSlicesData[iQuad * 6 + 3].st =     Vec2(fQuadShift + 0.f,                     1.f);
-            m_vecSlicesData[iQuad * 6 + 3].color.dcolor = ColorF(0.f, 1.f, fBlue).pack_argb8888();
-            m_vecSlicesData[iQuad * 6 + 4].xyz =    Vec3(fQuadShift + fQuadSize,           0.f, 0.f);
-            m_vecSlicesData[iQuad * 6 + 4].st =     Vec2(fQuadShift + fTexCoordSize,   0.f);
-            m_vecSlicesData[iQuad * 6 + 4].color.dcolor = ColorF(1.f, 0.f, fBlue).pack_argb8888();
-            m_vecSlicesData[iQuad * 6 + 5].xyz =    Vec3(fQuadShift + 0.f,                     0.f, 0.f);
-            m_vecSlicesData[iQuad * 6 + 5].st =     Vec2(fQuadShift + 0.f,                     0.f);
-            m_vecSlicesData[iQuad * 6 + 5].color.dcolor = ColorF(0.f, 0.f, fBlue).pack_argb8888();
-        }
-
-        m_pSlicesVB = new CVertexBuffer(&m_vecSlicesData[0], eVF_P3F_C4B_T2F, 6 * COLORCHART_SIZE);
-    }
-
-    return true;
-}
-
-
-bool CColorGradingControllerD3D::Update(const SColorGradingMergeParams* pMergeParams)
-{
-    m_pChartToUse = 0;
-
-    if (!m_pRenderer->CV_r_colorgrading_charts)
-    {
-        return true;
-    }
-
-    if (m_pChartStatic)
-    {
-        m_pChartToUse = m_pChartStatic;
-        return true;
-    }
-
-    if (!InitResources())
-    {
-        m_pChartToUse = m_pChartIdentity;
-        return m_pChartToUse != 0;
-    }
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    static const int texStatePntID = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    static const int texStateLinID = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-
-    const uint64 sample0    = g_HWSR_MaskBit[HWSR_SAMPLE0];
-    const uint64 sample1    = g_HWSR_MaskBit[HWSR_SAMPLE1];
-    const uint64 sample2    = g_HWSR_MaskBit[HWSR_SAMPLE2];
-    const uint64 sample5    = g_HWSR_MaskBit[HWSR_SAMPLE5];
-
-    // merge layers
-    const size_t numLayers = m_layers.size();
-    if (!numLayers)
-    {
-        m_pChartToUse = m_pChartIdentity;
-    }
-    else
-    {
-        CTexture* pNewMergeResult = m_pMergeLayers[0];
-        m_pRenderer->FX_PushRenderTarget(0, pNewMergeResult, 0);
-
-        int numMergePasses = 0;
-        for (size_t curLayer = 0; curLayer < numLayers; )
-        {
-            size_t mergeLayerIdx[4] = {azlossy_caster(-1), azlossy_caster(-1), azlossy_caster(-1), azlossy_caster(-1)};
-            int numLayersPerPass = 0;
-
-            for (; curLayer < numLayers && numLayersPerPass < 4; ++curLayer)
-            {
-                if (m_layers[curLayer].m_blendAmount > 0.001f)
-                {
-                    mergeLayerIdx[numLayersPerPass++] = curLayer;
-                }
-            }
-
-            if (numLayersPerPass)
-            {
-                const uint64 nResetFlags = ~(sample0 | sample1 | sample2);
-                m_pRenderer->m_RP.m_FlagsShader_RT &= nResetFlags;
-                if ((numLayersPerPass - 1) & 1)
-                {
-                    gRenDev->m_RP.m_FlagsShader_RT |= sample0;
-                }
-                if ((numLayersPerPass - 1) & 2)
-                {
-                    gRenDev->m_RP.m_FlagsShader_RT |= sample1;
-                }
-
-                CShader* pSh = CShaderMan::s_shPostEffectsGame;
-
-                PROFILE_LABEL_SCOPE("MergeColorCharts");
-                static CCryNameTSCRC techName("MergeColorCharts");
-                SD3DPostEffectsUtils::ShBeginPass(pSh, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-                Vec4 layerBlendAmount(0, 0, 0, 0);
-                for (int i = 0; i < numLayersPerPass; ++i)
-                {
-                    const SColorChartLayer& l = m_layers[mergeLayerIdx[i]];
-                    CTexture* pChart = CTexture::GetByID(l.m_texID);
-                    pChart->Apply(i, texStatePntID);
-                    layerBlendAmount[i] = l.m_blendAmount;
-                }
-
-                static CCryNameR semLayerBlendAmount("LayerBlendAmount");
-                SD3DPostEffectsUtils::ShSetParamPS(semLayerBlendAmount, layerBlendAmount);
-
-                m_pRenderer->FX_SetState(GS_NODEPTHTEST | (numMergePasses ? GS_BLSRC_ONE | GS_BLDST_ONE : 0));
-                m_pRenderer->SetCullMode(R_CULL_NONE);
-                gcpRendD3D->DrawPrimitivesInternal(m_pSlicesVB, COLORCHART_SIZE * 6, eptTriangleList);
-
-                SD3DPostEffectsUtils::ShEndPass();
-                ++numMergePasses;
-
-                m_pRenderer->m_RP.m_FlagsShader_RT &= nResetFlags;
-            }
-        }
-
-        m_pChartToUse = numMergePasses ? pNewMergeResult : m_pChartIdentity;
-
-        m_pRenderer->FX_PopRenderTarget(0);
-    }
-
-    // combine merged layers with color grading stuff
-    if (m_pChartToUse && pMergeParams)
-    {
-        PROFILE_LABEL_SCOPE("CombineColorGradingWithColorChart");
-
-        uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-        gRenDev->m_RP.m_FlagsShader_RT = pMergeParams->nFlagsShaderRT;
-        gRenDev->m_RP.m_FlagsShader_RT &= ~(sample1 | sample5);
-
-        CTexture* pNewMergeResult = m_pMergeLayers[1];
-        m_pRenderer->FX_PushRenderTarget(0, pNewMergeResult, 0);
-        m_pRenderer->FX_SetColorDontCareActions(0, true, false);
-        CShader* pSh = CShaderMan::s_shPostEffectsGame;
-
-        static CCryNameTSCRC techName("CombineColorGradingWithColorChart");
-        SD3DPostEffectsUtils::ShBeginPass(pSh, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        m_pChartToUse->Apply(0, texStateLinID);
-
-        static CCryNameR pParamName0("ColorGradingParams0");
-        static CCryNameR pParamName1("ColorGradingParams1");
-        static CCryNameR pParamName2("ColorGradingParams2");
-        static CCryNameR pParamName3("ColorGradingParams3");
-        static CCryNameR pParamName4("ColorGradingParams4");
-        static CCryNameR pParamMatrix("mColorGradingMatrix");
-
-        pSh->FXSetPSFloat(pParamName0, &pMergeParams->pLevels[0], 1);
-        pSh->FXSetPSFloat(pParamName1, &pMergeParams->pLevels[1], 1);
-        pSh->FXSetPSFloat(pParamName2, &pMergeParams->pFilterColor, 1);
-        pSh->FXSetPSFloat(pParamName3, &pMergeParams->pSelectiveColor[0], 1);
-        pSh->FXSetPSFloat(pParamName4, &pMergeParams->pSelectiveColor[1], 1);
-        pSh->FXSetPSFloat(pParamMatrix, &pMergeParams->pColorMatrix[0], 3);
-
-        m_pRenderer->FX_SetState(GS_NODEPTHTEST);
-        m_pRenderer->SetCullMode(R_CULL_NONE);
-        gcpRendD3D->DrawPrimitivesInternal(m_pSlicesVB, COLORCHART_SIZE * 6, eptTriangleList);
-
-        SD3DPostEffectsUtils::ShEndPass();
-
-        m_pChartToUse = pNewMergeResult;
-
-        m_pRenderer->FX_PopRenderTarget(0);
-
-        gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-    }
-
-    return m_pChartToUse != 0;
-}
-
-
-CTexture* CColorGradingControllerD3D::GetColorChart() const
-{
-    return m_pChartToUse;
-}
-
-
-void CColorGradingControllerD3D::DrawLayer([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] CTexture* pChart, [[maybe_unused]] float blendAmount, [[maybe_unused]] const char* pLayerName) const
-{
-#if !defined(_RELEASE)
-    CShader* pSh = CShaderMan::s_shPostEffectsGame;
-
-    gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-    // If using merged color grading with color chart disable regular color transformations in display - only need to use color chart
-    if (pChart && pChart->GetTexType() == eTT_3D)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    static CCryNameTSCRC techName("DisplayColorCharts");
-    SD3DPostEffectsUtils::ShBeginPass(pSh, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    static const int texStateID = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    if (pChart)
-    {
-        pChart->Apply(0, texStateID);
-    }
-
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-    vb.Allocate(4);
-    SVF_P3F_C4B_T2F* pVerts = vb.Lock();
-
-    pVerts[0].xyz = Vec3(x, y, 0);
-    pVerts[0].st = Vec2(0, 1);
-
-    pVerts[1].xyz = Vec3(x + w, y, 0);
-    pVerts[1].st = Vec2(1, 1);
-
-    pVerts[2].xyz = Vec3(x, y + h, 0);
-    pVerts[2].st = Vec2(0, 0);
-
-    pVerts[3].xyz = Vec3(x + w, y + h, 0);
-    pVerts[3].st = Vec2(1, 0);
-
-    vb.Unlock();
-
-    m_pRenderer->FX_Commit();
-    m_pRenderer->FX_SetState(GS_NODEPTHTEST);
-    m_pRenderer->SetCullMode(R_CULL_NONE);
-
-    vb.Bind(0);
-    vb.Release();
-
-    if (!FAILED(m_pRenderer->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        m_pRenderer->FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-    }
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    float color[4] = {1, 1, 1, 1};
-    m_pRenderer->Draw2dLabel(x + w + 10.0f, y, 1.35f, color, false, "%2.1f%%", blendAmount * 100.0f);
-    m_pRenderer->Draw2dLabel(x + w + 55.0f, y, 1.35f, color, false, "%s", pLayerName);
-#endif // #if !defined(_RELEASE)
-}
-
-
-void CColorGradingControllerD3D::DrawDebugInfo() const
-{
-#if !defined(_RELEASE)
-    if (m_pRenderer->CV_r_colorgrading_charts < 2)
-    {
-        return;
-    }
-
-    TransformationMatrices backupSceneMatrices;
-
-    m_pRenderer->Set2DMode(m_pRenderer->GetWidth(), m_pRenderer->GetHeight(), backupSceneMatrices);
-
-    const float w = (float) COLORCHART_WIDTH;
-    const float h = (float) COLORCHART_HEIGHT;
-
-    float x = 16.0f;
-    float y = 16.0f;
-
-    if (!m_pChartStatic)
-    {
-        for (size_t i = 0, numLayers = m_layers.size(); i < numLayers; ++i)
-        {
-            const SColorChartLayer& l = m_layers[i];
-            CTexture* pChart = CTexture::GetByID(l.m_texID);
-            DrawLayer(x, y, w, h, pChart, l.m_blendAmount, CryStringUtils::FindFileNameInPath(pChart->GetName()));
-            y += h + 4;
-        }
-        if (GetColorChart())
-        {
-            DrawLayer(x, y, w, h, GetColorChart(), 1, "FinalChart");
-        }
-    }
-    else
-    {
-        DrawLayer(x, y, w, h, m_pChartStatic, 1, CryStringUtils::FindFileNameInPath(m_pChartStatic->GetName()));
-    }
-
-    m_pRenderer->RT_RenderTextMessages();
-
-    m_pRenderer->Unset2DMode(backupSceneMatrices);
-#endif // #if !defined(_RELEASE)
-}
-
-
-bool CColorGradingControllerD3D::LoadStaticColorChart(const char* pChartFilePath)
-{
-    bool success = true;
-
-    // Prevent a dangling pointer by updating the current chart if it was set to the old static chart.
-    bool updateCurrentChart = false;
-    if (m_pChartToUse == m_pChartStatic)
-    {
-        updateCurrentChart = true;
-    }
-
-    SAFE_RELEASE(m_pChartStatic);
-    if (pChartFilePath && pChartFilePath[0] != '\0')
-    {
-        m_pChartStatic = LoadColorChartInt(pChartFilePath);
-        success = m_pChartStatic != 0;
-    }
-
-    if (updateCurrentChart)
-    {
-        m_pChartToUse = m_pChartStatic;
-    }
-
-    return success;
-}
-
-
-const CTexture* CColorGradingControllerD3D::GetStaticColorChart() const
-{
-    return m_pChartStatic;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DColorGradingController.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DColorGradingController.h
deleted file mode 100644
index d7b9acf859..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DColorGradingController.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DCOLORGRADINGCONTROLLER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DCOLORGRADINGCONTROLLER_H
-#pragma once
-
-#include <RenderDll/Common/IColorGradingControllerInt.h>
-
-
-class CD3D9Renderer;
-
-struct SColorGradingMergeParams
-{
-    Vec4 pColorMatrix[3];
-    Vec4 pLevels[2];
-    Vec4 pFilterColor;
-    Vec4 pSelectiveColor[2];
-    uint64 nFlagsShaderRT;
-};
-
-class CColorGradingControllerD3D
-    : public IColorGradingControllerInt
-{
-public:
-    // IColorGradingController interface
-    virtual int LoadColorChart(const char* pChartFilePath) const;
-    virtual int LoadDefaultColorChart() const;
-    virtual void UnloadColorChart(int texID) const;
-
-    virtual void SetLayers(const SColorChartLayer* pLayers, uint32 numLayers);
-
-public:
-    // IColorGradingController internal interface
-    virtual void RT_SetLayers(const SColorChartLayer* pLayers, uint32 numLayers);
-
-public:
-    CColorGradingControllerD3D(CD3D9Renderer* pRenderer);
-    virtual ~CColorGradingControllerD3D();
-
-    bool Update(const SColorGradingMergeParams* pMergeParams = 0);
-    CTexture* GetColorChart() const;
-    void DrawDebugInfo() const;
-
-    bool LoadStaticColorChart(const char* pChartFilePath);
-    const CTexture* GetStaticColorChart() const;
-
-    void ReleaseTextures();
-    void FreeMemory();
-
-private:
-    typedef std::vector<SColorChartLayer> Layers;
-
-private:
-    bool ValidateColorChart(const CTexture* pChart) const;
-    CTexture* LoadColorChartInt(const char* pChartFilePath) const;
-    bool InitResources();
-    void DrawLayer(float x, float y, float w, float h, CTexture* pChart, float blendAmount, const char* pLayerName) const;
-
-private:
-    Layers m_layers;
-    CD3D9Renderer* m_pRenderer;
-    CVertexBuffer* m_pSlicesVB;
-    std::vector<SVF_P3F_C4B_T2F> m_vecSlicesData;
-    CTexture* m_pChartIdentity;
-    CTexture* m_pChartStatic;
-    CTexture* m_pChartToUse;
-    CTexture* m_pMergeLayers[2];
-};
-
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DCOLORGRADINGCONTROLLER_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDebug.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DDebug.cpp
deleted file mode 100644
index e62456d777..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDebug.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Control D3D debug runtime output
-
-
-#include "RenderDll_precompiled.h"
-#include "D3DDebug.h"
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-
-CD3DDebug::CD3DDebug()
-{
-    m_pd3dDebugQueue = NULL;
-    m_nNumCurrBreakOnIDs = 0;
-}
-
-CD3DDebug::~CD3DDebug()
-{
-    Release();
-}
-
-bool CD3DDebug::Init(ID3D11Device* pD3DDevice)
-{
-    Release();
-    if (!pD3DDevice)
-    {
-        return false;
-    }
-
-    if (FAILED(pD3DDevice->QueryInterface(__uuidof(ID3D11InfoQueue), (void**)&m_pd3dDebugQueue)))
-    {
-        return false;
-    }
-
-    m_pd3dDebugQueue->PushEmptyStorageFilter();
-    m_pd3dDebugQueue->AddApplicationMessage(D3D11_MESSAGE_SEVERITY_INFO, "Application D3D Debug Layer initialized");
-
-    return true;
-}
-
-void CD3DDebug::Release()
-{
-    if (m_pd3dDebugQueue)
-    {
-        m_pd3dDebugQueue->AddApplicationMessage(D3D11_MESSAGE_SEVERITY_INFO, "Application D3D Debug Layer deinitialized");
-        m_pd3dDebugQueue->PopStorageFilter();
-    }
-
-    SAFE_RELEASE(m_pd3dDebugQueue);
-}
-
-void CD3DDebug::Update(ESeverityCombination muteSeverity, const char* strMuteMsgList, const char* strBreakOnMsgList)
-{
-    if (!m_pd3dDebugQueue)
-    {
-        return;
-    }
-
-    m_pd3dDebugQueue->ClearStorageFilter();
-
-    /////////////////////////
-    // Severity based mute //
-    /////////////////////////
-    D3D11_MESSAGE_SEVERITY severityList[4] = { D3D11_MESSAGE_SEVERITY_INFO };
-    UINT nNumSeverities = 0;
-    switch (muteSeverity)
-    {
-    case ESeverity_Info:
-        severityList[0] = D3D11_MESSAGE_SEVERITY_INFO;
-        nNumSeverities = 1;
-        break;
-    case ESeverity_InfoWarning:
-        severityList[0] = D3D11_MESSAGE_SEVERITY_INFO;
-        severityList[1] = D3D11_MESSAGE_SEVERITY_WARNING;
-        nNumSeverities = 2;
-        break;
-    case ESeverity_InfoWarningError:
-        severityList[0] = D3D11_MESSAGE_SEVERITY_INFO;
-        severityList[1] = D3D11_MESSAGE_SEVERITY_WARNING;
-        severityList[2] = D3D11_MESSAGE_SEVERITY_ERROR;
-        nNumSeverities = 3;
-        break;
-    case ESeverity_All:
-        severityList[0] = D3D11_MESSAGE_SEVERITY_INFO;
-        severityList[1] = D3D11_MESSAGE_SEVERITY_WARNING;
-        severityList[2] = D3D11_MESSAGE_SEVERITY_ERROR;
-        severityList[3] = D3D11_MESSAGE_SEVERITY_CORRUPTION;
-        nNumSeverities = 4;
-        break;
-    }
-
-    ///////////////////
-    // ID based mute //
-    ///////////////////
-    D3D11_MESSAGE_ID msgIDsList[MAX_NUM_DEBUG_MSG_IDS] = { D3D11_MESSAGE_ID_UNKNOWN };
-    UINT nNumIDs = ParseIDs(strMuteMsgList, msgIDsList);
-
-    D3D11_INFO_QUEUE_FILTER filterQueue;
-    ZeroStruct(filterQueue);
-    filterQueue.DenyList.pSeverityList = severityList;
-    filterQueue.DenyList.NumSeverities = nNumSeverities;
-    filterQueue.DenyList.pIDList = msgIDsList;
-    filterQueue.DenyList.NumIDs = nNumIDs;
-    m_pd3dDebugQueue->AddStorageFilterEntries(&filterQueue);
-
-    ////////////////////////////
-    // Break on functionality //
-    ////////////////////////////
-    // First disable break for old entries
-    for (UINT i = 0; i < m_nNumCurrBreakOnIDs; ++i)
-    {
-        m_pd3dDebugQueue->SetBreakOnID(m_arrBreakOnIDsList[i], FALSE);
-    }
-    m_nNumCurrBreakOnIDs = 0;
-
-    const int nVal = atoi(strBreakOnMsgList);
-    if (nVal == -1)
-    {
-        // Break on all errors
-        m_pd3dDebugQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, TRUE);
-        m_pd3dDebugQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, TRUE);
-    }
-    else
-    {
-        // Break on specified messages
-        m_pd3dDebugQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, FALSE);
-        m_pd3dDebugQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, FALSE);
-        m_nNumCurrBreakOnIDs = ParseIDs(strBreakOnMsgList, m_arrBreakOnIDsList);
-        for (UINT i = 0; i < m_nNumCurrBreakOnIDs; ++i)
-        {
-            m_pd3dDebugQueue->SetBreakOnID(m_arrBreakOnIDsList[i], TRUE);
-        }
-    }
-}
-
-UINT CD3DDebug::ParseIDs(const char* strMsgIDList, D3D11_MESSAGE_ID arrMsgList[MAX_NUM_DEBUG_MSG_IDS]) const
-{
-    const size_t nLen = strlen(strMsgIDList);
-    UINT nIDs = 0;
-    const char* pStart = strMsgIDList;
-    char* pEnd;
-    UINT nValID = 1;
-    while (nValID != 0 && nIDs < MAX_NUM_DEBUG_MSG_IDS)
-    {
-        nValID = UINT(strtol(pStart, &pEnd, 10));
-        if (nValID)
-        {
-            arrMsgList[nIDs] = D3D11_MESSAGE_ID(nValID);
-            pStart = pEnd;
-            nIDs++;
-        }
-    }
-
-    return nIDs;
-}
-
-string CD3DDebug::GetLastMessage()
-{
-    string res;
-
-    ID3D11InfoQueue* pQueue = GetDebugInfoQueue();
-    if (pQueue)
-    {
-        const UINT64 numMsg = pQueue->GetNumStoredMessages();
-        if (numMsg)
-        {
-            const UINT64 lastMsg = numMsg - 1;
-            SIZE_T msgLen = 0;
-            if (SUCCEEDED(pQueue->GetMessage(lastMsg, 0, &msgLen)))
-            {
-                D3D11_MESSAGE* pMsg = (D3D11_MESSAGE*) CryModuleMalloc(msgLen);
-                if (SUCCEEDED(pQueue->GetMessage(lastMsg, pMsg, &msgLen)))
-                {
-                    const char* pFmt = 0;
-                    switch (pMsg->Severity)
-                    {
-                    case D3D11_MESSAGE_SEVERITY_CORRUPTION:
-                        pFmt = "D3D11 Corruption #%d: ";
-                        break;
-                    case D3D11_MESSAGE_SEVERITY_ERROR:
-                        pFmt = "D3D11 Error #%d: ";
-                        break;
-                    case D3D11_MESSAGE_SEVERITY_WARNING:
-                        pFmt = "D3D11 Warning #%d: ";
-                        break;
-                    case D3D11_MESSAGE_SEVERITY_INFO:
-                        pFmt = "D3D11 Info #%d: ";
-                        break;
-                    }
-
-                    char buf[32];
-                    sprintf_s(buf, pFmt, pMsg->ID);
-
-                    res += buf;
-                    res += pMsg->pDescription;
-                }
-                CryModuleFree(pMsg);
-            }
-        }
-    }
-
-    if (res.empty())
-    {
-        res = string("No message queued. Debug runtime might be inactive or not installed.");
-    }
-
-    return res;
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDebug.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DDebug.h
deleted file mode 100644
index 29b9a2236f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDebug.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Control D3D debug runtime output
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DDEBUG_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DDEBUG_H
-#pragma once
-
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-
-enum ESeverityCombination
-{
-    ESeverity_None = 0,
-    ESeverity_Info,
-    ESeverity_InfoWarning,
-    ESeverity_InfoWarningError,
-    ESeverity_All
-};
-
-enum
-{
-    MAX_NUM_DEBUG_MSG_IDS = 32
-};
-
-class CD3DDebug
-{
-public:
-    CD3DDebug();
-    ~CD3DDebug();
-
-    bool Init(ID3D11Device* pD3DDevice);
-    void Release();
-    void Update(ESeverityCombination muteSeverity, const char* strMuteMsgList, const char* strBreakOnMsgList);
-
-    // To use D3D debug info queue outside of this class,
-    // you can push a copy of current settings or empty filter settings onto stack:
-    //      m_d3dDebug.GetDebugInfoQueue()->PushCopyOfStorageFilter()  or   PushEmptyStorageFilter()
-    //      .... change settings here
-    // or push your filter settings directly
-    //      m_d3dDebug.GetDebugInfoQueue()->PushStorageFilter(&myFilter);
-    // Note that 'PopStorageFilter' should be called before next CD3DDebug::Update,
-    // as CD3DDebug::Update modifies filter on top of stack
-    ID3D11InfoQueue* GetDebugInfoQueue()
-    {
-        return m_pd3dDebugQueue;
-    }
-
-    string GetLastMessage();
-
-private:
-    ID3D11InfoQueue*    m_pd3dDebugQueue;
-
-    D3D11_MESSAGE_ID    m_arrBreakOnIDsList[MAX_NUM_DEBUG_MSG_IDS];
-    UINT                            m_nNumCurrBreakOnIDs;
-
-    UINT ParseIDs(const char* strMsgIDList, D3D11_MESSAGE_ID arrMsgList[MAX_NUM_DEBUG_MSG_IDS]) const;
-};
-
-#endif // #if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DDEBUG_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredPasses.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredPasses.cpp
deleted file mode 100644
index b87571928d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredPasses.cpp
+++ /dev/null
@@ -1,996 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "../Common/RenderCapabilities.h"
-#include "D3DPostProcess.h"
-#include "../Common/ReverseDepth.h"
-#include "../../Cry3DEngine/Environment/OceanEnvironmentBus.h"
-
-bool CD3D9Renderer::FX_DeferredCaustics()
-{
-    //@NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
-    bool causticsIsActive = OceanToggle::IsActive() ? OceanRequest::GetCausticsEnabled() : CRenderer::CV_r_watercaustics == 1;
-    if (!causticsIsActive || !CTexture::s_ptexBackBuffer || !CTexture::s_ptexSceneTarget)
-    {
-        return false;
-    }
-
-    I3DEngine* pEng = gEnv->p3DEngine;
-    const N3DEngineCommon::SOceanInfo& OceanInfo = gRenDev->m_p3DEngineCommon.m_OceanInfo;
-    const I3DEngine::CausticsParams causticsParams = gEnv->p3DEngine->GetCausticsParams();
-
-    bool bOceanVolumeVisible = (OceanInfo.m_nOceanRenderFlags & OCR_OCEANVOLUME_VISIBLE) != 0;
-    if (!bOceanVolumeVisible || iszero(causticsParams.intensity))
-    {
-        return false;
-    }
-
-    uint64 nFlagsShaderRTSave = gcpRendD3D->m_RP.m_FlagsShader_RT;
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Deferred caustics pass begin +++ \n");
-    }
-
-    PROFILE_LABEL_SCOPE("OCEAN_CAUSTICS");
-    PROFILE_FRAME(DrawShader_DeferredCausticsPass);
-
-    const float causticsBottomLevel = OceanInfo.m_fWaterLevel - causticsParams.depth;
-    const float causticsTopLevel = OceanInfo.m_fWaterLevel + causticsParams.height;
-    const Vec4 pCausticsParams1 = Vec4(
-        causticsParams.distanceAttenuation,
-        causticsParams.intensity,
-        causticsBottomLevel,
-        causticsTopLevel
-    );
-    const Vec4 pCausticsParams2 = Vec4(
-        //pEng->GetCausticsParams().x, // Caustics Tiling
-        causticsParams.tiling, // Caustics Tiling
-        /* Following params are free for future use */ 
-        0.0, 0.0, 0.0
-    );
-
-    // Caustics are done with projection from sun - hence they update too fast with regular
-    // sun direction. Use a smooth sun direction update instead to workaround this
-    PerFrameParameters& PF = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_perFrameParameters;
-    Vec3 pRealtimeSunDirNormalized = pEng->GetRealtimeSunDirNormalized();
-
-    const float fSnapDot = 0.98f;
-    float fDot = fabs(PF.m_CausticsSunDirection.Dot(pRealtimeSunDirNormalized));
-    if (fDot < fSnapDot)
-    {
-        PF.m_CausticsSunDirection = pRealtimeSunDirNormalized;
-    }
-
-    PF.m_CausticsSunDirection += (pRealtimeSunDirNormalized - PF.m_CausticsSunDirection) * 0.005f * gEnv->pTimer->GetFrameTime();
-    PF.m_CausticsSunDirection.Normalize();
-
-    Matrix44 m_pLightView;
-
-    Vec3 up = Vec3(0, 0, 1);
-    Vec3 dirZ = -PF.m_CausticsSunDirection;
-    Vec3 dirX = up.Cross(dirZ).GetNormalized();
-    Vec3 dirY = dirZ.Cross(dirX).GetNormalized();
-
-    m_pLightView.SetIdentity();
-    m_pLightView.SetRow(0, dirX);
-    m_pLightView.SetRow(1, dirY);
-    m_pLightView.SetRow(2, dirZ);
-
-    float fTime = 0.125f * gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_RealTime;
-
-    Vec4 vAnimParams = Vec4(0.06f * fTime, 0.05f * fTime, 0.1f * fTime, -0.11f * fTime);
-
-    // Stencil pre-pass
-    CShader* pSH(CShaderMan::s_ShaderShadowMaskGen);
-
-    // make box for stencil passes
-    t_arrDeferredMeshIndBuff arrDeferredInds;
-    t_arrDeferredMeshVertBuff arrDeferredVerts;
-    CreateDeferredUnitBox(arrDeferredInds, arrDeferredVerts);
-
-    Vec3 vCamPos = gRenDev->GetViewParameters().vOrigin;
-
-    Matrix44A origMatView = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-    Matrix34 mLocal;
-    mLocal.SetIdentity();
-
-    float heightAboveWater  = max(0.0f, vCamPos.z - causticsTopLevel);
-
-    float fDist = sqrtf((causticsParams.distanceAttenuation * 5.0f) * 13.333f);  // Hard cut off when caustic would be attenuated to 0.2 (1/5.0f)
-    fDist = sqrtf(max((fDist * fDist) - (heightAboveWater * heightAboveWater), 0.0f));
-
-    //TODO: Adjust Z on fog density
-
-    mLocal.SetScale(Vec3(fDist * 2, fDist * 2, causticsParams.height + causticsParams.depth));
-    mLocal.SetTranslation(Vec3(vCamPos.x - fDist, vCamPos.y - fDist, OceanInfo.m_fWaterLevel - causticsParams.depth));
-
-    Matrix44 mLocalTransposed = mLocal.GetTransposed();
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = mLocalTransposed * m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-
-    uint32 nPasses = 0;
-    static CCryNameTSCRC TechName0 = "DeferredShadowPass";
-    pSH->FXSetTechnique(TechName0);
-    pSH->FXBegin(&nPasses, FEF_DONTSETSTATES);
-
-    //allocate vertices
-    TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(&arrDeferredVerts[0], arrDeferredVerts.size(), 0);
-
-    //allocate indices
-    TempDynIB16::CreateFillAndBind(&arrDeferredInds[0], arrDeferredInds.size());
-
-    if (RenderCapabilities::SupportsDepthClipping())
-    {
-        FX_StencilCullPass(-1, arrDeferredVerts.size(), arrDeferredInds.size(), pSH, DS_SHADOW_CULL_PASS);
-    }
-    else
-    {
-        FX_StencilCullPass(-1, arrDeferredVerts.size(), arrDeferredInds.size(), pSH, DS_SHADOW_CULL_PASS, DS_SHADOW_CULL_PASS_FRONTFACING);
-    }
-
-    pSH->FXEnd();
-
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = origMatView;
-
-    FX_StencilTestCurRef(true, false);
-
-    // Deferred caustic pass
-    gcpRendD3D->EF_Scissor(false, 0, 0, 0, 0);
-
-    gRenDev->m_cEF.mfRefreshSystemShader("DeferredCaustics", CShaderMan::s_ShaderDeferredCaustics);
-
-    CShader* pShader = CShaderMan::s_ShaderDeferredCaustics;
-    gcpRendD3D->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3];
-
-    static CCryNameTSCRC pTechName = "General";
-    SD3DPostEffectsUtils::ShBeginPass(pShader, pTechName, FEF_DONTSETSTATES);
-
-    int32 nRState = GS_NODEPTHTEST | GS_STENCIL | (GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA);
-
-    gcpRendD3D->FX_SetState(nRState);
-
-    static CCryNameR m_pParamAnimParams("vAnimParams");
-    static CCryNameR m_pCausticsParams1Name("vCausticsParams1");
-    static CCryNameR m_pCausticsParams2Name("vCausticsParams2");
-    static CCryNameR m_pParamLightView("mLightView");
-    pShader->FXSetPSFloat(m_pParamAnimParams,  &vAnimParams, 1);
-    pShader->FXSetPSFloat(m_pCausticsParams1Name,  &pCausticsParams1, 1);
-    pShader->FXSetPSFloat(m_pCausticsParams2Name, &pCausticsParams2, 1);
-    pShader->FXSetPSFloat(m_pParamLightView, (Vec4*) m_pLightView.GetData(), 4);
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight()); // TODO: Use Volume
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    FX_StencilTestCurRef(false);
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Deferred caustics pass end +++ \n");
-    }
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-    //m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags2 = nPersFlags2Save;
-
-    FX_ResetPipe();
-
-    return true;
-}
-
-bool CD3D9Renderer::FX_DeferredWaterVolumeCaustics(const N3DEngineCommon::SCausticInfo& causticInfo)
-{
-    if (!CTexture::s_ptexBackBuffer || !CTexture::s_ptexSceneTarget)
-    {
-        return false;
-    }
-
-    //gRenDev->m_cEF.mfRefreshSystemShader("DeferredCaustics", CShaderMan::m_ShaderDeferredCaustics);
-
-    CShader* pShader = CShaderMan::s_ShaderDeferredCaustics;
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Deferred caustics pass begin +++ \n");
-    }
-
-    PROFILE_LABEL_SCOPE("DEFERRED WATERVOLUME CAUSTICS");
-
-    bool bTiledDeferredShading = CRenderer::CV_r_DeferredShadingTiled >= 2;
-
-    if (bTiledDeferredShading)
-    {
-        gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexSceneTargetR11G11B10F[1], NULL);
-    }
-    else
-    {
-        gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexSceneDiffuseAccMap, NULL);
-    }
-
-    static CCryNameTSCRC pTechName = "WaterVolumeCaustics";
-
-    SD3DPostEffectsUtils::ShBeginPass(pShader, pTechName, FEF_DONTSETSTATES);
-
-    int32 nRState = GS_NODEPTHTEST;
-    if (!bTiledDeferredShading)
-    {
-        nRState |= GS_BLSRC_ONE | GS_BLDST_ONE;  // Blend directly into light accumulation buffer
-    }
-    gcpRendD3D->FX_SetState(nRState);
-
-    static CCryNameR m_pParamLightView("mLightView");
-    pShader->FXSetPSFloat(m_pParamLightView, (Vec4*) causticInfo.m_mCausticMatr.GetData(), 4);
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Deferred caustics pass end +++ \n");
-    }
-
-    FX_ResetPipe();
-
-    if (bTiledDeferredShading)
-    {
-        GetTiledShading().NotifyCausticsVisible();
-    }
-
-    return true;
-}
-
-bool CD3D9Renderer::FX_DeferredRainOcclusionMap(const N3DEngineCommon::ArrOccluders& arrOccluders, const SRainParams& rainVolParams)
-{
-    PROFILE_LABEL_SCOPE("OCCLUSION_PASS");
-
-    const Matrix44& matOccTrans = rainVolParams.matOccTrans;
-    uint64 nFlagsShaderRTSave = m_RP.m_FlagsShader_RT;
-
-    // Rain occlusion map generation does not work with reverse depth.
-    // It is OK to disable reverse depth rendering here because we render the occlusion buffer to an separate render target with its own depth buffer.
-    // Note that all shadow maps disable reverse depth as well, so we're following that scheme here.
-    uint32 persFlagSave = m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags;
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_REVERSE_DEPTH;
-
-    Matrix44 matTrans;
-    static const Matrix44 matSs2Ps
-        (2.f,  0.f,  0.f, -1.f,
-        0.f,  2.f,  0.f, -1.f,
-        0.f,  0.f,  1.f,  0.f,
-        0.f,  0.f,  0.f,  1.f);
-    matTrans = matSs2Ps * matOccTrans;
-
-    // Create texture if required
-    if (!CTexture::IsTextureExist(CTexture::s_ptexRainOcclusion))
-    {
-        if (!CTexture::s_ptexRainOcclusion->Create2DTexture(RAIN_OCC_MAP_SIZE, RAIN_OCC_MAP_SIZE, 1,
-                FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET,
-                0, eTF_R8G8B8A8, eTF_R8G8B8A8))
-        {
-            return false;
-        }
-    }
-
-    // Get temp depth buffer
-    SDepthTexture* pTmpDepthSurface = FX_GetDepthSurface(RAIN_OCC_MAP_SIZE, RAIN_OCC_MAP_SIZE, false);
-
-    // Render geometry to rain occlusion map
-    FX_PushRenderTarget(0, CTexture::s_ptexRainOcclusion, pTmpDepthSurface);
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-    RT_SetViewport(0, 0, RAIN_OCC_MAP_SIZE, RAIN_OCC_MAP_SIZE);
-
-    EF_ClearTargetsLater(FRT_CLEAR_COLOR | FRT_CLEAR_DEPTH, Clr_Neutral, Clr_FarPlane.r, 0);
-
-    FX_SetState(GS_DEPTHFUNC_LEQUAL | GS_DEPTHWRITE);
-    SetCullMode(R_CULL_NONE);
-
-    CShader* pSH = m_cEF.s_ShaderDeferredRain;
-    uint32 nPasses = 0;
-    static CCryNameTSCRC TechName("RainOcclusion");
-    pSH->FXSetTechnique(TechName);
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-
-    static CCryNameR occTransMatParamName("g_RainOcc_TransMat");
-    for (N3DEngineCommon::ArrOccluders::const_iterator it = arrOccluders.begin();
-         it != arrOccluders.end(); ++it)
-    {
-        if (it->m_RndMesh)
-        {
-            Matrix44A matWVP(it->m_WorldMat);
-            matWVP = matTrans * matWVP;
-            pSH->FXSetVSFloat(occTransMatParamName, (Vec4*)matWVP.GetData(), 4);
-
-            FX_Commit();
-
-            static_cast<CRenderMesh*>(it->m_RndMesh.get())->DrawImmediately();
-        }
-    }
-
-    pSH->FXEndPass();
-    pSH->FXEnd();
-
-    FX_PopRenderTarget(0);
-
-    RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags = persFlagSave;
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_DeferredRainOcclusion()
-{
-    // TODO: Implement this for GMEM path
-    // Not yet supported.
-    // Only r_rain=1 and r_snow=1 supported at the moment.
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        CRY_ASSERT(0);
-    }
-
-    SRainParams& rainVolParams = m_p3DEngineCommon.m_RainInfo;
-
-    if (rainVolParams.areaAABB.IsReset())
-    {
-        return false;
-    }
-
-    if (m_p3DEngineCommon.m_RainOccluders.m_bProcessed[RT_GetCurrGpuID()])
-    {
-        return true;
-    }
-
-    PROFILE_LABEL_SCOPE("DEFERRED_RAIN_OCCLUSION");
-
-    bool bRet = true;
-    const N3DEngineCommon::ArrOccluders& arrOccluders = m_p3DEngineCommon.m_RainOccluders.m_arrCurrOccluders[m_RP.m_nProcessThreadID];
-    if (!arrOccluders.empty())
-    {
-        // Render occluders to occlusion map
-        bRet = FX_DeferredRainOcclusionMap(arrOccluders, rainVolParams);
-        m_p3DEngineCommon.m_RainOccluders.m_bProcessed[RT_GetCurrGpuID()] = true;
-        if (bRet)
-        {
-            rainVolParams.matOccTransRender = rainVolParams.matOccTrans;
-        }
-    }
-
-    return bRet;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_DeferredRainPreprocess()
-{
-    AZ_TRACE_METHOD();
-    // Snow also uses the occlusion computation.
-    CEffectParam* pRainActive = PostEffectMgr()->GetByName("SceneRain_Active");
-    if (pRainActive)
-    {
-        pRainActive->SetParam(0);
-    }
-
-    CEffectParam* pSnowActive = PostEffectMgr()->GetByName("SceneSnow_Active");
-    if (pSnowActive)
-    {
-        pSnowActive->SetParam(0);
-    }
-
-    if ((CV_r_rain < 1 && CV_r_snow < 1) || !CV_r_PostProcess || !CTexture::s_ptexBackBuffer || !CTexture::s_ptexSceneTarget)
-    {
-        return false;
-    }
-
-    SRainParams& rainVolParams = m_p3DEngineCommon.m_RainInfo;
-    SSnowParams& snowVolParams = m_p3DEngineCommon.m_SnowInfo;
-
-    bool bRenderSnow = ((snowVolParams.m_fSnowAmount > 0.05f || snowVolParams.m_fFrostAmount > 0.05f) && snowVolParams.m_fRadius > 0.05f && CV_r_snow > 0);
-    bool bRenderRain = (rainVolParams.fAmount * CRenderer::CV_r_rainamount > 0.05f && rainVolParams.fRadius > 0.05f && CV_r_rain > 0);
-
-    bool bRender = bRenderSnow || bRenderRain;
-    if (!bRender)
-    {
-        return false;
-    }
-
-    bool bRet = true;
-    if (rainVolParams.bApplyOcclusion && ((CV_r_snow == 2 && bRenderSnow) || (CV_r_rain == 2 && bRenderRain)))
-    {
-        bRet = FX_DeferredRainOcclusion();
-    }
-
-    if (bRet && bRenderRain && pRainActive)
-    {
-        CSceneRain* pEffRain = (CSceneRain*)PostEffectMgr()->GetEffect(ePFX_SceneRain);
-        if (!pEffRain)
-        {
-            return false;
-        }
-
-        pEffRain->m_RainVolParams = rainVolParams;
-        pRainActive->SetParam(1);
-    }
-
-    if (bRet && bRenderSnow && pSnowActive)
-    {
-        CSceneSnow* pEffSnow = (CSceneSnow*)PostEffectMgr()->GetEffect(ePFX_SceneSnow);
-        if (!pEffSnow)
-        {
-            return false;
-        }
-
-        pEffSnow->m_RainVolParams = rainVolParams;
-        pEffSnow->m_SnowVolParams = snowVolParams;
-        pSnowActive->SetParam(1);
-    }
-
-    return bRet;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_DeferredRainGBuffer()
-{
-    const SRainParams& rainVolParams = m_p3DEngineCommon.m_RainInfo;
-    CEffectParam* pParam = PostEffectMgr()->GetByName("SceneRain_Active");
-    if (pParam == 0 || pParam->GetParam() < 0.5f
-        || rainVolParams.fCurrentAmount < 0.05f
-        || rainVolParams.fRadius < 0.05f)
-    {
-        return false;
-    }
-
-    const bool bUseStencilMask = gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && CRenderer::CV_r_RainUseStencilMasking;
-
-    // If GMEM path is enabled but no framebuffer fetches are supported, then neither can this pass.
-    // We would have to resolve which would break the GMEM path.
-    const bool gmemEnabled = gcpRendD3D->FX_GetEnabledGmemPath(nullptr) != CD3D9Renderer::eGT_REGULAR_PATH;
-    if (gmemEnabled && !(RenderCapabilities::GetFrameBufferFetchCapabilities().test(RenderCapabilities::FBF_ALL_COLORS)))
-    {
-        AZ_Assert(false, "Device does not support framebuffer fetches for all color attachments. Deferred rain not supported with GMEM paths.");
-        return false;
-    }
-
-    PROFILE_LABEL_SCOPE("DEFERRED_RAIN_GBUFFER");
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    static const int numOfDeferredStencilRainTechniques = 2;
-    static CCryNameTSCRC tech[numOfDeferredStencilRainTechniques] = {CCryNameTSCRC("DeferredRainGBufferStencil"), CCryNameTSCRC("DeferredRainGBufferNoDiscard")};
-    static CCryNameTSCRC techDiscard = "DeferredRainGBuffer";
-    static CCryNameR puddleParamName0("g_RainPuddleParams0");
-    static CCryNameR puddleParamName1("g_RainPuddleParams1");
-    static CCryNameR volumeParamName("g_RainVolumeParams");
-    static CCryNameR colorMulParamName("g_RainColorMultipliers");
-    static CCryNameR wvpParamName("g_WorldViewPos");
-    static CCryNameR occTransMatParamName("g_RainOcc_TransMat");
-    static CCryNameR windParamName("g_RainOcc_WindOffs");
-
-
-    CShader* pShader = CShaderMan::s_ShaderDeferredRain;
-    m_cEF.mfRefreshSystemShader("DeferredRain", pShader);
-
-    const CameraViewParameters& viewParameters = gcpRendD3D->m_RP.m_TI[m_RP.m_nProcessThreadID].m_cam.m_viewParameters;
-
-    // Prepare for reading from stencil in shader
-    CTexture* pDepthBufferRT = CTexture::s_ptexZTarget;
-    const bool bMSAA = m_RP.m_MSAAData.Type ? true : false;
-    D3DDepthSurface* pZBufferOrigDSV = (ID3D11DepthStencilView*)m_DepthBufferOrigMSAA.pSurf;
-    m_DepthBufferOrigMSAA.pSurf = m_pZBufferReadOnlyDSV;
-    bool restoreStencilResourceView = false;
-    D3DShaderResourceView* pZTargetOrigSRV = pDepthBufferRT->GetShaderResourceView(bMSAA? SResourceView::DefaultViewMS : SResourceView::DefaultView);
-
-    if (!gmemEnabled) // needed RTs already in GMEM
-    {
-        CTexture* pSceneSpecular = CTexture::s_ptexSceneSpecular;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DDeferredPasses_cpp)
-#endif
-        // TODO: Try avoiding the copy by directly accessing UAVs
-        PostProcessUtils().StretchRect(CTexture::s_ptexSceneNormalsMap, CTexture::s_ptexStereoL);
-        PostProcessUtils().StretchRect(pSceneSpecular, CTexture::s_ptexStereoR);
-        PostProcessUtils().StretchRect(CTexture::s_ptexSceneDiffuse, CTexture::s_ptexSceneNormalsBent);
-
-        FX_PushRenderTarget(0, CTexture::s_ptexSceneNormalsMap, bUseStencilMask ? &m_DepthBufferOrigMSAA : NULL);
-        FX_PushRenderTarget(1, pSceneSpecular, NULL);
-        FX_PushRenderTarget(2, CTexture::s_ptexSceneDiffuse, NULL);
-    }
-
-    uint64 nFlagsShaderRTSave = m_RP.m_FlagsShader_RT;
-    m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0]);
-
-    if (rainVolParams.bApplyOcclusion)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0]; // Occlusion
-    }
-    if (rainVolParams.fSplashesAmount > 0.001f && rainVolParams.fRainDropsAmount > 0.001f)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];  // Splashes
-    }
-
-    const int rainStencilMask = 0x40;
-    for (int i = bUseStencilMask ? 0 : 1; i < numOfDeferredStencilRainTechniques; ++i)
-    {
-        if (bUseStencilMask)
-        {
-            SD3DPostEffectsUtils::ShBeginPass(pShader, tech[i], FEF_DONTSETSTATES);
-            FX_SetState(GS_DEPTHFUNC_GREAT|GS_STENCIL);
-            
-            if (i==0)
-            {
-                FX_SetStencilState(STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-                                   STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                                   STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-                                   STENCOP_PASS(FSS_STENCOP_REPLACE),
-                                   rainStencilMask, rainStencilMask, rainStencilMask, false);
-            }
-            else
-            {
-                FX_SetStencilState(STENC_FUNC(FSS_STENCFUNC_EQUAL) |
-                                   STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                                   STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-                                   STENCOP_PASS(FSS_STENCOP_ZERO),
-                                   rainStencilMask, rainStencilMask, rainStencilMask, false);
-            }
-        }
-        else
-        {
-            SD3DPostEffectsUtils::ShBeginPass(pShader, tech[i], FEF_DONTSETSTATES);
-            FX_SetState(GS_NODEPTHTEST);
-        }
-        
-        float fMaxZ = -1.f;
-        if (CV_r_rain_maxviewdist_deferred > viewParameters.fNear)
-        {
-            fMaxZ = (viewParameters.fFar - (viewParameters.fNear * viewParameters.fFar) / CV_r_rain_maxviewdist_deferred) / (viewParameters.fFar - viewParameters.fNear);
-        }
-        
-        // Global wind params
-        Vec3 windVec = gEnv->p3DEngine->GetGlobalWind(false);
-        
-        // Animated puddles
-        float fTime = m_RP.m_TI[m_RP.m_nProcessThreadID].m_RealTime * 0.333f;
-        const float puddleWindScale = -0.15f;
-        float puddleOffsX = fTime * puddleWindScale * windVec.x;
-        float puddleOffsY = fTime * puddleWindScale * windVec.y;
-        
-        Vec4 vPuddleParams0 = Vec4(puddleOffsX, puddleOffsY, rainVolParams.fPuddlesAmount * rainVolParams.fCurrentAmount, rainVolParams.fDiffuseDarkening);
-        pShader->FXSetPSFloat(puddleParamName0, &vPuddleParams0, 1);
-        
-        float invPuddleMask = clamp_tpl(1.0f - rainVolParams.fPuddlesMaskAmount, 0.0f, 1.0f);
-        Vec4 vPuddleParams1 = Vec4(invPuddleMask, rainVolParams.fPuddlesRippleAmount, rainVolParams.fSplashesAmount, 0.0f);
-        pShader->FXSetPSFloat(puddleParamName1, &vPuddleParams1, 1);
-        
-        // Volume
-        Vec4 vRainPosCS = Vec4(rainVolParams.vWorldPos, 1.f / max(rainVolParams.fRadius, 1e-3f));
-        pShader->FXSetPSFloat(volumeParamName, &vRainPosCS, 1);
-        
-        // Global colour multiplier
-        float fAmount = rainVolParams.fCurrentAmount * CV_r_rainamount;
-        Vec4 vRainColorMultipliers = Vec4(rainVolParams.vColor, 1.f) * fAmount;
-        vRainColorMultipliers.w = fMaxZ > 0.f ? CV_r_rain_maxviewdist_deferred / viewParameters.fFar : 1.f;
-        vRainColorMultipliers.w = -10.f / vRainColorMultipliers.w;
-        pShader->FXSetPSFloat(colorMulParamName, &vRainColorMultipliers, 1);
-        
-        // Camera position
-        const Vec3& vCamPos = viewParameters.vOrigin;
-        Vec4 pCamPosParam = Vec4(vCamPos, 0.f);
-        pShader->FXSetPSFloat(wvpParamName, &pCamPosParam, 1);
-        
-        if (rainVolParams.bApplyOcclusion)
-        {
-            // Occlusion buffer matrix
-            pShader->FXSetPSFloat(occTransMatParamName, (Vec4*)rainVolParams.matOccTransRender.GetData(), 4);
-            
-            // Pre-calculate wind-driven occlusion sample offset
-            const float windOffsetScale = 15.f / (float)RAIN_OCC_MAP_SIZE;
-            windVec = rainVolParams.matOccTransRender.TransformVector(windVec);
-            windVec.x *= windOffsetScale;
-            windVec.y *= windOffsetScale;
-            
-            Vec4 pWindParams(windVec.x, windVec.y, 0.f, 0.f);
-            pShader->FXSetPSFloat(windParamName, &pWindParams, 1);
-        }
-        
-        if (!gmemEnabled) // can read straight from GMEM
-        {
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexStereoL, 9, FILTER_POINT, 0);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexStereoR, 10, FILTER_POINT, 0);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexSceneNormalsBent, 11, FILTER_POINT, 0);            
-        }
-
-        // On GMEM we need to check if we have access to the depth RT or depth buffer. If not we push the depth as a texture to be sampled.
-        if(!gmemEnabled || gcpRendD3D->FX_GmemGetDepthStencilMode() == CD3D9Renderer::eGDSM_Texture)
-        {
-            // Bind stencil buffer
-            restoreStencilResourceView = true;
-            pDepthBufferRT->SetShaderResourceView(m_pZBufferStencilReadOnlySRV, bMSAA);
-            SResourceView::KeyType nBindResourceMsaa = gcpRendD3D->m_RP.m_MSAAData.Type ? SResourceView::DefaultViewMS : SResourceView::DefaultView;
-            pDepthBufferRT->Apply(12, CTexture::GetTexState(STexState(FILTER_POINT, true)), EFTT_UNKNOWN, -1, nBindResourceMsaa);
-        }
-        
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexSceneNormalsMap->GetWidth(), CTexture::s_ptexSceneNormalsMap->GetHeight(), 1.0f);
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    // Restore original DSV/SRV
-    m_DepthBufferOrigMSAA.pSurf = pZBufferOrigDSV;
-    if (restoreStencilResourceView)
-    {
-        pDepthBufferRT->SetShaderResourceView(pZTargetOrigSRV, bMSAA);
-    }
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr)) // no need to restore... this would break GMEM path
-    {
-        FX_PopRenderTarget(0);
-        FX_PopRenderTarget(1);
-        FX_PopRenderTarget(2);
-    }
-
-    // Set persistent Rain Ripples Flag for Water Volumes and Ocean Ripple effect
-    m_RP.m_PersFlags2 |= RBPF2_RAINRIPPLES;
-
-    m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_DeferredSnowLayer()
-{
-    const SSnowParams& snowVolParams = m_p3DEngineCommon.m_SnowInfo;
-    const SRainParams& rainVolParams = m_p3DEngineCommon.m_RainInfo;
-    CShader* pShader = CShaderMan::s_ShaderDeferredSnow;
-    const CameraViewParameters& cCam = gcpRendD3D->m_RP.m_TI[m_RP.m_nProcessThreadID].m_cam.m_viewParameters;
-    if ((CRenderer::CV_r_snow < 1) || (snowVolParams.m_fSnowAmount < 0.05f && snowVolParams.m_fFrostAmount < 0.05f && snowVolParams.m_fSurfaceFreezing < 0.05f) || snowVolParams.m_fRadius < 0.05f)
-    {
-        return false;
-    }
-
-    // If GMEM path is enabled but no framebuffer fetches are supported, then neither can this pass.
-    // We would have to resolve which would break the GMEM path.
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && !(RenderCapabilities::GetFrameBufferFetchCapabilities().test(RenderCapabilities::FBF_ALL_COLORS)))
-    {
-        AZ_Assert(false, "Device does not support framebuffer fetches for all color attachments. Deferred snow not supported with GMEM paths.");
-        return false;
-    }
-
-    PROFILE_LABEL_SCOPE("DEFERRED_SNOW_ACCUMULATION");
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr)) // needed RTs already in GMEM
-    {
-        // TODO: Try avoiding the copy by directly accessing UAVs
-        PostProcessUtils().StretchRect(CTexture::s_ptexSceneDiffuse, CTexture::s_ptexStereoL);
-        PostProcessUtils().StretchRect(CTexture::s_ptexSceneNormalsMap, CTexture::s_ptexBackBuffer);
-        PostProcessUtils().StretchRect(CTexture::s_ptexSceneSpecular, CTexture::s_ptexSceneNormalsBent);
-
-        gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexSceneDiffuse, &gcpRendD3D->m_DepthBufferOrigMSAA);
-        gcpRendD3D->FX_PushRenderTarget(1, CTexture::s_ptexSceneNormalsMap, NULL);
-        gcpRendD3D->FX_PushRenderTarget(2, CTexture::s_ptexSceneSpecular, NULL);
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_snow_displacement)
-        {
-            gcpRendD3D->FX_PushRenderTarget(3, CTexture::s_ptexStereoR, NULL);
-        }
-    }
-    else
-    {
-        //Disable this during water reflection recursion pass as the needed render targets are not in GMEM anymore.
-        if (SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID] > 0)
-        {
-            return false;
-        }
-    }
-    
-
-    uint64 nFlagsShaderRTSave = m_RP.m_FlagsShader_RT;
-
-    m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3];
-    if (IsHDRModeEnabled())
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_HDR_MODE];
-    }
-    if (rainVolParams.bApplyOcclusion)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    static CCryNameTSCRC pTechName = "Snow";
-    SD3DPostEffectsUtils::ShBeginPass(pShader, pTechName, FEF_DONTSETSTATES);
-    FX_SetState(GS_NODEPTHTEST);
-
-    // Textures
-    STexState sPointTexState = STexState(FILTER_POINT, true);
-    const int pointTexState = CTexture::GetTexState(sPointTexState);
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr)) // can read straight from GMEM
-    {
-        CTexture::s_ptexStereoL->Apply(0, pointTexState);
-        CTexture::s_ptexBackBuffer->Apply(1, pointTexState);
-        CTexture::s_ptexSceneNormalsBent->Apply(2, pointTexState);
-    }
-
-    static CCryNameR paramName("g_SnowVolumeParams");
-    const Vec3& vCamPos = cCam.vOrigin;
-    const Vec4 vSnowPosCS = Vec4(snowVolParams.m_vWorldPos, 1.f / max(snowVolParams.m_fRadius, 1e-3f));
-    pShader->FXSetPSFloat(paramName, &vSnowPosCS, 1);
-
-    static CCryNameR param1Name("g_SnowMultipliers");
-    float fSnowAmount = snowVolParams.m_fSnowAmount;
-    float fFrostAmount = snowVolParams.m_fFrostAmount;
-    float fSurfaceFreezing = snowVolParams.m_fSurfaceFreezing;
-    Vec4 vSnowMultipliers(fSnowAmount, fFrostAmount, clamp_tpl(fSurfaceFreezing, 0.0f, 1.0f), 0);
-    pShader->FXSetPSFloat(param1Name, &vSnowMultipliers, 1);
-
-    static CCryNameR param2Name("g_WorldViewPos");
-    Vec4 pCamPosParam = Vec4(vCamPos, 1);
-    pShader->FXSetPSFloat(param2Name, &pCamPosParam, 1);
-
-    // Sample wind at camera position
-    AABB box;
-    box.min = box.max = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_cam.m_viewParameters.vOrigin;
-    Vec3 windVec = gEnv->p3DEngine->GetWind(box, false);
-
-    Vec3 windVecOcc = gEnv->p3DEngine->GetGlobalWind(false);
-    if (rainVolParams.bApplyOcclusion)
-    {
-        static CCryNameR param3Name("g_SnowOcc_TransMat");
-        pShader->FXSetPSFloat(param3Name, (Vec4*)rainVolParams.matOccTransRender.GetData(), 3);
-
-        // Pre-calculate wind-driven occlusion sample offset
-        const float windOffsetScale = 15.f / (float)RAIN_OCC_MAP_SIZE;
-        windVecOcc = rainVolParams.matOccTransRender.TransformVector(windVec);
-        windVecOcc.x *= windOffsetScale;
-        windVecOcc.y *= windOffsetScale;
-
-        static CCryNameR param4Name("g_SnowOcc_WindOffs");
-        Vec4 pWindParamsOcc(windVecOcc.x, windVecOcc.y, 0, 0);
-        pShader->FXSetPSFloat(param4Name, &pWindParamsOcc, 1);
-    }
-
-    static CCryNameR param4Name("g_WindDirection");
-    Vec4 pWindParams(windVec.x, windVec.y, windVecOcc.x, windVecOcc.y);
-    pShader->FXSetPSFloat(param4Name, &pWindParams, 1);
-
-    short sX, sY, sWidth, sHeight;
-    CDeferredShading::Instance().GetScissors(snowVolParams.m_vWorldPos, snowVolParams.m_fRadius, sX, sY, sWidth, sHeight);
-    gcpRendD3D->EF_Scissor(true, sX, sY, sWidth, sHeight);
-
-    // Render state
-    uint32 renderState = GS_STENCIL;
-
-    gcpRendD3D->FX_SetStencilState(STENC_FUNC(FSS_STENCFUNC_EQUAL) |
-        STENCOP_FAIL(FSS_STENCOP_KEEP) |
-        STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-        STENCOP_PASS(FSS_STENCOP_KEEP),
-        BIT_STENCIL_RESERVED, BIT_STENCIL_RESERVED, 0xFFFFFFFF, true);
-
-    gcpRendD3D->FX_SetState(renderState);
-    gcpRendD3D->FX_Commit();
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0, &gcpRendD3D->m_FullResRect);
-    SD3DPostEffectsUtils::ShEndPass();
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr)) // no need to restore... this would break GMEM path
-    {
-        // Restore targets
-        gcpRendD3D->FX_PopRenderTarget(0);
-        gcpRendD3D->FX_PopRenderTarget(1);
-        gcpRendD3D->FX_PopRenderTarget(2);
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_snow_displacement)
-        {
-            gcpRendD3D->FX_PopRenderTarget(3);
-        }
-    }
-
-    // Restore state
-    EF_Scissor(false, 0, 0, 0, 0);
-    gcpRendD3D->m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-    gcpRendD3D->FX_Commit();
-
-    return true;
-}
-
-bool CD3D9Renderer::FX_DeferredSnowDisplacement()
-{
-    const SSnowParams& snowVolParams = m_p3DEngineCommon.m_SnowInfo;
-    CShader* pShader = CShaderMan::s_ShaderDeferredSnow;
-
-    if IsCVarConstAccess(constexpr) ((CRenderer::CV_r_snow < 1 || CRenderer::CV_r_snow_displacement < 1) || snowVolParams.m_fSnowAmount < 0.05f || snowVolParams.m_fRadius < 0.05f)
-    {
-        return false;
-    }
-
-    // TODO: Implement this for GMEM path
-    // r_SnowDisplacement=1 not yet supported.
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        CRY_ASSERT(0);
-    }
-
-    PROFILE_LABEL_SCOPE("DEFERRED_SNOW_DISPLACEMENT");
-
-    static CCryNameR param5Name("g_CameraMatrix");
-    Matrix44A matView;
-    matView = m_RP.m_TI[m_RP.m_nProcessThreadID].m_cam.GetViewMatrix();
-
-    // Adjust the camera matrix so that the camera space will be: +y = down, +z - towards, +x - right
-    Vec3 zAxis = matView.GetRow(1);
-    matView.SetRow(1, -matView.GetRow(2));
-    matView.SetRow(2, zAxis);
-    float z = matView.m13;
-    matView.m13 = -matView.m23;
-    matView.m23 = z;
-
-    short sX, sY, sWidth, sHeight;
-    CDeferredShading::Instance().GetScissors(snowVolParams.m_vWorldPos, snowVolParams.m_fRadius, sX, sY, sWidth, sHeight);
-    EF_Scissor(true, sX, sY, sWidth, sHeight);
-
-    TransformationMatrices backupSceneMatrices;
-
-    gcpRendD3D->Set2DMode(1, 1, backupSceneMatrices);
-
-    // Render state
-    uint32 renderState = GS_NODEPTHTEST | GS_STENCIL;
-
-    gcpRendD3D->FX_SetStencilState(STENC_FUNC(FSS_STENCFUNC_EQUAL) |
-        STENCOP_FAIL(FSS_STENCOP_KEEP) |
-        STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-        STENCOP_PASS(FSS_STENCOP_KEEP),
-        BIT_STENCIL_RESERVED, BIT_STENCIL_RESERVED, 0xFFFFFFFF, true);
-
-    gcpRendD3D->FX_SetState(renderState);
-    gcpRendD3D->FX_Commit();
-
-    {
-        PROFILE_LABEL_SCOPE("GENERATE_HEIGHT_MAP");
-        static CCryNameTSCRC pTechNamePrepass = "ParallaxMapPrepass";
-        SD3DPostEffectsUtils::ShBeginPass(pShader, pTechNamePrepass, FEF_DONTSETSTATES);
-
-        FX_PushRenderTarget(0, CTexture::s_ptexBackBuffer, NULL);
-
-        pShader->FXSetPSFloat(param5Name, (Vec4*)matView.GetData(), 3);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexStereoR, 0, FILTER_POINT);
-
-        SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-
-        SD3DPostEffectsUtils::ShEndPass();
-
-        FX_PopRenderTarget(0);
-    }
-
-    {
-        static CCryNameTSCRC pTechNameMin = "ParallaxMapMin";
-        SD3DPostEffectsUtils::ShBeginPass(pShader, pTechNameMin, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-
-        FX_PushRenderTarget(0, CTexture::s_ptexSceneDiffuseAccMap, NULL);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexBackBuffer, 0, FILTER_POINT);
-
-        SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexSceneDiffuseAccMap->GetWidth(), CTexture::s_ptexSceneDiffuseAccMap->GetHeight());
-
-        SD3DPostEffectsUtils::ShEndPass();
-
-        FX_PopRenderTarget(0);
-    }
-
-    // Copy screen to texture for displacement.
-    FX_ScreenStretchRect(CTexture::s_ptexHDRTarget);
-
-    // Iteratively apply displacement to maximize quality and minimize sample count.
-    {
-        PROFILE_LABEL_SCOPE("APPLY_DISPLACEMENT");
-        static CCryNameTSCRC pTechNameApply = "ParallaxMapApply";
-        static CCryNameR pPassParamsName("g_DisplacementParams");
-        Vec4 pPassParams(0, 0, 0, 0);
-
-        uint64 nFlagsShaderRTSave = m_RP.m_FlagsShader_RT;
-        m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-        // First pass.
-        FX_PushRenderTarget(0, CTexture::s_ptexSceneTarget, NULL);
-        FX_PushRenderTarget(1, CTexture::s_ptexSceneSpecularAccMap, NULL);
-
-        SD3DPostEffectsUtils::ShBeginPass(pShader, pTechNameApply, FEF_DONTSETSTATES);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexHDRTarget, 0, FILTER_LINEAR);
-        PostProcessUtils().SetTexture(CTexture::s_ptexSceneDiffuseAccMap, 1, FILTER_LINEAR);
-        pPassParams.x = 1.0f;
-        pShader->FXSetPSFloat(pPassParamsName, &pPassParams, 1);
-
-        SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-        SD3DPostEffectsUtils::ShEndPass();
-
-        FX_PopRenderTarget(0);
-        FX_PopRenderTarget(1);
-
-        // Second pass.
-        FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, NULL);
-        FX_PushRenderTarget(1, CTexture::s_ptexSceneDiffuseAccMap, NULL);
-
-        SD3DPostEffectsUtils::ShBeginPass(pShader, pTechNameApply, FEF_DONTSETSTATES);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexSceneTarget, 0, FILTER_LINEAR);
-        PostProcessUtils().SetTexture(CTexture::s_ptexSceneSpecularAccMap, 1, FILTER_LINEAR);
-        pPassParams.x = 0.5f;
-        pShader->FXSetPSFloat(pPassParamsName, &pPassParams, 1);
-
-        SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-        SD3DPostEffectsUtils::ShEndPass();
-
-        FX_PopRenderTarget(0);
-        FX_PopRenderTarget(1);
-
-        // Third pass.
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-        FX_PushRenderTarget(0, CTexture::s_ptexSceneTarget, NULL);
-        FX_PushRenderTarget(1, CTexture::s_ptexZTarget, NULL);
-
-        SD3DPostEffectsUtils::ShBeginPass(pShader, pTechNameApply, FEF_DONTSETSTATES);
-        FX_SetState(GS_NODEPTHTEST);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexHDRTarget, 0, FILTER_LINEAR);
-        PostProcessUtils().SetTexture(CTexture::s_ptexSceneDiffuseAccMap, 1, FILTER_LINEAR);
-        pPassParams.x = 0.25f;
-        pShader->FXSetPSFloat(pPassParamsName, &pPassParams, 1);
-
-        SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-        SD3DPostEffectsUtils::ShEndPass();
-
-        FX_PopRenderTarget(0);
-        FX_PopRenderTarget(1);
-
-        gcpRendD3D->m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-    }
-
-    PostProcessUtils().CopyTextureToScreen(CTexture::s_ptexSceneTarget);
-
-    EF_Scissor(false, 0, 0, 0, 0);
-
-    FX_Commit();
-
-    FX_ResetPipe();
-
-    gcpRendD3D->Unset2DMode(backupSceneMatrices);
-
-    return true;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredRender.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredRender.cpp
deleted file mode 100644
index 7b8c22b9bc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredRender.cpp
+++ /dev/null
@@ -1,1800 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "Common/RenderCapabilities.h"
-#include "../Common/Textures/TextureManager.h"
-#include "GraphicsPipeline/FurPasses.h"
-
-#include <AzCore/NativeUI/NativeUIRequests.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DDeferredRender_cpp)
-#endif
-
-
-bool CD3D9Renderer::FX_DeferredShadowPassSetupBlend(const Matrix44& mShadowTexGen, int nFrustumNum, float maskRTWidth, float maskRTHeight)
-{
-    //set ScreenToWorld Expansion Basis
-    Vec4r vWBasisX, vWBasisY, vWBasisZ, vCamPos;
-    CShadowUtils::ProjectScreenToWorldExpansionBasis(mShadowTexGen, GetCamera(), Vec2(m_TemporalJitterClipSpace.x, m_TemporalJitterClipSpace.y), maskRTWidth, maskRTHeight, vWBasisX, vWBasisY, vWBasisZ, vCamPos, true, &m_RenderTileInfo);
-
-    Matrix44A* mat = &gRenDev->m_TempMatrices[nFrustumNum][2];
-    mat->SetRow4(0, Vec4r(vWBasisX.x, vWBasisY.x, vWBasisZ.x, vCamPos.x));
-    mat->SetRow4(1, Vec4r(vWBasisX.y, vWBasisY.y, vWBasisZ.y, vCamPos.y));
-    mat->SetRow4(2, Vec4r(vWBasisX.z, vWBasisY.z, vWBasisZ.z, vCamPos.z));
-    mat->SetRow4(3, Vec4r(vWBasisX.w, vWBasisY.w, vWBasisZ.w, vCamPos.w));
-    
-    return true;
-}
-
-bool CD3D9Renderer::FX_DeferredShadowPassSetup(const Matrix44& mShadowTexGen, [[maybe_unused]] ShadowMapFrustum* pShadowFrustum, float maskRTWidth, float maskRTHeight, Matrix44& mScreenToShadow, bool bNearest)
-{
-    //set ScreenToWorld Expansion Basis
-    Vec4r vWBasisX, vWBasisY, vWBasisZ, vCamPos;
-    bool bVPosSM30 = (GetFeatures() & (RFT_HW_SM30 | RFT_HW_SM40)) != 0;
-
-    CCamera Cam = GetCamera();
-    if (bNearest && m_drawNearFov > 1.0f && m_drawNearFov < 179.0f)
-    {
-        Cam.SetFrustum(Cam.GetViewSurfaceX(), Cam.GetViewSurfaceZ(), DEG2RAD(m_drawNearFov), Cam.GetNearPlane(), Cam.GetFarPlane(), Cam.GetPixelAspectRatio());
-    }
-
-    CShadowUtils::ProjectScreenToWorldExpansionBasis(mShadowTexGen, Cam, Vec2(m_TemporalJitterClipSpace.x, m_TemporalJitterClipSpace.y), maskRTWidth, maskRTHeight, vWBasisX, vWBasisY, vWBasisZ, vCamPos, bVPosSM30, &m_RenderTileInfo);
-
-    //TOFIX: create PB components for these params
-    //creating common projection matrix for depth reconstruction
-
-    mScreenToShadow = Matrix44(vWBasisX.x, vWBasisX.y, vWBasisX.z, vWBasisX.w,
-            vWBasisY.x, vWBasisY.y, vWBasisY.z, vWBasisY.w,
-            vWBasisZ.x, vWBasisZ.y, vWBasisZ.z, vWBasisZ.w,
-            vCamPos.x, vCamPos.y, vCamPos.z, vCamPos.w);
-
-    //save magnitudes separately to inrease precision
-    m_cEF.m_TempVecs[14].x = vWBasisX.GetLength();
-    m_cEF.m_TempVecs[14].y = vWBasisY.GetLength();
-    m_cEF.m_TempVecs[14].z = vWBasisZ.GetLength();
-    m_cEF.m_TempVecs[14].w = 1.0f;
-
-    //Vec4r normalization in doubles
-    vWBasisX /= vWBasisX.GetLength();
-    vWBasisY /= vWBasisY.GetLength();
-    vWBasisZ /= vWBasisZ.GetLength();
-
-    m_cEF.m_TempVecs[10].x = vWBasisX.x;
-    m_cEF.m_TempVecs[10].y = vWBasisX.y;
-    m_cEF.m_TempVecs[10].z = vWBasisX.z;
-    m_cEF.m_TempVecs[10].w = vWBasisX.w;
-
-    m_cEF.m_TempVecs[11].x = vWBasisY.x;
-    m_cEF.m_TempVecs[11].y = vWBasisY.y;
-    m_cEF.m_TempVecs[11].z = vWBasisY.z;
-    m_cEF.m_TempVecs[11].w = vWBasisY.w;
-
-    m_cEF.m_TempVecs[12].x = vWBasisZ.x;
-    m_cEF.m_TempVecs[12].y = vWBasisZ.y;
-    m_cEF.m_TempVecs[12].z = vWBasisZ.z;
-    m_cEF.m_TempVecs[12].w = vWBasisZ.w;
-
-    m_cEF.m_TempVecs[13].x = CV_r_ShadowsAdaptionRangeClamp;
-    m_cEF.m_TempVecs[13].y = CV_r_ShadowsAdaptionSize * 250.f;//to prevent akwardy high number in cvar
-    m_cEF.m_TempVecs[13].z = CV_r_ShadowsAdaptionMin;
-
-    // Particles shadow constants
-    if (m_RP.m_nPassGroupID == EFSLIST_TRANSP || m_RP.m_nPassGroupID ==  EFSLIST_HALFRES_PARTICLES)
-    {
-        m_cEF.m_TempVecs[13].x = CV_r_ShadowsParticleKernelSize;
-        m_cEF.m_TempVecs[13].y = CV_r_ShadowsParticleJitterAmount;
-        m_cEF.m_TempVecs[13].z = CV_r_ShadowsParticleAnimJitterAmount * 0.05f;
-        m_cEF.m_TempVecs[13].w = CV_r_ShadowsParticleNormalEffect;
-    }
-
-    m_cEF.m_TempVecs[0].x =  vCamPos.x;
-    m_cEF.m_TempVecs[0].y =  vCamPos.y;
-    m_cEF.m_TempVecs[0].z =  vCamPos.z;
-    m_cEF.m_TempVecs[0].w =  vCamPos.w;
-
-    return true;
-}
-
-
-HRESULT GetSampleOffsetsGaussBlur5x5Bilinear(DWORD dwD3DTexWidth, DWORD dwD3DTexHeight, Vec4* avTexCoordOffset, Vec4* avSampleWeight, FLOAT fMultiplier)
-{
-    float tu = 1.0f / (float)dwD3DTexWidth;
-    float tv = 1.0f / (float)dwD3DTexHeight;
-    float totalWeight = 0.0f;
-    Vec4 vWhite(1.f, 1.f, 1.f, 1.f);
-    float fWeights[6];
-
-    int index = 0;
-    for (int x = -2; x <= 2; x++, index++)
-    {
-        fWeights[index] = PostProcessUtils().GaussianDistribution2D((float)x, 0.f, 4);
-    }
-
-    //  compute weights for the 2x2 taps.  only 9 bilinear taps are required to sample the entire area.
-    index = 0;
-    for (int y = -2; y <= 2; y += 2)
-    {
-        float tScale = (y == 2) ? fWeights[4] : (fWeights[y + 2] + fWeights[y + 3]);
-        float tFrac  = fWeights[y + 2] / tScale;
-        float tOfs   = ((float)y + (1.f - tFrac)) * tv;
-        for (int x = -2; x <= 2; x += 2, index++)
-        {
-            float sScale = (x == 2) ? fWeights[4] : (fWeights[x + 2] + fWeights[x + 3]);
-            float sFrac  = fWeights[x + 2] / sScale;
-            float sOfs   = ((float)x + (1.f - sFrac)) * tu;
-            avTexCoordOffset[index] = Vec4(sOfs, tOfs, 0, 1);
-            avSampleWeight[index]   = vWhite * sScale * tScale;
-            totalWeight += sScale * tScale;
-        }
-    }
-
-
-    for (int i = 0; i < index; i++)
-    {
-        avSampleWeight[i] *= (fMultiplier / totalWeight);
-    }
-
-    return S_OK;
-}
-
-int CRenderer::FX_ApplyShadowQuality()
-{
-    SShaderProfile* pSP = &m_cEF.m_ShaderProfiles[eST_Shadow];
-    const uint64 quality    = g_HWSR_MaskBit[HWSR_QUALITY];
-    const uint64 quality1   = g_HWSR_MaskBit[HWSR_QUALITY1];
-    m_RP.m_FlagsShader_RT &= ~(quality | quality1);
-
-    int nQuality = (int)pSP->GetShaderQuality();
-    m_RP.m_nShaderQuality = nQuality;
-    switch (nQuality)
-    {
-    case eSQ_Medium:
-        m_RP.m_FlagsShader_RT |= quality;
-        break;
-    case eSQ_High:
-        m_RP.m_FlagsShader_RT |= quality1;
-        break;
-    case eSQ_VeryHigh:
-        m_RP.m_FlagsShader_RT |= quality;
-        m_RP.m_FlagsShader_RT |= quality1;
-        break;
-    }
-    return nQuality;
-}
-
-void CD3D9Renderer::FX_StateRestore([[maybe_unused]] int prevState)
-{
-}
-
-//setup pass offset
-// Draw a fullscreen quad to sample the RT
-//EF_Commit() is called here
-//////////////////////////////////////////////////////////////////////////
-// X Blur
-// Draw a fullscreen quad to sample the RT
-void CD3D9Renderer::FX_StencilTestCurRef(bool bEnable, [[maybe_unused]] bool bNoStencilClear, bool bStFuncEqual)
-{
-    if (bEnable)
-    {
-        int nStencilState =
-            STENC_FUNC(bStFuncEqual ? FSS_STENCFUNC_EQUAL : FSS_STENCFUNC_NOTEQUAL) |
-            STENCOP_FAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-            STENCOP_PASS(FSS_STENCOP_KEEP);
-
-        FX_SetStencilState(nStencilState, m_nStencilMaskRef, 0xFFFFFFFF, 0xFFFFFFFF);
-        FX_SetState(m_RP.m_CurState | GS_STENCIL);
-    }
-    else
-    {
-    }
-}
-
-void CD3D9Renderer::FX_DeferredShadowPass([[maybe_unused]] const SRenderLight* pLight, ShadowMapFrustum* pShadowFrustum, bool bShadowPass, bool bCloudShadowPass, bool bStencilPrepass, int nLod)
-{
-    uint32 nPassCount = 0;
-    CShader*  pShader = CShaderMan::s_ShaderShadowMaskGen;
-    static CCryNameTSCRC DeferredShadowTechName = "DeferredShadowPass";
-
-    D3DSetCull(eCULL_Back, true); //fs quads should not revert test..
-
-    if (pShadowFrustum->m_eFrustumType != ShadowMapFrustum::e_Nearest && !bCloudShadowPass)
-    {
-        if (pShadowFrustum->bUseShadowsPool || pShadowFrustum->pDepthTex == NULL)
-        {
-            return;
-        }
-    }
-
-    if (pShadowFrustum->m_eFrustumType == ShadowMapFrustum::e_HeightMapAO)
-    {
-        return;
-    }
-
-    int nShadowQuality = FX_ApplyShadowQuality();
-
-    //////////////////////////////////////////////////////////////////////////
-    // set global shader RT flags
-    //////////////////////////////////////////////////////////////////////////
-
-    // set pass dependent RT flags
-    m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[ HWSR_SAMPLE0 ] | g_HWSR_MaskBit[ HWSR_SAMPLE1 ] | g_HWSR_MaskBit[ HWSR_SAMPLE2 ] | g_HWSR_MaskBit[ HWSR_SAMPLE4 ] |
-                               g_HWSR_MaskBit[HWSR_CUBEMAP0] | g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ]  | g_HWSR_MaskBit[ HWSR_POINT_LIGHT ] |
-                               g_HWSR_MaskBit[ HWSR_SHADOW_MIXED_MAP_G16R16 ] | g_HWSR_MaskBit[HWSR_SHADOW_JITTERING] | g_HWSR_MaskBit[HWSR_NEAREST]);
-
-    if (!pShadowFrustum->bBlendFrustum)
-    {
-        m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-    }
-
-    if (m_shadowJittering > 0.0f)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_SHADOW_JITTERING ];
-    }
-
-    //enable hw-pcf per frustum
-    if (pShadowFrustum->bHWPCFCompare)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ];
-    }
-
-    if (pShadowFrustum->m_eFrustumType == ShadowMapFrustum::e_Nearest)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NEAREST];
-    }
-
-    if (bCloudShadowPass || (CV_r_ShadowsScreenSpace && bShadowPass && pShadowFrustum->nShadowMapLod == 0))
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_SAMPLE2 ];
-    }
-
-    ConfigShadowTexgen(0, pShadowFrustum);
-    if (nShadowQuality == eSQ_VeryHigh) //DX10 only
-    {
-        ConfigShadowTexgen(1, pShadowFrustum, -1, false, false);
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_SAMPLE1 ];
-    }
-
-    int newState = m_RP.m_CurState;
-    newState &= ~(GS_DEPTHWRITE | GS_BLSRC_ONE | GS_BLDST_ONE | GS_BLOP_MAX);
-    newState |= GS_NODEPTHTEST;
-
-    if (pShadowFrustum->m_eFrustumType == ShadowMapFrustum::e_Nearest)
-    {
-        newState &= ~(GS_NODEPTHTEST | GS_DEPTHFUNC_MASK);
-        newState |= GS_DEPTHFUNC_GREAT;
-    }
-
-    // In GMEM, we do our own clouds shadow blending
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr) ||
-        (gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && !bCloudShadowPass))
-    {
-        if (pShadowFrustum->bUseAdditiveBlending)
-        {
-            newState |= GS_BLSRC_ONE | GS_BLDST_ONE | GS_BLOP_MAX;
-        }
-        else if (bShadowPass && pShadowFrustum->bBlendFrustum)
-        {
-            newState |= GS_BLSRC_ONE | GS_BLDST_ONE;
-        }
-    }
-
-    pShader->FXSetTechnique(DeferredShadowTechName);
-    pShader->FXBegin(&nPassCount, FEF_DONTSETSTATES);
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //Stencil cull pre-pass for GSM
-    //////////////////////////////////////////////////////////////////////////
-    if (bStencilPrepass)
-    {
-        newState |= GS_STENCIL;
-        //Disable color writes
-        newState |= GS_COLMASK_NONE;
-
-        FX_SetState(newState);
-        //////////////////////////////////////////////////////////////////////////
-        
-        //render clip volume
-        Matrix44 mViewProj = pShadowFrustum->mLightViewMatrix;
-        Matrix44 mViewProjInv = mViewProj.GetInverted();
-        gRenDev->m_TempMatrices[0][0] = mViewProjInv.GetTransposed();
-        
-        FX_SetVStream(0, m_pUnitFrustumVB[SHAPE_SIMPLE_PROJECTOR], 0, sizeof(SVF_P3F_C4B_T2F));
-        FX_SetIStream(m_pUnitFrustumIB[SHAPE_SIMPLE_PROJECTOR], 0, (kUnitObjectIndexSizeof == 2 ? Index16 : Index32));
-            
-        if (!CV_r_ShadowsUseClipVolume || !RenderCapabilities::SupportsDepthClipping())
-        {
-            FX_StencilCullPass(nLod, m_UnitFrustVBSize[SHAPE_SIMPLE_PROJECTOR], m_UnitFrustIBSize[SHAPE_SIMPLE_PROJECTOR], pShader, DS_STENCIL_VOLUME_CLIP, DS_STENCIL_VOLUME_CLIP_FRONTFACING);
-        }
-        else
-        {
-            FX_StencilCullPass(nLod, m_UnitFrustVBSize[SHAPE_SIMPLE_PROJECTOR], m_UnitFrustIBSize[SHAPE_SIMPLE_PROJECTOR], pShader, DS_STENCIL_VOLUME_CLIP);
-        }
-                
-        // camera might be outside cached frustum => do front facing pass as well
-        if (pShadowFrustum->IsCached())
-        {
-            Vec4 vCamPosShadowSpace = Vec4(GetViewParameters().vOrigin, 1.f) * mViewProj;
-            vCamPosShadowSpace /= vCamPosShadowSpace.w;                
-            if (abs(vCamPosShadowSpace.x) > 1.0f || abs(vCamPosShadowSpace.y) > 1.0f || vCamPosShadowSpace.z < 0 || vCamPosShadowSpace.z > 1)
-            {
-                pShader->FXBeginPass(DS_STENCIL_VOLUME_CLIP);
-                if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-                {
-                    D3DSetCull(eCULL_Back);
-                    FX_SetStencilState(
-                                       STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-                                       STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                                       STENCOP_ZFAIL(FSS_STENCOP_ZERO) |
-                                       STENCOP_PASS(FSS_STENCOP_KEEP),
-                                       nLod, 0xFFFFFFFF, 0xFFFF
-                                       );
-                    
-                    FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, m_UnitFrustVBSize[SHAPE_SIMPLE_PROJECTOR], 0, m_UnitFrustIBSize[SHAPE_SIMPLE_PROJECTOR]);
-                }
-                pShader->FXEndPass();
-            }
-        }
-        
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Shadow Pass
-    //////////////////////////////////////////////////////////////////////////
-
-    if (bShadowPass)
-    {
-        newState &= ~(GS_COLMASK_NONE | GS_STENCIL);
-       
-        // When optimizations are on, we need only the R channel.
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && (CRenderer::CV_r_DeferredShadingLBuffersFmt != 2)) // A component write mask of GMEM light diffuse RT
-        {
-            newState |= GS_NOCOLMASK_R | GS_NOCOLMASK_G | GS_NOCOLMASK_B;
-        }
-        else
-        {
-            newState |= GS_NOCOLMASK_G | GS_NOCOLMASK_B | GS_NOCOLMASK_A;
-        }
-
-        if (nLod != 0 && !bCloudShadowPass)
-        {
-            newState |= GS_STENCIL;
-
-            FX_SetStencilState(
-                STENC_FUNC(FSS_STENCFUNC_EQUAL) |
-                STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-                STENCOP_PASS(FSS_STENCOP_KEEP),
-                nLod, 0xFFFFFFFF, 0xFFFFFFFF
-                );
-        }
-
-        FX_SetState(newState);
-
-        pShader->FXBeginPass(bCloudShadowPass ? DS_CLOUDS_SEPARATE : DS_SHADOW_PASS);
-
-        const float fCustomZ = pShadowFrustum->m_eFrustumType == ShadowMapFrustum::e_Nearest ? CV_r_DrawNearZRange - 0.001f : 0.f;
-        PostProcessUtils().DrawFullScreenTriWPOS(0, 0, fCustomZ);
-
-        pShader->FXEndPass();
-    }
-    pShader->FXEnd();
-}
-
-
-#define LOCAL_SAFE_RELEASE(buffer)                       \
-    if (buffer)                                          \
-    {                                                    \
-        gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(buffer); \
-        buffer = nullptr;                                \
-    }
-
-bool CD3D9Renderer::CreateAuxiliaryMeshes()
-{
-    t_arrDeferredMeshIndBuff arrDeferredInds;
-    t_arrDeferredMeshVertBuff arrDeferredVerts;
-
-    uint nProjectorMeshStep = 10;
-
-    //projector frustum mesh
-    for (int i = 0; i < 3; i++)
-    {
-        uint nFrustTess = 11  + nProjectorMeshStep * i;
-        CDeferredRenderUtils::CreateUnitFrustumMesh(nFrustTess, nFrustTess, arrDeferredInds, arrDeferredVerts);
-        LOCAL_SAFE_RELEASE(m_pUnitFrustumVB[SHAPE_PROJECTOR + i]);
-        LOCAL_SAFE_RELEASE(m_pUnitFrustumIB[SHAPE_PROJECTOR + i]);
-        COMPILE_TIME_ASSERT(kUnitObjectIndexSizeof == sizeof(arrDeferredInds[0]));
-        CreateUnitVolumeMesh(arrDeferredInds, arrDeferredVerts, m_pUnitFrustumIB[SHAPE_PROJECTOR + i], m_pUnitFrustumVB[SHAPE_PROJECTOR + i]);
-        m_UnitFrustVBSize[SHAPE_PROJECTOR + i] = arrDeferredVerts.size();
-        m_UnitFrustIBSize[SHAPE_PROJECTOR + i] = arrDeferredInds.size();
-    }
-
-    //clip-projector frustum mesh
-    for (int i = 0; i < 3; i++)
-    {
-        uint nClipFrustTess = 41  + nProjectorMeshStep * i;
-        CDeferredRenderUtils::CreateUnitFrustumMesh(nClipFrustTess, nClipFrustTess, arrDeferredInds, arrDeferredVerts);
-        LOCAL_SAFE_RELEASE(m_pUnitFrustumVB[SHAPE_CLIP_PROJECTOR + i]);
-        LOCAL_SAFE_RELEASE(m_pUnitFrustumIB[SHAPE_CLIP_PROJECTOR + i]);
-        COMPILE_TIME_ASSERT(kUnitObjectIndexSizeof == sizeof(arrDeferredInds[0]));
-        CreateUnitVolumeMesh(arrDeferredInds, arrDeferredVerts, m_pUnitFrustumIB[SHAPE_CLIP_PROJECTOR + i], m_pUnitFrustumVB[SHAPE_CLIP_PROJECTOR + i]);
-        m_UnitFrustVBSize[SHAPE_CLIP_PROJECTOR + i] = arrDeferredVerts.size();
-        m_UnitFrustIBSize[SHAPE_CLIP_PROJECTOR + i] = arrDeferredInds.size();
-    }
-
-    //omni-light mesh
-    //Use tess3 for big lights
-    CDeferredRenderUtils::CreateUnitSphere(2, arrDeferredInds, arrDeferredVerts);
-    LOCAL_SAFE_RELEASE(m_pUnitFrustumVB[SHAPE_SPHERE]);
-    LOCAL_SAFE_RELEASE(m_pUnitFrustumIB[SHAPE_SPHERE]);
-    COMPILE_TIME_ASSERT(kUnitObjectIndexSizeof == sizeof(arrDeferredInds[0]));
-    CreateUnitVolumeMesh(arrDeferredInds, arrDeferredVerts, m_pUnitFrustumIB[SHAPE_SPHERE], m_pUnitFrustumVB[SHAPE_SPHERE]);
-    m_UnitFrustVBSize[SHAPE_SPHERE] = arrDeferredVerts.size();
-    m_UnitFrustIBSize[SHAPE_SPHERE] = arrDeferredInds.size();
-
-    //unit box
-    CDeferredRenderUtils::CreateUnitBox(arrDeferredInds, arrDeferredVerts);
-    LOCAL_SAFE_RELEASE(m_pUnitFrustumVB[SHAPE_BOX]);
-    LOCAL_SAFE_RELEASE(m_pUnitFrustumIB[SHAPE_BOX]);
-    COMPILE_TIME_ASSERT(kUnitObjectIndexSizeof == sizeof(arrDeferredInds[0]));
-    CreateUnitVolumeMesh(arrDeferredInds, arrDeferredVerts, m_pUnitFrustumIB[SHAPE_BOX], m_pUnitFrustumVB[SHAPE_BOX]);
-    m_UnitFrustVBSize[SHAPE_BOX] = arrDeferredVerts.size();
-    m_UnitFrustIBSize[SHAPE_BOX] = arrDeferredInds.size();
-
-    //frustum approximated with 8 vertices
-    CDeferredRenderUtils::CreateSimpleLightFrustumMesh(arrDeferredInds, arrDeferredVerts);
-    LOCAL_SAFE_RELEASE(m_pUnitFrustumVB[SHAPE_SIMPLE_PROJECTOR]);
-    LOCAL_SAFE_RELEASE(m_pUnitFrustumIB[SHAPE_SIMPLE_PROJECTOR]);
-    COMPILE_TIME_ASSERT(kUnitObjectIndexSizeof == sizeof(arrDeferredInds[0]));
-    CreateUnitVolumeMesh(arrDeferredInds, arrDeferredVerts, m_pUnitFrustumIB[SHAPE_SIMPLE_PROJECTOR], m_pUnitFrustumVB[SHAPE_SIMPLE_PROJECTOR]);
-    m_UnitFrustVBSize[SHAPE_SIMPLE_PROJECTOR] = arrDeferredVerts.size();
-    m_UnitFrustIBSize[SHAPE_SIMPLE_PROJECTOR] = arrDeferredInds.size();
-
-    // FS quad
-    CDeferredRenderUtils::CreateQuad(arrDeferredInds, arrDeferredVerts);
-    LOCAL_SAFE_RELEASE(m_pQuadVB);
-    D3DBuffer* pDummyQuadIB = 0; // reusing CreateUnitVolumeMesh.
-    CreateUnitVolumeMesh(arrDeferredInds, arrDeferredVerts, pDummyQuadIB, m_pQuadVB);
-    m_nQuadVBSize = arrDeferredVerts.size();
-
-    return true;
-}
-
-bool CD3D9Renderer::ReleaseAuxiliaryMeshes()
-{
-    for (int i = 0; i < SHAPE_MAX; i++)
-    {
-        LOCAL_SAFE_RELEASE(m_pUnitFrustumVB[i]);
-        LOCAL_SAFE_RELEASE(m_pUnitFrustumIB[i]);
-    }
-
-    LOCAL_SAFE_RELEASE(m_pQuadVB);
-    m_nQuadVBSize = 0;
-
-    return true;
-}
-
-bool CD3D9Renderer::CreateUnitVolumeMesh(t_arrDeferredMeshIndBuff& arrDeferredInds, t_arrDeferredMeshVertBuff& arrDeferredVerts, D3DBuffer*& pUnitFrustumIB, D3DBuffer*& pUnitFrustumVB)
-{
-    HRESULT hr = S_OK;
-
-    //FIX: try default pools
-
-    D3D11_BUFFER_DESC BufDesc;
-    ZeroStruct(BufDesc);
-    D3D11_SUBRESOURCE_DATA SubResData;
-    ZeroStruct(SubResData);
-
-    if (!arrDeferredVerts.empty())
-    {
-        BufDesc.ByteWidth = arrDeferredVerts.size() * sizeof(SDeferMeshVert);
-        BufDesc.Usage = D3D11_USAGE_IMMUTABLE;
-        BufDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-        BufDesc.CPUAccessFlags = 0;
-        BufDesc.MiscFlags = 0;
-
-        SubResData.pSysMem = &arrDeferredVerts[0];
-        SubResData.SysMemPitch = 0;
-        SubResData.SysMemSlicePitch = 0;
-
-        hr = gcpRendD3D->m_DevMan.CreateD3D11Buffer(&BufDesc, &SubResData, (ID3D11Buffer**)&pUnitFrustumVB, "UnitVolumeMesh");
-        assert(SUCCEEDED(hr));
-    }
-
-    if (!arrDeferredInds.empty())
-    {
-        ZeroStruct(BufDesc);
-        BufDesc.ByteWidth = arrDeferredInds.size() * sizeof(arrDeferredInds[0]);
-        BufDesc.Usage = D3D11_USAGE_IMMUTABLE;
-        BufDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-        BufDesc.CPUAccessFlags = 0;
-        BufDesc.MiscFlags = 0;
-
-        ZeroStruct(SubResData);
-        SubResData.pSysMem = &arrDeferredInds[0];
-        SubResData.SysMemPitch = 0;
-        SubResData.SysMemSlicePitch = 0;
-
-        hr = gcpRendD3D->m_DevMan.CreateD3D11Buffer(&BufDesc, &SubResData, &pUnitFrustumIB, "UnitVolumeMesh");
-        assert(SUCCEEDED(hr));
-    }
-
-    return SUCCEEDED(hr);
-}
-
-void CD3D9Renderer::SetBackFacingStencillState(int nStencilID)
-{
-    int newState = m_RP.m_CurState;
-    
-    //Set LS colormask
-    //debug states
-    if IsCVarConstAccess(constexpr) (CV_r_DebugLightVolumes /*&& m_RP.m_TI.m_PersFlags2 & d3dRBPF2_ENABLESTENCILPB*/)
-    {
-        newState &= ~GS_COLMASK_NONE;
-        newState &= ~GS_NODEPTHTEST;
-        //newState |= GS_NODEPTHTEST;
-        newState |= GS_DEPTHWRITE;
-        newState |= (0xFFFFFFF0 << GS_COLMASK_SHIFT) & GS_COLMASK_MASK;
-        if IsCVarConstAccess(constexpr) (CV_r_DebugLightVolumes > 1)
-        {
-            newState |= GS_WIREFRAME;
-        }
-    }
-    else
-    {
-        //  //Disable color writes
-        //if (CV_r_ShadowsStencilPrePass == 2)
-        //{
-        //  newState &= ~GS_COLMASK_NONE;
-        //  newState |= GS_COLMASK_A;
-        //}
-        //else
-        {
-            newState |= GS_COLMASK_NONE;
-        }
-
-
-        //setup depth test and enable stencil
-        newState &= ~(GS_NODEPTHTEST | GS_DEPTHWRITE | GS_DEPTHFUNC_MASK);
-        newState |= GS_DEPTHFUNC_LEQUAL | GS_STENCIL;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //draw back faces - inc when depth fail. 
-    //////////////////////////////////////////////////////////////////////////
-    int stencilFunc = FSS_STENCFUNC_ALWAYS;
-    uint32 nCurrRef = 0;
-    if (nStencilID >= 0)
-    {
-        D3DSetCull(eCULL_Front);
-
-        //if (nStencilID>0)
-        stencilFunc = m_RP.m_CurStencilCullFunc;
-
-        FX_SetStencilState(
-            STENC_FUNC(stencilFunc) |
-            STENCOP_FAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_REPLACE) |
-            STENCOP_PASS(FSS_STENCOP_KEEP),
-            nStencilID, 0xFFFFFFFF, 0xFFFF
-            );
-        //    uint32 nStencilWriteMask = 1 << nStencilID; //0..7
-        //    FX_SetStencilState(
-        //      STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-        //      STENCOP_FAIL(FSS_STENCOP_KEEP) |
-        //      STENCOP_ZFAIL(FSS_STENCOP_REPLACE) |
-        //      STENCOP_PASS(FSS_STENCOP_KEEP),
-        //      0xFF, 0xFFFFFFFF, nStencilWriteMask
-        //      );
-    }
-    else if (nStencilID == -4) // set all pixels with nCurRef within clip volume to nCurRef-1
-    {
-        stencilFunc = FSS_STENCFUNC_EQUAL;
-
-        nCurrRef = m_nStencilMaskRef;
-
-        FX_SetStencilState(
-            STENC_FUNC(stencilFunc) |
-            STENCOP_FAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_DECR) |
-            STENCOP_PASS(FSS_STENCOP_KEEP),
-            nCurrRef, 0xFFFFFFFF, 0xFFFF
-            );
-
-        m_nStencilMaskRef--;
-        D3DSetCull(eCULL_Front);
-    }
-    else
-    {
-        if (nStencilID == -3) //TD: Fill stencil by values=1 for drawn volumes in order to avoid overdraw
-        {
-            stencilFunc = FSS_STENCFUNC_LEQUAL;
-
-            m_nStencilMaskRef--;
-        }
-        else if (nStencilID == -2)
-        {
-            stencilFunc = FSS_STENCFUNC_GEQUAL;
-            m_nStencilMaskRef--;
-        }
-        else
-        {
-            stencilFunc = FSS_STENCFUNC_GEQUAL;
-            m_nStencilMaskRef++;
-            //m_nStencilMaskRef = m_nStencilMaskRef%STENC_MAX_REF + m_nStencilMaskRef/STENC_MAX_REF;
-            if (m_nStencilMaskRef > STENC_MAX_REF)
-            {
-                int sX = 0, sY = 0, sWidth = 0, sHeight = 0;
-                bool bScissorEnabled = EF_GetScissorState(sX, sY, sWidth, sHeight);
-                EF_Scissor(false, 0, 0, 0, 0);
-
-                if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr)) // We must clear via full pass or else it'll kick buffers off GMEM
-                {
-                    uint32 prevState = m_RP.m_CurState;
-                    uint32 state = 0;
-                    state |= GS_COLMASK_NONE;
-                    state |= GS_STENCIL;
-                    FX_SetStencilState(
-                        STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-                        STENCOP_FAIL(FSS_STENCOP_ZERO) |
-                        STENCOP_ZFAIL(FSS_STENCOP_ZERO) |
-                        STENCOP_PASS(FSS_STENCOP_ZERO),
-                        0, 0xFFFFFFFF, 0xFFFF);
-                    FX_SetState(state);
-                    SD3DPostEffectsUtils::ClearScreen(0, 0, 0, 0);
-                    FX_SetState(prevState);
-                }
-                else
-                {
-                    EF_ClearTargetsImmediately(FRT_CLEAR_STENCIL, Clr_Unused.r, 1);
-                }
-
-                EF_Scissor(bScissorEnabled, sX, sY, sWidth, sHeight);
-                m_nStencilMaskRef = 2;
-            }
-        }
-
-        nCurrRef = m_nStencilMaskRef;
-        assert(m_nStencilMaskRef > 0 && m_nStencilMaskRef <= STENC_MAX_REF);
-
-        D3DSetCull(eCULL_Front);
-        FX_SetStencilState(
-            STENC_FUNC(stencilFunc) |
-            STENCOP_FAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_REPLACE) |
-            STENCOP_PASS(FSS_STENCOP_KEEP),
-            nCurrRef, 0xFFFFFFFF, 0xFFFF
-            );
-    }
-
-    FX_SetState(newState);    
-    FX_Commit();
-}
-
-void CD3D9Renderer::SetFrontFacingStencillState(int nStencilID)
-{    
-    if (nStencilID < 0)
-    {        
-        D3DSetCull(eCULL_Back);        
-        //TD: deferred meshed should have proper front facing on dx10
-        int currentStencilFunction = m_RP.m_CurStencilState & FSS_STENCFUNC_MASK;
-        FX_SetStencilState(
-            STENC_FUNC(currentStencilFunction) |
-            STENCOP_FAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_ZERO) |
-            STENCOP_PASS(FSS_STENCOP_KEEP),
-            m_nStencilMaskRef, 0xFFFFFFFF, 0xFFFF
-        );
-
-        FX_SetState(m_RP.m_CurState);
-        FX_Commit();
-    }   
-}
-
-//This version of the function uses two different passes and clamps the back facing triangles to the far plane in the vertex shader. 
-//Use this when you dont have support for DepthClipEnable. Also, this setup assumes reverse depth. 
-void CD3D9Renderer::FX_StencilCullPass(int nStencilID, int nNumVers, int nNumInds, CShader*  pShader, int backFacePass, int frontFacePass )
-{
-    //Render pass for back facing triangles
-    pShader->FXBeginPass(backFacePass);
-    
-    //We can only check for vertexDeclaration after setting the pass. We have techniques with
-    //multiple passes that can use different input layout. This way we ensure we are matching against
-    //the correct input layout of the correct pass
-    if (FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        AZ_Assert(false, "Skipping the draw inside FX_StencilCullPass as the vertex declaration for shader %s pass %i failed", pShader->m_NameShader.c_str(), backFacePass);
-        pShader->FXEndPass();
-        return;
-    }
-    SetBackFacingStencillState(nStencilID);
-    FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nNumVers, 0, nNumInds);       
-    pShader->FXEndPass();
-   
-    //Render pass for front facing triangles
-    pShader->FXBeginPass(frontFacePass);
-    SetFrontFacingStencillState(nStencilID);
-    //skip front faces when nStencilID is specified
-    if (nStencilID < 0)
-    {
-        FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nNumVers, 0, nNumInds);
-    }
-    pShader->FXEndPass();    
-
-    return;
-}
-
-
-//This version of the function assumes we have support for DepthClipEnable. Assumes reverse depth. 
-void CD3D9Renderer::FX_StencilCullPass(int nStencilID, int nNumVers, int nNumInds, CShader*  pShader, int backFacePass)
-{
-    //Render pass for back facing triangles
-    pShader->FXBeginPass(backFacePass);
-    
-    //We can only check for vertexDeclaration after setting the pass. We have techniques with
-    //multiple passes that can use different input layout. This way we ensure we are matching against
-    //the correct input layout of the correct pass
-    if (FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        //AZ_Assert(false, "Skipping the draw inside FX_StencilCullPass as the vertex declaration for shader %s pass %i failed", pShader->m_NameShader.c_str(), backFacePass);
-        pShader->FXEndPass();
-        return;
-    }
-    
-    SetBackFacingStencillState(nStencilID);
-
-    // Don't clip pixels beyond far clip plane
-    SStateRaster PreviousRS = m_StatesRS[m_nCurStateRS];
-    SStateRaster NoDepthClipRS = PreviousRS;
-    NoDepthClipRS.Desc.DepthClipEnable = false;
-    SetRasterState(&NoDepthClipRS);
-
-    FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nNumVers, 0, nNumInds);   
-    SetRasterState(&PreviousRS);
-
-    //Render pass for front facing triangles
-    SetFrontFacingStencillState(nStencilID);
-    //skip front faces when nStencilID is specified
-    if (nStencilID < 0)
-    {
-        FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nNumVers, 0, nNumInds);
-    }
-    pShader->FXEndPass();
-    return;
-}
-
-void CD3D9Renderer::FX_StencilFrustumCull(int nStencilID, const SRenderLight* pLight, ShadowMapFrustum* pFrustum, int nAxis)
-{
-    EShapeMeshType nPrimitiveID = m_RP.m_nDeferredPrimitiveID; //SHAPE_PROJECTOR;
-    uint32 nPassCount = 0;
-    CShader*  pShader = CShaderMan::s_ShaderShadowMaskGen;
-    static CCryNameTSCRC StencilCullTechName = "DeferredShadowPass";
-
-
-    Matrix44A mProjection = m_IdentityMatrix;
-    Matrix44A mView = m_IdentityMatrix;
-
-    assert(pLight != NULL);
-    bool bAreaLight = (pLight->m_Flags & DLF_AREA_LIGHT) && pLight->m_fAreaWidth && pLight->m_fAreaHeight && pLight->m_fLightFrustumAngle && CRenderer::CV_r_DeferredShadingAreaLights;
-
-    Vec3 vOffsetDir(0, 0, 0);
-
-    //un-projection matrix calc
-    if (pFrustum == NULL)
-    {
-        ITexture* pLightTexture = pLight->GetLightTexture();
-        if (pLight->m_fProjectorNearPlane < 0)
-        {
-            SRenderLight instLight = *pLight;
-            vOffsetDir = (-pLight->m_fProjectorNearPlane) * (pLight->m_ObjMatrix.GetColumn0().GetNormalized());
-            instLight.SetPosition(instLight.m_Origin - vOffsetDir);
-            instLight.m_fRadius -= pLight->m_fProjectorNearPlane;
-            CShadowUtils::GetCubemapFrustumForLight(&instLight, nAxis, 160.0f, &mProjection, &mView, false); // 3.0f -  offset to make sure that frustums are intersected
-        }
-        else
-        if ((pLight->m_Flags & DLF_PROJECT) &&  pLightTexture && !(pLightTexture->GetFlags() & FT_REPLICATE_TO_ALL_SIDES))
-        {
-            //projective light
-            //refactor projective light
-
-            //for light source
-            CShadowUtils::GetCubemapFrustumForLight(pLight, nAxis, pLight->m_fLightFrustumAngle * 2.f /*CShadowUtils::g_fOmniLightFov+3.0f*/, &mProjection, &mView, false); // 3.0f -  offset to make sure that frustums are intersected
-        }
-        else //omni/area light
-        {
-            //////////////// light sphere/box processing /////////////////////////////////
-            Matrix44A origMatView = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-
-            float fExpensionRadius = pLight->m_fRadius * 1.08f;
-
-            Vec3 vScale(fExpensionRadius, fExpensionRadius, fExpensionRadius);
-
-            Matrix34 mLocal;
-            if (bAreaLight)
-            {
-                mLocal = CShadowUtils::GetAreaLightMatrix(pLight, vScale);
-            }
-            else if (pLight->m_Flags & DLF_DEFERRED_CUBEMAPS)
-            {
-                Matrix33 rotMat(pLight->m_ObjMatrix.GetColumn0().GetNormalized() * pLight->m_ProbeExtents.x,
-                    pLight->m_ObjMatrix.GetColumn1().GetNormalized() * pLight->m_ProbeExtents.y,
-                    pLight->m_ObjMatrix.GetColumn2().GetNormalized() * pLight->m_ProbeExtents.z);
-                mLocal = Matrix34::CreateTranslationMat(pLight->m_Origin) * rotMat * Matrix34::CreateScale(Vec3(2, 2, 2), Vec3(-1, -1, -1));
-            }
-            else
-            {
-                mLocal.SetIdentity();
-                mLocal.SetScale(vScale, pLight->m_Origin);
-            }
-
-            Matrix44 mLocalTransposed = mLocal.GetTransposed();
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = mLocalTransposed * m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-
-            pShader->FXSetTechnique(StencilCullTechName);
-            pShader->FXBegin(&nPassCount, FEF_DONTSETSTATES);
-
-            // Vertex/index buffer
-            const EShapeMeshType meshType = (bAreaLight || (pLight->m_Flags & DLF_DEFERRED_CUBEMAPS)) ? SHAPE_BOX : SHAPE_SPHERE;
-
-            FX_SetVStream(0, m_pUnitFrustumVB[meshType], 0, sizeof(SVF_P3F_C4B_T2F));
-            FX_SetIStream(m_pUnitFrustumIB[meshType], 0, (kUnitObjectIndexSizeof == 2 ? Index16 : Index32));
-       
-            if (!RenderCapabilities::SupportsDepthClipping())
-            {
-                FX_StencilCullPass(nStencilID == -4 ? -4 : -1, m_UnitFrustVBSize[meshType], m_UnitFrustIBSize[meshType], pShader, DS_SHADOW_CULL_PASS, DS_SHADOW_CULL_PASS_FRONTFACING);
-            }
-            else
-            {
-                FX_StencilCullPass(nStencilID == -4 ? -4 : -1, m_UnitFrustVBSize[meshType], m_UnitFrustIBSize[meshType], pShader, DS_SHADOW_CULL_PASS);
-            }
-
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = origMatView;
-
-            pShader->FXEnd();
-
-            return;
-            //////////////////////////////////////////////////////////////////////////
-        }
-    }
-    else
-    {
-        if (!pFrustum->bOmniDirectionalShadow)
-        {
-            //temporarily disabled since mLightProjMatrix contains pre-multiplied matrix already
-            //pmProjection = &(pFrustum->mLightProjMatrix);
-            mProjection = gRenDev->m_IdentityMatrix;
-            mView = pFrustum->mLightViewMatrix;
-        }
-        else
-        {
-            //calc one of cubemap's frustums
-            Matrix33 mRot = (Matrix33(pLight->m_ObjMatrix));
-            //rotation for shadow frustums is disabled
-            CShadowUtils::GetCubemapFrustum(FTYP_OMNILIGHTVOLUME, pFrustum, nAxis, &mProjection, &mView /*, &mRot*/);
-        }
-    }
-
-    //matrix concanation and inversion should be computed in doubles otherwise we have precision problems with big coords on big levels
-    //which results to the incident frustum's discontinues for omni-lights
-    Matrix44r mViewProj =  Matrix44r(mView) * Matrix44r(mProjection);
-    Matrix44A mViewProjInv = mViewProj.GetInverted();
-
-    gRenDev->m_TempMatrices[0][0] = mViewProjInv.GetTransposed();
-
-    //setup light source pos/radius
-    m_cEF.m_TempVecs[5] = Vec4(pLight->m_Origin, pLight->m_fRadius * 1.1f); //increase radius slightly
-    if (pLight->m_fProjectorNearPlane < 0)
-    {
-        m_cEF.m_TempVecs[5].x -= vOffsetDir.x;
-        m_cEF.m_TempVecs[5].y -= vOffsetDir.y;
-        m_cEF.m_TempVecs[5].z -= vOffsetDir.z;
-        nPrimitiveID = SHAPE_CLIP_PROJECTOR;
-    }
-
-    //if (m_pUnitFrustumVB==NULL || m_pUnitFrustumIB==NULL)
-    //  CreateUnitFrustumMesh();
-
-    FX_SetVStream(0, m_pUnitFrustumVB[nPrimitiveID], 0, sizeof(SVF_P3F_C4B_T2F));
-    FX_SetIStream(m_pUnitFrustumIB[nPrimitiveID], 0, (kUnitObjectIndexSizeof == 2 ? Index16 : Index32));
-
-    pShader->FXSetTechnique(StencilCullTechName);
-    pShader->FXBegin(&nPassCount, FEF_DONTSETSTATES);        
-   
-    if (!RenderCapabilities::SupportsDepthClipping())
-    {
-        FX_StencilCullPass(nStencilID, m_UnitFrustVBSize[nPrimitiveID], m_UnitFrustIBSize[nPrimitiveID], pShader, DS_SHADOW_FRUSTUM_CULL_PASS, DS_SHADOW_FRUSTUM_CULL_PASS_FRONTFACING);
-    }
-    else
-    {
-        FX_StencilCullPass(nStencilID, m_UnitFrustVBSize[nPrimitiveID], m_UnitFrustIBSize[nPrimitiveID], pShader, DS_SHADOW_FRUSTUM_CULL_PASS);
-    }
-
-    pShader->FXEnd();
-
-    return;
-}
-
-void CD3D9Renderer::FX_StencilCullNonConvex(int nStencilID, IRenderMesh* pWaterTightMesh, const Matrix34& mWorldTM)
-{
-    CShader* pShader(CShaderMan::s_ShaderShadowMaskGen);
-    static CCryNameTSCRC TechName0 = "DeferredShadowPass";
-
-    CRenderMesh* pRenderMesh = static_cast<CRenderMesh*>(pWaterTightMesh);
-    pRenderMesh->CheckUpdate(0);
-
-    const buffer_handle_t hVertexStream = pRenderMesh->GetVBStream(VSF_GENERAL);
-    const buffer_handle_t hIndexStream = pRenderMesh->GetIBStream();
-
-    if (hVertexStream != ~0u && hIndexStream != ~0u)
-    {
-        size_t nOffsI = 0;
-        size_t nOffsV = 0;
-
-        D3DBuffer* pVB = gRenDev->m_DevBufMan.GetD3D(hVertexStream, &nOffsV);
-        D3DBuffer* pIB = gRenDev->m_DevBufMan.GetD3D(hIndexStream, &nOffsI);
-
-        FX_SetVStream(0, pVB, nOffsV, pRenderMesh->GetStreamStride(VSF_GENERAL));
-        FX_SetIStream(pIB, nOffsI, (sizeof(vtx_idx) == 2 ? Index16 : Index32));
-
-        const bool gmemLinearizeEnabled = FX_GetEnabledGmemPath(nullptr) && FX_GmemGetDepthStencilMode() == eGDSM_RenderTarget;
-        {
-            ECull nPrevCullMode = m_RP.m_eCull;
-            int nPrevState = m_RP.m_CurState;
-
-            int newState = nPrevState;
-
-            // FX_SetStencilState(...) would cast to uint instead of int
-            uint8_t u8StencilID = nStencilID;
-            uint8_t u8InvStencilID = ~nStencilID;
-
-            if (gmemLinearizeEnabled)
-            {
-                // This pass affects the stencil on depth fail.
-                // Since in GMEM we do our own stencil operations ourselves as to avoid
-                // resolving RTs, we need to inverse the depth test operation.
-                newState &=  ~(GS_BLEND_MASK | GS_NODEPTHTEST | GS_DEPTHFUNC_MASK | GS_STENCIL);
-                newState |= GS_NOCOLMASK_R | GS_NOCOLMASK_B | GS_NOCOLMASK_A;
-                newState |= GS_DEPTHFUNC_GREAT;
-            }
-            else
-            {
-                newState &= ~(GS_NODEPTHTEST | GS_DEPTHWRITE | GS_DEPTHFUNC_MASK);
-                newState |= GS_DEPTHFUNC_LEQUAL | GS_STENCIL | GS_COLMASK_NONE;
-            }
-
-            Matrix44A origMatView = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-            Matrix44 mLocalTransposed;
-            mLocalTransposed = mWorldTM.GetTransposed();
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = mLocalTransposed * m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-
-            uint32 nPasses = 0;
-            pShader->FXSetTechnique(TechName0);
-            pShader->FXBegin(&nPasses, FEF_DONTSETSTATES);
-
-            if (gmemLinearizeEnabled)
-            {
-                pShader->FXBeginPass(CD3D9Renderer::DS_GMEM_STENCIL_CULL_NON_CONVEX);
-            }
-            else
-            {
-                pShader->FXBeginPass(CD3D9Renderer::DS_SHADOW_CULL_PASS);
-            }
-            
-            if (!FAILED(FX_SetVertexDeclaration(0, pRenderMesh->_GetVertexFormat())))
-            {
-                // Mark all pixels that might be inside volume first (z-fail on back-faces)
-                D3DSetCull(eCULL_Front);
-                if (gmemLinearizeEnabled)
-                {
-                    static CCryNameR pParamName0("StencilRef");
-                    Vec4 StencilRefParam(0.f);
-                    StencilRefParam.x = static_cast<float>(u8StencilID);
-                    CShaderMan::s_ShaderShadowMaskGen->FXSetPSFloat(pParamName0, &StencilRefParam, 1);
-                }
-                else
-                {
-                    FX_SetStencilState(
-                        STENC_FUNC(FSS_STENCFUNC_GEQUAL) |
-                        STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                        STENCOP_ZFAIL(FSS_STENCOP_REPLACE) |
-                        STENCOP_PASS(FSS_STENCOP_KEEP),
-                        nStencilID, 0xFFFFFFFF, 0xFFFFFFFF
-                        );
-                }
-                FX_SetState(newState);
-                FX_Commit();
-                FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, pRenderMesh->GetNumVerts(), 0, pRenderMesh->GetNumInds());
-            }
-
-            // Flip bits for each face
-            {
-                D3DSetCull(eCULL_None);
-                if (gmemLinearizeEnabled)
-                {
-                    static CCryNameR pParamName0("StencilRef");
-                    Vec4 StencilRefParam(0.f);
-                    StencilRefParam.x = static_cast<float>(u8InvStencilID);
-                    StencilRefParam.y = 1.f;
-                    CShaderMan::s_ShaderShadowMaskGen->FXSetPSFloat(pParamName0, &StencilRefParam, 1);
-                    FX_Commit();
-                }
-                else
-                {
-                    FX_SetStencilState(STENC_FUNC(FSS_STENCFUNC_GEQUAL) |
-                        STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                        STENCOP_ZFAIL(FSS_STENCOP_INVERT) |
-                        STENCOP_PASS(FSS_STENCOP_KEEP),
-                        ~nStencilID, 0xFFFFFFFF, 0xFFFFFFFF);
-                }
-                FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, pRenderMesh->GetNumVerts(), 0, pRenderMesh->GetNumInds());
-            }
-            pShader->FXEndPass();
-
-            // If there's no stencil texture support we "resolve" the vis area directly to the texture.
-            if (!gmemLinearizeEnabled && !RenderCapabilities::SupportsStencilTextures())
-            {
-                pShader->FXBeginPass(CD3D9Renderer::DS_STENCIL_CULL_NON_CONVEX_RESOLVE);
-
-                {
-                    // These values must match the ones in the shader (ResolveStencilPS)
-                    const uint8_t BIT_STENCIL_STATIC = 0x0000007F;
-                    const uint8_t BIT_STENCIL_INSIDE_VOLUME = 0x00000040;
-
-                    uint8_t resolvedStencil = u8InvStencilID;
-
-                    resolvedStencil = resolvedStencil & BIT_STENCIL_STATIC;
-                    resolvedStencil = max(resolvedStencil - BIT_STENCIL_INSIDE_VOLUME, 1);
-
-                    static CCryNameR pParamName0("StencilRefResolve");
-                    Vec4 StencilRefParam(0.f);
-                    StencilRefParam.x = static_cast<float>(resolvedStencil) / 255.0;
-                    StencilRefParam.y = 1.f;
-                    CShaderMan::s_ShaderShadowMaskGen->FXSetPSFloat(pParamName0, &StencilRefParam, 1);
-                    FX_Commit();
-                }
-
-                {
-                    newState &= ~(GS_BLEND_MASK | GS_NODEPTHTEST | GS_DEPTHFUNC_MASK | GS_COLMASK_NONE);
-                    newState |= GS_NOCOLMASK_G | GS_NOCOLMASK_B | GS_NOCOLMASK_A;
-                    newState |= GS_DEPTHFUNC_GREAT | GS_STENCIL;
-                    FX_SetState(newState);
-                }
-                
-                {
-                    FX_SetStencilState(STENC_FUNC(FSS_STENCFUNC_EQUAL) |
-                        STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                        STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-                        STENCOP_PASS(FSS_STENCOP_KEEP),
-                        ~nStencilID, 0xFFFFFFFF, 0xFFFFFFFF);
-                }
-
-                FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, pRenderMesh->GetNumVerts(), 0, pRenderMesh->GetNumInds());
-                pShader->FXEndPass();
-            }
-
-            D3DSetCull(nPrevCullMode);
-            FX_SetState(nPrevState);
-
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = origMatView;
-
-            pShader->FXEnd();
-        }
-    }
-}
-
-void CD3D9Renderer::FX_DeferredShadowMaskGen(const TArray<uint32>& shadowPoolLights)
-{
-    const uint64 nPrevFlagsShaderRT = m_RP.m_FlagsShader_RT;
-
-    const int nThreadID = m_RP.m_nProcessThreadID;
-    const int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    const int nPreviousState = m_RP.m_CurState;
-
-    const bool isShadowPassEnabled = IsShadowPassEnabled();
-    const int nMaskWidth = GetWidth();
-    const int nMaskHeight = GetHeight();
-    const ColorF clearColor = ColorF (0.0f, 0.0f, 0.0f, 0.0f);
-
-    // reset render element and current render object in pipeline
-    m_RP.m_pRE = 0;
-    m_RP.m_pCurObject = m_RP.m_pIdendityRenderObject;
-    m_RP.m_ObjFlags = 0;
-
-    m_RP.m_FlagsShader_RT = 0;
-    m_RP.m_FlagsShader_LT = 0;
-    m_RP.m_FlagsShader_MD = 0;
-    m_RP.m_FlagsShader_MDV = 0;
-
-    FX_ResetPipe();
-    FX_Commit();
-
-    CTexture* pShadowMask = CTexture::s_ptexShadowMask;
-
-    SResourceView curSliceRVDesc = SResourceView::RenderTargetView(pShadowMask->GetTextureDstFormat(), 0, 1);
-    SResourceView& firstSliceRV = pShadowMask->GetResourceView(curSliceRVDesc);
-
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        // Avoid any resolve. We clear stencil with full screen pass.
-
-        // Only do a clear pass if shadows are actually enabled
-        static const ICVar* pCVarShadows = iConsole->GetCVar("e_Shadows");
-        if (m_RP.m_pSunLight && isShadowPassEnabled && pCVarShadows->GetIVal())
-        {
-            uint32 prevState = m_RP.m_CurState;
-            uint32 newState = 0;
-            newState |= GS_COLMASK_NONE;
-            newState |= GS_STENCIL;
-            FX_SetStencilState(
-                STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-                STENCOP_FAIL(FSS_STENCOP_ZERO) |
-                STENCOP_ZFAIL(FSS_STENCOP_ZERO) |
-                STENCOP_PASS(FSS_STENCOP_ZERO),
-                0, 0xFFFFFFFF, 0xFFFF);
-            FX_SetState(newState);
-            SD3DPostEffectsUtils::ClearScreen(0, 0, 0, 0);
-            FX_SetState(prevState);
-        }
-        else
-        {
-            return;
-        }
-    }
-    else
-    {
-        // set shadow mask RT and clear stencil
-        FX_ClearTarget(static_cast<D3DSurface*>(firstSliceRV.m_pDeviceResourceView), Clr_Transparent, 0, nullptr);
-        FX_ClearTarget(&m_DepthBufferOrig, CLEAR_STENCIL, Clr_Unused.r, 0);
-        FX_PushRenderTarget(0, static_cast<D3DSurface*>(firstSliceRV.m_pDeviceResourceView), &m_DepthBufferOrig);
-        RT_SetViewport(0, 0, nMaskWidth, nMaskHeight);
-    }
-
-    int nFirstChannel = 0;
-    int nChannelsInUse = 0;
-
-    // sun
-    if (m_RP.m_pSunLight && isShadowPassEnabled)
-    {
-        PROFILE_LABEL_SCOPE("SHADOWMASK_SUN");
-
-        // CONFETTI BEGIN: David Srour
-        // Metal Load/Store Actions
-        if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            FX_SetDepthDontCareActions(0, false, true);
-        }
-        // CONFETTI END
-
-        FX_DeferredShadows(m_RP.m_pSunLight, nMaskWidth, nMaskHeight);
-        ++nFirstChannel;
-        ++nChannelsInUse;
-    }
-
-    // point lights
-    if (!shadowPoolLights.empty()  && isShadowPassEnabled)
-    {
-        // This code path should only be hit when used tiled shading.
-        // Assert just in case since multiple layers of shadow masks can't fit GMEM path.
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            CRY_ASSERT(0);
-        }
-
-        PROFILE_LABEL_SCOPE("SHADOWMASK_DEFERRED_LIGHTS");
-
-        const int nMaxChannelCount = pShadowMask->StreamGetNumSlices() * 4;
-        std::vector< std::vector<std::pair<int, Vec4> > > lightsPerChannel;
-        lightsPerChannel.resize(nMaxChannelCount);
-
-        // sort lights into layers first in order to minimize the number of required render targets
-        for (int i = 0; i < shadowPoolLights.size(); ++i)
-        {
-            const int nLightID = shadowPoolLights[i];
-            SRenderLight* pLight = EF_GetDeferredLightByID(nLightID, eDLT_DeferredLight);
-            const int nFrustumIdx = m_RP.m_DLights[nThreadID][nCurRecLevel].Num() + nLightID;
-
-            if (!pLight || !(pLight->m_Flags & DLF_CASTSHADOW_MAPS))
-            {
-                __debugbreak();
-            }
-
-            int nStartIdx = SRendItem::m_StartFrust[nThreadID][nFrustumIdx];
-            int nEndIdx = SRendItem::m_EndFrust[nThreadID][nFrustumIdx];
-
-            //no single frustum was allocated for this light
-            if (nEndIdx <= nStartIdx)
-            {
-                continue;
-            }
-
-            // get light scissor rect
-            Vec4 pLightRect  = Vec4(static_cast<float>(pLight->m_sX), static_cast<float>(pLight->m_sY), static_cast<float>(pLight->m_sWidth), static_cast<float>(pLight->m_sHeight));
-
-            int nChannelIndex = nFirstChannel;
-            while (nChannelIndex < nMaxChannelCount)
-            {
-                bool bHasOverlappingLight = false;
-
-                float minX = pLightRect.x, maxX = pLightRect.x + pLightRect.z;
-                float minY = pLightRect.y, maxY = pLightRect.y + pLightRect.w;
-
-                for (int j = 0; j < lightsPerChannel[nChannelIndex].size(); ++j)
-                {
-                    const Vec4& lightRect = lightsPerChannel[nChannelIndex][j].second;
-
-                    if (maxX >= lightRect.x && minX <= lightRect.x + lightRect.z &&
-                        maxY >= lightRect.y && minY <= lightRect.y + lightRect.w)
-                    {
-                        bHasOverlappingLight = true;
-                        break;
-                    }
-                }
-
-                if (!bHasOverlappingLight)
-                {
-                    lightsPerChannel[nChannelIndex].push_back(std::make_pair(nLightID, pLightRect));
-                    nChannelsInUse = max(nChannelIndex + 1, nChannelsInUse);
-                    break;
-                }
-
-                ++nChannelIndex;
-            }
-
-            if (nChannelIndex >= nMaxChannelCount)
-            {
-                m_RP.m_SMFrustums[nThreadID][nCurRecLevel][nStartIdx].nShadowGenMask = 0;
-                ++nChannelsInUse;
-            }
-        }
-
-        // now render each layer
-        for (int nChannel = nFirstChannel; nChannel < min(nChannelsInUse, nMaxChannelCount); ++nChannel)
-        {
-            const int nMaskIndex = nChannel / 4;
-            const int nMaskChannel = nChannel % 4;
-
-            if (nChannel > 0 && nMaskChannel == 0)
-            {
-                curSliceRVDesc.m_Desc.nFirstSlice = nMaskIndex;
-                SResourceView& curSliceRV = pShadowMask->GetResourceView(curSliceRVDesc);
-
-                FX_PopRenderTarget(0);
-                FX_PushRenderTarget(0, static_cast<ID3D11RenderTargetView*>(curSliceRV.m_pDeviceResourceView), &m_DepthBufferOrig);
-            }
-
-            for (int i = 0; i < lightsPerChannel[nChannel].size(); ++i)
-            {
-                const int nLightIndex = lightsPerChannel[nChannel][i].first;
-                const Vec4 lightRect = lightsPerChannel[nChannel][i].second;
-
-                SRenderLight* pLight = EF_GetDeferredLightByID(nLightIndex, eDLT_DeferredLight);
-                assert(pLight);
-
-                PROFILE_SHADER_SCOPE;
-                m_RP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-
-                //////////////////////////////////////////////////////////////////////////
-                const int nFrustumIdx = m_RP.m_DLights[nThreadID][nCurRecLevel].Num() + nLightIndex;
-                const int nStartIdx = SRendItem::m_StartFrust[nThreadID][nFrustumIdx];
-                ShadowMapFrustum& firstFrustum = m_RP.m_SMFrustums[nThreadID][nCurRecLevel][nStartIdx];
-
-                const int nSides = firstFrustum.bOmniDirectionalShadow ? 6 : 1;
-                const bool bAreaLight = (pLight->m_Flags & DLF_AREA_LIGHT) && pLight->m_fAreaWidth && pLight->m_fAreaHeight && pLight->m_fLightFrustumAngle;
-
-                //enable hw-pcf light
-                if (firstFrustum.bHWPCFCompare)
-                {
-                    m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ];
-                }
-
-                // determine what's more beneficial: full screen quad or light volume
-                bool bStencilMask = true;
-                bool bUseLightVolumes = false;
-                CDeferredShading::Instance().GetLightRenderSettings(pLight, bStencilMask, bUseLightVolumes, m_RP.m_nDeferredPrimitiveID);
-
-                // reserve stencil values
-                m_nStencilMaskRef += (nSides + 1);
-                if (m_nStencilMaskRef > STENC_MAX_REF)
-                {
-                    FX_ClearTarget(&m_DepthBufferOrig, CLEAR_STENCIL, Clr_Unused.r, 0);
-                    m_nStencilMaskRef = nSides + 1;
-                }
-
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingScissor)
-                {
-                    EF_Scissor(true,
-                        static_cast<int>(lightRect.x * m_RP.m_CurDownscaleFactor.x),
-                        static_cast<int>(lightRect.y * m_RP.m_CurDownscaleFactor.y),
-                        static_cast<int>(lightRect.z * m_RP.m_CurDownscaleFactor.x + 1),
-                        static_cast<int>(lightRect.w * m_RP.m_CurDownscaleFactor.y + 1));
-                }
-
-                uint32 nPersFlagsPrev = m_RP.m_TI[nThreadID].m_PersFlags;
-
-                for (int nS = 0; nS < nSides; nS++)
-                {
-                    // render light volume to stencil
-                    {
-                        bool bIsMirrored =  (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_MIRRORCULL)  ? true : false;
-                        bool bRequiresMirroring = (!(pLight->m_Flags & (DLF_PROJECT | DLF_AREA_LIGHT))) ? true : false;
-
-                        if (bIsMirrored ^ bRequiresMirroring) // Enable mirror culling for omni-shadows, or if we are in cubemap-gen. If both, they cancel-out, so disable.
-                        {
-                            m_RP.m_TI[nThreadID].m_PersFlags |= RBPF_MIRRORCULL;
-                        }
-                        else
-                        {
-                            m_RP.m_TI[nThreadID].m_PersFlags &= ~RBPF_MIRRORCULL;
-                        }
-
-                        FX_StencilFrustumCull(-2, pLight, bAreaLight ? NULL : &firstFrustum, nS);
-                    }
-
-                    FX_StencilTestCurRef(true, true);
-
-                    if (firstFrustum.nShadowGenMask & (1 << nS))
-                    {
-                        FX_ApplyShadowQuality();
-                        CShader* pShader = CShaderMan::s_shDeferredShading;
-                        static CCryNameTSCRC techName = "ShadowMaskGen";
-                        static CCryNameTSCRC techNameVolume = "ShadowMaskGenVolume";
-
-                        ConfigShadowTexgen(0, &firstFrustum, nS);
-
-                        if (CV_r_ShadowsScreenSpace)
-                        {
-                            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_SAMPLE2 ];
-                        }
-
-                        if (bUseLightVolumes)
-                        {
-                            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-                            SD3DPostEffectsUtils::ShBeginPass(pShader, techNameVolume, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                        }
-                        else
-                        {
-                            SD3DPostEffectsUtils::ShBeginPass(pShader, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                        }
-
-                        // comparison filtering for shadow map
-                        STexState TS(firstFrustum.bHWPCFCompare ? FILTER_LINEAR : FILTER_POINT, true);
-                        TS.m_bSRGBLookup = false;
-                        TS.SetComparisonFilter(true);
-
-                        CTexture* pShadowMap = firstFrustum.bUseShadowsPool ? CTexture::s_ptexRT_ShadowPool : firstFrustum.pDepthTex;
-                        pShadowMap->Apply(1, CTexture::GetTexState(TS), EFTT_UNKNOWN, 6);
-
-                        SD3DPostEffectsUtils::SetTexture(CTextureManager::Instance()->GetDefaultTexture("ShadowJitterMap"), 7, FILTER_POINT, 0);
-
-                        static ICVar* pVar = iConsole->GetCVar("e_ShadowsPoolSize");
-                        int nShadowAtlasRes = pVar->GetIVal();
-
-                        //LRad
-                        float kernelSize = firstFrustum.bOmniDirectionalShadow ? 2.5f : 1.5f;
-                        const Vec4 vShadowParams(kernelSize * (float(firstFrustum.nTexSize) / nShadowAtlasRes), firstFrustum.nTexSize, 1.0 / nShadowAtlasRes, firstFrustum.fDepthConstBias);
-                        static CCryNameR  generalParamsName("g_GeneralParams");
-                        pShader->FXSetPSFloat(generalParamsName, &vShadowParams, 1);
-
-                        // set up shadow matrix
-                        static CCryNameR lightProjParamName("g_mLightShadowProj");
-                        Matrix44A shadowMat = gRenDev->m_TempMatrices[0][0];
-                        const Vec4 vEye(gRenDev->GetViewParameters().vOrigin, 0.f);
-                        Vec4 vecTranslation(vEye.Dot((Vec4&)shadowMat.m00), vEye.Dot((Vec4&)shadowMat.m10), vEye.Dot((Vec4&)shadowMat.m20), vEye.Dot((Vec4&)shadowMat.m30));
-                        shadowMat.m03 += vecTranslation.x;
-                        shadowMat.m13 += vecTranslation.y;
-                        shadowMat.m23 += vecTranslation.z;
-                        shadowMat.m33 += vecTranslation.w;
-
-                        // pre-multiply by 1/frustrum_far_plane
-                        (Vec4&)shadowMat.m20 *= gRenDev->m_cEF.m_TempVecs[2].x;
-
-                        //camera matrix
-                        pShader->FXSetPSFloat(lightProjParamName, alias_cast<Vec4*>(&shadowMat), 4);
-
-                        Vec4 vScreenScale(1.0f / nMaskWidth, 1.0f / nMaskHeight, 0.0f, 0.0f);
-                        static CCryNameR screenScaleParamName("g_ScreenScale");
-                        pShader->FXSetPSFloat(screenScaleParamName, &vScreenScale, 1);
-
-                        Vec4 vLightPos(pLight->m_Origin, 0.0f);
-                        static CCryNameR vLightPosName("g_vLightPos");
-                        pShader->FXSetPSFloat(vLightPosName, &vLightPos, 1);
-
-                        if (FurPasses::GetInstance().IsRenderingFur())
-                        {
-                            CTexture::s_ptexFurZTarget->Apply(0, CTexture::GetTexState(STexState(FILTER_POINT, true)));
-                        }
-                        else
-                        {
-                            CTexture::s_ptexZTarget->Apply(0, CTexture::GetTexState(STexState(FILTER_POINT, true)));
-                        }
-
-                        // color mask
-                        uint32 newState = m_RP.m_CurState & ~(GS_COLMASK_NONE | GS_BLEND_MASK);
-                        newState |= ~((1 << nMaskChannel % 4) << GS_COLMASK_SHIFT) & GS_COLMASK_MASK;
-
-                        if (bUseLightVolumes)
-                        {
-                            // shadow clip space to world space transform
-                            Matrix44A mUnitVolumeToWorld(IDENTITY);
-                            Vec4 vSphereAdjust(ZERO);
-
-                            if (bAreaLight)
-                            {
-                                const float fExpensionRadius = pLight->m_fRadius * 1.08f;
-                                mUnitVolumeToWorld = CShadowUtils::GetAreaLightMatrix(pLight, Vec3(fExpensionRadius)).GetTransposed();
-                                m_RP.m_nDeferredPrimitiveID = SHAPE_BOX;
-                            }
-                            else
-                            {
-                                Matrix44A mProjection, mView;
-                                if (firstFrustum.bOmniDirectionalShadow)
-                                {
-                                    CShadowUtils::GetCubemapFrustum(FTYP_OMNILIGHTVOLUME, &firstFrustum, nS, &mProjection, &mView);
-                                }
-                                else
-                                {
-                                    mProjection = gRenDev->m_IdentityMatrix;
-                                    mView = firstFrustum.mLightViewMatrix;
-                                }
-
-                                Matrix44r mViewProj =  Matrix44r(mView) * Matrix44r(mProjection);
-                                mUnitVolumeToWorld = mViewProj.GetInverted();
-                                vSphereAdjust = Vec4(pLight->m_Origin, pLight->m_fRadius * 1.1f);
-                            }
-
-                            newState &= ~(GS_NODEPTHTEST | GS_DEPTHWRITE);
-                            newState |= GS_DEPTHFUNC_LEQUAL;
-                            FX_SetState(newState);
-
-                            CDeferredShading::Instance().DrawLightVolume(m_RP.m_nDeferredPrimitiveID, mUnitVolumeToWorld, vSphereAdjust);
-                        }
-                        else
-                        {
-                            // depth state
-                            newState &= ~GS_DEPTHWRITE;
-                            newState |= GS_NODEPTHTEST;
-                            FX_SetState(newState);
-
-                            m_RP.m_TI[nThreadID].m_PersFlags &= ~RBPF_MIRRORCULL;
-                            gcpRendD3D->D3DSetCull(eCULL_Back, true); //fs quads should not revert test..
-                            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(nMaskWidth, nMaskHeight);
-                        }
-
-                        SD3DPostEffectsUtils::ShEndPass();
-                    }
-
-                    // restore PersFlags
-                    m_RP.m_TI[nThreadID].m_PersFlags = nPersFlagsPrev;
-                } // for each side
-
-                pLight->m_ShadowChanMask = nMaskChannel;
-                pLight->m_ShadowMaskIndex = nMaskIndex;
-
-                EF_Scissor(false, 0, 0, 0, 0);
-
-                m_nStencilMaskRef += nSides;
-
-                m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ] | g_HWSR_MaskBit[HWSR_CUBEMAP0] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-            } // for each light
-        }
-    }
-
-#ifndef _RELEASE
-    m_RP.m_PS[nThreadID].m_NumShadowMaskChannels = (pShadowMask->StreamGetNumSlices() * 4 << 16) | (nChannelsInUse & 0xFFFF);
-#endif
-
-    gcpRendD3D->D3DSetCull(eCULL_Back, true);
-
-    FX_SetState(nPreviousState);
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        FX_PopRenderTarget(0);
-    }
-
-    m_RP.m_FlagsShader_RT = nPrevFlagsShaderRT;
-}
-
-bool CD3D9Renderer::FX_DeferredShadows(SRenderLight* pLight, int maskRTWidth, int maskRTHeight)
-{
-    if (!pLight || (pLight->m_Flags & DLF_CASTSHADOW_MAPS) == 0)
-    {
-        return false;
-    }
-
-    const int nThreadID = m_RP.m_nProcessThreadID;
-    const int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-
-    //set ScreenToWorld Expansion Basis
-    Vec3 vWBasisX, vWBasisY, vWBasisZ;
-    CShadowUtils::CalcScreenToWorldExpansionBasis(GetCamera(), Vec2(m_TemporalJitterClipSpace.x, m_TemporalJitterClipSpace.y), (float)maskRTWidth, (float)maskRTHeight, vWBasisX, vWBasisY, vWBasisZ, true);
-    m_cEF.m_TempVecs[10] = Vec4(vWBasisX, 1.0f);
-    m_cEF.m_TempVecs[11] = Vec4(vWBasisY, 1.0f);
-    m_cEF.m_TempVecs[12] = Vec4(vWBasisZ, 1.0f);
-
-    const bool bCloudShadows = m_bCloudShadowsEnabled && m_cloudShadowTexId > 0;
-    const bool bCustomShadows = !m_RP.m_SMCustomFrustumIDs[nThreadID][nCurRecLevel].empty();
-
-    //////////////////////////////////////////////////////////////////////////
-    //check for valid gsm frustums
-    //////////////////////////////////////////////////////////////////////////
-    CRY_ASSERT(pLight->m_Id >= 0);
-    TArray<ShadowMapFrustum>& arrFrustums = m_RP.m_SMFrustums[nThreadID][nCurRecLevel];
-    const int nStartIdx = SRendItem::m_StartFrust[nThreadID][pLight->m_Id];
-
-    int nEndIdx;
-    for (nEndIdx = nStartIdx; nEndIdx < SRendItem::m_EndFrust[nThreadID][pLight->m_Id]; ++nEndIdx)
-    {
-        if (arrFrustums[nEndIdx].m_eFrustumType != ShadowMapFrustum::e_GsmDynamic && arrFrustums[nEndIdx].m_eFrustumType != ShadowMapFrustum::e_GsmDynamicDistance)
-        {
-            break;
-        }
-    }
-
-    const int nCasterCount = nEndIdx - nStartIdx;
-    if (nCasterCount == 0 && !bCloudShadows && !bCustomShadows)
-    {
-        return false;
-    }
-
-    // set shader
-    CShader* pSH(CShaderMan::s_ShaderShadowMaskGen);
-    static CCryNameR TechName("DeferredShadowPass");
-    
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-    }
-
-    static ICVar* pCascadesDebugVar = iConsole->GetCVar("e_ShadowsCascadesDebug");
-    bool bDebugShadowCascades = pCascadesDebugVar && pCascadesDebugVar->GetIVal() > 0;
-
-    // We don't currently support debug cascade shadow overlay with GMEM enabled
-    if (bDebugShadowCascades && gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        const AZStd::string title = "Debug cascade shadow overlay";
-        const AZStd::string message = AZStd::string::format("e_ShadowsCascadesDebug can not be enabled while r_EnableGMEMPath is enabled. Disable r_EnableGMEMPath to view debug shadow cascades.");
-        AZ_Warning("Renderer", false, "ERROR: %s\n", message.c_str());
-        if (!gEnv->IsInToolMode())
-        {
-            AZStd::vector<AZStd::string> options;
-            options.push_back("OK");
-            AZ::NativeUI::NativeUIRequestBus::Broadcast(&AZ::NativeUI::NativeUIRequestBus::Events::DisplayBlockingDialog, title, message, options);
-        }
-        pCascadesDebugVar->Set(0);
-        bDebugShadowCascades = false;
-    }
-
-    const bool bCascadeBlending = CV_r_ShadowsStencilPrePass == 1 && nCasterCount > 0 && arrFrustums[nStartIdx].bBlendFrustum && !bDebugShadowCascades;
-    if (bCascadeBlending)
-    {
-        for (int nCaster = nStartIdx + 1; nCaster < nEndIdx; nCaster++)
-        {
-            arrFrustums[nCaster].pPrevFrustum = &arrFrustums[nCaster - 1];
-        }
-
-        for (int nCaster = nStartIdx; nCaster < nEndIdx; nCaster++)
-        {
-            const bool bFirstCaster = (nCaster == nStartIdx);
-            const bool bLastCaster =  (nCaster == nEndIdx - 1);
-
-            const uint32 nStencilID      = 2 * (nCaster - nStartIdx) + 1;
-            const uint32 nMaxStencilID = 2 * nCasterCount + 1;
-
-            m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_GEQUAL;
-
-            m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], false, false, true, nStencilID);  // This frustum
-
-            if (!bLastCaster)
-            {
-                m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-                FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], false, false, true, nStencilID + 1); // This frustum, not including blend region
-
-                if (!bFirstCaster)
-                {
-                    m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-                    FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster - 1], false, false, true, nStencilID + 1); // Mask whole prior frustum ( allow blending region )
-                }
-            }
-
-            m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], true, false, false, !bLastCaster ? (nStencilID + 1) : nStencilID); // non-blending
-
-            if (!bLastCaster)
-            {
-                m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-                FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], true, false, false, nStencilID);  // blending
-            }
-
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-
-            m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_ALWAYS;
-
-            if (!bLastCaster)
-            {
-                FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], false, false, true, nMaxStencilID);  // Invalidate interior region for future rendering
-            }
-
-            m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[ HWSR_SAMPLE3 ];
-
-            if (!bFirstCaster && !bLastCaster)
-            {
-                FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster - 1 ], false, false, true, nMaxStencilID);  // Remove prior region
-            }
-        }
-
-        for (int nCaster = nStartIdx; nCaster < nEndIdx; nCaster++)
-        {
-            arrFrustums[ nCaster ].pPrevFrustum =   NULL;
-        }
-    }
-    else if IsCVarConstAccess(constexpr) (CV_r_ShadowsStencilPrePass == 1)
-    {
-        m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_GEQUAL;
-        for (int nCaster = 0; nCaster < nCasterCount; nCaster++)
-        {
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nStartIdx + nCaster ], false, false, true, nCasterCount - nCaster);
-        }
-
-        m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_ALWAYS;
-        for (int nCaster = 0; nCaster < nCasterCount; nCaster++)
-        {
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nStartIdx + nCaster ], true, false, false, nCasterCount - nCaster);
-        }
-    }
-    else if IsCVarConstAccess(constexpr) (CV_r_ShadowsStencilPrePass == 0)
-    {
-        //////////////////////////////////////////////////////////////////////////
-        //shadows passes
-        for (int nCaster = nStartIdx; nCaster < nEndIdx; nCaster++ /*, m_RP.m_PS[rd->m_RP.m_nProcessThreadID]. ++ */) // for non-conservative
-        {
-            m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_GEQUAL;
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], false, false, true, 10 - (nCaster - nStartIdx + 1));
-
-            m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_ALWAYS;
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], true, false, false, 10 - (nCaster - nStartIdx + 1));
-        }
-    }
-    else if IsCVarConstAccess(constexpr) (CV_r_ShadowsStencilPrePass == 2)
-    {
-        for (int nCaster = nStartIdx; nCaster < nEndIdx; nCaster++)
-        {
-            m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_GEQUAL;
-            int nLod = (10 - (nCaster - nStartIdx + 1));
-
-            //stencil mask
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], false, false, true, nLod);
-
-            //shadow pass
-            FX_DeferredShadowPass(pLight, &arrFrustums[ nCaster ], true, false, false, nLod);
-        }
-
-        m_RP.m_CurStencilCullFunc = FSS_STENCFUNC_ALWAYS;
-    }
-    else
-    {
-        assert(0);
-    }
-
-    // update stencil ref value, so subsequent passes will not use the same stencil values
-    m_nStencilMaskRef = bCascadeBlending ? 2 * nCasterCount + 1 : nCasterCount;
-
-    ///////////////// Cascades debug mode /////////////////////////////////
-    if ((pLight->m_Flags & DLF_SUN) && bDebugShadowCascades)
-    {
-        PROFILE_LABEL_SCOPE("DEBUG_SHADOWCASCADES");
-
-        static CCryNameTSCRC TechName2 = "DebugShadowCascades";
-        static CCryNameR CascadeColorParam("DebugCascadeColor");
-
-        const Vec4 cascadeColors[] =
-        {
-            Vec4(1, 0, 0, 1),
-            Vec4(0, 1, 0, 1),
-            Vec4(0, 0, 1, 1),
-            Vec4(1, 1, 0, 1),
-            Vec4(1, 0, 1, 1),
-            Vec4(0, 1, 1, 1),
-            Vec4(1, 0, 0, 1),
-        };
-
-        // Draw information text for Cascade colors
-        float yellow[4] = {1.f, 1.f, 0.f, 1.f};
-        Draw2dLabel(10.f, 30.f, 2.0f, yellow, false,
-            "e_ShadowsCascadesDebug");
-        Draw2dLabel(40.f, 60.f, 1.5f, yellow, false,
-            "Cascade0: Red\n"
-            "Cascade1: Green\n"
-            "Cascade2: Blue\n"
-            "Cascade3: Yellow\n"
-            "Cascade4: Pink"
-            );
-
-        const int cascadeColorCount = sizeof(cascadeColors) / sizeof(cascadeColors[0]);
-
-        // render into diffuse color target
-        CTexture* colorTarget = CTexture::s_ptexSceneDiffuse;
-        SDepthTexture* depthStencilTarget = &m_DepthBufferOrig;
-
-        FX_PushRenderTarget(0, colorTarget, depthStencilTarget);
-
-        const int oldState = m_RP.m_CurState;
-        int newState = oldState;
-        newState |= GS_STENCIL;
-        newState &= ~GS_COLMASK_NONE;
-
-        FX_SetState(newState);
-
-        for (int nCaster = 0; nCaster < nCasterCount; ++nCaster)
-        {
-            const Vec4& cascadeColor = cascadeColors[arrFrustums[nStartIdx + nCaster].nShadowMapLod % cascadeColorCount];
-
-            FX_SetStencilState(
-                STENC_FUNC(FSS_STENCFUNC_EQUAL) |
-                STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-                STENCOP_PASS(FSS_STENCOP_KEEP),
-                nCasterCount - nCaster, 0xFFFFFFFF, 0xFFFFFFFF
-                );
-
-            // set shader
-            SD3DPostEffectsUtils::ShBeginPass(pSH, TechName2, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-            pSH->FXSetPSFloat(CascadeColorParam, &cascadeColor, 1);
-
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(colorTarget->GetWidth(), colorTarget->GetHeight());
-            SD3DPostEffectsUtils::ShEndPass();
-        }
-
-        FX_SetState(oldState);
-        FX_PopRenderTarget(0);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //draw clouds shadow
-    if (bCloudShadows)
-    {
-        ShadowMapFrustum cloudsFrustum;
-        cloudsFrustum.bUseAdditiveBlending = true;
-        FX_DeferredShadowPass(pLight, &cloudsFrustum, true, true, false, 0);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    {
-        PROFILE_LABEL_SCOPE("CUSTOM SHADOW MAPS")
-
-        for (int32* pID = m_RP.m_SMCustomFrustumIDs[nThreadID][nCurRecLevel].begin(); pID != m_RP.m_SMCustomFrustumIDs[nThreadID][nCurRecLevel].end(); ++pID)
-        {
-            ShadowMapFrustum& curFrustum = m_RP.m_SMFrustums[nThreadID][nCurRecLevel][*pID];
-            const bool bIsNearestFrustum = curFrustum.m_eFrustumType == ShadowMapFrustum::e_Nearest;
-
-            // stencil prepass for per rendernode frustums. front AND back faces here
-            if (!bIsNearestFrustum)
-            {
-                FX_DeferredShadowPass(pLight,  &curFrustum, false, false, true, -1);
-            }
-
-            // shadow pass
-            FX_DeferredShadowPass(pLight, &curFrustum, true, false, false, bIsNearestFrustum ? 0 : m_nStencilMaskRef);
-        }
-    }
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-
-    return true;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredShading.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredShading.cpp
deleted file mode 100644
index af4ca53e95..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredShading.cpp
+++ /dev/null
@@ -1,5837 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "../Common/Textures/TextureManager.h"
-#include "../Common/Textures/TextureHelpers.h"
-#include "../Common/RendElements/FlareSoftOcclusionQuery.h"
-#include "../Common/ReverseDepth.h"
-#include "../Common/RenderCapabilities.h"
-#include "D3DTiledShading.h"
-
-#include <AzCore/std/sort.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DDEFERREDSHADING_CPP_SECTION_1 1
-#define D3DDEFERREDSHADING_CPP_SECTION_2 2
-#define D3DDEFERREDSHADING_CPP_SECTION_3 3
-#define D3DDEFERREDSHADING_CPP_SECTION_4 4
-#define D3DDEFERREDSHADING_CPP_SECTION_5 5
-#define D3DDEFERREDSHADING_CPP_SECTION_6 6
-#endif
-
-#if defined(FEATURE_SVO_GI)
-#include "D3D_SVO.h"
-#endif
-#include "GraphicsPipeline/FurPasses.h"
-
-#define MAX_VIS_AREAS 32
-
-// MSAA potential optimizations todo:
-//  - long term: port all functionality to compute, including all extra effects passes.
-
-// About MSAA:
-// - Please be careful when accessing or rendering into msaa'ed targets. When adding new techniques please make sure to test
-// - For post process technique to be MSAA friendly, do either:
-//    - Use compute. Single pass and as efficient as gets. Context switches might be problematic, until all lighting pipeline done like this.
-//    - For non compute, require 2 passes. One at pixel frequency, other at sub sample frequency.
-//               - Reuse existing sample frequency regions on stencil via stencilread/write mask:
-//                      - If not possible, tag pixel frequency regions using stencil + m_pMSAAMaskRT
-//                      - Alternative poor man version, do clip in shader.
-
-CDeferredShading* CDeferredShading::m_pInstance = NULL;
-
-#define RT_LIGHTSMASK g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5] | g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ] | g_HWSR_MaskBit[HWSR_CUBEMAP0] | g_HWSR_MaskBit[HWSR_APPLY_SSDO] | g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION]
-#define RT_LIGHTPASS_RESETMASK g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE5] | g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ] | g_HWSR_MaskBit[HWSR_CUBEMAP0] | g_HWSR_MaskBit[HWSR_APPLY_SSDO] | g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION]
-#define RT_DEBUGMASK g_HWSR_MaskBit[HWSR_DEBUG0] | g_HWSR_MaskBit[HWSR_DEBUG1] | g_HWSR_MaskBit[HWSR_DEBUG2] | g_HWSR_MaskBit[HWSR_DEBUG3]
-#define RT_TEX_PROJECT g_HWSR_MaskBit[HWSR_SAMPLE0]
-#define RT_GLOBAL_CUBEMAP g_HWSR_MaskBit[HWSR_SAMPLE0]
-#define RT_SPECULAR_CUBEMAP g_HWSR_MaskBit[HWSR_SAMPLE1]
-#define RT_AMBIENT_LIGHT g_HWSR_MaskBit[HWSR_SAMPLE5]
-#define RT_GLOBAL_CUBEMAP_IGNORE_VISAREAS g_HWSR_MaskBit[HWSR_SAMPLE4]
-#define RT_AREALIGHT g_HWSR_MaskBit[HWSR_SAMPLE1]
-#define RT_OVERDRAW_DEBUG g_HWSR_MaskBit[HWSR_DEBUG0]
-#define RT_BOX_PROJECTION g_HWSR_MaskBit[HWSR_SAMPLE3]
-#define RT_CLIPVOLUME_ID g_HWSR_MaskBit[HWSR_LIGHTVOLUME0]
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CTexPoolAtlas::Init(int nSize)
-{
-    m_nSize = nSize;
-    Clear();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CTexPoolAtlas::Clear()
-{
-    memset(&m_arrAllocatedBlocks[0], 0, MAX_BLOCKS * sizeof(m_arrAllocatedBlocks[0]));
-#ifdef _DEBUG
-    m_nTotalWaste = 0;
-    m_arrDebugBlocks.clear();
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CTexPoolAtlas::FreeMemory()
-{
-#ifdef _DEBUG
-    stl::free_container(m_arrDebugBlocks);
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CTexPoolAtlas::AllocateGroup(int32* pOffsetX, int32* pOffsetY, int nSizeX, int nSizeY)
-{
-    int nBorder = 2;
-    nSizeX += nBorder << 1;
-    nSizeY += nBorder << 1;
-
-    if (nSizeX > m_nSize || nSizeY > m_nSize)
-    {
-        return false;
-    }
-
-    uint16 nBestX = 0;
-    uint16 nBestY = 0;
-    uint16 nBestID = 0;
-    uint32 nBestWaste = ~0;
-
-    // outer loop over all relevant allocated blocks (Y dimension)
-    int nCurrY = 0;
-    for (int nCurrBlockID = 0;
-         m_arrAllocatedBlocks[max(nCurrBlockID - 1, 0)] > 0 && nCurrY <= m_nSize - nSizeY && nBestWaste > 0;
-         ++nCurrBlockID)
-    {
-        const uint32 nCurrBlock = m_arrAllocatedBlocks[nCurrBlockID];
-        const uint16 nCurrBlockWidth = LOWORD(nCurrBlock);
-        const uint16 nCurrBlockHeight = HIWORD(nCurrBlock);
-
-        // get max X for intersected blocks
-        int nCurrX = nCurrBlockWidth;
-        int nNextY = nCurrBlockHeight;
-        for (uint16 nNextBlockID = nCurrBlockID + 1;
-             m_arrAllocatedBlocks[nNextBlockID] > 0 && nNextY < nSizeY;
-             ++nNextBlockID)
-        {
-            const uint32 nNextBlock = m_arrAllocatedBlocks[nNextBlockID];
-            const uint16 nNextBlockWidth = LOWORD(nNextBlock);
-            const uint16 nNextBlockHeight = HIWORD(nNextBlock);
-            nCurrX = max(nCurrX, int(nNextBlockWidth));
-            nNextY += nNextBlockHeight;
-        }
-
-        // can fit next to them?
-        if (nSizeX <= m_nSize - nCurrX)
-        {
-            // compute waste
-            uint32 nWaste = 0;
-            nNextY = nCurrY;
-            for (uint16 nNextBlockID = nCurrBlockID;
-                 m_arrAllocatedBlocks[nNextBlockID] > 0 && nNextY < nCurrY + nSizeY;
-                 ++nNextBlockID)
-            {
-                const uint32 nNextBlock = m_arrAllocatedBlocks[nNextBlockID];
-                const uint16 nNextBlockWidth = LOWORD(nNextBlock);
-                const uint16 nNextBlockHeight = HIWORD(nNextBlock);
-                nWaste += (nCurrX - nNextBlockWidth) * (min(nCurrY + nSizeY, nNextY + nNextBlockHeight) - max(nCurrY, nNextY));
-                nNextY += nNextBlockHeight;
-            }
-            nWaste += max(nCurrY + nSizeY - nNextY, 0) * nCurrX;
-
-            // right spot?
-            if (nWaste < nBestWaste)
-            {
-                nBestX = nCurrX;
-                nBestY = nCurrY;
-                nBestID = nCurrBlockID;
-                nBestWaste = nWaste;
-            }
-        }
-
-        nCurrY += nCurrBlockHeight;
-    }
-
-    if ((nBestX | nBestY) || nCurrY <= m_nSize - nSizeY)
-    {
-        assert(nBestID < MAX_BLOCKS - 1);
-        if (nBestID >= MAX_BLOCKS - 1)
-        {
-            return false;
-        }
-
-        *pOffsetX = nBestX + nBorder;
-        *pOffsetY = nBestY + nBorder;
-
-        // block to be added, update block info
-        uint32 nBlockData = m_arrAllocatedBlocks[nBestID];
-        const uint16 nReplacedHeight = HIWORD(nBlockData);
-        if (nSizeY < nReplacedHeight)
-        {
-            nBlockData = MAKELONG(nBlockData, nReplacedHeight - nSizeY);
-            // shift by 1
-            for (uint16 nID = nBestID + 1; nBlockData > 0; ++nID)
-            {
-                std::swap(m_arrAllocatedBlocks[nID], nBlockData);
-            }
-        }
-        else if (nSizeY > nReplacedHeight)
-        {
-            uint16 nCoveredHeight = nReplacedHeight;
-            uint16 nBlocksToSkip = 0;
-            nBlockData = m_arrAllocatedBlocks[nBestID + 1];
-            for (uint16 nID = nBestID + 1; nBlockData > 0; nBlockData = m_arrAllocatedBlocks[++nID])
-            {
-                const uint16 nCurrHeight = HIWORD(nBlockData);
-                nCoveredHeight += nCurrHeight;
-                if (nSizeY >= nCoveredHeight)
-                {
-                    nBlocksToSkip++;
-                }
-                else
-                {
-                    m_arrAllocatedBlocks[nID] = MAKELONG(nBlockData, nCoveredHeight - nSizeY);
-                    break;
-                }
-            }
-            // shift by nBlocksToSkip
-            uint16 nID = nBestID + nBlocksToSkip + 1;
-            nBlockData = m_arrAllocatedBlocks[nID];
-            for (; nBlockData > 0; nBlockData = m_arrAllocatedBlocks[++nID])
-            {
-                m_arrAllocatedBlocks[nID - nBlocksToSkip] = nBlockData;
-            }
-        }
-        m_arrAllocatedBlocks[nBestID] = MAKELONG(nBestX + nSizeX, nSizeY);
-
-#ifdef _DEBUG
-        if (m_arrDebugBlocks.size())
-        {
-            m_nTotalWaste += nBestWaste;
-        }
-        _AddDebugBlock(nBestX, nBestY, nSizeX, nSizeY);
-#endif
-
-        return true;
-    }
-
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef _DEBUG
-void CTexPoolAtlas::_AddDebugBlock(int x, int y, int sizeX, int sizeY)
-{
-    SShadowMapBlock block;
-    block.m_nX1 = x;
-    block.m_nX2 = x + sizeX;
-    block.m_nY1 = y;
-    block.m_nY2 = y + sizeY;
-    assert(block.m_nX2 <= m_nSize && block.m_nY2 <= m_nSize);
-    for (std::vector<SShadowMapBlock>::const_iterator it = m_arrDebugBlocks.begin();
-         it != m_arrDebugBlocks.end(); it++)
-    {
-        assert(!block.Intersects(*it));
-    }
-    m_arrDebugBlocks.push_back(block);
-}
-
-float CTexPoolAtlas::_GetDebugUsage() const
-{
-    uint32 nUsed = 0;
-    for (std::vector<SShadowMapBlock>::const_iterator it = m_arrDebugBlocks.begin();
-         it != m_arrDebugBlocks.end(); it++)
-    {
-        nUsed += (it->m_nX2 - it->m_nX1) * (it->m_nY2 - it->m_nY1);
-    }
-
-    return 100.f * nUsed / (m_nSize * m_nSize);
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SRenderLight::CalculateScissorRect()
-{
-    Vec3 cameraPos = gcpRendD3D->GetCamera().GetPosition();
-    Vec3 vViewVec = m_Origin - cameraPos;
-    float fDistToLS =  vViewVec.GetLength();
-
-    // Use max of width/height for area lights.
-    float fMaxRadius = m_fRadius;
-    
-    if (m_Flags & DLF_AREA_LIGHT) // Use max for area lights.
-    {
-        fMaxRadius += max(m_fAreaWidth, m_fAreaHeight);
-    }
-    else if (m_Flags & DLF_DEFERRED_CUBEMAPS)
-    {
-        fMaxRadius = m_ProbeExtents.len();  // This is not optimal for a box
-    }
-    ITexture* pLightTexture = m_pLightImage ? m_pLightImage : NULL;
-    bool bProjectiveLight = (m_Flags & DLF_PROJECT) && pLightTexture && !(pLightTexture->GetFlags() & FT_REPLICATE_TO_ALL_SIDES);
-    bool bInsideLightVolume = fDistToLS <= fMaxRadius;
-    if (bInsideLightVolume && !bProjectiveLight)
-    {
-        //optimization when we are inside light frustum
-        m_sX = 0;
-        m_sY = 0;
-        m_sWidth  = gcpRendD3D->GetWidth();
-        m_sHeight = gcpRendD3D->GetHeight();
-
-        return;
-    }
-
-    // e_ScissorDebug will modify the view matrix here, so take a local copy
-    const Matrix44& mView = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_matView;
-    const Matrix44& mProj = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_matProj;
-
-    Vec3 vCenter = m_Origin;
-    float fRadius = fMaxRadius;
-
-    const int nMaxVertsToProject = 10;
-    int nVertsToProject = 4;
-    Vec3 pBRectVertices[nMaxVertsToProject];
-
-    Vec4 vCenterVS = Vec4(vCenter, 1) * mView;
-
-    if (!bInsideLightVolume)
-    {
-        // Compute tangent planes
-        float r = fRadius;
-        float sq_r = r * r;
-
-        Vec3 vLPosVS = Vec3(vCenterVS.x, vCenterVS.y, vCenterVS.z);
-        float lx = vLPosVS.x;
-        float ly = vLPosVS.y;
-        float lz = vLPosVS.z;
-        float sq_lx = lx * lx;
-        float sq_ly = ly * ly;
-        float sq_lz = lz * lz;
-
-        // Compute left and right tangent planes to light sphere
-        float sqrt_d = sqrt_tpl(max(sq_r * sq_lx  - (sq_lx + sq_lz) * (sq_r - sq_lz), 0.0f));
-        float nx = iszero(sq_lx + sq_lz) ? 1.0f : (r * lx + sqrt_d) / (sq_lx + sq_lz);
-        float nz = iszero(lz) ? 1.0f : (r - nx * lx) / lz;
-
-        Vec3 vTanLeft = Vec3(nx, 0, nz).normalized();
-
-        nx = iszero(sq_lx + sq_lz) ? 1.0f : (r * lx - sqrt_d) / (sq_lx + sq_lz);
-        nz = iszero(lz) ? 1.0f : (r - nx * lx) / lz;
-        Vec3 vTanRight = Vec3(nx, 0, nz).normalized();
-
-        pBRectVertices[0] = vLPosVS - r * vTanLeft;
-        pBRectVertices[1] = vLPosVS - r * vTanRight;
-
-        // Compute top and bottom tangent planes to light sphere
-        sqrt_d = sqrt_tpl(max(sq_r * sq_ly  - (sq_ly + sq_lz) * (sq_r - sq_lz), 0.0f));
-        float ny = iszero(sq_ly + sq_lz) ? 1.0f : (r * ly - sqrt_d) / (sq_ly + sq_lz);
-        nz = iszero(lz) ? 1.0f : (r - ny * ly) / lz;
-        Vec3 vTanBottom = Vec3(0, ny, nz).normalized();
-
-        ny = iszero(sq_ly + sq_lz) ? 1.0f :  (r * ly + sqrt_d) / (sq_ly + sq_lz);
-        nz = iszero(lz) ? 1.0f : (r - ny * ly) / lz;
-        Vec3 vTanTop = Vec3(0, ny, nz).normalized();
-
-        pBRectVertices[2] = vLPosVS - r * vTanTop;
-        pBRectVertices[3] = vLPosVS - r * vTanBottom;
-    }
-
-    if (bProjectiveLight)
-    {
-        // todo: improve/simplify projective case
-
-        Vec3 vRight  = m_ObjMatrix.GetColumn2();
-        Vec3 vUp      = -m_ObjMatrix.GetColumn1();
-        Vec3 pDirFront = m_ObjMatrix.GetColumn0();
-        pDirFront.NormalizeFast();
-
-        // Cone radius
-        float fConeAngleThreshold = 0.0f;
-        float fConeRadiusScale = /*min(1.0f,*/ tan_tpl((m_fLightFrustumAngle + fConeAngleThreshold) * (gf_PI / 180.0f));  //);
-        float fConeRadius = fRadius * fConeRadiusScale;
-
-        Vec3 pDiagA = (vUp + vRight);
-        float fDiagLen = 1.0f / pDiagA.GetLengthFast();
-        pDiagA *= fDiagLen;
-
-        Vec3 pDiagB = (vUp - vRight);
-        pDiagB *= fDiagLen;
-
-        float fPyramidBase =  sqrt_tpl(fConeRadius * fConeRadius * 2.0f);
-        pDirFront *= fRadius;
-
-        Vec3 pEdgeA  = (pDirFront + pDiagA * fPyramidBase);
-        Vec3 pEdgeA2 = (pDirFront - pDiagA * fPyramidBase);
-        Vec3 pEdgeB  = (pDirFront + pDiagB * fPyramidBase);
-        Vec3 pEdgeB2 = (pDirFront - pDiagB * fPyramidBase);
-
-        uint32 nOffset = 4;
-
-        // Check whether the camera is inside the extended bounding sphere that contains pyramid
-
-        // we are inside light frustum
-        // Put all pyramid vertices in view space
-        Vec4 pPosVS = Vec4(vCenter, 1) * mView;
-        pBRectVertices[nOffset++] = Vec3(pPosVS.x, pPosVS.y, pPosVS.z);
-        pPosVS = Vec4(vCenter + pEdgeA, 1) * mView;
-        pBRectVertices[nOffset++] = Vec3(pPosVS.x, pPosVS.y, pPosVS.z);
-        pPosVS = Vec4(vCenter + pEdgeB, 1) * mView;
-        pBRectVertices[nOffset++] = Vec3(pPosVS.x, pPosVS.y, pPosVS.z);
-        pPosVS = Vec4(vCenter + pEdgeA2, 1) * mView;
-        pBRectVertices[nOffset++] = Vec3(pPosVS.x, pPosVS.y, pPosVS.z);
-        pPosVS = Vec4(vCenter + pEdgeB2, 1) * mView;
-        pBRectVertices[nOffset++] = Vec3(pPosVS.x, pPosVS.y, pPosVS.z);
-
-        nVertsToProject = nOffset;
-    }
-
-    Vec3 vPMin = Vec3(1, 1, 999999.0f);
-    Vec2 vPMax = Vec2(0, 0);
-    Vec2 vMin = Vec2(1, 1);
-    Vec2 vMax = Vec2(0, 0);
-
-    int nStart = 0;
-
-    if (bInsideLightVolume)
-    {
-        nStart = 4;
-        vMin = Vec2(0, 0);
-        vMax = Vec2(1, 1);
-    }
-
-    const ICVar* scissorDebugCVar = iConsole->GetCVar("e_ScissorDebug");
-    int scissorDebugEnabled = scissorDebugCVar ? scissorDebugCVar->GetIVal() : 0;
-    Matrix44 invertedView;
-    if (scissorDebugEnabled)
-    {
-        invertedView = mView.GetInverted();
-    }
-
-    // Project all vertices
-    for (int i = nStart; i < nVertsToProject; i++)
-    {
-        if (scissorDebugEnabled)
-        {
-            if (gcpRendD3D->GetIRenderAuxGeom() != NULL)
-            {
-                Vec4 pVertWS = Vec4(pBRectVertices[i], 1) * invertedView;
-                Vec3 v = Vec3(pVertWS.x, pVertWS.y, pVertWS.z);
-                gcpRendD3D->GetIRenderAuxGeom()->DrawPoint(v, RGBA8(0xff, 0xff, 0xff, 0xff), 10);
-
-                int32 nPrevVert = (i - 1) < 0 ? nVertsToProject - 1 : (i - 1);
-                pVertWS = Vec4(pBRectVertices[nPrevVert], 1) * invertedView;
-                Vec3 v2 = Vec3(pVertWS.x, pVertWS.y, pVertWS.z);
-                gcpRendD3D->GetIRenderAuxGeom()->DrawLine(v, RGBA8(0xff, 0xff, 0x0, 0xff), v2, RGBA8(0xff, 0xff, 0x0, 0xff), 3.0f);
-            }
-        }
-
-        Vec4 vScreenPoint = Vec4(pBRectVertices[i], 1.0) * mProj;
-
-        //projection space clamping
-        vScreenPoint.w = max(vScreenPoint.w, 0.00000000000001f);
-        vScreenPoint.x = max(vScreenPoint.x, -(vScreenPoint.w));
-        vScreenPoint.x = min(vScreenPoint.x, vScreenPoint.w);
-        vScreenPoint.y = max(vScreenPoint.y, -(vScreenPoint.w));
-        vScreenPoint.y = min(vScreenPoint.y, vScreenPoint.w);
-
-        //NDC
-        vScreenPoint /= vScreenPoint.w;
-
-        //output coords
-        //generate viewport (x=0,y=0,height=1,width=1)
-        Vec2 vWin;
-        vWin.x = (1.0f + vScreenPoint.x) *  0.5f;
-        vWin.y = (1.0f + vScreenPoint.y) *  0.5f;  //flip coords for y axis
-
-        // clamp to [0.0, 1.0]
-        vWin.x = clamp_tpl<float>(vWin.x, 0.0f, 1.0f);
-        vWin.y = clamp_tpl<float>(vWin.y, 0.0f, 1.0f);
-
-        assert(vWin.x >= 0.0f && vWin.x <= 1.0f);
-        assert(vWin.y >= 0.0f && vWin.y <= 1.0f);
-
-        if (bProjectiveLight && i >= 4)
-        {
-            // Get light pyramid screen bounds
-            vPMin.x = min(vPMin.x, vWin.x);
-            vPMin.y = min(vPMin.y, vWin.y);
-            vPMax.x = max(vPMax.x, vWin.x);
-            vPMax.y = max(vPMax.y, vWin.y);
-
-            vPMin.z = min(vPMin.z, vScreenPoint.z); // if pyramid intersects the nearplane, the test is unreliable. (requires proper clipping)
-        }
-        else
-        {
-            // Get light sphere screen bounds
-            vMin.x = min(vMin.x, vWin.x);
-            vMin.y = min(vMin.y, vWin.y);
-            vMax.x = max(vMax.x, vWin.x);
-            vMax.y = max(vMax.y, vWin.y);
-        }
-    }
-
-    int iWidth = gcpRendD3D->GetWidth();
-    int iHeight = gcpRendD3D->GetHeight();
-    float fWidth = (float)iWidth;
-    float fHeight = (float)iHeight;
-
-    if (bProjectiveLight)
-    {
-        vPMin.x = (float)fsel(vPMin.z, vPMin.x, vMin.x); // Use sphere bounds if pyramid bounds are unreliable
-        vPMin.y = (float)fsel(vPMin.z, vPMin.y, vMin.y);
-        vPMax.x = (float)fsel(vPMin.z, vPMax.x, vMax.x);
-        vPMax.y = (float)fsel(vPMin.z, vPMax.y, vMax.y);
-
-        // Clamp light pyramid bounds to light sphere screen bounds
-        vMin.x = clamp_tpl<float>(vPMin.x, vMin.x, vMax.x);
-        vMin.y = clamp_tpl<float>(vPMin.y, vMin.y, vMax.y);
-        vMax.x = clamp_tpl<float>(vPMax.x, vMin.x, vMax.x);
-        vMax.y = clamp_tpl<float>(vPMax.y, vMin.y, vMax.y);
-    }
-
-    m_sX = (short)(vMin.x * fWidth);
-    m_sY = (short)((1.0f - vMax.y) * fHeight);
-    m_sWidth = (short)ceilf((vMax.x - vMin.x) * fWidth);
-    m_sHeight = (short)ceilf((vMax.y - vMin.y) * fHeight);
-
-    // make sure we don't create a scissor rect out of bound (D3DError)
-    m_sWidth = (m_sX + m_sWidth) > iWidth ? iWidth - m_sX : m_sWidth;
-    m_sHeight = (m_sY + m_sHeight) > iHeight ? iHeight - m_sY : m_sHeight;
-
-#if !defined(RELEASE)
-    if (scissorDebugEnabled)
-    {
-        // Render 2d areas additively on screen
-        IRenderAuxGeom* pAuxRenderer = gEnv->pRenderer->GetIRenderAuxGeom();
-        if (pAuxRenderer)
-        {
-            SAuxGeomRenderFlags oldRenderFlags = pAuxRenderer->GetRenderFlags();
-
-            SAuxGeomRenderFlags newRenderFlags;
-            newRenderFlags.SetDepthTestFlag(e_DepthTestOff);
-            newRenderFlags.SetAlphaBlendMode(e_AlphaAdditive);
-            newRenderFlags.SetMode2D3DFlag(e_Mode2D);
-            pAuxRenderer->SetRenderFlags(newRenderFlags);
-
-            const float screenWidth = (float)gcpRendD3D->GetWidth();
-            const float screenHeight = (float)gcpRendD3D->GetHeight();
-
-            // Calc resolve area
-            const float left = m_sX / screenWidth;
-            const float top = m_sY / screenHeight;
-            const float right = (m_sX + m_sWidth) / screenWidth;
-            const float bottom = (m_sY + m_sHeight) / screenHeight;
-
-            // Render resolve area
-            ColorB areaColor(50, 0, 50, 255);
-
-            if (vPMin.z < 0.0f)
-            {
-                areaColor = ColorB(0, 100, 0, 255);
-            }
-
-            const uint vertexCount = 6;
-            const Vec3 vert[vertexCount] = {
-                Vec3(left, top, 0.0f),
-                Vec3(left, bottom, 0.0f),
-                Vec3(right, top, 0.0f),
-                Vec3(left, bottom, 0.0f),
-                Vec3(right, bottom, 0.0f),
-                Vec3(right, top, 0.0f)
-            };
-            pAuxRenderer->DrawTriangles(vert, vertexCount, areaColor);
-
-            // Set previous Aux render flags back again
-            pAuxRenderer->SetRenderFlags(oldRenderFlags);
-        }
-    }
-#endif
-}
-
-uint32 CDeferredShading::AddLight(const CDLight& pDL, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    const uint32 nThreadID = gcpRendD3D->m_RP.m_nFillThreadID;
-    const int32 nRecurseLevel = passInfo.GetRecursiveLevel();
-
-    eDeferredLightType LightType = eDLT_DeferredLight;
-    if (pDL.m_Flags & DLF_DEFERRED_CUBEMAPS)
-    {
-        LightType = eDLT_DeferredCubemap;
-    }
-    else if (pDL.m_Flags & DLF_AMBIENT)
-    {
-        LightType = eDLT_DeferredAmbientLight;
-    }
-
-    if (pDL.GetLensOpticsElement() && !pDL.m_pSoftOccQuery)
-    {
-        CDLight* pLight = const_cast<CDLight*>(&pDL);
-
-        const uint8 numVisibilityFaders = 2; // For each flare type
-        pLight->m_pSoftOccQuery = new CFlareSoftOcclusionQuery(numVisibilityFaders);
-    }
-
-    TArray<SRenderLight>& rArray = m_pLights[LightType][nThreadID][nRecurseLevel];
-
-    const int32 lightsNum = (int32)rArray.Num();
-    int idx = -1;
-
-    rArray.AddElem(pDL);
-    idx = rArray.Num() - 1;
-    rArray[idx].m_lightId = idx;
-    rArray[idx].AcquireResources();
-
-    IF_LIKELY (eDLT_DeferredLight == LightType)
-    {
-        rArray[idx].m_Color *= fMult;
-        rArray[idx].m_SpecMult *= fMult;
-    }
-    else if (eDLT_DeferredAmbientLight == LightType)
-    {
-        ColorF origCol(rArray[idx].m_Color);
-        rArray[idx].m_Color.lerpFloat(Col_White, origCol, fMult);
-    }
-    else if (eDLT_DeferredCubemap == LightType)
-    {
-        rArray[idx].m_fProbeAttenuation *= fMult;
-    }
-    else
-    {
-        AZ_Assert(false, "Unhandled eDeferredLightType %d", LightType);
-    }
-
-    gcpRendD3D->EF_CheckLightMaterial(const_cast<CDLight*>(&pDL), idx, passInfo, rendItemSorter);
-
-    return idx;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-TArray<SRenderLight>& CDeferredShading::GetLights(int nThreadID, int nCurRecLevel, const eDeferredLightType eType)
-{
-    return m_pLights[eType][nThreadID][nCurRecLevel];
-}
-
-SRenderLight* CDeferredShading::GetLightByID(const uint16 nLightID, const eDeferredLightType eType)
-{
-    const uint32 nThreadID = gcpRendD3D->m_RP.m_nProcessThreadID;
-    assert(SRendItem::m_RecurseLevel[nThreadID] >= 0);
-    const int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-
-    TArray<SRenderLight>& pLightsList = GetLights(nThreadID, nRecurseLevel,  eType);
-    SRenderLight* foundIter = AZStd::find_if(pLightsList.begin(), pLightsList.end(), [&](const SRenderLight& light) {return light.m_lightId == nLightID; });
-    if (foundIter != pLightsList.end())
-    {
-        return foundIter;
-    }
-
-    return nullptr;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CDeferredShading::GetClipVolumeParams(const Vec4*& pParams, uint32& nCount)
-{
-    pParams = m_vClipVolumeParams;
-    nCount = m_nClipVolumesCount[m_nThreadID][m_nRecurseLevel];
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-uint32 CDeferredShading::GetLightsNum(const eDeferredLightType eType)
-{
-    uint32 nThreadID = gcpRendD3D->m_RP.m_nFillThreadID;
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-
-    assert(nRecurseLevel >= 0);
-
-    return m_pLights[eType][nThreadID][nRecurseLevel].size();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::ResetLights()
-{
-    uint32 nThreadID = gcpRendD3D->m_RP.m_nFillThreadID;
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nRecurseLevel >= 0);
-
-    for (uint32 iLightType = 0; iLightType < eDLT_NumLightTypes; ++iLightType)
-    {
-        TArray<SRenderLight>& pLightList = m_pLights[iLightType][nThreadID][nRecurseLevel];
-
-        const uint32 nNumLights = pLightList.size();
-        for (uint32 l = 0; l < nNumLights; ++l)
-        {
-            SRenderLight& pLight = pLightList[l];
-            pLight.DropResources();
-        }
-
-        pLightList.SetUse(0);
-    }
-    m_vecGIClipVolumes[nThreadID][nRecurseLevel].resize(0);
-
-    gcpRendD3D->GetVolumetricFog().Clear();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::ResetAllLights()
-{
-    for (size_t i = 0; i < eDLT_NumLightTypes; ++i)
-    {
-        for (size_t j = 0; j < RT_COMMAND_BUF_COUNT; ++j)
-        {
-            for (size_t k = 0; k < MAX_REND_RECURSION_LEVELS; ++k)
-            {
-                TArray<SRenderLight>& pLightList = m_pLights[i][j][k];
-
-                const uint32 nNumLights = pLightList.size();
-                for (uint32 l = 0; l < nNumLights; ++l)
-                {
-                    SRenderLight& pLight = pLightList[l];
-                    pLight.DropResources();
-                }
-
-                pLightList.Free();
-            }
-        }
-    }
-
-    gcpRendD3D->GetTiledShading().Clear();
-
-    gcpRendD3D->GetVolumetricFog().ClearAll();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::ReleaseData()
-{
-    // When the engine shutsdown this method gets called twice: once for when the level
-    // is unloaded (main thread) and once when the renderer is shutdown (render thread).
-    // Because m_nShadowPoolSize gets set to zero only in this method, we can use it as
-    // flag to indicate that we have already released the data and there is no reason
-    // to do so again. This avoids the assert a few lines below when the renderer is
-    // shutdown...
-    if (m_nShadowPoolSize == 0)
-    {
-        return;
-    }
-
-
-    ResetAllLights();
-    for (uint32 iThread = 0; iThread < 2; ++iThread)
-    {
-        for (uint32 nRecurseLevel = 0; nRecurseLevel < MAX_REND_RECURSION_LEVELS; ++nRecurseLevel)
-        {
-            m_vecGIClipVolumes[iThread][nRecurseLevel].clear();
-        }
-    }
-
-    m_shadowPoolAlloc.SetUse(0);
-    stl::free_container(m_shadowPoolAlloc);
-
-    m_blockPack->FreeContainers();
-
-    m_nShadowPoolSize = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-inline uint8 CDeferredShading::AddClipVolume(const IClipVolume* pClipVolume)
-{
-    uint32 nThreadID = gRenDev->m_RP.m_nFillThreadID;
-    // Note: vis area and clip volume code is processed before EF_StartEf() in 3DEngine side - so recurse level still at -1 at beginning
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID] + 1;
-
-    SClipVolumeData pClipVolumeData;
-    pClipVolumeData.nStencilRef = m_nClipVolumesCount[nThreadID][nRecurseLevel] + 1; // the first clip volume ID is reserved for outdoors
-    pClipVolumeData.nFlags = pClipVolume->GetClipVolumeFlags();
-    pClipVolumeData.mAABB = pClipVolume->GetClipVolumeBBox();
-    pClipVolume->GetClipVolumeMesh(pClipVolumeData.m_pRenderMesh, pClipVolumeData.mWorldTM);
-
-    m_pClipVolumes[nThreadID][nRecurseLevel].push_back(pClipVolumeData);
-    m_nClipVolumesCount[nThreadID][nRecurseLevel]++;
-
-    return pClipVolumeData.nStencilRef;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-bool CDeferredShading::SetClipVolumeBlendData(const IClipVolume* pClipVolume, const SClipVolumeBlendInfo& blendInfo)
-{
-    uint32 nThreadID = gRenDev->m_RP.m_nFillThreadID;
-    // Note: vis area and clip volume code is processed before EF_StartEf() in 3DEngine side - so recurse level still at -1 at beginning
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID] + 1;
-
-    size_t nClipVolumeIndex = pClipVolume->GetStencilRef() - 1; // 0 is reserved for outdoor
-    assert(m_pClipVolumes[nThreadID][nRecurseLevel].size() > nClipVolumeIndex &&
-        m_pClipVolumes[nThreadID][nRecurseLevel][nClipVolumeIndex].nStencilRef == pClipVolume->GetStencilRef());
-
-    SClipVolumeData& clipVolumeData = m_pClipVolumes[nThreadID][nRecurseLevel][nClipVolumeIndex];
-    for (int i = 0; i < SClipVolumeBlendInfo::BlendPlaneCount; ++i)
-    {
-        clipVolumeData.m_BlendData.blendPlanes[i] = Vec4(blendInfo.blendPlanes[i].n, blendInfo.blendPlanes[i].d);
-        clipVolumeData.m_BlendData.nBlendIDs[i] = blendInfo.blendVolumes[i] ? blendInfo.blendVolumes[i]->GetStencilRef() : 0;
-    }
-
-    clipVolumeData.nFlags |= IClipVolume::eClipVolumeBlend;
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::ResetClipVolumes()
-{
-    uint32 nThreadID = gcpRendD3D->m_RP.m_nFillThreadID;
-    // Note: vis area and clip volume code is processed before EF_StartEf() in 3DEngine side - so recurse level still at -1 at beginning
-    uint32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID] + 1;
-
-    if (nRecurseLevel < MAX_REND_RECURSION_LEVELS)
-    {
-        m_pClipVolumes[nThreadID][nRecurseLevel].clear();
-        m_nClipVolumesCount[nThreadID][nRecurseLevel] = 0;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::ResetAllClipVolumes()
-{
-    for (size_t i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        for (size_t j = 0; j < MAX_REND_RECURSION_LEVELS; ++j)
-        {
-            m_pClipVolumes[i][j].clear();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CDeferredShading::SpecularAccEnableMRT(bool bEnable)
-{
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        assert(m_pLBufferSpecularRT);
-
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-        if (bEnable && !m_bSpecularState)
-        {
-            rd->FX_PushRenderTarget(1, m_pLBufferSpecularRT, NULL, -1, false, 1);
-            m_bSpecularState = true;
-            return true;
-        }
-        else if (!bEnable && m_bSpecularState)
-        {
-            m_pLBufferSpecularRT->SetResolved(true);
-            rd->FX_PopRenderTarget(1);
-            m_bSpecularState = false;
-            return true;
-        }
-    }
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::SetupPasses()
-{
-    AZ_TRACE_METHOD();
-    CreateDeferredMaps();
-
-    m_nThreadID = gcpRendD3D->m_RP.m_nProcessThreadID;
-    m_nRecurseLevel = SRendItem::m_RecurseLevel[m_nThreadID];
-    assert(m_nRecurseLevel >= 0);
-
-    m_nBindResourceMsaa = gcpRendD3D->m_RP.m_MSAAData.Type ? SResourceView::DefaultViewMS : SResourceView::DefaultView;
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT &= ~(RT_LIGHTSMASK | RT_DEBUGMASK);
-
-    m_pLBufferDiffuseRT = CTexture::s_ptexCurrentSceneDiffuseAccMap;
-    m_pLBufferSpecularRT = CTexture::s_ptexSceneSpecularAccMap;
-    m_pNormalsRT = CTexture::s_ptexSceneNormalsMap;
-
-    if (FurPasses::GetInstance().IsRenderingFur())
-    {
-        m_pDepthRT = CTexture::s_ptexFurZTarget;
-    }
-    else
-    {
-        m_pDepthRT = CTexture::s_ptexZTarget;
-    }
-
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        m_pResolvedStencilRT = CTexture::s_ptexGmemStenLinDepth;
-        m_pDepthRT = CTexture::s_ptexGmemStenLinDepth;
-    }
-    else
-    {
-        m_pResolvedStencilRT = CTexture::s_ptexVelocity;
-    }
-    m_pDiffuseRT = CTexture::s_ptexSceneDiffuse;
-    m_pSpecularRT = CTexture::s_ptexSceneSpecular;
-    m_pMSAAMaskRT = CTexture::s_ptexBackBuffer;
-
-    m_nTexStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    m_nTexStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-    CameraViewParameters* viewParameters = &gcpRendD3D->m_RP.m_TI[m_nThreadID].m_cam.m_viewParameters;
-    m_pCamFront = viewParameters->vZ;
-    m_pCamFront.Normalize();
-    m_pCamPos = viewParameters->vOrigin;
-
-    m_fCamFar = viewParameters->fFar;
-    m_fCamNear = viewParameters->fNear;
-
-    m_fRatioWidth = (float)m_pLBufferDiffuseRT->GetWidth() / (float)CTexture::s_ptexSceneTarget->GetWidth();
-    m_fRatioHeight = (float)m_pLBufferDiffuseRT->GetHeight() / (float)CTexture::s_ptexSceneTarget->GetHeight();
-
-    m_pView = gcpRendD3D->m_CameraMatrix;
-    m_pView.Transpose();
-
-    m_mViewProj = gcpRendD3D->m_ViewProjMatrix;
-    m_mViewProj.Transpose();
-
-    m_pViewProjI = gcpRendD3D->m_ViewProjMatrix.GetInverted();
-
-    gRenDev->m_cEF.mfRefreshSystemShader("DeferredShading", CShaderMan::s_shDeferredShading);
-    m_pShader = CShaderMan::s_shDeferredShading;
-
-    gcpRendD3D->SetCullMode(R_CULL_BACK);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest <= 1)
-    {
-        m_nRenderState |= GS_NODEPTHTEST;
-    }
-    else
-    {
-        m_nRenderState &= ~GS_NODEPTHTEST;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDebug == 2)
-    {
-        gcpRendD3D->m_RP.m_FlagsShader_RT |= RT_OVERDRAW_DEBUG;
-    }
-
-    m_nCurTargetWidth = m_pLBufferDiffuseRT->GetWidth();
-    m_nCurTargetHeight = m_pLBufferDiffuseRT->GetHeight();
-
-    // Verify if sun present in non-deferred light list (usually fairly small list)
-    gcpRendD3D->m_RP.m_pSunLight = NULL;
-    for (uint32 i = 0; i < gcpRendD3D->m_RP.m_DLights[m_nThreadID][m_nRecurseLevel].Num(); i++)
-    {
-        SRenderLight* dl = &gcpRendD3D->m_RP.m_DLights[m_nThreadID][m_nRecurseLevel][i];
-        if (dl->m_Flags & DLF_SUN)
-        {
-            gcpRendD3D->m_RP.m_pSunLight = dl;
-            break;
-        }
-    }
-
-    SetupGlobalConsts();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::SetupGlobalConsts()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    //set world basis
-    float maskRTWidth = float(m_nCurTargetWidth);
-    float maskRTHeight = float(m_nCurTargetHeight);
-    Vec4r vWBasisX, vWBasisY, vWBasisZ, vCamPos;
-    Vec4 vParamValue, vMag;
-    CShadowUtils::ProjectScreenToWorldExpansionBasis(rd->m_IdentityMatrix, rd->GetCamera(), Vec2(rd->m_TemporalJitterClipSpace.x, rd->m_TemporalJitterClipSpace.y), maskRTWidth, maskRTHeight, vWBasisX, vWBasisY, vWBasisZ, vCamPos, true, NULL);
-
-    vWorldBasisX = vWBasisX / rd->m_RP.m_CurDownscaleFactor.x;
-    vWorldBasisY = vWBasisY / rd->m_RP.m_CurDownscaleFactor.y;
-    vWorldBasisZ = vWBasisZ;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::FilterGBuffer()
-{
-    if (!CRenderer::CV_r_DeferredShadingFilterGBuffer)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DDEFERREDSHADING_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DDeferredShading_cpp)
-#endif
-        return;
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    PROFILE_LABEL_SCOPE("GBUFFER_FILTER");
-
-    static CCryNameTSCRC tech("FilterGBuffer");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DDEFERREDSHADING_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DDeferredShading_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    PostProcessUtils().StretchRect(CTexture::s_ptexSceneSpecular, CTexture::s_ptexStereoR);
-    CTexture* pSceneSpecular = CTexture::s_ptexStereoR;
-#endif
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    rd->FX_PushRenderTarget(0, CTexture::s_ptexSceneSpecular, NULL);
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, tech, FEF_DONTSETSTATES);
-    rd->FX_SetState(GS_NODEPTHTEST);
-    SPostEffectsUtils::SetTexture(CTexture::s_ptexSceneNormalsMap, 0, FILTER_POINT, 0);
-    SPostEffectsUtils::SetTexture(pSceneSpecular, 1, FILTER_POINT, 0);
-    SPostEffectsUtils::SetTexture(m_pDepthRT, 2, FILTER_POINT, 0);
-
-    // Bind sampler directly so that it works with DX11 style texture objects
-    ID3D11SamplerState* pSamplers[1] = { (ID3D11SamplerState*)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState };
-    rd->m_DevMan.BindSampler(eHWSC_Pixel, pSamplers, 15, 1);
-
-    SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexSceneSpecular->GetWidth(), CTexture::s_ptexSceneSpecular->GetHeight());
-    SD3DPostEffectsUtils::ShEndPass();
-
-    ID3D11SamplerState* pSampNull[1] = { NULL };
-    rd->m_DevMan.BindSampler(eHWSC_Pixel, pSampNull, 15, 1);
-    rd->FX_Commit();
-
-    rd->FX_PopRenderTarget(0);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CDeferredShading::DrawLightVolume(EShapeMeshType meshType, const Matrix44& mUnitVolumeToWorld, const Vec4& vSphereAdjust)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    float maskRTWidth = (float) m_nCurTargetWidth;
-    float maskRTHeight = (float) m_nCurTargetHeight;
-
-    Vec4 vScreenScale(1.0f / maskRTWidth, 1.0f / maskRTHeight,
-        0.0f, 0.0f);
-
-    {
-        static CCryNameR paramName("g_ScreenScale");
-        m_pShader->FXSetPSFloat(paramName, &vScreenScale, 1);
-    }
-
-    {
-        static CCryNameR paramName("vWBasisX");
-        m_pShader->FXSetPSFloat(paramName, &vWorldBasisX, 1);
-    }
-
-    {
-        static CCryNameR paramName("vWBasisY");
-        m_pShader->FXSetPSFloat(paramName, &vWorldBasisY, 1);
-    }
-
-    {
-        static CCryNameR paramName("vWBasisZ");
-        m_pShader->FXSetPSFloat(paramName, &vWorldBasisZ, 1);
-    }
-
-    {
-        static CCryNameR paramNameVolumeToWorld("g_mUnitLightVolumeToWorld");
-        m_pShader->FXSetVSFloat(paramNameVolumeToWorld, (Vec4*) mUnitVolumeToWorld.GetData(), 4);
-    }
-
-    {
-        static CCryNameR paramNameSphereAdjust("g_vLightVolumeSphereAdjust");
-        m_pShader->FXSetVSFloat(paramNameSphereAdjust, &vSphereAdjust, 1);
-    }
-
-    {
-        static CCryNameR paramName("g_mViewProj");
-        Matrix44 mViewProjMatrix =  rd->m_ViewMatrix * rd->m_ProjMatrix;
-        m_pShader->FXSetVSFloat(paramName, (Vec4*) mViewProjMatrix.GetData(), 4);
-    }
-
-    // Vertex/index buffer
-    rd->FX_SetVStream(0, rd->m_pUnitFrustumVB[meshType], 0, sizeof(SVF_P3F_C4B_T2F));
-    rd->FX_SetIStream(rd->m_pUnitFrustumIB[meshType], 0, (rd->kUnitObjectIndexSizeof == 2 ? Index16 : Index32));
-
-    rd->D3DSetCull(eCULL_Back);
-    if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        rd->FX_Commit(false);
-        rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, rd->m_UnitFrustVBSize[meshType], 0, rd->m_UnitFrustIBSize[meshType]);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DrawDecalVolume([[maybe_unused]] const SDeferredDecal& rDecal, Matrix44A& mDecalLightProj, ECull volumeCull)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    float maskRTWidth = float(m_nCurTargetWidth);
-    float maskRTHeight = float(m_nCurTargetHeight);
-
-    Vec4 vScreenScale(1.0f / maskRTWidth, 1.0f / maskRTHeight,
-        0.0f, 0.0f);
-
-    {
-        static CCryNameR paramName("g_ScreenScale");
-        m_pShader->FXSetPSFloat(paramName, &vScreenScale, 1);
-    }
-
-    {
-        static CCryNameR paramName("vWBasisX");
-        m_pShader->FXSetPSFloat(paramName, &vWorldBasisX, 1);
-    }
-
-    {
-        static CCryNameR paramName("vWBasisY");
-        m_pShader->FXSetPSFloat(paramName, &vWorldBasisY, 1);
-    }
-
-    {
-        static CCryNameR paramName("vWBasisZ");
-        m_pShader->FXSetPSFloat(paramName, &vWorldBasisZ, 1);
-    }
-
-    //////////////// light sphere processing /////////////////////////////////
-    {
-        Matrix44 mInvDecalLightProj = mDecalLightProj.GetInverted();
-        static CCryNameR paramName("g_mInvLightProj");
-        m_pShader->FXSetVSFloat(paramName, alias_cast<Vec4*>(&mInvDecalLightProj), 4);
-    }
-
-    {
-        static CCryNameR paramName("g_mViewProj");
-        m_pShader->FXSetVSFloat(paramName, alias_cast<Vec4*>(&m_mViewProj), 4);
-    }
-
-    rd->FX_SetVStream(0, rd->m_pUnitFrustumVB[SHAPE_BOX], 0, sizeof(SVF_P3F_C4B_T2F));
-    rd->FX_SetIStream(rd->m_pUnitFrustumIB[SHAPE_BOX], 0, (rd->kUnitObjectIndexSizeof == 2 ? Index16 : Index32));
-
-    rd->D3DSetCull(volumeCull);
-    if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        rd->FX_Commit(false);
-        rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, rd->m_UnitFrustVBSize[SHAPE_BOX], 0, rd->m_UnitFrustIBSize[SHAPE_BOX]);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Calculates matrix that projects WS position into decal volume for texture coordinates
-Matrix44A GetDecalLightProjMatrix(const SDeferredDecal& rDecal)
-{
-    static const float fZNear = -0.3f;
-    static const float fZFar = 0.5f;
-
-    static const Matrix44A mTextureAndDepth(
-        0.5f, 0.0f, 0.0f, 0.5f,
-        0.0f, -0.5f, 0.0f, 0.5f,
-        0.0f, 0.0f, 1.0f / (fZNear - fZFar), fZNear / (fZNear - fZFar),
-        0.0f, 0.0f, 0.0f, 1.0f);
-
-    // transform world coords to decal texture coords
-    Matrix44A mDecalLightProj = mTextureAndDepth * rDecal.projMatrix.GetInverted();
-    return mDecalLightProj;
-}
-
-// Calculates tangent space to world matrix
-Matrix44A CalculateTSMatrix(const Vec3 vBasisX, const Vec3 vBasisY, const Vec3 vBasisZ)
-{
-    const Vec3 vNormX = vBasisX.GetNormalized();
-    const Vec3 vNormY = vBasisY.GetNormalized();
-    const Vec3 vNormZ = vBasisZ.GetNormalized();
-
-    // decal normal map to world transform
-    Matrix44A mDecalTS(
-        vNormX.x, vNormX.y, vNormX.z, 0,
-        -vNormY.x, -vNormY.y, -vNormY.z, 0,
-        vNormZ.x, vNormZ.y, vNormZ.z, 0,
-        0, 0, 0, 1);
-
-    return mDecalTS;
-}
-
-// Shared function to get dynamic parameters for deferred decals
-void GetDynamicDecalParams(AZStd::vector<SShaderParam>& shaderParams, float& decalAlphaMult, float& decalFalloff, float& decalDiffuseOpacity, float& emittanceMapGamma)
-{
-    decalAlphaMult = 1.0f;
-    decalFalloff = 1.0f;
-    emittanceMapGamma = 1.0f;
-    decalDiffuseOpacity = 1.0f;
-
-    for (uint32 i = 0, si = shaderParams.size(); i < si; ++i)
-    {
-        const char* name = shaderParams[i].m_Name.c_str();
-        if (azstricmp(name, "DecalAlphaMult") == 0)
-        {
-            decalAlphaMult = shaderParams[i].m_Value.m_Float;
-        }
-        else if (azstricmp(name, "DecalFalloff") == 0)
-        {
-            decalFalloff = shaderParams[i].m_Value.m_Float;
-        }
-        else if (azstricmp(name, "EmittanceMapGamma") == 0)
-        {
-            emittanceMapGamma = shaderParams[i].m_Value.m_Float;
-        }
-        else if (azstricmp(name, "DecalDiffuseOpacity") == 0)
-        {
-            decalDiffuseOpacity = shaderParams[i].m_Value.m_Float;
-        }
-    }
-}
-
-bool CDeferredShading::DeferredDecalPass(const SDeferredDecal& rDecal, uint32 indDecal)
-{
-    // __________________________________________________________________________________________
-    // Early out if no emissive material
-
-    _smart_ptr<IMaterial> pDecalMaterial = rDecal.pMaterial;
-    if (pDecalMaterial == NULL)
-    {
-        AZ_WarningOnce("CDeferredShading", pDecalMaterial == NULL, "Decal missing material.");
-        return false;
-    }
-
-    SShaderItem& sItem = pDecalMaterial->GetShaderItem(0);
-    if (sItem.m_pShaderResources == NULL)
-    {
-        assert(0);
-        return false;
-    }
-
-    // __________________________________________________________________________________________
-    // Begin
-
-    PROFILE_FRAME(CDeferredShading_DecalPass);
-    PROFILE_SHADER_SCOPE;
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT &= ~(RT_LIGHTSMASK | g_HWSR_MaskBit[HWSR_SAMPLE4]);
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    rd->m_RP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-
-    bool bStencilMask = false;
-    bool bUseLightVolumes = true;
-
-    rd->EF_Scissor(false, 0, 0, 1, 1);
-    rd->SetDepthBoundTest(0.0f, 1.0f, false); // stencil pre-passes are rop bound, using depth bounds increases even more rop cost
-
-    // coord systems conversion (from orientation to shader matrix)
-    const Vec3 vBasisX = rDecal.projMatrix.GetColumn0();
-    const Vec3 vBasisY = rDecal.projMatrix.GetColumn1();
-    const Vec3 vBasisZ = rDecal.projMatrix.GetColumn2();
-
-    // __________________________________________________________________________________________
-    // Textures
-
-    CTexture* pCurTarget = CTexture::s_ptexSceneNormalsMap;
-    m_nCurTargetWidth = pCurTarget->GetWidth();
-    m_nCurTargetHeight = pCurTarget->GetHeight();
-
-    const float decalSize = max(vBasisX.GetLength() * 2.0f, vBasisY.GetLength() * 2.0f);
-
-    // We will use mipLevelFactor from diffuse texture for other textures
-    float mipLevelFactor = 0.0;
-
-    ITexture* pDiffuseTex = SetTexture(sItem, EFTT_DIFFUSE, 2, rDecal.rectTexture, decalSize, mipLevelFactor, ESetTexture_Transform | ESetTexture_bSRGBLookup);
-    assert(pDiffuseTex != nullptr);
-
-    int setTextureFlags = ESetTexture_HWSR | ESetTexture_AllowDefault | ESetTexture_MipFactorProvided;
-    SetTexture(sItem, EFTT_NORMALS,    3, rDecal.rectTexture, decalSize, mipLevelFactor, setTextureFlags);
-    SetTexture(sItem, EFTT_SMOOTHNESS, 4, rDecal.rectTexture, decalSize, mipLevelFactor, setTextureFlags);
-    SetTexture(sItem, EFTT_OPACITY,    5, rDecal.rectTexture, decalSize, mipLevelFactor, setTextureFlags);
-
-    SD3DPostEffectsUtils::SetTexture((CTexture*)CTexture::s_ptexBackBuffer, 6, FILTER_POINT, 0);   //contains copy of normals buffer
-
-    // Need to set the depth texture if is not available as a RT
-    const bool needDepthTexture = !rd->FX_GetEnabledGmemPath(nullptr) || rd->FX_GmemGetDepthStencilMode() == CD3D9Renderer::eGDSM_Texture;
-    if (needDepthTexture)
-    {
-        m_pDepthRT->Apply(0, m_nTexStatePoint);
-    }
-
-    // __________________________________________________________________________________________
-    // Stencil
-
-    rd->m_RP.m_PersFlags2 |= RBPF2_READMASK_RESERVED_STENCIL_BIT;
-
-    //apply stencil dynamic masking
-    rd->FX_SetStencilState(
-        STENC_FUNC(FSS_STENCFUNC_EQUAL) |
-        STENCOP_FAIL(FSS_STENCOP_KEEP) |
-        STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-        STENCOP_PASS(FSS_STENCOP_KEEP),
-        BIT_STENCIL_RESERVED, BIT_STENCIL_RESERVED, 0xFFFFFFFF
-    );
-
-    rd->m_RP.m_PersFlags2 &= ~RBPF2_READMASK_RESERVED_STENCIL_BIT;
-
-    if (bStencilMask)
-    {
-        rd->FX_StencilTestCurRef(true, false);
-    }
-
-    // __________________________________________________________________________________________
-    // Shader technique
-
-    if (rDecal.fGrowAlphaRef > 0.0f)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_deferredDecalsDebug == 1)
-    {
-        rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0]; // disable alpha grow feature
-        rd->m_RP.m_FlagsShader_RT |=  g_HWSR_MaskBit[HWSR_SAMPLE2]; // debug output
-        rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE3]; // disable normals
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-    }
-    
-    if (bUseLightVolumes)
-    {
-        //enable light volumes rendering
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-        static CCryNameTSCRC techName("DeferredDecalVolume");
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-    else
-    {
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pDeferredDecalTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-
-    // __________________________________________________________________________________________
-    // Shader Params
-
-    // Texture transforms
-    m_pShader->FXSetPSFloat(m_pParamTexTransforms, m_vTextureTransforms[0], 2 * EMaxTextureSlots);
-
-    // decal normal map to world transform
-    Matrix44A mDecalTS = CalculateTSMatrix(vBasisX, vBasisY, vBasisZ);
-    m_pShader->FXSetPSFloat(m_pParamDecalTS, (Vec4*)mDecalTS.GetData(), 4);
-
-    // transform world coords to decal texture coords
-    Matrix44A mDecalLightProj = GetDecalLightProjMatrix(rDecal);
-    m_pShader->FXSetPSFloat(m_pParamLightProjMatrix, (Vec4*)mDecalLightProj.GetData(), 4);
-
-    // Diffuse
-    Vec4 vDiff = sItem.m_pShaderResources->GetColorValue(EFTT_DIFFUSE).toVec4();
-    vDiff.w = sItem.m_pShaderResources->GetStrengthValue(EFTT_OPACITY) * rDecal.fAlpha;
-    m_pShader->FXSetPSFloat(m_pParamDecalDiffuse, &vDiff, 1);
-
-    // Angle Attenuation
-    Vec4 angleAttenuation = Vec4(rDecal.angleAttenuation,0,0,0);
-    m_pShader->FXSetPSFloat(m_pParamDecalAngleAttenuation, &angleAttenuation, 1);
-    
-    // Specular
-    Vec4 vSpec = sItem.m_pShaderResources->GetColorValue(EFTT_SPECULAR).toVec4();
-    vSpec.w = sItem.m_pShaderResources->GetStrengthValue(EFTT_SMOOTHNESS);
-    m_pShader->FXSetPSFloat(m_pParamDecalSpecular, &vSpec, 1);
-
-    // Dynamic params
-    float decalAlphaMult, decalFalloff, decalDiffuseOpacity, emittanceMapGamma;
-    auto& shaderParams = sItem.m_pShaderResources->GetParameters();
-    GetDynamicDecalParams(shaderParams, decalAlphaMult, decalFalloff, decalDiffuseOpacity, emittanceMapGamma);
-
-    float fGrowAlphaRef = rDecal.fGrowAlphaRef;
-
-    // Debug shader params
-    if (pDiffuseTex && CRenderer::CV_r_deferredDecalsDebug == 1)
-    {
-        indDecal = pDiffuseTex->GetTextureID() % 3;
-
-        decalAlphaMult      = indDecal == 0 ? 1.0f : 0.0;
-        decalFalloff        = indDecal == 1 ? 1.0f : 0.0;
-        decalDiffuseOpacity = indDecal == 2 ? 1.0f : 0.0;
-        fGrowAlphaRef       = 0.94f;   // Crytek magic value
-    }
-
-    Vec4 decalParams(decalAlphaMult, decalFalloff, decalDiffuseOpacity, rDecal.fGrowAlphaRef);
-    m_pShader->FXSetPSFloat(m_pGeneralParams, &decalParams, 1);
-
-
-    // __________________________________________________________________________________________
-    // State
-
-    int nStates = m_nRenderState;
-
-    int disableFlags = GS_BLEND_MASK | GS_COLMASK_NONE | GS_NODEPTHTEST | GS_DEPTHFUNC_MASK;
-    int enableFlags = GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA | GS_DEPTHFUNC_LEQUAL | GS_COLMASK_RGB | GS_STENCIL;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_deferredDecalsDebug == 2)
-    {
-        enableFlags |= GS_DEPTHWRITE | GS_WIREFRAME;
-    }
-
-    nStates &= ~disableFlags;
-    nStates |= enableFlags;
-
-    // __________________________________________________________________________________________
-    // Culling
-
-    ECull volumeCull = eCULL_Back;
-
-    rd->EF_Scissor(false, 0, 0, 1, 1);
-
-    const float r = fabs(vBasisX.dot(m_pCamFront)) + fabs(vBasisY.dot(m_pCamFront)) + fabs(vBasisZ.dot(m_pCamFront));
-    const float s = m_pCamFront.dot(rDecal.projMatrix.GetTranslation() - m_pCamPos);
-    if (fabs(s) - m_fCamNear <= r) // OBB-Plane via separating axis test, to check if camera near plane intersects decal volume
-    {
-        nStates &= ~(GS_NODEPTHTEST | GS_DEPTHFUNC_MASK);
-        nStates |= GS_DEPTHFUNC_GREAT;
-        volumeCull = eCULL_Front;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_deferredDecalsDebug == 2)
-    {
-        volumeCull = eCULL_Back;
-    }
-
-    // __________________________________________________________________________________________
-    // Render
-
-    rd->FX_SetState(nStates);
-
-    if (bUseLightVolumes)
-    {
-        DrawDecalVolume(rDecal, mDecalLightProj, volumeCull);
-    }
-    else
-    {
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_nCurTargetWidth, m_nCurTargetHeight);
-    }
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    if (bStencilMask)
-    {
-        rd->FX_StencilTestCurRef(false);
-    }
-
-    return true;
-}
-
-// This renders the emissive part of a single deferred decal.
-// Only the emissive part of the light is output as the rest of the lighting has been calculated in the deferred resolve.
-// Blends using SRC_ONE and DST_ONE
-// Called by CD3D9Renderer::FX_DeferredDecalsEmissive
-// Uses pixel shader DecalEmissivePassPS in DeferredShading.cfx
-void CDeferredShading::DeferredDecalEmissivePass(const SDeferredDecal& rDecal, [[maybe_unused]] uint32 indDecal)
-{
-    // __________________________________________________________________________________________
-    // Early out if no emissive material
-
-    _smart_ptr<IMaterial> pDecalMaterial = rDecal.pMaterial;
-    if (pDecalMaterial == NULL)
-    {
-        AZ_WarningOnce("CDeferredShading", pDecalMaterial == NULL, "Decal missing material.");
-        return;
-    }
-
-    SShaderItem& sItem = pDecalMaterial->GetShaderItem(0);
-    if (sItem.m_pShaderResources == NULL)
-    {
-        assert(0);
-        return;
-    }
-
-    if (!sItem.m_pShaderResources->IsEmissive())
-    {
-        return;
-    }
-
-    // __________________________________________________________________________________________
-    // Begin
-
-    PROFILE_FRAME(CDeferredShading_DecalEmissivePass);
-    PROFILE_SHADER_SCOPE;
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT &= ~(RT_LIGHTSMASK | g_HWSR_MaskBit[HWSR_SAMPLE4]);
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    rd->m_RP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-
-    bool bUseLightVolumes = true;
-
-    rd->EF_Scissor(false, 0, 0, 1, 1);
-    rd->SetDepthBoundTest(0.0f, 1.0f, false);
-
-    // coord systems conversion (from orientation to shader matrix)
-    const Vec3 vBasisX = rDecal.projMatrix.GetColumn0();
-    const Vec3 vBasisY = rDecal.projMatrix.GetColumn1();
-    const Vec3 vBasisZ = rDecal.projMatrix.GetColumn2();
-
-    // __________________________________________________________________________________________
-    // Textures
-
-    CTexture* pCurTarget = CTexture::s_ptexHDRTarget;
-    m_nCurTargetWidth = pCurTarget->GetWidth();
-    m_nCurTargetHeight = pCurTarget->GetHeight();
-
-    // Particles use the $Detail slot for emittance
-    EEfResTextures emittanceTextureIdx = EFTT_EMITTANCE;
-    const char* shaderName = sItem.m_pShader->GetName();
-    if (strcmp(shaderName, "Particles") == 0)
-        emittanceTextureIdx = EFTT_DETAIL_OVERLAY;
-
-    // Each texture will calculate it's own mip level factor
-    float dummyMipLevelFactor = 0;
-    const float decalSize = max(vBasisX.GetLength() * 2.0f, vBasisY.GetLength() * 2.0f);
-
-    int setTextureFlags = ESetTexture_HWSR | ESetTexture_AllowDefault | ESetTexture_Transform;
-    SetTexture(sItem, emittanceTextureIdx,  3, rDecal.rectTexture, decalSize, dummyMipLevelFactor, setTextureFlags);
-    SetTexture(sItem, EFTT_DECAL_OVERLAY,   4, rDecal.rectTexture, decalSize, dummyMipLevelFactor, setTextureFlags);
-    SetTexture(sItem, EFTT_OPACITY,         5, rDecal.rectTexture, decalSize, dummyMipLevelFactor, setTextureFlags);
-
-    SD3DPostEffectsUtils::SetTexture((CTexture*)CTexture::s_ptexZTarget,    0, FILTER_POINT, 0);    // depth
-    SD3DPostEffectsUtils::SetTexture((CTexture*)CTexture::s_ptexBackBuffer, 6, FILTER_POINT, 0);    // copy of normals
-
-    // Need to set the depth texture if is not available as a RT
-    const bool needDepthTexture = !rd->FX_GetEnabledGmemPath(nullptr) || rd->FX_GmemGetDepthStencilMode() == CD3D9Renderer::eGDSM_Texture;
-    if (needDepthTexture)
-    {
-        m_pDepthRT->Apply(0, m_nTexStatePoint);
-    }
-
-    // __________________________________________________________________________________________
-    // Shader technique
-
-    if (rDecal.fGrowAlphaRef > 0.0f)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (bUseLightVolumes)
-    {
-        //enable light volumes rendering
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-        static CCryNameTSCRC techName("DeferredDecalEmissiveVolume");
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-    else
-    {
-        static CCryNameTSCRC techName("DeferredDecalEmissive");
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-    }
-    // __________________________________________________________________________________________
-    // Shader Params
-
-    // Dynamic Params
-    float decalAlphaMult, decalFalloff, decalDiffuseOpacity, emittanceMapGamma;
-    auto& shaderParams = sItem.m_pShaderResources->GetParameters();
-    GetDynamicDecalParams(shaderParams, decalAlphaMult, decalFalloff, decalDiffuseOpacity, emittanceMapGamma);
-
-    Vec4 decalParams(decalAlphaMult, decalFalloff, emittanceMapGamma, rDecal.fGrowAlphaRef);
-    m_pShader->FXSetPSFloat(m_pGeneralParams, &decalParams, 1);
-
-    // Texture transforms
-    m_pShader->FXSetPSFloat(m_pParamTexTransforms, m_vTextureTransforms[0], 2 * EMaxTextureSlots);
-
-    // transform world coords to decal texture coords
-    Matrix44A mDecalLightProj = GetDecalLightProjMatrix(rDecal);
-    m_pShader->FXSetPSFloat(m_pParamLightProjMatrix, (Vec4*)mDecalLightProj.GetData(), 4);
-
-    // decal normal map to world transform
-    Matrix44A mDecalTS = CalculateTSMatrix(vBasisX, vBasisY, vBasisZ);
-    m_pShader->FXSetPSFloat(m_pParamDecalTS, (Vec4*)mDecalTS.GetData(), 4);
-
-    // Emissive color + intensity
-    Vec4 vEmissive = sItem.m_pShaderResources->GetColorValue(EFTT_EMITTANCE).toVec4();
-    vEmissive.w = sItem.m_pShaderResources->GetStrengthValue(EFTT_EMITTANCE);
-    m_pShader->FXSetPSFloat(m_pParamDecalEmissive, &vEmissive, 1);
-
-    // __________________________________________________________________________________________
-    // State
-
-    int nStates = m_nRenderState;
-
-    int disableFlags = GS_NODEPTHTEST | GS_STENCIL | GS_DEPTHFUNC_MASK | GS_BLEND_MASK | GS_COLMASK_NONE;
-    int enableFlags = GS_DEPTHFUNC_LEQUAL | GS_COLMASK_RGB | GS_BLSRC_ONE | GS_BLDST_ONE;
-
-    nStates &= ~disableFlags;
-    nStates |= enableFlags;
-
-    // __________________________________________________________________________________________
-    // Culling
-
-    ECull volumeCull = eCULL_Back;
-
-    rd->EF_Scissor(false, 0, 0, 1, 1);
-
-    const float r = fabs(vBasisX.dot(m_pCamFront)) + fabs(vBasisY.dot(m_pCamFront)) + fabs(vBasisZ.dot(m_pCamFront));
-    const float s = m_pCamFront.dot(rDecal.projMatrix.GetTranslation() - m_pCamPos);
-    if (fabs(s) - m_fCamNear <= r) // OBB-Plane via separating axis test, to check if camera near plane intersects decal volume
-    {
-        nStates &= ~(GS_NODEPTHTEST | GS_DEPTHFUNC_MASK);
-        nStates |= GS_DEPTHFUNC_GREAT;
-        volumeCull = eCULL_Front;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_deferredDecalsDebug == 2)
-    {
-        volumeCull = eCULL_Back;
-    }
-
-    // __________________________________________________________________________________________
-    // Render
-
-    rd->FX_SetState(nStates);
-
-    if (bUseLightVolumes)
-    {
-        DrawDecalVolume(rDecal, mDecalLightProj, volumeCull);
-    }
-    else
-    {
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_nCurTargetWidth, m_nCurTargetHeight);
-    }
-
-    SD3DPostEffectsUtils::ShEndPass();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::GetLightRenderSettings(const SRenderLight* const __restrict pDL, bool& bStencilMask, bool& bUseLightVolumes, EShapeMeshType& meshType)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-    const bool bAreaLight = (pDL->m_Flags & DLF_AREA_LIGHT) && pDL->m_fAreaWidth && pDL->m_fAreaHeight && pDL->m_fLightFrustumAngle;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_deferredshadingLightVolumes)
-    {
-        if (bAreaLight)
-        {
-            // area lights use non-uniform box volume
-            // need to do more complex box intersection test
-            float fExpensionRadius = pDL->m_fRadius * 1.08f;
-            Vec3 vScale(fExpensionRadius, fExpensionRadius, fExpensionRadius);
-
-            Matrix34 mObjInv = CShadowUtils::GetAreaLightMatrix(pDL, vScale);
-            mObjInv.Invert();
-
-            // check if volumes bounding box intersects the near clipping plane
-            const Plane* pNearPlane(rd->GetCamera().GetFrustumPlane(FR_PLANE_NEAR));
-            Vec3 pntOnNearPlane(rd->GetCamera().GetPosition() - pNearPlane->DistFromPlane(rd->GetCamera().GetPosition()) * pNearPlane->n);
-            Vec3 pntOnNearPlaneOS(mObjInv.TransformPoint(pntOnNearPlane));
-
-            Vec3 nearPlaneOS_n(mObjInv.TransformVector(pNearPlane->n));
-            f32 nearPlaneOS_d(-nearPlaneOS_n.Dot(pntOnNearPlaneOS));
-
-            // get extreme lengths
-            float t(fabsf(nearPlaneOS_n.x) + fabsf(nearPlaneOS_n.y) + fabsf(nearPlaneOS_n.z));
-
-            float t0 = t + nearPlaneOS_d;
-            float t1 = -t + nearPlaneOS_d;
-
-            if (t0 * t1 > 0.0f)
-            {
-                bUseLightVolumes = true;
-            }
-            else
-            {
-                bStencilMask = true;
-            }
-        }
-        else
-        {
-            const float kDLRadius = pDL->m_fRadius;
-            const float fSmallLightBias = 0.5f;
-            // the light mesh tessellation and near clipping plane require some bias when testing if inside sphere
-            // higher bias for low radius lights
-            float fSqLightRadius = kDLRadius * max(-0.1f * kDLRadius + 1.5f, 1.22f);
-            fSqLightRadius = max(kDLRadius + fSmallLightBias, fSqLightRadius); //always add on a minimum bias, for very small light's sake
-            fSqLightRadius *= fSqLightRadius;
-            if (fSqLightRadius < pDL->m_Origin.GetSquaredDistance(m_pCamPos))
-            {
-                bUseLightVolumes = true;
-            }
-            else
-            {
-                bStencilMask = true;
-            }
-        }
-    }
-
-    Vec4 pLightRect  = Vec4(pDL->m_sX, pDL->m_sY, pDL->m_sWidth, pDL->m_sHeight);
-    Vec4 scaledLightRect = pLightRect * Vec4(
-            rRP.m_CurDownscaleFactor.x, rRP.m_CurDownscaleFactor.y,
-            rRP.m_CurDownscaleFactor.x, rRP.m_CurDownscaleFactor.y
-            );
-
-    float fCurTargetWidth = (float)(m_nCurTargetWidth);
-    float fCurTargetHeight = (float)(m_nCurTargetHeight);
-
-    if (!iszero(CRenderer::CV_r_DeferredShadingLightLodRatio))
-    {
-        if (CRenderer::CV_r_DeferredShadingLightStencilRatio > 0.01f)
-        {
-            const float fLightLodRatioScale = CRenderer::CV_r_DeferredShadingLightLodRatio;
-            float fLightArea = pLightRect.z * pLightRect.w;
-            float fScreenArea = fCurTargetHeight * fCurTargetWidth;
-            float fLightRatio = fLightLodRatioScale * (fLightArea / fScreenArea);
-
-            const float fDrawVolumeThres = 0.005f;
-            if (fLightRatio < fDrawVolumeThres)
-            {
-                bUseLightVolumes = false;
-            }
-
-            if (fLightRatio > 4 * CRenderer::CV_r_DeferredShadingLightStencilRatio)
-            {
-                meshType = SHAPE_PROJECTOR2;
-            }
-            else
-            if (fLightRatio > 2 * CRenderer::CV_r_DeferredShadingLightStencilRatio)
-            {
-                meshType = SHAPE_PROJECTOR1;
-            }
-        }
-        else
-        {
-            const float fLightLodRatioScale = CRenderer::CV_r_DeferredShadingLightLodRatio;
-            float fLightArea = pLightRect.z * pLightRect.w;
-            float fScreenArea = fCurTargetHeight * fCurTargetWidth;
-            float fLightRatio = fLightLodRatioScale * (fLightArea / fScreenArea);
-
-            const float fDrawVolumeThres = 0.005f;
-            if (fLightRatio < fDrawVolumeThres)
-            {
-                bUseLightVolumes = false;
-            }
-        }
-    }
-}
-
-void CDeferredShading::LightPass(const SRenderLight* const __restrict pDL, bool bForceStencilDisable /*= false*/)
-{
-    PROFILE_FRAME(CDeferredShading_LightPass);
-    PROFILE_SHADER_SCOPE;
-
-    PROFILE_LABEL(pDL->m_sName);
-
-    PrefetchLine(&pDL->m_Color, 0);
-    PrefetchLine(&pDL->m_sWidth, 0);
-
-    // Skip non-ambient area light if support is disabled
-    if ((pDL->m_Flags & DLF_AREA_LIGHT) && !(pDL->m_Flags & DLF_AMBIENT) && !CRenderer::CV_r_DeferredShadingAreaLights)
-    {
-        return;
-    }
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT &= ~(RT_LIGHTPASS_RESETMASK | RT_CLIPVOLUME_ID);
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-    CD3D9Renderer::EGmemPath gmemPath = gcpRendD3D->FX_GetEnabledGmemPath(nullptr);
-    bool castShadowMaps = (pDL->m_Flags & DLF_CASTSHADOW_MAPS) != 0;
-    bool isGmemEnabled = gmemPath != CD3D9Renderer::eGT_REGULAR_PATH;
-    const ITexture* pLightTex = pDL->m_pLightImage ? pDL->m_pLightImage : NULL;
-    const bool bProj2D = (pDL->m_Flags & DLF_PROJECT) && pLightTex && !(pLightTex->GetFlags() & FT_REPLICATE_TO_ALL_SIDES);
-    const bool bAreaLight = (pDL->m_Flags & DLF_AREA_LIGHT) && pDL->m_fAreaWidth && pDL->m_fAreaHeight && pDL->m_fLightFrustumAngle;
-
-    // Store light properties (color/radius, position relative to camera, rect, zbounds)
-    Vec4 pLightDiffuse = Vec4(pDL->m_Color.r, pDL->m_Color.g, pDL->m_Color.b, pDL->m_SpecMult);
-
-    float fInvRadius = (pDL->m_fRadius <= 0) ? 1.0f : 1.0f / pDL->m_fRadius;
-    Vec4 pLightPosCS = Vec4(pDL->m_Origin - m_pCamPos, fInvRadius);
-    Vec4 pDepthBounds = GetLightDepthBounds(pDL, (rRP.m_TI[rRP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0);
-
-    Vec4 scaledLightRect = Vec4(
-            pDL->m_sX * rRP.m_CurDownscaleFactor.x,
-            pDL->m_sY * rRP.m_CurDownscaleFactor.y,
-            pDL->m_sWidth * rRP.m_CurDownscaleFactor.x,
-            pDL->m_sHeight * rRP.m_CurDownscaleFactor.y
-            );
-
-    bool bUseLightVolumes = false;
-    bool bStencilMask = (CRenderer::CV_r_DeferredShadingStencilPrepass && (bProj2D || bAreaLight)) || CRenderer::CV_r_DebugLightVolumes || (pDL->m_fProjectorNearPlane < 0);
-    rRP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-
-    GetLightRenderSettings(pDL, bStencilMask, bUseLightVolumes, rRP.m_nDeferredPrimitiveID);
-
-    //reset stencil mask
-    if (bForceStencilDisable)
-    {
-        bStencilMask = false;
-    }
-
-    if (pDL->m_Flags & DLF_AMBIENT)
-    {
-        rRP.m_FlagsShader_RT |= RT_AMBIENT_LIGHT;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingAreaLights)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE3];
-    }
-
-    float fAttenuationBulbSize = pDL->m_fAttenuationBulbSize;
-
-    if (bAreaLight)
-    {
-        fAttenuationBulbSize = (pDL->m_fAreaWidth + pDL->m_fAreaHeight) * 0.25;
-    }
-
-    // Adjust light intensity so that the intended brightness is reached 1 meter from the light's surface
-    if (!(pDL->m_Flags & DLF_AMBIENT))
-    {
-        fAttenuationBulbSize = max(fAttenuationBulbSize, 0.001f);
-
-        // Solve I * 1 / (1 + d/lightsize)^2 = 1
-        float intensityMul = 1.0f + 1.0f / fAttenuationBulbSize;
-        intensityMul *= intensityMul;
-        pLightDiffuse.x *= intensityMul;
-        pLightDiffuse.y *= intensityMul;
-        pLightDiffuse.z *= intensityMul;
-    }
-
-    // Enable light pass flags
-    if ((pDL->m_Flags & DLF_PROJECT))
-    {
-        assert(!(pDL->GetDiffuseCubemap() && pDL->GetSpecularCubemap()));
-        rRP.m_FlagsShader_RT |= RT_TEX_PROJECT;
-        if (bProj2D && !bAreaLight)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ];
-        }
-    }
-
-    if (bAreaLight)
-    {
-        rRP.m_FlagsShader_RT |= RT_AREALIGHT;
-    }
-
-    uint16 scaledX = (uint16)(scaledLightRect.x);
-    uint16 scaledY = (uint16)(scaledLightRect.y);
-    uint16 scaledWidth = (uint16)(scaledLightRect.z) + 1;
-    uint16 scaledHeight = (uint16)(scaledLightRect.w) + 1;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingScissor)
-    {
-        SetupScissors(true, scaledX, scaledY, scaledWidth, scaledHeight);
-    }
-
-    if (bStencilMask)
-    {
-        PROFILE_LABEL_SCOPE("STENCIL_VOLUME");
-
-#if !defined(CRY_USE_METAL) && !defined(ANDROID)
-        SpecularAccEnableMRT(false);
-#endif
-
-        rd->SetDepthBoundTest(0.0f, 1.0f, false); // stencil pre-passes are rop bound, using depth bounds increases even more rop cost
-        rd->FX_StencilFrustumCull(castShadowMaps ? -4 : -1, pDL, NULL, 0);
-    }
-    else
-    if (rd->m_bDeviceSupports_NVDBT && CRenderer::CV_r_DeferredShadingDepthBoundsTest == 1)
-    {
-        rd->SetDepthBoundTest(pDepthBounds.x, pDepthBounds.z, true);
-    }
-
-    // todo: try out on consoles if DBT helps on light pass (on light stencil prepass is actually slower)
-    if (rd->m_bDeviceSupports_NVDBT && bStencilMask && CRenderer::CV_r_DeferredShadingDepthBoundsTest && CRenderer::CV_r_deferredshadingDBTstencil)
-    {
-        rd->SetDepthBoundTest(pDepthBounds.x, pDepthBounds.z, true);
-    }
-
-#if !defined(CRY_USE_METAL) && !defined(ANDROID)
-    if (bStencilMask)
-    {
-        SpecularAccEnableMRT(true);
-    }
-#endif
-
-    uint nNumClipVolumes = m_nClipVolumesCount[m_nThreadID][m_nRecurseLevel];
-    if (nNumClipVolumes > 0)
-    {
-        rRP.m_FlagsShader_RT |= RT_CLIPVOLUME_ID;
-    }
-    
-    // Directional occlusion
-    if (CRenderer::CV_r_ssdo)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_APPLY_SSDO];
-    }
-
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-    }
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-    
-    uint64 currentSample2MaskBit = rRP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_SAMPLE2];
-    if (isGmemEnabled)
-    {
-        // Signal the shader if we support independent blending
-        if (RenderCapabilities::SupportsIndependentBlending())
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-        }
-        else
-        {
-            rRP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE2];
-        }
-    }
-
-    if (bUseLightVolumes)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pLightVolumeTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-    else
-    {
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-
-    int nStates = m_nRenderState;
-    nStates &= ~(GS_BLEND_MASK);
-
-    nStates &= ~(GS_NODEPTHTEST | GS_DEPTHFUNC_MASK);           // Ensure zcull used.
-    nStates |= GS_DEPTHFUNC_LEQUAL;
-
-    // For PLS we do programmable blending in the fragment shader since we need to write to the PLS struct
-    if (!(isGmemEnabled && RenderCapabilities::SupportsPLSExtension()))
-    {
-        if (!(pDL->m_Flags & DLF_AMBIENT))
-        {
-            nStates |= (GS_BLSRC_ONE | GS_BLDST_ONE);
-        }
-        else
-        {
-            nStates |= (GS_BLSRC_DSTCOL | GS_BLDST_ZERO);
-        }
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDebug == 2)
-        {
-            nStates &= ~GS_BLEND_MASK;
-            nStates |= (GS_BLSRC_ONE | GS_BLDST_ONE);
-        }
-    }
-
-    rd->FX_SetState(nStates);
-
-    SStateBlend currentBlendState = gcpRendD3D->m_StatesBL[gcpRendD3D->m_nCurStateBL];
-    if (CD3D9Renderer::eGT_256bpp_PATH == gmemPath && RenderCapabilities::SupportsIndependentBlending())
-    {
-        // For GMEM 256 we have 6 RTs so we need to disable blending and writing for all the non lighting RTs
-        SStateBlend newBlendState = currentBlendState;
-        newBlendState.Desc.IndependentBlendEnable = TRUE;
-        for (int i = 0; i < AZ_ARRAY_SIZE(newBlendState.Desc.RenderTarget); ++i)
-        {
-            newBlendState.Desc.RenderTarget[i].BlendEnable = FALSE;
-            newBlendState.Desc.RenderTarget[i].RenderTargetWriteMask = 0;
-        }
-
-        // Enable blending for specular and diffuse light buffers
-        // Copy all state info from slot 0 since the engine only update that slot when calling FX_State.
-        newBlendState.Desc.RenderTarget[CD3D9Renderer::s_gmemRendertargetSlots[gmemPath][CD3D9Renderer::eGT_SpecularLight]] = currentBlendState.Desc.RenderTarget[0];
-        newBlendState.Desc.RenderTarget[CD3D9Renderer::s_gmemRendertargetSlots[gmemPath][CD3D9Renderer::eGT_DiffuseLight]] = currentBlendState.Desc.RenderTarget[0];
-        gcpRendD3D->SetBlendState(&newBlendState);
-    }
-
-    if (bStencilMask)
-    {
-        rd->FX_StencilTestCurRef(true, false);
-    }
-
-
-    if ((pDL->m_Flags & DLF_PROJECT))
-    {
-        Matrix44A ProjMatrixT;
-
-        if (bProj2D)
-        {
-            CShadowUtils::GetProjectiveTexGen(pDL, 0, &ProjMatrixT);
-        }
-        else
-        {
-            ProjMatrixT = pDL->m_ProjMatrix;
-        }
-
-        // translate into camera space
-        ProjMatrixT.Transpose();
-        const Vec4 vEye(gRenDev->GetViewParameters().vOrigin, 0.f);
-        Vec4 vecTranslation(vEye.Dot((Vec4&)ProjMatrixT.m00), vEye.Dot((Vec4&)ProjMatrixT.m10), vEye.Dot((Vec4&)ProjMatrixT.m20), vEye.Dot((Vec4&)ProjMatrixT.m30));
-        ProjMatrixT.m03 += vecTranslation.x;
-        ProjMatrixT.m13 += vecTranslation.y;
-        ProjMatrixT.m23 += vecTranslation.z;
-        ProjMatrixT.m33 += vecTranslation.w;
-        m_pShader->FXSetPSFloat(m_pParamLightProjMatrix, (Vec4*) ProjMatrixT.GetData(), 4);
-    }
-
-    {
-        Vec2 vLightSize = Vec2(pDL->m_fAreaWidth * 0.5f, pDL->m_fAreaHeight * 0.5f);
-
-        float fAreaFov = pDL->m_fLightFrustumAngle * 2.0f;
-        if (castShadowMaps && bAreaLight)
-        {
-            fAreaFov = min(fAreaFov, 135.0f);     // Shadow can only cover ~135 degree FOV without looking bad, so we clamp the FOV to hide shadow clipping.
-        }
-        const float fCosAngle = cosf(fAreaFov * (gf_PI / 360.0f));     // pre-compute on CPU.
-
-        static CCryNameR arealightMatrixName("g_AreaLightMatrix");
-        Matrix44 mAreaLightMatrix;
-        mAreaLightMatrix.SetRow4(0, Vec4(pDL->m_ObjMatrix.GetColumn0().GetNormalized(), 1.0f));
-        mAreaLightMatrix.SetRow4(1, Vec4(pDL->m_ObjMatrix.GetColumn1().GetNormalized(), 1.0f));
-        mAreaLightMatrix.SetRow4(2, Vec4(pDL->m_ObjMatrix.GetColumn2().GetNormalized(), 1.0f));
-        mAreaLightMatrix.SetRow4(3, Vec4(vLightSize.x, vLightSize.y, 0, fCosAngle));
-        m_pShader->FXSetPSFloat(arealightMatrixName, alias_cast<Vec4*>(&mAreaLightMatrix), 4);
-    }
-
-    m_pShader->FXSetPSFloat(m_pParamLightPos, &pLightPosCS, 1);
-    m_pShader->FXSetPSFloat(m_pParamLightDiffuse, &pLightDiffuse, 1);
-
-
-    uint32 stencilID = (pDL->m_nStencilRef[1] + 1) << 16 | pDL->m_nStencilRef[0] + 1;
-    Vec4 vAttenParams(fAttenuationBulbSize, *alias_cast<float*>(&stencilID), 0, 0);
-    m_pShader->FXSetPSFloat(m_pAttenParams, &vAttenParams, 1);
-
-    // Directional occlusion
-    const int ssdoTexSlot = 8;
-    SetSSDOParameters(ssdoTexSlot);
-    
-    if (castShadowMaps)
-    {
-        static ICVar* pVar = iConsole->GetCVar("e_ShadowsPoolSize");
-        int nShadowAtlasRes = pVar->GetIVal();
-
-        const ShadowMapFrustum& firstFrustum = CShadowUtils::GetFirstFrustum(m_nCurLighID);
-        //LRad
-        float kernelSize = firstFrustum.bOmniDirectionalShadow ? 2.5f : 1.5f;
-        const Vec4 vShadowParams(kernelSize * (float(firstFrustum.nTexSize) / nShadowAtlasRes), 0.0f, 0.0f, firstFrustum.fDepthConstBias);
-        m_pShader->FXSetPSFloat(m_pGeneralParams, &vShadowParams, 1);
-
-        // set up shadow matrix
-        static CCryNameR paramName("g_mLightShadowProj");
-        Matrix44A shadowMat = gRenDev->m_TempMatrices[0][0];
-        const Vec4 vEye(gRenDev->GetViewParameters().vOrigin, 0.f);
-        Vec4 vecTranslation(vEye.Dot((Vec4&)shadowMat.m00), vEye.Dot((Vec4&)shadowMat.m10), vEye.Dot((Vec4&)shadowMat.m20), vEye.Dot((Vec4&)shadowMat.m30));
-        shadowMat.m03 += vecTranslation.x;
-        shadowMat.m13 += vecTranslation.y;
-        shadowMat.m23 += vecTranslation.z;
-        shadowMat.m33 += vecTranslation.w;
-
-        // pre-multiply by 1/frustrum_far_plane
-        (Vec4&)shadowMat.m20 *= gRenDev->m_cEF.m_TempVecs[2].x;
-
-        //camera matrix
-        m_pShader->FXSetPSFloat(paramName, alias_cast<Vec4*>(&shadowMat), 4);
-    }
-
-    CTexture* pTexLightImage = (CTexture*)pLightTex;
-
-    if (CD3D9Renderer::eGT_256bpp_PATH != gmemPath)
-    {
-        // Note: Shadows use slot 3 and slot 7 for shadow map and jitter map
-#if defined(ANDROID)
-        m_pDepthRT->Apply(0, m_nTexStatePoint, EFTT_UNKNOWN, -2, SResourceView::DefaultView);
-#else
-        m_pDepthRT->Apply(0, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-#endif
-        m_pNormalsRT->Apply(1, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-        m_pDiffuseRT->Apply(2, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-        m_pSpecularRT->Apply(4, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-    }
-
-    if (!isGmemEnabled)
-    {
-        m_pMSAAMaskRT->Apply(9, m_nTexStatePoint);
-
-        if (nNumClipVolumes > 0)
-        {
-            m_pResolvedStencilRT->Apply(11, m_nTexStatePoint);
-            m_pShader->FXSetPSFloat(m_pClipVolumeParams, m_vClipVolumeParams, min((uint32)MAX_DEFERRED_CLIP_VOLUMES, nNumClipVolumes + VIS_AREAS_OUTDOOR_STENCIL_OFFSET));
-        }
-    }
-
-    if ((pDL->m_Flags & DLF_PROJECT) && pTexLightImage)
-    {
-        SD3DPostEffectsUtils::SetTexture(pTexLightImage, 5, FILTER_TRILINEAR, bProj2D ? 1 : 0);
-    }
-
-    if (isGmemEnabled && nNumClipVolumes > 0)
-    {
-        m_pShader->FXSetPSFloat(m_pClipVolumeParams, m_vClipVolumeParams, min((uint32)MAX_DEFERRED_CLIP_VOLUMES, nNumClipVolumes + VIS_AREAS_OUTDOOR_STENCIL_OFFSET));
-
-        // Global blend weight
-        static CCryNameR clipVolGlobalBendWeight("g_fGlobalClipVolumeBlendWeight");
-        Vec4 blendWeight(CRenderer::CV_r_GMEMVisAreasBlendWeight, 0, 0, 0);
-        m_pShader->FXSetPSFloat(clipVolGlobalBendWeight, &blendWeight, 1);
-    }
-
-    if (bUseLightVolumes)
-    {
-        gcpRendD3D->D3DSetCull(eCULL_Back);
-
-        const Vec3 scale(pDL->m_fRadius * 1.08f);
-        Matrix34 mUnitVolumeToWorld = bAreaLight ? CShadowUtils::GetAreaLightMatrix(pDL, scale) : Matrix34::CreateScale(scale, pDL->m_Origin);
-
-        DrawLightVolume(bAreaLight ? SHAPE_BOX : SHAPE_SPHERE, mUnitVolumeToWorld.GetTransposed());
-    }
-    else
-    {
-        gcpRendD3D->D3DSetCull(eCULL_Back, true);     //fs quads should not revert test..
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight(), pDepthBounds.x);
-    }
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    rd->SetDepthBoundTest(0.0f, 1.0f, false);
-
-    if (bStencilMask)
-    {
-        rd->FX_StencilTestCurRef(false);
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingScissor)
-    {
-        rd->EF_Scissor(false, 0, 0, 0, 0);
-    }
-
-    // Restore blend state
-    if (CD3D9Renderer::eGT_256bpp_PATH == gmemPath)
-    {
-        gcpRendD3D->SetBlendState(&currentBlendState);
-        rRP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE2];
-        rRP.m_FlagsShader_RT |= currentSample2MaskBit;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-void CDeferredShading::RenderClipVolumesToStencil(int nClipAreaReservedStencilBit)
-{
-    std::vector<SClipVolumeData>& pClipVolumes = m_pClipVolumes[m_nThreadID][m_nRecurseLevel];
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    const bool bRenderVisAreas = CRenderer::CV_r_VisAreaClipLightsPerPixel > 0;
-
-    for (int nCurrVolume = pClipVolumes.size() - 1; nCurrVolume >= 0; --nCurrVolume)
-    {
-        const SClipVolumeData& pVolumeData = pClipVolumes[nCurrVolume];
-        if (pVolumeData.m_pRenderMesh && pVolumeData.nStencilRef < MAX_DEFERRED_CLIP_VOLUMES)
-        {
-            if ((pVolumeData.nFlags & IClipVolume::eClipVolumeIsVisArea) != 0 && !bRenderVisAreas)
-            {
-                continue;
-            }
-
-            assert(((pVolumeData.nStencilRef + 1) & (BIT_STENCIL_RESERVED | nClipAreaReservedStencilBit)) == 0);
-            const int nStencilRef = ~(pVolumeData.nStencilRef + 1) & ~(BIT_STENCIL_RESERVED | nClipAreaReservedStencilBit);
-
-            rd->FX_StencilCullNonConvex(nStencilRef, pVolumeData.m_pRenderMesh.get(), pVolumeData.mWorldTM);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-void CDeferredShading::RenderPortalBlendValues(int nClipAreaReservedStencilBit)
-{
-    std::vector<SClipVolumeData>& pClipVolumes = m_pClipVolumes[m_nThreadID][m_nRecurseLevel];
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    uint nPrevState =  rd->m_RP.m_CurState;
-    ECull ePrevCullMode = rd->m_RP.m_eCull;
-
-    uint nNewState = nPrevState;
-    nNewState &= ~(GS_COLMASK_NONE | GS_DEPTHWRITE);
-    nNewState |= GS_NODEPTHTEST | GS_NOCOLMASK_R | GS_NOCOLMASK_B | GS_NOCOLMASK_A;
-    rd->FX_SetState(nNewState);
-
-    static CCryNameTSCRC TechName0 = "PortalBlendVal";
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, TechName0, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    SD3DPostEffectsUtils::SetTexture(m_pDepthRT, 3, FILTER_POINT);
-
-    for (int nCurrVolume = pClipVolumes.size() - 1; nCurrVolume >= 0; --nCurrVolume)
-    {
-        const SClipVolumeData& pClipVolumeData = pClipVolumes[nCurrVolume];
-        if (pClipVolumeData.nStencilRef < MAX_DEFERRED_CLIP_VOLUMES && pClipVolumeData.nFlags & IClipVolume::eClipVolumeBlend)
-        {
-            const bool bRenderMesh = pClipVolumeData.m_pRenderMesh && CRenderer::CV_r_VisAreaClipLightsPerPixel > 0;
-
-            static CCryNameR blendPlane0Param("BlendPlane0");
-            Vec4 plane0ClipSpace = rd->m_ViewProjInverseMatrix * pClipVolumeData.m_BlendData.blendPlanes[0];
-            m_pShader->FXSetPSFloat(blendPlane0Param, &plane0ClipSpace, 1);
-
-            static CCryNameR blendPlane1Param("BlendPlane1");
-            Vec4 plane1ClipSpace = rd->m_ViewProjInverseMatrix * pClipVolumeData.m_BlendData.blendPlanes[1];
-            m_pShader->FXSetPSFloat(blendPlane1Param, &plane1ClipSpace, 1);
-
-            static CCryNameR screenScaleParam("g_ScreenScale");
-            Vec4 screenScale = Vec4(1.0f / m_pLBufferDiffuseRT->GetWidth(), 1.0f / m_pLBufferDiffuseRT->GetHeight(), 0, 0);
-            m_pShader->FXSetPSFloat(screenScaleParam, &screenScale, 1);
-
-            rd->m_nStencilMaskRef = nClipAreaReservedStencilBit + pClipVolumeData.nStencilRef + 1;
-            rd->FX_StencilTestCurRef(true);
-
-            static CCryNameR paramNameVolumeToWorld("g_mUnitLightVolumeToWorld");
-            Matrix44 matIdentity(IDENTITY);
-            m_pShader->FXSetVSFloat(paramNameVolumeToWorld, (Vec4*) matIdentity.GetData(), 4);
-
-            static CCryNameR paramNameSphereAdjust("g_vLightVolumeSphereAdjust");
-            Vec4 vZero(ZERO);
-            m_pShader->FXSetVSFloat(paramNameSphereAdjust, &vZero, 1);
-
-            if (bRenderMesh)
-            {
-                CRenderMesh* pRenderMesh = static_cast<CRenderMesh*>(pClipVolumeData.m_pRenderMesh.get());
-                pRenderMesh->CheckUpdate(0);
-
-                const buffer_handle_t hVertexStream = pRenderMesh->GetVBStream(VSF_GENERAL);
-                const buffer_handle_t hIndexStream = pRenderMesh->GetIBStream();
-
-                if (hVertexStream != ~0u && hIndexStream != ~0u)
-                {
-                    size_t nOffsI = 0;
-                    size_t nOffsV = 0;
-
-                    D3DBuffer* pVB = gRenDev->m_DevBufMan.GetD3D(hVertexStream, &nOffsV);
-                    D3DBuffer* pIB = gRenDev->m_DevBufMan.GetD3D(hIndexStream, &nOffsI);
-
-                    rd->FX_SetVStream(0, pVB, nOffsV, pRenderMesh->GetStreamStride(VSF_GENERAL));
-                    rd->FX_SetIStream(pIB, nOffsI, (sizeof(vtx_idx) == 2 ? Index16 : Index32));
-
-                    if (!FAILED(rd->FX_SetVertexDeclaration(0, pRenderMesh->_GetVertexFormat())))
-                    {
-                        static CCryNameR viewProjParam("g_mViewProj");
-                        m_pShader->FXSetVSFloat(viewProjParam, (Vec4*) rd->m_ViewProjMatrix.GetData(), 4);
-
-                        rd->D3DSetCull(eCULL_Front);
-                        rd->FX_Commit();
-                        rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, pRenderMesh->GetNumVerts(), 0, pRenderMesh->GetNumInds());
-                    }
-                }
-            }
-            else
-            {
-                Matrix44 matQuadToClip(IDENTITY);
-                matQuadToClip.m00 =  2;
-                matQuadToClip.m30 = -1;
-                matQuadToClip.m11 = -2;
-                matQuadToClip.m31 =  1;
-
-                static CCryNameR viewProjParam("g_mViewProj");
-                m_pShader->FXSetVSFloat(viewProjParam, (Vec4*) matQuadToClip.GetData(), 4);
-
-                rd->D3DSetCull(eCULL_Back);
-                rd->FX_Commit();
-                SD3DPostEffectsUtils::DrawFullScreenTri(m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight());
-            }
-        }
-    }
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    rd->D3DSetCull(ePrevCullMode);
-    rd->FX_SetState(nPrevState);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-void CDeferredShading::PrepareClipVolumeData(bool& bOutdoorVisible)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    const bool bMSAA = false;
-    const bool isGmemEnabled = gcpRendD3D->FX_GetEnabledGmemPath(nullptr) != CD3D9Renderer::eGT_REGULAR_PATH;
-    const CD3D9Renderer::EGmemDepthStencilMode gmemStencilMode = gcpRendD3D->FX_GmemGetDepthStencilMode();
-
-    // Reserved outdoor fragments
-    std::vector<SClipVolumeData>& pClipVolumes = m_pClipVolumes[m_nThreadID][m_nRecurseLevel];
-    for (uint i = 0; i < VIS_AREAS_OUTDOOR_STENCIL_OFFSET; ++i)
-    {
-        uint32 nFlags = IClipVolume::eClipVolumeConnectedToOutdoor | IClipVolume::eClipVolumeAffectedBySun;
-        m_vClipVolumeParams[i] = Vec4(0, 0, 0, *alias_cast<float*>(&nFlags));
-    }
-
-    for (uint i = 0; i < pClipVolumes.size(); ++i)
-    {
-        const SClipVolumeData& pClipVolumeData = pClipVolumes[i];
-        if (pClipVolumeData.nStencilRef + 1 < MAX_DEFERRED_CLIP_VOLUMES)
-        {
-            uint32 nData = (pClipVolumeData.m_BlendData.nBlendIDs[1] + 1) << 24 | (pClipVolumeData.m_BlendData.nBlendIDs[0] + 1) << 16 | pClipVolumeData.nFlags;
-            m_vClipVolumeParams[pClipVolumeData.nStencilRef + 1] = Vec4(0, 0, 0, *alias_cast<float*>(&nData));
-
-            bOutdoorVisible |= pClipVolumeData.nFlags & IClipVolume::eClipVolumeConnectedToOutdoor ? true : false;
-        }
-    }
-
-
-    if (CRenderer::CV_r_VolumetricFog != 0)
-    {
-        if (isGmemEnabled)
-        {
-            CRY_ASSERT(0); // TODO: implement volumetric fog to work with GMEM
-        }
-        rd->GetVolumetricFog().ClearVolumeStencil();
-    }
-
-    const int nClipVolumeReservedStencilBit = BIT_STENCIL_INSIDE_CLIPVOLUME;
-
-    // Render Clip areas to stencil
-    if (!pClipVolumes.empty())
-    {
-        rd->FX_ResetPipe();
-
-        const uint32 nPersFlags2 = rd->m_RP.m_PersFlags2;
-        rd->m_RP.m_PersFlags2 |= RBPF2_WRITEMASK_RESERVED_STENCIL_BIT;
-
-        //ClipVolumes
-        {
-            PROFILE_LABEL_SCOPE("CLIPVOLUMES TO STENCIL");
-            if (!isGmemEnabled)
-            {
-                if (!RenderCapabilities::SupportsStencilTextures())
-                {
-                    // Because there's no support for stencil textures we can't resolve the stencil to a texture.
-                    // So we draw the ClipVolumes directly to the texture in the "resolve" during the PS.
-                    rd->FX_PushRenderTarget(0, m_pResolvedStencilRT, &rd->m_DepthBufferOrigMSAA);
-                    const ColorF clearColor((1.0f / 255.0f), 0.0f, 0.0f, 0.0f);
-                    rd->EF_ClearTargetsImmediately(FRT_CLEAR_COLOR, clearColor);
-                }
-                else
-                {
-                    rd->FX_PushRenderTarget(0, (CTexture*)NULL, &rd->m_DepthBufferOrigMSAA);
-                }
-
-                rd->RT_SetViewport(0, 0, m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight());
-            }
-            RenderClipVolumesToStencil(nClipVolumeReservedStencilBit);
-            if (!isGmemEnabled)
-            {
-                rd->FX_PopRenderTarget(0);
-            }
-        }
-
-        // Portals blending and volumetric fog are not supported in GMEM path.
-        // Use "r_GMEMVisAreasBlendWeight" for global blending between portals.
-        if (!isGmemEnabled)
-        {
-            // Portal blend factors
-            static ICVar* pPortalsBlendCVar =  iConsole->GetCVar("e_PortalsBlend");
-            if (pPortalsBlendCVar->GetIVal() > 0)
-            {
-                rd->FX_PushRenderTarget(0, m_pResolvedStencilRT, &rd->m_DepthBufferOrigMSAA);
-                rd->RT_SetViewport(0, 0, m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight());
-                RenderPortalBlendValues(nClipVolumeReservedStencilBit);
-                rd->FX_PopRenderTarget(0);
-            }
-
-            if (CRenderer::CV_r_VolumetricFog != 0)
-            {
-                rd->GetVolumetricFog().RenderClipVolumeToVolumeStencil(nClipVolumeReservedStencilBit);
-            }
-        }
-
-        rd->m_RP.m_PersFlags2 = nPersFlags2;
-    }
-
-    rd->m_nStencilMaskRef = nClipVolumeReservedStencilBit + m_nClipVolumesCount[m_nThreadID][m_nRecurseLevel] + 1;
-
-    if (isGmemEnabled)
-    {
-        switch (gmemStencilMode)
-        {
-        case CD3D9Renderer::eGDSM_RenderTarget:
-        {
-            if (!RenderCapabilities::SupportsPLSExtension())
-            {
-                PROFILE_LABEL_SCOPE("RESOLVE STENCIL");
-                static CCryNameTSCRC pszResolveStencil("ResolveStencil");
-                PostProcessUtils().ShBeginPass(CShaderMan::s_shDeferredShading, pszResolveStencil, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_NOCOLMASK_R | GS_NOCOLMASK_B | GS_NOCOLMASK_A);
-                GetUtils().DrawQuadFS(CShaderMan::s_shDeferredShading, false, CTexture::s_ptexGmemStenLinDepth->GetWidth(), CTexture::s_ptexGmemStenLinDepth->GetHeight());
-                GetUtils().ShEndPass();
-            }
-            return;
-        }
-        case CD3D9Renderer::eGDSM_DepthStencilBuffer:
-            // We resolve the stencil during the depth linearization 
-            return;
-        default:
-            // Stencil is resolved using the non gmem path.
-            break;
-        }
-    }
-
-    // Need to resolve stencil because light volumes and shadow mask overwrite stencil
-    // If there's no support for stencil textures, then we already clipped the stencil volumes straight
-    // to the resolved target during the 'CLIPVOLUMES TO STENCIL' pass.
-    if (RenderCapabilities::SupportsStencilTextures())
-    {
-        PROFILE_LABEL_SCOPE("RESOLVE STENCIL");
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-        bool renderTargetWasPopped = SpecularAccEnableMRT(false);
-#endif
-        rd->FX_PushRenderTarget(0, m_pResolvedStencilRT, NULL, -1, false, 1);
-
-        const bool isGmemResolve = isGmemEnabled && gmemStencilMode == CD3D9Renderer::eGDSM_Texture;
-        // Metal Load/Store Actions
-        rd->FX_SetColorDontCareActions(0, isGmemResolve ? false : true, false); // For GMEM we need to preserve the Red channel because it contains the linearized depth.
-        rd->FX_SetDepthDontCareActions(0, true, true);
-        rd->FX_SetStencilDontCareActions(0, true, true);
-        rd->FX_SetColorDontCareActions(1, true, false);
-        rd->FX_SetDepthDontCareActions(1, true, true);
-        rd->FX_SetStencilDontCareActions(1, true, true);
-
-        // color mask
-        static CCryNameTSCRC pszResolveStencil("ResolveStencil");
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shDeferredShading, pszResolveStencil, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        int states = GS_NODEPTHTEST | GS_NOCOLMASK_B | GS_NOCOLMASK_A;
-
-        // For Gmem we write into the green channel.
-        states |= isGmemResolve ? GS_NOCOLMASK_R : GS_NOCOLMASK_G;
-        rd->FX_SetState(states);
-
-        CTexture::SetSamplerState(4, m_nTexStatePoint, eHWSC_Pixel);
-        rd->m_DevMan.BindSRV(eHWSC_Pixel, gcpRendD3D->m_pZBufferStencilReadOnlySRV, 4);
-
-        GetUtils().DrawQuadFS(CShaderMan::s_shDeferredShading, false, m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight());
-        GetUtils().ShEndPass();
-        rd->FX_PopRenderTarget(0);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-        // Do not try to re-push a render target if one was not popped above.
-        if (renderTargetWasPopped)
-        {
-            SpecularAccEnableMRT(true);
-        }
-#endif
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CDeferredShading::AmbientPass(SRenderLight* pGlobalCubemap, bool& bOutdoorVisible)
-{
-    PROFILE_SHADER_SCOPE;
-    PROFILE_FRAME(CDeferredShading_AmbientPass);
-    PROFILE_LABEL_SCOPE("AMBIENT_PASS");
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-    rd->m_RP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-    rd->D3DSetCull(eCULL_Back, true); //fs quads should not revert test..
-
-    const bool bMSAA = gcpRendD3D->m_RP.m_MSAAData.Type ? true : false;
-
-    const uint64 nFlagsShaderRT = rRP.m_FlagsShader_RT;
-    rRP.m_FlagsShader_RT &= ~(RT_LIGHTSMASK);
-
-    SpecularAccEnableMRT(false);
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, DBT_SKY_CULL_DEPTH, false); // Disable depth bounds for ambient lookup.
-    }
-    const uint32 nNumClipVolumes = m_nClipVolumesCount[m_nThreadID][m_nRecurseLevel];
-    if (nNumClipVolumes)
-    {
-        rRP.m_FlagsShader_RT |= RT_CLIPVOLUME_ID;
-    }
-    else
-    {
-        bOutdoorVisible = true;
-    }
-
-    // Store global cubemap color
-    Vec4 pLightDiffuse;
-    if (pGlobalCubemap)
-    {
-        pLightDiffuse = Vec4(Vec3(pGlobalCubemap->m_Color.r, pGlobalCubemap->m_Color.g, pGlobalCubemap->m_Color.b), pGlobalCubemap->m_SpecMult);
-
-        const float fLuminance = pGlobalCubemap->m_Color.Luminance();
-        if (fLuminance > 0.001f)    // too dull => skip
-        {
-            rRP.m_FlagsShader_RT |= RT_GLOBAL_CUBEMAP;
-            // ignore specular if it's too dull
-            if (fLuminance * pLightDiffuse.w >= 0.005f)
-            {
-                rRP.m_FlagsShader_RT |= RT_SPECULAR_CUBEMAP;
-            }
-
-            rRP.m_FlagsShader_RT |= (pGlobalCubemap->m_Flags & DLF_IGNORES_VISAREAS) ? RT_GLOBAL_CUBEMAP_IGNORE_VISAREAS : 0;
-        }
-        else
-        {
-            pGlobalCubemap = NULL;
-        }
-    }
-
-    // Patch z-target for all platforms, we need stencil access.
-    CTexture* pDepthBufferRT = m_pDepthRT;
-    ID3D11DepthStencilView* pZBufferOrigDSV = (ID3D11DepthStencilView*) rd->m_DepthBufferOrigMSAA.pSurf;    // Override depthstencil shader/depthstencil views
-    rd->m_DepthBufferOrigMSAA.pSurf = rd->m_pZBufferReadOnlyDSV;
-    ID3D11ShaderResourceView* pZTargetOrigSRV = (ID3D11ShaderResourceView*) pDepthBufferRT->GetShaderResourceView(bMSAA ? SResourceView::DefaultViewMS : SResourceView::DefaultView);
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        rd->FX_PushRenderTarget(0, m_pLBufferDiffuseRT, &rd->m_DepthBufferOrigMSAA, -1, false, 1);
-
-        SpecularAccEnableMRT(true);
-
-        // CONFETTI BEGIN: David Srour
-        // Metal Load/Store Actions
-        // Though the ambient pass doesn't explicitly need to use MTLLoadActionLoad for the color buffer,
-        // the following passes after Ambient do use rasterization blending. Only one draw call usually
-        // occurs for Ambient pass and many more for the following passes... hence, just set the load/store actions
-        // only once here.
-        rd->FX_SetDepthDontCareActions(0, false, true);
-        rd->FX_SetDepthDontCareActions(1, false, true);
-
-        // The following can only be set if r_DeferredShadingLightVolumes==0 && r_DeferredShadingStencilPrepass == 0, otherwise stencil might need to be written to during light pass.
-        if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_deferredshadingLightVolumes &&
-            !CRenderer::CV_r_DeferredShadingStencilPrepass)
-        {
-            rd->FX_SetStencilDontCareActions(0, false, true);
-            rd->FX_SetStencilDontCareActions(1, false, true);
-        }
-        // CONFETTI END
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, DBT_SKY_CULL_DEPTH, true); // Enable depth bounds - discard sky
-    }
-    Vec3 vE3DParam;
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_AMBIENT_GROUND_COLOR, vE3DParam);
-
-    const Vec4 cAmbGroundColor = Vec4(vE3DParam, 0);
-
-    Vec4 cAmbHeightParams = Vec4(gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_AMBIENT_MIN_HEIGHT), gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_AMBIENT_MAX_HEIGHT), 0, 0);
-    cAmbHeightParams.z = 1.0 / max(0.0001f, cAmbHeightParams.y);
-    
-    if (pGlobalCubemap && CRenderer::CV_r_ssdo)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_APPLY_SSDO];
-    }
-        
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pAmbientOutdoorTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    rd->FX_SetState(GS_NODEPTHTEST);
-
-    SD3DPostEffectsUtils::ShSetParamPS(m_pParamAmbient, Vec4(0, 0, 0, 0));
-    SD3DPostEffectsUtils::ShSetParamPS(m_pParamAmbientGround, cAmbGroundColor);
-    SD3DPostEffectsUtils::ShSetParamPS(m_pParamAmbientHeight, cAmbHeightParams);
-
-    if (nNumClipVolumes)
-    {
-        m_pShader->FXSetPSFloat(m_pClipVolumeParams, m_vClipVolumeParams, min((uint32)MAX_DEFERRED_CLIP_VOLUMES, nNumClipVolumes + VIS_AREAS_OUTDOOR_STENCIL_OFFSET));
-
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            // Global blend weight
-            static CCryNameR clipVolGlobalBendWeight("g_fGlobalClipVolumeBlendWeight");
-            Vec4 blendWeight(CRenderer::CV_r_GMEMVisAreasBlendWeight, 0, 0, 0);
-            m_pShader->FXSetPSFloat(clipVolGlobalBendWeight, &blendWeight, 1);
-        }
-    }
-
-    if (pGlobalCubemap)
-    {
-        CTexture* const texDiffuse = (CTexture*)pGlobalCubemap->GetDiffuseCubemap();
-        CTexture* const texSpecular = (CTexture*)pGlobalCubemap->GetSpecularCubemap();
-        CTexture* const texNoTextureCM = CTextureManager::Instance()->GetNoTextureCM();
-
-        SD3DPostEffectsUtils::SetTexture(texDiffuse->GetTextureType() < eTT_Cube ? texNoTextureCM : texDiffuse, 1, FILTER_BILINEAR, 1, texDiffuse->IsSRGB());
-        SD3DPostEffectsUtils::SetTexture(texSpecular->GetTextureType() < eTT_Cube ? texNoTextureCM : texSpecular, 2, FILTER_TRILINEAR, 1, texSpecular->IsSRGB());
-
-        SD3DPostEffectsUtils::ShSetParamPS(m_pParamLightDiffuse, pLightDiffuse);
-        const Vec4 vCubemapParams(IntegerLog2((uint32)texSpecular->GetWidthNonVirtual()) - 2, 0, 0, 0);     // Use 4x4 mip for lowest gloss values
-        m_pShader->FXSetPSFloat(m_pGeneralParams, &vCubemapParams, 1);
-        
-        // Directional occlusion
-        const int ssdoTexSlot = 8;
-        SetSSDOParameters(ssdoTexSlot);
-    }
-
-    if (CD3D9Renderer::eGT_256bpp_PATH != gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        m_pNormalsRT->Apply(0, m_nTexStatePoint, EFTT_UNKNOWN, -1, m_nBindResourceMsaa);
-        m_pSpecularRT->Apply(7, m_nTexStatePoint);
-        m_pDiffuseRT->Apply(11, m_nTexStatePoint);
-    }
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        pDepthBufferRT->SetShaderResourceView(rd->m_pZBufferDepthReadOnlySRV, bMSAA);        // DX11 requires explicitly bind depth then stencil to have access to both depth and stencil read from shader. Formats also must match
-#ifndef ANDROID
-        pDepthBufferRT->Apply(3, m_nTexStatePoint, EFTT_UNKNOWN, -1, m_nBindResourceMsaa);
-        pDepthBufferRT->SetShaderResourceView(rd->m_pZBufferStencilReadOnlySRV, bMSAA);
-        pDepthBufferRT->Apply(4, m_nTexStatePoint, EFTT_UNKNOWN, -1, m_nBindResourceMsaa);
-#endif // !ANDROID
-
-        m_pMSAAMaskRT->Apply(5, m_nTexStatePoint);
-    }
-
-    CTextureManager::Instance()->GetDefaultTexture("EnvironmentBRDF")->Apply(10, m_nTexStateLinear);
-
-    //  this is expected by Mali drivers
-    //  this "workaround" was suggested by the Mali team as we were getting incorrect stencil/depth tests behavior due to driver bug
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && (gRenDev->GetFeatures() & RFT_HW_ARM_MALI))
-    {
-        int nPrevState = rRP.m_CurState;
-        int newState = nPrevState;
-
-        newState &= ~(GS_BLEND_MASK | GS_NODEPTHTEST | GS_DEPTHFUNC_MASK | GS_COLMASK_NONE);
-        newState |= GS_COLMASK_NONE;
-        newState |= GS_DEPTHFUNC_GREAT;
-        newState |= GS_DEPTHWRITE;
-        rd->FX_SetState(newState);
-
-        rd->FX_PushVP();
-        rd->m_NewViewport.nX = 0;
-        rd->m_NewViewport.nY = 0;
-        rd->m_NewViewport.nWidth = 1;
-        rd->m_NewViewport.nHeight = 1;
-        rd->m_NewViewport.fMinZ = 1.0f;
-        rd->m_NewViewport.fMaxZ = 1.0f;
-        rd->m_bViewportDirty = true;
-
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight(), 0, &gcpRendD3D->m_FullResRect);
-
-        rd->FX_PopVP();
-        rd->FX_SetState(nPrevState);
-    }
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight(), 0, &gcpRendD3D->m_FullResRect);
-    SD3DPostEffectsUtils::ShEndPass();
-
-    rd->m_DepthBufferOrigMSAA.pSurf = pZBufferOrigDSV;          // Restore DSV/SRV
-    pDepthBufferRT->SetShaderResourceView(pZTargetOrigSRV, bMSAA);
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        rd->FX_PopRenderTarget(0);
-    }
-
-    CTexture* const     pBlack = CTextureManager::Instance()->GetBlackTexture();
-    if (pBlack)
-    {
-        pBlack->Apply(3, m_nTexStatePoint);
-        pBlack->Apply(4, m_nTexStatePoint);
-    }
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    //  we don't want to swich RT's too often for metal
-    //  We want to keep all light RTs bound regardless of
-    //  specular RT usage.
-    //  This trick re-enables specular RT
-    SpecularAccEnableMRT(false);
-    SpecularAccEnableMRT(true);
-#endif
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        rd->FX_SetActiveRenderTargets();
-    }
-
-    // Follow up with NVidia. Seems driver/pixel quads synchronization? Wrong behavior when reading from native stencil/depth.
-    // Luckily can clear stencil since vis areas/decals tag not needed from here on
-    if (CRenderer::CV_r_DeferredShadingAmbientSClear)
-    {
-        rd->EF_ClearTargetsImmediately(FRT_CLEAR_STENCIL, Clr_Unused.r, 1);
-    }
-
-    rRP.m_FlagsShader_RT = nFlagsShaderRT;
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DeferredCubemaps(const TArray<SRenderLight>& rCubemaps, const uint32 nStartIndex /* = 0 */)
-{
-    if (nStartIndex < rCubemaps.Num() && CRenderer::CV_r_DeferredShadingEnvProbes)
-    {
-        // apply deferred cubemaps first
-        PROFILE_LABEL_SCOPE("DEFERRED_CUBEMAPS");
-
-        for (uint32 nCurrentCubemap = nStartIndex; nCurrentCubemap < rCubemaps.Num(); ++nCurrentCubemap)
-        {
-            const SRenderLight& pDL = rCubemaps[nCurrentCubemap];
-            if (pDL.m_Flags & (DLF_FAKE | DLF_VOLUMETRIC_FOG_ONLY))
-            {
-                continue;
-            }
-            DeferredCubemapPass(&pDL);
-            m_nLightsProcessedCount++;
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DeferredCubemapPass(const SRenderLight* const __restrict pDL)
-{
-    PROFILE_SHADER_SCOPE;
-    PROFILE_FRAME(CDeferredShading_CubemapPass);
-    PROFILE_LABEL(pDL->m_sName);
-
-    float scissorInt2Float[] = { (float)(pDL->m_sX), (float)(pDL->m_sY), (float)(pDL->m_sWidth), (float)(pDL->m_sHeight) };
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-    rRP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-
-    AZ_PUSH_DISABLE_WARNING(, "-Wconstant-logical-operand")
-    bool bStencilMask =  CRenderer::CV_r_DeferredShadingStencilPrepass || CRenderer::CV_r_DebugLightVolumes;
-    AZ_POP_DISABLE_WARNING
-    bool bUseLightVolumes = false;
-    bool bHasSpecular = false;
-
-    const uint64 nOldFlags = rRP.m_FlagsShader_RT;
-
-    rRP.m_FlagsShader_RT &= ~(RT_CLIPVOLUME_ID | RT_LIGHTSMASK | RT_GLOBAL_CUBEMAP | RT_SPECULAR_CUBEMAP | RT_BOX_PROJECTION);
-
-    uint nNumClipVolumes = m_nClipVolumesCount[m_nThreadID][m_nRecurseLevel];
-    rd->m_RP.m_FlagsShader_RT |= (pDL->m_Flags & DLF_BOX_PROJECTED_CM) ? RT_BOX_PROJECTION : 0;
-    rd->m_RP.m_FlagsShader_RT |= nNumClipVolumes > 0 ? RT_CLIPVOLUME_ID : 0;
-
-    // Store light properties (color/radius, position relative to camera, rect, z bounds)
-    Vec4 pLightDiffuse = Vec4(pDL->m_Color.r, pDL->m_Color.g, pDL->m_Color.b, pDL->m_SpecMult);
-
-    const float fInvRadius = (pDL->m_fRadius <= 0) ? 1.0f : 1.0f / pDL->m_fRadius;
-    const Vec4 pLightPosCS = Vec4(pDL->m_Origin - m_pCamPos, fInvRadius);
-    const float fAttenFalloffMax = max(pDL->GetFalloffMax(), 1e-3f);
-
-    const bool bReverseDepth = (rRP.m_TI[rRP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-    Vec4 pDepthBounds = GetLightDepthBounds(pDL, bReverseDepth);
-
-    // avoiding LHS, comment out if we ever use different resolution for light accumulation target
-    Vec4 pLightRect  = Vec4(scissorInt2Float[0], scissorInt2Float[1], scissorInt2Float[2], scissorInt2Float[3]);
-    Vec4 scaledLightRect = Vec4(pLightRect.x * rRP.m_CurDownscaleFactor.x, pLightRect.y * rRP.m_CurDownscaleFactor.y,
-            pLightRect.z * rRP.m_CurDownscaleFactor.x, pLightRect.w * rRP.m_CurDownscaleFactor.y);
-
-    assert(!(pDL->m_Flags & DLF_PROJECT));
-
-    if (CRenderer::CV_r_DeferredShadingLightLodRatio)
-    {
-        float fLightArea = pLightRect.z * pLightRect.w;
-        float fScreenArea = (float) m_nCurTargetWidth * m_nCurTargetHeight;
-        float fLightRatio = fLightArea / fScreenArea;
-
-        const float fMinScreenAreaRatioThreshold = 0.01f;   // 1% of screen by default
-
-        const float fDrawVolumeThres = 0.01f;
-        if ((fLightRatio* CRenderer::CV_r_DeferredShadingLightLodRatio) < fDrawVolumeThres)
-        {
-            //scissor + depthbound test only
-            bStencilMask = false;
-        }
-    }
-
-    uint16 scaledX = (uint16)(scaledLightRect.x);
-    uint16 scaledY = (uint16)(scaledLightRect.y);
-    uint16 scaledWidth = (uint16)(scaledLightRect.z) + 1;
-    uint16 scaledHeight = (uint16)(scaledLightRect.w) + 1;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingScissor)
-    {
-        SetupScissors(true, scaledX, scaledY, scaledWidth, scaledHeight);
-    }
-
-    if (bStencilMask)
-    {
-#if !defined(CRY_USE_METAL) && !defined(ANDROID)
-        SpecularAccEnableMRT(false);
-#endif
-        rd->SetDepthBoundTest(0.0f, 1.0f, false);
-        rd->FX_StencilFrustumCull(-1, pDL, NULL, 0);
-    }
-    else
-    if (rd->m_bDeviceSupports_NVDBT && CRenderer::CV_r_DeferredShadingDepthBoundsTest == 1)
-    {
-        rd->SetDepthBoundTest(pDepthBounds.x, pDepthBounds.z, true);
-    }
-
-    // todo: try out on consoles if DBT helps on light pass (on light stencil prepass is actually slower)
-    if (rd->m_bDeviceSupports_NVDBT && bStencilMask && CRenderer::CV_r_DeferredShadingDepthBoundsTest && CRenderer::CV_r_deferredshadingDBTstencil)
-    {
-        rd->SetDepthBoundTest(pDepthBounds.x, pDepthBounds.z, true);
-    }
-
-    const float fFadeout = pDL->m_fProbeAttenuation;
-    const float fLuminance = pDL->m_Color.Luminance() * fFadeout;
-
-    if (fLuminance * pLightDiffuse.w >= 0.03f)  // if specular intensity is too low, skip it
-    {
-        rRP.m_FlagsShader_RT |= RT_SPECULAR_CUBEMAP;
-        bHasSpecular = true;
-    }
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-    }
-
-#if !defined(CRY_USE_METAL) && !defined(ANDROID)
-    SpecularAccEnableMRT(bHasSpecular);
-#endif
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_deferredshadingLightVolumes)
-    {
-        const Plane* pNearPlane(rd->GetCamera().GetFrustumPlane(FR_PLANE_NEAR));
-        Vec3 n = pNearPlane->n;
-        Vec3 e = pDL->m_ProbeExtents;
-        Vec3 u0 = pDL->m_ObjMatrix.GetColumn0().GetNormalized();
-        Vec3 u1 = pDL->m_ObjMatrix.GetColumn1().GetNormalized();
-        Vec3 u2 = pDL->m_ObjMatrix.GetColumn2().GetNormalized();
-
-        // Check if OBB intersects near plane
-        float r = e.x * fabs(n.dot(u0)) + e.y * fabs(n.dot(u1)) + e.z * fabs(n.dot(u2));
-        float s = pNearPlane->DistFromPlane(pDL->m_Origin);
-        bUseLightVolumes = fabs(s) > r;
-    }
-
-    int MultplyState = m_nRenderState;
-
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr)) // we'll do our own programmable blending in GMEM path
-    {
-        MultplyState &= ~GS_BLEND_MASK;
-    }
-    else
-    {
-        MultplyState &= ~GS_BLEND_MASK;
-        MultplyState |= GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDebug == 2)
-        {
-            // Debug mode
-            MultplyState &= ~GS_BLEND_MASK;
-            MultplyState |= (GS_BLSRC_ONE | GS_BLDST_ONE);
-        }
-    }
-
-    if (bStencilMask)
-    {
-        MultplyState |= GS_STENCIL;
-    }
-
-    MultplyState &= ~(GS_NODEPTHTEST | GS_DEPTHFUNC_MASK);      // Ensure zcull used.
-    MultplyState |= GS_DEPTHFUNC_LEQUAL;
-    
-    // Directional occlusion
-    if (CRenderer::CV_r_ssdo)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_APPLY_SSDO];
-    }
-    
-    // Render..
-    if (bUseLightVolumes)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pCubemapsVolumeTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-    else
-    {
-        rRP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_CUBEMAP0];
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pCubemapsTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    }
-
-    rd->FX_SetState(MultplyState);
-
-    if (bStencilMask)
-    {
-        rd->FX_StencilTestCurRef(true, false);
-    }
-
-    m_pShader->FXSetPSFloat(m_pParamLightPos, &pLightPosCS, 1);
-    m_pShader->FXSetPSFloat(m_pParamLightDiffuse, &pLightDiffuse, 1);
-
-    if (CD3D9Renderer::eGT_256bpp_PATH != gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        m_pDepthRT->Apply(0, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-        m_pNormalsRT->Apply(1, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-        m_pDiffuseRT->Apply(2, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-        m_pSpecularRT->Apply(3, m_nTexStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-    }
-
-    static CCryNameR pszProbeOBBParams("g_mProbeOBBParams");
-    Vec4 vProbeOBBParams[3];
-    vProbeOBBParams[0] = Vec4(pDL->m_ObjMatrix.GetColumn0().GetNormalized(), 1 / pDL->m_ProbeExtents.x);
-    vProbeOBBParams[1] = Vec4(pDL->m_ObjMatrix.GetColumn1().GetNormalized(), 1 / pDL->m_ProbeExtents.y);
-    vProbeOBBParams[2] = Vec4(pDL->m_ObjMatrix.GetColumn2().GetNormalized(), 1 / pDL->m_ProbeExtents.z);
-    m_pShader->FXSetPSFloat(pszProbeOBBParams, vProbeOBBParams, 3);
-
-    if (pDL->m_Flags & DLF_BOX_PROJECTED_CM)
-    {
-        static CCryNameR pszBoxProjectionMin("g_vBoxProjectionMin");
-        static CCryNameR pszBoxProjectionMax("g_vBoxProjectionMax");
-        Vec4 vBoxProjectionMin(-pDL->m_fBoxLength * 0.5f, -pDL->m_fBoxWidth * 0.5f, -pDL->m_fBoxHeight * 0.5f, 0);
-        Vec4 vBoxProjectionMax(pDL->m_fBoxLength * 0.5f,  pDL->m_fBoxWidth * 0.5f,  pDL->m_fBoxHeight * 0.5f, 0);
-
-        m_pShader->FXSetPSFloat(pszBoxProjectionMin, &vBoxProjectionMin, 1);
-        m_pShader->FXSetPSFloat(pszBoxProjectionMax, &vBoxProjectionMax, 1);
-    }
-
-    CTexture* texDiffuse  = (CTexture*)pDL->GetDiffuseCubemap();
-    CTexture* texSpecular = (CTexture*)pDL->GetSpecularCubemap();
-
-    // Use 4x4 mip for lowest gloss values
-    Vec4 vCubemapParams(IntegerLog2((uint32)texSpecular->GetWidthNonVirtual()) - 2, 0, 0, 0);
-    m_pShader->FXSetPSFloat(m_pGeneralParams, &vCubemapParams, 1);
-    SD3DPostEffectsUtils::SetTexture(texDiffuse, 5, FILTER_BILINEAR, 1, texDiffuse->IsSRGB());
-    SD3DPostEffectsUtils::SetTexture(texSpecular, 6, FILTER_TRILINEAR, 1, texSpecular->IsSRGB());
-
-    uint32 stencilID = (pDL->m_nStencilRef[1] + 1) << 16 | pDL->m_nStencilRef[0] + 1;
-    const Vec4 vAttenParams(fFadeout, *alias_cast<float*>(&stencilID), 0, fAttenFalloffMax);
-    m_pShader->FXSetPSFloat(m_pAttenParams, &vAttenParams, 1);
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        m_pMSAAMaskRT->Apply(7, m_nTexStatePoint);
-    }
-    
-    // Directional occlusion
-    const int ssdoTexSlot = 8;
-    SetSSDOParameters(ssdoTexSlot);
-    
-    if (nNumClipVolumes > 0)
-    {
-        if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            m_pResolvedStencilRT->Apply(9, m_nTexStatePoint, -1, -1, -1);
-        }
-
-        m_pShader->FXSetPSFloat(m_pClipVolumeParams, m_vClipVolumeParams, min((uint32)MAX_DEFERRED_CLIP_VOLUMES, nNumClipVolumes + VIS_AREAS_OUTDOOR_STENCIL_OFFSET));
-
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            // Global blend weight
-            static CCryNameR clipVolGlobalBendWeight("g_fGlobalClipVolumeBlendWeight");
-            Vec4 blendWeight(CRenderer::CV_r_GMEMVisAreasBlendWeight, 0, 0, 0);
-            m_pShader->FXSetPSFloat(clipVolGlobalBendWeight, &blendWeight, 1);
-        }
-    }
-
-    CTextureManager::Instance()->GetDefaultTexture("EnvironmentBRDF")->Apply(10, m_nTexStateLinear);
-
-    //  If the texture is not loaded Metal runtime will assert
-    if (texDiffuse->IsTextureLoaded() && (!bHasSpecular || texSpecular->IsTextureLoaded()))
-    {
-        if (bUseLightVolumes)
-        {
-            gcpRendD3D->D3DSetCull(eCULL_Back);
-
-            Matrix33 rotMat(pDL->m_ObjMatrix.GetColumn0().GetNormalized() * pDL->m_ProbeExtents.x,
-                pDL->m_ObjMatrix.GetColumn1().GetNormalized() * pDL->m_ProbeExtents.y,
-                pDL->m_ObjMatrix.GetColumn2().GetNormalized() * pDL->m_ProbeExtents.z);
-            Matrix34 mUnitVolumeToWorld = Matrix34::CreateTranslationMat(pDL->m_Origin) * rotMat * Matrix34::CreateScale(Vec3(2, 2, 2), Vec3(-1, -1, -1));
-
-            DrawLightVolume(SHAPE_BOX, mUnitVolumeToWorld.GetTransposed());
-        }
-        else
-        {
-            rd->D3DSetCull(eCULL_Back, true);
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight(), pDepthBounds.x);
-        }
-    }
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    if (bStencilMask)
-    {
-        rd->FX_StencilTestCurRef(false);
-    }
-    else if (rd->m_bDeviceSupports_NVDBT && CRenderer::CV_r_DeferredShadingDepthBoundsTest == 1)
-    {
-        rd->SetDepthBoundTest(0.f, 1.f, false);
-    }
-
-    if (rd->m_bDeviceSupports_NVDBT && bStencilMask && CRenderer::CV_r_DeferredShadingDepthBoundsTest && CRenderer::CV_r_deferredshadingDBTstencil)
-    {
-        rd->SetDepthBoundTest(0.f, 1.f, false);
-    }
-
-#if !defined(CRY_USE_METAL) && !defined(ANDROID)
-    SpecularAccEnableMRT(true);
-#endif
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingScissor)
-    {
-        rd->EF_Scissor(false, 0, 0, 0, 0);
-    }
-
-    rRP.m_FlagsShader_RT = nOldFlags;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::ScreenSpaceReflectionPass()
-{
-    if (CRenderer::CV_r_GraphicsPipeline & 1)
-    {
-        gcpRendD3D->GetGraphicsPipeline().RenderScreenSpaceReflections();
-        return;
-    }
-    if (!CRenderer::CV_r_SSReflections || !CTexture::s_ptexHDRTarget)  // Sketch mode disables HDR rendering
-    {
-        return;
-    }
-
-    // SSR only supported on 128bpp GMEM path
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        assert(CD3D9Renderer::eGT_128bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr));
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    const uint32 nPrevPersFlags = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags;
-
-    Matrix44 mViewProj = rd->m_ViewMatrix * rd->m_ProjMatrix;
-
-    if (rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        mViewProj = ReverseDepthHelper::Convert(mViewProj);
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_REVERSE_DEPTH;
-    }
-
-    Matrix44 mViewport(0.5f, 0,    0,    0,
-        0,   -0.5f, 0,    0,
-        0,    0,    1.0f, 0,
-        0.5f, 0.5f, 0,    1.0f);
-    const uint32 numGPUs = rd->GetActiveGPUCount();
-
-    const int frameID = GetUtils().m_iFrameCounter;
-    Matrix44 mViewProjPrev = m_prevViewProj[max((frameID - (int)numGPUs) % MAX_GPU_NUM, 0)] * mViewport;
-
-    PROFILE_LABEL_SCOPE("SS_REFLECTIONS");
-
-    const uint64 shaderFlags = rd->m_RP.m_FlagsShader_RT;
-
-    if(CRenderer::CV_r_SlimGBuffer)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    // Get current viewport
-    int prevVpX, prevVpY, prevVpWidth, prevVpHeight;
-    gRenDev->GetViewport(&prevVpX, &prevVpY, &prevVpWidth, &prevVpHeight);
-
-    {
-        PROFILE_LABEL_SCOPE("SSR_RAYTRACE");
-
-        if (CRenderer::CV_r_SlimGBuffer == 1)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-        }
-
-        CTexture* dstTex = CRenderer::CV_r_SSReflHalfRes ? CTexture::s_ptexHDRTargetScaled[0] : CTexture::s_ptexHDRTarget;
-
-        rd->FX_PushRenderTarget(0, dstTex, NULL);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-        const Vec2& vDownscaleFactor = gcpRendD3D->m_RP.m_CurDownscaleFactor;
-        rd->RT_SetViewport(0, 0, dstTex->GetWidth() * vDownscaleFactor.x + 0.5f, dstTex->GetHeight() * vDownscaleFactor.y + 0.5f);
-#else
-        rd->RT_SetViewport(0, 0, dstTex->GetWidth(), dstTex->GetHeight());
-#endif
-
-
-        rd->FX_SetState(GS_NODEPTHTEST);
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pReflectionTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        m_pDepthRT->Apply(0, m_nTexStatePoint);
-        m_pNormalsRT->Apply(1, m_nTexStateLinear);
-        m_pSpecularRT->Apply(2, m_nTexStateLinear);
-        CTexture::s_ptexZTargetScaled->Apply(3, m_nTexStatePoint);
-        SD3DPostEffectsUtils::SetTexture(CTexture::s_ptexHDRTargetPrev, 4, FILTER_LINEAR, TADDR_BORDER);
-        CTexture::s_ptexHDRMeasuredLuminance[rd->RT_GetCurrGpuID()]->Apply(5, m_nTexStatePoint);    // Current luminance
-
-        static CCryNameR param0("g_mViewProj");
-        m_pShader->FXSetPSFloat(param0, (Vec4*) mViewProj.GetData(), 4);
-
-        static CCryNameR param1("g_mViewProjPrev");
-        m_pShader->FXSetPSFloat(param1, (Vec4*) mViewProjPrev.GetData(), 4);
-
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(dstTex->GetWidth(), dstTex->GetHeight());
-        SD3DPostEffectsUtils::ShEndPass();
-
-        rd->FX_PopRenderTarget(0);
-    }
-
-    if (!CRenderer::CV_r_SSReflHalfRes)
-    {
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-        PostProcessUtils().StretchRect(CTexture::s_ptexHDRTarget, CTexture::s_ptexHDRTargetScaled[0], false, false, false, false, SPostEffectsUtils::eDepthDownsample_None, false, &gcpRendD3D->m_HalfResRect);
-#else
-        PostProcessUtils().StretchRect(CTexture::s_ptexHDRTarget, CTexture::s_ptexHDRTargetScaled[0]);
-#endif
-    }
-
-    // Convolve sharp reflections
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    const Vec2& vDownscaleFactor = gcpRendD3D->m_RP.m_CurDownscaleFactor;
-    gRenDev->RT_SetScissor(true, 0, 0, CTexture::s_ptexHDRTargetScaled[1]->GetWidth() * vDownscaleFactor.x + 0.5f, CTexture::s_ptexHDRTargetScaled[1]->GetHeight() * vDownscaleFactor.y + 0.5f);
-#endif
-    PostProcessUtils().StretchRect(CTexture::s_ptexHDRTargetScaled[0], CTexture::s_ptexHDRTargetScaled[1]);
-    PostProcessUtils().TexBlurGaussian(CTexture::s_ptexHDRTargetScaled[1], 1, 1.0f, 3.0f, false, 0, false, CTexture::s_ptexHDRTargetScaledTempRT[1]);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    gRenDev->RT_SetScissor(true, 0, 0, CTexture::s_ptexHDRTargetScaled[2]->GetWidth() * vDownscaleFactor.x + 0.5f, CTexture::s_ptexHDRTargetScaled[2]->GetHeight() * vDownscaleFactor.y + 0.5f);
-#endif
-    PostProcessUtils().StretchRect(CTexture::s_ptexHDRTargetScaled[1], CTexture::s_ptexHDRTargetScaled[2]);
-    PostProcessUtils().TexBlurGaussian(CTexture::s_ptexHDRTargetScaled[2], 1, 1.0f, 3.0f, false, 0, false, CTexture::s_ptexHDRTargetScaledTempRT[2]);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    gRenDev->RT_SetScissor(true, 0, 0, CTexture::s_ptexHDRTargetScaled[3]->GetWidth() * vDownscaleFactor.x + 0.5f, CTexture::s_ptexHDRTargetScaled[3]->GetHeight() * vDownscaleFactor.y + 0.5f);
-#endif
-    PostProcessUtils().StretchRect(CTexture::s_ptexHDRTargetScaled[2], CTexture::s_ptexHDRTargetScaled[3]);
-    PostProcessUtils().TexBlurGaussian(CTexture::s_ptexHDRTargetScaled[3], 1, 1.0f, 3.0f, false, 0, false, CTexture::s_ptexHDRTargetScaledTempRT[3]);
-
-    {
-        PROFILE_LABEL_SCOPE("SSR_COMPOSE");
-
-        if (CRenderer::CV_r_SlimGBuffer == 1)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-        }
-
-        static CCryNameTSCRC tech("SSReflection_Comp");
-
-        CTexture* dstTex = CTexture::s_ptexHDRTargetScaledTmp[0];
-        dstTex->Unbind();
-
-        rd->FX_SetState(GS_NODEPTHTEST);
-        rd->FX_PushRenderTarget(0, dstTex, NULL);
-        rd->RT_SetViewport(0, 0, dstTex->GetWidth(), dstTex->GetHeight());
-
-        m_pSpecularRT->Apply(0, m_nTexStateLinear);
-        CTexture::s_ptexHDRTargetScaled[0]->Apply(1, m_nTexStateLinear);
-        CTexture::s_ptexHDRTargetScaled[1]->Apply(2, m_nTexStateLinear);
-        CTexture::s_ptexHDRTargetScaled[2]->Apply(3, m_nTexStateLinear);
-        CTexture::s_ptexHDRTargetScaled[3]->Apply(4, m_nTexStateLinear);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-        const Vec2& vDownscaleFactor = gcpRendD3D->m_RP.m_CurDownscaleFactor;
-        gRenDev->RT_SetScissor(true, 0, 0, CTexture::s_ptexHDRTargetScaled[0]->GetWidth() * vDownscaleFactor.x + 0.5f, CTexture::s_ptexHDRTargetScaled[0]->GetHeight() * vDownscaleFactor.y + 0.5f);
-#endif
-
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, tech, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        SD3DPostEffectsUtils::DrawFullScreenTri(dstTex->GetWidth(), dstTex->GetHeight());
-        SD3DPostEffectsUtils::ShEndPass();
-        rd->FX_PopRenderTarget(0);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-        gRenDev->RT_SetScissor(false, 0, 0, 0, 0);
-#endif
-    }
-
-    // Restore the old flags
-    rd->m_RP.m_FlagsShader_RT = shaderFlags;
-    rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags = nPrevPersFlags;
-
-    if (rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        uint32 depthState = ReverseDepthHelper::ConvertDepthFunc(rd->m_RP.m_CurState);
-        rd->FX_SetState(rd->m_RP.m_CurState, rd->m_RP.m_CurAlphaRef, depthState);
-    }
-
-    rd->RT_SetViewport(prevVpX, prevVpY, prevVpWidth, prevVpHeight);
-
-    // Array used for MGPU support
-    m_prevViewProj[frameID % MAX_GPU_NUM] = mViewProj;
-}
-
-void CDeferredShading::ApplySSReflections()
-{
-    if (!CRenderer::CV_r_SSReflections || !CTexture::s_ptexHDRTarget)  // Sketch mode disables HDR rendering
-    {
-        return;
-    }
-
-    // SSR only supported on 128bpp GMEM path
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        assert(CD3D9Renderer::eGT_128bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr));
-    }
-
-    CTexture* pSSRTarget = CTexture::s_ptexHDRTargetScaledTmp[0];
-
-    PROFILE_LABEL_SCOPE("SSR_APPLY");
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    if (CRenderer::CV_r_SlimGBuffer == 1)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        SpecularAccEnableMRT(false);
-        gcpRendD3D->FX_PushRenderTarget(0, m_pLBufferSpecularRT, NULL);
-    }
-
-    static CCryNameTSCRC tech("ApplySSR");
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, tech, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-
-    pSSRTarget->Apply(0, m_nTexStateLinear);
-    m_pDepthRT->Apply(1, m_nTexStatePoint);
-    m_pNormalsRT->Apply(2, m_nTexStatePoint);
-    m_pDiffuseRT->Apply(3, m_nTexStatePoint);
-    m_pSpecularRT->Apply(4, m_nTexStatePoint);
-
-    CTextureManager::Instance()->GetDefaultTexture("EnvironmentBRDF")->Apply(5, m_nTexStateLinear);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(pSSRTarget->GetWidth(), pSSRTarget->GetHeight(), 0, &gcpRendD3D->m_HalfResRect);
-#else
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(pSSRTarget->GetWidth(), pSSRTarget->GetHeight());
-#endif
-    SD3DPostEffectsUtils::ShEndPass();
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-    SpecularAccEnableMRT(true);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::HeightMapOcclusionPass(ShadowMapFrustum*& pHeightMapFrustum, CTexture*& pHeightMapAOScreenDepth, CTexture*& pHeightmapAO)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    const int nThreadID = rd->m_RP.m_nProcessThreadID;
-    pHeightMapFrustum = NULL;
-    pHeightMapAOScreenDepth = pHeightmapAO = NULL;
-
-    if (!CRenderer::CV_r_HeightMapAO || rd->m_RP.m_pSunLight == NULL)
-    {
-        return;
-    }
-
-    // find shadow frustum for height map AO
-    for (int nFrustum = 0; nFrustum < rd->m_RP.m_SMFrustums[nThreadID][0].size(); ++nFrustum)
-    {
-        ShadowMapFrustum* pCurFr = &rd->m_RP.m_SMFrustums[nThreadID][0][nFrustum];
-        if (pCurFr->m_eFrustumType == ShadowMapFrustum::e_HeightMapAO && pCurFr->pDepthTex)
-        {
-            rd->ConfigShadowTexgen(0, pCurFr, -1, false, false);
-            pHeightMapFrustum = pCurFr;
-            break;
-        }
-    }
-
-    if (pHeightMapFrustum)
-    {
-        PROFILE_LABEL_SCOPE("HEIGHTMAP_OCC");
-
-        const int resolutionIndex = clamp_tpl(CRenderer::CV_r_HeightMapAO - 1, 0, 2);
-        CTexture* pDepth[] = {  CTexture::s_ptexZTargetScaled2, CTexture::s_ptexZTargetScaled, m_pDepthRT };
-        CTexture* pDst = CTexture::s_ptexHeightMapAO[0];
-
-        if (!CTexture::s_ptexHeightMapAODepth[0]->IsResolved())
-        {
-            PROFILE_LABEL_SCOPE("GENERATE_MIPS");
-
-            rd->GetDeviceContext().CopySubresourceRegion(
-                CTexture::s_ptexHeightMapAODepth[1]->GetDevTexture()->GetBaseTexture(), 0, 0, 0, 0,
-                CTexture::s_ptexHeightMapAODepth[0]->GetDevTexture()->GetBaseTexture(), 0, NULL
-                );
-
-            CTexture::s_ptexHeightMapAODepth[1]->GenerateMipMaps();
-            CTexture::s_ptexHeightMapAODepth[0]->SetResolved(true);
-        }
-
-        // Generate occlusion
-        {
-            PROFILE_LABEL_SCOPE("GENERATE_OCCL");
-
-            rd->FX_PushRenderTarget(0, pDst, NULL);
-
-            static CCryNameTSCRC tech("HeightMapAOPass");
-            SD3DPostEffectsUtils::ShBeginPass(m_pShader, tech, FEF_DONTSETSTATES);
-            rd->FX_SetState(GS_NODEPTHTEST);
-
-            int TsLinearWithBorder = CTexture::GetTexState(STexState(FILTER_TRILINEAR, TADDR_BORDER, TADDR_BORDER, TADDR_BORDER, 0xFFFFFFFF));
-
-            m_pNormalsRT->Apply(0, m_nTexStatePoint);
-            pDepth[resolutionIndex]->Apply(1, m_nTexStatePoint);
-            CTexture::s_ptexSceneNormalsBent->Apply(10, m_nTexStatePoint);
-            CTexture::s_ptexHeightMapAODepth[1]->Apply(11, TsLinearWithBorder);
-
-            Matrix44A matHMAOTransform = gRenDev->m_TempMatrices[0][0];
-            Matrix44A texToWorld = matHMAOTransform.GetInverted();
-
-            static CCryNameR paramNameHMAO("HMAO_Params");
-            const float texelsPerMeter = CRenderer::CV_r_HeightMapAOResolution / CRenderer::CV_r_HeightMapAORange;
-            const bool enableMinMaxSampling = CRenderer::CV_r_HeightMapAO < 3;
-            Vec4 paramHMAO(CRenderer::CV_r_HeightMapAOAmount, texelsPerMeter / CTexture::s_ptexHeightMapAODepth[1]->GetWidth(), enableMinMaxSampling ? 1.0 : 0.0, 0.0f);
-            m_pShader->FXSetPSFloat(paramNameHMAO, &paramHMAO, 1);
-
-            static CCryNameR paramNameHMAO_TexToWorldT("HMAO_TexToWorldTranslation");
-            Vec4 vTranslation = Vec4(texToWorld.m03, texToWorld.m13, texToWorld.m23, 0);
-            m_pShader->FXSetPSFloat(paramNameHMAO_TexToWorldT, &vTranslation, 1);
-
-            static CCryNameR paramNameHMAO_TexToWorldS("HMAO_TexToWorldScale");
-            Vec4 vScale = Vec4(texToWorld.m00, texToWorld.m11, texToWorld.m22, 1);
-            m_pShader->FXSetPSFloat(paramNameHMAO_TexToWorldS, &vScale, 1);
-
-            static CCryNameR paramHMAO_Transform("HMAO_Transform");
-            m_pShader->FXSetPSFloat(paramHMAO_Transform, (Vec4*)matHMAOTransform.GetData(), 4);
-
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(pDst->GetWidth(), pDst->GetHeight());
-            SD3DPostEffectsUtils::ShEndPass();
-
-            rd->FX_PopRenderTarget(0);
-        }
-
-        // depth aware blur
-        {
-            PROFILE_LABEL_SCOPE("BLUR");
-
-            CShader* pSH = rd->m_cEF.s_ShaderShadowBlur;
-
-            CTexture* tpSrc = pDst;
-            rd->FX_PushRenderTarget(0, CTexture::s_ptexHeightMapAO[1], NULL);
-
-            const Vec4* pClipVolumeParams = NULL;
-            uint32 nClipVolumeCount = 0;
-            CDeferredShading::Instance().GetClipVolumeParams(pClipVolumeParams, nClipVolumeCount);
-
-            rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0]);
-            rd->m_RP.m_FlagsShader_RT |= nClipVolumeCount > 0 ? g_HWSR_MaskBit[HWSR_SAMPLE0] : 0;
-
-            static CCryNameTSCRC TechName("HMAO_Blur");
-            SD3DPostEffectsUtils::ShBeginPass(pSH, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            tpSrc->Apply(0, m_nTexStatePoint, -2);
-            pDepth[resolutionIndex]->Apply(1, m_nTexStatePoint, -2);
-
-            if (nClipVolumeCount)
-            {
-                static CCryNameR paramClipVolumeData("HMAO_ClipVolumeData");
-                pSH->FXSetPSFloat(paramClipVolumeData, pClipVolumeParams, min((uint32)MAX_DEFERRED_CLIP_VOLUMES, nClipVolumeCount + VIS_AREAS_OUTDOOR_STENCIL_OFFSET));
-                SD3DPostEffectsUtils::SetTexture(CDeferredShading::Instance().GetResolvedStencilRT(), 2, FILTER_POINT);
-            }
-
-            rd->D3DSetCull(eCULL_Back);
-            rd->FX_SetState(GS_NODEPTHTEST);
-
-            Vec4 v(0, 0, tpSrc->GetWidth(), tpSrc->GetHeight());
-            static CCryNameR Param1Name("PixelOffset");
-            pSH->FXSetVSFloat(Param1Name, &v, 1);
-
-            SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexHeightMapAO[1]->GetWidth(), CTexture::s_ptexHeightMapAO[1]->GetHeight());
-            SD3DPostEffectsUtils::ShEndPass();
-
-            rd->FX_PopRenderTarget(0);
-        }
-
-        pHeightMapAOScreenDepth = pDepth[resolutionIndex];
-        pHeightmapAO = CTexture::s_ptexHeightMapAO[1];
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DirectionalOcclusionPass()
-{
-    if (CRenderer::CV_r_GraphicsPipeline & 1)
-    {
-        gcpRendD3D->GetGraphicsPipeline().RenderScreenSpaceObscurance();
-        return;
-    }
-
-    AZ_TRACE_METHOD();
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    if (!CRenderer::CV_r_ssdo)
-    {
-        if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            gcpRendD3D->FX_ClearTarget(CTexture::s_ptexSceneNormalsBent, Clr_Median);
-        }
-        return;
-    }
-
-    // SSDO only supported on 128bpp GMEM path
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        assert(CD3D9Renderer::eGT_128bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr));
-    }
-
-    // calculate height map AO first
-    ShadowMapFrustum* pHeightMapFrustum = NULL;
-    CTexture* pHeightMapAODepth, * pHeightMapAO;
-    HeightMapOcclusionPass(pHeightMapFrustum, pHeightMapAODepth, pHeightMapAO);
-
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-    CTexture* pDstSSDO = CTexture::s_ptexStereoR;// re-using stereo buffers (only full resolution 32bit non-multisampled available at this step)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DDEFERREDSHADING_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(D3DDeferredShading_cpp)
-#endif
-
-    const bool bLowResOutput = (CRenderer::CV_r_ssdoHalfRes == 3);
-    if (bLowResOutput)
-    {
-        pDstSSDO = CTexture::s_ptexBackBufferScaled[0];
-    }
-
-    rd->m_RP.m_FlagsShader_RT |= CRenderer::CV_r_ssdoHalfRes ? g_HWSR_MaskBit[HWSR_SAMPLE0] : 0;
-    rd->m_RP.m_FlagsShader_RT |= pHeightMapFrustum ? g_HWSR_MaskBit[HWSR_SAMPLE1] : 0;
-
-    bool isRenderingFur = FurPasses::GetInstance().IsRenderingFur();
-    rd->m_RP.m_FlagsShader_RT |= isRenderingFur ? g_HWSR_MaskBit[HWSR_SAMPLE2] : 0;
-
-    // Extreme magnification as happening with small FOVs will cause banding issues with half-res depth
-    if (CRenderer::CV_r_ssdoHalfRes == 2 && RAD2DEG(rd->GetCamera().GetFov()) < 30)
-    {
-        rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    PROFILE_LABEL_PUSH("DIRECTIONAL_OCC");
-
-    bool allowDepthBounds = !bLowResOutput;
-    rd->FX_PushRenderTarget(0, pDstSSDO, allowDepthBounds ? &gcpRendD3D->m_DepthBufferOrig : NULL);
-    rd->FX_SetColorDontCareActions(0, true, false);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, DBT_SKY_CULL_DEPTH, allowDepthBounds);
-    }
-
-    static CCryNameTSCRC tech("DirOccPass");
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, tech, FEF_DONTSETSTATES);
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-    m_pNormalsRT->Apply(0, m_nTexStatePoint);
-    CTexture::s_ptexZTarget->Apply(1, m_nTexStatePoint);
-    SPostEffectsUtils::SetTexture(CTextureManager::Instance()->GetDefaultTexture("AOVOJitter"), 3, FILTER_POINT, 0);
-    if (bLowResOutput)
-    {
-        CTexture::s_ptexZTargetScaled2->Apply(5, m_nTexStatePoint);
-    }
-    else
-    {
-        CTexture::s_ptexZTargetScaled->Apply(5, m_nTexStatePoint);
-    }
-
-    if (isRenderingFur)
-    {
-        // Bind fur Z target - difference of the two Z targets indicates a stipple that needs avoided for SSDO
-        CTexture::s_ptexFurZTarget->Apply(2, m_nTexStatePoint);
-    }
-
-    Matrix44A matView;
-    matView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_cam.GetViewMatrix();
-
-    // Adjust the camera matrix so that the camera space will be: +y = down, +z - towards, +x - right
-    Vec3 zAxis = matView.GetRow(1);
-    matView.SetRow(1, -matView.GetRow(2));
-    matView.SetRow(2, zAxis);
-    float z = matView.m13;
-    matView.m13 = -matView.m23;
-    matView.m23 = z;
-
-    float radius = CRenderer::CV_r_ssdoRadius / rd->GetViewParameters().fFar;
-#if defined(FEATURE_SVO_GI)
-    if (CSvoRenderer::GetInstance()->IsActive())
-    {
-        radius *= CSvoRenderer::GetInstance()->GetSsaoAmount();
-    }
-#endif
-    static CCryNameR paramName1("SSDOParams");
-    Vec4 param1(radius * 0.5f * rd->m_ProjMatrix.m00, radius * 0.5f * rd->m_ProjMatrix.m11,
-        CRenderer::CV_r_ssdoRadiusMin, CRenderer::CV_r_ssdoRadiusMax);
-    m_pShader->FXSetPSFloat(paramName1, &param1, 1);
-
-    static CCryNameR viewspaceParamName("ViewSpaceParams");
-    Vec4 vViewSpaceParam(2.0f / rd->m_ProjMatrix.m00, 2.0f / rd->m_ProjMatrix.m11, -1.0f / rd->m_ProjMatrix.m00, -1.0f / rd->m_ProjMatrix.m11);
-    m_pShader->FXSetPSFloat(viewspaceParamName, &vViewSpaceParam, 1);
-
-    static CCryNameR paramName2("SSDO_CameraMatrix");
-    m_pShader->FXSetPSFloat(paramName2, (Vec4*)matView.GetData(), 3);
-
-    matView.Invert();
-    static CCryNameR paramName3("SSDO_CameraMatrixInv");
-    m_pShader->FXSetPSFloat(paramName3, (Vec4*)matView.GetData(), 3);
-
-    // set up height map AO
-    if (pHeightMapFrustum)
-    {
-        pHeightMapAODepth->Apply(11, -2);
-        pHeightMapAO->Apply(12, -2);
-
-        static CCryNameR paramNameHMAO("HMAO_Params");
-        Vec4 paramHMAO(CRenderer::CV_r_HeightMapAOAmount, 1.0f / pHeightMapFrustum->nTexSize, 0, 0);
-        m_pShader->FXSetPSFloat(paramNameHMAO, &paramHMAO, 1);
-    }
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    const Vec2& vDownscaleFactor = gcpRendD3D->m_RP.m_CurDownscaleFactor;
-    gRenDev->RT_SetScissor(true, 0, 0, pDstSSDO->GetWidth() * vDownscaleFactor.x + 0.5f, pDstSSDO->GetHeight() * vDownscaleFactor.y + 0.5f);
-#endif
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(pDstSSDO->GetWidth(), pDstSSDO->GetHeight(), 0);//, &gcpRendD3D->m_FullResRect);
-    SD3DPostEffectsUtils::ShEndPass();
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    gRenDev->RT_SetScissor(false, 0, 0, 0, 0);
-#endif
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, DBT_SKY_CULL_DEPTH, false);
-    }
-
-    rd->FX_PopRenderTarget(0);
-
-    if (CRenderer::CV_r_ssdo != 99)
-    {
-        CShader* pSH = rd->m_cEF.s_ShaderShadowBlur;
-        CTexture* tpSrc = pDstSSDO;
-
-        const int32 nSizeX = m_pDepthRT->GetWidth();
-        const int32 nSizeY = m_pDepthRT->GetHeight();
-
-        const int32 nSrcSizeX = tpSrc->GetWidth();
-        const int32 nSrcSizeY = tpSrc->GetHeight();
-
-        PROFILE_LABEL_SCOPE("SSDO_BLUR");
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexSceneNormalsBent, NULL);
-
-        static CCryNameTSCRC TechName("SSDO_Blur");
-        SD3DPostEffectsUtils::ShBeginPass(pSH, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        tpSrc->Apply(0, m_nTexStateLinear);
-        CTexture::s_ptexZTarget->Apply(1, m_nTexStatePoint);
-
-        rd->D3DSetCull(eCULL_Back);
-        rd->FX_SetState(GS_NODEPTHTEST);
-
-        Vec4 v(0, 0, nSrcSizeX, nSrcSizeY);
-        static CCryNameR Param1Name("PixelOffset");
-        pSH->FXSetVSFloat(Param1Name, &v, 1);
-
-        v = Vec4(0.5f / (float)nSizeX, 0.5f / (float)nSizeY, 1.f / (float)nSrcSizeX, 1.f / (float)nSrcSizeY);
-        static CCryNameR Param2Name("BlurOffset");
-        pSH->FXSetPSFloat(Param2Name, &v, 1);
-
-        v = Vec4(2.f / nSrcSizeX, 0, 2.f / nSrcSizeY, 10.f); //w = Weight coef
-        static CCryNameR Param3Name("SSAO_BlurKernel");
-        pSH->FXSetPSFloat(Param3Name, &v, 1);
-
-        SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexSceneNormalsBent->GetWidth(), CTexture::s_ptexSceneNormalsBent->GetHeight(), 0, &gcpRendD3D->m_FullResRect);
-        SD3DPostEffectsUtils::ShEndPass();
-
-        rd->FX_PopRenderTarget(0);
-    }
-    else  // For debugging
-    {
-        PostProcessUtils().StretchRect(pDstSSDO, CTexture::s_ptexSceneNormalsBent);
-    }
-
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-
-    if (CRenderer::CV_r_ssdoColorBleeding)
-    {
-        // Generate low frequency scene albedo for color bleeding (convolution not gamma correct but acceptable)
-        PostProcessUtils().StretchRect(CTexture::s_ptexSceneDiffuse, CTexture::s_ptexBackBufferScaled[0], false, false, false, false);
-        PostProcessUtils().StretchRect(CTexture::s_ptexBackBufferScaled[0], CTexture::s_ptexBackBufferScaled[1]);
-        PostProcessUtils().StretchRect(CTexture::s_ptexBackBufferScaled[1], CTexture::s_ptexAOColorBleed);
-        PostProcessUtils().TexBlurGaussian(CTexture::s_ptexAOColorBleed, 1, 1.0f, 4.0f, false, NULL, false, CTexture::s_ptexBackBufferScaled[2]);
-    }
-
-    PROFILE_LABEL_POP("DIRECTIONAL_OCC");
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DeferredSubsurfaceScattering(CTexture* tmpTex)
-{
-    if (CRenderer::CV_r_GraphicsPipeline & 1)
-    {
-        m_pLBufferDiffuseRT->Unbind();
-        gcpRendD3D->GetGraphicsPipeline().RenderScreenSpaceSSS(tmpTex);
-        return;
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (!CTexture::s_ptexHDRTarget)  // Sketch mode disables HDR rendering
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("SSSSS");
-
-    const uint64 nFlagsShaderRT = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_DEBUG0]);
-
-    if (CRenderer::CV_r_SlimGBuffer == 1)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    static CCryNameTSCRC techBlur("SSSSS_Blur");
-    static CCryNameR blurParamName("SSSBlurDir");
-    static CCryNameR viewspaceParamName("ViewSpaceParams");
-    Vec4 vViewSpaceParam(2.0f / rd->m_ProjMatrix.m00, 2.0f / rd->m_ProjMatrix.m11, -1.0f / rd->m_ProjMatrix.m00, -1.0f / rd->m_ProjMatrix.m11);
-    Vec4 vBlurParam;
-
-    float fProjScaleX = 0.5f * rd->m_ProjMatrix.m00;
-    float fProjScaleY = 0.5f * rd->m_ProjMatrix.m11;
-
-    m_pLBufferDiffuseRT->Unbind();
-    m_pDepthRT->Apply(1, m_nTexStatePoint);
-    m_pNormalsRT->Apply(2, m_nTexStatePoint);
-    m_pDiffuseRT->Apply(3, m_nTexStatePoint);
-    m_pSpecularRT->Apply(4, m_nTexStatePoint);
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-
-    // Selectively enables debug mode permutation if a debug parameter is non-zero.
-    bool bEnableDebug = false;
-    Vec4 vDebugParams(
-        (float)rd->CV_r_DeferredShadingTiledDebugDirect,
-        (float)rd->CV_r_DeferredShadingTiledDebugIndirect,
-        (float)rd->CV_r_DeferredShadingTiledDebugAccumulation,
-        (float)rd->CV_r_DeferredShadingTiledDebugAlbedo);
-    if (vDebugParams.Dot(vDebugParams) > 0.0f) // Simple check to see if anything is enabled.
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG0];
-        bEnableDebug = true;
-    }
-    static CCryNameR paramDebug("LightingDebugParams");
-
-#if defined (CRY_USE_METAL)
-    //Need to clear this texture as it can have undefined or bad data on load. 
-    rd->FX_ClearTarget(CTexture::s_ptexSceneTargetR11G11B10F[1], Clr_Empty);
-#endif
-
-    // Horizontal pass
-    rd->FX_PushRenderTarget(0, CTexture::s_ptexSceneTargetR11G11B10F[1], NULL);
-    
-    tmpTex->Apply(0, m_nTexStatePoint);  // Irradiance
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, techBlur, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    m_pShader->FXSetPSFloat(viewspaceParamName, &vViewSpaceParam, 1);
-    vBlurParam(fProjScaleX, 0, 0, 0);
-    m_pShader->FXSetPSFloat(blurParamName, &vBlurParam, 1);
-    if (bEnableDebug)
-    {
-        CShaderMan::s_shDeferredShading->FXSetPSFloat(paramDebug, &vDebugParams, 1);
-    }
-    SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight());
-    SD3DPostEffectsUtils::ShEndPass();
-    rd->FX_PopRenderTarget(0);
-
-    rd->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE);
-    rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-    // Vertical pass
-    rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, NULL);
-    CTexture::s_ptexSceneTargetR11G11B10F[1]->Apply(0, m_nTexStatePoint);
-    tmpTex->Apply(5, m_nTexStatePoint);  // Original irradiance
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, techBlur, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    m_pShader->FXSetPSFloat(viewspaceParamName, &vViewSpaceParam, 1);
-    vBlurParam(0, fProjScaleY, 0, 0);
-    m_pShader->FXSetPSFloat(blurParamName, &vBlurParam, 1);
-    if (bEnableDebug)
-    {
-        CShaderMan::s_shDeferredShading->FXSetPSFloat(paramDebug, &vDebugParams, 1);
-    }
-    SD3DPostEffectsUtils::DrawFullScreenTri(CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight());
-    SD3DPostEffectsUtils::ShEndPass();
-    rd->FX_PopRenderTarget(0);
-
-    rd->m_RP.m_FlagsShader_RT = nFlagsShaderRT;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DeferredShadingPass()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-
-    if (rd->IsShadowPassEnabled())
-    {
-        PROFILE_LABEL_SCOPE("SHADOWMASK");
-        rd->FX_DeferredShadowMaskGen(TArray<uint32>());
-    }
-
-    rd->D3DSetCull(eCULL_Back, true); //fs quads should not revert test..
-
-    PROFILE_LABEL_PUSH("DEFERRED_SHADING");
-
-    CTexture* tmpTexSSS = CTexture::s_ptexSceneTargetR11G11B10F[0];
-
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        tmpTexSSS = nullptr;
-    }
-
-    const uint64 nFlagsShaderRT = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_APPLY_SSDO] | g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION] |RT_CLIPVOLUME_ID);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, DBT_SKY_CULL_DEPTH, true);
-    }
-
-    bool deferredSSS = CRenderer::CV_r_DeferredShadingSSS != 0;
-
-    // Deferred subsurface scattering
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        deferredSSS = false; // Explicitly disable deferredSSS as it's not currently supported on GMEM path
-    }
-
-    bool isRenderingFur = FurPasses::GetInstance().IsRenderingFur();
-    if (deferredSSS || isRenderingFur)
-    {
-        // Output diffuse accumulation if SSS is enabled or if there are render items using fur
-        rd->FX_PushRenderTarget(1, tmpTexSSS, nullptr);
-    }
-
-    PROFILE_LABEL_PUSH("COMPOSITION");
-    static CCryNameTSCRC techComposition("DeferredShadingPass");
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        // CONFETTI BEGIN: David Srour
-        // Metal Load/Store Actions
-        rd->FX_SetDepthDontCareActions(0, false, true);
-        rd->FX_SetStencilDontCareActions(0, false, true);
-        rd->FX_SetDepthDontCareActions(1, false, true);
-        rd->FX_SetStencilDontCareActions(1, false, true);
-        // CONFETTI END
-    }
-
-    if (deferredSSS || isRenderingFur)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingAreaLights)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-
-    const uint32 nNumClipVolumes = m_nClipVolumesCount[m_nThreadID][m_nRecurseLevel];
-    if (nNumClipVolumes)
-    {
-        rd->m_RP.m_FlagsShader_RT |= RT_CLIPVOLUME_ID;
-    }
-
-    // Enable sun permutation (eg: when fully inside vis areas and sun not visible/used, skip sun computation)
-    if (rd->m_RP.m_pSunLight)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-    
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-    }
-
-    // Directional occlusion
-    if (CRenderer::CV_r_ssdo)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_APPLY_SSDO];
-    }
-    
-    
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, techComposition, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-    if (CD3D9Renderer::eGT_256bpp_PATH != gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        m_pDiffuseRT->Apply(2, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1);
-        m_pSpecularRT->Apply(3, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1);
-        m_pNormalsRT->Apply(4, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1);
-        m_pDepthRT->Apply(5, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1);
-    }
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))     // Following are already in GMEM
-    {
-        m_pLBufferDiffuseRT->Apply(0, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1);
-        m_pLBufferSpecularRT->Apply(1, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1);
-        m_pResolvedStencilRT->Apply(6, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1);
-    }
-    
-    // Directional occlusion
-    const int ssdoTexSlot = 7;
-    SetSSDOParameters(ssdoTexSlot);
-    
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))     // Following are already in GMEM
-    {
-        CTexture::s_ptexShadowMask->Apply(8, m_nTexStatePoint);
-        m_pDepthRT->Apply(9, m_nTexStatePoint);
-    }
-
-    Vec3 sunColor;
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SUN_COLOR, sunColor);
-
-    static CCryNameR paramNameSunColor("SunColor");
-    const Vec4 paramSunColor(sunColor, gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SUN_SPECULAR_MULTIPLIER));
-    m_pShader->FXSetPSFloat(paramNameSunColor, &paramSunColor, 1);
-
-    if (nNumClipVolumes)
-    {
-        m_pShader->FXSetPSFloat(m_pClipVolumeParams, m_vClipVolumeParams, min((uint32)MAX_DEFERRED_CLIP_VOLUMES, nNumClipVolumes + VIS_AREAS_OUTDOOR_STENCIL_OFFSET));
-
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            // Global blend weight
-            static CCryNameR clipVolGlobalBendWeight("g_fGlobalClipVolumeBlendWeight");
-            Vec4 blendWeight(CRenderer::CV_r_GMEMVisAreasBlendWeight, 0, 0, 0);
-            m_pShader->FXSetPSFloat(clipVolGlobalBendWeight, &blendWeight, 1);
-        }
-    }
-
-    const float SunSourceDiameter = 94.0f;      // atan(AngDiameterSun) * 2 * SunDistance, where AngDiameterSun=0.54deg and SunDistance=10000
-    static CCryNameR arealightMatrixName("g_AreaLightMatrix");
-    Matrix44 mAreaLightMatrix;
-    mAreaLightMatrix.SetIdentity();
-    mAreaLightMatrix.SetRow4(3, Vec4(SunSourceDiameter,  SunSourceDiameter, 0, 1.0f));
-    m_pShader->FXSetPSFloat(arealightMatrixName, alias_cast<Vec4*>(&mAreaLightMatrix), 4);
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight(), 0, &gcpRendD3D->m_FullResRect);
-    SD3DPostEffectsUtils::ShEndPass();
-
-    PROFILE_LABEL_POP("COMPOSITION");
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, DBT_SKY_CULL_DEPTH, false);
-    }
-
-    if (deferredSSS || isRenderingFur)
-    {
-        rd->FX_PopRenderTarget(1);
-        rd->FX_SetActiveRenderTargets();
-        DeferredSubsurfaceScattering(tmpTexSSS);
-    }
-
-    FurPasses::GetInstance().ExecuteObliteratePass();
-
-    rd->m_RP.m_FlagsShader_RT = nFlagsShaderRT;
-
-    PROFILE_LABEL_POP("DEFERRED_SHADING");
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DeferredLights(TArray<SRenderLight>& rLights, bool bCastShadows)
-{
-    if (rLights.Num())
-    {
-        PROFILE_LABEL_SCOPE("DEFERRED_LIGHTS");
-
-        if (bCastShadows)
-        {
-            PackAllShadowFrustums(rLights, false);
-        }
-
-        for (uint32 nCurrentLight = 0; nCurrentLight < rLights.Num(); ++nCurrentLight)
-        {
-            const SRenderLight& pDL = rLights[nCurrentLight];
-            if (pDL.m_Flags & (DLF_FAKE | DLF_VOLUMETRIC_FOG_ONLY))
-            {
-                continue;
-            }
-
-            assert(pDL.GetSpecularCubemap() == NULL);
-            if (!(pDL.m_Flags & DLF_CASTSHADOW_MAPS))
-            {
-                LightPass(&pDL);
-            }
-
-            m_nLightsProcessedCount++;
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-StaticInstance<CPowerOf2BlockPacker> CDeferredShading::m_blockPack;
-TArray<SShadowAllocData> CDeferredShading::m_shadowPoolAlloc;
-
-bool CDeferredShading::PackAllShadowFrustums(TArray<SRenderLight>& arrLights, bool bPreLoop)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    const uint64 nPrevFlagsShaderRT = rd->m_RP.m_FlagsShader_RT;
-
-    static ICVar* p_e_ShadowsPoolSize = iConsole->GetCVar("e_ShadowsPoolSize");
-    const bool isGmemEnabled = gcpRendD3D->FX_GetEnabledGmemPath(nullptr) != CD3D9Renderer::eGT_REGULAR_PATH;
-
-    int nRequestedPoolSize = p_e_ShadowsPoolSize->GetIVal();
-    if (m_nShadowPoolSize !=  nRequestedPoolSize)
-    {
-        m_blockPack->UpdateSize(nRequestedPoolSize >> TEX_POOL_BLOCKLOGSIZE, nRequestedPoolSize >> TEX_POOL_BLOCKLOGSIZE);
-        m_nShadowPoolSize = nRequestedPoolSize;
-
-        // clear pool and reset allocations
-        m_blockPack->Clear();
-        m_shadowPoolAlloc.SetUse(0);
-    }
-
-    // light pass here
-    if (!bPreLoop)
-    {
-        for (uint nLightPacked = m_nFirstCandidateShadowPoolLight; nLightPacked < m_nCurrentShadowPoolLight; ++nLightPacked)
-        {
-            const SRenderLight& rLight = arrLights[nLightPacked];
-            if (rLight.m_Flags & DLF_FAKE)
-            {
-                continue;
-            }
-            ShadowLightPasses(rLight);
-        }
-    }
-
-    while (m_nCurrentShadowPoolLight < arrLights.Num()) //pre-loop to avoid 0.5 ms restore/resolve
-    {
-        SRenderLight& rLight = arrLights[m_nCurrentShadowPoolLight];
-        if (!(rLight.m_Flags & DLF_DIRECTIONAL) && (rLight.m_Flags & DLF_CASTSHADOW_MAPS))
-        {
-            break;
-        }
-        m_nCurrentShadowPoolLight++;
-    }
-
-    if (bPreLoop && m_nCurrentShadowPoolLight < arrLights.Num()) // Shadow allocation tick, free old shadows.
-    {
-        uint32 nAllocs = m_shadowPoolAlloc.Num();
-        for (uint32 i = 0; i < nAllocs; i++)
-        {
-            SShadowAllocData* pAlloc = &m_shadowPoolAlloc[i];
-            uint32 currFrame = gcpRendD3D->GetFrameID(false) & 0xFF;
-            if (!pAlloc->isFree()  && ((currFrame - pAlloc->m_frameID) > (uint)CRenderer::CV_r_ShadowPoolMaxFrames))
-            {
-                m_blockPack->RemoveBlock(pAlloc->m_blockID);
-                pAlloc->Clear();
-                break;  //Max one delete per frame, this should spread updates across more frames
-            }
-        }
-    }
-
-    // In GMEM we only pack shadows during the preloop (that happens before the deferred lighting pass)
-    // We don't do it during the deferred lighting pass (preloop = false) because that would cause a resolve of the lighting accumulation buffers.
-    bool packShadows = bPreLoop || !isGmemEnabled;
-    bool bShadowRendered = false;
-    while (m_nCurrentShadowPoolLight < arrLights.Num() && (!bPreLoop || !bShadowRendered))
-    {
-        m_nFirstCandidateShadowPoolLight = m_nCurrentShadowPoolLight;
-
-        // init before shadowgen
-        SetupPasses();
-        rd->FX_ResetPipe();
-        rd->EF_Scissor(false, 0, 0, 0, 0);
-        rd->SetDepthBoundTest(0.0f, 1.0f, false);
-
-        {
-            PROFILE_LABEL_SCOPE("SHADOWMAP_POOL");
-
-            if (!bPreLoop && !isGmemEnabled)
-            {
-                ResolveCurrentBuffers();
-            }
-
-            while (m_nCurrentShadowPoolLight < arrLights.Num())
-            {
-                SRenderLight& rLight = arrLights[m_nCurrentShadowPoolLight];
-
-                if (packShadows && !(rLight.m_Flags & (DLF_DIRECTIONAL | DLF_FAKE)) && (rLight.m_Flags & DLF_CASTSHADOW_MAPS))
-                {
-                    bool bPacked = PackToPool(m_blockPack, rLight, m_bClearPool);
-                    m_bClearPool = !bPacked;
-                    if (!bPacked)
-                    {
-                        break;
-                    }
-                }
-                ++m_nCurrentShadowPoolLight;
-                bShadowRendered = true;
-            }
-
-#ifndef _RELEASE
-            {
-                uint32 nAllocs = m_shadowPoolAlloc.Num();
-                for (uint32 i = 0; i < nAllocs; i++)
-                {
-                    if (!m_shadowPoolAlloc[i].isFree())
-                    {
-                        rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumShadowPoolFrustums++;
-                    }
-                }
-            }
-#endif
-        }
-
-        if (!bPreLoop && bShadowRendered)
-        {
-            if (!isGmemEnabled)
-            {
-                RestoreCurrentBuffers();
-            }
-
-            size_t numLightsWithoutShadow = 0;
-            //insert light pass here
-            for (uint nLightPacked = m_nFirstCandidateShadowPoolLight; nLightPacked < m_nCurrentShadowPoolLight; ++nLightPacked)
-            {
-                SRenderLight& rLight = arrLights[nLightPacked];
-                if ((rLight.m_Flags & (DLF_FAKE | DLF_DIRECTIONAL)) || !(rLight.m_Flags & DLF_CASTSHADOW_MAPS))
-                {
-                    continue;
-                }
-
-                if (packShadows)
-                {
-                    ShadowLightPasses(rLight);
-                }
-                else
-                {
-                    // We are not allow to pack shadows (like in GMEM during the ligthing pass) so this light doesn't have a shadowmap.
-                    // Remove the cast shadow flag so it get's render without shadows later.
-                    rLight.m_Flags &= ~DLF_CASTSHADOW_MAPS;
-                    ++numLightsWithoutShadow;
-                }
-            }
-
-            AZ_Warning("Rendering", numLightsWithoutShadow == 0, "%d lights will be rendered without shadows because there's no more space in the shadowmap pool texture.\
-                Try decreasing the number of lights casting shadows or increasing the size of the shadowmap pool (e_ShadowsPoolSize)",
-                numLightsWithoutShadow);
-        }
-    }
-
-    rd->m_RP.m_FlagsShader_RT = nPrevFlagsShaderRT;
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CDeferredShading::PackToPool(CPowerOf2BlockPacker* pBlockPack, SRenderLight& light, bool bClearPool)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    //////////////////////////////////////////////////////////////////////////
-    int nDLights = rd->m_RP.m_DLights[m_nThreadID][m_nRecurseLevel].Num();
-
-    //////////////////////////////////////////////////////////////////////////
-    int nFrustumIdx = light.m_lightId + nDLights;
-    int nStartIdx = SRendItem::m_StartFrust[m_nThreadID][nFrustumIdx];
-    int nEndIdx = SRendItem::m_EndFrust[m_nThreadID][nFrustumIdx];
-
-    int nUpdatedThisFrame = 0;
-
-    assert((unsigned int) nFrustumIdx < (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS));
-    if ((unsigned int) nFrustumIdx >= (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS))
-    {
-        int nFrameID = gcpRendD3D->GetFrameID(false);
-        if (m_nWarningFrame != nFrameID)
-        {
-            Warning("CDeferredShading::ShadowLightPasses: Too many light sources used ...");
-            m_nWarningFrame = nFrameID;
-        }
-        //reset castshadow flag for further processing
-        light.m_Flags &= ~DLF_CASTSHADOW_MAPS;
-        return true;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //no single frustum was allocated for this light
-    if (nEndIdx <= nStartIdx)
-    {
-        //reset castshadow flag for further processing
-        light.m_Flags &= ~DLF_CASTSHADOW_MAPS;
-        return true;
-    }
-
-    if (m_nRecurseLevel < 0 || m_nRecurseLevel >= (int)rd->m_RP.m_SMFrustums[m_nThreadID]->Num())
-    {
-        //reset castshadow flag for further processing
-        light.m_Flags &= ~DLF_CASTSHADOW_MAPS;
-        return true;
-    }
-
-    ShadowMapFrustum& firstFrustum = rd->m_RP.m_SMFrustums[m_nThreadID][m_nRecurseLevel][nStartIdx];
-
-    //////////////////////////////////////////////////////////////////////////
-    int nBlockW = firstFrustum.nTexSize >> TEX_POOL_BLOCKLOGSIZE;
-    int nLogBlockW = IntegerLog2((uint32)nBlockW);
-    int nLogBlockH = nLogBlockW;
-
-    bool bNeedsUpdate = false;
-
-    if (bClearPool)
-    {
-        pBlockPack->Clear();
-        m_shadowPoolAlloc.SetUse(0);
-    }
-
-    uint32 currFrame = gcpRendD3D->GetFrameID(false) & 0xFF;
-
-    uint32 lightID = light.m_nEntityId;
-
-    assert(lightID != (uint32) - 1);
-
-    uint SidesNum = firstFrustum.bUnwrapedOmniDirectional ? OMNI_SIDES_NUM : 1;
-    uint nUpdateMask = firstFrustum.bUnwrapedOmniDirectional ? 0x3F : 0x1;
-
-    for (uint nSide = 0; nSide < SidesNum; nSide++)
-    {
-        bNeedsUpdate = false;
-        uint nX1, nX2, nY1, nY2;
-
-        //Find block allocation info (alternative: store in frustum data, but this does not persist)
-        bool bFoundAlloc = false;
-#if defined(WIN32)
-        int  nMGPUUpdate = -1;
-#endif
-        uint32 nAllocs = m_shadowPoolAlloc.Num();
-        SShadowAllocData* pAlloc = NULL;
-        for (uint32 i = 0; i < nAllocs; i++)
-        {
-            pAlloc = &m_shadowPoolAlloc[i];
-
-            if (pAlloc->m_lightID == lightID  && pAlloc->m_side == nSide)
-            {
-                bFoundAlloc = true;
-                break;
-            }
-        }
-
-        if (bFoundAlloc)
-        {
-            uint32 nID = pBlockPack->GetBlockInfo(pAlloc->m_blockID, nX1, nY1, nX2, nY2);
-
-            int nFrameCompare = (currFrame - pAlloc->m_frameID) % 256;
-
-            if (nID == 0xFFFFFFFF)
-            {
-                bNeedsUpdate =  true;
-            }
-            else
-            {
-                if (firstFrustum.nShadowPoolUpdateRate == 0)  // forced update, always do this
-                {
-                    bNeedsUpdate = true;
-                }
-                else if (firstFrustum.nShadowPoolUpdateRate < (uint8) nFrameCompare)
-                {
-                    if (nUpdatedThisFrame < CRenderer::CV_r_ShadowPoolMaxTimeslicedUpdatesPerFrame)
-                    {
-                        bNeedsUpdate = true;
-                        nUpdatedThisFrame++;
-                    }
-                }
-#if defined(WIN32) // AFR support
-                else if (rd->GetActiveGPUCount() > 1)
-                {
-                    if (gRenDev->GetActiveGPUCount() > nFrameCompare)
-                    {
-                        bNeedsUpdate = true;
-                        nMGPUUpdate = pAlloc->m_frameID;
-                    }
-                }
-#endif
-            }
-
-            if (!bNeedsUpdate)
-            {
-                if (nX1 != 0xFFFFFFFF &&  nBlockW == (nX2 - nX1))  // ignore Y, is square
-                {
-                    pBlockPack->GetBlockInfo(nID, nX1, nY1, nX2, nY2);
-                    firstFrustum.packX[nSide] = nX1 << TEX_POOL_BLOCKLOGSIZE;
-                    firstFrustum.packY[nSide] = nY1 << TEX_POOL_BLOCKLOGSIZE;
-                    firstFrustum.packWidth[nSide]  = (nX2 - nX1) << TEX_POOL_BLOCKLOGSIZE;
-                    firstFrustum.packHeight[nSide] = (nY2 - nY1) << TEX_POOL_BLOCKLOGSIZE;
-                    firstFrustum.nShadowGenID[m_nThreadID][nSide] = 0xFFFFFFFF; // turn off shadow gen for this side
-
-                    nUpdateMask &= ~(1 << nSide);
-                    continue; // All currently valid, skip
-                }
-            }
-
-            if (nID != 0xFFFFFFFF && nX1 != 0xFFFFFFFF) // Valid block, realloc
-            {
-                pBlockPack->RemoveBlock(nID);
-                pAlloc->Clear();
-            }
-        }
-
-        uint32 nID = pBlockPack->AddBlock(nLogBlockW, nLogBlockH);
-        bool isAllocated = (nID != 0xFFFFFFFF) ? true : false;
-
-#ifndef _RELEASE
-        rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumShadowPoolAllocsThisFrame++;
-#endif
-
-        if (isAllocated)
-        {
-            bNeedsUpdate = true;
-
-            if (!bFoundAlloc)
-            {
-                pAlloc = NULL;
-                nAllocs = m_shadowPoolAlloc.Num();
-                for (uint32 i = 0; i < nAllocs; i++)
-                {
-                    if (m_shadowPoolAlloc[i].isFree())
-                    {
-                        pAlloc = &m_shadowPoolAlloc[i];
-                        break;
-                    }
-                }
-
-                if (!pAlloc)
-                {
-                    pAlloc = m_shadowPoolAlloc.AddIndex(1);
-                }
-            }
-
-            pAlloc->m_blockID = nID;
-            pAlloc->m_lightID = lightID;
-            pAlloc->m_side = nSide;
-#if defined(WIN32)
-            pAlloc->m_frameID = (nMGPUUpdate == -1) ? gcpRendD3D->GetFrameID(false) & 0xFF : nMGPUUpdate;
-#else
-            pAlloc->m_frameID = gcpRendD3D->GetFrameID(false) & 0xFF;
-#endif
-            bClearPool = true;
-        }
-        else
-        {
-#ifndef _RELEASE // failed alloc, will thrash!
-            if (CRenderer::CV_r_ShadowPoolMaxFrames != 0 || CRenderer::CV_r_DeferredShadingTiled > 1)
-            {
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumShadowPoolAllocsThisFrame |= 0x80000000;
-            }
-#endif
-
-            return false;
-        }
-
-        pBlockPack->GetBlockInfo(nID, nX1, nY1, nX2, nY2);
-        firstFrustum.packX[nSide] = nX1 << TEX_POOL_BLOCKLOGSIZE;
-        firstFrustum.packY[nSide] = nY1 << TEX_POOL_BLOCKLOGSIZE;
-        firstFrustum.packWidth[nSide]  = (nX2 - nX1) << TEX_POOL_BLOCKLOGSIZE;
-        firstFrustum.packHeight[nSide] = (nY2 - nY1) << TEX_POOL_BLOCKLOGSIZE;
-    }
-
-    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    //  next step is to use these values in shadowgen
-
-    //////////////////////////////////////////////////////////////////////////
-
-    if (firstFrustum.bUseShadowsPool && nUpdateMask > 0)
-    {
-        rd->FX_PrepareDepthMapsForLight(light, nFrustumIdx, bClearPool);
-    }
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::ResolveCurrentBuffers()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    PROFILE_LABEL_SCOPE("FLUSH_RESOLVE");
-    rd->FX_PopRenderTarget(1);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::RestoreCurrentBuffers()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    rd->FX_PushRenderTarget(1, m_pLBufferSpecularRT, NULL, -1, false, 1);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CDeferredShading::ShadowLightPasses(const SRenderLight& light)
-{
-    PROFILE_SHADER_SCOPE;
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    float scissorInt2Float[] = { (float)(light.m_sX), (float)(light.m_sY), (float)(light.m_sWidth), (float)(light.m_sHeight) };
-
-    rd->m_RP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-    int nDLights = rd->m_RP.m_DLights[m_nThreadID][m_nRecurseLevel].Num();
-
-    //////////////////////////////////////////////////////////////////////////
-    int nFrustumIdx = light.m_lightId + nDLights;
-    int nStartIdx = SRendItem::m_StartFrust[m_nThreadID][nFrustumIdx];
-    int nEndIdx = SRendItem::m_EndFrust[m_nThreadID][nFrustumIdx];
-
-
-    assert((unsigned int) nFrustumIdx < (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS));
-    if ((unsigned int) nFrustumIdx >= (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS))
-    {
-        //Warning("CDeferredShading::ShadowLightPasses: Too many light sources used ..."); // redundant
-        return false;
-    }
-
-    //no single frustum was allocated for this light
-    if (nEndIdx <= nStartIdx)
-    {
-        return false;
-    }
-
-    if (m_nRecurseLevel < 0 || m_nRecurseLevel >= (int)rd->m_RP.m_SMFrustums[m_nThreadID]->Num())
-    {
-        return false;
-    }
-
-    // Area lights are a non-uniform box, not a cone in 1 of 6 directions, so we skip clipping/stencil testing and let the light pass take care of it.
-    bool bAreaLight = (light.m_Flags & DLF_AREA_LIGHT) && light.m_fAreaWidth && light.m_fAreaHeight && light.m_fLightFrustumAngle && CRenderer::CV_r_DeferredShadingAreaLights;
-
-    ShadowMapFrustum& firstFrustum = rd->m_RP.m_SMFrustums[m_nThreadID][m_nRecurseLevel][nStartIdx];
-
-    int nSides = 1;
-    if (firstFrustum.bOmniDirectionalShadow && !bAreaLight)
-    {
-        nSides = 6;
-    }
-
-    // omni lights with clip bounds require two stencil tests (one for the side and one for the clip bound)
-    const int stencilValuesPerSide = 1;
-
-    //enable shadow mapping
-    rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-
-    //enable hw-pcf per frustum
-    if (firstFrustum.bHWPCFCompare)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ];
-    }
-
-    Vec4 pLightRect  = Vec4(scissorInt2Float[0], scissorInt2Float[1], scissorInt2Float[2], scissorInt2Float[3]);
-    Vec4 scaledLightRect = Vec4(pLightRect.x * rd->m_RP.m_CurDownscaleFactor.x, pLightRect.y * rd->m_RP.m_CurDownscaleFactor.y,
-            pLightRect.z * rd->m_RP.m_CurDownscaleFactor.x, pLightRect.w * rd->m_RP.m_CurDownscaleFactor.y);
-
-    if (!bAreaLight)
-    {
-        rd->m_nStencilMaskRef += (nSides * stencilValuesPerSide + 2);
-        if (rd->m_nStencilMaskRef > STENC_MAX_REF)
-        {
-            int sX = 0, sY = 0, sWidth = 0, sHeight = 0;
-            bool bScissorEnabled = rd->EF_GetScissorState(sX, sY, sWidth, sHeight);
-            rd->EF_Scissor(false, 0, 0, 0, 0);
-
-            if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-            {
-                // Avoid any resolve. We clear stencil with full screen pass.
-                uint32 prevState = rd->m_RP.m_CurState;
-                uint32 newState = 0;
-                newState |= GS_COLMASK_NONE;
-                newState |= GS_STENCIL;
-                rd->FX_SetStencilState(STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-                    STENCOP_FAIL(FSS_STENCOP_ZERO) |
-                    STENCOP_ZFAIL(FSS_STENCOP_ZERO) |
-                    STENCOP_PASS(FSS_STENCOP_ZERO),
-                    0, 0xFFFFFFFF, 0xFFFF);
-                rd->FX_SetState(newState);
-                SD3DPostEffectsUtils::ClearScreen(0, 0, 0, 0);
-                rd->FX_SetState(prevState);
-            }
-            else
-            {
-                rd->EF_ClearTargetsImmediately(FRT_CLEAR_STENCIL);
-            }
-
-            rd->EF_Scissor(bScissorEnabled, sX, sY, sWidth, sHeight);
-            rd->m_nStencilMaskRef = nSides * stencilValuesPerSide + 1;
-        }
-    }
-
-    uint16 scaledX = 0, scaledY = 0, scaledWidth = 0, scaledHeight = 0;
-
-    for (int nS = 0; nS < nSides; nS++)
-    {
-        uint32 nPersFlagsPrev = rd->m_RP.m_TI[m_nThreadID].m_PersFlags;
-
-        bool bIsMirrored =  (rd->m_RP.m_TI[m_nThreadID].m_PersFlags & RBPF_MIRRORCULL)  ? true : false;
-        bool bRequiresMirroring = (!(light.m_Flags & (DLF_PROJECT | DLF_AREA_LIGHT))) ? true : false;
-
-        if (bIsMirrored ^ bRequiresMirroring) // Enable mirror culling for omni-shadows, or if we are in cubemap-gen. If both, they cancel-out, so disable.
-        {
-            rd->m_RP.m_TI[m_nThreadID].m_PersFlags |= RBPF_MIRRORCULL;
-        }
-        else
-        {
-            rd->m_RP.m_TI[m_nThreadID].m_PersFlags &= ~RBPF_MIRRORCULL;
-        }
-
-#if !defined(CRY_USE_METAL) && !defined(ANDROID)
-        SpecularAccEnableMRT(false);
-#endif
-
-        if (CRenderer::CV_r_DeferredShadingDepthBoundsTest == 1 && !bAreaLight)
-        {
-            Vec4 pDepthBounds = GetLightDepthBounds(&light, (rd->m_RP.m_TI[m_nThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0);
-            rd->SetDepthBoundTest(pDepthBounds.x, pDepthBounds.z, true);
-        }
-
-        if (nS == 0)
-        {
-            scaledX = (uint16)(scaledLightRect.x);
-            scaledY = (uint16)(scaledLightRect.y);
-            scaledWidth = (uint16)(scaledLightRect.z) + 1;
-            scaledHeight = (uint16)(scaledLightRect.w) + 1;
-        }
-
-        if (!bAreaLight)
-        {
-            //use current WorldProj matrix
-            rd->FX_StencilFrustumCull(-2, &light, &firstFrustum, nS);
-
-            rd->SetDepthBoundTest(0, 1, false);
-        }
-
-        rd->m_RP.m_TI[m_nThreadID].m_PersFlags = nPersFlagsPrev;
-        if (!bAreaLight)
-        {
-            rd->FX_StencilTestCurRef(true, true);
-        }
-
-        SetupPasses();
-
-        if (!bAreaLight)
-        {
-            m_nRenderState |= GS_STENCIL;
-        }
-
-#if !defined(CRY_USE_METAL) && !defined(ANDROID)
-        SpecularAccEnableMRT(true);
-#endif
-
-        if (firstFrustum.nShadowGenMask & (1 << nS))
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-            rd->ConfigShadowTexgen(0, &firstFrustum, nS);
-
-            if (firstFrustum.bUseShadowsPool)
-            {
-                const int nTexFilter = firstFrustum.bHWPCFCompare ? FILTER_LINEAR : FILTER_POINT;
-                STexState TS;
-                TS.SetFilterMode(nTexFilter);
-                TS.SetClampMode(TADDR_CLAMP, TADDR_CLAMP, TADDR_CLAMP);
-                TS.m_bSRGBLookup = false;
-                TS.SetComparisonFilter(true);
-                CTexture::s_ptexRT_ShadowPool->Apply(3, CTexture::GetTexState(TS), EFTT_UNKNOWN, 6);
-                //  this assigned comparison sampler to correct sampler slot for shadowmapped light sources
-                if (!rd->UseHalfFloatRenderTargets())
-                {
-                    CTexture::SetSamplerState(CTexture::GetTexState(TS), 0, eHWSC_Pixel);
-                }
-            }
-            else
-            {
-                SD3DPostEffectsUtils::SetTexture(firstFrustum.pDepthTex, 3, FILTER_POINT, 0);
-            }
-
-            SD3DPostEffectsUtils::SetTexture(CTextureManager::Instance()->GetDefaultTexture("ShadowJitterMap"), 7, FILTER_POINT, 0);
-        }
-        else
-        {
-            rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE4];
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-
-
-        m_nCurLighID = light.m_lightId;
-
-        LightPass(&light, true);
-
-        if (!bAreaLight)
-        {
-            rd->FX_StencilTestCurRef(false);
-        }
-    }
-
-    //assign range
-    if (!bAreaLight)
-    {
-        rd->m_nStencilMaskRef += nSides * stencilValuesPerSide;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ]);
-
-    if (!bAreaLight)
-    {
-        m_nRenderState &= ~GS_STENCIL;
-    }
-    rd->FX_SetState(m_nRenderState);
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::CreateDeferredMaps()
-{
-    AZ_TRACE_METHOD();
-    static uint32 nPrevLBuffersFmt = CRenderer::CV_r_DeferredShadingLBuffersFmt;
-    if (!CTexture::s_ptexSceneNormalsMap || CTexture::s_ptexSceneNormalsMap->IsMSAAChanged()
-        || CTexture::s_ptexSceneNormalsMap->GetWidth() != gcpRendD3D->m_MainViewport.nWidth
-        || CTexture::s_ptexSceneNormalsMap->GetHeight() != gcpRendD3D->m_MainViewport.nHeight
-        || nPrevLBuffersFmt != CRenderer::CV_r_DeferredShadingLBuffersFmt)
-    {
-        nPrevLBuffersFmt = CRenderer::CV_r_DeferredShadingLBuffersFmt;
-
-        int nWidth = gcpRendD3D->GetWidth();
-        int nHeight = gcpRendD3D->GetHeight();
-        int nMSAAUsageFlag = ((CRenderer::CV_r_msaa ? FT_USAGE_MSAA : 0));
-        int nMsaaAndSrgbFlag = nMSAAUsageFlag;
-
-        if (RenderCapabilities::SupportsTextureViews())
-        {
-            // Currently android nor mac(GL) support srgb render targets so only add this
-            // flag for other platforms
-            nMsaaAndSrgbFlag |= FT_USAGE_ALLOWREADSRGB;
-        }
-   
-        // This texture is reused for SMAA...
-        // grab format from backbuffer - normals map doubles as a previous backbuffer target elsewhere, so it has to be the same type as the backbuffer.
-        ETEX_Format fmt = CTexture::s_ptexBackBuffer->GetDstFormat();
-        SD3DPostEffectsUtils::CreateRenderTarget("$SceneNormalsMap", CTexture::s_ptexSceneNormalsMap, nWidth, nHeight, Clr_Unknown, true, false, fmt, TO_SCENE_NORMALMAP, nMsaaAndSrgbFlag);
-        SD3DPostEffectsUtils::CreateRenderTarget("$SceneNormalsBent", CTexture::s_ptexSceneNormalsBent, nWidth, nHeight, Clr_Median, true, false, eTF_R8G8B8A8);
-        SD3DPostEffectsUtils::CreateRenderTarget("$AOColorBleed", CTexture::s_ptexAOColorBleed, nWidth >> 3, nHeight >> 3, Clr_Unknown, true, false, eTF_R8G8B8A8);
-
-        ETEX_Format sceneDiffuseAccTexFormat  = eTF_R16G16B16A16F;
-        ETEX_Format sceneSpecularAccTexFormat = eTF_R16G16B16A16F;
-
-#if defined(OPENGL_ES) // might be no fp rendering support
-        if (!gcpRendD3D->UseHalfFloatRenderTargets())
-        {
-            sceneSpecularAccTexFormat = eTF_R10G10B10A2;
-            sceneDiffuseAccTexFormat = gcpRendD3D->FX_GetEnabledGmemPath(nullptr) ? eTF_R16G16B16A16 : eTF_R10G10B10A2;
-        }
-#elif defined(WIN32) || defined(APPLE) || defined(LINUX) || defined(SUPPORTS_DEFERRED_SHADING_L_BUFFERS_FORMAT)
-        if (CRenderer::CV_r_DeferredShadingLBuffersFmt == 1)
-        {
-            sceneSpecularAccTexFormat = eTF_R11G11B10F;
-            sceneDiffuseAccTexFormat = gcpRendD3D->FX_GetEnabledGmemPath(nullptr) ? eTF_R16G16B16A16F : eTF_R11G11B10F;
-        }
-#endif
-        
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2 && gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            sceneDiffuseAccTexFormat = eTF_R8;
-            sceneSpecularAccTexFormat = eTF_R11G11B10F;
-#if defined(OPENGL_ES)
-            if (!gcpRendD3D->UseHalfFloatRenderTargets())
-            {
-                sceneSpecularAccTexFormat = eTF_R10G10B10A2;
-            }
-#endif
-        }
-     
-        SD3DPostEffectsUtils::CreateRenderTarget("$SceneDiffuseAcc", CTexture::s_ptexSceneDiffuseAccMap, nWidth, nHeight, Clr_Transparent, true, false,
-            // In GMEM Paths:
-            // - Alpha channel is used for shadow mask
-            // - Used as a tmp buffer to hold normals while computing deferred decals
-            sceneDiffuseAccTexFormat,
-            TO_SCENE_DIFFUSE_ACC, nMSAAUsageFlag);
-
-        CTexture::s_ptexCurrentSceneDiffuseAccMap = CTexture::s_ptexSceneDiffuseAccMap;
-        
-        // When the device orientation changes on mobile, we need to regenerate HDR maps before calling CreateRenderTarget.
-        // Otherwise, the width and height of the texture get updated before HDRPostProcess::Begin call and we never regenerate the HDR maps which results in visual artifacts.
-        if (CTexture::s_ptexHDRTarget && (CTexture::s_ptexHDRTarget->IsMSAAChanged() || CTexture::s_ptexHDRTarget->GetWidth() != gcpRendD3D->GetWidth() || CTexture::s_ptexHDRTarget->GetHeight() != gcpRendD3D->GetHeight()))
-        {
-            CTexture::GenerateHDRMaps();
-        }
-
-        SD3DPostEffectsUtils::CreateRenderTarget("$SceneSpecularAcc", CTexture::s_ptexSceneSpecularAccMap, nWidth, nHeight, Clr_Transparent, true, false, sceneSpecularAccTexFormat, TO_SCENE_SPECULAR_ACC, nMSAAUsageFlag);
-
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            // Point s_ptexHDRTarget to s_ptexSceneSpecularAccMap for GMEM paths
-            CTexture::s_ptexHDRTarget = CTexture::s_ptexSceneSpecularAccMap;
-
-            // Point m_pResolvedStencilRT to s_ptexGmemStenLinDepth for GMEM paths
-            m_pResolvedStencilRT = CTexture::s_ptexGmemStenLinDepth;
-        }
-
-        SD3DPostEffectsUtils::CreateRenderTarget("$SceneDiffuse", CTexture::s_ptexSceneDiffuse, nWidth, nHeight, Clr_Empty, true, false, eTF_R8G8B8A8, -1, nMsaaAndSrgbFlag);
-        
-        // Slimming of GBuffer requires only one channel for specular due to packing of RGB values into YPbPr and
-        // specular components into less channels
-        ETEX_Format rtTextureFormat = eTF_R8G8B8A8;
-        if (CRenderer::CV_r_SlimGBuffer == 1)
-        {
-            rtTextureFormat = eTF_R8;
-        }
-        SD3DPostEffectsUtils::CreateRenderTarget("$SceneSpecular", CTexture::s_ptexSceneSpecular, nWidth, nHeight, Clr_Empty, true, false, rtTextureFormat, -1, nMsaaAndSrgbFlag);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DDEFERREDSHADING_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(D3DDeferredShading_cpp)
-#endif
-
-        ETEX_Format fmtZScaled = gcpRendD3D->UseHalfFloatRenderTargets() ? eTF_R16G16F : eTF_R16G16U;
-        SD3DPostEffectsUtils::CreateRenderTarget("$ZTargetScaled", CTexture::s_ptexZTargetScaled, nWidth >> 1, nHeight >> 1, Clr_FarPlane, 1, 0, fmtZScaled, TO_DOWNSCALED_ZTARGET_FOR_AO);
-        SD3DPostEffectsUtils::CreateRenderTarget("$ZTargetScaled2", CTexture::s_ptexZTargetScaled2, nWidth >> 2, nHeight >> 2, Clr_FarPlane, 1, 0, fmtZScaled, TO_QUARTER_ZTARGET_FOR_AO);
-
-        SD3DPostEffectsUtils::CreateRenderTarget("$AmbientLookup", CTexture::s_ptexAmbientLookup, 64, 1, Clr_Empty, true, false, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
-        SD3DPostEffectsUtils::CreateRenderTarget("$DepthBufferQuarter", CTexture::s_ptexDepthBufferQuarter, nWidth >> 2, nHeight >> 2, Clr_FarPlane, false, false, eTF_D32F, -1, FT_USAGE_DEPTHSTENCIL);
-    }
-
-    // Pre-create shadow pool
-    IF (gcpRendD3D->m_pRT->IsRenderThread() && gEnv->p3DEngine, 1)
-    {
-        //init shadow pool size
-        static ICVar* p_e_ShadowsPoolSize = iConsole->GetCVar("e_ShadowsPoolSize");
-        gcpRendD3D->m_nShadowPoolHeight = p_e_ShadowsPoolSize->GetIVal();
-        gcpRendD3D->m_nShadowPoolWidth = gcpRendD3D->m_nShadowPoolHeight; //square atlas
-
-        ETEX_Format eShadTF = gcpRendD3D->CV_r_shadowtexformat == 1 ? eTF_D16 : eTF_D32F;
-        CTexture::s_ptexRT_ShadowPool->Invalidate(gcpRendD3D->m_nShadowPoolWidth, gcpRendD3D->m_nShadowPoolHeight, eShadTF);
-        if (!CTexture::IsTextureExist(CTexture::s_ptexRT_ShadowPool))
-        {
-            CTexture::s_ptexRT_ShadowPool->CreateRenderTarget(eTF_Unknown, Clr_FarPlane);
-        }
-
-        CTexture::s_ptexRT_ShadowStub->Invalidate(1, 1, eShadTF);
-        if (!CTexture::IsTextureExist(CTexture::s_ptexRT_ShadowStub))
-        {
-            CTexture::s_ptexRT_ShadowStub->CreateRenderTarget(eTF_Unknown, Clr_FarPlane);
-        }
-    }
-
-    if (CRenderer::CV_r_DeferredShadingTiled > 0)
-    {
-        gcpRendD3D->GetTiledShading().CreateResources();
-    }
-
-    gcpRendD3D->GetVolumetricFog().CreateResources();
-
-    // shadow mask
-    {
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && !RenderCapabilities::SupportsPLSExtension())
-        {
-            // Gmem only supports one shadow mask texture and it's saved on the alpha channel of the diffuse light acc texture.
-            CTexture::s_ptexShadowMask = CTexture::s_ptexCurrentSceneDiffuseAccMap;
-        }
-        else
-        {
-            if (CTexture::s_ptexShadowMask)
-            {
-                CTexture::s_ptexShadowMask->Invalidate(gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight(), eTF_R8G8B8A8);
-            }
-
-            if (!CTexture::IsTextureExist(CTexture::s_ptexShadowMask))
-            {
-#if defined(CRY_USE_METAL)
-                const int nArraySize = 1; // iOS currently only supports one shadow mask texture
-#else
-                const int nArraySize = (gcpRendD3D->CV_r_ShadowCastingLightsMaxCount + 3) / 4;
-#endif
-                CTexture::s_ptexShadowMask = CTexture::CreateTextureArray("$ShadowMask", eTT_2D, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight(), nArraySize, 1, FT_DONT_STREAM | FT_USAGE_RENDERTARGET, eTF_R8G8B8A8, TO_SHADOWMASK);
-            }
-        }
-    }
-
-    // height map AO mask
-    if (CRenderer::CV_r_HeightMapAO > 0)
-    {
-        const int nShift = clamp_tpl(3 - CRenderer::CV_r_HeightMapAO, 0, 2);
-        const int hmaoWidth = gcpRendD3D->GetWidth() >> nShift;
-        const int hmaoHeight =  gcpRendD3D->GetHeight() >> nShift;
-
-        for (int i = 0; i < 2; ++i)
-        {
-            if (CTexture::s_ptexHeightMapAO[i])
-            {
-                CTexture::s_ptexHeightMapAO[i]->Invalidate(hmaoWidth, hmaoHeight, eTF_R8G8);
-            }
-
-            if (!CTexture::IsTextureExist(CTexture::s_ptexHeightMapAO[i]))
-            {
-                char buf[128];
-                sprintf_s(buf, "$HeightMapAO_%d", i);
-
-                SD3DPostEffectsUtils::CreateRenderTarget(buf, CTexture::s_ptexHeightMapAO[i], hmaoWidth,  hmaoHeight, Clr_Neutral, true, false, eTF_R8G8);
-            }
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DestroyDeferredMaps()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct CubemapsCompare
-{
-    bool operator()(const SRenderLight& l0, const SRenderLight& l1) const
-    {
-        // Cubes sort by: Sort priority first, light radius, lastly by entity id (insertion order every frame is not guaranteed)
-        if (l0.m_nSortPriority != l1.m_nSortPriority)
-        {
-            return l0.m_nSortPriority < l1.m_nSortPriority;
-        }
-
-        if (fcmp(l0.m_fRadius, l1.m_fRadius))
-        {
-            return l0.m_nEntityId < l1.m_nEntityId;
-        }
-
-        return l0.m_fRadius > l1.m_fRadius;
-    }
-};
-
-struct CubemapsCompareInv
-{
-    bool operator()(const SRenderLight& l0, const SRenderLight& l1) const
-    {
-        // Cubes sort by: Sort priority first, light radius, lastly by entity id (insertion order every frame is not guaranteed)
-        if (l0.m_nSortPriority != l1.m_nSortPriority)
-        {
-            return l0.m_nSortPriority > l1.m_nSortPriority;
-        }
-
-        if (fcmp(l0.m_fRadius, l1.m_fRadius))
-        {
-            return l0.m_nEntityId > l1.m_nEntityId;
-        }
-
-        return l0.m_fRadius < l1.m_fRadius;
-    }
-};
-
-struct LightsCompare
-{
-    bool operator()(const SRenderLight& l0, const SRenderLight& l1) const
-    {
-        if (!(l0.m_Flags & DLF_CASTSHADOW_MAPS) && (l1.m_Flags & DLF_CASTSHADOW_MAPS))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-};
-
-struct DeffDecalSort
-{
-    bool operator()(const SDeferredDecal& decal0, const SDeferredDecal& decal1) const
-    {
-        uint bBump0 = (decal0.nFlags & DECAL_HAS_NORMAL_MAP);
-        uint bBump1 = (decal1.nFlags & DECAL_HAS_NORMAL_MAP);
-        //bump-mapped decals first
-        if (bBump0 !=  bBump1)
-        {
-            return (bBump0 < bBump1);
-        }
-        return
-            (decal0.nSortOrder < decal1.nSortOrder);
-    }
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CDeferredShading::SetupGmemPath()
-{
-#if !defined(NDEBUG)
-    bool bTiledDeferredShading = CRenderer::CV_r_DeferredShadingTiled >= 2;
-    assert(!bTiledDeferredShading); // NOT SUPPORTED IN GMEM PATH!
-#endif
-
-    SetupPasses();
-    TArray<SRenderLight>& rDeferredLights = m_pLights[eDLT_DeferredLight][m_nThreadID][m_nRecurseLevel];
-
-    m_bClearPool |= CRenderer::CV_r_ShadowPoolMaxFrames == 0;
-
-    m_nCurrentShadowPoolLight = 0;
-    m_nFirstCandidateShadowPoolLight = 0;
-
-#if !defined(_RELEASE)
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    rd->m_RP.m_PS[m_nThreadID].m_NumShadowPoolFrustums = 0;
-    rd->m_RP.m_PS[m_nThreadID].m_NumShadowPoolAllocsThisFrame = 0;
-    rd->m_RP.m_PS[m_nThreadID].m_NumShadowMaskChannels = 0;
-#endif
-
-    SortLigths(rDeferredLights);
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLights)
-    {
-        PackAllShadowFrustums(rDeferredLights, true);
-    }
-}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::AmbientOcclusionPasses()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (CRenderer::CV_r_DeferredShadingTiled >= 2)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("AO_APPLY");
-
-    SpecularAccEnableMRT(false);
-
-    rd->EF_Scissor(false, 0, 0, 0, 0);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.f, DBT_SKY_CULL_DEPTH, true); // skip sky and near objects for SSAO/LPVs
-    }
-    SpecularAccEnableMRT(true);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DebugShadowMaskClear()
-{
-    // This function is only useful when shadows get turned off at run-time.
-    // TODO: should only clear once when shadows get turned off... not every frame!
-    // For GMEM, we by-pass this function completely as the RT has don't care actions set.
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        return;
-    }
-
-#ifndef _RELEASE
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    static const ICVar* pCVarShadows = iConsole->GetCVar("e_Shadows");
-    if ((pCVarShadows && pCVarShadows->GetIVal() == 0) || CRenderer::CV_r_ShadowPass == 0)
-    {
-        rd->FX_ClearTarget(CTexture::s_ptexBackBuffer, Clr_Transparent);
-    }
-#endif
-}
-
-void CDeferredShading::SortLigths(TArray<SRenderLight>& ligths) const
-{
-    if (CRenderer::CV_r_DeferredShadingSortLights <= 0 || ligths.size() <= 1)
-    {
-        return;
-    }
-
-    int swapPos = -1;
-    if (CRenderer::CV_r_DeferredShadingSortLights == 2 ||
-        CRenderer::CV_r_DeferredShadingSortLights == 3)
-    {
-        // Sort the lights so we process the ones that are packed first.
-        // This reduce the probability of trashing the shadowmap.
-        for (size_t i = 0; i < ligths.Num(); ++i)
-        {
-            const SRenderLight& light = ligths[i];
-            bool isPacked = m_shadowPoolAlloc.end() != AZStd::find_if(m_shadowPoolAlloc.begin(), m_shadowPoolAlloc.end(), [&light](const SShadowAllocData& data) {return data.m_lightID == light.m_nEntityId; });
-            if (isPacked)
-            {
-                ++swapPos;
-                if (i != swapPos)
-                {
-                    AZStd::swap(ligths[i], ligths[swapPos]);
-                }
-            }
-        }
-    }
-
-    if (CRenderer::CV_r_DeferredShadingSortLights == 1 ||
-        CRenderer::CV_r_DeferredShadingSortLights == 3)
-    {
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-        auto sortFunc = [&rd](const SRenderLight& lhs, const SRenderLight& rhs)
-        {
-            // First compare by influence area in screen area (bigger area goes first)
-            // If they have the same area then render the closest to the camera first
-            // If they are at the same distance then just use the entityId (to break the tie)
-            int lhsSize = lhs.m_sWidth * lhs.m_sHeight;
-            int rhsSize = rhs.m_sWidth * rhs.m_sHeight;
-            if (lhsSize == rhsSize)
-            {
-                Vec3 cameraPos = rd->GetCamera().GetPosition();
-                float lhsDistance = cameraPos.GetDistance(lhs.GetPosition());
-                float rhsDistance = cameraPos.GetDistance(rhs.GetPosition());
-                return lhsDistance == rhsDistance ? lhs.m_nEntityId < rhs.m_nEntityId : lhsDistance < rhsDistance;
-            }
-
-            return lhsSize > rhsSize;
-        };
-
-        // Sort in two halfs so we don't break the previous order. 
-        // The first half are the lights that are already packed (if r_DeferredShadingSortLights = 3).
-        // The second half are the rest of the lights. 
-        SRenderLight* firstHalfElement = swapPos < 0 ? ligths.end() : ligths.begin() + swapPos + 1;
-        AZStd::sort(ligths.begin(), firstHalfElement, sortFunc);
-        // Check if there's even a second half.
-        if (firstHalfElement != ligths.end())
-        {
-            AZStd::sort(firstHalfElement, ligths.end(), sortFunc);
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::Render()
-{
-    m_nLightsProcessedCount = 0;
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    uint64 nFlagsShaderRT = rd->m_RP.m_FlagsShader_RT;
-
-    rd->FX_ResetPipe();
-
-    SetupPasses();
-
-    // Calculate screenspace scissor bounds
-    CalculateLightScissorBounds();
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-#ifndef _RELEASE
-        rd->m_RP.m_PS[m_nThreadID].m_NumShadowPoolFrustums = 0;
-        rd->m_RP.m_PS[m_nThreadID].m_NumShadowPoolAllocsThisFrame = 0;
-        rd->m_RP.m_PS[m_nThreadID].m_NumShadowMaskChannels = 0;
-#endif
-    }
-
-    TArray<SRenderLight>& rDeferredLights                       = m_pLights[eDLT_DeferredLight][m_nThreadID][m_nRecurseLevel];
-    TArray<SRenderLight>& rDeferredCubemaps                 = m_pLights[eDLT_DeferredCubemap][m_nThreadID][m_nRecurseLevel];
-    TArray<SRenderLight>& rDeferredAmbientLights        = m_pLights[eDLT_DeferredAmbientLight][m_nThreadID][m_nRecurseLevel];
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.f, DBT_SKY_CULL_DEPTH, true); // skip sky for ambient and deferred cubemaps
-    }
-    int iTempX, iTempY, iWidth, iHeight;
-    rd->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    bool bOutdoorVisible = false;
-    PrepareClipVolumeData(bOutdoorVisible);
-
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        rd->FX_GmemTransition(CD3D9Renderer::eGT_POST_Z_PRE_DEFERRED);
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingScissor)
-    {
-        rd->EF_Scissor(false, 0, 0, 0, 0);
-    }
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        SortLigths(rDeferredLights);
-        FilterGBuffer();
-
-        // Generate directional occlusion information
-        DirectionalOcclusionPass();
-
-        // Generate glossy screenspace reflections
-        ScreenSpaceReflectionPass();
-
-        m_bClearPool = (CRenderer::CV_r_ShadowPoolMaxFrames > 0) ? false : true;
-
-        m_nCurrentShadowPoolLight = 0;
-        m_nFirstCandidateShadowPoolLight = 0;
-
-        PackAllShadowFrustums(rDeferredLights, true);
-
-        rd->FX_PushRenderTarget(0, m_pLBufferDiffuseRT, &gcpRendD3D->m_DepthBufferOrigMSAA, -1, false, 1);
-        rd->FX_PushRenderTarget(1, m_pLBufferSpecularRT, NULL, -1, false, 1);
-        m_bSpecularState = true;
-    }
-
-    // sort lights
-    if (rDeferredCubemaps.Num())
-    {
-        if (CRenderer::CV_r_DeferredShadingTiled <= 1)
-        {
-            std::sort(rDeferredCubemaps.begin(), rDeferredCubemaps.end(), CubemapsCompare());
-        }
-        else
-        {
-            std::sort(rDeferredCubemaps.begin(), rDeferredCubemaps.end(), CubemapsCompareInv());
-        }
-    }
-
-    rd->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ZERO);
-
-
-    if (gRenDev->GetWireframeMode())
-    {
-        rd->FX_ClearTarget(m_pLBufferDiffuseRT);
-        rd->FX_ClearTarget(m_pLBufferSpecularRT);
-        rd->FX_ClearTarget(&gcpRendD3D->m_DepthBufferOrigMSAA, CLEAR_STENCIL, Clr_Unused.r, 1);
-        rd->m_nStencilMaskRef = 1;// Stencil initialized to 1 - 0 is reserved for MSAAed samples
-    }
-
-    rd->RT_SetViewport(0, 0, gRenDev->GetWidth(), gRenDev->GetHeight());
-
-    uint32 nCurrentDeferredCubemap = 0;
-
-    bool bTiledDeferredShading = CRenderer::CV_r_DeferredShadingTiled >= 2;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDebug == 2)
-    {
-        gcpRendD3D->m_RP.m_FlagsShader_RT |= RT_OVERDRAW_DEBUG;
-        bTiledDeferredShading = false;
-    }
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_Unlit)
-    {
-        bTiledDeferredShading = false;
-    }
-
-    // Currently cubemap atlas update is not working with OpenGL - remove when fixed
-#if defined(OPENGL)
-    bTiledDeferredShading = false;
-#endif //defined(OPENGL)
-
-    // determine if we have a global cubemap in the scene
-    SRenderLight* pGlobalCubemap = NULL;
-    AZ_PUSH_DISABLE_WARNING(, "-Wconstant-logical-operand")
-    if (rDeferredCubemaps.Num() && CRenderer::CV_r_DeferredShadingEnvProbes)
-    AZ_POP_DISABLE_WARNING
-    {
-        SRenderLight& pFirstLight = rDeferredCubemaps[0];
-        ITexture* pDiffuseCubeCheck = pFirstLight.GetDiffuseCubemap();
-        float fRadius = pFirstLight.m_fRadius;
-
-        if (pDiffuseCubeCheck && fRadius >= 100000.f)
-        {
-            pGlobalCubemap = &pFirstLight;
-            ++nCurrentDeferredCubemap;
-        }
-    }
-
-    if (!bTiledDeferredShading)
-    {
-        if (CRenderer::CV_r_DeferredShadingAmbient && AmbientPass(pGlobalCubemap, bOutdoorVisible))
-        {
-            m_nLightsProcessedCount++;
-        }
-
-        DeferredCubemaps(rDeferredCubemaps, nCurrentDeferredCubemap);
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingAmbientLights)
-        {
-            DeferredLights(rDeferredAmbientLights, false);
-        }
-
-        ApplySSReflections();  // TODO: Try to merge with another pass
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, 1.0f, false);
-    }
-
-    if (CRenderer::CV_r_DeferredShadingLights && !bTiledDeferredShading)
-    {
-        DeferredLights(rDeferredLights, true);
-    }
-
-    // SSAO affects all light accumulation. Todo: batch into deferred shading pass.
-    AmbientOcclusionPasses();
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingScissor)
-    {
-        rd->EF_Scissor(false, 0, 0, 0, 0);
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-    {
-        rd->SetDepthBoundTest(0.0f, 1.0f, false);
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_Unlit)
-    {
-        rd->FX_ClearTarget(m_pLBufferDiffuseRT, Clr_MedianHalf);
-        rd->FX_ClearTarget(m_pLBufferSpecularRT, Clr_Transparent);
-        rd->FX_ClearTarget(&gcpRendD3D->m_DepthBufferOrigMSAA, CLEAR_STENCIL, Clr_Unused.r, 0);
-
-    }
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        // Commit any potential render target changes - required for deprecated platform resolves, do not remove this plz.
-        rd->FX_SetActiveRenderTargets(false);
-
-        rd->FX_PopRenderTarget(0);
-        rd->FX_PopRenderTarget(1);
-        m_bSpecularState = false;
-
-        // Water volume caustics not supported in GMEM paths
-        rd->FX_WaterVolumesCaustics();
-    }
-
-    if (bTiledDeferredShading)
-    {
-        gcpRendD3D->GetTiledShading().Render(rDeferredCubemaps, rDeferredAmbientLights, rDeferredLights, m_vClipVolumeParams);
-
-        if (CRenderer::CV_r_DeferredShadingSSS)  // Explicitly disabling deferred SSS has its incompatible with msaa in current stage
-        {
-            DeferredSubsurfaceScattering(CTexture::s_ptexSceneTargetR11G11B10F[0]);
-        }
-
-        FurPasses::GetInstance().ExecuteObliteratePass();
-    }
-    else
-    {
-        // GPU light culling
-        if (CRenderer::CV_r_DeferredShadingTiled == 1)
-        {
-            // Sort cubemaps in inverse order for tiled forward shading
-            std::sort(rDeferredCubemaps.begin(), rDeferredCubemaps.end(), CubemapsCompareInv());
-
-            gcpRendD3D->GetTiledShading().Render(rDeferredCubemaps, rDeferredAmbientLights, rDeferredLights, m_vClipVolumeParams);
-        }
-
-        DeferredShadingPass();
-    }
-
-    rd->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-#ifndef _RELEASE
-    if (CRenderer::CV_r_DeferredShadingDebugGBuffer)
-    {
-        DebugGBuffer();
-    }
-#endif
-
-    DebugShadowMaskClear();
-
-    // Commit any potential render target changes - required for when shadows disabled
-    rd->FX_SetActiveRenderTargets(false);
-
-    rd->m_RP.m_FlagsShader_RT = nFlagsShaderRT;
-    rd->m_RP.m_PersFlags2 &= ~RBPF2_WRITEMASK_RESERVED_STENCIL_BIT;
-
-    rd->FX_ResetPipe();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::Release()
-{
-    DestroyDeferredMaps();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::GetScissors(const Vec3& vCenter, float fRadius, short& sX, short& sY, short& sWidth, short& sHeight) const
-{
-    Vec3 vViewVec = vCenter - gcpRendD3D->GetCamera().GetPosition();
-    float fDistToLS =  vViewVec.GetLength();
-
-    bool bInsideLightVolume = fDistToLS <= fRadius;
-    if (bInsideLightVolume)
-    {
-        sX = sY = 0;
-        sWidth = gcpRendD3D->GetWidth();
-        sHeight = gcpRendD3D->GetHeight();
-        return;
-    }
-
-    Matrix44 mProj, mView;
-    gcpRendD3D->GetProjectionMatrix(mProj.GetData());
-    gcpRendD3D->GetModelViewMatrix(mView.GetData());
-
-    Vec3 pBRectVertices[4];
-    Vec4 vCenterVS = Vec4(vCenter, 1) * mView;
-
-    {
-        // Compute tangent planes
-        float r = fRadius;
-        float sq_r = r * r;
-
-        Vec3 vLPosVS = Vec3(vCenterVS.x, vCenterVS.y, vCenterVS.z);
-        float lx = vLPosVS.x;
-        float ly = vLPosVS.y;
-        float lz = vLPosVS.z;
-        float sq_lx = lx * lx;
-        float sq_ly = ly * ly;
-        float sq_lz = lz * lz;
-
-        // Compute left and right tangent planes to light sphere
-        float sqrt_d = sqrt_tpl(max(sq_r * sq_lx  - (sq_lx + sq_lz) * (sq_r - sq_lz), 0.0f));
-        float nx = (r * lx + sqrt_d) / (sq_lx + sq_lz);
-        float nz = iszero(lz) ? 1.0f : (r - nx * lx) / lz;
-
-        Vec3 vTanLeft = Vec3(nx, 0, nz).normalized();
-
-        nx = (r * lx - sqrt_d) / (sq_lx + sq_lz);
-        nz = iszero(lz) ? 1.0f : (r - nx * lx) / lz;
-        Vec3 vTanRight = Vec3(nx, 0, nz).normalized();
-
-        pBRectVertices[0] = vLPosVS - r * vTanLeft;
-        pBRectVertices[1] = vLPosVS - r * vTanRight;
-
-        // Compute top and bottom tangent planes to light sphere
-        sqrt_d = sqrt_tpl(max(sq_r * sq_ly  - (sq_ly + sq_lz) * (sq_r - sq_lz), 0.0f));
-        float ny = (r * ly - sqrt_d) / (sq_ly + sq_lz);
-        nz = iszero(lz) ? 1.0f : (r - ny * ly) / lz;
-        Vec3 vTanBottom = Vec3(0, ny, nz).normalized();
-
-        ny = (r * ly + sqrt_d) / (sq_ly + sq_lz);
-        nz = iszero(lz) ? 1.0f : (r - ny * ly) / lz;
-        Vec3 vTanTop = Vec3(0, ny, nz).normalized();
-
-        pBRectVertices[2] = vLPosVS - r * vTanTop;
-        pBRectVertices[3] = vLPosVS - r * vTanBottom;
-    }
-
-    Vec2 vPMin = Vec2(1, 1);
-    Vec2 vPMax = Vec2(0, 0);
-    Vec2 vMin = Vec2(1, 1);
-    Vec2 vMax = Vec2(0, 0);
-
-    // Project all vertices
-    for (int i = 0; i < 4; i++)
-    {
-        Vec4 vScreenPoint = Vec4(pBRectVertices[i], 1.0) * mProj;
-
-        //projection space clamping
-        vScreenPoint.w = max(vScreenPoint.w, 0.00000000000001f);
-        vScreenPoint.x = max(vScreenPoint.x, -(vScreenPoint.w));
-        vScreenPoint.x = min(vScreenPoint.x, vScreenPoint.w);
-        vScreenPoint.y = max(vScreenPoint.y, -(vScreenPoint.w));
-        vScreenPoint.y = min(vScreenPoint.y, vScreenPoint.w);
-
-        //NDC
-        vScreenPoint /= vScreenPoint.w;
-
-        //output coords
-        //generate viewport (x=0,y=0,height=1,width=1)
-        Vec2 vWin;
-        vWin.x = (1.0f + vScreenPoint.x) *  0.5f;
-        vWin.y = (1.0f + vScreenPoint.y) *  0.5f;  //flip coords for y axis
-
-        assert(vWin.x >= 0.0f && vWin.x <= 1.0f);
-        assert(vWin.y >= 0.0f && vWin.y <= 1.0f);
-
-        // Get light sphere screen bounds
-        vMin.x = min(vMin.x, vWin.x);
-        vMin.y = min(vMin.y, vWin.y);
-        vMax.x = max(vMax.x, vWin.x);
-        vMax.y = max(vMax.y, vWin.y);
-    }
-
-    float fWidth = (float)gcpRendD3D->GetWidth();
-    float fHeight = (float)gcpRendD3D->GetHeight();
-
-    sX = (short)(vMin.x * fWidth);
-    sY = (short)((1.0f - vMax.y) * fHeight);
-    sWidth = (short)ceilf((vMax.x - vMin.x) * fWidth);
-    sHeight = (short)ceilf((vMax.y - vMin.y) * fHeight);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::SetupScissors(bool bEnable, uint16 x, uint16 y, uint16 w, uint16 h) const
-{
-    gcpRendD3D->EF_Scissor(bEnable, x, y, w, h);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::CalculateLightScissorBounds()
-{
-    // Update our light scissor bounds.
-    for (int lightType=0; lightType<eDLT_NumLightTypes; ++lightType)
-    {
-        TArray<SRenderLight>& lightArray = m_pLights[lightType][m_nThreadID][m_nRecurseLevel];
-        for (uint32 nCurrentLight = 0; nCurrentLight < lightArray.Num(); ++nCurrentLight)
-        {
-            SRenderLight& light = lightArray[nCurrentLight];
-            light.CalculateScissorRect();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::Debug()
-{
-    uint64 nFlagsShaderRT = gcpRendD3D->m_RP.m_FlagsShader_RT;
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingDebug == 2)
-    {
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, m_pDebugTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-        m_pLBufferDiffuseRT->Apply(0, m_nTexStatePoint);
-        SD3DPostEffectsUtils::SetTexture( CTextureManager::Instance()->GetDefaultTexture("PaletteDebug"), 1, FILTER_LINEAR, 1);
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(m_pLBufferDiffuseRT->GetWidth(), m_pLBufferDiffuseRT->GetHeight());
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT = nFlagsShaderRT;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::DebugGBuffer()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    static CCryNameTSCRC techShadingDebug("DebugGBuffer");
-
-    CTexture* dstTex = CTexture::s_ptexStereoR;
-
-    m_pDepthRT->Apply(0, m_nTexStatePoint);
-    m_pNormalsRT->Apply(1, m_nTexStatePoint);
-    m_pDiffuseRT->Apply(2, m_nTexStatePoint);
-    m_pSpecularRT->Apply(3, m_nTexStatePoint);
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-
-    rd->FX_PushRenderTarget(0, dstTex, NULL);
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, techShadingDebug, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    static CCryNameR paramName("DebugViewMode");
-    Vec4 param(CRenderer::CV_r_DeferredShadingDebugGBuffer, 0, 0, 0);
-    m_pShader->FXSetPSFloat(paramName, &param, 1);
-    SD3DPostEffectsUtils::DrawFullScreenTri(dstTex->GetWidth(), dstTex->GetHeight());
-    SD3DPostEffectsUtils::ShEndPass();
-    rd->FX_PopRenderTarget(0);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeferredShading::SetSSDOParameters(const int texSlot)
-{
-    if (CRenderer::CV_r_ssdo)
-    {
-        Vec4 ssdoParams(CRenderer::CV_r_ssdoAmountDirect, CRenderer::CV_r_ssdoAmountAmbient, CRenderer::CV_r_ssdoAmountReflection, 0);
-        static CCryNameR ssdoParamsName("SSDOParams");
-        m_pShader->FXSetPSFloat(ssdoParamsName, &ssdoParams, 1);
-        CTexture::s_ptexSceneNormalsBent->Apply(texSlot, m_nTexStatePoint);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Utility function for setting up and binding textures.
-// Calculates and sets texture transforms as well as mipLevel
-// If the ESetTexture_MipFactorProvided flag is set, the passed in mipLevelFactor will be used
-// If it isn't set, mipLevelFactor will be calculated and output for possible reuse with other textures
-ITexture* CDeferredShading::SetTexture(const SShaderItem& sItem, EEfResTextures tex, int slot, const RectF texRect, float surfaceSize, float& mipLevelFactor, int flags)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    AZ_Assert(0 <= slot, "Texture slot index must be positive");
-    AZ_Assert(slot < EMaxTextureSlots, "Only %d texture slots available", int(EMaxTextureSlots));
-    AZ_Assert(texRect.w * texRect.h > 0.f, "Texture rect has invalid dimensions");
-
-    ITexture* pTexture = nullptr;
-
-    if (SEfResTexture* pResTexture = sItem.m_pShaderResources->GetTextureResource((uint16)tex))
-    {
-        if (pResTexture->m_Sampler.m_pITex)
-        {
-            pTexture = pResTexture->m_Sampler.m_pITex;
-
-            // Shader HWSR_SAMPLE flag
-            if (flags & ESetTexture_HWSR)
-            {
-                // Asserts
-                const static int maxHWSRSample = HWSR_SAMPLE5;
-                static_assert((maxHWSRSample + 1) == HWSR_DEBUG0, "HWSR_SAMPLE5 is no longer the last HWSR_SAMPLE"); // If this assert triggers please ensure HWSR_SAMPLE5 is the last HWSR_SAMPLE
-                AZ_Assert(slot <= (maxHWSRSample - HWSR_SAMPLE0), "Slot index too big to set HWSR_SAMPLE");
-
-                // Set HWSR slot
-                rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0 + slot];
-            }
-
-            // Texture transform
-            if (flags & ESetTexture_Transform)
-            {
-                // Texture matrix
-                Matrix44 texMatrix;
-                if (pResTexture->IsHasModificators())
-                {
-                    pResTexture->UpdateWithModifier(tex);
-                    texMatrix = pResTexture->m_Ext.m_pTexModifier->m_TexMatrix;
-                }
-                else
-                {
-                    texMatrix.SetIdentity();
-                }
-
-                // If mip level factor not provided, calculate it
-                if (!(flags & ESetTexture_MipFactorProvided))
-                {
-                    //                 tan(fov) * (textureSize * tiling / decalSize) * distance
-                    // MipLevel = log2 --------------------------------------------------------
-                    //                 screenResolution * dot(viewVector, decalNormal)
-
-                    const float screenRes = (float)rd->GetWidth() * 0.5f + (float)rd->GetHeight() * 0.5f;
-                    const float texScale = max(texMatrix.GetColumn(0).GetLength() * texRect.w, texMatrix.GetColumn(1).GetLength() * texRect.h);
-                    mipLevelFactor = (tan(rd->GetCamera().GetFov()) * texScale) / (surfaceSize * screenRes);
-                }
-                float fMipLevel = mipLevelFactor * (float)max(pTexture->GetWidth(), pTexture->GetHeight());
-
-                // Set transform (don't forget to bind m_vTextureTransforms after calls to this function)
-                m_vTextureTransforms[slot][0] = Vec4(texRect.w * texMatrix.m00, texRect.h * texMatrix.m10, texRect.x * texMatrix.m00 + texRect.y * texMatrix.m10 + texMatrix.m30, fMipLevel);
-                m_vTextureTransforms[slot][1] = Vec4(texRect.w * texMatrix.m01, texRect.h * texMatrix.m11, texRect.x * texMatrix.m01 + texRect.y * texMatrix.m11 + texMatrix.m31, 0.0f);
-            }
-            else if (flags & ESetTexture_MipFactorProvided)
-            {
-                // Mip level
-                float fMipLevel = mipLevelFactor * (float)max(pTexture->GetWidth(), pTexture->GetHeight());
-                m_vTextureTransforms[slot][0].w = fMipLevel;
-            }
-             
-            // Texture state
-            STexState texState;
-            texState.SetFilterMode(FILTER_TRILINEAR);
-            texState.m_bSRGBLookup = (flags & ESetTexture_bSRGBLookup) != 0;
-            texState.SetClampMode( pResTexture->m_bUTile ? TADDR_WRAP : TADDR_CLAMP,
-                                   pResTexture->m_bVTile ? TADDR_WRAP : TADDR_CLAMP,
-                                   TADDR_CLAMP);
-
-            // Set Texture
-            ((CTexture*)pTexture)->Apply(slot, CTexture::GetTexState(texState));
-        }
-    }
-
-    // Default texture
-    if ((flags & ESetTexture_AllowDefault) && (pTexture == nullptr))
-    {
-        ITexture* pTex = TextureHelpers::LookupTexDefault(tex);
-        SD3DPostEffectsUtils::SetTexture((CTexture*)pTex, slot, FILTER_TRILINEAR, 0);
-    }
-
-    return pTexture;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-uint32 CRenderer::EF_GetDeferredLightsNum(const eDeferredLightType eLightType /*= eDLT_DeferredLight*/)
-{
-    return CDeferredShading::Instance().GetLightsNum(eLightType);
-}
-
-TArray<SRenderLight>* CRenderer::EF_GetDeferredLights(const SRenderingPassInfo& passInfo, const eDeferredLightType eLightType /*= eDLT_DeferredLight*/)
-{
-    uint32 nThreadID = passInfo.ThreadID();
-    int32 nRecurseLevel = passInfo.GetRecursiveLevel();
-
-#ifndef _RELEASE
-    if (nRecurseLevel < 0)
-    {
-        __debugbreak();
-    }
-#endif
-
-    return &CDeferredShading::Instance().GetLights(nThreadID, nRecurseLevel, eLightType);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-int CRenderer::EF_AddDeferredLight(const CDLight& pLight, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter)
-{
-    int nLightID = -1;
-    CDeferredShading& pDS = CDeferredShading::Instance();
-    nLightID = pDS.AddLight(pLight, fMult, passInfo, rendItemSorter);
-
-    int nThreadID = m_RP.m_nFillThreadID;
-    float mipFactor =  (m_RP.m_TI[nThreadID].m_cam.GetPosition() - pLight.m_Origin).GetLengthSquared() / max(0.001f, pLight.m_fRadius * pLight.m_fRadius);
-    EF_PrecacheResource(const_cast<CDLight*>(&pLight), mipFactor, 0.1f, FPR_STARTLOADING, gRenDev->m_RP.m_TI[nThreadID].m_arrZonesRoundId[1]);
-    return nLightID;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CRenderer::EF_ClearDeferredLightsList()
-{
-    if (CDeferredShading::IsValid())
-    {
-        CDeferredShading::Instance().ResetLights();
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CRenderer::EF_ReleaseDeferredData()
-{
-    if (CDeferredShading::IsValid())
-    {
-        CDeferredShading::Instance().ReleaseData();
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CRenderer::EF_ClearDeferredClipVolumesList()
-{
-    if (CDeferredShading::IsValid())
-    {
-        CDeferredShading::Instance().ResetClipVolumes();
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-uint8 CRenderer::EF_AddDeferredClipVolume(const IClipVolume* pClipVolume)
-{
-    if (CDeferredShading::IsValid() && pClipVolume)
-    {
-        return CDeferredShading::Instance().AddClipVolume(pClipVolume);
-    }
-
-    return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-bool CRenderer::EF_SetDeferredClipVolumeBlendData(const IClipVolume* pVolume, const SClipVolumeBlendInfo& blendInfo)
-{
-    if (CDeferredShading::IsValid())
-    {
-        return CDeferredShading::Instance().SetClipVolumeBlendData(pVolume, blendInfo);
-    }
-
-    return false;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SRenderLight* CRenderer::EF_GetDeferredLightByID(const uint16 nLightID, const eDeferredLightType eLightType)
-{
-    return CDeferredShading::Instance().GetLightByID(nLightID, eLightType);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_DeferredRendering(bool bDebugPass, bool bUpdateRTOnly)
-{
-    CDeferredShading& pDS = CDeferredShading::Instance();
-
-    if (!CTexture::s_ptexSceneTarget)
-    {
-        pDS.Release();
-        return false;
-    }
-
-    if (bUpdateRTOnly)
-    {
-        pDS.CreateDeferredMaps();
-        return true;
-    }
-
-    if (!bDebugPass)
-    {
-        pDS.Render();
-    }
-    else
-    {
-        pDS.Debug();
-    }
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool IsDeferredDecalsSupported()
-{
-    bool isSupported = true;
-    // For deferred decals we need to access the Normals and Linearize Depth. In GMEM both textures are bound as RT at this point.
-    // Check if we can access both of them to see if we support Deferred Decals.
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        RenderCapabilities::FrameBufferFetchMask capabilities = RenderCapabilities::GetFrameBufferFetchCapabilities();
-        isSupported =   (capabilities.test(RenderCapabilities::FBF_ALL_COLORS)) || // We can access to the Normals and Linearize depth render targets directly.
-                        ((capabilities.test(RenderCapabilities::FBF_COLOR0)) && (capabilities.test(RenderCapabilities::FBF_DEPTH))); // Normals are in COLOR0 and with access to the Depth buffer we can linearize in the shader.
-    }
-
-    return isSupported;
-}
-
-bool CD3D9Renderer::FX_DeferredDecals()
-{
-    if IsCVarConstAccess(constexpr) (!CV_r_deferredDecals)
-    {
-        return false;
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    uint32 nThreadID = rd->m_RP.m_nProcessThreadID;
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nRecurseLevel >= 0);
-
-    DynArray<SDeferredDecal>& deferredDecals = rd->m_RP.m_DeferredDecals[nThreadID][nRecurseLevel];
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DDEFERREDSHADING_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(D3DDeferredShading_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    // Want the buffer cleared or we'll just get black out
-    if (deferredDecals.empty())
-    {
-        return false;
-    }
-#endif
-
-    if (!IsDeferredDecalsSupported())
-    {
-        AZ_Warning("Rendering", false, "Deferred decals is not supported in the current configuration");
-        return false;
-    }
-
-    PROFILE_LABEL_SCOPE("DEFERRED_DECALS");
-
-    CDeferredShading& rDS = CDeferredShading::Instance();
-    rDS.SetupPasses();
-
-    if (eGT_256bpp_PATH == gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && CRenderer::CV_r_DeferredShadingLBuffersFmt != 2)
-    {
-        // GMEM 256bpp path copies normals temporarily to the diffuse light buffer (rgba16) if it exists.
-        uint32 prevState = m_RP.m_CurState;
-        uint32 newState = 0;
-        FX_SetState(newState);
-        SD3DPostEffectsUtils::PrepareGmemDeferredDecals();
-        FX_SetState(prevState);
-    }
-    else if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        ID3D11Texture2D* pBBRes = CTexture::s_ptexBackBuffer->GetDevTexture()->Get2DTexture();
-        ID3D11Texture2D* pNMRes = NULL;
-
-        assert(CTexture::s_ptexBackBuffer->m_pPixelFormat->DeviceFormat == CTexture::s_ptexSceneNormalsMap->m_pPixelFormat->DeviceFormat);
-
-        if (rd->m_RP.m_MSAAData.Type > 1) //always copy when deferredDecals is not empty
-        {
-            pNMRes = (D3DTexture*)CTexture::s_ptexSceneNormalsMap->m_pRenderTargetData->m_pDeviceTextureMSAA->Get2DTexture();
-            rd->GetDeviceContext().ResolveSubresource(pBBRes, 0, pNMRes, 0, (DXGI_FORMAT)CTexture::s_ptexBackBuffer->m_pPixelFormat->DeviceFormat);
-        }
-        else
-        {
-            pNMRes = CTexture::s_ptexSceneNormalsMap->GetDevTexture()->Get2DTexture();
-            rd->GetDeviceContext().CopyResource(pBBRes, pNMRes);
-        }
-    }
-
-    std::stable_sort(deferredDecals.begin(), deferredDecals.end(), DeffDecalSort());
-
-    //if (CV_r_deferredDecalsDebug == 0)
-    //  rd->FX_PushRenderTarget(1, CTexture::s_ptexSceneNormalsMap, NULL);
-
-    const uint32 nNumDecals = deferredDecals.size();
-    for (uint32 d = 0; d < nNumDecals; ++d)
-    {
-        rDS.DeferredDecalPass(deferredDecals[d], d);
-    }
-
-    //if (CV_r_deferredDecalsDebug == 0)
-    //  rd->FX_PopRenderTarget(1);
-
-    rd->SetCullMode(R_CULL_BACK);
-
-    // Commit any potential render target changes - required for when shadows disabled
-    rd->FX_SetActiveRenderTargets(false);
-    rd->FX_ResetPipe();
-
-    return true;
-}
-
-// Renders emissive part of all deferred decals
-// This is called after the deferred lighting resolve since emissive
-// lighting is additive in relation to diffuse and specular 
-// Called by CD3D9Renderer::FX_RenderForwardOpaque
-bool CD3D9Renderer::FX_DeferredDecalsEmissive()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if IsCVarConstAccess(constexpr) (!CV_r_deferredDecals)
-        return false;
-
-    if (!IsDeferredDecalsSupported())
-    {
-        return false;
-    }
-
-    uint32 nThreadID = rd->m_RP.m_nProcessThreadID;
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nRecurseLevel >= 0);
-
-    DynArray<SDeferredDecal>& deferredDecals = rd->m_RP.m_DeferredDecals[nThreadID][nRecurseLevel];
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DDEFERREDSHADING_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(D3DDeferredShading_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    // Want the buffer cleared or we'll just get black out
-    if (deferredDecals.empty())
-    {
-        return false;
-    }
-#endif
-
-    PROFILE_LABEL_SCOPE("DEFERRED_DECALS");
-
-    CDeferredShading& rDS = CDeferredShading::Instance();
-
-    const uint32 nNumDecals = deferredDecals.size();
-    for (uint32 d = 0; d < nNumDecals; ++d)
-    {
-        rDS.DeferredDecalEmissivePass(deferredDecals[d], d);
-    }
-
-    rd->SetCullMode(R_CULL_BACK);
-
-    // Commit any potential render target changes - required for when shadows disabled
-    rd->FX_SetActiveRenderTargets(false);
-    rd->FX_ResetPipe();
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CREDeferredShading::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    if (gcpRendD3D->m_bDeviceLost)
-    {
-        return 0;
-    }
-
-    gcpRendD3D->FX_DeferredRendering();
-    return true;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredShading.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredShading.h
deleted file mode 100644
index 3837a1740c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredShading.h
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DDEFERREDSHADING_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DDEFERREDSHADING_H
-#pragma once
-struct IVisArea;
-
-enum EDecalType
-{
-    DTYP_DARKEN,
-    DTYP_BRIGHTEN,
-    DTYP_ALPHABLEND,
-    DTYP_ALPHABLEND_AND_BUMP,
-    DTYP_ALPHABLEND_SPECULAR,
-    DTYP_DARKEN_LIGHTBUF,
-    DTYP_NUM,
-};
-
-#define MAX_DEFERRED_CLIP_VOLUMES 64
-// Note: 2 stencil values reserved for stencil+outdoor fragments
-#define VIS_AREAS_OUTDOOR_STENCIL_OFFSET 2
-
-class CTexPoolAtlas;
-
-struct SShadowAllocData
-{
-    int         m_lightID;
-    uint16  m_blockID;
-    uint8       m_side;
-    uint8       m_frameID;
-
-    void Clear(){ m_blockID = 0xFFFF; m_lightID = -1; m_frameID = 0; }
-    bool isFree() { return (m_blockID == 0xFFFF) ? true : false; }
-
-    SShadowAllocData(){ Clear(); }
-    ~SShadowAllocData(){ Clear(); }
-};
-
-class CDeferredShading
-{
-public:
-
-    static inline bool IsValid()
-    {
-        return m_pInstance != NULL;
-    }
-
-    static CDeferredShading& Instance()
-    {
-        return (*m_pInstance);
-    }
-
-    void Render();
-    void SetupPasses();
-    void SetupGlobalConsts();
-
-
-    // This will setup shadows and sort lights.
-    // It is called before Z-Pass and is used so that we don't have
-    // to resolve any buffers because of shadows setup during deferred passes.
-    void SetupGmemPath();
-
-
-    //shadows
-    void ResolveCurrentBuffers();
-    void RestoreCurrentBuffers();
-    bool PackAllShadowFrustums(TArray<SRenderLight>& arrLights, bool bPreLoop);
-    void DebugShadowMaskClear();
-    bool PackToPool(CPowerOf2BlockPacker* pBlockPack, SRenderLight& light, bool bClearPool);
-
-    void FilterGBuffer();
-    void AmbientOcclusionPasses();
-    void PrepareClipVolumeData(bool& bOutdoorVisible);
-    void RenderClipVolumesToStencil(int nStencilInsideBit);
-    void RenderPortalBlendValues(int nStencilInsideBit);
-    bool AmbientPass(SRenderLight* pGlobalCubemap, bool& bOutdoorVisible);
-
-    bool DeferredDecalPass(const SDeferredDecal& rDecal, uint32 indDecal);
-    void DeferredDecalEmissivePass(const SDeferredDecal& rDecal, uint32 indDecal);
-    bool ShadowLightPasses(const SRenderLight& light);
-    void DrawDecalVolume(const SDeferredDecal& rDecal, Matrix44A& mDecalLightProj, ECull volumeCull);
-    void DrawLightVolume(EShapeMeshType meshType, const Matrix44& mVolumeToWorld, const Vec4& vSphereAdjust = Vec4(ZERO));
-    void LightPass(const SRenderLight* const __restrict pDL, bool bForceStencilDisable = false);
-    void DeferredCubemaps(const TArray<SRenderLight>& rCubemaps, const uint32 nStartIndex = 0);
-    void DeferredCubemapPass(const SRenderLight* const __restrict pDL);
-    void ScreenSpaceReflectionPass();
-    void ApplySSReflections();
-    void DirectionalOcclusionPass();
-    void HeightMapOcclusionPass(ShadowMapFrustum*& pHeightMapFrustum, CTexture*& pHeightMapAOScreenDepth, CTexture*& pHeightmapAO);
-    void DeferredLights(TArray<SRenderLight>& rLights, bool bCastShadows);
-
-    void DeferredSubsurfaceScattering(CTexture* tmpTex);
-    void DeferredShadingPass();
-
-    void CreateDeferredMaps();
-    void DestroyDeferredMaps();
-    void Release();
-    void Debug();
-    void DebugGBuffer();
-
-    //! Adds a light to the list of lights to be rendered.
-    //! \param pDL               Light to be rendered
-    //! \param fMult             Multiplier that will be applied to the light's intensity. For example, use this to fade out lights as they exceed distance thresholds.
-    //! \param passInfo          Standard SRenderingPassInfo, send to EF_AddEf()
-    //! \param rendItemSorter    Standard SRendItemSorter, send to EF_AddEf()
-    uint32 AddLight(const CDLight& pDL, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter);
-
-    inline uint8 AddClipVolume(const IClipVolume* pClipVolume);
-    inline bool SetClipVolumeBlendData(const IClipVolume* pClipVolume, const SClipVolumeBlendInfo& blendInfo);
-
-    inline void ResetLights();
-    inline void ResetClipVolumes();
-
-    // Renderer must be flushed
-    void ResetAllLights();
-    void ResetAllClipVolumes();
-
-    // called in between levels to free up memory
-    void ReleaseData();
-
-    TArray<SRenderLight>& GetLights(const int nThreadID, const int nCurRecLevel, const eDeferredLightType eType = eDLT_DeferredLight);
-    SRenderLight* GetLightByID(const uint16 nLightID, const eDeferredLightType eType = eDLT_DeferredLight);
-    uint32 GetLightsNum(const eDeferredLightType eType);
-    void GetClipVolumeParams(const Vec4*& pParams, uint32& nCount);
-    CTexture* GetResolvedStencilRT() { return m_pResolvedStencilRT; }
-    void GetLightRenderSettings(const SRenderLight* const __restrict pDL, bool& bStencilMask, bool& bUseLightVolumes, EShapeMeshType& meshType);
-
-    inline uint32 GetLightsCount() const
-    {
-        return m_nLightsProcessedCount;
-    }
-
-    inline Vec4 GetLightDepthBounds(const SRenderLight* pDL, bool bReverseDepth) const
-    {
-        float fRadius = pDL->m_fRadius;
-        if (pDL->m_Flags & DLF_AREA_LIGHT) // Use max for area lights.
-        {
-            fRadius += max(pDL->m_fAreaWidth, pDL->m_fAreaHeight);
-        }
-        else if (pDL->m_Flags & DLF_DEFERRED_CUBEMAPS)
-        {
-            fRadius = pDL->m_ProbeExtents.len(); // This is not optimal for a box
-        }
-        return GetLightDepthBounds(pDL->m_Origin, fRadius, bReverseDepth);
-    }
-
-    inline Vec4 GetLightDepthBounds(const Vec3& vCenter, float fRadius, bool bReverseDepth) const
-    {
-        if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_DeferredShadingDepthBoundsTest)
-        {
-            return Vec4(0.0f, 0.0f, 1.0f, 1.0f);
-        }
-
-        float fMinZ = 0.0f, fMaxZ = 1.0f;
-        float fMinW = 0.0f, fMaxW = 1.0f;
-
-        Vec3 pBounds = m_pCamFront * fRadius;
-        Vec3 pMax = vCenter - pBounds;
-        Vec3 pMin = vCenter + pBounds;
-
-        fMinZ = m_mViewProj.m20 * pMin.x + m_mViewProj.m21 * pMin.y + m_mViewProj.m22 * pMin.z + m_mViewProj.m23;
-        fMinW = m_mViewProj.m30 * pMin.x + m_mViewProj.m31 * pMin.y + m_mViewProj.m32 * pMin.z + m_mViewProj.m33;
-
-        float fMinDivisor = (float)fsel(-fabsf(fMinW), 1.0f, fMinW);
-        fMinZ = (float)fsel(-fabsf(fMinW), 1.0f, fMinZ / fMinDivisor);
-        fMinZ = (float)fsel(fMinW, fMinZ, bReverseDepth ? 1.0f : 0.0f);
-        
-
-        fMaxZ = m_mViewProj.m20 * pMax.x + m_mViewProj.m21 * pMax.y + m_mViewProj.m22 * pMax.z + m_mViewProj.m23;
-        fMaxW = m_mViewProj.m30 * pMax.x + m_mViewProj.m31 * pMax.y + m_mViewProj.m32 * pMax.z + m_mViewProj.m33;
-        float fMaxDivisor = (float)fsel(-fabsf(fMaxW), 1.0f, fMaxW);
-        fMaxZ = (float)fsel(-fabsf(fMaxW), 1.0f, fMaxZ / fMaxDivisor);
-        fMaxZ = (float)fsel(fMaxW, fMaxZ, bReverseDepth ? 1.0f : 0.0f);
-
-        if (bReverseDepth)
-        {
-            std::swap(fMinZ, fMaxZ);           
-        }
-
-        fMinZ = clamp_tpl(fMinZ, 0.000001f, 1.f);
-        fMaxZ = clamp_tpl(fMaxZ, fMinZ, 1.f);
-
-        return Vec4(fMinZ, max(fMinW, 0.000001f), fMaxZ, max(fMaxW, 0.000001f));
-    }
-
-    void GetScissors(const Vec3& vCenter, float fRadius, short& sX, short& sY, short& sWidth, short& sHeight) const;
-    void SetupScissors(bool bEnable, uint16 x, uint16 y, uint16 w, uint16 h) const;
-
-    // Calculate the individual screen-space scissor bounds for all of our bound lights
-    void CalculateLightScissorBounds();
-
-    const Matrix44A& GetCameraProjMatrix() const { return m_mViewProj; }
-
-    void SortLigths(TArray<SRenderLight>& ligths) const;
-
-private:
-    void SetSSDOParameters(const int texSlot);
-    ITexture* SetTexture(const SShaderItem& sItem, EEfResTextures tex, int slot, const RectF texRect, float surfaceSize, float& mipLevelFactor, int flags);
-
-    // Flags used for the above SetTexture function
-    enum ESetTextureFlags : uint32
-    {
-        ESetTexture_Transform           = 1 << 0,   // Will calculate 2 Vec3s used for transforming tex coords in the shader
-        ESetTexture_HWSR                = 1 << 1,   // Will set the HWSR_SAMPLE flag for the specified slot
-        ESetTexture_bSRGBLookup         = 1 << 2,   // Value to set on the STexState
-        ESetTexture_AllowDefault        = 1 << 3,   // Whether a default texture should be used as backup
-        ESetTexture_MipFactorProvided   = 1 << 4,   // Whether to use the mipLevelFactor provide or calculate our own and output it to the same parameter
-    };
-
-    enum
-    {
-        // Number of textures available in PostEffectsLib.cfi (_tex0 to _texF)
-        EMaxTextureSlots = 16,
-    };
-
-    CDeferredShading()
-    {
-        m_pShader = 0;
-        m_pTechName = "DeferredLightPass";
-        m_pAmbientOutdoorTechName = "AmbientPass";
-        m_pCubemapsTechName = "DeferredCubemapPass";
-        m_pCubemapsVolumeTechName = "DeferredCubemapVolumePass";
-        m_pReflectionTechName = "SSR_Raytrace";
-        m_pDebugTechName = "Debug";
-        m_pDeferredDecalTechName = "DeferredDecal";
-        m_pLightVolumeTechName = "DeferredLightVolume";
-
-        m_pParamLightPos = "g_LightPos";
-        m_pParamLightProjMatrix = "g_mLightProj";
-        m_pGeneralParams = "g_GeneralParams";
-        m_pParamLightDiffuse = "g_LightDiffuse";
-
-        m_pParamAmbient = "g_cDeferredAmbient";
-        m_pParamAmbientGround = "g_cAmbGround";
-        m_pParamAmbientHeight = "g_vAmbHeightParams";
-
-        m_pAttenParams = "g_vAttenParams";
-
-        m_pParamDecalTS = "g_mDecalTS";
-        m_pParamDecalDiffuse = "g_DecalDiffuse";
-        m_pParamDecalAngleAttenuation = "g_DecalAngleAttenuation";
-        m_pParamDecalSpecular = "g_DecalSpecular";
-        m_pParamDecalMipLevels = "g_DecalMipLevels";
-        m_pParamDecalEmissive = "g_DecalEmissive";
-        m_pParamTexTransforms = "g_texTransforms";
-        m_pClipVolumeParams = "g_vVisAreasParams";
-
-        m_pLBufferDiffuseRT = CTexture::s_ptexCurrentSceneDiffuseAccMap;
-        m_pLBufferSpecularRT = CTexture::s_ptexSceneSpecularAccMap;
-        m_pNormalsRT = CTexture::s_ptexSceneNormalsMap;
-        m_pDepthRT = CTexture::s_ptexZTarget;
-        m_pMSAAMaskRT = CTexture::s_ptexBackBuffer;
-        m_pResolvedStencilRT =  CTexture::s_ptexStereoR;
-        
-        m_pDiffuseRT = CTexture::s_ptexSceneDiffuse;
-        m_pSpecularRT = CTexture::s_ptexSceneSpecular;
-
-        memset(m_vClipVolumeParams, 0, sizeof(Vec4) * (MAX_DEFERRED_CLIP_VOLUMES));
-
-        m_nLightsProcessedCount = 0;
-
-        m_nCurLighID = -1;
-
-        m_nWarningFrame = 0;
-
-        m_bSpecularState = false;
-
-        m_nShadowPoolSize = 0;
-
-        for (int i = 0; i < MAX_GPU_NUM; ++i)
-        {
-            m_prevViewProj[i].SetIdentity();
-        }
-
-        m_nRenderState = GS_BLSRC_ONE | GS_BLDST_ONE;
-
-        m_nTexStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-        m_nTexStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-        m_nThreadID = 0;
-        m_nRecurseLevel = 0;
-
-        m_nBindResourceMsaa = -1;
-
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-        {
-            for (int j = 0; j < MAX_REND_RECURSION_LEVELS; ++j)
-            {
-                m_nClipVolumesCount[i][j] = 0;
-                m_nVisAreasGIRef[i][j] = 0;
-            }
-        }
-    }
-
-    ~CDeferredShading()
-    {
-        Release();
-    }
-
-    // Allow disable mrt usage: for double zspeed and on other passes less fillrate hit
-    // @return - Returns true if either a push or a pop was performed in this function.  Returns false if no push or pop was executed.
-    bool SpecularAccEnableMRT(bool bEnable);
-
-private:
-
-    struct SVisAreaBlendData
-    {
-        uint8 nBlendIDs[SClipVolumeBlendInfo::BlendPlaneCount];
-        Vec4 blendPlanes[SClipVolumeBlendInfo::BlendPlaneCount];
-    };
-
-    struct SClipVolumeData
-    {
-        SClipVolumeData()
-            : nStencilRef(0)
-            , nFlags(0)
-            , m_pRenderMesh(NULL)
-            , mAABB(AABB::RESET)
-            , mWorldTM(IDENTITY)
-        {
-        };
-
-        Matrix34 mWorldTM;
-        AABB mAABB;
-        uint8 nStencilRef;
-        uint8 nFlags;
-
-        _smart_ptr<IRenderMesh> m_pRenderMesh;
-        SVisAreaBlendData m_BlendData;
-    };
-
-    // Vis areas for current view
-    std::vector<SClipVolumeData> m_pClipVolumes[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-
-    // The 2 is for X and Y axis. In PostEffectsLib.cfi:
-    // float2x4 g_texTransforms[16];
-    Vec4 m_vTextureTransforms[EMaxTextureSlots][2];
-
-    uint32 m_nClipVolumesCount[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-    uint32 m_nVisAreasGIRef[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-
-    struct SClipShape
-    {
-        IRenderMesh*    pShape;
-        Matrix34            mxTransform;
-        SClipShape()
-            : pShape(NULL)
-            , mxTransform(Matrix34::CreateIdentity()) {}
-        SClipShape(IRenderMesh* _pShape, const Matrix34& _mxTransform)
-            : pShape(_pShape)
-            , mxTransform(_mxTransform) { }
-    };
-
-    // Clip volumes for GI for current view
-    TArray<SClipShape> m_vecGIClipVolumes[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-
-    // Deferred passes common
-    TArray<SRenderLight> m_pLights[eDLT_NumLightTypes][RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS];
-
-    Vec3 m_pCamPos;
-    Vec3 m_pCamFront;
-    float m_fCamFar;
-    float m_fCamNear;
-
-    float m_fRatioWidth;
-    float m_fRatioHeight;
-
-    CShader* m_pShader;
-    CCryNameTSCRC m_pDeferredDecalTechName;
-    CCryNameTSCRC m_pLightVolumeTechName;
-    CCryNameTSCRC m_pTechName;
-    CCryNameTSCRC m_pAmbientOutdoorTechName;
-    CCryNameTSCRC m_pCubemapsTechName;
-    CCryNameTSCRC m_pCubemapsVolumeTechName;
-    CCryNameTSCRC m_pReflectionTechName;
-    CCryNameTSCRC m_pDebugTechName;
-    CCryNameR m_pParamLightPos;
-    CCryNameR m_pParamLightDiffuse;
-    CCryNameR m_pParamLightProjMatrix;
-    CCryNameR m_pGeneralParams;
-    CCryNameR m_pParamAmbient;
-    CCryNameR m_pParamAmbientGround;
-    CCryNameR m_pParamAmbientHeight;
-    CCryNameR m_pAttenParams;
-
-    CCryNameR m_pParamDecalTS;
-    CCryNameR m_pParamDecalDiffuse;
-    CCryNameR m_pParamDecalAngleAttenuation;
-    CCryNameR m_pParamDecalSpecular;
-    CCryNameR m_pParamDecalMipLevels;
-    CCryNameR m_pParamDecalEmissive;
-    CCryNameR m_pParamTexTransforms;
-    CCryNameR m_pClipVolumeParams;
-
-    Matrix44A m_mViewProj;
-    Matrix44A m_pViewProjI;
-    Matrix44A m_pView;
-
-    Matrix44A m_prevViewProj[MAX_GPU_NUM];
-
-    Vec4 vWorldBasisX, vWorldBasisY, vWorldBasisZ;
-
-    CTexture* m_pLBufferDiffuseRT;
-    CTexture* m_pLBufferSpecularRT;
-
-    DEFINE_ALIGNED_DATA(Vec4, m_vClipVolumeParams[MAX_DEFERRED_CLIP_VOLUMES], 16);
-
-    CTexture* m_pDiffuseRT;
-    CTexture* m_pSpecularRT;
-    CTexture* m_pNormalsRT;
-    CTexture* m_pDepthRT;
-
-    CTexture* m_pMSAAMaskRT;
-    CTexture* m_pResolvedStencilRT;
-
-    int m_nWarningFrame;
-
-    int m_nRenderState;
-    uint32 m_nLightsProcessedCount;
-
-    uint32 m_nTexStateLinear;
-    uint32 m_nTexStatePoint;
-
-    SResourceView::KeyType m_nBindResourceMsaa;
-
-    uint32 m_nThreadID;
-    int32 m_nRecurseLevel;
-
-    uint m_nCurrentShadowPoolLight;
-    uint m_nFirstCandidateShadowPoolLight;
-    uint m_nShadowPoolSize;
-    bool m_bClearPool;
-
-    bool m_bSpecularState;
-    int m_nCurLighID;
-    short m_nCurTargetWidth;
-    short m_nCurTargetHeight;
-    static CDeferredShading* m_pInstance;
-
-    friend class CTiledShading;
-
-    static StaticInstance<CPowerOf2BlockPacker> m_blockPack;
-    static TArray<SShadowAllocData> m_shadowPoolAlloc;
-
-public:
-    static CDeferredShading* CreateDeferredShading()
-    {
-        m_pInstance = new CDeferredShading();
-
-        return m_pInstance;
-    }
-
-    static void DestroyDeferredShading()
-    {
-        SAFE_DELETE(m_pInstance);
-    }
-};
-
-class CTexPoolAtlas
-{
-public:
-    CTexPoolAtlas()
-    {
-        m_nSize = 0;
-#ifdef _DEBUG
-        m_nTotalWaste = 0;
-#endif
-    }
-    ~CTexPoolAtlas()    {}
-    void Init(int nSize);
-    void Clear();
-    void FreeMemory();
-    bool AllocateGroup(int32* pOffsetX, int32* pOffsetY, int nSizeX, int nSizeY);
-
-    int m_nSize;
-    static const int MAX_BLOCKS = 128;
-    uint32 m_arrAllocatedBlocks[MAX_BLOCKS];
-
-#ifdef _DEBUG
-    uint32 m_nTotalWaste;
-    struct SShadowMapBlock
-    {
-        uint16 m_nX1, m_nX2, m_nY1, m_nY2;
-        bool Intersects(const SShadowMapBlock& b) const
-        {
-            return max(m_nX1, b.m_nX1) < min(m_nX2, b.m_nX2)
-                   && max(m_nY1, b.m_nY1) < min(m_nY2, b.m_nY2);
-        }
-    };
-    std::vector<SShadowMapBlock> m_arrDebugBlocks;
-
-    void _AddDebugBlock(int x, int y, int sizeX, int sizeY);
-    float _GetDebugUsage() const;
-#endif
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DFXPipeline.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DFXPipeline.cpp
deleted file mode 100644
index 319a3ffe76..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DFXPipeline.cpp
+++ /dev/null
@@ -1,5735 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Direct3D specific FX shaders rendering pipeline.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include <I3DEngine.h>
-#include <IEntityRenderState.h>
-#include "MultiLayerAlphaBlendPass.h"
-#include <Common/ReverseDepth.h>
-#include <Common/RenderCapabilities.h>
-#include "GraphicsPipeline/FurPasses.h"
-
-#include "../../Cry3DEngine/Environment/OceanEnvironmentBus.h"
-
-#if defined(FEATURE_SVO_GI)
-#include "D3D_SVO.h"
-#endif
-
-#include <AzCore/Statistics/StatisticalProfilerProxy.h>
-
-
-
-long CD3D9Renderer::FX_SetVertexDeclaration(int StreamMask, const AZ::Vertex::Format& vertexFormat)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    HRESULT hr;
-
-    bool bMorph = (StreamMask & VSM_MORPHBUDDY) != 0;
-    bool bInstanced = (StreamMask & VSM_INSTANCED) != 0;
-
-#if defined(FEATURE_PER_SHADER_INPUT_LAYOUT_CACHE)
-    SOnDemandD3DVertexDeclarationCache pDeclCache[1] = {
-        { NULL }
-    };
-    // (StreamMask & (0xfe | VSM_MORPHBUDDY)) is the value of StreamMask for most cases. There are a few exceptions:
-    // 0xfe = 1111 1110 so the result is 0 in the case of VSM_GENERAL (1), or 0 if the mask bit is greater than 8 bits unless StreamMask happens to be VSM_MORPHBUDDY, in which case the result is again the value of StreamMask
-    // At the time of this comment, that means the portion of the cacheID determined by StreamMask will be the same for VSM_GENERAL as it will be for VSM_INSTANCED, or anything that may come after VSM_INSTANCED
-    uint64 cacheID = static_cast<uint64>(StreamMask & (0xfe | VSM_MORPHBUDDY)) ^ (static_cast<uint64>(vertexFormat.GetEnum()) << 32);
-    if (CHWShader_D3D::s_pCurInstVS)
-    {
-        pDeclCache->m_pDeclaration = CHWShader_D3D::s_pCurInstVS->GetCachedInputLayout(cacheID);
-    }
-#else
-    AZ::u32 declCacheKey = vertexFormat.GetEnum();
-    if (CHWShader_D3D::s_pCurInstVS)
-    {
-        declCacheKey = CHWShader_D3D::s_pCurInstVS->GenerateVertexDeclarationCacheKey(vertexFormat);
-    }
-
-    SOnDemandD3DVertexDeclarationCache* pDeclCache = &m_RP.m_D3DVertexDeclarationCache[(StreamMask & 0xff) >> 1][bMorph || bInstanced][declCacheKey];
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DFXPipeline_cpp)
-#endif
-#endif
-
-    if (!pDeclCache->m_pDeclaration)
-    {
-        SOnDemandD3DVertexDeclaration Decl;
-
-        EF_OnDemandVertexDeclaration(Decl, (StreamMask & 0xff) >> 1, vertexFormat, bMorph, bInstanced);
-        if (!Decl.m_Declaration.size())
-        {
-            return S_FALSE;
-        }
-
-        if (!CHWShader_D3D::s_pCurInstVS || !CHWShader_D3D::s_pCurInstVS->m_pShaderData || CHWShader_D3D::s_pCurInstVS->m_bFallback)
-        {
-            return (HRESULT)-1;
-        }
-        int nSize = CHWShader_D3D::s_pCurInstVS->m_nDataSize;
-        void* pVSData = CHWShader_D3D::s_pCurInstVS->m_pShaderData;
-        if (FAILED(hr = GetDevice().CreateInputLayout(&Decl.m_Declaration[0], Decl.m_Declaration.size(), pVSData, nSize, &pDeclCache->m_pDeclaration)))
-        {
-#ifndef _RELEASE
-            iLog->LogError("Failed to create an input layout for material \"%s\".\nThe shader and the vertex formats may be incompatible.\nVertex format: \"%d\".  Shader expects: \"%d\".\n\n", m_RP.m_pShaderResources->m_szMaterialName, (int)vertexFormat.GetEnum(), (int)CHWShader_D3D::s_pCurInstVS->m_vertexFormat.GetEnum());
-#endif
-            return hr;
-        }
-#if defined(FEATURE_PER_SHADER_INPUT_LAYOUT_CACHE)
-        CHWShader_D3D::s_pCurInstVS->SetCachedInputLayout(pDeclCache->m_pDeclaration, cacheID);
-#endif
-    }
-    D3DVertexDeclaration* pD3DDecl = pDeclCache->m_pDeclaration;
-    if (!CHWShader_D3D::s_pCurInstVS || !CHWShader_D3D::s_pCurInstPS || (CHWShader_D3D::s_pCurInstVS->m_bFallback | CHWShader_D3D::s_pCurInstPS->m_bFallback))
-    {
-        FX_Commit();
-        return E_FAIL;
-    }
-
-    if (m_pLastVDeclaration != pD3DDecl)
-    {
-        // Don't set input layout on fallback shader (crashes in DX11 NV driver)
-        if (!CHWShader_D3D::s_pCurInstVS || CHWShader_D3D::s_pCurInstVS->m_bFallback)
-        {
-            return (HRESULT)-1;
-        }
-        m_pLastVDeclaration = pD3DDecl;
-        m_DevMan.BindVtxDecl(pD3DDecl);
-    }
-
-    return S_OK;
-}
-
-void CD3D9Renderer::EF_ClearTargetsImmediately(uint32 nFlags)
-{
-    nFlags |= FRT_CLEAR_IMMEDIATE;
-
-    EF_ClearTargetsLater(nFlags);
-
-    if (nFlags & FRT_CLEAR_IMMEDIATE)
-    {
-        FX_SetActiveRenderTargets(true);
-    }
-}
-
-void CD3D9Renderer::EF_ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth, uint8 nStencil)
-{
-    nFlags |= FRT_CLEAR_IMMEDIATE;
-
-    EF_ClearTargetsLater(nFlags, Colors, fDepth, nStencil);
-
-    if (nFlags & FRT_CLEAR_IMMEDIATE)
-    {
-        FX_SetActiveRenderTargets(true);
-    }
-}
-
-void CD3D9Renderer::EF_ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors)
-{
-    nFlags |= FRT_CLEAR_IMMEDIATE;
-
-    EF_ClearTargetsLater(nFlags, Colors);
-
-    if (nFlags & FRT_CLEAR_IMMEDIATE)
-    {
-        FX_SetActiveRenderTargets(true);
-    }
-}
-
-void CD3D9Renderer::EF_ClearTargetsImmediately(uint32 nFlags, float fDepth, uint8 nStencil)
-{
-    nFlags |= FRT_CLEAR_IMMEDIATE;
-
-    EF_ClearTargetsLater(nFlags, fDepth, nStencil);
-
-    if (nFlags & FRT_CLEAR_IMMEDIATE)
-    {
-        FX_SetActiveRenderTargets(true);
-    }
-}
-
-// Clear buffers (color, depth/stencil)
-void CD3D9Renderer::EF_ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth, uint8 nStencil)
-{
-    if (nFlags & FRT_CLEAR_FOGCOLOR)
-    {
-        for (int i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            if (m_pNewTarget[i])
-            {
-                m_pNewTarget[i]->m_ReqColor = m_cClearColor;
-            }
-        }
-    }
-    else if (nFlags & FRT_CLEAR_COLOR)
-    {
-        for (int i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            if (m_pNewTarget[i] && m_pNewTarget[i]->m_pTarget)
-            {
-                m_pNewTarget[i]->m_ReqColor = Colors;
-            }
-        }
-    }
-
-    if (nFlags & FRT_CLEAR_DEPTH)
-    {
-        m_pNewTarget[0]->m_fReqDepth = fDepth;
-    }
-
-    if (!(nFlags & FRT_CLEAR_IMMEDIATE))
-    {
-        m_pNewTarget[0]->m_ClearFlags = 0;
-    }
-    if ((nFlags & FRT_CLEAR_DEPTH) && m_pNewTarget[0]->m_pDepth)
-    {
-        m_pNewTarget[0]->m_ClearFlags |= CLEAR_ZBUFFER;
-    }
-    if (nFlags & FRT_CLEAR_COLOR)
-    {
-        m_pNewTarget[0]->m_ClearFlags |= CLEAR_RTARGET;
-    }
-    if (nFlags & FRT_CLEAR_COLORMASK)
-    {
-        m_pNewTarget[0]->m_ClearFlags |= FRT_CLEAR_COLORMASK;
-    }
-
-    if (m_sbpp && (nFlags & FRT_CLEAR_STENCIL) && m_pNewTarget[0]->m_pDepth)
-    {
-#ifdef SUPPORTS_MSAA
-        if (gcpRendD3D->m_RP.m_MSAAData.Type)
-        {
-            m_RP.m_PersFlags2 |= RBPF2_MSAA_RESTORE_SAMPLE_MASK;
-        }
-#endif
-        m_pNewTarget[0]->m_ClearFlags |= CLEAR_STENCIL;
-        m_pNewTarget[0]->m_nReqStencil = nStencil;
-    }
-}
-
-void CD3D9Renderer::EF_ClearTargetsLater(uint32 nFlags, float fDepth, uint8 nStencil)
-{
-    if (nFlags & FRT_CLEAR_FOGCOLOR)
-    {
-        for (int i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            if (m_pNewTarget[i])
-            {
-                m_pNewTarget[i]->m_ReqColor = m_cClearColor;
-            }
-        }
-    }
-    else if (nFlags & FRT_CLEAR_COLOR)
-    {
-        for (int i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            if (m_pNewTarget[i] && m_pNewTarget[i]->m_pTex)
-            {
-                m_pNewTarget[i]->m_ReqColor = m_pNewTarget[i]->m_pTex->GetClearColor();
-            }
-        }
-    }
-
-    if (nFlags & FRT_CLEAR_DEPTH)
-    {
-        m_pNewTarget[0]->m_fReqDepth = fDepth;
-    }
-
-    if (!(nFlags & FRT_CLEAR_IMMEDIATE))
-    {
-        m_pNewTarget[0]->m_ClearFlags = 0;
-    }
-    if ((nFlags & FRT_CLEAR_DEPTH) && m_pNewTarget[0]->m_pDepth)
-    {
-        m_pNewTarget[0]->m_ClearFlags |= CLEAR_ZBUFFER;
-    }
-    if (nFlags & FRT_CLEAR_COLOR)
-    {
-        m_pNewTarget[0]->m_ClearFlags |= CLEAR_RTARGET;
-    }
-    if (nFlags & FRT_CLEAR_COLORMASK)
-    {
-        m_pNewTarget[0]->m_ClearFlags |= FRT_CLEAR_COLORMASK;
-    }
-
-    if (m_sbpp && (nFlags & FRT_CLEAR_STENCIL) && m_pNewTarget[0]->m_pDepth)
-    {
-#ifdef SUPPORTS_MSAA
-        if (gcpRendD3D->m_RP.m_MSAAData.Type)
-        {
-            m_RP.m_PersFlags2 |= RBPF2_MSAA_RESTORE_SAMPLE_MASK;
-        }
-#endif
-        m_pNewTarget[0]->m_ClearFlags |= CLEAR_STENCIL;
-        m_pNewTarget[0]->m_nReqStencil = nStencil;
-    }
-}
-
-void CD3D9Renderer::EF_ClearTargetsLater(uint32 nFlags, const ColorF& Colors)
-{
-    EF_ClearTargetsLater(nFlags, Colors, Clr_FarPlane.r, 0);
-    //      float(m_pNewTarget[0]->m_pSurfDepth->pTex->GetClearColor().r),
-    //      uint8(m_pNewTarget[0]->m_pSurfDepth->pTex->GetClearColor().g));
-}
-
-void CD3D9Renderer::EF_ClearTargetsLater(uint32 nFlags)
-{
-    EF_ClearTargetsLater(nFlags, Clr_FarPlane.r, 0);
-    //      float(m_pNewTarget[0]->m_pSurfDepth->pTex->GetClearColor().r),
-    //      uint8(m_pNewTarget[0]->m_pSurfDepth->pTex->GetClearColor().g));
-}
-
-
-void CD3D9Renderer::FX_ClearTargetRegion(const uint32 nAdditionalStates /* = 0*/)
-{
-    assert(m_pRT->IsRenderThread());
-    
-    bool clearColor   = (m_pNewTarget[0]->m_ClearFlags & CLEAR_RTARGET) ? true : false;
-    bool clearDepth   = (m_pNewTarget[0]->m_ClearFlags & CLEAR_ZBUFFER) ? true : false;
-    bool clearStencil = (m_pNewTarget[0]->m_ClearFlags & CLEAR_STENCIL) ? true : false;
-    
-    ColorF colorValue = Clr_Empty;
-    float  depthValue = 1.0f;
-    uint8  stencilValue = 0;
-    const char* clearTechnique = "Clear";
-    
-    if(clearColor)
-    {
-        colorValue = m_pNewTarget[0]->m_ReqColor;
-        
-        // Get number of render targets to clear
-        int numRT = 0;
-        for (int i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            if (m_pNewTarget[i] && m_pNewTarget[i]->m_pTarget)
-            {
-                numRT++;
-                break;
-            }
-        }
-        
-        // Select the technique to clear the right amount of render targets
-        switch(numRT)
-        {
-        case 0:
-            AZ_Assert(false, "No color render target bound.");
-            break;
-        case 1:
-            clearTechnique = "Clear";
-            break;
-        case 2:
-            clearTechnique = "Clear2RT";
-            break;
-        case 3:
-            clearTechnique = "Clear3RT";
-            break;
-        case 4:
-            clearTechnique = "Clear4RT";
-            break;
-        default:
-            AZ_Warning("Rendering", false, "More than 4 render targets bound. Only the first 4 will be cleared.");
-            clearTechnique = "Clear4RT";
-            break;
-        }
-    }
-    
-    if(clearDepth)
-    {
-        depthValue = ::FClamp(m_pNewTarget[0]->m_fReqDepth, 0.0f, 1.0f);
-    }
-    
-    if(clearStencil)
-    {
-        stencilValue = m_pNewTarget[0]->m_nReqStencil;
-    }
-
-    CRenderObject* pObj = m_RP.m_pCurObject;
-    CShader* pSHSave = m_RP.m_pShader;
-    SShaderTechnique* pSHT = m_RP.m_pCurTechnique;
-    SShaderPass* pPass = m_RP.m_pCurPass;
-    CShaderResources* pShRes = m_RP.m_pShaderResources;
-
-    gRenDev->m_cEF.mfRefreshSystemShader("Common", CShaderMan::s_ShaderCommon);
-
-    m_RP.m_PersFlags1 |= RBPF1_IN_CLEAR;
-    CShader* pSH = CShaderMan::s_ShaderCommon;
-    uint32 nPasses = 0;
-    pSH->FXSetTechnique(clearTechnique);
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-    
-    int nState = 0;
-    if (!clearColor)
-    {
-        nState |= GS_COLMASK_NONE;
-    }
-    
-    if (clearDepth)
-    {
-        if (!clearColor && !clearStencil)
-        {
-            // If only clearing depth then we can optimize the draw by using not-equal comparison,
-            // this way pixels with the same depth value as the clear value will be discarded.
-            nState |= GS_DEPTHFUNC_NOTEQUAL;
-        }
-        else
-        {
-            nState |= GS_DEPTHFUNC_ALWAYS;
-        }
-        nState |= GS_DEPTHWRITE;
-    }
-    else
-    {
-        nState |= GS_NODEPTHTEST;
-    }
-    
-    if (clearStencil)
-    {
-        int stencilState;
-        if (!clearColor && !clearDepth)
-        {
-            // If only clearing stencil then we can optimize the draw by using not-equal comparison,
-            // this way pixels with the same stencil value as the clear value will be discarded.
-            stencilState =
-                STENC_FUNC(FSS_STENCFUNC_NOTEQUAL) |
-                STENCOP_FAIL(FSS_STENCOP_KEEP) |
-                STENCOP_ZFAIL(FSS_STENCOP_REPLACE) |
-                STENCOP_PASS(FSS_STENCOP_REPLACE);
-        }
-        else
-        {
-            stencilState =
-                STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-                STENCOP_FAIL(FSS_STENCOP_REPLACE) |
-                STENCOP_ZFAIL(FSS_STENCOP_REPLACE) |
-                STENCOP_PASS(FSS_STENCOP_REPLACE);
-        }
-        
-        const uint32 stencilMask = 0xFFFFFFFF;
-
-        FX_SetStencilState(stencilState, stencilValue, stencilMask, stencilMask);
-        nState |= GS_STENCIL;
-    }
-
-    m_pNewTarget[0]->m_ClearFlags = 0;
-
-    nState |= nAdditionalStates;
-
-    FX_SetState(nState, -1);
-    D3DSetCull(eCULL_None);
-    float fX = (float)m_CurViewport.nWidth;
-    float fY = (float)m_CurViewport.nHeight;
-    DrawQuad(-0.5f, -0.5f, fX - 0.5f, fY - 0.5f, colorValue, depthValue, fX, fY, fX, fY);
-    m_RP.m_PersFlags1 &= ~RBPF1_IN_CLEAR;
-
-    m_RP.m_pCurObject = pObj;
-    m_RP.m_pShader = pSHSave;
-    m_RP.m_pCurTechnique = pSHT;
-    m_RP.m_pCurPass = pPass;
-    m_RP.m_pShaderResources = pShRes;
-}
-
-void CD3D9Renderer::FX_SetActiveRenderTargets(bool /*bAllowDip*/)
-{
-    DETAILED_PROFILE_MARKER("FX_SetActiveRenderTargets");
-    if (m_RP.m_PersFlags1 & RBPF1_IN_CLEAR)
-    {
-        return;
-    }
-    FUNCTION_PROFILER_RENDER_FLAT
-    bool bDirty = false;
-    if (m_nMaxRT2Commit >= 0)
-    {
-        for (int i = 0; i <= m_nMaxRT2Commit; i++)
-        {
-            if (!m_pNewTarget[i]->m_bWasSetRT)
-            {
-                m_pNewTarget[i]->m_bWasSetRT = true;
-                if (m_pNewTarget[i]->m_pTex)
-                {
-                    m_pNewTarget[i]->m_pTex->SetResolved(false);
-                }
-                m_pCurTarget[i] = m_pNewTarget[i]->m_pTex;
-                bDirty = true;
-#ifndef _RELEASE
-                if (m_logFileHandle != AZ::IO::InvalidHandle)
-                {
-                    Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Set RT");
-                    if (m_pNewTarget[i]->m_pTex)
-                    {
-                        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " '%s'", m_pNewTarget[i]->m_pTex->GetName());
-                        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " Format:%s", CTexture::NameForTextureFormat(m_pNewTarget[i]->m_pTex->m_eTFDst));
-                        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " Type:%s", CTexture::NameForTextureType(m_pNewTarget[i]->m_pTex->m_eTT));
-                        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " W/H:%d:%d\n",  m_pNewTarget[i]->m_pTex->GetWidth(), m_pNewTarget[i]->m_pTex->GetHeight());
-                    }
-                    else
-                    {
-                        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " 'Unknown'\n");
-                    }
-                }
-#endif
-                CTexture* pRT = m_pNewTarget[i]->m_pTex;
-                if (pRT && pRT->UseMultisampledRTV())
-                {
-                    pRT->Unbind();
-                }
-            }
-        }
-        if (!m_pNewTarget[0]->m_bWasSetD)
-        {
-            m_pNewTarget[0]->m_bWasSetD = true;
-            bDirty = true;
-        }
-        //m_nMaxRT2Commit = -1;
-    }
-
-    if (bDirty)
-    {
-        CTexture* pRT = m_pNewTarget[0]->m_pTex;
-        if (pRT && pRT->UseMultisampledRTV())
-        {
-            // Reset all texture slots which are used as RT currently
-            D3DShaderResourceView* pRes = NULL;
-            for (int i = 0; i < MAX_TMU; i++)
-            {
-                if (CTexture::s_TexStages[i].m_DevTexture == pRT->GetDevTexture())
-                {
-                    m_DevMan.BindSRV(eHWSC_Pixel, pRes, i);
-                    CTexture::s_TexStages[i].m_DevTexture = NULL;
-                }
-            }
-        }
-
-        const uint32 nMaxRT2Commit = max(m_nMaxRT2Commit + 1, 0);
-
-        ID3D11RenderTargetView* pRTV[RT_STACK_WIDTH] = { NULL };
-        uint32 nNumViews = 0;
-
-        for (uint32 v = 0; v < nMaxRT2Commit; ++v)
-        {
-            if (m_pNewTarget[v] && m_pNewTarget[v]->m_pTarget)
-            {
-                pRTV[v] = (ID3D11RenderTargetView*)m_pNewTarget[v]->m_pTarget;
-                nNumViews = v + 1;
-            }
-        }
-
-        GetDeviceContext().OMSetRenderTargets(m_pNewTarget[0]->m_pTarget == NULL ? 0 : nNumViews, pRTV, m_pNewTarget[0]->m_pDepth);
-    }
-
-    if (m_nMaxRT2Commit >= 0)
-    {
-        m_nMaxRT2Commit = -1;
-    }
-
-    FX_SetViewport();
-    FX_ClearTargets();
-}
-
-
-void CD3D9Renderer::FX_SetViewport()
-{
-    // Set current viewport
-    if (m_bViewportDirty)
-    {
-        m_bViewportDirty = false;
-        if ((m_CurViewport != m_NewViewport))
-        {
-            m_CurViewport = m_NewViewport;
-            D3DViewPort Port;
-            Port.Width = (FLOAT)m_CurViewport.nWidth;
-            Port.Height = (FLOAT)m_CurViewport.nHeight;
-            Port.TopLeftX = (FLOAT)m_CurViewport.nX;
-            Port.TopLeftY = (FLOAT)m_CurViewport.nY;
-            Port.MinDepth = m_CurViewport.fMinZ;
-            Port.MaxDepth = m_CurViewport.fMaxZ;
-
-            if (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-            {
-                Port = ReverseDepthHelper::Convert(Port);
-            }
-
-            GetDeviceContext().RSSetViewports(1, &Port);
-        }
-    }
-}
-
-void CD3D9Renderer::FX_ClearTarget(D3DSurface* pView, const ColorF& cClear, const uint numRects, [[maybe_unused]] const RECT* pRects)
-{
-#if !defined(EXCLUDE_RARELY_USED_R_STATS) && defined(ENABLE_PROFILING_CODE)
-    {
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTCleared++;
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTClearedSize += CDeviceTexture::TextureDataSize(pView, numRects, pRects);
-    }
-#endif
-
-#if CRY_USE_DX12
-    GetDeviceContext().ClearRectsRenderTargetView(
-        pView,
-        (const FLOAT*)&cClear,
-        numRects,
-        pRects);
-#elif defined(DEVICE_SUPPORTS_D3D11_1) && D3DFXPIPELINE_CPP_TRAIT_CLEARVIEW
-    GetDeviceContext().ClearView(
-        pView,
-        (const FLOAT*)&cClear,
-        pRects,
-        numRects);
-#else
-    if (!numRects)
-    {
-        GetDeviceContext().ClearRenderTargetView(
-            pView,
-            (const FLOAT*)&cClear);
-
-        return;
-    }
-
-    // TODO: implement clears in compute for DX11, gives max performance (pipeline switch cost?)
-    __debugbreak();
-    abort();
-#endif
-}
-
-void CD3D9Renderer::FX_ClearTarget(ITexture* tex, const ColorF& cClear, [[maybe_unused]] const uint numRects, const RECT* pRects, [[maybe_unused]] const bool bOptional)
-{
-    CTexture* pTex = reinterpret_cast<CTexture*>(tex);
-
-    // TODO: should not happen, happens in the editor currently
-    if (!pTex->GetDeviceRT())
-    {
-        pTex->GetSurface(-1, 0);
-    }
-
-#if CRY_USE_DX12
-    FX_ClearTarget(
-        pTex->GetDeviceRT(),
-        cClear,
-        numRects,
-        pRects);
-#else
-    if (bOptional)
-    {
-        FX_ClearTarget(
-            pTex->GetDeviceRT(),
-            cClear,
-            0U,
-            nullptr);
-
-        return;
-    }
-
-    // TODO: implement depth-clear as depth-only for DX11, gives max performance and probably just resets the depth-surface meta-data
-    int ox, oy, ow, oh;
-    FX_PushRenderTarget(0, pTex, nullptr);
-    GetViewport(&ox, &oy, &ow, &oh);
-    RT_SetViewport(pRects->left, pRects->top, pRects->right - pRects->left, pRects->bottom - pRects->top);
-    FX_SetActiveRenderTargets();
-    EF_ClearTargetsLater(FRT_CLEAR_COLOR, cClear);
-    FX_ClearTargetRegion();
-    FX_PopRenderTarget(0);
-    SetViewport(ox, oy, ow, oh);
-#endif
-}
-
-void CD3D9Renderer::FX_ClearTarget(ITexture* pTex, const ColorF& cClear)
-{
-    FX_ClearTarget(
-        pTex,
-        cClear,
-        0U,
-        nullptr,
-        true);
-}
-
-void CD3D9Renderer::FX_ClearTarget(ITexture* pTex)
-{
-    FX_ClearTarget(
-        pTex,
-        pTex->GetClearColor());
-}
-
-//====================================================================================
-
-void CD3D9Renderer::FX_ClearTarget(D3DDepthSurface* pView, const int nFlags, const float cDepth, const uint8 cStencil, const uint numRects, [[maybe_unused]] const RECT* pRects)
-{
-#if !defined(EXCLUDE_RARELY_USED_R_STATS) && defined(ENABLE_PROFILING_CODE)
-    if (nFlags)
-    {
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTCleared++;
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTClearedSize += CDeviceTexture::TextureDataSize(pView, numRects, pRects);
-    }
-#endif
-
-    assert((
-            (nFlags & CLEAR_ZBUFFER ? D3D11_CLEAR_DEPTH : 0) |
-            (nFlags & CLEAR_STENCIL ? D3D11_CLEAR_STENCIL : 0)
-            ) == nFlags);
-
-#if CRY_USE_DX12
-    GetDeviceContext().ClearRectsDepthStencilView(
-        pView,
-        nFlags,
-        cDepth,
-        cStencil,
-        numRects,
-        pRects);
-#else
-    if (!numRects)
-    {
-        GetDeviceContext().ClearDepthStencilView(
-            pView,
-            nFlags,
-            cDepth,
-            cStencil);
-
-        return;
-    }
-
-    // TODO: implement clears in compute for DX11, gives max performance (pipeline switch cost?)
-    __debugbreak();
-    abort();
-#endif
-}
-
-void CD3D9Renderer::FX_ClearTarget(SDepthTexture* pTex, const int nFlags, const float cDepth, const uint8 cStencil, [[maybe_unused]] const uint numRects, const RECT* pRects, [[maybe_unused]] const bool bOptional)
-{
-    assert((
-            (nFlags & CLEAR_ZBUFFER ? D3D11_CLEAR_DEPTH : 0) |
-            (nFlags & CLEAR_STENCIL ? D3D11_CLEAR_STENCIL : 0)
-            ) == nFlags);
-
-#if CRY_USE_DX12
-    FX_ClearTarget(
-        pTex->pSurf,
-        nFlags,
-        cDepth,
-        cStencil,
-        numRects,
-        pRects);
-#else
-    if (bOptional)
-    {
-        FX_ClearTarget(
-            static_cast<D3DDepthSurface*>(pTex->pSurf),
-            nFlags,
-            cDepth,
-            cStencil,
-            0U,
-            nullptr);
-
-        return;
-    }
-
-    // TODO: implement depth-clear as depth-only for DX11, gives max performance and probably just resets the depth-surface meta-data
-    int ox, oy, ow, oh;
-    FX_PushRenderTarget(0, (D3DSurface*)nullptr, pTex);
-    GetViewport(&ox, &oy, &ow, &oh);
-    RT_SetViewport(pRects->left, pRects->top, pRects->right - pRects->left, pRects->bottom - pRects->top);
-    FX_SetActiveRenderTargets();
-    EF_ClearTargetsLater(nFlags, Clr_Empty, cDepth, cStencil);
-    FX_ClearTargetRegion();
-    FX_PopRenderTarget(0);
-    SetViewport(ox, oy, ow, oh);
-#endif
-}
-
-void CD3D9Renderer::FX_ClearTarget(SDepthTexture* pTex, const int nFlags, const float cDepth, const uint8 cStencil)
-{
-    FX_ClearTarget(
-        pTex,
-        nFlags,
-        cDepth,
-        cStencil,
-        0U,
-        nullptr,
-        true);
-}
-
-void CD3D9Renderer::FX_ClearTarget(SDepthTexture* pTex, const int nFlags)
-{
-    FX_ClearTarget(
-        pTex,
-        nFlags,
-        (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 0.f : 1.f,
-        0U);
-}
-
-void CD3D9Renderer::FX_ClearTarget(SDepthTexture* pTex)
-{
-    FX_ClearTarget(
-        pTex,
-        CLEAR_ZBUFFER |
-        CLEAR_STENCIL);
-}
-
-//====================================================================================
-
-void CD3D9Renderer::FX_ClearTargets()
-{
-    if (m_pNewTarget[0]->m_ClearFlags)
-    {
-        {
-            const float fClearDepth = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 1.0f - m_pNewTarget[0]->m_fReqDepth : m_pNewTarget[0]->m_fReqDepth;
-            const uint8 nClearStencil = m_pNewTarget[0]->m_nReqStencil;
-            const int nFlags = m_pNewTarget[0]->m_ClearFlags & ~CLEAR_RTARGET;
-
-            // TODO: ClearFlags per render-target
-            if ((m_pNewTarget[0]->m_pTarget != NULL) && (m_pNewTarget[0]->m_ClearFlags & CLEAR_RTARGET))
-            {
-                for (int i = 0; i < RT_STACK_WIDTH; ++i)
-                {
-                    if (m_pNewTarget[i]->m_pTarget)
-                    {
-                        // NOTE: optimal value is "m_pNewTarget[0]->m_pTex->GetClearColor()"
-                        GetDeviceContext().ClearRenderTargetView(m_pNewTarget[i]->m_pTarget, &m_pNewTarget[i]->m_ReqColor[0]);
-                    }
-                }
-            }
-
-            assert((
-                    (nFlags & FRT_CLEAR_DEPTH ? D3D11_CLEAR_DEPTH : 0) |
-                    (nFlags & FRT_CLEAR_STENCIL ? D3D11_CLEAR_STENCIL : 0)
-                    ) == nFlags);
-
-            AZ_Warning("CD3D9Renderer", m_pNewTarget[0]->m_pDepth != nullptr, "FX_ClearTargets: Depth texture of target was nullptr. The depth target will not be cleared.");
-            if (nFlags && m_pNewTarget[0]->m_pDepth != nullptr)
-            {
-                GetDeviceContext().ClearDepthStencilView(m_pNewTarget[0]->m_pDepth, nFlags, fClearDepth, nClearStencil);
-            }
-        }
-
-        CTexture* pRT = m_pNewTarget[0]->m_pTex;
-        if IsCVarConstAccess(constexpr) (CV_r_stats == 13)
-        {
-            EF_AddRTStat(pRT, m_pNewTarget[0]->m_ClearFlags, m_CurViewport.nWidth, m_CurViewport.nHeight);
-        }
-
-#if !defined(EXCLUDE_RARELY_USED_R_STATS) && defined(ENABLE_PROFILING_CODE)
-        {
-            if ((m_pNewTarget[0]->m_pTarget != NULL) && (m_pNewTarget[0]->m_ClearFlags & CLEAR_RTARGET))
-            {
-                for (int i = 0; i < RT_STACK_WIDTH; ++i)
-                {
-                    if (m_pNewTarget[i]->m_pTarget)
-                    {
-                        m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTCleared++;
-                        m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTClearedSize += CDeviceTexture::TextureDataSize(m_pNewTarget[i]->m_pTarget);
-                    }
-                }
-            }
-
-            if (m_pNewTarget[0]->m_ClearFlags & (~CLEAR_RTARGET) && m_pNewTarget[0]->m_pSurfDepth != nullptr)
-            {
-                m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTCleared++;
-                m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTClearedSize += CDeviceTexture::TextureDataSize(m_pNewTarget[0]->m_pSurfDepth->pSurf);
-            }
-        }
-#endif
-
-        m_pNewTarget[0]->m_ClearFlags = 0;
-    }
-}
-
-void CD3D9Renderer::FX_Commit(bool bAllowDIP)
-{
-    DETAILED_PROFILE_MARKER("FX_Commit");
-    // Commit all changed shader parameters
-    if (m_RP.m_nCommitFlags & FC_GLOBAL_PARAMS)
-    {
-        CHWShader_D3D::mfCommitParamsGlobal();
-        m_RP.m_nCommitFlags &= ~FC_GLOBAL_PARAMS;
-    }
-    if (m_RP.m_nCommitFlags & FC_MATERIAL_PARAMS)
-    {
-        CHWShader_D3D::UpdatePerMaterialConstantBuffer();
-        m_RP.m_nCommitFlags &= ~FC_MATERIAL_PARAMS;
-    }
-    AzRHI::ConstantBufferCache::GetInstance().CommitAll();
-
-    // Commit all changed RT's
-    if (m_RP.m_nCommitFlags & FC_TARGETS)
-    {
-        FX_SetActiveRenderTargets(bAllowDIP);
-        m_RP.m_nCommitFlags &= ~FC_TARGETS;
-    }
-
-    // Adapt viewport dimensions if changed
-    FX_SetViewport();
-
-    // Clear rendertargets if requested
-    FX_ClearTargets();
-}
-
-
-// Set current geometry culling modes
-void CD3D9Renderer::D3DSetCull(ECull eCull, bool bSkipMirrorCull)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    if (eCull != eCULL_None && !bSkipMirrorCull)
-    {
-        if (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_MIRRORCULL)
-        {
-            eCull = (eCull == eCULL_Back) ? eCULL_Front : eCULL_Back;
-        }
-    }
-
-    if (eCull == m_RP.m_eCull)
-    {
-        return;
-    }
-
-    SStateRaster RS = m_StatesRS[m_nCurStateRS];
-
-    RS.Desc.FrontCounterClockwise = true;
-
-    if (eCull == eCULL_None)
-    {
-        RS.Desc.CullMode = D3D11_CULL_NONE;
-    }
-    else
-    {
-        if (eCull == eCULL_Back)
-        {
-            RS.Desc.CullMode = D3D11_CULL_BACK;
-        }
-        else
-        {
-            RS.Desc.CullMode = D3D11_CULL_FRONT;
-        }
-    }
-    SetRasterState(&RS);
-    m_RP.m_eCull = eCull;
-}
-
-uint8 g_StencilFuncLookup[8] =
-{
-    D3D11_COMPARISON_ALWAYS,                // FSS_STENCFUNC_ALWAYS   0x0
-    D3D11_COMPARISON_NEVER,                 // FSS_STENCFUNC_NEVER    0x1
-    D3D11_COMPARISON_LESS,                  // FSS_STENCFUNC_LESS     0x2
-    D3D11_COMPARISON_LESS_EQUAL,        // FSS_STENCFUNC_LEQUAL   0x3
-    D3D11_COMPARISON_GREATER,               // FSS_STENCFUNC_GREATER  0x4
-    D3D11_COMPARISON_GREATER_EQUAL, // FSS_STENCFUNC_GEQUAL   0x5
-    D3D11_COMPARISON_EQUAL,                 // FSS_STENCFUNC_EQUAL    0x6
-    D3D11_COMPARISON_NOT_EQUAL          // FSS_STENCFUNC_NOTEQUAL 0x7
-};
-
-uint8 g_StencilOpLookup[8] =
-{
-    D3D11_STENCIL_OP_KEEP,                  // FSS_STENCOP_KEEP    0x0
-    D3D11_STENCIL_OP_REPLACE,               // FSS_STENCOP_REPLACE 0x1
-    D3D11_STENCIL_OP_INCR_SAT,          // FSS_STENCOP_INCR    0x2
-    D3D11_STENCIL_OP_DECR_SAT,          // FSS_STENCOP_DECR    0x3
-    D3D11_STENCIL_OP_ZERO,                  // FSS_STENCOP_ZERO    0x4
-    D3D11_STENCIL_OP_INCR,                  // FSS_STENCOP_INCR_WRAP 0x5
-    D3D11_STENCIL_OP_DECR,                  // FSS_STENCOP_DECR_WRAP 0x6
-    D3D11_STENCIL_OP_INVERT                 // FSS_STENCOP_INVERT 0x7
-};
-
-void CRenderer::FX_SetStencilState(int st, uint32 nStencRef, uint32 nStencMask, uint32 nStencWriteMask, bool bForceFullReadMask)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-        PrefetchLine(g_StencilFuncLookup, 0);
-
-    const uint32 nPersFlags2 = m_RP.m_PersFlags2;
-    if (!bForceFullReadMask && !(nPersFlags2 & RBPF2_READMASK_RESERVED_STENCIL_BIT))
-    {
-        nStencMask &= ~BIT_STENCIL_RESERVED;
-    }
-
-    if (nPersFlags2 & RBPF2_WRITEMASK_RESERVED_STENCIL_BIT)
-    {
-        nStencWriteMask &= ~BIT_STENCIL_RESERVED;
-    }
-
-    nStencRef |= m_RP.m_CurStencilRefAndMask;
-
-    SStateDepth DS = gcpRendD3D->m_StatesDP[gcpRendD3D->m_nCurStateDP];
-    DS.Desc.StencilReadMask = nStencMask;
-    DS.Desc.StencilWriteMask = nStencWriteMask;
-
-    int nCurFunc = st & FSS_STENCFUNC_MASK;
-    DS.Desc.FrontFace.StencilFunc       = (D3D11_COMPARISON_FUNC)g_StencilFuncLookup[nCurFunc];
-
-    int nCurOp = (st & FSS_STENCFAIL_MASK) >> FSS_STENCFAIL_SHIFT;
-    DS.Desc.FrontFace.StencilFailOp = (D3D11_STENCIL_OP)g_StencilOpLookup[nCurOp];
-
-    nCurOp = (st & FSS_STENCZFAIL_MASK) >> FSS_STENCZFAIL_SHIFT;
-    DS.Desc.FrontFace.StencilDepthFailOp    = (D3D11_STENCIL_OP)g_StencilOpLookup[nCurOp];
-
-    nCurOp = (st & FSS_STENCPASS_MASK) >> FSS_STENCPASS_SHIFT;
-    DS.Desc.FrontFace.StencilPassOp = (D3D11_STENCIL_OP)g_StencilOpLookup[nCurOp];
-
-    if (!(st & FSS_STENCIL_TWOSIDED))
-    {
-        DS.Desc.BackFace = DS.Desc.FrontFace;
-    }
-    else
-    {
-        nCurFunc = (st & (FSS_STENCFUNC_MASK << FSS_CCW_SHIFT)) >> FSS_CCW_SHIFT;
-        DS.Desc.BackFace.StencilFunc        =   (D3D11_COMPARISON_FUNC)g_StencilFuncLookup[nCurFunc];
-
-        nCurOp = (st & (FSS_STENCFAIL_MASK << FSS_CCW_SHIFT)) >> (FSS_STENCFAIL_SHIFT + FSS_CCW_SHIFT);
-        DS.Desc.BackFace.StencilFailOp  = (D3D11_STENCIL_OP)g_StencilOpLookup[nCurOp];
-
-        nCurOp = (st & (FSS_STENCZFAIL_MASK << FSS_CCW_SHIFT)) >> (FSS_STENCZFAIL_SHIFT + FSS_CCW_SHIFT);
-        DS.Desc.BackFace.StencilDepthFailOp = (D3D11_STENCIL_OP)g_StencilOpLookup[nCurOp];
-
-        nCurOp = (st & (FSS_STENCPASS_MASK << FSS_CCW_SHIFT)) >> (FSS_STENCPASS_SHIFT + FSS_CCW_SHIFT);
-        DS.Desc.BackFace.StencilPassOp  = (D3D11_STENCIL_OP)g_StencilOpLookup[nCurOp];
-    }
-
-    m_RP.m_CurStencRef = nStencRef;
-    m_RP.m_CurStencMask = nStencMask;
-    m_RP.m_CurStencWriteMask = nStencWriteMask;
-
-    gcpRendD3D->SetDepthState(&DS, nStencRef);
-
-    m_RP.m_CurStencilState = st;
-}
-
-void CD3D9Renderer::EF_Scissor(bool bEnable, int sX, int sY, int sWdt, int sHgt)
-{
-    m_pRT->RC_SetScissor(bEnable, sX, sY, sWdt, sHgt);
-}
-
-void CD3D9Renderer::RT_SetScissor(bool bEnable, int sX, int sY, int sWdt, int sHgt)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    if (!CV_r_scissor || (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN))
-    {
-        return;
-    }
-    D3D11_RECT scRect;
-    if (bEnable)
-    {
-        if (sX != m_sPrevX || sY != m_sPrevY || sWdt != m_sPrevWdt || sHgt != m_sPrevHgt)
-        {
-            m_sPrevX = sX;
-            m_sPrevY = sY;
-            m_sPrevWdt = sWdt;
-            m_sPrevHgt = sHgt;
-            scRect.left = sX;
-            scRect.top = sY;
-            scRect.right = sX + sWdt;
-            scRect.bottom = sY + sHgt;
-
-            GetDeviceContext().RSSetScissorRects(1, &scRect);
-        }
-        if (bEnable != m_bsPrev)
-        {
-            m_bsPrev = bEnable;
-            SStateRaster RS = m_StatesRS[m_nCurStateRS];
-            RS.Desc.ScissorEnable = bEnable;
-            SetRasterState(&RS);
-        }
-    }
-    else
-    {
-        if (bEnable != m_bsPrev)
-        {
-            m_bsPrev = bEnable;
-            m_sPrevWdt = 0;
-            m_sPrevHgt = 0;
-            SStateRaster RS = m_StatesRS[m_nCurStateRS];
-            RS.Desc.ScissorEnable = bEnable;
-            SetRasterState(&RS);
-        }
-    }
-}
-
-bool CD3D9Renderer::EF_GetScissorState(int& sX, int& sY, int& sWdt, int& sHgt)
-{
-    if (!CV_r_scissor || (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN))
-    {
-        return false;
-    }
-
-    sX = m_sPrevX;
-    sY = m_sPrevY;
-    sWdt = m_sPrevWdt;
-    sHgt = m_sPrevHgt;
-    return m_bsPrev;
-}
-
-void CD3D9Renderer::FX_FogCorrection()
-{
-    if (m_RP.m_nPassGroupID <= EFSLIST_DECAL)
-    {
-        uint32 uBlendFlags = m_RP.m_CurState & GS_BLEND_MASK;
-        switch (uBlendFlags)
-        {
-        case GS_BLSRC_ONE | GS_BLDST_ONE:
-            EF_SetFogColor(Col_Black);
-            break;
-        case GS_BLSRC_DSTALPHA | GS_BLDST_ONE:
-            EF_SetFogColor(Col_Black);
-            break;
-        case GS_BLSRC_DSTCOL | GS_BLDST_SRCCOL:
-        {
-            static ColorF pColGrey = ColorF(0.5f, 0.5f, 0.5f, 1.0f);
-            EF_SetFogColor(pColGrey);
-            break;
-        }
-        case GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA:
-            EF_SetFogColor(Col_Black);
-            break;
-        case GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCCOL:
-            EF_SetFogColor(Col_Black);
-            break;
-        case GS_BLSRC_ZERO | GS_BLDST_ONEMINUSSRCCOL:
-            EF_SetFogColor(Col_Black);
-            break;
-        case GS_BLSRC_SRCALPHA | GS_BLDST_ONE:
-        case GS_BLSRC_SRCALPHA_A_ZERO | GS_BLDST_ONE:
-            EF_SetFogColor(Col_Black);
-            break;
-        case GS_BLSRC_ZERO | GS_BLDST_ONE:
-            EF_SetFogColor(Col_Black);
-            break;
-        case GS_BLSRC_DSTCOL | GS_BLDST_ZERO:
-            EF_SetFogColor(Col_White);
-            break;
-        default:
-            EF_SetFogColor(m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS.m_FogColor);
-            break;
-        }
-    }
-    else
-    {
-        EF_SetFogColor(m_RP.m_TI[m_RP.m_nProcessThreadID].m_FS.m_FogColor);
-    }
-}
-
-// Set current render states
-void CD3D9Renderer::FX_SetState(int st, int AlphaRef, int RestoreState)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    int Changed;
-    if IsCVarConstAccess(constexpr) (CV_r_measureoverdraw == 4 && (st & GS_DEPTHFUNC_MASK) == GS_DEPTHFUNC_HIZEQUAL)
-    {
-        // disable fine depth test
-        st |= GS_NODEPTHTEST;
-    }
-    st |= m_RP.m_StateOr;
-    st &= m_RP.m_StateAnd;
-    Changed = st ^ m_RP.m_CurState;
-    Changed |= RestoreState;
-
-    // Due to the way reverse depth was implemented, we need to check if RBPF_REVERSE_DEPTH has changed and force flush the depth state if so.
-    uint32 changedPersFlags = m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags ^ m_RP.m_previousPersFlags;
-    m_RP.m_previousPersFlags = m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags;
-
-    if (!Changed && !changedPersFlags && (AlphaRef == -1 || AlphaRef == m_RP.m_CurAlphaRef))
-    {
-        return;
-    }
-
-    //PROFILE_FRAME(State_RStates);
-
-#ifndef _RELEASE
-    m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumStateChanges++;
-#endif
-    if (m_StatesBL.size() == 0 || m_StatesDP.size() == 0 || m_StatesRS.size() == 0)
-    {
-        SetDefaultRenderStates();
-    }
-    SStateDepth DS = m_StatesDP[m_nCurStateDP];
-    SStateBlend BS = m_StatesBL[m_nCurStateBL];
-    SStateRaster RS = m_StatesRS[m_nCurStateRS];
-    bool bDirtyDS = false;
-    bool bDirtyBS = false;
-    bool bDirtyRS = false;
-
-    if ((Changed & GS_DEPTHFUNC_MASK) || (changedPersFlags & RBPF_REVERSE_DEPTH))
-    {
-        bDirtyDS = true;
-
-        uint32 nDepthState = st;
-        if (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-        {
-            nDepthState = ReverseDepthHelper::ConvertDepthFunc(st);
-        }
-
-        switch (nDepthState & GS_DEPTHFUNC_MASK)
-        {
-        case GS_DEPTHFUNC_HIZEQUAL:
-        case GS_DEPTHFUNC_EQUAL:
-            DS.Desc.DepthFunc = D3D11_COMPARISON_EQUAL;
-            break;
-        case GS_DEPTHFUNC_LEQUAL:
-            DS.Desc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL;
-            break;
-        case GS_DEPTHFUNC_GREAT:
-            DS.Desc.DepthFunc = D3D11_COMPARISON_GREATER;
-            break;
-        case GS_DEPTHFUNC_LESS:
-            DS.Desc.DepthFunc = D3D11_COMPARISON_LESS;
-            break;
-        case GS_DEPTHFUNC_NOTEQUAL:
-            DS.Desc.DepthFunc = D3D11_COMPARISON_NOT_EQUAL;
-            break;
-        case GS_DEPTHFUNC_GEQUAL:
-            DS.Desc.DepthFunc = D3D11_COMPARISON_GREATER_EQUAL;
-            break;
-        case GS_DEPTHFUNC_ALWAYS:
-            DS.Desc.DepthFunc = D3D11_COMPARISON_ALWAYS;
-            break;
-        }
-    }
-    if (Changed & (GS_WIREFRAME))
-    {
-        bDirtyRS = true;
-
-        if (st & GS_WIREFRAME)
-        {
-            RS.Desc.FillMode = D3D11_FILL_WIREFRAME;
-        }
-        else
-        {
-            RS.Desc.FillMode = D3D11_FILL_SOLID;
-        }
-    }
-
-    if (Changed & GS_COLMASK_MASK)
-    {
-        bDirtyBS = true;
-        uint32 nMask = 0xfffffff0 | ((st & GS_COLMASK_MASK) >> GS_COLMASK_SHIFT);
-        nMask = (~nMask) & 0xf;
-        for (size_t i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            BS.Desc.RenderTarget[i].RenderTargetWriteMask = nMask;
-        }
-    }
-
-    if (Changed & GS_BLEND_MASK)
-    {
-        bDirtyBS = true;
-        if (st & GS_BLEND_MASK)
-        {
-            if IsCVarConstAccess(constexpr) (CV_r_measureoverdraw && (m_RP.m_nRendFlags & SHDF_ALLOWHDR))
-            {
-                st = (st & ~GS_BLEND_MASK) | (GS_BLSRC_ONE | GS_BLDST_ONE);
-                st &= ~GS_ALPHATEST_MASK;
-            }
-
-            // todo: add separate alpha blend support for mrt
-            for (size_t i = 0; i < RT_STACK_WIDTH; ++i)
-            {
-                BS.Desc.RenderTarget[i].BlendEnable = TRUE;
-            }
-
-            // Source factor
-            switch (st & GS_BLSRC_MASK)
-            {
-            case GS_BLSRC_ZERO:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ZERO;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ZERO;
-                break;
-            case GS_BLSRC_ONE:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-                break;
-            case GS_BLSRC_DSTCOL:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_DEST_COLOR;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_DEST_ALPHA;
-                break;
-            case GS_BLSRC_ONEMINUSDSTCOL:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_INV_DEST_COLOR;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA;
-                break;
-            case GS_BLSRC_SRCALPHA:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-                break;
-            case GS_BLSRC_ONEMINUSSRCALPHA:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_INV_SRC_ALPHA;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-                break;
-            case GS_BLSRC_DSTALPHA:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_DEST_ALPHA;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_DEST_ALPHA;
-                break;
-            case GS_BLSRC_ONEMINUSDSTALPHA:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_INV_DEST_ALPHA;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA;
-                break;
-            case GS_BLSRC_ALPHASATURATE:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA_SAT;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA_SAT;
-                break;
-            case GS_BLSRC_SRCALPHA_A_ZERO:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ZERO;
-                break;
-            case GS_BLSRC_SRC1ALPHA:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC1_ALPHA;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC1_ALPHA;
-                break;
-            default:
-                BS.Desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-                break;
-            }
-
-            //Destination factor
-            switch (st & GS_BLDST_MASK)
-            {
-            case GS_BLDST_ZERO:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_ZERO;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-                break;
-            case GS_BLDST_ONE:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_ONE;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE;
-                break;
-            case GS_BLDST_SRCCOL:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_SRC_COLOR;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-                break;
-            case GS_BLDST_ONEMINUSSRCCOL:
-                if (m_nHDRType == 1 && (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_HDR))
-                {
-                    BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_ONE;
-                    BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE;
-                }
-                else
-                {
-                    BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_COLOR;
-                    BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-                }
-                break;
-            case GS_BLDST_SRCALPHA:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_SRC_ALPHA;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-                break;
-            case GS_BLDST_ONEMINUSSRCALPHA:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-                break;
-            case GS_BLDST_DSTALPHA:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_DEST_ALPHA;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_DEST_ALPHA;
-                break;
-            case GS_BLDST_ONEMINUSDSTALPHA:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_DEST_ALPHA;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA;
-                break;
-            case GS_BLDST_ONE_A_ZERO:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_ONE;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-                break;
-            case GS_BLDST_ONEMINUSSRC1ALPHA:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC1_ALPHA;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC1_ALPHA;
-                break;
-            default:
-                BS.Desc.RenderTarget[0].DestBlend = D3D11_BLEND_ZERO;
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-                break;
-            }
-
-            //Blending operation
-            D3D11_BLEND_OP blendOperation = D3D11_BLEND_OP_ADD;
-            D3D11_BLEND_OP blendOperationAlpha = D3D11_BLEND_OP_ADD;
-            switch (st & GS_BLEND_OP_MASK)
-            {
-            case GS_BLOP_MAX:
-                blendOperation = D3D11_BLEND_OP_MAX;
-                blendOperationAlpha = D3D11_BLEND_OP_MAX;
-                break;
-            case GS_BLOP_MIN:
-                blendOperation = D3D11_BLEND_OP_MIN;
-                blendOperationAlpha = D3D11_BLEND_OP_MIN;
-                break;
-            }
-
-            //Separate blend modes for alpha
-            switch (st & GS_BLALPHA_MASK)
-            {
-            case GS_BLALPHA_MIN:
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-                blendOperationAlpha = D3D11_BLEND_OP_MIN;
-                break;
-            case GS_BLALPHA_MAX:
-                BS.Desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE;
-                BS.Desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-                blendOperationAlpha = D3D11_BLEND_OP_MAX;
-                break;
-            }
-
-            // todo: add separate alpha blend support for mrt
-            for (size_t i = 0; i < RT_STACK_WIDTH; ++i)
-            {
-                BS.Desc.RenderTarget[i].BlendOp = blendOperation;
-                BS.Desc.RenderTarget[i].BlendOpAlpha = blendOperationAlpha;
-            }
-        }
-        else
-        {
-            // todo: add separate alpha blend support for mrt
-            for (size_t i = 0; i < RT_STACK_WIDTH; ++i)
-            {
-                BS.Desc.RenderTarget[i].BlendEnable = FALSE;
-            }
-        }
-
-        // Need to disable color write to MRTs for shadow map alpha blending (not supported by all hw)
-        if ((m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN) && m_pNewTarget[1])
-        {
-            bDirtyBS = true;
-            uint32 nMask = 0xfffffff0 | ((st & GS_COLMASK_MASK) >> GS_COLMASK_SHIFT);
-            nMask = (~nMask) & 0xf;
-            BS.Desc.RenderTarget[0].RenderTargetWriteMask = nMask;
-            if (st & GS_BLEND_MASK)
-            {
-                BS.Desc.IndependentBlendEnable = TRUE;
-                for (size_t i = 1; i < RT_STACK_WIDTH; ++i)
-                {
-                    BS.Desc.RenderTarget[i].RenderTargetWriteMask = 0;
-                    BS.Desc.RenderTarget[i].BlendEnable = FALSE;
-                }
-            }
-            else
-            {
-                BS.Desc.IndependentBlendEnable = FALSE;
-                for (size_t i = 1; i < RT_STACK_WIDTH; ++i)
-                {
-                    BS.Desc.RenderTarget[i].RenderTargetWriteMask = nMask;
-                    BS.Desc.RenderTarget[i].BlendEnable = TRUE;
-                }
-            }
-        }
-    }
-
-    m_RP.m_depthWriteStateUsed |= (st & GS_DEPTHWRITE) != 0;
-    if (Changed & GS_DEPTHWRITE)
-    {
-        bDirtyDS = true;
-        if (st & GS_DEPTHWRITE)
-        {
-            DS.Desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-        }
-        else
-        {
-            DS.Desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO;
-        }
-    }
-
-    if (Changed & GS_NODEPTHTEST)
-    {
-        bDirtyDS = true;
-        if (st & GS_NODEPTHTEST)
-        {
-            DS.Desc.DepthEnable = FALSE;
-        }
-        else
-        {
-            DS.Desc.DepthEnable = TRUE;
-        }
-    }
-
-    if (Changed & GS_STENCIL)
-    {
-        bDirtyDS = true;
-        if (st & GS_STENCIL)
-        {
-            DS.Desc.StencilEnable = TRUE;
-        }
-        else
-        {
-            DS.Desc.StencilEnable = FALSE;
-        }
-    }
-
-    {
-        // Alpha test must be handled in shader in D3D10 API
-        if (((st ^ m_RP.m_CurState) & GS_ALPHATEST_MASK)   || ((st & GS_ALPHATEST_MASK) && (m_RP.m_CurAlphaRef != AlphaRef && AlphaRef != -1)))
-        {
-            if (st & GS_ALPHATEST_MASK)
-            {
-                m_RP.m_CurAlphaRef = AlphaRef;
-                m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ALPHATEST];
-            }
-            else
-            {
-                m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_ALPHATEST];
-            }
-            // When alpha test is turned on or off just changing m_RP.m_FlagsShader_RT doesn't work unless
-            // an update is triggered. Setting this flag appears to cause the correct update.
-            SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-            pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-        }
-    }
-
-    if (bDirtyDS)
-    {
-        SetDepthState(&DS, m_nCurStencRef);
-    }
-    if (bDirtyRS)
-    {
-        SetRasterState(&RS);
-    }
-    if (bDirtyBS)
-    {
-        SetBlendState(&BS);
-    }
-
-    m_RP.m_CurState = st;
-}
-
-void CD3D9Renderer::FX_ZState(uint32& state)
-{
-    assert(m_RP.m_pRootTechnique);      // cannot be 0 here
-
-    if ((m_RP.m_pRootTechnique->m_Flags & (FHF_WASZWRITE | FHF_POSITION_INVARIANT))
-        && m_RP.m_nPassGroupID == EFSLIST_GENERAL
-        && SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID] == 0
-        && CV_r_usezpass)
-    {
-        if ((m_RP.m_nBatchFilter & (FB_GENERAL | FB_MULTILAYERS)) && (m_RP.m_nRendFlags & (SHDF_ALLOWHDR | SHDF_ALLOWPOSTPROCESS)))
-        {
-            if (!(m_RP.m_pRootTechnique->m_Flags & FHF_POSITION_INVARIANT))
-            {
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_measureoverdraw == 4)
-                {
-                    // Hi-Z test only, fine depth test is disabled at the top of FX_SetState()
-                    state |= GS_DEPTHFUNC_HIZEQUAL;
-                }
-                else
-                {
-                    state |= GS_DEPTHFUNC_EQUAL;
-                }
-            }
-            state &= ~(GS_DEPTHWRITE | GS_ALPHATEST_MASK);
-        }
-    }
-}
-
-void CD3D9Renderer::FX_HairState(uint32& nState, const SShaderPass* pPass)
-{
-    if ((m_RP.m_nPassGroupID == EFSLIST_GENERAL || m_RP.m_nPassGroupID == EFSLIST_TRANSP) && !(m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & (RBPF_SHADOWGEN | RBPF_ZPASS))
-        && !(m_RP.m_PersFlags2 & (RBPF2_MOTIONBLURPASS)))
-    {
-        // reset quality settings. BEWARE: these are used by shadows as well
-        m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_TILED_SHADING] | g_HWSR_MaskBit[HWSR_QUALITY1]);
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_QUALITY];
-
-        // force per object fog
-        m_RP.m_FlagsShader_RT |= (g_HWSR_MaskBit[HWSR_FOG] | g_HWSR_MaskBit[HWSR_ALPHABLEND]);
-
-        if (CV_r_DeferredShadingTiled && CV_r_DeferredShadingTiledHairQuality > 0)
-        {
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_TILED_SHADING];
-
-            if (CV_r_DeferredShadingTiledHairQuality > 1)
-            {
-                m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_QUALITY1];
-            }
-        }
-
-        if ((pPass->m_RenderState & GS_DEPTHFUNC_MASK) == GS_DEPTHFUNC_LESS)
-        {
-            nState = (nState & ~(GS_BLEND_MASK | GS_DEPTHFUNC_MASK));
-            nState |= GS_DEPTHFUNC_LESS;
-
-            if ((m_RP.m_nPassGroupID == EFSLIST_TRANSP) && (m_RP.m_pShader->m_Flags2 & EF2_DEPTH_FIXUP) && RenderCapabilities::SupportsDualSourceBlending())
-            {
-                nState |= GS_BLSRC_SRC1ALPHA | GS_BLDST_ONEMINUSSRC1ALPHA | GS_BLALPHA_MIN;
-            }
-            else
-            {
-                nState |= GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-            }
-
-            if (pPass->m_RenderState & GS_DEPTHWRITE)
-            {
-                nState |= GS_DEPTHWRITE;
-            }
-            else
-            {
-                nState &= ~GS_DEPTHWRITE;
-            }
-        }
-        else
-        {
-            nState = (nState & ~(GS_BLEND_MASK | GS_DEPTHFUNC_MASK));
-            nState |= GS_DEPTHFUNC_EQUAL /*| GS_DEPTHWRITE*/;
-        }
-    }
-}
-
-void CD3D9Renderer::FX_CommitStates(const SShaderTechnique* pTech, const SShaderPass* pPass, bool bUseMaterialState)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    uint32 State = 0;
-    int AlphaRef = pPass->m_AlphaRef == 0xff ? -1 : pPass->m_AlphaRef;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    if (rRP.m_pCurObject->m_RState)
-    {
-        switch (rRP.m_pCurObject->m_RState & OS_TRANSPARENT)
-        {
-        case OS_ALPHA_BLEND:
-            State = GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-            break;
-        case OS_ADD_BLEND:
-            // In HDR mode, this is equivalent to pure additive GS_BLSRC_ONE | GS_BLDST_ONE.
-            State = GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCCOL;
-            break;
-        case OS_MULTIPLY_BLEND:
-            State = GS_BLSRC_DSTCOL | GS_BLDST_SRCCOL;
-            break;
-        }
-
-        if (rRP.m_pCurObject->m_RState & OS_NODEPTH_TEST)
-        {
-            State |= GS_NODEPTHTEST;
-        }
-        AlphaRef = 0;
-    }
-    else
-    {
-        State = pPass->m_RenderState;
-    }
-
-    if (bUseMaterialState && rRP.m_MaterialStateOr != 0)
-    {
-        if (rRP.m_MaterialStateOr & GS_ALPHATEST_MASK)
-        {
-            AlphaRef = rRP.m_MaterialAlphaRef;
-        }
-        State &= ~rRP.m_MaterialStateAnd;
-        State |=  rRP.m_MaterialStateOr;
-    }
-
-    //This has higher priority than material states as for alphatested material
-    //it is forced to use depth writing (FX_SetResourcesState)
-    if (rRP.m_pCurObject->m_RState & OS_TRANSPARENT)
-    {
-        State &= ~GS_DEPTHWRITE;
-    }
-
-    if (!(pTech->m_Flags & FHF_POSITION_INVARIANT) && !(pPass->m_PassFlags & SHPF_FORCEZFUNC))
-    {
-        FX_ZState(State);
-    }
-
-    if (bUseMaterialState && (rRP.m_pCurObject->m_fAlpha < 1.0f) && !rRP.m_bIgnoreObjectAlpha)
-    {
-        if (pTech && pTech->m_NameCRC == m_techShadowGen)
-        {
-            // If rendering to a shadow map:
-            State = (State | GS_DEPTHWRITE);
-        }
-        else
-        {
-            // If not rendering to a shadow map:
-            State = (State & ~(GS_BLEND_MASK | GS_DEPTHWRITE)) | (GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-        }
-    }
-
-    State &= ~rRP.m_ForceStateAnd;
-    State |=  rRP.m_ForceStateOr;
-
-    if (rRP.m_pShader->m_Flags2 & EF2_HAIR)
-    {
-        FX_HairState(State, pPass);
-    }
-    else if ((m_RP.m_nPassGroupID == EFSLIST_TRANSP) && (m_RP.m_nSortGroupID == 1) &&
-             !(rRP.m_PersFlags2 & RBPF2_MOTIONBLURPASS) && !(m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & (RBPF_SHADOWGEN | RBPF_ZPASS)))
-    {
-        State &= ~GS_BLALPHA_MASK;
-
-        // Depth fixup for transparent geometry
-        if ((m_RP.m_pShader->m_Flags2 & EF2_DEPTH_FIXUP) && RenderCapabilities::SupportsDualSourceBlending())
-        {
-            if (rRP.m_pCurObject->m_RState & OS_ALPHA_BLEND || ((State & (GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA)) == (GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA)))
-            {
-                State &= ~(GS_NOCOLMASK_A | GS_BLSRC_MASK | GS_BLDST_MASK);
-                State |= GS_BLSRC_SRC1ALPHA | GS_BLDST_ONEMINUSSRC1ALPHA;
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ALPHABLEND] | g_HWSR_MaskBit[HWSR_DEPTHFIXUP];
-
-                // min blending on depth values (alpha channel)
-                State |= GS_BLALPHA_MIN;
-            }
-        }
-    }
-
-    if ((rRP.m_PersFlags2 & RBPF2_ALLOW_DEFERREDSHADING) && (rRP.m_pShader->m_Flags & EF_SUPPORTSDEFERREDSHADING))
-    {
-        if (rTI.m_PersFlags & RBPF_ZPASS)
-        {
-            if ((rRP.m_pShader->m_Flags & EF_DECAL))
-            {
-                State = (State & ~(GS_BLEND_MASK | GS_DEPTHWRITE | GS_DEPTHFUNC_MASK));
-                State |= GS_DEPTHFUNC_LEQUAL | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ALPHABLEND];
-            }
-
-            // Disable alpha writes - for alpha blend case we use default alpha value as a default power factor
-            if (State & GS_BLEND_MASK)
-            {
-                State |= GS_COLMASK_RGB;
-            }
-
-            // Disable alpha testing/depth writes if geometry had a z-prepass
-            if (!(rRP.m_PersFlags2 & RBPF2_ZPREPASS) && (rRP.m_RIs[0][0]->nBatchFlags & FB_ZPREPASS))
-            {
-                State &= ~(GS_DEPTHWRITE | GS_DEPTHFUNC_MASK | GS_ALPHATEST_MASK);
-                State |= GS_DEPTHFUNC_EQUAL;
-                rRP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_ALPHATEST];
-            }
-        }
-    }
-
-    {
-        const AZ::u32 VelocityMask = FOB_MOTION_BLUR | FOB_VERTEX_VELOCITY | FOB_SKINNED;
-        const AZ::u32 SoftwareSkinned = FOB_MOTION_BLUR | FOB_VERTEX_VELOCITY;
-        if ((rRP.m_ObjFlags & VelocityMask) == SoftwareSkinned &&
-            (rRP.m_PersFlags2 & RBPF2_MOTIONBLURPASS) != 0)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_VERTEX_VELOCITY];
-        }
-    }
-
-    if (rRP.m_PersFlags2 & RBPF2_CUSTOM_RENDER_PASS)
-    {
-        rRP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_customvisions == 2)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-            State |= GS_BLSRC_ONE | GS_BLDST_ONE;
-        }
-        else if IsCVarConstAccess(constexpr) (CRenderer::CV_r_customvisions == 3)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-
-            // Ignore depth thresholding in Post3DRender
-            if (rRP.m_PersFlags2 & RBPF2_POST_3D_RENDERER_PASS)
-            {
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-            }
-        }
-    }
-
-    if (m_NewViewport.fMaxZ <= 0.01f)
-    {
-        State &= ~GS_DEPTHWRITE;
-    }
-
-    // Intermediate solution to disable depth testing in 3D HUD
-    if (rRP.m_pCurObject->m_ObjFlags & FOB_RENDER_AFTER_POSTPROCESSING)
-    {
-        State &= ~GS_DEPTHFUNC_MASK;
-        State |= GS_NODEPTHTEST;
-    }
-
-    if (rRP.m_PersFlags2 & RBPF2_DISABLECOLORWRITES)
-    {
-        State &= ~GS_COLMASK_MASK;
-        State |= GS_COLMASK_NONE;
-    }
-
-    FX_SetState(State, AlphaRef);
-
-    if (State & GS_ALPHATEST_MASK)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ALPHATEST];
-    }
-
-    int nBlend = rRP.m_CurState & (GS_BLEND_MASK & ~GS_BLALPHA_MASK);
-    if (nBlend)
-    {
-        //set alpha blend shader flag when the blend mode for color is set to alpha blend.
-        if (nBlend == (GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA)
-            || nBlend == (GS_BLSRC_SRCALPHA | GS_BLDST_ONE)
-            || nBlend == (GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA)
-            || nBlend == (GS_BLSRC_SRCALPHA_A_ZERO | GS_BLDST_ONEMINUSSRCALPHA))
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ALPHABLEND];
-        }
-    }
-
-    // Enable position invariant flag to disable fast math on certain vertex shader operations that affect position calculations.
-    // This fixes issues with geometry that renders in both z-prepass and any other pass from having precision
-    // issues when executing different vertex shaders and expecting the same position output results.
-    if (rRP.m_RIs[0][0]->nBatchFlags & FB_ZPREPASS)
-    {
-        rRP.m_FlagsShader_MDV |= MDV_POSITION_INVARIANT;
-    }
-}
-
-//=====================================================================================
-
-bool CD3D9Renderer::FX_GetTargetSurfaces(CTexture* pTarget, D3DSurface*& pTargSurf, [[maybe_unused]] SRTStack* pCur, int nCMSide, [[maybe_unused]] int nTarget, [[maybe_unused]] uint32 nTileCount)
-{
-    if (pTarget)
-    {
-        if (!CTexture::IsTextureExist(pTarget) && !pTarget->m_bNoDevTexture)
-        {
-            pTarget->CreateRenderTarget(eTF_Unknown, pTarget->GetClearColor());
-        }
-
-        if (!CTexture::IsTextureExist(pTarget))
-        {
-            return false;
-        }
-        pTargSurf = pTarget->GetSurface(nCMSide, 0);
-    }
-    else
-    {
-        pTargSurf = NULL;
-    }
-    return true;
-}
-
-bool CD3D9Renderer::FX_SetRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, [[maybe_unused]] uint32 nTileCount)
-{
-    if (nTarget >= RT_STACK_WIDTH || m_nRTStackLevel[nTarget] >= MAX_RT_STACK)
-    {
-        return false;
-    }
-    HRESULT hr = 0;
-    SRTStack* pCur = &m_RTStack[nTarget][m_nRTStackLevel[nTarget]];
-    pCur->m_pTarget = static_cast<D3DSurface*>(pTargetSurf);
-    pCur->m_pSurfDepth = pDepthTarget;
-    pCur->m_pDepth = pDepthTarget ? (D3DDepthSurface*)pDepthTarget->pSurf : NULL;
-    pCur->m_pTex = NULL;
-
-#ifdef _DEBUG
-    if (m_nRTStackLevel[nTarget] == 0 && nTarget == 0)
-    {
-        assert(pCur->m_pTarget == m_pBackBuffer && (pDepthTarget == nullptr || pCur->m_pDepth == m_pNativeZBuffer));
-    }
-#endif
-
-    pCur->m_bNeedReleaseRT = false;
-    pCur->m_bWasSetRT = false;
-    pCur->m_bWasSetD = false;
-    m_pNewTarget[nTarget] = pCur;
-    if (nTarget == 0)
-    {
-        m_RP.m_StateOr &= ~GS_COLMASK_NONE;
-    }
-    m_nMaxRT2Commit = max(m_nMaxRT2Commit, nTarget);
-    m_RP.m_nCommitFlags |= FC_TARGETS;
-    return (hr == S_OK);
-}
-bool CD3D9Renderer::FX_PushRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount)
-{
-    assert(m_pRT->IsRenderThread());
-    if (nTarget >= RT_STACK_WIDTH || m_nRTStackLevel[nTarget] >= MAX_RT_STACK)
-    {
-        return false;
-    }
-    m_nRTStackLevel[nTarget]++;
-    return FX_SetRenderTarget(nTarget, pTargetSurf, pDepthTarget, nTileCount);
-}
-
-bool CD3D9Renderer::FX_SetRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, bool bPush, int nCMSide, bool bScreenVP, uint32 nTileCount)
-{
-    assert(!nTarget || !pDepthTarget);
-    assert((unsigned int) nTarget < RT_STACK_WIDTH);
-
-    if (pTarget && !(pTarget->GetFlags() & FT_USAGE_RENDERTARGET))
-    {
-        CryFatalError("Attempt to bind a non-render-target texture as a render-target");
-    }
-
-    if (pTarget && pDepthTarget)
-    {
-        if (pTarget->GetWidth() > pDepthTarget->nWidth || pTarget->GetHeight() > pDepthTarget->nHeight)
-        {
-            iLog->LogError("Error: RenderTarget '%s' size:%i x %i DepthSurface size:%i x %i \n", pTarget->GetName(), pTarget->GetWidth(), pTarget->GetHeight(), pDepthTarget->nWidth, pDepthTarget->nHeight);
-        }
-        assert(pTarget->GetWidth() <= pDepthTarget->nWidth);
-        assert(pTarget->GetHeight() <= pDepthTarget->nHeight);
-    }
-
-    if (nTarget >= RT_STACK_WIDTH || m_nRTStackLevel[nTarget] >= MAX_RT_STACK)
-    {
-        return false;
-    }
-
-    SRTStack* pCur = &m_RTStack[nTarget][m_nRTStackLevel[nTarget]];
-    D3DSurface* pTargSurf;
-
-    if (pCur->m_pTex)
-    {
-        if (pCur->m_bNeedReleaseRT)
-        {
-            pCur->m_bNeedReleaseRT = false;
-        }
-        m_pNewTarget[0]->m_bWasSetRT = false;
-        m_pNewTarget[0]->m_pTarget = NULL;
-
-        pCur->m_pTex->DecrementRenderTargetUseCount();
-    }
-
-    if (!pTarget)
-    {
-        pTargSurf = NULL;
-    }
-    else
-    {
-        if (!FX_GetTargetSurfaces(pTarget, pTargSurf, pCur, nCMSide, nTarget, nTileCount))
-        {
-            return false;
-        }
-    }
-
-    if (pTarget)
-    {
-        int nFrameID = m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-        if (pTarget && pTarget->m_nUpdateFrameID != nFrameID)
-        {
-            pTarget->m_nUpdateFrameID = nFrameID;
-        }
-    }
-
-    if (!bPush && pDepthTarget && pDepthTarget->pSurf != pCur->m_pDepth)
-    {
-        //assert(pCur->m_pDepth == m_pCurDepth);
-        //assert(pCur->m_pDepth != m_pZBuffer);   // Attempt to override default Z-buffer surface
-        if (pCur->m_pSurfDepth)
-        {
-            pCur->m_pSurfDepth->bBusy = false;
-        }
-    }
-    pCur->m_pDepth = pDepthTarget ? (D3DDepthSurface*)pDepthTarget->pSurf : NULL;
-    pCur->m_ClearFlags = 0;
-    pCur->m_pTarget = pTargSurf;
-    pCur->m_bNeedReleaseRT = true;
-    pCur->m_bWasSetRT = false;
-    pCur->m_bWasSetD = false;
-    pCur->m_bScreenVP = bScreenVP;
-
-    if (pDepthTarget)
-    {
-        pDepthTarget->bBusy = true;
-        pDepthTarget->nFrameAccess = m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-    }
-
-    if (pTarget)
-    {
-        pCur->m_pTex = pTarget;
-    }
-    else if (pDepthTarget)
-    {
-        pCur->m_pTex = (CTexture*)pDepthTarget->pTex;
-    }
-    else
-    {
-        pCur->m_pTex = NULL;
-    }
-
-    if (pCur->m_pTex)
-    {
-        pCur->m_pTex->IncrementRenderTargetUseCount();
-    }
-
-    pCur->m_pSurfDepth = pDepthTarget;
-
-    if (pTarget)
-    {
-        pCur->m_Width = pTarget->GetWidth();
-        pCur->m_Height = pTarget->GetHeight();
-    }
-    else
-    if (pDepthTarget)
-    {
-        pCur->m_Width = pDepthTarget->nWidth;
-        pCur->m_Height = pDepthTarget->nHeight;
-    }
-    if (!nTarget)
-    {
-        if (bScreenVP)
-        {
-            RT_SetViewport(m_MainViewport.nX, m_MainViewport.nY, m_MainViewport.nWidth, m_MainViewport.nHeight);
-        }
-        else
-        {
-            RT_SetViewport(0, 0, pCur->m_Width, pCur->m_Height);
-        }
-    }
-    m_pNewTarget[nTarget] = pCur;
-    m_nMaxRT2Commit = max(m_nMaxRT2Commit, nTarget);
-    m_RP.m_nCommitFlags |= FC_TARGETS;
-    return true;
-}
-
-CTexture* CD3D9Renderer::FX_GetCurrentRenderTarget(int target)
-{
-    return m_RTStack[target][gcpRendD3D->m_nRTStackLevel[target]].m_pTex;
-}
-
-D3DSurface* CD3D9Renderer::FX_GetCurrentRenderTargetSurface(int target) const
-{
-    return m_RTStack[target][gcpRendD3D->m_nRTStackLevel[target]].m_pTarget;
-}
-
-void CD3D9Renderer::FX_SetColorDontCareActions(int const nTarget,
-    [[maybe_unused]] bool const loadDontCare,
-    [[maybe_unused]] bool const storeDontCare)
-{
-    assert((unsigned int) nTarget < RT_STACK_WIDTH);
-
-    SRTStack* srt = m_pNewTarget[nTarget];
-    assert(srt);
-
-    if (srt->m_pTarget)
-    {
-        // Call appropriate extension depending on rendering platform
-#ifdef CRY_USE_METAL
-        DXMETALSetColorDontCareActions(srt->m_pTarget, loadDontCare, storeDontCare);
-#endif
-#if defined(ANDROID)
-        DXGLSetColorDontCareActions(srt->m_pTarget, loadDontCare, storeDontCare);
-#endif
-    }
-}
-
-void CD3D9Renderer::FX_SetDepthDontCareActions(int const nTarget,
-    [[maybe_unused]] bool const loadDontCare,
-    [[maybe_unused]] bool const storeDontCare)
-{
-    assert((unsigned int) nTarget < RT_STACK_WIDTH);
-
-    SRTStack* srt = m_pNewTarget[nTarget];
-    assert(srt);
-
-    if (srt->m_pDepth)
-    {
-        // Call appropriate extension depending on rendering platform
-#ifdef CRY_USE_METAL
-        DXMETALSetDepthDontCareActions(srt->m_pDepth, loadDontCare, storeDontCare);
-#endif
-#if defined(ANDROID)
-        DXGLSetDepthDontCareActions(srt->m_pDepth, loadDontCare, storeDontCare);
-#endif
-    }
-}
-
-void CD3D9Renderer::FX_SetStencilDontCareActions(int const nTarget,
-    [[maybe_unused]] bool const loadDontCare,
-    [[maybe_unused]] bool const storeDontCare)
-{
-    assert((unsigned int) nTarget < RT_STACK_WIDTH);
-
-    SRTStack* srt = m_pNewTarget[nTarget];
-    assert(srt);
-
-    if (srt->m_pDepth)
-    {
-        // Call appropriate extension depending on rendering platform
-#ifdef CRY_USE_METAL
-        DXMETALSetStencilDontCareActions(srt->m_pDepth, loadDontCare, storeDontCare);
-#endif
-#if defined(ANDROID)
-        DXGLSetStencilDontCareActions(srt->m_pDepth, loadDontCare, storeDontCare);
-#endif
-    }
-}
-
-void CD3D9Renderer::FX_TogglePLS([[maybe_unused]] bool const enable)
-{
-#if defined(OPENGL_ES) && !defined(DESKTOP_GLES)
-    DXGLTogglePLS(&GetDeviceContext(), enable);
-#endif
-}
-
-bool CD3D9Renderer::FX_PushRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, int nCMSide, bool bScreenVP, uint32 nTileCount)
-{
-    assert(m_pRT->IsRenderThread());
-
-    if (nTarget >= RT_STACK_WIDTH || m_nRTStackLevel[nTarget] == MAX_RT_STACK)
-    {
-        assert(0);
-        return false;
-    }
-    m_nRTStackLevel[nTarget]++;
-    return FX_SetRenderTarget(nTarget, pTarget, pDepthTarget, true, nCMSide, bScreenVP, nTileCount);
-}
-
-bool CD3D9Renderer::FX_RestoreRenderTarget(int nTarget)
-{
-    if (nTarget >= RT_STACK_WIDTH || m_nRTStackLevel[nTarget] < 0)
-    {
-        return false;
-    }
-
-    SRTStack* pCur = &m_RTStack[nTarget][m_nRTStackLevel[nTarget]];
-
-    SRTStack* pPrev = &m_RTStack[nTarget][m_nRTStackLevel[nTarget] + 1];
-
-    if (pPrev->m_bNeedReleaseRT)
-    {
-        pPrev->m_bNeedReleaseRT = false;
-        if (pPrev->m_pTarget && pPrev->m_pTarget == m_pNewTarget[nTarget]->m_pTarget)
-        {
-            m_pNewTarget[nTarget]->m_bWasSetRT = false;
-
-            pPrev->m_pTarget = NULL;
-            m_pNewTarget[nTarget]->m_pTarget = NULL;
-        }
-    }
-
-    if (nTarget == 0)
-    {
-        if (pPrev->m_pSurfDepth)
-        {
-            pPrev->m_pSurfDepth->bBusy = false;
-            pPrev->m_pSurfDepth = NULL;
-        }
-    }
-    if (pPrev->m_pTex)
-    {
-        pPrev->m_pTex->DecrementRenderTargetUseCount();
-        pPrev->m_pTex = NULL;
-    }
-    if (!nTarget)
-    {
-        if (pCur->m_bScreenVP)
-        {
-            RT_SetViewport(m_MainViewport.nX, m_MainViewport.nY, m_MainViewport.nWidth, m_MainViewport.nHeight);
-        }
-        else
-        if (!m_nRTStackLevel[nTarget])
-        {
-            RT_SetViewport(0, 0, m_backbufferWidth, m_backbufferHeight);
-        }
-        else
-        {
-            RT_SetViewport(0, 0, pCur->m_Width, pCur->m_Height);
-        }
-    }
-    pCur->m_bWasSetD = false;
-    pCur->m_bWasSetRT = false;
-    m_pNewTarget[nTarget] = pCur;
-    m_nMaxRT2Commit = max(m_nMaxRT2Commit, nTarget);
-
-    m_RP.m_nCommitFlags |= FC_TARGETS;
-    return true;
-}
-bool CD3D9Renderer::FX_PopRenderTarget(int nTarget)
-{
-    assert(m_pRT->IsRenderThread());
-    if (m_nRTStackLevel[nTarget] <= 0)
-    {
-        assert(0);
-        return false;
-    }
-    m_nRTStackLevel[nTarget]--;
-    return FX_RestoreRenderTarget(nTarget);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// REFACTOR BEGIN: (bethelz) Move scratch depth pool into its own class.
-
-SDepthTexture* CD3D9Renderer::FX_GetDepthSurface(int nWidth, int nHeight, [[maybe_unused]] bool bAA, bool shaderResourceView)
-{
-    assert(m_pRT->IsRenderThread());
-
-    SDepthTexture* pSrf = NULL;
-    D3D11_TEXTURE2D_DESC desc;
-    uint32 i;
-    int nBestX = -1;
-    int nBestY = -1;
-    for (i = 0; i < m_TempDepths.Num(); i++)
-    {
-        pSrf = m_TempDepths[i];
-        if (!pSrf->bBusy && pSrf->pSurf)
-        {
-            // verify that this texture supports binding as a shader resource if requested
-            pSrf->pTarget->GetDesc(&desc);
-            if (shaderResourceView && !(desc.BindFlags & D3D11_BIND_SHADER_RESOURCE))
-            {
-                continue;
-            }
-            if (pSrf->nWidth == nWidth && pSrf->nHeight == nHeight)
-            {
-                nBestX = i;
-                break;
-            }
-            if (nBestX < 0 && pSrf->nWidth == nWidth && pSrf->nHeight >= nHeight)
-            {
-                nBestX = i;
-            }
-            else
-            if (nBestY < 0 && pSrf->nWidth >= nWidth && pSrf->nHeight == nHeight)
-            {
-                nBestY = i;
-            }
-        }
-    }
-    if (nBestX >= 0)
-    {
-        return m_TempDepths[nBestX];
-    }
-    if (nBestY >= 0)
-    {
-        return m_TempDepths[nBestY];
-    }
-
-
-    bool allowUsingLargerRT = true;
-
-#if defined(CRY_OPENGL_DO_NOT_ALLOW_LARGER_RT)
-    allowUsingLargerRT = false;
-#elif defined(SUPPORT_D3D_DEBUG_RUNTIME)
-    if (CV_d3d11_debugruntime)
-    {
-        allowUsingLargerRT = false;
-    }
-#endif
-
-    if (allowUsingLargerRT)
-    {
-        for (i = 0; i < m_TempDepths.Num(); i++)
-        {
-            pSrf = m_TempDepths[i];
-            // verify that this texture supports binding as a shader resource if requested
-            pSrf->pTarget->GetDesc(&desc);
-            if (shaderResourceView && !(desc.BindFlags & D3D11_BIND_SHADER_RESOURCE))
-            {
-                continue;
-            }
-            if (pSrf->nWidth >= nWidth && pSrf->nHeight >= nHeight && !pSrf->bBusy)
-            {
-                break;
-            }
-        }
-    }
-    else
-    {
-        i = m_TempDepths.Num();
-    }
-
-    if (i == m_TempDepths.Num())
-    {
-        pSrf = CreateDepthSurface(nWidth, nHeight, shaderResourceView);
-        if (pSrf != nullptr)
-        {
-            if (pSrf->pSurf != nullptr)
-            {
-                m_TempDepths.AddElem(pSrf);
-            }
-            else
-            {
-                DestroyDepthSurface(pSrf);
-                pSrf = nullptr;
-            }
-        }
-    }
-
-    return pSrf;
-}
-
-// Commit changes states to the hardware before drawing
-bool CD3D9Renderer::FX_CommitStreams(SShaderPass* sl, bool bSetVertexDecl)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    //PROFILE_FRAME(Draw_Predraw);
-    SRenderPipeline& RESTRICT_REFERENCE rp(m_RP);
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-    if (CHWShader_D3D::s_pCurInstHS)
-    {
-        rp.m_FlagsStreams_Stream |= (1 << VSF_NORMALS);
-        rp.m_FlagsStreams_Decl |= (1 << VSF_NORMALS);
-    }
-#endif
-
-    HRESULT hr;
-    if (bSetVertexDecl)
-    {
-        if ((m_RP.m_ObjFlags & FOB_POINT_SPRITE) && !CHWShader_D3D::s_pCurInstHS)
-        {
-            rp.m_FlagsStreams_Stream |= VSM_INSTANCED;
-            rp.m_FlagsStreams_Decl |= VSM_INSTANCED;
-        }
-        hr = FX_SetVertexDeclaration(rp.m_FlagsStreams_Decl, rp.m_CurVFormat);
-        if (FAILED(hr))
-        {
-            return false;
-        }
-    }
-
-    if (rp.m_pRE)
-    {
-        bool bRet = rp.m_pRE->mfPreDraw(sl);
-        return bRet;
-    }
-    else if (rp.m_RendNumVerts && rp.m_RendNumIndices)
-    {
-        if (rp.m_FlagsPerFlush & RBSI_EXTERN_VMEM_BUFFERS)
-        {
-            assert(rp.m_pExternalVertexBuffer);
-            assert(rp.m_pExternalIndexBuffer);
-
-            // bind out external vertex/index buffer to use those directly, the client code has to set them up correctly
-            rp.m_pExternalVertexBuffer->Bind(0, 0, rp.m_StreamStride);
-            rp.m_pExternalIndexBuffer->Bind(0);
-
-            // adjust the first index to render from as well as
-            // other renderer stats
-            rp.m_FirstIndex = rp.m_nExternalVertexBufferFirstIndex;
-            rp.m_FirstVertex = rp.m_nExternalVertexBufferFirstVertex;
-
-            rp.m_PS[rp.m_nProcessThreadID].m_DynMeshUpdateBytes += rp.m_StreamStride * rp.m_RendNumVerts;
-            rp.m_PS[rp.m_nProcessThreadID].m_DynMeshUpdateBytes += rp.m_RendNumIndices * sizeof(short);
-
-            // clear external video memory buffer flag
-            rp.m_FlagsPerFlush &= ~RBSI_EXTERN_VMEM_BUFFERS;
-            rp.m_nExternalVertexBufferFirstIndex = 0;
-            rp.m_nExternalVertexBufferFirstVertex = 0;
-            rp.m_pExternalVertexBuffer = NULL;
-            rp.m_pExternalIndexBuffer = NULL;
-        }
-        else
-        {
-            /* NOTE:
-             * It is extremely important that transient dynamic VBs are filled in binding order.
-             * In the following case, rp.m_StreamPtr.Ptr verts data should be filled PRIOR the tangents.
-             * This is due to underlying restrictions of certain rendering layers such as METAL.
-             * The METAL renderer uses a ring buffer for transient data mapped to dynamic VBs.
-             * To calculate the proper offsets when binding the buffers, it assumes the map/unmap
-             * order is following an increasing VB slots binding.
-             *
-             * If the order is switched (tangents are filled before positions), the tangent data
-             * will be used in the slot before the position which will result in a mismatch with
-             * the expected IA layout. This will either cause artifacts or nothing to be rendered.
-             */
-
-            {
-                TempDynVBAny::CreateFillAndBind(rp.m_StreamPtr.Ptr, rp.m_RendNumVerts, 0, rp.m_StreamStride);
-                rp.m_FirstVertex = 0;
-                rp.m_PS[rp.m_nProcessThreadID].m_DynMeshUpdateBytes += rp.m_RendNumVerts * rp.m_StreamStride;
-            }
-
-            if (rp.m_FlagsStreams_Stream & VSM_TANGENTS)
-            {
-                TempDynVB<SPipTangents>::CreateFillAndBind((const SPipTangents*) rp.m_StreamPtrTang.Ptr, rp.m_RendNumVerts, VSF_TANGENTS);
-                rp.m_PersFlags1 |= RBPF1_USESTREAM << VSF_TANGENTS;
-                rp.m_PS[rp.m_nProcessThreadID].m_DynMeshUpdateBytes += rp.m_RendNumVerts * sizeof(SPipTangents);
-            }
-            else
-            if (rp.m_PersFlags1 & (RBPF1_USESTREAM << (VSF_TANGENTS | VSF_QTANGENTS)))
-            {
-                rp.m_PersFlags1 &= ~(RBPF1_USESTREAM << (VSF_TANGENTS | VSF_QTANGENTS));
-                FX_SetVStream(1, NULL, 0, 0);
-            }
-
-            {
-                TempDynIB16::CreateFillAndBind(rp.m_SysRendIndices, rp.m_RendNumIndices);
-                rp.m_FirstIndex = 0;
-                rp.m_PS[rp.m_nProcessThreadID].m_DynMeshUpdateBytes += rp.m_RendNumIndices * sizeof(short);
-            }
-        }
-    }
-
-    return true;
-}
-
-// Draw current indexed mesh
-void CD3D9Renderer::FX_DrawIndexedMesh (const eRenderPrimitiveType nPrimType)
-{
-    DETAILED_PROFILE_MARKER("FX_DrawIndexedMesh");
-    FX_Commit();
-
-    // Don't render fallback in DX11
-    if (!CHWShader_D3D::s_pCurInstVS || !CHWShader_D3D::s_pCurInstPS || CHWShader_D3D::s_pCurInstVS->m_bFallback || CHWShader_D3D::s_pCurInstPS->m_bFallback)
-    {
-        return;
-    }
-    if (CHWShader_D3D::s_pCurInstGS && CHWShader_D3D::s_pCurInstGS->m_bFallback)
-    {
-        return;
-    }
-
-    PROFILE_FRAME(Draw_DrawCall);
-
-    if (nPrimType != eptHWSkinGroups)
-    {
-        eRenderPrimitiveType eType = nPrimType;
-        int nFirstI = m_RP.m_FirstIndex;
-        int nNumI = m_RP.m_RendNumIndices;
-#ifdef TESSELLATION_RENDERER
-        if (CHWShader_D3D::s_pCurInstHS)
-        {
-            FX_SetAdjacencyOffsetBuffer();
-            eType = ept3ControlPointPatchList;
-        }
-#endif
-        FX_DrawIndexedPrimitive(eType, 0, 0, m_RP.m_RendNumVerts, nFirstI, nNumI);
-
-#if defined(ENABLE_PROFILING_CODE)
-#   ifdef TESSELLATION_RENDERER
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygonsByTypes[m_RP.m_nPassGroupDIP][EVCT_STATIC][m_RP.m_nBatchFilter == FB_Z] += (nPrimType == eptTriangleList || nPrimType == ept3ControlPointPatchList ? nNumI / 3 : nNumI - 2);
-#   else
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygonsByTypes[m_RP.m_nPassGroupDIP][EVCT_STATIC][m_RP.m_nBatchFilter == FB_Z] += (nPrimType == eptTriangleList ? nNumI / 3 : nNumI - 2);
-#   endif
-#endif
-    }
-    else
-    {
-        CRenderChunk* pChunk = m_RP.m_pRE->mfGetMatInfo();
-        if (pChunk)
-        {
-            int nNumVerts = pChunk->nNumVerts;
-
-            int nFirstIndexId = pChunk->nFirstIndexId;
-            int nNumIndices = pChunk->nNumIndices;
-
-            if (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & (RBPF_SHADOWGEN) && (gRenDev->m_RP.m_PersFlags2 & RBPF2_DISABLECOLORWRITES))
-            {
-                _smart_ptr<IMaterial> pMaterial = (m_RP.m_pCurObject) ? (m_RP.m_pCurObject->m_pCurrMaterial) : NULL;
-                ((CREMeshImpl*)m_RP.m_pRE)->m_pRenderMesh->AddShadowPassMergedChunkIndicesAndVertices(pChunk, pMaterial, nNumVerts, nNumIndices);
-            }
-
-            eRenderPrimitiveType eType = eptTriangleList;
-
-        #ifdef TESSELLATION_RENDERER
-            if (CHWShader_D3D::s_pCurInstHS)
-            {
-                FX_SetAdjacencyOffsetBuffer();
-                eType = ept3ControlPointPatchList;
-            }
-        #endif
-            FX_DrawIndexedPrimitive(eType, 0, 0, nNumVerts, nFirstIndexId, nNumIndices);
-
-        #if defined(ENABLE_PROFILING_CODE)
-            m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygonsByTypes[m_RP.m_nPassGroupDIP][EVCT_SKINNED][m_RP.m_nBatchFilter == FB_Z] += (pChunk->nNumIndices / 3);
-        #endif
-        }
-    }
-}
-
-//====================================================================================
-
-
-TArray<CRenderObject*> CD3D9Renderer::s_tempObjects[2];
-TArray<SRendItem*> CD3D9Renderer::s_tempRIs;
-
-// Actual drawing of instances
-void CD3D9Renderer::FX_DrawInstances([[maybe_unused]] CShader* ef, SShaderPass* slw, [[maybe_unused]] int nRE, uint32 nStartInst, uint32 nLastInst, uint32 nUsedAttr, [[maybe_unused]] byte* InstanceData, int nInstAttrMask, byte Attributes[], [[maybe_unused]] short dwCBufSlot)
-{
-    DETAILED_PROFILE_MARKER("FX_DrawInstances");
-    uint32 i;
-
-
-    SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-
-
-    if (!CHWShader_D3D::s_pCurInstVS || !CHWShader_D3D::s_pCurInstPS || CHWShader_D3D::s_pCurInstVS->m_bFallback || CHWShader_D3D::s_pCurInstPS->m_bFallback)
-    {
-        return;
-    }
-
-    PREFAST_SUPPRESS_WARNING(6326)
-    if (!nStartInst)
-    {
-        // Set the stream 3 to be per instance data and iterate once per instance
-        rRP.m_PersFlags1 &= ~(RBPF1_USESTREAM << 3);
-        if (!FX_CommitStreams(slw, false))
-        {
-            return;
-        }
-        int StreamMask = rRP.m_FlagsStreams_Decl >> 1;
-        SVertexDeclaration* vd = 0;
-        // See if the desired vertex declaration already exists in m_CustomVD
-        for (i = 0; i < rRP.m_CustomVD.Num(); i++)
-        {
-            vd = rRP.m_CustomVD[i];
-            if (vd->StreamMask == StreamMask && rRP.m_CurVFormat == vd->VertexFormat && vd->InstAttrMask == nInstAttrMask && vd->m_vertexShader == CHWShader_D3D::s_pCurInstVS)
-            {
-                break;
-            }
-        }
-        // If the vertex declaration was not found, create it
-        if (i == rRP.m_CustomVD.Num())
-        {
-            vd = new SVertexDeclaration;
-            rRP.m_CustomVD.AddElem(vd);
-            vd->StreamMask = StreamMask;
-            vd->VertexFormat = rRP.m_CurVFormat;
-            vd->InstAttrMask = nInstAttrMask;
-            vd->m_pDeclaration = NULL;
-            vd->m_vertexShader = CHWShader_D3D::s_pCurInstVS;
-
-            // Copy the base vertex format declaration
-            SOnDemandD3DVertexDeclaration Decl;
-            EF_OnDemandVertexDeclaration(Decl, StreamMask, rRP.m_CurVFormat, false, false);
-
-            int nElementsToCopy = Decl.m_Declaration.size();
-            for (i = 0; i < (uint32)nElementsToCopy; i++)
-            {
-                vd->m_Declaration.push_back(Decl.m_Declaration[i]);
-            }
-
-            // Add additional D3D11_INPUT_ELEMENT_DESCs with the TEXCOORD semantic to the end of the vertex declaration to handle the per instance data
-            uint32 texCoordSemanticIndexOffset = rRP.m_CurVFormat.GetAttributeUsageCount(AZ::Vertex::AttributeUsage::TexCoord);
-            D3D11_INPUT_ELEMENT_DESC elemTC = {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 3, 0, D3D11_INPUT_PER_INSTANCE_DATA, 1}; // texture
-            for (i = 0; i < nUsedAttr; i++)
-            {
-                elemTC.AlignedByteOffset = i * INST_PARAM_SIZE;
-                elemTC.SemanticIndex = Attributes[i] + texCoordSemanticIndexOffset;
-                vd->m_Declaration.push_back(elemTC);
-            }
-        }
-        if (!vd->m_pDeclaration)
-        {
-            HRESULT hr = S_OK;
-            assert (CHWShader_D3D::s_pCurInstVS && CHWShader_D3D::s_pCurInstVS->m_pShaderData);
-            if (FAILED(hr = GetDevice().CreateInputLayout(&vd->m_Declaration[0], vd->m_Declaration.size(), CHWShader_D3D::s_pCurInstVS->m_pShaderData, CHWShader_D3D::s_pCurInstVS->m_nDataSize, &vd->m_pDeclaration)))
-            {
-                return;
-            }
-        }
-        if (m_pLastVDeclaration != vd->m_pDeclaration)
-        {
-            m_pLastVDeclaration = vd->m_pDeclaration;
-            m_DevMan.BindVtxDecl(vd->m_pDeclaration);
-        }
-    }
-
-    int nInsts = nLastInst - nStartInst + 1;
-    {
-        //PROFILE_FRAME(Draw_ShaderIndexMesh);
-#ifndef _RELEASE
-        char instanceLabel[64];
-        if (CV_r_geominstancingdebug)
-        {
-            snprintf(instanceLabel, 63, "Instances: %d", nInsts);
-            PROFILE_LABEL_PUSH(instanceLabel);
-        }
-#endif
-
-        assert (rRP.m_pRE && rRP.m_pRE->mfGetType() == eDATA_Mesh);
-        FX_Commit();
-        D3D11_PRIMITIVE_TOPOLOGY eTopology = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
-#ifdef TESSELLATION_RENDERER
-        if (CHWShader_D3D::s_pCurInstHS)
-        {
-            FX_SetAdjacencyOffsetBuffer();
-            eTopology = D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST;
-        }
-#endif
-        SetPrimitiveTopology(eTopology);
-        m_DevMan.DrawIndexedInstanced(rRP.m_RendNumIndices, nInsts, ApplyIndexBufferBindOffset(rRP.m_FirstIndex), 0, 0);
-
-#ifndef _RELEASE
-        if (CV_r_geominstancingdebug)
-        {
-            PROFILE_LABEL_POP(instanceLabel);
-        }
-#endif
-
-#if defined(ENABLE_PROFILING_CODE)
-        int nPolysPerInst = rRP.m_RendNumIndices / 3;
-        int nPolysAll = nPolysPerInst * nInsts;
-        rRP.m_PS[rRP.m_nProcessThreadID].m_nPolygons[rRP.m_nPassGroupDIP] += rRP.m_RendNumIndices / 3;
-        rRP.m_PS[rRP.m_nProcessThreadID].m_nDIPs[rRP.m_nPassGroupDIP] += nInsts;
-        rRP.m_PS[rRP.m_nProcessThreadID].m_nPolygons[rRP.m_nPassGroupDIP] += nPolysAll;
-        rRP.m_PS[rRP.m_nProcessThreadID].m_nInsts += nInsts;
-        rRP.m_PS[rRP.m_nProcessThreadID].m_nInstCalls++;
-#endif
-    }
-}
-
-#define MAX_HWINST_PARAMS_CONST (240 - VSCONST_INSTDATA)
-
-// Draw geometry instances in single DIP using HW geom. instancing (StreamSourceFreq)
-void CD3D9Renderer::FX_DrawShader_InstancedHW(CShader* ef, SShaderPass* slw)
-{
-#if defined(HW_INSTANCING_ENABLED)
-    PROFILE_FRAME(DrawShader_Instanced);
-
-    SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    // Set culling mode
-    if (!(rRP.m_FlagsPerFlush & RBSI_LOCKCULL))
-    {
-        if (slw->m_eCull != -1)
-        {
-            D3DSetCull((ECull)slw->m_eCull);
-        }
-    }
-
-    bool bProcessedAll = true;
-
-    uint32 i;
-
-    SCGBind bind;
-    byte Attributes[32];
-
-    rRP.m_FlagsPerFlush |= RBSI_INSTANCED;
-
-    TempDynInstVB vb(gcpRendD3D);
-
-    uint32 nCurInst;
-    byte* data = NULL;
-    CShaderResources* pCurRes = rRP.m_pShaderResources;
-    CShaderResources* pSaveRes = pCurRes;
-
-    uint64 nRTFlags = rRP.m_FlagsShader_RT;
-    uint64 nSaveRTFlags = nRTFlags;
-
-    // batch further and send everything as if it's rotated (full 3x4 matrix), even if we could
-    // just send position
-    uint64* __restrict maskBit = g_HWSR_MaskBit;
-
-    nRTFlags |= maskBit[HWSR_INSTANCING_ATTR];
-
-    if IsCVarConstAccess(constexpr) (CV_r_geominstancingdebug > 1)
-    {
-        // !DEBUG0 && !DEBUG1 && DEBUG2 && DEBUG3
-        nRTFlags &= ~(maskBit[HWSR_DEBUG0] | maskBit[HWSR_DEBUG1]);
-        nRTFlags |= (maskBit[HWSR_DEBUG2] | maskBit[HWSR_DEBUG3]);
-    }
-
-    rRP.m_FlagsShader_RT = nRTFlags;
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    short dwCBufSlot = 0;
-
-    CHWShader_D3D* vp = (CHWShader_D3D*)slw->m_VShader;
-    CHWShader_D3D* ps = (CHWShader_D3D*)slw->m_PShader;
-
-    // Set Pixel shader and all associated textures
-    // Note: Need to set pixel shader first to properly set up modifiers for vertex shader (see ShaderCore.cpp & ModificatorTC.cfi)
-    if (!ps->mfSet(HWSF_SETTEXTURES))
-    {
-        rRP.m_FlagsShader_RT = nSaveRTFlags;
-
-        rRP.m_pShaderResources = pSaveRes;
-        rRP.m_PersFlags1 |= RBPF1_USESTREAM << 3;
-        return;
-    }
-
-    // Set Vertex shader
-    if (!vp->mfSet(HWSF_INSTANCED | HWSF_SETTEXTURES))
-    {
-        rRP.m_FlagsShader_RT = nSaveRTFlags;
-
-        rRP.m_pShaderResources = pSaveRes;
-        rRP.m_PersFlags1 |= RBPF1_USESTREAM << 3;
-        return;
-    }
-
-    CHWShader_D3D::SHWSInstance* pVPInst = vp->m_pCurInst;
-    if (!pVPInst || pVPInst->m_bFallback || (ps->m_pCurInst && ps->m_pCurInst->m_bFallback))
-    {
-        return;
-    }
-
-    CHWShader_D3D* curGS = (CHWShader_D3D*)slw->m_GShader;
-    if (curGS)
-    {
-        curGS->mfSet(0);
-        curGS->UpdatePerInstanceConstantBuffer();
-    }
-    else
-    {
-        CHWShader_D3D::mfBindGS(nullptr, nullptr);
-    }
-
-    CHWShader_D3D* pCurHS, * pCurDS;
-    bool bTessEnabled = FX_SetTessellationShaders(pCurHS, pCurDS, slw);
-
-    vp->UpdatePerInstanceConstantBuffer();
-    ps->UpdatePerInstanceConstantBuffer();
-
-    #ifdef TESSELLATION_RENDERER
-    CHWShader_D3D* curCS = (CHWShader_D3D*)slw->m_CShader;
-    if (curCS)
-    {
-        curCS->mfSetCS(0);
-    }
-    else
-    {
-        CHWShader_D3D::mfBindCS(nullptr, nullptr);
-    }
-
-    if (pCurDS)
-    {
-        pCurDS->UpdatePerInstanceConstantBuffer();
-    }
-    if (pCurHS)
-    {
-        pCurHS->UpdatePerInstanceConstantBuffer();
-    }
-    #endif
-
-    // VertexDeclaration of MeshInstance always starts with InstMatrix which has 3 vector4, that's why nUsedAttr is 3.
-    int32 nUsedAttr = 3, nInstAttrMask = 0;
-    pVPInst->GetInstancingAttribInfo(Attributes, nUsedAttr, nInstAttrMask);
-
-    IRenderElement* pRE = NULL;
-    CRenderMesh* pRenderMesh = NULL;
-
-    const int nLastRE = rRP.m_nLastRE;
-    for (int nRE = 0; nRE <= nLastRE; nRE++)
-    {
-        uint32 nRIs = rRP.m_RIs[nRE].size();
-        SRendItem** rRIs = &(rRP.m_RIs[nRE][0]);
-
-        // don't process REs that don't make the cut for instancing.
-        // these were batched with an instance-ready RE, so leave this to drop through into DrawBatch
-        if (nRIs <= (uint32)CRenderer::m_iGeomInstancingThreshold)
-        {
-            bProcessedAll = false;
-            continue;
-        }
-
-        CShaderResources* pRes = SRendItem::mfGetRes(rRIs[0]->SortVal);
-        pRE = rRP.m_pRE = rRIs[0]->pElem;
-        rRP.m_pCurObject = rRIs[0]->pObj;
-
-        CREMeshImpl* __restrict pMesh = (CREMeshImpl*) pRE;
-
-        pRE->mfPrepare(false);
-        {
-            if (pCurRes != pRes)
-            {
-                rRP.m_pShaderResources = pRes;
-                CHWShader_D3D::UpdatePerMaterialConstantBuffer();
-
-                vp->UpdatePerBatchConstantBuffer();
-                if (vp->m_pCurInst)
-                {
-                    vp->mfSetSamplers(vp->m_pCurInst->m_pSamplers, eHWSC_Vertex);
-                }
-                ps->UpdatePerBatchConstantBuffer();
-                if (ps->m_pCurInst)
-                {
-                    ps->mfSetSamplers(ps->m_pCurInst->m_pSamplers, eHWSC_Pixel);
-                }
-#ifdef TESSELLATION_RENDERER
-                if (pCurDS && pCurDS->m_pCurInst)
-                {
-                    pCurDS->mfSetSamplers(pCurDS->m_pCurInst->m_pSamplers, eHWSC_Domain);
-                }
-#endif
-                pCurRes = pRes;
-            }
-
-            if (pMesh->m_pRenderMesh != pRenderMesh)
-            {
-                // Create/Update video mesh (VB management)
-                if (!pRE->mfCheckUpdate(rRP.m_FlagsStreams_Stream, rTI.m_nFrameUpdateID, bTessEnabled))
-                {
-                    rRP.m_FlagsShader_RT = nSaveRTFlags;
-
-                    rRP.m_pShaderResources = pSaveRes;
-                    rRP.m_PersFlags1 |= RBPF1_USESTREAM << 3;
-                    return;
-                }
-
-                pRenderMesh = pMesh->m_pRenderMesh;
-            }
-
-            {
-                nCurInst = 0;
-
-                // Detects possibility of using attributes based instancing
-                // If number of used attributes exceed 16 we can't use attributes based instancing (switch to constant based)
-                int nStreamMask = rRP.m_FlagsStreams_Stream >> 1;
-                int nVFormat = rRP.m_CurVFormat.GetEnum();
-                uint32 nCO = 0;
-                uint32 dwDeclarationSize = 0;
-                if (dwDeclarationSize + nUsedAttr - 1 > 16)
-                {
-                    iLog->LogWarning("WARNING: Attributes based instancing cannot exceed 16 attributes (%s uses %d attr. + %d vertex decl.attr.)[VF: %d, SM: 0x%x]", vp->GetName(), nUsedAttr, dwDeclarationSize - 1, nVFormat, nStreamMask);
-                }
-                else
-                {
-                    while ((int)nCurInst < nRIs)
-                    {
-                        uint32 nLastInst = nRIs - 1;
-
-                        {
-                            uint32 nParamsPerInstAllowed = MAX_HWINST_PARAMS;
-                            if ((nLastInst - nCurInst + 1) * nUsedAttr >= nParamsPerInstAllowed)
-                            {
-                                nLastInst = nCurInst + (nParamsPerInstAllowed / nUsedAttr) - 1;
-                            }
-                        }
-                        {
-                            vb.Allocate(nLastInst - nCurInst + 1, nUsedAttr * INST_PARAM_SIZE);
-                            data = (byte*) vb.Lock();
-                        }
-                        CRenderObject* curObj = rRP.m_pCurObject;
-
-                        // 3 float4 = inst Matrix
-                        const AZ::u32 perInstanceStride = nUsedAttr * sizeof(float[4]);
-
-                        // Fill the stream 3 for per-instance data
-                        byte* pWalkData = data;
-                        for (i = nCurInst; i <= nLastInst; i++)
-                        {
-                            CRenderObject* renderObject = rRIs[nCO++]->pObj;
-                            rRP.m_pCurObject = renderObject;
-                            AzRHI::SIMDCopy(pWalkData, renderObject->m_II.m_Matrix.GetData(), 3);
-
-                            if (pVPInst->m_nParams_Inst >= 0)
-                            {
-                                SCGParamsGroup& Group = CGParamManager::s_Groups[pVPInst->m_nParams_Inst];
-                                vp->UpdatePerInstanceConstants(eHWSC_Vertex, Group.pParams, Group.nParams, pWalkData);
-                            }
-
-                            pWalkData += perInstanceStride;
-                        }
-                        rRP.m_pCurObject = curObj;
-
-                        vb.Unlock();
-
-                        // Set the first stream to be the indexed data and render N instances
-                        vb.Bind(3, nUsedAttr * INST_PARAM_SIZE);
-
-                        vb.Release();
-
-                        FX_DrawInstances(ef, slw, nRE, nCurInst, nLastInst, nUsedAttr, data, nInstAttrMask, Attributes, dwCBufSlot);
-
-                        nCurInst = nLastInst + 1;
-                    }
-                }
-            }
-        }
-    }
-#ifdef TESSELLATION_RENDERER
-    if (bTessEnabled)
-    {
-        CHWShader_D3D::mfBindDS(NULL, NULL);
-        CHWShader_D3D::mfBindHS(NULL, NULL);
-    }
-#endif
-
-    rRP.m_PersFlags1 |= RBPF1_USESTREAM << 3;
-    rRP.m_pShaderResources = pSaveRes;
-    rRP.m_nCommitFlags = FC_ALL;
-    rRP.m_FlagsShader_RT = nSaveRTFlags;
-    rRP.m_nNumRendPasses++;
-    if (!bProcessedAll)
-    {
-        FX_DrawBatches(ef, slw);
-    }
-#else
-    CryFatalError("HW Instancing not supported on this platform");
-#endif
-}
-//#endif
-
-//====================================================================================
-
-byte CD3D9Renderer::FX_StartQuery(SRendItem* pRI)
-{
-    if (!CV_r_ConditionalRendering || !(m_RP.m_nBatchFilter & (FB_Z | FB_GENERAL)))
-    {
-        return 0;
-    }
-#if !defined(NULL_RENDERER)
-    if (m_RP.m_nBatchFilter & FB_Z)
-    {
-        if (m_OcclQueriesUsed >= MAX_OCCL_QUERIES)
-        {
-            return 0;
-        }
-
-        assert(pRI->nOcclQuery > MAX_OCCL_QUERIES);
-        uint32 nQuery = m_OcclQueriesUsed;
-        ++m_OcclQueriesUsed;
-        COcclusionQuery* pQ = &m_OcclQueries[nQuery];
-        if (!pQ->IsCreated())
-        {
-            pQ->Create();
-        }
-        pQ->BeginQuery();
-        pRI->nOcclQuery = nQuery;
-#ifndef _RELEASE
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumQIssued++;
-#endif
-        return 1;
-    }
-    else
-    {
-        if (pRI->nOcclQuery >= MAX_OCCL_QUERIES || pRI->nOcclQuery < 0)
-        {
-            return 0;
-        }
-
-        COcclusionQuery* pQ = &m_OcclQueries[pRI->nOcclQuery];
-#ifndef _RELEASE
-        CTimeValue Time = iTimer->GetAsyncTime();
-#endif
-        uint32 nPixels = pQ->GetVisibleSamples(CV_r_ConditionalRendering == 2 ? false : true);
-#ifndef _RELEASE
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumQStallTime += static_cast<int>(iTimer->GetAsyncTime().GetMilliSeconds() - Time.GetMilliSeconds());
-#endif
-        bool bReady = pQ->IsReady();
-        if (!bReady)
-        {
-#ifndef _RELEASE
-            m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumQNotReady++;
-#endif
-            return 0;
-        }
-        if (nPixels == 0)
-        {
-#ifndef _RELEASE
-            m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumQOccluded++;
-#endif
-            return 2;
-        }
-        return 0;
-    }
-#endif
-}
-
-void CD3D9Renderer::FX_EndQuery(SRendItem* pRI, byte bStartQ)
-{
-    if (!bStartQ)
-    {
-        return;
-    }
-
-    assert(pRI->nOcclQuery < MAX_OCCL_QUERIES);
-    COcclusionQuery* pQ = &m_OcclQueries[pRI->nOcclQuery];
-    pQ->EndQuery();
-}
-
-void CD3D9Renderer::FX_DrawBatchesSkinned(CShader* pSh, SShaderPass* pPass, SSkinningData* pSkinningData)
-{
-    DETAILED_PROFILE_MARKER("FX_DrawBatchesSkinned");
-    PROFILE_FRAME(DrawShader_BatchSkinned);
-
-    SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    CHWShader_D3D* pCurVS = (CHWShader_D3D*)pPass->m_VShader;
-    CHWShader_D3D* pCurPS = (CHWShader_D3D*)pPass->m_PShader;
-
-    const int nThreadID = m_RP.m_nProcessThreadID;
-    const int bRenderLog  = CRenderer::CV_r_log;
-    CREMeshImpl* pRE = (CREMeshImpl*) rRP.m_pRE;
-    CRenderObject* const pSaveObj = rRP.m_pCurObject;
-
-    CHWShader_D3D* pCurGS = (CHWShader_D3D*)pPass->m_GShader;
-
-
-    CRenderMesh* pRenderMesh = pRE->m_pRenderMesh;
-
-    rRP.m_nNumRendPasses++;
-    rRP.m_RendNumGroup = 0;
-    rRP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_VERTEX_VELOCITY];
-
-    if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_Matrix)
-    {
-        rRP.m_FlagsShader_RT |= (g_HWSR_MaskBit[HWSR_SKINNING_MATRIX]);
-    }
-    else if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_DQ_Linear)
-    {
-        rRP.m_FlagsShader_RT |= (g_HWSR_MaskBit[HWSR_SKINNING_DQ_LINEAR]);
-    }
-    else
-    {
-        rRP.m_FlagsShader_RT |= (g_HWSR_MaskBit[HWSR_SKINNING_DUAL_QUAT]);
-    }
-
-    bool bRes = pCurPS->mfSetPS(HWSF_SETTEXTURES);
-    bRes &= pCurVS->mfSetVS(0);
-
-    CHWShader_D3D* pCurHS, *pCurDS;
-    bool bTessEnabled = FX_SetTessellationShaders(pCurHS, pCurDS, pPass);
-
-    if (pCurGS)
-    {
-        bRes &= pCurGS->mfSetGS(0);
-    }
-    else
-    {
-        CHWShader_D3D::mfBindGS(NULL, NULL);
-    }
-
-    const uint numObjects = rRP.m_RIs[0].Num();
-
-    if (!bRes)
-    {
-        goto done;
-    }
-
-    if (CHWShader_D3D::s_pCurInstVS && CHWShader_D3D::s_pCurInstVS->m_bFallback)
-    {
-        goto done;
-    }
-
-    // Create/Update video mesh (VB management)
-    if (!pRE->mfCheckUpdate(m_RP.m_FlagsStreams_Stream, rTI.m_nFrameUpdateID, bTessEnabled))
-    {
-        goto done;
-    }
-
-    if (ShouldApplyFogCorrection())
-    {
-        FX_FogCorrection();
-    }
-
-    // Unlock all VB (if needed) and set current streams
-    if (!FX_CommitStreams(pPass))
-    {
-        goto done;
-    }
-
-    for (uint nObj = 0; nObj < numObjects; ++nObj)
-    {
-        CRenderObject* pObject = rRP.m_RIs[0][nObj]->pObj;
-        rRP.m_pCurObject = pObject;
-
-#ifdef DO_RENDERSTATS
-        if (FX_ShouldTrackStats())
-        {
-            FX_TrackStats(pObject, pRE->m_pRenderMesh);
-        }
-#endif
-
-#ifdef DO_RENDERLOG
-        if (bRenderLog >= 3)
-        {
-            Vec3 vPos = pObject->GetTranslation();
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "+++ HWSkin Group Pass %d (Obj: %d [%.3f, %.3f, %.3f])\n", m_RP.m_nNumRendPasses, pObject->m_Id, vPos[0], vPos[1], vPos[2]);
-        }
-#endif
-
-        pCurVS->UpdatePerInstanceConstantBuffer();
-        pCurPS->UpdatePerInstanceConstantBuffer();
-
-        if (pCurGS)
-        {
-            pCurGS->UpdatePerInstanceConstantBuffer();
-        }
-        else
-        {
-            CHWShader_D3D::mfBindGS(NULL, NULL);
-        }
-#ifdef TESSELLATION_RENDERER
-        if (pCurDS)
-        {
-            pCurDS->UpdatePerInstanceConstantBuffer();
-        }
-        else
-        {
-            CHWShader_D3D::mfBindDS(NULL, NULL);
-        }
-        if (pCurHS)
-        {
-            pCurHS->UpdatePerInstanceConstantBuffer();
-        }
-        else
-        {
-            CHWShader_D3D::mfBindHS(NULL, NULL);
-        }
-#endif
-
-        AzRHI::ConstantBuffer* pBuffer[2] = { NULL };
-        SRenderObjData* pOD = pObject->GetObjData();
-        assert(pOD);
-        if (pOD)
-        {
-            SSkinningData* const skinningData = pOD->m_pSkinningData;
-            if (!pRE->BindRemappedSkinningData(skinningData->remapGUID))
-            {
-                continue;
-            }
-
-            pBuffer[0] = alias_cast<SCharInstCB*>(skinningData->pCharInstCB)->m_buffer;
-
-#ifdef CRY_USE_METAL
-            // Buffer is sometimes null... binding a null skinned VB will fail on METAL
-            if (!pBuffer[0])
-            {
-                continue;
-            }
-#endif
-
-            // get previous data for motion blur if available
-            if (skinningData->pPreviousSkinningRenderData)
-            {
-                pBuffer[1] = alias_cast<SCharInstCB*>(skinningData->pPreviousSkinningRenderData->pCharInstCB)->m_buffer;
-            }
-        }
-        else
-        {
-            continue;
-        }
-
-#ifndef _RELEASE
-        rRP.m_PS[nThreadID].m_NumRendSkinnedObjects++;
-#endif
-
-        m_PerInstanceConstantBufferPool.SetConstantBuffer(rRP.m_RIs[0][nObj]);
-
-        m_DevMan.BindConstantBuffer(eHWSC_Vertex, pBuffer[0], eConstantBufferShaderSlot_SkinQuat);
-        m_DevMan.BindConstantBuffer(eHWSC_Vertex, pBuffer[1], eConstantBufferShaderSlot_SkinQuatPrev);
-        {
-            DETAILED_PROFILE_MARKER("DrawSkinned");
-            if (rRP.m_pRE)
-            {
-                rRP.m_pRE->mfDraw(pSh, pPass);
-            }
-            else
-            {
-                FX_DrawIndexedMesh(pRenderMesh ? pRenderMesh->GetPrimitiveType() : eptTriangleList);
-            }
-        }
-    }
-
-done:
-
-    m_DevMan.BindConstantBuffer(eHWSC_Vertex, nullptr, eConstantBufferShaderSlot_SkinQuat);
-    m_DevMan.BindConstantBuffer(eHWSC_Vertex, nullptr, eConstantBufferShaderSlot_SkinQuatPrev);
-
-    rRP.m_FlagsShader_MD &= ~HWMD_TEXCOORD_FLAG_MASK;
-    rRP.m_pCurObject = pSaveObj;
-
-#ifdef TESSELLATION_RENDERER
-    if (bTessEnabled)
-    {
-        CHWShader_D3D::mfBindDS(NULL, NULL);
-        CHWShader_D3D::mfBindHS(NULL, NULL);
-    }
-#endif
-    rRP.m_RendNumGroup = -1;
-}
-
-#if defined(DO_RENDERSTATS)
-void CD3D9Renderer::FX_TrackStats([[maybe_unused]] CRenderObject* pObj, [[maybe_unused]] IRenderMesh* pRenderMesh)
-{
-#if !defined(_RELEASE)
-    SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-    if (pObj)
-    {
-        if (IRenderNode* pRenderNode = (IRenderNode*)pObj->m_pRenderNode)
-        {
-            //Add to per node map for r_stats 6
-            if (CV_r_stats == 6 || m_pDebugRenderNode || m_bCollectDrawCallsInfoPerNode)
-            {
-                IRenderer::RNDrawcallsMapNode& drawCallsInfoPerNode = rRP.m_pRNDrawCallsInfoPerNode[m_RP.m_nProcessThreadID];
-
-                IRenderer::RNDrawcallsMapNodeItor pItor = drawCallsInfoPerNode.find(pRenderNode);
-
-                if (pItor != drawCallsInfoPerNode.end())
-                {
-                    SDrawCallCountInfo& pInfoDP = pItor->second;
-                    pInfoDP.Update(pObj, pRenderMesh);
-                }
-                else
-                {
-                    SDrawCallCountInfo pInfoDP;
-                    pInfoDP.Update(pObj, pRenderMesh);
-                    drawCallsInfoPerNode.insert(IRenderer::RNDrawcallsMapNodeItor::value_type(pRenderNode, pInfoDP));
-                }
-            }
-
-            //Add to per mesh map for perfHUD
-            if (m_bCollectDrawCallsInfo)
-            {
-                IRenderer::RNDrawcallsMapMesh& drawCallsInfoPerMesh = rRP.m_pRNDrawCallsInfoPerMesh[m_RP.m_nProcessThreadID];
-
-                IRenderer::RNDrawcallsMapMeshItor pItor = drawCallsInfoPerMesh.find(pRenderMesh);
-
-                if (pItor != drawCallsInfoPerMesh.end())
-                {
-                    SDrawCallCountInfo& pInfoDP = pItor->second;
-                    pInfoDP.Update(pObj, pRenderMesh);
-                }
-                else
-                {
-                    SDrawCallCountInfo pInfoDP;
-                    pInfoDP.Update(pObj, pRenderMesh);
-                    drawCallsInfoPerMesh.insert(IRenderer::RNDrawcallsMapMeshItor::value_type(pRenderMesh, pInfoDP));
-                }
-            }
-        }
-    }
-#endif
-}
-#endif
-
-
-
-bool CD3D9Renderer::FX_SetTessellationShaders(CHWShader_D3D*& pCurHS, CHWShader_D3D*& pCurDS, const SShaderPass* pPass)
-{
-    SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-
-#ifdef TESSELLATION_RENDERER
-    pCurHS = (CHWShader_D3D*)pPass->m_HShader;
-    pCurDS = (CHWShader_D3D*)pPass->m_DShader;
-
-    bool bTessEnabled = (pCurHS != NULL) && (pCurDS != NULL) && !(rRP.m_pCurObject->m_ObjFlags & FOB_NEAREST) && (rRP.m_pCurObject->m_ObjFlags & FOB_ALLOW_TESSELLATION);
-
-#ifndef MOTIONBLUR_TESSELLATION
-    bTessEnabled &= !(rRP.m_PersFlags2 & RBPF2_MOTIONBLURPASS);
-#endif
-
-    if (bTessEnabled && pCurHS->mfSetHS(0) && pCurDS->mfSetDS(HWSF_SETTEXTURES))
-    {
-        if (CV_r_tessellationdebug == 1)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG1];
-        }
-
-        return true;
-    }
-
-    CHWShader_D3D::mfBindHS(NULL, NULL);
-    CHWShader_D3D::mfBindDS(NULL, NULL);
-#endif
-
-    rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NO_TESSELLATION];
-
-    pCurHS = NULL;
-    pCurDS = NULL;
-
-    return false;
-}
-
-#ifdef TESSELLATION_RENDERER
-
-void CD3D9Renderer::FX_SetAdjacencyOffsetBuffer()
-{
-#ifdef MESH_TESSELLATION_RENDERER
-    if (m_RP.m_pRE && m_RP.m_pRE->mfGetType() == eDATA_Mesh)
-    {
-        CREMeshImpl* pMesh = (CREMeshImpl*) m_RP.m_pRE;
-        // this buffer contains offset HS has to apply to SV_PrimitiveID it gets from HW. we need this because
-        // sometimes we do not start rendering from the beginning of index buffer
-        // AI AndreyK: probably texture buffer has to be replayed by per-instance constant
-        m_DevMan.BindSRV(eHWSC_Hull, pMesh->m_tessCB.GetShaderResourceView(), 15);
-    }
-    else
-    {
-        m_DevMan.BindSRV(eHWSC_Hull, NULL, 15);
-    }
-#endif
-}
-
-#endif //#ifdef TESSELLATION_RENDERER
-
-void CD3D9Renderer::FX_DrawBatches(CShader* pSh, SShaderPass* pPass)
-{
-    DETAILED_PROFILE_MARKER("FX_DrawBatches");
-    FUNCTION_PROFILER_RENDER_FLAT
-
-        SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    // Set culling mode
-    if (!((rRP.m_FlagsPerFlush & RBSI_LOCKCULL) || (m_RP.m_PersFlags2 & RBPF2_LIGHTSHAFTS)))
-    {
-        if (pPass->m_eCull != -1)
-        {
-            D3DSetCull((ECull)pPass->m_eCull);
-        }
-    }
-
-    bool bHWSkinning = FX_SetStreamFlags(pPass);
-    SSkinningData* pSkinningData = NULL;
-    if (bHWSkinning)
-    {
-        SRenderObjData* pOD = rRP.m_pCurObject->GetObjData();
-        if (!pOD || !pOD->m_pSkinningData)
-        {
-            pSkinningData = pOD->m_pSkinningData;
-            bHWSkinning = false;
-            Warning("Warning: Skinned geometry used without character instance");
-        }
-    }
-    IF(bHWSkinning && (rRP.m_pCurObject->m_ObjFlags & FOB_SKINNED) && !CV_r_character_nodeform, 0)
-    {
-        FX_DrawBatchesSkinned(pSh, pPass, pSkinningData);
-    }
-    else
-    {
-        DETAILED_PROFILE_MARKER("FX_DrawBatchesStatic");
-
-        // Set shaders
-        bool bRes = true;
-        const int rStats = CV_r_stats;
-        const int rLog = CV_r_log;
-
-        CHWShader_D3D* pCurGS = (CHWShader_D3D*)pPass->m_GShader;
-
-        if (pCurGS)
-        {
-            bRes &= pCurGS->mfSetGS(0);
-        }
-        else
-        {
-            CHWShader_D3D::mfBindGS(NULL, NULL);
-        }
-
-        CHWShader_D3D* pCurVS = (CHWShader_D3D*)pPass->m_VShader;
-        CHWShader_D3D* pCurPS = (CHWShader_D3D*)pPass->m_PShader;
-        bRes &= pCurPS->mfSetPS(HWSF_SETTEXTURES);
-        bRes &= pCurVS->mfSetVS(HWSF_SETTEXTURES);
-
-        CHWShader_D3D* pCurHS, * pCurDS;
-        bool bTessEnabled = FX_SetTessellationShaders(pCurHS, pCurDS, pPass);
-
-        if (bRes)
-        {
-            if (ShouldApplyFogCorrection())
-            {
-                FX_FogCorrection();
-            }
-
-            assert(rRP.m_pRE || !rRP.m_nLastRE);
-            IRenderElement* pRE = rRP.m_pRE;
-            IRenderElement* pRESave = pRE;
-            CRenderObject* pSaveObj = rRP.m_pCurObject;
-            CShaderResources* pCurRes = rRP.m_pShaderResources;
-            CShaderResources* pSaveRes = pCurRes;
-            for (int nRE = 0; nRE <= rRP.m_nLastRE; nRE++)
-            {
-                TArray<SRendItem*>& rRIs = rRP.m_RIs[nRE];
-                if (!(rRP.m_FlagsPerFlush & RBSI_INSTANCED) || rRIs.size() <= (unsigned)CRenderer::m_iGeomInstancingThreshold)
-                {
-                    if (pRE)
-                    {
-                        // Check the material for this object and make sure that it is actually supposed to be casting a shadow.
-                        const bool isShadowPass = m_RP.m_nPassGroupID == EFSLIST_SHADOW_GEN;
-                        int objectMaterialID = rRIs[0]->pElem->mfGetMatId();
-                        if (isShadowPass && (objectMaterialID != -1))
-                        {
-                            if (rRIs[0]->pObj->m_pCurrMaterial && (rRIs[0]->pObj->m_pCurrMaterial->GetSafeSubMtl(objectMaterialID)->GetFlags() & MTL_FLAG_NOSHADOW))
-                            {
-                                continue;
-                            }
-                        }
-
-                        pRE = rRP.m_pRE = rRIs[0]->pElem;
-                        rRP.m_pCurObject = rRIs[0]->pObj;
-                        CShaderResources* pRes = (rRP.m_PersFlags2 & RBPF2_MATERIALLAYERPASS) ? rRP.m_pShaderResources : SRendItem::mfGetRes(rRIs[0]->SortVal);
-                        uint32 nFrameID = rTI.m_nFrameUpdateID;
-                        if (!pRE->mfCheckUpdate(rRP.m_FlagsStreams_Stream | 0x80000000, nFrameID, bTessEnabled))
-                        {
-                            continue;
-                        }
-                        if (nRE || rRP.m_nNumRendPasses || pCurRes != pRes) // Only static meshes (CREMeshImpl) can use geom batching
-                        {
-                            rRP.m_pShaderResources = pRes;
-                            CHWShader_D3D::UpdatePerMaterialConstantBuffer();
-
-                            pRE->mfPrepare(false);
-                            CREMeshImpl* pM = (CREMeshImpl*)pRE;
-                            if (pM->m_CustomData || pCurRes != pRes) // Custom data can indicate some shader parameters are from mesh
-                            {
-                                pCurVS->UpdatePerBatchConstantBuffer();
-                                pCurPS->UpdatePerBatchConstantBuffer();
-                                if (pCurPS->m_pCurInst)
-                                {
-                                    pCurPS->mfSetSamplers(pCurPS->m_pCurInst->m_pSamplers, eHWSC_Pixel);
-                                }
-                                if (pCurVS->m_pCurInst)
-                                {
-                                    pCurVS->mfSetSamplers(pCurVS->m_pCurInst->m_pSamplers, eHWSC_Vertex);
-                                }
-#ifdef TESSELLATION_RENDERER
-                                if (pCurDS && pCurDS->m_pCurInst)
-                                {
-                                    pCurDS->mfSetSamplers(pCurDS->m_pCurInst->m_pSamplers, eHWSC_Domain);
-                                }
-#endif
-                                pCurRes = pRes;
-                            }
-                        }
-                    }
-
-                    rRP.m_nNumRendPasses++;
-                    // Unlock all VBs (if needed) and bind current streams
-                    if (FX_CommitStreams(pPass))
-                    {
-                        uint32 nO;
-                        const uint32 nNumRI = rRIs.Num();
-                        CRenderObject* pObj = NULL;
-                        CRenderObject::SInstanceInfo* pI;
-#ifdef DO_RENDERSTATS
-                        if ((CV_r_stats == 6 || m_pDebugRenderNode || m_bCollectDrawCallsInfo))
-                        {
-                            for (nO = 0; nO < nNumRI; nO++)
-                            {
-                                pObj = rRIs[nO]->pObj;
-
-                                IRenderElement* pElemBase = rRIs[nO]->pElem;
-
-                                if (pElemBase->mfGetType() == eDATA_Mesh)
-                                {
-                                    CREMeshImpl* pMesh = (CREMeshImpl*)pElemBase;
-                                    IRenderMesh* pRenderMesh = pMesh ? pMesh->m_pRenderMesh : NULL;
-
-                                    FX_TrackStats(pObj, pRenderMesh);
-                                }
-                            }
-                        }
-#endif
-
-                        for (nO = 0; nO < nNumRI; ++nO)
-                        {
-                            pObj = rRIs[nO]->pObj;
-                            rRP.m_pCurObject = pObj;
-                            pI = &pObj->m_II;
-                            byte bStartQ = FX_StartQuery(rRIs[nO]);
-                            if (bStartQ == 2)
-                            {
-                                continue;
-                            }
-
-#ifdef DO_RENDERLOG
-                            if (rLog >= 3)
-                            {
-                                Vec3 vPos = pObj->GetTranslation();
-                                Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "+++ General Pass %d (Obj: %d [%.3f, %.3f, %.3f], %.3f)\n", m_RP.m_nNumRendPasses, pObj->m_Id, vPos[0], vPos[1], vPos[2], pObj->m_fDistance);
-                            }
-#endif
-
-                            pCurVS->UpdatePerInstanceConstantBuffer();
-                            pCurPS->UpdatePerInstanceConstantBuffer();
-
-                            if (pCurGS)
-                            {
-                                pCurGS->UpdatePerInstanceConstantBuffer();
-                            }
-                            else
-                            {
-                                CHWShader_D3D::mfBindGS(NULL, NULL);
-                            }
-#ifdef TESSELLATION_RENDERER
-                            if (pCurDS)
-                            {
-                                pCurDS->UpdatePerInstanceConstantBuffer();
-                            }
-                            if (pCurHS)
-                            {
-                                pCurHS->UpdatePerInstanceConstantBuffer();
-                            }
-#endif
-
-                            AZ_Assert(rRIs[nO], "current render item is null");
-                            m_PerInstanceConstantBufferPool.SetConstantBuffer(rRIs[nO]);
-
-                            {
-                                if (pRE)
-                                {
-                                    pRE->mfDraw(pSh, pPass);
-                                }
-                                else
-                                {
-                                    FX_DrawIndexedMesh(eptTriangleList);
-                                }
-                            }
-
-                            m_RP.m_nCommitFlags &= ~(FC_TARGETS | FC_GLOBAL_PARAMS);
-                            FX_EndQuery(rRIs[nO], bStartQ);
-                        }
-
-                        rRP.m_FlagsShader_MD &= ~(HWMD_TEXCOORD_FLAG_MASK);
-                        if (pRE)
-                        {
-                            pRE->mfClearFlags(FCEF_PRE_DRAW_DONE);
-                        }
-                    }
-                    rRP.m_pCurObject = pSaveObj;
-                    rRP.m_pRE = pRESave;
-                    rRP.m_pShaderResources = pSaveRes;
-                }
-            }
-        }
-#ifdef TESSELLATION_RENDERER
-        if (bTessEnabled)
-        {
-            CHWShader_D3D::mfBindHS(NULL, NULL);
-            CHWShader_D3D::mfBindDS(NULL, NULL);
-        }
-#endif
-    }
-    m_RP.m_nCommitFlags = FC_ALL;
-}
-
-//============================================================================================
-
-void CD3D9Renderer::FX_DrawShader_General(CShader* ef, SShaderTechnique* pTech)
-{
-    SShaderPass* slw;
-    int32 i;
-
-    PROFILE_FRAME(DrawShader_Generic);
-
-
-    EF_Scissor(false, 0, 0, 0, 0);
-
-    if (pTech->m_Passes.Num())
-    {
-        slw = &pTech->m_Passes[0];
-        const int nCount = pTech->m_Passes.Num();
-        uint32 curPassBit = 1;
-        for (i = 0; i < nCount; i++, slw++, (curPassBit <<= 1))
-        {
-            m_RP.m_pCurPass = slw;
-
-            // Set all textures and HW TexGen modes for the current pass (ShadeLayer)
-            assert (slw->m_VShader && slw->m_PShader);
-            if (!slw->m_VShader || !slw->m_PShader || (curPassBit & m_RP.m_CurPassBitMask))
-            {
-                continue;
-            }
-
-            FX_CommitStates(pTech, slw, (slw->m_PassFlags & SHPF_NOMATSTATE) == 0);
-
-            bool bSkinned = (m_RP.m_pCurObject->m_ObjFlags & FOB_SKINNED) && !CV_r_character_nodeform;
-
-            bSkinned |= FX_SetStreamFlags(slw);
-
-            if (m_RP.m_FlagsPerFlush & RBSI_INSTANCED && !bSkinned)
-            {
-                // Using HW geometry instancing approach
-                FX_DrawShader_InstancedHW(ef, slw);
-            }
-            else
-            {
-                FX_DrawBatches(ef, slw);
-            }
-        }
-    }
-}
-
-void CD3D9Renderer::FX_DrawShader_Fur(CShader* ef, SShaderTechnique* pTech)
-{
-    static CCryNameTSCRC techFurZPost("FurZPost");
-    FurPasses& furPasses = FurPasses::GetInstance();
-    bool isFurZPost = (pTech->m_NameCRC == techFurZPost);
-    furPasses.SetFurShellPassPercent(isFurZPost ? 1.0f : 0.0f);
-
-    // Fur should be rendered with an object containing a render node.
-    // Example of objects without render node are various effects such as light beams
-    // light arc that their material was set to Fur by mistake - in such case we gracefully don't render ;)
-    // Adding a trace warning is an option but it'll slow down the render frame quite noticeably. 
-    if (!m_RP.m_pCurObject || !m_RP.m_pCurObject->m_pRenderNode)
-        return;
-
-    static CCryNameTSCRC techFurShell("General");
-    if (pTech->m_NameCRC == techFurShell)
-    {
-        PROFILE_FRAME(DrawShader_Fur);
-
-
-        EF_Scissor(false, 0, 0, 0, 0);
-
-        int recurseLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID]; // Skip fur shells for recursive passes
-        FurPasses::RenderMode furRenderMode = furPasses.GetFurRenderingMode();
-        if (pTech->m_Passes.Num() && furRenderMode != FurPasses::RenderMode::None && CV_r_FurShellPassCount > 0 && recurseLevel == 0)
-        {
-            uint64 nSavedFlags = m_RP.m_FlagsShader_RT;
-            uint32 nSavedStateAnd = m_RP.m_ForceStateAnd;
-
-            furPasses.ApplyFurDebugFlags();
-
-            if (furRenderMode == FurPasses::RenderMode::AlphaTested)
-            {
-                m_RP.m_ForceStateAnd |= GS_BLALPHA_MASK | GS_BLEND_MASK;
-                m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_ADDITIVE_BLENDING];
-
-                // Ensure that alpha testing is set up for alpha tested fur shells, even if not specified in the
-                // material, by forcing a minimum alpha test of 0.01. This allows fur materials that do not
-                // specify alpha testing to appear similar to alpha blended fur, but materials that control
-                // alpha testing still benefit from their settings.
-                FX_SetAlphaTestState(max(0.01f, m_RP.m_pShaderResources->GetAlphaRef()));
-            }
-            else if (furRenderMode == FurPasses::RenderMode::AlphaBlended)
-            {
-                // Even if the material specifies alpha testing, don't write depth for alpha blended fur shells
-                m_RP.m_ForceStateAnd |= GS_DEPTHWRITE;
-            }
-
-            // OIT permutation flag set
-            MultiLayerAlphaBlendPass::GetInstance().ConfigureShaderFlags(m_RP.m_FlagsShader_RT);
-
-            assert(pTech->m_Passes.Num() == 1);
-
-            SShaderPass* slw = &pTech->m_Passes[0];
-            m_RP.m_pCurPass = slw;
-
-            // Set all textures and HW TexGen modes for the current pass (ShadeLayer)
-            assert (slw->m_VShader && slw->m_PShader);
-            if (slw->m_VShader && slw->m_PShader)
-            {
-                FX_CommitStates(pTech, slw, (slw->m_PassFlags & SHPF_NOMATSTATE) == 0);
-
-                bool bSkinned = (m_RP.m_pCurObject->m_ObjFlags & FOB_SKINNED) && !CV_r_character_nodeform;
-
-                bSkinned |= FX_SetStreamFlags(slw);
-
-                int startShell = 1;
-                int endShell = CV_r_FurShellPassCount;
-                int numShellPasses = CV_r_FurShellPassCount;
-
-                if ((m_RP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_HDR_MODE]) == 0)
-                {
-                    // For aux views such as the material editor, draw the base surface, as it is not captured by Z pass there
-                    startShell = 0;
-                }
-
-                if (CV_r_FurDebugOneShell > 0 && CV_r_FurDebugOneShell <= CV_r_FurShellPassCount)
-                {
-                    startShell = CV_r_FurDebugOneShell;
-                    endShell = startShell;
-                }
-                else if (IRenderNode* pRenderNode = m_RP.m_pCurObject->m_pRenderNode)
-                {
-                    // Scale number of shell passes by object's distance to camera and LOD ratio
-                    float lodRatio = pRenderNode->GetLodRatioNormalized();
-                    if (lodRatio > 0.0f)
-                    {
-                        static ICVar* pTargetSize = gEnv->pConsole->GetCVar("e_LodFaceAreaTargetSize");
-                        if (pTargetSize)
-                        {
-                            lodRatio *= pTargetSize->GetFVal();
-                        }
-
-                        // Not using pRenderNode->GetMaxViewDist() because we want to be able to LOD out the fur while still being able to see the object at distance
-                        float   maxDistance = CV_r_FurMaxViewDist * pRenderNode->GetViewDistanceMultiplier();
-                        float   firstLodDistance = pRenderNode->GetFirstLodDistance();
-                        float   lodDistance = AZ::GetClamp(firstLodDistance / lodRatio, 0.0f, maxDistance - 0.001f);
-
-                        // Distance before first LOD change (factoring in LOD ratio) uses full number of shells
-                        // Beyond that distance, number of shells linearly decreases to 0 as distance approaches max view distance.
-                        float distance = m_RP.m_pCurObject->m_fDistance;
-                        float distanceRatio = (maxDistance - distance) / (maxDistance - lodDistance);
-                        float clampedDistanceRatio = AZ::GetClamp(distanceRatio, 0.0f, 1.0f);
-                        endShell = aznumeric_cast<int>(endShell * clampedDistanceRatio);
-                        numShellPasses = endShell;
-                    }
-                }
-
-                numShellPasses = AZ::GetMax(numShellPasses, 1);
-                for (int i = startShell; i <= endShell; ++i)
-                {
-                    // Set shell distance from base surface in fur params
-                    furPasses.SetFurShellPassPercent(static_cast<float>(i) / numShellPasses);
-
-                    if (m_RP.m_FlagsPerFlush & RBSI_INSTANCED && !bSkinned)
-                    {
-                        // Using HW geometry instancing approach
-                        FX_DrawShader_InstancedHW(ef, slw);
-                    }
-                    else
-                    {
-                        FX_DrawBatches(ef, slw);
-                    }
-                }
-            }
-
-            m_RP.m_ForceStateAnd = nSavedStateAnd;
-            m_RP.m_FlagsShader_RT = nSavedFlags;
-        }
-    }
-    else
-    {
-        uint64 nSavedFlags = m_RP.m_FlagsShader_RT;
-        static CCryNameTSCRC techFurShadow("FurShadowGen");
-        if (pTech->m_NameCRC == techFurShadow)
-        {
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_GPU_PARTICLE_TURBULENCE]; // Indicates fin pass
-            if (CV_r_FurFinShadowPass == 0 || furPasses.GetFurRenderingMode() == FurPasses::RenderMode::None)
-            {
-                m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_GPU_PARTICLE_SHADOW_PASS]; // Indicates fins should be skipped in shadow pass
-            }
-        }
-
-        // All other techniques use the normal path
-        FX_DrawShader_General(ef, pTech);
-        m_RP.m_FlagsShader_RT = nSavedFlags;
-    }
-}
-
-void CD3D9Renderer::FX_DrawDebugPasses()
-{
-    if (!m_RP.m_pRootTechnique || m_RP.m_pRootTechnique->m_nTechnique[TTYPE_DEBUG] < 0)
-    {
-        return;
-    }
-
-    CShader* sh = m_RP.m_pShader;
-    SShaderTechnique* pTech = m_RP.m_pShader->m_HWTechniques[m_RP.m_pRootTechnique->m_nTechnique[TTYPE_DEBUG]];
-
-    PROFILE_FRAME(DrawShader_DebugPasses);
-
-    PROFILE_LABEL_SCOPE("DEBUG_PASS");
-
-    int nLastRE = m_RP.m_nLastRE;
-    m_RP.m_nLastRE = 0;
-    for (int nRE = 0; nRE <= nLastRE; nRE++)
-    {
-        s_tempRIs.SetUse(0);
-
-        m_RP.m_pRE = m_RP.m_RIs[nRE][0]->pElem;
-
-        if (!m_RP.m_pRE)
-        {
-            continue;
-        }
-
-        for (uint32 i = 0; i < m_RP.m_RIs[nRE].Num(); i++)
-        {
-            s_tempRIs.AddElem(m_RP.m_RIs[nRE][i]);
-        }
-
-        if (!s_tempRIs.Num())
-        {
-            continue;
-        }
-
-        m_RP.m_pRE->mfPrepare(false);
-        uint32 nSaveMD = m_RP.m_FlagsShader_MD;
-
-        TArray<SRendItem*> saveArr;
-        saveArr.Assign(m_RP.m_RIs[0]);
-        m_RP.m_RIs[0].Assign(s_tempRIs);
-
-        CRenderObject* pSaveObject = m_RP.m_pCurObject;
-        m_RP.m_pCurObject = m_RP.m_RIs[0][0]->pObj;
-        m_RP.m_FlagsShader_MD &= ~HWMD_TEXCOORD_FLAG_MASK;
-        int32 nMaterialStatePrevOr = m_RP.m_MaterialStateOr;
-        int32 nMaterialStatePrevAnd = m_RP.m_MaterialStateAnd;
-        m_RP.m_MaterialStateAnd = GS_BLEND_MASK;
-        m_RP.m_MaterialStateOr = GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-
-        FX_DrawTechnique(sh, pTech);
-
-        m_RP.m_RIs[0].Assign(saveArr);
-        saveArr.ClearArr();
-
-        m_RP.m_pCurObject = pSaveObject;
-        m_RP.m_pPrevObject = NULL;
-        m_RP.m_FlagsShader_MD = nSaveMD;
-        m_RP.m_MaterialStateOr = nMaterialStatePrevOr;
-        m_RP.m_MaterialStateAnd = nMaterialStatePrevAnd;
-    }
-    m_RP.m_nLastRE = nLastRE;
-}
-
-// deprecated (cannot remove at this stage) - maybe can batch into FX_DrawEffectLayerPasses (?)
-void CD3D9Renderer::FX_DrawMultiLayers()
-{
-    // Verify if current mesh has valid data for layers
-    CREMeshImpl* pRE = (CREMeshImpl*) m_RP.m_pRE;
-    if (!m_RP.m_pShader || !m_RP.m_pShaderResources || !m_RP.m_pCurObject->m_nMaterialLayers)
-    {
-        return;
-    }
-
-    _smart_ptr<IMaterial> pObjMat = m_RP.m_pCurObject->m_pCurrMaterial;
-    if ((SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID] > 0) || !m_RP.m_pShaderResources || !pObjMat)
-    {
-        return;
-    }
-
-    if (m_RP.m_PersFlags2 & (RBPF2_CUSTOM_RENDER_PASS | RBPF2_MOTIONBLURPASS))
-    {
-        return;
-    }
-
-    CRenderChunk* pChunk = pRE->m_pChunk;
-    if (!pChunk)
-    {
-        assert(pChunk);
-        return;
-    }
-
-    // Check if chunk material has layers at all
-    _smart_ptr<IMaterial> pDefaultMtl = gEnv->p3DEngine->GetMaterialManager()->GetDefaultLayersMaterial();
-    _smart_ptr<IMaterial> pCurrMtl = pObjMat->GetSubMtlCount() ? pObjMat->GetSubMtl(pChunk->m_nMatID) : pObjMat;
-    if (!pCurrMtl || !pDefaultMtl || (pCurrMtl->GetFlags() & MTL_FLAG_NODRAW))
-    {
-        return;
-    }
-
-    uint32 nLayerCount = pDefaultMtl->GetLayerCount();
-    if (!nLayerCount)
-    {
-        return;
-    }
-
-    // Start multi-layers processing
-    PROFILE_FRAME(DrawShader_MultiLayers);
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** Start Multilayers processing ***\n");
-    }
-
-    for (int nRE = 0; nRE <= m_RP.m_nLastRE; nRE++)
-    {
-        m_RP.m_pRE = m_RP.m_RIs[nRE][0]->pElem;
-
-        // Render all layers
-        for (uint32 nCurrLayer(0); nCurrLayer < nLayerCount; ++nCurrLayer)
-        {
-            IMaterialLayer* pLayer = const_cast< IMaterialLayer* >(pCurrMtl->GetLayer(nCurrLayer));
-            IMaterialLayer* pDefaultLayer =  const_cast< IMaterialLayer* >(pDefaultMtl->GetLayer(nCurrLayer));
-            bool bDefaultLayer = false;
-            if (!pLayer)
-            {
-                // Replace with default layer
-                pLayer =  pDefaultLayer;
-                bDefaultLayer = true;
-
-                if (!pLayer)
-                {
-                    continue;
-                }
-            }
-
-            if (!pLayer->IsEnabled() || pLayer->DoesFadeOut())
-            {
-                continue;
-            }
-
-            // Set/verify layer shader technique
-            SShaderItem& pCurrShaderItem = pLayer->GetShaderItem();
-            CShader* pSH = static_cast<CShader*>(pCurrShaderItem.m_pShader);
-            if (!pSH || pSH->m_HWTechniques.empty())
-            {
-                continue;
-            }
-
-            SShaderTechnique* pTech = pSH->m_HWTechniques[0];
-            if (!pTech)
-            {
-                continue;
-            }
-
-            // Re-create render object list, based on layer properties
-            {
-                s_tempRIs.SetUse(0);
-
-                CRenderObject* pObj = m_RP.m_pCurObject;
-                uint32 nObj = 0;
-
-                for (nObj = 0; nObj < m_RP.m_RIs[nRE].Num(); nObj++)
-                {
-                    pObj = m_RP.m_RIs[nRE][nObj]->pObj;
-                    uint8 nMaterialLayers = 0;
-                    nMaterialLayers |= ((pObj->m_nMaterialLayers & MTL_LAYER_BLEND_DYNAMICFROZEN)) ? MTL_LAYER_FROZEN : 0;
-                    if (nMaterialLayers & (1 << nCurrLayer))
-                    {
-                        s_tempRIs.AddElem(m_RP.m_RIs[nRE][nObj]);
-                    }
-                }
-
-                // nothing in render list
-                if (!s_tempRIs.Num())
-                {
-                    continue;
-                }
-            }
-
-            int nSaveLastRE = m_RP.m_nLastRE;
-            m_RP.m_nLastRE = 0;
-
-            TexturesResourcesMap        pPrevLayerResourceTex;     // A map of texture used by the shader
-            if (bDefaultLayer)
-            {   // Keep layer resources and replace with resources from base shader
-                pPrevLayerResourceTex = ((CShaderResources*)pCurrShaderItem.m_pShaderResources)->m_TexturesResourcesMap; 
-                ((CShaderResources*)pCurrShaderItem.m_pShaderResources)->m_TexturesResourcesMap = m_RP.m_pShaderResources->m_TexturesResourcesMap;
-            }
-
-            m_RP.m_pRE->mfPrepare(false);
-
-            // Store current rendering data
-            TArray<SRendItem*> pPrevRenderObjLst;
-            pPrevRenderObjLst.Assign(m_RP.m_RIs[0]);
-            CRenderObject* pPrevObject = m_RP.m_pCurObject;
-            CShaderResources* pPrevShaderResources = m_RP.m_pShaderResources;
-            CShader* pPrevSH = m_RP.m_pShader;
-            uint32 nPrevNumRendPasses = m_RP.m_nNumRendPasses;
-            uint64 nFlagsShaderRTprev = m_RP.m_FlagsShader_RT;
-
-            SShaderTechnique* pPrevRootTech = m_RP.m_pRootTechnique;
-            m_RP.m_pRootTechnique = pTech;
-
-            int nMaterialStatePrevOr = m_RP.m_MaterialStateOr;
-            int nMaterialStatePrevAnd = m_RP.m_MaterialStateAnd;
-            uint32 nFlagsShaderLTprev = m_RP.m_FlagsShader_LT;
-
-            int nPersFlagsPrev = m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags;
-            int nPersFlags2Prev = m_RP.m_PersFlags2;
-            int nMaterialAlphaRefPrev = m_RP.m_MaterialAlphaRef;
-            bool bIgnoreObjectAlpha = m_RP.m_bIgnoreObjectAlpha;
-            m_RP.m_bIgnoreObjectAlpha = true;
-
-            m_RP.m_pShader = pSH;
-            m_RP.m_RIs[0].Assign(s_tempRIs);
-            m_RP.m_pCurObject = m_RP.m_RIs[0][0]->pObj;
-            m_RP.m_pPrevObject = NULL;
-            m_RP.m_pShaderResources = (CShaderResources*)pCurrShaderItem.m_pShaderResources;
-
-            // Reset light passes (need ambient)
-            m_RP.m_nNumRendPasses = 0;
-            m_RP.m_PersFlags2 |= RBPF2_MATERIALLAYERPASS;
-
-            if ((1 << nCurrLayer) & MTL_LAYER_FROZEN)
-            {
-                m_RP.m_MaterialStateAnd = GS_BLEND_MASK | GS_ALPHATEST_MASK;
-                m_RP.m_MaterialStateOr  = GS_BLSRC_ONE | GS_BLDST_ONE;
-                m_RP.m_MaterialAlphaRef = 0xff;
-            }
-
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-
-            FX_DrawTechnique(pSH, pTech);
-
-            // Restore previous rendering data
-            m_RP.m_RIs[0].Assign(pPrevRenderObjLst);
-            pPrevRenderObjLst.ClearArr();
-            m_RP.m_pShader = pPrevSH;
-            m_RP.m_pShaderResources = pPrevShaderResources;
-            m_RP.m_pCurObject = pPrevObject;
-            m_RP.m_pPrevObject = NULL;
-            m_RP.m_PersFlags2 = nPersFlags2Prev;
-            m_RP.m_nLastRE = nSaveLastRE;
-
-
-            m_RP.m_nNumRendPasses = nPrevNumRendPasses;
-
-            m_RP.m_FlagsShader_LT = nFlagsShaderLTprev;
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags = nPersFlagsPrev;
-            m_RP.m_FlagsShader_RT = nFlagsShaderRTprev;
-
-            m_RP.m_nNumRendPasses = 0;
-
-            m_RP.m_pRootTechnique = pPrevRootTech;
-            m_RP.m_bIgnoreObjectAlpha = bIgnoreObjectAlpha;
-            m_RP.m_MaterialStateOr = nMaterialStatePrevOr;
-            m_RP.m_MaterialStateAnd = nMaterialStatePrevAnd;
-            m_RP.m_MaterialAlphaRef = nMaterialAlphaRefPrev;
-
-            if (bDefaultLayer)
-            {   // restore from the base layer
-                ((CShaderResources*)pCurrShaderItem.m_pShaderResources)->m_TexturesResourcesMap = pPrevLayerResourceTex;
-            }
-        }
-    }
-
-    m_RP.m_pRE = pRE;
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** End Multilayers processing ***\n");
-    }
-}
-
-void CD3D9Renderer::FX_SelectTechnique(CShader* pShader, SShaderTechnique* pTech)
-{
-    SShaderTechniqueStat Stat;
-    Stat.pTech = pTech;
-    Stat.pShader = pShader;
-    if (pTech->m_Passes.Num())
-    {
-        SShaderPass* pPass = &pTech->m_Passes[0];
-        if (pPass->m_PShader && pPass->m_VShader)
-        {
-            Stat.pVS = (CHWShader_D3D*)pPass->m_VShader;
-            Stat.pPS = (CHWShader_D3D*)pPass->m_PShader;
-            Stat.pVSInst = Stat.pVS->m_pCurInst;
-            Stat.pPSInst = Stat.pPS->m_pCurInst;
-            g_SelectedTechs.push_back(Stat);
-        }
-    }
-}
-
-void CD3D9Renderer::FX_DrawTechnique(CShader* ef, SShaderTechnique* pTech)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    switch (ef->m_eSHDType)
-    {
-    case eSHDT_General:
-        FX_DrawShader_General(ef, pTech);
-        break;
-    case eSHDT_Light:
-        FX_DrawShader_General(ef, pTech);
-        break;
-    case eSHDT_Terrain:
-    {
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::LegacyTerrain, "FX_DrawTechnique");
-        FX_DrawShader_General(ef, pTech);
-    }
-        break;
-    case eSHDT_Fur:
-        FX_DrawShader_Fur(ef, pTech);
-        break;
-    case eSHDT_CustomDraw:
-    case eSHDT_Sky:
-        if (m_RP.m_pRE)
-        {
-            EF_Scissor(false, 0, 0, 0, 0);
-            if (pTech && pTech->m_Passes.Num())
-            {
-                m_RP.m_pRE->mfDraw(ef, &pTech->m_Passes[0]);
-            }
-            else
-            {
-                m_RP.m_pRE->mfDraw(ef, NULL);
-            }
-        }
-        break;
-    default:
-        assert(0);
-    }
-    if (m_RP.m_ObjFlags & FOB_SELECTED)
-    {
-        FX_SelectTechnique(ef, pTech);
-    }
-}
-
-#if defined(HW_INSTANCING_ENABLED)
-static void sDetectInstancing(CShader* pShader, [[maybe_unused]] CRenderObject* pObj)
-{
-    CRenderer* rd = gRenDev;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    if (!CRenderer::CV_r_geominstancing || rd->m_bUseGPUFriendlyBatching[rRP.m_nProcessThreadID] || !(pShader->m_Flags & EF_SUPPORTSINSTANCING) || CRenderer::CV_r_measureoverdraw ||
-        // don't instance in motion blur pass or post 3d render
-        rRP.m_PersFlags2 & RBPF2_POST_3D_RENDERER_PASS ||     //rRP.m_PersFlags2 & RBPF2_MOTIONBLURPASS ||
-        // only instance meshes
-        !rRP.m_pRE || rRP.m_pRE->mfGetType() != eDATA_Mesh
-        )
-    {
-        rRP.m_FlagsPerFlush &= ~RBSI_INSTANCED;
-        return;
-    }
-
-    int i = 0, nLastRE = rRP.m_nLastRE;
-    for (; i <= nLastRE; i++)
-    {
-        int nRIs = rRP.m_RIs[i].Num();
-
-        // instance even with conditional rendering - && RIs[0]->nOcclQuery<0
-        if (nRIs > CRenderer::m_iGeomInstancingThreshold || (rRP.m_FlagsPerFlush & RBSI_INSTANCED))
-        {
-            rRP.m_FlagsPerFlush |= RBSI_INSTANCED;
-            break;
-        }
-    }
-    if (i > rRP.m_nLastRE)
-    {
-        rRP.m_FlagsPerFlush &= ~RBSI_INSTANCED;
-    }
-}
-#endif
-
-void CD3D9Renderer::FX_SetAlphaTestState(float alphaRef)
-{
-    if (!(m_RP.m_PersFlags2 & RBPF2_NOALPHATEST))
-    {
-        const int nAlphaRef = int(alphaRef * 255.0f);
-
-        m_RP.m_MaterialAlphaRef = nAlphaRef;
-        m_RP.m_MaterialStateOr = GS_ALPHATEST_GEQUAL | GS_DEPTHWRITE;
-        m_RP.m_MaterialStateAnd = GS_ALPHATEST_MASK;
-    }
-    else
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ALPHATEST];
-    }
-}
-
-// Set/Restore shader resources overrided states
-bool CD3D9Renderer::FX_SetResourcesState()
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    if (!m_RP.m_pShader)
-    {
-        return false;
-    }
-    m_RP.m_MaterialStateOr = 0;
-    m_RP.m_MaterialStateAnd = 0;
-    if (!m_RP.m_pShaderResources)
-    {
-        return true;
-    }
-
-    PrefetchLine(m_RP.m_pShaderResources, 0);       //Shader Resources fit in a cache line, but they're not 128-byte aligned! We are likely going
-    PrefetchLine(m_RP.m_pShaderResources, 124); //  to cache miss on access to m_ResFlags but will hopefully avoid later ones
-
-    if (m_RP.m_pShader->m_Flags2 & EF2_IGNORERESOURCESTATES)
-    {
-        return true;
-    }
-
-    m_RP.m_ShaderTexResources[EFTT_DECAL_OVERLAY] = NULL;
-
-    const CShaderResources* pRes = m_RP.m_pShaderResources;
-    const uint32 uResFlags = pRes->m_ResFlags;
-    if (uResFlags & MTL_FLAG_NOTINSTANCED)
-    {
-        m_RP.m_FlagsPerFlush &= ~RBSI_INSTANCED;
-    }
-
-    if (uResFlags & MTL_FLAG_2SIDED)
-    {
-        D3DSetCull(eCULL_None);
-        m_RP.m_FlagsPerFlush |= RBSI_LOCKCULL;
-    }
-
-    if (pRes->IsAlphaTested())
-    {
-        FX_SetAlphaTestState(pRes->GetAlphaRef());
-    }
-
-    if (pRes->IsTransparent())
-    {
-        if (!(m_RP.m_PersFlags2 & RBPF2_NOALPHABLEND))
-        {
-            const float fOpacity = pRes->GetStrengthValue(EFTT_OPACITY);
-
-            m_RP.m_MaterialStateAnd |= GS_DEPTHWRITE | GS_BLEND_MASK;
-            m_RP.m_MaterialStateOr &= ~GS_DEPTHWRITE;
-            if (uResFlags & MTL_FLAG_ADDITIVE)
-            {
-                m_RP.m_MaterialStateOr |= GS_BLSRC_ONE | GS_BLDST_ONE;
-                m_RP.m_CurGlobalColor[0] = fOpacity;
-                m_RP.m_CurGlobalColor[1] = fOpacity;
-                m_RP.m_CurGlobalColor[2] = fOpacity;
-                m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ADDITIVE_BLENDING];
-            }
-            else
-            {
-                m_RP.m_MaterialStateOr |= GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-                m_RP.m_CurGlobalColor[3] = fOpacity;
-            }
-            m_RP.m_fCurOpacity = fOpacity;
-        }
-    }
-    {
-        if (pRes->m_pDeformInfo)
-        {
-            m_RP.m_FlagsShader_MDV |= pRes->m_pDeformInfo->m_eType;
-        }
-        m_RP.m_FlagsShader_MDV |= m_RP.m_pCurObject->m_nMDV | m_RP.m_pShader->m_nMDV;
-        if (m_RP.m_ObjFlags & FOB_OWNER_GEOMETRY)
-        {
-            m_RP.m_FlagsShader_MDV &= ~MDV_DEPTH_OFFSET;
-        }
-    }
-
-    return true;
-}
-
-//===================================================================================================
-
-#if !defined(_RELEASE)
-static void sBatchStats([[maybe_unused]] SRenderPipeline& rRP)
-{
-#if defined(ENABLE_PROFILING_CODE)
-    SPipeStat& rPS = rRP.m_PS[rRP.m_nProcessThreadID];
-    rPS.m_NumRendMaterialBatches++;
-    rPS.m_NumRendGeomBatches += rRP.m_nLastRE + 1;
-    for (int i = 0; i <= rRP.m_nLastRE; i++)
-    {
-        rPS.m_NumRendInstances += rRP.m_RIs[i].Num();
-    }
-#endif
-}
-#endif
-
-static void sLogFlush(const char* str, CShader* pSH, SShaderTechnique* pTech)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    if (rd->m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "%s: '%s.%s', Id:%d, ResId:%d, VF:%d\n", str, pSH->GetName(), pTech ? pTech->m_NameStr.c_str() : "Unknown", pSH->GetID(), rRP.m_pShaderResources ? rRP.m_pShaderResources->m_Id : -1, (int)rRP.m_CurVFormat.GetEnum());
-
-        if (rRP.m_ObjFlags & FOB_SELECTED)
-        {
-            if (rRP.m_MaterialStateOr & GS_ALPHATEST_MASK)
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "  %.3f, %.3f, %.3f (0x%x), (AT) (Selected)\n", rRP.m_pCurObject->m_II.m_Matrix(0, 3), rRP.m_pCurObject->m_II.m_Matrix(1, 3), rRP.m_pCurObject->m_II.m_Matrix(2, 3), rRP.m_pCurObject->m_ObjFlags);
-            }
-            else
-            if (rRP.m_MaterialStateOr & GS_BLEND_MASK)
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "  %.3f, %.3f, %.3f (0x%x) (AB) (Dist: %.3f) (Selected)\n", rRP.m_pCurObject->m_II.m_Matrix(0, 3), rRP.m_pCurObject->m_II.m_Matrix(1, 3), rRP.m_pCurObject->m_II.m_Matrix(2, 3), rRP.m_pCurObject->m_ObjFlags, rRP.m_pCurObject->m_fDistance);
-            }
-            else
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "  %.3f, %.3f, %.3f (0x%x), RE: 0x%x (Selected)\n", rRP.m_pCurObject->m_II.m_Matrix(0, 3), rRP.m_pCurObject->m_II.m_Matrix(1, 3), rRP.m_pCurObject->m_II.m_Matrix(2, 3), rRP.m_pCurObject->m_ObjFlags, rRP.m_pRE);
-            }
-        }
-        else
-        {
-            if (rRP.m_MaterialStateOr & GS_ALPHATEST_MASK)
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "  %.3f, %.3f, %.3f (0x%x) (AT), Inst: %d, RE: 0x%x (Dist: %.3f)\n", rRP.m_pCurObject->m_II.m_Matrix(0, 3), rRP.m_pCurObject->m_II.m_Matrix(1, 3), rRP.m_pCurObject->m_II.m_Matrix(2, 3), rRP.m_pCurObject->m_ObjFlags, rRP.m_RIs[0].Num(), rRP.m_pRE, rRP.m_pCurObject->m_fDistance);
-            }
-            else
-            if (rRP.m_MaterialStateOr & GS_BLEND_MASK)
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "  %.3f, %.3f, %.3f (0x%x) (AB), Inst: %d, RE: 0x%x (Dist: %.3f)\n", rRP.m_pCurObject->m_II.m_Matrix(0, 3), rRP.m_pCurObject->m_II.m_Matrix(1, 3), rRP.m_pCurObject->m_II.m_Matrix(2, 3), rRP.m_pCurObject->m_ObjFlags, rRP.m_RIs[0].Num(), rRP.m_pRE, rRP.m_pCurObject->m_fDistance);
-            }
-            else
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "  %.3f, %.3f, %.3f (0x%x), Inst: %d, RE: 0x%x\n", rRP.m_pCurObject->m_II.m_Matrix(0, 3), rRP.m_pCurObject->m_II.m_Matrix(1, 3), rRP.m_pCurObject->m_II.m_Matrix(2, 3), rRP.m_pCurObject->m_ObjFlags, rRP.m_RIs[0].Num(), rRP.m_pRE);
-            }
-        }
-        if (rRP.m_pRE && rRP.m_pRE->mfGetType() == eDATA_Mesh)
-        {
-            CREMeshImpl* pRE = (CREMeshImpl*) rRP.m_pRE;
-            CRenderMesh* pRM = pRE->m_pRenderMesh;
-            if (pRM && pRM->m_Chunks.size() && pRM->m_sSource)
-            {
-                int nChunk = -1;
-                for (int i = 0; i < pRM->m_Chunks.size(); i++)
-                {
-                    CRenderChunk* pCH = &pRM->m_Chunks[i];
-                    if (pCH->pRE == pRE)
-                    {
-                        nChunk = i;
-                        break;
-                    }
-                }
-                rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "  Mesh: %s (Chunk: %d)\n", pRM->m_sSource.c_str(), nChunk);
-            }
-        }
-    }
-}
-
-void CD3D9Renderer::FX_RefractionPartialResolve()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-    {
-        SRenderObjData* ObjData = rRP.m_pCurObject->GetObjData();
-
-        if (ObjData)
-        {
-            uint8 screenBounds[4];
-
-            screenBounds[0] = ObjData->m_screenBounds[0];
-            screenBounds[1] = ObjData->m_screenBounds[1];
-            screenBounds[2] = ObjData->m_screenBounds[2];
-            screenBounds[3] = ObjData->m_screenBounds[3];
-
-            float boundsI2F[] = {
-                (float)(screenBounds[0] << 4), (float)(screenBounds[1] << 4),
-                (float)(min(screenBounds[2] << 4, GetWidth())), (float)(min(screenBounds[3] << 4, GetHeight()))
-            };
-
-            if (((screenBounds[2] - screenBounds[0]) && (screenBounds[3] - screenBounds[1])) &&
-                !((rRP.m_nCurrResolveBounds[0] == screenBounds[0])
-                  && (rRP.m_nCurrResolveBounds[1] == screenBounds[1])
-                  && (rRP.m_nCurrResolveBounds[2] == screenBounds[2])
-                  && (rRP.m_nCurrResolveBounds[3] == screenBounds[3])))
-            {
-                rRP.m_nCurrResolveBounds[0] = screenBounds[0];
-                rRP.m_nCurrResolveBounds[1] = screenBounds[1];
-                rRP.m_nCurrResolveBounds[2] = screenBounds[2];
-                rRP.m_nCurrResolveBounds[3] = screenBounds[3];
-
-                int boundsF2I[] = {
-                    int(boundsI2F[0] * m_RP.m_CurDownscaleFactor.x),
-                    int(boundsI2F[1] * m_RP.m_CurDownscaleFactor.y),
-                    int(boundsI2F[2] * m_RP.m_CurDownscaleFactor.x),
-                    int(boundsI2F[3] * m_RP.m_CurDownscaleFactor.y)
-                };
-
-                int currScissorX, currScissorY, currScissorW, currScissorH;
-                CTexture* pTarget =    CTexture::s_ptexCurrSceneTarget;
-
-                //cache RP states  - Probably a bit excessive, but want to be safe
-                CShaderResources* currRes = rd->m_RP.m_pShaderResources;
-                CShader* currShader  = rd->m_RP.m_pShader;
-                int currShaderTechnique = rd->m_RP.m_nShaderTechnique;
-                SShaderTechnique* currTechnique = rd->m_RP.m_pCurTechnique;
-                uint32 currCommitFlags = rd->m_RP.m_nCommitFlags;
-                uint32 currFlagsShaderBegin = rd->m_RP.m_nFlagsShaderBegin;
-                ECull currCull = m_RP.m_eCull;
-
-                float currVPMinZ = rd->m_NewViewport.fMinZ; // Todo: Add to GetViewport / SetViewport
-                float currVPMaxZ = rd->m_NewViewport.fMaxZ;
-
-                D3DSetCull(eCULL_None);
-
-                bool bScissored = EF_GetScissorState(currScissorX, currScissorY, currScissorW, currScissorH);
-
-                int newScissorX = int(boundsF2I[0]);
-                int newScissorY = int(boundsF2I[1]);
-                int newScissorW = max(0, min(int(boundsF2I[2]), GetWidth()) - newScissorX);
-                int newScissorH = max(0, min(int(boundsF2I[3]), GetHeight()) - newScissorY);
-
-                EF_Scissor(true, newScissorX, newScissorY, newScissorW, newScissorH);
-
-                FX_ScreenStretchRect(pTarget);
-
-                EF_Scissor(bScissored, currScissorX, currScissorY, currScissorW, currScissorH);
-
-                D3DSetCull(currCull);
-
-                //restore RP states
-                rd->m_RP.m_pShaderResources = currRes;
-                rd->m_RP.m_pShader = currShader;
-                rd->m_RP.m_nShaderTechnique = currShaderTechnique;
-                rd->m_RP.m_pCurTechnique = currTechnique;
-                rd->m_RP.m_nCommitFlags = currCommitFlags | FC_MATERIAL_PARAMS;
-                rd->m_RP.m_nFlagsShaderBegin = currFlagsShaderBegin;
-                rd->m_NewViewport.fMinZ = currVPMinZ;
-                rd->m_NewViewport.fMaxZ = currVPMaxZ;
-
-#if REFRACTION_PARTIAL_RESOLVE_STATS
-                {
-                    const int x1 = (screenBounds[0] << 4);
-                    const int y1 = (screenBounds[1] << 4);
-                    const int x2 = (screenBounds[2] << 4);
-                    const int y2 = (screenBounds[3] << 4);
-
-                    const int resolveWidth = x2 - x1;
-                    const int resolveHeight = y2 - y1;
-                    const int resolvePixelCount = resolveWidth * resolveHeight;
-
-                    // Update stats
-                    SPipeStat& pipeStat = rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID];
-                    pipeStat.m_refractionPartialResolveCount++;
-                    pipeStat.m_refractionPartialResolvePixelCount += resolvePixelCount;
-
-                    const float resolveCostConversion = 18620398.0f;
-
-                    pipeStat.m_fRefractionPartialResolveEstimatedCost += ((float)resolvePixelCount / resolveCostConversion);
-
-#if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS
-                    if (CRenderer::CV_r_RefractionPartialResolvesDebug == eRPR_DEBUG_VIEW_2D_AREA || CRenderer::CV_r_RefractionPartialResolvesDebug == eRPR_DEBUG_VIEW_2D_AREA_OVERLAY)
-                    {
-                        // Render 2d areas additively on screen
-                        IRenderAuxGeom* pAuxRenderer = gEnv->pRenderer->GetIRenderAuxGeom();
-                        if (pAuxRenderer)
-                        {
-                            SAuxGeomRenderFlags oldRenderFlags = pAuxRenderer->GetRenderFlags();
-
-                            SAuxGeomRenderFlags newRenderFlags;
-                            newRenderFlags.SetDepthTestFlag(e_DepthTestOff);
-                            newRenderFlags.SetAlphaBlendMode(e_AlphaAdditive);
-                            newRenderFlags.SetMode2D3DFlag(e_Mode2D);
-                            pAuxRenderer->SetRenderFlags(newRenderFlags);
-
-                            const float screenWidth = (float)GetWidth();
-                            const float screenHeight = (float)GetHeight();
-
-                            // Calc resolve area
-                            const float left = x1 / screenWidth;
-                            const float top = y1 / screenHeight;
-                            const float right = x2 / screenWidth;
-                            const float bottom = y2 / screenHeight;
-
-                            // Render resolve area
-                            ColorB areaColor(20, 0, 0, 255);
-
-                            if (CRenderer::CV_r_RefractionPartialResolvesDebug == eRPR_DEBUG_VIEW_2D_AREA_OVERLAY)
-                            {
-                                int val = (pipeStat.m_refractionPartialResolveCount) % 3;
-                                areaColor = ColorB((val == 0) ? 0 : 128, (val == 1)  ? 0 : 128, (val == 2)  ? 0 : 128, 255);
-                            }
-
-                            const uint vertexCount = 6;
-                            const Vec3 vert[vertexCount] = {
-                                Vec3(left, top, 0.0f),
-                                Vec3(left, bottom, 0.0f),
-                                Vec3(right, top, 0.0f),
-                                Vec3(left, bottom, 0.0f),
-                                Vec3(right, bottom, 0.0f),
-                                Vec3(right, top, 0.0f)
-                            };
-                            pAuxRenderer->DrawTriangles(vert, vertexCount, areaColor);
-
-                            // Set previous Aux render flags back again
-                            pAuxRenderer->SetRenderFlags(oldRenderFlags);
-                        }
-                    }
-#endif  // REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS
-                }
-#endif  // REFRACTION_PARTIAL_RESOLVE_STATS
-            }
-        }
-    }
-}
-
-// Flush current render item
-void CD3D9Renderer::FX_FlushShader_General()
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    if (!rRP.m_pRE && !rRP.m_RendNumVerts)
-    {
-        return;
-    }
-
-    CShader* ef = rRP.m_pShader;
-    if (!ef)
-    {
-        return;
-    }
-
-    const CShaderResources* rsr = rRP.m_pShaderResources;
-    if ((ef->m_Flags & EF_SUPPORTSDEFERREDSHADING_FULL) && (rRP.m_PersFlags2 & RBPF2_FORWARD_SHADING_PASS) && (!rsr->IsEmissive()))
-    {
-        return;
-    }
-
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-    assert(!(rTI.m_PersFlags & RBPF_SHADOWGEN));
-    assert(!(rRP.m_nBatchFilter & FB_Z));
-
-    if (!rRP.m_sExcludeShader.empty())
-    {
-        char nm[1024];
-        azstrcpy(nm, AZ_ARRAY_SIZE(nm), ef->GetName());
-        azstrlwr(nm, AZ_ARRAY_SIZE(nm));
-        if (strstr(rRP.m_sExcludeShader.c_str(), nm))
-        {
-            return;
-        }
-    }
-#ifdef DO_RENDERLOG
-    if (rd->m_logFileHandle != AZ::IO::InvalidHandle && CV_r_log == 3)
-    {
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "\n\n.. Start %s flush: '%s' ..\n", "General", ef->GetName());
-    }
-#endif
-
-#ifndef _RELEASE
-    sBatchStats(rRP);
-#endif
-    CRenderObject* pObj = rRP.m_pCurObject;
-
-    PROFILE_SHADER_SCOPE;
-
-    if (rd->m_RP.m_pRE)
-    {
-        rd->m_RP.m_pRE = rd->m_RP.m_RIs[0][0]->pElem;
-    }
-
-#if defined(HW_INSTANCING_ENABLED)
-    sDetectInstancing(ef, pObj);
-#endif
-
-    // Techniques draw cycle...
-    SShaderTechnique* __restrict pTech = ef->mfGetStartTechnique(rRP.m_nShaderTechnique);
-
-    if (pTech)
-    {
-        uint32 flags = (FB_CUSTOM_RENDER | FB_MOTIONBLUR | FB_SOFTALPHATEST | FB_WATER_REFL | FB_WATER_CAUSTIC);
-
-        if (rRP.m_pShaderResources && !(rRP.m_nBatchFilter & flags))
-        {
-            uint32 i;
-            // Update render targets if necessary
-            if (!(rTI.m_PersFlags & RBPF_DRAWTOTEXTURE))
-            {
-                uint32 targetNum = rRP.m_pShaderResources->m_RTargets.Num();
-                const CShaderResources* const __restrict pShaderResources = rRP.m_pShaderResources;
-                for (i = 0; i < targetNum; ++i)
-                {
-                    SHRenderTarget* pTarg = pShaderResources->m_RTargets[i];
-                    if (pTarg->m_eOrder == eRO_PreDraw)
-                    {
-                        rd->FX_DrawToRenderTarget(ef, rRP.m_pShaderResources, pObj, pTech, pTarg, 0, rRP.m_pRE);
-                    }
-                }
-                targetNum = pTech->m_RTargets.Num();
-                for (i = 0; i < targetNum; ++i)
-                {
-                    SHRenderTarget* pTarg = pTech->m_RTargets[i];
-                    if (pTarg->m_eOrder == eRO_PreDraw)
-                    {
-                        rd->FX_DrawToRenderTarget(ef, rRP.m_pShaderResources, pObj, pTech, pTarg, 0, rRP.m_pRE);
-                    }
-                }
-            }
-        }
-        rRP.m_pRootTechnique = pTech;
-
-        flags = (FB_MOTIONBLUR | FB_CUSTOM_RENDER | FB_SOFTALPHATEST | FB_DEBUG | FB_WATER_REFL | FB_WATER_CAUSTIC  | FB_PARTICLES_THICKNESS);
-
-        if (rRP.m_nBatchFilter & flags)
-        {
-            int nTech = -1;
-            if (rRP.m_nBatchFilter & FB_MOTIONBLUR)
-            {
-                nTech = TTYPE_MOTIONBLURPASS;
-            }
-            else if (rRP.m_nBatchFilter & FB_CUSTOM_RENDER)
-            {
-                nTech = TTYPE_CUSTOMRENDERPASS;
-            }
-            else if (rRP.m_nBatchFilter & FB_SOFTALPHATEST)
-            {
-                nTech = TTYPE_SOFTALPHATESTPASS;
-            }
-            else if (rRP.m_nBatchFilter & FB_WATER_REFL)
-            {
-                nTech = TTYPE_WATERREFLPASS;
-            }
-            else if (rRP.m_nBatchFilter & FB_WATER_CAUSTIC)
-            {
-                nTech = TTYPE_WATERCAUSTICPASS;
-            }
-            else if (rRP.m_nBatchFilter & FB_PARTICLES_THICKNESS)
-            {
-                nTech = TTYPE_PARTICLESTHICKNESSPASS;
-            }
-            else if (rRP.m_nBatchFilter & FB_DEBUG)
-            {
-                nTech = TTYPE_DEBUG;
-            }
-
-            if (nTech >= 0 && pTech->m_nTechnique[nTech] > 0)
-            {
-                assert(pTech->m_nTechnique[nTech] < (int)ef->m_HWTechniques.Num());
-                pTech = ef->m_HWTechniques[pTech->m_nTechnique[nTech]];
-            }
-            rRP.m_nShaderTechniqueType = nTech;
-        }
-#ifndef _RELEASE
-        if (CV_r_debugrendermode)
-        {
-            if (CV_r_debugrendermode & 1)
-            {
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG0];
-            }
-            if (CV_r_debugrendermode & 2)
-            {
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG1];
-            }
-            if (CV_r_debugrendermode & 4)
-            {
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG2];
-            }
-            if (CV_r_debugrendermode & 8)
-            {
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG3];
-            }
-        }
-#endif
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-        }
-        
-        if (CRenderer::CV_r_SlimGBuffer)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-        }
-     
-        // If the object is transparent and if the object has the UAV bound.
-        bool multilayerUAVBound = (rRP.m_ObjFlags & FOB_AFTER_WATER) != 0;
-        if (rRP.m_pShaderResources && rRP.m_pShaderResources->IsTransparent() && multilayerUAVBound)
-        {
-            MultiLayerAlphaBlendPass::GetInstance().ConfigureShaderFlags(rRP.m_FlagsShader_RT);
-        }
-
-        if (!rd->FX_SetResourcesState())
-        {
-            return;
-        }
-
-        // Handle emissive materials
-        CShaderResources* pCurRes = rRP.m_pShaderResources;
-        if (pCurRes && pCurRes->IsEmissive() && !pCurRes->IsTransparent() && (rRP.m_PersFlags2 & RBPF2_HDR_FP16))
-        {
-            rRP.m_MaterialStateAnd |= GS_BLEND_MASK;
-            rRP.m_MaterialStateOr = (rRP.m_MaterialStateOr & ~GS_BLEND_MASK) | (GS_BLSRC_ONE | GS_BLDST_ONE);
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ADDITIVE_BLENDING];
-        }
-
-        else if (rRP.m_ObjFlags & FOB_BENDED)
-        {
-            rRP.m_FlagsShader_MDV |= MDV_BENDING;
-        }
-        rRP.m_FlagsShader_RT |= pObj->m_nRTMask;
-#ifdef TESSELLATION_RENDERER
-        if ((pObj->m_ObjFlags & FOB_NEAREST) || !(pObj->m_ObjFlags & FOB_ALLOW_TESSELLATION))
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NO_TESSELLATION];
-        }
-#endif
-        if (!(rRP.m_PersFlags2 & RBPF2_NOSHADERFOG) && rTI.m_FS.m_bEnable && !(rRP.m_ObjFlags & FOB_NO_FOG) || !(rRP.m_PersFlags2 & RBPF2_ALLOW_DEFERREDSHADING))
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_FOG];
-            if (CRenderer::CV_r_VolumetricFog != 0)
-            {
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_VOLUMETRIC_FOG];
-            }
-        }
-        rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_FOG_VOLUME_HIGH_QUALITY_SHADER]);
-        static ICVar* pCVarFogVolumeShadingQuality = gEnv->pConsole->GetCVar("e_FogVolumeShadingQuality");
-        if (pCVarFogVolumeShadingQuality->GetIVal() > 0)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_FOG_VOLUME_HIGH_QUALITY_SHADER];
-        }
-        
-        
-        const uint64 objFlags = rRP.m_ObjFlags;
-        if (objFlags & FOB_NEAREST)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NEAREST];
-        }
-        if (SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID] == 0 && CV_r_ParticlesSoftIsec)
-        {
-            //Enable soft particle shader flag for soft particles or particles have half resolution enabled
-            //Note: the half res render pass is relying on the soft particle flag to test z buffer. 
-            //I am not sure why they did this instead of just have enable z buffer test for that pass.
-            if ((objFlags & FOB_SOFT_PARTICLE) || (rRP.m_PersFlags2 & RBPF2_HALFRES_PARTICLES))
-            {
-                rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SOFT_PARTICLE];
-            }
-        }
-
-        if (ef->m_Flags2 & EF2_ALPHABLENDSHADOWS)
-        {
-            rd->FX_SetupShadowsForTransp();
-        }
-
-        if (rRP.m_pCurObject->m_RState & OS_ENVIRONMENT_CUBEMAP)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ENVIRONMENT_CUBEMAP];
-        }
-
-        if (rRP.m_pCurObject->m_RState & OS_ANIM_BLEND)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_ANIM_BLEND];
-        }
-        if (objFlags & FOB_POINT_SPRITE)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SPRITE];
-        }
-
-        // Only enable for resources not using zpass
-        if (!(rRP.m_pRLD->m_nBatchFlags[rRP.m_nSortGroupID][rRP.m_nPassGroupID] & FB_Z) || (ef->m_Flags & EF_DECAL))
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NOZPASS];
-        }
-
-        rRP.m_pCurTechnique = pTech;
-
-        if ((rRP.m_nBatchFilter & (FB_MULTILAYERS | FB_DEBUG)) && !rRP.m_pReplacementShader)
-        {
-            if (rRP.m_nBatchFilter & FB_MULTILAYERS)
-            {
-                rd->FX_DrawMultiLayers();
-            }
-
-            if (rRP.m_nBatchFilter & FB_DEBUG)
-            {
-                rd->FX_DrawDebugPasses();
-            }
-        }
-        else
-        {
-            rd->FX_DrawTechnique(ef, pTech);
-        }
-    }//pTech
-    else
-    if (ef->m_eSHDType == eSHDT_CustomDraw)
-    {
-        rd->FX_DrawTechnique(ef, 0);
-    }
-
-#ifdef DO_RENDERLOG
-    sLogFlush("Flush General", ef, pTech);
-#endif
-}
-
-void CD3D9Renderer::FX_FlushShader_ShadowGen()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    if (!rRP.m_pRE && !rRP.m_RendNumVerts)
-    {
-        return;
-    }
-
-    CShader* ef = rRP.m_pShader;
-    if (!ef)
-    {
-        return;
-    }
-
-    if (!rRP.m_sExcludeShader.empty())
-    {
-        char nm[1024];
-        azstrcpy(nm, AZ_ARRAY_SIZE(nm), ef->GetName());
-        azstrlwr(nm, AZ_ARRAY_SIZE(nm));
-        if (strstr(rRP.m_sExcludeShader.c_str(), nm))
-        {
-            return;
-        }
-    }
-
-    assert(rRP.m_TI[rRP.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN);
-
-    CRenderObject* pObj = rRP.m_pCurObject;
-
-#ifdef DO_RENDERLOG
-    if (rd->m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        if (CV_r_log == 3)
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "\n\n.. Start %s flush: '%s' ..\n", "ShadowGen", ef->GetName());
-        }
-        if (CV_r_log >= 3)
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "\n");
-        }
-    }
-#endif
-
-#ifndef _RELEASE
-    sBatchStats(rRP);
-#endif
-
-    PROFILE_SHADER_SCOPE;
-
-#if defined(HW_INSTANCING_ENABLED)
-    sDetectInstancing(ef, pObj);
-#endif
-
-    SShaderTechnique* __restrict pTech = ef->mfGetStartTechnique(rRP.m_nShaderTechnique);
-    assert(pTech);
-    if (!pTech || pTech->m_nTechnique[TTYPE_SHADOWGEN] < 0)
-    {
-        return;
-    }
-
-    rRP.m_nShaderTechniqueType = TTYPE_SHADOWGEN;
-
-    if (rd->m_RP.m_pRE)
-    {
-        rd->m_RP.m_pRE = rd->m_RP.m_RIs[0][0]->pElem;
-    }
-
-    rRP.m_pRootTechnique = pTech;
-
-    pTech = ef->m_HWTechniques[pTech->m_nTechnique[TTYPE_SHADOWGEN]];
-
-
-    const SRenderPipeline::ShadowInfo& shadowInfo = rd->m_RP.m_ShadowInfo;
-
-    if (ef->m_eSHDType == eSHDT_Terrain)
-    {
-        if (shadowInfo.m_pCurShadowFrustum->m_Flags & DLF_DIRECTIONAL)
-        {
-            rd->D3DSetCull(eCULL_None);
-            rd->m_RP.m_FlagsPerFlush |= RBSI_LOCKCULL;
-        }
-        else
-        {
-            rd->D3DSetCull(eCULL_Front);
-            rd->m_RP.m_FlagsPerFlush |= RBSI_LOCKCULL;
-        }
-    }
-
-    // RSMs
-#if defined(FEATURE_SVO_GI)
-    if (CSvoRenderer::GetRsmColorMap(*shadowInfo.m_pCurShadowFrustum))
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-
-        if (!(shadowInfo.m_pCurShadowFrustum->m_Flags & DLF_DIRECTIONAL))
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0] | g_HWSR_MaskBit[HWSR_HW_PCF_COMPARE];
-        }
-
-        rd->D3DSetCull(eCULL_Back);
-
-        const uint64_t objFlags = rRP.m_ObjFlags;
-        if (objFlags & FOB_DECAL_TEXGEN_2D)
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DECAL_TEXGEN_2D];
-        }
-    }
-    else
-#endif
-    if (rRP.m_PersFlags2 & (RBPF2_DRAWTOCUBE | RBPF2_DISABLECOLORWRITES))
-    {
-        if (rRP.m_PersFlags2 & RBPF2_DISABLECOLORWRITES)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ];
-        }
-        if (rRP.m_PersFlags2 & RBPF2_DRAWTOCUBE)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-        }
-    }
-#ifdef TESSELLATION_RENDERER
-    if ((pObj->m_ObjFlags & FOB_NEAREST) || !(pObj->m_ObjFlags & FOB_ALLOW_TESSELLATION))
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NO_TESSELLATION];
-    }
-#endif
-
-    if (!rd->FX_SetResourcesState())
-    {
-        return;
-    }
-
-    if ((rRP.m_ObjFlags & FOB_BENDED))
-    {
-        rRP.m_FlagsShader_MDV |= MDV_BENDING;
-    }
-    rRP.m_FlagsShader_RT |= rRP.m_pCurObject->m_nRTMask;
-
-    if (rRP.m_ObjFlags & FOB_NEAREST)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NEAREST];
-    }
-
-    if (rRP.m_ObjFlags & FOB_DISSOLVE)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DISSOLVE];
-    }
-
-    rRP.m_pCurTechnique = pTech;
-    rd->FX_DrawTechnique(ef, pTech);
-
-#ifdef DO_RENDERLOG
-    sLogFlush("Flush ShadowGen", ef, pTech);
-#endif
-}
-
-void CD3D9Renderer::FX_FlushShader_ZPass()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    if (!rRP.m_pRE && !rRP.m_RendNumVerts)
-    {
-        return;
-    }
-
-    CShader* ef = rRP.m_pShader;
-    if (!ef)
-    {
-        return;
-    }
-
-    if (!rRP.m_sExcludeShader.empty())
-    {
-        char nm[1024];
-        azstrcpy(nm, AZ_ARRAY_SIZE(nm), ef->GetName());
-        azstrlwr(nm, AZ_ARRAY_SIZE(nm));
-        if (strstr(rRP.m_sExcludeShader.c_str(), nm))
-        {
-            return;
-        }
-    }
-
-    assert(!(rRP.m_TI[rRP.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN));
-    assert(rRP.m_nBatchFilter & (FB_Z | FB_ZPREPASS | FB_POST_3D_RENDER));
-
-#ifdef DO_RENDERLOG
-    if (rd->m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        if (CV_r_log == 3)
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "\n\n.. Start %s flush: '%s' ..\n", "ZPass", ef->GetName());
-        }
-        else
-        if (CV_r_log >= 3)
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "\n");
-        }
-    }
-#endif
-
-    if (rd->m_RP.m_pRE)
-    {
-        rd->m_RP.m_pRE = rd->m_RP.m_RIs[0][0]->pElem;
-    }
-
-#ifndef _RELEASE
-    sBatchStats(rRP);
-#endif
-    PROFILE_SHADER_SCOPE;
-
-#if defined(HW_INSTANCING_ENABLED)
-    sDetectInstancing(ef, rRP.m_pCurObject);
-#endif
-
-    // Techniques draw cycle...
-    SShaderTechnique* __restrict pTech = ef->mfGetStartTechnique(rRP.m_nShaderTechnique);
-    const uint32 nTechniqueID = (rRP.m_nBatchFilter & FB_Z) ? TTYPE_Z : TTYPE_ZPREPASS;
-    if (!pTech || pTech->m_nTechnique[nTechniqueID] < 0)
-    {
-        return;
-    }
-
-    rRP.m_nShaderTechniqueType = nTechniqueID;
-    rRP.m_pRootTechnique = pTech;
-
-    // Skip z-pass if appropriate technique does not exist
-    assert(pTech->m_nTechnique[nTechniqueID] < (int)ef->m_HWTechniques.Num());
-    pTech = ef->m_HWTechniques[pTech->m_nTechnique[nTechniqueID]];
-
-    if (!rd->FX_SetResourcesState())
-    {
-        return;
-    }
-
-    rRP.m_FlagsShader_RT |= rRP.m_pCurObject->m_nRTMask;
-    if (rRP.m_ObjFlags & FOB_BENDED)
-    {
-        rRP.m_FlagsShader_MDV |= MDV_BENDING;
-    }
-
-    if (rRP.m_PersFlags2 & RBPF2_MOTIONBLURPASS)
-    {
-        if ((rRP.m_pCurObject->m_ObjFlags & (FOB_MOTION_BLUR | FOB_HAS_PREVMATRIX)) && (rRP.m_PersFlags2 & RBPF2_NOALPHABLEND))
-        {
-            rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_MOTION_BLUR];
-        }
-        else
-        {
-            rRP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_MOTION_BLUR];
-        }
-    }
-
-#ifdef TESSELLATION_RENDERER
-    if ((rRP.m_pCurObject->m_ObjFlags & FOB_NEAREST) || !(rRP.m_pCurObject->m_ObjFlags & FOB_ALLOW_TESSELLATION))
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_NO_TESSELLATION];
-    }
-#endif
-
-    // Set VisArea and Dynamic objects Stencil Ref
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingStencilPrepass)
-    {
-        if (rRP.m_nPassGroupID != EFSLIST_DECAL && !(rRP.m_nBatchFilter & FB_ZPREPASS))
-        {
-            rRP.m_ForceStateOr |=   GS_STENCIL;
-
-            uint32 nStencilRef = CRenderer::CV_r_VisAreaClipLightsPerPixel ? 0 : (rd->m_RP.m_RIs[0][0]->nStencRef | BIT_STENCIL_INSIDE_CLIPVOLUME);
-            
-            // Here we check if an object can receive decals.
-            bool bObjectAcceptsDecals = !(rRP.m_pCurObject->m_NoDecalReceiver);
-            if (bObjectAcceptsDecals)
-            {
-                nStencilRef |= (!(rRP.m_pCurObject->m_ObjFlags & FOB_DYNAMIC_OBJECT) || CV_r_deferredDecalsOnDynamicObjects ? BIT_STENCIL_RESERVED : 0);
-            }
-            const int32 stencilState = STENC_FUNC(FSS_STENCFUNC_ALWAYS) | STENCOP_FAIL(FSS_STENCOP_KEEP) | STENCOP_ZFAIL(FSS_STENCOP_KEEP) | STENCOP_PASS(FSS_STENCOP_REPLACE);
-            rd->FX_SetStencilState(stencilState, nStencilRef, 0xFF, 0xFF);
-        }
-        else
-        {
-            rRP.m_ForceStateOr &=   ~GS_STENCIL;
-        }
-    }
-
-    rRP.m_pCurTechnique = pTech;
-    rd->FX_DrawTechnique(ef, pTech);
-
-    rRP.m_ForceStateOr &=   ~GS_STENCIL;
-    //reset stencil AND mask always
-    rRP.m_CurStencilRefAndMask = 0;
-
-#ifdef DO_RENDERLOG
-    sLogFlush("Flush ZPass", ef, pTech);
-#endif
-}
-
-//===================================================================================================
-
-static int sTexLimitRes(uint32 nSrcsize, uint32 nDstSize)
-{
-    while (true)
-    {
-        if (nSrcsize > nDstSize)
-        {
-            nSrcsize >>= 1;
-        }
-        else
-        {
-            break;
-        }
-    }
-    return nSrcsize;
-}
-
-static Matrix34 sMatrixLookAt(const Vec3& dir, const Vec3& up, float rollAngle = 0)
-{
-    Matrix34 M;
-    // LookAt transform.
-    Vec3 xAxis, yAxis, zAxis;
-    Vec3 upVector = up;
-
-    yAxis = -dir.GetNormalized();
-
-    //if (zAxis.x == 0.0 && zAxis.z == 0) up.Set( -zAxis.y,0,0 ); else up.Set( 0,1.0f,0 );
-
-    xAxis = upVector.Cross(yAxis).GetNormalized();
-    zAxis = xAxis.Cross(yAxis).GetNormalized();
-
-    // OpenGL kind of matrix.
-    M(0, 0) = xAxis.x;
-    M(0, 1) = yAxis.x;
-    M(0, 2) = zAxis.x;
-    M(0, 3) = 0;
-
-    M(1, 0) = xAxis.y;
-    M(1, 1) = yAxis.y;
-    M(1, 2) = zAxis.y;
-    M(1, 3) = 0;
-
-    M(2, 0) = xAxis.z;
-    M(2, 1) = yAxis.z;
-    M(2, 2) = zAxis.z;
-    M(2, 3) = 0;
-
-    if (rollAngle != 0)
-    {
-        Matrix34 RollMtx;
-        RollMtx.SetIdentity();
-
-        float cossin[2];
-        //   sincos_tpl(rollAngle, cossin);
-        sincos_tpl(rollAngle, &cossin[1], &cossin[0]);
-
-        RollMtx(0, 0) = cossin[0];
-        RollMtx(0, 2) = -cossin[1];
-        RollMtx(2, 0) = cossin[1];
-        RollMtx(2, 2) = cossin[0];
-
-        // Matrix multiply.
-        M = RollMtx * M;
-    }
-
-    return M;
-}
-
-void TexBlurAnisotropicVertical(CTexture* pTex, int nAmount, float fScale, [[maybe_unused]] float fDistribution, [[maybe_unused]] bool bAlphaOnly)
-{
-    if (!pTex)
-    {
-        return;
-    }
-
-    SDynTexture* tpBlurTemp = new SDynTexture(pTex->GetWidth(), pTex->GetHeight(), pTex->GetDstFormat(), eTT_2D,  FT_STATE_CLAMP, "TempBlurAnisoVertRT");
-    if (!tpBlurTemp)
-    {
-        return;
-    }
-
-    tpBlurTemp->Update(pTex->GetWidth(), pTex->GetHeight());
-
-    if (!tpBlurTemp->m_pTexture)
-    {
-        SAFE_DELETE(tpBlurTemp);
-        return;
-    }
-
-    PROFILE_SHADER_SCOPE;
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-    gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-    Vec4 vWhite(1.0f, 1.0f, 1.0f, 1.0f);
-
-    static CCryNameTSCRC pTechName("AnisotropicVertical");
-    CShader* m_pCurrShader = CShaderMan::s_shPostEffects;
-
-    uint32 nPasses;
-    m_pCurrShader->FXSetTechnique(pTechName);
-    m_pCurrShader->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    m_pCurrShader->FXBeginPass(0);
-
-    gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-    // setup texture offsets, for texture sampling
-    float t1 = 1.0f / (float) pTex->GetHeight();
-
-    Vec4 pWeightsPS;
-    pWeightsPS.x = 0.25f * t1;
-    pWeightsPS.y = 0.5f * t1;
-    pWeightsPS.z = 0.75f * t1;
-    pWeightsPS.w = 1.0f * t1;
-
-
-    pWeightsPS *= -fScale;
-
-
-    STexState sTexState = STexState(FILTER_LINEAR, true);
-    static CCryNameR pParam0Name("blurParams0");
-
-    for (int p(1); p <= nAmount; ++p)
-    {
-        //Horizontal
-
-        CShaderMan::s_shPostEffects->FXSetVSFloat(pParam0Name, &pWeightsPS, 1);
-        gcpRendD3D->FX_PushRenderTarget(0, tpBlurTemp->m_pTexture, NULL);
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        pTex->Apply(0, CTexture::GetTexState(sTexState));
-        PostProcessUtils().DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-
-        //Vertical
-
-        pWeightsPS *= 2.0f;
-
-        gcpRendD3D->FX_PushRenderTarget(0, pTex, NULL);
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXSetVSFloat(pParam0Name, &pWeightsPS, 1);
-        tpBlurTemp->m_pTexture->Apply(0, CTexture::GetTexState(sTexState));
-        PostProcessUtils().DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-
-    m_pCurrShader->FXEndPass();
-    m_pCurrShader->FXEnd();
-
-    // Restore previous viewport
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    //release dyntexture
-    SAFE_DELETE(tpBlurTemp);
-}
-
-bool CD3D9Renderer::FX_DrawToRenderTarget(CShader* pShader, CShaderResources* pRes, CRenderObject* pObj, SShaderTechnique* pTech, SHRenderTarget* pRT, int nPreprType, IRenderElement* pRE)
-{
-    if (!pRT)
-    {
-        return false;
-    }
-
-    int nThreadList = m_pRT->GetThreadList();
-
-    uint32 nPrFlags = pRT->m_nFlags;
-    if (nPrFlags & FRT_RENDTYPE_CURSCENE)
-    {
-        return false;
-    }
-
-    CRenderObject* pPrevIgn = m_RP.m_TI[nThreadList].m_pIgnoreObject;
-    CTexture* Tex = pRT->m_pTarget[0];
-    SEnvTexture* pEnvTex = NULL;
-
-    if (nPreprType == SPRID_SCANTEX)
-    {
-        nPrFlags |= FRT_CAMERA_REFLECTED_PLANE;
-        pRT->m_nFlags = nPrFlags;
-    }
-
-    if (nPrFlags & FRT_RENDTYPE_CURSCENE)
-    {
-        return false;
-    }
-
-    AZ_TRACE_METHOD();
-
-    uint32 nWidth = pRT->m_nWidth;
-    uint32 nHeight = pRT->m_nHeight;
-
-    if (pRT->m_nIDInPool >= 0)
-    {
-        assert((int)CTexture::s_CustomRT_2D->Num() > pRT->m_nIDInPool);
-        if ((int)CTexture::s_CustomRT_2D->Num() <= pRT->m_nIDInPool)
-        {
-            return false;
-        }
-        pEnvTex = &(*CTexture::s_CustomRT_2D)[pRT->m_nIDInPool];
-
-        if (nWidth == -1)
-        {
-            nWidth = GetWidth();
-        }
-        if (nHeight == -1)
-        {
-            nHeight = GetHeight();
-        }
-
-        ETEX_Format eTF = pRT->m_eTF;
-        // $HDR
-        if (eTF == eTF_R8G8B8A8 && IsHDRModeEnabled() && m_nHDRType <= 1)
-        {
-            eTF = eTF_R16G16B16A16F;
-        }
-
-        // Very hi specs render reflections at half res - lower specs (and consoles) at quarter res
-        bool bMakeEnvironmentTexture = false;
-        if (OceanToggle::IsActive())
-        {
-            float fSizeScale = 0.5f;
-            AZ::OceanEnvironmentBus::BroadcastResult(fSizeScale, &AZ::OceanEnvironmentBus::Events::GetReflectResolutionScale);
-            fSizeScale = clamp_tpl(fSizeScale, 0.0f, 1.0f);
-
-            nWidth = sTexLimitRes(nWidth, uint32(GetWidth() * fSizeScale));
-            nHeight = sTexLimitRes(nHeight, uint32(GetHeight() * fSizeScale));
-
-            bMakeEnvironmentTexture = (!pEnvTex->m_pTex || pEnvTex->m_pTex->GetFormat() != eTF || pEnvTex->m_pTex->GetWidth() != nWidth || pEnvTex->m_pTex->GetHeight() != nHeight);
-        }
-        else
-        {
-            float fSizeScale = (CV_r_waterreflections_quality == 5) ? 0.5f : 0.25f;
-
-            nWidth = sTexLimitRes(nWidth, uint32(GetWidth() * fSizeScale));
-            nHeight = sTexLimitRes(nHeight, uint32(GetHeight() * fSizeScale));
-
-            bMakeEnvironmentTexture = (!pEnvTex->m_pTex || pEnvTex->m_pTex->GetFormat() != eTF);
-        }
-
-        // clamping to a reasonable texture size
-        if (nWidth < 32)
-        {
-            nWidth = 32;
-        }
-        if (nHeight < 32)
-        {
-            nHeight = 32;
-        }
-
-        if (bMakeEnvironmentTexture)
-        {
-            char name[128];
-            sprintf_s(name, "$RT_2D_%d", m_TexGenID++);
-            int flags = FT_NOMIPS | FT_STATE_CLAMP | FT_DONT_STREAM;
-            pEnvTex->m_pTex = new SDynTexture(nWidth, nHeight, eTF, eTT_2D, flags, name);
-        }
-        assert(nWidth > 0 && nWidth <= m_d3dsdBackBuffer.Width);
-        assert(nHeight > 0 && nHeight <= m_d3dsdBackBuffer.Height);
-        Tex = pEnvTex->m_pTex->m_pTexture;
-    }
-    else
-    if (Tex)
-    {
-        if (Tex->GetCustomID() == TO_RT_2D)
-        {
-            bool bReflect = false;
-            if (nPrFlags & (FRT_CAMERA_REFLECTED_PLANE | FRT_CAMERA_REFLECTED_WATERPLANE))
-            {
-                bReflect = true;
-            }
-            Matrix33 orientation = Matrix33(GetCamera().GetMatrix());
-            Ang3 Angs = CCamera::CreateAnglesYPR(orientation);
-            Vec3 Pos = GetCamera().GetPosition();
-            bool bNeedUpdate = false;
-            pEnvTex = CTexture::FindSuitableEnvTex(Pos, Angs, false, -1, false, pShader, pRes, pObj, bReflect, pRE, &bNeedUpdate);
-
-            if (!bNeedUpdate)
-            {
-                if (!pEnvTex)
-                {
-                    return false;
-                }
-                if (pEnvTex->m_pTex && pEnvTex->m_pTex->m_pTexture)
-                {
-                    return true;
-                }
-            }
-            m_RP.m_TI[nThreadList].m_pIgnoreObject = pObj;
-            switch (CRenderer::CV_r_envtexresolution)
-            {
-            case 0:
-                nWidth = 64;
-                break;
-            case 1:
-                nWidth = 128;
-                break;
-            case 2:
-            default:
-                nWidth = 256;
-                break;
-            case 3:
-                nWidth = 512;
-                break;
-            }
-            nHeight = nWidth;
-            if (!pEnvTex || !pEnvTex->m_pTex)
-            {
-                return false;
-            }
-            if (!pEnvTex->m_pTex->m_pTexture)
-            {
-                pEnvTex->m_pTex->Update(nWidth, nHeight);
-            }
-            Tex = pEnvTex->m_pTex->m_pTexture;
-        }
-    }
-    if (m_pRT->IsRenderThread() && Tex && Tex->IsActiveRenderTarget())
-    {
-        return true;
-    }
-
-    // always allow for non-mgpu
-    bool bMGPUAllowNextUpdate = gRenDev->GetActiveGPUCount() == 1;
-
-    ETEX_Format eTF = pRT->m_eTF;
-    // $HDR
-    if (eTF == eTF_R8G8B8A8 && IsHDRModeEnabled() && m_nHDRType <= 1)
-    {
-        eTF = eTF_R16G16B16A16F;
-    }
-    if (pEnvTex && (!pEnvTex->m_pTex || pEnvTex->m_pTex->GetFormat() != eTF))
-    {
-        SAFE_DELETE(pEnvTex->m_pTex);
-        char name[128];
-        sprintf_s(name, "$RT_2D_%d", m_TexGenID++);
-        int flags = FT_NOMIPS | FT_STATE_CLAMP | FT_DONT_STREAM;
-        pEnvTex->m_pTex = new SDynTexture(nWidth, nHeight, eTF, eTT_2D, flags, name);
-        assert(nWidth > 0 && nWidth <= m_d3dsdBackBuffer.Width);
-        assert(nHeight > 0 && nHeight <= m_d3dsdBackBuffer.Height);
-        pEnvTex->m_pTex->Update(nWidth, nHeight);
-    }
-
-    bool bEnableAnisotropicBlur = true;
-    switch (pRT->m_eUpdateType)
-    {
-    case eRTUpdate_WaterReflect:
-    {
-        if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_waterreflections)
-        {
-            assert(pEnvTex != NULL);
-            if (pEnvTex && pEnvTex->m_pTex && pEnvTex->m_pTex->m_pTexture)
-            {
-                m_pRT->RC_ClearTarget(pEnvTex->m_pTex->m_pTexture, Clr_Empty);
-            }
-            return true;
-        }
-
-        if (m_RP.m_nLastWaterFrameID == GetFrameID())
-        {
-            // water reflection already created this frame, share it
-            return true;
-        }
-
-        I3DEngine* eng = (I3DEngine*)gEnv->p3DEngine;
-        int nVisibleWaterPixelsCount = eng->GetOceanVisiblePixelsCount() / 2;     // bug in occlusion query returns 2x more
-        int nPixRatioThreshold = (int)(GetWidth() * GetHeight() * CRenderer::CV_r_waterreflections_min_visible_pixels_update);
-
-        static int nVisWaterPixCountPrev = nVisibleWaterPixelsCount;
-
-        float fUpdateFactorMul = 1.0f;
-        float fUpdateDistanceMul = 1.0f;
-        if (nVisWaterPixCountPrev < nPixRatioThreshold / 4)
-        {
-            bEnableAnisotropicBlur = false;
-            fUpdateFactorMul = CV_r_waterreflections_minvis_updatefactormul * 10.0f;
-            fUpdateDistanceMul = CV_r_waterreflections_minvis_updatedistancemul * 5.0f;
-        }
-        else
-        if (nVisWaterPixCountPrev < nPixRatioThreshold)
-        {
-            fUpdateFactorMul = CV_r_waterreflections_minvis_updatefactormul;
-            fUpdateDistanceMul = CV_r_waterreflections_minvis_updatedistancemul;
-        }
-
-        float fWaterUpdateFactor = CV_r_waterupdateFactor * fUpdateFactorMul;
-        float fWaterUpdateDistance = CV_r_waterupdateDistance * fUpdateDistanceMul;
-
-        float fTimeUpd = min(0.3f, eng->GetDistanceToSectorWithWater());
-        fTimeUpd *= fWaterUpdateFactor;
-        //if (fTimeUpd > 1.0f)
-        //fTimeUpd = 1.0f;
-        Vec3 camView = m_RP.m_TI[nThreadList].m_cam.m_viewParameters.ViewDir();
-        Vec3 camUp = m_RP.m_TI[nThreadList].m_cam.m_viewParameters.vY;
-
-        m_RP.m_nLastWaterFrameID = GetFrameID();
-
-        Vec3 camPos = GetCamera().GetPosition();
-        float fDistCam = (camPos - m_RP.m_LastWaterPosUpdate).GetLength();
-        float fDotView = camView * m_RP.m_LastWaterViewdirUpdate;
-        float fFOV = GetCamera().GetFov();
-        if (m_RP.m_fLastWaterUpdate - 1.0f > m_RP.m_TI[nThreadList].m_RealTime)
-        {
-            m_RP.m_fLastWaterUpdate = m_RP.m_TI[nThreadList].m_RealTime;
-        }
-
-        const float fMaxFovDiff = 0.1f;         // no exact test to prevent slowly changing fov causing per frame water reflection updates
-
-        static bool bUpdateReflection = true;
-        if (bMGPUAllowNextUpdate)
-        {
-            bUpdateReflection = m_RP.m_TI[nThreadList].m_RealTime - m_RP.m_fLastWaterUpdate >= fTimeUpd || fDistCam > fWaterUpdateDistance;
-            bUpdateReflection = bUpdateReflection || fDotView<0.9f || fabs(fFOV - m_RP.m_fLastWaterFOVUpdate)>fMaxFovDiff;
-        }
-
-        if (bUpdateReflection && bMGPUAllowNextUpdate)
-        {
-            m_RP.m_fLastWaterUpdate = m_RP.m_TI[nThreadList].m_RealTime;
-            m_RP.m_LastWaterViewdirUpdate = camView;
-            m_RP.m_LastWaterUpdirUpdate = camUp;
-            m_RP.m_fLastWaterFOVUpdate = fFOV;
-            m_RP.m_LastWaterPosUpdate = camPos;
-            assert(pEnvTex != NULL);
-            pEnvTex->m_pTex->ResetUpdateMask();
-        }
-        else
-        if (!bUpdateReflection)
-        {
-            assert(pEnvTex != NULL);
-            PREFAST_ASSUME(pEnvTex != NULL);
-            if (pEnvTex &&  pEnvTex->m_pTex && pEnvTex->m_pTex->IsValid())
-            {
-                return true;
-            }
-        }
-
-        assert(pEnvTex != NULL);
-        PREFAST_ASSUME(pEnvTex != NULL);
-        pEnvTex->m_pTex->SetUpdateMask();
-    }
-    break;
-    }
-
-    // Just copy current BB to the render target and exit
-    if (nPrFlags & FRT_RENDTYPE_COPYSCENE)
-    {
-        // Get current render target from the RT stack
-        if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_debugrefraction)
-        {
-            FX_ScreenStretchRect(Tex);   // should encode hdr format
-        }
-        else
-        {
-            assert(Tex != NULL);
-            m_pRT->RC_ClearTarget(Tex, Clr_Debug);
-        }
-
-        return true;
-    }
-
-    I3DEngine* eng = (I3DEngine*)gEnv->p3DEngine;
-    Matrix44A matProj, matView;
-
-    float plane[4];
-    bool bUseClipPlane = false;
-    bool bChangedCamera = false;
-
-    int nPersFlags = m_RP.m_TI[nThreadList].m_PersFlags;
-    //int nPersFlags2 = m_RP.m_TI[nThreadList].m_PersFlags2;
-
-    static CCamera tmp_cam_mgpu = GetCamera();
-    CCamera tmp_cam = GetCamera();
-    CCamera prevCamera = tmp_cam;
-    bool bMirror = false;
-    bool bOceanRefl = false;
-
-    // Set the camera
-    if (nPrFlags & FRT_CAMERA_REFLECTED_WATERPLANE)
-    {
-        bOceanRefl = true;
-
-        m_RP.m_TI[nThreadList].m_pIgnoreObject = pObj;
-        float fMinDist = min(SKY_BOX_SIZE * 0.5f, eng->GetDistanceToSectorWithWater()); // 16 is half of skybox size
-        float fMaxDist = eng->GetMaxViewDistance();
-
-        Vec3 vPrevPos = tmp_cam.GetPosition();
-
-        Plane Pl;
-        Pl.n = Vec3(0, 0, 1);
-        Pl.d = OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : eng->GetWaterLevel();
-        if ((vPrevPos | Pl.n) - Pl.d < 0)
-        {
-            Pl.d = -Pl.d;
-            Pl.n = -Pl.n;
-        }
-
-        plane[0] = Pl.n[0];
-        plane[1] = Pl.n[1];
-        plane[2] = Pl.n[2];
-        plane[3] = -Pl.d;
-
-        Matrix44 camMat;
-        GetModelViewMatrix(camMat.GetData());
-        Vec3 vPrevDir = Vec3(-camMat(0, 2), -camMat(1, 2), -camMat(2, 2));
-        Vec3 vPrevUp = Vec3(camMat(0, 1), camMat(1, 1), camMat(2, 1));
-        Vec3 vNewDir = Pl.MirrorVector(vPrevDir);
-        Vec3 vNewUp = Pl.MirrorVector(vPrevUp);
-        float fDot = vPrevPos.Dot(Pl.n) - Pl.d;
-        Vec3 vNewPos = vPrevPos - Pl.n * 2.0f * fDot;
-        Matrix34 m = sMatrixLookAt(vNewDir, vNewUp, tmp_cam.GetAngles()[2]);
-
-        // New position + offset along view direction - minimizes projection artefacts
-        m.SetTranslation(vNewPos + Vec3(vNewDir.x, vNewDir.y, 0));
-
-        tmp_cam.SetMatrix(m);
-
-        assert(pEnvTex);
-        PREFAST_ASSUME(pEnvTex);
-        tmp_cam.SetFrustum((int)(pEnvTex->m_pTex->GetWidth() * tmp_cam.GetProjRatio()), pEnvTex->m_pTex->GetHeight(), tmp_cam.GetFov(), fMinDist, fMaxDist); //tmp_cam.GetFarPlane());
-
-        // Allow camera update
-        if (bMGPUAllowNextUpdate)
-        {
-            tmp_cam_mgpu = tmp_cam;
-        }
-
-        SetCamera(tmp_cam_mgpu);
-        bChangedCamera = true;
-        bUseClipPlane = true;
-        bMirror = true;
-        //m_RP.m_TI[nThreadList].m_PersFlags |= RBPF_MIRRORCULL;
-    }
-    else
-    if (nPrFlags & FRT_CAMERA_REFLECTED_PLANE)
-    {   // Mirror case
-        m_RP.m_TI[nThreadList].m_pIgnoreObject = pObj;
-        float fMinDist = 0.25f;
-        float fMaxDist = eng->GetMaxViewDistance();
-
-        Vec3 vPrevPos = tmp_cam.GetPosition();
-
-        Plane Pl;
-        pRE->mfGetPlane(Pl);
-        //Pl.d = -Pl.d;
-        if (pObj)
-        {
-            Matrix44 mat = pObj->m_II.m_Matrix.GetTransposed();
-            Pl = TransformPlane(mat, Pl);
-        }
-        if ((vPrevPos | Pl.n) - Pl.d < 0)
-        {
-            Pl.d = -Pl.d;
-            Pl.n = -Pl.n;
-        }
-
-        plane[0] = Pl.n[0];
-        plane[1] = Pl.n[1];
-        plane[2] = Pl.n[2];
-        plane[3] = -Pl.d;
-
-        //this is the new code to calculate the reflection matrix
-
-        Matrix44A camMat;
-        GetModelViewMatrix(camMat.GetData());
-        Vec3 vPrevDir = Vec3(-camMat(0, 2), -camMat(1, 2), -camMat(2, 2));
-        Vec3 vPrevUp = Vec3(camMat(0, 1), camMat(1, 1), camMat(2, 1));
-        Vec3 vNewDir = Pl.MirrorVector(vPrevDir);
-        Vec3 vNewUp = Pl.MirrorVector(vPrevUp);
-        float fDot = vPrevPos.Dot(Pl.n) - Pl.d;
-        Vec3 vNewPos = vPrevPos - Pl.n * 2.0f * fDot;
-        Matrix34A m = sMatrixLookAt(vNewDir, vNewUp, tmp_cam.GetAngles()[2]);
-        m.SetTranslation(vNewPos);
-        tmp_cam.SetMatrix(m);
-
-        assert(Tex);
-        tmp_cam.SetFrustum((int)(Tex->GetWidth() * tmp_cam.GetProjRatio()), Tex->GetHeight(), tmp_cam.GetFov(), fMinDist, fMaxDist); //tmp_cam.GetFarPlane());
-        bMirror = true;
-        bUseClipPlane = true;
-
-        SetCamera(tmp_cam);
-        bChangedCamera = true;
-    }
-    else
-    if (((nPrFlags & FRT_CAMERA_CURRENT) || (nPrFlags & FRT_RENDTYPE_CURSCENE)) && pRT->m_eOrder == eRO_PreDraw && !(nPrFlags & FRT_RENDTYPE_CUROBJECT))
-    {
-        // Always restore stuff after explicitly changing...
-
-        // get texture surface
-        // Get current render target from the RT stack
-        if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_debugrefraction)
-        {
-            FX_ScreenStretchRect(Tex);   // should encode hdr format
-        }
-        else
-        {
-            m_pRT->RC_ClearTarget(Tex, Clr_Debug);
-        }
-
-        m_RP.m_TI[nThreadList].m_pIgnoreObject = pPrevIgn;
-        return true;
-    }
-
-    bool bRes = true;
-
-    m_pRT->RC_PushVP();
-    m_pRT->RC_PushFog();
-    m_RP.m_TI[nThreadList].m_PersFlags |= RBPF_DRAWTOTEXTURE | RBPF_ENCODE_HDR;
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[nThreadList], "*** Set RT for Water reflections ***\n");
-    }
-
-    assert(pEnvTex);
-    PREFAST_ASSUME(pEnvTex);
-    m_pRT->RC_SetEnvTexRT(pEnvTex, pRT->m_bTempDepth ? pEnvTex->m_pTex->GetWidth() : -1, pRT->m_bTempDepth ? pEnvTex->m_pTex->GetHeight() : -1, true);
-    m_pRT->RC_ClearTargetsImmediately(1, pRT->m_nFlags, pRT->m_ClearColor, pRT->m_fClearDepth);
-
-    float fAnisoScale = 1.0f;
-    if (pRT->m_nFlags & FRT_RENDTYPE_CUROBJECT)
-    {
-        CCryNameR& nameTech = pTech->m_NameStr;
-        char newTech[128];
-        sprintf_s(newTech, "%s_RT", nameTech.c_str());
-        SShaderTechnique* pT = pShader->mfFindTechnique(newTech);
-        if (!pT)
-        {
-            iLog->Log("Error: CD3D9Renderer::FX_DrawToRenderTarget: Couldn't find technique '%s' in shader '%s'\n", newTech, pShader->GetName());
-        }
-        else
-        {
-            FX_ObjectChange(pShader, pRes, pObj, pRE);
-            FX_Start(pShader, -1, pRes, pRE);
-            pRE->mfPrepare(false);
-            FX_DrawShader_General(pShader, pT);
-        }
-    }
-    else
-    {
-        if (bMirror)
-        {
-            if (bOceanRefl)
-            {
-                SetCamera(tmp_cam);
-            }
-
-            m_pRT->RC_SetEnvTexMatrix(pEnvTex);
-
-            if (bOceanRefl)
-            {
-                SetCamera(tmp_cam_mgpu);
-            }
-        }
-
-        m_RP.m_TI[nThreadList].m_PersFlags |= RBPF_OBLIQUE_FRUSTUM_CLIPPING | RBPF_MIRRORCAMERA;  // | RBPF_MIRRORCULL; ??
-
-        Plane p;
-        p.n[0] = plane[0];
-        p.n[1] = plane[1];
-        p.n[2] = plane[2];
-        p.d = plane[3]; // +0.25f;
-        fAnisoScale = plane[3];
-        fAnisoScale = fabs(fabs(fAnisoScale) - GetCamera().GetPosition().z);
-        m_RP.m_TI[nThreadList].m_bObliqueClipPlane = true;
-
-        // put clipplane in clipspace..
-        Matrix44A mView, mProj, mCamProj, mInvCamProj;
-        GetModelViewMatrix(&mView(0, 0));
-        GetProjectionMatrix(&mProj(0, 0));
-        mCamProj = mView * mProj;
-        mInvCamProj = mCamProj.GetInverted();
-        m_RP.m_TI[nThreadList].m_pObliqueClipPlane = TransformPlane2(mInvCamProj, p);
-
-        int nRenderPassFlags = 0; 
-
-        if (bOceanRefl && OceanToggle::IsActive())
-        {
-            AZ::OceanEnvironmentBus::Broadcast(&AZ::OceanEnvironmentBus::Events::ApplyReflectRenderFlags, nRenderPassFlags);
-        }
-        else
-        {
-            int nReflQuality = (bOceanRefl) ? (int)CV_r_waterreflections_quality : (int)CV_r_reflections_quality;
-
-            // set reflection quality setting
-            switch (nReflQuality)
-            {
-            case 1:
-            case 2:
-                nRenderPassFlags |= SRenderingPassInfo::ENTITIES;
-                break;
-            case 3:
-            case 4:
-            case 5:
-                nRenderPassFlags |= SRenderingPassInfo::STATIC_OBJECTS | SRenderingPassInfo::ENTITIES;
-                break;
-            }
-        }
-
-        int nRFlags = SHDF_ALLOWHDR | SHDF_NO_DRAWNEAR;
-
-        eng->RenderSceneReflection(nRFlags, SRenderingPassInfo::CreateRecursivePassRenderingInfo(bOceanRefl ? tmp_cam_mgpu : tmp_cam, nRenderPassFlags));
-
-        m_RP.m_TI[nThreadList].m_bObliqueClipPlane = false;
-        m_RP.m_TI[nThreadList].m_PersFlags &= ~RBPF_OBLIQUE_FRUSTUM_CLIPPING;
-    }
-    m_pRT->RC_PopRT(0);
-
-    bool bUseVeryHiSpecAnisotropicReflections = false;
-    if (OceanToggle::IsActive())
-    {
-        bool bAnisotropicReflections = false;
-        if (bOceanRefl)
-        {
-            AZ::OceanEnvironmentBus::BroadcastResult(bAnisotropicReflections, &AZ::OceanEnvironmentBus::Events::GetReflectionAnisotropic);
-        }
-        else
-        {
-            bAnisotropicReflections = (int)CV_r_reflections_quality >= 4;
-        }
-        bUseVeryHiSpecAnisotropicReflections = (bAnisotropicReflections && bEnableAnisotropicBlur && Tex && Tex->GetDevTexture());
-    }
-    else
-    {
-        int nReflQuality = (bOceanRefl) ? (int)CV_r_waterreflections_quality : (int)CV_r_reflections_quality;
-        bUseVeryHiSpecAnisotropicReflections = (nReflQuality >= 4 && bEnableAnisotropicBlur && Tex && Tex->GetDevTexture());
-    }
-
-    // Very Hi specs get anisotropic reflections?
-    if (bUseVeryHiSpecAnisotropicReflections)
-    {
-        m_pRT->RC_TexBlurAnisotropicVertical(Tex, fAnisoScale);
-    }
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[nThreadList], "*** End RT for Water reflections ***\n");
-    }
-
-    // todo: encode hdr format
-
-    m_RP.m_TI[nThreadList].m_PersFlags = nPersFlags;
-    //m_RP.m_TI[nThreadList].m_PersFlags2 = nPersFlags2;
-
-    if (bChangedCamera)
-    {
-        SetCamera(prevCamera);
-    }
-
-    m_pRT->RC_PopVP();
-    m_pRT->RC_PopFog();
-
-    // increase frame id to support multiple recursive draws
-    m_RP.m_TI[nThreadList].m_nFrameID++;
-    m_RP.m_TI[nThreadList].m_pIgnoreObject = pPrevIgn;
-
-    return bRes;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DFont.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DFont.cpp
deleted file mode 100644
index b81c35e9a3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DFont.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "../CryFont/FBitmap.h"
-//=========================================================================================
-
-bool CD3D9Renderer::FontUpdateTexture(int nTexId, int nX, int nY, int USize, int VSize, byte* pData)
-{
-    CTexture* tp = CTexture::GetByID(nTexId);
-    assert (tp);
-
-    if (tp)
-    {
-        tp->UpdateTextureRegion(pData, nX, nY, 0, USize, VSize, 0, eTF_A8);
-
-        return true;
-    }
-    return false;
-}
-
-bool CD3D9Renderer::FontUploadTexture(class CFBitmap* pBmp, ETEX_Format eTF)
-{
-    if (!pBmp)
-    {
-        return false;
-    }
-
-    unsigned int* pData = new unsigned int[pBmp->GetWidth() * pBmp->GetHeight()];
-
-    if (!pData)
-    {
-        return false;
-    }
-
-    pBmp->Get32Bpp(&pData);
-
-    char szName[128];
-    azsprintf(szName, "$AutoFont_%d", m_TexGenID++);
-
-    // FT_DONT_RELEASE was previously set here and caused the VRAM from font textures to never be released
-    int iFlags = FT_TEX_FONT | FT_DONT_STREAM;
-    CTexture* tp = CTexture::Create2DTexture(szName, pBmp->GetWidth(), pBmp->GetHeight(), 1, iFlags, (unsigned char*)pData, eTF, eTF);
-
-    SAFE_DELETE_ARRAY(pData);
-
-    pBmp->SetRenderData((void*)tp);
-
-    return true;
-}
-
-int CD3D9Renderer::FontCreateTexture(int Width, int Height, byte* pData, ETEX_Format eTF, bool genMips, const char* textureName)
-{
-    if (!pData)
-    {
-        return -1;
-    }
-
-    char szName[128];
-    if (textureName)
-    {
-        sprintf_s(szName, "$AutoFont_%d_%s", m_TexGenID++, textureName);
-    }
-    else
-    {
-        sprintf_s(szName, "$AutoFont_%d", m_TexGenID++);
-    }
-    
-    // FT_DONT_RELEASE was previously set here and caused the VRAM from font textures to never be released
-    int iFlags = FT_TEX_FONT | FT_DONT_STREAM;
-    if (genMips)
-    {
-        iFlags |= FT_FORCE_MIPS;
-    }
-    CTexture* tp = CTexture::Create2DTexture(szName, Width, Height, 1, iFlags, (unsigned char*)pData, eTF, eTF);
-
-    return tp->GetID();
-}
-
-void CD3D9Renderer::FontReleaseTexture(class CFBitmap* pBmp)
-{
-    if (!pBmp)
-    {
-        return;
-    }
-
-    CTexture* tp = (CTexture*)pBmp->GetRenderData();
-
-    SAFE_RELEASE(tp);
-}
-
-void CD3D9Renderer::FontSetTexture(class CFBitmap* pBmp, int nFilterMode)
-{
-    if (pBmp)
-    {
-        CTexture* tp = (CTexture*)pBmp->GetRenderData();
-        if (tp)
-        {
-            tp->SetFilterMode(nFilterMode);
-            tp->Apply(0);
-        }
-    }
-}
-
-void CD3D9Renderer::FontSetTexture(int nTexId, int nFilterMode)
-{
-    if (nTexId <= 0)
-    {
-        return;
-    }
-    CTexture* tp = CTexture::GetByID(nTexId);
-    assert (tp);
-    if (!tp)
-    {
-        return;
-    }
-
-    tp->SetFilterMode(nFilterMode);
-    tp->Apply(0);
-    //CTexture::m_Text_NoTexture->Apply(0);
-}
-
-int s_InFontState = 0;
-
-void CD3D9Renderer::FontSetRenderingState(bool overrideViewProjMatrices, TransformationMatrices& backupMatrices)
-{
-    assert(!s_InFontState);
-    assert(m_pRT->IsRenderThread());
-
-    // setup various d3d things that we need
-    FontSetState(false, GS_DEPTHFUNC_LEQUAL);
-
-    s_InFontState++;
-
-    if (overrideViewProjMatrices)
-    {
-        Matrix44A *m;
-        backupMatrices.m_projectMatrix = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj.SetIdentity();
-        m = &m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-    
-        if (m_NewViewport.nWidth != 0 && m_NewViewport.nHeight != 0)
-        {
-            const bool bReverseDepth = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-            const float zn = bReverseDepth ?  1.0f : -1.0f;
-            const float zf = bReverseDepth ? -1.0f :  1.0f;
-
-            mathMatrixOrthoOffCenter(m, 0.0f, (float)m_NewViewport.nWidth, (float)m_NewViewport.nHeight, 0.0f, zn, zf);
-        }
-
-        backupMatrices.m_viewMatrix = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-    }
-}
-
-void CD3D9Renderer::FontRestoreRenderingState(bool overrideViewProjMatrices, const TransformationMatrices& restoringMatrices)
-{
-    assert(m_pRT->IsRenderThread());
-    assert(s_InFontState == 1);
-    s_InFontState--;
-
-    if (overrideViewProjMatrices)
-    {
-        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = restoringMatrices.m_viewMatrix;
-        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj = restoringMatrices.m_projectMatrix;
-    }
-
-    FontSetState(true, GS_DEPTHFUNC_LEQUAL);
-}
-
-void CD3D9Renderer::FontSetBlending(int blendSrc, int blendDest, int baseState)
-{
-    assert(m_pRT->IsRenderThread());
-    m_fontBlendMode = blendSrc | blendDest;
-
-    int additionalFontStateFlags = GS_DEPTHFUNC_LEQUAL;
-    int alphaReference = -1;
-    if (eTF_R16G16F != CTexture::s_eTFZ && CTexture::s_eTFZ != eTF_R32F)
-    {
-        additionalFontStateFlags = GS_DEPTHFUNC_LEQUAL | GS_ALPHATEST_GREATER;
-        alphaReference = 0;
-    }
-
-    FX_SetState(m_fontBlendMode | ((baseState == -1) ? additionalFontStateFlags : baseState), alphaReference);
-}
-
-void CD3D9Renderer::FontSetState(bool bRestore, int baseState)
-{
-    static DWORD wireframeMode;
-#if !defined(OPENGL)
-    static D3DCOLORVALUE color;
-#endif //!defined(OPENGL)
-    static bool bMatColor;
-    static uint32 nState, nForceState;
-
-    assert(m_pRT->IsRenderThread());
-
-    // grab the modes that we might need to change
-    if (!bRestore)
-    {
-        D3DSetCull(eCULL_None);
-
-        nState = m_RP.m_CurState;
-        nForceState = m_RP.m_StateOr;
-        wireframeMode = m_wireframe_mode;
-
-        EF_SetVertColor();
-
-        if (wireframeMode > R_SOLID_MODE)
-        {
-            SStateRaster RS = gcpRendD3D->m_StatesRS[gcpRendD3D->m_nCurStateRS];
-            RS.Desc.FillMode = D3D11_FILL_SOLID;
-            gcpRendD3D->SetRasterState(&RS);
-        }
-
-        m_RP.m_FlagsPerFlush = 0;
-        int additionalFontStateFlags = GS_DEPTHFUNC_LEQUAL;
-        int alphaReference = -1;
-        if (eTF_R16G16F != CTexture::s_eTFZ && CTexture::s_eTFZ != eTF_R32F)
-        {
-            additionalFontStateFlags = GS_DEPTHFUNC_LEQUAL | GS_ALPHATEST_GREATER;
-            alphaReference = 0;
-        }
-
-        FX_SetState(m_fontBlendMode | ((baseState == -1) ? additionalFontStateFlags : baseState), alphaReference);
-        EF_SetColorOp(eCO_REPLACE, eCO_MODULATE, eCA_Diffuse | (eCA_Diffuse << 3), DEF_TEXARG0);
-
-    }
-    else
-    {
-        if (wireframeMode == R_WIREFRAME_MODE)
-        {
-            SStateRaster RS = gcpRendD3D->m_StatesRS[gcpRendD3D->m_nCurStateRS];
-            RS.Desc.FillMode = D3D11_FILL_WIREFRAME;
-            gcpRendD3D->SetRasterState(&RS);
-        }
-        m_RP.m_StateOr = nForceState;
-
-        //FX_SetState(State);
-    }
-}
-
-void CD3D9Renderer::DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, int nVerts, int nInds, const PublicRenderPrimitiveType nPrimType)
-{
-    PROFILE_FRAME(Draw_IndexMesh_Dyn);
-
-    if (!pBuf)
-    {
-        return;
-    }
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    //if (CV_d3d9_forcesoftware)
-    //  return;
-    if (!nVerts || (pInds && !nInds))
-    {
-        return;
-    }
-
-    m_pRT->RC_DrawDynVB(pBuf, pInds, nVerts, nInds, nPrimType);
-}
-
-void CD3D9Renderer::DrawDynUiPrimitiveList(DynUiPrimitiveList& primitives, int totalNumVertices, int totalNumIndices)
-{
-    PROFILE_FRAME(Draw_IndexMesh_Dyn);
-
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    m_pRT->RC_DrawDynUiPrimitiveList(primitives, totalNumVertices, totalNumIndices);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHDRRender.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DHDRRender.cpp
deleted file mode 100644
index a6faffc300..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHDRRender.cpp
+++ /dev/null
@@ -1,2190 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "I3DEngine.h"
-#include "../Common/Textures/TextureManager.h"
-#include "../Common/ReverseDepth.h"
-#include "CryCommon/FrameProfiler.h"
-
-
-enum class ToneMapOperators : int
-{
-    FilmicCurveUC2 = 0,
-    Linear = 1,
-    Exponential = 2,
-    Reinhard = 3,
-    FilmicCurveALU = 4
-};
-
-
-
-enum class Exposuretype : int
-{
-    Auto = 0,  //Any other variations of AUTO will go here.
-    Manual = 1
-};
-
-
-//  render targets info - first gather list of hdr targets, sort by size and create after
-struct SRenderTargetInfo
-{
-    SRenderTargetInfo()
-        : nWidth(0)
-        , nHeight(0)
-        , cClearColor(Clr_Empty)
-        , Format(eTF_Unknown)
-        , nFlags(0)
-        , lplpStorage(0)
-        , nPitch(0)
-        , fPriority(0.0f)
-        , nCustomID(0)
-    {};
-
-    uint32              nWidth;
-    uint32              nHeight;
-    ColorF              cClearColor;
-    ETEX_Format         Format;
-    uint32              nFlags;
-    CTexture** lplpStorage;
-    char                szName[64];
-    uint32              nPitch;
-    float               fPriority;
-    int32               nCustomID;
-};
-
-struct RenderTargetSizeSort
-{
-    bool operator()(const SRenderTargetInfo& drtStart, const SRenderTargetInfo& drtEnd) { return (drtStart.nPitch * drtStart.fPriority) > (drtEnd.nPitch * drtEnd.fPriority); }
-};
-
-class CHDRPostProcess
-{
-public:
-
-    CHDRPostProcess()
-    {
-        nTexStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-        nTexStateLinearWrap = CTexture::GetTexState(STexState(FILTER_LINEAR, false));
-        nTexStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-        nTexStatePointWrap = CTexture::GetTexState(STexState(FILTER_POINT, false));
-        m_bHiQuality = false;
-        m_shHDR = 0;
-        m_shHDRDolbyMetadataPass0 = nullptr;
-        m_shHDRDolbyMetadataPass1 = nullptr;
-    }
-
-    ~CHDRPostProcess()
-    {
-    }
-
-    void ScreenShot();
-
-    void SetShaderParams();
-
-    // Tone mapping steps
-    void HalfResDownsampleHDRTarget();
-    void QuarterResDownsampleHDRTarget();
-    void SceneDownsampleUsingCompute(); // for mobile, uses CS to 1/2 & 1/4 res downsample in 1 pass
-    void MeasureLuminance();
-    void EyeAdaptation();
-    void MeasureLumEyeAdaptationUsingCompute(); // uses CS to collapse measure lum and eye adap passes
-    void BloomGeneration();
-    void ProcessLensOptics();
-    void ToneMapping();
-    void ToneMappingDebug();
-    void CalculateDolbyDynamicMetadata(CTexture* pSunShaftsRT);
-    void DrawDebugViews();
-    void SetExposureTypeShaderFlags();
-    CCryNameTSCRC GetTonemapTechnique() const;
-    
-    void EncodeDolbyVision(CTexture* source);
-
-    void Begin();
-    void Render();
-    void End();
-
-    void AddRenderTarget(uint32 nWidth, uint32 nHeight, const ColorF& cClear, ETEX_Format Format, float fPriority, const char* szName, CTexture** pStorage, uint32 nFlags = 0, int32 nCustomID = -1, bool bDynamicTex = 0);
-    bool CreateRenderTargetList();
-    void ClearRenderTargetList()
-    {
-        m_pRenderTargets.clear();
-    }
-
-    static CHDRPostProcess* GetInstance()
-    {
-        static CHDRPostProcess pInstance;
-        return &pInstance;
-    }
-private:
-    std::vector< SRenderTargetInfo > m_pRenderTargets;
-    CShader* m_shHDR;
-    CShader* m_shHDRDolbyMetadataPass0;
-    CShader* m_shHDRDolbyMetadataPass1;
-    WrappedDX11Buffer m_bufDolbyMetadataMacroReductionOutput;
-    WrappedDX11Buffer m_bufDolbyMetadataMinMaxMid;
-    int32 nTexStateLinear;
-    int32 nTexStateLinearWrap;
-    int32 nTexStatePoint;
-    int32 nTexStatePointWrap;
-    bool m_bHiQuality;
-};
-
-
-void CHDRPostProcess::AddRenderTarget(uint32 nWidth, uint32 nHeight, const ColorF& cClear, ETEX_Format Format, float fPriority, const char* szName, CTexture** pStorage, uint32 nFlags, int32 nCustomID, [[maybe_unused]] bool bDynamicTex)
-{
-    SRenderTargetInfo drt;
-    drt.nWidth          = nWidth;
-    drt.nHeight         = nHeight;
-    drt.cClearColor     = cClear;
-    drt.nFlags          = FT_USAGE_RENDERTARGET | FT_DONT_STREAM | nFlags;
-    drt.Format           = Format;
-    drt.fPriority        = fPriority;
-    drt.lplpStorage      = pStorage;
-    drt.nCustomID        = nCustomID;
-    drt.nPitch           = nWidth * CTexture::BytesPerBlock(Format);
-    cry_strcpy(drt.szName, szName);
-    m_pRenderTargets.push_back(drt);
-}
-
-
-bool CHDRPostProcess::CreateRenderTargetList()
-{
-    std::sort(m_pRenderTargets.begin(), m_pRenderTargets.end(), RenderTargetSizeSort());
-
-    for (uint32 t = 0; t < m_pRenderTargets.size(); ++t)
-    {
-        SRenderTargetInfo& drt = m_pRenderTargets[t];
-        CTexture* pTex = (*drt.lplpStorage);
-        if (!CTexture::IsTextureExist(pTex))
-        {
-            pTex = CTexture::CreateRenderTarget(drt.szName, drt.nWidth, drt.nHeight, drt.cClearColor, eTT_2D, drt.nFlags, drt.Format, drt.nCustomID);
-
-            if (pTex)
-            {
-                // Following will mess up don't care resolve/restore actions since Fill() sets textures to be cleared on next draw
-#if !defined(CRY_USE_METAL) && !defined(OPENGL_ES)
-                pTex->Clear();
-#endif
-                (*drt.lplpStorage) = pTex;
-            }
-        }
-        else
-        {
-            pTex->SetFlags(drt.nFlags);
-            pTex->SetWidth(drt.nWidth);
-            pTex->SetHeight(drt.nHeight);
-            pTex->CreateRenderTarget(drt.Format, drt.cClearColor);
-        }
-    }
-
-    m_pRenderTargets.clear();
-
-    return S_OK;
-}
-
-
-void CTexture::GenerateHDRMaps()
-{
-    int i;
-    char szName[256];
-
-    CD3D9Renderer* r = gcpRendD3D;
-    CHDRPostProcess* pHDRPostProcess = CHDRPostProcess::GetInstance();
-
-    r->m_dwHDRCropWidth = r->GetWidth();
-    r->m_dwHDRCropHeight = r->GetHeight();
-
-    pHDRPostProcess->ClearRenderTargetList();
-
-    ETEX_Format nHDRFormat = eTF_R16G16B16A16F; // note: for main rendertarget R11G11B10 precision/range (even with rescaling) not enough for darks vs good blooming quality
-
-    ETEX_Format nHDRReducedFormat = r->UseHalfFloatRenderTargets() ? eTF_R11G11B10F : eTF_R10G10B10A2;
-
-    uint32 nHDRTargetFlags = FT_DONT_RELEASE | (CRenderer::CV_r_msaa ? FT_USAGE_MSAA : 0);
-    uint32 nHDRTargetFlagsUAV = nHDRTargetFlags | (CRenderer::CV_r_msaa ? 0 : FT_USAGE_UNORDERED_ACCESS);  // UAV required for tiled deferred shading
-
-    // GMEM render path uses CTexture::s_ptexSceneSpecularAccMap as the HDR Target
-    // It gets set in CDeferredShading::CreateDeferredMaps()
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, r->UseHalfFloatRenderTargets() ? nHDRFormat : nHDRReducedFormat, 1.0f, "$HDRTarget", &s_ptexHDRTarget, nHDRTargetFlagsUAV);
-    }
-
-    pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, nHDRReducedFormat, 1.0f, "$HDRTargetPrev", &s_ptexHDRTargetPrev);
-
-    pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, nHDRFormat, 1.0f, "$FurLightAcc", &s_ptexFurLightAcc, FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, eTF_R32G32B32A32F, 1.0f, "$FurPrepass", &s_ptexFurPrepass, FT_DONT_RELEASE);
-
-    // Scaled versions of the HDR scene texture
-    uint32 nWeight = (r->m_dwHDRCropWidth >> 1);
-    uint32 nHeight = (r->m_dwHDRCropHeight >> 1);
-
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaled0", &s_ptexHDRTargetScaled[0], FT_DONT_RELEASE);
-
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaledTmp0", &s_ptexHDRTargetScaledTmp[0], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaledTempRT0", &s_ptexHDRTargetScaledTempRT[0], FT_DONT_RELEASE);
-
-    nWeight = (r->m_dwHDRCropWidth >> 2);
-    nHeight = (r->m_dwHDRCropHeight >> 2);
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaled1", &s_ptexHDRTargetScaled[1], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaledTmp1", &s_ptexHDRTargetScaledTmp[1], FT_DONT_RELEASE);
-
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaledTempRT1", &s_ptexHDRTargetScaledTempRT[1], 0);
-
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, eTF_R11G11B10F, 0.9f, "$HDRTempBloom0", &s_ptexHDRTempBloom[0], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, eTF_R11G11B10F, 0.9f, "$HDRTempBloom1", &s_ptexHDRTempBloom[1], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(nWeight, nHeight, Clr_Unknown, eTF_R11G11B10F, 0.9f, "$HDRFinalBloom", &s_ptexHDRFinalBloom, FT_DONT_RELEASE);
-
-    pHDRPostProcess->AddRenderTarget((r->m_dwHDRCropWidth >> 3), (r->m_dwHDRCropHeight >> 3), Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaled2", &s_ptexHDRTargetScaled[2], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget((r->m_dwHDRCropWidth >> 3), (r->m_dwHDRCropHeight >> 3), Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaledTempRT2", &s_ptexHDRTargetScaledTempRT[2], FT_DONT_RELEASE);
-
-    pHDRPostProcess->AddRenderTarget((r->m_dwHDRCropWidth >> 4), (r->m_dwHDRCropHeight >> 4), Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaled3", &s_ptexHDRTargetScaled[3], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget((r->m_dwHDRCropWidth >> 4), (r->m_dwHDRCropHeight >> 4), Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaledTmp3", &s_ptexHDRTargetScaledTmp[3], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget((r->m_dwHDRCropWidth >> 4), (r->m_dwHDRCropHeight >> 4), Clr_Unknown, nHDRFormat, 0.9f, "$HDRTargetScaledTempRT3", &s_ptexHDRTargetScaledTempRT[3], FT_DONT_RELEASE);
-    for (i = 0; i < 8; i++)
-    {
-        sprintf_s(szName, "$HDRAdaptedLuminanceCur_%d", i);
-        pHDRPostProcess->AddRenderTarget(1, 1, Clr_Unknown, eTF_R16G16F, 0.1f, szName, &s_ptexHDRAdaptedLuminanceCur[i], FT_DONT_RELEASE);
-    }
-
-    pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, eTF_R11G11B10F, 1.0f, "$SceneTargetR11G11B10F_0", &s_ptexSceneTargetR11G11B10F[0], nHDRTargetFlagsUAV);
-    pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, eTF_R11G11B10F, 1.0f, "$SceneTargetR11G11B10F_1", &s_ptexSceneTargetR11G11B10F[1], nHDRTargetFlags);
-
-    pHDRPostProcess->AddRenderTarget(r->m_dwHDRCropWidth, r->m_dwHDRCropHeight, Clr_Unknown, eTF_R8G8B8A8, 0.1f, "$Velocity", &s_ptexVelocity, FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(20, r->m_dwHDRCropHeight, Clr_Unknown, eTF_R8G8B8A8, 0.1f, "$VelocityTilesTmp0", &s_ptexVelocityTiles[0], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(20, 20, Clr_Unknown, eTF_R8G8B8A8, 0.1f, "$VelocityTilesTmp1", &s_ptexVelocityTiles[1], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(20, 20, Clr_Transparent, eTF_R8G8B8A8, 0.1f, "$VelocityTiles", &s_ptexVelocityTiles[2], FT_DONT_RELEASE);
-
-    ETEX_Format velocityObjectRenderTargetFormat = eTF_R16G16F;
-    pHDRPostProcess->AddRenderTarget(r->m_dwHDRCropWidth, r->m_dwHDRCropHeight, Clr_Transparent, velocityObjectRenderTargetFormat, 0.1f, "$VelocityObjects", &s_ptexVelocityObjects[0], FT_DONT_RELEASE);
-    if (gRenDev->m_bDualStereoSupport)
-    {
-        pHDRPostProcess->AddRenderTarget(r->m_dwHDRCropWidth, r->m_dwHDRCropHeight, Clr_Unknown, velocityObjectRenderTargetFormat, 0.1f, "$VelocityObject_R", &s_ptexVelocityObjects[1], FT_DONT_RELEASE);
-    }
-
-    pHDRPostProcess->AddRenderTarget(r->GetWidth() >> 1, r->GetHeight() >> 1, Clr_Unknown, nHDRFormat, 0.9f, "$HDRDofLayerNear", &s_ptexHDRDofLayers[0], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(r->GetWidth() >> 1, r->GetHeight() >> 1, Clr_Unknown, nHDRFormat, 0.9f, "$HDRDofLayerFar", &s_ptexHDRDofLayers[1], FT_DONT_RELEASE);
-#if METAL
-    pHDRPostProcess->AddRenderTarget(r->GetWidth() >> 1, r->GetHeight() >> 1, Clr_Unknown, eTF_R16F, 1.0f, "$MinCoC_0_Temp", &s_ptexSceneCoCTemp, FT_DONT_RELEASE);
-#else
-    pHDRPostProcess->AddRenderTarget(r->GetWidth() >> 1, r->GetHeight() >> 1, Clr_Unknown, eTF_R16G16F, 1.0f, "$MinCoC_0_Temp", &s_ptexSceneCoCTemp, FT_DONT_RELEASE);
-#endif
-
-    pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, eTF_R16G16F, 1.0, "$CoC_History0", &s_ptexSceneCoCHistory[0], FT_DONT_RELEASE);
-    pHDRPostProcess->AddRenderTarget(r->GetWidth(), r->GetHeight(), Clr_Unknown, eTF_R16G16F, 1.0, "$CoC_History1", &s_ptexSceneCoCHistory[1], FT_DONT_RELEASE);
-
-    for (i = 0; i < MIN_DOF_COC_K; i++)
-    {
-        sprintf_s(szName, "$MinCoC_%d", i);
-#if METAL
-        pHDRPostProcess->AddRenderTarget((r->m_dwHDRCropWidth >> 1) / (i + 1), (r->m_dwHDRCropHeight >> 1) / (i + 1), Clr_Unknown, eTF_R16F, 0.1f, szName, &s_ptexSceneCoC[i], FT_DONT_RELEASE, -1, true);
-#else
-        pHDRPostProcess->AddRenderTarget((r->m_dwHDRCropWidth >> 1) / (i + 1), (r->m_dwHDRCropHeight >> 1) / (i + 1), Clr_Unknown, eTF_R16G16F, 0.1f, szName, &s_ptexSceneCoC[i], FT_DONT_RELEASE, -1, true);
-#endif
-    }
-
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        /* CONFETTI: David Srour
-         * Used during GMEM path for linear depth & stencil resolve.
-         * See following link for RT format storage sizes on Apple Metal HW:
-         * https://developer.apple.com/library/mac/documentation/Miscellaneous/Conceptual/MetalProgrammingGuide/MetalFeatureSetTables/MetalFeatureSetTables.html
-         */
-        ETEX_Format format = eTF_R16G16F;
-#if defined(OPENGL_ES) // might be no fp rendering support
-        if (!gcpRendD3D->UseHalfFloatRenderTargets())
-        {
-            format = eTF_R16G16U;
-        }
-#endif
-        pHDRPostProcess->AddRenderTarget(r->m_dwHDRCropWidth, r->m_dwHDRCropHeight, Clr_Unknown, format, 0.1f,
-            "$GmemStenLinDepth", &s_ptexGmemStenLinDepth, FT_DONT_RELEASE, -1, true);
-    }
-
-
-    // Luminance rt
-    for (i = 0; i < NUM_HDR_TONEMAP_TEXTURES; i++)
-    {
-        int iSampleLen = 1 << (2 * i);
-        sprintf_s(szName, "$HDRToneMap_%d", i);
-        pHDRPostProcess->AddRenderTarget(iSampleLen, iSampleLen, Clr_Dark, eTF_R16G16F, 0.7f, szName, &s_ptexHDRToneMaps[i], FT_DONT_RELEASE);
-    }
-    s_ptexHDRMeasuredLuminanceDummy = CTexture::CreateTextureObject("$HDRMeasuredLum_Dummy", 0, 0, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM, eTF_R16G16F, TO_HDR_MEASURED_LUMINANCE);
-    for (i = 0; i < MAX_GPU_NUM; ++i)
-    {
-        sprintf_s(szName, "$HDRMeasuredLum_%d", i);
-
-        if (CRenderer::CV_r_EnableGMEMPostProcCS)
-        {
-            pHDRPostProcess->AddRenderTarget(1, 1, Clr_Unknown, eTF_R16G16F, 0.1f, szName, &s_ptexHDRMeasuredLuminance[i], FT_DONT_RELEASE | FT_DONT_STREAM);
-        }
-        else
-        {
-            s_ptexHDRMeasuredLuminance[i] = CTexture::Create2DTexture(szName, 1, 1, 0, FT_DONT_RELEASE | FT_DONT_STREAM, NULL, eTF_R16G16F, eTF_R16G16F);
-        }
-    }
-
-    pHDRPostProcess->CreateRenderTargetList();
-
-    // Create resources if necessary - todo: refactor all this shared render targets stuff, quite cumbersome atm...
-    PostProcessUtils().Create();
-}
-
-
-void CTexture::DestroyHDRMaps()
-{
-    int i;
-
-    SAFE_RELEASE(s_ptexHDRTarget);
-
-    SAFE_RELEASE(s_ptexHDRTargetPrev);
-    SAFE_RELEASE(s_ptexHDRTargetScaled[0]);
-    SAFE_RELEASE(s_ptexHDRTargetScaled[1]);
-    SAFE_RELEASE(s_ptexHDRTargetScaled[2]);
-    SAFE_RELEASE(s_ptexHDRTargetScaled[3]);
-
-    SAFE_RELEASE(s_ptexHDRTargetScaledTmp[0]);
-    SAFE_RELEASE(s_ptexHDRTargetScaledTempRT[0]);
-
-    SAFE_RELEASE(s_ptexHDRTargetScaledTmp[1]);
-    SAFE_RELEASE(s_ptexHDRTargetScaledTmp[3]);
-
-    SAFE_RELEASE(s_ptexHDRTargetScaledTempRT[1]);
-    SAFE_RELEASE(s_ptexHDRTargetScaledTempRT[2]);
-    SAFE_RELEASE(s_ptexHDRTargetScaledTempRT[3]);
-
-    SAFE_RELEASE(s_ptexHDRTempBloom[0]);
-    SAFE_RELEASE(s_ptexHDRTempBloom[1]);
-    SAFE_RELEASE(s_ptexHDRFinalBloom);
-
-
-    for (i = 0; i < 8; i++)
-    {
-        SAFE_RELEASE(s_ptexHDRAdaptedLuminanceCur[i]);
-    }
-
-    for (i = 0; i < NUM_HDR_TONEMAP_TEXTURES; i++)
-    {
-        SAFE_RELEASE(s_ptexHDRToneMaps[i]);
-    }
-    SAFE_RELEASE(s_ptexHDRMeasuredLuminanceDummy);
-    for (i = 0; i < MAX_GPU_NUM; ++i)
-    {
-        SAFE_RELEASE(s_ptexHDRMeasuredLuminance[i]);
-    }
-
-    CTexture::s_ptexCurLumTexture = NULL;
-
-    SAFE_RELEASE(s_ptexVelocity);
-    SAFE_RELEASE(s_ptexVelocityTiles[0]);
-    SAFE_RELEASE(s_ptexVelocityTiles[1]);
-    SAFE_RELEASE(s_ptexVelocityTiles[2]);
-    SAFE_RELEASE(s_ptexVelocityObjects[0]);
-    SAFE_RELEASE(s_ptexVelocityObjects[1]);
-
-    SAFE_RELEASE(s_ptexHDRDofLayers[0]);
-    SAFE_RELEASE(s_ptexHDRDofLayers[1]);
-    SAFE_RELEASE(s_ptexSceneCoCTemp);
-    for (i = 0; i < MIN_DOF_COC_K; i++)
-    {
-        SAFE_RELEASE(s_ptexSceneCoC[i]);
-    }
-}
-
-
-// deprecated
-void DrawQuad3D(float s0, float t0, float s1, float t1)
-{
-    const float fZ = 0.5f;
-    const float fX0 = -1.0f, fX1 = 1.0f;
-    const float fY0 = 1.0f, fY1 = -1.0f;
-
-    gcpRendD3D->DrawQuad3D(Vec3(fX0, fY1, fZ), Vec3(fX1, fY1, fZ), Vec3(fX1, fY0, fZ), Vec3(fX0, fY0, fZ), Col_White, s0, t0, s1, t1);
-}
-
-
-// deprecated
-void DrawFullScreenQuadTR(float xpos, float ypos, float w, float h)
-{
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-    vb.Allocate(4);
-    SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-    const DWORD col = ~0;
-    const float s0 = 0;
-    const float s1 = 1;
-    const float t0 = 1;
-    const float t1 = 0;
-
-    // Define the quad
-    vQuad[0].xyz = Vec3(xpos, ypos, 1.0f);
-    vQuad[0].color.dcolor = col;
-    vQuad[0].st = Vec2(s0, 1.0f - t0);
-
-    vQuad[1].xyz = Vec3(xpos + w, ypos, 1.0f);
-    vQuad[1].color.dcolor = col;
-    vQuad[1].st = Vec2(s1, 1.0f - t0);
-
-    vQuad[3].xyz = Vec3(xpos + w, ypos + h, 1.0f);
-    vQuad[3].color.dcolor = col;
-    vQuad[3].st = Vec2(s1, 1.0f - t1);
-
-    vQuad[2].xyz = Vec3(xpos, ypos + h, 1.0f);
-    vQuad[2].color.dcolor = col;
-    vQuad[2].st = Vec2(s0, 1.0f - t1);
-
-    vb.Unlock();
-    vb.Bind(0);
-    vb.Release();
-
-    gcpRendD3D->FX_Commit();
-
-    if (!FAILED(gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        gcpRendD3D->FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-    }
-}
-
-#define NV_CACHE_OPTS_ENABLED TRUE
-
-
-// deprecated
-bool DrawFullScreenQuad(float fLeftU, float fTopV, float fRightU, float fBottomV, bool bClampToScreenRes)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    rd->FX_Commit();
-
-    // Acquire render target width and height
-    int nWidth = rd->m_NewViewport.nWidth;
-    int nHeight = rd->m_NewViewport.nHeight;
-
-    // Ensure that we're directly mapping texels to pixels by offset by 0.5
-    // For more info see the doc page titled "Directly Mapping Texels to Pixels"
-    if (bClampToScreenRes)
-    {
-        nWidth = min(nWidth, rd->GetWidth());
-        nHeight = min(nHeight, rd->GetHeight());
-    }
-
-    float fWidth5 = static_cast<float>(nWidth);
-    float fHeight5 = static_cast<float>(nHeight);
-    fWidth5 = fWidth5 - 0.5f;
-    fHeight5 = fHeight5 - 0.5f;
-
-    // Draw the quad
-    TempDynVB<SVF_TP3F_C4B_T2F> vb(gcpRendD3D);
-    vb.Allocate(4);
-    SVF_TP3F_C4B_T2F* Verts = vb.Lock();
-    {
-        fTopV = 1 - fTopV;
-        fBottomV = 1 - fBottomV;
-        Verts[0].pos = Vec4(-0.5f, -0.5f, 0.0f, 1.0f);
-        Verts[0].color.dcolor = ~0;
-        Verts[0].st = Vec2(fLeftU, fTopV);
-
-        Verts[1].pos = Vec4(fWidth5, -0.5f, 0.0f, 1.0f);
-        Verts[1].color.dcolor = ~0;
-        Verts[1].st = Vec2(fRightU, fTopV);
-
-        Verts[2].pos = Vec4(-0.5f, fHeight5, 0.0f, 1.0f);
-        Verts[2].color.dcolor = ~0;
-        Verts[2].st = Vec2(fLeftU, fBottomV);
-
-        Verts[3].pos = Vec4(fWidth5, fHeight5, 0.0f, 1.0f);
-        Verts[3].color.dcolor = ~0;
-        Verts[3].st = Vec2(fRightU, fBottomV);
-
-        vb.Unlock();
-        vb.Bind(0);
-        vb.Release();
-
-        rd->FX_SetState(GS_NODEPTHTEST);
-        if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_TP3F_C4B_T2F)))
-        {
-            rd->FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-        }
-    }
-
-    return true;
-}
-
-
-// deprecated
-bool DrawFullScreenQuad(CoordRect c, bool bClampToScreenRes)
-{
-    return DrawFullScreenQuad(c.fLeftU, c.fTopV, c.fRightU, c.fBottomV, bClampToScreenRes);
-}
-
-
-void GetSampleOffsets_DownScale4x4(uint32 nWidth, uint32 nHeight, Vec4 avSampleOffsets[])
-{
-    float tU = 1.0f / static_cast<float>(nWidth);
-    float tV = 1.0f / static_cast<float>(nHeight);
-
-    // Sample from the 16 surrounding points. Since the center point will be in
-    // the exact center of 16 texels, a 0.5f offset is needed to specify a texel
-    // center.
-    int index = 0;
-    for (int y = 0; y < 4; y++)
-    {
-        for (int x = 0; x < 4; x++)
-        {
-            avSampleOffsets[index].x = (x - 1.5f) * tU;
-            avSampleOffsets[index].y = (y - 1.5f) * tV;
-            avSampleOffsets[index].z = 0;
-            avSampleOffsets[index].w = 1;
-
-            index++;
-        }
-    }
-}
-
-
-void GetSampleOffsets_DownScale4x4Bilinear(uint32 nWidth, uint32 nHeight, Vec4 avSampleOffsets[])
-{
-    float tU = 1.0f / static_cast<float>(nWidth);
-    float tV = 1.0f / static_cast<float>(nHeight);
-
-    // Sample from the 16 surrounding points.  Since bilinear filtering is being used, specific the coordinate
-    // exactly halfway between the current texel center (k-1.5) and the neighboring texel center (k-0.5)
-
-    int index = 0;
-    for (int y = 0; y < 4; y += 2)
-    {
-        for (int x = 0; x < 4; x += 2, index++)
-        {
-            avSampleOffsets[index].x = (x - 1.f) * tU;
-            avSampleOffsets[index].y = (y - 1.f) * tV;
-            avSampleOffsets[index].z = 0;
-            avSampleOffsets[index].w = 1;
-        }
-    }
-}
-
-
-void GetSampleOffsets_DownScale2x2(uint32 nWidth, uint32 nHeight, Vec4 avSampleOffsets[])
-{
-    float tU = 1.0f / static_cast<float>(nWidth);
-    float tV = 1.0f / static_cast<float>(nHeight);
-
-    // Sample from the 4 surrounding points. Since the center point will be in
-    // the exact center of 4 texels, a 0.5f offset is needed to specify a texel
-    // center.
-    int index = 0;
-    for (int y = 0; y < 2; y++)
-    {
-        for (int x = 0; x < 2; x++)
-        {
-            avSampleOffsets[index].x = (x - 0.5f) * tU;
-            avSampleOffsets[index].y = (y - 0.5f) * tV;
-            avSampleOffsets[index].z = 0;
-            avSampleOffsets[index].w = 1;
-
-            index++;
-        }
-    }
-}
-
-
-void CHDRPostProcess::SetShaderParams()
-{
-
-    Vec4 vHDRSetupParams[5];
-    gEnv->p3DEngine->GetHDRSetupParams(vHDRSetupParams);
-
-    static CCryNameR szHDREyeAdaptationParam("HDREyeAdaptation");
-    m_shHDR->FXSetPSFloat(szHDREyeAdaptationParam, CRenderer::CV_r_HDREyeAdaptationMode == 2 ? &vHDRSetupParams[4] : &vHDRSetupParams[3], 1);
-
-    // RGB Film curve setup
-    static CCryNameR szHDRFilmCurve("HDRFilmCurve");
-
-    const Vec4 vHDRFilmCurve = vHDRSetupParams[0]; //* Vec4(0.22f, 0.3f, 0.01f, 1.0f);
-    m_shHDR->FXSetPSFloat(szHDRFilmCurve, &vHDRFilmCurve, 1);
-
-    static CCryNameR szHDRColorBalance("HDRColorBalance");
-    const Vec4 vHDRColorBalance = vHDRSetupParams[2];
-    m_shHDR->FXSetPSFloat(szHDRColorBalance, &vHDRColorBalance, 1);
-
-    static CCryNameR szHDRBloomColor("HDRBloomColor");
-    const Vec4 vHDRBloomColor = vHDRSetupParams[1] * Vec4(Vec3((1.0f / 8.0f)), 1.0f);   // division by 8.0f was done in shader before, remove this at some point
-    m_shHDR->FXSetPSFloat(szHDRBloomColor, &vHDRBloomColor, 1);
-    
-    if (CRenderer::CV_r_ToneMapExposureType == static_cast<int>(Exposuretype::Manual))
-    {
-        static CCryNameR tonemapParams("HDRTonemapParams");
-        Vec4 v = Vec4(CRenderer::CV_r_ToneMapManualExposureValue, 0, 0, 0);
-        m_shHDR->FXSetPSFloat(tonemapParams, &v, 1);
-    }
-}
-
-
-void CHDRPostProcess::SceneDownsampleUsingCompute()
-{
-    CTexture* pSrcRT = CTexture::s_ptexHDRTarget;
-    CTexture* pDstRTs[3] =
-    {
-        CTexture::s_ptexHDRTargetScaled[0],
-        CTexture::s_ptexHDRTargetScaled[1],
-        nullptr
-    };
-    PostProcessUtils().DownsampleUsingCompute(pSrcRT, pDstRTs);
-}
-
-
-void CHDRPostProcess::HalfResDownsampleHDRTarget()
-{
-    PROFILE_LABEL_SCOPE("HALFRES_DOWNSAMPLE_HDRTARGET");
-
-    CTexture* pSrcRT = CTexture::s_ptexHDRTarget;
-    CTexture* pDstRT = CTexture::s_ptexHDRTargetScaled[0];
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    gRenDev->RT_SetScissor(true, 0, 0, gcpRendD3D->m_HalfResRect.right, gcpRendD3D->m_HalfResRect.bottom);
-#endif
-
-    if (CRenderer::CV_r_HDRBloomQuality >= 2)
-    {
-        PostProcessUtils().DownsampleStable(pSrcRT, pDstRT, true);
-    }
-    else
-    {
-        PostProcessUtils().StretchRect(pSrcRT, pDstRT, true);
-    }
-
-#ifdef CRY_USE_METAL
-    gRenDev->RT_SetScissor(false, 0, 0, 0, 0);
-#endif
-}
-
-
-void CHDRPostProcess::QuarterResDownsampleHDRTarget()
-{
-    PROFILE_LABEL_SCOPE("QUARTER_RES_DOWNSAMPLE_HDRTARGET");
-
-    CTexture* pSrcRT = CTexture::s_ptexHDRTargetScaled[0];
-    CTexture* pDstRT = CTexture::s_ptexHDRTargetScaled[1];
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    gRenDev->RT_SetScissor(true, 0, 0, (gcpRendD3D->m_HalfResRect.right + 1) >> 1, (gcpRendD3D->m_HalfResRect.bottom + 1) >> 1);
-#endif
-
-    // TODO: this pass seems redundant.  Can we get rid of it in non-gmem paths too?
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        PostProcessUtils().DownsampleStable(pSrcRT, pDstRT, false);
-    }
-
-    // Try to merge both sunshafts mask gen with the scene downsample on GMEM mobile path
-    CSunShafts* pSunShaftsTech = static_cast<CSunShafts*>(PostEffectMgr()->GetEffect(ePFX_SunShafts));
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr) &&
-        CRenderer::CV_r_sunshafts &&
-        CRenderer::CV_r_PostProcess &&
-        pSunShaftsTech &&
-        pSunShaftsTech->IsVisible())
-    {
-        // It is important that the following texture remains untouched until the sunshafts passes right
-        // before tonemapping. At the moment, it doesn't look like any other passes make use of the RT.
-        // This RT also must match what is passed later on to CSunShafts::SunShaftsGen(...)
-        CTexture* pSunShaftsRT = CTexture::s_ptexBackBufferScaled[1];
-        pSunShaftsTech->MergedSceneDownsampleAndSunShaftsMaskGen(pSrcRT, pDstRT, pSunShaftsRT);
-    }
-    else if (CRenderer::CV_r_HDRBloomQuality >= 2)
-    {
-        PostProcessUtils().DownsampleStable(pSrcRT, pDstRT, false);
-    }
-    else if (CRenderer::CV_r_HDRBloomQuality == 1)
-    {
-        PostProcessUtils().DownsampleStable(pSrcRT, pDstRT, true);
-    }
-    else
-    {
-        PostProcessUtils().StretchRect(pSrcRT, pDstRT);
-    }
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    gRenDev->RT_SetScissor(false, 0, 0, 0, 0);
-#endif
-}
-
-
-void CHDRPostProcess::MeasureLuminance()
-{
-    PROFILE_LABEL_SCOPE("MEASURE_LUMINANCE");
-    int x, y, index;
-    Vec4 avSampleOffsets[16];
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    uint64 nFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    if (CRenderer::CV_r_SlimGBuffer == 1)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    int32 dwCurTexture = NUM_HDR_TONEMAP_TEXTURES - 1;
-    static CCryNameR Param1Name("SampleOffsets");
-
-    float tU = 1.0f / (3.0f * CTexture::s_ptexHDRToneMaps[dwCurTexture]->GetWidth());
-    float tV = 1.0f / (3.0f * CTexture::s_ptexHDRToneMaps[dwCurTexture]->GetHeight());
-
-    index = 0;
-    for (x = -1; x <= 1; x++)
-    {
-        for (y = -1; y <= 1; y++)
-        {
-            avSampleOffsets[index].x = x * tU;
-            avSampleOffsets[index].y = y * tV;
-            avSampleOffsets[index].z = 0;
-            avSampleOffsets[index].w = 1;
-
-            index++;
-        }
-    }
-
-    uint32 nPasses;
-
-    rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRToneMaps[dwCurTexture], NULL);
-
-    rd->FX_SetColorDontCareActions(0, true, false);
-    rd->FX_SetDepthDontCareActions(0, true, true);
-    rd->FX_SetStencilDontCareActions(0, true, true);
-
-
-    rd->FX_SetActiveRenderTargets();
-    rd->RT_SetViewport(0, 0, CTexture::s_ptexHDRToneMaps[dwCurTexture]->GetWidth(), CTexture::s_ptexHDRToneMaps[dwCurTexture]->GetHeight());
-
-    if (CRenderer::CV_r_HDREyeAdaptationMode == 2)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-    else
-    {
-        CTexture::s_ptexSceneNormalsMap->Apply(1, nTexStateLinear);
-        CTexture::s_ptexSceneDiffuse->Apply(2, nTexStateLinear);
-        CTexture::s_ptexSceneSpecular->Apply(3, nTexStateLinear);
-    }
-    
-    static CCryNameTSCRC TechName("HDRSampleLumInitial");
-    m_shHDR->FXSetTechnique(TechName);
-    m_shHDR->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    m_shHDR->FXBeginPass(0);
-
-    CTexture::s_ptexHDRTargetScaled[1]->Apply(0, nTexStateLinear);
-    
-    
-
-    float s1 = 1.0f / static_cast<float>(CTexture::s_ptexHDRTargetScaled[1]->GetWidth());
-    float t1 = 1.0f / static_cast<float>(CTexture::s_ptexHDRTargetScaled[1]->GetHeight());
-
-    // Use rotated grid
-    Vec4 vSampleLumOffsets0 = Vec4(s1 * 0.95f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);
-    Vec4 vSampleLumOffsets1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);
-
-    static CCryNameR pSampleLumOffsetsName0("SampleLumOffsets0");
-    static CCryNameR pSampleLumOffsetsName1("SampleLumOffsets1");
-
-    m_shHDR->FXSetPSFloat(pSampleLumOffsetsName0, &vSampleLumOffsets0, 1);
-    m_shHDR->FXSetPSFloat(pSampleLumOffsetsName1, &vSampleLumOffsets1, 1);
-
-    SetShaderParams();
-
-    bool ret = DrawFullScreenQuad(0.0f, 1.0f - 1.0f * gcpRendD3D->m_CurViewportScale.y, 1.0f * gcpRendD3D->m_CurViewportScale.x, 1.0f);
-
-    // important that we always write out valid luminance, even if quad draw fails
-    if (!ret)
-    {
-        rd->FX_ClearTarget(CTexture::s_ptexHDRToneMaps[dwCurTexture], Clr_Dark);
-    }
-
-    m_shHDR->FXEndPass();
-
-    rd->FX_PopRenderTarget(0);
-
-    dwCurTexture--;
-
-    // Initialize the sample offsets for the iterative luminance passes
-    while (dwCurTexture >= 0)
-    {
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRToneMaps[dwCurTexture], NULL);
-
-        // CONFETTI BEGIN: David Srour
-        // Metal Load/Store Actions
-        rd->FX_SetColorDontCareActions(0, true, false);
-        rd->FX_SetDepthDontCareActions(0, true, true);
-        rd->FX_SetStencilDontCareActions(0, true, true);
-        // CONFETTI END
-
-        rd->RT_SetViewport(0, 0, CTexture::s_ptexHDRToneMaps[dwCurTexture]->GetWidth(), CTexture::s_ptexHDRToneMaps[dwCurTexture]->GetHeight());
-
-        if (!dwCurTexture)
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-        }
-        if (dwCurTexture == 1)
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-        }
-
-        static CCryNameTSCRC TechNameLI("HDRSampleLumIterative");
-        m_shHDR->FXSetTechnique(TechNameLI);
-        m_shHDR->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        m_shHDR->FXBeginPass(0);
-
-        GetSampleOffsets_DownScale4x4Bilinear(CTexture::s_ptexHDRToneMaps[dwCurTexture + 1]->GetWidth(), CTexture::s_ptexHDRToneMaps[dwCurTexture + 1]->GetHeight(), avSampleOffsets);
-        m_shHDR->FXSetPSFloat(Param1Name, avSampleOffsets, 4);
-        CTexture::s_ptexHDRToneMaps[dwCurTexture + 1]->Apply(0, nTexStateLinear);
-
-        // Draw a fullscreen quad to sample the RT
-        ret = DrawFullScreenQuad(0.0f, 0.0f, 1.0f, 1.0f);
-
-        // important that we always write out valid luminance, even if quad draw fails
-        if (!ret)
-        {
-            rd->FX_ClearTarget(CTexture::s_ptexHDRToneMaps[dwCurTexture], Clr_Dark);
-        }
-
-        m_shHDR->FXEndPass();
-
-        rd->FX_PopRenderTarget(0);
-
-        dwCurTexture--;
-    }
-
-    gcpRendD3D->GetDeviceContext().CopyResource(
-        CTexture::s_ptexHDRMeasuredLuminance[gcpRendD3D->RT_GetCurrGpuID()]->GetDevTexture()->GetBaseTexture(),
-        CTexture::s_ptexHDRToneMaps[0]->GetDevTexture()->GetBaseTexture());
-
-    gRenDev->m_RP.m_FlagsShader_RT = nFlagsShader_RT;
-}
-
-void CHDRPostProcess::EyeAdaptation()
-{
-    PROFILE_LABEL_SCOPE("EYEADAPTATION");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    // Swap current & last luminance
-    const int32 lumMask = static_cast<int32>((sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur) / sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur[0]))) - 1;
-    const int32 numTextures = static_cast<int32>(max(min(gRenDev->GetActiveGPUCount(), static_cast<uint32>(sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur) / sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur[0]))), 1u));
-
-    CTexture::s_nCurLumTextureIndex++;
-
-    CTexture* pTexPrev = CTexture::s_ptexHDRAdaptedLuminanceCur[(CTexture::s_nCurLumTextureIndex - numTextures) & lumMask];
-    CTexture* pTexCur = CTexture::s_ptexHDRAdaptedLuminanceCur[CTexture::s_nCurLumTextureIndex & lumMask];
-    CTexture::s_ptexCurLumTexture = pTexCur;
-    CRY_ASSERT(pTexCur);
-
-    uint32 nPasses;
-    static CCryNameTSCRC TechName("HDRCalculateAdaptedLum");
-    m_shHDR->FXSetTechnique(TechName);
-    m_shHDR->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    rd->FX_PushRenderTarget(0, pTexCur, NULL);
-
-    // CONFETTI BEGIN: David Srour
-    // Metal Load/Store Actions
-    rd->FX_SetColorDontCareActions(0, true, false);
-    rd->FX_SetDepthDontCareActions(0, true, true);
-    rd->FX_SetStencilDontCareActions(0, true, true);
-    // CONFETTI END
-
-    rd->RT_SetViewport(0, 0, pTexCur->GetWidth(), pTexCur->GetHeight());
-
-    m_shHDR->FXBeginPass(0);
-
-    SetShaderParams();
-
-    static CCryNameR Param1Name("ElapsedTime");
-
-    {
-        Vec4 elapsedTime;
-        elapsedTime[0] = iTimer->GetFrameTime() * numTextures;
-        elapsedTime[1] = 1.0f - expf(-CRenderer::CV_r_HDREyeAdaptationSpeed * elapsedTime[0]);
-        elapsedTime[2] = 0;
-        elapsedTime[3] = 0;
-
-        if (rd->GetCamera().IsJustActivated() || rd->m_nDisableTemporalEffects > 0)
-        {
-            elapsedTime[1] = 1.0f;
-            elapsedTime[2] = 1.0f;
-        }
-
-        m_shHDR->FXSetPSFloat(Param1Name, &elapsedTime, 1);
-    }
-
-    pTexPrev->Apply(0, nTexStatePoint);
-    CTexture::s_ptexHDRToneMaps[0]->Apply(1, nTexStatePoint);
-
-        // Draw a fullscreen quad to sample the RT
-        DrawFullScreenQuad(0.0f, 0.0f, 1.0f, 1.0f);
-    
-
-    m_shHDR->FXEndPass();
-
-    rd->FX_PopRenderTarget(0);
-}
-
-
-void CHDRPostProcess::MeasureLumEyeAdaptationUsingCompute()
-{
-    PROFILE_LABEL_SCOPE("MEASURE_LUM_EYE_ADAPT_CS");
-    PROFILE_SHADER_SCOPE;
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    // Constants used by CS shaders
-    float hdrTargetWidth = static_cast<float>(CTexture::s_ptexHDRTargetScaled[1]->GetWidth());
-    float hdrTargetHeight = static_cast<float>(CTexture::s_ptexHDRTargetScaled[1]->GetHeight());
-
-    int lumStartingWidth = CTexture::s_ptexHDRToneMaps[NUM_HDR_TONEMAP_TEXTURES - 1]->GetWidth();
-    int lumStartingHeight = CTexture::s_ptexHDRToneMaps[NUM_HDR_TONEMAP_TEXTURES - 1]->GetHeight();
-
-    Vec4 vHdrTargetLumStartDims = Vec4(hdrTargetWidth, hdrTargetHeight, static_cast<float>(lumStartingWidth), static_cast<float>(lumStartingHeight));
-
-    Vec4 vGBufferDims = Vec4(static_cast<float>(CTexture::s_ptexSceneDiffuse->GetWidth()), static_cast<float>(CTexture::s_ptexSceneDiffuse->GetHeight()), 0, 0);
-
-    const int lumMask = static_cast<int32>((sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur) / sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur[0]))) - 1;
-    const int32 numTextures = static_cast<int32>(max(min(gRenDev->GetActiveGPUCount(), static_cast<uint32>(sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur) / sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur[0]))), 1u));
-
-    static CCryNameR pParamTimeName("ElapsedTime");
-    static CCryNameR pHdrTargetLumStartDimsName("HdrTargetAndLumStartingDims");
-    static CCryNameR pGbufferDimsName("GBufferDims");
-
-    static CCryNameTSCRC pTech("MeasureLuminanceCS");
-
-    uint32 nPasses;
-    m_shHDR->FXSetTechnique(pTech);
-    m_shHDR->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    D3DShaderResourceView* pSRV[3];
-    D3DUnorderedAccessView* pUAV[3];
-
-    // Grid dims must match in shader
-    const uint32 kernelGridX = 8;
-    const uint32 kernelGridY = 8;
-
-    uint32 dispatchSizeX, dispatchSizeY;
-
-    // Parallel reduction pass
-    m_shHDR->FXBeginPass(0);
-
-
-    m_shHDR->FXSetCSFloat(pHdrTargetLumStartDimsName, &vHdrTargetLumStartDims, 1);
-    m_shHDR->FXSetCSFloat(pGbufferDimsName, &vGBufferDims, 1);
-
-    rd->FX_Commit();
-
-    // SRVs
-    pSRV[0] = (CTexture::s_ptexHDRTargetScaled[1]->GetShaderResourceView());
-    pSRV[1] = (CTexture::s_ptexSceneDiffuse->GetShaderResourceView());
-    pSRV[2] = (CTexture::s_ptexSceneSpecular->GetShaderResourceView());
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRV, 0, 3);
-
-    // UAVs
-    // We can reuse CTexture::s_ptexHDRToneMaps[2] (16x16) to store the last parallel reduction data (64 pixels required)
-    // Note that this will potentially need to be changed if NUM_HDR_TONEMAP_TEXTURES changes in the future.
-    pUAV[0] = (CTexture::s_ptexHDRToneMaps[2]->GetDeviceUAV());
-    rd->GetDeviceContext().CSSetUnorderedAccessViews(0, 1, pUAV, NULL);
-
-    dispatchSizeX = lumStartingWidth / kernelGridX + (lumStartingWidth % kernelGridX > 0 ? 1 : 0);
-    dispatchSizeY = lumStartingHeight / kernelGridY + (lumStartingHeight % kernelGridY > 0 ? 1 : 0);
-    rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-
-    m_shHDR->FXEndPass();
-
-    // Final reduction and eye adaptation pass
-    m_shHDR->FXBeginPass(1);
-
-    m_shHDR->FXSetCSFloat(pHdrTargetLumStartDimsName, &vHdrTargetLumStartDims, 1);
-
-    {
-        Vec4 elapsedTime;
-        elapsedTime[0] = iTimer->GetFrameTime() * numTextures;
-        elapsedTime[1] = 1.0f - expf(-CRenderer::CV_r_HDREyeAdaptationSpeed * elapsedTime[0]);
-        elapsedTime[2] = 0;
-        elapsedTime[3] = 0;
-
-        if (rd->GetCamera().IsJustActivated() || rd->m_nDisableTemporalEffects > 0)
-        {
-            elapsedTime[1] = 1.0f;
-            elapsedTime[2] = 1.0f;
-        }
-
-        m_shHDR->FXSetCSFloat(pParamTimeName, &elapsedTime, 1);
-    }
-
-    // Swap current & last luminance
-    CTexture::s_nCurLumTextureIndex++;
-    CTexture* pTexPrev = CTexture::s_ptexHDRAdaptedLuminanceCur[(CTexture::s_nCurLumTextureIndex - numTextures) & lumMask];
-    CTexture* pTexCur = CTexture::s_ptexHDRAdaptedLuminanceCur[CTexture::s_nCurLumTextureIndex & lumMask];
-    CTexture::s_ptexCurLumTexture = pTexCur;
-    CRY_ASSERT(pTexCur);
-
-    // SRVs
-    pSRV[0] = (CTexture::s_ptexHDRToneMaps[2]->GetShaderResourceView());
-    pSRV[1] = (pTexPrev->GetShaderResourceView());
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRV, 0, 2);
-
-    // UAVs
-    pUAV[0] = (CTexture::s_ptexHDRMeasuredLuminance[gcpRendD3D->RT_GetCurrGpuID()]->GetDeviceUAV());
-    pUAV[1] = (CTexture::s_ptexHDRToneMaps[0]->GetDeviceUAV());
-    pUAV[2] = (pTexCur->GetDeviceUAV());
-    rd->GetDeviceContext().CSSetUnorderedAccessViews(0, 3, pUAV, NULL);
-
-    dispatchSizeX = lumStartingWidth / (kernelGridX * kernelGridY);
-    dispatchSizeY = lumStartingHeight / (kernelGridX * kernelGridY);
-    CRY_ASSERT(1 == dispatchSizeX && 1 == dispatchSizeY);
-
-    rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-
-    m_shHDR->FXEndPass();
-
-    rd->FX_Commit();
-}
-
-void CHDRPostProcess::BloomGeneration()
-{
-    if (CRenderer::CV_r_GraphicsPipeline & 1)
-    {
-        gcpRendD3D->GetGraphicsPipeline().RenderBloom();
-        return;
-    }
-
-    // Approximate function (1 - r)^4 by a sum of Gaussians: 0.0174*G(0.008,r) + 0.192*G(0.0576,r)
-    const float sigma1 = sqrtf(0.008f);
-    const float sigma2 = sqrtf(0.0576f - 0.008f);
-
-    PROFILE_LABEL_SCOPE("BLOOM_GEN");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    static CCryNameTSCRC TechName("HDRBloomGaussian");
-    static CCryNameR szHDRParam0("HDRParams0");
-
-    uint64 nPrevFlagsShaderRT = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0]);
-
-    int width = CTexture::s_ptexHDRFinalBloom->GetWidth();
-    int height = CTexture::s_ptexHDRFinalBloom->GetHeight();
-
-    // Note: Just scaling the sampling offsets depending on the resolution is not very accurate but works acceptably
-    CRY_ASSERT(CTexture::s_ptexHDRFinalBloom->GetWidth() == CTexture::s_ptexHDRTarget->GetWidth() / 4);
-    float scaleW = (static_cast<float>(width) / 400.0f) / static_cast<float>(width);
-    float scaleH = (static_cast<float>(height) / 225.0f) / static_cast<float>(height);
-    int32 texFilter = (CTexture::s_ptexHDRFinalBloom->GetWidth() == 400 && CTexture::s_ptexHDRFinalBloom->GetHeight() == 225) ? nTexStatePoint : nTexStateLinear;
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-    rd->RT_SetViewport(0, 0, width, height);
-
-    // Pass 1 Horizontal
-    rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRTempBloom[1], NULL);
-    rd->FX_SetColorDontCareActions(0, true, false);
-    rd->FX_SetDepthDontCareActions(0, true, true);
-    rd->FX_SetStencilDontCareActions(0, true, true);
-    SD3DPostEffectsUtils::ShBeginPass(m_shHDR, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    Vec4 v = Vec4(scaleW, 0, 0, 0);
-    m_shHDR->FXSetPSFloat(szHDRParam0, &v, 1);
-    CTexture::s_ptexHDRTargetScaled[1]->Apply(0, texFilter);
-    SPostEffectsUtils::DrawFullScreenTri(width, height);
-    SD3DPostEffectsUtils::ShEndPass();
-    rd->FX_PopRenderTarget(0);
-
-    // Pass 1 Vertical
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRFinalBloom, NULL);
-    }
-    else
-    {
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRTempBloom[0], NULL);
-    }
-    rd->FX_SetColorDontCareActions(0, true, false);
-    rd->FX_SetDepthDontCareActions(0, true, true);
-    rd->FX_SetStencilDontCareActions(0, true, true);
-    SD3DPostEffectsUtils::ShBeginPass(m_shHDR, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    v = Vec4(0, scaleH, 0, 0);
-    m_shHDR->FXSetPSFloat(szHDRParam0, &v, 1);
-    CTexture::s_ptexHDRTempBloom[1]->Apply(0, texFilter);
-    SPostEffectsUtils::DrawFullScreenTri(width, height);
-    SD3DPostEffectsUtils::ShEndPass();
-    rd->FX_PopRenderTarget(0);
-
-    // For mobile we skip the second blur pass for performance reasons
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        // Pass 2 Horizontal
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRTempBloom[1], NULL);
-        rd->FX_SetColorDontCareActions(0, true, false);
-        rd->FX_SetDepthDontCareActions(0, true, true);
-        rd->FX_SetStencilDontCareActions(0, true, true);
-        SD3DPostEffectsUtils::ShBeginPass(m_shHDR, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        v = Vec4((sigma2 / sigma1) * scaleW, 0, 0, 0);
-        m_shHDR->FXSetPSFloat(szHDRParam0, &v, 1);
-        CTexture::s_ptexHDRTempBloom[0]->Apply(0, texFilter);
-        SPostEffectsUtils::DrawFullScreenTri(width, height);
-        SD3DPostEffectsUtils::ShEndPass();
-        rd->FX_PopRenderTarget(0);
-
-        // Pass 2 Vertical
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRFinalBloom, NULL);
-        rd->FX_SetColorDontCareActions(0, true, false);
-        rd->FX_SetDepthDontCareActions(0, true, true);
-        rd->FX_SetStencilDontCareActions(0, true, true);
-        SD3DPostEffectsUtils::ShBeginPass(m_shHDR, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        v = Vec4(0, (sigma2 / sigma1) * scaleH, 0, 0);
-        m_shHDR->FXSetPSFloat(szHDRParam0, &v, 1);
-        CTexture::s_ptexHDRTempBloom[1]->Apply(0, texFilter);
-        CTexture::s_ptexHDRTempBloom[0]->Apply(1, texFilter);
-        SPostEffectsUtils::DrawFullScreenTri(width, height);
-        SD3DPostEffectsUtils::ShEndPass();
-        rd->FX_PopRenderTarget(0);
-    }
-
-    rd->m_RP.m_FlagsShader_RT = nPrevFlagsShaderRT;
-}
-
-void CHDRPostProcess::ProcessLensOptics()
-{
-    gcpRendD3D->m_RP.m_PersFlags2 &= ~RBPF2_LENS_OPTICS_COMPOSITE;
-    if (CRenderer::CV_r_flares && CRenderer::CV_r_PostProcess)
-    {
-        const uint32 nBatchMask = SRendItem::BatchFlags(EFSLIST_LENSOPTICS, gcpRendD3D->m_RP.m_pRLD);
-        if (nBatchMask & (FB_GENERAL | FB_TRANSPARENT))
-        {
-            PROFILE_LABEL_SCOPE("LENS_OPTICS");
-
-            CTexture* pLensOpticsComposite = CTexture::s_ptexBackBufferScaledTemp[0];
-            pLensOpticsComposite = CTexture::s_ptexSceneTargetR11G11B10F[0];
-            
-            gcpRendD3D->FX_PushRenderTarget(0, pLensOpticsComposite, 0);            
-            gcpRendD3D->FX_SetColorDontCareActions(0, false, false);
-            gcpRendD3D->FX_ClearTarget(pLensOpticsComposite, Clr_Transparent);            
-
-            gcpRendD3D->m_RP.m_PersFlags2 |= RBPF2_NOPOSTAA;
-
-            GetUtils().Log(" +++ Begin lens-optics scene +++ \n");
-            gcpRendD3D->FX_ProcessRenderList(EFSLIST_LENSOPTICS, FB_GENERAL);
-            gcpRendD3D->FX_ProcessRenderList(EFSLIST_LENSOPTICS, FB_TRANSPARENT);
-            gcpRendD3D->FX_ResetPipe();
-            GetUtils().Log(" +++ End lens-optics scene +++ \n");
-
-            gcpRendD3D->FX_SetActiveRenderTargets();
-            gcpRendD3D->FX_PopRenderTarget(0);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-        }
-    }
-}
-
-enum class eHDRPostProcessSRVs : int
-{
-    HDRInput = 0,
-    Luminance = 1,
-    Bloom = 2,
-    Velocity = 3,
-    ZTarget = 5,
-    VignetteMap = 7,
-    ColorChar = 8,
-    SunShafts = 9,
-    DolbyVisionDynamicMeta = 15
-};
-
-void CHDRPostProcess::ToneMapping()
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-    if (!gcpRendD3D->m_pColorGradingControllerD3D)
-    {
-        return;
-    }
-
-    CSunShafts* pSunShaftsTech = static_cast<CSunShafts*>(PostEffectMgr()->GetEffect(ePFX_SunShafts));
-
-    CTexture* pSunShaftsRT = CTextureManager::Instance()->GetBlackTexture();
-    if (CRenderer::CV_r_sunshafts && CRenderer::CV_r_PostProcess && pSunShaftsTech && pSunShaftsTech->IsVisible())
-    {
-        // Create shafts mask texture
-
-        uint32 nWidth = CTexture::s_ptexBackBufferScaled[1]->GetWidth();
-        uint32 nHeight = CTexture::s_ptexBackBufferScaled[1]->GetHeight();
-        pSunShaftsRT = CTexture::s_ptexBackBufferScaled[1];
-        CTexture* pSunShaftsPingPongRT = CTexture::s_ptexBackBufferScaledTemp[1];
-        if (rRP.m_eQuality >= eRQ_High &&
-            !gcpRendD3D->FX_GetEnabledGmemPath(nullptr)) // GMEM always uses the downsampled target
-        {
-            pSunShaftsRT = CTexture::s_ptexBackBufferScaled[0];
-            pSunShaftsPingPongRT = CTexture::s_ptexBackBufferScaledTemp[0];
-            nWidth = CTexture::s_ptexBackBufferScaled[0]->GetWidth();
-            nHeight = CTexture::s_ptexBackBufferScaled[0]->GetHeight();
-        }
-
-        pSunShaftsTech->SunShaftsGen(pSunShaftsRT, pSunShaftsPingPongRT);
-    }
-
-    // Update color grading
-
-    bool bColorGrading = false;
-
-    SColorGradingMergeParams pMergeParams;
-    if (CRenderer::CV_r_colorgrading && CRenderer::CV_r_colorgrading_charts)
-    {
-        CColorGrading* pColorGrad = 0;
-        if (!PostEffectMgr()->GetEffects().empty())
-        {
-            pColorGrad =  static_cast<CColorGrading*>(PostEffectMgr()->GetEffect(ePFX_ColorGrading));
-        }
-
-        if (pColorGrad && pColorGrad->UpdateParams(pMergeParams))
-        {
-            bColorGrading = true;
-        }
-    }
-
-    CColorGradingControllerD3D* pCtrl = gcpRendD3D->m_pColorGradingControllerD3D;
-    CTexture* pTexColorChar = pCtrl ? pCtrl->GetColorChart() : 0;
-
-    rd->RT_SetViewport(0, 0, CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight());
-
-    PROFILE_LABEL_SCOPE("TONEMAPPING");
-
-    // Enable corresponding shader variation
-    rRP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    if (CRenderer::CV_r_HDREyeAdaptationMode == 2)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-
-    SetExposureTypeShaderFlags();
-
-    if (bColorGrading && pTexColorChar)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-
-    if (CRenderer::CV_r_HDRDebug == 5)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG0];
-    }
-
-    const uint32 nAAMode = rd->FX_GetAntialiasingType();
-    if (nAAMode & eAT_FXAA_MASK)
-    {
-        rRP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-    
-    PostProcessUtils().SetSRGBShaderFlags();
-    
-    rd->FX_SetColorDontCareActions(0, true, false);
-    rd->FX_SetStencilDontCareActions(0, true, true);
-    rd->FX_SetColorDontCareActions(1, true, false);
-    rd->FX_SetStencilDontCareActions(1, true, true);
-    
-
-    bool isAfterPostProcessBucketEmpty = SRendItem::IsListEmpty(EFSLIST_AFTER_POSTPROCESS, rd->m_RP.m_nProcessThreadID, rd->m_RP.m_pRLD);
-    
-    bool isAuxGeomEnabled = false;
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    isAuxGeomEnabled = CRenderer::CV_r_enableauxgeom == 1;
-#endif
-    
-    //We may need to preserve the depth buffer in case there is something to render in the EFSLIST_AFTER_POSTPROCESS bucket.
-    //It could be UI in the 3d world. If the bucket is empty ignore the depth buffer as it is not needed.
-    //Also check if Auxgeom rendering is enabled in which case we preserve depth buffer.
-    if (isAfterPostProcessBucketEmpty && !isAuxGeomEnabled)
-    {
-        rd->FX_SetDepthDontCareActions(0, true, true);
-        rd->FX_SetDepthDontCareActions(1, true, true);
-    }
-    else
-    {
-        rd->FX_SetDepthDontCareActions(0, false, false);
-        rd->FX_SetDepthDontCareActions(1, false, false);
-    }
-
-    // Final bloom RT
-
-    // Noise offset was originally defined before VS parameter: "FrameRand" - algorithm untouched from original CryEngine implementation.
-    // Was moved to this location because for multi-pass the noise offset needs to be the same or there will be a mismatch.
-
-    static uint32 dwNoiseOffsetX = 0;
-    static uint32 dwNoiseOffsetY = 0;
-    dwNoiseOffsetX = (dwNoiseOffsetX + 27) & 0x3f;
-    dwNoiseOffsetY = (dwNoiseOffsetY + 19) & 0x3f;
-
-    Vec4 pFrameRand(
-        dwNoiseOffsetX / 64.0f,
-        dwNoiseOffsetX / 64.0f,
-        cry_random(0, 1023) / 1024.0f,
-        cry_random(0, 1023) / 1024.0f);
-
-    static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-    int DolbyCvarValue = DolbyCvar ? DolbyCvar->GetIVal() : eDVM_Disabled;
-
-    // Calculate dynamic metadata for Dolby vision if enabled.
-    if (DolbyCvarValue == eDVM_Vision && CRenderer::CV_r_HDRDolbyDynamicMetadata == 1)
-    {
-        CalculateDolbyDynamicMetadata(pSunShaftsRT);
-    }
-
-    {
-        CTexture*   pBloom = CTextureManager::Instance()->GetBlackTexture();
-        if (CRenderer::CV_r_HDRBloom && CRenderer::CV_r_PostProcess)
-        {
-            pBloom = CTexture::s_ptexHDRFinalBloom;
-        }
-
-        PREFAST_ASSUME(pBloom);
-        CRY_ASSERT(pBloom);
-
-        uint32 nPasses;
-        static CCryNameTSCRC TechFinalName("HDRFinalPass");
-        static CCryNameTSCRC TechFinalDolbyName("HDRFinalPassDolby");        
-        switch (DolbyCvarValue)
-        {
-        case eDVM_Disabled:
-            m_shHDR->FXSetTechnique(GetTonemapTechnique());           
-            break;
-        case eDVM_RGBPQ:
-        case eDVM_Vision:
-            m_shHDR->FXSetTechnique(TechFinalDolbyName);
-            break;
-        }
-        m_shHDR->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        m_shHDR->FXBeginPass(0);
-
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-        SetShaderParams();
-
-        // If any dolby output mode has been enabled, set required uniforms.
-        if (DolbyCvarValue >= eDVM_RGBPQ)
-        {
-            static CCryNameR pszHDRDolbyParam0("HDRDolbyScurveParams0");
-            static CCryNameR pszHDRDolbyParam1("HDRDolbyScurveParams1");
-            static CCryNameR pszHDRDolbyParam2("HDRDolbyScurveParams2");
-
-            Vec4 vHDRDolbyParam0(CRenderer::CV_r_HDRDolbyScurve ? 1.0f : 0.0f, CRenderer::CV_r_HDRDolbyScurveSourceMin, CRenderer::CV_r_HDRDolbyScurveSourceMid, CRenderer::CV_r_HDRDolbyScurveSourceMax);
-            Vec4 vHDRDolbyParam1(CRenderer::CV_r_HDRDolbyScurveRGBPQTargetMin, CRenderer::CV_r_HDRDolbyScurveRGBPQTargetMid, CRenderer::CV_r_HDRDolbyScurveRGBPQTargetMax, CRenderer::CV_r_HDRDolbyScurveSlope);
-            Vec4 vHDRDolbyParam2(CRenderer::CV_r_HDRDolbyDynamicMetadata ? 1.0f : 0.0f, 0.0f, 0.0f, CRenderer::CV_r_HDRDolbyScurveScale);
-            if (DolbyCvarValue == eDVM_Vision)
-            {
-                vHDRDolbyParam1.x = CRenderer::CV_r_HDRDolbyScurveVisionTargetMin;
-                vHDRDolbyParam1.y = CRenderer::CV_r_HDRDolbyScurveVisionTargetMid;
-                vHDRDolbyParam1.z = CRenderer::CV_r_HDRDolbyScurveVisionTargetMax;
-            }
-
-            m_shHDR->FXSetPSFloat(pszHDRDolbyParam0, &vHDRDolbyParam0, 1);
-            m_shHDR->FXSetPSFloat(pszHDRDolbyParam1, &vHDRDolbyParam1, 1);
-            m_shHDR->FXSetPSFloat(pszHDRDolbyParam2, &vHDRDolbyParam2, 1);
-        }
-
-        static CCryNameR pSunShaftsParamSName("SunShafts_SunCol");
-        Vec4 pShaftsSunCol(0, 0, 0, 0);
-        if (pSunShaftsRT)
-        {
-            Vec4 pSunShaftsParams[2];
-            pSunShaftsTech->GetSunShaftsParams(pSunShaftsParams);
-            Vec3 pSunColor = gEnv->p3DEngine->GetSunColor();
-            pSunColor.Normalize();
-            pSunColor.SetLerp(Vec3(pSunShaftsParams[0].x, pSunShaftsParams[0].y, pSunShaftsParams[0].z), pSunColor, pSunShaftsParams[1].w);
-
-            pShaftsSunCol = Vec4(pSunColor * pSunShaftsParams[1].z, 1);
-        }
-
-        m_shHDR->FXSetPSFloat(pSunShaftsParamSName, &pShaftsSunCol, 1);
-
-        // Force commit before setting samplers - workaround for per frame samplers hardcoded/overriding sampler slots.
-        rd->FX_Commit();
-
-        CTexture::s_ptexHDRTarget->Apply(static_cast<int>(eHDRPostProcessSRVs::HDRInput), nTexStateLinear, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-
-        if (CTexture::s_ptexCurLumTexture)
-        {
-            if (!gRenDev->m_CurViewportID)
-            {
-                CTexture::s_ptexCurLumTexture->Apply(static_cast<int>(eHDRPostProcessSRVs::Luminance), nTexStateLinear /*nTexStatePoint*/);
-            }
-            else
-            {
-                CTexture::s_ptexHDRToneMaps[0]->Apply(static_cast<int>(eHDRPostProcessSRVs::Luminance), nTexStateLinear);
-            }
-        }
-
-        pBloom->Apply(static_cast<int>(eHDRPostProcessSRVs::Bloom), nTexStateLinear);
-
-        if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            CTexture::s_ptexVelocity->Apply(static_cast<int>(eHDRPostProcessSRVs::Velocity), nTexStatePoint);
-        }
-        else
-        {
-            CTexture::s_ptexZTarget->Apply(static_cast<int>(eHDRPostProcessSRVs::ZTarget), nTexStatePoint);
-        }
-
-        AZ_PUSH_DISABLE_WARNING(, "-Wconstant-logical-operand")
-        if (CRenderer::CV_r_PostProcess && CRenderer::CV_r_HDRVignetting)
-        AZ_POP_DISABLE_WARNING
-        {
-            CTextureManager::Instance()->GetDefaultTexture("VignettingMap")->Apply(static_cast<int>(eHDRPostProcessSRVs::VignetteMap), nTexStateLinear);
-        }
-        else
-        {
-            CTexture*   pWhite = CTextureManager::Instance()->GetWhiteTexture();
-            pWhite->Apply(static_cast<int>(eHDRPostProcessSRVs::VignetteMap), nTexStateLinear);
-        }
-
-        if (pTexColorChar)
-        {
-            pTexColorChar->Apply(static_cast<int>(eHDRPostProcessSRVs::ColorChar), nTexStateLinear);
-        }
-
-        if (pSunShaftsRT)
-        {
-            pSunShaftsRT->Apply(static_cast<int>(eHDRPostProcessSRVs::SunShafts), nTexStateLinear);
-        }
-
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-    }
-
-    // Reset don't care actions for UI and other passes after post-proc pipeline
-    rd->FX_SetColorDontCareActions(0, false, false);
-}
-
-void CHDRPostProcess::EncodeDolbyVision(CTexture* source)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    int NumPasses = 2;
-
-    for (int pass = 0; pass < NumPasses; pass++)
-    {
-        uint32 nPasses;
-        static CCryNameTSCRC TechFinalDolbyVisionName("HDRFinalPassDolbyVision");
-        static CCryNameTSCRC TechFinalDolbyVisionNoMetadataName("HDRFinalPassDolbyVisionNoMetadata");
-
-        if (pass == 0)
-        {
-            m_shHDR->FXSetTechnique(TechFinalDolbyVisionName);
-        }
-        else if (pass == 1)
-        {
-            m_shHDR->FXSetTechnique(TechFinalDolbyVisionNoMetadataName);
-        }
-
-        m_shHDR->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        m_shHDR->FXBeginPass(0);
-
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-        // Set all shader params
-        SetShaderParams();
-
-        // If any dolby output mode has been enabled, set required uniforms.
-        {
-
-            static CCryNameR pszHDRDolbyParam0("HDRDolbyScurveParams0");
-            static CCryNameR pszHDRDolbyParam1("HDRDolbyScurveParams1");
-            static CCryNameR pszHDRDolbyParam2("HDRDolbyScurveParams2");
-
-            Vec4 vHDRDolbyParam0(CRenderer::CV_r_HDRDolbyScurve ? 1.0f : 0.0f, CRenderer::CV_r_HDRDolbyScurveSourceMin, CRenderer::CV_r_HDRDolbyScurveSourceMid, CRenderer::CV_r_HDRDolbyScurveSourceMax);
-            Vec4 vHDRDolbyParam1(CRenderer::CV_r_HDRDolbyScurveVisionTargetMin, CRenderer::CV_r_HDRDolbyScurveVisionTargetMid, CRenderer::CV_r_HDRDolbyScurveVisionTargetMax, CRenderer::CV_r_HDRDolbyScurveSlope);
-            Vec4 vHDRDolbyParam2(CRenderer::CV_r_HDRDolbyDynamicMetadata ? 1.0f : 0.0f, 0.0, 0.0, CRenderer::CV_r_HDRDolbyScurveScale);
-
-            m_shHDR->FXSetPSFloat(pszHDRDolbyParam0, &vHDRDolbyParam0, 1);
-            m_shHDR->FXSetPSFloat(pszHDRDolbyParam1, &vHDRDolbyParam1, 1);
-            m_shHDR->FXSetPSFloat(pszHDRDolbyParam2, &vHDRDolbyParam2, 1);
-        }
-
-        // Force commit before setting samplers - workaround for per frame samplers hardcoded/overriding sampler slots.
-        rd->FX_Commit();
-
-        SResourceView::KeyType nResourceID = SResourceView::DefaultView;
-
-        source->Apply(static_cast<int>(eHDRPostProcessSRVs::HDRInput), nTexStateLinear, EFTT_UNKNOWN, -1, nResourceID);
-
-        // Provide dynamic metadata values to the shader if enabled.
-        if (CRenderer::CV_r_HDRDolbyDynamicMetadata == 1)
-        {
-            rd->m_DevMan.BindSRV(eHWSC_Pixel, m_bufDolbyMetadataMinMaxMid.GetShaderResourceView(), static_cast<int>(eHDRPostProcessSRVs::DolbyVisionDynamicMeta));
-        }
-
-        {
-            // Dolby Vision split rendering (metadata/non-metadata).
-
-            // * Calculate split boundaries.
-            // Metadata needs 128 bytes * 3 times (according to dolby 3x repeater spec).
-            // Every pixel stores 1 bit so at least 3072 pixels are needed to store the metadata. 4000 is a safe margin above that value.
-            float pixelsNeeded = 4000.0f;
-            float rowsNeeded = pixelsNeeded / rd->GetBackbufferWidth();
-            float pixelRows = ceil(rowsNeeded);
-            float pixelRowsNormalized = pixelRows / rd->GetBackbufferHeight();
-
-            // * Draw split quad.
-            Vec2 srcLeftTop(0.0f, 0.0f), srcRightBottom(1.0f, 1.0f);
-            if (pass == 0)
-            {
-                srcRightBottom.y = pixelRowsNormalized;     // Draw top half with metadata.
-            }
-            else
-            {
-                srcLeftTop.y = pixelRowsNormalized;         // Draw bottom half without metadata.
-            }
-
-            SD3DPostEffectsUtils::DrawQuad(-1, -1, Vec2(srcLeftTop.x, srcLeftTop.y), Vec2(srcLeftTop.x, srcRightBottom.y), Vec2(srcRightBottom.x, srcRightBottom.y), Vec2(srcRightBottom.x, srcLeftTop.y),
-                Vec2(srcLeftTop.x, srcLeftTop.y), Vec2(srcLeftTop.x, srcRightBottom.y), Vec2(srcRightBottom.x, srcRightBottom.y), Vec2(srcRightBottom.x, srcLeftTop.y));
-        }
-    }
-}
-
-CCryNameTSCRC CHDRPostProcess::GetTonemapTechnique() const
-{
-    ToneMapOperators toneMapTech = static_cast<ToneMapOperators>(CRenderer::CV_r_ToneMapTechnique);
-    switch(toneMapTech)
-    {
-        case ToneMapOperators::Linear:
-            return CCryNameTSCRC("HDRToneMapLinear");
-        case ToneMapOperators::Exponential:
-            return CCryNameTSCRC("HDRToneMapExponential");
-        case ToneMapOperators::Reinhard:
-            return CCryNameTSCRC("HDRToneMapReinhard");
-        case ToneMapOperators::FilmicCurveALU:
-            return CCryNameTSCRC("HDRToneMapFilmicALU");
-        case ToneMapOperators::FilmicCurveUC2:
-            return CCryNameTSCRC("HDRFinalPass");       
-        default:
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Tonemap technique not supported");
-            return CCryNameTSCRC("HDRFinalPass");
-        }            
-    }    
-}
-  
-void CHDRPostProcess::SetExposureTypeShaderFlags()
-{
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE5]);
-    Exposuretype expType = static_cast<Exposuretype>(CRenderer::CV_r_ToneMapExposureType);
-    switch(expType)
-    {
-        case Exposuretype::Auto:
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-            return;
-        }
-        case Exposuretype::Manual:
-        {
-            //Don't need to do anything as it will default to manual.
-            return;
-        }
-        default:
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Exposure type not supported");
-        }
-    }
-}
-
-void CHDRPostProcess::ToneMappingDebug()
-{
-    Vec4 avSampleOffsets[4];
-    PROFILE_LABEL_SCOPE("TONEMAPPINGDEBUG");
-
-    // Enable corresponding shader variation
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-
-    if (CRenderer::CV_r_HDRDebug == 1)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG0];
-    }
-    else
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_DEBUG0];
-    }
-
-    if (CRenderer::CV_r_HDREyeAdaptationMode == 2)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-
-    SetExposureTypeShaderFlags();
-
-    uint32 nPasses;
-    static CCryNameTSCRC techName("HDRFinalDebugPass");
-    m_shHDR->FXSetTechnique(techName);
-    m_shHDR->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    m_shHDR->FXBeginPass(0);
-
-    GetSampleOffsets_DownScale2x2(CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight(), avSampleOffsets);
-    static CCryNameR SampleOffsetsName("SampleOffsets");
-    m_shHDR->FXSetPSFloat(SampleOffsetsName, avSampleOffsets, 4);
-
-    SetShaderParams();
-
-    CTexture::s_ptexHDRTarget->Apply(0, nTexStatePoint);
-    CTexture::s_ptexHDRToneMaps[0]->Apply(1, nTexStateLinear);
-    DrawFullScreenQuad(0.0f, 0.0f, 1.0f, 1.0f);
-
-    gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_DEBUG0];
-}
-
-
-void CHDRPostProcess::CalculateDolbyDynamicMetadata(CTexture* pSunShaftsRT)
-{
-    PROFILE_LABEL_SCOPE("DOLBY_DYNAMIC_META");
-    CD3D9Renderer* rd = &gcpRendD3D;
-
-    // Settings (must match shaders!)
-    int width = gRenDev->GetBackbufferWidth();
-    int height = gRenDev->GetBackbufferHeight();
-    int pass0ReductionX = 16;
-    int pass0ReductionY = 16;
-    int pass0ThreadsX = 16;
-    int pass0ThreadsY = 16;
-    int pass0StrideX = 2;
-    int pass0StrideY = 2;
-    double outWidth = width / static_cast<double>(pass0ReductionX * pass0StrideX);
-    double outHeight = height / static_cast<double>(pass0ReductionY * pass0StrideY);
-    double dispatchX = width / static_cast<double>(pass0ReductionX * pass0ThreadsX * pass0StrideX);
-    double dispatchY = height / static_cast<double>(pass0ReductionY * pass0ThreadsY * pass0StrideY);
-    dispatchX = ceil(dispatchX);
-    dispatchY = ceil(dispatchY);
-    outWidth = ceil(outWidth);
-    outHeight = ceil(outHeight);
-
-    // Make sure StructuredBuffers are initialized..
-    if (m_bufDolbyMetadataMacroReductionOutput.m_pBuffer == nullptr)
-    {
-        // Max resolution 4K (4096x2160)
-        m_bufDolbyMetadataMacroReductionOutput.Create((4096 * 2160) / (pass0ReductionX * pass0ReductionY), sizeof(float) * 4, DXGI_FORMAT_UNKNOWN, DX11BUF_STRUCTURED | DX11BUF_BIND_UAV | DX11BUF_BIND_SRV, nullptr);
-        m_bufDolbyMetadataMinMaxMid.Create(3, sizeof(float), DXGI_FORMAT_UNKNOWN, DX11BUF_STRUCTURED | DX11BUF_BIND_UAV | DX11BUF_BIND_SRV, nullptr);
-    }
-
-    // Make sure shaders are loaded..
-    if (m_shHDRDolbyMetadataPass0 == nullptr)
-    {
-        m_shHDRDolbyMetadataPass0 = gcpRendD3D->m_cEF.mfForName("HDRDolbyMetadataPass0", EF_SYSTEM);
-        m_shHDRDolbyMetadataPass1 = gcpRendD3D->m_cEF.mfForName("HDRDolbyMetadataPass1", EF_SYSTEM);
-    }
-
-    // Shared variables.
-    uint32 nPasses;
-    Vec4 parameters[2];
-    static CCryNameR Parameter0Name("Parameters0");
-    static CCryNameR Parameter1Name("Parameters1");
-
-    // Pass 1: Macro reduction of HDR signal. (256x reduction)
-    parameters[0] = Vec4(0.0f, 0.0f, static_cast<float>(width), static_cast<float>(height));
-    parameters[1] = Vec4(static_cast<float>(outWidth), 0.0f, 0.0f, 0.0f);
-    m_shHDRDolbyMetadataPass0->FXSetTechnique("Default");
-    m_shHDRDolbyMetadataPass0->FXBegin(&nPasses, 0);
-    m_shHDRDolbyMetadataPass0->FXBeginPass(0);
-    m_shHDRDolbyMetadataPass0->FXSetCSFloat(Parameter0Name, parameters, 1);
-    m_shHDRDolbyMetadataPass0->FXSetCSFloat(Parameter1Name, parameters + 1, 1);
-    rd->FX_Commit();
-
-    // Bind HDR targets in order to recreating the same HDR input signal.
-    CTexture::s_ptexHDRTarget->Apply(0, nTexStateLinear, EFTT_UNKNOWN, -1, SResourceView::DefaultView, eHWSC_Compute);
-    CTexture::s_ptexHDRToneMaps[0]->Apply(1, nTexStateLinear, EFTT_UNKNOWN, -1, SResourceView::DefaultView, eHWSC_Compute);
-    CTexture*   pBloom = CTextureManager::Instance()->GetBlackTexture();
-    if (CRenderer::CV_r_HDRBloom && CRenderer::CV_r_PostProcess)
-    {
-        pBloom = CTexture::s_ptexHDRFinalBloom;
-    }
-    pBloom->Apply(2, nTexStateLinear, EFTT_UNKNOWN, -1, SResourceView::DefaultView, eHWSC_Compute);
-    if (pSunShaftsRT)
-    {
-        pSunShaftsRT->Apply(9, nTexStateLinear, EFTT_UNKNOWN, -1, SResourceView::DefaultView, eHWSC_Compute);
-    }
-
-    rd->m_DevMan.BindUAV(eHWSC_Compute, m_bufDolbyMetadataMacroReductionOutput.GetUnorderedAccessView(), 0, 0);
-
-    // Execute pass 1.
-    rd->m_DevMan.Dispatch(static_cast<int>(dispatchX), static_cast<int>(dispatchY), 1);
-    m_shHDRDolbyMetadataPass0->FXEndPass();
-    m_shHDRDolbyMetadataPass0->FXEnd();
-
-    // Unbind UAV.
-    rd->m_DevMan.BindUAV(eHWSC_Compute, nullptr, 0, 0);
-    rd->m_DevMan.CommitDeviceStates();
-
-    // Pass 2: Micro reduction. (remainder)
-    parameters[0] = Vec4(static_cast<float>(outWidth * outHeight), 0.0f, 0.0f, 0.0f);
-    m_shHDRDolbyMetadataPass1->FXSetTechnique("Default");
-    m_shHDRDolbyMetadataPass1->FXBegin(&nPasses, 0);
-    m_shHDRDolbyMetadataPass1->FXBeginPass(0);
-    m_shHDRDolbyMetadataPass1->FXSetCSFloat(Parameter0Name, parameters, 1);
-    rd->FX_Commit();
-
-    rd->m_DevMan.BindUAV(eHWSC_Compute, m_bufDolbyMetadataMinMaxMid.GetUnorderedAccessView(), 0, 0); // Unbind previous UAV.
-    rd->m_DevMan.BindSRV(eHWSC_Compute, m_bufDolbyMetadataMacroReductionOutput.GetShaderResourceView(), 0);
-
-    // Execute pass 2.
-    rd->m_DevMan.Dispatch(1, 1, 1);
-    m_shHDRDolbyMetadataPass1->FXEndPass();
-    m_shHDRDolbyMetadataPass1->FXEnd();
-
-    // Unbind UAV.
-    rd->m_DevMan.BindUAV(eHWSC_Compute, nullptr, 0, 0);
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-
-void CHDRPostProcess::DrawDebugViews()
-{
-    if (CRenderer::CV_r_HDRDebug != 1 && CRenderer::CV_r_HDRDebug != 3 && CRenderer::CV_r_HDRDebug != 4)
-    {
-        return;
-    }
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    uint32 nPasses = 0;
-
-    if (CRenderer::CV_r_HDRDebug == 1)
-    {
-        // We use screen shots to create minimaps, and we don't want to
-        // have any debug text on minimaps.
-        {
-            ICVar* const pVar = gEnv->pConsole->GetCVar("e_ScreenShot");
-            if (pVar && pVar->GetIVal() != 0)
-            {
-                return;
-            }
-        }
-
-        STALL_PROFILER("read scene luminance")
-
-        float fLuminance = -1;
-        float fIlluminance = -1;
-
-        CDeviceTexture* pSrcDevTex = CTexture::s_ptexHDRToneMaps[0]->GetDevTexture();
-        pSrcDevTex->DownloadToStagingResource(0, [&](void* pData, [[maybe_unused]] uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-            {
-                CryHalf* pRawPtr = reinterpret_cast<CryHalf*>(pData);
-                fLuminance = CryConvertHalfToFloat(pRawPtr[0]);
-                fIlluminance = CryConvertHalfToFloat(pRawPtr[1]);
-                return true;
-            });
-
-        char str[256];
-        SDrawTextInfo ti;
-        ti.color[1] = 0;
-        azsprintf(str, "Average Luminance (cd/m2): %.2f", fLuminance * RENDERER_LIGHT_UNIT_SCALE);
-        rd->Draw2dText(5, 35, str, ti);
-        azsprintf(str, "Estimated Illuminance (lux): %.1f", fIlluminance * RENDERER_LIGHT_UNIT_SCALE);
-        rd->Draw2dText(5, 55, str, ti);
-
-        Vec4 vHDRSetupParams[5];
-        gEnv->p3DEngine->GetHDRSetupParams(vHDRSetupParams);
-
-        if (CRenderer::CV_r_HDREyeAdaptationMode == 2)
-        {
-            // Compute scene key and exposure in the same way as in the tone mapping shader
-            float sceneKey = 1.03f - 2.0f / (2.0f + log(fLuminance + 1.0f) / log(2.0f));
-            float exposure = clamp_tpl<float>(sceneKey / fLuminance, vHDRSetupParams[4].y, vHDRSetupParams[4].z);
-
-            azsprintf(str, "Exposure: %.2f  SceneKey: %.2f", exposure, sceneKey);
-            rd->Draw2dText(5, 75, str, ti);
-        }
-        else
-        {
-            float exposure = log(fIlluminance * RENDERER_LIGHT_UNIT_SCALE * 100.0f / 330.0f) / log(2.0f);
-            float sceneKey = log(fIlluminance * RENDERER_LIGHT_UNIT_SCALE + 1.0f) / log(10.0f);
-            float autoCompensation = (clamp_tpl<float>(sceneKey, 0.1f, 5.2f) - 3.0f) / 2.0f * vHDRSetupParams[3].z;
-            float finalExposure = clamp_tpl<float>(exposure - autoCompensation, vHDRSetupParams[3].x, vHDRSetupParams[3].y);
-
-            azsprintf(str, "Measured EV: %.1f  Auto-EC: %.1f  Final EV: %.1f", exposure, autoCompensation, finalExposure);
-            rd->Draw2dText(5, 75, str, ti);
-        }
-
-        return;
-    }
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-    int iTmpX, iTmpY, iTempWidth, iTempHeight;
-    rd->GetViewport(&iTmpX, &iTmpY, &iTempWidth, &iTempHeight);
-
-    rd->EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    rd->EF_SetSrgbWrite(false);
-
-    TransformationMatrices backupSceneMatrices;
-    rd->Set2DMode(1, 1, backupSceneMatrices);
-
-    gRenDev->m_cEF.mfRefreshSystemShader("Debug", CShaderMan::s_ShaderDebug);
-    CShader* pSH = CShaderMan::s_ShaderDebug;
-
-    CTexture* pSceneTargetHalfRes = CTexture::s_ptexHDRTargetScaled[0];
-    CTexture::s_ptexHDRTarget->SetResolved(false);
-    CTexture::s_ptexHDRTarget->Resolve();
-    // 1
-    uint32 nPosX = 10;
-    rd->RT_SetViewport(nPosX, 500, 100, 100);
-    rd->DrawImage(0, 0, 1, 1, CTexture::s_ptexHDRTarget->GetID(), 0, 1, 1, 0, 1, 1, 1, 1);
-
-    // 2
-    rd->RT_SetViewport(nPosX += 110, 500, 100, 100);
-    rd->DrawImage(0, 0, 1, 1, pSceneTargetHalfRes->GetID(), 0, 1, 1, 0, 1, 1, 1, 1);
-
-    // 3
-    if (CRenderer::CV_r_HDRBloom)
-    {
-        // Bloom generation/intermediate render-targets
-
-        // Quarter res
-        rd->RT_SetViewport(nPosX += 110, 500, 100, 100);
-        rd->DrawImage(0, 0, 1, 1, CTexture::s_ptexHDRTempBloom[0]->GetID(), 0, 1, 1, 0, 1, 1, 1, 1);
-
-        rd->RT_SetViewport(nPosX += 110, 500, 100, 100);
-        rd->DrawImage(0, 0, 1, 1, CTexture::s_ptexHDRTempBloom[1]->GetID(), 0, 1, 1, 0, 1, 1, 1, 1);
-
-        rd->RT_SetViewport(nPosX += 110, 500, 100, 100);
-        rd->DrawImage(0, 0, 1, 1, CTexture::s_ptexHDRFinalBloom->GetID(), 0, 1, 1, 0, 1, 1, 1, 1);
-    }
-
-    nPosX = 10;
-
-    pSH->FXSetTechnique("Debug_ShowR");
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-
-    CTexture::s_ptexHDRToneMaps[3]->Apply(0, nTexStatePoint);
-    rd->RT_SetViewport(nPosX, 610, 100, 100);
-    DrawFullScreenQuadTR(0.0f, 0.0f, 1.0f, 1.0f);
-
-    if (CTexture::s_ptexHDRToneMaps[2])
-    {
-        CTexture::s_ptexHDRToneMaps[2]->Apply(0, nTexStatePoint);
-        rd->RT_SetViewport(nPosX += 110, 610, 100, 100);
-        DrawFullScreenQuadTR(0.0f, 0.0f, 1.0f, 1.0f);
-    }
-
-    if (CTexture::s_ptexHDRToneMaps[1])
-    {
-        CTexture::s_ptexHDRToneMaps[1]->Apply(0, nTexStatePoint);
-        rd->RT_SetViewport(nPosX += 110, 610, 100, 100);
-        DrawFullScreenQuadTR(0.0f, 0.0f, 1.0f, 1.0f);
-    }
-
-    if (CTexture::s_ptexHDRToneMaps[0])
-    {
-        CTexture::s_ptexHDRToneMaps[0]->Apply(0, nTexStatePoint);
-        rd->RT_SetViewport(nPosX += 110, 610, 100, 100);
-        DrawFullScreenQuadTR(0.0f, 0.0f, 1.0f, 1.0f);
-    }
-
-    if (CTexture::s_ptexCurLumTexture)
-    {
-        CTexture::s_ptexCurLumTexture->Apply(0, nTexStatePoint);
-        rd->RT_SetViewport(nPosX += 110, 610, 100, 100);
-        DrawFullScreenQuadTR(0.0f, 0.0f, 1.0f, 1.0f);
-    }
-
-    pSH->FXEndPass();
-    pSH->FXEnd();
-
-    rd->Unset2DMode(backupSceneMatrices);
-
-    rd->RT_SetViewport(iTmpX, iTmpY, iTempWidth, iTempHeight);
-
-    {
-        char str[256];
-
-        SDrawTextInfo ti;
-
-        sprintf_s(str, "HDR rendering debug");
-        rd->Draw2dText(5, 310, str, ti);
-    }
-}
-
-
-void CHDRPostProcess::ScreenShot()
-{
-    if (CRenderer::CV_r_GetScreenShot == 1)
-    {
-        iLog->LogError("HDR screen shots are not yet supported on DX11!");      // TODO: D3DXSaveSurfaceToFile()
-    }
-}
-
-
-void CHDRPostProcess::Begin()
-{
-    gcpRendD3D->GetModelViewMatrix(PostProcessUtils().m_pView.GetData());
-    gcpRendD3D->GetProjectionMatrix(PostProcessUtils().m_pProj.GetData());
-
-    // Store some commonly used per-frame data
-
-    PostProcessUtils().m_pViewProj = PostProcessUtils().m_pView * PostProcessUtils().m_pProj;
-    if (gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        PostProcessUtils().m_pViewProj = ReverseDepthHelper::Convert(PostProcessUtils().m_pViewProj);
-    }
-
-    PostProcessUtils().m_pViewProj.Transpose();
-
-    m_shHDR = CShaderMan::s_shHDRPostProcess;
-
-    if (CTexture::s_ptexHDRTarget->GetWidth() != gcpRendD3D->GetWidth() || CTexture::s_ptexHDRTarget->GetHeight() != gcpRendD3D->GetHeight())
-    {
-        CTexture::GenerateHDRMaps();
-    }
-
-    gcpRendD3D->FX_ResetPipe();
-    PostProcessUtils().SetFillModeSolid(true);
-}
-
-
-void CHDRPostProcess::End()
-{
-    gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_HDR;
-    gcpRendD3D->m_RP.m_PersFlags2 &= ~(RBPF2_HDR_FP16 | RBPF2_LIGHTSHAFTS);
-
-    gcpRendD3D->FX_ResetPipe();
-
-    PostProcessUtils().SetFillModeSolid(false);
-
-    // (re-set back-buffer): if the platform does lazy RT updates/setting there's strong possibility we run into problems when we try to resolve with no RT set
-    gcpRendD3D->FX_SetActiveRenderTargets();
-}
-
-
-void CHDRPostProcess::Render()
-{
-    PROFILE_LABEL_SCOPE("HDR_POSTPROCESS");
-
-    Begin();
-
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        CRY_ASSERT(gcpRendD3D->FX_GetCurrentRenderTarget(0) == CTexture::s_ptexHDRTarget);
-
-        gcpRendD3D->FX_SetActiveRenderTargets(); // Called explicitly to work around RT stack problems on deprecated platform
-        gcpRendD3D->RT_UnbindTMUs();// Avoid d3d error due to potential rtv still bound as shader input.
-        gcpRendD3D->FX_PopRenderTarget(0);
-        gcpRendD3D->EF_ClearTargetsLater(0);
-    }
-
-    // Skip hdr/post processing when rendering different camera views
-    if ((gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_MIRRORCULL) || (gcpRendD3D->m_RP.m_nRendFlags & SHDF_CUBEMAPGEN))
-    {
-        End();
-        return;
-    }
-
-#if !defined(_RELEASE) || defined(WIN32) || defined(WIN64) || defined(ENABLE_LW_PROFILERS)
-    ScreenShot();
-#endif
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT = 0;
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0]; // enable srgb. Can save this flag, always enabled
-
-    gcpRendD3D->FX_ApplyShaderQuality(eST_PostProcess);
-    m_bHiQuality = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Low, eSQ_VeryHigh);
-
-    static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-    const int DolbyCvarValue = DolbyCvar ? DolbyCvar->GetIVal() : eDVM_Disabled;
-    const bool bDolbyHDRMode = DolbyCvarValue > eDVM_Disabled;
-
-    if (CRenderer::CV_r_PostProcess)
-    {
-        CStandardGraphicsPipeline& graphicsPipeline = gcpRendD3D->GetGraphicsPipeline();
-
-        const bool bSolidModeEnabled = gcpRendD3D->GetWireframeMode() == R_SOLID_MODE;
-        const bool bDepthOfFieldEnabled = CRenderer::CV_r_dof >= 1 && bSolidModeEnabled;
-        const bool takingScreenShot = (gcpRendD3D->m_screenShotType != 0);
-        const bool bMotionBlurEnabled = CRenderer::CV_r_MotionBlur && bSolidModeEnabled && (!takingScreenShot || CRenderer::CV_r_MotionBlurScreenShot) && !CRenderer::CV_r_RenderMotionBlurAfterHDR;
-
-        DepthOfFieldParameters depthOfFieldParameters;
-
-        if (bDepthOfFieldEnabled)
-        {
-            CDepthOfField* depthOfField = static_cast<CDepthOfField*>(PostEffectMgr()->GetEffect(ePFX_eDepthOfField));
-            depthOfField->UpdateParameters();
-            depthOfFieldParameters = depthOfField->GetParameters();
-        }
-
-        if (CRenderer::CV_r_AntialiasingMode == eAT_TAA)
-        {
-            CRY_ASSERT_MESSAGE(CRenderer::CV_r_ToneMapExposureType==static_cast<int>(Exposuretype::Auto), "TAA needs auto exposure");
-            GetUtils().StretchRect(CTexture::s_ptexHDRTarget, CTexture::s_ptexSceneTarget);
-            graphicsPipeline.RenderTemporalAA(CTexture::s_ptexSceneTarget, CTexture::s_ptexHDRTarget, depthOfFieldParameters);
-        }
-
-        // Rain
-        CSceneRain* pSceneRain = static_cast<CSceneRain*>(PostEffectMgr()->GetEffect(ePFX_SceneRain));
-        const SRainParams& rainInfo = gcpRendD3D->m_p3DEngineCommon.m_RainInfo;
-        if (pSceneRain && pSceneRain->IsActive() && rainInfo.fRainDropsAmount > 0.01f)
-        {
-            pSceneRain->Render();
-        }
-
-        // Motion blur not enabled in 256bpp GMEM paths
-        if (CD3D9Renderer::eGT_256bpp_PATH != gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            // Note: Motion blur uses s_ptexHDRTargetPrev to avoid doing another copy, so this should be right before the MB pass
-            PostProcessUtils().StretchRect(CTexture::s_ptexHDRTarget, CTexture::s_ptexHDRTargetPrev, false, false, false, false, SPostEffectsUtils::eDepthDownsample_None, false, &gcpRendD3D->m_FullResRect);
-        }
-
-        if (bDepthOfFieldEnabled)
-        {
-            graphicsPipeline.RenderDepthOfField();
-        }
-                
-        uint32 flags = SRendItem::BatchFlags(EFSLIST_TRANSP, gcpRendD3D->m_RP.m_pRLD);
-        if (flags & FB_TRANSPARENT_AFTER_DOF)
-        {
-            PROFILE_LABEL_SCOPE("PARTICLES AFTER DOF");
-            //render (after water) transparent particles list which was set to skip Depth of Field
-            gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, &gcpRendD3D->m_DepthBufferOrig);
-            uint32 nBatchFilter = FB_TRANSPARENT_AFTER_DOF;
-            gcpRendD3D->FX_ProcessRenderList(EFSLIST_TRANSP, 1, gcpRendD3D->FX_FlushShader_General, true, nBatchFilter);
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        if (bMotionBlurEnabled)
-        {
-            // Added old pipeline render call here. This lets us do motion blur before the end of HDR processing.
-
-            if (CRenderer::CV_r_GraphicsPipeline > 0)
-            {
-                graphicsPipeline.RenderMotionBlur();
-            }
-            else
-            {
-                CMotionBlur* motionBlurEffect = static_cast<CMotionBlur*>(PostEffectMgr()->GetEffect(ePFX_eMotionBlur));
-
-                if (motionBlurEffect)
-                {
-                  motionBlurEffect->Render();
-                }
-            }
-        }
-
-        {
-            CSceneSnow* pSceneSnow = static_cast<CSceneSnow*>(PostEffectMgr()->GetEffect(ePFX_SceneSnow));
-            if (pSceneSnow->IsActiveSnow())
-            {
-                pSceneSnow->Render();
-            }
-        }
-
-        //Render passes for auto exposure. Used for tonemapping or Bloom generation
-        if (CRenderer::CV_r_ToneMapExposureType == static_cast<int>(Exposuretype::Auto) || CRenderer::CV_r_HDRBloom)
-        {
-            HalfResDownsampleHDRTarget();
-            gcpRendD3D->SetCurDownscaleFactor(Vec2(1, 1));
-            QuarterResDownsampleHDRTarget();
-            
-            gcpRendD3D->FX_ApplyShaderQuality(eST_PostProcess);
-            
-            // Update eye adaptation
-            if (CRenderer::CV_r_EnableGMEMPostProcCS)
-            {
-                MeasureLumEyeAdaptationUsingCompute();
-            }
-            else
-            {
-                MeasureLuminance();
-                EyeAdaptation();
-            }
-        }
-
-        if (CRenderer::CV_r_HDRBloom)
-        {
-            BloomGeneration();
-        }
-    }
-
-    gcpRendD3D->SetCurDownscaleFactor(gcpRendD3D->m_CurViewportScale);
-
-    bool postAAWillApplyAA = (CRenderer::CV_r_AntialiasingMode == eAT_SMAA1TX) || (CRenderer::CV_r_AntialiasingMode == eAT_FXAA);
-    bool shouldRenderToBackbufferNow = CRenderer::CV_r_SkipNativeUpscale && CRenderer::CV_r_SkipRenderComposites && !postAAWillApplyAA;
-    if (shouldRenderToBackbufferNow)
-    {
-        gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetNativeWidth(), gcpRendD3D->GetNativeHeight());
-        gcpRendD3D->FX_SetRenderTarget(0, gcpRendD3D->GetBackBuffer(), nullptr);
-        gcpRendD3D->FX_SetActiveRenderTargets();
-    }
-    else
-    {
-        gcpRendD3D->FX_PushRenderTarget(0, SPostEffectsUtils::AcquireFinalCompositeTarget(bDolbyHDRMode), &gcpRendD3D->m_DepthBufferOrigMSAA);
-    }
-    
-    // Render final scene to the back buffer
-    if (CRenderer::CV_r_HDRDebug != 1 && CRenderer::CV_r_HDRDebug != 2)
-    {
-        ToneMapping();
-    }
-    else
-    {
-        ToneMappingDebug();
-    }
-
-    if (CRenderer::CV_r_HDRDebug > 0)
-    {
-        DrawDebugViews();
-    }
-
-    End();
-}
-
-
-void CD3D9Renderer::FX_HDRPostProcessing()
-{
-    PROFILE_FRAME(Draw_HDR_PostProcessing);
-
-
-    if (gcpRendD3D->m_bDeviceLost)
-    {
-        return;
-    }
-
-    if (!CTexture::IsTextureExist(CTexture::s_ptexHDRTarget))
-    {
-        return;
-    }
-
-    CHDRPostProcess* pHDRPostProcess = CHDRPostProcess::GetInstance();
-    pHDRPostProcess->Render();
-    pHDRPostProcess->ProcessLensOptics();
-}
-
-
-void CD3D9Renderer::FX_FinalComposite()
-{
-    CTexture* upscaleSource = SPostEffectsUtils::GetFinalCompositeTarget();
-
-    if (FX_GetCurrentRenderTarget(0) == upscaleSource && upscaleSource != nullptr)
-    {
-        FX_PopRenderTarget(0);
-
-        RT_SetViewport(0, 0, m_nativeWidth, m_nativeHeight);
-        FX_SetRenderTarget(0, m_pBackBuffer, nullptr);
-        FX_SetActiveRenderTargets();
-
-        static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-        int DolbyCvarValue = DolbyCvar ? DolbyCvar->GetIVal() : eDVM_Disabled;
-
-        if (DolbyCvarValue == eDVM_Vision)
-        {
-            CHDRPostProcess::GetInstance()->EncodeDolbyVision(upscaleSource);
-        }
-        else
-        {
-            GetGraphicsPipeline().RenderFinalComposite(upscaleSource);
-        }
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHMDRenderer.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DHMDRenderer.cpp
deleted file mode 100644
index 852ada8601..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHMDRenderer.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-#include "D3DHMDRenderer.h"
-#include "DriverD3D.h"
-#include <HMDBus.h>
-#include <IStereoRenderer.h>
-#include <D3DPostProcess.h>
-#include <Common/Textures/Texture.h>
-#include <string.h> // for memset
-
-D3DHMDRenderer::D3DHMDRenderer() :
-    m_eyeWidth(0),
-    m_eyeHeight(0),
-    m_renderer(nullptr),
-    m_stereoRenderer(nullptr),
-    m_framePrepared(false)
-{
-    memset(m_eyes, 0, sizeof(m_eyes));
-}
-
-D3DHMDRenderer::~D3DHMDRenderer()
-{
-}
-
-bool D3DHMDRenderer::Initialize(CD3D9Renderer* renderer, CD3DStereoRenderer* stereoRenderer)
-{
-    m_renderer       = renderer;
-    m_stereoRenderer = stereoRenderer;
-    m_eyeWidth       = m_renderer->GetWidth();
-    m_eyeHeight      = m_renderer->GetHeight();
-
-    AZ::VR::HMDDeviceBus::TextureDesc textureDesc;
-    textureDesc.width = m_eyeWidth;
-    textureDesc.height = m_eyeHeight;
-
-    if (!ResizeRenderTargets(textureDesc))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void D3DHMDRenderer::Shutdown()
-{
-    m_stereoRenderer->SetEyeTextures(nullptr, nullptr);
-    FreeRenderTargets();
-}
-
-void D3DHMDRenderer::CalculateBackbufferResolution(int eyeWidth, int eyeHeight, int& backbufferWidth, int& backbufferHeight)
-{
-    backbufferWidth  = eyeWidth;
-    backbufferHeight = eyeHeight;
-}
-
-void D3DHMDRenderer::OnResolutionChanged()
-{
-    if (m_eyeWidth != m_renderer->GetWidth() ||
-        m_eyeHeight != m_renderer->GetHeight())
-    {
-        // The size has actually changed, re-create the internal buffers.
-        m_eyeWidth  = m_renderer->GetWidth();
-        m_eyeHeight = m_renderer->GetHeight();
-
-        AZ::VR::HMDDeviceBus::TextureDesc textureDesc;
-        textureDesc.width = m_eyeWidth;
-        textureDesc.height = m_eyeHeight;
-
-        ResizeRenderTargets(textureDesc);
-    }
-}
-
-void D3DHMDRenderer::RenderSocialScreen()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DHMDRenderer_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    //Only render the social screen if we're rendering to the main viewport
-    if (!gcpRendD3D->m_CurrContext->m_bMainViewport)
-    {
-        return;
-    }
-
-    static ICVar* socialScreen = gEnv->pConsole->GetCVar("hmd_social_screen");
-    AZ::VR::HMDSocialScreen socialScreenType = static_cast<AZ::VR::HMDSocialScreen>(socialScreen->GetIVal());
-
-    switch (socialScreenType)
-    {
-        case AZ::VR::HMDSocialScreen::Off:
-        {
-            // Don't render true black in order to distinguish between a rendering error and no social screen.
-            GetUtils().ClearScreen(0.1f, 0.1f, 0.1f, 1.0f);
-            break;
-        }
-
-        case AZ::VR::HMDSocialScreen::UndistortedLeftEye:
-        case AZ::VR::HMDSocialScreen::UndistortedRightEye:
-        {
-            bool isLeftEye = (socialScreenType == AZ::VR::HMDSocialScreen::UndistortedLeftEye);
-            CTexture* sourceTexture = isLeftEye ? m_stereoRenderer->GetLeftEye() : m_stereoRenderer->GetRightEye();
-            GetUtils().CopyTextureToScreen(sourceTexture);
-            break;
-        }
-
-        default:
-            AZ_Assert(false, "Unknown social screen type specified in HMD renderer");
-            break;
-    }
-#endif
-}
-
-void D3DHMDRenderer::PrepareFrame()
-{
-    // Determine which frame texture we should be using.
-    AZ::u32 leftEyeIndex = 0;
-    AZ::u32 rightEyeIndex = 0;
-    EBUS_EVENT_RESULT(leftEyeIndex, AZ::VR::HMDDeviceRequestBus, GetSwapchainIndex, STEREO_EYE_LEFT);
-    EBUS_EVENT_RESULT(rightEyeIndex, AZ::VR::HMDDeviceRequestBus, GetSwapchainIndex, STEREO_EYE_RIGHT);
-
-    CTexture* leftEye  = m_eyes[STEREO_EYE_LEFT].textureChain[leftEyeIndex];
-    CTexture* rightEye = m_eyes[STEREO_EYE_RIGHT].textureChain[rightEyeIndex];
-
-    m_stereoRenderer->SetEyeTextures(leftEye, rightEye);
-    m_framePrepared = true;
-
-    EBUS_EVENT(AZ::VR::HMDDeviceRequestBus, PrepareFrame);
-}
-
-void D3DHMDRenderer::SubmitFrame()
-{
-    AZ_Assert(m_framePrepared, "D3DHMDRenderer::PrepareFrame() must be called BEFORE SubmitFrame()");
-
-    AZ::VR::HMDDeviceBus::EyeTarget targets[STEREO_EYE_COUNT];
-    for (uint32 eye = 0; eye < STEREO_EYE_COUNT; ++eye)
-   { 
-        targets[eye].renderTarget     = m_eyes[eye].deviceRenderTarget.deviceSwapTextureSet;
-        targets[eye].viewportPosition = m_eyes[eye].viewportPosition;
-        targets[eye].viewportSize     = m_eyes[eye].viewportSize;
-    }
-
-    // Pass the final images to the HMD for final compositing and display.
-    EBUS_EVENT(AZ::VR::HMDDeviceRequestBus, SubmitFrame, targets[STEREO_EYE_LEFT], targets[STEREO_EYE_RIGHT]);
-
-    m_framePrepared = false;
-}
-
-bool D3DHMDRenderer::ResizeRenderTargets(const AZ::VR::HMDDeviceBus::TextureDesc& textureDesc)
-{
-    FreeRenderTargets();
-
-    const char* eyeTextureNames[2] = { "$LeftEye_%d", "$RightEye_%d" };
-
-    // Initialize the eye textures for rendering.
-    ID3D11Device* d3d11Device = &m_renderer->GetDevice();
-
-    AZ::VR::HMDRenderTarget* renderTargets[STEREO_EYE_COUNT];
-    for (int eye = 0; eye < STEREO_EYE_COUNT; ++eye)
-    {
-        renderTargets[eye] = &((&(m_eyes[eye]))->deviceRenderTarget);
-    }
-
-    {
-        bool result = false;
-        EBUS_EVENT_RESULT(result, AZ::VR::HMDDeviceRequestBus, CreateRenderTargets, d3d11Device, textureDesc, STEREO_EYE_COUNT, renderTargets);
-
-        if (!result)
-        {
-            Shutdown();
-            return false;
-        }
-    }
-
-    for (int eye = 0; eye < STEREO_EYE_COUNT; ++eye)
-    {
-        EyeRenderTarget* eyeTarget = &(m_eyes[eye]);
-
-        // The render target was successfully created, now wrap the device target in a DX11 texture for use by the rest
-        // of the engine.
-        uint32 numTextures = eyeTarget->deviceRenderTarget.numTextures;
-        eyeTarget->textureChain.reserve(numTextures);
-        for (uint32 texID = 0; texID < numTextures; ++texID)
-        {
-            char textureName[256];
-            sprintf_s(textureName, eyeTextureNames[eye], texID);
-
-            ETEX_Format format = CTexture::TexFormatFromDeviceFormat(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB);
-            CTexture* eyeTexture = WrapD3DRenderTarget(static_cast<ID3D11Texture2D*>(eyeTarget->deviceRenderTarget.textures[texID]), textureDesc.width, textureDesc.height, format, textureName, true);
-            if (eyeTexture == nullptr)
-            {
-                return false;
-            }
-
-            eyeTarget->textureChain.push_back(eyeTexture);
-            eyeTarget->viewportPosition = Vec2i(0, 0);
-            eyeTarget->viewportSize = Vec2i(textureDesc.width, textureDesc.height);
-        }
-    }
-
-    return true;
-}
-
-void D3DHMDRenderer::FreeRenderTargets()
-{
-    for (uint32 eye = 0; eye < STEREO_EYE_COUNT; ++eye)
-    {
-        for (uint32 texID = 0; texID < m_eyes[eye].textureChain.size(); ++texID)
-        {
-            SAFE_RELEASE_FORCE(m_eyes[eye].textureChain[texID]);
-        }
-
-        // Destroy the device render target as well.
-        if (m_eyes[eye].textureChain.size())
-        {
-            EBUS_EVENT(AZ::VR::HMDDeviceRequestBus, DestroyRenderTarget, m_eyes[eye].deviceRenderTarget);
-        }
-
-        m_eyes[eye].textureChain.clear();
-    }
-}
-
-CTexture* D3DHMDRenderer::WrapD3DRenderTarget(ID3D11Texture2D* d3dTexture, uint32 width, uint32 height, ETEX_Format format, const char* name, bool shaderResourceView)
-{
-    CTexture* texture = CTexture::CreateTextureObject(name, width, height, 1, eTT_2D, FT_DONT_STREAM | FT_USAGE_RENDERTARGET, format);
-    if (texture == nullptr)
-    {
-        CryLogAlways("[HMD] Unable to create texture object!");
-        return nullptr;
-    }
-
-    // CTexture::CreateTextureObject does not set width and height if the texture already existed
-    AZ_Assert(texture->GetWidth() == width, "Texture was already wrapped");
-    AZ_Assert(texture->GetHeight() == height, "Texture was already wrapped");
-    AZ_Assert(texture->GetDepth() == 1, "Texture was already wrapped");
-
-    d3dTexture->AddRef();
-    CDeviceTexture* deviceTexture = new CDeviceTexture(d3dTexture);
-    deviceTexture->SetNoDelete(true);
-
-    texture->SetDevTexture(deviceTexture);
-    texture->ClosestFormatSupported(format);
-
-    if (shaderResourceView)
-    {
-        void* default_srv = texture->CreateDeviceResourceView(SResourceView::ShaderResourceView(format, 0, -1, 0, 1, false, false));
-        if (default_srv == nullptr)
-        {
-            CryLogAlways("[HMD] Unable to create default shader resource view!");
-            texture->Release();
-            return nullptr;
-        }
-        texture->SetShaderResourceView(static_cast<D3DShaderResourceView*>(default_srv), false);
-    }
-
-    return texture;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHMDRenderer.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DHMDRenderer.h
deleted file mode 100644
index b5a0b49818..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHMDRenderer.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-///
-/// Abstract all rendering for any connected HMD. This renderer takes care of managing the rendering-specific portions
-/// of an HMD including: render target creation and destruction, social screen rendering, and frame submission.
-///
-
-#include <HMDBus.h>
-#include <IStereoRenderer.h>
-
-class CD3D9Renderer;
-class CD3DStereoRenderer;
-class CTexture;
-
-class D3DHMDRenderer
-{
-    public:
-
-        D3DHMDRenderer();
-        ~D3DHMDRenderer();
-
-        ///
-        /// Initialize the renderer for use. This includes creating any internal render targets.
-        ///
-        /// @param hmdDevice The HMD device to use when creating render targets and submitting frames. The HMD device should remain valid
-        ///                  the entire time that this renderer is in use.
-        /// @param renderer The platform-specific renderer (e.g. DX11) to use for render target creation/deletion.
-        /// @param stereoRenderer The platform-specific stereo renderer controlling this object. see IStereoRenderer.h for more info.
-        ///
-        /// @returns If true, the renderer successfully initialized and is ready to go.
-        ///
-        bool Initialize(CD3D9Renderer* renderer, CD3DStereoRenderer* stereoRenderer);
-
-        ///
-        /// Shutdown the renderer and free any associated data from it.
-        ///
-        void Shutdown();
-
-        ///
-        /// Calculate the backbuffer resolution necessary to display both eyes simultaneously to a device such as a PC monitor.
-        ///
-        /// @param eyeWidth The width (in pixels) of one eye.
-        /// @param eyeHeight The height (in pixels) of one eye.
-        /// @param backbufferWidth Calculated backbuffer width based on the eye width/height.
-        /// @param backbufferHeight Calculated backbuffer height based on the eye width/height.
-        ///
-        void CalculateBackbufferResolution(int eyeWidth, int eyeHeight, int& backbufferWidth, int& backbufferHeight);
-
-        ///
-        /// Change the underlying buffers to match the new resolution after the renderer has resized.
-        ///
-        void OnResolutionChanged();
-
-        ///
-        /// Render the social screen to a connected display (e.g. a PC monitor).
-        ///
-        void RenderSocialScreen();
-
-        ///
-        /// Prepare the current frame for submission. This must be called before any call to SubmitFrame().
-        ///
-        void PrepareFrame();
-
-        ///
-        /// Submit the most recently rendered frame to the connected HMD device.
-        ///
-        void SubmitFrame();
-
-    private:
-
-        ///
-        /// Resize the internal render targets based on the texture descriptor passed in.
-        ///
-        bool ResizeRenderTargets(const AZ::VR::HMDDeviceBus::TextureDesc& textureDesc);
-
-        ///
-        /// Free the internal render targets (including device targets).
-        ///
-        void FreeRenderTargets();
-
-        ///
-        /// Wrap a device render target into a CTexture object for easy access throughout the renderer.
-        ///
-        CTexture* WrapD3DRenderTarget(ID3D11Texture2D* d3dTexture, uint32 width, uint32 height, ETEX_Format format, const char* name, bool shaderResourceView);
-
-        uint32 m_eyeWidth;      ///< Current width of an eye (in pixels).
-        uint32 m_eyeHeight;     ///< Current height of an eye (in pixels).
-
-        CD3D9Renderer* m_renderer;              ///< Platform-specific rendering device.
-        CD3DStereoRenderer* m_stereoRenderer;   ///< Platform-specific stereo rendering device controlling this object.
-
-        ///
-        /// Per-eye render target info.
-        ///
-        struct EyeRenderTarget
-        {
-            AZ::VR::HMDRenderTarget deviceRenderTarget;     ///< Device-controlled swap chain for rendering to.
-            TArray<CTexture*> textureChain;                 ///< Texture references to the internal swap chain.
-
-            Vec2i viewportPosition;     ///< Position of the per-eye viewport (in pixels).
-            Vec2i viewportSize;         ///< Size of the per-eye viewport (in pixels).
-        };
-
-        EyeRenderTarget m_eyes[STEREO_EYE_COUNT];     ///< Device render targets to be rendered to and submitted to the HMD for display.
-
-        bool m_framePrepared;       ///< If true, PrepareFrame() and SubmitFrame() were called in the proper ordering (just for debugging purproses).
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShader.cpp
deleted file mode 100644
index 112510ff6a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShader.cpp
+++ /dev/null
@@ -1,5307 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "CryCrc32.h"
-#include "../Common/Shaders/RemoteCompiler.h"
-#include "../Common/PostProcess/PostEffects.h"
-#include "D3DPostProcess.h"
-#include "../Common/Textures/TextureHelpers.h"
-#include "../Common/Textures/TextureManager.h"
-#include "../Common/Include_HLSL_CPP_Shared.h"
-#include "../Common/TypedConstantBuffer.h"
-#include "GraphicsPipeline/FurBendData.h"
-#include "GraphicsPipeline/FurPasses.h"
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DHWSHADER_CPP_SECTION_1 1
-#define D3DHWSHADER_CPP_SECTION_2 2
-#endif
-
-#if defined(FEATURE_SVO_GI)
-#include "D3D_SVO.h"
-#endif
-#include "../Cry3DEngine/Environment/OceanEnvironmentBus.h"
-
-CHWShader_D3D::SHWSInstance *CHWShader_D3D::s_pCurInstGS; bool CHWShader_D3D::s_bFirstGS = true;
-CHWShader_D3D::SHWSInstance *CHWShader_D3D::s_pCurInstHS; bool CHWShader_D3D::s_bFirstHS = true;
-CHWShader_D3D::SHWSInstance *CHWShader_D3D::s_pCurInstDS; bool CHWShader_D3D::s_bFirstDS = true;
-CHWShader_D3D::SHWSInstance *CHWShader_D3D::s_pCurInstCS; bool CHWShader_D3D::s_bFirstCS = true;
-CHWShader_D3D::SHWSInstance *CHWShader_D3D::s_pCurInstVS; bool CHWShader_D3D::s_bFirstVS = true;
-CHWShader_D3D::SHWSInstance *CHWShader_D3D::s_pCurInstPS; bool CHWShader_D3D::s_bFirstPS = true;
-
-#if !defined(_RELEASE)
-AZStd::unordered_set<uint32_t, AZStd::hash<uint32_t>, AZStd::equal_to<uint32_t>, AZ::StdLegacyAllocator> CHWShader_D3D::s_ErrorsLogged;
-#endif
-
-int CHWShader_D3D::s_nActivationFailMask = 0;
-
-AZStd::vector<SShaderTechniqueStat, AZ::StdLegacyAllocator> g_SelectedTechs;
-
-bool CHWShader_D3D::s_bInitShaders = true;
-
-int CHWShader_D3D::s_nResetDeviceFrame = -1;
-int CHWShader_D3D::s_nInstFrame = -1;
-
-SD3DShader* CHWShader::s_pCurPS;
-SD3DShader* CHWShader::s_pCurVS;
-SD3DShader* CHWShader::s_pCurGS;
-SD3DShader* CHWShader::s_pCurDS;
-SD3DShader* CHWShader::s_pCurHS;
-SD3DShader* CHWShader::s_pCurCS;
-
-FXShaderCache CHWShader::m_ShaderCache;
-FXShaderCacheNames CHWShader::m_ShaderCacheList;
-
-// REFACTOR NOTE:
-//  Everything in the block should be pulled into its own file once stablized back to mainline.
-#pragma region ShaderConstants
-
-CHWShader_D3D::SCGTextures CHWShader_D3D::s_PF_Textures;     // Per-frame textures
-CHWShader_D3D::SCGSamplers CHWShader_D3D::s_PF_Samplers;     // Per-frame samplers
-
-namespace
-{
-    alloc_info_struct* GetFreeChunk(int bytes_count, int nBufSize, PodArray<alloc_info_struct>& alloc_info, const char* szSource)
-    {
-        int best_i = -1;
-        int min_size = 10000000;
-
-        // find best chunk
-        for (int i = 0; i < alloc_info.Count(); i++)
-        {
-            if (!alloc_info[i].busy)
-            {
-                if (alloc_info[i].bytes_num >= bytes_count)
-                {
-                    if (alloc_info[i].bytes_num < min_size)
-                    {
-                        best_i = i;
-                        min_size = alloc_info[i].bytes_num;
-                    }
-                }
-            }
-        }
-
-        if (best_i >= 0)
-        { // use best free chunk
-            alloc_info[best_i].busy = true;
-            alloc_info[best_i].szSource = szSource;
-
-            int bytes_free = alloc_info[best_i].bytes_num - bytes_count;
-            if (bytes_free > 0)
-            {
-                // modify reused shunk
-                alloc_info[best_i].bytes_num = bytes_count;
-
-                // insert another free shunk
-                alloc_info_struct new_chunk;
-                new_chunk.bytes_num = bytes_free;
-                new_chunk.ptr = alloc_info[best_i].ptr + alloc_info[best_i].bytes_num;
-                new_chunk.busy = false;
-
-                if (best_i < alloc_info.Count() - 1) // if not last
-                {
-                    alloc_info.InsertBefore(new_chunk, best_i + 1);
-                }
-                else
-                {
-                    alloc_info.Add(new_chunk);
-                }
-            }
-
-            return &alloc_info[best_i];
-        }
-
-        int res_ptr = 0;
-
-        int piplevel = alloc_info.Count() ? (alloc_info.Last().ptr - alloc_info[0].ptr) + alloc_info.Last().bytes_num : 0;
-        if (piplevel + bytes_count >= nBufSize)
-        {
-            return NULL;
-        }
-        else
-        {
-            res_ptr = piplevel;
-        }
-
-        // register new chunk
-        alloc_info_struct ai;
-        ai.ptr = res_ptr;
-        ai.szSource = szSource;
-        ai.bytes_num = bytes_count;
-        ai.busy = true;
-        alloc_info.Add(ai);
-
-        return &alloc_info[alloc_info.Count() - 1];
-    }
-
-    bool ReleaseChunk(int p, PodArray<alloc_info_struct>& alloc_info)
-    {
-        for (int i = 0; i < alloc_info.Count(); i++)
-        {
-            if (alloc_info[i].ptr == p)
-            {
-                alloc_info[i].busy = false;
-
-                // delete info about last unused chunks
-                while (alloc_info.Count() && alloc_info.Last().busy == false)
-                {
-                    alloc_info.Delete(alloc_info.Count() - 1);
-                }
-
-                // merge unused chunks
-                for (int s = 0; s < alloc_info.Count() - 1; s++)
-                {
-                    assert(alloc_info[s].ptr < alloc_info[s + 1].ptr);
-
-                    if (alloc_info[s].busy == false)
-                    {
-                        if (alloc_info[s + 1].busy == false)
-                        {
-                            alloc_info[s].bytes_num += alloc_info[s + 1].bytes_num;
-                            alloc_info.Delete(s + 1);
-                            s--;
-                        }
-                    }
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
-
-DynArray<SCGParamPool> CGParamManager::s_Pools;
-AZStd::vector<SCGParamsGroup, AZ::StdLegacyAllocator> CGParamManager::s_Groups;
-AZStd::vector<uint32, AZ::StdLegacyAllocator> CGParamManager::s_FreeGroups;
-
-SCGParamPool::SCGParamPool(int nEntries)
-    : m_Params(new SCGParam[nEntries], nEntries)
-{
-}
-
-SCGParamPool::~SCGParamPool()
-{
-    delete[] m_Params.begin();
-}
-
-SCGParamsGroup SCGParamPool::Alloc(int nEntries)
-{
-    SCGParamsGroup Group;
-
-    alloc_info_struct* pAI = GetFreeChunk(nEntries, m_Params.size(), m_alloc_info, "CGParam");
-    if (pAI)
-    {
-        Group.nParams = nEntries;
-        Group.pParams = &m_Params[pAI->ptr];
-    }
-
-    return Group;
-}
-
-bool SCGParamPool::Free(SCGParamsGroup& Group)
-{
-    bool bRes = ReleaseChunk((int)(Group.pParams - m_Params.begin()), m_alloc_info);
-    return bRes;
-}
-
-int CGParamManager::GetParametersGroup(SParamsGroup& InGr, int nId)
-{
-    std::vector<SCGParam>& InParams = nId > 1 ? InGr.Params_Inst : InGr.Params[nId];
-    int32 i;
-    int nParams = InParams.size();
-
-    int nGroupSize = s_Groups.size();
-    for (i = 0; i < nGroupSize; i++)
-    {
-        SCGParamsGroup& Gr = s_Groups[i];
-        if (Gr.nParams != nParams)
-        {
-            continue;
-        }
-        int j;
-        for (j = 0; j < nParams; j++)
-        {
-            if (InParams[j] != Gr.pParams[j])
-            {
-                break;
-            }
-        }
-        if (j == nParams)
-        {
-            Gr.nRefCounter++;
-            return i;
-        }
-    }
-
-    SCGParamsGroup Group;
-    SCGParamPool* pPool = NULL;
-    for (i = 0; i < s_Pools.size(); i++)
-    {
-        pPool = &s_Pools[i];
-        Group = pPool->Alloc(nParams);
-        if (Group.nParams)
-        {
-            break;
-        }
-    }
-    if (!Group.pParams)
-    {
-        pPool = NewPool(PARAMS_POOL_SIZE);
-        Group = pPool->Alloc(nParams);
-    }
-    assert(Group.pParams);
-    if (!Group.pParams)
-    {
-        return 0;
-    }
-    Group.nPool = i;
-    uint32 n = s_Groups.size();
-    if (s_FreeGroups.size())
-    {
-        n = s_FreeGroups.back();
-        s_FreeGroups.pop_back();
-        s_Groups[n] = Group;
-    }
-    else
-    {
-        s_Groups.push_back(Group);
-    }
-
-    for (i = 0; i < nParams; i++)
-    {
-        s_Groups[n].pParams[i] = InParams[i];
-    }
-
-    return n;
-}
-
-bool CGParamManager::FreeParametersGroup(int nIDGroup)
-{
-    if (nIDGroup < 0 || nIDGroup >= (int)s_Groups.size())
-    {
-        return false;
-    }
-    SCGParamsGroup& Group = s_Groups[nIDGroup];
-    Group.nRefCounter--;
-    if (Group.nRefCounter)
-    {
-        return true;
-    }
-    if (Group.nPool < 0 || Group.nPool >= s_Pools.size())
-    {
-        return false;
-    }
-    SCGParamPool& Pool = s_Pools[Group.nPool];
-    if (!Pool.Free(Group))
-    {
-        return false;
-    }
-    for (int i = 0; i < Group.nParams; i++)
-    {
-        Group.pParams[i].m_Name.reset();
-        SAFE_DELETE(Group.pParams[i].m_pData);
-    }
-
-    Group.nParams = 0;
-    Group.nPool = 0;
-    Group.pParams = 0;
-
-    s_FreeGroups.push_back(nIDGroup);
-
-    return true;
-}
-
-void CGParamManager::Init()
-{
-    s_FreeGroups.reserve(128); // Based on spear
-    s_Groups.reserve(2048);
-}
-void CGParamManager::Shutdown()
-{
-    s_FreeGroups.clear();
-    s_Pools.clear();
-    s_Groups.clear();
-}
-
-SCGParamPool* CGParamManager::NewPool(int nEntries)
-{
-    return new(s_Pools.grow_raw())SCGParamPool(nEntries);
-}
-
-
-DEFINE_ALIGNED_DATA(UFloat4, s_ConstantScratchBuffer[48], 16);
-
-namespace
-{
-    static inline void TransposeAndStore(UFloat4* sData, const Matrix44A& mMatrix)
-    {
-#    if defined(_CPU_SSE)
-        __m128 row0 = _mm_load_ps(&mMatrix.m00);
-        __m128 row1 = _mm_load_ps(&mMatrix.m10);
-        __m128 row2 = _mm_load_ps(&mMatrix.m20);
-        __m128 row3 = _mm_load_ps(&mMatrix.m30);
-        _MM_TRANSPOSE4_PS(row0, row1, row2, row3);
-        _mm_store_ps(&sData[0].f[0], row0);
-        _mm_store_ps(&sData[1].f[0], row1);
-        _mm_store_ps(&sData[2].f[0], row2);
-        _mm_store_ps(&sData[3].f[0], row3);
-#   else
-        *alias_cast<Matrix44A*>(&sData[0]) = mMatrix.GetTransposed();
-#   endif
-    }
-
-    static inline void Store(UFloat4* sData, const Matrix44A& mMatrix)
-    {
-#    if defined(_CPU_SSE)
-        __m128 row0 = _mm_load_ps(&mMatrix.m00);
-        _mm_store_ps(&sData[0].f[0], row0);
-        __m128 row1 = _mm_load_ps(&mMatrix.m10);
-        _mm_store_ps(&sData[1].f[0], row1);
-        __m128 row2 = _mm_load_ps(&mMatrix.m20);
-        _mm_store_ps(&sData[2].f[0], row2);
-        __m128 row3 = _mm_load_ps(&mMatrix.m30);
-        _mm_store_ps(&sData[3].f[0], row3);
-#   else
-        *alias_cast<Matrix44A*>(&sData[0]) = mMatrix;
-#   endif
-    }
-
-    static inline void Store(UFloat4* sData, const Matrix34A& mMatrix)
-    {
-#    if defined(_CPU_SSE)
-        __m128 row0 = _mm_load_ps(&mMatrix.m00);
-        _mm_store_ps(&sData[0].f[0], row0);
-        __m128 row1 = _mm_load_ps(&mMatrix.m10);
-        _mm_store_ps(&sData[1].f[0], row1);
-        __m128 row2 = _mm_load_ps(&mMatrix.m20);
-        _mm_store_ps(&sData[2].f[0], row2);
-        _mm_store_ps(&sData[3].f[0], _mm_setr_ps(0, 0, 0, 1));
-#   else
-        *alias_cast<Matrix44A*>(&sData[0]) = mMatrix;
-#   endif
-    }
-
-#if defined(_CPU_SSE)
-    // Matrix multiplication using SSE instructions set
-    // IMPORTANT NOTE: much faster if matrices m1 and product are 16 bytes aligned
-    inline void multMatrixf_Transp2_SSE(float* product, const float* m1, const float* m2)
-    {
-        __m128 x0 = _mm_load_ss(m2);
-        __m128 x1 = _mm_load_ps(m1);
-        x0 = _mm_shuffle_ps(x0, x0, 0);
-        __m128 x2 = _mm_load_ss(&m2[4]);
-        x0 = _mm_mul_ps(x0, x1);
-        x2 = _mm_shuffle_ps(x2, x2, 0);
-        __m128 x3 = _mm_load_ps(&m1[4]);
-        __m128 x4 = _mm_load_ss(&m2[8]);
-        x2 = _mm_mul_ps(x2, x3);
-        x4 = _mm_shuffle_ps(x4, x4, 0);
-        x0 = _mm_add_ps(x0, x2);
-        x2 = _mm_load_ps(&m1[8]);
-        x4 = _mm_mul_ps(x4, x2);
-        __m128 x6 = _mm_load_ps(&m1[12]);
-        x0 = _mm_add_ps(x0, x4);
-        _mm_store_ps(product, x0);
-        x0 = _mm_load_ss(&m2[1]);
-        x4 = _mm_load_ss(&m2[5]);
-        x0 = _mm_shuffle_ps(x0, x0, 0);
-        x4 = _mm_shuffle_ps(x4, x4, 0);
-        x0 = _mm_mul_ps(x0, x1);
-        x4 = _mm_mul_ps(x4, x3);
-        __m128 x5 = _mm_load_ss(&m2[9]);
-        x0 = _mm_add_ps(x0, x4);
-        x5 = _mm_shuffle_ps(x5, x5, 0);
-        x5 = _mm_mul_ps(x5, x2);
-        x0 = _mm_add_ps(x0, x5);
-        _mm_store_ps(&product[4], x0);
-        x0 = _mm_load_ss(&m2[2]);
-        x4 = _mm_load_ss(&m2[6]);
-        x0 = _mm_shuffle_ps(x0, x0, 0);
-        x4 = _mm_shuffle_ps(x4, x4, 0);
-        x0 = _mm_mul_ps(x0, x1);
-        x4 = _mm_mul_ps(x4, x3);
-        x5 = _mm_load_ss(&m2[10]);
-        x0 = _mm_add_ps(x0, x4);
-        x5 = _mm_shuffle_ps(x5, x5, 0);
-        x5 = _mm_mul_ps(x5, x2);
-        x0 = _mm_add_ps(x0, x5);
-        _mm_store_ps(&product[8], x0);
-        x0 = _mm_load_ss(&m2[3]);
-        x4 = _mm_load_ss(&m2[7]);
-        x0 = _mm_shuffle_ps(x0, x0, 0);
-        x4 = _mm_shuffle_ps(x4, x4, 0);
-        x0 = _mm_mul_ps(x0, x1);
-        x4 = _mm_mul_ps(x4, x3);
-        x1 = _mm_load_ss(&m2[11]);
-        x0 = _mm_add_ps(x0, x4);
-        x1 = _mm_shuffle_ps(x1, x1, 0);
-        x1 = _mm_mul_ps(x1, x2);
-        x1 = _mm_add_ps(x1, x6);
-        x0 = _mm_add_ps(x0, x1);
-        _mm_store_ps(&product[12], x0);
-    }
-#endif
-
-    inline void multMatrixf_Transp2(float* product, const float* m1, const float* m2)
-    {
-        float temp[16];
-
-#define A(row, col)  m1[(col << 2) + row]
-#define B(row, col)  m2[(col << 2) + row]
-#define P(row, col)  temp[(col << 2) + row]
-
-        int i;
-        for (i = 0; i < 4; i++)
-        {
-            float ai0 = A(i, 0), ai1 = A(i, 1), ai2 = A(i, 2), ai3 = A(i, 3);
-            P(i, 0) = ai0 * B(0, 0) + ai1 * B(0, 1) + ai2 * B(0, 2);
-            P(i, 1) = ai0 * B(1, 0) + ai1 * B(1, 1) + ai2 * B(1, 2);
-            P(i, 2) = ai0 * B(2, 0) + ai1 * B(2, 1) + ai2 * B(2, 2);
-            P(i, 3) = ai0 * B(3, 0) + ai1 * B(3, 1) + ai2 * B(3, 2) + ai3;
-        }
-
-        cryMemcpy(product, temp, sizeof(temp));
-
-#undef A
-#undef B
-#undef P
-    }
-
-
-    inline void mathMatrixMultiply_Transp2(float* pOut, const float* pM1, const float* pM2, [[maybe_unused]] int OptFlags)
-    {
-#if defined(_CPU_SSE)
-        multMatrixf_Transp2_SSE(pOut, pM1, pM2);
-#else
-        multMatrixf_Transp2(pOut, pM1, pM2);
-#endif
-    }
-
-    NO_INLINE void sIdentityLine(UFloat4* sData)
-    {
-        sData[0].f[0] = sData[0].f[1] = sData[0].f[2] = 0.f;
-        sData[0].f[3] = 1.0f;
-    }
-    NO_INLINE void sOneLine(UFloat4* sData)
-    {
-        sData[0].f[0] = sData[0].f[1] = sData[0].f[2] = 1.f;
-        sData[0].f[3] = 1.0f;
-    }
-    NO_INLINE void sZeroLine(UFloat4* sData)
-    {
-        sData[0].f[0] = sData[0].f[1] = sData[0].f[2] = 0.f;
-        sData[0].f[3] = 0.0f;
-    }
-
-    NO_INLINE IRenderElement* sGetContainerRE0(IRenderElement* pRE)
-    {
-        assert(pRE);    // someone assigned wrong shader - function should not be called then
-
-        if (pRE->mfGetType() == eDATA_Mesh && ((CREMeshImpl*)pRE)->m_pRenderMesh->_GetVertexContainer())
-        {
-            assert(((CREMeshImpl*)pRE)->m_pRenderMesh->_GetVertexContainer()->m_Chunks.size() >= 1);
-            return ((CREMeshImpl*)pRE)->m_pRenderMesh->_GetVertexContainer()->m_Chunks[0].pRE;
-        }
-
-        return pRE;
-    }
-
-    NO_INLINE void sGetTerrainBase(UFloat4* sData, CD3D9Renderer* r)
-    {
-        if (!r->m_RP.m_pRE)
-        {
-            sZeroLine(sData);
-            return;
-        }
-        // use render element from vertex container render mesh if available
-        IRenderElement* pRE = sGetContainerRE0(r->m_RP.m_pRE);
-
-        if (pRE && pRE->GetCustomData())
-        {
-            float* pData;
-
-            if (SRendItem::m_RecurseLevel[r->m_RP.m_nProcessThreadID] <= 0)
-            {
-                pData = (float*)pRE->GetCustomData();
-            }
-            else
-            {
-                pData = (float*)pRE->GetCustomData() + 4;
-            }
-
-            sData[0].f[0] = pData[2];
-            sData[0].f[1] = pData[0];
-            sData[0].f[2] = pData[1];
-        }
-        else
-        {
-            sZeroLine(sData);
-        }
-    }
-
-    NO_INLINE void sGetTerrainLayerGen(UFloat4* sData, CD3D9Renderer* r)
-    {
-        IRenderElement* pRE = r->m_RP.m_pRE;
-        if (pRE && pRE->GetCustomData())
-        {
-            float* pData = (float*)pRE->GetCustomData();
-            memcpy(sData, pData, sizeof(float) * 16);
-        }
-        else
-        {
-            memset(sData, 0, sizeof(float) * 16);
-        }
-    }
-
-    void sGetTexMatrix(UFloat4* sData, CD3D9Renderer* r, const SCGParam* ParamBind)
-    {
-        Matrix44& result = *((Matrix44*)sData);
-
-        SHRenderTarget* renderTarget = (SHRenderTarget*)(UINT_PTR)ParamBind->m_nID;
-        if (!renderTarget)
-        {
-            result.SetIdentity();
-            return;
-        }
-
-        SEnvTexture* pEnvTex = renderTarget->GetEnv2D();
-        if (!pEnvTex || !pEnvTex->m_pTex)
-        {
-            result.SetIdentity();
-            return;
-        }
-
-        if ((renderTarget->m_eUpdateType != eRTUpdate_WaterReflect))
-        {
-            result = r->m_RP.m_pCurObject->m_II.m_Matrix * pEnvTex->m_Matrix;
-        }
-        else
-        {
-            result = pEnvTex->m_Matrix;
-        }
-        result.Transpose();
-    }
-
-
-
-    NO_INLINE void sGetScreenSize(UFloat4* sData, CD3D9Renderer* r)
-    {
-        int iTempX, iTempY, iWidth, iHeight;
-        r->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-#if defined(WIN32) || defined(WIN64)
-        float w = (float)(iWidth > 1 ? iWidth : 1);
-        float h = (float)(iHeight > 1 ? iHeight : 1);
-#else
-        float w = (float)iWidth;
-        float h = (float)iHeight;
-#endif
-        sData[0].f[0] = w;
-        sData[0].f[1] = h;
-        sData[0].f[2] = 0.5f / (w / r->m_RP.m_CurDownscaleFactor.x);
-        sData[0].f[3] = 0.5f / (h / r->m_RP.m_CurDownscaleFactor.y);
-    }
-
-    NO_INLINE void sGetIrregKernel(UFloat4* sData, CD3D9Renderer* r)
-    {
-        int nSamplesNum = 1;
-        switch (r->m_RP.m_nShaderQuality)
-        {
-        case eSQ_Low:
-            nSamplesNum = 4;
-            break;
-        case eSQ_Medium:
-            nSamplesNum = 8;
-            break;
-        case eSQ_High:
-            nSamplesNum = 16;
-            break;
-        case eSQ_VeryHigh:
-            nSamplesNum = 16;
-            break;
-        default:
-            assert(0);
-        }
-
-        CShadowUtils::GetIrregKernel((float(*)[4]) & sData[0], nSamplesNum);
-    }
-
-    enum class FrameType
-    {
-        Current,
-        Previous
-    };
-
-    NO_INLINE void sGetBendInfo(CRenderObject* const __restrict renderObject, FrameType frameType, UFloat4* sData, [[maybe_unused]] CD3D9Renderer* r)
-    {
-        Vec4 bendingInfoResult(0.0f);
-        SRenderObjData* objectData = renderObject->GetObjData();
-        SBending* bending = nullptr;
-        float time = 0.0f;
-
-        if (objectData)
-        {
-            if (frameType == FrameType::Current)
-            {
-                bending = objectData->m_pBending;
-                time = CRenderer::GetRealTime();
-            }
-            else
-            {
-                bending = objectData->m_BendingPrev;
-                time = CRenderer::GetRealTime() - CRenderer::GetElapsedTime();
-            }
-        }
-
-        // Set values to zero if no bending found - eg. trees created as geom entity and not vegetation,
-        // these are still rendered with bending/detailbending enabled in shader
-        // (very ineffective but they should not appear in real levels)
-        if (bending)
-        {
-            bendingInfoResult = bending->GetShaderConstants(time);
-        }
-
-        *(alias_cast<Vec4*>(&sData[0])) = bendingInfoResult;
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogParams(CD3D9Renderer* r)
-    {
-        Vec4 pFogParams;
-
-        I3DEngine* pEng = gEnv->p3DEngine;
-        assert(pEng);
-
-        Vec3 globalDensityParams(0, 1, 1);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG_GLOBAL_DENSITY, globalDensityParams);
-
-        float globalDensity = globalDensityParams.x;
-        if (!gRenDev->IsHDRModeEnabled())
-        {
-            globalDensity *= globalDensityParams.y;
-        }
-
-        Vec3 volFogHeightDensity(0, 1, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG_HEIGHT_DENSITY, volFogHeightDensity);
-        volFogHeightDensity.y = clamp_tpl(volFogHeightDensity.y, 1e-5f, 1.0f);
-
-        Vec3 volFogHeightDensity2(4000.0f, 0, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG_HEIGHT_DENSITY2, volFogHeightDensity2);
-        volFogHeightDensity2.y = clamp_tpl(volFogHeightDensity2.y, 1e-5f, 1.0f);
-        volFogHeightDensity2.x = volFogHeightDensity2.x < volFogHeightDensity.x + 1.0f ? volFogHeightDensity.x + 1.0f : volFogHeightDensity2.x;
-
-        const float ha = volFogHeightDensity.x;
-        const float hb = volFogHeightDensity2.x;
-
-        const float da = volFogHeightDensity.y;
-        const float db = volFogHeightDensity2.y;
-
-        const float ga = logf(da);
-        const float gb = logf(db);
-
-        const float c = (gb - ga) / (hb - ha);
-        const float o = ga - c * ha;
-
-        const float viewerHeight = r->GetViewParameters().vOrigin.z;
-        const float co = clamp_tpl(c * viewerHeight + o, -50.0f, 50.0f); // Avoiding FPEs at extreme ranges
-
-        globalDensity *= 0.01f; // multiply by 1/100 to scale value editor value back to a reasonable range
-
-        pFogParams.x = c;
-        pFogParams.y = 1.44269502f * globalDensity * expf(co); // log2(e) = 1.44269502
-        pFogParams.z = globalDensity;
-        pFogParams.w = 1.0f - clamp_tpl(globalDensityParams.z, 0.0f, 1.0f);
-
-        return pFogParams;
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogRampParams()
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 vfRampParams(0, 100.0f, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG_RAMP, vfRampParams);
-
-        vfRampParams.x = vfRampParams.x < 0 ? 0 : vfRampParams.x; // start
-        vfRampParams.y = vfRampParams.y < vfRampParams.x + 0.1f ? vfRampParams.x + 0.1f : vfRampParams.y; // end
-        vfRampParams.z = clamp_tpl(vfRampParams.z, 0.0f, 1.0f); // influence
-
-        float invRampDist = 1.0f / (vfRampParams.y - vfRampParams.x);
-        return Vec4(invRampDist, -vfRampParams.x * invRampDist, vfRampParams.z, -vfRampParams.z + 1.0f);
-    }
-
-    NO_INLINE void sGetFogColorGradientConstants(Vec4& fogColGradColBase, Vec4& fogColGradColDelta)
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 colBase = pEng->GetFogColor();
-        fogColGradColBase = Vec4(colBase, 0);
-
-        Vec3 colTop(colBase);
-        pEng->GetGlobalParameter(E3DPARAM_FOG_COLOR2, colTop);
-        fogColGradColDelta = Vec4(colTop - colBase, 0);
-    }
-
-    NO_INLINE Vec4 sGetFogColorGradientParams()
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 volFogHeightDensity(0, 1, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG_HEIGHT_DENSITY, volFogHeightDensity);
-
-        Vec3 volFogHeightDensity2(4000.0f, 0, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG_HEIGHT_DENSITY2, volFogHeightDensity2);
-        volFogHeightDensity2.x = volFogHeightDensity2.x < volFogHeightDensity.x + 1.0f ? volFogHeightDensity.x + 1.0f : volFogHeightDensity2.x;
-
-        Vec3 gradientCtrlParams(0, 0.75f, 0.5f);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG_GRADIENT_CTRL, gradientCtrlParams);
-
-        const float colorHeightOffset = clamp_tpl(gradientCtrlParams.x, -1.0f, 1.0f);
-        const float radialSize = -expf((1.0f - clamp_tpl(gradientCtrlParams.y, 0.0f, 1.0f)) * 14.0f) * 1.44269502f; // log2(e) = 1.44269502;
-        const float radialLobe = 1.0f / clamp_tpl(gradientCtrlParams.z, 1.0f / 21.0f, 1.0f) - 1.0f;
-
-        const float invDist = 1.0f / (volFogHeightDensity2.x - volFogHeightDensity.x);
-        return Vec4(invDist, -volFogHeightDensity.x * invDist - colorHeightOffset, radialSize, radialLobe);
-    }
-
-    NO_INLINE Vec4 sGetFogColorGradientRadial(CD3D9Renderer* r)
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 fogColorRadial(0, 0, 0);
-        pEng->GetGlobalParameter(E3DPARAM_FOG_RADIAL_COLOR, fogColorRadial);
-
-        const CameraViewParameters& rc = r->GetViewParameters();
-        const float invFarDist = 1.0f / rc.fFar;
-
-        return Vec4(fogColorRadial, invFarDist);
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogSamplingParams(CD3D9Renderer* r)
-    {
-        const CameraViewParameters& rc = r->GetViewParameters();
-
-        Vec3 volFogCtrlParams(0.0f, 0.0f, 0.0f);
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volFogCtrlParams);
-        const float raymarchStart = rc.fNear;
-        const float raymarchDistance = (volFogCtrlParams.x > raymarchStart) ? (volFogCtrlParams.x - raymarchStart) : 0.0001f;
-
-        Vec4 params;
-        params.x = raymarchStart;
-        params.y = 1.0f / raymarchDistance;
-        params.z = static_cast<f32>(CTexture::s_ptexVolumetricFog ? CTexture::s_ptexVolumetricFog->GetDepth() : 0.0f);
-        params.w = params.z > 0.0f ? (1.0f / params.z) : 0.0f;
-        return params;
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogDistributionParams(CD3D9Renderer* r)
-    {
-        const CameraViewParameters& rc = r->GetViewParameters();
-
-        Vec3 volFogCtrlParams(0.0f, 0.0f, 0.0f);
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volFogCtrlParams);
-        const float raymarchStart = rc.fNear;
-        const float raymarchDistance = (volFogCtrlParams.x > raymarchStart) ? (volFogCtrlParams.x - raymarchStart) : 0.0001f;
-
-        Vec4 params;
-        params.x = raymarchStart;
-        params.y = raymarchDistance;
-        float d = static_cast<f32>(CTexture::s_ptexVolumetricFog ? CTexture::s_ptexVolumetricFog->GetDepth() : 0.0f);
-        params.z = d > 1.0f ? (1.0f / (d - 1.0f)) : 0.0f;
-        params.w = 0.0f;
-        return params;
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogScatteringParams([[maybe_unused]] CD3D9Renderer* r)
-    {
-        Vec3 volFogScatterParams(0.0f, 0.0f, 0.0f);
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_SCATTERING_PARAMS, volFogScatterParams);
-
-        Vec3 anisotropy(0.0f, 0.0f, 0.0f);
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_HEIGHT_DENSITY, anisotropy);
-
-        float k = anisotropy.z;
-        bool bNegative = k < 0.0f ? true : false;
-        k = (abs(k) > 0.99999f) ? (bNegative ? -0.99999f : 0.99999f) : k;
-
-        Vec4 params;
-        params.x = volFogScatterParams.x;
-        params.y = (volFogScatterParams.y < 0.0001f) ? 0.0001f : volFogScatterParams.y;// it ensures extinction is more than zero.
-        params.z = k;
-        params.w = 1.0f - k * k;
-        return params;
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogScatteringBlendParams([[maybe_unused]] CD3D9Renderer* r)
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 volFogCtrlParams(0.0f, 0.0f, 0.0f);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volFogCtrlParams);
-
-        Vec4 params;
-        params.x = volFogCtrlParams.y;// blend factor of two radial lobes
-        params.y = volFogCtrlParams.z;// blend mode of two radial lobes
-        params.z = 0.0f;
-        params.w = 0.0f;
-        return params;
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogScatteringColor([[maybe_unused]] CD3D9Renderer* r)
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 fogAlbedo(0.0f, 0.0f, 0.0f);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_COLOR1, fogAlbedo);
-        Vec3 sunColor = pEng->GetSunColor();
-        sunColor = sunColor.CompMul(fogAlbedo);
-
-        Vec3 anisotropy(0.0f, 0.0f, 0.0f);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_HEIGHT_DENSITY2, anisotropy);
-
-        float k = anisotropy.z;
-        bool bNegative = k < 0.0f ? true : false;
-        k = (abs(k) > 0.99999f) ? (bNegative ? -0.99999f : 0.99999f) : k;
-
-        return Vec4(sunColor, k);
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogScatteringSecondaryColor([[maybe_unused]] CD3D9Renderer* r)
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 fogAlbedo(0.0f, 0.0f, 0.0f);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_COLOR2, fogAlbedo);
-        Vec3 sunColor = pEng->GetSunColor();
-        sunColor = sunColor.CompMul(fogAlbedo);
-
-        Vec3 anisotropy(0.0f, 0.0f, 0.0f);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_HEIGHT_DENSITY2, anisotropy);
-
-        float k = anisotropy.z;
-        bool bNegative = k < 0.0f ? true : false;
-        k = (abs(k) > 0.99999f) ? (bNegative ? -0.99999f : 0.99999f) : k;
-
-        return Vec4(sunColor, 1.0f - k * k);
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogHeightDensityParams(CD3D9Renderer* r)
-    {
-        Vec4 pFogParams;
-
-        I3DEngine* pEng = gEnv->p3DEngine;
-        assert(pEng);
-
-        Vec3 globalDensityParams(0, 1, 1);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_GLOBAL_DENSITY, globalDensityParams);
-
-        float globalDensity = globalDensityParams.x;
-        const float clampTransmittance = globalDensityParams.y > 0.9999999f ? 1.0f : globalDensityParams.y;
-        const float visibility = globalDensityParams.z;
-
-        Vec3 volFogHeightDensity(0, 1, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_HEIGHT_DENSITY, volFogHeightDensity);
-        volFogHeightDensity.y = clamp_tpl(volFogHeightDensity.y, 1e-5f, 1.0f);
-
-        Vec3 volFogHeightDensity2(4000.0f, 0, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_HEIGHT_DENSITY2, volFogHeightDensity2);
-        volFogHeightDensity2.y = clamp_tpl(volFogHeightDensity2.y, 1e-5f, 1.0f);
-        volFogHeightDensity2.x = volFogHeightDensity2.x < volFogHeightDensity.x + 1.0f ? volFogHeightDensity.x + 1.0f : volFogHeightDensity2.x;
-
-        const float ha = volFogHeightDensity.x;
-        const float hb = volFogHeightDensity2.x;
-
-        const float db = volFogHeightDensity2.y;
-        const float da = abs(db - volFogHeightDensity.y) < 0.00001f ? volFogHeightDensity.y + 0.00001f : volFogHeightDensity.y;
-
-        const float ga = logf(da);
-        const float gb = logf(db);
-
-        const float c = (gb - ga) / (hb - ha);
-        const float o = ga - c * ha;
-
-        const float viewerHeight = r->GetViewParameters().vOrigin.z;
-        const float co = clamp_tpl(c * viewerHeight + o, -50.0f, 50.0f); // Avoiding FPEs at extreme ranges
-
-        globalDensity *= 0.01f; // multiply by 1/100 to scale value editor value back to a reasonable range
-
-        pFogParams.x = c;
-        pFogParams.y = 1.44269502f * globalDensity * expf(co); // log2(e) = 1.44269502
-        pFogParams.z = visibility;
-        pFogParams.w = 1.0f - clamp_tpl(clampTransmittance, 0.0f, 1.0f);
-
-        return pFogParams;
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogHeightDensityRampParams([[maybe_unused]] CD3D9Renderer* r)
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-
-        Vec3 vfRampParams(0, 100.0f, 0);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_RAMP, vfRampParams);
-
-        vfRampParams.x = vfRampParams.x < 0 ? 0 : vfRampParams.x; // start
-        vfRampParams.y = vfRampParams.y < vfRampParams.x + 0.1f ? vfRampParams.x + 0.1f : vfRampParams.y; // end
-
-        float t0 = 1.0f / (vfRampParams.y - vfRampParams.x);
-        float t1 = vfRampParams.x * t0;
-
-        return Vec4(vfRampParams.x, vfRampParams.y, t0, t1);
-    }
-
-    NO_INLINE Vec4 sGetVolumetricFogDistanceParams(CD3D9Renderer* rndr)
-    {
-        const CameraViewParameters& rc = rndr->GetViewParameters();
-        float l, r, b, t, Ndist, Fdist;
-        rc.GetFrustumParams(&l, &r, &b, &t, &Ndist, &Fdist);
-
-        Vec3 volFogCtrlParams(0.0f, 0.0f, 0.0f);
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volFogCtrlParams);
-        const float raymarchStart = rc.fNear;
-        const float raymarchEnd = (volFogCtrlParams.x > raymarchStart) ? volFogCtrlParams.x : raymarchStart + 0.0001f;
-
-        float l2 = l * l;
-        float t2 = t * t;
-        float n2 = Ndist * Ndist;
-        Vec4 params;
-        params.x = raymarchEnd * (Ndist / sqrt(l2 + t2 + n2));
-        params.y = raymarchEnd * (Ndist / sqrt(t2 + n2));
-        params.z = raymarchEnd * (Ndist / sqrt(l2 + n2));
-        params.w = raymarchEnd;
-
-        return params;
-    }
-
-    void sGetMotionBlurData(UFloat4* sData, CD3D9Renderer* r, [[maybe_unused]] const CRenderObject::SInstanceInfo& instInfo, SRenderPipeline& rRP)
-    {
-        CRenderObject* pObj = r->m_RP.m_pCurObject;
-
-        Matrix44A mObjPrev;
-        if ((rRP.m_FlagsPerFlush & RBSI_CUSTOM_PREVMATRIX) == 0)
-        {
-            CMotionBlur::GetPrevObjToWorldMat(pObj, mObjPrev);
-        }
-        else
-        {
-            mObjPrev = *rRP.m_pPrevMatrix;
-        }
-
-        float* pData = mObjPrev.GetData();
-#if defined(_CPU_SSE) && !defined(_DEBUG)
-        sData[0].m128 = _mm_load_ps(&pData[0]);
-        sData[1].m128 = _mm_load_ps(&pData[4]);
-        sData[2].m128 = _mm_load_ps(&pData[8]);
-#else
-        sData[0].f[0] = pData[0];
-        sData[0].f[1] = pData[1];
-        sData[0].f[2] = pData[2];
-        sData[0].f[3] = pData[3];
-        sData[1].f[0] = pData[4];
-        sData[1].f[1] = pData[5];
-        sData[1].f[2] = pData[6];
-        sData[1].f[3] = pData[7];
-        sData[2].f[0] = pData[8];
-        sData[2].f[1] = pData[9];
-        sData[2].f[2] = pData[10];
-        sData[2].f[3] = pData[11];
-#endif
-    }
-
-    void sGetPrevObjWorldData(UFloat4* sData, SRenderPipeline& rRP)
-    {
-        CRenderObject* pObj = rRP.m_pCurObject;
-
-        Matrix44A mObjPrev;
-        if ((rRP.m_FlagsPerFlush & RBSI_CUSTOM_PREVMATRIX) == 0)
-        {
-            FurBendData::Get().GetPrevObjToWorldMat(*pObj, mObjPrev);
-        }
-        else
-        {
-            mObjPrev = *rRP.m_pPrevMatrix;
-        }
-
-        float* pData = mObjPrev.GetData();
-#if defined(_CPU_SSE) && !defined(_DEBUG)
-        sData[0].m128 = _mm_load_ps(&pData[0]);
-        sData[1].m128 = _mm_load_ps(&pData[4]);
-        sData[2].m128 = _mm_load_ps(&pData[8]);
-#else
-        sData[0].f[0] = pData[0];
-        sData[0].f[1] = pData[1];
-        sData[0].f[2] = pData[2];
-        sData[0].f[3] = pData[3];
-        sData[1].f[0] = pData[4];
-        sData[1].f[1] = pData[5];
-        sData[1].f[2] = pData[6];
-        sData[1].f[3] = pData[7];
-        sData[2].f[0] = pData[8];
-        sData[2].f[1] = pData[9];
-        sData[2].f[2] = pData[10];
-        sData[2].f[3] = pData[11];
-#endif
-    }
-
-    NO_INLINE void sVisionParams(UFloat4* sData)
-    {
-        CRenderObject* pObj = gRenDev->m_RP.m_pCurObject;
-        SRenderObjData* pOD = pObj->GetObjData();
-        if (pOD)
-        {
-            float fRecip = (1.0f / 255.0f);
-
-            uint32 nParams(pOD->m_nHUDSilhouetteParams);
-
-            sData[0].f[0] = float((nParams & 0xff000000) >> 24) * fRecip;
-            sData[0].f[1] = float((nParams & 0x00ff0000) >> 16) * fRecip;
-            sData[0].f[2] = float((nParams & 0x0000ff00) >> 8) * fRecip;
-            sData[0].f[3] = float((nParams & 0x000000ff)) * fRecip;
-
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_customvisions == 2)
-            {
-                sData[0].f[3] = gEnv->pTimer->GetCurrTime() + ((float)(2 * pObj->m_Id) / 32768.0f);
-            }
-        }
-        else
-        {
-            sData[0].f[0] = 0;
-            sData[0].f[1] = 0;
-            sData[0].f[2] = 0;
-            sData[0].f[3] = 0;
-        }
-    }
-
-    NO_INLINE void sFromObjSB(UFloat4* sData)
-    {
-        CRenderObject* pObj = gRenDev->m_RP.m_pCurObject;
-        if (pObj && (pObj->m_nTextureID > 0))
-        {
-            CTexture* pTex = CTexture::GetByID(pObj->m_nTextureID);
-
-            // SB == Scale & Bias
-            _MS_ALIGN(16) ColorF B = pTex->GetMinColor();
-            _MS_ALIGN(16) ColorF S = pTex->GetMaxColor() - pTex->GetMinColor();
-
-            sData[0] = (const UFloat4&)B;
-            sData[1] = (const UFloat4&)S;
-        }
-        else
-        {
-            // SB == Scale & Bias
-            _MS_ALIGN(16) ColorF B = ColorF(0.0f);
-            _MS_ALIGN(16) ColorF S = ColorF(1.0f);
-
-            sData[0] = (const UFloat4&)B;
-            sData[1] = (const UFloat4&)S;
-        }
-    }
-
-    NO_INLINE void sVisionMtlParams(UFloat4* sData)
-    {
-        const Vec3& vCameraPos = gRenDev->GetViewParameters().vOrigin;
-        Vec3 vObjectPos = gRenDev->m_RP.m_pCurObject->GetTranslation();
-        if (gRenDev->m_RP.m_pCurObject->m_ObjFlags & FOB_NEAREST)
-        {
-            vObjectPos += vCameraPos; // Nearest objects are rendered in camera space, so convert to world space
-        }
-        const float fRecipThermalViewDist = 1.0f;
-
-        float heatAmount = 0.0f;
-
-        sData[0].f[0] = heatAmount;
-        sData[0].f[0] *= 1.0f - min(1.0f, vObjectPos.GetSquaredDistance(vCameraPos) * fRecipThermalViewDist);
-
-        if (gRenDev->m_RP.m_nPassGroupID == EFSLIST_TRANSP && gRenDev->m_RP.m_pCurObject->m_ObjFlags & FOB_REQUIRES_RESOLVE)
-        {
-            static void* pPrevNode = NULL;
-            static int prevFrame = 0;
-            static float fScale = 1.0f;
-
-            sData[0].f[0] *= fScale;
-
-            //Cache parameters for use in the next call, to provide a consistent value for an individual character
-            pPrevNode = gRenDev->m_RP.m_pCurObject->m_pRenderNode;
-            prevFrame = gRenDev->GetFrameID(true);
-        }
-
-        sData[0].f[1] = sData[0].f[2] = 0.0f;
-    }
-
-    NO_INLINE void sTexelsPerMeterInfo(UFloat4 *sData, uint32 texIdx)
-    {
-        sData[0].f[0] = sData[0].f[1] = sData[0].f[2] = sData[0].f[3] = 0;
-        CShaderResources*   pRes = gRenDev->m_RP.m_pShaderResources;
-        SEfResTexture*      pTextureRes = pRes ? pRes->GetTextureResource(texIdx) : nullptr;
-
-        if (pTextureRes && pTextureRes->m_Sampler.m_pTex)
-        {
-            CTexture*   pTexture = pTextureRes->m_Sampler.m_pTex;
-
-            int texWidth(pTexture->GetWidth());
-            int texHeight(pTexture->GetHeight());
-            float ratio = 0.5f / CRenderer::CV_r_TexelsPerMeter;
-            sData[0].f[0] = (float)texWidth * ratio;
-            sData[0].f[1] = (float)texHeight * ratio;
-        }
-    }
-
-    inline void sAppendClipSpaceAdaptation([[maybe_unused]] Matrix44A* __restrict pTransform)
-    {
-#if defined(OPENGL) && CRY_OPENGL_MODIFY_PROJECTIONS
-#if CRY_OPENGL_FLIP_Y
-        (*pTransform)(1, 0) = -(*pTransform)(1, 0);
-        (*pTransform)(1, 1) = -(*pTransform)(1, 1);
-        (*pTransform)(1, 2) = -(*pTransform)(1, 2);
-        (*pTransform)(1, 3) = -(*pTransform)(1, 3);
-#endif //CRY_OPENGL_FLIP_Y
-        (*pTransform)(2, 0) = +2.0f * (*pTransform)(2, 0) - (*pTransform)(3, 0);
-        (*pTransform)(2, 1) = +2.0f * (*pTransform)(2, 1) - (*pTransform)(3, 1);
-        (*pTransform)(2, 2) = +2.0f * (*pTransform)(2, 2) - (*pTransform)(3, 2);
-        (*pTransform)(2, 3) = +2.0f * (*pTransform)(2, 3) - (*pTransform)(3, 3);
-#endif //defined(OPENGL) && CRY_OPENGL_MODIFY_PROJECTIONS
-    }
-
-
-    NO_INLINE void sOceanMat(UFloat4* sData)
-    {
-        const CameraViewParameters& cam(gRenDev->GetViewParameters());
-
-        Matrix44A viewMat;
-        viewMat.m00 = cam.vX.x;
-        viewMat.m01 = cam.vY.x;
-        viewMat.m02 = cam.vZ.x;
-        viewMat.m03 = 0;
-        viewMat.m10 = cam.vX.y;
-        viewMat.m11 = cam.vY.y;
-        viewMat.m12 = cam.vZ.y;
-        viewMat.m13 = 0;
-        viewMat.m20 = cam.vX.z;
-        viewMat.m21 = cam.vY.z;
-        viewMat.m22 = cam.vZ.z;
-        viewMat.m23 = 0;
-        viewMat.m30 = 0;
-        viewMat.m31 = 0;
-        viewMat.m32 = 0;
-        viewMat.m33 = 1;
-        Matrix44A* pMat = alias_cast<Matrix44A*>(&sData[0]);
-        *pMat = viewMat * gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_matProj;
-        *pMat = pMat->GetTransposed();
-        sAppendClipSpaceAdaptation(pMat);
-    }
-
-    // Filling texture dimensions and inverse dimensions to CB
-    NO_INLINE void sResInfo(UFloat4 *sData, int texIdx)  // EFTT_DIFFUSE, EFTT_GLOSS, ... etc (but NOT EFTT_BUMP!)
-    {
-        sIdentityLine(sData);
-        CShaderResources *pRes = gRenDev->m_RP.m_pShaderResources;
-        if (!pRes)
-            return;
-
-        SEfResTexture*  pTextureRes = pRes->GetTextureResource(texIdx);
-        if (!pTextureRes)
-            return;
-
-        ITexture*   pTexture(pTextureRes->m_Sampler.m_pTex);
-        if (pTexture)
-        {
-            int texWidth(pTexture->GetWidth());
-            int texHeight(pTexture->GetHeight());
-            sData[0].f[0] = (float)texWidth;
-            sData[0].f[1] = (float)texHeight;
-            if (texWidth && texHeight)
-            {
-                sData[0].f[2] = 1.0f / (float)texWidth;
-                sData[0].f[3] = 1.0f / (float)texHeight;
-            }
-        }
-    }
-
-    NO_INLINE void sTexelDensityParam(UFloat4 *sData, uint32 texIdx)
-    {
-        sIdentityLine(sData);
-
-        CShaderResources *pRes = gRenDev->m_RP.m_pShaderResources;
-        if (!pRes)
-            return;
-
-        SEfResTexture*  pTextureRes = pRes->GetTextureResource(texIdx);
-        if (pTextureRes)
-        {
-            CRenderChunk*   pRenderChunk = NULL;
-            int texWidth = 512;
-            int texHeight = 512;
-            int mipLevel = 0;
-
-            IRenderElement *pRE = gRenDev->m_RP.m_pRE;
-
-            if (pRE)
-            {
-                pRenderChunk = pRE->mfGetMatInfo();
-            }
-
-            CRenderObject *pCurObject = gRenDev->m_RP.m_pCurObject;
-
-            if (pRenderChunk && pCurObject)
-            {
-                float weight = 1.0f;
-
-                if (pRenderChunk->m_texelAreaDensity > 0.0f)
-                {
-                    float scale = 1.0f;
-
-
-                    float distance = pCurObject->m_fDistance * TANGENT30_2 / scale;
-                    int screenHeight = gRenDev->GetHeight();
-
-                    weight = pRenderChunk->m_texelAreaDensity * distance * distance * texWidth * texHeight * 
-                        pTextureRes->GetTiling(0) *pTextureRes->GetTiling(1) / (screenHeight * screenHeight);
-                }
-
-                mipLevel = fastround_positive(0.5f * logf(max(weight, 1.0f)) / LN2);
-            }
-
-            texWidth /= (1 << mipLevel);
-            texHeight /= (1 << mipLevel);
-
-            if (texWidth == 0)
-                texWidth = 1;
-            if (texHeight == 0)
-                texHeight = 1;
-
-            sData[0].f[0] = (float)texWidth;
-            sData[0].f[1] = (float)texHeight;
-            sData[0].f[2] = 1.0f / (float)texWidth;
-            sData[0].f[3] = 1.0f / (float)texHeight;
-        }
-    }
-
-    NO_INLINE void sTexelDensityColor(UFloat4 *sData, uint32 texIdx)
-    {
-        sOneLine(sData);
-
-        CShaderResources *pRes = gRenDev->m_RP.m_pShaderResources;
-        if (!pRes)
-            return;
-
-        SEfResTexture*  pTextureRes = pRes->GetTextureResource(texIdx);
-        if (pTextureRes)
-        {
-            if (CRenderer::CV_e_DebugTexelDensity == 2 || gcpRendD3D->CV_e_DebugTexelDensity == 4)
-            {
-                CRenderChunk *pRenderChunk = NULL;
-                int texWidth = 512;
-                int texHeight = 512;
-                int mipLevel = 0;
-
-                IRenderElement *pRE = gRenDev->m_RP.m_pRE;
-
-                if (pRE)
-                {
-                    pRenderChunk = pRE->mfGetMatInfo();
-                }
-
-                CRenderObject *pCurObject = gRenDev->m_RP.m_pCurObject;
-
-                if (pRenderChunk && pCurObject)
-                {
-                    float weight = 1.0f;
-
-                    if (pRenderChunk->m_texelAreaDensity > 0.0f)
-                    {
-                        float scale = 1.0f;
-
-
-                        float distance = pCurObject->m_fDistance * TANGENT30_2 / scale;
-                        int screenHeight = gRenDev->GetHeight();
-
-                        weight = pRenderChunk->m_texelAreaDensity * distance * distance * texWidth * texHeight * 
-                            pTextureRes->GetTiling(0) * pTextureRes->GetTiling(1) / (screenHeight * screenHeight);
-                    }
-
-                    mipLevel = fastround_positive(0.5f * logf(max(weight, 1.0f)) / LN2);
-                }
-
-                switch (mipLevel)
-                {
-                case 0:
-                    sData[0].f[0] = 1.0f; sData[0].f[1] = 1.0f; sData[0].f[2] = 1.0f; break;
-                case 1:
-                    sData[0].f[0] = 0.0f; sData[0].f[1] = 0.0f; sData[0].f[2] = 1.0f; break;
-                case 2:
-                    sData[0].f[0] = 0.0f; sData[0].f[1] = 1.0f; sData[0].f[2] = 0.0f; break;
-                case 3:
-                    sData[0].f[0] = 0.0f; sData[0].f[1] = 1.0f; sData[0].f[2] = 1.0f; break;
-                case 4:
-                    sData[0].f[0] = 1.0f; sData[0].f[1] = 0.0f; sData[0].f[2] = 0.0f; break;
-                case 5:
-                    sData[0].f[0] = 1.0f; sData[0].f[1] = 0.0f; sData[0].f[2] = 1.0f; break;
-                default:
-                    sData[0].f[0] = 1.0f; sData[0].f[1] = 1.0f; sData[0].f[2] = 0.0f; break;
-                }
-            }
-            else
-            {
-                sData[0].f[0] = 1.0f; sData[0].f[1] = 1.0f; sData[0].f[2] = 1.0f;
-            }
-        }
-    }
-
-    NO_INLINE void sNumInstructions(UFloat4* sData)
-    {
-        sData[0].f[0] = gRenDev->m_RP.m_NumShaderInstructions / CRenderer::CV_r_measureoverdrawscale / 256.0f;
-    }
-
-    NO_INLINE void sAmbient(UFloat4* sData, SRenderPipeline& rRP, const CRenderObject::SInstanceInfo& instInfo)
-    {
-        sData[0].f[0] = instInfo.m_AmbColor[0];
-        sData[0].f[1] = instInfo.m_AmbColor[1];
-        sData[0].f[2] = instInfo.m_AmbColor[2];
-        sData[0].f[3] = instInfo.m_AmbColor[3];
-
-        if (CShaderResources* pRes = rRP.m_pShaderResources)
-        {
-            if (pRes->m_ResFlags & MTL_FLAG_ADDITIVE)
-            {
-                sData[0].f[0] *= rRP.m_fCurOpacity;
-                sData[0].f[1] *= rRP.m_fCurOpacity;
-                sData[0].f[2] *= rRP.m_fCurOpacity;
-            }
-        }
-    }
-    NO_INLINE void sAmbientOpacity(CRenderObject* const renderObject, CD3D9Renderer* renderer, CShaderResources* shaderResources, UFloat4* sData, const CRenderObject::SInstanceInfo& instInfo)
-    {
-        SRenderPipeline& RESTRICT_REFERENCE rRP = renderer->m_RP;
-
-        float opacity = shaderResources ? shaderResources->GetStrengthValue(EFTT_OPACITY) : 1.0f;
-        float opal = opacity * renderObject->m_fAlpha;
-        float s0 = instInfo.m_AmbColor[0];
-        float s1 = instInfo.m_AmbColor[1];
-        float s2 = instInfo.m_AmbColor[2];
-        float s3 = opal;// object opacity
-
-        if (shaderResources)
-        {
-            if (rRP.m_nShaderQuality == eSQ_Low)
-            {
-                ColorF diffuseColor = shaderResources->GetColorValue(EFTT_DIFFUSE);
-                s0 *= diffuseColor.r;
-                s1 *= diffuseColor.g;
-                s2 *= diffuseColor.b;
-            }
-            ColorF emissiveColor = shaderResources->GetColorValue(EFTT_EMITTANCE);
-            s0 += emissiveColor.r;
-            s1 += emissiveColor.g;
-            s2 += emissiveColor.b;
-
-            if (shaderResources->m_ResFlags & MTL_FLAG_ADDITIVE)
-            {
-                s0 *= opacity;
-                s1 *= opacity;
-                s2 *= opacity;
-            }
-        }
-
-        sData[0].f[0] = s0;
-        sData[0].f[1] = s1;
-        sData[0].f[2] = s2;
-        sData[0].f[3] = s3;
-    }
-
-    NO_INLINE void sObjectAmbColComp(UFloat4* sData, const CRenderObject::SInstanceInfo& instInfo, const float fRenderQuality)
-    {
-        CD3D9Renderer* const __restrict r = gcpRendD3D;
-        SRenderPipeline& RESTRICT_REFERENCE rRP = r->m_RP;
-        CRenderObject* pObj = rRP.m_pCurObject;
-        sData[0].f[0] = instInfo.m_AmbColor[3];
-        sData[0].f[1] = /*instInfo.m_AmbColor[3] * */ rRP.m_fCurOpacity * pObj->m_fAlpha;
-
-
-        sData[0].f[2] = 0.f;
-        sData[0].f[3] = fRenderQuality * (1.0f / 65535.0f);
-    }
-
-    NO_INLINE void sMotionBlurInfo([[maybe_unused]] UFloat4* sData, [[maybe_unused]] SRenderPipeline& rRP)
-    {
-#ifdef PARTICLE_MOTION_BLUR
-        SRenderObjData* pOD = rRP.m_pCurObject->GetObjData();
-        if (pOD && pOD->m_pParticleParams)
-        {
-            if (pOD->m_pParticleParams->eFacing().Camera)
-            {
-                sData[0].f[0] = pOD->m_pParticleParams->fMotionBlurCamStretchScale;
-                sData[0].f[1] = pOD->m_pParticleParams->fMotionBlurStretchScale;
-            }
-            else
-            {
-                sData[0].f[0] = infosData[0].f1] = 0;
-            }
-            sData[0].f[2] = pOD->m_pParticleParams->fMotionBlurScale * 0.2f;
-        }
-#endif
-    }
-
-    NO_INLINE void sWrinklesMask(UFloat4* sData, SRenderPipeline& rRP, uint index)
-    {
-        static uint8 WrinkleMask[3] = { ECGP_PI_WrinklesMask0, ECGP_PI_WrinklesMask1, ECGP_PI_WrinklesMask2 };
-
-        SRenderObjData* pOD = rRP.m_pCurObject->GetObjData();
-        if (pOD)
-        {
-            if (pOD->m_pShaderParams)
-            {
-                if (SShaderParam::GetValue(WrinkleMask[index], const_cast<AZStd::vector<SShaderParam>*>(pOD->m_pShaderParams), &sData[0].f[0], 4) == false)
-                {
-                    sData[0].f[0] = 0.f;
-                    sData[0].f[1] = 0.f;
-                    sData[0].f[2] = 0.f;
-                    sData[0].f[3] = 0.f;
-                }
-            }
-            else
-            {
-                sData[0].f[0] = 0.f;
-                sData[0].f[1] = 0.f;
-                sData[0].f[2] = 0.f;
-                sData[0].f[3] = 0.f;
-            }
-        }
-    }
-
-     NO_INLINE void sAlphaTest(UFloat4* sData, const float dissolveRef)
-    {
-        SRenderPipeline& RESTRICT_REFERENCE rRP = gRenDev->m_RP;
-
-        sData[0].f[0] = dissolveRef * (1.0f / 255.0f);
-        sData[0].f[1] = (rRP.m_pCurObject->m_ObjFlags & FOB_DISSOLVE_OUT) ? 1.0f : -1.0f;
-        sData[0].f[2] = 0.0f;
-        sData[0].f[3] = 0.0f;
-    }
-
-    NO_INLINE void sParticleEmissiveColor(UFloat4* data, SRenderPipeline& renderPipeline)
-    {
-        if (renderPipeline.m_pShaderResources)
-        {
-            ColorF finalEmittance = renderPipeline.m_pShaderResources->GetFinalEmittance();
-            data[0].f[0] = finalEmittance.r;
-            data[0].f[1] = finalEmittance.g;
-            data[0].f[2] = finalEmittance.b;
-            data[0].f[3] = 0.0f;
-        }
-        else
-        {
-            sZeroLine(data);
-        }
-    }
-
-    NO_INLINE void sAvgFogVolumeContrib(UFloat4* sData)
-    {
-        CD3D9Renderer* const __restrict r = gcpRendD3D;
-        SRenderPipeline& RESTRICT_REFERENCE rRP = r->m_RP;
-        CRenderObject* pObj = rRP.m_pCurObject;
-        SRenderObjData* pOD = r->FX_GetObjData(pObj, rRP.m_nProcessThreadID);
-        if (!pOD || pOD->m_FogVolumeContribIdx[rRP.m_nProcessThreadID] == (uint16)-1)
-        {
-            sData[0].f[0] = sData[0].f[1] = sData[0].f[2] = 0.0f;
-            sData[0].f[3] = 1.0f;
-            return;
-        }
-        SFogVolumeData fogVolData;
-        ColorF& contrib = fogVolData.fogColor;
-        r->GetFogVolumeContribution(pOD->m_FogVolumeContribIdx[rRP.m_nProcessThreadID], fogVolData);
-        // Pre-multiply alpha (saves 1 instruction in pixel shader)
-        sData[0].f[0] = contrib.r * (1 - contrib.a);
-        sData[0].f[1] = contrib.g * (1 - contrib.a);
-        sData[0].f[2] = contrib.b * (1 - contrib.a);
-        sData[0].f[3] = contrib.a;
-        // Pass min & max of the aabb and cvar value.
-        sData[1].f[0] = fogVolData.avgAABBox.min.x;
-        sData[1].f[1] = fogVolData.avgAABBox.min.y;
-        sData[1].f[2] = fogVolData.avgAABBox.min.z;
-        static ICVar* pCVarFogVolumeShadingQuality = gEnv->pConsole->GetCVar("e_FogVolumeShadingQuality");
-
-        sData[1].f[3] = (pCVarFogVolumeShadingQuality->GetIVal() && fogVolData.avgAABBox.GetRadius() > 0.001f) ? 1.0f : 0.0f;
-
-        sData[2].f[0] = fogVolData.avgAABBox.max.x;
-        sData[2].f[1] = fogVolData.avgAABBox.max.y;
-        sData[2].f[2] = fogVolData.avgAABBox.max.z;
-        sData[2].f[3] = (fogVolData.avgAABBox.GetRadius() > 0.001f) ? 1.0f : 0.0f;
-
-        sData[3].f[0] = fogVolData.m_heightFallOffBasePoint.x;
-        sData[3].f[1] = fogVolData.m_heightFallOffBasePoint.y;
-        sData[3].f[2] = fogVolData.m_heightFallOffBasePoint.z;
-        sData[3].f[3] = fogVolData.m_densityOffset;
-        
-        sData[4].f[0] = fogVolData.m_heightFallOffDirScaled.x;
-        sData[4].f[1] = fogVolData.m_heightFallOffDirScaled.y;
-        sData[4].f[2] = fogVolData.m_heightFallOffDirScaled.z;
-        sData[4].f[3] = fogVolData.m_globalDensity;
-
-        sData[5].f[0] = Overlap::Point_AABB(r->GetViewParameters().vOrigin, fogVolData.avgAABBox);
-
-    }
-
-    NO_INLINE void sDLightsInfo(UFloat4* sData)
-    {
-        COMPILE_TIME_ASSERT(sizeof(s_ConstantScratchBuffer) >= (sizeof(SLightVolume::SLightData) * LIGHTVOLUME_MAXLIGHTS));
-        PROFILE_FRAME(DLightsInfo_UpdateCB);
-
-        CD3D9Renderer* const __restrict r = gcpRendD3D;
-        SRenderPipeline& RESTRICT_REFERENCE rRP = r->m_RP;
-        SRenderObjData* pOD = r->FX_GetObjData(rRP.m_pCurObject, rRP.m_nProcessThreadID);
-        int nVols = 0;
-        if (pOD->m_LightVolumeId > 0)
-        {
-            assert((uint32)pOD->m_LightVolumeId - 1 < r->m_nNumVols);
-            SLightVolume::LightDataVector& lvData = r->m_pLightVols[pOD->m_LightVolumeId - 1].pData;
-            nVols = lvData.size();
-            assert(nVols <= LIGHTVOLUME_MAXLIGHTS);
-            if (nVols)
-            {
-                memcpy(&sData[0], &lvData[0], sizeof(SLightVolume::SLightData) * nVols);
-            }
-        }
-        memset((char*)sData + sizeof(SLightVolume::SLightData) * nVols, 0, sizeof(SLightVolume::SLightData) * (LIGHTVOLUME_MAXLIGHTS - nVols));
-    }
-
-    NO_INLINE void sGetTempData(UFloat4* sData, CD3D9Renderer* r, const SCGParam* ParamBind)
-    {
-        sData[0].f[0] = r->m_cEF.m_TempVecs[ParamBind->m_nID].x;
-        sData[0].f[1] = r->m_cEF.m_TempVecs[ParamBind->m_nID].y;
-        sData[0].f[2] = r->m_cEF.m_TempVecs[ParamBind->m_nID].z;
-        sData[0].f[3] = r->m_cEF.m_TempVecs[ParamBind->m_nID].w;
-    }
-
-    NO_INLINE void sRTRect(UFloat4* sData, CD3D9Renderer* r)
-    {
-        sData[0].f[0] = r->m_cEF.m_RTRect.x;
-        sData[0].f[1] = r->m_cEF.m_RTRect.y;
-        sData[0].f[2] = r->m_cEF.m_RTRect.z;
-        sData[0].f[3] = r->m_cEF.m_RTRect.w;
-    }
-
-    bool sCanSet(const STexSamplerRT* pSM, CTexture* pTex)
-    {
-        assert(pTex);
-        if (!pTex)
-        {
-            return false;
-        }
-        if (!pSM->m_bGlobal)
-        {
-            return true;
-        }
-        CD3D9Renderer* pRD = gcpRendD3D;
-        if (pRD->m_pNewTarget[0] && pRD->m_pNewTarget[0]->m_pTex == pTex)
-        {
-            return false;
-        }
-        if (pRD->m_pNewTarget[1] && pRD->m_pNewTarget[1]->m_pTex == pTex)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    void LogParameter(
-        EHWShaderClass shaderClass,
-        const SCGParam* parameter,
-        AZ::u32 componentIndex = 0)
-    {
-#ifdef DO_RENDERLOG
-        static const char* s_shaderClassNames[] = { "VS", "PS", "GS", "CS", "DS", "HS" };
-        static const char* s_componentNames[] = { "x", "y", "z", "w" };
-
-        CD3D9Renderer* const __restrict r = gcpRendD3D;
-        SRenderPipeline& RESTRICT_REFERENCE rRP = r->m_RP;
-        if (CRenderer::CV_r_log >= 3)
-        {
-            ECGParam parameterType = ECGParam((parameter->m_eCGParamType >> (componentIndex << 3)) & 0xff);
-            if (parameter->m_Flags & PF_SINGLE_COMP)
-            {
-                r->Logv(
-                    SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID],
-                    " Set %s parameter '%s:%s' (%d vectors, reg: %d)\n",
-                    s_shaderClassNames[shaderClass],
-                    parameter->m_Name.c_str(),
-                    r->m_cEF.mfGetShaderParamName(parameterType),
-                    parameter->m_RegisterCount,
-                    parameter->m_RegisterOffset);
-            }
-            else
-            {
-                r->Logv(
-                    SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID],
-                    " Set %s parameter '%s:%s' (%d vectors, reg: %d)\n",
-                    s_shaderClassNames[shaderClass],
-                    parameter->m_Name.c_str(),
-                    r->m_cEF.mfGetShaderParamName(parameterType),
-                    parameter->m_RegisterCount,
-                    parameter->m_RegisterOffset,
-                    s_componentNames[componentIndex]);
-            }
-        }
-#endif
-    }
-
-    void UpdateConstants(
-        EHWShaderClass shaderClass,
-        [[maybe_unused]] EConstantBufferShaderSlot shaderSlot,
-        const SCGParam* parameters,
-        AZ::u32 parameterCount,
-        void* outputData)
-    {
-        DETAILED_PROFILE_MARKER("mfSetParameters");
-        PROFILE_FRAME(Shader_SetParams);
-
-        if (!parameters)
-        {
-            return;
-        }
-
-        CD3D9Renderer* r = gcpRendD3D;
-        SRenderPipeline& rRP = r->m_RP;
-
-        for (AZ::u32 parameterIdx = 0; parameterIdx < parameterCount; parameterIdx++)
-        {
-            const SCGParam* parameter = &parameters[parameterIdx];
-            AZ::u32 registerCount = parameter->m_RegisterCount;
-            AZ::u32 registerOffset = parameter->m_RegisterOffset;
-            AZ::u32 parameterTypeFlags = (uint32)parameter->m_eCGParamType;
-            AZ::u32 parameterType = parameterTypeFlags & 0xFF;
-
-            UFloat4* result = s_ConstantScratchBuffer;
-
-            for (AZ::u32 componentIndex = 0; componentIndex < 4; componentIndex++)
-            {
-                LogParameter(shaderClass, parameter, componentIndex);
-
-                switch (parameterType)
-                {
-                case ECGP_PB_ScreenSize:
-                    sGetScreenSize(result, r);
-                    break;
-
-                case ECGP_Matr_PB_TerrainBase:
-                    sGetTerrainBase(result, r);
-                    break;
-                case ECGP_Matr_PB_TerrainLayerGen:
-                    sGetTerrainLayerGen(result, r);
-                    break;
-
-                case ECGP_PB_BlendTerrainColInfo:
-                {
-                    SRenderObjData* objectData = rRP.m_pCurObject->GetObjData();
-                    if (objectData)
-                    {
-                        float* pObjTmpVars = objectData->m_fTempVars;
-
-                        result[0].f[0] = pObjTmpVars[3];     // fTexOffsetX
-                        result[0].f[1] = pObjTmpVars[4];     // fTexOffsetY
-                        result[0].f[2] = pObjTmpVars[5];     // fTexScale
-                        result[0].f[3] = pObjTmpVars[8];     // Obj view distance
-                    }
-                }
-                break;
-
-                case ECGP_Matr_PB_Temp4_0:
-                case ECGP_Matr_PB_Temp4_1:
-                case ECGP_Matr_PB_Temp4_2:
-                case ECGP_Matr_PB_Temp4_3:
-                    memcpy(result, &r->m_TempMatrices[parameter->m_eCGParamType - ECGP_Matr_PB_Temp4_0][parameter->m_nID], sizeof(Matrix44));
-                    break;
-
-                case ECGP_PB_FromRE:
-                {
-                    IRenderElement* pRE = rRP.m_pRE;
-                    if (!pRE || !pRE->GetCustomData())
-                    {
-                        result[0].f[componentIndex] = 0;
-                    }
-                    else
-                    {
-                        result[0].f[componentIndex] = reinterpret_cast<float*>(pRE->GetCustomData())[(parameter->m_nID >> (componentIndex * 8)) & 0xff];
-                    }
-                    break;
-                }
-                case ECGP_PB_FromObjSB:
-                    sFromObjSB(result);
-                    break;
-
-                case ECGP_PB_GmemStencilValue:
-                {
-                    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-                    {
-                        uint32 stencilRef = CRenderer::CV_r_VisAreaClipLightsPerPixel ? 0 : (rRP.m_RIs[0][0]->nStencRef | BIT_STENCIL_INSIDE_CLIPVOLUME);
-                        // Here we check if an object can receive decals.
-                        bool bObjectAcceptsDecals = !(rRP.m_pCurObject->m_NoDecalReceiver);
-                        if (bObjectAcceptsDecals)
-                        {
-                             stencilRef |= (!(rRP.m_pCurObject->m_ObjFlags & FOB_DYNAMIC_OBJECT) || CRenderer::CV_r_deferredDecalsOnDynamicObjects ? BIT_STENCIL_RESERVED : 0);
-                        }
-                        result[0].f[0] = azlossy_caster(stencilRef);
-                        result[0].f[1] = 0.0f;
-                        result[0].f[2] = 0.0f;
-                        result[0].f[3] = 0.0f;
-                    }
-                    else
-                    {
-                        CRY_ASSERT_MESSAGE(false, "Warning: Trying to use GMEM Stencil attribute in a shader but GMEM is disabled. Value will not be set.");
-                    }
-                    break;
-                }
-
-                case ECGP_PB_TempData:
-                    sGetTempData(result, r, parameter);
-                    break;
-
-                case ECGP_Matr_PB_UnProjMatrix:
-                {
-                    Matrix44A* pMat = alias_cast<Matrix44A*>(&result[0]);
-                    *pMat = rRP.m_TI[rRP.m_nProcessThreadID].m_matView * rRP.m_TI[rRP.m_nProcessThreadID].m_matProj;
-                    *pMat = pMat->GetInverted();
-                    *pMat = pMat->GetTransposed();
-                    break;
-                }
-
-                case ECGP_PB_DLightsInfo:
-                    sDLightsInfo(result);
-                    break;
-
-                case ECGP_PB_ObjVal:
-                {
-                    SRenderObjData* objectData = rRP.m_pCurObject->GetObjData();
-                    if (objectData)
-                    {
-                        result[0].f[componentIndex] =
-                            reinterpret_cast<float*>(objectData->m_fTempVars)[(parameter->m_nID >> (componentIndex * 8)) & 0xff];
-                    }
-                }
-                break;
-                case ECGP_PB_IrregKernel:
-                    sGetIrregKernel(result, r);
-                    break;
-                case ECGP_PB_TFactor:
-                    result[0].f[0] = r->m_RP.m_CurGlobalColor[0];
-                    result[0].f[1] = r->m_RP.m_CurGlobalColor[1];
-                    result[0].f[2] = r->m_RP.m_CurGlobalColor[2];
-                    result[0].f[3] = r->m_RP.m_CurGlobalColor[3];
-                    break;
-                case ECGP_PB_RTRect:
-                    sRTRect(result, r);
-                    break;
-                case ECGP_PB_Scalar:
-                    assert(parameter->m_pData);
-                    if (parameter->m_pData)
-                    {
-                        result[0].f[componentIndex] = parameter->m_pData->d.fData[componentIndex];
-                    }
-                    break;
-
-                case ECGP_PB_ClipVolumeParams:
-                    result[0].f[0] = rRP.m_pCurObject->m_nClipVolumeStencilRef + 1.0f;
-                    result[0].f[1] = result[0].f[2] = result[0].f[3] = 0;
-                    break;
-
-                /// Used by Sketch.cfx
-                case ECGP_PB_ResInfoDiffuse:
-                    sResInfo(result, EFTT_DIFFUSE);
-                    break;
-                case ECGP_PB_TexelDensityParam:
-                    sTexelDensityParam(result, EFTT_DIFFUSE);
-                    break;
-                case ECGP_PB_TexelDensityColor:
-                    sTexelDensityColor(result, EFTT_DIFFUSE);
-                    break;
-                case ECGP_PB_TexelsPerMeterInfo:
-                    sTexelsPerMeterInfo(result, EFTT_DIFFUSE);
-                    break;
-                ///!
-
-                case ECGP_PB_VisionMtlParams:
-                    sVisionMtlParams(result);
-                    break;
-
-                /// Water.cfx / WaterVolume.cfx
-                case ECGP_PB_WaterRipplesLookupParams:
-                    if (CPostEffectsMgr* pPostEffectsMgr = PostEffectMgr())
-                    {
-                        if (CWaterRipples* pWaterRipplesTech = (CWaterRipples*)pPostEffectsMgr->GetEffect(ePFX_WaterRipples))
-                        {
-                            result[0].f[0] = pWaterRipplesTech->GetLookupParams().x;
-                            result[0].f[1] = pWaterRipplesTech->GetLookupParams().y;
-                            result[0].f[2] = pWaterRipplesTech->GetLookupParams().z;
-                            result[0].f[3] = pWaterRipplesTech->GetLookupParams().w;
-                        }
-                    }
-                    break;
-                ///!
-
-                case ECGP_PB_SkinningExtraWeights:
-                {
-                    if (rRP.m_pRE->mfGetType() == eDATA_Mesh && ((CREMeshImpl*)rRP.m_pRE)->m_pRenderMesh->m_extraBonesBuffer.m_numElements > 0)
-                    {
-                        result[0].f[0] = 1.0f;
-                        result[0].f[1] = 1.0f;
-                        result[0].f[2] = 1.0f;
-                        result[0].f[3] = 1.0f;
-                    }
-                    else
-                    {
-                        result[0].f[0] = 0.0f;
-                        result[0].f[1] = 0.0f;
-                        result[0].f[2] = 0.0f;
-                        result[0].f[3] = 0.0f;
-                    }
-                    break;
-                }
-
-                case 0:
-                    break;
-
-                default:
-                    assert(0);
-                    break;
-                }
-                if (parameter->m_Flags & PF_SINGLE_COMP)
-                {
-                    break;
-                }
-
-                parameterTypeFlags >>= 8;
-            }
-
-            AzRHI::SIMDCopy(&reinterpret_cast<UFloat4*>(outputData)[registerOffset], s_ConstantScratchBuffer, registerCount);
-        }
-    }
-}
-
-void CHWShader_D3D::UpdatePerInstanceConstants(
-    EHWShaderClass shaderClass,
-    const SCGParam* parameters,
-    AZ::u32 parameterCount,
-    void* outputData)
-{
-    DETAILED_PROFILE_MARKER("UpdatePerInstanceConstants");
-
-    CD3D9Renderer* const __restrict r = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = r->m_RP;
-    CRenderObject* const __restrict pObj = rRP.m_pCurObject;
-    CShaderResources* shaderResources = rRP.m_pShaderResources;
-
-    UFloat4* result = s_ConstantScratchBuffer;
-    AZ_Assert(pObj, "Trying to set PI parameters with NULL object");
-
-    // precache int to float conversions for some parameters
-    float objDissolveRef = (float)(pObj->m_DissolveRef);
-    float objRenderQuality = (float)(pObj->m_nRenderQuality);
-    const CRenderObject::SInstanceInfo& instanceInfo = pObj->m_II;
-
-    for (AZ::u32 parameterIdx = 0; parameterIdx < parameterCount; parameterIdx++)
-    {
-        const SCGParam* parameter = &parameters[parameterIdx];
-
-        // Not activated yet for this shader
-        if (parameter->m_BindingSlot < 0)
-        {
-            continue;
-        }
-
-        assert(parameter->m_Flags & PF_SINGLE_COMP);
-        LogParameter(shaderClass, parameter);
-
-        switch (parameter->m_eCGParamType)
-        {
-        case ECGP_SI_AmbientOpacity:
-            sAmbientOpacity(pObj, r, shaderResources, result, instanceInfo);
-            break;
-        case ECGP_SI_BendInfo:
-            sGetBendInfo(pObj, FrameType::Current, result, r);
-            break;
-        case ECGP_SI_PrevBendInfo:
-            sGetBendInfo(pObj, FrameType::Previous, result, r);
-            break;
-        case ECGP_SI_ObjectAmbColComp:
-            sObjectAmbColComp(result, instanceInfo, objRenderQuality);
-            break;
-        case ECGP_SI_AlphaTest:
-            sAlphaTest(result, objDissolveRef);
-            break;
-
-        case ECGP_Matr_PI_Obj_T:
-        {
-            Store(result, instanceInfo.m_Matrix);
-        }
-        break;
-        case ECGP_Matr_PI_ViewProj:
-        {
-            mathMatrixMultiply_Transp2(&result[4].f[0], r->m_ViewProjMatrix.GetData(), instanceInfo.m_Matrix.GetData(), g_CpuFlags);
-            TransposeAndStore(result, *alias_cast<Matrix44A*>(&result[4]));
-            sAppendClipSpaceAdaptation(alias_cast<Matrix44A*>(&result[0]));
-        }
-        break;
-        case ECGP_PI_Ambient:
-            sAmbient(result, rRP, instanceInfo);
-            break;
-        case ECGP_PI_MotionBlurInfo:
-            sMotionBlurInfo(result, rRP);
-            break;
-
-        case ECGP_PI_ParticleEmissiveColor:
-            sParticleEmissiveColor(result, rRP);
-            break;
-
-        case ECGP_PI_WrinklesMask0:
-            sWrinklesMask(result, rRP, 0);
-            break;
-        case ECGP_PI_WrinklesMask1:
-            sWrinklesMask(result, rRP, 1);
-            break;
-        case ECGP_PI_WrinklesMask2:
-            sWrinklesMask(result, rRP, 2);
-            break;
-
-        case ECGP_PI_AvgFogVolumeContrib:
-            sAvgFogVolumeContrib(result);
-            break;
-        // Remove ECGP_Matr_PI_Composite after we refactor Set2DMode and m_matView and m_matProj
-        // For now ECGP_Matr_PI_Composite is not used in 3D object rendering shaders.
-        case ECGP_Matr_PI_Composite:
-        {
-            const Matrix44A viewProj = rRP.m_TI[rRP.m_nProcessThreadID].m_matView * rRP.m_TI[rRP.m_nProcessThreadID].m_matProj;
-            TransposeAndStore(result, viewProj);
-        }
-        break;
-        case ECGP_PI_MotionBlurData:
-            sGetMotionBlurData(result, r, instanceInfo, rRP);
-
-            break;
-        case ECGP_PI_PrevObjWorldMatrix:
-            sGetPrevObjWorldData(result, rRP);
-            break;
-        case ECGP_Matr_PI_TexMatrix:
-            sGetTexMatrix(result, r, parameter);
-            break;
-        case ECGP_Matr_PI_TCGMatrix:
-        {
-            SEfResTexture* pRT = rRP.m_ShaderTexResources[parameter->m_nID];
-            if (pRT && pRT->m_Ext.m_pTexModifier)
-            {
-                Store(result, pRT->m_Ext.m_pTexModifier->m_TexGenMatrix);
-            }
-            else
-            {
-                Store(result, r->m_IdentityMatrix);
-            }
-        }
-        break;
-        case ECGP_PI_OSCameraPos:
-        {
-            Matrix44A* pMat1 = alias_cast<Matrix44A*>(&result[4]);
-            Matrix44A* pMat2 = alias_cast<Matrix44A*>(&result[0]);
-            *pMat1 = instanceInfo.m_Matrix.GetTransposed();
-            *pMat2 = fabs(pMat1->Determinant()) > 1e-6 ? (*pMat1).GetInverted() : Matrix44(IDENTITY);
-
-            // Respect Camera-Space rendering
-            Vec3 cameraPosObjectSpace;
-            Vec3 cameraPos = (rRP.m_pCurObject->m_ObjFlags & FOB_NEAREST) ? ZERO : r->GetViewParameters().vOrigin;
-            TransformPosition(cameraPosObjectSpace, cameraPos, *pMat2);
-
-            result[0].f[0] = cameraPosObjectSpace.x;
-            result[0].f[1] = cameraPosObjectSpace.y;
-            result[0].f[2] = cameraPosObjectSpace.z;
-            result[0].f[3] = 1.f;
-        }
-        break;
-        case ECGP_PI_VisionParams:
-            sVisionParams(result);
-            break;
-        case ECGP_PI_NumInstructions:
-            sNumInstructions(result);
-            break;
-        case ECGP_Matr_PI_OceanMat:
-            sOceanMat(result);
-            break;
-
-        case ECGP_PI_FurLODInfo:
-        {
-            // FurLODInfo contains LOD values for the current object to adjust fur rendering:
-            //   x - Current object's first LOD distance
-            //   y - Current object's max view distance
-            // Presently, this is used to control self-shadowing as a function of distance and LOD.
-            if (rRP.m_pCurObject)
-            {
-                if (IRenderNode* pRenderNode = rRP.m_pCurObject->m_pRenderNode)
-                {
-                    /// Fix it! should not access the memory pointed by IRenderNode in render thread.
-                    // Scale number of shell passes by object's distance to camera and LOD ratio
-                    float lodRatio = pRenderNode->GetLodRatioNormalized();
-                    if (lodRatio > 0.0f)
-                    {
-                        static ICVar* pTargetSize = gEnv->pConsole->GetCVar("e_LodFaceAreaTargetSize");
-                        if (pTargetSize)
-                        {
-                            lodRatio *= pTargetSize->GetFVal();
-                        }
-                    }
-
-                    float maxDistance = CD3D9Renderer::CV_r_FurMaxViewDist * pRenderNode->GetViewDistanceMultiplier();
-                    float lodDistance = AZ::GetClamp(pRenderNode->GetFirstLodDistance() / lodRatio, 0.0f, maxDistance);
-
-                    result[0].f[0] = lodDistance;
-                    result[0].f[1] = maxDistance;
-                }
-            }
-            break;
-        }
-
-        case ECGP_PI_FurParams:
-        {
-            // FurParams contains common information for fur rendering:
-            //   x, y, z - wind direction and strength in world space, for wind bending of fur
-            //   w - distance of current shell between base and outermost shell, in the range [0, 1]
-            AABB instanceBboxWorld(AABB::RESET);
-            Vec3 vWindWorld(ZERO);
-            if (rRP.m_pRE)
-            {
-                rRP.m_pRE->mfGetBBox(instanceBboxWorld.min, instanceBboxWorld.max);
-                instanceBboxWorld.min = instanceInfo.m_Matrix * instanceBboxWorld.min;
-                instanceBboxWorld.max = instanceInfo.m_Matrix * instanceBboxWorld.max;
-            }
-            if (instanceBboxWorld.IsReset())
-            {
-                vWindWorld = gEnv->p3DEngine->GetGlobalWind(false);
-            }
-            else
-            {
-                vWindWorld = gEnv->p3DEngine->GetWind(instanceBboxWorld, false);
-            }
-
-            result[0].f[0] = vWindWorld.x;
-            result[0].f[1] = vWindWorld.y;
-            result[0].f[2] = vWindWorld.z;
-            result[0].f[3] = FurPasses::GetInstance().GetFurShellPassPercent();
-            break;
-        }
-
-        default:
-            assert(0);
-            break;
-        }
-
-        const AZ::u32 registerCount = parameter->m_RegisterCount;
-        const AZ::u32 registerOffset = parameter->m_RegisterOffset;
-        AzRHI::SIMDCopy(&reinterpret_cast<UFloat4*>(outputData)[registerOffset], result, registerCount);
-    }
-}
-
-void CHWShader_D3D::UpdatePerInstanceConstantBuffer()
-{
-    if (!m_pCurInst)
-    {
-        return;
-    }
-    SHWSInstance* pInst = m_pCurInst;
-    if (pInst->m_nParams[1] >= 0)
-    {
-        SCGParamsGroup& Group = CGParamManager::s_Groups[pInst->m_nParams[1]];
-
-        void* mappedData = AzRHI::ConstantBufferCache::GetInstance().MapConstantBuffer(
-            m_eSHClass, eConstantBufferShaderSlot_PerInstanceLegacy, pInst->m_nMaxVecs[1]);
-        UpdatePerInstanceConstants(m_eSHClass, Group.pParams, Group.nParams, mappedData);
-    }
-}
-
-void CHWShader_D3D::UpdatePerBatchConstantBuffer()
-{
-    if (!m_pCurInst)
-    {
-        return;
-    }
-    SHWSInstance* pInst = m_pCurInst;
-    if (pInst->m_nParams[0] >= 0)
-    {
-        SCGParamsGroup& Group = CGParamManager::s_Groups[pInst->m_nParams[0]];
-
-        void* mappedData = AzRHI::ConstantBufferCache::GetInstance().MapConstantBuffer(
-            m_eSHClass, eConstantBufferShaderSlot_PerBatch, pInst->m_nMaxVecs[0]);
-        UpdateConstants(m_eSHClass, eConstantBufferShaderSlot_PerBatch, Group.pParams, Group.nParams, mappedData);
-    }
-}
-
-void CHWShader_D3D::UpdatePerViewConstantBuffer()
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    rd->GetGraphicsPipeline().UpdatePerViewConstantBuffer();
-    rd->GetGraphicsPipeline().BindPerViewConstantBuffer();
-}
-
-void CD3D9Renderer::UpdatePerFrameParameters()
-{
-    // Per frame - hardcoded/fast - update of commonly used data - feel free to improve this
-    int nThreadID = m_RP.m_nFillThreadID;
-    uint32 nFrameID = gRenDev->m_RP.m_TI[nThreadID].m_nFrameUpdateID;
-    PerFrameParameters& PF = gRenDev->m_RP.m_TI[nThreadID].m_perFrameParameters;
-    if (PF.m_FrameID == nFrameID || SRendItem::m_RecurseLevel[nThreadID] > 0)
-    {
-        return;
-    }
-
-    PF.m_FrameID = nFrameID;
-
-    I3DEngine* p3DEngine = gEnv->p3DEngine;
-    if (p3DEngine == nullptr)
-    {
-        return;
-    }
-
-    PF.m_WaterLevel = Vec3(OceanToggle::IsActive() ? OceanRequest::GetOceanLevel() : p3DEngine->GetWaterLevel());
-
-    {
-        // Caustics are done with projection from sun - ence they update too fast with regular
-        // sun direction. Use a smooth sun direction update instead to workaround this
-        Vec3 realtimeSunDirNormalized = p3DEngine->GetRealtimeSunDirNormalized();
-
-        const float snapshot = 0.98f;
-        float dotProduct = fabs(PF.m_CausticsSunDirection.Dot(realtimeSunDirNormalized));
-        if (dotProduct < snapshot)
-        {
-            PF.m_CausticsSunDirection = realtimeSunDirNormalized;
-        }
-
-        PF.m_CausticsSunDirection += (realtimeSunDirNormalized - PF.m_CausticsSunDirection) * 0.005f * gEnv->pTimer->GetFrameTime();
-        PF.m_CausticsSunDirection.Normalize();
-    }
-
-    {
-        Vec4 hdrSetupParams[5];
-        p3DEngine->GetHDRSetupParams(hdrSetupParams);
-        // Film curve setup
-        PF.m_HDRParams = Vec4(
-            hdrSetupParams[0].x * 6.2f,
-            hdrSetupParams[0].y * 0.5f,
-            hdrSetupParams[0].z * 0.06f,
-            1.0f);
-    }
-
-    {
-        Vec3 multiplier;
-        p3DEngine->GetGlobalParameter(E3DPARAM_SUN_SPECULAR_MULTIPLIER, multiplier);
-        PF.m_SunSpecularMultiplier = multiplier.x;
-    }
-
-    // Set energy indicator representing the sun intensity compared to noon.
-    Vec3    dayNightIndicators;
-    p3DEngine->GetGlobalParameter(E3DPARAM_DAY_NIGHT_INDICATOR, dayNightIndicators);
-    PF.m_MidDayIndicator = dayNightIndicators.y;
-
-    p3DEngine->GetGlobalParameter(E3DPARAM_CLOUDSHADING_SUNCOLOR, PF.m_CloudShadingColorSun);
-    p3DEngine->GetGlobalParameter(E3DPARAM_CLOUDSHADING_SKYCOLOR, PF.m_CloudShadingColorSky);
-
-    {
-        //Prevent division by Zero if there's no terrain system.
-        AZ::Aabb terrainAabb = AZ::Aabb::CreateFromMinMax(AZ::Vector3::CreateZero(), AZ::Vector3::CreateOne());
-        AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-        const float heightMapSizeX = terrainAabb.GetXExtent();
-        const float heightMapSizeY = terrainAabb.GetYExtent();
-
-        Vec3 cloudShadowOffset = m_cloudShadowSpeed * gEnv->pTimer->GetCurrTime();
-        cloudShadowOffset.x -= (int)cloudShadowOffset.x;
-        cloudShadowOffset.y -= (int)cloudShadowOffset.y;
-        PF.m_CloudShadowAnimParams = Vec4(m_cloudShadowTiling / heightMapSizeX, -m_cloudShadowTiling / heightMapSizeY, cloudShadowOffset.x, -cloudShadowOffset.y);
-        PF.m_CloudShadowParams = Vec4(0, 0, m_cloudShadowInvert ? 1.0f : 0.0f, m_cloudShadowBrightness);
-    }
-
-    {
-        float* projMatrix = (float*)&gcpRendD3D->m_RP.m_TI[nThreadID].m_matProj;
-        float scalingFactor = clamp_tpl(CRenderer::CV_r_ZFightingDepthScale, 0.1f, 1.0f);
-
-        PF.m_DecalZFightingRemedy.x = scalingFactor; // scaling factor to pull decal in front
-        PF.m_DecalZFightingRemedy.y = (float)((1.0f - scalingFactor) * projMatrix[4 * 3 + 2]); // correction factor for homogeneous z after scaling is applied to xyzw { = ( 1 - v[0] ) * zMappingRageBias }
-        PF.m_DecalZFightingRemedy.z = clamp_tpl(CRenderer::CV_r_ZFightingExtrude, 0.0f, 1.0f);
-    }
-
-    PF.m_VolumetricFogParams = sGetVolumetricFogParams(gcpRendD3D);
-    PF.m_VolumetricFogRampParams = sGetVolumetricFogRampParams();
-
-    sGetFogColorGradientConstants(PF.m_VolumetricFogColorGradientBase, PF.m_VolumetricFogColorGradientDelta);
-    PF.m_VolumetricFogColorGradientParams = sGetFogColorGradientParams();
-    PF.m_VolumetricFogColorGradientRadial = sGetFogColorGradientRadial(gcpRendD3D);
-    PF.m_VolumetricFogSamplingParams = sGetVolumetricFogSamplingParams(gcpRendD3D);
-    PF.m_VolumetricFogDistributionParams = sGetVolumetricFogDistributionParams(gcpRendD3D);
-    PF.m_VolumetricFogScatteringParams = sGetVolumetricFogScatteringParams(gcpRendD3D);
-    PF.m_VolumetricFogScatteringBlendParams = sGetVolumetricFogScatteringBlendParams(gcpRendD3D);
-    PF.m_VolumetricFogScatteringColor = sGetVolumetricFogScatteringColor(gcpRendD3D);
-    PF.m_VolumetricFogScatteringSecondaryColor = sGetVolumetricFogScatteringSecondaryColor(gcpRendD3D);
-    PF.m_VolumetricFogHeightDensityParams = sGetVolumetricFogHeightDensityParams(gcpRendD3D);
-    PF.m_VolumetricFogHeightDensityRampParams = sGetVolumetricFogHeightDensityRampParams(gcpRendD3D);
-    PF.m_VolumetricFogDistanceParams = sGetVolumetricFogDistanceParams(gcpRendD3D);
-}
-
-void CD3D9Renderer::ForceUpdateGlobalShaderParameters()
-{
-    UpdatePerFrameParameters();
-
-    gRenDev->m_pRT->EnqueueRenderCommand([this]()
-    {
-        FX_PreRender(1);
-        CHWShader_D3D::UpdatePerFrameResourceGroup();
-    });
-}
-
-void CHWShader_D3D::UpdatePerFrameResourceGroup()
-{
-    static std::vector<SCGTexture> s_textures;
-    static std::vector<STexSamplerRT> s_samplers;
-    s_textures.assign(s_PF_Textures.begin(), s_PF_Textures.end());
-    s_samplers.assign(s_PF_Samplers.begin(), s_PF_Samplers.end());
-    mfSetTextures(s_textures, eHWSC_Pixel);
-    mfSetSamplers_Old(s_samplers, eHWSC_Pixel);
-
-    const PerFrameParameters& PF = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_perFrameParameters;
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    rd->GetGraphicsPipeline().UpdatePerFrameConstantBuffer(PF);
-    rd->GetGraphicsPipeline().BindPerFrameConstantBuffer();
-}
-
-void CHWShader_D3D::UpdatePerMaterialConstantBuffer()
-{
-    DETAILED_PROFILE_MARKER("UpdatePerMaterialConstantBuffer");
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    CShaderResources* const __restrict shaderResources = rd->m_RP.m_pShaderResources;
-    CDeviceManager& deviceManager = rd->m_DevMan;
-    if (shaderResources)
-    {
-        AzRHI::ConstantBuffer* constantBuffer = shaderResources->GetConstantBuffer();
-        deviceManager.BindConstantBuffer(eHWSC_Vertex, constantBuffer, eConstantBufferShaderSlot_PerMaterial);
-        deviceManager.BindConstantBuffer(eHWSC_Pixel, constantBuffer, eConstantBufferShaderSlot_PerMaterial);
-        
-        if (s_pCurInstDS)
-        {
-            deviceManager.BindConstantBuffer(eHWSC_Domain, constantBuffer, eConstantBufferShaderSlot_PerMaterial);
-        }
-        if (s_pCurInstHS)
-        {
-            deviceManager.BindConstantBuffer(eHWSC_Hull, constantBuffer, eConstantBufferShaderSlot_PerMaterial);
-        }
-        if (s_pCurInstGS)
-        {
-            deviceManager.BindConstantBuffer(eHWSC_Geometry, constantBuffer, eConstantBufferShaderSlot_PerMaterial);
-        }
-        if (s_pCurInstCS)
-        {
-            deviceManager.BindConstantBuffer(eHWSC_Compute, constantBuffer, eConstantBufferShaderSlot_PerMaterial);
-        }
-    }
-}
-
-void CHWShader_D3D::mfCommitParamsGlobal()
-{
-    DETAILED_PROFILE_MARKER("mfCommitParamsGlobal");
-    PROFILE_FRAME(CommitGlobalShaderParams);
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    if (rRP.m_PersFlags2 & (RBPF2_COMMIT_PF | RBPF2_COMMIT_CM))
-    {
-        rRP.m_PersFlags2 &= ~(RBPF2_COMMIT_PF | RBPF2_COMMIT_CM);
-        UpdatePerViewConstantBuffer();
-    }
-}
-
-void CHWShader_D3D::mfSetGlobalParams()
-{
-    AZ_TRACE_METHOD();
-    DETAILED_PROFILE_MARKER("mfSetGlobalParams");
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        gRenDev->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "--- Set global shader constants...\n");
-    }
-#endif
-
-    Vec4 v;
-    CD3D9Renderer* r = gcpRendD3D;
-
-    r->m_RP.m_PersFlags2 |= RBPF2_COMMIT_PF | RBPF2_COMMIT_CM;
-    r->m_RP.m_nCommitFlags |= FC_GLOBAL_PARAMS;
-}
-
-void CHWShader_D3D::mfSetCameraParams()
-{
-    DETAILED_PROFILE_MARKER("mfSetCameraParams");
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        gRenDev->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "--- Set camera shader constants...\n");
-    }
-#endif
-    gRenDev->m_RP.m_PersFlags2 |= RBPF2_COMMIT_PF | RBPF2_COMMIT_CM;
-    gRenDev->m_RP.m_nCommitFlags |= FC_GLOBAL_PARAMS;
-}
-
-#if !defined(_RELEASE)
-void CHWShader_D3D::LogSamplerTextureMismatch(const CTexture* pTex, const STexSamplerRT* pSampler, EHWShaderClass shaderClass, const char* pMaterialName)
-{
-    if (pTex && pSampler)
-    {
-        const CHWShader_D3D::SHWSInstance* pInst = 0;
-        switch (shaderClass)
-        {
-        case eHWSC_Vertex:
-            pInst = s_pCurInstVS;
-            break;
-        case eHWSC_Pixel:
-            pInst = s_pCurInstPS;
-            break;
-        case eHWSC_Geometry:
-            pInst = s_pCurInstGS;
-            break;
-        case eHWSC_Compute:
-            pInst = s_pCurInstCS;
-            break;
-        case eHWSC_Domain:
-            pInst = s_pCurInstDS;
-            break;
-        case eHWSC_Hull:
-            pInst = s_pCurInstHS;
-            break;
-        default:
-            break;
-        }
-
-        const char* pSamplerName = "unknown";
-        if (pInst)
-        {
-            const uint32 slot = pSampler->m_nTextureSlot;
-            for (size_t idx = 0; idx < pInst->m_pBindVars.size(); ++idx)
-            {
-                if (slot == (pInst->m_pBindVars[idx].m_RegisterOffset & 0xF) && (pInst->m_pBindVars[idx].m_RegisterOffset & SHADER_BIND_SAMPLER) != 0)
-                {
-                    pSamplerName = pInst->m_pBindVars[idx].m_Name.c_str();
-                    break;
-                }
-            }
-        }
-
-        const char* pShaderName = gcpRendD3D->m_RP.m_pShader ? gcpRendD3D->m_RP.m_pShader->GetName() : "NULL";
-        const char* pTechName = gcpRendD3D->m_RP.m_pCurTechnique ? gcpRendD3D->m_RP.m_pCurTechnique->m_NameStr.c_str() : "NULL";
-        const char* pSamplerTypeName = CTexture::NameForTextureType((ETEX_Type)pSampler->m_eTexType);
-        const char* pTexName = pTex->GetName();
-        const char* pTexTypeName = pTex->GetTypeName();
-        const char* pTexSurrogateMsg = pTex->IsNoTexture() ? " (texture doesn't exist!)" : "";
-
-        // Do not keep re-logging the same error every frame, in editor this will pop-up an error dialog (every frame), rendering it unusable (also can't save map)
-        const char* pMaterialNameNotNull = pMaterialName ? pMaterialName : "none";
-        CCrc32 crc;
-        crc.Add(pShaderName);
-        crc.Add(pTechName);
-        crc.Add(pSamplerName);
-        crc.Add(pSamplerTypeName);
-        crc.Add(pTexName);
-        crc.Add(pTexTypeName);
-        crc.Add(pTexSurrogateMsg);
-        crc.Add(pMaterialNameNotNull);
-        const bool bShouldLog = s_ErrorsLogged.insert(crc.Get()).second;
-        if (!bShouldLog)
-        {
-            return;
-        }
-
-        if (!pTex->GetIsTextureMissing())
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR_DBGBRK, "!Mismatch between texture and sampler type detected! ...\n"
-                "- Shader \"%s\" with technique \"%s\"\n"
-                "- Sampler \"%s\" is of type \"%s\"\n"
-                "- Texture \"%s\" is of type \"%s\"%s\n"
-                "- Material is \"%s\"",
-                pShaderName, pTechName,
-                pSamplerName, pSamplerTypeName,
-                pTexName, pTexTypeName, pTexSurrogateMsg,
-                pMaterialName ? pMaterialName : "none");
-        }
-    }
-}
-#endif
-
-static EEfResTextures sSlots[] =
-{
-    EFTT_UNKNOWN,
-
-    EFTT_DIFFUSE,
-    EFTT_NORMALS,
-    EFTT_HEIGHT,
-    EFTT_SPECULAR,
-    EFTT_ENV,
-    EFTT_SUBSURFACE,
-    EFTT_SMOOTHNESS,
-    EFTT_DECAL_OVERLAY,
-    EFTT_CUSTOM,
-    EFTT_CUSTOM_SECONDARY,
-    EFTT_OPACITY,
-    EFTT_DETAIL_OVERLAY,
-    EFTT_EMITTANCE,
-    EFTT_OCCLUSION,
-    EFTT_SPECULAR_2,
-};
-
-bool CHWShader_D3D::mfSetSamplers(const std::vector<SCGSampler>& Samplers, EHWShaderClass eSHClass)
-{
-    DETAILED_PROFILE_MARKER("mfSetSamplers");
-    FUNCTION_PROFILER_RENDER_FLAT
-        //PROFILE_FRAME(Shader_SetShaderSamplers);
-        const uint32 nSize = Samplers.size();
-    if (!nSize)
-    {
-        return true;
-    }
-    CD3D9Renderer* __restrict rd = gcpRendD3D;
-
-    uint32 i;
-    const SCGSampler* pSamp = &Samplers[0];
-    for (i = 0; i < nSize; i++)
-    {
-        const SCGSampler* pSM = pSamp++;
-        int nSUnit = pSM->m_BindingSlot;
-
-        switch (pSM->m_eCGSamplerType)
-        {
-        case ECGS_Unknown:
-            break;
-
-        case ECGS_Shadow0:
-        case ECGS_Shadow1:
-        case ECGS_Shadow2:
-        case ECGS_Shadow3:
-        case ECGS_Shadow4:
-        case ECGS_Shadow5:
-        case ECGS_Shadow6:
-        case ECGS_Shadow7:
-        {
-            const int nShadowMapNum = pSM->m_eCGSamplerType - ECGS_Shadow0;
-            //force  MinFilter = Linear; MagFilter = Linear; for HW_PCF_FILTERING
-            STexState TS;
-
-            TS.m_pDeviceState = NULL;
-            TS.SetClampMode(TADDR_CLAMP, TADDR_CLAMP, TADDR_CLAMP);
-
-            SShaderProfile* pSP = &gRenDev->m_cEF.m_ShaderProfiles[eST_Shadow];
-            const int  nShadowQuality = (int)pSP->GetShaderQuality();
-            const bool bShadowsVeryHigh = nShadowQuality == eSQ_VeryHigh;
-            const bool bForwardShadows = (rd->m_RP.m_pShader->m_Flags2 & EF2_ALPHABLENDSHADOWS) != 0;
-            const bool bParticleShadow = (gRenDev->m_RP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_PARTICLE_SHADOW]) != 0;
-            const bool bPCFShadow = (gRenDev->m_RP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_HW_PCF_COMPARE]) != 0;
-
-            if ((!bShadowsVeryHigh || (nShadowMapNum != 0) || bForwardShadows || bParticleShadow) && bPCFShadow)
-            {
-                // non texture array case vs. texture array case
-                TS.SetComparisonFilter(true);
-                TS.SetFilterMode(FILTER_LINEAR);
-            }
-            else
-            {
-                TS.SetComparisonFilter(false);
-                TS.SetFilterMode(FILTER_POINT);
-            }
-
-            const int texState = CTexture::GetTexState(TS);
-            CTexture::SetSamplerState(texState, nSUnit, eSHClass);
-        }
-        break;
-
-        case ECGS_TrilinearClamp:
-        {
-            const static int nTStateTrilinearClamp = CTexture::GetTexState(STexState(FILTER_TRILINEAR, true));
-            CTexture::SetSamplerState(nTStateTrilinearClamp, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatAnisoHighWrap:
-        {
-            CTexture::SetSamplerState(gcpRendD3D->m_nMaterialAnisoHighSampler, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatAnisoLowWrap:
-        {
-            CTexture::SetSamplerState(gcpRendD3D->m_nMaterialAnisoLowSampler, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatTrilinearWrap:
-        {
-            const static int nTStateTrilinearWrap = CTexture::GetTexState(STexState(FILTER_TRILINEAR, false));
-            CTexture::SetSamplerState(nTStateTrilinearWrap, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatBilinearWrap:
-        {
-            const static int nTStateBilinearWrap = CTexture::GetTexState(STexState(FILTER_BILINEAR, false));
-            CTexture::SetSamplerState(nTStateBilinearWrap, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatTrilinearClamp:
-        {
-            const static int nTStateTrilinearClamp = CTexture::GetTexState(STexState(FILTER_TRILINEAR, true));
-            CTexture::SetSamplerState(nTStateTrilinearClamp, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatBilinearClamp:
-        {
-            const static int nTStateBilinearClamp = CTexture::GetTexState(STexState(FILTER_BILINEAR, true));
-            CTexture::SetSamplerState(nTStateBilinearClamp, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatAnisoHighBorder:
-        {
-            CTexture::SetSamplerState(gcpRendD3D->m_nMaterialAnisoSamplerBorder, nSUnit, eSHClass);
-        }
-        break;
-        case ECGS_MatTrilinearBorder:
-        {
-            const static int nTStateTrilinearBorder = CTexture::GetTexState(STexState(FILTER_TRILINEAR, TADDR_BORDER, TADDR_BORDER, TADDR_BORDER, 0x0));
-            CTexture::SetSamplerState(nTStateTrilinearBorder, nSUnit, eSHClass);
-        }
-        break;
-
-        default:
-            assert(0);
-            break;
-        }
-    }
-
-    return true;
-}
-
-//------------------------------------------------------------------------------
-// This is the final texture prep and bind point to the shader, using the 
-// function call 'CTexture::ApplyTexture'.
-//
-// This method runs over the list of parsed textures and bind them to the HW stage
-// Materials textures are handled the same and if do not exist they use a default.
-// The rest of the textures (engine / per frame ..) are specifically handled.
-// [Shader System] - this method should go data driven and have the same handling per texture.
-//
-// Observations:
-// 1. The binding indices here are determined by ECGTexture while textures contexts
-//      are derived by EEfResTextures - they do NOT exactly match!  
-//      It seems that the order can be switched without side effect - TEST!
-//------------------------------------------------------------------------------
-bool CHWShader_D3D::mfSetTextures(const std::vector<SCGTexture>& Textures, EHWShaderClass eSHClass)
-{
-    DETAILED_PROFILE_MARKER("mfSetTextures");
-    FUNCTION_PROFILER_RENDER_FLAT
-
-        const uint32 nSize = Textures.size();
-    if (!nSize)
-    {
-        return true;
-    }
-    CD3D9Renderer* __restrict rd = gcpRendD3D;
-    CShaderResources* __restrict pSR = rd->m_RP.m_pShaderResources;
-
-    uint32 i;
-    const SCGTexture* pTexBind = &Textures[0];
-    for (i = 0; i < nSize; i++)
-    {
-        int nTUnit = pTexBind->m_BindingSlot;
-
-        // Get appropriate view for the texture to bind (can be SRGB, MipLevels etc.)
-        SResourceView::KeyType nResViewKey = SResourceView::DefaultView;
-        if (pTexBind->m_bSRGBLookup)
-        {
-            nResViewKey = SResourceView::DefaultViewSRGB;
-        }
-
-        // This case handles texture names parsed from the shader that are not contextually predefined 
-        // [Shader System] - can be used for the per material stage once the texture Id is not 
-        // contextual anymore, hence not hard coded.
-        if (pTexBind->m_eCGTextureType == ECGT_Unknown)
-        {
-            CTexture* pTexture = pTexBind->GetTexture();
-            if (pTexture)
-            {
-                pTexture->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-            }
-
-            pTexBind++;
-            continue;
-        }
-
-        switch (pTexBind->m_eCGTextureType)
-        {
-        case ECGT_MatSlot_Diffuse:
-        case ECGT_MatSlot_Normals:
-        case ECGT_MatSlot_Specular:
-        case ECGT_MatSlot_Height:
-        case ECGT_MatSlot_SubSurface:
-        case ECGT_MatSlot_Smoothness:
-        case ECGT_MatSlot_DecalOverlay:
-        case ECGT_MatSlot_Custom:
-        case ECGT_MatSlot_CustomSecondary:
-        case ECGT_MatSlot_Env:
-        case ECGT_MatSlot_Opacity:
-        case ECGT_MatSlot_Detail:
-        case ECGT_MatSlot_Emittance:
-        case ECGT_MatSlot_Occlusion:
-        case ECGT_MatSlot_Specular2:
-        {
-            uint32          texSlot = EEfResTextures(pTexBind->m_eCGTextureType - 1);
-            SEfResTexture*  pTextureRes = pSR ? pSR->GetTextureResource(texSlot) : nullptr;
-            CTexture*       pTex = pTextureRes ? 
-                pTextureRes->m_Sampler.m_pTex : 
-                TextureHelpers::LookupTexDefault((EEfResTextures)texSlot);
-
-            if (pTex)
-            {
-                pTex->ApplyTexture(texSlot, eSHClass, nResViewKey);
-            }
-        }
-        break;
-
-        case ECGT_Shadow0:
-        case ECGT_Shadow1:
-        case ECGT_Shadow2:
-        case ECGT_Shadow3:
-        case ECGT_Shadow4:
-        case ECGT_Shadow5:
-        case ECGT_Shadow6:
-        case ECGT_Shadow7:
-        {
-            const int nShadowMapNum = pTexBind->m_eCGTextureType - ECGT_Shadow0;
-            const int nCustomID = rd->m_RP.m_ShadowCustomTexBind[nShadowMapNum];
-            if (nCustomID < 0)
-            {
-                break;
-            }
-
-            CTexture* tex = nCustomID ? CTexture::GetByID(nCustomID) : CTexture::s_ptexRT_ShadowStub;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_ShadowMask:
-        {
-            CTexture* tex = CTexture::IsTextureExist(CTexture::s_ptexShadowMask)
-                ? CTexture::s_ptexShadowMask
-                : CTextureManager::Instance()->GetBlackTexture();
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_ZTarget:
-        {
-            CTexture* tex = CTexture::s_ptexZTarget;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-        case ECGT_ZTargetMS:
-        {
-            CTexture* tex = CTexture::s_ptexZTarget;
-            tex->ApplyTexture(nTUnit, eSHClass, SResourceView::DefaultViewMS);
-        }
-        break;
-        case ECGT_ZTargetScaled:
-        {
-            CTexture* tex = CTexture::s_ptexZTargetScaled;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-        case ECGT_ShadowMaskZTarget:
-        {
-            // Returns FurZTarget if fur rendering is present in frame, otherwise ZTarget is returned
-            CTexture* tex = CTexture::s_ptexZTarget;
-            if (FurPasses::GetInstance().IsRenderingFur())
-            {
-                tex = CTexture::s_ptexFurZTarget;
-            }
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_SceneNormalsBent:
-        {
-            CTexture* tex = CTexture::s_ptexSceneNormalsBent;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_SceneNormals:
-        {
-            CTexture* tex = CTexture::s_ptexSceneNormalsMap;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-        case ECGT_SceneDiffuse:
-        {
-            CTexture* tex = CTexture::s_ptexSceneDiffuse;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-        case ECGT_SceneSpecular:
-        {
-            CTexture* tex = CTexture::s_ptexSceneSpecular;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-        case ECGT_SceneDiffuseAcc:
-        {
-            const uint32 nLightsCount = CDeferredShading::Instance().GetLightsCount();
-            CTexture* tex = nLightsCount ? CTexture::s_ptexSceneDiffuseAccMap : CTextureManager::Instance()->GetBlackTexture();
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-        case ECGT_SceneSpecularAcc:
-        {
-            const uint32 nLightsCount = CDeferredShading::Instance().GetLightsCount();
-            CTexture* tex = nLightsCount ? CTexture::s_ptexSceneSpecularAccMap : CTextureManager::Instance()->GetBlackTexture();
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_SceneNormalsMapMS:
-        {
-            CTexture* tex = CTexture::s_ptexSceneNormalsMapMS;
-            tex->ApplyTexture(nTUnit, eSHClass, SResourceView::DefaultViewMS);
-        }
-        break;
-        case ECGT_SceneDiffuseAccMS:
-        {
-            const uint32 nLightsCount = CDeferredShading::Instance().GetLightsCount();
-            CTexture* tex = nLightsCount ? CTexture::s_ptexSceneDiffuseAccMapMS : CTextureManager::Instance()->GetBlackTexture();
-            tex->ApplyTexture(nTUnit, eSHClass, SResourceView::DefaultViewMS);
-        }
-        break;
-        case ECGT_SceneSpecularAccMS:
-        {
-            const uint32 nLightsCount = CDeferredShading::Instance().GetLightsCount();
-            CTexture* tex = nLightsCount ? CTexture::s_ptexSceneSpecularAccMapMS : CTextureManager::Instance()->GetBlackTexture();
-            tex->ApplyTexture(nTUnit, eSHClass, SResourceView::DefaultViewMS);
-        }
-        break;
-
-        case ECGT_VolumetricClipVolumeStencil:
-        {
-            CTexture* tex = CTexture::s_ptexVolumetricClipVolumeStencil;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_VolumetricFog:
-        {
-            CTexture* tex = CTexture::s_ptexVolumetricFog;
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_VolumetricFogGlobalEnvProbe0:
-        {
-            CTexture* tex = rd->GetVolumetricFog().GetGlobalEnvProbeTex0();
-            tex = (tex != NULL) ? tex : CTextureManager::Instance()->GetNoTextureCM();
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        case ECGT_VolumetricFogGlobalEnvProbe1:
-        {
-            CTexture* tex = rd->GetVolumetricFog().GetGlobalEnvProbeTex1();
-            tex = (tex != NULL) ? tex : CTextureManager::Instance()->GetNoTextureCM();
-            tex->ApplyTexture(nTUnit, eSHClass, nResViewKey);
-        }
-        break;
-
-        default:
-            assert(0);
-            break;
-        }
-
-        pTexBind++;
-    }
-
-    return true;
-}
-
-bool CHWShader_D3D::mfSetSamplers_Old(const std::vector<STexSamplerRT>& Samplers, EHWShaderClass eSHClass)
-{
-    DETAILED_PROFILE_MARKER("mfSetSamplers_Old");
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    const uint32 nSize = Samplers.size();
-    if (!nSize)
-    {
-        return true;
-    }
-
-    CD3D9Renderer* __restrict       rd = gcpRendD3D;
-    CShaderResources* __restrict    pSR = rd->m_RP.m_pShaderResources;
-
-    uint32 i;
-    const STexSamplerRT* pSamp = &Samplers[0];
-
-    // Loop counter increments moved to resolve an issue where the compiler introduced
-    // load hit stores by storing the counters as the last instruction in the loop then
-    // immediately reloading and incrementing them after the branch back to the top
-    for (i = 0; i < nSize; )
-    {
-        CTexture*   tx = pSamp->m_pTex;
-        assert(tx);
-        if (!tx)
-        {
-            ++pSamp;
-            ++i;
-            continue;
-        }
-
-        int nTexMaterialSlot = EFTT_UNKNOWN;
-        const STexSamplerRT* pSM = pSamp++;
-        int nSUnit = pSM->m_nSamplerSlot;
-        int nTUnit = pSM->m_nTextureSlot;
-        assert(nTUnit >= 0);
-        int nTState = pSM->m_nTexState;
-        const ETEX_Type smpTexType = (ETEX_Type)pSM->m_eTexType;
-
-        ++i;
-
-        if (tx >= &(*CTexture::s_ShaderTemplates)[0] && tx <= &(*CTexture::s_ShaderTemplates)[EFTT_MAX - 1])
-        {
-            nTexMaterialSlot = (int)(tx - &(*CTexture::s_ShaderTemplates)[0]);
-
-            SEfResTexture*      pTextureRes = pSR ? pSR->GetTextureResource(nTexMaterialSlot) : nullptr;
-            if (!pTextureRes)
-            {
-                tx = TextureHelpers::LookupTexDefault((EEfResTextures)nTexMaterialSlot);
-            }
-#if defined(CONSOLE_CONST_CVAR_MODE)
-            else if constexpr (CD3D9Renderer::CV_r_TexturesDebugBandwidth > 0)
-#else
-            else if (rd->CV_r_TexturesDebugBandwidth > 0)
-#endif
-            {
-                tx = CTextureManager::Instance()->GetDefaultTexture("Gray");
-            }
-            else
-            {
-                pSM = &pTextureRes->m_Sampler;
-                tx = pSM->m_pTex;
-
-                if (nTState < 0 || !CTexture::s_TexStates[nTState].m_bActive)
-                {
-                    nTState = pSM->m_nTexState; // Use material texture state
-                }
-            }
-        }
-
-        IF(pSM && pSM->m_pAnimInfo, 0)
-        {
-            STexSamplerRT* pRT = (STexSamplerRT*)pSM;
-            pRT->Update();
-            tx = pRT->m_pTex;
-        }
-
-        IF(!tx || tx->GetCustomID() <= 0 && smpTexType != tx->GetTexType(), 0)
-        {
-#if !defined(_RELEASE)
-            string matName = "unknown";
-
-            if (pSR->m_szMaterialName)
-            {
-                matName = pSR->m_szMaterialName;
-            }
-
-            CRenderObject* pObj = gcpRendD3D->m_RP.m_pCurObject;
-
-            if (pObj && pObj->m_pCurrMaterial)
-            {
-                matName.Format("%s/%s", pObj->m_pCurrMaterial->GetName(), pSR->m_szMaterialName ? pSR->m_szMaterialName : "unknown");
-            }
-
-            if (tx && !tx->IsNoTexture())
-            {
-                LogSamplerTextureMismatch(tx, pSamp - 1, eSHClass, pSR && (nTexMaterialSlot >= 0 && nTexMaterialSlot < EFTT_UNKNOWN) ? matName : "none");
-            }
-#endif
-            tx = CTexture::s_pTexNULL;
-        }
-
-        {
-            int nCustomID = tx->GetCustomID();
-            if (nCustomID <= 0)
-            {
-                if (nTState >= 0 && nTState < CTexture::s_TexStates.size())
-                {
-                    if (tx->UseDecalBorderCol())
-                    {
-                        STexState TS = CTexture::s_TexStates[nTState];
-                        //TS.SetFilterMode(...); // already set up
-                        TS.SetClampMode(TADDR_CLAMP, TADDR_CLAMP, TADDR_CLAMP);
-                        nTState = CTexture::GetTexState(TS);
-                    }
-
-                    if (CRenderer::CV_r_texNoAnisoAlphaTest && (rd->m_RP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_ALPHATEST]))
-                    {
-                    
-                        STexState TS = CTexture::s_TexStates[nTState];
-                        if (TS.m_nAnisotropy > 1)
-                        {
-                            TS.m_nAnisotropy = 1;
-                            TS.SetFilterMode(FILTER_TRILINEAR);
-                            nTState = CTexture::GetTexState(TS);
-                        }
-                    }
-                }
-
-                tx->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-            }
-            else 
-            {
-                // Allow render elements to set their own samplers
-                IRenderElement* pRE = rd->m_RP.m_pRE;
-                if (pRE && pRE->mfSetSampler(nCustomID, nTUnit, nTState, nTexMaterialSlot, nSUnit))
-                {
-                    continue;
-                }
-
-                switch (nCustomID)
-                {
-                case TO_FROMRE0:
-                case TO_FROMRE1:
-                {
-                    if (rd->m_RP.m_pRE)
-                    {
-                        nCustomID = rd->m_RP.m_pRE->GetCustomTexBind(nCustomID - TO_FROMRE0);
-                    }
-                    else
-                    {
-                        nCustomID = rd->m_RP.m_RECustomTexBind[nCustomID - TO_FROMRE0];
-                    }
-                    if (nCustomID < 0)
-                    {
-                        break;
-                    }
-
-                    CTexture* pTex = CTexture::GetByID(nCustomID);
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                }
-                break;
-
-                case TO_FROMRE0_FROM_CONTAINER:
-                case TO_FROMRE1_FROM_CONTAINER:
-                {
-                    // take render element from vertex container render mesh if available
-                    IRenderElement* _pRE = sGetContainerRE0(rd->m_RP.m_pRE);
-                    if (_pRE)
-                    {
-                        nCustomID = _pRE->GetCustomTexBind(nCustomID - TO_FROMRE0_FROM_CONTAINER);
-                    }
-                    else
-                    {
-                        nCustomID = rd->m_RP.m_RECustomTexBind[nCustomID - TO_FROMRE0_FROM_CONTAINER];
-                    }
-                    if (nCustomID < 0)
-                    {
-                        break;
-                    }
-                    CTexture::ApplyForID(nTUnit, nCustomID, nTState, nSUnit);
-                }
-                break;
-
-                case TO_ZTARGET_MS:
-                {
-                    CTexture* pTex = CTexture::s_ptexZTarget;
-                    assert(pTex);
-                    if (pTex)
-                    {
-                        pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nTUnit, SResourceView::DefaultViewMS);
-                    }
-                }
-                break;
-
-                case TO_SCENE_NORMALMAP_MS:
-                case TO_SCENE_NORMALMAP:
-                {
-                    CTexture* pTex = CTexture::s_ptexSceneNormalsMap;
-                    if (sCanSet(pSM, pTex))
-                    {
-                        if (nCustomID != TO_SCENE_NORMALMAP_MS)
-                        {
-                            pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView);
-                        }
-                        else
-                        {
-                            pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nTUnit, SResourceView::DefaultViewMS);
-                        }
-                    }
-                }
-                break;
-
-                case TO_SHADOWID0:
-                case TO_SHADOWID1:
-                case TO_SHADOWID2:
-                case TO_SHADOWID3:
-                case TO_SHADOWID4:
-                case TO_SHADOWID5:
-                case TO_SHADOWID6:
-                case TO_SHADOWID7:
-                {
-                    const int nShadowMapNum = nCustomID - TO_SHADOWID0;
-                    nCustomID = rd->m_RP.m_ShadowCustomTexBind[nShadowMapNum];
-
-                    if (nCustomID < 0)
-                    {
-                        break;
-                    }
-
-                    if (nTState >= 0 && nTState < CTexture::s_TexStates.size())
-                    {
-                        //force  MinFilter = Linear; MagFilter = Linear; for HW_PCF_FILTERING
-                        STexState TS = CTexture::s_TexStates[nTState];
-                        TS.m_pDeviceState = NULL;
-                        TS.SetClampMode(TADDR_CLAMP, TADDR_CLAMP, TADDR_CLAMP);
-
-                        const bool bComparisonSampling = rd->m_RP.m_ShadowCustomComparisonSampling[nShadowMapNum];
-                        if (bComparisonSampling)
-                        {
-                            TS.SetFilterMode(FILTER_LINEAR);
-                            TS.SetComparisonFilter(true);
-                        }
-                        else
-                        {
-                            TS.SetFilterMode(FILTER_POINT);
-                            TS.SetComparisonFilter(false);
-                        }
-
-                        nTState = CTexture::GetTexState(TS);
-                    }
-
-                    CTexture* tex = CTexture::GetByID(nCustomID);
-                    tex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                }
-                break;
-
-
-                case TO_SHADOWMASK:
-                {
-                    CTexture* pTex = CTexture::IsTextureExist(CTexture::s_ptexShadowMask)
-                        ? CTexture::s_ptexShadowMask
-                        : CTextureManager::Instance()->GetBlackTexture();
-
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                }
-                break;
-
-                case TO_SCENE_DIFFUSE_ACC_MS:
-                case TO_SCENE_DIFFUSE_ACC:
-                {
-                    const uint32 nLightsCount = CDeferredShading::Instance().GetLightsCount();
-                    CTexture* pTex = nLightsCount ? CTexture::s_ptexCurrentSceneDiffuseAccMap : CTextureManager::Instance()->GetBlackTexture();
-                    if (sCanSet(pSM, pTex))
-                    {
-                        if (!(nLightsCount && nCustomID == TO_SCENE_DIFFUSE_ACC_MS))
-                        {
-                            pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView);
-                        }
-                        else
-                        {
-                            pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nTUnit, SResourceView::DefaultViewMS);
-                        }
-                    }
-                }
-                break;
-
-                case TO_SCENE_SPECULAR_ACC_MS:
-                case TO_SCENE_SPECULAR_ACC:
-                {
-                    const uint32 nLightsCount = CDeferredShading::Instance().GetLightsCount();
-                    CTexture* pTex = nLightsCount ? CTexture::s_ptexSceneSpecularAccMap : CTextureManager::Instance()->GetBlackTexture();
-                    if (sCanSet(pSM, pTex))
-                    {
-                        if (!(nLightsCount && nCustomID == TO_SCENE_SPECULAR_ACC_MS))
-                        {
-                            pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView);
-                        }
-                        else
-                        {
-                            pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nTUnit, SResourceView::DefaultViewMS);
-                        }
-                    }
-                }
-                break;
-
-                case TO_SCENE_TARGET:
-                {
-                    CTexture* tex = CTexture::s_ptexCurrSceneTarget;
-                    if (!tex)
-                    {
-                        tex = CTextureManager::Instance()->GetWhiteTexture();
-                    }
-
-                    tex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                }
-                break;
-
-                case TO_DOWNSCALED_ZTARGET_FOR_AO:
-                {
-                    assert(CTexture::s_ptexZTargetScaled);
-                    if (CTexture::s_ptexZTargetScaled)
-                    {
-                        CTexture::s_ptexZTargetScaled->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    }
-                }
-                break;
-
-                case TO_QUARTER_ZTARGET_FOR_AO:
-                {
-                    assert(CTexture::s_ptexZTargetScaled2);
-                    if (CTexture::s_ptexZTargetScaled2)
-                    {
-                        CTexture::s_ptexZTargetScaled2->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    }
-                }
-                break;
-
-                case TO_FROMOBJ:
-                {
-                    CTexture* pTex = CTextureManager::Instance()->GetBlackTexture();
-                    if (rd->m_RP.m_pCurObject)
-                    {
-                        nCustomID = rd->m_RP.m_pCurObject->m_nTextureID;
-                        if (nCustomID > 0)
-                        {
-                            pTex = CTexture::GetByID(nCustomID);
-                        }
-                    }
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                }
-                break;
-
-                case TO_FROMOBJ_CM:
-                {
-                    SEfResTexture*  overloadTexture = nullptr;
-                    CTexture*       pTex = CTextureManager::Instance()->GetNoTextureCM();
-                    if (rd->m_RP.m_pCurObject)
-                    {
-                        nCustomID = rd->m_RP.m_pCurObject->m_nTextureID;
-                        if (nCustomID > 0)
-                        {
-                            pTex = CTexture::GetByID(nCustomID);
-                        }
-                        else if ((nTUnit < EFTT_MAX) && pSR && pSR->GetTextureResource(EFTT_ENV))
-                        {
-                            overloadTexture = pSR->GetTextureResource(EFTT_ENV);
-                            // Perhaps user wanted a specific cubemap instead?
-                            // This should still be allowed even if the sampler is "TO_FROMOBJ_CM" as the
-                            // end user can still select specific cubemaps from the material editor.
-                            CTexture* tex = overloadTexture->m_Sampler.m_pTex;
-                            if (tex)
-                            {
-                                tex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                            }
-                            nCustomID = -1;
-                        }
-                        else if (nCustomID == 0)
-                        {
-                            pTex = CTextureManager::Instance()->GetNoTextureCM();
-                        }
-                    }
-                    if (nCustomID >= 0)
-                    {
-                        pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    }
-                }
-                break;
-
-                case TO_RT_2D:
-                {
-                    SHRenderTarget* pRT = pSM->m_pTarget ? pSM->m_pTarget : pSamp->m_pTarget;
-                    SEnvTexture* pEnvTex = pRT->GetEnv2D();
-                    //assert(pEnvTex->m_pTex);
-                    if (pEnvTex && pEnvTex->m_pTex)
-                    {
-                        pEnvTex->m_pTex->Apply(nTUnit, nTState);
-                    }
-                    else
-                    {
-                        CTextureManager::Instance()->GetWhiteTexture()->Apply(nTUnit, nTState);
-                    }
-                }
-                break;
-
-                case TO_WATEROCEANMAP:
-                    CTexture::s_ptexWaterOcean->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                    break;
-
-                case TO_WATERVOLUMEREFLMAP:
-                {
-                    const uint32 nCurrWaterVolID = gRenDev->GetFrameID(false) % 2;
-                    CTexture* pTex = CTexture::s_ptexWaterVolumeRefl[nCurrWaterVolID] ? CTexture::s_ptexWaterVolumeRefl[nCurrWaterVolID] : CTextureManager::Instance()->GetBlackTexture();
-                    pTex->Apply(nTUnit, CTexture::GetTexState(STexState(FILTER_ANISO16X, true)), nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                }
-                break;
-
-                case TO_WATERVOLUMEREFLMAPPREV:
-                {
-                    const uint32 nPrevWaterVolID = (gRenDev->GetFrameID(false) + 1) % 2;
-
-                    CTexture* pTex = CTexture::s_ptexWaterVolumeRefl[nPrevWaterVolID] ? CTexture::s_ptexWaterVolumeRefl[nPrevWaterVolID] : CTextureManager::Instance()->GetBlackTexture();
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                }
-                break;
-
-                case TO_WATERVOLUMECAUSTICSMAP:
-                {
-                    const uint32 nCurrWaterVolID = gRenDev->GetFrameID(false) % 2;
-                    CTexture* pTex = CTexture::s_ptexWaterCaustics[nCurrWaterVolID];
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                }
-                break;
-
-                case TO_WATERVOLUMECAUSTICSMAPTEMP:
-                {
-                    const uint32 nPrevWaterVolID = (gRenDev->GetFrameID(false) + 1) % 2;
-                    CTexture* pTex = CTexture::s_ptexWaterCaustics[nPrevWaterVolID];
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                }
-                break;
-
-                case TO_WATERVOLUMEMAP:
-                {
-                    if (CTexture::s_ptexWaterVolumeDDN)
-                    {
-                        CEffectParam* pParam = PostEffectMgr()->GetByName("WaterVolume_Amount");
-                        assert(pParam && "Parameter doesn't exist");
-
-                        // Activate puddle generation
-                        if (pParam)
-                        {
-                            pParam->SetParam(1.0f);
-                        }
-
-                        CTexture::s_ptexWaterVolumeDDN->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                    }
-                    else
-                    {
-                        CTextureManager::Instance()->GetDefaultTexture("FlatBump")->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                    }
-                }
-                break;
-
-                case TO_WATERRIPPLESMAP:
-                {
-                    if (CTexture::s_ptexWaterRipplesDDN)
-                    {
-                        CTexture::s_ptexWaterRipplesDDN->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                    }
-                    else
-                    {
-                        CTextureManager::Instance()->GetWhiteTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                    }
-                }
-                break;
-
-                case TO_BACKBUFFERSCALED_D2:
-                case TO_BACKBUFFERSCALED_D4:
-                case TO_BACKBUFFERSCALED_D8:
-                {
-                    const uint32 nTargetID = nCustomID - TO_BACKBUFFERSCALED_D2;
-                    CTexture* pTex = CTexture::s_ptexBackBufferScaled[nTargetID] ? CTexture::s_ptexBackBufferScaled[nTargetID] : CTextureManager::Instance()->GetBlackTexture();
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                }
-                break;
-
-                case TO_CLOUDS_LM:
-                {
-                    const bool setupCloudShadows = rd->m_bShadowsEnabled && rd->m_bCloudShadowsEnabled;
-                    if (setupCloudShadows)
-                    {
-                        // cloud shadow map
-                        CTexture* pCloudShadowTex(rd->GetCloudShadowTextureId() > 0 ? CTexture::GetByID(rd->GetCloudShadowTextureId()) : CTextureManager::Instance()->GetWhiteTexture());
-                        assert(pCloudShadowTex);
-
-                        STexState pTexStateLinearClamp;
-                        pTexStateLinearClamp.SetFilterMode(FILTER_LINEAR);
-                        pTexStateLinearClamp.SetClampMode(false, false, false);
-                        CTexture::GetTexState(pTexStateLinearClamp);
-
-                        pCloudShadowTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                    }
-                    else
-                    {
-                        CTextureManager::Instance()->GetWhiteTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, SResourceView::DefaultView, eSHClass);
-                    }
-
-                    break;
-                }
-
-                case TO_MIPCOLORS_DIFFUSE:
-                    CTextureManager::Instance()->GetWhiteTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    break;
-
-                case TO_BACKBUFFERMAP:
-                {
-                    CTexture* pBackBufferTex = CTexture::s_ptexBackBuffer;
-                    if (pBackBufferTex)
-                    {
-                        pBackBufferTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    }
-                }
-                break;
-
-                case TO_HDR_MEASURED_LUMINANCE:
-                {
-                    CTexture::s_ptexHDRMeasuredLuminance[gRenDev->RT_GetCurrGpuID()]->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                }
-                break;
-
-                case TO_VOLOBJ_DENSITY:
-                case TO_VOLOBJ_SHADOW:
-                {
-                    bool texBound(false);
-                    IRenderElement* _pRE(rd->m_RP.m_pRE);
-                    if (_pRE && _pRE->mfGetType() == eDATA_VolumeObject)
-                    {
-                        CREVolumeObject* pVolObj((CREVolumeObject*)_pRE);
-                        int texId(0);
-                        if (pVolObj)
-                        {
-                            switch (nCustomID)
-                            {
-                            case TO_VOLOBJ_DENSITY:
-                                if (pVolObj->m_pDensVol)
-                                {
-                                    texId = pVolObj->m_pDensVol->GetTexID();
-                                }
-                                break;
-                            case TO_VOLOBJ_SHADOW:
-                                if (pVolObj->m_pShadVol)
-                                {
-                                    texId = pVolObj->m_pShadVol->GetTexID();
-                                }
-                                break;
-                            default:
-                                assert(0);
-                                break;
-                            }
-                        }
-                        CTexture* pTex(texId > 0 ? CTexture::GetByID(texId) : 0);
-                        if (pTex)
-                        {
-                            pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                            texBound = true;
-                        }
-                    }
-                    if (!texBound)
-                    {
-                        CTextureManager::Instance()->GetWhiteTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    }
-                    break;
-                }
-
-                case TO_COLORCHART:
-                {
-                    CColorGradingControllerD3D* pCtrl = gcpRendD3D->m_pColorGradingControllerD3D;
-                    if (pCtrl)
-                    {
-                        CTexture* pTex = pCtrl->GetColorChart();
-                        if (pTex)
-                        {
-                            const static int texStateID = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-                            pTex->Apply(nTUnit, texStateID);
-                            break;
-                        }
-                    }
-                    CRenderer::CV_r_colorgrading_charts = 0;
-                    CTextureManager::Instance()->GetWhiteTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    break;
-                }
-
-                case TO_SKYDOME_MIE:
-                case TO_SKYDOME_RAYLEIGH:
-                {
-                    IRenderElement* _pRE = rd->m_RP.m_pRE;
-                    if (_pRE && _pRE->mfGetType() == eDATA_HDRSky)
-                    {
-                        CTexture* pTex = nCustomID == TO_SKYDOME_MIE ? ((CREHDRSky*)_pRE)->m_pSkyDomeTextureMie : ((CREHDRSky*)_pRE)->m_pSkyDomeTextureRayleigh;
-                        if (pTex)
-                        {
-                            pTex->Apply(nTUnit, -1, nTexMaterialSlot, nSUnit);
-                            break;
-                        }
-                    }
-                    CTextureManager::Instance()->GetBlackTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    break;
-                }
-
-                case TO_SKYDOME_MOON:
-                {
-                    IRenderElement* _pRE = rd->m_RP.m_pRE;
-                    if (_pRE && _pRE->mfGetType() == eDATA_HDRSky)
-                    {
-                        CREHDRSky* pHDRSky = (CREHDRSky*)_pRE;
-                        CTexture* pMoonTex(pHDRSky->m_moonTexId > 0 ? CTexture::GetByID(pHDRSky->m_moonTexId) : 0);
-                        if (pMoonTex)
-                        {
-                            const static int texStateID = CTexture::GetTexState(STexState(FILTER_BILINEAR, TADDR_BORDER, TADDR_BORDER, TADDR_BORDER, 0));
-                            pMoonTex->Apply(nTUnit, texStateID, nTexMaterialSlot, nSUnit);
-                            break;
-                        }
-                    }
-                    CTextureManager::Instance()->GetBlackTexture()->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    break;
-                }
-
-                case TO_VOLFOGSHADOW_BUF:
-                {
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-                    const bool enabled = gRenDev->m_bVolFogShadowsEnabled;
-                    assert(enabled);
-                    CTexture* pTex = enabled ? CTexture::s_ptexVolFogShadowBuf[0] : CTextureManager::Instance()->GetWhiteTexture();
-                    pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    break;
-#else
-                    assert(0);
-                    break;
-#endif
-                }
-
-                case TO_DEFAULT_ENVIRONMENT_PROBE:
-                {
-                    // The environment probe entity render object requires that a texture that is bound to a sampler via shader declaration be overloaded in code.
-                    // This is not supported by default, and changing the behavior generically breaks other systems that depend on this behavior.
-                    // For the default environment probe texture declaration, we need to check if someone has tried to bind a new texture to the shader
-                    // (which would happen either via C++ code or by overloading the environment map slot on the envcube.mtl material)
-                    SEfResTexture*      pTextureRes = pSR ? pSR->GetTextureResource(EFTT_ENV) : nullptr;
-
-                    if ((nSUnit == nTUnit) && (nTUnit < EFTT_MAX) && 
-                        pTextureRes && pTextureRes->m_Sampler.m_pTex &&
-                        pTextureRes->m_Sampler.m_pTex->GetDevTexture())
-                    {
-                        SEfResTexture*  overloadTexture = pTextureRes;
-                        overloadTexture->m_Sampler.m_pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                    }
-                    else 
-                    {
-                        CTexture* defaultEnvironmentProbe = CTextureManager::Instance()->GetDefaultTexture("DefaultProbeCM");
-                        if (defaultEnvironmentProbe)
-                        {
-                            defaultEnvironmentProbe->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                        }
-                    }
-                }
-                break;
-
-                default:
-                {
-#if defined(FEATURE_SVO_GI)
-                    if (CSvoRenderer::SetSamplers(nCustomID, eSHClass, nTUnit, nTState, nTexMaterialSlot, nSUnit))
-                    {
-                        break;
-                    }
-#endif
-                    tx->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit);
-                }
-                break;
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-//------------------------------------------------------------------------------
-// Going over the samplers and making sure that dependent slots exist and
-// represent the same texture (normals and smoothness/
-// [Shader System] - TO DO: 
-// 1. Seems like dependency on second smoothness is missing
-// 2. Move this to be data driven based on flagged slots
-//------------------------------------------------------------------------------
-bool CHWShader_D3D::mfUpdateSamplers(CShader* shader)
-{
-    DETAILED_PROFILE_MARKER("mfUpdateSamplers");
-    FUNCTION_PROFILER_RENDER_FLAT
-    if (!m_pCurInst)
-    {
-        return false;
-    }
-
-    SHWSInstance*       pInst = m_pCurInst;
-    CShaderResources*   pSRes = gRenDev->m_RP.m_pShaderResources;
-    if (!pInst->m_pSamplers.size() || !pSRes)
-    {
-        return true;
-    }
-
-    CD3D9Renderer*                      rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    SThreadInfo& RESTRICT_REFERENCE     rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-    STexSamplerRT*                      pSamp = &pInst->m_pSamplers[0];
-
-    const uint32                        samplerCount = pInst->m_pSamplers.size();
-    bool                                bDiffuseSlotUpdated = false;
-
-    if (pSRes)
-    {
-        AZStd::map<uint16, SEfResTexture*>  UpdatedTMap;
-
-        for (AZ::u32 i = 0; i < samplerCount; i++, pSamp++)
-        {
-            CTexture* tx = pSamp->m_pTex;
-            if (!tx)
-            {
-                continue;
-            }
-
-            //  [Shader System TO DO] - replace with proper data driven code reflected from the shaders 
-            if (tx >= &(*CTexture::s_ShaderTemplates)[0] && tx <= &(*CTexture::s_ShaderTemplates)[EFTT_MAX - 1])
-            {
-                int             nSlot = (int)(tx - &(*CTexture::s_ShaderTemplates)[0]);
-                int16           replacementSlot = -1;
-                SEfResTexture*  pTextureRes = pSRes->GetTextureResource(nSlot);
-
-                if (pTextureRes)
-                {
-                    // Default inserting and indexing - because we force some slots (Normal, Diffuse..), this 
-                    // operation might be done twice (same data). 
-                    UpdatedTMap[nSlot] = pTextureRes;   
-
-                    //----------------------------------------------------------
-                    // Force adding samplers / textures if they indirectly assumed to be used 
-                    //----------------------------------------------------------
-                    //  [Shader System TO DO] - replace with data driven reflection (i.e. a texture should be 
-                    // able to specify that it is driven by another texture and not hard code it)
-                    if (nSlot == EFTT_HEIGHT || nSlot == EFTT_SMOOTHNESS)
-                    {
-                        replacementSlot = EFTT_NORMALS;
-                    }
-                    else if (nSlot == EFTT_DIFFUSE)
-                    {   // marked as updated - no need to look for replacement 
-                        bDiffuseSlotUpdated = true;
-                    }
-
-                    // Force uploading the diffuse when the normal already exist (Really?)
-                    if ((rTI.m_PersFlags & RBPF_ZPASS) && (nSlot == EFTT_NORMALS) && !bDiffuseSlotUpdated)
-                    {
-                        replacementSlot = EFTT_DIFFUSE;
-                    }
- 
-                    // Using the following block we can now drive forced slots to be data driven!
-                    if (replacementSlot != -1)
-                    {
-                        SEfResTexture*  replacementTexRes = pSRes->GetTextureResource(replacementSlot);
-                        if (replacementTexRes)
-                        {
-                            UpdatedTMap[replacementSlot] = replacementTexRes;   // inserting and indexing
-                        }
-/*                      [Shader System] - this is a good warning, however it will repeat every frame and drop fps.
-                        else
-                        {
-                            AZ_Warning("ShadersSystem", false, "CHWShader_D3D::mfUpdateSamplers - [%s] using texture slot %d without existing forced texture %d",
-                                pSRes->m_szMaterialName, nSlot, replacementSlot);
-                        }
-*/
-                    }
-
-                }
-            }
-        }
-
-        // Next run over all existing textures and explore if they have dynamic modulators 
-        // which will force shader resource constants update.
-        bool    bNeedsConstantUpdate = false;
-        for (auto iter = UpdatedTMap.begin(); iter != UpdatedTMap.end(); ++iter)
-        {
-            SEfResTexture*  pTexture = iter->second;
-
-            pTexture->Update(iter->first);
-            bNeedsConstantUpdate |= pTexture->IsNeedTexTransform();
-        }
-
-        // Rebuild shader resources - there was at least one transform modulator request
-        if (bNeedsConstantUpdate)
-        {
-            pSRes->Rebuild(shader);
-        }
-    }
-
-    return true;
-}
-
-
-bool CHWShader_D3D::mfAddGlobalTexture(SCGTexture& Texture)
-{
-    DETAILED_PROFILE_MARKER("mfAddGlobalTexture");
-    uint32 i;
-    if (!Texture.m_bGlobal)
-    {
-        return false;
-    }
-    for (i = 0; i < s_PF_Textures.size(); i++)
-    {
-        SCGTexture* pP = &s_PF_Textures[i];
-        if (pP->m_pTexture == Texture.m_pTexture)
-        {
-            break;
-        }
-    }
-    if (i == s_PF_Textures.size())
-    {
-        s_PF_Textures.push_back(Texture);
-        return true;
-    }
-    return false;
-}
-
-
-bool CHWShader_D3D::mfAddGlobalSampler(STexSamplerRT& Sampler)
-{
-    DETAILED_PROFILE_MARKER("mfAddGlobalSampler");
-    uint32 i;
-    if (!Sampler.m_bGlobal)
-    {
-        return false;
-    }
-    for (i = 0; i < s_PF_Samplers.size(); i++)
-    {
-        STexSamplerRT* pP = &s_PF_Samplers[i];
-        if (pP->m_pTex == Sampler.m_pTex)
-        {
-            break;
-        }
-    }
-    if (i == s_PF_Samplers.size())
-    {
-        s_PF_Samplers.push_back(Sampler);
-        assert(s_PF_Samplers.size() <= MAX_PF_SAMPLERS);
-        return true;
-    }
-    return false;
-}
-
-
-Vec4 CHWShader_D3D::GetVolumetricFogParams()
-{
-    DETAILED_PROFILE_MARKER("GetVolumetricFogParams");
-    return sGetVolumetricFogParams(gcpRendD3D);
-}
-
-Vec4 CHWShader_D3D::GetVolumetricFogRampParams()
-{
-    DETAILED_PROFILE_MARKER("GetVolumetricFogRampParams");
-    return sGetVolumetricFogRampParams();
-}
-
-void CHWShader_D3D::GetFogColorGradientConstants(Vec4& fogColGradColBase, Vec4& fogColGradColDelta)
-{
-    DETAILED_PROFILE_MARKER("GetFogColorGradientConstants");
-    sGetFogColorGradientConstants(fogColGradColBase, fogColGradColDelta);
-};
-
-Vec4 CHWShader_D3D::GetFogColorGradientRadial()
-{
-    DETAILED_PROFILE_MARKER("GetFogColorGradientRadial");
-    return sGetFogColorGradientRadial(gcpRendD3D);
-}
-
-Vec4 SBending::GetShaderConstants(float realTime) const
-{
-    Vec4 result(ZERO);
-    if ((m_vBending.x * m_vBending.x + m_vBending.y * m_vBending.y) > 0.0f)
-    {
-        const Vec2& vBending = m_vBending;
-        Vec2 vAddBending(ZERO);
-
-        if (m_Waves[0].m_Amp)
-        {
-            // Fast version of CShaderMan::EvalWaveForm (for bending)
-            const SWaveForm2& RESTRICT_REFERENCE wave0 = m_Waves[0];
-            const SWaveForm2& RESTRICT_REFERENCE wave1 = m_Waves[1];
-            const float* const __restrict pSinTable = gcpRendD3D->m_RP.m_tSinTable;
-
-            int val0 = (int)((realTime * wave0.m_Freq + wave0.m_Phase) * (float)SRenderPipeline::sSinTableCount);
-            int val1 = (int)((realTime * wave1.m_Freq + wave1.m_Phase) * (float)SRenderPipeline::sSinTableCount);
-
-            float sinVal0 = pSinTable[val0 & (SRenderPipeline::sSinTableCount - 1)];
-            float sinVal1 = pSinTable[val1 & (SRenderPipeline::sSinTableCount - 1)];
-            vAddBending.x = wave0.m_Amp * sinVal0 + wave0.m_Level;
-            vAddBending.y = wave1.m_Amp * sinVal1 + wave1.m_Level;
-        }
-
-        result.x = vAddBending.x * 50.f + vBending.x;
-        result.y = vAddBending.y * 50.f + vBending.y;
-        result.z = vBending.GetLength() * 2.f;
-        result *= m_fMainBendingScale;
-        result.w = (vAddBending + vBending).GetLength() * 0.3f;
-    }
-
-    return result;
-}
-
-void SBending::GetShaderConstantsStatic([[maybe_unused]] float realTime, Vec4* pBendInfo) const
-{
-    pBendInfo[0] = Vec4(ZERO);
-    pBendInfo[0].x = m_Waves[0].m_Freq;
-    pBendInfo[0].y = m_Waves[0].m_Amp;
-    pBendInfo[0].z = m_Waves[1].m_Freq;
-    pBendInfo[0].w = m_Waves[1].m_Amp;
-    pBendInfo[1].x = m_vBending.x;
-    pBendInfo[1].y = m_vBending.y;
-    pBendInfo[1].z = m_vBending.GetLength();
-    pBendInfo[1].w = m_fMainBendingScale;
-}
-
-#pragma endregion everything in this block is related to shader parameters
-
-int SD3DShader::Release(EHWShaderClass eSHClass, int nSize)
-{
-    m_nRef--;
-    if (m_nRef)
-    {
-        return m_nRef;
-    }
-    void* pHandle = m_pHandle;
-    delete this;
-    if (!pHandle)
-    {
-        return 0;
-    }
-    if (eSHClass == eHWSC_Pixel)
-    {
-        CHWShader_D3D::s_nDevicePSDataSize -= nSize;
-    }
-    else
-    {
-        CHWShader_D3D::s_nDeviceVSDataSize -= nSize;
-    }
-
-    if (eSHClass == eHWSC_Pixel)
-    {
-        return ((ID3D11PixelShader*)pHandle)->Release();
-    }
-    else
-    if (eSHClass == eHWSC_Vertex)
-    {
-        return ((ID3D11VertexShader*)pHandle)->Release();
-    }
-    else
-    if (eSHClass == eHWSC_Geometry)
-    {
-        return ((ID3D11GeometryShader*)pHandle)->Release();
-    }
-    else
-    if (eSHClass == eHWSC_Hull)
-    {
-        return ((ID3D11HullShader*)pHandle)->Release();
-    }
-    else
-    if (eSHClass == eHWSC_Compute)
-    {
-        return ((ID3D11ComputeShader*)pHandle)->Release();
-    }
-    else
-    if (eSHClass == eHWSC_Domain)
-    {
-        return ((ID3D11DomainShader*)pHandle)->Release();
-    }
-    else
-    {
-        assert(0);
-        return 0;
-    }
-}
-
-void CHWShader_D3D::SHWSInstance::Release(SShaderDevCache* pCache, [[maybe_unused]] bool bReleaseData)
-{
-    if (m_nParams[0] >= 0)
-    {
-        CGParamManager::FreeParametersGroup(m_nParams[0]);
-    }
-    if (m_nParams[1] >= 0)
-    {
-        CGParamManager::FreeParametersGroup(m_nParams[1]);
-    }
-    if (m_nParams_Inst >= 0)
-    {
-        CGParamManager::FreeParametersGroup(m_nParams_Inst);
-    }
-
-    int nCount = -1;
-    if (m_Handle.m_pShader)
-    {
-        if (m_eClass == eHWSC_Pixel)
-        {
-            SD3DShader* pPS = m_Handle.m_pShader;
-            if (pPS)
-            {
-                nCount = m_Handle.Release(m_eClass, m_nDataSize);
-                if (!nCount && CHWShader::s_pCurPS == pPS)
-                {
-                    CHWShader::s_pCurPS = NULL;
-                }
-            }
-        }
-        else
-        if (m_eClass == eHWSC_Vertex)
-        {
-            SD3DShader* pVS = m_Handle.m_pShader;
-            if (pVS)
-            {
-                nCount = m_Handle.Release(m_eClass, m_nDataSize);
-                if (!nCount && CHWShader::s_pCurVS == pVS)
-                {
-                    CHWShader::s_pCurVS = NULL;
-                }
-            }
-        }
-        else
-        if (m_eClass == eHWSC_Geometry)
-        {
-            SD3DShader* pGS = m_Handle.m_pShader;
-            if (pGS)
-            {
-                nCount = m_Handle.Release(m_eClass, m_nDataSize);
-                if (!nCount && CHWShader::s_pCurGS == pGS)
-                {
-                    CHWShader::s_pCurGS = NULL;
-                }
-            }
-        }
-        else
-        if (m_eClass == eHWSC_Hull)
-        {
-            SD3DShader* pHS = m_Handle.m_pShader;
-            if (pHS)
-            {
-                nCount = m_Handle.Release(m_eClass, m_nDataSize);
-                if (!nCount && CHWShader::s_pCurHS == pHS)
-                {
-                    CHWShader::s_pCurHS = NULL;
-                }
-            }
-        }
-        else
-        if (m_eClass == eHWSC_Compute)
-        {
-            SD3DShader* pCS = m_Handle.m_pShader;
-            if (pCS)
-            {
-                nCount = m_Handle.Release(m_eClass, m_nDataSize);
-                if (!nCount && CHWShader::s_pCurCS == pCS)
-                {
-                    CHWShader::s_pCurCS = NULL;
-                }
-            }
-        }
-        else
-        if (m_eClass == eHWSC_Domain)
-        {
-            SD3DShader* pDS = m_Handle.m_pShader;
-            if (pDS)
-            {
-                nCount = m_Handle.Release(m_eClass, m_nDataSize);
-                if (!nCount && CHWShader::s_pCurDS == pDS)
-                {
-                    CHWShader::s_pCurDS = NULL;
-                }
-            }
-        }
-    }
-
-    if (m_pShaderData)
-    {
-        delete[] (char*)m_pShaderData;
-        m_pShaderData = NULL;
-    }
-
-    if (!nCount && pCache && !pCache->m_DeviceShaders.empty())
-    {
-        pCache->m_DeviceShaders.erase(m_DeviceObjectID);
-    }
-    m_Handle.m_pShader = NULL;
-}
-
-void CHWShader_D3D::SHWSInstance::GetInstancingAttribInfo(uint8 Attributes[32], int32& nUsedAttr, int& nInstAttrMask)
-{
-    Attributes[0] = (byte)m_nInstMatrixID;
-    for (int32 i = 1; i < nUsedAttr; ++i)
-    {
-        Attributes[i] = Attributes[0] + i;
-    }
-
-    nInstAttrMask = 0x7 << m_nInstMatrixID;
-    if (m_nParams_Inst >= 0)
-    {
-        SCGParamsGroup& Group = CGParamManager::s_Groups[m_nParams_Inst];
-        uint32 nSize = Group.nParams;
-        for (uint32 j = 0; j < nSize; ++j)
-        {
-            SCGParam* pr = &Group.pParams[j];
-            for (uint32 na = 0; na < (uint32)pr->m_RegisterCount; ++na)
-            {
-                Attributes[nUsedAttr + na] = pr->m_RegisterOffset + na;
-                nInstAttrMask |= 1 << Attributes[nUsedAttr + na];
-            }
-            nUsedAttr += pr->m_RegisterCount;
-        }
-    }
-}
-
-
-void CHWShader_D3D::ShutDown()
-{
-    CCryNameTSCRC Name;
-    SResourceContainer* pRL;
-
-    AzRHI::ConstantBufferCache::GetInstance().Reset();
-
-    uint32 numResourceLeaks = 0;
-
-    // First make sure all HW and FX shaders are released
-    Name = CHWShader::mfGetClassName(eHWSC_Vertex);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* vsh = (CHWShader*)itor->second;
-            if (vsh)
-            {
-                ++numResourceLeaks;
-            }
-        }
-        if (!pRL->m_RMap.size())
-        {
-            pRL->m_RList.clear();
-            pRL->m_AvailableIDs.clear();
-        }
-    }
-
-    Name = CHWShader::mfGetClassName(eHWSC_Pixel);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* psh = (CHWShader*)itor->second;
-            if (psh)
-            {
-                ++numResourceLeaks;
-            }
-        }
-        if (!pRL->m_RMap.size())
-        {
-            pRL->m_RList.clear();
-            pRL->m_AvailableIDs.clear();
-        }
-    }
-
-    Name = CShader::mfGetClassName();
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CShader* sh = (CShader*)itor->second;
-            if (!sh->m_DerivedShaders)
-            {
-                numResourceLeaks++;
-            }
-        }
-        if (!pRL->m_RMap.size())
-        {
-            pRL->m_RList.clear();
-            pRL->m_AvailableIDs.clear();
-        }
-    }
-
-    if (numResourceLeaks > 0)
-    {
-        iLog->LogWarning("Detected shader resource leaks on shutdown");
-    }
-
-    stl::free_container(s_PF_Samplers);
-
-    gRenDev->m_cEF.m_Bin.mfReleaseFXParams();
-
-    while (!m_ShaderCache.empty())
-    {
-        SShaderCache* pC = m_ShaderCache.begin()->second;
-        SAFE_RELEASE(pC);
-    }
-    m_ShaderCacheList.clear();
-    g_SelectedTechs.clear();
-#if !defined(_RELEASE)
-    s_ErrorsLogged.clear();
-#endif
-    CGParamManager::Shutdown();
-}
-
-CHWShader* CHWShader::mfForName(const char* name, const char* nameSource, uint32 CRC32, const char* szEntryFunc, EHWShaderClass eClass, TArray<uint32>& SHData, FXShaderToken* pTable, uint32 dwType, CShader* pFX, uint64 nMaskGen, uint64 nMaskGenFX)
-{
-    //  LOADING_TIME_PROFILE_SECTION(iSystem);
-    if (!name || !name[0])
-    {
-        return NULL;
-    }
-
-    CHWShader_D3D* pSH = NULL;
-    stack_string strName = name;
-    CCryNameTSCRC className = mfGetClassName(eClass);
-    stack_string AddStr;
-
-    if (nMaskGen)
-    {
-        strName += AddStr.Format("(GL_%llx)", nMaskGen);
-    }
-
-    if (pFX->m_maskGenStatic)
-    {
-        strName += AddStr.Format("(ST_%llx)", pFX->m_maskGenStatic);
-    }
-
-    strName += AddStr.Format( GetShaderLanguageResourceName() );
-
-    CCryNameTSCRC Name = strName.c_str();
-    CBaseResource* pBR = CBaseResource::GetResource(className, Name, false);
-    if (!pBR)
-    {
-        pSH = new CHWShader_D3D;
-        pSH->m_Name = strName.c_str();
-        pSH->m_NameSourceFX = nameSource;
-        pSH->Register(className, Name);
-        pSH->m_EntryFunc = szEntryFunc;
-        pSH->mfFree(CRC32);
-
-        // do we want to use lookup table for faster searching of shaders
-        if (CRenderer::CV_r_shadersuseinstancelookuptable)
-        {
-            pSH->m_bUseLookUpTable = true;
-        }
-    }
-    else
-    {
-        pSH = (CHWShader_D3D*)pBR;
-        pSH->AddRef();
-        if (pSH->m_CRC32 == CRC32)
-        {
-            if (pTable && CRenderer::CV_r_shadersAllowCompilation)
-            {
-                FXShaderToken* pMap = pTable;
-                TArray<uint32>* pData = &SHData;
-                pSH->mfGetCacheTokenMap(pMap, pData, pSH->m_nMaskGenShader);
-            }
-            return pSH;
-        }
-        pSH->mfFree(CRC32);
-        pSH->m_CRC32 = CRC32;
-    }
-
-    if (CParserBin::m_bEditable)
-    {
-        if (pTable)
-        {
-            pSH->m_TokenTable = *pTable;
-        }
-        pSH->m_TokenData = SHData;
-    }
-
-    pSH->m_dwShaderType = dwType;
-    pSH->m_eSHClass = eClass;
-    pSH->m_nMaskGenShader = nMaskGen;
-    pSH->m_nMaskGenFX = nMaskGenFX;
-    pSH->m_maskGenStatic = pFX->m_maskGenStatic;
-    pSH->m_CRC32 = CRC32;
-
-    pSH->mfConstructFX(pTable, &SHData);
-
-    return pSH;
-}
-
-
-void CHWShader_D3D::SetTokenFlags(uint32 nToken)
-{
-    switch (nToken)
-    {
-    case eT__LT_LIGHTS:
-        m_Flags |= HWSG_SUPPORTS_LIGHTING;
-        break;
-    case eT__LT_0_TYPE:
-    case eT__LT_1_TYPE:
-    case eT__LT_2_TYPE:
-    case eT__LT_3_TYPE:
-        m_Flags |= HWSG_SUPPORTS_MULTILIGHTS;
-        break;
-    case eT__TT_TEXCOORD_MATRIX:
-    case eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE:
-    case eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE:
-    case eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT:
-    case eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL:
-    case eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM:
-        m_Flags |= HWSG_SUPPORTS_MODIF;
-        break;
-    case eT__VT_TYPE:
-        m_Flags |= HWSG_SUPPORTS_VMODIF;
-        break;
-    case eT__FT_TEXTURE:
-        m_Flags |= HWSG_FP_EMULATION;
-        break;
-    }
-}
-
-uint64 CHWShader_D3D::CheckToken(uint32 nToken)
-{
-    uint64 nMask = 0;
-    SShaderGen* pGen = gRenDev->m_cEF.m_pGlobalExt;
-    uint32 i;
-    for (i = 0; i < pGen->m_BitMask.Num(); i++)
-    {
-        SShaderGenBit* bit = pGen->m_BitMask[i];
-        if (!bit)
-        {
-            continue;
-        }
-
-        if (bit->m_dwToken == nToken)
-        {
-            nMask |= bit->m_Mask;
-            break;
-        }
-    }
-    if (!nMask)
-    {
-        SetTokenFlags(nToken);
-    }
-
-    return nMask;
-}
-
-uint64 CHWShader_D3D::CheckIfExpr_r(uint32* pTokens, uint32& nCur, uint32 nSize)
-{
-    uint64 nMask = 0;
-
-    while (nCur < nSize)
-    {
-        uint32 nToken = pTokens[nCur++];
-        if (nToken == eT_br_rnd_1) // check for '('
-        {
-            uint32 tmpBuf[64];
-            int n = 0;
-            int nD = 0;
-            while (true)
-            {
-                nToken = pTokens[nCur];
-                if (nToken == eT_br_rnd_1) // check for '('
-                {
-                    n++;
-                }
-                else
-                if (nToken == eT_br_rnd_2) // check for ')'
-                {
-                    if (!n)
-                    {
-                        tmpBuf[nD] = 0;
-                        nCur++;
-                        break;
-                    }
-                    n--;
-                }
-                else
-                if (nToken == 0)
-                {
-                    return nMask;
-                }
-                tmpBuf[nD++] = nToken;
-                nCur++;
-            }
-            if (nD)
-            {
-                uint32 nC = 0;
-                nMask |= CheckIfExpr_r(tmpBuf, nC, nSize);
-            }
-        }
-        else
-        {
-            bool bNeg = false;
-            if (nToken == eT_excl)
-            {
-                bNeg = true;
-                nToken = pTokens[nCur++];
-            }
-            nMask |= CheckToken(nToken);
-        }
-        nToken = pTokens[nCur];
-        if (nToken == eT_or)
-        {
-            nCur++;
-            assert (pTokens[nCur] == eT_or);
-            if (pTokens[nCur] == eT_or)
-            {
-                nCur++;
-            }
-        }
-        else
-        if (nToken == eT_and)
-        {
-            nCur++;
-            assert (pTokens[nCur] == eT_and);
-            if (pTokens[nCur] == eT_and)
-            {
-                nCur++;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-    return nMask;
-}
-
-void CHWShader_D3D::mfConstructFX_Mask_RT([[maybe_unused]] FXShaderToken* Table, TArray<uint32>* pSHData)
-{
-    assert(gRenDev->m_cEF.m_pGlobalExt);
-    m_nMaskAnd_RT = 0;
-    m_nMaskOr_RT = 0;
-    if (!gRenDev->m_cEF.m_pGlobalExt)
-    {
-        return;
-    }
-    SShaderGen* pGen = gRenDev->m_cEF.m_pGlobalExt;
-    
-    // Construct mask of all mask bits that are usable for this shader from precache entries. This mask is then ANDed 
-    // with the property defines used in the shader, in other words, permutation flags prep for shader fetch will 
-    // be AND with these masks so that only acceptable / used permutations are being fetched.
-    // See Runtime.ext file for the flags bits themselves.
-    uint64 allowedBits = 0;
-    if (m_dwShaderType)
-    {
-        for (uint32 i = 0; i < pGen->m_BitMask.Num(); i++)
-        {
-            SShaderGenBit* bit = pGen->m_BitMask[i];
-            if (!bit)
-            {
-                continue;
-            }
-            if (bit->m_Flags & SHGF_RUNTIME)
-            {
-                allowedBits |= bit->m_Mask;
-                continue;
-            }
-            
-            uint32 j;
-            if (bit->m_PrecacheNames.size())
-            {
-                for (j = 0; j < bit->m_PrecacheNames.size(); j++)
-                {
-                    if (m_dwShaderType == bit->m_PrecacheNames[j])
-                    {                    
-                        AZ_Error("Shaders", ((allowedBits & bit->m_Mask) == 0), "Two shader properties in this shader technique have the same mask which is bad. Look for mask 0x%x in Runtime.ext", bit->m_Mask);
-                        allowedBits |= bit->m_Mask;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    else
-    {
-        allowedBits = 0xFFFFFFFFFFFFFFFF;
-    }
-    
-    AZ_Assert(!pSHData->empty(), "Shader data is empty");
-    uint32* pTokens = &(*pSHData)[0];
-    uint32 nSize = pSHData->size();
-    uint32 nCur = 0;
-    while (nCur < nSize)
-    {
-        uint32 nTok = CParserBin::NextToken(pTokens, nCur, nSize - 1);
-        if (!nTok)
-        {
-            continue;
-        }
-        if (nTok >= eT_if && nTok <= eT_elif)
-        {
-            m_nMaskAnd_RT |= CheckIfExpr_r(pTokens, nCur, nSize) & allowedBits;
-        }
-        else
-        {
-            SetTokenFlags(nTok);
-        }
-    }
-
-    mfSetDefaultRT(m_nMaskAnd_RT, m_nMaskOr_RT);
-}
-
-void CHWShader_D3D::mfConstructFX(FXShaderToken* Table, TArray<uint32>* pSHData)
-{
-    if (!_strnicmp(m_EntryFunc.c_str(), "Sync_", 5))
-    {
-        m_Flags |= HWSG_SYNC;
-    }
-
-    if (!pSHData->empty())
-    {
-        mfConstructFX_Mask_RT(Table, pSHData);
-    }
-    else
-    {
-        m_nMaskAnd_RT = -1;
-        m_nMaskOr_RT = 0;
-    }
-
-    if (Table && CRenderer::CV_r_shadersAllowCompilation)
-    {
-        FXShaderToken* pMap = Table;
-        TArray<uint32>* pData = pSHData;
-        mfGetCacheTokenMap(pMap, pData, m_nMaskGenShader); // Store tokens
-    }
-}
-
-bool CHWShader_D3D::mfPrecache(SShaderCombination& cmb, bool bForce, bool bFallback, bool bCompressedOnly, CShader* pSH, CShaderResources* pRes)
-{
-    assert(gRenDev->m_pRT->IsRenderThread());
-
-    bool bRes = true;
-
-    if (!CRenderer::CV_r_shadersAllowCompilation && !bForce)
-    {
-        return bRes;
-    }
-
-    uint64 AndRTMask = 0;
-    uint64 OrRTMask = 0;
-    mfSetDefaultRT(AndRTMask, OrRTMask);
-    SShaderCombIdent Ident;
-    Ident.m_RTMask = cmb.m_RTMask & AndRTMask | OrRTMask;
-    Ident.m_pipelineState.opaque = cmb.m_pipelineState.opaque;
-    Ident.m_MDVMask = cmb.m_MDVMask;
-    if (m_eSHClass == eHWSC_Pixel)
-    {
-        Ident.m_MDVMask = CParserBin::m_nPlatform;
-    }
-    if (m_Flags & HWSG_SUPPORTS_MULTILIGHTS)
-    {
-        Ident.m_LightMask = 1;
-    }
-    Ident.m_GLMask = m_nMaskGenShader;
-    Ident.m_STMask = m_maskGenStatic;
-    uint32 nFlags = HWSF_PRECACHE;
-    if (m_eSHClass == eHWSC_Pixel && pRes)
-    {
-        SHWSInstance* pInst = mfGetInstance(pSH, Ident, HWSF_PRECACHE_INST);
-        pInst->m_bFallback = bFallback;
-        int nResult = mfCheckActivation(pSH, pInst, HWSF_PRECACHE);
-        if (!nResult)
-        {
-            return bRes;
-        }
-        mfUpdateSamplers(pSH);
-        pInst->m_fLastAccess = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime;
-        Ident.m_MDMask = gRenDev->m_RP.m_FlagsShader_MD & ~HWMD_TEXCOORD_FLAG_MASK;
-    }
-    if (m_eSHClass == eHWSC_Pixel && gRenDev->m_RP.m_pShaderResources)
-    {
-        Ident.m_MDMask &= ~HWMD_TEXCOORD_FLAG_MASK;
-    }
-
-    if (Ident.m_MDMask || bForce)
-    {
-        SHWSInstance* pInst = mfGetInstance(pSH, Ident, HWSF_PRECACHE_INST);
-        pInst->m_bFallback = bFallback;
-        pInst->m_fLastAccess = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_RealTime;
-        mfActivate(pSH, nFlags, NULL, NULL, bCompressedOnly);
-    }
-
-    return bRes;
-}
-
-void CHWShader_D3D::mfReset([[maybe_unused]] uint32 CRC32)
-{
-    DETAILED_PROFILE_MARKER("mfReset");
-    for (uint32 i = 0; i < m_Insts.size(); i++)
-    {
-        m_pCurInst = m_Insts[i];
-        assert(m_pCurInst);
-        PREFAST_ASSUME(m_pCurInst);
-        if (!m_pCurInst->m_bDeleted)
-        {
-            m_pCurInst->Release(m_pDevCache);
-        }
-
-        delete m_pCurInst;
-    }
-    m_pCurInst = NULL;
-    m_Insts.clear();
-    m_LookupMap.clear();
-
-    mfCloseCacheFile();
-}
-
-CHWShader_D3D::~CHWShader_D3D()
-{
-    mfFree(0);
-}
-
-void CHWShader_D3D::mfInit()
-{
-    CGParamManager::Init();
-}
-
-ED3DShError CHWShader_D3D::mfFallBack(SHWSInstance*& pInst, int nStatus)
-{
-    // No fallback for:
-    //  - ShadowGen pass
-    //  - Z-prepass
-    //  - Shadow-pass
-    if (CParserBin::m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_JASPER | SF_GL4 | SF_GLES3 | SF_METAL))
-    {
-        //assert(gRenDev->m_cEF.m_nCombinationsProcess >= 0);
-        return ED3DShError_CompilingError;
-    }
-    if (
-        m_eSHClass == eHWSC_Geometry || m_eSHClass == eHWSC_Domain || m_eSHClass == eHWSC_Hull ||
-        (gRenDev->m_RP.m_nBatchFilter & FB_Z) || (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN) || gRenDev->m_RP.m_nPassGroupID == EFSLIST_SHADOW_PASS)
-    {
-        return ED3DShError_CompilingError;
-    }
-    if (gRenDev->m_RP.m_pShader)
-    {
-        if (gRenDev->m_RP.m_pShader->GetShaderType() == eST_HDR || gRenDev->m_RP.m_pShader->GetShaderType() == eST_PostProcess || gRenDev->m_RP.m_pShader->GetShaderType() == eST_Water || gRenDev->m_RP.m_pShader->GetShaderType() == eST_Shadow || gRenDev->m_RP.m_pShader->GetShaderType() == eST_Shadow)
-        {
-            return ED3DShError_CompilingError;
-        }
-    }
-    // Skip rendering if async compiling Cvar is 2
-    if (CRenderer::CV_r_shadersasynccompiling == 2)
-    {
-        return ED3DShError_CompilingError;
-    }
-
-    CShader* pSH = CShaderMan::s_ShaderFallback;
-    int nTech = 0;
-    if (nStatus == -1)
-    {
-        pInst->m_Handle.m_bStatus = 1;
-        nTech = 1;
-    }
-    else
-    {
-        nTech = 0;
-        assert(nStatus == 0);
-    }
-    assert(pSH);
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logShaders)
-    {
-        char nameSrc[256];
-        mfGetDstFileName(pInst, this, nameSrc, 256, 3);
-        gcpRendD3D->LogShv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Async %d: using Fallback tech '%s' instead of 0x%x '%s' shader\n", gRenDev->GetFrameID(false), pSH->m_HWTechniques[nTech]->m_NameStr.c_str(), pInst, nameSrc);
-    }
-    // Fallback
-    if (pSH)
-    {
-        if (gRenDev->m_RP.m_CurState & GS_DEPTHFUNC_EQUAL)
-        {
-            int nState = gRenDev->m_RP.m_CurState & ~GS_DEPTHFUNC_EQUAL;
-            nState |= GS_DEPTHWRITE;
-            gRenDev->FX_SetState(nState);
-        }
-        CHWShader_D3D* pHWSH;
-        if (m_eSHClass == eHWSC_Vertex)
-        {
-            pHWSH = (CHWShader_D3D*)pSH->m_HWTechniques[nTech]->m_Passes[0].m_VShader;
-#ifdef DO_RENDERLOG
-            if (CRenderer::CV_r_log >= 3)
-            {
-                gcpRendD3D->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "---- Fallback FX VShader \"%s\"\n", pHWSH->GetName());
-            }
-#endif
-        }
-        else
-        {
-            pHWSH = (CHWShader_D3D*)pSH->m_HWTechniques[nTech]->m_Passes[0].m_PShader;
-#ifdef DO_RENDERLOG
-            if (CRenderer::CV_r_log >= 3)
-            {
-                gcpRendD3D->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "---- Fallback FX PShader \"%s\"\n", pHWSH->GetName());
-            }
-#endif
-        }
-
-        if (!pHWSH->m_Insts.size())
-        {
-            SShaderCombination cmb;
-            pHWSH->mfPrecache(cmb, true, true, false, gRenDev->m_RP.m_pShader, gRenDev->m_RP.m_pShaderResources);
-        }
-        if (pHWSH->m_Insts.size())
-        {
-            SHWSInstance* pInstF = pHWSH->m_Insts[0];
-            if (!pInstF->m_Handle.m_pShader || !pInstF->m_Handle.m_pShader->m_pHandle)
-            {
-                return ED3DShError_CompilingError;
-            }
-            pInst = pInstF;
-            m_pCurInst = pInstF;
-            pInstF->m_bFallback = true;
-        }
-        else
-        {
-            return ED3DShError_CompilingError;
-        }
-    }
-    //if (nStatus == 0)
-    //  return ED3DShError_Compiling;
-    return ED3DShError_Ok;
-}
-
-ED3DShError CHWShader_D3D::mfIsValid_Int(SHWSInstance*& pInst, bool bFinalise)
-{
-    //if (_stricmp(m_EntryFunc.c_str(), "FPPS") && _stricmp(m_EntryFunc.c_str(), "FPVS") && _stricmp(m_EntryFunc.c_str(), "AuxGeomPS") && _stricmp(m_EntryFunc.c_str(), "AuxGeomVS"))
-    //  return mfFallBack(pInst, 0);
-
-    if (pInst->m_Handle.m_bStatus == 1)
-    {
-        return mfFallBack(pInst, -1);
-    }
-    if (pInst->m_Handle.m_bStatus == 2)
-    {
-        return ED3DShError_Fake;
-    }
-    if (pInst->m_Handle.m_pShader == NULL)
-    {
-        if (pInst->m_bAsyncActivating)
-        {
-            return mfFallBack(pInst, 0);
-        }
-
-        if (!bFinalise || !pInst->m_pAsync)
-        {
-            return ED3DShError_NotCompiled;
-        }
-
-        int nStatus = 0;
-        if (!pInst->m_bAsyncActivating)
-        {
-            nStatus = mfAsyncCompileReady(pInst);
-            if (nStatus == 1)
-            {
-                if (gcpRendD3D->m_cEF.m_nCombinationsProcess <= 0 || gcpRendD3D->m_cEF.m_bActivatePhase)
-                {
-                    assert(pInst->m_Handle.m_pShader != NULL);
-                }
-                return ED3DShError_Ok;
-            }
-        }
-        return mfFallBack(pInst, nStatus);
-    }
-    return ED3DShError_Ok;
-}
-
-struct InstContainerByHash
-{
-    bool operator () (const CHWShader_D3D::SHWSInstance* left, const CHWShader_D3D::SHWSInstance* right) const
-    {
-        return left->m_Ident.m_nHash < right->m_Ident.m_nHash;
-    }
-    bool operator () (const uint32 left, const CHWShader_D3D::SHWSInstance* right) const
-    {
-        return left < right->m_Ident.m_nHash;
-    }
-    bool operator () (const CHWShader_D3D::SHWSInstance* left, uint32 right) const
-    {
-        return left->m_Ident.m_nHash < right;
-    }
-};
-
-
-CHWShader_D3D::SHWSInstance* CHWShader_D3D::mfGetInstance([[maybe_unused]] CShader* pSH, int nHashInstance, [[maybe_unused]] uint64 GLMask)
-{
-    DETAILED_PROFILE_MARKER("mfGetInstance");
-    FUNCTION_PROFILER_RENDER_FLAT
-    InstContainer* pInstCont = &m_Insts;
-    if (m_bUseLookUpTable)
-    {
-        assert(nHashInstance < pInstCont->size());
-        SHWSInstance* pInst = (*pInstCont)[nHashInstance];
-        return pInst;
-    }
-    InstContainerIt it = std::lower_bound(pInstCont->begin(), pInstCont->end(), nHashInstance, InstContainerByHash());
-    assert (it != pInstCont->end() && nHashInstance == (*it)->m_Ident.m_nHash);
-
-    return (*it);
-}
-
-CHWShader_D3D::SHWSInstance* CHWShader_D3D::mfGetInstance(CShader* pSH, SShaderCombIdent& Ident, uint32 nFlags)
-{
-    DETAILED_PROFILE_MARKER("mfGetInstance");
-    FUNCTION_PROFILER_RENDER_FLAT
-    SHWSInstance* cgi = m_pCurInst;
-    if (cgi && !cgi->m_bFallback)
-    {
-        assert(cgi->m_eClass < eHWSC_Num);
-
-        const SShaderCombIdent& other = cgi->m_Ident;
-        // other will have been through PostCreate, and so won't have the platform mask set anymore
-        if ((Ident.m_MDVMask & ~SF_PLATFORM) == other.m_MDVMask && Ident.m_RTMask == other.m_RTMask && Ident.m_GLMask == other.m_GLMask && Ident.m_FastCompare1 == other.m_FastCompare1 && Ident.m_pipelineState.opaque == other.m_pipelineState.opaque && Ident.m_STMask == other.m_STMask)
-        {
-            return cgi;
-        }
-    }
-    InstContainerByHash findByHash;
-    InstContainer* pInstCont = &m_Insts;
-    THWInstanceLookupMap* pInstMap = &m_LookupMap;
-    uint32 identHash = Ident.PostCreate();
-    if (m_bUseLookUpTable)
-    {
-        uint64 uiKey = Ident.m_RTMask + Ident.m_GLMask + Ident.m_LightMask + Ident.m_MDMask + Ident.m_MDVMask + Ident.m_pipelineState.opaque + Ident.m_STMask;
-
-        std::pair<THWInstanceLookupMap::iterator, THWInstanceLookupMap::iterator> itp = pInstMap->equal_range(uiKey);
-        for (THWInstanceLookupMap::iterator it = itp.first; it != itp.second; ++it)
-        {
-            // use index redirection
-            uint32 uiIndex = it->second;
-            cgi = (*pInstCont)[uiIndex];
-            if (cgi->m_Ident.m_nHash == identHash)
-            {
-                m_pCurInst = cgi;
-                return cgi;
-            }
-        }
-        cgi = new SHWSInstance;
-        cgi->m_nContIndex = pInstCont->size();
-        cgi->m_vertexFormat = pSH->m_vertexFormat;
-        cgi->m_nCache = -1;
-        s_nInstFrame++;
-        cgi->m_Ident = Ident;
-        cgi->m_eClass = m_eSHClass;
-        pInstCont->push_back(cgi);
-        uint32 uiIndex = pInstCont->size() - 1;
-        if (nFlags & HWSF_FAKE)
-        {
-            cgi->m_Handle.SetFake();
-            //mfSetHWStartProfile(nFlags);
-        }
-
-        // only store index to object instead of pointer itself
-        // else we have lots of issues with the internal resize
-        // functionality of the vector itself (does some strange
-        // allocation stuff once above 20 000 members)
-        pInstMap->insert(std::pair<uint64, uint32>(uiKey, uiIndex));
-    }
-    else
-    {
-        cgi = 0;
-
-        //int nFree = -1;
-
-        // Find first matching shader RT bit flag combination (CRC hash identification)
-        InstContainerIt it = std::lower_bound(pInstCont->begin(), pInstCont->end(), identHash, findByHash);
-        if (it != pInstCont->end() && identHash == (*it)->m_Ident.m_nHash)
-        {
-#ifdef _RELEASE
-            cgi = *it; // release - return the first matching shader permutation
-#else
-
-            // If not release, run over all matching shaders permutations and look for matching CRC hash
-            while (it != pInstCont->end() && identHash == (*it)->m_Ident.m_nHash)
-            {
-                const SShaderCombIdent& other = (*it)->m_Ident;
-                if ((Ident.m_MDVMask & ~SF_PLATFORM) == other.m_MDVMask && Ident.m_RTMask == other.m_RTMask
-                    && Ident.m_GLMask == other.m_GLMask && Ident.m_FastCompare1 == other.m_FastCompare1
-                    && Ident.m_pipelineState.opaque == other.m_pipelineState.opaque && Ident.m_STMask == other.m_STMask)
-                {
-                    cgi = *it;
-                    break;
-                }
-
-                // Matching CRC hash was found, but the shader permutation bits do not match - this is a CRC
-                // wrongly matched due to small chance of having same CRC over different bits
-                iLog->Log("Error: ShaderIdent hash value not unique - matching two different shader permutations with same CRC!");
-
-                // Move to the next iterator, hoping to have a match with the right permutation
-                ++it;
-            }
-
-
-            // No matching permutation was found:
-            // If a matching CRC hash was found, set the iterator to the last matching CRC on the list, 
-            // otherwise set it to the last iterator.
-            if (cgi == 0)
-            {
-                --it;
-            }
-#endif
-        }
-
-        // Either the CRC was not found, or no match permutation was found - in either case create
-        // a new entry and insert it to the table.
-        if (cgi == 0)
-        {
-            cgi = new SHWSInstance;
-            cgi->m_nContIndex = pInstCont->size();
-            cgi->m_vertexFormat = pSH->m_vertexFormat;
-            cgi->m_nCache = -1;
-            s_nInstFrame++;
-            cgi->m_Ident = Ident;
-            cgi->m_eClass = m_eSHClass;
-            pInstCont->insert(it, cgi);
-            if (nFlags & HWSF_FAKE)
-            {
-                cgi->m_Handle.SetFake();
-                //mfSetHWStartProfile(nFlags);
-            }
-        }
-    }
-    m_pCurInst = cgi;
-    return cgi;
-}
-
-//=================================================================================
-
-void CHWShader_D3D::mfSetForOverdraw(SHWSInstance* pInst, uint32 nFlags, uint64& RTMask)
-{
-    if (mfIsValid(pInst, false) ==  ED3DShError_NotCompiled)
-    {
-        mfActivate(gRenDev->m_RP.m_pShader, nFlags);
-    }
-    RTMask |= g_HWSR_MaskBit[HWSR_DEBUG0] | g_HWSR_MaskBit[HWSR_DEBUG1] | g_HWSR_MaskBit[HWSR_DEBUG2] | g_HWSR_MaskBit[HWSR_DEBUG3];
-    RTMask &= m_nMaskAnd_RT;
-    RTMask |= m_nMaskOr_RT;
-    CD3D9Renderer* rd = gcpRendD3D;
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_measureoverdraw == 1 && m_eSHClass == eHWSC_Pixel)
-    {
-        rd->m_RP.m_NumShaderInstructions = pInst->m_nInstructions;
-    }
-    else
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_measureoverdraw == 3 && m_eSHClass == eHWSC_Vertex)
-    {
-        rd->m_RP.m_NumShaderInstructions = pInst->m_nInstructions;
-    }
-    else
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_measureoverdraw == 2 || CRenderer::CV_r_measureoverdraw == 4)
-    {
-        rd->m_RP.m_NumShaderInstructions = 30;
-    }
-}
-
-
-void CHWShader_D3D::ModifyLTMask(uint32& nMask)
-{
-    if (nMask)
-    {
-        if (!(m_Flags & (HWSG_SUPPORTS_MULTILIGHTS | HWSG_SUPPORTS_LIGHTING | HWSG_FP_EMULATION)))
-        {
-            nMask = 0;
-        }
-        else
-        if (!(m_Flags & HWSG_SUPPORTS_MULTILIGHTS) && (m_Flags & HWSG_SUPPORTS_LIGHTING))
-        {
-            int nLightType = (nMask >> SLMF_LTYPE_SHIFT) & SLMF_TYPE_MASK;
-            if (nLightType != SLMF_PROJECTED)
-            {
-                nMask = 1;
-            }
-        }
-    }
-}
-
-bool CHWShader_D3D::mfSetVS(int nFlags)
-{
-    DETAILED_PROFILE_MARKER("mfSetVS");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    SShaderCombIdent Ident;
-    Ident.m_LightMask = rRP.m_FlagsShader_LT;
-    Ident.m_RTMask = rRP.m_FlagsShader_RT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Ident.m_MDMask = rRP.m_FlagsShader_MD;
-    Ident.m_MDVMask = rRP.m_FlagsShader_MDV | CParserBin::m_nPlatform;
-    Ident.m_GLMask = m_nMaskGenShader;
-    Ident.m_STMask = m_maskGenStatic;
-
-    ModifyLTMask(Ident.m_LightMask);
-
-    SHWSInstance* pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_measureoverdraw == 3)
-    {
-        mfSetForOverdraw(pInst, nFlags, Ident.m_RTMask);
-        pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-    }
-
-    pInst->m_fLastAccess = rTI.m_RealTime;
-
-    if (!mfCheckActivation(rRP.m_pShader, pInst, nFlags))
-    {
-        s_pCurInstVS = NULL;
-        s_nActivationFailMask |= (1 << eHWSC_Vertex);
-        return false;
-    }
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "--- Set FX VShader \"%s\" (%d instr), LTMask: 0x%x, GLMask: 0x%llx, RTMask: 0x%llx, MDMask: 0x%x, MDVMask: 0x%x, PSS: 0x%llx, STMask: 0x%llx\n", GetName(), pInst->m_nInstructions, Ident.m_LightMask, Ident.m_GLMask, Ident.m_RTMask, Ident.m_MDMask, Ident.m_MDVMask, Ident.m_pipelineState.opaque, Ident.m_STMask);
-    }
-#endif
-    if (m_nFrame != rTI.m_nFrameUpdateID)
-    {
-        m_nFrame = rTI.m_nFrameUpdateID;
-#ifndef _RELEASE
-        rRP.m_PS[rRP.m_nProcessThreadID].m_NumVShaders++;
-        if (pInst->m_nInstructions > rRP.m_PS[rRP.m_nProcessThreadID].m_NumVSInstructions)
-        {
-            rRP.m_PS[rRP.m_nProcessThreadID].m_NumVSInstructions = pInst->m_nInstructions;
-            rRP.m_PS[rRP.m_nProcessThreadID].m_pMaxVShader = this;
-            rRP.m_PS[rRP.m_nProcessThreadID].m_pMaxVSInstance = pInst;
-        }
-#endif
-    }
-    if (!(nFlags & HWSF_PRECACHE))
-    {
-        if (s_pCurVS != pInst->m_Handle.m_pShader)
-        {
-            s_pCurVS = pInst->m_Handle.m_pShader;
-#ifndef _RELEASE
-            rRP.m_PS[rRP.m_nProcessThreadID].m_NumVShadChanges++;
-#endif
-            mfBind();
-        }
-        s_pCurInstVS = pInst;
-        rRP.m_FlagsStreams_Decl = pInst->m_VStreamMask_Decl;
-        rRP.m_FlagsStreams_Stream = pInst->m_VStreamMask_Stream;
-        // Make sure we don't use any texture attributes except baseTC in instancing case
-        if (nFlags & HWSF_INSTANCED)
-        {
-            rRP.m_FlagsStreams_Decl &= ~(VSM_MORPHBUDDY);
-            rRP.m_FlagsStreams_Stream &= ~(VSM_MORPHBUDDY);
-        }
-
-        UpdatePerBatchConstantBuffer();
-    }
-    if (nFlags & HWSF_SETTEXTURES)
-    {
-        mfSetSamplers(pInst->m_pSamplers, m_eSHClass);
-    }
-
-    s_nActivationFailMask &= ~(1 << eHWSC_Vertex);
-
-    return true;
-}
-
-bool CHWShader_D3D::mfSetPS(int nFlags)
-{
-    DETAILED_PROFILE_MARKER("mfSetPS");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    SShaderCombIdent Ident;
-    Ident.m_LightMask = rRP.m_FlagsShader_LT;
-    Ident.m_RTMask = rRP.m_FlagsShader_RT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Ident.m_MDMask = rRP.m_FlagsShader_MD & ~HWMD_TEXCOORD_FLAG_MASK;
-    Ident.m_MDVMask = CParserBin::m_nPlatform;
-    Ident.m_GLMask = m_nMaskGenShader;
-    Ident.m_STMask = m_maskGenStatic;
-
-    ModifyLTMask(Ident.m_LightMask);
-
-    SHWSInstance* pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-
-    // Update texture modificator flags based on active samplers state
-    if (nFlags & HWSF_SETTEXTURES)
-    {
-        int nResult = mfCheckActivation(rRP.m_pShader, pInst, nFlags);
-        if (!nResult)
-        {
-            CHWShader_D3D::s_pCurInstPS = NULL;
-            s_nActivationFailMask |= (1 << eHWSC_Pixel);
-            return false;
-        }
-        mfUpdateSamplers(rRP.m_pShader);
-        if ((rRP.m_FlagsShader_MD ^ Ident.m_MDMask) & ~HWMD_TEXCOORD_FLAG_MASK)
-        {
-            pInst->m_fLastAccess = rTI.m_RealTime;
-            if (rd->m_nFrameSwapID != pInst->m_nUsedFrame)
-            {
-                pInst->m_nUsedFrame = rd->m_nFrameSwapID;
-                pInst->m_nUsed++;
-            }
-            Ident.m_MDMask = rRP.m_FlagsShader_MD & ~HWMD_TEXCOORD_FLAG_MASK;
-            Ident.m_MDVMask = CParserBin::m_nPlatform;
-            pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-        }
-    }
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_measureoverdraw > 0 && CRenderer::CV_r_measureoverdraw < 5)
-    {
-        mfSetForOverdraw(pInst, nFlags, Ident.m_RTMask);
-        pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-    }
-    pInst->m_fLastAccess = rTI.m_RealTime;
-
-    if (!mfCheckActivation(rRP.m_pShader, pInst, nFlags))
-    {
-        s_pCurInstPS = NULL;
-        s_nActivationFailMask |= (1 << eHWSC_Pixel);
-        return false;
-    }
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "--- Set FX PShader \"%s\" (%d instr) LTMask: 0x%x, GLMask: 0x%llx, RTMask: 0x%llx, MDMask: 0x%x, MDVMask: 0x%x, PSS: 0x%llx, STMask: 0x%llx\n", GetName(), pInst->m_nInstructions, Ident.m_LightMask, Ident.m_GLMask, Ident.m_RTMask, Ident.m_MDMask, Ident.m_MDVMask & 0x0fffffff, Ident.m_pipelineState.opaque, Ident.m_STMask);
-    }
-#endif
-
-    if (m_nFrame != rTI.m_nFrameUpdateID)
-    {
-        m_nFrame = rTI.m_nFrameUpdateID;
-#ifndef _RELEASE
-        rRP.m_PS[rRP.m_nProcessThreadID].m_NumPShaders++;
-        if (pInst->m_nInstructions > rRP.m_PS[rRP.m_nProcessThreadID].m_NumPSInstructions)
-        {
-            rRP.m_PS[rRP.m_nProcessThreadID].m_NumPSInstructions = pInst->m_nInstructions;
-            rRP.m_PS[rRP.m_nProcessThreadID].m_pMaxPShader = this;
-            rRP.m_PS[rRP.m_nProcessThreadID].m_pMaxPSInstance = pInst;
-        }
-#endif
-    }
-    if (!(nFlags & HWSF_PRECACHE))
-    {
-        if (s_pCurPS != pInst->m_Handle.m_pShader)
-        {
-            s_pCurPS = pInst->m_Handle.m_pShader;
-#ifndef _RELEASE
-            rRP.m_PS[rRP.m_nProcessThreadID].m_NumPShadChanges++;
-#endif
-            mfBind();
-        }
-        s_pCurInstPS = pInst;
-        UpdatePerBatchConstantBuffer();
-        if (nFlags & HWSF_SETTEXTURES)
-        {
-            mfSetSamplers(pInst->m_pSamplers, m_eSHClass);
-        }
-    }
-
-    s_nActivationFailMask &= ~(1 << eHWSC_Pixel);
-
-    return true;
-}
-
-bool CHWShader_D3D::mfSetGS(int nFlags)
-{
-    DETAILED_PROFILE_MARKER("mfSetGS");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    SShaderCombIdent Ident;
-    Ident.m_LightMask = rRP.m_FlagsShader_LT;
-    Ident.m_RTMask = rRP.m_FlagsShader_RT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Ident.m_MDMask = rRP.m_FlagsShader_MD;
-    Ident.m_MDVMask = rRP.m_FlagsShader_MDV | CParserBin::m_nPlatform;
-    Ident.m_GLMask = m_nMaskGenShader;
-    Ident.m_STMask = m_maskGenStatic;
-
-    ModifyLTMask(Ident.m_LightMask);
-
-    SHWSInstance* pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-    pInst->m_fLastAccess = rTI.m_RealTime;
-
-    if (!mfCheckActivation(rRP.m_pShader, pInst, nFlags))
-    {
-        s_pCurInstGS = NULL;
-        s_nActivationFailMask |= (1 << eHWSC_Geometry);
-        return false;
-    }
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "--- Set FX GShader \"%s\" (%d instr), LTMask: 0x%x, GLMask: 0x%llx, RTMask: 0x%llx, MDMask: 0x%x, MDVMask: 0x%x, PSS: 0x%llx, STMask: 0x%llx\n", GetName(), pInst->m_nInstructions, Ident.m_LightMask, Ident.m_GLMask, Ident.m_RTMask, Ident.m_MDMask, Ident.m_MDVMask, Ident.m_pipelineState.opaque, Ident.m_STMask);
-    }
-#endif
-
-    rRP.m_PersFlags2 |= s_bFirstGS * (RBPF2_COMMIT_PF | RBPF2_COMMIT_CM);
-    rRP.m_nCommitFlags |= s_bFirstGS * (FC_GLOBAL_PARAMS);
-
-    s_bFirstGS = false;
-    s_pCurInstGS = pInst;
-    if (!(nFlags & HWSF_PRECACHE))
-    {
-        mfBindGS(pInst->m_Handle.m_pShader, pInst->m_Handle.m_pShader->m_pHandle);
-
-        UpdatePerBatchConstantBuffer();
-
-        if (nFlags & HWSF_SETTEXTURES)
-        {
-            mfSetSamplers(pInst->m_pSamplers, m_eSHClass);
-        }
-    }
-
-    s_nActivationFailMask &= ~(1 << eHWSC_Geometry);
-
-    return true;
-}
-
-bool CHWShader_D3D::mfSetHS(int nFlags)
-{
-    DETAILED_PROFILE_MARKER("mfSetHS");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    SShaderCombIdent Ident;
-    Ident.m_LightMask = rRP.m_FlagsShader_LT;
-    Ident.m_RTMask = rRP.m_FlagsShader_RT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Ident.m_MDMask = rRP.m_FlagsShader_MD;
-    Ident.m_MDVMask = rRP.m_FlagsShader_MDV | CParserBin::m_nPlatform;
-    Ident.m_GLMask = m_nMaskGenShader;
-    Ident.m_STMask = m_maskGenStatic;
-    ModifyLTMask(Ident.m_LightMask);
-
-    SHWSInstance* pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-    pInst->m_fLastAccess = rTI.m_RealTime;
-
-    if (!mfCheckActivation(rRP.m_pShader, pInst, nFlags))
-    {
-        s_pCurInstHS = NULL;
-        s_nActivationFailMask |= (1 << eHWSC_Hull);
-        return false;
-    }
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "--- Set FX HShader \"%s\" (%d instr), LTMask: 0x%x, GLMask: 0x%llx, RTMask: 0x%llx, MDMask: 0x%x, MDVMask: 0x%x, PSS: 0x%llx, STMask: 0x%llx\n", GetName(), pInst->m_nInstructions, Ident.m_LightMask, Ident.m_GLMask, Ident.m_RTMask, Ident.m_MDMask, Ident.m_MDVMask, Ident.m_pipelineState.opaque, Ident.m_STMask);
-    }
-#endif
-
-    rRP.m_PersFlags2 |= s_bFirstHS * (RBPF2_COMMIT_PF | RBPF2_COMMIT_CM);
-    rRP.m_nCommitFlags |= s_bFirstHS * (FC_GLOBAL_PARAMS);
-
-    s_bFirstHS = false;
-    s_pCurInstHS = pInst;
-    if (!(nFlags & HWSF_PRECACHE))
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADER_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DHWShader_cpp)
-#endif
-
-        mfBindHS(pInst->m_Handle.m_pShader, pInst->m_Handle.m_pShader->m_pHandle);
-
-        UpdatePerBatchConstantBuffer();
-    }
-
-    s_nActivationFailMask &= ~(1 << eHWSC_Hull);
-
-    return true;
-}
-
-bool CHWShader_D3D::mfSetDS(int nFlags)
-{
-    DETAILED_PROFILE_MARKER("mfSetDS");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    SShaderCombIdent Ident;
-    Ident.m_LightMask = rRP.m_FlagsShader_LT;
-    Ident.m_RTMask = rRP.m_FlagsShader_RT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Ident.m_MDMask = rRP.m_FlagsShader_MD;
-    Ident.m_MDVMask = rRP.m_FlagsShader_MDV | CParserBin::m_nPlatform;
-    Ident.m_GLMask = m_nMaskGenShader;
-    Ident.m_STMask = m_maskGenStatic;
-
-    ModifyLTMask(Ident.m_LightMask);
-
-    SHWSInstance* pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-    pInst->m_fLastAccess = rTI.m_RealTime;
-
-    if (!mfCheckActivation(rRP.m_pShader, pInst, nFlags))
-    {
-        s_pCurInstDS = NULL;
-        s_nActivationFailMask |= (1 << eHWSC_Domain);
-        return false;
-    }
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "--- Set FX CShader \"%s\" (%d instr), LTMask: 0x%x, GLMask: 0x%llx, RTMask: 0x%llx, MDMask: 0x%x, MDVMask: 0x%x, PSS: 0x%llx, STMask: 0x%llx\n", GetName(), pInst->m_nInstructions, Ident.m_LightMask, Ident.m_GLMask, Ident.m_RTMask, Ident.m_MDMask, Ident.m_MDVMask, Ident.m_pipelineState.opaque, Ident.m_STMask);
-    }
-#endif
-
-    rRP.m_PersFlags2 |= s_bFirstDS * (RBPF2_COMMIT_PF | RBPF2_COMMIT_CM);
-    rRP.m_nCommitFlags |= s_bFirstDS * (FC_GLOBAL_PARAMS);
-
-    s_bFirstDS = false;
-    s_pCurInstDS = pInst;
-    if (!(nFlags & HWSF_PRECACHE))
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADER_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DHWShader_cpp)
-#endif
-
-        mfBindDS(pInst->m_Handle.m_pShader, pInst->m_Handle.m_pShader->m_pHandle);
-
-        UpdatePerBatchConstantBuffer();
-    }
-
-    if (nFlags & HWSF_SETTEXTURES)
-    {
-        mfSetSamplers(pInst->m_pSamplers, m_eSHClass);
-    }
-
-    s_nActivationFailMask &= ~(1 << eHWSC_Domain);
-
-    return true;
-}
-
-bool CHWShader_D3D::mfSetCS(int nFlags)
-{
-    DETAILED_PROFILE_MARKER("mfSetCS");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-    SThreadInfo& RESTRICT_REFERENCE rTI = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    SShaderCombIdent Ident;
-    Ident.m_LightMask = rRP.m_FlagsShader_LT;
-    Ident.m_RTMask = rRP.m_FlagsShader_RT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Ident.m_MDMask = rRP.m_FlagsShader_MD;
-    Ident.m_MDVMask = rRP.m_FlagsShader_MDV | CParserBin::m_nPlatform;
-    Ident.m_GLMask = m_nMaskGenShader;
-    Ident.m_STMask = m_maskGenStatic;
-
-    if (Ident.m_LightMask)
-    {
-        if (!(m_Flags & (HWSG_SUPPORTS_MULTILIGHTS | HWSG_SUPPORTS_LIGHTING | HWSG_FP_EMULATION)))
-        {
-            Ident.m_LightMask = 0;
-        }
-        else
-        if (!(m_Flags & HWSG_SUPPORTS_MULTILIGHTS) && (m_Flags & HWSG_SUPPORTS_LIGHTING))
-        {
-            int nLightType = (Ident.m_LightMask >> SLMF_LTYPE_SHIFT) & SLMF_TYPE_MASK;
-            if (nLightType != SLMF_PROJECTED)
-            {
-                Ident.m_LightMask = 1;
-            }
-        }
-    }
-
-    SHWSInstance* pInst = mfGetInstance(rRP.m_pShader, Ident, nFlags);
-    pInst->m_fLastAccess = rTI.m_RealTime;
-
-    if (!mfCheckActivation(rRP.m_pShader, pInst, nFlags))
-    {
-        s_pCurInstCS = NULL;
-        s_nActivationFailMask |= (1 << eHWSC_Compute);
-        return false;
-    }
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        rd->Logv(SRendItem::m_RecurseLevel[rRP.m_nProcessThreadID], "--- Set FX CShader \"%s\" (%d instr), LTMask: 0x%x, GLMask: 0x%llx, RTMask: 0x%llx, MDMask: 0x%x, MDVMask: 0x%x, STMask: 0x%llx\n", GetName(), pInst->m_nInstructions, Ident.m_LightMask, Ident.m_GLMask, Ident.m_RTMask, Ident.m_MDMask, Ident.m_MDVMask, Ident.m_STMask);
-    }
-#endif
-
-    s_pCurInstCS = pInst;
-    if (!(nFlags & HWSF_PRECACHE))
-    {
-        mfBindCS(pInst->m_Handle.m_pShader, pInst->m_Handle.m_pShader->m_pHandle);
-
-        UpdatePerBatchConstantBuffer();
-    }
-
-    if (nFlags & HWSF_SETTEXTURES)
-    {
-        mfSetSamplers(pInst->m_pSamplers, m_eSHClass);
-    }
-
-    s_nActivationFailMask = 0; // Reset entire mask since CS does not need any other shader stages
-
-    return true;
-}
-
-void CHWShader_D3D::mfUpdatePreprocessFlags(SShaderTechnique* pTech)
-{
-    DETAILED_PROFILE_MARKER("mfUpdatePreprocessFlags");
-    uint32 nFlags = 0;
-
-    for (uint32 i = 0; i < (uint32)m_Insts.size(); i++)
-    {
-        SHWSInstance* pInst = m_Insts[i];
-        if (pInst->m_pSamplers.size())
-        {
-            for (uint32 j = 0; j < (uint32)pInst->m_pSamplers.size(); j++)
-            {
-                STexSamplerRT* pSamp = &pInst->m_pSamplers[j];
-                if (pSamp && pSamp->m_pTarget)
-                {
-                    SHRenderTarget* pTarg = pSamp->m_pTarget;
-                    if (pTarg->m_eOrder == eRO_PreProcess)
-                    {
-                        nFlags |= pTarg->m_nProcessFlags;
-                    }
-                    if (pTech)
-                    {
-                        uint32 n = 0;
-                        for (n = 0; n < pTech->m_RTargets.Num(); n++)
-                        {
-                            if (pTarg == pTech->m_RTargets[n])
-                            {
-                                break;
-                            }
-                        }
-                        if (n == pTech->m_RTargets.Num())
-                        {
-                            pTech->m_RTargets.AddElem(pTarg);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    if (pTech)
-    {
-        pTech->m_RTargets.Shrink();
-        pTech->m_nPreprocessFlags |= nFlags;
-    }
-}
-
-AZ::u32 CHWShader_D3D::SHWSInstance::GenerateVertexDeclarationCacheKey(const AZ::Vertex::Format& vertexFormat)
-{
-
-    // We cannot naively use the AZ::Vertex::Format CRC to cache the results of CreateInputLayout.
-    // CreateInputLayout compiles a fetch shader to associate the vertex format with the individual vertex shader instance.
-    // If the vertex shader does not reference one of the input semantics, then the fetch shader will not
-    AZ::u32 fetchShaderKey = ( m_uniqueNameCRC ^ vertexFormat.GetEnum() );
-
-    return fetchShaderKey;
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShader.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShader.h
deleted file mode 100644
index 66d30e177d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShader.h
+++ /dev/null
@@ -1,1177 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DHWShader_h)
-#endif
-
-#define MERGE_SHADER_PARAMETERS 1
-
-// Streams redefinitions (TEXCOORD#)
-#define VSTR_COLOR1        4  //Base Stream
-#define VSTR_NORMAL1       5  //Base Stream
-#define VSTR_PSIZE         6  //Base particles stream
-//#define VSTR_MORPHTARGETDELTA 7 // MorphTarget stream (VSF_HWSKIN_MORPHTARGET_INFO)
-#define VSTR_TANGENT       8  // Tangents stream (VSF_TANGENTS)
-#define VSTR_BITANGENT     9  // Tangents stream (VSF_TANGENTS) -> unused, remove
-#define VSTR_BLENDWEIGHTS 10  // HWSkin stream (VSF_HWSKIN_INFO)
-#define VSTR_BLENDINDICES 11  // HWSkin stream (VSF_HWSKIN_INFO)
-#define VSTR_BONESPACE    12  // HWSkin stream (VSF_HWSKIN_INFO)
-
-#define INST_PARAM_SIZE sizeof(Vec4)
-
-#define MAX_PF_TEXTURES     (32)
-#define MAX_PF_SAMPLERS     (4)
-
-#if defined(_CPU_SSE)
-typedef __m128 VECTOR_TYPE;
-#define VECTOR_CONST(x, y, z, w)  { x, y, z, w }   //{ w, z, y, x }
-#define VECTOR_ZERO()                               _mm_setzero_ps()
-#define VECTOR_XOR(a, b)                  _mm_xor_ps(a, b)
-#else
-union USoftVector
-{
-    struct
-    {
-        float x, y, z, w;
-    };
-    uint32 u[4];
-};
-
-#if defined(LINUX32)
-typedef DEFINE_ALIGNED_DATA (USoftVector, VECTOR_TYPE, 8);
-#else
-typedef DEFINE_ALIGNED_DATA (USoftVector, VECTOR_TYPE, 16);
-#endif
-
-#define VECTOR_CONST(x, y, z, w)  { \
-        { x, y, z, w }              \
-}
-const VECTOR_TYPE   g_VectorZero = VECTOR_CONST(0.f, 0.f, 0.f, 0.f);
-#define VECTOR_ZERO()                               (g_VectorZero)
-inline VECTOR_TYPE VECTOR_XOR(const VECTOR_TYPE& a, const VECTOR_TYPE& b)
-{
-    VECTOR_TYPE r;
-    r.u[0] = a.u[0] ^ b.u[0];
-    r.u[1] = a.u[1] ^ b.u[1];
-    r.u[2] = a.u[2] ^ b.u[2];
-    r.u[3] = a.u[3] ^ b.u[3];
-    return r;
-}
-#endif
-
-union UFloat4
-{
-    float f[4];
-    VECTOR_TYPE m128;
-};
-
-namespace AzRHI{ class ConstantBuffer; }
-
-//==============================================================================
-
-int D3DXGetSHParamHandle(void* pSH, SCGBind* pParam);
-
-struct SParamsGroup
-{
-    std::vector<SCGParam> Params[2];
-    std::vector<SCGParam> Params_Inst;
-};
-
-enum ED3DShError
-{
-    ED3DShError_NotCompiled,
-    ED3DShError_CompilingError,
-    ED3DShError_Fake,
-    ED3DShError_Ok,
-    ED3DShError_Compiling,
-};
-
-//====================================================================================
-
-struct SCGParamsGroup
-{
-    uint16 nParams;
-    uint16 nSamplers;
-    uint16 nTextures;
-    SCGParam* pParams;
-    int nPool;
-    int nRefCounter;
-    SCGParamsGroup()
-    {
-        nParams = 0;
-        nPool = 0;
-        pParams = NULL;
-        nRefCounter = 1;
-    }
-    unsigned Size() { return sizeof(*this); }
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-};
-
-#define PARAMS_POOL_SIZE 256
-
-struct alloc_info_struct
-{
-    int ptr;
-    int bytes_num;
-    bool busy;
-    const char* szSource;
-    unsigned Size() { return sizeof(*this); }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-};
-
-struct SCGParamPool
-{
-protected:
-    PodArray<alloc_info_struct> m_alloc_info;
-    Array<SCGParam> m_Params;
-
-public:
-
-    SCGParamPool(int nEntries = 0);
-    ~SCGParamPool();
-    SCGParamsGroup Alloc(int nEntries);
-    bool Free(SCGParamsGroup& Group);
-
-    size_t Size()
-    {
-        return sizeof(*this) + sizeOfV(m_alloc_info) + m_Params.size_mem();
-    }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_alloc_info);
-        pSizer->Add(m_Params.begin(), m_Params.size());
-    }
-};
-
-template<>
-inline bool raw_movable(const SCGParamPool&)
-{
-    return true;
-}
-
-class CGParamManager
-{
-    friend class CHWShader_D3D;
-    //friend struct CHWShader_D3D::SHWSInstance;
-
-    static AZStd::vector<uint32, AZ::StdLegacyAllocator> s_FreeGroups;
-
-public:
-    static void Init();
-    static void Shutdown();
-
-    static SCGParamPool* NewPool(int nEntries);
-    static int GetParametersGroup(SParamsGroup& Gr, int nId);
-    static bool FreeParametersGroup(int nID);
-
-    static AZStd::vector<SCGParamsGroup, AZ::StdLegacyAllocator> s_Groups;
-    static DynArray<SCGParamPool> s_Pools;
-};
-
-//=========================================================================================
-
-struct SD3DShader
-{
-    int m_nRef;
-    void* m_pHandle;
-    bool m_bBound;
-
-    SD3DShader()
-    {
-        m_nRef = 1;
-        m_pHandle = NULL;
-        m_bBound = false;
-    }
-    int AddRef()
-    {
-        return m_nRef++;
-    }
-    int Release(EHWShaderClass eSHClass, int nSize);
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-};
-
-struct SD3DShaderHandle
-{
-    SD3DShader* m_pShader;
-    byte* m_pData;
-    int m_nData;
-    byte m_bStatus;
-    SD3DShaderHandle()
-    {
-        m_pShader = NULL;
-        m_bStatus = 0;
-        m_nData = 0;
-        m_pData = NULL;
-    }
-    void SetShader(SD3DShader* pShader)
-    {
-        m_bStatus = 0;
-        m_pShader = pShader;
-    }
-    void SetFake()
-    {
-        m_bStatus = 2;
-    }
-    void SetNonCompilable()
-    {
-        m_bStatus = 1;
-    }
-    int AddRef()
-    {
-        if (!m_pShader)
-        {
-            return 0;
-        }
-        return m_pShader->AddRef();
-    }
-    int Release(EHWShaderClass eSHClass, int nSize)
-    {
-        if (!m_pShader)
-        {
-            return 0;
-        }
-        return m_pShader->Release(eSHClass, nSize);
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_pShader);
-    }
-};
-
-struct SShaderAsyncInfo
-{
-    SShaderAsyncInfo* m_Next;         //!<
-    SShaderAsyncInfo* m_Prev;         //!<
-    inline void Unlink()
-    {
-        if (!m_Next || !m_Prev)
-        {
-            return;
-        }
-        m_Next->m_Prev = m_Prev;
-        m_Prev->m_Next = m_Next;
-        m_Next = m_Prev = NULL;
-    }
-    inline void Link(SShaderAsyncInfo* Before)
-    {
-        if (m_Next || m_Prev)
-        {
-            return;
-        }
-        m_Next = Before->m_Next;
-        Before->m_Next->m_Prev = this;
-        Before->m_Next = this;
-        m_Prev = Before;
-    }
-    static void FlushPendingShaders();
-
-#if D3DHWSHADER_H_TRAIT_DEFINE_D3D_BLOB || defined(OPENGL)
-#define LPD3DXBUFFER D3DBlob *
-#define ID3DXBuffer D3DBlob
-#define D3D10CreateBlob D3DCreateBlob
-#endif
-
-    int m_nHashInst;
-    uint64 m_RTMask;
-    uint32 m_LightMask;
-    uint32 m_MDMask;
-    uint32 m_MDVMask;
-    EHWShaderClass m_eClass;
-    UPipelineState m_pipelineState;
-    class CHWShader_D3D* m_pShader;
-    CShader* m_pFXShader;
-
-    LPD3D10BLOB m_pDevShader;
-    LPD3D10BLOB m_pErrors;
-    void* m_pConstants;
-    string m_Name;
-    string m_Text;
-    string m_Errors;
-    string m_Profile;
-    string m_RequestLine;
-    string m_shaderList;
-    //CShaderThread *m_pThread;
-    AZStd::vector<SCGBind, AZ::StdLegacyAllocator> m_InstBindVars;
-    byte m_bPending;
-    bool m_bPendedFlush;
-    bool m_bPendedSamplers;
-    bool m_bPendedEnv;
-    bool m_bDeleteAfterRequest;
-    float m_fMinDistance;
-    int m_nFrame;
-    int m_nThread;
-    int m_nCombination;
-
-    SShaderAsyncInfo()
-        : m_Next(nullptr)
-        , m_Prev(nullptr)
-        , m_nHashInst(-1)
-        , m_RTMask(0)
-        , m_LightMask(0)
-        , m_MDMask(0)
-        , m_MDVMask(0)
-        , m_eClass(eHWSC_Num)
-        , m_pShader(nullptr)
-        , m_pFXShader(nullptr)
-        , m_pDevShader(nullptr)
-        , m_pErrors(nullptr)
-        , m_pConstants(nullptr)
-        , m_bPending(true) // this flag is now used as an atomic indication that if the async shader has been compiled
-        , m_bPendedFlush(false)
-        , m_bPendedSamplers(false)
-        , m_bPendedEnv(false)
-        , m_bDeleteAfterRequest(false)
-        , m_fMinDistance(0.0f)
-        , m_nFrame(0)
-        , m_nThread(0)
-        , m_nCombination(-1)
-    {
-    }
-
-    ~SShaderAsyncInfo();
-    static volatile int s_nPendingAsyncShaders;
-    static SShaderAsyncInfo& PendingList();
-    static SShaderAsyncInfo& PendingListT();
-    static CryEvent s_RequestEv;
-};
-
-#ifdef SHADER_ASYNC_COMPILATION
-
-#include "CryThread.h"
-#define SHADER_THREAD_NAME "ShaderCompile"
-
-class CAsyncShaderTask
-{
-    friend class CD3D9Renderer; // so it can instantiate us
-
-public:
-    CAsyncShaderTask();
-
-    static void InsertPendingShader(SShaderAsyncInfo* pAsync);
-    int GetThread()
-    {
-        return m_nThread;
-    }
-    int GetThreadFXC()
-    {
-        return m_nThreadFXC;
-    }
-    void SetThread(int nThread)
-    {
-        m_nThread = nThread;
-        m_nThreadFXC = -1;
-    }
-    void SetThreadFXC(int nThread)
-    {
-        m_nThreadFXC = nThread;
-    }
-
-private:
-
-    void FlushPendingShaders();
-
-    static SShaderAsyncInfo& BuildList();
-    SShaderAsyncInfo m_flush_list;
-    int m_nThread;
-    int m_nThreadFXC;
-
-    class CShaderThread
-        : public CrySimpleThread<>
-    {
-    public:
-        CShaderThread(CAsyncShaderTask* task)
-            : m_task(task)
-            , m_quit(false)
-        {
-            CAsyncShaderTask::BuildList().m_Next = &CAsyncShaderTask::BuildList();
-            CAsyncShaderTask::BuildList().m_Prev = &CAsyncShaderTask::BuildList();
-
-            task->m_flush_list.m_Next = &task->m_flush_list;
-            task->m_flush_list.m_Prev = &task->m_flush_list;
-            Start();
-        }
-
-        ~CShaderThread()
-        {
-            m_quit = true;
-            Stop();
-            WaitForThread();
-        }
-
-    private:
-        void Run();
-
-        CAsyncShaderTask* m_task;
-        volatile bool m_quit;
-    };
-
-    CShaderThread m_thread;
-
-    bool CompileAsyncShader(SShaderAsyncInfo* pAsync);
-    void SubmitAsyncRequestLine(SShaderAsyncInfo* pAsync);
-    bool PostCompile(SShaderAsyncInfo* pAsync);
-};
-#endif
-
-class CHWShader_D3D
-    : public CHWShader
-{
-    friend class CD3D9Renderer;
-    friend class CAsyncShaderTask;
-    friend class CGParamManager;
-    friend struct SShaderAsyncInfo;
-    friend class CHWShader;
-    friend class CShaderMan;
-    friend struct InstContainerByHash;
-    friend class CREGeomCache;
-    friend struct SRenderStatePassD3D;
-    friend struct SDeviceObjectHelpers;
-    friend class CDeviceGraphicsCommandList;
-    friend class CDeviceGraphicsPSO;
-    friend class CDeviceGraphicsPSO_DX11;
-    friend class CDeviceGraphicsPSO_DX12;
-    friend class CGnmGraphicsPipelineState;
-    friend class CSceneGBufferPass;  // HACK
-
-    SShaderDevCache* m_pDevCache;
-
-#if !defined(_RELEASE)
-    static AZStd::unordered_set<uint32_t, AZStd::hash<uint32_t>, AZStd::equal_to<uint32_t>, AZ::StdLegacyAllocator> s_ErrorsLogged; // CRC32 of message, risk of collision acceptable
-#endif
-
-#if !defined(CONSOLE)
-    SPreprocessTree* m_pTree;
-    CParserBin* m_pParser;
-#endif
-
-    struct SHWSInstance
-    {
-        friend struct SShaderAsyncInfo;
-
-        SShaderCombIdent m_Ident;
-
-        int m_nContIndex;
-
-        SD3DShaderHandle m_Handle;
-        EHWShaderClass m_eClass;
-
-        int m_nParams[2]; // 0: Instance independent; 1: Instance depended
-
-        // Shader-specific data (unlike the static per frame which are shared)
-        std::vector<STexSamplerRT> m_pSamplers;
-        std::vector<SCGSampler> m_Samplers;
-        std::vector<SCGTexture> m_Textures;     
-        std::vector<SCGBind> m_pBindVars;
-
-        int m_nParams_Inst;
-        float m_fLastAccess;
-        int m_nUsed;
-        int m_nUsedFrame;
-        int m_nFrameSubmit;
-        void* m_pShaderData;
-        int m_nMaxVecs[3];
-        short m_nInstMatrixID;
-        short m_nInstIndex;
-        short m_nInstructions;
-        short m_nTempRegs;
-        uint16 m_VStreamMask_Stream;
-        uint16 m_VStreamMask_Decl;
-        short m_nCache;
-        short m_nParent;
-        byte m_bDeleted : 1;
-        byte m_bHasPMParams : 1;
-        byte m_bFallback : 1;
-        byte m_bCompressed : 1;
-        byte m_bAsyncActivating : 1;
-        byte m_bHasSendRequest : 1;
-        AZ::Vertex::Format m_vertexFormat;
-        byte m_nNumInstAttributes;
-
-        int m_nDataSize;
-        int m_DeviceObjectID;
-        AZ::u32 m_uniqueNameCRC = 0; // CRC generated from the pattern: "Technique@EntryPoint(Permutations)"
-#if defined(FEATURE_PER_SHADER_INPUT_LAYOUT_CACHE)
-        enum
-        {
-            NUM_CACHE = 2
-        };
-        ID3D11InputLayout* m_pInputLayout[NUM_CACHE];
-        uint64 m_cacheID[NUM_CACHE];
-#endif
-        SShaderAsyncInfo* m_pAsync;
-
-        SHWSInstance()
-            : m_Ident()
-            , m_nContIndex(0)
-            , m_Handle()
-            , m_eClass(eHWSC_Num)
-            , m_nParams_Inst(-1)
-            , m_fLastAccess(0.0f)
-            , m_nUsed(0)
-            , m_nUsedFrame(0)
-            , m_nFrameSubmit(0)
-            , m_pShaderData(nullptr)
-            , m_nInstMatrixID(1)
-            , m_nInstIndex(-1)
-            , m_nInstructions(0)
-            , m_nTempRegs(0)
-            , m_VStreamMask_Stream(0)
-            , m_VStreamMask_Decl(0)
-            , m_nCache(-1)
-            , m_nParent(-1)
-            , m_bDeleted(false)
-            , m_bHasPMParams(false)
-            , m_bFallback(false)
-            , m_bCompressed(false)
-            , m_bAsyncActivating(false)
-            , m_bHasSendRequest(false)
-            , m_vertexFormat(eVF_P3F_C4B_T2F)
-            , m_nNumInstAttributes(0)
-            , m_nDataSize(0)
-            , m_DeviceObjectID(-1)
-            , m_pAsync(nullptr)
-        {
-            m_nParams[0] = -1;
-            m_nParams[1] = -1;
-            m_nMaxVecs[0] = 0;
-            m_nMaxVecs[1] = 0;
-            m_nMaxVecs[2] = 0;
-
-#if defined(FEATURE_PER_SHADER_INPUT_LAYOUT_CACHE)
-            for (int i = 0; i < NUM_CACHE; ++i)
-            {
-                m_pInputLayout[i] = nullptr;
-                m_cacheID[i] = 0;
-            }
-#endif
-        }
-
-#if defined(FEATURE_PER_SHADER_INPUT_LAYOUT_CACHE)
-        ~SHWSInstance()
-        {
-            for (uint i = 0; i < NUM_CACHE; ++i)
-            {
-                SAFE_RELEASE(m_pInputLayout[i]);
-            }
-        }
-        ID3D11InputLayout* GetCachedInputLayout(uint64 cacheID)
-        {
-            for (uint i = 0; i < NUM_CACHE; ++i)
-            {
-                if (cacheID == m_cacheID[i])
-                {
-                    return m_pInputLayout[i];
-                }
-            }
-            return NULL;
-        }
-        void SetCachedInputLayout(ID3D11InputLayout* pInputLayout, uint64 cacheID)
-        {
-            // First try empy slot
-            for (uint i = 0; i < NUM_CACHE; ++i)
-            {
-                if (m_pInputLayout[i] == NULL)
-                {
-                    m_pInputLayout[i] = pInputLayout;
-                    m_cacheID[i]            = cacheID;
-                    return;
-                }
-            }
-            // Cache is full - look for matching InputLayout
-            for (uint i = 0; i < NUM_CACHE; ++i)
-            {
-                if (m_pInputLayout[i] == pInputLayout)
-                {
-                    m_cacheID[i] = cacheID;
-                    return;
-                }
-            }
-            // Replace first entry (cache is thrashing)
-            SAFE_RELEASE(m_pInputLayout[0]);
-            m_pInputLayout[0] = pInputLayout;
-            m_cacheID[0]            = cacheID;
-        }
-#endif
-        void Release(SShaderDevCache* pCache = NULL, bool bReleaseData = true);
-        void GetInstancingAttribInfo(uint8 Attributes[32], int32 & nUsedAttr, int& nInstAttrMask);
-
-        int Size()
-        {
-            int nSize = sizeof(*this);
-            nSize += sizeOfV(m_pSamplers);
-            nSize += sizeOfV(m_pBindVars);
-
-            return nSize;
-        }
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(m_Handle);
-            pSizer->AddObject(m_pSamplers);
-            pSizer->AddObject(m_pBindVars);
-            pSizer->AddObject(m_pShaderData, m_nDataSize);
-        }
-
-        bool IsAsyncCompiling()
-        {
-            if (m_pAsync || m_bAsyncActivating)
-            {
-                return true;
-            }
-
-            return false;
-        }
-        
-        // CreateInputLayout in D3D11 generates a unique resource depending on the vertex format and the compiled vertex shader.
-        // If an associated vertex shader does not reference certain vertexFormat inputs, then CreateInputLayout can return
-        // a result that will not work for other vertexFormat + vertex shader combinations that do reference the previously unreferenced input.
-        // On some platforms we must generate a key for SOnDemandD3DVertexDeclarationCache that is based both on the vertex shader binary and the vertex format layout.
-        AZ::u32 GenerateVertexDeclarationCacheKey(const AZ::Vertex::Format& vertexFormat);
-    };
-
-    typedef std::vector<SHWSInstance*> InstContainer;
-    typedef InstContainer::iterator InstContainerIt;
-
-    using SCGTextures = AZStd::fixed_vector<SCGTexture, MAX_PF_TEXTURES>;
-    using SCGSamplers = AZStd::fixed_vector<STexSamplerRT, MAX_PF_SAMPLERS>;
-
-    typedef std::multimap<uint64, uint32> THWInstanceLookupMap;
-
-    THWInstanceLookupMap m_LookupMap;
-    bool m_bUseLookUpTable;
-
-public:
-
-    SHWSInstance* m_pCurInst;
-    InstContainer m_Insts;
-
-    static int m_FrameObj;
-    int m_nCurInstFrame;
-
-    // Bin FX support
-    FXShaderToken m_TokenTable;
-    TArray<uint32> m_TokenData;
-
-    virtual int Size()
-    {
-        int nSize = sizeof(*this);
-        nSize += sizeOfVP(m_Insts);
-        nSize += sizeofVector(m_TokenData);
-        nSize += sizeOfV(m_TokenTable);
-
-        return nSize;
-    }
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_pGlobalCache);
-        pSizer->AddObject(m_pDevCache);
-        pSizer->AddObject(m_Insts);
-        pSizer->AddObject(m_TokenData);
-        pSizer->AddObject(m_TokenTable);
-    }
-    CHWShader_D3D()
-    {
-#if !defined(CONSOLE)
-        m_pTree = NULL;
-        m_pParser = NULL;
-#endif
-        mfConstruct();
-    }
-    
-    static void mfInit();
-    void mfConstruct()
-    {
-        if (s_bInitShaders)
-        {
-            s_bInitShaders = false;
-        }
-
-        m_pCurInst = NULL;
-        m_pDevCache = NULL;
-        m_nCurInstFrame = 0;
-
-        m_dwShaderType = 0;
-
-        m_bUseLookUpTable = false;
-
-    }
-
-    void mfFree(uint32 CRC32)
-    {
-#if !defined(CONSOLE)
-        SAFE_DELETE(m_pTree);
-        SAFE_DELETE(m_pParser);
-#endif
-
-        m_Flags = 0;
-        mfReset(CRC32);
-    }
-
-    // Binary cache support
-    SShaderCacheHeaderItem* mfGetCompressedItem(uint32 nFlags, int32& nSize);
-    SShaderCacheHeaderItem* mfGetCacheItem(uint32& nFlags, int32& nSize);
-    static bool mfAddCacheItem(SShaderCache* pCache, SShaderCacheHeaderItem* pItem, const byte* pData, int nLen, bool bFlush, CCryNameTSCRC Name);
-
-    bool mfCloseCacheFile()
-    {
-        SAFE_RELEASE (m_pDevCache);
-        SAFE_RELEASE (m_pGlobalCache);
-
-        return true;
-    }
-
-    static byte* mfBindsToCache(SHWSInstance* pInst, std::vector<SCGBind>* Binds, int nParams, byte* pP);
-    byte* mfBindsFromCache(std::vector<SCGBind>*& Binds, int nParams, byte* pP);
-
-    bool mfActivateCacheItem(CShader* pSH, SShaderCacheHeaderItem* pItem, uint32 nSize, uint32 nFlags);
-    static bool mfCreateCacheItem(SHWSInstance* pInst, std::vector<SCGBind>& InstBinds, byte* pData, int nLen, CHWShader_D3D* pSH, bool bShaderThread);
-
-    int mfGetParams(int Type)
-    {
-        assert(m_pCurInst);
-        return m_pCurInst->m_nParams[Type];
-    }
-
-    bool mfSetHWStartProfile(uint32 nFlags);
-
-    void mfSaveCGFile(const char* scr, const char* path);
-    void mfOutputCompilerError(string& strErr, const char* szSrc);
-    static bool mfCreateShaderEnv(int nThread, SHWSInstance* pInst, LPD3D10BLOB pShader, void* pConstantTable, LPD3D10BLOB pErrorMsgs, std::vector<SCGBind>& InstBindVars, CHWShader_D3D* pSH, bool bShaderThread, CShader* pFXShader, int nCombination, const char* src = NULL);
-    void mfPrintCompileInfo(SHWSInstance* pInst);
-    bool mfCompileHLSL_Int(CShader* pSH, char* prog_text, LPD3D10BLOB* ppShader, void** ppConstantTable, LPD3D10BLOB* ppErrorMsgs, string& strErr, std::vector<SCGBind>& InstBindVars);
-
-    int mfAsyncCompileReady(SHWSInstance* pInst);
-    bool mfRequestAsync(CShader* pSH, SHWSInstance* pInst, std::vector<SCGBind>& InstBindVars, const char* prog_text, const char* szProfile, const char* szEntry);
-
-    void mfSubmitRequestLine(SHWSInstance* pInst, string* pRequestLine = NULL);
-    LPD3D10BLOB mfCompileHLSL(CShader* pSH, char* prog_text, void** ppConstantTable, LPD3D10BLOB* ppErrorMsgs, uint32 nFlags, std::vector<SCGBind>& InstBindVars);
-    bool mfUploadHW(SHWSInstance* pInst, byte* pBuf, uint32 nSize, CShader* pSH, uint32 nFlags);
-    bool mfUploadHW(LPD3D10BLOB pShader, SHWSInstance* pInst, CShader* pSH, uint32 nFlags);
-
-    ED3DShError mfIsValid_Int(SHWSInstance*& pInst, bool bFinalise);
-
-    //ILINE most common outcome
-    ILINE ED3DShError mfIsValid(SHWSInstance*& pInst, bool bFinalise)
-    {
-        if (pInst->m_Handle.m_pShader)
-        {
-            return ED3DShError_Ok;
-        }
-        if (pInst->m_bAsyncActivating)
-        {
-            return ED3DShError_NotCompiled;
-        }
-
-        return mfIsValid_Int(pInst, bFinalise);
-    }
-
-    ED3DShError mfFallBack(SHWSInstance*& pInst, int nStatus);
-    void mfCommitCombinations(int nFrame, int nFrameDiff);
-    void mfCommitCombination(SHWSInstance* pInst, int nFrame, int nFrameDiff);
-    void mfLogShaderCacheMiss(SHWSInstance* pInst);
-    void mfLogShaderRequest(SHWSInstance* pInst);
-
-    void mfBindInstance(SHWSInstance *pInst, EHWShaderClass eHWSC)
-    {
-        m_pCurInst = pInst;
-        if (eHWSC == eHWSC_Vertex)
-        {
-            s_pCurInstVS = pInst;
-            if (s_pCurVS != pInst->m_Handle.m_pShader)
-            {
-                s_pCurVS = pInst->m_Handle.m_pShader;
-#ifndef _RELEASE
-                gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_NumVShadChanges++;
-#endif
-                mfBind();
-            }
-        }
-        else if (eHWSC == eHWSC_Pixel)
-        {
-            s_pCurInstPS = pInst;
-            if (s_pCurPS != pInst->m_Handle.m_pShader)
-            {
-                s_pCurPS = pInst->m_Handle.m_pShader;
-#ifndef _RELEASE
-                gRenDev->m_RP.m_PS[gRenDev->m_RP.m_nProcessThreadID].m_NumPShadChanges++;
-#endif
-                mfBind();
-            }
-        }
-    }
-
-    void mfBind()
-    {
-        if (mfIsValid(m_pCurInst, true) == ED3DShError_Ok)
-        {
-            if (gRenDev->m_nFrameSwapID != m_pCurInst->m_nUsedFrame)
-            {
-                m_pCurInst->m_nUsedFrame = gRenDev->m_nFrameSwapID;
-                m_pCurInst->m_nUsed++;
-            }
-            gcpRendD3D->m_DevMan.BindShader(m_eSHClass, (ID3D11Resource*)m_pCurInst->m_Handle.m_pShader->m_pHandle);
-        }
-    }
-
-    static inline void mfBindGS(SD3DShader* pShader, void* pHandle)
-    {
-        if (s_pCurGS != pShader)
-        {
-            s_pCurGS = pShader;
-#if !defined(_RELEASE)
-            gcpRendD3D->m_RP.m_PS[gcpRendD3D->m_RP.m_nProcessThreadID].m_NumGShadChanges++;
-#endif
-            gcpRendD3D->GetDeviceContext().GSSetShader((ID3D11GeometryShader*)pHandle, NULL, 0);
-        }
-        if (!s_pCurGS)
-        {
-            s_pCurInstGS = NULL;
-            s_nActivationFailMask &= ~(1 << eHWSC_Geometry);
-        }
-    }
-    static inline void mfBindDS(SD3DShader* pShader, void* pHandle)
-    {
-        if (s_pCurDS != pShader)
-        {
-            s_pCurDS = pShader;
-#if !defined(_RELEASE)
-            gcpRendD3D->m_RP.m_PS[gcpRendD3D->m_RP.m_nProcessThreadID].m_NumDShadChanges++;
-#endif
-            gcpRendD3D->GetDeviceContext().DSSetShader((ID3D11DomainShader*)pHandle, NULL, 0);
-        }
-        if (!s_pCurDS)
-        {
-            s_pCurInstDS = NULL;
-            s_nActivationFailMask &= ~(1 << eHWSC_Domain);
-        }
-    }
-    static inline void mfBindHS(SD3DShader* pShader, void* pHandle)
-    {
-        if (s_pCurHS != pShader)
-        {
-            s_pCurHS = pShader;
-#if !defined(_RELEASE)
-            gcpRendD3D->m_RP.m_PS[gcpRendD3D->m_RP.m_nProcessThreadID].m_NumHShadChanges++;
-#endif
-            gcpRendD3D->GetDeviceContext().HSSetShader((ID3D11HullShader*)pHandle, NULL, 0);
-        }
-        if (!s_pCurHS)
-        {
-            s_pCurInstHS = NULL;
-            s_nActivationFailMask &= ~(1 << eHWSC_Hull);
-        }
-    }
-    static inline void mfBindCS(SD3DShader* pShader, void* pHandle)
-    {
-        if (s_pCurCS != pShader)
-        {
-            s_pCurCS = pShader;
-#if !defined(_RELEASE)
-            gcpRendD3D->m_RP.m_PS[gcpRendD3D->m_RP.m_nProcessThreadID].m_NumCShadChanges++;
-#endif
-            gcpRendD3D->GetDeviceContext().CSSetShader((ID3D11ComputeShader*)pHandle, NULL, 0);
-        }
-        if (!s_pCurCS)
-        {
-            s_pCurInstCS = NULL;
-            s_nActivationFailMask &= ~(1 << eHWSC_Compute);
-        }
-    }
-
-    static void UpdatePerMaterialConstantBuffer();
-    static void mfCommitParamsGlobal();
-
-    SCGBind* mfGetParameterBind(const CCryNameR& Name)
-    {
-        if (!m_pCurInst)
-        {
-            return NULL;
-        }
-
-        std::vector<SCGBind>& pBinds = m_pCurInst->m_pBindVars;
-        int i;
-        int nSize = pBinds.size();
-        for (i = 0; i < nSize; i++)
-        {
-            if (Name == pBinds[i].m_Name)
-            {
-                return &pBinds[i];
-            }
-        }
-        return NULL;
-    }
-
-    static void UpdatePerInstanceConstants(
-        EHWShaderClass shaderClass,
-        const SCGParam* parameters,
-        AZ::u32 parameterCount,
-        void* outputData);
-
-    void UpdatePerInstanceConstantBuffer();
-    void UpdatePerBatchConstantBuffer();
-    static void UpdatePerFrameResourceGroup();
-
-    inline void mfSetSamplers(const std::vector<STexSamplerRT>& Samplers, EHWShaderClass eHWClass)
-    {
-        mfSetSamplers_Old(Samplers, eHWClass);
-        if (!m_pCurInst)
-        {
-            return;
-        }
-        SHWSInstance* pInst = m_pCurInst;
-        mfSetSamplers(pInst->m_Samplers, eHWClass);
-        mfSetTextures(pInst->m_Textures, eHWClass);
-    }
-
-    void mfLostDevice(SHWSInstance* pInst, byte* pBuf, int nSize)
-    {
-        pInst->m_Handle.SetFake();
-        pInst->m_Handle.m_pData = new byte[nSize];
-        memcpy(pInst->m_Handle.m_pData, pBuf, nSize);
-        pInst->m_Handle.m_nData = nSize;
-    }
-
-    ILINE int mfCheckActivation(CShader* pSH, SHWSInstance*& pInst, uint32 nFlags)
-    {
-        ED3DShError eError = mfIsValid(pInst, true);
-        if (eError == ED3DShError_NotCompiled)
-        {
-            if (!mfActivate(pSH, nFlags))
-            {
-                pInst = m_pCurInst;
-                if (gRenDev->m_cEF.m_bActivatePhase)
-                {
-                    return 0;
-                }
-                if (!pInst->IsAsyncCompiling())
-                {
-                    pInst->m_Handle.SetNonCompilable();
-                }
-                else
-                {
-                    eError = mfIsValid(pInst, true);
-                    if (eError == ED3DShError_CompilingError || pInst->m_bAsyncActivating)
-                    {
-                        return 0;
-                    }
-                    if (m_eSHClass == eHWSC_Vertex)
-                    {
-                        return 1;
-                    }
-                    else
-                    {
-                        return -1;
-                    }
-                }
-                return 0;
-            }
-            if (gRenDev->m_RP.m_pCurTechnique)
-            {
-                mfUpdatePreprocessFlags(gRenDev->m_RP.m_pCurTechnique);
-            }
-            pInst = m_pCurInst;
-        }
-        else
-            if (eError == ED3DShError_Fake)
-            {
-                if (pInst->m_Handle.m_pData)
-                {
-                    if (gRenDev && !gRenDev->CheckDeviceLost())
-                    {
-                        mfUploadHW(pInst, pInst->m_Handle.m_pData, pInst->m_Handle.m_nData, pSH, nFlags);
-                        SAFE_DELETE_ARRAY(pInst->m_Handle.m_pData);
-                        pInst->m_Handle.m_nData = 0;
-                    }
-                    else
-                    {
-                        eError = ED3DShError_CompilingError;
-                    }
-                }
-            }
-        if (eError == ED3DShError_CompilingError)
-        {
-            return 0;
-        }
-        return 1;
-    }
-
-    void mfSetForOverdraw(SHWSInstance* pInst, uint32 nFlags, uint64& RTMask);
-
-#if !defined(_RELEASE)
-    static void LogSamplerTextureMismatch(const CTexture* pTex, const STexSamplerRT* pSampler, EHWShaderClass shaderClass, const char* pMaterialName);
-#endif
-    static bool mfSetTextures(const std::vector<SCGTexture>& Textures, EHWShaderClass eHWClass);
-    static bool mfSetSamplers(const std::vector<SCGSampler>& Samplers, EHWShaderClass eHWClass);
-    static bool mfSetSamplers_Old(const std::vector<STexSamplerRT>& Samplers, EHWShaderClass eHWClass);
-    SHWSInstance* mfGetInstance(CShader* pSH, SShaderCombIdent& Ident, uint32 nFlags);
-    SHWSInstance* mfGetInstance(CShader* pSH, int nHashInstance, uint64 GLMask);
-    static void mfPrepareShaderDebugInfo(SHWSInstance* pInst, CHWShader_D3D* pSH, const char* szAsm, std::vector<SCGBind>& InstBindVars, void* pBuffer);
-    void mfGetSrcFileName(char* srcName, int nSize);
-    static void mfGetDstFileName(SHWSInstance* pInst, CHWShader_D3D* pSH, char* dstname, int nSize, byte bType);
-    static void mfGenName(SHWSInstance* pInst, char* dstname, int nSize, byte bType);
-    void CorrectScriptEnums(CParserBin& Parser, SHWSInstance* pInst, std::vector<SCGBind>& InstBindVars, FXShaderToken* Table);
-    bool ConvertBinScriptToASCII(CParserBin& Parser, SHWSInstance* pInst, std::vector<SCGBind>& InstBindVars, FXShaderToken* Table, TArray<char>& Scr);
-    void RemoveUnaffectedParameters_D3D10(CParserBin& Parser, SHWSInstance* pInst, std::vector<SCGBind>& InstBindVars);
-    bool mfStoreCacheTokenMap(FXShaderToken*& Table, TArray<uint32>*& pSHData, const char* szName);
-    void mfGetTokenMap(CResFile* pRes, SDirEntry* pDE, FXShaderToken*& Table, TArray<uint32>*& pSHData);
-    void mfSetDefaultRT(uint64& nAndMask, uint64& nOrMask);
-
-public:
-    bool mfGetCacheTokenMap(FXShaderToken*& Table, TArray<uint32>*& pSHData, uint64 nMaskGen);
-    bool mfGenerateScript(CShader* pSH, SHWSInstance*& pInst, std::vector<SCGBind>& InstBindVars, uint32 nFlags, FXShaderToken* Table, TArray<uint32>* pSHData, TArray<char>& sNewScr);
-    bool mfActivate(CShader* pSH, uint32 nFlags, FXShaderToken* Table = NULL, TArray<uint32>* pSHData = NULL, bool bCompressedOnly = false);
-
-    void SetTokenFlags(uint32 nToken);
-    uint64 CheckToken(uint32 nToken);
-    uint64 CheckIfExpr_r(uint32* pTokens, uint32& nCur, uint32 nSize);
-    void mfConstructFX_Mask_RT(FXShaderToken* Table, TArray<uint32>* pSHData);
-    void mfConstructFX(FXShaderToken* Table, TArray<uint32>* pSHData);
-
-    static bool mfAddFXSampler(SHWSInstance* pInst, SShaderFXParams& FXParams, SFXSampler* pr, const char* ParamName, SCGBind* pBind, CShader* ef, EHWShaderClass eSHClass);
-    static bool mfAddFXTexture(SHWSInstance* pInst, SShaderFXParams& FXParams, SFXTexture* pr, const char* ParamName, SCGBind* pBind, CShader* ef, EHWShaderClass eSHClass);
-
-    /* 
-    Add shader parameters during the shader parsing.  A parameters can be Sampler, Texture or Constant 
-    */
-    static void mfAddFXParameter(SHWSInstance* pInst, SParamsGroup& OutParams, SShaderFXParams& FXParams, SFXParam* pr, const char* ParamName, SCGBind* pBind, CShader* ef, bool bInstParam, EHWShaderClass eSHClass);
-    static bool mfAddFXParameter(SHWSInstance* pInst, SParamsGroup& OutParams, SShaderFXParams& FXParams, const char* param, SCGBind* bn, bool bInstParam, EHWShaderClass eSHClass, CShader* pFXShader);
-
-    static void mfGatherFXParameters(SHWSInstance* pInst, std::vector<SCGBind>* InstBindVars, CHWShader_D3D* pSH, int nFlags, CShader* pFXShader);
-
-    /*
-    Associates the final binding of all resources slots per shader instance.
-    */
-    static void mfCreateBinds(SHWSInstance* pInst, void* pConstantTable, byte* pShader, int nSize);
-
-    bool mfUpdateSamplers(CShader* shader);
-    static void mfPostVertexFormat(SHWSInstance * pInst, CHWShader_D3D * pHWSH, bool bCol, byte bNormal, bool bTC0, bool bTC1, bool bPSize, bool bTangent[2], bool bBitangent[2], bool bHWSkin, bool bSH[2], bool bMorphTarget, bool bMorph);
-    void mfUpdateFXVertexFormat(SHWSInstance* pInst, CShader* pSH);
-
-    void ModifyLTMask(uint32& nMask);
-
-public:
-    virtual ~CHWShader_D3D();
-    bool mfSetVS(int nFlags = 0);
-    bool mfSetPS(int nFlags = 0);
-    bool mfSetGS(int nFlags = 0);
-    bool mfSetHS(int nFlags = 0);
-    bool mfSetCS(int nFlags = 0);
-    bool mfSetDS(int nFlags = 0);
-
-    inline bool mfSet(int nFlags = 0)
-    {
-        switch (m_eSHClass)
-        {
-        case eHWSC_Vertex:
-            return mfSetVS(nFlags);
-        case eHWSC_Pixel:
-            return mfSetPS(nFlags);
-        case eHWSC_Geometry:
-            return mfSetGS(nFlags);
-        case eHWSC_Compute:
-            return mfSetCS(nFlags);
-        case eHWSC_Hull:
-            return mfSetHS(nFlags);
-        case eHWSC_Domain:
-            return mfSetDS(nFlags);
-        }
-        return false;
-    }
-
-    virtual bool mfAddEmptyCombination(CShader* pSH, uint64 nRT, uint64 nGL, uint32 nLT);
-    virtual bool mfStoreEmptyCombination(SEmptyCombination& Comb);
-    virtual bool mfSetV(int nFlags = 0){ return mfSet(nFlags); };
-    virtual void mfReset(uint32 CRC32);
-    virtual const char* mfGetEntryName() { return m_EntryFunc.c_str(); }
-    virtual bool mfFlushCacheFile();
-    virtual bool Export(SShaderSerializeContext& SC);
-    virtual bool mfPrecache(SShaderCombination& cmb, bool bForce, bool bFallback, bool bCompressedOnly, CShader* pSH, CShaderResources* pRes);
-
-    // Vertex shader specific functions
-    virtual AZ::Vertex::Format mfVertexFormat(bool& bUseTangents, bool& bUseLM, bool& bUseHWSkin, bool& bUseVertexVelocity);
-    static AZ::Vertex::Format  mfVertexFormat(SHWSInstance* pInst, CHWShader_D3D* pSH, LPD3D10BLOB pBuffer);
-    virtual void mfUpdatePreprocessFlags(SShaderTechnique* pTech);
-
-    virtual const char* mfGetActivatedCombinations(bool bForLevel);
-
-    static void mfSetGlobalParams();
-    static void mfSetCameraParams();
-    static void UpdatePerViewConstantBuffer();
-    static bool mfAddGlobalTexture(SCGTexture& Texture);
-    static bool mfAddGlobalSampler(STexSamplerRT& Sampler);
-
-    static void* GetVSDataForDecl(const D3D11_INPUT_ELEMENT_DESC* pDecl, int nCount, int& nDataSize);
-
-    static void ShutDown();
-
-    static Vec4 GetVolumetricFogParams();
-    static Vec4 GetVolumetricFogRampParams();
-    static void GetFogColorGradientConstants(Vec4& fogColGradColBase, Vec4& fogColGradColDelta);
-    static Vec4 GetFogColorGradientRadial();
-
-    // Import/Export
-    bool ExportSamplers(SCHWShader& SHW, SShaderSerializeContext& SC);
-    bool ExportParams(SCHWShader& SHW, SShaderSerializeContext& SC);
-
-    static CHWShader_D3D::SHWSInstance* s_pCurInstGS;
-    static CHWShader_D3D::SHWSInstance* s_pCurInstDS;
-    static CHWShader_D3D::SHWSInstance* s_pCurInstHS;
-    static CHWShader_D3D::SHWSInstance* s_pCurInstCS;
-    static CHWShader_D3D::SHWSInstance* s_pCurInstVS;
-    static CHWShader_D3D::SHWSInstance* s_pCurInstPS;
-
-    static bool s_bFirstGS;
-    static bool s_bFirstDS;
-    static bool s_bFirstHS;
-    static bool s_bFirstCS;
-    static bool s_bFirstVS;
-    static bool s_bFirstPS;
-
-    static int s_nActivationFailMask;
-
-    static bool s_bInitShaders;
-
-    static int s_nResetDeviceFrame;
-    static int s_nInstFrame;
-
-    static int s_nDevicePSDataSize;
-    static int s_nDeviceVSDataSize;
-
-    static SCGTextures s_PF_Textures;   // Per frame textures (shared between all)
-    static SCGSamplers s_PF_Samplers;   // Per-frame samplers (shared between all)
-
-    friend struct SShaderTechniqueStat;
-};
-
-struct SShaderTechniqueStat
-{
-    SShaderTechnique* pTech;
-    CShader* pShader;
-    CHWShader_D3D* pVS;
-    CHWShader_D3D* pPS;
-    CHWShader_D3D::SHWSInstance* pVSInst;
-    CHWShader_D3D::SHWSInstance* pPSInst;
-};
-
-extern AZStd::vector<SShaderTechniqueStat, AZ::StdLegacyAllocator> g_SelectedTechs;
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShaderCompiling.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShaderCompiling.cpp
deleted file mode 100644
index 89ee65bc91..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DHWShaderCompiling.cpp
+++ /dev/null
@@ -1,5407 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "CryCrc32.h"
-#include "UnalignedBlit.h"
-#include <CryPath.h>
-#include <Pak/CryPakUtils.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DHWSHADERCOMPILING_CPP_SECTION_1 1
-#define D3DHWSHADERCOMPILING_CPP_SECTION_2 2
-#define D3DHWSHADERCOMPILING_CPP_SECTION_3 3
-#define D3DHWSHADERCOMPILING_CPP_SECTION_4 4
-#define D3DHWSHADERCOMPILING_CPP_SECTION_5 5
-#define D3DHWSHADERCOMPILING_CPP_SECTION_6 6
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADERCOMPILING_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DHWShaderCompiling_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif !defined(OPENGL)
-    #include <D3D11Shader.h>
-    #include <D3DCompiler.h>
-#endif
-
-#ifdef CRY_USE_METAL
-#import <Foundation/Foundation.h>
-#endif
-#include "../Common/Shaders/RemoteCompiler.h"
-#include "../Common/RenderCapabilities.h"
-
-#include <AzFramework/IO/FileOperations.h>
-
-static CryCriticalSection g_cAILock;
-static SShaderAsyncInfo g_PendingList;
-static SShaderAsyncInfo g_PendingListT;
-#ifdef SHADER_ASYNC_COMPILATION
-static SShaderAsyncInfo g_BuildList;
-#endif
-
-SShaderAsyncInfo& SShaderAsyncInfo::PendingList() { return g_PendingList; }
-SShaderAsyncInfo& SShaderAsyncInfo::PendingListT() { return g_PendingListT; }
-#ifdef SHADER_ASYNC_COMPILATION
-SShaderAsyncInfo& CAsyncShaderTask::BuildList() { return g_BuildList; }
-#endif
-
-CryEvent SShaderAsyncInfo::s_RequestEv;
-
-int CHWShader_D3D::s_nDevicePSDataSize;
-int CHWShader_D3D::s_nDeviceVSDataSize;
-
-class CSpinLock
-{
-public:
-    CSpinLock()
-    {
-#if defined (WIN32) || defined(LINUX) || defined(APPLE) || defined(IMPLEMENT_SPIN_LOCK_WITH_INTERLOCKED_COMPARE_EXCHANGE)
-        while (CryInterlockedCompareExchange(&s_locked, 1L, 0L) == 1L)
-        {
-            Sleep(0);
-        }
-#endif
-    }
-
-    ~CSpinLock()
-    {
-#if defined (WIN32)
-        InterlockedExchange(&s_locked, 0L);
-#elif defined(LINUX) || defined(APPLE) || defined(IMPLEMENT_SPIN_LOCK_WITH_INTERLOCKED_COMPARE_EXCHANGE)
-        while (CryInterlockedCompareExchange(&s_locked, 0L, 1L) == 0L)
-        {
-            ;
-        }
-#endif
-    }
-
-private:
-    static volatile LONG s_locked;
-};
-
-volatile LONG CSpinLock::s_locked = 0L;
-
-volatile int SShaderAsyncInfo::s_nPendingAsyncShaders = 0;
-
-//------------------------------------------------------------------------------
-// This is the single method that is used to map a sampler and its HW slot.
-// It is called when parsing a shader / loading from cache.
-//------------------------------------------------------------------------------
-bool CHWShader_D3D::mfAddFXSampler(SHWSInstance* pInst, SShaderFXParams& FXParams, SFXSampler* pr, const char* ParamName, SCGBind* pBind, CShader* ef, EHWShaderClass eSHClass)
-{
-    assert(pBind);
-    if (!pBind)
-    {
-        return false;
-    }
-
-    std::vector<SCGSampler>* pParams;
-    pParams = &pInst->m_Samplers;
-    uint32 nOffs = pParams->size();
-    bool bRes = gRenDev->m_cEF.mfParseFXSampler(FXParams, pr, ParamName, ef, pBind->m_RegisterCount, pParams, eSHClass);
-    if (pParams->size() > nOffs)
-    {
-        for (uint32 i = 0; i < pParams->size() - nOffs; i++)
-        {
-            SCGSampler& p = (*pParams)[nOffs + i];
-            p.m_RegisterOffset = pBind->m_RegisterOffset + i;
-            p.m_BindingSlot = pBind->m_BindingSlot;
-            p.m_Name = pBind->m_Name;
-        }
-    }
-    // Parameter without semantic
-    return bRes;
-}
-
-//------------------------------------------------------------------------------
-// The main texture binding method.
-// This is the single method that is used to map a texture and its HW slot.
-// It is called when going over a shader / loading from cache.
-//------------------------------------------------------------------------------
-bool CHWShader_D3D::mfAddFXTexture(
-    SHWSInstance* pInst, SShaderFXParams& FXParams, SFXTexture* pr, const char* ParamName, 
-    SCGBind* pBind, CShader* ef, EHWShaderClass eSHClass)
-{
-    assert(pBind);
-    if (!pBind)
-    {
-        return false;
-    }
-
-    std::vector<SCGTexture>* pParams;
-    pParams = &pInst->m_Textures;
-    uint32 nOffs = pParams->size();
-    bool bRes = gRenDev->m_cEF.mfParseFXTexture(FXParams, pr, ParamName, ef, pBind->m_RegisterCount, pParams, eSHClass);
-    
-    if (pParams->size() > nOffs)
-    {   // If the texture was added
-        for (uint32 i = 0; i < pParams->size() - nOffs; i++)
-        {
-            SCGTexture& p = (*pParams)[nOffs + i];
-            p.m_RegisterOffset = pBind->m_RegisterOffset + i;   // Offset by one and set it for this texture
-            p.m_BindingSlot = pBind->m_BindingSlot;             // Set the passed binding slot 
-            p.m_Name = pBind->m_Name;
-        }
-    }
-    // Parameter without semantic
-    return bRes;
-}
-
-//------------------------------------------------------------------------------
-// This is the single method that is used to map constant parameter and its HW slot.
-// It is called when parsing a shader / loading from cache.
-//------------------------------------------------------------------------------
-void CHWShader_D3D::mfAddFXParameter( 
-    [[maybe_unused]] SHWSInstance* pInst, SParamsGroup& OutParams, SShaderFXParams& FXParams, 
-    SFXParam* pr, const char* ParamName, SCGBind* pBind, CShader* ef, bool bInstParam, EHWShaderClass eSHClass)
-{
-    SCGParam CGpr;
-
-    assert(pBind);
-    if (!pBind)
-    {
-        return;
-    }
-
-    int nComps = 0;
-    int nParams = pBind->m_RegisterCount;
-    if (!pr->m_Semantic.empty())
-    {
-        nComps = pr->m_ComponentCount;
-    }
-    else
-    {
-        for (int i = 0; i < pr->m_ComponentCount; i++)
-        {
-            CryFixedStringT<128> cur;
-            pr->GetParamComp(i, cur);
-            if (cur.empty())
-            {
-                break;
-            }
-            nComps++;
-        }
-    }
-    // Process parameters only with semantics
-    if (nComps && nParams)
-    {
-        std::vector<SCGParam>* pParams;
-        if (bInstParam)
-        {
-            pParams = &OutParams.Params_Inst;
-        }
-        else
-        {
-            pParams = &OutParams.Params[0];
-        }
-        uint32 nOffs = pParams->size();
-        [[maybe_unused]] bool bRes = gRenDev->m_cEF.mfParseFXParameter(FXParams, pr, ParamName, ef, bInstParam, pBind->m_RegisterCount, pParams, eSHClass, false);
-        AZ_Assert(bRes, "Error: CHWShader_D3D::mfAddFXParameter - bRes is false");
-
-        if (pParams->size() > nOffs)
-        {
-            for (uint32 i = 0; i < pParams->size() - nOffs; i++)
-            {
-                //assert(pBind->m_nComponents == 1);
-                SCGParam& p = (*pParams)[nOffs + i];
-                p.m_RegisterOffset = pBind->m_RegisterOffset + i;
-                p.m_BindingSlot = pBind->m_BindingSlot;
-            }
-        }
-    }
-    // Parameter without semantic
-}
-
-struct SAliasSampler
-{
-    STexSamplerRT Sampler;
-    string NameTex;
-};
-
-bool CHWShader_D3D::mfAddFXParameter(SHWSInstance* pInst, SParamsGroup& OutParams, SShaderFXParams& FXParams, const char* param, SCGBind* bn, bool bInstParam, EHWShaderClass eSHClass, CShader* pFXShader)
-{
-    if (bn->m_RegisterOffset & SHADER_BIND_TEXTURE)
-    {
-        SFXTexture* pr = gRenDev->m_cEF.mfGetFXTexture(FXParams.m_FXTextures, param);
-        if (pr)
-        {
-            if (bn->m_RegisterCount < 0)
-            {
-                bn->m_RegisterCount = pr->m_nArray;
-            }
-            return true;
-        }
-    }
-    else
-    if (bn->m_RegisterOffset & SHADER_BIND_SAMPLER)
-    {
-        SFXSampler* pr = gRenDev->m_cEF.mfGetFXSampler(FXParams.m_FXSamplers, param);
-        if (pr)
-        {
-            if (bn->m_RegisterCount < 0)
-            {
-                bn->m_RegisterCount = pr->m_nArray;
-            }
-            return true;
-        }
-    }
-    else
-    {
-        SFXParam* pr = gRenDev->m_cEF.mfGetFXParameter(FXParams.m_FXParams, param);
-        if (pr)
-        {
-            if (bn->m_RegisterCount < 0)
-            {
-                bn->m_RegisterCount = pr->m_RegisterCount;
-            }
-            mfAddFXParameter(pInst, OutParams, FXParams, pr, param, bn, pFXShader, bInstParam, eSHClass);
-            return true;
-        }
-    }
-    return false;
-}
-
-//==================================================================================================================
-
-int CGBindCallback(const VOID* arg1, const VOID* arg2)
-{
-    SCGBind* pi1 = (SCGBind*)arg1;
-    SCGBind* pi2 = (SCGBind*)arg2;
-
-    if (pi1->m_RegisterOffset < pi2->m_RegisterOffset)
-    {
-        return -1;
-    }
-    if (pi1->m_RegisterOffset > pi2->m_RegisterOffset)
-    {
-        return 1;
-    }
-
-    return 0;
-}
-
-const char* ReflectedConstantBufferNames[eConstantBufferShaderSlot_ReflectedCount] = {"PER_BATCH", "PER_INSTANCE", "PER_MATERIAL"};
-
-void CHWShader_D3D::mfCreateBinds(SHWSInstance* pInst, void* pConstantTable, [[maybe_unused]] byte* pShader, [[maybe_unused]] int nSize)
-{
-    uint32 i;
-    ID3D11ShaderReflection* pShaderReflection = (ID3D11ShaderReflection*)pConstantTable;
-    D3D11_SHADER_DESC Desc;
-    pShaderReflection->GetDesc(&Desc);
-    ID3D11ShaderReflectionConstantBuffer* pCB = NULL;
-    for (uint32 n = 0; n < Desc.ConstantBuffers; n++)
-    {
-        pCB = pShaderReflection->GetConstantBufferByIndex(n);
-        D3D11_SHADER_BUFFER_DESC SBDesc;
-        pCB->GetDesc(&SBDesc);
-        if (SBDesc.Type == D3D11_CT_RESOURCE_BIND_INFO)
-        {
-            continue;
-        }
-        int nCB;
-        if (!strcmp("$Globals", SBDesc.Name))
-        {
-            nCB = eConstantBufferShaderSlot_PerBatch;
-        }
-        else
-        {
-            for (nCB = 0; nCB < eConstantBufferShaderSlot_ReflectedCount; nCB++)
-            {
-                if (!strcmp(ReflectedConstantBufferNames[nCB], SBDesc.Name))
-                {
-                    break;
-                }
-            }
-        }
-        if (nCB >= eConstantBufferShaderSlot_ReflectedCount)  // Allow having custom cbuffers in shaders
-        {
-            continue;
-        }
-        for (i = 0; i < SBDesc.Variables; i++)
-        {
-            ID3D11ShaderReflectionVariable* pCV = pCB->GetVariableByIndex(i);
-            ID3D11ShaderReflectionType* pVT = pCV->GetType();
-            D3D11_SHADER_VARIABLE_DESC CDesc;
-            D3D11_SHADER_TYPE_DESC CTDesc;
-            pVT->GetDesc(&CTDesc);
-            pCV->GetDesc(&CDesc);
-            if (!(CDesc.uFlags & D3D10_SVF_USED))
-            {
-                continue;
-            }
-            if (CTDesc.Class == D3D10_SVC_VECTOR || CTDesc.Class == D3D10_SVC_SCALAR || CTDesc.Class == D3D10_SVC_MATRIX_COLUMNS || CTDesc.Class == D3D10_SVC_MATRIX_ROWS)
-            {
-                SCGBind cgp;
-                assert(!(CDesc.StartOffset & 0xf));
-                //assert(!(CDesc.Size & 0xf));
-                int nReg = CDesc.StartOffset >> 4;
-                cgp.m_RegisterOffset = nReg; //<<2;
-                cgp.m_BindingSlot = nCB;
-                cgp.m_RegisterCount = (CDesc.Size + 15) >> 4;
-                cgp.m_Name = CDesc.Name;
-                cgp.m_Flags = CParserBin::GetCRC32(CDesc.Name);
-                pInst->m_pBindVars.push_back(cgp);
-            }
-            else
-            {
-                assert(false);
-            }
-        }
-    }
-
-    D3D11_SHADER_INPUT_BIND_DESC IBDesc;
-    for (i = 0; i < Desc.BoundResources; i++)
-    {
-        ZeroStruct(IBDesc);
-        pShaderReflection->GetResourceBindingDesc(i, &IBDesc);
-        SCGBind cgp;
-        if (IBDesc.Type == D3D10_SIT_TEXTURE)
-        {
-            cgp.m_RegisterOffset = IBDesc.BindPoint | SHADER_BIND_TEXTURE;
-        }
-        else
-        if (IBDesc.Type == D3D10_SIT_SAMPLER)
-        {
-            cgp.m_RegisterOffset = IBDesc.BindPoint | SHADER_BIND_SAMPLER;
-        }
-        else
-        {
-            continue;
-        }
-
-        if (IBDesc.Dimension == D3D10_SRV_DIMENSION_BUFFER)
-        {
-            continue;
-        }
-
-        cgp.m_BindingSlot = IBDesc.BindPoint;
-        cgp.m_RegisterCount = IBDesc.BindCount;
-        cgp.m_Name = IBDesc.Name;
-        cgp.m_Flags = CParserBin::GetCRC32(IBDesc.Name);
-        pInst->m_pBindVars.push_back(cgp);
-    }
-}
-
-void CHWShader_D3D::mfGatherFXParameters(SHWSInstance* pInst, std::vector<SCGBind>* InstBindVars, CHWShader_D3D* pSH, int nFlags, CShader* pFXShader)
-{
-    //  LOADING_TIME_PROFILE_SECTION(iSystem);
-
-    std::vector<SCGBind>& parameters = pInst->m_pBindVars;
-
-    uint32 i, j;
-    SAliasSampler samps[MAX_TMU];
-    int nMaxSampler = -1;
-    SParamsGroup Group;
-    SShaderFXParams& FXParams = gRenDev->m_cEF.m_Bin.mfGetFXParams(pInst->m_bFallback ? CShaderMan::s_ShaderFallback : pFXShader);
-    if (parameters.size())
-    {
-        std::list<uint32> skipped;
-
-        for (i = 0; i < parameters.size(); i++)
-        {
-            SCGBind* bn = &parameters[i];
-            const char* param = bn->m_Name.c_str();
-            if (!strncmp(param, "_g_", 3))
-            {
-                continue;
-            }
-            bool bRes = mfAddFXParameter(pInst, Group, FXParams, param, bn, false, pSH->m_eSHClass, pFXShader);
-            if (!bRes && (bn->m_RegisterOffset & SHADER_BIND_TEXTURE)) // try to find old samplers (Without semantics)
-            {
-                skipped.push_back(i);
-            }
-        }
-
-        bool setSamplers[256] = { false };
-        bool setTextures[256] = { false };
-
-        for (i = 0; i < pInst->m_Samplers.size(); i++)
-        {
-            setSamplers[pInst->m_Samplers[i].m_RegisterOffset & 0xff] = true;
-        }
-        for (i = 0; i < pInst->m_Textures.size(); i++)
-        {
-            setTextures[pInst->m_Textures[i].m_RegisterOffset & 0xff] = true;
-        }
-
-        while (skipped.size() > 0)
-        {
-            i = skipped.front();
-            skipped.pop_front();
-
-            SCGBind *bn = &parameters[i];
-            const char *param = bn->m_Name.c_str();
-
-            {
-                for (j = 0; j < (uint32)FXParams.m_FXSamplersOld.size(); j++)
-                {
-                    STexSamplerFX* sm = &FXParams.m_FXSamplersOld[j];
-                    if (!azstricmp(sm->m_szName.c_str(), param))
-                    {
-                        int nSampler = bn->m_RegisterOffset & 0x7f;
-                        if (nSampler < MAX_TMU)
-                        {
-                            nMaxSampler = max(nSampler, nMaxSampler);
-                            samps[nSampler].Sampler = STexSamplerRT(*sm);
-                            samps[nSampler].NameTex = sm->m_szTexture;
-                            samps[nSampler].Sampler.m_nSamplerSlot = (int8)(bn->m_BindingSlot & 0xff);
-                            samps[nSampler].Sampler.m_nTextureSlot = nSampler;
-
-                            for (int k = 0; k < parameters.size(); k++)
-                            {
-                                if (parameters[k].m_RegisterOffset & SHADER_BIND_TEXTURE)
-                                {
-                                    if (!azstricmp(parameters[k].m_Name.c_str(), param))
-                                    {
-                                        samps[nSampler].Sampler.m_nTextureSlot = (int8)parameters[k].m_BindingSlot;
-                                    }
-                                }
-                            }
-
-                            for (int k = 0; k < parameters.size(); k++)
-                            {
-                                if (parameters[k].m_RegisterOffset & SHADER_BIND_SAMPLER)
-                                {
-                                    if (!azstricmp(parameters[k].m_Name.c_str(), param))
-                                    {
-                                        samps[nSampler].Sampler.m_nSamplerSlot = (int8)parameters[k].m_BindingSlot;
-                                    }
-                                }
-                            }
-
-
-                            // Texture slot occupied, search an alternative
-                            if (setSamplers[samps[nSampler].Sampler.m_nSamplerSlot])
-                            {
-                                uint32 f = 0; while (setSamplers[f]) ++f;
-                                samps[nSampler].Sampler.m_nSamplerSlot = f;
-                                assert(f < 16);
-                            }
-
-                            // Sampler slot occupied, search an alternative
-                            if (setTextures[samps[nSampler].Sampler.m_nTextureSlot])
-                            {
-                                uint32 f = 0; while (setTextures[f]) ++f;
-                                samps[nSampler].Sampler.m_nTextureSlot = f;
-                                assert(f < 256);
-                            }
-
-                            setTextures[samps[nSampler].Sampler.m_nTextureSlot] = true;
-                            setSamplers[samps[nSampler].Sampler.m_nSamplerSlot] = true;
-
-                            break;
-                        }
-                    }
-                }
-                if (j == FXParams.m_FXSamplersOld.size())
-                {
-                    for (j = 0; j < (uint32)FXParams.m_FXSamplersOld.size(); j++)
-                    {
-                        STexSamplerFX* sm = &FXParams.m_FXSamplersOld[j];
-                        const char* src = sm->m_szName.c_str();
-                        char name[128];
-                        int n = 0;
-                        while (src[n])
-                        {
-                            if (src[n] <= 0x20 || src[n] == '[')
-                            {
-                                break;
-                            }
-                            name[n] = src[n];
-                            n++;
-                        }
-                        name[n] = 0;
-                        if (!azstricmp(name, param))
-                        {
-                            int nSampler = bn->m_RegisterOffset & 0x7f;
-                            if (nSampler < MAX_TMU)
-                            {
-                                samps[nSampler].Sampler = STexSamplerRT(*sm);
-                                samps[nSampler].NameTex = sm->m_szTexture;
-                                samps[nSampler].Sampler.m_nSamplerSlot = (int8)(bn->m_BindingSlot & 0xff);
-                                samps[nSampler].Sampler.m_nTextureSlot = nSampler;
-
-                                for (int k = 0; k < parameters.size(); k++)
-                                {
-                                    if (parameters[k].m_RegisterOffset & SHADER_BIND_TEXTURE)
-                                    {
-                                        if (!azstricmp(parameters[k].m_Name.c_str(), param))
-                                        {
-                                            samps[nSampler].Sampler.m_nTextureSlot = (int8)parameters[k].m_BindingSlot;
-                                        }
-                                    }
-                                }
-
-                                for (int k = 0; k < parameters.size(); k++)
-                                {
-                                    if (parameters[k].m_RegisterOffset & SHADER_BIND_SAMPLER)
-                                    {
-                                        if (!azstricmp(parameters[k].m_Name.c_str(), param))
-                                        {
-                                            samps[nSampler].Sampler.m_nSamplerSlot = (int8)parameters[k].m_BindingSlot;
-                                        }
-                                    }
-                                }
-
-                                // Texture slot occupied, search an alternative
-                                if (setSamplers[samps[nSampler].Sampler.m_nSamplerSlot])
-                                {
-                                    uint32 f = 0; while (setSamplers[f]) ++f;
-                                    samps[nSampler].Sampler.m_nSamplerSlot = f;
-                                    assert(f < 16);
-                                }
-
-                                // Sampler slot occupied, search an alternative
-                                if (setTextures[samps[nSampler].Sampler.m_nTextureSlot])
-                                {
-                                    uint32 f = 0; while (setTextures[f]) ++f;
-                                    samps[nSampler].Sampler.m_nTextureSlot = f;
-                                    assert(f < 256);
-                                }
-
-                                setTextures[samps[nSampler].Sampler.m_nTextureSlot] = true;
-                                setSamplers[samps[nSampler].Sampler.m_nSamplerSlot] = true;
-
-                                for (int nS = 0; nS < bn->m_RegisterCount; nS++)
-                                {
-                                    nMaxSampler = max(nSampler + nS, nMaxSampler);
-                                    samps[nSampler + nS].Sampler = samps[nSampler].Sampler;
-                                    samps[nSampler + nS].NameTex = sm->m_szTexture;
-                                }
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    if (nFlags != 1)
-    {
-        for (i = 0; (int)i <= nMaxSampler; i++)
-        {
-            STexSamplerRT& smp = samps[i].Sampler;
-            smp.m_pTex = gRenDev->m_cEF.mfParseFXTechnique_LoadShaderTexture(&smp, samps[i].NameTex.c_str(), NULL, NULL, i, eCO_NOSET, eCO_NOSET, DEF_TEXARG0, DEF_TEXARG0);
-            if (!smp.m_pTex)
-            {
-                continue;
-            }
-            if (smp.m_bGlobal)
-            {
-                mfAddGlobalSampler(smp);
-            }
-            else
-            {
-                pInst->m_pSamplers.push_back(smp);
-            }
-        }
-    }
-    else
-    {
-        assert(pInst->m_pAsync);
-        if (pInst->m_pAsync && nMaxSampler >= 0)
-        {
-            pInst->m_pAsync->m_bPendedSamplers = true;
-        }
-    }
-
-    pInst->m_nMaxVecs[0] = pInst->m_nMaxVecs[1] = 0;
-    if (parameters.size())
-    {
-        for (i = 0; i < parameters.size(); i++)
-        {
-            SCGBind* pB = &parameters[i];
-            if (pB->m_RegisterOffset & (SHADER_BIND_SAMPLER | SHADER_BIND_TEXTURE))
-            {
-                continue;
-            }
-            if (pB->m_BindingSlot < 0 || pB->m_BindingSlot > 2)
-            {
-                continue;
-            }
-            for (j = 0; j < Group.Params[0].size(); j++)
-            {
-                SCGParam* pr = &Group.Params[0][j];
-                if (pr->m_RegisterOffset == pB->m_RegisterOffset && pr->m_Name == pB->m_Name)
-                {
-                    break;
-                }
-            }
-            if (j != Group.Params[0].size())
-            {
-                continue;
-            }
-            if (pB->m_BindingSlot < 3)
-            {
-                pInst->m_nMaxVecs[pB->m_BindingSlot] = max(pB->m_RegisterOffset + pB->m_RegisterCount, pInst->m_nMaxVecs[pB->m_BindingSlot]);
-            }
-        }
-    }
-    if (Group.Params[0].size())
-    {
-        for (i = 0; i < Group.Params[0].size(); i++)
-        {
-            SCGParam* pr = &Group.Params[0][i];
-
-            if (pr->m_Flags & PF_MATERIAL)
-            {
-                pInst->m_bHasPMParams = true;
-            }
-        }
-
-        gRenDev->m_cEF.mfCheckObjectDependParams(Group.Params[0], Group.Params[1], pSH->m_eSHClass, pFXShader);
-    }
-
-    for (i = 0; i < 2; i++)
-    {
-        if (Group.Params[i].size())
-        {
-            for (j = 0; j < Group.Params[i].size(); j++)
-            {
-                const SCGParam* pr = &Group.Params[i][j];
-                pInst->m_nMaxVecs[i] = max(pr->m_RegisterOffset + pr->m_RegisterCount, pInst->m_nMaxVecs[i]);
-            }
-        }
-    }
-#if !defined(NDEBUG)
-    int nMax = AzRHI::GetConstantRegisterCountMax(pSH->m_eSHClass);
-    assert(pInst->m_nMaxVecs[0] < nMax);
-    assert(pInst->m_nMaxVecs[1] < nMax);
-#endif
-
-    if ((pInst->m_Ident.m_RTMask & g_HWSR_MaskBit[HWSR_INSTANCING_ATTR]) && pSH->m_eSHClass == eHWSC_Vertex)
-    {
-        int nNumInst = 0;
-        if (InstBindVars)
-        {
-            for (i = 0; i < (uint32)InstBindVars->size(); i++)
-            {
-                SCGBind& b = (*InstBindVars)[i];
-                int nID = b.m_RegisterOffset;
-                if (!nNumInst)
-                {
-                    pInst->m_nInstMatrixID = nID;
-                }
-
-                SCGBind bn;
-                bn.m_RegisterCount = b.m_RegisterCount;
-                bn.m_RegisterOffset = nID;
-
-                nNumInst++;
-            }
-        }
-        //assert(cgi->m_nNumInstAttributes == nNumInst);
-        pInst->m_nNumInstAttributes = nNumInst;
-
-        if (Group.Params_Inst.size())
-        {
-            qsort(&Group.Params_Inst[0], Group.Params_Inst.size(), sizeof(SCGParam), CGBindCallback);
-            pInst->m_nParams_Inst = CGParamManager::GetParametersGroup(Group, 2);
-        }
-    }
-    if (Group.Params[0].size() > 0)
-    {
-        qsort(&Group.Params[0][0], Group.Params[0].size(), sizeof(SCGParam), CGBindCallback);
-        pInst->m_nParams[0] = CGParamManager::GetParametersGroup(Group, 0);
-    }
-    if (Group.Params[1].size() > 0)
-    {
-        qsort(&Group.Params[1][0], Group.Params[1].size(), sizeof(SCGParam), CGBindCallback);
-        pInst->m_nParams[1] = CGParamManager::GetParametersGroup(Group, 1);
-    }
-}
-
-// Vertex shader specific
-void CHWShader_D3D::mfUpdateFXVertexFormat([[maybe_unused]] SHWSInstance* pInst, CShader* pSH)
-{
-    // Update global FX shader's vertex format / flags
-    if (pSH)
-    {
-        AZ::Vertex::Format vertexFormat = pSH->m_vertexFormat;
-        bool bCurrent = false;
-        for (uint32 i = 0; i < pSH->m_HWTechniques.Num(); i++)
-        {
-            SShaderTechnique* hw = pSH->m_HWTechniques[i];
-            for (uint32 j = 0; j < hw->m_Passes.Num(); j++)
-            {
-                SShaderPass* pass = &hw->m_Passes[j];
-                if (pass->m_VShader)
-                {
-                    if (pass->m_VShader == this)
-                    {
-                        bCurrent = true;
-                    }
-                    bool bUseLM = false;
-                    bool bUseTangs = false;
-                    bool bUseHWSkin = false;
-                    bool bUseVertexVelocity = false;
-                    AZ::Vertex::Format currentVertexFormat = pass->m_VShader->mfVertexFormat(bUseTangs, bUseLM, bUseHWSkin, bUseVertexVelocity);
-                    if (currentVertexFormat > vertexFormat)
-                    {
-                        vertexFormat = currentVertexFormat;
-                    }
-                    if (bUseTangs)
-                    {
-                        pass->m_PassFlags |= VSM_TANGENTS;
-                    }
-                    if (bUseHWSkin)
-                    {
-                        pass->m_PassFlags |= VSM_HWSKIN;
-                    }
-                    if (bUseVertexVelocity)
-                    {
-                        pass->m_PassFlags |= VSM_VERTEX_VELOCITY;
-                    }
-                }
-            }
-        }
-        //assert (bCurrent);
-        pSH->m_vertexFormat = vertexFormat;
-    }
-}
-
-void CHWShader_D3D::mfPostVertexFormat(SHWSInstance* pInst, [[maybe_unused]] CHWShader_D3D* pHWSH, bool bCol, byte bNormal, bool bTC0, bool bTC1, bool bPSize, bool bTangent[2], bool bBitangent[2], bool bHWSkin, [[maybe_unused]] bool bSH[2], bool bVelocity, bool bMorph)
-{
-    if (bBitangent[0])
-    {
-        pInst->m_VStreamMask_Decl |= 1 << VSF_TANGENTS;
-    }
-    else
-    if (bTangent[0])
-    {
-        pInst->m_VStreamMask_Decl |= 1 << VSF_QTANGENTS;
-    }
-    if (bBitangent[1])
-    {
-        pInst->m_VStreamMask_Stream |= 1 << VSF_TANGENTS;
-    }
-    else
-    if (bTangent[1])
-    {
-        pInst->m_VStreamMask_Stream |= 1 << VSF_QTANGENTS;
-    }
-    if (pInst->m_VStreamMask_Decl & (1 << VSF_TANGENTS))
-    {
-        bNormal = false;
-    }
-
-    if (bHWSkin)
-    {
-        pInst->m_VStreamMask_Decl |= VSM_HWSKIN;
-        pInst->m_VStreamMask_Stream |= VSM_HWSKIN;
-    }
-
-    if (bVelocity)
-    {
-        pInst->m_VStreamMask_Decl |= VSM_VERTEX_VELOCITY;
-        pInst->m_VStreamMask_Stream |= VSM_VERTEX_VELOCITY;
-    }
-    if (bMorph)
-    {
-        pInst->m_VStreamMask_Decl |= VSM_MORPHBUDDY;
-        pInst->m_VStreamMask_Stream |= VSM_MORPHBUDDY;
-    }
-
-    pInst->m_vertexFormat = AZ::Vertex::VertFormatForComponents(bCol, bTC0, bTC1, bPSize, bNormal != 0);
-}
-
-AZ::Vertex::Format CHWShader_D3D::mfVertexFormat(bool& bUseTangents, bool& bUseLM, bool& bUseHWSkin, bool& bUseVertexVelocity)
-{
-    uint32 i;
-
-    assert (m_eSHClass == eHWSC_Vertex);
-
-    AZ::Vertex::Format vertexFormat(eVF_Unknown);
-    int nStream = 0;
-    for (i = 0; i < m_Insts.size(); i++)
-    {
-        SHWSInstance* pInst = m_Insts[i];
-        if (pInst->m_vertexFormat > vertexFormat)
-        {
-            vertexFormat = pInst->m_vertexFormat;
-        }
-        nStream |= pInst->m_VStreamMask_Stream;
-    }
-    bUseTangents = (nStream & VSM_TANGENTS) != 0;
-    bUseLM = false;
-    bUseHWSkin = (nStream & VSM_HWSKIN) != 0;
-    bUseVertexVelocity = (nStream & VSM_VERTEX_VELOCITY) != 0;
-    return vertexFormat;
-}
-
-AZ::Vertex::Format CHWShader_D3D::mfVertexFormat(SHWSInstance* pInst, CHWShader_D3D* pSH, LPD3D10BLOB pShader)
-{
-    assert (pSH->m_eSHClass == eHWSC_Vertex);
-
-    byte bNormal = false;
-    bool bTangent[2] = {false, false};
-    bool bBitangent[2] = {false, false};
-    bool bHWSkin = false;
-    bool bVelocity = false;
-    bool bMorph = false;
-    bool bPSize = false;
-    bool bSH[2] = {false, false};
-    bool bTC0 = false;
-    bool bTC1[2] = {false, false};
-    bool bCol = false;
-    bool bSecCol = false;
-    bool bPos = false;
-
-    size_t nSize = pShader->GetBufferSize();
-    void* pData = pShader->GetBufferPointer();
-    void* pShaderReflBuf;
-    HRESULT hr = D3DReflect(pData, nSize, IID_ID3D11ShaderReflection, &pShaderReflBuf);
-    assert (SUCCEEDED(hr));
-    ID3D11ShaderReflection* pShaderReflection = (ID3D11ShaderReflection*)pShaderReflBuf;
-    if (!SUCCEEDED(hr))
-    {
-        return AZ::Vertex::Format(eVF_Unknown);
-    }
-    D3D11_SHADER_DESC Desc;
-    pShaderReflection->GetDesc(&Desc);
-    if (!Desc.InputParameters)
-    {
-        return AZ::Vertex::Format(eVF_Unknown);
-    }
-    D3D11_SIGNATURE_PARAMETER_DESC IDesc;
-    for (uint32 i = 0; i < Desc.InputParameters; i++)
-    {
-        pShaderReflection->GetInputParameterDesc(i, &IDesc);
-        //if (!IDesc.ReadWriteMask)
-        //  continue;
-        if (!IDesc.SemanticName)
-        {
-            continue;
-        }
-        int nIndex;
-        if (!_strnicmp(IDesc.SemanticName, "POSITION", 8)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADERCOMPILING_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DHWShaderCompiling_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            || !_strnicmp(IDesc.SemanticName, "SV_POSITION", 11)
-#endif
-            )
-        {
-            nIndex = IDesc.SemanticIndex;
-            if (nIndex == 0)
-            {
-                bPos = true;
-            }
-            else
-            if (nIndex == 3)
-            {
-                bVelocity = true;
-            }
-            else
-            if (nIndex == 4)
-            {
-                bHWSkin = true;
-            }
-            else
-            if (nIndex == 8)
-            {
-                bMorph = true;
-            }
-            else
-            {
-                assert(false);
-            }
-        }
-        else
-        if (!_strnicmp(IDesc.SemanticName, "NORMAL", 6))
-        {
-            bNormal = true;
-        }
-        else
-        if (!_strnicmp(IDesc.SemanticName, "TEXCOORD", 8))
-        {
-            nIndex = IDesc.SemanticIndex;
-            if (nIndex == 0)
-            {
-                bTC0 = true;
-            }
-            else
-            if (!(pInst->m_Ident.m_RTMask & g_HWSR_MaskBit[HWSR_INSTANCING_ATTR]))
-            {
-                if (nIndex == 1)
-                {
-                    bTC1[0] = true;
-                    if (IDesc.ReadWriteMask)
-                    {
-                        bTC1[1] = true;
-                    }
-                }
-                else
-                if (nIndex == 8)
-                {
-                    bMorph = true;
-                }
-            }
-        }
-        else
-        if (!_strnicmp(IDesc.SemanticName, "COLOR", 5))
-        {
-            nIndex = IDesc.SemanticIndex;
-            if (nIndex == 0)
-            {
-                bCol = true;
-            }
-            else
-            if (nIndex == 1)
-            {
-                bSecCol = true;
-            }
-            else
-            {
-                if (nIndex == 2 || nIndex == 3)
-                {
-                    bSH[0] = true;
-                    if (IDesc.ReadWriteMask)
-                    {
-                        bSH[1] = true;
-                    }
-                }
-                else
-                {
-                    assert(false);
-                }
-            }
-        }
-        else
-        if (!azstricmp(IDesc.SemanticName, "TANGENT"))
-        {
-            bTangent[0] = true;
-            if (IDesc.ReadWriteMask)
-            {
-                bTangent[1] = true;
-            }
-        }
-        else
-        if (!azstricmp(IDesc.SemanticName, "BITANGENT") || !azstricmp(IDesc.SemanticName, "BINORMAL"))
-        {
-            bBitangent[0] = true;
-            if (IDesc.ReadWriteMask)
-            {
-                bBitangent[1] = true;
-            }
-        }
-        else
-        if (!_strnicmp(IDesc.SemanticName, "PSIZE", 5))
-        {
-            bPSize = true;
-        }
-        else
-        if (!_strnicmp(IDesc.SemanticName, "BLENDWEIGHT", 11) || !_strnicmp(IDesc.SemanticName, "BLENDINDICES", 12))
-        {
-            nIndex = IDesc.SemanticIndex;
-            if (nIndex == 0)
-            {
-                bHWSkin = true;
-            }
-            else
-            if (nIndex == 1)
-            {
-                bMorph = true;
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-        else
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADERCOMPILING_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(D3DHWShaderCompiling_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        if (!_strnicmp(IDesc.SemanticName, "SV_", 3))
-#endif
-        {
-            // SV_ are valid semantics
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-    mfPostVertexFormat(pInst, pSH, bCol, bNormal, bTC0, bTC1[0], bPSize, bTangent, bBitangent, bHWSkin, bSH, bVelocity, bMorph);
-    SAFE_RELEASE(pShaderReflection);
-
-    return pInst->m_vertexFormat;
-}
-
-void CHWShader_D3D::mfSetDefaultRT(uint64& nAndMask, uint64& nOrMask)
-{
-    uint32 i, j;
-    SShaderGen* pGen = gRenDev->m_cEF.m_pGlobalExt;
-
-    uint32 nBitsPlatform = 0;
-    if (CParserBin::m_nPlatform == SF_ORBIS)
-    {
-        nBitsPlatform |= SHGD_HW_ORBIS;
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_D3D11)
-    {
-        nBitsPlatform |= SHGD_HW_DX11;
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_GL4)
-    {
-        nBitsPlatform |= SHGD_HW_GL4;
-    }
-    else
-    if (CParserBin::m_nPlatform == SF_GLES3)
-    {
-        nBitsPlatform |= SHGD_HW_GLES3;
-    }
-    // Confetti Nicholas Baldwin: adding metal shader language support
-    else
-    if (CParserBin::m_nPlatform == SF_METAL)
-    {
-        nBitsPlatform |= SHGD_HW_METAL;
-    }
-
-    // Make a mask of flags affected by this type of shader
-    uint32 nType = m_dwShaderType;
-    if (nType)
-    {
-        for (i = 0; i < pGen->m_BitMask.size(); i++)
-        {
-            SShaderGenBit* pBit = pGen->m_BitMask[i];
-            if (!pBit->m_Mask)
-            {
-                continue;
-            }
-            if (nBitsPlatform & pBit->m_nDependencyReset)
-            {
-                nAndMask &= ~pBit->m_Mask;
-                continue;
-            }
-            for (j = 0; j < pBit->m_PrecacheNames.size(); j++)
-            {
-                if (pBit->m_PrecacheNames[j] == nType)
-                {
-                    if (nBitsPlatform & pBit->m_nDependencySet)
-                    {
-                        nOrMask |= pBit->m_Mask;
-                    }
-                    break;
-                }
-            }
-        }
-    }
-}
-
-//==================================================================================================================
-
-void CHWShader::mfValidateTokenData([[maybe_unused]] CResFile* pRes)
-{
-#ifdef _DEBUG
-    if (pRes == 0)
-    {
-        return;
-    }
-
-    bool bTokenValid = true;
-    ResDir* Dir = pRes->mfGetDirectory();
-    for (unsigned int i = 0; i < Dir->size(); i++)
-    {
-        SDirEntry* pDE = &(*Dir)[i];
-        if (pDE->flags & RF_RES_$TOKENS)
-        {
-            uint32 nSize = pRes->mfFileRead(pDE);
-            byte* pData = (byte*)pRes->mfFileGetBuf(pDE);
-            if (!pData)
-            {
-                bTokenValid = false;
-                break;
-            }
-
-            uint32 nL = *(uint32*)pData;
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(nL, eBigEndian);
-            }
-
-            if (nL * sizeof(uint32) > nSize)
-            {
-                bTokenValid = false;
-                break;
-            }
-
-            int nTableSize = nSize - (4 + nL * sizeof(uint32));
-            if (nTableSize < 0)
-            {
-                bTokenValid = false;
-                break;
-            }
-
-            pRes->mfCloseEntry(pDE);
-        }
-    }
-
-    if (!bTokenValid)
-    {
-        CryFatalError("Invalid token data in shader cache file");
-    }
-#endif
-}
-
-bool CHWShader_D3D::mfStoreCacheTokenMap(FXShaderToken*& Table, TArray<uint32>*& pSHData, const char* szName)
-{
-    TArray<byte> Data;
-
-    FXShaderTokenItor itor;
-    uint32 nSize = pSHData->size();
-    if (CParserBin::m_bEndians)
-    {
-        uint32 nSizeEnd = nSize;
-        SwapEndian(nSizeEnd, eBigEndian);
-        Data.Copy((byte*)&nSizeEnd, sizeof(uint32));
-        for (uint32 i = 0; i < nSize; i++)
-        {
-            uint32 nToken = (*pSHData)[i];
-            SwapEndian(nToken, eBigEndian);
-            Data.Copy((byte*)&nToken, sizeof(uint32));
-        }
-    }
-    else
-    {
-        Data.Copy((byte*)&nSize, sizeof(uint32));
-        Data.Copy((byte*)&(*pSHData)[0], nSize * sizeof(uint32));
-    }
-    for (itor = Table->begin(); itor != Table->end(); itor++)
-    {
-        STokenD T = *itor;
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(T.Token, eBigEndian);
-        }
-        Data.Copy((byte*)&T.Token, sizeof(DWORD));
-        Data.Copy((byte*)T.SToken.c_str(), T.SToken.size() + 1);
-    }
-    if (!Data.size())
-    {
-        return false;
-    }
-    SDirEntry de;
-    de.Name = szName;
-    de.flags = RF_RES_$TOKENS;
-    de.size = Data.size();
-    m_pGlobalCache->m_pRes[CACHE_USER]->mfFileAdd(&de);
-    SDirEntryOpen* pOE = m_pGlobalCache->m_pRes[CACHE_USER]->mfOpenEntry(&de);
-    pOE->pData = &Data[0];
-    m_pGlobalCache->m_pRes[CACHE_USER]->mfFlush();
-    m_pGlobalCache->m_pRes[CACHE_USER]->mfCloseEntry(&de);
-
-    return true;
-}
-
-void CHWShader_D3D::mfGetTokenMap(CResFile* pRes, SDirEntry* pDE, FXShaderToken*& Table, TArray<uint32>*& pSHData)
-{
-    uint32 i;
-    int nSize = pRes->mfFileRead(pDE);
-    byte* pData = (byte*)pRes->mfFileGetBuf(pDE);
-    if (!pData)
-    {
-        Table = NULL;
-        return;
-    }
-    Table = new FXShaderToken;
-    pSHData = new TArray<uint32>;
-    uint32 nL = *(uint32*)pData;
-    if (CParserBin::m_bEndians)
-    {
-        SwapEndian(nL, eBigEndian);
-    }
-    pSHData->resize(nL);
-    if (CParserBin::m_bEndians)
-    {
-        uint32* pTokens = (uint32*)&pData[4];
-        for (i = 0; i < nL; i++)
-        {
-            uint32 nToken = pTokens[i];
-            SwapEndian(nToken, eBigEndian);
-            (*pSHData)[i] = nToken;
-        }
-    }
-    else
-    {
-        memcpy(&(*pSHData)[0], &pData[4], nL * sizeof(uint32));
-    }
-    pData += 4 + nL * sizeof(uint32);
-    nSize -= 4 + nL * sizeof(uint32);
-    int nOffs = 0;
-
-    while (nOffs < nSize)
-    {
-        char* pStr = (char*)&pData[nOffs + sizeof(DWORD)];
-        DWORD nToken;
-        LoadUnaligned(pData + nOffs, nToken);
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(nToken, eBigEndian);
-        }
-        int nLen = strlen(pStr) + 1;
-        STokenD TD;
-        TD.Token = nToken;
-        TD.SToken = pStr;
-        Table->push_back(TD);
-        nOffs += sizeof(DWORD) + nLen;
-    }
-}
-
-bool CHWShader_D3D::mfGetCacheTokenMap(FXShaderToken*& Table, TArray<uint32>*& pSHData, uint64 nMaskGenFX)
-{
-    if (!m_pGlobalCache || !m_pGlobalCache->isValid())
-    {
-        if (m_pGlobalCache)
-        {
-            m_pGlobalCache->Release(false);
-        }
-        m_pGlobalCache = mfInitCache(NULL, this, true, m_CRC32, true, CRenderer::CV_r_shadersasyncactivation != 0);
-    }
-    if (!m_pGlobalCache)
-    {
-        assert(false);
-        return false;
-    }
-
-    char strName[256];
-    sprintf_s(strName, "$MAP_%llx_%llx", nMaskGenFX, m_maskGenStatic);
-
-    if (Table)
-    {
-        if (m_pGlobalCache->m_pRes[CACHE_READONLY] && m_pGlobalCache->m_pRes[CACHE_READONLY]->mfFileExist(strName))
-        {
-            return true;
-        }
-        if (!m_pGlobalCache->m_pRes[CACHE_USER])
-        {
-            m_pGlobalCache->Release(false);
-            m_pGlobalCache = mfInitCache(NULL, this, true, m_CRC32, false);
-        }
-        if (!m_pGlobalCache || !m_pGlobalCache->m_pRes[CACHE_USER])
-        {
-            assert(false);
-            return false;
-        }
-        if (!m_pGlobalCache->m_pRes[CACHE_USER]->mfFileExist(strName))
-        {
-            if (!CRenderer::CV_r_shadersAllowCompilation)
-            {
-                return false;
-            }
-
-            //CryLogAlways("Storing MAP entry '%s' in shader cache file '%s'", strName, m_pGlobalCache->m_Name.c_str());
-
-            return mfStoreCacheTokenMap(Table, pSHData, strName);
-        }
-        return true;
-    }
-    SDirEntry* pDE = NULL;
-    CResFile* pRes = NULL;
-    for (int i = 0; i < 2; i++)
-    {
-        pRes = m_pGlobalCache->m_pRes[i];
-        if (!pRes)
-        {
-            continue;
-        }
-        pDE = pRes->mfGetEntry(strName);
-        if (pDE)
-        {
-            break;
-        }
-    }
-    if (!pDE || !pRes)
-    {
-        Warning("Couldn't find tokens MAP entry '%s' in shader cache file '%s'", strName, m_pGlobalCache->m_Name.c_str());
-        ASSERT_IN_SHADER(0);
-        return false;
-    }
-    mfGetTokenMap(pRes, pDE, Table, pSHData);
-    pRes->mfFileClose(pDE);
-
-    return true;
-}
-
-//==============================================================================================================================================================
-
-bool CHWShader_D3D::mfGenerateScript(CShader* pSH, SHWSInstance*& pInst, std::vector<SCGBind>& InstBindVars, uint32 nFlags, FXShaderToken* Table, TArray<uint32>* pSHData, TArray<char>& sNewScr)
-{
-
-    bool bTempMap = (Table == NULL);
-    assert((Table && pSHData) || (!Table && !pSHData));
-    assert (m_pGlobalCache);
-    if (CParserBin::m_bEditable && !Table) // Fast path for offline shaders builder
-    {
-        Table = &m_TokenTable;
-        pSHData = &m_TokenData;
-        bTempMap = false;
-    }
-    else
-    {
-        if (m_pGlobalCache)
-        {
-            mfGetCacheTokenMap(Table, pSHData, m_nMaskGenShader);
-        }
-        if (CParserBin::m_bEditable)
-        {
-            if (bTempMap)
-            {
-                SAFE_DELETE(Table);
-                SAFE_DELETE(pSHData);
-            }
-            Table = &m_TokenTable;
-            pSHData = &m_TokenData;
-            bTempMap = false;
-        }
-    }
-    assert (Table && pSHData);
-    if (!Table || !pSHData)
-    {
-        return false;
-    }
-
-    ShaderTokensVec NewTokens;
-
-    uint32 eT = eT_unknown;
-
-    switch (pInst->m_eClass)
-    {
-    case eHWSC_Vertex:
-        eT = eT__VS;
-        break;
-    case eHWSC_Pixel:
-        eT = eT__PS;
-        break;
-    case eHWSC_Geometry:
-        eT = eT__GS;
-        break;
-    case eHWSC_Hull:
-        eT = eT__HS;
-        break;
-    case eHWSC_Compute:
-        eT = eT__CS;
-        break;
-    case eHWSC_Domain:
-        eT = eT__DS;
-        break;
-
-    default:
-        assert(0);
-    }
-    if (eT != eT_unknown)
-    {
-        CParserBin::AddDefineToken(eT, NewTokens);
-    }
-
-    // Include runtime mask definitions in the script
-    SShaderGen* shg = gRenDev->m_cEF.m_pGlobalExt;
-    if (shg && pInst->m_Ident.m_RTMask)
-    {
-        for (uint32 i = 0; i < shg->m_BitMask.Num(); i++)
-        {
-            SShaderGenBit* bit = shg->m_BitMask[i];
-            if (!(bit->m_Mask & pInst->m_Ident.m_RTMask))
-            {
-                continue;
-            }
-            CParserBin::AddDefineToken(bit->m_dwToken, NewTokens);
-        }
-    }
-
-    // Include light mask definitions in the script
-    if (m_Flags & HWSG_SUPPORTS_MULTILIGHTS)
-    {
-        int nLights = pInst->m_Ident.m_LightMask & 0xf;
-        if (nLights)
-        {
-            CParserBin::AddDefineToken(eT__LT_LIGHTS, NewTokens);
-        }
-        CParserBin::AddDefineToken(eT__LT_NUM, nLights + eT_0, NewTokens);
-        bool bHasProj = false;
-        for (int i = 0; i < 4; i++)
-        {
-            int nLightType = (pInst->m_Ident.m_LightMask >> (SLMF_LTYPE_SHIFT + i * SLMF_LTYPE_BITS)) & SLMF_TYPE_MASK;
-            if (nLightType == SLMF_PROJECTED)
-            {
-                bHasProj = true;
-            }
-
-            CParserBin::AddDefineToken(eT__LT_0_TYPE + i, nLightType + eT_0, NewTokens);
-        }
-        if (bHasProj)
-        {
-            CParserBin::AddDefineToken(eT__LT_HASPROJ, eT_1, NewTokens);
-        }
-    }
-    else
-    if (m_Flags & HWSG_SUPPORTS_LIGHTING)
-    {
-        CParserBin::AddDefineToken(eT__LT_LIGHTS, NewTokens);
-        int nLightType = (pInst->m_Ident.m_LightMask >> SLMF_LTYPE_SHIFT) & SLMF_TYPE_MASK;
-        if (nLightType == SLMF_PROJECTED)
-        {
-            CParserBin::AddDefineToken(eT__LT_HASPROJ, eT_1, NewTokens);
-        }
-    }
-
-    // Include modificator mask definitions in the script
-    if ((m_Flags & HWSG_SUPPORTS_MODIF) && pInst->m_Ident.m_MDMask)
-    {
-        const uint32 tcProjMask = HWMD_TEXCOORD_PROJ;
-        const uint32 tcMatrixMask   = HWMD_TEXCOORD_MATRIX;
-
-        if (pInst->m_Ident.m_MDMask & tcProjMask)
-        {
-            CParserBin::AddDefineToken(eT__TT_TEXCOORD_PROJ, NewTokens);
-        }
-        if (pInst->m_Ident.m_MDMask & tcMatrixMask)
-        {
-            CParserBin::AddDefineToken(eT__TT_TEXCOORD_MATRIX, NewTokens);
-        }
-        if (pInst->m_Ident.m_MDMask & HWMD_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE)
-        {
-            CParserBin::AddDefineToken(eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DIFFUSE, NewTokens);
-        }
-        if (pInst->m_Ident.m_MDMask & HWMD_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE)
-        {
-            CParserBin::AddDefineToken(eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE, NewTokens);
-        }
-        if (pInst->m_Ident.m_MDMask & HWMD_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT)
-        {
-            CParserBin::AddDefineToken(eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_EMITTANCE_MULT, NewTokens);
-        }
-        if (pInst->m_Ident.m_MDMask & HWMD_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL)
-        {
-            CParserBin::AddDefineToken(eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_DETAIL, NewTokens);
-        }
-        if (pInst->m_Ident.m_MDMask & HWMD_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM)
-        {
-            CParserBin::AddDefineToken(eT__TT_TEXCOORD_GEN_OBJECT_LINEAR_CUSTOM, NewTokens);
-        }
-    }
-
-    // Include vertex modificator mask definitions in the script
-    if ((m_Flags & HWSG_SUPPORTS_VMODIF) && pInst->m_Ident.m_MDVMask)
-    {
-        int nMDV = pInst->m_Ident.m_MDVMask & 0x0fffffff;
-        int nType = nMDV & 0xf;
-        if (nType)
-        {
-            CParserBin::AddDefineToken(eT__VT_TYPE, eT_0 + nType, NewTokens);
-        }
-        if ((nMDV & MDV_BENDING) || nType == eDT_Bending)
-        {
-            CParserBin::AddDefineToken(eT__VT_BEND, eT_1, NewTokens);
-            if (!(nMDV & 0xf))
-            {
-                nType = eDT_Bending;
-                CParserBin::AddDefineToken(eT__VT_TYPE, eT_0 + nType, NewTokens);
-            }
-        }
-        if (nMDV & MDV_DEPTH_OFFSET)
-        {
-            CParserBin::AddDefineToken(eT__VT_DEPTH_OFFSET, eT_1, NewTokens);
-        }
-        if (nMDV & MDV_WIND)
-        {
-            CParserBin::AddDefineToken(eT__VT_WIND, eT_1, NewTokens);
-        }
-        if (nMDV & MDV_DET_BENDING)
-        {
-            CParserBin::AddDefineToken(eT__VT_DET_BEND, eT_1, NewTokens);
-        }
-        if (nMDV & MDV_DET_BENDING_GRASS)
-        {
-            CParserBin::AddDefineToken(eT__VT_GRASS, eT_1, NewTokens);
-        }
-        if (nMDV & ~0xf)
-        {
-            CParserBin::AddDefineToken(eT__VT_TYPE_MODIF, eT_1, NewTokens);
-        }
-    }
-
-    if (m_Flags & HWSG_FP_EMULATION)
-    {
-        //starting at LSB. 8 bits for colorop, 8 bits for alphaop, 3 bits for color arg1, 3 bits for color arg2, 1 bit for srgbwrite, 1 bit unused, 3 bits for
-        //  alpha arg1, 3 bits for alpha arg2, 2 bits unused.
-        CParserBin::AddDefineToken(eT__FT0_COP, eT_0 + (pInst->m_Ident.m_LightMask & 0xff), NewTokens);
-        CParserBin::AddDefineToken(eT__FT0_AOP, eT_0 + ((pInst->m_Ident.m_LightMask & 0xff00) >> 8), NewTokens);
-
-        byte CO_0 = ((pInst->m_Ident.m_LightMask & 0xff0000) >> 16) & 7;
-        CParserBin::AddDefineToken(eT__FT0_CARG1, eT_0 + CO_0, NewTokens);
-
-        byte CO_1 = ((pInst->m_Ident.m_LightMask & 0xff0000) >> 19) & 7;
-        CParserBin::AddDefineToken(eT__FT0_CARG2, eT_0 + CO_1, NewTokens);
-
-        byte AO_0 = ((pInst->m_Ident.m_LightMask & 0xff000000) >> 24) & 7;
-        CParserBin::AddDefineToken(eT__FT0_AARG1, eT_0 + AO_0, NewTokens);
-
-        byte AO_1 = ((pInst->m_Ident.m_LightMask & 0xff000000) >> 27) & 7;
-        CParserBin::AddDefineToken(eT__FT0_AARG2, eT_0 + AO_1, NewTokens);
-
-        if (CO_0 == eCA_Specular || CO_1 == eCA_Specular || AO_0 == eCA_Specular || AO_1 == eCA_Specular)
-        {
-            CParserBin::AddDefineToken(eT__FT_SPECULAR, NewTokens);
-        }
-        if (CO_0 == eCA_Diffuse || CO_1 == eCA_Diffuse || AO_0 == eCA_Diffuse || AO_1 == eCA_Diffuse)
-        {
-            CParserBin::AddDefineToken(eT__FT_DIFFUSE, NewTokens);
-        }
-        if (CO_0 == eCA_Texture || CO_1 == eCA_Texture || AO_0 == eCA_Texture || AO_1 == eCA_Texture)
-        {
-            CParserBin::AddDefineToken(eT__FT_TEXTURE, NewTokens);
-        }
-        if (CO_0 == eCA_Texture1 || (CO_1 == eCA_Texture1) || AO_0 == eCA_Texture1 || AO_1 == eCA_Texture1
-            || CO_0 == eCA_Previous || (CO_1 == eCA_Previous) || AO_0 == eCA_Previous || AO_1 == eCA_Previous)
-        {
-            CParserBin::AddDefineToken(eT__FT_TEXTURE1, NewTokens);
-        }
-        if (CO_0 == eCA_Normal || CO_1 == eCA_Normal || AO_0 == eCA_Normal || AO_1 == eCA_Normal)
-        {
-            CParserBin::AddDefineToken(eT__FT_NORMAL, NewTokens);
-        }
-        if (CO_0 == eCA_Constant || (CO_1 == eCA_Constant) || AO_0 == eCA_Constant || AO_1 == eCA_Constant
-            || CO_0 == eCA_Previous || (CO_1 == eCA_Previous) || AO_0 == eCA_Previous || AO_1 == eCA_Previous)
-        {
-            CParserBin::AddDefineToken(eT__FT_PSIZE, NewTokens);
-        }
-
-        byte toSRGB = ((pInst->m_Ident.m_LightMask & 0x400000) >> 22) & 1;
-        if (toSRGB)
-        {
-            CParserBin::AddDefineToken(eT__FT_SRGBWRITE, NewTokens);
-        }
-
-        if (nFlags & HWSF_STOREDATA)
-        {
-            int nStreams = pInst->m_Ident.m_LightMask & 0xff;
-            if (nStreams & (1 << VSF_QTANGENTS))
-            {
-                CParserBin::AddDefineToken(eT__FT_QTANGENT_STREAM, NewTokens);
-            }
-            if (nStreams & (1 << VSF_TANGENTS))
-            {
-                CParserBin::AddDefineToken(eT__FT_TANGENT_STREAM, NewTokens);
-            }
-            if (nStreams & VSM_HWSKIN)
-            {
-                CParserBin::AddDefineToken(eT__FT_SKIN_STREAM, NewTokens);
-            }
-#if ENABLE_NORMALSTREAM_SUPPORT
-            if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_ORBIS || CParserBin::m_nPlatform == SF_GL4 ||  CParserBin::m_nPlatform == SF_GLES3)
-            {
-                if (nStreams & VSM_NORMALS)
-                {
-                    CParserBin::AddDefineToken(eT__FT_NORMAL, NewTokens);
-                }
-            }
-#endif
-            if (nStreams & VSM_VERTEX_VELOCITY)
-            {
-                CParserBin::AddDefineToken(eT__FT_VERTEX_VELOCITY_STREAM, NewTokens);
-            }
-        }
-    }
-
-    int nT = NewTokens.size();
-    NewTokens.resize(nT + pSHData->size());
-    memcpy(&NewTokens[nT], &(*pSHData)[0], pSHData->size() * sizeof(uint32));
-
-    CParserBin Parser(NULL, pSH);
-    Parser.Preprocess(1, NewTokens, Table);
-    CorrectScriptEnums(Parser, pInst, InstBindVars, Table);
-    RemoveUnaffectedParameters_D3D10(Parser, pInst, InstBindVars);
-    ConvertBinScriptToASCII(Parser, pInst, InstBindVars, Table, sNewScr);
-
-    if (bTempMap)
-    {
-        SAFE_DELETE(Table);
-        SAFE_DELETE(pSHData);
-    }
-
-    return sNewScr.Num() && sNewScr[0];
-}
-
-void CHWShader_D3D::RemoveUnaffectedParameters_D3D10(CParserBin& Parser, [[maybe_unused]] SHWSInstance* pInst, std::vector<SCGBind>& InstBindVars)
-{
-    int nPos = Parser.FindToken(0, Parser.m_Tokens.size() - 1, eT_cbuffer);
-    while (nPos >= 0)
-    {
-        uint32 nName = Parser.m_Tokens[nPos + 1];
-        if (nName == eT_PER_BATCH || nName == eT_PER_INSTANCE)
-        {
-            int nPosEnd = Parser.FindToken(nPos + 3, Parser.m_Tokens.size() - 1, eT_br_cv_2);
-            assert(nPosEnd >= 0);
-            int nPosN = Parser.FindToken(nPos + 1, Parser.m_Tokens.size() - 1, eT_br_cv_1);
-            assert(nPosN >= 0);
-            nPosN++;
-            while (nPosN < nPosEnd)
-            {
-                uint32 nT = Parser.m_Tokens[nPosN + 1];
-                int nPosCode = Parser.FindToken(nPosEnd + 1, Parser.m_Tokens.size() - 1, nT);
-                if (nPosCode < 0)
-                {
-                    assert(nPosN > 0 && nPosN < (int)Parser.m_Tokens.size());
-                    if (InstBindVars.size())
-                    {
-                        size_t i = 0;
-                        CCryNameR nm(Parser.GetString(nT));
-                        for (; i < InstBindVars.size(); i++)
-                        {
-                            SCGBind& b = InstBindVars[i];
-                            if (b.m_Name == nm)
-                            {
-                                break;
-                            }
-                        }
-                        if (i == InstBindVars.size())
-                        {
-                            Parser.m_Tokens[nPosN] = eT_comment;
-                        }
-                    }
-                    else
-                    {
-                        Parser.m_Tokens[nPosN] = eT_comment;
-                    }
-                }
-                nPosN = Parser.FindToken(nPosN + 2, nPosEnd, eT_semicolumn);
-                assert(nPosN >= 0);
-                nPosN++;
-            }
-            nPos = Parser.FindToken(nPosEnd + 1, Parser.m_Tokens.size() - 1, eT_cbuffer);
-        }
-        else
-        {
-            nPos = Parser.FindToken(nPos + 2, Parser.m_Tokens.size() - 1, eT_cbuffer);
-        }
-    }
-}
-
-struct SStructData
-{
-    uint32 m_nName;
-    uint32 m_nTCs;
-    int m_nPos;
-};
-
-void CHWShader_D3D::CorrectScriptEnums(CParserBin& Parser, SHWSInstance* pInst, std::vector<SCGBind>& InstBindVars, FXShaderToken* Table)
-{
-    // correct enumeration of TEXCOORD# interpolators after preprocessing
-    int nCur = 0;
-    int nSize = Parser.m_Tokens.size();
-    uint32* pTokens = &Parser.m_Tokens[0];
-    int nInstParam = 0;
-    const uint32 Toks[] = {eT_TEXCOORDN, eT_TEXCOORDN_centroid, eT_unknown};
-
-    std::vector<SStructData> SData;
-    uint32 i;
-    while (true)
-    {
-        nCur = Parser.FindToken(nCur, nSize - 1, eT_struct);
-        if (nCur < 0)
-        {
-            break;
-        }
-        int nLastStr = Parser.FindToken(nCur, nSize - 1, eT_br_cv_2);
-        assert(nLastStr >= 0);
-        if (nLastStr < 0)
-        {
-            break;
-        }
-        bool bNested = false;
-        for (i = 0; i < SData.size(); i++)
-        {
-            SStructData& Data = SData[i];
-            Data.m_nPos = Parser.FindToken(nCur, nLastStr, Data.m_nName);
-            if (Data.m_nPos > 0)
-            {
-                bNested = true;
-            }
-        }
-        uint32 nName = pTokens[nCur + 1];
-        int n = 0;
-        while (nCur < nLastStr)
-        {
-            int nTN = Parser.FindToken(nCur, nLastStr, Toks);
-            if (nTN < 0)
-            {
-                nCur = nLastStr + 1;
-                break;
-            }
-            int nNested = 0;
-            if (bNested)
-            {
-                for (i = 0; i < SData.size(); i++)
-                {
-                    SStructData& Data = SData[i];
-                    if (Data.m_nPos > 0 && nTN > Data.m_nPos)
-                    {
-                        nNested += Data.m_nTCs;
-                    }
-                }
-            }
-            assert(pTokens[nTN - 1] == eT_colon);
-            int nArrSize = 1;
-            uint32 nTokName;
-            if (pTokens[nTN - 2] == eT_br_sq_2)
-            {
-                nArrSize = pTokens[nTN - 3] - eT_0;
-                if ((unsigned int) nArrSize > 15)
-                {
-                    const char* szArrSize = Parser.GetString(pTokens[nTN - 3], *Table);
-                    nArrSize = szArrSize ? atoi(szArrSize) : 0;
-                }
-                assert(pTokens[nTN - 4] == eT_br_sq_1);
-                //const char *szName = Parser.GetString(pTokens[nTN-5], *Table);
-                nTokName = pTokens[nTN - 5];
-            }
-            else
-            {
-                uint32 nType = pTokens[nTN - 3];
-                assert(nType == eT_float || nType == eT_float2 || nType == eT_float3 || nType == eT_float4 || nType == eT_float4x4 || nType == eT_float3x4 || nType == eT_float2x4 || nType == eT_float3x3 ||
-                    nType == eT_half  || nType == eT_half2  || nType == eT_half3  || nType == eT_half4  || nType == eT_half4x4  || nType == eT_half3x4  || nType == eT_half2x4  || nType == eT_half3x3);
-                if (nType == eT_float4x4 || nType == eT_half4x4)
-                {
-                    nArrSize = 4;
-                }
-                else
-                if (nType == eT_float3x4 || nType == eT_float3x3 || nType == eT_half3x4 || nType == eT_half3x3)
-                {
-                    nArrSize = 3;
-                }
-                else
-                if (nType == eT_float2x4 || nType == eT_half2x4)
-                {
-                    nArrSize = 2;
-                }
-                nTokName = pTokens[nTN - 2];
-            }
-            assert(nArrSize > 0 && nArrSize < 16);
-
-            EToken eT = (pTokens[nTN] == eT_TEXCOORDN) ? eT_TEXCOORD0 : eT_TEXCOORD0_centroid;
-
-            pTokens[nTN] = n + nNested + eT;
-            n += nArrSize;
-            nCur = nTN + 1;
-
-            if (pInst->m_Ident.m_RTMask & g_HWSR_MaskBit[HWSR_INSTANCING_ATTR])
-            {
-                const char* szName = Parser.GetString(nTokName, *Table);
-                if (!_strnicmp(szName, "Inst", 4))
-                {
-                    char newName[256];
-                    int nm = 0;
-                    while (szName[4 + nm] > 0x20 && szName[4 + nm] != '[')
-                    {
-                        newName[nm] = szName[4 + nm];
-                        nm++;
-                    }
-                    newName[nm++] = 0;
-
-                    SCGBind bn;
-                    bn.m_RegisterOffset = nInstParam;
-                    bn.m_RegisterCount = nArrSize;
-                    bn.m_Name = newName;
-                    InstBindVars.push_back(bn);
-
-                    nInstParam += nArrSize;
-                }
-            }
-        }
-        SStructData SD;
-        SD.m_nName = nName;
-        SD.m_nPos = -1;
-        SD.m_nTCs = n;
-        SData.push_back(SD);
-    }
-    if (InstBindVars.size())
-    {
-        qsort(&InstBindVars[0], InstBindVars.size(), sizeof(SCGBind), CGBindCallback);
-    }
-    pInst->m_nNumInstAttributes = nInstParam;
-}
-
-static int sFetchInst(uint32& nCur, uint32* pTokens, [[maybe_unused]] uint32 nT, std::vector<uint32>& Parameter)
-{
-    while (true)
-    {
-        uint32 nTok = pTokens[nCur];
-        if (nTok != eT_br_rnd_1 && nTok != eT_br_rnd_2 && nTok != eT_comma)
-        {
-            break;
-        }
-        nCur++;
-    }
-    int nC = 0;
-    Parameter.push_back(pTokens[nCur]);
-    nCur++;
-    while (pTokens[nCur] == eT_dot)
-    {
-        nC = 2;
-        Parameter.push_back(pTokens[nCur]);
-        Parameter.push_back(pTokens[nCur + 1]);
-        nCur += 2;
-    }
-    return nC;
-}
-
-namespace HWShaderD3D {
-    static void sCR(TArray<char>& Text, int nLevel)
-    {
-        Text.AddElem('\n');
-        for (int i = 0; i < nLevel; i++)
-        {
-            Text.AddElem(' ');
-            Text.AddElem(' ');
-        }
-    }
-}
-
-bool CHWShader_D3D::ConvertBinScriptToASCII(CParserBin& Parser, [[maybe_unused]] SHWSInstance* pInst, [[maybe_unused]] std::vector<SCGBind>& InstBindVars, FXShaderToken* Table, TArray<char>& Text)
-{
-    using namespace HWShaderD3D;
-    uint32 i;
-    bool bRes = true;
-
-    uint32* pTokens = &Parser.m_Tokens[0];
-    uint32 nT = Parser.m_Tokens.size();
-    int nLevel = 0;
-    for (i = 0; i < nT; i++)
-    {
-        uint32 nToken = pTokens[i];
-        if (nToken == 0)
-        {
-            Text.Copy("\n", 1);
-            continue;
-        }
-        if (nToken == eT_skip)
-        {
-            i++;
-            continue;
-        }
-        if (nToken == eT_skip_1)
-        {
-            while (i < nT)
-            {
-                nToken = pTokens[i];
-                if (nToken == eT_skip_2)
-                {
-                    break;
-                }
-                i++;
-            }
-            assert(i < nT);
-            continue;
-        }
-        if (nToken == eT_fetchinst)
-        {
-            char str[512];
-            i++;
-            std::vector<uint32> ParamDst, ParamSrc;
-            TArray<char> sParamDstFull, sParamDstName, sParamSrc;
-            int nDst = sFetchInst(i, &Parser.m_Tokens[0], Parser.m_Tokens.size(), ParamDst);
-            assert(Parser.m_Tokens[i] == eT_eq);
-            if (Parser.m_Tokens[i] != eT_eq)
-            { // Should never happen
-                int n = CParserBin::FindToken(i, Parser.m_Tokens.size() - 1, &Parser.m_Tokens[0], eT_semicolumn);
-                if (n > 0)
-                {
-                    i = n + 1;
-                }
-                continue;
-            }
-            i++;
-            int nSrc = sFetchInst(i, &Parser.m_Tokens[0], Parser.m_Tokens.size(), ParamSrc);
-            CParserBin::ConvertToAscii(&ParamDst[0], ParamDst.size(), *Table, sParamDstFull);
-            CParserBin::ConvertToAscii(&ParamDst[nDst], 1, *Table, sParamDstName);
-            CParserBin::ConvertToAscii(&ParamSrc[nSrc], 1, *Table, sParamSrc);
-            assert(strncmp(&sParamSrc[0], "Inst", 4) == 0);
-
-            {
-                sParamSrc.Free();
-                CParserBin::ConvertToAscii(&ParamSrc[0], ParamSrc.size(), *Table, sParamSrc);
-                sprintf_s(str, "%s = %s;\n", &sParamDstFull[0], &sParamSrc[0]);
-                Text.Copy(str, strlen(str));
-            }
-            while (Parser.m_Tokens[i] != eT_semicolumn)
-            {
-                i++;
-            }
-            continue;
-        }
-        const char* szStr = CParserBin::GetString(nToken, *Table, false);
-        assert(szStr);
-        if (!szStr || !szStr[0])
-        {
-            assert(0);
-            bRes = CParserBin::CorrectScript(pTokens, i, nT, Text);
-        }
-        else
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADERCOMPILING_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(D3DHWShaderCompiling_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined (_DEBUG)
-            int n = 0;
-            while (szStr[n])
-            {
-                char c = szStr[n++];
-                bool bASC = isascii(c);
-                assert(bASC);
-            }
-#endif
-            if (nToken == eT_semicolumn || nToken == eT_br_cv_1)
-            {
-                if (nToken == eT_br_cv_1)
-                {
-                    sCR(Text, nLevel);
-                    nLevel++;
-                }
-                Text.Copy(szStr, strlen(szStr));
-                if (nToken == eT_semicolumn)
-                {
-                    if (i + 1 < nT && pTokens[i + 1] == eT_br_cv_2)
-                    {
-                        sCR(Text, nLevel - 1);
-                    }
-                    else
-                    {
-                        sCR(Text, nLevel);
-                    }
-                }
-                else
-                if (i + 1 < nT)
-                {
-                    if (pTokens[i + 1] < eT_br_rnd_1 || pTokens[i + 1] >= eT_float)
-                    {
-                        sCR(Text, nLevel);
-                    }
-                }
-            }
-            else
-            {
-                if (i + 1 < nT)
-                {
-                    if (Text.Num())
-                    {
-                        char cPrev = Text[Text.Num() - 1];
-                        if (!SkipChar((uint8)cPrev) && !SkipChar((uint8)szStr[0]))
-                        {
-                            Text.AddElem(' ');
-                        }
-                    }
-                }
-                Text.Copy(szStr, strlen(szStr));
-                if (nToken == eT_br_cv_2)
-                {
-                    nLevel--;
-                    if (i + 1 < nT && pTokens[i + 1] != eT_semicolumn)
-                    {
-                        sCR(Text, nLevel);
-                    }
-                }
-            }
-        }
-    }
-    Text.AddElem(0);
-
-    return bRes;
-}
-
-void CHWShader_D3D::mfGetSrcFileName(char* srcName, int nSize)
-{
-    if (!srcName || nSize <= 0)
-    {
-        return;
-    }
-    if (!m_NameSourceFX.empty())
-    {
-        cry_strcpy(srcName, nSize, m_NameSourceFX.c_str());
-        return;
-    }
-    cry_strcpy(srcName, nSize, gRenDev->m_cEF.m_HWPath);
-    if (m_eSHClass == eHWSC_Vertex)
-    {
-        cry_strcat(srcName, nSize, "Declarations/CGVShaders/");
-    }
-    else if (m_eSHClass == eHWSC_Pixel)
-    {
-        cry_strcat(srcName, nSize, "Declarations/CGPShaders/");
-    }
-    else
-    {
-        cry_strcat(srcName, nSize, "Declarations/CGGShaders/");
-    }
-    cry_strcat(srcName, nSize, GetName());
-    cry_strcat(srcName, nSize, ".crycg");
-}
-
-void CHWShader_D3D::mfGenName(SHWSInstance* pInst, char* dstname, int nSize, byte bType)
-{
-    if (bType)
-    {
-        CHWShader::mfGenName(pInst->m_Ident.m_GLMask, pInst->m_Ident.m_RTMask, pInst->m_Ident.m_LightMask, pInst->m_Ident.m_MDMask, pInst->m_Ident.m_MDVMask, pInst->m_Ident.m_pipelineState.opaque, pInst->m_Ident.m_STMask, pInst->m_eClass, dstname, nSize, bType);
-    }
-    else
-    {
-        CHWShader::mfGenName(0, 0, 0, 0, 0, 0, 0, eHWSC_Num, dstname, nSize, bType);
-    }
-}
-
-void CHWShader_D3D::mfGetDstFileName(SHWSInstance* pInst, CHWShader_D3D* pSH, char* dstname, int nSize, byte bType)
-{
-    cry_strcpy(dstname, nSize, gRenDev->m_cEF.m_ShadersCache.c_str());
-
-    if (pSH->m_eSHClass == eHWSC_Vertex)
-    {
-        if (bType == 1 || bType == 4)
-        {
-            cry_strcat(dstname, nSize, "CGVShaders/Debug/");
-        }
-        else if (bType == 0)
-        {
-            cry_strcat(dstname, nSize, "CGVShaders/");
-        }
-        else if (bType == 2 || bType == 3)
-        {
-            cry_strcat(dstname, nSize, "CGVShaders/Pending/");
-        }
-    }
-    else if (pSH->m_eSHClass == eHWSC_Pixel)
-    {
-        if (bType == 1 || bType == 4)
-        {
-            cry_strcat(dstname, nSize, "CGPShaders/Debug/");
-        }
-        else if (bType == 0)
-        {
-            cry_strcat(dstname, nSize, "CGPShaders/");
-        }
-        else if (bType == 2 || bType == 3)
-        {
-            cry_strcat(dstname, nSize, "CGPShaders/Pending/");
-        }
-    }
-    else if (GEOMETRYSHADER_SUPPORT && pSH->m_eSHClass == eHWSC_Geometry)
-    {
-        if (bType == 1 || bType == 4)
-        {
-            cry_strcat(dstname, nSize, "CGGShaders/Debug/");
-        }
-        else if (bType == 0)
-        {
-            cry_strcat(dstname, nSize, "CGGShaders/");
-        }
-        else if (bType == 2 || bType == 3)
-        {
-            cry_strcat(dstname, nSize, "CGGShaders/Pending/");
-        }
-    }
-    else if (GEOMETRYSHADER_SUPPORT && pSH->m_eSHClass == eHWSC_Hull)
-    {
-        if (bType == 1 || bType == 4)
-        {
-            cry_strcat(dstname, nSize, "CGHShaders/Debug/");
-        }
-        else if (bType == 0)
-        {
-            cry_strcat(dstname, nSize, "CGHShaders/");
-        }
-        else if (bType == 2 || bType == 3)
-        {
-            cry_strcat(dstname, nSize, "CGHShaders/Pending/");
-        }
-    }
-    else if (GEOMETRYSHADER_SUPPORT && pSH->m_eSHClass == eHWSC_Domain)
-    {
-        if (bType == 1 || bType == 4)
-        {
-            cry_strcat(dstname, nSize, "CGDShaders/Debug/");
-        }
-        else if (bType == 0)
-        {
-            cry_strcat(dstname, nSize, "CGDShaders/");
-        }
-        else if (bType == 2 || bType == 3)
-        {
-            cry_strcat(dstname, nSize, "CGDShaders/Pending/");
-        }
-    }
-    else if (GEOMETRYSHADER_SUPPORT && pSH->m_eSHClass == eHWSC_Compute)
-    {
-        if (bType == 1 || bType == 4)
-        {
-            cry_strcat(dstname, nSize, "CGCShaders/Debug/");
-        }
-        else if (bType == 0)
-        {
-            cry_strcat(dstname, nSize, "CGCShaders/");
-        }
-        else if (bType == 2 || bType == 3)
-        {
-            cry_strcat(dstname, nSize, "CGCShaders/Pending/");
-        }
-    }
-
-    cry_strcat(dstname, nSize, pSH->GetName());
-
-    if (bType == 2)
-    {
-        cry_strcat(dstname, nSize, "_out");
-    }
-
-    if (bType == 0)
-    {
-        char* s = strchr(dstname, '(');
-        if (s)
-        {
-            s[0] = 0;
-        }
-    }
-
-    char szGenName[256];
-    mfGenName(pInst, szGenName, 256, bType);
-
-    cry_strcat(dstname, nSize, szGenName);
-}
-
-//========================================================================================================
-// Binary cache support
-
-SShaderCache::~SShaderCache()
-{
-    if (m_pStreamInfo)
-    {
-        CResFile* pRes = m_pStreamInfo->m_pRes;
-        if (pRes)
-        {
-            assert(pRes == m_pRes[0] || pRes == m_pRes[1]);
-            assert(!pRes->mfIsDirStreaming());
-            //bWarn = pRes->mfIsDirStreaming();
-        }
-        /*if (m_pStreamInfo->m_EntriesQueue.size())
-          bWarn = true;
-        if (bWarn)
-          Warning("Warning: SShader`Cache::~SShaderCache(): '%s' Streaming tasks is still in progress!: %d", m_Name.c_str(), m_pStreamInfo->m_EntriesQueue.size());*/
-
-        m_pStreamInfo->AbortJobs();
-    }
-
-    CHWShader::m_ShaderCache.erase(m_Name);
-    SAFE_DELETE(m_pRes[CACHE_USER]);
-    SAFE_DELETE(m_pRes[CACHE_READONLY]);
-    SAFE_RELEASE(m_pStreamInfo);
-}
-
-void SShaderCache::Cleanup()
-{
-    if (m_pRes[0])
-    {
-        m_pRes[0]->mfDeactivate(true);
-    }
-    if (m_pRes[1])
-    {
-        m_pRes[1]->mfDeactivate(true);
-    }
-}
-
-bool SShaderCache::isValid()
-{
-    return ((m_pRes[CACHE_READONLY] || m_pRes[CACHE_USER]) && CParserBin::m_nPlatform == m_nPlatform);
-}
-
-int SShaderCache::Size()
-{
-    int nSize = sizeof(SShaderCache);
-
-    if (m_pRes[0])
-    {
-        nSize += m_pRes[0]->Size();
-    }
-    if (m_pRes[1])
-    {
-        nSize += m_pRes[1]->Size();
-    }
-
-    return nSize;
-}
-int SShaderDevCache::Size()
-{
-    int nSize = sizeof(SShaderDevCache);
-
-    nSize += m_DeviceShaders.size() * sizeof(SD3DShader);
-
-    return nSize;
-}
-
-void SShaderCache::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_pRes[0]);
-    pSizer->AddObject(m_pRes[1]);
-}
-
-void SShaderDevCache::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_DeviceShaders);
-}
-
-SShaderDevCache* CHWShader::mfInitDevCache(const char* name, [[maybe_unused]] CHWShader* pSH)
-{
-    CCryNameR cryShaderName(name);
-    return new SShaderDevCache(cryShaderName);
-}
-
-SShaderCacheHeaderItem* CHWShader_D3D::mfGetCompressedItem([[maybe_unused]] uint32 nFlags, int32& nSize)
-{
-    SHWSInstance*   pInst = m_pCurInst;
-    char            name[128];
-    {
-        azstrcpy(name, AZ_ARRAY_SIZE(name), GetName());
-        char* s = strchr(name, '(');
-        if (s)
-        {
-            s[0] = 0;
-        }
-    }
-
-    CCryNameTSCRC Name = name;
-    FXCompressedShadersItor it = CHWShader::m_CompressedShaders.find(Name);
-    if (it == CHWShader::m_CompressedShaders.end())
-    {
-        return NULL;
-    }
-    SHWActivatedShader* pAS = it->second;
-    assert(pAS);
-    if (!pAS)
-    {
-        return NULL;
-    }
-    mfGenName(pInst, name, 128, 1);
-    Name = name;
-    FXCompressedShaderRemapItor itR = pAS->m_Remap.find(Name);
-    if (itR == pAS->m_Remap.end())
-    {
-        return NULL;
-    }
-    int nDevID = itR->second;
-    FXCompressedShaderItor itS = pAS->m_CompressedShaders.find(nDevID);
-    if (itS == pAS->m_CompressedShaders.end())
-    {
-        return NULL;
-    }
-    SCompressedData& CD = itS->second;
-    assert(CD.m_pCompressedShader);
-    if (!CD.m_pCompressedShader)
-    {
-        return NULL;
-    }
-    byte* pData = new byte[CD.m_nSizeDecompressedShader];
-    if (!pData)
-    {
-        return NULL;
-    }
-    pInst->m_DeviceObjectID = nDevID;
-    SShaderCacheHeaderItem* pIt = (SShaderCacheHeaderItem*)pData;
-    if (CParserBin::m_bEndians)
-    {
-        SwapEndian(*pIt, eBigEndian);
-    }
-    nSize = CD.m_nSizeDecompressedShader;
-    return pIt;
-}
-
-SShaderCacheHeaderItem* CHWShader_D3D::mfGetCacheItem(uint32& nFlags, int32& nSize)
-{
-    LOADING_TIME_PROFILE_SECTION(gEnv->pSystem);
-    SHWSInstance* pInst = m_pCurInst;
-    byte* pData = NULL;
-    nSize = 0;
-    if (!m_pGlobalCache || !m_pGlobalCache->isValid())
-    {
-        return NULL;
-    }
-    CResFile* rf = NULL;
-    SDirEntry* de = NULL;
-    int i;
-    bool bAsync = false;
-    int n = CRenderer::CV_r_shadersAllowCompilation == 0 ? 1 : 2;
-    for (i = 0; i < n; i++)
-    {
-        rf = m_pGlobalCache->m_pRes[i];
-        if (!rf)
-        {
-            continue;
-        }
-        char name[128];
-        mfGenName(pInst, name, 128, 1);
-        de = rf->mfGetEntry(name, &bAsync);
-        if (de || bAsync)
-        {
-            break;
-        }
-    }
-    if (de)
-    {
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 3 || CRenderer::CV_r_shadersdebug == 4)
-        {
-            iLog->Log("---Cache: LoadedFromGlobal %s': 0x%x", rf->mfGetFileName(), de->Name.get());
-        }
-        pInst->m_nCache = i;
-        SShaderCacheHeaderItem* pIt = NULL;
-        nSize = rf->mfFileRead(de);
-        pInst->m_bAsyncActivating = (nSize == -1);
-        pData = (byte*)rf->mfFileGetBuf(de);
-        if (pData && nSize > 0)
-        {
-            byte* pD = new byte[nSize];
-            memcpy(pD, pData, nSize);
-            pIt = (SShaderCacheHeaderItem*)pD;
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(*pIt, eBigEndian);
-            }
-            pInst->m_DeviceObjectID = de->Name.get();
-            rf->mfFileClose(de);
-        }
-        if (i == CACHE_USER)
-        {
-            nFlags |= HWSG_CACHE_USER;
-        }
-        return pIt;
-    }
-    else
-    {
-        pInst->m_bAsyncActivating = bAsync;
-        return NULL;
-    }
-}
-
-bool CHWShader_D3D::mfAddCacheItem(SShaderCache* pCache, SShaderCacheHeaderItem* pItem, const byte* pData, int nLen, bool bFlush, CCryNameTSCRC Name)
-{
-    if (!pCache)
-    {
-        return false;
-    }
-    if (!pCache->m_pRes[CACHE_USER])
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 3 || CRenderer::CV_r_shadersdebug == 4)
-    {
-        iLog->Log("---Cache: StoredToGlobal %s': 0x%x", pCache->m_pRes[CACHE_USER]->mfGetFileName(), Name.get());
-    }
-
-    pItem->m_CRC32 = CCrc32::Compute(pData, nLen);
-    //CryLog("Size: %d: CRC: %x", nLen, pItem->m_CRC32);
-
-    byte* pNew = new byte[sizeof(SShaderCacheHeaderItem) + nLen];
-    SDirEntry de;
-    de.offset = 0;
-    if (CParserBin::m_bEndians)
-    {
-        SShaderCacheHeaderItem IT = *pItem;
-        SwapEndian(IT, eBigEndian);
-        memcpy(pNew, &IT, sizeof(SShaderCacheHeaderItem));
-    }
-    else
-    {
-        memcpy(pNew, pItem, sizeof(SShaderCacheHeaderItem));
-    }
-    memcpy(&pNew[sizeof(SShaderCacheHeaderItem)], pData, nLen);
-    de.Name = Name;
-    de.flags = RF_COMPRESS | RF_TEMPDATA;
-    de.size = nLen + sizeof(SShaderCacheHeaderItem);
-    pCache->m_pRes[CACHE_USER]->mfFileAdd(&de);
-    SDirEntryOpen* pOE = pCache->m_pRes[CACHE_USER]->mfOpenEntry(&de);
-    pOE->pData = pNew;
-    if (bFlush)
-    {
-        pCache->m_pRes[CACHE_USER]->mfFlush();
-    }
-
-    return true;
-}
-
-SEmptyCombination::Combinations SEmptyCombination::s_Combinations;
-
-bool CHWShader_D3D::mfAddEmptyCombination([[maybe_unused]] CShader* pSH, uint64 nRT, uint64 nGL, uint32 nLT)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rRP = rd->m_RP;
-
-    SEmptyCombination Comb;
-    Comb.nGLNew = m_nMaskGenShader;
-    Comb.nRTNew = rRP.m_FlagsShader_RT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Comb.nLTNew = rRP.m_FlagsShader_LT;
-    Comb.nGLOrg = nGL;
-    Comb.nRTOrg = nRT & m_nMaskAnd_RT | m_nMaskOr_RT;
-    Comb.nLTOrg = nLT;
-    Comb.nMD = rRP.m_FlagsShader_MD;
-    Comb.nMDV = rRP.m_FlagsShader_MDV;
-    Comb.nST = m_maskGenStatic;
-    if (m_eSHClass == eHWSC_Pixel)
-    {
-        Comb.nMD &= ~HWMD_TEXCOORD_FLAG_MASK;
-        Comb.nMDV = 0;
-    }
-
-    Comb.pShader = this;
-    if (Comb.nRTNew != Comb.nRTOrg || Comb.nGLNew != Comb.nGLOrg || Comb.nLTNew != Comb.nLTOrg)
-    {
-        SEmptyCombination::s_Combinations.push_back(Comb);
-    }
-
-    m_nMaskGenShader = nGL;
-
-    return true;
-}
-
-bool CHWShader_D3D::mfStoreEmptyCombination(SEmptyCombination& Comb)
-{
-    if (!m_pGlobalCache || !m_pGlobalCache->m_pRes[CACHE_USER])
-    {
-        return false;
-    }
-
-    CResFile* rf = m_pGlobalCache->m_pRes[CACHE_USER];
-    char nameOrg[128];
-    char nameNew[128];
-    SShaderCombIdent Ident;
-    Ident.m_GLMask = Comb.nGLNew;
-    Ident.m_RTMask = Comb.nRTNew;
-    Ident.m_LightMask = Comb.nLTNew;
-    Ident.m_MDMask = Comb.nMD;
-    Ident.m_MDVMask = Comb.nMDV;
-    Ident.m_STMask = Comb.nST;
-    SHWSInstance* pInstNew = mfGetInstance(gRenDev->m_RP.m_pShader, Ident, 0);
-    mfGenName(pInstNew, nameNew, 128, 1);
-    SDirEntry* deNew = rf->mfGetEntry(nameNew);
-    //assert(deNew);
-    if (!deNew)
-    {
-        return false;
-    }
-
-    Ident.m_GLMask = Comb.nGLOrg;
-    Ident.m_RTMask = Comb.nRTOrg;
-    Ident.m_LightMask = Comb.nLTOrg;
-    Ident.m_MDMask = Comb.nMD;
-    Ident.m_MDVMask = Comb.nMDV;
-    Ident.m_STMask = Comb.nST;
-    SHWSInstance* pInstOrg = mfGetInstance(gRenDev->m_RP.m_pShader, Ident, 0);
-    mfGenName(pInstOrg, nameOrg, 128, 1);
-    SDirEntry* deOrg = rf->mfGetEntry(nameOrg);
-    if (deOrg)
-    {
-        if (deOrg->offset != deNew->offset)
-        {
-            deOrg->offset = -abs(deNew->offset);
-            deOrg->flags |= RF_NOTSAVED;
-        }
-        return true;
-    }
-    SDirEntry de;
-    de.Name = CCryNameTSCRC(nameOrg);
-    de.flags = deNew->flags;
-    de.size = deNew->size;
-    de.offset = -abs(deNew->offset);
-    rf->mfFileAdd(&de);
-
-    return true;
-}
-
-bool CHWShader_D3D::mfFlushCacheFile()
-{
-    uint32 i;
-
-    for (i = 0; i < m_Insts.size(); i++)
-    {
-        SHWSInstance* pInst = m_Insts[i];
-        if (pInst->m_Handle.m_bStatus == 2) // Fake
-        {
-            pInst->m_Handle.SetShader(NULL);
-        }
-    }
-    return m_pGlobalCache && m_pGlobalCache->m_pRes[CACHE_USER] && m_pGlobalCache->m_pRes[CACHE_USER]->mfFlush();
-}
-
-struct SData
-{
-    CCryNameTSCRC Name;
-    uint32 nSizeDecomp;
-    uint32 nSizeComp;
-    //uint32 CRC;
-    uint16 flags;
-    int nOffset;
-    byte* pData;
-    byte bProcessed;
-
-    bool operator <(const SData& o) const
-    {
-        return Name < o.Name;
-    }
-};
-#if !defined(CONSOLE)
-// Remove shader duplicates
-bool CHWShader::mfOptimiseCacheFile(SShaderCache* pCache, [[maybe_unused]] bool bForce, SOptimiseStats* pStats)
-{
-    CResFile* pRes = pCache->m_pRes[CACHE_USER];
-    pRes->mfFlush();
-    ResDir* Dir = pRes->mfGetDirectory();
-    uint32 i, j;
-#ifdef _DEBUG
-    /*for (i=0; i<Dir->size(); i++)
-    {
-      SDirEntry *pDE = &(*Dir)[i];
-      for (j=i+1; j<Dir->size(); j++)
-      {
-        SDirEntry *pDE1 = &(*Dir)[j];
-        assert(pDE->Name != pDE1->Name);
-      }
-      }
-      */
-    mfValidateTokenData(pRes);
-#endif
-
-    std::vector<SData> Data;
-    bool bNeedOptimise = true;
-    if (pStats)
-    {
-        pStats->nEntries += Dir->size();
-    }
-    for (i = 0; i < Dir->size(); i++)
-    {
-        SDirEntry* pDE = &(*Dir)[i];
-        if (pDE->flags & RF_RES_$)
-        {
-            if (pDE->Name == CShaderMan::s_cNameHEAD)
-            {
-                continue;
-            }
-
-            SData d;
-            d.nSizeComp = d.nSizeDecomp = 0;
-            d.pData = pRes->mfFileReadCompressed(pDE, d.nSizeDecomp, d.nSizeComp);
-            assert(d.pData && d.nSizeComp && d.nSizeDecomp);
-            if (!d.pData || !d.nSizeComp || !d.nSizeDecomp)
-            {
-                continue;
-            }
-            if (pStats)
-            {
-                pStats->nTokenDataSize += d.nSizeDecomp;
-            }
-            d.bProcessed = 3;
-            d.Name = pDE->Name;
-            //d.CRC = 0;
-            d.nOffset = 0;
-            d.flags = (short)pDE->flags;
-            Data.push_back(d);
-            continue;
-        }
-        SData d;
-        d.flags = pDE->flags;
-        d.nSizeComp = d.nSizeDecomp = 0;
-        d.pData = pRes->mfFileReadCompressed(pDE, d.nSizeDecomp, d.nSizeComp);
-        assert(d.pData && d.nSizeComp && d.nSizeDecomp);
-        if (!d.pData || !d.nSizeComp || !d.nSizeDecomp)
-        {
-            continue;
-        }
-        d.nOffset = pDE->offset;
-        d.bProcessed = 0;
-        d.Name = pDE->Name;
-        //d.CRC = 0;
-        Data.push_back(d);
-        pRes->mfCloseEntry(pDE);
-    }
-    //FILE *fp = NULL;
-    int nDevID = 0x10000000;
-    int nOutFiles = Data.size();
-    if (bNeedOptimise)
-    {
-        for (i = 0; i < Data.size(); i++)
-        {
-            /*if (fp)
-            {
-              gEnv->pCryPak->FClose(fp);
-              fp = NULL;
-            }*/
-            if (Data[i].bProcessed)
-            {
-                continue;
-            }
-            byte* pD = Data[i].pData;
-            Data[i].bProcessed = 1;
-            Data[i].nOffset = nDevID++;
-            int nSizeComp = Data[i].nSizeComp;
-            int nSizeDecomp = Data[i].nSizeDecomp;
-            for (j = i + 1; j < Data.size(); j++)
-            {
-                if (Data[j].bProcessed)
-                {
-                    continue;
-                }
-                byte* pD1 = Data[j].pData;
-                if (nSizeComp != Data[j].nSizeComp || nSizeDecomp != Data[j].nSizeDecomp)
-                {
-                    continue;
-                }
-                if (!memcmp(pD, pD1, nSizeComp))
-                {
-                    /*if (!fp && CRenderer::CV_r_shaderscacheoptimiselog)
-                    {
-                      char name[256];
-                      sprintf_s(name, "Optimise/%s/%s.cache", pRes->mfGetFileName(), Data[i].Name.c_str());
-                      fp = gEnv->pCryPak->FOpen(name, "w");
-                    }*/
-                    Data[j].nOffset = Data[i].nOffset;
-                    Data[j].bProcessed = 2;
-                    nOutFiles--;
-                    //if (fp)
-                    //  gEnv->pCryPak->FPrintf(fp, "%s\n", Data[j].Name.c_str());
-                }
-            }
-        }
-    }
-    /*if (fp)
-    {
-      gEnv->pCryPak->FClose(fp);
-      fp = NULL;
-    }*/
-
-    if (nOutFiles != Data.size() || CRenderer::CV_r_shaderscachedeterministic)
-    {
-        if (nOutFiles == Data.size())
-        {
-            iLog->Log(" Forcing optimise for deterministic order...");
-        }
-
-        iLog->Log(" Optimising shaders resource '%s' (%" PRISIZE_T " items)...", pCache->m_Name.c_str(), Data.size() - 1);
-
-        pRes->mfClose();
-        pRes->mfOpen(RA_CREATE | (CParserBin::m_bEndians ? RA_ENDIANS : 0), &gRenDev->m_cEF.m_ResLookupDataMan[CACHE_USER]);
-
-        float fVersion = FX_CACHE_VER;
-        uint32 nMinor = (int)(((float)fVersion - (float)(int)fVersion) * 10.1f);
-        uint32 nMajor = (int)fVersion;
-
-        SResFileLookupData* pLookupCache = pCache->m_pRes[CACHE_USER]->GetLookupData(false, 0, 0);
-        CRY_ASSERT(pLookupCache != NULL);
-
-        if (pLookupCache == NULL || pLookupCache->m_CacheMajorVer != nMajor || pLookupCache->m_CacheMinorVer != nMinor)
-        {
-            CRY_ASSERT_MESSAGE(pLookupCache == NULL, "Losing ShaderIdents by recreating lookupdata cache");
-            pLookupCache = pRes->GetLookupData(true, 0, FX_CACHE_VER);
-        }
-
-        pRes->mfFlush();
-
-        if (CRenderer::CV_r_shaderscachedeterministic)
-        {
-            std::sort(Data.begin(), Data.end());
-        }
-
-        for (i = 0; i < Data.size(); i++)
-        {
-            SData* pD = &Data[i];
-
-            SDirEntry de;
-            de.Name = pD->Name;
-            de.flags = pD->flags;
-            if (pD->bProcessed == 1)
-            {
-                de.offset = pD->nOffset;
-                de.flags |= RF_COMPRESS | RF_COMPRESSED;
-                if (pStats)
-                {
-                    pStats->nSizeUncompressed += pD->nSizeDecomp;
-                    pStats->nSizeCompressed += pD->nSizeComp;
-                    pStats->nUniqueEntries++;
-                }
-                assert(pD->pData);
-                if (pD->pData)
-                {
-                    de.size = pD->nSizeComp + 4;
-                    SDirEntryOpen* pOE = pRes->mfOpenEntry(&de);
-                    byte* pData = new byte[de.size];
-                    int nSize = pD->nSizeDecomp;
-                    *(int*)pData = nSize;
-                    memcpy(&pData[4], pD->pData, pD->nSizeComp);
-                    de.flags |= RF_TEMPDATA;
-                    pOE->pData = pData;
-                    SAFE_DELETE_ARRAY(pD->pData);
-                }
-            }
-            else
-            if (pD->bProcessed != 3)
-            {
-                de.size = pD->nSizeComp + 4;
-                de.flags |= RF_COMPRESS;
-                de.offset = -pD->nOffset;
-                SAFE_DELETE_ARRAY(pD->pData);
-            }
-            else
-            {
-                SDirEntryOpen* pOE = pRes->mfOpenEntry(&de);
-                pOE->pData = pD->pData;
-                de.size = pD->nSizeDecomp;
-            }
-            pRes->mfFileAdd(&de);
-        }
-    }
-
-    if (nOutFiles != Data.size())
-    {
-        iLog->Log("  -- Removed %" PRISIZE_T " duplicated shaders", Data.size() - nOutFiles);
-    }
-
-    Data.clear();
-    int nSizeDir = pRes->mfFlush(true);
-    //int nSizeCompr = pRes->mfFlush();
-
-#ifdef _DEBUG
-    mfValidateTokenData(pRes);
-#endif
-
-    if (pStats)
-    {
-        pStats->nDirDataSize += nSizeDir;
-    }
-
-    for (i = 0; i < Data.size(); i++)
-    {
-        SData* pD = &Data[i];
-        SAFE_DELETE_ARRAY(pD->pData);
-    }
-
-    if (pStats)
-    {
-        CryLog("  -- Shader cache '%s' stats: Entries: %d, Unique Entries: %d, Size: %.3f Mb, Compressed Size: %.3f Mb, Token data size: %3f Mb, Directory Size: %.3f Mb", pCache->m_Name.c_str(), pStats->nEntries, pStats->nUniqueEntries, pStats->nSizeUncompressed / 1024.0f / 1024.0f, pStats->nSizeCompressed / 1024.0f / 1024.0f, pStats->nTokenDataSize / 1024.0f / 1024.0f, pStats->nDirDataSize / 1024.0f / 1024.0f);
-    }
-
-    return true;
-}
-#endif
-
-int __cdecl sSort(const VOID* arg1, const VOID* arg2)
-{
-    SDirEntry** pi1 = (SDirEntry**)arg1;
-    SDirEntry** pi2 = (SDirEntry**)arg2;
-    SDirEntry* ti1 = *pi1;
-    SDirEntry* ti2 = *pi2;
-    if (ti1->Name < ti2->Name)
-    {
-        return -1;
-    }
-    if (ti1->Name == ti2->Name)
-    {
-        return 0;
-    }
-    return 1;
-}
-
-bool CHWShader::_OpenCacheFile(float fVersion, SShaderCache* pCache, CHWShader* pSH, bool bCheckValid, uint32 CRC32, int nCache, CResFile* pRF, bool bReadOnly)
-{
-    assert(nCache == CACHE_USER || nCache == CACHE_READONLY);
-
-    bool bValid = true;
-    CHWShader_D3D* pSHHW = (CHWShader_D3D*)pSH;
-    int nRes = pRF->mfOpen(RA_READ | (CParserBin::m_bEndians ? RA_ENDIANS : 0), &gRenDev->m_cEF.m_ResLookupDataMan[nCache], (nCache == CACHE_READONLY && pCache->m_pStreamInfo) ? pCache->m_pStreamInfo : NULL);
-    if (nRes == 0)
-    {
-        pRF->mfClose();
-        bValid = false;
-    }
-    else
-    if (nRes > 0)
-    {
-        if (bValid)
-        {
-            SResFileLookupData* pLookup = pRF->GetLookupData(false, 0, 0);
-            if (!pLookup)
-            {
-                bValid = false;
-            }
-            else
-            if (bCheckValid)
-            {
-                if (fVersion && (pLookup->m_CacheMajorVer != (int)fVersion || pLookup->m_CacheMinorVer != (int)(((float)fVersion - (float)(int)fVersion) * 10.1f)))
-                {
-                    bValid = false;
-                }
-                if (!bValid && (CRenderer::CV_r_shadersdebug == 2 || nCache == CACHE_READONLY))
-                {
-                    LogWarningEngineOnly("WARNING: Shader cache '%s' version mismatch (Cache: %d.%d, Expected: %.1f)", pRF->mfGetFileName(), pLookup->m_CacheMajorVer, pLookup->m_CacheMinorVer, fVersion);
-                }
-                if (pSH)
-                {
-                    if (bValid && pLookup->m_CRC32 != pSHHW->m_CRC32)
-                    {
-                        bValid = false;
-                        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 2 && (CRenderer::CV_r_shadersdebug == 2 || nCache == CACHE_READONLY))
-                        {
-                            LogWarningEngineOnly("WARNING: Shader cache '%s' CRC mismatch", pRF->mfGetFileName());
-                        }
-                    }
-                }
-            }
-        }
-
-        if (nCache == CACHE_USER)
-        {
-            pRF->mfClose();
-            if (bValid)
-            {
-                int nAcc = CRenderer::CV_r_shadersAllowCompilation != 0 ? (RA_READ | RA_WRITE) : RA_READ;
-                if (!pRF->mfOpen(nAcc | (CParserBin::m_bEndians ? RA_ENDIANS : 0), &gRenDev->m_cEF.m_ResLookupDataMan[nCache]))
-                {
-                    pRF->mfClose();
-                    bValid = false;
-                }
-            }
-        }
-    }
-    if (!bValid && bCheckValid)
-    {
-        if (nCache == CACHE_USER && !bReadOnly)
-        {
-            if (!pRF->mfOpen(RA_CREATE | (CParserBin::m_bEndians ? RA_ENDIANS : 0), &gRenDev->m_cEF.m_ResLookupDataMan[nCache]))
-            {
-                return false;
-            }
-
-            pRF->GetLookupData(true, CRC32, FX_CACHE_VER);
-            if (pSHHW)
-            {
-                pRF->mfFlush();
-            }
-            pCache->m_bNeedPrecache = true;
-            bValid = true;
-        }
-        else
-        {
-            SAFE_DELETE(pRF);
-        }
-    }
-    pCache->m_pRes[nCache] = pRF;
-    pCache->m_bReadOnly[nCache] = bReadOnly;
-
-#ifdef _DEBUG
-    mfValidateTokenData(pRF);
-#endif
-
-    return bValid;
-}
-
-bool CHWShader::mfOpenCacheFile(const char* szName, float fVersion, SShaderCache* pCache, CHWShader* pSH, bool bCheckValid, uint32 CRC32, bool bReadOnly)
-{
-    bool bValidRO = false;
-    bool bValidUser = true;
-    // don't load the readonly cache, when shaderediting is true
-    if (!CRenderer::CV_r_shadersediting && !pCache->m_pRes[CACHE_READONLY])
-    {
-        CResFile* rfRO = new CResFile(szName);
-        bool bRO = bReadOnly;
-        if (!CRenderer::CV_r_shadersAllowCompilation)
-        {
-            bRO = true;
-        }
-        bValidRO = _OpenCacheFile(fVersion, pCache, pSH, bCheckValid, CRC32, CACHE_READONLY, rfRO, bRO);
-    }
-    if (!CRenderer::CV_r_shadersAllowCompilation)
-    {
-        assert(bReadOnly);
-    }
-    if ((!bReadOnly || gRenDev->IsShaderCacheGenMode()) && !pCache->m_pRes[CACHE_USER])
-    {
-        stack_string szUser = stack_string(gRenDev->m_cEF.m_szCachePath.c_str()) + stack_string(szName);
-        CResFile* rfUser = new CResFile(szUser.c_str());
-        bValidUser = _OpenCacheFile(fVersion, pCache, pSH, bCheckValid, CRC32, CACHE_USER, rfUser, bReadOnly);
-    }
-
-    return (bValidRO || bValidUser);
-}
-
-SShaderCache* CHWShader::mfInitCache(const char* name, CHWShader* pSH, bool bCheckValid, uint32 CRC32, bool bReadOnly, bool bAsync)
-{
-    //  LOADING_TIME_PROFILE_SECTION(iSystem);
-
-    CHWShader_D3D* pSHHW = (CHWShader_D3D*)pSH;
-    char nameCache[256];
-
-    if (!CRenderer::CV_r_shadersAllowCompilation)
-    {
-        bCheckValid = false;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersediting)
-    {
-        bReadOnly = false;
-    }
-
-    if (!name)
-    {
-        char namedst[256];
-        pSHHW->mfGetDstFileName(pSHHW->m_pCurInst, pSHHW, namedst, 256, 0);
-        fpStripExtension(namedst, nameCache);
-        fpAddExtension(nameCache, ".fxcb");
-        name = nameCache;
-    }
-
-    SShaderCache* pCache = NULL;
-    FXShaderCacheItor it = m_ShaderCache.find(CCryNameR(name));
-    if (it != m_ShaderCache.end())
-    {
-        pCache = it->second;
-        pCache->AddRef();
-        if (pSHHW)
-        {
-            if (bCheckValid)
-            {
-                int nCache[2] = {-1, -1};
-                if (!CRenderer::CV_r_shadersAllowCompilation)
-                {
-                    nCache[0] = CACHE_READONLY;
-                }
-                else
-                {
-                    nCache[0] = CACHE_USER;
-                    nCache[1] = CACHE_READONLY;
-                }
-                bool bValid;
-                for (int i = 0; i < 2; i++)
-                {
-                    if (nCache[i] < 0 || !pCache->m_pRes[i])
-                    {
-                        continue;
-                    }
-                    CResFile* pRF = pCache->m_pRes[i];
-                    SResFileLookupData* pLookup = pRF->GetLookupData(false, 0, FX_CACHE_VER);
-                    bValid = (pLookup && pLookup->m_CRC32 == CRC32);
-                    if (!bValid)
-                    {
-                        SAFE_DELETE(pCache->m_pRes[i]);
-                    }
-                }
-                bValid = true;
-                if (!CRenderer::CV_r_shadersAllowCompilation && !pCache->m_pRes[CACHE_READONLY])
-                {
-                    bValid = false;
-                }
-                else
-                {
-                    if (bReadOnly && (!pCache->m_pRes[CACHE_READONLY] || !pCache->m_pRes[CACHE_USER]))
-                    {
-                        bValid = false;
-                    }
-                    if (!bReadOnly && !pCache->m_pRes[CACHE_USER])
-                    {
-                        bValid = false;
-                    }
-                }
-                if (!bValid)
-                {
-                    mfOpenCacheFile(name, FX_CACHE_VER, pCache, pSH, bCheckValid, CRC32, bReadOnly);
-                }
-            }
-        }
-    }
-    else
-    {
-        pCache = new SShaderCache;
-        if (bAsync)
-        {
-            pCache->m_pStreamInfo = new SResStreamInfo(pCache);
-        }
-        pCache->m_nPlatform = CParserBin::m_nPlatform;
-        pCache->m_Name = name;
-        mfOpenCacheFile(name, FX_CACHE_VER, pCache, pSH, bCheckValid, CRC32, bReadOnly);
-        m_ShaderCache.insert(FXShaderCacheItor::value_type(CCryNameR(name), pCache));
-    }
-
-    return pCache;
-}
-
-
-byte* CHWShader_D3D::mfBindsToCache([[maybe_unused]] SHWSInstance* pInst, std::vector<SCGBind>* Binds, int nParams, byte* pP)
-{
-    int i;
-    for (i = 0; i < nParams; i++)
-    {
-        SCGBind* cgb = &(*Binds)[i];
-        SShaderCacheHeaderItemVar* pVar = (SShaderCacheHeaderItemVar*)pP;
-        pVar->m_nCount = cgb->m_RegisterCount;
-        pVar->m_Reg = cgb->m_RegisterOffset;
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(pVar->m_nCount, eBigEndian);
-            SwapEndian(pVar->m_Reg, eBigEndian);
-        }
-        int len = strlen(cgb->m_Name.c_str()) + 1;
-        memcpy(pVar->m_Name,  cgb->m_Name.c_str(), len);
-        pP += offsetof(SShaderCacheHeaderItemVar, m_Name) + strlen(pVar->m_Name) + 1;
-    }
-    return pP;
-}
-
-byte* CHWShader_D3D::mfBindsFromCache(std::vector<SCGBind>*& Binds, int nParams, byte* pP)
-{
-    int i;
-    for (i = 0; i < nParams; i++)
-    {
-        if (!Binds)
-        {
-            Binds = new std::vector<SCGBind>;
-        }
-        SCGBind cgb;
-        SShaderCacheHeaderItemVar* pVar = (SShaderCacheHeaderItemVar*)pP;
-
-        short nParameters = pVar->m_nCount;
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(nParameters, eBigEndian);
-        }
-        cgb.m_RegisterCount = nParameters;
-
-        cgb.m_Name = pVar->m_Name;
-
-        int dwBind = pVar->m_Reg;
-        if (CParserBin::m_bEndians)
-        {
-            SwapEndian(dwBind, eBigEndian);
-        }
-        cgb.m_RegisterOffset = dwBind;
-
-        Binds->push_back(cgb);
-        pP += offsetof(SShaderCacheHeaderItemVar, m_Name) + strlen(pVar->m_Name) + 1;
-    }
-    return pP;
-}
-
-byte* CHWShader::mfIgnoreBindsFromCache(int nParams, byte* pP)
-{
-    int i;
-    for (i = 0; i < nParams; i++)
-    {
-        SShaderCacheHeaderItemVar* pVar = (SShaderCacheHeaderItemVar*)pP;
-        pP += offsetof(SShaderCacheHeaderItemVar, m_Name) + strlen(pVar->m_Name) + 1;
-    }
-    return pP;
-}
-
-bool CHWShader_D3D::mfUploadHW(SHWSInstance* pInst, byte* pBuf, uint32 nSize, CShader* pSH, uint32 nFlags)
-{
-    PROFILE_FRAME(Shader_mfUploadHW);
-
-    const char* sHwShaderName = _HELP("Vertex Shader");
-    if (m_eSHClass == eHWSC_Pixel)
-    {
-        sHwShaderName = _HELP("Pixel Shader");
-    }
-    
-    HRESULT hr = S_OK;
-    if (!pInst->m_Handle.m_pShader)
-    {
-        pInst->m_Handle.SetShader(new SD3DShader);
-    }
-
-    if ((m_eSHClass == eHWSC_Vertex) && (!(nFlags & HWSF_PRECACHE) || gRenDev->m_cEF.m_bActivatePhase) && !pInst->m_bFallback)
-    {
-        mfUpdateFXVertexFormat(pInst, pSH);
-    }
-
-    pInst->m_nDataSize = nSize;
-    if (m_eSHClass == eHWSC_Pixel)
-    {
-        s_nDevicePSDataSize += nSize;
-    }
-    else
-    {
-        s_nDeviceVSDataSize += nSize;
-    }
-
-    if (m_eSHClass == eHWSC_Pixel)
-    {
-        hr = gcpRendD3D->GetDevice().CreatePixelShader(alias_cast<DWORD*>(pBuf), nSize, NULL, alias_cast<ID3D11PixelShader**>(&pInst->m_Handle.m_pShader->m_pHandle));
-    }
-    else
-    if (m_eSHClass == eHWSC_Vertex)
-    {
-        hr = gcpRendD3D->GetDevice().CreateVertexShader(alias_cast<DWORD*>(pBuf), nSize, NULL, alias_cast<ID3D11VertexShader**>(&pInst->m_Handle.m_pShader->m_pHandle));
-    }
-    else
-    if (m_eSHClass == eHWSC_Geometry)
-    {
-        hr = gcpRendD3D->GetDevice().CreateGeometryShader(alias_cast<DWORD*>(pBuf), nSize, NULL, alias_cast<ID3D11GeometryShader**>(&pInst->m_Handle.m_pShader->m_pHandle));
-    }
-    else
-    if (m_eSHClass == eHWSC_Hull)
-    {
-        hr = gcpRendD3D->GetDevice().CreateHullShader(alias_cast<DWORD*>(pBuf), nSize, NULL, alias_cast<ID3D11HullShader**>(&pInst->m_Handle.m_pShader->m_pHandle));
-    }
-    else
-    if (m_eSHClass == eHWSC_Compute)
-    {
-        hr = gcpRendD3D->GetDevice().CreateComputeShader(alias_cast<DWORD*>(pBuf), nSize, NULL, alias_cast<ID3D11ComputeShader**>(&pInst->m_Handle.m_pShader->m_pHandle));
-    }
-    else
-    if (m_eSHClass == eHWSC_Domain)
-    {
-        hr = gcpRendD3D->GetDevice().CreateDomainShader(alias_cast<DWORD*>(pBuf), nSize, NULL, alias_cast<ID3D11DomainShader**>(&pInst->m_Handle.m_pShader->m_pHandle));
-    }
-    else
-    {
-        assert(0);
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADERCOMPILING_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(D3DHWShaderCompiling_cpp)
-#endif
-
-    // Assign name to Shader for enhanced debugging
-#if !defined(RELEASE) && defined(WIN64)
-    if (pInst->m_Handle.m_pShader->m_pHandle)
-    {
-        char name[1024];
-        azsprintf(name, "%s_%s(LT%x)@(RT%llx)(MD%x)(MDV%x)(GL%llx)(PSS%llx)(ST%llx)", pSH->GetName(), m_EntryFunc.c_str(), pInst->m_Ident.m_LightMask, pInst->m_Ident.m_RTMask, pInst->m_Ident.m_MDMask, pInst->m_Ident.m_MDVMask, pInst->m_Ident.m_GLMask, pInst->m_Ident.m_pipelineState.opaque, pInst->m_Ident.m_STMask);
-        ((ID3D11DeviceChild*)pInst->m_Handle.m_pShader->m_pHandle)->SetPrivateData(WKPDID_D3DDebugObjectName, strlen(name), name);
-    }
-#endif
-
-    return (hr == S_OK);
-}
-
-bool CHWShader_D3D::mfUploadHW(LPD3D10BLOB pShader, SHWSInstance* pInst, CShader* pSH, uint32 nFlags)
-{
-    bool bResult = true;
-    if (m_eSHClass == eHWSC_Vertex && !pInst->m_bFallback)
-    {
-        mfUpdateFXVertexFormat(pInst, pSH);
-    }
-    if (pShader && !(m_Flags & HWSG_PRECACHEPHASE))
-    {
-        DWORD* pCode = (DWORD*)pShader->GetBufferPointer();
-        if (gcpRendD3D->m_cEF.m_nCombinationsProcess >= 0 && !gcpRendD3D->m_cEF.m_bActivatePhase)
-        {
-            pInst->m_Handle.SetFake();
-        }
-        else
-        {
-            bResult = mfUploadHW(pInst, (byte*)pCode, (uint32)pShader->GetBufferSize(), pSH, nFlags);
-            if (m_eSHClass == eHWSC_Vertex)
-            {
-                size_t nSize = pShader->GetBufferSize();
-                pInst->m_pShaderData = new byte[nSize];
-                pInst->m_nDataSize = nSize;
-                memcpy(pInst->m_pShaderData, pCode, nSize);
-                pInst->m_uniqueNameCRC = AZ::Crc32(GetName());
-            }
-        }
-        if (!bResult)
-        {
-            if (m_eSHClass == eHWSC_Vertex)
-            {
-                Warning("CHWShader_D3D::mfUploadHW: Could not create vertex shader '%s'(0x%" PRIx64 ")\n", GetName(), pInst->m_Ident.m_GLMask);
-            }
-            else
-            if (m_eSHClass == eHWSC_Pixel)
-            {
-                Warning("CHWShader_D3D::mfUploadHW: Could not create pixel shader '%s'(0x%" PRIx64 ")\n", GetName(), pInst->m_Ident.m_GLMask);
-            }
-            else
-            if (m_eSHClass == eHWSC_Geometry)
-            {
-                Warning("CHWShader_D3D::mfUploadHW: Could not create geometry shader '%s'(0x%" PRIx64 ")\n", GetName(), pInst->m_Ident.m_GLMask);
-            }
-            else
-            if (m_eSHClass == eHWSC_Domain)
-            {
-                Warning("CHWShader_D3D::mfUploadHW: Could not create domain shader '%s'(0x%" PRIx64 ")\n", GetName(), pInst->m_Ident.m_GLMask);
-            }
-            else
-            if (m_eSHClass == eHWSC_Hull)
-            {
-                Warning("CHWShader_D3D::mfUploadHW: Could not create hull shader '%s'(0x%" PRIx64 ")\n", GetName(), pInst->m_Ident.m_GLMask);
-            }
-            else
-            if (m_eSHClass == eHWSC_Compute)
-            {
-                Warning("CHWShader_D3D::mfUploadHW: Could not create compute shader '%s'(0x%" PRIx64 ")\n", GetName(), pInst->m_Ident.m_GLMask);
-            }
-        }
-    }
-    return bResult;
-}
-
-bool CHWShader_D3D::mfActivateCacheItem(CShader* pSH, SShaderCacheHeaderItem* pItem, uint32 nSize, uint32 nFlags)
-{
-    SHWSInstance* pInst = m_pCurInst;
-    byte* pData = (byte*)pItem;
-    pData += sizeof(SShaderCacheHeaderItem);
-    byte* pBuf = pData;
-    std::vector<SCGBind>* pInstBinds = NULL;
-    pInst->Release(m_pDevCache, false);
-    pBuf = mfBindsFromCache(pInstBinds, pItem->m_nInstBinds, pBuf);
-    nSize -= (uint32)(pBuf - (byte*)pItem);
-    pInst->m_eClass = (EHWShaderClass)pItem->m_Class;
-
-#if !defined(_RELEASE)
-    if (pItem->m_nVertexFormat >= eVF_Max)
-    {
-        AZ_Warning("Graphics", false, "Existing vertex format with enum %d not legit (must be less than %d).  Is the shader cache out of date? Defaulting to eVF_P3S_C4B_T2S.", pItem->m_nVertexFormat, eVF_Max);
-        pItem->m_nVertexFormat = eVF_P3S_C4B_T2S;
-    }
-#endif
-    pInst->m_vertexFormat = AZ::Vertex::Format(gcpRendD3D->m_RP.m_vertexFormats[pItem->m_nVertexFormat]);
-
-    pInst->m_nInstructions = pItem->m_nInstructions;
-    pInst->m_VStreamMask_Decl = pItem->m_StreamMask_Decl;
-    pInst->m_VStreamMask_Stream = pItem->m_StreamMask_Stream;
-    bool bResult = true;
-    SD3DShader* pHandle = NULL;
-    SShaderDevCache* pCache = m_pDevCache;
-    if (!(nFlags & HWSG_CACHE_USER))
-    {
-        if (pCache)
-        {
-            FXDeviceShaderItor it = pCache->m_DeviceShaders.find(pInst->m_DeviceObjectID);
-            if (it != pCache->m_DeviceShaders.end())
-            {
-                pHandle = it->second;
-            }
-        }
-    }
-    HRESULT hr = S_OK;
-    if (pHandle)
-    {
-        pInst->m_Handle.SetShader(pHandle);
-        pInst->m_Handle.AddRef();
-
-#if D3DHWSHADERCOMPILING_CPP_TRAIT_VERTEX_FORMAT
-        if (m_eSHClass == eHWSC_Vertex)
-        {
-            ID3D10Blob* pS = NULL;
-            D3D10CreateBlob(nSize, (LPD3D10BLOB*)&pS);
-            DWORD* pBuffer = (DWORD*)pS->GetBufferPointer();
-            memcpy(pBuffer, pBuf, nSize);
-            mfVertexFormat(pInst, this, pS);
-            SAFE_RELEASE(pS);
-        }
-#endif
-        if ((m_eSHClass == eHWSC_Vertex) && (!(nFlags & HWSF_PRECACHE) || gRenDev->m_cEF.m_bActivatePhase) && !pInst->m_bFallback)
-        {
-            mfUpdateFXVertexFormat(pInst, pSH);
-        }
-    }
-    else
-    {
-        if (gcpRendD3D->m_cEF.m_nCombinationsProcess > 0 && !gcpRendD3D->m_cEF.m_bActivatePhase)
-        {
-            pInst->m_Handle.SetFake();
-        }
-        else
-        {
-#if D3DHWSHADERCOMPILING_CPP_TRAIT_VERTEX_FORMAT
-            if (m_eSHClass == eHWSC_Vertex)
-            {
-                ID3D10Blob* pS = NULL;
-                D3D10CreateBlob(nSize, (LPD3D10BLOB*)&pS);
-                DWORD* pBuffer = (DWORD*)pS->GetBufferPointer();
-                memcpy(pBuffer, pBuf, nSize);
-                mfVertexFormat(pInst, this, pS);
-                SAFE_RELEASE(pS);
-            }
-#endif
-
-            bResult = mfUploadHW(pInst, pBuf, nSize, pSH, nFlags);
-        }
-        if (!bResult)
-        {
-            SAFE_DELETE(pInstBinds);
-            assert(!"Shader creation error");
-            iLog->Log("WARNING: cannot create shader '%s' (FX: %s)", m_EntryFunc.c_str(), GetName());
-            return true;
-        }
-        pCache->m_DeviceShaders.insert(FXDeviceShaderItor::value_type(pInst->m_DeviceObjectID, pInst->m_Handle.m_pShader));
-    }
-    void* pConstantTable = NULL;
-    void* pShaderReflBuf = NULL;
-    hr = D3DReflect(pBuf, nSize, IID_ID3D11ShaderReflection, &pShaderReflBuf);
-    ID3D11ShaderReflection* pShaderReflection = (ID3D11ShaderReflection*)pShaderReflBuf;
-    if (SUCCEEDED(hr))
-    {
-        pConstantTable = (void*)pShaderReflection;
-    }
-    if (m_eSHClass == eHWSC_Vertex || gRenDev->IsEditorMode())
-    {
-        pInst->m_pShaderData = new byte[nSize];
-        pInst->m_nDataSize = nSize;
-        memcpy(pInst->m_pShaderData, pBuf, nSize);
-        pInst->m_uniqueNameCRC = AZ::Crc32(GetName());
-    }
-    assert(hr == S_OK);
-    bResult &= (hr == S_OK);
-    if (pConstantTable)
-    {
-        mfCreateBinds(pInst, pConstantTable, pBuf, nSize);
-    }
-
-    mfGatherFXParameters(pInst, pInstBinds, this, 0, pSH);
-    SAFE_DELETE(pInstBinds);
-    SAFE_RELEASE(pShaderReflection);
-
-    return bResult;
-}
-
-bool CHWShader_D3D::mfCreateCacheItem(SHWSInstance* pInst, std::vector<SCGBind>& InstBinds, byte* pData, int nLen, CHWShader_D3D* pSH, bool bShaderThread)
-{
-    if (!pSH->m_pGlobalCache || !pSH->m_pGlobalCache->m_pRes[CACHE_USER])
-    {
-        if (pSH->m_pGlobalCache)
-        {
-            pSH->m_pGlobalCache->Release(false);
-        }
-        pSH->m_pGlobalCache = mfInitCache(NULL, pSH, true, pSH->m_CRC32, false, false);
-    }
-    assert(pSH->m_pGlobalCache);
-    if (!pSH->m_pGlobalCache || !pSH->m_pGlobalCache->m_pRes[CACHE_USER])
-    {
-        return false;
-    }
-
-    byte* byteData = NULL;
-    DWORD* dwordData = NULL;
-
-    SShaderCacheHeaderItem h;
-    h.m_nInstBinds = InstBinds.size();
-    h.m_nInstructions = pInst->m_nInstructions;
-    h.m_nVertexFormat = pInst->m_vertexFormat.GetEnum();
-    h.m_Class = pData ? pInst->m_eClass : 255;
-    h.m_StreamMask_Decl = pInst->m_VStreamMask_Decl;
-    h.m_StreamMask_Stream = (byte)pInst->m_VStreamMask_Stream;
-    int nNewSize = (h.m_nInstBinds) * sizeof(SShaderCacheHeaderItemVar) + nLen;
-    byte* pNewData = new byte [nNewSize];
-    byte* pP = pNewData;
-    pP = mfBindsToCache(pInst, &InstBinds, h.m_nInstBinds, pP);
-    PREFAST_ASSUME(pData);
-    memcpy(pP, pData, nLen);
-    delete[] byteData;
-    delete[] dwordData;
-    pP += nLen;
-    char name[256];
-    mfGenName(pInst, name, 256, 1);
-    CCryNameTSCRC nm = CCryNameTSCRC(name);
-    bool bRes = mfAddCacheItem(pSH->m_pGlobalCache, &h, pNewData, (int)(pP - pNewData), false, nm);
-    SAFE_DELETE_ARRAY(pNewData);
-    if (gRenDev->m_cEF.m_bActivatePhase || (!(pSH->m_Flags & HWSG_PRECACHEPHASE) && gRenDev->m_cEF.m_nCombinationsProcess <= 0))
-    {
-        if (!gRenDev->m_cEF.m_bActivatePhase)
-        {
-            if (bShaderThread && false)
-            {
-                if (pInst->m_pAsync)
-                {
-                    pInst->m_pAsync->m_bPendedFlush = true;
-                }
-            }
-            else
-            {
-                pSH->mfFlushCacheFile();
-            }
-        }
-        azstrcpy(name, AZ_ARRAY_SIZE(name), pSH->GetName());
-        char* s = strchr(name, '(');
-        if (s)
-        {
-            s[0] = 0;
-        }
-        if (!bShaderThread || true)
-        {
-            byte bStore = 1;
-            if (pSH->m_Flags & HWSG_FP_EMULATION)
-            {
-                bStore = 2;
-            }
-            SShaderCombIdent Ident = pInst->m_Ident;
-            ;
-            Ident.m_GLMask = pSH->m_nMaskGenFX;
-            gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, name, 0, NULL, bStore);
-        }
-    }
-    pInst->m_nCache = CACHE_USER;
-
-    return bRes;
-}
-
-//============================================================================
-
-void CHWShader_D3D::mfSaveCGFile(const char* scr, const char* path)
-{
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug < 1)
-    {
-        return;
-    }
-    char name[1024];
-    if (path && path[0])
-    {
-        sprintf_s(name, "%s/%s(LT%x)/(RT%llx)(MD%x)(MDV%x)(GL%llx)(PSS%llx)(ST%llx).cg", path, GetName(), m_pCurInst->m_Ident.m_LightMask, m_pCurInst->m_Ident.m_RTMask, m_pCurInst->m_Ident.m_MDMask, m_pCurInst->m_Ident.m_MDVMask, m_pCurInst->m_Ident.m_GLMask, m_pCurInst->m_Ident.m_pipelineState.opaque, m_pCurInst->m_Ident.m_STMask);
-    }
-    else
-    {
-        sprintf_s(name, "@usercache@/shaders/fxerror/%s(GL%llx)/(LT%x)(RT%llx)/(MD%x)(MDV%x)(PSS%llx)(ST%llx).cg", GetName(), m_pCurInst->m_Ident.m_GLMask, m_pCurInst->m_Ident.m_LightMask, m_pCurInst->m_Ident.m_RTMask, m_pCurInst->m_Ident.m_MDMask, m_pCurInst->m_Ident.m_MDVMask, m_pCurInst->m_Ident.m_pipelineState.opaque, m_pCurInst->m_Ident.m_STMask);
-    }
-
-    AZ::IO::HandleType fileHandle;
-
-    fileHandle = gEnv->pCryPak->FOpen(name, "w");
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        size_t len = strlen(scr);
-        gEnv->pCryPak->FWrite(scr, len, fileHandle);
-        gEnv->pCryPak->FClose (fileHandle);
-    }
-}
-
-void CHWShader_D3D::mfOutputCompilerError(string& strErr, const char* szSrc)
-{
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug)
-    {
-        AZ::IO::HandleType fileHandle = fxopen("$$err", "w");
-        if (fileHandle != AZ::IO::InvalidHandle)
-        {
-            AZ::IO::FPutS(szSrc, fileHandle);
-            gEnv->pFileIO->Close(fileHandle);
-        }
-    }
-
-    string strE = strErr;
-
-    size_t newlinePos = strE.find('\n');
-
-    while (newlinePos != string::npos)
-    {
-        iLog->LogError("%s", strE.substr(0, newlinePos).c_str());
-        strE = strE.substr(newlinePos + 1);
-        newlinePos = strE.find('\n');
-    }
-
-    if (strE.size())
-    {
-        iLog->LogError("%s", strE.c_str());
-    }
-}
-
-SShaderAsyncInfo::~SShaderAsyncInfo()
-{
-    {
-        AUTO_LOCK(g_cAILock);
-        Unlink();
-    }
-    if (m_pFXShader)
-    {
-        assert(m_pFXShader->GetID() >= 0 && m_pFXShader->GetID() < MAX_REND_SHADERS);
-    }
-    SAFE_RELEASE(m_pFXShader);
-    SAFE_RELEASE(m_pShader);
-}
-
-// Flush pended or processed shaders (main thread task)
-void SShaderAsyncInfo::FlushPendingShaders()
-{
-    //assert (gRenDev->m_pRT->IsRenderThread());
-
-    if (!SShaderAsyncInfo::PendingList().m_Next)
-    {
-        SShaderAsyncInfo::PendingList().m_Next = &SShaderAsyncInfo::PendingList();
-        SShaderAsyncInfo::PendingList().m_Prev = &SShaderAsyncInfo::PendingList();
-        SShaderAsyncInfo::PendingListT().m_Next = &SShaderAsyncInfo::PendingListT();
-        SShaderAsyncInfo::PendingListT().m_Prev = &SShaderAsyncInfo::PendingListT();
-    }
-
-    SShaderAsyncInfo* pAI, * pAINext;
-    {
-        AUTO_LOCK(g_cAILock);
-        for (pAI = PendingListT().m_Next; pAI != &PendingListT(); pAI = pAINext)
-        {
-            pAINext = pAI->m_Next;
-            pAI->Unlink();
-            pAI->Link(&PendingList());
-        }
-    }
-
-    for (pAI = PendingList().m_Next; pAI != &PendingList(); pAI = pAINext)
-    {
-        pAINext = pAI->m_Next;
-
-        CHWShader_D3D* pSH = pAI->m_pShader;
-        if (pSH)
-        {
-            CHWShader_D3D::SHWSInstance* pInst = pSH->mfGetInstance(pAI->m_pFXShader, pAI->m_nHashInst, pSH->m_nMaskGenShader);
-            if (pInst->m_pAsync != pAI)
-            {
-                CryFatalError("Shader instance async info doesn't match queued async info.");
-            }
-            pSH->mfAsyncCompileReady(pInst);
-        }
-    }
-}
-void CShader::mfFlushPendedShaders()
-{
-    SShaderAsyncInfo::FlushPendingShaders();
-}
-
-void CHWShader::mfFlushPendedShadersWait(int nMaxAllowed)
-{
-    if (nMaxAllowed > 0 && SShaderAsyncInfo::s_nPendingAsyncShaders < nMaxAllowed)
-    {
-        return;
-    }
-    if (CRenderer::CV_r_shadersasynccompiling > 0)
-    {
-        iLog->Log("Flushing pended shaders...");
-Start:
-        while (true)
-        {
-            if (SShaderAsyncInfo::s_nPendingAsyncShaders <= 0)
-            {
-                break;
-            }
-            int n = (int)iTimer->GetAsyncCurTime();
-            if (!(n % 2))
-            {
-                iLog->Update();
-            }
-            if (!(n % 8))
-            {
-                SShaderAsyncInfo::FlushPendingShaders();
-            }
-            else
-            {
-                Sleep(1);
-            }
-        }
-        // Compile FXC shaders or next iteration of internal shaders
-        SShaderAsyncInfo::FlushPendingShaders();
-
-        if (SShaderAsyncInfo::s_nPendingAsyncShaders)
-        {
-            goto Start;
-        }
-
-        iLog->Log("Finished flushing pended shaders...");
-    }
-}
-
-int CHWShader_D3D::mfAsyncCompileReady(SHWSInstance* pInst)
-{
-    //SHWSInstance *pInst = m_pCurInst;
-    //assert(pInst->m_pAsync);
-    if (!pInst->m_pAsync)
-    {
-        return 0;
-    }
-
-    gRenDev->m_cEF.m_ShaderCacheStats.m_nNumShaderAsyncCompiles = SShaderAsyncInfo::s_nPendingAsyncShaders;
-
-    SShaderAsyncInfo* pAsync = pInst->m_pAsync;
-    int nFrame = gRenDev->GetFrameID(false);
-    if (pAsync->m_nFrame == nFrame)
-    {
-        if (pAsync->m_fMinDistance > gRenDev->m_RP.m_fMinDistance)
-        {
-            pAsync->m_fMinDistance = gRenDev->m_RP.m_fMinDistance;
-        }
-    }
-    else
-    {
-        pAsync->m_fMinDistance = gRenDev->m_RP.m_fMinDistance;
-        pAsync->m_nFrame = nFrame;
-    }
-
-    std::vector<SCGBind> InstBindVars;
-    LPD3D10BLOB pShader = NULL;
-    void* pConstantTable = NULL;
-    LPD3D10BLOB pErrorMsgs = NULL;
-    string strErr;
-    char nmDst[256], nameSrc[256];
-    bool bResult = true;
-    int nRefCount;
-
-    SShaderTechnique* pTech = gRenDev->m_RP.m_pCurTechnique;
-    CShader* pSH = pAsync->m_pFXShader;
-    {
-        if (pAsync->m_bPending)
-        {
-            return 0;
-        }
-
-        mfGetDstFileName(pInst, this, nmDst, 256, 3);
-        gEnv->pCryPak->AdjustFileName(nmDst, nameSrc, AZ_ARRAY_SIZE(nameSrc), 0);
-        if (pAsync->m_pFXShader && pAsync->m_pFXShader->m_HWTechniques.Num())
-        {
-            pTech = pAsync->m_pFXShader->m_HWTechniques[0];
-        }
-        if ((pAsync->m_pErrors && !pAsync->m_Errors.empty()) || !pAsync->m_pDevShader)
-        {
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logShaders)
-            {
-                gcpRendD3D->LogShv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Async %d: **Failed to compile 0x%x '%s' shader\n", gRenDev->GetFrameID(false), pInst, nameSrc);
-            }
-            string Errors = pAsync->m_Errors;
-            string Text = pAsync->m_Text;
-            CShader* pFXShader = pAsync->m_pFXShader;
-            nRefCount = pFXShader ? pFXShader->GetRefCounter() : 0;
-            nRefCount = min(nRefCount, pAsync->m_pShader ? pAsync->m_pShader->GetRefCounter() : 0);
-            if (nRefCount <= 1) // Just exit if shader was deleted
-            {
-                pInst->m_pAsync = NULL;
-                SAFE_DELETE (pAsync);
-                return -1;
-            }
-
-            mfOutputCompilerError(Errors, Text.c_str());
-
-            Warning("Couldn't compile HW shader '%s'", GetName());
-            mfSaveCGFile(Text.c_str(), NULL);
-
-            bResult = false;
-        }
-        else if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logShaders)
-        {
-            gcpRendD3D->LogShv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Async %d: Finished compiling 0x%x '%s' shader\n", gRenDev->GetFrameID(false), pInst, nameSrc);
-        }
-        pShader = pAsync->m_pDevShader;
-        pErrorMsgs = pAsync->m_pErrors;
-        pConstantTable = pAsync->m_pConstants;
-        strErr = pAsync->m_Errors;
-        InstBindVars = decltype(InstBindVars)(pAsync->m_InstBindVars.begin(), pAsync->m_InstBindVars.end());
-
-        if (pAsync->m_bPendedEnv)
-        {
-            bResult &= CHWShader_D3D::mfCreateShaderEnv(pAsync->m_nThread, pInst, pAsync->m_pDevShader, pAsync->m_pConstants, pAsync->m_pErrors, InstBindVars, this, false, pAsync->m_pFXShader, pAsync->m_nCombination);
-            assert(bResult == true);
-        }
-
-        // Load samplers
-        if (pAsync->m_bPendedSamplers)
-        {
-            mfGatherFXParameters(pInst, &InstBindVars, this, 2, pAsync->m_pFXShader);
-        }
-
-        if (pAsync->m_bPendedFlush)
-        {
-            mfFlushCacheFile();
-            azstrcpy(nmDst, AZ_ARRAY_SIZE(nmDst), GetName());
-            char* s = strchr(nmDst, '(');
-            if (s)
-            {
-                s[0] = 0;
-            }
-            SShaderCombIdent Ident = pInst->m_Ident;
-            Ident.m_GLMask = m_nMaskGenFX;
-            gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, nmDst, 0);
-        }
-
-        nRefCount = pAsync->m_pFXShader ? pAsync->m_pFXShader->GetRefCounter() : 0;
-        nRefCount = min(nRefCount, pAsync->m_pShader ? pAsync->m_pShader->GetRefCounter() : 0);
-        if (nRefCount <= 1) // Just exit if shader was deleted
-        {
-            pInst->m_pAsync = NULL;
-            SAFE_DELETE(pAsync);
-            return -1;
-        }
-        SAFE_DELETE (pInst->m_pAsync);
-    }
-
-    if (pErrorMsgs && !strErr.empty())
-    {
-        return -1;
-    }
-
-    bResult &= mfUploadHW(pShader, pInst, pSH, 0);
-    SAFE_RELEASE(pShader);
-
-    if (bResult)
-    {
-        if (pTech)
-        {
-            mfUpdatePreprocessFlags(pTech);
-        }
-        return 1;
-    }
-    return -1;
-}
-
-bool CHWShader_D3D::mfRequestAsync(CShader* pSH, SHWSInstance* pInst, std::vector<SCGBind>& InstBindVars, const char* prog_text, const char* szProfile, const char* szEntry)
-{
-#ifdef SHADER_ASYNC_COMPILATION
-    char nameSrc[256], nmDst[256];
-    mfGetDstFileName(pInst, this, nmDst, 256, 3);
-    gEnv->pCryPak->AdjustFileName(nmDst, nameSrc, AZ_ARRAY_SIZE(nameSrc), 0);
-
-    if (!SShaderAsyncInfo::PendingList().m_Next)
-    {
-        SShaderAsyncInfo::PendingList().m_Next = &SShaderAsyncInfo::PendingList();
-        SShaderAsyncInfo::PendingList().m_Prev = &SShaderAsyncInfo::PendingList();
-        SShaderAsyncInfo::PendingListT().m_Next = &SShaderAsyncInfo::PendingListT();
-        SShaderAsyncInfo::PendingListT().m_Prev = &SShaderAsyncInfo::PendingListT();
-    }
-
-    if (!m_pGlobalCache || !m_pGlobalCache->m_pRes[CACHE_USER])
-    {
-        if (m_pGlobalCache)
-        {
-            m_pGlobalCache->Release(false);
-        }
-        m_pGlobalCache = mfInitCache(NULL, this, true, m_CRC32, false, false);
-    }
-
-    pInst->m_pAsync = new SShaderAsyncInfo;
-    pInst->m_pAsync->m_fMinDistance = gRenDev->m_RP.m_fMinDistance;
-    pInst->m_pAsync->m_nFrame = gRenDev->GetFrameID(false);
-    pInst->m_pAsync->m_InstBindVars.assign(InstBindVars.data(), InstBindVars.data() + InstBindVars.size());
-    pInst->m_pAsync->m_pShader = this;
-    pInst->m_pAsync->m_pShader->AddRef();
-    pInst->m_pAsync->m_pFXShader = pSH;
-    pInst->m_pAsync->m_pFXShader->AddRef();
-    pInst->m_pAsync->m_nCombination = gRenDev->m_cEF.m_nCombinationsProcess;
-    assert(!azstricmp(m_NameSourceFX.c_str(), pInst->m_pAsync->m_pFXShader->m_NameFile.c_str()));
-    if (m_bUseLookUpTable)
-    {
-        pInst->m_pAsync->m_nHashInst = pInst->m_nContIndex;
-    }
-    else
-    {
-        pInst->m_pAsync->m_nHashInst = pInst->m_Ident.m_nHash;
-    }
-    pInst->m_pAsync->m_RTMask = pInst->m_Ident.m_RTMask;
-    pInst->m_pAsync->m_LightMask = pInst->m_Ident.m_LightMask;
-    pInst->m_pAsync->m_MDMask = pInst->m_Ident.m_MDMask;
-    pInst->m_pAsync->m_MDVMask = pInst->m_Ident.m_MDVMask;
-    pInst->m_pAsync->m_pipelineState.opaque = pInst->m_Ident.m_pipelineState.opaque;
-    pInst->m_pAsync->m_eClass = pInst->m_eClass;
-    pInst->m_pAsync->m_Text = prog_text;
-    pInst->m_pAsync->m_Name = szEntry;
-    pInst->m_pAsync->m_Profile = szProfile;
-
-    // Generate request line text to store on the shaderlist for next shader cache gen
-    {
-        char szShaderGenName[512];
-        cry_strcpy(szShaderGenName, GetName());
-        char* s = strchr(szShaderGenName, '(');
-        if (s)
-        {
-            s[0] = 0;
-        }
-        string RequestLine;
-        SShaderCombIdent Ident = pInst->m_Ident;
-        Ident.m_GLMask = m_nMaskGenFX;
-        gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, szShaderGenName, 0, &RequestLine, false);
-
-        pInst->m_pAsync->m_RequestLine = RequestLine;
-    }
-
-    CAsyncShaderTask::InsertPendingShader(pInst->m_pAsync);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logShaders)
-    {
-        gcpRendD3D->LogShv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Async %d: Requested compiling 0x%x '%s' shader\n", gRenDev->GetFrameID(false), pInst, nameSrc);
-    }
-#endif
-    return false;
-}
-
-
-
-void CHWShader_D3D::mfSubmitRequestLine(SHWSInstance* pInst, string* pRequestLine)
-{
-    // Generate request line text.
-    char szShaderGenName[512];
-    cry_strcpy(szShaderGenName, GetName());
-    char* s = strchr(szShaderGenName, '(');
-    if (s)
-    {
-        s[0] = 0;
-    }
-    string RequestLine;
-    SShaderCombIdent Ident = pInst->m_Ident;
-    Ident.m_GLMask = m_nMaskGenFX;
-    gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, szShaderGenName, 0, &RequestLine, false);
-
-    if (pRequestLine)
-    {
-        *pRequestLine = RequestLine;
-    }
-
-    if (!CRenderer::CV_r_shaderssubmitrequestline || !CRenderer::CV_r_shadersremotecompiler || pInst->m_bHasSendRequest)
-    {
-        return;
-    }
-
-    // make sure we only send the request once
-    pInst->m_bHasSendRequest = true;
-
-#ifdef SHADER_ASYNC_COMPILATION
-    if (CRenderer::CV_r_shadersasynccompiling && !(m_Flags & HWSG_SYNC))
-    {
-        if (!SShaderAsyncInfo::PendingList().m_Next)
-        {
-            SShaderAsyncInfo::PendingList().m_Next = &SShaderAsyncInfo::PendingList();
-            SShaderAsyncInfo::PendingList().m_Prev = &SShaderAsyncInfo::PendingList();
-            SShaderAsyncInfo::PendingListT().m_Next = &SShaderAsyncInfo::PendingListT();
-            SShaderAsyncInfo::PendingListT().m_Prev = &SShaderAsyncInfo::PendingListT();
-        }
-
-        SShaderAsyncInfo* pAsync = new SShaderAsyncInfo;
-
-        if (pAsync)
-        {
-            pAsync->m_RequestLine = RequestLine;
-            pAsync->m_Text = "";
-            pAsync->m_bDeleteAfterRequest = true;
-
-            CAsyncShaderTask::InsertPendingShader(pAsync);
-        }
-    }
-    else
-#endif
-    {
-        NRemoteCompiler::CShaderSrv::Instance().RequestLine(GetShaderListFilename().c_str(), RequestLine.c_str());
-    }
-}
-
-bool CHWShader_D3D::mfCompileHLSL_Int(CShader* pSH, char* prog_text, LPD3D10BLOB* ppShader, void** ppConstantTable, LPD3D10BLOB* ppErrorMsgs, string& strErr, std::vector<SCGBind>& InstBindVars)
-{
-    HRESULT hr = S_OK;
-    SHWSInstance* pInst = m_pCurInst;
-    const char* szProfile = mfProfileString(pInst->m_eClass);
-    const char* pFunCCryName = m_EntryFunc.c_str();
-
-    bool bRes = true;
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 2)
-    {
-        mfSaveCGFile(prog_text, "TestCG");
-    }
-    if (CRenderer::CV_r_shadersasynccompiling && !(m_Flags & HWSG_SYNC))
-    {
-        return mfRequestAsync(pSH, pInst, InstBindVars, prog_text, szProfile, pFunCCryName);
-    }
-    else
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersremotecompiler)
-    {
-        AZStd::string lsCompilerFlags = NRemoteCompiler::CShaderSrv::Instance().GetShaderCompilerFlags(pInst->m_eClass, pInst->m_Ident.m_pipelineState, pInst->m_Ident.m_MDVMask);
-
-        string RequestLine;
-        mfSubmitRequestLine(pInst, &RequestLine);
-
-        std::vector<uint8> Data;
-        if (NRemoteCompiler::ESOK != NRemoteCompiler::CShaderSrv::Instance().Compile(Data, szProfile, prog_text, pFunCCryName, lsCompilerFlags.c_str(), RequestLine.c_str()))
-        {
-            string sErrorText;
-            sErrorText.reserve(Data.size());
-            for (uint32 i = 0; i < Data.size(); i++)
-            {
-                sErrorText += Data[i];
-            }
-            strErr = sErrorText;
-
-            return false;
-        }
-
-        D3D10CreateBlob(Data.size(), (LPD3D10BLOB*)ppShader);
-        LPD3D10BLOB pShader = (LPD3D10BLOB) * ppShader;
-        DWORD* pBuf = (DWORD*) pShader->GetBufferPointer();
-        memcpy(pBuf, &Data[0], Data.size());
-
-        *ppShader = (LPD3D10BLOB)pShader;
-        pBuf = (DWORD*)pShader->GetBufferPointer();
-        size_t nSize = pShader->GetBufferSize();
-
-        bool bReflect = true;
-
-#if !defined(CONSOLE)
-        if (CParserBin::PlatformIsConsole())
-        {
-            bReflect = false;
-        }
-#endif
-
-        if (bReflect)
-        {
-            void* pShaderReflBuf;
-            hr = D3DReflect(pBuf, nSize, IID_ID3D11ShaderReflection, &pShaderReflBuf);
-            if (SUCCEEDED(hr))
-            {
-                ID3D11ShaderReflection* pShaderReflection = (ID3D11ShaderReflection*)pShaderReflBuf;
-                *ppConstantTable = (void*)pShaderReflection;
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-
-        return hr == S_OK;
-    }
-#if defined(WIN32) || defined(WIN64)
-    else
-    {
-        static bool s_logOnce_WrongPlatform = false;
-#   if !defined(OPENGL)
-#       if !defined(_RELEASE)
-        if (!s_logOnce_WrongPlatform && !(CParserBin::m_nPlatform == SF_D3D11))
-        {
-            s_logOnce_WrongPlatform = true;
-            iLog->LogError("Trying to build non DX11 shader via internal compiler which is not supported. Please use remote compiler instead!");
-        }
-#       endif
-        uint32 nFlags = D3D10_SHADER_PACK_MATRIX_ROW_MAJOR | D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY;
-        if (CRenderer::CV_r_shadersdebug == 3) // Generate debug information and do not optimize shader for ease of debugging
-        {
-            nFlags |= D3D10_SHADER_DEBUG | D3D10_SHADER_SKIP_OPTIMIZATION;
-        }
-        else if(CRenderer::CV_r_shadersdebug == 4) // Generate debug information, but still optimize shader
-        {
-            nFlags |= D3D10_SHADER_DEBUG;
-        }
-
-        hr = D3DCompile(prog_text, strlen(prog_text), GetName(), NULL, NULL, pFunCCryName, szProfile, nFlags, 0, (ID3DBlob**) ppShader, (ID3DBlob**) ppErrorMsgs);
-        if (FAILED(hr) || !*ppShader)
-        {
-            if (*ppErrorMsgs)
-            {
-                const char* err = (const char*)ppErrorMsgs[0]->GetBufferPointer();
-                strErr += err;
-            }
-            else
-            {
-                strErr += "D3DXCompileShader failed";
-            }
-            bRes = false;
-        }
-        else
-        {
-            void* pShaderReflBuf;
-            UINT* pData = (UINT*)ppShader[0]->GetBufferPointer();
-            UINT nSize = (uint32)ppShader[0]->GetBufferSize();
-            hr = D3DReflect(pData, nSize, IID_ID3D11ShaderReflection, &pShaderReflBuf);
-            if (SUCCEEDED(hr))
-            {
-                ID3D11ShaderReflection* pShaderReflection = (ID3D11ShaderReflection*)pShaderReflBuf;
-                *ppConstantTable = (void*)pShaderReflection;
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-        return bRes;
-#   endif
-    }
-#endif // #if defined(WIN32) || defined(WIN64)
-
-    return false;
-}
-
-LPD3D10BLOB CHWShader_D3D::mfCompileHLSL(CShader* pSH, char* prog_text, void** ppConstantTable, LPD3D10BLOB* ppErrorMsgs, [[maybe_unused]] uint32 nFlags, std::vector<SCGBind>& InstBindVars)
-{
-    //  LOADING_TIME_PROFILE_SECTION(iSystem);
-
-    // Test adding source text to context
-    string strErr;
-    LPD3D10BLOB pCode = NULL;
-    if (!prog_text)
-    {
-        assert(0);
-        return NULL;
-    }
-    if (!CRenderer::CV_r_shadersAllowCompilation)
-    {
-        return NULL;
-    }
-
-    mfCompileHLSL_Int(pSH, prog_text, &pCode, ppConstantTable, ppErrorMsgs, strErr, InstBindVars);
-    if (!pCode)
-    {
-        if (CRenderer::CV_r_shadersasynccompiling)
-        {
-            return NULL;
-        }
-        if (!pCode)
-        {
-            {
-                mfOutputCompilerError(strErr, prog_text);
-
-                Warning("Couldn't compile HW shader '%s'", GetName());
-                mfSaveCGFile(prog_text, NULL);
-            }
-        }
-    }
-
-    return pCode;
-}
-
-void CHWShader_D3D::mfPrepareShaderDebugInfo(SHWSInstance* pInst, CHWShader_D3D* pSH, const char* szAsm, std::vector<SCGBind>& InstBindVars, void* pConstantTable)
-{
-    if (szAsm)
-    {
-        char* szInst = strstr((char*)szAsm, "pproximately ");
-        if (szInst)
-        {
-            pInst->m_nInstructions = atoi(&szInst[13]);
-        }
-    }
-    // Confetti Nicholas Baldwin: adding metal shader language support
-    if (CParserBin::m_nPlatform == SF_D3D11 || CParserBin::m_nPlatform == SF_JASPER || CParserBin::m_nPlatform == SF_GL4 || CParserBin::m_nPlatform == SF_GLES3 ||  CParserBin::m_nPlatform == SF_METAL)
-    {
-        ID3D11ShaderReflection* pShaderReflection = (ID3D11ShaderReflection*) pConstantTable;
-
-        if (pShaderReflection)
-        {
-            D3D11_SHADER_DESC Desc;
-            pShaderReflection->GetDesc(&Desc);
-
-            pInst->m_nInstructions = Desc.InstructionCount;
-            pInst->m_nTempRegs = Desc.TempRegisterCount;
-        }
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug)
-    {
-        char nmdst[256];
-        mfGetDstFileName(pInst, pSH, nmdst, 256, 4);
-
-        AZStd::string szName = AZStd::string::format("%s%s.fxca", gRenDev->m_cEF.m_szCachePath.c_str(), nmdst);
-        AZ::IO::HandleType statusdstFileHandle = gEnv->pCryPak->FOpen(szName.c_str(), "wb");
-
-        if (statusdstFileHandle != AZ::IO::InvalidHandle)
-        {
-            gEnv->pCryPak->FPrintf(statusdstFileHandle, "\n// %s %s\n\n", "%STARTSHADER", mfProfileString(pInst->m_eClass));
-            if (pSH->m_eSHClass == eHWSC_Vertex)
-            {
-                for (uint32 i = 0; i < (uint32)InstBindVars.size(); i++)
-                {
-                    SCGBind* pBind = &InstBindVars[i];
-                    gEnv->pCryPak->FPrintf(statusdstFileHandle, "//   %s %s %d %d\n", "%%", pBind->m_Name.c_str(), pBind->m_RegisterCount, pBind->m_RegisterOffset);
-                }
-            }
-            gEnv->pCryPak->FPrintf(statusdstFileHandle, "%s", szAsm);
-            gEnv->pCryPak->FPrintf(statusdstFileHandle, "\n// %s\n", "%ENDSHADER");
-            gEnv->pCryPak->FClose(statusdstFileHandle);
-        }
-        pInst->m_Handle.m_pShader = NULL;
-    }
-}
-
-void CHWShader_D3D::mfPrintCompileInfo(SHWSInstance* pInst)
-{
-    int nConsts = 0;
-    int nParams = pInst->m_pBindVars.size();
-    for (int i = 0; i < nParams; i++)
-    {
-        SCGBind* pB = &pInst->m_pBindVars[i];
-        nConsts += pB->m_RegisterCount;
-    }
-
-    char szGenName[512];
-    cry_strcpy(szGenName, GetName());
-    char* s = strchr(szGenName, '(');
-    if (s)
-    {
-        s[0] = 0;
-    }
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 2)
-    {
-        string pName;
-        SShaderCombIdent Ident(m_nMaskGenFX, pInst->m_Ident);
-        gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, szGenName, 0, &pName, false);
-        CryLog(" Compile %s (%d instructions, %d tempregs, %d/%d constants) ... ", pName.c_str(), pInst->m_nInstructions, pInst->m_nTempRegs, nParams, nConsts);
-        int nSize = strlen(szGenName);
-        mfGenName(pInst, &szGenName[nSize], 512 - nSize, 1);
-        CryLog("           --- Cache entry: %s", szGenName);
-    }
-    else
-    {
-        int nSize = strlen(szGenName);
-        mfGenName(pInst, &szGenName[nSize], 512 - nSize, 1);
-        CryLog(" Compile %s (%d instructions, %d tempregs, %d/%d constants) ... ", szGenName, pInst->m_nInstructions, pInst->m_nTempRegs, nParams, nConsts);
-    }
-
-    if (gRenDev->m_cEF.m_bActivated && CRenderer::CV_r_shadersdebug > 0)
-    {
-        CryLog(" Shader %s (%llx)(%x)(%x)(%x)(%llx)(%llx)(%s) wasn't compiled before preactivating phase",
-            GetName(), pInst->m_Ident.m_RTMask, pInst->m_Ident.m_LightMask, pInst->m_Ident.m_MDMask, pInst->m_Ident.m_MDVMask, pInst->m_Ident.m_pipelineState.opaque, pInst->m_Ident.m_STMask, mfProfileString(pInst->m_eClass));
-    }
-}
-
-bool CHWShader_D3D::mfCreateShaderEnv([[maybe_unused]] int nThread, SHWSInstance* pInst, LPD3D10BLOB pShader, void* pConstantTable, LPD3D10BLOB pErrorMsgs, std::vector<SCGBind>& InstBindVars, CHWShader_D3D* pSH, bool bShaderThread, CShader* pFXShader, int nCombination, [[maybe_unused]] const char* src)
-{
-    // Create asm (.fxca) cache file
-    assert(pInst);
-    if (!pInst)
-    {
-        return false;
-    }
-
-    CSpinLock lock;
-
-    if (pInst->m_pBindVars.size())
-    {
-        return true;
-    }
-
-    if (pShader && (nCombination < 0))
-    {
-#if !defined(OPENGL)
-        ID3D10Blob* pAsm = NULL;
-        ID3D10Blob* pSrc = (ID3D10Blob*)pShader;
-        UINT* pBuf = (UINT*)pSrc->GetBufferPointer();
-        D3DDisassemble(pBuf, pSrc->GetBufferSize(), 0, NULL, &pAsm);
-        if (pAsm)
-        {
-            char* szAsm = (char*)pAsm->GetBufferPointer();
-            mfPrepareShaderDebugInfo(pInst, pSH, szAsm, InstBindVars, pConstantTable);
-        }
-        SAFE_RELEASE(pAsm);
-#endif
-    }
-    //assert(!pInst->m_pBindVars);
-
-    if (pShader)
-    {
-        bool bVF = pSH->m_eSHClass == eHWSC_Vertex;
-#if !defined(CONSOLE)
-        if (CParserBin::PlatformIsConsole())
-        {
-            bVF = false;
-        }
-#endif
-#if !defined(OPENGL)
-        if (CParserBin::m_nPlatform & (SF_GL4 | SF_GLES3))
-        {
-            bVF = false;
-        }
-#endif
-#if defined(CRY_USE_METAL)
-        if (!(CParserBin::m_nPlatform & (SF_METAL)))
-        {
-            bVF = false;
-        }
-#endif
-        if (bVF)
-        {
-            mfVertexFormat(pInst, pSH, pShader);
-        }
-        if (pConstantTable)
-        {
-            mfCreateBinds(pInst, pConstantTable, (byte*)pShader->GetBufferPointer(), (uint32)pShader->GetBufferSize());
-        }
-    }
-    if (!(pSH->m_Flags & HWSG_PRECACHEPHASE))
-    {
-        int nConsts = 0;
-        int nParams = pInst->m_pBindVars.size();
-        for (int i = 0; i < nParams; i++)
-        {
-            SCGBind* pB = &pInst->m_pBindVars[i];
-            nConsts += pB->m_RegisterCount;
-        }
-        if (gRenDev->m_cEF.m_nCombinationsProcess >= 0)
-        {
-            //assert(!bShaderThread);
-
-            //if (!(gRenDev->m_cEF.m_nCombination & 0xff))
-            if (!CParserBin::m_nPlatform)
-            {
-                CryLog("%d: Compile %s %s (%d out of %d) - (%d/%d constants) ... ", nThread,
-                    mfProfileString(pInst->m_eClass), pSH->GetName(), nCombination, gRenDev->m_cEF.m_nCombinationsProcessOverall,
-                    nParams, nConsts);
-            }
-            else
-            {
-                CryLog("%d: Compile %s %s (%d out of %d) ... ", nThread,
-                    mfProfileString(pInst->m_eClass), pSH->GetName(), nCombination, gRenDev->m_cEF.m_nCombinationsProcessOverall);
-            }
-        }
-        else
-        {
-            pSH->mfPrintCompileInfo(pInst);
-        }
-    }
-
-    mfGatherFXParameters(pInst, &InstBindVars, pSH, bShaderThread ? 1 : 0, pFXShader);
-
-    if (pShader)
-    {
-        mfCreateCacheItem(pInst, InstBindVars, (byte*)pShader->GetBufferPointer(), (uint32)pShader->GetBufferSize(), pSH, bShaderThread);
-    }
-    else if (CRenderer::CV_r_shadersCacheUnavailableShaders)
-    {
-        // If the shader is unavailable, cache an invalid item to avoid requesting its compilation again in future executions
-        mfCreateCacheItem(pInst, InstBindVars, NULL, 0, pSH, bShaderThread);
-    }
-
-#if !defined (NULL_RENDERER)
-    ID3D11ShaderReflection* pRFL = (ID3D11ShaderReflection*)pConstantTable;
-    ID3D10Blob* pER = (ID3D10Blob*)pErrorMsgs;
-    SAFE_RELEASE(pRFL);
-    SAFE_RELEASE(pER);
-#endif
-
-    return true;
-}
-
-// Compile pixel/vertex shader for the current instance properties
-bool CHWShader_D3D::mfActivate(CShader* pSH, uint32 nFlags, FXShaderToken* Table, TArray<uint32>* pSHData, bool bCompressedOnly)
-{
-    PROFILE_FRAME(Shader_HWShaderActivate);
-    AZ_TRACE_METHOD();
-
-    bool bResult = true;
-    SHWSInstance* pInst = m_pCurInst;
-
-    mfLogShaderRequest(pInst);
-
-    if (mfIsValid(pInst, true) == ED3DShError_NotCompiled)
-    {
-        //if (!(m_Flags & HWSG_PRECACHEPHASE) && !(nFlags & HWSF_NEXT))
-        //  mfSetHWStartProfile(nFlags);
-
-        // We need a different source and desination for fpStripExtension
-        // since a call to strcpy with the same src and dst results in
-        // undefined behaviour
-        char nameCacheUnstripped[256];
-        char nameCache[256];
-        float t0 = gEnv->pTimer->GetAsyncCurTime();
-
-        mfGetDstFileName(pInst, this, nameCacheUnstripped, 256, 0);
-        fpStripExtension(nameCacheUnstripped, nameCache);
-        fpAddExtension(nameCache, ".fxcb");
-        if (!m_pDevCache)
-        {
-            m_pDevCache = mfInitDevCache(nameCache, this);
-        }
-
-        int32 nSize;
-        SShaderCacheHeaderItem* pCacheItem = mfGetCompressedItem(nFlags, nSize);
-        if (pCacheItem)
-        {
-            pInst->m_bCompressed = true;
-        }
-        else if (bCompressedOnly)
-        {
-            // don't activate if shader isn't found in compressed shader data
-            return false;
-        }
-        else
-        {
-            // if shader compiling is enabled, make sure the user folder shader caches are also available
-            bool bReadOnly = CRenderer::CV_r_shadersAllowCompilation == 0;
-            if (!m_pGlobalCache || m_pGlobalCache->m_nPlatform != CParserBin::m_nPlatform ||
-                (!bReadOnly && !m_pGlobalCache->m_pRes[CACHE_USER]))
-            {
-                SAFE_RELEASE(m_pGlobalCache);
-                bool bAsync = CRenderer::CV_r_shadersasyncactivation != 0;
-                if (nFlags & HWSF_PRECACHE)
-                {
-                    bAsync = false;
-                }
-                m_pGlobalCache = mfInitCache(nameCache, this, true, m_CRC32, bReadOnly, bAsync);
-            }
-            if (gRenDev->m_cEF.m_nCombinationsProcess >= 0 && !gRenDev->m_cEF.m_bActivatePhase)
-            {
-                mfGetDstFileName(pInst, this, nameCache, 256, 0);
-                fpStripExtension(nameCache, nameCache);
-                fpAddExtension(nameCache, ".fxcb");
-                FXShaderCacheNamesItor it = m_ShaderCacheList.find(nameCache);
-                if (it == m_ShaderCacheList.end())
-                {
-                    m_ShaderCacheList.insert(FXShaderCacheNamesItor::value_type(nameCache, m_CRC32));
-                }
-            }
-            pCacheItem = mfGetCacheItem(nFlags, nSize);
-        }
-        if (pCacheItem && pCacheItem->m_Class != 255)
-        {
-            if (Table && CRenderer::CV_r_shadersAllowCompilation)
-            {
-                mfGetCacheTokenMap(Table, pSHData, m_nMaskGenShader);
-            }
-            if (((m_Flags & HWSG_PRECACHEPHASE) || gRenDev->m_cEF.m_nCombinationsProcess >= 0) && !gRenDev->m_cEF.m_bActivatePhase)
-            {
-                byte* pData = (byte*)pCacheItem;
-                SAFE_DELETE_ARRAY(pData);
-                return true;
-            }
-            bool bRes = false;
-            bRes = mfActivateCacheItem(pSH, pCacheItem, nSize, nFlags);
-            byte* pData = (byte*)pCacheItem;
-            SAFE_DELETE_ARRAY(pData);
-            pCacheItem = NULL;
-            if (CRenderer::CV_r_shaderspreactivate == 2 && !gRenDev->m_cEF.m_bActivatePhase)
-            {
-                t0 = gEnv->pTimer->GetAsyncCurTime() - t0;
-                iLog->Log("Warning: Shader activation (%.3f ms): %s(%llx)(%x)(%x)(%x)(%llx)(%llx)(%s)...",
-                        t0 * 1000.0f, GetName(), pInst->m_Ident.m_RTMask, pInst->m_Ident.m_LightMask, pInst->m_Ident.m_MDMask, pInst->m_Ident.m_MDVMask,
-                        pInst->m_Ident.m_pipelineState.opaque, pInst->m_Ident.m_STMask, mfProfileString(pInst->m_eClass));
-                char name[256];
-                azstrcpy(name, AZ_ARRAY_SIZE(name), GetName());
-                char* s = strchr(name, '(');
-                if (s)
-                {
-                    s[0] = 0;
-                }
-                string pName;
-                SShaderCombIdent Ident(m_nMaskGenFX, pInst->m_Ident);
-                gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, name, 0, &pName, false);
-                iLog->Log("...Shader list entry: %s (%llx)", pName.c_str(), m_nMaskGenFX);
-            }
-            if (bRes)
-            {
-                return (pInst->m_Handle.m_pShader != NULL);
-            }
-            pCacheItem = NULL;
-        }
-        else
-        if (pCacheItem && pCacheItem->m_Class == 255)
-        {
-            byte* pData = (byte*)pCacheItem;
-            SAFE_DELETE_ARRAY(pData);
-            pCacheItem = NULL;
-            return false;
-        }
-        else
-        if (gRenDev->m_cEF.m_bActivatePhase)
-        {
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug > 0)
-            {
-                iLog->Log("Warning: Shader %s(%llx)(%x)(%x)(%x)(%llx)(%llx)(%s) wasn't compiled before preactivating phase",
-                    GetName(), pInst->m_Ident.m_RTMask, pInst->m_Ident.m_LightMask, pInst->m_Ident.m_MDMask, pInst->m_Ident.m_MDVMask, pInst->m_Ident.m_pipelineState.opaque, pInst->m_Ident.m_STMask, mfProfileString(pInst->m_eClass));
-            }
-            byte* pData = (byte*)pCacheItem;
-            SAFE_DELETE_ARRAY(pData);
-            pCacheItem = NULL;
-            return false;
-        }
-        if (pCacheItem)
-        {
-            byte* pData = (byte*)pCacheItem;
-            SAFE_DELETE_ARRAY(pData);
-            pCacheItem = NULL;
-        }
-        //assert(!m_TokenData.empty());
-
-        TArray<char> newScr;
-
-        if (nFlags & HWSF_PRECACHE)
-        {
-            gRenDev->m_cEF.m_nCombinationsCompiled++;
-        }
-
-        float fTime0 = iTimer->GetAsyncCurTime();
-        LPD3D10BLOB pShader = NULL;
-        void* pConstantTable = NULL;
-        LPD3D10BLOB pErrorMsgs = NULL;
-        std::vector<SCGBind> InstBindVars;
-        m_Flags |= HWSG_WASGENERATED;
-
-        bool bScriptSuccess = false;
-
-        if (CRenderer::CV_r_shadersAllowCompilation)
-        {
-            // MemReplay shows that 16kb should be enough memory to hold the script without having to reallocate
-            newScr.reserve(16 * 1024);
-            bScriptSuccess = mfGenerateScript(pSH, pInst, InstBindVars, nFlags, Table, pSHData, newScr);
-            ASSERT_IN_SHADER(bScriptSuccess);
-        }
-
-        if (!pInst->m_bAsyncActivating && !bCompressedOnly)
-        {
-            // report miss in global cache to log and/or callback
-            mfLogShaderCacheMiss(pInst);
-
-            // still sumit the request line when no compiling to be sure that the shadercompiler will
-            // compile it in the next build
-            if (!CRenderer::CV_r_shadersAllowCompilation)
-            {
-                mfSubmitRequestLine(pInst);
-            }
-        }
-
-        if (!bScriptSuccess)
-        {
-            if (!pInst->m_bAsyncActivating)
-            {
-                Warning("Warning: Shader %s(%llx)(%x)(%x)(%x)(%llx)(%llx)(%s) is not existing in the cache\n",
-                    GetName(), pInst->m_Ident.m_RTMask, pInst->m_Ident.m_LightMask, pInst->m_Ident.m_MDMask, pInst->m_Ident.m_MDVMask, pInst->m_Ident.m_pipelineState.opaque, pInst->m_Ident.m_STMask, mfProfileString(pInst->m_eClass));
-            }
-            return false;
-        }
-
-        {
-            PROFILE_FRAME(Shader_CompileHLSL);
-            pShader = mfCompileHLSL(pSH, newScr.Data(), &pConstantTable, &pErrorMsgs, nFlags, InstBindVars);
-        }
-
-        gRenDev->m_cEF.m_ShaderCacheStats.m_nNumShaderAsyncCompiles = SShaderAsyncInfo::s_nPendingAsyncShaders;
-
-        if (!pShader)
-        {
-            if (!CRenderer::CV_r_shadersAllowCompilation || pInst->IsAsyncCompiling())
-            {
-                return false;
-            }
-        }
-        bResult = mfCreateShaderEnv(0, pInst, pShader, pConstantTable, pErrorMsgs, InstBindVars, this, false, pSH, gRenDev->m_cEF.m_nCombinationsProcess, newScr.Data());
-        bResult &= mfUploadHW(pShader, pInst, pSH, nFlags);
-        SAFE_RELEASE(pShader);
-
-        fTime0 = iTimer->GetAsyncCurTime() - fTime0;
-        //iLog->LogToConsole(" Time activate: %.3f", fTime0);
-    }
-    else
-    if (pSHData)
-    {
-        mfGetCacheTokenMap(Table, pSHData, m_nMaskGenShader);
-    }
-
-    bool bSuccess = (mfIsValid(pInst, true) == ED3DShError_Ok);
-
-    return bSuccess;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-#ifdef SHADER_ASYNC_COMPILATION
-
-CAsyncShaderTask::CAsyncShaderTask()
-    : m_thread(this)
-{
-}
-
-void CAsyncShaderTask::InsertPendingShader(SShaderAsyncInfo* pAsync)
-{
-    AUTO_LOCK(g_cAILock);
-    pAsync->Link(&BuildList());
-    CryInterlockedIncrement(&SShaderAsyncInfo::s_nPendingAsyncShaders);
-}
-
-void CAsyncShaderTask::FlushPendingShaders()
-{
-    SShaderAsyncInfo* pAI, * pAI2, * pAINext;
-    assert(m_flush_list.m_Prev == &m_flush_list && m_flush_list.m_Next == &m_flush_list); // the flush list must be empty - cleared by the shader compile thread
-    if (BuildList().m_Prev == &BuildList() && BuildList().m_Next == &BuildList())
-    {
-        return; // the build list is empty, might need to do some assert here
-    }
-    {
-        AUTO_LOCK(g_cAILock);
-        for (pAI = BuildList().m_Prev; pAI != &BuildList(); pAI = pAINext)
-        {
-            pAINext = pAI->m_Prev;
-            pAI->Unlink();
-            pAI->Link(&m_flush_list);
-        }
-    }
-
-    // Sorting by distance
-    if (gRenDev->m_cEF.m_nCombinationsProcess < 0)
-    {
-        for (pAI = m_flush_list.m_Next; pAI != &m_flush_list; pAI = pAI->m_Next)
-        {
-            assert(pAI);
-            PREFAST_ASSUME(pAI);
-            pAINext = NULL;
-            int nFrame = pAI->m_nFrame;
-            float fDist = pAI->m_fMinDistance;
-            for (pAI2 = pAI->m_Next; pAI2 != &m_flush_list; pAI2 = pAI2->m_Next)
-            {
-                if (pAI2->m_nFrame < nFrame)
-                {
-                    continue;
-                }
-                if (pAI2->m_nFrame > nFrame || pAI2->m_fMinDistance < fDist)
-                {
-                    pAINext = pAI2;
-                    nFrame = pAI2->m_nFrame;
-                    fDist = pAI2->m_fMinDistance;
-                }
-            }
-            if (pAINext)
-            {
-                assert(pAI != pAINext);
-                SShaderAsyncInfo* pAIP0 = pAI->m_Prev;
-                SShaderAsyncInfo* pAIP1 = pAINext->m_Prev == pAI ? pAINext : pAINext->m_Prev;
-
-                pAI->m_Next->m_Prev = pAI->m_Prev;
-                pAI->m_Prev->m_Next = pAI->m_Next;
-                pAI->m_Next = pAIP1->m_Next;
-                pAIP1->m_Next->m_Prev = pAI;
-                pAIP1->m_Next = pAI;
-                pAI->m_Prev = pAIP1;
-
-                pAI = pAINext;
-
-                pAI->m_Next->m_Prev = pAI->m_Prev;
-                pAI->m_Prev->m_Next = pAI->m_Next;
-                pAI->m_Next = pAIP0->m_Next;
-                pAIP0->m_Next->m_Prev = pAI;
-                pAIP0->m_Next = pAI;
-                pAI->m_Prev = pAIP0;
-            }
-        }
-    }
-
-    for (pAI = m_flush_list.m_Next; pAI != &m_flush_list; pAI = pAINext)
-    {
-        pAINext = pAI->m_Next;
-        assert(pAI->m_bPending);
-        SubmitAsyncRequestLine(pAI);
-        if (pAI->m_Text.length() > 0)
-        {
-            CompileAsyncShader(pAI);
-        }
-
-        CryInterlockedDecrement(&SShaderAsyncInfo::s_nPendingAsyncShaders);
-        {
-            AUTO_LOCK(g_cAILock);
-
-            pAI->Unlink();
-            pAI->m_bPending = 0;
-            pAI->Link(&SShaderAsyncInfo::PendingListT());
-        }
-
-        if (pAI->m_bDeleteAfterRequest)
-        {
-            SAFE_DELETE(pAI);
-        }
-    }
-}
-
-bool CAsyncShaderTask::PostCompile(SShaderAsyncInfo* pAsync)
-{
-    bool bResult = true;
-    /*if (pAsync->m_nCombination < 0 && false)
-    {
-      CHWShader_D3D *pSH = pAsync->m_pShader;
-      CHWShader_D3D::SHWSInstance *pInst = pSH->mfGetInstance(pAsync->m_nOwner, pSH->m_nMaskGenShader);
-      bResult = CHWShader_D3D::mfCreateShaderEnv(m_nThread, pInst, pAsync->m_pDevShader, pAsync->m_pConstants, pAsync->m_pErrors, pAsync->m_InstBindVars, pSH, true, pAsync->m_pFXShader, pAsync->m_nCombination);
-      assert(bResult == true);
-    }
-    else*/
-    {
-        pAsync->m_nThread = m_nThread;
-        pAsync->m_bPendedEnv = true;
-    }
-    return bResult;
-}
-
-void CAsyncShaderTask::SubmitAsyncRequestLine(SShaderAsyncInfo* pAsync)
-{
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersremotecompiler)
-    {
-        if (!pAsync->m_shaderList.empty())
-        {
-            NRemoteCompiler::CShaderSrv::Instance().RequestLine(pAsync->m_shaderList.c_str(), pAsync->m_RequestLine.c_str());
-        }
-        else
-        {
-            NRemoteCompiler::CShaderSrv::Instance().RequestLine(GetShaderListFilename().c_str(), pAsync->m_RequestLine.c_str());
-        }
-    }
-}
-
-bool CAsyncShaderTask::CompileAsyncShader(SShaderAsyncInfo* pAsync)
-{
-#if !(defined(MOBILE) || defined(CONSOLE))
-    const bool outputShaderSourceFiles = CRenderer::CV_r_OutputShaderSourceFiles != 0;
-#else
-    const bool outputShaderSourceFiles = false;
-#endif
-    string shaderSourceOutputFolder;
-
-    if ( outputShaderSourceFiles )
-    {
-        CryFixedStringT<1024> hlslPath;
-
-        // Create a directory for this shader type, strip the .fxcb extension from the folder name
-        shaderSourceOutputFolder.Format("@usercache@/%s",pAsync->m_pShader->m_pDevCache->m_Name.c_str());
-        PathUtil::RemoveExtension(shaderSourceOutputFolder);
-        gEnv->pFileIO->CreatePath(shaderSourceOutputFolder);
-
-        // Output both HLSL here, and GLSL/Metal below since those require the remote shader compiler to execute first
-        hlslPath.Format("%s/[0x%08x].hlsl",shaderSourceOutputFolder.c_str(),pAsync->m_nHashInst);
-        {
-            AZ::IO::HandleType hlslHandle;
-
-            if ( gEnv->pFileIO->Open(hlslPath.c_str(),AZ::IO::OpenMode::ModeWrite,hlslHandle) )
-            {
-                gEnv->pFileIO->Write(hlslHandle, pAsync->m_Text.c_str(), pAsync->m_Text.size());
-                gEnv->pFileIO->Flush(hlslHandle);
-                gEnv->pFileIO->Close(hlslHandle);
-            }
-        }
-    }
-
-    bool bResult = true;
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersremotecompiler)
-    {
-        AZStd::string lsCompilerFlags = NRemoteCompiler::CShaderSrv::Instance().GetShaderCompilerFlags(pAsync->m_eClass, pAsync->m_pipelineState, pAsync->m_MDVMask);
-
-        std::vector<uint8> Data;
-        if (NRemoteCompiler::ESOK != NRemoteCompiler::CShaderSrv::Instance().Compile(Data, pAsync->m_Profile, pAsync->m_Text.c_str(), pAsync->m_Name.c_str(), lsCompilerFlags.c_str(), pAsync->m_RequestLine.c_str()))
-        {
-#if !defined(NULL_RENDERER)
-            D3D10CreateBlob(sizeof("D3DXCompileShader failed"), (LPD3D10BLOB*)&pAsync->m_pErrors);
-            DWORD* pBuf = (DWORD*) pAsync->m_pErrors->GetBufferPointer();
-                           memcpy(pBuf, "D3DXCompileShader failed", sizeof("D3DXCompileShader failed"));
-#endif
-            string sErrorText;
-
-            if (!Data.empty())
-            {
-                sErrorText.reserve(Data.size());
-                for (uint32 i = 0; i < Data.size(); i++)
-                {
-                    sErrorText += Data[i];
-                }
-            }
-            else
-            {
-                sErrorText.assign("Unknown Error");
-            }
-
-            pAsync->m_Errors += sErrorText;
-
-            return false;
-        }
-
-        HRESULT hr = S_OK;
-        D3D10CreateBlob(Data.size(), (LPD3D10BLOB*) & pAsync->m_pDevShader);
-        LPD3D10BLOB pShader = (LPD3D10BLOB)*&pAsync->m_pDevShader;
-        DWORD* pBuf = (DWORD*)pShader->GetBufferPointer();
-        memcpy(pBuf, &Data[0], Data.size());
-
-        pAsync->m_pDevShader = (LPD3D10BLOB)pShader;
-        pBuf = (DWORD*)pShader->GetBufferPointer();
-        size_t nSize = pShader->GetBufferSize();
-
-        if ( outputShaderSourceFiles )
-        {
-#if defined(OPENGL)
-            CryFixedStringT<1024> glslPath;
-            glslPath.Format("%s/[0x%08x].glsl",shaderSourceOutputFolder.c_str(),pAsync->m_nHashInst);
-            {
-                AZ::IO::HandleType glslHandle;
-                if ( gEnv->pFileIO->Open(glslPath.c_str(),AZ::IO::OpenMode::ModeWrite,glslHandle) )
-                {
-                    gEnv->pFileIO->Write(glslHandle,static_cast<const void*>(pBuf),nSize);
-                    gEnv->pFileIO->Flush(glslHandle);
-                    gEnv->pFileIO->Close(glslHandle);
-                }
-            }
-#endif
-
-#if defined(CRY_USE_METAL)
-            CryFixedStringT<1024> metallibPath;
-            metallibPath.Format("%s/[0x%08x].metallib",shaderSourceOutputFolder.c_str(),pAsync->m_nHashInst);
-            {
-                AZ::IO::HandleType metalHandle;
-                if ( gEnv->pFileIO->Open(metallibPath.c_str(),AZ::IO::OpenMode::ModeWrite,metalHandle) )
-                {
-                    gEnv->pFileIO->Write(metalHandle,static_cast<const void*>(pBuf),nSize);
-                    gEnv->pFileIO->Flush(metalHandle);
-                    gEnv->pFileIO->Close(metalHandle);
-                }
-            }
-#endif
-        }
-
-        bool bReflect = true;
-
-#if !defined(CONSOLE)
-        if (CParserBin::PlatformIsConsole())
-        {
-            bReflect = false;
-        }
-#endif
-#if !defined(OPENGL)
-        if (CParserBin::m_nPlatform & (SF_GL4 | SF_GLES3))
-        {
-            bReflect = false;
-        }
-#endif
-#if defined(CRY_USE_METAL)
-        if (!(CParserBin::m_nPlatform & (SF_METAL)))
-        {
-            bReflect = false;
-        }
-#endif
-
-        if (bReflect)
-        {
-            ID3D11ShaderReflection* pShaderReflection;
-            hr = D3DReflect(pBuf, nSize, IID_ID3D11ShaderReflection, (void**)&pShaderReflection);
-            if (SUCCEEDED(hr))
-            {
-                pAsync->m_pConstants = (void*)pShaderReflection;
-            }
-        }
-
-        if (SUCCEEDED(hr))
-        {
-            bResult = PostCompile(pAsync);
-        }
-        else
-        {
-            pAsync->m_pDevShader    =   0;
-            assert(0);
-        }
-    }
-#if defined(WIN32) && !defined(OPENGL)
-    else
-    {
-        static bool s_logOnce_WrongPlatform = false;
-#       if !defined(_RELEASE)
-        if (!s_logOnce_WrongPlatform && !(CParserBin::m_nPlatform == SF_D3D11))
-        {
-            s_logOnce_WrongPlatform = true;
-            iLog->LogError("Trying to build non DX11 shader via internal compiler which is not supported. Please use remote compiler instead!");
-        }
-#       endif
-        uint32 nFlags = D3D10_SHADER_PACK_MATRIX_ROW_MAJOR | D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY;
-        if (CRenderer::CV_r_shadersdebug == 3) // Generate debug information and do not optimize shader for ease of debugging
-        {
-            nFlags |= D3D10_SHADER_DEBUG | D3D10_SHADER_SKIP_OPTIMIZATION;
-        }
-        else if(CRenderer::CV_r_shadersdebug == 4) // Generate debug information, but still optimize shader
-        {
-            nFlags |= D3D10_SHADER_DEBUG;
-        }
-
-        const char* Name = pAsync->m_pShader ? pAsync->m_pShader->GetName() : "Unknown";
-        HRESULT hr = S_OK;
-        hr = D3DCompile(pAsync->m_Text.c_str(), pAsync->m_Text.size(), Name, NULL, NULL, pAsync->m_Name.c_str(), pAsync->m_Profile.c_str(), nFlags, 0, (ID3DBlob * *) & pAsync->m_pDevShader, (ID3DBlob**) &pAsync->m_pErrors);
-        if (FAILED(hr) || !pAsync->m_pDevShader)
-        {
-            if (pAsync->m_pErrors)
-            {
-                const char* err = (const char*)pAsync->m_pErrors->GetBufferPointer();
-                pAsync->m_Errors += err;
-            }
-            else
-            {
-                pAsync->m_Errors += "D3DXCompileShader failed";
-            }
-            bResult = false;
-        }
-        else
-        {
-            ID3D11ShaderReflection* pShaderReflection;
-            UINT* pData = (UINT*)pAsync->m_pDevShader->GetBufferPointer();
-            size_t nSize = pAsync->m_pDevShader->GetBufferSize();
-            hr = D3DReflect(pData, nSize, IID_ID3D11ShaderReflection, (void**)&pShaderReflection);
-            if (SUCCEEDED(hr))
-            {
-                pAsync->m_pConstants = (void*)pShaderReflection;
-                bResult = PostCompile(pAsync);
-            }
-            else
-            {
-                iLog->LogWarning("ERROR: Shader Reflection Failed!");
-                assert(0);
-            }
-        }
-    }
-#endif // #if defined(WIN32) || defined(WIN64)
-    return bResult;
-}
-
-void CAsyncShaderTask::CShaderThread::Run()
-{
-    CryThreadSetName(-1, SHADER_THREAD_NAME);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DHWSHADERCOMPILING_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(D3DHWShaderCompiling_cpp)
-#endif
-
-    while (!m_quit)
-    {
-        m_task->FlushPendingShaders();
-        if (!CRenderer::CV_r_shadersasynccompiling)
-        {
-            Sleep(250);
-        }
-        else
-        {
-            Sleep(25);
-        }
-    }
-}
-
-#endif
-
-//===============================================================================================
-// Export/Import
-
-#ifdef SHADERS_SERIALIZING
-
-bool STexSamplerFX::Export(SShaderSerializeContext& SC)
-{
-    bool bRes = true;
-
-    SSTexSamplerFX TS;
-    TS.m_nRTIdx = -1;
-    TS.m_nsName = SC.AddString(m_szName.c_str());
-
-    TS.m_nsNameTexture = SC.AddString(m_szTexture.c_str());
-
-    TS.m_eTexType = m_eTexType;
-    TS.m_nSamplerSlot = m_nSlotId;
-    TS.m_nTexFlags = m_nTexFlags;
-    if (m_nTexState > 0)
-    {
-        TS.m_bTexState = 1;
-        memcpy(&TS.ST, &CTexture::s_TexStates[m_nTexState], sizeof(TS.ST));
-        TS.ST.m_pDeviceState = NULL;
-    }
-
-    if (m_pTarget)
-    {
-        TS.m_nRTIdx = SC.FXTexRTs.Num();
-
-        SHRenderTarget* pRT = m_pTarget;
-        SSHRenderTarget RT;
-        RT.m_eOrder = pRT->m_eOrder;
-        RT.m_nProcessFlags = pRT->m_nProcessFlags;
-
-        RT.m_nsTargetName = SC.AddString(pRT->m_TargetName.c_str());
-
-        RT.m_nWidth = pRT->m_nWidth;
-        RT.m_nHeight = pRT->m_nHeight;
-        RT.m_eTF = pRT->m_eTF;
-        RT.m_nIDInPool = pRT->m_nIDInPool;
-        RT.m_eUpdateType = pRT->m_eUpdateType;
-        RT.m_bTempDepth = pRT->m_bTempDepth;
-        RT.m_ClearColor = pRT->m_ClearColor;
-        RT.m_fClearDepth = pRT->m_fClearDepth;
-        RT.m_nFlags = pRT->m_nFlags;
-        RT.m_nFilterFlags = pRT->m_nFilterFlags;
-        SC.FXTexRTs.push_back(RT);
-    }
-
-    //crude workaround for TArray push_back() bug a=b operator. Does not init a, breaks texState dtor for a
-    SSTexSamplerFX* pNewSampler = SC.FXTexSamplers.AddIndex(1);
-    memcpy(pNewSampler, &TS, sizeof(SSTexSamplerFX));
-
-    return bRes;
-}
-bool STexSamplerFX::Import(SShaderSerializeContext& SC, SSTexSamplerFX* pTS)
-{
-    bool bRes = true;
-
-    m_szName = sString(pTS->m_nsName, SC.Strings);
-    m_szTexture = sString(pTS->m_nsNameTexture, SC.Strings);
-
-    m_eTexType = pTS->m_eTexType;
-    m_nSlotId = pTS->m_nSamplerSlot;
-    m_nTexFlags = pTS->m_nTexFlags;
-    if (pTS->m_bTexState)
-    {
-        m_nTexState = CTexture::GetTexState(pTS->ST);
-    }
-
-    if (pTS->m_nRTIdx != -1)
-    {
-        SSHRenderTarget* pRT = &SC.FXTexRTs[pTS->m_nRTIdx];
-
-        SHRenderTarget* pDst = new SHRenderTarget;
-
-        pDst->m_eOrder = pRT->m_eOrder;
-        pDst->m_nProcessFlags = pRT->m_nProcessFlags;
-        pDst->m_TargetName = sString(pRT->m_nsTargetName, SC.Strings);
-        pDst->m_nWidth = pRT->m_nWidth;
-        pDst->m_nHeight = pRT->m_nHeight;
-        pDst->m_eTF = pRT->m_eTF;
-        pDst->m_nIDInPool = pRT->m_nIDInPool;
-        pDst->m_eUpdateType = pRT->m_eUpdateType;
-        pDst->m_bTempDepth = pRT->m_bTempDepth != 0;
-        pDst->m_ClearColor = pRT->m_ClearColor;
-        pDst->m_fClearDepth = pRT->m_fClearDepth;
-        pDst->m_nFlags = pRT->m_nFlags;
-        pDst->m_nFilterFlags = pRT->m_nFilterFlags;
-        m_pTarget = pDst;
-    }
-
-    PostLoad();
-
-    return bRes;
-}
-
-bool SFXParam::Export(SShaderSerializeContext& SC)
-{
-    bool bRes = true;
-
-    SSFXParam PR;
-    PR.m_nsName = SC.AddString(m_Name.c_str());
-    PR.m_nsAnnotations = SC.AddString(m_Annotations.c_str());
-    PR.m_nsSemantic = SC.AddString(m_Semantic.c_str());
-    PR.m_nsValues = SC.AddString(m_Values.c_str());
-
-    PR.m_eType = m_eType;
-    PR.m_nCB = m_BindingSlot;
-    PR.m_nComps = m_ComponentCount;
-    PR.m_nFlags = m_nFlags;
-    PR.m_nParameters = m_RegisterCount;
-    for ( int i=0; i<eHWSC_Num; ++i )
-    {
-        PR.m_nRegister[i] = m_Register[i];
-    }
-
-    SC.FXParams.push_back(PR);
-
-    return bRes;
-}
-bool SFXParam::Import(SShaderSerializeContext& SC, SSFXParam* pPR)
-{
-    bool bRes = true;
-
-    m_Name = sString(pPR->m_nsName, SC.Strings);
-    m_Annotations = sString(pPR->m_nsAnnotations, SC.Strings);
-    m_Semantic = sString(pPR->m_nsSemantic, SC.Strings);
-    m_Values = sString(pPR->m_nsValues, SC.Strings);
-
-    m_eType = pPR->m_eType;
-    m_BindingSlot = pPR->m_nCB;
-    m_ComponentCount = pPR->m_nComps;
-    m_nFlags = pPR->m_nFlags;
-    m_RegisterCount = pPR->m_nParameters;
-    for ( int i=0; i<eHWSC_Num; ++i )
-    {
-        m_Register[i] = pPR->m_nRegister[i];
-    }
-
-    return bRes;
-}
-
-bool SFXSampler::Export(SShaderSerializeContext& SC)
-{
-    bool bRes = true;
-
-    SSFXSampler PR;
-    PR.m_nsName = SC.AddString(m_Name.c_str());
-    PR.m_nsAnnotations = SC.AddString(m_Annotations.c_str());
-    PR.m_nsSemantic = SC.AddString(m_Semantic.c_str());
-    PR.m_nsValues = SC.AddString(m_Values.c_str());
-
-    PR.m_eType = m_eType;
-    PR.m_nArray = m_nArray;
-    PR.m_nFlags = m_nFlags;
-    for ( int i=0; i<eHWSC_Num; ++i )
-    {
-        PR.m_nRegister[i] = m_Register[i];
-    }
-
-    SC.FXSamplers.push_back(PR);
-
-    return bRes;
-}
-bool SFXSampler::Import(SShaderSerializeContext& SC, SSFXSampler* pPR)
-{
-    bool bRes = true;
-
-    m_Name = sString(pPR->m_nsName, SC.Strings);
-    m_Annotations = sString(pPR->m_nsAnnotations, SC.Strings);
-    m_Semantic = sString(pPR->m_nsSemantic, SC.Strings);
-    m_Values = sString(pPR->m_nsValues, SC.Strings);
-
-    m_eType = pPR->m_eType;
-    m_nArray = pPR->m_nArray;
-    m_nFlags = pPR->m_nFlags;
-    for ( int i=0; i<eHWSC_Num; ++i )
-    {
-        m_Register[i] = pPR->m_nRegister[i];
-    }
-
-    return bRes;
-}
-
-bool SFXTexture::Export(SShaderSerializeContext& SC)
-{
-    bool bRes = true;
-
-    SSFXTexture PR;
-    PR.m_nsName = SC.AddString(m_Name.c_str());
-    PR.m_nsAnnotations = SC.AddString(m_Annotations.c_str());
-    PR.m_nsSemantic = SC.AddString(m_Semantic.c_str());
-    PR.m_nsValues = SC.AddString(m_Values.c_str());
-
-    PR.m_nsNameTexture = SC.AddString(m_szTexture.c_str());
-    PR.m_bSRGBLookup = m_bSRGBLookup;
-    PR.m_eType = m_eType;
-    PR.m_nArray = m_nArray;
-    PR.m_nFlags = m_nFlags;
-    for ( int i=0; i<eHWSC_Num; ++i )
-    {
-        PR.m_nRegister[i] = m_Register[i];
-    }
-
-    SC.FXTextures.push_back(PR);
-
-    return bRes;
-}
-bool SFXTexture::Import(SShaderSerializeContext& SC, SSFXTexture* pPR)
-{
-    bool bRes = true;
-
-    m_Name = sString(pPR->m_nsName, SC.Strings);
-    m_Annotations = sString(pPR->m_nsAnnotations, SC.Strings);
-    m_Semantic = sString(pPR->m_nsSemantic, SC.Strings);
-    m_Values = sString(pPR->m_nsValues, SC.Strings);
-
-    m_szTexture = sString(pPR->m_nsNameTexture, SC.Strings);
-    m_bSRGBLookup = pPR->m_bSRGBLookup;
-    m_eType = pPR->m_eType;
-    m_nArray = pPR->m_nArray;
-    m_nFlags = pPR->m_nFlags;
-    for ( int i=0; i<eHWSC_Num; ++i )
-    {
-        m_Register[i] = pPR->m_nRegister[i];
-    }
-
-    return bRes;
-}
-
-bool CHWShader_D3D::ExportSamplers([[maybe_unused]] SCHWShader& SHW, [[maybe_unused]] SShaderSerializeContext& SC)
-{
-    bool bRes = true;
-    return bRes;
-}
-bool CHWShader::ImportSamplers([[maybe_unused]] SShaderSerializeContext& SC, [[maybe_unused]] SCHWShader* pSHW, [[maybe_unused]] byte*& pData, [[maybe_unused]] std::vector<STexSamplerRT>& Samplers)
-{
-    bool bRes = true;
-    return bRes;
-}
-
-bool CHWShader_D3D::ExportParams(SCHWShader& SHW, [[maybe_unused]] SShaderSerializeContext& SC)
-{
-    bool bRes = true;
-    SHW.m_nParams = 0;
-    return bRes;
-}
-bool CHWShader::ImportParams([[maybe_unused]] SShaderSerializeContext& SC, [[maybe_unused]] SCHWShader* pSHW, [[maybe_unused]] byte*& pData, [[maybe_unused]] std::vector<SFXParam>& Params)
-{
-    bool bRes = true;
-    return bRes;
-}
-
-bool CHWShader_D3D::Export(SShaderSerializeContext& SC)
-{
-    bool bRes = true;
-
-    SCHWShader SHW;
-
-    char str[256];
-    azstrcpy(str, AZ_ARRAY_SIZE(str), GetName());
-    char* c = strchr(str, '(');
-    if (c)
-    {
-        c[0] = 0;
-    }
-
-    SHW.m_nsName = SC.AddString(str);
-    SHW.m_nsNameSourceFX = SC.AddString(m_NameSourceFX.c_str());
-    SHW.m_nsEntryFunc = SC.AddString(m_EntryFunc.c_str());
-
-    SHW.m_eSHClass = m_eSHClass;
-    SHW.m_dwShaderType = m_dwShaderType;
-    SHW.m_nMaskGenFX = m_nMaskGenFX;
-    SHW.m_nMaskGenShader = m_nMaskGenShader;
-    SHW.m_nMaskOr_RT = m_nMaskOr_RT;
-    SHW.m_nMaskAnd_RT = m_nMaskAnd_RT;
-    SHW.m_Flags = m_Flags;
-
-    FXShaderToken* pMap = NULL;
-    TArray<uint32>* pData = &m_TokenData;
-    bool bDeleteTokenData = false;
-
-    SHW.m_nTokens = 0;
-    SHW.m_nTableEntries = 0;
-
-    SCHWShader SHWTemp = SHW;
-
-    SHW.Export(SC.Data);
-
-    bRes &= ExportSamplers(SHW, SC);
-    bRes &= ExportParams(SHW, SC);
-
-    if (bRes)
-    {
-        if (memcmp(&SHW, &SHWTemp, sizeof(SCHWShader)))
-        {
-            CryFatalError("Export failed");
-        }
-    }
-
-    if (bDeleteTokenData)
-    {
-        SAFE_DELETE(pData);
-        SAFE_DELETE(pMap);
-    }
-
-    return bRes;
-}
-
-CHWShader* CHWShader::Import(SShaderSerializeContext& SC, int nOffs, uint32 CRC32, CShader* pSH)
-{
-    if (nOffs < 0)
-    {
-        return NULL;
-    }
-
-    CHWShader* pHWSH = NULL;
-    SCHWShader shaderHW;
-    shaderHW.Import(&SC.Data[nOffs]);
-    SCHWShader* pSHW = &shaderHW;
-
-    const char* szName = sString(pSHW->m_nsName, SC.Strings);
-    const char* szNameSource = sString(pSHW->m_nsNameSourceFX, SC.Strings);
-    const char* szNameEntry = sString(pSHW->m_nsEntryFunc, SC.Strings);
-
-    TArray<uint32> SHData;
-    SHData.resize(pSHW->m_nTokens);
-
-    FXShaderToken Table, * pTable = NULL;
-    Table.reserve(pSHW->m_nTableEntries);
-
-    nOffs = 0;
-
-    //Copy string pool, TODO separate string pool for tokens!
-    //TArray<char> tokenStringPool = SC.Strings;
-
-    // Token data is no longer in export data - See CHWShader_D3D::Export where bOutputTokens == false and disables this path
-    if (0)    //CRenderer::CV_r_shadersAllowCompilation)
-    {
-        byte* pData = &SC.Data[nOffs + sizeof(SCHWShader)];
-
-        memcpy(&SHData[0], pData, pSHW->m_nTokens * sizeof(uint32));
-        pData += pSHW->m_nTokens * sizeof(uint32);
-
-        pTable = &Table;
-        for (uint32 i = 0; i < pSHW->m_nTableEntries; i++)
-        {
-            // string pool method
-            DWORD nToken = *(DWORD*)&pData[nOffs];
-            nOffs += sizeof(DWORD);
-            uint32 nTokenStrIdx = *(DWORD*)&pData[nOffs];
-            nOffs += sizeof(uint32);
-
-            if (CParserBin::m_bEndians)
-            {
-                SwapEndian(nToken, eBigEndian);
-                SwapEndian(nTokenStrIdx, eBigEndian);
-            }
-
-            STokenD TD;
-            TD.SToken = sString(nTokenStrIdx, SC.Strings);
-
-            TD.Token = nToken;
-
-            Table.push_back(TD);
-        }
-        pData += nOffs;
-
-        std::vector<STexSamplerRT> Samplers;
-        ImportSamplers(SC, pSHW, pData, Samplers);
-
-        std::vector<SFXParam> Params;
-        ImportParams(SC, pSHW, pData, Params);
-    }
-
-
-    //static CHWShader *mfForName(const char *name, const char *nameSource, uint32 CRC32, const char *szEntryFunc, EHWShaderClass eClass, TArray<uint32>& SHData, FXShaderToken *pTable, uint32 dwType, CShader *pFX, uint64 nMaskGen=0, uint64 nMaskGenFX=0);
-    pHWSH = CHWShader::mfForName(szName,            szNameSource,            CRC32,        szNameEntry,             pSHW->m_eSHClass,     SHData,                  pTable,                pSHW->m_dwShaderType,  pSH, pSHW->m_nMaskGenShader, pSHW->m_nMaskGenFX);
-
-    pHWSH->m_eSHClass = shaderHW.m_eSHClass;
-    pHWSH->m_dwShaderType = shaderHW.m_dwShaderType;
-    pHWSH->m_nMaskGenFX = shaderHW.m_nMaskGenFX;
-    pHWSH->m_nMaskGenShader = shaderHW.m_nMaskGenShader;
-    pHWSH->m_nMaskOr_RT = shaderHW.m_nMaskOr_RT;
-    pHWSH->m_nMaskAnd_RT = shaderHW.m_nMaskAnd_RT;
-    pHWSH->m_Flags = shaderHW.m_Flags;
-
-    return pHWSH;
-}
-
-#else
-bool CHWShader_D3D::Export(SShaderSerializeContext& SC)
-{
-    return false;
-}
-#endif
-
-const char* CHWShader_D3D::mfGetActivatedCombinations([[maybe_unused]] bool bForLevel)
-{
-    TArray <char> Combinations;
-    char* pPtr = NULL;
-    uint32 i;
-
-    for (i = 0; i < m_Insts.size(); i++)
-    {
-        SHWSInstance* pInst = m_Insts[i];
-        char name[256];
-        azstrcpy(name, AZ_ARRAY_SIZE(name), GetName());
-        char* s = strchr(name, '(');
-        if (s)
-        {
-            s[0] = 0;
-        }
-        string str;
-        SShaderCombIdent Ident(m_nMaskGenFX, pInst->m_Ident);
-        gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, name, 0, &str, false);
-        assert (str.size());
-        if (str.size())
-        {
-            assert(str[0] == '<' && str[2] == '>');
-            string s1;
-            if (str[0] == '<' && str[2] == '>')
-            {
-                s1.Format("<%d>%s", pInst->m_nUsed, &str[3]);
-            }
-            else
-            {
-                s1 = str;
-            }
-            Combinations.Copy(s1.c_str(), s1.size());
-            Combinations.Copy("\n", 1);
-        }
-    }
-
-    if (!Combinations.Num())
-    {
-        return NULL;
-    }
-    pPtr = new char [Combinations.Num() + 1];
-    memcpy(pPtr, &Combinations[0], Combinations.Num());
-    pPtr[Combinations.Num()] = 0;
-    return pPtr;
-}
-
-const char* CHWShader::GetCurrentShaderCombinations(bool bForLevel)
-{
-    TArray <char> Combinations;
-    char* pPtr = NULL;
-    CCryNameTSCRC Name;
-    SResourceContainer* pRL;
-
-    Name = CHWShader::mfGetClassName(eHWSC_Vertex);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    int nVS = 0;
-    int nPS = 0;
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* vs = (CHWShader*)itor->second;
-            if (!vs)
-            {
-                continue;
-            }
-            const char* szCombs = vs->mfGetActivatedCombinations(bForLevel);
-            if (!szCombs)
-            {
-                continue;
-            }
-            Combinations.Copy(szCombs, strlen(szCombs));
-            delete [] szCombs;
-            nVS++;
-        }
-    }
-
-    Name = CHWShader::mfGetClassName(eHWSC_Pixel);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* ps = (CHWShader*)itor->second;
-            if (!ps)
-            {
-                continue;
-            }
-            const char* szCombs = ps->mfGetActivatedCombinations(bForLevel);
-            if (!szCombs)
-            {
-                continue;
-            }
-            Combinations.Copy(szCombs, strlen(szCombs));
-            delete [] szCombs;
-            nPS++;
-        }
-    }
-
-    if (!Combinations.Num())
-    {
-        return NULL;
-    }
-    pPtr = new char [Combinations.Num() + 1];
-    memcpy(pPtr, &Combinations[0], Combinations.Num());
-    pPtr[Combinations.Num()] = 0;
-    return pPtr;
-}
-
-bool CHWShader::PreactivateShaders()
-{
-    bool bRes = true;
-
-    if (CRenderer::CV_r_shaderspreactivate)
-    {
-        gRenDev->m_pRT->RC_PreactivateShaders();
-    }
-
-    return bRes;
-}
-
-void CHWShader::RT_PreactivateShaders()
-{
-    gRenDev->m_cEF.mfPreloadBinaryShaders();
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DMeshBaker.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DMeshBaker.cpp
deleted file mode 100644
index e914b9e9b5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DMeshBaker.cpp
+++ /dev/null
@@ -1,925 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "IIndexedMesh.h"
-#include "IShader.h"
-#include "Common/RenderView.h"
-#include "Common/Textures/TextureManager.h"
-
-class CREBaker
-    : public CRendElementBase
-{
-private:
-    IRenderElement* m_pSrc;
-    std::vector<IIndexedMesh*> m_pDst;
-    CMesh* m_pSrcMesh;
-    int m_nPhase;
-    bool m_bSmoothNormals;
-    const SMeshBakingMaterialParams* m_params;
-    int m_numParams;
-
-public:
-    CREBaker(IRenderElement* pSrc, CMesh* pSrcMesh, std::vector<IIndexedMesh*> pDst, int nPhase, const SMeshBakingMaterialParams* params, int numParams, bool bSmoothNormals) { m_pSrc = pSrc; m_pDst = pDst; m_pSrcMesh = pSrcMesh; m_nPhase = nPhase; m_params = params; m_numParams = numParams; m_bSmoothNormals = bSmoothNormals; }
-    virtual ~CREBaker() { }
-    inline uint16 mfGetFlags(void) { return m_pSrc->mfGetFlags(); }
-    inline void mfSetFlags(uint16 fl) { m_pSrc->mfSetFlags(fl); }
-    inline void mfUpdateFlags(uint16 fl) { m_pSrc->mfUpdateFlags(fl); }
-    inline void mfClearFlags(uint16 fl) { m_pSrc->mfClearFlags(fl); }
-    inline bool mfCheckUpdate(int Flags, uint16 nFrame, bool /* unused */) { return m_pSrc->mfCheckUpdate(Flags, nFrame); }
-    virtual void mfPrepare(bool bCheckOverflow) { m_pSrc->mfPrepare(bCheckOverflow); gcpRendD3D->m_RP.m_CurVFormat = eVF_P3F_T2F_T3F; }
-    virtual CRenderChunk* mfGetMatInfo() { return m_pSrc->mfGetMatInfo(); }
-    virtual TRenderChunkArray* mfGetMatInfoList() { return m_pSrc->mfGetMatInfoList(); }
-    virtual int mfGetMatId() { return m_pSrc->mfGetMatId(); }
-    virtual void mfReset() { m_pSrc->mfReset(); }
-    virtual bool mfIsHWSkinned() { return m_pSrc->mfIsHWSkinned(); }
-    virtual CRendElementBase* mfCopyConstruct(void) { return m_pSrc->mfCopyConstruct(); }
-    virtual void mfCenter(Vec3& centr, CRenderObject* pObj) { m_pSrc->mfCenter(centr, pObj); }
-    virtual void mfGetBBox(Vec3& vMins, Vec3& vMaxs) { m_pSrc->mfGetBBox(vMins, vMaxs); }
-    virtual void mfGetPlane(Plane& pl) { m_pSrc->mfGetPlane(pl); }
-    virtual bool mfCompile(CParserBin& Parser, SParserFrame& Frame) { return m_pSrc->mfCompile(Parser, Frame); }
-    virtual bool mfDraw(CShader* ef, SShaderPass* sfm);
-    virtual void* mfGetPointer(ESrcPointer ePT, int* Stride, EParamType Type, ESrcPointer Dst, int Flags) { return m_pSrc->mfGetPointer(ePT, Stride, Type, Dst, Flags); }
-    virtual bool mfPreDraw(SShaderPass* sl) { return m_pSrc->mfPreDraw(sl); }
-    virtual bool mfUpdate(int Flags, bool bTessellation = false) { bool bRet = m_pSrc->mfUpdate(Flags, bTessellation); gcpRendD3D->m_RP.m_CurVFormat = eVF_P3F_T2F_T3F; return bRet; }
-    virtual void mfPrecache(const SShaderItem& SH) { m_pSrc->mfPrecache(SH); }
-    virtual void mfExport(struct SShaderSerializeContext& SC) { m_pSrc->mfExport(SC); }
-    virtual int Size() { return m_pSrc->Size(); }
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const { m_pSrc->GetMemoryUsage(pSizer); }
-};
-
-bool CREBaker::mfDraw(CShader* ef, SShaderPass* sfm)
-{
-    static CCryNameR triPosName("TRI_POS");
-    static CCryNameR triBiNormName("TRI_BINORM");
-    static CCryNameR triTangName("TRI_TANGENT");
-    static CCryNameR triUVName("TRI_UV");
-    static CCryNameR triColorName("TRI_COLOR");
-    static CCryNameR triZRange("ZOFFSET");
-    Vec4 zRange(10.0f, 0.5f, 0.0f, 0.0f);
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    const bool bReverseDepth = (rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-
-    zRange.z = (float)m_nPhase - 0.5f;
-
-    if (m_pDst.empty())
-    {
-        CryLog("BakeMesh: Failed as pOutput is NULL in CREBaker::mfDraw\n");
-        return false;
-    }
-
-    for (std::vector<IIndexedMesh*>::iterator mit = m_pDst.begin(), mend = m_pDst.end(); mit != mend; ++mit)
-    {
-        IIndexedMesh* pOutput = *mit;
-        if (!pOutput)
-        {
-            continue;
-        }
-        int numOutputTriangles = pOutput->GetIndexCount() / 3;
-        int numPositions = 0;
-        CMesh* pOutputMesh = pOutput->GetMesh();
-        Vec3* pOutPos = pOutputMesh->GetStreamPtrAndElementCount<Vec3>(CMesh::POSITIONS, 0, &numPositions);
-        SMeshTangents* pOutTangents = pOutputMesh->GetStreamPtr<SMeshTangents>(CMesh::TANGENTS, 0);
-        vtx_idx* pOutIndices = pOutputMesh->GetStreamPtr<vtx_idx>(CMesh::INDICES, 0);
-        SMeshTexCoord* pOutTexCoords = pOutputMesh->GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, 0);
-
-        std::vector<Vec3> smoothedNormals;
-        if (m_bSmoothNormals)
-        {
-            smoothedNormals.resize(numPositions);
-            for (int pi = 0; pi < numPositions; pi++)
-            {
-                Vec3 p = pOutPos[pi];
-                Vec3 n(ZERO);
-                for (int i = 0; i < numOutputTriangles; i++)
-                {
-                    vtx_idx idx0 = pOutIndices[3 * i + 0];
-                    vtx_idx idx1 = pOutIndices[3 * i + 1];
-                    vtx_idx idx2 = pOutIndices[3 * i + 2];
-                    if (pOutPos[idx0] == p || pOutPos[idx1] == p || pOutPos[idx2] == p)
-                    {
-                        Vec3 faceN = (pOutPos[idx1] - pOutPos[idx0]).Cross(pOutPos[idx2] - pOutPos[idx0]);
-                        faceN.NormalizeSafe();
-                        n += faceN;
-                    }
-                }
-                if (n.NormalizeSafe() == 0.0f)
-                {
-                    // Make sure we actually get a valid normal even if everything went wrong
-                    n = pOutTangents[pi].GetN().normalize();
-                }
-                smoothedNormals[pi] = n;
-            }
-        }
-
-        // Allocate and fill per-stream vertex buffers
-        TempDynVB<SVF_P3F_T2F_T3F> vb0(gcpRendD3D);
-        TempDynVB<SPipTangents> vb1(gcpRendD3D);
-
-        {
-            vb0.Allocate(numOutputTriangles * 3);
-            SVF_P3F_T2F_T3F* vInputs = vb0.Lock();
-
-            for (int i = numOutputTriangles * 3 - 1; i >= 0; i--)
-            {
-                SVF_P3F_T2F_T3F& v = vInputs[i];
-                vtx_idx idx = pOutIndices[i];
-                v.st0 = pOutTexCoords[idx].GetUV();
-                v.p = pOutPos[idx];
-                if (m_bSmoothNormals)
-                {
-                    v.st1 = smoothedNormals[idx];
-                }
-                else
-                {
-                    v.st1 = pOutTangents[idx].GetN().normalize();
-                }
-            }
-
-            vb0.Unlock();
-            vb0.Bind(VSF_GENERAL);
-        }
-
-        {
-            vb1.Allocate(numOutputTriangles * 3);
-            SPipTangents* pTangentsVB = vb1.Lock();
-
-            for (int i = 0; i < numOutputTriangles * 3; i++)
-            {
-                vtx_idx idx = pOutIndices[i];
-                pOutTangents[idx].ExportTo(pTangentsVB[i]);
-            }
-
-            vb1.Unlock();
-            vb1.Bind(VSF_TANGENTS);
-        }
-
-        int nStencilState =
-            STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-            STENCOP_FAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-            STENCOP_PASS(FSS_STENCOP_REPLACE);
-
-        uint32 State = rd->m_RP.m_CurState | GS_STENCIL;
-
-        if (ef->m_Flags & EF_DECAL)
-        {
-            PROFILE_LABEL("DECAL");
-            State = (State & ~GS_BLEND_MASK);
-            State |= GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-        }
-
-        rd->FX_SetStencilState(nStencilState, 1, 0xFFFFFFFF, 0xFFFFFFFF);
-        rd->FX_SetState(State);
-
-        if (!FAILED(rd->FX_SetVertexDeclaration(VSM_GENERAL | ((1 << VSF_TANGENTS)), eVF_P3F_T2F_T3F)))
-        {
-            CMesh* pInputMesh = m_pSrcMesh;
-            Vec3* pInPos = pInputMesh->GetStreamPtr<Vec3>(CMesh::POSITIONS);
-            vtx_idx* pInIndices = pInputMesh->GetStreamPtr<vtx_idx>(CMesh::INDICES);
-            SMeshTexCoord* pInTexCoords = pInputMesh->GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS);
-            SMeshTangents* pInTangents = pInputMesh->GetStreamPtr<SMeshTangents>(CMesh::TANGENTS);
-            SMeshColor* pInColors = pInputMesh->GetStreamPtr<SMeshColor>(CMesh::COLORS, 0);
-            Matrix44* pTexMtx = NULL;
-            if (rd->m_RP.m_pShaderResources)
-            {
-                SEfResTexture* pTex = rd->m_RP.m_pShaderResources->GetTextureResource(EFTT_DIFFUSE);
-                if (pTex && pTex->IsHasModificators())
-                {
-                    SEfTexModificator* mod = pTex->m_Ext.m_pTexModifier;
-                    pTexMtx = &mod->m_TexMatrix;
-                }
-            }
-
-            float textureBakeLoopTimer = gEnv->pTimer->GetAsyncCurTime();
-            for (int i = 0; i < rd->m_RP.m_RendNumIndices / 3; i++)
-            {
-                Vec4 triPos[3];
-                Vec4 triUV[3];
-                Vec4 triTangents[2][3];
-                Vec4 triColor[3];
-
-                for (int t = 0; t < 3; t++)
-                {
-                    vtx_idx idx = pInIndices[rd->m_RP.m_FirstIndex + i * 3 + t];
-                    triPos[t].x = pInPos[idx].x;
-                    triPos[t].y = pInPos[idx].y;
-                    triPos[t].z = pInPos[idx].z;
-                    pInTexCoords[idx].GetUV(triUV[t]);
-                    if (pTexMtx)
-                    {
-                        Vec4 modTex = (*pTexMtx) * Vec4(triUV[t].x, triUV[t].y, 0.0f, 1.0f);
-                        triUV[t].x = modTex.x;
-                        triUV[t].y = modTex.y;
-                    }
-                    pInTangents[idx].GetTB(triTangents[0][t], triTangents[1][t]);
-                    if (pInColors)
-                    {
-                        pInColors[idx].GetRGBA(triColor[t]), triColor[t] /= 255.0f;
-                    }
-                    else
-                    {
-                        triColor[t] = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-                    }
-                }
-                if (triPos[0] != triPos[1] && triPos[0] != triPos[2] && triPos[1] != triPos[2])
-                {
-                    for (int ss = 0; ss < pOutputMesh->GetSubSetCount(); ss++)
-                    {
-                        const SMeshSubset& pSubSet = pOutput->GetSubSet(ss);
-                        if (pSubSet.nMatID < m_numParams)
-                        {
-                            if (m_params[pSubSet.nMatID].bIgnore)
-                            {
-                                continue;
-                            }
-                            zRange.x = m_params[pSubSet.nMatID].rayLength;
-                            zRange.y = m_params[pSubSet.nMatID].rayIndent;
-                        }
-                        else
-                        {
-                            zRange.x = 10.0f;
-                            zRange.y = 0.5f;
-                        }
-                        zRange = bReverseDepth ? Vec4(-zRange.x, -zRange.y, zRange.z, zRange.w) : zRange;
-
-                        if (i > 0)
-                        {
-                            CHWShader_D3D* pCurVS = (CHWShader_D3D*)sfm->m_VShader;
-                            CHWShader_D3D* pCurPS = (CHWShader_D3D*)sfm->m_PShader;
-
-                            pCurVS->UpdatePerBatchConstantBuffer();
-                            pCurPS->UpdatePerBatchConstantBuffer();
-                        }
-                        rd->m_RP.m_pShader->FXSetVSFloat(triPosName, triPos, 3);
-                        rd->m_RP.m_pShader->FXSetPSFloat(triPosName, triPos, 3);
-                        rd->m_RP.m_pShader->FXSetPSFloat(triUVName, triUV, 3);
-                        rd->m_RP.m_pShader->FXSetPSFloat(triZRange, &zRange, 1);
-                        rd->m_RP.m_pShader->FXSetPSFloat(triBiNormName, triTangents[0], 3);
-                        rd->m_RP.m_pShader->FXSetPSFloat(triTangName, triTangents[1], 3);
-                        rd->m_RP.m_pShader->FXSetPSFloat(triColorName, triColor, 3);
-                        rd->FX_Commit();
-                        rd->FX_DrawPrimitive(eptTriangleList, pSubSet.nFirstIndexId, pSubSet.nNumIndices);
-                    }
-                }
-                if ((i % 8) == 7)
-                {
-                    if (!rd->m_pRT || rd->m_pRT->IsRenderThread())
-                    {
-                        // Send the commands to the GPU to make sure we don't timeout the driver
-                        rd->GetDeviceContext().Flush();
-                        Sleep(1);
-                    }
-                }
-            }
-
-            // Print a message every now and then to show we are still working.
-            if (gEnv->pTimer->GetAsyncCurTime() - textureBakeLoopTimer > 20.0f)
-            {
-                textureBakeLoopTimer = gEnv->pTimer->GetAsyncCurTime();
-                CryLog("LoD texture baker - Loop check\n");
-            }
-        }
-
-        // Release buffers once finished
-        vb0.Release();
-        vb1.Release();
-    }
-
-    return true;
-}
-
-struct CompareRendItemMeshBaker
-{
-    bool operator()(const SRendItem& a, const SRendItem& b) const
-    {
-        CShader* pShaderA, * pShaderB;
-        CShaderResources* pResA, * pResB;
-        int nTech;
-        SRendItem::mfGet(a.SortVal, nTech, pShaderA, pResA);
-        SRendItem::mfGet(b.SortVal, nTech, pShaderB, pResB);
-
-        if (pShaderA && pShaderB)
-        {
-            // sort decals to the end
-            if ((pShaderA->m_Flags & EF_DECAL) != (pShaderB->m_Flags & EF_DECAL))
-            {
-                return (pShaderA->m_Flags & EF_DECAL) < (pShaderB->m_Flags & EF_DECAL);
-            }
-        }
-
-        if (pResA && pResB)
-        {
-            if (pResA->IsTransparent() != pResB->IsTransparent())
-            {
-                return pResA->GetStrengthValue(EFTT_OPACITY) > pResB->GetStrengthValue(EFTT_OPACITY);
-            }
-            if (pResA->IsAlphaTested() != pResB->IsAlphaTested())
-            {
-                return pResA->GetAlphaRef() < pResB->GetAlphaRef();
-            }
-        }
-
-        int nNearA = (a.ObjSort & FOB_NEAREST);
-        int nNearB = (b.ObjSort & FOB_NEAREST);
-        if (nNearA != nNearB)               // Sort by nearest flag
-        {
-            return nNearA > nNearB;
-        }
-
-        if (a.SortVal != b.SortVal)         // Sort by shaders
-        {
-            return a.SortVal < b.SortVal;
-        }
-
-        if (a.pElem != b.pElem)               // Sort by geometry
-        {
-            return a.pElem < b.pElem;
-        }
-
-        return (a.ObjSort & 0xFFFF) < (b.ObjSort & 0xFFFF);   // Sort by distance
-    }
-};
-
-static void PatchShaderItemRecurse(_smart_ptr<IMaterial> pDst, _smart_ptr<IMaterial> pMat)
-{
-    IMaterialManager* pMatMan = gEnv->p3DEngine->GetMaterialManager();
-    if (pMat && pDst && pMat != pMatMan->GetDefaultMaterial())
-    {
-        SShaderItem& siSrc(pMat->GetShaderItem());
-        if (siSrc.m_pShader)
-        {
-            SInputShaderResources isr(siSrc.m_pShaderResources);
-            SShaderItem siDst(gcpRendD3D->EF_LoadShaderItem("Illum.MeshBaker", false, 0, &isr, siSrc.m_pShader->GetGenerationMask()));
-            pDst->AssignShaderItem(siDst);
-            siDst.m_pShaderResources->UpdateConstants(siDst.m_pShader);
-        }
-        for (int i = 0; i < pMat->GetSubMtlCount(); i++)
-        {
-            _smart_ptr<IMaterial> pSubMat = pMat->GetSubMtl(i);
-            PatchShaderItemRecurse(pDst->GetSubMtl(i), pSubMat);
-        }
-    }
-}
-
-static _smart_ptr<IMaterial> PatchMaterial(_smart_ptr<IMaterial> pMat)
-{
-    IMaterialManager* pMatMan = gEnv->p3DEngine->GetMaterialManager();
-    _smart_ptr<IMaterial> pResult = pMatMan->CloneMaterial(pMat);
-
-    PatchShaderItemRecurse(pResult, pMat);
-
-    return pResult;
-}
-
-static void EtchAlphas(std::vector<IIndexedMesh*> outputList, _smart_ptr<IMaterial> pMaterial, const SMeshBakingMaterialParams* params, int numParams)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (outputList.empty())
-    {
-        return;
-    }
-
-    for (std::vector<IIndexedMesh*>::iterator mit = outputList.begin(), mend = outputList.end(); mit != mend; ++mit)
-    {
-        IIndexedMesh* pOutput = *mit;
-        if (!pOutput)
-        {
-            continue;
-        }
-        int numOutputTriangles = pOutput->GetIndexCount() / 3;
-        CMesh* pOutputMesh = pOutput->GetMesh();
-        vtx_idx* pOutIndices = pOutputMesh->GetStreamPtr<vtx_idx>(CMesh::INDICES);
-        SMeshTexCoord* pOutTexCoords = pOutputMesh->GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS);
-
-        {
-            TempDynVB<SVF_P3F_T2F_T3F> vb(gRenDev);
-            vb.Allocate(numOutputTriangles * 3);
-            SVF_P3F_T2F_T3F* vInputs = vb.Lock();
-
-            for (int i = 0; i < numOutputTriangles * 3; i++)
-            {
-                SVF_P3F_T2F_T3F& v = vInputs[i];
-                const vtx_idx idx = pOutIndices[i];
-                const Vec2 uv = pOutTexCoords[idx].GetUV();
-
-                v.p.x = uv.x;
-                v.p.y = uv.y;
-                v.p.z = 0.0f;
-                v.st0.x = v.p.x;
-                v.st0.y = v.p.y;
-            }
-
-            vb.Unlock();
-            vb.Bind(VSF_GENERAL);
-            vb.Release();
-        }
-
-        if (!FAILED(rd->FX_SetVertexDeclaration(VSM_GENERAL, eVF_P3F_T2F_T3F)))
-        {
-            rd->FX_Commit();
-            for (int ss = 0; ss < pOutputMesh->GetSubSetCount(); ss++)
-            {
-                const SMeshSubset& pSubSet = pOutput->GetSubSet(ss);
-                if (pSubSet.nMatID < numParams && (params[pSubSet.nMatID].bAlphaCutout && !params[pSubSet.nMatID].bIgnore))
-                {
-                    rd->FX_DrawPrimitive(eptTriangleList, pSubSet.nFirstIndexId, pSubSet.nNumIndices);
-                }
-            }
-        }
-    }
-}
-
-static bool Dilate(CTexture* pTex, CTexture* pOutput, int nPhase, std::vector<IIndexedMesh*> pInputIndexedMesh, _smart_ptr<IMaterial> pMaterial, const SMeshBakingMaterialParams* params, int numParams, SDepthTexture* pDepthStencil, const SMeshBakingInputParams* pInputParams)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    PROFILE_LABEL_SCOPE("BakeMeshDilate");
-    static CCryNameR missColourName("MISSCOLOUR");
-    static CCryNameR tintColourName("TINTCOLOUR");
-    static CCryNameR pixSizeName("PIXSIZE");
-    static CCryNameTSCRC TechName = "MeshBakerDilate";
-    CShader* pSH = rd->m_cEF.mfForName("MeshBakerDilate", 0);
-    uint32 uvMapWidth = pTex->GetWidth();
-    uint32 uvMapHeight = pTex->GetHeight();
-    Vec4 pixSize = Vec4(1.0f / (float)uvMapWidth, 1.0f / (float)uvMapHeight, 0, 0);
-    const ColorF& inMissColour = pInputParams->dilateMagicColour;
-    Vec4 missColour = Vec4(inMissColour.r, inMissColour.g, inMissColour.b, inMissColour.a);
-    Vec4 whiteColour = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-    uint32 nPasses = 0;
-    if (!pSH)
-    {
-        CryLog("BakeMesh: Dilate shader missing\n");
-        return false;
-    }
-
-    bool bAlphaCutout = false;
-    for (int i = 0; i < numParams; i++)
-    {
-        if (params[i].bAlphaCutout && !params[i].bIgnore)
-        {
-            bAlphaCutout = (nPhase == 0);
-        }
-    }
-
-    CTexture* pTemp = CTexture::CreateRenderTarget("MeshBaker_DilateTemp", uvMapWidth, uvMapHeight, Clr_Unknown, eTT_2D, FT_STATE_CLAMP, pTex->GetTextureDstFormat());
-    int TempX, TempY, TempWidth, TempHeight;
-    CTexture::GetTexState(STexState(FILTER_TRILINEAR, false));
-    rd->GetViewport(&TempX, &TempY, &TempWidth, &TempHeight);
-    rd->RT_SetViewport(0, 0, uvMapWidth, uvMapHeight);
-
-    rd->FX_ResetPipe();
-    rd->D3DSetCull(eCULL_None);
-    pSH->FXSetTechnique(TechName);
-    pSH->FXBegin(&nPasses, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-
-    const uint32 nPassDilateWithThresholdAlpha = 0;
-    const uint32 nPassDilate = 1;
-    const uint32 nPassDilateWithZeroAlpha = 2;
-    const uint32 nPassGammaCorrect = 3;
-    const uint32 nPassNormalCorrect = 4;
-    const uint32 nPassPassthrough = 5;
-
-    if (pInputParams->bDoDilationPass)
-    {
-        // Set miss colour wherever we missed
-        rd->FX_PushRenderTarget(0, pTex, pDepthStencil);
-        int nStencilState = STENC_FUNC(FSS_STENCFUNC_EQUAL) | STENCOP_FAIL(FSS_STENCOP_KEEP) | STENCOP_ZFAIL(FSS_STENCOP_KEEP) | STENCOP_PASS(FSS_STENCOP_KEEP);
-        rd->FX_SetStencilState(nStencilState, 0, 0xFFFFFFFF, 0xFFFFFFFF);
-        rd->FX_SetState(GS_NODEPTHTEST | GS_STENCIL);
-        pSH->FXBeginPass(nPassPassthrough);
-        CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-        pSH->FXSetPSFloat(tintColourName, &missColour, 1);
-        rd->FX_Commit();
-        rd->DrawQuad(0.0f, 0.0f, 1.0f, 1.0f, ColorF(1, 1, 1, 1));
-        pSH->FXEndPass();
-        rd->FX_PopRenderTarget(0);
-
-        uint32 dilatePasses = max(uvMapWidth, uvMapHeight);
-
-        for (int p = 0; p < 2; p++)
-        {
-            if (p == 1 || (bAlphaCutout && nPhase == 0)) // If doing alpha cutout we need to dilate the alpha cutout sections first (so geometry doesn't dilate into alphaed areas)
-            {
-                for (uint32 i = 0; i < dilatePasses; i++) // Dilate as much as possible (make sure even number so result ends up in correct buffer)
-                {
-                    rd->FX_PushRenderTarget(0, pTemp, pDepthStencil);
-                    rd->FX_SetState(GS_NODEPTHTEST);
-                    // Pass through all existing data
-                    pSH->FXBeginPass(nPassPassthrough);
-                    pTex->Apply(0);
-                    rd->FX_Commit();
-                    pSH->FXSetPSFloat(tintColourName, &whiteColour, 1);
-                    rd->DrawQuad(0.0f, 0.0f, 1.0f, 1.0f, ColorF(1, 1, 1, 1));
-                    // Dilate using stencil/magic colour to identify areas to dilate
-                    if (nPhase == 0)
-                    {
-                        pSH->FXBeginPass(p ? nPassDilateWithThresholdAlpha : nPassDilateWithZeroAlpha);
-                    }
-                    else if (nPhase == 1)
-                    {
-                        pSH->FXBeginPass(p ? nPassDilate : nPassDilateWithZeroAlpha);
-                    }
-                    else
-                    {
-                        pSH->FXBeginPass(nPassDilateWithZeroAlpha);
-                    }
-                    pTex->Apply(0);
-                    pSH->FXSetPSFloat(missColourName, &missColour, 1);
-                    pSH->FXSetPSFloat(pixSizeName, &pixSize, 1);
-                    nStencilState = STENC_FUNC(FSS_STENCFUNC_EQUAL) | STENCOP_FAIL(FSS_STENCOP_KEEP) | STENCOP_ZFAIL(FSS_STENCOP_KEEP) | STENCOP_PASS(FSS_STENCOP_INCR);
-                    rd->FX_SetStencilState(nStencilState, 0, 0xFFFFFFFF, 0xFFFFFFFF);
-                    rd->FX_SetState(GS_NODEPTHTEST | GS_STENCIL);
-                    if (p)
-                    {
-                        rd->DrawQuad(0.0f, 0.0f, 1.0f, 1.0f, ColorF(1, 1, 1, 1));
-                    }
-                    else
-                    {
-                        EtchAlphas(pInputIndexedMesh, pMaterial, params, numParams);
-                    }
-                    rd->FX_PopRenderTarget(0);
-                    // ping pong
-                    CTexture* tmp = pTex;
-                    pTex = pTemp;
-                    pTemp = tmp;
-                }
-            }
-        }
-        pSH->FXEndPass();
-    }
-    else if (bAlphaCutout)
-    {
-        // not doing dilate pass but still show alpha
-        Vec4 zeroAlpha(1, 1, 1, 0);
-        rd->FX_PushRenderTarget(0, pTex, pDepthStencil);
-        int nStencilState = STENC_FUNC(FSS_STENCFUNC_EQUAL) | STENCOP_FAIL(FSS_STENCOP_KEEP) | STENCOP_ZFAIL(FSS_STENCOP_KEEP) | STENCOP_PASS(FSS_STENCOP_KEEP);
-        rd->FX_SetStencilState(nStencilState, 0, 0xFFFFFFFF, 0xFFFFFFFF);
-        rd->FX_SetState(GS_NODEPTHTEST | GS_STENCIL | GS_COLMASK_A);
-        pSH->FXBeginPass(nPassPassthrough);
-        CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-        pSH->FXSetPSFloat(tintColourName, &zeroAlpha, 1);
-        rd->FX_Commit();
-        EtchAlphas(pInputIndexedMesh, pMaterial, params, numParams);
-        pSH->FXEndPass();
-        rd->FX_PopRenderTarget(0);
-    }
-    rd->FX_SetState(GS_NODEPTHTEST);
-    if (pOutput) // Fix SRGB/Flipped normals problems
-    {
-        pSH->FXBeginPass((nPhase == 1) ? nPassNormalCorrect : nPassGammaCorrect);
-        rd->FX_PushRenderTarget(0, pOutput, NULL);
-        pTex->Apply(0);
-        rd->FX_Commit();
-        rd->DrawQuad(0.0f, 0.0f, 1.0f, 1.0f, ColorF(1, 1, 1, 1));
-        rd->FX_PopRenderTarget(0);
-        pSH->FXEndPass();
-    }
-    pSH->FXEnd();
-    rd->RT_SetViewport(TempX, TempY, TempWidth, TempHeight);
-    rd->FX_SetState(0);
-    rd->FX_Commit();
-    rd->FX_ResetPipe();
-    pTemp->Release();
-    pSH->Release();
-    return true;
-}
-
-static bool IsRenderableSubObject(IStatObj* obj, int child)
-{
-    return obj->GetSubObject(child)->nType == STATIC_SUB_OBJECT_MESH &&
-           obj->GetSubObject(child)->pStatObj != NULL &&
-           obj->GetSubObject(child)->pStatObj->GetRenderMesh() != NULL;
-}
-
-bool CD3D9Renderer::BakeMesh([[maybe_unused]] const SMeshBakingInputParams* pInputParams, [[maybe_unused]] SMeshBakingOutput* pReturnValues)
-{
-#if defined(WIN64) || defined(WIN32) || defined(APPLE) || defined(LINUX)
-    if (gEnv->IsEditor())
-    {
-        std::vector<IRenderMesh*> pRM;
-        std::vector<_smart_ptr<IMaterial> > pInputMaterial;
-        std::vector<CMesh*> pInputMesh;
-        std::vector<IIndexedMesh*> pOutputMesh;
-        _smart_ptr<IMaterial> pOutputMaterial;
-        int outputWidth = pInputParams->outputTextureWidth;
-        int outputHeight = pInputParams->outputTextureHeight;
-        int cachedShaderCompileCvar = CRenderer::CV_r_shadersasynccompiling;
-
-        if (pInputParams->pInputMesh)
-        {
-            IStatObj* obj = pInputParams->pInputMesh;
-            if (obj->GetRenderMesh() == NULL)
-            {
-                if (obj->GetSubObjectCount() == 0)
-                {
-                    CryLog("BakeMesh: Failed due to input mesh having no rendermesh and no subobjects\n");
-                    return false;
-                }
-                for (int i = 0; i < obj->GetSubObjectCount(); i++)
-                {
-                    if (IsRenderableSubObject(obj, i))
-                    {
-                        IStatObj* pObj = obj->GetSubObject(i)->pStatObj;
-                        pRM.push_back(pObj->GetRenderMesh());
-                        pInputMaterial.push_back(pInputParams->pMaterial ? pInputParams->pMaterial : pObj->GetMaterial());
-                        pInputMesh.push_back(pObj->GetIndexedMesh(true)->GetMesh());
-                    }
-                }
-            }
-            else
-            {
-                pRM.push_back(obj->GetRenderMesh());
-                pInputMaterial.push_back(pInputParams->pMaterial ? pInputParams->pMaterial : obj->GetMaterial());
-                pInputMesh.push_back(obj->GetIndexedMesh(true)->GetMesh());
-            }
-        }
-
-        // HACK TO GET STREAMING SYSTEM TO MAKE SURE USED TEXTURES ARE STREAMED IN
-        gEnv->p3DEngine->ProposeContentPrecache();
-        //      gEnv->p3DEngine->UpdateStreaming(SRenderingPassInfo::CreateGeneralPassRenderingInfo(gEnv->pSystem->GetViewCamera()));
-        for (std::vector<_smart_ptr<IMaterial> >::iterator it = pInputMaterial.begin(), end = pInputMaterial.end(); it != end; ++it)
-        {
-            float start = gEnv->pTimer->GetAsyncCurTime();
-            while (true)
-            {
-                int pRoundIds[MAX_STREAM_PREDICTION_ZONES] = {0};
-                (*it)->PrecacheMaterial(0.0f, NULL, true, false);
-                (*it)->PrecacheMaterial(0.0f, NULL, false, false);
-                CTexture::Update();
-                gEnv->pSystem->GetStreamEngine()->Update();
-                if ((*it)->IsStreamedIn(pRoundIds, NULL))
-                {
-                    break;
-                }
-                if (gEnv->pTimer->GetAsyncCurTime() - start > 5.0f)
-                {
-                    LogWarning("Time out waiting for textures to stream\n");
-                    break;
-                }
-            }
-        }
-
-        if (pRM.empty())
-        {
-            CryLog("BakeMesh: Failed due to no inputs\n");
-            return false;
-        }
-
-        if (pInputParams->pCageMesh)
-        {
-            IStatObj* obj = pInputParams->pCageMesh;
-
-            if (obj->GetRenderMesh() == NULL)
-            {
-                if (obj->GetSubObjectCount() == 0)
-                {
-                    CryLog("BakeMesh: Failed due to cage mesh having no rendermesh and no subobjects\n");
-                    return false;
-                }
-                for (int i = 0; i < obj->GetSubObjectCount(); i++)
-                {
-                    if (IsRenderableSubObject(obj, i))
-                    {
-                        IStatObj* subobj = obj->GetSubObject(i)->pStatObj;
-                        pOutputMesh.push_back(subobj->GetIndexedMesh(true));
-                    }
-                }
-            }
-            else
-            {
-                pOutputMesh.push_back(obj->GetIndexedMesh(true));
-            }
-            pOutputMaterial = obj->GetMaterial();
-        }
-        else
-        {
-            CryLog("BakeMesh: Failed due to no low poly cage\n");
-            return false;
-        }
-
-        CRenderer::CV_r_shadersasynccompiling = 0;
-
-        std::vector<_smart_ptr<IMaterial> > pBakeMaterial;
-        pBakeMaterial.reserve(pInputMaterial.size());
-        for (std::vector<_smart_ptr<IMaterial> >::iterator it = pInputMaterial.begin(), end = pInputMaterial.end(); it != end; ++it)
-        {
-            pBakeMaterial.push_back(PatchMaterial(*it)); // Replace current shader with MeshBake
-        }
-
-        SDepthTexture* pTmpDepthSurface = FX_GetDepthSurface(outputWidth, outputHeight, false);
-        if (!pTmpDepthSurface)
-        {
-            CryLog("BakeMesh: Failed as temporary depth surface could not be created of size %dx%d\n", outputWidth, outputHeight);
-            CRenderer::CV_r_shadersasynccompiling = cachedShaderCompileCvar;
-            return false;
-        }
-        CTexture* pHighPrecisionBuffer[3], * pOutputBuffer[3];
-
-        PROFILE_LABEL_SCOPE("BakeMesh");
-
-        SRenderingPassInfo passInfo  = SRenderingPassInfo::CreateGeneralPassRenderingInfo(gEnv->p3DEngine->GetRenderingCamera());
-
-        if (m_RP.m_pRLD == NULL)
-        {
-            const int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-            m_RP.m_pRLD = &m_RP.m_pRenderViews[m_RP.m_nProcessThreadID]->m_RenderListDesc[recursiveLevel];
-        }
-
-        bool bAlphaCutout = false;
-        for (int i = 0; i < pInputParams->numMaterialParams; i++)
-        {
-            if (pInputParams->pMaterialParams[i].bAlphaCutout && !pInputParams->pMaterialParams[i].bIgnore)
-            {
-                bAlphaCutout = true;
-            }
-        }
-
-        for (int nPhase = 0; nPhase < 3; nPhase++)
-        {
-            const bool bReverseDepth = !!(m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH);
-            ColorF Clr_Phase;
-            switch (nPhase)
-            {
-            case 0:
-                Clr_Phase = pInputParams->defaultBackgroundColour;
-                break;
-            case 1:
-                Clr_Phase = ColorF(0.5f, 0.5f, 1.0f, 1.0f);
-                break;
-            default:
-                Clr_Phase = ColorF(0.0f, 0.0f, 0.0f, 1.0f);
-            }
-
-            char uniqueName[128];
-            const char* suffix[3] = {"Albedo", "Normal", "Refl"};
-            sprintf_s(uniqueName, sizeof(uniqueName), "MeshBaker_16Bit%s_%d%s", suffix[nPhase], pInputParams->nLodId, bAlphaCutout ? "_alpha" : "");
-            pHighPrecisionBuffer[nPhase] = CTexture::CreateRenderTarget(uniqueName, outputWidth, outputHeight, Clr_Unknown, eTT_2D, FT_STATE_CLAMP, eTF_R16G16B16A16F /*, -1, 95*/);
-            sprintf_s(uniqueName, sizeof(uniqueName), "MeshBaker_8Bit%s_%d%s", suffix[nPhase], pInputParams->nLodId, bAlphaCutout ? "_alpha" : "");
-            pOutputBuffer[nPhase] = CTexture::CreateRenderTarget(uniqueName, outputWidth, outputHeight, Clr_Unknown, eTT_2D, FT_STATE_CLAMP, eTF_R8G8B8A8 /*, -1, 95*/);
-
-            PROFILE_LABEL_SCOPE(suffix[nPhase]);
-
-            FX_ResetPipe();
-            FX_ClearTarget(pHighPrecisionBuffer[nPhase], Clr_Phase);
-            FX_ClearTarget(pTmpDepthSurface, CLEAR_ZBUFFER | CLEAR_STENCIL, Clr_FarPlane_R.r, 0);
-            FX_PushRenderTarget(0, pHighPrecisionBuffer[nPhase], pTmpDepthSurface);
-            RT_SetViewport(0, 0, outputWidth, outputHeight);
-
-            int nThreadID = m_pRT->GetThreadList();
-            SRendItem::m_RecurseLevel[nThreadID]++;
-            FX_PreRender(3);
-
-            SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-            rRP.m_pRenderFunc = FX_FlushShader_General;
-            rRP.m_nPassGroupID = EFSLIST_GENERAL;
-            rRP.m_nPassGroupDIP = rRP.m_nPassGroupID;
-            rRP.m_nSortGroupID = 0;
-            FX_StartBatching();
-            rRP.m_nBatchFilter = FB_GENERAL;
-
-            int numChunks = 0;
-            for (int m = 0; m < pRM.size(); m++)
-            {
-                TRenderChunkArray& chunkList = pRM[m]->GetChunks();
-                numChunks += chunkList.size();
-            }
-
-            std::vector<CRenderObject*> pObjs;
-            SRendItem* ri = new SRendItem[numChunks];
-            numChunks = 0;
-            for (int m = 0; m < pRM.size(); m++)
-            {
-                TRenderChunkArray& chunkList = pRM[m]->GetChunks();
-
-                CRenderObject* pObj = aznew CRenderObject();
-                pObj->Init();
-                pObj->m_II.m_Matrix.SetIdentity();
-                pObj->m_II.m_Matrix.SetTranslationMat(GetCamera().GetPosition());
-                pObj->m_ObjFlags = 0;
-                pObj->m_II.m_AmbColor = Col_White;
-                pObj->m_nSort =  0;
-                pObj->m_ObjFlags |= FOB_NO_FOG | ((!pInputMesh[m]) ? FOB_SKINNED : 0);
-                pObj->m_pCurrMaterial = pBakeMaterial[m];
-                pObjs.push_back(pObj);
-                for (int i = 0; i < chunkList.size(); i++)
-                {
-                    CRenderChunk* pChunk = &chunkList[i];
-                    SShaderItem& pSH = pBakeMaterial[m]->GetShaderItem(pChunk->m_nMatID);
-                    CShaderResources* pR = (CShaderResources*)pSH.m_pShaderResources;
-                    CShader* __restrict pShader = (CShader*)pSH.m_pShader;
-                    CREMesh* pRE = pChunk->pRE;
-
-                    if (pShader->m_Flags & EF_DECAL)
-                    {
-                        const bool bHasDiffuse = pR ? pR->TextureSlotExists((uint16)EFTT_DIFFUSE) : false;
-                        const bool bHasNormal = pR ? pR->TextureSlotExists((uint16)EFTT_NORMALS) : false;
-                        const bool bHasGloss = pR ? pR->TextureSlotExists((uint16)EFTT_SMOOTHNESS) : false;
-
-                        // emulate gbuffer blend masking (since we don't MRT, this won't work correctly
-                        // in the normal pipeline)
-
-                        if (!bHasDiffuse && nPhase == 0)
-                        {
-                            continue;
-                        }
-                        if (!bHasNormal && nPhase == 1)
-                        {
-                            continue;
-                        }
-                        if (!bHasGloss && nPhase == 2)
-                        {
-                            continue;
-                        }
-                    }
-
-                    ri[numChunks].pObj = pObj;
-                    ri[numChunks].nOcclQuery = m; // Stash in this in something that doesn't effect sorting
-                    ri[numChunks].ObjSort = (pObj->m_ObjFlags & 0xffff0000) | pObj->m_nSort;
-                    ri[numChunks].nBatchFlags = EF_BatchFlags(pSH, pObj, pRE, passInfo);  // naughty
-                    ri[numChunks].nStencRef = pObj->m_nClipVolumeStencilRef;
-                    uint32 nResID = pR ? pR->m_Id : 0;
-                    ri[numChunks].SortVal = (nResID << 18) | (pShader->mfGetID() << 6) | (pSH.m_nTechnique & 0x3f);
-                    ri[numChunks].pElem = pRE;
-                    numChunks++;
-                }
-            }
-
-            std::sort(ri, ri + numChunks, CompareRendItemMeshBaker());
-
-            for (int i = 0; i < numChunks; i++)
-            {
-                CShader* pShader;
-                CShaderResources* pRes;
-                int nTech;
-                SRendItem::mfGet(ri[i].SortVal, nTech, pShader, pRes);
-                if (pShader)
-                {
-                    int m = ri[i].nOcclQuery;
-                    ri[i].nOcclQuery = SRendItem::kOcclQueryInvalid;
-                    CREBaker wrappedRE(ri[i].pElem, pInputMesh[m], pOutputMesh, nPhase, pInputParams->pMaterialParams, pInputParams->numMaterialParams, pInputParams->bSmoothNormals);
-                    ri[i].pElem = &wrappedRE;
-                    FX_ObjectChange(pShader, pRes, ri[i].pObj, &wrappedRE);
-                    FX_Start(pShader, nTech, pRes, &wrappedRE);
-                    wrappedRE.mfPrepare(true);
-                    rRP.m_RIs[0].AddElem(&ri[i]);
-                    FX_FlushShader_General();
-                }
-            }
-
-            for (int i = 0; i < pObjs.size(); i++)
-            {
-                delete pObjs[i];
-            }
-            delete[] ri;
-
-            FX_PostRender();
-
-            SRendItem::m_RecurseLevel[nThreadID]--;
-
-            FX_PopRenderTarget(0);
-
-            Dilate(pHighPrecisionBuffer[nPhase], pOutputBuffer[nPhase], nPhase, pOutputMesh, pOutputMaterial, pInputParams->pMaterialParams, pInputParams->numMaterialParams, pTmpDepthSurface, pInputParams);
-        }
-
-        for (int i = 0; i < 3; i++)
-        {
-            if (i == 2 && !pInputParams->bSaveSpecular)
-            {
-                SAFE_RELEASE(pOutputBuffer[i]);
-                pReturnValues->ppOuputTexture[i] = NULL;
-
-                SAFE_RELEASE(pHighPrecisionBuffer[i]);
-                pReturnValues->ppIntermediateTexture[i] = NULL;
-                continue;
-            }
-
-            pOutputBuffer[i]->GetDevTexture()->DownloadToStagingResource(0);
-            pReturnValues->ppOuputTexture[i] = pOutputBuffer[i];
-            pReturnValues->ppIntermediateTexture[i] = pHighPrecisionBuffer[i];
-        }
-
-        CRenderer::CV_r_shadersasynccompiling = cachedShaderCompileCvar;
-
-        return true;
-    }
-    else
-#endif
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "BakeMesh: Only exists within editor\n");
-        return false;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DOcclQuery.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DOcclQuery.cpp
deleted file mode 100644
index db661e94a9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DOcclQuery.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Occlusion queries unified interface implementation
-
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-
-void COcclusionQuery::Create()
-{
-    Release();
-
-    // Create visibility queries
-
-    D3DQuery* pVizQuery = NULL;
-    D3D11_QUERY_DESC desc;
-    desc.Query = D3D11_QUERY_OCCLUSION;
-    desc.MiscFlags = 0;
-
-#if !defined(NDEBUG)
-    HRESULT hr =
-#endif
-        gcpRendD3D->GetDevice().CreateQuery(&desc, &pVizQuery);
-    assert(SUCCEEDED(hr));
-
-    m_nOcclusionID = (UINT_PTR) pVizQuery;
-    
-    // Prime query
-    BeginQuery();
-    EndQuery();
-}
-
-void COcclusionQuery::Release()
-{
-    D3DQuery* pVizQuery = (D3DQuery*)m_nOcclusionID;
-    SAFE_RELEASE(pVizQuery);
-
-    m_nOcclusionID = 0;
-    m_nDrawFrame = 0;
-    m_nCheckFrame = 0;
-    m_nVisSamples = ~0;
-}
-
-void COcclusionQuery::BeginQuery()
-{
-    if (!m_nOcclusionID)
-    {
-        return;
-    }
-
-    D3DQuery* pVizQuery = (D3DQuery*)m_nOcclusionID;
-    gcpRendD3D->GetDeviceContext().Begin(pVizQuery);
-}
-
-void COcclusionQuery::EndQuery()
-{
-    if (!m_nOcclusionID)
-    {
-        return;
-    }
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    m_nDrawFrame = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-    D3DQuery*  pVizQuery = (D3DQuery*)m_nOcclusionID;
-    rd->GetDeviceContext().End(pVizQuery);
-}
-
-bool COcclusionQuery::IsReady()
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    int nFrame = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-    return (m_nCheckFrame == nFrame);
-}
-
-uint32 COcclusionQuery::GetVisibleSamples(bool bAsynchronous)
-{
-    if (!m_nOcclusionID)
-    {
-        return ~0;
-    }
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    int nFrame = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-    if (m_nCheckFrame == nFrame)
-    {
-        return m_nVisSamples;
-    }
-
-    int64 nVisSamples = ~0; //query needs to be 8byte
-
-    if (!bAsynchronous)
-    {
-        PROFILE_FRAME(COcclusionQuery::GetVisibleSamples);
-
-        HRESULT hRes = S_FALSE;
-
-        D3DQuery* pVizQuery = (D3DQuery*)m_nOcclusionID;
-
-        size_t DataSize =   pVizQuery->GetDataSize();
-        assert(sizeof(nVisSamples) == DataSize);
-        while (hRes == S_FALSE)
-        {
-            hRes = rd->GetDeviceContext().GetData(pVizQuery, (void*) &nVisSamples, DataSize, 0);
-        }
-
-        if (hRes == S_OK)
-        {
-            m_nCheckFrame = nFrame;
-            m_nVisSamples = static_cast<int>(nVisSamples);
-        }
-    }
-    else
-    {
-        PROFILE_FRAME(COcclusionQuery::GetVisibleSamplesAsync);
-
-        HRESULT hRes = S_OK;
-
-        D3DQuery*  pVizQuery = (D3DQuery*)m_nOcclusionID;
-        hRes = rd->GetDeviceContext().GetData(pVizQuery, (void*) &nVisSamples, pVizQuery->GetDataSize(), 0);
-
-        if (hRes == S_OK)
-        {
-            m_nCheckFrame = nFrame;
-            m_nVisSamples = static_cast<int>(nVisSamples);
-        }
-    }
-    return m_nVisSamples;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DPostProcess.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DPostProcess.cpp
deleted file mode 100644
index 20f0af5a74..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DPostProcess.cpp
+++ /dev/null
@@ -1,1700 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Direct3D specific post processing special effects
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include <Common/RenderCapabilities.h>
-#include <Common/Textures/TextureManager.h>
-
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DPOSTPROCESS_CPP_SECTION_1 1
-#define D3DPOSTPROCESS_CPP_SECTION_2 2
-#endif
-
-enum COLORSPACES
-{
-    CS_sRGB0 = 0,    //Most accurate sRGB curve
-    CS_sRGB1 = 1,   //Cheap approximation - pow(col, 1/2.2)
-    CS_sRGB2 = 2,   //cheaper approx - sqrt(col)
-    CS_P3D65 = 3,
-    CS_Rec709 = 4,
-    CS_Rec2020 = 5
-};
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SDepthTexture* SD3DPostEffectsUtils::GetDepthSurface(CTexture* pTex)
-{
-    if (pTex->GetFlags() & FT_USAGE_MSAA && gRenDev->m_RP.m_MSAAData.Type)
-    {
-        return &gcpRendD3D->m_DepthBufferOrigMSAA;
-    }
-
-    return &gcpRendD3D->m_DepthBufferOrig;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::ResolveRT(CTexture*& pDst, const RECT* pSrcRect)
-{
-    AZ_Assert(pDst, "Null texture passed in");
-    if (!pDst)
-    {
-        return;
-    }
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    CDeviceTexture* pDstResource = pDst->GetDevTexture();
-    ID3D11RenderTargetView* pOrigRT = gcpRendD3D->m_pNewTarget[0]->m_pTarget;
-    if (pOrigRT && pDstResource)
-    {
-        D3D11_BOX box;
-        ZeroStruct(box);
-        if (pSrcRect)
-        {
-            box.left = pSrcRect->left;
-            box.right = pSrcRect->right;
-            box.top = pSrcRect->top;
-            box.bottom = pSrcRect->bottom;
-        }
-        else
-        {
-            box.right = min(pDst->GetWidth(), gcpRendD3D->m_pNewTarget[0]->m_Width);
-            box.bottom = min(pDst->GetHeight(), gcpRendD3D->m_pNewTarget[0]->m_Height);
-        }
-        box.back = 1;
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DPOSTPROCESS_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DPostProcess_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-    #else
-        ID3D11Resource* pSrcResource;
-        pOrigRT->GetResource(&pSrcResource);
-    #endif
-
-        gcpRendD3D->m_RP.m_PS[gcpRendD3D->m_RP.m_nProcessThreadID].m_RTCopied++;
-        gcpRendD3D->m_RP.m_PS[gcpRendD3D->m_RP.m_nProcessThreadID].m_RTCopiedSize += pDst->GetDeviceDataSize();
-
-        gcpRendD3D->GetDeviceContext().CopySubresourceRegion(pDstResource->Get2DTexture(), 0, 0, 0, 0, pSrcResource, 0, &box);
-        SAFE_RELEASE(pSrcResource);
-    }
-}
-
-void SD3DPostEffectsUtils::SetSRGBShaderFlags()
-{
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SRGB0] | g_HWSR_MaskBit[HWSR_SRGB1] | g_HWSR_MaskBit[HWSR_SRGB2]);
-    switch(CRenderer::CV_r_ColorSpace)
-    {
-        case COLORSPACES::CS_sRGB0:
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SRGB0];
-            break;
-        }
-        case COLORSPACES::CS_sRGB1:
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SRGB1];
-            break;
-        }
-        case COLORSPACES::CS_sRGB2:
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SRGB2];
-            break;
-        }
-        case COLORSPACES::CS_P3D65:
-        {
-            //todo: Needs support
-        }
-        case COLORSPACES::CS_Rec709:
-        {
-            //todo: Add support for Rec709 related shader flags to allow control over color space conversion from c++ code
-        }
-        case COLORSPACES::CS_Rec2020:
-        {
-            //todo: Add support for Rec2020 related shader flags to allow control over color space conversion from c++ code
-        }
-        default:
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Color space not supported");
-        }
-    }
-}
-
-void SD3DPostEffectsUtils::CopyTextureToScreen(CTexture*& pSrc, const RECT* pSrcRegion, const int filterMode, bool sRGBLookup)
-{
-    CRenderer* rd = gRenDev;
-    uint64 saveFlagsShader_RT = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE3];
-    if (sRGBLookup && !pSrc->IsSRGB() && !RenderCapabilities::SupportsTextureViews())
-    {
-        //Force SRGB conversion in the shader because the platform doesn't support texture views
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE3];
-        SetSRGBShaderFlags();
-    }
-    static CCryNameTSCRC pRestoreTechName("TextureToTexture");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, pRestoreTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    gRenDev->FX_SetState(GS_NODEPTHTEST);
-    PostProcessUtils().SetTexture(pSrc, 0, filterMode >= 0 ? filterMode : FILTER_POINT, 1, sRGBLookup);
-    PostProcessUtils().DrawFullScreenTri(pSrc->GetWidth(), pSrc->GetHeight(), 0, pSrcRegion);
-    PostProcessUtils().ShEndPass();
-    rd->m_RP.m_FlagsShader_RT = saveFlagsShader_RT;
-}
-
-void SD3DPostEffectsUtils::CopyScreenToTexture(CTexture*& pDst, const RECT* pSrcRegion)
-{
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    CTexture* source = gcpRendD3D->FX_GetCurrentRenderTarget(0);
-    if (source)
-    {
-        if (source->GetDstFormat() == pDst->GetDstFormat())
-        {
-            ResolveRT(pDst, pSrcRegion);
-        }
-        else
-        {
-            StretchRect(source, pDst, false, false, false, false, SPostEffectsUtils::eDepthDownsample_None, false, pSrcRegion);
-        }
-    }
-    else
-    {
-        CDeviceTexture* dstResource = pDst->GetDevTexture();
-        ID3D11RenderTargetView* sourceRT = gcpRendD3D->FX_GetCurrentRenderTargetSurface(0);
-        if (sourceRT)
-        {
-            D3D11_RENDER_TARGET_VIEW_DESC backbufferDesc;
-            sourceRT->GetDesc(&backbufferDesc);
-            const D3DFormat dstFmt = CTexture::DeviceFormatFromTexFormat(pDst->GetDstFormat());
-            const D3DFormat srcFmt = backbufferDesc.Format;
-
-            if (dstFmt == srcFmt)
-            {
-                ID3D11Resource* srcResource;
-                sourceRT->GetResource(&srcResource);
-
-                ID3D11Texture2D* srcTex2D = static_cast<ID3D11Texture2D*>(srcResource);
-                D3D11_TEXTURE2D_DESC srcTex2desc;
-                srcTex2D->GetDesc(&srcTex2desc);
-
-                if (pSrcRegion)
-                {
-                    D3D11_BOX box = { 0 };
-                    box.left = pSrcRegion->left;
-                    box.right = pSrcRegion->right;
-                    box.top = pSrcRegion->top;
-                    box.bottom = pSrcRegion->bottom;
-                    box.front = 0;
-                    box.back = 1;
-                    gcpRendD3D->GetDeviceContext().CopySubresourceRegion(dstResource->Get2DTexture(), 0, 0, 0, 0, srcResource, 0, &box);
-                }
-                else
-                {
-                    gcpRendD3D->GetDeviceContext().CopySubresourceRegion(dstResource->Get2DTexture(), 0, 0, 0, 0, srcResource, 0, NULL);
-                }
-            }
-            else
-            {
-                AZ_Assert(false, "Pixel formats differ");
-            }
-        }
-        else
-        {
-            AZ_Assert(false, "No source texture present");
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::StretchRect(CTexture* pSrc, CTexture*& pDst, bool bClearAlpha, bool bDecodeSrcRGBK, bool bEncodeDstRGBK, bool bBigDownsample, EDepthDownsample depthDownsample, bool bBindMultisampled, const RECT* srcRegion)
-{
-    if (!pSrc || !pDst)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("STRETCHRECT");
-    PROFILE_SHADER_SCOPE;
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] |
-                                        g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5] | g_HWSR_MaskBit[HWSR_REVERSE_DEPTH]);
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-    bool bResample = 0;
-
-    if (pSrc->GetWidth() != pDst->GetWidth() || pSrc->GetHeight() != pDst->GetHeight())
-    {
-        bResample = 1;
-    }
-
-    const D3DFormat dstFmt = CTexture::DeviceFormatFromTexFormat(pDst->GetDstFormat());
-    const D3DFormat srcFmt = CTexture::DeviceFormatFromTexFormat(pSrc->GetDstFormat());
-
-    bool destinationBaseTextureExists = pDst->GetDevTexture() && pDst->GetDevTexture()->GetBaseTexture();
-    AZ_Error("Rendering", destinationBaseTextureExists, "'%s' used as destination texture in call to SD3DPostProcessUtils::StretchRect, but it does not have a valid device texture.", pDst->GetName());
-    bool sourceBaseTextureExists = pSrc->GetDevTexture() && pSrc->GetDevTexture()->GetBaseTexture();
-    AZ_Error("Rendering", sourceBaseTextureExists, "'%s' used as source texture in call to SD3DPostProcessUtils::StretchRect, but it does not have a valid device texture.", pSrc->GetName());
-
-    if (bResample == false && gRenDev->m_RP.m_FlagsShader_RT == 0 && dstFmt == srcFmt)
-    {
-        if (sourceBaseTextureExists && destinationBaseTextureExists)
-        {
-            gcpRendD3D->GetDeviceContext().CopyResource(pDst->GetDevTexture()->GetBaseTexture(), pSrc->GetDevTexture()->GetBaseTexture());
-            gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-        }
-        return;
-    }
-
-    gcpRendD3D->FX_PushRenderTarget(0, pDst, NULL);
-
-    gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-    gcpRendD3D->FX_SetDepthDontCareActions(0, true, true);
-    gcpRendD3D->FX_SetStencilDontCareActions(0, true, true);
-
-    gcpRendD3D->FX_SetActiveRenderTargets();
-    gcpRendD3D->RT_SetViewport(0, 0, pDst->GetWidth(), pDst->GetHeight());
-
-    bool bEnableRTSample0 = bBindMultisampled;
-
-    if (bEnableRTSample0)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (bClearAlpha)         // clear alpha to 0
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-    if (bDecodeSrcRGBK)  // decode RGBK src texture
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-    if (depthDownsample != eDepthDownsample_None)  // take minimum/maximum depth from the 4 samples
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-        if (depthDownsample == eDepthDownsample_Min)
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_REVERSE_DEPTH];
-        }
-    }
-    if (bEncodeDstRGBK)  // encode RGBK dst texture
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-
-    static CCryNameTSCRC pTechTexToTex("TextureToTexture");
-    static CCryNameTSCRC pTechTexToTexResampled("TextureToTextureResampled");
-    ShBeginPass(CShaderMan::s_shPostEffects, bResample ? pTechTexToTexResampled : pTechTexToTex, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-    // Get sample size ratio (based on empirical "best look" approach)
-
-    // Set samples position
-    //float s1 = fSampleSize / (float) pSrc->GetWidth();  // 2.0 better results on lower res images resizing
-    //float t1 = fSampleSize / (float) pSrc->GetHeight();
-
-    CTexture* pOffsetTex = bBigDownsample ? pDst : pSrc;
-
-    float s1 = 0.5f / (float) pOffsetTex->GetWidth(); // 2.0 better results on lower res images resizing
-    float t1 = 0.5f / (float) pOffsetTex->GetHeight();
-
-    Vec4 pParams0, pParams1;
-
-    if (bBigDownsample)
-    {
-        // Use rotated grid + middle sample (~quincunx)
-        pParams0 = Vec4(s1 * 0.96f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);
-        pParams1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);
-    }
-    else
-    {
-        // Use box filtering (faster - can skip bilinear filtering, only 4 taps)
-        pParams0 = Vec4(-s1, -t1, s1, -t1);
-        pParams1 = Vec4(s1, t1, -s1, t1);
-    }
-
-    static CCryNameR pParam0Name("texToTexParams0");
-    static CCryNameR pParam1Name("texToTexParams1");
-
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, &pParams0, 1);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams1, 1);
-
-    int nFilter = bResample ? FILTER_LINEAR : FILTER_POINT;
-    pSrc->Apply(0, CTexture::GetTexState(STexState(nFilter, true)), EFTT_UNKNOWN, -1,
-        (bBindMultisampled && gRenDev->m_RP.m_MSAAData.Type) ? SResourceView::DefaultViewMS : SResourceView::DefaultView);  // bind as msaa target (if valid)
-
-    DrawFullScreenTri(pDst->GetWidth(), pDst->GetHeight(), 0, srcRegion);
-
-    ShEndPass();
-
-    // Restore previous viewport
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-void SD3DPostEffectsUtils::SwapRedBlue([[maybe_unused]] CTexture* pSrc, [[maybe_unused]] CTexture* pDst)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DPOSTPROCESS_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DPostProcess_cpp)
-#endif
-}
-
-void SD3DPostEffectsUtils::DownsampleDepth(CTexture* pSrc, CTexture* pDst, bool bFromSingleChannel)
-{
-    PROFILE_LABEL_SCOPE("DOWNSAMPLE_DEPTH");
-    PROFILE_SHADER_SCOPE;
-
-    if (!pDst)
-    {
-        return;
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    uint64 nSaveFlagsShader_RT = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    // Get current viewport
-    int prevVPX, prevVPY, prevVPWidth, prevVPHeight;
-    rd->GetViewport(&prevVPX, &prevVPY, &prevVPWidth, &prevVPHeight);
-
-    bool bUseDeviceDepth = (pSrc == NULL);
-
-    rd->FX_PushRenderTarget(0, pDst, NULL);
-
-    // Metal Load/Store Actions
-    rd->FX_SetColorDontCareActions(0, true, false);
-    rd->FX_SetDepthDontCareActions(0, true, true);
-    rd->FX_SetStencilDontCareActions(0, true, true);
-
-    int dstWidth  = pDst->GetWidth();
-    int dstHeight = pDst->GetHeight();
-    rd->RT_SetViewport(0, 0, dstWidth, dstHeight);
-
-    if (bUseDeviceDepth)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (bFromSingleChannel)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-
-    static CCryNameTSCRC pTech("DownsampleDepth");
-    ShBeginPass(CShaderMan::s_shPostEffects, pTech, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-
-    int srcWidth  = bUseDeviceDepth ? rd->GetWidth()  : pSrc->GetWidth();
-    int srcHeight = bUseDeviceDepth ? rd->GetHeight() : pSrc->GetHeight();
-
-    if (bUseDeviceDepth)
-    {
-        rd->m_DevMan.BindSRV(eHWSC_Pixel, &rd->m_pZBufferDepthReadOnlySRV, 0, 1);
-    }
-    else
-    {
-        SetTexture(pSrc, 0, FILTER_POINT, 1);
-    }
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    const Vec2& vDownscaleFactor = gcpRendD3D->m_RP.m_CurDownscaleFactor;
-    gRenDev->RT_SetScissor(true, 0, 0, pDst->GetWidth() * vDownscaleFactor.x + 0.5f, pDst->GetHeight() * vDownscaleFactor.y + 0.5f);
-#endif
-
-    if (GetShaderLanguage() == eSL_GLES3_0)
-    {
-        // There's a bug in Qualcomm OpenGL ES 3.0 drivers that cause the device
-        // shader compiler to crash if we use "textureSize" in the shader to get the texture dimensions.
-        Vec4 texSize = Vec4(srcWidth, srcHeight, 0, 0);
-        static CCryNameR texSizeParam("DownsampleDepth_DepthTex_Dimensions");
-        CShaderMan::s_shPostEffects->FXSetPSFloat(texSizeParam, &texSize, 1);
-    }
-
-    RECT source = { 0, 0, pDst->GetWidth(), pDst->GetHeight() };
-    //Round up to even to handle uneven dimensions
-    dstWidth = (dstWidth + 1) & ~1;
-    dstHeight = (dstHeight + 1) & ~1;
-    DrawFullScreenTri(dstWidth, dstHeight, 0.f, &source);
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-    gRenDev->RT_SetScissor(false, 0, 0, 0, 0);
-#endif
-
-    ShEndPass();
-
-    if (bUseDeviceDepth)
-    {
-        D3DShaderResourceView* pNullSRV[1] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Pixel, pNullSRV, 0, 1);
-
-        rd->FX_Commit();
-    }
-
-    // Restore previous viewport
-    rd->FX_PopRenderTarget(0);
-    rd->RT_SetViewport(prevVPX, prevVPY, prevVPWidth, prevVPHeight);
-
-    rd->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-void SD3DPostEffectsUtils::DownsampleDepthUsingCompute(CTexture* pSrc, CTexture** pDstArr, bool bFromSingleChannel)
-{
-    PROFILE_LABEL_SCOPE("DOWNSAMPLE_DEPTHCS");
-    PROFILE_SHADER_SCOPE;
-
-    if (!pDstArr || !pDstArr[0])
-    {
-        return;
-    }
-
-    CTexture* pDst = pDstArr[0];
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    uint64 saveFlagsShader_RT = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    bool useDeviceDepth = (pSrc == NULL);
-
-    rd->RT_SetViewport(0, 0, pDst->GetWidth(), pDst->GetHeight());
-
-    if (useDeviceDepth)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (bFromSingleChannel)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-
-    static CCryNameTSCRC pTech("DownsampleDepthCS");
-    ShBeginPass(CShaderMan::s_shPostEffects, pTech, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    rd->FX_SetState(GS_NODEPTHTEST);
-
-    int srcWidth  = useDeviceDepth ? rd->GetWidth()  : pSrc->GetWidth();
-    int srcHeight = useDeviceDepth ? rd->GetHeight() : pSrc->GetHeight();
-
-    if (useDeviceDepth)
-    {
-        rd->m_DevMan.BindSRV(eHWSC_Compute, &rd->m_pZBufferDepthReadOnlySRV, 0, 1);
-    }
-    else
-    {
-        D3DShaderResourceView* pShaderResrouce[1] = {
-            (pSrc->GetShaderResourceView()),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pShaderResrouce, 0, 1);
-    }
-
-    static CCryNameR paramSrcSize("SrcTexSizeAndCount");
-    Vec4 vParamSrcSize(srcWidth, srcHeight, 2, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramSrcSize, &vParamSrcSize, 1);
-    rd->FX_Commit();
-
-    D3DUnorderedAccessView* UAVs[2] = {
-        (pDstArr[0]->GetDeviceUAV()),
-        (pDstArr[1]->GetDeviceUAV()),
-    };
-    rd->GetDeviceContext().CSSetUnorderedAccessViews(0, 2, UAVs, NULL);
-
-    uint32 dispatchSizeX = srcWidth / 8 + (srcWidth % 8 > 0 ? 1 : 0);
-    uint32 dispatchSizeY = srcHeight / 8 + (srcHeight % 8 > 0 ? 1 : 0);
-    rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-    ShEndPass();
-    rd->m_RP.m_FlagsShader_RT = saveFlagsShader_RT;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void SD3DPostEffectsUtils::DownsampleUsingCompute(CTexture* pSrc, CTexture** pDstArr)
-{
-    AZ_Assert(pSrc && pDstArr[0], "Null textures passed in");
-
-    const int maxIterations = 3;
-
-    int numIters = 1;
-    D3DUnorderedAccessView* pUAV[maxIterations];
-    pUAV[0] = (pDstArr[0]->GetDeviceUAV());
-
-    for (int i = 1; i < maxIterations; i++)
-    {
-        if (pDstArr[i])
-        {
-            numIters++;
-            pUAV[i] = (pDstArr[i]->GetDeviceUAV());
-        }
-        else
-        {
-            // Need to bind a UAV or Metal will complain... even if not written to.
-            pUAV[i] = pUAV[0];
-            break;
-        }
-    }
-
-    PROFILE_LABEL_SCOPE("DOWNSAMPLE_SCENE_CS");
-    PROFILE_SHADER_SCOPE;
-
-    CTexture* pSrcRT = pSrc;
-
-    static CCryNameTSCRC pTech("TextureToTextureCS");
-    ShBeginPass(CShaderMan::s_shPostEffects, pTech, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    int srcWidth  = pSrcRT->GetWidth();
-    int srcHeight = pSrcRT->GetHeight();
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    D3DShaderResourceView* pSRV = (pSrcRT->GetShaderResourceView());
-    rd->m_DevMan.BindSRV(eHWSC_Compute, &pSRV, 0, 1);
-
-    static CCryNameR param("gNumIterations");
-    Vec4 vParam(numIters, 0, 0, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(param, &vParam, 1);
-    rd->FX_Commit();
-
-    rd->GetDeviceContext().CSSetUnorderedAccessViews(0, 3, pUAV, NULL);
-
-    // Grid dims must match in shader
-    const uint32 kernelGridX = 8;
-    const uint32 kernelGridY = 8;
-
-    uint32 dispatchSizeX = srcWidth / kernelGridX + (srcWidth % kernelGridX > 0 ? 1 : 0);
-    uint32 dispatchSizeY = srcHeight / kernelGridY + (srcHeight % kernelGridY > 0 ? 1 : 0);
-    rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-    ShEndPass();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::Downsample(CTexture* pSrc, CTexture* pDst, int nSrcW, int nSrcH, int nDstW, int nDstH, EFilterType eFilter, bool bSetTarget)
-{
-    if (!pSrc)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("DOWNSAMPLE");
-    PROFILE_SHADER_SCOPE;
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    if (bSetTarget)
-    {
-        gcpRendD3D->FX_PushRenderTarget(0, pDst, NULL);
-    }
-    gcpRendD3D->RT_SetViewport(0, 0, nDstW, nDstH);
-
-    // Currently only exact multiples supported
-    Vec2 vSamples(float(nSrcW) / nDstW, float(nSrcH) / nDstH);
-    const Vec2 vSampleSize(1.f / nSrcW, 1.f / nSrcH);
-    const Vec2 vPixelSize(1.f / nDstW, 1.f / nDstH);
-    // Adjust UV space if source rect smaller than texture
-    const float fClippedRatioX = float(nSrcW) / pSrc->GetWidth();
-    const float fClippedRatioY = float(nSrcH) / pSrc->GetHeight();
-
-    // Base kernel size in pixels
-    float fBaseKernelSize = 1.f;
-    // How many lines of border samples to skip
-    float fBorderSamplesToSkip = 0.f;
-
-    switch (eFilter)
-    {
-    default:
-    case FilterType_Box:
-        fBaseKernelSize = 1.f;
-        fBorderSamplesToSkip = 0.f;
-        break;
-    case FilterType_Tent:
-        fBaseKernelSize = 2.f;
-        fBorderSamplesToSkip = 0.f;
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-        break;
-    case FilterType_Gauss:
-        // The base kernel for Gaussian filter is 3x3 pixels [-1.5 .. 1.5]
-        // Samples on the borders are ignored due to small contribution
-        // so the actual kernel size is N*3 - 2 where N is number of samples per pixel
-        fBaseKernelSize = 3.f;
-        fBorderSamplesToSkip = 1.f;
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-        break;
-    case FilterType_Lanczos:
-        fBaseKernelSize = 3.f;
-        fBorderSamplesToSkip = 0.f;
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-        break;
-    }
-
-    // Kernel position step
-    const Vec2 vSampleStep(1.f / vSamples.x, 1.f / vSamples.y);
-    // The actual kernel radius in pixels
-    const Vec2 vKernelRadius = 0.5f * Vec2(fBaseKernelSize, fBaseKernelSize) - fBorderSamplesToSkip * vSampleStep;
-
-    // UV offset from pixel center to first (top-left) sample
-    const Vec2 vFirstSampleOffset(0.5f * vSampleSize.x - vKernelRadius.x * vPixelSize.x,
-        0.5f * vSampleSize.y - vKernelRadius.y * vPixelSize.y);
-    // Kernel position of first (top-left) sample
-    const Vec2 vFirstSamplePos = -vKernelRadius + 0.5f * vSampleStep;
-
-    static CCryNameTSCRC pTechName("TextureToTextureResampleFilter");
-    ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-    const Vec4 pParams0(vKernelRadius.x, vKernelRadius.y, fClippedRatioX, fClippedRatioY);
-    const Vec4 pParams1(vSampleSize.x, vSampleSize.y, vFirstSampleOffset.x, vFirstSampleOffset.y);
-    const Vec4 pParams2(vSampleStep.x, vSampleStep.y, vFirstSamplePos.x, vFirstSamplePos.y);
-
-    static CCryNameR pParam0Name("texToTexParams0");
-    static CCryNameR pParam1Name("texToTexParams1");
-    static CCryNameR pParam2Name("texToTexParams2");
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, &pParams0, 1);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams1, 1);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParam2Name, &pParams2, 1);
-
-    SetTexture(pSrc, 0, FILTER_NONE);
-
-    DrawFullScreenTri(nDstW, nDstH);
-
-    ShEndPass();
-
-    // Restore previous viewport
-    if (bSetTarget)
-    {
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::DownsampleStable(CTexture* pSrcRT, CTexture* pDstRT, bool bKillFireflies)
-{
-    PROFILE_LABEL_SCOPE("DOWNSAMPLE_STABLE");
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    gcpRendD3D->FX_PushRenderTarget(0, pDstRT, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, pDstRT->GetWidth(), pDstRT->GetHeight());
-
-    gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-    gcpRendD3D->FX_SetDepthDontCareActions(0, true, true);
-    gcpRendD3D->FX_SetStencilDontCareActions(0, true, true);
-
-    if (bKillFireflies)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    static CCryNameTSCRC techName("DownsampleStable");
-    ShBeginPass(CShaderMan::s_shPostEffects, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-    pSrcRT->Apply(0, CTexture::GetTexState(STexState(FILTER_LINEAR, true)));
-
-    DrawFullScreenTri(pDstRT->GetWidth(), pDstRT->GetHeight());
-
-    ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::TexBlurIterative(CTexture* pTex, int nIterationsMul, bool bDilate, CTexture* pBlurTmp)
-{
-    if (!pTex)
-    {
-        return;
-    }
-
-    SDynTexture* tpBlurTemp = 0;
-
-    if (!pBlurTmp)
-    {
-        tpBlurTemp = new SDynTexture(pTex->GetWidth(), pTex->GetHeight(), pTex->GetDstFormat(), eTT_2D, FT_STATE_CLAMP | FT_USAGE_RENDERTARGET, "TempBlurRT");
-        if (tpBlurTemp)
-        {
-            tpBlurTemp->Update(pTex->GetWidth(), pTex->GetHeight());
-        }
-
-        if (!tpBlurTemp || !tpBlurTemp->m_pTexture)
-        {
-            SAFE_DELETE(tpBlurTemp);
-            return;
-        }
-    }
-
-    PROFILE_LABEL_SCOPE("TEXBLUR_16TAPS");
-    PROFILE_SHADER_SCOPE;
-
-    CTexture* pTempRT = pBlurTmp ? pBlurTmp : tpBlurTemp->m_pTexture;
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    // Iterative blur (aka Kawase): 4 taps, 16 taps, 64 taps, 256 taps, etc
-    uint64 nFlagsShaderRT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1]);
-
-    //// Dilate - use 2 passes, horizontal+vertical
-    //if( bDilate )
-    //{
-    //  gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    //  nIterationsMul = 1;
-    //}
-
-    for (int i = 1; i <= nIterationsMul; ++i)
-    {
-        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // 1st iteration (4 taps)
-
-        gcpRendD3D->FX_PushRenderTarget(0, pTempRT, NULL);
-        gcpRendD3D->FX_SetActiveRenderTargets(false);// Avoiding invalid d3d error (due to deferred rt setup, when ping-pong'ing between RTs we can bump into RTs still bound when binding it as a SRV)
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        // only regular gaussian blur supporting masking
-        static CCryNameTSCRC pTechName("Blur4Taps");
-
-        uint32 nPasses;
-        CShaderMan::s_shPostEffects->FXSetTechnique(pTechName);
-        CShaderMan::s_shPostEffects->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-        // setup texture offsets, for texture sampling
-        // Get sample size ratio (based on empirical "best look" approach)
-        float fSampleSize = 1.0f * ((float) i);//((float)pTex->GetWidth()/(float)pTex->GetWidth()) * 0.5f;
-
-        // Set samples position
-        float s1 = fSampleSize / (float) pTex->GetWidth();  // 2.0 better results on lower res images resizing
-        float t1 = fSampleSize / (float) pTex->GetHeight();
-
-        // Use rotated grid
-        Vec4 pParams0 = Vec4(s1 * 0.96f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);//Vec4(-s1, -t1, s1, -t1);
-        Vec4 pParams1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);//Vec4(s1, t1, -s1, t1);
-
-        static CCryNameR pParam0Name("texToTexParams0");
-        static CCryNameR pParam1Name("texToTexParams1");
-
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, &pParams0, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams1, 1);
-
-        CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-        SetTexture(pTex, 0, FILTER_LINEAR);
-
-        DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXEndPass();
-        CShaderMan::s_shPostEffects->FXEnd();
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // 2nd iteration (4 x 4 taps)
-        if (bDilate)
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-        }
-
-        gcpRendD3D->FX_PushRenderTarget(0, pTex, NULL);
-        gcpRendD3D->FX_SetActiveRenderTargets(false);// Avoiding invalid d3d error (due to deferred rt setup, when ping-pong'ing between RTs we can bump into RTs still bound when binding it as a SRV)
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXSetTechnique(pTechName);
-        CShaderMan::s_shPostEffects->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        gRenDev->FX_SetState(GS_NODEPTHTEST);
-        // increase kernel size for second iteration
-        fSampleSize = 2.0 * ((float) i);
-        // Set samples position
-        s1 = fSampleSize / (float) pTex->GetWidth();  // 2.0 better results on lower res images resizing
-        t1 = fSampleSize / (float) pTex->GetHeight();
-
-        // Use rotated grid
-        pParams0 = Vec4(s1 * 0.96f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);//Vec4(-s1, -t1, s1, -t1);
-        pParams1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);//Vec4(s1, t1, -s1, t1);
-
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, &pParams0, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams1, 1);
-
-        CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-        SetTexture(pTempRT, 0, FILTER_LINEAR);
-
-        DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXEndPass();
-        CShaderMan::s_shPostEffects->FXEnd();
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-
-    gRenDev->m_RP.m_FlagsShader_RT = nFlagsShaderRT;
-
-    // Restore previous viewport
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    SAFE_DELETE(tpBlurTemp);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::TexBlurDirectional(CTexture* pTex, const Vec2& vDir, int nIterationsMul, CTexture* pBlurTmp)
-{
-    if (!pTex)
-    {
-        return;
-    }
-
-    SDynTexture* tpBlurTemp = 0;
-    if (!pBlurTmp)
-    {
-        tpBlurTemp = new SDynTexture(pTex->GetWidth(), pTex->GetHeight(), pTex->GetDstFormat(), eTT_2D, FT_STATE_CLAMP | FT_USAGE_RENDERTARGET, "TempBlurRT");
-        if (tpBlurTemp)
-        {
-            tpBlurTemp->Update(pTex->GetWidth(), pTex->GetHeight());
-        }
-
-        if (!tpBlurTemp || !tpBlurTemp->m_pTexture)
-        {
-            SAFE_DELETE(tpBlurTemp);
-            return;
-        }
-    }
-
-    PROFILE_LABEL_SCOPE("TEXBLUR_DIRECTIONAL");
-    PROFILE_SHADER_SCOPE;
-
-    CTexture* pTempRT = pBlurTmp;
-    if (!pBlurTmp)
-    {
-        pTempRT = tpBlurTemp->m_pTexture;
-    }
-
-    static CCryNameTSCRC pTechName("BlurDirectional");
-    static CCryNameR pParam0Name("texToTexParams0");
-    static CCryNameR pParam1Name("texToTexParams1");
-    static CCryNameR pParam2Name("texToTexParams2");
-    static CCryNameR pParam3Name("texToTexParams3");
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    // Iterative directional blur: 1 iter: 8 taps, 64 taps, 2 iter: 512 taps, 4096 taps...
-    float fSampleScale = 1.0f;
-    for (int i = nIterationsMul; i >= 1; --i)
-    {
-        // 1st iteration (4 taps)
-
-        gcpRendD3D->FX_PushRenderTarget(0, pTempRT, NULL);
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        uint32 nPasses;
-        CShaderMan::s_shPostEffects->FXSetTechnique(pTechName);
-        CShaderMan::s_shPostEffects->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-        float fSampleSize = fSampleScale;
-
-        // Set samples position
-        float s1 = fSampleSize / (float) pTex->GetWidth();  // 2.0 better results on lower res images resizing
-        float t1 = fSampleSize / (float) pTex->GetHeight();
-        Vec2 vBlurDir;
-        vBlurDir.x = s1 * vDir.x;
-        vBlurDir.y = t1 * vDir.y;
-
-        // Use rotated grid
-        Vec4 pParams0 = Vec4(-vBlurDir.x * 4.0f, -vBlurDir.y * 4.0f, -vBlurDir.x * 3.0f, -vBlurDir.y * 3.0f);
-        Vec4 pParams1 = Vec4(-vBlurDir.x * 2.0f, -vBlurDir.y * 2.0f, -vBlurDir.x, -vBlurDir.y);
-        Vec4 pParams2 = Vec4(vBlurDir.x * 2.0f, vBlurDir.y * 2.0f, vBlurDir.x, vBlurDir.y);
-        Vec4 pParams3 = Vec4(vBlurDir.x * 4.0f, vBlurDir.y * 4.0f, vBlurDir.x * 3.0f, vBlurDir.y * 3.0f);
-
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, &pParams0, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams1, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam2Name, &pParams2, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam3Name, &pParams3, 1);
-
-        CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-        SetTexture(pTex, 0, FILTER_LINEAR, TADDR_BORDER);
-        SetTexture(CTextureManager::Instance()->GetDefaultTexture("ScreenNoiseMap"), 1, FILTER_POINT, 0);
-
-        DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXEndPass();
-        CShaderMan::s_shPostEffects->FXEnd();
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // 2nd iteration (4 x 4 taps)
-
-        gcpRendD3D->FX_PushRenderTarget(0, pTex, NULL);
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXSetTechnique(pTechName);
-        CShaderMan::s_shPostEffects->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-        fSampleScale *= 0.75f;
-
-        fSampleSize = fSampleScale;
-        s1 = fSampleSize / (float) pTex->GetWidth();  // 2.0 better results on lower res images resizing
-        t1 = fSampleSize / (float) pTex->GetHeight();
-        vBlurDir.x = vDir.x * s1;
-        vBlurDir.y = vDir.y * t1;
-
-        pParams0 = Vec4(-vBlurDir.x * 4.0f, -vBlurDir.y * 4.0f, -vBlurDir.x * 3.0f, -vBlurDir.y * 3.0f);
-        pParams1 = Vec4(-vBlurDir.x * 2.0f, -vBlurDir.y * 2.0f, -vBlurDir.x, -vBlurDir.y);
-        pParams2 = Vec4(vBlurDir.x, vBlurDir.y, vBlurDir.x * 2.0f, vBlurDir.y * 2.0f);
-        pParams3 = Vec4(vBlurDir.x * 3.0f, vBlurDir.y * 3.0f, vBlurDir.x * 4.0f, vBlurDir.y * 4.0f);
-
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, &pParams0, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams1, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam2Name, &pParams2, 1);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam3Name, &pParams3, 1);
-
-        CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-        SetTexture(pTempRT, 0, FILTER_LINEAR, TADDR_BORDER);
-        SetTexture(CTextureManager::Instance()->GetDefaultTexture("ScreenNoiseMap"), 1, FILTER_POINT, 0);
-
-        DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXEndPass();
-        CShaderMan::s_shPostEffects->FXEnd();
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-
-        fSampleScale *= 0.5f;
-    }
-
-    // Restore previous viewport
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    SAFE_DELETE(tpBlurTemp);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::TexBlurGaussian(CTexture* pTex, [[maybe_unused]] int nAmount, float fScale, float fDistribution, bool bAlphaOnly, CTexture* pMask, bool bSRGB, CTexture* pBlurTmp)
-{
-    if (!pTex)
-    {
-        return;
-    }
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-
-    PROFILE_LABEL_SCOPE("TEXBLUR_GAUSSIAN");
-
-    if (bSRGB)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    CTexture* pTempRT = pBlurTmp;
-    SDynTexture* tpBlurTemp = 0;
-    if (!pBlurTmp)
-    {
-        tpBlurTemp = new SDynTexture(pTex->GetWidth(), pTex->GetHeight(), pTex->GetDstFormat(), eTT_2D,  FT_STATE_CLAMP | FT_USAGE_RENDERTARGET, "TempBlurRT");
-        if (tpBlurTemp)
-        {
-            tpBlurTemp->Update(pTex->GetWidth(), pTex->GetHeight());
-        }
-
-        if (!tpBlurTemp || !tpBlurTemp->m_pTexture)
-        {
-            SAFE_DELETE(tpBlurTemp);
-            return;
-        }
-
-        pTempRT = tpBlurTemp->m_pTexture;
-    }
-
-    PROFILE_SHADER_SCOPE;
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-    gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-    Vec4 vWhite(1.0f, 1.0f, 1.0f, 1.0f);
-
-    // TODO: Make test with Martin's idea about the horizontal blur pass with vertical offset.
-
-    // only regular gaussian blur supporting masking
-    static CCryNameTSCRC pTechName("GaussBlurBilinear");
-    static CCryNameTSCRC pTechNameMasked("MaskedGaussBlurBilinear");
-    static CCryNameTSCRC pTechName1("GaussAlphaBlur");
-
-    //ShBeginPass(CShaderMan::m_shPostEffects, , FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    uint32 nPasses;
-    CShaderMan::s_shPostEffects->FXSetTechnique((!bAlphaOnly) ? ((pMask) ? pTechNameMasked : pTechName) : pTechName1);
-    CShaderMan::s_shPostEffects->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-    // setup texture offsets, for texture sampling
-    float s1 = 1.0f / (float) pTex->GetWidth();
-    float t1 = 1.0f / (float) pTex->GetHeight();
-
-    // Horizontal/Vertical pass params
-    const int nSamples = 16;
-    int nHalfSamples = (nSamples >> 1);
-
-    Vec4 pHParams[32], pVParams[32], pWeightsPS[32];
-    float pWeights[32], fWeightSum = 0;
-
-    memset(pWeights, 0, sizeof(pWeights));
-
-    int s;
-    for (s = 0; s < nSamples; ++s)
-    {
-        if (fDistribution != 0.0f)
-        {
-            pWeights[s] = GaussianDistribution1D(s - nHalfSamples, fDistribution);
-        }
-        else
-        {
-            pWeights[s] = 0.0f;
-        }
-        fWeightSum += pWeights[s];
-    }
-
-    // normalize weights
-    for (s = 0; s < nSamples; ++s)
-    {
-        pWeights[s] /= fWeightSum;
-    }
-
-    // set bilinear offsets
-    for (s = 0; s < nHalfSamples; ++s)
-    {
-        float off_a = pWeights[s * 2];
-        float off_b = ((s * 2 + 1) <= nSamples - 1) ? pWeights[s * 2 + 1] : 0;
-        float a_plus_b = (off_a + off_b);
-        if (a_plus_b == 0)
-        {
-            a_plus_b = 1.0f;
-        }
-        float offset = off_b / a_plus_b;
-
-        pWeights[s] = off_a + off_b;
-        pWeights[s] *= fScale;
-        pWeightsPS[s] = vWhite * pWeights[s];
-
-        float fCurrOffset = (float) s * 2 + offset - nHalfSamples;
-        pHParams[s] = Vec4(s1 * fCurrOffset, 0, 0, 0);
-        pVParams[s] = Vec4(0, t1 * fCurrOffset, 0, 0);
-    }
-
-
-    STexState sTexState = STexState(FILTER_LINEAR, true);
-    static CCryNameR clampTCName("clampTC");
-    static CCryNameR pParam0Name("psWeights");
-    static CCryNameR pParam1Name("PI_psOffsets");
-
-    Vec4 clampTC(0.0f, 1.0f, 0.0f, 1.0f);
-    if (pTex->GetWidth() == gcpRendD3D->GetWidth() && pTex->GetHeight() == gcpRendD3D->GetHeight())
-    {
-        // clamp manually in shader since texture clamp won't apply for smaller viewport
-        clampTC = Vec4(0.0f, gRenDev->m_RP.m_CurDownscaleFactor.x, 0.0f, gRenDev->m_RP.m_CurDownscaleFactor.y);
-    }
-
-    //SetTexture(pTex, 0, FILTER_LINEAR);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(clampTCName, &clampTC, 1);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, pWeightsPS, nHalfSamples);
-
-    //for(int p(1); p<= nAmount; ++p)
-    {
-        //Horizontal
-
-
-        gcpRendD3D->FX_PushRenderTarget(0, pTempRT, NULL);
-        gcpRendD3D->FX_SetActiveRenderTargets(false);// Avoiding invalid d3d error (due to deferred rt setup, when ping-pong'ing between RTs we can bump into RTs still bound when binding it as a SRV)
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        // !force updating constants per-pass! (dx10..)
-        CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-        pTex->Apply(0, CTexture::GetTexState(sTexState));
-        if (pMask)
-        {
-            pMask->Apply(1, CTexture::GetTexState(sTexState));
-        }
-        CShaderMan::s_shPostEffects->FXSetVSFloat(pParam1Name, pHParams, nHalfSamples);
-        DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXEndPass();
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-
-        //Vertical
-        gcpRendD3D->FX_PushRenderTarget(0, pTex, NULL);
-        gcpRendD3D->FX_SetActiveRenderTargets(false);// Avoiding invalid d3d error (due to deferred rt setup, when ping-pong'ing between RTs we can bump into RTs still bound when binding it as a SRV)
-        gcpRendD3D->RT_SetViewport(0, 0, pTex->GetWidth(), pTex->GetHeight());
-
-        // !force updating constants per-pass! (dx10..)
-        CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-        CShaderMan::s_shPostEffects->FXSetVSFloat(pParam1Name, pVParams, nHalfSamples);
-        pTempRT->Apply(0, CTexture::GetTexState(sTexState));
-        if (pMask)
-        {
-            pMask->Apply(1, CTexture::GetTexState(sTexState));
-        }
-        DrawFullScreenTri(pTex->GetWidth(), pTex->GetHeight());
-
-        CShaderMan::s_shPostEffects->FXEndPass();
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-
-    CShaderMan::s_shPostEffects->FXEnd();
-
-    //    ShEndPass( );
-
-    // Restore previous viewport
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    //release dyntexture
-    SAFE_DELETE(tpBlurTemp);
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::BeginStencilPrePass(const bool bAddToStencil, const bool bDebug, const bool bResetStencil, const uint8 nStencilRefReset)
-{
-    if (!bAddToStencil && !bResetStencil)
-    {
-        gcpRendD3D->m_nStencilMaskRef++;
-    }
-
-    if (gcpRendD3D->m_nStencilMaskRef > STENC_MAX_REF)
-    {
-        gcpRendD3D->EF_ClearTargetsImmediately(FRT_CLEAR_STENCIL);
-        gcpRendD3D->m_nStencilMaskRef = 1;
-    }
-
-    gcpRendD3D->FX_SetStencilState(
-        STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-        STENCOP_FAIL(FSS_STENCOP_REPLACE) |
-        STENCOP_ZFAIL(FSS_STENCOP_REPLACE) |
-        STENCOP_PASS(FSS_STENCOP_REPLACE),
-        bResetStencil ? nStencilRefReset : gcpRendD3D->m_nStencilMaskRef, 0xFFFFFFFF, 0xFFFF
-        );
-
-    gcpRendD3D->FX_SetState(GS_STENCIL | GS_NODEPTHTEST | (!bDebug ? GS_COLMASK_NONE : 0));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::EndStencilPrePass()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::SetupStencilStates(int32 nStFunc)
-{
-    if (nStFunc < 0)
-    {
-        return;
-    }
-
-    gcpRendD3D->FX_SetStencilState(
-        STENC_FUNC(nStFunc) |
-        STENCOP_FAIL(FSS_STENCOP_KEEP) |
-        STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-        STENCOP_PASS(FSS_STENCOP_KEEP),
-        gcpRendD3D->m_nStencilMaskRef, 0xFFFFFFFF, 0xFFFFFFFF);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::SetFillModeSolid(bool bEnable)
-{
-    if (bEnable)
-    {
-        if (gcpRendD3D->GetWireframeMode() > R_SOLID_MODE)
-        {
-            SStateRaster RS = gcpRendD3D->m_StatesRS[gcpRendD3D->m_nCurStateRS];
-            RS.Desc.FillMode = D3D11_FILL_SOLID;
-            gcpRendD3D->SetRasterState(&RS);
-        }
-    }
-    else
-    {
-        if (gcpRendD3D->GetWireframeMode() == R_WIREFRAME_MODE)
-        {
-            SStateRaster RS = gcpRendD3D->m_StatesRS[gcpRendD3D->m_nCurStateRS];
-            RS.Desc.FillMode = D3D11_FILL_WIREFRAME;
-            gcpRendD3D->SetRasterState(&RS);
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SD3DPostEffectsUtils::DrawQuadFS(CShader* pShader, bool bOutputCamVec, int nWidth, int nHeight, float x0, float y0, float x1, float y1, float z)
-{
-    const Vec4 cQuadConst(1.0f / (float) nWidth, 1.0f / (float) nHeight, z, 1.0f);
-    pShader->FXSetVSFloat(m_pQuadParams, &cQuadConst, 1);
-
-    const Vec4 cQuadPosConst(x0, y0, x1, y1);
-    pShader->FXSetVSFloat(m_pQuadPosParams, &cQuadPosConst, 1);
-
-    if (bOutputCamVec)
-    {
-        UpdateFrustumCorners();
-        const Vec4 vLT(m_vLT, 1.0f);
-        pShader->FXSetVSFloat(m_pFrustumLTParams, &vLT, 1);
-        const Vec4 vLB(m_vLB, 1.0f);
-        pShader->FXSetVSFloat(m_pFrustumLBParams, &vLB, 1);
-        const Vec4 vRT(m_vRT, 1.0f);
-        pShader->FXSetVSFloat(m_pFrustumRTParams, &vRT, 1);
-        const Vec4 vRB(m_vRB, 1.0f);
-        pShader->FXSetVSFloat(m_pFrustumRBParams, &vRB, 1);
-    }
-
-    gcpRendD3D->FX_Commit();
-    if (!FAILED(gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        gcpRendD3D->FX_SetVStream(0, gcpRendD3D->m_pQuadVB, 0, sizeof(SVF_P3F_C4B_T2F));
-        gcpRendD3D->FX_DrawPrimitive(eptTriangleStrip, 0, gcpRendD3D->m_nQuadVBSize);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_PostProcessScene(bool bEnable)
-{
-    AZ_TRACE_METHOD();
-    if (!gcpRendD3D)
-    {
-        return false;
-    }
-
-    if (bEnable)
-    {
-        PostProcessUtils().Create();
-    }
-    else
-    if (!CRenderer::CV_r_PostProcess && CTexture::s_ptexBackBuffer)
-    {
-        PostProcessUtils().Release();
-    }
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::GetReprojectionMatrix(Matrix44A& matReproj,
-    const Matrix44A& matView,
-    const Matrix44A& matProj,
-    const Matrix44A& matPrevView,
-    const Matrix44A& matPrevProj,
-    float fFarPlane) const
-{
-    // Current camera screen-space to projection-space
-    const Matrix44A matSc2Pc
-        (2.f,  0.f, -1.f,  0.f,
-        0.f,  2.f, -1.f,  0.f,
-        0.f,  0.f,  1.f,  0.f,
-        0.f,  0.f,  0.f,  1.f / fFarPlane);
-
-    // Current camera view-space to projection-space
-    const Matrix44A matVc2Pc
-        (matProj.m00,  0.f,          0.f,         0.f,
-        0.f,          matProj.m11,  0.f,         0.f,
-        0.f,          0.f,          1.f,         0.f,
-        0.f,          0.f,          0.f,         1.f);
-
-    // Current camera projection-space to world-space
-    const Matrix44A matPc2Wc = (matVc2Pc * matView).GetInverted();
-
-    // Previous camera view-space to projection-space
-    const Matrix44A matVp2Pp
-        (matPrevProj.m00, 0.f,              0.f,                0.f,
-        0.f,             matPrevProj.m11,  0.f,                0.f,
-        0.f,             0.f,              1.f,                0.f,
-        0.f,             0.f,              0.f,                1.f);
-
-    // Previous camera world-space to projection-space
-    const Matrix44A matWp2Pp = matVp2Pp * matPrevView;
-
-    // Previous camera projection-space to texture-space
-    const Matrix44A matPp2Tp
-        (0.5f,         0.f,           0.5f,                     0.f,
-        0.f,          0.5f,          0.5f,                     0.f,
-        0.f,          0.f,           1.f,                      0.f,
-        0.f,          0.f,           0.f,                      1.f);
-
-    // Final reprojection matrix (from current camera screen-space to previous camera texture-space)
-    matReproj = matPp2Tp * matWp2Pp * matPc2Wc * matSc2Pc;
-}
-
-void CD3D9Renderer::UpdatePreviousFrameMatrices()
-{
-    PreviousFrameMatrixSet& matrices = m_PreviousFrameMatrixSets[m_CurViewportID][m_CurRenderEye];
-
-    matrices.m_WorldViewPosition = GetViewParameters().vOrigin;
-    matrices.m_ViewMatrix = m_CameraMatrix;
-    matrices.m_ViewNoTranslateMatrix = m_CameraZeroMatrix[m_RP.m_nProcessThreadID];
-    matrices.m_ProjMatrix = m_ProjNoJitterMatrix;
-
-    // Use next frame jitter so that motion vector calculation is stable with jitter. While it would
-    // be best to remove jitter entirely, the shaders are already computing the clip space position of
-    // the current fragment with jitter, so this a pragmatic compromise.
-    SubpixelJitter::Sample sample = SubpixelJitter::EvaluateSample(SPostEffectsUtils::m_iFrameCounter + 1, (SubpixelJitter::Pattern)CV_r_AntialiasingTAAJitterPattern);
-
-    Vec2 subpixelOffsetClipSpace;
-    subpixelOffsetClipSpace.x = ((sample.m_subpixelOffset.x * 2.0) / (float)m_width) / m_RP.m_CurDownscaleFactor.x;
-    subpixelOffsetClipSpace.y = ((sample.m_subpixelOffset.y * 2.0) / (float)m_height) / m_RP.m_CurDownscaleFactor.y;
-
-    matrices.m_ProjMatrix.m20 += subpixelOffsetClipSpace.x;
-    matrices.m_ProjMatrix.m21 += subpixelOffsetClipSpace.y;
-
-    matrices.m_ViewProjMatrix = m_ViewProjNoJitterMatrix;
-    matrices.m_ViewProjNoTranslateMatrix = m_CameraZeroMatrix[m_RP.m_nProcessThreadID] * matrices.m_ProjMatrix;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CPostEffectsMgr::Begin()
-{
-    PostProcessUtils().Log("### POST-PROCESSING BEGINS ### ");
-    PostProcessUtils().m_pTimer = gEnv->pTimer;
-    static EShaderQuality nPrevShaderQuality = eSQ_Low;
-    static ERenderQuality nPrevRenderQuality = eRQ_Low;
-
-    EShaderQuality nShaderQuality = (EShaderQuality) gcpRendD3D->EF_GetShaderQuality(eST_PostProcess);
-    ERenderQuality nRenderQuality = gRenDev->m_RP.m_eQuality;
-    if (nPrevShaderQuality != nShaderQuality || nPrevRenderQuality != nRenderQuality)
-    {
-        CPostEffectsMgr::Reset(true);
-        nPrevShaderQuality = nShaderQuality;
-        nPrevRenderQuality = nRenderQuality;
-    }
-
-    gcpRendD3D->ResetToDefault();
-
-    SPostEffectsUtils::m_pCurDepthSurface = &gcpRendD3D->m_DepthBufferOrig;
-
-    gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-
-    SPostEffectsUtils::m_fWaterLevel = gRenDev->m_p3DEngineCommon.m_OceanInfo.m_fWaterLevel;
-
-    PostProcessUtils().SetFillModeSolid(true);
-    PostProcessUtils().UpdateOverscanBorderAspectRatio();
-}
-
-void CPostEffectsMgr::End()
-{
-    gcpRendD3D->RT_SetViewport(PostProcessUtils().m_pScreenRect.left, PostProcessUtils().m_pScreenRect.top, PostProcessUtils().m_pScreenRect.right, PostProcessUtils().m_pScreenRect.bottom);
-
-    gcpRendD3D->FX_ResetPipe();
-
-    PostProcessUtils().SetFillModeSolid(false);
-
-    const uint32 nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-#if !defined(NDEBUG)
-    int recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(recursiveLevel >= 0);
-#endif
-
-    gcpRendD3D->UpdatePreviousFrameMatrices();
-
-    const int kFloatMaxContinousInt = 0x1000000;  // 2^24
-    const bool bStereo = gcpRendD3D->GetS3DRend().IsStereoEnabled();
-    if (!bStereo || (bStereo && gRenDev->m_CurRenderEye == STEREO_EYE_RIGHT))
-    {
-        SPostEffectsUtils::m_iFrameCounter = (SPostEffectsUtils::m_iFrameCounter + 1) % kFloatMaxContinousInt;
-    }
-
-    PostProcessUtils().Log("### POST-PROCESSING ENDS ### ");
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CREPostProcess:: mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    CPostEffectsMgr* pPostMgr = PostEffectMgr();
-    IF (!gcpRendD3D || !CRenderer::CV_r_PostProcess || pPostMgr->GetEffects().empty() || gcpRendD3D->GetWireframeMode() > R_SOLID_MODE, 0)
-    {
-        return 0;
-    }
-
-    // Skip hdr/post processing when rendering different camera views
-    if ((gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_MIRRORCULL) || (gcpRendD3D->m_RP.m_nRendFlags & SHDF_CUBEMAPGEN))
-    {
-        return 0;
-    }
-
-    if (gcpRendD3D->m_bDeviceLost)
-    {
-        return 0;
-    }
-
-    IF (!CShaderMan::s_shPostEffects, 0)
-    {
-        return 0;
-    }
-
-    IF (!CTexture::IsTextureExist(CTexture::s_ptexBackBuffer), 0)
-    {
-        return 0;
-    }
-
-    IF (!CTexture::IsTextureExist(CTexture::s_ptexSceneTarget), 0)
-    {
-        return 0;
-    }
-
-    PROFILE_LABEL_SCOPE("POST EFFECTS");
-
-    pPostMgr->Begin();
-
-    gcpRendD3D->FX_ApplyShaderQuality(eST_PostProcess);
-
-    for (CPostEffectItor pItor = pPostMgr->GetEffects().begin(), pItorEnd = pPostMgr->GetEffects().end(); pItor != pItorEnd; ++pItor)
-    {
-        CPostEffect* pCurrEffect = (*pItor);
-        if (pCurrEffect->GetRenderFlags() & PSP_REQUIRES_UPDATE)
-        {
-            pCurrEffect->Update();
-        }
-    }
-
-#ifndef _RELEASE
-    CPostEffectDebugVec& activeEffects = pPostMgr->GetActiveEffectsDebug();
-    CPostEffectDebugVec& activeParams = pPostMgr->GetActiveEffectsParamsDebug();
-#endif
-
-    AZStd::vector<CPostEffect*> effectsToRender;
-    for (CPostEffectItor pItor = pPostMgr->GetEffects().begin(), pItorEnd = pPostMgr->GetEffects().end(); pItor != pItorEnd; ++pItor)
-    {
-        CPostEffect* effectToPreprocess = (*pItor);
-        if (effectToPreprocess->Preprocess())
-        {
-            effectsToRender.push_back(effectToPreprocess);
-        }
-    }
-
-    for (auto effectIter = effectsToRender.begin(); effectIter != effectsToRender.end(); ++effectIter)
-    {
-        CPostEffect* currentEffect = (*effectIter);
-        uint32 nRenderFlags = currentEffect->GetRenderFlags();
-        if (nRenderFlags & PSP_UPDATE_BACKBUFFER)
-        {
-            PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexBackBuffer);
-        }
-        if (nRenderFlags & PSP_UPDATE_SCENE_SPECULAR)
-        {
-            bool optimizeRT = CRenderer::CV_r_SlimGBuffer == 1;
-            // When optimization is on, we use a single channel format texture for specular. This copy requires full RGBA so use normal map render target instead.
-            PostProcessUtils().CopyScreenToTexture(optimizeRT ? CTexture::s_ptexSceneNormalsMap : CTexture::s_ptexSceneSpecular);
-
-        }
-# ifndef _RELEASE
-        SPostEffectsDebugInfo* pDebugInfo = NULL;
-        for (uint32 i = 0, nNumEffects = activeEffects.size(); i < nNumEffects; ++i)
-        {
-            pDebugInfo = &activeEffects[i];
-            if (pDebugInfo && pDebugInfo->pEffect == currentEffect)
-            {
-                pDebugInfo->fTimeOut = POSTSEFFECTS_DEBUGINFO_TIMEOUT;
-                break;
-            }
-            pDebugInfo = NULL;
-        }
-        if (pDebugInfo == NULL)
-        {
-            activeEffects.push_back(SPostEffectsDebugInfo(currentEffect));
-        }
-#endif
-        if (CRenderer::CV_r_SkipNativeUpscale > 0 && AZStd::next(effectIter) == effectsToRender.end())
-        {
-            gcpRendD3D->FX_PopRenderTarget(0);
-            gcpRendD3D->RT_SetViewport(0,0, gcpRendD3D->GetNativeWidth(), gcpRendD3D->GetNativeHeight());
-            gcpRendD3D->FX_SetRenderTarget(0, gcpRendD3D->GetBackBuffer(), &gcpRendD3D->m_DepthBufferOrigMSAA);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-        }
-        currentEffect->Render();
-    }
-
-# ifndef _RELEASE
-    if (CRenderer::CV_r_AntialiasingModeDebug > 0)
-    {
-        float mx = CTexture::s_ptexBackBuffer->GetWidth() >> 1, my = CTexture::s_ptexBackBuffer->GetHeight() >> 1;
-        AZ::Vector2 systemCursorPositionNormalized = AZ::Vector2::CreateZero();
-        AzFramework::InputSystemCursorRequestBus::EventResult(systemCursorPositionNormalized,
-                                                              AzFramework::InputDeviceMouse::Id,
-                                                              &AzFramework::InputSystemCursorRequests::GetSystemCursorPositionNormalized);
-        mx = systemCursorPositionNormalized.GetX() * gEnv->pRenderer->GetWidth();
-        my = systemCursorPositionNormalized.GetY() * gEnv->pRenderer->GetHeight();
-
-        PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexBackBuffer);
-        static CCryNameTSCRC pszTechName("DebugPostAA");
-        GetUtils().ShBeginPass(CShaderMan::s_shPostAA, pszTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        gcpRendD3D->SetCullMode(R_CULL_NONE);
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-        const Vec4 vDebugParams(mx, my, 1.f, max(1.0f, (float) CRenderer::CV_r_AntialiasingModeDebug));
-        static CCryNameR pszDebugParams("vDebugParams");
-        CShaderMan::s_shPostAA->FXSetPSFloat(pszDebugParams, &vDebugParams, 1);
-        GetUtils().SetTexture(CTexture::s_ptexBackBuffer, 0, FILTER_POINT);
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-        GetUtils().ShEndPass();
-    }
-
-    if (!activeEffects.empty() && CRenderer::CV_r_PostProcess >= 2) // Debug output for active post effects
-    {
-        SDrawTextInfo pDrawTexInfo;
-        if (CRenderer::CV_r_PostProcess >= 2)
-        {
-            int nPosY = 20;
-            pDrawTexInfo.color[0] = pDrawTexInfo.color[2] = 0.0f;
-            pDrawTexInfo.color[1] = 1.0f;
-            gcpRendD3D->Draw2dText(30, nPosY += 15, "Active post effects:", pDrawTexInfo);
-
-            pDrawTexInfo.color[0] = pDrawTexInfo.color[1] = pDrawTexInfo.color[2] = 1.0f;
-            for (uint32 i = 0, nNumEffects = activeEffects.size(); i < nNumEffects; ++i)
-            {
-                SPostEffectsDebugInfo& debugInfo = activeEffects[i];
-                if (debugInfo.fTimeOut > 0.0f)
-                {
-                    gcpRendD3D->Draw2dText(30, nPosY += 10, debugInfo.pEffect->GetName(), pDrawTexInfo);
-                }
-                debugInfo.fTimeOut -= gEnv->pTimer->GetFrameTime();
-            }
-        }
-
-        if (CRenderer::CV_r_PostProcess == 3)
-        {
-            StringEffectMap* pEffectsParamsUpdated = pPostMgr->GetDebugParamsUsedInFrame();
-            if (pEffectsParamsUpdated)
-            {
-                if (!pEffectsParamsUpdated->empty())
-                {
-                    StringEffectMapItor pEnd = pEffectsParamsUpdated->end();
-                    for (StringEffectMapItor pItor = pEffectsParamsUpdated->begin(); pItor != pEnd; ++pItor)
-                    {
-                        SPostEffectsDebugInfo* pDebugInfo = NULL;
-                        for (uint32 p = 0, nNumParams = activeParams.size(); p < nNumParams; ++p)
-                        {
-                            pDebugInfo = &activeParams[p];
-                            if (pDebugInfo && pDebugInfo->szParamName == (pItor->first))
-                            {
-                                pDebugInfo->fTimeOut = POSTSEFFECTS_DEBUGINFO_TIMEOUT;
-                                break;
-                            }
-                            pDebugInfo = NULL;
-                        }
-                        if (pDebugInfo == NULL)
-                        {
-                            activeParams.push_back(SPostEffectsDebugInfo((pItor->first), (pItor->second != 0) ? pItor->second->GetParam() : 0.0f));
-                        }
-                    }
-                    pEffectsParamsUpdated->clear();
-                }
-
-                int nPosX = 250, nPosY = 5;
-                pDrawTexInfo.color[0] = pDrawTexInfo.color[2] = 0.0f;
-                pDrawTexInfo.color[1] = 1.0f;
-                gcpRendD3D->Draw2dText(nPosX, nPosY += 15, "Frame parameters:", pDrawTexInfo);
-
-                pDrawTexInfo.color[0] = pDrawTexInfo.color[1] = pDrawTexInfo.color[2] = 1.0f;
-                for (uint32 p = 0, nNumParams = activeParams.size(); p < nNumParams; ++p)
-                {
-                    SPostEffectsDebugInfo& debugInfo = activeParams[p];
-                    if (debugInfo.fTimeOut > 0.0f)
-                    {
-                        char pNameAndValue[128];
-                        sprintf_s(pNameAndValue, "%s: %.4f\n", debugInfo.szParamName.c_str(), debugInfo.fParamVal);
-                        gcpRendD3D->Draw2dText(nPosX, nPosY += 10, pNameAndValue, pDrawTexInfo);
-                    }
-                    debugInfo.fTimeOut -= gEnv->pTimer->GetFrameTime();
-                }
-            }
-        }
-    }
-#endif
-
-    pPostMgr->End();
-
-    return 1;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DPostProcess.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DPostProcess.h
deleted file mode 100644
index e15b551ee3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DPostProcess.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef _D3DPOSTPROCESS_H_
-#define _D3DPOSTPROCESS_H_
-
-#include "../Common/PostProcess/PostEffects.h"
-
-struct SD3DPostEffectsUtils
-    : public SPostEffectsUtils
-{
-    //  friend class CD3D9Renderer;
-
-public:
-
-    enum EFilterType
-    {
-        FilterType_Box,
-        FilterType_Tent,
-        FilterType_Gauss,
-        FilterType_Lanczos,
-    };
-
-    virtual void CopyTextureToScreen(CTexture*& pSrc, const RECT* srcRegion = NULL, const int filterMode = -1, bool sRGBLookup = false);
-    virtual void CopyScreenToTexture(CTexture*& pDst, const RECT* srcRegion = NULL);
-    virtual void StretchRect(CTexture* pSrc, CTexture*& pDst, bool bClearAlpha = false, bool bDecodeSrcRGBK = false, bool bEncodeDstRGBK = false, bool bBigDownsample = false, EDepthDownsample depthDownsampleMode = eDepthDownsample_None, bool bBindMultisampled = false, const RECT* srcRegion = NULL);
-    void SwapRedBlue(CTexture* pSrc, CTexture* pDst);
-    virtual void TexBlurIterative(CTexture* pTex, int nIterationsMul = 1, bool bDilate = false, CTexture* pBlurTmp = 0); // 2 terations minimum (src => temp => src)
-    virtual void TexBlurGaussian(CTexture* pTex, int nAmount, float fScale, float fDistribution, bool bAlphaOnly, CTexture* pMask = 0, bool bSRGB = false, CTexture* pBlurTmp = 0);
-    virtual void TexBlurDirectional(CTexture* pTex, const Vec2& vDir, int nIterationsMul = 1, CTexture* pBlurTmp = 0); // 2 terations minimum (src => temp => src)
-    virtual void DrawQuadFS(CShader* pShader, bool bOutputCamVec, int nWidth, int nHeight, float x0 = 0, float y0 = 0, float x1 = 1, float y1 = 1, float z = 0);
-
-    // Begins drawing a stencil pre-pass mask
-    void BeginStencilPrePass(const bool bAddToStencil = false, const bool bDebug = false, const bool bResetStencil = false, const uint8 nStencilRefReset = 0);
-    // Ends drawing a stencil pre-pass mask
-    void EndStencilPrePass();
-    // Setup render states for passes using stencil masks
-    void SetupStencilStates(int32 nStFunc);
-
-    // Override fill mode (wireframe/point) with solid mode
-    void SetFillModeSolid(bool bEnable);
-
-    // Downsample source to target using specified filter
-    // If bSetTarget is not set then destination target is ignored and currently set render target is used instead
-    void Downsample(CTexture* pSrc, CTexture* pDst, int nSrcW, int nSrcH, int nDstW, int nDstH, EFilterType eFilter = FilterType_Box, bool bSetTarget = true);
-
-    // Downsample to half resolution while minimizing temporal aliasing (useful for bloom)
-    void DownsampleStable(CTexture* pSrcRT, CTexture* pDstRT, bool bKillFireflies = false);
-
-    void DownsampleDepth(CTexture* pSrc, CTexture* pDst, bool bFromSingleChannel);
-    // Downsample using compute shader
-    void DownsampleDepthUsingCompute(CTexture* pSrc, CTexture** pDstArr, bool bFromSingleChannel);
-
-    // Downsamples color N amount of times in one pass using 2x2 box filtering
-    // Max N is 3.  pDstArr has to be an array of 3.  Nullptrs ok for elements > 0.
-    void DownsampleUsingCompute(CTexture* pSrc, CTexture** pDstArr);
-
-    CTexture* GetBackBufferTexture();
-
-    SDepthTexture* GetDepthSurface(CTexture* pTex);
-    void ResolveRT(CTexture*& pDst, const RECT* pSrcRect);
-    void SetSRGBShaderFlags();
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    static SD3DPostEffectsUtils& GetInstance()
-    {
-        static SD3DPostEffectsUtils m_pInstance;
-        return m_pInstance;
-    }
-
-
-private:
-
-
-    SD3DPostEffectsUtils()
-    {
-        m_pQuadParams = "g_vQuadParams";
-        m_pQuadPosParams = "g_vQuadPosParams";
-        m_pFrustumLTParams = "g_vViewFrustumLT";
-        m_pFrustumLBParams = "g_vViewFrustumLB";
-        m_pFrustumRTParams = "g_vViewFrustumRT";
-        m_pFrustumRBParams = "g_vViewFrustumRB";
-    }
-
-    virtual ~SD3DPostEffectsUtils()
-    {
-    }
-
-private:
-
-    CCryNameR m_pQuadParams;
-    CCryNameR m_pQuadPosParams;
-    CCryNameR m_pFrustumLTParams;
-    CCryNameR m_pFrustumLBParams;
-    CCryNameR m_pFrustumRTParams;
-    CCryNameR m_pFrustumRBParams;
-};
-
-// to be removed
-#define GetUtils() SD3DPostEffectsUtils::GetInstance()
-
-#define PostProcessUtils() SD3DPostEffectsUtils::GetInstance()
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRECloud.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DRECloud.cpp
deleted file mode 100644
index 7c2faeeb8f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRECloud.cpp
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-
-//=======================================================================
-
-extern CTexture* gTexture;
-
-void CRECloud::IlluminateCloud(Vec3 vLightPos, [[maybe_unused]] Vec3 vObjPos, ColorF cLightColor, ColorF cAmbColor, bool bReset)
-{
-    CryFatalError("Not implemented on D3D11+");
-
-    int iOldVP[4];
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    int nShadeRes = m_siShadeResolution;
-    nShadeRes = 256;
-
-    rd->GetViewport(&iOldVP[0], &iOldVP[1], &iOldVP[2], &iOldVP[3]);
-
-    Matrix44A origMatView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-    Matrix44A origMatProj = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-    rd->RT_SetViewport(0, 0, nShadeRes, nShadeRes);
-
-    Vec3 vDir = vLightPos;
-    vDir.Normalize();
-
-    if (bReset)
-    {
-        m_lightDirections.clear();
-    }
-    m_lightDirections.push_back(vDir);
-
-    vLightPos *= (1.1f * m_boundingBox.GetRadius());
-    vLightPos += m_boundingBox.GetCenter();
-
-    CameraViewParameters cam;
-
-    Vec3 vUp(0, 0, 1);
-    cam.LookAt(vLightPos, m_boundingBox.GetCenter(), vUp);
-
-    SortParticles(cam.ViewDir(), vLightPos, eSort_AWAY);
-
-    float DistToCntr = (m_boundingBox.GetCenter() - vLightPos) * cam.ViewDir();
-
-    float fNearDist = DistToCntr - m_boundingBox.GetRadius();
-    float fFarDist  = DistToCntr + m_boundingBox.GetRadius();
-
-    Matrix44A* m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-    cam.GetModelviewMatrix((float*)m);
-
-    mathMatrixOrthoOffCenter(&rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj, -m_boundingBox.GetRadius(), m_boundingBox.GetRadius(), -m_boundingBox.GetRadius(), m_boundingBox.GetRadius(), fNearDist, fFarDist);
-
-
-    rd->SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    rd->SetSrgbWrite(false);
-    rd->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA | GS_NODEPTHTEST | GS_ALPHATEST_GREATER, 0);
-    rd->D3DSetCull(eCULL_None);
-
-    CRenderObject* pObj = rd->m_RP.m_pCurObject;
-    CShader* pSH = rd->m_RP.m_pShader;
-    SShaderTechnique* pSHT = rd->m_RP.m_pCurTechnique;
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-    CShaderResources*   pShRes = rd->m_RP.m_pShaderResources;
-
-    if (pShRes)
-    {
-        SEfResTexture*  pTextureRes = pShRes->GetTextureResource(EFTT_DIFFUSE);
-        if (pTextureRes)
-        {
-            m_pTexParticle = pTextureRes->m_Sampler.m_pTex;
-        }
-    }
-    if (m_pTexParticle)
-    {
-        m_pTexParticle->Apply(0);
-    }
-    else
-    {
-        AZ_Warning("Shaders System", false, "Error: missing diffuse texture for clouds in CRECloud::IlluminateCloud");
-    }
-
-    rd->FX_SetFPMode();
-
-    rd->EF_ClearTargetsLater(FRT_CLEAR, Clr_White, Clr_FarPlane.r, 0);
-    rd->FX_Commit();
-
-    float fPixelsPerLength = (float)nShadeRes / (2.0f * m_boundingBox.GetRadius());
-
-    // the solid angle over which we will sample forward-scattered light.
-    float fSolidAngle = 0.09f;
-    int i;
-    int nParts = m_particles.size();
-    for (i = 0; i < nParts; i++)
-    {
-        SCloudParticle* p = m_particles[i];
-        Vec3 vParticlePos = p->GetPosition();
-
-        Vec3 vOffset = vLightPos - vParticlePos;
-
-        float fDistance  = fabs(cam.ViewDir() * vOffset) - fNearDist;
-
-        float fArea      = fSolidAngle * fDistance * fDistance;
-        int   iPixelDim  = (int)(sqrtf(fArea) * fPixelsPerLength);
-        //iPixelDim = 1;
-        int   iNumPixels = iPixelDim * iPixelDim;
-        if (iNumPixels < 1)
-        {
-            iNumPixels = 1;
-            iPixelDim = 1;
-        }
-
-        // the scale factor to convert the read back pixel colors to an average illumination of the area.
-        float fColorScaleFactor = fSolidAngle / (iNumPixels * 255.0f);
-
-        unsigned char* ds = new unsigned char[4 * iNumPixels];
-        unsigned char* c = ds;
-
-        Vec3 vWinPos;
-
-        // find the position in the buffer to which the particle position projects.
-        rd->ProjectToScreen(vParticlePos.x, vParticlePos.y, vParticlePos.z,  &vWinPos.x, &vWinPos.y, &vWinPos.z);
-        vWinPos.x /= 100.0f / rd->m_NewViewport.nWidth;
-        vWinPos.y /= 100.0f / rd->m_NewViewport.nHeight;
-
-        // offset the projected window position by half the size of the readback region.
-        vWinPos.x -= 0.5f * iPixelDim;
-        if (vWinPos.x < 0)
-        {
-            vWinPos.x = 0;
-        }
-        vWinPos.y = (vWinPos.y - 0.5f * iPixelDim);
-        if (vWinPos.y < 0)
-        {
-            vWinPos.y = 0;
-        }
-
-        // scattering coefficient vector.
-        //m_sfScatterFactor = m_sfAlbedo * 80 * (1.0f/(4.0f*(float)M_PI));
-        ColorF vScatter = ColorF(m_sfScatterFactor, m_sfScatterFactor, m_sfScatterFactor, 1);
-
-        // add up the read back pixels (only need one component -- its grayscale)
-        int iSum = 0;
-        int nTest = 0;
-        for (int k = 0; k < 4 * iNumPixels; k += 4)
-        {
-            PREFAST_SUPPRESS_WARNING(6001) // ds/c is unintialized, all this code is unused, unmaintained and should be entirely removed
-            iSum += c[k];
-            nTest += 255;
-        }
-        delete [] c;
-
-        ColorF vScatteredAmount = ColorF(iSum * fColorScaleFactor, iSum * fColorScaleFactor, iSum * fColorScaleFactor, 1 - m_sfTransparency);
-        vScatteredAmount *= vScatter;
-
-        ColorF vColor = vScatteredAmount;
-        float fScat = (float)iSum / (float)nTest;
-        fScat = powf(fScat, 3);
-        //vColor = ColorF(fScat);
-
-        vColor      *= cLightColor;
-        vColor.a     = 1 - m_sfTransparency;
-
-        //ColorF Amb = ColorF(0.1f, 0.1f, 0.1f, 1.0f);
-        if (bReset)
-        {
-            p->SetBaseColor(cAmbColor);
-            p->ClearLitColors();
-            p->AddLitColor(vColor);
-        }
-        else
-        {
-            p->AddLitColor(vColor);
-        }
-
-        vScatteredAmount *= 1.5f;
-
-        // clamp the color
-        vScatteredAmount.clamp();
-        vScatteredAmount.a = 1 - m_sfTransparency;
-
-        Vec3 vPos = vParticlePos;
-        Vec3 x = cam.vX * p->GetRadiusX();
-        Vec3 y = cam.vY * p->GetRadiusY();
-        rd->DrawQuad3D(vPos - y - x, vPos - y + x, vPos + y + x, vPos + y - x, vScatteredAmount, p->m_vUV[0].x, p->m_vUV[0].y, p->m_vUV[1].x, p->m_vUV[1].y);
-    }
-
-    rd->FX_PopRenderTarget(0);
-    assert(0);
-    rd->m_RP.m_pCurObject = pObj;
-    rd->m_RP.m_pShader = pSH;
-    rd->m_RP.m_pCurTechnique = pSHT;
-    rd->m_RP.m_pCurPass = pPass;
-
-    rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView = origMatView;
-    rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-    rd->RT_SetViewport(iOldVP[0], iOldVP[1], iOldVP[2], iOldVP[3]);
-}
-
-void CRECloud::DisplayWithoutImpostor(const CameraViewParameters& camera)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    assert(rd->m_pRT->IsRenderThread());
-
-    int nThreadID = rd->m_RP.m_nProcessThreadID;
-
-    // copy the current camera
-    CameraViewParameters cam(camera);
-
-    Vec3 vUp(0, 0, 1);
-
-    Vec3 vParticlePlane = cam.vX % cam.vY;
-    Vec3 vParticleX = (vUp % vParticlePlane).GetNormalized();
-    Vec3 vParticleY = (vParticleX % vParticlePlane).GetNormalized();
-
-    float fCosAngleSinceLastSort = m_vLastSortViewDir * rd->GetViewParameters().ViewDir();
-
-    float fSquareDistanceSinceLastSort = (rd->GetViewParameters().vOrigin - m_vLastSortCamPos).GetLengthSquared();
-
-    if (fCosAngleSinceLastSort < m_sfSortAngleErrorTolerance || fSquareDistanceSinceLastSort > m_sfSortSquareDistanceTolerance)
-    {
-        Vec3 vSortPos = -cam.ViewDir();
-        vSortPos *= (1.1f * m_boundingBox.GetRadius());
-
-        // sort the particles from back to front wrt the camera position.
-        SortParticles(cam.ViewDir(), vSortPos, eSort_TOWARD);
-
-        m_vLastSortViewDir = rd->GetViewParameters().ViewDir();
-        m_vLastSortCamPos = rd->GetViewParameters().vOrigin;
-    }
-
-    ColorF color;
-    Vec3 eyeDir;
-
-    int nParts = m_particles.size();
-    int nStartPart = 0;
-
-    if (nParts == 0)
-    {
-        return;
-    }
-
-    int nCurParts;
-
-    CRenderObject* pObj = rd->m_RP.m_pCurObject;
-    CShader* pSH = rd->m_RP.m_pShader;
-    SShaderTechnique* pSHT = rd->m_RP.m_pCurTechnique;
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-    CREImposter* pRE = (CREImposter*)pObj->GetRE();
-    Vec3 vPos = pRE->GetPosition();
-
-    uint32 nPasses;
-    if (SRendItem::m_RecurseLevel[nThreadID] > 0)
-    {
-        static CCryNameTSCRC techName("Cloud_Recursive");
-        pSH->FXSetTechnique(techName);
-    }
-    else
-    {
-        static CCryNameTSCRC techName("Cloud");
-        pSH->FXSetTechnique(techName);
-    }
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-
-    CShaderResources*   pShRes = rd->m_RP.m_pShaderResources;
-    if (pShRes)
-    {
-        SEfResTexture*  pTextureRes = pShRes->GetTextureResource(EFTT_DIFFUSE);
-        if (pTextureRes)
-            m_pTexParticle = pTextureRes->m_Sampler.m_pTex;
-    }
-    if (m_pTexParticle)
-    {
-        m_pTexParticle->Apply(0);
-    }
-    else
-    {
-        AZ_Warning("ShadersSystem", false, "Error: missing diffuse texture for clouds in CRECloud::DisplayWithoutImpostor");
-    }
-
-    /*
-        // set depth texture for soft clipping of cloud particle against scene geometry
-        if(0 != CTexture::s_ptexZTarget)
-        {
-            STexState depthTextState( FILTER_POINT, true );
-            CTexture::s_ptexZTarget->Apply( 1, CTexture::GetTexState(depthTextState) );
-        }
-    */
-    rd->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA | GS_NODEPTHTEST | GS_ALPHATEST_GREATER, 0);
-    //rd->FX_SetState(GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA | GS_NODEPTHTEST | GS_ALPHATEST_GREATER, 0);
-    rd->D3DSetCull(eCULL_None);
-
-    if (SRendItem::m_RecurseLevel[nThreadID] > 0)
-    {
-        rd->m_cEF.m_RTRect = Vec4(0, 0, 1, 1);
-    }
-
-    if (SRendItem::m_RecurseLevel[nThreadID] > 0)
-    {
-        Vec4 vCloudColorScale(m_fCloudColorScale, 0, 0, 0);
-        static CCryNameR g_CloudColorScaleName("g_CloudColorScale");
-        pSH->FXSetPSFloat(g_CloudColorScaleName, &vCloudColorScale, 1);
-    }
-
-    rd->FX_Commit();
-
-    if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        while (nStartPart < nParts)
-        {
-            nCurParts = nParts - nStartPart;
-            if (nCurParts > 32768)
-            {
-                nCurParts = 32768;
-            }
-
-            TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-            vb.Allocate(nCurParts * 4);
-            SVF_P3F_C4B_T2F* pDst = vb.Lock();
-
-            TempDynIB16 ib(gcpRendD3D);
-            ib.Allocate(nCurParts * 6);
-            uint16* pDstInds = ib.Lock();
-
-            // get various run-time parameters to determine cloud shading
-            Vec3 sunDir(gEnv->p3DEngine->GetSunDir().GetNormalized());
-
-            ColorF cloudSpec, cloudDiff;
-            GetIllumParams(cloudSpec, cloudDiff);
-
-            I3DEngine* p3DEngine(gEnv->p3DEngine);
-            assert(0 != p3DEngine);
-
-            Vec3 cloudShadingMultipliers;
-            p3DEngine->GetGlobalParameter(E3DPARAM_CLOUDSHADING_MULTIPLIERS, cloudShadingMultipliers);
-
-            Vec3 brightColor(cloudShadingMultipliers.x* p3DEngine->GetSunColor().CompMul(Vec3(cloudSpec.r, cloudSpec.g, cloudSpec.b)));
-
-            Vec3 negCamFrontDir(-cam.ViewDir());
-
-            m_fCloudColorScale = 1.0f;
-
-            // compute m_fCloudColorScale for HDR rendering
-            {
-                if (brightColor.x > m_fCloudColorScale)
-                {
-                    m_fCloudColorScale = brightColor.x;
-                }
-                if (brightColor.y > m_fCloudColorScale)
-                {
-                    m_fCloudColorScale = brightColor.y;
-                }
-                if (brightColor.z > m_fCloudColorScale)
-                {
-                    m_fCloudColorScale = brightColor.z;
-                }
-
-                // normalize color
-                brightColor /= m_fCloudColorScale;
-            }
-
-            // render cloud particles
-            for (int i = 0; i < nCurParts; i++)
-            {
-                SCloudParticle* p = m_particles[i + nStartPart];
-
-                // draw the particle as a textured billboard.
-                int nInd = i * 4;
-                SVF_P3F_C4B_T2F* pQuad = &pDst[nInd];
-                Vec3 pos = p->GetPosition() * m_fScale + vPos;
-                Vec3 x = vParticleX * p->GetRadiusX() * m_fScale;
-                Vec3 y = vParticleY * p->GetRadiusY() * m_fScale;
-                //ColorB cb = color;
-                //uint32 cd = cb.pack_argb8888();
-
-                // determine shade for each vertex of the billboard
-                float f0 = sunDir.Dot(Vec3(-y - x).GetNormalized()) * 0.5f + 0.5f;
-                float f1 = sunDir.Dot(Vec3(-y + x).GetNormalized()) * 0.5f + 0.5f;
-                float f2 = sunDir.Dot(Vec3(y + x).GetNormalized()) * 0.5f + 0.5f;
-                float f3 = sunDir.Dot(Vec3(y - x).GetNormalized()) * 0.5f + 0.5f;
-
-                Vec3 eye0(cam.vOrigin - (pos - y - x));
-                eye0 = (eye0.GetLengthSquared() < 1e-4f) ? negCamFrontDir : eye0.GetNormalized();
-                Vec3 eye1(cam.vOrigin - (pos - y + x));
-                eye1 = (eye1.GetLengthSquared() < 1e-4f) ? negCamFrontDir : eye1.GetNormalized();
-                Vec3 eye2(cam.vOrigin - (pos + y + x));
-                eye2 = (eye2.GetLengthSquared() < 1e-4f) ? negCamFrontDir : eye2.GetNormalized();
-                Vec3 eye3(cam.vOrigin - (pos + y - x));
-                eye3 = (eye3.GetLengthSquared() < 1e-4f) ? negCamFrontDir : eye3.GetNormalized();
-                f0 *= sunDir.Dot(eye0) * 0.25f + 0.75f;
-                f1 *= sunDir.Dot(eye1) * 0.25f + 0.75f;
-                f2 *= sunDir.Dot(eye2) * 0.25f + 0.75f;
-                f3 *= sunDir.Dot(eye3) * 0.25f + 0.75f;
-
-                //float heightScaleTop( ( p->GetPosition().z + x.z + y.z - minHeight ) / totalHeight );
-                //float heightScaleBottom( ( p->GetPosition().z - x.z - y.z - minHeight ) / totalHeight );
-                float heightScaleTop(1);
-                float heightScaleBottom(1);
-
-                // compute finale shading values
-                f0 = clamp_tpl(f0 * heightScaleBottom, 0.0f, 1.0f);
-                f1 = clamp_tpl(f1 * heightScaleBottom, 0.0f, 1.0f);
-                f2 = clamp_tpl(f2 * heightScaleTop, 0.0f, 1.0f);
-                f3 = clamp_tpl(f3 * heightScaleTop, 0.0f, 1.0f);
-
-                // blend between dark and bright cloud color based on shading value
-                Vec3 c0(f0 * (brightColor));
-                Vec3 c1(f1 * (brightColor));
-                Vec3 c2(f2 * (brightColor));
-                Vec3 c3(f3 * (brightColor));
-                float transp(pRE->m_fCurTransparency);
-
-                // write billboard vertices
-                ColorF col0(c0.x, c0.y, c0.z, transp);
-                col0.clamp();
-                pQuad[0].xyz = pos - y - x;
-                pQuad[0].color.dcolor = ColorB(col0).pack_argb8888();
-                pQuad[0].st = Vec2(p->m_vUV[0].x, p->m_vUV[0].y);
-
-                ColorF col1(c1.x, c1.y, c1.z, transp);
-                col1.clamp();
-                pQuad[1].xyz = pos - y + x;
-                pQuad[1].color.dcolor = ColorB(col1).pack_argb8888();
-                pQuad[1].st = Vec2(p->m_vUV[1].x, p->m_vUV[0].y);
-
-                ColorF col2(c2.x, c2.y, c2.z, transp);
-                col2.clamp();
-                pQuad[2].xyz = pos + y + x;
-                pQuad[2].color.dcolor = ColorB(col2).pack_argb8888();
-                pQuad[2].st = Vec2(p->m_vUV[1].x, p->m_vUV[1].y);
-
-                ColorF col3(c3.x, c3.y, c3.z, transp);
-                col3.clamp();
-                pQuad[3].xyz = pos + y - x;
-                pQuad[3].color.dcolor = ColorB(col3).pack_argb8888();
-                pQuad[3].st = Vec2(p->m_vUV[0].x, p->m_vUV[1].y);
-
-                uint16* pInds = &pDstInds[i * 6];
-                pInds[0] = nInd;
-                pInds[1] = nInd + 1;
-                pInds[2] = nInd + 2;
-
-                pInds[3] = nInd;
-                pInds[4] = nInd + 2;
-                pInds[5] = nInd + 3;
-            }
-
-            vb.Unlock();
-            vb.Bind(0);
-            vb.Release();
-
-            ib.Unlock();
-            ib.Bind();
-            ib.Release();
-
-            rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nCurParts * 4, 0, nCurParts * 6);
-
-            nStartPart += nCurParts;
-        }
-    }
-
-    rd->m_RP.m_pCurObject = pObj;
-    rd->m_RP.m_pShader = pSH;
-    rd->m_RP.m_pCurTechnique = pSHT;
-    rd->m_RP.m_pCurPass = pPass;
-}
-
-bool CRECloud::GenerateCloudImposter(CShader* pShader, CShaderResources* pRes, CRenderObject* pObject)
-{
-    CD3D9Renderer* r = gcpRendD3D;
-    r->FX_PreRender(1);
-    r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_DRAWTOTEXTURE;
-    r->m_RP.m_pRE = NULL;
-    r->m_RP.m_pShader = pShader;
-    r->m_RP.m_pShaderResources = pRes;
-    r->m_RP.m_pCurObject = pObject;
-    r->m_RP.m_RendNumVerts = 0;
-    r->m_RP.m_RendNumIndices = 0;
-    mfPrepare(false);
-    r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_DRAWTOTEXTURE;
-    r->FX_PostRender();
-
-    return true;
-}
-
-bool CRECloud::UpdateImposter(CRenderObject* pObj)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    CREImposter* pRE = (CREImposter*)pObj->GetRE();
-
-    if (!pRE->PrepareForUpdate())
-    {
-        if (!CRenderer::CV_r_cloudsupdatealways && pRE->m_nFrameReset == rd->m_nFrameReset)
-        {
-            return true;
-        }
-    }
-
-    PROFILE_FRAME(Imposter_CloudUpdate);
-
-    pRE->m_nFrameReset = rd->m_nFrameReset;
-    int nLogX = pRE->m_nLogResolutionX;
-    int nLogY = pRE->m_nLogResolutionY;
-    int iResX = 1 << nLogX;
-    int iResY = 1 << nLogY;
-    while (iResX > SDynTexture::s_CurTexAtlasSize)
-    {
-        nLogX--;
-        iResX = 1 << nLogX;
-    }
-    while (iResY > SDynTexture::s_CurTexAtlasSize)
-    {
-        nLogY--;
-        iResY = 1 << nLogY;
-    }
-
-    int iOldVP[4];
-    rd->GetViewport(&iOldVP[0], &iOldVP[1], &iOldVP[2], &iOldVP[3]);
-
-    Matrix44A origMatView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-    Matrix44A origMatProj = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-    rd->RT_SetViewport(0, 0, iResX, iResY);
-#ifndef _RELEASE
-    rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumCloudImpostersUpdates++;
-#endif
-
-    Matrix44A* m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-    pRE->m_LastViewParameters.GetModelviewMatrix((float*)m);
-
-    m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-    //pRE->m_LastCamera.GetProjectionMatrix(*m);
-    mathMatrixPerspectiveOffCenter(m, pRE->m_LastViewParameters.fWL, pRE->m_LastViewParameters.fWR, pRE->m_LastViewParameters.fWB,
-        pRE->m_LastViewParameters.fWT, pRE->m_LastViewParameters.fNear, pRE->m_LastViewParameters.fFar);
-
-    IDynTexture** pDT;
-    if (!pRE->m_bSplit)
-    {
-        if (!pRE->m_bScreenImposter)
-        {
-            pDT = &pRE->m_pTexture;
-        }
-        else
-        {
-            pDT = &pRE->m_pScreenTexture;
-        }
-        if (!*pDT)
-        {
-            *pDT = new SDynTexture2(iResX, iResY,  FT_STATE_CLAMP, "CloudImposter", eTP_Clouds);
-        }
-
-        if (*pDT)
-        {
-            SDepthTexture* pDepth = &gcpRendD3D->m_DepthBufferOrig;
-            uint32 nX1, nY1, nW1, nH1;
-            (*pDT)->Update(iResX, iResY);
-            (*pDT)->GetImageRect(nX1, nY1, nW1, nH1);
-#if defined(OPENGL_ES)
-            // OpenGLES needs the color texture size to match the depth texture
-            pDepth = nW1 != static_cast<int>(rd->m_d3dsdBackBuffer.Width) || nH1 != static_cast<int>(rd->m_d3dsdBackBuffer.Height) ? nullptr : pDepth;
-#else
-            pDepth = nW1 > static_cast<int>(rd->m_d3dsdBackBuffer.Width) || nH1 > static_cast<int>(rd->m_d3dsdBackBuffer.Height) ? nullptr : pDepth;
-#endif // defined(OPENGL_ES)
-
-            if (!pDepth)
-            {
-                pDepth = rd->FX_GetDepthSurface(nW1, nH1, false);
-            }
-            (*pDT)->ClearRT();
-            (*pDT)->SetRT(0, true, pDepth);
-            gTexture = (CTexture*)(*pDT)->GetTexture();
-
-            uint32 nX, nY, nW, nH;
-            (*pDT)->GetSubImageRect(nX, nY, nW, nH);
-            if (pRE->m_bScreenImposter)
-            {
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_cloudsdebug != 2)
-                {
-                    rd->LogStrv(SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID], "Generating screen '%s' - %s (%d, %d, %d, %d) (%d)\n", gTexture->GetName(), (*pDT)->IsSecondFrame() ? "Second" : "First", nX, nY, nW, nH, gRenDev->GetFrameID(false));
-                }
-            }
-            else
-            {
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_cloudsdebug != 1)
-                {
-                    rd->LogStrv(SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID], "Generating '%s' - %s (%d, %d, %d, %d) (%d)\n", gTexture->GetName(), (*pDT)->IsSecondFrame() ? "Second" : "First", nX, nY, nW, nH, gRenDev->GetFrameID(false));
-                }
-            }
-
-            int nSize = iResX * iResY * 4;
-            pRE->m_MemUpdated += nSize / 1024;
-            rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_CloudImpostersSizeUpdate += nSize;
-            DisplayWithoutImpostor(pRE->m_LastViewParameters);
-            (*pDT)->SetUpdateMask();
-            (*pDT)->RestoreRT(0, true);
-        }
-    }
-    rd->RT_SetViewport(iOldVP[0], iOldVP[1], iOldVP[2], iOldVP[3]);
-
-    rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView = origMatView;
-    rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-
-    return true;
-}
-
-bool CRECloud::mfDisplay(bool bDisplayFrontOfSplit)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    CRenderObject* pObj = rd->m_RP.m_pCurObject;
-    CREImposter* pRE = (CREImposter*)pObj->GetRE();
-    Vec3 vPos = pRE->m_vPos;
-    CShader* pSH = rd->m_RP.m_pShader;
-    SShaderTechnique* pSHT = rd->m_RP.m_pCurTechnique;
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-#ifndef _RELEASE
-    rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumCloudImpostersDraw++;
-#endif
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_cloudsdebug == 2 && pRE->m_bScreenImposter)
-    {
-        return true;
-    }
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_cloudsdebug == 1 && !pRE->m_bScreenImposter)
-    {
-        return true;
-    }
-
-    uint32 nPersFlags2 = rd->m_RP.m_PersFlags2;
-    rd->m_RP.m_PersFlags2 &= ~(RBPF2_COMMIT_PF | RBPF2_COMMIT_CM);
-
-    uint32 nPasses;
-
-    float fAlpha = pObj->m_fAlpha;
-    ColorF col(1, 1, 1, fAlpha);
-
-    if (SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID] > 0)
-    {
-        DisplayWithoutImpostor(rd->GetViewParameters());
-        return true;
-    }
-
-    //  if (!pRE->m_pTexture || (bDisplayFrontOfSplit && !pRE->m_pFrontTexture))
-    //    Warning("WARNING: CRECloud::mfDisplay: missing texture!");
-    //  else
-    //  {
-    //    IDynTexture *pDT;
-    //    if (bDisplayFrontOfSplit)
-    //      pDT = pRE->m_pFrontTexture;
-    //    else
-    //      pDT = pRE->m_pTexture;
-    //CTexture::m_Text_NoTexture->Apply(0);
-    //    pDT->Apply(0);
-    //  }
-
-    IDynTexture* pDT;
-
-    if (!pRE->m_bScreenImposter)
-    {
-        pDT = pRE->m_pTexture;
-    }
-    else
-    {
-        pDT = pRE->m_pScreenTexture;
-    }
-
-    float fOffsetU = 0, fOffsetV = 0;
-    if (pDT && (!bDisplayFrontOfSplit || (bDisplayFrontOfSplit && pRE->m_pFrontTexture)))
-    {
-        pDT->Apply(0);
-
-        fOffsetU = 0.5f / (float) pDT->GetWidth();
-        fOffsetV = 0.5f / (float) pDT->GetHeight();
-    }
-
-    // set depth texture for soft clipping of cloud against scene geometry
-    if (0 != CTexture::s_ptexZTarget)
-    {
-        STexState depthTextState(FILTER_POINT, true);
-        CTexture::s_ptexZTarget->Apply(1, CTexture::GetTexState(depthTextState));
-    }
-
-    int State = GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA | GS_ALPHATEST_GREATER;
-
-    if (pRE->m_bSplit)
-    {
-        if (!bDisplayFrontOfSplit)
-        {
-            State |= GS_DEPTHWRITE;
-        }
-        else
-        {
-            State |= GS_NODEPTHTEST;
-        }
-    }
-
-
-    // Martin test - for clouds particle soft clipping against terrain
-    // State |= GS_NODEPTHTEST;
-
-    // Added for Sun-rays to work with clouds:
-    // - force depth writing so that sun-rays interact with clouds.
-    // - also make sure we don't make any depth test (it's already done in pixel shader) so that no alpha test artifacts are visible
-    //State |= GS_DEPTHWRITE | GS_DEPTHFUNC_NOTEQUAL;
-
-    rd->FX_SetState(State, 0);
-
-    Vec3 x, y, z;
-
-    Vec4 vCloudColorScale(m_fCloudColorScale, 0, 0, 0);
-
-    if (!pRE->m_bScreenImposter)
-    {
-        z = vPos - pRE->m_LastViewParameters.vOrigin;
-        z.Normalize();
-        x = (z ^ pRE->m_LastViewParameters.vY);
-        x.Normalize();
-        x *= pRE->m_fRadiusX;
-        y = (x ^ z);
-        y.Normalize();
-        y *= pRE->m_fRadiusY;
-
-
-
-        const CameraViewParameters& cam = rd->GetViewParameters();
-        Matrix44A* m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-        cam.GetModelviewMatrix((float*)m);
-        m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-        mathMatrixPerspectiveOffCenter(m, cam.fWL, cam.fWR, cam.fWB, cam.fWT, cam.fNear, cam.fFar);
-
-        if (SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID] <= 0)
-        {
-            const SRenderTileInfo* rti = rd->GetRenderTileInfo();
-            if (rti->nGridSizeX > 1.f || rti->nGridSizeY > 1.f)
-            { // shift and scale viewport
-                m->m00 *= rti->nGridSizeX;
-                m->m11 *= rti->nGridSizeY;
-                m->m20 =   (rti->nGridSizeX - 1.f) - rti->nPosX * 2.0f;
-                m->m21 = -((rti->nGridSizeY - 1.f) - rti->nPosY * 2.0f);
-            }
-        }
-
-        rd->D3DSetCull(eCULL_None);
-        static CCryNameTSCRC techName("Cloud_Imposter");
-        pSH->FXSetTechnique(techName);
-        pSH->FXBegin(&nPasses, FEF_DONTSETSTATES);
-        pSH->FXBeginPass(0);
-
-        static CCryNameR g_CloudColorScaleName("g_CloudColorScale");
-        pSH->FXSetPSFloat(g_CloudColorScaleName, &vCloudColorScale, 1);
-
-        Vec3 lPos;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_POS, lPos);
-        Vec4 lightningPosition(lPos.x, lPos.y, lPos.z, 0.0f);
-        static CCryNameR LightningPosName("LightningPos");
-        pSH->FXSetVSFloat(LightningPosName, &lightningPosition, 1);
-
-        Vec3 lCol;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_COLOR, lCol);
-        Vec3 lSize;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_SIZE, lSize);
-        Vec4 lightningColorSize(lCol.x, lCol.y, lCol.z, lSize.x * 0.01f);
-        static CCryNameR LightningColSizeName("LightningColSize");
-        pSH->FXSetVSFloat(LightningColSizeName, &lightningColorSize, 1);
-
-        rd->m_RP.m_nCommitFlags |= FC_MATERIAL_PARAMS;
-        rd->FX_Commit();
-
-        rd->DrawQuad3D(pRE->m_vQuadCorners[0] + vPos,
-            pRE->m_vQuadCorners[1] + vPos,
-            pRE->m_vQuadCorners[2] + vPos,
-            pRE->m_vQuadCorners[3] + vPos, col, 0 + fOffsetU, 1 - fOffsetV, 1 - fOffsetU, 0 + fOffsetV);
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_impostersdraw & 4)
-        {
-            rd->FX_SetState(GS_NODEPTHTEST);
-            SAuxGeomRenderFlags auxFlags;
-            auxFlags.SetDepthTestFlag(e_DepthTestOff);
-            rd->GetIRenderAuxGeom()->SetRenderFlags(auxFlags);
-            rd->GetIRenderAuxGeom()->DrawAABB(AABB(pRE->m_WorldSpaceBV.GetMin(), pRE->m_WorldSpaceBV.GetMax()), false, Col_White, eBBD_Faceted);
-        }
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_impostersdraw & 2)
-        {
-            Vec3 v[4];
-            v[0] = vPos - y - x;
-            v[1] = vPos - y + x;
-            v[2] = vPos + y + x;
-            v[3] = vPos + y - x;
-            vtx_idx inds[6];
-            inds[0] = 0;
-            inds[1] = 1;
-            inds[2] = 2;
-            inds[3] = 0;
-            inds[4] = 2;
-            inds[5] = 3;
-
-            SAuxGeomRenderFlags auxFlags;
-            auxFlags.SetFillMode(e_FillModeWireframe);
-            auxFlags.SetDepthTestFlag(e_DepthTestOn);
-            rd->GetIRenderAuxGeom()->SetRenderFlags(auxFlags);
-            rd->GetIRenderAuxGeom()->DrawTriangles(v, 4, inds, 6, Col_Green);
-        }
-    }
-    else
-    {
-        x = pRE->m_LastViewParameters.vX;
-        x *= 0.5f * (pRE->m_LastViewParameters.fWR - pRE->m_LastViewParameters.fWL);
-        y = pRE->m_LastViewParameters.vY;
-        y *= 0.5f * (pRE->m_LastViewParameters.fWT - pRE->m_LastViewParameters.fWB);
-        z = -pRE->m_LastViewParameters.vZ;
-        z *= pRE->m_LastViewParameters.fNear;
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_impostersdraw & 4)
-        {
-            rd->GetIRenderAuxGeom()->DrawAABB(AABB(pRE->m_WorldSpaceBV.GetMin(), pRE->m_WorldSpaceBV.GetMax()), false, Col_Red, eBBD_Faceted);
-        }
-
-        // draw a polygon with this texture...
-        Matrix44A origMatProj = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-        Matrix44A* m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-        mathMatrixOrthoOffCenterLH(m, -1, 1, -1, 1, -1, 1);
-        if (SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID] <= 0)
-        {
-            const SRenderTileInfo* rti = rd->GetRenderTileInfo();
-            if (rti->nGridSizeX > 1.f || rti->nGridSizeY > 1.f)
-            { // shift and scale viewport
-                m->m00 *= rti->nGridSizeX;
-                m->m11 *= rti->nGridSizeY;
-                m->m30 = -((rti->nGridSizeX - 1.f) - rti->nPosX * 2.0f);
-                m->m31 =  ((rti->nGridSizeY - 1.f) - rti->nPosY * 2.0f);
-            }
-        }
-
-        Matrix44A origMatView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-
-        pSH->FXSetTechnique("Cloud_ScreenImposter");
-        pSH->FXBegin(&nPasses, FEF_DONTSETSTATES);
-        pSH->FXBeginPass(0);
-
-        float fNear = pRE->m_fNear;
-        float fFar = pRE->m_fFar;
-        if (fNear < 0 || fNear > 1)
-        {
-            fNear = 0.92f;
-        }
-        if (fFar < 0 || fFar > 1)
-        {
-            fFar = 0.999f;
-        }
-        float fZ = (fNear + fFar) * 0.5f;
-
-        Vec4 pos(pRE->GetPosition(), 1);
-        static CCryNameR vCloudWSPosName("vCloudWSPos");
-        pSH->FXSetVSFloat(vCloudWSPosName, &pos, 1);
-        static CCryNameR g_CloudColorScaleName("g_CloudColorScale");
-        pSH->FXSetPSFloat(g_CloudColorScaleName, &vCloudColorScale, 1);
-
-        Vec3 lPos;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_POS, lPos);
-        Vec4 lightningPosition(lPos.x, lPos.y, lPos.z, col.a);
-        static CCryNameR LightningPosName("LightningPos");
-        pSH->FXSetVSFloat(LightningPosName, &lightningPosition, 1);
-
-        Vec3 lCol;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_COLOR, lCol);
-        Vec3 lSize;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_SIZE, lSize);
-        Vec4 lightningColorSize(lCol.x, lCol.y, lCol.z, lSize.x * 0.01f);
-        static CCryNameR LightningColSizeName("LightningColSize");
-        pSH->FXSetVSFloat(LightningColSizeName, &lightningColorSize, 1);
-
-        {
-            TempDynVB<SVF_P3F_T2F_T3F> vb(gRenDev);
-            vb.Allocate(4);
-            SVF_P3F_T2F_T3F* vQuad = vb.Lock();
-
-            Vec3 vCoords[8];
-            gcpRendD3D->GetViewParameters().CalcVerts(vCoords);
-            Vec3 vRT = vCoords[4] - vCoords[0];
-            Vec3 vLT = vCoords[5] - vCoords[1];
-            Vec3 vLB = vCoords[6] - vCoords[2];
-            Vec3 vRB = vCoords[7] - vCoords[3];
-
-            vQuad[0].p.x = -1;
-            vQuad[0].p.y = -1;
-            vQuad[0].p.z = fZ;
-            vQuad[0].st0[0] = 0;
-            vQuad[0].st0[1] = 1;
-            vQuad[0].st1 = vLB;
-
-            vQuad[1].p.x = 1;
-            vQuad[1].p.y = -1;
-            vQuad[1].p.z = fZ;
-            vQuad[1].st0[0] = 1;
-            vQuad[1].st0[1] = 1;
-            vQuad[1].st1 = vRB;
-
-            vQuad[3].p.x = 1;
-            vQuad[3].p.y = 1;
-            vQuad[3].p.z = fZ;
-            vQuad[3].st0[0] = 1;
-            vQuad[3].st0[1] = 0;
-            vQuad[3].st1 = vRT;
-
-            vQuad[2].p.x = -1;
-            vQuad[2].p.y = 1;
-            vQuad[2].p.z = fZ;
-            vQuad[2].st0[0] = 0;
-            vQuad[2].st0[1] = 0;
-            vQuad[2].st1 = vLT;
-
-            vb.Unlock();
-            vb.Bind(0);
-
-
-            rd->m_RP.m_nCommitFlags |= FC_MATERIAL_PARAMS;
-            rd->FX_Commit();
-            if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_T2F_T3F)))
-            {
-                rd->FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-            }
-
-            vb.Release();
-        }
-
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView = origMatView;
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-    }
-
-    pSH->FXEndPass();
-    pSH->FXEnd();
-
-    rd->m_RP.m_PersFlags2 = nPersFlags2;
-
-    rd->m_RP.m_pCurObject = pObj;
-    rd->m_RP.m_pShader = pSH;
-    rd->m_RP.m_pCurTechnique = pSHT;
-    rd->m_RP.m_pCurPass = pPass;
-
-    return true;
-}
-
-bool CRECloud::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* pPass)
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_impostersdraw)
-    {
-        return true;
-    }
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    CRenderObject* pObj = rd->m_RP.m_pCurObject;
-    CREImposter* pRE = (CREImposter*)pObj->GetRE();
-
-    mfDisplay(false);
-
-    if (pRE->IsSplit())
-    {
-        // now display the front half of the split impostor.
-        mfDisplay(true);
-    }
-
-    return true;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DREImposter.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DREImposter.cpp
deleted file mode 100644
index 51c328b19f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DREImposter.cpp
+++ /dev/null
@@ -1,741 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-
-//=======================================================================
-
-CTexture* gTexture;
-
-int IntersectRayAABB(Vec3 p, Vec3 d, SMinMaxBox a, Vec3& q);
-
-
-static void GetEdgeNo(const uint32 dwEdgeNo, uint32& dwA, uint32& dwB)
-{
-    switch (dwEdgeNo)
-    {
-    case  0:
-        dwA = 0;
-        dwB = 1;
-        break;
-    case  1:
-        dwA = 2;
-        dwB = 3;
-        break;
-    case  2:
-        dwA = 4;
-        dwB = 5;
-        break;
-    case  3:
-        dwA = 6;
-        dwB = 7;
-        break;
-
-    case  4:
-        dwA = 0;
-        dwB = 2;
-        break;
-    case  5:
-        dwA = 4;
-        dwB = 6;
-        break;
-    case  6:
-        dwA = 5;
-        dwB = 7;
-        break;
-    case  7:
-        dwA = 1;
-        dwB = 3;
-        break;
-
-    case  8:
-        dwA = 0;
-        dwB = 4;
-        break;
-    case  9:
-        dwA = 2;
-        dwB = 6;
-        break;
-    case 10:
-        dwA = 3;
-        dwB = 7;
-        break;
-    case 11:
-        dwA = 1;
-        dwB = 5;
-        break;
-
-    default:
-        assert(0);
-    }
-}
-
-
-
-bool CREImposter::PrepareForUpdate()
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    CameraViewParameters cam = rd->GetViewParameters();
-    int i;
-
-    if (SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID] > 0)
-    {
-        return false;
-    }
-
-
-    float fMinX, fMaxX, fMinY, fMaxY;
-    uint32 dwBestEdge = 0xffffffff;     // favor the last edge we found
-    float fBestArea = FLT_MAX;
-
-    Vec3 vCenter = GetPosition();
-    Vec3 vEye = vCenter - cam.vOrigin;
-    float fDistance  = vEye.GetLength();
-    vEye /= fDistance;
-
-    int32 D3DVP[4];
-    rd->GetViewport(&D3DVP[0], &D3DVP[1], &D3DVP[2], &D3DVP[3]);
-
-    Vec3 vProjPos[9];
-    Vec3 vUnProjPos[9];
-    for (i = 0; i < 8; i++)
-    {
-        if (i & 1)
-        {
-            vUnProjPos[i].x = m_WorldSpaceBV.GetMax().x;
-        }
-        else
-        {
-            vUnProjPos[i].x = m_WorldSpaceBV.GetMin().x;
-        }
-
-        if (i & 2)
-        {
-            vUnProjPos[i].y = m_WorldSpaceBV.GetMax().y;
-        }
-        else
-        {
-            vUnProjPos[i].y = m_WorldSpaceBV.GetMin().y;
-        }
-
-        if (i & 4)
-        {
-            vUnProjPos[i].z = m_WorldSpaceBV.GetMax().z;
-        }
-        else
-        {
-            vUnProjPos[i].z = m_WorldSpaceBV.GetMin().z;
-        }
-    }
-
-    vUnProjPos[8] = vCenter;
-    /*
-        // test
-        rd->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-        rd->GetIRenderAuxGeom()->DrawAABB(AABB(m_WorldSpaceBV.GetMin(),m_WorldSpaceBV.GetMax()),false,ColorB(0,255,255,255),eBBD_Faceted);
-    */
-
-    CameraViewParameters tempCam;
-    Matrix44A viewMat, projMat;
-
-    tempCam.fNear = cam.fNear;
-    tempCam.fFar = cam.fFar;
-
-    mathMatrixPerspectiveOffCenter(&projMat, -1, 1, 1, -1, tempCam.fNear, tempCam.fFar);
-
-    float fOldEdgeArea = -FLT_MAX;
-
-    // try to find minimal enclosing rectangle assuming the best projection frustum must be aligned to a AABB edge
-    for (uint32 dwEdge = 0; dwEdge < 13; ++dwEdge)     // 12 edges and iteration no 13 processes the best again
-    {
-        uint32 dwEdgeA, dwEdgeB;
-
-        if (dwEdge == 12 && fBestArea > fOldEdgeArea * 0.98f)      // not a lot better than old axis then keep old axis (to avoid jittering)
-        {
-            dwBestEdge = m_nLastBestEdge;
-        }
-
-        if (dwEdge == 12)
-        {
-            GetEdgeNo(dwBestEdge, dwEdgeA, dwEdgeB);      // the best again
-        }
-        else
-        {
-            GetEdgeNo(dwEdge, dwEdgeA, dwEdgeB);              // edge no dwEdge
-        }
-        Vec3 vEdge[2] = { vUnProjPos[dwEdgeA], vUnProjPos[dwEdgeB]};
-        /*
-                if(dwEdge==12)
-                {
-                    // axis that allows smallest enclosing rectangle
-                    rd->GetIRenderAuxGeom()->DrawLine( vEdge[0],ColorB(0,0,255,255),vEdge[1],ColorB(0,255,255,255),10.0f);
-                }
-        */
-
-        Vec3 vR = vEdge[0] - vEdge[1];
-        Vec3 vU = (vEdge[0] - cam.vOrigin) ^ vR;
-
-        tempCam.LookAt(cam.vOrigin, vCenter, vU);
-        tempCam.GetModelviewMatrix(viewMat.GetData());
-        mathVec3ProjectArray((Vec3*)&vProjPos[0].x, sizeof(Vec3), (Vec3*)&vUnProjPos[0].x, sizeof(Vec3), D3DVP, &projMat, &viewMat, &rd->m_IdentityMatrix, 9, g_CpuFlags);
-
-        // Calculate 2D extents
-        fMinX = fMinY = FLT_MAX;
-        fMaxX = fMaxY = -FLT_MAX;
-        for (i = 0; i < 8; i++)
-        {
-            if (fMinX > vProjPos[i].x)
-            {
-                fMinX = vProjPos[i].x;
-            }
-            if (fMinY > vProjPos[i].y)
-            {
-                fMinY = vProjPos[i].y;
-            }
-
-            if (fMaxX < vProjPos[i].x)
-            {
-                fMaxX = vProjPos[i].x;
-            }
-            if (fMaxY < vProjPos[i].y)
-            {
-                fMaxY = vProjPos[i].y;
-            }
-        }
-
-        float fArea = (fMaxX - fMinX) * (fMaxY - fMinY);
-
-        if (dwEdge == m_nLastBestEdge)
-        {
-            fOldEdgeArea = fArea;
-        }
-
-        if (fArea < fBestArea)
-        {
-            dwBestEdge = dwEdge;
-            fBestArea = fArea;
-        }
-    }
-
-    /*
-        // low precision - jitters
-      // LB, RB, RT, LT
-      vProjPos[0] = Vec3(fMinX, fMinY, vProjPos[8].z);
-      vProjPos[1] = Vec3(fMaxX, fMinY, vProjPos[8].z);
-      vProjPos[2] = Vec3(fMaxX, fMaxY, vProjPos[8].z);
-      vProjPos[3] = Vec3(fMinX, fMaxY, vProjPos[8].z);
-      // Unproject back to the world with new z-value
-      mathVec3UnprojectArray((Vec3 *)&vUnProjPos[0].x, sizeof(Vec3), (Vec3 *)&vProjPos[0].x, sizeof(Vec3), D3DVP, &projMat, &viewMat, &sIdentityMatrix, 4, g_CpuFlags);
-    */
-    // high precision - no jitter
-    float fCamZ = (tempCam.vOrigin - vCenter).Dot(tempCam.ViewDir());
-    float f = -fCamZ / tempCam.fNear;
-    vUnProjPos[0] = tempCam.CamToWorld(Vec3((fMinX / D3DVP[2] * 2.0f - 1.0f) * f, (fMinY / D3DVP[3] * 2.0f - 1.0f) * f, fCamZ));
-    vUnProjPos[1] = tempCam.CamToWorld(Vec3((fMaxX / D3DVP[2] * 2.0f - 1.0f) * f, (fMinY / D3DVP[3] * 2.0f - 1.0f) * f, fCamZ));
-    vUnProjPos[2] = tempCam.CamToWorld(Vec3((fMaxX / D3DVP[2] * 2.0f - 1.0f) * f, (fMaxY / D3DVP[3] * 2.0f - 1.0f) * f, fCamZ));
-    vUnProjPos[3] = tempCam.CamToWorld(Vec3((fMinX / D3DVP[2] * 2.0f - 1.0f) * f, (fMaxY / D3DVP[3] * 2.0f - 1.0f) * f, fCamZ));
-
-
-
-    // test
-    //  rd->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    //  rd->GetIRenderAuxGeom()->DrawPolyline(vUnProjPos,4,true,ColorB(0,0,255,0),20);
-
-    m_vPos = vCenter;
-    Vec3 vProjCenter = (vUnProjPos[0] + vUnProjPos[1] + vUnProjPos[2] + vUnProjPos[3]) / 4.0f;
-    Vec3 vDif = vProjCenter - vCenter;
-    float fDerivX = vDif * tempCam.vX;
-    float fDerivY = vDif * tempCam.vY;
-
-    float fRadius = m_WorldSpaceBV.GetRadius();
-    Vec3 vRight = vUnProjPos[0] - vUnProjPos[1];
-    Vec3 vUp = vUnProjPos[0] - vUnProjPos[2];
-    float fRadiusX = vRight.len() / 2 + fabsf(fDerivX);
-    float fRadiusY = vUp.len() / 2 + fabsf(fDerivY);
-
-    Vec3 vNearest;
-    IntersectRayAABB(cam.vOrigin, vEye, m_WorldSpaceBV, vNearest);
-    Vec4 v4Nearest = Vec4(vNearest, 1);
-    Vec4 v4Far = Vec4(vNearest + vEye * fRadius * 2, 1);
-    Vec4 v4ZRange = Vec4(0, 0, 0, 0);
-    Vec4 v4Column2 = rd->m_ViewProjMatrix.GetColumn4(2);
-    Vec4 v4Column3 = rd->m_ViewProjMatrix.GetColumn4(3);
-
-    bool bScreen = false;
-
-    float fZ = v4Nearest.Dot(v4Column2);
-    float fW = v4Nearest.Dot(v4Column3);
-
-    float fNewNear = m_fNear;
-    float fNewFar = m_fFar;
-    if (fabs(fW) < 0.001f)              // to avoid division by 0 (near the object Screen is used and the value doesn't matter anyway)
-    {
-        fNewNear = 0.0f;
-        bScreen = true;
-    }
-    else
-    {
-        fNewNear = 0.999f * fZ / fW;
-    }
-
-    fZ = v4Far.Dot(v4Column2);
-    fW = v4Far.Dot(v4Column3);
-
-    if (fabs(fW) < 0.001f)              // to avoid division by 0 (near the object Screen is used and the value doesn't matter anyway)
-    {
-        fNewFar = 1.0f;
-        bScreen = true;
-    }
-    else
-    {
-        fNewFar = fZ / fW;
-    }
-
-    float fCamRadiusX = sqrtf(cam.fWR * cam.fWR + cam.fNear * cam.fNear);
-    float fCamRadiusY = sqrtf(cam.fWT * cam.fWT + cam.fNear * cam.fNear);
-
-    float fWidth     = cam.fWR - cam.fWL;
-    float fHeight    = cam.fWT - cam.fWB;
-
-    if (!bScreen)
-    {
-        bScreen = (fRadiusX * cam.fNear / fDistance >= fWidth || fRadiusY * cam.fNear / fDistance >= fHeight || (fDistance - fRadiusX <= fCamRadiusX) || (fDistance - fRadiusY <= fCamRadiusY));
-    }
-
-    IDynTexture* pDT = bScreen ? m_pScreenTexture : m_pTexture;
-    SDynTexture2* pDT2 = (SDynTexture2*)pDT;
-
-
-    float fRequiredResX = 1024;
-    float fRequiredResY = 512;
-
-    float fTexScale = CRenderer::CV_r_imposterratio > 0.1f ? 1.0f / CRenderer::CV_r_imposterratio : 1.0f / 0.1f;
-
-    if (!bScreen)  // outside cloud
-    {
-        assert(D3DVP[0] == 0 && D3DVP[1] == 0);         // otherwise the following lines don't make sense
-
-        float fRadPixelX = (fMaxX - fMinX) * 2;     // for some reason *2 is needed, most likely /near (*4) is the correct
-        float fRadPixelY = (fMaxY - fMinY) * 2;
-
-        fRequiredResX = min(fRequiredResX, max(16.0f, fRadPixelX));
-        fRequiredResY = min(fRequiredResY, max(16.0f, fRadPixelY));
-    }
-
-    int nRequiredLogXRes = LogBaseTwo((int)(fRequiredResX * fTexScale));
-    int nRequiredLogYRes = LogBaseTwo((int)(fRequiredResY * fTexScale));
-
-    if (IsImposterValid(cam, fRadiusX, fRadiusY, fCamRadiusX, fCamRadiusY, nRequiredLogXRes, nRequiredLogYRes, dwBestEdge))
-    {
-        if (!pDT2 || !pDT2->_IsValid())
-        {
-            return true;
-        }
-
-        if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_cloudsupdatealways)
-        {
-            return false;
-        }
-    }
-    if (pDT2)
-    {
-        pDT2->ResetUpdateMask();
-    }
-
-    bool bPostpone = false;
-    int nCurFrame = rd->GetFrameID(false);
-    if (gRenDev->GetActiveGPUCount() == 1)
-    {
-        if (!CRenderer::CV_r_cloudsupdatealways && !bScreen && !m_bScreenImposter && pDT && pDT->GetTexture() && m_fRadiusX && m_fRadiusY)
-        {
-            if (m_MemUpdated > CRenderer::CV_r_impostersupdateperframe)
-            {
-                bPostpone = true;
-            }
-            if (m_PrevMemPostponed)
-            {
-                int nDeltaFrames = m_PrevMemPostponed / CRenderer::CV_r_impostersupdateperframe;
-                if (nCurFrame - m_FrameUpdate > nDeltaFrames)
-                {
-                    bPostpone = false;
-                }
-            }
-            if (bPostpone)
-            {
-                m_MemPostponed += (1 << nRequiredLogXRes) * (1 << nRequiredLogYRes) * 4 / 1024;
-                return false;
-            }
-        }
-    }
-    m_FrameUpdate = nCurFrame;
-    m_fNear = fNewNear;
-    m_fFar = fNewFar;
-
-    Matrix44A M;
-
-
-    m_LastViewParameters = cam;
-    m_vLastSunDir = gEnv->p3DEngine->GetSunDir().GetNormalized();
-
-    m_nLogResolutionX = nRequiredLogXRes;
-    m_nLogResolutionY = nRequiredLogYRes;
-
-    if (!bScreen)
-    { // outside cloud
-      //    m_LastCamera.TightlyFitToSphere(cam.vOrigin, vU, m_vPos, fRadiusX, fRadiusY);
-
-        m_LastViewParameters = tempCam;
-        /*
-                float DistToCntr = (m_vPos-cam.vOrigin) | m_LastCamera.ViewDir();
-
-                // are the following 2 lines correct ?
-                m_LastCamera.fNear = DistToCntr-fRadiusX;
-                m_LastCamera.fFar = DistToCntr+fRadiusX;
-        */
-
-        assert(D3DVP[0] == 0 && D3DVP[1] == 0);         // otherwise the following lines don't make sense
-
-        //      float fRadX = max(-fMinX/D3DVP[2]*2.0f+1.0f,fMaxX/D3DVP[2]*2.0f-1.0f);
-        //      float fRadY = max(-fMinY/D3DVP[3]*2.0f+1.0f,fMaxY/D3DVP[3]*2.0f-1.0f);
-        m_LastViewParameters.fWL = (fMinX / D3DVP[2] * 2 - 1);
-        m_LastViewParameters.fWR = (fMaxX / D3DVP[2] * 2 - 1);
-        m_LastViewParameters.fWT = (fMaxY / D3DVP[3] * 2 - 1);
-        m_LastViewParameters.fWB = (fMinY / D3DVP[3] * 2 - 1);
-
-        m_fRadiusX = 0.5f * (m_LastViewParameters.fWR - m_LastViewParameters.fWL) * fDistance / m_LastViewParameters.fNear;
-        m_fRadiusY = 0.5f * (m_LastViewParameters.fWT - m_LastViewParameters.fWB) * fDistance / m_LastViewParameters.fNear;
-
-        m_vQuadCorners[0] = vUnProjPos[0] - m_vPos;
-        m_vQuadCorners[1] = vUnProjPos[1] - m_vPos;
-        m_vQuadCorners[2] = vUnProjPos[2] - m_vPos;
-        m_vQuadCorners[3] = vUnProjPos[3] - m_vPos;
-        m_nLastBestEdge = dwBestEdge;
-
-        m_bScreenImposter = false;
-        // store points used in later error estimation
-        m_vNearPoint = -m_LastViewParameters.vZ * m_LastViewParameters.fNear + m_LastViewParameters.vOrigin;
-        m_vFarPoint = -m_LastViewParameters.vZ * m_LastViewParameters.fFar + m_LastViewParameters.vOrigin;
-    }
-    else
-    { // inside cloud
-      //m_LastCamera.fFar = m_LastCamera.fNear + 3 * fRadius;
-        m_bScreenImposter =  true;
-    }
-
-    return true;
-}
-
-bool CREImposter::UpdateImposter()
-{
-    if (!PrepareForUpdate())
-    {
-        return true;
-    }
-
-    //PrepareForUpdate();
-
-    PROFILE_FRAME(Imposter_Update);
-
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    int iResX = 1 << m_nLogResolutionX;
-    int iResY = 1 << m_nLogResolutionY;
-
-    rd->FX_SetState(GS_DEPTHWRITE);
-
-    int iOldVP[4];
-    rd->GetViewport(&iOldVP[0], &iOldVP[1], &iOldVP[2], &iOldVP[3]);
-
-    IDynTexture** pDT; //, *pDTDepth;
-    if (!m_bSplit)
-    {
-        if (!m_bScreenImposter)
-        {
-            pDT = &m_pTexture;
-        }
-        else
-        {
-            pDT = &m_pScreenTexture;
-        }
-
-        if (!*pDT)
-        {
-            *pDT = new SDynTexture2(iResX, iResY,  FT_STATE_CLAMP, "Imposter", eTP_Clouds);
-        }
-
-        //if (!m_pTextureDepth)
-        //  m_pTextureDepth = new SDynTexture2(iResX, iResY, eTF_G16R16F, eTT_2D,  FT_STATE_CLAMP, "ImposterDepth");
-#ifndef _RELEASE
-        rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumImpostersUpdates++;
-#endif
-        if (*pDT) // && m_pTextureDepth)
-        {
-            //pDTDepth = m_pTextureDepth;
-            (*pDT)->Update(iResX, iResY);
-            CTexture* pT = (CTexture*)(*pDT)->GetTexture();
-            int nSize = pT->GetDataSize();
-            m_MemUpdated += nSize / 1024;
-            rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ImpostersSizeUpdate += nSize;
-            //pDTDepth->Update(iResX, iResY);
-            //ColorF col = ColorF(0,0,0,0);
-            //pDT->m_pTexture->Fill(col);
-            //pDTDepth->m_pTexture->Fill(Col_White);
-            SDepthTexture* pDepth = rd->FX_GetDepthSurface(iResX, iResY, false);
-            (*pDT)->ClearRT();
-            (*pDT)->SetRT(0, true, pDepth);
-            //rd->FX_PushRenderTarget(1, pDTDepth->m_pTexture, NULL);
-            gTexture = pT;
-            rd->FX_ClearTarget(pDepth);
-            float fYFov, fXFov, fAspect, fNearest, fFar;
-            m_LastViewParameters.GetPerspectiveParams(&fYFov, &fXFov, &fAspect, &fNearest, &fFar);
-            CCamera EngCam;
-            CCamera OldCam = rd->GetCamera();
-            int nW = iResX;
-            int nH = iResY;
-            //fXFov = DEG2RAD(fXFov);
-            fYFov = DEG2RAD(fYFov);
-            fXFov = DEG2RAD(fXFov);
-            if (m_bScreenImposter)
-            {
-                nW = rd->GetWidth();
-                nH = rd->GetHeight();
-                fXFov = EngCam.GetFov();
-            }
-            Matrix34 matr;
-            matr = Matrix34::CreateFromVectors(m_LastViewParameters.vX, -m_LastViewParameters.vZ, m_LastViewParameters.vY, m_LastViewParameters.vOrigin);
-            EngCam.SetMatrix(matr);
-            EngCam.SetFrustum(nW, nH, fXFov, fNearest, fFar);
-            //rd->SetCamera(EngCam);
-            //m_LastCamera.fFar += 100;
-            rd->m_TranspOrigCameraProjMatrix = rd->m_ViewProjMatrix.GetTransposed();
-            rd->ApplyViewParameters(m_LastViewParameters);
-
-            if (rd->m_logFileHandle != AZ::IO::InvalidHandle)
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID], " +++ Start Imposter scene +++ \n");
-            }
-
-            int nFL = rd->m_RP.m_PersFlags2;
-            rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_IMPOSTERGEN;
-            rd->m_RP.m_PersFlags2 |= RBPF2_NOALPHABLEND | RBPF2_NOALPHATEST;
-            rd->m_RP.m_StateAnd &= ~(GS_BLEND_MASK | GS_ALPHATEST_MASK);
-
-            assert(!"GetI3DEngine()->RenderImposterContent() does not exist");
-            //gEnv->p3DEngine->RenderImposterContent(this, EngCam);
-            rd->m_RP.m_PersFlags2 = nFL;
-
-            if (rd->m_logFileHandle != AZ::IO::InvalidHandle)
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID], " +++ End Imposter scene +++ \n");
-            }
-
-            if (rd->m_logFileHandle != AZ::IO::InvalidHandle)
-            {
-                rd->Logv(SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID], " +++ Postprocess Imposter +++ \n");
-            }
-
-            (*pDT)->RestoreRT(0, true);
-            //rd->FX_PopRenderTarget(1);
-
-            rd->SetCamera(OldCam);
-        }
-    }
-    rd->RT_SetViewport(iOldVP[0], iOldVP[1], iOldVP[2], iOldVP[3]);
-
-    return true;
-}
-
-bool CREImposter::Display(bool bDisplayFrontOfSplit)
-{
-    if (SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID] > 0)
-    {
-        return false;
-    }
-
-    //return true;
-    CD3D9Renderer* rd = gcpRendD3D;
-    CShader* pSH = rd->m_RP.m_pShader;
-    SShaderTechnique* pSHT = rd->m_RP.m_pCurTechnique;
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-#ifndef _RELEASE
-    rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumImpostersDraw++;
-#endif
-    Vec3 vPos = m_vPos;
-
-    uint32 nPasses = 0;
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    STexState sTexStatePoint = STexState(FILTER_POINT, true);
-    STexState sTexStateLinear = STexState(FILTER_LINEAR, true);
-    if (!m_pTexture || (bDisplayFrontOfSplit && !m_pFrontTexture))
-    {
-        Warning("WRANING: CREImposter::mfDisplay: missing texture!");
-    }
-    else
-    {
-        IDynTexture* pDT;
-        if (bDisplayFrontOfSplit)
-        {
-            pDT = m_pFrontTexture;
-        }
-        else
-        {
-            pDT = m_pTexture;
-
-            pDT->Apply(0, CTexture::GetTexState(sTexStateLinear));
-            pDT->Apply(1, CTexture::GetTexState(sTexStatePoint));
-        }
-
-        //pDT = m_pTextureDepth;
-        //pDT->Apply(1);
-    }
-
-    int State = m_State; //GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA | GS_ALPHATEST_GREATER0;
-    if (m_bSplit)
-    {
-        if (!bDisplayFrontOfSplit)
-        {
-            State |= GS_DEPTHWRITE;
-        }
-        else
-        {
-            State |= GS_NODEPTHTEST;
-        }
-    }
-    rd->FX_SetState(State, m_AlphaRef);
-    if (CRenderer::CV_r_usezpass && CTexture::s_ptexZTarget)
-    {
-        rd->FX_PushRenderTarget(1, CTexture::s_ptexZTarget, NULL);
-    }
-
-    Vec3 x, y, z;
-
-    if (!m_bScreenImposter)
-    {
-        z = vPos - m_LastViewParameters.vOrigin;
-        z.Normalize();
-        x = (z ^ m_LastViewParameters.vY);
-        x.Normalize();
-        x *=    m_fRadiusX;
-        y  =    (x ^ z);
-        y.Normalize();
-        y *=    m_fRadiusY;
-
-        const CameraViewParameters& cam = rd->GetViewParameters();
-        Matrix44A* m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-        cam.GetModelviewMatrix((float*)m);
-        m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-        mathMatrixPerspectiveOffCenter(m, cam.fWL, cam.fWR, cam.fWB, cam.fWT, cam.fNear, cam.fFar);
-
-        rd->D3DSetCull(eCULL_None);
-        pSH->FXBeginPass(0);
-
-        rd->DrawQuad3D(vPos - y - x, vPos - y + x, vPos + y + x, vPos + y - x, Col_White, 0, 1, 1, 0);
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_impostersdraw & 4)
-        {
-            rd->GetIRenderAuxGeom()->DrawAABB(AABB(m_WorldSpaceBV.GetMin(), m_WorldSpaceBV.GetMax()), false, Col_White, eBBD_Faceted);
-        }
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_impostersdraw & 2)
-        {
-            ColorB col = Col_Yellow; //ColorB(colR<<4, colG<<4, colB<<4, 255);
-            Vec3 v[4];
-            v[0] = vPos - y - x;
-            v[1] = vPos - y + x;
-            v[2] = vPos + y + x;
-            v[3] = vPos + y - x;
-            vtx_idx inds[6];
-            inds[0] = 0;
-            inds[1] = 1;
-            inds[2] = 2;
-            inds[3] = 0;
-            inds[4] = 2;
-            inds[5] = 3;
-
-            SAuxGeomRenderFlags auxFlags;
-            auxFlags.SetFillMode(e_FillModeWireframe);
-            auxFlags.SetDepthTestFlag(e_DepthTestOn);
-            rd->GetIRenderAuxGeom()->SetRenderFlags(auxFlags);
-            rd->GetIRenderAuxGeom()->DrawTriangles(v, 4, inds, 6, col);
-        }
-    }
-    else
-    {
-        x = m_LastViewParameters.vX;
-        x *= 0.5f * (m_LastViewParameters.fWR - m_LastViewParameters.fWL);
-        y = m_LastViewParameters.vY;
-        y *= 0.5f * (m_LastViewParameters.fWT - m_LastViewParameters.fWB);
-        z = -m_LastViewParameters.vZ;
-        z *= m_LastViewParameters.fNear;
-
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_impostersdraw & 4)
-        {
-            rd->GetIRenderAuxGeom()->DrawAABB(AABB(m_WorldSpaceBV.GetMin(), m_WorldSpaceBV.GetMax()), false, Col_Red, eBBD_Faceted);
-        }
-        // draw a polygon with this texture...
-        Matrix44A origMatProj = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-        mathMatrixOrthoOffCenter(&rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj, -1, 1, -1, 1, -1, 1);
-
-        Matrix44A origMatView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-        pSH->FXBeginPass(0);
-
-        rd->DrawQuad3D(Vec3(-1, -1, 0), Vec3(1, -1, 0), Vec3(1, 1, 0), Vec3(-1, 1, 0), Col_White, 0, 1, 1, 0);
-
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView = origMatView;
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-    }
-
-    pSH->FXEndPass();
-    pSH->FXEnd();
-
-    if (CRenderer::CV_r_usezpass && CTexture::s_ptexZTarget)
-    {
-        rd->FX_PopRenderTarget(1);
-    }
-
-    rd->m_RP.m_pShader = pSH;
-    rd->m_RP.m_pCurTechnique = pSHT;
-    rd->m_RP.m_pCurPass = pPass;
-
-    return true;
-}
-
-bool CREImposter::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* pPass)
-{
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_impostersdraw)
-    {
-        return true;
-    }
-
-    Display(false);
-
-    if (IsSplit())
-    {
-        // display contained instances -- first opaque, then transparent.
-        /*InstanceIterator ii;
-        for (ii = containedOpaqueInstances.begin(); ii != containedOpaqueInstances.end(); ++ii)
-        FAIL_RETURN((*ii)->Display());
-        for (ii = containedTransparentInstances.begin(); ii != containedTransparentInstances.end(); ++ii)
-        FAIL_RETURN((*ii)->Display());*/
-
-        // now display the front half of the split impostor.
-        Display(true);
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRendPipeline.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DRendPipeline.cpp
deleted file mode 100644
index 37fb0e1880..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRendPipeline.cpp
+++ /dev/null
@@ -1,6675 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Direct3D rendering pipeline.
-
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include <I3DEngine.h>
-#include <IMovieSystem.h>
-#include <CryHeaders.h>
-
-#include "RenderBus.h"
-#include "D3DPostProcess.h"
-#include "D3DStereo.h"
-#include "D3DHWShader.h"
-#include "D3DTiledShading.h"
-#include <Pak/CryPakUtils.h>
-#include "Shaders/CShader.h"
-#include "Shaders/RemoteCompiler.h"
-#include "ReverseDepth.h"
-#include "MultiLayerAlphaBlendPass.h"
-#include "Textures/TextureManager.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DRENDPIPELINE_CPP_SECTION_1 1
-#define D3DRENDPIPELINE_CPP_SECTION_2 2
-#define D3DRENDPIPELINE_CPP_SECTION_3 3
-#define D3DRENDPIPELINE_CPP_SECTION_4 4
-#define D3DRENDPIPELINE_CPP_SECTION_5 5
-#endif
-
-#if defined(FEATURE_SVO_GI)
-#include "D3D_SVO.h"
-#endif
-#include "RenderCapabilities.h"
-#include <ISystem.h>
-#include "GraphicsPipeline/Common/GraphicsPipelinePass.h"
-#include "Common/RenderView.h"
-#include "GraphicsPipeline/FurBendData.h"
-#include "GraphicsPipeline/FurPasses.h"
-
-#include <HMDBus.h>
-#include "MathConversion.h"
-
-#include <AzCore/Jobs/LegacyJobExecutor.h>
-#include <AzCore/std/algorithm.h>
-
-extern SHWOccZBuffer HWZBuffer;
-
-const static int BEFORE_WATER = 0;
-const static int AFTER_WATER  = 1;
-
-const int CD3D9Renderer::s_gmemRendertargetSlots[eGT_PathCount][eGT_RenderTargetCount] =
-{
-//  { eGT_Diffuse, eGT_Specular, eGT_Normals, eGT_DepthStencil, eGT_DiffuseLight, eGT_SpecularLight, eGT_VelocityBuffer }
-    {  -1,           -1,             -1,             -1,             -1,                 -1,             -1             },  // eGT_REGULAR_PATH
-    {   1,            2,              5,              3,              4,                  0,             -1             },  // eGT_256bpp_PATH
-    {   1,            2,              0,              3,              1,                  0,              4             }   // eGT_128bpp_PATH
-};
-
-//============================================================================================
-// Shaders rendering
-//============================================================================================
-
-//============================================================================================
-// Init Shaders rendering
-void CD3D9Renderer::EF_InitWaveTables()
-{
-    int i;
-
-    //Init wave Tables
-    for (i = 0; i < SRenderPipeline::sSinTableCount; i++)
-    {
-        float f = (float)i;
-
-        m_RP.m_tSinTable[i] = sin_tpl(f * (360.0f / (float)SRenderPipeline::sSinTableCount) * (float)M_PI / 180.0f);
-    }
-}
-
-static DXGI_FORMAT AttributeTypeDXGIFormatTable[(unsigned int)AZ::Vertex::AttributeType::NumTypes] =
-{
-    DXGI_FORMAT::DXGI_FORMAT_R16_FLOAT, //Float16_1"
-    DXGI_FORMAT::DXGI_FORMAT_R16G16_FLOAT, //Float16_2"
-    DXGI_FORMAT::DXGI_FORMAT_R16G16B16A16_FLOAT, //Float16_4"
-
-    DXGI_FORMAT::DXGI_FORMAT_R32_FLOAT, //Float32_1"
-    DXGI_FORMAT::DXGI_FORMAT_R32G32_FLOAT, //Float32_2"
-    DXGI_FORMAT::DXGI_FORMAT_R32G32B32_FLOAT, //Float32_3"
-    DXGI_FORMAT::DXGI_FORMAT_R32G32B32A32_FLOAT, //Float32_4"
-
-    DXGI_FORMAT::DXGI_FORMAT_R8_UNORM, //Byte_1"
-    DXGI_FORMAT::DXGI_FORMAT_R8G8_UNORM, //Byte_2"
-    DXGI_FORMAT::DXGI_FORMAT_R8G8B8A8_UNORM, //Byte_4"
-
-    DXGI_FORMAT::DXGI_FORMAT_R16_TYPELESS, //Short_1"
-    DXGI_FORMAT::DXGI_FORMAT_R16G16_TYPELESS, //Short_2"
-    DXGI_FORMAT::DXGI_FORMAT_R16G16B16A16_TYPELESS, //Short_4"
-
-    DXGI_FORMAT::DXGI_FORMAT_R16_UINT, //UInt16_1"
-    DXGI_FORMAT::DXGI_FORMAT_R16G16_UINT, //UInt16_2"
-    DXGI_FORMAT::DXGI_FORMAT_R16G16B16A16_UINT, //UInt16_4"
-
-    DXGI_FORMAT::DXGI_FORMAT_R32_UINT, //UInt32_1"
-    DXGI_FORMAT::DXGI_FORMAT_R32G32_UINT, //UInt32_2"
-    DXGI_FORMAT::DXGI_FORMAT_R32G32B32_UINT, //UInt32_3"
-    DXGI_FORMAT::DXGI_FORMAT_R32G32B32A32_UINT //UInt32_4"
-};
-
-AZStd::vector<D3D11_INPUT_ELEMENT_DESC> GetD3D11Declaration(const AZ::Vertex::Format& vertexFormat)
-{
-    AZStd::vector<D3D11_INPUT_ELEMENT_DESC> declaration;
-    uint offset = 0;
-    // semanticIndices is a vector of zeros that will be incremented for each attribute that shares a usage/semantic name
-    uint semanticIndices[(uint)AZ::Vertex::AttributeUsage::NumUsages] = { 0 };
-
-    uint32 attributeCount = 0;
-    const uint8* vertexAttributes = vertexFormat.GetAttributes(attributeCount);
-    for (uint ii = 0; ii < attributeCount; ++ii)
-    {
-        const uint8 attribute = vertexAttributes[ii];
-
-        D3D11_INPUT_ELEMENT_DESC elementDescription;
-        AZ::Vertex::AttributeUsage attributeUsage = AZ::Vertex::Attribute::GetUsage(attribute);
-        AZ::Vertex::AttributeType attributeType = AZ::Vertex::Attribute::GetType(attribute);
-        // TEXCOORD semantic name used for Tangents and BiTangents.
-        if (attributeUsage == AZ::Vertex::AttributeUsage::Tangent || attributeUsage == AZ::Vertex::AttributeUsage::BiTangent)
-        {
-            attributeUsage = AZ::Vertex::AttributeUsage::TexCoord;
-        }
-        elementDescription.SemanticName = AZ::Vertex::Attribute::GetSemanticName(attribute).c_str();
-
-        // Get the number of inputs with this usage up to this point, then increment that number
-        elementDescription.SemanticIndex = semanticIndices[(uint)attributeUsage];
-        semanticIndices[(uint)attributeUsage]++;
-
-        elementDescription.Format = AttributeTypeDXGIFormatTable[(uint)attributeType];
-
-        elementDescription.AlignedByteOffset = offset;
-        offset += AZ::Vertex::Attribute::GetByteLength(attribute);
-
-        elementDescription.InputSlot = 0;
-        elementDescription.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-        elementDescription.InstanceDataStepRate = 0;
-        declaration.push_back(elementDescription);
-    }
-    declaration.shrink_to_fit();
-    return declaration;
-}
-
-// build vertex declarations on demand (for programmable pipeline)
-void CD3D9Renderer::EF_OnDemandVertexDeclaration(SOnDemandD3DVertexDeclaration& out,
-    const int nStreamMask, const AZ::Vertex::Format& vertexFormat, const bool bMorph, const bool bInstanced)
-{
-    uint32 j;
-
-    AZStd::vector<D3D11_INPUT_ELEMENT_DESC>& declarationElements = m_RP.m_D3DVertexDeclarations[vertexFormat.GetEnum()].m_Declaration;
-
-    if (bInstanced)
-    {
-        // Create instanced vertex declaration
-        for (j = 0; j <declarationElements.size(); j++)
-        {
-            D3D11_INPUT_ELEMENT_DESC elem = declarationElements[j];
-            elem.InputSlotClass = D3D11_INPUT_PER_INSTANCE_DATA;
-            elem.InstanceDataStepRate = 1;
-            out.m_Declaration.push_back(elem);
-        }
-    }
-    else
-    {
-        for (j = 0; j < declarationElements.size(); j++)
-        {
-            out.m_Declaration.push_back(declarationElements[j]);
-        }
-    }
-
-    for (j = 1; j < VSF_NUM; j++)
-    {
-        if (!(nStreamMask & (1 << (j - 1))))
-        {
-            continue;
-        }
-        int n;
-        for (n = 0; n < m_RP.m_D3DStreamProperties[j].m_nNumElements; n++)
-        {
-            out.m_Declaration.push_back(m_RP.m_D3DStreamProperties[j].m_pElements[n]);
-        }
-    }
-
-    if (bMorph)
-    {
-        uint32 dwNumWithoutMorph = out.m_Declaration.size();
-
-        for (j = 0; j < dwNumWithoutMorph; j++)
-        {
-            D3D11_INPUT_ELEMENT_DESC El = out.m_Declaration[j];
-            El.InputSlot += VSF_MORPHBUDDY;
-            El.SemanticIndex += 8;
-            out.m_Declaration.push_back(El);
-        }
-        D3D11_INPUT_ELEMENT_DESC El = { "BLENDWEIGHT", 1, DXGI_FORMAT_R32G32_FLOAT, VSF_MORPHBUDDY_WEIGHTS, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }; // BlendWeight
-        out.m_Declaration.push_back(El);
-    }
-}
-
-
-void CD3D9Renderer::EF_InitD3DVertexDeclarations()
-{
-    for (int nFormat = 1; nFormat < eVF_Max; ++nFormat)
-    {
-        AZ::Vertex::Format vertexFormat = AZ::Vertex::Format((EVertexFormat)nFormat);
-        m_RP.m_D3DVertexDeclarations[nFormat].m_Declaration = GetD3D11Declaration(vertexFormat);
-        m_RP.m_vertexFormats[nFormat] = vertexFormat;
-    }
-
-    //=============================================================================
-    // Additional streams declarations:
-
-    // Tangents stream
-    static D3D11_INPUT_ELEMENT_DESC VElemTangents[] =
-    {
-#ifdef TANG_FLOATS
-        { "TANGENT", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, VSF_TANGENTS, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },   // Binormal
-        { "BINORMAL", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, VSF_TANGENTS, 16, D3D11_INPUT_PER_VERTEX_DATA, 0 }, // Tangent
-#else
-        { "TANGENT", 0, DXGI_FORMAT_R16G16B16A16_SNORM, VSF_TANGENTS, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },   // Binormal
-        { "BINORMAL", 0, DXGI_FORMAT_R16G16B16A16_SNORM, VSF_TANGENTS, 8, D3D11_INPUT_PER_VERTEX_DATA, 0 },  // Tangent
-#endif
-    };
-    // Tangents stream
-    static D3D11_INPUT_ELEMENT_DESC VElemQTangents[] =
-    {
-#ifdef TANG_FLOATS
-        { "TANGENT", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, VSF_QTANGENTS, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },   // Binormal
-#else
-        { "TANGENT", 0, DXGI_FORMAT_R16G16B16A16_SNORM, VSF_QTANGENTS, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },   // Binormal
-#endif
-    };
-
-    //HW Skin stream
-    static D3D11_INPUT_ELEMENT_DESC VElemHWSkin[] =
-    {
-        { "BLENDWEIGHT", 0, DXGI_FORMAT_R8G8B8A8_UNORM, VSF_HWSKIN_INFO, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, // BlendWeight
-        { "BLENDINDICES", 0, DXGI_FORMAT_R16G16B16A16_SINT, VSF_HWSKIN_INFO, 4, D3D11_INPUT_PER_VERTEX_DATA, 0 }, // BlendIndices
-    };
-
-#if ENABLE_NORMALSTREAM_SUPPORT
-    static D3D11_INPUT_ELEMENT_DESC VElemNormals[] =
-    {
-        { "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, VSF_NORMALS, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-    };
-#endif
-
-    static D3D11_INPUT_ELEMENT_DESC VElemVelocity[] =
-    {
-        { "POSITION", 3, DXGI_FORMAT_R32G32B32_FLOAT, VSF_VERTEX_VELOCITY, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, // Velocity
-    };
-
-
-    // stream 1 (Tangent basis vectors)
-    // stream 2 (QTangents info)
-    // stream 3 (HW skin info)
-    // stream 4 (Velocity)
-    // stream 5 (Normals)
-    m_RP.m_D3DStreamProperties[VSF_GENERAL].m_pElements = NULL;
-    m_RP.m_D3DStreamProperties[VSF_GENERAL].m_nNumElements = 0;
-    m_RP.m_D3DStreamProperties[VSF_TANGENTS].m_pElements = VElemTangents;
-    m_RP.m_D3DStreamProperties[VSF_TANGENTS].m_nNumElements = sizeof(VElemTangents) / sizeof(D3D11_INPUT_ELEMENT_DESC);
-    m_RP.m_D3DStreamProperties[VSF_QTANGENTS].m_pElements = VElemQTangents;
-    m_RP.m_D3DStreamProperties[VSF_QTANGENTS].m_nNumElements = sizeof(VElemQTangents) / sizeof(D3D11_INPUT_ELEMENT_DESC);
-    m_RP.m_D3DStreamProperties[VSF_HWSKIN_INFO].m_pElements = VElemHWSkin;
-    m_RP.m_D3DStreamProperties[VSF_HWSKIN_INFO].m_nNumElements = sizeof(VElemHWSkin) / sizeof(D3D11_INPUT_ELEMENT_DESC);
-    m_RP.m_D3DStreamProperties[VSF_VERTEX_VELOCITY].m_pElements = VElemVelocity;
-    m_RP.m_D3DStreamProperties[VSF_VERTEX_VELOCITY].m_nNumElements = sizeof(VElemVelocity) / sizeof(D3D11_INPUT_ELEMENT_DESC);
-#if ENABLE_NORMALSTREAM_SUPPORT
-    m_RP.m_D3DStreamProperties[VSF_NORMALS].m_pElements = VElemNormals;
-    m_RP.m_D3DStreamProperties[VSF_NORMALS].m_nNumElements = sizeof(VElemNormals) / sizeof(D3D11_INPUT_ELEMENT_DESC);
-#endif
-
-
-    m_CurVertBufferSize = 0;
-    m_CurIndexBufferSize = 0;
-}
-
-_inline static void* sAlign0x20(byte* vrts)
-{
-    return (void*)(((INT_PTR)vrts + 0x1f) & ~0x1f);
-}
-
-// Init shaders pipeline
-void CD3D9Renderer::EF_Init()
-{
-    // Ensure only one call to EF_Init per call to FX_PipelineShutdown
-    if (m_shaderPipelineInitialized)
-    {
-        return;
-    }
-
-
-    if IsCVarConstAccess(constexpr) (CV_r_logTexStreaming && m_logFileStrHandle == AZ::IO::InvalidHandle)
-    {
-        m_logFileStrHandle = fxopen("Direct3DLogStreaming.txt", "w");
-        if (m_logFileStrHandle != AZ::IO::InvalidHandle)
-        {
-            iLog->Log("Direct3D texture streaming log file '%s' opened", "Direct3DLogStreaming.txt");
-            char time[128];
-            char date[128];
-
-            azstrtime(time);
-            azstrdate(date);
-
-            AZ::IO::Print(m_logFileStrHandle, "\n==========================================\n");
-            AZ::IO::Print(m_logFileStrHandle, "Direct3D Textures streaming Log file opened: %s (%s)\n", date, time);
-            AZ::IO::Print(m_logFileStrHandle, "==========================================\n");
-        }
-    }
-
-    m_RP.m_MaxVerts = 16384;
-    m_RP.m_MaxTris = 16384 * 3;
-
-    iLog->Log("Allocate render buffer for particles (%d verts, %d tris)...", m_RP.m_MaxVerts, m_RP.m_MaxTris);
-
-    int n = 0;
-
-    int nSizeV = sizeof(SVF_P3F_C4B_T4B_N3F2);//this is the vertex format used for particles
-
-    n += nSizeV * m_RP.m_MaxVerts + 32;
-
-    n += sizeof(SPipTangents) * m_RP.m_MaxVerts + 32;
-
-    //m_RP.mRendIndices;
-    n += sizeof(uint16) * 3 * m_RP.m_MaxTris + 32;
-
-    {
-        byte* buf = new byte[n];
-        m_RP.m_SizeSysArray = n;
-        m_RP.m_SysArray = buf;
-        if (!buf)
-        {
-            iConsole->Exit("Can't allocate buffers for RB");
-        }
-
-        memset(buf, 0, n);
-
-        m_RP.m_StreamPtr.Ptr = sAlign0x20(buf);
-        buf += sizeof(SVF_P3F_C4B_T4B_N3F2) * m_RP.m_MaxVerts + 32;
-
-        m_RP.m_StreamPtrTang.Ptr = sAlign0x20(buf);
-        buf += sizeof(SPipTangents) * m_RP.m_MaxVerts + 32;
-
-        m_RP.m_RendIndices = (uint16*)sAlign0x20(buf);
-        m_RP.m_SysRendIndices = m_RP.m_RendIndices;
-        buf += sizeof(uint16) * 3 * m_RP.m_MaxTris + 32;
-    }
-
-    EF_Restore();
-
-    EF_InitWaveTables();
-    EF_InitD3DVertexDeclarations();
-    CHWShader_D3D::mfInit();
-
-    {
-        for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-        {
-            for (int j = 0; j < MAX_RECURSION_LEVELS; j++)
-            {
-                m_RP.m_DLights[i][j].Reserve(MAX_LIGHTS_NUM);
-            }
-        }
-    }
-
-    // Init RenderObjects
-    {
-        m_RP.m_nNumObjectsInPool = SRenderPipeline::sNumObjectsInPool;
-
-        if (m_RP.m_ObjectsPool != nullptr)
-        {
-            for (int j = 0; j < (int)(m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT); j++)
-            {
-                CRenderObject* pRendObj = &m_RP.m_ObjectsPool[j];
-                pRendObj->~CRenderObject();
-            }
-            CryModuleMemalignFree(m_RP.m_ObjectsPool);
-        }
-
-        // we use a plain allocation and placement new here to garantee the alignment, when using array new, the compiler can store it's size and break the alignment
-        m_RP.m_ObjectsPool = (CRenderObject*)CryModuleMemalign(sizeof(CRenderObject) * (m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT), 16);
-        for (int j = 0; j < (int)(m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT); j++)
-        {
-            new(&m_RP.m_ObjectsPool[j])CRenderObject();
-        }
-
-        CRenderObject** arrPrefill = (CRenderObject**)(alloca(m_RP.m_nNumObjectsInPool * sizeof(CRenderObject*)));
-        for (int j = 0; j < RT_COMMAND_BUF_COUNT; j++)
-        {
-            for (int k = 0; k < m_RP.m_nNumObjectsInPool; ++k)
-            {
-                arrPrefill[k] = &m_RP.m_ObjectsPool[j * m_RP.m_nNumObjectsInPool + k];
-            }
-
-            m_RP.m_TempObjects[j].PrefillContainer(arrPrefill, m_RP.m_nNumObjectsInPool);
-            m_RP.m_TempObjects[j].resize(0);
-        }
-    }
-    // Init identity RenderObject
-    SAFE_DELETE(m_RP.m_pIdendityRenderObject);
-    m_RP.m_pIdendityRenderObject = aznew CRenderObject();
-    m_RP.m_pIdendityRenderObject->Init();
-    m_RP.m_pIdendityRenderObject->m_II.m_AmbColor = Col_White;
-    m_RP.m_pIdendityRenderObject->m_II.m_Matrix.SetIdentity();
-    m_RP.m_pIdendityRenderObject->m_RState = 0;
-    m_RP.m_pIdendityRenderObject->m_ObjFlags |= FOB_RENDERER_IDENDITY_OBJECT;
-
-    // create hdr element
-    m_RP.m_pREHDR = (CREHDRProcess*)EF_CreateRE(eDATA_HDRProcess);
-    // create deferred shading element
-    m_RP.m_pREDeferredShading = (CREDeferredShading*)EF_CreateRE(eDATA_DeferredShading);
-
-    // Create post process render element
-    m_RP.m_pREPostProcess = (CREPostProcess*)EF_CreateRE(eDATA_PostProcess);
-
-    // Initialize posteffects manager
-    if (!m_pPostProcessMgr)
-    {
-        m_pPostProcessMgr = new CPostEffectsMgr;
-        m_pPostProcessMgr->Init();
-    }
-
-    if (!m_pWaterSimMgr)
-    {
-        m_pWaterSimMgr = new CWater;
-    }
-
-    //SDynTexture::CreateShadowPool();
-
-    m_RP.m_fLastWaterFOVUpdate = 0;
-    m_RP.m_LastWaterViewdirUpdate = Vec3(0, 0, 0);
-    m_RP.m_LastWaterUpdirUpdate = Vec3(0, 0, 0);
-    m_RP.m_LastWaterPosUpdate = Vec3(0, 0, 0);
-    m_RP.m_fLastWaterUpdate = 0;
-    m_RP.m_nLastWaterFrameID = 0;
-    m_RP.m_nCommitFlags = FC_ALL;
-
-    m_nMaterialAnisoHighSampler = CTexture::GetTexState(STexState(FILTER_ANISO16X, false));
-    m_nMaterialAnisoLowSampler = CTexture::GetTexState(STexState(FILTER_ANISO4X, false));
-    m_nMaterialAnisoSamplerBorder = CTexture::GetTexState(STexState(FILTER_ANISO16X, TADDR_BORDER, TADDR_BORDER, TADDR_BORDER, 0x0));
-
-    CDeferredShading::CreateDeferredShading();
-
-    if (m_pStereoRenderer)
-    {
-        m_pStereoRenderer->CreateResources();
-        m_pStereoRenderer->Update();
-    }
-
-    MultiLayerAlphaBlendPass::InstallInstance();
-    FurPasses::InstallInstance();
-    
-    // Initialize occlusion data
-    InvalidateCoverageBufferData();
-
-    AZ_Assert(m_pBackBuffer == m_pBackBuffers[CD3D9Renderer::GetCurrentBackBufferIndex(m_pSwapChain)], "Swap chain was not properly swapped");
-
-    GetDeviceContext().OMSetRenderTargets(1, &m_pBackBuffer, m_pNativeZBuffer);
-
-    ResetToDefault();
-
-    m_shaderPipelineInitialized = true;
-}
-
-// Invalidate shaders pipeline
-void CD3D9Renderer::FX_Invalidate()
-{
-    for (int i = 0; i < SRenderPipeline::nNumParticleVertexIndexBuffer; ++i)
-    {
-        SAFE_DELETE(m_RP.m_pParticleVertexBuffer[i]);
-        SAFE_DELETE(m_RP.m_pParticleIndexBuffer[i]);
-    }
-}
-
-void CD3D9Renderer::FX_UnbindStreamSource(D3DBuffer* buffer)
-{
-    IF (!buffer, 0)
-    {
-        return;
-    }
-
-    for (int i = 0; i < MAX_STREAMS; i++)
-    {
-        IF (m_RP.m_VertexStreams[i].pStream == buffer, 0)
-        {
-            ID3D11Buffer* pNullBuffer = NULL;
-            uint32 zeroStrideOffset = 0;
-            m_DevMan.BindVB(i, 1, &pNullBuffer, &zeroStrideOffset, &zeroStrideOffset);
-            m_RP.m_VertexStreams[i].pStream = NULL;
-        }
-    }
-    IF (m_RP.m_pIndexStream == buffer, 0)
-    {
-        m_DevMan.BindIB(NULL, 0, DXGI_FORMAT_R16_UINT);
-        m_RP.m_pIndexStream = NULL;
-    }
-
-    // commit state changes a second time to really unbind right now, not during the next DrawXXX or Commit
-    m_DevMan.CommitDeviceStates();
-}
-
-// Restore shaders pipeline
-void CD3D9Renderer::EF_Restore()
-{
-    if (!m_RP.m_MaxTris)
-    {
-        return;
-    }
-
-    FX_Invalidate();
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_ComputeVerticesJobExecutors[i].WaitForCompletion();
-    }
-
-    // preallocate video memory buffer for particles when using the job system
-    for (int i = 0; i < SRenderPipeline::nNumParticleVertexIndexBuffer; ++i)
-    {
-        m_RP.m_pParticleVertexBuffer[i] = new FencedVB<byte>(CV_r_ParticleVerticePoolSize, sizeof(SVF_P3F_C4B_T4B_N3F2));
-        m_RP.m_pParticleIndexBuffer[i] = new FencedIB<uint16>(CV_r_ParticleVerticePoolSize * 3, sizeof(uint16));
-
-        m_RP.m_pParticleVertexVideoMemoryBase[i] = NULL;
-        m_RP.m_pParticleindexVideoMemoryBase[i] = NULL;
-
-        m_RP.m_nParticleVertexOffset[i] = 0;
-        m_RP.m_nParticleIndexOffset[i] = 0;
-
-        m_RP.m_nParticleVertexBufferAvailableMemory = CV_r_ParticleVerticePoolSize * sizeof(SVF_P3F_C4B_T4B_N3F2);
-        m_RP.m_nParticleIndexBufferAvailableMemory = CV_r_ParticleVerticePoolSize * 3 * sizeof(uint16);
-    }
-}
-
-void CD3D9Renderer::OnRendererFreeResources(int flags)
-{
-    // If texture resources are about to be freed by the renderer
-    if (flags & FRR_TEXTURES)
-    {
-        // Release the occlusion readback textures before CTexture::Shutdown is called
-        for (size_t idx = 0; idx < s_numOcclusionReadbackTextures; idx++)
-        {
-            m_occlusionData[idx].Destroy();
-        }
-    }
-}
-
-// Shutdown shaders pipeline
-void CD3D9Renderer::FX_PipelineShutdown(bool bFastShutdown)
-{
-    if (!m_shaderPipelineInitialized)
-    {
-        return;
-    }
-
-    uint32 i, j, n;
-
-    FX_Invalidate();
-
-    MultiLayerAlphaBlendPass::ReleaseInstance();
-    FurPasses::ReleaseInstance();
-
-    SAFE_DELETE_ARRAY(m_RP.m_SysArray);
-    m_RP.m_SysVertexPool[0].Free();
-    m_RP.m_SysIndexPool[0].Free();
-#if !defined(STRIP_RENDER_THREAD)
-    m_RP.m_SysVertexPool[1].Free();
-    m_RP.m_SysIndexPool[1].Free();
-#endif
-    for (int index=0; index<eVF_Max; ++index)
-    {
-        m_RP.m_D3DVertexDeclarations[index].m_Declaration.clear();
-    }
-
-    // Loop through the 2D array of hash maps
-    for (auto& stream : m_RP.m_D3DVertexDeclarationCache)
-    {
-        for (auto& vertexFormatHashMap : stream)
-        {
-            for (auto& crcVertexFormatPair : vertexFormatHashMap)
-            {
-                // Release the vertex format declaration
-                SAFE_RELEASE(crcVertexFormatPair.second.m_pDeclaration);
-            }
-        }
-    }
-
-    for (n = 0; n < RT_COMMAND_BUF_COUNT; n++)
-    {
-        for (j = 0; j < MAX_RECURSION_LEVELS; j++)
-        {
-            for (i = 0; i < CREClientPoly::m_PolysStorage[n][j].Num(); i++)
-            {
-                CREClientPoly::m_PolysStorage[n][j][i]->Release(true);
-            }
-            CREClientPoly::m_PolysStorage[n][j].Free();
-        }
-    }
-
-    SAFE_RELEASE(m_RP.m_pREHDR);
-    SAFE_RELEASE(m_RP.m_pREDeferredShading);
-    SAFE_RELEASE(m_RP.m_pREPostProcess);
-    SAFE_DELETE(m_pPostProcessMgr);
-    SAFE_DELETE(m_pWaterSimMgr);
-    
-    for (size_t idx = 0; idx < s_numOcclusionReadbackTextures; idx++)
-    {
-        m_occlusionData[idx].Destroy();
-    }
-
-    //if (m_pStereoRenderer)
-    //  m_pStereoRenderer->ReleaseResources();
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (m_pRenderAuxGeomD3D)
-    {
-        m_pRenderAuxGeomD3D->ReleaseShader();
-    }
-#endif
-
-    if (!bFastShutdown)
-    {
-        CHWShader_D3D::ShutDown();
-    }
-
-    m_RP.m_pCurTechnique = 0;
-
-    if (m_RP.m_ObjectsPool != nullptr)
-    {
-        for (int objIdx = 0; objIdx < (int)(m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT); objIdx++)
-        {
-            CRenderObject* pRendObj = &m_RP.m_ObjectsPool[objIdx];
-            pRendObj->~CRenderObject();
-        }
-        CryModuleMemalignFree(m_RP.m_ObjectsPool);
-    }
-    m_RP.m_ObjectsPool = NULL;
-    for (int k = 0; k < RT_COMMAND_BUF_COUNT; ++k)
-    {
-        m_RP.m_TempObjects[k].clear();
-    }
-
-    m_DevMan.SetBlendState(nullptr, nullptr, 0);
-    m_DevMan.SetRasterState(nullptr);
-    m_DevMan.SetDepthStencilState(nullptr, 0);
-
-    for (i = 0; i < m_StatesDP.Num(); ++i)
-    {
-        SAFE_RELEASE(m_StatesDP[i].pState);
-    }
-    for (i = 0; i < m_StatesRS.Num(); ++i)
-    {
-        SAFE_RELEASE(m_StatesRS[i].pState);
-    }
-    for (i = 0; i < m_StatesBL.Num(); ++i)
-    {
-        SAFE_RELEASE(m_StatesBL[i].pState);
-    }
-    m_StatesBL.Free();
-    m_StatesRS.Free();
-    m_StatesDP.Free();
-    m_nCurStateRS = ~0U;
-    m_nCurStateDP = ~0U;
-    m_nCurStateBL = ~0U;
-
-    CDeferredShading::DestroyDeferredShading();
-
-    for (unsigned int a = 0; a < m_OcclQueries.size(); a++)
-    {
-        m_OcclQueries[a].Release();
-    }
-
-    m_shaderPipelineInitialized = false;
-}
-
-void CD3D9Renderer::FX_ResetPipe()
-{
-    int i;
-
-    FX_SetState(GS_NODEPTHTEST);
-    D3DSetCull(eCULL_None);
-    m_RP.m_FlagsStreams_Decl = 0;
-    m_RP.m_FlagsStreams_Stream = 0;
-    m_RP.m_FlagsPerFlush = 0;
-    m_RP.m_FlagsShader_RT = 0;
-    m_RP.m_FlagsShader_MD = 0;
-    m_RP.m_FlagsShader_MDV = 0;
-    m_RP.m_FlagsShader_LT = 0;
-    m_RP.m_nCommitFlags = FC_ALL;
-    m_RP.m_PersFlags2 |= RBPF2_COMMIT_PF | RBPF2_COMMIT_CM;
-    
-    m_RP.m_nDeferredPrimitiveID = SHAPE_PROJECTOR;
-
-    HRESULT h = FX_SetIStream(NULL, 0, Index16);
-
-    EF_Scissor(false, 0, 0, 0, 0);
-    m_RP.m_pShader = NULL;
-    m_RP.m_pCurTechnique = NULL;
-    for (i = 1; i < VSF_NUM; i++)
-    {
-        if (m_RP.m_PersFlags1 & (RBPF1_USESTREAM << i))
-        {
-            m_RP.m_PersFlags1 &= ~(RBPF1_USESTREAM << i);
-            h = FX_SetVStream(i, NULL, 0, 0);
-        }
-    }
-
-    CHWShader_D3D::mfSetGlobalParams();
-}
-
-void DrawFullScreenQuad(float fLeftU, float fTopV, float fRightU, float fBottomV);
-
-
-//==========================================================================
-// Calculate current scene node matrices
-void CD3D9Renderer::EF_SetCameraInfo()
-{
-    m_pRT->RC_SetCamera();
-}
-
-void CD3D9Renderer::RT_SetCameraInfo()
-{
-    GetModelViewMatrix(&m_ViewMatrix(0, 0));
-    m_CameraMatrix = m_ViewMatrix;
-
-    GetProjectionMatrix(&m_ProjMatrix(0, 0));
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    if (pShaderThreadInfo->m_PersFlags & RBPF_OBLIQUE_FRUSTUM_CLIPPING)
-    {
-        Matrix44A mObliqueProjMatrix;
-        mObliqueProjMatrix.SetIdentity();
-
-        mObliqueProjMatrix.m02 = pShaderThreadInfo->m_pObliqueClipPlane.n[0];
-        mObliqueProjMatrix.m12 = pShaderThreadInfo->m_pObliqueClipPlane.n[1];
-        mObliqueProjMatrix.m22 = pShaderThreadInfo->m_pObliqueClipPlane.n[2];
-        mObliqueProjMatrix.m32 = pShaderThreadInfo->m_pObliqueClipPlane.d;
-
-        m_ProjMatrix = m_ProjMatrix * mObliqueProjMatrix;
-    }
-
-    bool bApplySubpixelShift = !(m_RP.m_PersFlags2 & RBPF2_NOPOSTAA);
-    bApplySubpixelShift &= !(pShaderThreadInfo->m_PersFlags & (RBPF_DRAWTOTEXTURE | RBPF_SHADOWGEN));
-
-    m_ProjNoJitterMatrix = m_ProjMatrix;
-    m_ViewProjNoJitterMatrix = m_CameraMatrix * m_ProjMatrix;
-
-    if (bApplySubpixelShift)
-    {
-        m_ProjMatrix.m20 += m_TemporalJitterClipSpace.x;
-        m_ProjMatrix.m21 += m_TemporalJitterClipSpace.y;
-    }
-
-    m_ViewProjMatrix = m_CameraMatrix * m_ProjMatrix;
-    m_ViewProjNoTranslateMatrix = m_CameraZeroMatrix[m_RP.m_nProcessThreadID] * m_ProjMatrix;
-
-    // specialized matrix inversion for enhanced precision
-    Matrix44_tpl<f64> mProjInv;
-    if (mathMatrixPerspectiveFovInverse(&mProjInv, &m_ProjMatrix))
-    {
-        Matrix44_tpl<f64>  mViewInv;
-        mathMatrixLookAtInverse(&mViewInv, &m_CameraMatrix);
-        m_ViewProjInverseMatrix = mProjInv * mViewInv;
-    }
-    else
-    {
-        m_ViewProjInverseMatrix = m_ViewProjMatrix.GetInverted();
-    }
-
-    if (m_RP.m_ObjFlags & FOB_NEAREST)
-    {
-        m_CameraMatrixNearest = m_CameraMatrix;
-    }
-
-    pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-    m_RP.m_ObjFlags = 0;
-
-    m_NewViewport.fMinZ = pShaderThreadInfo->m_cam.GetZRangeMin();
-    m_NewViewport.fMaxZ = pShaderThreadInfo->m_cam.GetZRangeMax();
-    m_bViewportDirty = true;
-
-    CHWShader_D3D::mfSetCameraParams();
-}
-
-/*
-    Applies the correct HMD tracking pose to the camera. This is done
-    on the render thread to ensure that we are rendering with the most
-    up to date poses.
-*/
-void CD3D9Renderer::RT_SetStereoCamera()
-{
-    int threadId = m_RP.m_nProcessThreadID;
-
-    if (m_pStereoRenderer->IsRenderingToHMD())
-    {
-        CCamera camera = m_RP.m_TI[threadId].m_cam;
-
-        const AZ::VR::TrackingState* trackingState = nullptr;
-        EBUS_EVENT_RESULT(trackingState, AZ::VR::HMDDeviceRequestBus, GetTrackingState);
-        if (trackingState)
-        {
-            const Vec3 position = camera.GetEntityPos();
-            Quat rotation = camera.GetEntityRotation();
-
-            const Vec3 trackedPosition = rotation * AZVec3ToLYVec3(trackingState->pose.position);
-            rotation = rotation * AZQuaternionToLYQuaternion(trackingState->pose.orientation);
-
-            Matrix34 camMat = Matrix34(rotation);
-            camMat.SetTranslation(position + trackedPosition);
-
-            AZ::VR::PerEyeCameraInfo cameraInfo;
-            EBUS_EVENT(AZ::VR::HMDDeviceRequestBus, GetPerEyeCameraInfo, static_cast<EStereoEye>(gRenDev->m_CurRenderEye), camera.GetNearPlane(), camera.GetFarPlane(), cameraInfo);
-
-            const float asymmetricHorizontalTranslation = cameraInfo.frustumPlane.horizontalDistance * camera.GetNearPlane();
-            const float asymmetricVerticalTranslation = cameraInfo.frustumPlane.verticalDistance * camera.GetNearPlane();
-
-            const Vec3 eyeOffset = AZVec3ToLYVec3(cameraInfo.eyeOffset);
-
-            const Matrix34 stereoMat = Matrix34::CreateTranslationMat(eyeOffset);
-            camera.SetMatrix(camMat * stereoMat);
-            camera.SetFrustum(1, 1, cameraInfo.fov, camera.GetNearPlane(), camera.GetFarPlane(), 1.0f / cameraInfo.aspectRatio);
-            camera.SetAsymmetry(asymmetricHorizontalTranslation, asymmetricHorizontalTranslation, asymmetricVerticalTranslation, asymmetricVerticalTranslation);
-
-            SetCamera(camera);
-        }
-        else
-        {
-            AZ_Warning("VR", false, "Failed to set stereo camera: No tracking state")
-        }
-    }
-}
-
-// Set object transform for fixed pipeline shader
-void CD3D9Renderer::FX_SetObjectTransform(CRenderObject* obj, [[maybe_unused]] CShader* pSH, [[maybe_unused]] int nTransFlags)
-{
-    assert(m_pRT->IsRenderThread());
-
-    m_ViewMatrix = (Matrix44A(obj->m_II.m_Matrix).GetTransposed() * m_CameraMatrix);
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-    pShaderThreadInfo->m_matView = m_ViewMatrix;
-}
-
-
-//==============================================================================
-// Shader Pipeline
-//=======================================================================
-
-void CD3D9Renderer::EF_SetFogColor(const ColorF& Color)
-{
-    const int nThreadID = m_pRT->GetThreadList();
-
-    m_uLastBlendFlagsPassGroup = PackBlendModeAndPassGroup();
-
-    m_RP.m_TI[nThreadID].m_FS.m_CurColor = Color;
-}
-
-// Set current texture color op modes (used in fixed pipeline shaders)
-void CD3D9Renderer::SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    m_pRT->RC_SetColorOp(eCo, eAo, eCa, eAa);
-}
-
-void CD3D9Renderer::EF_SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa)
-{
-    const int nThreadID = m_pRT->GetThreadList();
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[nThreadID]);
-
-    if (eCo != 255 && pShaderThreadInfo->m_eCurColorOp != eCo)
-    {
-        pShaderThreadInfo->m_eCurColorOp = eCo;
-        pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-    }
-    if (eAo != 255 && pShaderThreadInfo->m_eCurAlphaOp != eAo)
-    {
-        pShaderThreadInfo->m_eCurAlphaOp = eAo;
-        pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-    }
-    if (eCa != 255 && pShaderThreadInfo->m_eCurColorArg != eCa)
-    {
-        pShaderThreadInfo->m_eCurColorArg = eCa;
-        pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-    }
-    if (eAa != 255 && pShaderThreadInfo->m_eCurAlphaArg != eAa)
-    {
-        pShaderThreadInfo->m_eCurAlphaArg = eAa;
-        pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-    }
-}
-
-// Set whether fixed pipeline shaders should convert linear color space to sRGB on write
-void CD3D9Renderer::SetSrgbWrite(bool srgbWrite)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    m_pRT->RC_SetSrgbWrite(srgbWrite);
-}
-
-void CD3D9Renderer::EF_SetSrgbWrite(bool sRGBWrite)
-{
-    const int nThreadID = m_pRT->GetThreadList();
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[nThreadID]);
-
-    if (pShaderThreadInfo->m_sRGBWrite != sRGBWrite)
-    {
-        pShaderThreadInfo->m_sRGBWrite = sRGBWrite;
-        pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-    }
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DRENDPIPELINE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DRendPipeline_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-// <DEPRECATED>
-void CD3D9Renderer::CopyFramebufferDX11(CTexture* pDst, ID3D11Resource* pSrcResource, D3DFormat srcFormat)
-{
-    // Simulated texture copy to overcome the format dismatch issue for texture-blit.
-    // TODO: use partial update.
-    CShader* pShader = CShaderMan::s_shPostEffects;
-    static CCryNameTSCRC techName("TextureToTexture");
-    pShader->FXSetTechnique(techName);
-
-    // Try get the pointer to the actual backbuffer
-    ID3D11Texture2D* pBackBufferTex = (ID3D11Texture2D*)pSrcResource;
-
-    // create the shader res view on the fly
-    D3DShaderResourceView* shaderResView;   // released at the end of this func
-    D3D11_SHADER_RESOURCE_VIEW_DESC svDesc;
-    ZeroStruct(svDesc);
-    svDesc.Format = srcFormat;
-    svDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-    svDesc.Texture2D.MipLevels = 1;
-    svDesc.Texture2D.MostDetailedMip = 0;
-    HRESULT hr;
-    if (!SUCCEEDED(hr = GetDevice().CreateShaderResourceView(pBackBufferTex, &svDesc, &shaderResView)))
-    {
-        iLog->LogError("Creating shader resource view has failed.  Code: %d", hr);
-    }
-
-    // render
-    uint32 nPasses = 0;
-    pShader->FXBegin(&nPasses, FEF_DONTSETTEXTURES);
-    FX_PushRenderTarget(0, pDst, NULL);
-    ID3D11RenderTargetView* pNullRTV = NULL;
-    GetDeviceContext().OMSetRenderTargets(1, &pNullRTV, NULL);
-    pShader->FXBeginPass(0);
-    FX_SetState(GS_NODEPTHTEST);
-
-    // Set shader resource
-    m_DevMan.BindSRV(eHWSC_Pixel, shaderResView, 0);
-
-    // Set sampler state:
-    int tsIdx = CTexture::GetTexState(STexState(FILTER_LINEAR, true));  // get the sampler state cache line index
-    ID3D11SamplerState* linearSampler = static_cast<ID3D11SamplerState*> (CTexture::s_TexStates[tsIdx].m_pDeviceState);
-    m_DevMan.BindSampler(eHWSC_Pixel, &linearSampler, 0, 1);
-    SPostEffectsUtils::DrawFullScreenTri(pDst->GetWidth(), pDst->GetHeight());
-    // unbind backbuffer:
-    D3DShaderResourceView* pNullSTV = NULL;
-    m_DevMan.BindSRV(eHWSC_Pixel, pNullSTV, 0);
-    CTexture::s_TexStages[0].m_DevTexture = NULL;
-
-    pShader->FXEndPass();
-    FX_PopRenderTarget(0);
-    pShader->FXEnd();
-
-    GetDeviceContext(); // explicit flush as temp target gets released in next line
-    SAFE_RELEASE(shaderResView);
-}
-#endif
-
-// <DEPRECATED> This function must be refactored post C3
-void CD3D9Renderer::FX_ScreenStretchRect(CTexture* pDst, CTexture* pHDRSrc)
-{
-    PROFILE_LABEL_SCOPE("SCREEN_STRETCH_RECT");
-    if (CTexture::IsTextureExist(pDst))
-    {
-        int iTempX, iTempY, iWidth, iHeight;
-        gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-        uint64 nPrevFlagsShaderRT = gRenDev->m_RP.m_FlagsShader_RT;
-        gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-        {
-            // update scene target before using it for water rendering
-            CDeviceTexture* pDstResource = pDst->GetDevTexture();
-            ID3D11RenderTargetView* pOrigRT = m_pNewTarget[0]->m_pTarget;
-            ID3D11Resource* pSrcResource;
-
-            // This is a subrect to subrect copy with no resolving or stretching
-            D3D11_BOX box;
-            ZeroStruct(box);
-            box.right = pDst->GetWidth();
-            box.bottom = pDst->GetHeight();
-            box.back = 1;
-
-            //Allow for scissoring to happen
-            int sX, sY, sWdt, sHgt;
-            if (EF_GetScissorState(sX, sY, sWdt, sHgt))
-            {
-                box.left = sX;
-                box.right = sX + sWdt;
-                box.top = sY;
-                box.bottom = sY + sHgt;
-
-                // Align the RECT boundaries to GPU memory layout
-                box.left = box.left & 0xfffffff8;
-                box.top = box.top & 0xfffffff8;
-                box.right = min((int)((box.right + 8) & 0xfffffff8), iWidth);
-                box.bottom = min((int)((box.bottom + 8) & 0xfffffff8), iHeight);
-            }
-
-            D3D11_RENDER_TARGET_VIEW_DESC backbufferDesc;
-            if (pOrigRT)
-            {
-                pOrigRT->GetResource(&pSrcResource);
-                pOrigRT->GetDesc(&backbufferDesc);
-                if (backbufferDesc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DMS || pHDRSrc)
-                {
-                    // No API side for ResolveSubresourceRegion from MS target to non-ms. Need to perform custom resolve step
-                    if ((CTexture::s_ptexSceneTarget && (CTexture::s_ptexHDRTarget || pHDRSrc) && CTexture::s_ptexCurrentSceneDiffuseAccMap))
-                    {
-                        if (backbufferDesc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DMS)
-                        {
-                            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-                        }
-
-                        CTexture* pHDRTarget = pHDRSrc ? pHDRSrc : CTexture::s_ptexHDRTarget;
-                        pHDRTarget->SetResolved(true);
-
-                        FX_PushRenderTarget(0, pDst, 0);
-                        FX_SetActiveRenderTargets();
-
-                        RT_SetViewport(0, 0, pDst->GetWidth(), pDst->GetHeight());
-
-                        static CCryNameTSCRC pTechName("TextureToTexture");
-                        SPostEffectsUtils::ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                        FX_SetState(GS_NODEPTHTEST);
-
-                        pHDRTarget->Apply(0, CTexture::GetTexState(STexState(FILTER_POINT, true)), EFTT_UNKNOWN, -1, m_RP.m_MSAAData.Type ? SResourceView::DefaultViewMS : SResourceView::DefaultView);
-
-                        SPostEffectsUtils::DrawFullScreenTri(pDst->GetWidth(), pDst->GetHeight());
-                        SPostEffectsUtils::ShEndPass();
-
-                        // Restore previous viewport
-                        FX_PopRenderTarget(0);
-                        RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-                        pHDRTarget->SetResolved(false);
-                    }
-                    else
-                    {
-                        GetDeviceContext().ResolveSubresource(pDstResource->Get2DTexture(), 0, pSrcResource, 0, backbufferDesc.Format);
-                    }
-                }
-                else
-                {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DRENDPIPELINE_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DRendPipeline_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-                    // Check if the format match (or the copysubregionresource call would fail)
-                    const D3DFormat dstFmt = CTexture::DeviceFormatFromTexFormat(pDst->GetDstFormat());
-                    const D3DFormat srcFmt = backbufferDesc.Format;
-                    if (dstFmt == srcFmt)
-                    {
-#   if !defined(_RELEASE)
-                        D3D11_RESOURCE_DIMENSION type;
-                        pSrcResource->GetType(&type);
-                        if (type != D3D11_RESOURCE_DIMENSION_TEXTURE2D)
-                        {
-                            __debugbreak();
-                        }
-#endif
-                        ID3D11Texture2D* pSrcTex2D = (ID3D11Texture2D*)pSrcResource;
-                        D3D11_TEXTURE2D_DESC srcTex2desc;
-                        pSrcTex2D->GetDesc(&srcTex2desc);
-
-                        box.left = min(box.left, srcTex2desc.Width);
-                        box.right = min(box.right, srcTex2desc.Width);
-                        box.top = min(box.top, srcTex2desc.Height);
-                        box.bottom = min(box.bottom, srcTex2desc.Height);
-
-                        GetDeviceContext().CopySubresourceRegion(pDstResource->Get2DTexture(), 0, box.left, box.top, 0, pSrcResource, 0, &box);
-                    }
-                    else
-                    {
-                        // deal with format mismatch case:
-                        EF_Scissor(false, 0, 0, 0, 0); // TODO: optimize. dont use full screen pass.
-                        CopyFramebufferDX11(pDst, pSrcResource, backbufferDesc.Format);
-                        EF_Scissor(true, sX, sY, sWdt, sHgt);
-                    }
-#endif
-                }
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DRENDPIPELINE_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(D3DRendPipeline_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-                SAFE_RELEASE(pSrcResource);
-#endif
-            }
-        }
-
-        gRenDev->m_RP.m_FlagsShader_RT = nPrevFlagsShaderRT;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_SkinRendering(bool bEnable)
-{
-    if (bEnable)
-    {
-        FX_ScreenStretchRect(CTexture::s_ptexCurrentSceneDiffuseAccMap, CTexture::s_ptexHDRTarget);
-
-        RT_SetViewport(0, 0, CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-    }
-    else
-    {
-        FX_ResetPipe();
-        gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-    }
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::FX_ProcessSkinRenderLists(int nList, void(* RenderFunc)(), bool bLighting)
-{
-    // Forward SSS completely disabled, except for the character editor where we just do a simple forward pass
-    if (m_RP.m_PersFlags2 & RBPF2_ALLOW_DEFERREDSHADING)
-    {
-        return;
-    }
-
-    const int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    const bool bUseDeferredSkin = ((m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS) && recursiveLevel <= 0) && CV_r_DeferredShadingDebug != 2 && CV_r_measureoverdraw == 0;
-
-    //if ((m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS) && nR <= 1) && CV_r_DeferredShadingDebug != 2)
-    {
-        uint32 nBatchMask = SRendItem::BatchFlags(nList, m_RP.m_pRLD);
-        if (nBatchMask & FB_SKIN)
-        {
-#ifdef DO_RENDERLOG
-            if (CV_r_log)
-            {
-                Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** Begin skin pass ***\n");
-            }
-#endif
-
-            {
-                PROFILE_LABEL_SCOPE("SKIN_GEN_PASS");
-
-                if (bUseDeferredSkin)
-                {
-                    m_RP.m_PersFlags2 |= RBPF2_SKIN;
-                }
-
-                FX_ProcessRenderList(nList, BEFORE_WATER, RenderFunc, bLighting);
-                FX_ProcessRenderList(nList, AFTER_WATER , RenderFunc, bLighting);
-
-                if (bUseDeferredSkin)
-                {
-                    m_RP.m_PersFlags2 &= ~RBPF2_SKIN;
-                }
-            }
-
-            if (bUseDeferredSkin)
-            {
-                PROFILE_LABEL_SCOPE("SKIN_APPLY_PASS");
-
-                FX_SkinRendering(true);
-
-                FX_ProcessRenderList(nList, BEFORE_WATER, RenderFunc, bLighting);
-                FX_ProcessRenderList(nList, AFTER_WATER , RenderFunc, bLighting);
-
-                FX_SkinRendering(false);
-            }
-
-#ifdef DO_RENDERLOG
-            if (CV_r_log)
-            {
-                Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** End skin pass ***\n");
-            }
-#endif
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::FX_ProcessEyeOverlayRenderLists(int nList, void(* RenderFunc)(), bool bLighting)
-{
-    int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    if ((m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS) && recursiveLevel <= 0)
-    {
-        int iTempX, iTempY, iWidth, iHeight;
-        gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-        PROFILE_LABEL_SCOPE("EYE_OVERLAY");
-
-        SDepthTexture* pCurrDepthBuffer = (gRenDev->m_RP.m_MSAAData.Type) ? &gcpRendD3D->m_DepthBufferOrigMSAA : &gcpRendD3D->m_DepthBufferOrig;
-
-        FX_PushRenderTarget(0, CTexture::s_ptexSceneDiffuse, pCurrDepthBuffer);
-
-        FX_ProcessRenderList(nList, BEFORE_WATER, RenderFunc, bLighting);
-        FX_ProcessRenderList(nList, AFTER_WATER , RenderFunc, bLighting);
-
-        FX_PopRenderTarget(0);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::FX_ProcessHalfResParticlesRenderList(int nList, void(* RenderFunc)(), bool bLighting)
-{
-    int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    if ((m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS) && recursiveLevel <= 0)
-    {
-        const int nums = m_RP.m_pRLD->m_nStartRI[1][nList];
-        if (m_RP.m_pRLD->m_nEndRI[1][nList] - nums > 0)
-        {
-            CRenderView::CurrentRenderView()->GetRenderItems(1, nList);
-            const bool bAlphaBased = CV_r_ParticlesHalfResBlendMode == 0;
-
-#ifdef DO_RENDERLOG
-            if (CV_r_log)
-            {
-                Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** Begin half res transparent pass ***\n");
-            }
-#endif
-
-            CTexture* pHalfResTarget = CTexture::s_ptexHDRTargetScaled[CV_r_ParticlesHalfResAmount];
-            assert(CTexture::IsTextureExist(pHalfResTarget));
-            if (CTexture::IsTextureExist(pHalfResTarget))
-            {
-                const int nHalfWidth = pHalfResTarget->GetWidth();
-                const int nHalfHeight = pHalfResTarget->GetHeight();
-
-                PROFILE_LABEL_SCOPE("TRANSP_HALF_RES_PASS");
-
-                // Get current viewport
-                int iTempX, iTempY, iWidth, iHeight;
-                GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-                FX_PushRenderTarget(0, pHalfResTarget, NULL);
-                FX_SetColorDontCareActions(0);
-                FX_ClearTarget(pHalfResTarget, Clr_Empty);
-                RT_SetViewport(0, 0, nHalfWidth, nHalfHeight);
-
-                m_RP.m_PersFlags2 |= RBPF2_HALFRES_PARTICLES;
-                const uint32 nOldForceStateAnd = m_RP.m_ForceStateAnd;
-                const uint32 nOldForceStateOr = m_RP.m_ForceStateOr;
-                m_RP.m_ForceStateOr = GS_NODEPTHTEST;
-                if (bAlphaBased)
-                {
-                    m_RP.m_ForceStateAnd = GS_BLSRC_SRCALPHA;
-                    m_RP.m_ForceStateOr |= GS_BLSRC_SRCALPHA_A_ZERO;
-                }
-                FX_ProcessRenderList(nList, AFTER_WATER, RenderFunc, bLighting);
-                m_RP.m_ForceStateAnd = nOldForceStateAnd;
-                m_RP.m_ForceStateOr = nOldForceStateOr;
-                m_RP.m_PersFlags2 &= ~RBPF2_HALFRES_PARTICLES;
-
-#if defined(CRY_USE_METAL)
-                //In metal Clear calls are cached until a draw call is made. If nothing is rendered do a manual clear
-                if (m_RP.m_RendNumVerts == 0)
-                {
-                    FX_Commit();
-                    FX_ClearTargetRegion();
-                }
-#endif
-
-                FX_PopRenderTarget(0);
-
-                {
-                    PROFILE_LABEL_SCOPE("UPSAMPLE_PASS");
-                    CTexture* pHalfResSrc = pHalfResTarget;
-                    CTexture* pZTarget = CTexture::s_ptexZTarget;
-                    CTexture* pZTargetScaled = CV_r_ParticlesHalfResAmount > 0 ? CTexture::s_ptexZTargetScaled2 : CTexture::s_ptexZTargetScaled;
-
-                    uint32 nStates = GS_NODEPTHTEST | GS_COLMASK_RGB;
-                    if (bAlphaBased)
-                    {
-                        nStates |= GS_BLSRC_ONE | GS_BLDST_SRCALPHA;
-                    }
-                    else
-                    {
-                        nStates |= GS_BLSRC_ONE | GS_BLDST_ONE;
-                    }
-
-                    RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-                    static const CCryNameTSCRC pTechNameNearestDepth("NearestDepthUpsample");
-                    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechNameNearestDepth, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-                    static CCryNameR pParam0Name("texToTexParams0");
-                    Vec4 vParam0(pZTarget->GetWidth(), pZTarget->GetHeight(), pZTargetScaled->GetWidth(), pZTargetScaled->GetHeight());
-                    CShaderMan::s_shPostEffects->FXSetPSFloat(pParam0Name, &vParam0, 1);
-
-                    PostProcessUtils().SetTexture(pHalfResSrc, 1, FILTER_LINEAR);
-                    PostProcessUtils().SetTexture(pZTarget, 2, FILTER_POINT);
-                    PostProcessUtils().SetTexture(pZTargetScaled, 3, FILTER_POINT);
-
-                    FX_SetState(nStates);
-                    PostProcessUtils().DrawFullScreenTri(m_width, m_height);
-
-                    PostProcessUtils().ShEndPass();
-                }
-            }
-
-#ifdef DO_RENDERLOG
-            if (CV_r_log)
-            {
-                Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** End half res transparent pass ***\n");
-            }
-#endif
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Checks if we need to enable velocity pass.
-bool CD3D9Renderer::IsVelocityPassEnabled() const
-{
-    bool takingScreenShot = (m_screenShotType != 0);
-    bool bUseMotionVectors = (CV_r_MotionBlur || (FX_GetAntialiasingType() & eAT_TEMPORAL_MASK) != 0) && CV_r_MotionVectors && (!takingScreenShot || CV_r_MotionBlurScreenShot);
-    return bUseMotionVectors && CV_r_MotionBlurGBufferVelocity;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Output g-buffer
-bool CD3D9Renderer::FX_ZScene(bool bEnable, bool bClearZBuffer, bool bRenderNormalsOnly, bool bZPrePass)
-{
-    AZ_TRACE_METHOD();
-
-    uint32 nDiffuseTargetID = 1;
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    if (bEnable)
-    {
-        pShaderThreadInfo->m_PersFlags |= RBPF_ZPASS;
-
-        int nStates = GS_DEPTHWRITE;
-        FX_SetState(nStates);
-
-        const int nWidth = m_MainViewport.nWidth;
-        const int nHeight = m_MainViewport.nHeight;
-        if (bClearZBuffer)
-        {
-            const float clearDepth = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 0.f : 1.f;
-            const uint clearStencil = 1;
-            RECT rect = { 0, 0, nWidth, nHeight };
-
-            // Stencil initialized to 1 - 0 is reserved for MSAAed samples
-            FX_ClearTarget(&m_DepthBufferOrigMSAA, CLEAR_ZBUFFER | CLEAR_STENCIL, clearDepth, clearStencil, 1, &rect, true);
-            m_nStencilMaskRef = 1;
-        }
-
-        m_RP.m_PersFlags2 |= RBPF2_NOALPHABLEND | (bZPrePass ? (RBPF2_ZPREPASS | RBPF2_DISABLECOLORWRITES) : RBPF2_NOALPHATEST);
-        m_RP.m_StateAnd &= ~(GS_BLEND_MASK | GS_ALPHATEST_MASK);
-        m_RP.m_StateAnd |= bZPrePass ? GS_ALPHATEST_MASK : 0;
-
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Start Z scene +++ \n");
-        }
-
-        // RTs resolves/restores occur in CD3D9Renderer::FX_GmemTransition(...)
-        if (FX_GetEnabledGmemPath(nullptr))
-        {
-            if (IsVelocityPassEnabled() && FX_GetEnabledGmemPath(nullptr) == CD3D9Renderer::eGT_128bpp_PATH )
-            {
-                m_RP.m_PersFlags2 |= RBPF2_MOTIONBLURPASS;
-            }
-            return true;
-        }
-
-        if (!CTexture::s_ptexZTarget
-            || CTexture::s_ptexZTarget->IsMSAAChanged()
-            || CTexture::s_ptexZTarget->GetDstFormat() != CTexture::s_eTFZ
-            || CTexture::s_ptexZTarget->GetWidth() != nWidth
-            || CTexture::s_ptexZTarget->GetHeight() != nHeight)
-        {
-            FX_Commit(); // Flush to unset the Z target before regenerating
-            CTexture::GenerateZMaps();
-        }
-
-        bool bClearRT = false;
-        bClearRT |= CV_r_wireframe != 0;
-        bClearRT |= !bRenderNormalsOnly;
-        static ICVar* skyBoxCVar = gEnv->pConsole->GetCVar("e_SkyBox");
-        bClearRT |= skyBoxCVar->GetIVal() == 0;
-        bClearRT |= m_clearBackground;
-        if (bClearRT)
-        {
-            EF_ClearTargetsLater(FRT_CLEAR_COLOR);
-            // If we don't have a skybox do a clear of the scene normal map. When
-            // we have a sky box every texel in the normal map is rendered to.
-            // But when the sky box is disabled then it is possible that left over
-            // data remains in the normal texture from previous passes and this
-            // causes rendering artifacts. The check for bClearZBuffer is used to
-            // make sure we clear the normal map only once and not twice per frame.
-            if (bClearZBuffer)
-            {
-                FX_ClearTarget(CTexture::s_ptexSceneNormalsMap);
-            }
-        }
-        FX_PushRenderTarget(0, CTexture::s_ptexSceneNormalsMap, &m_DepthBufferOrigMSAA, -1, true);
-
-        // CONFETTI BEGIN: David Srour
-        // Note that the GBUFFER cannot have don't care actions or
-        // it'll break deferred decals & other similar passes.
-        FX_SetColorDontCareActions(0, false, false);
-        // CONFETTI END
-
-#ifndef CRY_USE_METAL
-        if (!bZPrePass)
-#endif
-        {
-            FX_PushRenderTarget(nDiffuseTargetID, CTexture::s_ptexSceneDiffuse, NULL);
-
-            CTexture* pSceneSpecular = CTexture::s_ptexSceneSpecular;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DRENDPIPELINE_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(D3DRendPipeline_cpp)
-#endif
-            FX_PushRenderTarget(nDiffuseTargetID + 1, pSceneSpecular, NULL);
-
-            
-            FX_SetColorDontCareActions(nDiffuseTargetID, false, false);
-            FX_SetColorDontCareActions(nDiffuseTargetID + 1, false, false);
-
-            if (IsVelocityPassEnabled())
-            {
-                m_RP.m_PersFlags2 |= RBPF2_MOTIONBLURPASS;
-                FX_PushRenderTarget(nDiffuseTargetID + 2, GetUtils().GetVelocityObjectRT(), NULL);
-            }
-        }
-
-        RT_SetViewport(0, 0, nWidth, nHeight);
-
-        FX_SetActiveRenderTargets();
-    }
-    else if (pShaderThreadInfo->m_PersFlags & RBPF_ZPASS)
-    {
-        pShaderThreadInfo->m_PersFlags &= ~RBPF_ZPASS;
-
-        m_RP.m_PersFlags2 &= ~(RBPF2_NOALPHABLEND | RBPF2_NOALPHATEST | RBPF2_ZPREPASS | RBPF2_DISABLECOLORWRITES);
-        m_RP.m_StateAnd |= (GS_BLEND_MASK | GS_ALPHATEST_MASK);
-
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ End Z scene +++ \n");
-        }
-
-        // RTs resolves/restores occur in CD3D9Renderer::FX_GmemTransition(...)
-        if (FX_GetEnabledGmemPath(nullptr))
-        {
-            return true;
-        }
-
-        FX_PopRenderTarget(0);
-
-#ifndef CRY_USE_METAL
-        if (!bZPrePass)
-#endif
-        {
-            FX_PopRenderTarget(nDiffuseTargetID);
-            FX_PopRenderTarget(nDiffuseTargetID + 1);
-            if (m_RP.m_PersFlags2 & RBPF2_MOTIONBLURPASS)
-            {
-                FX_PopRenderTarget(nDiffuseTargetID + 2);
-                m_RP.m_PersFlags2 &= ~RBPF2_MOTIONBLURPASS;
-            }
-        }
-        if (bRenderNormalsOnly)
-        {
-            CTexture::s_ptexZTarget->Resolve();
-        }
-    }
-    else
-    {
-        if (!CV_r_usezpass)
-        {
-            CTexture::DestroyZMaps();
-        }
-    }
-
-    return true;
-}
-
-void CD3D9Renderer::FX_GmemTransition([[maybe_unused]] const EGmemTransitions transition)
-{
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-    /* Resources used during the GMEM render paths:
-     *
-     * CTexture::s_ptexSceneNormalsMap              // 32 bits
-     * CTexture::s_ptexSceneDiffuse                 // 32 bits
-     * CTexture::s_ptexSceneSpecular                // 32 bits
-     * CTexture::s_ptexGmemStenLinDepth             // 32 bits
-     * CTexture::s_ptexCurrentSceneDiffuseAccMap    // 64 bits
-     * CTexture::s_ptexSceneSpecularAccMap          // 64 bits
-     */
-
-    if (SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID] != 0)
-    {
-        return;
-    }
-
-    CTexture* gmemSceneTarget = CTexture::s_ptexSceneSpecularAccMap;
-
-    int const currentGmemPath = FX_GetEnabledGmemPath(nullptr);
-    assert(FX_GetEnabledGmemPath(nullptr));
-
-    // COMMON FUNCTIONS ///////////////////////////////////////////////////////////////////////////
-    auto UnbindGmemRts = [this](int const startRT, int const endRT)
-        {
-            assert(startRT  >= 0 &&
-                endRT    >= 0 &&
-                startRT  <= 5 &&
-                endRT    <= 5 &&
-                startRT  <= endRT);
-
-            for (auto rt = startRT; rt <= endRT; rt++)
-            {
-                FX_PopRenderTarget(rt);
-            }
-        };
-
-    auto BindGBufferRts = [this, gmemSceneTarget](int currentGmemPath, int* outVelocityRT, int* outDepthStencilRT, bool forceLoad = false)
-    {
-        /* Bind RTs
-        *
-        * 256bpp:
-        * (0) Specular L-Buffer (used as scene-target during GMEM sections)
-        * (1) Diffuse
-        * (2) Spec
-        * (3) Stencil / Linear Depth
-        * (4) Diffuse L-Buffer
-        * (5) Normals
-        *
-        * 128bpp:
-        * (0) Normals
-        * (1) Diffuse
-        * (2) Spec
-        * (3) Stencil / Linear Depth
-        */
-        const int invalidRT = -1;
-        const int defaultDepthRT = 3;
-        const int maxGmemRTCount = 6;
-
-        int velocityBufferRT = invalidRT;
-        int depthStencilRT = defaultDepthRT;
-        AZStd::vector<bool> dontCareColorLoad;
-        AZStd::vector<bool> dontCareColorSave;
-        AZStd::vector<bool> dontCareDepthStencilLoad = { false, false };
-        AZStd::vector<bool> dontCareDepthStencilSave = { false, false };
-
-        dontCareColorLoad.reserve(maxGmemRTCount);
-        dontCareColorSave.reserve(maxGmemRTCount);
-        if (eGT_256bpp_PATH == currentGmemPath)
-        {
-            FX_PushRenderTarget(0, gmemSceneTarget, &m_DepthBufferOrigMSAA, -1, true);
-            FX_PushRenderTarget(1, CTexture::s_ptexSceneDiffuse, NULL);
-            FX_PushRenderTarget(2, CTexture::s_ptexSceneSpecular, NULL);
-            FX_PushRenderTarget(3, CTexture::s_ptexGmemStenLinDepth, NULL);
-            FX_PushRenderTarget(4, CTexture::s_ptexCurrentSceneDiffuseAccMap, NULL);
-            FX_PushRenderTarget(5, CTexture::s_ptexSceneNormalsMap, NULL);
-
-            dontCareColorLoad = { true,  true, true, true,  true, true };
-            dontCareColorSave = { false, true, true, false, true, true };
-        }
-        else if (eGT_128bpp_PATH == currentGmemPath)
-        {
-            FX_PushRenderTarget(0, CTexture::s_ptexSceneNormalsMap, &m_DepthBufferOrigMSAA, -1, true);
-            FX_PushRenderTarget(1, CTexture::s_ptexSceneDiffuse, NULL);
-            FX_PushRenderTarget(2, CTexture::s_ptexSceneSpecular, NULL);
-
-            dontCareColorLoad = { true,  true, true, true };
-            dontCareColorSave = { false, false, false, false };
-
-            if (IsVelocityPassEnabled())
-            {
-                if (RenderCapabilities::SupportsRenderTargets(s_gmemLargeRTCount))
-                {
-                    dontCareColorLoad.resize(5);
-                    dontCareColorSave.resize(5);
-                    depthStencilRT = 3;
-                    velocityBufferRT = 4;
-                }
-                else
-                {
-                    depthStencilRT = -1;
-                    velocityBufferRT = 3;
-                }
-            }
-
-            if (velocityBufferRT != invalidRT)
-            {
-                FX_PushRenderTarget(velocityBufferRT, GetUtils().GetVelocityObjectRT(), NULL);
-                dontCareColorLoad[velocityBufferRT] = true;
-                dontCareColorSave[velocityBufferRT] = false;
-            }
-
-            if (depthStencilRT != invalidRT)
-            {
-                FX_PushRenderTarget(depthStencilRT, CTexture::s_ptexGmemStenLinDepth, NULL);
-                dontCareColorLoad[depthStencilRT] = true;
-                dontCareColorSave[depthStencilRT] = false;
-            }
-        }
-
-        if (forceLoad)
-        {
-            std::fill(dontCareColorLoad.begin(), dontCareColorLoad.end(), false);
-            std::fill(dontCareDepthStencilLoad.begin(), dontCareDepthStencilLoad.end(), false);
-        }
-
-        for (int i = 0; i < dontCareColorLoad.size(); ++i)
-        {
-            FX_SetColorDontCareActions(i, dontCareColorLoad[i], dontCareColorSave[i]);
-        }
-
-        FX_SetDepthDontCareActions(0, dontCareDepthStencilLoad[0], dontCareDepthStencilSave[0]);
-        FX_SetStencilDontCareActions(0, dontCareDepthStencilLoad[1], dontCareDepthStencilSave[1]);
-        
-        if (outVelocityRT)
-        {
-            *outVelocityRT = velocityBufferRT;
-        }
-
-        if (outDepthStencilRT)
-        {
-            *outDepthStencilRT = depthStencilRT;
-        }
-    };
-
-    auto ProcessPassesThatDontFitGMEM = [this](bool const linearizeDepth, bool const downsampleDepth, bool const deferredPasses)
-        {
-            if (linearizeDepth)
-            {
-                FX_LinearizeDepth(CTexture::s_ptexGmemStenLinDepth);
-            }
-
-            if (downsampleDepth)
-            {
-                GetUtils().DownsampleDepth(CTexture::s_ptexGmemStenLinDepth, CTexture::s_ptexZTargetScaled, true);
-                GetUtils().DownsampleDepth(CTexture::s_ptexZTargetScaled, CTexture::s_ptexZTargetScaled2, true);
-                static ICVar* checkOcclusion = gEnv->pConsole->GetCVar("e_CheckOcclusion");
-                if(checkOcclusion->GetIVal())
-                {
-                    //Downsample to the occlusion buffer dimensions
-                    GetUtils().DownsampleDepth(CTexture::s_ptexZTargetScaled2, m_occlusionData[m_occlusionBufferIndex].m_zTargetReadback, true);
-                }
-            }
-
-            if (deferredPasses)
-            {
-                CDeferredShading::Instance().DirectionalOcclusionPass();
-                CDeferredShading::Instance().ScreenSpaceReflectionPass();
-            }
-        };
-
-    auto ResetGMEMDontCareActions = [this](int const endRT)
-        {
-            assert(endRT >= 0);
-
-            for (auto rt = 0; rt <= endRT; rt++)
-            {
-                FX_SetColorDontCareActions(rt, false, false);
-            }
-
-            FX_SetDepthDontCareActions(0, false, false);
-            FX_SetStencilDontCareActions(0, false, false);
-        };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////
-
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    switch (transition)
-    {
-    case eGT_PRE_Z:
-    {
-        // Setup deferred renderer's lights and shadows for GMEM path
-        assert(CDeferredShading::IsValid());
-        if (IsShadowPassEnabled())
-        {
-            CDeferredShading::Instance().SetupGmemPath();
-        }
-
-        RT_SetViewport(0, 0, m_MainViewport.nWidth, m_MainViewport.nHeight);
-        int velocityRT, depthStencilRT;
-        BindGBufferRts(currentGmemPath, &velocityRT, &depthStencilRT);
-
-        // Clear depth stencil
-        EF_ClearTargetsImmediately(FRT_CLEAR_DEPTH | FRT_CLEAR_STENCIL, 1.0f, 1);
-        m_nStencilMaskRef = 1;
-
-        // Custom clear GMEM G-Buffer if requested
-        if (depthStencilRT >= 0)
-        {
-            if (CRenderer::CV_r_ClearGMEMGBuffer == 1)
-            {
-                PROFILE_LABEL_SCOPE("GMEM G-BUFFER CLEAR");
-                FX_SetState(GS_NODEPTHTEST | GS_COLMASK_RGB | GS_BLSRC_ONE | GS_BLDST_ZERO);
-                RT_SetViewport(0, 0, m_MainViewport.nWidth, m_MainViewport.nHeight);
-                PostProcessUtils().ClearGmemGBuffer();
-            }
-            else if (CRenderer::CV_r_ClearGMEMGBuffer == 2)
-            {
-                //Linear depth is set to be cleared to 1.0f. x (linear depth) = 1, y(stencil id) = 0.
-                FX_SetColorDontCareActions(depthStencilRT, false, false);
-                FX_ClearTarget(CTexture::s_ptexGmemStenLinDepth, ColorF(1.000f, 0.000f, 0.000f));
-
-                if (velocityRT > 0)
-                {
-                    // Clear out the velocity buffer to half2(1.0, 1.0)
-                    FX_SetColorDontCareActions(velocityRT, false, false);
-                    FX_ClearTarget(GetUtils().GetVelocityObjectRT(), Clr_White);
-                }
-            }
-        }
-
-        break;
-    }
-    case eGT_POST_GBUFFER:
-    {
-        if (FX_GmemGetDepthStencilMode() == eGDSM_Texture)
-        {
-            // Since we can't fetch the depth/stencil from the buffer we need to linearize it now.
-            // The linearized depth is used by the deferred decal, snow and rain passes.
-            // This will flush the Gbuffer out.
-            int renderTargetsToUnbind = IsVelocityPassEnabled() && RenderCapabilities::SupportsRenderTargets(s_gmemLargeRTCount) ? 4 : 3;
-            UnbindGmemRts(0, renderTargetsToUnbind);
-            ProcessPassesThatDontFitGMEM(true, true, false);
-            BindGBufferRts(currentGmemPath, nullptr, nullptr, true);
-        }
-        break;
-    }
-    case eGT_POST_Z_PRE_DEFERRED:
-    {
-        /* Resolve RTs for 128bpp path.
-         *
-         * Bind RTs
-         * 128bpp:
-         * (0) Specular L-Buffer (used as scene-target during GMEM sections)
-         * (1) Diffuse L-Buffer
-         */
-        if (eGT_128bpp_PATH == currentGmemPath)
-        {
-            int renderTargetsToUnbind = IsVelocityPassEnabled() && RenderCapabilities::SupportsRenderTargets(s_gmemLargeRTCount) ? 4 : 3;
-           
-            ResetGMEMDontCareActions(renderTargetsToUnbind);
-            UnbindGmemRts(0, renderTargetsToUnbind);
-
-            EGmemDepthStencilMode depthStencilMode = FX_GmemGetDepthStencilMode();
-            ProcessPassesThatDontFitGMEM(depthStencilMode == eGDSM_DepthStencilBuffer, depthStencilMode != eGDSM_Texture, true);
-
-            // Bind RTs
-            FX_PushRenderTarget(s_gmemRendertargetSlots[currentGmemPath][eGT_SpecularLight], gmemSceneTarget, &m_DepthBufferOrigMSAA, -1, true);
-            FX_SetColorDontCareActions(s_gmemRendertargetSlots[currentGmemPath][eGT_SpecularLight], true, false);
-
-            // Don't push more than 1 RT if using PLS extension
-            if (!RenderCapabilities::SupportsPLSExtension())
-            {
-                FX_PushRenderTarget(s_gmemRendertargetSlots[currentGmemPath][eGT_DiffuseLight], CTexture::s_ptexCurrentSceneDiffuseAccMap, NULL);
-                FX_SetColorDontCareActions(s_gmemRendertargetSlots[currentGmemPath][eGT_DiffuseLight], true, false);
-            }
-            else
-            {
-                FX_TogglePLS(true);
-            }
-
-            FX_SetDepthDontCareActions(0, false, false);
-            FX_SetStencilDontCareActions(0, false, false);
-        }
-        break;
-    }
-    case eGT_POST_DEFERRED_PRE_FORWARD:
-    {
-        ResetGMEMDontCareActions(eGT_256bpp_PATH == currentGmemPath ? 5 : 1);
-
-        // Unbind all but the scene target
-        // Scene target already bound if using PLS... just need to toggle PLS off
-        if (RenderCapabilities::SupportsPLSExtension())
-        {
-            FX_TogglePLS(false);
-        }
-        else
-        {
-            UnbindGmemRts(1, eGT_256bpp_PATH == currentGmemPath ? 5 : 1);
-        }
-
-        if (eGT_256bpp_PATH == currentGmemPath)
-        {
-            ProcessPassesThatDontFitGMEM(false, true, false);
-        }
-        break;
-    }
-    case eGT_POST_AW_TRANS_PRE_POSTFX:
-    {
-        // Unbind scene target
-        UnbindGmemRts(0, 0);
-
-        // TODO: Behavior for HDR/PostFX passes
-        break;
-    }
-    default:
-        CRY_ASSERT(0);
-        break;
-    }
-
-    FX_SetActiveRenderTargets();
-#endif
-}
-
-CD3D9Renderer::EGmemPath CD3D9Renderer::FX_GetEnabledGmemPath(CD3D9Renderer::EGmemPathState* const gmemPathStateOut) const
-{
-    // Using local statics since this check should only be done once per run-time
-    static EGmemPath enabledPath = eGT_REGULAR_PATH;
-    static EGmemPathState gmemState = eGT_OK;
-
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-    static bool enabledGmemPathAlreadyChecked = false;
-
-    if (!enabledGmemPathAlreadyChecked)
-    {
-        switch (CRenderer::CV_r_EnableGMEMPath)
-        {
-        case eGT_REGULAR_PATH:
-            break;
-        case eGT_256bpp_PATH:
-        {
-            // Does device support this path?
-            if (!RenderCapabilities::Supports256bppGmemPath())
-            {
-                gmemState = eGT_DEV_UNSUPPORTED;
-
-                // Check if device supports 128bpp path instead
-                if (RenderCapabilities::Supports128bppGmemPath())
-                {
-                    enabledPath = eGT_128bpp_PATH;
-                }
-            }
-            // Check for unsupported rendering features on this path otherwise
-            else if (CRenderer::CV_r_ssdo || CRenderer::CV_r_SSReflections ||
-                     CRenderer::CV_r_MotionBlur > 0 || (FX_GetAntialiasingType() & eAT_TEMPORAL_MASK) != 0)
-            {
-                // Force 128bpp path
-                gmemState = eGT_FEATURES_UNSUPPORTED;
-                enabledPath = eGT_128bpp_PATH;
-            }
-            else
-            {
-                enabledPath = eGT_256bpp_PATH;
-            }
-            break;
-        }
-        case eGT_128bpp_PATH:
-        {
-            // Does device support this path?
-            if (!RenderCapabilities::Supports128bppGmemPath())
-            {
-                gmemState = eGT_DEV_UNSUPPORTED;
-            }
-            else
-            {
-                enabledPath = eGT_128bpp_PATH;
-            }
-            break;
-        }
-        default:
-            CRY_ASSERT(0);
-            break;
-        }
-
-        enabledGmemPathAlreadyChecked = true;
-    }
-#endif
-
-    if (gmemPathStateOut)
-    {
-        *gmemPathStateOut = gmemState;
-    }
-
-    return enabledPath;
-}
-
-CD3D9Renderer::EGmemDepthStencilMode CD3D9Renderer::FX_GmemGetDepthStencilMode() const
-{
-    if (m_gmemDepthStencilMode == eGDSM_Invalid)
-    {
-        switch (FX_GetEnabledGmemPath(nullptr))
-        {
-        case eGT_256bpp_PATH:
-            m_gmemDepthStencilMode = eGDSM_RenderTarget;
-            break;
-        case eGT_128bpp_PATH:
-        {
-            bool hasEnoughRTs = true;
-#if defined(OPENGL_ES) || defined(CRY_USE_METAL)
-            hasEnoughRTs &= RenderCapabilities::SupportsRenderTargets(s_gmemLargeRTCount);
-#endif
-            if (IsVelocityPassEnabled() && !hasEnoughRTs)
-            {
-                m_gmemDepthStencilMode = RenderCapabilities::GetFrameBufferFetchCapabilities().test(RenderCapabilities::FBF_DEPTH) ? eGDSM_DepthStencilBuffer : eGDSM_Texture;
-            }
-            else
-            {
-                m_gmemDepthStencilMode = eGDSM_RenderTarget;
-            }
-            break;
-        }
-        default:
-            m_gmemDepthStencilMode = eGDSM_Texture;
-            break;
-        }
-    }
-
-    return m_gmemDepthStencilMode;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::FX_RenderForwardOpaque(void(* RenderFunc)(), const bool bLighting, [[maybe_unused]] const bool bAllowDeferred)
-{
-    if (FX_GetEnabledGmemPath(nullptr))
-    {
-#ifdef SUPPORTS_MSAA
-        // Not supported in GMEM path
-        CRY_ASSERT(0);
-#endif
-    }
-
-    // Note: MSAA for deferred lighting requires extra pass using per-sample frequency for tagged undersampled regions
-    //  for future: this could be avoided (while maintaining current architecture), by using MRT output then a composite step
-    int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    if (!FX_GetEnabledGmemPath(nullptr)) // Can't reclear buffers during GMEM path
-    {
-        if IsCVarConstAccess(constexpr) (CV_r_measureoverdraw == 4)
-        {
-            SetClearColor(Vec3_Zero);
-            EF_ClearTargetsLater(FRT_CLEAR_COLOR, Clr_Empty);
-        }
-    }
-
-    PROFILE_LABEL_SCOPE("OPAQUE_PASSES");
-
-    m_RP.m_depthWriteStateUsed = false;
-
-    const bool bShadowGenSpritePasses = (pShaderThreadInfo->m_PersFlags & (RBPF_SHADOWGEN)) != 0;
-
-    if ((m_RP.m_PersFlags2 & RBPF2_ALLOW_DEFERREDSHADING) && !bShadowGenSpritePasses && recursiveLevel == 0 && !m_wireframe_mode)
-    {
-        m_RP.m_PersFlags2 |= RBPF2_FORWARD_SHADING_PASS;
-    }
-
-    if (!FX_GetEnabledGmemPath(nullptr))
-    {
-        // This unbinds/binds new RTs which isn't supported in GMEM path.
-        // TODO: rework FX_ProcessEyeOverlayRenderLists() for GMEM
-        if (!bShadowGenSpritePasses)
-        {
-            // Note: Eye overlay writes to diffuse color buffer for eye shader reading
-            PROFILE_PS_TIME_SCOPE(fTimeDIPs[EFSLIST_EYE_OVERLAY]);
-            FX_ProcessEyeOverlayRenderLists(EFSLIST_EYE_OVERLAY, RenderFunc, bLighting);
-        }
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("GENERAL");
-        PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_GENERAL], !bShadowGenSpritePasses);
-
-        GetTiledShading().BindForwardShadingResources(NULL);
-
-        FX_ProcessRenderList(EFSLIST_GENERAL, BEFORE_WATER, RenderFunc, bLighting);
-        FX_ProcessRenderList(EFSLIST_GENERAL, AFTER_WATER , RenderFunc, bLighting);
-
-        GetTiledShading().UnbindForwardShadingResources();
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("FORWARD_DECALS");
-        PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_DECAL], !bShadowGenSpritePasses);
-
-        FX_ProcessRenderList(EFSLIST_DECAL, BEFORE_WATER, RenderFunc, bLighting);
-        FX_ProcessRenderList(EFSLIST_DECAL, AFTER_WATER , RenderFunc, bLighting);
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("DEFERRED_EMISSIVE_DECALS");
-        FX_DeferredDecalsEmissive();
-    }
-
-    if (!FX_GetEnabledGmemPath(nullptr)) // not supported in GMEM path as it resolves buffers
-    {
-        if (!bShadowGenSpritePasses)
-        {
-            // Note: Do not swap render order with decals it breaks light acc buffer.
-            //  -   PC could actually work via accumulation into light acc target
-            {
-                PROFILE_PS_TIME_SCOPE(fTimeDIPs[EFSLIST_SKIN]);
-                FX_ProcessSkinRenderLists(EFSLIST_SKIN, RenderFunc, bLighting);
-            }
-        }
-    }
-
-    if (CRenderer::CV_r_FurFinPass != 0)
-    {
-        FurPasses::GetInstance().ExecuteFinPass();
-    }
-
-    if (m_RP.m_depthWriteStateUsed && !FX_GetEnabledGmemPath(nullptr))
-    {
-        // If any forward opaque passes wrote depth, recapture linear depth for upcoming passes such as fog
-        FX_LinearizeDepth(CTexture::s_ptexZTarget);
-    }
-
-    m_RP.m_PersFlags2 &= ~RBPF2_FORWARD_SHADING_PASS;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::FX_RenderFog()
-{
-    PROFILE_PS_TIME_SCOPE(fTimeDIPsDeferredLayers);
-
-    FX_ResetPipe();
-    FX_FogScene();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-inline static float expf_s(float arg)
-{
-    return expf(clamp_tpl(arg, -80.0f, 80.0f));
-}
-
-inline static float MaxChannel(const Vec4& col)
-{
-    return max(max(col.x, col.y), col.z);
-}
-
-bool CD3D9Renderer::FX_FogScene()
-{
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Fog scene +++ \n");
-    }
-    m_RP.m_PersFlags2 &= ~(RBPF2_NOSHADERFOG);
-
-    FX_SetVStream(3, NULL, 0, 0);
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    if (pShaderThreadInfo->m_FS.m_bEnable && CV_r_usezpass)
-    {
-        PROFILE_SHADER_SCOPE;
-        PROFILE_LABEL_SCOPE("FOG_GLOBAL");
-
-        int x = 0, y = 0, width = GetWidth(), height = GetHeight();
-
-        m_pNewTarget[0]->m_ClearFlags = 0;
-        RT_SetViewport(x, y, width, height);
-
-        CShader* pSH = CShaderMan::s_shHDRPostProcess;
-
-        float modelMatrix[16];
-        float projMatrix[16];
-        int viewport[4] = { x, y, width, height };
-        GetModelViewMatrix(modelMatrix);
-        GetProjectionMatrix(projMatrix);
-
-        Vec3 vFarPlaneVerts[4];
-        const float fFar = (pShaderThreadInfo->m_PersFlags & RBPF_REVERSE_DEPTH) ? 0.0f : 1.0f;
-        UnProject(width, height, fFar, &vFarPlaneVerts[0].x, &vFarPlaneVerts[0].y, &vFarPlaneVerts[0].z, modelMatrix, projMatrix, viewport);
-        UnProject(0, height, fFar, &vFarPlaneVerts[1].x, &vFarPlaneVerts[1].y, &vFarPlaneVerts[1].z, modelMatrix, projMatrix, viewport);
-        UnProject(0, 0, fFar, &vFarPlaneVerts[2].x, &vFarPlaneVerts[2].y, &vFarPlaneVerts[2].z, modelMatrix, projMatrix, viewport);
-        UnProject(width, 0, fFar, &vFarPlaneVerts[3].x, &vFarPlaneVerts[3].y, &vFarPlaneVerts[3].z, modelMatrix, projMatrix, viewport);
-
-        const float camZFar = GetCamera().GetFarPlane();
-        const Vec3 camPos = GetCamera().GetPosition();
-        const Vec3 camDir = GetCamera().GetViewdir();
-
-        const Vec3 vRT = vFarPlaneVerts[0] - camPos;
-        const Vec3 vLT = vFarPlaneVerts[1] - camPos;
-        const Vec3 vLB = vFarPlaneVerts[2] - camPos;
-        const Vec3 vRB = vFarPlaneVerts[3] - camPos;
-
-        const uint64 nFlagsShaderRTSave = m_RP.m_FlagsShader_RT;
-
-        //////////////////////////////////////////////////////////////////////////
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-        const bool renderFogShadow = m_bVolFogShadowsEnabled && (CV_r_VolumetricFog == 0);
-
-        Vec4 volFogShadowRange;
-        {
-            Vec3 volFogShadowRangeP;
-            gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_RANGE, volFogShadowRangeP);
-            volFogShadowRangeP.x = clamp_tpl(volFogShadowRangeP.x, 0.01f, 1.0f);
-            volFogShadowRange = Vec4(volFogShadowRangeP.x, 1.0f / volFogShadowRangeP.x, 0, 0);
-        }
-
-        if (renderFogShadow)
-        {
-            // Recreate render targets if quality was changed
-            bool halfRes = (CV_r_FogShadows == 1), quarterRes = (CV_r_FogShadows == 2);
-            if ((halfRes && CTexture::s_ptexVolFogShadowBuf[0]->GetWidth() != GetWidth() / 2) ||
-                (quarterRes && CTexture::s_ptexVolFogShadowBuf[0]->GetWidth() != GetWidth() / 4))
-            {
-                uint32 width2 = GetWidth() / (halfRes ? 2 : 4);
-                uint32 height2 = GetHeight() / (halfRes ? 2 : 4);
-                for (uint32 i = 0; i < 2; ++i)
-                {
-                    ETEX_Format fmt = CTexture::s_ptexVolFogShadowBuf[i]->GetDstFormat();
-                    CTexture::s_ptexVolFogShadowBuf[i]->Invalidate(width2, height2, fmt);
-                    CTexture::s_ptexVolFogShadowBuf[i]->CreateRenderTarget(fmt, Clr_Transparent);
-                }
-            }
-
-
-            int oldWidth, oldHeight;
-            {
-                int dummy0, dummy1;
-                GetViewport(&dummy0, &dummy1, &oldWidth, &oldHeight);
-            }
-
-            TempDynVB<SVF_P3F_T3F> vb(gcpRendD3D);
-            vb.Allocate(4);
-            SVF_P3F_T3F* pQuad = vb.Lock();
-
-            pQuad[0].p = Vec3(-1, -1, 0);
-            pQuad[0].st = vLB;
-
-            pQuad[1].p = Vec3(1, -1, 0);
-            pQuad[1].st = vRB;
-
-            pQuad[2].p = Vec3(-1, 1, 0);
-            pQuad[2].st = vLT;
-
-            pQuad[3].p = Vec3(1, 1, 0);
-            pQuad[3].st = vRT;
-
-            vb.Unlock();
-            vb.Bind(0);
-            vb.Release();
-
-            //////////////////////////////////////////////////////////////////////////
-            // interleave pass
-            {
-                FX_SetupShadowsForFog();
-
-                FX_PushRenderTarget(0, CTexture::s_ptexVolFogShadowBuf[0], 0);
-                RT_SetViewport(0, 0, CTexture::s_ptexVolFogShadowBuf[0]->GetWidth(), CTexture::s_ptexVolFogShadowBuf[0]->GetHeight());
-
-                const bool renderFogCloudShadow = m_bVolFogCloudShadowsEnabled;
-                m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE5];
-                if (renderFogCloudShadow)
-                {
-                    m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-                }
-
-                static CCryNameTSCRC TechName0("FogPassVolShadowsInterleavePass");
-                static CCryNameTSCRC TechName1("MultiGSMShadowedFog");
-                pSH->FXSetTechnique(CRenderer::CV_r_FogShadowsMode == 1 ? TechName1 : TechName0);
-
-                uint32 nPasses;
-                pSH->FXBegin(&nPasses, FEF_DONTSETSTATES);
-                pSH->FXBeginPass(0);
-
-                static CCryNameR volFogShadowRangeN("volFogShadowRange");
-                pSH->FXSetPSFloat(volFogShadowRangeN, &volFogShadowRange, 1);
-
-                FX_Commit();
-
-                const uint32 nRS = GS_NODEPTHTEST;
-                FX_SetState(nRS);
-                D3DSetCull(eCULL_None);
-
-                if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-                {
-                    FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-                }
-
-                pSH->FXEndPass();
-
-                FX_PopRenderTarget(0);
-                m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // gather pass
-            {
-                static CCryNameTSCRC TechName("FogPassVolShadowsGatherPass");
-                static CCryNameR volFogShadowBufSampleOffsetsN("volFogShadowBufSampleOffsets");
-                static const int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-                Vec4 sampleOffsets[8];
-
-                // horizontal
-                {
-                    FX_PushRenderTarget(0, CTexture::s_ptexVolFogShadowBuf[1], 0);
-                    RT_SetViewport(0, 0, CTexture::s_ptexVolFogShadowBuf[1]->GetWidth(), CTexture::s_ptexVolFogShadowBuf[1]->GetHeight());
-
-                    pSH->FXSetTechnique(TechName);
-
-                    uint32 nPasses;
-                    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                    pSH->FXBeginPass(0);
-
-                    CTexture::s_ptexVolFogShadowBuf[0]->Apply(0, texStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-
-                    const float tU = 1.0f / (float)CTexture::s_ptexVolFogShadowBuf[0]->GetWidth();
-                    for (int x2 = -4, index = 0; x2 < 4; ++x2, ++index)
-                    {
-                        sampleOffsets[index] = Vec4(x2 * tU, 0, 0, 1);
-                    }
-
-                    pSH->FXSetPSFloat(volFogShadowBufSampleOffsetsN, sampleOffsets, 8);
-
-                    FX_Commit();
-
-                    const uint32 nRS = GS_NODEPTHTEST;
-                    FX_SetState(nRS);
-                    D3DSetCull(eCULL_None);
-
-                    if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-                    {
-                        FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-                    }
-
-                    pSH->FXEndPass();
-
-                    FX_PopRenderTarget(0);
-                }
-
-                // vertical
-                {
-                    FX_PushRenderTarget(0, CTexture::s_ptexVolFogShadowBuf[0], 0);
-                    RT_SetViewport(0, 0, CTexture::s_ptexVolFogShadowBuf[0]->GetWidth(), CTexture::s_ptexVolFogShadowBuf[0]->GetHeight());
-
-                    uint32 nPasses;
-                    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                    pSH->FXBeginPass(0);
-
-                    CTexture::s_ptexVolFogShadowBuf[1]->Apply(0, texStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-
-                    const float tV = 1.0f / (float)CTexture::s_ptexVolFogShadowBuf[1]->GetHeight();
-                    for (int y2 = -4, index = 0; y2 < 4; ++y2, ++index)
-                    {
-                        sampleOffsets[index] = Vec4(0, y2 * tV, 0, 1);
-                    }
-
-                    pSH->FXSetPSFloat(volFogShadowBufSampleOffsetsN, sampleOffsets, 8);
-
-                    FX_Commit();
-
-                    if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-                    {
-                        FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-                    }
-
-                    pSH->FXEndPass();
-
-                    FX_PopRenderTarget(0);
-                }
-            }
-
-            RT_SetViewport(0, 0, oldWidth, oldHeight);
-        }
-#endif // #if defined(VOLUMETRIC_FOG_SHADOWS)
-
-        //////////////////////////////////////////////////////////////////////////
-
-        if (m_RP.m_PersFlags2 & RBPF2_HDR_FP16)
-        {
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_HDR_MODE];
-        }
-
-        float fogDepth = 0.0f;
-        if (CV_r_FogDepthTest != 0.0f && CV_r_VolumetricFog == 0)
-        {
-            if (CV_r_FogDepthTest < 0.0f)
-            {
-                Vec4 fogColGradColBase(0, 0, 0, 0), fogColGradColDelta(0, 0, 0, 0);
-                CHWShader_D3D::GetFogColorGradientConstants(fogColGradColBase, fogColGradColDelta);
-
-                const Vec4 fogColGradRadial = CHWShader_D3D::GetFogColorGradientRadial();
-
-                const float fogColorIntensityBase = MaxChannel(fogColGradColBase);
-                const float fogColorIntensityTop = MaxChannel(fogColGradColBase + fogColGradColDelta);
-                const float fogColorIntensityRadial = MaxChannel(fogColGradRadial);
-                const float fogColorIntensity = max(fogColorIntensityBase, fogColorIntensityTop) + fogColorIntensityRadial;
-
-                const float threshold = -CV_r_FogDepthTest;
-
-                const Vec4 volFogParams = CHWShader_D3D::GetVolumetricFogParams();
-                const Vec4 volFogRampParams = CHWShader_D3D::GetVolumetricFogRampParams();
-
-                const float atmosphereScale = volFogParams.x;
-                const float volFogHeightDensityAtViewer = volFogParams.y;
-                const float finalClamp = 1.0f - volFogParams.w;
-
-                Vec3 lookDir = vRT;
-                if (lookDir.z * atmosphereScale < vLT.z * atmosphereScale)
-                {
-                    lookDir = vLT;
-                }
-                if (lookDir.z * atmosphereScale < vLB.z * atmosphereScale)
-                {
-                    lookDir = vLB;
-                }
-                if (lookDir.z * atmosphereScale < vRB.z * atmosphereScale)
-                {
-                    lookDir = vRB;
-                }
-
-                lookDir.Normalize();
-                const float viewDirAdj = lookDir.Dot(camDir);
-
-                float depth = camZFar * 0.5f;
-                float step = depth * 0.5f;
-                uint32 numSteps = 16;
-
-                while (numSteps)
-                {
-                    Vec3 cameraToWorldPos = lookDir * depth;
-
-                    float fogInt = 1.0f;
-
-                    const float t = atmosphereScale * cameraToWorldPos.z;
-                    const float slopeThreshold = 0.01f;
-                    if (fabsf(t) > slopeThreshold)
-                    {
-                        fogInt *= (expf_s(t) - 1.0f) / t;
-                    }
-
-                    const float l = depth; // length(cameraToWorldPos);
-                    const float u = l * volFogHeightDensityAtViewer;
-                    fogInt = fogInt * u;
-
-                    float f = clamp_tpl(expf_s(0.69314719f * -fogInt), 0.0f, 1.0f);
-
-                    float r = clamp_tpl(l * volFogRampParams.x + volFogRampParams.y, 0.0f, 1.0f);
-                    r = r * (2.0f - r);
-                    r = r * volFogRampParams.z + volFogRampParams.w;
-
-                    f = (1.0f - f) * r;
-                    assert(f >= 0.0f && f <= 1.0f);
-
-                    f = min(f, finalClamp);
-                    f *= fogColorIntensity;
-
-                    if (f > threshold)
-                    {
-                        depth -= step;
-                    }
-                    else
-                    {
-                        fogDepth = depth * viewDirAdj;
-                        depth += step;
-                    }
-                    step *= 0.5f;
-
-                    --numSteps;
-                }
-            }
-            else
-            {
-                fogDepth = CV_r_FogDepthTest;
-            }
-        }
-
-        m_fogCullDistance = fogDepth;
-
-        int nSUnitZTarget = -2; // FogPassPS doesn't need a sampler for ZTarget.
-
-        const bool useFogDepthTest = fogDepth >= 0.01f;
-        uint32 nFlags = FEF_DONTSETTEXTURES | FEF_DONTSETSTATES;
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-        m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-        if (renderFogShadow)
-        {
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-        }
-#endif
-
-        if (CV_r_VolumetricFog != 0)
-        {
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_VOLUMETRIC_FOG];
-            nFlags &= ~FEF_DONTSETTEXTURES;
-        }
-
-        static CCryNameTSCRC TechName("FogPass");
-        pSH->FXSetTechnique(TechName);
-
-        uint32 nPasses;
-        pSH->FXBegin(&nPasses, nFlags);
-        pSH->FXBeginPass(0);
-
-        STexState TexStatePoint = STexState(FILTER_POINT, true);
-
-        CTexture* depthRT = CTexture::s_ptexZTarget;
-
-        if (FX_GetEnabledGmemPath(nullptr))
-        {
-            depthRT = CTexture::s_ptexGmemStenLinDepth;
-        }
-
-        depthRT->Apply(0, CTexture::GetTexState(TexStatePoint), EFTT_UNKNOWN, nSUnitZTarget, m_RP.m_MSAAData.Type ? SResourceView::DefaultViewMS : SResourceView::DefaultView); // bind as msaa target (if valid)
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-        if (renderFogShadow)
-        {
-            static int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-            CTexture::s_ptexVolFogShadowBuf[0]->Apply(2, texStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-        }
-#endif
-
-#if defined(FEATURE_SVO_GI)
-        // bind SVO atmosphere
-        {
-            static CCryNameR sSVO_AirTextureScale("SVO_AirTextureScale");
-            Vec4 vSVO_AirTextureScale(0, 0, 0, 0);
-            pSH->FXSetPSFloat(sSVO_AirTextureScale, &vSVO_AirTextureScale, 1);
-        }
-#endif
-
-        TempDynVB<SVF_P3F_T3F> vb(gcpRendD3D);
-        vb.Allocate(4);
-        SVF_P3F_T3F* Verts = vb.Lock();
-
-        const Matrix44A& projMat = pShaderThreadInfo->m_matProj;
-        float clipZ = 0;
-        if (useFogDepthTest)
-        {
-            // projMat.m23 is -1 or 1 depending on whether we use a RH or LH coord system
-            // done in favor of an if check to make homogeneous divide by fogDepth (which is always positive) work
-            clipZ = projMat.m23 * fogDepth * projMat.m22 + projMat.m32;
-            clipZ /= fogDepth;
-            clipZ = clamp_tpl(clipZ, 0.f, 1.f);
-        }
-
-        Verts[0].p = Vec3(-1, -1, clipZ);
-        Verts[0].st = vLB;
-
-        Verts[1].p = Vec3(1, -1, clipZ);
-        Verts[1].st = vRB;
-
-        Verts[2].p = Vec3(-1, 1, clipZ);
-        Verts[2].st = vLT;
-
-        Verts[3].p = Vec3(1, 1, clipZ);
-        Verts[3].st = vRT;
-
-        vb.Unlock();
-        vb.Bind(0);
-        vb.Release();
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-        if (renderFogShadow)
-        {
-            Vec3 volFogShadowDarkeningP;
-            gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_DARKENING, volFogShadowDarkeningP);
-
-            Vec4 volFogShadowDarkening(volFogShadowDarkeningP, 0);
-            static CCryNameR volFogShadowDarkeningN("volFogShadowDarkening");
-            pSH->FXSetPSFloat(volFogShadowDarkeningN, &volFogShadowDarkening, 1);
-
-            const float aSun = (1.0f - clamp_tpl(volFogShadowDarkeningP.y, 0.0f, 1.0f)) * 1.0f;
-            const float bSun = 1.0f - aSun;
-            const float aAmb = (1.0f - clamp_tpl(volFogShadowDarkeningP.z, 0.0f, 1.0f)) * 0.4f;
-            const float bAmb = 1.0f - aAmb;
-
-            Vec4 volFogShadowDarkeningSunAmb(aSun, bSun, aAmb, bAmb);
-            static CCryNameR volFogShadowDarkeningSunAmbN("volFogShadowDarkeningSunAmb");
-            pSH->FXSetPSFloat(volFogShadowDarkeningSunAmbN, &volFogShadowDarkeningSunAmb, 1);
-
-            static CCryNameR volFogShadowRangeN("volFogShadowRange");
-            pSH->FXSetPSFloat(volFogShadowRangeN, &volFogShadowRange, 1);
-
-            Vec4 sampleOffsets[5];
-            {
-                const float tU = 1.0f / (float)CTexture::s_ptexVolFogShadowBuf[0]->GetWidth();
-                const float tV = 1.0f / (float)CTexture::s_ptexVolFogShadowBuf[0]->GetHeight();
-
-                sampleOffsets[0] = Vec4(0, 0, 0, 0);
-                sampleOffsets[1] = Vec4(0, -tV, 0, 0);
-                sampleOffsets[2] = Vec4(-tU, 0, 0, 0);
-                sampleOffsets[3] = Vec4(tU, 0, 0, 0);
-                sampleOffsets[4] = Vec4(0, tU, 0, 0);
-            }
-            static CCryNameR volFogShadowBufSampleOffsetsN("volFogShadowBufSampleOffsets");
-            pSH->FXSetPSFloat(volFogShadowBufSampleOffsetsN, sampleOffsets, 5);
-        }
-#endif
-
-        FX_Commit();
-
-        // using GS_BLDST_SRCALPHA because GS_BLDST_ONEMINUSSRCALPHA causes banding artifact when alpha value is very low.
-        uint32 nRS = GS_BLSRC_ONE | GS_BLDST_SRCALPHA | (useFogDepthTest ? GS_DEPTHFUNC_LEQUAL : GS_NODEPTHTEST);
-
-        // Draw a fullscreen quad to sample the RT
-        FX_SetState(nRS);
-        D3DSetCull(eCULL_None);
-
-        if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-        {
-            FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-        }
-
-        pSH->FXEndPass();
-
-        //////////////////////////////////////////////////////////////////////////
-
-        Vec3 lCol;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_COLOR, lCol);
-
-        bool useFogPassWithLightning(lCol.x > 1e-4f || lCol.y > 1e-4f || lCol.z > 1e-4f);
-        if (useFogPassWithLightning)
-        {
-            static CCryNameTSCRC TechNameAlt("FogPassWithLightning");
-            if (pSH->FXSetTechnique(TechNameAlt))
-            {
-                pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                pSH->FXBeginPass(0);
-
-                Vec3 lPos;
-                gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_POS, lPos);
-                Vec4 lightningPosition(lPos.x, lPos.y, lPos.z, 0.0f);
-                static CCryNameR Param1Name("LightningPos");
-                pSH->FXSetPSFloat(Param1Name, &lightningPosition, 1);
-
-                Vec3 lSize;
-                gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_SIZE, lSize);
-                Vec4 lightningColorSize(lCol.x, lCol.y, lCol.z, lSize.x * 0.01f);
-                static CCryNameR Param2Name("LightningColSize");
-                pSH->FXSetPSFloat(Param2Name, &lightningColorSize, 1);
-
-                FX_Commit();
-
-                FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE);
-
-                if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-                {
-                    FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-                }
-
-                pSH->FXEndPass();
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-
-        m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-    }
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SnapVector(Vec3& vVector, const float fSnapRange)
-{
-    Vec3 vSnapped = vVector / fSnapRange;
-    vSnapped.Set(floor_tpl(vSnapped.x), floor_tpl(vSnapped.y), floor_tpl(vSnapped.z));
-    vSnapped *= fSnapRange;
-    vVector = vSnapped;
-}
-
-void CD3D9Renderer::FX_WaterVolumesCausticsPreprocess(N3DEngineCommon::SCausticInfo& causticInfo)
-{
-    PROFILE_LABEL_SCOPE("PREPROCESS");
-
-    AZ_Assert((SRendItem::BatchFlags(EFSLIST_WATER, m_RP.m_pRLD) & FB_WATER_CAUSTIC) == 0, "Water volume found in the wrong render list");
-
-    const uint32 waterRenderList = EFSLIST_REFRACTIVE_SURFACE;
-    const int32 waterSortGroup = 0;
-
-    const int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    // Pre-process water ripples
-    if (!recursiveLevel && (m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS))
-    {
-        FX_ResetPipe();
-        CWaterRipples* pWaterRipples = (CWaterRipples*)PostEffectMgr()->GetEffect(ePFX_WaterRipples);
-        CEffectParam* pParam = PostEffectMgr()->GetByName("WaterRipples_Amount");
-        pParam->SetParam(1.0f);
-        if (pWaterRipples->Preprocess()) // Preprocess here will clear the list and skip the one in FX_RenderWater.
-        {
-            m_RP.m_PersFlags2 |= RBPF2_WATERRIPPLES;
-            gcpRendD3D->FX_ResetPipe();
-
-            TransformationMatrices backupSceneMatrices;
-            gcpRendD3D->Set2DMode(1, 1, backupSceneMatrices);
-
-            pWaterRipples->Render();
-
-            gcpRendD3D->Unset2DMode(backupSceneMatrices);
-
-            gcpRendD3D->FX_ResetPipe();
-
-            FX_Commit();
-        }
-    }
-
-    PostProcessUtils().Log(" +++ Begin watervolume caustics preprocessing +++ \n");
-
-    const float fMaxDistance = CRenderer::CV_r_watervolumecausticsmaxdistance;
-    CCamera origCam = GetCamera();
-
-    float fWidth = CTexture::s_ptexWaterCaustics[0]->GetWidth();
-    float fHeight = CTexture::s_ptexWaterCaustics[0]->GetHeight();
-
-    Vec3 vDir = gRenDev->GetViewParameters().ViewDir();
-    Vec3 vPos = gRenDev->GetViewParameters().vOrigin;
-
-    const float fOffsetDist = fMaxDistance * 0.25f;
-    vPos += Vec3(vDir.x * fOffsetDist, vDir.y * fOffsetDist, 0.0f); // Offset in viewing direction to maximimze view distance.
-
-    // Snap to avoid some aliasing.
-    const float fSnapRange = CRenderer::CV_r_watervolumecausticssnapfactor;
-    if (fSnapRange > 0.05f) // don't bother snapping if the value is low.
-    {
-        SnapVector(vPos, fSnapRange);
-    }
-
-    Vec3 vEye = vPos + Vec3(0.0f, 0.0f, 10.0f);
-
-    // Create the matrices.
-    Matrix44A mOrthoMatr;
-    Matrix44A mViewMatr;
-    mOrthoMatr.SetIdentity();
-    mViewMatr.SetIdentity();
-    mathMatrixOrtho(&mOrthoMatr, fMaxDistance, fMaxDistance, 0.25f, 100.0f);
-    mathMatrixLookAt(&mViewMatr, vEye, vPos, Vec3(0, 1, 0));
-
-    // Push the matrices.
-    Matrix44A origMatView = pShaderThreadInfo->m_matView;
-    Matrix44A origMatProj = pShaderThreadInfo->m_matProj;
-
-    Matrix44A* m = &pShaderThreadInfo->m_matProj;
-    m->SetIdentity();
-    *m = mOrthoMatr;
-
-    m = &pShaderThreadInfo->m_matView;
-    m->SetIdentity();
-    *m = mViewMatr;
-
-    // Store for projection onto the scene.
-    causticInfo.m_mCausticMatr = mViewMatr * mOrthoMatr;
-    causticInfo.m_mCausticMatr.Transpose();
-
-    pShaderThreadInfo->m_PersFlags |= RBPF_DRAWTOTEXTURE;
-
-    FX_ClearTarget(CTexture::s_ptexWaterCaustics[0], Clr_Transparent);
-    FX_PushRenderTarget(0, CTexture::s_ptexWaterCaustics[0], 0);
-    RT_SetViewport(0, 0, (int)fWidth, (int)fHeight);
-
-    FX_PreRender(3);
-
-    m_RP.m_pRenderFunc = FX_FlushShader_General;
-    m_RP.m_nPassGroupID = waterRenderList;
-    m_RP.m_nPassGroupDIP = waterRenderList;
-
-    PROFILE_DIPS_START;
-
-    m_RP.m_nSortGroupID = waterSortGroup;
-    FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][waterRenderList], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][waterRenderList], FB_WATER_CAUSTIC);
-
-    PROFILE_DIPS_END(waterRenderList);
-
-    FX_PopRenderTarget(0);
-
-    FX_PostRender();
-
-    pShaderThreadInfo->m_matView = origMatView;
-    pShaderThreadInfo->m_matProj = origMatProj;
-
-    FX_ResetPipe();
-    RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-
-    pShaderThreadInfo->m_PersFlags &= ~RBPF_DRAWTOTEXTURE;
-
-    FX_Commit();
-
-    PostProcessUtils().Log(" +++ End watervolume caustics preprocessing +++ \n");
-}
-
-bool CD3D9Renderer::FX_WaterVolumesCausticsUpdateGrid(N3DEngineCommon::SCausticInfo& causticInfo)
-{
-    // 16 bit index limit, can only do max 256x256 grid.
-    // could use hardware tessellation to reduce memory and increase tessellation amount for higher precision.
-    const uint32 nCausticMeshWidth = clamp_tpl(CRenderer::CV_r_watervolumecausticsdensity, 16, 255);
-    const uint32 nCausticMeshHeight = clamp_tpl(CRenderer::CV_r_watervolumecausticsdensity, 16, 255);
-
-    // Update the grid mesh if required.
-    if ((!causticInfo.m_pCausticQuadMesh || causticInfo.m_nCausticMeshWidth != nCausticMeshWidth || causticInfo.m_nCausticMeshHeight != nCausticMeshHeight))
-    {
-        // Make sure we aren't recreating the mesh.
-        causticInfo.m_pCausticQuadMesh = NULL;
-
-        const uint32 nCausticVertexCount = (nCausticMeshWidth + 1) * (nCausticMeshHeight + 1);
-        const uint32 nCausticIndexCount = (nCausticMeshWidth * nCausticMeshHeight) * 6;
-
-        // Store the new resolution and vertex/index counts.
-        causticInfo.m_nCausticMeshWidth = nCausticMeshWidth;
-        causticInfo.m_nCausticMeshHeight = nCausticMeshHeight;
-        causticInfo.m_nVertexCount = nCausticVertexCount;
-        causticInfo.m_nIndexCount = nCausticIndexCount;
-
-        // Reciprocal for scaling.
-        float fRecipW = 1.0f / (float)nCausticMeshWidth;
-        float fRecipH = 1.0f / (float)nCausticMeshHeight;
-
-        // Buffers.
-        SVF_P3F_C4B_T2F* pCausticQuads = new SVF_P3F_C4B_T2F[nCausticVertexCount];
-        vtx_idx* pCausticIndices = new vtx_idx[nCausticIndexCount];
-
-        // Fill vertex buffer.
-        for (uint32 y = 0; y <= nCausticMeshHeight; ++y)
-        {
-            for (uint32 x = 0; x <= nCausticMeshWidth; ++x)
-            {
-                pCausticQuads[y * (nCausticMeshWidth + 1) + x].xyz = Vec3(((float)x) * fRecipW, ((float)y) * fRecipH, 0.0f);
-            }
-        }
-
-        // Fill index buffer.
-        for (uint32 y = 0; y < nCausticMeshHeight; ++y)
-        {
-            for (uint32 x = 0; x < nCausticMeshWidth; ++x)
-            {
-                pCausticIndices[(y * (nCausticMeshWidth) + x) * 6] = y * (nCausticMeshWidth + 1) + x;
-                pCausticIndices[(y * (nCausticMeshWidth) + x) * 6 + 1] = y * (nCausticMeshWidth + 1) + x + 1;
-                pCausticIndices[(y * (nCausticMeshWidth) + x) * 6 + 2] = (y + 1) * (nCausticMeshWidth + 1) + x + 1;
-                pCausticIndices[(y * (nCausticMeshWidth) + x) * 6 + 3] = (y + 1) * (nCausticMeshWidth + 1) + x + 1;
-                pCausticIndices[(y * (nCausticMeshWidth) + x) * 6 + 4] = (y + 1) * (nCausticMeshWidth + 1) + x;
-                pCausticIndices[(y * (nCausticMeshWidth) + x) * 6 + 5] = y * (nCausticMeshWidth + 1) + x;
-            }
-        }
-
-        // Create the mesh.
-        causticInfo.m_pCausticQuadMesh = gRenDev->CreateRenderMeshInitialized(pCausticQuads, nCausticVertexCount, eVF_P3F_C4B_T2F, pCausticIndices, nCausticIndexCount, prtTriangleList, "WaterCausticMesh", "WaterCausticMesh");
-
-        // Delete the temporary buffers.
-        delete[] pCausticQuads;
-        delete[] pCausticIndices;
-    }
-
-    // If we created the mesh, return true.
-    if (causticInfo.m_pCausticQuadMesh)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CD3D9Renderer::FX_WaterVolumesCaustics()
-{
-    uint64 nPrevFlagsShaderRT = gRenDev->m_RP.m_FlagsShader_RT;
-
-    const uint32 waterRenderList = EFSLIST_REFRACTIVE_SURFACE;
-    const int32 waterSortGroup = 0;
-
-    uint32 nBatchMask = SRendItem::BatchFlags(waterRenderList, m_RP.m_pRLD);
-
-    bool isEmpty = SRendItem::IsListEmpty(waterRenderList, m_RP.m_nProcessThreadID, m_RP.m_pRLD) && SRendItem::IsListEmpty(EFSLIST_WATER_VOLUMES, m_RP.m_nProcessThreadID, m_RP.m_pRLD);
-
-    // Check if there are any water volumes that have caustics enabled
-    if (!isEmpty)
-    {
-        auto& RESTRICT_REFERENCE RI = CRenderView::CurrentRenderView()->GetRenderItems(waterSortGroup, waterRenderList);
-
-        int endRI = m_RP.m_pRLD->m_nEndRI[waterSortGroup][waterRenderList];
-        int curRI = m_RP.m_pRLD->m_nStartRI[waterSortGroup][waterRenderList];
-
-        isEmpty = true;
-
-        while (curRI < endRI)
-        {
-            IRenderElement* pRE = RI[curRI++].pElem;
-            if (pRE->mfGetType() == eDATA_WaterVolume && ((CREWaterVolume*)pRE)->m_pParams && ((CREWaterVolume*)pRE)->m_pParams->m_caustics == true)
-            {
-                isEmpty = false;
-                break;
-            }
-        }
-    }
-
-    // Pre-process refraction
-    // @NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
-    if (!isEmpty && (nBatchMask & FB_WATER_CAUSTIC) && CTexture::IsTextureExist(CTexture::s_ptexWaterCaustics[0]) && CTexture::IsTextureExist(CTexture::s_ptexWaterCaustics[1])
-        && CRenderer::CV_r_watercaustics && CRenderer::CV_r_watervolumecaustics)
-    {
-        PROFILE_LABEL_SCOPE("WATERVOLUME_CAUSTICS");
-
-        // Caustics info.
-        N3DEngineCommon::SCausticInfo& causticInfo = gcpRendD3D->m_p3DEngineCommon.m_CausticInfo;
-
-
-        // Preprocess (render all visible volumes to caustic gbuffer)
-        FX_WaterVolumesCausticsPreprocess(causticInfo);
-
-        gRenDev->m_cEF.mfRefreshSystemShader("DeferredCaustics", CShaderMan::s_ShaderDeferredCaustics);
-
-        // Dilate the gbuffer.
-        static CCryNameTSCRC pTechNameDilate("WaterCausticsInfoDilate");
-
-        {
-            PROFILE_LABEL_SCOPE("DILATION");
-
-            PostProcessUtils().Log(" +++ Begin watervolume caustics dilation +++ \n");
-        }
-
-        FX_Commit();
-        gcpRendD3D->FX_SetActiveRenderTargets(false);
-        FX_PushRenderTarget(0, CTexture::s_ptexWaterCaustics[1], NULL);
-        RT_SetViewport(0, 0, CTexture::s_ptexWaterCaustics[1]->GetWidth(), CTexture::s_ptexWaterCaustics[1]->GetHeight());
-
-        TransformationMatrices backupSceneMatrices;
-        Set2DMode(1, 1, backupSceneMatrices);
-
-        PostProcessUtils().ShBeginPass(CShaderMan::s_ShaderDeferredCaustics, pTechNameDilate, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-        FX_SetState(GS_NODEPTHTEST);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexWaterCaustics[0], 0);
-        PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexWaterCaustics[1]->GetWidth(), CTexture::s_ptexWaterCaustics[1]->GetHeight());
-        PostProcessUtils().ShEndPass();
-        FX_PopRenderTarget(0);
-
-        PostProcessUtils().Log(" +++ End watervolume caustics dilation +++ \n");
-
-
-        // Super blur for alpha to mask edges of volumes.
-        PostProcessUtils().TexBlurGaussian(CTexture::s_ptexWaterCaustics[1], 1, 1.0, 10.0, true, 0, false, CTexture::s_ptexWaterCaustics[0]);
-
-        // Get current viewport
-        int iTempX, iTempY, iWidth, iHeight;
-        GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-        ////////////////////////////////////////////////
-        // Procedural caustic generation
-
-        // Generate the caustics map using the grid mesh.
-        // for future:
-        // - merge this somehow with shadow gen for correct projection/intersection with geometry (and lighting) - can use shadow map for position reconstruction of world around volume and project caustic geometry to it.
-        // - try hardware tessellation to increase quality and reduce memory (perhaps do projection per volume instead of as a single pass, that way it's basically screen-space)
-        if (FX_WaterVolumesCausticsUpdateGrid(causticInfo)) // returns true if the mesh is valid
-        {
-            static CCryNameTSCRC pTechNameCaustics("WaterCausticsGen");
-            PROFILE_LABEL_SCOPE("CAUSTICS_GEN");
-            PostProcessUtils().Log(" +++ Begin watervolume caustics generation +++ \n");
-
-            FX_PushRenderTarget(0, CTexture::s_ptexWaterCaustics[0], NULL);
-            FX_SetActiveRenderTargets(false);// Avoiding invalid d3d error (due to deferred rt setup, when ping-pong'ing between RTs we can bump into RTs still bound when binding it as a SRV)
-            RT_SetViewport(0, 0, CTexture::s_ptexWaterCaustics[0]->GetWidth(), CTexture::s_ptexWaterCaustics[0]->GetHeight());
-
-            PostProcessUtils().ShBeginPass(CShaderMan::s_ShaderDeferredCaustics, pTechNameCaustics, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-            FX_SetState(GS_NODEPTHTEST | GS_NOCOLMASK_R | GS_NOCOLMASK_G | GS_NOCOLMASK_A);
-
-            // Set vertex textures.
-            CTexture::s_ptexWaterCaustics[1]->SetVertexTexture(true);
-            PostProcessUtils().SetTexture(CTexture::s_ptexWaterCaustics[1], 0, FILTER_TRILINEAR);
-
-            FX_Commit();
-            // Render the grid mesh.
-            if (!FAILED(gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-            {
-                size_t voffset(0);
-                size_t ioffset(0);
-                CRenderMesh* pCausticQuadMesh = static_cast<CRenderMesh*>(causticInfo.m_pCausticQuadMesh.get());
-                pCausticQuadMesh->CheckUpdate(0);
-                D3DBuffer* pVB = gcpRendD3D->m_DevBufMan.GetD3D(pCausticQuadMesh->GetVBStream(VSF_GENERAL), &voffset);
-                D3DBuffer* pIB = gcpRendD3D->m_DevBufMan.GetD3D(pCausticQuadMesh->GetIBStream(), &ioffset);
-                FX_SetVStream(0, pVB, voffset, pCausticQuadMesh->GetStreamStride(VSF_GENERAL));
-                FX_SetIStream(pIB, ioffset, (sizeof(vtx_idx) == 2 ? Index16 : Index32));
-
-                FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, causticInfo.m_nVertexCount, 0, causticInfo.m_nIndexCount);
-            }
-
-            PostProcessUtils().ShEndPass();
-
-            // Unset vertex textures.
-            CTexture::s_ptexWaterCaustics[1]->SetVertexTexture(false);
-
-
-            FX_PopRenderTarget(0);
-            RT_SetViewport(0, 0, iWidth, iHeight);
-
-            RT_UnbindTMUs();// Avoid d3d error due to rtv (s_ptexWaterCaustics[0]) still bound as shader input.
-
-            // Smooth out any inconsistencies in the caustic map (pixels, etc).
-            PostProcessUtils().TexBlurGaussian(CTexture::s_ptexWaterCaustics[0], 1, 1.0, 1.0, false, NULL, false, CTexture::s_ptexWaterCaustics[1]);
-
-            PostProcessUtils().Log(" +++ End watervolume caustics generation +++ \n");
-
-            FX_DeferredWaterVolumeCaustics(causticInfo);
-        }
-
-        Unset2DMode(backupSceneMatrices);
-    }
-
-    gRenDev->m_RP.m_FlagsShader_RT = nPrevFlagsShaderRT;
-}
-
-void CD3D9Renderer::FX_WaterVolumesPreprocess()
-{
-    AZ_Assert((SRendItem::BatchFlags(EFSLIST_WATER, m_RP.m_pRLD) & FB_WATER_REFL) == 0, "Water volume found in the wrong render list");
-
-    const uint32 waterRenderList = EFSLIST_REFRACTIVE_SURFACE;
-    const int32 waterSortGroup = 0;
-
-    uint32 nBatchMask = SRendItem::BatchFlags(waterRenderList, m_RP.m_pRLD);
-    if ((nBatchMask & FB_WATER_REFL) && CTexture::IsTextureExist(CTexture::s_ptexWaterVolumeRefl[0]))
-    {
-        PROFILE_LABEL_SCOPE("WATER_PREPROCESS");
-        const uint32 nCurrWaterVolID = gRenDev->GetFrameID(false) % 2;
-
-        CTexture* pCurrWaterVolRefl = CTexture::s_ptexWaterVolumeRefl[nCurrWaterVolID];
-
-        PostProcessUtils().Log(" +++ Begin water volumes preprocessing +++ \n");
-
-        bool bRgbkSrc = false;
-
-        int nWidth = int(pCurrWaterVolRefl->GetWidth() * m_RP.m_CurDownscaleFactor.x);
-        int nHeight = int(pCurrWaterVolRefl->GetHeight() * m_RP.m_CurDownscaleFactor.y);
-
-        PostProcessUtils().StretchRect(CTexture::s_ptexCurrSceneTarget, CTexture::s_ptexHDRTargetPrev, false, bRgbkSrc, false, false, SPostEffectsUtils::eDepthDownsample_None, false, &gcpRendD3D->m_FullResRect);
-
-        RECT rect = { 0, pCurrWaterVolRefl->GetHeight() - nHeight, nWidth, nHeight };
-        FX_ClearTarget(pCurrWaterVolRefl, Clr_Transparent, 1, &rect, true);
-        FX_PushRenderTarget(0, pCurrWaterVolRefl, 0);
-        RT_SetViewport(0, pCurrWaterVolRefl->GetHeight() - nHeight, nWidth, nHeight);
-
-        FX_PreRender(3);
-
-        m_RP.m_pRenderFunc = FX_FlushShader_General;
-        m_RP.m_nPassGroupID = waterRenderList;
-        m_RP.m_nPassGroupDIP = waterRenderList;
-
-        PROFILE_DIPS_START;
-
-        m_RP.m_nSortGroupID = waterSortGroup;
-        FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][waterRenderList], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][waterRenderList], FB_WATER_REFL);
-
-        PROFILE_DIPS_END(waterRenderList);
-
-        FX_PostRender();
-
-        FX_PopRenderTarget(0);
-
-        pCurrWaterVolRefl->GenerateMipMaps();
-
-        FX_ResetPipe();
-
-        RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-
-        PostProcessUtils().Log(" +++ End water volumes preprocessing +++ \n");
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::FX_RenderWater(void(* RenderFunc)())
-{
-    PROFILE_LABEL_SCOPE("WATER");
-
-#if defined(ENABLE_FRAME_PROFILER)
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-#endif
-
-    PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_WATER_VOLUMES], !(pShaderThreadInfo->m_PersFlags & (RBPF_SHADOWGEN)));
-    const int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-
-    if (!recursiveLevel)
-    {
-        // Pre-process refraction
-        const bool isEmpty = SRendItem::IsListEmpty(EFSLIST_REFRACTIVE_SURFACE, m_RP.m_nProcessThreadID, m_RP.m_pRLD) && SRendItem::IsListEmpty(EFSLIST_WATER, m_RP.m_nProcessThreadID, m_RP.m_pRLD) && SRendItem::IsListEmpty(EFSLIST_WATER_VOLUMES, m_RP.m_nProcessThreadID, m_RP.m_pRLD);
-        if (!isEmpty && CTexture::IsTextureExist(CTexture::s_ptexCurrSceneTarget))
-        {
-            if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_debugrefraction)
-            {
-                FX_ScreenStretchRect(CTexture::s_ptexCurrSceneTarget);
-            }
-            else
-            {
-#if defined(CRY_USE_METAL)
-                // On metal we have to submit a draw call in order for a clear to take effect.
-                // Doing the commit/clear target region will produce the needed draw call for the clear.
-                FX_PushRenderTarget(0, CTexture::s_ptexCurrSceneTarget, nullptr);
-                FX_SetColorDontCareActions(0);
-                CTexture::s_ptexCurrSceneTarget->Clear(ColorF(1, 0, 0, 1));
-                RT_SetViewport(0, 0, CTexture::s_ptexCurrSceneTarget->GetWidth(), CTexture::s_ptexCurrSceneTarget->GetHeight());
-                FX_Commit();
-                FX_ClearTargetRegion();
-                FX_PopRenderTarget(0);
-#else
-                CTexture::s_ptexCurrSceneTarget->Clear(ColorF(1, 0, 0, 1));
-#endif
-            }
-        }
-
-        // Pre-process rain ripples
-        if (!isEmpty && (m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS))
-        {
-            FX_ResetPipe();
-            CWaterRipples* pWaterRipples = (CWaterRipples*)PostEffectMgr()->GetEffect(ePFX_WaterRipples);
-            CEffectParam* pParam = PostEffectMgr()->GetByName("WaterRipples_Amount");
-            pParam->SetParam(1.0f);
-            if (pWaterRipples->Preprocess())
-            {
-                m_RP.m_PersFlags2 |= RBPF2_WATERRIPPLES;
-                gcpRendD3D->FX_ResetPipe();
-
-                TransformationMatrices backupSceneMatrices;
-
-                gcpRendD3D->Set2DMode(1, 1, backupSceneMatrices);
-
-                pWaterRipples->Render();
-
-                gcpRendD3D->Unset2DMode(backupSceneMatrices);
-
-                gcpRendD3D->FX_ResetPipe();
-
-                FX_Commit();
-            }
-        }
-    }
-
-    FX_WaterVolumesPreprocess();
-
-    FX_ProcessRenderList(EFSLIST_WATER, BEFORE_WATER, RenderFunc, false);
-    
-    // We render opaque refractive surface, before the after water objects.
-    // Because they are in EFSLIST_REFRACTIVE_SURFACE, they don't have sorting issues 
-    // with EFSLIST_WATER objects.
-    {
-        PROFILE_LABEL_SCOPE("REFRACTIVE_SURFACE");
-        PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_REFRACTIVE_SURFACE], !(pShaderThreadInfo->m_PersFlags & (RBPF_SHADOWGEN)));
-        FX_ProcessRenderList(EFSLIST_REFRACTIVE_SURFACE, BEFORE_WATER, RenderFunc, false);
-    } 
-    
-    FX_ProcessRenderList(EFSLIST_WATER, AFTER_WATER , RenderFunc, false);
-
-    m_RP.m_PersFlags2 &= ~(RBPF2_WATERRIPPLES | RBPF2_RAINRIPPLES);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::FX_LinearizeDepth(CTexture* ptexZ)
-{
-    {
-        PROFILE_LABEL_SCOPE("LINEARIZE_DEPTH");
-
-
-#ifdef SUPPORTS_MSAA
-        if (FX_GetMSAAMode())
-        {
-            FX_MSAASampleFreqStencilSetup(MSAA_SAMPLEFREQ_PASS);
-        }
-#endif
-        SDepthTexture* depthBuffer = nullptr;
-        if (FX_GetEnabledGmemPath(nullptr))
-        {
-            switch (FX_GmemGetDepthStencilMode())
-            {
-            case eGDSM_RenderTarget:
-                AZ_Assert(false, "Depth is already linearized in the render target");
-                return;
-            case eGDSM_DepthStencilBuffer:
-                depthBuffer = &m_DepthBufferOrigMSAA;
-                break;
-            default:
-                break;
-            }
-        }
-
-        FX_PushRenderTarget(0, ptexZ, depthBuffer);
-
-        static const CCryNameTSCRC pTechName("LinearizeDepth");
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        FX_SetState(GS_NODEPTHTEST);
-
-        m_DevMan.BindSRV(eHWSC_Pixel, &m_pZBufferDepthReadOnlySRV, 15, 1);
-
-        RECT rect;
-        rect.left = rect.top = 0;
-        rect.right = LONG(ptexZ->GetWidth() * m_RP.m_CurDownscaleFactor.x);
-        rect.bottom = LONG(ptexZ->GetHeight() * m_RP.m_CurDownscaleFactor.y);
-
-        PostProcessUtils().DrawFullScreenTri(ptexZ->GetWidth(), ptexZ->GetHeight(), 0, &rect);
-
-        D3DShaderResourceView* pNullSRV[1] = { NULL };
-        m_DevMan.BindSRV(eHWSC_Pixel, pNullSRV, 15, 1);
-
-        PostProcessUtils().ShEndPass();
-
-        FX_PopRenderTarget(0);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Depth Fixup is  two-stage pass technique to fix the linear depth buffer to include
-// additional depth that was not register in the opaque pass, i.e., transparency objects.
-// This pass will initialize the buffer to default set value to be compared when finalizing.
-void CD3D9Renderer::FX_DepthFixupPrepare()
-{
-    PROFILE_LABEL_SCOPE("PREPARE_DEPTH_FIXUP");
-
-    // Merge linear depth with depth values written for transparent objects
-    FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, NULL);
-
-    // CONFETTI BEGIN: David Srour
-    // Metal Load/Store Actions
-    FX_SetDepthDontCareActions(0, false, true);
-    FX_SetStencilDontCareActions(0, false, true);
-    // CONFETTI END
-
-    RT_SetViewport(0, 0, CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight());
-    static const CCryNameTSCRC pTechName("TranspDepthFixupPrepare");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ZERO | GS_BLDST_ONE | GS_BLALPHA_MAX);
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight());
-    PostProcessUtils().ShEndPass();
-    FX_PopRenderTarget(0);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Depth Fixup is  two-stage pass technique to fix the linear depth buffer to include
-// additional depth that was not register in the opaque pass, i.e., transparency objects.
-// This method will run the pass that will write the pixels with non default value.
-void CD3D9Renderer::FX_DepthFixupMerge()
-{
-    PROFILE_LABEL_SCOPE("MERGE_DEPTH");
-
-    // Merge linear depth with depth values written for transparent objects
-    FX_PushRenderTarget(0, CTexture::s_ptexZTarget, NULL);
-
-    // CONFETTI BEGIN: David Srour
-    // Metal Load/Store Actions
-    FX_SetDepthDontCareActions(0, false, true);
-    FX_SetStencilDontCareActions(0, false, true);
-    // CONFETTI END
-
-    RT_SetViewport(0, 0, CTexture::s_ptexZTarget->GetWidth(), CTexture::s_ptexZTarget->GetHeight());
-    static const CCryNameTSCRC pTechName("TranspDepthFixupMerge");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    PostProcessUtils().SetTexture(CTexture::s_ptexHDRTarget, 0, FILTER_POINT);
-    FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE | GS_BLOP_MIN);
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexZTarget->GetWidth(), CTexture::s_ptexZTarget->GetHeight());
-    PostProcessUtils().ShEndPass();
-    FX_PopRenderTarget(0);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::FX_SRGBConversion()
-{
-    PROFILE_LABEL_SCOPE("SRGB CONVERSION");
-    CRY_ASSERT(gcpRendD3D->FX_GetCurrentRenderTarget(0) == CTexture::s_ptexHDRTarget);
-    gcpRendD3D->FX_PopRenderTarget(0);
-    CTexture* targetText = GetUtils().AcquireFinalCompositeTarget(false);
-    gcpRendD3D->RT_SetViewport(0, 0, targetText->GetWidth(), targetText->GetHeight());
-    gcpRendD3D->FX_PushRenderTarget(0, targetText, NULL);
-    GetUtils().CopyTextureToScreen(CTexture::s_ptexHDRTarget, nullptr, -1, true);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_HDRScene(bool bEnableHDR, bool bClear)
-{
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    if (bEnableHDR)
-    {
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ Start HDR scene +++ \n");
-        }
-
-        if (!CTexture::s_ptexHDRTarget || CTexture::s_ptexHDRTarget->IsMSAAChanged() || CTexture::s_ptexHDRTarget->GetWidth() != GetWidth() || CTexture::s_ptexHDRTarget->GetHeight() != GetHeight())
-        {
-            CTexture::GenerateHDRMaps();
-        }
-
-        bool bEmpty = SRendItem::IsListEmpty(EFSLIST_HDRPOSTPROCESS, m_RP.m_nProcessThreadID, m_RP.m_pRLD);
-        if (bEmpty)
-        {
-            return false;
-        }
-
-        if (!FX_GetEnabledGmemPath(nullptr)) // GMEM buffers are already bound
-        {
-            if (bClear || (pShaderThreadInfo->m_PersFlags & RBPF_MIRRORCULL) || (m_RP.m_nRendFlags & SHDF_CUBEMAPGEN))
-            {
-                FX_ClearTarget(CTexture::s_ptexHDRTarget);
-                FX_ClearTarget(&m_DepthBufferOrigMSAA);
-            }
-
-            FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, &m_DepthBufferOrigMSAA, -1, true);
-        }
-        pShaderThreadInfo->m_PersFlags |= RBPF_HDR;
-
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], " +++ End HDR scene +++ \n");
-        }
-    }
-    return true;
-}
-
-// Draw overlay geometry in wireframe mode
-void CD3D9Renderer::FX_DrawWire()
-{
-    float fColor = 1.f;
-    int nState = GS_WIREFRAME;
-
-    if IsCVarConstAccess(constexpr) (CV_r_showlines == 1)
-    {
-        nState |= GS_NODEPTHTEST;
-    }
-
-    if IsCVarConstAccess(constexpr) (CV_r_showlines == 3)
-    {
-        if (!gcpRendD3D->m_RP.m_pRE || !gcpRendD3D->m_RP.m_pRE->GetCustomData())
-        {
-            return; // draw only terrain
-        }
-        nState |= GS_BLSRC_DSTCOL | GS_BLDST_ONE;
-        fColor = .25f;
-    }
-
-    gcpRendD3D->FX_SetState(nState);
-    gcpRendD3D->SetMaterialColor(fColor, fColor, fColor, 1.f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    gcpRendD3D->EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, (eCA_Texture | (eCA_Constant << 3)), (eCA_Texture | (eCA_Constant << 3)));
-    gcpRendD3D->EF_SetSrgbWrite(false);
-    CRenderObject* pObj = gcpRendD3D->m_RP.m_pCurObject;
-    gcpRendD3D->FX_SetFPMode();
-    gcpRendD3D->m_RP.m_pCurObject = pObj;
-
-    uint32 i;
-    if (gcpRendD3D->m_RP.m_pCurPass)
-    {
-        for (int nRE = 0; nRE <= gcpRendD3D->m_RP.m_nLastRE; nRE++)
-        {
-            gcpRendD3D->m_RP.m_pRE = gcpRendD3D->m_RP.m_RIs[nRE][0]->pElem;
-            if (gcpRendD3D->m_RP.m_pRE)
-            {
-                EDataType t = gcpRendD3D->m_RP.m_pRE->mfGetType();
-                if (t != eDATA_Mesh && t != eDATA_Terrain && t != eDATA_ClientPoly)
-                {
-                    continue;
-                }
-                gcpRendD3D->m_RP.m_pRE->mfPrepare(false);
-                gcpRendD3D->m_RP.m_pRE->mfCheckUpdate(0, gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_nFrameUpdateID);
-            }
-
-            CHWShader_D3D* curVS = (CHWShader_D3D*)gcpRendD3D->m_RP.m_pCurPass->m_VShader;
-            for (i = 0; i < gcpRendD3D->m_RP.m_RIs[nRE].Num(); i++)
-            {
-                SRendItem* pRI = gcpRendD3D->m_RP.m_RIs[nRE][i];
-                gcpRendD3D->FX_SetObjectTransform(pRI->pObj, NULL, pRI->pObj->m_ObjFlags);
-                curVS->UpdatePerInstanceConstantBuffer();
-                gcpRendD3D->FX_Commit();
-                gcpRendD3D->FX_DrawRE(gcpRendD3D->m_RP.m_pShader, NULL);
-            }
-        }
-    }
-}
-
-// Draw geometry normal vectors
-void CD3D9Renderer::FX_DrawNormals()
-{
-
-    float len = CRenderer::CV_r_normalslength;
-    int StrVrt, StrTan, StrNorm;
-
-    for (int nRE = 0; nRE <= gcpRendD3D->m_RP.m_nLastRE; nRE++)
-    {
-        gcpRendD3D->m_RP.m_pRE = gcpRendD3D->m_RP.m_RIs[nRE][0]->pElem;
-        if (gcpRendD3D->m_RP.m_pRE)
-        {
-            if (nRE)
-            {
-                gcpRendD3D->m_RP.m_pRE->mfPrepare(false);
-            }
-            gcpRendD3D->m_RP.m_pRE->mfCheckUpdate(-1, gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_nFrameUpdateID);
-        }
-
-        const byte* verts = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Vert, &StrVrt, eType_FLOAT, eSrcPointer_Vert, FGP_SRC | FGP_REAL);
-        const byte* normals = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Normal, &StrNorm, eType_FLOAT, eSrcPointer_Normal, FGP_SRC | FGP_REAL);
-        const byte* tangents = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Tangent, &StrTan, eType_FLOAT, eSrcPointer_Tangent, FGP_SRC | FGP_REAL);
-
-        verts = ((INT_PTR)verts > 256 && StrVrt >= sizeof(Vec3)) ? verts : 0;
-        normals = ((INT_PTR)normals > 256 && StrNorm >= sizeof(SPipNormal)) ? normals : 0;
-        tangents = ((INT_PTR)tangents > 256 && (StrTan == sizeof(SPipQTangents) || StrTan == sizeof(SPipTangents))) ? tangents : 0;
-
-        if (verts && (normals || tangents))
-        {
-            gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F);
-            gcpRendD3D->EF_SetColorOp(eCO_REPLACE, eCO_REPLACE, (eCA_Diffuse | (eCA_Diffuse << 3)), (eCA_Diffuse | (eCA_Diffuse << 3)));
-            gcpRendD3D->EF_SetSrgbWrite(false);
-            gcpRendD3D->FX_SetFPMode();
-            CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-            int nStateFlags = 0;
-            if (gcpRendD3D->m_wireframe_mode == R_SOLID_MODE)
-            {
-                nStateFlags = GS_DEPTHWRITE;
-            }
-            if IsCVarConstAccess(constexpr) (CV_r_shownormals == 2)
-            {
-                nStateFlags = GS_NODEPTHTEST;
-            }
-            gcpRendD3D->FX_SetState(nStateFlags);
-            gcpRendD3D->D3DSetCull(eCULL_None);
-
-            //gcpRendD3D->GetDevice().SetVertexShader(NULL);
-
-            // We must limit number of vertices, because TempDynVB (see code below)
-            // uses transient pool that has *limited* size. See DevBuffer.cpp for details.
-            // Note that one source vertex produces *two* buffer vertices (endpoints of
-            // a normal vector).
-            const size_t maxBufferSize = (size_t)NextPower2(gRenDev->CV_r_transient_pool_size) << 20;
-            const size_t maxVertexCount = maxBufferSize / (2 * sizeof(SVF_P3F_C4B_T2F));
-            const int numVerts = (int)(AZStd::GetMin)((size_t)gcpRendD3D->m_RP.m_RendNumVerts, maxVertexCount);
-
-            TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-            vb.Allocate(numVerts * 2);
-            SVF_P3F_C4B_T2F* Verts = vb.Lock();
-
-            uint32 col0 = 0x000000ff;
-            uint32 col1 = 0x00ffffff;
-
-            const bool bHasNormals = (normals != 0);
-
-            for (int v = 0; v < numVerts; v++, verts += StrVrt, normals += StrNorm, tangents += StrTan)
-            {
-                const float* const fverts = (const float*)verts;
-
-                Vec3 vNorm;
-                if (bHasNormals)
-                {
-                    vNorm = ((const SPipNormal*)normals)->GetN();
-                }
-                else if (StrTan == sizeof(SPipQTangents))
-                {
-                    vNorm = ((const SPipQTangents*)tangents)->GetN();
-                }
-                else
-                {
-                    vNorm = ((const SPipTangents*)tangents)->GetN();
-                }
-                vNorm.Normalize();
-
-                Verts[v * 2].xyz = Vec3(fverts[0], fverts[1], fverts[2]);
-                Verts[v * 2].color.dcolor = col0;
-
-                Verts[v * 2 + 1].xyz = Vec3(fverts[0] + vNorm[0] * len, fverts[1] + vNorm[1] * len, fverts[2] + vNorm[2] * len);
-                Verts[v * 2 + 1].color.dcolor = col1;
-            }
-
-            vb.Unlock();
-            vb.Bind(0);
-            vb.Release();
-
-            if (gcpRendD3D->m_RP.m_pCurPass)
-            {
-                CHWShader_D3D* curVS = (CHWShader_D3D*)gcpRendD3D->m_RP.m_pCurPass->m_VShader;
-                for (uint32 i = 0; i < gcpRendD3D->m_RP.m_RIs[nRE].Num(); i++)
-                {
-                    SRendItem* pRI = gcpRendD3D->m_RP.m_RIs[nRE][i];
-                    gcpRendD3D->FX_SetObjectTransform(pRI->pObj, NULL, pRI->pObj->m_ObjFlags);
-                    curVS->UpdatePerInstanceConstantBuffer();
-                    gcpRendD3D->FX_Commit();
-
-                    gcpRendD3D->FX_DrawPrimitive(eptLineList, 0, numVerts * 2);
-                }
-            }
-
-            gcpRendD3D->m_RP.m_VertexStreams[0].pStream = NULL;
-        }
-    }
-}
-
-// Draw geometry tangent vectors
-void CD3D9Renderer::FX_DrawTangents()
-{
-
-    float len = CRenderer::CV_r_normalslength;
-
-    for (int nRE = 0; nRE <= gcpRendD3D->m_RP.m_nLastRE; nRE++)
-    {
-        gcpRendD3D->m_RP.m_pRE = gcpRendD3D->m_RP.m_RIs[nRE][0]->pElem;
-        if (gcpRendD3D->m_RP.m_pRE)
-        {
-            if (nRE)
-            {
-                gcpRendD3D->m_RP.m_pRE->mfPrepare(false);
-            }
-            gcpRendD3D->m_RP.m_pRE->mfCheckUpdate(-1, gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_nFrameUpdateID);
-        }
-
-        int StrVrt, StrTan;
-        const int flags = (CRenderer::CV_r_showtangents == 1)
-            ? FGP_SRC | FGP_REAL
-            : FGP_REAL;
-
-        const byte* verts = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Vert, &StrVrt, eType_FLOAT, eSrcPointer_Vert, flags);
-        const byte* tangents = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Tangent, &StrTan, eType_FLOAT, eSrcPointer_Tangent, FGP_SRC | FGP_REAL);
-
-        verts = ((INT_PTR)verts > 256 && StrVrt >= sizeof(Vec3)) ? verts : 0;
-        tangents = ((INT_PTR)tangents > 256 && (StrTan == sizeof(SPipQTangents) || StrTan == sizeof(SPipTangents))) ? tangents : 0;
-
-        if (verts && tangents)
-        {
-            CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-            gcpRendD3D->EF_SetColorOp(eCO_REPLACE, eCO_REPLACE, (eCA_Diffuse | (eCA_Diffuse << 3)), (eCA_Diffuse | (eCA_Diffuse << 3)));
-            gcpRendD3D->EF_SetSrgbWrite(false);
-            int nStateFlags = 0;
-            if (gcpRendD3D->m_wireframe_mode == R_SOLID_MODE)
-            {
-                nStateFlags = GS_DEPTHWRITE;
-            }
-            if IsCVarConstAccess(constexpr) (CV_r_shownormals == 2)
-            {
-                nStateFlags = GS_NODEPTHTEST;
-            }
-            gcpRendD3D->FX_SetState(nStateFlags);
-            gcpRendD3D->D3DSetCull(eCULL_None);
-            gcpRendD3D->FX_SetFPMode();
-            gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F);
-
-            // We must limit number of vertices, because TempDynVB (see code below)
-            // uses transient pool that has *limited* size. See DevBuffer.cpp for details.
-            // Note that one source vertex produces *six* buffer vertices (three tangent space
-            // vectors, two vertices per vector).
-            const size_t maxBufferSize = (size_t)NextPower2(gRenDev->CV_r_transient_pool_size) << 20;
-            const size_t maxVertexCount = maxBufferSize / (6 * sizeof(SVF_P3F_C4B_T2F));
-            const int numVerts = (int)(AZStd::GetMin)((size_t)gcpRendD3D->m_RP.m_RendNumVerts, maxVertexCount);
-
-            TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-            vb.Allocate(numVerts * 6);
-            SVF_P3F_C4B_T2F* Verts = vb.Lock();
-
-            for (int v = 0; v < numVerts; v++, verts += StrVrt, tangents += StrTan)
-            {
-                uint32 col0 = 0xffff0000;
-                uint32 col1 = 0xffffffff;
-                const Vec3& vPos = *(const Vec3*)verts;
-                Vec3 vTan, vBiTan, vNorm;
-
-                if (StrTan == sizeof(SPipQTangents))
-                {
-                    const Quat q = ((const SPipQTangents*)tangents)->GetQ();
-                    vTan = q.GetColumn0();
-                    vBiTan = q.GetColumn1();
-                    vNorm = ((const SPipQTangents*)tangents)->GetN();
-                }
-                else
-                {
-                    ((const SPipTangents*)tangents)->GetTBN(vTan, vBiTan, vNorm);
-                }
-
-                Verts[v * 6 + 0].xyz = vPos;
-                Verts[v * 6 + 0].color.dcolor = col0;
-
-                Verts[v * 6 + 1].xyz = Vec3(vPos[0] + vTan[0] * len, vPos[1] + vTan[1] * len, vPos[2] + vTan[2] * len);
-                Verts[v * 6 + 1].color.dcolor = col1;
-
-                col0 = 0x0000ff00;
-                col1 = 0x00ffffff;
-
-                Verts[v * 6 + 2].xyz = vPos;
-                Verts[v * 6 + 2].color.dcolor = col0;
-
-                Verts[v * 6 + 3].xyz = Vec3(vPos[0] + vBiTan[0] * len, vPos[1] + vBiTan[1] * len, vPos[2] + vBiTan[2] * len);
-                Verts[v * 6 + 3].color.dcolor = col1;
-
-                col0 = 0x000000ff;
-                col1 = 0x00ffffff;
-
-                Verts[v * 6 + 4].xyz = vPos;
-                Verts[v * 6 + 4].color.dcolor = col0;
-
-                Verts[v * 6 + 5].xyz = Vec3(vPos[0] + vNorm[0] * len, vPos[1] + vNorm[1] * len, vPos[2] + vNorm[2] * len);
-                Verts[v * 6 + 5].color.dcolor = col1;
-            }
-
-            vb.Unlock();
-            vb.Bind(0);
-            vb.Release();
-
-            if (gcpRendD3D->m_RP.m_pCurPass)
-            {
-                CHWShader_D3D* curVS = (CHWShader_D3D*)gcpRendD3D->m_RP.m_pCurPass->m_VShader;
-                for (uint32 i = 0; i < gcpRendD3D->m_RP.m_RIs[nRE].Num(); i++)
-                {
-                    SRendItem* pRI = gcpRendD3D->m_RP.m_RIs[nRE][i];
-                    gcpRendD3D->FX_SetObjectTransform(pRI->pObj, NULL, pRI->pObj->m_ObjFlags);
-                    curVS->UpdatePerInstanceConstantBuffer();
-                    gcpRendD3D->FX_Commit();
-
-                    gcpRendD3D->FX_DrawPrimitive(eptLineList, 0, numVerts * 6);
-                }
-            }
-
-            gcpRendD3D->m_RP.m_VertexStreams[0].pStream = NULL;
-        }
-    }
-}
-
-void CD3D9Renderer::FX_DrawFurBending()
-{
-    float len = CRenderer::CV_r_normalslength;
-    for (int nRE = 0; nRE <= gcpRendD3D->m_RP.m_nLastRE; nRE++)
-    {
-        gcpRendD3D->m_RP.m_pRE = gcpRendD3D->m_RP.m_RIs[nRE][0]->pElem;
-        if (gcpRendD3D->m_RP.m_pRE)
-        {
-            if (nRE)
-            {
-                gcpRendD3D->m_RP.m_pRE->mfPrepare(false);
-            }
-            gcpRendD3D->m_RP.m_pRE->mfCheckUpdate(-1, gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_nFrameUpdateID);
-        }
-
-        int StrVrt, StrNorm, StrTan, StrCol;
-
-        const byte* verts = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Vert, &StrVrt, eType_FLOAT, eSrcPointer_Vert, FGP_SRC | FGP_REAL);
-        const byte* normals = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Normal, &StrNorm, eType_FLOAT, eSrcPointer_Normal, FGP_SRC | FGP_REAL);
-        const byte* tangents = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Tangent, &StrTan, eType_FLOAT, eSrcPointer_Tangent, FGP_SRC | FGP_REAL);
-        const byte* colors = (const byte*)gcpRendD3D->EF_GetPointer(eSrcPointer_Color, &StrCol, eType_FLOAT, eSrcPointer_Color, FGP_SRC | FGP_REAL);
-
-        verts = ((INT_PTR)verts > 256 && StrVrt >= sizeof(Vec3)) ? verts : 0;
-        normals = ((INT_PTR)normals > 256 && StrNorm >= sizeof(SPipNormal)) ? normals : 0;
-        tangents = ((INT_PTR)tangents > 256 && (StrTan == sizeof(SPipQTangents) || StrTan == sizeof(SPipTangents))) ? tangents : 0;
-        colors = ((INT_PTR)colors > 256 && StrCol >= sizeof(UCol)) ? colors : 0;
-
-        if (verts && (normals || tangents) && colors)
-        {
-            CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-            gcpRendD3D->EF_SetColorOp(eCO_REPLACE, eCO_REPLACE, (eCA_Diffuse | (eCA_Diffuse << 3)), (eCA_Diffuse | (eCA_Diffuse << 3)));
-            gcpRendD3D->EF_SetSrgbWrite(false);
-            int nStateFlags = 0;
-            if (gcpRendD3D->m_wireframe_mode == R_SOLID_MODE)
-            {
-                nStateFlags = GS_DEPTHWRITE;
-            }
-            if (CV_r_FurShowBending == 2)
-            {
-                nStateFlags = GS_NODEPTHTEST;
-            }
-            gcpRendD3D->FX_SetState(nStateFlags);
-            gcpRendD3D->D3DSetCull(eCULL_None);
-            gcpRendD3D->FX_SetFPMode();
-            gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F);
-
-            // We must limit number of vertices, because TempDynVB (see code below)
-            // uses transient pool that has *limited* size. See DevBuffer.cpp for details.
-            // Note that one source vertex produces *four* buffer vertices.
-            const uint32 c_vertsPerPrimitive = 4;
-            const size_t maxBufferSize = (size_t)NextPower2(gRenDev->CV_r_transient_pool_size) << 20;
-            const size_t maxVertexCount = maxBufferSize / (c_vertsPerPrimitive * sizeof(SVF_P3F_C4B_T2F));
-            const int numVerts = (int)(std::min)((size_t)gcpRendD3D->m_RP.m_RendNumVerts, maxVertexCount);
-
-            TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-            vb.Allocate(numVerts * c_vertsPerPrimitive);
-            SVF_P3F_C4B_T2F* Verts = vb.Lock();
-
-            uint32 col0 = 0xffff0000;
-            uint32 col1 = 0xff00ff00;
-            uint32 col2 = 0xff0000ff;
-
-            const bool bHasNormals = (normals != 0);
-
-            for (int v = 0; v < numVerts; v++, verts += StrVrt, normals += StrNorm, colors += StrCol)
-            {
-                Vec3 vPos = *(const Vec3*)verts;
-                Vec3 vNorm;
-                if (bHasNormals)
-                {
-                    vNorm = ((const SPipNormal*)normals)->GetN();
-                }
-                else if (StrTan == sizeof(SPipQTangents))
-                {
-                    vNorm = ((const SPipQTangents*)tangents)->GetN();
-                }
-                else
-                {
-                    vNorm = ((const SPipTangents*)tangents)->GetN();
-                }
-                vNorm.Normalize();
-
-                UCol color = *(const UCol*)colors;
-                Vec3 vColor(color.r / 255.0f * 2 - 1, color.b / 255.0f * 2 - 1, color.g / 255.0f * 2 - 1);
-                vColor.Normalize();
-
-                float furLength = len * color.a / 255.0f;
-
-                Verts[v * c_vertsPerPrimitive + 0].xyz = vPos;
-                Verts[v * c_vertsPerPrimitive + 0].color.dcolor = col0;
-
-                Verts[v * c_vertsPerPrimitive + 1].xyz = vPos + vNorm * furLength;
-                Verts[v * c_vertsPerPrimitive + 1].color.dcolor = col1;
-
-                Verts[v * c_vertsPerPrimitive + 2].xyz = vPos + vNorm * furLength;
-                Verts[v * c_vertsPerPrimitive + 2].color.dcolor = col1;
-
-                Verts[v * c_vertsPerPrimitive + 3].xyz = vPos + vColor * furLength;
-                Verts[v * c_vertsPerPrimitive + 3].color.dcolor = col2;
-            }
-
-            vb.Unlock();
-            vb.Bind(0);
-            vb.Release();
-
-            if (gcpRendD3D->m_RP.m_pCurPass)
-            {
-                CHWShader_D3D* curVS = (CHWShader_D3D*)gcpRendD3D->m_RP.m_pCurPass->m_VShader;
-                for (uint32 i = 0; i < gcpRendD3D->m_RP.m_RIs[nRE].Num(); i++)
-                {
-                    SRendItem* pRI = gcpRendD3D->m_RP.m_RIs[nRE][i];
-                    gcpRendD3D->FX_SetObjectTransform(pRI->pObj, NULL, pRI->pObj->m_ObjFlags);
-                    curVS->UpdatePerInstanceConstantBuffer();
-                    gcpRendD3D->FX_Commit();
-
-                    gcpRendD3D->FX_DrawPrimitive(eptLineList, 0, numVerts * c_vertsPerPrimitive);
-                }
-            }
-
-            gcpRendD3D->m_RP.m_VertexStreams[0].pStream = NULL;
-        }
-    }
-}
-
-// Draw light sources in debug mode
-// Draw debug geometry/info
-void CD3D9Renderer::EF_DrawDebugTools(SViewport& VP, const SRenderingPassInfo& passInfo)
-{
-    AZ_TRACE_METHOD();
-    if IsCVarConstAccess(constexpr) (CV_r_showlines)
-    {
-        EF_ProcessRenderLists(FX_DrawWire, 0, VP, passInfo, false);
-    }
-
-    if IsCVarConstAccess(constexpr) (CV_r_shownormals)
-    {
-        EF_ProcessRenderLists(FX_DrawNormals, 0, VP, passInfo, false);
-    }
-
-    if IsCVarConstAccess(constexpr) (CV_r_showtangents)
-    {
-        EF_ProcessRenderLists(FX_DrawTangents, 0, VP, passInfo, false);
-    }
-
-    if (CV_r_FurShowBending)
-    {
-        m_RP.m_pRenderFunc = FX_DrawFurBending;
-        FX_ProcessRenderList(FurPasses::GetInstance().GetFurRenderList(), FB_FUR, false /*bSetRenderFunc*/);
-    }
-}
-
-#if !defined(_RELEASE)
-static int __cdecl TimeProfCallback(const VOID * arg1, const VOID * arg2)
-{
-    SProfInfo* pi1 = (SProfInfo*)arg1;
-    SProfInfo* pi2 = (SProfInfo*)arg2;
-    if (pi1->pTechnique->m_fProfileTime > pi2->pTechnique->m_fProfileTime)
-    {
-        return -1;
-    }
-    if (pi1->pTechnique->m_fProfileTime < pi2->pTechnique->m_fProfileTime)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int __cdecl Compare_SProfInfo(const VOID * arg1, const VOID * arg2)
-{
-    SProfInfo* pi1 = (SProfInfo*)arg1;
-    SProfInfo* pi2 = (SProfInfo*)arg2;
-
-#if defined(CONSOLE_CONST_CVAR_MODE)
-    if constexpr (CRenderer::CV_r_ProfileShadersGroupByName == 1)
-#else
-    if (gRenDev->CV_r_ProfileShadersGroupByName == 1)
-#endif
-    {
-        char str1[128];
-        char str2[128];
-
-        sprintf_s(str1, sizeof(str1), "%s.%s", pi1->pShader->GetName(), pi1->pTechnique->m_NameStr.c_str());
-        sprintf_s(str2, sizeof(str2), "%s.%s", pi2->pShader->GetName(), pi2->pTechnique->m_NameStr.c_str());
-
-        return azstricmp(str1, str2);
-    }
-#if defined(CONSOLE_CONST_CVAR_MODE)
-    else if constexpr (CRenderer::CV_r_ProfileShadersGroupByName == 2)
-#else
-    else if (gRenDev->CV_r_ProfileShadersGroupByName == 2)
-#endif
-    {
-        return azstricmp(pi1->pTechnique->m_NameStr.c_str(), pi2->pTechnique->m_NameStr.c_str());
-    }
-
-    if (pi1->pTechnique > pi2->pTechnique)
-    {
-        return -1;
-    }
-    if (pi1->pTechnique < pi2->pTechnique)
-    {
-        return 1;
-    }
-
-    return 0;
-}
-#endif
-
-struct STimeStorage
-{
-    float fNumPolys;
-    float fNumDips;
-    double fTime;
-    float fItems;
-    uint32 nUsedFrameId;
-    STimeStorage()
-    {
-        fNumPolys = 0;
-        fNumDips = 0;
-        fTime = 0;
-        fItems = 0;
-        nUsedFrameId = 0;
-    }
-};
-
-
-// Print shaders profile info on the screen
-void CD3D9Renderer::EF_PrintProfileInfo()
-{
-#ifndef _RELEASE
-#if defined(ENABLE_PROFILING_CODE)
-    TextToScreenColor(1, 14, 0, 2, 0, 1, "Instances: %d, MatBatches: %d, GeomBatches: %d, DrawCalls: %d, Text: %d, Stat: %d, PShad: %d, VShad: %d", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendInstances, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendMaterialBatches, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendGeomBatches, GetCurrentNumberOfDrawCalls(), m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumTextChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumStateChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumPShadChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumVShadChanges);
-#endif
-    TextToScreenColor(1, 17, 0, 2, 0, 1, "VShad: %d, PShad: %d, Text: %d", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumVShaders, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumPShaders, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumTextures);
-    TextToScreenColor(1, 20, 0, 2, 0, 1, "Preprocess: %8.02f ms, OccmOut. queries: %8.02f ms", m_RP.m_PS[m_RP.m_nProcessThreadID].m_fPreprocessTime * 1000.f, m_RP.m_PS[m_RP.m_nProcessThreadID].m_fOcclusionTime * 1000.f);
-    TextToScreenColor(1, 23, 0, 2, 0, 1, "Skinning:   %8.02f ms (Skinned Objects: %d)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_fSkinningTime * 1000.f, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendSkinnedObjects);
-
-    // TODO: implement CV_r_profileDIPs=2 mode - draw only one triangle per draw call
-    // merge items with same grouping factor into single item
-    if (m_RP.m_Profile.Num())
-    {
-        qsort(&m_RP.m_Profile[0], m_RP.m_Profile.Num(), sizeof(SProfInfo), Compare_SProfInfo);
-
-        for (uint32 i = 0; (i + 1) < m_RP.m_Profile.Num(); i++)
-        {
-            if (!Compare_SProfInfo(&m_RP.m_Profile[i], &m_RP.m_Profile[i + 1]))
-            {
-                m_RP.m_Profile[i].Time += m_RP.m_Profile[i + 1].Time;
-                m_RP.m_Profile[i].m_nItems++;
-                m_RP.m_Profile[i].NumPolys += m_RP.m_Profile[i + 1].NumPolys;
-                m_RP.m_Profile[i].NumDips += m_RP.m_Profile[i + 1].NumDips;
-                m_RP.m_Profile.DelElem(i + 1);
-                i--;
-            }
-        }
-    }
-
-    // smooth values over time
-    if (CV_r_ProfileShadersSmooth && (CV_r_ProfileShadersGroupByName == 1 || CV_r_ProfileShadersGroupByName == 2))
-    {
-        typedef std::map<string, STimeStorage*, stl::less_stricmp<string> > TimeStorageMap;
-        static TimeStorageMap timeStorageMap;
-
-        char strName[128] = "";
-
-        for (uint32 i = 0; i < m_RP.m_Profile.Num(); i++)
-        {
-            SProfInfo* pi1 = &m_RP.m_Profile[i];
-
-            if (CV_r_ProfileShadersGroupByName == 1)
-            {
-                azsnprintf(strName, sizeof(strName), "%s.%s", pi1->pShader->GetName(), pi1->pTechnique->m_NameStr.c_str());
-            }
-            else
-            {
-                cry_strcpy(strName, pi1->pTechnique->m_NameStr.c_str());
-            }
-
-            STimeStorage* pTimeStorage = stl::find_in_map(timeStorageMap, CONST_TEMP_STRING(strName), NULL);
-            if (!pTimeStorage)
-            {
-                pTimeStorage = timeStorageMap[strName] = new STimeStorage();
-            }
-
-            float fSmooth = CV_r_ProfileShadersSmooth;
-            m_RP.m_Profile[i].pTechnique->m_fProfileTime = pTimeStorage->fTime = (m_RP.m_Profile[i].Time + pTimeStorage->fTime * fSmooth) / (fSmooth + 1.f);
-            m_RP.m_Profile[i].m_nItems = (int)(pTimeStorage->fItems = ((float)m_RP.m_Profile[i].m_nItems + pTimeStorage->fItems * fSmooth) / (fSmooth + 1.f));
-            m_RP.m_Profile[i].NumDips = (int)(pTimeStorage->fNumDips = ((float)m_RP.m_Profile[i].NumDips + pTimeStorage->fNumDips * fSmooth) / (fSmooth + 1.f));
-            m_RP.m_Profile[i].NumPolys = (int)(pTimeStorage->fNumPolys = ((float)m_RP.m_Profile[i].NumPolys + pTimeStorage->fNumPolys * fSmooth) / (fSmooth + 1.f));
-            pTimeStorage->nUsedFrameId = GetFrameID(false);
-        }
-
-        // fade items not used in this frame, delete not important items
-        TimeStorageMap::iterator next;
-        for (TimeStorageMap::iterator it = timeStorageMap.begin(); it != timeStorageMap.end(); it = next)
-        {
-            next = it;
-            next++;
-            STimeStorage* pTimeStorage = (STimeStorage*)(it->second);
-            if (pTimeStorage->nUsedFrameId != GetFrameID(false))
-            {
-                float fSmooth = CV_r_ProfileShadersSmooth;
-                pTimeStorage->fTime = (0 + pTimeStorage->fTime * fSmooth) / (fSmooth + 1.f);
-                pTimeStorage->fItems = (0 + pTimeStorage->fItems * fSmooth) / (fSmooth + 1.f);
-                pTimeStorage->fNumDips = (0 + pTimeStorage->fNumDips * fSmooth) / (fSmooth + 1.f);
-                pTimeStorage->fNumPolys = (0 + pTimeStorage->fNumPolys * fSmooth) / (fSmooth + 1.f);
-
-                if (pTimeStorage->fTime < 0.0001f)
-                {
-                    timeStorageMap.erase(it);
-                    delete pTimeStorage;
-                }
-            }
-        }
-    }
-    else
-    {
-        for (uint32 i = 0; i < m_RP.m_Profile.Num(); i++)
-        {
-            m_RP.m_Profile[i].pTechnique->m_fProfileTime =
-                (float)(m_RP.m_Profile[i].Time + m_RP.m_Profile[i].pTechnique->m_fProfileTime * (float)CV_r_ProfileShadersSmooth) / ((float)CV_r_ProfileShadersSmooth + 1);
-        }
-    }
-
-    const uint32 nMaxLines = 18;
-
-    // sort by final smoothed time
-    if (m_RP.m_Profile.Num())
-    {
-        qsort(&m_RP.m_Profile[0], m_RP.m_Profile.Num(), sizeof(SProfInfo), TimeProfCallback);
-    }
-
-    float fTimeAll = 0;
-
-    // print
-    for (uint32 nLine = 0; nLine < m_RP.m_Profile.Num(); nLine++)
-    {
-        float fProfTime = m_RP.m_Profile[nLine].pTechnique->m_fProfileTime * 1000.f;
-
-        fTimeAll += fProfTime;
-
-        if (nLine >= nMaxLines)
-        {
-            continue;
-        }
-
-        if (CV_r_ProfileShadersGroupByName == 1)
-        { // no RT flags
-            TextToScreenColor(4, (27 + (nLine * 3)), 1, 0, 0, 1, "%8.2f ms, %6d tris, %4d DIPs, '%s.%s', %d item(s)",
-                fProfTime,
-                m_RP.m_Profile[nLine].NumPolys,
-                m_RP.m_Profile[nLine].NumDips,
-                m_RP.m_Profile[nLine].pShader->GetName(),
-                m_RP.m_Profile[nLine].pTechnique->m_NameStr.c_str(),
-                m_RP.m_Profile[nLine].m_nItems + 1);
-        }
-        else if (CV_r_ProfileShadersGroupByName == 2)
-        { // only Technique name - no RT flag, no shader name
-            TextToScreenColor(4, (27 + (nLine * 3)), 1, 0, 0, 1, "%8.2f ms, %6d tris, %4d DIPs, '%s', %d item(s)",
-                fProfTime,
-                m_RP.m_Profile[nLine].NumPolys,
-                m_RP.m_Profile[nLine].NumDips,
-                m_RP.m_Profile[nLine].pTechnique->m_NameStr.c_str(),
-                m_RP.m_Profile[nLine].m_nItems + 1);
-        }
-        else
-        { // with RT flags and all names
-            TextToScreenColor(4, (27 + (nLine * 3)), 1, 0, 0, 1, "%8.2f ms, %6d tris, %4d DIPs, '%s.%s(0x%x)', %d item(s)",
-                fProfTime,
-                m_RP.m_Profile[nLine].NumPolys,
-                m_RP.m_Profile[nLine].NumDips,
-                m_RP.m_Profile[nLine].pShader->GetName(),
-                m_RP.m_Profile[nLine].pTechnique->m_NameStr.c_str(),
-                m_RP.m_Profile[nLine].pShader->m_nMaskGenFX,
-                m_RP.m_Profile[nLine].m_nItems + 1);
-        }
-    }
-
-    TextToScreenColor(1, (28 + (nMaxLines * 3)), 0, 2, 0, 1, "Total unique items:            %8d", m_RP.m_Profile.Num());
-    TextToScreenColor(1, (31 + (nMaxLines * 3)), 0, 2, 0, 1, "Total flush time:              %8.2f ms", fTimeAll);
-    TextToScreenColor(1, (34 + (nMaxLines * 3)), 0, 2, 0, 1, "Total scene rendering time (MT): %8.2f ms", m_RP.m_PS[m_RP.m_nProcessThreadID].m_fSceneTimeMT);
-    TextToScreenColor(1, (34 + (nMaxLines * 3)), 0, 2, 0, 1, "Total scene rendering time (RT): %8.2f ms", m_RP.m_PS[m_RP.m_nProcessThreadID].m_fRenderTime);
-#endif
-}
-
-
-struct SPreprocess
-{
-    int m_nPreprocess;
-    int m_Num;
-    CRenderObject* m_pObject;
-    int m_nTech;
-    CShader* m_Shader;
-    CShaderResources* m_pRes;
-    IRenderElement* m_RE;
-};
-
-struct Compare2
-{
-    bool operator()(const SPreprocess& a, const SPreprocess& b) const
-    {
-        return a.m_nPreprocess < b.m_nPreprocess;
-    }
-};
-
-// Current scene preprocess operations (Rendering to RT, screen effects initializing, ...)
-int CD3D9Renderer::EF_Preprocess(SRendItem* ri, uint32 nums, uint32 nume, RenderFunc pRenderFunc, [[maybe_unused]] const SRenderingPassInfo& passInfo) PREFAST_SUPPRESS_WARNING(6262)
-{
-    AZ_TRACE_METHOD();
-
-    uint32 i, j;
-    CShader* Shader;
-    CShaderResources* Res;
-    CRenderObject* pObject;
-    int nTech;
-
-    SPreprocess Procs[512];
-    uint32 nProcs = 0;
-
-    CTimeValue time0 = iTimer->GetAsyncTime();
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID], "*** Start preprocess frame ***\n");
-    }
-
-    int nReturn = 0;
-
-    for (i = nums; i < nume; i++)
-    {
-        if (nProcs >= 512)
-        {
-            break;
-        }
-        SRendItem::mfGet(ri[i].SortVal, nTech, Shader, Res);
-        pObject = ri[i].pObj;
-        if (!(ri[i].nBatchFlags & FSPR_MASK))
-        {
-            break;
-        }
-        nReturn++;
-        if (nTech < 0)
-        {
-            nTech = 0;
-        }
-        if (nTech < (int)Shader->m_HWTechniques.Num())
-        {
-            for (j = SPRID_FIRST; j < 32; j++)
-            {
-                uint32 nMask = 1 << j;
-                if (nMask >= FSPR_MAX || nMask > (ri[i].nBatchFlags & FSPR_MASK))
-                {
-                    break;
-                }
-                if (nMask & ri[i].nBatchFlags)
-                {
-                    Procs[nProcs].m_nPreprocess = j;
-                    Procs[nProcs].m_Num = i;
-                    Procs[nProcs].m_Shader = Shader;
-                    Procs[nProcs].m_pRes = Res;
-                    Procs[nProcs].m_RE = ri[i].pElem;
-                    Procs[nProcs].m_pObject = pObject;
-                    Procs[nProcs].m_nTech = nTech;
-                    nProcs++;
-                }
-            }
-        }
-    }
-    if (!nProcs)
-    {
-        return 0;
-    }
-    std::sort(&Procs[0], &Procs[nProcs], Compare2());
-
-    if (pRenderFunc != FX_FlushShader_General)
-    {
-        return nReturn;
-    }
-
-    bool bRes = true;
-    for (i = 0; i < nProcs; i++)
-    {
-        SPreprocess* pr = &Procs[i];
-        if (!pr->m_Shader)
-        {
-            continue;
-        }
-        switch (pr->m_nPreprocess)
-        {
-        case SPRID_SCANTEX:
-        case SPRID_SCANTEXWATER:
-            if (!(m_RP.m_TI[m_RP.m_nFillThreadID].m_PersFlags & RBPF_DRAWTOTEXTURE))
-            {
-                CRenderObject* pObj = pr->m_pObject;
-                int nT = pr->m_nTech;
-                if (nT < 0)
-                {
-                    nT = 0;
-                }
-                SShaderTechnique* pTech = pr->m_Shader->m_HWTechniques[nT];
-                CShaderResources* pRes = pr->m_pRes;
-                for (j = 0; j < pTech->m_RTargets.Num(); j++)
-                {
-                    SHRenderTarget* pTarg = pTech->m_RTargets[j];
-                    if (pTarg->m_eOrder == eRO_PreProcess)
-                    {
-                        bRes &= FX_DrawToRenderTarget(pr->m_Shader, pRes, pObj, pTech, pTarg, pr->m_nPreprocess, pr->m_RE);
-                    }
-                }
-                if (pRes)
-                {
-                    for (j = 0; j < pRes->m_RTargets.Num(); j++)
-                    {
-                        SHRenderTarget* pTarg = pRes->m_RTargets[j];
-                        if (pTarg->m_eOrder == eRO_PreProcess)
-                        {
-                            bRes &= FX_DrawToRenderTarget(pr->m_Shader, pRes, pObj, pTech, pTarg, pr->m_nPreprocess, pr->m_RE);
-                        }
-                    }
-                }
-            }
-            break;
-
-        case SPRID_CUSTOMTEXTURE:
-            if (!(m_RP.m_TI[m_RP.m_nFillThreadID].m_PersFlags & RBPF_DRAWTOTEXTURE))
-            {
-                CRenderObject* pObj = pr->m_pObject;
-                int nT = pr->m_nTech;
-                if (nT < 0)
-                {
-                    nT = 0;
-                }
-                SShaderTechnique* pTech = pr->m_Shader->m_HWTechniques[nT];
-                CShaderResources* pRes = pr->m_pRes;
-                for (j = 0; j < pRes->m_RTargets.Num(); j++)
-                {
-                    SHRenderTarget* pTarg = pRes->m_RTargets[j];
-                    if (pTarg->m_eOrder == eRO_PreProcess)
-                    {
-                        bRes &= FX_DrawToRenderTarget(pr->m_Shader, pRes, pObj, pTech, pTarg, pr->m_nPreprocess, pr->m_RE);
-                    }
-                }
-            }
-            break;
-        case SPRID_GENCLOUDS:
-            break;
-
-        default:
-            assert(0);
-        }
-    }
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nFillThreadID], "*** End preprocess frame ***\n");
-    }
-
-    m_RP.m_PS[m_RP.m_nFillThreadID].m_fPreprocessTime += iTimer->GetAsyncTime().GetDifferenceInSeconds(time0);
-
-    return nReturn;
-}
-
-
-void CD3D9Renderer::EF_EndEf2D([[maybe_unused]] const bool bSort)
-{
-}
-
-//========================================================================================================
-
-bool CRenderer::FX_TryToMerge(CRenderObject* pObjN, CRenderObject* pObjO, IRenderElement* pRE, bool bResIdentical)
-{
-#if !defined(_RELEASE)
-    if (!CV_r_Batching)
-    {
-        return false;
-    }
-#endif
-
-    if ((pRE == nullptr) || pRE->mfGetType() != eDATA_Mesh)
-    {
-        return false;
-    }
-
-#if defined(FEATURE_SVO_GI)
-    if (m_RP.m_nPassGroupID == EFSLIST_VOXELIZE)
-    {
-        return false;
-    }
-#endif
-    if (!bResIdentical || pRE != m_RP.m_pRE)
-    {
-        if (m_RP.m_nLastRE + 1 >= MAX_REND_GEOMS_IN_BATCH)
-        {
-            return false;
-        }
-        if ((pObjN->m_ObjFlags ^ pObjO->m_ObjFlags) & FOB_MASK_AFFECTS_MERGING_GEOM)
-        {
-            return false;
-        }
-        if ((pObjN->m_ObjFlags | pObjO->m_ObjFlags) & (FOB_SKINNED | FOB_DECAL_TEXGEN_2D | FOB_REQUIRES_RESOLVE | FOB_DISSOLVE | FOB_LIGHTVOLUME))
-        {
-            return false;
-        }
-
-        if (pObjN->m_nClipVolumeStencilRef != pObjO->m_nClipVolumeStencilRef)
-        {
-            return false;
-        }
-
-        /* Confetti: David Srour
-        * Following is important as well.
-        * As an example... if 2 glass material objects use "nearest_cubemap"
-        * textures, the chosen texture might be picked differently depending on the
-        * camera position within the scene -- this'll cause jarring popping as the
-        * camera moves. This issue was observed on iOS.
-        */
-        if (pObjN->m_nTextureID != pObjO->m_nTextureID)
-        {
-            return false;
-        }
-
-        m_RP.m_RIs[++m_RP.m_nLastRE].SetUse(0);
-        m_RP.m_pRE = pRE;
-        return true;
-    }
-
-    // Batching/Instancing case
-    if ((pObjN->m_ObjFlags ^ pObjO->m_ObjFlags) & FOB_MASK_AFFECTS_MERGING)
-    {
-        return false;
-    }
-
-    if ((pObjN->m_ObjFlags | pObjO->m_ObjFlags) & (FOB_REQUIRES_RESOLVE | FOB_LIGHTVOLUME))
-    {
-        return false;
-    }
-
-    if (pObjN->m_nMaterialLayers != pObjO->m_nMaterialLayers)
-    {
-        return false;
-    }
-
-    if (pObjN->m_nTextureID != pObjO->m_nTextureID)
-    {
-        return false;
-    }
-
-    if (pObjN->m_nClipVolumeStencilRef != pObjO->m_nClipVolumeStencilRef)
-    {
-        return false;
-    }
-
-    m_RP.m_ObjFlags |= pObjN->m_ObjFlags & FOB_SELECTED;
-    m_RP.m_fMinDistance = min(pObjN->m_fDistance, m_RP.m_fMinDistance);
-
-    return true;
-}
-
-// Note: When adding/removing batch flags/techniques, make sure to update sDescList / sBatchList
-static const char* sDescList[] =
-{
-    "NULL",
-    "Preprocess",
-    "General",
-    "ShadowGen",
-    "Decal",
-    "WaterVolume",
-    "Transparent",
-    "Water",
-    "HDRPostProcess",
-    "AfterHDRPostProcess",
-    "PostProcess",
-    "AfterPostProcess",
-    "ShadowPass",
-    "DeferredPreprocess",
-    "Skin",
-    "HalfResParticles",
-    "ParticlesThickness",
-    "LensOptics",
-    "Voxelize",
-    "EyeOverlay",
-    "FogVolume",
-    "GPUParticleCollisionCubemap",
-    "RefractiveSurface",
-};
-
-static const char* sBatchList[] =
-{
-    "FB_GENERAL",
-    "FB_TRANSPARENT",
-    "FB_SKIN",
-    "FB_Z",
-    "FB_FUR",
-    "FB_ZPREPASS",
-    "FB_PREPROCESS",
-    "FB_MOTIONBLUR",
-    "FB_POST_3D_RENDER",
-    "FB_MULTILAYERS",
-    "NULL"
-    "FB_CUSTOM_RENDER",
-    "FB_SOFTALPHATEST",
-    "FB_LAYER_EFFECT",
-    "FB_WATER_REFL",
-    "FB_WATER_CAUSTIC",
-    "FB_DEBUG",
-    "FB_PARTICLES_THICKNESS",
-    "FB_TRANSPARENT_AFTER_DOF",
-    "FB_EYE_OVERLAY"
-};
-
-// Init states before rendering of the scene
-void CD3D9Renderer::FX_PreRender(int Stage)
-{
-    uint32 i;
-
-    if (Stage & 1)
-    { // Before preprocess
-        m_RP.m_pSunLight = NULL;
-
-        m_RP.m_Flags = 0;
-        m_RP.m_pPrevObject = NULL;
-
-        RT_SetCameraInfo();
-
-        for (i = 0; i < m_RP.m_DLights[m_RP.m_nProcessThreadID][SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID]].Num(); i++)
-        {
-            SRenderLight* dl = &m_RP.m_DLights[m_RP.m_nProcessThreadID][SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID]][i];
-            if (dl->m_Flags & DLF_FAKE)
-            {
-                continue;
-            }
-
-            if (dl->m_Flags & DLF_SUN)
-            {
-                m_RP.m_pSunLight = dl;
-            }
-        }
-    }
-
-    CHWShader_D3D::mfSetGlobalParams();
-    m_RP.m_nCommitFlags = FC_ALL;
-    FX_PushVP();
-}
-
-// Restore states after rendering of the scene
-void CD3D9Renderer::FX_PostRender()
-{
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    //FrameProfiler f("CD3D9Renderer:EF_PostRender", iSystem );
-    FX_ObjectChange(NULL, NULL, m_RP.m_pIdendityRenderObject, NULL);
-    m_RP.m_pRE = NULL;
-
-    FX_ResetPipe();
-    FX_PopVP();
-
-    m_RP.m_nCurrResolveBounds[0] = m_RP.m_nCurrResolveBounds[1] = m_RP.m_nCurrResolveBounds[2] = m_RP.m_nCurrResolveBounds[3] = 0;
-    m_RP.m_FlagsShader_MD = 0;
-    m_RP.m_FlagsShader_MDV = 0;
-    m_RP.m_FlagsShader_LT = 0;
-    m_RP.m_pCurObject = m_RP.m_pIdendityRenderObject;
-
-    pShaderThreadInfo->m_PersFlags |= RBPF_FP_DIRTY;
-    m_RP.m_nCommitFlags = FC_ALL;
-}
-
-// Object changing handling (skinning, shadow maps updating, initial states setting, ...)
-bool CD3D9Renderer::FX_ObjectChange(CShader* Shader, [[maybe_unused]] CShaderResources* Res, CRenderObject* obj, [[maybe_unused]] IRenderElement* pRE)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    if ((pShaderThreadInfo->m_PersFlags & RBPF_SHADOWGEN))
-    {
-        const bool bNearObjOnly = m_RP.m_ShadowInfo.m_pCurShadowFrustum->m_eFrustumType == ShadowMapFrustum::e_Nearest;
-        if (bNearObjOnly && !(obj->m_ObjFlags & FOB_NEAREST))
-        {
-            return false;
-        }
-    }
-
-    if ((obj->m_ObjFlags & FOB_NEAREST) && CV_r_nodrawnear)
-    {
-        return false;
-    }
-
-    if (Shader)
-    {
-        if (pShaderThreadInfo->m_pIgnoreObject && pShaderThreadInfo->m_pIgnoreObject->m_pRenderNode == obj->m_pRenderNode)
-        {
-            return false;
-        }
-    }
-
-    if (obj == m_RP.m_pPrevObject)
-    {
-        return true;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_RefractionPartialResolves == 2)
-    {
-        if (m_RP.m_pCurObject == NULL || obj->m_pRenderNode == NULL || obj->m_pRenderNode != m_RP.m_pCurObject->m_pRenderNode)
-        {
-            m_RP.m_nCurrResolveBounds[0] = m_RP.m_nCurrResolveBounds[1] = m_RP.m_nCurrResolveBounds[2] = m_RP.m_nCurrResolveBounds[3] = 0;
-        }
-    }
-
-    m_RP.m_pCurObject = obj;
-
-    int flags = 0;
-    if (obj != m_RP.m_pIdendityRenderObject) // Non-default object
-    {
-        if (obj->m_ObjFlags & FOB_NEAREST)
-        {
-            flags |= RBF_NEAREST;
-        }
-
-        if ((flags ^ m_RP.m_Flags) & RBF_NEAREST)
-        {
-            UpdateNearestChange(flags);
-        }
-    }
-    else
-    {
-        HandleDefaultObject();
-    }
-
-    const uint32 nPerfFlagsExcludeMask = (RBPF_SHADOWGEN | RBPF_ZPASS);
-    const uint32 nPerfFlags2ExcludeMask = (RBPF2_MOTIONBLURPASS | RBPF2_CUSTOM_RENDER_PASS);
-
-    if ((m_RP.m_nPassGroupID == EFSLIST_TRANSP)
-        && (obj->m_ObjFlags & FOB_REQUIRES_RESOLVE)
-        && !(pShaderThreadInfo->m_PersFlags & nPerfFlagsExcludeMask)
-        && !(m_RP.m_PersFlags2 & nPerfFlags2ExcludeMask))
-    {
-        if IsCVarConstAccess(constexpr) (bool(CRenderer::CV_r_RefractionPartialResolves))
-        {
-            int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-            if (!recursiveLevel)
-            {
-                gcpRendD3D->FX_RefractionPartialResolve();
-            }
-        }
-    }
-
-    m_RP.m_fMinDistance = obj->m_fDistance;
-    m_RP.m_pPrevObject = obj;
-    m_RP.m_CurPassBitMask = 0;
-
-    return true;
-}
-
-void CD3D9Renderer::UpdateNearestChange(int flags)
-{
-    const int nProcessThread = m_RP.m_nProcessThreadID;
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[nProcessThread]);
-
-    const ShadowMapFrustum* pCurFrustum = m_RP.m_ShadowInfo.m_pCurShadowFrustum;
-    const bool bNearObjOnly = pCurFrustum && (pCurFrustum->m_eFrustumType == ShadowMapFrustum::e_Nearest) && (m_RP.m_pCurObject->m_ObjFlags & FOB_NEAREST);
-    if (bNearObjOnly && (pShaderThreadInfo->m_PersFlags & RBPF_SHADOWGEN)) //add additional flag
-    {
-        //set per-object camera view
-        Matrix44A& mPrj = pShaderThreadInfo->m_matProj;
-        Matrix44A& mView = pShaderThreadInfo->m_matView;
-        ShadowMapFrustum& curFrust = *m_RP.m_ShadowInfo.m_pCurShadowFrustum;
-
-        mPrj = curFrust.mLightProjMatrix;
-        mView = curFrust.mLightViewMatrix;
-
-        EF_SetCameraInfo();
-    }
-
-    if (!(pShaderThreadInfo->m_PersFlags & RBPF_SHADOWGEN) && (m_drawNearFov > 0.0f))
-    {
-        if (flags & RBF_NEAREST)
-        {
-            CCamera Cam = pShaderThreadInfo->m_cam;
-            m_RP.m_PrevCamera = Cam;
-            if (m_logFileHandle != AZ::IO::InvalidHandle)
-            {
-                Logv(SRendItem::m_RecurseLevel[nProcessThread], "*** Prepare nearest Z range ***\n");
-            }
-            // set nice fov for weapons
-
-            float fFov = Cam.GetFov();
-            if (m_drawNearFov > 1.0f && m_drawNearFov < 179.0f)
-            {
-                fFov = DEG2RAD(m_drawNearFov);
-            }
-
-            float fNearRatio = DRAW_NEAREST_MIN / Cam.GetNearPlane();
-            Cam.SetAsymmetry(Cam.GetAsymL() * fNearRatio, Cam.GetAsymR() * fNearRatio, Cam.GetAsymB() * fNearRatio, Cam.GetAsymT() * fNearRatio);
-            Cam.SetFrustum(Cam.GetViewSurfaceX(), Cam.GetViewSurfaceZ(), fFov, DRAW_NEAREST_MIN, CV_r_DrawNearFarPlane, Cam.GetPixelAspectRatio());
-
-            SetCamera(Cam);
-            m_NewViewport.fMaxZ = CV_r_DrawNearZRange;
-            m_RP.m_Flags |= RBF_NEAREST;
-        }
-        else
-        {
-            if (m_logFileHandle != AZ::IO::InvalidHandle)
-            {
-                Logv(SRendItem::m_RecurseLevel[nProcessThread], "*** Restore Z range ***\n");
-            }
-
-            SetCamera(m_RP.m_PrevCamera);
-            m_NewViewport.fMaxZ = m_RP.m_PrevCamera.GetZRangeMax();
-            m_RP.m_Flags &= ~RBF_NEAREST;
-        }
-
-        m_bViewportDirty = true;
-    }
-    m_RP.m_nCurrResolveBounds[0] = m_RP.m_nCurrResolveBounds[1] = m_RP.m_nCurrResolveBounds[2] = m_RP.m_nCurrResolveBounds[3] = 0;
-}
-
-void CD3D9Renderer::HandleDefaultObject()
-{
-    if (m_RP.m_Flags & (RBF_NEAREST))
-    {
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** Restore Z range/camera ***\n");
-        }
-        SetCamera(m_RP.m_PrevCamera);
-        m_NewViewport.fMaxZ = 1.0f;
-        m_bViewportDirty = true;
-        m_RP.m_Flags &= ~(RBF_NEAREST);
-    }
-    m_ViewMatrix = m_CameraMatrix;
-    // Restore transform
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-    pShaderThreadInfo->m_matView = m_CameraMatrix;
-}
-
-//=================================================================================
-// Check buffer overflow during geometry batching
-void CRenderer::FX_CheckOverflow(int nVerts, int nInds, IRenderElement* re, int* nNewVerts, int* nNewInds)
-{
-    if (nNewVerts)
-    {
-        *nNewVerts = nVerts;
-    }
-    if (nNewInds)
-    {
-        *nNewInds = nInds;
-    }
-
-    if (m_RP.m_pRE || (m_RP.m_RendNumVerts + nVerts >= m_RP.m_MaxVerts || m_RP.m_RendNumIndices + nInds >= m_RP.m_MaxTris * 3))
-    {
-        m_RP.m_pRenderFunc();
-        if (nVerts >= m_RP.m_MaxVerts)
-        {
-            // iLog->Log("CD3D9Renderer::EF_CheckOverflow: numVerts >= MAX (%d > %d)\n", nVerts, m_RP.m_MaxVerts);
-            assert(nNewVerts);
-            *nNewVerts = m_RP.m_MaxVerts;
-        }
-        if (nInds >= m_RP.m_MaxTris * 3)
-        {
-            // iLog->Log("CD3D9Renderer::EF_CheckOverflow: numIndices >= MAX (%d > %d)\n", nInds, m_RP.m_MaxTris*3);
-            assert(nNewInds);
-            *nNewInds = m_RP.m_MaxTris * 3;
-        }
-        FX_Start(m_RP.m_pShader, m_RP.m_nShaderTechnique, m_RP.m_pShaderResources, re);
-        FX_StartMerging();
-    }
-}
-
-// Start of the new shader pipeline (3D pipeline version)
-void CRenderer::FX_Start(CShader* ef, int nTech, CShaderResources* Res, [[maybe_unused]] IRenderElement* re)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-        assert(ef);
-
-    PrefetchLine(&m_RP.m_pCurObject, 64);
-    PrefetchLine(&m_RP.m_Frame, 0);
-
-    if (!ef)        // should not be 0, check to prevent crash
-    {
-        return;
-    }
-
-    PrefetchLine(&ef->m_vertexFormat, 0);
-
-    m_RP.m_nNumRendPasses = 0;
-    m_RP.m_FirstIndex = 0;
-    m_RP.m_FirstVertex = 0;
-    m_RP.m_RendNumIndices = 0;
-    m_RP.m_RendNumVerts = 0;
-    m_RP.m_RendNumGroup = -1;
-    m_RP.m_pShader = ef;
-    m_RP.m_nShaderTechnique = nTech;
-    m_RP.m_nShaderTechniqueType = -1;
-    m_RP.m_pShaderResources = Res;
-    m_RP.m_FlagsPerFlush = 0;
-
-    m_RP.m_FlagsStreams_Decl = 0;
-    m_RP.m_FlagsStreams_Stream = 0;
-    m_RP.m_FlagsShader_RT = 0;
-    m_RP.m_FlagsShader_MD = 0;
-    m_RP.m_FlagsShader_MDV = 0;
-
-    const uint64 hdrMode = g_HWSR_MaskBit[HWSR_HDR_MODE];
-    const uint64 sample0 = g_HWSR_MaskBit[HWSR_SAMPLE0];
-    const uint64 sample1 = g_HWSR_MaskBit[HWSR_SAMPLE1];
-    const uint64 sample4 = g_HWSR_MaskBit[HWSR_SAMPLE4];
-    const uint64 tiled = g_HWSR_MaskBit[HWSR_TILED_SHADING];
-
-    FX_ApplyShaderQuality(ef->m_eShaderType);
-
-    const uint32 nPersFlags2 = m_RP.m_PersFlags2;
-    if ((nPersFlags2 & RBPF2_HDR_FP16) && !(m_RP.m_nBatchFilter & (FB_Z)))
-    {
-        m_RP.m_FlagsShader_RT |= hdrMode; // deprecated: redundant flag, will be dropped (rendering always HDR)
-    }
-    static const uint32 nPFlags2Mask = (RBPF2_WATERRIPPLES | RBPF2_RAINRIPPLES | RBPF2_SKIN);
-    if (nPersFlags2 & nPFlags2Mask)
-    {
-        if (nPersFlags2 & RBPF2_SKIN)
-        {
-            m_RP.m_FlagsShader_RT |= sample0;
-        }
-        else
-        if ((nPersFlags2 & (RBPF2_WATERRIPPLES | RBPF2_RAINRIPPLES)) && ef->m_eShaderType == eST_Water)
-        {
-            m_RP.m_FlagsShader_RT |= (nPersFlags2 & RBPF2_WATERRIPPLES) ? sample4 : 0;
-            m_RP.m_FlagsShader_RT |= (nPersFlags2 & RBPF2_RAINRIPPLES) ? g_HWSR_MaskBit[HWSR_OCEAN_PARTICLE] : 0;
-        }
-    }
-
-    // Set shader flag for tiled forward shading
-    if (CV_r_DeferredShadingTiled > 0)
-    {
-        m_RP.m_FlagsShader_RT |= tiled;
-    }
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-    if (pShaderThreadInfo->m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_REVERSE_DEPTH];
-    }
-
-    m_RP.m_fCurOpacity = 1.0f;
-    m_RP.m_CurVFormat = ef->m_vertexFormat;
-    m_RP.m_ObjFlags = m_RP.m_pCurObject->m_ObjFlags;
-    m_RP.m_RIs[0].SetUse(0);
-    m_RP.m_nLastRE = 0;
-
-
-    m_RP.m_pRE = NULL;
-    m_RP.m_Frame++;
-}
-
-//==============================================================================================
-
-static void sBatchFilter(uint32 nFilter, char* sFilt)
-{
-    STATIC_ASSERT((1 << ((sizeof(sBatchList) / sizeof(sBatchList[0])) - 1) <= FB_MASK), "Batch techniques/flags list mismatch");
-
-AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
-    sFilt[0] = 0;
-    int n = 0;
-    for (int i = 0; i < sizeof(sBatchList) / sizeof(sBatchList[0]); i++)
-    {
-        if (nFilter & (1 << i))
-        {
-            if (n)
-            {
-                strcat(sFilt, "|");
-            }
-            strcat(sFilt, sBatchList[i]);
-            n++;
-        }
-    }
-AZ_POP_DISABLE_WARNING
-}
-
-void CD3D9Renderer::FX_StartBatching()
-{
-    m_RP.m_nCommitFlags = FC_ALL;
-}
-
-void CD3D9Renderer::FX_ProcessBatchesList(int nums, int nume, uint32 nBatchFilter, uint32 nBatchExcludeFilter)
-{
-    PROFILE_FRAME(ProcessBatchesList);
-
-    if (nume - nums == 0)
-    {
-        return;
-    }
-    SRenderPipeline& RESTRICT_REFERENCE rRP = m_RP;
-    int nList = rRP.m_nPassGroupID;
-    int nAW = rRP.m_nSortGroupID;
-    int nThreadID = rRP.m_nProcessThreadID;
-
-    auto& RESTRICT_REFERENCE RI = CRenderView::CurrentRenderView()->GetRenderItems(nAW, nList);
-    assert(nums < RI.size());
-    assert(nume <= RI.size());
-
-
-    rRP.m_nBatchFilter = nBatchFilter;
-
-    // make sure all all jobs which are computing particle vertices/indices
-    // have finished and their vertex/index buffers are unlocked
-    // before starting rendering of those
-    if (rRP.m_nPassGroupID == EFSLIST_TRANSP || rRP.m_nPassGroupID == EFSLIST_HALFRES_PARTICLES || rRP.m_nPassGroupID == EFSLIST_PARTICLES_THICKNESS)
-    {
-        m_ComputeVerticesJobExecutors[m_RP.m_nProcessThreadID].WaitForCompletion();
-        UnLockParticleVideoMemory(gRenDev->m_nPoolIndexRT % SRenderPipeline::nNumParticleVertexIndexBuffer);
-    }
-
-#ifdef DO_RENDERLOG
-    STATIC_ASSERT(((sizeof(sDescList) / sizeof(sDescList[0])) == EFSLIST_NUM), "Batch techniques/flags list mismatch");
-
-    if (CV_r_log)
-    {
-        char sFilt[256];
-        sBatchFilter(nBatchFilter, sFilt);
-        Logv(SRendItem::m_RecurseLevel[nThreadID], "\n*** Start batch list %s (Filter: %s) (%s) ***\n", sDescList[nList], sFilt, nAW ? "After water" : "Before water");
-    }
-#endif
-
-    uint32 prevSortVal = -1;
-    CShader* pShader = NULL;
-    CShaderResources* pCurRes = NULL;
-    CRenderObject* pCurObject = NULL;
-    CShader* pCurShader = NULL;
-    int nTech;
-
-    for (int i = nums; i < nume; i++)
-    {
-        SRendItem& ri = RI[i];
-        if (!(ri.nBatchFlags & nBatchFilter))
-        {
-            continue;
-        }
-        if (ri.nBatchFlags & nBatchExcludeFilter)
-        {
-            continue;
-        }
-
-        CRenderObject* pObject = ri.pObj;
-        IRenderElement* pRE = ri.pElem;
-        bool bChangedShader = false;
-        bool bResIdentical = true;
-        if (prevSortVal != ri.SortVal)
-        {
-            CShaderResources* pRes;
-            SRendItem::mfGet(ri.SortVal, nTech, pShader, pRes);
-            if (pShader != pCurShader || !pRes || !pCurRes || pRes->m_IdGroup != pCurRes->m_IdGroup || (pObject->m_ObjFlags & (FOB_SKINNED | FOB_DECAL))) // Additional check for materials batching
-            {
-                bChangedShader = true;
-            }
-            bResIdentical = (pRes == pCurRes);
-            pCurRes = pRes;
-            prevSortVal = ri.SortVal;
-        }
-        if (!bChangedShader && FX_TryToMerge(pObject, pCurObject, pRE, bResIdentical))
-        {
-            rRP.m_RIs[rRP.m_nLastRE].AddElem(&ri);
-            continue;
-        }
-        // when not doing main pass rendering, need to flush the shader for each data part since the external VMEM buffers are laid out only for the main pass
-        if (pObject && pObject != pCurObject || (m_RP.m_FlagsPerFlush & RBSI_EXTERN_VMEM_BUFFERS))
-        {
-            if (pCurShader)
-            {
-                rRP.m_pRenderFunc();
-                pCurShader = NULL;
-                bChangedShader = true;
-            }
-            if (!FX_ObjectChange(pShader, pCurRes, pObject, pRE))
-            {
-                prevSortVal = ~0;
-                continue;
-            }
-            pCurObject = pObject;
-        }
-
-        if (bChangedShader)
-        {
-            if (pCurShader)
-            {
-                rRP.m_pRenderFunc();
-            }
-
-            pCurShader = pShader;
-            FX_Start(pShader, nTech, pCurRes, pRE);
-        }
-
-        if (pRE)
-        {
-            pRE->mfPrepare(true);
-        }
-
-        if (rRP.m_RIs[0].size() == 0)
-        {
-            rRP.m_RIs[0].AddElem(&ri);
-        }
-    }
-    if (pCurShader)
-    {
-        rRP.m_pRenderFunc();
-    }
-
-#ifdef DO_RENDERLOG
-    if (CV_r_log)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** End batch list ***\n\n");
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Only do expensive DX12 resource set building for PC DX12
-#if defined(CRY_USE_DX12)
-void CD3D9Renderer::PerFrameValidateResourceSets()
-{
-    AZ_TRACE_METHOD();
-    int dirtyCount = CDeviceResourceSet::GetGlobalDirtyCount();
-    if (dirtyCount != 0)
-    {
-        // Goes thou the list of all known resources and check if any of them needs to be re build.
-        //////////////////////////////////////////////////////////////////////////
-        for (unsigned int i = 0; i < CShader::s_ShaderResources_known.Num(); i++)
-        {
-            CShaderResources* pSR = CShader::s_ShaderResources_known[i];
-            if (pSR && pSR->m_pCompiledResourceSet)
-            {
-                if (pSR->m_pCompiledResourceSet->IsDirty())
-                {
-                    pSR->m_pCompiledResourceSet->Build();
-                }
-            }
-        }
-        if (dirtyCount == CDeviceResourceSet::GetGlobalDirtyCount())
-        {
-            CDeviceResourceSet::ResetGlobalDirtyCount();
-        }
-    }
-}
-#endif
-
-void CD3D9Renderer::FX_ProcessRenderList(int nums, int nume, int nList, int nAfterWater, void(* RenderFunc)(), bool bLighting, 
-    uint32 nBatchFilter, uint32 nBatchExcludeFilter)
-{
-    if (nume - nums < 1)
-    {
-        return;
-    }
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    const bool bTranspPass = (nList == EFSLIST_TRANSP) || (nList == EFSLIST_HALFRES_PARTICLES);
-    if (bTranspPass && !CV_r_TransparentPasses)
-    {
-        return;
-    }
-
-    Matrix44A origMatView = pShaderThreadInfo->m_matView;
-    Matrix44A origMatProj = pShaderThreadInfo->m_matProj;
-
-    m_RP.m_pRenderFunc = RenderFunc;
-
-    m_RP.m_pCurObject = m_RP.m_pIdendityRenderObject;
-    m_RP.m_pPrevObject = m_RP.m_pCurObject;
-
-    FX_PreRender(3);
-
-    int nPrevGroup = m_RP.m_nPassGroupID;
-    int nPrevGroup2 = m_RP.m_nPassGroupDIP;
-    int nPrevSortGroupID = m_RP.m_nSortGroupID;
-
-    m_RP.m_nPassGroupID = nList;
-    m_RP.m_nPassGroupDIP = nList;
-    m_RP.m_nSortGroupID = nAfterWater;
-
-    FX_ProcessBatchesList(nums, nume, nBatchFilter, nBatchExcludeFilter);
-
-    if (bLighting)
-    {
-        FX_ProcessPostGroups(nums, nume);
-    }
-
-    FX_PostRender();
-
-    pShaderThreadInfo->m_matView = origMatView;
-    pShaderThreadInfo->m_matProj = origMatProj;
-
-    m_RP.m_nPassGroupID = nPrevGroup;
-    m_RP.m_nPassGroupDIP = nPrevGroup2;
-    m_RP.m_nSortGroupID = nPrevSortGroupID;
-}
-
-void CD3D9Renderer::FX_ProcessRenderList(int nList, uint32 nBatchFilter, bool bSetRenderFunc /* = true */)
-{
-    FX_PreRender(3);
-
-    if (bSetRenderFunc)
-    {
-        m_RP.m_pRenderFunc = FX_FlushShader_General;
-    }
-    m_RP.m_nPassGroupID = nList;
-    m_RP.m_nPassGroupDIP = nList;
-
-    //PROFILE_DIPS_START;
-
-    m_RP.m_nSortGroupID = 0;
-    FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][nList], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][nList], nBatchFilter);
-
-    m_RP.m_nSortGroupID = 1;
-    FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][nList], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][nList], nBatchFilter);
-
-    //PROFILE_DIPS_END(nList);
-
-    FX_PostRender();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-void CD3D9Renderer::FX_ProcessZPassRender_List(ERenderListID list, uint32 filter = FB_Z)
-{
-    m_RP.m_nPassGroupID = list;
-    m_RP.m_nPassGroupDIP = list;
-
-    m_RP.m_nSortGroupID = 0;
-    FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][list], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][list], filter);
-    m_RP.m_nSortGroupID = 1;
-    FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][list], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][list], filter);
-}
-
-void CD3D9Renderer::FX_ProcessZPassRenderLists()
-{
-    PROFILE_LABEL_SCOPE("ZPASS");
-
-    if (SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID] > 0)
-    {
-        return;
-    }
-
-    uint32 bfGeneral = SRendItem::BatchFlags(EFSLIST_GENERAL, m_RP.m_pRLD);
-    uint32 bfSkin = SRendItem::BatchFlags(EFSLIST_SKIN, m_RP.m_pRLD);
-    uint32 bfTransp = SRendItem::BatchFlags(EFSLIST_TRANSP, m_RP.m_pRLD);
-    uint32 bfDecal = SRendItem::BatchFlags(EFSLIST_DECAL, m_RP.m_pRLD);
-    bfGeneral |= FB_Z;
-
-
-    if ((bfGeneral | bfSkin | bfTransp | bfDecal) & FB_Z)
-    {
-#ifdef DO_RENDERLOG
-        if (CV_r_log)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** Start z-pass ***\n");
-        }
-#endif
-
-        FX_PreRender(3);
-
-        m_RP.m_pRenderFunc = FX_FlushShader_ZPass;
-        const bool isGmemEnabled = FX_GetEnabledGmemPath(nullptr) != CD3D9Renderer::eGT_REGULAR_PATH;
-        bool bClearZBuffer = !(m_RP.m_nRendFlags & SHDF_DO_NOT_CLEAR_Z_BUFFER);
-
-        // For GMEM paths, depth/stencil clear gets set in CD3D9Renderer::FX_GmemTransition(...).
-        bClearZBuffer &= !isGmemEnabled;
-
-        // For GMEM paths, velocity RT clear gets set in CD3D9Renderer::FX_GmemTransition(...).
-        if (!FX_GetEnabledGmemPath(nullptr) && UseHalfFloatRenderTargets())
-        {
-            FX_ClearTarget(GetUtils().GetVelocityObjectRT(), Clr_White);
-        }
-
-        if (CRenderer::CV_r_usezpass == 2)
-        {
-            if (bfGeneral & FB_ZPREPASS)
-            {
-                PROFILE_LABEL_SCOPE("ZPREPASS");
-
-                // Clear z target to prevent issues during reprojection.
-                // Following would resolve GMEM paths.
-                if (!FX_GetEnabledGmemPath(nullptr))
-                {
-                    FX_ClearTarget(CTexture::s_ptexZTarget, Clr_White);
-                }
-
-                FX_ZScene(true, bClearZBuffer, false, true);
-
-                FX_ProcessZPassRender_List(EFSLIST_GENERAL, FB_ZPREPASS);
-
-                FX_ZScene(false, false, false, true);
-                bClearZBuffer = false;
-            }
-        }
-
-        {
-            PROFILE_LABEL_SCOPE("GBUFFER");
-
-            FX_ZScene(true, bClearZBuffer);
-
-            if (bfGeneral & FB_Z)
-            {
-                PROFILE_LABEL_SCOPE("GENERAL");
-                FX_ProcessZPassRender_List(EFSLIST_GENERAL);
-            }
-            if (bfSkin    & FB_Z)
-            {
-                PROFILE_LABEL_SCOPE("SKIN");
-                FX_ProcessZPassRender_List(EFSLIST_SKIN);
-            }
-            if (bfTransp  & FB_Z)
-            {
-                PROFILE_LABEL_SCOPE("TRANSPARENT");
-                FX_ProcessZPassRender_List(EFSLIST_TRANSP);
-            }
-
-            // PC special case: render terrain/decals/roads normals separately - disable mrt rendering, on consoles we always use single rt for output
-            FX_ZScene(false, false);
-            FX_ZScene(true, false, true);
-
-            m_RP.m_PersFlags2 &= ~RBPF2_NOALPHABLEND;
-            m_RP.m_StateAnd |= GS_BLEND_MASK;
-
-            if (bfDecal        & FB_Z)
-            {
-                PROFILE_LABEL_SCOPE("DECALS");
-                FX_ProcessZPassRender_List(EFSLIST_DECAL);
-            }
-
-            FX_ZScene(false, false, true);
-        }
-
-        if (isGmemEnabled)
-        {
-            FX_GmemTransition(eGT_POST_GBUFFER);
-        }
-
-        // For some GMEM paths, the depth gets linearized right away during z-pass.
-        // Depth downsampling gets done during transitions in CD3D9Renderer::FX_GmemTransition(...).
-        if (!isGmemEnabled)
-        {
-            // Reset current object so we don't end up with RBF_NEAREST states in FX_LinearizeDepth
-            FX_ObjectChange(NULL, NULL, m_RP.m_pIdendityRenderObject, NULL);
-
-            FX_LinearizeDepth(CTexture::s_ptexZTarget);
-
-            if (!CRenderer::CV_r_EnableComputeDownSampling)
-            {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DRENDPIPELINE_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(D3DRendPipeline_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-                GetUtils().DownsampleDepth(CTexture::s_ptexZTarget, CTexture::s_ptexZTargetScaled, true);
-#endif
-                GetUtils().DownsampleDepth(CTexture::s_ptexZTargetScaled, CTexture::s_ptexZTargetScaled2, false);
-            }
-            else
-            {
-                CTexture* UAVArr[2] =
-                {
-                    CTexture::s_ptexZTargetScaled,
-                    CTexture::s_ptexZTargetScaled2
-                };
-                GetUtils().DownsampleDepthUsingCompute(CTexture::s_ptexZTarget, UAVArr, false);
-            }
-        }
-
-        FurPasses::GetInstance().ExecuteZPostPass();
-
-        FX_ZScene(true, false, true);
-        m_RP.m_PersFlags2 &= ~RBPF2_NOALPHABLEND;
-        m_RP.m_StateAnd |= GS_BLEND_MASK;
-
-        FX_PostRender();
-        RT_SetViewport(0, 0, GetWidth(), GetHeight());
-
-        if (m_RP.m_PersFlags2 & RBPF2_ALLOW_DEFERREDSHADING)
-        {
-            m_bDeferredDecals = FX_DeferredDecals();
-        }
-
-        m_RP.m_PersFlags2 |= RBPF2_NOALPHABLEND;
-        m_RP.m_StateAnd &= ~GS_BLEND_MASK;
-
-        FX_ZScene(false, false, true);
-
-        FX_ZTargetReadBack();
-
-        m_RP.m_pRenderFunc = FX_FlushShader_General;
-
-#ifdef DO_RENDERLOG
-        if (CV_r_log)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** End z-pass ***\n");
-        }
-#endif
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::FX_ProcessThicknessRenderLists()
-{
-    int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    if ((m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS) && recursiveLevel <= 0 && 0) // Thickness pass disabled temporarily
-    {
-        uint32 nBatchMask = SRendItem::BatchFlags(EFSLIST_TRANSP, m_RP.m_pRLD);
-        if (nBatchMask & FB_PARTICLES_THICKNESS)
-        {
-            PROFILE_LABEL_SCOPE("PARTICLES_THICKNESS_PASS");
-
-            CTexture* pThicknessTarget = CTexture::s_ptexBackBufferScaled[1];
-            const uint32 nWidthRT = pThicknessTarget->GetWidth();
-            const uint32 nHeightRT = pThicknessTarget->GetHeight();
-
-            FX_PreRender(3);
-
-            // Get current viewport
-            int iTempX, iTempY, iWidth, iHeight;
-            GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-            FX_ClearTarget(pThicknessTarget, Clr_Median);
-            FX_PushRenderTarget(0, pThicknessTarget, NULL);
-            RT_SetViewport(0, 0, nWidthRT, nHeightRT);
-
-            m_RP.m_nPassGroupID = EFSLIST_TRANSP;
-            m_RP.m_nPassGroupDIP = EFSLIST_TRANSP;
-
-            m_RP.m_nSortGroupID = 0;
-            FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][EFSLIST_TRANSP], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][EFSLIST_TRANSP], FB_PARTICLES_THICKNESS);
-
-            m_RP.m_nSortGroupID = 1;
-            FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][EFSLIST_TRANSP], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][EFSLIST_TRANSP], FB_PARTICLES_THICKNESS);
-
-            FX_PopRenderTarget(0);
-
-            PostProcessUtils().TexBlurGaussian(pThicknessTarget, 1, 1, 1.0f, false);
-            FX_SetActiveRenderTargets();
-            RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-            FX_PostRender();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::FX_ProcessSoftAlphaTestRenderLists()
-{
-    int32 nList = EFSLIST_GENERAL;
-
-    int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    if ((m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS) && recursiveLevel <= 0)
-    {
-#ifdef DO_RENDERLOG
-        if (CV_r_log)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** Begin soft alpha test pass ***\n");
-        }
-#endif
-
-        uint32 nBatchMask = SRendItem::BatchFlags(nList, m_RP.m_pRLD);
-        if (nBatchMask & FB_SOFTALPHATEST)
-        {
-            m_RP.m_PersFlags2 |= RBPF2_NOALPHATEST;
-
-            FX_PreRender(3);
-
-            m_RP.m_nPassGroupID = nList;
-            m_RP.m_nPassGroupDIP = nList;
-
-            m_RP.m_nSortGroupID = 0;
-            FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][nList], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][nList], FB_SOFTALPHATEST);
-            m_RP.m_nSortGroupID = 1;
-            FX_ProcessBatchesList(m_RP.m_pRLD->m_nStartRI[m_RP.m_nSortGroupID][nList], m_RP.m_pRLD->m_nEndRI[m_RP.m_nSortGroupID][nList], FB_SOFTALPHATEST);
-
-            FX_PostRender();
-
-            m_RP.m_PersFlags2 &= ~RBPF2_NOALPHATEST;
-        }
-
-#ifdef DO_RENDERLOG
-        if (CV_r_log)
-        {
-            Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], "*** End soft alpha test pass ***\n");
-        }
-#endif
-    }
-}
-
-
-void CD3D9Renderer::FX_ProcessPostRenderLists(uint32 nBatchFilter)
-{
-    int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-
-    if ((m_RP.m_nRendFlags & SHDF_ALLOWPOSTPROCESS) && recursiveLevel <= 0)
-    {
-        uint32 nBatchMask = SRendItem::BatchFlags(EFSLIST_GENERAL, m_RP.m_pRLD) | SRendItem::BatchFlags(EFSLIST_TRANSP, m_RP.m_pRLD);
-        nBatchMask |= SRendItem::BatchFlags(EFSLIST_DECAL, m_RP.m_pRLD);
-        nBatchMask |= SRendItem::BatchFlags(EFSLIST_SKIN, m_RP.m_pRLD);
-        if (nBatchMask & nBatchFilter)
-        {
-            if (nBatchFilter == FB_CUSTOM_RENDER || nBatchFilter == FB_POST_3D_RENDER)
-            {
-                FX_CustomRenderScene(true);
-            }
-
-            FX_ProcessRenderList(EFSLIST_GENERAL, nBatchFilter);
-            FX_ProcessRenderList(EFSLIST_SKIN, nBatchFilter);
-
-            if (nBatchFilter != FB_MOTIONBLUR)
-            {
-                FX_ProcessRenderList(EFSLIST_DECAL, nBatchFilter);
-            }
-
-            FX_ProcessRenderList(EFSLIST_TRANSP, nBatchFilter);
-
-            if (nBatchFilter == FB_CUSTOM_RENDER || nBatchFilter == FB_POST_3D_RENDER)
-            {
-                FX_CustomRenderScene(false);
-            }
-        }
-    }
-}
-
-void CD3D9Renderer::FX_ProcessPostGroups(int nums, int nume)
-{
-    const uint32 nPrevPersFlags2 = m_RP.m_PersFlags2;
-    m_RP.m_PersFlags2 &= ~RBPF2_FORWARD_SHADING_PASS;
-
-    uint32 nBatchMask = m_RP.m_pRLD->m_nBatchFlags[m_RP.m_nSortGroupID][m_RP.m_nPassGroupID];
-    AZ_PUSH_DISABLE_WARNING(, "-Wconstant-logical-operand")
-    if (nBatchMask & FB_MULTILAYERS && CV_r_usemateriallayers)
-    AZ_POP_DISABLE_WARNING
-    {
-        FX_ProcessBatchesList(nums, nume, FB_MULTILAYERS);
-    }
-    if (0 != (nBatchMask & FB_DEBUG))
-    {
-        FX_ProcessBatchesList(nums, nume, FB_DEBUG);
-    }
-
-    m_RP.m_PersFlags2 = nPrevPersFlags2;
-}
-
-
-void CD3D9Renderer::FX_ApplyThreadState(SThreadInfo& TI, SThreadInfo* pOldTI)
-{
-    if (pOldTI)
-    {
-        *pOldTI = m_RP.m_TI[m_RP.m_nProcessThreadID];
-    }
-
-    m_RP.m_TI[m_RP.m_nProcessThreadID] = TI;
-}
-
-CD3D9Renderer::OcclusionReadbackData::~OcclusionReadbackData()
-{
-    Destroy();
-}
-
-void CD3D9Renderer::OcclusionReadbackData::Destroy()
-{
-    azfree(m_occlusionReadbackBuffer);
-    m_occlusionReadbackBuffer = nullptr;
-}
-void CD3D9Renderer::OcclusionReadbackData::Reset(bool reverseDepth)
-{
-    m_occlusionReadbackViewProj.SetIdentity();
-
-    if (!m_occlusionReadbackBuffer)
-    {
-        m_occlusionReadbackBuffer = static_cast<float*>(azmalloc(CD3D9Renderer::s_occlusionBufferNumElements * sizeof(float), 16));
-    }
-    std::fill(m_occlusionReadbackBuffer, m_occlusionReadbackBuffer + CD3D9Renderer::s_occlusionBufferNumElements, (reverseDepth) ? 0.0f : 1.0f);
-}
-
-void CD3D9Renderer::InvalidateCoverageBufferData()
-{
-    static const char* occlusionDataTextureName[s_numOcclusionReadbackTextures] = {
-        "$ZTargetReadBack0",
-        "$ZTargetReadBack1",
-        "$ZTargetReadBack2"
-    };
-
-    static_assert(s_numOcclusionReadbackTextures == 3, "Change the initialization of occlusionDataTextureName if you change s_numOcclusionReadbackTextures!");
-
-    for (size_t i = 0; i < s_numOcclusionReadbackTextures; i++)
-    {
-        m_occlusionData[i].SetupOcclusionData(occlusionDataTextureName[i]);
-    }
-    m_cpuOcclusionReadIndex = 0;
-    m_occlusionBufferIndex = 0;
-}
-
-void CD3D9Renderer::CPUOcclusionData::SetupOcclusionData(const char* textureName)
-{
-    m_occlusionDataState = CPUOcclusionData::OcclusionDataState::OcclusionDataInvalid;
-    m_occlusionViewProj.SetIdentity();
-    
-    // Note: The macro Clr_FarPlane_R expects the variable name bReverseDepth to determine the clear value
-    const bool bReverseDepth = CRenderer::CV_r_ReverseDepth > 0 ? true : false;
-    if (!m_zTargetReadback)
-    {
-        unsigned int flags = FT_DONT_STREAM | FT_DONT_RELEASE | FT_STAGE_READBACK;
-        m_zTargetReadback = CTexture::CreateTextureObject(textureName, s_occlusionBufferWidth, s_occlusionBufferHeight, 1, eTT_2D, flags, eTF_Unknown);
-        //CPU reading code expects it to be 32 bit float. Changing this to 16bit would require "16bit to 32bitfloat" conversion in FX_ZTargetReadBackOnCPU.
-        m_zTargetReadback->CreateRenderTarget(eTF_R32F, Clr_FarPlane_R); 
-    }
-
-    m_occlusionReadbackData.Reset(bReverseDepth);    
-}
-
-void CD3D9Renderer::CPUOcclusionData::Destroy()
-{
-    SAFE_RELEASE(m_zTargetReadback);
-    m_occlusionReadbackData.Destroy();
-}
-
-int CD3D9Renderer::GetOcclusionBuffer(uint16* pOutOcclBuffer, Matrix44* pmCamBuffer)
-{
-    AZ_Assert(m_cpuOcclusionReadIndex < s_numOcclusionReadbackTextures, "m_cpuOcclusionReadIndex (%u) out of range (%u)", m_cpuOcclusionReadIndex.load(), s_numOcclusionReadbackTextures);
-    const CPUOcclusionData& occlusionData = m_occlusionData[m_cpuOcclusionReadIndex];
-
-    // Do not perform occlusion checks if our data is not ready or has been invalidated
-    if (occlusionData.m_occlusionDataState == CPUOcclusionData::OcclusionDataState::OcclusionDataInvalid)
-    {
-        return 0;
-    }
-
-    const OcclusionReadbackData& readbackData = occlusionData.m_occlusionReadbackData;
-
-    // Copy the data that was prepared by the render thread for use with the Coverage Buffer system
-    memcpy(pOutOcclBuffer, readbackData.m_occlusionReadbackBuffer, s_occlusionBufferNumElements * sizeof(float));
-    
-    *pmCamBuffer = readbackData.m_occlusionReadbackViewProj;
-
-    return 1;
-}
-
-bool IsDepthReadbackOcclusionEnabled()
-{
-    static ICVar* pCVCheckOcclusion = gEnv->pConsole->GetCVar("e_CheckOcclusion");
-    static ICVar* pCVStatObjBufferRenderTasks = gEnv->pConsole->GetCVar("e_StatObjBufferRenderTasks");
-    static ICVar* pCVCoverageBufferReproj = gEnv->pConsole->GetCVar("e_CoverageBufferReproj");
-    if ((pCVCheckOcclusion && pCVCheckOcclusion->GetIVal() == 0) ||
-        (pCVStatObjBufferRenderTasks && pCVStatObjBufferRenderTasks->GetIVal() == 0) ||
-        (pCVCoverageBufferReproj && pCVCoverageBufferReproj->GetIVal() == 4))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void CD3D9Renderer::UpdateOcclusionDataForCPU()
-{
-    const bool bReverseDepth = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-    
-    // Copy to CPU accessible memory
-    m_occlusionData[m_occlusionBufferIndex].m_zTargetReadback->GetDevTexture()->DownloadToStagingResource(0);
-    
-    Matrix44 mCurView, mCurProj;
-    mCurView.SetIdentity();
-    mCurProj.SetIdentity();
-    GetModelViewMatrix(reinterpret_cast<f32*>(&mCurView));
-    GetProjectionMatrix(reinterpret_cast<f32*>(&mCurProj));
-    
-    if (bReverseDepth)
-    {
-        mCurProj = ReverseDepthHelper::Convert(mCurProj);
-    }
-    
-    m_occlusionData[m_occlusionBufferIndex].m_occlusionViewProj = mCurView * mCurProj;
-    m_occlusionData[m_occlusionBufferIndex].m_occlusionDataState = CPUOcclusionData::OcclusionDataState::OcclusionDataOnGPU;
-    
-    m_occlusionBufferIndex = (m_occlusionBufferIndex + 1) % s_numOcclusionReadbackTextures;
-}
-
-void CD3D9Renderer::FX_ZTargetReadBackOnCPU()
-{
-    PROFILE_LABEL_SCOPE("DEPTH READBACK CPU");
-    PROFILE_FRAME(FX_ZTargetReadBackOnCPU);
-
-    if (!IsDepthReadbackOcclusionEnabled() || (SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID] > 0))
-    {
-        return;
-    }
-
-    const bool isGmemEnabled = FX_GetEnabledGmemPath(nullptr) != CD3D9Renderer::eGT_REGULAR_PATH;
-    if (isGmemEnabled)
-    {
-        //Since FX_ZTargetReadBack can not be run for gmem path we update the
-        //occlusion data for m_occlusionData here.
-        UpdateOcclusionDataForCPU();
-    }
-
-    static ICVar* pCVCoverageBufferLatency = gEnv->pConsole->GetCVar("e_CoverageBufferNumberFramesLatency");    
-    int latency = pCVCoverageBufferLatency->GetIVal();
-
-    // Readback index for the depth buffer in our ring buffer
-    AZ::u8 occlusionReadbackIndex = 0;
-    static_assert(s_numOcclusionReadbackTextures <= 3, "Maximum of 3 occlusion readback textures currently supported");
-    switch (latency)
-    {
-    case 0:
-        // Do not perform any CPU readback
-        return;
-        break;
-
-    case 1:
-        // Readback the depth buffer that was written to this frame (CPU will stall on GPU, useful for debugging)
-        occlusionReadbackIndex = (m_occlusionBufferIndex + 2) % s_numOcclusionReadbackTextures;
-        break;
-
-    case 2:
-        // Readback previous frame.
-        occlusionReadbackIndex = (m_occlusionBufferIndex + 1) % s_numOcclusionReadbackTextures;
-        break;
-
-    case 3:
-        // Readback oldest frame
-        occlusionReadbackIndex = m_occlusionBufferIndex;
-        break;
-    }
-    CPUOcclusionData& occlusionData = m_occlusionData[occlusionReadbackIndex];
-
-    // Do not perform readback if our occlusion data is not ready to be read back
-    if (occlusionData.m_occlusionDataState != CPUOcclusionData::OcclusionDataState::OcclusionDataOnGPU)
-    {
-        return;
-    }
-
-    const bool bUseNativeDepth = CRenderer::CV_r_CBufferUseNativeDepth && !gEnv->IsEditor();
-    const bool bReverseDepth = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-    
-    int nCameraID = -1;
-
-    // In stereo rendering, we want the coverage buffer to be a merge of both rendered eyes. Otherwise one eye may
-    // cull out the geometry visible be the other eye.
-    bool mergePreviousBuffer = (GetS3DRend().GetStatus() == IStereoRenderer::Status::kRenderingSecondEye);
-
-    // Read data from the prepared frame
-    occlusionData.m_zTargetReadback->GetDevTexture()->AccessCurrStagingResource(0, false, [=, &nCameraID](void* pData, [[maybe_unused]] uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-    {
-        float* pDepths = reinterpret_cast<float*>(pData);
-        const CameraViewParameters& rc = GetViewParameters();
-        float zn = rc.fNear;
-        float zf = rc.fFar;
-        const float ProjRatioX  = zf / (zf - zn);
-        const float ProjRatioY  = zn / (zn - zf);
-                
-        OcclusionReadbackData& readbackData = m_occlusionData[occlusionReadbackIndex].m_occlusionReadbackData;
-        readbackData.m_occlusionReadbackViewProj = m_occlusionData[occlusionReadbackIndex].m_occlusionViewProj;
-        float* readBuffer = readbackData.m_occlusionReadbackBuffer;
-
-        if (bUseNativeDepth)
-        {
-            float x = floorf(pDepths[0] * 0.5f); // Decode the ID from the first pixel
-            readBuffer[0] = pDepths[0] - (x * 2.0f);
-            nCameraID  = (int)(x);
-
-            for (uint32 idx = 1; idx < s_occlusionBufferNumElements; idx++)
-            {
-                const float fDepthVal = bReverseDepth ? 1.0f - pDepths[idx] : pDepths[idx];
-                if (mergePreviousBuffer)
-                {
-                    if (readBuffer[idx] == FLT_EPSILON)
-                    {
-                        readBuffer[idx] = max(fDepthVal, FLT_EPSILON);
-                    }
-                    else
-                    {
-                        float maxDepth = max(fDepthVal, readBuffer[idx]);
-                        readBuffer[idx] = max(maxDepth, FLT_EPSILON);
-                    }
-                }
-                else
-                {
-                    readBuffer[idx] = max(fDepthVal, FLT_EPSILON);
-                }
-            }
-        }
-        else
-        {
-            for (uint32 idx = 0; idx < s_occlusionBufferNumElements; idx++)
-            {
-                if (!mergePreviousBuffer)
-                {
-                    readBuffer[idx] = max(ProjRatioY / max(pDepths[idx], FLT_EPSILON) + ProjRatioX, FLT_EPSILON);
-                }
-                else
-                {
-                    if (readBuffer[idx] == FLT_EPSILON)
-                    {
-                        readBuffer[idx] = max(ProjRatioY / max(pDepths[idx], FLT_EPSILON) + ProjRatioX, FLT_EPSILON);
-                    }
-                    else
-                    {
-                        float newDepth = ProjRatioY / max(pDepths[idx], FLT_EPSILON) + ProjRatioX;
-                        float maxDepth = max(newDepth, readBuffer[idx]);
-                        readBuffer[idx] = max(maxDepth, FLT_EPSILON);
-                    }
-                }
-            }
-        }
-
-        return true;
-    });
-
-    occlusionData.m_occlusionDataState = CPUOcclusionData::OcclusionDataState::OcclusionDataOnCPU;
-    m_cpuOcclusionReadIndex = occlusionReadbackIndex;
-}
-
-void CD3D9Renderer::FX_ZTargetReadBack()
-{
-    PROFILE_LABEL_SCOPE("DEPTH READBACK GPU");
-    PROFILE_FRAME(FX_ZTargetReadBack);
-
-    //Check for gmem as this code runs after gbuffer breaking gmem path. Besides we can just use
-    //downsampled linearized depth for occlusion.
-    const bool isGmemEnabled = FX_GetEnabledGmemPath(nullptr) != CD3D9Renderer::eGT_REGULAR_PATH;
-
-    if (!IsDepthReadbackOcclusionEnabled() || isGmemEnabled)
-    {
-        return;
-    }
-    
-    const bool bUseNativeDepth = CRenderer::CV_r_CBufferUseNativeDepth && !gEnv->IsEditor();
-    const bool bReverseDepth = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-    int sourceWidth = CTexture::s_ptexZTarget->GetWidth();
-    int sourceHeight = CTexture::s_ptexZTarget->GetHeight();
-
-    if (sourceWidth != m_occlusionSourceSizeX || sourceHeight != m_occlusionSourceSizeY)
-    {
-        m_occlusionSourceSizeX = sourceWidth;
-        m_occlusionSourceSizeY = sourceHeight;
-
-        int downSampleX = max(0, 1 + IntegerLog2((uint16)((m_occlusionSourceSizeX * m_RP.m_CurDownscaleFactor.x) / s_occlusionBufferWidth)));
-        int downSampleY = max(0, 1 + IntegerLog2((uint16)((m_occlusionSourceSizeY * m_RP.m_CurDownscaleFactor.y) / s_occlusionBufferHeight)));
-        m_numOcclusionDownsampleStages = min(4, max(downSampleX, downSampleY));
-        
-        const uint32 nFlags = FT_DONT_STREAM | FT_DONT_RELEASE | FT_STAGE_READBACK;
-        for (int downsampleStage = 0; downsampleStage < m_numOcclusionDownsampleStages; downsampleStage++)
-        {
-            const int width = s_occlusionBufferWidth << (m_numOcclusionDownsampleStages - downsampleStage - 1);
-            const int height = s_occlusionBufferHeight << (m_numOcclusionDownsampleStages - downsampleStage - 1);
-
-            if (CTexture::s_ptexZTargetDownSample[downsampleStage])
-            {
-                CTexture::s_ptexZTargetDownSample[downsampleStage]->m_nFlags = nFlags;
-                CTexture::s_ptexZTargetDownSample[downsampleStage]->m_nWidth = width;
-                CTexture::s_ptexZTargetDownSample[downsampleStage]->m_nHeight = height;
-
-                CTexture::s_ptexZTargetDownSample[downsampleStage]->CreateRenderTarget(CTexture::s_eTFZ, Clr_FarPlane_R);
-            }
-            else
-            {
-                assert(CTexture::s_ptexZTargetDownSample[downsampleStage]);
-            }
-        }
-
-        InvalidateCoverageBufferData();
-    }
-
-    // downsample on GPU
-    RECT srcRect;
-    srcRect.top = srcRect.left = 0;
-    srcRect.right = LONG(CTexture::s_ptexZTargetDownSample[0]->GetWidth() * m_RP.m_CurDownscaleFactor.x);
-    srcRect.bottom = LONG(CTexture::s_ptexZTargetDownSample[0]->GetHeight() * m_RP.m_CurDownscaleFactor.y);
-
-    RECT* srcRegion = &srcRect;
-
-    bool bMSAA = m_RP.m_MSAAData.Type ? true : false;
-
-    D3DShaderResourceView* pZTargetOrigSRV = (D3DShaderResourceView*)     CTexture::s_ptexZTarget->GetShaderResourceView(bMSAA ? SResourceView::DefaultViewMS : SResourceView::DefaultView);
-    if (bUseNativeDepth)
-    {
-        CTexture::s_ptexZTarget->SetShaderResourceView(m_pZBufferDepthReadOnlySRV, bMSAA);   // Read native depth, rather than linear. TODO: Check me, this may be slow on ATI MSAA
-
-        int vpX, vpY, vpWidth, vpHeight;
-        GetViewport(&vpX, &vpY, &vpWidth, &vpHeight);
-
-        srcRect.right  = LONG(srcRect.right * vpWidth  / float(m_width));
-        srcRect.bottom = LONG(srcRect.bottom * vpHeight / float(m_height));
-    }
-    else
-    {
-        bMSAA = false;
-    }
-
-    CTexture* pSrc = CTexture::s_ptexZTarget;
-    CTexture* pDst = CTexture::s_ptexZTarget;
-
-    bool bUseMSAA = bMSAA;
-    const SPostEffectsUtils::EDepthDownsample downsampleMode = (bUseNativeDepth && bReverseDepth)
-        ? SPostEffectsUtils::eDepthDownsample_Min
-        : SPostEffectsUtils::eDepthDownsample_Max;
-
-    for (int i = 0; i < m_numOcclusionDownsampleStages; i++)
-    {
-        pDst = CTexture::s_ptexZTargetDownSample[i];
-        GetUtils().StretchRect(pSrc, pDst, false, false, false, false, downsampleMode, false, srcRegion);
-        pSrc = pDst;
-        srcRegion = NULL;
-        bUseMSAA = false;
-    }
-
-    pSrc = pDst;
-    pDst = m_occlusionData[m_occlusionBufferIndex].m_zTargetReadback;
-    PostProcessUtils().StretchRect(pSrc, pDst, false, false, false, false, downsampleMode);
-
-    //  Blend ID into top left pixel of readback buffer
-    gcpRendD3D->FX_PushRenderTarget(0, pDst, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, 1, 1);
-
-    CShader* pSH = CShaderMan::s_ShaderCommon;
-    uint32 nPasses = 0;
-    pSH->FXSetTechnique("ClearUniform");
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-
-    static CCryNameR pClearParams("vClearParam");
-    m_RP.m_nZOcclusionBufferID = ((m_RP.m_nZOcclusionBufferID + 1) < CULLER_MAX_CAMS) ? (m_RP.m_nZOcclusionBufferID + 1) : 0;
-    Vec4 vFrameID = Vec4((float)(m_RP.m_nZOcclusionBufferID * 2.0f), 0, 0, 0);
-    pSH->FXSetPSFloat(pClearParams, &vFrameID, 1);
-
-    FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE);
-    D3DSetCull(eCULL_None);
-    float fX = (float)m_CurViewport.nWidth;
-    float fY = (float)m_CurViewport.nHeight;
-    ColorF col = Col_Black;
-    DrawQuad(-0.5f, -0.5f, fX - 0.5f, fY - 0.5f, col, 1.0f, fX, fY, fX, fY);
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->RT_SetViewport(0, 0, GetWidth(), GetHeight());
-    
-    if (bUseNativeDepth)
-    {
-        CTexture::s_ptexZTarget->SetShaderResourceView(pZTargetOrigSRV, bMSAA);
-    }
-    
-    UpdateOcclusionDataForCPU();
-}
-
-void CD3D9Renderer::FX_UpdateCharCBs()
-{
-    PROFILE_FRAME(FX_UpdateCharCBs);
-    AZ_TRACE_METHOD();
-    unsigned poolId = (m_nPoolIndexRT) % 3;
-    for (size_t boneType = 0; boneType < eBoneType_Count; ++boneType)
-    {
-        for (util::list<SCharInstCB>* iter = m_CharCBActiveList[boneType][poolId].next; iter != &m_CharCBActiveList[boneType][poolId]; iter = iter->next)
-        {
-            SCharInstCB* cb = iter->item<&SCharInstCB::list>();
-            if (cb->updated)
-            {
-                continue;
-            }
-            SSkinningData* pSkinningData = cb->m_pSD;
-
-            // make sure all sync jobs filling the buffers have finished
-            if (pSkinningData->pAsyncJobExecutor)
-            {
-                PROFILE_FRAME(FX_UpdateCharCBs_ASYNC_WAIT);
-                pSkinningData->pAsyncJobExecutor->WaitForCompletion();
-            }
-
-            if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_Matrix)
-            {
-                AZ_Assert(boneType == eBoneType_Matrix, "Skinning type is Matrix but bone type is not.");
-                cb->m_buffer->UpdateBuffer(pSkinningData->pBoneMatrices, pSkinningData->nNumBones * sizeof(Matrix34));
-            }
-            else
-            {
-                AZ_Assert(boneType == eBoneType_DualQuat, "Copying DualQuat buffer but bone type is not DualQuat.");
-                cb->m_buffer->UpdateBuffer(pSkinningData->pBoneQuatsS, pSkinningData->nNumBones * sizeof(DualQuat));
-            }
-
-            cb->updated = true;
-        }
-    }
-    // free a buffer each frame if we have an over-comittment of more than 75% compared
-    // to our last 2 frames of rendering
-    {
-        int committed = CryInterlockedCompareExchange((LONG*)&m_CharCBAllocated, 0, 0);
-        int totalRequested = m_CharCBFrameRequired[poolId] + m_CharCBFrameRequired[(poolId - 1) % 3];
-        WriteLock _lock(m_lockCharCB);
-
-        for (size_t boneType = 0; boneType < eBoneType_Count; ++boneType)
-        {
-            if (totalRequested * 4 > committed * 3 && m_CharCBFreeList[boneType].empty() == false)
-            {
-                delete m_CharCBFreeList[boneType].prev->item<&SCharInstCB::list>();
-                CryInterlockedDecrement(&m_CharCBAllocated);
-                break;
-            }
-        }
-    }
-}
-
-void* CD3D9Renderer::FX_AllocateCharInstCB(SSkinningData* pSkinningData, uint32 frameId)
-{
-    PROFILE_FRAME(FX_AllocateCharInstCB);
-    SCharInstCB* cb = NULL;
-
-    size_t boneType = eBoneType_DualQuat;
-    size_t boneSize = sizeof(DualQuat);
-
-    if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_Matrix)
-    {
-        boneType = eBoneType_Matrix;
-        boneSize = sizeof(Matrix34);
-    }
-
-    {
-        WriteLock _lock(m_lockCharCB);
-        if (m_CharCBFreeList[boneType].empty() == false)
-        {
-            cb = m_CharCBFreeList[boneType].next->item<& SCharInstCB::list>();
-            cb->list.erase();
-        }
-    }
-    if (cb == NULL)
-    {
-        cb = new SCharInstCB();
-        cb->m_buffer = gcpRendD3D->m_DevBufMan.CreateConstantBuffer(
-            "SkinningBones",
-            768 * boneSize,
-            AzRHI::ConstantBufferUsage::Static);
-        CryInterlockedIncrement(&m_CharCBAllocated);
-    }
-    cb->updated = false;
-    cb->m_pSD = pSkinningData;
-    {
-        WriteLock _lock(m_lockCharCB);
-        cb->list.relink_tail(&m_CharCBActiveList[boneType][frameId % 3]);
-    }
-    CryInterlockedIncrement(&m_CharCBFrameRequired[frameId % 3]);
-    return cb;
-}
-
-void CD3D9Renderer::FX_ClearCharInstCB(uint32 frameId)
-{
-    PROFILE_FRAME(FX_ClearCharInstCB);
-    uint32 poolId = frameId % 3;
-    WriteLock _lock(m_lockCharCB);
-    m_CharCBFrameRequired[poolId] = 0;
-
-    for (size_t boneType = 0; boneType < eBoneType_Count; ++boneType)
-    {
-        m_CharCBFreeList[boneType].splice_tail(&m_CharCBActiveList[boneType][poolId]);
-    }
-}
-
-// Render thread only scene rendering
-void CD3D9Renderer::RT_RenderScene(int nFlags, SThreadInfo& TI, void(* RenderFunc)())
-{
-    // We first ensure that CRenderer::CV_r_EnableGMEMPath is only used for iOS or Android. Required
-    // for when running in the editor and selecting the ios or android .cfg file settings. Only need
-    // to worry about this in non-release builds as the default value is 0 and the editor is not built
-    // in release builds.
-#if (!defined (ANDROID) && !defined(IOS))
-    CRenderer::CV_r_EnableGMEMPath = 0;
-#endif
-    // We first ensure that CRenderer::r_EnableComputeDownSampling is only used for iOS Metal
-#if (!defined (CRY_USE_METAL) || !defined(IOS))
-    CRenderer::CV_r_EnableComputeDownSampling = 0;
-#endif
-
-    int const nCurrentRecurseLvl = SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID];
-
-    PROFILE_LABEL_SCOPE(nCurrentRecurseLvl == 0 ? "SCENE" : "SCENE_REC");
-
-    gcpRendD3D->SetCurDownscaleFactor(gcpRendD3D->m_CurViewportScale);
-
-    // Skip scene rendering when device is lost
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    SThreadInfo* const pShaderThreadInfo = &(m_RP.m_TI[m_RP.m_nProcessThreadID]);
-
-    ////////////////////////////////////////////////
-    // to non-thread safe remaing work for *::Render functions
-    {
-        PROFILE_FRAME(WaitForRendItems);
-        m_finalizeRendItemsJobExecutor[m_RP.m_nProcessThreadID].WaitForCompletion();
-        m_finalizeShadowRendItemsJobExecutor[m_RP.m_nProcessThreadID].WaitForCompletion();
-    }
-
-    CRenderMesh::FinalizeRendItems(m_RP.m_nProcessThreadID);
-    CMotionBlur::InsertNewElements();
-    FurBendData::Get().InsertNewElements();
-
-    {
-        PROFILE_LABEL_SCOPE("UpdateModifiedMeshes");
-        CRenderMesh::UpdateModified();
-    }
-
-    // Once per frame, notify that the start of the render thread scene rendering has begun.
-    if (nCurrentRecurseLvl == 0)
-    {
-        AZ::RenderThreadEventsBus::Broadcast(&AZ::RenderThreadEventsBus::Events::OnRenderThreadRenderSceneBegin);
-    }
-
-    ////////////////////////////////////////////////
-#ifdef CRY_INTEGRATE_DX12
-    GetGraphicsPipeline().Prepare();
-
-    // Make sure all dirty device resource sets are rebuild.
-    PerFrameValidateResourceSets();
-#endif
-    ////////////////////////////////////////////////
-
-    const int recursiveLevel = SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID];
-    const int currentFrameId = GetFrameID(false);
-    CRenderView& currentView = *m_RP.m_pRenderViews[m_RP.m_nProcessThreadID];
-
-    // set to use RenderList Description
-    m_RP.m_pRLD = &m_RP.m_pRenderViews[m_RP.m_nProcessThreadID]->m_RenderListDesc[recursiveLevel];
-
-    CTimeValue Time = iTimer->GetAsyncTime();
-
-    if (!recursiveLevel)
-    {
-        m_MainViewport.nX = 0;
-        m_MainViewport.nY = 0;
-        m_MainViewport.nWidth = m_width;
-        m_MainViewport.nHeight = m_height;
-    }
-
-    // invalidate object pointers
-    m_RP.m_pCurObject = m_RP.m_pPrevObject = m_RP.m_pIdendityRenderObject;
-
-    RT_UpdateLightVolumes(nFlags, recursiveLevel);
-
-    // Wait for shadow jobs before building constant buffers.
-    {
-        PROFILE_FRAME(WaitForShadowRendItems);
-        m_finalizeShadowRendItemsJobExecutor[m_RP.m_nProcessThreadID].WaitForCompletion();
-    }
-
-    // Precompile constant buffers for the frame.
-    {
-        GetPerInstanceConstantBufferPool().Update(currentView, TI.m_RealTime);
-
-        FX_UpdateCharCBs();
-
-        CHWShader_D3D::UpdatePerFrameResourceGroup();
-    }
-
-    //
-    // Process Shadow Maps
-    //
-    if (!recursiveLevel && !(nFlags & SHDF_ZPASS_ONLY))
-    {
-        if (nFlags & SHDF_NO_SHADOWGEN)
-        {
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_NO_SHADOWGEN;
-        }
-        else
-        {
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_NO_SHADOWGEN;
-        }
-
-        PROFILE_LABEL_SCOPE("SHADOWMAP PASSES");
-        PROFILE_PS_TIME_SCOPE(fTimeDIPs[EFSLIST_SHADOW_GEN]);
-        EF_PrepareAllDepthMaps();
-    }
-
-    if (FX_GetEnabledGmemPath(nullptr))
-    {
-        FX_GmemTransition(eGT_PRE_Z);
-    }
-
-    int nSaveDrawNear = CV_r_nodrawnear;
-    int nSaveStreamSync = CV_r_texturesstreamingsync;
-    if (nFlags & SHDF_NO_DRAWNEAR)
-    {
-        CV_r_nodrawnear = 1;
-    }
-    if (nFlags & SHDF_STREAM_SYNC)
-    {
-        CV_r_texturesstreamingsync = 1;
-    }
-
-    m_bDeferredDecals = false;
-    uint32 nSaveRendFlags = m_RP.m_nRendFlags;
-    m_RP.m_nRendFlags = nFlags;
-    FX_ApplyThreadState(TI, &m_RP.m_OldTI[recursiveLevel]);
-
-    //
-    // VR Tracking updates
-    //
-
-    if (m_pStereoRenderer->IsRenderingToHMD())
-    {
-        if (gRenDev->m_CurRenderEye == STEREO_EYE_LEFT)
-        {
-            /*
-                Update tracking states for VR:
-                For OpenVR we need to tell the compositor (SteamVR) to retrieve up to date tracking info.
-                This is a blocking call that will only return when the compositor allows us
-                Calling this here allows the GPU work submitted above to get a head start while
-                we wait for the compositor to free us.
-
-                This only need to be done once per frame but must be done on the render thread.
-                This cannot be done on the main thread or a job/side thread or else it will
-                cause tracking to de-sync from rendering causing all frames to render with out
-                of date tracking. Updating tracking here significantly reduces GPU bubbles.
-
-                For Oculus, PSVR etc this is still the best place to request a tracking
-                update in a multi-threaded scenario. It ensures that any prediction will be done
-                for this frame that we want to render rather than the next frame.
-            */
-            RT_UpdateTrackingStates();
-        }
-
-        /*
-            After tracking has updated we want to override the camera with the
-            correct tracking information. If this is the Right eye's pass we don't
-            need to update tracking info but we do need to set the correct camera.
-        */
-        RT_SetStereoCamera();
-    }
-
-    bool bHDRRendering = (nFlags & SHDF_ALLOWHDR) && IsHDRModeEnabled();
-    //The HDR pass is in charge of doing the SRGB conversion. Since is
-    //disabled, we need to push a render target to do the SRGB conversion before the post process.
-    bool doSRGBConversionCopy = !IsHDRModeEnabled() && (m_RP.m_nRendFlags & SHDF_ALLOWHDR) &&
-                                !recursiveLevel && !m_wireframe_mode && 
-                                !FX_GetEnabledGmemPath(nullptr);
-
-    if (!recursiveLevel && bHDRRendering)
-    {
-        m_RP.m_bUseHDR = true;
-        if (FX_HDRScene(m_RP.m_bUseHDR, false))
-        {
-            m_RP.m_PersFlags2 |= RBPF2_HDR_FP16;
-        }
-    }
-    else
-    {
-        m_RP.m_bUseHDR = false;
-        FX_HDRScene(false);
-
-        if ((pShaderThreadInfo->m_PersFlags & RBPF_DRAWTOTEXTURE) && bHDRRendering)
-        {
-            m_RP.m_PersFlags2 |= RBPF2_HDR_FP16;
-        }
-        else
-        {
-            m_RP.m_PersFlags2 &= ~RBPF2_HDR_FP16;
-        }
-    }
-
-    if (doSRGBConversionCopy)
-    {
-        FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, &m_DepthBufferOrigMSAA, -1, true);
-    }
-
-    // Prepare post processing
-    bool bAllowPostProcess = (nFlags & SHDF_ALLOWPOSTPROCESS) && !recursiveLevel && (CV_r_PostProcess) && !CV_r_measureoverdraw &&
-        !(pShaderThreadInfo->m_PersFlags & (RBPF_SHADOWGEN));
-
-    bool bAllowSubpixelShift = bAllowPostProcess
-        && (gcpRendD3D->FX_GetAntialiasingType() & eAT_JITTER_MASK)
-        && (!gEnv->IsEditing() || CRenderer::CV_r_AntialiasingModeEditor)
-        && (GetWireframeMode() == R_SOLID_MODE)
-        && (CRenderer::CV_r_DeferredShadingDebugGBuffer == 0);
-
-    m_TemporalJitterClipSpace = Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-    m_TemporalJitterMipBias = 0.0f;
-    if (bAllowSubpixelShift)
-    {
-        SubpixelJitter::Sample sample = SubpixelJitter::EvaluateSample(SPostEffectsUtils::m_iFrameCounter, (SubpixelJitter::Pattern)CV_r_AntialiasingTAAJitterPattern);
-
-        m_TemporalJitterClipSpace.x = ((sample.m_subpixelOffset.x * 2.0) / (float)m_width)  / m_RP.m_CurDownscaleFactor.x;
-        m_TemporalJitterClipSpace.y = ((sample.m_subpixelOffset.y * 2.0) / (float)m_height) / m_RP.m_CurDownscaleFactor.y;
-        m_TemporalJitterClipSpace.z = sample.m_subpixelOffset.x;
-        m_TemporalJitterClipSpace.w = sample.m_subpixelOffset.y;
-
-        if IsCVarConstAccess(constexpr) (CV_r_AntialiasingTAAUseJitterMipBias)
-        {
-            m_TemporalJitterMipBias = sample.m_mipBias;
-        }
-    }
-
-    FX_PostProcessScene(bAllowPostProcess);
-    bool bAllowDeferred = (nFlags & SHDF_ZPASS) && !recursiveLevel && !CV_r_measureoverdraw;
-    if (bAllowDeferred)
-    {
-        PROFILE_PS_TIME_SCOPE(fTimeDIPs[EFSLIST_DEFERRED_PREPROCESS]);
-        m_RP.m_PersFlags2 |= RBPF2_ALLOW_DEFERREDSHADING;
-        FX_DeferredRendering(false, true);
-    }
-    else
-    {
-        m_RP.m_PersFlags2 &= ~RBPF2_ALLOW_DEFERREDSHADING;
-    }
-
-    {
-        if (!recursiveLevel && (nFlags & SHDF_ALLOWHDR))
-        {
-            ETEX_Format eTF = (m_RP.m_bUseHDR && m_nHDRType == 1) ? eTF_R16G16B16A16F : eTF_R8G8B8A8;
-            int nW = gcpRendD3D->GetWidth(); //m_d3dsdBackBuffem.Width;
-            int nH = gcpRendD3D->GetHeight(); //m_d3dsdBackBuffem.Height;
-            if (!CTexture::s_ptexSceneTarget || CTexture::s_ptexSceneTarget->GetDstFormat() != eTF || CTexture::s_ptexSceneTarget->GetWidth() != nW || CTexture::s_ptexSceneTarget->GetHeight() != nH)
-            {
-                CTexture::GenerateSceneMap(eTF);
-            }
-        }
-    }
-
-    if ((nFlags & SHDF_ALLOWPOSTPROCESS) && !recursiveLevel)
-    {
-        FX_DeferredRainPreprocess();
-    }
-
-    if (!(nFlags & SHDF_ZPASS_ONLY))
-    {
-        bool bLighting = (pShaderThreadInfo->m_PersFlags & RBPF_SHADOWGEN) == 0;
-        if (!nFlags)
-        {
-            bLighting = false;
-        }
-
-        if ((nFlags & (SHDF_ALLOWHDR | SHDF_ALLOWPOSTPROCESS)) && CV_r_usezpass)
-        {
-            PROFILE_PS_TIME_SCOPE(fTimeDIPsZ);
-            FX_ProcessZPassRenderLists();
-
-            FX_DeferredRainGBuffer();
-            FX_DeferredSnowLayer();
-
-            const bool takingScreenShot = (m_screenShotType != 0);
-            const bool bMotionVectorsEnabled = (CRenderer::CV_r_MotionBlur > 1 || (gRenDev->FX_GetAntialiasingType() & eAT_TEMPORAL_MASK) != 0) && CRenderer::CV_r_MotionVectors && (!takingScreenShot || CRenderer::CV_r_MotionBlurScreenShot);
-            if (bMotionVectorsEnabled)
-            {
-                CMotionBlur* motionBlur = static_cast<CMotionBlur*>(PostEffectMgr()->GetEffect(ePFX_eMotionBlur));
-                motionBlur->RenderObjectsVelocity();
-            }
-
-            // Restore per-batch sorting after zpass finished
-            if (m_bUseGPUFriendlyBatching[m_RP.m_nProcessThreadID] && CRenderer::CV_r_ZPassDepthSorting)
-            {
-                for (int i = 0; i < MAX_LIST_ORDER; ++i)
-                {
-                    EF_SortRenderList(EFSLIST_GENERAL, i, m_RP.m_pRLD, m_RP.m_nProcessThreadID, false);
-                }
-            }
-        }
-
-#if defined(FEATURE_SVO_GI)
-        if ((gEnv->pConsole->GetCVar("e_GI")->GetIVal()) && (nFlags & SHDF_ALLOWHDR) && !recursiveLevel && CSvoRenderer::GetInstance())
-        {
-            PROFILE_LABEL_SCOPE("SVOGI");
-            CSvoRenderer::GetInstance()->Lock();
-            CSvoRenderer::GetInstance()->UpdateCompute();
-            CSvoRenderer::GetInstance()->UpdateRender();
-            CSvoRenderer::GetInstance()->Unlock();
-        }
-#endif
-
-        bool bEmpty = SRendItem::IsListEmpty(EFSLIST_GENERAL, m_RP.m_nProcessThreadID, m_RP.m_pRLD);
-        bEmpty &= SRendItem::IsListEmpty(EFSLIST_DEFERRED_PREPROCESS, m_RP.m_nProcessThreadID, m_RP.m_pRLD);
-        if (!recursiveLevel && !bEmpty && pShaderThreadInfo->m_FS.m_bEnable && CV_r_usezpass)
-        {
-            m_RP.m_PersFlags2 |= RBPF2_NOSHADERFOG;
-        }
-
-        if (bAllowDeferred && !bEmpty)
-        {
-            PROFILE_LABEL_SCOPE("DEFERRED_LIGHTING");
-            PROFILE_PS_TIME_SCOPE(fTimeDIPs[EFSLIST_DEFERRED_PREPROCESS]);
-
-            FX_ProcessRenderList(EFSLIST_DEFERRED_PREPROCESS, BEFORE_WATER, RenderFunc, false);       // Sorted list without preprocess of all deferred related passes and screen shaders
-            FX_ProcessRenderList(EFSLIST_DEFERRED_PREPROCESS, AFTER_WATER , RenderFunc, false);       // Sorted list without preprocess of all deferred related passes and screen shaders
-        }
-
-        if (FX_GetEnabledGmemPath(nullptr))
-        {
-            FX_GmemTransition(eGT_POST_DEFERRED_PRE_FORWARD);
-        }
-
-        if (nCurrentRecurseLvl == 0 && FurPasses::GetInstance().GetFurRenderingMode() == FurPasses::RenderMode::AlphaTested)
-        {
-            // If using alpha tested fur, perform shell prepass before forward opaque
-            FurPasses::GetInstance().ExecuteShellPrepass();
-        }
-
-        FX_RenderForwardOpaque(RenderFunc, bLighting, bAllowDeferred);
-
-        FX_ProcessThicknessRenderLists();
-
-        const bool bDeferredScenePasses = (nFlags & SHDF_ALLOWPOSTPROCESS) && !recursiveLevel && !bEmpty;
-        if (bDeferredScenePasses)
-        {
-            FX_ResetPipe();
-
-            FX_DeferredCaustics();
-        }
-
-        const bool bShadowGenSpritePasses = (pShaderThreadInfo->m_PersFlags & (RBPF_SHADOWGEN)) != 0;
-
-        //Include this profile segment in the summary information for the quick GPU profiling display
-        {
-            PROFILE_LABEL_SCOPE(nCurrentRecurseLvl == 0 ? "TRANSPARENT_PASSES" : "TRANSPARENT_PASSES_REC");
-
-            if (!FX_GetEnabledGmemPath(nullptr) && bAllowDeferred && bDeferredScenePasses)
-            {
-                // make sure all all jobs which are computing particle vertices/indices
-                // have finished and their vertex/index buffers are unlocked
-                // before starting rendering of those
-                m_ComputeVerticesJobExecutors[m_RP.m_nProcessThreadID].WaitForCompletion();
-                UnLockParticleVideoMemory(gRenDev->m_nPoolIndexRT % SRenderPipeline::nNumParticleVertexIndexBuffer);
-
-
-                PROFILE_LABEL_SCOPE("VOLUMETRIC FOG");
-
-                GetVolumetricFog().RenderVolumetricsToVolume(RenderFunc);
-                GetVolumetricFog().RenderVolumetricFog();
-            }
-
-            if (bDeferredScenePasses && CV_r_measureoverdraw != 4)
-            {
-                FX_RenderFog();
-            }
-
-            if (nCurrentRecurseLvl == 0 && FurPasses::GetInstance().GetFurRenderingMode() == FurPasses::RenderMode::AlphaBlended)
-            {
-                // If using alpha blended fur, perform shell prepass after fog passes so that fog can influence fur shading
-                FurPasses::GetInstance().ExecuteShellPrepass();
-            }
-
-            {
-                PROFILE_LABEL_SCOPE("TRANSPARENT_BW");
-                PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_TRANSP], !bShadowGenSpritePasses);
-
-                GetTiledShading().BindForwardShadingResources(NULL);
-
-                FX_ProcessRenderList(EFSLIST_TRANSP, BEFORE_WATER, RenderFunc, bLighting); // Unsorted list
-
-                // Highest quality we need to render twice for accuracy under water.\
-                // So we render first, here,  all the transparent fragments that are under water.  
-                // The fragments above water that are rendered here will be discarded when we render the refractive water surface later in the pipeline.
-                // This has a huge cost, need optimization.
-                if (nFlags & SHDF_ALLOW_WATER)
-                {
-                    const ICVar* renderTransparentUnderWaterCVar = iConsole->GetCVar("e_RenderTransparentUnderWater");
-                    int renderTransparentUnderWater = renderTransparentUnderWaterCVar ? renderTransparentUnderWaterCVar->GetIVal() : 0;
-                    if (renderTransparentUnderWater == 1)
-                    {
-                        FX_ProcessRenderList(EFSLIST_TRANSP, AFTER_WATER, RenderFunc, bLighting); // Unsorted list
-                    }
-                }
-
-                GetTiledShading().UnbindForwardShadingResources();
-            }
-
-            if (nFlags & SHDF_ALLOW_WATER)
-            {
-                {
-                    PROFILE_LABEL_SCOPE("WATER_VOLUME");
-                    PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_WATER_VOLUMES], !bShadowGenSpritePasses);
-                    FX_ProcessRenderList(EFSLIST_WATER_VOLUMES, BEFORE_WATER, RenderFunc, false);    // Sorted list without preprocess
-                }
-
-                FX_RenderWater(RenderFunc);
-            }
-
-            {
-                PROFILE_LABEL_SCOPE("TRANSPARENT_AW");
-                PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_TRANSP], !bShadowGenSpritePasses);
-
-                if (bAllowPostProcess && CV_r_TranspDepthFixup)
-                {
-                    FX_DepthFixupPrepare();
-                }
-
-                GetTiledShading().BindForwardShadingResources(NULL);
-
-                MultiLayerAlphaBlendPass::GetInstance().SetLayerCount(CD3D9Renderer::CV_r_AlphaBlendLayerCount);
-                MultiLayerAlphaBlendPass::GetInstance().BindResources();
-
-                //draw after water transparent list. exclude objects which skip depth of field (only particles enabled this option, but it
-                //could be applied to any transparent object later)
-                uint32 nBatchExcludeFilter = 0;
-                if (m_RP.m_bUseHDR)
-                {
-                    nBatchExcludeFilter = FB_TRANSPARENT_AFTER_DOF;
-                }
-                FX_ProcessRenderList(EFSLIST_TRANSP, AFTER_WATER, RenderFunc, true, FB_GENERAL, nBatchExcludeFilter);
-
-                MultiLayerAlphaBlendPass::GetInstance().UnBindResources();
-                GetTiledShading().UnbindForwardShadingResources();
-
-                MultiLayerAlphaBlendPass::GetInstance().Resolve(*this);
-
-                if (bAllowPostProcess && CV_r_TranspDepthFixup)
-                {
-                    FX_DepthFixupMerge();
-                }
-            }
-
-            FX_ProcessHalfResParticlesRenderList(EFSLIST_HALFRES_PARTICLES, RenderFunc, bLighting);
-
-            if (nFlags & SHDF_ALLOW_WATER)
-            {
-                PROFILE_LABEL_SCOPE("WATER_VOLUME");
-                PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_WATER_VOLUMES], !bShadowGenSpritePasses);
-                FX_ProcessRenderList(EFSLIST_WATER_VOLUMES, AFTER_WATER, RenderFunc, false);
-            }
-
-            // insert fence which is used on consoles to prevent overwriting VideoMemory
-            InsertParticleVideoMemoryFence(gRenDev->m_nPoolIndexRT % SRenderPipeline::nNumParticleVertexIndexBuffer);
-        }
-
-#if defined(ENABLE_ART_RT_TIME_ESTIMATE)
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_actualRenderTimeMinusPost += iTimer->GetAsyncTime().GetDifferenceInSeconds(Time);
-#endif
-
-        PROFILE_PS_TIME_SCOPE_COND(fTimeDIPs[EFSLIST_POSTPROCESS], !bShadowGenSpritePasses);
-
-        if (bAllowDeferred && !recursiveLevel)
-        {
-            FX_DeferredSnowDisplacement();
-        }
-
-        if (FX_GetEnabledGmemPath(nullptr))
-        {
-            FX_GmemTransition(eGT_POST_AW_TRANS_PRE_POSTFX);
-        }
-
-        if (!recursiveLevel)
-        {
-            gcpRendD3D->m_RP.m_PersFlags1 &= ~RBPF1_SKIP_AFTER_POST_PROCESS;
-
-            FX_ProcessRenderList(EFSLIST_HDRPOSTPROCESS, BEFORE_WATER, RenderFunc, false);       // Sorted list without preprocess of all fog passes and screen shaders
-            FX_ProcessRenderList(EFSLIST_HDRPOSTPROCESS, AFTER_WATER , RenderFunc, false);       // Sorted list without preprocess of all fog passes and screen shaders
-            if (doSRGBConversionCopy)
-            {
-                //The HDR pass is in charge of doing the SRGB conversion but it's disabled.
-                FX_SRGBConversion();
-            }
-            FX_ProcessRenderList(EFSLIST_AFTER_HDRPOSTPROCESS, BEFORE_WATER, RenderFunc, false); // for specific cases where rendering after tone mapping is needed
-            FX_ProcessRenderList(EFSLIST_AFTER_HDRPOSTPROCESS, AFTER_WATER , RenderFunc, false);
-            FX_ProcessRenderList(EFSLIST_POSTPROCESS, BEFORE_WATER, RenderFunc, false);       // Sorted list without preprocess of all fog passes and screen shaders
-            FX_ProcessRenderList(EFSLIST_POSTPROCESS, AFTER_WATER , RenderFunc, false);       // Sorted list without preprocess of all fog passes and screen shaders
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-            //  If need upscale do it here.
-            {
-                const Vec2& vDownscaleFactor = gcpRendD3D->m_RP.m_CurDownscaleFactor;
-
-                bool bDoUpscale = (vDownscaleFactor.x < .999999f) || (vDownscaleFactor.y < .999999f);
-
-                if (bDoUpscale)
-                {
-                    PROFILE_LABEL_SCOPE("RT_UPSCALE");
-                    CTexture* pCurrRT = CTexture::s_ptexSceneDiffuse;
-                    GetUtils().CopyScreenToTexture(pCurrRT);
-
-                    //  copy osm-guaided viewport rect. It will be destroyed soon.
-                    RECT rcSrcRegion = gcpRendD3D->m_FullResRect;
-                    //  Since now we render to a full RT.
-                    gcpRendD3D->SetCurDownscaleFactor(Vec2(1, 1));
-                    gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-
-                    SD3DPostEffectsUtils::GetInstance().CopyTextureToScreen(pCurrRT, &rcSrcRegion, FILTER_BILINEAR);
-                }
-            }
-#endif
-            bool bDrawAfterPostProcess = !(gcpRendD3D->m_RP.m_PersFlags1 & RBPF1_SKIP_AFTER_POST_PROCESS);
-
-            RT_SetViewport(0, 0, GetWidth(), GetHeight());
-
-            if (bDrawAfterPostProcess)
-            {
-                PROFILE_LABEL_SCOPE("AFTER_POSTPROCESS"); // for specific cases where rendering after all post effects is needed
-                FX_ProcessRenderList(EFSLIST_AFTER_POSTPROCESS, BEFORE_WATER, RenderFunc, false);
-                FX_ProcessRenderList(EFSLIST_AFTER_POSTPROCESS, AFTER_WATER , RenderFunc, false);
-            }
-
-            gcpRendD3D->m_RP.m_PersFlags2 &= ~RBPF2_NOPOSTAA;
-
-            if IsCVarConstAccess(constexpr) (CV_r_DeferredShadingDebug && bAllowDeferred)
-            {
-                FX_DeferredRendering(true);
-            }
-        }
-    }
-    else
-    {
-        FX_ProcessRenderList(EFSLIST_GENERAL, BEFORE_WATER, RenderFunc, true);    // Sorted list without preprocess
-        FX_ProcessRenderList(EFSLIST_DECAL, BEFORE_WATER, RenderFunc, true);    // Sorted list without preprocess
-        FX_ProcessRenderList(EFSLIST_WATER_VOLUMES, BEFORE_WATER, RenderFunc, false);    // Sorted list without preprocess
-
-        FX_ProcessRenderList(EFSLIST_GENERAL, AFTER_WATER, RenderFunc, true);    // Sorted list without preprocess
-        FX_ProcessRenderList(EFSLIST_DECAL, AFTER_WATER, RenderFunc, true);    // Sorted list without preprocess
-        FX_ProcessRenderList(EFSLIST_WATER_VOLUMES, AFTER_WATER, RenderFunc, false);    // Sorted list without preprocess
-    }
-
-    // Readback the downsampled z-buffer to the CPU for use by the Coverage Buffer system next frame.
-    // This is performed at the end of the frame in order to help prevent a CPU/GPU sync point.
-    FX_ZTargetReadBackOnCPU();
-
-    FX_ApplyThreadState(m_RP.m_OldTI[recursiveLevel], NULL);
-
-    m_RP.m_PS[m_RP.m_nProcessThreadID].m_fRenderTime += iTimer->GetAsyncTime().GetDifferenceInSeconds(Time);
-
-    m_RP.m_nRendFlags = nSaveRendFlags;
-    CV_r_nodrawnear = nSaveDrawNear;
-    CV_r_texturesstreamingsync = nSaveStreamSync;
-}
-
-//======================================================================================================
-// Process all render item lists (can be called recursively)
-void CD3D9Renderer::EF_ProcessRenderLists(RenderFunc pRenderFunc, int nFlags, [[maybe_unused]] SViewport& VP, const SRenderingPassInfo& passInfo, bool bSync3DEngineJobs)
-{
-    AZ_TRACE_METHOD();
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    int nThreadID = passInfo.ThreadID();
-    int nR = passInfo.GetRecursiveLevel();
-#ifndef _RELEASE
-    if (nR < 0)
-    {
-        __debugbreak();
-    }
-#endif
-
-    bool bIsMultiThreadedRenderer = false;
-    EF_Query(EFQ_RenderMultithreaded, bIsMultiThreadedRenderer);
-    if (!nR)
-    {
-        if (bSync3DEngineJobs)
-        {
-            // wait for all RendItems which need preprocession
-            // note: the PopCompletionFence here indicates that no new jobs for preprocessing are spawned
-            // note: must be called before EndSpawningGeneratingRendItemJobs! in all constellations, else a race condition can uncoalesce the underlying memory
-            AZ::LegacyJobExecutor* pJobExecutor = gEnv->pRenderer->GetGenerateRendItemJobExecutorPreProcess();
-            if (pJobExecutor->IsRunning())
-            {
-                pJobExecutor->PopCompletionFence();
-            }
-            pJobExecutor->WaitForCompletion();
-
-            // we need to prepare the render item lists here when we are using the editor(which doesn't have MT rendering)
-            if (!bIsMultiThreadedRenderer)
-            {
-                if (m_generateRendItemJobExecutor.IsRunning())
-                {
-                    m_generateRendItemJobExecutor.PopCompletionFence();
-                }
-
-                if (m_generateShadowRendItemJobExecutor.IsRunning())
-                {
-                    m_generateShadowRendItemJobExecutor.PopCompletionFence();
-                }
-
-                ////////////////////////////////////////////////
-                // wait till all SRendItems for this frame have finished preparing
-                m_finalizeRendItemsJobExecutor[m_RP.m_nProcessThreadID].WaitForCompletion();
-                m_finalizeShadowRendItemsJobExecutor[m_RP.m_nProcessThreadID].WaitForCompletion();
-                gRenDev->GetGenerateRendItemJobExecutor()->ClearPostJob(); // clear post job to prevent invoking it twice when no MT Rendering is enabled, but recursive rendering is used
-            }
-        }
-
-        assert(nThreadID == m_RP.m_nFillThreadID); // make sure this is main thread
-        assert(nThreadID < RT_COMMAND_BUF_COUNT);
-        if ((nFlags & SHDF_ALLOWPOSTPROCESS))
-        {
-            SRenderListDesc tmpRLD;
-            int nPreProcessLists[] = { EFSLIST_PREPROCESS, EFSLIST_WATER, EFSLIST_WATER_VOLUMES };
-            for (int i = 0; i < 3; ++i)
-            {
-                int nList = nPreProcessLists[i];
-                FinalizeRendItems_ReorderRendItemList(0, nList, nThreadID);
-                FinalizeRendItems_ReorderRendItemList(1, nList, nThreadID);
-
-                // make sure the memory is continous before sorting
-                auto& RESTRICT_REFERENCE renderItems = CRenderView::CurrentFillView()->GetRenderItems(0, nList);
-                renderItems.CoalesceMemory();
-
-                tmpRLD.m_nStartRI[0][nList] = 0;
-                tmpRLD.m_nEndRI[0][nList] = renderItems.size();
-                tmpRLD.m_nBatchFlags[0][nList] = passInfo.GetRenderView()->GetBatchFlags(0, 0, nList);
-                EF_SortRenderList(nList, 0, &tmpRLD, nThreadID, (CRenderer::CV_r_ZPassDepthSorting != 0));
-            }
-
-            int nums = tmpRLD.m_nStartRI[0][EFSLIST_PREPROCESS];
-            int nume = tmpRLD.m_nEndRI[0][EFSLIST_PREPROCESS];
-
-            // Perform pre-process operations for the current frame
-            auto& RESTRICT_REFERENCE postProcessRenderItems = CRenderView::CurrentFillView()->GetRenderItems(0, EFSLIST_PREPROCESS);
-
-            if (nume - nums > 0 && postProcessRenderItems[nums].nBatchFlags & FSPR_MASK)
-            {
-                nums += EF_Preprocess(&postProcessRenderItems[0], nums, nume, pRenderFunc, passInfo);
-            }
-        }
-    }
-
-    // since we need to sync earlier if we don't have multithreaded rendering
-    // we need to finalize the rend items again in a possible recursive pass
-    if (!bIsMultiThreadedRenderer && nR)
-    {
-        m_generateRendItemJobExecutor.WaitForCompletion();
-        m_finalizeRendItemsJobExecutor[nThreadID].PushCompletionFence();
-        CRenderer::FinalizeRendItems(nThreadID);
-    }
-    m_pRT->RC_RenderScene(nFlags, pRenderFunc);
-}
-
-void CD3D9Renderer::EF_RenderScene(int nFlags, SViewport& VP, const SRenderingPassInfo& passInfo)
-{
-    AZ_TRACE_METHOD();
-    int nThreadID = passInfo.ThreadID();
-
-    CTimeValue time0 = iTimer->GetAsyncTime();
-#ifndef _RELEASE
-    int nRecurseLevel = passInfo.GetRecursiveLevel();
-    if (nRecurseLevel < 0)
-    {
-        __debugbreak();
-    }
-    if (CV_r_excludeshader->GetString()[0] != '0')
-    {
-        char nm[256];
-        azstrcpy(nm, AZ_ARRAY_SIZE(nm), CV_r_excludeshader->GetString());
-        azstrlwr(nm, AZ_ARRAY_SIZE(nm));
-        m_RP.m_sExcludeShader = nm;
-    }
-    else
-#endif
-    m_RP.m_sExcludeShader = "";
-
-    if (nFlags & SHDF_ALLOWPOSTPROCESS && gRenDev->m_CurRenderEye == 0)
-    {
-        EF_AddClientPolys(passInfo);
-    }
-
-    EF_ProcessRenderLists(FX_FlushShader_General, nFlags, VP, passInfo, true);
-
-    EF_DrawDebugTools(VP, passInfo);
-
-    m_RP.m_PS[nThreadID].m_fSceneTimeMT += iTimer->GetAsyncTime().GetDifferenceInSeconds(time0);
-}
-
-
-// Process all render item lists
-void CD3D9Renderer::EF_EndEf3D(const int nFlags, const int nPrecacheUpdateIdSlow, const int nPrecacheUpdateIdFast, const SRenderingPassInfo& passInfo)
-{
-    AZ_TRACE_METHOD();
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    int nThreadID = m_RP.m_nFillThreadID;
-
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nRecurseLevel >= 0);
-    if (nRecurseLevel < 0)
-    {
-        iLog->Log("Error: CRenderer::EF_EndEf3D without CRenderer::EF_StartEf");
-        return;
-    }
-
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_arrZonesRoundId[0] = max(m_RP.m_TI[m_RP.m_nFillThreadID].m_arrZonesRoundId[0], nPrecacheUpdateIdFast);
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_arrZonesRoundId[1] = max(m_RP.m_TI[m_RP.m_nFillThreadID].m_arrZonesRoundId[1], nPrecacheUpdateIdSlow);
-
-    m_p3DEngineCommon.Update(nThreadID);
-
-    if IsCVarConstAccess(constexpr) (CV_r_nodrawshaders == 1)
-    {
-        EF_ClearTargetsLater(FRT_CLEAR, Clr_Transparent);
-        if (SRendItem::m_RecurseLevel[nThreadID] == 0)
-        {
-
-            if(m_generateRendItemPreProcessJobExecutor.IsRunning())
-            {
-                m_generateRendItemPreProcessJobExecutor.PopCompletionFence();
-            }
-
-            bool bIsMultiThreadedRenderer = false;
-            gEnv->pRenderer->EF_Query(EFQ_RenderMultithreaded, bIsMultiThreadedRenderer);
-            // Because of EndSpawningGeneratingRendItemJobs we need to skip this one while in multi-threaded renderer.
-            if (!bIsMultiThreadedRenderer && m_generateRendItemJobExecutor.IsRunning())
-            {
-                m_generateRendItemJobExecutor.PopCompletionFence();
-            }
-
-            // The m_generateShadowRendItemJobExecutor was started in EF_PrepareShadowGenRenderList, need to end it.
-            if (m_generateShadowRendItemJobExecutor.IsRunning())
-            {
-                m_generateShadowRendItemJobExecutor.PopCompletionFence();
-            }
-        }
-        SRendItem::m_RecurseLevel[nThreadID]--;
-        return;
-    }
-
-    int nAsyncShaders = CV_r_shadersasynccompiling;
-    if (nFlags & SHDF_NOASYNC)
-    {
-        AZ_Assert(gRenDev->m_pRT->IsRenderThread(), "EF_EndEf3D: SHDF_NOASYNC may only be used with r_multithreading disabled.  This is because the render thread modifies r_shadersasynccompiling and can lead to race conditions.");
-        CV_r_shadersasynccompiling = 0;
-    }
-
-    if (SRendItem::m_RecurseLevel[nThreadID] == 0 && !(nFlags & (SHDF_ZPASS_ONLY | SHDF_NO_SHADOWGEN))) //|SHDF_ALLOWPOSTPROCESS
-    {
-        PrepareShadowGenForFrustumNonJobs(nFlags);
-    }
-
-    if (GetS3DRend().IsStereoEnabled())
-    {
-        GetS3DRend().ProcessScene(nFlags, passInfo);
-    }
-    else
-    {
-        EF_Scene3D(m_MainRTViewport, nFlags, passInfo);
-    }
-
-    //deferredDecals.SetUse(0);
-    bool bIsMultiThreadedRenderer = false;
-    EF_Query(EFQ_RenderMultithreaded, bIsMultiThreadedRenderer);
-    if (bIsMultiThreadedRenderer && SRendItem::m_RecurseLevel[nThreadID] == 0 && !(nFlags & (SHDF_ZPASS_ONLY | SHDF_NO_SHADOWGEN))) //|SHDF_ALLOWPOSTPROCESS
-    {
-        m_generateShadowRendItemJobExecutor.PopCompletionFence();
-    }
-
-    SRendItem::m_RecurseLevel[nThreadID]--;
-
-    // Do not restore this variable unless this condition is valid, otherwise it can cause a race condition.
-    // This variable is accessed and modified from both the render and main thread, so it is only valid to touch this variable on this thread when r_multithreaded=0
-    if (nFlags & SHDF_NOASYNC)
-    {
-        CV_r_shadersasynccompiling = nAsyncShaders;
-    }
-}
-
-void CD3D9Renderer::EF_InvokeShadowMapRenderJobs([[maybe_unused]] const int nFlags)
-{
-    int nThreadID = m_RP.m_nFillThreadID;
-    if (SRendItem::m_RecurseLevel[nThreadID] == 0)
-    {
-        EF_PrepareShadowGenRenderList();
-    }
-}
-
-void CD3D9Renderer::EF_Scene3D(SViewport& VP, int nFlags, const SRenderingPassInfo& passInfo)
-{
-    ASSERT_IS_MAIN_THREAD(m_pRT)
-    AZ_TRACE_METHOD();
-    int nThreadID = m_RP.m_nFillThreadID;
-    assert(nThreadID >= 0 && nThreadID < RT_COMMAND_BUF_COUNT);
-
-    int recursiveLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(recursiveLevel >= 0 && recursiveLevel < MAX_REND_RECURSION_LEVELS);
-
-    if (!recursiveLevel && m_pStereoRenderer->GetStatus() != IStereoRenderer::Status::kRenderingSecondEye && !CV_r_measureoverdraw)
-    {
-        bool bAllowDeferred = (nFlags & SHDF_ZPASS) != 0;
-        if (bAllowDeferred)
-        {
-            gRenDev->m_cEF.mfRefreshSystemShader("DeferredShading", CShaderMan::s_shDeferredShading);
-
-            SShaderItem shItem(CShaderMan::s_shDeferredShading);
-            CRenderObject* pObj = EF_GetObject_Temp(passInfo.ThreadID());
-            if (pObj)
-            {
-                pObj->m_II.m_Matrix.SetIdentity();
-                EF_AddEf(m_RP.m_pREDeferredShading, shItem, pObj, passInfo, EFSLIST_DEFERRED_PREPROCESS, 0, SRendItemSorter::CreateDeferredPreProcessRendItemSorter(passInfo, SRendItemSorter::eDeferredShadingPass));
-            }
-        }
-
-        if ((nFlags & SHDF_ALLOWHDR) && IsHDRModeEnabled())
-        {
-            SShaderItem shItem(CShaderMan::s_shHDRPostProcess);
-            CRenderObject* pObj = EF_GetObject_Temp(passInfo.ThreadID());
-            if (pObj)
-            {
-                pObj->m_II.m_Matrix.SetIdentity();
-                SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-                EF_AddEf(m_RP.m_pREHDR, shItem, pObj, passInfo, EFSLIST_HDRPOSTPROCESS, 0, rendItemSorter);
-            }
-        }
-
-        bool bAllowPostProcess = (nFlags & SHDF_ALLOWPOSTPROCESS) && (CV_r_PostProcess);
-        bAllowPostProcess &= (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_MIRRORCULL) == 0;
-        if (bAllowPostProcess)
-        {
-            SShaderItem shItem(CShaderMan::s_shPostEffects);
-            CRenderObject* pObj = EF_GetObject_Temp(passInfo.ThreadID());
-            if (pObj)
-            {
-                pObj->m_II.m_Matrix.SetIdentity();
-                SRendItemSorter rendItemSorter = SRendItemSorter::CreateRendItemSorter(passInfo);
-                EF_AddEf(m_RP.m_pREPostProcess, shItem, pObj, passInfo, EFSLIST_POSTPROCESS, 0, rendItemSorter);
-            }
-        }
-    }
-
-    // Update per-frame params
-    UpdatePerFrameParameters();
-
-    EF_RenderScene(nFlags, VP, passInfo);
-
-    //Re-apply stereo camera here just so that all rendering is done based off of the correct camera instead of
-    //whatever the camera is currently set to
-    if (gcpRendD3D->GetIStereoRenderer()->IsRenderingToHMD())
-    {
-        gcpRendD3D->RT_SetStereoCamera();
-    }
-
-    if (!passInfo.IsRecursivePass())
-    {
-        //Draw these Debug systems as part of the scene so that they render properly in VR
-
-#ifdef ENABLE_RENDER_AUX_GEOM
-#ifndef _RELEASE
-
-        //Draws all aux geometry
-        GetIRenderAuxGeom()->Flush();
-
-        //Actually flushes and clears out aux geometry buffers
-        //We need to do this so that geometry is re-processed for VR.
-        //This is because the aux geometry buffers overwrite themselves
-        //as they draw. By clearing them out it means we can just re-process
-        //that geometry for the 2nd eye and not draw a mangled vertex buffer.
-        GetIRenderAuxGeom()->Process();
-#endif //_RELEASE
-#endif //ENABLE_RENDER_AUX_GEOM
-
-        //Only render the UI Canvas and the Console on the main window
-        //If we're not in the editor, don't bother to check viewport
-        if (!gEnv->IsEditor() || m_CurrContext->m_bMainViewport)
-        {
-            EBUS_EVENT(AZ::RenderNotificationsBus, OnScene3DEnd);
-        }
-
-        // For VR rendering, RenderTextMessages need to be called in EF_Scene3D to render into both eyes,
-        // Some 2D rendering calls such as console rendering were moved from CSystem::RenderEnd or EndFrame into EF_Scene3D to work with it.
-        // In this case we have to RenderTextMessage immediately instead of push RenderTextMessage to render thread.
-        // EF_RenderTextMessages will render text messages into actual draw2d commands.
-        // For the remaining 2D renderings that are still called at the end of frame(such as C3DEngine::DisplayInfo in CSystem::RenderEnd),
-        // they are called after the TextMessage have already been rendered, so they will be eventually rendered 2 frames later.
-        // This is not an ideal situation and we should find a better way to handle it later.
-        EF_RenderTextMessages();
-    }
-}
-
-void CD3D9Renderer::RT_PrepareStereo(int mode, int output)
-{
-    m_pStereoRenderer->PrepareStereo((EStereoMode)mode, (EStereoOutput)output);
-}
-
-void CD3D9Renderer::RT_CopyToStereoTex(int channel)
-{
-    m_pStereoRenderer->CopyToStereo(channel);
-}
-
-void CD3D9Renderer::RT_UpdateTrackingStates()
-{
-    if (m_pStereoRenderer->IsRenderingToHMD())
-    {
-        // Only allow tracking info to update once per frame
-        // Do not allow recursion "frame" ID otherwise we will update tracking for both the water reflection pass as well as the main scene pass
-        static int lastFrameId = 0;
-        int frameId = GetFrameID(false); 
-        if (lastFrameId != frameId)
-        {
-            EBUS_EVENT(AZ::VR::HMDDeviceRequestBus, UpdateTrackingStates);
-            lastFrameId = frameId;
-        }
-    }
-}
-
-void CD3D9Renderer::RT_DisplayStereo()
-{
-    m_pStereoRenderer->DisplayStereo();
-}
-
-void CD3D9Renderer::EnablePipelineProfiler([[maybe_unused]] bool bEnable)
-{
-#if defined(ENABLE_PROFILING_GPU_TIMERS)
-    if (m_pPipelineProfiler)
-    {
-        m_pPipelineProfiler->SetEnabled(bEnable);
-    }
-#endif
-}
-
-//========================================================================================================
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRendPipeline_Jobs.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DRendPipeline_Jobs.cpp
deleted file mode 100644
index 403335b021..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRendPipeline_Jobs.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include <I3DEngine.h>
-#include <IMovieSystem.h>
-#include <CryHeaders.h>
-
-#include "../Common/PostProcess/PostProcessUtils.h"
-#include "D3DPostProcess.h"
-#include "D3DStereo.h"
-#include "D3DHWShader.h"
-
-#include "Common/RenderView.h"
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::RegisterFinalizeShadowJobs(int nThreadID)
-{
-    // Init post job
-    // legacy job priority: JobManager::eLowPriority
-    m_generateShadowRendItemJobExecutor.SetPostJob(
-        m_finalizeShadowRendItemsJobExecutor[nThreadID],
-        [this, nThreadID]
-        {
-            this->FinalizeShadowRendItems(nThreadID);
-        }
-    );
-    m_generateShadowRendItemJobExecutor.PushCompletionFence();
-    
-    m_finalizeShadowRendItemsJobExecutor[nThreadID].PushCompletionFence();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// sort SRendItem lists
-void CD3D9Renderer::EF_SortRenderList(int nList, int nAW, SRenderListDesc* pRLD, int nThread, bool bUseDist)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-    int nStart = pRLD->m_nStartRI[nAW][nList];
-    int nEnd   = pRLD->m_nEndRI[nAW][nList];
-    int n = nEnd - nStart;
-
-    if (!n)
-    {
-        return;
-    }
-
-    auto& renderItems = CRenderView::GetRenderViewForThread(nThread)->GetRenderItems(nAW, nList);
-    switch (nList)
-    {
-    case EFSLIST_PREPROCESS:
-    {
-        PROFILE_FRAME(State_SortingPre);
-        SRendItem::mfSortPreprocess(&renderItems[nStart], n);
-    }
-    break;
-
-    case EFSLIST_DEFERRED_PREPROCESS:
-    case EFSLIST_HDRPOSTPROCESS:
-    case EFSLIST_POSTPROCESS:
-    case EFSLIST_FOG_VOLUME:
-        break;
-
-    case EFSLIST_WATER_VOLUMES:
-    case EFSLIST_REFRACTIVE_SURFACE:
-    case EFSLIST_TRANSP:
-    case EFSLIST_WATER:
-    case EFSLIST_HALFRES_PARTICLES:
-    case EFSLIST_LENSOPTICS:
-    case EFSLIST_EYE_OVERLAY:
-    {
-        PROFILE_FRAME(State_SortingDist);
-        SRendItem::mfSortByDist(&renderItems[nStart], n, false);
-    }
-    break;
-    case EFSLIST_DECAL:
-    {
-        PROFILE_FRAME(State_SortingDecals);
-        SRendItem::mfSortByDist(&renderItems[nStart], n, true);
-    }
-    break;
-
-    case EFSLIST_GENERAL:
-    case EFSLIST_SKIN:
-    {
-        if (bUseDist && m_bUseGPUFriendlyBatching[nThread])
-        {
-            PROFILE_FRAME(State_SortingZPass);
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_ZPassDepthSorting == 1)
-            {
-                SRendItem::mfSortForZPass(&renderItems[nStart], n);
-            }
-            else if IsCVarConstAccess(constexpr) (CRenderer::CV_r_ZPassDepthSorting == 2)
-            {
-                SRendItem::mfSortByDist(&renderItems[nStart], n, false, true);
-            }
-        }
-        else
-        {
-            PROFILE_FRAME(State_SortingLight);
-            SRendItem::mfSortByLight(&renderItems[nStart], n, true, false, false);
-        }
-    }
-    break;
-
-    case EFSLIST_AFTER_POSTPROCESS:
-    case EFSLIST_AFTER_HDRPOSTPROCESS:
-    {
-        PROFILE_FRAME(State_SortingLight);
-        SRendItem::mfSortByLight(&renderItems[nStart], n, true, false, nList == EFSLIST_DECAL);
-    }
-    break;
-    case EFSLIST_GPU_PARTICLE_CUBEMAP_COLLISION:
-        break;
-
-    default:
-        AZ_Assert(0, "Not handled");
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::EF_SortRenderLists(SRenderListDesc* pRLD, int nThreadID, bool bUseDist, bool bUseJobSystem)
-{
-    PROFILE_FRAME(Sort_Lists);
-
-    int i, j;
-    for (j = 0; j < MAX_LIST_ORDER; j++)
-    {
-        for (i = 1; i < EFSLIST_NUM; i++)
-        {
-            // EFSLIST_SHADOW_GEN is handled in Shadow Pass
-            // EFSLIST_PREPROCESS, EFSLIST_WATER, EFSLIST_WATER_VOLUMES are handled in EF_ProcessRenderLists
-            if (i == EFSLIST_SHADOW_GEN || i == EFSLIST_PREPROCESS || i == EFSLIST_WATER || i == EFSLIST_WATER_VOLUMES)
-            {
-                continue;
-            }
-            if (bUseJobSystem)
-            {
-                int nStart = pRLD->m_nStartRI[j][i];
-                int nEnd   = pRLD->m_nEndRI[j][i];
-
-                if ((nEnd - nStart) > 0)
-                {
-                    // legacy job priority: JobManager::eHighPriority
-                    m_finalizeRendItemsJobExecutor[nThreadID].StartJob(
-                        [this, i, j, pRLD, nThreadID, bUseDist]
-                        {
-                            this->EF_SortRenderList(i, j, pRLD, nThreadID, bUseDist);
-                        }
-                    );
-                }
-            }
-            else
-            {
-                EF_SortRenderList(i, j, pRLD, nThreadID, bUseDist);
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::BeginSpawningGeneratingRendItemJobs(int nThreadID)
-{
-    AZ_TRACE_METHOD();
-
-    // Register post job
-    // legacy job priority: JobManager::eHighPriority
-    m_generateRendItemJobExecutor.SetPostJob(
-        m_finalizeRendItemsJobExecutor[nThreadID],
-        [this, nThreadID]
-        {
-            this->FinalizeRendItems(nThreadID);
-        }
-    );
-
-    // Push completion fences accross all groups to prevent false (race-condition) reports of "completion" before all jobs are started.  These are then popped after we are done starting jobs.
-    // there will be decreased again after the main thread has passed all job creating parts
-    m_generateRendItemPreProcessJobExecutor.PushCompletionFence();
-    m_generateRendItemJobExecutor.PushCompletionFence();
-    m_finalizeRendItemsJobExecutor[nThreadID].PushCompletionFence();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::BeginSpawningShadowGeneratingRendItemJobs(int nThreadID)
-{
-    RegisterFinalizeShadowJobs(nThreadID);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::EndSpawningGeneratingRendItemJobs()
-{
-    m_generateRendItemJobExecutor.PopCompletionFence();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::FinalizeRendItems(int nThreadID)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-    FinalizeRendItems_ReorderRendItems(nThreadID);
-    FinalizeRendItems_SortRenderLists(nThreadID);
-
-    m_finalizeRendItemsJobExecutor[nThreadID].PopCompletionFence();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::FinalizeShadowRendItems(int nThreadID)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-    FinalizeRendItems_ReorderShadowRendItems(nThreadID);
-    FinalizeRendItems_FindShadowFrustums(nThreadID);
-
-    m_finalizeShadowRendItemsJobExecutor[nThreadID].PopCompletionFence();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::FinalizeRendItems_ReorderRendItems(int nThreadID)
-{
-    ////////////////////////////////////////////////
-    // reoder item lists by their recursive pass
-    for (int j = 0; j < MAX_LIST_ORDER; j++)
-    {
-        for (int i = 0; i < EFSLIST_NUM; i++)
-        {
-            // shadows don't need sorting, and PREPROCESS is sorted in mainthread
-            if (i == EFSLIST_SHADOW_GEN || i == EFSLIST_PREPROCESS || i == EFSLIST_WATER || i == EFSLIST_WATER_VOLUMES)
-            {
-                continue;
-            }
-
-            FinalizeRendItems_ReorderRendItemList(j, i, nThreadID);
-        }
-    }
-}
-
-void CRenderer::FinalizeRendItems_ReorderRendItemList(int nAW, int nList, int nThreadID)
-{
-    CRenderView* pRenderView = gRenDev->GetRenderViewForThread(nThreadID);
-    SRenderListDesc* __restrict pGeneralPassRLD        = &pRenderView->m_RenderListDesc[0];
-    SRenderListDesc* __restrict pRecursivePassRLD = &pRenderView->m_RenderListDesc[1];
-
-    auto& rRendItems = pRenderView->GetRenderItems(nAW, nList);
-
-    size_t nRendItemsSize = rRendItems.size();
-    if (nRendItemsSize)
-    {
-        std::sort(&rRendItems[0], &rRendItems[0] + nRendItemsSize, SCompareByOnlyStableFlagsOctreeID());
-    }
-
-    pGeneralPassRLD->m_nStartRI[nAW][nList] = 0;
-    pGeneralPassRLD->m_nEndRI[nAW][nList] = 0;
-    pRecursivePassRLD->m_nStartRI[nAW][nList] = 0;
-    pRecursivePassRLD->m_nEndRI[nAW][nList] = 0;
-
-    for (size_t i = 0; i < nRendItemsSize; ++i)
-    {
-        if (rRendItems[i].rendItemSorter.IsRecursivePass())
-        {
-            pGeneralPassRLD->m_nEndRI[nAW][nList] = i;
-            pRecursivePassRLD->m_nStartRI[nAW][nList] = i;
-            break;
-        }
-    }
-
-    if (pRecursivePassRLD->m_nStartRI[nAW][nList])
-    {
-        pRecursivePassRLD->m_nEndRI[nAW][nList] = nRendItemsSize;
-    }
-    else
-    {
-        pGeneralPassRLD->m_nEndRI[nAW][nList] = nRendItemsSize;
-    }
-    pGeneralPassRLD->m_nBatchFlags[nAW][nList] = pRenderView->GetBatchFlags(0, nAW, nList);
-    pRecursivePassRLD->m_nBatchFlags[nAW][nList] = pRenderView->GetBatchFlags(1, nAW, nList);
-
-    AZ_Assert(pGeneralPassRLD->m_nEndRI[nAW][nList] - pGeneralPassRLD->m_nStartRI[nAW][nList] >= 0, "EndRI has to be bigger than StartRI");
-    AZ_Assert(pRecursivePassRLD->m_nEndRI[nAW][nList] - pRecursivePassRLD->m_nStartRI[nAW][nList] >= 0, "EndRI has to be bigger than StartRI");
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CRenderer::FinalizeRendItems_SortRenderLists(int nThreadID)
-{
-    ////////////////////////////////////////////////
-    // do the actual sorting
-    CRenderView* pRenderView = m_RP.m_pRenderViews[nThreadID].get();
-    for (int k = 0; k < 2; k++)
-    {
-        SRenderListDesc* pCurRLD = &pRenderView->m_RenderListDesc[k];
-        static_cast<CD3D9Renderer*>(this)->EF_SortRenderLists(pCurRLD, nThreadID, (CRenderer::CV_r_ZPassDepthSorting != 0), true);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::InvokeShadowMapRenderJobs(ShadowMapFrustum* pCurFrustum, const SRenderingPassInfo& passInfo)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-    for (int i = 0; i < pCurFrustum->m_jobExecutedCastersList.Count(); ++i)
-    {
-        IShadowCaster* pEnt  = pCurFrustum->m_jobExecutedCastersList[i];
-
-        //TOFIX reactivate OmniDirectionalShadow
-        if (pCurFrustum->bOmniDirectionalShadow)
-        {
-            AABB aabb;
-            pEnt->FillBBox(aabb);
-            //!!! Reactivate proper camera
-            bool bVis = passInfo.GetCamera().IsAABBVisible_F(aabb);
-            if (!bVis)
-            {
-                continue;
-            }
-        }
-
-        if ((pCurFrustum->m_Flags & DLF_DIFFUSEOCCLUSION) && pEnt->HasOcclusionmap(0, pCurFrustum->pLightOwner))
-        {
-            continue;
-        }
-
-        // all not yet to jobs ported types need to be processed by mainthread
-        gEnv->p3DEngine->RenderRenderNode_ShadowPass(pEnt, passInfo, gRenDev->GetGenerateShadowRendItemJobExecutor());
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::StartInvokeShadowMapRenderJobs(ShadowMapFrustum* pCurFrustum, const SRenderingPassInfo& passInfo)
-{
-    // legacy job priority: JobManager::eLowPriority
-    gRenDev->GetGenerateShadowRendItemJobExecutor()->StartJob(
-        [this, pCurFrustum, passInfo]
-        {
-            this->InvokeShadowMapRenderJobs(pCurFrustum, passInfo);
-        }
-    );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CD3D9Renderer::WaitForParticleBuffer(threadID nThreadId)
-{
-    FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_PARTICLE)
-    AZ_TRACE_METHOD();
-    SRenderPipeline& rp = gRenDev->m_RP;
-
-    if (rp.m_pParticleVertexBuffer[nThreadId])
-    {
-        rp.m_pParticleVertexBuffer[nThreadId]->WaitForFence();
-    }
-    if (rp.m_pParticleIndexBuffer[nThreadId])
-    {
-        rp.m_pParticleIndexBuffer[nThreadId]->WaitForFence();
-    }
-}
-///////////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderAuxGeom.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderAuxGeom.cpp
deleted file mode 100644
index 73b6127021..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderAuxGeom.cpp
+++ /dev/null
@@ -1,1909 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "D3DRenderAuxGeom.h"
-#include <Pak/CryPakUtils.h>
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-
-const float c_clipThres(0.1f);
-
-enum EAuxGeomBufferSizes
-{
-    e_auxGeomVBSize = 0xffff,
-    e_auxGeomIBSize = e_auxGeomVBSize * 2 * 3
-};
-
-
-
-struct SAuxObjVertex
-{
-    SAuxObjVertex()
-    {
-    }
-
-    SAuxObjVertex(const Vec3& pos, const Vec3& normal)
-        : m_pos(pos)
-        , m_normal(normal)
-    {
-    }
-
-    Vec3 m_pos;
-    Vec3 m_normal;
-};
-
-
-typedef std::vector< SAuxObjVertex > AuxObjVertexBuffer;
-typedef std::vector< uint16 > AuxObjIndexBuffer;
-
-
-CRenderAuxGeomD3D::CRenderAuxGeomD3D(CD3D9Renderer& renderer)
-    : m_renderer(renderer)
-    , m_pAuxGeomVB(0)
-    , m_pAuxGeomIB(0)
-    , m_pCurVB(0)
-    , m_pCurIB(0)
-    , m_auxGeomSBM()
-    , m_wndXRes(0)
-    , m_wndYRes(0)
-    , m_aspect(1.0f)
-    , m_aspectInv(1.0f)
-    , m_matrices()
-    , m_curPrimType(CAuxGeomCB::e_PrimTypeInvalid)
-    , m_curPointSize(1)
-    , m_curTransMatrixIdx(-1)
-    , m_pAuxGeomShader(0)
-    , m_curDrawInFrontMode(e_DrawInFrontOff)
-    , m_auxSortedPushBuffer()
-    , m_pCurCBRawData(0)
-    , m_auxGeomCBCol()
-    , CV_r_auxGeom(1)
-{
-    REGISTER_CVAR2("r_auxGeom", &CV_r_auxGeom, 1, VF_NULL, "");
-}
-
-
-CRenderAuxGeomD3D::~CRenderAuxGeomD3D()
-{
-    //SAFE_RELEASE(m_pAuxGeomShader);
-    // m_pAuxGeomShader released by CShaderMan ???
-    //delete m_pAuxGeomShader;
-    //m_pAuxGeomShader = 0;
-}
-
-
-void CRenderAuxGeomD3D::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject((char*)this - 16, sizeof(*this) + 16);  // adjust for new operator
-    pSizer->AddObject(m_auxSortedPushBuffer);
-    pSizer->AddObject(m_auxGeomCBCol);
-}
-
-
-void CRenderAuxGeomD3D::ReleaseDeviceObjects()
-{
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_pAuxGeomVB);
-    m_pAuxGeomVB = nullptr;
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_pAuxGeomIB);
-    m_pAuxGeomIB = nullptr;
-
-    for (uint32 i(0); i < e_auxObjNumLOD; ++i)
-    {
-        m_sphereObj[ i ].Release();
-        m_diskObj[ i ].Release();
-        m_quadObj[ i ].Release();
-        m_coneObj[ i ].Release();
-        m_cylinderObj[ i ].Release();
-    }
-}
-
-int CRenderAuxGeomD3D::GetDeviceDataSize()
-{
-    int nSize = 0;
-
-    nSize += _VertBufferSize(m_pAuxGeomVB);
-    nSize += _IndexBufferSize(m_pAuxGeomIB);
-
-    for (uint32 i = 0; i < e_auxObjNumLOD; ++i)
-    {
-        nSize += m_sphereObj[i].GetDeviceDataSize();
-        nSize += m_diskObj[i].GetDeviceDataSize();
-        nSize += m_quadObj[i].GetDeviceDataSize();
-        nSize += m_coneObj[i].GetDeviceDataSize();
-        nSize += m_cylinderObj[i].GetDeviceDataSize();
-    }
-    return nSize;
-}
-
-
-// function to generate a sphere mesh
-static void CreateSphere(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib, float radius, unsigned int rings, unsigned int sections)
-{
-    // calc required number of vertices/indices/triangles to build a sphere for the given parameters
-    uint32 numVertices((rings - 1) * (sections + 1) + 2);
-    uint32 numTriangles((rings - 2) * sections * 2  + 2 * sections);
-    uint32 numIndices(numTriangles * 3);
-
-    // setup buffers
-    vb.clear();
-    vb.reserve(numVertices);
-
-    ib.clear();
-    ib.reserve(numIndices);
-
-    // 1st pole vertex
-    vb.push_back(SAuxObjVertex(Vec3(0.0f, 0.0f, radius), Vec3(0.0f, 0.0f, 1.0f)));
-
-    // calculate "inner" vertices
-    float sectionSlice(DEG2RAD(360.0f / (float) sections));
-    float ringSlice(DEG2RAD(180.0f / (float) rings));
-
-    for (uint32 a(1); a < rings; ++a)
-    {
-        float w(sinf(a * ringSlice));
-        for (uint32 i(0); i <= sections; ++i)
-        {
-            Vec3 v;
-            v.x = radius * cosf(i * sectionSlice) * w;
-            v.y = radius * sinf(i * sectionSlice) * w;
-            v.z = radius * cosf(a * ringSlice);
-            vb.push_back(SAuxObjVertex(v, v.GetNormalized()));
-        }
-    }
-
-    // 2nd vertex of pole (for end cap)
-    vb.push_back(SAuxObjVertex(Vec3(0.0f, 0.0f, -radius), Vec3(0.0f, 0.0f, 1.0f)));
-
-    // build "inner" faces
-    for (uint32 a(0); a < rings - 2; ++a)
-    {
-        for (uint32 i(0); i < sections; ++i)
-        {
-            ib.push_back((uint16) (1 + a * (sections + 1) + i + 1));
-            ib.push_back((uint16) (1 + a * (sections + 1) + i));
-            ib.push_back((uint16) (1 + (a + 1) * (sections + 1) + i + 1));
-
-            ib.push_back((uint16) (1 + (a + 1) * (sections + 1) + i));
-            ib.push_back((uint16) (1 + (a + 1) * (sections + 1) + i + 1));
-            ib.push_back((uint16) (1 + a * (sections + 1) + i));
-        }
-    }
-
-    // build faces for end caps (to connect "inner" vertices with poles)
-    for (uint32 i(0); i < sections; ++i)
-    {
-        ib.push_back((uint16) (1 + (0) * (sections + 1) + i));
-        ib.push_back((uint16) (1 + (0) * (sections + 1) + i + 1));
-        ib.push_back((uint16) 0);
-    }
-
-    for (uint32 i(0); i < sections; ++i)
-    {
-        ib.push_back((uint16) (1 + (rings - 2) * (sections + 1) + i + 1));
-        ib.push_back((uint16) (1 + (rings - 2) * (sections + 1) + i));
-        ib.push_back((uint16) ((rings - 1) * (sections + 1) + 1));
-    }
-}
-
-// function to generate a disk mesh
-static void CreateDisk(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib, float radius, unsigned int sections)
-{
-    // calc required number of vertices/indices/triangles to build a disk for the given parameters
-    uint32 numVertices = (sections + 1) * 2;
-    uint32 numTriangles = sections * 2;
-    uint32 numIndices = numTriangles * 3;
-
-    // setup buffers
-    vb.clear();
-    vb.reserve(numVertices);
-
-    ib.clear();
-    ib.reserve(numIndices);
-
-    Vec3 yUp = Vec3(0.0f, 1.0f, 0.0f);
-    Vec3 yDown = Vec3(0.0f, -1.0f, 0.0f);
-
-    // center vertex
-    vb.push_back(SAuxObjVertex(Vec3(0.0f, 0.0f, 0.0f), yUp));
-    vb.push_back(SAuxObjVertex(Vec3(0.0f, 0.0f, 0.0f), yDown));
-
-    // create circle around it
-    float sectionSlice(DEG2RAD(360.0f / (float)sections));
-    for (uint32 i(0); i <= sections; ++i)
-    {
-        Vec3 v;
-        v.x = radius * cosf(i * sectionSlice);
-        v.y = 0.0f;
-        v.z = radius * sinf(i * sectionSlice);
-        vb.push_back(SAuxObjVertex(v, yUp));
-        vb.push_back(SAuxObjVertex(v, yDown));
-    }
-
-    // build faces
-    for (uint16 i = 0; i < numTriangles; i += 2)
-    {
-        // top face
-        ib.push_back(0);
-        ib.push_back(2 + i + 2);
-        ib.push_back(2 + i);
-
-        // bottom face
-        ib.push_back(1);
-        ib.push_back(3 + i);
-        ib.push_back(3 + i + 2);
-    }
-}
-
-// function to generate a quad mesh on the x z plane
-static void CreateQuad(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib, float width, float height)
-{
-    // Calc required number of vertices/indices/triangles to build a quad for the given parameters
-    uint32 numVertices = 4 * 2; // 4 corners * 2 sides
-    uint32 numTriangles = 2 * 2; // 2 triangles * 2 sides
-    uint32 numIndices = numTriangles * 3; 
-
-    float halfWidth = width * 0.5f;
-    float halfHeight = height * 0.5f;
-
-    // setup buffers
-    vb.clear();
-    vb.reserve(numVertices);
-
-    ib.clear();
-    ib.reserve(numIndices);
-
-    Vec3 yUp = Vec3(0.0f, 1.0f, 0.0f);
-    Vec3 yDown = Vec3(0.0f, -1.0f, 0.0f);
-
-    // top faces
-    vb.push_back(SAuxObjVertex(Vec3(-halfWidth, 0.0f,  halfHeight), yUp));
-    vb.push_back(SAuxObjVertex(Vec3( halfWidth, 0.0f,  halfHeight), yUp));
-    vb.push_back(SAuxObjVertex(Vec3(-halfWidth, 0.0f, -halfHeight), yUp));
-    vb.push_back(SAuxObjVertex(Vec3( halfWidth, 0.0f, -halfHeight), yUp));
-
-    ib.insert(ib.end(), {1, 2, 0, 3, 2, 1});
-
-    // bottom faces
-    vb.push_back(SAuxObjVertex(Vec3(-halfWidth, 0.0f,  halfHeight), yDown));
-    vb.push_back(SAuxObjVertex(Vec3( halfWidth, 0.0f,  halfHeight), yDown));
-    vb.push_back(SAuxObjVertex(Vec3(-halfWidth, 0.0f, -halfHeight), yDown));
-    vb.push_back(SAuxObjVertex(Vec3( halfWidth, 0.0f, -halfHeight), yDown));
-
-    ib.insert(ib.end(), { 4, 6, 5, 5, 6, 7 });
-}
-
-// function to generate a cone mesh
-static void CreateCone(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib, float radius, float height, unsigned int sections)
-{
-    // calc required number of vertices/indices/triangles to build a cone for the given parameters
-    uint32 numVertices(2 * (sections + 1) + 2);
-    uint32 numTriangles(2 * sections);
-    uint32 numIndices(numTriangles * 3);
-
-    // setup buffers
-    vb.clear();
-    vb.reserve(numVertices);
-
-    ib.clear();
-    ib.reserve(numIndices);
-
-    // center vertex
-    vb.push_back(SAuxObjVertex(Vec3(0.0f, 0.0f, 0.0f), Vec3(0.0f, -1.0f, 0.0f)));
-
-    // create circle around it
-    float sectionSlice(DEG2RAD(360.0f / (float) sections));
-    for (uint32 i(0); i <= sections; ++i)
-    {
-        Vec3 v;
-        v.x = radius * cosf(i * sectionSlice);
-        v.y = 0.0f;
-        v.z = radius * sinf(i * sectionSlice);
-        vb.push_back(SAuxObjVertex(v, Vec3(0.0f, -1.0f, 0.0f)));
-    }
-
-    // build faces for end cap
-    for (uint16 i(0); i < sections; ++i)
-    {
-        ib.push_back(0);
-        ib.push_back(1 + i);
-        ib.push_back(1 + i + 1);
-    }
-
-    // top
-    vb.push_back(SAuxObjVertex(Vec3(0.0f, height, 0.0f), Vec3(0.0f, 1.0f, 0.0f)));
-
-    for (uint32 i(0); i <= sections; ++i)
-    {
-        Vec3 v;
-        v.x = radius * cosf(i * sectionSlice);
-        v.y = 0.0f;
-        v.z = radius * sinf(i * sectionSlice);
-
-        Vec3 v1;
-        v1.x = radius * cosf(i * sectionSlice + 0.01f);
-        v1.y = 0.0f;
-        v1.z = radius * sinf(i * sectionSlice + 0.01f);
-
-        Vec3 d(v1 - v);
-        Vec3 d1(Vec3(0.0, height, 0.0f) - v);
-
-        Vec3 n((d1.Cross(d)).normalized());
-        vb.push_back(SAuxObjVertex(v, n));
-    }
-
-    // build faces
-    for (uint16 i(0); i < sections; ++i)
-    {
-        ib.push_back(sections + 2);
-        ib.push_back(sections + 3 + i + 1);
-        ib.push_back(sections + 3 + i);
-    }
-}
-
-
-// function to generate a cylinder mesh
-static void CreateCylinder(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib, float radius, float height, unsigned int sections)
-{
-    // calc required number of vertices/indices/triangles to build a cylinder for the given parameters
-    uint32 numVertices(4 * (sections + 1) + 2);
-    uint32 numTriangles(4 * sections);
-    uint32 numIndices(numTriangles * 3);
-
-    // setup buffers
-    vb.clear();
-    vb.reserve(numVertices);
-
-    ib.clear();
-    ib.reserve(numIndices);
-
-    float sectionSlice(DEG2RAD(360.0f / (float) sections));
-
-    // bottom cap
-    {
-        // center bottom vertex
-        vb.push_back(SAuxObjVertex(Vec3(0.0f, -0.5f * height, 0.0f), Vec3(0.0f, -1.0f, 0.0f)));
-
-        // create circle around it
-        for (uint32 i(0); i <= sections; ++i)
-        {
-            Vec3 v;
-            v.x = radius * cosf(i * sectionSlice);
-            v.y = -0.5f * height;
-            v.z = radius * sinf(i * sectionSlice);
-            vb.push_back(SAuxObjVertex(v, Vec3(0.0f, -1.0f, 0.0f)));
-        }
-
-        // build faces
-        for (uint16 i(0); i < sections; ++i)
-        {
-            ib.push_back(0);
-            ib.push_back(1 + i);
-            ib.push_back(1 + i + 1);
-        }
-    }
-
-    // side
-    {
-        int vIdx(vb.size());
-
-        for (uint32 i(0); i <= sections; ++i)
-        {
-            Vec3 v;
-            v.x = radius * cosf(i * sectionSlice);
-            v.y = -0.5f * height;
-            v.z = radius * sinf(i * sectionSlice);
-
-            Vec3 n(v.normalized());
-            vb.push_back(SAuxObjVertex(v, n));
-            vb.push_back(SAuxObjVertex(Vec3(v.x, -v.y, v.z), n));
-        }
-
-        // build faces
-        for (uint16 i(0); i < sections; ++i, vIdx += 2)
-        {
-            ib.push_back(vIdx);
-            ib.push_back(vIdx + 1);
-            ib.push_back(vIdx + 2);
-
-            ib.push_back(vIdx + 1);
-            ib.push_back(vIdx + 3);
-            ib.push_back(vIdx + 2);
-        }
-    }
-
-    // top cap
-    {
-        int vIdx(vb.size());
-
-        // center top vertex
-        vb.push_back(SAuxObjVertex(Vec3(0.0f, 0.5f * height, 0.0f), Vec3(0.0f, 1.0f, 0.0f)));
-
-        // create circle around it
-        for (uint32 i(0); i <= sections; ++i)
-        {
-            Vec3 v;
-            v.x = radius * cosf(i * sectionSlice);
-            v.y = 0.5f * height;
-            v.z = radius * sinf(i * sectionSlice);
-            vb.push_back(SAuxObjVertex(v, Vec3(0.0f, 1.0f, 0.0f)));
-        }
-
-        // build faces
-        for (uint16 i(0); i < sections; ++i)
-        {
-            ib.push_back(vIdx);
-            ib.push_back(vIdx + 1 + i + 1);
-            ib.push_back(vIdx + 1 + i);
-        }
-    }
-}
-
-
-// Functor to generate a sphere mesh. To be used with generalized CreateMesh function.
-struct SSphereMeshCreateFunc
-{
-    SSphereMeshCreateFunc(float radius, unsigned int rings, unsigned int sections)
-        : m_radius(radius)
-        , m_rings(rings)
-        , m_sections(sections)
-    {
-    }
-
-    void CreateMesh(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib)
-    {
-        CreateSphere(vb, ib, m_radius, m_rings, m_sections);
-    }
-
-    float m_radius;
-    unsigned int m_rings;
-    unsigned int m_sections;
-};
-
-// Functor to generate a disk mesh. To be used with generalized CreateMesh function.
-struct SDiskMeshCreateFunc
-{
-    SDiskMeshCreateFunc(float radius, unsigned int rings)
-        : m_radius(radius)
-        , m_rings(rings)
-    {
-    }
-
-    void CreateMesh(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib)
-    {
-        CreateDisk(vb, ib, m_radius, m_rings);
-    }
-
-    float m_radius;
-    unsigned int m_rings;
-};
-
-// Functor to generate a quad mesh. To be used with generalized CreateMesh function.
-struct SQuadMeshCreateFunc
-{
-    SQuadMeshCreateFunc(float width, float height)
-        : m_width(width)
-        , m_height(height)
-    {
-    }
-
-    void CreateMesh(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib)
-    {
-        CreateQuad(vb, ib, m_width, m_height);
-    }
-
-    float m_width;
-    float m_height;
-};
-
-
-
-// Functor to generate a cone mesh. To be used with generalized CreateMesh function.
-struct SConeMeshCreateFunc
-{
-    SConeMeshCreateFunc(float radius, float height, unsigned int sections)
-        : m_radius(radius)
-        , m_height(height)
-        , m_sections(sections)
-    {
-    }
-
-    void CreateMesh(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib)
-    {
-        CreateCone(vb, ib, m_radius, m_height, m_sections);
-    }
-
-    float m_radius;
-    float m_height;
-    unsigned int m_sections;
-};
-
-
-// Functor to generate a cylinder mesh. To be used with generalized CreateMesh function.
-struct SCylinderMeshCreateFunc
-{
-    SCylinderMeshCreateFunc(float radius, float height, unsigned int sections)
-        : m_radius(radius)
-        , m_height(height)
-        , m_sections(sections)
-    {
-    }
-
-    void CreateMesh(AuxObjVertexBuffer& vb, AuxObjIndexBuffer& ib)
-    {
-        CreateCylinder(vb, ib, m_radius, m_height, m_sections);
-    }
-
-    float m_radius;
-    float m_height;
-    unsigned int m_sections;
-};
-
-
-// Generalized CreateMesh function to create any mesh via passed-in functor.
-// The functor needs to provide a CreateMesh function which accepts an
-// AuxObjVertexBuffer and AuxObjIndexBuffer to stored the resulting mesh.
-template< typename TMeshFunc >
-HRESULT CRenderAuxGeomD3D::CreateMesh(SDrawObjMesh& mesh, TMeshFunc meshFunc)
-{
-    // create mesh
-    std::vector< SAuxObjVertex > vb;
-    std::vector< uint16 > ib;
-    meshFunc.CreateMesh(vb, ib);
-
-    // create vertex buffer and copy data
-    HRESULT hr(S_OK);
-    D3D11_BUFFER_DESC BufDescV;
-    ZeroStruct(BufDescV);
-    BufDescV.ByteWidth = vb.size() * sizeof(SAuxObjVertex);
-    BufDescV.Usage = D3D11_USAGE_DEFAULT;
-    BufDescV.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-    BufDescV.CPUAccessFlags = 0;
-    BufDescV.MiscFlags = 0;
-
-    D3D11_SUBRESOURCE_DATA InitData;
-    InitData.pSysMem = &vb[0];
-    InitData.SysMemPitch = 0;
-    InitData.SysMemSlicePitch = 0;
-    if (FAILED(hr = m_renderer.m_DevMan.CreateD3D11Buffer(&BufDescV, &InitData, &mesh.m_pVB, "AuxGeometryMesh")))
-    {
-        assert(SUCCEEDED(hr));
-        return(hr);
-    }
-
-    D3D11_BUFFER_DESC BufDescI;
-    ZeroStruct(BufDescI);
-    BufDescI.ByteWidth = ib.size() * sizeof(uint16);
-    BufDescI.Usage = D3D11_USAGE_DEFAULT;
-    BufDescI.BindFlags = D3D11_BIND_INDEX_BUFFER;
-    BufDescI.CPUAccessFlags = 0;
-    BufDescI.MiscFlags = 0;
-
-    InitData.pSysMem = &ib[0];
-    InitData.SysMemPitch = 0;
-    InitData.SysMemSlicePitch = 0;
-    if (FAILED(hr = m_renderer.m_DevMan.CreateD3D11Buffer(&BufDescI, &InitData, &mesh.m_pIB, "AuxGeometryMesh")))
-    {
-        assert(SUCCEEDED(hr));
-        return(hr);
-    }
-
-    // write mesh info
-    mesh.m_numVertices = vb.size();
-    mesh.m_numFaces = ib.size() / 3;
-
-    return(hr);
-}
-
-HRESULT CRenderAuxGeomD3D::RestoreDeviceObjects()
-{
-    HRESULT hr(S_OK);
-
-    // recreate vertex buffer
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_pAuxGeomVB);
-    m_pAuxGeomVB = nullptr;
-
-    D3D11_BUFFER_DESC BufDescV;
-    ZeroStruct(BufDescV);
-    BufDescV.ByteWidth = e_auxGeomVBSize * sizeof(SAuxVertex);
-#if defined(CRY_USE_METAL)
-    //Direct access memory is faster on metal as it only needs one CPU->GPU copy whereas the
-    //dynamic memory (for vertex buffers) will do a CPU->GPU and then a GPU->GPU copy.
-    BufDescV.Usage = D3D11_USAGE_DIRECT_ACCESS;
-#else
-    BufDescV.Usage = D3D11_USAGE_DYNAMIC;
-#endif
-    BufDescV.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-    BufDescV.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    BufDescV.MiscFlags = 0;
-
-    if (FAILED(hr = m_renderer.m_DevMan.CreateD3D11Buffer(&BufDescV, 0, &m_pAuxGeomVB, "AuxGeometry")))
-    {
-        assert(0);
-        return(hr);
-    }
-
-    // recreate index buffer
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_pAuxGeomIB);
-    m_pAuxGeomIB = nullptr;
-
-    D3D11_BUFFER_DESC BufDescI;
-    ZeroStruct(BufDescI);
-    BufDescI.ByteWidth =  e_auxGeomIBSize * sizeof(uint16);
-#if defined(CRY_USE_METAL)
-    //Direct access memory is faster on metal as it only needs one CPU->GPU copy whereas the
-    //dynamic memory (for index buffers) will do a CPU->GPU and then a GPU->GPU copy.
-    BufDescI.Usage = D3D11_USAGE_DIRECT_ACCESS;
-#else
-    BufDescI.Usage = D3D11_USAGE_DYNAMIC;
-#endif
-    BufDescI.BindFlags = D3D11_BIND_INDEX_BUFFER;
-    BufDescI.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    BufDescI.MiscFlags = 0;
-    if (FAILED(hr = m_renderer.m_DevMan.CreateD3D11Buffer(&BufDescI, 0, &m_pAuxGeomIB, "AuxGeometry")))
-    {
-        assert(0);
-        return(hr);
-    }
-
-    // recreate aux objects
-    for (uint32 i(0); i < e_auxObjNumLOD; ++i)
-    {
-        m_sphereObj[ i ].Release();
-        if (FAILED(hr = CreateMesh(m_sphereObj[ i ], SSphereMeshCreateFunc(1.0f, 9 + 4 * i, 9 + 4 * i))))
-        {
-            return(hr);
-        }
-
-        m_diskObj[i].Release();
-        if (FAILED(hr = CreateMesh(m_diskObj[ i ], SDiskMeshCreateFunc(1.0f, 9 + 4 * i))))
-        {
-            return(hr);
-        }
-
-        m_quadObj[i].Release();
-        if (FAILED(hr = CreateMesh(m_quadObj[i], SQuadMeshCreateFunc(1.0f, 1.0f))))
-        {
-            return(hr);
-        }
-
-        m_coneObj[ i ].Release();
-        if (FAILED(hr = CreateMesh(m_coneObj[ i ], SConeMeshCreateFunc(1.0f, 1.0f, 10 + i * 6))))
-        {
-            return(hr);
-        }
-
-        m_cylinderObj[ i ].Release();
-        if (FAILED(hr = CreateMesh(m_cylinderObj[ i ], SCylinderMeshCreateFunc(1.0f, 1.0f, 10 + i * 6))))
-        {
-            return(hr);
-        }
-    }
-    return(hr);
-}
-
-
-void CRenderAuxGeomD3D::DrawAuxPrimitives(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd, const CAuxGeomCB::EPrimType& primType)
-{
-    assert(CAuxGeomCB::e_PtList == primType || CAuxGeomCB::e_LineList == primType || CAuxGeomCB::e_TriList == primType);
-
-    HRESULT hr(S_OK);
-
-    // bind vertex and index streams and set vertex declaration
-    bool streamsBound = BindStreams(m_auxGeomPrimitiveVertexFormat, m_pAuxGeomVB, m_pAuxGeomIB);
-
-    // get aux vertex buffer
-    const CAuxGeomCB::AuxVertexBuffer& auxVertexBuffer(GetAuxVertexBuffer());
-
-    // determine flags for prim type
-    uint32 d3dNumPrimDivider;
-    eRenderPrimitiveType ePrimType;
-
-    DetermineAuxPrimitveFlags(d3dNumPrimDivider, ePrimType, primType);
-
-    // helpers for DP call
-    uint32 initialVBLockOffset(m_auxGeomSBM.m_curVBIndex);
-    uint32 numVerticesWrittenToVB(0);
-
-    m_renderer.FX_Commit();
-
-    // process each entry
-    for (CAuxGeomCB::AuxSortedPushBuffer::const_iterator it(itBegin); it != itEnd; ++it)
-    {
-        // get current push buffer entry
-        const CAuxGeomCB::SAuxPushBufferEntry* curPBEntry(*it);
-
-        // number of vertices to copy
-        uint32 verticesToCopy(curPBEntry->m_numVertices);
-        uint32 verticesCopied(0);
-
-        // stream vertex data
-        while (verticesToCopy > 0)
-        {
-            // number of vertices which fit into current vb
-            uint32 maxVerticesInThisBatch(e_auxGeomVBSize - m_auxGeomSBM.m_curVBIndex);
-
-            // round down to previous multiple of "d3dNumPrimDivider"
-            maxVerticesInThisBatch -= maxVerticesInThisBatch % d3dNumPrimDivider;
-
-            // still enough space to feed data in the current vb
-            if (maxVerticesInThisBatch > 0)
-            {
-                // compute amount of vertices to move in this batch
-                uint32 toCopy(verticesToCopy > maxVerticesInThisBatch ? maxVerticesInThisBatch : verticesToCopy);
-
-                // get pointer to vertex buffer
-                SAuxVertex* pVertices(0);
-                // determine lock flags
-                D3D11_MAP mapFlags(D3D11_MAP_WRITE_NO_OVERWRITE);
-                if (false != m_auxGeomSBM.m_discardVB)
-                {
-                    m_auxGeomSBM.m_discardVB = false;
-                    mapFlags = D3D11_MAP_WRITE_DISCARD;
-                }
-
-                D3D11_MAPPED_SUBRESOURCE mappedResource;
-                if (FAILED(hr = m_renderer.GetDeviceContext().Map(m_pAuxGeomVB, 0, mapFlags, 0, &mappedResource)))
-                {
-                    assert(0);
-                    iLog->Log("ERROR: CD3DRenderAuxGeom::DrawAuxPrimitives() - Vertex buffer could not be locked!");
-                    return;
-                }
-                pVertices = (SAuxVertex*)mappedResource.pData;
-                pVertices += m_auxGeomSBM.m_curVBIndex;
-
-                // move vertex data
-                // cppcheck-suppress nullPointer
-                memcpy(pVertices, &auxVertexBuffer[ curPBEntry->m_vertexOffs + verticesCopied ], toCopy * sizeof(SAuxVertex));
-
-                // unlock vb
-                m_renderer.GetDeviceContext().Unmap(m_pAuxGeomVB, 0);
-                // update accumulators and buffer indices
-                verticesCopied += toCopy;
-                verticesToCopy -= toCopy;
-
-                m_auxGeomSBM.m_curVBIndex += toCopy;
-                numVerticesWrittenToVB += toCopy;
-            }
-            else
-            {
-                // not enough space in vb for (remainder of) current push buffer entry
-                if (numVerticesWrittenToVB > 0)
-                {
-                    // commit batch
-                    assert(0 == numVerticesWrittenToVB % d3dNumPrimDivider);
-                    if (streamsBound)
-                    {
-                        m_renderer.FX_DrawPrimitive(ePrimType, initialVBLockOffset, numVerticesWrittenToVB);
-                    }
-                }
-
-                // request a DISCARD lock of vb in the next run
-                m_auxGeomSBM.DiscardVB();
-                initialVBLockOffset = m_auxGeomSBM.m_curVBIndex;
-                numVerticesWrittenToVB = 0;
-            }
-        }
-    }
-
-    if (numVerticesWrittenToVB > 0)
-    {
-        // commit batch
-        assert(0 == numVerticesWrittenToVB % d3dNumPrimDivider);
-
-        if (streamsBound)
-        {
-            m_renderer.FX_DrawPrimitive(ePrimType, initialVBLockOffset, numVerticesWrittenToVB);
-        }
-    }
-}
-
-
-void CRenderAuxGeomD3D::DrawAuxIndexedPrimitives(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd, const CAuxGeomCB::EPrimType& primType)
-{
-    assert(CAuxGeomCB::e_LineListInd == primType || CAuxGeomCB::e_TriListInd == primType);
-
-    HRESULT hr(S_OK);
-
-    // bind vertex and index streams and set vertex declaration
-    bool streamsBound = BindStreams(eVF_P3F_C4B_T2F, m_pAuxGeomVB, m_pAuxGeomIB);
-
-    // get aux vertex and index buffer
-    const CAuxGeomCB::AuxVertexBuffer& auxVertexBuffer(GetAuxVertexBuffer());
-    const CAuxGeomCB::AuxIndexBuffer& auxIndexBuffer(GetAuxIndexBuffer());
-
-    // determine flags for prim type
-    uint32 d3dNumPrimDivider;
-    eRenderPrimitiveType ePrimType;
-    DetermineAuxPrimitveFlags(d3dNumPrimDivider, ePrimType, primType);
-
-    // helpers for DP call
-    uint32 initialVBLockOffset(m_auxGeomSBM.m_curVBIndex);
-    uint32 numVerticesWrittenToVB(0);
-    uint32 initialIBLockOffset(m_auxGeomSBM.m_curIBIndex);
-    uint32 numIndicesWrittenToIB(0);
-
-    m_renderer.FX_Commit();
-
-    // process each entry
-    for (CAuxGeomCB::AuxSortedPushBuffer::const_iterator it(itBegin); it != itEnd; )
-    {
-        // get current push buffer entry
-        const CAuxGeomCB::SAuxPushBufferEntry* curPBEntry(*it);
-
-        // process a push buffer entry if it can fit at all (otherwise silently skip it)
-        if (e_auxGeomVBSize >= curPBEntry->m_numVertices && e_auxGeomIBSize >= curPBEntry->m_numIndices)
-        {
-            // check if push buffer still fits into current buffer
-            if (e_auxGeomVBSize >= m_auxGeomSBM.m_curVBIndex + curPBEntry->m_numVertices && e_auxGeomIBSize >= m_auxGeomSBM.m_curIBIndex + curPBEntry->m_numIndices)
-            {
-                // determine lock vb flags
-
-                // get pointer to vertex buffer
-                SAuxVertex* pVertices(0);
-                D3D11_MAP mp (D3D11_MAP_WRITE_NO_OVERWRITE);
-                if (false != m_auxGeomSBM.m_discardVB)
-                {
-                    m_auxGeomSBM.m_discardVB = false;
-                    mp = D3D11_MAP_WRITE_DISCARD;
-                }
-                D3D11_MAPPED_SUBRESOURCE mappedResource;
-                if (FAILED(hr = m_renderer.GetDeviceContext().Map(m_pAuxGeomVB, 0, mp, 0, &mappedResource)))
-                {
-                    assert(0);
-                    iLog->Log("ERROR: CD3DRenderAuxGeom::DrawAuxIndexedPrimitives() - Vertex buffer could not be locked!");
-                    return;
-                }
-                pVertices = (SAuxVertex*)mappedResource.pData;
-                pVertices += m_auxGeomSBM.m_curVBIndex;
-
-                // move vertex data of this entry
-                // cppcheck-suppress nullPointer
-                memcpy(pVertices, &auxVertexBuffer[ curPBEntry->m_vertexOffs ], curPBEntry->m_numVertices * sizeof(SAuxVertex));
-
-                // unlock vb
-                m_renderer.GetDeviceContext().Unmap(m_pAuxGeomVB, 0);
-
-                // get pointer to index buffer
-                uint16* pIndices(0);
-                mp = D3D11_MAP_WRITE_NO_OVERWRITE;
-                if (false != m_auxGeomSBM.m_discardIB)
-                {
-                    m_auxGeomSBM.m_discardIB = false;
-                    mp = D3D11_MAP_WRITE_DISCARD;
-                }
-
-                if (FAILED(hr = m_renderer.GetDeviceContext().Map(m_pAuxGeomIB, 0, mp, 0, &mappedResource)))
-                {
-                    assert(0);
-                    iLog->Log("ERROR: CD3DRenderAuxGeom::DrawAuxIndexedPrimitives() - Index buffer could not be locked!");
-
-                    m_renderer.GetDeviceContext().Unmap(m_pAuxGeomVB, 0);
-                    return;
-                }
-                pIndices = (uint16*)mappedResource.pData;
-                pIndices += m_auxGeomSBM.m_curIBIndex;
-
-                // move index data of this entry (modify indices to match VB insert location)
-                for (uint32 i(0); i < curPBEntry->m_numIndices; ++i)
-                {
-                    // cppcheck-suppress nullPointer
-                    pIndices[ i ] = numVerticesWrittenToVB + auxIndexBuffer[ curPBEntry->m_indexOffs + i ];
-                }
-
-                // unlock ib
-                m_renderer.GetDeviceContext().Unmap(m_pAuxGeomIB, 0);
-
-                // update buffer indices
-                m_auxGeomSBM.m_curVBIndex += curPBEntry->m_numVertices;
-                m_auxGeomSBM.m_curIBIndex += curPBEntry->m_numIndices;
-
-                numVerticesWrittenToVB += curPBEntry->m_numVertices;
-                numIndicesWrittenToIB += curPBEntry->m_numIndices;
-
-                // advance to next push puffer entry
-                ++it;
-            }
-            else
-            {
-                // push buffer entry currently doesn't fit, will be processed in the next iteration when buffers got flushed
-                if (numVerticesWrittenToVB > 0 && numIndicesWrittenToIB > 0)
-                {
-                    // commit batch
-                    assert(0 == numIndicesWrittenToIB % d3dNumPrimDivider);
-                    if (streamsBound)
-                    {
-                        m_renderer.FX_DrawIndexedPrimitive(ePrimType, initialVBLockOffset, 0, numVerticesWrittenToVB, initialIBLockOffset, numIndicesWrittenToIB);
-                    }
-                }
-
-                // request a DISCARD lock / don't advance iterator!
-                m_auxGeomSBM.DiscardVB();
-                initialVBLockOffset = m_auxGeomSBM.m_curVBIndex;
-                numVerticesWrittenToVB = 0;
-
-                m_auxGeomSBM.DiscardIB();
-                initialIBLockOffset = m_auxGeomSBM.m_curIBIndex;
-                numIndicesWrittenToIB = 0;
-            }
-        }
-        else
-        {
-            // push buffer entry too big for dedicated vb/ib buffer
-            // advance to next push puffer entry
-            assert(0);
-            iLog->Log("ERROR: CD3DRenderAuxGeom::DrawAuxIndexedPrimitives() - Auxiliary geometry too big to render!");
-            ++it;
-        }
-    }
-
-    if (numVerticesWrittenToVB > 0 && numIndicesWrittenToIB > 0)
-    {
-        // commit batch
-        assert(0 == numIndicesWrittenToIB % d3dNumPrimDivider);
-        if (streamsBound)
-        {
-            m_renderer.FX_DrawIndexedPrimitive(ePrimType, initialVBLockOffset, 0, numVerticesWrittenToVB, initialIBLockOffset, numIndicesWrittenToIB);
-        }
-    }
-}
-
-
-void CRenderAuxGeomD3D::DrawAuxObjects(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd)
-{
-    CAuxGeomCB::EAuxDrawObjType objType(CAuxGeomCB::GetAuxObjType((*itBegin)->m_renderFlags));
-
-    // get draw params buffer
-    const CAuxGeomCB::AuxDrawObjParamBuffer& auxDrawObjParamBuffer(GetAuxDrawObjParamBuffer());
-
-    // process each entry
-    for (CAuxGeomCB::AuxSortedPushBuffer::const_iterator it(itBegin); it != itEnd; ++it)
-    {
-        // get current push buffer entry
-        const CAuxGeomCB::SAuxPushBufferEntry* curPBEntry(*it);
-
-        // assert than all objects in this batch are of same type
-        assert(CAuxGeomCB::GetAuxObjType(curPBEntry->m_renderFlags) == objType);
-
-        uint32 drawParamOffs(0);
-        if (curPBEntry->GetDrawParamOffs(drawParamOffs))
-        {
-            // get draw params
-            const CAuxGeomCB::SAuxDrawObjParams& drawParams(auxDrawObjParamBuffer[ drawParamOffs ]);
-
-            // Prepare d3d world space matrix in draw param structure
-            // Attention: in d3d terms matWorld is actually matWorld^T
-            Matrix44A matWorld;
-            matWorld.SetIdentity();
-            memcpy(&matWorld, &drawParams.m_matWorld, sizeof(drawParams.m_matWorld));
-
-            // set transformation matrices
-            static CCryNameR matWorldViewProjName("matWorldViewProj");
-            if (m_curDrawInFrontMode == e_DrawInFrontOn)
-            {
-                Matrix44A matScale(Matrix44A(Matrix34::CreateScale(Vec3(0.999f, 0.999f, 0.999f))));
-
-                Matrix44A matWorldViewScaleProjT;
-                matWorldViewScaleProjT = (GetCurrentView() * matScale);
-                matWorldViewScaleProjT = matWorldViewScaleProjT * GetCurrentProj();
-
-                matWorldViewScaleProjT = matWorldViewScaleProjT.GetTransposed();
-                matWorldViewScaleProjT = matWorldViewScaleProjT * matWorld;
-                m_pAuxGeomShader->FXSetVSFloat(matWorldViewProjName, alias_cast<Vec4*>(&matWorldViewScaleProjT), 4);
-            }
-            else
-            {
-                Matrix44A matWorldViewProjT;
-                matWorldViewProjT = m_matrices.m_pCurTransMat->GetTransposed();
-                matWorldViewProjT = matWorldViewProjT * matWorld;
-                m_pAuxGeomShader->FXSetVSFloat(matWorldViewProjName, alias_cast<Vec4*>(&matWorldViewProjT), 4);
-            }
-
-            // set color
-            ColorF col(drawParams.m_color);
-            Vec4 colVec(col.b, col.g, col.r, col.a);   // need to flip r/b as drawParams.m_color was originally argb
-            static CCryNameR auxGeomObjColorName("auxGeomObjColor");
-            m_pAuxGeomShader->FXSetVSFloat(auxGeomObjColorName, &colVec, 1);
-
-            // set shading flag
-            Vec4 shadingVec(drawParams.m_shaded ? 0.4f : 0, drawParams.m_shaded ? 0.6f : 1, 0, 0);
-            static CCryNameR auxGeomObjShadingName("auxGeomObjShading");
-            m_pAuxGeomShader->FXSetVSFloat(auxGeomObjShadingName, &shadingVec, 1);
-
-            // set light vector (rotate back into local space)
-            Matrix33 matWorldInv(drawParams.m_matWorldRotation.GetInverted());
-            Vec3 lightLocalSpace(matWorldInv * Vec3(0.5773f, 0.5773f, 0.5773f));
-
-            // normalize light vector (matWorld could contain non-uniform scaling)
-            lightLocalSpace.Normalize();
-            Vec4 lightVec(lightLocalSpace.x, lightLocalSpace.y, lightLocalSpace.z, 0.0f);
-            static CCryNameR globalLightLocalName("globalLightLocal");
-            m_pAuxGeomShader->FXSetVSFloat(globalLightLocalName, &lightVec, 1);
-
-            // LOD calculation
-            Matrix44A matWorldT;
-            matWorldT = matWorld.GetTransposed();
-
-            Vec4 objCenterWorld;
-            Vec3 nullVec(0.0f, 0.0f, 0.0f);
-            mathVec3TransformF(&objCenterWorld, &nullVec, &matWorldT);
-            Vec4 objOuterRightWorld(objCenterWorld + (Vec4(GetCurrentView().m00, GetCurrentView().m10, GetCurrentView().m20, 0.0f) * drawParams.m_size));
-
-            Vec4 v0, v1;
-
-            Vec3 objCenterWorldVec(objCenterWorld.x, objCenterWorld.y, objCenterWorld.z);
-            Vec3 objOuterRightWorldVec(objOuterRightWorld.x, objOuterRightWorld.y, objOuterRightWorld.z);
-            mathVec3TransformF(&v0, &objCenterWorldVec, m_matrices.m_pCurTransMat);
-            mathVec3TransformF(&v1, &objOuterRightWorldVec, m_matrices.m_pCurTransMat);
-
-            float scale;
-            assert(fabs(v0.w - v0.w) < 1e-4);
-            if (fabs(v0.w) < 1e-2)
-            {
-                scale = 0.5f;
-            }
-            else
-            {
-                scale = ((v1.x - v0.x) / v0.w) * (float) max(m_wndXRes, m_wndYRes) / 500.0f;
-            }
-
-            // map scale to detail level
-            uint32 lodLevel((uint32) ((scale / 0.5f) * (e_auxObjNumLOD - 1)));
-            if (lodLevel >= e_auxObjNumLOD)
-            {
-                lodLevel = e_auxObjNumLOD - 1;
-            }
-
-            // get appropriate mesh
-            assert(lodLevel >= 0 && lodLevel < e_auxObjNumLOD);
-            SDrawObjMesh* pMesh(0);
-            switch (objType)
-            {
-            case CAuxGeomCB::eDOT_Sphere:
-            default:
-            {
-                pMesh = &m_sphereObj[ lodLevel ];
-                break;
-            }
-            case CAuxGeomCB::eDOT_Disk:
-            {
-                pMesh = &m_diskObj[ lodLevel ];
-                break;
-            }
-            case CAuxGeomCB::eDOT_Quad:
-            {
-                pMesh = &m_quadObj[lodLevel];
-                break;
-            }
-            case CAuxGeomCB::eDOT_Cone:
-            {
-                pMesh = &m_coneObj[ lodLevel ];
-                break;
-            }
-            case CAuxGeomCB::eDOT_Cylinder:
-            {
-                pMesh = &m_cylinderObj[ lodLevel ];
-                break;
-            }
-            }
-            assert(0 != pMesh);
-
-            // bind vertex and index streams and set vertex declaration
-            if (BindStreams(m_auxGeomObjectVertexFormat, pMesh->m_pVB, pMesh->m_pIB))
-            {
-                m_renderer.FX_Commit();
-
-                // draw mesh
-                m_renderer.FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, pMesh->m_numVertices, 0, pMesh->m_numFaces * 3);
-            }
-        }
-        else
-        {
-            assert(0);   // GetDrawParamOffs( ... ) failed -- corrupt data in push buffer?
-        }
-    }
-}
-
-static inline Vec3 IntersectLinePlane(const Vec3& o, const Vec3& d, const Plane& p, float& t)
-{
-    t = -((p.n | o) + (p.d + c_clipThres)) / (p.n | d);
-    return(o + d * t);
-}
-
-// maps floating point channels (0.f to 1.f range) to DWORD
-#define DWORD_COLORVALUE(r, g, b, a)        \
-    DWORD(                                  \
-    (((DWORD)((a) * 255.f) & 0xff) << 24) | \
-    (((DWORD)((r) * 255.f) & 0xff) << 16) | \
-    (((DWORD)((g) * 255.f) & 0xff) << 8) |  \
-    (((DWORD)((b) * 255.f) & 0xff) << 0))
-
-static inline DWORD ClipColor(const DWORD& c0, const DWORD& c1, float t)
-{
-    // convert D3D DWORD color storage (ARGB) to custom ColorF storage (ColorB uses ABGR!)
-    const float f = 1.0f / 255.0f;
-    ColorF v0(
-        f * (float)(unsigned char)(c0 >> 16),
-        f * (float)(unsigned char)(c0 >>  8),
-        f * (float)(unsigned char)(c0 >>  0),
-        f * (float)(unsigned char)(c0 >> 24));
-    ColorF v1(
-        f * (float)(unsigned char)(c1 >> 16),
-        f * (float)(unsigned char)(c1 >>  8),
-        f * (float)(unsigned char)(c1 >>  0),
-        f * (float)(unsigned char)(c1 >> 24));
-    ColorF vRes(v0 + (v1 - v0) * t);
-    return(DWORD_COLORVALUE(vRes.r, vRes.g, vRes.b, vRes.a));
-}
-
-static bool ClipLine(Vec3* v, DWORD* c)
-{
-    // get near plane to perform clipping
-    Plane nearPlane(*gRenDev->GetCamera().GetFrustumPlane(FR_PLANE_NEAR));
-
-    // get clipping flags
-    bool bV0Behind(-((nearPlane.n | v[ 0 ]) + nearPlane.d) < c_clipThres);
-    bool bV1Behind(-((nearPlane.n | v[ 1 ]) + nearPlane.d) < c_clipThres);
-
-    // proceed only if both are not behind near clipping plane
-    if (false == bV0Behind || false == bV1Behind)
-    {
-        if (false == bV0Behind && false == bV1Behind)
-        {
-            // no clipping needed
-            return(true);
-        }
-
-        // define line to be clipped
-        Vec3 p(v[ 0 ]);
-        Vec3 d(v[ 1 ] - v[ 0 ]);
-
-        // get clipped position
-        float t;
-        v[ 0 ] = (false == bV0Behind) ? v[ 0 ] : IntersectLinePlane(p, d, nearPlane, t);
-        v[ 1 ] = (false == bV1Behind) ? v[ 1 ] : IntersectLinePlane(p, d, nearPlane, t);
-
-        // get clipped colors
-        c[ 0 ] = (false == bV0Behind) ? c[ 0 ] : ClipColor(c[ 0 ], c[ 1 ], t);
-        c[ 1 ] = (false == bV1Behind) ? c[ 1 ] : ClipColor(c[ 0 ], c[ 1 ], t);
-
-        return(true);
-    }
-    else
-    {
-        return(false);
-    }
-}
-
-
-static float ComputeConstantScale(const Vec3& v, const Matrix44A& matView, const Matrix44A& matProj, const uint32 wndXRes)
-{
-    Vec4 vCam0;
-    mathVec3TransformF(&vCam0, &v, &matView);
-
-    Vec4 vCam1(vCam0);
-    vCam1.x += 1.0f;
-
-    const float a = vCam0.y * matProj.m10 + vCam0.z * matProj.m20 + matProj.m30;
-    const float b = vCam0.y * matProj.m13 + vCam0.z * matProj.m23 + matProj.m33;
-
-    float c0((vCam0.x * matProj.m00 + a) / (vCam0.x * matProj.m03 + b));
-    float c1((vCam1.x * matProj.m00 + a) / (vCam1.x * matProj.m03 + b));
-
-    float s = (float)wndXRes * (c1 - c0);
-
-    const float epsilon = 0.001f;
-    return (fabsf(s) >= epsilon) ? 1.0f / s : 1.0f / epsilon;
-}
-
-
-void CRenderAuxGeomD3D::PrepareThickLines3D(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd)
-{
-    const CAuxGeomCB::AuxVertexBuffer& auxVertexBuffer(GetAuxVertexBuffer());
-
-    // process each entry
-    for (CAuxGeomCB::AuxSortedPushBuffer::const_iterator it(itBegin); it != itEnd; ++it)
-    {
-        // get current push buffer entry
-        const CAuxGeomCB::SAuxPushBufferEntry* curPBEntry(*it);
-
-        uint32 offset(curPBEntry->m_vertexOffs);
-        for (uint32 i(0); i < curPBEntry->m_numVertices / 6; ++i, offset += 6)
-        {
-            // get line vertices and thickness parameter
-            const float* aTmp0 = (const float*) &(auxVertexBuffer[ offset + 0 ].xyz.x);
-            const float* aTmp1 = (const float*) &(auxVertexBuffer[ offset + 1 ].xyz.x);
-            const Vec3 v[ 2 ] =
-            {
-                Vec3(aTmp0[0], aTmp0[1], aTmp0[2]),
-                Vec3(aTmp1[0], aTmp1[1], aTmp1[2])
-            };
-            DWORD col[ 2 ] =
-            {
-                auxVertexBuffer[ offset + 0 ].color.dcolor,
-                auxVertexBuffer[ offset + 1 ].color.dcolor
-            };
-            float thickness(auxVertexBuffer[ offset + 2 ].xyz.x);
-
-            bool skipLine(false);
-            Vec4 vf[ 4 ];
-
-            if (false == IsOrthoMode())  // regular, 3d projected geometry
-            {
-                skipLine = !ClipLine((Vec3*)v, col);
-                if (false == skipLine)
-                {
-                    // compute depth corrected thickness of line end points
-                    float thicknessV0(0.5f * thickness * ComputeConstantScale(v[ 0 ], GetCurrentView(), GetCurrentProj(), m_wndXRes));
-                    float thicknessV1(0.5f * thickness * ComputeConstantScale(v[ 1 ], GetCurrentView(), GetCurrentProj(), m_wndXRes));
-
-                    // compute camera space line delta
-                    Vec4 vt[ 2 ];
-                    mathVec3TransformF(&vt[ 0 ], &v[ 0 ], &GetCurrentView());
-                    mathVec3TransformF(&vt[ 1 ], &v[ 1 ], &GetCurrentView());
-                    vt[0].z = (float) fsel(-vt[0].z - c_clipThres, vt[0].z, -c_clipThres);
-                    vt[1].z = (float) fsel(-vt[1].z - c_clipThres, vt[1].z, -c_clipThres);
-                    Vec4 tmp(vt[ 1 ] / vt[ 1 ].z - vt[ 0 ] / vt[ 0 ].z);
-                    Vec2 delta(tmp.x, tmp.y);
-
-                    // create screen space normal of line delta
-                    Vec2 normalVec(-delta.y, delta.x);
-                    mathVec2NormalizeF(&normalVec, &normalVec);
-                    Vec2 normal(normalVec.x, normalVec.y);
-
-                    Vec2 n[ 2 ];
-                    n[ 0 ] = normal * thicknessV0;
-                    n[ 1 ] = normal * thicknessV1;
-
-                    // compute final world space vertices of thick line
-                    Vec4 vertices[4] =
-                    {
-                        Vec4(vt[ 0 ].x + n[ 0 ].x, vt[ 0 ].y + n[ 0 ].y, vt[ 0 ].z, vt[ 0 ].w),
-                        Vec4(vt[ 1 ].x + n[ 1 ].x, vt[ 1 ].y + n[ 1 ].y, vt[ 1 ].z, vt[ 1 ].w),
-                        Vec4(vt[ 1 ].x - n[ 1 ].x, vt[ 1 ].y - n[ 1 ].y, vt[ 1 ].z, vt[ 1 ].w),
-                        Vec4(vt[ 0 ].x - n[ 0 ].x, vt[ 0 ].y - n[ 0 ].y, vt[ 0 ].z, vt[ 0 ].w)
-                    };
-                    mathVec4TransformF(&vf[ 0 ], &vertices[0], &GetCurrentViewInv());
-                    mathVec4TransformF(&vf[ 1 ], &vertices[1], &GetCurrentViewInv());
-                    mathVec4TransformF(&vf[ 2 ], &vertices[2], &GetCurrentViewInv());
-                    mathVec4TransformF(&vf[ 3 ], &vertices[3], &GetCurrentViewInv());
-                }
-            }
-            else // orthogonal projected geometry
-            {
-                // compute depth corrected thickness of line end points
-                float thicknessV0(0.5f * thickness * ComputeConstantScale(v[ 0 ], GetCurrentView(), GetCurrentProj(), m_wndXRes));
-                float thicknessV1(0.5f * thickness * ComputeConstantScale(v[ 1 ], GetCurrentView(), GetCurrentProj(), m_wndXRes));
-
-                // compute line delta
-                Vec2 delta(v[ 1 ] - v[ 0 ]);
-
-                // create normal of line delta
-                Vec2 normalVec(-delta.y, delta.x);
-                mathVec2NormalizeF(&normalVec, &normalVec);
-                Vec2 normal(normalVec.x, normalVec.y);
-
-                Vec2 n[ 2 ];
-                n[ 0 ] = normal * thicknessV0 * 2.0f;
-                n[ 1 ] = normal * thicknessV1 * 2.0f;
-
-                // compute final world space vertices of thick line
-                vf[ 0 ] = Vec4(v[ 0 ].x + n[ 0 ].x, v[ 0 ].y + n[ 0 ].y, v[ 0 ].z, 1.0f);
-                vf[ 1 ] = Vec4(v[ 1 ].x + n[ 1 ].x, v[ 1 ].y + n[ 1 ].y, v[ 1 ].z, 1.0f);
-                vf[ 2 ] = Vec4(v[ 1 ].x - n[ 1 ].x, v[ 1 ].y - n[ 1 ].y, v[ 1 ].z, 1.0f);
-                vf[ 3 ] = Vec4(v[ 0 ].x - n[ 0 ].x, v[ 0 ].y - n[ 0 ].y, v[ 0 ].z, 1.0f);
-            }
-
-            SAuxVertex* pVertices(const_cast<SAuxVertex*>(&auxVertexBuffer[ offset ]));
-            if (false == skipLine)
-            {
-                // copy data to vertex buffer
-                pVertices[ 0 ].xyz = Vec3(vf[ 0 ].x, vf[ 0 ].y, vf[ 0 ].z);
-                pVertices[ 0 ].color.dcolor = col[ 0 ];
-                pVertices[ 1 ].xyz = Vec3(vf[ 1 ].x, vf[ 1 ].y, vf[ 1 ].z);
-                pVertices[ 1 ].color.dcolor = col[ 1 ];
-                pVertices[ 2 ].xyz = Vec3(vf[ 2 ].x, vf[ 2 ].y, vf[ 2 ].z);
-                pVertices[ 2 ].color.dcolor = col[ 1 ];
-                pVertices[ 3 ].xyz = Vec3(vf[ 0 ].x, vf[ 0 ].y, vf[ 0 ].z);
-                pVertices[ 3 ].color.dcolor = col[ 0 ];
-                pVertices[ 4 ].xyz = Vec3(vf[ 2 ].x, vf[ 2 ].y, vf[ 2 ].z);
-                pVertices[ 4 ].color.dcolor = col[ 1 ];
-                pVertices[ 5 ].xyz = Vec3(vf[ 3 ].x, vf[ 3 ].y, vf[ 3 ].z);
-                pVertices[ 5 ].color.dcolor = col[ 0 ];
-            }
-            else
-            {
-                // invalidate parameter data of thick line stored in vertex buffer
-                // (generates two black degenerated triangles at (0,0,0))
-                memset(pVertices, 0, sizeof(SAuxVertex) * 6);
-            }
-        }
-    }
-}
-
-
-void CRenderAuxGeomD3D::PrepareThickLines2D(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd)
-{
-    const CAuxGeomCB::AuxVertexBuffer& auxVertexBuffer(GetAuxVertexBuffer());
-
-    // process each entry
-    for (CAuxGeomCB::AuxSortedPushBuffer::const_iterator it(itBegin); it != itEnd; ++it)
-    {
-        // get current push buffer entry
-        const CAuxGeomCB::SAuxPushBufferEntry* curPBEntry(*it);
-
-        uint32 offset(curPBEntry->m_vertexOffs);
-        for (uint32 i(0); i < curPBEntry->m_numVertices / 6; ++i, offset += 6)
-        {
-            // get line vertices and thickness parameter
-            const float* aTmp0 = (const float*) &(auxVertexBuffer[ offset + 0 ].xyz.x);
-            const float* aTmp1 = (const float*) &(auxVertexBuffer[ offset + 1 ].xyz.x);
-            const Vec3 v[ 2 ] =
-            {
-                Vec3(aTmp0[0], aTmp0[1], aTmp0[2]),
-                Vec3(aTmp1[0], aTmp1[1], aTmp1[2])
-            };
-            const DWORD col[ 2 ] =
-            {
-                auxVertexBuffer[ offset + 0 ].color.dcolor,
-                auxVertexBuffer[ offset + 1 ].color.dcolor
-            };
-            float thickness(auxVertexBuffer[ offset + 2 ].xyz.x);
-
-            // get line delta and aspect ratio corrected normal
-            Vec3 delta(v[ 1 ] - v[ 0 ]);
-            Vec3 normalVec(-delta.y * m_aspectInv, delta.x * m_aspect, 0.0f);
-
-            // normalize and scale to line thickness
-            mathVec3NormalizeF(&normalVec, &normalVec);
-            Vec3 normal(normalVec.x, normalVec.y, normalVec.z);
-            normal *= thickness * 0.001f;
-
-            // compute final 2D vertices of thick line in normalized device space
-            Vec3 vf[ 4 ];
-            vf[ 0 ] = v[ 0 ] + normal;
-            vf[ 1 ] = v[ 1 ] + normal;
-            vf[ 2 ] = v[ 1 ] - normal;
-            vf[ 3 ] = v[ 0 ] - normal;
-
-            // copy data to vertex buffer
-            SAuxVertex* pVertices(const_cast<SAuxVertex*>(&auxVertexBuffer[ offset ]));
-            pVertices[ 0 ].xyz = Vec3(vf[ 0 ].x, vf[ 0 ].y, vf[ 0 ].z);
-            pVertices[ 0 ].color.dcolor = col[ 0 ];
-            pVertices[ 1 ].xyz = Vec3(vf[ 1 ].x, vf[ 1 ].y, vf[ 1 ].z);
-            pVertices[ 1 ].color.dcolor = col[ 1 ];
-            pVertices[ 2 ].xyz = Vec3(vf[ 2 ].x, vf[ 2 ].y, vf[ 2 ].z);
-            pVertices[ 2 ].color.dcolor = col[ 1 ];
-            pVertices[ 3 ].xyz = Vec3(vf[ 0 ].x, vf[ 0 ].y, vf[ 0 ].z);
-            pVertices[ 3 ].color.dcolor = col[ 0 ];
-            pVertices[ 4 ].xyz = Vec3(vf[ 2 ].x, vf[ 2 ].y, vf[ 2 ].z);
-            pVertices[ 4 ].color.dcolor = col[ 1 ];
-            pVertices[ 5 ].xyz = Vec3(vf[ 3 ].x, vf[ 3 ].y, vf[ 3 ].z);
-            pVertices[ 5 ].color.dcolor = col[ 0 ];
-        }
-    }
-}
-
-
-void CRenderAuxGeomD3D::PrepareRendering()
-{
-    // update transformation matrices
-    m_matrices.UpdateMatrices(m_renderer);
-
-    // get current window resultion and update aspect ratios
-    m_wndXRes = m_renderer.GetWidth();
-    m_wndYRes = m_renderer.GetHeight();
-
-    m_aspect = 1.0f;
-    m_aspectInv = 1.0f;
-    if (m_wndXRes > 0 && m_wndYRes > 0)
-    {
-        m_aspect = (float) m_wndXRes / (float) m_wndYRes;
-        m_aspectInv = 1.0f / m_aspect;
-    }
-
-    // reset DrawInFront mode
-    m_curDrawInFrontMode = e_DrawInFrontOff;
-
-    // reset stream buffer manager
-    m_auxGeomSBM.Reset();
-
-    // reset current VB/IB
-    m_pCurVB = 0;
-    m_pCurIB = 0;
-
-    // reset current prim type
-    m_curPrimType = CAuxGeomCB::e_PrimTypeInvalid;
-
-    // set vertex format
-    //m_renderer.m_RP.m_CurVFormat = m_auxGeomVertexFormat;
-}
-
-
-bool CRenderAuxGeomD3D::BindStreams(const AZ::Vertex::Format& newVertexFormat, D3DBuffer* pNewVB, D3DBuffer* pNewIB)
-{
-    // set vertex declaration
-    if (FAILED(m_renderer.FX_SetVertexDeclaration(0, newVertexFormat)))
-    {
-        return false;
-    }
-
-    // bind streams
-    HRESULT hr = S_OK;
-    if (m_pCurVB != pNewVB)
-    {
-        hr = m_renderer.FX_SetVStream(0, pNewVB, 0, newVertexFormat.GetStride());
-        m_pCurVB = pNewVB;
-    }
-    if (m_pCurIB != pNewIB)
-    {
-        hr = m_renderer.FX_SetIStream(pNewIB, 0, Index16);
-        m_pCurIB = pNewIB;
-    }
-
-    return SUCCEEDED(hr);
-}
-
-
-void CRenderAuxGeomD3D::SetShader(const SAuxGeomRenderFlags& renderFlags)
-{
-    if (0 == m_pAuxGeomShader)
-    {
-        // allow invalid file access for this shader because it shouldn't be used in the final build anyway
-        CDebugAllowFileAccess ignoreInvalidFileAccess;
-        m_pAuxGeomShader = m_renderer.m_cEF.mfForName("AuxGeom", EF_SYSTEM);
-        assert(0 != m_pAuxGeomShader);
-    }
-
-    if (0 != m_pAuxGeomShader)
-    {
-        bool dirty(0 != (m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_PersFlags &  RBPF_FP_DIRTY));
-        if (false != dirty)
-        {
-            // NOTE: dirty flags are either set when setting EF_ColorOp in AdjustRenderStates
-            m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_FP_DIRTY;
-            m_renderer.m_RP.m_pCurObject = m_renderer.m_RP.m_pIdendityRenderObject;
-            m_renderer.m_RP.m_FlagsShader_LT = m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_eCurColorOp | (m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_eCurAlphaOp << 8) |
-                (m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_eCurColorArg << 16) | (m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_eCurAlphaArg << 24);
-        }
-
-        EAuxGeomPublicRenderflags_DrawInFrontMode newDrawInFrontMode(renderFlags.GetDrawInFrontMode());
-        CAuxGeomCB::EPrimType newPrimType(CAuxGeomCB::GetPrimType(renderFlags));
-
-        if (false != dirty || m_pAuxGeomShader != m_renderer.m_RP.m_pShader || m_curDrawInFrontMode != newDrawInFrontMode || m_curPrimType != newPrimType)
-        {
-            if (CAuxGeomCB::e_Obj != newPrimType)
-            {
-                static CCryNameTSCRC techName("AuxGeometry");
-                m_pAuxGeomShader->FXSetTechnique(techName);
-                m_pAuxGeomShader->FXBegin(&m_renderer.m_RP.m_nNumRendPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                m_pAuxGeomShader->FXBeginPass(0);
-                m_renderer.m_RP.m_CurVFormat = m_auxGeomPrimitiveVertexFormat;
-
-                static CCryNameR matViewProjName("matViewProj");
-                if (e_DrawInFrontOn == renderFlags.GetDrawInFrontMode() && e_Mode3D == renderFlags.GetMode2D3DFlag())
-                {
-                    Matrix44A matScale(Matrix44(Matrix34::CreateScale(Vec3(0.999f, 0.999f, 0.999f))));
-
-                    Matrix44A matViewScaleProjT;
-                    matViewScaleProjT = GetCurrentView() * matScale;
-                    matViewScaleProjT = matViewScaleProjT * GetCurrentProj();
-                    matViewScaleProjT = matViewScaleProjT.GetTransposed();
-                    m_pAuxGeomShader->FXSetVSFloat(matViewProjName, alias_cast<Vec4*>(&matViewScaleProjT), 4);
-                    m_curDrawInFrontMode = e_DrawInFrontOn;
-                }
-                else
-                {
-                    Matrix44A matViewProjT = m_matrices.m_pCurTransMat->GetTransposed();
-                    m_pAuxGeomShader->FXSetVSFloat(matViewProjName, alias_cast<Vec4*>(&matViewProjT), 4);
-                    m_curDrawInFrontMode = e_DrawInFrontOff;
-                }
-            }
-            else
-            {
-                static CCryNameTSCRC techName("AuxGeometryObj");
-                m_pAuxGeomShader->FXSetTechnique(techName);
-                m_pAuxGeomShader->FXBegin(&m_renderer.m_RP.m_nNumRendPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-                m_pAuxGeomShader->FXBeginPass(0);
-                m_renderer.m_RP.m_CurVFormat = m_auxGeomObjectVertexFormat;
-
-                if (e_DrawInFrontOn == renderFlags.GetDrawInFrontMode() && e_Mode3D == renderFlags.GetMode2D3DFlag())
-                {
-                    m_curDrawInFrontMode = e_DrawInFrontOn;
-                }
-                else
-                {
-                    m_curDrawInFrontMode = e_DrawInFrontOff;
-                }
-            }
-            m_curPrimType = newPrimType;
-        }
-    }
-    else
-    {
-        m_renderer.FX_SetFPMode();
-    }
-}
-
-
-void CRenderAuxGeomD3D::AdjustRenderStates(const SAuxGeomRenderFlags& renderFlags)
-{
-    // init current render states mask
-    uint32 curRenderStates(0);
-
-    // mode 2D/3D -- set new transformation matrix
-    const Matrix44A* pNewTransMat(&GetCurrentTrans3D());
-    if (e_Mode2D == renderFlags.GetMode2D3DFlag())
-    {
-        pNewTransMat = &GetCurrentTrans2D();
-    }
-    if (m_matrices.m_pCurTransMat != pNewTransMat)
-    {
-        m_matrices.m_pCurTransMat = pNewTransMat;
-
-        m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-        m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_matProj = *pNewTransMat;
-    }
-
-    // set alpha blending mode
-    switch (renderFlags.GetAlphaBlendMode())
-    {
-    case e_AlphaAdditive:
-    {
-        curRenderStates |= GS_BLSRC_ONE | GS_BLDST_ONE;
-        break;
-    }
-    case e_AlphaBlended:
-    {
-        curRenderStates |= GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-        break;
-    }
-    case e_AlphaNone:
-    default:
-    {
-        break;
-    }
-    }
-
-    // set fill mode
-    switch (renderFlags.GetFillMode())
-    {
-    case e_FillModeWireframe:
-    {
-        curRenderStates |= GS_WIREFRAME;
-        break;
-    }
-    case e_FillModeSolid:
-    default:
-    {
-        break;
-    }
-    }
-
-    // set cull mode
-    switch (renderFlags.GetCullMode())
-    {
-    case e_CullModeNone:
-    {
-        m_renderer.SetCullMode(R_CULL_NONE);
-        break;
-    }
-    case e_CullModeFront:
-    {
-        m_renderer.SetCullMode(R_CULL_FRONT);
-        break;
-    }
-    case e_CullModeBack:
-    default:
-    {
-        m_renderer.SetCullMode(R_CULL_BACK);
-        break;
-    }
-    }
-
-    // set depth write mode
-    switch (renderFlags.GetDepthWriteFlag())
-    {
-    case e_DepthWriteOff:
-    {
-        break;
-    }
-    case e_DepthWriteOn:
-    default:
-    {
-        curRenderStates |= GS_DEPTHWRITE;
-        break;
-    }
-    }
-
-    // set depth test mode
-    switch (renderFlags.GetDepthTestFlag())
-    {
-    case e_DepthTestOff:
-    {
-        curRenderStates |= GS_NODEPTHTEST;
-        break;
-    }
-    case e_DepthTestOn:
-    default:
-    {
-        break;
-    }
-    }
-
-    // set point size
-    uint8 newPointSize(m_curPointSize);
-    if (CAuxGeomCB::e_PtList == CAuxGeomCB::GetPrimType(renderFlags))
-    {
-        newPointSize = CAuxGeomCB::GetPointSize(renderFlags);
-    }
-    else
-    {
-        newPointSize = 1;
-    }
-
-    if (newPointSize != m_curPointSize)
-    {
-        assert(newPointSize > 0);
-        assert(0);
-        m_curPointSize = newPointSize;
-    }
-
-    // apply states
-    m_renderer.FX_SetState(curRenderStates);
-
-    // set color operations
-    m_renderer.EF_SetColorOp(eCO_REPLACE, eCO_REPLACE, (eCA_Diffuse | (eCA_Diffuse << 3)), (eCA_Diffuse | (eCA_Diffuse << 3)));
-    m_renderer.EF_SetSrgbWrite(false);
-}
-
-
-void CRenderAuxGeomD3D::RT_Flush(SAuxGeomCBRawDataPackaged& data, size_t begin, size_t end, bool reset)
-{
-    if (!CV_r_auxGeom)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("AuxGeom");
-
-    // should only be called from render thread
-    assert(m_renderer.m_pRT->IsRenderThread());
-
-    assert(data.m_pData);
-
-    if (begin < end)
-    {
-        m_pCurCBRawData = data.m_pData;
-
-        Matrix44A origMatProj = m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_matProj;
-        Matrix44A origMatView = m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_matView;
-
-        if (false == m_renderer.IsDeviceLost())
-        {
-            // prepare rendering
-            PrepareRendering();
-
-            // get push buffer to process all submitted auxiliary geometries
-            m_pCurCBRawData->GetSortedPushBuffer(begin, end, m_auxSortedPushBuffer);
-
-            // process push buffer
-            for (CAuxGeomCB::AuxSortedPushBuffer::const_iterator it(m_auxSortedPushBuffer.begin()), itEnd(m_auxSortedPushBuffer.end()); it != itEnd; )
-            {
-                // mark current push buffer position
-                CAuxGeomCB::AuxSortedPushBuffer::const_iterator itCur(it);
-
-                // get current render flags
-                const SAuxGeomRenderFlags& curRenderFlags((*itCur)->m_renderFlags);
-                m_curTransMatrixIdx = (*itCur)->m_transMatrixIdx;
-
-                // get prim type
-                CAuxGeomCB::EPrimType primType(CAuxGeomCB::GetPrimType(curRenderFlags));
-
-                // find all entries sharing the same render flags
-                while (true)
-                {
-                    ++it;
-                    if ((it == itEnd) || ((*it)->m_renderFlags != curRenderFlags) || ((*it)->m_transMatrixIdx != m_curTransMatrixIdx))
-                    {
-                        break;
-                    }
-                }
-
-                // Adjust render states based on current render flags and m_curTransMatrixIdx
-                AdjustRenderStates(curRenderFlags);
-                // Force the constant buffer to update the camera info - AdjustRenderStates() may have changed the projection matrix.
-                m_renderer.RT_SetCameraInfo(); 
-
-                // prepare thick lines
-                if (CAuxGeomCB::e_TriList == primType && false != CAuxGeomCB::IsThickLine(curRenderFlags))
-                {
-                    if (e_Mode3D == curRenderFlags.GetMode2D3DFlag())
-                    {
-                        PrepareThickLines3D(itCur, it);
-                    }
-                    else
-                    {
-                        PrepareThickLines2D(itCur, it);
-                    }
-                }
-
-                // set appropriate shader
-                SetShader(curRenderFlags);
-
-                // draw push buffer entries
-                switch (primType)
-                {
-                case CAuxGeomCB::e_PtList:
-                case CAuxGeomCB::e_LineList:
-                case CAuxGeomCB::e_TriList:
-                {
-                    DrawAuxPrimitives(itCur, it, primType);
-                }
-                break;
-                case CAuxGeomCB::e_LineListInd:
-                case CAuxGeomCB::e_TriListInd:
-                {
-                    DrawAuxIndexedPrimitives(itCur, it, primType);
-                }
-                break;
-                case CAuxGeomCB::e_Obj:
-                default:
-                {
-                    DrawAuxObjects(itCur, it);
-                }
-                break;
-                }
-            }
-        }
-
-        m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-        m_renderer.m_RP.m_TI[m_renderer.m_RP.m_nProcessThreadID].m_matView = origMatView;
-
-        m_pCurCBRawData = 0;
-        m_curTransMatrixIdx = 0;
-    }
-
-    if (reset)
-    {
-        FlushTextMessages(data.m_pData->m_TextMessages, true);
-        data.m_pData->SetUsed(false);
-    }
-}
-
-
-void CRenderAuxGeomD3D::Flush(SAuxGeomCBRawDataPackaged& data, size_t begin, size_t end, bool reset)
-{
-    m_renderer.m_pRT->RC_AuxFlush(this, data, begin, end, reset);
-}
-
-void CRenderAuxGeomD3D::FlushTextMessages(CTextMessages& tMessages, bool reset)
-{
-    gRenDev->RenderTextMessages(tMessages);
-    tMessages.Clear(!reset);
-}
-
-
-void CRenderAuxGeomD3D::SetOrthoMode(bool enable, Matrix44A* pMatrix)
-{
-    GetRenderAuxGeom()->SetOrthoMode(enable, pMatrix);
-}
-
-
-const Matrix44A& CRenderAuxGeomD3D::GetCurrentView() const
-{
-    return IsOrthoMode() ? gRenDev->m_IdentityMatrix : m_matrices.m_matView;
-}
-
-
-const Matrix44A& CRenderAuxGeomD3D::GetCurrentViewInv() const
-{
-    return IsOrthoMode() ? gRenDev->m_IdentityMatrix : m_matrices.m_matViewInv;
-}
-
-
-const Matrix44A& CRenderAuxGeomD3D::GetCurrentProj() const
-{
-    return IsOrthoMode() ? GetAuxOrthoMatrix(m_curTransMatrixIdx) : m_matrices.m_matProj;
-}
-
-
-const Matrix44A& CRenderAuxGeomD3D::GetCurrentTrans3D() const
-{
-    return IsOrthoMode() ? GetAuxOrthoMatrix(m_curTransMatrixIdx) : m_matrices.m_matTrans3D;
-}
-
-
-const Matrix44A& CRenderAuxGeomD3D::GetCurrentTrans2D() const
-{
-    return m_matrices.m_matTrans2D;
-}
-
-
-bool CRenderAuxGeomD3D::IsOrthoMode() const
-{
-    return m_curTransMatrixIdx != -1;
-}
-
-
-void CRenderAuxGeomD3D::SMatrices::UpdateMatrices(CD3D9Renderer& renderer)
-{
-    renderer.GetModelViewMatrix(&m_matView.m00);
-    renderer.GetProjectionMatrix(&m_matProj.m00);
-
-    m_matViewInv = m_matView.GetInverted();
-    m_matTrans3D = m_matView * m_matProj;
-
-    m_pCurTransMat = 0;
-}
-
-
-void CRenderAuxGeomD3D::FreeMemory()
-{
-    m_auxGeomCBCol.FreeMemory();
-
-    stl::free_container(m_auxSortedPushBuffer);
-}
-
-void CRenderAuxGeomD3D::Process()
-{
-    m_auxGeomCBCol.Process();
-}
-
-CAuxGeomCB* CRenderAuxGeomD3D::GetRenderAuxGeom(void* jobID)
-{
-    return m_auxGeomCBCol.Get(this, jobID);
-}
-
-
-inline const CAuxGeomCB::AuxVertexBuffer& CRenderAuxGeomD3D::GetAuxVertexBuffer() const
-{
-    assert(m_pCurCBRawData);
-    return m_pCurCBRawData->m_auxVertexBuffer;
-}
-
-
-inline const CAuxGeomCB::AuxIndexBuffer& CRenderAuxGeomD3D::GetAuxIndexBuffer() const
-{
-    assert(m_pCurCBRawData);
-    return m_pCurCBRawData->m_auxIndexBuffer;
-}
-
-
-inline const CAuxGeomCB::AuxDrawObjParamBuffer& CRenderAuxGeomD3D::GetAuxDrawObjParamBuffer() const
-{
-    assert(m_pCurCBRawData);
-    return m_pCurCBRawData->m_auxDrawObjParamBuffer;
-}
-
-
-inline const Matrix44A& CRenderAuxGeomD3D::GetAuxOrthoMatrix(int idx) const
-{
-    assert(m_pCurCBRawData && idx >= 0 && idx < (int)m_pCurCBRawData->m_auxOrthoMatrices.size());
-    return m_pCurCBRawData->m_auxOrthoMatrices[idx];
-}
-
-void CRenderAuxGeomD3D::SDrawObjMesh::Release()
-{
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_pVB);
-    m_pVB = nullptr;
-
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_pIB);
-    m_pIB = nullptr;
-
-    m_numVertices = 0;
-    m_numFaces = 0;
-}
-
-#endif // #if defined(ENABLE_RENDER_AUX_GEOM)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderAuxGeom.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderAuxGeom.h
deleted file mode 100644
index 74d30a6ed2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderAuxGeom.h
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DRENDERAUXGEOM_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_D3DRENDERAUXGEOM_H
-#pragma once
-
-
-
-#include <RenderDll/Common/RenderAuxGeom.h>
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-
-class CD3D9Renderer;
-class ICrySizer;
-
-
-class CRenderAuxGeomD3D
-    : public IRenderAuxGeomImpl
-{
-public:
-    virtual void Flush(SAuxGeomCBRawDataPackaged& data, size_t begin, size_t end, bool reset = false);
-    virtual void RT_Flush(SAuxGeomCBRawDataPackaged& data, size_t begin, size_t end, bool reset = false);
-
-    virtual void FlushTextMessages(CTextMessages& tMessages, bool reset);
-
-    void Process();
-
-public:
-    static CRenderAuxGeomD3D* Create(CD3D9Renderer& renderer)
-    {
-        return(new CRenderAuxGeomD3D(renderer));
-    }
-
-public:
-    ~CRenderAuxGeomD3D();
-
-    void FreeMemory();
-
-    CAuxGeomCB* GetRenderAuxGeom(void* jobID = 0);
-    int GetDeviceDataSize();
-    void ReleaseDeviceObjects();
-    HRESULT RestoreDeviceObjects();
-    void SetOrthoMode(bool enable, Matrix44A* pMatrix = 0);
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-    void ReleaseShader() { SAFE_RELEASE_FORCE(m_pAuxGeomShader); }
-
-    void* operator new(size_t s)
-    {
-        uint8* p = (uint8*) CryModuleMalloc(s + 16 + 8);
-        memset(p, 0, s + 16 + 8);
-        uint8* pRet = (uint8*) ((size_t) (p + 16 + 8) & ~0xF);
-        ((uint8**) pRet)[-1] = p;
-        return pRet;
-    }
-
-    void operator delete(void* p)
-    {
-        CryModuleFree(((uint8**)p)[-1]);
-    }
-
-private:
-    struct SStreamBufferManager
-    {
-    public:
-        SStreamBufferManager();
-        void Reset();
-        void DiscardVB();
-        void DiscardIB();
-
-    public:
-        bool m_discardVB;
-        uint32 m_curVBIndex;
-        bool m_discardIB;
-        uint32 m_curIBIndex;
-    };
-
-    struct SDrawObjMesh
-    {
-        SDrawObjMesh()
-            : m_numVertices(0)
-            , m_numFaces(0)
-            , m_pVB(0)
-            , m_pIB(0)
-        {
-        }
-
-        ~SDrawObjMesh()
-        {
-            Release();
-        }
-
-        void Release();
-
-        int GetDeviceDataSize()
-        {
-            int nSize = 0;
-            nSize += _VertBufferSize(m_pVB);
-            nSize += _IndexBufferSize(m_pIB);
-
-            return nSize;
-        }
-
-        uint32 m_numVertices;
-        uint32 m_numFaces;
-        D3DBuffer* m_pVB;
-        D3DBuffer* m_pIB;
-    };
-
-    enum EAuxObjNumLOD
-    {
-        e_auxObjNumLOD = 5
-    };
-
-    struct SMatrices
-    {
-        SMatrices()
-            : m_pCurTransMat(0)
-        {
-            m_matView.SetIdentity();
-            m_matViewInv.SetIdentity();
-            m_matProj.SetIdentity();
-            m_matTrans3D.SetIdentity();
-
-            m_matTrans2D = Matrix44A(2,  0, 0, 0,
-                    0, -2, 0, 0,
-                    0,  0, 1, 0,
-                    -1,  1, 0, 1);
-        }
-
-        void UpdateMatrices(CD3D9Renderer& renderer);
-
-        Matrix44A m_matView;
-        Matrix44A m_matViewInv;
-        Matrix44A m_matProj;
-        Matrix44A m_matTrans3D;
-        Matrix44A m_matTrans2D;
-        const Matrix44A* m_pCurTransMat;
-    };
-
-    class CAuxGeomCBCollector
-    {
-        class SThread;
-
-        typedef std::map<threadID, SThread*> AUXThreadMap;
-        typedef std::vector<SThread*>        AUXThreads;
-        typedef std::vector<CAuxGeomCB*>     AUXJobs;
-
-
-        class SThread
-        {
-            typedef std::map<void*, CAuxGeomCB*> AUXJobMap;
-
-            CAuxGeomCB* m_cbCurrent;
-            AUXJobMap   m_auxJobMap;
-
-            mutable CryRWLock m_rwlLocal;
-
-        public:
-            SThread()
-                : m_cbCurrent() {}
-
-            CAuxGeomCB* Get(IRenderAuxGeomImpl* pRenderAuxGeomImpl, void* jobID, threadID tid)
-            {
-                if (jobID == 0 && m_cbCurrent)
-                {
-                    return m_cbCurrent;
-                }
-
-                m_rwlLocal.RLock();
-
-                AUXJobMap::const_iterator it = m_auxJobMap.find(jobID);
-                CAuxGeomCB*       pAuxGeomCB = m_auxJobMap.end() != it ? it->second : 0;
-
-                m_rwlLocal.RUnlock();
-
-                if (!pAuxGeomCB)
-                {
-                    threadID mainThreadID, renderThreadID;
-
-                    gRenDev->GetThreadIDs(mainThreadID, renderThreadID);
-
-                    if     (tid == renderThreadID)
-                    {
-                        pAuxGeomCB = new CAuxGeomCB(pRenderAuxGeomImpl);
-                    }
-                    else if (tid == mainThreadID)
-                    {
-                        pAuxGeomCB = new CAuxGeomCBMainThread(pRenderAuxGeomImpl);
-                    }
-                    else
-                    {
-                        pAuxGeomCB = new CAuxGeomCBWorkerThread(pRenderAuxGeomImpl);
-                    }
-
-                    m_rwlLocal.WLock();
-                    m_auxJobMap.insert(AUXJobMap::value_type(jobID, pAuxGeomCB));
-                    m_rwlLocal.WUnlock();
-                }
-
-                return pAuxGeomCB;
-            }
-
-            ~SThread()
-            {
-                for (AUXJobMap::iterator cbit = m_auxJobMap.begin(); cbit != m_auxJobMap.end(); ++cbit)
-                {
-                    delete cbit->second;
-                }
-            }
-
-            void Process(AUXJobs& auxJobs)
-            {
-                m_rwlLocal.RLock();
-
-                for (SThread::AUXJobMap::const_iterator job = m_auxJobMap.begin(); job != m_auxJobMap.end(); ++job)
-                {
-                    auxJobs.push_back(job->second);
-                }
-
-                m_rwlLocal.RUnlock();
-            }
-
-            void FreeMemory()
-            {
-                m_rwlLocal.WLock();
-                for (AUXJobMap::const_iterator job = m_auxJobMap.begin(); job != m_auxJobMap.end(); ++job)
-                {
-                    // MUST BE called after final CAuxGeomCB::Commit()
-                    // adding data (issuing render commands) is not thread safe !!!
-                    job->second->FreeMemory();
-                }
-                m_rwlLocal.WUnlock();
-            }
-
-            void GetMemoryUsage(ICrySizer* pSizer) const
-            {
-                m_rwlLocal.RLock();
-                for (AUXJobMap::const_iterator job = m_auxJobMap.begin(); job != m_auxJobMap.end(); ++job)
-                {
-                    // MUST BE called after final CAuxGeomCB::Commit()
-                    // adding data (issuing render commands) is not thread safe !!!
-                    job->second->GetMemoryUsage(pSizer);
-                }
-                m_rwlLocal.RUnlock();
-            }
-        };
-
-
-        AUXThreadMap m_auxThreadMap;
-        AUXThreads   m_tmpThreads;
-        AUXJobs      m_tmpJobs;
-
-
-        mutable CryRWLock m_rwGlobal;
-
-    public:
-        ~CAuxGeomCBCollector()
-        {
-            for (AUXThreadMap::iterator cbit = m_auxThreadMap.begin(); cbit != m_auxThreadMap.end(); ++cbit)
-            {
-                delete cbit->second;
-            }
-        }
-
-        CAuxGeomCB* Get(IRenderAuxGeomImpl* pRenderAuxGeomImpl, void* jobID)
-        {
-            threadID tid = CryGetCurrentThreadId();
-
-            m_rwGlobal.RLock();
-
-            AUXThreadMap::const_iterator it = m_auxThreadMap.find(tid);
-            SThread*              auxThread = m_auxThreadMap.end() != it ? it->second : 0;
-
-            m_rwGlobal.RUnlock();
-
-            if (!auxThread)
-            {
-                auxThread = new SThread;
-
-                m_rwGlobal.WLock();
-                m_auxThreadMap.insert(AUXThreadMap::value_type(tid, auxThread));
-                m_rwGlobal.WUnlock();
-            }
-
-            return auxThread->Get(pRenderAuxGeomImpl, jobID, tid);
-        }
-
-        void FreeMemory()
-        {
-            m_rwGlobal.WLock();
-            for (AUXThreadMap::const_iterator cbit = m_auxThreadMap.begin(); cbit != m_auxThreadMap.end(); ++cbit)
-            {
-                cbit->second->FreeMemory();
-            }
-            m_rwGlobal.WUnlock();
-        }
-
-        void Process()
-        {
-            m_rwGlobal.RLock();
-            for (AUXThreadMap::const_iterator it = m_auxThreadMap.begin(); it != m_auxThreadMap.end(); ++it)
-            {
-                m_tmpThreads.push_back(it->second);
-            }
-            m_rwGlobal.RUnlock();
-
-            for (AUXThreads::iterator it = m_tmpThreads.begin(); it != m_tmpThreads.end(); ++it)
-            {
-                (*it)->Process(m_tmpJobs);
-            }
-
-            for (AUXJobs::iterator job = m_tmpJobs.begin(); job != m_tmpJobs.end(); ++job)
-            {
-                (*job)->Process();
-            }
-
-            m_tmpThreads.clear();
-            m_tmpJobs.clear();
-        }
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            m_rwGlobal.RLock();
-            for (AUXThreadMap::const_iterator it = m_auxThreadMap.begin(); it != m_auxThreadMap.end(); ++it)
-            {
-                it->second->GetMemoryUsage(pSizer);
-            }
-            m_rwGlobal.RUnlock();
-        }
-    };
-
-private:
-    CRenderAuxGeomD3D(CD3D9Renderer& renderer);
-    void DetermineAuxPrimitveFlags(uint32& d3dNumPrimDivider, eRenderPrimitiveType& d3dPrim, CAuxGeomCB::EPrimType primType) const;
-    void DrawAuxPrimitives(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd, const CAuxGeomCB::EPrimType& primType);
-    void DrawAuxIndexedPrimitives(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd, const CAuxGeomCB::EPrimType& primType);
-    void DrawAuxObjects(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd);
-
-    void PrepareThickLines2D(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd);
-    void PrepareThickLines3D(CAuxGeomCB::AuxSortedPushBuffer::const_iterator itBegin, CAuxGeomCB::AuxSortedPushBuffer::const_iterator itEnd);
-
-    void PrepareRendering();
-    void SetShader(const SAuxGeomRenderFlags& renderFlags);
-    void AdjustRenderStates(const SAuxGeomRenderFlags& renderFlags);
-    bool BindStreams(const AZ::Vertex::Format& newVertexFormat, ID3D11Buffer* pNewVB, ID3D11Buffer* pNewIB);
-
-    template< typename TMeshFunc >
-    HRESULT CreateMesh(SDrawObjMesh& mesh, TMeshFunc meshFunc);
-
-    const Matrix44A& GetCurrentView() const;
-    const Matrix44A& GetCurrentViewInv() const;
-    const Matrix44A& GetCurrentProj() const;
-    const Matrix44A& GetCurrentTrans3D() const;
-    const Matrix44A& GetCurrentTrans2D() const;
-
-    bool IsOrthoMode() const;
-
-    const CAuxGeomCB::AuxVertexBuffer& GetAuxVertexBuffer() const;
-    const CAuxGeomCB::AuxIndexBuffer& GetAuxIndexBuffer() const;
-    const CAuxGeomCB::AuxDrawObjParamBuffer& GetAuxDrawObjParamBuffer() const;
-    const Matrix44A& GetAuxOrthoMatrix(int idx) const;
-
-private:
-    CD3D9Renderer& m_renderer;
-
-    D3DBuffer* m_pAuxGeomVB;
-    D3DBuffer* m_pAuxGeomIB;
-
-    D3DBuffer* m_pCurVB;
-    D3DBuffer* m_pCurIB;
-
-    SStreamBufferManager m_auxGeomSBM;
-
-    uint32 m_wndXRes;
-    uint32 m_wndYRes;
-    float m_aspect;
-    float m_aspectInv;
-
-    SMatrices m_matrices;
-
-    CAuxGeomCB::EPrimType m_curPrimType;
-
-    uint8 m_curPointSize;
-
-    int m_curTransMatrixIdx;
-
-    CShader* m_pAuxGeomShader;
-    EAuxGeomPublicRenderflags_DrawInFrontMode m_curDrawInFrontMode;
-
-    CAuxGeomCB::AuxSortedPushBuffer m_auxSortedPushBuffer;
-    const CAuxGeomCB::SAuxGeomCBRawData* m_pCurCBRawData;
-    CAuxGeomCBCollector m_auxGeomCBCol;
-
-    int CV_r_auxGeom;
-
-    SDrawObjMesh m_sphereObj[ e_auxObjNumLOD ];
-    SDrawObjMesh m_diskObj[ e_auxObjNumLOD ];
-    SDrawObjMesh m_quadObj[ e_auxObjNumLOD ];
-    SDrawObjMesh m_coneObj[ e_auxObjNumLOD ];
-    SDrawObjMesh m_cylinderObj[ e_auxObjNumLOD ];
-
-    AZ::Vertex::Format m_auxGeomPrimitiveVertexFormat = eVF_P3F_C4B_T2F;
-    AZ::Vertex::Format m_auxGeomObjectVertexFormat = eVF_P3F_T3F;
-};
-
-
-inline
-CRenderAuxGeomD3D::SStreamBufferManager::SStreamBufferManager()
-    : m_discardVB(true)
-    , m_curVBIndex(0)
-    , m_discardIB(true)
-    , m_curIBIndex(0)
-{
-}
-
-
-inline void
-CRenderAuxGeomD3D::SStreamBufferManager::Reset()
-{
-    m_discardVB = true;
-    m_curVBIndex = 0;
-    m_discardIB = true;
-    m_curIBIndex = 0;
-}
-
-
-inline void
-CRenderAuxGeomD3D::SStreamBufferManager::DiscardVB()
-{
-    m_discardVB = true;
-    m_curVBIndex = 0;
-}
-
-
-inline void
-CRenderAuxGeomD3D::SStreamBufferManager::DiscardIB()
-{
-    m_discardIB = true;
-    m_curIBIndex = 0;
-}
-
-inline void CRenderAuxGeomD3D::DetermineAuxPrimitveFlags(uint32& d3dNumPrimDivider, eRenderPrimitiveType& ePrimType, CAuxGeomCB::EPrimType primType) const
-{
-    switch (primType)
-    {
-    case CAuxGeomCB::e_PtList:
-    {
-        d3dNumPrimDivider = 1;
-        ePrimType = eptPointList;
-        break;
-    }
-    case CAuxGeomCB::e_LineList:
-    case CAuxGeomCB::e_LineListInd:
-    {
-        d3dNumPrimDivider = 2;
-        ePrimType = eptLineList;
-        break;
-    }
-    case CAuxGeomCB::e_TriList:
-    case CAuxGeomCB::e_TriListInd:
-    default:
-    {
-        d3dNumPrimDivider = 3;
-        ePrimType = eptTriangleList;
-        break;
-    }
-    }
-}
-
-#endif // #if defined(ENABLE_RENDER_AUX_GEOM)
-
-#endif // D3D_RENDER_AUX_GEOM_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderRE.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderRE.cpp
deleted file mode 100644
index b04d0fbb01..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderRE.cpp
+++ /dev/null
@@ -1,2466 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "../Common/RendElements/Stars.h"
-#include "I3DEngine.h"
-#include "../Common/PostProcess/PostProcessUtils.h"
-#include "../Common/PostProcess/PostEffects.h"
-#include "D3DPostProcess.h"
-#include "../Common/Renderer.h"
-#include "../Common/Textures/TextureManager.h"
-#include <CryPath.h>
-
-
-//=======================================================================
-
-bool CRESky::mfDraw(CShader* ef, SShaderPass* sfm)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-
-#if !defined(_RELEASE)
-    if (ef->m_eShaderType != eST_Sky)
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Incorrect shader set for sky");
-        return false;
-    }
-#endif
-
-    if (!rd->m_RP.m_pShaderResources || !rd->m_RP.m_pShaderResources->m_pSky)
-    {
-        return false;
-    }
-
-    // pass 0 - skybox
-    SSkyInfo* pSky = rd->m_RP.m_pShaderResources->m_pSky;
-    if (!pSky->m_SkyBox[0])
-    {
-        return false;
-    }
-
-    float v(gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKYBOX_MULTIPLIER));
-    rd->SetMaterialColor(v, v, v, m_fAlpha);
-
-    if (!sfm)
-    {
-        ef->FXSetTechnique(CCryNameTSCRC((uint32)0));
-    }
-
-
-    uint32 nPasses = 0;
-    ef->FXBegin(&nPasses, FEF_DONTSETTEXTURES);
-    //ef->FXBegin(&nPasses, 0 );
-    if (!nPasses)
-    {
-        return false;
-    }
-    ef->FXBeginPass(0);
-
-    rd->FX_PushVP();
-    rd->m_NewViewport.fMinZ = 1.0f;
-    rd->m_NewViewport.fMaxZ = 1.0f;
-    rd->m_bViewportDirty = true;
-
-    STexState pTexState;
-    pTexState.SetFilterMode(FILTER_LINEAR);
-    pTexState.SetClampMode(1, 1, 1);
-
-    int texStateID = CTexture::GetTexState(pTexState);
-
-    const float fSkyBoxSize = SKY_BOX_SIZE;
-
-    rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-    if (rd->m_RP.m_nBatchFilter & FB_Z)
-    {
-        CTextureManager::Instance()->GetBlackTexture()->Apply(0, texStateID);
-        { // top
-            SVF_P3F_C4B_T2F data[] =
-            {
-                {Vec3(+fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)},
-                {Vec3(-fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)},
-                {Vec3(+fSkyBoxSize, +fSkyBoxSize, fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)},
-                {Vec3(-fSkyBoxSize, +fSkyBoxSize, fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)}
-            };
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 4, eptTriangleStrip);
-        }
-        { // nesw
-            SVF_P3F_C4B_T2F data[] =
-            {
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, +fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, -fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(+fSkyBoxSize, -fSkyBoxSize, +fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(+fSkyBoxSize, -fSkyBoxSize, -fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(+fSkyBoxSize, +fSkyBoxSize, +fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(+fSkyBoxSize, +fSkyBoxSize, -fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(-fSkyBoxSize, +fSkyBoxSize, +fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(-fSkyBoxSize, +fSkyBoxSize, -fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, +fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, -fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0, 0)},
-            };
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 10, eptTriangleStrip);
-        }
-        {   // b
-            SVF_P3F_C4B_T2F data[] =
-            {
-                {Vec3(+fSkyBoxSize, -fSkyBoxSize, -fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)},
-                {Vec3(-fSkyBoxSize, -fSkyBoxSize, -fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)},
-                {Vec3(+fSkyBoxSize, +fSkyBoxSize, -fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)},
-                {Vec3(-fSkyBoxSize, +fSkyBoxSize, -fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 0)}
-            };
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 4, eptTriangleStrip);
-        }
-    }
-    else
-    {
-        { // top
-            SVF_P3F_C4B_T2F data[] =
-            {
-                {Vec3(fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize),  {
-                     {0}
-                 }, Vec2(1, 1.f - 1)},
-                {Vec3(-fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 1.f - 1)},
-                {Vec3(fSkyBoxSize, fSkyBoxSize, fSkyBoxSize),  {
-                     {0}
-                 }, Vec2(1, 1.f - 0)},
-                {Vec3(-fSkyBoxSize, fSkyBoxSize, fSkyBoxSize), {
-                     {0}
-                 }, Vec2(0, 1.f - 0)}
-            };
-
-            ((CTexture*)(pSky->m_SkyBox[2]))->Apply(0, texStateID);
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 4, eptTriangleStrip);
-        }
-
-        Vec3 camera = iSystem->GetViewCamera().GetPosition();
-        camera.z = max(0.f, camera.z);
-
-        float fWaterCamDiff = max(0.f, camera.z - m_fTerrainWaterLevel);
-
-        float fMaxDist = gEnv->p3DEngine->GetMaxViewDistance() / 1024.f;
-        float P = (fWaterCamDiff) / 128 + max(0.f, (fWaterCamDiff) * 0.03f / fMaxDist);
-
-        P *= m_fSkyBoxStretching;
-
-        float D = (fWaterCamDiff) / 10.0f * fSkyBoxSize / 124.0f - /*P*/ 0 + 8;
-
-        D = max(0.f, D);
-
-        if (m_fTerrainWaterLevel > camera.z && SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID] == 0)
-        {
-            P = (fWaterCamDiff);
-            D = (fWaterCamDiff);
-        }
-
-        float fTexOffset;
-        fTexOffset = 1.0f / max(pSky->m_SkyBox[1]->GetHeight(), 1);
-        { // s
-            SVF_P3F_C4B_T2F data[] =
-            {
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize), {
-                      {0}
-                  }, Vec2(1.0, 1.f - 1.0) },
-                { Vec3(fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize),  {
-                      {0}
-                  }, Vec2(0.0, 1.f - 1.0) },
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, -P),           {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5 - fTexOffset) },
-                { Vec3(fSkyBoxSize, -fSkyBoxSize, -P),            {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5 - fTexOffset) },
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, -D),           {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5 - fTexOffset) },
-                { Vec3(fSkyBoxSize, -fSkyBoxSize, -D),            {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5 - fTexOffset) }
-            };
-
-            ((CTexture*)(pSky->m_SkyBox[1]))->Apply(0, texStateID);
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 6, eptTriangleStrip);
-        }
-        { // e
-            SVF_P3F_C4B_T2F data[] =
-            {
-                { Vec3(-fSkyBoxSize, fSkyBoxSize, fSkyBoxSize), {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.0) },
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.0) },
-                { Vec3(-fSkyBoxSize, fSkyBoxSize, -P),           {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5f + fTexOffset) },
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, -P),           {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5f + fTexOffset) },
-                { Vec3(-fSkyBoxSize, fSkyBoxSize, -D),           {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5f + fTexOffset) },
-                { Vec3(-fSkyBoxSize, -fSkyBoxSize, -D),           {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5f + fTexOffset) }
-            };
-
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 6, eptTriangleStrip);
-        }
-
-        fTexOffset = 1.0f / max(pSky->m_SkyBox[0]->GetHeight(), 1);
-        { // n
-            SVF_P3F_C4B_T2F data[] =
-            {
-                { Vec3(fSkyBoxSize, fSkyBoxSize, fSkyBoxSize),  {
-                      {0}
-                  }, Vec2(1.0, 1.f - 1.0) },
-                { Vec3(-fSkyBoxSize, fSkyBoxSize, fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0.0, 1.f - 1.0) },
-                { Vec3(fSkyBoxSize, fSkyBoxSize, -P),            {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5 - fTexOffset) },
-                { Vec3(-fSkyBoxSize, fSkyBoxSize, -P),           {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5 - fTexOffset) },
-                { Vec3(fSkyBoxSize, fSkyBoxSize, -D),            {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5 - fTexOffset) },
-                { Vec3(-fSkyBoxSize, fSkyBoxSize, -D),           {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5 - fTexOffset) }
-            };
-
-            ((CTexture*)(pSky->m_SkyBox[0]))->Apply(0, texStateID);
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 6, eptTriangleStrip);
-        }
-        { // w
-            SVF_P3F_C4B_T2F data[] =
-            {
-                { Vec3(fSkyBoxSize, -fSkyBoxSize, fSkyBoxSize), {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.0) },
-                { Vec3(fSkyBoxSize, fSkyBoxSize, fSkyBoxSize), {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.0) },
-                { Vec3(fSkyBoxSize, -fSkyBoxSize, -P),           {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5f + fTexOffset) },
-                { Vec3(fSkyBoxSize, fSkyBoxSize, -P),           {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5f + fTexOffset) },
-                { Vec3(fSkyBoxSize, -fSkyBoxSize, -D),           {
-                      {0}
-                  }, Vec2(1.0, 1.f - 0.5f + fTexOffset) },
-                { Vec3(fSkyBoxSize, fSkyBoxSize, -D),           {
-                      {0}
-                  }, Vec2(0.0, 1.f - 0.5f + fTexOffset) }
-            };
-            CVertexBuffer vertexBuffer(data, eVF_P3F_C4B_T2F);
-            rd->DrawPrimitivesInternal(&vertexBuffer, 6, eptTriangleStrip);
-        }
-    }
-
-    rd->FX_PopVP();
-    rd->FX_ResetPipe();
-
-    return true;
-}
-
-static void FillSkyTextureData(CTexture* pTexture, const void* pData, const uint32 width, const uint32 height, [[maybe_unused]] const uint32 pitch)
-{
-    assert(pTexture && pTexture->GetWidth() == width && pTexture->GetHeight() == height);
-    CDeviceTexture* pDevTex = pTexture->GetDevTexture();
-    assert(pDevTex);
-
-    if (!pDevTex)
-    {
-        return;
-    }
-
-    gcpRendD3D->GetDeviceContext().UpdateSubresource(pDevTex->Get2DTexture(), 0, 0, pData, sizeof(CryHalf4) * width, sizeof(CryHalf4) * width * height);
-}
-
-bool CREHDRSky::mfDraw(CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    CD3D9Renderer* rd(gcpRendD3D);
-
-#if !defined(_RELEASE)
-    if (ef->m_eShaderType != eST_Sky)
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Incorrect shader set for sky");
-        return false;
-    }
-#endif
-
-
-    if (!rd->m_RP.m_pShaderResources || !rd->m_RP.m_pShaderResources->m_pSky)
-    {
-        return false;
-    }
-    SSkyInfo* pSky(rd->m_RP.m_pShaderResources->m_pSky);
-    if (!pSky->m_SkyBox[0])
-    {
-        return false;
-    }
-
-    assert(m_pRenderParams);
-    if (!m_pRenderParams)
-    {
-        return false;
-    }
-
-    assert(m_pRenderParams->m_pSkyDomeMesh.get());
-    if (!m_pRenderParams->m_pSkyDomeMesh)
-    {
-        return false;
-    }
-
-    bool isNotZPass = (rd->m_RP.m_nBatchFilter & FB_Z) == 0;
-    if (isNotZPass)
-    {
-        // re-create sky dome textures if necessary
-        bool forceTextureUpdate(false);
-        if (!CTexture::IsTextureExist(m_pSkyDomeTextureMie) || !CTexture::IsTextureExist(m_pSkyDomeTextureRayleigh))
-        {
-            GenerateSkyDomeTextures(SSkyLightRenderParams::skyDomeTextureWidth, SSkyLightRenderParams::skyDomeTextureHeight);
-            forceTextureUpdate = true;
-        }
-
-        // dyn tex data lost due to device reset?
-        if (m_frameReset != rd->m_nFrameReset)
-        {
-            forceTextureUpdate = true;
-            m_frameReset = rd->m_nFrameReset;
-        }
-
-        // update sky dome texture if new data is available
-        if (m_skyDomeTextureLastTimeStamp != m_pRenderParams->m_skyDomeTextureTimeStamp || forceTextureUpdate)
-        {
-            FillSkyTextureData(m_pSkyDomeTextureMie, m_pRenderParams->m_pSkyDomeTextureDataMie, SSkyLightRenderParams::skyDomeTextureWidth, SSkyLightRenderParams::skyDomeTextureHeight, m_pRenderParams->m_skyDomeTexturePitch);
-            FillSkyTextureData(m_pSkyDomeTextureRayleigh, m_pRenderParams->m_pSkyDomeTextureDataRayleigh, SSkyLightRenderParams::skyDomeTextureWidth, SSkyLightRenderParams::skyDomeTextureHeight, m_pRenderParams->m_skyDomeTexturePitch);
-
-            // update time stamp of last update
-            m_skyDomeTextureLastTimeStamp = m_pRenderParams->m_skyDomeTextureTimeStamp;
-        }
-    }
-
-    // render
-    uint32 nPasses(0);
-    ef->FXBegin(&nPasses, 0);
-    if (!nPasses)
-    {
-        return false;
-    }
-    ef->FXBeginPass(0);
-
-    I3DEngine* p3DEngine(gEnv->p3DEngine);
-
-    rd->FX_PushVP();
-    rd->m_NewViewport.fMinZ = 1.0f;
-    rd->m_NewViewport.fMaxZ = 1.0f;
-    rd->m_bViewportDirty = true;
-
-    if (isNotZPass)
-    {
-        // shader constants -- set sky dome texture and texel size
-        assert(m_pSkyDomeTextureMie && m_pSkyDomeTextureMie->GetWidth() == SSkyLightRenderParams::skyDomeTextureWidth && m_pSkyDomeTextureMie->GetHeight() == SSkyLightRenderParams::skyDomeTextureHeight);
-        assert(m_pSkyDomeTextureRayleigh && m_pSkyDomeTextureRayleigh->GetWidth() == SSkyLightRenderParams::skyDomeTextureWidth && m_pSkyDomeTextureRayleigh->GetHeight() == SSkyLightRenderParams::skyDomeTextureHeight);
-        Vec4 skyDomeTexSizeVec((float) SSkyLightRenderParams::skyDomeTextureWidth, (float) SSkyLightRenderParams::skyDomeTextureHeight, 0.0f, 0.0f);
-        static CCryNameR Param1Name("SkyDome_TextureSize");
-        ef->FXSetPSFloat(Param1Name, &skyDomeTexSizeVec, 1);
-        Vec4 skyDomeTexelSizeVec(1.0f / (float) SSkyLightRenderParams::skyDomeTextureWidth, 1.0f / (float) SSkyLightRenderParams::skyDomeTextureHeight, 0.0f, 0.0f);
-        static CCryNameR Param2Name("SkyDome_TexelSize");
-        ef->FXSetPSFloat(Param2Name, &skyDomeTexelSizeVec, 1);
-
-        // shader constants -- phase function constants
-        static CCryNameR Param3Name("SkyDome_PartialMieInScatteringConst");
-        static CCryNameR Param4Name("SkyDome_PartialRayleighInScatteringConst");
-        static CCryNameR Param5Name("SkyDome_SunDirection");
-        static CCryNameR Param6Name("SkyDome_PhaseFunctionConstants");
-        ef->FXSetPSFloat(Param3Name, &m_pRenderParams->m_partialMieInScatteringConst, 1);
-        ef->FXSetPSFloat(Param4Name, &m_pRenderParams->m_partialRayleighInScatteringConst, 1);
-        ef->FXSetPSFloat(Param5Name, &m_pRenderParams->m_sunDirection, 1);
-        ef->FXSetPSFloat(Param6Name, &m_pRenderParams->m_phaseFunctionConsts, 1);
-
-        // shader constants -- night sky relevant constants
-        Vec3 nightSkyHorizonCol;
-        p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_HORIZON_COLOR, nightSkyHorizonCol);
-        Vec3 nightSkyZenithCol;
-        p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_ZENITH_COLOR, nightSkyZenithCol);
-        float nightSkyZenithColShift(p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_ZENITH_SHIFT));
-        const float minNightSkyZenithGradient(-0.1f);
-
-        static CCryNameR Param7Name("SkyDome_NightSkyColBase");
-        static CCryNameR Param8Name("SkyDome_NightSkyColDelta");
-        static CCryNameR Param9Name("SkyDome_NightSkyZenithColShift");
-
-        Vec4 nsColBase(nightSkyHorizonCol, 0);
-        ef->FXSetPSFloat(Param7Name, &nsColBase, 1);
-        Vec4 nsColDelta(nightSkyZenithCol - nightSkyHorizonCol, 0);
-        ef->FXSetPSFloat(Param8Name, &nsColDelta, 1);
-        Vec4 nsZenithColShift(1.0f / (nightSkyZenithColShift - minNightSkyZenithGradient),  -minNightSkyZenithGradient / (nightSkyZenithColShift - minNightSkyZenithGradient), 0, 0);
-        ef->FXSetPSFloat(Param9Name, &nsZenithColShift, 1);
-
-        CREHDRSky::SetCommonMoonParams(ef, true);
-
-        Vec3 nightMoonColor;
-        p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_COLOR, nightMoonColor);
-        Vec4 nsMoonColor(nightMoonColor, 0);
-        static CCryNameR Param11Name("SkyDome_NightMoonColor");
-        ef->FXSetPSFloat(Param11Name, &nsMoonColor, 1);
-
-        Vec3 nightMoonInnerCoronaColor;
-        p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_INNERCORONA_COLOR, nightMoonInnerCoronaColor);
-        float nightMoonInnerCoronaScale(1.0f + 1000.0f * p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_INNERCORONA_SCALE));
-        Vec4 nsMoonInnerCoronaColorScale(nightMoonInnerCoronaColor, nightMoonInnerCoronaScale);
-        static CCryNameR Param12Name("SkyDome_NightMoonInnerCoronaColorScale");
-        ef->FXSetPSFloat(Param12Name, &nsMoonInnerCoronaColorScale, 1);
-
-        Vec3 nightMoonOuterCoronaColor;
-        p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_OUTERCORONA_COLOR, nightMoonOuterCoronaColor);
-        float nightMoonOuterCoronaScale(1.0f + 1000.0f * p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_MOON_OUTERCORONA_SCALE));
-        Vec4 nsMoonOuterCoronaColorScale(nightMoonOuterCoronaColor, nightMoonOuterCoronaScale);
-        static CCryNameR Param13Name("SkyDome_NightMoonOuterCoronaColorScale");
-        ef->FXSetPSFloat(Param13Name, &nsMoonOuterCoronaColorScale, 1);
-    }
-
-    HRESULT hr(S_OK);
-
-    // commit all render changes
-
-    //  David S. workaround for Mali driver's bug
-    if (isNotZPass && (gRenDev->GetFeatures() & RFT_HW_ARM_MALI))
-    {
-        uint32 newState = rd->m_RP.m_CurState;
-        newState |= GS_STENCIL;
-        rd->FX_SetStencilState(
-            STENC_FUNC(FSS_STENCFUNC_ALWAYS) |
-            STENCOP_FAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_KEEP) |
-            STENCOP_ZFAIL(FSS_STENCOP_KEEP),
-            1, 0xFFFFFFFF, 0xFFFFFFFF);
-        rd->FX_SetState(newState);
-    }
-
-    rd->FX_Commit();
-
-    // set vertex declaration and streams of sky dome
-    CRenderMesh* pSkyDomeMesh = static_cast<CRenderMesh*>(m_pRenderParams->m_pSkyDomeMesh.get());
-    hr = rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F);
-    if (!FAILED(hr))
-    {
-        // set vertex and index buffer
-        pSkyDomeMesh->CheckUpdate(0);
-        size_t vbOffset(0);
-        size_t ibOffset(0);
-        D3DBuffer* pVB = rd->m_DevBufMan.GetD3D(pSkyDomeMesh->GetVBStream(VSF_GENERAL), &vbOffset);
-        D3DBuffer* pIB = rd->m_DevBufMan.GetD3D(pSkyDomeMesh->GetIBStream(), &ibOffset);
-        assert(pVB);
-        assert(pIB);
-        if (!pVB || !pIB)
-        {
-            return false;
-        }
-
-        hr =  rd->FX_SetVStream(0, pVB, vbOffset, pSkyDomeMesh->GetStreamStride(VSF_GENERAL));
-        hr = rd->FX_SetIStream(pIB, ibOffset, (sizeof(vtx_idx) == 2 ? Index16 : Index32));
-
-        rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-        // draw sky dome
-        rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, pSkyDomeMesh->GetNumVerts(), 0, pSkyDomeMesh->GetNumInds());
-    }
-
-    ef->FXEndPass();
-    ef->FXEnd();
-
-    if (m_pStars)
-    {
-        m_pStars->Render(m_moonTexId > 0 ? true : false);
-    }
-
-    rd->FX_PopVP();
-
-    gcpRendD3D->FX_ResetPipe();
-
-    return true;
-}
-
-void CStars::Render(bool bUseMoon)
-{
-    CD3D9Renderer* rd(gcpRendD3D);
-
-    I3DEngine* p3DEngine(gEnv->p3DEngine);
-    float starIntensity(p3DEngine->GetGlobalParameter(E3DPARAM_NIGHSKY_STAR_INTENSITY));
-
-    if (m_pStarMesh && m_pShader && rd->m_RP.m_nPassGroupID == EFSLIST_GENERAL && (rd->m_RP.m_nBatchFilter & FB_GENERAL) && starIntensity > 1e-3f)
-    {
-        //////////////////////////////////////////////////////////////////////////
-        // set shader
-
-        static CCryNameTSCRC shaderTech("Stars");
-        m_pShader->FXSetTechnique(shaderTech);
-        uint32 nPasses(0);
-        m_pShader->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        if (!nPasses)
-        {
-            return;
-        }
-        m_pShader->FXBeginPass(0);
-
-        //////////////////////////////////////////////////////////////////////////
-        // setup params
-
-        int vpX(0), vpY(0), vpWidth(0), vpHeight(0);
-        rd->GetViewport(&vpX, &vpY, &vpWidth, &vpHeight);
-        const float size = 5.0f * min(1.f, min(vpWidth / 1280.f, vpHeight / 720.f));
-        float flickerTime(gEnv->pTimer->GetCurrTime());
-        static CCryNameR vspnStarSize("StarSize");
-        Vec4 paramStarSize(size / (float)vpWidth, size / (float)vpHeight, 0, flickerTime * 0.5f);
-        m_pShader->FXSetVSFloat(vspnStarSize, &paramStarSize, 1);
-
-        static CCryNameR pspnStarIntensity("StarIntensity");
-        Vec4 paramStarIntensity(starIntensity* min(1.f, size), 0, 0, 0);
-        m_pShader->FXSetPSFloat(pspnStarIntensity, &paramStarIntensity, 1);
-
-        CREHDRSky::SetCommonMoonParams(m_pShader, bUseMoon);
-
-        //////////////////////////////////////////////////////////////////////////
-        // commit & draw
-
-        int32 nRenderState = GS_BLSRC_ONE | GS_BLDST_ONE;
-
-        rd->FX_SetState(nRenderState);
-
-        rd->FX_Commit();
-        if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3S_C4B_T2S)))
-        {
-            size_t offset(0);
-            //void* pVB(m_pStarVB->GetStream(VSF_GENERAL, &offset));
-            //rd->FX_SetVStream(0, pVB, offset, m_VertexSize[m_pStarVB->m_vertexformat]);
-            CRenderMesh* pStarMesh = static_cast<CRenderMesh*>(m_pStarMesh.get());
-            pStarMesh->CheckUpdate(0);
-            D3DBuffer* pVB = rd->m_DevBufMan.GetD3D(pStarMesh->GetVBStream(VSF_GENERAL), &offset);
-            rd->FX_SetVStream(0, pVB, offset, pStarMesh->GetStreamStride(VSF_GENERAL));
-            rd->FX_SetIStream(0, 0, Index16);
-
-            rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-            rd->FX_DrawPrimitive(eptTriangleList, 0, 6 * m_numStars);
-        }
-
-        m_pShader->FXEndPass();
-        m_pShader->FXEnd();
-    }
-}
-
-bool CREFogVolume::mfDraw(CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    CD3D9Renderer* rd(gcpRendD3D);
-
-#if !defined(_RELEASE)
-    if (ef->m_eShaderType != eST_PostProcess)
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Incorrect shader set for fog volume");
-        return false;
-    }
-#endif
-
-    // shader technique is multi-pass but it doesn't need to be rendered twice.
-    if (rd->m_RP.m_nNumRendPasses > 1)
-    {
-        return false;
-    }
-
-    // rendered to volume texture
-    if (CD3D9Renderer::CV_r_VolumetricFog != 0 && rd->m_RP.m_nPassGroupID == EFSLIST_FOG_VOLUME)
-    {
-        // calculate depth bounds of FogVolume.
-        // reusing light depth bounds code from CDeferredShading::GetLightDepthBounds().
-        // This is not optimal for a box.
-        Matrix34 temp = m_matWSInv.GetInverted();
-        AABB aabbInObj(1.0f);
-        AABB aabbInWS = AABB::CreateTransformedAABB(temp, aabbInObj);
-        float fRadius = aabbInWS.GetRadius();
-        Vec3 cameraFront = rd->GetViewParameters().vZ;
-        cameraFront.Normalize();
-        Vec3 pBounds = cameraFront * fRadius;
-        Vec3 pMax = m_center - pBounds;
-        Vec3 pMin = m_center + pBounds;
-        float fMinW, fMaxW;
-        fMaxW = rd->GetViewParameters().WorldToCamZ(pMax);
-        fMinW = rd->GetViewParameters().WorldToCamZ(pMin);
-        fMinW = max(-fMinW, 0.000001f);
-        fMaxW = max(-fMaxW, 0.000001f);
-
-
-        // don't render when FogVolume is out of volume texture.
-        Vec3 volumetricFogRaymarchEnd;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volumetricFogRaymarchEnd);
-        if (fMinW > volumetricFogRaymarchEnd.x)
-        {
-            return false;
-        }
-
-        PROFILE_LABEL_SCOPE("FOG_VOLUME");
-
-        // render
-        uint32 nPasses(0);
-        ef->FXBegin(&nPasses, 0);
-        if (0 == nPasses)
-        {
-            assert(0);
-            return(false);
-        }
-
-        uint64 nFlagsShaderRTSave = rd->m_RP.m_FlagsShader_RT;
-        rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-        if (m_affectsThisAreaOnly)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-        }
-
-        // set volumetric fog injection pass
-        ef->FXBeginPass(1);
-
-        if (m_viewerInsideVolume)
-        {
-            rd->SetCullMode(R_CULL_FRONT);
-        }
-        else
-        {
-            rd->SetCullMode(R_CULL_BACK);
-        }
-        rd->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ONE | GS_NODEPTHTEST);
-
-        // set vs constants
-        static CCryNameR invObjSpaceMatrixName("invObjSpaceMatrix");
-        ef->FXSetVSFloat(invObjSpaceMatrixName, (const Vec4*) &m_matWSInv.m00, 3);
-        ef->FXSetPSFloat(invObjSpaceMatrixName, (const Vec4*) &m_matWSInv.m00, 3);
-
-        const Vec4 cEyePosVec(m_eyePosInWS, !m_viewerInsideVolume ? 1 : 0);
-        static CCryNameR eyePosInWSName("eyePosInWS");
-        ef->FXSetVSFloat(eyePosInWSName, &cEyePosVec, 1);
-
-        const Vec4 cNearCutoffVec(m_nearCutoff, m_nearCutoff, m_nearCutoff, m_nearCutoff);
-        static CCryNameR nearCutoffName("nearCutoff");
-        ef->FXSetVSFloat(nearCutoffName, &cNearCutoffVec, 1);
-
-        // set ps constants
-        const Vec4 cFogColVec(m_fogColor.r, m_fogColor.g, m_fogColor.b, 0);
-        static CCryNameR fogColorName("fogColor");
-        ef->FXSetPSFloat(fogColorName, &cFogColVec, 1);
-
-        float globalDensity = m_globalDensity * 0.1f;// scale density to volumetric fog.
-        const Vec4 cGlobalDensityVec(globalDensity, 1.44269502f * globalDensity, m_noiseElapsedTime, 0);
-        static CCryNameR globalDensityName("globalDensity");
-        ef->FXSetPSFloat(globalDensityName, &cGlobalDensityVec, 1);
-
-        const Vec4 cDensityOffsetVec(m_densityOffset, m_densityOffset, m_densityOffset, m_densityOffset);
-        static CCryNameR densityOffsetName("densityOffset");
-        ef->FXSetPSFloat(densityOffsetName, &cDensityOffsetVec, 1);
-
-        uint32 nData = m_stencilRef + 1;// first ref value is reserved, see CDeferredShading::PrepareClipVolumeData function.
-        const Vec4 cHeigthFallOffBasePointVec(m_heightFallOffBasePoint, *alias_cast<float*>(&nData));
-        static CCryNameR heightFallOffBasePointName("heightFallOffBasePoint");
-        ef->FXSetPSFloat(heightFallOffBasePointName, &cHeigthFallOffBasePointVec, 1);
-
-        const Vec4 cHeightFallOffDirScaledVec(m_heightFallOffDirScaled * 0.015625f, 0);  // scale fall off ramp to volumetric fog.
-        static CCryNameR heightFallOffDirScaledName("heightFallOffDirScaled");
-        ef->FXSetPSFloat(heightFallOffDirScaledName, &cHeightFallOffDirScaledVec, 1);
-
-        const Vec4 cOutsideSoftEdgesLerpVec(m_softEdgesLerp.x, m_softEdgesLerp.y, 0, 0);
-        static CCryNameR outsideSoftEdgesLerpName("outsideSoftEdgesLerp");
-        ef->FXSetPSFloat(outsideSoftEdgesLerpName, &cOutsideSoftEdgesLerpVec, 1);
-
-        const Vec4 cEyePosInWSVec(m_eyePosInWS, 0);
-        ef->FXSetPSFloat(eyePosInWSName, &cEyePosInWSVec, 1);
-
-        const Vec4 cEyePosInOSVec(m_eyePosInOS, 0);
-        static CCryNameR eyePosInOSName("eyePosInOS");
-        ef->FXSetPSFloat(eyePosInOSName, &cEyePosInOSVec, 1);
-
-        const Vec4 cEyePosInOSx2Vec(2.0f * m_eyePosInOS, 0);
-        static CCryNameR eyePosInOSx2Name("eyePosInOSx2");
-        ef->FXSetPSFloat(eyePosInOSx2Name, &cEyePosInOSx2Vec, 1);
-
-        float softEdgeLerp = (m_softEdgesLerp.x > 0.0f) ? m_softEdgesLerp.x : 0.0001f;
-        const Vec4 cFogVolumePos(m_center, 1.0f / softEdgeLerp);
-        static CCryNameR fogVolumePosName("fogVolumePos");
-        ef->FXSetPSFloat(fogVolumePosName, &cFogVolumePos, 1);
-
-        float rampDist = m_rampParams.y - m_rampParams.x;
-        rampDist = rampDist < 0.1f ? 0.1f : rampDist;
-        float invRampDist = 1.0f / rampDist;
-        const Vec4 cRampParams(invRampDist, -m_rampParams.x* invRampDist, m_rampParams.z, -m_rampParams.z + 1.0f);
-        static CCryNameR rampParamsName("rampParams");
-        ef->FXSetPSFloat(rampParamsName, &cRampParams, 1);
-
-        const float normalizeFactor = (1.0f / (1.0f + 0.5f));
-        const Vec4 cWindOffset(m_windOffset.x, m_windOffset.y, m_windOffset.z, m_noiseScale* normalizeFactor);
-        static CCryNameR windOffsetName("windOffset");
-        ef->FXSetPSFloat(windOffsetName, &cWindOffset, 1);
-
-        const Vec4 cNoiseFreq(m_noiseFreq.x, m_noiseFreq.y, m_noiseFreq.z, m_noiseOffset);
-        static CCryNameR noiseFreqName("noiseFreq");
-        ef->FXSetPSFloat(noiseFreqName, &cNoiseFreq, 1);
-
-        // find minimum and maximum affected slices
-        const int slicesPerInstance = 28;
-        const int depthMaxCount = CTexture::s_ptexVolumetricFogDensity->GetDepth();
-        static CCryNameR sliceBounds("sliceBounds");
-        Vec4 vSliceBounds(fMinW, fMaxW, slicesPerInstance, 0.0f);
-        ef->FXSetGSFloat(sliceBounds, &vSliceBounds, 1);
-
-        // commit all render changes
-        rd->FX_Commit();
-
-        // set vertex declaration and streams of skydome
-        if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            // define bounding box geometry
-            const uint32 c_numBBVertices(8);
-            SVF_P3F_C4B_T2F bbVertices[ c_numBBVertices ] =
-            {
-                { Vec3(m_localAABB.min.x, m_localAABB.min.y, m_localAABB.min.z) },
-                { Vec3(m_localAABB.min.x, m_localAABB.max.y, m_localAABB.min.z) },
-                { Vec3(m_localAABB.max.x, m_localAABB.max.y, m_localAABB.min.z) },
-                { Vec3(m_localAABB.max.x, m_localAABB.min.y, m_localAABB.min.z) },
-                { Vec3(m_localAABB.min.x, m_localAABB.min.y, m_localAABB.max.z) },
-                { Vec3(m_localAABB.min.x, m_localAABB.max.y, m_localAABB.max.z) },
-                { Vec3(m_localAABB.max.x, m_localAABB.max.y, m_localAABB.max.z) },
-                { Vec3(m_localAABB.max.x, m_localAABB.min.y, m_localAABB.max.z) }
-            };
-
-            const uint32 c_numBBIndices(36);
-            static const uint16 bbIndices[ c_numBBIndices ] =
-            {
-                0, 1, 2,   0, 2, 3,
-                7, 6, 5,   7, 5, 4,
-                3, 2, 6,   3, 6, 7,
-                4, 5, 1,   4, 1, 0,
-                1, 5, 6,   1, 6, 2,
-                4, 0, 3,   4, 3, 7
-            };
-
-            // copy vertices into dynamic VB
-            TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(bbVertices, c_numBBVertices, 0);
-
-            // copy indices into dynamic IB
-            TempDynIB16::CreateFillAndBind(bbIndices, c_numBBIndices);
-
-            rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-            // use instanced draw for rendering multiple slices at once
-            int instanceCount = (depthMaxCount / slicesPerInstance) + ((depthMaxCount % slicesPerInstance) != 0 ? 1 : 0);
-            rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, instanceCount, 0, c_numBBIndices, true);
-        }
-
-        ef->FXEndPass();
-        ef->FXEnd();
-
-        rd->m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-
-        return true;
-    }
-
-    PROFILE_LABEL_SCOPE("FOG_VOLUME");
-
-    // render
-    uint32 nPasses(0);
-    ef->FXBegin(&nPasses, 0);
-    if (0 == nPasses)
-    {
-        assert(0);
-        return(false);
-    }
-    ef->FXBeginPass(0);
-
-    if (m_viewerInsideVolume)
-    {
-        rd->SetCullMode(R_CULL_FRONT);
-        int nState = GS_COLMASK_RGB | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-        nState |= m_nearCutoff ? 0 : GS_NODEPTHTEST;
-        rd->FX_SetState(nState);
-    }
-    else
-    {
-        rd->SetCullMode(R_CULL_BACK);
-        rd->FX_SetState(GS_COLMASK_RGB | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-    }
-
-    // set vs constants
-    static CCryNameR invObjSpaceMatrixName("invObjSpaceMatrix");
-    ef->FXSetVSFloat(invObjSpaceMatrixName, (const Vec4*) &m_matWSInv.m00, 3);
-
-    const Vec4 cEyePosVec(m_eyePosInWS, !m_viewerInsideVolume ? 1 : 0);
-    static CCryNameR eyePosInWSName("eyePosInWS");
-    ef->FXSetVSFloat(eyePosInWSName, &cEyePosVec, 1);
-
-    const Vec4 cEyePosInOSVec(m_eyePosInOS, 0);
-    static CCryNameR eyePosInOSName("eyePosInOS");
-    ef->FXSetVSFloat(eyePosInOSName, &cEyePosInOSVec, 1);
-
-    const Vec4 cNearCutoffVec(m_nearCutoff, m_nearCutoff, m_nearCutoff, m_nearCutoff);
-    static CCryNameR nearCutoffName("nearCutoff");
-    ef->FXSetVSFloat(nearCutoffName, &cNearCutoffVec, 1);
-
-    // set ps constants
-    const Vec4 cFogColVec(m_fogColor.r, m_fogColor.g, m_fogColor.b, 0);
-    static CCryNameR fogColorName("fogColor");
-    ef->FXSetPSFloat(fogColorName, &cFogColVec, 1);
-
-    const Vec4 cGlobalDensityVec(m_globalDensity, 1.44269502f * m_globalDensity, 0, 0);
-    static CCryNameR globalDensityName("globalDensity");
-    ef->FXSetPSFloat(globalDensityName, &cGlobalDensityVec, 1);
-
-    const Vec4 cDensityOffsetVec(m_densityOffset, m_densityOffset, m_densityOffset, m_densityOffset);
-    static CCryNameR densityOffsetName("densityOffset");
-    ef->FXSetPSFloat(densityOffsetName, &cDensityOffsetVec, 1);
-
-    const Vec4 cHeigthFallOffBasePointVec(m_heightFallOffBasePoint, 0);
-    static CCryNameR heightFallOffBasePointName("heightFallOffBasePoint");
-    ef->FXSetPSFloat(heightFallOffBasePointName, &cHeigthFallOffBasePointVec, 1);
-
-    const Vec4 cHeightFallOffDirScaledVec(m_heightFallOffDirScaled, 0);
-    static CCryNameR heightFallOffDirScaledName("heightFallOffDirScaled");
-    ef->FXSetPSFloat(heightFallOffDirScaledName, &cHeightFallOffDirScaledVec, 1);
-
-    const Vec4 cOutsideSoftEdgesLerpVec(m_softEdgesLerp.x, m_softEdgesLerp.y, 0, 0);
-    static CCryNameR outsideSoftEdgesLerpName("outsideSoftEdgesLerp");
-    ef->FXSetPSFloat(outsideSoftEdgesLerpName, &cOutsideSoftEdgesLerpVec, 1);
-
-    const Vec4 cEyePosInWSVec(m_eyePosInWS, 0);
-    ef->FXSetPSFloat(eyePosInWSName, &cEyePosInWSVec, 1);
-
-    const Vec4 cEyePosInOSx2Vec(2.0f * m_eyePosInOS, 0);
-    static CCryNameR eyePosInOSx2Name("eyePosInOSx2");
-    ef->FXSetPSFloat(eyePosInOSx2Name, &cEyePosInOSx2Vec, 1);
-
-    // commit all render changes
-    rd->FX_Commit();
-
-    // set vertex declaration and streams of skydome
-    if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        // define bounding box geometry
-        const uint32 c_numBBVertices(8);
-        SVF_P3F_C4B_T2F bbVertices[ c_numBBVertices ] =
-        {
-            { Vec3(m_localAABB.min.x, m_localAABB.min.y, m_localAABB.min.z) },
-            { Vec3(m_localAABB.min.x, m_localAABB.max.y, m_localAABB.min.z) },
-            { Vec3(m_localAABB.max.x, m_localAABB.max.y, m_localAABB.min.z) },
-            { Vec3(m_localAABB.max.x, m_localAABB.min.y, m_localAABB.min.z) },
-            { Vec3(m_localAABB.min.x, m_localAABB.min.y, m_localAABB.max.z) },
-            { Vec3(m_localAABB.min.x, m_localAABB.max.y, m_localAABB.max.z) },
-            { Vec3(m_localAABB.max.x, m_localAABB.max.y, m_localAABB.max.z) },
-            { Vec3(m_localAABB.max.x, m_localAABB.min.y, m_localAABB.max.z) }
-        };
-
-        const uint32 c_numBBIndices(36);
-        static const uint16 bbIndices[ c_numBBIndices ] =
-        {
-            0, 1, 2,   0, 2, 3,
-            7, 6, 5,   7, 5, 4,
-            3, 2, 6,   3, 6, 7,
-            4, 5, 1,   4, 1, 0,
-            1, 5, 6,   1, 6, 2,
-            4, 0, 3,   4, 3, 7
-        };
-
-        // copy vertices into dynamic VB
-        TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(bbVertices, c_numBBVertices, 0);
-
-        // copy indices into dynamic IB
-        TempDynIB16::CreateFillAndBind(bbIndices, c_numBBIndices);
-
-        rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-        // draw skydome
-        rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, c_numBBVertices, 0, c_numBBIndices);
-    }
-
-    ef->FXEndPass();
-    ef->FXEnd();
-
-    return(true);
-}
-
-bool CREVolumeObject::mfDraw(CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    CD3D9Renderer* rd(gcpRendD3D);
-    I3DEngine* p3DEngine(gEnv->p3DEngine);
-
-    uint32 nFlagsPS2 = rd->m_RP.m_PersFlags2;
-    rd->m_RP.m_PersFlags2 &= ~(RBPF2_COMMIT_PF | RBPF2_COMMIT_CM);
-
-    // render
-    uint32 nPasses(0);
-    ef->FXBegin(&nPasses, 0);
-    if (!nPasses)
-    {
-        return false;
-    }
-
-    ef->FXBeginPass(0);
-
-    if (m_nearPlaneIntersectsVolume)
-    {
-        rd->SetCullMode(R_CULL_FRONT);
-        rd->FX_SetState(GS_COLMASK_RGB | GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-    }
-    else
-    {
-        rd->SetCullMode(R_CULL_BACK);
-        rd->FX_SetState(GS_COLMASK_RGB | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-    }
-
-    // set vs constants
-    static CCryNameR invObjSpaceMatrixName("invObjSpaceMatrix");
-    ef->FXSetVSFloat(invObjSpaceMatrixName, (const Vec4*) &m_matInv.m00, 3);
-
-    const Vec4 cEyePosVec(m_eyePosInWS, 0);
-    static CCryNameR eyePosInWSName("eyePosInWS");
-    ef->FXSetVSFloat(eyePosInWSName, &cEyePosVec, 1);
-
-    const Vec4 cViewerOutsideVec(!m_viewerInsideVolume ? 1 : 0, m_nearPlaneIntersectsVolume ? 1 : 0, 0, 0);
-    static CCryNameR viewerIsOutsideName("viewerIsOutside");
-    ef->FXSetVSFloat(viewerIsOutsideName, &cViewerOutsideVec, 1);
-
-    const Vec4 cEyePosInOSVec(m_eyePosInOS, 0);
-    static CCryNameR eyePosInOSName("eyePosInOS");
-    ef->FXSetVSFloat(eyePosInOSName, &cEyePosInOSVec, 1);
-
-    // set ps constants
-    const Vec4 cEyePosInWSVec(m_eyePosInWS, 0);
-    ef->FXSetPSFloat(eyePosInWSName, &cEyePosInWSVec, 1);
-
-    ColorF specColor(1, 1, 1, 1);
-    ColorF diffColor(1, 1, 1, 1);
-
-    CShaderResources* pRes(rd->m_RP.m_pShaderResources);
-    if (pRes && pRes->HasLMConstants())
-    {
-        specColor = pRes->GetColorValue(EFTT_SPECULAR);
-        diffColor = pRes->GetColorValue(EFTT_DIFFUSE);
-    }
-
-    Vec3 cloudShadingMultipliers;
-    p3DEngine->GetGlobalParameter(E3DPARAM_CLOUDSHADING_MULTIPLIERS, cloudShadingMultipliers);
-
-    Vec3 brightColor(p3DEngine->GetSunColor() * cloudShadingMultipliers.x);
-    brightColor = brightColor.CompMul(Vec3(specColor.r, specColor.g, specColor.b));
-
-    {
-        static CCryNameR darkColorName("darkColor");
-        const Vec4 data(0, 0, 0, m_alpha);
-        ef->FXSetPSFloat(darkColorName, &data, 1);
-    }
-    {
-        static CCryNameR brightColorName("brightColor");
-        const Vec4 data(brightColor, m_alpha);
-        ef->FXSetPSFloat(brightColorName, &data, 1);
-    }
-
-    const Vec4 cVolumeTraceStartPlane(m_volumeTraceStartPlane.n, m_volumeTraceStartPlane.d);
-    static CCryNameR volumeTraceStartPlaneName("volumeTraceStartPlane");
-    ef->FXSetPSFloat(volumeTraceStartPlaneName, &cVolumeTraceStartPlane, 1);
-
-    const Vec4 cScaleConsts(m_scale, 0, 0, 0);
-    static CCryNameR scaleConstsName("scaleConsts");
-    ef->FXSetPSFloat(scaleConstsName, &cScaleConsts, 1);
-
-    // TODO: optimize shader and remove need to pass inv obj space matrix
-    ef->FXSetPSFloat(invObjSpaceMatrixName, (const Vec4*) &m_matInv.m00, 3);
-
-
-    // commit all render changes
-    rd->FX_Commit();
-
-    // set vertex declaration and streams
-    if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F)))
-    {
-        CRenderMesh* pHullMesh = static_cast<CRenderMesh*>(m_pHullMesh.get());
-
-        // set vertex and index buffer
-        pHullMesh->CheckUpdate(0);
-        size_t vbOffset(0);
-        size_t ibOffset(0);
-        D3DBuffer* pVB = rd->m_DevBufMan.GetD3D(pHullMesh->GetVBStream(VSF_GENERAL), &vbOffset);
-        D3DBuffer* pIB = rd->m_DevBufMan.GetD3D(pHullMesh->GetIBStream(), &ibOffset);
-        assert(pVB);
-        assert(pIB);
-        if (!pVB || !pIB)
-        {
-            return false;
-        }
-
-        HRESULT hr(S_OK);
-        hr = rd->FX_SetVStream(0, pVB, vbOffset, pHullMesh->GetStreamStride(VSF_GENERAL));
-        hr = rd->FX_SetIStream(pIB, ibOffset, (sizeof(vtx_idx) == 2 ? Index16 : Index32));
-
-        rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-        rd->FX_DrawIndexedPrimitive(pHullMesh->GetPrimitiveType(), 0, 0, pHullMesh->GetNumVerts(), 0, pHullMesh->GetNumInds());
-    }
-
-    ef->FXEndPass();
-    ef->FXEnd();
-
-    rd->FX_ResetPipe();
-    rd->m_RP.m_PersFlags2 = nFlagsPS2;
-
-    return true;
-}
-
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-bool CREPrismObject::mfDraw(CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-
-    // render
-    uint32 nPasses(0);
-    ef->FXBegin(&nPasses, 0);
-    if (!nPasses)
-    {
-        return false;
-    }
-
-    ef->FXBeginPass(0);
-
-    // commit all render changes
-    //  rd->FX_Commit();
-
-    static SVF_P3F_C4B_T2F pScreenQuad[] =
-    {
-        { Vec3(0, 0, 0), {
-              {0}
-          }, Vec2(0, 0) },
-        { Vec3(0, 1, 0), {
-              {0}
-          }, Vec2(0, 1) },
-        { Vec3(1, 0, 0), {
-              {0}
-          }, Vec2(1, 0) },
-        { Vec3(1, 1, 0), {
-              {0}
-          }, Vec2(1, 1) },
-    };
-
-    pScreenQuad[0].xyz = Vec3(0, 0, 0);
-    pScreenQuad[1].xyz = Vec3(0, 1, 0);
-    pScreenQuad[2].xyz = Vec3(1, 0, 0);
-    pScreenQuad[3].xyz = Vec3(1, 1, 0);
-
-    CVertexBuffer strip(pScreenQuad, eVF_P3F_C4B_T2F);
-    gcpRendD3D->DrawPrimitivesInternal(&strip, 4, eptTriangleStrip);
-
-    ef->FXEndPass();
-    ef->FXEnd();
-
-    return true;
-}
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-
-bool CREWaterVolume::mfDraw(CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    assert(m_pParams);
-    if (!m_pParams)
-    {
-        return false;
-    }
-
-    CD3D9Renderer* rd(gcpRendD3D);
-
-    IF (ef->m_eShaderType != eST_Water, 0)
-    {
-#if !defined(_RELEASE)
-        // CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Incorrect shader set for water / water fog volume");
-#endif
-        return false;
-    }
-
-    //@NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
-    bool bCaustics = CRenderer::CV_r_watercaustics &&
-        CRenderer::CV_r_watervolumecaustics &&
-        m_pParams->m_caustics &&
-        (-m_pParams->m_fogPlane.d >= 1.0f);              // unfortunately packing to RG8 limits us to heights over 1 meter, so we just disable if volume goes below.
-
-    // Don't render caustics pass unless needed.
-    if ((rd->m_RP.m_nBatchFilter & FB_WATER_CAUSTIC) && !bCaustics)
-    {
-        return false;
-    }
-
-    uint64 nFlagsShaderRTSave = gcpRendD3D->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-    const bool renderFogShadowWater = (CRenderer::CV_r_FogShadowsWater > 0) && (m_pParams->m_fogShadowing > 0.01f);
-
-    Vec4 volFogShadowRange(0, 0, clamp_tpl(m_pParams->m_fogShadowing, 0.0f, 1.0f), 1.0f - clamp_tpl(m_pParams->m_fogShadowing, 0.0f, 1.0f));
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    const bool renderFogShadow = gcpRendD3D->m_bVolFogShadowsEnabled;
-    {
-        Vec3 volFogShadowRangeP;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_RANGE, volFogShadowRangeP);
-        volFogShadowRangeP.x = clamp_tpl(volFogShadowRangeP.x, 0.01f, 1.0f);
-        volFogShadowRange.x = volFogShadowRangeP.x;
-        volFogShadowRange.y = volFogShadowRangeP.y;
-    }
-
-    if (renderFogShadow)
-    {
-        gcpRendD3D->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-
-    if (!renderFogShadowWater) // set up forward shadows in case they will not be set up below
-    {
-        rd->FX_SetupShadowsForTransp();
-    }
-
-#endif
-
-    if (renderFogShadowWater)
-    {
-        rd->FX_SetupShadowsForTransp();
-        gcpRendD3D->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    Matrix44A origMatProj;
-    Matrix44A origMatView;
-
-    origMatProj.SetIdentity();
-    origMatView.SetIdentity();
-
-    if (!m_drawWaterSurface && m_pParams->m_viewerInsideVolume)
-    {
-        // set projection matrix for full screen quad
-        origMatProj = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-        Matrix44A* m = &rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj;
-        mathMatrixOrthoOffCenterLH(m, -1, 1, -1, 1, -1, 1);
-        if (SRendItem::m_RecurseLevel[rd->m_RP.m_nProcessThreadID] <= 0)
-        {
-            const SRenderTileInfo* rti = rd->GetRenderTileInfo();
-            if (rti->nGridSizeX > 1.f || rti->nGridSizeY > 1.f)
-            { // shift and scale viewport
-                m->m00 *= rti->nGridSizeX;
-                m->m11 *= rti->nGridSizeY;
-                m->m30 = -((rti->nGridSizeX - 1.f) - rti->nPosX * 2.0f);
-                m->m31 =  ((rti->nGridSizeY - 1.f) - rti->nPosY * 2.0f);
-            }
-        }
-
-        // set view matrix to identity
-        origMatView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView;
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-    }
-
-    // render
-    uint32 nPasses(0);
-    ef->FXBegin(&nPasses, 0);
-    if (0 == nPasses)
-    {
-        // reset matrices
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView = origMatView;
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-        return false;
-    }
-    ef->FXBeginPass(0);
-
-    // set ps constants
-    if (!m_drawWaterSurface || m_drawFastPath && !m_pParams->m_viewerInsideVolume)
-    {
-        if (!m_pOceanParams)
-        {
-            // fog color & density
-            const Vec3 col = m_pParams->m_fogColorAffectedBySun ? m_pParams->m_fogColor.CompMul(gEnv->p3DEngine->GetSunColor()) : m_pParams->m_fogColor;
-            const Vec4 fogColorDensity(col, 1.44269502f * m_pParams->m_fogDensity);   // log2(e) = 1.44269502
-            static CCryNameR Param1Name("cFogColorDensity");
-            ef->FXSetPSFloat(Param1Name, &fogColorDensity, 1);
-        }
-        else
-        {
-            // fog color & density
-            Vec4 fogColorDensity(m_pOceanParams->m_fogColor.CompMul(gEnv->p3DEngine->GetSunColor()), 1.44269502f * m_pOceanParams->m_fogDensity);     // log2(e) = 1.44269502
-            static CCryNameR Param1Name("cFogColorDensity");
-            ef->FXSetPSFloat(Param1Name, &fogColorDensity, 1);
-
-            // fog color shallow & water level
-            Vec4 fogColorShallowWaterLevel(m_pOceanParams->m_fogColorShallow.CompMul(gEnv->p3DEngine->GetSunColor()), -m_pParams->m_fogPlane.d);
-            static CCryNameR Param2Name("cFogColorShallowWaterLevel");
-            ef->FXSetPSFloat(Param2Name, &fogColorShallowWaterLevel, 1);
-
-            if (m_pParams->m_viewerInsideVolume)
-            {
-                // under water in-scattering constant term = exp2( -fogDensity * ( waterLevel - cameraPos.z) )
-                float c(expf(-m_pOceanParams->m_fogDensity * (-m_pParams->m_fogPlane.d - rd->GetCamera().GetPosition().z)));
-                Vec4 underWaterInScatterConst(c, 0, 0, 0);
-                static CCryNameR Param3Name("cUnderWaterInScatterConst");
-                ef->FXSetPSFloat(Param3Name, &underWaterInScatterConst, 1);
-            }
-        }
-
-        Vec4 fogPlane(m_pParams->m_fogPlane.n.x, m_pParams->m_fogPlane.n.y, m_pParams->m_fogPlane.n.z, m_pParams->m_fogPlane.d);
-        static CCryNameR Param4Name("cFogPlane");
-        ef->FXSetPSFloat(Param4Name, &fogPlane, 1);
-
-        if (m_pParams->m_viewerInsideVolume)
-        {
-            Vec4 perpDist(m_pParams->m_fogPlane | rd->GetViewParameters().vOrigin, 0, 0, 0);
-            static CCryNameR Param5Name("cPerpDist");
-            ef->FXSetPSFloat(Param5Name, &perpDist, 1);
-        }
-    }
-
-    // Disable fog when inside volume or when not using fast path - could assign custom RT flag for this instead
-    if (m_drawFastPath && m_pParams->m_viewerInsideVolume || !m_drawFastPath && m_drawWaterSurface)
-    {
-        // fog color & density
-        const Vec4 fogColorDensity(0, 0, 0, 0);
-        static CCryNameR Param1Name("cFogColorDensity");
-        ef->FXSetPSFloat(Param1Name, &fogColorDensity, 1);
-    }
-
-    {
-        static CCryNameR pszParamBBoxMin("vBBoxMin");
-        static CCryNameR pszParamBBoxMax("vBBoxMax");
-        const Vec4 vBBoxMin(m_pParams->m_WSBBox.min, 1.0f);
-        const Vec4 vBBoxMax(m_pParams->m_WSBBox.max, 1.0f);
-        ef->FXSetPSFloat(pszParamBBoxMin, &vBBoxMin, 1);
-        ef->FXSetPSFloat(pszParamBBoxMax, &vBBoxMax, 1);
-    }
-
-    // set vs constants
-    Vec4 viewerColorToWaterPlane(m_pParams->m_viewerCloseToWaterPlane && m_pParams->m_viewerCloseToWaterVolume ? 0.0f : 1.0f,
-        m_pParams->m_viewerCloseToWaterVolume ? 2.0f * 2.0f : 0.0f,
-        0.0f,
-        0.0f);
-    static CCryNameR Param6Name("cViewerColorToWaterPlane");
-    ef->FXSetVSFloat(Param6Name, &viewerColorToWaterPlane, 1);
-
-    if (bCaustics)
-    {
-        Vec4 pCausticsParams = Vec4(0.0f /* Not used */, m_pParams->m_causticIntensity, m_pParams->m_causticTiling, m_pParams->m_causticHeight);
-
-        static CCryNameR m_pCausticParams("vCausticParams");
-        ef->FXSetPSFloat(m_pCausticParams,  &pCausticsParams, 1);
-    }
-
-    static CCryNameR volFogShadowRangeN("volFogShadowRange");
-    ef->FXSetPSFloat(volFogShadowRangeN, &volFogShadowRange, 1);
-
-    if (renderFogShadowWater)
-    {
-        //set world basis
-        float maskRTWidth = float(rd->GetWidth());
-        float maskRTHeight = float(rd->GetHeight());
-
-        Vec4 vScreenScale(1.0f / maskRTWidth, 1.0f / maskRTHeight, 0.0f, 0.0f);
-
-        Vec4r vWBasisX, vWBasisY, vWBasisZ, vCamPos;
-        Vec4 vParamValue, vMag;
-        CShadowUtils::ProjectScreenToWorldExpansionBasis(rd->m_IdentityMatrix, rd->GetCamera(), Vec2(rd->m_TemporalJitterClipSpace.x, rd->m_TemporalJitterClipSpace.y), maskRTWidth, maskRTHeight, vWBasisX, vWBasisY, vWBasisZ, vCamPos, true, NULL);
-
-        Vec4 vWorldBasisX = vWBasisX;
-        Vec4 vWorldBasisY = vWBasisY;
-        Vec4 vWorldBasisZ = vWBasisZ;
-        Vec4 vCameraPos = vCamPos;
-
-        static CCryNameR m_pScreenScale("ScreenScale");
-        static CCryNameR m_pCamPos("vCamPos");
-        static CCryNameR m_pWBasisX("vWBasisX");
-        static CCryNameR m_pWBasisY("vWBasisY");
-        static CCryNameR m_pWBasisZ("vWBasisZ");
-
-        ef->FXSetPSFloat(m_pScreenScale, &vScreenScale, 1);
-        ef->FXSetPSFloat(m_pCamPos, &vCameraPos, 1);
-        ef->FXSetPSFloat(m_pWBasisX, &vWorldBasisX, 1);
-        ef->FXSetPSFloat(m_pWBasisY, &vWorldBasisY, 1);
-        ef->FXSetPSFloat(m_pWBasisZ, &vWorldBasisZ, 1);
-    }
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    if (renderFogShadow)
-    {
-        Vec3 volFogShadowDarkeningP;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_DARKENING, volFogShadowDarkeningP);
-
-        Vec4 volFogShadowDarkening(volFogShadowDarkeningP, 0);
-        static CCryNameR volFogShadowDarkeningN("volFogShadowDarkening");
-        ef->FXSetPSFloat(volFogShadowDarkeningN, &volFogShadowDarkening, 1);
-
-        const float aSun = (1.0f - clamp_tpl(volFogShadowDarkeningP.y, 0.0f, 1.0f)) * 1.0f;
-        const float bSun = 1.0f - aSun;
-        const float aAmb = (1.0f - clamp_tpl(volFogShadowDarkeningP.z, 0.0f, 1.0f)) * 0.4f;
-        const float bAmb = 1.0f - aAmb;
-
-        Vec4 volFogShadowDarkeningSunAmb(aSun, bSun, aAmb, bAmb);
-        static CCryNameR volFogShadowDarkeningSunAmbN("volFogShadowDarkeningSunAmb");
-        ef->FXSetPSFloat(volFogShadowDarkeningSunAmbN, &volFogShadowDarkeningSunAmb, 1);
-    }
-#endif
-
-    if (m_drawWaterSurface || !m_pParams->m_viewerInsideVolume)
-    {
-        // copy vertices into dynamic VB
-        TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(m_pParams->m_pVertices, m_pParams->m_numVertices, 0);
-
-        // copy indices into dynamic IB
-        TempDynIB16::CreateFillAndBind(m_pParams->m_pIndices, m_pParams->m_numIndices);
-
-        // set vertex declaration
-        if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            // commit all render changes
-            rd->FX_Commit();
-
-            // draw
-            eRenderPrimitiveType eType = eptTriangleList;
-            if (CHWShader_D3D::s_pCurInstHS)
-            {
-                eType = ept3ControlPointPatchList;
-            }
-
-            rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-            rd->FX_DrawIndexedPrimitive(eType, 0, 0, m_pParams->m_numVertices, 0, m_pParams->m_numIndices);
-        }
-    }
-    else
-    {
-        // copy vertices into dynamic VB
-        TempDynVB<SVF_P3F_T3F> vb(gcpRendD3D);
-        vb.Allocate(4);
-        SVF_P3F_T3F* pVB = vb.Lock();
-
-        Vec3 coords[8];
-        rd->GetViewParameters().CalcVerts(coords);
-
-        pVB[0].p.x = -1;
-        pVB[0].p.y = 1;
-        pVB[0].p.z = 0.5f;
-        pVB[0].st = coords[5] - coords[1];
-
-        pVB[1].p.x = 1;
-        pVB[1].p.y = 1;
-        pVB[1].p.z = 0.5f;
-        pVB[1].st = coords[4] - coords[0];
-
-        pVB[2].p.x = -1;
-        pVB[2].p.y = -1;
-        pVB[2].p.z = 0.5f;
-        pVB[2].st = coords[6] - coords[2];
-
-        pVB[3].p.x = 1;
-        pVB[3].p.y = -1;
-        pVB[3].p.z = 0.5f;
-        pVB[3].st = coords[7] - coords[3];
-
-        vb.Unlock();
-        vb.Bind(0);
-        vb.Release();
-
-        // set vertex declaration
-        if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-        {
-            // commit all render changes
-            rd->FX_Commit();
-
-            rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-            rd->FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-        }
-
-        // reset matrices
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matView = origMatView;
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-    }
-
-    ef->FXEndPass();
-    ef->FXEnd();
-
-    gcpRendD3D->m_RP.m_FlagsShader_RT = nFlagsShaderRTSave;
-
-    return true;
-}
-
-void CREWaterOcean::Create(uint32 nVerticesCount, SVF_P3F_C4B_T2F* pVertices, uint32 nIndicesCount, const void* pIndices, uint32 nIndexSizeof)
-{
-    if (!nVerticesCount || !pVertices || !nIndicesCount || !pIndices || (nIndexSizeof != 2 && nIndexSizeof != 4))
-    {
-        return;
-    }
-
-    ReleaseOcean();
-
-    m_nVerticesCount = nVerticesCount;
-    m_nIndicesCount = nIndicesCount;
-    m_nIndexSizeof = nIndexSizeof;
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    // Create vertex buffer
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    {
-        D3DBuffer* pVertexBuffer = 0;
-        D3D11_BUFFER_DESC BufDesc;
-
-        uint32 size = nVerticesCount * sizeof(SVF_P3F_C4B_T2F);
-        BufDesc.ByteWidth = size;
-        BufDesc.Usage = D3D11_USAGE_DEFAULT;
-        BufDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-        BufDesc.CPUAccessFlags = 0;
-        BufDesc.MiscFlags = 0;
-
-        D3D11_SUBRESOURCE_DATA pInitData;
-        pInitData.pSysMem = pVertices;
-        pInitData.SysMemPitch = 0;
-        pInitData.SysMemSlicePitch = 0;
-
-        gcpRendD3D->m_DevMan.CreateD3D11Buffer(&BufDesc, &pInitData, &pVertexBuffer, "OceanMesh");
-        m_pVertices = pVertexBuffer;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    // Create index buffer
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    {
-        D3DBuffer* pIndexBuffer = 0;
-        const uint32 size = nIndicesCount * m_nIndexSizeof;
-
-        D3D11_BUFFER_DESC BufDesc;
-        BufDesc.ByteWidth = size;
-        BufDesc.Usage = D3D11_USAGE_DEFAULT;
-        BufDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-        BufDesc.CPUAccessFlags = 0;
-        BufDesc.MiscFlags = 0;
-
-        D3D11_SUBRESOURCE_DATA pInitData;
-        pInitData.pSysMem = pIndices;
-        pInitData.SysMemPitch = 0;
-        pInitData.SysMemSlicePitch = 0;
-
-        gcpRendD3D->m_DevMan.CreateD3D11Buffer(&BufDesc, &pInitData, &pIndexBuffer, "OceanMesh");
-        m_pIndices = pIndexBuffer;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CREWaterOcean::FrameUpdate()
-{
-    static bool bInitialize = true;
-    if (bInitialize)
-    {
-        WaterSimMgr()->Create(1.0, 1.0f, 1.0f);
-        bInitialize = false;
-    }
-
-    const int nGridSize = 64;
-
-    // Update Vertex Texture
-    if (!CTexture::IsTextureExist(CTexture::s_ptexWaterOcean))
-    {
-        CTexture::s_ptexWaterOcean->Create2DTexture(nGridSize, nGridSize, 1,
-            FT_DONT_RELEASE | FT_NOMIPS | FT_STAGE_UPLOAD,
-            0, eTF_R32G32B32A32F, eTF_R32G32B32A32F);
-    }
-
-    CTexture* pTexture = CTexture::s_ptexWaterOcean;
-
-    // Copy data..
-    if (CTexture::IsTextureExist(pTexture))
-    {
-        Vec4* pDispGrid = WaterSimMgr()->GetDisplaceGrid();
-        if (pDispGrid == nullptr)
-        {
-            return;
-        }
-
-        const auto oceanData = gEnv->p3DEngine->GetOceanAnimationParams();
-        const float fUpdateTime = 0.125f * gEnv->pTimer->GetCurrTime() * oceanData.fWavesSpeed;
-        int nFrameID = gRenDev->GetFrameID();
-        void* pRawPtr = NULL;
-        WaterSimMgr()->Update(nFrameID, fUpdateTime, false, pRawPtr);
-
-        uint32 width = nGridSize;
-        uint32 height = nGridSize;
-
-        STALL_PROFILER("update subresource")
-        CDeviceTexture * pDevTex = pTexture->GetDevTexture();
-        pDevTex->UploadFromStagingResource(0, [=](void* pData, [[maybe_unused]] uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-            {
-                cryMemcpy(pData, pDispGrid, 4 * width * height * sizeof(f32));
-                return true;
-            });
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CREWaterOcean::ReleaseOcean()
-{
-    ID3D11Buffer* pVertices = (ID3D11Buffer*)m_pVertices;
-    ID3D11Buffer* pIndices = (ID3D11Buffer*)m_pIndices;
-
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(pVertices);
-    m_pVertices = nullptr;
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(pIndices);
-    m_pIndices = nullptr;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CREWaterOcean::mfDraw(CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    if (!m_nVerticesCount || !m_nIndicesCount || !m_pVertices || !m_pIndices)
-    {
-        return false;
-    }
-
-    CD3D9Renderer* rd(gcpRendD3D);
-
-    if (CTexture::s_ptexWaterOcean)
-    {
-        CTexture::s_ptexWaterOcean->SetFilterMode(FILTER_LINEAR);
-        CTexture::s_ptexWaterOcean->SetClampingMode(0, 0, 1);
-        CTexture::s_ptexWaterOcean->UpdateTexStates();
-    }
-
-    if (CTexture::s_ptexWaterRipplesDDN)
-    {
-        CTexture::s_ptexWaterRipplesDDN->SetVertexTexture(true);
-        CTexture::s_ptexWaterRipplesDDN->SetFilterMode(FILTER_LINEAR);
-        CTexture::s_ptexWaterRipplesDDN->SetClampingMode(0, 0, 1);
-        CTexture::s_ptexWaterRipplesDDN->UpdateTexStates();
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-
-    uint64 nFlagsShaderRTprev = rd->m_RP.m_FlagsShader_RT;
-
-    uint32 nFlagsPF2prev = rd->m_RP.m_PersFlags2;
-    rd->m_RP.m_PersFlags2 &= ~(RBPF2_COMMIT_PF | RBPF2_COMMIT_CM);
-
-    // render
-    uint32 nPasses(0);
-
-
-    // set streams
-    HRESULT hr(S_OK);
-
-    STexStageInfo pPrevTexState0 = CTexture::s_TexStages[0];
-    STexStageInfo pPrevTexState1 = CTexture::s_TexStages[1];
-
-    STexState pState(FILTER_BILINEAR, false);
-    const int texStateID(CTexture::GetTexState(pState));
-
-
-    N3DEngineCommon::SOceanInfo& OceanInfo = gRenDev->m_p3DEngineCommon.m_OceanInfo;
-
-    uint32 nPrevStateOr = rd->m_RP.m_StateOr;
-    uint32 nPrevStateAnd = rd->m_RP.m_StateAnd;
-
-    ef->FXSetTechnique("Water");
-    ef->FXBegin(&nPasses, 0);
-
-    if (0 == nPasses)
-    {
-        return false;
-    }
-
-    if (gRenDev->GetViewParameters().vOrigin.z > OceanInfo.m_fWaterLevel)
-    {
-        rd->m_RP.m_StateAnd |= GS_DEPTHFUNC_MASK;
-        rd->m_RP.m_StateOr |= GS_DEPTHWRITE | GS_DEPTHFUNC_LEQUAL;
-    }
-
-    ef->FXBeginPass(0);
-
-    if (CTexture::s_ptexWaterOcean)
-    {
-        CTexture::s_ptexWaterOcean->SetVertexTexture(true);
-        CTexture::s_ptexWaterOcean->Apply(0, texStateID);
-        CTexture::s_ptexWaterOcean->SetVertexTexture(false);
-    }
-
-    if (CTexture::s_ptexWaterRipplesDDN)
-    {
-        CTexture::s_ptexWaterRipplesDDN->SetVertexTexture(true);
-        CTexture::s_ptexWaterRipplesDDN->Apply(1, texStateID);
-        CTexture::s_ptexWaterRipplesDDN->SetVertexTexture(false);
-    }
-
-    hr = rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F);
-    if (!FAILED(hr))
-    {
-        // commit all render changes
-        rd->FX_Commit();
-
-        hr = rd->FX_SetVStream(0, m_pVertices, 0, sizeof(SVF_P3F_C4B_T2F));
-        hr = rd->FX_SetIStream(m_pIndices, 0, (m_nIndexSizeof == 2 ? Index16 : Index32));
-
-        eRenderPrimitiveType eType = rd->m_bUseWaterTessHW ? eptTriangleList : eptTriangleStrip;
-#ifdef WATER_TESSELLATION_RENDERER
-        if (CHWShader_D3D::s_pCurInstHS)
-        {
-            eType = ept3ControlPointPatchList;
-        }
-#endif
-
-        rd->GetPerInstanceConstantBufferPool().SetConstantBuffer(rd->m_RP.m_RIs[0][0]);
-
-        rd->FX_DrawIndexedPrimitive(eType, 0, 0, m_nVerticesCount, 0, m_nIndicesCount);
-    }
-
-    ef->FXEndPass();
-    ef->FXEnd();
-
-    rd->m_RP.m_StateOr = nPrevStateOr;
-    rd->m_RP.m_StateAnd = nPrevStateAnd;
-
-    CTexture::s_TexStages[0] = pPrevTexState0;
-    CTexture::s_TexStages[1] = pPrevTexState1;
-
-    gcpRendD3D->FX_ResetPipe();
-
-    rd->m_RP.m_FlagsShader_RT = nFlagsShaderRTprev;
-    rd->m_RP.m_PersFlags2 = nFlagsPF2prev;
-
-    return true;
-}
-
-//=========================================================================================
-
-CREOcclusionQuery::~CREOcclusionQuery()
-{
-    mfReset();
-}
-
-void CREOcclusionQuery::mfReset()
-{
-    ID3D11Query* pVizQuery = (ID3D11Query*)m_nOcclusionID;
-    SAFE_RELEASE(pVizQuery);
-
-    m_nOcclusionID = 0;
-    m_nDrawFrame = 0;
-    m_nCheckFrame = 0;
-    m_nVisSamples = 0;
-    m_bSucceeded = false;
-}
-
-uint32 CREOcclusionQuery::m_nQueriesPerFrameCounter = 0;
-uint32 CREOcclusionQuery::m_nReadResultNowCounter = 0;
-uint32 CREOcclusionQuery::m_nReadResultTryCounter = 0;
-
-bool CREOcclusionQuery::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    PROFILE_FRAME(CREOcclusionQuery::mfDraw);
-
-    CD3D9Renderer* r = gcpRendD3D;
-
-    gRenDev->m_cEF.mfRefreshSystemShader("OcclusionTest", CShaderMan::s_ShaderOcclTest);
-
-    CShader* pSh = CShaderMan::s_ShaderOcclTest;
-    if (!pSh || pSh->m_HWTechniques.empty())
-    {
-        return false;
-    }
-
-    if (!(r->m_Features & RFT_OCCLUSIONTEST))
-    { // If not supported
-        m_nVisSamples = r->GetWidth() * r->GetHeight();
-        return true;
-    }
-
-
-    if (!m_nOcclusionID)
-    {
-        HRESULT hr;
-        ID3D11Query* pVizQuery = NULL;
-        D3D11_QUERY_DESC qdesc;
-        qdesc.MiscFlags = 0; //D3D11_QUERY_MISC_PREDICATEHINT;
-        qdesc.Query = D3D11_QUERY_OCCLUSION;
-        hr = r->GetDevice().CreateQuery(&qdesc, &pVizQuery);
-        if (pVizQuery)
-        {
-            m_nOcclusionID = (UINT_PTR)pVizQuery;
-        }
-    }
-
-
-    if (!m_nDrawFrame) // only allow queries update, if finished already with previous query
-    { // draw test box
-        if (m_nOcclusionID)
-        {
-            D3DQuery*  pVizQuery = (D3DQuery*)m_nOcclusionID;
-            r->GetDeviceContext().Begin(pVizQuery);
-
-            const t_arrDeferredMeshIndBuff& arrDeferredInds = r->GetDeferredUnitBoxIndexBuffer();
-            const t_arrDeferredMeshVertBuff& arrDeferredVerts = r->GetDeferredUnitBoxVertexBuffer();
-
-            //allocate vertices
-            TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(&arrDeferredVerts[0], arrDeferredVerts.size(), 0);
-
-            //allocate indices
-            TempDynIB16::CreateFillAndBind(&arrDeferredInds[0], arrDeferredInds.size());
-
-            Matrix44A origMatView = r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_matView;
-            Matrix34 mat;
-            mat.SetIdentity();
-            mat.SetScale(m_vBoxMax - m_vBoxMin, m_vBoxMin);
-
-            const Matrix44 cTransPosed = Matrix44(mat).GetTransposed();
-            r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_matView = cTransPosed * r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_matView;
-
-            uint32 nPasses;
-            pSh->FXSetTechnique("General");
-            pSh->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-            pSh->FXBeginPass(0);
-
-            int nPersFlagsSave = r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags;
-            int nObjFlagsSave = r->m_RP.m_ObjFlags;
-            CRenderObject* pCurObjectSave = r->m_RP.m_pCurObject;
-            CShader* pShaderSave = r->m_RP.m_pShader;
-            SShaderTechnique* pCurTechniqueSave = r->m_RP.m_pCurTechnique;
-
-            if (r->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F) == S_OK)
-            {
-                r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_FP_DIRTY;
-                r->m_RP.m_pCurObject = r->m_RP.m_pIdendityRenderObject;
-                r->m_RP.m_pShader = pSh;
-                r->m_RP.m_pCurTechnique = pSh->m_HWTechniques[0];
-                r->FX_SetState(GS_COLMASK_NONE | GS_DEPTHFUNC_LEQUAL);
-                r->SetCullMode(R_CULL_NONE);
-
-                r->FX_Commit();
-
-                r->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, arrDeferredVerts.size(), 0, arrDeferredInds.size());
-            }
-
-            pSh->FXEndPass();
-            pSh->FXEnd();
-
-            r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_matView = origMatView;
-            r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags = nPersFlagsSave;
-            r->m_RP.m_ObjFlags = nObjFlagsSave;
-            r->m_RP.m_pCurObject = pCurObjectSave;
-            r->m_RP.m_pShader = pShaderSave;
-            r->m_RP.m_pCurTechnique = pCurTechniqueSave;
-
-            r->GetDeviceContext().End(pVizQuery);
-
-            CREOcclusionQuery::m_nQueriesPerFrameCounter++;
-            m_nDrawFrame = 1;
-        }
-
-        m_bSucceeded = false;
-        // m_nDrawFrame = nFrame;
-    }
-
-    return true;
-}
-
-bool CREOcclusionQuery::mfReadResult_Now()
-{
-    int nFrame = gcpRendD3D->GetFrameID();
-
-    ID3D11Query* pVizQuery = (ID3D11Query*)m_nOcclusionID;
-    if (pVizQuery)
-    {
-        HRESULT hRes = S_FALSE;
-        while (hRes == S_FALSE)
-        {
-            hRes = gcpRendD3D->GetDeviceContext().GetData(pVizQuery, (void*) &m_nVisSamples, sizeof(uint64), 0);
-        }
-
-        if (hRes == S_OK)
-        {
-            m_nDrawFrame = 0;
-            m_nCheckFrame = nFrame;
-        }
-    }
-
-    m_nReadResultNowCounter++;
-
-    m_bSucceeded = (m_nCheckFrame == nFrame);
-    return m_bSucceeded;
-}
-
-bool CREOcclusionQuery::mfReadResult_Try(uint32 nDefaultNumSamples)
-{
-    return gRenDev->m_pRT->RC_OC_ReadResult_Try(nDefaultNumSamples, this);
-}
-bool CREOcclusionQuery::RT_ReadResult_Try([[maybe_unused]] uint32 nDefaultNumSamples)
-{
-    PROFILE_FRAME(CREOcclusionQuery::mfReadResult_Try);
-
-    int nFrame = gcpRendD3D->GetFrameID();
-
-    ID3D11Query* pVizQuery = (ID3D11Query*)m_nOcclusionID;
-    if (pVizQuery)
-    {
-        HRESULT hRes = S_FALSE;
-        hRes = gcpRendD3D->GetDeviceContext().GetData(pVizQuery, (void*) &m_nVisSamples, sizeof(uint64), D3D11_ASYNC_GETDATA_DONOTFLUSH);
-
-        if (hRes == S_OK)
-        {
-            m_nDrawFrame = 0;
-            m_nCheckFrame = nFrame;
-        }
-    }
-
-    m_nReadResultTryCounter++;
-
-#ifdef DO_RENDERLOG
-    if (!m_nVisSamples)
-    {
-        if (CRenderer::CV_r_log)
-        {
-            gRenDev->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "OcclusionQuery: Water is not visible\n");
-        }
-    }
-    else
-    {
-        if (CRenderer::CV_r_log)
-        {
-            gRenDev->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "OcclusionQuery: Water is visible (%d samples)\n", m_nVisSamples);
-        }
-    }
-#endif
-
-    m_bSucceeded = (m_nCheckFrame == nFrame);
-    return m_bSucceeded;
-}
-
-//===================================================================================
-
-void CRenderMesh::DrawImmediately()
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    HRESULT hr = rd->FX_SetVertexDeclaration(0, _GetVertexFormat());
-
-    if (FAILED(hr))
-    {
-        CRY_ASSERT(!"CRenderMesh::DrawImmediately failed");
-        return;
-    }
-
-    // set vertex and index buffer
-    CheckUpdate(0);
-
-    size_t vbOffset(0);
-    size_t ibOffset(0);
-    D3DBuffer* pVB = rd->m_DevBufMan.GetD3D(GetVBStream(VSF_GENERAL), &vbOffset);
-    D3DBuffer* pIB = rd->m_DevBufMan.GetD3D(GetIBStream(), &ibOffset);
-    assert(pVB);
-    assert(pIB);
-
-    if (!pVB || !pIB)
-    {
-        assert(!"CRenderMesh::DrawImmediately failed");
-        return;
-    }
-
-    hr =  rd->FX_SetVStream(0, pVB, vbOffset, GetStreamStride(VSF_GENERAL));
-    hr = rd->FX_SetIStream(pIB, ibOffset, (sizeof(vtx_idx) == 2 ? Index16 : Index32));
-
-    // draw indexed mesh
-    rd->FX_DrawIndexedPrimitive(GetPrimitiveType(), 0, 0, GetNumVerts(), 0, GetNumInds());
-}
-
-//=========================================================================================
-
-bool CREHDRProcess::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-    if (!(rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_HDR))
-    {
-        return false;
-    }
-    assert(rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_HDR || rd->m_RP.m_CurState & GS_WIREFRAME);
-
-    rd->FX_HDRPostProcessing();
-    return true;
-}
-
-bool CREBeam::mfDraw(CShader* ef, [[maybe_unused]] SShaderPass* sl)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DRenderRE_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    CD3D9Renderer* rd = gcpRendD3D;
-    int nThreadID = rd->m_RP.m_nProcessThreadID;
-
-    if (SRendItem::m_RecurseLevel[nThreadID] != 0)
-    {
-        return false;
-    }
-
-    PROFILE_LABEL_SCOPE("LIGHT BEAM");
-
-    STexState pState(FILTER_BILINEAR, true);
-    const int texStateID(CTexture::GetTexState(pState));
-
-    STexState pStatePoint(FILTER_POINT, true);
-    const int texStateIDPoint(CTexture::GetTexState(pStatePoint));
-
-    bool bViewerInsideCone = false;
-
-    CTexture* pLowResRT = CTexture::s_ptexZTargetScaled2; // CTexture::s_ptexBackBufferScaled[1];
-    CTexture* pLowResRTDepth = CTexture::s_ptexDepthBufferQuarter;
-
-    SDepthTexture D3dDepthSurface;
-    SDepthTexture* pCurrDepthSurf = NULL;
-
-#if D3DRENDERRE_CPP_TRAIT_MFDRAW_SETDEPTHSURF // Depth surface nastiness
-    if (CTexture::IsTextureExist(pLowResRTDepth))
-    {
-        D3dDepthSurface.nWidth = pLowResRTDepth->GetWidth();
-        D3dDepthSurface.nHeight = pLowResRTDepth->GetHeight();
-        D3dDepthSurface.nFrameAccess = -1;
-        D3dDepthSurface.bBusy = false;
-
-        D3dDepthSurface.pTex = pLowResRTDepth;
-        D3dDepthSurface.pSurf = pLowResRTDepth->GetDeviceDepthStencilSurf();
-        D3dDepthSurface.pTarget = pLowResRTDepth->GetDevTexture()->Get2DTexture();
-
-        pCurrDepthSurf = &D3dDepthSurface;
-    }
-#endif
-
-    CRenderObject* pObj = rd->m_RP.m_pCurObject;
-    SRenderObjData* pOD = pObj->GetObjData();
-    uint16 nLightID = pOD->m_nLightID;
-    SRenderLight* pDL = rd->EF_GetDeferredLightByID(nLightID);
-
-    bool bCastsShadows = ((pDL->m_Flags & (DLF_CASTSHADOW_MAPS | DLF_PROJECT)) == (DLF_CASTSHADOW_MAPS | DLF_PROJECT)) ? true : false;
-
-    const CRenderObject::SInstanceInfo& rInstInfo = pObj->m_II;
-
-    Matrix34A objMatInv = rInstInfo.m_Matrix.GetInverted();
-
-    Matrix44A mLightProj, mLightView;
-    CShadowUtils::GetCubemapFrustumForLight(pDL, 0, pDL->m_fLightFrustumAngle * 2.f, &mLightProj, &mLightView, true);
-
-    Matrix44 projMat = mLightView * mLightProj;
-
-    const CameraViewParameters& RCam = gRenDev->GetViewParameters();
-
-    float fLightAngle = pDL->m_fLightFrustumAngle;
-    float fAngleCoeff = 1.0f / tan_tpl((90.0f - fLightAngle) * gf_PI / 180.0f);
-    float fNear = pDL->m_fProjectorNearPlane;
-    float fFar = pDL->m_fRadius;
-    Vec3 vLightPos = pDL->m_Origin;
-    Vec3 vAxis = rInstInfo.m_Matrix.GetColumn0();
-
-    float fSin, fCos;
-    sincos_tpl(fLightAngle * gf_PI / 180.0f, &fSin, &fCos);
-
-    Vec4 vLightParams = Vec4(fFar, fAngleCoeff, fNear, fFar);
-    Vec4 vSphereParams = Vec4(vLightPos, fFar);
-    Vec4 vConeParams = Vec4(vAxis, fCos);
-    Vec4 pLightPos = Vec4(vLightPos, 1.0f);
-    Vec4 cLightDiffuse = Vec4(pDL->m_Color.r, pDL->m_Color.g, pDL->m_Color.b, pDL->m_SpecMult);
-
-    Vec3 vEye = RCam.vOrigin;
-
-    Vec3 vCoords[9];  // Evaluate campos to near plane verts as a sphere.
-    RCam.CalcVerts(vCoords);
-    vCoords[4] = vEye;
-    AABB camExtents(vCoords, 5);
-
-    float fRadius = camExtents.GetRadius();
-    Vec3 vCentre = camExtents.GetCenter();
-
-    float fCosSq = fCos * fCos;
-
-    Vec3 vVertToSphere = vCentre - vLightPos;
-    Vec3 d = vVertToSphere + vAxis * (fRadius / fSin);
-    float dSq = d.dot(d);
-    float e = d.dot(vAxis);
-    float eSq = e * e;
-
-    if ((e > 0.0f) && (eSq >= (dSq * fCosSq)))
-    {
-        dSq = vVertToSphere.dot(vVertToSphere);
-        e = vVertToSphere.dot(vAxis);
-
-        if ((e < (fFar + fRadius)) && (e > (fNear - fRadius))) // test capping planes
-        {
-            bViewerInsideCone = true;
-        }
-    }
-
-    Vec4 cEyePosVec(vEye, !bViewerInsideCone ? 1 : 0);
-
-    Vec4 vShadowCoords = Vec4(0.0f, 0.0f, 1.0f, 1.0f);
-
-    CTexture* shadowTexture = nullptr;
-    CTexture* projectedTexture = nullptr;
-
-    if (bCastsShadows)
-    {
-        const ShadowMapFrustum& shadowFrustum = CShadowUtils::GetFirstFrustum(nLightID);
-
-        if (shadowFrustum.bUseShadowsPool)
-        {
-            shadowTexture = CTexture::s_ptexRT_ShadowPool;
-            float width = CTexture::s_ptexRT_ShadowPool->GetWidth();
-            float height = CTexture::s_ptexRT_ShadowPool->GetHeight();
-            vShadowCoords = Vec4(shadowFrustum.packX[0] / width, shadowFrustum.packY[0] / height, shadowFrustum.packWidth[0] / width, shadowFrustum.packHeight[0] / height);
-        }
-    }
-
-    if (pDL->m_pLightImage)
-    {
-        projectedTexture = (CTexture*)pDL->m_pLightImage;
-    }
-
-    Vec4 sampleOffsets[5];
-    {
-        const float tU = 1.0f / (float)pLowResRT->GetWidth();
-        const float tV = 1.0f / (float)pLowResRT->GetHeight();
-
-        sampleOffsets[0] = Vec4(0, 0, 0, 0);
-        sampleOffsets[1] = Vec4(0, -tV, tU, tV);
-        sampleOffsets[2] = Vec4(-tU, 0, -tU, tV);
-        sampleOffsets[3] = Vec4(tU, 0, tU, -tV);
-        sampleOffsets[4] = Vec4(0, tV, -tU, -tV);
-    }
-
-    Vec4 vMisc = Vec4(1.0f / (float)gcpRendD3D->m_nShadowPoolWidth, 1.0f / (float)gcpRendD3D->m_nShadowPoolHeight, 0.0f, 0.0f);
-
-    const int ZPass = 2; // passes can be buggy, use manual ordering
-    const int VolumetricPass = 1;
-    const int FinalPass = 0;
-
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3]);
-
-    if (bCastsShadows)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    //Setup geometry
-    const int nNumSides = BEAM_RE_CONE_SIDES;
-    const uint32 c_numBBVertices(nNumSides * 2 + 2);
-    SVF_P3F_C4B_T2F bbVertices[c_numBBVertices];
-
-    const uint32 c_numBBIndices((nNumSides) * 6 * 2);
-    uint16 bbIndices[c_numBBIndices];
-
-    SetupGeometry(&bbVertices[0], &bbIndices[0], fAngleCoeff, fNear, fFar);
-
-    // copy vertices into dynamic VB
-    TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(bbVertices, c_numBBVertices, 0);
-
-    // copy indices into dynamic IB
-    TempDynIB16::CreateFillAndBind(bbIndices, c_numBBIndices);
-
-    uint32 nPasses = 0;
-    ef->FXBegin(&nPasses, FEF_DONTSETSTATES);
-
-    assert(nPasses == (ZPass + 1));
-
-    int nStartPass = (bViewerInsideCone || !pCurrDepthSurf) ? VolumetricPass : ZPass;
-
-    for (int nCurPass = nStartPass; nCurPass > -1; nCurPass--)
-    {
-        ef->FXBeginPass(nCurPass);
-
-        //set world basis
-        float maskRTWidthL = pLowResRT->GetWidth();
-        float maskRTHeightL = pLowResRT->GetHeight();
-        float maskRTWidthH = rd->GetWidth();
-        float maskRTHeightH = rd->GetHeight();
-        Vec4 vScreenScale(1.0f / maskRTWidthL, 1.0f / maskRTHeightL, 1.0f / maskRTWidthH, 1.0f / maskRTHeightH);
-
-        if (nCurPass == nStartPass && pLowResRT)
-        {
-            rd->FX_PushRenderTarget(0, pLowResRT, pCurrDepthSurf, -1, false, 1);
-            rd->FX_SetColorDontCareActions(0, false, false); //Check gmem path for performance when using this pass.
-            rd->FX_ClearTarget(pLowResRT, Clr_Transparent);
-            rd->FX_ClearTarget(pCurrDepthSurf, CLEAR_ZBUFFER);
-            
-        }
-
-        uint32 nState = (nCurPass == FinalPass) ? (GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA) : 0;
-
-        if (bViewerInsideCone)
-        {
-            rd->SetCullMode(R_CULL_FRONT);
-        }
-        else
-        {
-            rd->SetCullMode(R_CULL_BACK);
-        }
-
-        if (bViewerInsideCone || !pCurrDepthSurf)
-        {
-            nState |= GS_NODEPTHTEST;
-        }
-        else
-        {
-            nState |= (nCurPass == ZPass) ? (GS_DEPTHWRITE | GS_COLMASK_NONE) : 0;
-        }
-
-        rd->FX_SetState(nState);
-
-        // set vs constants
-        if (nCurPass == VolumetricPass)
-        {
-            ef->FXSetVSFloat(m_eyePosInWSName, &cEyePosVec, 1);
-
-            ef->FXSetPSFloat(m_eyePosInWSName, &cEyePosVec, 1);
-            ef->FXSetPSFloat(m_projMatrixName, (const Vec4*)&projMat.m00, 4);
-            ef->FXSetPSFloat(m_shadowCoordsName, (const Vec4*)&vShadowCoords, 1);
-            ef->FXSetPSFloat(m_lightParamsName, &vLightParams, 1);
-            ef->FXSetPSFloat(m_sphereParamsName, &vSphereParams, 1);
-            ef->FXSetPSFloat(m_coneParamsName, &vConeParams, 1);
-            ef->FXSetPSFloat(m_lightPosName, &pLightPos, 1);
-            ef->FXSetPSFloat(m_miscOffsetsName, &vMisc, 1);
-        }
-        else if (nCurPass == FinalPass)
-        {
-            ef->FXSetPSFloat(m_sampleOffsetsName, &sampleOffsets[0], 5);
-        }
-
-        ef->FXSetPSFloat(m_lightDiffuseName, &cLightDiffuse, 1);
-        ef->FXSetPSFloat(m_screenScaleName, &vScreenScale, 1);
-
-        if (nCurPass == FinalPass && pLowResRT)
-        {
-            pLowResRT->Apply(7, texStateID);
-        }
-        if (projectedTexture)
-        {
-            projectedTexture->Apply(5, texStateID);
-        }
-        if (bCastsShadows && shadowTexture)
-        {
-            shadowTexture->Apply(6, texStateID); // bilinear is a hack, but looks better
-        }
-        //pShadowTex->Apply(6, texStateIDPoint);
-
-        rd->m_RP.m_nCommitFlags |= FC_MATERIAL_PARAMS;
-
-        // commit all render changes
-        rd->FX_Commit();
-
-        // set vertex declaration and streams of skydome
-        if (!FAILED(rd->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            // draw skydome
-            rd->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, c_numBBVertices, 0, c_numBBIndices);
-        }
-
-        if ((nCurPass == VolumetricPass) && pLowResRT)
-        {
-            rd->FX_PopRenderTarget(0);
-        }
-    }
-    return true;
-#endif
-}
-
-bool CREGameEffect::mfDraw(CShader* ef, SShaderPass* sfm)
-{
-    CRY_ASSERT_MESSAGE(gRenDev->m_pRT->IsRenderThread(), "Trying to render from wrong thread");
-    CRY_ASSERT(ef);
-    CRY_ASSERT(sfm);
-
-    if (m_pImpl)
-    {
-#ifndef _RELEASE
-        _smart_ptr<IMaterial> pMaterial = (gRenDev->m_RP.m_pCurObject) ? (gRenDev->m_RP.m_pCurObject->m_pCurrMaterial) : NULL;
-        const char* pEffectName = (pMaterial) ? (PathUtil::GetFileName(pMaterial->GetName())) : "GameEffectRenderElement";
-        PROFILE_LABEL_SCOPE(pEffectName);
-#endif
-
-        uint32 passCount    = 0;
-        bool successFlag    = true;
-
-        // Begin drawing
-        ef->FXBegin(&passCount, 0);
-        if (passCount > 0)
-        {
-            // Begin pass
-            ef->FXBeginPass(0);
-
-            // Draw element
-            successFlag = m_pImpl->mfDraw(ef, sfm, gRenDev->m_RP.m_pCurObject);
-
-            // End pass
-            ef->FXEndPass();
-        }
-        // End drawing
-        ef->FXEnd();
-
-        return successFlag;
-    }
-    return false;
-}
-
-#if defined(USE_GEOM_CACHES)
-
-// Each call of CREGeomCache::mfDraw render *all* meshes that share the same material in the geom cache. See CGeomCacheRenderNode::Render
-bool CREGeomCache::mfDraw(CShader* ef, SShaderPass* sfm)
-{
-    PROFILE_FRAME(CREGeomCache::mfDraw);
-
-    const uint numMeshes = m_meshRenderData.size();
-    CD3D9Renderer* const pRenderer = gcpRendD3D;
-
-    SRenderPipeline& rRP = pRenderer->m_RP;
-    SThreadInfo& threadInfo = rRP.m_TI[rRP.m_nProcessThreadID];
-
-    CRenderObject* const pRenderObject = rRP.m_pCurObject;
-    Matrix34A matrix = pRenderObject->m_II.m_Matrix;
-    CHWShader_D3D* const pCurVS = (CHWShader_D3D*)sfm->m_VShader;
-
-    const bool bIsShadowPass = (threadInfo.m_PersFlags & RBPF_SHADOWGEN) != 0;
-    const CCamera& camera = bIsShadowPass ? rRP.m_ShadowInfo.m_pCurShadowFrustum->FrustumPlanes[rRP.m_ShadowInfo.m_nOmniLightSide] : gRenDev->GetCamera();
-
-    Matrix44A prevMatrix;
-
-    CMotionBlur::GetPrevObjToWorldMat(rRP.m_pCurObject, prevMatrix);
-
-    const uint64 oldFlagsShader_RT = rRP.m_FlagsShader_RT;
-    uint64 flagsShader_RT = rRP.m_FlagsShader_RT;
-    const int oldFlagsPerFlush = rRP.m_FlagsPerFlush;
-    bool bResetVertexDecl = false;
-
-    for (uint nMesh = 0; nMesh < numMeshes; ++nMesh)
-    {
-        const SMeshRenderData& meshData = m_meshRenderData[nMesh];
-
-        CRenderMesh* const pRenderMesh = static_cast<CRenderMesh*>(meshData.m_pRenderMesh.get());
-        const uint numInstances = meshData.m_instances.size();
-
-        if (pRenderMesh && numInstances > 0)
-        {
-            PROFILE_LABEL_SHADER(pRenderMesh->GetSourceName() ? pRenderMesh->GetSourceName() : "Unknown mesh-resource name");
-
-            const CRenderMesh* const pVertexContainer = pRenderMesh->_GetVertexContainer();
-
-            if (!pVertexContainer->_HasVBStream(VSF_GENERAL) || !pRenderMesh->_HasIBStream())
-            {
-                // Should never happen. Video buffer is missing
-                continue;
-            }
-
-            const bool bHasVelocityStream = pRenderMesh->_HasVBStream(VSF_VERTEX_VELOCITY);
-            const bool bIsMotionBlurPass = (rRP.m_PersFlags2 & RBPF2_MOTIONBLURPASS) != 0;
-
-            pRenderMesh->BindStreamsToRenderPipeline();
-
-            rRP.m_RendNumVerts = pRenderMesh->GetNumVerts();
-
-            if (ef->m_HWTechniques.Num() && pRenderMesh->CanRender())
-            {
-                const TRenderChunkArray& chunks = pRenderMesh->GetChunks();
-                const uint numChunks = chunks.size();
-
-                for (uint i = 0; i < numChunks; ++i)
-                {
-                    const CRenderChunk& chunk = chunks[i];
-                    if (chunk.m_nMatID != m_materialId)
-                    {
-                        continue;
-                    }
-
-                    rRP.m_FirstIndex = chunk.nFirstIndexId;
-                    rRP.m_RendNumIndices = chunk.nNumIndices;
-
-#if defined(HW_INSTANCING_ENABLED) && D3DRENDERRE_CPP_TRAIT_MFDRAW_USEINSTANCING
-                    const bool bUseInstancing = (CRenderer::CV_r_geominstancing != 0) && (numInstances > CRenderer::CV_r_GeomCacheInstanceThreshold);
-#else
-                    const bool bUseInstancing = false;
-#endif
-
-                    TempDynInstVB instVB(gcpRendD3D);
-                    uint numInstancesToDraw = 0;
-                    byte* __restrict pInstanceMatricesVB = NULL;
-
-                    // Note: Geom cache instancing is a horrible mess at the moment, because it re-uses
-                    // FX_DrawInstances which supports both constant based and attribute based instancing
-                    // and all platforms.
-                    //
-                    // This only sets up the data structures for D3D11 attribute based
-                    // instancing. Need to clean this up later and ideally use constant based instancing.
-
-                    const uint64 lastFlagsShader_RT = rRP.m_FlagsShader_RT;
-                    rRP.m_FlagsShader_RT = flagsShader_RT | (bUseInstancing ? g_HWSR_MaskBit[HWSR_INSTANCING_ATTR] : 0);
-                    if (lastFlagsShader_RT != rRP.m_FlagsShader_RT)
-                    {
-                        pCurVS->mfSet(bUseInstancing ? HWSF_INSTANCED : 0);
-                    }
-
-                    CHWShader_D3D::SHWSInstance* pVPInst = pCurVS->m_pCurInst;
-                    int32 nUsedAttr = 3, nInstAttrMask = 0;
-                    byte Attributes[32];
-
-                    if (bUseInstancing)
-                    {
-                        pVPInst->GetInstancingAttribInfo(Attributes, nUsedAttr, nInstAttrMask);
-                        instVB.Allocate(numInstances, nUsedAttr * INST_PARAM_SIZE);
-                        pInstanceMatricesVB = (byte*)(instVB.Lock());
-                    }
-
-                    const uint32 nStride = nUsedAttr * sizeof(float[4]);
-
-                    // Fill the stream 3 for per-instance data
-                    byte* pWalkData = pInstanceMatricesVB;
-                    for (uint nInstance = 0; nInstance < numInstances; ++nInstance)
-                    {
-                        const SMeshInstance& instance = meshData.m_instances[nInstance];
-
-                        Matrix34A pieceMatrix = matrix * instance.m_matrix;
-
-                        AABB pieceWorldAABB;
-                        pieceWorldAABB.SetTransformedAABB(pieceMatrix, instance.m_aabb);
-                        if (!camera.IsAABBVisible_F(pieceWorldAABB))
-                        {
-                            continue;
-                        }
-
-                        // Needs to be in this scope, because it's used by FX_DrawIndexedMesh
-                        Matrix44A prevPieceMatrix = prevMatrix * instance.m_prevMatrix;
-
-                        if (bIsMotionBlurPass)
-                        {
-                            const float fThreshold = 0.01f;
-                            if (bUseInstancing || (rRP.m_nBatchFilter & FB_Z) || !Matrix34::IsEquivalent(pieceMatrix, Matrix34(prevPieceMatrix), fThreshold) || bHasVelocityStream)
-                            {
-                                rRP.m_FlagsPerFlush |= RBSI_CUSTOM_PREVMATRIX;
-                                rRP.m_pPrevMatrix = &prevPieceMatrix;
-                            }
-                            else
-                            {
-                                // Don't draw pieces without any motion in motion blur pass
-                                continue;
-                            }
-                        }
-
-                        if (!bUseInstancing)
-                        {
-                            pRenderer->GetPerInstanceConstantBufferPool().UpdateConstantBuffer([&](void* mappedData)
-                                {
-                                    *reinterpret_cast<Matrix34A*>(mappedData) = pieceMatrix;
-                                }, threadInfo.m_RealTime);
-
-                            pRenderObject->m_II.m_Matrix = pieceMatrix;
-                            pCurVS->UpdatePerInstanceConstantBuffer();
-
-                            // Check if instancing messed with vertex declaration
-                            if (bResetVertexDecl)
-                            {
-                                pRenderer->FX_SetVertexDeclaration(rRP.m_FlagsStreams_Decl, rRP.m_CurVFormat);
-                                bResetVertexDecl = false;
-                            }
-
-                            pRenderer->FX_DrawIndexedMesh(pRenderMesh->GetPrimitiveType());
-                        }
-                        else
-                        {
-                            *reinterpret_cast<Matrix34A*>(pWalkData) = pieceMatrix;
-
-                            if (pVPInst->m_nParams_Inst >= 0)
-                            {
-                                SCGParamsGroup& Group = CGParamManager::s_Groups[pVPInst->m_nParams_Inst];
-                                pCurVS->UpdatePerInstanceConstants(eHWSC_Vertex, Group.pParams, Group.nParams, pWalkData);
-                            }
-
-                            pWalkData += nStride;
-                            ++numInstancesToDraw;
-                        }
-                    }
-
-                    if (bUseInstancing)
-                    {
-                        instVB.Unlock();
-                        instVB.Bind(3, nUsedAttr * INST_PARAM_SIZE);
-                        instVB.Release();
-
-                        pCurVS->UpdatePerInstanceConstantBuffer();
-                        pRenderer->FX_DrawInstances(ef, sfm, 0, 0, numInstancesToDraw - 1, nUsedAttr, pInstanceMatricesVB, nInstAttrMask, Attributes, 0);
-                        bResetVertexDecl = true;
-                    }
-                }
-            }
-        }
-    }
-
-    // Reset matrix to original value for cases when render object gets reused
-    pRenderObject->m_II.m_Matrix = matrix;
-    rRP.m_FlagsShader_RT = oldFlagsShader_RT;
-    rRP.m_FlagsPerFlush = oldFlagsPerFlush;
-
-    return true;
-}
-
-#endif
-
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderThread.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderThread.cpp
deleted file mode 100644
index ee3939f665..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DRenderThread.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-
-#include "D3DStereo.h"
-
-#include "../Common/Textures/TextureManager.h"
-
-//=======================================================================
-
-bool CD3D9Renderer::RT_CreateDevice()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    
-#if (defined(WIN32) || defined(WIN64)) && !defined(SUPPORT_DEVICE_INFO)
-    if (!m_bShaderCacheGen && !SetWindow(m_width, m_height, m_bFullScreen, m_hWnd))
-    {
-        return false;
-    }
-#endif
-
-    return SetRes();
-}
-
-void CD3D9Renderer::RT_ReleaseVBStream(void* pVB, [[maybe_unused]] int nStream)
-{
-    D3DBuffer* pBuf = (D3DBuffer*)pVB;
-    SAFE_RELEASE(pBuf);
-}
-void CD3D9Renderer::RT_ReleaseCB(void* pVCB)
-{
-    AzRHI::ConstantBuffer* pCB = (AzRHI::ConstantBuffer*)pVCB;
-    SAFE_RELEASE(pCB);
-}
-
-void CD3D9Renderer::RT_ClearTarget(ITexture* tex, const ColorF& color)
-{
-    CTexture* pTex = reinterpret_cast<CTexture*>(tex);
-    if (pTex->GetFlags() & FT_USAGE_DEPTHSTENCIL)
-    {
-        D3DDepthSurface* pSurf = reinterpret_cast<D3DDepthSurface*>(pTex->GetDeviceDepthStencilSurf());
-        if (!pSurf)
-        {
-            return;
-        }
-
-        // NOTE: normalized depth in color.r and unnormalized stencil in color.g
-        GetDeviceContext().ClearDepthStencilView(pSurf, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, color.r, (uint8)color.g);
-    }
-    else
-    {
-        D3DSurface* pSurf = pTex->GetSurface(0, 0);
-        if (!pSurf)
-        {
-            return;
-        }
-
-        GetDeviceContext().ClearRenderTargetView(pSurf, (float*)&color);
-    }
-}
-
-void CD3D9Renderer::RT_DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, uint32 nVerts, uint32 nInds, const PublicRenderPrimitiveType nPrimType)
-{
-    FX_SetFPMode();
-
-    if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        // Create the temp buffer after we try to set the vertex declaration otherwise
-        // if that fails we won't call FX_DrawPrimitive that on a platform level
-        // cleans up some of the memory stuff that the TempDynVB creates
-        TempDynVB<SVF_P3F_C4B_T2F>::CreateFillAndBind(pBuf, nVerts, 0);
-        if (pInds)
-        {
-            TempDynIB16::CreateFillAndBind(pInds, nInds);
-            FX_DrawIndexedPrimitive(GetInternalPrimitiveType(nPrimType), 0, 0, nVerts, 0, nInds);
-        }
-        else
-        {
-            FX_DrawPrimitive(GetInternalPrimitiveType(nPrimType), 0, nVerts);
-        }
-    }
-}
-
-void CD3D9Renderer::RT_DrawDynVBUI(SVF_P2F_C4B_T2F_F4B* pBuf, uint16* pInds, uint32 nVerts, uint32 nInds, const PublicRenderPrimitiveType nPrimType)
-{
-    FX_SetUIMode();
-
-    if (!FAILED(FX_SetVertexDeclaration(0, eVF_P2F_C4B_T2F_F4B)))
-    {
-        // Create the temp buffer after we try to set the vertex declaration otherwise
-        // if that fails we won't call FX_DrawPrimitive that on a platform level
-        // cleans up some of the memory stuff that the TempDynVB creates
-        TempDynVB<SVF_P2F_C4B_T2F_F4B>::CreateFillAndBind(pBuf, nVerts, 0);
-        if (pInds)
-        {
-            TempDynIB16::CreateFillAndBind(pInds, nInds);
-            FX_DrawIndexedPrimitive(GetInternalPrimitiveType(nPrimType), 0, 0, nVerts, 0, nInds);
-        }
-        else
-        {
-            FX_DrawPrimitive(GetInternalPrimitiveType(nPrimType), 0, nVerts);
-        }
-    }
-}
-
-void CD3D9Renderer::RT_Draw2dImageInternal(C2dImage* images, uint32 numImages, bool stereoLeftEye)
-{
-    SetCullMode(R_CULL_DISABLE);
-
-    float maxParallax = 0;
-    float screenDist = 0;
-
-    if (GetS3DRend().IsStereoEnabled())
-    {
-        maxParallax = GetS3DRend().GetMaxSeparationScene();
-        screenDist = GetS3DRend().GetZeroParallaxPlaneDist();
-    }
-
-    // Flush the current viewports.
-    // The GetViewport call below uses either m_MainRTViewport or m_NewViewport, then the image scaling code 
-    // (ScaleCoordX/ScaleCoordY) uses m_CurViewport, so this could lead to different viewport settings being used unless we flush.
-    FX_SetViewport();
-
-    // Set orthographic projection
-    Matrix44A origMatProj = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-    Matrix44A* m = &m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-    int vx, vy, vw, vh;
-    GetViewport(&vx, &vy, &vw, &vh);
-    mathMatrixOrthoOffCenterLH(m, (float)vx, (float)vw, (float)vh, (float)vy, 0.0f, 1.0f);
-    Matrix44A origMatView = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-    m = &m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-
-    // Create dynamic geometry
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-    vb.Allocate(numImages * 4);
-    SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-    for (uint32 i = 0; i < numImages; ++i)
-    {
-        C2dImage& img = images[i];
-        uint32 baseIdx = i * 4;
-
-        float parallax = 0;
-        if (img.stereoDepth > 0)
-        {
-            parallax = 800 * maxParallax * (1 - screenDist / img.stereoDepth);
-        }
-
-        float xpos = (float)ScaleCoordX(img.xpos + parallax * (stereoLeftEye ? -1 : 1));
-        float w = (float)ScaleCoordX(img.w);
-        float ypos = (float)ScaleCoordY(img.ypos);
-        float h = (float)ScaleCoordY(img.h);
-
-        if (img.angle != 0)
-        {
-            float xsub = (float)(xpos + w / 2.0f);
-            float ysub = (float)(ypos + h / 2.0f);
-
-            float x, y, x1, y1;
-            float mcos = cos_tpl(DEG2RAD(img.angle));
-            float msin = sin_tpl(DEG2RAD(img.angle));
-
-            x = xpos - xsub;
-            y = ypos - ysub;
-            x1 = x * mcos - y * msin;
-            y1 = x * msin + y * mcos;
-            x1 += xsub;
-            y1 += ysub;
-            vQuad[baseIdx].xyz.x = x1;
-            vQuad[baseIdx].xyz.y = y1;
-
-            x = xpos + w - xsub;
-            y = ypos - ysub;
-            x1 = x * mcos - y * msin;
-            y1 = x * msin + y * mcos;
-            x1 += xsub;
-            y1 += ysub;
-            vQuad[baseIdx + 1].xyz.x = x1;//xpos + fw;
-            vQuad[baseIdx + 1].xyz.y = y1;// fy;
-
-            x = xpos + w - xsub;
-            y = ypos + h - ysub;
-            x1 = x * mcos - y * msin;
-            y1 = x * msin + y * mcos;
-            x1 += xsub;
-            y1 += ysub;
-            vQuad[baseIdx + 3].xyz.x = x1;//xpos + fw;
-            vQuad[baseIdx + 3].xyz.y = y1;//fy + fh;
-
-            x = xpos - xsub;
-            y = ypos + h - ysub;
-            x1 = x * mcos - y * msin;
-            y1 = x * msin + y * mcos;
-            x1 += xsub;
-            y1 += ysub;
-            vQuad[baseIdx + 2].xyz.x = x1;//xpos;
-            vQuad[baseIdx + 2].xyz.y = y1;//fy + fh;
-        }
-        else
-        {
-            vQuad[baseIdx].xyz.x = xpos;
-            vQuad[baseIdx].xyz.y = ypos;
-
-            vQuad[baseIdx + 1].xyz.x = xpos + w;
-            vQuad[baseIdx + 1].xyz.y = ypos;
-
-            vQuad[baseIdx + 2].xyz.x = xpos;
-            vQuad[baseIdx + 2].xyz.y = ypos + h;
-
-            vQuad[baseIdx + 3].xyz.x = xpos + w;
-            vQuad[baseIdx + 3].xyz.y = ypos + h;
-        }
-
-        vQuad[baseIdx + 0].st = Vec2(img.s0, 1.0f - img.t0);
-        vQuad[baseIdx + 1].st = Vec2(img.s1, 1.0f - img.t0);
-        vQuad[baseIdx + 2].st = Vec2(img.s0, 1.0f - img.t1);
-        vQuad[baseIdx + 3].st = Vec2(img.s1, 1.0f - img.t1);
-
-        for (int j = 0; j < 4; ++j)
-        {
-            vQuad[baseIdx + j].color.dcolor = img.col;
-            vQuad[baseIdx + j].xyz.z = img.z;
-        }
-    }
-
-    vb.Unlock();
-    vb.Bind(0);
-    vb.Release();
-
-    CTexture* prevTex = NULL;
-    EF_SetColorOp(eCO_REPLACE, eCO_REPLACE, (eCA_Diffuse | (eCA_Diffuse << 3)), (eCA_Diffuse | (eCA_Diffuse << 3)));
-    EF_SetSrgbWrite(false);
-    FX_SetFPMode();
-
-    if (FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = origMatView;
-        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-        return;
-    }
-
-
-    int nState = m_bDraw2dImageStretchMode ? CTexture::GetTexState(STexState(FILTER_TRILINEAR, true)) : CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-    // Draw quads
-    for (uint32 i = 0; i < numImages; ++i)
-    {
-        C2dImage& img = images[i];
-
-        if (img.pTex != prevTex)
-        {
-            prevTex = img.pTex;
-            if (img.pTex)
-            {
-                img.pTex->Apply(0, nState);
-                EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-                EF_SetSrgbWrite(false);
-            }
-            else
-            {
-                EF_SetColorOp(eCO_REPLACE, eCO_REPLACE, (eCA_Diffuse | (eCA_Diffuse << 3)), (eCA_Diffuse | (eCA_Diffuse << 3)));
-                EF_SetSrgbWrite(false);
-            }
-
-            FX_SetFPMode();
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DRenderThread_cpp)
-#endif
-        }
-
-        FX_DrawPrimitive(eptTriangleStrip, i * 4, 4);
-    }
-
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = origMatView;
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-}
-
-void CD3D9Renderer::RT_DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) const
-{
-    SetProfileMarker("DRAWSTRINGU", CRenderer::ESPM_PUSH);
-
-    pFont->RenderCallback(x, y, z, pStr, asciiMultiLine, ctx);
-
-    SetProfileMarker("DRAWSTRINGU", CRenderer::ESPM_POP);
-}
-
-void CD3D9Renderer::RT_DrawLines(Vec3 v[], int nump, ColorF& col, int flags, float fGround)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    int i;
-    int st;
-
-    EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, eCA_Texture | (eCA_Diffuse << 3), eCA_Texture | (eCA_Diffuse << 3));
-    EF_SetSrgbWrite(false);
-
-    st = GS_NODEPTHTEST;
-    if (flags & 1)
-    {
-        st |= GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-    }
-    FX_SetState(st);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-
-    DWORD c = D3DRGBA(col.r, col.g, col.b, col.a);
-
-    if (fGround >= 0)
-    {
-        TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-        vb.Allocate(nump * 2);
-        SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-        for (i = 0; i < nump; i++)
-        {
-            vQuad[i * 2 + 0].xyz.x = v[i][0];
-            vQuad[i * 2 + 0].xyz.y = fGround;
-            vQuad[i * 2 + 0].xyz.z = 0;
-            vQuad[i * 2 + 0].color.dcolor = c;
-            vQuad[i * 2 + 0].st = Vec2(0.0f, 0.0f);
-            vQuad[i * 2 + 1].xyz = v[i];
-            vQuad[i * 2 + 1].color.dcolor = c;
-            vQuad[i * 2 + 1].st = Vec2(0.0f, 0.0f);
-        }
-
-        vb.Unlock();
-        vb.Bind(0);
-        vb.Release();
-
-        FX_SetFPMode();
-        if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            FX_DrawPrimitive(eptLineList, 0, nump * 2);
-        }
-    }
-    else
-    {
-        TempDynVB<SVF_P3F_C4B_T2F> vb(gcpRendD3D);
-        vb.Allocate(nump);
-        SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-        for (i = 0; i < nump; i++)
-        {
-            vQuad[i].xyz = v[i];
-            vQuad[i].color.dcolor = c;
-            vQuad[i].st = Vec2(0, 0);
-        }
-
-        vb.Unlock();
-        vb.Bind(0);
-        vb.Release();
-
-        FX_SetFPMode();
-        if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            FX_DrawPrimitive(eptLineStrip, 0, nump);
-        }
-    }
-}
-
-void CD3D9Renderer::RT_Draw2dImageStretchMode(bool bStretch)
-{
-    m_bDraw2dImageStretchMode = bStretch;
-}
-
-void CD3D9Renderer::RT_Draw2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, DWORD col, float z)
-{
-    C2dImage img(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, col, z, 0);
-
-    SetProfileMarker("DRAW2DIMAGE", CRenderer::ESPM_PUSH);
-
-    if (GetS3DRend().IsStereoEnabled())
-    {
-        GetS3DRend().BeginRenderingTo(STEREO_EYE_LEFT);
-        RT_Draw2dImageInternal(&img, 1, true);
-        GetS3DRend().EndRenderingTo(STEREO_EYE_LEFT);
-
-        GetS3DRend().BeginRenderingTo(STEREO_EYE_RIGHT);
-        RT_Draw2dImageInternal(&img, 1, false);
-        GetS3DRend().EndRenderingTo(STEREO_EYE_RIGHT);
-    }
-    else
-    {
-        RT_Draw2dImageInternal(&img, 1);
-    }
-
-    SetProfileMarker("DRAW2DIMAGE", CRenderer::ESPM_POP);
-}
-
-void CD3D9Renderer::RT_Push2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, DWORD col, float z, float stereoDepth)
-{
-    m_2dImages.Add(C2dImage(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, col, z, stereoDepth));
-}
-
-void CD3D9Renderer::RT_Draw2dImageList()
-{
-    if (m_2dImages.empty())
-    {
-        return;
-    }
-
-    SetProfileMarker("DRAW2DIMAGELIST", CRenderer::ESPM_PUSH);
-
-    if (GetS3DRend().IsStereoEnabled())
-    {
-        GetS3DRend().BeginRenderingTo(STEREO_EYE_LEFT);
-        RT_Draw2dImageInternal(m_2dImages.Data(), m_2dImages.size(), true);
-        GetS3DRend().EndRenderingTo(STEREO_EYE_LEFT);
-
-        GetS3DRend().BeginRenderingTo(STEREO_EYE_RIGHT);
-        RT_Draw2dImageInternal(m_2dImages.Data(), m_2dImages.size(), false);
-        GetS3DRend().EndRenderingTo(STEREO_EYE_RIGHT);
-    }
-    else
-    {
-        RT_Draw2dImageInternal(m_2dImages.Data(), m_2dImages.size());
-    }
-
-    SetProfileMarker("DRAW2DIMAGELIST", CRenderer::ESPM_POP);
-
-    m_2dImages.resize(0);
-}
-
-void CD3D9Renderer::RT_PushRenderTarget(int nTarget, CTexture* pTex, SDepthTexture* pDepth, int nS)
-{
-    FX_PushRenderTarget(nTarget, pTex, pDepth, nS);
-}
-
-void CD3D9Renderer::RT_PopRenderTarget(int nTarget)
-{
-    FX_PopRenderTarget(nTarget);
-}
-
-void CD3D9Renderer::RT_Init()
-{
-    EF_Init();
-}
-
-void CD3D9Renderer::RT_CreateResource(SResourceAsync* pRes)
-{
-    if (pRes->eClassName == eRCN_Texture)
-    {
-        CTexture* pTex = NULL;
-
-        if (pRes->nTexId)
-        { // only create device texture
-            pTex = CTexture::GetByID(pRes->nTexId);
-            const byte* arrData[6] = { pRes->pData, 0, 0, 0, 0, 0 };
-            pTex->CreateDeviceTexture(arrData);
-        }
-        else
-        { // create full texture
-            char* pName = pRes->Name;
-            char szName[128];
-            if (!pName)
-            {
-                sprintf_s(szName, "$AutoDownloadAsync_%d", m_TexGenID++);
-                pName = szName;
-            }
-            pTex = CTexture::Create2DTexture(pName, pRes->nWidth, pRes->nHeight, pRes->nMips, pRes->nTexFlags, pRes->pData, (ETEX_Format)pRes->nFormat, (ETEX_Format)pRes->nFormat);
-        }
-
-        SAFE_DELETE_ARRAY(pRes->pData);
-        pRes->pResource = pTex;
-        pRes->nReady = (CTexture::IsTextureExist(pTex));
-    }
-    else
-    {
-        assert(0);
-    }
-
-    delete pRes;
-}
-void CD3D9Renderer::RT_ReleaseResource(SResourceAsync* pRes)
-{
-    if (pRes->eClassName == eRCN_Texture)
-    {
-        CTexture* pTex = (CTexture*)pRes->pResource;
-        pTex->Release();
-    }
-    else
-    {
-        assert(0);
-    }
-
-    delete pRes;
-}
-
-void CD3D9Renderer::RT_UnbindTMUs()
-{
-    D3DShaderResourceView* pTex[MAX_TMU] = {NULL};
-    for (uint32 i = 0; i < MAX_TMU; ++i)
-    {
-        CTexture::s_TexStages[i].m_DevTexture = NULL;
-    }
-    m_DevMan.BindSRV(eHWSC_Vertex, pTex, 0, MAX_TMU);
-    m_DevMan.BindSRV(eHWSC_Geometry, pTex, 0, MAX_TMU);
-    m_DevMan.BindSRV(eHWSC_Domain, pTex, 0, MAX_TMU);
-    m_DevMan.BindSRV(eHWSC_Hull, pTex, 0, MAX_TMU);
-    m_DevMan.BindSRV(eHWSC_Compute, pTex, 0, MAX_TMU);
-    m_DevMan.BindSRV(eHWSC_Pixel, pTex, 0, MAX_TMU);
-
-    m_DevMan.CommitDeviceStates();
-}
-
-void CD3D9Renderer::RT_UnbindResources()
-{
-    for (AZ::u32 shaderClass = 0; shaderClass < eHWSC_Num; ++shaderClass)
-    {
-        for (AZ::u32 shaderSlot = 0; shaderSlot < eConstantBufferShaderSlot_Count; ++shaderSlot)
-        {
-            m_DevMan.BindConstantBuffer(EHWShaderClass(shaderClass), nullptr, shaderSlot);
-        }
-    }
-
-    D3DBuffer* pBuffers[16] = { 0 };
-    UINT StrideOffset[16] = { 0 };
-
-    m_DevMan.BindIB(NULL, 0, DXGI_FORMAT_R16_UINT);
-    m_RP.m_pIndexStream = NULL;
-
-    m_DevMan.BindVB(0, 16, pBuffers, StrideOffset, StrideOffset);
-    m_RP.m_VertexStreams[0].pStream = NULL;
-
-    m_DevMan.BindVtxDecl(NULL);
-    m_pLastVDeclaration = NULL;
-
-    m_DevMan.BindShader(eHWSC_Pixel, NULL);
-    m_DevMan.BindShader(eHWSC_Vertex, NULL);
-    m_DevMan.BindShader(eHWSC_Geometry, NULL);
-    m_DevMan.BindShader(eHWSC_Domain, NULL);
-    m_DevMan.BindShader(eHWSC_Hull, NULL);
-    m_DevMan.BindShader(eHWSC_Compute, NULL);
-
-    CHWShader::s_pCurPS = nullptr;
-    CHWShader::s_pCurVS = nullptr;
-    CHWShader::s_pCurGS = nullptr;
-    CHWShader::s_pCurDS = nullptr;
-    CHWShader::s_pCurHS = nullptr;
-    CHWShader::s_pCurCS = nullptr;
-
-    m_DevMan.CommitDeviceStates();
-}
-
-void CD3D9Renderer::RT_ReleaseRenderResources()
-{
-    GetGraphicsPipeline().Shutdown();
-
-    m_cEF.mfReleasePreactivatedShaderData();
-    m_cEF.m_Bin.InvalidateCache();
-    //m_cEF.m_Bin.m_BinPaths.clear();
-    ForceFlushRTCommands();
-
-    for (uint i = 0; i < CLightStyle::s_LStyles.Num(); i++)
-    {
-        delete CLightStyle::s_LStyles[i];
-    }
-    CLightStyle::s_LStyles.Free();
-
-    FX_PipelineShutdown();
-    ID3D11RenderTargetView* pRTV[RT_STACK_WIDTH] = { NULL };
-    GetDeviceContext().OMSetRenderTargets(RT_STACK_WIDTH, pRTV, NULL);
-    m_nMaxRT2Commit = -1;
-}
-void CD3D9Renderer::RT_CreateRenderResources()
-{
-    EF_Init();
-
-    if (m_pPostProcessMgr)
-    {
-        m_pPostProcessMgr->CreateResources();
-    }
-
-    GetGraphicsPipeline().Init();
-}
-
-void CD3D9Renderer::RT_PrecacheDefaultShaders()
-{
-    SShaderCombination cmb;
-    m_cEF.s_ShaderStereo->mfPrecache(cmb, true, true, NULL);
-
-    cmb.m_RTMask |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    cmb.m_RTMask |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    cmb.m_RTMask |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    m_cEF.s_ShaderVideo->mfPrecache(cmb, true, true, nullptr);
-}
-
-void CD3D9Renderer::RT_ResetGlass()
-{
-}
-
-void CD3D9Renderer::SetRendererCVar(ICVar* pCVar, const char* pArgText, const bool bSilentMode)
-{
-    m_pRT->RC_SetRendererCVar(pCVar, pArgText, bSilentMode);
-}
-
-void CD3D9Renderer::RT_SetRendererCVar(ICVar* pCVar, const char* pArgText, const bool bSilentMode)
-{
-    if (pCVar)
-    {
-        pCVar->Set(pArgText);
-
-        if (!bSilentMode)
-        {
-            if (gEnv->IsEditor())
-            {
-                gEnv->pLog->LogWithType(ILog::eInputResponse, "%s = %s (Renderer CVar)", pCVar->GetName(), pCVar->GetString());
-            }
-            else
-            {
-                gEnv->pLog->LogWithType(ILog::eInputResponse, "    $3%s = $6%s $5(Renderer CVar)", pCVar->GetName(), pCVar->GetString());
-            }
-        }
-    }
-}
-
-void CD3D9Renderer::RT_PostLevelLoading()
-{
-    CRenderer::RT_PostLevelLoading();
-
-    // Clear our the shadow mask texture in case the level we are loading does not
-    // have any shadow casters. If we don't clear out the mask then whatever was
-    // previous in the mask, including a previously loaded level, will be used and
-    // incorrect shadows will be drawn.
-    FX_ClearShadowMaskTexture();
-}
-
-void CD3D9Renderer::StartLoadtimePlayback(ILoadtimeCallback* pCallback)
-{
-    // make sure we can't access loading mode twice!
-    if (m_pRT->m_pLoadtimeCallback)
-    {
-        return;
-    }
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);
-
-    if (pCallback)
-    {
-        FlushRTCommands(true, true, true);
-
-        m_pRT->m_pLoadtimeCallback = pCallback;
-        SetViewport(0, 0, GetOverlayWidth(), GetOverlayHeight());
-        m_pRT->RC_StartVideoThread();
-
-        if (m_pRT->IsMultithreaded())
-        {
-            // wait until render thread has fully processed the start of the video
-            // to reduce the congestion on the IO reading (make sure nothing else
-            // beats the video to actually start reading something from the DVD)
-            while (m_pRT->m_eVideoThreadMode != SRenderThread::eVTM_Active)
-            {
-                m_pRT->FlushAndWait();
-                AZStd::this_thread::yield();
-            }
-        }
-    }
-}
-
-void CD3D9Renderer::StopLoadtimePlayback()
-{
-    if (m_pRT->m_pLoadtimeCallback)
-    {
-        LOADING_TIME_PROFILE_SECTION;
-
-        FlushRTCommands(true, true, true);
-
-        m_pRT->RC_StopVideoThread();
-
-        if (m_pRT->IsMultithreaded())
-        {
-            // wait until render thread has fully processed the shutdown of the loading thread
-            while (m_pRT->m_eVideoThreadMode != SRenderThread::eVTM_Disabled)
-            {
-                m_pRT->FlushAndWait();
-                AZStd::this_thread::yield();
-            }
-        }
-
-        m_pRT->m_pLoadtimeCallback = nullptr;
-
-        m_pRT->RC_BeginFrame();
-
-#if !defined(STRIP_RENDER_THREAD)
-        // Blit the accumulated commands from the renderloading thread into the current fill command queue
-        // : Currently hacked into the RC_UpdateMaterialConstants command
-        if (m_pRT->m_CommandsLoading.size())
-        {
-            void* buf = m_pRT->m_Commands[m_pRT->m_nCurThreadFill].Grow(m_pRT->m_CommandsLoading.size());
-            memcpy(buf, &m_pRT->m_CommandsLoading[0], m_pRT->m_CommandsLoading.size());
-            m_pRT->m_CommandsLoading.Free();
-        }
-#endif // !defined(STRIP_RENDER_THREAD)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DShaders.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DShaders.cpp
deleted file mode 100644
index f5b7868030..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DShaders.cpp
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "Shaders/CShader.h"
-#include "DevBuffer.h"
-#include "RenderCapabilities.h"
-#include <AzCore/std/string/conversions.h>
-#include <I3DEngine.h>
-#include <IResourceManager.h>
-#include <AzFramework/Archive/IArchive.h>
-
-//==================================================================================
-
-bool CShader::FXSetTechnique(const CCryNameTSCRC& Name)
-{
-    assert (gRenDev->m_pRT->IsRenderThread());
-
-    uint32 i;
-    SShaderTechnique* pTech = NULL;
-    for (i = 0; i < m_HWTechniques.Num(); i++)
-    {
-        pTech = m_HWTechniques[i];
-        if (pTech && Name == pTech->m_NameCRC)
-        {
-            break;
-        }
-    }
-
-    CRenderer* rd = gRenDev;
-
-    if (i == m_HWTechniques.Num())
-    { // not found and not set
-        rd->m_RP.m_nShaderTechnique = -1;
-        rd->m_RP.m_pCurTechnique = NULL;
-        return false;
-    }
-
-    rd->m_RP.m_pShader = this;
-    rd->m_RP.m_nShaderTechnique = i;
-    rd->m_RP.m_pCurTechnique = m_HWTechniques[i];
-
-    return true;
-}
-
-bool CShader::FXSetCSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams)
-{
-    CRenderer* rd = gRenDev;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique)
-    {
-        return false;
-    }
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-    if (!pPass)
-    {
-        return false;
-    }
-    CHWShader_D3D* curCS = (CHWShader_D3D*)pPass->m_CShader;
-    if (!curCS)
-    {
-        return false;
-    }
-    SCGBind* pBind = curCS->mfGetParameterBind(NameParam);
-    if (!pBind)
-    {
-        return false;
-    }
-
-    const AZ::u32 registerCountMax = curCS->m_pCurInst->m_nMaxVecs[pBind->m_BindingSlot];
-    AzRHI::ConstantBufferCache::GetInstance().WriteConstants(eHWSC_Compute, pBind, fParams, nParams, registerCountMax);
-    return true;
-}
-
-bool CShader::FXSetCSFloat(const char* NameParam, const Vec4 fParams[], int nParams)
-{
-    return FXSetCSFloat(CCryNameR(NameParam), fParams, nParams);
-}
-
-bool CShader::FXSetPSFloat(const CCryNameR& NameParam, const Vec4* fParams, int nParams)
-{
-    CRenderer* rd = gRenDev;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique)
-    {
-        return false;
-    }
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-    if (!pPass)
-    {
-        return false;
-    }
-    CHWShader_D3D* curPS = (CHWShader_D3D*)pPass->m_PShader;
-    if (!curPS)
-    {
-        return false;
-    }
-    SCGBind* pBind = curPS->mfGetParameterBind(NameParam);
-    if (!pBind)
-    {
-        return false;
-    }
-
-    const AZ::u32 registerCountMax = curPS->m_pCurInst->m_nMaxVecs[pBind->m_BindingSlot];
-    AzRHI::ConstantBufferCache::GetInstance().WriteConstants(eHWSC_Pixel, pBind, fParams, nParams, registerCountMax);
-    return true;
-}
-
-bool CShader::FXSetPSFloat(const char* NameParam, const Vec4* fParams, int nParams)
-{
-    return FXSetPSFloat(CCryNameR(NameParam), fParams, nParams);
-}
-
-bool CShader::FXSetVSFloat(const CCryNameR& NameParam, const Vec4* fParams, int nParams)
-{
-    CRenderer* rd = gRenDev;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique)
-    {
-        return false;
-    }
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-    if (!pPass)
-    {
-        return false;
-    }
-    CHWShader_D3D* curVS = (CHWShader_D3D*)pPass->m_VShader;
-    if (!curVS)
-    {
-        return false;
-    }
-    SCGBind* pBind = curVS->mfGetParameterBind(NameParam);
-    if (!pBind)
-    {
-        return false;
-    }
-
-    const AZ::u32 registerCountMax = curVS->m_pCurInst->m_nMaxVecs[pBind->m_BindingSlot];
-    AzRHI::ConstantBufferCache::GetInstance().WriteConstants(eHWSC_Vertex, pBind, fParams, nParams, registerCountMax);
-    return true;
-}
-
-bool CShader::FXSetVSFloat(const char* NameParam, const Vec4* fParams, int nParams)
-{
-    return FXSetVSFloat(CCryNameR(NameParam), fParams, nParams);
-}
-
-bool CShader::FXSetGSFloat(const CCryNameR& NameParam, const Vec4* fParams, int nParams)
-{
-    CRenderer* rd = gRenDev;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique)
-    {
-        return false;
-    }
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-    if (!pPass)
-    {
-        return false;
-    }
-    CHWShader_D3D* curGS = (CHWShader_D3D*)pPass->m_GShader;
-    if (!curGS)
-    {
-        return false;
-    }
-    SCGBind* pBind = curGS->mfGetParameterBind(NameParam);
-    if (!pBind)
-    {
-        return false;
-    }
-
-    const AZ::u32 registerCountMax = curGS->m_pCurInst->m_nMaxVecs[pBind->m_BindingSlot];
-    AzRHI::ConstantBufferCache::GetInstance().WriteConstants(eHWSC_Geometry, pBind, fParams, nParams, registerCountMax);
-    return true;
-}
-
-bool CShader::FXSetGSFloat(const char* NameParam, const Vec4* fParams, int nParams)
-{
-    return FXSetGSFloat(CCryNameR(NameParam), fParams, nParams);
-}
-
-bool CShader::FXBegin(uint32* uiPassCount, uint32 nFlags)
-{
-    CRenderer* rd = gRenDev;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique || !rd->m_RP.m_pCurTechnique->m_Passes.Num())
-    {
-        return false;
-    }
-    *uiPassCount = rd->m_RP.m_pCurTechnique->m_Passes.Num();
-    rd->m_RP.m_nFlagsShaderBegin = nFlags;
-    rd->m_RP.m_pCurPass = &rd->m_RP.m_pCurTechnique->m_Passes[0];
-    return true;
-}
-
-bool CShader::FXBeginPass(uint32 uiPass)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    CD3D9Renderer* rd = gcpRendD3D;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique || uiPass >= rd->m_RP.m_pCurTechnique->m_Passes.Num())
-    {
-        return false;
-    }
-    rd->m_RP.m_pCurPass = &rd->m_RP.m_pCurTechnique->m_Passes[uiPass];
-    SShaderPass* pPass = rd->m_RP.m_pCurPass;
-    //assert (pPass->m_VShader && pPass->m_PShader);
-    //if (!pPass->m_VShader || !pPass->m_PShader)
-    //  return false;
-    CHWShader_D3D* curVS = (CHWShader_D3D*)pPass->m_VShader;
-    CHWShader_D3D* curPS = (CHWShader_D3D*)pPass->m_PShader;
-    CHWShader_D3D* curGS = (CHWShader_D3D*)pPass->m_GShader;
-    CHWShader_D3D* curCS = (CHWShader_D3D*)pPass->m_CShader;
-
-    bool bResult = true;
-
-    // Set Pixel-shader and all associated textures
-    if (curPS)
-    {
-        if (rd->m_RP.m_nFlagsShaderBegin & FEF_DONTSETTEXTURES)
-        {
-            bResult &= curPS->mfSet(0);
-        }
-        else
-        {
-            bResult &= curPS->mfSet(HWSF_SETTEXTURES);
-        }
-        curPS->UpdatePerInstanceConstantBuffer();
-    }
-    // Set Vertex-shader
-    if (curVS)
-    {
-        // Allow vertex shaders to bind textures.
-        // Some existing vertex shaders do try to read textures, for example the shader function GetVolumetricFogAnalyticalColor
-        if (rd->m_RP.m_nFlagsShaderBegin & FEF_DONTSETTEXTURES)
-        {
-            bResult &= curVS->mfSet(0);
-        }
-        else
-        {
-            bResult &= curVS->mfSet(HWSF_SETTEXTURES);
-        }
-
-        curVS->UpdatePerInstanceConstantBuffer();
-    }
-
-    // Set Geometry-shader
-    if (curGS)
-    {
-        if (rd->m_RP.m_nFlagsShaderBegin & FEF_DONTSETTEXTURES)
-        {
-            bResult &= curGS->mfSet(0);
-        }
-        else
-        {
-            bResult &= curGS->mfSet(HWSF_SETTEXTURES);
-        }
-
-        curGS->UpdatePerInstanceConstantBuffer();
-    }
-    else
-    {
-        CHWShader_D3D::mfBindGS(NULL, NULL);
-    }
-
-    // Set Compute-shader
-    if (curCS)
-    {
-        if (rd->m_RP.m_nFlagsShaderBegin & FEF_DONTSETTEXTURES)
-        {
-            bResult &= curCS->mfSet(0);
-        }
-        else
-        {
-            bResult &= curCS->mfSet(HWSF_SETTEXTURES);
-        }
-        curCS->UpdatePerInstanceConstantBuffer();
-    }
-    else
-    {
-        CHWShader_D3D::mfBindCS(NULL, NULL);
-    }
-
-    if (!(rd->m_RP.m_nFlagsShaderBegin & FEF_DONTSETSTATES))
-    {
-        rd->FX_SetState(pPass->m_RenderState);
-        if (pPass->m_eCull != -1)
-        {
-            rd->D3DSetCull((ECull)pPass->m_eCull);
-        }
-    }
-
-    return bResult;
-}
-
-bool CShader::FXEndPass()
-{
-    CRenderer* rd = gRenDev;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique || !rd->m_RP.m_pCurTechnique->m_Passes.Num())
-    {
-        return false;
-    }
-    rd->m_RP.m_pCurPass = NULL;
-    return true;
-}
-
-bool CShader::FXEnd()
-{
-    CRenderer* rd = gRenDev;
-    if (!rd->m_RP.m_pShader || !rd->m_RP.m_pCurTechnique)
-    {
-        return false;
-    }
-    return true;
-}
-
-bool CShader::FXCommit([[maybe_unused]] const uint32 nFlags)
-{
-    gcpRendD3D->FX_Commit();
-
-    return true;
-}
-
-
-void* CHWShader_D3D::GetVSDataForDecl(const D3D11_INPUT_ELEMENT_DESC* pDecl, int nCount, int& nDataSize)
-{
-    nDataSize = 0;
-    CShader* pSh = CShaderMan::s_ShaderFPEmu;
-    if (!pSh || !pSh->m_HWTechniques.Num() || !nCount)
-    {
-        return NULL;
-    }
-    uint32 i, j;
-
-    SShaderTechnique* pTech = NULL;
-    for (i = 0; i < pSh->m_HWTechniques.Num(); i++)
-    {
-        if (!azstricmp(pSh->m_HWTechniques[i]->m_NameStr.c_str(), "InputLayout"))
-        {
-            pTech = pSh->m_HWTechniques[i];
-            break;
-        }
-    }
-    if (!pTech || !pTech->m_Passes.Num())
-    {
-        return NULL;
-    }
-    SShaderPass& Pass = pTech->m_Passes[0];
-    CHWShader_D3D* pVS = (CHWShader_D3D*)Pass.m_VShader;
-    if (!pVS)
-    {
-        return NULL;
-    }
-
-    uint32 nMask = 0;
-    //m_RP.m_FlagsShader_LT = m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorOp[0] | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaOp[0] << 8) | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg[0] << 16) | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg[0] << 24);
-
-    for (i = 0; i < nCount; i++)
-    {
-        const D3D11_INPUT_ELEMENT_DESC& Desc = pDecl[i];
-        if (Desc.InputSlot != 0)
-        {
-            nMask |= 1 << Desc.InputSlot;
-            if (nMask & VSM_TANGENTS)
-            {
-                for (j = 0; j < nCount; j++)
-                {
-                    const D3D11_INPUT_ELEMENT_DESC& Desc2 = pDecl[j];
-                    if (!strcmp(Desc2.SemanticName, "BITANGENT") || !strcmp(Desc2.SemanticName, "BINORMAL"))
-                    {
-                        nMask |= (1 << VSF_QTANGENTS);
-                        break;
-                    }
-                }
-            }
-        }
-        else
-        if (!strcmp(Desc.SemanticName, "POSITION"))
-        {
-            if (Desc.Format == DXGI_FORMAT_R32G32_FLOAT)
-            {
-                nMask |= 0 << 8;
-            }
-            else
-            if (Desc.Format == DXGI_FORMAT_R32G32B32_FLOAT)
-            {
-                nMask |= 1 << 8;
-            }
-            else
-            if (Desc.Format == DXGI_FORMAT_R16G16B16A16_FLOAT || Desc.Format == DXGI_FORMAT_R32G32B32A32_FLOAT)
-            {
-                nMask |= 2 << 8;
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-        else
-        if (!strcmp(Desc.SemanticName, "TEXCOORD"))
-        {
-            int nShift = 0;
-            if (Desc.SemanticIndex == 0)
-            {
-                nMask |= eCA_Texture << 16;
-                nShift = 10;
-                if (Desc.Format == DXGI_FORMAT_R32G32_FLOAT || Desc.Format == DXGI_FORMAT_R16G16_FLOAT)
-                {
-                    nMask |= 0 << nShift;
-                }
-                else
-                if (Desc.Format == DXGI_FORMAT_R32G32B32_FLOAT)
-                {
-                    nMask |= 1 << nShift;
-                }
-                else
-                if (Desc.Format == DXGI_FORMAT_R16G16B16A16_FLOAT || Desc.Format == DXGI_FORMAT_R32G32B32A32_FLOAT)
-                {
-                    nMask |= 2 << nShift;
-                }
-                else
-                {
-                    assert(0);
-                }
-            }
-            else
-            if (Desc.SemanticIndex == 1)
-            {
-                if (nMask & (eCA_Constant << 19))
-                {
-                    // PSIZE and TEX1 used together
-                    nMask &= ~(0x7 << 19);
-                    nMask |= eCA_Previous << 19;
-                }
-                else
-                {
-                    nMask |= eCA_Texture1 << 19;
-                }
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-        else
-        if (!strcmp(Desc.SemanticName, "COLOR"))
-        {
-            int nShift = 0;
-            if (Desc.SemanticIndex == 0)
-            {
-                nMask |= eCA_Diffuse << 24;
-                nShift = 12;
-                if (Desc.Format == DXGI_FORMAT_R32G32B32_FLOAT)
-                {
-                    nMask |= 1 << nShift;
-                }
-                else
-                if (Desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM || Desc.Format == DXGI_FORMAT_R32G32B32A32_FLOAT)
-                {
-                    nMask |= 2 << nShift;
-                }
-                else
-                {
-                    assert(0);
-                }
-            }
-            else
-            if (Desc.SemanticIndex == 1)
-            {
-                nMask |= eCA_Specular << 27;
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-        else
-        if (!strcmp(Desc.SemanticName, "NORMAL"))
-        {
-            if (Desc.SemanticIndex == 0)
-            {
-                nMask |= eCA_Normal << 27;
-            }
-            else
-            {
-                assert(0);
-            }
-            //assert (Desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM);
-        }
-        else
-        if (!strcmp(Desc.SemanticName, "PSIZE"))
-        {
-            if (Desc.SemanticIndex == 0)
-            {
-                if (nMask & (eCA_Texture1 << 19))
-                {
-                    // PSIZE and TEX1 used together
-                    nMask &= ~(0x7 << 19);
-                    nMask |= eCA_Previous << 19;
-                }
-                else
-                {
-                    nMask |= eCA_Constant << 19;
-                }
-            }
-            else
-            {
-                assert(0);
-            }
-            assert (Desc.Format == DXGI_FORMAT_R32G32B32A32_FLOAT);
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-
-    SShaderCombIdent Ident;
-    Ident.m_LightMask = nMask;
-    Ident.m_RTMask = 0;
-    Ident.m_MDMask = 0;
-    Ident.m_MDVMask = 0;
-    Ident.m_GLMask = 0;
-    Ident.m_STMask = 0;
-
-    SHWSInstance* pI = pVS->m_pCurInst;
-
-    uint32 nFlags = HWSF_STOREDATA;
-    SHWSInstance* pInst = pVS->mfGetInstance(pSh, Ident, nFlags);
-    if (!pVS->mfCheckActivation(pSh, pInst, nFlags))
-    {
-        pVS->m_pCurInst = pI;
-        return NULL;
-    }
-    pVS->m_pCurInst = pI;
-
-    nDataSize = pInst->m_nDataSize;
-    return pInst->m_pShaderData;
-}
-
-//===================================================================================
-
-void CRenderer::RefreshSystemShaders()
-{
-    // make sure all system shaders are properly refreshed during loading!
-#if defined(FEATURE_SVO_GI)
-    gRenDev->m_cEF.mfRefreshSystemShader("Total_Illumination", CShaderMan::s_ShaderSVOGI);
-#endif
-    gRenDev->m_cEF.mfRefreshSystemShader("Common", CShaderMan::s_ShaderCommon);
-    gRenDev->m_cEF.mfRefreshSystemShader("Debug", CShaderMan::s_ShaderDebug);
-    gRenDev->m_cEF.mfRefreshSystemShader("DeferredCaustics", CShaderMan::s_ShaderDeferredCaustics);
-    gRenDev->m_cEF.mfRefreshSystemShader("DeferredRain", CShaderMan::s_ShaderDeferredRain);
-    gRenDev->m_cEF.mfRefreshSystemShader("DeferredSnow", CShaderMan::s_ShaderDeferredSnow);
-    gRenDev->m_cEF.mfRefreshSystemShader("DeferredShading", CShaderMan::s_shDeferredShading);
-    gRenDev->m_cEF.mfRefreshSystemShader("DepthOfField", CShaderMan::s_shPostDepthOfField);
-    gRenDev->m_cEF.mfRefreshSystemShader("DXTCompress", CShaderMan::s_ShaderDXTCompress);
-    gRenDev->m_cEF.mfRefreshSystemShader("LensOptics", CShaderMan::s_ShaderLensOptics);
-    gRenDev->m_cEF.mfRefreshSystemShader("SoftOcclusionQuery", CShaderMan::s_ShaderSoftOcclusionQuery);
-    gRenDev->m_cEF.mfRefreshSystemShader("MotionBlur", CShaderMan::s_shPostMotionBlur);
-    gRenDev->m_cEF.mfRefreshSystemShader("OcclusionTest", CShaderMan::s_ShaderOcclTest);
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-    gRenDev->m_cEF.mfRefreshSystemShader("ShadowBlur", CShaderMan::s_ShaderShadowBlur);
-    gRenDev->m_cEF.mfRefreshSystemShader("Stereo", CShaderMan::s_ShaderStereo);
-    gRenDev->m_cEF.mfRefreshSystemShader("Sunshafts", CShaderMan::s_shPostSunShafts);
-    gRenDev->m_cEF.mfRefreshSystemShader("Fur", CShaderMan::s_ShaderFur);
-}
-
-bool CD3D9Renderer::FX_SetFPMode()
-{
-    assert (gRenDev->m_pRT->IsRenderThread());
-
-    if (!(m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_FP_DIRTY) && CShaderMan::s_ShaderFPEmu == m_RP.m_pShader)
-    {
-        return true;
-    }
-    if (m_bDeviceLost)
-    {
-        return false;
-    }
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_FP_DIRTY;
-    m_RP.m_pCurObject = m_RP.m_pIdendityRenderObject;
-    CShader* pSh = CShaderMan::s_ShaderFPEmu;
-    if (!pSh || !pSh->m_HWTechniques.Num())
-    {
-        return false;
-    }
-    m_RP.m_FlagsShader_LT = m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorOp | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaOp << 8) | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg << 16) | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg << 24);
-    m_RP.m_FlagsShader_LT |= (m_RP.m_TI[m_RP.m_nProcessThreadID].m_sRGBWrite ? 1 : 0) << 22;
-
-    if (CTexture::s_TexStages[0].m_DevTexture && CTexture::s_TexStages[0].m_DevTexture->IsCube())
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-    }
-    else
-    {
-        m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_CUBEMAP0];
-    }
-
-    m_RP.m_pShader = pSh;
-    m_RP.m_pCurTechnique = pSh->m_HWTechniques[0];
-
-    bool bRes = pSh->FXBegin(&m_RP.m_nNumRendPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    if (!bRes)
-    {
-        return false;
-    }
-    bRes = pSh->FXBeginPass(0);
-    FX_Commit();
-    return bRes;
-}
-
-bool CD3D9Renderer::FX_SetUIMode()
-{
-    assert (gRenDev->m_pRT->IsRenderThread());
-
-    if (!(m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_FP_DIRTY) && CShaderMan::s_ShaderUI == m_RP.m_pShader)
-    {
-        return true;
-    }
-    if (m_bDeviceLost)
-    {
-        return false;
-    }
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_FP_DIRTY;
-    m_RP.m_pCurObject = m_RP.m_pIdendityRenderObject;
-    CShader* pSh = CShaderMan::s_ShaderUI;
-    if (!pSh || !pSh->m_HWTechniques.Num())
-    {
-        return false;
-    }
-    m_RP.m_FlagsShader_LT = m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorOp | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaOp << 8) | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg << 16) | (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg << 24);
-    m_RP.m_FlagsShader_LT |= (m_RP.m_TI[m_RP.m_nProcessThreadID].m_sRGBWrite ? 1 : 0) << 22;
-
-    if (CTexture::s_TexStages[0].m_DevTexture && CTexture::s_TexStages[0].m_DevTexture->IsCube())
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-    }
-    else
-    {
-        m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_CUBEMAP0];
-    }
-
-    m_RP.m_pShader = pSh;
-    m_RP.m_pCurTechnique = pSh->m_HWTechniques[0];
-
-    bool bRes = pSh->FXBegin(&m_RP.m_nNumRendPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    if (!bRes)
-    {
-        return false;
-    }
-    bRes = pSh->FXBeginPass(0);
-    FX_Commit();
-    return bRes;
-}
-
-void CShaderMan::mfCheckObjectDependParams(std::vector<SCGParam>& PNoObj, std::vector<SCGParam>& PObj, [[maybe_unused]] EHWShaderClass eSH, [[maybe_unused]] CShader* pFXShader)
-{
-    if (!PNoObj.size())
-    {
-        return;
-    }
-    uint32 i;
-    for (i = 0; i < PNoObj.size(); i++)
-    {
-        SCGParam* prNoObj = &PNoObj[i];
-        if ((prNoObj->m_eCGParamType & 0xff) == ECGP_PM_Tweakable)
-        {
-            int nType = prNoObj->m_eCGParamType & 0xff;
-            prNoObj->m_eCGParamType = (ECGParam)nType;
-        }
-
-        if (prNoObj->m_Flags & PF_INSTANCE)
-        {
-            PObj.push_back(PNoObj[i]);
-            PNoObj.erase(PNoObj.begin() + i);
-            i--;
-        }
-        else
-        if (prNoObj->m_Flags & PF_MATERIAL)
-        {
-            PNoObj.erase(PNoObj.begin() + i);
-            i--;
-        }
-    }
-    if (PObj.size())
-    {
-        int n = -1;
-        for (i = 0; i < PObj.size(); i++)
-        {
-            if (PObj[i].m_eCGParamType == ECGP_Matr_PI_ViewProj)
-            {
-                n = i;
-                break;
-            }
-        }
-        if (n > 0)
-        {
-            SCGParam pr = PObj[n];
-            PObj[n] = PObj[0];
-            PObj[0] = pr;
-        }
-    }
-}
-
-bool CShaderMan::mfPreactivate2(CResFileLookupDataMan& LevelLookup,
-    const AZStd::string& pathPerLevel, const AZStd::string& pathGlobal,
-    bool bVS, bool bPersistent)
-{
-    bool bRes = true;
-    
-    AZStd::string allFilesPath = pathPerLevel + "/*.*";
-    
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst(allFilesPath.c_str());
-    if (!handle)
-    {
-        return bRes;
-    }
-
-    do
-    {
-        if (handle.m_filename.front() == '.')
-        {
-            continue;
-        }
-        
-        AZStd::string fileInfoPerLevel = AZStd::string::format("%s/%.*s", pathPerLevel.c_str(), aznumeric_cast<int>(handle.m_filename.size()), handle.m_filename.data());
-        AZStd::string fileInfoGlobal   = AZStd::string::format("%s/%.*s", pathGlobal.c_str(),   aznumeric_cast<int>(handle.m_filename.size()), handle.m_filename.data());
-        
-        if((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-        {
-            bRes &= mfPreactivate2(LevelLookup, fileInfoPerLevel, fileInfoGlobal, bVS, bPersistent);
-            continue;
-        }
-        CResFile* pRes = new CResFile(fileInfoPerLevel.c_str());
-        int bR = pRes ? pRes->mfOpen(RA_READ, &LevelLookup) : 0;
-        if (!bR)
-        {
-            Warning("ShaderCache rejected (damaged?) file %s: %s", fileInfoPerLevel.c_str(), pRes->mfGetError() ? pRes->mfGetError() : "<unknown reason>");
-            bRes = false;
-            SAFE_DELETE(pRes);
-            continue;
-        }
-
-        SResFileLookupData* pLookupGlobal = gRenDev->m_cEF.m_ResLookupDataMan[CACHE_READONLY].GetData(fileInfoGlobal.c_str());
-        if (!pLookupGlobal)
-        {
-            SAFE_DELETE(pRes);
-            continue;
-        }
-        SResFileLookupData* pLookupLevel = NULL;
-        if (!bPersistent)
-        {
-            CCryNameTSCRC name = LevelLookup.AdjustName(pRes->mfGetFileName());
-            pLookupLevel = LevelLookup.GetData(name);
-        }
-        else
-        {
-            // Startup cache
-            const char* szName = pRes->mfGetFileName();
-            CCryNameTSCRC name;
-            if (_strnicmp(szName, "ShaderCache/", 12) == 0)
-            {
-                stack_string sName = stack_string(g_shaderCache) + stack_string(&szName[12]);
-                name = sName.c_str();
-            }
-            else if (_strnicmp(szName, g_shaderCache, 14) == 0)
-            {
-                name = LevelLookup.AdjustName(pRes->mfGetFileName());
-            }
-            else
-            {
-                Warning("Wrong virtual directory in ShaderCacheStartup.pak");
-                SAFE_DELETE(pRes);
-                continue;
-            }
-            pLookupLevel = LevelLookup.GetData(name);
-        }
-        if (!pLookupLevel)
-        {
-            SAFE_DELETE(pRes);
-            continue;
-        }
-        if (pLookupLevel->m_CacheMajorVer != pLookupGlobal->m_CacheMajorVer || pLookupLevel->m_CacheMinorVer != pLookupGlobal->m_CacheMinorVer || pLookupLevel->m_CRC32 != pLookupGlobal->m_CRC32)
-        {
-            SAFE_DELETE(pRes);
-            continue;
-        }
-        const char* s = fileInfoPerLevel.c_str();
-        const uint32 nLen = strlen(s);
-        int nStart = -1;
-        int nEnd = -1;
-        bool bPC = false;
-        for (uint32 i = 0; i < nLen; i++)
-        {
-            uint32 n = nLen - i - 1;
-            char c = s[n];
-            if (c == '.')
-            {
-                nEnd = n;
-            }
-            else
-            if (!bPC)
-            {
-                if (c == '@' || c == '/')
-                {
-                    bPC = true;
-                }
-            }
-            else
-            if (c == '/')
-            {
-                nStart = n + 1;
-                break;
-            }
-        }
-        if (nStart < 0 || nEnd < 0)
-        {
-            SAFE_DELETE(pRes);
-            continue;
-        }
-        char str[128];
-        memcpy(str, &s[nStart], nEnd - nStart);
-        str[nEnd - nStart] = 0;
-        CCryNameTSCRC Name = str;
-        FXCompressedShadersItor it = CHWShader::m_CompressedShaders.find(Name);
-        SHWActivatedShader* pAS = NULL;
-        if (it == CHWShader::m_CompressedShaders.end())
-        {
-            pAS = new SHWActivatedShader;
-            pAS->m_bPersistent = bPersistent;
-            CHWShader::m_CompressedShaders.insert(FXCompressedShadersItor::value_type(Name, pAS));
-        }
-        else
-        {
-            pAS = it->second;
-        }
-        ResDir* pDir = pRes->mfGetDirectory();
-        for (uint32 i = 0; i < pDir->size(); i++)
-        {
-            SDirEntry& DE = (*pDir)[i];
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_shadersdebug == 3 || CRenderer::CV_r_shadersdebug == 4)
-            {
-                iLog->Log("---Cache: PreactivateForLevel %s': 0x%x", pRes->mfGetFileName(), DE.Name.get());
-            }
-
-            FXCompressedShaderRemapItor itR = pAS->m_Remap.find(DE.Name);
-            uint32 nIDDev = DE.Name.get();
-            assert(DE.offset > 0);
-            if (itR == pAS->m_Remap.end())
-            {
-                pAS->m_Remap.insert(FXCompressedShaderRemapItor::value_type(DE.Name, nIDDev));
-                itR = pAS->m_Remap.find(DE.Name);
-            }
-            FXCompressedShaderItor itS = pAS->m_CompressedShaders.find(itR->second);
-            if (itS == pAS->m_CompressedShaders.end())
-            {
-                uint32 nSizeCompressed;
-                uint32 nSizeDecompressed;
-                byte* pDataCompressed = pRes->mfFileReadCompressed(&DE, nSizeDecompressed, nSizeCompressed);
-                if (!pDataCompressed)
-                {
-                    SAFE_DELETE_ARRAY(pDataCompressed);
-                    bRes = false;
-                    continue;
-                }
-
-                // only store compressed data - don't store token data for example because this is not compressed
-                if (nSizeCompressed == nSizeDecompressed)
-                {
-                    SAFE_DELETE_ARRAY(pDataCompressed);
-                    continue;
-                }
-
-                if (nSizeCompressed > std::numeric_limits<uint32>::max() || nSizeDecompressed > std::numeric_limits<uint32>::max())
-                {
-                    CryFatalError("size of shader %s (compressed: %u, decompressed: %u) is too big to be stored in uint32", pRes->mfGetFileName(), (uint)nSizeCompressed, (uint)nSizeDecompressed);
-                    SAFE_DELETE_ARRAY(pDataCompressed);
-                    bRes = false;
-                    continue;
-                }
-
-                SCompressedData CD;
-                CD.m_nSizeCompressedShader = nSizeCompressed;
-                CD.m_nSizeDecompressedShader = nSizeDecompressed;
-                CD.m_pCompressedShader = pDataCompressed;
-                assert (CD.m_nSizeCompressedShader != CD.m_nSizeDecompressedShader);
-
-                /*byte *pData = new byte[CD.m_nSizeDecompressedShader+1];
-                pData[CD.m_nSizeDecompressedShader] = 0xaa;
-                Decodem(CD.m_pCompressedShader, pData, CD.m_nSizeCompressedShader);
-                assert(pData[CD.m_nSizeDecompressedShader] == 0xaa);
-                SShaderCacheHeaderItem *pIt = (SShaderCacheHeaderItem *)pData;
-                if (CParserBin::m_bEndians)
-                  SwapEndian(*pIt, eBigEndian);
-                SAFE_DELETE_ARRAY(pData);*/
-
-                pAS->m_CompressedShaders.insert(FXCompressedShaderItor::value_type(nIDDev, CD));
-            }
-            else
-            {
-#ifdef _DEBUG
-                uint32 nSizeCompressed;
-                uint32 nSizeDecompressed;
-                byte* pDataCompressed = pRes->mfFileReadCompressed(&DE, nSizeDecompressed, nSizeCompressed);
-                assert(nSizeCompressed < 65536 && nSizeDecompressed < 65536);
-                assert(pDataCompressed);
-                if (pDataCompressed)
-                {
-                    SCompressedData& CD1 = itS->second;
-                    assert(CD1.m_nSizeCompressedShader == nSizeCompressed);
-                    SAFE_DELETE_ARRAY(pDataCompressed);
-                }
-#endif
-            }
-        }
-        SAFE_DELETE(pRes);
-    } while (handle = gEnv->pCryPak->FindNext(handle));
-
-    gEnv->pCryPak->FindClose (handle);
-
-    return bRes;
-}
-
-int SHWActivatedShader::Size()
-{
-    int nSize = sizeof(SHWActivatedShader);
-    nSize += sizeOfMap(m_CompressedShaders);
-    nSize += sizeOfMapS(m_Remap);
-
-    return nSize;
-}
-
-void SHWActivatedShader::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(SHWActivatedShader));
-    pSizer->AddObject(m_CompressedShaders);
-    pSizer->AddObject(m_Remap);
-}
-
-SHWActivatedShader::~SHWActivatedShader()
-{
-    FXCompressedShaderItor it;
-    for (it = m_CompressedShaders.begin(); it != m_CompressedShaders.end(); ++it)
-    {
-        SCompressedData& Data = it->second;
-        SAFE_DELETE_ARRAY(Data.m_pCompressedShader);
-    }
-    m_CompressedShaders.clear();
-    m_Remap.clear();
-}
-bool CShaderMan::mfReleasePreactivatedShaderData()
-{
-    FXCompressedShadersItor it;
-    std::vector<CCryNameTSCRC> DelStuff;
-    for (it = CHWShader::m_CompressedShaders.begin(); it != CHWShader::m_CompressedShaders.end(); ++it)
-    {
-        SHWActivatedShader* pAS = it->second;
-        if (pAS && !pAS->m_bPersistent)
-        {
-            SAFE_DELETE(pAS);
-            DelStuff.push_back(it->first);
-        }
-    }
-    uint32 i;
-    for (i = 0; i < DelStuff.size(); i++)
-    {
-        CHWShader::m_CompressedShaders.erase(DelStuff[i]);
-    }
-    return true;
-}
-
-bool CShaderMan::mfPreactivateShaders2(
-    [[maybe_unused]] const char* szPak, const char* szPath, bool bPersistent, [[maybe_unused]] const char* szBindRoot)
-{
-    mfReleasePreactivatedShaderData();
-
-    bool bRes = true;
-
-    // Get shader platform name and make it lower
-    AZStd::string shaderLanguageName = GetShaderLanguageName();
-    AZStd::to_lower(shaderLanguageName.begin(), shaderLanguageName.end());
-
-    const AZStd::string pathPerLevel = AZStd::string::format( "%s%s/", szPath, shaderLanguageName.c_str());
-
-    CResFileLookupDataMan LevelLookup;
-    bool bLoaded = LevelLookup.LoadData((pathPerLevel + "lookupdata.bin").c_str(), CParserBin::m_bEndians, true);
-    if (bLoaded)
-    {
-        
-        const char* cgcShaders = "cgcshaders";
-        const char* cgdShaders = "cgdshaders";
-        const char* cggShaders = "cggshaders";
-        const char* cghShaders = "cghshaders";
-        const char* cgpShaders = "cgpshaders";
-        const char* cgvShaders = "cgvshaders";
-        
-        bRes &= mfPreactivate2(LevelLookup, pathPerLevel + cgcShaders, pathPerLevel + cgcShaders, false, bPersistent);
-        bRes &= mfPreactivate2(LevelLookup, pathPerLevel + cgdShaders, pathPerLevel + cgdShaders, false, bPersistent);
-        bRes &= mfPreactivate2(LevelLookup, pathPerLevel + cggShaders, pathPerLevel + cggShaders, false, bPersistent);
-        bRes &= mfPreactivate2(LevelLookup, pathPerLevel + cghShaders, pathPerLevel + cghShaders, false, bPersistent);
-        bRes &= mfPreactivate2(LevelLookup, pathPerLevel + cgpShaders, pathPerLevel + cgpShaders, false, bPersistent);
-        bRes &= mfPreactivate2(LevelLookup, pathPerLevel + cgvShaders, pathPerLevel + cgvShaders, true,  bPersistent);
-    }
-
-    return bRes;
-}
-
-
-void CHWShader_D3D::mfLogShaderCacheMiss(SHWSInstance* pInst)
-{
-    CShaderMan& Man = gRenDev->m_cEF;
-
-    // update the stats
-    Man.m_ShaderCacheStats.m_nGlobalShaderCacheMisses++;
-
-    // don't do anything else if CVar is disabled and no callback is registered
-    if (CRenderer::CV_r_shaderslogcachemisses == 0 && Man.m_ShaderCacheMissCallback == 0)
-    {
-        return;
-    }
-
-    char nameCache[256];
-    azstrcpy(nameCache, AZ_ARRAY_SIZE(nameCache), GetName());
-    char* s = strchr(nameCache, '(');
-    if (s)
-    {
-        s[0] = 0;
-    }
-    string sNew;
-    SShaderCombIdent Ident = pInst->m_Ident;
-    Ident.m_GLMask = m_nMaskGenFX;
-    gRenDev->m_cEF.mfInsertNewCombination(Ident, pInst->m_eClass, nameCache, 0, &sNew, 0);
-
-    if (CRenderer::CV_r_shaderslogcachemisses > 1 && !gRenDev->m_bShaderCacheGen && !gEnv->IsEditor())
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "[SHADERS] GCM Global Cache Miss: %s\n", sNew.c_str());
-    }
-
-    string sEntry;
-
-    sEntry = "[";
-    sEntry += GetShaderListFilename().c_str();
-    sEntry += "]";
-    sEntry += sNew;
-
-    CCryNameTSCRC cryName(sEntry);
-
-    // do we already contain this entry (vec is sorted so lower bound gives us already the good position to insert)
-    CShaderMan::ShaderCacheMissesVec::iterator it = std::lower_bound(Man.m_ShaderCacheMisses.begin(), Man.m_ShaderCacheMisses.end(), cryName);
-    if (it == Man.m_ShaderCacheMisses.end() || cryName != (*it))
-    {
-        Man.m_ShaderCacheMisses.insert(it, cryName);
-
-        if (CRenderer::CV_r_shaderslogcachemisses)
-        {
-            AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
-            gEnv->pFileIO->Open(Man.m_ShaderCacheMissPath.c_str(), AZ::IO::OpenMode::ModeAppend | AZ::IO::OpenMode::ModeUpdate, fileHandle);
-            if (fileHandle != AZ::IO::InvalidHandle)
-            {
-                AZ::IO::Print(fileHandle, "%s\n", sEntry.c_str());
-                gEnv->pFileIO->Close(fileHandle);
-            }
-        }
-
-        // call callback if provided to inform client about misses
-        if (Man.m_ShaderCacheMissCallback)
-        {
-            (*Man.m_ShaderCacheMissCallback)(sEntry.c_str());
-        }
-    }
-}
-
-void CHWShader_D3D::mfLogShaderRequest([[maybe_unused]] SHWSInstance* pInst)
-{
-#if !defined(_RELEASE)
-    IF (CRenderer::CV_r_shaderssubmitrequestline > 1, 0)
-    {
-        mfSubmitRequestLine(pInst);
-    }
-#endif
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DShadows.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DShadows.cpp
deleted file mode 100644
index f5ff24f46b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DShadows.cpp
+++ /dev/null
@@ -1,2004 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : shadows support.
-
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include <IEntityRenderState.h>
-#include "../Common/Shadow_Renderer.h"
-#include "../Common/ReverseDepth.h"
-#include "D3DPostProcess.h"
-
-#include "I3DEngine.h"
-
-#include "GraphicsPipeline/Common/GraphicsPipelinePass.h"
-
-#include "Common/RenderView.h"
-
-#if defined(FEATURE_SVO_GI)
-#include "D3D_SVO.h"
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(D3DShadows_cpp)
-#endif
-
-namespace
-{
-    CryCriticalSection g_cDynTexLock;
-}
-
-void CD3D9Renderer::EF_PrepareShadowGenRenderList()
-{
-    AZ_TRACE_METHOD();
-    int nThreadID = m_RP.m_nFillThreadID;
-    int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-    int NumDynLights = m_RP.m_DLights[nThreadID][nCurRecLevel].Num();
-
-    //TFIX nCurRecLevel+1 is incorrect
-    TArray<SRenderLight>&  arrDeferLights = CDeferredShading::Instance().GetLights(nThreadID, nCurRecLevel);
-
-    RegisterFinalizeShadowJobs(nThreadID);
-
-    if (NumDynLights <= 0 && arrDeferLights.Num() <= 0)
-    {
-        return;
-    }
-
-    for (int nLightID = 0; nLightID < NumDynLights; nLightID++)
-    {
-        SRenderLight* pLight = &m_RP.m_DLights[nThreadID][nCurRecLevel][nLightID];
-        EF_PrepareShadowGenForLight(pLight, nLightID);
-    }
-
-    for (uint32 nDeferLightID = 0; nDeferLightID < arrDeferLights.Num(); nDeferLightID++)
-    {
-        SRenderLight* pLight = &arrDeferLights[nDeferLightID];
-        EF_PrepareShadowGenForLight(pLight, (NumDynLights + nDeferLightID));
-    }
-
-    // add custom frustums
-    {
-        ShadowMapFrustum* arrCustomFrustums;
-        int nFrustumCount;
-        gEnv->p3DEngine->GetCustomShadowMapFrustums(arrCustomFrustums, nFrustumCount);
-
-        for (uint32 i = 0; i < nFrustumCount; ++i)
-        {
-            if (PrepareShadowGenForFrustum(&arrCustomFrustums[i], NULL, 0, i))
-            {
-                SRenderPipeline::SShadowFrustumToRender* pToRender = m_RP.SShadowFrustumToRenderList[nThreadID].AddIndex(1);
-                pToRender->pFrustum = &arrCustomFrustums[i];
-                pToRender->nRecursiveLevel = nCurRecLevel;
-                pToRender->nLightID = 0;
-                pToRender->pLight = NULL;
-            }
-        }
-    }
-}
-
-bool CD3D9Renderer::EF_PrepareShadowGenForLight(SRenderLight* pLight, int nLightID)
-{
-    assert((unsigned int) nLightID < (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS));
-    if ((unsigned int) nLightID >= (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS))
-    {
-        //Warning("CRenderer::EF_PrepareShadowGenForLight: Too many light sources used ..."); // redundant
-        return false;
-    }
-    int nThreadID  = m_RP.m_nFillThreadID;
-    int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-    if (!(pLight->m_Flags & DLF_CASTSHADOW_MAPS))
-    {
-        return false;
-    }
-
-    const int nLightFrustumBaseID = nLightID * MAX_SHADOWMAP_LOD;
-
-    ShadowMapFrustum** ppSMFrustumList = pLight->m_pShadowMapFrustums;
-    if (!ppSMFrustumList)
-    {
-        return false;
-    }
-
-
-    int32 nCurLOD = 0;
-
-    for (int nCaster = 0; *ppSMFrustumList && nCaster != MAX_GSM_LODS_NUM; ++ppSMFrustumList, ++nCaster)
-    {
-        //use pools
-        if (CV_r_UseShadowsPool && pLight->m_Flags & DLF_DEFERRED_LIGHT)
-        {
-            (*ppSMFrustumList)->bUseShadowsPool = true;
-        }
-        else
-        {
-            (*ppSMFrustumList)->bUseShadowsPool = false;
-        }
-
-        if (PrepareShadowGenForFrustum(*ppSMFrustumList, pLight, nLightFrustumBaseID, nCurLOD))
-        {
-            SRenderPipeline::SShadowFrustumToRender* pToRender = m_RP.SShadowFrustumToRenderList[nThreadID].AddIndex(1);
-            pToRender->pFrustum = (*ppSMFrustumList);
-            pToRender->nRecursiveLevel = nCurRecLevel;
-            pToRender->nLightID = nLightID;
-            pToRender->pLight = pLight;
-            nCurLOD++;
-        }
-    }
-
-    return true;
-}
-
-bool CD3D9Renderer::PrepareShadowGenForFrustum(ShadowMapFrustum* pCurFrustum, SRenderLight* pLight, [[maybe_unused]] int nLightFrustumBaseID, [[maybe_unused]] int nLOD)
-{
-    int nThreadID  = m_RP.m_nFillThreadID;
-    assert(SRendItem::m_RecurseLevel[nThreadID] == 0);
-
-    PROFILE_FRAME(PrepareShadowGenForFrustum);
-
-    //validate shadow frustum
-    assert(pCurFrustum);
-    if (!pCurFrustum)
-    {
-        return false;
-    }
-    if (pCurFrustum->m_castersList.IsEmpty() && pCurFrustum->m_jobExecutedCastersList.IsEmpty() &&
-        !pCurFrustum->IsCached() && pCurFrustum->m_eFrustumType != ShadowMapFrustum::e_GsmDynamicDistance)
-    {
-        return false;
-    }
-    if (pCurFrustum->IsCached() && pCurFrustum->nTexSize == 0)
-    {
-        return false;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //regenerate on reset device
-    if (pCurFrustum->nResetID != m_nFrameReset)
-    {
-        pCurFrustum->nResetID = m_nFrameReset;
-        pCurFrustum->RequestUpdate();
-    }
-
-    int nShadowGenGPU = 0;
-
-    if (GetActiveGPUCount() > 1 && CV_r_ShadowGenMode == 1)
-    {
-        //TOFIx: make m_nFrameSwapID - double buffered
-        nShadowGenGPU = gRenDev->RT_GetCurrGpuID();
-
-        pCurFrustum->nOmniFrustumMask = 0x3F;
-        //in case there was switch on the fly - regenerate all faces
-        if (pCurFrustum->nInvalidatedFrustMask[nShadowGenGPU] > 0)
-        {
-            pCurFrustum->nInvalidatedFrustMask[nShadowGenGPU] = 0x3F;
-        }
-    }
-
-
-
-    bool bNotNeedUpdate = false;
-    if (pCurFrustum->bOmniDirectionalShadow)
-    {
-        bNotNeedUpdate = !(pCurFrustum->nInvalidatedFrustMask[nShadowGenGPU] & pCurFrustum->nOmniFrustumMask);
-    }
-    else
-    {
-        bNotNeedUpdate = !pCurFrustum->isUpdateRequested(nShadowGenGPU);
-    }
-
-    if (bNotNeedUpdate && !pCurFrustum->bUseShadowsPool)
-    {
-        memset(pCurFrustum->nShadowGenID[nThreadID], 0xFF, sizeof(pCurFrustum->nShadowGenID[nThreadID]));
-        return pCurFrustum->nShadowGenMask != 0;
-    }
-
-
-    if (pCurFrustum->bUseShadowsPool)
-    {
-        pCurFrustum->nShadowPoolUpdateRate = min((uint32)CRenderer::CV_r_ShadowPoolMaxFrames, (uint32)pCurFrustum->nShadowPoolUpdateRate);
-        if (!bNotNeedUpdate)
-        {
-            pCurFrustum->nShadowPoolUpdateRate >>= 2;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //  update is requested - we should generate new shadow map
-    //////////////////////////////////////////////////////////////////////////
-    //force unwrap frustum
-    if (pCurFrustum->bOmniDirectionalShadow)
-    {
-        pCurFrustum->bUnwrapedOmniDirectional = true;
-    }
-    else
-    {
-        pCurFrustum->bUnwrapedOmniDirectional = false;
-    }
-
-    ETEX_Type eTT = (pCurFrustum->bOmniDirectionalShadow && !pCurFrustum->bUnwrapedOmniDirectional) ? eTT_Cube : eTT_2D;
-
-    //////////////////////////////////////////////////////////////////////////
-    //recalculate LOF rendering params
-    //////////////////////////////////////////////////////////////////////////
-
-    //calc texture resolution and frustum resolution
-    pCurFrustum->nTexSize = max(pCurFrustum->nTexSize, 32);
-    pCurFrustum->nTextureWidth = pCurFrustum->nTexSize;
-    pCurFrustum->nTextureHeight = pCurFrustum->nTexSize;
-    pCurFrustum->nShadowMapSize = pCurFrustum->nTexSize;
-
-    if (pCurFrustum->bUnwrapedOmniDirectional)
-    {
-        pCurFrustum->nTextureWidth = pCurFrustum->nTexSize * 3;
-        pCurFrustum->nTextureHeight = pCurFrustum->nTexSize * 2;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //Select shadow buffers format
-    //////////////////////////////////////////////////////////////////////////
-    ETEX_Format eTF = eTF_D32F;
-    if (pCurFrustum->IsCached())
-    {
-        eTF = CV_r_ShadowsCacheFormat == 0 ? eTF_D32F : eTF_D16;
-    }
-    else if IsCVarConstAccess(constexpr) (CV_r_shadowtexformat == 0)
-    {
-        eTF = eTF_D32F;
-    }
-    else if IsCVarConstAccess(constexpr) (CV_r_shadowtexformat == 1)
-    {
-        eTF = eTF_D16;
-    }
-    else
-    {
-        eTF = eTF_D24S8;
-    }
-
-    if (pCurFrustum->bOmniDirectionalShadow && !(pCurFrustum->bUnwrapedOmniDirectional))
-    {
-        pCurFrustum->bHWPCFCompare = false;
-    }
-    else
-    {
-        const bool bSun = pLight && (pLight->m_Flags & DLF_SUN) != 0;
-        pCurFrustum->bHWPCFCompare = !bSun || (CV_r_ShadowsPCFiltering != 0);
-    }
-    //assign requested texture format
-    pCurFrustum->m_eReqTF = eTF;
-    pCurFrustum->m_eReqTT = eTT;
-
-    //assign owners
-    pCurFrustum->pFrustumOwner = pCurFrustum;
-
-    //actual view camera position
-    Vec3 vCamOrigin = iSystem->GetViewCamera().GetPosition();
-
-    CCamera tmpCamera;
-
-    int nSides = 1;
-    if (pCurFrustum->bOmniDirectionalShadow)
-    {
-        nSides = OMNI_SIDES_NUM;
-    }
-
-    // Static shadow map might not have any active casters, so don't reset nShadowGenMask every frame
-    if (!pCurFrustum->IsCached())
-    {
-        pCurFrustum->nShadowGenMask = pCurFrustum->m_eFrustumType == ShadowMapFrustum::e_GsmDynamicDistance ? 1 : 0;
-    }
-    Matrix44 m;
-
-    for (int nS = 0; nS < nSides; nS++)
-    {
-        //update check for shadow frustums
-        if (pCurFrustum->bOmniDirectionalShadow && !pCurFrustum->bUseShadowsPool)
-        {
-            if (!((pCurFrustum->nInvalidatedFrustMask[nShadowGenGPU] & pCurFrustum->nOmniFrustumMask) & (1 << nS)))
-            {
-                continue;
-            }
-            else
-            {
-                pCurFrustum->nInvalidatedFrustMask[nShadowGenGPU] &= ~(1 << nS);
-            }
-        }
-        else
-        {
-            pCurFrustum->nInvalidatedFrustMask[nShadowGenGPU] = 0;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Calc frustum CCamera for current frustum
-        //////////////////////////////////////////////////////////////////////////
-        if (!pCurFrustum->bOmniDirectionalShadow)
-        {
-            if (pCurFrustum->m_Flags & (DLF_PROJECT | DLF_AREA_LIGHT))
-            {
-                SRenderLight instLight = *pLight;
-                if (pLight->m_Flags & DLF_AREA_LIGHT)
-                {
-                    // Pull the shadow frustum back to encompas the area of the light source.
-                    float fMaxSize = max(pLight->m_fAreaWidth, pLight->m_fAreaHeight);
-                    float fScale = fMaxSize / max(tanf(DEG2RAD(pLight->m_fLightFrustumAngle)), 0.0001f);
-
-                    Vec3 vOffsetDir = fScale * pLight->m_ObjMatrix.GetColumn0().GetNormalized();
-                    instLight.SetPosition(instLight.m_Origin - vOffsetDir);
-                    instLight.m_fProjectorNearPlane = fScale;
-                }
-
-                // Frustum angle is clamped to prevent projection matrix problems.
-                // We clamp here because area lights and non-shadow casting lights can cast 180 degree light.
-                CShadowUtils::GetCubemapFrustumForLight(&instLight, 0, min(2 * pLight->m_fLightFrustumAngle, 175.0f), &(pCurFrustum->mLightProjMatrix), &(pCurFrustum->mLightViewMatrix), false);
-            }
-            else
-            {
-                if (pCurFrustum->m_eFrustumType == ShadowMapFrustum::e_PerObject)
-                {
-                    AABB lsBounds = CShadowUtils::GetShadowMatrixForCasterBox(pCurFrustum->mLightProjMatrix, pCurFrustum->mLightViewMatrix, pCurFrustum, 20.f);
-
-                    // normalize filter filter kernel size to dimensions of light space bounding box
-                    pCurFrustum->fWidthS *= pCurFrustum->nTextureWidth  / (lsBounds.max.x - lsBounds.min.x);
-                    pCurFrustum->fWidthT *= pCurFrustum->nTextureHeight / (lsBounds.max.y - lsBounds.min.y);
-                }
-                else if (pCurFrustum->m_eFrustumType != ShadowMapFrustum::e_HeightMapAO)
-                {
-                    CShadowUtils::GetShadowMatrixOrtho(pCurFrustum->mLightProjMatrix,  pCurFrustum->mLightViewMatrix, m_CameraMatrix, pCurFrustum, false);
-                }
-            }
-
-            //Pre-multiply matrices
-            Matrix44 mViewProj =  Matrix44(pCurFrustum->mLightViewMatrix) * Matrix44(pCurFrustum->mLightProjMatrix);
-            pCurFrustum->mLightViewMatrix = mViewProj;
-            pCurFrustum->mLightProjMatrix.SetIdentity();
-
-            tmpCamera = gEnv->p3DEngine->GetRenderingCamera();
-        }
-        else
-        {
-            tmpCamera = pCurFrustum->FrustumPlanes[nS];
-        }
-
-
-        //////////////////////////////////////////////////////////////////////////
-        // Invoke IRenderNode::Render Jobs
-        //////////////////////////////////////////////////////////////////////////
-        uint32 nShadowGenID = m_nShadowGenId[nThreadID];
-        m_nShadowGenId[nThreadID] += 1;
-
-        pCurFrustum->nShadowGenID[nThreadID][nS] = nShadowGenID;
-
-        uint32 nRenderingFlags = SRenderingPassInfo::DEFAULT_FLAGS;
-
-#if defined(FEATURE_SVO_GI)
-        if (CSvoRenderer::GetRsmColorMap(*pCurFrustum))
-        {
-            // we need correct diffuse texture for every chunk
-            nRenderingFlags |= SRenderingPassInfo::DISABLE_RENDER_CHUNK_MERGE;
-        }
-#endif
-        // create a matching rendering pass info for shadows
-        SRenderingPassInfo passInfo = SRenderingPassInfo::CreateShadowPassRenderingInfo(tmpCamera, pCurFrustum->m_Flags, pCurFrustum->nShadowMapLod,
-                pCurFrustum->IsCached(), pCurFrustum->bIsMGPUCopy, &pCurFrustum->nShadowGenMask, nS, nShadowGenID, nRenderingFlags);
-
-        StartInvokeShadowMapRenderJobs(pCurFrustum, passInfo);
-    }//nSides
-
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-void CD3D9Renderer::PrepareShadowGenForFrustumNonJobs([[maybe_unused]] const int nFlags)
-{
-    int nThreadID  = m_RP.m_nFillThreadID;
-#if !defined(NDEBUG)
-    int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-#endif
-
-    CCamera tmpCamera;
-
-    for (int i = 0; i < m_RP.SShadowFrustumToRenderList[nThreadID].size(); ++i)
-    {
-        SRenderPipeline::SShadowFrustumToRender& rFrustumToRender = m_RP.SShadowFrustumToRenderList[nThreadID][i];
-        ShadowMapFrustum* pCurFrustum = rFrustumToRender.pFrustum;
-
-        int nSides = pCurFrustum->bOmniDirectionalShadow ? OMNI_SIDES_NUM : 1;
-
-        for (int nS = 0; nS < nSides; nS++)
-        {
-            if (pCurFrustum->nShadowGenID[nThreadID][nS] == 0xFFFFFFFF)
-            {
-                continue;
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // Calc frustum CCamera for current frustum
-            //////////////////////////////////////////////////////////////////////////
-            if (!pCurFrustum->bOmniDirectionalShadow)
-            {
-                tmpCamera = gEnv->p3DEngine->GetRenderingCamera();
-            }
-            else
-            {
-                tmpCamera = pCurFrustum->FrustumPlanes[nS];
-            }
-            //////////////////////////////////////////////////////////////////////////
-            // Invoke IRenderNode::Render
-            //////////////////////////////////////////////////////////////////////////
-
-
-            uint32 nRenderingFlags = SRenderingPassInfo::DEFAULT_FLAGS;
-
-#if defined(FEATURE_SVO_GI)
-            if (CSvoRenderer::GetRsmColorMap(*pCurFrustum))
-            {
-                // we need correct diffuse texture for every chunk
-                nRenderingFlags |= SRenderingPassInfo::DISABLE_RENDER_CHUNK_MERGE;
-            }
-#endif
-
-            // create a matching rendering pass info for shadows
-            SRenderingPassInfo passInfo = SRenderingPassInfo::CreateShadowPassRenderingInfo(tmpCamera, pCurFrustum->m_Flags, pCurFrustum->nShadowMapLod,
-                    pCurFrustum->IsCached(), pCurFrustum->bIsMGPUCopy, &pCurFrustum->nShadowGenMask, nS, pCurFrustum->nShadowGenID[nThreadID][nS], nRenderingFlags);
-
-            for (int casterIdx = 0; casterIdx < pCurFrustum->m_castersList.Count(); ++casterIdx)
-            {
-                IShadowCaster* pEnt  = pCurFrustum->m_castersList[casterIdx];
-
-                //TOFIX reactivate OmniDirectionalShadow
-                if (pCurFrustum->bOmniDirectionalShadow)
-                {
-                    AABB aabb = pEnt->GetBBoxVirtual();
-                    //!!! Reactivate proper camera
-                    bool bVis = tmpCamera.IsAABBVisible_F(aabb);
-                    if (!bVis)
-                    {
-                        continue;
-                    }
-                }
-
-                if ((pCurFrustum->m_Flags & DLF_DIFFUSEOCCLUSION) && pEnt->HasOcclusionmap(0, pCurFrustum->pLightOwner))
-                {
-                    continue;
-                }
-
-                gEnv->p3DEngine->RenderRenderNode_ShadowPass(pEnt, passInfo, NULL);
-            }
-        }
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Name: GetTextureRect()
-// Desc: Get the dimensions of the texture
-//-----------------------------------------------------------------------------
-HRESULT GetTextureRect(CTexture* pTexture, RECT* pRect)
-{
-    pRect->left = 0;
-    pRect->top = 0;
-    pRect->right = pTexture->GetWidth();
-    pRect->bottom = pTexture->GetHeight();
-
-    return S_OK;
-}
-
-void CD3D9Renderer::OnEntityDeleted(IRenderNode* pRenderNode)
-{
-    m_pRT->RC_EntityDelete(pRenderNode);
-}
-
-void _DrawText(ISystem* pSystem, int x, int y, const float fScale, const char* format, ...)
-PRINTF_PARAMS(5, 6);
-
-void _DrawText([[maybe_unused]] ISystem* pSystem, int x, int y, const float fScale, const char* format, ...)
-{
-    char buffer[512];
-    va_list args;
-    va_start(args, format);
-    vsprintf_s(buffer, format, args);
-    va_end(args);
-
-    float color[4] = {0, 1, 0, 1};
-    gEnv->pRenderer->Draw2dLabel((float)x, (float)y, fScale, color, false, buffer);
-}
-
-void CD3D9Renderer::DrawAllShadowsOnTheScreen()
-{
-    float width = 800;
-    float height = 600;
-
-    TransformationMatrices backupSceneMatrices;
-
-    Set2DMode(static_cast<uint32>(width), static_cast<uint32>(height), backupSceneMatrices);
-
-    EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    EF_SetSrgbWrite(false);
-
-    int nMaxCount = 16;
-
-    float fArrDim = max(4.f, sqrtf((float)nMaxCount));
-    float fPicDimX = width / fArrDim;
-    float fPicDimY = height / fArrDim;
-    int nShadowId = 0;
-    SDynTexture_Shadow* pTX = SDynTexture_Shadow::s_RootShadow.m_NextShadow;
-    for (float x = 0; nShadowId < nMaxCount && x < width - 10; x += fPicDimX)
-    {
-        for (float y = 0; nShadowId < nMaxCount && y < height - 10; y += fPicDimY)
-        {
-            static ICVar* pVar = iConsole->GetCVar("e_ShadowsDebug");
-            if (pVar && pVar->GetIVal() == 1)
-            {
-                while (pTX->m_pTexture && (pTX->m_pTexture->m_nAccessFrameID + 2) < GetFrameID(false) && pTX != &SDynTexture_Shadow::s_RootShadow)
-                {
-                    pTX = pTX->m_NextShadow;
-                }
-            }
-
-            if (pTX == &SDynTexture_Shadow::s_RootShadow)
-            {
-                break;
-            }
-
-            if (pTX->m_pTexture && pTX->pLightOwner)
-            {
-                CTexture* tp = pTX->m_pTexture;
-                if (tp)
-                {
-                    int nSavedAccessFrameID = pTX->m_pTexture->m_nAccessFrameID;
-
-
-                    SetState(/*GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA | */ GS_NODEPTHTEST);
-                    if (tp->GetTextureType() == eTT_2D)
-                    {
-                        //Draw2dImage(x, y, fPicDimX-1, fPicDimY-1, tp->GetID(), 0,1,1,0,180);
-
-                        // set shader
-                        CShader* pSH(CShaderMan::s_ShaderShadowMaskGen);
-
-                        uint32 nPasses = 0;
-                        static CCryNameTSCRC TechName = "DebugShadowMap";
-                        pSH->FXSetTechnique(TechName);
-                        pSH->FXBegin(&nPasses, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-                        pSH->FXBeginPass(0);
-
-                        Matrix44A origMatProj = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-                        Matrix44A origMatView = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-                        Matrix44A* m = &m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-                        mathMatrixOrthoOffCenterLH(m, 0.0f, (float)width, (float)height, 0.0f, -1e30f, 1e30f);
-                        m = &m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-                        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-
-                        SetState(GS_NODEPTHTEST);
-                        STexState ts(FILTER_LINEAR, false);
-                        ts.m_nAnisotropy = 1;
-                        tp->Apply(0, CTexture::GetTexState(ts));
-                        D3DSetCull(eCULL_None);
-
-                        TempDynVB<SVF_P3F_T3F> vb(gcpRendD3D);
-                        vb.Allocate(4);
-                        SVF_P3F_T3F* vQuad = vb.Lock();
-
-                        vQuad[0].p = Vec3(x, y, 1);
-                        vQuad[0].st = Vec3(0, 1, 1);
-                        //vQuad[0].color.dcolor = (uint32)-1;
-                        vQuad[1].p = Vec3(x + fPicDimX - 1, y, 1);
-                        vQuad[1].st = Vec3(1, 1, 1);
-                        //vQuad[1].color.dcolor = (uint32)-1;
-                        vQuad[3].p = Vec3(x + fPicDimX - 1, y + fPicDimY - 1, 1);
-                        vQuad[3].st = Vec3(1, 0, 1);
-                        //vQuad[3].color.dcolor = (uint32)-1;
-                        vQuad[2].p = Vec3(x, y + fPicDimY - 1, 1);
-                        vQuad[2].st = Vec3(0, 0, 1);
-                        //vQuad[2].color.dcolor = (uint32)-1;
-
-                        vb.Unlock();
-                        vb.Bind(0);
-                        vb.Release();
-
-                        if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-                        {
-                            FX_Commit();
-                            FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-                        }
-
-                        pSH->FXEndPass();
-                        pSH->FXEnd();
-
-                        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = origMatView;
-                        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-                    }
-                    else
-                    {
-                        // set shader
-                        CShader* pSH(CShaderMan::s_ShaderShadowMaskGen);
-
-                        uint32 nPasses = 0;
-                        static CCryNameTSCRC TechName = "DebugCubeMap";
-                        pSH->FXSetTechnique(TechName);
-                        pSH->FXBegin(&nPasses, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-                        pSH->FXBeginPass(0);
-
-                        float fSizeX = fPicDimX / 3;
-                        float fSizeY = fPicDimY / 2;
-                        float fx = ScaleCoordX(x);
-                        fSizeX = ScaleCoordX(fSizeX);
-                        float fy = ScaleCoordY(y);
-                        fSizeY = ScaleCoordY(fSizeY);
-                        float fOffsX[] = {fx, fx + fSizeX, fx + fSizeX * 2, fx, fx + fSizeX, fx + fSizeX * 2};
-                        float fOffsY[] = {fy, fy, fy, fy + fSizeY, fy + fSizeY, fy + fSizeY};
-                        Vec3 vTC0[] = {Vec3(1, 1, 1), Vec3(-1, 1, -1), Vec3(-1, 1, -1), Vec3(-1, -1, 1), Vec3(-1, 1, 1), Vec3(1, 1, -1)};
-                        Vec3 vTC1[] = {Vec3(1, 1, -1), Vec3(-1, 1, 1), Vec3(1, 1, -1), Vec3(1, -1, 1), Vec3(1, 1, 1), Vec3(-1, 1, -1)};
-                        Vec3 vTC2[] = {Vec3(1, -1, -1), Vec3(-1, -1, 1), Vec3(1, 1, 1), Vec3(1, -1, -1), Vec3(1, -1, 1), Vec3(-1, -1, -1)};
-                        Vec3 vTC3[] = {Vec3(1, -1, 1), Vec3(-1, -1, -1), Vec3(-1, 1, 1), Vec3(-1, -1, -1), Vec3(-1, -1, 1), Vec3(1, -1, -1)};
-
-                        Matrix44A origMatProj = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-                        Matrix44A origMatView = m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-                        Matrix44A* m = &m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj;
-                        mathMatrixOrthoOffCenterLH(m, 0.0f, (float)m_width, (float)m_height, 0.0f, -1e30f, 1e30f);
-                        m = &m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView;
-                        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-
-                        SetState(GS_NODEPTHTEST);
-                        STexState ts(FILTER_LINEAR, false);
-                        ts.m_nAnisotropy = 1;
-                        tp->Apply(0, CTexture::GetTexState(ts));
-
-                        D3DSetCull(eCULL_None);
-
-                        for (int i = 0; i < 6; i++)
-                        {
-                            TempDynVB<SVF_P3F_T3F> vb(gcpRendD3D);
-                            vb.Allocate(4);
-                            SVF_P3F_T3F* vQuad = vb.Lock();
-
-                            vQuad[0].p = Vec3(fOffsX[i], fOffsY[i], 1);
-                            vQuad[0].st = vTC0[i];
-                            //vQuad[0].color.dcolor = (uint32)-1;
-                            vQuad[1].p = Vec3(fOffsX[i] + fSizeX - 1, fOffsY[i], 1);
-                            vQuad[1].st = vTC1[i];
-                            //vQuad[1].color.dcolor = (uint32)-1;
-                            vQuad[3].p = Vec3(fOffsX[i] + fSizeX - 1, fOffsY[i] + fSizeY - 1, 1);
-                            vQuad[3].st = vTC2[i];
-                            //vQuad[3].color.dcolor = (uint32)-1;
-                            vQuad[2].p = Vec3(fOffsX[i], fOffsY[i] + fSizeY - 1, 1);
-                            vQuad[2].st = vTC3[i];
-                            //vQuad[2].color.dcolor = (uint32)-1;
-
-                            vb.Unlock();
-                            vb.Bind(0);
-                            vb.Release();
-
-                            if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_T3F)))
-                            {
-                                FX_Commit();
-                                FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-                            }
-                        }
-
-                        pSH->FXEndPass();
-                        pSH->FXEnd();
-
-                        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView = origMatView;
-                        m_RP.m_TI[m_RP.m_nProcessThreadID].m_matProj = origMatProj;
-                    }
-
-                    pTX->m_pTexture->m_nAccessFrameID = nSavedAccessFrameID;
-                    ILightSource* pLS = (ILightSource*)pTX->pLightOwner;
-
-                    _DrawText(iSystem, (int)(x / width * 800.f), (int)(y / height * 600.f), 1.0f, "%s \n %d %d-%d %d x%d",
-                        pTX->m_pTexture->GetSourceName(),
-                        pTX->m_nUniqueID,
-                        pTX->m_pTexture ? pTX->m_pTexture->m_nUpdateFrameID : 0,
-                        pTX->m_pTexture ? pTX->m_pTexture->m_nAccessFrameID : 0,
-                        pTX->nObjectsRenderedCount,
-                        pTX->m_nWidth);
-
-                    if (pLS->GetLightProperties().m_sName)
-                    {
-                        _DrawText(iSystem, (int)(x / width * 800.f), (int)(y / height * 600.f) + 32, 1.0f, "%s", pLS->GetLightProperties().m_sName);
-                    }
-                }
-            }
-            pTX = pTX->m_NextShadow;
-        }
-    }
-
-    Unset2DMode(backupSceneMatrices);
-}
-
-Vec3 UnProject(ShadowMapFrustum* pFr, Vec3 vPoint)
-{
-    const int shadowViewport[4] = {0, 0, 1, 1};
-
-    Vec3 vRes(0, 0, 0);
-    gRenDev->UnProject(vPoint.x, vPoint.y, vPoint.z,
-        &vRes.x, &vRes.y, &vRes.z,
-        (float*)&pFr->mLightViewMatrix,
-        (float*)&pFr->mLightProjMatrix,
-        shadowViewport);
-
-    return vRes;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-namespace
-{
-    struct CompareRSMRendItem
-    {
-        bool operator()(const SRendItem& a, const SRendItem& b) const
-        {
-            // Decal objects should be rendered last
-            int nDecalA = (a.ObjSort & FOB_DECAL_MASK);
-            int nDecalB = (b.ObjSort & FOB_DECAL_MASK);
-            if ((nDecalA == 0) != (nDecalB == 0))         // Sort by decal flag
-            {
-                return nDecalA < nDecalB;
-            }
-
-            if (nDecalA && nDecalB)
-            {
-                // decal sorting
-                uint32 objSortA_Low(a.ObjSort & 0xFFFF);
-                uint32 objSortA_High(a.ObjSort & ~0xFFFF);
-                uint32 objSortB_Low(b.ObjSort & 0xFFFF);
-                uint32 objSortB_High(b.ObjSort & ~0xFFFF);
-
-                if (objSortA_Low != objSortB_Low)
-                {
-                    return objSortA_Low < objSortB_Low;
-                }
-
-                if (a.SortVal != b.SortVal)
-                {
-                    return a.SortVal < b.SortVal;
-                }
-
-                return objSortA_High < objSortB_High;
-            }
-            else
-            {
-                // usual sorting
-                if (a.SortVal != b.SortVal)         // Sort by shaders
-                {
-                    return a.SortVal < b.SortVal;
-                }
-
-                if (a.pElem != b.pElem)               // Sort by geometry
-                {
-                    return a.pElem < b.pElem;
-                }
-
-                return a.ObjSort < b.ObjSort;
-            }
-        }
-    };
-}
-
-bool CD3D9Renderer::PrepareDepthMap(ShadowMapFrustum* lof, int nLightFrustumID, bool bClearPool)
-{
-    int nThreadList = m_RP.m_nProcessThreadID;
-    assert(lof);
-    if (!lof)
-    {
-        return false;
-    }
-
-    //select shadowgen gpu
-    int nShadowGenGPU = 0;
-    if (GetActiveGPUCount() > 1 && CV_r_ShadowGenMode == 1)
-    {
-        //TOFIx: make m_nFrameSwapID - double buffered
-        nShadowGenGPU = gRenDev->RT_GetCurrGpuID();
-    }
-
-    if (GetActiveGPUCount() > 1 && lof->IsCached())
-    {
-        ShadowFrustumMGPUCache* pFrustumCache = GetShadowFrustumMGPUCache();
-        pFrustumCache->nUpdateMaskRT &= ~(1 << gRenDev->RT_GetCurrGpuID());
-    }
-
-    // Save previous camera
-    int vX, vY, vWidth, vHeight;
-    GetViewport(&vX, &vY, &vWidth, &vHeight);
-    Matrix44 camMatr = m_CameraMatrix;
-
-    // Setup matrices
-    Matrix44A origMatView = m_RP.m_TI[nThreadList].m_matView;
-    Matrix44A origMatProj = m_RP.m_TI[nThreadList].m_matProj;
-
-    Matrix44A* m = &m_RP.m_TI[nThreadList].m_matProj;
-    m->SetIdentity();
-    m = &m_RP.m_TI[nThreadList].m_matView;
-    m->SetIdentity();
-
-    lof->mLightProjMatrix.SetIdentity();
-
-    //////////////////////////////////////////////////////////////////////////
-    //  Assign RTs
-    //////////////////////////////////////////////////////////////////////////
-    bool bTextureFromDynPool = false;
-
-    if (lof->bUseShadowsPool)
-    {
-        lof->nTextureWidth = m_nShadowPoolWidth;
-        lof->nTextureHeight = m_nShadowPoolHeight;
-
-        //current eTF should be stored in the shadow frustum
-        ETEX_Format ePoolTF = lof->m_eReqTF;
-        CTexture::s_ptexRT_ShadowPool->Invalidate(m_nShadowPoolWidth, m_nShadowPoolHeight, ePoolTF);
-
-        if (!CTexture::IsTextureExist(CTexture::s_ptexRT_ShadowPool))
-        {
-#if !defined(_RELEASE) && !defined(WIN32) && !defined(WIN64)
-            __debugbreak(); // don't want any realloc on consoles
-#endif
-            CTexture::s_ptexRT_ShadowPool->CreateRenderTarget(eTF_Unknown, Clr_FarPlane);
-        }
-
-        lof->pDepthTex = CTexture::s_ptexRT_ShadowPool;
-    }
-    else
-    {
-        if (lof->m_eFrustumType == ShadowMapFrustum::e_Nearest)
-        {
-            CTexture* pTX = CTexture::s_ptexNearestShadowMap;
-            if (!CTexture::IsTextureExist(pTX))
-            {
-                pTX->CreateRenderTarget(lof->m_eReqTF, Clr_FarPlane);
-            }
-            lof->pDepthTex = pTX;
-
-            lof->fWidthS *= lof->nTextureWidth / (float)pTX->GetWidth();
-            lof->fWidthT *= lof->nTextureHeight / (float)pTX->GetHeight();
-
-            lof->nTextureWidth = pTX->GetWidth();
-            lof->nTextureHeight = pTX->GetHeight();
-        }
-
-        else if (lof->IsCached())
-        {
-            if (lof->m_eFrustumType != ShadowMapFrustum::e_HeightMapAO)
-            {
-                assert(CV_r_ShadowsCache > 0 && CV_r_ShadowsCache <= MAX_GSM_LODS_NUM);
-                const int nStaticMapIndex = clamp_tpl(lof->nShadowMapLod - (CV_r_ShadowsCache - 1), 0, MAX_GSM_LODS_NUM - 1);
-                lof->pDepthTex = CTexture::s_ptexCachedShadowMap[nStaticMapIndex];
-            }
-            else
-            {
-                lof->pDepthTex = CTexture::s_ptexHeightMapAODepth[0];
-            }
-        }
-        else if (lof->m_eFrustumType != ShadowMapFrustum::e_GsmDynamicDistance)
-        {
-            bTextureFromDynPool = true;
-            SDynTexture_Shadow* pDynTX = SDynTexture_Shadow::GetForFrustum(lof);
-            lof->pDepthTex = pDynTX->m_pTexture;
-        }
-    }
-
-    if (CTexture::IsTextureExist(lof->pDepthTex))
-    {
-        int nSides = 1;
-        if (lof->bOmniDirectionalShadow)
-        {
-            nSides = OMNI_SIDES_NUM;
-        }
-
-        int sideIndex;
-        int nFirstShadowGenRI, nLastShadowGenRI;
-
-        int nOldScissor = CV_r_scissor;
-        int old_CV_r_nodrawnear = CV_r_nodrawnear;
-        int nPersFlags = m_RP.m_TI[nThreadList].m_PersFlags;
-        int nPersFlags2 = m_RP.m_PersFlags2;
-        int nStateAnd = m_RP.m_StateAnd;
-        m_RP.m_TI[nThreadList].m_PersFlags &= ~(RBPF_HDR | RBPF_MIRRORCULL); // In a mirrorcull pass (i.e. cubemap gen), remove mirrorculling for shadow gen (omni shadows should re-enable it later on)
-        m_RP.m_TI[nThreadList].m_PersFlags |= RBPF_SHADOWGEN;
-
-        if (!(lof->m_Flags & DLF_DIRECTIONAL))
-        {
-            m_RP.m_PersFlags2 |= RBPF2_DRAWTOCUBE;
-        }
-
-        //hack remove texkill for eTF_DF24 and eTF_D24S8
-        if (lof->m_eReqTF == eTF_R32F || lof->m_eReqTF == eTF_R16G16F || lof->m_eReqTF == eTF_R16F || lof->m_eReqTF == eTF_R16G16B16A16F ||
-            lof->m_eReqTF == eTF_D16 || lof->m_eReqTF == eTF_D24S8 || lof->m_eReqTF == eTF_D32F || lof->m_eReqTF == eTF_D32FS8)
-        {
-            m_RP.m_PersFlags2 |= RBPF2_NOALPHABLEND;
-            m_RP.m_StateAnd &= ~GS_BLEND_MASK;
-        }
-
-        if (lof->m_eReqTF == eTF_R32F || lof->m_eReqTF == eTF_R16G16F || lof->m_eReqTF == eTF_R16F || lof->m_eReqTF == eTF_R16G16B16A16F)
-        {
-            m_RP.m_PersFlags2 |= RBPF2_NOALPHATEST;
-            m_RP.m_StateAnd &= ~GS_ALPHATEST_MASK;
-        }
-        CCamera saveCam = GetCamera();
-        Vec3 vPos = lof->vLightSrcRelPos + lof->vProjTranslation;
-
-        SDepthTexture depthTarget;
-        ZeroStruct(depthTarget);
-
-        for (sideIndex = 0; sideIndex < nSides; sideIndex++)
-        {
-            if (nLightFrustumID >= 0)//skip for custom fustum
-            {
-                //////////////////////////////////////////////////////////////////////////
-                //compute shadow recursive level
-                //////////////////////////////////////////////////////////////////////////
-                const int nThreadID  = m_RP.m_nProcessThreadID;
-                const int nShadowRecur = lof->nShadowGenID[nThreadID][sideIndex];
-
-                if (nShadowRecur == 0xFFFFFFFF)
-                {
-                    continue;
-                }
-
-                assert(nShadowRecur >= 0 && nShadowRecur < MAX_SHADOWMAP_FRUSTUMS);
-
-                assert(nThreadID >= 0 && nThreadID < 2);
-                nFirstShadowGenRI = SRendItem::m_ShadowsStartRI[nThreadID][nShadowRecur];
-                nLastShadowGenRI = SRendItem::m_ShadowsEndRI[nThreadID][nShadowRecur];
-                const bool bClearRequired = lof->IsCached() && !lof->bIncrementalUpdate;
-                // If there's something to render, sort by lights.
-                if (nLastShadowGenRI - nFirstShadowGenRI > 0)
-                {
-                    auto& renderItems = CRenderView::CurrentRenderView()->GetRenderItems(SG_SORT_GROUP, EFSLIST_SHADOW_GEN);
-                    SRendItem* pFirst = &renderItems[nFirstShadowGenRI];
-                    SRendItem::mfSortByLight(pFirst, nLastShadowGenRI - nFirstShadowGenRI, true, false, false);
-                }
-                else if (!bClearRequired)
-                {
-                    // Nothing to render and there's no need to clear, so we can just continue.
-                    continue;
-                }
-            }
-
-            depthTarget.nWidth = lof->nTextureWidth;
-            depthTarget.nHeight = lof->nTextureHeight;
-            depthTarget.nFrameAccess = -1;
-            depthTarget.bBusy = false;
-            depthTarget.pTex = lof->pDepthTex;
-            depthTarget.pTarget = lof->pDepthTex->GetDevTexture()->Get2DTexture();
-            depthTarget.pSurf = lof->bOmniDirectionalShadow && !(lof->bUnwrapedOmniDirectional)
-                ? static_cast<D3DDepthSurface*>(lof->pDepthTex->GetDeviceDepthStencilSurf(sideIndex, 1))
-                : static_cast<D3DDepthSurface*>(lof->pDepthTex->GetDeviceDepthStencilSurf());
-
-            CCamera tmpCamera;
-            if (!lof->bOmniDirectionalShadow)
-            {
-                *m =  lof->mLightViewMatrix;
-                m_RP.m_TI[nThreadList].m_PersFlags &= ~RBPF_REVERSE_DEPTH;
-
-                uint32 depthState = ReverseDepthHelper::ConvertDepthFunc(m_RP.m_CurState);
-                FX_SetState(m_RP.m_CurState, m_RP.m_CurAlphaRef, depthState);
-
-#if defined(FEATURE_SVO_GI)
-                if (!(lof->m_Flags & DLF_DIRECTIONAL) && CSvoRenderer::GetRsmColorMap(*lof))
-                {
-                    m_RP.m_TI[nThreadList].m_PersFlags |= RBPF_MIRRORCULL;
-                }
-#endif
-            }
-            else
-            {
-                const Matrix34& m34 = lof->FrustumPlanes[sideIndex].GetMatrix();
-                CameraViewParameters c;
-                c.Perspective(tmpCamera.GetFov(), tmpCamera.GetProjRatio(), tmpCamera.GetNearPlane(), tmpCamera.GetFarPlane());
-                Vec3 vEyeC = tmpCamera.GetPosition();
-                Vec3 vAtC = vEyeC + Vec3(m34(0, 1), m34(1, 1), m34(2, 1));
-                Vec3 vUpC = Vec3(m34(0, 2), m34(1, 2), m34(2, 2));
-                c.LookAt(vEyeC, vAtC, vUpC);
-                ApplyViewParameters(c);
-                CShadowUtils::GetCubemapFrustum(FTYP_SHADOWOMNIPROJECTION, lof, sideIndex, &m_RP.m_TI[nThreadList].m_matProj, &m_RP.m_TI[nThreadList].m_matView, NULL);
-
-                //enable back facing for omni lights for now
-                m_RP.m_TI[nThreadList].m_PersFlags |= RBPF_MIRRORCULL;
-                if (lof->m_Flags & DLF_AREA_LIGHT)
-                {
-                    m_RP.m_TI[nThreadList].m_PersFlags &= ~RBPF_MIRRORCULL;
-                }
-
-#if defined(FEATURE_SVO_GI)
-                if (!(lof->m_Flags & DLF_DIRECTIONAL) && CSvoRenderer::GetRsmColorMap(*lof))
-                {
-                    m_RP.m_TI[nThreadList].m_PersFlags &= ~RBPF_MIRRORCULL;
-                }
-#endif
-            }
-
-            EF_SetCameraInfo();
-
-            //assign for shader's parameters
-            SRenderPipeline::ShadowInfo& shadowInfo = m_RP.m_ShadowInfo;
-            shadowInfo.m_pCurShadowFrustum = lof;
-            shadowInfo.m_nOmniLightSide = sideIndex;
-            shadowInfo.vViewerPos = saveCam.GetPosition();
-
-            {
-                CStandardGraphicsPipeline::ShadowParameters shadowParams;
-                shadowParams.m_ShadowFrustum = lof;
-                shadowParams.m_OmniLightSideIndex = sideIndex;
-                shadowParams.m_ViewerPos = shadowInfo.vViewerPos;
-                GetGraphicsPipeline().UpdatePerShadowConstantBuffer(shadowParams);
-
-                AzRHI::ConstantBuffer* perShadow = GetGraphicsPipeline().GetPerShadowConstantBuffer().get();
-                m_DevMan.BindConstantBuffer(eHWSC_Vertex, perShadow, eConstantBufferShaderSlot_PerPass);
-                m_DevMan.BindConstantBuffer(eHWSC_Pixel, perShadow, eConstantBufferShaderSlot_PerPass);
-                m_DevMan.BindConstantBuffer(eHWSC_Geometry, perShadow, eConstantBufferShaderSlot_PerPass);
-                m_DevMan.BindConstantBuffer(eHWSC_Hull, perShadow, eConstantBufferShaderSlot_PerPass);
-                m_DevMan.BindConstantBuffer(eHWSC_Domain, perShadow, eConstantBufferShaderSlot_PerPass);
-                m_DevMan.BindConstantBuffer(eHWSC_Compute, perShadow, eConstantBufferShaderSlot_PerPass);
-            }
-
-#if defined(FEATURE_SVO_GI)
-            if (CSvoRenderer::GetRsmColorMap(*lof, true) && CSvoRenderer::GetRsmNormlMap(*lof, true))
-            {
-                FX_PushRenderTarget(0, CSvoRenderer::GetInstance()->GetRsmColorMap(*lof), &depthTarget, lof->m_eReqTT == eTT_Cube ? sideIndex : -1);
-                FX_PushRenderTarget(1, CSvoRenderer::GetInstance()->GetRsmNormlMap(*lof), NULL, lof->m_eReqTT == eTT_Cube ? sideIndex : -1);
-            }
-            else
-#endif
-            {
-                FX_PushRenderTarget(0, nullptr, &depthTarget, lof->m_eReqTT == eTT_Cube ? sideIndex : -1);
-                FX_SetColorDontCareActions(0, true, true);
-            }
-
-            //SDW-GEN_REND_PATH
-            //////////////////////////////////////////////////////////////////////////
-            // clear frame buffer after RT push
-            //////////////////////////////////////////////////////////////////////////
-            if (!lof->bIncrementalUpdate)
-            {
-                uint32_t clearFlags = 0;
-
-                const bool bReverseDepth = (m_RP.m_TI[nThreadList].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-
-                if (lof->bUseShadowsPool)
-                {
-                    if (bClearPool)
-                    {
-                        const RECT rect = { lof->packX[sideIndex], lof->packY[sideIndex], lof->packX[sideIndex] + lof->packWidth[sideIndex], lof->packY[sideIndex] + lof->packHeight[sideIndex] };
-
-                        FX_ClearTarget(&depthTarget, CLEAR_ZBUFFER, Clr_FarPlane_R.r, 0, 1, &rect, false);
-                        clearFlags |= CLEAR_ZBUFFER;
-                    }
-                }
-                else
-                {
-#if defined(FEATURE_SVO_GI)
-                    if (CSvoRenderer::GetRsmColorMap(*lof, true) && CSvoRenderer::GetRsmNormlMap(*lof, true))
-                    {
-                        FX_ClearTarget(CSvoRenderer::GetInstance()->GetRsmColorMap(*lof), Clr_Transparent);
-                        FX_ClearTarget(CSvoRenderer::GetInstance()->GetRsmNormlMap(*lof), Clr_Transparent);
-                        clearFlags |= CLEAR_RTARGET;
-                    }
-#endif
-                    FX_ClearTarget(&depthTarget, CLEAR_ZBUFFER | CLEAR_STENCIL, Clr_FarPlane_R.r, 0);
-                    clearFlags |= CLEAR_ZBUFFER | CLEAR_STENCIL;
-#if defined(CRY_USE_METAL)
-                    //Clear calls are cached until a draw call is made. If there is nothing in the caster list no draw calls will be made.
-                    //Hence make a draw call to clear the render targets.
-                    if (lof->m_castersList.IsEmpty() && lof->m_jobExecutedCastersList.IsEmpty())
-                    {
-                        FX_Commit();
-                        FX_ClearTargetRegion();
-                    }
-#endif
-                }
-
-                m_pNewTarget[0]->m_ClearFlags = 0;
-
-                FX_SetColorDontCareActions(0, !(clearFlags & CLEAR_RTARGET), false);
-                FX_SetColorDontCareActions(1, !(clearFlags & CLEAR_RTARGET), false);
-                FX_SetColorDontCareActions(2, !(clearFlags & CLEAR_RTARGET), false);
-#if !defined(OPENGL_ES) // some drivers don't play well with the following
-                FX_SetStencilDontCareActions(0, !(clearFlags & CLEAR_STENCIL), true);
-                FX_SetStencilDontCareActions(1, !(clearFlags & CLEAR_STENCIL), true);
-                FX_SetStencilDontCareActions(2, !(clearFlags & CLEAR_STENCIL), true);
-#endif
-            }
-            else
-            {
-                // CONFETTI BEGIN: David Srour
-                // Metal Load/Store Actions
-                FX_SetColorDontCareActions(0, true, true);
-                FX_SetStencilDontCareActions(0, true, true);
-                FX_SetColorDontCareActions(1, true, true);
-                FX_SetStencilDontCareActions(1, true, true);
-                FX_SetColorDontCareActions(2, true, true);
-                FX_SetStencilDontCareActions(2, true, true);
-                // CONFETTI END
-            }
-
-            //set proper side-viewport
-            if (lof->bUnwrapedOmniDirectional || lof->bUseShadowsPool)
-            {
-                int arrViewport[4];
-                lof->GetSideViewport(sideIndex, arrViewport);
-                RT_SetViewport(arrViewport[0], arrViewport[1], arrViewport[2], arrViewport[3]);
-            }
-
-            FX_Commit(true);
-
-#if defined(FEATURE_SVO_GI)
-            if (!CSvoRenderer::GetRsmColorMap(*lof))
-#endif
-            {
-                FX_SetState(GS_COLMASK_NONE, -1);
-                m_RP.m_PersFlags2 |= RBPF2_DISABLECOLORWRITES;
-                m_RP.m_StateOr |= GS_COLMASK_NONE;
-            }
-
-            if (lof->fDepthSlopeBias > 0.0f && (lof->m_Flags & DLF_DIRECTIONAL))
-            {
-                float fShadowsBias = CV_r_ShadowsBias;
-                float fShadowsSlopeScaleBias = lof->fDepthSlopeBias;
-
-                //adjust nearest slope fer nearest custom frustum
-                if (lof->m_eFrustumType == ShadowMapFrustum::e_Nearest)
-                {
-                    fShadowsSlopeScaleBias *= 7.0f;
-                }
-
-                SStateRaster CurRS = m_StatesRS[m_nCurStateRS];
-                CurRS.Desc.DepthBias = 0;
-                CurRS.Desc.DepthBiasClamp = fShadowsBias * 20;
-                CurRS.Desc.SlopeScaledDepthBias = fShadowsSlopeScaleBias;
-                SetRasterState(&CurRS);
-            }
-
-
-            if (!(lof->m_Flags & DLF_LIGHT_BEAM))
-            {
-                D3DSetCull(eCULL_None);
-            }
-            else
-            {
-                D3DSetCull(eCULL_Back);
-                m_RP.m_PersFlags2 |= RBPF2_LIGHTSHAFTS;
-            }
-
-            if (nLightFrustumID < 0)
-            {
-                FX_ProcessRenderList(EFSLIST_GENERAL, 0, FX_FlushShader_ShadowGen, false);
-                FX_ProcessRenderList(EFSLIST_GENERAL, 1, FX_FlushShader_ShadowGen, false);
-            }
-            else
-            if (!lof->m_castersList.IsEmpty() || !lof->m_jobExecutedCastersList.IsEmpty())
-            {
-                FX_ProcessRenderList(nFirstShadowGenRI,
-                    nLastShadowGenRI,
-                    EFSLIST_SHADOW_GEN, 0, FX_FlushShader_ShadowGen, false);
-            }
-
-            FX_PopRenderTarget(0);
-
-#if defined(FEATURE_SVO_GI)
-            if (CSvoRenderer::GetRsmColorMap(*lof) && CSvoRenderer::GetRsmNormlMap(*lof))
-            {
-                FX_PopRenderTarget(1);
-            }
-#endif
-
-            m_RP.m_PersFlags2 &= ~RBPF2_DISABLECOLORWRITES;
-            m_RP.m_StateOr &= ~GS_COLMASK_NONE;
-            if (CV_r_ShadowsBias > 0.0f)
-            {
-                SStateRaster CurRS = m_StatesRS[m_nCurStateRS];
-                CurRS.Desc.DepthBias = 0;
-                CurRS.Desc.DepthBiasClamp = 0;
-                CurRS.Desc.SlopeScaledDepthBias = 0;
-                SetRasterState(&CurRS);
-            }
-        }
-
-        m_RP.m_TI[nThreadList].m_PersFlags &= ~RBPF_SHADOWGEN;
-        SetCamera(saveCam);
-        if (lof->m_eReqTT == eTT_Cube)
-        {
-            lof->mLightViewMatrix.SetIdentity();
-            lof->mLightViewMatrix.SetTranslation(vPos);
-            lof->mLightViewMatrix.Transpose();
-        }
-
-        if (!(lof->m_Flags & DLF_DIRECTIONAL))
-        {
-            m_RP.m_PersFlags2 &= ~RBPF2_DRAWTOCUBE;
-        }
-
-        m_RP.m_TI[nThreadList].m_PersFlags &= ~RBPF_MIRRORCULL;
-        m_RP.m_PersFlags2 &= ~RBPF2_LIGHTSHAFTS;
-
-        CV_r_nodrawnear = old_CV_r_nodrawnear;
-        CV_r_scissor = nOldScissor;
-
-        m_RP.m_TI[nThreadList].m_PersFlags = nPersFlags;
-        m_RP.m_PersFlags2 = nPersFlags2;
-        m_RP.m_StateAnd = nStateAnd;
-
-        EF_Scissor(false, 0, 0, 0, 0);
-    }
-    else if (bTextureFromDynPool)
-    {
-        iLog->Log("Error: cannot create depth texture  for frustum '%d' (skipping)", lof->nShadowMapLod);
-    }
-
-    m_RP.m_TI[nThreadList].m_matView = origMatView;
-    m_RP.m_TI[nThreadList].m_matProj = origMatProj;
-    m_CameraMatrix = camMatr;
-    EF_SetCameraInfo();
-    RT_SetViewport(vX, vY, vWidth, vHeight);
-
-    return true;
-}
-
-void CD3D9Renderer::ConfigShadowTexgen(int Num, ShadowMapFrustum* pFr, int nFrustNum, [[maybe_unused]] bool bScreenToLocalBasis, bool bUseComparisonSampling)
-{
-    Matrix44A shadowMat, mTexScaleBiasMat, mLightView, mLightProj, mLightViewProj;
-    bool bGSM = false;
-
-    //check for successful PrepareDepthMap
-    if (!pFr->pDepthTex && !pFr->bUseShadowsPool)
-    {
-        return;
-    }
-
-    float fOffsetX = 0.5f;
-    float fOffsetY = 0.5f;
-    const Matrix44A mClipToTexSpace = Matrix44(0.5f,     0.0f,     0.0f,    0.0f,
-            0.0f,    -0.5f,     0.0f,    0.0f,
-            0.0f,     0.0f,     1.0f,    0.0f,
-            fOffsetX, fOffsetY, 0.0f,    1.0f);
-
-    mTexScaleBiasMat = mClipToTexSpace;
-
-    if ((pFr->bOmniDirectionalShadow || pFr->bUseShadowsPool) && nFrustNum > -1)
-    {
-        if (!pFr->bOmniDirectionalShadow)
-        {
-            mLightView = pFr->mLightViewMatrix;
-            mLightProj.SetIdentity();
-        }
-        else
-        {
-            CShadowUtils::GetCubemapFrustum(FTYP_SHADOWOMNIPROJECTION, pFr, nFrustNum,  &mLightProj, &mLightView);
-        }
-
-        float arrOffs[2];
-        float arrScale[2];
-        pFr->GetTexOffset(nFrustNum, arrOffs, arrScale, m_nShadowPoolWidth, m_nShadowPoolHeight);
-
-        //calculate crop matrix for  frustum
-        //TD: investigate proper half-texel offset with mCropView
-        Matrix44 mCropView(arrScale[0],     0.0f,  0.0f,   0.0f,
-            0.0f,  arrScale[1],  0.0f,   0.0f,
-            0.0f,     0.0f,  1.0f,   0.0f,
-            arrOffs[0], arrOffs[1],  0.0f,   1.0f);
-
-        // multiply the projection matrix with it
-        mTexScaleBiasMat = mTexScaleBiasMat * mCropView;
-
-        //constants for gsm atlas
-        m_cEF.m_TempVecs[6].x = arrOffs[0];
-        m_cEF.m_TempVecs[6].y = arrOffs[1];
-    }
-    else
-    {
-        mLightView = pFr->mLightViewMatrix;
-
-        if (pFr->m_eFrustumType == ShadowMapFrustum::e_GsmDynamicDistance)
-        {
-            Matrix44 mCropView(IDENTITY);
-            mCropView.m00 = (float)pFr->packWidth[0]  / pFr->pDepthTex->GetWidth();
-            mCropView.m11 = (float)pFr->packHeight[0] / pFr->pDepthTex->GetHeight();
-            mCropView.m30 = (float)pFr->packX[0] / pFr->pDepthTex->GetWidth();
-            mCropView.m31 = (float)pFr->packY[0] / pFr->pDepthTex->GetHeight();
-
-            mTexScaleBiasMat = mTexScaleBiasMat * mCropView;
-        }
-
-        mLightProj.SetIdentity();
-        bGSM = true;
-    }
-
-    mLightViewProj = mLightView * mLightProj;
-    shadowMat = mLightViewProj * mTexScaleBiasMat;
-
-    //set shadow matrix
-    gRenDev->m_TempMatrices[Num][0] = shadowMat.GetTransposed();
-    m_cEF.m_TempVecs[5] = Vec4(mLightViewProj.m30, mLightViewProj.m31, mLightViewProj.m32, 1);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Deferred shadow pass setup
-    //////////////////////////////////////////////////////////////////////////
-    Matrix44 mScreenToShadow;
-    int vpX, vpY, vpWidth, vpHeight;
-    GetViewport(&vpX, &vpY, &vpWidth, &vpHeight);
-    FX_DeferredShadowPassSetup(gRenDev->m_TempMatrices[Num][0], pFr, (float)vpWidth, (float)vpHeight,
-        mScreenToShadow, pFr->m_eFrustumType == ShadowMapFrustum::e_Nearest);
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-    //use cur TexGen for homogeneous position reconstruction
-    if (bScreenToLocalBasis && CRenderer::CV_r_FogShadowsMode == 1)
-    {
-        Matrix44A mLocalScale;
-        mLocalScale.SetIdentity();
-        gRenDev->m_TempMatrices[Num][0] = mScreenToShadow.GetTransposed();
-        float fScreenScale = (CV_r_FogShadows == 2) ? 4.0f : 2.0f;
-        mLocalScale.m00 = fScreenScale;
-        mLocalScale.m11 = fScreenScale;
-        gRenDev->m_TempMatrices[Num][0] = gRenDev->m_TempMatrices[Num][0] * mLocalScale;
-    }
-#endif
-
-    gRenDev->m_TempMatrices[Num][2].m33 = 0.0f;
-    if (bGSM && pFr->bBlendFrustum)
-    {
-        const float fBlendVal = pFr->fBlendVal;
-
-        m_cEF.m_TempVecs[15][0] = fBlendVal;
-        m_cEF.m_TempVecs[15][1] = 1.0f / (1.0f - fBlendVal);
-        m_cEF.m_TempVecs[15][2] = 0.0f;
-        m_cEF.m_TempVecs[15][3] = 0.0f;
-
-        m_cEF.m_TempVecs[6] = Vec4(1.f, 1.f, 0.f, 0.f);
-        if (pFr->m_eFrustumType == ShadowMapFrustum::e_GsmDynamicDistance)
-        {
-            m_cEF.m_TempVecs[6].x = pFr->pDepthTex->GetWidth() /  float(pFr->packWidth[0]);
-            m_cEF.m_TempVecs[6].y = pFr->pDepthTex->GetHeight() / float(pFr->packHeight[0]);
-            m_cEF.m_TempVecs[6].z = -pFr->packX[0] / float(pFr->packWidth[0]);
-            m_cEF.m_TempVecs[6].w = -pFr->packY[0] / float(pFr->packHeight[0]);
-        }
-
-        const ShadowMapFrustum* pPrevFr = pFr->pPrevFrustum;
-        if (pPrevFr)
-        {
-            Matrix44A mLightViewPrev = pPrevFr->mLightViewMatrix;
-            Matrix44A shadowMatPrev =  mLightViewPrev * mClipToTexSpace; // NOTE: no sub-rect here as blending code assumes full [0-1] UV range;
-
-            FX_DeferredShadowPassSetupBlend(shadowMatPrev.GetTransposed(), Num, (float)vpWidth, (float)vpHeight);
-
-            m_cEF.m_TempVecs[2][2] = 1.f / (pPrevFr->fFarDist);
-
-            float fBlendValPrev = pPrevFr->fBlendVal;
-
-            m_cEF.m_TempVecs[15][2] = fBlendValPrev;
-            m_cEF.m_TempVecs[15][3] = 1.0f / (1.0f - fBlendValPrev);
-        }
-    }
-
-    Matrix33 mRotMatrix(mLightView);
-    mRotMatrix.OrthonormalizeFast();
-    gRenDev->m_TempMatrices[0][1] =  Matrix44(mRotMatrix).GetTransposed();
-
-    if (Num >= 0)
-    {
-        if (!pFr->pDepthTex && !pFr->bUseShadowsPool)
-        {
-            Warning("Warning: CD3D9Renderer::ConfigShadowTexgen: pFr->depth_tex_id not set");
-        }
-        else
-        {
-            int nID = 0;
-            int nIDBlured = 0;
-            if (pFr->bUseShadowsPool)
-            {
-                nID = CTexture::s_ptexRT_ShadowPool->GetID();
-            }
-            else
-            if (pFr->pDepthTex != NULL)
-            {
-                nID = pFr->pDepthTex->GetID();
-            }
-
-            m_RP.m_ShadowCustomTexBind[Num * 2 + 0] = nID;
-            m_RP.m_ShadowCustomTexBind[Num * 2 + 1] = nIDBlured;
-            m_RP.m_ShadowCustomComparisonSampling[Num * 2 + 0] = bUseComparisonSampling;
-
-            m_cEF.m_TempVecs[8][0] = pFr->fShadowFadingDist;
-
-            assert(Num < 4);
-            if (pFr->bHWPCFCompare)
-            {
-                if (pFr->m_Flags & DLF_DIRECTIONAL)
-                {
-                    //linear case + constant offset
-                    m_cEF.m_TempVecs[1][Num] = pFr->fDepthConstBias;
-                    if (pFr->m_eFrustumType == ShadowMapFrustum::e_Nearest)
-                    {
-                        m_cEF.m_TempVecs[1][Num] *= 3.0f;
-                    }
-                }
-                else
-                if (pFr->m_Flags & DLF_PROJECT)
-                {
-                    //non-linear case
-                    m_cEF.m_TempVecs[1][Num] = pFr->fDepthConstBias;
-                }
-                else
-                {
-                    m_cEF.m_TempVecs[1][Num] = pFr->fDepthConstBias;
-                }
-            }
-            else
-            {
-                //linear case
-                m_cEF.m_TempVecs[1][Num] = pFr->fDepthTestBias;
-            }
-
-            m_cEF.m_TempVecs[2][Num] = 1.f / (pFr->fFarDist);
-            m_cEF.m_TempVecs[9][Num] = 1.f / pFr->nTexSize;
-            m_cEF.m_TempVecs[3][Num] = 0.0f;
-
-            float fShadowJitter = m_shadowJittering;
-
-            if (pFr->m_Flags & DLF_DIRECTIONAL)
-            {
-                float fFilteredArea = fShadowJitter * (pFr->fWidthS + pFr->fBlurS);
-
-                if (pFr->m_eFrustumType == ShadowMapFrustum::e_Nearest)
-                {
-                    fFilteredArea *= 0.1f;
-                }
-
-                m_cEF.m_TempVecs[4].x = fFilteredArea;
-                m_cEF.m_TempVecs[4].y = fFilteredArea;
-            }
-            else
-            {
-                fShadowJitter = 2.0;
-                m_cEF.m_TempVecs[4].x = fShadowJitter;
-                ;
-                m_cEF.m_TempVecs[4].y = fShadowJitter;
-
-                if (pFr->bOmniDirectionalShadow)
-                {
-                    m_cEF.m_TempVecs[4].x *= 1.0f / 3.0f;
-                    m_cEF.m_TempVecs[4].y *= 1.0f / 2.0f;
-                }
-            }
-        }
-    }
-}
-
-//=============================================================================================================
-void CD3D9Renderer::FX_SetupForwardShadows(bool bUseShaderPermutations)
-{
-    const int FORWARD_SHADOWS_CASCADE0_SINGLE_TAP = 0x10;
-    const int FORWARD_SHADOWS_CLOUD_SHADOWS       = 0x20;
-
-    const int nThreadID = m_RP.m_nProcessThreadID;
-    const int nSunFrustumID = 0;
-
-    const int nStartIdx = SRendItem::m_StartFrust[nThreadID][nSunFrustumID];
-    const int nEndIdx = SRendItem::m_EndFrust[nThreadID][nSunFrustumID];
-
-    if (bUseShaderPermutations)
-    {
-        m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] |
-                                   g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ]);
-    }
-
-    uint32 nCascadeMask = 0;
-    for (int a = nStartIdx, cascadeCount = 0; a < nEndIdx && cascadeCount < 4; ++a)
-    {
-        ShadowMapFrustum* pFr = &m_RP.m_SMFrustums[nThreadID][nSunFrustumID][a];
-        nCascadeMask |= 0x1 << a;
-
-        ConfigShadowTexgen(cascadeCount, pFr, -1, true);
-
-        if (bUseShaderPermutations)
-        {
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0 + cascadeCount];
-        }
-
-        ++cascadeCount;
-    }
-
-    // only do full pcf filtering on nearest shadow cascade
-    if (nCascadeMask > 0 && m_RP.m_SMFrustums[nThreadID][nSunFrustumID][nStartIdx].nShadowMapLod != 0)
-    {
-        nCascadeMask |= FORWARD_SHADOWS_CASCADE0_SINGLE_TAP;
-    }
-
-    if (m_bCloudShadowsEnabled && m_cloudShadowTexId > 0)
-    {
-        nCascadeMask |= FORWARD_SHADOWS_CLOUD_SHADOWS;
-
-        if (bUseShaderPermutations)
-        {
-            m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ];
-        }
-    }
-
-    // store cascade mask in m_TempVecs[4].z
-    *alias_cast<uint32*>(&m_cEF.m_TempVecs[4].z) = nCascadeMask;
-}
-
-void CD3D9Renderer::FX_SetupShadowsForTransp()
-{
-    PROFILE_FRAME(SetupShadowsForTransp);
-
-    m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_POINT_LIGHT] | g_HWSR_MaskBit[HWSR_SHADOW_MIXED_MAP_G16R16]);
-
-
-    m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_PARTICLE_SHADOW];
-
-    if (m_shadowJittering > 0.0f)
-    {
-        m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SHADOW_JITTERING];
-    }
-
-    // Always use PCF for shadows for transparent
-    m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[ HWSR_HW_PCF_COMPARE ];
-
-    FX_SetupForwardShadows(true);
-}
-
-void CD3D9Renderer::FX_SetupShadowsForFog()
-{
-    PROFILE_FRAME(FX_SetupShadowsForFog);
-
-    m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_POINT_LIGHT] | g_HWSR_MaskBit[HWSR_HW_PCF_COMPARE] | g_HWSR_MaskBit[HWSR_SHADOW_JITTERING] |
-                               g_HWSR_MaskBit[HWSR_SHADOW_MIXED_MAP_G16R16]);
-
-    m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_HW_PCF_COMPARE] | g_HWSR_MaskBit[HWSR_PARTICLE_SHADOW];
-
-    FX_SetupForwardShadows();
-}
-
-
-bool CD3D9Renderer::FX_PrepareDepthMapsForLight(const SRenderLight& rLight, int nLightID, bool bClearPool)
-{
-    int nThreadID = m_RP.m_nProcessThreadID;
-    int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-
-    if ((m_RP.m_TI[nThreadID].m_PersFlags & RBPF_NO_SHADOWGEN) != 0)
-    {
-        return false;
-    }
-
-    //render all valid shadow frustums
-    const int nStartIdx = SRendItem::m_StartFrust[nThreadID][nLightID];
-    const int nEndIdx = SRendItem::m_EndFrust[nThreadID][nLightID];
-    if (nStartIdx == nEndIdx)
-    {
-        return false;
-    }
-
-    AZ_Assert((nEndIdx - nStartIdx) <= MAX_GSM_LODS_NUM, "Number of shadow frustums is more than max GSM LODs supported.");
-
-    bool processedAtLeastOneShadow = false;
-
-    for (int nFrustIdx = nEndIdx - 1; nFrustIdx >= nStartIdx; --nFrustIdx)
-    {
-        ShadowMapFrustum* pCurFrustum = &m_RP.m_SMFrustums[nThreadID][nCurRecLevel][nFrustIdx];
-
-        int nLightFrustumID = nLightID * MAX_SHADOWMAP_LOD + (nFrustIdx - nStartIdx);
-        if (!pCurFrustum)
-        {
-            continue;
-        }
-
-        if (pCurFrustum->m_eReqTT == eTT_1D || pCurFrustum->m_eReqTF == eTF_Unknown)
-        {
-            // looks like unitialized shadow frustum for 1 frame - some mt issue
-            continue;
-        }
-
-        const bool bSun = (rLight.m_Flags & DLF_SUN) != 0;
-
-        // Per-object shadows are added to the "custom" shadow list in CRenderer::FinalizeRendItems_FindShadowFrustums.
-        // Do not render them twice.
-        if (pCurFrustum->m_eFrustumType != ShadowMapFrustum::e_PerObject)
-        {
-#ifndef _RELEASE
-            char frustumLabel[64];
-
-            if (bSun)
-            {
-                const int nShadowRecur = pCurFrustum->nShadowGenID[nThreadID][0];
-                const int nRendItemCount = nShadowRecur != 0xFFFFFFFF ? (SRendItem::m_ShadowsEndRI[nThreadID][nShadowRecur] - SRendItem::m_ShadowsStartRI[nThreadID][nShadowRecur]) : 0;
-
-                const char* frustumTextSun[] =
-                {
-                    "GSM FRUSTUM %i",
-                    "GSM DISTANCE FRUSTUM %i",
-                    "GSM CACHED FRUSTUM %i",
-                    "HEIGHT MAP AO FRUSTUM %i",
-                    "NEAREST FRUSTUM",
-                    "UNKNOWN"
-                };
-
-                frustumLabel[0] = 0;
-
-                if (!pCurFrustum->IsCached() || nRendItemCount > 0)
-                {
-                    sprintf_s(frustumLabel, frustumTextSun[pCurFrustum->m_eFrustumType], m_RP.m_SMFrustums[nThreadID][nCurRecLevel][nFrustIdx].nShadowMapLod);
-                }
-            }
-            else
-            {
-                sprintf_s(frustumLabel, "FRUSTUM %i", nFrustIdx - nStartIdx);
-            }
-
-            if (frustumLabel[0])
-            {
-                PROFILE_LABEL_PUSH(frustumLabel);
-            }
-#endif
-            // merge cached shadow maps and corresponding dynamic shadow maps.
-            if (bSun && pCurFrustum->m_eFrustumType == ShadowMapFrustum::e_GsmDynamicDistance)
-            {
-                assert(0 <= nStartIdx && nStartIdx <= nEndIdx && nEndIdx <= m_RP.m_SMFrustums[nThreadID][nCurRecLevel].size());
-                auto pBegin = m_RP.m_SMFrustums[nThreadID][nCurRecLevel].Data() + nStartIdx;
-                auto pEnd = m_RP.m_SMFrustums[nThreadID][nCurRecLevel].Data() + nEndIdx;
-                auto pCachedFrustum = std::find_if(pBegin, pEnd,
-                        [=](ShadowMapFrustum& fr)
-                        {
-                            return fr.nShadowMapLod == pCurFrustum->nShadowMapLod && fr.m_eFrustumType == ShadowMapFrustum::e_GsmCached;
-                        });
-
-                pCurFrustum->pDepthTex = NULL;
-                if (pCachedFrustum != pEnd)
-                {
-                    FX_MergeShadowMaps(pCurFrustum, pCachedFrustum);
-                    processedAtLeastOneShadow = true;
-                }
-            }
-
-            if (PrepareDepthMap(pCurFrustum, nLightFrustumID, bClearPool))
-            {
-                bClearPool = false;
-                processedAtLeastOneShadow = true;
-            }
-
-#ifndef _RELEASE
-            if (frustumLabel[0])
-            {
-                PROFILE_LABEL_POP(frustumLabel);
-            }
-#endif
-        }
-    }
-
-    return processedAtLeastOneShadow;
-}
-
-void CD3D9Renderer::EF_PrepareCustomShadowMaps()
-{
-    int nThreadID = m_RP.m_nProcessThreadID;
-    int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-
-    if ((m_RP.m_TI[nThreadID].m_PersFlags & RBPF_NO_SHADOWGEN) != 0)
-    {
-        return;
-    }
-
-    int NumDynLights = m_RP.m_DLights[nThreadID][nCurRecLevel].Num();
-
-    TArray<SRenderLight>&  arrDeferLights = CDeferredShading::Instance().GetLights(nThreadID, nCurRecLevel);
-
-    if (NumDynLights <= 0 && arrDeferLights.Num() <= 0)
-    {
-        return;
-    }
-
-    // Find AABB of all nearest objects. Compute once for all lights as this can be slow
-    AABB aabbCasters(AABB::RESET);
-    m_RP.m_arrCustomShadowMapFrustumData[nThreadID].CoalesceMemory();
-    size_t shadowMapArraySize = m_RP.m_arrCustomShadowMapFrustumData[nThreadID].size();
-    for (size_t i = 0; i < shadowMapArraySize; ++i)
-    {
-        aabbCasters.Add(m_RP.m_arrCustomShadowMapFrustumData[nThreadID][i].aabb);
-    }
-
-    // AABBs are added in world space but without camera position applied
-    aabbCasters.min += GetCamera().GetPosition();
-    aabbCasters.max += GetCamera().GetPosition();
-
-    // add nearest frustum if it has been set up
-    for (int nLightID = 0; nLightID < NumDynLights; nLightID++)
-    {
-        SRenderLight* pLight =  &m_RP.m_DLights[nThreadID][nCurRecLevel][nLightID];
-
-        if (!(pLight->m_Flags & DLF_CASTSHADOW_MAPS))
-        {
-            continue;
-        }
-
-        //shadows for nearest objects
-        if (CV_r_DrawNearShadows && pLight->m_Flags & DLF_DIRECTIONAL)
-        {
-            int nStartIdx = SRendItem::m_StartFrust[nThreadID][nLightID];
-            TArray<ShadowMapFrustum>& arrFrustums = m_RP.m_SMFrustums[nThreadID][nCurRecLevel];
-            if (!arrFrustums.empty() && nStartIdx >= 0 && nStartIdx < arrFrustums.size())
-            {
-                //////////////////////////////////////////////////////////////////////////
-                //prepare custom frustums for sun
-                if (!m_RP.m_arrCustomShadowMapFrustumData[nThreadID].empty())
-                {
-                    //copy sun frustum
-                    ShadowMapFrustum* pCustomFrustum = arrFrustums.AddIndex(1);
-                    ShadowMapFrustum* pSunFrustum =  &arrFrustums[nStartIdx];
-                    memcpy(pCustomFrustum, pSunFrustum, sizeof(ShadowMapFrustum));
-
-                    const int nFrustumIndex = arrFrustums.Num() - 1;
-                    m_RP.m_SMCustomFrustumIDs[nThreadID][nCurRecLevel].Add(nFrustumIndex);
-
-                    pCustomFrustum->m_eFrustumType = ShadowMapFrustum::e_Nearest;
-                    pCustomFrustum->bUseShadowsPool = false;
-                    pCustomFrustum->bUseAdditiveBlending = true;
-                    pCustomFrustum->fShadowFadingDist = 1.0f;
-                    pCustomFrustum->fDepthConstBias = 0.0001f;
-
-                    Matrix44A& mPrj = pCustomFrustum->mLightProjMatrix;
-                    Matrix44A& mView = pCustomFrustum->mLightViewMatrix;
-                    pCustomFrustum->aabbCasters = aabbCasters;
-                    CShadowUtils::GetShadowMatrixForObject(mPrj, mView, pCustomFrustum);
-                    pCustomFrustum->mLightViewMatrix = pCustomFrustum->mLightViewMatrix * pCustomFrustum->mLightProjMatrix;
-                }
-                //////////////////////////////////////////////////////////////////////////
-            }
-        }
-    }
-
-    // prepare depth maps for all custom frustums
-    for (int32* pID = m_RP.m_SMCustomFrustumIDs[nThreadID][nCurRecLevel].begin(); pID != m_RP.m_SMCustomFrustumIDs[nThreadID][nCurRecLevel].end(); ++pID)
-    {
-        ShadowMapFrustum& curFrustum = m_RP.m_SMFrustums[nThreadID][nCurRecLevel][*pID];
-        PrepareDepthMap(&curFrustum, curFrustum.m_eFrustumType == ShadowMapFrustum::e_Nearest ? -1 : *pID, true);
-    }
-}
-
-void CD3D9Renderer::EF_PrepareAllDepthMaps()
-{
-    int nThreadID = m_RP.m_nProcessThreadID;
-    int nCurRecLevel = SRendItem::m_RecurseLevel[nThreadID];
-    assert(nCurRecLevel >= 0);
-
-    int NumDynLights = m_RP.m_DLights[nThreadID][nCurRecLevel].Num();
-
-    TArray<SRenderLight>&  arrDeferLights = CDeferredShading::Instance().GetLights(nThreadID, nCurRecLevel);
-
-    if (NumDynLights <= 0 && arrDeferLights.Num() <= 0)
-    {
-        return;
-    }
-
-    bool haveShadows = false;
-    for (int nLightID = 0; nLightID < NumDynLights; nLightID++)
-    {
-        SRenderLight* pLight =  &m_RP.m_DLights[nThreadID][SRendItem::m_RecurseLevel[nThreadID]][nLightID];
-
-        if (!(pLight->m_Flags & DLF_CASTSHADOW_MAPS))
-        {
-            continue;
-        }
-
-        haveShadows |= FX_PrepareDepthMapsForLight(*pLight, nLightID);
-    }
-
-    if (!haveShadows && m_clearShadowMaskTexture)
-    {
-        FX_ClearShadowMaskTexture();
-        m_clearShadowMaskTexture = false;
-    }
-    else
-    {
-        m_clearShadowMaskTexture = true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    if IsCVarConstAccess(constexpr) (!CV_r_UseShadowsPool)
-    {
-        for (uint32 nDeferLightID = 0; nDeferLightID < arrDeferLights.Num(); nDeferLightID++)
-        {
-            SRenderLight* pLight =  &arrDeferLights[nDeferLightID];
-            if (!(pLight->m_Flags & DLF_CASTSHADOW_MAPS))
-            {
-                continue;
-            }
-
-            int nDeferLightIdx = nDeferLightID + NumDynLights;
-            assert((unsigned int) nDeferLightIdx < (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS));
-            if ((unsigned int) nDeferLightIdx >= (MAX_REND_LIGHTS + MAX_DEFERRED_LIGHTS))
-            {
-                Warning("CD3D9Renderer::EF_PrepareAllDepthMaps: Too many light sources used ...");
-                return;
-            }
-
-            FX_PrepareDepthMapsForLight(*pLight, nDeferLightIdx);
-        }
-    }
-
-    // prepare custom depth maps
-    {
-        PROFILE_LABEL_SCOPE("CUSTOM MAPS");
-        const uint64 nPrevRTFlags = m_RP.m_FlagsShader_RT;
-        uint32 nPrefRendFlags = m_RP.m_nRendFlags;
-        m_RP.m_nRendFlags = 0;
-
-        EF_PrepareCustomShadowMaps();
-
-        m_RP.m_nRendFlags = nPrefRendFlags;
-        m_RP.m_FlagsShader_RT = nPrevRTFlags;
-    }
-}
-
-void CD3D9Renderer::FX_MergeShadowMaps(ShadowMapFrustum* pDst, const ShadowMapFrustum* pSrc)
-{
-    if (!pDst || !pSrc)
-    {
-        return;
-    }
-    AZ_TRACE_METHOD();
-
-    CRY_ASSERT(pSrc->m_eFrustumType == ShadowMapFrustum::e_GsmCached);
-    CRY_ASSERT(pDst->m_eFrustumType == ShadowMapFrustum::e_GsmDynamicDistance);
-    CRY_ASSERT(pDst->nShadowMapLod == pSrc->nShadowMapLod);
-
-    const int nThreadID = m_RP.m_nProcessThreadID;
-    const int nShadowRecur = pDst->nShadowGenID[nThreadID][0];
-    const int nRendItemCount = nShadowRecur != 0xFFFFFFFF ? (SRendItem::m_ShadowsEndRI[nThreadID][nShadowRecur] - SRendItem::m_ShadowsStartRI[nThreadID][nShadowRecur]) : 0;
-
-    // get crop rectangle for projection
-    Matrix44r mReproj = Matrix44r(pDst->mLightViewMatrix).GetInverted() * Matrix44r(pSrc->mLightViewMatrix);
-    Vec4r srcClipPosTL = Vec4r(-1, -1, 0, 1) * mReproj;
-    srcClipPosTL /= srcClipPosTL.w;
-
-    const float fSnap = 2.0f / pSrc->pDepthTex->GetWidth();
-    Vec4 crop = Vec4(
-            crop.x = fSnap * int(srcClipPosTL.x / fSnap),
-            crop.y = fSnap * int(srcClipPosTL.y / fSnap),
-            crop.z = 2.0f * pDst->nTextureWidth / float(pSrc->nTextureWidth),
-            crop.w = 2.0f * pDst->nTextureHeight / float(pSrc->nTextureHeight)
-            );
-
-    Matrix44 cropMatrix(IDENTITY);
-    cropMatrix.m00 = 2.f / crop.z;
-    cropMatrix.m11 = 2.f / crop.w;
-    cropMatrix.m30 = -(1.0f + cropMatrix.m00 * crop.x);
-    cropMatrix.m31 = -(1.0f + cropMatrix.m11 * crop.y);
-
-    const bool bOutsideFrustum = abs(crop.x) > 1.0f || abs(crop.x + crop.z) > 1.0f || abs(crop.y) > 1.0f || abs(crop.y + crop.w) > 1.0f;
-    const bool bEmptyCachedFrustum = pSrc->nShadowGenMask == 0;
-    const bool bRequireCopy = bOutsideFrustum || bEmptyCachedFrustum || nRendItemCount > 0;
-
-    pDst->pDepthTex = NULL;
-    pDst->bIncrementalUpdate = true;
-    pDst->mLightViewMatrix = pSrc->mLightViewMatrix * cropMatrix;
-
-    // do we need to merge static shadows into the dynamic shadow map?
-    if (bRequireCopy)
-    {
-
-        SDynTexture_Shadow* pDynTex = SDynTexture_Shadow::GetForFrustum(pDst);
-        pDst->pDepthTex = pDynTex->m_pTexture;
-
-        SDepthTexture depthSurface;
-
-        depthSurface.nWidth = pDst->nTextureWidth;
-        depthSurface.nHeight = pDst->nTextureHeight;
-        depthSurface.nFrameAccess = -1;
-        depthSurface.bBusy = false;
-        depthSurface.pTex = pDst->pDepthTex;
-        depthSurface.pSurf = pDst->pDepthTex->GetDeviceDepthStencilSurf();
-        depthSurface.pTarget = pDst->pDepthTex->GetDevTexture()->Get2DTexture();
-
-        if (bEmptyCachedFrustum)
-        {
-            gcpRendD3D->FX_ClearTarget(&depthSurface, CLEAR_ZBUFFER | CLEAR_STENCIL, Clr_FarPlane.r, 0);
-        }
-        else
-        {
-            uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-
-            int iTempX, iTempY, iWidth, iHeight;
-            gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-            gcpRendD3D->FX_PushRenderTarget(0, (CTexture*)NULL, &depthSurface);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-            gcpRendD3D->RT_SetViewport(0, 0,  pDst->pDepthTex->GetWidth(),  pDst->pDepthTex->GetHeight());
-
-            FX_SetStencilDontCareActions(0, true, true);
-
-            static CCryNameTSCRC pTechCopyShadowMap("ReprojectShadowMap");
-            SPostEffectsUtils::ShBeginPass(CShaderMan::s_ShaderShadowMaskGen, pTechCopyShadowMap, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            gRenDev->FX_SetState(GS_DEPTHWRITE | GS_DEPTHFUNC_NOTEQUAL);
-
-            Matrix44 mReprojDstToSrc = pDst->mLightViewMatrix.GetInverted() * pSrc->mLightViewMatrix;
-
-            static CCryNameR paramReprojMatDstToSrc("g_mReprojDstToSrc");
-            CShaderMan::s_ShaderShadowMaskGen->FXSetPSFloat(paramReprojMatDstToSrc, (Vec4*) mReprojDstToSrc.GetData(), 4);
-
-            Matrix44 mReprojSrcToDst = pSrc->mLightViewMatrix.GetInverted() * pDst->mLightViewMatrix;
-            static CCryNameR paramReprojMatSrcToDst("g_mReprojSrcToDst");
-            CShaderMan::s_ShaderShadowMaskGen->FXSetPSFloat(paramReprojMatSrcToDst, (Vec4*) mReprojSrcToDst.GetData(), 4);
-
-            pSrc->pDepthTex->Apply(0, CTexture::GetTexState(STexState(FILTER_POINT, true)));
-
-            SPostEffectsUtils::DrawFullScreenTri(depthSurface.nWidth, depthSurface.nHeight);
-            SPostEffectsUtils::ShEndPass();
-
-            gcpRendD3D->FX_PopRenderTarget(0);
-            gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-            gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-        }
-
-        pDst->packWidth[0] = pDst->nTextureWidth;
-        pDst->packHeight[0] = pDst->nTextureHeight;
-
-        pDst->packX[0] = pDst->packY[0] = 0;
-    }
-    else
-    {
-        pDst->packX[0] = int((crop.x * 0.5f + 0.5f) * pSrc->pDepthTex->GetWidth() + 0.5f);
-        pDst->packY[0] = int((-(crop.y + crop.w) * 0.5f + 0.5f) * pSrc->pDepthTex->GetHeight() + 0.5f);
-        pDst->packWidth[0]  = pDst->nTextureWidth;
-        pDst->packHeight[0] = pDst->nTextureHeight;
-
-        pDst->pDepthTex = pSrc->pDepthTex;
-        pDst->nTexSize = pSrc->nTexSize;
-        pDst->nTextureWidth = pSrc->nTextureWidth;
-        pDst->nTextureHeight = pSrc->nTextureHeight;
-    }
-
-    pDst->fNearDist = pSrc->fNearDist;
-    pDst->fFarDist = pSrc->fFarDist;
-    pDst->fDepthConstBias = pSrc->fDepthConstBias;
-    pDst->fDepthTestBias = pSrc->fDepthTestBias;
-    pDst->fDepthSlopeBias = pSrc->fDepthSlopeBias;
-}
-
-void CD3D9Renderer::FX_ClearShadowMaskTexture()
-{
-    const int arraySize = CTexture::s_ptexShadowMask->StreamGetNumSlices();
-    SResourceView curSliceRVDesc = SResourceView::RenderTargetView(CTexture::s_ptexShadowMask->GetTextureDstFormat(), 0, 1);
-    for (int i = 0; i < arraySize; ++i)
-    {
-        curSliceRVDesc.m_Desc.nFirstSlice = i;
-        SResourceView& firstSliceRV = CTexture::s_ptexShadowMask->GetResourceView(curSliceRVDesc);
-
-#if defined(CRY_USE_METAL)
-        static ICVar* pVar = iConsole->GetCVar("e_ShadowsClearShowMaskAtLoad");
-        if (pVar && pVar->GetIVal())
-        {
-            FX_ClearTarget(static_cast<D3DSurface*>(firstSliceRV.m_pDeviceResourceView), Clr_Transparent, 0, nullptr);
-            
-            // On metal we have to submit a draw call in order for a clear to take affect.
-            // Doing the commit/clear target region will produce the needed draw call for the clear.
-            FX_PushRenderTarget(0, static_cast<D3DSurface*>(firstSliceRV.m_pDeviceResourceView), nullptr);
-            
-            RT_SetViewport(0, 0, CTexture::s_ptexShadowMask->GetWidth(), CTexture::s_ptexShadowMask->GetHeight());
-            FX_Commit();
-            FX_ClearTargetRegion();
-            FX_PopRenderTarget(0);
-        }
-#else
-        FX_ClearTarget(static_cast<D3DSurface*>(firstSliceRV.m_pDeviceResourceView), Clr_Transparent, 0, nullptr);
-#endif
-    }
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DStereo.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DStereo.cpp
deleted file mode 100644
index 0997a10e59..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DStereo.cpp
+++ /dev/null
@@ -1,884 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "D3DStereo.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "D3DHMDRenderer.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DSTEREO_CPP_SECTION_1 1
-#define D3DSTEREO_CPP_SECTION_2 2
-#endif
-
-#include <MathConversion.h>
-
-CD3DStereoRenderer::CD3DStereoRenderer(CD3D9Renderer& renderer, EStereoDevice device)
-    : m_renderer(renderer)
-    , m_device(device)
-    , m_deviceState(STEREO_DEVSTATE_UNSUPPORTED_DEVICE)
-    , m_mode(STEREO_MODE_NO_STEREO)
-    , m_output(STEREO_OUTPUT_STANDARD)
-    , m_driver(DRIVER_UNKNOWN)
-    , m_pLeftTex(nullptr)
-    , m_pRightTex(nullptr)
-    , m_nvStereoHandle(nullptr)
-    , m_nvStereoStrength(0.0f)
-    , m_nvStereoActivated(0)
-    , m_renderStatus(IStereoRenderer::Status::kIdle)
-    , m_frontBufWidth(0)
-    , m_frontBufHeight(0)
-    , m_stereoStrength(0.0f)
-    , m_zeroParallaxPlaneDist(0.25f)
-    , m_maxSeparationScene(0.0f)
-    , m_nearGeoScale(0.0f)
-    , m_gammaAdjustment(0)
-    , m_screenSize(0.0f)
-    , m_resourcesPatched(false)
-    , m_needClearLeft(true)
-    , m_needClearRight(true)
-    , m_hmdRenderer(nullptr)
-{
-    if (device == STEREO_DEVICE_DEFAULT)
-    {
-        SelectDefaultDevice();
-    }
-}
-
-
-CD3DStereoRenderer::~CD3DStereoRenderer()
-{
-    Shutdown();
-}
-
-
-void CD3DStereoRenderer::SelectDefaultDevice()
-{
-    EStereoDevice device = STEREO_DEVICE_NONE;
-
-#if D3DSTEREO_CPP_TRAIT_SELECTDEFAULTDEVICE_STEREODEVICEDRIVER
-    device = STEREO_DEVICE_DRIVER;
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSTEREO_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DStereo_cpp)
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-    device = STEREO_DEVICE_FRAMECOMP;
-#endif
-
-    m_device = device;
-}
-
-
-void CD3DStereoRenderer::InitDeviceBeforeD3D()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (m_device == STEREO_DEVICE_NONE)
-    {
-        return;
-    }
-
-    bool success = true;
-    m_deviceState = STEREO_DEVSTATE_UNSUPPORTED_DEVICE;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSTEREO_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DStereo_cpp)
-#endif
-
-    if (success)
-    {
-        m_deviceState = STEREO_DEVSTATE_OK;
-    }
-    else
-    {
-        iLog->LogError("Failed to create stereo device");
-        m_device = STEREO_DEVICE_NONE;
-    }
-}
-
-
-void CD3DStereoRenderer::InitDeviceAfterD3D()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    // Note: Resources will be created in EF_Init, so no need to create them here
-    AZ::StereoRendererRequestBus::Handler::BusConnect();
-}
-
-
-void CD3DStereoRenderer::CreateResources()
-{
-    m_SourceSizeParamName = CCryNameR("SourceSize");
-
-    if (!CTexture::s_ptexStereoL || !CTexture::s_ptexStereoR)
-    {
-        CreateIntermediateBuffers();
-    }
-}
-
-
-void CD3DStereoRenderer::CreateIntermediateBuffers()
-{
-    SAFE_RELEASE(CTexture::s_ptexStereoL);
-    SAFE_RELEASE(CTexture::s_ptexStereoR);
-
-    int nWidth = m_renderer.GetWidth();
-    int nHeight = m_renderer.GetHeight();
-
-    uint32 nFlags = FT_DONT_STREAM | FT_USAGE_RENDERTARGET;
-
-    CTexture::s_ptexStereoL = CTexture::CreateRenderTarget("$StereoL", nWidth, nHeight, Clr_Empty, eTT_2D, nFlags, eTF_R8G8B8A8);
-    CTexture::s_ptexStereoR = CTexture::CreateRenderTarget("$StereoR", nWidth, nHeight, Clr_Empty, eTT_2D, nFlags, eTF_R8G8B8A8);
-}
-
-void CD3DStereoRenderer::Shutdown()
-{
-    AZ::StereoRendererRequestBus::Handler::BusDisconnect();
-
-    ReleaseResources();
-
-    ShutdownHmdRenderer();
-}
-
-
-void CD3DStereoRenderer::ReleaseResources()
-{
-    if (m_device == STEREO_DEVICE_NONE)
-    {
-        return;
-    }
-
-    SAFE_RELEASE(CTexture::s_ptexStereoL);
-    SAFE_RELEASE(CTexture::s_ptexStereoR);
-}
-
-
-bool CD3DStereoRenderer::EnableStereo()
-{
-    if (!m_hmdRenderer)
-    {
-        return InitializeHmdRenderer();
-    }
-
-    return true;
-}
-
-
-void CD3DStereoRenderer::DisableStereo()
-{
-    m_gammaAdjustment = 0;
-
-    ShutdownHmdRenderer();
-}
-
-
-void CD3DStereoRenderer::ChangeOutputFormat()
-{
-    m_frontBufWidth = 0;
-    m_frontBufHeight = 0;
-}
-
-
-bool CD3DStereoRenderer::InitializeHmdRenderer()
-{
-    assert(m_hmdRenderer == nullptr);
-
-    if (AZ::VR::HMDDeviceRequestBus::GetTotalNumOfEventHandlers() <= 0)
-    {
-        return false;
-    }
-
-    m_hmdRenderer = new D3DHMDRenderer();
-
-    if (m_hmdRenderer != nullptr)
-    {
-        if (!m_hmdRenderer->Initialize(&m_renderer, this))
-        {
-            SAFE_DELETE(m_hmdRenderer);
-            return false;
-        }
-    }
-    return (m_hmdRenderer != nullptr);
-}
-
-
-void CD3DStereoRenderer::ShutdownHmdRenderer()
-{
-    if (m_hmdRenderer != NULL)
-    {
-        m_hmdRenderer->Shutdown();
-        SAFE_DELETE(m_hmdRenderer);
-    }
-}
-
-
-void CD3DStereoRenderer::PrepareStereo(EStereoMode mode, EStereoOutput output)
-{
-    if (m_mode != mode || m_output != output)
-    {
-        m_renderer.ForceFlushRTCommands();
-
-        if (m_mode != mode)
-        {
-            m_mode = mode;
-            m_output = output;
-
-            if (mode != STEREO_MODE_NO_STEREO)
-            {
-                EnableStereo();
-                ChangeOutputFormat();
-            }
-        }
-        else if (m_output != output)
-        {
-            m_output = output;
-
-            if (IsStereoEnabled())
-            {
-                ChangeOutputFormat();
-            }
-        }
-    }
-
-    if (IsStereoEnabled())
-    {
-        // VR FIX ME
-        // These code was written for 3D TV stereo, not for VR.
-        // VR EyeDist concept is the half distance between the eyes, it can be different for 3D TV with reprojection
-
-        // Update stereo parameters
-        m_stereoStrength = CRenderer::CV_r_StereoStrength;
-        m_maxSeparationScene = CRenderer::CV_r_StereoEyeDist;
-        m_zeroParallaxPlaneDist = CRenderer::CV_r_StereoScreenDist;
-        m_nearGeoScale = CRenderer::CV_r_StereoNearGeoScale;
-        m_gammaAdjustment = CRenderer::CV_r_StereoGammaAdjustment;
-
-        float screenDiagonal = GetScreenDiagonalInInches();
-        if (screenDiagonal > 0.0f) // override CVar if we can determine the correct maximum separation
-        {
-            float aspect = 9.0f / 16.0f;
-            float horizontal = screenDiagonal / sqrtf(1.0f + aspect * aspect);
-            float typicalEyeSeperation = 2.5f; // In inches
-            m_maxSeparationScene = min(typicalEyeSeperation / horizontal, m_maxSeparationScene); // Get bleeding at edges so limit to CVar
-        }
-
-        // Apply stereo strength
-        m_maxSeparationScene *= m_stereoStrength;
-
-        if (m_hmdRenderer != NULL)
-        {
-            m_hmdRenderer->PrepareFrame();
-        }
-    }
-}
-
-
-void CD3DStereoRenderer::HandleNVControl()
-{
-}
-
-
-void CD3DStereoRenderer::SetEyeTextures(CTexture* leftTex, CTexture* rightTex)
-{
-    m_pLeftTex = leftTex;
-    m_pRightTex = rightTex;
-}
-
-
-void CD3DStereoRenderer::Update()
-{
-    if (m_device != STEREO_DEVICE_NONE)
-    {
-        m_renderer.m_pRT->RC_PrepareStereo(CRenderer::CV_r_StereoMode, CRenderer::CV_r_StereoOutput);
-    }
-    else
-    {
-        static int prevMode = 0;
-        if (CRenderer::CV_r_StereoMode != prevMode)
-        {
-            LogWarning("No stereo device enabled, ignoring stereo mode");
-            prevMode = CRenderer::CV_r_StereoMode;
-        }
-    }
-}
-
-
-CCamera CD3DStereoRenderer::PrepareCamera(EStereoEye nEye,  const CCamera& currentCamera, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-    CCamera cam = currentCamera;
-
-    if (IsRenderingToHMD())
-    {
-        AZ::VR::PerEyeCameraInfo cameraInfo;
-        EBUS_EVENT(AZ::VR::HMDDeviceRequestBus, GetPerEyeCameraInfo, nEye, cam.GetNearPlane(), cam.GetFarPlane(), cameraInfo);
-
-        const float asymmetricHorizontalTranslation = cameraInfo.frustumPlane.horizontalDistance * cam.GetNearPlane();
-        const float asymmetricVerticalTranslation = cameraInfo.frustumPlane.verticalDistance * cam.GetNearPlane();
-
-        Matrix34 stereoMat = Matrix34::CreateTranslationMat(AZVec3ToLYVec3(cameraInfo.eyeOffset));
-        cam.SetMatrix(cam.GetMatrix() * stereoMat);
-        cam.SetFrustum(1, 1, cameraInfo.fov, cam.GetNearPlane(), cam.GetFarPlane(), 1.0f / cameraInfo.aspectRatio);
-        cam.SetAsymmetry(asymmetricHorizontalTranslation, asymmetricHorizontalTranslation, asymmetricVerticalTranslation, asymmetricVerticalTranslation);
-    }
-    else
-    {
-        float fNear = cam.GetNearPlane();
-        float screenDist = CRenderer::CV_r_StereoScreenDist;
-        float z = 99999.0f;  // Point which is far away
-
-        // standard 3D TV stereo projection parameters
-        float wT = tanf(cam.GetFov() * 0.5f) * fNear;
-        float wR = wT * cam.GetProjRatio(), wL = -wR;
-        float p00 = 2 * fNear / (wR - wL);
-        float p02 = (wL + wR) / (wL - wR);
-
-        // Compute required camera shift, so that a distant point gets the desired maximum separation
-        const float maxSeparation = CRenderer::CV_r_StereoEyeDist;
-        const float camOffset = (maxSeparation - p02) / (p00 / z - p00 / screenDist);
-        float frustumShift = camOffset * (fNear / screenDist);
-        //frustumShift *= (nEye == STEREO_EYE_LEFT ? 1 : -1);  // Support postive and negative parallax for non-VR stereo
-
-        Matrix34 stereoMat = Matrix34::CreateTranslationMat(Vec3(nEye == STEREO_EYE_LEFT ? -camOffset : camOffset, 0, 0));
-        cam.SetMatrix(cam.GetMatrix() * stereoMat);
-        cam.SetAsymmetry(frustumShift, frustumShift, 0, 0);
-    }
-
-    return cam;
-}
-
-
-void CD3DStereoRenderer::ProcessScene(int sceneFlags, const SRenderingPassInfo& passInfo)
-{
-    int nThreadID = passInfo.ThreadID();
-
-    //for recursive rendering (e.g. rendering to ocean reflection texture), stereo is not needed
-    //We also don't need stereo rendering if we're not rendering on the main viewport (don't check if main viewport when in the launcher)
-    if (CRenderer::CV_r_StereoMode == STEREO_MODE_DUAL_RENDERING && SRendItem::m_RecurseLevel[nThreadID] < 1
-        && (!gEnv->IsEditor() || gcpRendD3D->m_CurrContext->m_bMainViewport))      
-    {
-        CCamera cam = m_renderer.m_RP.m_TI[nThreadID].m_cam;
-
-        // Left eye
-        {
-            m_renderStatus = IStereoRenderer::Status::kRenderingFirstEye;
-            m_renderer.m_pRT->RC_SetStereoEye(STEREO_EYE_LEFT);
-            m_renderer.PushProfileMarker("LEFT_EYE");
-
-            CCamera camL = PrepareCamera(STEREO_EYE_LEFT, cam, passInfo);
-            m_renderer.SetCamera(camL);
-
-            CD3DStereoRenderer::RenderScene(sceneFlags, passInfo);
-
-            CopyToStereoFromMainThread(STEREO_EYE_LEFT);
-            m_renderer.PopProfileMarker("LEFT_EYE");
-        }
-
-        // Right eye
-        {
-            m_renderStatus = IStereoRenderer::Status::kRenderingSecondEye;
-            m_renderer.m_pRT->RC_SetStereoEye(STEREO_EYE_RIGHT);
-            m_renderer.PushProfileMarker("RIGHT_EYE");
-
-            CCamera camR = PrepareCamera(STEREO_EYE_RIGHT, cam, passInfo);
-            m_renderer.SetCamera(camR);
-
-            CD3DStereoRenderer::RenderScene(sceneFlags | SHDF_NO_SHADOWGEN, passInfo);
-            CopyToStereoFromMainThread(STEREO_EYE_RIGHT);
-
-            m_renderer.PopProfileMarker("RIGHT_EYE");
-        }
-
-        m_renderStatus = IStereoRenderer::Status::kIdle;
-    }
-    else
-    {
-        if (CRenderer::CV_r_StereoMode != STEREO_MODE_DUAL_RENDERING)
-        {
-            m_renderer.m_pRT->RC_SetStereoEye(0);
-        }
-
-        CD3DStereoRenderer::RenderScene(sceneFlags, passInfo);
-    }
-}
-
-
-void CD3DStereoRenderer::CopyToStereo(int channel)
-{
-    assert(IsRenderThread());
-
-    PROFILE_LABEL_SCOPE("COPY_TO_STEREO");
-
-    CTexture* pTex;
-
-    if (channel == STEREO_EYE_LEFT)
-    {
-        pTex = GetLeftEye();
-        m_needClearLeft = false;
-    }
-    else
-    {
-        pTex = GetRightEye();
-        m_needClearRight = false;
-    }
-
-    if (pTex == NULL)
-    {
-        return;
-    }
-
-    GetUtils().CopyScreenToTexture(pTex);
-
-    CTexture* finalCompositeSource = GetUtils().GetFinalCompositeTarget();
-    if (gcpRendD3D->FX_GetCurrentRenderTarget(0) == finalCompositeSource && finalCompositeSource != nullptr)
-    {
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-}
-
-
-void CD3DStereoRenderer::DisplayStereo()
-{
-    assert(IsRenderThread());
-
-    if (!IsStereoEnabled() || m_renderer.m_bDeviceLost)  // When unloading level, m_bDeviceLost is set to 2
-    {
-        return;
-    }
-
-    if (m_hmdRenderer != NULL)
-    {
-        m_hmdRenderer->RenderSocialScreen();
-        m_hmdRenderer->SubmitFrame();
-        return;
-    }
-
-    ResolveStereoBuffers();
-    m_needClearLeft = true;
-    m_needClearRight = true;
-
-    m_renderer.m_cEF.mfRefreshSystemShader("Stereo", CShaderMan::s_ShaderStereo);
-
-    PROFILE_LABEL_SCOPE("DISPLAY_STEREO");
-
-    // TODO: Fix this properly
-    if (!gEnv->IsEditor())
-    {
-        m_renderer.RT_SetViewport(0, 0, m_renderer.GetBackbufferWidth(), m_renderer.GetBackbufferHeight());
-    }
-
-    if (m_renderer.m_pSecondBackBuffer != 0)
-    {
-        m_renderer.FX_PushRenderTarget(1, m_renderer.m_pSecondBackBuffer, NULL);
-        m_renderer.RT_SetViewport(0, 0, m_renderer.m_NewViewport.nWidth, m_renderer.m_NewViewport.nHeight);
-    }
-
-    CShader* pSH = m_renderer.m_cEF.s_ShaderStereo;
-    SelectShaderTechnique();
-
-    uint32 nPasses = 0;
-    pSH->FXBegin(&nPasses, FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-
-    m_renderer.FX_SetState(GS_NODEPTHTEST);
-
-    int width = m_renderer.GetWidth();
-    int height = m_renderer.GetHeight();
-
-    Vec4 pParams = Vec4((float) width, (float) height, 0, 0);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(m_SourceSizeParamName, &pParams, 1);
-
-    GetUtils().SetTexture(!CRenderer::CV_r_StereoFlipEyes ? GetLeftEye() : GetRightEye(), 0, FILTER_LINEAR);
-    GetUtils().SetTexture(!CRenderer::CV_r_StereoFlipEyes ? GetRightEye() : GetLeftEye(), 1, FILTER_LINEAR);
-
-    GetUtils().DrawFullScreenTri(width, height);
-
-    pSH->FXEndPass();
-    pSH->FXEnd();
-
-    if (m_renderer.m_pSecondBackBuffer != 0)
-    {
-        m_renderer.FX_PopRenderTarget(1);
-    }
-}
-
-
-void CD3DStereoRenderer::BeginRenderingMRT(bool disableClear)
-{
-    if (!IsStereoEnabled())
-    {
-        return;
-    }
-
-    if (disableClear)
-    {
-        m_needClearLeft = false;
-        m_needClearRight = false;
-    }
-
-    PushRenderTargets();
-}
-
-
-void CD3DStereoRenderer::EndRenderingMRT(bool bResolve)
-{
-    if (!IsStereoEnabled())
-    {
-        return;
-    }
-
-    PopRenderTargets(bResolve);
-}
-
-
-void CD3DStereoRenderer::TakeScreenshot(const char path[])
-{
-    stack_string pathL(path);
-    stack_string pathR(path);
-
-    pathL.insert(pathL.find('.'), "_L");
-    pathR.insert(pathR.find('.'), "_R");
-
-    ((CD3D9Renderer*) gRenDev)->CaptureFrameBufferToFile(pathL.c_str(), GetLeftEye());
-    ((CD3D9Renderer*) gRenDev)->CaptureFrameBufferToFile(pathR.c_str(), GetRightEye());
-}
-
-
-void CD3DStereoRenderer::ResolveStereoBuffers()
-{
-}
-
-IStereoRenderer::Status ConvertFromEyeToStatus(const EStereoEye eye)
-{
-    if (eye == STEREO_EYE_LEFT)
-    {
-        return IStereoRenderer::Status::kRenderingFirstEye;
-    }
-    else if (eye == STEREO_EYE_RIGHT)
-    {
-        return IStereoRenderer::Status::kRenderingSecondEye;
-    }
-
-    return IStereoRenderer::Status::kIdle;
-}
-
-void CD3DStereoRenderer::BeginRenderingTo(EStereoEye eye)
-{
-    m_renderStatus = ConvertFromEyeToStatus(eye);
-
-    if (eye == STEREO_EYE_LEFT)
-    {
-        gRenDev->SetProfileMarker("LEFT_EYE", CRenderer::ESPM_PUSH);
-        if (m_needClearLeft)
-        {
-            m_renderer.FX_ClearTarget(GetLeftEye(), Clr_Transparent);
-            m_needClearLeft = false;
-        }
-        m_renderer.FX_PushRenderTarget(0, GetLeftEye(), &m_renderer.m_DepthBufferOrig);
-    }
-    else
-    {
-        gRenDev->SetProfileMarker("RIGHT_EYE", CRenderer::ESPM_PUSH);
-        if (m_needClearRight)
-        {
-            m_renderer.FX_ClearTarget(GetRightEye(), Clr_Transparent);
-            m_needClearRight = false;
-        }
-        m_renderer.FX_PushRenderTarget(0, GetRightEye(), &m_renderer.m_DepthBufferOrig);
-    }
-
-    m_renderer.FX_SetActiveRenderTargets();
-
-    if (eye == STEREO_EYE_LEFT)
-    {
-        GetLeftEye()->SetResolved(true);
-    }
-    else
-    {
-        GetRightEye()->SetResolved(true);
-    }
-}
-
-
-void CD3DStereoRenderer::EndRenderingTo(EStereoEye eye)
-{
-    if (eye == STEREO_EYE_LEFT)
-    {
-        gRenDev->SetProfileMarker("LEFT_EYE", CRenderer::ESPM_POP);
-        GetLeftEye()->SetResolved(true);
-        m_renderer.FX_PopRenderTarget(0);
-    }
-    else
-    {
-        gRenDev->SetProfileMarker("RIGHT_EYE", CRenderer::ESPM_POP);
-        GetRightEye()->SetResolved(true);
-        m_renderer.FX_PopRenderTarget(0);
-    }
-}
-
-
-void CD3DStereoRenderer::SelectShaderTechnique()
-{
-    gRenDev->m_cEF.mfRefreshSystemShader("Stereo", CShaderMan::s_ShaderStereo);
-
-    CShader* pSH = m_renderer.m_cEF.s_ShaderStereo;
-
-    if (m_device == STEREO_DEVICE_FRAMECOMP)
-    {
-        switch (GetStereoOutput())
-        {
-        case STEREO_OUTPUT_CHECKERBOARD:
-            pSH->FXSetTechnique("Checkerboard");
-            break;
-        case STEREO_OUTPUT_SIDE_BY_SIDE:
-            pSH->FXSetTechnique("SideBySide");
-            break;
-        case STEREO_OUTPUT_LINE_BY_LINE:
-            pSH->FXSetTechnique("LineByLine");
-            break;
-    #ifndef _RELEASE
-        case STEREO_OUTPUT_ANAGLYPH:
-            pSH->FXSetTechnique("Anaglyph");
-            break;
-    #endif
-        default:
-            pSH->FXSetTechnique("Emulation");
-        }
-    }
-    else if (IsDriver(DRIVER_NV))
-    {
-        pSH->FXSetTechnique("NV3DVision");
-    }
-    else if (m_device == STEREO_DEVICE_DUALHEAD)
-    {
-        switch (GetStereoOutput())
-        {
-        case STEREO_OUTPUT_STANDARD:
-            pSH->FXSetTechnique("DualHead");
-            break;
-        case STEREO_OUTPUT_IZ3D:
-            pSH->FXSetTechnique("IZ3D");
-            break;
-        default:
-            pSH->FXSetTechnique("Emulation");
-        }
-    }
-    else
-    {
-        pSH->FXSetTechnique("Emulation");
-    }
-}
-
-
-void CD3DStereoRenderer::RenderScene(int sceneFlags, const SRenderingPassInfo& passInfo)
-{
-    m_renderer.EF_Scene3D(m_renderer.m_MainRTViewport, sceneFlags, passInfo);
-}
-
-
-bool CD3DStereoRenderer::IsRenderThread() const
-{
-    return m_renderer.m_pRT->IsRenderThread();
-}
-
-
-void CD3DStereoRenderer::CopyToStereoFromMainThread(int channel)
-{
-    m_renderer.m_pRT->RC_CopyToStereoTex(channel);
-}
-
-
-void CD3DStereoRenderer::PushRenderTargets()
-{
-    if (m_needClearLeft)
-    {
-        m_needClearLeft = false;
-        m_renderer.FX_ClearTarget(GetLeftEye(), Clr_Transparent);
-    }
-
-    if (m_needClearRight)
-    {
-        m_needClearRight = false;
-        m_renderer.FX_ClearTarget(GetRightEye(), Clr_Transparent);
-    }
-
-    m_renderer.FX_PushRenderTarget(0, GetLeftEye(),  &m_renderer.m_DepthBufferOrig);
-    m_renderer.FX_PushRenderTarget(1, GetRightEye(), NULL);
-
-    m_renderer.RT_SetViewport(0, 0, GetLeftEye()->GetWidth(), GetLeftEye()->GetHeight());
-
-    m_renderer.FX_SetActiveRenderTargets();
-}
-
-
-void CD3DStereoRenderer::PopRenderTargets([[maybe_unused]] bool bResolve)
-{
-    m_renderer.FX_PopRenderTarget(1);
-    m_renderer.FX_PopRenderTarget(0);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// IStereoRenderer Interface
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-EStereoDevice CD3DStereoRenderer::GetDevice()
-{
-    return m_device;
-}
-
-
-EStereoDeviceState CD3DStereoRenderer::GetDeviceState()
-{
-    return m_deviceState;
-}
-
-
-void CD3DStereoRenderer::GetInfo(EStereoDevice* device, EStereoMode* mode, EStereoOutput* output, EStereoDeviceState* state) const
-{
-    if (device)
-    {
-        *device = m_device;
-    }
-    if (mode)
-    {
-        *mode = m_mode;
-    }
-    if (output)
-    {
-        *output = m_output;
-    }
-    if (state)
-    {
-        *state = m_deviceState;
-    }
-}
-
-
-bool CD3DStereoRenderer::GetStereoEnabled()
-{
-    return IsStereoEnabled();
-}
-
-
-float CD3DStereoRenderer::GetStereoStrength()
-{
-    return m_stereoStrength;
-}
-
-
-float CD3DStereoRenderer::GetMaxSeparationScene(bool half)
-{
-    return m_maxSeparationScene * (half ? 0.5f : 1.0f);
-}
-
-
-float CD3DStereoRenderer::GetZeroParallaxPlaneDist()
-{
-    return m_zeroParallaxPlaneDist;
-}
-
-
-void CD3DStereoRenderer::GetNVControlValues(bool& stereoActivated, float& stereoStrength)
-{
-    stereoActivated = m_nvStereoActivated != 0;
-    stereoStrength = m_nvStereoStrength;
-}
-
-
-void CD3DStereoRenderer::ReleaseBuffers()
-{
-}
-
-void CD3DStereoRenderer::OnResolutionChanged()
-{
-    // StereoL and StereoR buffers are used as temporary buffers in other passes and always required
-    CreateIntermediateBuffers();
-
-    if (m_device == STEREO_DEVICE_NONE)
-    {
-        return;
-    }
-
-    if (m_hmdRenderer != NULL)
-    {
-        m_hmdRenderer->OnResolutionChanged();
-    }
-}
-
-
-void CD3DStereoRenderer::CalculateBackbufferResolution(int eyeWidth, int eyeHeight, int& backbufferWidth, int& backbufferHeight)
-{
-    if (m_hmdRenderer != NULL)
-    {
-        m_hmdRenderer->CalculateBackbufferResolution(eyeWidth, eyeHeight, backbufferWidth, backbufferHeight);
-    }
-    else
-    {
-        switch (m_output)
-        {
-        case STEREO_OUTPUT_SIDE_BY_SIDE:
-            backbufferWidth  = eyeWidth * 2;
-            backbufferHeight = eyeHeight;
-            break;
-        case STEREO_OUTPUT_ABOVE_AND_BELOW:
-            backbufferWidth = eyeWidth;
-            backbufferHeight = eyeHeight * 2;
-            break;
-        default:
-            backbufferWidth = eyeWidth;
-            backbufferHeight = eyeHeight;
-            break;
-        }
-    }
-}
-
-
-void CD3DStereoRenderer::OnHmdDeviceChanged()
-{
-    if (m_hmdRenderer)
-    {
-        ShutdownHmdRenderer();
-        InitializeHmdRenderer();
-    }
-}
-
-bool CD3DStereoRenderer::IsRenderingToHMD()
-{
-    bool valid = false;
-    if (m_hmdRenderer)
-    {
-        // If the renderer is valid, make sure that we're actually supposed to be rendering to the HMD.
-
-        EStereoDevice device = STEREO_DEVICE_NONE;
-        EStereoMode mode     = STEREO_MODE_NO_STEREO;
-        EStereoOutput output = STEREO_OUTPUT_STANDARD;
-
-        GetInfo(&device, &mode, &output, nullptr);
-
-        const bool hmdSelected = (output == STEREO_OUTPUT_HMD);
-        if (hmdSelected)
-        {
-            // Make sure the mode and device are set to use the HMD.
-            valid = (mode == STEREO_MODE_DUAL_RENDERING);
-        }
-    }
-
-    return valid;
-}
-
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DStereo.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DStereo.h
deleted file mode 100644
index 60af061806..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DStereo.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef STEREORENDERER_H
-#define STEREORENDERER_H
-
-#pragma once
-
-#include "IStereoRenderer.h"
-
-class CD3D9Renderer;
-class D3DHMDRenderer;
-
-class CD3DStereoRenderer
-    : public IStereoRenderer
-{
-public:
-    CD3DStereoRenderer(CD3D9Renderer& renderer, EStereoDevice device);
-    virtual ~CD3DStereoRenderer();
-
-    void InitDeviceBeforeD3D();
-    void InitDeviceAfterD3D();
-    void Shutdown();
-    float GetScreenDiagonalInInches() const { return m_screenSize; }
-    void SetScreenDiagonalInInches(float size) { m_screenSize = size; }
-
-    void CreateResources();
-    void ReleaseResources();
-
-    bool IsStereoEnabled() const { return m_device != STEREO_DEVICE_NONE && m_mode != STEREO_MODE_NO_STEREO; }
-
-    void PrepareStereo(EStereoMode mode, EStereoOutput output);
-
-    EStereoDevice GetStereoDevice() const { return m_device; }
-    EStereoMode GetStereoMode() const { return m_mode; }
-    EStereoOutput GetStereoOutput() const { return m_output; }
-
-    CTexture* GetLeftEye() { return m_pLeftTex == NULL ? CTexture::s_ptexStereoL : m_pLeftTex; }
-    CTexture* GetRightEye() { return m_pRightTex == NULL ? CTexture::s_ptexStereoR : m_pRightTex; }
-
-    void SetEyeTextures(CTexture* leftTex, CTexture* rightTex);
-
-    void Update();
-    void ProcessScene(int sceneFlags, const SRenderingPassInfo& passInfo);
-    void ReleaseBuffers();
-    void OnResolutionChanged() override;
-    void CalculateBackbufferResolution(int eyeWidth, int eyeHeight, int& backbufferWidth, int& backbufferHeight);
-
-    void CopyToStereo(int channel);
-    void DisplayStereo();
-
-    void BeginRenderingMRT(bool disableClear);
-    void EndRenderingMRT(bool bResolve = true);
-
-    void ResolveStereoBuffers();
-
-    void BeginRenderingTo(EStereoEye eye);
-    void EndRenderingTo(EStereoEye eye);
-
-    void TakeScreenshot(const char path[]);
-
-    float GetNearGeoShift() { return m_zeroParallaxPlaneDist; }
-    float GetNearGeoScale() { return m_nearGeoScale; }
-    float GetGammaAdjustment() { return m_gammaAdjustment; }
-
-public:
-    // IStereoRenderer Interface
-    virtual EStereoDevice GetDevice();
-    virtual EStereoDeviceState GetDeviceState();
-    virtual void GetInfo(EStereoDevice* device, EStereoMode* mode, EStereoOutput* output, EStereoDeviceState* state) const;
-
-    virtual bool GetStereoEnabled();
-    virtual float GetStereoStrength();
-    virtual float GetMaxSeparationScene(bool half = true);
-    virtual float GetZeroParallaxPlaneDist();
-    virtual void GetNVControlValues(bool& stereoEnabled, float& stereoStrength);
-
-    virtual void OnHmdDeviceChanged();
-    Status GetStatus() const override { return m_renderStatus; }
-    virtual bool IsRenderingToHMD() override;
-
-private:
-    enum DriverType
-    {
-        DRIVER_UNKNOWN = 0,
-        DRIVER_NV = 1,
-        DRIVER_AMD = 2
-    };
-
-    CD3D9Renderer& m_renderer;
-
-    EStereoDevice m_device;
-    EStereoDeviceState m_deviceState;
-    EStereoMode m_mode;
-    EStereoOutput m_output;
-
-    DriverType m_driver;
-
-    CTexture* m_pLeftTex;
-    CTexture* m_pRightTex;
-
-    void* m_nvStereoHandle;
-    float m_nvStereoStrength;
-    uint8 m_nvStereoActivated;
-
-    EStereoEye m_curEye;
-    IStereoRenderer::Status m_renderStatus;
-    CCryNameR m_SourceSizeParamName;
-
-    uint32 m_frontBufWidth, m_frontBufHeight;
-
-    float m_stereoStrength;
-    float m_zeroParallaxPlaneDist;
-    float m_maxSeparationScene;
-    float m_nearGeoScale;
-    float m_gammaAdjustment;
-    float m_screenSize;
-
-    bool m_resourcesPatched;
-    bool m_needClearLeft;
-    bool m_needClearRight;
-
-    D3DHMDRenderer* m_hmdRenderer;
-
-private:
-    void SelectDefaultDevice();
-
-    void CreateIntermediateBuffers();
-
-    bool EnableStereo();
-    void DisableStereo();
-    void ChangeOutputFormat();
-    void HandleNVControl();
-    bool InitializeHmdRenderer();
-    void ShutdownHmdRenderer();
-
-    void RenderScene(int sceneFlags, const SRenderingPassInfo& passInfo);
-
-    void SelectShaderTechnique();
-
-    bool IsRenderThread() const;
-    void CopyToStereoFromMainThread(int channel);
-
-    void PushRenderTargets();
-    void PopRenderTargets(bool bResolve);
-
-    CCamera PrepareCamera(EStereoEye nEye, const CCamera& currentCamera, const SRenderingPassInfo& passInfo);
-
-    bool IsDriver(DriverType driver) { return m_device == STEREO_DEVICE_DRIVER && m_driver == driver; }
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DSystem.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DSystem.cpp
deleted file mode 100644
index 15058c878e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DSystem.cpp
+++ /dev/null
@@ -1,2975 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "UnicodeFunctions.h"
-#include "DriverD3D.h"
-#include "WindowsUtils.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DSYSTEM_CPP_SECTION_1 1
-#define D3DSYSTEM_CPP_SECTION_2 2
-#define D3DSYSTEM_CPP_SECTION_3 3
-#define D3DSYSTEM_CPP_SECTION_4 4
-#define D3DSYSTEM_CPP_SECTION_5 5
-#define D3DSYSTEM_CPP_SECTION_6 6
-#define D3DSYSTEM_CPP_SECTION_7 7
-#define D3DSYSTEM_CPP_SECTION_8 8
-#define D3DSYSTEM_CPP_SECTION_9 9
-#define D3DSYSTEM_CPP_SECTION_10 10
-#define D3DSYSTEM_CPP_SECTION_11 11
-#define D3DSYSTEM_CPP_SECTION_12 12
-#define D3DSYSTEM_CPP_SECTION_13 13
-#define D3DSYSTEM_CPP_SECTION_14 14
-#define D3DSYSTEM_CPP_SECTION_15 15
-#define D3DSYSTEM_CPP_SECTION_16 16
-#define D3DSYSTEM_CPP_SECTION_17 17
-#define D3DSYSTEM_CPP_SECTION_18 18
-#define D3DSYSTEM_CPP_SECTION_19 19
-#define D3DSYSTEM_CPP_SECTION_20 20
-#define D3DSYSTEM_CPP_SECTION_21 21
-#define D3DSYSTEM_CPP_SECTION_22 22
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-
-
-#include "D3DStereo.h"
-#include "D3DPostProcess.h"
-#include "NullD3D11Device.h"
-
-#if defined(WIN32)
-
-// CryTek undefs some defines from WinBase.h...so let's redefine them here
-  #ifdef UNICODE
-    #define RegisterClass  RegisterClassW
-    #define LoadLibrary  LoadLibraryW
-  #else
-    #define RegisterClass  RegisterClassA
-    #define LoadLibrary  LoadLibraryA
-  #endif // !UNICODE
-#endif // defined(WIN32)
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-
-#include "../Common/RenderCapabilities.h"
-#include <AzCore/Utils/Utils.h>
-
-#ifdef WIN32
-// Count monitors helper
-static BOOL CALLBACK CountConnectedMonitors([[maybe_unused]] HMONITOR hMonitor, [[maybe_unused]] HDC hDC, [[maybe_unused]] LPRECT pRect, LPARAM opaque)
-{
-    uint* count = reinterpret_cast<uint*>(opaque);
-    (*count)++;
-    return TRUE;
-}
-
-#endif
-
-void CD3D9Renderer::DisplaySplash()
-{
-#ifdef WIN32
-    if (IsEditorMode())
-    {
-        return;
-    }
-
-    HBITMAP hImage = (HBITMAP)LoadImage(GetModuleHandle(0), "splash.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
-
-    if (hImage != INVALID_HANDLE_VALUE)
-    {
-        RECT rect;
-        HDC hDC = GetDC(m_hWnd);
-        HDC hDCBitmap = CreateCompatibleDC(hDC);
-        BITMAP bm;
-
-        GetClientRect(m_hWnd, &rect);
-        GetObjectA(hImage, sizeof(bm), &bm);
-        SelectObject(hDCBitmap, hImage);
-
-
-
-        //    BitBlt(hDC, x, y, bm.bmWidth, bm.bmHeight, hDCBitmap, 0, 0, SRCCOPY);
-
-        RECT Rect;
-        GetWindowRect(m_hWnd, &Rect);
-        StretchBlt(hDC, 0, 0, Rect.right - Rect.left, Rect.bottom - Rect.top,  hDCBitmap, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
-
-        DeleteObject(hImage);
-        DeleteDC(hDCBitmap);
-    }
-#endif
-}
-
-//=====================================================================================
-
-bool CD3D9Renderer::SetCurrentContext(WIN_HWND hWnd)
-{
-    uint32 i;
-
-    for (i = 0; i < m_RContexts.Num(); i++)
-    {
-        if (m_RContexts[i]->m_hWnd == hWnd)
-        {
-            break;
-        }
-    }
-    if (i == m_RContexts.Num())
-    {
-        return false;
-    }
-
-    if (m_CurrContext == m_RContexts[i])
-    {
-        return true;
-    }
-
-    m_CurrContext = m_RContexts[i];
-
-    CHWShader::s_pCurVS = NULL;
-    CHWShader::s_pCurPS = NULL;
-
-    return true;
-}
-
-bool CD3D9Renderer::CreateContext(WIN_HWND hWnd, [[maybe_unused]] bool bAllowMSAA, int SSX, int SSY)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    uint32 i;
-
-    for (i = 0; i < m_RContexts.Num(); i++)
-    {
-        if (m_RContexts[i]->m_hWnd == hWnd)
-        {
-            break;
-        }
-    }
-    if (i != m_RContexts.Num())
-    {
-        return true;
-    }
-    SD3DContext* pContext = new SD3DContext;
-    pContext->m_hWnd = (HWND)hWnd;
-    pContext->m_X = 0;
-    pContext->m_Y = 0;
-    pContext->m_Width  = m_width;
-    pContext->m_Height = m_height;
-    pContext->m_pSwapChain  = 0;
-    pContext->m_pBackBuffer = 0;
-    pContext->m_nViewportWidth  = aznumeric_cast<int>(aznumeric_cast<float>(m_width)  / (m_CurrContext ? m_CurrContext->m_fPixelScaleX : 1.0f));
-    pContext->m_nViewportHeight = aznumeric_cast<int>(aznumeric_cast<float>(m_height) / (m_CurrContext ? m_CurrContext->m_fPixelScaleY : 1.0f));
-    pContext->m_fPixelScaleX = aznumeric_cast<float>(std::max(1, SSX));
-    pContext->m_fPixelScaleY = aznumeric_cast<float>(std::max(1, SSY));
-    pContext->m_bMainViewport = !gEnv->IsEditor();
-    m_CurrContext = pContext;
-    m_RContexts.AddElem(pContext);
-
-    return true;
-}
-
-bool CD3D9Renderer::DeleteContext(WIN_HWND hWnd)
-{
-    uint32 i, j;
-
-    for (i = 0; i < m_RContexts.Num(); i++)
-    {
-        if (m_RContexts[i]->m_hWnd == hWnd)
-        {
-            break;
-        }
-    }
-    if (i == m_RContexts.Num())
-    {
-        return false;
-    }
-    if (m_CurrContext == m_RContexts[i])
-    {
-        for (j = 0; j < m_RContexts.Num(); j++)
-        {
-            if (m_RContexts[j]->m_hWnd != hWnd)
-            {
-                m_CurrContext = m_RContexts[j];
-                break;
-            }
-        }
-        if (j == m_RContexts.Num())
-        {
-            m_CurrContext = NULL;
-        }
-
-        if (!m_CurrContext)
-        {
-            m_width = 0;
-            m_height = 0;
-        }
-        else if (m_CurrContext->m_Width != m_width || m_CurrContext->m_Height != m_height)
-        {
-            m_width = m_CurrContext->m_Width;
-            m_height = m_CurrContext->m_Height;
-        }
-    }
-    for (unsigned int b = 0; b < m_RContexts[i]->m_pBackBuffers.size(); ++b)
-    {
-        SAFE_RELEASE(m_RContexts[i]->m_pBackBuffers[b]);
-    }
-    SAFE_RELEASE(m_RContexts[i]->m_pSwapChain);
-    delete m_RContexts[i];
-    m_RContexts.Remove(i, 1);
-
-    return true;
-}
-
-void CD3D9Renderer::MakeMainContextActive()
-{
-    if (m_RContexts.empty() || m_CurrContext == m_RContexts[0])
-    {
-        return;
-    }
-
-    m_CurrContext = m_RContexts[0];
-
-    CHWShader::s_pCurVS = NULL;
-    CHWShader::s_pCurPS = NULL;
-}
-
-bool CD3D9Renderer::CreateMSAADepthBuffer()
-{
-    HRESULT hr = S_OK;
-    if (CV_r_msaa)
-    {
-        if (m_RP.m_MSAAData.Type != CV_r_msaa_samples || m_RP.m_MSAAData.Quality != CV_r_msaa_quality)
-        {
-            SAFE_RELEASE(m_RP.m_MSAAData.m_pZBuffer);
-            SAFE_RELEASE(m_RP.m_MSAAData.m_pDepthTex);
-        }
-        m_RP.m_MSAAData.Type = CV_r_msaa_samples;
-        m_RP.m_MSAAData.Quality = CV_r_msaa_quality;
-        if (m_RP.m_MSAAData.Type > 1 && !m_RP.m_MSAAData.m_pZBuffer)
-        {
-            // Create depth stencil texture
-            D3D11_TEXTURE2D_DESC descDepth;
-            ZeroStruct(descDepth);
-            descDepth.Width = m_width;
-            descDepth.Height = m_height;
-            descDepth.MipLevels = 1;
-            descDepth.ArraySize = 1;
-            descDepth.Format = m_ZFormat;
-            descDepth.SampleDesc.Count = m_RP.m_MSAAData.Type;
-            descDepth.SampleDesc.Quality = m_RP.m_MSAAData.Quality;
-            descDepth.Usage = D3D11_USAGE_DEFAULT;
-            descDepth.BindFlags = D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE; // bind-able as shader resource view
-            descDepth.CPUAccessFlags = 0;
-            descDepth.MiscFlags = 0;
-
-            const float clearDepth = CRenderer::CV_r_ReverseDepth ? 0.f : 1.f;
-            const uint clearStencil = 1;
-            const FLOAT clearValues[4] = { clearDepth, FLOAT(clearStencil) };
-
-            hr = m_DevMan.CreateD3D11Texture2D(&descDepth, clearValues, NULL, &m_RP.m_MSAAData.m_pDepthTex, "MSAADepthBuffer");
-            if (FAILED(hr))
-            {
-                return false;
-            }
-
-            m_DepthBufferOrigMSAA.pTex = nullptr;
-            m_DepthBufferOrigMSAA.pTarget = m_RP.m_MSAAData.m_pDepthTex;
-            m_DepthBufferOrigMSAA.pSurf = m_RP.m_MSAAData.m_pZBuffer;
-
-            // Create the depth stencil view
-            D3D11_DEPTH_STENCIL_VIEW_DESC descDSV;
-            ZeroStruct(descDSV);
-            descDSV.Format =  CTexture::ConvertToDepthStencilFmt(descDepth.Format);
-            descDSV.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMS;
-            hr = GetDevice().CreateDepthStencilView(m_RP.m_MSAAData.m_pDepthTex, &descDSV, &m_RP.m_MSAAData.m_pZBuffer);
-            if (FAILED(hr))
-            {
-                return false;
-            }
-            m_DepthBufferOrigMSAA.pSurf = m_RP.m_MSAAData.m_pZBuffer;
-            m_RP.m_MSAAData.m_pZBuffer->AddRef();
-        }
-    }
-    else
-    {
-        m_RP.m_MSAAData.Type = 0;
-        m_RP.m_MSAAData.Quality = 0;
-
-        SAFE_RELEASE(m_RP.m_MSAAData.m_pZBuffer);
-        SAFE_RELEASE(m_RP.m_MSAAData.m_pDepthTex);
-        
-        SAFE_RELEASE(m_DepthBufferOrigMSAA.pSurf);
-        m_DepthBufferOrigMSAA.pTex = nullptr;
-        m_DepthBufferOrigMSAA.pSurf = m_pZBuffer;
-        m_DepthBufferOrigMSAA.pTarget = m_pZTexture;
-        m_pZBuffer->AddRef();
-    }
-    return (hr == S_OK);
-}
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-static void UserOverrideDXGIOutputFS(DeviceInfo& devInfo, int outputIndex, int defaultX, int defaultY, int& outputX, int& outputY)
-{
-    outputX = defaultX;
-    outputY = defaultY;
-
-    // This is not an ideal solution. Just for development or careful use.
-    // The FS output override might be incompatible with output originally set up in device info.
-    // As such selected resolutions might not be directly supported but currently won't fall back properly.
-#   if (defined(WIN32) || defined(WIN64))
-    if (outputIndex > 0)
-    {
-        bool success = false;
-
-        IDXGIOutput* pOutput = 0;
-        if (SUCCEEDED(devInfo.Adapter()->EnumOutputs(outputIndex, &pOutput)) && pOutput)
-        {
-            DXGI_OUTPUT_DESC outputDesc;
-            if (SUCCEEDED(pOutput->GetDesc(&outputDesc)))
-            {
-                MONITORINFO monitorInfo;
-                monitorInfo.cbSize = sizeof(monitorInfo);
-                if (GetMonitorInfo(outputDesc.Monitor, &monitorInfo))
-                {
-                    outputX = monitorInfo.rcMonitor.left;
-                    outputY = monitorInfo.rcMonitor.top;
-                    success = true;
-                }
-            }
-        }
-        SAFE_RELEASE(pOutput);
-
-        if (!success)
-        {
-            CryLogAlways("Failed to resolve DXGI display for override index %d. Falling back to preferred or primary display.", outputIndex);
-        }
-    }
-#   endif
-}
-#endif
-
-bool CD3D9Renderer::ChangeResolution(int nNewWidth, int nNewHeight, int nNewColDepth, [[maybe_unused]] int nNewRefreshHZ, bool bFullScreen, bool bForceReset)
-{
-    if (m_bDeviceLost)
-    {
-        return true;
-    }
-
-#if !defined(_RELEASE) && (defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX))
-    if (m_pRT && !m_pRT->IsRenderThread())
-    {
-        __debugbreak();
-    }
-#endif
-
-    iLog->Log("Changing resolution...");
-
-    const int nPrevWidth = m_width;
-    const int nPrevHeight = m_height;
-    const int nPrevColorDepth = m_cbpp;
-    const bool bPrevFullScreen = m_bFullScreen;
-    if (nNewColDepth < 24)
-    {
-        nNewColDepth = 16;
-    }
-    else
-    {
-        nNewColDepth = 32;
-    }
-    bool bNeedReset = bForceReset || nNewColDepth != nPrevColorDepth || bFullScreen != bPrevFullScreen || nNewWidth != nPrevWidth || nNewHeight != nPrevHeight;
-#if !defined(SUPPORT_DEVICE_INFO)
-    bNeedReset |= m_VSync != CV_r_vsync;
-#endif
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-    bNeedReset |= m_overrideRefreshRate != CV_r_overrideRefreshRate || m_overrideScanlineOrder != CV_r_overrideScanlineOrder;
-#endif
-
-    GetS3DRend().ReleaseBuffers();
-    DeleteContext(m_hWnd);
-
-    // Save the new dimensions
-    m_width  = nNewWidth;
-    m_height = nNewHeight;
-    m_cbpp   = nNewColDepth;
-    m_bFullScreen = bFullScreen;
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-    m_overrideRefreshRate = CV_r_overrideRefreshRate;
-    m_overrideScanlineOrder = CV_r_overrideScanlineOrder;
-#endif
-    if (!IsEditorMode())
-    {
-        m_VSync = CV_r_vsync;
-    }
-    else
-    {
-        m_VSync = 0;
-    }
-#if defined(SUPPORT_DEVICE_INFO)
-    m_devInfo.SyncInterval() = m_VSync ? 1 : 0;
-#endif
-
-    if (bFullScreen && nNewColDepth == 16)
-    {
-        m_zbpp = 16;
-        m_sbpp = 0;
-    }
-
-    RestoreGamma();
-
-    bool bFullscreenWindow = false;
-#if defined(WIN32) || defined(WIN64)
-    bFullscreenWindow = CV_r_FullscreenWindow && CV_r_FullscreenWindow->GetIVal() != 0;
-#endif
-
-    if (IsEditorMode() && !bForceReset)
-    {
-        nNewWidth = m_deskwidth;
-        nNewHeight = m_deskheight;
-    }
-    if (bNeedReset)
-    {
-#if defined(SUPPORT_DEVICE_INFO)
-#if defined(WIN32)
-        // disable floating point exceptions due to driver bug when switching to fullscreen
-        SCOPED_DISABLE_FLOAT_EXCEPTIONS;
-#endif
-        m_devInfo.SwapChainDesc().Windowed = !bFullScreen;
-        m_devInfo.SwapChainDesc().BufferDesc.Width = m_backbufferWidth;
-        m_devInfo.SwapChainDesc().BufferDesc.Height = m_backbufferHeight;
-
-        m_devInfo.SnapSettings();
-
-        int swapChainWidth  = m_devInfo.SwapChainDesc().BufferDesc.Width;
-        int swapChainHeight = m_devInfo.SwapChainDesc().BufferDesc.Height;
-        if (m_backbufferWidth != swapChainWidth || m_backbufferHeight != swapChainHeight)
-        {
-            if (m_nativeWidth == m_backbufferWidth)
-            {
-                if (m_width == m_nativeWidth)
-                {
-                    m_width = swapChainWidth;
-                    if (m_CVWidth)
-                    {
-                        m_CVWidth->Set(swapChainWidth);
-                    }
-                }
-                m_nativeWidth = swapChainWidth;
-            }
-            m_backbufferWidth  = swapChainWidth;
-
-            if (m_nativeHeight == m_backbufferHeight)
-            {
-                if (m_height == m_nativeHeight)
-                {
-                    m_height = swapChainHeight;
-                    if (m_CVHeight)
-                    {
-                        m_CVHeight->Set(swapChainHeight);
-                    }
-                }
-                m_nativeHeight = swapChainHeight;
-            }
-            m_backbufferHeight = swapChainHeight;
-        }
-
-        ID3D11DepthStencilView* pDSV = 0;
-        ID3D11RenderTargetView* pRTVs[8] = {0};
-        GetDeviceContext().OMSetRenderTargets(8, pRTVs, pDSV);
-        m_DepthBufferOrig.Release();
-        m_DepthBufferOrigMSAA.Release();
-        m_DepthBufferNative.Release();
-
-        AdjustWindowForChange();
-
-
-#   if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-        UserOverrideDisplayProperties(m_devInfo.SwapChainDesc().BufferDesc);
-#   endif
-        m_pSwapChain->SetFullscreenState(bFullScreen, 0);
-        m_pSwapChain->ResizeTarget(&m_devInfo.SwapChainDesc().BufferDesc);
-        m_devInfo.ResizeDXGIBuffers();
-
-        OnD3D11PostCreateDevice(m_devInfo.Device());
-#endif
-        m_FullResRect.right = m_width;
-        m_FullResRect.bottom = m_height;
-
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE) || defined(CREATE_DEVICE_ON_MAIN_THREAD)
-        m_pRT->RC_SetViewport(0, 0, m_width, m_height);
-#else
-        RT_SetViewport(0, 0, m_width, m_height);
-#endif
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-        m_MainViewport.nX = 0;
-        m_MainViewport.nY = 0;
-        m_MainViewport.nWidth = m_width;
-        m_MainViewport.nHeight = m_height;
-        m_MainRTViewport.nX = 0;
-        m_MainRTViewport.nY = 0;
-        m_MainRTViewport.nWidth = m_width;
-        m_MainRTViewport.nHeight = m_height;
-    }
-
-    AdjustWindowForChange();
-
-    GetS3DRend().OnResolutionChanged();
-
-#ifdef WIN32
-    SetWindowText(m_hWnd, m_WinTitle);
-    iLog->Log("  Window resolution: %dx%dx%d (%s)", m_d3dsdBackBuffer.Width, m_d3dsdBackBuffer.Height, nNewColDepth, bFullScreen ? "Fullscreen" : "Windowed");
-    iLog->Log("  Render resolution: %dx%d)", m_width, m_height);
-#endif
-
-    CreateMSAADepthBuffer();
-
-    CreateContext(m_hWnd, CV_r_msaa != 0);
-
-    ICryFont* pCryFont = gEnv->pCryFont;
-    if (pCryFont)
-    {
-        pCryFont->GetFont("default");
-    }
-
-    PostDeviceReset();
-
-    return true;
-}
-
-void CD3D9Renderer::PostDeviceReset()
-{
-    m_bDeviceLost = 0;
-    if (m_bFullScreen)
-    {
-        SetGamma(CV_r_gamma + m_fDeltaGamma, CV_r_brightness, CV_r_contrast, true);
-    }
-    FX_ResetPipe();
-    CHWShader::s_pCurVS = NULL;
-    CHWShader::s_pCurPS = NULL;
-
-    for (int i = 0; i < MAX_TMU; i++)
-    {
-        CTexture::s_TexStages[i].m_DevTexture = NULL;
-    }
-    m_nFrameReset++;
-}
-
-
-//-----------------------------------------------------------------------------
-// Name: CD3D9Renderer::AdjustWindowForChange()
-// Desc: Prepare the window for a possible change between windowed mode and
-//       fullscreen mode.  This function is virtual and thus can be overridden
-//       to provide different behavior, such as switching to an entirely
-//       different window for fullscreen mode (as in the MFC sample apps).
-//-----------------------------------------------------------------------------
-HRESULT CD3D9Renderer::AdjustWindowForChange()
-{
-#if defined(WIN32)
-    if (IsEditorMode())
-    {
-        return S_OK;
-    }
-
-#if defined(OPENGL)
-    const DXGI_SWAP_CHAIN_DESC& swapChainDesc(m_devInfo.SwapChainDesc());
-
-    DXGI_MODE_DESC modeDesc;
-    modeDesc.Width            = m_backbufferWidth;
-    modeDesc.Height           = m_backbufferHeight;
-    modeDesc.RefreshRate      = swapChainDesc.BufferDesc.RefreshRate;
-    modeDesc.Format           = swapChainDesc.BufferDesc.Format;
-    modeDesc.ScanlineOrdering = swapChainDesc.BufferDesc.ScanlineOrdering;
-    modeDesc.Scaling          = swapChainDesc.BufferDesc.Scaling;
-
-    HRESULT result = m_pSwapChain->ResizeTarget(&modeDesc);
-    if (FAILED(result))
-    {
-        return result;
-    }
-#elif defined(WIN32)
-    bool bFullscreenWindow = false;
-
-    bFullscreenWindow = CV_r_FullscreenWindow && CV_r_FullscreenWindow->GetIVal() != 0;
-
-    if (!m_bFullScreen && !bFullscreenWindow)
-    {
-        // Set windowed-mode style
-        SetWindowLongW(m_hWnd, GWL_STYLE, m_dwWindowStyle);
-    }
-    else
-    {
-        // Set fullscreen-mode style
-        SetWindowLongW(m_hWnd, GWL_STYLE, WS_POPUP | WS_VISIBLE);
-    }
-
-    if (m_bFullScreen)
-    {
-        int x = m_prefMonX;
-        int y = m_prefMonY;
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-        UserOverrideDXGIOutputFS(m_devInfo, CV_r_overrideDXGIOutputFS, m_prefMonX, m_prefMonY, x, y);
-#endif
-        const int wdt = m_backbufferWidth;
-        const int hgt = m_backbufferHeight;
-        SetWindowPos(m_hWnd, HWND_TOPMOST, x, y, wdt, hgt, SWP_SHOWWINDOW);
-    }
-    else if (bFullscreenWindow)
-    {
-        const int x = m_prefMonX + (m_prefMonWidth - m_backbufferWidth) / 2;
-        const int y = m_prefMonY + (m_prefMonHeight - m_backbufferHeight) / 2;
-        const int wdt = m_backbufferWidth;
-        const int hgt = m_backbufferHeight;
-        SetWindowPos(m_hWnd, HWND_NOTOPMOST, x, y, wdt, hgt, SWP_SHOWWINDOW);
-    }
-    else
-    {
-        RECT wndrect;
-        SetRect(&wndrect, 0, 0, m_backbufferWidth, m_backbufferHeight);
-        AdjustWindowRectEx(&wndrect, m_dwWindowStyle, FALSE, WS_EX_APPWINDOW);
-
-        const int wdt = wndrect.right  - wndrect.left;
-        const int hgt = wndrect.bottom - wndrect.top;
-
-        const int x = m_prefMonX + (m_prefMonWidth - wdt) / 2;
-        const int y = m_prefMonY + (m_prefMonHeight - hgt) / 2;
-
-        SetWindowPos(m_hWnd, HWND_NOTOPMOST, x, y, wdt, hgt, SWP_SHOWWINDOW);
-    }
- #endif
-
-    //set viewport to ensure we have a valid one, even when doing chainloading
-    // and playing a video before going ingame
-    m_MainViewport.nX = 0;
-    m_MainViewport.nY = 0;
-    m_MainViewport.nWidth = m_width;
-    m_MainViewport.nHeight = m_height;
-    m_MainRTViewport.nX = 0;
-    m_MainRTViewport.nY = 0;
-    m_MainRTViewport.nWidth = m_width;
-    m_MainRTViewport.nHeight = m_height;
-
-    m_FullResRect.right = m_width;
-    m_FullResRect.bottom = m_height;
-
-    m_pRT->RC_SetViewport(0, 0, m_width, m_height);
- #endif
-
-    return S_OK;
-}
-
-#if defined(SUPPORT_DEVICE_INFO)
-bool compareDXGIMODEDESC(const DXGI_MODE_DESC& lhs, const DXGI_MODE_DESC& rhs)
-{
-    if (lhs.Width != rhs.Width)
-    {
-        return lhs.Width < rhs.Width;
-    }
-    return lhs.Height < rhs.Height;
-}
-#endif
-
-int CD3D9Renderer::EnumDisplayFormats([[maybe_unused]] SDispFormat* formats)
-{
-#if defined(WIN32) || defined(WIN64) || defined(OPENGL)
-
-#if defined(SUPPORT_DEVICE_INFO)
-
-    unsigned int numModes = 0;
-    if (m_devInfo.Output())
-    {
-        if (SUCCEEDED(m_devInfo.Output()->GetDisplayModeList(m_devInfo.SwapChainDesc().BufferDesc.Format, 0, &numModes, 0)) && numModes)
-        {
-            std::vector<DXGI_MODE_DESC> dispModes(numModes);
-            if (SUCCEEDED(m_devInfo.Output()->GetDisplayModeList(m_devInfo.SwapChainDesc().BufferDesc.Format, 0, &numModes, &dispModes[0])) && numModes)
-            {
-                std::sort(dispModes.begin(), dispModes.end(), compareDXGIMODEDESC);
-
-                unsigned int numUniqueModes = 0;
-                unsigned int prevWidth = 0;
-                unsigned int prevHeight = 0;
-                for (unsigned int i = 0; i < numModes; ++i)
-                {
-                    if (prevWidth != dispModes[i].Width || prevHeight != dispModes[i].Height)
-                    {
-                        if (formats)
-                        {
-                            formats[numUniqueModes].m_Width = dispModes[i].Width;
-                            formats[numUniqueModes].m_Height = dispModes[i].Height;
-                            formats[numUniqueModes].m_BPP = CTexture::BytesPerBlock(CTexture::TexFormatFromDeviceFormat(dispModes[i].Format)) * 8;
-                        }
-
-                        prevWidth = dispModes[i].Width;
-                        prevHeight = dispModes[i].Height;
-                        ++numUniqueModes;
-                    }
-                }
-
-                numModes = numUniqueModes;
-            }
-        }
-    }
-
-    return numModes;
-
-#endif
-
-#else
-    return 0;
-#endif
-}
-
-bool CD3D9Renderer::ChangeDisplay([[maybe_unused]] unsigned int width, [[maybe_unused]] unsigned int height, [[maybe_unused]] unsigned int cbpp)
-{
-    return false;
-}
-
-
-void CD3D9Renderer::UnSetRes()
-{
-    m_Features |= RFT_SUPPORTZBIAS;
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-    m_d3dDebug.Release();
-#endif
-}
-
-void CD3D9Renderer::DestroyWindow(void)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(OPENGL) // Scrubber safe exclusion
-#else
-    SAFE_RELEASE(m_DeviceContext);
-#endif
-
-    SAFE_RELEASE(m_Device);
-
-#if defined(CRY_USE_METAL)
-    DXGLDestroyMetalWindow(m_hWnd);
-#elif defined(WIN32)
-    if (gEnv && gEnv->pSystem)
-    {
-        if (m_registeredWindoWHandler)
-        {
-            gEnv->pSystem->UnregisterWindowMessageHandler(this);
-        }
-        m_registeredWindoWHandler = false;
-    }
-    if (m_hWnd)
-    {
-        ::DestroyWindow(m_hWnd);
-        m_hWnd = NULL;
-    }
-    if (m_hWnd2)
-    {
-        ::DestroyWindow(m_hWnd2);
-        m_hWnd2 = NULL;
-    }
-    if (m_hIconBig)
-    {
-        ::DestroyIcon(m_hIconBig);
-        m_hIconBig = NULL;
-    }
-    if (m_hIconSmall)
-    {
-        ::DestroyIcon(m_hIconSmall);
-        m_hIconSmall = NULL;
-    }
-#elif defined(OPENGL)
-    DXGLDestroyWindow(m_hWnd);
-#endif
-}
-
-struct CD3D9Renderer::gammaramp_t
-{
-    uint16 red[256];
-    uint16 green[256];
-    uint16 blue[256];
-};
-
-static CD3D9Renderer::gammaramp_t orgGamma;
-
-static BOOL g_doGamma = false;
-
-
-void CD3D9Renderer::RestoreGamma(void)
-{
-    if (!(GetFeatures() & RFT_HWGAMMA))
-    {
-        return;
-    }
-
-    if (CV_r_nohwgamma && m_nLastNoHWGamma)
-    {
-        return;
-    }
-
-    m_nLastNoHWGamma = CV_r_nohwgamma;
-    m_fLastGamma = 1.0f;
-    m_fLastBrightness = 0.5f;
-    m_fLastContrast = 0.5f;
-
-    //iLog->Log("...RestoreGamma");
-
-#if defined(WIN32)
-    if (!g_doGamma)
-    {
-        return;
-    }
-
-    g_doGamma = false;
-
-    m_hWndDesktop = GetDesktopWindow();
-
-    if (HDC dc = GetDC(m_hWndDesktop))
-    {
-        SetDeviceGammaRamp(dc, &orgGamma);
-        ReleaseDC(m_hWndDesktop, dc);
-    }
-#endif
-}
-
-void CD3D9Renderer::GetDeviceGamma()
-{
-#if defined(WIN32)
-    if (g_doGamma)
-    {
-        return;
-    }
-
-    m_hWndDesktop = GetDesktopWindow();
-
-    if (HDC dc = GetDC(m_hWndDesktop))
-    {
-        g_doGamma = true;
-
-        if (!GetDeviceGammaRamp(dc, &orgGamma))
-        {
-            for (uint16 i = 0; i < 256; i++)
-            {
-                orgGamma.red  [i] = i * 0x101;
-                orgGamma.green[i] = i * 0x101;
-                orgGamma.blue [i] = i * 0x101;
-            }
-        }
-
-        ReleaseDC(m_hWndDesktop, dc);
-    }
-#endif
-}
-
-void CD3D9Renderer::SetDeviceGamma([[maybe_unused]] gammaramp_t* gamma)
-{
-    if (!(GetFeatures() & RFT_HWGAMMA))
-    {
-        return;
-    }
-
-    if IsCVarConstAccess(constexpr) (bool(CV_r_nohwgamma))
-    {
-        return;
-    }
-
-#if defined(WIN32)
-    if (!g_doGamma)
-    {
-        return;
-    }
-
-    m_hWndDesktop = GetDesktopWindow();  // TODO: DesktopWindow - does not represent actual output window thus gamma affects all desktop monitors !!!
-
-    if (HDC dc = GetDC(m_hWndDesktop))
-    {
-        g_doGamma = true;
-        // INFO!!! - very strange: in the same time
-        // GetDeviceGammaRamp -> TRUE
-        // SetDeviceGammaRamp -> FALSE but WORKS!!!
-        // at least for desktop window DC... be careful
-        SetDeviceGammaRamp(dc, gamma);
-        ReleaseDC(m_hWndDesktop, dc);
-    }
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::SetGamma(float fGamma, float fBrightness, float fContrast, bool bForce)
-{
-    // Early out if HW gamma is disabled (same early out as SetDeviceGamma)
-    if IsCVarConstAccess(constexpr) (bool(CV_r_nohwgamma))
-    {
-        // Restore default if HW gamma was previously enabled
-        if (m_nLastNoHWGamma == 0)
-        {
-            RestoreGamma();
-        }
-        return;
-    }
-
-    if (m_pStereoRenderer)  // Function can be called on shutdown
-    {
-        fGamma += GetS3DRend().GetGammaAdjustment();
-    }
-
-    fGamma = CLAMP(fGamma, 0.4f, 1.6f);
-
-    if (!bForce && m_fLastGamma == fGamma && m_fLastBrightness == fBrightness && m_fLastContrast == fContrast && m_nLastNoHWGamma == CV_r_nohwgamma)
-    {
-        return;
-    }
-
-    GetDeviceGamma();
-
-    gammaramp_t gamma;
-
-    float fInvGamma = 1.f / fGamma;
-
-    float fAdd = (fBrightness - 0.5f) * 0.5f - fContrast * 0.5f + 0.25f;
-    float fMul = fContrast + 0.5f;
-
-    for (int i = 0; i < 256; i++)
-    {
-        float pfInput[3];
-
-        pfInput[0] = (float)(orgGamma.red  [i] >> 8) / 255.f;
-        pfInput[1] = (float)(orgGamma.green[i] >> 8) / 255.f;
-        pfInput[2] = (float)(orgGamma.blue [i] >> 8) / 255.f;
-
-        pfInput[0] = pow_tpl(pfInput[0], fInvGamma) * fMul + fAdd;
-        pfInput[1] = pow_tpl(pfInput[1], fInvGamma) * fMul + fAdd;
-        pfInput[2] = pow_tpl(pfInput[2], fInvGamma) * fMul + fAdd;
-
-        gamma.red  [i] = CLAMP(int_round(pfInput[0] * 65535.f), 0, 65535);
-        gamma.green[i] = CLAMP(int_round(pfInput[1] * 65535.f), 0, 65535);
-        gamma.blue [i] = CLAMP(int_round(pfInput[2] * 65535.f), 0, 65535);
-    }
-
-    SetDeviceGamma(&gamma);
-
-    m_nLastNoHWGamma = CV_r_nohwgamma;
-    m_fLastGamma = fGamma;
-    m_fLastBrightness = fBrightness;
-    m_fLastContrast = fContrast;
-}
-
-bool CD3D9Renderer::SetGammaDelta(const float fGamma)
-{
-    m_fDeltaGamma = fGamma;
-    SetGamma(CV_r_gamma + fGamma, CV_r_brightness, CV_r_contrast, false);
-    return true;
-}
-
-SDepthTexture::~SDepthTexture()
-{
-}
-
-void SDepthTexture::Release(bool bReleaseTex)
-{
-    SAFE_RELEASE(pSurf);
-    if (bReleaseTex && pTarget)
-    {
-        gcpRendD3D->m_DevMan.ReleaseD3D11Texture2D(static_cast<ID3D11Texture2D*>(pTarget));
-        pTex = nullptr;
-    }
-}
-
-
-void CD3D9Renderer::ShutDownFast()
-{
-    // Flush RT command buffer
-    ForceFlushRTCommands();
-    CHWShader::mfFlushPendedShadersWait(-1);
-    FX_PipelineShutdown(true);
-    //CBaseResource::ShutDown();
-    memset(&CTexture::s_TexStages[0], 0, sizeof(CTexture::s_TexStages));
-    for (uint32 i = 0; i < CTexture::s_TexStates.size(); i++)
-    {
-        memset(&CTexture::s_TexStates[i], 0, sizeof(STexState));
-    }
-    SAFE_DELETE(m_pRT);
-
-#if defined(OPENGL)
-#if !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    if (CV_r_multithreaded)
-    {
-        DXGLReleaseContext(m_devInfo.Device());
-    }
-#endif //!DXGL_FULL_EMULATION
-    m_devInfo.Release();
-#endif //defined(OPENGL)
-}
-
-void CD3D9Renderer::RT_ShutDown(uint32 nFlags)
-{
-    m_volumetricFog.DestroyResources(true);
-
-    SAFE_DELETE(m_pColorGradingControllerD3D);
-    SAFE_DELETE(m_pPostProcessMgr);
-    SAFE_DELETE(m_pWaterSimMgr);
-    SAFE_DELETE(m_pStereoRenderer);
-    SAFE_DELETE(m_pPipelineProfiler);
-
-    m_PerInstanceConstantBufferPool.Shutdown();
-
-    for (size_t bt = 0; bt < eBoneType_Count; ++bt)
-    {
-        for (size_t i = 0; i < 3; ++i)
-        {
-            while (m_CharCBActiveList[bt][i].next != &m_CharCBActiveList[bt][i])
-            {
-                delete m_CharCBActiveList[bt][i].next->item<&SCharInstCB::list>();
-            }
-        }
-        while (m_CharCBFreeList[bt].next != &m_CharCBFreeList[bt])
-        {
-            delete m_CharCBFreeList[bt].next->item<&SCharInstCB::list>();
-        }
-    }
-
-    CHWShader::mfFlushPendedShadersWait(-1);
-    if (nFlags == FRR_ALL)
-    {
-        memset(&CTexture::s_TexStages[0], 0, sizeof(CTexture::s_TexStages));
-        CTexture::s_TexStates.clear();
-        FreeResources(FRR_ALL);
-    }
-
-    FX_PipelineShutdown();
-
-#if defined(SUPPORT_DEVICE_INFO)
-    //m_devInfo.Release();
-#  if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    m_pRT->m_kDXGLDeviceContextHandle.Set(NULL, !CV_r_multithreaded);
-    m_pRT->m_kDXGLContextHandle.Set(NULL);
-#  endif //if defined(OPENGL) && !DXGL_FULL_EMULATION
-#endif
-
-
-    SAFE_RELEASE(m_pZBufferReadOnlyDSV);
-    SAFE_RELEASE(m_pZBufferDepthReadOnlySRV);
-    SAFE_RELEASE(m_pZBufferStencilReadOnlySRV);
-
-    SAFE_DELETE(m_GraphicsPipeline);
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    SAFE_DELETE(m_pRenderAuxGeomD3D);
-#endif
-    m_DepthBufferOrig.pSurf = NULL;
-    m_DepthBufferOrig.pTex = NULL;
-    m_DepthBufferOrigMSAA.pSurf = NULL;
-    m_DepthBufferOrigMSAA.pTex = NULL;
-    m_DepthBufferNative.pSurf = NULL;
-    m_DepthBufferNative.pTex = NULL;
-}
-
-void CD3D9Renderer::ShutDown(bool bReInit)
-{
-    m_bInShutdown = true;
-
-    // Force Flush RT command buffer
-    ForceFlushRTCommands();
-    PreShutDown();
-    CWaterRipples::ReleasePhysCallbacks();
-    if (m_pRT)
-    {
-        m_pRT->RC_ShutDown(bReInit ? (FRR_SHADERS | FRR_TEXTURES | FRR_REINITHW) : FRR_ALL);
-    }
-
-    //CBaseResource::ShutDown();
-    ForceFlushRTCommands();
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-    //////////////////////////////////////////////////////////////////////////
-    // Clear globals.
-    //////////////////////////////////////////////////////////////////////////
-
-    STLALLOCATOR_CLEANUP
-
-        SAFE_DELETE(m_pRT);
-
-#if defined(OPENGL)
-#if !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    if (CV_r_multithreaded)
-    {
-        DXGLReleaseContext(&GetDevice());
-    }
-#endif //!DXGL_FULL_EMULATION
-    m_devInfo.Release();
-#endif //defined(OPENGL)
-
-    if (!bReInit)
-    {
-        iLog = NULL;
-        //iConsole = NULL;
-        iTimer = NULL;
-        iSystem = NULL;
-    }
-
-    EnableGPUTimers2(false);
-    AllowGPUTimers2(false);
-
-#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    DXGLFinalize();
-#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
-
-    PostShutDown();
-}
-
-#ifdef WIN32
-LRESULT CALLBACK LowLevelKeyboardProc (INT nCode, WPARAM wParam, LPARAM lParam)
-{
-    KBDLLHOOKSTRUCT* pkbhs = (KBDLLHOOKSTRUCT*) lParam;
-    switch (nCode)
-    {
-    case HC_ACTION:
-    {
-        if (pkbhs->vkCode == VK_TAB && pkbhs->flags & LLKHF_ALTDOWN)
-        {
-            return 1;                // Disable ALT+ESC
-        }
-    }
-    default:
-        break;
-    }
-    return CallNextHookEx (0, nCode, wParam, lParam);
-}
-#endif
-
-HWND CD3D9Renderer::CreateWindowCallback()
-{
-    gcpRendD3D->SetWindow(gcpRendD3D->GetBackbufferWidth(), gcpRendD3D->GetBackbufferHeight(), gcpRendD3D->m_bFullScreen, gcpRendD3D->m_hWnd);
-
-    return gcpRendD3D->m_hWnd;
-}
-
-bool CD3D9Renderer::SetWindow([[maybe_unused]] int width, [[maybe_unused]] int height, [[maybe_unused]] bool fullscreen, [[maybe_unused]] WIN_HWND hWnd)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-#if D3DSYSTEM_CPP_TRAIT_SETWINDOW_REGISTERWINDOWMESSAGEHANDLER
-    iSystem->RegisterWindowMessageHandler(this);
-    m_registeredWindoWHandler = true;
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_22
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(CRY_USE_METAL)
-    if (gcpRendD3D->m_hWnd == 0)
-    {
-        DXGLCreateMetalWindow(m_WinTitle, width, height, fullscreen, &m_hWnd);
-    }
-#elif defined(WIN32)
-    DWORD style, exstyle;
-    int x, y, wdt, hgt;
-
-    if (width < 640)
-    {
-        width = 640;
-    }
-    if (height < 480)
-    {
-        height = 480;
-    }
-
-    m_dwWindowStyle = WS_OVERLAPPEDWINDOW | WS_VISIBLE;
-
-    // Do not allow the user to resize the window
-    m_dwWindowStyle &= ~WS_MAXIMIZEBOX;
-    m_dwWindowStyle &= ~WS_THICKFRAME;
-
-    bool bFullscreenWindow = false;
-#if defined(WIN32) || defined(WIN64)
-    bFullscreenWindow = CV_r_FullscreenWindow && CV_r_FullscreenWindow->GetIVal() != 0;
-#endif
-
-    if (fullscreen || bFullscreenWindow)
-    {
-        exstyle = bFullscreenWindow ? WS_EX_APPWINDOW : WS_EX_TOPMOST;
-        style = WS_POPUP | WS_VISIBLE;
-        x = m_prefMonX + (m_prefMonWidth - width) / 2;
-        y = m_prefMonY + (m_prefMonHeight - height) / 2;
-        wdt = width;
-        hgt = height;
-    }
-    else
-    {
-        exstyle = WS_EX_APPWINDOW;
-        style = m_dwWindowStyle;
-
-        RECT wndrect;
-        SetRect(&wndrect, 0, 0, width, height);
-        AdjustWindowRectEx(&wndrect, style, FALSE, exstyle);
-
-        wdt = wndrect.right  - wndrect.left;
-        hgt = wndrect.bottom - wndrect.top;
-
-        x = m_prefMonX + (m_prefMonWidth - wdt) / 2;
-        y = m_prefMonY + (m_prefMonHeight - hgt) / 2;
-    }
-
-    if (IsEditorMode())
-    {
-#if defined(UNICODE) || defined(_UNICODE)
-#error Review this, probably should be wide if Editor also has UNICODE support (or maybe moved into Editor)
-#endif
-        m_dwWindowStyle = WS_OVERLAPPED;
-        style = m_dwWindowStyle;
-        exstyle = 0;
-        x = y = 0;
-        wdt = 100;
-        hgt = 100;
-
-        WNDCLASSA wc;
-        memset(&wc, 0, sizeof(WNDCLASSA));
-        wc.style         = CS_OWNDC;
-        wc.lpfnWndProc   = DefWindowProcA;
-        wc.hInstance     = m_hInst;
-        wc.lpszClassName = "D3DDeviceWindowClassForSandbox";
-        if (!RegisterClassA(&wc))
-        {
-            CryFatalError("Cannot Register Window Class %s", wc.lpszClassName);
-            return false;
-        }
-        m_hWnd = CreateWindowExA(exstyle, wc.lpszClassName, m_WinTitle, style, x, y, wdt, hgt, NULL, NULL, m_hInst, NULL);
-        ShowWindow(m_hWnd, SW_HIDE);
-    }
-    else
-    {
-        if (!hWnd)
-        {
-            LPCWSTR pClassName = L"CryENGINE";
-
-            // Load default icon if we have nothing yet
-            if (m_hIconBig == NULL)
-            {
-                SetWindowIcon("textures/default_icon.dds");
-            }
-
-            // Moved from Game DLL
-            WNDCLASSEXW wc;
-            memset(&wc, 0, sizeof(WNDCLASSEXW));
-            wc.cbSize        = sizeof(WNDCLASSEXW);
-            wc.style         = CS_OWNDC | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
-            wc.lpfnWndProc   = (WNDPROC)GetISystem()->GetRootWindowMessageHandler();
-            wc.hInstance     = m_hInst;
-            wc.hIcon         = m_hIconBig;
-            wc.hIconSm       = m_hIconSmall;
-            wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
-            wc.lpszClassName = pClassName;
-            if (!RegisterClassExW(&wc))
-            {
-                CryFatalError("Cannot Register Launcher Window Class");
-                return false;
-            }
-
-            wstring wideTitle = Unicode::Convert<wstring>(m_WinTitle);
-
-            m_hWnd = CreateWindowExW(exstyle, pClassName, wideTitle.c_str(), style, x, y, wdt, hgt, NULL, NULL, m_hInst, NULL);
-            if (m_hWnd && !IsWindowUnicode(m_hWnd))
-            {
-                CryFatalError("Expected an UNICODE window for launcher");
-                return false;
-            }
-
-            // Create second window for stereo (multi-head device)
-            if (GetS3DRend().GetStereoDevice() == STEREO_DEVICE_DUALHEAD && fullscreen)
-            {
-                m_hWnd2 = CreateWindowExW(exstyle, pClassName, wideTitle.c_str(), style, x, y, wdt, hgt, m_hWnd, NULL, m_hInst, NULL);
-            }
-            else
-            {
-                m_hWnd2 = 0;
-            }
-
-            EnableCloseButton(m_hWnd, false);
-
-            if (fullscreen && (!gEnv->pSystem->IsDevMode() && CV_r_enableAltTab == 0))
-            {
-                SetWindowsHookExW(WH_KEYBOARD_LL, LowLevelKeyboardProc, NULL, 0);
-            }
-        }
-        else
-        {
-            m_hWnd = (HWND)hWnd;
-        }
-
-        ShowWindow(m_hWnd, SW_SHOWNORMAL);
-        SetFocus(m_hWnd);
-        SetForegroundWindow(m_hWnd);
-    }
-
-    if (!m_hWnd)
-    {
-        iConsole->Exit("Couldn't create window\n");
-    }
-#elif defined(OPENGL)
-    return DXGLCreateWindow(m_WinTitle, width, height, fullscreen, &m_hWnd);
-#else
-    return false;
-#endif //WIN32
-    return true;
-}
-
-bool CD3D9Renderer::SetWindowIcon([[maybe_unused]] const char* path)
-{
-#ifdef WIN32
-    if (IsEditorMode())
-    {
-        return false;
-    }
-
-    if (azstricmp(path, m_iconPath.c_str()) == 0)
-    {
-        return true;
-    }
-
-    HICON hIconBig = CreateResourceFromTexture(this, path, eResourceType_IconBig);
-    if (hIconBig)
-    {
-        if (m_hWnd)
-        {
-            SendMessage(m_hWnd, WM_SETICON, ICON_BIG, (LPARAM)hIconBig);
-        }
-        if (m_hWnd2)
-        {
-            SendMessage(m_hWnd2, WM_SETICON, ICON_BIG, (LPARAM)hIconBig);
-        }
-        if (m_hIconBig)
-        {
-            ::DestroyIcon(m_hIconBig);
-        }
-        m_hIconBig = hIconBig;
-        m_iconPath = path;
-    }
-
-    // Note: Also set the small icon manually.
-    // Even though the big icon will also affect the small icon, the re-scaling done by GDI has aliasing problems.
-    // Just grabbing a smaller MIP from the texture (if possible) will solve this.
-    HICON hIconSmall = CreateResourceFromTexture(this, path, eResourceType_IconSmall);
-    if (hIconSmall)
-    {
-        if (m_hWnd)
-        {
-            SendMessage(m_hWnd, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall);
-        }
-        if (m_hWnd)
-        {
-            SendMessage(m_hWnd, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall);
-        }
-        if (m_hIconSmall)
-        {
-            ::DestroyIcon(m_hIconSmall);
-        }
-        m_hIconSmall = hIconSmall;
-    }
-
-    return hIconBig != NULL;
-#else
-    return false;
-#endif
-}
-
-#define QUALITY_VAR(name)                                                   \
-    static void OnQShaderChange_Shader##name(ICVar * pVar)                  \
-    {                                                                       \
-        int iQuality = eSQ_Low;                                             \
-        if (gRenDev->GetFeatures() & (RFT_HW_SM2X | RFT_HW_SM30)) {         \
-            iQuality = CLAMP(pVar->GetIVal(), 0, eSQ_Max); }                \
-        gRenDev->EF_SetShaderQuality(eST_##name, (EShaderQuality)iQuality); \
-    }
-
-QUALITY_VAR(General)
-QUALITY_VAR(Metal)
-QUALITY_VAR(Glass)
-QUALITY_VAR(Ice)
-QUALITY_VAR(Shadow)
-QUALITY_VAR(Water)
-QUALITY_VAR(FX)
-QUALITY_VAR(PostProcess)
-QUALITY_VAR(HDR)
-QUALITY_VAR(Sky)
-
-#undef QUALITY_VAR
-
-static void OnQShaderChange_Renderer(ICVar* pVar)
-{
-    int iQuality = eRQ_Low;
-
-    if (gRenDev->GetFeatures() & (RFT_HW_SM2X | RFT_HW_SM30))
-    {
-        iQuality = CLAMP(pVar->GetIVal(), 0, eSQ_Max);
-    }
-    else
-    {
-        pVar->ForceSet("0");
-    }
-
-    gRenDev->m_RP.m_eQuality = (ERenderQuality)iQuality;
-}
-
-
-static void Command_Quality(IConsoleCmdArgs* Cmd)
-{
-    bool bLog = false;
-    bool bSet = false;
-
-    int iQuality = -1;
-
-    if (Cmd->GetArgCount() == 2)
-    {
-        iQuality = CLAMP(atoi(Cmd->GetArg(1)), eSQ_Low, eSQ_VeryHigh);
-        bSet = true;
-    }
-    else
-    {
-        bLog = true;
-    }
-
-    if (bLog)
-    {
-        iLog->LogWithType(IMiniLog::eInputResponse, " ");
-    }
-    if (bLog)
-    {
-        iLog->LogWithType(IMiniLog::eInputResponse, "Current quality settings (0=low/1=med/2=high/3=very high):");
-    }
-
-#define QUALITY_VAR(name) if (bLog) {iLog->LogWithType(IMiniLog::eInputResponse, "  $3q_"#name " = $6%d", gEnv->pConsole->GetCVar("q_"#name)->GetIVal()); } \
-    if (bSet) { gEnv->pConsole->GetCVar("q_"#name)->Set(iQuality); }
-
-    QUALITY_VAR(ShaderGeneral)
-    QUALITY_VAR(ShaderMetal)
-    QUALITY_VAR(ShaderGlass)
-    QUALITY_VAR(ShaderVegetation)
-    QUALITY_VAR(ShaderIce)
-    QUALITY_VAR(ShaderTerrain)
-    QUALITY_VAR(ShaderShadow)
-    QUALITY_VAR(ShaderWater)
-    QUALITY_VAR(ShaderFX)
-    QUALITY_VAR(ShaderPostProcess)
-    QUALITY_VAR(ShaderHDR)
-    QUALITY_VAR(ShaderSky)
-    QUALITY_VAR(Renderer)
-
-#undef QUALITY_VAR
-
-    if (bSet)
-    {
-        iLog->LogWithType(IMiniLog::eInputResponse, "Set quality to %d", iQuality);
-    }
-}
-
-const char* sGetSQuality(const char* szName)
-{
-    ICVar* pVar = iConsole->GetCVar(szName);
-    assert(pVar);
-    if (!pVar)
-    {
-        return "Unknown";
-    }
-    int iQ = pVar->GetIVal();
-    switch (iQ)
-    {
-    case eSQ_Low:
-        return "Low";
-    case eSQ_Medium:
-        return "Medium";
-    case eSQ_High:
-        return "High";
-    case eSQ_VeryHigh:
-        return "VeryHigh";
-    default:
-        return "Unknown";
-    }
-}
-
-static void Command_ColorGradingChartImage(IConsoleCmdArgs* pCmd)
-{
-    CColorGradingControllerD3D* pCtrl = gcpRendD3D->m_pColorGradingControllerD3D;
-    if (pCmd && pCtrl)
-    {
-        const int numArgs = pCmd->GetArgCount();
-        if (numArgs == 1)
-        {
-            const CTexture* pChart = pCtrl->GetStaticColorChart();
-            if (pChart)
-            {
-                iLog->Log("current static chart is \"%s\"", pChart->GetName());
-            }
-            else
-            {
-                iLog->Log("no static chart loaded");
-            }
-        }
-        else if (numArgs == 2)
-        {
-            const char* pArg = pCmd->GetArg(1);
-            if (pArg && pArg[0])
-            {
-                if (pArg[0] == '0' && !pArg[1])
-                {
-                    pCtrl->LoadStaticColorChart(0);
-                    iLog->Log("static chart reset");
-                }
-                else
-                {
-                    if (pCtrl->LoadStaticColorChart(pArg))
-                    {
-                        iLog->Log("\"%s\" loaded successfully", pArg);
-                    }
-                    else
-                    {
-                        iLog->Log("failed to load \"%s\"", pArg);
-                    }
-                }
-            }
-        }
-    }
-}
-
-WIN_HWND CD3D9Renderer::Init([[maybe_unused]] int x, [[maybe_unused]] int y, int width, int height, unsigned int cbpp, int zbpp, int sbits, bool fullscreen, bool isEditor, WIN_HINSTANCE hinst, WIN_HWND Glhwnd, [[maybe_unused]] bool bReInit, [[maybe_unused]] const SCustomRenderInitArgs* pCustomArgs, bool bShaderCacheGen)
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    if (!iSystem || !iLog)
-    {
-        AZ_Error("CD3D9Renderer::Init", iSystem, "Renderer initialization failed because iSystem was null.");
-        AZ_Error("CD3D9Renderer::Init", iLog, "Renderer initialization failed because iLog was null.");
-        return 0;
-    }
-
-    iLog->Log("Initializing Direct3D and creating game window:");
-    INDENT_LOG_DURING_SCOPE();
-
-    m_CVWidth = iConsole->GetCVar("r_Width");
-    m_CVHeight = iConsole->GetCVar("r_Height");
-    m_CVFullScreen = iConsole->GetCVar("r_Fullscreen");
-    m_CVDisplayInfo = iConsole->GetCVar("r_DisplayInfo");
-    m_CVColorBits = iConsole->GetCVar("r_ColorBits");
-
-    bool bNativeResolution;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(IOS)
-    bNativeResolution = true;
-#elif defined(ANDROID)
-    bNativeResolution = true;
-#elif defined(WIN32) || defined(WIN64)
-    CV_r_FullscreenWindow = iConsole->GetCVar("r_FullscreenWindow");
-    m_fullscreenWindow = CV_r_FullscreenWindow && CV_r_FullscreenWindow->GetIVal();
-    CV_r_FullscreenNativeRes = iConsole->GetCVar("r_FullscreenNativeRes");
-    bNativeResolution = CV_r_FullscreenNativeRes && CV_r_FullscreenNativeRes->GetIVal() != 0 && (fullscreen || m_fullscreenWindow);
-
-    {
-        RECT rcDesk;
-        GetWindowRect(GetDesktopWindow(), &rcDesk);
-
-        m_prefMonX = rcDesk.left;
-        m_prefMonY = rcDesk.top;
-        m_prefMonWidth = rcDesk.right - rcDesk.left;
-        m_prefMonHeight = rcDesk.bottom - rcDesk.top;
-    }
-    {
-        RECT rc;
-        HDC hdc = GetDC(NULL);
-        GetClipBox(hdc, &rc);
-        ReleaseDC(NULL, hdc);
-        m_deskwidth = rc.right  - rc.left;
-        m_deskheight = rc.bottom - rc.top;
-    }
-#else
-    bNativeResolution = false;
-#endif
-
-#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    DXGLInitialize(CV_r_multithreaded ? 4 : 0);
-#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
-
-#ifdef D3DX_SDK_VERSION
-    iLog->Log("D3DX_SDK_VERSION = %d", D3DX_SDK_VERSION);
-#else
-    iLog->Log("D3DX_SDK_VERSION = <UNDEFINED>");
-#endif
-
-    iLog->Log ("Direct3D driver is creating...");
-    iLog->Log ("Crytek Direct3D driver version %4.2f (%s <%s>)", VERSION_D3D, __DATE__, __TIME__);
-
-    auto projectName = AZ::Utils::GetProjectName();
-    cry_strcpy(m_WinTitle, projectName.c_str());
-
-    iLog->Log ("Creating window called '%s' (%dx%d)", m_WinTitle, width, height);
-
-    m_hInst = (HINSTANCE)(TRUNCATE_PTR)hinst;
-
-    m_bEditor = isEditor;
-    if (isEditor)
-    {
-        fullscreen = false;
-    }
-
-    m_bShaderCacheGen = bShaderCacheGen;
-
-    m_cbpp   = cbpp;
-    m_zbpp   = zbpp;
-    m_sbpp   = sbits;
-    m_bFullScreen = fullscreen;
-
-    CalculateResolutions(width, height, bNativeResolution, &m_width, &m_height, &m_nativeWidth, &m_nativeHeight, &m_backbufferWidth, &m_backbufferHeight);
-
-    // only create device if we are not in shader cache generation mode
-    if (!m_bShaderCacheGen)
-    {
-        // call init stereo before device is created!
-        m_pStereoRenderer->InitDeviceBeforeD3D();
-
-        while (true)
-        {
-            m_hWnd = (HWND)Glhwnd;
-
-            // Creates Device here.
-            bool bRes = m_pRT->RC_CreateDevice();
-            if (!bRes)
-            {
-                ShutDown(true);
-                return 0;
-            }
-
-
-            break;
-        }
-
-# if defined(SUPPORT_DEVICE_INFO)
-        iLog->Log(" ****** D3D11 CryRender Stats ******");
-        iLog->Log(" Driver description: %S", m_devInfo.AdapterDesc().Description);
-
-        switch (m_devInfo.FeatureLevel())
-        {
-        case D3D_FEATURE_LEVEL_9_1:
-            iLog->Log(" Feature level: DirectX 9.1");
-            break;
-        case D3D_FEATURE_LEVEL_9_2:
-            iLog->Log(" Feature level: DirectX 9.2");
-            break;
-        case D3D_FEATURE_LEVEL_9_3:
-            iLog->Log(" Feature level: DirectX 9.3");
-            break;
-        case D3D_FEATURE_LEVEL_10_0:
-            iLog->Log(" Feature level: DirectX 10.0");
-            break;
-        case D3D_FEATURE_LEVEL_10_1:
-            iLog->Log(" Feature level: DirectX 10.1");
-            break;
-        case D3D_FEATURE_LEVEL_11_0:
-            iLog->Log(" Feature level: DirectX 11.0");
-            break;
-        }
-        if (m_devInfo.DriverType() == D3D_DRIVER_TYPE_HARDWARE)
-        {
-            iLog->Log(" Rasterizer: Hardware");
-        }
-        else if (m_devInfo.DriverType() == D3D_DRIVER_TYPE_REFERENCE)
-        {
-            iLog->Log(" Rasterizer: Reference");
-        }
-        else if (m_devInfo.DriverType() == D3D_DRIVER_TYPE_SOFTWARE)
-        {
-            iLog->Log(" Rasterizer: Software");
-        }
-
-#   endif
-        iLog->Log(" Current Resolution: %dx%dx%d %s", CRenderer::m_width, CRenderer::m_height, CRenderer::m_cbpp, m_bFullScreen ? "Full Screen" : "Windowed");
-        iLog->Log(" HDR Rendering: %s", m_nHDRType == 1 ? "FP16" : m_nHDRType == 2 ? "MRT" : "Disabled");
-        iLog->Log(" MRT HDR Rendering: %s", (m_bDeviceSupportsFP16Separate) ? "Enabled" : "Disabled");
-        iLog->Log(" Occlusion queries: %s", (m_Features & RFT_OCCLUSIONTEST) ? "Supported" : "Not supported");
-        iLog->Log(" Geometry instancing: %s", (m_bDeviceSupportsInstancing) ? "Supported" : "Not supported");
-        iLog->Log(" Vertex textures: %s", (m_bDeviceSupportsVertexTexture) ? "Supported" : "Not supported");
-        iLog->Log(" R32F rendertarget: %s", (m_bDeviceSupportsR32FRendertarget) ? "Supported" : "Not supported");
-        iLog->Log(" NormalMaps compression : %s", m_hwTexFormatSupport.m_FormatBC5U.IsValid() ? "Supported" : "Not supported");
-        iLog->Log(" Gamma control: %s", (m_Features & RFT_HWGAMMA) ? "Hardware" : "Software");
-        iLog->Log(" Vertex Shaders version %d.%d", 4, 0);
-        iLog->Log(" Pixel Shaders version %d.%d", 4, 0);
-
-        CRenderer::ChangeGeomInstancingThreshold();     // to get log printout and to set the internal value (vendor dependent)
-
-        m_Features |= RFT_HW_SM20 | RFT_HW_SM2X | RFT_HW_SM30;
-
-        // Force the Z targets to be 16-bit float
-        if (!m_bDeviceSupportsR32FRendertarget)
-        {
-            CTexture::s_eTFZ = eTF_R16F;
-        }
-        if (!gcpRendD3D->UseHalfFloatRenderTargets())
-        {
-            CTexture::s_eTFZ = eTF_R16U;
-        }
-
-        // Note: Not rolling this into the if statement above in case s_eTFZ is set to R16F on initialization
-        if (CTexture::s_eTFZ != eTF_R32F)
-        {
-            CRenderer::CV_r_CBufferUseNativeDepth = 0; //0=disable
-        }
-
-        if (!m_bDeviceSupportsInstancing)
-        {
-            _SetVar("r_GeomInstancing", 0);
-        }
-
-        const char* str = NULL;
-        if (m_Features & RFT_HW_SM50)
-        {
-            str = "SM.5.0";
-        }
-        else if (m_Features & RFT_HW_SM40)
-        {
-            str = "SM.4.0";
-        }
-        else
-        {
-            assert(0);
-        }
-        iLog->Log(" Shader model usage: '%s'", str);
-    }
-    else
-    {
-        // force certain features during shader cache gen mode
-        m_Features |= RFT_HW_SM20 | RFT_HW_SM2X | RFT_HW_SM30;
-
-        m_bDeviceSupportsFP16Filter = true;
-
-#if defined(ENABLE_NULL_D3D11DEVICE)
-        m_Device = new NullD3D11Device;
-        D3DDeviceContext* pContext = NULL;
-#if defined(DEVICE_SUPPORTS_D3D11_3)
-        GetDevice().GetImmediateContext3(&pContext);
-#elif defined(DEVICE_SUPPORTS_D3D11_2)
-        GetDevice().GetImmediateContext2(&pContext);
-#elif defined(DEVICE_SUPPORTS_D3D11_1)
-        GetDevice().GetImmediateContext1(&pContext);
-#else
-        GetDevice().GetImmediateContext(&pContext);
-#endif
-        m_DeviceContext = pContext;
-#endif
-    }
-
-    iLog->Log(" *****************************************");
-    iLog->Log(" ");
-
-    iLog->Log("Init Shaders");
-
-    //  if (!(GetFeatures() & (RFT_HW_PS2X | RFT_HW_PS30)))
-    //    SetShaderQuality(eST_All, eSQ_Low);
-
-    // Quality console variables --------------------------------------
-
-#define QUALITY_VAR(name) { ICVar* pVar = iConsole->Register("q_Shader"#name, &m_cEF.m_ShaderProfiles[(int)eST_##name].m_iShaderProfileQuality, 1,                                          \
-                                    0, CVARHELP("Defines the shader quality of "#name "\nUsage: q_Shader"#name " 0=low/1=med/2=high/3=very high (default)"), OnQShaderChange_Shader##name); \
-                            OnQShaderChange_Shader##name(pVar);                                                                                                                             \
-                            iLog->Log(" %s shader quality: %s", #name, sGetSQuality("q_Shader"#name)); } // clamp for lowspec
-
-    QUALITY_VAR(General);
-    QUALITY_VAR(Metal);
-    QUALITY_VAR(Glass);
-    QUALITY_VAR(Ice);
-    QUALITY_VAR(Shadow);
-    QUALITY_VAR(Water);
-    QUALITY_VAR(FX);
-    QUALITY_VAR(PostProcess);
-    QUALITY_VAR(HDR);
-    QUALITY_VAR(Sky);
-
-
-#undef QUALITY_VAR
-
-    ICVar* pVar = REGISTER_INT_CB("q_Renderer", 3, 0, "Defines the quality of Renderer\nUsage: q_Renderer 0=low/1=med/2=high/3=very high (default)", OnQShaderChange_Renderer);
-    OnQShaderChange_Renderer(pVar); // clamp for lowspec, report renderer current value
-    iLog->Log("Render quality: %s", sGetSQuality("q_Renderer"));
-
-    REGISTER_COMMAND("q_Quality", &Command_Quality, 0,
-        "If called with a parameter it sets the quality of all q_.. variables\n"
-        "otherwise it prints their current state\n"
-        "Usage: q_Quality [0=low/1=med/2=high/3=very high]");
-
-    REGISTER_COMMAND("r_ColorGradingChartImage", &Command_ColorGradingChartImage, 0,
-        "If called with a parameter it loads a color chart image. This image will overwrite\n"
-        " the dynamic color chart blending result and be used during post processing instead.\n"
-        "If called with no parameter it displays the name of the previously loaded chart.\n"
-        "To reset a previously loaded chart call r_ColorGradingChartImage 0.\n"
-        "Usage: r_ColorGradingChartImage [path of color chart image/reset]");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-
-#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    if (!m_pRT->IsRenderThread())
-    {
-        DXGLUnbindDeviceContext(&GetDeviceContext(), !CV_r_multithreaded);
-    }
-#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
-
-    if (!bShaderCacheGen)
-    {
-        m_pRT->RC_Init();
-    }
-
-    if (!g_shaderGeneralHeap)
-    {
-        g_shaderGeneralHeap = CryGetIMemoryManager()->CreateGeneralExpandingMemoryHeap(4 * 1024 * 1024, 0, "Shader General");
-    }
-
-    m_cEF.mfInit();
-
-    CWaterRipples::CreatePhysCallbacks();
-
-    if (!IsEditorMode() && !IsShaderCacheGenMode())
-    {
-        m_pRT->RC_PrecacheDefaultShaders();
-    }
-
-    //PostInit();
-
-#if defined(WIN32)
-    // Initialize the set of connected monitors
-    HandleMessage(0, WM_DEVICECHANGE, 0, 0, 0);
-    m_bDisplayChanged = false;
-#endif
-
-    m_bInitialized = true;
-
-    //  Cry_memcheck();
-
-    if (!bShaderCacheGen)
-    {
-    }
-
-    // Success, return the window handle
-    return (m_hWnd);
-}
-
-//=============================================================================
-
-int CD3D9Renderer::EnumAAFormats([[maybe_unused]] SAAFormat* formats)
-{
-#if defined(SUPPORT_DEVICE_INFO)
-
-    int numFormats = 0;
-
-    for (unsigned int i = 1; i <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; ++i)
-    {
-        unsigned int maxQuality;
-        if (SUCCEEDED(m_devInfo.Device()->CheckMultisampleQualityLevels(m_devInfo.SwapChainDesc().BufferDesc.Format, i, &maxQuality)) && maxQuality > 0)
-        {
-            if (formats)
-            {
-                formats[numFormats].nSamples = i;
-                formats[numFormats].nQuality = 0;
-                formats[numFormats].szDescr[0] = 0;
-            }
-
-            ++numFormats;
-        }
-    }
-
-    return numFormats;
-
-#else // #if defined(SUPPORT_DEVICE_INFO)
-
-    return 0;
-
-#endif
-}
-
-int CD3D9Renderer::GetAAFormat(TArray<SAAFormat>& Formats)
-{
-    int nNums = EnumAAFormats(NULL);
-    if (nNums > 0)
-    {
-        Formats.resize(nNums);
-        EnumAAFormats(&Formats[0]);
-    }
-
-    for (unsigned int i = 0; i < Formats.Num(); i++)
-    {
-        if (CV_r_msaa_samples == Formats[i].nSamples && CV_r_msaa_quality == Formats[i].nQuality)
-        {
-            return (int) i;
-        }
-    }
-
-    return -1;
-}
-
-bool CD3D9Renderer::CheckMSAAChange()
-{
-    bool bChanged = false;
-    if (CV_r_msaa != m_MSAA || (CV_r_msaa && (m_MSAA_quality != CV_r_msaa_quality || m_MSAA_samples != CV_r_msaa_samples)))
-    {
-        if (CV_r_msaa && (m_hwTexFormatSupport.m_FormatR16G16B16A16.bCanMultiSampleRT || m_hwTexFormatSupport.m_FormatR16G16.bCanMultiSampleRT))
-        {
-            CTexture::s_eTFZ = eTF_R32F;
-            TArray<SAAFormat> Formats;
-            int nNum = GetAAFormat(Formats);
-            if (nNum < 0)
-            {
-                iLog->Log(" MSAA: Requested mode not supported\n");
-                _SetVar("r_MSAA", 0);
-                m_MSAA = 0;
-            }
-            else
-            {
-                iLog->Log(" MSAA: Enabled %d samples (quality level %d)", Formats[nNum].nSamples, Formats[nNum].nQuality);
-                if (Formats[nNum].nQuality != m_MSAA_quality || Formats[nNum].nSamples != m_MSAA_samples)
-                {
-                    bChanged = true;
-                    _SetVar("r_MSAA_quality", Formats[nNum].nQuality);
-                    _SetVar("r_MSAA_samples", Formats[nNum].nSamples);
-                }
-                else
-                if (!m_MSAA)
-                {
-                    bChanged = true;
-                }
-            }
-        }
-        else
-        {
-            CTexture::s_eTFZ = eTF_R32F;
-            bChanged = true;
-            iLog->Log(" MSAA: Disabled");
-        }
-        m_MSAA = CV_r_msaa;
-        m_MSAA_quality = CV_r_msaa_quality;
-        m_MSAA_samples = CV_r_msaa_samples;
-    }
-
-    return bChanged;
-}
-
-bool CD3D9Renderer::CheckSSAAChange()
-{
-    const int width = m_CVWidth ? m_CVWidth->GetIVal() : m_width;
-    const int height = m_CVHeight ? m_CVHeight->GetIVal() : m_height;
-    int numSSAASamples = 1;
-    if (width > 0 && height > 0)
-    {
-        const int maxSamples = min(m_MaxTextureSize / width, m_MaxTextureSize / height);
-        numSSAASamples = clamp_tpl(CV_r_Supersampling, 1, maxSamples);
-    }
-    if (m_numSSAASamples != numSSAASamples)
-    {
-        m_numSSAASamples = numSSAASamples;
-        return true;
-    }
-    return false;
-}
-
-//==========================================================================
-bool CD3D9Renderer::SetRes()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    ChangeLog();
-
-    m_pixelAspectRatio = 1.0f;
-
-    ///////////////////////////////////////////////////////////////////
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_8
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(IOS) || defined(ANDROID)
-    m_bFullScreen = true;
-
-    if (!m_devInfo.CreateDevice(false, m_width, m_height, m_backbufferWidth, m_backbufferHeight, m_zbpp, OnD3D11CreateDevice, CreateWindowCallback))
-    {
-        return false;
-    }
-    m_devInfo.SyncInterval() = m_VSync ? 1 : 0;
-
-    OnD3D11PostCreateDevice(m_devInfo.Device());
-
-    AdjustWindowForChange();
-
-    CreateContext(m_hWnd);
-#elif defined(WIN32) || defined(APPLE) || defined(LINUX)
-
-    UnSetRes();
-
-    int width = m_width;
-    int height = m_height;
-    if (IsEditorMode())
-    {
-        // Note: Editor is a special case, m_backbufferWidth needs to be the same as m_width
-        width = m_deskwidth;
-        height = m_deskheight;
-    }
-
-    // DirectX9 and DirectX10 device creating
-#if defined(SUPPORT_DEVICE_INFO)
-    if (m_devInfo.CreateDevice(!m_bFullScreen, width, height, m_backbufferWidth, m_backbufferHeight, m_zbpp, OnD3D11CreateDevice, CreateWindowCallback))
-    {
-        m_devInfo.SyncInterval() = m_VSync ? 1 : 0;
-    }
-    else
-    {
-        return false;
-    }
-
-    OnD3D11PostCreateDevice(m_devInfo.Device());
-#endif
-
-    AdjustWindowForChange();
-
-    CreateContext(m_hWnd);
-
-#else
-    #error UNKNOWN RENDER DEVICE PLATFORM
-#endif
-
-    m_DevBufMan.Init();
-
-    m_pStereoRenderer->InitDeviceAfterD3D();
-
-    return true;
-}
-
-
-bool SPixFormat::CheckSupport(D3DFormat Format, const char* szDescr, [[maybe_unused]] ETexture_Usage eTxUsage)
-{
-    bool bRes = true;
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    UINT nOptions;
-    HRESULT hr = gcpRendD3D->GetDevice().CheckFormatSupport(Format, &nOptions);
-    if (SUCCEEDED(hr))
-    {
-        if (nOptions & (D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURECUBE))
-        {
-            bool canReadSRGB = CTexture::IsDeviceFormatSRGBReadable(Format);
-
-            //  TODO: check if need to allow other compressed formats to stay here formats here too?
-            //  Adding PVRTC format here improved the picture on iOS device.
-
-            bool bCanMips = true;
-
-            Init();
-            DeviceFormat  = Format;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_9
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            MaxWidth = D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
-            MaxHeight = D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
-#endif
-            Desc          = szDescr;
-            BytesPerBlock = CTexture::BytesPerBlock(CTexture::TexFormatFromDeviceFormat(Format));
-
-            bCanDS            = (nOptions & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) != 0;
-            bCanRT            = (nOptions & D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0;
-            bCanMultiSampleRT = (nOptions & D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET) != 0;
-            bCanMips          = (nOptions & D3D11_FORMAT_SUPPORT_MIP) != 0;
-            bCanMipsAutoGen   = (nOptions & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN) != 0;
-            bCanGather        = (nOptions & D3D11_FORMAT_SUPPORT_SHADER_GATHER) != 0;
-            bCanGatherCmp     = (nOptions & D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON) != 0;
-            bCanBlend         = (nOptions & D3D11_FORMAT_SUPPORT_BLENDABLE) != 0;
-            bCanReadSRGB      = canReadSRGB;
-
-            if (bCanDS || bCanRT || bCanGather || bCanBlend || bCanReadSRGB || bCanMips)
-            {
-                iLog->Log("  %s%s%s%s%s%s%s%s%s%s",
-                    szDescr,
-                    bCanMips ? ", mips" : "",
-                    bCanMipsAutoGen ? " (autogen)" : "",
-                    bCanReadSRGB ? ", sRGB" : "",
-                    bCanBlend ? ", blend" : "",
-                    bCanDS ? ", DS" : "",
-                    bCanRT ? ", RT" : "",
-                    bCanMultiSampleRT ? " (multi-sampled)" : "",
-                    bCanGather ? ", gather" : "",
-                    bCanGatherCmp ? " (comparable)" : ""
-                    );
-            }
-            else
-            {
-                iLog->Log("  %s", szDescr);
-            }
-
-            Next = rd->m_hwTexFormatSupport.m_FirstPixelFormat;
-            rd->m_hwTexFormatSupport.m_FirstPixelFormat = this;
-        }
-        else
-        {
-            bRes = false;
-        }
-    }
-    else
-    {
-        bRes = false;
-    }
-
-    return bRes;
-}
-
-void SPixFormatSupport::CheckFormatSupport()
-{
-    iLog->Log("Using pixel texture formats:");
-
-    m_FirstPixelFormat = NULL;
-
-    m_FormatR8G8B8A8S.CheckSupport(DXGI_FORMAT_R8G8B8A8_SNORM, "R8G8B8A8S");
-    m_FormatR8G8B8A8.CheckSupport(DXGI_FORMAT_R8G8B8A8_UNORM, "R8G8B8A8");
-
-    //m_FormatR1.CheckSupport(DXGI_FORMAT_R1_UNORM, "R1");
-    m_FormatA8.CheckSupport(DXGI_FORMAT_A8_UNORM, "A8");
-    m_FormatR8.CheckSupport(DXGI_FORMAT_R8_UNORM, "R8");
-    m_FormatR8S.CheckSupport(DXGI_FORMAT_R8_SNORM, "R8S");
-    m_FormatR16.CheckSupport(DXGI_FORMAT_R16_UNORM, "R16");
-    m_FormatR16U.CheckSupport(DXGI_FORMAT_R16_UINT, "R16U");
-    m_FormatR16G16U.CheckSupport(DXGI_FORMAT_R16G16_UINT, "R16G16U");
-    m_FormatR10G10B10A2UI.CheckSupport(DXGI_FORMAT_R10G10B10A2_UINT, "R10G10B10A2UI");
-    m_FormatR16F.CheckSupport(DXGI_FORMAT_R16_FLOAT, "R16F");
-    m_FormatR32F.CheckSupport(DXGI_FORMAT_R32_FLOAT, "R32F");
-    m_FormatR8G8.CheckSupport(DXGI_FORMAT_R8G8_UNORM, "R8G8");
-    m_FormatR8G8S.CheckSupport(DXGI_FORMAT_R8G8_SNORM, "R8G8S");
-    m_FormatR16G16.CheckSupport(DXGI_FORMAT_R16G16_UNORM, "R16G16");
-    m_FormatR16G16S.CheckSupport(DXGI_FORMAT_R16G16_SNORM, "R16G16S");
-    m_FormatR16G16F.CheckSupport(DXGI_FORMAT_R16G16_FLOAT, "R16G16F");
-    m_FormatR11G11B10F.CheckSupport(DXGI_FORMAT_R11G11B10_FLOAT, "R11G11B10F");
-    m_FormatR10G10B10A2.CheckSupport(DXGI_FORMAT_R10G10B10A2_UNORM, "R10G10B10A2");
-    m_FormatR16G16B16A16.CheckSupport(DXGI_FORMAT_R16G16B16A16_UNORM, "R16G16B16A16");
-    m_FormatR16G16B16A16S.CheckSupport(DXGI_FORMAT_R16G16B16A16_SNORM, "R16G16B16A16S");
-    m_FormatR16G16B16A16F.CheckSupport(DXGI_FORMAT_R16G16B16A16_FLOAT, "R16G16B16A16F");
-    m_FormatR32G32B32A32F.CheckSupport(DXGI_FORMAT_R32G32B32A32_FLOAT, "R32G32B32A32F");
-
-    m_FormatBC1.CheckSupport(DXGI_FORMAT_BC1_UNORM, "BC1");
-    m_FormatBC2.CheckSupport(DXGI_FORMAT_BC2_UNORM, "BC2");
-    m_FormatBC3.CheckSupport(DXGI_FORMAT_BC3_UNORM, "BC3");
-    m_FormatBC4U.CheckSupport(DXGI_FORMAT_BC4_UNORM, "BC4");
-    m_FormatBC4S.CheckSupport(DXGI_FORMAT_BC4_SNORM, "BC4S");
-    m_FormatBC5U.CheckSupport(DXGI_FORMAT_BC5_UNORM, "BC5");
-    m_FormatBC5S.CheckSupport(DXGI_FORMAT_BC5_SNORM, "BC5S");
-    m_FormatBC6UH.CheckSupport(DXGI_FORMAT_BC6H_UF16, "BC6UH");
-    m_FormatBC6SH.CheckSupport(DXGI_FORMAT_BC6H_SF16, "BC6SH");
-    m_FormatBC7.CheckSupport(DXGI_FORMAT_BC7_UNORM, "BC7");
-    m_FormatR9G9B9E5.CheckSupport(DXGI_FORMAT_R9G9B9E5_SHAREDEXP, "R9G9B9E5");
-
-    // Depth formats
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_10
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    m_FormatD32FS8.CheckSupport(DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, "R32FX8T");
-    m_FormatD32F.CheckSupport(DXGI_FORMAT_R32_TYPELESS, "R32T");
-    m_FormatD24S8.CheckSupport(DXGI_FORMAT_R24G8_TYPELESS, "R24G8T");
-    m_FormatD16.CheckSupport(DXGI_FORMAT_R16_TYPELESS, "R16T");
-#endif
-
-    m_FormatB5G6R5.CheckSupport(DXGI_FORMAT_B5G6R5_UNORM, "B5G6R5");
-    m_FormatB5G5R5.CheckSupport(DXGI_FORMAT_B5G5R5A1_UNORM, "B5G5R5");
-    //  m_FormatB4G4R4A4.CheckSupport(DXGI_FORMAT_B4G4R4A4_UNORM, "B4G4R4A4");
-
-    m_FormatB8G8R8A8.CheckSupport(DXGI_FORMAT_B8G8R8A8_UNORM, "B8G8R8A8");
-    m_FormatB8G8R8X8.CheckSupport(DXGI_FORMAT_B8G8R8X8_UNORM, "B8G8R8X8");
-
-#if defined(OPENGL)
-    m_FormatEAC_R11.CheckSupport(DXGI_FORMAT_EAC_R11_UNORM, "EAC_R11");
-    m_FormatEAC_RG11.CheckSupport(DXGI_FORMAT_EAC_RG11_UNORM, "EAC_RG11");
-    m_FormatETC2.CheckSupport(DXGI_FORMAT_ETC2_UNORM, "ETC2");
-    m_FormatETC2A.CheckSupport(DXGI_FORMAT_ETC2A_UNORM, "ETC2A");
-#endif //defined(OPENGL)
-
-#ifdef CRY_USE_METAL
-    m_FormatPVRTC2.CheckSupport(DXGI_FORMAT_PVRTC2_UNORM, "PVRTC2");
-    m_FormatPVRTC4.CheckSupport(DXGI_FORMAT_PVRTC4_UNORM, "PVRTC4");
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    m_FormatASTC_4x4.CheckSupport(DXGI_FORMAT_ASTC_4x4_UNORM, "ASTC_4x4");
-    m_FormatASTC_5x4.CheckSupport(DXGI_FORMAT_ASTC_5x4_UNORM, "ASTC_5x4");
-    m_FormatASTC_5x5.CheckSupport(DXGI_FORMAT_ASTC_5x5_UNORM, "ASTC_5x5");
-    m_FormatASTC_6x5.CheckSupport(DXGI_FORMAT_ASTC_6x5_UNORM, "ASTC_6x5");
-    m_FormatASTC_6x6.CheckSupport(DXGI_FORMAT_ASTC_6x6_UNORM, "ASTC_6x6");
-    m_FormatASTC_8x5.CheckSupport(DXGI_FORMAT_ASTC_8x5_UNORM, "ASTC_8x5");
-    m_FormatASTC_8x6.CheckSupport(DXGI_FORMAT_ASTC_8x6_UNORM, "ASTC_8x6");
-    m_FormatASTC_8x8.CheckSupport(DXGI_FORMAT_ASTC_8x8_UNORM, "ASTC_8x8");
-    m_FormatASTC_10x5.CheckSupport(DXGI_FORMAT_ASTC_10x5_UNORM, "ASTC_10x5");
-    m_FormatASTC_10x6.CheckSupport(DXGI_FORMAT_ASTC_10x6_UNORM, "ASTC_10x6");
-    m_FormatASTC_10x8.CheckSupport(DXGI_FORMAT_ASTC_10x8_UNORM, "ASTC_10x8");
-    m_FormatASTC_10x10.CheckSupport(DXGI_FORMAT_ASTC_10x10_UNORM, "ASTC_10x10");
-    m_FormatASTC_12x10.CheckSupport(DXGI_FORMAT_ASTC_12x10_UNORM, "ASTC_12x10");
-    m_FormatASTC_12x12.CheckSupport(DXGI_FORMAT_ASTC_12x12_UNORM, "ASTC_12x12");
-#endif
-}
-
-void CD3D9Renderer::GetVideoMemoryUsageStats(size_t& vidMemUsedThisFrame, size_t& vidMemUsedRecently, bool bGetPoolsSizes)
-{
-    if (bGetPoolsSizes)
-    {
-        vidMemUsedThisFrame = vidMemUsedRecently = (GetTexturesStreamPoolSize() + CV_r_rendertargetpoolsize) * 1024 * 1024;
-    }
-    else
-    {
-        assert(!"CD3D9Renderer::GetVideoMemoryUsageStats() not implemented for this platform yet!");
-        vidMemUsedThisFrame = vidMemUsedRecently = 0;
-    }
-}
-
-//===========================================================================================
-
-HRESULT CALLBACK CD3D9Renderer::OnD3D11CreateDevice(D3DDevice* pd3dDevice)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    CD3D9Renderer* rd = gcpRendD3D;
-    rd->m_Device = pd3dDevice;
-
-#if defined(SUPPORT_DEVICE_INFO)
-    rd->m_DeviceContext = rd->m_devInfo.Context();
-#endif
-    rd->m_Features |= RFT_OCCLUSIONQUERY | RFT_ALLOWANISOTROPIC | RFT_HW_SM20 | RFT_HW_SM2X | RFT_HW_SM30 | RFT_HW_SM40 | RFT_HW_SM50;
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-    rd->m_d3dDebug.Init(pd3dDevice);
-    rd->m_d3dDebug.Update(ESeverityCombination(CV_d3d11_debugMuteSeverity->GetIVal()), CV_d3d11_debugMuteMsgID->GetString(), CV_d3d11_debugBreakOnMsgID->GetString());
-    rd->m_bUpdateD3DDebug = false;
-#endif
-
-#if defined(SUPPORT_DEVICE_INFO)
-    rd->BindContextToThread(CryGetCurrentThreadId());
-
-    LARGE_INTEGER driverVersion;
-    driverVersion.LowPart = 0;
-    driverVersion.HighPart = 0;
-    rd->m_devInfo.Adapter()->CheckInterfaceSupport(__uuidof(ID3D10Device), &driverVersion);
-    iLog->Log ("D3D Adapter: Description: %ls", rd->m_devInfo.AdapterDesc().Description);
-    iLog->Log ("D3D Adapter: Driver version (UMD): %d.%02d.%02d.%04d", HIWORD(driverVersion.u.HighPart), LOWORD(driverVersion.u.HighPart), HIWORD(driverVersion.u.LowPart), LOWORD(driverVersion.u.LowPart));
-    iLog->Log ("D3D Adapter: VendorId = 0x%.4X", rd->m_devInfo.AdapterDesc().VendorId);
-    iLog->Log ("D3D Adapter: DeviceId = 0x%.4X", rd->m_devInfo.AdapterDesc().DeviceId);
-    iLog->Log ("D3D Adapter: SubSysId = 0x%.8X", rd->m_devInfo.AdapterDesc().SubSysId);
-    iLog->Log ("D3D Adapter: Revision = %i", rd->m_devInfo.AdapterDesc().Revision);
-
-    // Vendor-specific initializations and workarounds for driver bugs.
-    {
-        const DXGI_ADAPTER_DESC1& adapterDesc = rd->m_devInfo.AdapterDesc();
-
-        rd->m_adapterDescription = AZStd::string::format("%ls", adapterDesc.Description);
-
-        if (adapterDesc.VendorId == RenderCapabilities::s_gpuVendorIdAMD)
-        {
-            rd->m_Features |= RFT_HW_ATI;
-            iLog->Log ("D3D Detected: AMD video card");
-        }
-        else if (adapterDesc.VendorId == RenderCapabilities::s_gpuVendorIdNVIDIA)
-        {
-            rd->m_Features |= RFT_HW_NVIDIA;
-            iLog->Log ("D3D Detected: NVIDIA video card");
-        }
-        else if (adapterDesc.VendorId == RenderCapabilities::s_gpuVendorIdQualcomm)
-        {
-            rd->m_Features |= RFT_HW_QUALCOMM;
-            iLog->Log ("D3D Detected: Qualcomm video card");
-        }
-        else if (rd->m_devInfo.AdapterDesc().VendorId == RenderCapabilities::s_gpuVendorIdIntel)
-        {
-            rd->m_Features |= RFT_HW_INTEL;
-            iLog->Log ("D3D Detected: intel video card");
-        }
-        else if (rd->m_devInfo.AdapterDesc().VendorId == RenderCapabilities::s_gpuVendorIdARM)
-        {
-            rd->m_Features |= RFT_HW_ARM_MALI;
-            iLog->Log ("D3D Detected: ARM (MALI) video card");
-        }
-
-#if defined(OPENGL) && !defined(CRY_USE_METAL)
-        DXGLInitializeIHVSpecifix();
-#endif
-    }
-
-    rd->m_nGPUs = min(rd->m_nGPUs, (uint32)MAX_GPU_NUM);
-#endif
-
-    CryLogAlways("Active GPUs: %i", rd->m_nGPUs);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_11
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    rd->m_NumResourceSlots = D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT;
-    rd->m_NumSamplerSlots = D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT;
-    rd->m_MaxAnisotropyLevel = min(D3D11_REQ_MAXANISOTROPY, CRenderer::CV_r_texmaxanisotropy);
-#endif
-
-#if defined(WIN32) || defined(WIN64)
-    HWND hWndDesktop = GetDesktopWindow();
-    HDC dc = GetDC(hWndDesktop);
-    uint16 gamma[3][256];
-    if (GetDeviceGammaRamp(dc, gamma))
-    {
-        rd->m_Features |= RFT_HWGAMMA;
-    }
-    ReleaseDC(hWndDesktop, dc);
-#endif
-
-    // For safety, lots of drivers don't handle tiny texture sizes too tell.
-#if defined(SUPPORT_DEVICE_INFO) && !defined(CRY_USE_METAL)
-    rd->m_MaxTextureMemory = rd->m_devInfo.AdapterDesc().DedicatedVideoMemory;
-#else
-    rd->m_MaxTextureMemory = 256 * 1024 * 1024;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_12
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#elif defined(IOS)
-    rd->m_MaxTextureMemory = 1024 * 1024 * 1024;
-#endif
-#endif
-    if (CRenderer::CV_r_TexturesStreamPoolSize <= 0)
-    {
-        CRenderer::CV_r_TexturesStreamPoolSize = (int)(rd->m_MaxTextureMemory / 1024.0f / 1024.0f * 0.75f);
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_13
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    rd->m_MaxTextureSize = D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION;
-    rd->m_bDeviceSupportsInstancing = true;
-#endif
-
-    rd->m_bDeviceSupportsVertexTexture = (rd->m_Features & RFT_HW_SM30);
-    if (rd->m_bDeviceSupportsVertexTexture != 0)
-    {
-        rd->m_Features |= RFT_HW_VERTEXTEXTURES;
-    }
-
-#if defined(CRY_USE_METAL) || (defined(OPENGL_ES))
-    // METAL Supports R32 RTs but it doesn't support blending for it. Cryengine uses blending to fix up depth.
-    // Disable R32 RT for metal for now.
-    // Qualcomm's OpenGL ES 3.0 driver does not support R32F render targets.  Disabling for all OpenGL ES 3.0 versions for the time being.
-    // When bound as a render target, we get this error:
-    // W/Adreno-ES20(12623): <validate_render_targets:444>: GL_INVALID_OPERATION
-
-    //R32 depth render targets are showing instability on Mali GPUs. For stability reasons we are forcing R16 render targets across all Android devices.
-    rd->m_bDeviceSupportsR32FRendertarget = false;
-#else
-    rd->m_bDeviceSupportsR32FRendertarget = true;
-#endif
-
-#if defined(CRY_USE_METAL) || defined(OPENGL)
-    D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS computeShadersSupport;
-    HRESULT result = rd->GetDevice().CheckFeatureSupport(D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &computeShadersSupport, sizeof(computeShadersSupport));
-    if (result == S_OK && computeShadersSupport.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x == TRUE)
-    {
-        rd->m_Features |= RFT_COMPUTE_SHADERS;
-    }
-#else
-    rd->m_Features |= RFT_COMPUTE_SHADERS;
-#endif
-
-    if (RenderCapabilities::SupportsStructuredBuffer(EShaderStage_Vertex))
-    {
-        rd->m_Features |= RFT_HW_VERTEX_STRUCTUREDBUF;
-    }
-
-#if defined(DIRECT3D10) && !defined(OPENGL_ES) && !defined(CRY_USE_METAL)
-    rd->m_bDeviceSupportsGeometryShaders = (rd->m_Features & RFT_HW_SM40) != 0;
-#else
-    rd->m_bDeviceSupportsGeometryShaders = false;
-#endif
-
-#if defined(DIRECT3D10) && !defined(OPENGL) && !defined(CRY_USE_METAL)
-    rd->m_bDeviceSupportsTessellation = (rd->m_Features & RFT_HW_SM50) != 0;
-#else
-    rd->m_bDeviceSupportsTessellation = false;
-#endif
-
-    rd->m_Features |= RFT_OCCLUSIONTEST;
-
-    rd->m_bUseWaterTessHW = CV_r_WaterTessellationHW != 0 && rd->m_bDeviceSupportsTessellation;
-
-    PREFAST_SUPPRESS_WARNING(6326); //not a constant vs constant comparison on Win32/Win64
-    rd->m_bUseSilhouettePOM = CV_r_SilhouettePOM != 0;
-    rd->m_bUseSpecularAntialiasing = CV_r_SpecularAntialiasing != 0;
-    CV_r_DeferredShadingAmbientSClear = !(rd->m_Features & RFT_HW_NVIDIA) ? 0 : CV_r_DeferredShadingAmbientSClear;
-
-    // Handle the texture formats we need.
-    {
-        // Find the needed texture formats.
-        rd->m_hwTexFormatSupport.CheckFormatSupport();
-
-        rd->m_bDeviceSupportsFP16Separate = false;
-        rd->m_bDeviceSupportsFP16Filter = true;
-
-#ifdef CRY_USE_METAL
-        rd->m_FormatPVRTC2.CheckSupport(DXGI_FORMAT_PVRTC2_UNORM, "PVRTC2");
-        rd->m_FormatPVRTC4.CheckSupport(DXGI_FORMAT_PVRTC4_UNORM, "PVRTC4");
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-        rd->m_FormatASTC_4x4.CheckSupport(DXGI_FORMAT_ASTC_4x4_UNORM, "ASTC_4x4");
-        rd->m_FormatASTC_5x4.CheckSupport(DXGI_FORMAT_ASTC_5x4_UNORM, "ASTC_5x4");
-        rd->m_FormatASTC_5x5.CheckSupport(DXGI_FORMAT_ASTC_5x5_UNORM, "ASTC_5x5");
-        rd->m_FormatASTC_6x5.CheckSupport(DXGI_FORMAT_ASTC_6x5_UNORM, "ASTC_6x5");
-        rd->m_FormatASTC_6x6.CheckSupport(DXGI_FORMAT_ASTC_6x6_UNORM, "ASTC_6x6");
-        rd->m_FormatASTC_8x5.CheckSupport(DXGI_FORMAT_ASTC_8x5_UNORM, "ASTC_8x5");
-        rd->m_FormatASTC_8x6.CheckSupport(DXGI_FORMAT_ASTC_8x6_UNORM, "ASTC_8x6");
-        rd->m_FormatASTC_8x8.CheckSupport(DXGI_FORMAT_ASTC_8x8_UNORM, "ASTC_8x8");
-        rd->m_FormatASTC_10x5.CheckSupport(DXGI_FORMAT_ASTC_10x5_UNORM, "ASTC_10x5");
-        rd->m_FormatASTC_10x6.CheckSupport(DXGI_FORMAT_ASTC_10x6_UNORM, "ASTC_10x6");
-        rd->m_FormatASTC_10x8.CheckSupport(DXGI_FORMAT_ASTC_10x8_UNORM, "ASTC_10x8");
-        rd->m_FormatASTC_10x10.CheckSupport(DXGI_FORMAT_ASTC_10x10_UNORM, "ASTC_10x10");
-        rd->m_FormatASTC_12x10.CheckSupport(DXGI_FORMAT_ASTC_12x10_UNORM, "ASTC_12x10");
-        rd->m_FormatASTC_12x12.CheckSupport(DXGI_FORMAT_ASTC_12x12_UNORM, "ASTC_12x12");
-#endif
-
-        if (rd->m_hwTexFormatSupport.m_FormatBC1.IsValid() || rd->m_hwTexFormatSupport.m_FormatBC2.IsValid() || rd->m_hwTexFormatSupport.m_FormatBC3.IsValid())
-        {
-            rd->m_Features |= RFT_COMPRESSTEXTURE;
-        }
-    }
-
-    rd->m_Features |= RFT_HW_HDR;
-
-    rd->m_nHDRType = 1;
-
-    rd->m_FullResRect.right = rd->m_width;
-    rd->m_FullResRect.bottom = rd->m_height;
-
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX) || defined(CREATE_DEVICE_ON_MAIN_THREAD)
-    rd->m_pRT->RC_SetViewport(0, 0, rd->m_width, rd->m_height);
-#else
-    rd->RT_SetViewport(0, 0, rd->m_width, rd->m_height);
-#endif
-    rd->m_MainViewport.nX = 0;
-    rd->m_MainViewport.nY = 0;
-    rd->m_MainViewport.nWidth = rd->m_width;
-    rd->m_MainViewport.nHeight = rd->m_height;
-
-    return S_OK;
-}
-
-HRESULT CALLBACK CD3D9Renderer::OnD3D11PostCreateDevice(D3DDevice* pd3dDevice)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    CD3D9Renderer* rd = gcpRendD3D;
-    HRESULT hr;
-
-#if defined(SUPPORT_DEVICE_INFO)
-    rd->BindContextToThread(CryGetCurrentThreadId());
-    rd->m_DeviceContext = rd->m_devInfo.Context();
-
-    rd->m_pBackBuffer = rd->m_devInfo.BackbufferRTV();
-    rd->m_pBackBuffers = rd->m_devInfo.BackbufferRTVs();
-    rd->m_pSwapChain = rd->m_devInfo.SwapChain();
-    rd->m_pCurrentBackBufferIndex = rd->GetCurrentBackBufferIndex(rd->m_pSwapChain);
-#endif
-
-    void* pBackBuf;
-    hr = rd->m_pSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), &pBackBuf);
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-    ID3D11Texture2D* pBackBuffer = (ID3D11Texture2D*)pBackBuf;
-    D3D11_TEXTURE2D_DESC backBufferSurfaceDesc;
-    pBackBuffer->GetDesc(&backBufferSurfaceDesc);
-    ZeroMemory(&rd->m_d3dsdBackBuffer, sizeof(DXGI_SURFACE_DESC));
-    rd->m_d3dsdBackBuffer.Width = (UINT) backBufferSurfaceDesc.Width;
-    rd->m_d3dsdBackBuffer.Height = (UINT) backBufferSurfaceDesc.Height;
-#if defined(SUPPORT_DEVICE_INFO)
-    rd->m_d3dsdBackBuffer.Format = backBufferSurfaceDesc.Format;
-    rd->m_d3dsdBackBuffer.SampleDesc = backBufferSurfaceDesc.SampleDesc;
-    rd->m_ZFormat = rd->m_devInfo.AutoDepthStencilFmt();
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_14
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-    SAFE_RELEASE(pBackBuffer);
-
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-
-    // Collect depth stencil parameters
-    D3D11_TEXTURE2D_DESC dsTextureDesc;
-    dsTextureDesc.MipLevels = 1;
-    dsTextureDesc.ArraySize = 1;
-    dsTextureDesc.Format = rd->m_ZFormat;
-    dsTextureDesc.SampleDesc = rd->m_d3dsdBackBuffer.SampleDesc;
-    dsTextureDesc.Usage = D3D11_USAGE_DEFAULT;
-    dsTextureDesc.BindFlags = D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE;
-    dsTextureDesc.CPUAccessFlags = 0;
-    dsTextureDesc.MiscFlags = 0;
-    D3D11_DEPTH_STENCIL_VIEW_DESC dsViewDesc;
-    dsViewDesc.Format = CTexture::ConvertToDepthStencilFmt(dsTextureDesc.Format);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_15
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    dsViewDesc.Flags = 0;
-#endif
-    dsViewDesc.ViewDimension = dsTextureDesc.SampleDesc.Count > 1 ? D3D11_DSV_DIMENSION_TEXTURE2DMS : D3D11_DSV_DIMENSION_TEXTURE2D;
-    dsViewDesc.Texture2D.MipSlice = 0;
-
-    const float clearDepth = CRenderer::CV_r_ReverseDepth ? 0.f : 1.f;
-    const uint clearStencil = 1;
-    const FLOAT clearValues[4] = { clearDepth, FLOAT(clearStencil) };
-
-    int nDepthBufferWidth = rd->IsEditorMode() ? rd->m_d3dsdBackBuffer.Width : rd->m_width;
-    int nDepthBufferHeight = rd->IsEditorMode() ? rd->m_d3dsdBackBuffer.Height : rd->m_height;
-
-    // Create the depth stencil buffer for scene rendering
-    SAFE_RELEASE(rd->m_pZTexture);
-    SAFE_RELEASE(rd->m_pZBuffer);
-    dsTextureDesc.Width  = nDepthBufferWidth;
-    dsTextureDesc.Height = nDepthBufferHeight;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_16
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-    hr = rd->m_DevMan.CreateD3D11Texture2D(&dsTextureDesc, clearValues, NULL, &rd->m_pZTexture, "DepthBuffer");
-    if (FAILED(hr))
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_17
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-        return hr;
-    }
-    hr = rd->GetDevice().CreateDepthStencilView(rd->m_pZTexture, &dsViewDesc, &rd->m_pZBuffer);
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-    rd->GetDeviceContext().ClearDepthStencilView(rd->m_pZBuffer, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, clearDepth, clearStencil);
-
-    // Create the native resolution depth stencil buffer for overlay rendering if needed
-    SAFE_RELEASE(rd->m_pNativeZTexture);
-    SAFE_RELEASE(rd->m_pNativeZBuffer);
-    if (!rd->IsEditorMode() && (gcpRendD3D->GetOverlayWidth() != dsTextureDesc.Width || gcpRendD3D->GetOverlayHeight() != dsTextureDesc.Height))
-    {
-        dsTextureDesc.Width  = gcpRendD3D->GetOverlayWidth();
-        dsTextureDesc.Height = gcpRendD3D->GetOverlayHeight();
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_18
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-        hr = rd->m_DevMan.CreateD3D11Texture2D(&dsTextureDesc, clearValues, NULL, &rd->m_pNativeZTexture, "DepthBuffer");
-        if (FAILED(hr))
-        {
-            return hr;
-        }
-        hr = rd->GetDevice().CreateDepthStencilView(rd->m_pNativeZTexture, &dsViewDesc, &rd->m_pNativeZBuffer);
-        if (FAILED(hr))
-        {
-            return hr;
-        }
-        rd->GetDeviceContext().ClearDepthStencilView(rd->m_pNativeZBuffer, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, clearDepth, clearStencil);
-    }
-    else
-    {
-        rd->m_pNativeZTexture = rd->m_pZTexture;
-        rd->m_pNativeZBuffer = rd->m_pZBuffer;
-        rd->m_pNativeZTexture->AddRef();
-        rd->m_pNativeZBuffer->AddRef();
-    }
-    rd->m_DepthBufferOrig.pTex = nullptr;
-    rd->m_DepthBufferOrig.pTarget = rd->m_pZTexture;
-    rd->m_DepthBufferOrig.pSurf = rd->m_pZBuffer;
-    rd->m_pZBuffer->AddRef();
-    
-    rd->m_DepthBufferOrigMSAA.pTex = nullptr;
-    rd->m_DepthBufferOrigMSAA.pTarget = rd->m_pZTexture;
-    rd->m_DepthBufferOrigMSAA.pSurf = rd->m_pZBuffer;
-    rd->m_pZBuffer->AddRef();
-    
-    rd->m_DepthBufferNative.pTex = nullptr;
-    rd->m_DepthBufferNative.pTarget = rd->m_pNativeZTexture;
-    rd->m_DepthBufferNative.pSurf = rd->m_pNativeZBuffer;
-    rd->m_pNativeZBuffer->AddRef();
-
-    rd->m_nRTStackLevel[0] = 0;
-    if (rd->m_d3dsdBackBuffer.Width == rd->m_nativeWidth && rd->m_d3dsdBackBuffer.Height == rd->m_nativeHeight)
-    {
-        rd->m_RTStack[0][0].m_pDepth = rd->m_pNativeZBuffer;
-        rd->m_RTStack[0][0].m_pSurfDepth = &rd->m_DepthBufferNative;
-    }
-    else
-    {
-        rd->m_RTStack[0][0].m_pDepth = NULL;
-        rd->m_RTStack[0][0].m_pSurfDepth = NULL;
-    }
-    rd->m_RTStack[0][0].m_pTarget = rd->m_pBackBuffer;
-    rd->m_RTStack[0][0].m_Width = rd->m_d3dsdBackBuffer.Width;
-    rd->m_RTStack[0][0].m_Height = rd->m_d3dsdBackBuffer.Height;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_19
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    rd->m_RTStack[0][0].m_bScreenVP = false;
-#endif
-    rd->m_RTStack[0][0].m_bWasSetRT = false;
-    rd->m_RTStack[0][0].m_bWasSetD = false;
-    rd->m_nMaxRT2Commit = 0;
-    rd->m_pNewTarget[0] = &rd->m_RTStack[0][0];
-    rd->FX_SetActiveRenderTargets();
-
-    for (int i = 0; i < RT_STACK_WIDTH; i++)
-    {
-        rd->m_pNewTarget[i] = &rd->m_RTStack[i][0];
-        rd->m_pCurTarget[i] = rd->m_pNewTarget[0]->m_pTex;
-    }
-
-    rd->m_DepthBufferOrig.nWidth = nDepthBufferWidth;
-    rd->m_DepthBufferOrig.nHeight = nDepthBufferHeight;
-    rd->m_DepthBufferOrig.bBusy = true;
-    rd->m_DepthBufferOrig.nFrameAccess = -2;
-
-    rd->m_DepthBufferOrigMSAA.nWidth = nDepthBufferWidth;
-    rd->m_DepthBufferOrigMSAA.nHeight = nDepthBufferHeight;
-    rd->m_DepthBufferOrigMSAA.bBusy = true;
-    rd->m_DepthBufferOrigMSAA.nFrameAccess = -2;
-
-    rd->m_DepthBufferNative.nWidth = rd->m_nativeWidth;
-    rd->m_DepthBufferNative.nHeight = rd->m_nativeHeight;
-    rd->m_DepthBufferNative.bBusy = true;
-    rd->m_DepthBufferNative.nFrameAccess = -2;
-
-    SAFE_RELEASE(rd->m_RP.m_MSAAData.m_pDepthTex);
-    SAFE_RELEASE(rd->m_RP.m_MSAAData.m_pZBuffer);
-
-    rd->CreateMSAADepthBuffer();
-
-    // Create shader bindable depthstencil buffer view and shader resource view. Ideally would be unified into regular texture creation - requires big refactoring
-    SAFE_RELEASE(rd->m_pZBufferReadOnlyDSV);
-    SAFE_RELEASE(rd->m_pZBufferDepthReadOnlySRV);
-    SAFE_RELEASE(rd->m_pZBufferStencilReadOnlySRV);
-    D3DTexture* pDepthStencil = rd->m_DepthBufferOrigMSAA.pTarget;
-    D3D11_TEXTURE2D_DESC descDepthStencil;
-    pDepthStencil->GetDesc(&descDepthStencil);
-
-#if defined(SUPPORT_DEVICE_INFO)
-    if (rd->DevInfo().FeatureLevel() >= D3D_FEATURE_LEVEL_11_0) // Read-only depth-stencil supported on 11.0 feature level and above, leave NULL otherwise resulting in no testing
-#endif //defined(SUPPORT_DEVICE_INFO)
-    {
-        D3D11_DEPTH_STENCIL_VIEW_DESC descDSV;
-        ZeroStruct(descDSV);
-        descDSV.Format = CTexture::ConvertToDepthStencilFmt(descDepthStencil.Format);
-        descDSV.Flags = D3D11_DSV_READ_ONLY_DEPTH | D3D11_DSV_READ_ONLY_STENCIL;
-        descDSV.ViewDimension = (descDepthStencil.SampleDesc.Count > 1) ? D3D11_DSV_DIMENSION_TEXTURE2DMS : D3D11_DSV_DIMENSION_TEXTURE2D;
-        descDSV.Texture2D.MipSlice = 0;
-        hr = rd->GetDevice().CreateDepthStencilView(pDepthStencil, &descDSV, &rd->m_pZBufferReadOnlyDSV);
-        assert(SUCCEEDED(hr));
-    }
-
-    D3DFormat nDepthStencilFormatTypeless = descDepthStencil.Format;
-    if (!CTexture::IsDeviceFormatTypeless(nDepthStencilFormatTypeless))
-    {
-        nDepthStencilFormatTypeless = CTexture::ConvertToTypelessFmt(nDepthStencilFormatTypeless);
-    }
-
-    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
-    ZeroStruct(SRVDesc);
-    SRVDesc.Format = CTexture::ConvertToShaderResourceFmt(nDepthStencilFormatTypeless);
-    SRVDesc.ViewDimension = (descDepthStencil.SampleDesc.Count > 1) ? D3D11_SRV_DIMENSION_TEXTURE2DMS : D3D11_SRV_DIMENSION_TEXTURE2D;
-    SRVDesc.Texture2D.MipLevels = 1;
-    hr = rd->GetDevice().CreateShaderResourceView(pDepthStencil, &SRVDesc, &rd->m_pZBufferDepthReadOnlySRV);
-    assert(SUCCEEDED(hr));
-
-    if (RenderCapabilities::SupportsStencilTextures())
-    {
-        SRVDesc.Format = CTexture::ConvertToStencilFmt(nDepthStencilFormatTypeless);
-        hr = rd->GetDevice().CreateShaderResourceView(pDepthStencil, &SRVDesc, &rd->m_pZBufferStencilReadOnlySRV);
-        assert(SUCCEEDED(hr));
-    }
-
-#if !defined(_RELEASE)
-#if defined(WIN32)
-#define D3DSYSTEM_CPP_USE_PRIVATEDATA
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_20
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#endif
-
-#if defined(D3DSYSTEM_CPP_USE_PRIVATEDATA)
-    if (rd->m_pZTexture)
-    {
-        AZStd::string dsvName("$MainDepthStencil");
-        rd->m_pZTexture->SetPrivateData(WKPDID_D3DDebugObjectName, dsvName.length(), dsvName.c_str());
-    }
-
-    if (rd->m_pZBuffer)
-    {
-        AZStd::string srvName("[DSV] $MainDepthStencil");
-        rd->m_pZBuffer->SetPrivateData(WKPDID_D3DDebugObjectName, srvName.length(), srvName.c_str());
-    }
-
-    if (rd->m_pZBufferReadOnlyDSV)
-    {
-        AZStd::string srvName("[DSV] $MainDepthStencil - Read Only");
-        rd->m_pZBufferReadOnlyDSV->SetPrivateData(WKPDID_D3DDebugObjectName, srvName.length(), srvName.c_str());
-    }
-
-    if (rd->m_pZBufferDepthReadOnlySRV)
-    {
-        AZStd::string srvName("[SRV] $MainDepthStencil - Depth Read Only");
-        rd->m_pZBufferDepthReadOnlySRV->SetPrivateData(WKPDID_D3DDebugObjectName, srvName.length(), srvName.c_str());
-    }
-
-    if (rd->m_pZBufferStencilReadOnlySRV)
-    {
-        AZStd::string srvName("[SRV] $MainDepthStencil - Stencil Read Only");
-        rd->m_pZBufferStencilReadOnlySRV->SetPrivateData(WKPDID_D3DDebugObjectName, srvName.length(), srvName.c_str());
-    }
-#endif
-
-    rd->ReleaseAuxiliaryMeshes();
-    rd->CreateAuxiliaryMeshes();
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DSYSTEM_CPP_SECTION_21
-    #include AZ_RESTRICTED_FILE(D3DSystem_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    D3D11_QUERY_DESC QDesc;
-    QDesc.Query = D3D11_QUERY_EVENT;
-    QDesc.MiscFlags = 0;
-    for (int i = 0; i < 2; ++i)
-    {
-        hr = pd3dDevice->CreateQuery(&QDesc, &rd->m_pQuery[i]);
-        assert(hr == S_OK && rd->m_pQuery[i]);
-        rd->GetDeviceContext().End(rd->m_pQuery[i]);
-    }
-#endif
-    rd->EF_Restore();
-
-    rd->m_bDeviceLost = 0;
-    rd->m_pLastVDeclaration = NULL;
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (rd->m_pRenderAuxGeomD3D && FAILED(hr = rd->m_pRenderAuxGeomD3D->RestoreDeviceObjects()))
-    {
-        return hr;
-    }
-#endif
-
-    CHWShader_D3D::mfSetGlobalParams();
-
-    if (rd->m_OcclQueries.capacity())
-    {
-        for (int a = 0; a < MAX_OCCL_QUERIES; a++)
-        {
-            rd->m_OcclQueries[a].Release();
-        }
-    }
-
-    {
-        LOADING_TIME_PROFILE_SECTION_NAMED("CD3D9Renderer::OnD3D10PostCreateDevice(): m_OcclQueries");
-        rd->m_OcclQueries.Reserve(MAX_OCCL_QUERIES);
-        // Lazy initialization on Android due to limited number of queries that we can create.
-        // TODO Linux - This was crashing on Ubuntu, investigate
-#if !defined(AZ_PLATFORM_ANDROID) && !defined(AZ_PLATFORM_LINUX)
-        for (int a = 0; a < MAX_OCCL_QUERIES; a++)
-        {
-            rd->m_OcclQueries[a].Create();
-        }
-#endif
-    }
-
-
-    return S_OK;
-}
-
-#if defined(WIN32)
-// Renderer looks for multi-monitor setup changes and fullscreen key combination
-bool CD3D9Renderer::HandleMessage([[maybe_unused]] HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, [[maybe_unused]] LRESULT* pResult)
-{
-    switch (message)
-    {
-    case WM_DISPLAYCHANGE:
-    case WM_DEVICECHANGE:
-    {
-        // Count the number of connected display devices
-        bool bHaveMonitorsChanged = true;
-        uint connectedMonitors = 0;
-        EnumDisplayMonitors(NULL, NULL, CountConnectedMonitors, reinterpret_cast<LPARAM>(&connectedMonitors));
-
-        // Check for changes
-        if (connectedMonitors > m_nConnectedMonitors)
-        {
-            iSystem->GetILog()->LogAlways("[Renderer] A display device has been connected to the system");
-        }
-        else if (connectedMonitors < m_nConnectedMonitors)
-        {
-            iSystem->GetILog()->LogAlways("[Renderer] A display device has been disconnected from the system");
-        }
-        else
-        {
-            bHaveMonitorsChanged = false;
-        }
-
-        // Update state
-        m_nConnectedMonitors = connectedMonitors;
-        m_bDisplayChanged = bHaveMonitorsChanged;
-    }
-    break;
-
-    case WM_SYSKEYDOWN:
-    {
-        const bool bAlt = (lParam & (1 << 29)) != 0;
-        if (wParam == VK_RETURN && bAlt)     // ALT+ENTER
-        {
-            ICVar* pVar = iConsole->GetCVar("r_fullscreen");
-            if (pVar)
-            {
-                int fullscreen = pVar->GetIVal();
-                pVar->Set((int)(fullscreen == 0));     // Toggle CVar
-            }
-        }
-    }
-    break;
-    }
-    return false;
-}
-#endif // defined(WIN32)
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-static const char* GetScanlineOrderNaming(DXGI_MODE_SCANLINE_ORDER v)
-{
-    switch (v)
-    {
-    case DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE:
-        return "progressive";
-    case DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST:
-        return "interlaced (upper field first)";
-    case DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST:
-        return "interlaced (lower field first)";
-    default:
-        return "unspecified";
-    }
-}
-
-void UserOverrideDisplayProperties(DXGI_MODE_DESC& desc)
-{
-    if (gRenDev->m_CVFullScreen->GetIVal())
-    {
-        if (gRenDev->CV_r_overrideRefreshRate > 0)
-        {
-            DXGI_RATIONAL& refreshRate = desc.RefreshRate;
-            if (refreshRate.Denominator)
-            {
-                gEnv->pLog->Log("Overriding refresh rate to %.2f Hz (was %.2f Hz).", (float)gRenDev->CV_r_overrideRefreshRate, (float)refreshRate.Numerator / (float)refreshRate.Denominator);
-            }
-            else
-            {
-                gEnv->pLog->Log("Overriding refresh rate to %.2f Hz (was undefined).", (float)gRenDev->CV_r_overrideRefreshRate);
-            }
-            refreshRate.Numerator = (unsigned int) (gRenDev->CV_r_overrideRefreshRate * 1000.0f);
-            refreshRate.Denominator = 1000;
-        }
-
-        if (gRenDev->CV_r_overrideScanlineOrder > 0)
-        {
-            DXGI_MODE_SCANLINE_ORDER old = desc.ScanlineOrdering;
-            DXGI_MODE_SCANLINE_ORDER& so = desc.ScanlineOrdering;
-            switch (gRenDev->CV_r_overrideScanlineOrder)
-            {
-            case 2:
-                so = DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST;
-                break;
-            case 3:
-                so = DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST;
-                break;
-            default:
-                so = DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE;
-                break;
-            }
-            gEnv->pLog->Log("Overriding scanline order to %s (was %s).", GetScanlineOrderNaming(so), GetScanlineOrderNaming(old));
-        }
-    }
-}
-#endif
-
-
-#include "DeviceInfo.inl"
-
-
-void EnableCloseButton([[maybe_unused]] void* hWnd, [[maybe_unused]] bool enabled)
-{
-#if defined(WIN32) || defined(WIN64)
-    if (hWnd)
-    {
-        HMENU hMenu = GetSystemMenu((HWND) hWnd, FALSE);
-        if (hMenu)
-        {
-            const unsigned int flags = enabled ? MF_ENABLED : (MF_DISABLED | MF_GRAYED);
-            EnableMenuItem(hMenu, SC_CLOSE, MF_BYCOMMAND | flags);
-        }
-    }
-#endif
-}
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-string D3DDebug_GetLastMessage()
-{
-    return gcpRendD3D->m_d3dDebug.GetLastMessage();
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTexture.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DTexture.cpp
deleted file mode 100644
index 2e674b89bc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTexture.cpp
+++ /dev/null
@@ -1,5253 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Direct3D specific texture manager implementation.
-
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "StringUtils.h"
-#include <ImageExtensionHelper.h>
-#include "BitFiddling.h"        // ConvertBlock3DcToDXT5()
-#include "D3DStereo.h"
-#include "../Common/PostProcess/PostProcessUtils.h"
-#include "D3DPostProcess.h"
-#include "../Common/Textures/TextureHelpers.h"
-#include "../Common/Textures/TextureManager.h"
-#include "../Common/RenderCapabilities.h"
-#include <AzCore/Debug/AssetTracking.h>
-#include <Common/Memory/VRAMDrillerBus.h>
-
-#undef min
-#undef max
-//===============================================================================
-namespace {
-    void SetShaderResourceViewDesc(const SResourceView& rv, uint32 texType, D3DFormat format, int arraySize, uint32 nSliceCount, D3D11_SHADER_RESOURCE_VIEW_DESC& desc)
-    {
-        const uint nMipCount = rv.m_Desc.nMipCount == SResourceView().m_Desc.nMipCount ? (uint) - 1 : (uint)rv.m_Desc.nMipCount;
-        ZeroStruct(desc);
-        desc.Format = CTexture::ConvertToShaderResourceFmt(format);
-        if (rv.m_Desc.bSrgbRead)
-        {
-            desc.Format = CTexture::ConvertToSRGBFmt(desc.Format);
-        }
-        switch (texType)
-        {
-        case eTT_1D:
-            if (arraySize > 1)
-            {
-                desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY;
-                desc.Texture1DArray.MostDetailedMip = rv.m_Desc.nMostDetailedMip;
-                desc.Texture1DArray.MipLevels = nMipCount;
-                desc.Texture1DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                desc.Texture1DArray.ArraySize = nSliceCount;
-            }
-            else
-            {
-                desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D;
-                desc.Texture1D.MostDetailedMip = rv.m_Desc.nMostDetailedMip;
-                desc.Texture1D.MipLevels = nMipCount;
-            }
-            break;
-        case eTT_2D:
-            if (arraySize > 1)
-            {
-                if (rv.m_Desc.bMultisample)
-                {
-                    desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
-                    desc.Texture2DMSArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                    desc.Texture2DMSArray.ArraySize = nSliceCount;
-                }
-                else
-                {
-                    desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
-                    desc.Texture2DArray.MostDetailedMip = rv.m_Desc.nMostDetailedMip;
-                    desc.Texture2DArray.MipLevels = nMipCount;
-                    desc.Texture2DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                    desc.Texture2DArray.ArraySize = nSliceCount;
-                }
-            }
-            else
-            {
-                if (rv.m_Desc.bMultisample)
-                {
-                    desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
-                }
-                else
-                {
-                    desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-                    desc.Texture2D.MostDetailedMip = rv.m_Desc.nMostDetailedMip;
-                    desc.Texture2D.MipLevels = nMipCount;
-                }
-            }
-            break;
-        case eTT_3D:
-            desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
-            desc.Texture3D.MostDetailedMip = rv.m_Desc.nMostDetailedMip;
-            desc.Texture3D.MipLevels = nMipCount;
-            break;
-        case eTT_Cube:
-            desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
-            desc.TextureCube.MostDetailedMip = rv.m_Desc.nMostDetailedMip;
-            desc.TextureCube.MipLevels = nMipCount;
-            break;
-        }
-    }
-
-    void SetRenderTargetViewDesc(const SResourceView& rv, uint32 texType, D3DFormat format, int arraySize, uint32 nSliceCount, D3D11_RENDER_TARGET_VIEW_DESC& rtvDesc)
-    {
-        ZeroStruct(rtvDesc);
-        rtvDesc.Format = format;
-
-        switch (texType)
-        {
-        case eTT_1D:
-            if (arraySize > 1)
-            {
-                rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1DARRAY;
-                rtvDesc.Texture1DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-                rtvDesc.Texture1DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                rtvDesc.Texture1DArray.ArraySize = nSliceCount;
-            }
-            else
-            {
-                rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1D;
-                rtvDesc.Texture1D.MipSlice = rv.m_Desc.nMostDetailedMip;
-            }
-            break;
-        case eTT_2D:
-            if (arraySize > 1)
-            {
-                if (rv.m_Desc.bMultisample)
-                {
-                    rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY;
-                    rtvDesc.Texture2DMSArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                    rtvDesc.Texture2DMSArray.ArraySize = nSliceCount;
-                }
-                else
-                {
-                    rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
-                    rtvDesc.Texture2DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-                    rtvDesc.Texture2DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                    rtvDesc.Texture2DArray.ArraySize = nSliceCount;
-                }
-            }
-            else
-            {
-                if (rv.m_Desc.bMultisample)
-                {
-                    rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS;
-                }
-                else
-                {
-                    rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
-                    rtvDesc.Texture2D.MipSlice = rv.m_Desc.nMostDetailedMip;
-                }
-            }
-            break;
-        case eTT_3D:
-            rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D;
-            rtvDesc.Texture3D.MipSlice = rv.m_Desc.nMostDetailedMip;
-            rtvDesc.Texture3D.FirstWSlice = rv.m_Desc.nFirstSlice;
-            rtvDesc.Texture3D.WSize = nSliceCount;
-            break;
-        case eTT_Cube:
-            rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
-            rtvDesc.Texture2DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-            rtvDesc.Texture2DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-            rtvDesc.Texture2DArray.ArraySize = nSliceCount;
-            break;
-        }
-    }
-
-    void SetDepthStencilViewDesc(const SResourceView& rv, uint32 texType, D3DFormat format, int arraySize, uint32 nSliceCount, D3D11_DEPTH_STENCIL_VIEW_DESC& dsvDesc)
-    {
-        ZeroStruct(dsvDesc);
-        dsvDesc.Format = (DXGI_FORMAT)CTexture::ConvertToDepthStencilFmt(format);
-
-        switch (texType)
-        {
-        case eTT_1D:
-            if (arraySize > 1)
-            {
-                dsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1DARRAY;
-                dsvDesc.Texture1DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-                dsvDesc.Texture1DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                dsvDesc.Texture1DArray.ArraySize = nSliceCount;
-            }
-            else
-            {
-                dsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1D;
-                dsvDesc.Texture1D.MipSlice = rv.m_Desc.nMostDetailedMip;
-            }
-            break;
-        case eTT_2D:
-            if (arraySize > 1)
-            {
-                if (rv.m_Desc.bMultisample)
-                {
-                    dsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY;
-                    dsvDesc.Texture2DMSArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                    dsvDesc.Texture2DMSArray.ArraySize = nSliceCount;
-                }
-                else
-                {
-                    dsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
-                    dsvDesc.Texture2DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-                    dsvDesc.Texture2DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                    dsvDesc.Texture2DArray.ArraySize = nSliceCount;
-                }
-            }
-            else
-            {
-                if (rv.m_Desc.bMultisample)
-                {
-                    dsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMS;
-                }
-                else
-                {
-                    dsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
-                    dsvDesc.Texture2D.MipSlice = rv.m_Desc.nMostDetailedMip;
-                }
-            }
-            break;
-        case eTT_Cube:
-            {
-                dsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
-                dsvDesc.Texture2DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-                dsvDesc.Texture2DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                dsvDesc.Texture2DArray.ArraySize = nSliceCount;
-            }
-            break;
-        }
-    }
-
-    void SetUnorderedAccessViewDesc(const SResourceView& rv, uint32 texType, D3DFormat format, int arraySize, uint32 nSliceCount, D3D11_UNORDERED_ACCESS_VIEW_DESC& desc)
-    {
-        ZeroStruct(desc);
-        desc.Format = format;
-
-        switch (texType)
-        {
-        case eTT_1D:
-            if (arraySize > 1)
-            {
-                desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE1DARRAY;
-                desc.Texture1DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-                desc.Texture1DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                desc.Texture1DArray.ArraySize = nSliceCount;
-            }
-            else
-            {
-                desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE1D;
-                desc.Texture1D.MipSlice = rv.m_Desc.nMostDetailedMip;
-            }
-            break;
-        case eTT_2D:
-            if (arraySize > 1)
-            {
-                AZ_Assert(rv.m_Desc.bMultisample == 0, "No MSAA in UAV Array");
-                desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2DARRAY;
-                desc.Texture2DArray.MipSlice = rv.m_Desc.nMostDetailedMip;
-                desc.Texture2DArray.FirstArraySlice = rv.m_Desc.nFirstSlice;
-                desc.Texture2DArray.ArraySize = nSliceCount;
-            }
-            else
-            {
-                AZ_Assert(rv.m_Desc.bMultisample == 0, "No MSAA in UAV");
-                desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D;
-                desc.Texture2D.MipSlice = rv.m_Desc.nMostDetailedMip;
-            }
-            break;
-        case eTT_3D:
-            desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE3D;
-            desc.Texture3D.MipSlice = rv.m_Desc.nMostDetailedMip;
-            desc.Texture3D.FirstWSlice = rv.m_Desc.nFirstSlice;
-            desc.Texture3D.WSize = nSliceCount;
-            break;
-        }
-    }
-}
-
-RenderTargetData::~RenderTargetData()
-{
-    CDeviceTexture* pTexMSAA = (CDeviceTexture*)m_pDeviceTextureMSAA;
-    SAFE_RELEASE(pTexMSAA);
-
-    for (size_t i = 0; i < m_ResourceViews.size(); ++i)
-    {
-        const SResourceView& rv = m_ResourceViews[i];
-        switch (rv.m_Desc.eViewType)
-        {
-        case SResourceView::eShaderResourceView:
-        {
-            D3DShaderResourceView* pView = static_cast<D3DShaderResourceView*>(rv.m_pDeviceResourceView);
-            SAFE_RELEASE(pView);
-            break;
-        }
-        case SResourceView::eRenderTargetView:
-        {
-            D3DSurface* pView = static_cast<D3DSurface*>(rv.m_pDeviceResourceView);
-            SAFE_RELEASE(pView);
-            break;
-        }
-        case SResourceView::eDepthStencilView:
-        {
-            D3DDepthSurface* pView = static_cast<D3DDepthSurface*>(rv.m_pDeviceResourceView);
-            SAFE_RELEASE(pView);
-            break;
-        }
-        case SResourceView::eUnorderedAccessView:
-        {
-            D3DUnorderedAccessView* pView = static_cast<D3DUnorderedAccessView*>(rv.m_pDeviceResourceView);
-            SAFE_RELEASE(pView);
-            break;
-        }
-        default:
-            assert(false);
-        }
-    }
-}
-//===============================================================================
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DTEXTURE_CPP_SECTION_1 1
-#define D3DTEXTURE_CPP_SECTION_2 2
-#define D3DTEXTURE_CPP_SECTION_3 3
-#define D3DTEXTURE_CPP_SECTION_4 4
-#define D3DTEXTURE_CPP_SECTION_5 5
-#define D3DTEXTURE_CPP_SECTION_6 6
-#define D3DTEXTURE_CPP_SECTION_7 7
-#define D3DTEXTURE_CPP_SECTION_8 8
-#define D3DTEXTURE_CPP_SECTION_9 9
-#define D3DTEXTURE_CPP_SECTION_10 10
-#define D3DTEXTURE_CPP_SECTION_11 11
-#define D3DTEXTURE_CPP_SECTION_12 12
-#define D3DTEXTURE_CPP_SECTION_13 13
-#define D3DTEXTURE_CPP_SECTION_14 14
-#endif
-
-#if defined(TEXTURE_GET_SYSTEM_COPY_SUPPORT)
-byte* CTexture::Convert(const byte* sourceData, int nWidth, int nHeight, int sourceMipCount, ETEX_Format eTFSrc, ETEX_Format eTFDst, int& nOutSize, [[maybe_unused]] bool bLinear)
-{
-    nOutSize = 0;
-
-    DXGI_FORMAT DeviceFormatSRC = (DXGI_FORMAT)DeviceFormatFromTexFormat(eTFSrc);
-    DXGI_FORMAT DeviceFormatDST = (DXGI_FORMAT)DeviceFormatFromTexFormat(eTFDst);
-
-    if (DeviceFormatSRC == DXGI_FORMAT_UNKNOWN || DeviceFormatDST == DXGI_FORMAT_UNKNOWN || nWidth <= 0 || nHeight <= 0)
-    {
-        AZ_Assert(false, "Invalid parameters to CTexture::Convert");
-        return nullptr;
-    }
-
-    if (sourceMipCount <= 0)
-    {
-        sourceMipCount = 1;
-    }
-
-    int outputSize = 0;
-    byte* outputData = nullptr;
-
-    if (eTFSrc == eTF_BC5U && eTFDst == eTF_BC3)
-    {
-        int w = nWidth;
-        int h = nHeight;
-
-        outputSize = CTexture::TextureDataSize(w, h, 1, sourceMipCount, 1, eTF_BC3);
-        outputData = new byte[outputSize];
-
-        int nOffsDST = 0;
-        int nOffsSRC = 0;
-        for (int mip = 0; mip < sourceMipCount; mip++)
-        {
-            if (w <= 0)
-            {
-                w = 1;
-            }
-            if (h <= 0)
-            {
-                h = 1;
-            }
-
-            const void* outSrc = &sourceData[nOffsSRC];
-            DWORD outSize = CTexture::TextureDataSize(w, h, 1, 1, 1, eTFDst);
-
-            nOffsSRC += CTexture::TextureDataSize(w, h, 1, 1, 1, eTFSrc);
-
-            {
-                const byte* src = (const byte*)outSrc;
-
-                for (uint32 n = 0; n < outSize / 16; n++)           // for each block
-                {
-                    const uint8* srcDataBlock = &src[n * 16];
-                    uint8* outputDataBlock = &outputData[nOffsDST + n * 16];
-                    ConvertBlock3DcToDXT5(outputDataBlock, srcDataBlock);
-                }
-
-                nOffsDST += outSize;
-            }
-
-            w >>= 1;
-            h >>= 1;
-        }
-        nOutSize = outputSize;
-        return outputData;
-    }
-
-    outputSize = CTexture::TextureDataSize(nWidth, nHeight, 1, sourceMipCount, 1, eTFSrc);
-    outputData = new byte[outputSize];
-    memcpy(outputData, sourceData, outputSize);
-    nOutSize = outputSize;
-    return outputData;
-}
-#endif //#if defined(WIN32) || defined(WIN64)
-
-D3DSurface* CTexture::GetSurface(int nCMSide, int nLevel)
-{
-    if (!m_pDevTexture)
-    {
-        return NULL;
-    }
-
-    if (IsDeviceFormatTypeless(m_pPixelFormat->DeviceFormat))
-    {
-        iLog->Log("Error: CTexture::GetSurface: typeless formats can't be specified for RTVs, failed to create surface for the texture %s", GetSourceName());
-        return NULL;
-    }
-
-    SCOPED_RENDERER_ALLOCATION_NAME_HINT(GetSourceName());
-
-    HRESULT hr = S_OK;
-    D3DSurface* pTargSurf = m_pDeviceRTV;
-    const bool bUseMultisampledRTV = ((m_nFlags & FT_USAGE_MSAA) && m_bUseMultisampledRTV) != 0;
-    if (bUseMultisampledRTV)
-    {
-        pTargSurf = m_pDeviceRTVMS;
-    }
-
-    if (!pTargSurf)
-    {
-        int nMipLevel = 0;
-        int nSlice = 0;
-        int nSliceCount = -1;
-
-        if (m_eTT == eTT_Cube)
-        {
-            nMipLevel = (m_nFlags & FT_FORCE_MIPS) ? min((int)(m_nMips - 1), nLevel) : 0;
-            nSlice = nCMSide;
-            nSliceCount = 1;
-        }
-        pTargSurf = (D3DSurface*) CreateDeviceResourceView(SResourceView::RenderTargetView(m_eTFDst, nSlice, nSliceCount, nMipLevel, bUseMultisampledRTV));
-
-        if (bUseMultisampledRTV)
-        {
-            m_pDeviceRTVMS = pTargSurf;
-        }
-        else
-        {
-            m_pDeviceRTV = pTargSurf;
-        }
-    }
-    assert(hr == S_OK);
-
-    if (FAILED(hr))
-    {
-        pTargSurf = NULL;
-    }
-
-    return pTargSurf;
-}
-
-
-void CTexture::Readback(AZ::u32 subresourceIndex, StagingHook callback)
-{
-    if (m_pDevTexture)
-    {
-        m_pDevTexture->DownloadToStagingResource(subresourceIndex, callback);
-    }
-}
-
-//===============================================================================
-
-bool CTexture::IsDeviceFormatTypeless(D3DFormat nFormat)
-{
-    switch (nFormat)
-    {
-    //128 bits
-    case DXGI_FORMAT_R32G32B32A32_TYPELESS:
-    case DXGI_FORMAT_R32G32B32_TYPELESS:
-
-    //64 bits
-    case DXGI_FORMAT_R16G16B16A16_TYPELESS:
-    case DXGI_FORMAT_R32G32_TYPELESS:
-    case DXGI_FORMAT_R32G8X24_TYPELESS:
-    case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
-    case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
-
-    //32 bits
-    case DXGI_FORMAT_R10G10B10A2_TYPELESS:
-    case DXGI_FORMAT_R8G8B8A8_TYPELESS:
-    case DXGI_FORMAT_B8G8R8A8_TYPELESS:
-    case DXGI_FORMAT_B8G8R8X8_TYPELESS:
-    case DXGI_FORMAT_R16G16_TYPELESS:
-    case DXGI_FORMAT_R32_TYPELESS:
-    case DXGI_FORMAT_R24G8_TYPELESS:
-    case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
-    case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
-
-    //16 bits
-    case DXGI_FORMAT_R8G8_TYPELESS:
-    case DXGI_FORMAT_R16_TYPELESS:
-
-    //8 bits
-    case DXGI_FORMAT_R8_TYPELESS:
-
-    //block formats
-    case DXGI_FORMAT_BC1_TYPELESS:
-    case DXGI_FORMAT_BC2_TYPELESS:
-    case DXGI_FORMAT_BC3_TYPELESS:
-    case DXGI_FORMAT_BC4_TYPELESS:
-    case DXGI_FORMAT_BC5_TYPELESS:
-
-#if defined(OPENGL) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ETC2_TYPELESS:
-    case DXGI_FORMAT_ETC2A_TYPELESS:
-    case DXGI_FORMAT_EAC_R11_TYPELESS:
-    case DXGI_FORMAT_EAC_RG11_TYPELESS:
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    case DXGI_FORMAT_BC6H_TYPELESS:
-#endif
-    case DXGI_FORMAT_BC7_TYPELESS:
-
-#ifdef CRY_USE_METAL
-    case DXGI_FORMAT_PVRTC2_TYPELESS:
-    case DXGI_FORMAT_PVRTC4_TYPELESS:
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ASTC_4x4_TYPELESS:
-    case DXGI_FORMAT_ASTC_5x4_TYPELESS:
-    case DXGI_FORMAT_ASTC_5x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_6x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_6x6_TYPELESS:
-    case DXGI_FORMAT_ASTC_8x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_8x6_TYPELESS:
-    case DXGI_FORMAT_ASTC_8x8_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x6_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x8_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x10_TYPELESS:
-    case DXGI_FORMAT_ASTC_12x10_TYPELESS:
-    case DXGI_FORMAT_ASTC_12x12_TYPELESS:
-#endif
-        return true;
-
-    default:
-        break;
-    }
-
-    return false;
-}
-
-bool CTexture::IsDeviceFormatSRGBReadable(D3DFormat nFormat)
-{
-    switch (nFormat)
-    {
-    case DXGI_FORMAT_R8G8B8A8_UNORM:
-        return true;
-    case DXGI_FORMAT_B8G8R8A8_UNORM:
-        return true;
-    case DXGI_FORMAT_B8G8R8X8_UNORM:
-        return true;
-
-    case DXGI_FORMAT_BC1_UNORM:
-        return true;
-    case DXGI_FORMAT_BC2_UNORM:
-        return true;
-    case DXGI_FORMAT_BC3_UNORM:
-        return true;
-    case DXGI_FORMAT_BC7_UNORM:
-        return true;
-
-#if defined(OPENGL) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ETC2_UNORM:
-        return true;
-    case DXGI_FORMAT_ETC2A_UNORM:
-        return true;
-#endif //defined(OPENGL)
-
-#ifdef CRY_USE_METAL
-    case DXGI_FORMAT_PVRTC2_UNORM:
-        return true;
-    case DXGI_FORMAT_PVRTC4_UNORM:
-        return true;
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ASTC_4x4_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_5x4_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_5x5_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_6x5_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_6x6_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_8x5_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_8x6_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_8x8_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_10x5_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_10x6_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_10x8_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_10x10_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_12x10_UNORM:
-        return true;
-    case DXGI_FORMAT_ASTC_12x12_UNORM:
-        return true;
-#endif
-
-    default:
-        break;
-    }
-
-    return false;
-}
-
-// this function is valid for FT_USAGE_DEPTHSTENCIL textures only
-D3DFormat CTexture::DeviceFormatFromTexFormat(ETEX_Format eTF)
-{
-    switch (eTF)
-    {
-    case eTF_R8G8B8A8:
-        return DXGI_FORMAT_R8G8B8A8_UNORM;
-    case eTF_R8G8B8A8S:
-        return DXGI_FORMAT_R8G8B8A8_SNORM;
-
-    case eTF_A8:
-        return DXGI_FORMAT_A8_UNORM;
-    case eTF_R8:
-        return DXGI_FORMAT_R8_UNORM;
-    case eTF_R8S:
-        return DXGI_FORMAT_R8_SNORM;
-    case eTF_R16:
-        return DXGI_FORMAT_R16_UNORM;
-    case eTF_R16U:
-        return DXGI_FORMAT_R16_UINT;
-    case eTF_R16G16U:
-        return DXGI_FORMAT_R16G16_UINT;
-    case eTF_R10G10B10A2UI:
-        return DXGI_FORMAT_R10G10B10A2_UINT;
-    case eTF_R16F:
-        return DXGI_FORMAT_R16_FLOAT;
-    case eTF_R32F:
-        return DXGI_FORMAT_R32_FLOAT;
-    case eTF_R8G8:
-        return DXGI_FORMAT_R8G8_UNORM;
-    case eTF_R8G8S:
-        return DXGI_FORMAT_R8G8_SNORM;
-    case eTF_R16G16:
-        return DXGI_FORMAT_R16G16_UNORM;
-    case eTF_R16G16S:
-        return DXGI_FORMAT_R16G16_SNORM;
-    case eTF_R16G16F:
-        return DXGI_FORMAT_R16G16_FLOAT;
-    case eTF_R11G11B10F:
-        return DXGI_FORMAT_R11G11B10_FLOAT;
-    case eTF_R10G10B10A2:
-        return DXGI_FORMAT_R10G10B10A2_UNORM;
-    case eTF_R16G16B16A16:
-        return DXGI_FORMAT_R16G16B16A16_UNORM;
-    case eTF_R16G16B16A16S:
-        return DXGI_FORMAT_R16G16B16A16_SNORM;
-    case eTF_R16G16B16A16F:
-        return DXGI_FORMAT_R16G16B16A16_FLOAT;
-    case eTF_R32G32B32A32F:
-        return DXGI_FORMAT_R32G32B32A32_FLOAT;
-
-    case eTF_BC1:
-        return DXGI_FORMAT_BC1_UNORM;
-    case eTF_BC2:
-        return DXGI_FORMAT_BC2_UNORM;
-    case eTF_BC3:
-        return DXGI_FORMAT_BC3_UNORM;
-    case eTF_BC4U:
-        return DXGI_FORMAT_BC4_UNORM;
-    case eTF_BC4S:
-        return DXGI_FORMAT_BC4_SNORM;
-    case eTF_BC5U:
-        return DXGI_FORMAT_BC5_UNORM;
-    case eTF_BC5S:
-        return DXGI_FORMAT_BC5_SNORM;
-    case eTF_BC6UH:
-        return DXGI_FORMAT_BC6H_UF16;
-    case eTF_BC6SH:
-        return DXGI_FORMAT_BC6H_SF16;
-    case eTF_BC7:
-        return DXGI_FORMAT_BC7_UNORM;
-    case eTF_R9G9B9E5:
-        return DXGI_FORMAT_R9G9B9E5_SHAREDEXP;
-
-    // hardware depth buffers
-    case eTF_D16:
-        return DXGI_FORMAT_D16_UNORM;
-    case eTF_D24S8:
-        return DXGI_FORMAT_D24_UNORM_S8_UINT;
-    case eTF_D32F:
-        return DXGI_FORMAT_D32_FLOAT;
-    case eTF_D32FS8:
-        return DXGI_FORMAT_D32_FLOAT_S8X24_UINT;
-
-    // only available as hardware format under DX11.1 with DXGI 1.2
-    case eTF_B5G6R5:
-        return DXGI_FORMAT_B5G6R5_UNORM;
-    case eTF_B5G5R5:
-        return DXGI_FORMAT_B5G5R5A1_UNORM;
-    //      case eTF_B4G4R4A4:                      return DXGI_FORMAT_B4G4R4A4_UNORM;
-    case eTF_B4G4R4A4:
-        return DXGI_FORMAT_UNKNOWN;
-
-#if defined(OPENGL) || defined(CRY_USE_METAL)
-    // only available as hardware format under OpenGL
-    case eTF_EAC_R11:
-        return DXGI_FORMAT_EAC_R11_UNORM;
-    case eTF_EAC_RG11:
-        return DXGI_FORMAT_EAC_RG11_UNORM;
-    case eTF_ETC2:
-        return DXGI_FORMAT_ETC2_UNORM;
-    case eTF_ETC2A:
-        return DXGI_FORMAT_ETC2A_UNORM;
-#endif //defined(OPENGL)
-#ifdef CRY_USE_METAL
-    case eTF_PVRTC2:
-        return DXGI_FORMAT_PVRTC2_UNORM;
-    case eTF_PVRTC4:
-        return DXGI_FORMAT_PVRTC4_UNORM;
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case eTF_ASTC_4x4:
-        return DXGI_FORMAT_ASTC_4x4_UNORM;
-    case eTF_ASTC_5x4:
-        return DXGI_FORMAT_ASTC_5x4_UNORM;
-    case eTF_ASTC_5x5:
-        return DXGI_FORMAT_ASTC_5x5_UNORM;
-    case eTF_ASTC_6x5:
-        return DXGI_FORMAT_ASTC_6x5_UNORM;
-    case eTF_ASTC_6x6:
-        return DXGI_FORMAT_ASTC_6x6_UNORM;
-    case eTF_ASTC_8x5:
-        return DXGI_FORMAT_ASTC_8x5_UNORM;
-    case eTF_ASTC_8x6:
-        return DXGI_FORMAT_ASTC_8x6_UNORM;
-    case eTF_ASTC_8x8:
-        return DXGI_FORMAT_ASTC_8x8_UNORM;
-    case eTF_ASTC_10x5:
-        return DXGI_FORMAT_ASTC_10x5_UNORM;
-    case eTF_ASTC_10x6:
-        return DXGI_FORMAT_ASTC_10x6_UNORM;
-    case eTF_ASTC_10x8:
-        return DXGI_FORMAT_ASTC_10x8_UNORM;
-    case eTF_ASTC_10x10:
-        return DXGI_FORMAT_ASTC_10x10_UNORM;
-    case eTF_ASTC_12x10:
-        return DXGI_FORMAT_ASTC_12x10_UNORM;
-    case eTF_ASTC_12x12:
-        return DXGI_FORMAT_ASTC_12x12_UNORM;
-#endif
-
-    // only available as hardware format under DX9
-    case eTF_A8L8:
-        return DXGI_FORMAT_UNKNOWN;
-    case eTF_L8:
-        return DXGI_FORMAT_UNKNOWN;
-    case eTF_L8V8U8:
-        return DXGI_FORMAT_UNKNOWN;
-    case eTF_B8G8R8:
-        return DXGI_FORMAT_UNKNOWN;
-    case eTF_L8V8U8X8:
-        return DXGI_FORMAT_UNKNOWN;
-    case eTF_B8G8R8X8:
-        return DXGI_FORMAT_B8G8R8X8_UNORM;
-    case eTF_B8G8R8A8:
-        return DXGI_FORMAT_B8G8R8A8_UNORM;
-    }
-
-    return DXGI_FORMAT_UNKNOWN;
-}
-
-D3DFormat CTexture::GetD3DLinFormat(D3DFormat nFormat)
-{
-    return nFormat;
-}
-
-D3DFormat CTexture::ConvertToSRGBFmt(D3DFormat fmt)
-{
-    switch (fmt)
-    {
-    case DXGI_FORMAT_R8G8B8A8_UNORM:
-        return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
-    case DXGI_FORMAT_B8G8R8A8_UNORM:
-        return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB;
-    case DXGI_FORMAT_B8G8R8X8_UNORM:
-        return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB;
-
-    case DXGI_FORMAT_BC1_UNORM:
-        return DXGI_FORMAT_BC1_UNORM_SRGB;
-    case DXGI_FORMAT_BC2_UNORM:
-        return DXGI_FORMAT_BC2_UNORM_SRGB;
-    case DXGI_FORMAT_BC3_UNORM:
-        return DXGI_FORMAT_BC3_UNORM_SRGB;
-    case DXGI_FORMAT_BC7_UNORM:
-        return DXGI_FORMAT_BC7_UNORM_SRGB;
-
-#if defined(OPENGL) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ETC2_UNORM:
-        return DXGI_FORMAT_ETC2_UNORM_SRGB;
-    case DXGI_FORMAT_ETC2A_UNORM:
-        return DXGI_FORMAT_ETC2A_UNORM_SRGB;
-    case DXGI_FORMAT_EAC_RG11_UNORM:
-        return DXGI_FORMAT_EAC_RG11_UNORM;
-#endif //defined(OPENGL)
-
-#ifdef CRY_USE_METAL
-    case DXGI_FORMAT_PVRTC2_UNORM:
-        return DXGI_FORMAT_PVRTC2_UNORM_SRGB;
-    case DXGI_FORMAT_PVRTC4_UNORM:
-        return DXGI_FORMAT_PVRTC4_UNORM_SRGB;
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ASTC_4x4_UNORM:
-        return DXGI_FORMAT_ASTC_4x4_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_5x4_UNORM:
-        return DXGI_FORMAT_ASTC_5x4_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_5x5_UNORM:
-        return DXGI_FORMAT_ASTC_5x5_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_6x5_UNORM:
-        return DXGI_FORMAT_ASTC_6x5_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_6x6_UNORM:
-        return DXGI_FORMAT_ASTC_6x6_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_8x5_UNORM:
-        return DXGI_FORMAT_ASTC_8x5_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_8x6_UNORM:
-        return DXGI_FORMAT_ASTC_8x6_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_8x8_UNORM:
-        return DXGI_FORMAT_ASTC_8x8_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_10x5_UNORM:
-        return DXGI_FORMAT_ASTC_10x5_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_10x6_UNORM:
-        return DXGI_FORMAT_ASTC_10x6_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_10x8_UNORM:
-        return DXGI_FORMAT_ASTC_10x8_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_10x10_UNORM:
-        return DXGI_FORMAT_ASTC_10x10_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_12x10_UNORM:
-        return DXGI_FORMAT_ASTC_12x10_UNORM_SRGB;
-    case DXGI_FORMAT_ASTC_12x12_UNORM:
-        return DXGI_FORMAT_ASTC_12x12_UNORM_SRGB;
-    case DXGI_FORMAT_R8_UNORM:
-        return DXGI_FORMAT_R8_UNORM;
-    case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
-        return DXGI_FORMAT_R9G9B9E5_SHAREDEXP;
-#endif
-    case DXGI_FORMAT_R10G10B10A2_UNORM:
-        return DXGI_FORMAT_R10G10B10A2_UNORM;
-    // AntonK: we don't need sRGB space for fp formats, because there is enough precision
-    case DXGI_FORMAT_R16G16B16A16_FLOAT:
-        return DXGI_FORMAT_R16G16B16A16_FLOAT;
-    case DXGI_FORMAT_R11G11B10_FLOAT:
-        return DXGI_FORMAT_R11G11B10_FLOAT;
-    // There is no SRGB format for BC4
-    case DXGI_FORMAT_BC4_SNORM:
-        return DXGI_FORMAT_BC4_SNORM;
-    case DXGI_FORMAT_BC4_UNORM:
-        return DXGI_FORMAT_BC4_UNORM;
-    default:
-        assert(0);
-    }
-
-    return fmt;
-}
-
-D3DFormat CTexture::ConvertToSignedFmt(D3DFormat fmt)
-{
-    switch (fmt)
-    {
-    case DXGI_FORMAT_R8_UNORM:
-        return DXGI_FORMAT_R8_SNORM;
-    case DXGI_FORMAT_R8G8_UNORM:
-        return DXGI_FORMAT_R8G8_SNORM;
-    case DXGI_FORMAT_R8G8B8A8_UNORM:
-        return DXGI_FORMAT_R8G8B8A8_SNORM;
-    case DXGI_FORMAT_R16_UNORM:
-        return DXGI_FORMAT_R16_SNORM;
-    case DXGI_FORMAT_R16G16_UNORM:
-        return DXGI_FORMAT_R16G16_SNORM;
-    case DXGI_FORMAT_R16G16B16A16_UNORM:
-        return DXGI_FORMAT_R16G16B16A16_SNORM;
-    case DXGI_FORMAT_BC4_UNORM:
-        return DXGI_FORMAT_BC4_SNORM;
-    case DXGI_FORMAT_BC5_UNORM:
-        return DXGI_FORMAT_BC5_SNORM;
-    case DXGI_FORMAT_BC6H_UF16:
-        return DXGI_FORMAT_BC6H_SF16;
-
-    case DXGI_FORMAT_R32G32B32A32_UINT:
-        return DXGI_FORMAT_R32G32B32A32_SINT;
-    case DXGI_FORMAT_R32G32B32_UINT:
-        return DXGI_FORMAT_R32G32B32_SINT;
-    case DXGI_FORMAT_R16G16B16A16_UINT:
-        return DXGI_FORMAT_R16G16B16A16_SINT;
-    case DXGI_FORMAT_R32G32_UINT:
-        return DXGI_FORMAT_R32G32_SINT;
-    case DXGI_FORMAT_R8G8B8A8_UINT:
-        return DXGI_FORMAT_R8G8B8A8_SINT;
-    case DXGI_FORMAT_R16G16_UINT:
-        return DXGI_FORMAT_R16G16_SINT;
-    case DXGI_FORMAT_R32_UINT:
-        return DXGI_FORMAT_R32_SINT;
-    case DXGI_FORMAT_R8G8_UINT:
-        return DXGI_FORMAT_R8G8_SINT;
-    case DXGI_FORMAT_R16_UINT:
-        return DXGI_FORMAT_R16_SINT;
-    case DXGI_FORMAT_R8_UINT:
-        return DXGI_FORMAT_R8_SINT;
-
-    default:
-        assert(0);
-    }
-
-    return fmt;
-}
-
-ETEX_Format CTexture::TexFormatFromDeviceFormat(D3DFormat nFormat)
-{
-    switch (nFormat)
-    {
-    case DXGI_FORMAT_R8G8B8A8_TYPELESS:
-        return eTF_R8G8B8A8;
-    case DXGI_FORMAT_R8G8B8A8_UNORM:
-        return eTF_R8G8B8A8;
-    case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
-        return eTF_R8G8B8A8;
-    case DXGI_FORMAT_R8G8B8A8_SNORM:
-        return eTF_R8G8B8A8S;
-
-    case DXGI_FORMAT_A8_UNORM:
-        return eTF_A8;
-    case DXGI_FORMAT_R8_TYPELESS:
-    case DXGI_FORMAT_R8_UNORM:
-        return eTF_R8;
-    case DXGI_FORMAT_R8_SNORM:
-        return eTF_R8S;
-    case DXGI_FORMAT_R16_UNORM:
-        return eTF_R16;
-    case DXGI_FORMAT_R16_UINT:
-        return eTF_R16U;
-    case DXGI_FORMAT_R16G16_UINT:
-        return eTF_R16G16U;
-    case DXGI_FORMAT_R10G10B10A2_UINT:
-        return eTF_R10G10B10A2UI;
-    case DXGI_FORMAT_R16_FLOAT:
-        return eTF_R16F;
-    case DXGI_FORMAT_R16_TYPELESS:
-        return eTF_R16F;
-    case DXGI_FORMAT_R32_FLOAT:
-        return eTF_R32F;
-    case DXGI_FORMAT_R32_TYPELESS:
-        return eTF_R32F;
-    case DXGI_FORMAT_R8G8_UNORM:
-        return eTF_R8G8;
-    case DXGI_FORMAT_R8G8_SNORM:
-        return eTF_R8G8S;
-    case DXGI_FORMAT_R16G16_UNORM:
-        return eTF_R16G16;
-    case DXGI_FORMAT_R16G16_SNORM:
-        return eTF_R16G16S;
-    case DXGI_FORMAT_R16G16_FLOAT:
-        return eTF_R16G16F;
-    case DXGI_FORMAT_R11G11B10_FLOAT:
-        return eTF_R11G11B10F;
-    case DXGI_FORMAT_R10G10B10A2_UNORM:
-        return eTF_R10G10B10A2;
-    case DXGI_FORMAT_R10G10B10A2_TYPELESS:
-        return eTF_R10G10B10A2;
-    case DXGI_FORMAT_R16G16B16A16_UNORM:
-        return eTF_R16G16B16A16;
-    case DXGI_FORMAT_R16G16B16A16_SNORM:
-        return eTF_R16G16B16A16S;
-    case DXGI_FORMAT_R16G16B16A16_FLOAT:
-        return eTF_R16G16B16A16F;
-    case DXGI_FORMAT_R16G16B16A16_TYPELESS:
-        return eTF_R16G16B16A16F;
-    case DXGI_FORMAT_R32G32B32A32_FLOAT:
-        return eTF_R32G32B32A32F;
-    case DXGI_FORMAT_R32G32B32A32_TYPELESS:
-        return eTF_R32G32B32A32F;
-
-    case DXGI_FORMAT_BC1_TYPELESS:
-        return eTF_BC1;
-    case DXGI_FORMAT_BC1_UNORM:
-        return eTF_BC1;
-    case DXGI_FORMAT_BC1_UNORM_SRGB:
-        return eTF_BC1;
-    case DXGI_FORMAT_BC2_TYPELESS:
-        return eTF_BC2;
-    case DXGI_FORMAT_BC2_UNORM:
-        return eTF_BC2;
-    case DXGI_FORMAT_BC2_UNORM_SRGB:
-        return eTF_BC2;
-    case DXGI_FORMAT_BC3_TYPELESS:
-        return eTF_BC3;
-    case DXGI_FORMAT_BC3_UNORM:
-        return eTF_BC3;
-    case DXGI_FORMAT_BC3_UNORM_SRGB:
-        return eTF_BC3;
-    case DXGI_FORMAT_BC4_TYPELESS:
-        return eTF_BC4U;
-    case DXGI_FORMAT_BC4_UNORM:
-        return eTF_BC4U;
-    case DXGI_FORMAT_BC4_SNORM:
-        return eTF_BC4S;
-    case DXGI_FORMAT_BC5_TYPELESS:
-        return eTF_BC5U;
-    case DXGI_FORMAT_BC5_UNORM:
-        return eTF_BC5U;
-    case DXGI_FORMAT_BC5_SNORM:
-        return eTF_BC5S;
-    case DXGI_FORMAT_BC6H_UF16:
-        return eTF_BC6UH;
-    case DXGI_FORMAT_BC6H_SF16:
-        return eTF_BC6SH;
-    case DXGI_FORMAT_BC7_TYPELESS:
-        return eTF_BC7;
-    case DXGI_FORMAT_BC7_UNORM:
-        return eTF_BC7;
-    case DXGI_FORMAT_BC7_UNORM_SRGB:
-        return eTF_BC7;
-    case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
-        return eTF_R9G9B9E5;
-
-    // hardware depth buffers
-    case DXGI_FORMAT_D16_UNORM:
-        return eTF_D16;
-    case DXGI_FORMAT_D24_UNORM_S8_UINT:
-        return eTF_D24S8;
-    case DXGI_FORMAT_D32_FLOAT:
-        return eTF_D32F;
-    case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
-        return eTF_D32FS8;
-
-    case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
-        return eTF_D24S8;
-    case DXGI_FORMAT_R24G8_TYPELESS:
-        return eTF_D24S8;
-    case DXGI_FORMAT_R32G8X24_TYPELESS:
-        return eTF_D32FS8;
-    case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
-        return eTF_D32FS8;
-
-    // only available as hardware format under DX11.1 with DXGI 1.2
-    case DXGI_FORMAT_B5G6R5_UNORM:
-        return eTF_B5G6R5;
-    case DXGI_FORMAT_B5G5R5A1_UNORM:
-        return eTF_B5G5R5;
-        //  case DXGI_FORMAT_B4G4R4A4_UNORM:        return eTF_B4G4R4A4;
-
-#if defined(OPENGL) || defined(CRY_USE_METAL)
-    // only available as hardware format under OpenGL
-    case DXGI_FORMAT_EAC_R11_UNORM:
-    case DXGI_FORMAT_EAC_R11_TYPELESS:
-        return eTF_EAC_R11;
-    case DXGI_FORMAT_EAC_RG11_UNORM:
-    case DXGI_FORMAT_EAC_RG11_TYPELESS:
-        return eTF_EAC_RG11;
-    case DXGI_FORMAT_ETC2_UNORM:
-    case DXGI_FORMAT_ETC2_UNORM_SRGB:
-    case DXGI_FORMAT_ETC2_TYPELESS:
-        return eTF_ETC2;
-    case DXGI_FORMAT_ETC2A_UNORM:
-    case DXGI_FORMAT_ETC2A_UNORM_SRGB:
-    case DXGI_FORMAT_ETC2A_TYPELESS:
-        return eTF_ETC2A;
-#endif //defined(OPENGL)
-
-#ifdef CRY_USE_METAL
-    case DXGI_FORMAT_PVRTC2_TYPELESS:
-    case DXGI_FORMAT_PVRTC2_UNORM:
-    case DXGI_FORMAT_PVRTC2_UNORM_SRGB:
-        return eTF_PVRTC2;
-    case DXGI_FORMAT_PVRTC4_TYPELESS:
-    case DXGI_FORMAT_PVRTC4_UNORM:
-    case DXGI_FORMAT_PVRTC4_UNORM_SRGB:
-        return eTF_PVRTC4;
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ASTC_4x4_TYPELESS:
-    case DXGI_FORMAT_ASTC_4x4_UNORM:
-    case DXGI_FORMAT_ASTC_4x4_UNORM_SRGB:
-        return eTF_ASTC_4x4;
-    case DXGI_FORMAT_ASTC_5x4_TYPELESS:
-    case DXGI_FORMAT_ASTC_5x4_UNORM:
-    case DXGI_FORMAT_ASTC_5x4_UNORM_SRGB:
-        return eTF_ASTC_5x4;
-    case DXGI_FORMAT_ASTC_5x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_5x5_UNORM:
-    case DXGI_FORMAT_ASTC_5x5_UNORM_SRGB:
-        return eTF_ASTC_5x5;
-    case DXGI_FORMAT_ASTC_6x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_6x5_UNORM:
-    case DXGI_FORMAT_ASTC_6x5_UNORM_SRGB:
-        return eTF_ASTC_6x5;
-    case DXGI_FORMAT_ASTC_6x6_TYPELESS:
-    case DXGI_FORMAT_ASTC_6x6_UNORM:
-    case DXGI_FORMAT_ASTC_6x6_UNORM_SRGB:
-        return eTF_ASTC_6x6;
-    case DXGI_FORMAT_ASTC_8x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_8x5_UNORM:
-    case DXGI_FORMAT_ASTC_8x5_UNORM_SRGB:
-        return eTF_ASTC_8x5;
-    case DXGI_FORMAT_ASTC_8x6_TYPELESS:
-    case DXGI_FORMAT_ASTC_8x6_UNORM:
-    case DXGI_FORMAT_ASTC_8x6_UNORM_SRGB:
-        return eTF_ASTC_8x6;
-    case DXGI_FORMAT_ASTC_8x8_TYPELESS:
-    case DXGI_FORMAT_ASTC_8x8_UNORM:
-    case DXGI_FORMAT_ASTC_8x8_UNORM_SRGB:
-        return eTF_ASTC_8x8;
-    case DXGI_FORMAT_ASTC_10x5_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x5_UNORM:
-    case DXGI_FORMAT_ASTC_10x5_UNORM_SRGB:
-        return eTF_ASTC_10x5;
-    case DXGI_FORMAT_ASTC_10x6_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x6_UNORM:
-    case DXGI_FORMAT_ASTC_10x6_UNORM_SRGB:
-        return eTF_ASTC_10x6;
-    case DXGI_FORMAT_ASTC_10x8_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x8_UNORM:
-    case DXGI_FORMAT_ASTC_10x8_UNORM_SRGB:
-        return eTF_ASTC_10x8;
-    case DXGI_FORMAT_ASTC_10x10_TYPELESS:
-    case DXGI_FORMAT_ASTC_10x10_UNORM:
-    case DXGI_FORMAT_ASTC_10x10_UNORM_SRGB:
-        return eTF_ASTC_10x10;
-    case DXGI_FORMAT_ASTC_12x10_TYPELESS:
-    case DXGI_FORMAT_ASTC_12x10_UNORM:
-    case DXGI_FORMAT_ASTC_12x10_UNORM_SRGB:
-        return eTF_ASTC_12x10;
-    case DXGI_FORMAT_ASTC_12x12_TYPELESS:
-    case DXGI_FORMAT_ASTC_12x12_UNORM:
-    case DXGI_FORMAT_ASTC_12x12_UNORM_SRGB:
-        return eTF_ASTC_12x12;
-#endif
-
-    // only available as hardware format under DX9
-    case DXGI_FORMAT_B8G8R8A8_TYPELESS:
-        return eTF_B8G8R8A8;
-    case DXGI_FORMAT_B8G8R8A8_UNORM:
-        return eTF_B8G8R8A8;
-    case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
-        return eTF_B8G8R8A8;
-    case DXGI_FORMAT_B8G8R8X8_TYPELESS:
-        return eTF_B8G8R8X8;
-    case DXGI_FORMAT_B8G8R8X8_UNORM:
-        return eTF_B8G8R8X8;
-    case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
-        return eTF_B8G8R8X8;
-
-    default:
-        assert(0);
-    }
-
-    return eTF_Unknown;
-}
-
-// this function is valid for FT_USAGE_DEPTHSTENCIL textures only
-D3DFormat CTexture::ConvertToDepthStencilFmt(D3DFormat nFormat)
-{
-    switch (nFormat)
-    {
-    case DXGI_FORMAT_R16_TYPELESS:
-        return DXGI_FORMAT_D16_UNORM;
-    case DXGI_FORMAT_R24G8_TYPELESS:
-        return DXGI_FORMAT_D24_UNORM_S8_UINT;
-    case DXGI_FORMAT_R32_TYPELESS:
-        return DXGI_FORMAT_D32_FLOAT;
-    case DXGI_FORMAT_R32G8X24_TYPELESS:
-        return DXGI_FORMAT_D32_FLOAT_S8X24_UINT;
-
-    // Don't assert if they pass in a valid depth format...
-    case DXGI_FORMAT_D16_UNORM:
-    case DXGI_FORMAT_D24_UNORM_S8_UINT:
-    case DXGI_FORMAT_D32_FLOAT:
-    case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
-        return nFormat;
-
-    default:
-        assert(nFormat == DXGI_FORMAT_D16_UNORM || nFormat == DXGI_FORMAT_D24_UNORM_S8_UINT || nFormat == DXGI_FORMAT_D32_FLOAT || nFormat == DXGI_FORMAT_D32_FLOAT_S8X24_UINT);
-    }
-
-    return nFormat;
-}
-
-D3DFormat CTexture::ConvertToStencilFmt(D3DFormat nFormat)
-{
-    switch (nFormat)
-    {
-    case DXGI_FORMAT_R32G8X24_TYPELESS:
-        return DXGI_FORMAT_X32_TYPELESS_G8X24_UINT;
-    case DXGI_FORMAT_R24G8_TYPELESS:
-        return DXGI_FORMAT_X24_TYPELESS_G8_UINT;
-
-    default:
-        assert(nFormat == DXGI_FORMAT_X32_TYPELESS_G8X24_UINT || nFormat == DXGI_FORMAT_X24_TYPELESS_G8_UINT);
-    }
-
-    return nFormat;
-}
-
-D3DFormat CTexture::ConvertToShaderResourceFmt(D3DFormat nFormat)
-{
-    //handle special cases
-    switch (nFormat)
-    {
-    case DXGI_FORMAT_R16_TYPELESS:
-        return DXGI_FORMAT_R16_UNORM;
-    case DXGI_FORMAT_R24G8_TYPELESS:
-        return DXGI_FORMAT_R24_UNORM_X8_TYPELESS;
-    case DXGI_FORMAT_R32_TYPELESS:
-        return DXGI_FORMAT_R32_FLOAT;
-    case DXGI_FORMAT_R32G8X24_TYPELESS:
-        return DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS;
-    //      case DXGI_FORMAT_R32G32_TYPELESS:       return DXGI_FORMAT_D32_FLOAT_S8X24_UINT;
-
-    default:
-        break;                                     //pass through
-    }
-
-    return nFormat;
-}
-
-D3DFormat CTexture::ConvertToTypelessFmt(D3DFormat fmt)
-{
-    switch (fmt)
-    {
-    case DXGI_FORMAT_R8G8B8A8_UNORM:
-        return DXGI_FORMAT_R8G8B8A8_TYPELESS;
-    case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
-        return DXGI_FORMAT_R8G8B8A8_TYPELESS;
-    case DXGI_FORMAT_R8G8B8A8_SNORM:
-        return DXGI_FORMAT_R8G8B8A8_TYPELESS;
-    case DXGI_FORMAT_R8G8B8A8_UINT:
-        return DXGI_FORMAT_R8G8B8A8_TYPELESS;
-    case DXGI_FORMAT_R8G8B8A8_SINT:
-        return DXGI_FORMAT_R8G8B8A8_TYPELESS;
-
-    case DXGI_FORMAT_B8G8R8A8_UNORM:
-        return DXGI_FORMAT_B8G8R8A8_TYPELESS;
-    case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
-        return DXGI_FORMAT_B8G8R8A8_TYPELESS;
-    case DXGI_FORMAT_B8G8R8X8_UNORM:
-        return DXGI_FORMAT_B8G8R8X8_TYPELESS;
-    case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
-        return DXGI_FORMAT_B8G8R8X8_TYPELESS;
-
-    case DXGI_FORMAT_R8_UNORM:
-        return DXGI_FORMAT_R8_TYPELESS;
-    case DXGI_FORMAT_R8_SNORM:
-        return DXGI_FORMAT_R8_TYPELESS;
-    case DXGI_FORMAT_R8_UINT:
-        return DXGI_FORMAT_R8_TYPELESS;
-    case DXGI_FORMAT_R8_SINT:
-        return DXGI_FORMAT_R8_TYPELESS;
-
-    case DXGI_FORMAT_R16_UNORM:
-        return DXGI_FORMAT_R16_TYPELESS;
-    case DXGI_FORMAT_R16_SNORM:
-        return DXGI_FORMAT_R16_TYPELESS;
-    case DXGI_FORMAT_R16_FLOAT:
-        return DXGI_FORMAT_R16_TYPELESS;
-    case DXGI_FORMAT_R16_UINT:
-        return DXGI_FORMAT_R16_TYPELESS;
-    case DXGI_FORMAT_R16_SINT:
-        return DXGI_FORMAT_R16_TYPELESS;
-
-    case DXGI_FORMAT_R32_FLOAT:
-        return DXGI_FORMAT_R32_TYPELESS;
-    case DXGI_FORMAT_R32_UINT:
-        return DXGI_FORMAT_R32_TYPELESS;
-    case DXGI_FORMAT_R32_SINT:
-        return DXGI_FORMAT_R32_TYPELESS;
-
-    case DXGI_FORMAT_R8G8_UNORM:
-        return DXGI_FORMAT_R8G8_TYPELESS;
-    case DXGI_FORMAT_R8G8_SNORM:
-        return DXGI_FORMAT_R8G8_TYPELESS;
-    case DXGI_FORMAT_R8G8_UINT:
-        return DXGI_FORMAT_R8G8_TYPELESS;
-    case DXGI_FORMAT_R8G8_SINT:
-        return DXGI_FORMAT_R8G8_TYPELESS;
-
-    case DXGI_FORMAT_R16G16_FLOAT:
-        return DXGI_FORMAT_R16G16_TYPELESS;
-    case DXGI_FORMAT_R16G16_UNORM:
-        return DXGI_FORMAT_R16G16_TYPELESS;
-    case DXGI_FORMAT_R16G16_SNORM:
-        return DXGI_FORMAT_R16G16_TYPELESS;
-    case DXGI_FORMAT_R16G16_UINT:
-        return DXGI_FORMAT_R16G16_TYPELESS;
-    case DXGI_FORMAT_R16G16_SINT:
-        return DXGI_FORMAT_R16G16_TYPELESS;
-
-    case DXGI_FORMAT_R32G32_FLOAT:
-        return DXGI_FORMAT_R32G32_TYPELESS;
-    case DXGI_FORMAT_R32G32_UINT:
-        return DXGI_FORMAT_R32G32_TYPELESS;
-    case DXGI_FORMAT_R32G32_SINT:
-        return DXGI_FORMAT_R32G32_TYPELESS;
-
-    case DXGI_FORMAT_R32G32B32_FLOAT:
-        return DXGI_FORMAT_R32G32B32_TYPELESS;
-    case DXGI_FORMAT_R32G32B32_UINT:
-        return DXGI_FORMAT_R32G32B32_TYPELESS;
-    case DXGI_FORMAT_R32G32B32_SINT:
-        return DXGI_FORMAT_R32G32B32_TYPELESS;
-
-    case DXGI_FORMAT_R10G10B10A2_UNORM:
-        return DXGI_FORMAT_R10G10B10A2_TYPELESS;
-    case DXGI_FORMAT_R10G10B10A2_UINT:
-        return DXGI_FORMAT_R10G10B10A2_TYPELESS;
-
-    case DXGI_FORMAT_R16G16B16A16_FLOAT:
-        return DXGI_FORMAT_R16G16B16A16_TYPELESS;
-    case DXGI_FORMAT_R16G16B16A16_UNORM:
-        return DXGI_FORMAT_R16G16B16A16_TYPELESS;
-    case DXGI_FORMAT_R16G16B16A16_SNORM:
-        return DXGI_FORMAT_R16G16B16A16_TYPELESS;
-    case DXGI_FORMAT_R16G16B16A16_UINT:
-        return DXGI_FORMAT_R16G16B16A16_TYPELESS;
-    case DXGI_FORMAT_R16G16B16A16_SINT:
-        return DXGI_FORMAT_R16G16B16A16_TYPELESS;
-
-    case DXGI_FORMAT_R32G32B32A32_FLOAT:
-        return DXGI_FORMAT_R32G32B32A32_TYPELESS;
-    case DXGI_FORMAT_R32G32B32A32_UINT:
-        return DXGI_FORMAT_R32G32B32A32_TYPELESS;
-    case DXGI_FORMAT_R32G32B32A32_SINT:
-        return DXGI_FORMAT_R32G32B32A32_TYPELESS;
-
-    case DXGI_FORMAT_BC1_UNORM:
-        return DXGI_FORMAT_BC1_TYPELESS;
-    case DXGI_FORMAT_BC1_UNORM_SRGB:
-        return DXGI_FORMAT_BC1_TYPELESS;
-
-    case DXGI_FORMAT_BC2_UNORM:
-        return DXGI_FORMAT_BC2_TYPELESS;
-    case DXGI_FORMAT_BC2_UNORM_SRGB:
-        return DXGI_FORMAT_BC2_TYPELESS;
-
-    case DXGI_FORMAT_BC3_UNORM:
-        return DXGI_FORMAT_BC3_TYPELESS;
-    case DXGI_FORMAT_BC3_UNORM_SRGB:
-        return DXGI_FORMAT_BC3_TYPELESS;
-
-    case DXGI_FORMAT_BC4_UNORM:
-        return DXGI_FORMAT_BC4_TYPELESS;
-    case DXGI_FORMAT_BC4_SNORM:
-        return DXGI_FORMAT_BC4_TYPELESS;
-
-    case DXGI_FORMAT_BC5_UNORM:
-        return DXGI_FORMAT_BC5_TYPELESS;
-    case DXGI_FORMAT_BC5_SNORM:
-        return DXGI_FORMAT_BC5_TYPELESS;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    case DXGI_FORMAT_BC6H_UF16:
-        return DXGI_FORMAT_BC6H_TYPELESS;
-    case DXGI_FORMAT_BC6H_SF16:
-        return DXGI_FORMAT_BC6H_TYPELESS;
-#endif
-    case DXGI_FORMAT_BC7_UNORM:
-        return DXGI_FORMAT_BC7_TYPELESS;
-    case DXGI_FORMAT_BC7_UNORM_SRGB:
-        return DXGI_FORMAT_BC7_TYPELESS;
-
-#if defined(OPENGL) && !defined(CRY_USE_METAL)
-    case DXGI_FORMAT_EAC_R11_UNORM:
-        return DXGI_FORMAT_EAC_R11_TYPELESS;
-    case DXGI_FORMAT_EAC_R11_SNORM:
-        return DXGI_FORMAT_EAC_R11_TYPELESS;
-    case DXGI_FORMAT_EAC_RG11_UNORM:
-        return DXGI_FORMAT_EAC_RG11_TYPELESS;
-    case DXGI_FORMAT_EAC_RG11_SNORM:
-        return DXGI_FORMAT_EAC_RG11_TYPELESS;
-    case DXGI_FORMAT_ETC2_UNORM:
-        return DXGI_FORMAT_ETC2_TYPELESS;
-    case DXGI_FORMAT_ETC2_UNORM_SRGB:
-        return DXGI_FORMAT_ETC2_TYPELESS;
-    case DXGI_FORMAT_ETC2A_UNORM:
-        return DXGI_FORMAT_ETC2A_TYPELESS;
-    case DXGI_FORMAT_ETC2A_UNORM_SRGB:
-        return DXGI_FORMAT_ETC2A_TYPELESS;
-#endif //defined(OPENGL)
-
-    case DXGI_FORMAT_D16_UNORM:
-        return DXGI_FORMAT_R16_TYPELESS;
-    case DXGI_FORMAT_D24_UNORM_S8_UINT:
-        return DXGI_FORMAT_R24G8_TYPELESS;
-    case DXGI_FORMAT_D32_FLOAT:
-        return DXGI_FORMAT_R32_TYPELESS;
-    case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
-        return DXGI_FORMAT_R32G8X24_TYPELESS;
-
-        // todo: add missing formats if they found required
-
-#ifdef CRY_USE_METAL
-    case DXGI_FORMAT_PVRTC2_UNORM:
-    case DXGI_FORMAT_PVRTC2_UNORM_SRGB:
-        return DXGI_FORMAT_PVRTC2_TYPELESS;
-
-    case DXGI_FORMAT_PVRTC4_UNORM:
-    case DXGI_FORMAT_PVRTC4_UNORM_SRGB:
-        return DXGI_FORMAT_PVRTC4_TYPELESS;
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case DXGI_FORMAT_ASTC_4x4_UNORM:
-    case DXGI_FORMAT_ASTC_4x4_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_4x4_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_5x4_UNORM:
-    case DXGI_FORMAT_ASTC_5x4_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_5x4_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_5x5_UNORM:
-    case DXGI_FORMAT_ASTC_5x5_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_5x5_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_6x5_UNORM:
-    case DXGI_FORMAT_ASTC_6x5_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_6x5_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_6x6_UNORM:
-    case DXGI_FORMAT_ASTC_6x6_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_6x6_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_8x5_UNORM:
-    case DXGI_FORMAT_ASTC_8x5_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_8x5_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_8x6_UNORM:
-    case DXGI_FORMAT_ASTC_8x6_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_8x6_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_8x8_UNORM:
-    case DXGI_FORMAT_ASTC_8x8_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_8x8_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_10x5_UNORM:
-    case DXGI_FORMAT_ASTC_10x5_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_10x5_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_10x6_UNORM:
-    case DXGI_FORMAT_ASTC_10x6_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_10x6_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_10x8_UNORM:
-    case DXGI_FORMAT_ASTC_10x8_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_10x8_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_10x10_UNORM:
-    case DXGI_FORMAT_ASTC_10x10_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_10x10_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_12x10_UNORM:
-    case DXGI_FORMAT_ASTC_12x10_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_12x10_TYPELESS;
-
-    case DXGI_FORMAT_ASTC_12x12_UNORM:
-    case DXGI_FORMAT_ASTC_12x12_UNORM_SRGB:
-        return DXGI_FORMAT_ASTC_12x12_TYPELESS;
-
-#endif
-
-    // No conversion on floating point format.
-    case DXGI_FORMAT_R11G11B10_FLOAT:
-        return DXGI_FORMAT_R11G11B10_FLOAT; 
-
-    default:
-        assert(0);
-    }
-
-    return fmt;
-}
-
-bool CTexture::IsFormatSupported(ETEX_Format eTFDst)
-{
-    const SPixFormatSupport* rd = &gcpRendD3D->m_hwTexFormatSupport;
-
-    int D3DFmt = DeviceFormatFromTexFormat(eTFDst);
-    if (!D3DFmt)
-    {
-        return false;
-    }
-    SPixFormat* pFmt;
-    for (pFmt = rd->m_FirstPixelFormat; pFmt; pFmt = pFmt->Next)
-    {
-        if (pFmt->DeviceFormat == D3DFmt && pFmt->IsValid())
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-ETEX_Format CTexture::ClosestFormatSupported(ETEX_Format eTFDst)
-{
-    return ClosestFormatSupported(eTFDst, m_pPixelFormat);
-}
-
-ETEX_Format CTexture::ClosestFormatSupported(ETEX_Format eTFDst, const SPixFormat*& pPF)
-{
-    const SPixFormatSupport* rd = &gcpRendD3D->m_hwTexFormatSupport;
-
-    switch (eTFDst)
-    {
-    case eTF_R8G8B8A8S:
-        if (rd->m_FormatR8G8B8A8S.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8B8A8S;
-            return eTF_R8G8B8A8S;
-        }
-        return eTF_Unknown;
-    case eTF_R8G8B8A8:
-        if (rd->m_FormatR8G8B8A8.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8B8A8;
-            return eTF_R8G8B8A8;
-        }
-        return eTF_Unknown;
-
-    case eTF_B5G5R5:
-        if (rd->m_FormatB5G5R5.IsValid())
-        {
-            pPF = &rd->m_FormatB5G5R5;
-            return eTF_B5G5R5;
-        }
-    case eTF_B5G6R5:
-        if (rd->m_FormatB5G6R5.IsValid())
-        {
-            pPF = &rd->m_FormatB5G6R5;
-            return eTF_B5G6R5;
-        }
-
-    case eTF_B8G8R8X8:
-        if (rd->m_FormatB8G8R8X8.IsValid())
-        {
-            pPF = &rd->m_FormatB8G8R8X8;
-            return eTF_B8G8R8X8;
-        }
-        return eTF_Unknown;
-    case eTF_B4G4R4A4:
-        if (rd->m_FormatB4G4R4A4.IsValid())
-        {
-            pPF = &rd->m_FormatB4G4R4A4;
-            return eTF_B4G4R4A4;
-        }
-    case eTF_B8G8R8A8:
-        if (rd->m_FormatB8G8R8A8.IsValid())
-        {
-            pPF = &rd->m_FormatB8G8R8A8;
-            return eTF_B8G8R8A8;
-        }
-        return eTF_Unknown;
-
-    case eTF_A8:
-        if (rd->m_FormatA8.IsValid())
-        {
-            pPF = &rd->m_FormatA8;
-            return eTF_A8;
-        }
-        return eTF_Unknown;
-
-
-    case eTF_R8:
-        if (rd->m_FormatR8.IsValid())
-        {
-            pPF = &rd->m_FormatR8;
-            return eTF_R8;
-        }
-        return eTF_Unknown;
-
-    case eTF_R8S:
-        if (rd->m_FormatR8S.IsValid())
-        {
-            pPF = &rd->m_FormatR8S;
-            return eTF_R8S;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16:
-        if (rd->m_FormatR16.IsValid())
-        {
-            pPF = &rd->m_FormatR16;
-            return eTF_R16;
-        }
-        if (rd->m_FormatR16G16.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16;
-            return eTF_R16G16;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16U:
-        if (rd->m_FormatR16U.IsValid())
-        {
-            pPF = &rd->m_FormatR16U;
-            return eTF_R16U;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16G16U:
-        if (rd->m_FormatR16G16U.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16U;
-            return eTF_R16G16U;
-        }
-        return eTF_Unknown;
-
-    case eTF_R10G10B10A2UI:
-        if (rd->m_FormatR10G10B10A2UI.IsValid())
-        {
-            pPF = &rd->m_FormatR10G10B10A2UI;
-            return eTF_R10G10B10A2UI;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16F:
-        if (rd->m_FormatR16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16F;
-            return eTF_R16F;
-        }
-        if (rd->m_FormatR16G16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16F;
-            return eTF_R16G16F;
-        }
-        return eTF_Unknown;
-
-    case eTF_R32F:
-        if (rd->m_FormatR32F.IsValid())
-        {
-            pPF = &rd->m_FormatR32F;
-            return eTF_R32F;
-        }
-        if (rd->m_FormatR16G16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16F;
-            return eTF_R16G16F;
-        }
-        return eTF_Unknown;
-
-    case eTF_R8G8:
-        if (rd->m_FormatR8G8.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8;
-            return eTF_R8G8;
-        }
-        return eTF_Unknown;
-
-    case eTF_R8G8S:
-        if (rd->m_FormatR8G8S.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8S;
-            return eTF_R8G8S;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16G16:
-        if (rd->m_FormatR16G16.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16;
-            return eTF_R16G16;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16G16S:
-        if (rd->m_FormatR16G16S.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16S;
-            return eTF_R16G16S;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16G16F:
-        if (rd->m_FormatR16G16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16F;
-            return eTF_R16G16F;
-        }
-        return eTF_Unknown;
-
-    case eTF_R11G11B10F:
-        if (rd->m_FormatR11G11B10F.IsValid())
-        {
-            pPF = &rd->m_FormatR11G11B10F;
-            return eTF_R11G11B10F;
-        }
-        return eTF_Unknown;
-
-    case eTF_R10G10B10A2:
-        if (rd->m_FormatR10G10B10A2.IsValid())
-        {
-            pPF = &rd->m_FormatR10G10B10A2;
-            return eTF_R10G10B10A2;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16G16B16A16:
-        if (rd->m_FormatR16G16B16A16.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16B16A16;
-            return eTF_R16G16B16A16;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16G16B16A16S:
-        if (rd->m_FormatR16G16B16A16S.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16B16A16S;
-            return eTF_R16G16B16A16S;
-        }
-        return eTF_Unknown;
-
-    case eTF_R16G16B16A16F:
-        if (rd->m_FormatR16G16B16A16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16B16A16F;
-            return eTF_R16G16B16A16F;
-        }
-        return eTF_Unknown;
-
-    case eTF_R32G32B32A32F:
-        if (rd->m_FormatR32G32B32A32F.IsValid())
-        {
-            pPF = &rd->m_FormatR32G32B32A32F;
-            return eTF_R32G32B32A32F;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC1:
-        if (rd->m_FormatBC1.IsValid())
-        {
-            pPF = &rd->m_FormatBC1;
-            return eTF_BC1;
-        }
-        if (rd->m_FormatR8G8B8A8.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8B8A8;
-            return eTF_R8G8B8A8;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC2:
-        if (rd->m_FormatBC2.IsValid())
-        {
-            pPF = &rd->m_FormatBC2;
-            return eTF_BC2;
-        }
-        if (rd->m_FormatR8G8B8A8.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8B8A8;
-            return eTF_R8G8B8A8;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC3:
-        if (rd->m_FormatBC3.IsValid())
-        {
-            pPF = &rd->m_FormatBC3;
-            return eTF_BC3;
-        }
-        if (rd->m_FormatR8G8B8A8.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8B8A8;
-            return eTF_R8G8B8A8;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC4U:
-        if (rd->m_FormatBC4U.IsValid())
-        {
-            pPF = &rd->m_FormatBC4U;
-            return eTF_BC4U;
-        }
-        if (rd->m_FormatR8.IsValid())
-        {
-            pPF = &rd->m_FormatR8;
-            return eTF_R8;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC4S:
-        if (rd->m_FormatBC4S.IsValid())
-        {
-            pPF = &rd->m_FormatBC4S;
-            return eTF_BC4S;
-        }
-        if (rd->m_FormatR8S.IsValid())
-        {
-            pPF = &rd->m_FormatR8S;
-            return eTF_R8S;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC5U:
-        if (rd->m_FormatBC5U.IsValid())
-        {
-            pPF = &rd->m_FormatBC5U;
-            return eTF_BC5U;
-        }
-        if (rd->m_FormatR8G8.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8;
-            return eTF_R8G8;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC5S:
-        if (rd->m_FormatBC5S.IsValid())
-        {
-            pPF = &rd->m_FormatBC5S;
-            return eTF_BC5S;
-        }
-        if (rd->m_FormatR8G8S.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8S;
-            return eTF_R8G8S;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC6UH:
-        if (rd->m_FormatBC6UH.IsValid())
-        {
-            pPF = &rd->m_FormatBC6UH;
-            return eTF_BC6UH;
-        }
-        if (rd->m_FormatR16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16F;
-            return eTF_R16F;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC6SH:
-        if (rd->m_FormatBC6SH.IsValid())
-        {
-            pPF = &rd->m_FormatBC6SH;
-            return eTF_BC6SH;
-        }
-        if (rd->m_FormatR16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16F;
-            return eTF_R16F;
-        }
-        return eTF_Unknown;
-
-    case eTF_BC7:
-        if (rd->m_FormatBC7.IsValid())
-        {
-            pPF = &rd->m_FormatBC7;
-            return eTF_BC7;
-        }
-        if (rd->m_FormatR8G8B8A8.IsValid())
-        {
-            pPF = &rd->m_FormatR8G8B8A8;
-            return eTF_R8G8B8A8;
-        }
-        return eTF_Unknown;
-
-    case eTF_R9G9B9E5:
-        if (rd->m_FormatR9G9B9E5.IsValid())
-        {
-            pPF = &rd->m_FormatR9G9B9E5;
-            return eTF_R9G9B9E5;
-        }
-        if (rd->m_FormatR16G16B16A16F.IsValid())
-        {
-            pPF = &rd->m_FormatR16G16B16A16F;
-            return eTF_R16G16B16A16F;
-        }
-        return eTF_Unknown;
-
-    case eTF_D16:
-        if (rd->m_FormatD16.IsValid())
-        {
-            pPF = &rd->m_FormatD16;
-            return eTF_D16;
-        }
-    case eTF_D24S8:
-        if (rd->m_FormatD24S8.IsValid())
-        {
-            pPF = &rd->m_FormatD24S8;
-            return eTF_D24S8;
-        }
-    case eTF_D32F:
-        if (rd->m_FormatD32F.IsValid())
-        {
-            pPF = &rd->m_FormatD32F;
-            return eTF_D32F;
-        }
-    case eTF_D32FS8:
-        if (rd->m_FormatD32FS8.IsValid())
-        {
-            pPF = &rd->m_FormatD32FS8;
-            return eTF_D32FS8;
-        }
-        return eTF_Unknown;
-
-    case eTF_EAC_R11:
-        if (rd->m_FormatEAC_R11.IsValid())
-        {
-            pPF = &rd->m_FormatEAC_R11;
-            return eTF_EAC_R11;
-        }
-        return eTF_Unknown;
-
-    case eTF_EAC_RG11:
-        if (rd->m_FormatEAC_RG11.IsValid())
-        {
-            pPF = &rd->m_FormatEAC_RG11;
-            return eTF_EAC_RG11;
-        }
-        return eTF_Unknown;
-
-    case eTF_ETC2:
-        if (rd->m_FormatETC2.IsValid())
-        {
-            pPF = &rd->m_FormatETC2;
-            return eTF_ETC2;
-        }
-        return eTF_Unknown;
-
-    case eTF_ETC2A:
-        if (rd->m_FormatETC2A.IsValid())
-        {
-            pPF = &rd->m_FormatETC2A;
-            return eTF_ETC2A;
-        }
-        return eTF_Unknown;
-
-#ifdef CRY_USE_METAL
-    case eTF_PVRTC2:
-        if (rd->m_FormatPVRTC2.IsValid())
-        {
-            pPF = &rd->m_FormatPVRTC2;
-            return eTF_PVRTC2;
-        }
-        return eTF_Unknown;
-
-    case eTF_PVRTC4:
-        if (rd->m_FormatPVRTC4.IsValid())
-        {
-            pPF = &rd->m_FormatPVRTC4;
-            return eTF_PVRTC4;
-        }
-        return eTF_Unknown;
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    case eTF_ASTC_4x4:
-        if (rd->m_FormatASTC_4x4.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_4x4;
-            return eTF_ASTC_4x4;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_5x4:
-        if (rd->m_FormatASTC_5x4.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_5x4;
-            return eTF_ASTC_5x4;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_5x5:
-        if (rd->m_FormatASTC_5x5.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_5x5;
-            return eTF_ASTC_5x5;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_6x5:
-        if (rd->m_FormatASTC_6x5.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_6x5;
-            return eTF_ASTC_6x5;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_6x6:
-        if (rd->m_FormatASTC_6x6.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_6x6;
-            return eTF_ASTC_6x6;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_8x5:
-        if (rd->m_FormatASTC_8x5.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_8x5;
-            return eTF_ASTC_8x5;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_8x6:
-        if (rd->m_FormatASTC_8x6.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_8x6;
-            return eTF_ASTC_8x6;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_8x8:
-        if (rd->m_FormatASTC_8x8.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_8x8;
-            return eTF_ASTC_8x8;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_10x5:
-        if (rd->m_FormatASTC_10x5.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_10x5;
-            return eTF_ASTC_10x5;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_10x6:
-        if (rd->m_FormatASTC_10x6.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_10x6;
-            return eTF_ASTC_10x6;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_10x8:
-        if (rd->m_FormatASTC_10x8.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_10x8;
-            return eTF_ASTC_10x8;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_10x10:
-        if (rd->m_FormatASTC_10x10.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_10x10;
-            return eTF_ASTC_10x10;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_12x10:
-        if (rd->m_FormatASTC_12x10.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_12x10;
-            return eTF_ASTC_12x10;
-        }
-        return eTF_Unknown;
-
-    case eTF_ASTC_12x12:
-        if (rd->m_FormatASTC_12x12.IsValid())
-        {
-            pPF = &rd->m_FormatASTC_12x12;
-            return eTF_ASTC_12x12;
-        }
-        return eTF_Unknown;
-#endif
-
-    default:
-        assert(0);
-    }
-    return eTF_Unknown;
-}
-
-//===============================================================================
-
-bool CTexture::CreateRenderTarget(ETEX_Format eTF, const ColorF& cClear)
-{
-    if (eTF == eTF_Unknown)
-    {
-        eTF = m_eTFDst;
-    }
-    if (eTF == eTF_Unknown)
-    {
-        return false;
-    }
-    const byte* pData[6] = { NULL };
-
-    ETEX_Format eTFDst = ClosestFormatSupported(eTF);
-    if (eTF != eTFDst)
-    {
-        return false;
-    }
-    m_eTFDst = eTF;
-    m_nFlags |= FT_USAGE_RENDERTARGET;
-    m_cClearColor = cClear;
-    bool bRes = CreateDeviceTexture(pData);
-    PostCreate();
-
-    // Assign name to RT for enhanced debugging
-#if !defined(_RELEASE)
-#if defined(WIN32)
-#define D3DTEXTURE_CPP_USE_PRIVATEDATA
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-#endif
-
-#if defined(D3DTEXTURE_CPP_USE_PRIVATEDATA)
-    if (bRes)
-    {
-        m_pDevTexture->GetBaseTexture()->SetPrivateData(WKPDID_D3DDebugObjectName, strlen(m_SrcName.c_str()), m_SrcName.c_str());
-    }
-#endif
-
-    return bRes;
-}
-
-// Resolve anti-aliased RT to the texture
-bool CTexture::Resolve([[maybe_unused]] int nTarget, [[maybe_unused]] bool bUseViewportSize)
-{
-    if (m_bResolved)
-    {
-        return true;
-    }
-
-    m_bResolved = true;
-    if (!(m_nFlags & FT_USAGE_MSAA))
-    {
-        return true;
-    }
-
-    assert ((m_nFlags & FT_USAGE_RENDERTARGET) && (m_nFlags & FT_USAGE_MSAA) && m_pDeviceShaderResource && m_pDevTexture && m_pRenderTargetData->m_pDeviceTextureMSAA);
-    CDeviceTexture* pDestSurf = GetDevTexture();
-    CDeviceTexture* pSrcSurf =  GetDevTextureMSAA();
-
-    assert(pSrcSurf != NULL);
-    assert(pDestSurf != NULL);
-
-    gcpRendD3D->GetDeviceContext().ResolveSubresource(pDestSurf->Get2DTexture(), 0, pSrcSurf->Get2DTexture(), 0, (DXGI_FORMAT)m_pPixelFormat->DeviceFormat);
-    return true;
-}
-
-bool CTexture::CreateDeviceTexture(const byte* pData[6])
-{
-    if (!m_pPixelFormat)
-    {
-#if !defined(NDEBUG)
-        ETEX_Format eTF =
-#endif
-            ClosestFormatSupported(m_eTFDst);
-        assert(eTF != eTF_Unknown);
-        assert(eTF == m_eTFDst);
-    }
-    assert(m_pPixelFormat);
-    if (!m_pPixelFormat)
-    {
-        return false;
-    }
-
-    if (gRenDev->m_pRT->RC_CreateDeviceTexture(this, pData))
-    {
-        // Assign name to Texture for enhanced debugging
-#if !defined(RELEASE)
-#if defined (WIN64)
-        m_pDevTexture->GetBaseTexture()->SetPrivateData(WKPDID_D3DDebugObjectName, strlen(m_SrcName.c_str()), m_SrcName.c_str());
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-#endif
-
-        return true;
-    }
-
-    return false;
-}
-
-void CTexture::Unbind()
-{
-    if (m_pDeviceShaderResource)
-    {
-        gcpRendD3D->m_DevMan.UnbindSRV(m_pDeviceShaderResource);
-    }
-
-    CDeviceTexture* pDevTex = m_pDevTexture;
-
-    if (pDevTex)
-    {
-        pDevTex->Unbind();
-    }
-}
-
-bool CTexture::RT_CreateDeviceTexture(const byte* pData[6])
-{
-    SCOPED_RENDERER_ALLOCATION_NAME_HINT(GetSourceName());
-    AZ_ASSET_ATTACH_TO_SCOPE(this);
-
-    HRESULT hr;
-
-    int32 nESRAMOffset = -1;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-
-    //if we have any device owned resources allocated, we must sync with render thread
-    if (m_pDevTexture)
-    {
-        ReleaseDeviceTexture(false);
-    }
-    else
-    {
-        SAFE_DELETE(m_pRenderTargetData);
-    }
-
-    CD3D9Renderer* r = gcpRendD3D;
-    int nWdt = m_nWidth;
-    int nHgt = m_nHeight;
-    int nDepth = m_nDepth;
-    int nMips = m_nMips;
-    AZ_Assert(nWdt > 0 && nHgt > 0 && nMips > 0, "Attempting to create a device texture '%s' with height:%d, width:%d, and mip levels:%d. All three must be > 0", GetSourceName(), nHgt, nWdt, nMips);
-
-    #ifdef CRY_USE_METAL
-        bool isMetalCompressedTextureFormat = GetBlockDim(m_eTFSrc) != Vec2i(1);
-    #else
-        bool isMetalCompressedTextureFormat = false;
-    #endif
-
-        bool allowReinterpretingColorSpace = !isMetalCompressedTextureFormat && RenderCapabilities::SupportsTextureViews();
-    
-    byte* pTemp = NULL;
-
-    CDeviceManager* pDevMan = &r->m_DevMan;
-
-    bool resetSRGB = true;
-
-    if (m_nFlags & (FT_USAGE_RENDERTARGET | FT_USAGE_UNORDERED_ACCESS))
-    {
-        m_pRenderTargetData = new RenderTargetData();
-        #if defined(AZ_RESTRICTED_PLATFORM)
-            #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_6
-            #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-        #endif
-    }
-
-    uint32 nArraySize = m_nArraySize;
-
-    if (m_eTT == eTT_2D)
-    {
-        STextureInfo TI;
-        D3DFormat D3DFmt = m_pPixelFormat->DeviceFormat;
-
-        //nMips = 1;
-        DXGI_FORMAT nFormatOrig = D3DFmt;
-        
-        resetSRGB = false;
-        
-        m_bIsSRGB &= m_pPixelFormat->bCanReadSRGB && (m_nFlags & (FT_USAGE_MSAA | FT_USAGE_RENDERTARGET)) == 0;
-
-        if (m_bIsSRGB)
-        {
-            D3DFmt = ConvertToSRGBFmt(D3DFmt);
-        }
-
-        // must use typeless format to allow runtime casting
-        if (m_nFlags & FT_USAGE_ALLOWREADSRGB && allowReinterpretingColorSpace)
-        {
-            D3DFmt = ConvertToTypelessFmt(D3DFmt);
-        }
-
-        uint32 nUsage = 0;
-        if (m_nFlags & FT_USAGE_DEPTHSTENCIL)
-        {
-            nUsage |= CDeviceManager::USAGE_DEPTH_STENCIL;
-        }
-        if (m_nFlags & FT_USAGE_RENDERTARGET)
-        {
-            nUsage |= CDeviceManager::USAGE_RENDER_TARGET;
-        }
-        
-        #if defined(AZ_PLATFORM_IOS)
-            if (m_nFlags & FT_USAGE_MEMORYLESS)
-            {
-                nUsage |= CDeviceManager::USAGE_MEMORYLESS;
-            }
-        #endif
-        
-        if (m_nFlags & FT_USAGE_DYNAMIC)
-        {
-            nUsage |= CDeviceManager::USAGE_DYNAMIC;
-        }
-        if (m_nFlags & FT_STAGE_READBACK)
-        {
-            nUsage |= CDeviceManager::USAGE_STAGE_ACCESS | CDeviceManager::USAGE_CPU_READ;
-        }
-        if (m_nFlags & FT_STAGE_UPLOAD)
-        {
-            nUsage |= CDeviceManager::USAGE_STAGE_ACCESS | CDeviceManager::USAGE_CPU_WRITE;
-        }
-        if (m_nFlags & FT_USAGE_UNORDERED_ACCESS
-#if defined(SUPPORT_DEVICE_INFO)
-            && r->DevInfo().FeatureLevel() >= D3D_FEATURE_LEVEL_11_0
-#endif //defined(SUPPORT_DEVICE_INFO)
-            )
-        {
-            nUsage |= CDeviceManager::USAGE_UNORDERED_ACCESS;
-        }
-        if ((m_nFlags & (FT_DONT_RELEASE | FT_DONT_STREAM)) == (FT_DONT_RELEASE | FT_DONT_STREAM))
-        {
-            nUsage |= CDeviceManager::USAGE_ETERNAL;
-        }
-        if (m_nFlags & FT_USAGE_UAV_RWTEXTURE)
-        {
-            nUsage |= CDeviceManager::USAGE_UAV_RWTEXTURE;
-        }
-
-        if (m_nFlags & FT_FORCE_MIPS)
-        {
-            nUsage |= CDeviceManager::USAGE_AUTOGENMIPS;
-            if (nMips <= 1)
-            {
-                m_nMips = nMips = max(1, CTexture::CalcNumMips(nWdt, nHgt) - 2);
-            }
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_14
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-
-        if (m_nFlags & FT_USAGE_MSAA)
-        {
-            m_pRenderTargetData->m_nMSAASamples = (uint8)r->m_RP.m_MSAAData.Type;
-            m_pRenderTargetData->m_nMSAAQuality = (uint8)r->m_RP.m_MSAAData.Quality;
-
-            TI.m_nMSAASamples = m_pRenderTargetData->m_nMSAASamples;
-            TI.m_nMSAAQuality = m_pRenderTargetData->m_nMSAAQuality;
-            hr = pDevMan->Create2DTexture(m_SrcName, nWdt, nHgt, nMips, nArraySize, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pRenderTargetData->m_pDeviceTextureMSAA, &TI);
-
-            AZ_Assert(SUCCEEDED(hr), "Call to Create2DTexture failed for '%s'.", GetSourceName());
-            m_bResolved = false;
-
-            TI.m_nMSAASamples = 1;
-            TI.m_nMSAAQuality = 0;
-        }
-
-        if (pData[0])
-        {
-            {
-                STextureInfoData InitData[20];
-                int w = nWdt;
-                int h = nHgt;
-                int nOffset = 0;
-                const byte* src = pData[0];
-                for (int i = 0; i < nMips; i++)
-                {
-                    if (!w && !h)
-                    {
-                        break;
-                    }
-                    if (!w)
-                    {
-                        w = 1;
-                    }
-                    if (!h)
-                    {
-                        h = 1;
-                    }
-
-                    int nSize = TextureDataSize(w, h, 1, 1, 1, m_eTFSrc, m_eSrcTileMode);
-                    InitData[i].pSysMem = &src[nOffset];
-                    if (m_eSrcTileMode == eTM_None)
-                    {
-                        const Vec2i BlockDim = GetBlockDim(m_eTFSrc);
-                        if (BlockDim == Vec2i(1))
-                        {
-                            InitData[i].SysMemPitch = TextureDataSize(w, 1, 1, 1, 1, m_eTFSrc, eTM_None);
-                        }
-                        else
-                        {
-                            int blockSize = CImageExtensionHelper::BytesPerBlock(m_eTFSrc);
-                            InitData[i].SysMemPitch = (w + BlockDim.x - 1) / BlockDim.x * blockSize;
-                        }
-
-                        //ignored
-                        InitData[i].SysMemSlicePitch = nSize;
-                        InitData[i].SysMemTileMode = eTM_None;
-                    }
-                    else
-                    {
-                        InitData[i].SysMemPitch = 0;
-                        InitData[i].SysMemSlicePitch = 0;
-                        InitData[i].SysMemTileMode = m_eSrcTileMode;
-                    }
-
-                    w >>= 1;
-                    h >>= 1;
-                    nOffset += nSize;
-                }
-
-                TI.m_pData = InitData;
-
-                SAFE_RELEASE(m_pDevTexture);
-                hr = pDevMan->Create2DTexture(m_SrcName, nWdt, nHgt, nMips, nArraySize, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pDevTexture, &TI);
-                if (!FAILED(hr) && m_pDevTexture)
-                {
-                    m_pDevTexture->SetNoDelete(!!(m_nFlags & FT_DONT_RELEASE));
-                }
-            }
-        }
-        else // no texture data so just make an empty texture
-        {
-            #if defined(AZ_RESTRICTED_PLATFORM)
-                #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_7
-                #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-            #endif
-
-            SAFE_RELEASE(m_pDevTexture);
-            hr = pDevMan->Create2DTexture(m_SrcName, nWdt, nHgt, nMips, nArraySize, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pDevTexture, &TI, false, nESRAMOffset);
-            if (!FAILED(hr) && m_pDevTexture)
-            {
-                m_pDevTexture->SetNoDelete(!!(m_nFlags & FT_DONT_RELEASE));
-            }
-        }
-
-        if (FAILED(hr))
-        {
-            AZ_Assert(0, "Call to Create2DTexture failed for '%s'.", GetSourceName());
-            return false;
-        }
-
-        // Restore format
-        if (m_nFlags & FT_USAGE_ALLOWREADSRGB)
-        {
-            D3DFmt = nFormatOrig;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        m_pDeviceShaderResource = static_cast<D3DShaderResourceView*> (CreateDeviceResourceView(SResourceView::ShaderResourceView(m_eTFDst, 0, -1, 0, nMips, m_bIsSRGB, false)));
-        
-        m_nMinMipVidActive = 0;
-
-        if (m_nFlags & FT_USAGE_ALLOWREADSRGB && allowReinterpretingColorSpace)
-        {
-            m_pDeviceShaderResourceSRGB = static_cast<D3DShaderResourceView*> (CreateDeviceResourceView(SResourceView::ShaderResourceView(m_eTFDst, 0, -1, 0, nMips, true, false)));
-        }
-    }
-    else if (m_eTT == eTT_Cube)
-    {
-        STextureInfo TI;
-        D3DFormat D3DFmt = m_pPixelFormat->DeviceFormat;
-        uint32 nUsage = 0;
-        if (m_nFlags & FT_USAGE_DEPTHSTENCIL)
-        {
-            nUsage |= CDeviceManager::USAGE_DEPTH_STENCIL;
-        }
-        if (m_nFlags & FT_USAGE_RENDERTARGET)
-        {
-            nUsage |= CDeviceManager::USAGE_RENDER_TARGET;
-        }
-        
-#if defined(AZ_PLATFORM_IOS)
-        if (m_nFlags & FT_USAGE_MEMORYLESS)
-        {
-            nUsage |= CDeviceManager::USAGE_MEMORYLESS;
-        }
-#endif
-        
-        if (m_nFlags & FT_USAGE_DYNAMIC)
-        {
-            nUsage |= CDeviceManager::USAGE_DYNAMIC;
-        }
-        if (m_nFlags & FT_STAGE_READBACK)
-        {
-            nUsage |= CDeviceManager::USAGE_STAGE_ACCESS | CDeviceManager::USAGE_CPU_READ;
-        }
-        if (m_nFlags & FT_STAGE_UPLOAD)
-        {
-            nUsage |= CDeviceManager::USAGE_STAGE_ACCESS | CDeviceManager::USAGE_CPU_WRITE;
-        }
-        if ((m_nFlags & (FT_DONT_RELEASE | FT_DONT_STREAM)) == (FT_DONT_RELEASE | FT_DONT_STREAM))
-        {
-            nUsage |= CDeviceManager::USAGE_ETERNAL;
-        }
-
-        if (m_nFlags & FT_FORCE_MIPS)
-        {
-            nUsage |= CDeviceManager::USAGE_AUTOGENMIPS;
-            if (nMips <= 1)
-            {
-                m_nMips = nMips = max(1, CTexture::CalcNumMips(nWdt, nHgt) - 2);
-            }
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_14
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-
-        if (m_nFlags & FT_USAGE_MSAA)
-        {
-            m_pRenderTargetData->m_nMSAASamples = (uint8)r->m_RP.m_MSAAData.Type;
-            m_pRenderTargetData->m_nMSAAQuality = (uint8)r->m_RP.m_MSAAData.Quality;
-
-            TI.m_nMSAASamples = m_pRenderTargetData->m_nMSAASamples;
-            TI.m_nMSAAQuality = m_pRenderTargetData->m_nMSAAQuality;
-            hr = pDevMan->CreateCubeTexture(m_SrcName, nWdt, nMips, m_nArraySize, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pRenderTargetData->m_pDeviceTextureMSAA, &TI);
-
-            AZ_Assert(SUCCEEDED(hr), "Call to CreateCubeTexuture failed for '%s'.", GetSourceName());
-            m_bResolved = false;
-
-            TI.m_nMSAASamples = 1;
-            TI.m_nMSAAQuality = 0;
-        }
-        DXGI_FORMAT nFormatOrig = D3DFmt;
-        DXGI_FORMAT nFormatSRGB = D3DFmt;
-
-        resetSRGB = false;
-
-        {
-            m_bIsSRGB &= m_pPixelFormat->bCanReadSRGB && (m_nFlags & (FT_USAGE_MSAA | FT_USAGE_RENDERTARGET)) == 0;
-
-            if ((m_bIsSRGB || m_nFlags & FT_USAGE_ALLOWREADSRGB))
-            {
-                nFormatSRGB = ConvertToSRGBFmt(D3DFmt);
-            }
-
-            if (m_bIsSRGB)
-            {
-                D3DFmt = nFormatSRGB;
-            }
-
-            // must use typeless format to allow runtime casting
-            if (m_nFlags & FT_USAGE_ALLOWREADSRGB)
-            {
-                D3DFmt = ConvertToTypelessFmt(D3DFmt);
-            }
-        }
-
-        if (pData[0])
-        {
-            AZ_Assert(m_nArraySize == 1, "There is no implementation for tex array data.");
-
-            STextureInfoData InitData[g_nD3D10MaxSupportedSubres];
-
-            for (int nSide = 0; nSide < 6; nSide++)
-            {
-                int w = nWdt;
-                int h = nHgt;
-                int nOffset = 0;
-                const byte* src = (!(m_nFlags & FT_REPLICATE_TO_ALL_SIDES)) ? pData[nSide] : pData[0];
-
-                for (int i = 0; i < nMips; i++)
-                {
-                    if (!w && !h)
-                    {
-                        break;
-                    }
-                    if (!w)
-                    {
-                        w = 1;
-                    }
-                    if (!h)
-                    {
-                        h = 1;
-                    }
-
-                    int nSubresInd = nSide * nMips + i;
-                    int nSize = TextureDataSize(w, h, 1, 1, 1, m_eTFSrc, m_eSrcTileMode);
-
-                    InitData[nSubresInd].pSysMem = &src[nOffset];
-
-                    if (m_eSrcTileMode == eTM_None)
-                    {
-                        InitData[nSubresInd].SysMemPitch = TextureDataSize(w, 1, 1, 1, 1, m_eTFSrc, eTM_None);
-
-                        //ignored
-                        InitData[nSubresInd].SysMemSlicePitch = nSize;
-                        InitData[nSubresInd].SysMemTileMode = eTM_None;
-                    }
-                    else
-                    {
-                        InitData[nSubresInd].SysMemPitch = 0;
-                        InitData[nSubresInd].SysMemSlicePitch = 0;
-                        InitData[nSubresInd].SysMemTileMode = m_eSrcTileMode;
-                    }
-
-                    w >>= 1;
-                    h >>= 1;
-                    nOffset += nSize;
-                }
-            }
-
-            TI.m_pData = InitData;
-            SAFE_RELEASE(m_pDevTexture);
-            hr = pDevMan->CreateCubeTexture(m_SrcName, nWdt, nMips, m_nArraySize, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pDevTexture, &TI);
-            if (!FAILED(hr) && m_pDevTexture)
-            {
-                m_pDevTexture->SetNoDelete(!!(m_nFlags & FT_DONT_RELEASE));
-            }
-        }
-        else
-        {
-            //hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, 0, 0); // validates parameters
-            //assert(hr == S_FALSE);
-            SAFE_RELEASE(m_pDevTexture);
-            hr = pDevMan->CreateCubeTexture(m_SrcName, nWdt, nMips, m_nArraySize, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pDevTexture, &TI);
-            if (!FAILED(hr) && m_pDevTexture)
-            {
-                m_pDevTexture->SetNoDelete(!!(m_nFlags & FT_DONT_RELEASE));
-            }
-        }
-        if (FAILED(hr))
-        {
-            AZ_Assert(0, "Call to CreateCubeTexture failed for '%s'.", GetSourceName());
-            return false;
-        }
-
-        if (m_nFlags & FT_USAGE_ALLOWREADSRGB)
-        {
-            D3DFmt = nFormatOrig;
-        }
-
-        D3DCubeTexture* pID3DTexture = m_pDevTexture->GetCubeTexture();
-
-        D3DShaderResourceView* pRes = NULL;
-        D3D11_SHADER_RESOURCE_VIEW_DESC ResDesc;
-        ZeroStruct(ResDesc);
-        ResDesc.Format = (DXGI_FORMAT)ConvertToShaderResourceFmt(D3DFmt);
-
-        if (m_nArraySize > 1)
-        {
-            ResDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY;
-            ResDesc.TextureCubeArray.MipLevels = nMips;
-            ResDesc.TextureCubeArray.First2DArrayFace = 0;
-            ResDesc.TextureCubeArray.NumCubes = m_nArraySize;
-
-            // Create the multi-slice shader resource view
-            hr = gcpRendD3D->GetDevice().CreateShaderResourceView(pID3DTexture, &ResDesc, &pRes);
-            if (FAILED(hr))
-            {
-                AZ_Assert(0, "Call to CreateShaderResourceView failed for '%s'.", GetSourceName());
-                return false;
-            }
-            m_pDeviceShaderResource = pRes;
-            m_nMinMipVidActive = 0;
-        }
-        else
-        {
-            ResDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
-            ResDesc.TextureCube.MipLevels = nMips;
-            ResDesc.TextureCube.MostDetailedMip = 0;
-            hr = gcpRendD3D->GetDevice().CreateShaderResourceView(pID3DTexture, &ResDesc, &pRes);
-            if (FAILED(hr))
-            {
-                AZ_Assert(0, "Call to CreateShaderResourceView failed for '%s'.", GetSourceName());
-                return false;
-            }
-            m_pDeviceShaderResource = pRes;
-            m_nMinMipVidActive = 0;
-
-            if (m_nFlags & FT_USAGE_ALLOWREADSRGB)
-            {
-                ResDesc.Format = (DXGI_FORMAT)ConvertToShaderResourceFmt(nFormatSRGB);
-
-                D3DShaderResourceView* pSRGBRes = NULL;
-                hr = gcpRendD3D->GetDevice().CreateShaderResourceView(pID3DTexture, &ResDesc, &pSRGBRes);
-                if (FAILED(hr))
-                {
-                    AZ_Assert(0, "Call to CreateShaderResourceView failed for '%s'.", GetSourceName());
-                    return false;
-                }
-                //assign shader resource views
-                m_pDeviceShaderResourceSRGB = pSRGBRes;
-            }
-        }
-    }
-    else if (m_eTT == eTT_3D)
-    {
-        STextureInfo TI;
-        D3DFormat D3DFmt = m_pPixelFormat->DeviceFormat;
-
-        uint32 nUsage = 0;
-        if (m_nFlags & FT_USAGE_DEPTHSTENCIL)
-        {
-            nUsage |= CDeviceManager::USAGE_DEPTH_STENCIL;
-        }
-        if (m_nFlags & FT_USAGE_RENDERTARGET)
-        {
-            nUsage |= CDeviceManager::USAGE_RENDER_TARGET;
-        }
-        
-#if defined(AZ_PLATFORM_IOS)
-        if (m_nFlags & FT_USAGE_MEMORYLESS)
-        {
-            nUsage |= CDeviceManager::USAGE_MEMORYLESS;
-        }
-#endif
-        
-        if (m_nFlags & FT_USAGE_DYNAMIC)
-        {
-            nUsage |= CDeviceManager::USAGE_DYNAMIC;
-        }
-        if ((m_nFlags & (FT_DONT_RELEASE | FT_DONT_STREAM)) == (FT_DONT_RELEASE | FT_DONT_STREAM))
-        {
-            nUsage |= CDeviceManager::USAGE_ETERNAL;
-        }
-        if (m_nFlags & FT_STAGE_READBACK)
-        {
-            nUsage |= CDeviceManager::USAGE_STAGE_ACCESS | CDeviceManager::USAGE_CPU_READ;
-        }
-        if (m_nFlags & FT_STAGE_UPLOAD)
-        {
-            nUsage |= CDeviceManager::USAGE_STAGE_ACCESS | CDeviceManager::USAGE_CPU_WRITE;
-        }
-        if (m_nFlags & FT_USAGE_UNORDERED_ACCESS
-#if defined(SUPPORT_DEVICE_INFO)
-            && r->DevInfo().FeatureLevel() >= D3D_FEATURE_LEVEL_11_0
-#endif //defined(SUPPORT_DEVICE_INFO)
-            )
-        {
-            nUsage |= CDeviceManager::USAGE_UNORDERED_ACCESS;
-        }
-        if (m_nFlags & FT_USAGE_UAV_RWTEXTURE)
-        {
-            nUsage |= CDeviceManager::USAGE_UAV_RWTEXTURE;
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_14
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-
-        if (m_nFlags & FT_USAGE_MSAA)
-        {
-            m_pRenderTargetData->m_nMSAASamples = (uint8)r->m_RP.m_MSAAData.Type;
-            m_pRenderTargetData->m_nMSAAQuality = (uint8)r->m_RP.m_MSAAData.Quality;
-
-            TI.m_nMSAASamples = m_pRenderTargetData->m_nMSAASamples;
-            TI.m_nMSAAQuality = m_pRenderTargetData->m_nMSAAQuality;
-            hr = pDevMan->CreateVolumeTexture(m_SrcName, nWdt, nHgt, m_nDepth, nMips, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pRenderTargetData->m_pDeviceTextureMSAA, &TI);
-
-            AZ_Assert(SUCCEEDED(hr), "Call to CreateVolumeTexture failed for '%s'.", GetSourceName());
-            m_bResolved = false;
-
-            TI.m_nMSAASamples = 1;
-            TI.m_nMSAAQuality = 0;
-        }
-        if (pData[0])
-        {
-            STextureInfoData InitData[15];
-
-            int w = nWdt;
-            int h = nHgt;
-            int d = nDepth;
-            int nOffset = 0;
-            const byte* src = pData[0];
-
-            for (int i = 0; i < nMips; i++)
-            {
-                if (!w && !h && !d)
-                {
-                    break;
-                }
-                if (!w)
-                {
-                    w = 1;
-                }
-                if (!h)
-                {
-                    h = 1;
-                }
-                if (!d)
-                {
-                    d = 1;
-                }
-
-                int nSliceSize = TextureDataSize(w, h, 1, 1, 1, m_eTFSrc);
-                int nMipSize = TextureDataSize(w, h, d, 1, 1, m_eTFSrc);
-                InitData[i].pSysMem = &src[nOffset];
-                InitData[i].SysMemPitch = TextureDataSize(w, 1, 1, 1, 1, m_eTFSrc);
-
-                //ignored
-                InitData[i].SysMemSlicePitch = nSliceSize;
-                InitData[i].SysMemTileMode = eTM_None;
-
-                w >>= 1;
-                h >>= 1;
-                d >>= 1;
-
-                nOffset += nMipSize;
-            }
-
-            TI.m_pData = InitData;
-            SAFE_RELEASE(m_pDevTexture);
-            hr = pDevMan->CreateVolumeTexture(m_SrcName, nWdt, nHgt, nDepth, nMips, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pDevTexture, &TI);
-            if (!FAILED(hr) && m_pDevTexture)
-            {
-                m_pDevTexture->SetNoDelete(!!(m_nFlags & FT_DONT_RELEASE));
-            }
-        }
-        else
-        {
-            //hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, 0, 0); // validates parameters
-            //assert(hr == S_FALSE);
-            SAFE_RELEASE(m_pDevTexture);
-            hr = pDevMan->CreateVolumeTexture(m_SrcName, nWdt, nHgt, nDepth, nMips, nUsage, m_cClearColor, D3DFmt, (D3DPOOL)0, &m_pDevTexture, &TI);
-            if (!FAILED(hr) && m_pDevTexture)
-            {
-                m_pDevTexture->SetNoDelete(!!(m_nFlags & FT_DONT_RELEASE));
-            }
-        }
-        if (SUCCEEDED(hr))
-        {
-            PREFAST_ASSUME(m_pDevTexture);
-
-            m_pDeviceShaderResource = static_cast<D3DShaderResourceView*> (CreateDeviceResourceView(SResourceView::ShaderResourceView(m_eTFDst)));
-            m_nMinMipVidActive = 0;
-        }
-        else
-        {
-            AZ_Assert(0, "Call to CreateVolumeTexture failed for '%s'.", GetSourceName());
-            return false;
-        }
-    }
-    else
-    {
-        AZ_Assert(0, "Texture type not supported for this function.");
-        return false;
-    }
-
-    SetTexStates();
-
-    AZ_Assert(!IsStreamed(), "IsStreamed must be false.");
-    if (m_pDevTexture)
-    {
-        m_nActualSize = m_nPersistentSize = m_pDevTexture->GetDeviceSize();
-        if (m_nFlags & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET))
-        {
-            CTexture::s_nStatsCurDynamicTexMem += m_nActualSize;
-        }
-        else
-        {
-            CTexture::s_nStatsCurManagedNonStreamedTexMem += m_nActualSize;
-        }
-    }
-
-    // Notify that resource is dirty
-    InvalidateDeviceResource(eDeviceResourceDirty | eDeviceResourceViewDirty);
-
-#if defined(D3DTEXTURE_CPP_USE_PRIVATEDATA)
-    if (m_pDevTexture)
-    {
-        m_pDevTexture->GetBaseTexture()->SetPrivateData(WKPDID_D3DDebugObjectName, m_SrcName.length(), m_SrcName.c_str());
-    }
-#endif
-
-    if (!pData[0])
-    {
-        return true;
-    }
-
-
-    if (resetSRGB)
-    {
-        m_bIsSRGB = false;
-    }
-
-    SetWasUnload(false);
-
-    SAFE_DELETE_ARRAY(pTemp);
-    return true;
-}
-
-void CTexture::ReleaseDeviceTexture(bool bKeepLastMips, bool bFromUnload)
-{
-    PROFILE_FRAME(CTexture_ReleaseDeviceTexture);
-    AZ_TRACE_METHOD();
-
-    if (!gcpRendD3D->m_pRT->IsRenderThread())
-    {
-        if (!gcpRendD3D->m_pRT->IsMainThread())
-        {
-            CryFatalError("Texture is deleted from non-main and non-render thread, which causes command buffer corruption!");
-        }
-
-        // Push to render thread to process
-        gcpRendD3D->m_pRT->RC_ReleaseDeviceTexture(this);
-        return;
-    }
-
-    Unbind();
-
-    if (!bFromUnload)
-    {
-        AbortStreamingTasks(this);
-    }
-
-    if (s_pTextureStreamer)
-    {
-        s_pTextureStreamer->OnTextureDestroy(this);
-    }
-
-    SAFE_DELETE(m_pRenderTargetData);
-
-    if (!m_bNoTexture)
-    {
-        CDeviceTexture* pTex = m_pDevTexture;
-
-        D3DShaderResourceView* pSRVSRGB = m_pDeviceShaderResourceSRGB;
-        SAFE_RELEASE(pSRVSRGB);
-        m_pDeviceShaderResourceSRGB = NULL;
-
-        D3DShaderResourceView* pSRV = m_pDeviceShaderResource;
-        SAFE_RELEASE(pSRV);
-        m_pDeviceShaderResource = 0;
-
-        D3DSurface* pRTV = m_pDeviceRTV;
-        SAFE_RELEASE(pRTV);
-        m_pDeviceRTV = NULL;
-
-        D3DSurface* pRTVMS = m_pDeviceRTVMS;
-        SAFE_RELEASE(pRTVMS);
-        m_pDeviceRTVMS = NULL;
-
-        if (!m_pFileTexMips || !m_pFileTexMips->m_pPoolItem)
-        {
-            if (IsStreamed())
-            {
-                SAFE_DELETE(pTex);          // for manually created textures
-            }
-            else
-            {
-                SAFE_RELEASE(pTex);
-            }
-        }
-
-        m_pDevTexture = NULL;
-
-        // otherwise it's already taken into account in the m_pFileTexMips->m_pPoolItem's dtor
-        if (!m_pFileTexMips || !m_pFileTexMips->m_pPoolItem)
-        {
-            if (IsDynamic())
-            {
-                assert(CTexture::s_nStatsCurDynamicTexMem >= m_nActualSize);
-                CTexture::s_nStatsCurDynamicTexMem -= m_nActualSize;
-            }
-            else if (!IsStreamed())
-            {
-                assert(CTexture::s_nStatsCurManagedNonStreamedTexMem >= m_nActualSize);
-                CTexture::s_nStatsCurManagedNonStreamedTexMem -= m_nActualSize;
-            }
-        }
-        if (m_pFileTexMips)
-        {
-            m_bStreamPrepared = false;
-            StreamRemoveFromPool();
-            if (bKeepLastMips)
-            {
-                const int nLastMipsStart = m_nMips - m_CacheFileHeader.m_nMipsPersistent;
-                int nSides = StreamGetNumSlices();
-                for (int nS = 0; nS < nSides; nS++)
-                {
-                    for (int i = 0; i < nLastMipsStart; i++)
-                    {
-                        SMipData* mp = &m_pFileTexMips->m_pMipHeader[i].m_Mips[nS];
-                        mp->Free();
-                    }
-                }
-            }
-            else
-            {
-                Unlink();
-                StreamState_ReleaseInfo(this, m_pFileTexMips);
-                m_pFileTexMips = NULL;
-                m_bStreamed = false;
-                SetStreamingInProgress(InvalidStreamSlot);
-                m_bStreamRequested = false;
-            }
-        }
-        m_nActualSize = 0;
-        m_nPersistentSize = 0;
-    }
-    else
-    {
-        m_pDevTexture = NULL;
-        m_pDeviceRTV = NULL;
-        m_pDeviceShaderResource = NULL;
-        m_pDeviceShaderResourceSRGB = NULL;
-    }
-    m_bNoTexture = false;
-}
-
-void* CTexture::CreateDeviceResourceView(const SResourceView& rv)
-{
-    const SPixFormat* pPixFormat = NULL;
-    if (ClosestFormatSupported((ETEX_Format)rv.m_Desc.nFormat, pPixFormat) == eTF_Unknown)
-    {
-        return NULL;
-    }
-
-    HRESULT hr = E_FAIL;
-    void* pResult = NULL;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_8
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    // DX expects -1 for selecting all mip maps/slices. max count throws an exception
-    const uint nSliceCount = rv.m_Desc.nSliceCount == SResourceView().m_Desc.nSliceCount ? (uint) - 1 : (uint)rv.m_Desc.nSliceCount;
-#endif
-
-    if (!m_pDevTexture)
-    {
-        return nullptr;
-    }
-
-    D3DTexture* pTex = m_pDevTexture->Get2DTexture();
-
-    switch (rv.m_Desc.eViewType)
-    {
-    case SResourceView::eShaderResourceView:
-    {
-        D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
-        SetShaderResourceViewDesc(rv, m_eTT, pPixFormat->DeviceFormat, m_nArraySize, nSliceCount, srvDesc);
-        if (rv.m_Desc.bMultisample && m_eTT == eTT_2D)
-        {
-            pTex = m_pRenderTargetData->m_pDeviceTextureMSAA->Get2DTexture();
-        }
-        D3DShaderResourceView* pSRV = NULL;
-        hr = gcpRendD3D->GetDevice().CreateShaderResourceView(pTex, &srvDesc, &pSRV);
-        pResult = pSRV;
-
-#if defined(D3DTEXTURE_CPP_USE_PRIVATEDATA)
-        if (pSRV)
-        {
-            AZStd::string srvName = AZStd::string::format("[SRV] %s", m_SrcName.c_str());
-            pSRV->SetPrivateData(WKPDID_D3DDebugObjectName, srvName.length(), srvName.c_str());
-        }
-#endif
-
-    }
-    break;
-    case SResourceView::eRenderTargetView:
-    {
-        D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
-        SetRenderTargetViewDesc(rv, m_eTT, pPixFormat->DeviceFormat, m_nArraySize, nSliceCount, rtvDesc);
-        if (rv.m_Desc.bMultisample && m_eTT == eTT_2D)
-        {
-            pTex = m_pRenderTargetData->m_pDeviceTextureMSAA->Get2DTexture();
-        }
-        D3DSurface* pRTV = NULL;
-        hr = gcpRendD3D->GetDevice().CreateRenderTargetView(pTex, &rtvDesc, &pRTV);
-        pResult = pRTV;
-
-#if defined(D3DTEXTURE_CPP_USE_PRIVATEDATA)
-            if (pRTV)
-            {
-                AZStd::string rtvName = AZStd::string::format("[RTV] %s", m_SrcName.c_str());
-                pRTV->SetPrivateData(WKPDID_D3DDebugObjectName, rtvName.length(), rtvName.c_str());
-            }
-#endif
-    }
-    break;
-    case SResourceView::eDepthStencilView:
-    {
-        D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
-        SetDepthStencilViewDesc(rv, m_eTT, pPixFormat->DeviceFormat, m_nArraySize, nSliceCount, dsvDesc);
-
-        dsvDesc.Flags = rv.m_Desc.nFlags;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_9
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-
-        D3DDepthSurface* pDSV = NULL;
-        hr = gcpRendD3D->GetDevice().CreateDepthStencilView(pTex, &dsvDesc, &pDSV);
-        pResult = pDSV;
-
-#if defined(D3DTEXTURE_CPP_USE_PRIVATEDATA)
-            if (pDSV)
-            {
-                AZStd::string dsvName = AZStd::string::format("[DSV] %s", m_SrcName.c_str());
-                pDSV->SetPrivateData(WKPDID_D3DDebugObjectName, dsvName.length(), dsvName.c_str());
-            }
-#endif
-    }
-    break;
-    case SResourceView::eUnorderedAccessView:
-    {
-        D3D11_UNORDERED_ACCESS_VIEW_DESC uavDesc;
-
-        SetUnorderedAccessViewDesc(rv, m_eTT, pPixFormat->DeviceFormat, m_nArraySize, nSliceCount, uavDesc);
-
-        if (rv.m_Desc.nFlags & 0x1)     // typed UAV loads are only allowed for single-component 32-bit element types
-        {
-            uavDesc.Format = DXGI_FORMAT_R32_UINT;
-        }
-
-        D3DUnorderedAccessView* pUAV = NULL;
-        hr = gcpRendD3D->GetDevice().CreateUnorderedAccessView(pTex, &uavDesc, &pUAV);
-
-        pResult = pUAV;
-#if defined(D3DTEXTURE_CPP_USE_PRIVATEDATA)
-            if (pUAV)
-            {
-                AZStd::string uavName = AZStd::string::format("[UAV] %s", m_SrcName.c_str());
-                pUAV->SetPrivateData(WKPDID_D3DDebugObjectName, uavName.length(), uavName.c_str());
-            }
-#endif
-    }
-    break;
-    }
-
-    if (FAILED(hr))
-    {
-        CRY_ASSERT(0);
-        return NULL;
-    }
-
-    return pResult;
-}
-
-void CTexture::SetTexStates()
-{
-    STexState s;
-
-    const bool noMipFiltering = m_nMips <= 1 && !(m_nFlags & FT_FORCE_MIPS);
-    s.m_nMinFilter = FILTER_LINEAR;
-    s.m_nMagFilter = FILTER_LINEAR;
-    s.m_nMipFilter = noMipFiltering ? FILTER_NONE : FILTER_LINEAR;
-
-    const int addrMode = (m_nFlags & FT_STATE_CLAMP || m_eTT == eTT_Cube) ? TADDR_CLAMP : TADDR_WRAP;
-    s.SetClampMode(addrMode, addrMode, addrMode);
-
-    m_nDefState = (uint16)CTexture::GetTexState(s);
-}
-
-static uint32 sAddressMode(int nAddress)
-{
-    IF (nAddress < 0, 0)
-    {
-        nAddress = TADDR_WRAP;
-    }
-
-    switch (nAddress)
-    {
-    case TADDR_WRAP:
-        return D3D11_TEXTURE_ADDRESS_WRAP;
-    case TADDR_CLAMP:
-        return D3D11_TEXTURE_ADDRESS_CLAMP;
-    case TADDR_BORDER:
-        return D3D11_TEXTURE_ADDRESS_BORDER;
-    case TADDR_MIRROR:
-        return D3D11_TEXTURE_ADDRESS_MIRROR;
-    default:
-        assert(0);
-        return D3D11_TEXTURE_ADDRESS_WRAP;
-    }
-}
-
-void STexState::SetComparisonFilter(bool bEnable)
-{
-    if (m_pDeviceState)
-    {
-        D3DSamplerState* pSamp = (D3DSamplerState*)m_pDeviceState;
-        SAFE_RELEASE(pSamp);
-        m_pDeviceState = NULL;
-    }
-    m_bComparison = bEnable;
-}
-
-bool STexState::SetClampMode(int nAddressU, int nAddressV, int nAddressW)
-{
-    if (m_pDeviceState)
-    {
-        D3DSamplerState* pSamp = (D3DSamplerState*)m_pDeviceState;
-        SAFE_RELEASE(pSamp);
-        m_pDeviceState = NULL;
-    }
-
-    m_nAddressU = sAddressMode(nAddressU);
-    m_nAddressV = sAddressMode(nAddressV);
-    m_nAddressW = sAddressMode(nAddressW);
-    return true;
-}
-
-bool STexState::SetFilterMode(int nFilter)
-{
-    IF (nFilter < 0, 0)
-    {
-        nFilter = FILTER_TRILINEAR;
-    }
-
-    if (m_pDeviceState)
-    {
-        D3DSamplerState* pSamp = (D3DSamplerState*)m_pDeviceState;
-        SAFE_RELEASE(pSamp);
-        m_pDeviceState = NULL;
-    }
-
-    switch (nFilter)
-    {
-    case FILTER_POINT:
-    case FILTER_NONE:
-        m_nMinFilter = FILTER_POINT;
-        m_nMagFilter = FILTER_POINT;
-        m_nMipFilter = FILTER_NONE;
-        m_nAnisotropy = 1;
-        break;
-    case FILTER_LINEAR:
-        m_nMinFilter = FILTER_LINEAR;
-        m_nMagFilter = FILTER_LINEAR;
-        m_nMipFilter = FILTER_NONE;
-        m_nAnisotropy = 1;
-        break;
-    case FILTER_BILINEAR:
-        m_nMinFilter = FILTER_LINEAR;
-        m_nMagFilter = FILTER_LINEAR;
-        m_nMipFilter = FILTER_POINT;
-        m_nAnisotropy = 1;
-        break;
-    case FILTER_TRILINEAR:
-        m_nMinFilter = FILTER_LINEAR;
-        m_nMagFilter = FILTER_LINEAR;
-        m_nMipFilter = FILTER_LINEAR;
-        m_nAnisotropy = 1;
-        break;
-    case FILTER_ANISO2X:
-    case FILTER_ANISO4X:
-    case FILTER_ANISO8X:
-    case FILTER_ANISO16X:
-        m_nMinFilter = nFilter;
-        m_nMagFilter = nFilter;
-        m_nMipFilter = nFilter;
-        if (nFilter == FILTER_ANISO2X)
-        {
-            m_nAnisotropy = min(gcpRendD3D->m_MaxAnisotropyLevel, 2);
-        }
-        else
-        if (nFilter == FILTER_ANISO4X)
-        {
-            m_nAnisotropy = min(gcpRendD3D->m_MaxAnisotropyLevel, 4);
-        }
-        else
-        if (nFilter == FILTER_ANISO8X)
-        {
-            m_nAnisotropy = min(gcpRendD3D->m_MaxAnisotropyLevel, 8);
-        }
-        else
-        if (nFilter == FILTER_ANISO16X)
-        {
-            m_nAnisotropy = min(gcpRendD3D->m_MaxAnisotropyLevel, 16);
-        }
-        break;
-    default:
-        assert(0);
-        return false;
-    }
-    return true;
-}
-
-void STexState::SetBorderColor(DWORD dwColor)
-{
-    if (m_pDeviceState)
-    {
-        D3DSamplerState* pSamp = (D3DSamplerState*)m_pDeviceState;
-        SAFE_RELEASE(pSamp);
-        m_pDeviceState = NULL;
-    }
-
-    m_dwBorderColor = dwColor;
-}
-
-void STexState::PostCreate()
-{
-    if (m_pDeviceState)
-    {
-        return;
-    }
-
-    D3D11_SAMPLER_DESC Desc;
-    ZeroStruct(Desc);
-    D3DSamplerState* pSamp = NULL;
-    // AddressMode of 0 is INVALIDARG
-    Desc.AddressU = m_nAddressU ? (D3D11_TEXTURE_ADDRESS_MODE)m_nAddressU : D3D11_TEXTURE_ADDRESS_WRAP;
-    Desc.AddressV = m_nAddressV ? (D3D11_TEXTURE_ADDRESS_MODE)m_nAddressV : D3D11_TEXTURE_ADDRESS_WRAP;
-    Desc.AddressW = m_nAddressW ? (D3D11_TEXTURE_ADDRESS_MODE)m_nAddressW : D3D11_TEXTURE_ADDRESS_WRAP;
-    ColorF col((uint32)m_dwBorderColor);
-    Desc.BorderColor[0] = col.r;
-    Desc.BorderColor[1] = col.g;
-    Desc.BorderColor[2] = col.b;
-    Desc.BorderColor[3] = col.a;
-    if (m_bComparison)
-    {
-        Desc.ComparisonFunc = D3D11_COMPARISON_LESS;
-    }
-    else
-    {
-        Desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-    }
-
-    Desc.MaxAnisotropy = 1;
-    Desc.MinLOD = 0;
-    if (m_nMipFilter == FILTER_NONE)
-    {
-        Desc.MaxLOD = 0.0f;
-    }
-    else
-    {
-        Desc.MaxLOD = 100.0f;
-    }
-
-    Desc.MipLODBias = m_MipBias;
-
-    if (m_bComparison)
-    {
-        if (m_nMinFilter == FILTER_LINEAR && m_nMagFilter == FILTER_LINEAR && m_nMipFilter == FILTER_LINEAR || m_nMinFilter == FILTER_TRILINEAR || m_nMagFilter == FILTER_TRILINEAR)
-        {
-            Desc.Filter = D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR;
-        }
-        else
-        if (m_nMinFilter == FILTER_LINEAR && m_nMagFilter == FILTER_LINEAR && (m_nMipFilter == FILTER_NONE || m_nMipFilter == FILTER_POINT) || m_nMinFilter == FILTER_BILINEAR || m_nMagFilter == FILTER_BILINEAR)
-        {
-            Desc.Filter = D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT;
-        }
-        else
-        if (m_nMinFilter == FILTER_POINT && m_nMagFilter == FILTER_POINT && (m_nMipFilter == FILTER_NONE || m_nMipFilter == FILTER_POINT))
-        {
-            Desc.Filter = D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
-        }
-        else
-        if (m_nMinFilter >= FILTER_ANISO2X && m_nMagFilter >= FILTER_ANISO2X && m_nMipFilter >= FILTER_ANISO2X)
-        {
-            Desc.Filter = D3D11_FILTER_COMPARISON_ANISOTROPIC;
-            Desc.MaxAnisotropy = m_nAnisotropy;
-        }
-    }
-    else
-    {
-        if (m_nMinFilter == FILTER_LINEAR && m_nMagFilter == FILTER_LINEAR && m_nMipFilter == FILTER_LINEAR || m_nMinFilter == FILTER_TRILINEAR || m_nMagFilter == FILTER_TRILINEAR)
-        {
-            Desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-        }
-        else
-        if (m_nMinFilter == FILTER_LINEAR && m_nMagFilter == FILTER_LINEAR && (m_nMipFilter == FILTER_NONE || m_nMipFilter == FILTER_POINT) || m_nMinFilter == FILTER_BILINEAR || m_nMagFilter == FILTER_BILINEAR)
-        {
-            Desc.Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
-        }
-        else
-        if (m_nMinFilter == FILTER_POINT && m_nMagFilter == FILTER_POINT && (m_nMipFilter == FILTER_NONE || m_nMipFilter == FILTER_POINT))
-        {
-            Desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
-        }
-        else
-        if (m_nMinFilter >= FILTER_ANISO2X && m_nMagFilter >= FILTER_ANISO2X && m_nMipFilter >= FILTER_ANISO2X)
-        {
-            Desc.Filter = D3D11_FILTER_ANISOTROPIC;
-            Desc.MaxAnisotropy = m_nAnisotropy;
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-
-    HRESULT hr = gcpRendD3D->GetDevice().CreateSamplerState(&Desc, &pSamp);
-    if (SUCCEEDED(hr))
-    {
-        m_pDeviceState = pSamp;
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void STexState::Destroy()
-{
-    if (m_pDeviceState)
-    {
-        D3DSamplerState* pSamp = (D3DSamplerState*)m_pDeviceState;
-        SAFE_RELEASE(pSamp);
-        m_pDeviceState = NULL;
-    }
-}
-
-void STexState::Init(const STexState& src)
-{
-    memcpy(this, &src, sizeof(src));
-    if (m_pDeviceState)
-    {
-        D3DSamplerState* pSamp = (D3DSamplerState*)m_pDeviceState;
-        pSamp->AddRef();
-    }
-}
-
-bool CTexture::SetClampingMode(int nAddressU, int nAddressV, int nAddressW)
-{
-    return s_sDefState.SetClampMode(nAddressU, nAddressV, nAddressW);
-}
-
-bool CTexture::SetFilterMode(int nFilter)
-{
-    return s_sDefState.SetFilterMode(nFilter);
-}
-
-void CTexture::UpdateTexStates()
-{
-    m_nDefState = (uint16)CTexture::GetTexState(s_sDefState);
-}
-
-void CTexture::SetSamplerState(int nTS, int nSUnit, EHWShaderClass eHWSC)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    assert(gcpRendD3D->m_pRT->IsRenderThread());
-
-    STexState* pTS = &s_TexStates[nTS];
-    D3DSamplerState* pSamp = (D3DSamplerState*)pTS->m_pDeviceState;
-
-    assert(pSamp);
-
-    if (pSamp)
-    {
-        if (eHWSC == eHWSC_Pixel)
-        {
-            gcpRendD3D->m_DevMan.BindSampler(eHWSC_Pixel, &pSamp, nSUnit, 1);
-        }
-        else
-        if (eHWSC == eHWSC_Domain)
-        {
-            gcpRendD3D->m_DevMan.BindSampler(eHWSC_Domain, &pSamp, nSUnit, 1);
-        }
-        else
-        if (eHWSC == eHWSC_Vertex)
-        {
-            gcpRendD3D->m_DevMan.BindSampler(eHWSC_Vertex, &pSamp, nSUnit, 1);
-        }
-        else
-        if (eHWSC == eHWSC_Compute)
-        {
-            gcpRendD3D->m_DevMan.BindSampler(eHWSC_Compute, &pSamp, nSUnit, 1);
-        }
-        else
-        if (eHWSC == eHWSC_Geometry)
-        {
-            gcpRendD3D->m_DevMan.BindSampler(eHWSC_Geometry, &pSamp, nSUnit, 1);
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-}
-
-void CTexture::ApplySamplerState(int nSUnit, EHWShaderClass eHWSC, int nState)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-        uint32 nTSSel = Isel32(nState, (int32)m_nDefState);
-    assert(nTSSel >= 0 && nTSSel < s_TexStates.size());
-
-    CDeviceTexture* pDevTex = m_pDevTexture;
-
-    // avoiding L2 cache misses from usage from up ahead
-    PrefetchLine(pDevTex, 0);
-
-    assert(nSUnit >= 0 && nSUnit < 16);
-    assert((nSUnit >= 0 || nSUnit == -2) && nSUnit < gcpRendD3D->m_NumSamplerSlots);
-
-    CD3D9Renderer *const __restrict rd = gcpRendD3D;
-    const int nFrameID = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-    if (IsVertexTexture())
-        eHWSC = eHWSC_Vertex;
-
-    SetSamplerState(nTSSel, nSUnit, eHWSC);
-}
-
-//------------------------------------------------------------------------------
-// Given a texture and a binding slot, this is the method that actually refreshes 
-// the texture resource, validates it and finally binds it to the HW stage.
-void CTexture::ApplyTexture(int nTUnit, EHWShaderClass eHWSC, SResourceView::KeyType nResViewKey)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-
-    STexStageInfo *TexStages = s_TexStages;
-    CDeviceTexture* pDevTex = m_pDevTexture;
-
-    // avoiding L2 cache misses from usage from up ahead
-    PrefetchLine(pDevTex, 0);
-
-    assert(nTUnit >= 0 && nTUnit < gcpRendD3D->m_NumResourceSlots);
-
-    CD3D9Renderer *const __restrict rd = gcpRendD3D;
-    const int nFrameID = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-    if (IsStreamed() && !m_bPostponed)
-    {
-        bool bIsUnloaded = IsUnloaded();
-
-        assert(m_pFileTexMips);
-        if (bIsUnloaded || !m_bStreamPrepared || IsPartiallyLoaded())
-        {
-            PROFILE_FRAME(Texture_Precache);
-            if (!CRenderer::CV_r_texturesstreaming || !m_bStreamPrepared || bIsUnloaded)
-            {
-                if (bIsUnloaded)
-                    StreamLoadFromCache(0);
-                else
-                    Load(m_eTFDst);
-
-                pDevTex = m_pDevTexture;
-            }
-        }
-    }
-
-    IF(this != CTexture::s_pTexNULL && (!pDevTex || !pDevTex->GetBaseTexture()), 0)
-    {
-        // apply black by default
-        CTexture*     pBlackTexture = CTextureManager::Instance()->GetBlackTexture();
-        if (m_eTT != eTT_Cube && pBlackTexture)
-        {
-            pBlackTexture->ApplyTexture(nTUnit, eHWSC, nResViewKey);
-        }
-        else
-        {
-            pBlackTexture = CTextureManager::Instance()->GetBlackTextureCM();
-            if (m_eTT == eTT_Cube && pBlackTexture)
-            {
-                pBlackTexture->ApplyTexture(nTUnit, eHWSC, nResViewKey);
-            }
-        }
-        return;
-    }
-
-    // Resolve multisampled RT to texture
-    if (!m_bResolved)
-    {
-        Resolve();
-    }
-
-    bool bStreamed = IsStreamed();
-    if (m_nAccessFrameID != nFrameID)
-    {
-        m_nAccessFrameID = nFrameID;
-
-#if !defined(_RELEASE)
-        rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumTextures++;
-        if (m_nFlags & (FT_USAGE_RENDERTARGET | FT_USAGE_DYNAMIC))
-        {
-            rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_DynTexturesSize += m_nActualSize;
-        }
-        else
-        {
-            if (bStreamed)
-            {
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesStreamVidSize += m_nActualSize;
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesStreamSysSize += StreamComputeDevDataSize(0);
-            }
-            else
-            {
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesSysMemSize += m_nActualSize;
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesVidMemSize += m_nActualSize;
-            }
-        }
-#endif
-
-        // mip map fade in
-        if (bStreamed)
-        {
-            const float fCurrentMipBias = m_fCurrentMipBias;
-            if (fabsf(fCurrentMipBias) > 0.26667f)
-            {
-                // one mip per half a second
-                m_fCurrentMipBias -= 0.26667f * fCurrentMipBias;
-
-                gcpRendD3D->GetDeviceContext().SetResourceMinLOD(pDevTex->Get2DTexture(), m_fCurrentMipBias + (float)m_nMinMipVidUploaded);
-            }
-            else if (fCurrentMipBias != 0.f)
-            {
-                m_fCurrentMipBias = 0.f;
-            }
-        }
-    }
-
-    if (IsVertexTexture())
-        eHWSC = eHWSC_Vertex;
-
-    const bool bUnnorderedAcessView = SResourceView(nResViewKey).m_Desc.eViewType == SResourceView::eUnorderedAccessView;
-
-    D3DShaderResourceView* pResView = GetShaderResourceView(nResViewKey);
-
-    if (pDevTex == TexStages[nTUnit].m_DevTexture && pResView == TexStages[nTUnit].m_pCurResView && eHWSC == TexStages[nTUnit].m_eHWSC)
-        return;
-
-    TexStages[nTUnit].m_pCurResView = pResView;
-    TexStages[nTUnit].m_eHWSC = eHWSC;
-
-    //  <DEPRECATED> This must get re-factored post C3.  
-    //  This check is ultra-buggy, render targets setup is deferred until last moment might not be matching this check at all. Also very wrong for MRTs
-
-    if (rd->m_pCurTarget[0] == this)
-    {
-        //assert(rd->m_pCurTarget[0]->m_pDeviceRTV);
-        rd->m_pNewTarget[0]->m_bWasSetRT = false;
-        rd->GetDeviceContext().OMSetRenderTargets(1, &rd->m_pNewTarget[0]->m_pTarget, rd->m_pNewTarget[0]->m_pDepth);
-    }
-
-    TexStages[nTUnit].m_DevTexture = pDevTex;
-
-#if !defined(_RELEASE)
-    rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumTextChanges++;
-#endif
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        if (IsNoTexture())
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "CTexture::Apply(): (%d) \"%s\" (Not found)\n", nTUnit, m_SrcName.c_str());
-        }
-        else
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "CTexture::Apply(): (%d) \"%s\"\n", nTUnit, m_SrcName.c_str());
-        }
-    }
-#endif
-
-    {
-#ifdef DO_RENDERLOG
-        if (CRenderer::CV_r_log >= 3 && int64(nResViewKey) >= 0)
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "CTexture::Apply(): Shader Resource View: %ul \n", nResViewKey);
-        }
-#endif
-
-        if (bUnnorderedAcessView)
-        {
-            // todo: 
-            // - add support for pixel shader side via OMSetRenderTargetsAndUnorderedAccessViews
-            // - DX11.1 very likely API will be similar to CSSetUnorderedAccessViews, but for all stages
-            D3DUnorderedAccessView *pUAV = (D3DUnorderedAccessView*)pResView;
-            rd->GetDeviceContext().CSSetUnorderedAccessViews(nTUnit, 1, &pUAV, NULL);
-            return;
-        }
-
-        {
-            if (IsVertexTexture())
-                eHWSC = eHWSC_Vertex;
-
-            if (eHWSC == eHWSC_Pixel)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Pixel, pResView, nTUnit);
-            }
-            else if (eHWSC == eHWSC_Vertex)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Vertex, pResView, nTUnit);
-            }
-            else if (eHWSC == eHWSC_Domain)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Domain, pResView, nTUnit);
-            }
-            else if (eHWSC == eHWSC_Compute)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Compute, pResView, nTUnit);
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-    }
-}
-
-void CTexture::Apply(int nTUnit, int nState, int nTexMatSlot, int nSUnit, SResourceView::KeyType nResViewKey, EHWShaderClass eHWSC)
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    assert(nTUnit >= 0);
-
-    uint32 nTSSel = Isel32(nState, (int32)m_nDefState);
-    assert(nTSSel >= 0 && nTSSel < s_TexStates.size());
-
-#if defined(OPENGL)
-    // Due to driver issues on MALI gpus only point filtering is allowed for 32 bit float textures.
-    // If another filtering is used the sampler returns black.
-    if ((gcpRendD3D->m_Features | RFT_HW_ARM_MALI) && 
-        (m_eTFDst == eTF_R32F || m_eTFDst == eTF_R32G32B32A32F) &&
-        (s_TexStates[nTSSel].m_nMagFilter != FILTER_POINT || s_TexStates[nTSSel].m_nMinFilter != FILTER_POINT))
-    {
-        STexState newState = s_TexStates[nTSSel];
-        newState.SetFilterMode(FILTER_POINT);
-        nTSSel = CTexture::GetTexState(newState);
-        AZ_WarningOnce("Texture", false, "The current device only supports point filtering for full float textures. Forcing filtering for texture in slot %d", nTUnit);
-    }
-#endif // defined(OPENGL)
-
-    STexStageInfo* TexStages = s_TexStages;
-
-    CDeviceTexture* pDevTex = m_pDevTexture;
-
-    // avoiding L2 cache misses from usage from up ahead
-    PrefetchLine(pDevTex, 0);
-
-    if (nSUnit >= -1)
-    {
-        nSUnit = Isel32(nSUnit, nTUnit);
-    }
-
-    assert(nTUnit >= 0 && nTUnit < gcpRendD3D->m_NumResourceSlots);
-    assert((nSUnit >= 0 || nSUnit == -2) && nSUnit < gcpRendD3D->m_NumSamplerSlots);
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    const int nFrameID = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_nFrameUpdateID;
-
-    if (IsStreamed() && !m_bPostponed)
-    {
-        bool bIsUnloaded = IsUnloaded();
-
-        assert(m_pFileTexMips);
-        if (bIsUnloaded || !m_bStreamPrepared || IsPartiallyLoaded())
-        {
-            PROFILE_FRAME(Texture_Precache);
-            if (!CRenderer::CV_r_texturesstreaming || !m_bStreamPrepared || bIsUnloaded)
-            {
-                if (bIsUnloaded)
-                {
-                    StreamLoadFromCache(0);
-                }
-                else
-                {
-                    Load(m_eTFDst);
-                }
-
-                pDevTex = m_pDevTexture;
-            }
-        }
-
-        if (nTexMatSlot != EFTT_UNKNOWN)
-        {
-            m_nStreamingPriority = max((int8)m_nStreamingPriority, TextureHelpers::LookupTexPriority((EEfResTextures)nTexMatSlot));
-        }
-    }
-
-    IF (this != CTexture::s_pTexNULL && (!pDevTex || !pDevTex->GetBaseTexture()), 0)
-    {
-        // apply black by default
-        if (m_eTT != eTT_Cube && CTextureManager::Instance()->GetBlackTexture() && this != CTextureManager::Instance()->GetBlackTexture())
-        {
-            CTextureManager::Instance()->GetBlackTexture()->Apply(nTUnit, nState, nTexMatSlot, nSUnit, nResViewKey);
-        }
-        else if (m_eTT == eTT_Cube && CTextureManager::Instance()->GetBlackTextureCM() && this != CTextureManager::Instance()->GetBlackTextureCM())
-        {
-            CTextureManager::Instance()->GetBlackTextureCM()->Apply(nTUnit, nState, nTexMatSlot, nSUnit, nResViewKey);
-        }
-        return;
-    }
-
-    // Resolve multisampled RT to texture
-    if (!m_bResolved)
-    {
-        Resolve();
-    }
-    bool bStreamed = IsStreamed();
-    if (m_nAccessFrameID != nFrameID)
-    {
-        m_nAccessFrameID = nFrameID;
-
-#if !defined(_RELEASE)
-        rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumTextures++;
-        if (m_nFlags & (FT_USAGE_RENDERTARGET | FT_USAGE_DYNAMIC))
-        {
-            rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_DynTexturesSize += m_nActualSize;
-        }
-        else
-        {
-            if (bStreamed)
-            {
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesStreamVidSize += m_nActualSize;
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesStreamSysSize += StreamComputeDevDataSize(0);
-            }
-            else
-            {
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesSysMemSize += m_nActualSize;
-                rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_ManagedTexturesVidMemSize += m_nActualSize;
-            }
-        }
-#endif
-
-        // mip map fade in
-        if (bStreamed)
-        {
-            const float fCurrentMipBias = m_fCurrentMipBias;
-            if (fabsf(fCurrentMipBias) > 0.26667f)
-            {
-                // one mip per half a second
-                m_fCurrentMipBias -= 0.26667f * fCurrentMipBias;
-#if defined(CRY_USE_METAL)
-                //For metal, the lodminclamp is set once at initialization for the mtlsamplerstate. The mtlSamplerDescriptor's properties
-                //are only used during mtlSamplerState object creation; once created the behaviour of a sampler state object is
-                //fixed and cannot be changed. Hence we modify the descriptor with minlod and recreate the sampler state.
-                STexState* pTS = &s_TexStates[nTSSel];
-                D3DSamplerState* pSamp = (D3DSamplerState*)pTS->m_pDeviceState;
-                pSamp->SetLodMinClamp(m_fCurrentMipBias + static_cast<float>(m_nMinMipVidUploaded));
-#else
-                gcpRendD3D->GetDeviceContext().SetResourceMinLOD(pDevTex->Get2DTexture(), m_fCurrentMipBias + static_cast<float>(m_nMinMipVidUploaded));
-#endif
-            }
-            else if (fCurrentMipBias != 0.f)
-            {
-                m_fCurrentMipBias = 0.f;
-            }
-        }
-    }
-
-    if (IsVertexTexture())
-    {
-        eHWSC = eHWSC_Vertex;
-    }
-
-    const bool bUnnorderedAcessView = SResourceView(nResViewKey).m_Desc.eViewType == SResourceView::eUnorderedAccessView;
-    if (!bUnnorderedAcessView && nSUnit >= 0)
-    {
-        SetSamplerState(nTSSel, nSUnit, eHWSC);
-    }
-
-    D3DShaderResourceView* pResView = GetShaderResourceView(nResViewKey, s_TexStates[nTSSel].m_bSRGBLookup);
-
-    if (pDevTex == TexStages[nTUnit].m_DevTexture && pResView == TexStages[nTUnit].m_pCurResView && eHWSC == TexStages[nTUnit].m_eHWSC)
-    {
-        return;
-    }
-
-    TexStages[nTUnit].m_pCurResView = pResView;
-    TexStages[nTUnit].m_eHWSC = eHWSC;
-    //  <DEPRECATED> This must get re-factored post C3.
-    //  -   This check is ultra-buggy, render targets setup is deferred until last moment might not be matching this check at all. Also very wrong for MRTs
-
-    if (rd->m_pCurTarget[0] == this)
-    {
-        //assert(rd->m_pCurTarget[0]->m_pDeviceRTV);
-        rd->m_pNewTarget[0]->m_bWasSetRT = false;
-        rd->GetDeviceContext().OMSetRenderTargets(1, &rd->m_pNewTarget[0]->m_pTarget, rd->m_pNewTarget[0]->m_pDepth);
-    }
-
-    TexStages[nTUnit].m_DevTexture = pDevTex;
-
-#if !defined(_RELEASE)
-    rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumTextChanges++;
-#endif
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log >= 3)
-    {
-        if (IsNoTexture())
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "CTexture::Apply(): (%d) \"%s\" (Not found)\n", nTUnit, m_SrcName.c_str());
-        }
-        else
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "CTexture::Apply(): (%d) \"%s\"\n", nTUnit, m_SrcName.c_str());
-        }
-    }
-#endif
-
-    {
-#ifdef DO_RENDERLOG
-        if (CRenderer::CV_r_log >= 3 && int64(nResViewKey) >= 0)
-        {
-            rd->Logv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "CTexture::Apply(): Shader Resource View: %ul \n", nResViewKey);
-        }
-#endif
-
-        if (bUnnorderedAcessView)
-        {
-            // todo:
-            // - add support for pixel shader side via OMSetRenderTargetsAndUnorderedAccessViews
-            // - DX11.1 very likely API will be similar to CSSetUnorderedAccessViews, but for all stages
-            D3DUnorderedAccessView* pUAV = (D3DUnorderedAccessView*)pResView;
-            rd->GetDeviceContext().CSSetUnorderedAccessViews(nTUnit, 1, &pUAV, NULL);
-            return;
-        }
-
-        {
-            if (IsVertexTexture())
-            {
-                eHWSC = eHWSC_Vertex;
-            }
-
-            if (eHWSC == eHWSC_Pixel)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Pixel, pResView, nTUnit);
-            }
-            else
-            if (eHWSC == eHWSC_Vertex)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Vertex, pResView, nTUnit);
-            }
-            else
-            if (eHWSC == eHWSC_Domain)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Domain, pResView, nTUnit);
-            }
-            else
-            if (eHWSC == eHWSC_Compute)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Compute, pResView, nTUnit);
-            }
-            else
-            if (eHWSC == eHWSC_Geometry)
-            {
-                rd->m_DevMan.BindSRV(eHWSC_Geometry, pResView, nTUnit);
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-    }
-}
-
-void CTexture::UpdateTextureRegion(const uint8_t* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc)
-{
-    gRenDev->m_pRT->RC_UpdateTextureRegion(this, data, nX, nY, nZ, USize, VSize, ZSize, eTFSrc);
-}
-
-void CTexture::RT_UpdateTextureRegion(const byte* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc)
-{
-    PROFILE_FRAME(UpdateTextureRegion);
-
-    if (m_eTT != eTT_2D && m_eTT != eTT_3D)
-    {
-        assert(0);
-        return;
-    }
-
-    HRESULT hr = S_OK;
-    CDeviceTexture* pDevTexture = GetDevTexture();
-    assert(pDevTexture);
-    if (!pDevTexture)
-    {
-        return;
-    }
-
-    bool bDone = false;
-    D3D11_BOX rc = {aznumeric_caster(nX), aznumeric_caster(nY), 0, aznumeric_caster(nX + USize), aznumeric_caster(nY + VSize), 1};
-    if (m_eTT == eTT_2D)
-    {
-        if (GetBlockDim(m_eTFDst) == Vec2i(1))
-        {
-            int nBPPSrc = CTexture::BytesPerBlock(eTFSrc);
-            int nBPPDst = CTexture::BytesPerBlock(m_eTFDst);
-            if (nBPPSrc == nBPPDst)
-            {
-                int nRowPitch = CTexture::TextureDataSize(USize, 1, 1, 1, 1, eTFSrc);
-                const int nSlicePitch = CTexture::TextureDataSize(USize, VSize, 1, 1, 1, eTFSrc);
-                gcpRendD3D->GetDeviceContext().UpdateSubresource(pDevTexture->Get2DTexture(), 0, &rc, data, nRowPitch, nSlicePitch);
-                bDone = true;
-            }
-            else
-            {
-                assert(0);
-                bDone = true;
-            }
-        }
-    }
-    else if (m_eTT == eTT_3D)
-    {
-        rc.front = nZ;
-        rc.back = nZ + ZSize;
-
-        int nBPPSrc = CTexture::BytesPerBlock(eTFSrc);
-        int nBPPDst = CTexture::BytesPerBlock(m_eTFDst);
-        if (nBPPSrc == nBPPDst)
-        {
-            if (m_nFlags & FT_USAGE_DYNAMIC)
-            {
-                D3DVolumeTexture* pDT = pDevTexture->GetVolumeTexture();
-                int cZ, cY;
-                for (cZ = nZ; cZ < ZSize; cZ++)
-                {
-                    D3D11_MAPPED_SUBRESOURCE lrct;
-                    uint32 nLockFlags = D3D11_MAP_WRITE_DISCARD;
-                    uint32 nSubRes = D3D11CalcSubresource(0, cZ, 1);
-
-                    hr = gcpRendD3D->GetDeviceContext().Map(pDT, nSubRes, (D3D11_MAP)nLockFlags, 0, &lrct);
-                    assert(hr == S_OK);
-
-                    byte* pDst = ((byte*)lrct.pData) + nX * 4 + nY * lrct.RowPitch;
-                    for (cY = 0; cY < VSize; cY++)
-                    {
-                        cryMemcpy(pDst, data, USize * 4);
-                        data += USize * 4;
-                        pDst += lrct.RowPitch;
-                    }
-                    gcpRendD3D->GetDeviceContext().Unmap(pDT, nSubRes);
-                }
-            }
-            else
-            {
-                int U = USize;
-                int V = VSize;
-                int Z = ZSize;
-                for (int i = 0; i < m_nMips; i++)
-                {
-                    if (!U)
-                    {
-                        U = 1;
-                    }
-                    if (!V)
-                    {
-                        V = 1;
-                    }
-                    if (!Z)
-                    {
-                        Z = 1;
-                    }
-
-                    int nRowPitch = CTexture::TextureDataSize(U, 1, 1, 1, 1, eTFSrc);
-                    int nDepthPitch = m_eTT == eTT_3D ? CTexture::TextureDataSize(U, V, 1, 1, 1, eTFSrc) : 0;
-
-                    gcpRendD3D->GetDeviceContext().UpdateSubresource(pDevTexture->GetBaseTexture(), i, &rc, data, nRowPitch, nDepthPitch);
-                    bDone = true;
-
-                    data += nDepthPitch * Z;
-
-                    U >>= 1;
-                    V >>= 1;
-                    Z >>= 1;
-
-                    rc.front >>= 1;
-                    rc.left >>= 1;
-                    rc.top >>= 1;
-
-                    rc.back = max(rc.front + 1, rc.back >> 1);
-                    rc.right = max(rc.left + 4, rc.right >> 1);
-                    rc.bottom = max(rc.top + 4, rc.bottom >> 1);
-                }
-            }
-        }
-        else if ((eTFSrc == eTF_B8G8R8A8 || eTFSrc == eTF_B8G8R8X8) && (m_eTFDst == eTF_B5G6R5))
-        {
-            assert(0);
-            bDone = true;
-        }
-    }
-
-    if (!bDone)
-    {
-        D3D11_BOX box;
-        ZeroStruct(box);
-        box.right = USize;
-        box.bottom = VSize;
-        box.back = 1;
-        const int nPitch = CTexture::TextureDataSize(USize, 1, 1, 1, 1, eTFSrc);
-        const int nSlicePitch = CTexture::TextureDataSize(USize, VSize, 1, 1, 1, eTFSrc);
-        gcpRendD3D->GetDeviceContext().UpdateSubresource(pDevTexture->Get2DTexture(), 0, &box, data, nPitch, nSlicePitch);
-    }
-}
-
-bool CTexture::Clear()
-{
-    if (!(m_nFlags & FT_USAGE_RENDERTARGET))
-        return false;
-
-    gRenDev->m_pRT->RC_ClearTarget(this, m_cClearColor);
-    return true;
-}
-
-bool CTexture::Clear(const ColorF& color)
-{
-    if (!(m_nFlags & FT_USAGE_RENDERTARGET))
-    {
-        return false;
-    }
-
-    gRenDev->m_pRT->RC_ClearTarget(this, color);
-    return true;
-}
-
-void SEnvTexture::Release()
-{
-    ReleaseDeviceObjects();
-    SAFE_DELETE(m_pTex);
-}
-
-void SEnvTexture::RT_SetMatrix()
-{
-    Matrix44A matView, matProj;
-    gRenDev->GetModelViewMatrix(matView.GetData());
-    gRenDev->GetProjectionMatrix(matProj.GetData());
-
-    float fWidth = m_pTex ? (float)m_pTex->GetWidth() : 1;
-    float fHeight = m_pTex ? (float)m_pTex->GetHeight() : 1;
-
-    Matrix44A matScaleBias(0.5f, 0, 0,   0,
-        0, -0.5f,    0,   0,
-        0,     0, 0.5f,   0,
-        // texel alignment - also push up y axis reflection up a bit
-        0.5f + 0.5f / fWidth, 0.5f + 1.0f / fHeight, 0.5f, 1.0f);
-
-    Matrix44A m = matProj * matScaleBias;
-    Matrix44A mm = matView * m;
-    m_Matrix = mm;
-}
-
-void SEnvTexture::ReleaseDeviceObjects()
-{
-    //if (m_pTex)
-    //  m_pTex->ReleaseDynamicRT(true);
-}
-
-bool CTexture::RenderEnvironmentCMHDR([[maybe_unused]] int size, [[maybe_unused]] Vec3& Pos, [[maybe_unused]] TArray<unsigned short>& vecData)
-{
-#if !defined(CONSOLE)
-
-    iLog->Log("Start generating a cubemap...");
-
-    vecData.SetUse(0);
-
-    int vX, vY, vWidth, vHeight;
-    gRenDev->GetViewport(&vX, &vY, &vWidth, &vHeight);
-
-    const int nOldWidth = gRenDev->GetCurrentContextViewportWidth();
-    const int nOldHeight = gRenDev->GetCurrentContextViewportHeight();
-    gRenDev->ChangeViewport(0, 0, size, size);
-
-    int nPFlags = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags;
-
-    CTexture* ptexGenEnvironmentCM = CTexture::Create2DTexture("$GenEnvironmentCM", size, size, 0, FT_DONT_STREAM, 0, eTF_R16G16B16A16F, eTF_R16G16B16A16F);
-    if (!ptexGenEnvironmentCM || !ptexGenEnvironmentCM->GetDevTexture())
-    {
-        iLog->Log("Failed generating a cubemap: out of video memory");
-        gRenDev->ChangeViewport(0, 0, nOldWidth, nOldHeight);
-
-        SAFE_RELEASE(ptexGenEnvironmentCM);
-        return false;
-    }
-
-    // Disable/set cvars that can affect cube map generation. This is thread unsafe (we assume editor will not run in mt mode), no other way around at this time
-    //  - coverage buffer unreliable for multiple views
-    //  - custom view distance ratios
-
-    ICVar* pCoverageBufferCV = gEnv->pConsole->GetCVar("e_CoverageBuffer");
-    const int32 nCoverageBuffer = pCoverageBufferCV ? pCoverageBufferCV->GetIVal() : 0;
-    if (pCoverageBufferCV)
-    {
-        pCoverageBufferCV->Set(0);
-    }
-
-    ICVar* pStatObjBufferRenderTasksCV = gEnv->pConsole->GetCVar("e_StatObjBufferRenderTasks");
-    const int32 nStatObjBufferRenderTasks = pStatObjBufferRenderTasksCV ? pStatObjBufferRenderTasksCV->GetIVal() : 0;
-    if (pStatObjBufferRenderTasksCV)
-    {
-        pStatObjBufferRenderTasksCV->Set(0);
-    }
-
-    ICVar* pViewDistRatioCV = gEnv->pConsole->GetCVar("e_ViewDistRatio");
-    const float fOldViewDistRatio = pViewDistRatioCV ? pViewDistRatioCV->GetFVal() : 1.f;
-    if (pViewDistRatioCV)
-    {
-        pViewDistRatioCV->Set(10000.f);
-    }
-
-    ICVar* pViewDistRatioVegetationCV = gEnv->pConsole->GetCVar("e_ViewDistRatioVegetation");
-    const float fOldViewDistRatioVegetation = pViewDistRatioVegetationCV ? pViewDistRatioVegetationCV->GetFVal() : 100.f;
-    if (pViewDistRatioVegetationCV)
-    {
-        pViewDistRatioVegetationCV->Set(10000.f);
-    }
-
-    ICVar* pLodRatioCV = gEnv->pConsole->GetCVar("e_LodRatio");
-    const float fOldLodRatio = pLodRatioCV ? pLodRatioCV->GetFVal() : 1.f;
-    if (pLodRatioCV)
-    {
-        pLodRatioCV->Set(1000.f);
-    }
-
-    Vec3 oldSunDir, oldSunStr, oldSunRGB;
-    float oldSkyKm, oldSkyKr, oldSkyG;
-    if (CRenderer::CV_r_HideSunInCubemaps)
-    {
-        gEnv->p3DEngine->GetSkyLightParameters(oldSunDir, oldSunStr, oldSkyKm, oldSkyKr, oldSkyG, oldSunRGB);
-        gEnv->p3DEngine->SetSkyLightParameters(oldSunDir, oldSunStr, oldSkyKm, oldSkyKr, 1.0f, oldSunRGB, true); // Hide sun disc
-    }
-
-    const int32 nFlaresCV = CRenderer::CV_r_flares;
-    CRenderer::CV_r_flares = 0;
-
-    ICVar* pSSDOHalfResCV = gEnv->pConsole->GetCVar("r_ssdoHalfRes");
-    const int nOldSSDOHalfRes = pSSDOHalfResCV ? pSSDOHalfResCV->GetIVal() : 1;
-    if (pSSDOHalfResCV)
-    {
-        pSSDOHalfResCV->Set(0);
-    }
-
-    ICVar* pDynamicGI = gEnv->pConsole->GetCVar("e_GI");
-    const int oldDynamicGIValue = pDynamicGI ? pDynamicGI->GetIVal() : 1;
-    if (pDynamicGI)
-    {
-        pDynamicGI->Set(0);
-    }
-
-    const int nDesktopWidth = gcpRendD3D->m_deskwidth;
-    const int nDesktopHeight = gcpRendD3D->m_deskheight;
-    gcpRendD3D->m_deskwidth = gcpRendD3D->m_deskheight = size;
-
-    gcpRendD3D->EnableSwapBuffers(false);
-    for (int nSide = 0; nSide < 6; nSide++)
-    {
-        gcpRendD3D->BeginFrame();
-        gcpRendD3D->SetViewport(0, 0, size, size);
-
-        gcpRendD3D->SetWidth(size);
-        gcpRendD3D->SetHeight(size);
-
-        gcpRendD3D->EF_ClearTargetsLater(FRT_CLEAR, Clr_Transparent);
-
-        DrawSceneToCubeSide(Pos, size, nSide);
-
-        // Transfer to sysmem
-        D3D11_BOX srcBox;
-        srcBox.left = 0;
-        srcBox.right = size;
-        srcBox.top = 0;
-        srcBox.bottom = size;
-        srcBox.front = 0;
-        srcBox.back = 1;
-
-        CDeviceTexture* pDevTextureSrc = CTexture::s_ptexHDRTarget->GetDevTexture();
-        CDeviceTexture* pDevTextureDst = ptexGenEnvironmentCM->GetDevTexture();
-
-        gcpRendD3D->GetDeviceContext().CopySubresourceRegion(pDevTextureDst->Get2DTexture(), 0, 0, 0, 0, pDevTextureSrc->Get2DTexture(), 0, &srcBox);
-
-        CDeviceTexture* pDstDevTex = ptexGenEnvironmentCM->GetDevTexture();
-        pDstDevTex->DownloadToStagingResource(0, [&](void* pData, [[maybe_unused]] uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-        {
-            unsigned short* pTarg = (unsigned short*)pData;
-            const uint32 nLineStride = CTexture::TextureDataSize(size, 1, 1, 1, 1, eTF_R16G16B16A16F) / sizeof(unsigned short);
-
-            // Copy vertically flipped image
-            for (uint32 nLine = 0; nLine < size; ++nLine)
-            {
-                vecData.Copy(&pTarg[((size - 1) - nLine) * nLineStride], nLineStride);
-            }
-
-            return true;
-        });
-
-        gcpRendD3D->EndFrame();
-    }
-
-    SAFE_RELEASE(ptexGenEnvironmentCM);
-
-    // Restore previous states
-
-    gcpRendD3D->m_deskwidth = nDesktopWidth;
-    gcpRendD3D->m_deskheight = nDesktopHeight;
-    gRenDev->ChangeViewport(0, 0, nOldWidth, nOldHeight);
-
-    gcpRendD3D->EnableSwapBuffers(true);
-    gcpRendD3D->SetWidth(vWidth);
-    gcpRendD3D->SetHeight(vHeight);
-    gcpRendD3D->RT_SetViewport(vX, vY, vWidth, vHeight);
-    gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags = nPFlags;
-    gcpRendD3D->ResetToDefault();
-
-    if (pCoverageBufferCV)
-    {
-        pCoverageBufferCV->Set(nCoverageBuffer);
-    }
-
-    if (pStatObjBufferRenderTasksCV)
-    {
-        pStatObjBufferRenderTasksCV->Set(nStatObjBufferRenderTasks);
-    }
-
-    if (pViewDistRatioCV)
-    {
-        pViewDistRatioCV->Set(fOldViewDistRatio);
-    }
-
-    if (pViewDistRatioVegetationCV)
-    {
-        pViewDistRatioVegetationCV->Set(fOldViewDistRatioVegetation);
-    }
-
-    if (pLodRatioCV)
-    {
-        pLodRatioCV->Set(fOldLodRatio);
-    }
-
-    if (CRenderer::CV_r_HideSunInCubemaps)
-    {
-        gEnv->p3DEngine->SetSkyLightParameters(oldSunDir, oldSunStr, oldSkyKm, oldSkyKr, oldSkyG, oldSunRGB, true);
-    }
-
-    CRenderer::CV_r_flares = nFlaresCV;
-
-    if (pSSDOHalfResCV)
-    {
-        pSSDOHalfResCV->Set(nOldSSDOHalfRes);
-    }
-
-    if (pDynamicGI)
-    {
-        pDynamicGI->Set(oldDynamicGIValue);
-    }
-
-    iLog->Log("Successfully finished generating a cubemap.  The cubemap is being compressed in the background and will update automatically when done.");
-#endif
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CTexture::DrawSceneToCubeSide(Vec3& Pos, int tex_size, int side)
-{
-    const float sCubeVector[6][7] =
-    {
-        { 1, 0, 0, 0, 0, 1, -90}, //posx
-        {-1, 0, 0, 0, 0, 1, 90}, //negx
-        { 0, 1, 0, 0, 0, -1,  0}, //posy
-        { 0, -1, 0, 0, 0, 1,  0}, //negy
-        { 0, 0, 1, 0, 1, 0,  0}, //posz
-        { 0, 0, -1, 0, 1, 0,  0}, //negz
-    };
-
-    if (!iSystem)
-    {
-        return;
-    }
-
-    CRenderer* r = gRenDev;
-    CCamera prevCamera = r->GetCamera();
-
-    I3DEngine* eng = gEnv->p3DEngine;
-
-    Vec3 vForward = Vec3(sCubeVector[side][0], sCubeVector[side][1], sCubeVector[side][2]);
-    Vec3 vUp      = Vec3(sCubeVector[side][3], sCubeVector[side][4], sCubeVector[side][5]);
-
-    Matrix33 matRot = Matrix33::CreateOrientation(vForward, vUp, DEG2RAD(sCubeVector[side][6]));
-    Matrix34 mFinal = Matrix34(matRot, Pos);
-
-    // Use current viewport camera's near/far to capture what is shown in the editor
-    const CCamera& viewCamera = gEnv->pSystem->GetViewCamera();
-    const float captureNear = viewCamera.GetNearPlane();
-    const float captureFar = viewCamera.GetFarPlane();
-    const float captureFOV = DEG2RAD(90.0f);
-
-    CCamera captureCamera;
-    captureCamera.SetMatrix(mFinal);
-    captureCamera.SetFrustum(tex_size, tex_size, captureFOV, captureNear, captureFar);
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log)
-    {
-        r->Logv(SRendItem::m_RecurseLevel[r->m_RP.m_nProcessThreadID], ".. DrawSceneToCubeSide .. (DrawCubeSide %d)\n", side);
-    }
-#endif
-
-    eng->RenderWorld(SHDF_CUBEMAPGEN | SHDF_ALLOWPOSTPROCESS | SHDF_ALLOWHDR | SHDF_ZPASS | SHDF_NOASYNC | SHDF_STREAM_SYNC, SRenderingPassInfo::CreateGeneralPassRenderingInfo(captureCamera, (SRenderingPassInfo::DEFAULT_FLAGS | SRenderingPassInfo::CUBEMAP_GEN)), __FUNCTION__);
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log)
-    {
-        r->Logv(SRendItem::m_RecurseLevel[r->m_RP.m_nProcessThreadID], ".. End DrawSceneToCubeSide .. (DrawCubeSide %d)\n", side);
-    }
-#endif
-
-    r->SetCamera(prevCamera);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CTexture::DrawCubeSide(Vec3& Pos, int tex_size, int side, float fMaxDist)
-{
-    const float sCubeVector[6][7] =
-    {
-        { 1, 0, 0, 0, 0, 1, -90}, //posx
-        {-1, 0, 0, 0, 0, 1, 90}, //negx
-        { 0, -1, 0, 0, 0, 1,  0}, //posy
-        { 0, 1, 0, 0, 0, -1,  0}, //negy
-        { 0, 0, 1, 0, 1, 0,  0}, //posz
-        { 0, 0, -1, 0, 1, 0,  0}, //negz
-    };
-
-    if (!iSystem)
-    {
-        return;
-    }
-
-    CRenderer* r = gRenDev;
-    CCamera prevCamera = r->GetCamera();
-    CCamera tmpCamera = prevCamera;
-
-    I3DEngine* eng = gEnv->p3DEngine;
-    float fMinDist = 0.25f;
-
-    Vec3 vForward = Vec3(sCubeVector[side][0], sCubeVector[side][1], sCubeVector[side][2]);
-    Vec3 vUp      = Vec3(sCubeVector[side][3], sCubeVector[side][4], sCubeVector[side][5]);
-    Matrix33 matRot = Matrix33::CreateOrientation(vForward, vUp, DEG2RAD(sCubeVector[side][6]));
-
-    // magic orientation we use in engine
-    Matrix33 matScale = Matrix33::CreateScale(Vec3(1, -1, 1));
-    matRot = matScale * matRot;
-
-    tmpCamera.SetMatrix(Matrix34(matRot, Pos));
-    tmpCamera.SetFrustum(tex_size, tex_size, 90.0f * gf_PI / 180.0f, fMinDist, fMaxDist);
-    int nPersFlags = r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags;
-    int nPersFlags2 = r->m_RP.m_PersFlags2;
-    r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags |= /*RBPF_MIRRORCAMERA | */ RBPF_MIRRORCULL | RBPF_DRAWTOTEXTURE | RBPF_ENCODE_HDR;
-    int nOldZ = CRenderer::CV_r_usezpass;
-    CRenderer::CV_r_usezpass = 0;
-
-    r->RT_SetViewport(0, 0, tex_size, tex_size);
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log)
-    {
-        r->Logv(SRendItem::m_RecurseLevel[r->m_RP.m_nProcessThreadID], ".. DrawLowDetail .. (DrawCubeSide %d)\n", side);
-    }
-#endif
-
-    eng->RenderWorld(SHDF_ALLOWHDR | SHDF_NOASYNC | SHDF_STREAM_SYNC, SRenderingPassInfo::CreateGeneralPassRenderingInfo(tmpCamera), __FUNCTION__);
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log)
-    {
-        r->Logv(SRendItem::m_RecurseLevel[r->m_RP.m_nProcessThreadID], ".. End DrawLowDetail .. (DrawCubeSide %d)\n", side);
-    }
-#endif
-
-    r->m_RP.m_TI[r->m_RP.m_nProcessThreadID].m_PersFlags = nPersFlags;
-    r->m_RP.m_PersFlags2 = nPersFlags2;
-    r->SetCamera(prevCamera);
-    CRenderer::CV_r_usezpass = nOldZ;
-}
-
-bool CTexture::GenerateMipMaps(bool bSetOrthoProj, bool bUseHW, bool bNormalMap)
-{
-    if (!(GetFlags() & FT_FORCE_MIPS)
-        || bSetOrthoProj || !bUseHW || bNormalMap)  //todo: implement
-    {
-        return false;
-    }
-
-    PROFILE_LABEL_SCOPE("GENERATE_MIPS");
-    PROFILE_SHADER_SCOPE;
-
-    CDeviceTexture* pTex = GetDevTexture();
-    if (!pTex)
-    {
-        return false;
-    }
-
-    D3D11_TEXTURE2D_DESC pDesc;
-    pTex->Get2DTexture()->GetDesc(&pDesc);
-
-    // all d3d11 devices support autogenmipmaps
-    if (m_pRenderTargetData)
-    {
-        gcpRendD3D->GetDeviceContext().GenerateMips(m_pDeviceShaderResource);
-    }
-
-    return true;
-}
-
-void CTexture::DestroyZMaps()
-{
-    //SAFE_RELEASE(s_ptexZTarget);
-}
-
-void CTexture::GenerateZMaps()
-{
-    if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        // Custom Z-Target for GMEM render path should already be set
-        assert(s_ptexZTarget == CTexture::s_ptexGmemStenLinDepth);
-        return;
-    }
-
-    int nWidth = gcpRendD3D->m_MainViewport.nWidth; //m_d3dsdBackBuffer.Width;
-    int nHeight = gcpRendD3D->m_MainViewport.nHeight; //m_d3dsdBackBuffer.Height;
-    ETEX_Format eTFZ = CTexture::s_eTFZ;
-    uint32 nFlags = FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_DONT_RELEASE;
-    if (CRenderer::CV_r_msaa)
-    {
-        nFlags |= FT_USAGE_MSAA;
-    }
-    if (!s_ptexZTarget)
-    {
-        s_ptexZTarget = CreateRenderTarget("$ZTarget", nWidth, nHeight, Clr_White, eTT_2D, nFlags, eTFZ);
-        s_ptexFurZTarget = CreateRenderTarget("$FurZTarget", nWidth, nHeight, Clr_White, eTT_2D, nFlags, eTFZ);
-    }
-    else
-    {
-        s_ptexZTarget->m_nFlags = nFlags;
-        s_ptexZTarget->m_nWidth = nWidth;
-        s_ptexZTarget->m_nHeight = nHeight;
-        s_ptexZTarget->CreateRenderTarget(eTFZ, Clr_White);
-
-        s_ptexFurZTarget->m_nFlags = nFlags;
-        s_ptexFurZTarget->m_nWidth = nWidth;
-        s_ptexFurZTarget->m_nHeight = nHeight;
-        s_ptexFurZTarget->CreateRenderTarget(eTFZ, Clr_White);
-    }
-}
-
-void CTexture::DestroySceneMap()
-{
-    //SAFE_RELEASE(s_ptexSceneTarget);
-}
-
-void CTexture::GenerateSceneMap(ETEX_Format eTF)
-{
-    const int32 nWidth = gcpRendD3D->GetWidth();
-    const int32 nHeight = gcpRendD3D->GetHeight();
-    uint32 nFlags =  FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_USAGE_UNORDERED_ACCESS;
-    nFlags |= FT_USAGE_UNORDERED_ACCESS;
-
-    if (!s_ptexSceneTarget)
-    {
-        s_ptexSceneTarget = CreateRenderTarget("$SceneTarget", nWidth, nHeight, Clr_Empty, eTT_2D, nFlags, eTF, TO_SCENE_TARGET);
-    }
-    else
-    {
-        s_ptexSceneTarget->m_nFlags = nFlags;
-        s_ptexSceneTarget->m_nWidth = nWidth;
-        s_ptexSceneTarget->m_nHeight = nHeight;
-        s_ptexSceneTarget->CreateRenderTarget(eTF, Clr_Empty);
-    }
-
-    nFlags &= ~(FT_USAGE_MSAA | FT_USAGE_UNORDERED_ACCESS);
-
-    // This RT used for all post processes passes and shadow mask (group 0) as well
-    ETEX_Format backbufferFormat;
-
-    static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-
-    if (DolbyCvar->GetIVal() == 1)
-    {
-        backbufferFormat = eTF_R10G10B10A2;
-    }
-    else
-    {
-        backbufferFormat = eTF_R8G8B8A8;
-    }
-
-    // This RT used for all post processes passes and shadow mask (group 0) as well
-    if (!CTexture::IsTextureExist(s_ptexBackBuffer))
-    {
-        s_ptexBackBuffer = CreateRenderTarget("$BackBuffer", nWidth, nHeight, Clr_Transparent, eTT_2D, nFlags, backbufferFormat, TO_BACKBUFFERMAP);
-    }
-    else
-    {
-        s_ptexBackBuffer->m_nFlags = nFlags;
-        s_ptexBackBuffer->m_nWidth = nWidth;
-        s_ptexBackBuffer->m_nHeight = nHeight;
-        s_ptexBackBuffer->CreateRenderTarget(backbufferFormat, Clr_Transparent);
-    }
-
-    nFlags &= ~(FT_USAGE_MSAA | FT_USAGE_UNORDERED_ACCESS);
-
-    // This RT can be used by the Render3DModelMgr if the buffer needs to be persistent
-    if (CRenderer::CV_r_UsePersistentRTForModelHUD > 0)
-    {
-        if (!CTexture::IsTextureExist(s_ptexModelHudBuffer))
-        {
-            s_ptexModelHudBuffer = CreateRenderTarget("$ModelHUD", nWidth, nHeight, Clr_Transparent, eTT_2D, nFlags, eTF_R8G8B8A8, TO_BACKBUFFERMAP);
-        }
-        else
-        {
-            s_ptexModelHudBuffer->m_nFlags = nFlags;
-            s_ptexModelHudBuffer->m_nWidth = nWidth;
-            s_ptexModelHudBuffer->m_nHeight = nHeight;
-            s_ptexModelHudBuffer->CreateRenderTarget(eTF_R8G8B8A8, Clr_Transparent);
-        }
-    }
-}
-
-void CTexture::GenerateCachedShadowMaps()
-{
-    StaticArray<int, MAX_GSM_LODS_NUM> nResolutions = gRenDev->GetCachedShadowsResolution();
-
-    // parse shadow resolutions from cvar
-    {
-        int nCurPos = 0;
-        int nCurRes = 0;
-
-        string strResolutions = gEnv->pConsole->GetCVar("r_ShadowsCacheResolutions")->GetString();
-        string strCurRes = strResolutions.Tokenize(" ,;-\t", nCurPos);
-
-        if (!strCurRes.empty())
-        {
-            nResolutions.fill(0);
-
-            while (!strCurRes.empty())
-            {
-                int nRes = atoi(strCurRes.c_str());
-                nResolutions[nCurRes] = clamp_tpl(nRes, 0, 16384);
-
-                strCurRes = strResolutions.Tokenize(" ,;-\t", nCurPos);
-                ++nCurRes;
-            }
-
-            gRenDev->SetCachedShadowsResolution(nResolutions);
-        }
-    }
-
-    const ETEX_Format texFormat = gEnv->pConsole->GetCVar("r_ShadowsCacheFormat")->GetIVal() == 0 ? eTF_D32F : eTF_D16;
-    const int cachedShadowsStart = clamp_tpl(CRenderer::CV_r_ShadowsCache, 0, MAX_GSM_LODS_NUM - 1);
-
-    int gsmCascadeCount = gEnv->pSystem->GetConfigSpec() == CONFIG_LOW_SPEC ? 4 : 5;
-    if (ICVar* pGsmLodsVar = gEnv->pConsole->GetCVar("e_GsmLodsNum"))
-    {
-        gsmCascadeCount = pGsmLodsVar->GetIVal();
-    }
-    const int cachedCascadesCount = cachedShadowsStart > 0 ? clamp_tpl(gsmCascadeCount - cachedShadowsStart + 1, 0, MAX_GSM_LODS_NUM) : 0;
-
-    for (int i = 0; i < MAX_GSM_LODS_NUM; ++i)
-    {
-        CTexture*& pTx = s_ptexCachedShadowMap[i];
-
-        if (!pTx)
-        {
-            char szName[32];
-            sprintf_s(szName, "CachedShadowMap_%d", i);
-
-            uint32 flags = FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_DEPTHSTENCIL | FT_USE_HTILE;
-        #if defined(AZ_RESTRICTED_PLATFORM)
-            #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_13
-            #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-        #endif
-            pTx = CTexture::CreateTextureObject(szName, nResolutions[i], nResolutions[i], 1, eTT_2D, flags, texFormat);
-        }
-
-        pTx->Invalidate(nResolutions[i], nResolutions[i], texFormat);
-
-        // delete existing texture in case it's not needed anymore
-        if (CTexture::IsTextureExist(pTx) && nResolutions[i] == 0)
-        {
-            pTx->ReleaseDeviceTexture(false);
-        }
-
-        // allocate texture directly for all cached cascades
-        if (!CTexture::IsTextureExist(pTx) && nResolutions[i] > 0 && i < cachedCascadesCount)
-        {
-            CryLog("Allocating shadow map cache %d x %d: %.2f MB", nResolutions[i], nResolutions[i], sqr(nResolutions[i]) * CTexture::BytesPerBlock(texFormat) / (1024.f * 1024.f));
-            pTx->CreateRenderTarget(texFormat, Clr_FarPlane);
-        }
-    }
-
-    // height map AO
-    if (CRenderer::CV_r_HeightMapAO)
-    {
-        const int nTexRes = (int)clamp_tpl(CRenderer::CV_r_HeightMapAOResolution, 0.f, 16384.f);
-
-        if (!s_ptexHeightMapAODepth[0])
-        {
-            s_ptexHeightMapAODepth[0] = CTexture::CreateTextureObject("HeightMapAO_Depth_0", nTexRes, nTexRes, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_DEPTHSTENCIL | FT_USE_HTILE, eTF_D16);
-            s_ptexHeightMapAODepth[1] = CTexture::CreateTextureObject("HeightMapAO_Depth_1", nTexRes, nTexRes, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_RENDERTARGET | FT_FORCE_MIPS, eTF_R16);
-        }
-
-        s_ptexHeightMapAODepth[0]->Invalidate(nTexRes, nTexRes, eTF_D16);
-        s_ptexHeightMapAODepth[1]->Invalidate(nTexRes, nTexRes, eTF_R16);
-
-        if (!CTexture::IsTextureExist(s_ptexHeightMapAODepth[0]) && nTexRes > 0)
-        {
-            s_ptexHeightMapAODepth[0]->CreateRenderTarget(eTF_D16, Clr_FarPlane);
-            s_ptexHeightMapAODepth[1]->CreateRenderTarget(eTF_R16, Clr_FarPlane);
-        }
-    }
-
-    if (ShadowFrustumMGPUCache* pShadowMGPUCache = gRenDev->GetShadowFrustumMGPUCache())
-    {
-        pShadowMGPUCache->nUpdateMaskRT = 0;
-        pShadowMGPUCache->nUpdateMaskMT = 0;
-    }
-}
-
-void CTexture::DestroyCachedShadowMaps()
-{
-    for (int i = 0; i < MAX_GSM_LODS_NUM; ++i)
-    {
-        SAFE_RELEASE_FORCE(s_ptexCachedShadowMap[i]);
-    }
-
-    SAFE_RELEASE_FORCE(s_ptexHeightMapAO[0]);
-    SAFE_RELEASE_FORCE(s_ptexHeightMapAO[1]);
-}
-
-void CTexture::GenerateNearestShadowMap()
-{
-    const int texResolution = CRenderer::CV_r_ShadowsNearestMapResolution;
-    const ETEX_Format texFormat = eTF_D32F;
-    s_ptexNearestShadowMap = CTexture::CreateTextureObject("NearestShadowMap", texResolution, texResolution, 1, eTT_2D, FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_DEPTHSTENCIL | FT_USE_HTILE, texFormat);
-}
-
-void CTexture::DestroyNearestShadowMap()
-{
-    if (s_ptexNearestShadowMap)
-    {
-        SAFE_RELEASE_FORCE(s_ptexNearestShadowMap);
-    }
-}
-
-bool SDynTexture::RT_Update(int nNewWidth, int nNewHeight)
-{
-    AZ_Assert(gRenDev->m_pRT->IsRenderThread(), ("Error - Cannot call SDynTexture::RT_Update from any thread that is not the primary render thread!"));
-
-    Unlink();
-
-    assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-    if (nNewWidth != m_nReqWidth || nNewHeight != m_nReqHeight)
-    {
-        if (m_pTexture)
-        {
-            ReleaseDynamicRT(false);
-        }
-        m_pTexture = NULL;
-
-        m_nReqWidth = nNewWidth;
-        m_nReqHeight = nNewHeight;
-
-        AdjustRealSize();
-    }
-
-    if (!m_pTexture)
-    {
-        int nNeedSpace = CTexture::TextureDataSize(m_nWidth, m_nHeight, 1, 1, 1, m_eTF);
-        if (m_eTT == eTT_Cube)
-        {
-            nNeedSpace *= 6;
-        }
-        SDynTexture* pTX = SDynTexture::s_Root.m_Prev;
-        const uint32 maxDynamicTextureMemory = SDynTexture::s_CurDynTexMaxSize * 1024u * 1024u;
-        if (nNeedSpace + s_nMemoryOccupied > maxDynamicTextureMemory)
-        {
-            // Commit any render target binds/unbinds in case they are still waiting to be set or unset in a shadow state
-            gcpRendD3D->FX_SetActiveRenderTargets();
-
-            m_pTexture = GetDynamicRT();
-            if (!m_pTexture)
-            {
-                bool bFreed = FreeTextures(true, nNeedSpace);
-                if (!bFreed)
-                {
-                    bFreed = FreeTextures(false, nNeedSpace);
-                }
-
-                if (!bFreed)
-                {
-                    pTX = SDynTexture::s_Root.m_Next;
-                    int nFrame = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameUpdateID - 1;
-                    while (nNeedSpace + s_nMemoryOccupied > maxDynamicTextureMemory)
-                    {
-                        if (pTX == &SDynTexture::s_Root)
-                        {
-                            static int nThrash;
-                            if (nThrash != nFrame)
-                            {
-                                nThrash = nFrame;
-                                iLog->Log("Error: Dynamic textures thrashing (try to increase texture pool size - r_DynTexMaxSize)...");
-                            }
-                            break;
-                        }
-                        SDynTexture* pNext = pTX->m_Next;
-                        // We cannot unload locked texture or texture used in current frame
-                        // Better to increase pool size temporarily
-                        if (pTX->m_pTexture && !pTX->m_pTexture->IsActiveRenderTarget())
-                        {
-                            if (pTX->m_pTexture->m_nAccessFrameID < nFrame && pTX->m_pTexture->m_nUpdateFrameID < nFrame && !pTX->m_bLocked)
-                            {
-                                pTX->ReleaseDynamicRT(true);
-                            }
-                        }
-                        pTX = pNext;
-                    }
-                }
-            }
-        }
-    }
-    if (!m_pTexture)
-    {
-        m_pTexture = CreateDynamicRT();
-    }
-
-    assert(s_iNumTextureBytesCheckedOut + s_iNumTextureBytesCheckedIn == s_nMemoryOccupied);
-
-    if (m_pTexture)
-    {
-        Link();
-        return true;
-    }
-    return false;
-}
-
-bool SDynTexture::RT_SetRT(int nRT, int nWidth, int nHeight, bool bPush, bool bScreenVP)
-{
-    Update(m_nWidth, m_nHeight);
-
-    SDepthTexture* pDepthSurf = nWidth > 0 ? gcpRendD3D->FX_GetDepthSurface(nWidth, nHeight, false) : &gcpRendD3D->m_DepthBufferOrig;
-
-    assert(m_pTexture);
-    if (m_pTexture)
-    {
-        if (bPush)
-        {
-            return gcpRendD3D->FX_PushRenderTarget(nRT, m_pTexture, pDepthSurf, -1, bScreenVP);
-        }
-        else
-        {
-            return gcpRendD3D->FX_SetRenderTarget(nRT, m_pTexture, pDepthSurf, false, -1, bScreenVP);
-        }
-    }
-    return false;
-}
-
-bool SDynTexture::SetRT(int nRT, bool bPush, SDepthTexture* pDepthSurf, bool bScreenVP)
-{
-    Update(m_nWidth, m_nHeight);
-
-    assert(m_pTexture);
-    if (m_pTexture)
-    {
-        if (bPush)
-        {
-            return gcpRendD3D->FX_PushRenderTarget(nRT, m_pTexture, pDepthSurf, -1, bScreenVP);
-        }
-        else
-        {
-            return gcpRendD3D->FX_SetRenderTarget(nRT, m_pTexture, pDepthSurf, false, -1, bScreenVP);
-        }
-    }
-    return false;
-}
-
-bool SDynTexture::RestoreRT(int nRT, bool bPop)
-{
-    if (bPop)
-    {
-        return gcpRendD3D->FX_PopRenderTarget(nRT);
-    }
-    else
-    {
-        return gcpRendD3D->FX_RestoreRenderTarget(nRT);
-    }
-}
-
-bool SDynTexture::ClearRT()
-{
-    gcpRendD3D->FX_ClearTarget(m_pTexture);
-    return true;
-}
-
-bool SDynTexture2::ClearRT()
-{
-    gcpRendD3D->FX_ClearTarget(m_pTexture);
-    return true;
-}
-
-bool SDynTexture2::SetRT(int nRT, bool bPush, SDepthTexture* pDepthSurf, [[maybe_unused]] bool bScreenVP)
-{
-    Update(m_nWidth, m_nHeight);
-
-    assert(m_pTexture);
-    if (m_pTexture)
-    {
-        bool bRes = false;
-        if (bPush)
-        {
-            bRes = gcpRendD3D->FX_PushRenderTarget(nRT, m_pTexture, pDepthSurf);
-        }
-        else
-        {
-            bRes = gcpRendD3D->FX_SetRenderTarget(nRT, m_pTexture, pDepthSurf);
-        }
-        SetRectStates();
-        gcpRendD3D->FX_Commit();
-    }
-    return false;
-}
-
-bool SDynTexture2::SetRectStates()
-{
-    assert(m_pTexture);
-    gcpRendD3D->RT_SetViewport(m_nX, m_nY, m_nWidth, m_nHeight);
-    gcpRendD3D->EF_Scissor(true, m_nX, m_nY, m_nWidth, m_nHeight);
-    return true;
-}
-
-bool SDynTexture2::RestoreRT(int nRT, bool bPop)
-{
-    bool bRes = false;
-    gcpRendD3D->EF_Scissor(false, m_nX, m_nY, m_nWidth, m_nHeight);
-    if (bPop)
-    {
-        bRes = gcpRendD3D->FX_PopRenderTarget(nRT);
-    }
-    else
-    {
-        bRes = gcpRendD3D->FX_RestoreRenderTarget(nRT);
-    }
-    gcpRendD3D->FX_Commit();
-
-    return bRes;
-}
-
-void _DrawText(ISystem* pSystem, int x, int y, const float fScale, const char* format, ...);
-
-#if !defined(_RELEASE)
-static int __cdecl RTCallback(const VOID* arg1, const VOID* arg2)
-{
-    CTexture* p1 = *(CTexture**)arg1;
-    CTexture* p2 = *(CTexture**)arg2;
-
-    // show big textures first
-    int nSize1 = p1->GetDataSize();
-    int nSize2 = p2->GetDataSize();
-    if (nSize1 > nSize2)
-    {
-        return -1;
-    }
-    else if (nSize2 > nSize1)
-    {
-        return 1;
-    }
-
-    return strcmp(p1->GetName(), p2->GetName());
-}
-#endif
-
-void CD3D9Renderer::DrawAllDynTextures([[maybe_unused]] const char* szFilter, [[maybe_unused]] const bool bLogNames, [[maybe_unused]] const bool bOnlyIfUsedThisFrame)
-{
-#ifndef _RELEASE
-    SDynTexture2::TextureSet2Itor itor;
-    char name[256]; //, nm[256];
-    cry_strcpy(name, szFilter);
-    azstrlwr(name, AZ_ARRAY_SIZE(name));
-    TArray<CTexture*> UsedRT;
-    int nMaxCount = CV_r_ShowDynTexturesMaxCount;
-
-    float width = 800;
-    float height = 600;
-    float fArrDim = max(1.f, sqrtf((float)nMaxCount));
-    float fPicDimX = width / fArrDim;
-    float fPicDimY = height / fArrDim;
-    float x = 0;
-    float y = 0;
-
-    TransformationMatrices backupSceneMatrices;
-
-    Set2DMode(static_cast<uint32>(width), static_cast<uint32>(height), backupSceneMatrices);
-
-    EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    EF_SetSrgbWrite(false);
-    if (name[0] == '*' && !name[1])
-    {
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        ResourcesMapItor it;
-        for (it = pRL->m_RMap.begin(); it != pRL->m_RMap.end(); it++)
-        {
-            CTexture* tp = (CTexture*)it->second;
-            if (tp && !tp->IsNoTexture())
-            {
-                if ((tp->GetFlags() & (FT_USAGE_RENDERTARGET | FT_USAGE_DYNAMIC)) && tp->GetDevTexture())
-                {
-                    UsedRT.AddElem(tp);
-                }
-            }
-        }
-    }
-    else
-    {
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        ResourcesMapItor it;
-        for (it = pRL->m_RMap.begin(); it != pRL->m_RMap.end(); it++)
-        {
-            CTexture* tp = (CTexture*)it->second;
-            if (!tp || tp->IsNoTexture())
-            {
-                continue;
-            }
-            if ((tp->GetFlags() & (FT_USAGE_RENDERTARGET | FT_USAGE_DYNAMIC)) && tp->GetDevTexture())
-            {
-                char nameBuffer[128];
-                cry_strcpy(nameBuffer, tp->GetName());
-                azstrlwr(nameBuffer, AZ_ARRAY_SIZE(nameBuffer));
-                if (CryStringUtils::MatchWildcard(nameBuffer, name))
-                {
-                    UsedRT.AddElem(tp);
-                }
-            }
-        }
-    }
-    if (UsedRT.Num() > 1)
-    {
-        qsort(&UsedRT[0], UsedRT.Num(), sizeof(CTexture*), RTCallback);
-    }
-    fPicDimX = width / fArrDim;
-    fPicDimY = height / fArrDim;
-    x = 0;
-    y = 0;
-    for (uint32 i = 0; i < UsedRT.Num(); i++)
-    {
-        SetState(GS_NODEPTHTEST);
-        CTexture* tp = UsedRT[i];
-        int nSavedAccessFrameID = tp->m_nAccessFrameID;
-
-        if (bOnlyIfUsedThisFrame)
-        {
-            if (tp->m_nUpdateFrameID < m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameUpdateID - 2)
-            {
-                continue;
-            }
-        }
-
-        if (tp->GetTextureType() == eTT_2D)
-        {
-            Draw2dImage(x, y, fPicDimX - 2, fPicDimY - 2, tp->GetID(), 0, 1, 1, 0, 0);
-        }
-
-        tp->m_nAccessFrameID = nSavedAccessFrameID;
-
-        const char* pTexName = tp->GetName();
-        char nameBuffer[128];
-        memset(nameBuffer, 0, sizeof nameBuffer);
-        for (int iStr = 0, jStr = 0; pTexName[iStr] && jStr < sizeof nameBuffer - 1; ++iStr)
-        {
-            if (pTexName[iStr] == '$')
-            {
-                nameBuffer[jStr] = '$';
-                nameBuffer[jStr + 1] = '$';
-                jStr += 2;
-            }
-            else
-            {
-                nameBuffer[jStr] = pTexName[iStr];
-                ++jStr;
-            }
-        }
-        nameBuffer[sizeof nameBuffer - 1] = 0;
-        pTexName = nameBuffer;
-
-        int32 nPosX = (int32)ScaleCoordX(x);
-        int32 nPosY = (int32)ScaleCoordY(y);
-        _DrawText(iSystem, nPosX, nPosY, 1.0f, "%8s", pTexName);
-        _DrawText(iSystem, nPosX, nPosY += 10, 1.0f, "%d-%d", tp->m_nUpdateFrameID, tp->m_nAccessFrameID);
-        _DrawText(iSystem, nPosX, nPosY += 10, 1.0f, "%dx%d", tp->GetWidth(), tp->GetHeight());
-
-        if (bLogNames)
-        {
-            iLog->Log("Mem:%d  %dx%d  Type:%s  Format:%s (%s)",
-                tp->GetDeviceDataSize(), tp->GetWidth(), tp->GetHeight(), tp->NameForTextureType(tp->GetTextureType()), tp->NameForTextureFormat(tp->GetDstFormat()), tp->GetName());
-        }
-
-        x += fPicDimX;
-        if (x >= width - 10)
-        {
-            x = 0;
-            y += fPicDimY;
-        }
-    }
-
-    Unset2DMode(backupSceneMatrices);
-
-    RT_RenderTextMessages();
-#endif
-}
-
-void CTexture::ReleaseSystemTargets()
-{
-    CTexture::DestroyHDRMaps();
-    CTexture::DestroySceneMap();
-    CTexture::DestroyCachedShadowMaps();
-    CTexture::DestroyNearestShadowMap();
-
-    if (CDeferredShading::Instance().IsValid())
-    {
-        CDeferredShading::Instance().DestroyDeferredMaps();
-    }
-
-    PostProcessUtils().Release();
-
-    SAFE_RELEASE_FORCE(s_ptexWaterOcean);
-    SAFE_RELEASE_FORCE(s_ptexWaterVolumeTemp);
-    SAFE_RELEASE_FORCE(s_ptexWaterRipplesDDN);
-
-    SAFE_RELEASE_FORCE(s_ptexSceneNormalsMap);
-    SAFE_RELEASE_FORCE(s_ptexSceneNormalsBent);
-    SAFE_RELEASE_FORCE(s_ptexAOColorBleed);
-    SAFE_RELEASE_FORCE(s_ptexSceneDiffuse);
-    SAFE_RELEASE_FORCE(s_ptexSceneSpecular);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_10
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-    SAFE_RELEASE_FORCE(s_ptexSceneDiffuseAccMap);
-    SAFE_RELEASE_FORCE(s_ptexSceneSpecularAccMap);
-    SAFE_RELEASE_FORCE(s_ptexBackBuffer);
-    SAFE_RELEASE_FORCE(s_ptexSceneTarget);
-    SAFE_RELEASE_FORCE(s_ptexZTargetScaled);
-    SAFE_RELEASE_FORCE(s_ptexZTargetScaled2);
-    SAFE_RELEASE_FORCE(s_ptexAmbientLookup);
-    SAFE_RELEASE_FORCE(s_ptexDepthBufferQuarter);
-
-    gcpRendD3D->m_bSystemTargetsInit = 0;
-}
-
-void CTexture::ReleaseMiscTargets()
-{
-    if (gcpRendD3D->m_pColorGradingControllerD3D)
-    {
-        gcpRendD3D->m_pColorGradingControllerD3D->ReleaseTextures();
-    }
-}
-
-void CTexture::CreateSystemTargets()
-{
-    if (!gcpRendD3D->m_bSystemTargetsInit)
-    {
-        
-
-        gcpRendD3D->m_bSystemTargetsInit = 1;
-
-        ETEX_Format eTF = (gcpRendD3D->m_RP.m_bUseHDR && gcpRendD3D->m_nHDRType == 1) ? eTF_R16G16B16A16F : eTF_R8G8B8A8;
-
-        // Create HDR targets
-        CTexture::GenerateHDRMaps();
-
-        // Create scene targets
-        CTexture::GenerateSceneMap(eTF);
-
-        // Create ZTarget
-        CTexture::GenerateZMaps();
-
-        // Allocate cached shadow maps if required
-        CTexture::GenerateCachedShadowMaps();
-
-        // Allocate the nearest shadow map if required
-        CTexture::GenerateNearestShadowMap();
-
-        // Create deferred lighting targets
-        if (CDeferredShading::Instance().IsValid())
-        {
-            CDeferredShading::Instance().CreateDeferredMaps();
-        }
-
-        if (CRenderer::CV_r_DeferredShadingTiled > 0)
-        {
-            gcpRendD3D->GetTiledShading().CreateResources();
-        }
-
-        gcpRendD3D->GetVolumetricFog().CreateResources();
-
-        // Create post effects targets
-        PostProcessUtils().Create();
-    }
-}
-
-void CTexture::CopySliceChain(CDeviceTexture* const pDevTexture, int ownerMips, int nDstSlice, int nDstMip, CDeviceTexture* pSrcDevTex, int nSrcSlice, int nSrcMip, int nSrcMips, int nNumMips)
-{
-    assert(pSrcDevTex && pDevTexture);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_11
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-
-    D3DBaseTexture* pDstResource = pDevTexture->GetBaseTexture();
-    D3DBaseTexture* pSrcResource = pSrcDevTex->GetBaseTexture();
-
-#ifndef _RELEASE
-    if (!pDstResource)
-    {
-        __debugbreak();
-    }
-    if (!pSrcResource)
-    {
-        __debugbreak();
-    }
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURE_CPP_SECTION_12
-    #include AZ_RESTRICTED_FILE(D3DTexture_cpp)
-#endif
-    assert(nSrcMip >= 0 && nDstMip >= 0);
-    for (int i = 0; i < nNumMips; ++i)
-    {
-        #if defined(DEVICE_SUPPORTS_D3D11_1)
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(
-                pDstResource,
-                D3D11CalcSubresource(nDstMip + i, nDstSlice, ownerMips),
-                0, 0, 0,
-                pSrcResource,
-                D3D11CalcSubresource(nSrcMip + i, nSrcSlice, nSrcMips),
-                NULL,
-                D3D11_COPY_NO_OVERWRITE);
-        #else
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                pDstResource,
-                D3D11CalcSubresource(nDstMip + i, nDstSlice, ownerMips),
-                0, 0, 0,
-                pSrcResource,
-                D3D11CalcSubresource(nSrcMip + i, nSrcSlice, nSrcMips),
-                NULL);
-        #endif
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTextureStreamPool.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DTextureStreamPool.cpp
deleted file mode 100644
index 015eebc8d5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTextureStreamPool.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "../Common/Textures/TextureStreamPool.h"
-
-#include "DriverD3D.h"
-
-#if !defined(CHK_RENDTH)
-#   define CHK_RENDTH assert(gRenDev->m_pRT->IsRenderThread())
-#endif
-#if !defined(CHK_MAINTH)
-#   define CHK_MAINTH assert(gRenDev->m_pRT->IsMainThread())
-#endif
-#if !defined(CHK_MAINORRENDTH)
-#   define CHK_MAINORRENDTH assert(gRenDev->m_pRT->IsMainThread() || gRenDev->m_pRT->IsRenderThread())
-#endif
-
-CryCriticalSection STexPoolItemHdr::s_sSyncLock;
-
-bool STexPoolItem::IsStillUsedByGPU(uint32 nTick)
-{
-    CDeviceTexture* pDeviceTexture = m_pDevTexture;
-    if (pDeviceTexture)
-    {
-        CHK_MAINORRENDTH;
-    }
-    return (nTick - m_nFreeTick) < 4;
-}
-
-STexPoolItem::STexPoolItem (STexPool* pOwner, CDeviceTexture* pDevTexture, size_t devSize)
-    : m_pOwner(pOwner)
-    , m_pTex(NULL)
-    , m_pDevTexture(pDevTexture)
-    , m_nDeviceTexSize(devSize)
-    , m_nFreeTick(0)
-    , m_nActiveLod(0)
-{
-    assert (pDevTexture);
-    ++pOwner->m_nItems;
-}
-
-STexPoolItem::~STexPoolItem()
-{
-    assert (m_pDevTexture);
-    if (m_pOwner)
-    {
-        --m_pOwner->m_nItems;
-        if (IsFree())
-        {
-            --m_pOwner->m_nItemsFree;
-        }
-    }
-    Unlink();
-    UnlinkFree();
-
-    m_pDevTexture->Unbind();
-    m_pDevTexture->Release();
-}
-
-CTextureStreamPoolMgr::CTextureStreamPoolMgr()
-{
-    m_FreeTexPoolItems.m_NextFree = &m_FreeTexPoolItems;
-    m_FreeTexPoolItems.m_PrevFree = &m_FreeTexPoolItems;
-
-    m_nDeviceMemReserved = 0;
-    m_nDeviceMemInUse = 0;
-
-#ifdef TEXSTRM_USE_FREEPOOL
-    m_nFreePoolBegin = 0;
-    m_nFreePoolEnd = 0;
-#endif
-
-    m_nTick = 0;
-
-#if !defined(_RELEASE)
-    m_bComputeStats = false;
-#endif
-}
-
-CTextureStreamPoolMgr::~CTextureStreamPoolMgr()
-{
-    Flush();
-}
-
-void CTextureStreamPoolMgr::Flush()
-{
-    AUTO_LOCK(STexPoolItem::s_sSyncLock);
-
-    FlushFree();
-
-    // Free pools first, as that will attempt to remove streamed textures in release, which will end up
-    // in the free list.
-
-    for (TexturePoolMap::iterator it = m_TexturesPools.begin(), itEnd = m_TexturesPools.end(); it != itEnd; ++it)
-    {
-        SAFE_DELETE(it->second);
-    }
-    stl::free_container(m_TexturesPools);
-
-    // Now nuke the free items.
-
-    FlushFree();
-#ifdef TEXSTRM_USE_FREEPOOL
-    while (m_nFreePoolBegin != m_nFreePoolEnd)
-    {
-        assert (m_nFreePoolEnd < sizeof(m_FreePool) / sizeof(m_FreePool[0]));
-        void* p = m_FreePool[m_nFreePoolBegin];
-        m_nFreePoolBegin = (m_nFreePoolBegin + 1) % MaxFreePool;
-        ::operator delete(p);
-    }
-#endif
-}
-
-STexPool* CTextureStreamPoolMgr::GetPool(int nWidth, int nHeight, int nMips, int nArraySize, ETEX_Format eTF, bool bIsSRGB, ETEX_Type eTT)
-{
-    D3DFormat d3dFmt = CTexture::DeviceFormatFromTexFormat(eTF);
-    if (bIsSRGB)
-    {
-        d3dFmt = CTexture::ConvertToSRGBFmt(d3dFmt);
-    }
-
-    TexturePoolKey poolKey((uint16)nWidth, (uint16)nHeight, d3dFmt, (uint8)eTT, (uint8)nMips, (uint16)nArraySize);
-
-    TexturePoolMap::iterator it = m_TexturesPools.find(poolKey);
-    if (it != m_TexturesPools.end())
-    {
-        return it->second;
-    }
-
-    return NULL;
-}
-
-STexPoolItem* CTextureStreamPoolMgr::GetPoolItem(int nWidth, int nHeight, int nMips, int nArraySize, ETEX_Format eTF, bool bIsSRGB, ETEX_Type eTT, bool bShouldBeCreated, const char* sName, STextureInfo* pTI, bool bCanCreate, bool bWaitForIdle)
-{
-    D3DFormat d3dFmt = CTexture::DeviceFormatFromTexFormat(eTF);
-    if (bIsSRGB)
-    {
-        d3dFmt = CTexture::ConvertToSRGBFmt(d3dFmt);
-    }
-
-    STexPool* pPool = CreatePool(nWidth, nHeight, nMips, nArraySize, d3dFmt, eTT);
-    if (!pPool)
-    {
-        return NULL;
-    }
-
-    AUTO_LOCK(STexPoolItem::s_sSyncLock);
-
-    STexPoolItemHdr* pITH = &m_FreeTexPoolItems;
-    STexPoolItem* pIT = static_cast<STexPoolItem*>(pITH);
-
-    bool bFoundACoolingMatch = false;
-
-#ifndef TSP_GC_ALL_ITEMS
-
-    if (!pTI)
-    {
-        pITH = m_FreeTexPoolItems.m_PrevFree;
-        pIT = static_cast<STexPoolItem*>(pITH);
-
-        // Try to find empty item in the pool
-        while (pITH != &m_FreeTexPoolItems)
-        {
-            if (pIT->m_pOwner == pPool)
-            {
-                if (!bWaitForIdle || !pIT->IsStillUsedByGPU(m_nTick))
-                {
-                    break;
-                }
-
-                bFoundACoolingMatch = true;
-            }
-
-            pITH = pITH->m_PrevFree;
-            pIT = static_cast<STexPoolItem*>(pITH);
-        }
-    }
-
-#endif
-
-    if (pITH != &m_FreeTexPoolItems)
-    {
-        pIT->UnlinkFree();
-#if defined(DO_RENDERLOG)
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logTexStreaming == 2)
-        {
-            gRenDev->LogStrv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Remove from FreePool '%s', [%d x %d], Size: %d\n", sName, pIT->m_pOwner->m_Width, pIT->m_pOwner->m_Height, pIT->m_pOwner->m_Size);
-        }
-#endif
-
-#if !defined(_RELEASE)
-        ++m_frameStats.nSoftCreates;
-#endif
-
-        --pIT->m_pOwner->m_nItemsFree;
-    }
-    else
-    {
-        if (!bCanCreate)
-        {
-            return NULL;
-        }
-
-#if defined(TEXSTRM_TEXTURECENTRIC_MEMORY)
-        if (bFoundACoolingMatch)
-        {
-            // Really, really, don't want to create a texture if one will be available soon
-            if (!bShouldBeCreated)
-            {
-                return NULL;
-            }
-        }
-#endif
-
-        // Create API texture for the item in DEFAULT pool
-        const char* poolTextureName = "StreamingTexturePool";
-
-        HRESULT h = S_OK;
-        CDeviceTexture* pDevTex = NULL;
-        if (eTT != eTT_Cube)
-        {
-            h = gcpRendD3D->m_DevMan.Create2DTexture(poolTextureName, nWidth, nHeight, nMips, nArraySize, STREAMED_TEXTURE_USAGE, Clr_Transparent, d3dFmt, D3DPOOL_DEFAULT, &pDevTex, pTI, bShouldBeCreated);
-        }
-        else
-        {
-            h = gcpRendD3D->m_DevMan.CreateCubeTexture(poolTextureName, nWidth, nMips, 1, STREAMED_TEXTURE_USAGE, Clr_Transparent, d3dFmt, D3DPOOL_DEFAULT, &pDevTex, pTI, bShouldBeCreated);
-        }
-        if (FAILED(h) || !pDevTex)
-        {
-            return NULL;
-        }
-
-#ifdef TEXSTRM_USE_FREEPOOL
-        if (m_nFreePoolBegin != m_nFreePoolEnd)
-        {
-            assert (m_nFreePoolBegin < (sizeof(m_FreePool) / sizeof(m_FreePool[0])));
-
-            void* p = m_FreePool[m_nFreePoolBegin];
-            m_nFreePoolBegin = (m_nFreePoolBegin + 1) % MaxFreePool;
-            pIT = new (p) STexPoolItem(pPool, pDevTex, pPool->m_Size);
-        }
-        else
-#endif
-        {
-            pIT = new STexPoolItem(pPool, pDevTex, pPool->m_Size);
-        }
-
-        pIT->Link(&pPool->m_ItemsList);
-        CryInterlockedAddSize(&m_nDeviceMemReserved, (ptrdiff_t)pPool->m_Size);
-
-#if !defined(_RELEASE)
-        ++m_frameStats.nHardCreates;
-#endif
-    }
-
-    CryInterlockedAddSize(&m_nDeviceMemInUse, (ptrdiff_t)pIT->m_nDeviceTexSize);
-
-    return pIT;
-}
-
-void CTextureStreamPoolMgr::ReleaseItem(STexPoolItem* pItem)
-{
-    assert(!pItem->m_NextFree);
-
-#ifdef DO_RENDERLOG
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logTexStreaming == 2)
-    {
-        const char* name = pItem->m_pTex ? pItem->m_pTex->GetSourceName() : "";
-        gRenDev->LogStrv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Add to FreePool '%s', [%d x %d], Size: %d\n", name, pItem->m_pOwner->m_Width, pItem->m_pOwner->m_Height, pItem->m_pOwner->m_Size);
-    }
-#endif
-
-    CryInterlockedAddSize(&m_nDeviceMemInUse, -(ptrdiff_t)pItem->m_nDeviceTexSize);
-
-    pItem->m_pTex = NULL;
-    pItem->m_nFreeTick = m_nTick;
-    pItem->LinkFree(&m_FreeTexPoolItems);
-
-    ++pItem->m_pOwner->m_nItemsFree;
-
-#if !defined(_RELEASE)
-    ++m_frameStats.nSoftFrees;
-#endif
-}
-
-STexPool* CTextureStreamPoolMgr::CreatePool(int nWidth, int nHeight, int nMips, int nArraySize, D3DFormat eTF, ETEX_Type eTT)
-{
-    STexPool* pPool = NULL;
-
-    TexturePoolKey poolKey((uint16)nWidth, (uint16)nHeight, eTF, (uint8)eTT, (uint8)nMips, (uint16)nArraySize);
-
-    TexturePoolMap::iterator it = m_TexturesPools.find(poolKey);
-    if (it == m_TexturesPools.end())
-    {
-        // Create new pool
-        pPool = new STexPool;
-        pPool->m_eTT = eTT;
-        pPool->m_eFormat = eTF;
-        pPool->m_Width = nWidth;
-        pPool->m_Height = nHeight;
-        pPool->m_nArraySize = nArraySize;
-        pPool->m_nMips = nMips;
-        pPool->m_Size = CDeviceTexture::TextureDataSize(nWidth, nHeight, 1, nMips, nArraySize * (eTT == eTT_Cube ? 6 : 1), CTexture::TexFormatFromDeviceFormat(eTF));
-
-        pPool->m_nItems = 0;
-        pPool->m_nItemsFree = 0;
-
-        pPool->m_ItemsList.m_Next = &pPool->m_ItemsList;
-        pPool->m_ItemsList.m_Prev = &pPool->m_ItemsList;
-
-        it = m_TexturesPools.insert(std::make_pair(poolKey, pPool)).first;
-    }
-
-    return it->second;
-}
-
-void CTextureStreamPoolMgr::FlushFree()
-{
-    STexPoolItemHdr* pITH = m_FreeTexPoolItems.m_PrevFree;
-    while (pITH != &m_FreeTexPoolItems)
-    {
-        STexPoolItemHdr* pITHNext = pITH->m_PrevFree;
-        STexPoolItem* pIT = static_cast<STexPoolItem*>(pITH);
-
-        assert (!pIT->m_pTex);
-        CryInterlockedAddSize(&m_nDeviceMemReserved, -(ptrdiff_t)pIT->m_nDeviceTexSize);
-
-#ifdef TEXSTRM_USE_FREEPOOL
-        unsigned int nFreePoolSize = (m_nFreePoolEnd - m_nFreePoolBegin) % MaxFreePool;
-        if (nFreePoolSize < MaxFreePool - 1) // -1 to avoid needing a separate count
-        {
-            pIT->~STexPoolItem();
-            m_FreePool[m_nFreePoolEnd] = pIT;
-            m_nFreePoolEnd = (m_nFreePoolEnd + 1) % MaxFreePool;
-        }
-        else
-#endif
-        {
-            delete pIT;
-        }
-
-        pITH = pITHNext;
-    }
-}
-
-void CTextureStreamPoolMgr::GarbageCollect(size_t* nCurTexPoolSize, size_t nLowerPoolLimit, int nMaxItemsToFree)
-{
-    size_t nSize = nCurTexPoolSize ? *nCurTexPoolSize : 1024 * 1024 * 1024;
-    ptrdiff_t nFreed = 0;
-
-    AUTO_LOCK(STexPoolItem::s_sSyncLock);
-
-    STexPoolItemHdr* pITH = m_FreeTexPoolItems.m_PrevFree;
-    while (pITH != &m_FreeTexPoolItems)
-    {
-        STexPoolItemHdr* pITHNext = pITH->m_PrevFree;
-
-        STexPoolItem* pIT = static_cast<STexPoolItem*>(pITH);
-
-        if (!pIT->m_pTex)
-        {
-            pITH = pITHNext;
-            continue;
-        }
-
-#if defined(TEXSTRM_TEXTURECENTRIC_MEMORY)
-        if (pIT->m_pOwner->m_nItemsFree > 20 || pIT->m_pOwner->m_Width > 64 || pIT->m_pOwner->m_Height > 64)
-#endif
-        {
-            if (!pIT->IsStillUsedByGPU(m_nTick))
-            {
-                nSize -= pIT->m_nDeviceTexSize;
-                nFreed += (ptrdiff_t)pIT->m_nDeviceTexSize;
-
-#ifdef TEXSTRM_USE_FREEPOOL
-                unsigned int nFreePoolSize = (m_nFreePoolEnd - m_nFreePoolBegin) % MaxFreePool;
-                if (nFreePoolSize < MaxFreePool - 1) // -1 to avoid needing a separate count
-                {
-                    pIT->~STexPoolItem();
-                    m_FreePool[m_nFreePoolEnd] = pIT;
-                    m_nFreePoolEnd = (m_nFreePoolEnd + 1) % MaxFreePool;
-                }
-                else
-#endif
-                {
-                    delete pIT;
-                }
-
-                --nMaxItemsToFree;
-
-#if !defined(_RELEASE)
-                ++m_frameStats.nHardFrees;
-#endif
-            }
-        }
-
-        pITH = pITHNext;
-
-        // we release all textures immediately on consoles
-#ifndef TSP_GC_ALL_ITEMS
-        if (nMaxItemsToFree <= 0 || nSize < nLowerPoolLimit)
-        {
-            break;
-        }
-#endif
-    }
-
-    CryInterlockedAddSize(&m_nDeviceMemReserved, -nFreed);
-
-    CTexture::StreamValidateTexSize();
-
-    if (nCurTexPoolSize)
-    {
-        *nCurTexPoolSize = nSize;
-    }
-
-#if !defined(_RELEASE)
-    if (m_bComputeStats)
-    {
-        CryAutoLock<CryCriticalSection> lock(m_statsLock);
-
-        m_poolStats.clear();
-
-        for (TexturePoolMap::iterator it = m_TexturesPools.begin(), itEnd = m_TexturesPools.end(); it != itEnd; ++it)
-        {
-            STexPool* pPool = it->second;
-            SPoolStats ps;
-            ps.nWidth = pPool->m_Width;
-            ps.nHeight = pPool->m_Height;
-            ps.nMips = pPool->m_nMips;
-            ps.nFormat = pPool->m_eFormat;
-            ps.eTT = pPool->m_eTT;
-
-            ps.nInUse = pPool->m_nItems - pPool->m_nItemsFree;
-            ps.nFree = pPool->m_nItemsFree;
-            ps.nHardCreatesPerFrame = 0;
-            ps.nSoftCreatesPerFrame = 0;
-
-            m_poolStats.push_back(ps);
-        }
-    }
-#endif
-
-    ++m_nTick;
-}
-
-void CTextureStreamPoolMgr::GetMemoryUsage(ICrySizer* pSizer)
-{
-    SIZER_COMPONENT_NAME(pSizer, "Texture Pools");
-    pSizer->AddObject(m_TexturesPools);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTexturesStreaming.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DTexturesStreaming.cpp
deleted file mode 100644
index 53a62e3f45..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTexturesStreaming.cpp
+++ /dev/null
@@ -1,986 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "StringUtils.h"
-#include <AzCore/Debug/Profiler.h>
-
-#include "../Common/Textures/TextureStreamPool.h"
-
-// checks for MT-safety of called functions
-#define D3D_CHK_RENDTH assert(gcpRendD3D->m_pRT->IsRenderThread())
-#define D3D_CHK_MAINTH assert(gcpRendD3D->m_pRT->IsMainThread())
-#define D3D_CHK_MAINORRENDTH assert(gRenDev->m_pRT->IsMainThread() || gRenDev->m_pRT->IsRenderThread())
-
-void CTexture::InitStreamingDev()
-{
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DTEXTURESSTREAMING_CPP_SECTION_1 1
-#define D3DTEXTURESSTREAMING_CPP_SECTION_2 2
-#define D3DTEXTURESSTREAMING_CPP_SECTION_3 3
-#define D3DTEXTURESSTREAMING_CPP_SECTION_4 4
-#define D3DTEXTURESSTREAMING_CPP_SECTION_5 5
-#define D3DTEXTURESSTREAMING_CPP_SECTION_6 6
-#define D3DTEXTURESSTREAMING_CPP_SECTION_7 7
-#endif
-
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-    if (CRenderer::CV_r_texturesstreamingDeferred)
-    {
-        if (!s_pStreamDeferredCtx)
-        {
-            gcpRendD3D->GetDevice().CreateDeferredContext(0, &s_pStreamDeferredCtx);
-        }
-    }
-#endif
-}
-
-bool CTexture::IsStillUsedByGPU()
-{
-    CDeviceTexture* pDeviceTexture = m_pDevTexture;
-    if (pDeviceTexture)
-    {
-        D3D_CHK_RENDTH;
-    }
-    return false;
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURESSTREAMING_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DTexturesStreaming_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-
-bool CTexture::StreamPrepare_Platform()
-{
-    return true;
-}
-
-#endif
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURESSTREAMING_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DTexturesStreaming_cpp)
-#endif
-
-void CTexture::StreamExpandMip(const void* vpRawData, int nMip, int nBaseMipOffset, int nSideDelta)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    const uint32 nCurMipWidth = (m_nWidth >> (nMip + nBaseMipOffset));
-    const uint32 nCurMipHeight = (m_nHeight >> (nMip + nBaseMipOffset));
-
-    const STexMipHeader& mh = m_pFileTexMips->m_pMipHeader[nBaseMipOffset + nMip];
-
-    const byte* pRawData = (const byte*)vpRawData;
-
-    const int nSides = StreamGetNumSlices();
-    const Vec2i vMipAlign = CTexture::GetBlockDim(m_eTFDst);
-
-    const int nSrcSurfaceSize = CTexture::TextureDataSize(nCurMipWidth, nCurMipHeight, 1, 1, 1, m_eTFSrc, m_eSrcTileMode);
-    const int nSrcSidePitch = nSrcSurfaceSize + nSideDelta;
-
-    if (mh.m_Mips && mh.m_SideSize > 0)
-    {
-        for (int iSide = 0; iSide < nSides; ++iSide)
-        {
-            SMipData* mp = &mh.m_Mips[iSide];
-            if (mp)
-            {
-                if (!mp->DataArray)
-                {
-                    mp->Init(mh.m_SideSize, Align(max(1, m_nWidth >> nMip), vMipAlign.x), Align(max(1, m_nHeight >> nMip), vMipAlign.y));
-                }
-
-                const byte* pRawSideData = pRawData + nSrcSidePitch * iSide;
-                CTexture::ExpandMipFromFile(&mp->DataArray[0], mh.m_SideSize, pRawSideData, nSrcSurfaceSize, m_eTFSrc);
-            }
-        }
-    }
-}
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-void STexStreamOutState::CopyMips()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::System);
-
-    CTexture* tp = m_pTexture;
-
-    if (m_nStartMip < MAX_MIP_LEVELS)
-    {
-        const int nOldMipOffset = m_nStartMip - tp->m_nMinMipVidUploaded;
-        const int nNumMips = tp->GetNumMipsNonVirtual() - m_nStartMip;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURESSTREAMING_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(D3DTexturesStreaming_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        CTexture::StreamCopyMipsTexToTex(tp->m_pFileTexMips->m_pPoolItem, 0 + nOldMipOffset, m_pNewPoolItem, 0, nNumMips);
-#endif
-    }
-    else
-    {
-        // Stream unload case - pull persistent mips into local memory
-        tp->StreamCopyMipsTexToMem(tp->m_nMips - tp->m_CacheFileHeader.m_nMipsPersistent, tp->m_nMips - 1, false, NULL);
-    }
-
-    m_bDone = true;
-}
-#endif
-
-int CTexture::StreamTrim(int nToMip)
-{
-    FUNCTION_PROFILER_RENDERER;
-    D3D_CHK_RENDTH;
-
-    if (IsUnloaded() || !IsStreamed() || IsStreaming())
-    {
-        return 0;
-    }
-
-    // clamp mip level
-    nToMip = max(0, min(nToMip, m_nMips - m_CacheFileHeader.m_nMipsPersistent));
-
-    if (m_nMinMipVidUploaded >= nToMip)
-    {
-        return 0;
-    }
-
-    int nFreeSize = StreamComputeDevDataSize(m_nMinMipVidUploaded) - StreamComputeDevDataSize(nToMip);
-
-#ifndef _RELEASE
-    if (CRenderer::CV_r_TexturesStreamingDebug == 2)
-    {
-        iLog->Log("Shrinking texture: %s - From mip: %i, To mip: %i", m_SrcName.c_str(), m_nMinMipVidUploaded, GetRequiredMipNonVirtual());
-    }
-#endif
-
-    STexPoolItem* pNewPoolItem = StreamGetPoolItem(nToMip, m_nMips - nToMip, false, false, true, true);
-    assert(pNewPoolItem != m_pFileTexMips->m_pPoolItem);
-    if (pNewPoolItem)
-    {
-        const int nOldMipOffset = nToMip - m_nMinMipVidUploaded;
-        const int nNumMips = GetNumMipsNonVirtual() - nToMip;
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-
-        bool bCopying = false;
-
-        if (CanAsyncCopy() && (TryAddRef() > 0))
-        {
-            STexStreamOutState* pStreamState = StreamState_AllocateOut();
-            if (pStreamState)
-            {
-                pStreamState->m_nStartMip = nToMip;
-                pStreamState->m_pNewPoolItem = pNewPoolItem;
-                pStreamState->m_pTexture = this;
-
-                SetStreamingInProgress(StreamOutMask | (uint8)s_StreamOutTasks.GetIdxFromPtr(pStreamState));
-
-                pStreamState->m_jobExecutor.StartJob([pStreamState]()
-                {
-                    pStreamState->CopyMips();
-                });
-
-                bCopying = true;
-
-#ifdef DO_RENDERLOG
-                if (gRenDev->m_logFileStrHandle != AZ::IO::InvalidHandle)
-                {
-                    gRenDev->LogStrv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Async Start SetLod '%s', Lods: [%d-%d], Time: %.3f\n", m_SrcName.c_str(), nToMip, m_nMips - 1, iTimer->GetAsyncCurTime());
-                }
-#endif
-            }
-            else
-            {
-                Release();
-            }
-        }
-
-        if (!bCopying)
-#endif
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURESSTREAMING_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(D3DTexturesStreaming_cpp)
-#endif
-            // it is a sync operation anyway, so we do it in the render thread
-            CTexture::StreamCopyMipsTexToTex(m_pFileTexMips->m_pPoolItem, 0 + nOldMipOffset, pNewPoolItem, 0, nNumMips);
-            StreamAssignPoolItem(pNewPoolItem, nToMip);
-        }
-    }
-    else
-    {
-        s_pTextureStreamer->FlagOutOfMemory();
-    }
-
-    return nFreeSize;
-}
-
-
-int CTexture::StreamUnload()
-{
-    D3D_CHK_RENDTH;
-
-    if (IsUnloaded() || !IsStreamed() || !CRenderer::CV_r_texturesstreaming)
-    {
-        return 0;
-    }
-
-    AbortStreamingTasks(this);
-    assert(!IsStreaming());
-
-    int nDevSize = m_nActualSize;
-
-#ifdef TEXSTRM_ASYNC_TEXCOPY
-    bool bCopying = false;
-
-    if (CanAsyncCopy() && (TryAddRef() > 0))
-    {
-        STexStreamOutState* pStreamState = StreamState_AllocateOut();
-        if (pStreamState)
-        {
-            pStreamState->m_pTexture = this;
-            pStreamState->m_nStartMip = MAX_MIP_LEVELS;
-
-            SetStreamingInProgress(StreamOutMask | (uint8)s_StreamOutTasks.GetIdxFromPtr(pStreamState));
-
-            pStreamState->m_jobExecutor.StartJob([pStreamState]()
-            {
-                pStreamState->CopyMips();
-            });
-
-            bCopying = true;
-        }
-        else
-        {
-            Release();
-        }
-    }
-
-    if (!bCopying)
-#endif
-    {
-        // copy old mips to system memory
-        StreamCopyMipsTexToMem(m_nMips - m_CacheFileHeader.m_nMipsPersistent, m_nMips - 1, false, NULL);
-        ReleaseDeviceTexture(true);
-        SetWasUnload(true);
-    }
-
-#ifndef _RELEASE
-    if (CRenderer::CV_r_TexturesStreamingDebug == 2)
-    {
-        iLog->Log("Unloading unused texture: %s", m_SrcName.c_str());
-    }
-#endif
-
-    return nDevSize;
-}
-
-void CTexture::StreamActivateLod(int nMinMip)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    STexPoolItem* pItem = m_pFileTexMips->m_pPoolItem;
-    STexPool* pPool = pItem->m_pOwner;
-    int nMipOffset = m_nMips - pPool->m_nMips;
-    int nDevMip = min((int)pPool->m_nMips - 1, max(0, nMinMip - nMipOffset));
-
-    if (pItem->m_nActiveLod != nDevMip)
-    {
-        pItem->m_nActiveLod = nDevMip;
-
-        //D3DDevice* dv = gcpRendD3D->GetD3DDevice();
-        //gcpRendD3D->GetDeviceContext().SetResourceMinLOD(m_pDevTexture->GetBaseTexture(), (FLOAT)nDevMip);
-    }
-
-    m_nMinMipVidActive = nMinMip;
-}
-
-void CTexture::StreamCopyMipsTexToMem(int nStartMip, int nEndMip, bool bToDevice, STexPoolItem* pNewPoolItem)
-{
-    PROFILE_FRAME(Texture_StreamUpload);
-
-    CD3D9Renderer* r = gcpRendD3D;
-    CDeviceManager* pDevMan = &r->m_DevMan;
-    HRESULT h = S_OK;
-    nEndMip =   min(nEndMip + 1, (int)m_nMips) - 1;//+1 -1 needed as the compare is <=
-    STexMipHeader* mh = m_pFileTexMips->m_pMipHeader;
-
-    const Vec2i vMipAlign = CTexture::GetBlockDim(m_eTFDst);
-
-    const int nOldMinMipVidUploaded = m_nMinMipVidUploaded;
-
-    if (bToDevice && !pNewPoolItem)
-    {
-        SetMinLoadedMip(nStartMip);
-    }
-
-    D3DFormat fmt = DeviceFormatFromTexFormat(GetDstFormat());
-    if (m_bIsSRGB)
-    {
-        fmt = ConvertToSRGBFmt(fmt);
-    }
-
-    CDeviceTexture* pDevTexture = m_pDevTexture;
-    uint32 nTexMips = m_nMips;
-    if (m_pFileTexMips->m_pPoolItem)
-    {
-        assert(m_pFileTexMips->m_pPoolItem->m_pDevTexture);
-        assert(pDevTexture == m_pFileTexMips->m_pPoolItem->m_pDevTexture);
-        nTexMips = m_pFileTexMips->m_pPoolItem->m_pOwner->m_nMips;
-    }
-    if (bToDevice && pNewPoolItem)
-    {
-        assert(pNewPoolItem->m_pDevTexture);
-        pDevTexture = pNewPoolItem->m_pDevTexture;
-        nTexMips = pNewPoolItem->m_pOwner->m_nMips;
-    }
-
-    if (!pDevTexture)
-    {
-        if (m_eTT != eTT_Cube)
-        {
-            h = pDevMan->Create2DTexture(m_SrcName, m_nWidth, m_nHeight, m_nMips, m_nArraySize, STREAMED_TEXTURE_USAGE, m_cClearColor, fmt, (D3DPOOL)0, &pDevTexture);
-        }
-        else
-        {
-            h = pDevMan->CreateCubeTexture(m_SrcName, m_nWidth, m_nMips, 1, STREAMED_TEXTURE_USAGE, m_cClearColor, fmt, (D3DPOOL)0, &pDevTexture);
-        }
-        assert(h == S_OK);
-
-        // If a pool item was provided, it would have a valid dev texture, so we shouldn't have ended up here..
-        assert (!bToDevice || !pNewPoolItem);
-        SetDevTexture(pDevTexture);
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_texturesstreamingnoupload && bToDevice)
-    {
-        return;
-    }
-
-    const int nMipOffset = m_nMips - nTexMips;
-    const int32 nSides = StreamGetNumSlices();
-
-    D3DBaseTexture* pID3DTexture = pDevTexture->GetBaseTexture();
-
-    int SizeToLoad = 0;
-    for (int32 iSide = 0; iSide < nSides; ++iSide)
-    {
-        const int32 iSideLockIndex = m_eTT != eTT_Cube ? -1 : iSide;
-        for (int nLod = nStartMip; nLod <= nEndMip; nLod++)
-        {
-            SMipData* mp = &mh[nLod].m_Mips[iSide];
-            int nMipW = m_nWidth >> nLod;
-            int nMipH = m_nHeight >> nLod;
-
-            if (bToDevice && !mp->DataArray && s_bStreamDontKeepSystem)  // we have this mip already loaded
-            {
-                continue;
-            }
-
-            const int nDevTexMip = nLod - nMipOffset;
-
-            if (bToDevice)
-            {
-                if (mp->DataArray)
-                {
-                    CryInterlockedAdd(&CTexture::s_nTexturesDataBytesUploaded, mh[nLod].m_SideSize);
-                    const int nRowPitch = CTexture::TextureDataSize(nMipW, 1, 1, 1, 1, m_eTFDst);
-                    const int nSlicePitch = CTexture::TextureDataSize(nMipW, nMipH, 1, 1, 1, m_eTFDst);
-                    STALL_PROFILER("update texture");
-                    {
-                        gcpRendD3D->GetDeviceContext().UpdateSubresource(pID3DTexture, D3D11CalcSubresource(nDevTexMip, iSide, nTexMips), NULL, &mp->DataArray[0], nRowPitch, nSlicePitch);
-                    }
-                }
-                else
-                {
-                    assert(0);
-                }
-            }
-            else
-            {
-                const int nMipSize = mh[nLod].m_SideSize;
-                mp->Init(nMipSize, nMipW, nMipH);
-                const int nRowPitch = CTexture::TextureDataSize(nMipW, 1, 1, 1, 1, m_eTFDst);
-                const int nRows = nMipSize / nRowPitch;
-                assert(nMipSize % nRowPitch == 0);
-
-                STALL_PROFILER("update texture");
-                pDevTexture->DownloadToStagingResource(D3D11CalcSubresource(nDevTexMip, iSide, nTexMips), [&](void* pData, uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-                {
-                    for (int iRow = 0; iRow < nRows; ++iRow)
-                    {
-                        memcpy(&mp->DataArray[iRow * nRowPitch], (byte*)pData + rowPitch * iRow, nRowPitch);
-                    }
-                    return true;
-                });
-                // mark as native
-                mp->m_bNative = true;
-            }
-            SizeToLoad += m_pFileTexMips->m_pMipHeader[nLod].m_SideSize;
-
-            if (s_bStreamDontKeepSystem && bToDevice)
-            {
-                mp->Free();
-            }
-        }
-    }
-#ifdef DO_RENDERLOG
-    if (gRenDev->m_logFileStrHandle != AZ::IO::InvalidHandle)
-    {
-        gRenDev->LogStrv(SRendItem::m_RecurseLevel[gRenDev->m_RP.m_nProcessThreadID], "Uploading mips '%s'. (%d[%d]), Size: %d, Time: %.3f\n", m_SrcName.c_str(), nStartMip, m_nMips, SizeToLoad, iTimer->GetAsyncCurTime());
-    }
-#endif
-}
-
-#if defined(TEXSTRM_DEFERRED_UPLOAD)
-
-ID3D11CommandList* CTexture::StreamCreateDeferred(int nStartMip, int nEndMip, STexPoolItem* pNewPoolItem, STexPoolItem* pSrcPoolItem)
-{
-    PROFILE_FRAME(Texture_StreamCreateDeferred);
-
-    if ((pNewPoolItem == nullptr) || (pSrcPoolItem == nullptr))
-    {
-        AZ_Warning("CTexture", false, "CTexture::StreamCreateDeferred called with pNewPoolItem = %p and pSrcPoolItem = %p, command list will not be created", pNewPoolItem, pSrcPoolItem);
-        return nullptr;
-    }
-
-    ID3D11CommandList* pCmdList = nullptr;
-
-    if (CTexture::s_pStreamDeferredCtx)
-    {
-        nEndMip =   min(nEndMip + 1, (int)m_nMips) - 1;//+1 -1 needed as the compare is <=
-        STexMipHeader* mh = m_pFileTexMips->m_pMipHeader;
-
-        const int nOldMinMipVidUploaded = m_nMinMipVidUploaded;
-
-        D3DFormat fmt = DeviceFormatFromTexFormat(GetDstFormat());
-        if (m_bIsSRGB)
-        {
-            fmt = ConvertToSRGBFmt(fmt);
-        }
-
-        CDeviceTexture* pDevTexture = pNewPoolItem->m_pDevTexture;
-        uint32 nTexMips = pNewPoolItem->m_pOwner->m_nMips;
-
-        const int nMipOffset = m_nMips - nTexMips;
-        const int32 nSides = StreamGetNumSlices();
-
-        const Vec2i vMipAlign = GetBlockDim(m_eTFSrc);
-
-        D3DBaseTexture* pID3DTexture = pDevTexture->GetBaseTexture();
-
-        int SizeToLoad = 0;
-        for (int32 iSide = 0; iSide < nSides; ++iSide)
-        {
-            const int32 iSideLockIndex = m_eTT != eTT_Cube ? -1 : iSide;
-            for (int nLod = nStartMip; nLod <= nEndMip; nLod++)
-            {
-                SMipData* mp = &mh[nLod].m_Mips[iSide];
-
-                if (mp->DataArray)
-                {
-                    const int nDevTexMip = nLod - nMipOffset;
-
-                    CryInterlockedAdd(&CTexture::s_nTexturesDataBytesUploaded, mh[nLod].m_SideSize);
-                    const int nUSize = Align(max(1, m_nWidth >> nLod), vMipAlign.x);
-                    const int nVSize = Align(max(1, m_nHeight >> nLod), vMipAlign.y);
-                    const int nRowPitch = CTexture::TextureDataSize(nUSize, 1, 1, 1, 1, m_eTFDst);
-                    const int nSlicePitch = CTexture::TextureDataSize(nUSize, nVSize, 1, 1, 1, m_eTFDst);
-                    STALL_PROFILER("update texture");
-                    {
-                        s_pStreamDeferredCtx->UpdateSubresource(pID3DTexture, D3D11CalcSubresource(nDevTexMip, iSide, nTexMips), NULL, &mp->DataArray[0], nRowPitch, nSlicePitch);
-                    }
-
-                    SizeToLoad += m_pFileTexMips->m_pMipHeader[nLod].m_SideSize;
-
-                    if (s_bStreamDontKeepSystem)
-                    {
-                        mp->Free();
-                    }
-                }
-            }
-        }
-
-        int nMipsSrc = pSrcPoolItem->m_pOwner->m_nMips;
-        int nMipsDst = pNewPoolItem->m_pOwner->m_nMips;
-        int nMipSrcOffset = m_nMips - nMipsSrc;
-        int nMipDstOffset = m_nMips - nMipsDst;
-
-        for (int32 iSide = 0; iSide < nSides; ++iSide)
-        {
-            for (int i = nEndMip + 1; i < m_nMips; ++i)
-            {
-                s_pStreamDeferredCtx->CopySubresourceRegion(
-                    pID3DTexture,
-                    D3D11CalcSubresource(i - nMipDstOffset, iSide, nMipsDst),
-                    0, 0, 0, pSrcPoolItem->m_pDevTexture->GetBaseTexture(),
-                    D3D11CalcSubresource(i - nMipSrcOffset, iSide, nMipsSrc),
-                    NULL);
-            }
-        }
-
-        s_pStreamDeferredCtx->FinishCommandList(FALSE, &pCmdList);
-    }
-
-    return pCmdList;
-}
-
-void CTexture::StreamApplyDeferred(ID3D11CommandList* pCmdList)
-{
-    FUNCTION_PROFILER_RENDERER;
-    gcpRendD3D->GetDeviceContext().ExecuteCommandList(pCmdList, TRUE);
-}
-
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURESSTREAMING_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(D3DTexturesStreaming_cpp)
-#endif
-
-// Just remove item from the texture object and keep Item in Pool list for future use
-// This function doesn't release API texture
-void CTexture::StreamRemoveFromPool()
-{
-    D3D_CHK_MAINORRENDTH;
-
-    if (!m_pFileTexMips || !m_pFileTexMips->m_pPoolItem)
-    {
-        return;
-    }
-
-    AUTO_LOCK(STexPoolItem::s_sSyncLock);
-
-    SAFE_RELEASE(*alias_cast<D3DShaderResourceView**>(&m_pDeviceShaderResource));
-
-    ptrdiff_t nSize = (ptrdiff_t)m_nActualSize;
-    ptrdiff_t nPersSize = (ptrdiff_t)m_nPersistentSize;
-
-    s_pPoolMgr->ReleaseItem(m_pFileTexMips->m_pPoolItem);
-
-    m_pFileTexMips->m_pPoolItem = NULL;
-    m_nActualSize = 0;
-    m_nPersistentSize = 0;
-    m_pDevTexture = NULL;
-
-    SetMinLoadedMip(MAX_MIP_LEVELS);
-    m_nMinMipVidActive = MAX_MIP_LEVELS;
-
-    CryInterlockedAddSize(&s_nStatsStreamPoolBoundMem, -nSize);
-    CryInterlockedAddSize(&s_nStatsStreamPoolBoundPersMem, -nPersSize);
-}
-
-void CTexture::StreamAssignPoolItem(STexPoolItem* pItem, int nMinMip)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    assert (!pItem->IsFree());
-    STexPool* pItemOwner = pItem->m_pOwner;
-
-    if (m_pFileTexMips->m_pPoolItem == pItem)
-    {
-        assert(m_nActualSize == m_pFileTexMips->m_pPoolItem->m_pOwner->m_Size);
-        assert(m_pFileTexMips->m_pPoolItem->m_pTex == this);
-        assert(m_pDevTexture == m_pFileTexMips->m_pPoolItem->m_pDevTexture);
-        return;
-    }
-
-    if (m_pFileTexMips->m_pPoolItem == NULL)
-    {
-        if (m_pDevTexture)
-        {
-            __debugbreak();
-        }
-    }
-
-    int nPersMip = m_nMips - m_CacheFileHeader.m_nMipsPersistent;
-    size_t nPersSize = StreamComputeDevDataSize(nPersMip);
-
-    // Assign a new pool item
-    {
-        AUTO_LOCK(STexPoolItem::s_sSyncLock);
-        StreamRemoveFromPool();
-
-        m_pFileTexMips->m_pPoolItem = pItem;
-        m_nActualSize = pItemOwner->m_Size;
-        m_nPersistentSize = nPersSize;
-        pItem->m_pTex = this;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURESSTREAMING_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(D3DTexturesStreaming_cpp)
-#endif
-
-    SAFE_RELEASE(m_pDevTexture);
-    m_pDevTexture = pItem->m_pDevTexture;
-
-    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
-    ZeroStruct(SRVDesc);
-    SRVDesc.Format = DeviceFormatFromTexFormat(GetDstFormat());
-    if (m_bIsSRGB)
-    {
-        SRVDesc.Format = CTexture::ConvertToSRGBFmt(SRVDesc.Format);
-    }
-
-
-    // Recreate shader resource view
-    if (m_eTT == eTT_2D)
-    {
-        SRVDesc.Texture2D.MipLevels = -1;
-        SRVDesc.Texture2D.MostDetailedMip = 0;
-        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-    }
-    else if (m_eTT == eTT_2DArray)
-    {
-        SRVDesc.Texture2DArray.MipLevels = -1;
-        SRVDesc.Texture2DArray.MostDetailedMip = 0;
-        SRVDesc.Texture2DArray.FirstArraySlice = 0;
-        SRVDesc.Texture2DArray.ArraySize = m_nArraySize;
-        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
-    }
-    else
-    {
-        SRVDesc.TextureCube.MipLevels = -1;
-        SRVDesc.TextureCube.MostDetailedMip = 0;
-        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
-    }
-
-    if (m_pDeviceShaderResource)
-    {
-        D3DShaderResourceView* pSRV = m_pDeviceShaderResource;
-        pSRV->Release();
-        m_pDeviceShaderResource = NULL;
-    }
-
-    D3DShaderResourceView* pNewResourceView = NULL;
-#if !defined(NDEBUG)
-    HRESULT hr =
-#endif
-        gcpRendD3D->GetDevice().CreateShaderResourceView(pItem->m_pDevTexture->GetBaseTexture(), &SRVDesc, &pNewResourceView);
-    assert(hr == S_OK);
-
-    SetShaderResourceView(pNewResourceView, false);
-    SetMinLoadedMip(m_nMips - pItemOwner->m_nMips);
-    StreamActivateLod(nMinMip);
-
-    CryInterlockedAddSize(&s_nStatsStreamPoolBoundMem, (ptrdiff_t)pItem->m_nDeviceTexSize);
-    CryInterlockedAddSize(&s_nStatsStreamPoolBoundPersMem, (ptrdiff_t)nPersSize);
-}
-
-STexPool* CTexture::StreamGetPool(int nStartMip, int nMips)
-{
-    const Vec2i vMipAlign = CTexture::GetBlockDim(m_eTFDst);
-    int uSize = Align(max(1, m_nWidth >> nStartMip), vMipAlign.x);
-    int vSize = Align(max(1, m_nHeight >> nStartMip), vMipAlign.y);
-
-    return s_pPoolMgr->GetPool(uSize, vSize, nMips, m_nArraySize, m_eTFDst, m_bIsSRGB, m_eTT);
-}
-
-STexPoolItem* CTexture::StreamGetPoolItem(int nStartMip, int nMips, bool bShouldBeCreated, bool bCreateFromMipData, bool bCanCreate, bool bForStreamOut)
-{
-    FUNCTION_PROFILER_RENDERER;
-
-    if (!m_pFileTexMips)
-    {
-        return NULL;
-    }
-
-    assert (nStartMip < m_nMips);
-    assert(!IsStreaming());
-
-    SCOPED_RENDERER_ALLOCATION_NAME_HINT(GetSourceName());
-
-    const Vec2i vMipAlign = CTexture::GetBlockDim(m_eTFDst);
-    int uSize = Align(max(1, m_nWidth >> nStartMip), vMipAlign.x);
-    int vSize = Align(max(1, m_nHeight >> nStartMip), vMipAlign.y);
-    int nArraySize = m_nArraySize;
-    ETEX_Type texType = m_eTT;
-
-    if (m_pFileTexMips->m_pPoolItem && m_pFileTexMips->m_pPoolItem->m_pOwner)
-    {
-        STexPoolItem* pPoolItem = m_pFileTexMips->m_pPoolItem;
-        if (pPoolItem->m_pOwner->m_nMips == nMips &&
-            pPoolItem->m_pOwner->m_Width == uSize &&
-            pPoolItem->m_pOwner->m_Height == vSize &&
-            pPoolItem->m_pOwner->m_nArraySize == nArraySize)
-        {
-            return NULL;
-        }
-    }
-
-    STextureInfo ti;
-    std::vector<STextureInfoData> srti;
-    STextureInfo* pTI = NULL;
-
-    if (bCreateFromMipData)
-    {
-        uint32 nSlices = StreamGetNumSlices();
-
-        ti.m_nMSAAQuality = 0;
-        ti.m_nMSAASamples = 1;
-        srti.resize(nSlices * nMips);
-        ti.m_pData = &srti[0];
-
-        for (int nSide = 0; nSide < nSlices; ++nSide)
-        {
-            for (int nMip = nStartMip, nEndMip = nStartMip + nMips; nMip != nEndMip; ++nMip)
-            {
-                int nSRIdx = nSide * nMips + (nMip - nStartMip);
-                STexMipHeader& mmh = m_pFileTexMips->m_pMipHeader[nMip];
-                SMipData& md = mmh.m_Mips[nSide];
-
-                if (md.m_bNative)
-                {
-                    ti.m_pData[nSRIdx].pSysMem = md.DataArray;
-                    ti.m_pData[nSRIdx].SysMemPitch = 0;
-                    ti.m_pData[nSRIdx].SysMemSlicePitch = 0;
-                    ti.m_pData[nSRIdx].SysMemTileMode = m_eSrcTileMode;
-                }
-                else
-                {
-                    int nMipW = Align(max(1, m_nWidth >> nMip), vMipAlign.x);
-                    int nPitch = 0;
-                    const int BlockDim = vMipAlign.x;
-                    if (BlockDim > 1)
-                    {
-                        int blockSize = BytesPerBlock(m_eTFDst);
-                        nPitch = (nMipW + BlockDim - 1) / BlockDim * blockSize;
-                    }
-                    else
-                    {
-                        nPitch = TextureDataSize(nMipW, 1, 1, 1, 1, m_eTFSrc);
-                    }
-
-                    ti.m_pData[nSRIdx].pSysMem = md.DataArray;
-                    ti.m_pData[nSRIdx].SysMemPitch = nPitch;
-                    ti.m_pData[nSRIdx].SysMemSlicePitch = 0;
-                    ti.m_pData[nSRIdx].SysMemTileMode = eTM_None;
-                }
-            }
-        }
-
-        pTI = &ti;
-    }
-
-    bool bGPIMustWaitForIdle = true;
-
-    // For end of C3, preserve existing (idle wait) console behaviour
-    bGPIMustWaitForIdle = !bForStreamOut;
-
-    STexPoolItem* pItem = s_pPoolMgr->GetPoolItem(uSize, vSize, nMips, nArraySize, GetDstFormat(), m_bIsSRGB, texType, bShouldBeCreated, m_SrcName.c_str(), pTI, bCanCreate, bGPIMustWaitForIdle);
-    if (pItem)
-    {
-        return pItem;
-    }
-
-    s_pTextureStreamer->FlagOutOfMemory();
-    return NULL;
-}
-
-void CTexture::StreamCopyMipsTexToTex(STexPoolItem* pSrcItem, int nMipSrc, STexPoolItem* pDestItem, int nMipDest, int nNumMips)
-{
-    D3D_CHK_RENDTH;
-
-    uint32 nSides = pDestItem->m_pOwner->GetNumSlices();
-
-    for (uint32 iSide = 0; iSide < nSides; ++iSide)
-    {
-        CopySliceChain(pDestItem->m_pDevTexture, pDestItem->m_pOwner->m_nMips, iSide, nMipDest, pSrcItem->m_pDevTexture, iSide, nMipSrc, pSrcItem->m_pOwner->m_nMips, nNumMips);
-    }
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTEXTURESSTREAMING_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(D3DTexturesStreaming_cpp)
-#endif
-
-// Debug routines /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#ifndef _RELEASE
-struct StreamDebugSortFunc
-{
-    bool operator()(const CTexture* p1, const CTexture* p2) const
-    {
-        if (!p1)
-        {
-            return true;
-        }
-        if (!p2)
-        {
-            return false;
-        }
-        if (p1->GetActualSize() != p2->GetActualSize())
-        {
-            return p1->GetActualSize() < p2->GetActualSize();
-        }
-        return p1 < p2;
-    }
-};
-
-struct StreamDebugSortWantedFunc
-{
-    bool operator()(const CTexture* p1, const CTexture* p2) const
-    {
-        int nP1ReqMip = p1->GetRequiredMipNonVirtual();
-        int nP1Size = p1->StreamComputeDevDataSize(nP1ReqMip);
-
-        int nP2ReqMip = p2->GetRequiredMipNonVirtual();
-        int nP2Size = p2->StreamComputeDevDataSize(nP2ReqMip);
-
-        if (nP1Size != nP2Size)
-        {
-            return nP1Size < nP2Size;
-        }
-
-        return p1 < p2;
-    }
-};
-
-void CTexture::OutputDebugInfo()
-{
-    CD3D9Renderer* r = gcpRendD3D;
-
-    int nX = 40;
-    int nY = 30;
-
-    if (CRenderer::CV_r_TexturesStreamingDebugDumpIntoLog)
-    {
-        Vec3i vCamPos = iSystem->GetViewCamera().GetPosition();
-        CryLogAlways("===================== Dumping textures streaming debug info for camera position (%d, %d, %d) =====================", vCamPos.x, vCamPos.y, vCamPos.z);
-    }
-
-    char szText[512];
-    sprintf_s(szText, "Size(MB) | WantedSize | MipFactor | HighPriority | #Mips(Desired/Current/Actual) | RoundID Normal/Fast | RecentlyUsed | Name");
-    r->WriteXY(nX, nY, 1.f, 1.f, 1, 1, 0, 1, szText);
-    if (CRenderer::CV_r_TexturesStreamingDebugDumpIntoLog)
-    {
-        CryLogAlways(szText);
-    }
-
-    std::vector<CTexture*> texSorted;
-    s_pTextureStreamer->StatsFetchTextures(texSorted);
-
-    const char* const sTexFilter = CRenderer::CV_r_TexturesStreamingDebugfilter->GetString();
-    const bool bNameFilter = sTexFilter != 0 && strlen(sTexFilter) > 1;
-
-    if (!texSorted.empty())
-    {
-        switch (CRenderer::CV_r_TexturesStreamingDebug)
-        {
-        case 4:
-            std::stable_sort(&texSorted[0], &texSorted[0] + texSorted.size(), StreamDebugSortFunc());
-            break;
-
-        case 5:
-            std::reverse(texSorted.begin(), texSorted.end());
-            break;
-
-        case 6:
-            std::stable_sort(&texSorted[0], &texSorted[0] + texSorted.size(), StreamDebugSortWantedFunc());
-            break;
-        }
-    }
-
-    SThreadInfo& ti = gRenDev->m_RP.m_TI[gRenDev->m_pRT->GetThreadList()];
-
-    for (int i = (int)texSorted.size() - 1, nTexNum = 0; i >= 0; --i)
-    {
-        CTexture* tp = texSorted[i];
-        if (tp == NULL)
-        {
-            continue;
-        }
-        // name filter
-        if (bNameFilter && !strstr(tp->m_SrcName.c_str(), sTexFilter))
-        {
-            continue;
-        }
-        if (tp->m_nActualSize / 1024 < CRenderer::CV_r_TexturesStreamingDebugMinSize)
-        {
-            continue;
-        }
-
-        ColorF color = (tp->m_nActualSize / 1024 >= CRenderer::CV_r_TexturesStreamingDebugMinSize * 2) ? Col_Red : Col_Green;
-
-        // compute final mip factor
-        bool bHighPriority = false;
-        float fFinalMipFactor = pow(99.99f, 2.f);
-        for (int z = 0; z < MAX_PREDICTION_ZONES; z++)
-        {
-            if (tp->m_pFileTexMips && (int)tp->m_streamRounds[z].nRoundUpdateId > gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_arrZonesRoundId[z] - 2)
-            {
-                fFinalMipFactor = min(fFinalMipFactor, tp->m_pFileTexMips->m_arrSPInfo[z].fLastMinMipFactor);
-                bHighPriority |= tp->m_streamRounds[z].bLastHighPriority;
-            }
-        }
-
-        // how many times used in area around
-        assert(tp->m_pFileTexMips);
-
-        int nMipIdSigned = tp->StreamCalculateMipsSigned(fFinalMipFactor);
-
-        if (nMipIdSigned > CRenderer::CV_r_TexturesStreamingDebugMinMip)
-        {
-            continue;
-        }
-
-        int nPersMip = tp->m_nMips - tp->m_CacheFileHeader.m_nMipsPersistent;
-        int nMipReq = min(tp->GetRequiredMipNonVirtual(), nPersMip);
-        const int nWantedSize = tp->StreamComputeDevDataSize(nMipReq);
-
-        assert(tp->m_pFileTexMips);
-        PREFAST_ASSUME(tp->m_pFileTexMips);
-        sprintf_s(szText, "%.2f | %.2f |%6.2f | %1d | %2d/%d/%d | %i/%i | %i | %s",
-            (float)tp->m_nActualSize / (1024 * 1024.0f),
-            (float)nWantedSize / (1024 * 1024.0f),
-            sqrtf(fFinalMipFactor),
-            (int)bHighPriority,
-            tp->GetNumMipsNonVirtual() - nMipIdSigned, tp->GetNumMipsNonVirtual() - tp->m_nMinMipVidUploaded, tp->GetNumMipsNonVirtual(),
-            tp->m_streamRounds[0].nRoundUpdateId, tp->m_streamRounds[MAX_PREDICTION_ZONES - 1].nRoundUpdateId,
-            tp->m_nAccessFrameID >= (int)ti.m_nFrameUpdateID - 8,
-            tp->m_SrcName.c_str());
-
-        r->WriteXY(nX, nY + (nTexNum + 1) * 10, 1.f, 1.f, color.r, color.g, color.b, 1, szText);
-        if (CRenderer::CV_r_TexturesStreamingDebugDumpIntoLog)
-        {
-            CryLogAlways(szText);
-        }
-
-        ++nTexNum;
-        if (nTexNum > 50 && !CRenderer::CV_r_TexturesStreamingDebugDumpIntoLog)
-        {
-            break;
-        }
-    }
-
-    if (CRenderer::CV_r_TexturesStreamingDebugDumpIntoLog)
-    {
-        CryLogAlways("==============================================================================================================");
-    }
-
-    if (ICVar* pCVar = gEnv->pConsole->GetCVar("r_TexturesStreamingDebugDumpIntoLog"))
-    {
-        pCVar->Set(0);
-    }
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTiledShading.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DTiledShading.cpp
deleted file mode 100644
index 1e590742e2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTiledShading.cpp
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "D3DTiledShading.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "D3DVolumetricFog.h"
-#include "GraphicsPipeline/FurPasses.h"
-
-#include "../Common/Textures/TextureManager.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define D3DTILEDSHADING_CPP_SECTION_1 1
-#define D3DTILEDSHADING_CPP_SECTION_2 2
-#define D3DTILEDSHADING_CPP_SECTION_3 3
-#endif
-
-#if defined(FEATURE_SVO_GI)
-#include "D3D_SVO.h"
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const uint32 AtlasArrayDim = 64;
-const uint32 SpotTexSize = 512;
-const uint32 DiffuseProbeSize = 32;
-const uint32 SpecProbeSize = 256;
-const uint32 ShadowSampleCount = 16;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// The following structs and constants have to match the shader code
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const uint32 MaxNumTileLights = 255;
-const uint32 LightTileSizeX = 8;
-const uint32 LightTileSizeY = 8;
-const uint32 MaxNumClipVolumes = MAX_DEFERRED_CLIP_VOLUMES;
-
-
-struct STiledLightCullInfo
-{
-    uint32    volumeType;
-    uint32    PADDING0;
-    Vec2      depthBounds;
-    Vec4      posRad;
-    Vec4      volumeParams0;
-    Vec4      volumeParams1;
-    Vec4      volumeParams2;
-};  // 80 bytes
-
-struct STiledClipVolumeInfo
-{
-    float    data;
-};
-
-enum ETiledVolumeTypes
-{
-    tlVolumeSphere = 1,
-    tlVolumeCone = 2,
-    tlVolumeOBB = 3,
-    tlVolumeSun = 4,
-};
-
-enum ETiledLightTypes
-{
-    tlTypeProbe = 1,
-    tlTypeAmbientPoint = 2,
-    tlTypeAmbientProjector = 3,
-    tlTypeAmbientArea = 4,
-    tlTypeRegularPoint = 5,
-    tlTypeRegularProjector = 6,
-    tlTypeRegularPointFace = 7,
-    tlTypeRegularArea = 8,
-    tlTypeSun = 9,
-};
-
-// Sun area light parameters (same as in standard deferred shading)
-const float SunDistance = 10000.0f;
-const float SunSourceDiameter = 94.0f;  // atan(AngDiameterSun) * 2 * SunDistance, where AngDiameterSun=0.54deg
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace
-{
-    STiledLightCullInfo g_tileLightsCull[MaxNumTileLights];
-    STiledLightShadeInfo g_tileLightsShade[MaxNumTileLights];
-}
-
-CTiledShading::CTiledShading()
-{
-    // 16 byte alignment is important for performance on nVidia cards
-    STATIC_ASSERT(sizeof(STiledLightCullInfo) % 16 == 0, "STiledLightCullInfo should be 16 byte aligned for GPU performance");
-    STATIC_ASSERT(sizeof(STiledLightShadeInfo) % 16 == 0, "STiledLightShadeInfo should be 16 byte aligned for GPU performance");
-
-    m_dispatchSizeX = 0;
-    m_dispatchSizeY = 0;
-
-    m_nTexStateCompare = 0xFFFFFFFF;
-
-    m_numAtlasUpdates = 0;
-    m_numSkippedLights = 0;
-
-    m_arrShadowCastingLights.Reserve(16);
-
-    m_bApplyCaustics = false;
-}
-
-
-void CTiledShading::CreateResources()
-{
-    uint32 dispatchSizeX = gRenDev->GetWidth() / LightTileSizeX + (gRenDev->GetWidth() % LightTileSizeX > 0 ? 1 : 0);
-    uint32 dispatchSizeY = gRenDev->GetHeight() / LightTileSizeY + (gRenDev->GetHeight() % LightTileSizeY > 0 ? 1 : 0);
-
-    if (m_dispatchSizeX == dispatchSizeX && m_dispatchSizeY == dispatchSizeY)
-    {
-        assert(m_lightCullInfoBuf.m_pBuffer && m_specularProbeAtlas.texArray);
-        return;
-    }
-    else
-    {
-        DestroyResources(false);
-    }
-
-    m_dispatchSizeX = dispatchSizeX;
-    m_dispatchSizeY = dispatchSizeY;
-
-    if (!m_lightCullInfoBuf.m_pBuffer)
-    {
-        m_lightCullInfoBuf.Create(MaxNumTileLights, sizeof(STiledLightCullInfo), DXGI_FORMAT_UNKNOWN, DX11BUF_DYNAMIC | DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, NULL);
-    }
-
-    if (!m_LightShadeInfoBuf.m_pBuffer)
-    {
-        m_LightShadeInfoBuf.Create(MaxNumTileLights, sizeof(STiledLightShadeInfo), DXGI_FORMAT_UNKNOWN, DX11BUF_DYNAMIC | DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, NULL);
-    }
-
-    if (!m_tileLightIndexBuf.m_pBuffer)
-    {
-        PREFAST_SUPPRESS_WARNING(6326)
-        DXGI_FORMAT format = MaxNumTileLights < 256 ? DXGI_FORMAT_R8_UINT : DXGI_FORMAT_R16_UINT;
-        PREFAST_SUPPRESS_WARNING(6326)
-        uint32 stride = MaxNumTileLights < 256 ? sizeof(char) : sizeof(short);
-
-        m_tileLightIndexBuf.Create(dispatchSizeX * dispatchSizeY * MaxNumTileLights, stride, format, DX11BUF_BIND_SRV | DX11BUF_BIND_UAV, NULL);
-    }
-
-    if (!m_clipVolumeInfoBuf.m_pBuffer)
-    {
-        m_clipVolumeInfoBuf.Create(MaxNumClipVolumes, sizeof(STiledClipVolumeInfo), DXGI_FORMAT_UNKNOWN, DX11BUF_DYNAMIC | DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, NULL);
-    }
-
-    if (!m_specularProbeAtlas.texArray)
-    {
-        ETEX_Format specProbeAtlasFormat = eTF_BC6UH;
-#if defined(AZ_PLATFORM_MAC)
-        specProbeAtlasFormat = eTF_R9G9B9E5;
-#endif
-        m_specularProbeAtlas.texArray = CTexture::CreateTextureArray("$TiledSpecProbeTexArr", eTT_Cube, SpecProbeSize, SpecProbeSize, AtlasArrayDim, IntegerLog2(SpecProbeSize) - 1, 0, specProbeAtlasFormat);
-        m_specularProbeAtlas.items.resize(AtlasArrayDim);
-
-        if (m_specularProbeAtlas.texArray->GetFlags() & FT_FAILED)
-        {
-            CryFatalError("Couldn't allocate specular probe texture atlas");
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTILEDSHADING_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(D3DTiledShading_cpp)
-#endif
-    }
-
-    if (!m_diffuseProbeAtlas.texArray)
-    {
-        ETEX_Format diffuseProbeAtlasFormat = eTF_BC6UH;
-#if defined(AZ_PLATFORM_MAC)
-        diffuseProbeAtlasFormat = eTF_R9G9B9E5;
-#endif
-        m_diffuseProbeAtlas.texArray = CTexture::CreateTextureArray("$TiledDiffuseProbeTexArr", eTT_Cube, DiffuseProbeSize, DiffuseProbeSize, AtlasArrayDim, 1, 0, diffuseProbeAtlasFormat);
-        m_diffuseProbeAtlas.items.resize(AtlasArrayDim);
-
-        if (m_diffuseProbeAtlas.texArray->GetFlags() & FT_FAILED)
-        {
-            CryFatalError("Couldn't allocate diffuse probe texture atlas");
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTILEDSHADING_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(D3DTiledShading_cpp)
-#endif
-    }
-
-    if (!m_spotTexAtlas.texArray)
-    {
-        // Note: BC4 has 4x4 as lowest mipmap
-        m_spotTexAtlas.texArray = CTexture::CreateTextureArray("$TiledSpotTexArr", eTT_2D, SpotTexSize, SpotTexSize, AtlasArrayDim, IntegerLog2(SpotTexSize) - 1, 0, eTF_BC4U);
-        m_spotTexAtlas.items.resize(AtlasArrayDim);
-
-        if (m_spotTexAtlas.texArray->GetFlags() & FT_FAILED)
-        {
-            CryFatalError("Couldn't allocate spot texture atlas");
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION D3DTILEDSHADING_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(D3DTiledShading_cpp)
-#endif
-    }
-
-    STexState ts1(FILTER_LINEAR, true);
-    ts1.SetComparisonFilter(true);
-    m_nTexStateCompare = CTexture::GetTexState(ts1);
-}
-
-
-void CTiledShading::DestroyResources(bool destroyResolutionIndependentResources)
-{
-    m_dispatchSizeX = 0;
-    m_dispatchSizeY = 0;
-
-    m_lightCullInfoBuf.Release();
-    m_LightShadeInfoBuf.Release();
-    m_tileLightIndexBuf.Release();
-    m_clipVolumeInfoBuf.Release();
-
-    if (destroyResolutionIndependentResources)
-    {
-        m_specularProbeAtlas.items.clear();
-        m_diffuseProbeAtlas.items.clear();
-        m_spotTexAtlas.items.clear();
-
-        SAFE_RELEASE_FORCE(m_specularProbeAtlas.texArray);
-        SAFE_RELEASE_FORCE(m_diffuseProbeAtlas.texArray);
-        SAFE_RELEASE_FORCE(m_spotTexAtlas.texArray);
-    }
-}
-
-
-void CTiledShading::Clear()
-{
-    for (uint32 i = 0, si = m_specularProbeAtlas.items.size(); i < si; ++i)
-    {
-        m_specularProbeAtlas.items[i] = AtlasItem();
-    }
-    for (uint32 i = 0, si = m_diffuseProbeAtlas.items.size(); i < si; ++i)
-    {
-        m_diffuseProbeAtlas.items[i] = AtlasItem();
-    }
-    for (uint32 i = 0, si = m_spotTexAtlas.items.size(); i < si; ++i)
-    {
-        m_spotTexAtlas.items[i] = AtlasItem();
-    }
-
-    m_numAtlasUpdates = 0;
-    m_numSkippedLights = 0;
-}
-
-
-int CTiledShading::InsertTexture(CTexture* texture, TextureAtlas& atlas, int arrayIndex)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    const int frameID = rd->GetFrameID(false);
-
-    if (texture == NULL)
-    {
-        return -1;
-    }
-
-    // Make sure the texture is loaded already
-    if (texture->GetWidthNonVirtual() == 0 && texture->GetHeightNonVirtual() == 0)
-    {
-        return -1;
-    }
-
-    bool isEditor = gEnv->IsEditor();
-
-    // Check if texture is already in atlas
-    for (uint32 i = 0, si = atlas.items.size(); i < si; ++i)
-    {
-        if (atlas.items[i].texture == texture)
-        {
-            bool textureUpToDate = !isEditor ? true : (texture->GetUpdateFrameID() == abs(atlas.items[i].updateFrameID) || texture->GetUpdateFrameID() == 0);
-
-            if (textureUpToDate)
-            {
-                if (atlas.items[i].invalid)
-                {
-                    // Texture was processed before and is invalid
-                    return -1;
-                }
-                else
-                {
-                    atlas.items[i].accessFrameID = frameID;
-                    return (int)i;
-                }
-            }
-        }
-    }
-
-    // Find least recently used entry in atlas
-    if (arrayIndex < 0)
-    {
-        uint32 minIndex = 0, minValue = 0xFFFFFFFF;
-        for (int i = 0, si = atlas.items.size(); i < si; ++i)
-        {
-            uint32 accessFrameID = atlas.items[i].accessFrameID;
-            if (accessFrameID < minValue)
-            {
-                minValue = accessFrameID;
-                minIndex = i;
-            }
-        }
-
-        arrayIndex = minIndex;
-    }
-
-    atlas.items[arrayIndex].texture = texture;
-    atlas.items[arrayIndex].accessFrameID = frameID;
-    atlas.items[arrayIndex].updateFrameID = texture->GetUpdateFrameID();
-    atlas.items[arrayIndex].invalid = false;
-
-    if (texture->GetIsTextureMissing())
-    {
-        //if Texture is missing than do not do error checking
-        return -1;
-    }
-
-    // Check if texture is valid
-    if (!texture->IsLoaded() ||
-        texture->GetWidthNonVirtual() < atlas.texArray->GetWidthNonVirtual() ||
-        texture->GetWidthNonVirtual() != texture->GetHeightNonVirtual() ||
-        texture->GetPixelFormat() != atlas.texArray->GetPixelFormat() ||
-        (texture->IsStreamed() && texture->IsPartiallyLoaded()))
-    {
-        atlas.items[arrayIndex].invalid = true;
-
-        if (!texture->IsLoaded())
-        {
-            iLog->LogError("TiledShading: Texture not found: %s", texture->GetName());
-        }
-        else if (texture->IsStreamed() && texture->IsPartiallyLoaded())
-        {
-            iLog->LogError("TiledShading: Texture not fully streamed so impossible to add: %s (W:%i H:%i F:%s)",
-                texture->GetName(), texture->GetWidth(), texture->GetHeight(), texture->GetFormatName());
-        }
-        else if (texture->GetPixelFormat() != atlas.texArray->GetPixelFormat())
-        {
-            iLog->LogError("TiledShading: Unsupported texture format: %s (W:%i H:%i F:%s), it has to be equal to the tile-atlas (F:%s), please change the texture's preset by re-exporting with CryTif",
-                texture->GetName(), texture->GetWidth(), texture->GetHeight(), texture->GetFormatName(), atlas.texArray->GetFormatName());
-        }
-        else
-        {
-            iLog->LogError("TiledShading: Unsupported texture properties: %s (W:%i H:%i F:%s)",
-                texture->GetName(), texture->GetWidth(), texture->GetHeight(), texture->GetFormatName());
-        }
-        return -1;
-    }
-
-    // Update atlas
-    uint32 numSrcMips = (uint32)texture->GetNumMipsNonVirtual();
-    uint32 numDstMips = (uint32)atlas.texArray->GetNumMipsNonVirtual();
-    uint32 firstSrcMip = IntegerLog2((uint32)texture->GetWidthNonVirtual() / atlas.texArray->GetWidthNonVirtual());
-    uint32 numFaces = atlas.texArray->GetTexType() == eTT_Cube ? 6 : 1;
-
-    CDeviceTexture* pTexArrayDevTex = atlas.texArray->GetDevTexture();
-
-    //ASSERT_DEVICE_TEXTURE_IS_FIXED(pTexArrayDevTex);
-
-    for (uint32 i = 0; i < numDstMips; ++i)
-    {
-        for (uint32 j = 0; j < numFaces; ++j)
-        {
-            rd->GetDeviceContext().CopySubresourceRegion(
-                pTexArrayDevTex->GetBaseTexture(), D3D11CalcSubresource(i, arrayIndex * numFaces + j, numDstMips), 0, 0, 0,
-                texture->GetDevTexture()->GetBaseTexture(), D3D11CalcSubresource(i + firstSrcMip, j, numSrcMips), NULL);
-        }
-    }
-
-    ++m_numAtlasUpdates;
-
-    return arrayIndex;
-}
-
-
-AABB RotateAABB(const AABB& aabb, const Matrix33& mat)
-{
-    Matrix33 matAbs;
-    matAbs.m00 = fabs_tpl(mat.m00);
-    matAbs.m01 = fabs_tpl(mat.m01);
-    matAbs.m02 = fabs_tpl(mat.m02);
-    matAbs.m10 = fabs_tpl(mat.m10);
-    matAbs.m11 = fabs_tpl(mat.m11);
-    matAbs.m12 = fabs_tpl(mat.m12);
-    matAbs.m20 = fabs_tpl(mat.m20);
-    matAbs.m21 = fabs_tpl(mat.m21);
-    matAbs.m22 = fabs_tpl(mat.m22);
-
-    Vec3 sz  = ((aabb.max - aabb.min) * 0.5f) * matAbs;
-    Vec3 pos = ((aabb.max + aabb.min) * 0.5f) * mat;
-
-    return AABB(pos - sz, pos + sz);
-}
-
-void CTiledShading::PrepareEnvironmentProbes(bool& shouldAdd, SRenderLight& renderLight, STiledLightCullInfo& lightCullInfo, STiledLightShadeInfo& lightShadeInfo, Matrix44A& matView, const float invCameraFar, const Vec4& posVS)
-{
-    lightCullInfo.volumeType = tlVolumeOBB;
-    lightShadeInfo.lightType = tlTypeProbe;
-    lightShadeInfo.resIndex = 0xFFFFFFFF;
-
-    const float uniformAttenuation = renderLight.m_fProbeAttenuation;
-    const float edgeFalloffSmoothness = max(renderLight.GetFalloffMax(), 0.001f);
-    lightShadeInfo.attenuationParams = Vec2(uniformAttenuation, edgeFalloffSmoothness);
-
-    AABB aabb = RotateAABB(AABB(-renderLight.m_ProbeExtents, renderLight.m_ProbeExtents), Matrix33(renderLight.m_ObjMatrix));
-    aabb = RotateAABB(aabb, Matrix33(matView));
-    lightCullInfo.depthBounds = Vec2(posVS.z + aabb.min.z, posVS.z + aabb.max.z) * invCameraFar;
-
-    const Vec4 u0 = Vec4(renderLight.m_ObjMatrix.GetColumn0().GetNormalized(), 0) * matView;
-    const Vec4 u1 = Vec4(renderLight.m_ObjMatrix.GetColumn1().GetNormalized(), 0) * matView;
-    const Vec4 u2 = Vec4(renderLight.m_ObjMatrix.GetColumn2().GetNormalized(), 0) * matView;
-    lightCullInfo.volumeParams0 = Vec4(u0.x, u0.y, u0.z, renderLight.m_ProbeExtents.x);
-    lightCullInfo.volumeParams1 = Vec4(u1.x, u1.y, u1.z, renderLight.m_ProbeExtents.y);
-    lightCullInfo.volumeParams2 = Vec4(u2.x, u2.y, u2.z, renderLight.m_ProbeExtents.z);
-
-    lightShadeInfo.projectorMatrix.SetRow4(0, Vec4(renderLight.m_ObjMatrix.GetColumn0().GetNormalized() / renderLight.m_ProbeExtents.x, 0));
-    lightShadeInfo.projectorMatrix.SetRow4(1, Vec4(renderLight.m_ObjMatrix.GetColumn1().GetNormalized() / renderLight.m_ProbeExtents.y, 0));
-    lightShadeInfo.projectorMatrix.SetRow4(2, Vec4(renderLight.m_ObjMatrix.GetColumn2().GetNormalized() / renderLight.m_ProbeExtents.z, 0));
-
-    Vec3 boxProxyMin(-1000000, -1000000, -1000000);
-    Vec3 boxProxyMax(1000000, 1000000, 1000000);
-
-    if (renderLight.m_Flags & DLF_BOX_PROJECTED_CM)
-    {
-        boxProxyMin = Vec3(-renderLight.m_fBoxLength * 0.5f, -renderLight.m_fBoxWidth * 0.5f, -renderLight.m_fBoxHeight * 0.5f);
-        boxProxyMax = Vec3(renderLight.m_fBoxLength * 0.5f, renderLight.m_fBoxWidth * 0.5f, renderLight.m_fBoxHeight * 0.5f);
-    }
-
-    lightShadeInfo.shadowMatrix.SetRow4(0, Vec4(boxProxyMin, 0));
-    lightShadeInfo.shadowMatrix.SetRow4(1, Vec4(boxProxyMax, 0));
-
-    const int arrayIndex = InsertTexture((CTexture*)renderLight.GetSpecularCubemap(), m_specularProbeAtlas, -1);
-    if (arrayIndex >= 0)
-    {
-        if (InsertTexture((CTexture*)renderLight.GetDiffuseCubemap(), m_diffuseProbeAtlas, arrayIndex) >= 0)
-        {
-            lightShadeInfo.resIndex = arrayIndex;
-        }
-        else
-        {
-            shouldAdd = false;  // Skip light
-        }
-    }
-    else
-    {
-        shouldAdd = false;  // Skip light
-    }
-}
-
-void CTiledShading::PrepareRegularAndAmbientLights(bool& shouldAdd, SRenderLight& renderLight, STiledLightCullInfo& lightCullInfo, STiledLightShadeInfo& lightShadeInfo, Matrix44A& matView, const float invCameraFar, const Vec4& posVS,
-    const bool ambientLight, CD3D9Renderer* const __restrict rd, const bool areaLightRect, const uint32 lightIdx, const uint32 firstShadowLight, const uint32 curShadowPoolLight, const int nThreadID, const int nRecurseLevel, uint32& numTileLights)
-{
-    const float sqrt_2 = 1.414214f;  // Scale for cone so that it's base encloses a pyramid base
-
-    lightCullInfo.volumeType = tlVolumeSphere;
-    lightShadeInfo.lightType = ambientLight ? tlTypeAmbientPoint : tlTypeRegularPoint;
-
-    if (!ambientLight)
-    {
-        lightShadeInfo.attenuationParams.x = max(lightShadeInfo.attenuationParams.x, 0.001f);
-
-        // Adjust light intensity so that the intended brightness is reached 1 meter from the light's surface
-        // Solve I * 1 / (1 + d/lightsize)^2 = 1
-        float intensityMul = 1.0f + 1.0f / lightShadeInfo.attenuationParams.x;
-        intensityMul *= intensityMul;
-        lightShadeInfo.color.x *= intensityMul;
-        lightShadeInfo.color.y *= intensityMul;
-        lightShadeInfo.color.z *= intensityMul;
-    }
-
-    // Handle projectors
-    if (renderLight.m_Flags & DLF_PROJECT)
-    {
-        lightCullInfo.volumeType = tlVolumeCone;
-        lightShadeInfo.lightType = ambientLight ? tlTypeAmbientProjector : tlTypeRegularProjector;
-        lightShadeInfo.resIndex = 0xFFFFFFFF;
-
-        int arrayIndex = InsertTexture((CTexture*)renderLight.m_pLightImage, m_spotTexAtlas, -1);
-        if (arrayIndex >= 0)
-        {
-            lightShadeInfo.resIndex = (uint32)arrayIndex;
-        }
-        else
-        {
-            shouldAdd = false;  // Skip light
-            return;
-        }
-        // Prevent culling errors for frustums with large FOVs by slightly enlarging the frustum
-        const float frustumAngleDelta = renderLight.m_fLightFrustumAngle > 50 ? 7.5f : 0.0f;
-
-        Matrix34 objMat = renderLight.m_ObjMatrix;
-        objMat.m03 = objMat.m13 = objMat.m23 = 0;  // Remove translation
-        const Vec3 lightDir = objMat * Vec3(-1, 0, 0);
-        lightCullInfo.volumeParams0 = Vec4(lightDir.x, lightDir.y, lightDir.z, 0) * matView;
-        lightCullInfo.volumeParams0.w = renderLight.m_fRadius * tanf(DEG2RAD(min(renderLight.m_fLightFrustumAngle + frustumAngleDelta, 89.9f))) * sqrt_2;
-
-        const Vec3 coneTip = Vec3(lightCullInfo.posRad.x, lightCullInfo.posRad.y, lightCullInfo.posRad.z);
-        const Vec3 coneDir = Vec3(-lightCullInfo.volumeParams0.x, -lightCullInfo.volumeParams0.y, -lightCullInfo.volumeParams0.z);
-        const AABB coneBounds = AABB::CreateAABBfromCone(Cone(coneTip, coneDir, renderLight.m_fRadius, lightCullInfo.volumeParams0.w));
-        lightCullInfo.depthBounds = Vec2(coneBounds.min.z, coneBounds.max.z) * invCameraFar;
-
-        lightShadeInfo.dirCosAngle = Vec4(lightDir.GetNormalized(), cosf(DEG2RAD(min(renderLight.m_fLightFrustumAngle + frustumAngleDelta, 89.9f))));
-
-        Matrix44A projMatT;
-        CShadowUtils::GetProjectiveTexGen(&renderLight, 0, &projMatT);
-
-        // Translate into camera space
-        projMatT.Transpose();
-        const Vec4 vEye(rd->GetViewParameters().vOrigin, 0.0f);
-        const Vec4 vecTranslation(vEye.Dot((Vec4&)projMatT.m00), vEye.Dot((Vec4&)projMatT.m10), vEye.Dot((Vec4&)projMatT.m20), vEye.Dot((Vec4&)projMatT.m30));
-        projMatT.m03 += vecTranslation.x;
-        projMatT.m13 += vecTranslation.y;
-        projMatT.m23 += vecTranslation.z;
-        projMatT.m33 += vecTranslation.w;
-
-        lightShadeInfo.projectorMatrix = projMatT;
-    }
-
-    // Handle rectangular area lights
-    if (areaLightRect)
-    {
-        lightCullInfo.volumeType = tlVolumeOBB;
-        lightShadeInfo.lightType = ambientLight ? tlTypeAmbientArea : tlTypeRegularArea;
-
-        const float expensionRadius = renderLight.m_fRadius * 1.08f;
-        const Matrix34 areaLightMat = CShadowUtils::GetAreaLightMatrix(&renderLight, Vec3(expensionRadius, expensionRadius, expensionRadius));
-
-        const Vec4 u0 = Vec4(areaLightMat.GetColumn0().GetNormalized(), 0) * matView;
-        const Vec4 u1 = Vec4(areaLightMat.GetColumn1().GetNormalized(), 0) * matView;
-        const Vec4 u2 = Vec4(areaLightMat.GetColumn2().GetNormalized(), 0) * matView;
-        lightCullInfo.volumeParams0 = Vec4(u0.x, u0.y, u0.z, areaLightMat.GetColumn0().GetLength() * 0.5f);
-        lightCullInfo.volumeParams1 = Vec4(u1.x, u1.y, u1.z, areaLightMat.GetColumn1().GetLength() * 0.5f);
-        lightCullInfo.volumeParams2 = Vec4(u2.x, u2.y, u2.z, areaLightMat.GetColumn2().GetLength() * 0.5f);
-
-        const float volumeExtent = renderLight.m_fRadius + max(renderLight.m_fAreaWidth, renderLight.m_fAreaHeight);
-        lightCullInfo.depthBounds = Vec2(posVS.z - volumeExtent, posVS.z + volumeExtent) * invCameraFar;
-
-        float areaFov = renderLight.m_fLightFrustumAngle * 2.0f;
-        if (renderLight.m_Flags & DLF_CASTSHADOW_MAPS)
-        {
-            areaFov = min(areaFov, 135.0f); // Shadow can only cover ~135 degree FOV without looking bad, so we clamp the FOV to hide shadow clipping
-        }
-        const float cosAngle = cosf(areaFov * (gf_PI / 360.0f));
-
-        Matrix44 areaLightParams;
-        areaLightParams.SetRow4(0, Vec4(renderLight.m_ObjMatrix.GetColumn0().GetNormalized(), 1.0f));
-        areaLightParams.SetRow4(1, Vec4(renderLight.m_ObjMatrix.GetColumn1().GetNormalized(), 1.0f));
-        areaLightParams.SetRow4(2, Vec4(renderLight.m_ObjMatrix.GetColumn2().GetNormalized(), 1.0f));
-        areaLightParams.SetRow4(3, Vec4(renderLight.m_fAreaWidth * 0.5f, renderLight.m_fAreaHeight * 0.5f, 0, cosAngle));
-
-        lightShadeInfo.projectorMatrix = areaLightParams;
-    }
-
-    // Handle shadow casters
-    if (!ambientLight && lightIdx >= firstShadowLight && lightIdx < curShadowPoolLight)
-    {
-        const int numDLights = rd->m_RP.m_DLights[nThreadID][nRecurseLevel].size();
-        const int frustumIdx = renderLight.m_lightId + numDLights;
-        const int startIdx = SRendItem::m_StartFrust[nThreadID][frustumIdx];
-        const int endIdx = SRendItem::m_EndFrust[nThreadID][frustumIdx];
-
-        if (endIdx > startIdx && nRecurseLevel < (int)rd->m_RP.m_SMFrustums[nThreadID]->size())
-        {
-            ShadowMapFrustum& firstFrustum = rd->m_RP.m_SMFrustums[nThreadID][nRecurseLevel][startIdx];
-            assert(firstFrustum.bUseShadowsPool);
-
-            const int numSides = firstFrustum.bOmniDirectionalShadow ? 6 : 1;
-            const float kernelSize = firstFrustum.bOmniDirectionalShadow ? 2.5f : 1.5f;
-
-            if (numTileLights + numSides > MaxNumTileLights)
-            {
-                shouldAdd = false;  // Skip light
-                return;
-            }
-            static ICVar* pShadowAtlasResCVar = iConsole->GetCVar("e_ShadowsPoolSize");
-            const Vec2 shadowParams = Vec2(kernelSize * ((float)firstFrustum.nTexSize / (float)pShadowAtlasResCVar->GetIVal()), firstFrustum.fDepthConstBias);
-
-            static const Vec3 cubeDirs[6] = { Vec3(-1, 0, 0), Vec3(1, 0, 0), Vec3(0, -1, 0), Vec3(0, 1, 0), Vec3(0, 0, -1), Vec3(0, 0, 1) };
-
-            for (int side = 0; side < numSides; ++side)
-            {
-                rd->ConfigShadowTexgen(0, &firstFrustum, side);
-                Matrix44A shadowMat = rd->m_TempMatrices[0][0];
-
-                // Translate into camera space
-                const Vec4 vEye(rd->GetViewParameters().vOrigin, 0.0f);
-                const Vec4 vecTranslation(vEye.Dot((Vec4&)shadowMat.m00), vEye.Dot((Vec4&)shadowMat.m10), vEye.Dot((Vec4&)shadowMat.m20), vEye.Dot((Vec4&)shadowMat.m30));
-                shadowMat.m03 += vecTranslation.x;
-                shadowMat.m13 += vecTranslation.y;
-                shadowMat.m23 += vecTranslation.z;
-                shadowMat.m33 += vecTranslation.w;
-
-                // Pre-multiply by inverse frustum far plane distance
-                (Vec4&)shadowMat.m20 *= rd->m_cEF.m_TempVecs[2].x;
-
-                Vec4 spotParamsVS = Vec4(cubeDirs[side].x, cubeDirs[side].y, cubeDirs[side].z, 0) * matView;
-
-                // slightly enlarge the frustum to prevent culling errors
-                spotParamsVS.w = renderLight.m_fRadius * tanf(DEG2RAD(45.0f + 14.5f)) * sqrt_2;
-
-                const Vec3 coneTip(lightCullInfo.posRad.x, lightCullInfo.posRad.y, lightCullInfo.posRad.z);
-                const Vec3 coneDir(-spotParamsVS.x, -spotParamsVS.y, -spotParamsVS.z);
-                const AABB coneBounds = AABB::CreateAABBfromCone(Cone(coneTip, coneDir, renderLight.m_fRadius, spotParamsVS.w));
-                const Vec2 depthBoundsVS = Vec2(coneBounds.min.z, coneBounds.max.z) * invCameraFar;
-                const Vec2 sideShadowParams = (firstFrustum.nShadowGenMask & (1 << side)) ? shadowParams : Vec2(ZERO);
-
-                if (side == 0)
-                {
-                    lightShadeInfo.shadowParams = sideShadowParams;
-                    lightShadeInfo.shadowMatrix = shadowMat;
-                    lightShadeInfo.shadowChannelIndex = Vec4(
-                        renderLight.m_ShadowChanMask % 4 == 0,
-                        renderLight.m_ShadowChanMask % 4 == 1,
-                        renderLight.m_ShadowChanMask % 4 == 2,
-                        renderLight.m_ShadowChanMask % 4 == 3
-                    );
-                    lightShadeInfo.shadowMaskIndex = renderLight.m_ShadowMaskIndex;
-
-                    if (numSides > 1)
-                    {
-                        lightCullInfo.volumeType = tlVolumeCone;
-                        lightShadeInfo.lightType = tlTypeRegularPointFace;
-                        lightShadeInfo.resIndex = side;
-                        lightCullInfo.volumeParams0 = spotParamsVS;
-                        lightCullInfo.depthBounds = depthBoundsVS;
-                    }
-                }
-                else
-                {
-                    // Split point light
-                    ++numTileLights;
-                    g_tileLightsCull[numTileLights] = lightCullInfo;
-                    g_tileLightsShade[numTileLights] = lightShadeInfo;
-                    g_tileLightsShade[numTileLights].shadowParams = sideShadowParams;
-                    g_tileLightsShade[numTileLights].shadowMatrix = shadowMat;
-                    g_tileLightsShade[numTileLights].resIndex = side;
-                    g_tileLightsCull[numTileLights].volumeParams0 = spotParamsVS;
-                    g_tileLightsCull[numTileLights].depthBounds = depthBoundsVS;
-                }
-            }
-        }
-    }
-}
-
-void CTiledShading::PrepareLightList(TArray<SRenderLight>& envProbes, TArray<SRenderLight>& ambientLights, TArray<SRenderLight>& defLights)
-{
-    AZ_TRACE_METHOD();
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    const float invCameraFar = 1.0f / rd->GetViewParameters().fFar;
-
-    // Prepare view matrix with flipped z-axis
-    Matrix44A matView = rd->m_ViewMatrix;
-    matView.m02 *= -1;
-    matView.m12 *= -1;
-    matView.m22 *= -1;
-    matView.m32 *= -1;
-
-    const int nThreadID = rd->m_RP.m_nProcessThreadID;
-    const int nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-    const uint32 firstShadowLight = CDeferredShading::Instance().m_nFirstCandidateShadowPoolLight;
-    const uint32 curShadowPoolLight = CDeferredShading::Instance().m_nCurrentShadowPoolLight;
-
-    uint32 numTileLights = 0;
-    uint32 numRenderLights = 0;
-    uint32 numValidRenderLights = 0;
-
-    // Reset lights
-    ZeroMemory(g_tileLightsCull, sizeof(STiledLightCullInfo) * MaxNumTileLights);
-    ZeroMemory(g_tileLightsShade, sizeof(STiledLightShadeInfo) * MaxNumTileLights);
-
-    TArray<SRenderLight>* lightLists[3] = {
-        CRenderer::CV_r_DeferredShadingEnvProbes ? &envProbes : NULL,
-        CRenderer::CV_r_DeferredShadingAmbientLights ? &ambientLights : NULL,
-        CRenderer::CV_r_DeferredShadingLights ? &defLights : NULL
-    };
-
-    for (uint32 lightListIdx = 0; lightListIdx < 3; ++lightListIdx)
-    {
-        if (lightLists[lightListIdx] == NULL)
-        {
-            continue;
-        }
-
-        for (uint32 lightIdx = 0, lightListSize = lightLists[lightListIdx]->size(); lightIdx < lightListSize; ++lightIdx)
-        {
-            SRenderLight& renderLight = (*lightLists[lightListIdx])[lightIdx];
-            STiledLightCullInfo& lightCullInfo = g_tileLightsCull[numTileLights];
-            STiledLightShadeInfo& lightShadeInfo = g_tileLightsShade[numTileLights];
-
-            if (renderLight.m_Flags & (DLF_FAKE | DLF_VOLUMETRIC_FOG_ONLY))
-            {
-                continue;
-            }
-
-            // Skip non-ambient area light if support is disabled
-            if ((renderLight.m_Flags & DLF_AREA_LIGHT) && !(renderLight.m_Flags & DLF_AMBIENT) && !CRenderer::CV_r_DeferredShadingAreaLights)
-            {
-                continue;
-            }
-
-            ++numRenderLights;
-
-            if (numTileLights == MaxNumTileLights)
-            {
-                continue;  // Skip light
-            }
-            // Setup standard parameters
-            const bool areaLightRect = (renderLight.m_Flags & DLF_AREA_LIGHT) && renderLight.m_fAreaWidth && renderLight.m_fAreaHeight && renderLight.m_fLightFrustumAngle;
-            const float volumeSize = (lightListIdx == 0) ? renderLight.m_ProbeExtents.len() : renderLight.m_fRadius;
-            const Vec3 pos = renderLight.GetPosition();
-            const Vec3 worldViewPos = rd->GetViewParameters().vOrigin;
-            lightShadeInfo.posRad = Vec4(pos.x - worldViewPos.x, pos.y - worldViewPos.y, pos.z - worldViewPos.z, volumeSize);
-            const Vec4 posVS = Vec4(pos, 1) * matView;
-            lightCullInfo.posRad = Vec4(posVS.x, posVS.y, posVS.z, volumeSize);
-            lightShadeInfo.attenuationParams = Vec2(areaLightRect ? (renderLight.m_fAreaWidth + renderLight.m_fAreaHeight) * 0.25f : renderLight.m_fAttenuationBulbSize, renderLight.m_fAreaHeight * 0.5f);
-            lightCullInfo.depthBounds = Vec2(posVS.z - volumeSize, posVS.z + volumeSize) * invCameraFar;
-            lightShadeInfo.color = Vec4(
-                renderLight.m_Color.r,
-                renderLight.m_Color.g,
-                renderLight.m_Color.b,
-                renderLight.m_SpecMult);
-            lightShadeInfo.resIndex = 0;
-            lightShadeInfo.shadowParams = Vec2(0, 0);
-            lightShadeInfo.stencilID0 = renderLight.m_nStencilRef[0] + 1;
-            lightShadeInfo.stencilID1 = renderLight.m_nStencilRef[1] + 1;
-
-            bool shouldAdd = true;
-
-            // Environment probes
-            if (lightListIdx == 0)
-            {
-                PrepareEnvironmentProbes(shouldAdd, renderLight, lightCullInfo, lightShadeInfo, matView, invCameraFar, posVS);
-            }
-            // Regular and ambient lights
-            else
-            {
-                const bool ambientLight = (lightListIdx == 1);
-                PrepareRegularAndAmbientLights(shouldAdd, renderLight, lightCullInfo, lightShadeInfo, matView, invCameraFar, posVS,
-                    ambientLight, rd, areaLightRect, lightIdx, firstShadowLight, curShadowPoolLight, nThreadID, nRecurseLevel, numTileLights);
-            }
-
-            if (shouldAdd)
-            {
-                // Add current light
-                ++numTileLights;
-                ++numValidRenderLights;
-            }
-        }
-    }
-
-    // Invalidate last light in case it got skipped
-    if (numTileLights < MaxNumTileLights)
-    {
-        ZeroMemory(&g_tileLightsCull[numTileLights], sizeof(STiledLightCullInfo));
-        ZeroMemory(&g_tileLightsShade[numTileLights], sizeof(STiledLightShadeInfo));
-    }
-
-    m_numSkippedLights = numRenderLights - numValidRenderLights;
-
-    // Add sun
-    if (rd->m_RP.m_pSunLight)
-    {
-        if (numTileLights < MaxNumTileLights)
-        {
-            STiledLightCullInfo& lightCullInfo = g_tileLightsCull[numTileLights];
-            STiledLightShadeInfo& lightShadeInfo = g_tileLightsShade[numTileLights];
-
-            lightCullInfo.volumeType = tlVolumeSun;
-            lightCullInfo.depthBounds = Vec2(-100000, 100000);
-            lightCullInfo.posRad = Vec4(0, 0, 0, 100000);
-
-            lightShadeInfo.lightType = tlTypeSun;
-            lightShadeInfo.attenuationParams = Vec2(SunSourceDiameter, SunSourceDiameter);
-            lightShadeInfo.shadowParams = Vec2(1, 0);
-            lightShadeInfo.shadowMaskIndex = 0;
-            lightShadeInfo.shadowChannelIndex = Vec4(1, 0, 0, 0);
-            lightShadeInfo.stencilID0 = lightShadeInfo.stencilID1 = 0;
-
-            Vec3 sunColor;
-            gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SUN_COLOR, sunColor);
-            lightShadeInfo.color = Vec4(sunColor.x, sunColor.y, sunColor.z, gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SUN_SPECULAR_MULTIPLIER));
-
-            ++numTileLights;
-        }
-        else
-        {
-            m_numSkippedLights += 1;
-        }
-    }
-
-#ifndef _RELEASE
-    rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumTiledShadingSkippedLights = m_numSkippedLights;
-#endif
-
-    // Update light buffer
-    m_lightCullInfoBuf.UpdateBufferContent(g_tileLightsCull, sizeof(STiledLightCullInfo) * MaxNumTileLights);
-    m_LightShadeInfoBuf.UpdateBufferContent(g_tileLightsShade, sizeof(STiledLightShadeInfo) * MaxNumTileLights);
-
-
-    rd->GetVolumetricFog().PrepareLightList(lightLists[0], lightLists[1], lightLists[2], firstShadowLight, curShadowPoolLight);
-}
-
-void CTiledShading::PrepareShadowCastersList(TArray<SRenderLight>& defLights)
-{
-    uint32 firstShadowLight = CDeferredShading::Instance().m_nFirstCandidateShadowPoolLight;
-    uint32 curShadowPoolLight = CDeferredShading::Instance().m_nCurrentShadowPoolLight;
-
-    m_arrShadowCastingLights.SetUse(0);
-
-    for (int lightIdx = firstShadowLight; lightIdx < curShadowPoolLight; ++lightIdx)
-    {
-        const SRenderLight& light = defLights[lightIdx];
-        if (light.m_Flags & DLF_CASTSHADOW_MAPS)
-        {
-            m_arrShadowCastingLights.Add(light.m_lightId);
-        }
-    }
-}
-
-void CTiledShading::PrepareClipVolumeList(Vec4* clipVolumeParams)
-{
-    STiledClipVolumeInfo clipVolumeInfo[MaxNumClipVolumes];
-    for (uint32 volumeIndex = 0; volumeIndex < MaxNumClipVolumes; ++volumeIndex)
-    {
-        clipVolumeInfo[volumeIndex].data = clipVolumeParams[volumeIndex].w;
-    }
-
-    m_clipVolumeInfoBuf.UpdateBufferContent(clipVolumeInfo, sizeof(STiledClipVolumeInfo) * MaxNumClipVolumes);
-}
-
-void CTiledShading::Render(TArray<SRenderLight>& envProbes, TArray<SRenderLight>& ambientLights, TArray<SRenderLight>& defLights, Vec4* clipVolumeParams)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (!CTexture::s_ptexHDRTarget)  // Sketch mode
-    {
-        return;
-    }
-
-    // Temporary hack until tiled shading has proper MSAA support
-    if (CRenderer::CV_r_DeferredShadingTiled == 2 && CRenderer::CV_r_msaa)
-    {
-        CRenderer::CV_r_DeferredShadingTiled = 1;
-    }
-
-    // Generate shadow mask. Note that in tiled forward only mode the shadow mask is generated in CDeferredShading::DeferredShadingPass()
-    if (CRenderer::CV_r_DeferredShadingTiled > 1)
-    {
-        PROFILE_LABEL_SCOPE("SHADOWMASK");
-
-        PrepareShadowCastersList(defLights);
-        rd->FX_DeferredShadowMaskGen(m_arrShadowCastingLights);
-
-        rd->FX_SetActiveRenderTargets(false);
-    }
-
-    PROFILE_LABEL_SCOPE("TILED_SHADING");
-
-    PrepareClipVolumeList(clipVolumeParams);
-
-    PrepareLightList(envProbes, ambientLights, defLights);
-
-    // Make sure HDR target is not bound as RT any more
-    rd->FX_PushRenderTarget(0, CTexture::s_ptexSceneSpecularAccMap, NULL);
-
-    uint64 nPrevRTFlags = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5] | g_HWSR_MaskBit[HWSR_DEBUG0] | g_HWSR_MaskBit[HWSR_APPLY_SSDO]);
-
-    if (CRenderer::CV_r_DeferredShadingTiled > 1)   // Tiled deferred
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-    if (CRenderer::CV_r_DeferredShadingTiled == 4)  // Light coverage visualization
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-    if (CRenderer::CV_r_ssdoColorBleeding)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-    if (CRenderer::CV_r_SSReflections)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE3];
-    }
-
-    bool isRenderingFur = FurPasses::GetInstance().IsRenderingFur();
-    if (CRenderer::CV_r_DeferredShadingSSS || isRenderingFur)
-    {
-        // Output diffuse accumulation if SSS is enabled or if there are render items using fur
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingAreaLights > 0)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-
-    if (CRenderer::CV_r_ApplyToonShading > 0)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_APPLY_TOON_SHADING];
-    }
-
-    if (CRenderer::CV_r_ssdo)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_APPLY_SSDO];
-    }
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_DeferredShadingLBuffersFmt == 2)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEFERRED_RENDER_TARGET_OPTIMIZATION];
-    }
-#if defined(FEATURE_SVO_GI)
-    rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_CUBEMAP0];
-    rd->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_DECAL_TEXGEN_2D];
-
-    if (CSvoRenderer::GetInstance()->IsActive())
-    {
-        int nModeGI = CSvoRenderer::GetInstance()->GetIntegratioMode();
-
-        if (nModeGI == 0 && gEnv->pConsole->GetCVar("e_svoTI_UseLightProbes")->GetIVal())
-        { // AO modulates diffuse and specular
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-        }
-        else if (nModeGI <= 1)
-        { // GI replaces diffuse and modulates specular
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DECAL_TEXGEN_2D];
-        }
-        else if (nModeGI == 2)
-        { // GI replaces diffuse and specular
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_CUBEMAP0];
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DECAL_TEXGEN_2D];
-        }
-    }
-#endif
-
-    // Selectively enables debug mode permutation if a debug parameter is non-zero.
-    bool bDebugEnabled = false;
-    Vec4 vDebugParams(
-        (float)rd->CV_r_DeferredShadingTiledDebugDirect,
-        (float)rd->CV_r_DeferredShadingTiledDebugIndirect,
-        (float)rd->CV_r_DeferredShadingTiledDebugAccumulation,
-        (float)rd->CV_r_DeferredShadingTiledDebugAlbedo);
-    if (vDebugParams.Dot(vDebugParams) > 0.0f) // Simple check to see if anything is enabled.
-    {
-        bDebugEnabled = true;
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG0];
-    }
-
-    static CCryNameTSCRC techTiledShading("TiledDeferredShading");
-
-    uint32 nScreenWidth = rd->GetWidth();
-    uint32 nScreenHeight = rd->GetHeight();
-    uint32 dispatchSizeX = nScreenWidth / LightTileSizeX + (nScreenWidth % LightTileSizeX > 0 ? 1 : 0);
-    uint32 dispatchSizeY = nScreenHeight / LightTileSizeY + (nScreenHeight % LightTileSizeY > 0 ? 1 : 0);
-
-    const bool shaderAvailable = SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, techTiledShading, FEF_DONTSETSTATES);
-    if (shaderAvailable)  // Temporary workaround for a shader cache issue
-    {
-        D3DShaderResourceView* pTiledBaseRes[8] = {
-            m_LightShadeInfoBuf.GetShaderResourceView(),
-            m_specularProbeAtlas.texArray->GetShaderResourceView(),
-            m_diffuseProbeAtlas.texArray->GetShaderResourceView(),
-            m_spotTexAtlas.texArray->GetShaderResourceView(),
-            CTexture::s_ptexRT_ShadowPool->GetShaderResourceView(),
-            CTextureManager::Instance()->GetDefaultTexture("ShadowJitterMap")->GetShaderResourceView(),
-            m_lightCullInfoBuf.GetShaderResourceView(),
-            m_clipVolumeInfoBuf.GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pTiledBaseRes, 16, 8);
-
-        CTexture* texClipVolumeIndex = CTexture::s_ptexVelocity;
-        CTexture* pTexCaustics = m_bApplyCaustics ? CTexture::s_ptexSceneTargetR11G11B10F[1] : CTextureManager::Instance()->GetBlackTexture();
-
-        CTexture* ptexGiDiff = CTextureManager::Instance()->GetBlackTexture();
-        CTexture* ptexGiSpec = CTextureManager::Instance()->GetBlackTexture();
-
-#if defined(FEATURE_SVO_GI)
-        if (CSvoRenderer::GetInstance()->IsActive() && CSvoRenderer::GetInstance()->GetSpecularFinRT())
-        {
-            ptexGiDiff = (CTexture*)CSvoRenderer::GetInstance()->GetDiffuseFinRT();
-            ptexGiSpec = (CTexture*)CSvoRenderer::GetInstance()->GetSpecularFinRT();
-        }
-#endif
-
-        CTexture* ptexDepth = CTexture::s_ptexZTarget;
-        if (isRenderingFur)
-        {
-            ptexDepth = CTexture::s_ptexFurZTarget;
-        }
-
-        D3DShaderResourceView* pDeferredShadingRes[13] = {
-            ptexDepth->GetShaderResourceView(),
-            CTexture::s_ptexSceneNormalsMap->GetShaderResourceView(),
-            CTexture::s_ptexSceneSpecular->GetShaderResourceView(),
-            CTexture::s_ptexSceneDiffuse->GetShaderResourceView(),
-            CTexture::s_ptexShadowMask->GetShaderResourceView(),
-            CTexture::s_ptexSceneNormalsBent->GetShaderResourceView(),
-            CTexture::s_ptexHDRTargetScaledTmp[0]->GetShaderResourceView(),
-            CTextureManager::Instance()->GetDefaultTexture("EnvironmentBRDF")->GetShaderResourceView(),
-            texClipVolumeIndex->GetShaderResourceView(),
-            CTexture::s_ptexAOColorBleed->GetShaderResourceView(),
-            ptexGiDiff->GetShaderResourceView(),
-            ptexGiSpec->GetShaderResourceView(),
-            pTexCaustics->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pDeferredShadingRes, 0, 13);
-
-        if (bDebugEnabled)
-        {
-            static CCryNameR paramDebug("LightingDebugParams");
-            CShaderMan::s_shDeferredShading->FXSetCSFloat(paramDebug, &vDebugParams, 1);
-        }
-
-        static CCryNameR paramProj("ProjParams");
-        Vec4 vParamProj(rd->m_ProjMatrix.m00, rd->m_ProjMatrix.m11, rd->m_ProjMatrix.m20, rd->m_ProjMatrix.m21);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramProj, &vParamProj, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        Vec3 worldViewPos = rd->GetViewParameters().vOrigin;
-        static CCryNameR paramWorldViewPos("WorldViewPos");
-        Vec4 vParamWorldViewPos(worldViewPos.x, worldViewPos.y, worldViewPos.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramWorldViewPos, &vParamWorldViewPos, 1);
-
-        SD3DPostEffectsUtils::UpdateFrustumCorners();
-        static CCryNameR paramFrustumTL("FrustumTL");
-        Vec4 vParamFrustumTL(SD3DPostEffectsUtils::m_vLT.x, SD3DPostEffectsUtils::m_vLT.y, SD3DPostEffectsUtils::m_vLT.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTL, &vParamFrustumTL, 1);
-        static CCryNameR paramFrustumTR("FrustumTR");
-        Vec4 vParamFrustumTR(SD3DPostEffectsUtils::m_vRT.x, SD3DPostEffectsUtils::m_vRT.y, SD3DPostEffectsUtils::m_vRT.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTR, &vParamFrustumTR, 1);
-        static CCryNameR paramFrustumBL("FrustumBL");
-        Vec4 vParamFrustumBL(SD3DPostEffectsUtils::m_vLB.x, SD3DPostEffectsUtils::m_vLB.y, SD3DPostEffectsUtils::m_vLB.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumBL, &vParamFrustumBL, 1);
-
-        Vec3 sunDir = gEnv->p3DEngine->GetSunDirNormalized();
-        static CCryNameR paramSunDir("SunDir");
-        Vec4 vParamSunDir(sunDir.x, sunDir.y, sunDir.z, SunDistance);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramSunDir, &vParamSunDir, 1);
-
-        Vec3 sunColor;
-        gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SUN_COLOR, sunColor);
-        static CCryNameR paramSunColor("SunColor");
-        Vec4 vParamSunColor(sunColor.x, sunColor.y, sunColor.z, gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SUN_SPECULAR_MULTIPLIER));
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramSunColor, &vParamSunColor, 1);
-
-        static CCryNameR paramSSDO("SSDOParams");
-        Vec4 vParamSSDO(CRenderer::CV_r_ssdoAmountDirect, CRenderer::CV_r_ssdoAmountAmbient, CRenderer::CV_r_ssdoAmountReflection, 0);
-
-#if defined(FEATURE_SVO_GI)
-        if (CSvoRenderer::GetInstance()->IsActive())
-        {
-            vParamSSDO *= CSvoRenderer::GetInstance()->GetSsaoAmount();
-        }
-#endif
-
-        Vec4 vParamSSDONull(0, 0, 0, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramSSDO, CRenderer::CV_r_ssdo ? &vParamSSDO : &vParamSSDONull, 1);
-
-        rd->FX_Commit();
-
-        ID3D11UnorderedAccessView* pUAV[3] = {
-            m_tileLightIndexBuf.GetUnorderedAccessView(),
-            CTexture::s_ptexHDRTarget->GetDeviceUAV(),
-            CTexture::s_ptexSceneTargetR11G11B10F[0]->GetDeviceUAV(),
-        };
-        rd->GetDeviceContext().CSSetUnorderedAccessViews(0, 3, pUAV, NULL);
-
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    ID3D11UnorderedAccessView* pUAVNull[3] = { NULL };
-    rd->GetDeviceContext().CSSetUnorderedAccessViews(0, 3, pUAVNull, NULL);
-
-    D3DShaderResourceView* pSRVNull[13] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 0, 13);
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 16, 8);
-
-    rd->FX_PopRenderTarget(0);
-
-    rd->m_RP.m_FlagsShader_RT = nPrevRTFlags;
-
-    // Output debug information
-    if (CRenderer::CV_r_DeferredShadingTiled == 3)
-    {
-        rd->Draw2dLabel(20, 60, 2.0f, Col_Blue, false, "Tiled Shading Debug");
-        rd->Draw2dLabel(20, 95, 1.7f, m_numSkippedLights > 0 ? Col_Red : Col_Blue, false, "Skipped Lights: %i", m_numSkippedLights);
-        rd->Draw2dLabel(20, 120, 1.7f, Col_Blue, false, "Atlas Updates: %i", m_numAtlasUpdates);
-    }
-
-    m_bApplyCaustics = false;  // Reset flag
-}
-
-void CTiledShading::BindForwardShadingResources(CShader*, EHWShaderClass shaderType)
-{
-    if (!CRenderer::CV_r_DeferredShadingTiled || !m_dispatchSizeX || !m_dispatchSizeY)
-    {
-        return;
-    }
-    AZ_TRACE_METHOD();
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    CTexture* ptexGiDiff = CTextureManager::Instance()->GetBlackTexture();
-    CTexture* ptexGiSpec = CTextureManager::Instance()->GetBlackTexture();
-    CTexture* ptexRsmCol = NULL;
-    CTexture* ptexRsmNor = NULL;
-
-#if defined(FEATURE_SVO_GI)
-    if (CSvoRenderer::GetInstance()->IsActive() && CSvoRenderer::GetInstance()->GetSpecularFinRT())
-    {
-        ptexGiDiff = (CTexture*)CSvoRenderer::GetInstance()->GetDiffuseFinRT();
-        ptexGiSpec = (CTexture*)CSvoRenderer::GetInstance()->GetSpecularFinRT();
-        ptexRsmCol = (CTexture*)CSvoRenderer::GetInstance()->GetRsmPoolCol();
-        ptexRsmNor = (CTexture*)CSvoRenderer::GetInstance()->GetRsmPoolNor();
-    }
-#endif
-
-    D3DShaderResourceView* pTiledBaseRes[12] = {
-        m_LightShadeInfoBuf.GetShaderResourceView(),
-        m_specularProbeAtlas.texArray->GetShaderResourceView(),
-        m_diffuseProbeAtlas.texArray->GetShaderResourceView(),
-        m_spotTexAtlas.texArray->GetShaderResourceView(),
-        CTexture::s_ptexRT_ShadowPool->GetShaderResourceView(),
-        CTextureManager::Instance()->GetDefaultTexture("ShadowJitterMap")->GetShaderResourceView(),
-        m_tileLightIndexBuf.GetShaderResourceView(),
-        m_clipVolumeInfoBuf.GetShaderResourceView(),
-        ptexGiDiff->GetShaderResourceView(),
-        ptexGiSpec->GetShaderResourceView(),
-        ptexRsmCol ? ptexRsmCol->GetShaderResourceView() : NULL,
-        ptexRsmNor ? ptexRsmNor->GetShaderResourceView() : NULL,
-    };
-
-    rd->m_DevMan.BindSRV(shaderType, pTiledBaseRes, 16, 12);
-
-    D3DSamplerState* pSamplers[1] = {
-        (D3DSamplerState*)CTexture::s_TexStates[m_nTexStateCompare].m_pDeviceState,
-    };
-    rd->m_DevMan.BindSampler(shaderType, pSamplers, 14, 1);
-}
-
-
-void CTiledShading::UnbindForwardShadingResources(EHWShaderClass shaderType)
-{
-    if (!CRenderer::CV_r_DeferredShadingTiled)
-    {
-        return;
-    }
-    AZ_TRACE_METHOD();
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    D3DShaderResourceView* pNullViews[12] = { NULL };
-    rd->m_DevMan.BindSRV(shaderType, pNullViews, 16, 12);
-
-    D3DSamplerState* pNullSamplers[1] = { NULL };
-    rd->m_DevMan.BindSampler(shaderType, pNullSamplers, 14, 1);
-}
-
-struct STiledLightShadeInfo* CTiledShading::GetTiledLightShadeInfo()
-{
-    return &g_tileLightsShade[0];
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTiledShading.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DTiledShading.h
deleted file mode 100644
index 03b6f3be03..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DTiledShading.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef _D3DTILEDSHADING_H_
-#define _D3DTILEDSHADING_H_
-
-struct STiledLightCullInfo;
-class CD3D9Renderer;
-
-struct STiledLightShadeInfo
-{
-    uint32    lightType;
-    uint32    resIndex;
-    uint32    shadowMaskIndex;
-    uint16    stencilID0;
-    uint16    stencilID1;
-    Vec4      posRad;
-    Vec4      dirCosAngle;
-    Vec2      attenuationParams;
-    Vec2      shadowParams;
-    Vec4      color;
-    Vec4      shadowChannelIndex;
-    Matrix44  projectorMatrix;
-    Matrix44  shadowMatrix;
-};  // 256 bytes
-
-class CTiledShading
-{
-protected:
-    struct AtlasItem
-    {
-        ITexture* texture;
-        int       updateFrameID;
-        int       accessFrameID;
-        bool      invalid;
-
-        AtlasItem()
-            : texture(NULL)
-            , updateFrameID(-1)
-            , accessFrameID(0)
-            , invalid(false) {}
-    };
-
-    struct TextureAtlas
-    {
-        CTexture* texArray;
-        std::vector<AtlasItem>  items;
-
-        TextureAtlas()
-            : texArray(NULL) {}
-    };
-
-public:
-    CTiledShading();
-
-    void CreateResources();
-    void DestroyResources(bool destroyResolutionIndependentResources);
-    void Clear();
-
-    void Render(TArray<SRenderLight>& envProbes, TArray<SRenderLight>& ambientLights, TArray<SRenderLight>& defLights, Vec4* clipVolumeParams);
-
-    void BindForwardShadingResources(CShader* pShader, EHWShaderClass shType = eHWSC_Pixel);
-    void UnbindForwardShadingResources(EHWShaderClass shType = eHWSC_Pixel);
-
-    STiledLightShadeInfo* GetTiledLightShadeInfo();
-
-    int InsertTextureToSpecularProbeAtlas(CTexture* texture, int arrayIndex) {return InsertTexture(texture, m_specularProbeAtlas, arrayIndex); }
-    int InsertTextureToDiffuseProbeAtlas(CTexture* texture, int arrayIndex) {return InsertTexture(texture, m_diffuseProbeAtlas, arrayIndex); }
-    int InsertTextureToSpotTexAtlas(CTexture* texture, int arrayIndex) {return InsertTexture(texture, m_spotTexAtlas, arrayIndex); }
-
-    void NotifyCausticsVisible() { m_bApplyCaustics = true; }
-
-protected:
-    int InsertTexture(CTexture* texture, TextureAtlas& atlas, int arrayIndex);
-    void PrepareLightList(TArray<SRenderLight>& envProbes, TArray<SRenderLight>& ambientLights, TArray<SRenderLight>& defLights);
-    void PrepareEnvironmentProbes(bool& shouldAdd, SRenderLight& renderLight, STiledLightCullInfo& lightCullInfo, STiledLightShadeInfo& lightShadeInfo, Matrix44A& matView, const float invCameraFar, const Vec4& posVS);
-    void PrepareRegularAndAmbientLights(bool& shouldAdd, SRenderLight& renderLight, STiledLightCullInfo& lightCullInfo, STiledLightShadeInfo& lightShadeInfo, Matrix44A& matView, const float invCameraFar, const Vec4& posVS,
-        const bool ambientLight, CD3D9Renderer* const __restrict rd, const bool areaLightRect, const uint32 lightIdx, const uint32 firstShadowLight,const uint32 curShadowPoolLight, const int nThreadID, const int nRecurseLevel,
-        uint32& numTileLights);
-
-    void PrepareShadowCastersList(TArray<SRenderLight>& defLights);
-    void PrepareClipVolumeList(Vec4* clipVolumeParams);
-
-protected:
-    uint32             m_dispatchSizeX, m_dispatchSizeY;
-
-    WrappedDX11Buffer  m_lightCullInfoBuf;
-    WrappedDX11Buffer  m_LightShadeInfoBuf;
-    WrappedDX11Buffer  m_tileLightIndexBuf;
-
-    WrappedDX11Buffer  m_clipVolumeInfoBuf;
-
-    TextureAtlas       m_specularProbeAtlas;
-    TextureAtlas       m_diffuseProbeAtlas;
-    TextureAtlas       m_spotTexAtlas;
-
-    uint32             m_nTexStateTriLinear;
-    uint32             m_nTexStateCompare;
-
-    uint32             m_numSkippedLights;
-    uint32             m_numAtlasUpdates;
-
-    TArray<uint32>     m_arrShadowCastingLights;
-
-    bool               m_bApplyCaustics;
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DVolumetricFog.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3DVolumetricFog.cpp
deleted file mode 100644
index bd4e32e62b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DVolumetricFog.cpp
+++ /dev/null
@@ -1,3055 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "D3DVolumetricFog.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "CREFogVolume.h"
-
-
-#define ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define D3DVOLUMETRICFOG_CPP_SECTION_1 1
-#endif
-
-namespace vfInternal
-{
-    static const uint32 MaxNumTileLights = 255;
-
-    static const uint32 MaxNumFogVolumes = 64;
-
-    static const float ThresholdLengthGlobalProbe = 1.732f * (1000.0f * 0.5f);
-
-    enum EVolumeVolumeTypes
-    {
-        tlVolumeSphere = 1,
-        tlVolumeCone = 2,
-        tlVolumeOBB = 3,
-        tlVolumeSun = 4,
-    };
-
-    enum EVolumeLightTypes
-    {
-        tlTypeProbe = 1,
-        tlTypeAmbientPoint = 2,
-        tlTypeAmbientProjector = 3,
-        tlTypeAmbientArea = 4,
-        tlTypeRegularPoint = 5,
-        tlTypeRegularProjector = 6,
-        tlTypeRegularPointFace = 7,
-        tlTypeRegularArea = 8,
-        tlTypeSun = 9,
-    };
-
-    struct SVolumeLightCullInfo
-    {
-        uint32    volumeType;
-        uint32    miscFlag;
-        Vec2      depthBounds;
-        Vec4      posRad;
-        Vec4      volumeParams0;
-        Vec4      volumeParams1;
-        Vec4      volumeParams2;
-    };  // 80 bytes
-
-    struct SVolumeLightShadeInfo
-    {
-        uint32    lightType;
-        uint32    resIndex;
-        uint32    shadowMaskIndex;
-        uint16    stencilID0;
-        uint16    stencilID1;
-        Vec4      posRad;
-        Vec2      attenuationParams;
-        Vec2      shadowParams;
-        Vec4      color;
-        Vec4      shadowChannelIndex;
-        Matrix44  projectorMatrix;
-        Matrix44  shadowMatrix;
-    };  // 208 bytes
-
-    struct SFogVolumeCullInfo
-    {
-        Vec4      posRad;
-        Vec4      volumeParams0;
-        Vec4      volumeParams1;
-        Vec4      volumeParams2;
-    };
-
-    struct SFogVolumeInjectInfo
-    {
-        uint32      miscFlag;   // 1: volumeType, 8: stencilRef, 1: affectThisAreaOnly, 22: reserved
-        Vec3            fogColor;
-
-        float           globalDensity;
-        Vec3            fogVolumePos;
-
-        Vec3            heightFalloffBasePoint;
-        float           invSoftEdgeLerp;
-
-        Vec3            heightFallOffDirScaled;
-        float           densityOffset;
-
-        Vec4            rampParams;
-
-        Vec3            windOffset;
-        float           noiseElapsedTime;
-
-        Vec3            noiseSpatialFrequency;
-        float           noiseScale;
-
-        Vec3            eyePosInOS;
-        float           noiseOffset;
-
-        Matrix34    worldToObjMatrix;
-    };
-
-    int GetVolumeTexDepth()
-    {
-        int d = CRenderer::CV_r_VolumetricFogTexDepth;
-        d = (d < 4) ? 4 : d;
-    #if defined(AZ_RESTRICTED_PLATFORM)
-        #define AZ_RESTRICTED_SECTION D3DVOLUMETRICFOG_CPP_SECTION_1
-        #include AZ_RESTRICTED_FILE(D3DVolumetricFog_cpp)
-    #endif
-
-    #if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-        #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-    #else  
-        d = (d > 255) ? 255 : d;// this limitation due to the limitation of CTexture::CreateTextureArray.
-    #endif
-        int f = d % 4;
-        d = (f > 0) ? d - f : d;// depth should be the multiples of 4.
-        return d;
-    }
-
-    int GetVolumeTexSize(int size, int scale)
-    {
-        scale = max(scale, 2);
-        return (size / scale) + ((size % scale) > 0 ? 1 : 0);
-    }
-
-    AABB RotateAABB(const AABB& aabb, const Matrix33& mat)
-    {
-        Matrix33 matAbs;
-        matAbs.m00 = fabs_tpl(mat.m00);
-        matAbs.m01 = fabs_tpl(mat.m01);
-        matAbs.m02 = fabs_tpl(mat.m02);
-        matAbs.m10 = fabs_tpl(mat.m10);
-        matAbs.m11 = fabs_tpl(mat.m11);
-        matAbs.m12 = fabs_tpl(mat.m12);
-        matAbs.m20 = fabs_tpl(mat.m20);
-        matAbs.m21 = fabs_tpl(mat.m21);
-        matAbs.m22 = fabs_tpl(mat.m22);
-
-        Vec3 sz  = ((aabb.max - aabb.min) * 0.5f) * matAbs;
-        Vec3 pos = ((aabb.max + aabb.min) * 0.5f) * mat;
-
-        return AABB(pos - sz, pos + sz);
-    }
-}
-
-
-CVolumetricFog::CVolumetricFog()
-{
-    STATIC_ASSERT(MaxFrameNum >= MAX_GPU_NUM, "MaxFrameNum must be more than or equal to MAX_GPU_NUM.");
-
-    for (int i = 0; i < MaxFrameNum; ++i)
-    {
-        m_viewProj[i].SetIdentity();
-    }
-
-    m_InscatteringVolume = NULL;
-    m_fogInscatteringVolume[0] = NULL;
-    m_fogInscatteringVolume[1] = NULL;
-    m_MaxDepth = NULL;
-    m_MaxDepthTemp = NULL;
-    m_ClipVolumeDSVArray = NULL;
-    m_fogDensityVolume[0] = NULL;
-    m_fogDensityVolume[1] = NULL;
-    for (int i = 0; i < 3; ++i)
-    {
-        m_downscaledShadow[i] = NULL;
-    }
-    m_downscaledShadowTemp = NULL;
-    m_globalEnvProveTex0 = NULL;
-    m_globalEnvProveTex1 = NULL;
-
-    m_nTexStateTriLinear = -1;
-    m_nTexStateCompare = -1;
-    m_nTexStatePoint = -1;
-    m_Cleared = MaxFrameNum;
-    m_Destroyed = MaxFrameNum;
-    m_numTileLights = 0;
-    m_numFogVolumes = 0;
-    m_frameID = -1;
-    m_tick = 0;
-    m_ReverseDepthMode = 1;
-    m_raymarchDistance = 0.0f;
-    m_globalEnvProbeParam0 = Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-    m_globalEnvProbeParam1 = Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        for (int j = 0; j < MAX_REND_RECURSION_LEVELS; ++j)
-        {
-            for (int k = 0; k < MaxNumFogVolumeType; ++k)
-            {
-                m_fogVolumeInfoArray[i][j][k].Reserve(vfInternal::MaxNumFogVolumes);
-            }
-        }
-    }
-}
-
-void CVolumetricFog::CreateResources()
-{
-    static const ICVar* pCVarVolumetricFog = NULL;
-    if (!pCVarVolumetricFog)
-    {
-        pCVarVolumetricFog = gEnv->pConsole->GetCVar("e_VolumetricFog");
-    }
-
-    if (!pCVarVolumetricFog || pCVarVolumetricFog->GetIVal() == 0)
-    {
-        return;
-    }
-
-    // downscaled shadow maps
-    ETEX_Format shadowFormat = eTF_D32F;
-    static const ICVar* pCVarShadowMaxTexRes = NULL;
-    if (!pCVarShadowMaxTexRes)
-    {
-        pCVarShadowMaxTexRes = gEnv->pConsole->GetCVar("e_ShadowsMaxTexRes");
-    }
-    int widthShadowMap = 0;
-    int widthShadowMapTemp = 0;
-    if (pCVarShadowMaxTexRes)
-    {
-        widthShadowMapTemp = max(pCVarShadowMaxTexRes->GetIVal(), 32);//this restriction is same as it in CD3D9Renderer::PrepareShadowGenForFrustum.
-        switch (CRenderer::CV_r_VolumetricFogDownscaledSunShadowRatio)
-        {
-        case 0:
-            widthShadowMapTemp /= 4;
-            widthShadowMap = widthShadowMapTemp;
-            break;
-        case 1:
-            widthShadowMapTemp /= 4;
-            widthShadowMap = widthShadowMapTemp / 2;
-            break;
-        case 2:
-            widthShadowMapTemp /= 4;
-            widthShadowMap = widthShadowMapTemp / 4;
-            break;
-        default:
-            widthShadowMapTemp /= 4;
-            widthShadowMap = widthShadowMapTemp / 4;
-            break;
-        }
-    }
-
-    // view frustum aligned volume texture
-    int width = vfInternal::GetVolumeTexSize(gRenDev->GetWidth(), CRenderer::CV_r_VolumetricFogTexScale);
-    int height = vfInternal::GetVolumeTexSize(gRenDev->GetHeight(), CRenderer::CV_r_VolumetricFogTexScale);
-    int depth = vfInternal::GetVolumeTexDepth();
-#ifdef ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-    ETEX_Format fmt = eTF_R16G16B16A16F;
-#else
-    ETEX_Format fmt = eTF_R11G11B10F;
-#endif
-    ETEX_Format fmtDensityColor = eTF_R11G11B10F;
-    ETEX_Format fmtDensity = eTF_R16F;
-
-
-    bool validVolumeTexture = m_InscatteringVolume
-        && (m_InscatteringVolume->GetWidth() == width)
-        && (m_InscatteringVolume->GetHeight() == height)
-        && (m_InscatteringVolume->GetDepth() == depth)
-        && (m_InscatteringVolume->GetDstFormat() == fmt)
-        && CTexture::s_ptexVolumetricFogDensityColor
-        && (CTexture::s_ptexVolumetricFogDensityColor->GetDstFormat() == fmtDensityColor);
-
-    bool validDownscaledShadowMaps = (CRenderer::CV_r_VolumetricFogDownscaledSunShadow == 0 && !m_downscaledShadow[0])
-        || (CRenderer::CV_r_VolumetricFogDownscaledSunShadow != 0
-            && m_downscaledShadow[0] && m_downscaledShadow[0]->GetWidth() == widthShadowMap
-            && m_downscaledShadow[0]->GetDstFormat() == shadowFormat
-            && ((CRenderer::CV_r_VolumetricFogDownscaledSunShadow == 1 && !m_downscaledShadow[2])
-                || (CRenderer::CV_r_VolumetricFogDownscaledSunShadow != 1 && m_downscaledShadow[2])));
-
-    if (validVolumeTexture && validDownscaledShadowMaps)
-    {
-        return;
-    }
-    else
-    {
-        DestroyResources(false);
-    }
-
-    STexState ts0(FILTER_TRILINEAR, true);
-    STexState ts1(FILTER_BILINEAR, true);
-    STexState ts2(FILTER_POINT, true);
-    ts1.SetComparisonFilter(true);
-    m_nTexStateTriLinear = CTexture::GetTexState(ts0);
-    m_nTexStateCompare = CTexture::GetTexState(ts1);
-    m_nTexStatePoint =  CTexture::GetTexState(ts2);
-
-
-    uint32 commonFlags = FT_NOMIPS | FT_DONT_RELEASE | FT_DONT_STREAM;
-
-    assert(!m_InscatteringVolume);
-    if (!m_InscatteringVolume)
-    {
-        const int32 w = width;
-        const int32 h = height;
-        const int32 d = depth;
-        //ETEX_Format format = eTF_R8G8B8A8;
-        //uint32 flags = FT_NOMIPS | FT_DONT_RELEASE | FT_DONT_STREAM | FT_USAGE_UNORDERED_ACCESS | FT_USAGE_UAV_RWTEXTURE;
-        ETEX_Format format = fmt;
-        uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS;
-        m_InscatteringVolume = CTexture::CreateTextureObject("$InscatteringVolume", w, h, d, eTT_3D, flags, format);
-        const byte* pData[6] = {NULL};
-        m_InscatteringVolume->CreateDeviceTexture(pData);
-
-        if (m_InscatteringVolume->GetFlags() & FT_FAILED)
-        {
-            CryFatalError("Couldn't allocate texture.");
-        }
-    }
-
-    {
-        uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS;
-
-        assert(CTexture::s_ptexVolumetricFog);
-        if (CTexture::s_ptexVolumetricFog)
-        {
-            const int32 w = width;
-            const int32 h = height;
-            const int32 d = depth;
-            ETEX_Format format = eTF_R16G16B16A16F;
-            if (!CTexture::s_ptexVolumetricFog->Create3DTexture(w, h, d, 1, flags, NULL, format, format))
-            {
-                CryFatalError("Couldn't allocate texture.");
-            }
-        }
-    }
-
-    {
-        const char* tname[2] =
-        {
-            "$FogInscatteringVolume0",
-            "$FogInscatteringVolume1",
-        };
-
-        for (int i = 0; i < 2; ++i)
-        {
-            assert(!m_fogInscatteringVolume[i]);
-            if (!m_fogInscatteringVolume[i])
-            {
-                const int32 w = width;
-                const int32 h = height;
-                const int32 d = depth;
-                ETEX_Format format = fmt;
-                uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS;
-                m_fogInscatteringVolume[i] = CTexture::CreateTextureObject(tname[i], w, h, d, eTT_3D, flags, format);
-                const byte* pData[6] = {NULL};
-                m_fogInscatteringVolume[i]->CreateDeviceTexture(pData);
-
-                if (m_fogInscatteringVolume[i]->GetFlags() & FT_FAILED)
-                {
-                    CryFatalError("Couldn't allocate texture.");
-                }
-            }
-        }
-    }
-
-    assert(!m_MaxDepth);
-    if (!m_MaxDepth)
-    {
-        const int32 w = width;
-        const int32 h = height;
-        ETEX_Format format = eTF_R16F;
-        uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS;
-        m_MaxDepth = CTexture::CreateTextureObject("$MaxDepth", w, h, 1, eTT_2D, flags, format);
-        const byte* pData[6] = {NULL};
-        m_MaxDepth->CreateDeviceTexture(pData);
-
-        if (m_MaxDepth->GetFlags() & FT_FAILED)
-        {
-            CryFatalError("Couldn't allocate texture.");
-        }
-    }
-
-    assert(!m_MaxDepthTemp);
-    if (!m_MaxDepthTemp)
-    {
-        const int32 w = width << 1;
-        const int32 h = CTexture::s_ptexZTargetScaled->GetHeight() >> 1;
-        ETEX_Format format = eTF_R16F;
-        uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS;
-        m_MaxDepthTemp = CTexture::CreateTextureObject("$MaxDepthTemp", w, h, 1, eTT_2D, flags, format);
-        const byte* pData[6] = {NULL};
-        m_MaxDepthTemp->CreateDeviceTexture(pData);
-
-        if (m_MaxDepthTemp->GetFlags() & FT_FAILED)
-        {
-            CryFatalError("Couldn't allocate texture.");
-        }
-    }
-
-    assert(!m_ClipVolumeDSVArray);
-    if (!m_ClipVolumeDSVArray)
-    {
-        typedef D3DDepthSurface* DSVPTR;
-        m_ClipVolumeDSVArray = new DSVPTR[depth];
-        for (int i = 0; i < depth; ++i)
-        {
-            m_ClipVolumeDSVArray[i] = NULL;
-        }
-    }
-
-    assert(CTexture::s_ptexVolumetricClipVolumeStencil);
-    if (CTexture::s_ptexVolumetricClipVolumeStencil)
-    {
-        const int32 w = width;
-        const int32 h = height;
-        const int32 d = depth;
-        ETEX_Format format = eTF_D24S8;
-        uint32 flags = commonFlags | FT_USAGE_DEPTHSTENCIL | FT_USAGE_RENDERTARGET;
-        CTexture* ptex = CTexture::CreateTextureArray("$ClipVolumeStencilVolume", eTT_2D, w, h, d, 1, flags, format);
-
-        // texture name has to exactly match the name of CTexture::s_ptexVolumetricClipVolumeStencil.
-        if (CTexture::s_ptexVolumetricClipVolumeStencil != ptex || CTexture::s_ptexVolumetricClipVolumeStencil->GetFlags() & FT_FAILED)
-        {
-            CryFatalError("Couldn't allocate volumetric clip volume stencil texture.");
-        }
-
-        // This is the code for working around that stencil readable shader resource view can't be created directly.
-        D3DShaderResourceView* pSRV = CTexture::s_ptexVolumetricClipVolumeStencil->GetShaderResourceView();
-        pSRV->Release();
-        D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
-        ZeroStruct(SRVDesc);
-        SRVDesc.Format = DXGI_FORMAT_X24_TYPELESS_G8_UINT;
-        D3DTexture* pID3DTexture = CTexture::s_ptexVolumetricClipVolumeStencil->GetDevTexture()->Get2DTexture();
-        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
-        SRVDesc.Texture2DArray.FirstArraySlice = 0;
-        SRVDesc.Texture2DArray.ArraySize = d;
-        SRVDesc.Texture2DArray.MipLevels = 1;
-        SRVDesc.Texture2DArray.MostDetailedMip = 0;
-        HRESULT hr = gcpRendD3D->GetDevice().CreateShaderResourceView(pID3DTexture, &SRVDesc, &pSRV);
-        assert(SUCCEEDED(hr));
-        CTexture::s_ptexVolumetricClipVolumeStencil->SetShaderResourceView(pSRV);
-
-        // Separate DSVs need to be created because of performance issue of drawing to single DSV array.
-        ID3D11DepthStencilView* pDSV;
-        D3D11_DEPTH_STENCIL_VIEW_DESC DsvDesc;
-        ZeroStruct(DsvDesc);
-        DsvDesc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT;
-        DsvDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
-        DsvDesc.Texture2DArray.ArraySize = 1;
-        DsvDesc.Texture2DArray.MipSlice = 0;
-        for (int i = 0; i < d; ++i)
-        {
-            DsvDesc.Texture2DArray.FirstArraySlice = i;
-            pDSV = NULL;
-            hr = gcpRendD3D->GetDevice().CreateDepthStencilView(pID3DTexture, &DsvDesc, &pDSV);
-            assert(SUCCEEDED(hr));
-            m_ClipVolumeDSVArray[i] = pDSV;
-        }
-    }
-
-    assert(CTexture::s_ptexVolumetricFogDensityColor);
-    if (CTexture::s_ptexVolumetricFogDensityColor)
-    {
-        const int32 w = width;
-        const int32 h = height;
-        const int32 d = depth;
-        ETEX_Format format = fmtDensityColor;
-        uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS | FT_USAGE_RENDERTARGET;
-
-        CTexture::s_ptexVolumetricFogDensityColor->Invalidate(w, h, format);
-
-        if (!CTexture::s_ptexVolumetricFogDensityColor->Create3DTexture(w, h, d, 1, flags, NULL, format, format))
-        {
-            CryFatalError("Couldn't allocate texture.");
-        }
-    }
-
-    assert(CTexture::s_ptexVolumetricFogDensity);
-    if (CTexture::s_ptexVolumetricFogDensity)
-    {
-        const int32 w = width;
-        const int32 h = height;
-        const int32 d = depth;
-        ETEX_Format format = fmtDensity;
-        uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS | FT_USAGE_RENDERTARGET;
-
-        CTexture::s_ptexVolumetricFogDensity->Invalidate(w, h, format);
-
-        if (!CTexture::s_ptexVolumetricFogDensity->Create3DTexture(w, h, d, 1, flags, NULL, format, format))
-        {
-            CryFatalError("Couldn't allocate texture.");
-        }
-    }
-
-#ifndef ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-    {
-        const char* tname[2] =
-        {
-            "$FogDensityVolume0",
-            "$FogDensityVolume1",
-        };
-
-        for (int i = 0; i < 2; ++i)
-        {
-            assert(!m_fogDensityVolume[i]);
-            if (!m_fogDensityVolume[i])
-            {
-                const int32 w = width;
-                const int32 h = height;
-                const int32 d = depth;
-                ETEX_Format format = fmtDensity;
-                uint32 flags = commonFlags | FT_USAGE_UNORDERED_ACCESS;
-                m_fogDensityVolume[i] = CTexture::CreateTextureObject(tname[i], w, h, d, eTT_3D, flags, format);
-                m_fogDensityVolume[i]->CreateRenderTarget(format);
-
-                if (m_fogDensityVolume[i]->GetFlags() & FT_FAILED)
-                {
-                    CryFatalError("Couldn't allocate texture.");
-                }
-            }
-        }
-    }
-#endif
-
-    if (CRenderer::CV_r_VolumetricFogDownscaledSunShadow != 0)
-    {
-        const char* tname[3] =
-        {
-            "$DownscaledShadowMaps0",
-            "$DownscaledShadowMaps1",
-            "$DownscaledShadowMaps2",
-        };
-
-        int count = (CRenderer::CV_r_VolumetricFogDownscaledSunShadow == 1) ? 2 : 3;
-        for (int i = 0; i < count; ++i)
-        {
-            assert(!m_downscaledShadow[i]);
-            if (!m_downscaledShadow[i])
-            {
-                uint32 flags = commonFlags | FT_USAGE_DEPTHSTENCIL | FT_USAGE_RENDERTARGET;
-
-                m_downscaledShadow[i] = CTexture::Create2DTexture(tname[i], widthShadowMap, widthShadowMap, 1, flags, NULL, shadowFormat, shadowFormat);
-            }
-
-            if (!m_downscaledShadow[i] || m_downscaledShadow[i]->GetFlags() & FT_FAILED)
-            {
-                CryFatalError("Couldn't allocate texture.");
-            }
-        }
-
-        if (CRenderer::CV_r_VolumetricFogDownscaledSunShadowRatio != 0)
-        {
-            assert(!m_downscaledShadowTemp);
-            if (!m_downscaledShadowTemp)
-            {
-                uint32 flags = commonFlags | FT_USAGE_DEPTHSTENCIL | FT_USAGE_RENDERTARGET;
-
-                m_downscaledShadowTemp = CTexture::Create2DTexture("$DownscaledShadowMapsTemp", widthShadowMapTemp, widthShadowMapTemp, 1, flags, NULL, shadowFormat, shadowFormat);
-            }
-
-            if (!m_downscaledShadowTemp || m_downscaledShadowTemp->GetFlags() & FT_FAILED)
-            {
-                CryFatalError("Couldn't allocate texture.");
-            }
-        }
-    }
-
-    if (!m_lightCullInfoBuf.m_pBuffer)
-    {
-        DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN;
-        uint32 stride = sizeof(vfInternal::SVolumeLightCullInfo);
-        m_lightCullInfoBuf.Create(vfInternal::MaxNumTileLights, stride, format, DX11BUF_DYNAMIC | DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, NULL);
-    }
-
-    if (!m_LightShadeInfoBuf.m_pBuffer)
-    {
-        DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN;
-        uint32 stride = sizeof(vfInternal::SVolumeLightShadeInfo);
-        m_LightShadeInfoBuf.Create(vfInternal::MaxNumTileLights, stride, format, DX11BUF_DYNAMIC | DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, NULL);
-    }
-
-    if (!m_lightGridBuf.m_pBuffer)
-    {
-        const uint32 tileSizeX = 4;
-        const uint32 tileSizeY = 4;
-        const uint32 tileSizeZ = 4;
-        const uint32 dispatchSizeX = (width / tileSizeX) + (width % tileSizeX > 0 ? 1 : 0);
-        const uint32 dispatchSizeY = (height / tileSizeY) + (height % tileSizeY > 0 ? 1 : 0);
-        const uint32 dispatchSizeZ = (depth / tileSizeZ) + (depth % tileSizeZ > 0 ? 1 : 0);
-        DXGI_FORMAT format = DXGI_FORMAT_R8_UINT;
-        uint32 stride = sizeof(char);
-        m_lightGridBuf.Create(dispatchSizeX * dispatchSizeY * dispatchSizeZ * vfInternal::MaxNumTileLights, stride, format, DX11BUF_BIND_SRV | DX11BUF_BIND_UAV, NULL);
-    }
-
-    if (!m_lightCountBuf.m_pBuffer)
-    {
-        const uint32 tileSizeX = 4;
-        const uint32 tileSizeY = 4;
-        const uint32 tileSizeZ = 4;
-        const uint32 dispatchSizeX = (width / tileSizeX) + (width % tileSizeX > 0 ? 1 : 0);
-        const uint32 dispatchSizeY = (height / tileSizeY) + (height % tileSizeY > 0 ? 1 : 0);
-        const uint32 dispatchSizeZ = (depth / tileSizeZ) + (depth % tileSizeZ > 0 ? 1 : 0);
-        DXGI_FORMAT format = DXGI_FORMAT_R8_UINT;
-        uint32 stride = sizeof(char);
-        m_lightCountBuf.Create(dispatchSizeX * dispatchSizeY * dispatchSizeZ, stride, format, DX11BUF_BIND_SRV | DX11BUF_BIND_UAV, NULL);
-    }
-
-    if (!m_fogVolumeCullInfoBuf.m_pBuffer)
-    {
-        DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN;
-        uint32 stride = sizeof(vfInternal::SFogVolumeCullInfo);
-        m_fogVolumeCullInfoBuf.Create(vfInternal::MaxNumFogVolumes, stride, format, DX11BUF_DYNAMIC | DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, NULL);
-    }
-
-    if (!m_fogVolumeInjectInfoBuf.m_pBuffer)
-    {
-        DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN;
-        uint32 stride = sizeof(vfInternal::SFogVolumeInjectInfo);
-        m_fogVolumeInjectInfoBuf.Create(vfInternal::MaxNumFogVolumes, stride, format, DX11BUF_DYNAMIC | DX11BUF_STRUCTURED | DX11BUF_BIND_SRV, NULL);
-    }
-}
-
-void CVolumetricFog::DestroyResources(bool destroyResolutionIndependentResources)
-{
-    assert((m_ClipVolumeDSVArray && m_InscatteringVolume) || !(m_ClipVolumeDSVArray || m_InscatteringVolume));
-    if (m_ClipVolumeDSVArray && m_InscatteringVolume)
-    {
-        int depth = m_InscatteringVolume->GetDepth();
-        for (int i = 0; i < depth; ++i)
-        {
-            if (m_ClipVolumeDSVArray[i])
-            {
-                ((ID3D11DepthStencilView*)m_ClipVolumeDSVArray[i])->Release();
-            }
-        }
-        delete [] m_ClipVolumeDSVArray;
-        m_ClipVolumeDSVArray = NULL;
-    }
-
-    SAFE_RELEASE_FORCE(m_InscatteringVolume);
-    SAFE_RELEASE_FORCE(m_fogInscatteringVolume[0]);
-    SAFE_RELEASE_FORCE(m_fogInscatteringVolume[1]);
-    SAFE_RELEASE_FORCE(m_MaxDepth);
-    SAFE_RELEASE_FORCE(m_MaxDepthTemp);
-    SAFE_RELEASE_FORCE(m_fogDensityVolume[0]);
-    SAFE_RELEASE_FORCE(m_fogDensityVolume[1]);
-    for (int i = 0; i < 3; ++i)
-    {
-        SAFE_RELEASE_FORCE(m_downscaledShadow[i]);
-    }
-    SAFE_RELEASE_FORCE(m_downscaledShadowTemp);
-
-    m_lightCullInfoBuf.Release();
-    m_LightShadeInfoBuf.Release();
-    m_lightGridBuf.Release();
-    m_lightCountBuf.Release();
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        for (int j = 0; j < MAX_REND_RECURSION_LEVELS; ++j)
-        {
-            for (int k = 0; k < MaxNumFogVolumeType; ++k)
-            {
-                m_fogVolumeInfoArray[i][j][k].clear();
-            }
-        }
-    }
-
-    m_fogVolumeCullInfoBuf.Release();
-    m_fogVolumeInjectInfoBuf.Release();
-
-    if (destroyResolutionIndependentResources)
-    {
-        if (CTexture::s_ptexVolumetricFog)
-        {
-            CTexture::s_ptexVolumetricFog->ReleaseDeviceTexture(false);
-        }
-        if (CTexture::s_ptexVolumetricClipVolumeStencil)
-        {
-            CTexture::s_ptexVolumetricClipVolumeStencil->ReleaseDeviceTexture(false);
-        }
-        if (CTexture::s_ptexVolumetricFogDensityColor)
-        {
-            CTexture::s_ptexVolumetricFogDensityColor->ReleaseDeviceTexture(false);
-        }
-        if (CTexture::s_ptexVolumetricFogDensity)
-        {
-            CTexture::s_ptexVolumetricFogDensity->ReleaseDeviceTexture(false);
-        }
-    }
-
-    m_Cleared = MaxFrameNum;
-    m_Destroyed = MaxFrameNum;
-    m_ReverseDepthMode = CRenderer::CV_r_ReverseDepth;
-}
-
-void CVolumetricFog::Clear()
-{
-    ClearFogVolumes();
-}
-
-void CVolumetricFog::ClearAll()
-{
-    Clear();
-
-    m_globalEnvProbeParam0 = Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-    m_globalEnvProbeParam1 = Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-
-    // ClearAll() is called during shutdown and post level unload 
-    // when we should not be rendering volumetric fog.
-    SAFE_RELEASE(m_globalEnvProveTex0);
-    SAFE_RELEASE(m_globalEnvProveTex1);
-
-    ClearAllFogVolumes();
-    m_Cleared = MaxFrameNum;
-}
-
-void CVolumetricFog::PrepareLightList(TArray<SRenderLight>* envProbes, TArray<SRenderLight>* ambientLights, TArray<SRenderLight>* defLights, uint32 firstShadowLight, uint32 curShadowPoolLight)
-{
-    const ICVar* pCVarVolumetricFog = gEnv->pConsole->GetCVar("e_VolumetricFog");
-    if (!pCVarVolumetricFog || pCVarVolumetricFog->GetIVal() == 0)
-    {
-        return;
-    }
-
-    if (!IsViable())
-    {
-        return;
-    }
-
-    AZ_TRACE_METHOD();
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    CTiledShading& tdsh = rd->GetTiledShading();
-
-    // Prepare view matrix with flipped z-axis
-    Matrix44A matView = rd->m_ViewMatrix;
-    matView.m02 *= -1;
-    matView.m12 *= -1;
-    matView.m22 *= -1;
-    matView.m32 *= -1;
-
-    int nThreadID = rd->m_RP.m_nProcessThreadID;
-    int nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-
-    uint32 numTileLights = 0;
-    uint32 numRenderLights = 0;
-    uint32 numValidRenderLights = 0;
-    CTexture* texGlobalEnvProbe0 = NULL;
-    CTexture* texGlobalEnvProbe1 = NULL;
-    Vec3 colorGlobalEnvProbe0(0.0f, 0.0f, 0.0f);
-    Vec3 colorGlobalEnvProbe1(0.0f, 0.0f, 0.0f);
-    float attenuationGlobalEnvProbe0 = 0.0f;
-    float attenuationGlobalEnvProbe1 = 0.0f;
-    float maxSizeGlobalEnvProbe0 = 0.0f;
-    float maxSizeGlobalEnvProbe1 = 0.0f;
-
-    vfInternal::SVolumeLightCullInfo tileLightsCull[vfInternal::MaxNumTileLights];
-    vfInternal::SVolumeLightShadeInfo tileLightsShade[vfInternal::MaxNumTileLights];
-
-    // Reset lights
-    ZeroMemory(tileLightsCull, sizeof(vfInternal::SVolumeLightCullInfo) * vfInternal::MaxNumTileLights);
-    ZeroMemory(tileLightsShade, sizeof(vfInternal::SVolumeLightShadeInfo) * vfInternal::MaxNumTileLights);
-
-    TArray<SRenderLight>* lightLists[3] = {
-        CRenderer::CV_r_DeferredShadingEnvProbes ? envProbes : NULL,
-        CRenderer::CV_r_DeferredShadingAmbientLights ? ambientLights : NULL,
-        CRenderer::CV_r_DeferredShadingLights ? defLights : NULL,
-    };
-
-    const bool areaLights = CRenderer::CV_r_DeferredShadingAreaLights > 0;  //convert from int to bool
-    const float minBulbSize = max(0.001f, min(2.0f, CRenderer::CV_r_VolumetricFogMinimumLightBulbSize));// limit the minimum bulb size to reduce the light flicker.
-
-    for (uint32 lightListIdx = 0; lightListIdx < 3; ++lightListIdx)
-    {
-        if (lightLists[lightListIdx] == NULL)
-        {
-            continue;
-        }
-
-        for (uint32 lightIdx = 0, lightListSize = lightLists[lightListIdx]->size(); lightIdx < lightListSize; ++lightIdx)
-        {
-            SRenderLight& renderLight = (*lightLists[lightListIdx])[lightIdx];
-            vfInternal::SVolumeLightCullInfo& lightCullInfo = tileLightsCull[numTileLights];
-            vfInternal::SVolumeLightShadeInfo& lightShadeInfo = tileLightsShade[numTileLights];
-
-            if ((renderLight.m_Flags & DLF_FAKE) || !(renderLight.m_Flags & DLF_VOLUMETRIC_FOG))
-            {
-                continue;
-            }
-
-            // Skip non-ambient area light if support is disabled
-            if ((renderLight.m_Flags & DLF_AREA_LIGHT) && !(renderLight.m_Flags & DLF_AMBIENT) && !areaLights)
-            {
-                continue;
-            }
-
-            ++numRenderLights;
-
-            if (numTileLights == vfInternal::MaxNumTileLights)
-            {
-                continue;  // Skip light
-            }
-            // Setup standard parameters
-            bool areaLightRect = (renderLight.m_Flags & DLF_AREA_LIGHT) && renderLight.m_fAreaWidth && renderLight.m_fAreaHeight && renderLight.m_fLightFrustumAngle;
-            float volumeSize = (lightListIdx == 0) ? renderLight.m_ProbeExtents.len() : renderLight.m_fRadius;
-            Vec3 pos = renderLight.GetPosition();
-            Vec3 worldViewPos = rd->GetViewParameters().vOrigin;
-            lightShadeInfo.posRad = Vec4(pos.x - worldViewPos.x, pos.y - worldViewPos.y, pos.z - worldViewPos.z, volumeSize);
-            Vec4 posVS = Vec4(pos, 1) * matView;
-            lightCullInfo.posRad = Vec4(posVS.x, posVS.y, posVS.z, volumeSize);
-            lightShadeInfo.attenuationParams = Vec2(areaLightRect ? (renderLight.m_fAreaWidth + renderLight.m_fAreaHeight) * 0.25f : renderLight.m_fAttenuationBulbSize, renderLight.m_fAreaHeight * 0.5f);
-            lightCullInfo.depthBounds = Vec2(posVS.z - volumeSize, posVS.z + volumeSize);
-            lightShadeInfo.color = Vec4(renderLight.m_Color.r,
-                    renderLight.m_Color.g,
-                    renderLight.m_Color.b,
-                    renderLight.m_fFogRadialLobe);
-            lightShadeInfo.resIndex = 0;
-            lightShadeInfo.shadowParams = Vec2(0, 0);
-            lightShadeInfo.stencilID0 = renderLight.m_nStencilRef[0] + 1;
-            lightShadeInfo.stencilID1 = renderLight.m_nStencilRef[1] + 1;
-
-            // Environment probes
-            if (lightListIdx == 0)
-            {
-                lightCullInfo.volumeType = vfInternal::tlVolumeOBB;
-                lightShadeInfo.lightType = vfInternal::tlTypeProbe;
-                lightShadeInfo.resIndex = 0xFFFFFFFF;
-                lightShadeInfo.attenuationParams.x = renderLight.m_fProbeAttenuation;
-                // assigning value isn't needed because AttenuationFalloffMax is hard-coded in VolumeLighting.cfi to mitigate sharp transition between probes.
-                //lightShadeInfo.attenuationParams.y = max( renderLight.GetFalloffMax(), 0.001f );
-                lightCullInfo.miscFlag = 0;
-
-                AABB aabb = vfInternal::RotateAABB(AABB(-renderLight.m_ProbeExtents, renderLight.m_ProbeExtents), Matrix33(renderLight.m_ObjMatrix));
-                aabb = vfInternal::RotateAABB(aabb, Matrix33(matView));
-                lightCullInfo.depthBounds = Vec2(posVS.z + aabb.min.z, posVS.z + aabb.max.z);
-
-                Vec4 u0 = Vec4(renderLight.m_ObjMatrix.GetColumn0().GetNormalized(), 0) * matView;
-                Vec4 u1 = Vec4(renderLight.m_ObjMatrix.GetColumn1().GetNormalized(), 0) * matView;
-                Vec4 u2 = Vec4(renderLight.m_ObjMatrix.GetColumn2().GetNormalized(), 0) * matView;
-                lightCullInfo.volumeParams0 = Vec4(u0.x, u0.y, u0.z, renderLight.m_ProbeExtents.x);
-                lightCullInfo.volumeParams1 = Vec4(u1.x, u1.y, u1.z, renderLight.m_ProbeExtents.y);
-                lightCullInfo.volumeParams2 = Vec4(u2.x, u2.y, u2.z, renderLight.m_ProbeExtents.z);
-
-                lightShadeInfo.projectorMatrix.SetRow4(0, Vec4(renderLight.m_ObjMatrix.GetColumn0().GetNormalized() / renderLight.m_ProbeExtents.x, 0));
-                lightShadeInfo.projectorMatrix.SetRow4(1, Vec4(renderLight.m_ObjMatrix.GetColumn1().GetNormalized() / renderLight.m_ProbeExtents.y, 0));
-                lightShadeInfo.projectorMatrix.SetRow4(2, Vec4(renderLight.m_ObjMatrix.GetColumn2().GetNormalized() / renderLight.m_ProbeExtents.z, 0));
-
-                Vec3 boxProxyMin(-1000000, -1000000, -1000000);
-                Vec3 boxProxyMax(1000000,  1000000,  1000000);
-
-                if (renderLight.m_Flags & DLF_BOX_PROJECTED_CM)
-                {
-                    boxProxyMin = Vec3(-renderLight.m_fBoxLength * 0.5f, -renderLight.m_fBoxWidth * 0.5f, -renderLight.m_fBoxHeight * 0.5f);
-                    boxProxyMax = Vec3(renderLight.m_fBoxLength * 0.5f,  renderLight.m_fBoxWidth * 0.5f,  renderLight.m_fBoxHeight * 0.5f);
-                }
-
-                lightShadeInfo.shadowMatrix.SetRow4(0, Vec4(boxProxyMin, 0));
-                lightShadeInfo.shadowMatrix.SetRow4(1, Vec4(boxProxyMax, 0));
-
-                int arrayIndex = tdsh.InsertTextureToSpecularProbeAtlas((CTexture*)renderLight.GetSpecularCubemap(), -1);
-                if (arrayIndex >= 0)
-                {
-                    if (tdsh.InsertTextureToDiffuseProbeAtlas((CTexture*)renderLight.GetDiffuseCubemap(), arrayIndex) >= 0)
-                    {
-                        lightShadeInfo.resIndex = arrayIndex;
-                    }
-                    else
-                    {
-                        continue;  // Skip light
-                    }
-                }
-                else
-                {
-                    continue;  // Skip light
-                }
-                // Determine the global env probe for lighting analytical volumetric fog if we have it in the scene.
-                // Enough big(more than 1000 meters), the biggest and the second biggest including camera position are selected.
-                if (volumeSize >= vfInternal::ThresholdLengthGlobalProbe &&
-                    (volumeSize > maxSizeGlobalEnvProbe0 || volumeSize > maxSizeGlobalEnvProbe1))
-                {
-                    Vec3 vLightPos = renderLight.GetPosition();
-                    Vec3 vCenterRel = worldViewPos - vLightPos;
-                    if (vCenterRel.dot(vCenterRel) <= volumeSize * volumeSize)
-                    {
-                        Vec3 vCenterOBBSpace;
-                        vCenterOBBSpace.x = renderLight.m_ObjMatrix.GetColumn0().GetNormalized().dot(vCenterRel);
-                        vCenterOBBSpace.y = renderLight.m_ObjMatrix.GetColumn1().GetNormalized().dot(vCenterRel);
-                        vCenterOBBSpace.z = renderLight.m_ObjMatrix.GetColumn2().GetNormalized().dot(vCenterRel);
-
-                        // Check if camera position is within probe OBB
-                        Vec3 vProbeExtents = renderLight.m_ProbeExtents;
-                        if (fabs(vCenterOBBSpace.x) < vProbeExtents.x && fabs(vCenterOBBSpace.y) < vProbeExtents.y && fabs(vCenterOBBSpace.z) < vProbeExtents.z)
-                        {
-                            Vec3 probePos;
-                            probePos.x = vCenterOBBSpace.x / vProbeExtents.x;
-                            probePos.y = vCenterOBBSpace.y / vProbeExtents.y;
-                            probePos.z = vCenterOBBSpace.z / vProbeExtents.z;
-                            Vec3 pos2 = probePos.CompMul(probePos);
-                            Vec3 t;
-                            t.x = sqrt(1.0f - 0.5f * pos2.y - 0.5f * pos2.z + 0.333f * pos2.y * pos2.z);
-                            t.y = sqrt(1.0f - 0.5f * pos2.z - 0.5f * pos2.x + 0.333f * pos2.z * pos2.x);
-                            t.z = sqrt(1.0f - 0.5f * pos2.x - 0.5f * pos2.y + 0.333f * pos2.x * pos2.y);
-                            probePos = probePos.CompMul(t);
-                            float falloff = max(0.0f, min(1.0f, 1.0f + probePos.Dot(-probePos)));
-                            const static float AttenuationFalloffMax = 0.2f;
-                            falloff = min(1.0f, falloff / max(renderLight.GetFalloffMax(), AttenuationFalloffMax));
-
-                            // This globalEnvProbe stuff has not been tested since the introduction of m_fProbeAttenuation
-                            // because the feature is dead at this time; CVolumetricFog::Clear() gets called before m_globalEnvProbeParam0/1
-                            // and m_globalEnvProveTex0/1 are copied to the GPU. I updated the code to use m_fProbeAttenuation as best I could,
-                            // but can't be certain that the final result will be correct if/when globalEnvProbe functionality is restored. (9/21/2017)
-
-                            float attenuation = falloff * falloff * (3.0f - 2.0f * falloff) * renderLight.m_fProbeAttenuation;
-
-                            if (renderLight.m_fProbeAttenuation > 0)
-                            {
-                                if (volumeSize > maxSizeGlobalEnvProbe0)
-                                {
-                                    maxSizeGlobalEnvProbe1 = maxSizeGlobalEnvProbe0;
-                                    texGlobalEnvProbe1 = texGlobalEnvProbe0;
-                                    colorGlobalEnvProbe1 = colorGlobalEnvProbe0;
-                                    attenuationGlobalEnvProbe1 = attenuationGlobalEnvProbe0;
-
-                                    maxSizeGlobalEnvProbe0 = volumeSize;
-                                    texGlobalEnvProbe0 = (CTexture*)renderLight.GetDiffuseCubemap();
-                                    colorGlobalEnvProbe0 = Vec3(lightShadeInfo.color);
-                                    attenuationGlobalEnvProbe0 = attenuation;
-                                }
-                                else if (volumeSize > maxSizeGlobalEnvProbe1)
-                                {
-                                    maxSizeGlobalEnvProbe1 = volumeSize;
-                                    texGlobalEnvProbe1 = (CTexture*)renderLight.GetDiffuseCubemap();
-                                    colorGlobalEnvProbe1 = Vec3(lightShadeInfo.color);
-                                    attenuationGlobalEnvProbe1 = attenuation;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            // Regular and ambient lights
-            else
-            {
-                const float sqrt_2 = 1.414214f;  // Scale for cone so that it's base encloses a pyramid base
-
-                const bool ambientLight = (lightListIdx == 1);
-
-                lightCullInfo.volumeType = vfInternal::tlVolumeSphere;
-                lightShadeInfo.lightType = ambientLight ? vfInternal::tlTypeAmbientPoint : vfInternal::tlTypeRegularPoint;
-                lightCullInfo.miscFlag = 0;
-
-                if (!ambientLight)
-                {
-                    lightShadeInfo.attenuationParams.x = max(lightShadeInfo.attenuationParams.x, minBulbSize);
-
-                    // Adjust light intensity so that the intended brightness is reached 1 meter from the light's surface
-                    // Solve I * 1 / (1 + d/lightsize)^2 = 1
-                    float intensityMul = 1.0f + 1.0f / lightShadeInfo.attenuationParams.x;
-                    intensityMul *= intensityMul;
-                    lightShadeInfo.color.x *= intensityMul;
-                    lightShadeInfo.color.y *= intensityMul;
-                    lightShadeInfo.color.z *= intensityMul;
-                }
-
-                // Handle projectors
-                if (renderLight.m_Flags & DLF_PROJECT)
-                {
-                    lightCullInfo.volumeType = vfInternal::tlVolumeCone;
-                    lightShadeInfo.lightType = ambientLight ? vfInternal::tlTypeAmbientProjector : vfInternal::tlTypeRegularProjector;
-                    lightShadeInfo.resIndex = 0xFFFFFFFF;
-                    lightCullInfo.miscFlag = 0;
-
-                    int arrayIndex = tdsh.InsertTextureToSpotTexAtlas((CTexture*)renderLight.m_pLightImage, -1);
-                    if (arrayIndex >= 0)
-                    {
-                        lightShadeInfo.resIndex = (uint32)arrayIndex;
-                    }
-                    else
-                    {
-                        continue;  // Skip light
-                    }
-                    // Prevent culling errors for frustums with large FOVs by slightly enlarging the frustum
-                    const float frustumAngleDelta = renderLight.m_fLightFrustumAngle > 50 ? 7.5f : 0.0f;
-
-                    Matrix34 objMat = renderLight.m_ObjMatrix;
-                    objMat.m03 = objMat.m13 = objMat.m23 = 0;  // Remove translation
-                    Vec3 lightDir = objMat * Vec3(-1, 0, 0);
-                    lightCullInfo.volumeParams0 = Vec4(lightDir.x, lightDir.y, lightDir.z, 0) * matView;
-                    lightCullInfo.volumeParams0.w = renderLight.m_fRadius * tanf(DEG2RAD(min(renderLight.m_fLightFrustumAngle + frustumAngleDelta, 89.9f))) * sqrt_2;
-
-                    Vec3 coneTip = Vec3(lightCullInfo.posRad.x, lightCullInfo.posRad.y, lightCullInfo.posRad.z);
-                    Vec3 coneDir = Vec3(-lightCullInfo.volumeParams0.x, -lightCullInfo.volumeParams0.y, -lightCullInfo.volumeParams0.z);
-                    AABB coneBounds = AABB::CreateAABBfromCone(Cone(coneTip, coneDir, renderLight.m_fRadius, lightCullInfo.volumeParams0.w));
-                    lightCullInfo.depthBounds = Vec2(coneBounds.min.z, coneBounds.max.z);
-
-                    Matrix44A projMatT;
-                    CShadowUtils::GetProjectiveTexGen(&renderLight, 0, &projMatT);
-
-                    // Translate into camera space
-                    projMatT.Transpose();
-                    const Vec4 vEye(rd->GetViewParameters().vOrigin, 0.0f);
-                    Vec4 vecTranslation(vEye.Dot((Vec4&)projMatT.m00), vEye.Dot((Vec4&)projMatT.m10), vEye.Dot((Vec4&)projMatT.m20), vEye.Dot((Vec4&)projMatT.m30));
-                    projMatT.m03 += vecTranslation.x;
-                    projMatT.m13 += vecTranslation.y;
-                    projMatT.m23 += vecTranslation.z;
-                    projMatT.m33 += vecTranslation.w;
-
-                    lightShadeInfo.projectorMatrix = projMatT;
-                }
-
-                // Handle rectangular area lights
-                if (areaLightRect)
-                {
-                    lightCullInfo.volumeType = vfInternal::tlVolumeOBB;
-                    lightShadeInfo.lightType = ambientLight ? vfInternal::tlTypeAmbientArea : vfInternal::tlTypeRegularArea;
-                    lightCullInfo.miscFlag = 0;
-
-                    float expensionRadius = renderLight.m_fRadius * 1.08f;
-                    Vec3 scale(expensionRadius, expensionRadius, expensionRadius);
-                    Matrix34 areaLightMat = CShadowUtils::GetAreaLightMatrix(&renderLight, scale);
-
-                    Vec4 u0 = Vec4(areaLightMat.GetColumn0().GetNormalized(), 0) * matView;
-                    Vec4 u1 = Vec4(areaLightMat.GetColumn1().GetNormalized(), 0) * matView;
-                    Vec4 u2 = Vec4(areaLightMat.GetColumn2().GetNormalized(), 0) * matView;
-                    lightCullInfo.volumeParams0 = Vec4(u0.x, u0.y, u0.z, areaLightMat.GetColumn0().GetLength() * 0.5f);
-                    lightCullInfo.volumeParams1 = Vec4(u1.x, u1.y, u1.z, areaLightMat.GetColumn1().GetLength() * 0.5f);
-                    lightCullInfo.volumeParams2 = Vec4(u2.x, u2.y, u2.z, areaLightMat.GetColumn2().GetLength() * 0.5f);
-
-                    float volumeExtent = renderLight.m_fRadius + max(renderLight.m_fAreaWidth, renderLight.m_fAreaHeight);
-                    lightCullInfo.depthBounds = Vec2(posVS.z - volumeExtent, posVS.z + volumeExtent);
-
-                    float areaFov = renderLight.m_fLightFrustumAngle * 2.0f;
-                    if (renderLight.m_Flags & DLF_CASTSHADOW_MAPS)
-                    {
-                        areaFov = min(areaFov, 135.0f); // Shadow can only cover ~135 degree FOV without looking bad, so we clamp the FOV to hide shadow clipping
-                    }
-                    const float cosAngle = cosf(areaFov * (gf_PI / 360.0f));
-
-                    Matrix44 areaLightParams;
-                    areaLightParams.SetRow4(0, Vec4(renderLight.m_ObjMatrix.GetColumn0().GetNormalized(), 1.0f));
-                    areaLightParams.SetRow4(1, Vec4(renderLight.m_ObjMatrix.GetColumn1().GetNormalized(), 1.0f));
-                    areaLightParams.SetRow4(2, Vec4(renderLight.m_ObjMatrix.GetColumn2().GetNormalized(), 1.0f));
-                    areaLightParams.SetRow4(3, Vec4(renderLight.m_fAreaWidth * 0.5f, renderLight.m_fAreaHeight * 0.5f, 0, cosAngle));
-
-                    lightShadeInfo.projectorMatrix = areaLightParams;
-                }
-
-                // Handle shadow casters
-                if (!ambientLight && lightIdx >= firstShadowLight && lightIdx < curShadowPoolLight)
-                {
-                    int numDLights = rd->m_RP.m_DLights[nThreadID][nRecurseLevel].size();
-                    int frustumIdx = lightIdx + numDLights;
-                    int startIdx = SRendItem::m_StartFrust[nThreadID][frustumIdx];
-                    int endIdx = SRendItem::m_EndFrust[nThreadID][frustumIdx];
-
-                    if (endIdx > startIdx && nRecurseLevel < (int)rd->m_RP.m_SMFrustums[nThreadID]->size())
-                    {
-                        ShadowMapFrustum& firstFrustum = rd->m_RP.m_SMFrustums[nThreadID][nRecurseLevel][startIdx];
-                        assert (firstFrustum.bUseShadowsPool);
-
-                        int numSides = firstFrustum.bOmniDirectionalShadow ? 6 : 1;
-                        float kernelSize = firstFrustum.bOmniDirectionalShadow ? 2.5f : 1.5f;
-
-                        if (numTileLights + numSides > vfInternal::MaxNumTileLights)
-                        {
-                            continue;  // Skip light
-                        }
-                        static ICVar* pShadowAtlasResCVar = iConsole->GetCVar("e_ShadowsPoolSize");
-                        const Vec2 shadowParams = Vec2(kernelSize * ((float)firstFrustum.nTexSize / (float)pShadowAtlasResCVar->GetIVal()), firstFrustum.fDepthConstBias);
-
-                        const Vec3 cubeDirs[6] = { Vec3(-1, 0, 0), Vec3(1, 0, 0), Vec3(0, -1, 0), Vec3(0, 1, 0), Vec3(0, 0, -1), Vec3(0, 0, 1) };
-
-                        for (int side = 0; side < numSides; ++side)
-                        {
-                            rd->ConfigShadowTexgen(0, &firstFrustum, side);
-                            Matrix44A shadowMat = rd->m_TempMatrices[0][0];
-
-                            // Translate into camera space
-                            const Vec4 vEye(rd->GetViewParameters().vOrigin, 0.0f);
-                            Vec4 vecTranslation(vEye.Dot((Vec4&)shadowMat.m00), vEye.Dot((Vec4&)shadowMat.m10), vEye.Dot((Vec4&)shadowMat.m20), vEye.Dot((Vec4&)shadowMat.m30));
-                            shadowMat.m03 += vecTranslation.x;
-                            shadowMat.m13 += vecTranslation.y;
-                            shadowMat.m23 += vecTranslation.z;
-                            shadowMat.m33 += vecTranslation.w;
-
-                            // Pre-multiply by inverse frustum far plane distance
-                            (Vec4&)shadowMat.m20 *= rd->m_cEF.m_TempVecs[2].x;
-
-                            Vec3 cubeDir = cubeDirs[side];
-                            Vec4 spotParamsVS = Vec4(cubeDir.x, cubeDir.y, cubeDir.z, 0) * matView;
-
-                            // slightly enlarge the frustum to prevent culling errors
-                            spotParamsVS.w = renderLight.m_fRadius * tanf(DEG2RAD(45.0f + 14.5f)) * sqrt_2;
-
-                            Vec3 coneTip = Vec3(lightCullInfo.posRad.x, lightCullInfo.posRad.y, lightCullInfo.posRad.z);
-                            Vec3 coneDir = Vec3(-spotParamsVS.x, -spotParamsVS.y, -spotParamsVS.z);
-                            AABB coneBounds = AABB::CreateAABBfromCone(Cone(coneTip, coneDir, renderLight.m_fRadius, spotParamsVS.w));
-                            Vec2 depthBoundsVS = Vec2(coneBounds.min.z, coneBounds.max.z);
-                            Vec2 sideShadowParams = (firstFrustum.nShadowGenMask & (1 << side)) ? shadowParams : Vec2(ZERO);
-
-                            if (side == 0)
-                            {
-                                lightShadeInfo.shadowParams = sideShadowParams;
-                                lightShadeInfo.shadowMatrix = shadowMat;
-                                lightShadeInfo.shadowChannelIndex = Vec4(
-                                        renderLight.m_ShadowChanMask % 4 == 0,
-                                        renderLight.m_ShadowChanMask % 4 == 1,
-                                        renderLight.m_ShadowChanMask % 4 == 2,
-                                        renderLight.m_ShadowChanMask % 4 == 3
-                                        );
-                                lightShadeInfo.shadowMaskIndex = renderLight.m_ShadowMaskIndex;
-
-                                if (numSides > 1)
-                                {
-                                    lightCullInfo.volumeType = vfInternal::tlVolumeCone;
-                                    lightShadeInfo.lightType = vfInternal::tlTypeRegularPointFace;
-                                    lightShadeInfo.resIndex = side;
-                                    lightCullInfo.volumeParams0 = spotParamsVS;
-                                    lightCullInfo.depthBounds = depthBoundsVS;
-                                    lightCullInfo.miscFlag = 0;
-                                }
-                            }
-                            else
-                            {
-                                // Split point light
-                                ++numTileLights;
-                                tileLightsCull[numTileLights] = lightCullInfo;
-                                tileLightsShade[numTileLights] = lightShadeInfo;
-                                tileLightsShade[numTileLights].shadowParams = sideShadowParams;
-                                tileLightsShade[numTileLights].shadowMatrix = shadowMat;
-                                tileLightsShade[numTileLights].resIndex = side;
-                                tileLightsCull[numTileLights].volumeParams0 = spotParamsVS;
-                                tileLightsCull[numTileLights].depthBounds = depthBoundsVS;
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Add current light
-            ++numTileLights;
-            ++numValidRenderLights;
-        }
-    }
-
-    // Invalidate last light in case it got skipped
-    if (numTileLights < vfInternal::MaxNumTileLights)
-    {
-        ZeroMemory(&tileLightsCull[numTileLights], sizeof(vfInternal::SVolumeLightCullInfo));
-        ZeroMemory(&tileLightsShade[numTileLights], sizeof(vfInternal::SVolumeLightShadeInfo));
-    }
-
-    // Update light buffer
-    m_lightCullInfoBuf.UpdateBufferContent(tileLightsCull, sizeof(vfInternal::SVolumeLightCullInfo) * vfInternal::MaxNumTileLights);
-    m_LightShadeInfoBuf.UpdateBufferContent(tileLightsShade, sizeof(vfInternal::SVolumeLightShadeInfo) * vfInternal::MaxNumTileLights);
-
-    m_numTileLights = numTileLights;
-
-    // Update global env probes for analytical volumetric fog
-    {
-        I3DEngine* pEng = gEnv->p3DEngine;
-        Vec3 fogAlbedo(0.0f, 0.0f, 0.0f);
-        pEng->GetGlobalParameter(E3DPARAM_VOLFOG2_COLOR, fogAlbedo);
-        colorGlobalEnvProbe0 = colorGlobalEnvProbe0.CompMul(fogAlbedo);
-        colorGlobalEnvProbe1 = colorGlobalEnvProbe1.CompMul(fogAlbedo);
-        m_globalEnvProbeParam0 = Vec4(colorGlobalEnvProbe0, attenuationGlobalEnvProbe0);
-        m_globalEnvProbeParam1 = Vec4(colorGlobalEnvProbe1, attenuationGlobalEnvProbe1);
-
-        SAFE_RELEASE(m_globalEnvProveTex0);
-        SAFE_RELEASE(m_globalEnvProveTex1);
-        if (texGlobalEnvProbe0)
-        {
-            m_globalEnvProveTex0 = texGlobalEnvProbe0;
-            m_globalEnvProveTex0->AddRef();
-        }
-        if (texGlobalEnvProbe1)
-        {
-            m_globalEnvProveTex1 = texGlobalEnvProbe1;
-            m_globalEnvProveTex1->AddRef();
-        }
-    }
-}
-
-void CVolumetricFog::RenderVolumetricsToVolume(void (* RenderFunc)())
-{
-    if (!IsViable())
-    {
-        return;
-    }
-
-    AZ_TRACE_METHOD();
-
-    static const ICVar* pCVarFogVolumeInject = NULL;
-    if (!pCVarFogVolumeInject)
-    {
-        pCVarFogVolumeInject = gEnv->pConsole->GetCVar("e_FogVolumesTiledInjection");
-    }
-    bool bFogVolumeInjection = (pCVarFogVolumeInject && pCVarFogVolumeInject->GetIVal() != 0);
-
-    UpdateFrame();
-
-    RenderDownscaledShadowmap();
-
-    BuildLightListGrid();
-
-    RenderDownscaledDepth();
-
-    {
-        PROFILE_LABEL_SCOPE("INJECT_PARTICIPATING_MEDIA");
-
-        if (bFogVolumeInjection)
-        {
-            PrepareFogVolumeList();
-            InjectFogDensity();
-        }
-        else
-        {
-            InjectExponentialHeightFog();
-        }
-
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-        SRenderPipeline& rp(rd->m_RP);
-
-        // store state
-        int oldX, oldY;
-        int oldWidth, oldHeight;
-        rd->GetViewport(&oldX, &oldY, &oldWidth, &oldHeight);
-        const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-
-        if (!bFogVolumeInjection)
-        {
-            // clear s_ptexVolumetricFogDensityColor.
-            rd->FX_ClearTarget(CTexture::s_ptexVolumetricFogDensityColor, Clr_Transparent);
-        }
-
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexVolumetricFogDensityColor, NULL);
-        rd->FX_PushRenderTarget(1, CTexture::s_ptexVolumetricFogDensity, NULL);
-        rd->FX_SetActiveRenderTargets(false);
-
-        // Set the viewport.
-        int targetWidth = CTexture::s_ptexVolumetricFogDensity->GetWidth();
-        int targetHeight = CTexture::s_ptexVolumetricFogDensity->GetHeight();
-        rd->RT_SetViewport(0, 0, targetWidth, targetHeight);
-
-        // overwrite pipeline state.
-        const uint32 nOldForceStateAnd = rp.m_ForceStateAnd;
-        const uint32 nOldForceStateOr = rp.m_ForceStateOr;
-        rp.m_ForceStateAnd = GS_BLSRC_MASK | GS_BLDST_MASK | GS_DEPTHFUNC_MASK | GS_DEPTHWRITE | GS_NODEPTHTEST;
-        rp.m_ForceStateOr |= GS_BLSRC_ONE | GS_BLDST_ONE | GS_NODEPTHTEST;
-
-        // inject fog density and fog albedo into volume texture.
-        rd->FX_ProcessRenderList(EFSLIST_FOG_VOLUME, 0, RenderFunc, false);
-        rd->FX_ProcessRenderList(EFSLIST_FOG_VOLUME, 1, RenderFunc, false);
-
-        rd->FX_PopRenderTarget(0);
-        rd->FX_PopRenderTarget(1);
-        rd->FX_SetActiveRenderTargets(false);
-
-        // restore pipeline state.
-        rp.m_ForceStateAnd = nOldForceStateAnd;
-        rp.m_ForceStateOr = nOldForceStateOr;
-        rd->RT_SetViewport(oldX, oldY, oldWidth, oldHeight);
-        rp.m_FlagsShader_RT = prevShaderRtFlags;
-        rd->FX_Commit();
-    }
-}
-
-void CVolumetricFog::RenderVolumetricFog()
-{
-    if (!IsViable())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("RENDER_VOLUMETRIC_FOG");
-
-    InjectInscatteringLight();
-
-    const int VolumetricFogBlurInscattering = 1;
-    if constexpr (VolumetricFogBlurInscattering > 0)
-    {
-        int maxBlurCount = VolumetricFogBlurInscattering;
-        maxBlurCount = maxBlurCount <= 4 ? maxBlurCount : 4;
-        for (int count = 0; count < maxBlurCount; ++count)
-        {
-#ifdef ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-            BlurInscatterVolume();
-#else
-            BlurDensityVolume();
-            BlurInscatterVolume();
-#endif
-        }
-    }
-
-    ReprojectVolume();
-
-    RaymarchVolumetricFog();
-}
-
-float CVolumetricFog::GetDepthIndex(float linearDepth) const
-{
-    const float raymarchStart = gcpRendD3D->GetViewParameters().fNear;
-    Vec3 volFogCtrlParams(0.0f, 0.0f, 0.0f);
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volFogCtrlParams);
-    const float raymarchDistance = (volFogCtrlParams.x > raymarchStart) ? (volFogCtrlParams.x - raymarchStart) : 0.0001f;
-    float d = powf(((linearDepth - raymarchStart) / raymarchDistance), (1.0f / 2.0f));
-    float maxIndex = static_cast<f32>(CTexture::s_ptexVolumetricFog ? CTexture::s_ptexVolumetricFog->GetDepth() : 1.0f);
-    d = (0.5f - d) / maxIndex + d;
-    return d;
-}
-
-bool CVolumetricFog::IsEnableInFrame() const
-{
-    bool v = CRenderer::CV_r_DeferredShadingTiled > 0
-        && CRenderer::CV_r_DeferredShadingTiled < 4
-        && CRenderer::CV_r_usezpass != 0
-        && CRenderer::CV_r_Unlit == 0
-        && CRenderer::CV_r_DeferredShadingDebug != 2
-        && CRenderer::CV_r_measureoverdraw == 0;
-
-    return v;
-}
-
-void CVolumetricFog::PushFogVolume(CREFogVolume* pFogVolume, const SRenderingPassInfo& passInfo)
-{
-    assert(pFogVolume != NULL);
-    if (pFogVolume == NULL)
-    {
-        return;
-    }
-
-    const uint32 nThreadID = gcpRendD3D->m_RP.m_nFillThreadID;
-    const uint32 nRecurseLevel = passInfo.GetRecursiveLevel();
-    const uint32 nVolumeType = pFogVolume->m_volumeType;
-
-    TArray<SFogVolumeInfo>& array = m_fogVolumeInfoArray[nThreadID][nRecurseLevel][nVolumeType];
-
-    if (array.size() >= vfInternal::MaxNumFogVolumes)
-    {
-        // TODO: show skipped FogVolume number on the screen.
-        return;
-    }
-
-    SFogVolumeInfo temp;
-    temp.m_center = pFogVolume->m_center;
-    temp.m_viewerInsideVolume = pFogVolume->m_viewerInsideVolume;
-    temp.m_affectsThisAreaOnly = pFogVolume->m_affectsThisAreaOnly;
-    temp.m_stencilRef = pFogVolume->m_stencilRef;
-    temp.m_volumeType = pFogVolume->m_volumeType;
-    temp.m_localAABB = pFogVolume->m_localAABB;
-    temp.m_matWSInv = pFogVolume->m_matWSInv;
-    temp.m_fogColor = pFogVolume->m_fogColor;
-    temp.m_globalDensity = pFogVolume->m_globalDensity;
-    temp.m_densityOffset = pFogVolume->m_densityOffset;
-    temp.m_softEdgesLerp = pFogVolume->m_softEdgesLerp;
-    temp.m_heightFallOffDirScaled = pFogVolume->m_heightFallOffDirScaled;
-    temp.m_heightFallOffBasePoint = pFogVolume->m_heightFallOffBasePoint;
-    temp.m_eyePosInOS = pFogVolume->m_eyePosInOS;
-    temp.m_rampParams = pFogVolume->m_rampParams;
-    temp.m_windOffset = pFogVolume->m_windOffset;
-    temp.m_noiseScale = pFogVolume->m_noiseScale;
-    temp.m_noiseFreq = pFogVolume->m_noiseFreq;
-    temp.m_noiseOffset = pFogVolume->m_noiseOffset;
-    temp.m_noiseElapsedTime = pFogVolume->m_noiseElapsedTime;
-    temp.m_scale = pFogVolume->m_scale;
-
-    array.Add(temp);
-}
-
-void CVolumetricFog::ClearFogVolumes()
-{
-    const uint32 nThreadID = gcpRendD3D->m_RP.m_nFillThreadID;
-    int32 nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-
-    if (0 <= nRecurseLevel && nRecurseLevel < MAX_REND_RECURSION_LEVELS)
-    {
-        for (uint32 i = 0; i < MaxNumFogVolumeType; ++i)
-        {
-            m_fogVolumeInfoArray[nThreadID][nRecurseLevel][i].SetUse(0);
-        }
-    }
-}
-
-void CVolumetricFog::ClearAllFogVolumes()
-{
-    for (int32 i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        for (int32 j = 0; j < MAX_REND_RECURSION_LEVELS; ++j)
-        {
-            for (uint32 k = 0; k < MaxNumFogVolumeType; ++k)
-            {
-                m_fogVolumeInfoArray[i][j][k].Free();
-            }
-        }
-    }
-}
-
-void CVolumetricFog::UpdateFrame()
-{
-    int frameID = gcpRendD3D->GetFrameID(false);
-    if (m_frameID != frameID)
-    {
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-        Matrix44 mViewProj = rd->m_ViewMatrix * rd->m_ProjMatrix;
-        Matrix44& mViewport = SD3DPostEffectsUtils::GetInstance().m_pScaleBias;
-
-        ++m_tick;
-        m_frameID = frameID;
-        m_viewProj[m_tick % MaxFrameNum] = mViewProj * mViewport;
-    }
-}
-
-bool CVolumetricFog::IsViable() const
-{
-    int nThreadID = gcpRendD3D->m_RP.m_nProcessThreadID;
-    int nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-
-    bool v = CD3D9Renderer::CV_r_VolumetricFog != 0     // IsEnableInFrame() and e_VolumetricFog are accumulated.
-        && gcpRendD3D->m_RP.m_TI[nThreadID].m_FS.m_bEnable
-        && nRecurseLevel == 0;
-
-    return v;
-}
-
-void CVolumetricFog::InjectInscatteringLight()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    SRenderPipeline& rp(rd->m_RP);
-    const int nThreadID = rp.m_nProcessThreadID;
-
-    // store state
-    const int32 prevState = rp.m_CurState;
-    const uint32 prevStateAnd = rp.m_StateAnd;
-    const uint32 prevStateOr = rp.m_StateOr;
-    const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-    const int prevPersFlags = rp.m_TI[nThreadID].m_PersFlags;
-
-
-    const uint32 nScreenWidth = m_InscatteringVolume->GetWidth();
-    const uint32 nScreenHeight = m_InscatteringVolume->GetHeight();
-    const uint32 volumeDepth = m_InscatteringVolume->GetDepth();
-
-    // calculate fog density and accumulate in-scattering lighting along view ray.
-    //PROFILE_LABEL_SCOPE( "INJECT_VOLUMETRIC_FOG_INSCATTERING" );
-
-    D3DShaderResourceView* pNullViews[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 8, 8);
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 16, 8);
-
-    D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-    // We are bypassing various texture shadow state caches by directly hitting the device manager for clearing texture slots here.
-    // CTexture::Apply can cache textures into CTexture::s_TexStages, which are not invalidated by the device manager and can lead CTexture to falsely believe
-    // a texture is still bound to the device when it has been cleared.
-    rd->RT_UnbindTMUs();
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-
-    rd->FX_SetupShadowsForFog();
-
-    const int nStaticShadowMapSlot = 3;
-    SetupStaticShadowMap(nStaticShadowMapSlot);
-
-    rd->GetTiledShading().BindForwardShadingResources(NULL, eHWSC_Compute);
-
-    //// set debug flag
-    //if(CRenderer::CV_r_VolumetricFogDebug == 1)
-    //{
-    //  rp.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG0];
-    //}
-    //else if(CRenderer::CV_r_VolumetricFogDebug == 2)
-    //{
-    //  rp.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG1];
-    //}
-    //else if(CRenderer::CV_r_VolumetricFogDebug == 3)
-    //{
-    //  rp.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG2];
-    //}
-    //else if(CRenderer::CV_r_VolumetricFogDebug == 4)
-    //{
-    //  rp.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG3];
-    //}
-
-    // set sampling quality
-    const uint64 quality  = g_HWSR_MaskBit[HWSR_SAMPLE4];
-    const uint64 quality1 = g_HWSR_MaskBit[HWSR_SAMPLE5];
-    rp.m_FlagsShader_RT &= ~(quality | quality1);
-    switch (CRenderer::CV_r_VolumetricFogSample)
-    {
-    case 1:
-        rp.m_FlagsShader_RT |= quality;
-        break;
-    case 2:
-        rp.m_FlagsShader_RT |= quality1;
-        break;
-    default:
-        break;
-    }
-
-    // set shadow quality
-    const uint64 shadowQuality  = g_HWSR_MaskBit[HWSR_LIGHTVOLUME0];
-    const uint64 shadowQuality1 = g_HWSR_MaskBit[HWSR_LIGHTVOLUME1];
-    rp.m_FlagsShader_RT &= ~(shadowQuality | shadowQuality1);
-    switch (CRenderer::CV_r_VolumetricFogShadow)
-    {
-    case 1:
-        rp.m_FlagsShader_RT |= shadowQuality;
-        break;
-    case 2:
-        rp.m_FlagsShader_RT |= shadowQuality1;
-        break;
-    case 3:
-        rp.m_FlagsShader_RT |= shadowQuality | shadowQuality1;
-        break;
-    default:
-        break;
-    }
-
-    // set downscaled sun shadow maps
-    const uint64 shadowMode0  = g_HWSR_MaskBit[HWSR_SAMPLE0];
-    const uint64 shadowMode1  = g_HWSR_MaskBit[HWSR_SAMPLE1];
-    rp.m_FlagsShader_RT &= ~(shadowMode0 | shadowMode1);
-    if (CRenderer::CV_r_VolumetricFogDownscaledSunShadow == 1)
-    {
-        // replace first and second cascades
-        rp.m_FlagsShader_RT |= (CRenderer::CV_r_ShadowsCache > 0) ? shadowMode0 | shadowMode1 : shadowMode0;
-    }
-    else if (CRenderer::CV_r_VolumetricFogDownscaledSunShadow != 0)
-    {
-        // replace first, second, and third cascades
-        rp.m_FlagsShader_RT |= shadowMode1;
-    }
-
-    static CCryNameTSCRC shaderName("InjectVolumetricInscattering");
-    SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETSTATES);
-
-    D3DUnorderedAccessView* pUAVs[1] = {
-        m_InscatteringVolume->GetDeviceUAV(),
-    };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-    if (CRenderer::CV_r_VolumetricFogDownscaledSunShadow != 0)
-    {
-        D3DShaderResourceView* pDSMs[3] = {
-            m_downscaledShadow[0]->GetShaderResourceView(),
-            m_downscaledShadow[1]->GetShaderResourceView(),
-            m_downscaledShadow[2] ? m_downscaledShadow[2]->GetShaderResourceView() : NULL,
-        };
-        int count = (CRenderer::CV_r_VolumetricFogDownscaledSunShadow == 1) ? 2 : 3;
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pDSMs, 5, count);
-    }
-
-#ifdef ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-    D3DShaderResourceView* pSRVs[7] = {
-        m_lightGridBuf.GetShaderResourceView(),
-        m_lightCountBuf.GetShaderResourceView(),
-        m_MaxDepth->GetShaderResourceView(),
-        CTexture::s_ptexVolumetricClipVolumeStencil->GetShaderResourceView(),
-        m_LightShadeInfoBuf.GetShaderResourceView(),
-        CTexture::s_ptexVolumetricFogDensityColor->GetShaderResourceView(),
-        CTexture::s_ptexVolumetricFogDensity->GetShaderResourceView(),
-    };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 8, 7);
-#else
-    D3DShaderResourceView* pSRVs[6] = {
-        m_lightGridBuf.GetShaderResourceView(),
-        m_lightCountBuf.GetShaderResourceView(),
-        m_MaxDepth->GetShaderResourceView(),
-        CTexture::s_ptexVolumetricClipVolumeStencil->GetShaderResourceView(),
-        m_LightShadeInfoBuf.GetShaderResourceView(),
-        CTexture::s_ptexVolumetricFogDensityColor->GetShaderResourceView(),
-    };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 8, 6);
-#endif
-
-    //D3DSamplerState *pSamplers[2] = {
-    //  (D3DSamplerState *)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState,
-    //  (D3DSamplerState *)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-    //};
-    //rd->m_DevMan.BindSampler( eHWSC_Compute, pSamplers, 0, 2 );
-
-    static CCryNameR paramScreenSize("ScreenSize");
-    float fScreenWidth = (float)nScreenWidth;
-    float fScreenHeight = (float)nScreenHeight;
-    Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-    SD3DPostEffectsUtils::UpdateFrustumCorners();
-    static CCryNameR paramFrustumTL("FrustumTL");
-    Vec4 vParamFrustumTL(SD3DPostEffectsUtils::m_vLT.x, SD3DPostEffectsUtils::m_vLT.y, SD3DPostEffectsUtils::m_vLT.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTL, &vParamFrustumTL, 1);
-    static CCryNameR paramFrustumTR("FrustumTR");
-    Vec4 vParamFrustumTR(SD3DPostEffectsUtils::m_vRT.x, SD3DPostEffectsUtils::m_vRT.y, SD3DPostEffectsUtils::m_vRT.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTR, &vParamFrustumTR, 1);
-    static CCryNameR paramFrustumBL("FrustumBL");
-    Vec4 vParamFrustumBL(SD3DPostEffectsUtils::m_vLB.x, SD3DPostEffectsUtils::m_vLB.y, SD3DPostEffectsUtils::m_vLB.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumBL, &vParamFrustumBL, 1);
-
-    float octave = (CRenderer::CV_r_VolumetricFogReprojectionBlendFactor > 0.0f) ? -1.7f : 0.0f;
-    Vec3 sunDir = gEnv->p3DEngine->GetSunDirNormalized();
-    static CCryNameR paramSunDir("SunDir");
-    Vec4 vParamSunDir(sunDir.x, sunDir.y, sunDir.z, octave);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramSunDir, &vParamSunDir, 1);
-
-    Vec3 sunColor;
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SUN_COLOR, sunColor);
-    static CCryNameR paramSunColor("SunColor");
-    Vec4 vParamSunColor(sunColor.x, sunColor.y, sunColor.z, 0.0f);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramSunColor, &vParamSunColor, 1);
-
-    Vec3 fogAlbedoColor;
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_COLOR, fogAlbedoColor);
-    static CCryNameR paramFogColor("ExponentialHeightFogColor");
-    Vec4 vParamFogColor(fogAlbedoColor.x, fogAlbedoColor.y, fogAlbedoColor.z, 0.0f);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFogColor, &vParamFogColor, 1);
-
-    Vec3 scatteringParam;
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_SCATTERING_PARAMS, scatteringParam);
-    static CCryNameR paramInjectInscattering("InjectInscatteringParams");
-    float k = scatteringParam.z;
-    bool bNegative = k < 0.0f ? true : false;
-    k = (abs(k) > 0.99999f) ? (bNegative ? -0.99999f : 0.99999f) : k;
-    Vec4 vParamInjectInscattering(k, 1.0f - k * k, 0.0f, 0.0f);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramInjectInscattering, &vParamInjectInscattering, 1);
-
-    const uint32 tileSizeX = 4;
-    const uint32 tileSizeY = 4;
-    const uint32 tileSizeZ = 4;
-    uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-    uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-    uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-    static CCryNameR paramDispatchSize("DispatchSize");
-    Vec4 vParamDispatchSize((float)dispatchSizeX, (float)dispatchSizeY, (float)dispatchSizeZ, 0.0f);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramDispatchSize, &vParamDispatchSize, 1);
-
-    rd->FX_Commit();
-
-    rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    rd->GetTiledShading().UnbindForwardShadingResources(eHWSC_Compute);
-
-
-    //D3DUAV* pUAVNull[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-    D3DShaderResourceView* pSRVNull[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 0, 8);
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 8, 8);
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 16, 8);
-    
-    // We are bypassing various texture shadow state caches by directly hitting the device manager for clearing texture slots here.
-    // CTexture::Apply can cache textures into CTexture::s_TexStages, which are not invalidated by the device manager and can lead CTexture to falsely believe
-    // a texture is still bound to the device when it has been cleared.
-    rd->RT_UnbindTMUs();
-
-    // restore state
-    rp.m_StateAnd = prevStateAnd;
-    rp.m_StateOr = prevStateOr;
-    rd->SetState(prevState);
-    rp.m_TI[nThreadID].m_PersFlags = prevPersFlags;
-    rp.m_FlagsShader_RT = prevShaderRtFlags;
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-void CVolumetricFog::BuildLightListGrid()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    SRenderPipeline& rp(rd->m_RP);
-    const int nThreadID = rp.m_nProcessThreadID;
-
-    // store state
-    const int32 prevState = rp.m_CurState;
-    const uint32 prevStateAnd = rp.m_StateAnd;
-    const uint32 prevStateOr = rp.m_StateOr;
-    const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-    const int prevPersFlags = rp.m_TI[nThreadID].m_PersFlags;
-
-
-    const uint32 nScreenWidth = m_InscatteringVolume->GetWidth();
-    const uint32 nScreenHeight = m_InscatteringVolume->GetHeight();
-    const uint32 volumeDepth = m_InscatteringVolume->GetDepth();
-
-    // calculate fog density and accumulate in-scattering lighting along view ray.
-    //PROFILE_LABEL_SCOPE( "BUILD_VOLUMETRIC_FOG_CLUSTERED_LIGHT_GRID" );
-
-    D3DShaderResourceView* pNullViews[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 16, 8);
-
-    D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-    rd->FX_Commit();
-
-
-    static CCryNameTSCRC shaderName("BuildLightListGrid");
-    SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETSTATES);
-
-    D3DUnorderedAccessView* pUAVs[2] = {
-        m_lightGridBuf.GetUnorderedAccessView(),
-        m_lightCountBuf.GetUnorderedAccessView(),
-    };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 2);
-
-    D3DShaderResourceView* pSRV[1] = {
-        m_lightCullInfoBuf.GetShaderResourceView(),
-    };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRV, 0, 1);
-
-    static CCryNameR paramScreenSize("ScreenSize");
-    float fScreenWidth = (float)nScreenWidth;
-    float fScreenHeight = (float)nScreenHeight;
-    Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-    SD3DPostEffectsUtils::UpdateFrustumCorners();
-    static CCryNameR paramFrustumTL("FrustumTL");
-    Vec4 vParamFrustumTL(SD3DPostEffectsUtils::m_vLT.x, SD3DPostEffectsUtils::m_vLT.y, SD3DPostEffectsUtils::m_vLT.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTL, &vParamFrustumTL, 1);
-    static CCryNameR paramFrustumTR("FrustumTR");
-    Vec4 vParamFrustumTR(SD3DPostEffectsUtils::m_vRT.x, SD3DPostEffectsUtils::m_vRT.y, SD3DPostEffectsUtils::m_vRT.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTR, &vParamFrustumTR, 1);
-    static CCryNameR paramFrustumBL("FrustumBL");
-    Vec4 vParamFrustumBL(SD3DPostEffectsUtils::m_vLB.x, SD3DPostEffectsUtils::m_vLB.y, SD3DPostEffectsUtils::m_vLB.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumBL, &vParamFrustumBL, 1);
-
-    const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-    float yfov, xfov, aspect, ndist, fdist;
-    rc.GetPerspectiveParams(&yfov, &xfov, &aspect, &ndist, &fdist);
-    static CCryNameR paramNameScreenInfo("ScreenInfo");
-    Vec4 screenInfo(ndist, fdist, 0.0f, (float)volumeDepth);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramNameScreenInfo, &screenInfo, 1);
-
-    static CCryNameR paramProj("ProjParams");
-    Vec4 vParamProj(rd->m_ProjMatrix.m00, rd->m_ProjMatrix.m11, rd->m_ProjMatrix.m20, rd->m_ProjMatrix.m21);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramProj, &vParamProj, 1);
-
-    uint32 numTileLights = m_numTileLights;
-
-    const uint32 tileSizeX = 4;
-    const uint32 tileSizeY = 4;
-    const uint32 tileSizeZ = 4;
-    uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-    uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-    uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-    static CCryNameR paramDispatchSize("DispatchSize");
-    Vec4 vParamDispatchSize((float)dispatchSizeX, (float)dispatchSizeY, (float)dispatchSizeZ, (float)numTileLights);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramDispatchSize, &vParamDispatchSize, 1);
-
-    rd->FX_Commit();
-
-    rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-
-    //D3DUAV* pUAVNull[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-    D3DShaderResourceView* pSRVNull[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 0, 1);
-
-    //D3DSamplerState* pSampNull[2] = { NULL };
-    //rd->m_DevMan.BindSampler( eHWSC_Compute, pSampNull, 0, 2 );
-
-    // restore state
-    rp.m_StateAnd = prevStateAnd;
-    rp.m_StateOr = prevStateOr;
-    rd->SetState(prevState);
-    rp.m_TI[nThreadID].m_PersFlags = prevPersFlags;
-    rp.m_FlagsShader_RT = prevShaderRtFlags;
-
-    rd->FX_Commit();
-}
-
-void CVolumetricFog::RaymarchVolumetricFog()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    // Unbind the VolumetricFog SRV (used in the recursive pass). It gets 
-    // implicitly unbound when used as a UAV. Without explicitly calling 
-    // Unbind(), it may not get re-bound as an SRV for future shaders.
-    CTexture::s_ptexVolumetricFog->Unbind();
-
-    // store state
-    SRenderPipeline& rp(rd->m_RP);
-    const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-
-    const uint32 nScreenWidth = CTexture::s_ptexVolumetricFogDensity->GetWidth();
-    const uint32 nScreenHeight = CTexture::s_ptexVolumetricFogDensity->GetHeight();
-    const uint32 volumeDepth = CTexture::s_ptexVolumetricFogDensity->GetDepth();
-
-    //PROFILE_LABEL_SCOPE( "RAYMARCH_VOLUMETRIC_FOG" );
-
-    // accumulate in-scattering lighting along view ray.
-    static CCryNameTSCRC shaderName("RaymarchVolumetricFog");
-    SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    D3DUnorderedAccessView* pUAVs[1] = {
-        CTexture::s_ptexVolumetricFog->GetDeviceUAV(),
-    };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-#ifdef ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-    D3DShaderResourceView* pSRVs[1] = {
-        (GetInscatterTex()->GetShaderResourceView()),
-    };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 1);
-#else
-    D3DShaderResourceView* pSRVs[2] = {
-        (GetInscatterTex()->GetShaderResourceView()),
-        (GetDensityTex()->GetShaderResourceView()),
-    };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 2);
-#endif
-
-    //D3DSamplerState *pSamplers[2] = {
-    //  (D3DSamplerState *)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState,
-    //  (D3DSamplerState *)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-    //};
-    //rd->m_DevMan.BindSampler( eHWSC_Compute, pSamplers, 0, 2 );
-
-    static CCryNameR paramScreenSize("ScreenSize");
-    float fScreenWidth = (float)nScreenWidth;
-    float fScreenHeight = (float)nScreenHeight;
-    Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-    SD3DPostEffectsUtils::UpdateFrustumCorners();
-    static CCryNameR paramFrustumTL("FrustumTL");
-    Vec4 vParamFrustumTL(SD3DPostEffectsUtils::m_vLT.x, SD3DPostEffectsUtils::m_vLT.y, SD3DPostEffectsUtils::m_vLT.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTL, &vParamFrustumTL, 1);
-    static CCryNameR paramFrustumTR("FrustumTR");
-    Vec4 vParamFrustumTR(SD3DPostEffectsUtils::m_vRT.x, SD3DPostEffectsUtils::m_vRT.y, SD3DPostEffectsUtils::m_vRT.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTR, &vParamFrustumTR, 1);
-    static CCryNameR paramFrustumBL("FrustumBL");
-    Vec4 vParamFrustumBL(SD3DPostEffectsUtils::m_vLB.x, SD3DPostEffectsUtils::m_vLB.y, SD3DPostEffectsUtils::m_vLB.z, 0);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumBL, &vParamFrustumBL, 1);
-
-    const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-    float yfov, xfov, aspect, ndist, fdist;
-    rc.GetPerspectiveParams(&yfov, &xfov, &aspect, &ndist, &fdist);
-    static CCryNameR paramNameScreenInfo("ScreenInfo");
-    Vec4 screenInfo(ndist, fdist, 0.0f, (float)volumeDepth);
-    CShaderMan::s_shDeferredShading->FXSetCSFloat(paramNameScreenInfo, &screenInfo, 1);
-
-    rd->FX_Commit();
-
-    const uint32 tileSizeX = 8;
-    const uint32 tileSizeY = 8;
-    uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-    uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-    rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-
-    D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-    D3DShaderResourceView* pSRVNull[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 0, 2);
-
-    D3DSamplerState* pSampNull[2] = { NULL };
-    rd->m_DevMan.BindSampler(eHWSC_Compute, pSampNull, 0, 2);
-
-    // restore state
-    rp.m_FlagsShader_RT = prevShaderRtFlags;
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-void CVolumetricFog::BlurInscatterVolume()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    const uint32 nScreenWidth = m_InscatteringVolume->GetWidth();
-    const uint32 nScreenHeight = m_InscatteringVolume->GetHeight();
-    const uint32 volumeDepth = m_InscatteringVolume->GetDepth();
-
-    // blur inscattering volume texture for removing jittering noise.
-    //PROFILE_LABEL_SCOPE( "VOLUMETRIC_FOG_BLUR" );
-
-    {
-        static CCryNameTSCRC shaderNameHorizontal("BlurHorizontalInscatteringVolume");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderNameHorizontal, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(GetInscatterTex()->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DShaderResourceView* pSRVs[2] = {
-            m_InscatteringVolume->GetShaderResourceView(),
-            m_MaxDepth->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 2);
-
-        D3DSamplerState* pSamplers[1] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-        float yfov, xfov, aspect, ndist, fdist;
-        rc.GetPerspectiveParams(&yfov, &xfov, &aspect, &ndist, &fdist);
-        static CCryNameR paramNameScreenInfo("ScreenInfo");
-        Vec4 screenInfo(ndist, fdist, 0.0f, (float)volumeDepth);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramNameScreenInfo, &screenInfo, 1);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 8;
-        const uint32 tileSizeY = 8;
-        const uint32 tileSizeZ = 1;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    {
-        D3DShaderResourceView* pNullViews[8] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-
-        D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-        rd->FX_Commit();
-        rd->m_DevMan.CommitDeviceStates();
-    }
-
-    {
-        static CCryNameTSCRC shaderNameVertical("BlurVerticalInscatteringVolume");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderNameVertical, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(m_InscatteringVolume->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DShaderResourceView* pSRVs[2] = {
-            (GetInscatterTex()->GetShaderResourceView()),
-            m_MaxDepth->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 2);
-
-        D3DSamplerState* pSamplers[1] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-        float yfov, xfov, aspect, ndist, fdist;
-        rc.GetPerspectiveParams(&yfov, &xfov, &aspect, &ndist, &fdist);
-        static CCryNameR paramNameScreenInfo("ScreenInfo");
-        Vec4 screenInfo(ndist, fdist, 0.0f, (float)volumeDepth);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramNameScreenInfo, &screenInfo, 1);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 8;
-        const uint32 tileSizeY = 8;
-        const uint32 tileSizeZ = 1;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    D3DUnorderedAccessView* pUAVNull4[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull4, NULL, 0, 4);
-
-    D3DShaderResourceView* pNullViews[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-
-    D3DSamplerState* pSampNull[2] = { NULL };
-    rd->m_DevMan.BindSampler(eHWSC_Compute, pSampNull, 0, 2);
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-void CVolumetricFog::BlurDensityVolume()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    const uint32 nScreenWidth = CTexture::s_ptexVolumetricFogDensity->GetWidth();
-    const uint32 nScreenHeight = CTexture::s_ptexVolumetricFogDensity->GetHeight();
-    const uint32 volumeDepth = CTexture::s_ptexVolumetricFogDensity->GetDepth();
-
-    // blur density volume texture for removing jitter noise.
-    //PROFILE_LABEL_SCOPE( "VOLUMETRIC_FOG_BLUR_DENSITY" );
-
-    {
-        D3DShaderResourceView* pNullViews[8] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-
-        D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-        rd->FX_Commit();
-        rd->m_DevMan.CommitDeviceStates();
-    }
-
-    {
-        static CCryNameTSCRC shaderNameHorizontal("BlurHorizontalDensityVolume");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderNameHorizontal, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(GetDensityTex()->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DShaderResourceView* pSRVs[2] = {
-            CTexture::s_ptexVolumetricFogDensity->GetShaderResourceView(),
-            m_MaxDepth->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 2);
-
-        D3DSamplerState* pSamplers[1] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-        float yfov, xfov, aspect, ndist, fdist;
-        rc.GetPerspectiveParams(&yfov, &xfov, &aspect, &ndist, &fdist);
-        static CCryNameR paramNameScreenInfo("ScreenInfo");
-        Vec4 screenInfo(ndist, fdist, 0.0f, (float)volumeDepth);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramNameScreenInfo, &screenInfo, 1);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 8;
-        const uint32 tileSizeY = 8;
-        const uint32 tileSizeZ = 1;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    {
-        D3DShaderResourceView* pNullViews[8] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-
-        D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-        rd->FX_Commit();
-        rd->m_DevMan.CommitDeviceStates();
-    }
-
-    {
-        static CCryNameTSCRC shaderNameVertical("BlurVerticalDensityVolume");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderNameVertical, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(CTexture::s_ptexVolumetricFogDensity->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DShaderResourceView* pSRVs[2] = {
-            (GetDensityTex()->GetShaderResourceView()),
-            m_MaxDepth->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 2);
-
-        D3DSamplerState* pSamplers[1] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-        float yfov, xfov, aspect, ndist, fdist;
-        rc.GetPerspectiveParams(&yfov, &xfov, &aspect, &ndist, &fdist);
-        static CCryNameR paramNameScreenInfo("ScreenInfo");
-        Vec4 screenInfo(ndist, fdist, 0.0f, (float)volumeDepth);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramNameScreenInfo, &screenInfo, 1);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 8;
-        const uint32 tileSizeY = 8;
-        const uint32 tileSizeZ = 1;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    D3DUnorderedAccessView* pUAVNull4[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull4, NULL, 0, 4);
-
-    D3DShaderResourceView* pNullViews[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-
-    D3DSamplerState* pSampNull[2] = { NULL };
-    rd->m_DevMan.BindSampler(eHWSC_Compute, pSampNull, 0, 2);
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-void CVolumetricFog::ReprojectVolume()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    // store state
-    SRenderPipeline& rp(rd->m_RP);
-    const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-
-    const uint32 nScreenWidth = m_InscatteringVolume->GetWidth();
-    const uint32 nScreenHeight = m_InscatteringVolume->GetHeight();
-    const uint32 volumeDepth = m_InscatteringVolume->GetDepth();
-
-    //PROFILE_LABEL_SCOPE( "REPROJECT_VOLUMETRIC_FOG" );
-
-
-    // no reprojection in cleared frames
-    if (m_Cleared > 0)
-    {
-#ifdef ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-        rd->GetDeviceContext().CopyResource(GetPrevInscatterTex()->GetDevTexture()->GetVolumeTexture(),
-            m_InscatteringVolume->GetDevTexture()->GetVolumeTexture());
-#else
-        rd->GetDeviceContext().CopyResource(GetPrevInscatterTex()->GetDevTexture()->GetVolumeTexture(),
-            m_InscatteringVolume->GetDevTexture()->GetVolumeTexture());
-        rd->GetDeviceContext().CopyResource(GetPrevDensityTex()->GetDevTexture()->GetVolumeTexture(),
-            CTexture::s_ptexVolumetricFogDensity->GetDevTexture()->GetVolumeTexture());
-#endif
-    }
-
-
-    {
-        // set reprojection mode
-        if (CRenderer::CV_r_VolumetricFogReprojectionMode != 0)
-        {
-            rp.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-        }
-
-        // accumulate in-scattering lighting along view ray.
-        static CCryNameTSCRC shaderName("ReprojectVolumetricFog");
-        bool valid = SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-#ifdef ENABLE_VOLFOG_TEX_FORMAT_RGBA16F
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(GetInscatterTex()->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DShaderResourceView* pSRVs[3] = {
-            m_InscatteringVolume->GetShaderResourceView(),
-            (GetPrevInscatterTex()->GetShaderResourceView()),
-            m_MaxDepth->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 3);
-#else
-        D3DUnorderedAccessView* pUAVs[2] = {
-            static_cast<D3DUnorderedAccessView*>(GetInscatterTex()->GetDeviceUAV()),
-            static_cast<D3DUnorderedAccessView*>(GetDensityTex()->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 2);
-
-        D3DShaderResourceView* pSRVs[5] = {
-            m_InscatteringVolume->GetShaderResourceView(),
-            (GetPrevInscatterTex()->GetShaderResourceView()),
-            CTexture::s_ptexVolumetricFogDensity->GetShaderResourceView(),
-            (GetPrevDensityTex()->GetShaderResourceView()),
-            m_MaxDepth->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 5);
-#endif
-
-        D3DSamplerState* pSamplers[2] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 2);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        SD3DPostEffectsUtils::UpdateFrustumCorners();
-        static CCryNameR paramFrustumTL("FrustumTL");
-        Vec4 vParamFrustumTL(SD3DPostEffectsUtils::m_vLT.x, SD3DPostEffectsUtils::m_vLT.y, SD3DPostEffectsUtils::m_vLT.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTL, &vParamFrustumTL, 1);
-        static CCryNameR paramFrustumTR("FrustumTR");
-        Vec4 vParamFrustumTR(SD3DPostEffectsUtils::m_vRT.x, SD3DPostEffectsUtils::m_vRT.y, SD3DPostEffectsUtils::m_vRT.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTR, &vParamFrustumTR, 1);
-        static CCryNameR paramFrustumBL("FrustumBL");
-        Vec4 vParamFrustumBL(SD3DPostEffectsUtils::m_vLB.x, SD3DPostEffectsUtils::m_vLB.y, SD3DPostEffectsUtils::m_vLB.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumBL, &vParamFrustumBL, 1);
-
-        float reprojectionFactor = max(0.0f, min(1.0f, CRenderer::CV_r_VolumetricFogReprojectionBlendFactor));
-
-        const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-        float yfov, xfov, aspect, ndist, fdist;
-        rc.GetPerspectiveParams(&yfov, &xfov, &aspect, &ndist, &fdist);
-        static CCryNameR paramNameScreenInfo("ScreenInfo");
-        Vec4 screenInfo(ndist, fdist, reprojectionFactor, (float)volumeDepth);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramNameScreenInfo, &screenInfo, 1);
-
-        static CCryNameR param1("PrevViewProjMatrix");
-        Vec4* temp = (Vec4*)m_viewProj[max(m_tick - (int32)rd->GetActiveGPUCount(), 0) % MaxFrameNum].GetData();
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(param1, temp, 4);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 4;
-        const uint32 tileSizeY = 4;
-        const uint32 tileSizeZ = 4;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-        SD3DPostEffectsUtils::ShEndPass();
-
-        if (valid)
-        {
-            m_Cleared = (m_Cleared > 0) ? (m_Cleared - 1) : 0;
-        }
-    }
-
-
-    D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-    D3DShaderResourceView* pSRVNull[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVNull, 0, 5);
-
-    D3DSamplerState* pSampNull[2] = { NULL };
-    rd->m_DevMan.BindSampler(eHWSC_Compute, pSampNull, 0, 2);
-
-    // restore state
-    rp.m_FlagsShader_RT = prevShaderRtFlags;
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-CTexture* CVolumetricFog::GetInscatterTex() const
-{
-    return ((m_tick / gcpRendD3D->GetActiveGPUCount()) & 0x1) ? m_fogInscatteringVolume[0] : m_fogInscatteringVolume[1];
-}
-
-CTexture* CVolumetricFog::GetPrevInscatterTex() const
-{
-    return ((m_tick / gcpRendD3D->GetActiveGPUCount()) & 0x1) ? m_fogInscatteringVolume[1] : m_fogInscatteringVolume[0];
-}
-
-CTexture* CVolumetricFog::GetDensityTex() const
-{
-    return ((m_tick / gcpRendD3D->GetActiveGPUCount()) & 0x1) ? m_fogDensityVolume[0] : m_fogDensityVolume[1];
-}
-
-CTexture* CVolumetricFog::GetPrevDensityTex() const
-{
-    return ((m_tick / gcpRendD3D->GetActiveGPUCount()) & 0x1) ? m_fogDensityVolume[1] : m_fogDensityVolume[0];
-}
-
-void CVolumetricFog::RenderDownscaledDepth()
-{
-    //PROFILE_LABEL_SCOPE( "VOLUMETRIC_FOG_DOWNSCALED_DEPTH" );
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    {
-        static CCryNameTSCRC shaderName("StoreDownscaledMaxDepthHorizontal");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(m_MaxDepthTemp->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DShaderResourceView* pSRVs[1] = {
-            CTexture::s_ptexZTargetScaled->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 1);
-
-        D3DSamplerState* pSamplers[1] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 1);
-
-        int nScreenWidth = m_MaxDepthTemp->GetWidth();
-        int nScreenHeight = m_MaxDepthTemp->GetHeight();
-        int nSrcTexWidth = CTexture::s_ptexZTargetScaled->GetWidth();
-
-        static CCryNameR paramDispatchParams("maxDepthDispatchParams");
-        float destW = (float)nScreenWidth;
-        float srcW = (float)nSrcTexWidth;
-        Vec4 vParamDispatchParams((srcW / destW), (destW / srcW), 0.0f, 0.0f);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramDispatchParams, &vParamDispatchParams, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 8;
-        const uint32 tileSizeY = 8;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    {
-        D3DShaderResourceView* pNullViews[1] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 1);
-
-        D3DUnorderedAccessView* pUAVNull[1] = { NULL };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 1);
-
-        rd->FX_Commit();
-        rd->m_DevMan.CommitDeviceStates();
-    }
-
-    {
-        static CCryNameTSCRC shaderName("StoreDownscaledMaxDepthVertical");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(m_MaxDepth->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DShaderResourceView* pSRVs[1] = {
-            m_MaxDepthTemp->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 0, 1);
-
-        D3DSamplerState* pSamplers[1] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 1);
-
-        int nScreenWidth = m_MaxDepth->GetWidth();
-        int nScreenHeight = m_MaxDepth->GetHeight();
-        int nSrcTexWidth = m_MaxDepthTemp->GetWidth();
-
-        static CCryNameR paramDispatchParams("maxDepthDispatchParams");
-        float destW = (float)nScreenWidth;
-        float srcW = (float)nSrcTexWidth;
-        Vec4 vParamDispatchParams((srcW / destW), (destW / srcW), 0.0f, 0.0f);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramDispatchParams, &vParamDispatchParams, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 8;
-        const uint32 tileSizeY = 8;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, 1);
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    {
-        D3DUnorderedAccessView* pUAVNull[1] = { NULL };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 1);
-
-        D3DShaderResourceView* pNullViews[1] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 1);
-
-        D3DSamplerState* pSampNull[1] = { NULL };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSampNull, 0, 1);
-    }
-}
-
-void CVolumetricFog::ClearVolumeStencil()
-{
-    if (!IsViable())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("VOLUMETRIC_FOG_CLEAR_VOLUME_STENCIL");
-    gcpRendD3D->FX_ClearTarget((D3DDepthSurface*)CTexture::s_ptexVolumetricClipVolumeStencil->GetDeviceDepthStencilSurf(), CLEAR_STENCIL, Clr_Unused.r, 0);
-}
-
-void CVolumetricFog::RenderClipVolumeToVolumeStencil(int nClipAreaReservedStencilBit)
-{
-    if (!IsViable())
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("VOLUMETRIC_FOG_CLIPVOLUMES TO STENCIL");
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& rp(rd->m_RP);
-    const bool bReverseDepth = (rp.m_TI[rp.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-
-    int oldX, oldY;
-    int oldWidth, oldHeight;
-    rd->GetViewport(&oldX, &oldY, &oldWidth, &oldHeight);
-
-    // FOB_POINT_SPRITE prevents CD3D9Renderer::FX_SetVertexDeclaration function working correctly.
-    uint64 objFlags = rp.m_ObjFlags;
-    rp.m_ObjFlags &= ~FOB_POINT_SPRITE;
-
-    int targetWidth = CTexture::s_ptexVolumetricClipVolumeStencil->GetWidth();
-    int targetHeight = CTexture::s_ptexVolumetricClipVolumeStencil->GetHeight();
-    rd->RT_SetViewport(0, 0, targetWidth, targetHeight);
-
-    SDepthTexture D3dDepthSurface;
-    D3dDepthSurface.nWidth = targetWidth;
-    D3dDepthSurface.nHeight = targetHeight;
-    D3dDepthSurface.pSurf = nullptr;
-    D3dDepthSurface.pTex = nullptr;
-    D3dDepthSurface.pTarget = CTexture::s_ptexVolumetricClipVolumeStencil->GetDevTexture()->Get2DTexture();
-
-    int maxDepthCount = m_InscatteringVolume->GetDepth();
-    float a = 0.0f;
-    float b = 0.0f;
-    bool valid = true;
-    float d = (rp.m_TI[rp.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 1.0f : 0.0f;
-    float raymarchDistance = gRenDev->m_cEF.m_PF.m_VolumetricFogDistanceParams.w;
-
-    if (m_Destroyed > 0)
-    {
-        float fFar = rd->GetViewParameters().fFar;
-        float fNear = rd->GetViewParameters().fNear;
-        a = fFar / (fFar - fNear);
-        b = fNear * -a;
-
-        // store values to observe the change.
-        m_ReverseDepthMode = CRenderer::CV_r_ReverseDepth;
-        m_raymarchDistance = raymarchDistance;
-
-        rd->FX_ClearTarget((D3DDepthSurface*)CTexture::s_ptexVolumetricClipVolumeStencil->GetDeviceDepthStencilSurf(), CLEAR_ZBUFFER, Clr_FarPlane_R.r, 0);
-    }
-
-    for (int i = 0; i < maxDepthCount; ++i)
-    {
-        // set separate DSV.
-        D3dDepthSurface.pSurf = (D3DDepthSurface*)m_ClipVolumeDSVArray[i];
-        rd->FX_PushRenderTarget(0, (CTexture*)NULL, &D3dDepthSurface);
-
-        // clear depth when it's needed.
-        if (m_Destroyed > 0)
-        {
-            // write jittering depth.
-            static CCryNameTSCRC shaderName("StoreJitteringDepthToClipVolumeDepth");
-            bool result = GetUtils().ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            valid = valid && result;
-
-            rd->FX_SetState(GS_DEPTHWRITE);
-
-            static CCryNameR paramDepth("ParamDepth");
-            Vec4 vParamDepth((float)i, b, a, d);
-            CShaderMan::s_shDeferredShading->FXSetPSFloat(paramDepth, &vParamDepth, 1);
-
-            GetUtils().DrawFullScreenTri(targetWidth, targetHeight);
-
-            GetUtils().ShEndPass();
-        }
-
-        CDeferredShading& pDS = CDeferredShading::Instance();
-        pDS.RenderClipVolumesToStencil(nClipAreaReservedStencilBit);
-
-        rd->FX_PopRenderTarget(0);
-    }
-
-    if (valid)
-    {
-        m_Destroyed = (m_Destroyed > 0) ? (m_Destroyed - 1) : 0;
-
-        if (m_ReverseDepthMode != CRenderer::CV_r_ReverseDepth
-            || (0.2f < abs(m_raymarchDistance - raymarchDistance)))
-        {
-            // rewrite the depth if needed.
-            m_Destroyed = MaxFrameNum;
-        }
-    }
-
-    rd->RT_SetViewport(oldX, oldY, oldWidth, oldHeight);
-    rp.m_ObjFlags = objFlags;
-}
-
-void CVolumetricFog::InjectExponentialHeightFog()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& rp(rd->m_RP);
-    const int nThreadID = rp.m_nProcessThreadID;
-
-    // store state
-    const int32 prevState = rp.m_CurState;
-    const uint32 prevStateAnd = rp.m_StateAnd;
-    const uint32 prevStateOr = rp.m_StateOr;
-    const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-    const int prevPersFlags = rp.m_TI[nThreadID].m_PersFlags;
-
-
-    // inject atmospheric fog into density volume texture.
-    {
-        const uint32 nScreenWidth = CTexture::s_ptexVolumetricFogDensity->GetWidth();
-        const uint32 nScreenHeight = CTexture::s_ptexVolumetricFogDensity->GetHeight();
-        const uint32 volumeDepth = CTexture::s_ptexVolumetricFogDensity->GetDepth();
-
-        //PROFILE_LABEL_SCOPE( "INJECT_ATMOSPHERIC_FOG" );
-
-        D3DShaderResourceView* pNullViews[8] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-
-        D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-        rd->FX_Commit();
-        rd->m_DevMan.CommitDeviceStates();
-
-
-        rd->GetTiledShading().BindForwardShadingResources(NULL, eHWSC_Compute);
-
-        CShader* pShader = CShaderMan::s_shDeferredShading;
-
-        static CCryNameTSCRC shaderName("InjectExponentialHeightFog");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[1] = {
-            static_cast<D3DUnorderedAccessView*>(CTexture::s_ptexVolumetricFogDensity->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 1);
-
-        D3DSamplerState* pSamplers[1] = {
-            (D3DSamplerState*)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-        };
-        rd->m_DevMan.BindSampler(eHWSC_Compute, pSamplers, 0, 1);
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        pShader->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        SD3DPostEffectsUtils::UpdateFrustumCorners();
-        static CCryNameR paramFrustumTL("FrustumTL");
-        Vec4 vParamFrustumTL(SD3DPostEffectsUtils::m_vLT.x, SD3DPostEffectsUtils::m_vLT.y, SD3DPostEffectsUtils::m_vLT.z, 0);
-        pShader->FXSetCSFloat(paramFrustumTL, &vParamFrustumTL, 1);
-        static CCryNameR paramFrustumTR("FrustumTR");
-        Vec4 vParamFrustumTR(SD3DPostEffectsUtils::m_vRT.x, SD3DPostEffectsUtils::m_vRT.y, SD3DPostEffectsUtils::m_vRT.z, 0);
-        pShader->FXSetCSFloat(paramFrustumTR, &vParamFrustumTR, 1);
-        static CCryNameR paramFrustumBL("FrustumBL");
-        Vec4 vParamFrustumBL(SD3DPostEffectsUtils::m_vLB.x, SD3DPostEffectsUtils::m_vLB.y, SD3DPostEffectsUtils::m_vLB.z, 0);
-        pShader->FXSetCSFloat(paramFrustumBL, &vParamFrustumBL, 1);
-
-        static CCryNameR paramInjectExponentialHeightFogParams("InjectExponentialHeightFogParams");
-        Vec4 vInjectExponentialHeightFogParams((float)volumeDepth, 0.0f, 0.0f, 0.0f);
-        pShader->FXSetCSFloat(paramInjectExponentialHeightFogParams, &vInjectExponentialHeightFogParams, 1);
-
-        rd->FX_Commit();
-
-        const uint32 tileSizeX = 4;
-        const uint32 tileSizeY = 4;
-        const uint32 tileSizeZ = 4;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-        SD3DPostEffectsUtils::ShEndPass();
-
-        rd->GetTiledShading().UnbindForwardShadingResources(eHWSC_Compute);
-    }
-
-
-    D3DUnorderedAccessView* pUAVNull4[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull4, NULL, 0, 4);
-
-    D3DShaderResourceView* pNullViews[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-
-    D3DSamplerState* pSampNull[2] = { NULL };
-    rd->m_DevMan.BindSampler(eHWSC_Compute, pSampNull, 0, 2);
-
-    // restore state
-    rp.m_StateAnd = prevStateAnd;
-    rp.m_StateOr = prevStateOr;
-    rd->SetState(prevState);
-    rp.m_TI[nThreadID].m_PersFlags = prevPersFlags;
-    rp.m_FlagsShader_RT = prevShaderRtFlags;
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-void CVolumetricFog::PrepareFogVolumeList()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    int nThreadID = rd->m_RP.m_nProcessThreadID;
-    int nRecurseLevel = SRendItem::m_RecurseLevel[nThreadID];
-
-    // Prepare view matrix with flipped z-axis
-    Matrix44A matView = rd->m_ViewMatrix;
-    matView.m02 *= -1;
-    matView.m12 *= -1;
-    matView.m22 *= -1;
-    matView.m32 *= -1;
-
-    vfInternal::SFogVolumeCullInfo cullInfoArray[vfInternal::MaxNumFogVolumes];
-    vfInternal::SFogVolumeInjectInfo injectInfoArray[vfInternal::MaxNumFogVolumes];
-    uint32 numFogVol = 0;
-
-    Vec3 volumetricFogRaymarchEnd(0.0f, 0.0f, 0.0f);
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG2_CTRL_PARAMS, volumetricFogRaymarchEnd);
-    Vec3 cameraFront = rd->GetViewParameters().vZ;
-    cameraFront.Normalize();
-
-    Vec3 worldViewPos = rd->GetViewParameters().vOrigin;
-    AABB aabbInObj(1.0f);
-
-    for (uint32 type = 0; type < MaxNumFogVolumeType; ++type)
-    {
-        TArray<SFogVolumeInfo>& srcArray = m_fogVolumeInfoArray[nThreadID][nRecurseLevel][type];
-        uint num = srcArray.Num();
-        for (uint32 i = 0; i < num; ++i)
-        {
-            SFogVolumeInfo& fvol = srcArray[i];
-
-            // calculate depth bounds of FogVolume.
-            // reusing light depth bounds code from CDeferredShading::GetLightDepthBounds().
-            // This is not optimal for a box.
-            Matrix34 temp = fvol.m_matWSInv.GetInverted();
-            AABB aabbInWS = AABB::CreateTransformedAABB(temp, aabbInObj);
-            float fRadius = aabbInWS.GetRadius();
-            Vec3 pBounds = cameraFront * fRadius;
-            Vec3 pMin = fvol.m_center + pBounds;
-            float fMinW = rd->GetViewParameters().WorldToCamZ(pMin);
-            fMinW = max(-fMinW, 0.000001f);
-
-            // not needed to be injected when FogVolume is out of volume texture.
-            if (fMinW > volumetricFogRaymarchEnd.x)
-            {
-                continue;
-            }
-
-            vfInternal::SFogVolumeCullInfo& cullInfo = cullInfoArray[numFogVol];
-            vfInternal::SFogVolumeInjectInfo& injectInfo = injectInfoArray[numFogVol];
-
-            Vec4 posVS = Vec4(fvol.m_center, 1) * matView;
-            cullInfo.posRad = Vec4(posVS.x, posVS.y, posVS.z, fRadius);
-
-            Vec4 u0 = Vec4(temp.GetColumn0().GetNormalized(), 0) * matView;
-            Vec4 u1 = Vec4(temp.GetColumn1().GetNormalized(), 0) * matView;
-            Vec4 u2 = Vec4(temp.GetColumn2().GetNormalized(), 0) * matView;
-            Vec3 size = fvol.m_scale.CompMul(fvol.m_localAABB.GetSize() * 0.5f);
-            cullInfo.volumeParams0 = Vec4(u0.x, u0.y, u0.z, size.x);
-            cullInfo.volumeParams1 = Vec4(u1.x, u1.y, u1.z, size.y);
-            cullInfo.volumeParams2 = Vec4(u2.x, u2.y, u2.z, size.z);
-
-            uint32 nData = fvol.m_stencilRef + 1;// first ref value is reserved, see CDeferredShading::PrepareClipVolumeData function.
-            injectInfo.miscFlag = fvol.m_volumeType | ((nData & 0xFF) << 1) | (fvol.m_affectsThisAreaOnly << 9);
-
-            injectInfo.fogColor.x = fvol.m_fogColor.r;
-            injectInfo.fogColor.y = fvol.m_fogColor.g;
-            injectInfo.fogColor.z = fvol.m_fogColor.b;
-
-            float globalDensity = fvol.m_globalDensity * 0.1f;// scale density to volumetric fog.
-            injectInfo.globalDensity = globalDensity;
-
-            injectInfo.fogVolumePos = fvol.m_center;
-
-            injectInfo.heightFalloffBasePoint = fvol.m_heightFallOffBasePoint;
-
-            float softEdgeLerp = (fvol.m_softEdgesLerp.x > 0.0f) ? fvol.m_softEdgesLerp.x : 0.0001f;
-            injectInfo.invSoftEdgeLerp = 1.0f / softEdgeLerp;
-
-            const Vec3 cHeightFallOffDirScaledVec(fvol.m_heightFallOffDirScaled * 0.015625f);  // scale fall off ramp to volumetric fog.
-            injectInfo.heightFallOffDirScaled = cHeightFallOffDirScaledVec;
-
-            injectInfo.densityOffset = fvol.m_densityOffset;
-
-            float rampDist = fvol.m_rampParams.y - fvol.m_rampParams.x;
-            rampDist = rampDist < 0.1f ? 0.1f : rampDist;
-            float invRampDist = 1.0f / rampDist;
-            const Vec4 cRampParams(invRampDist, -fvol.m_rampParams.x * invRampDist, fvol.m_rampParams.z, -fvol.m_rampParams.z + 1.0f);
-            injectInfo.rampParams = cRampParams;
-
-            injectInfo.windOffset = fvol.m_windOffset;
-
-            injectInfo.noiseElapsedTime = fvol.m_noiseElapsedTime;
-
-            injectInfo.noiseSpatialFrequency = fvol.m_noiseFreq;
-
-            const float normalizeFactor = (1.0f / (1.0f + 0.5f));
-            injectInfo.noiseScale = fvol.m_noiseScale * normalizeFactor;
-
-            injectInfo.eyePosInOS = fvol.m_eyePosInOS;
-
-            injectInfo.noiseOffset = fvol.m_noiseOffset;
-
-            injectInfo.worldToObjMatrix = fvol.m_matWSInv;
-
-            ++numFogVol;
-        }
-    }
-
-    m_numFogVolumes = numFogVol;
-
-    m_fogVolumeCullInfoBuf.UpdateBufferContent(cullInfoArray, sizeof(vfInternal::SFogVolumeCullInfo) * vfInternal::MaxNumFogVolumes);
-    m_fogVolumeInjectInfoBuf.UpdateBufferContent(injectInfoArray, sizeof(vfInternal::SFogVolumeInjectInfo) * vfInternal::MaxNumFogVolumes);
-}
-
-void CVolumetricFog::InjectFogDensity()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& rp(rd->m_RP);
-    const int nThreadID = rp.m_nProcessThreadID;
-
-    // store state
-    const int32 prevState = rp.m_CurState;
-    const uint32 prevStateAnd = rp.m_StateAnd;
-    const uint32 prevStateOr = rp.m_StateOr;
-    const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-    const int prevPersFlags = rp.m_TI[nThreadID].m_PersFlags;
-
-    {
-        D3DShaderResourceView* pNullViews[8] = { NULL };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 8, 8);
-
-        D3DUnorderedAccessView* pUAVNull[4] = { NULL };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull, NULL, 0, 4);
-
-        rd->FX_Commit();
-        rd->m_DevMan.CommitDeviceStates();
-    }
-
-    // inject the density of atmospheric fog and FogVolume into volume texture.
-    {
-        rd->GetTiledShading().BindForwardShadingResources(NULL, eHWSC_Compute);
-
-        const uint32 nScreenWidth = CTexture::s_ptexVolumetricFogDensity->GetWidth();
-        const uint32 nScreenHeight = CTexture::s_ptexVolumetricFogDensity->GetHeight();
-        const uint32 volumeDepth = CTexture::s_ptexVolumetricFogDensity->GetDepth();
-
-        //PROFILE_LABEL_SCOPE( "INJECT_FOG_DENSITY" );
-
-        static CCryNameTSCRC shaderName("InjectFogDensity");
-        SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETSTATES);
-
-        D3DUnorderedAccessView* pUAVs[2] = {
-            (CTexture::s_ptexVolumetricFogDensity->GetDeviceUAV()),
-            (CTexture::s_ptexVolumetricFogDensityColor->GetDeviceUAV()),
-        };
-        rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVs, NULL, 0, 2);
-
-        D3DShaderResourceView* pSRVs[3] = {
-            m_fogVolumeInjectInfoBuf.GetShaderResourceView(),
-            m_fogVolumeCullInfoBuf.GetShaderResourceView(),
-            m_MaxDepth->GetShaderResourceView(),
-        };
-        rd->m_DevMan.BindSRV(eHWSC_Compute, pSRVs, 8, 3);
-
-        //D3DSamplerState *pSamplers[1] = {
-        //  (D3DSamplerState *)CTexture::s_TexStates[m_nTexStateTriLinear].m_pDeviceState,
-        //  //(D3DSamplerState *)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState,
-        //};
-        //rd->m_DevMan.BindSampler( eHWSC_Compute, pSamplers, 0, 1 );
-
-        static CCryNameR paramScreenSize("ScreenSize");
-        float fScreenWidth = (float)nScreenWidth;
-        float fScreenHeight = (float)nScreenHeight;
-        Vec4 vParamScreenSize(fScreenWidth, fScreenHeight, 1.0f / fScreenWidth, 1.0f / fScreenHeight);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramScreenSize, &vParamScreenSize, 1);
-
-        SD3DPostEffectsUtils::UpdateFrustumCorners();
-        static CCryNameR paramFrustumTL("FrustumTL");
-        Vec4 vParamFrustumTL(SD3DPostEffectsUtils::m_vLT.x, SD3DPostEffectsUtils::m_vLT.y, SD3DPostEffectsUtils::m_vLT.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTL, &vParamFrustumTL, 1);
-        static CCryNameR paramFrustumTR("FrustumTR");
-        Vec4 vParamFrustumTR(SD3DPostEffectsUtils::m_vRT.x, SD3DPostEffectsUtils::m_vRT.y, SD3DPostEffectsUtils::m_vRT.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumTR, &vParamFrustumTR, 1);
-        static CCryNameR paramFrustumBL("FrustumBL");
-        Vec4 vParamFrustumBL(SD3DPostEffectsUtils::m_vLB.x, SD3DPostEffectsUtils::m_vLB.y, SD3DPostEffectsUtils::m_vLB.z, 0);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramFrustumBL, &vParamFrustumBL, 1);
-
-        float octave = (CRenderer::CV_r_VolumetricFogReprojectionBlendFactor > 0.0f) ? -1.7f : 0.0f;
-        static CCryNameR paramInjectExponentialHeightFogParams("InjectFogDensityParams");
-        Vec4 vInjectExponentialHeightFogParams((float)volumeDepth, (float)m_numFogVolumes, octave, 0.0f);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramInjectExponentialHeightFogParams, &vInjectExponentialHeightFogParams, 1);
-
-        static CCryNameR paramProj("ProjParams");
-        Vec4 vParamProj(rd->m_ProjMatrix.m00, rd->m_ProjMatrix.m11, rd->m_ProjMatrix.m20, rd->m_ProjMatrix.m21);
-        CShaderMan::s_shDeferredShading->FXSetCSFloat(paramProj, &vParamProj, 1);
-
-        const uint32 tileSizeX = 4;
-        const uint32 tileSizeY = 4;
-        const uint32 tileSizeZ = 4;
-        uint32 dispatchSizeX = (nScreenWidth / tileSizeX) + (nScreenWidth % tileSizeX > 0 ? 1 : 0);
-        uint32 dispatchSizeY = (nScreenHeight / tileSizeY) + (nScreenHeight % tileSizeY > 0 ? 1 : 0);
-        uint32 dispatchSizeZ = (volumeDepth / tileSizeZ) + (volumeDepth % tileSizeZ > 0 ? 1 : 0);
-
-        rd->FX_Commit();
-
-        rd->m_DevMan.Dispatch(dispatchSizeX, dispatchSizeY, dispatchSizeZ);
-
-        SD3DPostEffectsUtils::ShEndPass();
-
-        rd->GetTiledShading().UnbindForwardShadingResources(eHWSC_Compute);
-    }
-
-
-    D3DUnorderedAccessView* pUAVNull4[4] = { NULL };
-    rd->m_DevMan.BindUAV(eHWSC_Compute, pUAVNull4, NULL, 0, 4);
-
-    D3DShaderResourceView* pNullViews[8] = { NULL };
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 0, 8);
-    rd->m_DevMan.BindSRV(eHWSC_Compute, pNullViews, 8, 8);
-
-    //D3DSamplerState* pSampNull[2] = { NULL };
-    //rd->m_DevMan.BindSampler( eHWSC_Compute, pSampNull, 0, 2 );
-
-    // restore state
-    rp.m_StateAnd = prevStateAnd;
-    rp.m_StateOr = prevStateOr;
-    rd->SetState(prevState);
-    rp.m_TI[nThreadID].m_PersFlags = prevPersFlags;
-    rp.m_FlagsShader_RT = prevShaderRtFlags;
-
-    rd->FX_Commit();
-    rd->m_DevMan.CommitDeviceStates();
-}
-
-void CVolumetricFog::RenderDownscaledShadowmap()
-{
-    if (!gcpRendD3D->m_bShadowsEnabled)
-    {
-        return;
-    }
-
-    if (CRenderer::CV_r_VolumetricFogDownscaledSunShadow == 0)
-    {
-        return;
-    }
-
-    //PROFILE_LABEL_SCOPE("DOWNSCALE_SHADOWMAP");
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& rp(rd->m_RP);
-
-    // store state
-    int oldX, oldY;
-    int oldWidth, oldHeight;
-    rd->GetViewport(&oldX, &oldY, &oldWidth, &oldHeight);
-    const uint64 prevShaderRtFlags = rp.m_FlagsShader_RT;
-
-    rd->FX_SetupShadowsForFog();
-
-    SDepthTexture D3dDepthSurface;
-    static const int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    int count = (CRenderer::CV_r_VolumetricFogDownscaledSunShadow == 1) ? 2 : 3;
-
-    for (int i = 0; i < count; ++i)
-    {
-        {
-            const uint64 lv0  = g_HWSR_MaskBit[HWSR_LIGHTVOLUME0];
-            const uint64 lv1 = g_HWSR_MaskBit[HWSR_LIGHTVOLUME1];
-            rp.m_FlagsShader_RT &= ~(lv0 | lv1);
-            switch (i)
-            {
-            case 0:
-                rp.m_FlagsShader_RT |= lv0;
-                break;
-            case 1:
-                rp.m_FlagsShader_RT |= lv1;
-                break;
-            case 2:
-                rp.m_FlagsShader_RT |= lv0 | lv1;
-                break;
-            default:
-                break;
-            }
-
-            CTexture* target = NULL;
-            if (CRenderer::CV_r_VolumetricFogDownscaledSunShadowRatio == 0)
-            {
-                target = m_downscaledShadow[i];
-            }
-            else
-            {
-                target = m_downscaledShadowTemp;
-            }
-
-            int targetWidth = target->GetWidth();
-            int targetHeight = target->GetHeight();
-
-            D3dDepthSurface.nWidth = targetWidth;
-            D3dDepthSurface.nHeight = targetHeight;
-            D3dDepthSurface.pTex = target;
-            D3dDepthSurface.pSurf = (D3DDepthSurface*)target->GetDeviceDepthStencilSurf();
-            D3dDepthSurface.pTarget = target->GetDevTexture()->Get2DTexture();
-            rd->FX_PushRenderTarget(0, (CTexture*)NULL, &D3dDepthSurface);
-            rd->FX_SetActiveRenderTargets();
-
-            rd->FX_SetState(GS_COLMASK_NONE | GS_DEPTHWRITE | GS_DEPTHFUNC_NOTEQUAL);
-
-            static CCryNameTSCRC shaderName("RenderDownscaledShadowMap");
-            GetUtils().ShBeginPass(CShaderMan::s_shDeferredShading, shaderName, FEF_DONTSETSTATES);
-
-            D3DSamplerState* pSamplers[1] = {
-                (D3DSamplerState*)CTexture::s_TexStates[m_nTexStatePoint].m_pDeviceState,
-            };
-            rd->m_DevMan.BindSampler(eHWSC_Pixel, pSamplers, 0, 1);
-
-            GetUtils().DrawFullScreenTri(targetWidth, targetHeight);
-
-            GetUtils().ShEndPass();
-
-            rd->FX_PopRenderTarget(0);
-
-            rp.m_FlagsShader_RT = prevShaderRtFlags;
-        }
-
-        // additional downscale pass
-        if (CRenderer::CV_r_VolumetricFogDownscaledSunShadowRatio != 0)
-        {
-            CTexture* source = m_downscaledShadowTemp;
-            CTexture* target = m_downscaledShadow[i];
-
-            int targetWidth = target->GetWidth();
-            int targetHeight = target->GetHeight();
-
-            D3dDepthSurface.nWidth = targetWidth;
-            D3dDepthSurface.nHeight = targetHeight;
-            D3dDepthSurface.pTex = target;
-            D3dDepthSurface.pSurf = target->GetDeviceDepthStencilSurf();
-            D3dDepthSurface.pTarget = target->GetDevTexture()->Get2DTexture();
-
-            rd->FX_PushRenderTarget(0, (CTexture*)NULL, &D3dDepthSurface);
-            rd->FX_SetActiveRenderTargets();
-
-            rd->FX_SetState(GS_COLMASK_NONE | GS_DEPTHWRITE | GS_DEPTHFUNC_NOTEQUAL);
-
-            static CCryNameTSCRC shaderName0("DownscaleShadowMap2");
-            static CCryNameTSCRC shaderName1("DownscaleShadowMap4");
-            if (CRenderer::CV_r_VolumetricFogDownscaledSunShadowRatio == 1)
-            {
-                GetUtils().ShBeginPass(CShaderMan::s_shDeferredShading, shaderName0, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-            }
-            else
-            {
-                GetUtils().ShBeginPass(CShaderMan::s_shDeferredShading, shaderName1, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-            }
-
-            source->Apply(0, texStatePoint, EFTT_UNKNOWN, -1, SResourceView::DefaultView);
-
-            GetUtils().DrawFullScreenTri(targetWidth, targetHeight);
-
-            GetUtils().ShEndPass();
-
-            rd->FX_PopRenderTarget(0);
-        }
-    }
-
-    // restore pipeline state.
-    rd->RT_SetViewport(oldX, oldY, oldWidth, oldHeight);
-    rp.m_FlagsShader_RT = prevShaderRtFlags;
-    rd->FX_Commit();
-}
-
-void CVolumetricFog::SetupStaticShadowMap(int nSlot) const
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    SRenderPipeline& rp(rd->m_RP);
-    const int nThreadID = rp.m_nProcessThreadID;
-
-    const int nSunFrustumID = 0;
-    const int nStartIdx = SRendItem::m_StartFrust[nThreadID][nSunFrustumID];
-    const int nEndIdx = SRendItem::m_EndFrust[nThreadID][nSunFrustumID];
-
-    for (int i = nStartIdx; i < nEndIdx; ++i)
-    {
-        ShadowMapFrustum& fr = rp.m_SMFrustums[nThreadID][nSunFrustumID][i];
-        if (fr.m_eFrustumType == ShadowMapFrustum::e_GsmCached)
-        {
-            rd->ConfigShadowTexgen(nSlot, &fr, -1, true);
-            break;
-        }
-    }
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3DVolumetricFog.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3DVolumetricFog.h
deleted file mode 100644
index b09a918172..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3DVolumetricFog.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-/* A short note on MultiGPU:
- Without knowing for sure if textures are copied between GPUs, the only 'correct' solution would be to have 2 * NUM_GPUs copies of rendertargets
- This would use too much memory though, so we keep one copy and swap it once every NUM_GPUs frames.This will work correctly if copy between GPUs
- is disabled. In case copies are performed though, every second frame the re-projection matrix will be off by a frame.
-*/
-#ifndef _D3DVOLUMETRICFOG_H_
-#define _D3DVOLUMETRICFOG_H_
-
-
-class CVolumetricFog
-{
-public:
-    CVolumetricFog();
-
-    void CreateResources();
-    void DestroyResources(bool destroyResolutionIndependentResources);
-    void Clear();
-    void ClearAll();
-
-    void PrepareLightList(TArray<SRenderLight>* envProbes, TArray<SRenderLight>* ambientLights, TArray<SRenderLight>* defLights, uint32 firstShadowLight, uint32 curShadowPoolLight);
-
-    void RenderVolumetricsToVolume(void (* RenderFunc)());
-    void RenderVolumetricFog();
-
-    void ClearVolumeStencil();
-    void RenderClipVolumeToVolumeStencil(int nClipAreaReservedStencilBit);
-
-    float GetDepthIndex(float linearDepth) const;
-    bool IsEnableInFrame() const;
-    const Vec4& GetGlobalEnvProbeShaderParam0() const {return m_globalEnvProbeParam0; }
-    const Vec4& GetGlobalEnvProbeShaderParam1() const {return m_globalEnvProbeParam1; }
-    CTexture* GetGlobalEnvProbeTex0() const {return m_globalEnvProveTex0; }
-    CTexture* GetGlobalEnvProbeTex1() const {return m_globalEnvProveTex1; }
-
-    void PushFogVolume(class CREFogVolume* pFogVolume, const SRenderingPassInfo& passInfo);
-
-private:
-    static const uint32         MaxFrameNum = 4;
-    static const uint32         MaxNumFogVolumeType = 2;
-
-    struct SFogVolumeInfo
-    {
-        Vec3 m_center;
-        uint32 m_viewerInsideVolume : 1;
-        uint32 m_affectsThisAreaOnly : 1;
-        uint32 m_stencilRef : 8;
-        uint32 m_volumeType : 1;
-        uint32 m_reserved : 21;
-        AABB m_localAABB;
-        Matrix34 m_matWSInv;
-        float m_globalDensity;
-        float m_densityOffset;
-        Vec2 m_softEdgesLerp;
-        ColorF m_fogColor;
-        Vec3 m_heightFallOffDirScaled;
-        Vec3 m_heightFallOffBasePoint;
-        Vec3 m_eyePosInOS;
-        Vec3 m_rampParams;
-        Vec3 m_windOffset;
-        float m_noiseScale;
-        Vec3 m_noiseFreq;
-        float m_noiseOffset;
-        float m_noiseElapsedTime;
-        Vec3 m_scale;
-    };
-
-    void ClearFogVolumes();
-    void ClearAllFogVolumes();
-    void UpdateFrame();
-    bool IsViable() const;
-    void InjectInscatteringLight();
-    void BuildLightListGrid();
-    void RaymarchVolumetricFog();
-    void BlurInscatterVolume();
-    void BlurDensityVolume();
-    void ReprojectVolume();
-    CTexture* GetInscatterTex() const;
-    CTexture* GetPrevInscatterTex() const;
-    CTexture* GetDensityTex() const;
-    CTexture* GetPrevDensityTex() const;
-    void RenderDownscaledDepth();
-    void InjectExponentialHeightFog();
-    void PrepareFogVolumeList();
-    void InjectFogDensity();
-    void RenderDownscaledShadowmap();
-    void SetupStaticShadowMap(int nSlot) const;
-
-private:
-    Matrix44A                       m_viewProj[MaxFrameNum];
-    CTexture*                       m_InscatteringVolume;
-    CTexture*                       m_fogInscatteringVolume[2];
-    CTexture*                       m_MaxDepth;
-    CTexture*                       m_MaxDepthTemp;
-    D3DDepthSurface**               m_ClipVolumeDSVArray;
-    CTexture*                       m_fogDensityVolume[2];
-    CTexture*                       m_downscaledShadow[3];
-    CTexture*                       m_downscaledShadowTemp;
-    CTexture*                       m_globalEnvProveTex0;
-    CTexture*                       m_globalEnvProveTex1;
-
-    int                                 m_nTexStateTriLinear;
-    int                                 m_nTexStateCompare;
-    int                                 m_nTexStatePoint;
-    int32                               m_Cleared;
-    int32                               m_Destroyed;
-    uint32                          m_numTileLights;
-    uint32                          m_numFogVolumes;
-    int32                               m_frameID;
-    int32                               m_tick;
-    int32                               m_ReverseDepthMode;
-    float                               m_raymarchDistance;
-    Vec4                                m_globalEnvProbeParam0;
-    Vec4                                m_globalEnvProbeParam1;
-
-    WrappedDX11Buffer       m_lightCullInfoBuf;
-    WrappedDX11Buffer       m_LightShadeInfoBuf;
-    WrappedDX11Buffer       m_lightGridBuf;
-    WrappedDX11Buffer       m_lightCountBuf;
-    WrappedDX11Buffer       m_fogVolumeCullInfoBuf;
-    WrappedDX11Buffer       m_fogVolumeInjectInfoBuf;
-
-    TArray<SFogVolumeInfo>  m_fogVolumeInfoArray[RT_COMMAND_BUF_COUNT][MAX_REND_RECURSION_LEVELS][MaxNumFogVolumeType];
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3D_SVO.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/D3D_SVO.cpp
deleted file mode 100644
index 7d49132125..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3D_SVO.cpp
+++ /dev/null
@@ -1,1705 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#if defined(FEATURE_SVO_GI)
-
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "D3D_SVO.h"
-#include "D3DTiledShading.h"
-#include "../Common/Include_HLSL_CPP_Shared.h"
-#include "../Common/TypedConstantBuffer.h"
-#include "../Common/Textures/TextureManager.h"
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-
-CSvoRenderer* CSvoRenderer::s_pInstance = 0;
-
-CSvoRenderer::CSvoRenderer()
-{
-    m_pRT_AIR_MIN =
-        m_pRT_AIR_MAX =
-        m_pRT_AIR_SHAD =
-        m_pRT_NID_0 = NULL;
-
-    m_nTexStateTrilinear = CTexture::GetTexState(STexState(FILTER_TRILINEAR, true));
-    m_nTexStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    m_nTexStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    m_nTexStateLinearWrap = CTexture::GetTexState(STexState(FILTER_LINEAR, false));
-
-    m_pNoiseTex = nullptr; 
-    m_pRsmNormlMap = m_pRsmColorMap = 0;
-    m_pRsmPoolNor = m_pRsmPoolCol = 0;
-
-    m_pShader = nullptr;
-
-    ZeroStruct(m_arrNodesForUpdate);
-    ZeroStruct(m_nCurPropagationPassID);
-
-    SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::RegisterMutex, &m_renderMutex);
-}
-
-void SSvoTargetsSet::Release()
-{
-    SAFE_RELEASE(pRT_RGB_DEM_MIN_0);
-    SAFE_RELEASE(pRT_ALD_DEM_MIN_0);
-    SAFE_RELEASE(pRT_RGB_DEM_MAX_0);
-    SAFE_RELEASE(pRT_ALD_DEM_MAX_0);
-    SAFE_RELEASE(pRT_RGB_DEM_MIN_1);
-    SAFE_RELEASE(pRT_ALD_DEM_MIN_1);
-    SAFE_RELEASE(pRT_RGB_DEM_MAX_1);
-    SAFE_RELEASE(pRT_ALD_DEM_MAX_1);
-    SAFE_RELEASE(pRT_FIN_OUT_0);
-    SAFE_RELEASE(pRT_FIN_OUT_1);
-    SAFE_RELEASE(pRT_ALD_0);
-    SAFE_RELEASE(pRT_ALD_1);
-    SAFE_RELEASE(pRT_RGB_0);
-    SAFE_RELEASE(pRT_RGB_1);
-}
-
-CSvoRenderer::~CSvoRenderer()
-{
-    m_tsDiff.Release();
-    m_tsSpec.Release();
-
-    SAFE_RELEASE(m_pRT_AIR_MIN);
-    SAFE_RELEASE(m_pRT_AIR_MAX);
-    SAFE_RELEASE(m_pRT_AIR_SHAD);
-    SAFE_RELEASE(m_pRT_NID_0);
-    SAFE_RELEASE(m_pRsmColorMap);
-    SAFE_RELEASE(m_pRsmNormlMap);
-    SAFE_RELEASE(m_pRsmPoolCol);
-    SAFE_RELEASE(m_pRsmPoolNor);
-    SVOGILegacyRequestBus::Broadcast(&SVOGILegacyRequests::UnregisterMutex);
-}
-
-CSvoRenderer* CSvoRenderer::GetInstance(bool bCheckAlloce)
-{
-    if (!s_pInstance && bCheckAlloce)
-    {
-        s_pInstance = new CSvoRenderer();
-    }
-
-    return s_pInstance;
-}
-
-void CSvoRenderer::Release()
-{
-    SAFE_DELETE(s_pInstance);
-}
-
-void CSvoRenderer::UpdateCompute()
-{
-    if (!IsActive())
-    {
-        return;
-    }
-
-    UpdatePassConstantBuffer();
-
-    static int nTI_Compute_FrameId = -1;
-    if (nTI_Compute_FrameId == gRenDev->GetFrameID(false))
-    {
-        return;
-    }
-    nTI_Compute_FrameId = gRenDev->GetFrameID(false);
-
-    gEnv->p3DEngine->GetSvoStaticTextures(m_texInfo, &m_arrLightsStatic, &m_arrLightsDynamic);
-    if (m_texInfo.pTexTree == nullptr)
-    {
-        return;
-    }
-
-
-    if (!m_pShader)
-    {
-        gcpRendD3D->m_cEF.mfRefreshSystemShader("Total_Illumination", m_pShader);
-    }
-
-    m_nodesForStaticUpdate.Clear();
-    m_nodesForDynamicUpdate.Clear();
-
-
-    if (GetIntegratioMode())
-    {
-        gEnv->p3DEngine->GetSvoBricksForUpdate(m_arrNodeInfo, false);
-
-        for (int n = 0; n < m_arrNodeInfo.Count(); n++)
-        {
-            m_nodesForStaticUpdate.Add(m_arrNodeInfo[n]);
-        }
-
-        m_arrNodeInfo.Clear();
-    }
-
-    if (GetIntegratioMode())
-    {
-        gEnv->p3DEngine->GetSvoBricksForUpdate(m_arrNodeInfo, true);
-
-        for (int n = 0; n < m_arrNodeInfo.Count(); n++)
-        {
-            m_nodesForDynamicUpdate.Add(m_arrNodeInfo[n]);
-        }
-
-        m_arrNodeInfo.Clear();
-    }
-
-    {
-        // get UAV access
-        vp_RGB0.Init(m_texInfo.pTexRgb0);
-        vp_RGB1.Init(m_texInfo.pTexRgb1);
-        vp_DYNL.Init(m_texInfo.pTexDynl);
-        vp_RGB2.Init(m_texInfo.pTexRgb2);
-        vp_RGB3.Init(m_texInfo.pTexRgb3);
-        vp_NORM.Init(m_texInfo.pTexNorm);
-        vp_ALDI.Init(m_texInfo.pTexAldi);
-        vp_OPAC.Init(m_texInfo.pTexOpac);
-    }
-
-    if (!IsActive() || !m_texInfo.bSvoReady || !GetIntegratioMode())
-    {
-        return;
-    }
-
-    // force sync shaders compiling
-    int nPrevAsync = CRenderer::CV_r_shadersasynccompiling;
-    CRenderer::CV_r_shadersasynccompiling = 0;
-
-    // clear pass
-    {
-        PROFILE_LABEL_SCOPE("TI_INJECT_CLEAR");
-
-        for (int nNodesForUpdateStartIndex = 0; nNodesForUpdateStartIndex < m_nodesForStaticUpdate.Count(); )
-        {
-            ExecuteComputeShader(m_pShader, "ComputeClearBricks", eCS_ClearBricks, &nNodesForUpdateStartIndex, 0, m_nodesForStaticUpdate);
-        }
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("TI_INJECT_LIGHT");
-
-        for (int nNodesForUpdateStartIndex = 0; nNodesForUpdateStartIndex < m_nodesForStaticUpdate.Count(); )
-        {
-            ExecuteComputeShader(m_pShader, "ComputeDirectStaticLighting", eCS_InjectStaticLights, &nNodesForUpdateStartIndex, 0, m_nodesForStaticUpdate);
-        }
-    }
-
-    if (gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal())
-    {
-        if (gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal() > 1)
-        {
-            PROFILE_LABEL_SCOPE("TI_INJECT_REFL0");
-
-            m_nCurPropagationPassID = 0;
-            for (int nNodesForUpdateStartIndex = 0; nNodesForUpdateStartIndex < m_nodesForStaticUpdate.Count(); )
-            {
-                ExecuteComputeShader(m_pShader, "ComputePropagateLighting", eCS_PropagateLighting_1to2, &nNodesForUpdateStartIndex, 0, m_nodesForStaticUpdate);
-            }
-        }
-
-        if (gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal() > 2)
-        {
-            PROFILE_LABEL_SCOPE("TI_INJECT_REFL1");
-
-            m_nCurPropagationPassID++;
-            for (int nNodesForUpdateStartIndex = 0; nNodesForUpdateStartIndex < m_nodesForStaticUpdate.Count(); )
-            {
-                ExecuteComputeShader(m_pShader, "ComputePropagateLighting", eCS_PropagateLighting_2to3, &nNodesForUpdateStartIndex, 0, m_nodesForStaticUpdate);
-            }
-        }
-    }
-
-    static int nLightsDynamicCountPrevFrame = 0;
-
-    if ((m_arrLightsDynamic.Count() || nLightsDynamicCountPrevFrame))
-    {
-        PROFILE_LABEL_SCOPE("TI_INJECT_DYNL");
-
-        // TODO: cull not affected nodes
-
-        for (int nNodesForUpdateStartIndex = 0; nNodesForUpdateStartIndex < m_nodesForDynamicUpdate.Count(); )
-        {
-            ExecuteComputeShader(m_pShader, "ComputeDirectDynamicLighting", eCS_InjectDynamicLights, &nNodesForUpdateStartIndex, 0, m_nodesForDynamicUpdate);
-        }
-    }
-
-    nLightsDynamicCountPrevFrame = m_arrLightsDynamic.Count();
-
-    CRenderer::CV_r_shadersasynccompiling = nPrevAsync;
-
-}
-
-void CSvoRenderer::ExecuteComputeShader(CShader* pSH, const char* szTechFinalName, EComputeStages eRenderStage, int* pnNodesForUpdateStartIndex, [[maybe_unused]] int nObjPassId, PodArray<I3DEngine::SSvoNodeInfo>& arrNodesForUpdate)
-{
-
-    FUNCTION_PROFILER_RENDERER;
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    SetShaderFlags(true, false);
-
-    SD3DPostEffectsUtils::ShBeginPass(pSH, szTechFinalName, FEF_DONTSETSTATES);
-
-    if (!gRenDev->m_RP.m_pShader)
-    {
-        gEnv->pLog->LogWarning("%s: Technique not found: %s", __FUNC__, szTechFinalName);
-        (*pnNodesForUpdateStartIndex) += 1000;
-        return;
-    }
-
-    {
-        static CCryNameR param("SVO_PropagationPass");
-        Vec4 value((float)(m_nCurPropagationPassID), 0, 0, 0);
-        m_pShader->FXSetCSFloat(param, (Vec4*)&value, 1);
-    }
-
-    {
-        static CCryNameR parameterName6("SVO_FrameIdByte");
-        Vec4 ttt((float)(rd->GetFrameID(false) & 255), (float)rd->GetFrameID(false), 3, 4);
-        if (rd->GetActiveGPUCount() > 1)
-        {
-            ttt.x = 0;
-        }
-        m_pShader->FXSetCSFloat(parameterName6, (Vec4*)&ttt, 1);
-    }
-
-    {
-        static CCryNameR parameterName6("SVO_CamPos");
-        Vec4 ttt(gEnv->pSystem->GetViewCamera().GetPosition(), 0);
-        m_pShader->FXSetCSFloat(parameterName6, (Vec4*)&ttt, 1);
-    }
-
-    {
-        Matrix44A mViewProj;
-        mViewProj = gcpRendD3D->m_ViewProjMatrix;
-        mViewProj.Transpose();
-
-        static CCryNameR paramName("g_mViewProj");
-        m_pShader->FXSetCSFloat(paramName, alias_cast<Vec4*>(&mViewProj), 4);
-
-        static CCryNameR paramNamePrev("g_mViewProjPrev");
-        m_pShader->FXSetPSFloat(paramNamePrev, alias_cast<Vec4*>(&m_matViewProjPrev), 4);
-    }
-
-    {
-        const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-        float zn = rc.fNear;
-        float zf = rc.fFar;
-        float hfov = gcpRendD3D->GetCamera().GetHorizontalFov();
-        Vec4 f;
-        f[0] = zf / (zf - zn);
-        f[1] = zn / (zn - zf);
-        f[2] = 1.0f / hfov;
-        f[3] = 1.0f;
-        static CCryNameR paramName("SVO_ProjRatio");
-        m_pShader->FXSetCSFloat(paramName, alias_cast<Vec4*>(&f), 1);
-    }
-
-    // setup SVO textures
-
-    ID3D11DeviceContext* pDeviceCtx = &gcpRendD3D->GetDeviceContext();
-    UINT UAVInitialCounts = 0;
-
-    if (eRenderStage == eCS_InjectStaticLights)
-    {
-        SetupLightSources(m_arrLightsStatic, m_pShader, false);
-        SetupNodesForUpdate(*pnNodesForUpdateStartIndex, arrNodesForUpdate);
-
-        // update RGB1
-        pDeviceCtx->CSSetUnorderedAccessViews(2, 1, &vp_RGB0.pUAV, &UAVInitialCounts);
-        pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &vp_RGB1.pUAV, &UAVInitialCounts);
-        pDeviceCtx->CSSetUnorderedAccessViews(5, 1, &vp_NORM.pUAV, &UAVInitialCounts);
-
-        if (vp_DYNL.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(6, 1, &vp_DYNL.pUAV, &UAVInitialCounts);
-        }
-
-        SetupSvoTexturesForRead(m_texInfo, eHWSC_Compute, 0);
-
-        SetupRsmSun(eHWSC_Compute);
-    }
-    else if (eRenderStage == eCS_InjectDynamicLights)
-    {
-        BindTiledLights(m_arrLightsDynamic, eHWSC_Compute);
-        SetupLightSources(m_arrLightsDynamic, m_pShader, false);
-        SetupNodesForUpdate(*pnNodesForUpdateStartIndex, arrNodesForUpdate);
-
-        // update RGB
-        pDeviceCtx->CSSetUnorderedAccessViews(2, 1, &vp_RGB0.pUAV, &UAVInitialCounts);
-
-        if (gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal() == 1)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &vp_RGB1.pUAV, &UAVInitialCounts);
-        }
-        if (gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal() == 2)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &vp_RGB2.pUAV, &UAVInitialCounts);
-        }
-        if (gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal() == 3)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &vp_RGB3.pUAV, &UAVInitialCounts);
-        }
-
-        pDeviceCtx->CSSetUnorderedAccessViews(5, 1, &vp_DYNL.pUAV, &UAVInitialCounts);
-
-        SetupSvoTexturesForRead(m_texInfo, eHWSC_Compute, 0);
-        if (!m_pNoiseTex)
-        {
-            m_pNoiseTex = CTextureManager::Instance()->GetDefaultTexture("DissolveNoiseMap");
-        }
-        m_pNoiseTex->Apply(15, m_nTexStateLinearWrap, -1, -1, -1, eHWSC_Compute);
-
-        SetupRsmSun(eHWSC_Compute);
-    }
-    else if (eRenderStage == eCS_PropagateLighting_1to2)
-    {
-        SetupLightSources(m_arrLightsStatic, m_pShader, false);
-        SetupNodesForUpdate(*pnNodesForUpdateStartIndex, arrNodesForUpdate);
-
-        // update RGB2
-        if (vp_RGB0.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(0, 1, &vp_RGB0.pUAV, &UAVInitialCounts);
-        }
-        SetupSvoTexturesForRead(m_texInfo, eHWSC_Compute, 1); // input
-        if (vp_RGB2.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(5, 1, &vp_RGB2.pUAV, &UAVInitialCounts);
-        }
-        if (vp_ALDI.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(6, 1, &vp_ALDI.pUAV, &UAVInitialCounts);
-        }
-        if (vp_DYNL.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &vp_DYNL.pUAV, &UAVInitialCounts);
-        }
-    }
-    else if (eRenderStage == eCS_PropagateLighting_2to3)
-    {
-        SetupLightSources(m_arrLightsStatic, m_pShader, false);
-        SetupNodesForUpdate(*pnNodesForUpdateStartIndex, arrNodesForUpdate);
-
-        // update RGB3
-        if (vp_RGB0.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(0, 1, &vp_RGB0.pUAV, &UAVInitialCounts);
-        }
-        SetupSvoTexturesForRead(m_texInfo, eHWSC_Compute, 2); // input
-        if (vp_RGB3.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(5, 1, &vp_RGB3.pUAV, &UAVInitialCounts);
-        }
-        if (vp_ALDI.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(6, 1, &vp_ALDI.pUAV, &UAVInitialCounts);
-        }
-        if (vp_DYNL.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &vp_DYNL.pUAV, &UAVInitialCounts);
-        }
-    }
-    else if (eRenderStage == eCS_ClearBricks)
-    {
-        SetupNodesForUpdate(*pnNodesForUpdateStartIndex, arrNodesForUpdate);
-
-        if (vp_RGB3.pUAV)
-        {
-            pDeviceCtx->CSSetUnorderedAccessViews(6, 1, &vp_RGB3.pUAV, &UAVInitialCounts);
-        }
-        pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &vp_RGB1.pUAV, &UAVInitialCounts);
-        pDeviceCtx->CSSetUnorderedAccessViews(5, 1, &vp_RGB2.pUAV, &UAVInitialCounts);
-        pDeviceCtx->CSSetUnorderedAccessViews(0, 1, &vp_ALDI.pUAV, &UAVInitialCounts);
-    }
-
-    {
-        rd->FX_Commit();
-
-        uint32 nDispatchSizeX = 128;
-        uint32 nDispatchSizeY = 16;
-
-#ifdef CINEBOX_APP
-        pDeviceCtx->Dispatch(nDispatchSizeX, nDispatchSizeY, 1);
-#else
-        rd->m_DevMan.Dispatch(nDispatchSizeX, nDispatchSizeY, 1);
-#endif
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    D3DUnorderedAccessView* pUAVNULL = NULL;
-
-    pDeviceCtx->CSSetUnorderedAccessViews(7, 1, &pUAVNULL, &UAVInitialCounts);
-    pDeviceCtx->CSSetUnorderedAccessViews(6, 1, &pUAVNULL, &UAVInitialCounts);
-    pDeviceCtx->CSSetUnorderedAccessViews(5, 1, &pUAVNULL, &UAVInitialCounts);
-    pDeviceCtx->CSSetUnorderedAccessViews(2, 1, &pUAVNULL, &UAVInitialCounts);
-    pDeviceCtx->CSSetUnorderedAccessViews(1, 1, &pUAVNULL, &UAVInitialCounts);
-    pDeviceCtx->CSSetUnorderedAccessViews(0, 1, &pUAVNULL, &UAVInitialCounts);
-
-    CTexture::GetByID(vp_RGB0.nTexId)->Unbind();
-    CTexture::GetByID(vp_RGB1.nTexId)->Unbind();
-    CTexture::GetByID(vp_DYNL.nTexId)->Unbind();
-    CTexture::GetByID(vp_RGB2.nTexId)->Unbind();
-    CTexture::GetByID(vp_RGB3.nTexId)->Unbind();
-    CTexture::GetByID(vp_NORM.nTexId)->Unbind();
-    CTexture::GetByID(vp_ALDI.nTexId)->Unbind();
-    CTexture::GetByID(vp_OPAC.nTexId)->Unbind();
-
-    gcpRendD3D->GetTiledShading().UnbindForwardShadingResources(eHWSC_Compute);
-
-    pSH->FXEnd();
-
-}
-
-CTexture* CSvoRenderer::GetGBuffer(int nId) // simplify branch compatibility
-{
-    CTexture* pRes;
-
-    if (nId == 0)
-    {
-        pRes = CTexture::s_ptexSceneDiffuse;
-    }
-    else if (nId == 1)
-    {
-        pRes = CTexture::s_ptexSceneNormalsMap;
-    }
-    else if (nId == 2)
-    {
-        pRes = CTexture::s_ptexSceneSpecular;
-    }
-    else
-    {
-        pRes = 0;
-    }
-
-    return pRes;
-}
-
-void CSvoRenderer::ConeTracePass(SSvoTargetsSet* pTS)
-{
-    CheckAllocateRT(pTS == &m_tsSpec);
-
-    if (!IsActive() || !m_pShader)
-    {
-        return;
-    }
-
-    const char* szTechFinalName = "ConeTracePass";
-
-    if (m_texInfo.bSvoFreeze)
-    {
-        return;
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    rd->FX_PushRenderTarget(0, pTS->pRT_ALD_0, NULL);
-    rd->FX_PushRenderTarget(1, pTS->pRT_RGB_0, NULL);
-
-    if (m_texInfo.pTexTree)
-    {
-        SetShaderFlags(pTS == &m_tsDiff);
-
-        SD3DPostEffectsUtils::ShBeginPass(m_pShader, szTechFinalName, FEF_DONTSETTEXTURES /*| FEF_DONTSETSTATES*/);
-
-        {
-            Matrix44A matView;
-            matView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_cam.GetViewMatrix();
-            Vec3 zAxis = matView.GetRow(1);
-            matView.SetRow(1, -matView.GetRow(2));
-            matView.SetRow(2, zAxis);
-            float z = matView.m13;
-            matView.m13 = -matView.m23;
-            matView.m23 = z;
-
-            SetupRsmSun(eHWSC_Pixel);
-
-            static int nReprojFrameId = -1;
-            if ((pTS == &m_tsDiff) && nReprojFrameId != rd->GetFrameID(false))
-            {
-                nReprojFrameId = rd->GetFrameID(false);
-
-                Matrix44A matProj;
-                const CCamera& cam = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_cam;
-                mathMatrixPerspectiveFov(&matProj, cam.GetFov(), cam.GetProjRatio(), cam.GetNearPlane(), cam.GetFarPlane());
-                static Matrix44A matPrevView = matView;
-                static Matrix44A matPrevProj = matProj;
-                rd->GetReprojectionMatrix(m_matReproj, matView, matProj, matPrevView, matPrevProj, cam.GetFarPlane());
-                matPrevView = matView;
-                matPrevProj = matProj;
-            }
-
-            {
-                static CCryNameR parameterName5("SVO_ReprojectionMatrix");
-                m_pShader->FXSetPSFloat(parameterName5, (Vec4*)m_matReproj.GetData(), 3);
-            }
-
-            {
-                static CCryNameR parameterName6("SVO_FrameIdByte");
-                Vec4 ttt((float)(rd->GetFrameID(false) & 255), (float)rd->GetFrameID(false), 3, 4);
-                if (rd->GetActiveGPUCount() > 1)
-                {
-                    ttt.x = 0;
-                }
-                m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-            }
-
-            {
-                static CCryNameR parameterName6("SVO_CamPos");
-                Vec4 ttt(gEnv->pSystem->GetViewCamera().GetPosition(), 0);
-                m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-            }
-
-            {
-                Matrix44A mViewProj;
-                mViewProj = gcpRendD3D->m_ViewProjMatrix;
-                mViewProj.Transpose();
-
-                static CCryNameR paramName("g_mViewProj");
-                m_pShader->FXSetPSFloat(paramName, alias_cast<Vec4*>(&mViewProj), 4);
-
-                static CCryNameR paramNamePrev("g_mViewProjPrev");
-                m_pShader->FXSetPSFloat(paramNamePrev, alias_cast<Vec4*>(&m_matViewProjPrev), 4);
-            }
-
-            {
-                float fSizeRatioW = float(rd->GetWidth() / rd->m_RTStack[0][rd->m_nRTStackLevel[0]].m_Width);
-                float fSizeRatioH = float(rd->GetHeight() / rd->m_RTStack[0][rd->m_nRTStackLevel[0]].m_Height);
-                static CCryNameR parameterName6("SVO_TargetResScale");
-                static int nPrevWidth = 0;
-                Vec4 ttt(fSizeRatioW, fSizeRatioH, gEnv->pConsole->GetCVar("e_svoTemporalFilteringBase")->GetFVal(),
-                    (float)(nPrevWidth != (pTS->pRT_ALD_0->GetWidth() + 1) || (rd->m_RP.m_nRendFlags & SHDF_CUBEMAPGEN) || (rd->GetActiveGPUCount() > 1)));
-                m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-                nPrevWidth = (pTS->pRT_ALD_0->GetWidth() + 1);
-            }
-
-            {
-                Matrix44A matView2;
-                matView2 = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_cam.GetViewMatrix();
-                Vec3 zAxis2 = matView2.GetRow(1);
-                matView2.SetRow(1, -matView2.GetRow(2));
-                matView2.SetRow(2, zAxis2);
-                float z2 = matView2.m13;
-                matView2.m13 = -matView2.m23;
-                matView2.m23 = z2;
-                static CCryNameR paramName2("TI_CameraMatrix");
-                m_pShader->FXSetPSFloat(paramName2, (Vec4*)matView2.GetData(), 3);
-            }
-
-            {
-                Vec3 pvViewFrust[8];
-                const CameraViewParameters& rc = gcpRendD3D->GetViewParameters();
-                rc.CalcVerts(pvViewFrust);
-
-                static CCryNameR parameterName0("SVO_FrustumVerticesCam0");
-                static CCryNameR parameterName1("SVO_FrustumVerticesCam1");
-                static CCryNameR parameterName2("SVO_FrustumVerticesCam2");
-                static CCryNameR parameterName3("SVO_FrustumVerticesCam3");
-                Vec4 ttt0(pvViewFrust[4] - rc.vOrigin, 0);
-                Vec4 ttt1(pvViewFrust[5] - rc.vOrigin, 0);
-                Vec4 ttt2(pvViewFrust[6] - rc.vOrigin, 0);
-                Vec4 ttt3(pvViewFrust[7] - rc.vOrigin, 0);
-                m_pShader->FXSetPSFloat(parameterName0, (Vec4*)&ttt0, 1);
-                m_pShader->FXSetPSFloat(parameterName1, (Vec4*)&ttt1, 1);
-                m_pShader->FXSetPSFloat(parameterName2, (Vec4*)&ttt2, 1);
-                m_pShader->FXSetPSFloat(parameterName3, (Vec4*)&ttt3, 1);
-            }
-
-
-            if (pTS->pRT_ALD_1 && pTS->pRT_ALD_1)
-            {
-                static int nPrevWidth = 0;
-                if (nPrevWidth != (pTS->pRT_ALD_1->GetWidth()))
-                {
-                    CTextureManager::Instance()->GetWhiteTexture()->Apply(10, m_nTexStateLinear);
-                    CTextureManager::Instance()->GetWhiteTexture()->Apply(11, m_nTexStateLinear);
-                    nPrevWidth = pTS->pRT_ALD_1->GetWidth();
-                }
-                else
-                {
-                    pTS->pRT_ALD_1->Apply(10, m_nTexStateLinear);
-                    pTS->pRT_RGB_1->Apply(11, m_nTexStateLinear);
-                }
-            }
-        }
-
-        rd->FX_SetState(GS_NODEPTHTEST);
-
-        SetupSvoTexturesForRead(m_texInfo, eHWSC_Pixel, (gEnv->pConsole->GetCVar("e_svoTI_Active")->GetIVal() ? gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal() : 0), 0, 0);
-
-        CTexture::s_ptexZTarget->Apply(4, m_nTexStatePoint);
-
-        {
-            GetGBuffer(1)->Apply(5, m_nTexStatePoint);
-
-            GetGBuffer(2)->Apply(7, m_nTexStatePoint);
-
-            GetGBuffer(0)->Apply(14, m_nTexStatePoint);
-        }
-
-        if (!GetIntegratioMode() && gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal() && m_arrLightsDynamic.Count())
-        {
-            BindTiledLights(m_arrLightsDynamic, eHWSC_Pixel);
-            SetupLightSources(m_arrLightsDynamic, m_pShader, true);
-        }
-
-        {
-            const bool setupCloudShadows = rd->m_bShadowsEnabled && rd->m_bCloudShadowsEnabled;
-            if (setupCloudShadows)
-            {
-                // cloud shadow map
-                CTexture* pCloudShadowTex(rd->GetCloudShadowTextureId() > 0 ? CTexture::GetByID(rd->GetCloudShadowTextureId()) : CTextureManager::Instance()->GetWhiteTexture());
-                assert(pCloudShadowTex);
-
-                STexState pTexStateLinearClamp;
-                pTexStateLinearClamp.SetFilterMode(FILTER_LINEAR);
-                pTexStateLinearClamp.SetClampMode(false, false, false);
-                CTexture::GetTexState(pTexStateLinearClamp);
-
-                pCloudShadowTex->Apply(15, m_nTexStateLinearWrap);
-            }
-            else
-            {
-                CTextureManager::Instance()->GetWhiteTexture()->Apply(15, m_nTexStateLinearWrap);
-            }
-        }
-
-        rd->FX_Commit();
-
-        SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexCurrentSceneDiffuseAccMap->GetWidth(), CTexture::s_ptexCurrentSceneDiffuseAccMap->GetHeight());
-
-        gcpRendD3D->GetTiledShading().UnbindForwardShadingResources(eHWSC_Pixel);
-
-        SD3DPostEffectsUtils::ShEndPass();
-    }
-
-    rd->FX_PopRenderTarget(0);
-    rd->FX_PopRenderTarget(1);
-}
-
-void CSvoRenderer::DrawPonts(PodArray<SVF_P3F_C4B_T2F>& arrVerts)
-{
-    SPostEffectsUtils::UpdateFrustumCorners();
-
-    CVertexBuffer strip(arrVerts.GetElements(), eVF_P3F_C4B_T2F);
-
-    gRenDev->DrawPrimitivesInternal(&strip, arrVerts.Count(), eptPointList);
-}
-
-void CSvoRenderer::UpdateRender()
-{
-    int nPrevAsync = CRenderer::CV_r_shadersasynccompiling;
-    if (gEnv->IsEditor())
-    {
-        CRenderer::CV_r_shadersasynccompiling = 0;
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("TI_GEN_DIFF");
-
-        ConeTracePass(&m_tsDiff);
-    }
-    if (GetIntegratioMode() == 2)
-    {
-        PROFILE_LABEL_SCOPE("TI_GEN_SPEC");
-
-        ConeTracePass(&m_tsSpec);
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("TI_DEMOSAIC_DIFF");
-
-        DemosaicPass(&m_tsDiff);
-    }
-    if (GetIntegratioMode() == 2)
-    {
-        PROFILE_LABEL_SCOPE("TI_DEMOSAIC_SPEC");
-
-        DemosaicPass(&m_tsSpec);
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("TI_UPSCALE_DIFF");
-
-        UpScalePass(&m_tsDiff);
-    }
-    if (GetIntegratioMode() == 2)
-    {
-        PROFILE_LABEL_SCOPE("TI_UPSCALE_SPEC");
-
-        UpScalePass(&m_tsSpec);
-    }
-
-    {
-        m_matViewProjPrev = gcpRendD3D->m_ViewProjMatrix;
-        m_matViewProjPrev.Transpose();
-    }
-
-    if (gEnv->IsEditor())
-    {
-        CRenderer::CV_r_shadersasynccompiling = nPrevAsync;
-    }
-}
-
-void CSvoRenderer::DemosaicPass(SSvoTargetsSet* pTS)
-{
-    const char* szTechFinalName = "DemosaicPass";
-
-    if (!IsActive() || !m_pShader)
-    {
-        return;
-    }
-
-    if (m_texInfo.bSvoFreeze)
-    {
-        return;
-    }
-
-    { // SVO
-        if (!pTS->pRT_ALD_0 || !pTS->pRT_ALD_0)
-        {
-            return;
-        }
-
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-        rd->FX_PushRenderTarget(0, pTS->pRT_RGB_DEM_MIN_0, NULL, -1, false, 1);
-        rd->FX_PushRenderTarget(1, pTS->pRT_ALD_DEM_MIN_0, NULL, -1, false, 1);
-        rd->FX_PushRenderTarget(2, pTS->pRT_RGB_DEM_MAX_0, NULL, -1, false, 1);
-        rd->FX_PushRenderTarget(3, pTS->pRT_ALD_DEM_MAX_0, NULL, -1, false, 1);
-
-        if (m_texInfo.pTexTree)
-        {
-            SetShaderFlags(pTS == &m_tsDiff);
-
-            SD3DPostEffectsUtils::ShBeginPass(m_pShader, szTechFinalName, FEF_DONTSETTEXTURES);
-
-            rd->FX_SetState(GS_NODEPTHTEST);
-
-            CTexture::s_ptexZTarget->Apply(4, m_nTexStatePoint);
-
-            GetGBuffer(1)->Apply(5, m_nTexStatePoint);
-
-            GetGBuffer(2)->Apply(7, m_nTexStatePoint);
-
-            GetGBuffer(0)->Apply(14, m_nTexStatePoint);
-
-            {
-                static CCryNameR parameterName5("SVO_ReprojectionMatrix");
-                m_pShader->FXSetPSFloat(parameterName5, (Vec4*)m_matReproj.GetData(), 3);
-            }
-
-            {
-                float fSizeRatioW = float(rd->GetWidth() / rd->m_RTStack[0][rd->m_nRTStackLevel[0]].m_Width);
-                float fSizeRatioH = float(rd->GetHeight() / rd->m_RTStack[0][rd->m_nRTStackLevel[0]].m_Height);
-                static CCryNameR parameterName6("SVO_TargetResScale");
-                static int nPrevWidth = 0;
-                Vec4 ttt(fSizeRatioW, fSizeRatioH, gEnv->pConsole->GetCVar("e_svoTemporalFilteringBase")->GetFVal(),
-                    (float)(nPrevWidth != (pTS->pRT_ALD_0->GetWidth() + 1) || (rd->m_RP.m_nRendFlags & SHDF_CUBEMAPGEN) || (rd->GetActiveGPUCount() > 1)));
-                m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-                nPrevWidth = (pTS->pRT_ALD_0->GetWidth() + 1);
-            }
-
-            {
-                static CCryNameR parameterName6("SVO_FrameIdByte");
-                Vec4 ttt((float)(rd->GetFrameID(false) & 255), (float)rd->GetFrameID(false), 3, 4);
-                if (rd->GetActiveGPUCount() > 1)
-                {
-                    ttt.x = 0;
-                }
-                m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-            }
-
-            {
-                static CCryNameR parameterName6("SVO_CamPos");
-                Vec4 ttt(gEnv->pSystem->GetViewCamera().GetPosition(), 0);
-                m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-            }
-
-            {
-                Matrix44A mViewProj;
-                mViewProj = gcpRendD3D->m_ViewProjMatrix;
-                mViewProj.Transpose();
-
-                static CCryNameR paramName("g_mViewProj");
-                m_pShader->FXSetPSFloat(paramName, alias_cast<Vec4*>(&mViewProj), 4);
-
-                static CCryNameR paramNamePrev("g_mViewProjPrev");
-                m_pShader->FXSetPSFloat(paramNamePrev, alias_cast<Vec4*>(&m_matViewProjPrev), 4);
-            }
-
-            {
-                Matrix44A matView;
-                matView = gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_cam.GetViewMatrix();
-                Vec3 zAxis = matView.GetRow(1);
-                matView.SetRow(1, -matView.GetRow(2));
-                matView.SetRow(2, zAxis);
-                float z = matView.m13;
-                matView.m13 = -matView.m23;
-                matView.m23 = z;
-                static CCryNameR paramName2("TI_CameraMatrix");
-                m_pShader->FXSetPSFloat(paramName2, (Vec4*)matView.GetData(), 3);
-            }
-
-            pTS->pRT_ALD_0->Apply(10, m_nTexStateLinear);
-            pTS->pRT_RGB_0->Apply(11, m_nTexStateLinear);
-
-            pTS->pRT_RGB_DEM_MIN_1->Apply(0, m_nTexStateLinear);
-            pTS->pRT_ALD_DEM_MIN_1->Apply(1, m_nTexStateLinear);
-            pTS->pRT_RGB_DEM_MAX_1->Apply(2, m_nTexStateLinear);
-            pTS->pRT_ALD_DEM_MAX_1->Apply(3, m_nTexStateLinear);
-
-
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexCurrentSceneDiffuseAccMap->GetWidth(), CTexture::s_ptexCurrentSceneDiffuseAccMap->GetHeight());
-
-            SD3DPostEffectsUtils::ShEndPass();
-        }
-
-        rd->FX_PopRenderTarget(0);
-        rd->FX_PopRenderTarget(1);
-        rd->FX_PopRenderTarget(2);
-        rd->FX_PopRenderTarget(3);
-    }
-}
-
-void CSvoRenderer::SetupLightSources(PodArray<I3DEngine::SLightTI>& lightsTI, CShader* pShader, bool bPS)
-{
-    const int nLightGroupsNum = 2;
-
-    static CCryNameR paramNamesLightPos[nLightGroupsNum] =
-    {
-        CCryNameR("SVO_LightPos0"),
-        CCryNameR("SVO_LightPos1"),
-    };
-    static CCryNameR paramNamesLightDir[nLightGroupsNum] =
-    {
-        CCryNameR("SVO_LightDir0"),
-        CCryNameR("SVO_LightDir1"),
-    };
-    static CCryNameR paramNamesLightCol[nLightGroupsNum] =
-    {
-        CCryNameR("SVO_LightCol0"),
-        CCryNameR("SVO_LightCol1"),
-    };
-
-    for (int g = 0; g < nLightGroupsNum; g++)
-    {
-        Vec4 LightPos[4];
-        Vec4 LightDir[4];
-        Vec4 LightCol[4];
-
-        for (int x = 0; x < 4; x++)
-        {
-            int nId = g * 4 + x;
-
-            LightPos[x] = (nId < lightsTI.Count()) ? lightsTI[nId].vPosR : Vec4(0, 0, 0, 0);
-            LightDir[x] = (nId < lightsTI.Count()) ? lightsTI[nId].vDirF : Vec4(0, 0, 0, 0);
-            LightCol[x] = (nId < lightsTI.Count()) ? lightsTI[nId].vCol : Vec4(0, 0, 0, 0);
-        }
-
-        if (bPS)
-        {
-            pShader->FXSetPSFloat(paramNamesLightPos[g], alias_cast<Vec4*>(&LightPos[0][0]), 4);
-            pShader->FXSetPSFloat(paramNamesLightDir[g], alias_cast<Vec4*>(&LightDir[0][0]), 4);
-            pShader->FXSetPSFloat(paramNamesLightCol[g], alias_cast<Vec4*>(&LightCol[0][0]), 4);
-        }
-        else
-        { // CS
-            pShader->FXSetCSFloat(paramNamesLightPos[g], alias_cast<Vec4*>(&LightPos[0][0]), 4);
-            pShader->FXSetCSFloat(paramNamesLightDir[g], alias_cast<Vec4*>(&LightDir[0][0]), 4);
-            pShader->FXSetCSFloat(paramNamesLightCol[g], alias_cast<Vec4*>(&LightCol[0][0]), 4);
-        }
-    }
-}
-
-void CSvoRenderer::SetupNodesForUpdate(int& nNodesForUpdateStartIndex, PodArray<I3DEngine::SSvoNodeInfo>& arrNodesForUpdate)
-{
-    static CCryNameR paramNames[SVO_MAX_NODE_GROUPS] =
-    {
-        CCryNameR("SVO_NodesForUpdate0"),
-        CCryNameR("SVO_NodesForUpdate1"),
-        CCryNameR("SVO_NodesForUpdate2"),
-        CCryNameR("SVO_NodesForUpdate3"),
-    };
-
-    for (int g = 0; g < SVO_MAX_NODE_GROUPS; g++)
-    {
-        float matVal[4][4];
-
-        for (int x = 0; x < 4; x++)
-        {
-            for (int y = 0; y < 4; y++)
-            {
-                int nId = nNodesForUpdateStartIndex + g * 16 + x * 4 + y;
-                matVal[x][y] = 0.1f + ((nId < arrNodesForUpdate.Count()) ? arrNodesForUpdate[nId].nAtlasOffset : -2);
-            }
-        }
-
-        m_pShader->FXSetCSFloat(paramNames[g], alias_cast<Vec4*>(&matVal[0][0]), 4);
-    }
-
-    nNodesForUpdateStartIndex += 4 * 4 * SVO_MAX_NODE_GROUPS; // 128
-}
-
-void CSvoRenderer::SetupSvoTexturesForRead(I3DEngine::SSvoStaticTexInfo& texInfo, EHWShaderClass eShaderClass, int nStage, int nStageOpa, int nStageNorm)
-{
-    ((CTexture*)texInfo.pTexTree)->Apply(0, m_nTexStatePoint, -1, -1, -1, eShaderClass);
-
-    CTextureManager::Instance()->GetBlackTexture()->Apply(1, m_nTexStateLinear, -1, -1, -1, eShaderClass);
-
-
-    if (nStage == 0)
-    {
-        CTexture::GetByID(vp_RGB0.nTexId)->Apply(1, m_nTexStateLinear, -1, -1, -1, eShaderClass);
-    }
-    else if (nStage == 1)
-    {
-        CTexture::GetByID(vp_RGB1.nTexId)->Apply(1, m_nTexStateLinear, -1, -1, -1, eShaderClass);
-    }
-    else if (nStage == 2)
-    {
-        CTexture::GetByID(vp_RGB2.nTexId)->Apply(1, m_nTexStateLinear, -1, -1, -1, eShaderClass);
-    }
-    else if (nStage == 3)
-    {
-        CTexture::GetByID(vp_RGB3.nTexId)->Apply(1, m_nTexStateLinear, -1, -1, -1, eShaderClass);
-    }
-
-    if (nStageNorm == 0)
-    {
-        CTexture::GetByID(vp_NORM.nTexId)->Apply(2, m_nTexStateLinear, -1, -1, -1, eShaderClass);
-    }
-
-
-    if (nStageOpa == 0)
-    {
-        ((CTexture*)texInfo.pTexOpac)->Apply(3, m_nTexStateLinear, -1, -1, -1, eShaderClass);
-    }
-
-
-    if (texInfo.pGlobalSpecCM)
-    {
-        ((CTexture*)texInfo.pGlobalSpecCM)->Apply(6, m_nTexStateTrilinear, -1, -1, -1, eShaderClass);
-    }
-
-}
-
-void CSvoRenderer::CheckAllocateRT(bool bSpecPass)
-{
-    int nWidth = gcpRendD3D->GetWidth();
-    int nHeight = gcpRendD3D->GetHeight();
-
-    int nResScaleBase = 2;
-    int nInW = (nWidth / nResScaleBase);
-    int nInH = (nHeight / nResScaleBase);
-
-    if (!bSpecPass)
-    {
-        CheckCreateUpdateRT(m_tsDiff.pRT_ALD_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_DIFF_ALD");
-        CheckCreateUpdateRT(m_tsDiff.pRT_ALD_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_DIFF_ALD");
-        CheckCreateUpdateRT(m_tsDiff.pRT_RGB_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_DIFF_RGB");
-        CheckCreateUpdateRT(m_tsDiff.pRT_RGB_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_DIFF_RGB");
-
-        CheckCreateUpdateRT(m_tsSpec.pRT_ALD_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_SPEC_ALD");
-        CheckCreateUpdateRT(m_tsSpec.pRT_ALD_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_SPEC_ALD");
-        CheckCreateUpdateRT(m_tsSpec.pRT_RGB_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_SPEC_RGB");
-        CheckCreateUpdateRT(m_tsSpec.pRT_RGB_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_SPEC_RGB");
-
-
-        CheckCreateUpdateRT(m_tsDiff.pRT_RGB_DEM_MIN_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_DIFF_FIN_RGB_MIN");
-        CheckCreateUpdateRT(m_tsDiff.pRT_ALD_DEM_MIN_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_DIFF_FIN_ALD_MIN");
-        CheckCreateUpdateRT(m_tsDiff.pRT_RGB_DEM_MAX_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_DIFF_FIN_RGB_MAX");
-        CheckCreateUpdateRT(m_tsDiff.pRT_ALD_DEM_MAX_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_DIFF_FIN_ALD_MAX");
-        CheckCreateUpdateRT(m_tsDiff.pRT_RGB_DEM_MIN_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_DIFF_FIN_RGB_MIN");
-        CheckCreateUpdateRT(m_tsDiff.pRT_ALD_DEM_MIN_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_DIFF_FIN_ALD_MIN");
-        CheckCreateUpdateRT(m_tsDiff.pRT_RGB_DEM_MAX_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_DIFF_FIN_RGB_MAX");
-        CheckCreateUpdateRT(m_tsDiff.pRT_ALD_DEM_MAX_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_DIFF_FIN_ALD_MAX");
-
-        CheckCreateUpdateRT(m_tsDiff.pRT_FIN_OUT_0, nWidth, nHeight, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_FIN_DIFF_OUT");
-        CheckCreateUpdateRT(m_tsDiff.pRT_FIN_OUT_1, nWidth, nHeight, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_FIN_DIFF_OUT");
-
-        CheckCreateUpdateRT(m_tsSpec.pRT_RGB_DEM_MIN_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_SPEC_FIN_RGB_MIN");
-        CheckCreateUpdateRT(m_tsSpec.pRT_ALD_DEM_MIN_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_SPEC_FIN_ALD_MIN");
-        CheckCreateUpdateRT(m_tsSpec.pRT_RGB_DEM_MAX_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_SPEC_FIN_RGB_MAX");
-        CheckCreateUpdateRT(m_tsSpec.pRT_ALD_DEM_MAX_0, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_SPEC_FIN_ALD_MAX");
-        CheckCreateUpdateRT(m_tsSpec.pRT_RGB_DEM_MIN_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_SPEC_FIN_RGB_MIN");
-        CheckCreateUpdateRT(m_tsSpec.pRT_ALD_DEM_MIN_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_SPEC_FIN_ALD_MIN");
-        CheckCreateUpdateRT(m_tsSpec.pRT_RGB_DEM_MAX_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_SPEC_FIN_RGB_MAX");
-        CheckCreateUpdateRT(m_tsSpec.pRT_ALD_DEM_MAX_1, nInW, nInH, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_SPEC_FIN_ALD_MAX");
-
-        CheckCreateUpdateRT(m_tsSpec.pRT_FIN_OUT_0, nWidth, nHeight, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SVO_FIN_SPEC_OUT");
-        CheckCreateUpdateRT(m_tsSpec.pRT_FIN_OUT_1, nWidth, nHeight, eTF_R16G16B16A16F, eTT_2D, FT_STATE_CLAMP, "SV1_FIN_SPEC_OUT");
-
-        // swap ping-pong RT
-        std::swap(m_tsDiff.pRT_ALD_0, m_tsDiff.pRT_ALD_1);
-        std::swap(m_tsDiff.pRT_RGB_0, m_tsDiff.pRT_RGB_1);
-        std::swap(m_tsDiff.pRT_RGB_DEM_MIN_0, m_tsDiff.pRT_RGB_DEM_MIN_1);
-        std::swap(m_tsDiff.pRT_ALD_DEM_MIN_0, m_tsDiff.pRT_ALD_DEM_MIN_1);
-        std::swap(m_tsDiff.pRT_RGB_DEM_MAX_0, m_tsDiff.pRT_RGB_DEM_MAX_1);
-        std::swap(m_tsDiff.pRT_ALD_DEM_MAX_0, m_tsDiff.pRT_ALD_DEM_MAX_1);
-        std::swap(m_tsDiff.pRT_FIN_OUT_0, m_tsDiff.pRT_FIN_OUT_1);
-
-        std::swap(m_tsSpec.pRT_ALD_0, m_tsSpec.pRT_ALD_1);
-        std::swap(m_tsSpec.pRT_RGB_0, m_tsSpec.pRT_RGB_1);
-        std::swap(m_tsSpec.pRT_RGB_DEM_MIN_0, m_tsSpec.pRT_RGB_DEM_MIN_1);
-        std::swap(m_tsSpec.pRT_ALD_DEM_MIN_0, m_tsSpec.pRT_ALD_DEM_MIN_1);
-        std::swap(m_tsSpec.pRT_RGB_DEM_MAX_0, m_tsSpec.pRT_RGB_DEM_MAX_1);
-        std::swap(m_tsSpec.pRT_ALD_DEM_MAX_0, m_tsSpec.pRT_ALD_DEM_MAX_1);
-        std::swap(m_tsSpec.pRT_FIN_OUT_0, m_tsSpec.pRT_FIN_OUT_1);
-    }
-}
-
-bool CSvoRenderer::IsShaderItemUsedForVoxelization(SShaderItem& rShaderItem, [[maybe_unused]] IRenderNode* pRN)
-{
-    CShader* pS = (CShader*)rShaderItem.m_pShader;
-
-    // skip some objects marked by level designer
-    //  if(pRN && pRN->IsRenderNode() && pRN->GetIntegrationType())
-    //  return false;
-
-    // skip transparent meshes except decals
-    //  if((pR->Opacity() != 1.f) && !(pS->GetFlags()&EF_DECAL))
-    //  return false;
-
-    // skip windows
-    if (pS && pS->GetShaderType() == eST_Glass)
-    {
-        return false;
-    }
-
-    // skip water
-    if (pS && pS->GetShaderType() == eST_Water)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-namespace
-{
-    const float ACTIVATION_MODE_DISABLED = -1.0f;
-
-    float GetActivationModeAsFloat()
-    {
-        auto* instance = CSvoRenderer::GetInstance();
-
-        float modeAsFloat = ACTIVATION_MODE_DISABLED;
-        int32 modeAsInt = instance->GetIntegratioMode();
-
-        if (instance->IsActive())
-        {
-            if (modeAsInt == 0 && gEnv->pConsole->GetCVar("e_svoTI_UseLightProbes")->GetIVal())
-            { // AO modulates diffuse and specular
-                modeAsFloat = 0.0f;
-            }
-            else if (modeAsInt <= 1)
-            { // GI replaces diffuse and modulates specular
-                modeAsFloat = 1.0f;
-            }
-            else if (modeAsInt == 2)
-            { // GI replaces diffuse and specular
-                modeAsFloat = 2.0f;
-            }
-        }
-
-        return modeAsFloat;
-    }
-}
-
-void CSvoRenderer::UpdatePassConstantBuffer()
-{
-    CSvoRenderer* svoRenderer = CSvoRenderer::GetInstance();
-
-    CTypedConstantBuffer<HLSL_PerPassConstantBuffer_Svo> cb(m_PassConstantBuffer);
-
-    // SvoParams4 is used by forward tiled shaders even if GI is disabled, it contains info about GI mode and also is GI active or not
-    cb->PerPass_SvoParams4 = Vec4(0.0f, -1.0f, 0.0f, 0.0f);
-
-    if (svoRenderer)
-    {
-        AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-        AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-        const float terrainSizeX = terrainAabb.GetXExtent();
-
-        cb->PerPass_SvoTreeSettings0 = Vec4(
-            (float)terrainSizeX,
-            gEnv->pConsole->GetCVar("e_svoMinNodeSize")->GetFVal(),
-            (float)svoRenderer->m_texInfo.nBrickSize,
-            128.f);
-
-        cb->PerPass_SvoTreeSettings1 = Vec4(
-            gEnv->pConsole->GetCVar("e_svoMaxNodeSize")->GetFVal(),
-            0.0f,
-            0.0f,
-            0.0f);
-        cb->PerPass_SvoParams0 = Vec4(
-            1.0f,
-            0.0f,
-            0.0f,
-            0.0f);
-
-        cb->PerPass_SvoParams1 = Vec4(
-            1.f / (gEnv->pConsole->GetCVar("e_svoTI_DiffuseConeWidth")->GetFVal() + 0.00001f),
-            gEnv->pConsole->GetCVar("e_svoTI_ConeMaxLength")->GetFVal(),
-            0.0f,
-            (svoRenderer->m_texInfo.bSvoReady && gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal()) ? 1.0f : 0.0f);
-
-        cb->PerPass_SvoParams2 = Vec4(
-            gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal(),
-            0.0f,
-            gEnv->pConsole->GetCVar("e_svoTI_Saturation")->GetFVal(),
-            0.0f);
-
-        cb->PerPass_SvoParams3 = Vec4(
-            1.0f,
-            0.0f,
-            0.0f,
-            (svoRenderer->m_texInfo.bSvoReady && gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetIVal()) ? 1.0f : 0.0f);
-
-
-        {
-            cb->PerPass_SvoParams4.x = gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetRed")->GetFVal();
-            cb->PerPass_SvoParams4.y = gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetGreen")->GetFVal();
-            cb->PerPass_SvoParams4.z = gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetBlue")->GetFVal();
-            cb->PerPass_SvoParams4.w = gEnv->pConsole->GetCVar("e_svoTI_AmbientOffsetBias")->GetFVal();
-        }
-
-        cb->PerPass_SvoParams5 = Vec4(
-            0.0f,
-            0.0f,
-            gEnv->pConsole->GetCVar("e_svoTI_NumberOfBounces")->GetFVal() - 1.f,
-            svoRenderer->m_texInfo.fGlobalSpecCM_Mult);
-
-        cb->PerPass_SvoParams6 = Vec4(
-            1.0f,
-            gEnv->IsEditing() ? 0 : (gEnv->pConsole->GetCVar("e_svoTemporalFilteringMinDistance")->GetFVal() / gcpRendD3D->GetViewParameters().fFar),
-            0.0f,
-            0.0f);
-    }
-
-    m_PassConstantBuffer = cb.GetDeviceConstantBuffer();
-    cb.CopyToDevice();
-
-    auto& devManager = gcpRendD3D->m_DevMan;
-    devManager.BindConstantBuffer(eHWSC_Compute, m_PassConstantBuffer.get(), eConstantBufferShaderSlot_PerPass);
-    devManager.BindConstantBuffer(eHWSC_Pixel, m_PassConstantBuffer.get(), eConstantBufferShaderSlot_PerPass);
-}
-
-Vec4 CSvoRenderer::GetDisabledPerFrameShaderParameters()
-{
-    Vec4 params;
-    params.x = 0.0f;
-    params.y = ACTIVATION_MODE_DISABLED;
-    params.z = 0.0f;
-    params.z = 0.0f;
-    return params;
-}
-
-Vec4 CSvoRenderer::GetPerFrameShaderParameters() const
-{
-    Vec4 params;
-    params.x = 1.f;
-    params.y = GetActivationModeAsFloat();
-    params.z = 0.0f;
-    params.w = 0.0f;
-    return params;
-}
-
-void CSvoRenderer::DebugDrawStats(const RPProfilerStats* pBasicStats, float& ypos, const float ystep, float xposms)
-{
-    ColorF color = Col_Yellow;
-    const EDrawTextFlags  txtFlags = (EDrawTextFlags)(eDrawText_2D | eDrawText_800x600 | eDrawText_FixedSize | eDrawText_Monospace);
-
-#define SVO_Draw2dLabel(labelName)                                                                                        \
-    gRenDev->Draw2dLabel(60, ypos += ystep, 2, &color.r, false, (const char*)(((const char*)(#labelName)) + 10));         \
-    if (pBasicStats[labelName].gpuTimeMax > 0.01) {                                                                       \
-        gRenDev->Draw2dLabelEx(xposms, ypos, 2, color, txtFlags, "%5.2f Aver=%5.2f Max=%5.2f",                            \
-            pBasicStats[labelName].gpuTime, pBasicStats[labelName].gpuTimeSmoothed, pBasicStats[labelName].gpuTimeMax); } \
-    else{                                                                                                                 \
-        gRenDev->Draw2dLabelEx(xposms, ypos, 2, color, txtFlags, "%5.2f", pBasicStats[labelName].gpuTime); }              \
-
-    SVO_Draw2dLabel(eRPPSTATS_TI_INJECT_CLEAR);
-    SVO_Draw2dLabel(eRPPSTATS_TI_VOXELIZE);
-    SVO_Draw2dLabel(eRPPSTATS_TI_INJECT_AIR);
-    SVO_Draw2dLabel(eRPPSTATS_TI_INJECT_LIGHT);
-    SVO_Draw2dLabel(eRPPSTATS_TI_INJECT_REFL0);
-    SVO_Draw2dLabel(eRPPSTATS_TI_INJECT_REFL1);
-    SVO_Draw2dLabel(eRPPSTATS_TI_INJECT_DYNL);
-    SVO_Draw2dLabel(eRPPSTATS_TI_NID_DIFF);
-    SVO_Draw2dLabel(eRPPSTATS_TI_GEN_DIFF);
-    SVO_Draw2dLabel(eRPPSTATS_TI_GEN_SPEC);
-    SVO_Draw2dLabel(eRPPSTATS_TI_GEN_AIR);
-    SVO_Draw2dLabel(eRPPSTATS_TI_DEMOSAIC_DIFF);
-    SVO_Draw2dLabel(eRPPSTATS_TI_DEMOSAIC_SPEC);
-    SVO_Draw2dLabel(eRPPSTATS_TI_UPSCALE_DIFF);
-    SVO_Draw2dLabel(eRPPSTATS_TI_UPSCALE_SPEC);
-}
-
-void CSvoRenderer::SetShaderFlags(bool bDiffuseMode, bool bPixelShader)
-{
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (m_texInfo.pGlobalSpecCM && GetIntegratioMode()) // use global env CM
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-    else
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE1];
-
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE3];
-    }
-
-    if (bDiffuseMode) // diffuse or specular rendering
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-    else
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-
-    if (GetIntegratioMode()) // ignore colors and normals for AO only mode
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-    else
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_HW_PCF_COMPARE];
-    }
-
-    if (bPixelShader && !GetIntegratioMode() && gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal()) // read sun light and shadow map during final cone tracing
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ];
-    }
-    else
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_LIGHT_TEX_PROJ];
-    }
-
-    if (bPixelShader && !GetIntegratioMode() && gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal() && m_arrLightsDynamic.Count()) // read sun light and shadow map during final cone tracing
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_POINT_LIGHT];
-    }
-    else
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_POINT_LIGHT];
-    }
-}
-
-int CSvoRenderer::GetIntegratioMode()
-{
-    return gEnv->pConsole->GetCVar("e_svoTI_IntegrationMode")->GetIVal();
-}
-
-bool CSvoRenderer::IsActive()
-{
-    static ICVar* e_GI = gEnv->pConsole->GetCVar("e_GI");
-    static ICVar* e_svoTI_Active = gEnv->pConsole->GetCVar("e_svoTi_Active");
-
-    //Unable to find cvars, clearly can't be active.
-    if (!e_GI || !e_svoTI_Active)
-    {
-        return false;
-    }
-
-    return e_GI->GetIVal() && CSvoRenderer::s_pInstance && e_svoTI_Active->GetIVal();
-}
-
-bool CSvoRenderer::SetSamplers(int nCustomID, EHWShaderClass eSHClass, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit)
-{
-    CSvoRenderer* pSR = CSvoRenderer::GetInstance();
-
-    if (!pSR)
-    {
-        return false;
-    }
-
-    switch (nCustomID)
-    {
-    case TO_SVOTREE:
-    case TO_SVOTRIS:
-    case TO_SVOGLCM:
-    case TO_SVORGBS:
-    case TO_SVONORM:
-    case TO_SVOOPAC:
-    {
-        CTexture* pTex = CTextureManager::Instance()->GetBlackTexture();
-
-        if (pSR->m_texInfo.pTexTree)
-        {
-            if (nCustomID == TO_SVOTREE)
-            {
-                nCustomID = pSR->m_texInfo.pTexTree->GetTextureID();
-            }
-            if (nCustomID == TO_SVORGBS)
-            {
-                if (pSR->m_texInfo.pTexRgb0)
-                {
-                    nCustomID = pSR->m_texInfo.pTexRgb0->GetTextureID();
-                }
-            }
-            if (nCustomID == TO_SVONORM)
-            {
-                nCustomID = pSR->m_texInfo.pTexNorm->GetTextureID();
-            }
-            if (nCustomID == TO_SVOOPAC)
-            {
-                nCustomID = pSR->m_texInfo.pTexOpac->GetTextureID();
-            }
-
-            if (nCustomID > 0)
-            {
-                pTex = CTexture::GetByID(nCustomID);
-            }
-        }
-
-        pTex->Apply(nTUnit, nTState, nTexMaterialSlot, nSUnit, -1, eSHClass);
-
-        return true;
-    }
-    }
-
-    return false;
-}
-
-CTexture* CSvoRenderer::GetDiffuseFinRT()
-{
-    return m_tsDiff.pRT_FIN_OUT_0;
-}
-
-CTexture* CSvoRenderer::GetSpecularFinRT()
-{
-    return m_tsSpec.pRT_FIN_OUT_0;
-}
-
-void CSvoRenderer::UpScalePass(SSvoTargetsSet* pTS)
-{
-
-    const char* szTechFinalName = "UpScalePass";
-
-    if (!IsActive() || !m_pShader)
-    {
-        return;
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    rd->FX_PushRenderTarget(0, pTS->pRT_FIN_OUT_0, NULL, -1, false, 1);
-
-    SetShaderFlags(pTS == &m_tsDiff);
-
-    SD3DPostEffectsUtils::ShBeginPass(m_pShader, szTechFinalName, FEF_DONTSETTEXTURES);
-
-    if (!gRenDev->m_RP.m_pShader)
-    {
-        gEnv->pLog->LogWarning("Error: %s: Technique not found: %s", __FUNC__, szTechFinalName);
-        rd->FX_PopRenderTarget(0);
-        return;
-    }
-
-    CTexture::s_ptexZTarget->Apply(4, m_nTexStatePoint);
-    GetGBuffer(1)->Apply(5, m_nTexStatePoint);
-    GetGBuffer(2)->Apply(7, m_nTexStatePoint);
-    GetGBuffer(0)->Apply(14, m_nTexStatePoint);
-
-    pTS->pRT_ALD_DEM_MIN_0->Apply(10, m_nTexStatePoint);
-    pTS->pRT_RGB_DEM_MIN_0->Apply(11, m_nTexStatePoint);
-    pTS->pRT_ALD_DEM_MAX_0->Apply(12, m_nTexStatePoint);
-    pTS->pRT_RGB_DEM_MAX_0->Apply(13, m_nTexStatePoint);
-
-    pTS->pRT_FIN_OUT_1->Apply(9, m_nTexStatePoint);
-
-    if (pTS == &m_tsSpec && m_tsDiff.pRT_FIN_OUT_0)
-    {
-        m_tsDiff.pRT_FIN_OUT_0->Apply(15, m_nTexStatePoint);
-    }
-    else
-    {
-        CTextureManager::Instance()->GetBlackTexture()->Apply(15, m_nTexStatePoint);
-    }
-
-    {
-        static CCryNameR parameterName6("SVO_SrcPixSize");
-        Vec4 ttt(0, 0, 0, 0);
-        ttt.x = 1.f / float(pTS->pRT_ALD_DEM_MIN_0->GetWidth());
-        ttt.y = 1.f / float(pTS->pRT_ALD_DEM_MIN_0->GetHeight());
-        m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-    }
-
-    {
-        static CCryNameR parameterName5("SVO_ReprojectionMatrix");
-        m_pShader->FXSetPSFloat(parameterName5, (Vec4*)m_matReproj.GetData(), 3);
-    }
-
-    {
-        float fSizeRatioW = float(rd->GetWidth() / rd->m_RTStack[0][rd->m_nRTStackLevel[0]].m_Width);
-        float fSizeRatioH = float(rd->GetHeight() / rd->m_RTStack[0][rd->m_nRTStackLevel[0]].m_Height);
-        static CCryNameR parameterName6("SVO_TargetResScale");
-        static int nPrevWidth = 0;
-        Vec4 ttt(fSizeRatioW, fSizeRatioH, gEnv->pConsole->GetCVar("e_svoTemporalFilteringBase")->GetFVal(),
-            (float)(nPrevWidth != (pTS->pRT_ALD_0->GetWidth() + 1) || (rd->m_RP.m_nRendFlags & SHDF_CUBEMAPGEN) || (rd->GetActiveGPUCount() > 1)));
-        m_pShader->FXSetPSFloat(parameterName6, (Vec4*)&ttt, 1);
-        nPrevWidth = (pTS->pRT_ALD_0->GetWidth() + 1);
-    }
-
-    {
-        Matrix44A mViewProj;
-        mViewProj = gcpRendD3D->m_ViewProjMatrix;
-        mViewProj.Transpose();
-
-        static CCryNameR paramName("g_mViewProj");
-        m_pShader->FXSetPSFloat(paramName, alias_cast<Vec4*>(&mViewProj), 4);
-
-        static CCryNameR paramNamePrev("g_mViewProjPrev");
-        m_pShader->FXSetPSFloat(paramNamePrev, alias_cast<Vec4*>(&m_matViewProjPrev), 4);
-    }
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexCurrentSceneDiffuseAccMap->GetWidth(), CTexture::s_ptexCurrentSceneDiffuseAccMap->GetHeight());
-
-    SD3DPostEffectsUtils::ShEndPass();
-
-    rd->FX_PopRenderTarget(0);
-}
-
-void CSvoRenderer::SetupRsmSun(const EHWShaderClass eShClass)
-{
-    
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    int nLightID = 0;
-
-    threadID m_nThreadID = gcpRendD3D->m_RP.m_nProcessThreadID;
-    int m_nRecurseLevel = SRendItem::m_RecurseLevel[m_nThreadID];
-
-    int nFrustumIdx = nLightID;// + nDLights;
-
-    int nStartIdx = SRendItem::m_StartFrust[m_nThreadID][nFrustumIdx];
-    int nEndIdx = SRendItem::m_EndFrust[m_nThreadID][nFrustumIdx];
-
-    static CCryNameR lightProjParamName("SVO_RsmSunShadowProj");
-    static CCryNameR rsmSunColParameterName("SVO_RsmSunCol");
-    static CCryNameR rsmSunDirParameterName("SVO_RsmSunDir");
-    Matrix44A shadowMat;
-    shadowMat.SetIdentity();
-
-    int nFrIdx = 0;
-    for (nFrIdx = nStartIdx; nFrIdx < nEndIdx; nFrIdx++)
-    {
-        ShadowMapFrustum& firstFrustum = rd->m_RP.m_SMFrustums[m_nThreadID][m_nRecurseLevel][nFrIdx];
-        if (firstFrustum.nShadowMapLod == 2)
-        {
-            break;
-        }
-    }
-
-    if ((nEndIdx > nFrIdx) && GetRsmColorMap(rd->m_RP.m_SMFrustums[m_nThreadID][m_nRecurseLevel][nFrIdx]))
-    {
-        ShadowMapFrustum& firstFrustum = rd->m_RP.m_SMFrustums[m_nThreadID][m_nRecurseLevel][nFrIdx];
-        rd->ConfigShadowTexgen(0, &firstFrustum, 0);
-
-        if (firstFrustum.bUseShadowsPool)
-        {
-            STexState TS;
-            TS.SetFilterMode(FILTER_POINT);
-            TS.SetClampMode(TADDR_CLAMP, TADDR_CLAMP, TADDR_CLAMP);
-            TS.m_bSRGBLookup = false;
-            CTexture::s_ptexRT_ShadowPool->Apply(12, CTexture::GetTexState(TS), EFTT_UNKNOWN, -1, -1, eShClass);
-        }
-        else
-        {
-            firstFrustum.pDepthTex->Apply(12, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
-            GetRsmColorMap(firstFrustum)->Apply(13, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
-            GetRsmNormlMap(firstFrustum)->Apply(9, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
-        }
-
-        // set up shadow matrix
-        shadowMat = gRenDev->m_TempMatrices[0][0];
-        const Vec4 vEye(gRenDev->GetViewParameters().vOrigin, 0.f);
-        Vec4 vecTranslation(vEye.Dot((Vec4&)shadowMat.m00), vEye.Dot((Vec4&)shadowMat.m10), vEye.Dot((Vec4&)shadowMat.m20), vEye.Dot((Vec4&)shadowMat.m30));
-        shadowMat.m03 += vecTranslation.x;
-        shadowMat.m13 += vecTranslation.y;
-        shadowMat.m23 += vecTranslation.z;
-        shadowMat.m33 += vecTranslation.w;
-        (Vec4&)shadowMat.m20 *= gRenDev->m_cEF.m_TempVecs[2].x;
-        SetShaderFloat(eShClass, lightProjParamName, alias_cast<Vec4*>(&shadowMat), 4);
-
-        Vec4 ttt(gEnv->p3DEngine->GetSunColor(), gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal());
-        SetShaderFloat(eShClass, rsmSunColParameterName, (Vec4*)&ttt, 1);
-        Vec4 ttt2(gEnv->p3DEngine->GetSunDirNormalized(), 0);
-        SetShaderFloat(eShClass, rsmSunDirParameterName, (Vec4*)&ttt2, 1);
-    }
-    else
-    {
-        CTextureManager::Instance()->GetBlackTexture()->Apply(12, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
-        CTextureManager::Instance()->GetBlackTexture()->Apply(13, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
-        CTextureManager::Instance()->GetBlackTexture()->Apply(9, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
-        SetShaderFloat(eShClass, lightProjParamName, alias_cast<Vec4*>(&shadowMat), 4);
-
-        Vec4 ttt(0, 0, 0, 0);
-        SetShaderFloat(eShClass, rsmSunColParameterName, (Vec4*)&ttt, 1);
-        Vec4 ttt2(0, 0, 0, 0);
-        SetShaderFloat(eShClass, rsmSunDirParameterName, (Vec4*)&ttt2, 1);
-    }
-}
-
-ISvoRenderer* CD3D9Renderer::GetISvoRenderer()
-{
-    return CSvoRenderer::GetInstance(true);
-}
-
-void CSvoRenderer::SetShaderFloat(const EHWShaderClass eShClass, const CCryNameR& NameParam, const Vec4* fParams, int nParams)
-{
-    if (eShClass == eHWSC_Pixel)
-    {
-        m_pShader->FXSetPSFloat(NameParam, fParams, nParams);
-    }
-    else if (eShClass == eHWSC_Compute)
-    {
-        m_pShader->FXSetCSFloat(NameParam, fParams, nParams);
-    }
-    else if (eShClass == eHWSC_Vertex)
-    {
-        m_pShader->FXSetVSFloat(NameParam, fParams, nParams);
-    }
-}
-
-void CSvoRenderer::BindTiledLights(PodArray<I3DEngine::SLightTI>& lightsTI, EHWShaderClass shaderType)
-{
-    gcpRendD3D->GetTiledShading().BindForwardShadingResources(NULL, shaderType);
-
-    STiledLightShadeInfo* tiledLightShadeInfo = gcpRendD3D->GetTiledShading().GetTiledLightShadeInfo();
-
-    for (int l = 0; l < lightsTI.Count(); l++)
-    {
-        I3DEngine::SLightTI& svoLight = lightsTI[l];
-
-        if (!svoLight.vDirF.w)
-        {
-            continue;
-        }
-
-        const int tlTypeRegularProjector = 6;
-
-        Vec4 worldViewPos = Vec4(gcpRendD3D->GetViewParameters().vOrigin, 0);
-
-        for (uint32 lightIdx = 0; lightIdx <= 255 && tiledLightShadeInfo[lightIdx].posRad != Vec4(0, 0, 0, 0); ++lightIdx)
-        {
-            if ((tiledLightShadeInfo[lightIdx].lightType == tlTypeRegularProjector) && svoLight.vPosR.IsEquivalent(tiledLightShadeInfo[lightIdx].posRad + worldViewPos, .5f))
-            {
-                if (svoLight.vCol.w > 0)
-                {
-                    svoLight.vCol.w = ((float)lightIdx + 100);
-                }
-                else
-                {
-                    svoLight.vCol.w = -((float)lightIdx + 100);
-                }
-            }
-        }
-    }
-}
-
-CTexture* CSvoRenderer::GetRsmColorMap(ShadowMapFrustum& rFr, bool bCheckUpdate)
-{
-    if (IsActive() && (rFr.nShadowMapLod == 2) && gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal())
-    {
-        if (bCheckUpdate)
-        {
-            CSvoRenderer::GetInstance()->CheckCreateUpdateRT(CSvoRenderer::GetInstance()->m_pRsmColorMap, rFr.nShadowMapSize, rFr.nShadowMapSize, eTF_R8G8B8A8, eTT_2D, FT_STATE_CLAMP, "SVO_SUN_RSM_COLOR");
-        }
-
-        return CSvoRenderer::GetInstance()->m_pRsmColorMap;
-    }
-
-    if (IsActive() && rFr.bUseShadowsPool && gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal() && rFr.m_Flags & DLF_USE_FOR_SVOGI)
-    {
-        if (bCheckUpdate)
-        {
-            CSvoRenderer::GetInstance()->CheckCreateUpdateRT(CSvoRenderer::GetInstance()->m_pRsmPoolCol, gcpRendD3D->m_nShadowPoolWidth, gcpRendD3D->m_nShadowPoolHeight, eTF_R8G8B8A8, eTT_2D, FT_STATE_CLAMP, "SVO_PRJ_RSM_COLOR");
-        }
-
-        return CSvoRenderer::GetInstance()->m_pRsmPoolCol;
-    }
-
-    return NULL;
-}
-
-CTexture* CSvoRenderer::GetRsmNormlMap(ShadowMapFrustum& rFr, bool bCheckUpdate)
-{
-    if (IsActive() &&  (rFr.nShadowMapLod == 2) && gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal())
-    {
-        if (bCheckUpdate)
-        {
-            CSvoRenderer::GetInstance()->CheckCreateUpdateRT(CSvoRenderer::GetInstance()->m_pRsmNormlMap, rFr.nShadowMapSize, rFr.nShadowMapSize, eTF_R8G8B8A8, eTT_2D, FT_STATE_CLAMP, "SVO_SUN_RSM_NORMAL");
-        }
-
-        return CSvoRenderer::GetInstance()->m_pRsmNormlMap;
-    }
-
-    if (IsActive() && rFr.bUseShadowsPool && gEnv->pConsole->GetCVar("e_svoTI_InjectionMultiplier")->GetFVal() && rFr.m_Flags & DLF_USE_FOR_SVOGI)
-    {
-        if (bCheckUpdate)
-        {
-            CSvoRenderer::GetInstance()->CheckCreateUpdateRT(CSvoRenderer::GetInstance()->m_pRsmPoolNor, gcpRendD3D->m_nShadowPoolWidth, gcpRendD3D->m_nShadowPoolHeight, eTF_R8G8B8A8, eTT_2D, FT_STATE_CLAMP, "SVO_PRJ_RSM_NORMAL");
-        }
-
-        return CSvoRenderer::GetInstance()->m_pRsmPoolNor;
-    }
-
-    return NULL;
-}
-
-void CSvoRenderer::CheckCreateUpdateRT(CTexture*& pTex, int nWidth, int nHeight, ETEX_Format eTF, [[maybe_unused]] ETEX_Type eTT, [[maybe_unused]] int nTexFlags, const char* szName)
-{
-    if ((!pTex) || (pTex->GetWidth() != nWidth) || (pTex->GetHeight() != nHeight) || (pTex->GetTextureDstFormat() != eTF))
-    {
-        SAFE_RELEASE(pTex);
-
-        char szNameEx[256] = "";
-        sprintf_s(szNameEx, "%s_%d_%d", szName, nWidth, nHeight); // workaround for RT management bug
-
-        SD3DPostEffectsUtils::CreateRenderTarget(szNameEx, pTex, nWidth, nHeight, Clr_Unknown, false, false, eTF);
-
-        //iLog->Log("Realloc RT %dx%d, %s, %s", nWidth, nHeight, CTexture::NameForTextureFormat(eTF), szName);
-    }
-}
-
-
-void CSvoRenderer::SVoxPool::Init(ITexture* _pTex)
-{
-    CTexture* pTex = (CTexture*)_pTex;
-
-    if (pTex)
-    {
-        pUAV = (D3DUnorderedAccessView*)((CTexture*)pTex)->GetDeviceUAV();
-        nTexId = pTex->GetTextureID();
-    }
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/D3D_SVO.h b/Code/CryEngine/RenderDll/XRenderD3D9/D3D_SVO.h
deleted file mode 100644
index d23ab95ced..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/D3D_SVO.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef __D3D_SVO__H__
-#define __D3D_SVO__H__
-
-#if defined(FEATURE_SVO_GI)
-
-struct SSvoTargetsSet
-{
-    SSvoTargetsSet() { ZeroStruct(*this); }
-    void Release();
-
-    CTexture
-        // tracing targets
-        *pRT_RGB_0, *pRT_ALD_0,
-        *pRT_RGB_1, *pRT_ALD_1,
-        // de-mosaic targets
-        *pRT_RGB_DEM_MIN_0, *pRT_ALD_DEM_MIN_0,
-        *pRT_RGB_DEM_MAX_0, *pRT_ALD_DEM_MAX_0,
-        *pRT_RGB_DEM_MIN_1, *pRT_ALD_DEM_MIN_1,
-        *pRT_RGB_DEM_MAX_1, *pRT_ALD_DEM_MAX_1,
-        // output
-        *pRT_FIN_OUT_0,
-        *pRT_FIN_OUT_1;
-};
-
-class CSvoRenderer
-    : public ISvoRenderer
-{
-public:
-    static Vec4 GetDisabledPerFrameShaderParameters();
-    static CSvoRenderer* GetInstance(bool bCheckAlloce = false);
-
-    void Release();
-    static bool IsActive();
-    void UpdateCompute();
-    void UpdateRender();
-    int GetIntegratioMode();
-
-    Vec4 GetPerFrameShaderParameters() const;
-
-    void DebugDrawStats(const RPProfilerStats* pBasicStats, float& ypos, const float ystep, float xposms);
-    static bool SetSamplers(int nCustomID, EHWShaderClass eSHClass, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit);
-
-    CTexture* GetDiffuseFinRT();
-    CTexture* GetSpecularFinRT();
-    static CTexture* GetRsmColorMap(ShadowMapFrustum& rFr, bool bCheckUpdate = false);
-    static CTexture* GetRsmNormlMap(ShadowMapFrustum& rFr, bool bCheckUpdate = false);
-    float GetSsaoAmount() { return IsActive() ? gEnv->pConsole->GetCVar("e_svoTI_SSAOAmount")->GetFVal() : 1.f; }
-    CTexture* GetRsmPoolCol() { return IsActive() ? m_pRsmPoolCol : NULL; }
-    CTexture* GetRsmPoolNor() { return IsActive() ? m_pRsmPoolNor : NULL; }
-
-    void Lock() { m_renderMutex.lock(); }
-    void Unlock() { m_renderMutex.unlock(); }
-
-protected:
-
-    CSvoRenderer();
-    virtual ~CSvoRenderer();
-    bool IsShaderItemUsedForVoxelization(SShaderItem& rShaderItem, IRenderNode* pRN);
-    static CTexture* GetGBuffer(int nId);
-    void UpScalePass(SSvoTargetsSet* pTS);
-    void DemosaicPass(SSvoTargetsSet* pTS);
-    void ConeTracePass(SSvoTargetsSet* pTS);
-    void SetupRsmSun(const EHWShaderClass eShClass);
-    void SetShaderFloat(const EHWShaderClass eShClass, const CCryNameR& NameParam, const Vec4* fParams, int nParams);
-    void CheckCreateUpdateRT(CTexture*& pTex, int nWidth, int nHeight, ETEX_Format eTF, ETEX_Type eTT, int nTexFlags, const char* szName);
-
-    enum EComputeStages
-    {
-        eCS_ClearBricks,
-        eCS_InjectDynamicLights,
-        eCS_InjectStaticLights,
-        eCS_PropagateLighting_1to2,
-        eCS_PropagateLighting_2to3,
-    };
-
-    void ExecuteComputeShader(CShader* pSH, const char* szTechFinalName, EComputeStages etiStage, int* nNodesForUpdateStartIndex, int nObjPassId, PodArray<I3DEngine::SSvoNodeInfo>& arrNodesForUpdate);
-    void SetShaderFlags(bool bDiffuseMode = true, bool bPixelShader = true);
-    void SetupSvoTexturesForRead(I3DEngine::SSvoStaticTexInfo& texInfo, EHWShaderClass eShaderClass, int nStage, int nStageOpa = 0, int nStageNorm = 0);
-    void SetupNodesForUpdate(int& nNodesForUpdateStartIndex, PodArray<I3DEngine::SSvoNodeInfo>& arrNodesForUpdate);
-    void CheckAllocateRT(bool bSpecPass);
-    void SetupLightSources(PodArray<I3DEngine::SLightTI>& lightsTI, CShader* pShader, bool bPS);
-    void BindTiledLights(PodArray<I3DEngine::SLightTI>& lightsTI, EHWShaderClass shaderType);
-    void DrawPonts(PodArray<SVF_P3F_C4B_T2F>& arrVerts);
-
-    void UpdatePassConstantBuffer();
-
-    SSvoTargetsSet m_tsDiff, m_tsSpec;
-
-    CTexture
-        *m_pRT_NID_0,
-        *m_pRT_AIR_MIN,
-        *m_pRT_AIR_MAX,
-        *m_pRT_AIR_SHAD;
-
-    int m_nTexStateTrilinear, m_nTexStateLinear, m_nTexStatePoint, m_nTexStateLinearWrap;
-    Matrix44A m_matReproj;
-    Matrix44A m_matViewProjPrev;
-    CShader* m_pShader;
-    CTexture* m_pNoiseTex;
-    CTexture* m_pRsmColorMap;
-    CTexture* m_pRsmNormlMap;
-    CTexture* m_pRsmPoolCol;
-    CTexture* m_pRsmPoolNor;
-    AzRHI::ConstantBufferPtr m_PassConstantBuffer;
-
-    struct SVoxPool
-    {
-        SVoxPool() { nTexId = 0; pUAV = 0; }
-        void Init(ITexture* pTex);
-        int nTexId;
-        ID3D11UnorderedAccessView* pUAV;
-    };
-
-    SVoxPool vp_OPAC;
-    SVoxPool vp_RGB0;
-    SVoxPool vp_RGB1;
-    SVoxPool vp_DYNL;
-    SVoxPool vp_RGB2;
-    SVoxPool vp_RGB3;
-    SVoxPool vp_NORM;
-    SVoxPool vp_ALDI;
-
-    PodArray<I3DEngine::SSvoNodeInfo> m_nodesForStaticUpdate;
-    PodArray<I3DEngine::SSvoNodeInfo> m_nodesForDynamicUpdate;
-    PodArray<I3DEngine::SLightTI> m_arrLightsStatic;
-    PodArray<I3DEngine::SLightTI> m_arrLightsDynamic;
-    static const int SVO_MAX_NODE_GROUPS = 4;
-    float               m_arrNodesForUpdate[SVO_MAX_NODE_GROUPS][4][4];
-    int                 m_nCurPropagationPassID;
-    I3DEngine::SSvoStaticTexInfo m_texInfo;
-    static CSvoRenderer* s_pInstance;
-    PodArray<I3DEngine::SSvoNodeInfo> m_arrNodeInfo;
-    AZStd::mutex m_renderMutex;
-
-};
-#endif
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX/RenderCapabilities.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX/RenderCapabilities.cpp
deleted file mode 100644
index e4d91a49d4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX/RenderCapabilities.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include "..\Common\RenderCapabilities.h"
-
-namespace RenderCapabilities
-{
-    bool SupportsTextureViews()
-    {
-        return true;
-    }
-
-    bool SupportsStencilTextures()
-    {
-        return true;
-    }
-
-    bool SupportsPLSExtension()
-    {
-        return false;
-    }
-
-    FrameBufferFetchMask GetFrameBufferFetchCapabilities()
-    {
-        return FrameBufferFetchMask();
-    }
-
-    bool SupportsDepthClipping()
-    {
-        return true;
-    }
-
-    bool SupportsDualSourceBlending()
-    {
-        return true;
-    }
-
-    bool SupportsStructuredBuffer([[maybe_unused]] EShaderStage stage)
-    {
-        return true;
-    }
-
-    bool SupportsIndependentBlending()
-    {
-        return true;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX/Tests/test_Main.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX/Tests/test_Main.cpp
deleted file mode 100644
index 3d54c26e4c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX/Tests/test_Main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/UnitTest/UnitTest.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Memory/OSAllocator.h>
-#include <AzCore/Memory/AllocatorManager.h>
-namespace
-{
-    class RenderDllTestEnvironment final
-        : public AZ::Test::ITestEnvironment
-        , UnitTest::TraceBusRedirector // provides AZ_TEST_START_TRACE_SUPPRESSION
-    {
-    public:
-        AZ_TEST_CLASS_ALLOCATOR(RenderDllTestEnvironment);
-
-    protected:
-        void SetupEnvironment() override
-        {
-            AZ::Debug::TraceMessageBus::Handler::BusConnect();
-        }
-
-        void TeardownEnvironment() override
-        {           
-            AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
-        }
-    private:
-    };
-}
-AZ_UNIT_TEST_HOOK(new RenderDllTestEnvironment);
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12AsyncCommandQueue.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12AsyncCommandQueue.cpp
deleted file mode 100644
index 451ba86161..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12AsyncCommandQueue.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DX12AsyncCommandQueue.hpp"
-#include "DX12CommandList.hpp"
-#include "DriverD3D.h"
-
-#include <AzCore/Debug/EventTraceDrillerBus.h>
-
-#define TRACK_RENDERTREAD_WAIT_TIME SScopedExecutionTimeTracker renderThreadWaitTimeTracker(gcpRendD3D->m_fTimeWaitForGPU[gcpRendD3D->m_RP.m_nProcessThreadID]);
-
-struct SScopedExecutionTimeTracker
-{
-    SScopedExecutionTimeTracker(float& var)
-        : trackerVariable(var)
-        , startTime(iTimer ? iTimer->GetAsyncTime() : 0.0f)
-    {}
-
-    ~SScopedExecutionTimeTracker()
-    {
-        trackerVariable += iTimer ? iTimer->GetAsyncTime().GetDifferenceInSeconds(startTime) : 0.0f;
-    }
-
-    float& trackerVariable;
-    CTimeValue startTime;
-};
-
-namespace DX12
-{
-    void AsyncCommandQueue::SExecuteCommandlist::Process(const STaskArgs& args)
-    {
-        AZ_TRACE_METHOD_NAME("CommandQueue ExecuteCommandLists");
-        args.pCommandQueue->ExecuteCommandLists(1, &pCommandList);
-    }
-
-    void AsyncCommandQueue::SResetCommandlist::Process([[maybe_unused]] const STaskArgs& args)
-    {
-        AZ_TRACE_METHOD_NAME("CommandList Reset");
-        pCommandList->Reset();
-    }
-
-    void AsyncCommandQueue::SSignalFence::Process(const STaskArgs& args)
-    {
-        AZ_TRACE_METHOD_NAME("Fence Signal");
-        args.pCommandQueue->Signal(pFence, FenceValue);
-    }
-
-    void AsyncCommandQueue::SWaitForFence::Process(const STaskArgs& args)
-    {
-        AZ_TRACE_METHOD_NAME("Fence Wait");
-        args.pCommandQueue->Wait(pFence, FenceValue);
-    }
-
-    void AsyncCommandQueue::SWaitForFences::Process(const STaskArgs& args)
-    {
-        AZ_TRACE_METHOD_NAME("Fence MultiWait");
-        if (FenceValues[CMDQUEUE_COPY    ])
-        {
-            args.pCommandQueue->Wait(pFences[CMDQUEUE_COPY    ], FenceValues[CMDQUEUE_COPY    ]);
-        }
-        if (FenceValues[CMDQUEUE_GRAPHICS])
-        {
-            args.pCommandQueue->Wait(pFences[CMDQUEUE_GRAPHICS], FenceValues[CMDQUEUE_GRAPHICS]);
-        }
-    }
-
-    AsyncCommandQueue::AsyncCommandQueue()
-        : m_pCmdListPool(NULL)
-        , m_QueuedFramesCounter(0)
-        , m_bStopRequested(false)
-    {
-    }
-
-    AsyncCommandQueue::~AsyncCommandQueue()
-    {
-        SignalStop();
-        Flush();
-
-        GetISystem()->GetIThreadManager()->JoinThread(this, eJM_Join);
-    }
-
-    void AsyncCommandQueue::Init(CommandListPool* pCommandListPool)
-    {
-        m_pCmdListPool = pCommandListPool;
-        m_QueuedFramesCounter = 0;
-        m_QueuedTasksCounter = 0;
-        m_bStopRequested = false;
-
-        GetISystem()->GetIThreadManager()->SpawnThread(this, "DX12 AsyncCommandQueue");
-    }
-
-
-    void AsyncCommandQueue::ExecuteCommandLists(UINT NumCommandLists, ID3D12CommandList* const* ppCommandLists)
-    {
-        for (int i = 0; i < NumCommandLists; ++i)
-        {
-            SSubmissionTask task;
-            ZeroStruct(task);
-
-            task.type = eTT_ExecuteCommandList;
-            task.Data.ExecuteCommandList.pCommandList = ppCommandLists[i];
-
-            AddTask<SExecuteCommandlist>(task);
-        }
-    }
-
-    void AsyncCommandQueue::ResetCommandList(CommandList* pCommandList)
-    {
-        SSubmissionTask task;
-        ZeroStruct(task);
-
-        task.type = eTT_ResetCommandList;
-        task.Data.ResetCommandList.pCommandList = pCommandList;
-
-        AddTask<SResetCommandlist>(task);
-    }
-
-    void AsyncCommandQueue::Signal(ID3D12Fence* pFence, const UINT64 FenceValue)
-    {
-        SSubmissionTask task;
-        ZeroStruct(task);
-
-        task.type = eTT_SignalFence;
-        task.Data.SignalFence.pFence = pFence;
-        task.Data.SignalFence.FenceValue = FenceValue;
-
-        AddTask<SSignalFence>(task);
-    }
-
-    void AsyncCommandQueue::Wait(ID3D12Fence* pFence, const UINT64 FenceValue)
-    {
-        SSubmissionTask task;
-        ZeroStruct(task);
-
-        task.type = eTT_WaitForFence;
-        task.Data.WaitForFence.pFence = pFence;
-        task.Data.WaitForFence.FenceValue = FenceValue;
-
-        AddTask<SWaitForFence>(task);
-    }
-
-    void AsyncCommandQueue::Wait(ID3D12Fence** pFences, const UINT64 (&FenceValues)[CMDQUEUE_NUM])
-    {
-        SSubmissionTask task;
-        ZeroStruct(task);
-
-        task.type = eTT_WaitForFences;
-        task.Data.WaitForFences.pFences = pFences;
-        task.Data.WaitForFences.FenceValues[CMDQUEUE_COPY    ] = FenceValues[CMDQUEUE_COPY    ];
-        task.Data.WaitForFences.FenceValues[CMDQUEUE_GRAPHICS] = FenceValues[CMDQUEUE_GRAPHICS];
-
-        AddTask<SWaitForFences>(task);
-    }
-
-    void AsyncCommandQueue::Flush(UINT64 lowerBoundFenceValue)
-    {
-        TRACK_RENDERTREAD_WAIT_TIME
-
-        if (lowerBoundFenceValue != (~0ULL))
-        {
-            while (m_QueuedTasksCounter > 0)
-            {
-                if (lowerBoundFenceValue <= m_pCmdListPool->GetLastCompletedFenceValue())
-                {
-                    break;
-                }
-
-                Sleep(0);
-            }
-        }
-        else
-        {
-            while (m_QueuedTasksCounter > 0)
-            {
-                Sleep(0);
-            }
-        }
-    }
-
-    void AsyncCommandQueue::ThreadEntry()
-    {
-        EBUS_EVENT(AZ::Debug::EventTraceDrillerSetupBus, SetThreadName, AZStd::this_thread::get_id(), "AsyncCommandQueue");
-
-        while (!m_bStopRequested)
-        {
-            SSubmissionTask task;
-            STaskArgs taskArgs = { m_pCmdListPool->GetD3D12CommandQueue(), &m_QueuedFramesCounter };
-
-            if (m_TaskQueue.dequeue(task))
-            {
-                switch (task.type)
-                {
-                case eTT_ExecuteCommandList:
-                    task.Process<SExecuteCommandlist>(taskArgs);
-                    break;
-                case eTT_ResetCommandList:
-                    task.Process<SResetCommandlist>(taskArgs);
-                    break;
-                case eTT_SignalFence:
-                    task.Process<SSignalFence>(taskArgs);
-                    break;
-                case eTT_WaitForFence:
-                    task.Process<SWaitForFence>(taskArgs);
-                    break;
-                case eTT_WaitForFences:
-                    task.Process<SWaitForFences>(taskArgs);
-                    break;
-                }
-
-                CryInterlockedDecrement(&m_QueuedTasksCounter);
-            }
-            else
-            {
-                Sleep(0);
-            }
-        }
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12AsyncCommandQueue.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12AsyncCommandQueue.hpp
deleted file mode 100644
index 3ae99bb987..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12AsyncCommandQueue.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <IThreadManager.h>
-#include "DX12/Includes/concqueue.hpp"
-#include "DX12Base.hpp"
-#include "DX12/API/DX12CommandListFence.hpp"
-
-struct IDXGISwapChain3;
-
-namespace DX12
-{
-    class CommandListPool;
-
-    class AsyncCommandQueue : public IThread
-    {
-    public:
-        AsyncCommandQueue();
-        ~AsyncCommandQueue();
-
-        template<typename TaskType>
-        static bool IsSynchronous()
-        {
-            return CRenderer::CV_r_D3D12SubmissionThread == 0;
-        }
-
-        void Init(CommandListPool* pCommandListPool);
-        void Flush(UINT64 lowerBoundFenceValue = ~0ULL);
-        void SignalStop() { m_bStopRequested = true; }
-
-        void ResetCommandList(CommandList* pCommandList);
-        void ExecuteCommandLists(UINT NumCommandLists, ID3D12CommandList* const* ppCommandLists);
-        void Signal(ID3D12Fence* pFence, const UINT64 Value);
-        void Wait(ID3D12Fence* pFence, const UINT64 Value);
-        void Wait(ID3D12Fence** pFences, const UINT64 (&Values)[CMDQUEUE_NUM]);
-
-    private:
-        enum eTaskType
-        {
-            eTT_ExecuteCommandList,
-            eTT_ResetCommandList,
-            eTT_SignalFence,
-            eTT_WaitForFence,
-            eTT_WaitForFences
-        };
-
-        struct STaskArgs
-        {
-            ID3D12CommandQueue* pCommandQueue;
-            volatile int* QueueFramesCounter;
-        };
-
-        struct SExecuteCommandlist
-        {
-            ID3D12CommandList* pCommandList;
-
-            void Process(const STaskArgs& args);
-        };
-
-        struct SResetCommandlist
-        {
-            CommandList* pCommandList;
-
-            void Process(const STaskArgs& args);
-        };
-
-        struct SSignalFence
-        {
-            ID3D12Fence* pFence;
-            UINT64 FenceValue;
-
-            void Process(const STaskArgs& args);
-        };
-
-        struct SWaitForFence
-        {
-            ID3D12Fence* pFence;
-            UINT64 FenceValue;
-
-            void Process(const STaskArgs& args);
-        };
-
-        struct SWaitForFences
-        {
-            ID3D12Fence** pFences;
-            UINT64 FenceValues[CMDQUEUE_NUM];
-
-            void Process(const STaskArgs& args);
-        };
-
-        struct SSubmissionTask
-        {
-            eTaskType type;
-
-            union
-            {
-                SSignalFence SignalFence;
-                SWaitForFence WaitForFence;
-                SWaitForFences WaitForFences;
-                SExecuteCommandlist ExecuteCommandList;
-                SResetCommandlist ResetCommandList;
-            } Data;
-
-            template<typename TaskType>
-            void Process(const STaskArgs& args)
-            {
-                TaskType* pTask = reinterpret_cast<TaskType*>(&Data);
-                pTask->Process(args);
-            }
-        };
-
-        template<typename TaskType>
-        void AddTask(SSubmissionTask& task)
-        {
-            if (CRenderer::CV_r_D3D12SubmissionThread)
-            {
-                CryInterlockedIncrement(&m_QueuedTasksCounter);
-                m_TaskQueue.enqueue(task);
-            }
-            else
-            {
-                Flush();
-                STaskArgs taskArgs = { m_pCmdListPool->GetD3D12CommandQueue(), &m_QueuedFramesCounter };
-                task.Process<TaskType>(taskArgs);
-            }
-        }
-
-        void ThreadEntry() override;
-
-        volatile int m_QueuedFramesCounter;
-        volatile int m_QueuedTasksCounter;
-        volatile bool m_bStopRequested;
-
-        CommandListPool* m_pCmdListPool;
-        ConcQueue<UnboundMPSC, SSubmissionTask> m_TaskQueue;
-    };
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Base.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Base.cpp
deleted file mode 100644
index fcfc01cdc3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Base.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12Base.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define DX12BASE_CPP_SECTION_1 1
-#endif
-
-int g_nPrintDX12 = 0;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12BASE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12Base_cpp)
-#endif
-
-namespace DX12
-{
-    //---------------------------------------------------------------------------------------------------------------------
-    UINT GetDXGIFormatSize(DXGI_FORMAT format)
-    {
-        switch (format)
-        {
-        case DXGI_FORMAT_UNKNOWN:
-            return 0;
-
-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
-        case DXGI_FORMAT_R32G32B32A32_UINT:
-        case DXGI_FORMAT_R32G32B32A32_SINT:
-            return 16;
-
-        case DXGI_FORMAT_R32G32B32_TYPELESS:
-        case DXGI_FORMAT_R32G32B32_FLOAT:
-        case DXGI_FORMAT_R32G32B32_UINT:
-        case DXGI_FORMAT_R32G32B32_SINT:
-            return 12;
-
-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
-        case DXGI_FORMAT_R16G16B16A16_UNORM:
-        case DXGI_FORMAT_R16G16B16A16_UINT:
-        case DXGI_FORMAT_R16G16B16A16_SNORM:
-        case DXGI_FORMAT_R16G16B16A16_SINT:
-        case DXGI_FORMAT_R32G32_TYPELESS:
-        case DXGI_FORMAT_R32G32_FLOAT:
-        case DXGI_FORMAT_R32G32_UINT:
-        case DXGI_FORMAT_R32G32_SINT:
-        case DXGI_FORMAT_R32G8X24_TYPELESS:
-        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
-            return 8;
-
-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
-        case DXGI_FORMAT_R10G10B10A2_UNORM:
-        case DXGI_FORMAT_R10G10B10A2_UINT:
-        case DXGI_FORMAT_R11G11B10_FLOAT:
-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
-        case DXGI_FORMAT_R8G8B8A8_UNORM:
-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
-        case DXGI_FORMAT_R8G8B8A8_UINT:
-        case DXGI_FORMAT_R8G8B8A8_SNORM:
-        case DXGI_FORMAT_R8G8B8A8_SINT:
-        case DXGI_FORMAT_R16G16_TYPELESS:
-        case DXGI_FORMAT_R16G16_FLOAT:
-        case DXGI_FORMAT_R16G16_UNORM:
-        case DXGI_FORMAT_R16G16_UINT:
-        case DXGI_FORMAT_R16G16_SNORM:
-        case DXGI_FORMAT_R16G16_SINT:
-        case DXGI_FORMAT_R32_TYPELESS:
-        case DXGI_FORMAT_D32_FLOAT:
-        case DXGI_FORMAT_R32_FLOAT:
-        case DXGI_FORMAT_R32_UINT:
-        case DXGI_FORMAT_R32_SINT:
-        case DXGI_FORMAT_R24G8_TYPELESS:
-        case DXGI_FORMAT_D24_UNORM_S8_UINT:
-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
-        case DXGI_FORMAT_B8G8R8A8_UNORM:
-        case DXGI_FORMAT_B8G8R8X8_UNORM:
-        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
-        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
-        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
-        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
-        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
-        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
-        case DXGI_FORMAT_R8G8_B8G8_UNORM:
-        case DXGI_FORMAT_G8R8_G8B8_UNORM:
-            return 4;
-
-        case DXGI_FORMAT_R8G8_TYPELESS:
-        case DXGI_FORMAT_R8G8_UNORM:
-        case DXGI_FORMAT_R8G8_UINT:
-        case DXGI_FORMAT_R8G8_SNORM:
-        case DXGI_FORMAT_R8G8_SINT:
-        case DXGI_FORMAT_R16_TYPELESS:
-        case DXGI_FORMAT_R16_FLOAT:
-        case DXGI_FORMAT_D16_UNORM:
-        case DXGI_FORMAT_R16_UNORM:
-        case DXGI_FORMAT_R16_UINT:
-        case DXGI_FORMAT_R16_SNORM:
-        case DXGI_FORMAT_R16_SINT:
-        case DXGI_FORMAT_B5G6R5_UNORM:
-        case DXGI_FORMAT_B5G5R5A1_UNORM:
-        case DXGI_FORMAT_B4G4R4A4_UNORM:
-            return 2;
-
-        case DXGI_FORMAT_R8_TYPELESS:
-        case DXGI_FORMAT_R8_UNORM:
-        case DXGI_FORMAT_R8_UINT:
-        case DXGI_FORMAT_R8_SNORM:
-        case DXGI_FORMAT_R8_SINT:
-        case DXGI_FORMAT_A8_UNORM:
-            return 1;
-        }
-
-        DX12_NOT_IMPLEMENTED;
-        return 0;
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    D3D12_CLEAR_VALUE GetDXGIFormatClearValue(DXGI_FORMAT format, bool depth)
-    {
-        D3D12_CLEAR_VALUE clearValue;
-
-        clearValue.Color[0] = 0.0f;
-        clearValue.Color[1] = 0.0f;
-        clearValue.Color[2] = 0.0f;
-        clearValue.Color[3] = 0.0f;
-
-        switch (format)
-        {
-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
-            format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-            break;
-
-        case DXGI_FORMAT_R32G32B32_TYPELESS:
-            format = DXGI_FORMAT_R32G32B32_FLOAT;
-            break;
-
-        case DXGI_FORMAT_R32_TYPELESS:
-            format = depth ? DXGI_FORMAT_D32_FLOAT : DXGI_FORMAT_R32_FLOAT;
-            break;
-
-        case DXGI_FORMAT_R16G16_TYPELESS:
-            format = DXGI_FORMAT_R16G16_FLOAT;
-            break;
-
-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
-            format = DXGI_FORMAT_R16G16B16A16_FLOAT;
-            break;
-
-        case DXGI_FORMAT_R32G32_TYPELESS:
-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
-            format = DXGI_FORMAT_R32G32_FLOAT;
-            break;
-        case DXGI_FORMAT_R32G8X24_TYPELESS:
-            format = depth ? DXGI_FORMAT_D32_FLOAT_S8X24_UINT : DXGI_FORMAT_R32G32_FLOAT;
-            break;
-
-        case DXGI_FORMAT_R24G8_TYPELESS:
-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
-            format = DXGI_FORMAT_D24_UNORM_S8_UINT;
-            break;
-
-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
-            format = DXGI_FORMAT_R10G10B10A2_UNORM;
-            break;
-
-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
-        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
-        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
-            format = DXGI_FORMAT_R8G8B8A8_UNORM;
-            break;
-
-        case DXGI_FORMAT_R8G8_TYPELESS:
-            format = DXGI_FORMAT_R8G8_UNORM;
-            break;
-
-        case DXGI_FORMAT_R16_TYPELESS:
-            format = depth ? DXGI_FORMAT_D16_UNORM : DXGI_FORMAT_R16_FLOAT;
-            break;
-
-        case DXGI_FORMAT_R8_TYPELESS:
-            format = DXGI_FORMAT_R8_UNORM;
-            break;
-        }
-
-        clearValue.Format = format;
-        return clearValue;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //---------------------------------------------------------------------------------------------------------------------
-    DeviceObject::DeviceObject(Device* device)
-        : AzRHI::ReferenceCounted()
-        , m_Device(device)
-        , m_IsInitialized(false)
-    {
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    DeviceObject::~DeviceObject()
-    {
-        DX12_LOG("DX12 object destroyed: %p", this);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Base.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Base.hpp
deleted file mode 100644
index 7045e989cf..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Base.hpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include <I3DEngine.h>
-#include <ISystem.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define DX12BASE_HPP_SECTION_1 1
-#endif
-
-#ifndef NDEBUG
-
-#define DX12_FUNC_LOG do {                              \
-        if (g_nPrintDX12)                               \
-        { CryLog("DX12 function call: %s", __FUNC__); } \
-} while (0);
-
-#define DX12_LOG(...) do {  \
-if (g_nPrintDX12)           \
-  { CryLog("DX12 Log: " __VA_ARGS__); } \
-} while (0)
-#define DX12_ERROR(...) do { CryLog("DX12 Error: " __VA_ARGS__); } while (0)
-#define DX12_ASSERT(cond, ...) \
-  do { if (!(cond)) { DX12_ERROR(__VA_ARGS__); CRY_ASSERT(0); __debugbreak(); } } while(0)
-
-#else
-#define DX12_FUNC_LOG do { } while (0);
-#define DX12_LOG(...) do { } while (0)
-#define DX12_ERROR(...) do { } while (0)
-#define DX12_ASSERT(cond, ...) 
-#endif
-
-#define DX12_NOT_IMPLEMENTED DX12_ASSERT(0, "Not implemented!");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12BASE_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12Base_hpp)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #include <d3d11.h>
-    #include <d3d11_1.h>
-    #include <dxgi1_2.h>
-
-    #include <d3d12.h>
-    #include <d3dx12.h>
-    #include <dxgi1_4.h>
-
-    using IDX12Unknown = IUnknown;
-#endif
-
-#include <Range.h>
-
-#include "../Includes/fasthash.inl"
-#include "../Includes/concqueue.hpp"
-
-#include <XRenderD3D9/DeviceManager/Base.h>
-
-#include <AzCore/std/parallel/atomic.h>
-
-extern int g_nPrintDX12;
-
-#ifndef IID_GRAPHICS_PPV_ARGS
-#define IID_GRAPHICS_PPV_ARGS(ppType) IID_PPV_ARGS(ppType)
-#endif
-
-#define DX12_STATS
-#define DX12_GPU_VIRTUAL_ADDRESS_NULL 0ULL
-#define INVALID_CPU_DESCRIPTOR_HANDLE CD3DX12_CPU_DESCRIPTOR_HANDLE(D3D12_DEFAULT)
-#define INVALID_GPU_DESCRIPTOR_HANDLE CD3DX12_GPU_DESCRIPTOR_HANDLE(D3D12_DEFAULT)
-
-namespace DX12
-{
-    class CommandList;
-    class CommandListPool;
-    class DescriptorHeap;
-    class Device;
-    class GraphicsPipelineState;
-    class PipelineStateCache;
-    class Resource;
-    class ResourceView;
-
-    template <typename T>
-    using SmartPtr = _smart_ptr<T>;
-
-    template <typename T>
-    static T* PassAddRef(T* ptr)
-    {
-        if (ptr)
-        {
-            ptr->AddRef();
-        }
-
-        return ptr;
-    }
-
-    template <typename T>
-    static T* PassAddRef(const _smart_ptr<T>& ptr)
-    {
-        if (ptr)
-        {
-            ptr.get()->AddRef();
-        }
-
-        return ptr.get();
-    }
-
-    typedef uint32_t THash;
-    template<size_t length>
-    inline THash ComputeSmallHash(const void* data, UINT seed = 666)
-    {
-        return fasthash::fasthash32<length>(data, seed);
-    }
-
-    UINT GetDXGIFormatSize(DXGI_FORMAT format);
-    D3D12_CLEAR_VALUE GetDXGIFormatClearValue(DXGI_FORMAT format, bool depth);
-
-    inline bool IsDXGIFormatCompressed(DXGI_FORMAT format)
-    {
-        return
-            (format >= DXGI_FORMAT_BC1_TYPELESS  && format <= DXGI_FORMAT_BC5_SNORM) ||
-            (format >= DXGI_FORMAT_BC6H_TYPELESS && format <= DXGI_FORMAT_BC7_UNORM_SRGB);
-    }
-
-    inline bool IsDXGIFormatCompressed4bpp(DXGI_FORMAT format)
-    {
-        return
-            (format >= DXGI_FORMAT_BC1_TYPELESS  && format <= DXGI_FORMAT_BC1_UNORM_SRGB) ||
-            (format >= DXGI_FORMAT_BC4_TYPELESS  && format <= DXGI_FORMAT_BC4_SNORM);
-    }
-
-    inline bool IsDXGIFormatCompressed8bpp(DXGI_FORMAT format)
-    {
-        return
-            (format >= DXGI_FORMAT_BC2_TYPELESS  && format <= DXGI_FORMAT_BC3_UNORM_SRGB) ||
-            (format >= DXGI_FORMAT_BC5_TYPELESS  && format <= DXGI_FORMAT_BC5_SNORM) ||
-            (format >= DXGI_FORMAT_BC6H_TYPELESS && format <= DXGI_FORMAT_BC7_UNORM_SRGB);
-    }
-
-    class DeviceObject : public AzRHI::ReferenceCounted
-    {
-    public:
-        inline Device* GetDevice() const
-        {
-            return m_Device;
-        }
-
-        inline bool IsInitialized() const
-        {
-            return m_IsInitialized;
-        }
-
-    protected:
-        DeviceObject(Device* device);
-        virtual ~DeviceObject();
-
-        DeviceObject(DeviceObject&& r)
-            : AzRHI::ReferenceCounted(std::move(r))
-            , m_IsInitialized(std::move(r.m_IsInitialized))
-            , m_Device(std::move(r.m_Device))
-        {}
-
-        DeviceObject& operator=(DeviceObject&& r)
-        {
-            AzRHI::ReferenceCounted::operator=(std::move(r));
-
-            m_IsInitialized = std::move(r.m_IsInitialized);
-            m_Device = std::move(r.m_Device);
-
-            return *this;
-        }
-
-        inline void SetDevice(Device* device)
-        {
-            m_Device = device;
-        }
-
-        inline void IsInitialized(bool is)
-        {
-            m_IsInitialized = is;
-        }
-
-    private:
-        Device* m_Device;
-        bool m_IsInitialized;
-    };
-
-    static const UINT CONSTANT_BUFFER_ELEMENT_SIZE = 16U;
-
-    enum CommandMode
-    {
-        CommandModeCompute = 0,
-        CommandModeGraphics,
-        CommandModeCount
-    };
-}
-
-#include "DX12Device.hpp"
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandList.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandList.cpp
deleted file mode 100644
index 3e854fb048..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandList.cpp
+++ /dev/null
@@ -1,1321 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12CommandList.hpp"
-#include "DX12Resource.hpp"
-#include "DX12View.hpp"
-#include "DX12SamplerState.hpp"
-#include "DX12/GI/CCryDX12SwapChain.hpp"
-#include "AzCore/Debug/EventTraceDrillerBus.h"
-
-namespace DX12
-{
-    namespace EventTrace
-    {
-        const AZStd::thread_id GpuDetailThreadId{ (size_t)2 };
-        const char* GpuDetailName = "GPU Detail";
-        const char* GpuDetailCategory = "GPU";
-    }
-
-    const char* StateToString(D3D12_RESOURCE_STATES state)
-    {
-        static int buf = 0;
-        static char str[2][512];
-        static char *ret;
-
-        ret = str[buf ^= 1];
-        *ret = '\0';
-
-        if (!state)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " Common/Present");
-            return ret;
-        }
-
-        if ((state & D3D12_RESOURCE_STATE_GENERIC_READ) == D3D12_RESOURCE_STATE_GENERIC_READ)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " Generic Read");
-            return ret;
-        }
-
-        if (state & D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " V/C Buffer");
-        }
-        if (state & D3D12_RESOURCE_STATE_INDEX_BUFFER)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " I Buffer");
-        }
-        if (state & D3D12_RESOURCE_STATE_RENDER_TARGET)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " RT");
-        }
-        if (state & D3D12_RESOURCE_STATE_UNORDERED_ACCESS)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " UA");
-        }
-        if (state & D3D12_RESOURCE_STATE_DEPTH_WRITE)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " DepthW");
-        }
-        if (state & D3D12_RESOURCE_STATE_DEPTH_READ)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " DepthR");
-        }
-        if (state & D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " NoPixelR");
-        }
-        if (state & D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " PixelR");
-        }
-        if (state & D3D12_RESOURCE_STATE_STREAM_OUT)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " Stream Out");
-        }
-        if (state & D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " Indirect Arg");
-        }
-        if (state & D3D12_RESOURCE_STATE_COPY_DEST)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " CopyD");
-        }
-        if (state & D3D12_RESOURCE_STATE_COPY_SOURCE)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " CopyS");
-        }
-        if (state & D3D12_RESOURCE_STATE_RESOLVE_DEST)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " ResolveD");
-        }
-        if (state & D3D12_RESOURCE_STATE_RESOLVE_SOURCE)
-        {
-            azstrcat(ret, AZStd::size(str[0]), " ResolveS");
-        }
-
-        return ret;
-    }
-
-    CommandList::CommandList(CommandListPool& pool)
-        : DeviceObject(pool.GetDevice())
-        , m_rPool(pool)
-        , m_pCmdQueue{}
-        , m_pCmdAllocator{}
-        , m_CommandList{}
-        , m_pD3D12Device{}
-        , m_CurrentNumRTVs{}
-        , m_CurrentNumVertexBuffers{}
-        , m_CurrentFenceValue{}
-        , m_eListType(pool.GetD3D12QueueType())
-        , m_State(CLSTATE_FREE)
-        , m_nodeMask{}
-#if DX12_GPU_PROFILE_MODE != DX12_GPU_PROFILE_MODE_OFF
-        , m_Timers{ *GetDevice() }
-#endif
-        , m_DescriptorHeaps
-        {
-            {
-                GetDevice()->GetGlobalDescriptorBlock(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1024)
-            },
-            {
-                GetDevice()->GetGlobalDescriptorBlock(D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1024)
-            },
-            {
-                GetDevice()->GetGlobalDescriptorBlock(D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1024)
-            },
-            {
-                GetDevice()->GetGlobalDescriptorBlock(D3D12_DESCRIPTOR_HEAP_TYPE_DSV, 1024)
-            }
-        }
-    {
-        ResetStateTracking(CommandModeCompute);
-        ResetStateTracking(CommandModeGraphics);
-    }
-
-    CommandList::~CommandList()
-    {
-    }
-
-    bool CommandList::Init(UINT64 currentFenceValue)
-    {
-        m_State = CLSTATE_STARTED;
-        m_Commands = 0;
-        m_CurrentPipelineState = nullptr;
-        m_CurrentRootSignature[DX12::CommandModeCompute] = m_CurrentRootSignature[DX12::CommandModeGraphics] = nullptr;
-        m_pDSV = nullptr;
-        m_CurrentNumRTVs = 0;
-        m_CurrentNumVertexBuffers = 0;
-
-        m_CurrentFenceValue = currentFenceValue;
-        ZeroMemory(m_UsedFenceValues, sizeof(m_UsedFenceValues));
-
-        m_pD3D12Device = GetDevice()->GetD3D12Device();
-
-        for (D3D12_DESCRIPTOR_HEAP_TYPE eType = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; eType < D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES; eType = D3D12_DESCRIPTOR_HEAP_TYPE(eType + 1))
-        {
-            m_DescriptorHeaps[eType].Reset();
-        }
-
-        if (!IsInitialized())
-        {
-            m_pCmdQueue = m_rPool.GetD3D12CommandQueue();
-
-            D3D12_COMMAND_LIST_TYPE eCmdListType = m_pCmdQueue->GetDesc().Type;
-
-            ID3D12CommandAllocator* pCmdAllocator = nullptr;
-            if (S_OK != m_pD3D12Device->CreateCommandAllocator(eCmdListType, IID_GRAPHICS_PPV_ARGS(&pCmdAllocator)))
-            {
-                DX12_ERROR("Could not create command allocator!");
-                return false;
-            }
-
-            m_pCmdAllocator = pCmdAllocator;
-            pCmdAllocator->Release();
-
-            ID3D12GraphicsCommandList* pCmdList = nullptr;
-            if (S_OK != m_pD3D12Device->CreateCommandList(m_nodeMask, eCmdListType, m_pCmdAllocator, nullptr, IID_GRAPHICS_PPV_ARGS(&pCmdList)))
-            {
-                DX12_ERROR("Could not create command list");
-                return false;
-            }
-
-            m_CommandList = pCmdList;
-            pCmdList->Release();
-
-#if DX12_GPU_PROFILE_MODE != DX12_GPU_PROFILE_MODE_OFF
-            m_Timers.Init(TimerCountMax);
-#endif
-
-            IsInitialized(true);
-        }
-
-#ifdef DX12_STATS
-        m_NumWaitsGPU = 0;
-        m_NumWaitsCPU = 0;
-#endif // DX12_STATS
-
-        return true;
-    }
-
-    void CommandList::Begin()
-    {
-#if DX12_GPU_PROFILE_MODE != DX12_GPU_PROFILE_MODE_OFF
-        m_Timers.Begin();
-        m_TimerHandle = m_Timers.BeginTimer(*this, "CommandList");
-#endif
-    }
-
-    void CommandList::End()
-    {
-        {
-            DX12_COMMANDLIST_TIMER("End");
-            FlushBarriers();
-        }
-
-        if (IsUtilized())
-        {
-#if DX12_GPU_PROFILE_MODE != DX12_GPU_PROFILE_MODE_OFF
-            m_Timers.EndTimer(*this, m_TimerHandle);
-            m_Timers.End(*this);
-#endif
-
-#ifndef NDEBUG
-            HRESULT res =
-#endif
-                m_CommandList->Close();
-            DX12_ASSERT(res == S_OK, "Could not close command list!");
-        }
-
-        m_State = CLSTATE_COMPLETED;
-    }
-
-    void CommandList::Schedule()
-    {
-        if (m_State < CLSTATE_SCHEDULED)
-        {
-            m_State = CLSTATE_SCHEDULED;
-        }
-    }
-
-    void CommandList::Submit()
-    {
-        if (IsUtilized())
-        {
-            // Inject a Wait() into the CommandQueue prior to executing it to wait for all required resources being available either readable or writable
-#ifdef DX12_IN_ORDER_SUBMISSION
-            m_UsedFenceValues[CMDTYPE_ANY][CMDQUEUE_COPY    ] = std::max(m_UsedFenceValues[CMDTYPE_READ][CMDQUEUE_COPY    ], m_UsedFenceValues[CMDTYPE_WRITE][CMDQUEUE_COPY    ]);
-            m_UsedFenceValues[CMDTYPE_ANY][CMDQUEUE_GRAPHICS] = std::max(m_UsedFenceValues[CMDTYPE_READ][CMDQUEUE_GRAPHICS], m_UsedFenceValues[CMDTYPE_WRITE][CMDQUEUE_GRAPHICS]);
-#else
-            MaxFenceValue(m_UsedFenceValues[CMDTYPE_ANY][CMDQUEUE_COPY    ], std::max(m_UsedFenceValues[CMDTYPE_READ][CMDQUEUE_COPY    ], m_UsedFenceValues[CMDTYPE_WRITE][CMDQUEUE_COPY    ]));
-            MaxFenceValue(m_UsedFenceValues[CMDTYPE_ANY][CMDQUEUE_GRAPHICS], std::max(m_UsedFenceValues[CMDTYPE_READ][CMDQUEUE_GRAPHICS], m_UsedFenceValues[CMDTYPE_WRITE][CMDQUEUE_GRAPHICS]));
-#endif
-
-            m_rPool.WaitForFenceOnGPU(m_UsedFenceValues[CMDTYPE_ANY]);
-
-            // Then inject the Execute() which is possibly blocked by the Wait()
-            ID3D12CommandList* ppCommandLists[] = { GetD3D12CommandList() };
-            m_rPool.GetAsyncCommandQueue().ExecuteCommandLists(1, ppCommandLists); // TODO: allow to submit multiple command-lists in one go
-        }
-
-        // Inject the signal of the utilized fence to unblock code which picked up the fence of the command-list (even if it doesn't have contents)
-        m_rPool.SetSubmittedFenceValue(SignalFenceOnGPU());
-        m_State = CLSTATE_SUBMITTED;
-    }
-
-    void CommandList::Clear()
-    {
-        m_State = CLSTATE_CLEARING;
-        FlushBarriers();
-        m_rPool.GetAsyncCommandQueue().ResetCommandList(this);
-    }
-
-    void CommandList::SubmitTimers()
-    {
-#if DX12_GPU_PROFILE_MODE != DX12_GPU_PROFILE_MODE_OFF
-        m_Timers.ReadbackTimers();
-
-        for (const Timer& timer : m_Timers.GetTimers())
-        {
-            EBUS_QUEUE_EVENT(AZ::Debug::EventTraceDrillerBus, RecordSlice, timer.m_Name, EventTrace::GpuDetailCategory, EventTrace::GpuDetailThreadId, timer.m_Timestamp, timer.m_Duration);
-        }
-#endif
-    }
-
-    bool CommandList::Reset()
-    {
-        if (IsUtilized())
-        {
-            SubmitTimers();
-
-            HRESULT ret = 0;
-
-            // reset the allocator before the list re-occupies it, otherwise the whole state of the allocator starts leaking
-            if (m_pCmdAllocator)
-            {
-                ret = m_pCmdAllocator->Reset();
-            }
-            // make the list re-occupy this allocator, reseting the list will _not_ reset the allocator
-            if (m_CommandList)
-            {
-                ret = m_CommandList->Reset(m_pCmdAllocator, NULL);
-            }
-        }
-
-        m_State = CLSTATE_FREE;
-        m_Commands = 0;
-        return true;
-    }
-
-    void CommandList::ResetStateTracking(CommandMode commandMode)
-    {
-        memset(&m_CurrentRootParameters[commandMode], ~0, sizeof(m_CurrentRootParameters[commandMode]));
-    }
-
-    void CommandList::SetPipelineState(const PipelineState* pso)
-    {
-        if (m_CurrentPipelineState != pso)
-        {
-            m_CurrentPipelineState = pso;
-
-            DX12_COMMANDLIST_TIMER_DETAIL("SetPipelineState");
-            m_CommandList->SetPipelineState(pso->GetD3D12PipelineState());
-            m_Commands += CLCOUNT_SETIO;
-        }
-    }
-
-    void CommandList::SetRootSignature(CommandMode commandMode, const RootSignature* rootSignature)
-    {
-        if (m_CurrentRootSignature[commandMode] != rootSignature)
-        {
-            m_CurrentRootSignature[commandMode] = rootSignature;
-
-            if (rootSignature)
-            {
-                ResetStateTracking(commandMode);
-                DX12_COMMANDLIST_TIMER_DETAIL("SetRootSignature");
-                switch (commandMode)
-                {
-                case CommandModeGraphics:
-                    m_CommandList->SetGraphicsRootSignature(rootSignature->GetD3D12RootSignature());
-                    break;
-
-                case CommandModeCompute:
-                    m_CommandList->SetComputeRootSignature(rootSignature->GetD3D12RootSignature());
-                    break;
-                }
-                m_Commands += CLCOUNT_SETIO;
-            }
-        }
-    }
-
-    bool CommandList::IsFull(size_t numResources, size_t numSamplers, size_t numRendertargets, size_t numDepthStencils) const
-    {
-        return
-            (GetResourceHeap().GetCursor() + numResources >= GetResourceHeap().GetCapacity()) ||
-            (GetSamplerHeap().GetCursor() + numSamplers >= GetSamplerHeap().GetCapacity()) ||
-            (GetRenderTargetHeap().GetCursor() + numRendertargets >= GetRenderTargetHeap().GetCapacity()) ||
-            (GetDepthStencilHeap().GetCursor() + numDepthStencils >= GetDepthStencilHeap().GetCapacity());
-    }
-
-    void CommandList::SetDescriptorTable(CommandMode commandMode, UINT RootParameterIndex, D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor)
-    {
-        if (m_CurrentRootParameters[commandMode][RootParameterIndex].descriptorHandle.ptr != BaseDescriptor.ptr)
-        {
-            DX12_ASSERT(RootParameterIndex < RootParameterCountMax, "Too many root parameters");
-            m_CurrentRootParameters[commandMode][RootParameterIndex].descriptorHandle = BaseDescriptor;
-
-            switch (commandMode)
-            {
-            case CommandModeGraphics:
-                m_CommandList->SetGraphicsRootDescriptorTable(RootParameterIndex, BaseDescriptor);
-                break;
-
-            case CommandModeCompute:
-                m_CommandList->SetComputeRootDescriptorTable(RootParameterIndex, BaseDescriptor);
-                break;
-            }
-            m_Commands += CLCOUNT_SETIO;
-        }
-    }
-
-    void CommandList::SetConstantBufferView(CommandMode commandMode, UINT RootParameterIndex, D3D12_GPU_VIRTUAL_ADDRESS BufferLocation)
-    {
-        if (m_CurrentRootParameters[commandMode][RootParameterIndex].gpuAddress != BufferLocation)
-        {
-            DX12_ASSERT(RootParameterIndex < RootParameterCountMax, "Too many root parameters");
-            m_CurrentRootParameters[commandMode][RootParameterIndex].gpuAddress = BufferLocation;
-            switch (commandMode)
-            {
-            case CommandModeGraphics:
-                m_CommandList->SetGraphicsRootConstantBufferView(RootParameterIndex, BufferLocation);
-                break;
-
-            case CommandModeCompute:
-                m_CommandList->SetComputeRootConstantBufferView(RootParameterIndex, BufferLocation);
-                break;
-            }
-            m_Commands += CLCOUNT_SETIO;
-        }
-    }
-
-    void CommandList::Set32BitConstants(CommandMode commandMode, UINT RootParameterIndex, UINT Num32BitValuesToSet, const void* pSrcData, UINT DestOffsetIn32BitValues)
-    {
-        switch (commandMode)
-        {
-        case CommandModeGraphics:
-            m_CommandList->SetGraphicsRoot32BitConstants(RootParameterIndex, Num32BitValuesToSet, pSrcData, DestOffsetIn32BitValues);
-            break;
-
-        case CommandModeCompute:
-            m_CommandList->SetComputeRoot32BitConstants(RootParameterIndex, Num32BitValuesToSet, pSrcData, DestOffsetIn32BitValues);
-            break;
-        }
-        m_Commands += CLCOUNT_SETIO;
-    }
-
-    void CommandList::SetDescriptorTables(CommandMode commandMode, D3D12_DESCRIPTOR_HEAP_TYPE eType)
-    {
-        DX12_ASSERT(m_CurrentRootSignature[commandMode]);
-
-        const PipelineLayout& layout = m_CurrentRootSignature[commandMode]->GetPipelineLayout();
-        for (AZ::u32 rootParameterIdx = 0, tableIdx = 0; rootParameterIdx < layout.m_NumRootParameters; ++rootParameterIdx)
-        {
-            const CD3DX12_ROOT_PARAMETER& rootParameter = layout.m_RootParameters[rootParameterIdx];
-
-            if (rootParameter.ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE)
-            {
-                continue;
-            }
-
-            if (layout.m_DescriptorTables[tableIdx].m_Type == eType)
-            {
-                switch (commandMode)
-                {
-                case CommandModeCompute:
-                    m_CommandList->SetComputeRootDescriptorTable(rootParameterIdx, m_DescriptorHeaps[eType].GetHandleOffsetGPU(layout.m_DescriptorTables[tableIdx].m_Offset));
-                    break;
-
-                case CommandModeGraphics:
-                    m_CommandList->SetGraphicsRootDescriptorTable(rootParameterIdx, m_DescriptorHeaps[eType].GetHandleOffsetGPU(layout.m_DescriptorTables[tableIdx].m_Offset));
-                    break;
-                }
-                m_Commands += CLCOUNT_SETIO;
-            }
-
-            ++tableIdx;
-        }
-    }
-
-    void CommandList::BindDepthStencilView(const ResourceView& dsv)
-    {
-        Resource& resource = dsv.GetDX12Resource();
-        const D3D12_CPU_DESCRIPTOR_HANDLE handle = GetDepthStencilHeap().GetHandleOffsetCPU(0);
-
-        if (INVALID_CPU_DESCRIPTOR_HANDLE != dsv.GetDescriptorHandle())
-        {
-            m_pD3D12Device->CopyDescriptorsSimple(1, handle, dsv.GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_DSV);
-        }
-        else
-        {
-            m_pD3D12Device->CreateDepthStencilView(resource.GetD3D12Resource(), dsv.HasDesc() ? &(dsv.GetDSVDesc()) : NULL, handle);
-        }
-
-        if (dsv.GetDSVDesc().Flags & D3D12_DSV_FLAG_READ_ONLY_DEPTH)
-        {
-            TrackResourceDRVUsage(resource);
-        }
-        else
-        {
-            TrackResourceDSVUsage(resource);
-        }
-    }
-
-    void CommandList::PresentRenderTargetView(SwapChain* pDX12SwapChain)
-    {
-        QueueTransitionBarrier(pDX12SwapChain->GetCurrentBackBuffer(), D3D12_RESOURCE_STATE_PRESENT);
-    }
-
-    void CommandList::BindRenderTargetView(const ResourceView& renderTargetView)
-    {
-        Resource& resource = renderTargetView.GetDX12Resource();
-
-        const D3D12_CPU_DESCRIPTOR_HANDLE handle = GetRenderTargetHeap().GetHandleOffsetCPU(0);
-        if (INVALID_CPU_DESCRIPTOR_HANDLE != renderTargetView.GetDescriptorHandle())
-        {
-            m_pD3D12Device->CopyDescriptorsSimple(1, handle, renderTargetView.GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
-        }
-        else
-        {
-            m_pD3D12Device->CreateRenderTargetView(resource.GetD3D12Resource(), renderTargetView.HasDesc() ? &(renderTargetView.GetRTVDesc()) : NULL, handle);
-        }
-
-        TrackResourceRTVUsage(resource);
-    }
-
-    void CommandList::WriteUnorderedAccessDescriptor(const ResourceView* resourceView, INT descriptorOffset)
-    {
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle = GetResourceHeap().GetHandleOffsetCPU(descriptorOffset);
-
-        if (resourceView)
-        {
-            Resource& resource = resourceView->GetDX12Resource();
-
-            if (INVALID_CPU_DESCRIPTOR_HANDLE != resourceView->GetDescriptorHandle())
-            {
-                m_pD3D12Device->CopyDescriptorsSimple(1, dstHandle, resourceView->GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-            }
-            else
-            {
-                m_pD3D12Device->CreateUnorderedAccessView(resource.GetD3D12Resource(), nullptr, resourceView->HasDesc() ? &(resourceView->GetUAVDesc()) : NULL, dstHandle);
-            }
-
-            TrackResourceUAVUsage(resource);
-        }
-        else
-        {
-            m_pD3D12Device->CopyDescriptorsSimple(1, dstHandle, GetDevice()->GetNullUnorderedAccessView(), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-        }
-    }
-
-    void CommandList::WriteShaderResourceDescriptor(const ResourceView* resourceView, INT descriptorOffset)
-    {
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle = GetResourceHeap().GetHandleOffsetCPU(descriptorOffset);
-
-        if (resourceView)
-        {
-            Resource& resource = resourceView->GetDX12Resource();
-            DX12_ASSERT(resource.GetD3D12Resource(), "No resource to create SRV from!");
-
-            if (INVALID_CPU_DESCRIPTOR_HANDLE != resourceView->GetDescriptorHandle())
-            {
-                m_pD3D12Device->CopyDescriptorsSimple(1, dstHandle, resourceView->GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-            }
-            else
-            {
-                m_pD3D12Device->CreateShaderResourceView(resource.GetD3D12Resource(), &resourceView->GetSRVDesc(), dstHandle);
-            }
-
-            TrackResourceSRVUsage(resource);
-        }
-        else
-        {
-            m_pD3D12Device->CopyDescriptorsSimple(1, dstHandle, GetDevice()->GetNullShaderResourceView(), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-        }
-    }
-
-    void CommandList::WriteConstantBufferDescriptor(const ResourceView* resourceView, INT descriptorOffset, UINT byteOffset, UINT byteCount)
-    {
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle = GetResourceHeap().GetHandleOffsetCPU(descriptorOffset);
-
-        if (resourceView)
-        {
-            if (INVALID_CPU_DESCRIPTOR_HANDLE != resourceView->GetDescriptorHandle())
-            {
-                m_pD3D12Device->CopyDescriptorsSimple(1, dstHandle, resourceView->GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-            }
-            else
-            {
-                D3D12_CONSTANT_BUFFER_VIEW_DESC cbvDesc;
-                cbvDesc = resourceView->GetCBVDesc();
-                cbvDesc.BufferLocation += byteOffset;
-                cbvDesc.SizeInBytes = byteCount ? byteCount : cbvDesc.SizeInBytes - byteOffset;
-                DX12_ASSERT(byteCount < D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT * DX12::CONSTANT_BUFFER_ELEMENT_SIZE, "exceeded allowed size of constant buffer");
-                m_pD3D12Device->CreateConstantBufferView(&cbvDesc, dstHandle);
-            }
-
-            TrackResourceCBVUsage(resourceView->GetDX12Resource());
-        }
-        else
-        {
-            D3D12_CONSTANT_BUFFER_VIEW_DESC desc = {};
-            m_pD3D12Device->CreateConstantBufferView(&desc, dstHandle);
-        }
-    }
-
-    void CommandList::WriteSamplerStateDescriptor(const SamplerState* state, INT descriptorOffset)
-    {
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle = GetSamplerHeap().GetHandleOffsetCPU(descriptorOffset);
-
-        if (state)
-        {
-            if (INVALID_CPU_DESCRIPTOR_HANDLE != state->GetDescriptorHandle())
-            {
-                m_pD3D12Device->CopyDescriptorsSimple(1, dstHandle, state->GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
-            }
-            else
-            {
-                m_pD3D12Device->CreateSampler(&state->GetSamplerDesc(), dstHandle);
-            }
-        }
-        else
-        {
-            m_pD3D12Device->CopyDescriptorsSimple(1, dstHandle, GetDevice()->GetNullSampler(), D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
-        }
-    }
-
-    void CommandList::SetResourceAndSamplerStateHeaps()
-    {
-        DX12_COMMANDLIST_TIMER_DETAIL("SetResourceAndSamplerStateHeaps");
-        ID3D12DescriptorHeap* heaps[] =
-        {
-            GetResourceHeap().GetDescriptorHeap()->GetD3D12DescriptorHeap(),
-            GetSamplerHeap().GetDescriptorHeap()->GetD3D12DescriptorHeap()
-        };
-
-        m_CommandList->SetDescriptorHeaps(2, heaps);
-        m_Commands += CLCOUNT_SETIO;
-    }
-
-    void CommandList::BindAndSetOutputViews(INT numRTVs, const ResourceView** rtv, const ResourceView* dsv)
-    {
-        DX12_COMMANDLIST_TIMER_DETAIL("BindAndSetOutputViews");
-        if (dsv)
-        {
-            BindDepthStencilView(*dsv);
-            GetDepthStencilHeap().IncrementCursor();
-        }
-
-        m_pDSV = dsv;
-
-        for (INT i = 0; i < numRTVs; ++i)
-        {
-            BindRenderTargetView(*rtv[i]);
-            GetRenderTargetHeap().IncrementCursor();
-
-            m_pRTV[i] = rtv[i];
-        }
-
-        m_CurrentNumRTVs = numRTVs;
-
-        D3D12_CPU_DESCRIPTOR_HANDLE RTVDescriptors[] = { GetRenderTargetHeap().GetHandleOffsetCPU(-numRTVs) };
-        D3D12_CPU_DESCRIPTOR_HANDLE DSVDescriptors[] = { GetDepthStencilHeap().GetHandleOffsetCPU(-1) };
-
-        m_CommandList->OMSetRenderTargets(numRTVs, numRTVs ? RTVDescriptors : NULL, true, dsv ? DSVDescriptors : NULL);
-        m_Commands += CLCOUNT_SETIO;
-    }
-
-    bool CommandList::IsUsedByOutputViews(const Resource& res) const
-    {
-        if (m_pDSV && (&m_pDSV->GetDX12Resource() == &res))
-        {
-            return true;
-        }
-
-        for (INT i = 0, n = m_CurrentNumRTVs; i < n; ++i)
-        {
-            if (m_pRTV[i] && (&m_pRTV[i]->GetDX12Resource() == &res))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    void CommandList::BindVertexBufferView(const ResourceView& view, INT offset, const TRange<UINT>& bindRange, UINT bindStride, D3D12_VERTEX_BUFFER_VIEW (&heap)[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT])
-    {
-        Resource& resource = view.GetDX12Resource();
-
-        D3D12_VERTEX_BUFFER_VIEW& vbvDesc = heap[offset];
-        vbvDesc = view.GetVBVDesc();
-        vbvDesc.BufferLocation += bindRange.start;
-        vbvDesc.SizeInBytes = bindRange.Length() > 0 ? bindRange.Length() : vbvDesc.SizeInBytes - bindRange.start;
-        vbvDesc.StrideInBytes = bindStride;
-
-        TrackResourceVBVUsage(resource);
-    }
-
-    void CommandList::ClearVertexBufferHeap(UINT num)
-    {
-        memset(m_VertexBufferHeap, 0, std::max(num, m_CurrentNumVertexBuffers) * sizeof(m_VertexBufferHeap[0]));
-    }
-
-    void CommandList::SetVertexBufferHeap(UINT num)
-    {
-        m_CommandList->IASetVertexBuffers(0, std::max(num, m_CurrentNumVertexBuffers), m_VertexBufferHeap);
-        m_Commands += CLCOUNT_SETIO;
-
-        m_CurrentNumVertexBuffers = num;
-    }
-
-    void CommandList::BindAndSetIndexBufferView(const ResourceView& view, DXGI_FORMAT format, UINT offset)
-    {
-        Resource& resource = view.GetDX12Resource();
-
-        D3D12_INDEX_BUFFER_VIEW ibvDesc;
-        ibvDesc = view.GetIBVDesc();
-        ibvDesc.BufferLocation += offset;
-        ibvDesc.SizeInBytes = ibvDesc.SizeInBytes - offset;
-        ibvDesc.Format = (format == DXGI_FORMAT_UNKNOWN ? resource.GetDesc().Format : format);
-
-        TrackResourceIBVUsage(resource);
-
-        m_CommandList->IASetIndexBuffer(&ibvDesc);
-        m_Commands += CLCOUNT_SETIO;
-    }
-
-    void CommandList::ClearDepthStencilView(const ResourceView& view, D3D12_CLEAR_FLAGS clearFlags, float depthValue, UINT stencilValue, UINT NumRects, const D3D12_RECT* pRect)
-    {
-        DX12_ASSERT(INVALID_CPU_DESCRIPTOR_HANDLE != view.GetDescriptorHandle(), "View has no descriptor handle, that is not allowed!");
-        DX12_COMMANDLIST_TIMER_DETAIL("ClearDepthStencilView");
-
-        Resource& resource = view.GetDX12Resource();
-
-        TrackResourceDSVUsage(resource);
-        FlushBarriers();
-
-        m_CommandList->ClearDepthStencilView(view.GetDescriptorHandle(), clearFlags, depthValue, stencilValue, NumRects, pRect);
-        m_Commands += CLCOUNT_CLEAR;
-    }
-
-    void CommandList::ClearRenderTargetView(const ResourceView& inputView, const FLOAT rgba[4], UINT NumRects, const D3D12_RECT* pRect)
-    {
-        DX12_ASSERT(INVALID_CPU_DESCRIPTOR_HANDLE != inputView.GetDescriptorHandle(), "View has no descriptor handle, that is not allowed!");
-        DX12_COMMANDLIST_TIMER_DETAIL("ClearRenderTargetView");
-
-        TrackResourceRTVUsage(inputView.GetDX12Resource());
-        FlushBarriers();
-
-        m_CommandList->ClearRenderTargetView(inputView.GetDescriptorHandle(), rgba, NumRects, pRect);
-        m_Commands += CLCOUNT_CLEAR;
-    }
-
-    void CommandList::ClearUnorderedAccessView(const ResourceView& view, const UINT rgba[4], UINT NumRects, const D3D12_RECT* pRect)
-    {
-        DX12_ASSERT(INVALID_CPU_DESCRIPTOR_HANDLE != view.GetDescriptorHandle(), "View has no descriptor handle, that is not allowed!");
-        DX12_COMMANDLIST_TIMER_DETAIL("ClearUnorderedAccessView");
-
-        TrackResourceUAVUsage(view.GetDX12Resource());
-        FlushBarriers();
-
-        m_CommandList->ClearUnorderedAccessViewUint(GetResourceHeap().GetHandleGPUFromCPU(view.GetDescriptorHandle()), view.GetDescriptorHandle(), view.GetD3D12Resource(), rgba, NumRects, pRect);
-        m_Commands += CLCOUNT_CLEAR;
-    }
-
-    void CommandList::ClearUnorderedAccessView(const ResourceView& view, const FLOAT rgba[4], UINT NumRects, const D3D12_RECT* pRect)
-    {
-        DX12_ASSERT(INVALID_CPU_DESCRIPTOR_HANDLE != view.GetDescriptorHandle(), "View has no descriptor handle, that is not allowed!");
-        DX12_COMMANDLIST_TIMER_DETAIL("ClearUnorderedAccessView");
-
-        TrackResourceUAVUsage(view.GetDX12Resource());
-        FlushBarriers();
-
-        m_CommandList->ClearUnorderedAccessViewFloat(GetResourceHeap().GetHandleGPUFromCPU(view.GetDescriptorHandle()), view.GetDescriptorHandle(), view.GetD3D12Resource(), rgba, NumRects, pRect);
-        m_Commands += CLCOUNT_CLEAR;
-    }
-
-    void CommandList::ClearView(const ResourceView& view, const FLOAT rgba[4], UINT NumRects, const D3D12_RECT* pRect)
-    {
-        DX12_ASSERT(INVALID_CPU_DESCRIPTOR_HANDLE != view.GetDescriptorHandle(), "View has no descriptor handle, that is not allowed!");
-
-        switch (view.GetType())
-        {
-        case EVT_UnorderedAccessView:
-            ClearUnorderedAccessView(view, rgba, NumRects, pRect);
-            break;
-
-        case EVT_DepthStencilView: // Optional implementation under DX11.1
-            ClearDepthStencilView(view, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, FLOAT(rgba[0]), UINT(rgba[1]), NumRects, pRect);
-            break;
-
-        case EVT_RenderTargetView:
-            ClearRenderTargetView(view, rgba, NumRects, pRect);
-            break;
-
-        case EVT_ShaderResourceView:
-        case EVT_ConstantBufferView:
-        case EVT_VertexBufferView:
-        default:
-            DX12_ASSERT(0, "Unsupported resource-type for input!");
-            break;
-        }
-    }
-
-    void CommandList::CopyResource(Resource& dstResource, Resource& srcResource)
-    {
-        if (srcResource.InitHasBeenDeferred())
-        {
-            srcResource.TryStagingUpload(this);
-        }
-
-        DX12_COMMANDLIST_TIMER_DETAIL("CopyResource");
-        MaxResourceFenceValue(dstResource, CMDTYPE_ANY);
-        MaxResourceFenceValue(srcResource, CMDTYPE_WRITE);
-
-        QueueTransitionBarrier(dstResource, D3D12_RESOURCE_STATE_COPY_DEST);
-        QueueTransitionBarrier(srcResource, D3D12_RESOURCE_STATE_COPY_SOURCE);
-        FlushBarriers();
-
-        DX12_ASSERT(srcResource.GetDesc().Dimension == dstResource.GetDesc().Dimension, "Can't copy resources of different dimension");
-        m_CommandList->CopyResource(dstResource.GetD3D12Resource(), srcResource.GetD3D12Resource());
-        m_Commands += CLCOUNT_COPY;
-
-        SetResourceFenceValue(dstResource, m_CurrentFenceValue, CMDTYPE_WRITE);
-        SetResourceFenceValue(srcResource, m_CurrentFenceValue, CMDTYPE_READ);
-    }
-
-    void CommandList::CopySubresource(Resource& dstResource, UINT dstSubResource, UINT x, UINT y, UINT z, Resource& srcResource, UINT srcSubResource, const D3D12_BOX* srcBox)
-    {
-        if (srcResource.InitHasBeenDeferred())
-        {
-            srcResource.TryStagingUpload(this);
-        }
-
-        DX12_COMMANDLIST_TIMER_DETAIL("CopySubresource");
-        MaxResourceFenceValue(dstResource, CMDTYPE_ANY);
-        MaxResourceFenceValue(srcResource, CMDTYPE_WRITE);
-
-        // TODO: if we know early that the resource(s) will be DEST and SOURCE we can begin the barrier early and end it here
-        QueueTransitionBarrier(dstResource, D3D12_RESOURCE_STATE_COPY_DEST);
-        QueueTransitionBarrier(srcResource, D3D12_RESOURCE_STATE_COPY_SOURCE);
-        FlushBarriers();
-
-        if (srcResource.GetDesc().Dimension == D3D12_RESOURCE_DIMENSION_BUFFER && dstResource.GetDesc().Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
-        {
-            UINT64 offset = 0;
-            UINT64 length = srcResource.GetDesc().Width;
-
-            if (srcBox)
-            {
-                length = srcBox->right - srcBox->left;
-                offset = srcBox->left;
-            }
-
-            m_CommandList->CopyBufferRegion(dstResource.GetD3D12Resource(), x, srcResource.GetD3D12Resource(), offset, length);
-            m_Commands += CLCOUNT_COPY;
-        }
-        else if (srcResource.GetDesc().Dimension != D3D12_RESOURCE_DIMENSION_BUFFER && dstResource.GetDesc().Dimension != D3D12_RESOURCE_DIMENSION_BUFFER)
-        {
-            CD3DX12_TEXTURE_COPY_LOCATION src(srcResource.GetD3D12Resource(), srcSubResource);
-            CD3DX12_TEXTURE_COPY_LOCATION dst(dstResource.GetD3D12Resource(), dstSubResource);
-
-            m_CommandList->CopyTextureRegion(&dst, x, y, z, &src, srcBox);
-            m_Commands += CLCOUNT_COPY;
-        }
-        else if (dstResource.GetDesc().Dimension != D3D12_RESOURCE_DIMENSION_BUFFER)
-        {
-            // If this assert trips, you may need to increase MAX_SUBRESOURCES.  Just be wary of growing the stack too much.
-            AZ_Assert(dstSubResource < CCryDX12DeviceContext::MAX_SUBRESOURCES, "Too many sub resources: (sub ID %d requested, %d allowed)", dstSubResource, CCryDX12DeviceContext::MAX_SUBRESOURCES);
-            D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[CCryDX12DeviceContext::MAX_SUBRESOURCES];
-
-            // From our "regular" resource, get the offset and description information for the subresource so we can copy the correct
-            // part of the buffer resource.  We need to get Layouts for subresource 0 through dstSubResource so that the offset is set
-            // correctly.  If we just get the Layout for dstSubResource, it will have an offset of 0.
-            GetDevice()->GetD3D12Device()->GetCopyableFootprints(&dstResource.GetDesc(), 0, dstSubResource + 1, 0, layouts, nullptr, nullptr, nullptr);
-            
-            CD3DX12_TEXTURE_COPY_LOCATION src(srcResource.GetD3D12Resource(), layouts[dstSubResource]);
-            CD3DX12_TEXTURE_COPY_LOCATION dst(dstResource.GetD3D12Resource(), dstSubResource);
-
-            m_CommandList->CopyTextureRegion(&dst, x, y, z, &src, srcBox);
-            m_Commands += CLCOUNT_COPY;
-        }
-        else if (srcResource.GetDesc().Dimension != D3D12_RESOURCE_DIMENSION_BUFFER)
-        {
-            // If this assert trips, you may need to increase MAX_SUBRESOURCES.  Just be wary of growing the stack too much.
-            AZ_Assert(dstSubResource < CCryDX12DeviceContext::MAX_SUBRESOURCES, "Too many sub resources: (sub ID %d requested, %d allowed)", dstSubResource, CCryDX12DeviceContext::MAX_SUBRESOURCES);
-            D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[CCryDX12DeviceContext::MAX_SUBRESOURCES];
-
-            // From our "regular" resource, get the offset and description information for the subresource so we can copy the correct
-            // part of the buffer resource.  We need to get Layouts for subresource 0 through dstSubResource so that the offset is set
-            // correctly.  If we just get the Layout for dstSubResource, it will have an offset of 0.
-            GetDevice()->GetD3D12Device()->GetCopyableFootprints(&srcResource.GetDesc(), 0, srcSubResource + 1, 0, layouts, nullptr, nullptr, nullptr);
-
-            CD3DX12_TEXTURE_COPY_LOCATION src(srcResource.GetD3D12Resource(), srcSubResource);
-            CD3DX12_TEXTURE_COPY_LOCATION dst(dstResource.GetD3D12Resource(), layouts[srcSubResource]);
-
-            m_CommandList->CopyTextureRegion(&dst, x, y, z, &src, srcBox);
-            m_Commands += CLCOUNT_COPY;
-        }
-
-        SetResourceFenceValue(dstResource, m_CurrentFenceValue, CMDTYPE_WRITE);
-        SetResourceFenceValue(srcResource, m_CurrentFenceValue, CMDTYPE_READ);
-    }
-
-    void CommandList::UpdateSubresourceRegion(Resource& resource, UINT subResource, const D3D12_BOX* box, const void* data, UINT rowPitch, UINT slicePitch)
-    {
-        if (resource.InitHasBeenDeferred())
-        {
-            resource.TryStagingUpload(this);
-        }
-
-        DX12_COMMANDLIST_TIMER_DETAIL("UpdateSubresourceRegion");
-        MaxResourceFenceValue(resource, CMDTYPE_ANY);
-
-        ID3D12Resource* res12 = resource.GetD3D12Resource();
-        const D3D12_RESOURCE_DESC& desc = resource.GetDesc();
-
-        // Determine temporary upload buffer size (mostly only pow2-alignment of textures)
-        UINT64 uploadBufferSize;
-        D3D12_RESOURCE_DESC uploadDesc = desc;
-
-        uploadDesc.Width  = box ? box->right  - box->left : uploadDesc.Width;
-        uploadDesc.Height = box ? box->bottom - box->top  : uploadDesc.Height;
-
-        GetDevice()->GetD3D12Device()->GetCopyableFootprints(&uploadDesc, subResource, 1, 0, nullptr, nullptr, nullptr, &uploadBufferSize);
-
-        DX12_ASSERT((desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER) || (box == nullptr), "Box used for buffer update, that's not supported!");
-        DX12_ASSERT((desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) || (slicePitch != 0), "Slice-pitch is missing for UpdateSubresourceRegion(), this is a required parameter!");
-        ID3D12Resource* uploadBuffer;
-
-        D3D12_SUBRESOURCE_DATA subData;
-        ZeroMemory(&subData, sizeof(D3D12_SUBRESOURCE_DATA));
-        subData.pData = data;
-        subData.RowPitch = rowPitch;
-        subData.SlicePitch = slicePitch;
-        assert(subData.pData != nullptr);
-
-        ResourceStates resourceStates;
-        const CD3DX12_HEAP_PROPERTIES heapProperties(D3D12_HEAP_TYPE_UPLOAD);
-        const CD3DX12_RESOURCE_DESC resourceDesc = CD3DX12_RESOURCE_DESC::Buffer(uploadBufferSize);
-        if (S_OK != GetDevice()->CreateOrReuseCommittedResource(
-                &heapProperties,
-                D3D12_HEAP_FLAG_NONE,
-                &resourceDesc,
-                D3D12_RESOURCE_STATE_GENERIC_READ,
-                nullptr,
-                IID_GRAPHICS_PPV_ARGS(&uploadBuffer),
-                resourceStates))
-        {
-            DX12_ERROR("Could not create intermediate upload buffer!");
-            return;
-        }
-
-        // If it is reused resource,  we have to transition the recycled state to new state
-        AZ_Assert(resourceStates.m_AnnouncedState == -1, "Recycled resource should not be in split state");
-        QueueTransitionBarrier(uploadBuffer, resourceStates.m_CurrentState, D3D12_RESOURCE_STATE_GENERIC_READ);
-        QueueTransitionBarrier(resource, D3D12_RESOURCE_STATE_COPY_DEST);
-        FlushBarriers();
-
-        ::UpdateSubresources<1>(m_CommandList, res12, uploadBuffer, 0, subResource, 1, &subData, box);
-        m_Commands += CLCOUNT_COPY;
-
-        SetResourceFenceValue(resource, m_CurrentFenceValue, CMDTYPE_WRITE);
-
-        uploadBuffer->SetName(L"UpdateSubresourceRegion");
-        GetDevice()->ReleaseLater(uploadBuffer, D3D12_RESOURCE_STATE_GENERIC_READ, static_cast<D3D12_RESOURCE_STATES>(-1));
-    }
-
-    void CommandList::UpdateSubresources(Resource& resource, UINT64 uploadBufferSize, UINT subResources, D3D12_SUBRESOURCE_DATA* subResourceData)
-    {
-        if (resource.InitHasBeenDeferred())
-        {
-            resource.TryStagingUpload(this);
-        }
-
-        DX12_COMMANDLIST_TIMER_DETAIL("UpdateSubresources");
-        MaxResourceFenceValue(resource, CMDTYPE_ANY);
-
-        ID3D12Resource* res12 = resource.GetD3D12Resource();
-        ID3D12Resource* uploadBuffer = NULL;
-        ResourceStates resourceStates;
-        const CD3DX12_HEAP_PROPERTIES heapProperties(D3D12_HEAP_TYPE_UPLOAD);
-        const CD3DX12_RESOURCE_DESC resourceDesc = CD3DX12_RESOURCE_DESC::Buffer(uploadBufferSize);
-        if (S_OK != GetDevice()->CreateOrReuseCommittedResource(
-                &heapProperties,
-                D3D12_HEAP_FLAG_NONE,
-                &resourceDesc,
-                D3D12_RESOURCE_STATE_GENERIC_READ,
-                nullptr,
-                IID_GRAPHICS_PPV_ARGS(&uploadBuffer),
-                resourceStates))
-        {
-            DX12_ERROR("Could not create intermediate upload buffer!");
-        }
-
-        // If it is reused resource,  we have to transition the recycled state to new state
-        AZ_Assert(resourceStates.m_AnnouncedState == -1, "Recycled resource should not be in split state");
-        QueueTransitionBarrier(uploadBuffer, resourceStates.m_CurrentState, D3D12_RESOURCE_STATE_GENERIC_READ);
-        QueueTransitionBarrier(resource, D3D12_RESOURCE_STATE_COPY_DEST);
-        FlushBarriers();
-
-        ::UpdateSubresources(m_CommandList, res12, uploadBuffer, 0, 0, subResources, subResourceData, nullptr);
-        m_Commands += CLCOUNT_COPY;
-
-        SetResourceFenceValue(resource, m_CurrentFenceValue, CMDTYPE_WRITE);
-
-        uploadBuffer->SetName(L"UpdateSubresources");
-        GetDevice()->ReleaseLater(uploadBuffer, D3D12_RESOURCE_STATE_GENERIC_READ, static_cast<D3D12_RESOURCE_STATES>(-1));
-    }
-
-    void CommandList::DiscardResource(Resource& resource, const D3D12_DISCARD_REGION* pRegion)
-    {
-        DX12_COMMANDLIST_TIMER_DETAIL("DiscardResource");
-        FlushBarriers();
-        MaxResourceFenceValue(resource, CMDTYPE_ANY);
-
-        m_CommandList->DiscardResource(resource.GetD3D12Resource(), pRegion);
-        m_Commands += CLCOUNT_DISCARD;
-    }
-
-    void CommandList::QueueTransitionBarrier(Resource& resource, D3D12_RESOURCE_STATES finalState)
-    {
-        if (resource.IsOffCard())
-        {
-            if (finalState != D3D12_RESOURCE_STATE_COMMON)
-            {
-                finalState = resource.GetRequiredResourceState();
-            }
-        }
-
-        D3D12_RESOURCE_STATES currentState = resource.GetCurrentState();
-        D3D12_RESOURCE_STATES announcedState = resource.GetAnnouncedState();
-        bool bFinishedSplit = false;
-
-        // Finish a split barrier.
-        if (announcedState != static_cast<D3D12_RESOURCE_STATES>(-1))
-        {
-            m_Commands += CLCOUNT_BARRIER;
-
-            //AZ_Printf("DX12", "QueueTransitionBarrier: Split END %p %s -> %s", resource.GetD3D12Resource(), StateToString(currentState), StateToString(announcedState));
-
-            D3D12_RESOURCE_TRANSITION_BARRIER transition;
-            transition.pResource = resource.GetD3D12Resource();
-            transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
-            transition.StateBefore = currentState;
-            transition.StateAfter = announcedState;
-            m_BarrierCache.EnqueueTransition(m_CommandList, D3D12_RESOURCE_BARRIER_FLAG_END_ONLY, transition);
-
-            resource.SetAnnouncedState(static_cast<D3D12_RESOURCE_STATES>(-1));
-            currentState = announcedState;
-            resource.SetCurrentState(currentState);
-            bFinishedSplit = true;
-        }
-
-        // Now check if we still need to transition to final state.
-        if (currentState != finalState)
-        {
-            //AZ_Printf("DX12", "QueueTransitionBarrier: Transition %p %s -> %s", resource.GetD3D12Resource(), StateToString(currentState), StateToString(finalState));
-
-            m_Commands += CLCOUNT_BARRIER;
-
-            D3D12_RESOURCE_TRANSITION_BARRIER transition;
-            transition.pResource = resource.GetD3D12Resource();
-            transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
-            transition.StateBefore = currentState;
-            transition.StateAfter = finalState;
-            m_BarrierCache.EnqueueTransition(m_CommandList, D3D12_RESOURCE_BARRIER_FLAG_NONE, transition);
-
-            resource.SetCurrentState(finalState);
-        }
-
-        // Only need UAV barrier if we didn't do a split transition here.
-        else if (finalState == D3D12_RESOURCE_STATE_UNORDERED_ACCESS && !bFinishedSplit)
-        {
-            QueueUAVBarrier(resource);
-        }
-    }
-
-
-    void CommandList::QueueTransitionBarrierBegin(Resource& resource, D3D12_RESOURCE_STATES finalState)
-    {
-        if (resource.IsOffCard())
-        {
-            if (finalState != D3D12_RESOURCE_STATE_COMMON)
-            {
-                finalState = resource.GetRequiredResourceState();
-            }
-        }
-
-        if (resource.GetAnnouncedState() != static_cast<D3D12_RESOURCE_STATES>(-1))
-        {
-            QueueTransitionBarrier(resource, resource.GetAnnouncedState());
-        }
-
-        D3D12_RESOURCE_STATES stateInitial = resource.GetCurrentState();
-        D3D12_RESOURCE_STATES stateAnnounced = resource.GetAnnouncedState();
-
-        if (stateInitial != finalState && stateAnnounced != finalState)
-        {
-            m_Commands += CLCOUNT_BARRIER;
-
-            //AZ_Printf("DX12", "QueueTransitionBarrierBegin: Split Barrier BEGIN %p %s -> %s", resource.GetD3D12Resource(), StateToString(stateInitial), StateToString(finalState));
-
-            D3D12_RESOURCE_TRANSITION_BARRIER transition;
-            transition.pResource = resource.GetD3D12Resource();
-            transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
-            transition.StateBefore = stateInitial;
-            transition.StateAfter = finalState;
-
-            m_BarrierCache.EnqueueTransition(m_CommandList, D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY, transition);
-
-            resource.SetAnnouncedState(finalState);
-        }
-    }
-
-    void CommandList::QueueUAVBarrier(Resource& resource)
-    {
-        m_Commands += CLCOUNT_BARRIER;
-
-        m_BarrierCache.EnqueueUAV(m_CommandList, resource);
-    }
-
-    void CommandList::FlushBarriers()
-    {
-        if (m_BarrierCache.IsFlushNeeded())
-        {
-            DX12_COMMANDLIST_TIMER_DETAIL("FlushBarriers");
-            m_BarrierCache.Flush(m_CommandList);
-        }
-    }
-
-    void CommandList::QueueTransitionBarrier(ID3D12Resource* resource, D3D12_RESOURCE_STATES stateBefore, D3D12_RESOURCE_STATES stateAfter)
-    {
-        if (stateBefore == stateAfter)
-            return;
-
-        D3D12_RESOURCE_TRANSITION_BARRIER transition;
-        transition.pResource = resource;
-        transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
-        transition.StateBefore = stateBefore;
-        transition.StateAfter = stateAfter;
-
-        m_BarrierCache.EnqueueTransition(m_CommandList, D3D12_RESOURCE_BARRIER_FLAG_NONE, transition);
-    }
-
-    CommandListPool::CommandListPool(Device* device, CommandListFenceSet& rCmdFence, int nPoolFenceId)
-        : m_pDevice(device)
-        , m_rCmdFences(rCmdFence)
-        , m_nPoolFenceId(nPoolFenceId)
-    {
-#ifdef DX12_STATS
-        m_PeakNumCommandListsAllocated = 0;
-        m_PeakNumCommandListsInFlight = 0;
-        m_NumWaitsGPU = 0;
-        m_NumWaitsCPU = 0;
-#endif // DX12_STATS
-    }
-
-    CommandListPool::~CommandListPool()
-    {
-    }
-
-    bool CommandListPool::Init(D3D12_COMMAND_LIST_TYPE eType)
-    {
-        if (!m_pCmdQueue)
-        {
-            D3D12_COMMAND_QUEUE_DESC queueDesc = {};
-
-            queueDesc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
-            queueDesc.Type = m_ePoolType = eType;
-            queueDesc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL;
-            queueDesc.NodeMask = 0; // One GPU?
-
-            ID3D12CommandQueue* pCmdQueue = NULL;
-            if (S_OK != m_pDevice->GetD3D12Device()->CreateCommandQueue(&queueDesc, IID_GRAPHICS_PPV_ARGS(&pCmdQueue)))
-            {
-                DX12_ERROR("Could not create command queue");
-                return false;
-            }
-
-            m_pCmdQueue = pCmdQueue;
-            pCmdQueue->Release();
-
-            EBUS_EVENT(AZ::Debug::EventTraceDrillerSetupBus, SetThreadName, EventTrace::GpuDetailThreadId, EventTrace::GpuDetailName);
-        }
-
-        m_AsyncCommandQueue.Init(this);
-
-#ifdef DX12_STATS
-        m_PeakNumCommandListsAllocated = 0;
-        m_PeakNumCommandListsInFlight = 0;
-#endif // DX12_STATS
-
-        return true;
-    }
-
-    void CommandListPool::ScheduleCommandLists()
-    {
-        // Remove finished command-lists from the head of the live-list
-        while (m_LiveCommandLists.size())
-        {
-            SmartPtr<CommandList> pCmdList = m_LiveCommandLists.front();
-
-            // free -> complete -> submitted -> finished -> clearing -> free
-            if (pCmdList->IsFinished() && !pCmdList->IsClearing())
-            {
-                m_LiveCommandLists.pop_front();
-                m_BusyCommandLists.push_back(pCmdList);
-
-                pCmdList->Clear();
-            }
-            else
-            {
-                break;
-            }
-        }
-
-        // Submit completed but not yet submitted command-lists from the head of the live-list
-        for (uint32 t = 0; t < m_LiveCommandLists.size(); ++t)
-        {
-            SmartPtr<CommandList> pCmdList = m_LiveCommandLists[t];
-
-            if (pCmdList->IsScheduled() && !pCmdList->IsSubmitted())
-            {
-                pCmdList->Submit();
-            }
-
-            if (!pCmdList->IsSubmitted())
-            {
-                break;
-            }
-        }
-
-        // Remove cleared/deallocated command-lists from the head of the busy-list
-        while (m_BusyCommandLists.size())
-        {
-            SmartPtr<CommandList> pCmdList = m_BusyCommandLists.front();
-
-            // free -> complete -> submitted -> finished -> clearing -> free
-            if (pCmdList->IsFree())
-            {
-                m_BusyCommandLists.pop_front();
-                m_FreeCommandLists.push_back(pCmdList);
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-
-    void CommandListPool::CreateOrReuseCommandList(SmartPtr<CommandList>& result)
-    {
-        if (m_FreeCommandLists.empty())
-        {
-            result = new CommandList(*this);
-        }
-        else
-        {
-            result = m_FreeCommandLists.front();
-
-            m_FreeCommandLists.pop_front();
-        }
-
-        // Increment fence value on allocation, this has the effect that
-        // acquired CommandLists need to be submitted in-order to prevent
-        // dead-locking
-        SetCurrentFenceValue(GetCurrentFenceValue() + 1);
-
-        result->Init(GetCurrentFenceValue());
-        m_LiveCommandLists.push_back(result);
-
-#ifdef DX12_STATS
-        m_PeakNumCommandListsAllocated = std::max(m_PeakNumCommandListsAllocated, m_LiveCommandLists.size() + m_BusyCommandLists.size() + m_FreeCommandLists.size());
-        m_PeakNumCommandListsInFlight = std::max(m_PeakNumCommandListsInFlight, m_LiveCommandLists.size());
-#endif // DX12_STATS
-    }
-
-    void CommandListPool::AcquireCommandList(SmartPtr<CommandList>& result)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-
-        ScheduleCommandLists();
-
-        CreateOrReuseCommandList(result);
-    }
-
-    void CommandListPool::ForfeitCommandList(SmartPtr<CommandList>& result, bool bWait)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-        SmartPtr<CommandList> pWaitable = result;
-
-        DX12_ASSERT(result->IsCompleted(), "It's not possible to forfeit an unclosed command list!");
-        result->Schedule();
-        result = nullptr;
-
-        ScheduleCommandLists();
-
-        if (bWait)
-        {
-            pWaitable->WaitForFinishOnCPU();
-        }
-    }
-
-    void CommandListPool::AcquireCommandLists(uint32 numCLs, SmartPtr<CommandList>* results)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-
-        ScheduleCommandLists();
-
-        for (uint32 i = 0; i < numCLs; ++i)
-        {
-            CreateOrReuseCommandList(results[i]);
-        }
-    }
-
-    void CommandListPool::ForfeitCommandLists(uint32 numCLs, SmartPtr<CommandList>* results, bool bWait)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-        SmartPtr<CommandList> pWaitable = results[numCLs - 1];
-
-        for (uint32 i = 0; i < numCLs; ++i)
-        {
-            DX12_ASSERT(results[i]->IsCompleted(), "It's not possible to forfeit an unclosed command list!");
-            results[i]->Schedule();
-            results[i] = nullptr;
-        }
-
-        ScheduleCommandLists();
-
-        if (bWait)
-        {
-            pWaitable->WaitForFinishOnCPU();
-        }
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandList.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandList.hpp
deleted file mode 100644
index 7a36d78341..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandList.hpp
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12CommandListFence.hpp"
-#include "DX12PSO.hpp"
-#include "DX12DescriptorHeap.hpp"
-#include "DX12QueryHeap.hpp"
-#include "DX12View.hpp"
-#include "DX12SamplerState.hpp"
-#include "DX12AsyncCommandQueue.hpp"
-#include "DX12Resource.hpp"
-#include "DX12ResourceBarrierCache.h"
-#include "DX12TimerHeap.h"
-
-#include <AzCore/Debug/EventTrace.h>
-#include <AzCore/std/containers/array.h>
-#include <AzCore/std/containers/unordered_map.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define DX12COMMANDLIST_HPP_SECTION_1 1
-#endif
-
-namespace DX12
-{
-    class CommandList;
-
-    class CommandListPool
-    {
-    public:
-        CommandListPool(Device* device, CommandListFenceSet& rCmdFence, int nPoolFenceId);
-        ~CommandListPool();
-
-        bool Init(D3D12_COMMAND_LIST_TYPE eType = D3D12_COMMAND_LIST_TYPE_DIRECT);
-        void AcquireCommandList(SmartPtr<CommandList> & result);
-        void ForfeitCommandList(SmartPtr<CommandList> & result, bool bWait = false);
-        void AcquireCommandLists(uint32 numCLs, SmartPtr<CommandList> * results);
-        void ForfeitCommandLists(uint32 numCLs, SmartPtr<CommandList> * results, bool bWait = false);
-
-        inline ID3D12CommandQueue* GetD3D12CommandQueue() const
-        {
-            return m_pCmdQueue;
-        }
-
-        inline D3D12_COMMAND_LIST_TYPE GetD3D12QueueType() const
-        {
-            return m_ePoolType;
-        }
-
-        inline DX12::AsyncCommandQueue& GetAsyncCommandQueue()
-        {
-            return m_AsyncCommandQueue;
-        }
-
-        inline Device* GetDevice() const
-        {
-            return m_pDevice;
-        }
-
-        inline CommandListFenceSet& GetFences()
-        {
-            return m_rCmdFences;
-        }
-
-        inline ID3D12Fence** GetD3D12Fences() const
-        {
-            return m_rCmdFences.GetD3D12Fences();
-        }
-
-        inline ID3D12Fence* GetD3D12Fence() const
-        {
-            return m_rCmdFences.GetD3D12Fence(m_nPoolFenceId);
-        }
-
-        inline int GetFenceID() const
-        {
-            return m_nPoolFenceId;
-        }
-
-        inline void SetSubmittedFenceValue(const UINT64 fenceValue)
-        {
-            return m_rCmdFences.SetSubmittedValue(fenceValue, m_nPoolFenceId);
-        }
-
-        inline UINT64 GetSubmittedFenceValue() const
-        {
-            return m_rCmdFences.GetSubmittedValue(m_nPoolFenceId);
-        }
-
-    private:
-        inline void SetCurrentFenceValue(const UINT64 fenceValue)
-        {
-            return m_rCmdFences.SetCurrentValue(fenceValue, m_nPoolFenceId);
-        }
-
-    public:
-        inline UINT64 GetLastCompletedFenceValue() const
-        {
-            return m_rCmdFences.GetLastCompletedFenceValue(m_nPoolFenceId);
-        }
-
-        inline UINT64 GetCurrentFenceValue() const
-        {
-            return m_rCmdFences.GetCurrentValue(m_nPoolFenceId);
-        }
-
-        inline void WaitForFenceOnGPU(const std::atomic<AZ::u64> (&fenceValues)[CMDQUEUE_NUM])
-        {
-            // The pool which waits for the fence can be omitted (in-order-execution)
-            UINT64 fenceValuesMasked[CMDQUEUE_NUM];
-
-            fenceValuesMasked[CMDQUEUE_COPY    ] = fenceValues[CMDQUEUE_COPY    ];
-            fenceValuesMasked[CMDQUEUE_GRAPHICS] = fenceValues[CMDQUEUE_GRAPHICS];
-            fenceValuesMasked[m_nPoolFenceId   ] = 0;
-
-            if (!m_rCmdFences.IsCompleted(fenceValuesMasked))
-            {
-                DX12_LOG("Waiting for GPU fences (type: %d) [%d,%d] -> [%d,%d]",
-                    m_nPoolFenceId,
-                    m_rCmdFences.GetD3D12Fence(CMDQUEUE_COPY)->GetCompletedValue(),
-                    m_rCmdFences.GetD3D12Fence(CMDQUEUE_GRAPHICS)->GetCompletedValue(),
-                    static_cast<AZ::u64>(fenceValues[CMDQUEUE_COPY    ]),
-                    static_cast<AZ::u64>(fenceValues[CMDQUEUE_GRAPHICS]));
-#ifdef DX12_STATS
-                m_NumWaitsGPU += 2;
-#endif // DX12_STATS
-
-                m_AsyncCommandQueue.Wait(m_rCmdFences.GetD3D12Fences(), fenceValuesMasked);
-            }
-        }
-
-        inline void WaitForFenceOnGPU(const UINT64 fenceValue, const int id)
-        {
-            if (!m_rCmdFences.IsCompleted(fenceValue, id))
-            {
-                DX12_LOG("Waiting for GPU fence %d -> %d", m_rCmdFences.GetD3D12Fence(id)->GetCompletedValue(), fenceValue);
-
-#ifdef DX12_STATS
-                m_NumWaitsGPU++;
-#endif // DX12_STATS
-
-                m_AsyncCommandQueue.Wait(m_rCmdFences.GetD3D12Fence(id), fenceValue);
-            }
-        }
-
-        inline void WaitForFenceOnGPU(const UINT64 fenceValue)
-        {
-            return WaitForFenceOnGPU(fenceValue, m_nPoolFenceId);
-        }
-
-        inline void WaitForFenceOnCPU(const std::atomic<AZ::u64> (&fenceValues)[CMDQUEUE_NUM]) const
-        {
-            AZ_TRACE_METHOD();
-            UINT64 fenceValuesCopied[CMDQUEUE_NUM];
-
-            fenceValuesCopied[CMDQUEUE_COPY    ] = fenceValues[CMDQUEUE_COPY    ];
-            fenceValuesCopied[CMDQUEUE_GRAPHICS] = fenceValues[CMDQUEUE_GRAPHICS];
-
-            if (!m_rCmdFences.IsCompleted(fenceValuesCopied))
-            {
-#ifdef DX12_STATS
-                m_NumWaitsCPU += 2;
-#endif // DX12_STATS
-
-                m_rCmdFences.WaitForFence(fenceValuesCopied);
-            }
-        }
-
-        inline void WaitForFenceOnCPU(const UINT64 fenceValue, const int id) const
-        {
-            if (!m_rCmdFences.IsCompleted(fenceValue, id))
-            {
-#ifdef DX12_STATS
-                m_NumWaitsCPU++;
-#endif // DX12_STATS
-
-                m_rCmdFences.WaitForFence(fenceValue, id);
-            }
-        }
-
-        inline void WaitForFenceOnCPU(const UINT64 fenceValue) const
-        {
-            return WaitForFenceOnCPU(fenceValue, m_nPoolFenceId);
-        }
-
-        inline bool IsCompleted(const std::atomic<AZ::u64> (&fenceValues)[CMDQUEUE_NUM]) const
-        {
-            // The pool which checks for the fence can be omitted (in-order-execution)
-            UINT64 fenceValuesMasked[CMDQUEUE_NUM];
-
-            fenceValuesMasked[CMDQUEUE_COPY    ] = fenceValues[CMDQUEUE_COPY    ];
-            fenceValuesMasked[CMDQUEUE_GRAPHICS] = fenceValues[CMDQUEUE_GRAPHICS];
-            fenceValuesMasked[m_nPoolFenceId   ] = 0;
-
-            return m_rCmdFences.IsCompleted(fenceValuesMasked);
-        }
-
-        inline bool IsCompleted(const UINT64 fenceValue, const int id) const
-        {
-            return m_rCmdFences.IsCompleted(fenceValue, id);
-        }
-
-        inline bool IsCompleted(const UINT64 fenceValue) const
-        {
-            return IsCompleted(fenceValue, m_nPoolFenceId);
-        }
-
-    private:
-        void ScheduleCommandLists();
-        void CreateOrReuseCommandList(SmartPtr<CommandList> & result);
-
-        Device* m_pDevice;
-        CommandListFenceSet& m_rCmdFences;
-        int m_nPoolFenceId;
-        D3D12_COMMAND_LIST_TYPE m_ePoolType;
-
-        typedef std::deque<SmartPtr<CommandList>> TCommandLists;
-        TCommandLists m_LiveCommandLists;
-        TCommandLists m_BusyCommandLists;
-        TCommandLists m_FreeCommandLists;
-
-        SmartPtr<ID3D12CommandQueue> m_pCmdQueue;
-        DX12::AsyncCommandQueue m_AsyncCommandQueue;
-
-#ifdef DX12_STATS
-        size_t m_NumWaitsGPU;
-        mutable size_t m_NumWaitsCPU;
-        size_t m_PeakNumCommandListsAllocated;
-        size_t m_PeakNumCommandListsInFlight;
-#endif // DX12_STATS
-    };
-
-    class CommandList
-        : public DeviceObject
-    {
-        friend class CommandListPool;
-
-    public:
-        virtual ~CommandList();
-
-        bool Init(UINT64 currentFenceValue);
-        bool Reset();
-
-        inline ID3D12GraphicsCommandList* GetD3D12CommandList() const
-        {
-            return m_CommandList;
-        }
-        inline D3D12_COMMAND_LIST_TYPE GetD3D12ListType() const
-        {
-            return m_eListType;
-        }
-        inline ID3D12CommandAllocator* GetD3D12CommandAllocator() const
-        {
-            return m_pCmdAllocator;
-        }
-        inline ID3D12CommandQueue* GetD3D12CommandQueue() const
-        {
-            return m_pCmdQueue;
-        }
-        inline CommandListPool& GetCommandListPool() const
-        {
-            return m_rPool;
-        }
-
-        // Stage 1
-        inline bool IsFree() const
-        {
-            return m_State == CLSTATE_FREE;
-        }
-
-        // Stage 2
-        void Begin();
-        inline bool IsUtilized() const
-        {
-#define CLCOUNT_DRAW        1
-#define CLCOUNT_DISPATCH    1
-#define CLCOUNT_COPY        1
-#define CLCOUNT_CLEAR       1
-#define CLCOUNT_DISCARD     1
-#define CLCOUNT_BARRIER     1
-#define CLCOUNT_QUERY       1
-#define CLCOUNT_QUERY_TIMESTAMP 0
-#define CLCOUNT_RESOLVE     1
-#define CLCOUNT_SETIO       0
-#define CLCOUNT_SETSTATE    0
-
-            return m_Commands > 0;
-        }
-
-        void End();
-        inline bool IsCompleted() const
-        {
-            return m_State >= CLSTATE_COMPLETED;
-        }
-
-        void Schedule();
-        inline bool IsScheduled() const
-        {
-            return m_State == CLSTATE_SCHEDULED;
-        }
-
-        // Stage 3
-        UINT64 SignalFenceOnGPU()
-        {
-            DX12_LOG("Signaling fence value on GPU (%d) : %d", m_rPool.GetFenceID(), m_CurrentFenceValue);
-            m_rPool.GetAsyncCommandQueue().Signal(m_rPool.GetD3D12Fence(), m_CurrentFenceValue);
-            return m_CurrentFenceValue;
-        }
-
-        UINT64 SignalFenceOnCPU()
-        {
-            DX12_LOG("Signaling fence value on CPU: %d", m_CurrentFenceValue);
-            m_rPool.GetD3D12Fence()->Signal(m_CurrentFenceValue);
-            return m_CurrentFenceValue;
-        }
-
-        void Submit();
-        inline bool IsSubmitted() const
-        {
-            return m_State >= CLSTATE_SUBMITTED;
-        }
-
-        // Stage 4
-        void WaitForFinishOnGPU()
-        {
-            DX12_ASSERT(m_State == CLSTATE_SUBMITTED, "GPU fence waits for itself to be complete: deadlock imminent!");
-            m_rPool.WaitForFenceOnGPU(m_CurrentFenceValue);
-        }
-
-        void WaitForFinishOnCPU() const
-        {
-            DX12_ASSERT(m_State == CLSTATE_SUBMITTED, "CPU fence waits for itself to be complete: deadlock imminent!");
-            m_rPool.WaitForFenceOnCPU(m_CurrentFenceValue);
-        }
-
-        inline bool IsFinished() const
-        {
-            if ((m_State == CLSTATE_SUBMITTED) && m_rPool.IsCompleted(m_CurrentFenceValue))
-            {
-                m_State = CLSTATE_FINISHED;
-            }
-
-            return m_State == CLSTATE_FINISHED;
-        }
-
-        inline UINT64 GetCurrentFenceValue() const
-        {
-            return m_CurrentFenceValue;
-        }
-
-        // Stage 5
-        void Clear();
-        inline bool IsClearing() const
-        {
-            return m_State == CLSTATE_CLEARING;
-        }
-
-        void SetPipelineState(const PipelineState* pso);
-        void SetRootSignature(CommandMode commandMode, const RootSignature* rootSignature);
-
-        void QueueUAVBarrier(Resource& resource);
-
-        void QueueTransitionBarrier(Resource& resource, D3D12_RESOURCE_STATES desiredState);
-
-        void QueueTransitionBarrierBegin(Resource& resource, D3D12_RESOURCE_STATES desiredState);
-
-        void FlushBarriers();
-
-        // Collect the highest fenceValues of all given Resource to wait before the command-list is finally submitted
-        inline void MaxResourceFenceValue(Resource& resource, const int type)
-        {
-            resource.MaxFenceValues(m_UsedFenceValues, type);
-        }
-
-        // Mark resource with desired fence value, returns the previous fence value
-        inline UINT64 SetResourceFenceValue(Resource& resource, const UINT64 fenceValue, const int type) const
-        {
-            return resource.SetFenceValue(fenceValue, m_rPool.GetFenceID(), type);
-        }
-
-        inline void TrackResourceUsage(Resource& resource, D3D12_RESOURCE_STATES stateUsage, int cmdBlocker = CMDTYPE_WRITE, int cmdUsage = CMDTYPE_READ)
-        {
-            resource.TryStagingUpload(this);
-            MaxResourceFenceValue(resource, cmdBlocker);
-            QueueTransitionBarrier(resource, stateUsage);
-            SetResourceFenceValue(resource, m_CurrentFenceValue, cmdUsage);
-        }
-
-        inline void TrackResourceIBVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_INDEX_BUFFER, CMDTYPE_WRITE, CMDTYPE_READ); }
-        inline void TrackResourceVBVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER, CMDTYPE_WRITE, CMDTYPE_READ); }
-        inline void TrackResourceCBVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER, CMDTYPE_WRITE, CMDTYPE_READ); }
-        inline void TrackResourceSRVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | GetPreserveFlags(resource), CMDTYPE_WRITE, CMDTYPE_READ); }
-        inline void TrackResourceUAVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS | GetPreserveFlags(resource), CMDTYPE_ANY, CMDTYPE_ANY); }
-        inline void TrackResourceDSVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_DEPTH_WRITE | GetPreserveFlags(resource), CMDTYPE_ANY, CMDTYPE_WRITE); }
-        inline void TrackResourceDRVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_DEPTH_READ | GetPreserveFlags(resource), CMDTYPE_WRITE, CMDTYPE_READ); }
-        inline void TrackResourceRTVUsage(Resource& resource) { TrackResourceUsage(resource, D3D12_RESOURCE_STATE_RENDER_TARGET | GetPreserveFlags(resource), CMDTYPE_ANY, CMDTYPE_WRITE); }
-
-        bool IsFull(size_t numResources, size_t numSamplers, size_t numRendertargets, size_t numDepthStencils) const;
-        bool IsUsedByOutputViews(const Resource& res) const;
-
-        inline void IncrementInputCursors(size_t numResources, size_t numSamplers)
-        {
-            GetResourceHeap().IncrementCursor(numResources);
-            GetSamplerHeap().IncrementCursor(numSamplers);
-        }
-
-        inline void IncrementOutputCursors()
-        {
-            GetRenderTargetHeap().IncrementCursor(m_CurrentNumRTVs);
-            if (m_pDSV)
-            {
-                GetDepthStencilHeap().IncrementCursor();
-            }
-        }
-
-        void WriteShaderResourceDescriptor(const ResourceView* resourceView, INT descriptorOffset);
-        void WriteUnorderedAccessDescriptor(const ResourceView* resourceView, INT descriptorOffset);
-        void WriteConstantBufferDescriptor(const ResourceView* resourceView, INT descriptorOffset, UINT byteOffset, UINT byteCount);
-        void WriteSamplerStateDescriptor(const SamplerState* state, INT descriptorOffset);
-
-        void BindVertexBufferView(const ResourceView&view, INT offset, const TRange<UINT>&bindRange, UINT bindStride, D3D12_VERTEX_BUFFER_VIEW (&heap)[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]);
-        inline void BindVertexBufferView(const ResourceView& view, INT offset, const TRange<UINT>& bindRange, UINT bindStride)
-        {
-            BindVertexBufferView(view, offset, bindRange, bindStride, m_VertexBufferHeap);
-        }
-
-        void SetConstantBufferView(CommandMode commandMode, UINT RootParameterIndex, D3D12_GPU_VIRTUAL_ADDRESS BufferLocation);
-        void Set32BitConstants(CommandMode commandMode, UINT RootParameterIndex, UINT Num32BitValuesToSet, const void* pSrcData, UINT DestOffsetIn32BitValues);
-        void SetDescriptorTable(CommandMode commandMode, UINT RootParameterIndex, D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor);
-
-        void SetDescriptorTables(CommandMode commandMode, D3D12_DESCRIPTOR_HEAP_TYPE eType);
-
-        void ClearVertexBufferHeap(UINT num);
-        void SetVertexBufferHeap(UINT num);
-        void BindAndSetIndexBufferView(const ResourceView& view, DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN, UINT offset = 0);
-
-        void SetResourceAndSamplerStateHeaps();
-        void BindAndSetOutputViews(INT numRTVs, const ResourceView** rtv, const ResourceView* dsv);
-
-        void ClearDepthStencilView(const ResourceView& view, D3D12_CLEAR_FLAGS clearFlags, float depthValue, UINT stencilValue, UINT NumRects = 0U, const D3D12_RECT* pRect = nullptr);
-        void ClearRenderTargetView(const ResourceView& view, const FLOAT rgba[4], UINT NumRects = 0U, const D3D12_RECT* pRect = nullptr);
-        void ClearUnorderedAccessView(const ResourceView& view, const UINT rgba[4], UINT NumRects = 0U, const D3D12_RECT* pRect = nullptr);
-        void ClearUnorderedAccessView(const ResourceView& view, const FLOAT rgba[4], UINT NumRects = 0U, const D3D12_RECT* pRect = nullptr);
-        void ClearView(const ResourceView& view, const FLOAT rgba[4], UINT NumRects = 0U, const D3D12_RECT* pRect = nullptr);
-
-        void CopyResource(Resource& pDstResource, Resource& pSrcResource);
-        void CopySubresource(Resource& pDestResource, UINT destSubResource, UINT x, UINT y, UINT z, Resource& pSrcResource, UINT srcSubResource, const D3D12_BOX* srcBox);
-        void UpdateSubresourceRegion(Resource& resource, UINT subResource, const D3D12_BOX* box, const void* data, UINT rowPitch, UINT depthPitch);
-        void UpdateSubresources(Resource& rResource, UINT64 uploadBufferSize, UINT subResources, D3D12_SUBRESOURCE_DATA* subResourceData);
-        void DiscardResource(Resource& resource, const D3D12_DISCARD_REGION* pRegion);
-
-        void PresentRenderTargetView(SwapChain* pDX12SwapChain);
-
-        inline void DrawInstanced(UINT vertexCountPerInstance, UINT instanceCount, UINT startVertexLocation, UINT startInstanceLocation)
-        {
-            DX12_COMMANDLIST_TIMER_DETAIL("DrawInstanced");
-#ifdef DX12_STATS
-            m_NumDraws++;
-#endif // DX12_STATS
-
-            FlushBarriers();
-            m_CommandList->DrawInstanced(vertexCountPerInstance, instanceCount, startVertexLocation, startInstanceLocation);
-            m_Commands += CLCOUNT_DRAW;
-        }
-
-        inline void DrawIndexedInstanced(UINT indexCountPerInstance, UINT instanceCount, UINT startIndexLocation, UINT baseVertexLocation, UINT startInstanceLocation)
-        {
-            DX12_COMMANDLIST_TIMER_DETAIL("DrawIndexedInstanced");
-#ifdef DX12_STATS
-            m_NumDraws++;
-#endif // DX12_STATS
-
-            FlushBarriers();
-            m_CommandList->DrawIndexedInstanced(indexCountPerInstance, instanceCount, startIndexLocation, baseVertexLocation, startInstanceLocation);
-            m_Commands += CLCOUNT_DRAW;
-        }
-
-        inline void Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ)
-        {
-            DX12_COMMANDLIST_TIMER_DETAIL("Dispatch");
-#ifdef DX12_STATS
-            m_NumDraws++;
-#endif // DX12_STATS
-
-            FlushBarriers();
-            m_CommandList->Dispatch(ThreadGroupCountX, ThreadGroupCountY, ThreadGroupCountZ);
-            m_Commands += CLCOUNT_DISPATCH;
-        }
-
-        inline void SetPrimitiveTopology(D3D12_PRIMITIVE_TOPOLOGY topo)
-        {
-            m_CommandList->IASetPrimitiveTopology(topo);
-            m_Commands += CLCOUNT_SETIO;
-        }
-
-        inline void SetViewports(UINT NumViewports, const D3D12_VIEWPORT* pViewports)
-        {
-            m_CommandList->RSSetViewports(NumViewports, pViewports);
-            m_Commands += CLCOUNT_SETSTATE;
-        }
-
-        inline void SetScissorRects(UINT NumRects, const D3D12_RECT* pRects)
-        {
-            m_CommandList->RSSetScissorRects(NumRects, pRects);
-            m_Commands += CLCOUNT_SETSTATE;
-        }
-
-        inline void SetStencilRef(UINT Ref)
-        {
-            m_CommandList->OMSetStencilRef(Ref);
-            m_Commands += CLCOUNT_SETSTATE;
-        }
-
-        inline void BeginQuery(QueryHeap& queryHeap, D3D12_QUERY_TYPE Type, UINT Index)
-        {
-            m_CommandList->BeginQuery(queryHeap.GetD3D12QueryHeap(), Type, Index);
-            m_Commands += Type == D3D12_QUERY_TYPE_TIMESTAMP ? CLCOUNT_QUERY_TIMESTAMP : CLCOUNT_QUERY;
-        }
-
-        inline void EndQuery(QueryHeap& queryHeap, D3D12_QUERY_TYPE Type, UINT Index)
-        {
-            m_CommandList->EndQuery(queryHeap.GetD3D12QueryHeap(), Type, Index);
-            m_Commands += Type == D3D12_QUERY_TYPE_TIMESTAMP ? CLCOUNT_QUERY_TIMESTAMP : CLCOUNT_QUERY;
-        }
-
-        inline void ResolveQueryData(QueryHeap& queryHeap, D3D12_QUERY_TYPE Type,
-            _In_  UINT StartIndex,
-            _In_  UINT NumQueries,
-            _In_  ID3D12Resource* pDestinationBuffer,
-            _In_  UINT64 AlignedDestinationBufferOffset)
-        {
-            m_CommandList->ResolveQueryData(queryHeap.GetD3D12QueryHeap(), Type, StartIndex, NumQueries, pDestinationBuffer, AlignedDestinationBufferOffset);
-            m_Commands += CLCOUNT_RESOLVE;
-        }
-
-    private:
-        CommandList(CommandListPool& pPool);
-        CommandListPool& m_rPool;
-
-        void ResetStateTracking(CommandMode commandMode);
-        void BindDepthStencilView(const ResourceView& dsv);
-        void BindRenderTargetView(const ResourceView& rtv);
-
-        D3D12_RESOURCE_STATES GetPreserveFlags([[maybe_unused]] Resource& resource)
-        {
-            D3D12_RESOURCE_STATES preserveFlags = D3D12_RESOURCE_STATES(0U);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12COMMANDLIST_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12CommandList_hpp)
-#endif
-            return preserveFlags;
-        }
-
-        void QueueTransitionBarrier(ID3D12Resource* resource, D3D12_RESOURCE_STATES stateBefore, D3D12_RESOURCE_STATES stateAfter);
-        void SubmitTimers();
-
-        ID3D12Device* m_pD3D12Device;
-        SmartPtr<ID3D12GraphicsCommandList> m_CommandList;
-        SmartPtr<ID3D12CommandAllocator> m_pCmdAllocator;
-        SmartPtr<ID3D12CommandQueue> m_pCmdQueue;
-        std::atomic<AZ::u64> m_UsedFenceValues[CMDTYPE_NUM][CMDQUEUE_NUM];
-
-        ResourceBarrierCache m_BarrierCache;
-
-        // Only used by IsUsedByOutputViews()
-        const ResourceView* m_pDSV;
-        const ResourceView* m_pRTV[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT];
-        INT m_CurrentNumRTVs;
-
-        UINT64 m_CurrentFenceValue;
-        D3D12_COMMAND_LIST_TYPE m_eListType;
-
-        DescriptorBlock m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES];
-
-        inline       DescriptorBlock& GetResourceHeap    ()       { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV]; }
-        inline       DescriptorBlock& GetSamplerHeap     ()       { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER]; }
-        inline       DescriptorBlock& GetRenderTargetHeap()       { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_RTV]; }
-        inline       DescriptorBlock& GetDepthStencilHeap()       { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_DSV]; }
-
-        inline const DescriptorBlock& GetResourceHeap    () const { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV]; }
-        inline const DescriptorBlock& GetSamplerHeap     () const { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER]; }
-        inline const DescriptorBlock& GetRenderTargetHeap() const { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_RTV]; }
-        inline const DescriptorBlock& GetDepthStencilHeap() const { return m_DescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_DSV]; }
-
-        UINT m_CurrentNumVertexBuffers;
-        D3D12_VERTEX_BUFFER_VIEW m_VertexBufferHeap[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-
-        static const AZ::u32 RootParameterCountMax = 16;
-        struct RootParameter
-        {
-            union
-            {
-                D3D12_GPU_VIRTUAL_ADDRESS gpuAddress;
-                D3D12_GPU_DESCRIPTOR_HANDLE descriptorHandle;
-            };
-        };
-
-        RootParameter m_CurrentRootParameters[CommandModeCount][RootParameterCountMax];
-        const PipelineState* m_CurrentPipelineState;
-        const RootSignature* m_CurrentRootSignature[CommandModeCount];
-
-        UINT m_Commands;
-        mutable enum
-        {
-            CLSTATE_FREE,
-            CLSTATE_STARTED,
-            CLSTATE_UTILIZED,
-            CLSTATE_COMPLETED,
-            CLSTATE_SCHEDULED,
-            CLSTATE_SUBMITTED,
-            CLSTATE_FINISHED,
-            CLSTATE_CLEARING
-        }
-        m_State;
-
-        UINT m_nodeMask;
-
-#ifdef DX12_STATS
-        size_t m_NumDraws;
-        size_t m_NumWaitsGPU;
-        size_t m_NumWaitsCPU;
-#endif // DX12_STATS
-
-#if DX12_GPU_PROFILE_MODE != DX12_GPU_PROFILE_MODE_OFF
-        TimerHeap m_Timers;
-        TimerHandle m_TimerHandle;
-        static const AZ::u32 TimerCountMax = 2048;
-#endif
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandListFence.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandListFence.cpp
deleted file mode 100644
index ec1e384a9a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandListFence.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12CommandListFence.hpp"
-#include "DriverD3D.h"
-
-#define TRACK_RENDERTREAD_WAIT_TIME SScopedExecutionTimeTracker renderThreadWaitTimeTracker(gcpRendD3D->m_fTimeWaitForGPU[gcpRendD3D->m_RP.m_nProcessThreadID]);
-
-struct SScopedExecutionTimeTracker
-{
-    SScopedExecutionTimeTracker(float& var)
-        : trackerVariable(var)
-        , startTime(iTimer->GetAsyncTime())
-    {}
-
-    ~SScopedExecutionTimeTracker()
-    {
-        trackerVariable += iTimer->GetAsyncTime().GetDifferenceInSeconds(startTime);
-    }
-
-    float& trackerVariable;
-    CTimeValue startTime;
-};
-
-namespace DX12
-{
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    CommandListFence::CommandListFence(Device* device)
-        : m_pDevice(device)
-        , m_LastCompletedValue(0)
-        , m_CurrentValue(0)
-    {
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    CommandListFence::~CommandListFence()
-    {
-        m_pFence->Release();
-        CloseHandle(m_FenceEvent);
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    bool CommandListFence::Init()
-    {
-        ID3D12Fence* fence = NULL;
-        if (S_OK != m_pDevice->GetD3D12Device()->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_GRAPHICS_PPV_ARGS(&fence)))
-        {
-            DX12_ERROR("Could not create fence object!");
-            return false;
-        }
-
-        m_pFence = fence;
-        m_pFence->Signal(m_LastCompletedValue);
-        m_FenceEvent = CreateEventEx(NULL, FALSE, FALSE, EVENT_ALL_ACCESS);
-
-        return true;
-    }
-
-    void CommandListFence::WaitForFence(AZ::u64 fenceValue)
-    {
-        if (!IsCompleted(fenceValue))
-        {
-            DX12_LOG("Waiting CPU for fence %d -> %d", m_pFence->GetCompletedValue(), fenceValue);
-            {
-                TRACK_RENDERTREAD_WAIT_TIME
-
-                m_pFence->SetEventOnCompletion(fenceValue, m_FenceEvent);
-
-                WaitForSingleObject(m_FenceEvent, INFINITE);
-            }
-            DX12_LOG("Completed fence value: %d", m_pFence->GetCompletedValue());
-
-            AdvanceCompletion();
-        }
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    CommandListFenceSet::CommandListFenceSet(Device* device)
-        : m_pDevice(device)
-    {
-        m_LastCompletedValues[CMDQUEUE_COPY    ] =
-            m_LastCompletedValues[CMDQUEUE_GRAPHICS] = 0;
-        m_SubmittedValues[CMDQUEUE_COPY] =
-            m_SubmittedValues[CMDQUEUE_GRAPHICS] = 0;
-        m_CurrentValues[CMDQUEUE_COPY    ] =
-            m_CurrentValues[CMDQUEUE_GRAPHICS] = 0;
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    CommandListFenceSet::~CommandListFenceSet()
-    {
-        for (int i = 0; i < CMDQUEUE_NUM; ++i)
-        {
-            m_pFences[i]->Release();
-
-            CloseHandle(m_FenceEvents[i]);
-        }
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    bool CommandListFenceSet::Init()
-    {
-        for (int i = 0; i < CMDQUEUE_NUM; ++i)
-        {
-            ID3D12Fence* fence = NULL;
-            if (S_OK != m_pDevice->GetD3D12Device()->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_GRAPHICS_PPV_ARGS(&fence)))
-            {
-                DX12_ERROR("Could not create fence object!");
-                return false;
-            }
-
-            m_pFences[i] = fence;
-            m_pFences[i]->Signal(m_LastCompletedValues[i]);
-            m_FenceEvents[i] = CreateEventEx(NULL, FALSE, FALSE, EVENT_ALL_ACCESS);
-        }
-
-        return true;
-    }
-
-    void CommandListFenceSet::WaitForFence(const AZ::u64 fenceValue, const int id) const
-    {
-        DX12_LOG("Waiting CPU for fence %d -> %d", m_pFences[id]->GetCompletedValue(), fenceValue);
-
-        {
-            TRACK_RENDERTREAD_WAIT_TIME
-
-                m_pFences[id]->SetEventOnCompletion(fenceValue, m_FenceEvents[id]);
-
-            WaitForSingleObject(m_FenceEvents[id], INFINITE);
-        }
-
-        DX12_LOG("Completed fence value: %d", m_pFences[id]->GetCompletedValue());
-
-        AdvanceCompletion(id);
-    }
-
-    void CommandListFenceSet::WaitForFence(const AZ::u64 (&fenceValues)[CMDQUEUE_NUM]) const
-    {
-        // TODO: the pool which waits for the fence can be omitted (in-order-execution)
-        DX12_LOG("Waiting for GPU fences [%d,%d] -> [%d,%d]",
-            m_pFences[CMDQUEUE_COPY    ]->GetCompletedValue(),
-            m_pFences[CMDQUEUE_GRAPHICS]->GetCompletedValue(),
-            fenceValues[CMDQUEUE_COPY    ],
-            fenceValues[CMDQUEUE_GRAPHICS]);
-
-        {
-            TRACK_RENDERTREAD_WAIT_TIME
-
-            // NOTE: event does ONLY trigger when the value has been set (it'll lock when trying with 0)
-            int numObjects = 0;
-            for (int id = 0; id < CMDQUEUE_NUM; ++id)
-            {
-                if (fenceValues[id] && (m_LastCompletedValues[id] < fenceValues[id]))
-                {
-                    m_pFences[id]->SetEventOnCompletion(fenceValues[id], m_FenceEvents[numObjects++]);
-                }
-            }
-
-            WaitForMultipleObjects(numObjects, m_FenceEvents, true, INFINITE);
-        }
-
-        DX12_LOG("Completed GPU fences [%d,%d]",
-            m_pFences[CMDQUEUE_COPY    ]->GetCompletedValue(),
-            m_pFences[CMDQUEUE_GRAPHICS]->GetCompletedValue());
-
-        AdvanceCompletion();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandListFence.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandListFence.hpp
deleted file mode 100644
index cbf796ea5b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12CommandListFence.hpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#define CMDQUEUE_GRAPHICS       0
-#define CMDQUEUE_COPY           1
-#define CMDQUEUE_NUM            2
-
-#define CMDTYPE_READ            0
-#define CMDTYPE_WRITE           1
-#define CMDTYPE_ANY             2
-#define CMDTYPE_NUM             3
-
-#include "DX12Device.hpp"
-
-namespace std
-{
-    inline AZ::u64 (& max(const AZ::u64 (&a)[CMDQUEUE_NUM], const AZ::u64 (&b)[CMDQUEUE_NUM], AZ::u64 (&c)[CMDQUEUE_NUM]))[CMDQUEUE_NUM]
-    {
-        c[CMDQUEUE_COPY    ] = max(a[CMDQUEUE_COPY    ], b[CMDQUEUE_COPY    ]);
-        c[CMDQUEUE_GRAPHICS] = max(a[CMDQUEUE_GRAPHICS], b[CMDQUEUE_GRAPHICS]);
-
-        return c;
-    }
-}
-
-namespace DX12
-{
-    inline AZ::u64 MaxFenceValue(std::atomic<AZ::u64>& a, const AZ::u64& b)
-    {
-        AZ::u64 utilizedValue = b;
-        AZ::u64 previousValue = a;
-        while (previousValue < utilizedValue &&
-               !a.compare_exchange_weak(previousValue, utilizedValue))
-        {
-            ;
-        }
-
-        return previousValue;
-    }
-
-    inline AZ::u64 (& MaxFenceValues(const std::atomic<AZ::u64> (&a)[CMDQUEUE_NUM], const std::atomic<AZ::u64> (&b)[CMDQUEUE_NUM], AZ::u64 (&c)[CMDQUEUE_NUM]))[CMDQUEUE_NUM]
-    {
-        c[CMDQUEUE_COPY    ] = std::max(a[CMDQUEUE_COPY    ], b[CMDQUEUE_COPY    ]);
-        c[CMDQUEUE_GRAPHICS] = std::max(a[CMDQUEUE_GRAPHICS], b[CMDQUEUE_GRAPHICS]);
-
-        return c;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    class CommandListFence
-    {
-    public:
-        CommandListFence(Device* device);
-        ~CommandListFence();
-
-        bool Init();
-
-        inline ID3D12Fence* GetFence() const
-        {
-            return m_pFence;
-        }
-
-        inline AZ::u64 GetCurrentValue() const
-        {
-            return m_CurrentValue;
-        }
-
-        inline void SetCurrentValue(AZ::u64 fenceValue)
-        {
-#ifdef DX12_IN_ORDER_ACQUIRATION
-            DX12_ASSERT(m_CurrentValue <= fenceValue, "Setting new fence value which is older than the current!");
-            // We do not allow smaller fences being submitted, and fences always submit in-order, no max() neccessary
-            m_CurrentValue = fenceValue;
-#else
-            // CLs may submit in any order. Is it higher than last known completed fence? If so, update it!
-            MaxFenceValue(m_CurrentValue, fenceValue);
-#endif // !NDEBUG
-        }
-
-        inline bool IsCompleted(AZ::u64 fenceValue) const
-        {
-            // Check against last known completed value first to avoid unnecessary fence read
-            return
-                (m_LastCompletedValue >= fenceValue) || (AdvanceCompletion() >= fenceValue);
-        }
-
-        void WaitForFence(AZ::u64 fenceValue);
-
-        inline AZ::u64 AdvanceCompletion() const
-        {
-            // Check current completed fence
-            AZ::u64 currentCompletedValue = m_pFence->GetCompletedValue();
-
-            if (m_LastCompletedValue < currentCompletedValue)
-            {
-                DX12_LOG("Completed fence value(s): %d to %d", m_LastCompletedValue + 1, currentCompletedValue);
-            }
-
-#ifdef DX12_IN_ORDER_TERMINATION
-            DX12_ASSERT(m_LastCompletedValue <= currentCompletedValue, "Getting new fence value which is older than the last!");
-            // We do not allow smaller fences being submitted, and fences always complete in-order, no max() neccessary
-            m_LastCompletedValue = currentCompletedValue;
-#else
-            // CLs may terminate in any order. Is it higher than last known completed fence? If so, update it!
-            MaxFenceValue(m_LastCompletedValue, currentCompletedValue);
-#endif // !NDEBUG
-
-            return currentCompletedValue;
-        }
-
-        inline AZ::u64 GetLastCompletedFenceValue() const
-        {
-            return m_LastCompletedValue;
-        }
-
-    private:
-        Device* m_pDevice;
-        ID3D12Fence* m_pFence;
-        HANDLE m_FenceEvent;
-
-        std::atomic<AZ::u64> m_CurrentValue;
-        mutable std::atomic<AZ::u64> m_LastCompletedValue;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    class CommandListFenceSet
-    {
-    public:
-        CommandListFenceSet(Device* device);
-        ~CommandListFenceSet();
-
-        bool Init();
-
-        inline ID3D12Fence** GetD3D12Fences()
-        {
-            return m_pFences;
-        }
-
-        inline ID3D12Fence* GetD3D12Fence(const int id) const
-        {
-            return m_pFences[id];
-        }
-
-        inline AZ::u64 GetSubmittedValue(const int id) const
-        {
-            return m_SubmittedValues[id];
-        }
-
-        inline void SetSubmittedValue(const AZ::u64 fenceValue, const int id)
-        {
-#ifdef DX12_IN_ORDER_SUBMISSION
-            DX12_ASSERT(m_SubmittedValues[id] <= fenceValue, "Setting new fence value which is older than the submitted!");
-            // We do not allow smaller fences being submitted, and fences always submit in-order, no max() neccessary
-            m_SubmittedValues[id] = fenceValue;
-#else
-            // CLs may submit in any order. Is it higher than last known completed fence? If so, update it!
-            MaxFenceValue(m_SubmittedValues[id], fenceValue);
-#endif // !NDEBUG
-        }
-
-        inline AZ::u64 GetCurrentValue(const int id) const
-        {
-            return m_CurrentValues[id];
-        }
-
-        inline void GetCurrentValues(AZ::u64 (&fenceValues)[CMDQUEUE_NUM]) const
-        {
-            fenceValues[CMDQUEUE_COPY    ] = m_CurrentValues[CMDQUEUE_COPY    ];
-            fenceValues[CMDQUEUE_GRAPHICS] = m_CurrentValues[CMDQUEUE_GRAPHICS];
-        }
-
-        inline const std::atomic<AZ::u64> (& GetCurrentValues() const)[CMDQUEUE_NUM]
-        {
-            return m_CurrentValues;
-        }
-
-        // thread-save
-        inline void SetCurrentValue(const AZ::u64 fenceValue, const int id)
-        {
-#ifdef DX12_IN_ORDER_ACQUIRATION
-            DX12_ASSERT(m_CurrentValues[id] <= fenceValue, "Setting new fence value which is older than the current!");
-            // We do not allow smaller fences being submitted, and fences always submit in-order, no max() neccessary
-            m_CurrentValues[id] = fenceValue;
-#else
-            // CLs may submit in any order. Is it higher than last known completed fence? If so, update it!
-            MaxFenceValue(m_CurrentValues[id], fenceValue);
-#endif // !NDEBUG
-        }
-
-        inline bool IsCompleted(const AZ::u64 fenceValue, const int id) const
-        {
-            // Check against last known completed value first to avoid unnecessary fence read
-            return
-                (m_LastCompletedValues[id] >= fenceValue) || (AdvanceCompletion(id) >= fenceValue);
-        }
-
-        inline bool IsCompleted(const AZ::u64 (&fenceValues)[CMDQUEUE_NUM]) const
-        {
-            // Check against last known completed value first to avoid unnecessary fence read
-            return
-                // TODO: return mask of completed fences so we don't check all three of them all the time
-                ((m_LastCompletedValues[CMDQUEUE_COPY    ] >= fenceValues[CMDQUEUE_COPY    ]) || (AdvanceCompletion(CMDQUEUE_COPY) >= fenceValues[CMDQUEUE_COPY    ])) &
-                ((m_LastCompletedValues[CMDQUEUE_GRAPHICS] >= fenceValues[CMDQUEUE_GRAPHICS]) || (AdvanceCompletion(CMDQUEUE_GRAPHICS) >= fenceValues[CMDQUEUE_GRAPHICS]));
-        }
-
-        void WaitForFence(const AZ::u64 fenceValue, const int id) const;
-        void WaitForFence(const AZ::u64 (&fenceValues)[CMDQUEUE_NUM]) const;
-
-        inline AZ::u64 AdvanceCompletion(const int id) const
-        {
-            // Check current completed fence
-            AZ::u64 currentCompletedValue = m_pFences[id]->GetCompletedValue();
-
-            if (m_LastCompletedValues[id] < currentCompletedValue)
-            {
-                DX12_LOG("Completed fence value(s): %d to %d", m_LastCompletedValues[id] + 1, currentCompletedValue);
-            }
-
-#ifdef DX12_IN_ORDER_TERMINATION
-            DX12_ASSERT(m_LastCompletedValues[id] <= currentCompletedValue, "Getting new fence value which is older than the last!");
-            // We do not allow smaller fences being submitted, and fences always complete in-order, no max() neccessary
-            m_LastCompletedValues[id] = currentCompletedValue;
-#else
-            // CLs may terminate in any order. Is it higher than last known completed fence? If so, update it!
-            MaxFenceValue(m_LastCompletedValues[id], currentCompletedValue);
-#endif // !NDEBUG
-
-            return currentCompletedValue;
-        }
-
-        inline void AdvanceCompletion() const
-        {
-            AdvanceCompletion(CMDQUEUE_COPY);
-            AdvanceCompletion(CMDQUEUE_GRAPHICS);
-        }
-
-        inline AZ::u64 GetLastCompletedFenceValue(const int id) const
-        {
-            return m_LastCompletedValues[id];
-        }
-
-        inline void GetLastCompletedFenceValues(AZ::u64 (&fenceValues)[CMDQUEUE_NUM]) const
-        {
-            fenceValues[CMDQUEUE_COPY    ] = m_LastCompletedValues[CMDQUEUE_COPY    ];
-            fenceValues[CMDQUEUE_GRAPHICS] = m_LastCompletedValues[CMDQUEUE_GRAPHICS];
-        }
-
-    private:
-        Device* m_pDevice;
-        ID3D12Fence* m_pFences[CMDQUEUE_NUM];
-        HANDLE m_FenceEvents[CMDQUEUE_NUM];
-
-        // Maximum fence-value of all command-lists currently in flight (allocated, running or free)
-        std::atomic<AZ::u64> m_CurrentValues[CMDQUEUE_NUM];
-        // Maximum fence-value of all command-lists passed to the driver (running only)
-        std::atomic<AZ::u64> m_SubmittedValues[CMDQUEUE_NUM];
-
-        // Maximum fence-value of all command-lists executed by the driver (free only)
-        mutable std::atomic<AZ::u64> m_LastCompletedValues[CMDQUEUE_NUM];
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12DescriptorHeap.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12DescriptorHeap.cpp
deleted file mode 100644
index e9be718781..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12DescriptorHeap.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12DescriptorHeap.hpp"
-
-namespace DX12
-{
-    DescriptorHeap::DescriptorHeap(Device* device)
-        : DeviceObject(device)
-    {
-    }
-
-    DescriptorHeap::~DescriptorHeap()
-    {
-    }
-
-    bool DescriptorHeap::Init(const D3D12_DESCRIPTOR_HEAP_DESC& desc)
-    {
-        if (!IsInitialized())
-        {
-            ID3D12DescriptorHeap* heap;
-            GetDevice()->GetD3D12Device()->CreateDescriptorHeap(&desc, IID_GRAPHICS_PPV_ARGS(&heap));
-
-            m_pDescriptorHeap = heap;
-            heap->Release();
-
-            m_Desc12 = m_pDescriptorHeap->GetDesc();
-            m_HeapStartCPU = m_pDescriptorHeap->GetCPUDescriptorHandleForHeapStart();
-            m_HeapStartGPU = m_pDescriptorHeap->GetGPUDescriptorHandleForHeapStart();
-            m_DescSize = GetDevice()->GetD3D12Device()->GetDescriptorHandleIncrementSize(m_Desc12.Type);
-
-            IsInitialized(true);
-        }
-
-        Reset();
-        return true;
-    }
-
-    DescriptorBlock::DescriptorBlock(const SDescriptorBlock& block)
-    {
-        m_pDescriptorHeap = reinterpret_cast<DescriptorHeap*>(block.pBuffer);
-        m_BlockStart = block.offset;
-        m_Capacity = block.size;
-        m_Cursor = 0;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12DescriptorHeap.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12DescriptorHeap.hpp
deleted file mode 100644
index 1da4c2a64d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12DescriptorHeap.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12Base.hpp"
-
-struct SDescriptorBlock;
-
-namespace DX12
-{
-    struct Cursor
-    {
-        Cursor() : m_Cursor(0) {}
-
-        inline void SetCursor(AZ::u32 value)          { m_Cursor = value; }
-        inline AZ::u32 GetCursor() const              { return m_Cursor; }
-        inline void IncrementCursor(AZ::u32 step = 1) { m_Cursor += step; }
-        inline void Reset()                        { m_Cursor = 0; }
-
-        AZ::u32 m_Cursor;
-    };
-
-    class DescriptorHeap
-        : public DeviceObject
-        , public Cursor
-    {
-    public:
-        DescriptorHeap(Device* device);
-        virtual ~DescriptorHeap();
-
-        bool Init(const D3D12_DESCRIPTOR_HEAP_DESC& desc);
-
-        inline ID3D12DescriptorHeap* GetD3D12DescriptorHeap() const
-        {
-            return m_pDescriptorHeap;
-        }
-
-        inline AZ::u32 GetDescriptorSize() const
-        {
-            return m_DescSize;
-        }
-
-        inline AZ::u32 GetCapacity() const
-        {
-            return m_Desc12.NumDescriptors;
-        }
-
-        inline CD3DX12_CPU_DESCRIPTOR_HANDLE GetHandleOffsetCPU(INT offset) const
-        {
-            return CD3DX12_CPU_DESCRIPTOR_HANDLE(m_HeapStartCPU, m_Cursor + offset, m_DescSize);
-        }
-
-        inline CD3DX12_CPU_DESCRIPTOR_HANDLE GetHandleOffsetCPU_R(INT offset) const
-        {
-            return CD3DX12_CPU_DESCRIPTOR_HANDLE(m_HeapStartCPU, offset, m_DescSize);
-        }
-
-        inline CD3DX12_GPU_DESCRIPTOR_HANDLE GetHandleOffsetGPU(INT offset) const
-        {
-            return CD3DX12_GPU_DESCRIPTOR_HANDLE(m_HeapStartGPU, m_Cursor + offset, m_DescSize);
-        }
-
-        inline CD3DX12_GPU_DESCRIPTOR_HANDLE GetHandleOffsetGPU_R(INT offset) const
-        {
-            return CD3DX12_GPU_DESCRIPTOR_HANDLE(m_HeapStartGPU, offset, m_DescSize);
-        }
-
-        inline D3D12_GPU_DESCRIPTOR_HANDLE GetHandleGPUFromCPU(D3D12_CPU_DESCRIPTOR_HANDLE handle) const
-        {
-            AZ_Assert(GetHandleOffsetCPU(0).ptr <= handle.ptr && handle.ptr < GetHandleOffsetCPU(GetCapacity()).ptr, "Out of bounds");
-            D3D12_GPU_DESCRIPTOR_HANDLE rebase;
-            rebase.ptr = m_HeapStartGPU.ptr + handle.ptr - m_HeapStartCPU.ptr;
-            return rebase;
-        }
-
-        inline D3D12_CPU_DESCRIPTOR_HANDLE GetHandleCPUFromGPU(D3D12_GPU_DESCRIPTOR_HANDLE handle) const
-        {
-            AZ_Assert(GetHandleOffsetGPU(0).ptr <= handle.ptr && handle.ptr < GetHandleOffsetGPU(GetCapacity()).ptr, "Out of bounds");
-            D3D12_CPU_DESCRIPTOR_HANDLE rebase;
-            rebase.ptr = m_HeapStartCPU.ptr + handle.ptr - m_HeapStartGPU.ptr;
-            return rebase;
-        }
-
-        inline INT GetOffsetFromCPUHandle(D3D12_CPU_DESCRIPTOR_HANDLE handle)
-        {
-            return static_cast<INT>((handle.ptr - m_HeapStartCPU.ptr) / m_DescSize);
-        }
-
-    private:
-        SmartPtr<ID3D12DescriptorHeap> m_pDescriptorHeap;
-        D3D12_DESCRIPTOR_HEAP_DESC m_Desc12;
-        D3D12_CPU_DESCRIPTOR_HANDLE m_HeapStartCPU;
-        D3D12_GPU_DESCRIPTOR_HANDLE m_HeapStartGPU;
-        AZ::u32 m_DescSize;
-    };
-
-    class DescriptorBlock : public Cursor
-    {
-    public:
-        DescriptorBlock()
-            : m_BlockStart(0)
-            , m_Capacity(0)
-        {}
-
-        DescriptorBlock(DescriptorHeap* pHeap, AZ::u32 cursor, AZ::u32 capacity)
-            : m_pDescriptorHeap(pHeap)
-            , m_BlockStart(cursor)
-            , m_Capacity(capacity)
-        {
-            AZ_Assert(cursor + capacity <= pHeap->GetCapacity(), "Out of bounds");
-        }
-
-        DescriptorBlock(const SDescriptorBlock& block);
-
-        inline DescriptorHeap* GetDescriptorHeap() const
-        {
-            return m_pDescriptorHeap.get();
-        }
-
-        inline AZ::u32 GetDescriptorSize() const
-        {
-            return m_pDescriptorHeap->GetDescriptorSize();
-        }
-
-        inline AZ::u32 GetCapacity() const
-        {
-            return m_Capacity;
-        }
-
-        inline D3D12_CPU_DESCRIPTOR_HANDLE GetHandleOffsetCPU(INT offset) const
-        {
-            AZ_Assert((offset < 0) || (m_Cursor + offset < m_Capacity), "Out of bounds");
-            return m_pDescriptorHeap->GetHandleOffsetCPU_R(static_cast<INT>(m_BlockStart + m_Cursor) + offset);
-        }
-
-        inline D3D12_GPU_DESCRIPTOR_HANDLE GetHandleOffsetGPU(INT offset) const
-        {
-            AZ_Assert((offset < 0) || (m_Cursor + offset < m_Capacity), "Out of bounds");
-            return m_pDescriptorHeap->GetHandleOffsetGPU_R(static_cast<INT>(m_BlockStart + m_Cursor) + offset);
-        }
-
-        inline D3D12_GPU_DESCRIPTOR_HANDLE GetHandleGPUFromCPU(D3D12_CPU_DESCRIPTOR_HANDLE handle) const
-        {
-            AZ_Assert(m_pDescriptorHeap->GetHandleOffsetCPU(m_BlockStart).ptr <= handle.ptr && handle.ptr < m_pDescriptorHeap->GetHandleOffsetCPU(m_BlockStart + GetCapacity()).ptr, "Out of bounds");
-            return m_pDescriptorHeap->GetHandleGPUFromCPU(handle);
-        }
-
-        inline D3D12_CPU_DESCRIPTOR_HANDLE GetHandleCPUFromGPU(D3D12_GPU_DESCRIPTOR_HANDLE handle) const
-        {
-            AZ_Assert(m_pDescriptorHeap->GetHandleOffsetGPU(m_BlockStart).ptr <= handle.ptr && handle.ptr < m_pDescriptorHeap->GetHandleOffsetGPU(m_BlockStart + GetCapacity()).ptr, "Out of bounds");
-            return m_pDescriptorHeap->GetHandleCPUFromGPU(handle);
-        }
-
-        inline AZ::u32 GetStartOffset() const { return m_BlockStart; }
-
-    private:
-        SmartPtr<DescriptorHeap> m_pDescriptorHeap;
-        AZ::u32 m_BlockStart;
-        AZ::u32 m_Capacity;
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Device.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Device.cpp
deleted file mode 100644
index 811cf712a9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Device.cpp
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12Device.hpp"
-#include "DX12Resource.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define DX12DEVICE_CPP_SECTION_1 1
-    #define DX12DEVICE_CPP_SECTION_2 2
-    #define DX12DEVICE_CPP_SECTION_3 3
-    #define DX12DEVICE_CPP_SECTION_4 4
-#endif
-
-#define DX12_GLOBALHEAP_RESOURCES   (1 << D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV)
-#define DX12_GLOBALHEAP_SAMPLERS    (1 << D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER)
-#define DX12_GLOBALHEAP_TYPES       DX12_GLOBALHEAP_RESOURCES
-
-namespace DX12
-{
-    Device* Device::Create(IDXGIAdapter* pAdapter, D3D_FEATURE_LEVEL* pFeatureLevel)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12DEVICE_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(DX12Device_cpp)
-#endif
-
-        ID3D12Device* pDevice12 = NULL;
-
-        if (CRenderer::CV_r_EnableDebugLayer)
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12DEVICE_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(DX12Device_cpp)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-            #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            ID3D12Debug* debugInterface = nullptr;
-            if (SUCCEEDED(D3D12GetDebugInterface(IID_GRAPHICS_PPV_ARGS(&debugInterface))))
-            {
-                debugInterface->EnableDebugLayer();
-            }
-// ID3D12Debug1 is only available after windows 10 anniversary update or windows sdk 14393
-#ifdef __ID3D12Debug1_INTERFACE_DEFINED__
-            ID3D12Debug1* debugInterface1;
-            if (SUCCEEDED(debugInterface->QueryInterface(IID_GRAPHICS_PPV_ARGS(&debugInterface1))))
-            {
-                debugInterface1->SetEnableGPUBasedValidation(true);
-            }
-#endif
-#endif // defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-        }
-
-        D3D_FEATURE_LEVEL level;
-        HRESULT hr;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12DEVICE_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(DX12Device_cpp)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-        #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else        
-        hr =
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_12_1, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_12_0, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            //      (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_11_3, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            //      (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_11_2, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_11_1, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_11_0, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_10_1, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_10_0, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_9_3, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_9_2, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ||
-            (D3D12CreateDevice(pAdapter, level = D3D_FEATURE_LEVEL_9_1, IID_GRAPHICS_PPV_ARGS(&pDevice12)) == S_OK) ? S_OK : S_FALSE;
-#endif
-        if (hr != S_OK)
-        {
-            DX12_ASSERT(0, "Failed to create D3D12 Device!");
-            return NULL;
-        }
-
-        if (pFeatureLevel)
-        {
-            *pFeatureLevel = level;
-        }
-
-        Device* result = new Device(pDevice12);
-        pDevice12->Release();
-
-        return DX12::PassAddRef(result);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    Device::Device(ID3D12Device* d3d12Device)
-        : m_Device(d3d12Device)
-        , m_SamplerCache(this)
-        , m_ShaderResourceDescriptorCache(this)
-        , m_UnorderedAccessDescriptorCache(this)
-        , m_DepthStencilDescriptorCache(this)
-        , m_RenderTargetDescriptorCache(this)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12DEVICE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12Device_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-        #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        , m_GlobalDescriptorHeaps
-        {
-            { this },
-            { this },
-            { this },
-            { this }
-        }
-#endif
-        , m_FrameCounter(0)
-        , m_CalibratedCpuTimestamp{}
-        , m_CalibratedCpuTimestampFrequency{}
-        , m_CalibratedGpuTimestamp{}
-        , m_CalibratedGpuTimestampFrequency{}
-        , m_NullSRV{}
-        , m_NullUAV{}
-        , m_NullSampler{}
-    {
-        // These objects are reference counted, but didn't heap allocate them. We assume ownership.
-        {
-            m_SamplerCache.AddRef();
-            m_ShaderResourceDescriptorCache.AddRef();
-            m_UnorderedAccessDescriptorCache.AddRef();
-            m_DepthStencilDescriptorCache.AddRef();
-            m_RenderTargetDescriptorCache.AddRef();
-
-            for (AZ::u32 i = 0; i < D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES; ++i)
-            {
-                m_GlobalDescriptorHeaps[i].AddRef();
-            }
-        }
-
-        m_PipelineStateCache.Init(this);
-        m_RootSignatureCache.Init(this);
-
-        // init sampler cache
-        {
-            D3D12_DESCRIPTOR_HEAP_DESC desc;
-            ZeroStruct(desc);
-
-            desc.NumDescriptors = 2048;
-            desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER;
-            desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
-
-            m_SamplerCache.Init(desc);
-        }
-
-        // init shader resource descriptor cache
-        {
-            D3D12_DESCRIPTOR_HEAP_DESC desc = {};
-            desc.NumDescriptors = 65535;
-            desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
-            desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
-
-            m_ShaderResourceDescriptorCache.Init(desc);
-        }
-
-        // init unordered access descriptor cache
-        {
-            D3D12_DESCRIPTOR_HEAP_DESC desc = {};
-            desc.NumDescriptors = 4096;
-            desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
-            desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
-
-            m_UnorderedAccessDescriptorCache.Init(desc);
-        }
-
-        // init depth stencil descriptor cache
-        {
-            D3D12_DESCRIPTOR_HEAP_DESC desc = {};
-            desc.NumDescriptors = 256;
-            desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV;
-            desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
-
-            m_DepthStencilDescriptorCache.Init(desc);
-        }
-
-        // init render target descriptor cache
-        {
-            D3D12_DESCRIPTOR_HEAP_DESC desc = {};
-            desc.NumDescriptors = 1024;
-            desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
-            desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
-
-            m_RenderTargetDescriptorCache.Init(desc);
-        }
-
-        // init global descriptor heaps
-
-        static AZ::u32 globalHeapSizes[D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES] =
-        {
-            1000000, // D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV
-            1024, // D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER
-            256,  // D3D12_DESCRIPTOR_HEAP_TYPE_RTV
-            256   // D3D12_DESCRIPTOR_HEAP_TYPE_DSV
-        };
-
-        for (D3D12_DESCRIPTOR_HEAP_TYPE eType = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; eType < D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES; eType = D3D12_DESCRIPTOR_HEAP_TYPE(eType + 1))
-        {
-            if (DX12_GLOBALHEAP_TYPES & (1 << eType))
-            {
-                D3D12_DESCRIPTOR_HEAP_DESC desc = {};
-                desc.NumDescriptors = globalHeapSizes[eType];
-                desc.Type = eType;
-                desc.Flags = (eType == D3D12_DESCRIPTOR_HEAP_TYPE_RTV || eType == D3D12_DESCRIPTOR_HEAP_TYPE_DSV ? D3D12_DESCRIPTOR_HEAP_FLAG_NONE : D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE);
-
-                m_GlobalDescriptorHeaps[eType].Init(desc);
-            }
-        }
-
-        D3D12_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
-        SRVDesc.Format = DXGI_FORMAT_R32_UINT;
-        SRVDesc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
-        SRVDesc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
-        m_NullSRV = CacheShaderResourceView(&SRVDesc, nullptr);
-
-        D3D12_UNORDERED_ACCESS_VIEW_DESC UAVDesc = {};
-        UAVDesc.Format = DXGI_FORMAT_R32_UINT;
-        UAVDesc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
-        m_NullUAV = CacheUnorderedAccessView(&UAVDesc, nullptr);
-
-        D3D12_SAMPLER_DESC SamplerDesc = {};
-        SamplerDesc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
-        SamplerDesc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
-        SamplerDesc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
-        SamplerDesc.ComparisonFunc = D3D12_COMPARISON_FUNC_ALWAYS;
-        SamplerDesc.Filter = D3D12_FILTER_COMPARISON_ANISOTROPIC;
-        m_NullSampler = CacheSampler(&SamplerDesc);
-    }
-
-    Device::~Device()
-    {
-        // Fee all resources in the m_ReleaseHeap and m_RecycleHeap
-        FlushReleaseHeap(ResourceReleasePolicy::Immediate);
-    }
-
-    D3D12_CPU_DESCRIPTOR_HANDLE Device::CacheSampler(const D3D12_SAMPLER_DESC* pDesc)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-
-        DX12_ASSERT(m_SamplerCache.GetCursor() < m_SamplerCache.GetCapacity());
-
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle = m_SamplerCache.GetHandleOffsetCPU(0);
-        GetD3D12Device()->CreateSampler(pDesc, dstHandle);
-        m_SamplerCache.IncrementCursor();
-
-        return dstHandle;
-    }
-
-    D3D12_CPU_DESCRIPTOR_HANDLE Device::CacheShaderResourceView(const D3D12_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D12Resource* pResource)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-
-        bool useCached = false;
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle;
-        if (m_DescriptorPools[DescriptorPoolSRV].size())
-        {
-            auto it = m_DescriptorPools[DescriptorPoolSRV].front();
-            if (m_FrameCounter > (it.first + AllowedGPUFramesLatency))
-            {
-                useCached = true;
-                m_DescriptorPools[DescriptorPoolSRV].pop_front();
-                dstHandle = m_ShaderResourceDescriptorCache.GetHandleOffsetCPU_R(it.second);
-            }
-        }
-        if(!useCached)
-        {
-            DX12_ASSERT(m_ShaderResourceDescriptorCache.GetCursor() < m_ShaderResourceDescriptorCache.GetCapacity());
-            dstHandle = m_ShaderResourceDescriptorCache.GetHandleOffsetCPU(0);
-            m_ShaderResourceDescriptorCache.IncrementCursor();
-        }
-
-        GetD3D12Device()->CreateShaderResourceView(pResource, pDesc, dstHandle);
-        
-
-        return dstHandle;
-    }
-
-    D3D12_CPU_DESCRIPTOR_HANDLE Device::CacheUnorderedAccessView(const D3D12_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D12Resource* pResource)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-
-        bool useCached = false;
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle;
-        if (m_DescriptorPools[DescriptorPoolUAV].size())
-        {
-            auto it = m_DescriptorPools[DescriptorPoolUAV].front();
-            if (m_FrameCounter > (it.first + AllowedGPUFramesLatency))
-            {
-                useCached = true;
-                m_DescriptorPools[DescriptorPoolUAV].pop_front();
-                dstHandle = m_UnorderedAccessDescriptorCache.GetHandleOffsetCPU_R(it.second);
-            }
-        }
-        if (!useCached)
-        {
-            DX12_ASSERT(m_UnorderedAccessDescriptorCache.GetCursor() < m_UnorderedAccessDescriptorCache.GetCapacity());
-            dstHandle = m_UnorderedAccessDescriptorCache.GetHandleOffsetCPU(0);
-            m_UnorderedAccessDescriptorCache.IncrementCursor();
-        }
-        GetD3D12Device()->CreateUnorderedAccessView(pResource, nullptr, pDesc, dstHandle);
-        
-        return dstHandle;
-    }
-
-    D3D12_CPU_DESCRIPTOR_HANDLE Device::CacheDepthStencilView(const D3D12_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D12Resource* pResource)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-
-        DX12_ASSERT(m_DepthStencilDescriptorCache.GetCursor() < m_DepthStencilDescriptorCache.GetCapacity());
-
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle = m_DepthStencilDescriptorCache.GetHandleOffsetCPU(0);
-        GetD3D12Device()->CreateDepthStencilView(pResource, pDesc, dstHandle);
-        m_DepthStencilDescriptorCache.IncrementCursor();
-
-        return dstHandle;
-    }
-
-    D3D12_CPU_DESCRIPTOR_HANDLE Device::CacheRenderTargetView(const D3D12_RENDER_TARGET_VIEW_DESC* pDesc, ID3D12Resource* pResource)
-    {
-        static CryCriticalSectionNonRecursive csThreadSafeScope;
-        CryAutoLock<CryCriticalSectionNonRecursive> lThreadSafeScope(csThreadSafeScope);
-
-        DX12_ASSERT(m_RenderTargetDescriptorCache.GetCursor() < m_RenderTargetDescriptorCache.GetCapacity());
-
-        D3D12_CPU_DESCRIPTOR_HANDLE dstHandle = m_RenderTargetDescriptorCache.GetHandleOffsetCPU(0);
-        GetD3D12Device()->CreateRenderTargetView(pResource, pDesc, dstHandle);
-        m_RenderTargetDescriptorCache.IncrementCursor();
-
-        return dstHandle;
-    }
-
-    void Device::RecycleDescriptorHandle(DescriptorPoolType poolType, D3D12_CPU_DESCRIPTOR_HANDLE handle)
-    {
-        AZ::u32 offset;
-        switch (poolType)
-        {
-        case DescriptorPoolSRV:
-            offset = m_ShaderResourceDescriptorCache.GetOffsetFromCPUHandle(handle);
-            break;
-        case DescriptorPoolUAV:
-            offset = m_UnorderedAccessDescriptorCache.GetOffsetFromCPUHandle(handle);
-            break;
-        default:
-            AZ_Assert(0, "DescriptorPoolType not supported!");
-        }
-        
-        m_DescriptorPools[poolType].push_back(AZStd::pair<AZ::u32, AZ::u32>(m_FrameCounter, offset));
-    }
-
-    void Device::FinishFrame()
-    {
-        m_FrameCounter++;
-    }
-
-    HRESULT STDMETHODCALLTYPE Device::CreateOrReuseCommittedResource(
-        _In_  const D3D12_HEAP_PROPERTIES* pHeapProperties,
-        D3D12_HEAP_FLAGS HeapFlags,
-        _In_  const D3D12_RESOURCE_DESC* pResourceDesc,
-        D3D12_RESOURCE_STATES InitialResourceState,
-        _In_opt_  const D3D12_CLEAR_VALUE* pOptimizedClearValue,
-        REFIID riidResource,
-        _COM_Outptr_opt_  void** ppvResource,
-        ResourceStates& resourceStates)
-    {
-        AZ_TRACE_METHOD();
-
-        struct
-        {
-            D3D12_HEAP_FLAGS sHeapFlags;
-            D3D12_HEAP_PROPERTIES sHeapProperties;
-            D3D12_RESOURCE_DESC sResourceDesc;
-        }
-        hashableBlob;
-
-        hashableBlob.sHeapProperties = *pHeapProperties;
-        hashableBlob.sResourceDesc = *pResourceDesc;
-        hashableBlob.sHeapFlags = HeapFlags;
-
-        // Clear spaces from alignment of members
-        void* ptr1 = ((char*)&hashableBlob.sResourceDesc.Dimension) + sizeof(hashableBlob.sResourceDesc.Dimension);
-        ZeroMemory(ptr1, offsetof(D3D12_RESOURCE_DESC, Alignment) - sizeof(hashableBlob.sResourceDesc.Dimension));
-        void* ptr2 = ((char*)&hashableBlob.sResourceDesc.Flags) + sizeof(hashableBlob.sResourceDesc.Flags);
-        ZeroMemory(ptr2, sizeof(hashableBlob.sResourceDesc) - offsetof(D3D12_RESOURCE_DESC, Flags) - sizeof(hashableBlob.sResourceDesc.Flags));
-
-        THash hHash = ComputeSmallHash<sizeof(hashableBlob)>(&hashableBlob);
-        
-        auto result = m_RecycleHeap.find(hHash);
-        if (result != m_RecycleHeap.end())
-        {
-            if (ppvResource)
-            {
-                *ppvResource = result->second.resource;
-                resourceStates = result->second.resourceStates;
-                m_RecycleHeap.erase(result);
-            }
-            
-            return S_OK;
-        }
-
-        auto res = GetD3D12Device()->CreateCommittedResource(
-                pHeapProperties, HeapFlags, pResourceDesc, InitialResourceState,
-                pOptimizedClearValue, riidResource, ppvResource);
-        resourceStates.m_CurrentState = InitialResourceState;
-        resourceStates.m_AnnouncedState = static_cast<D3D12_RESOURCE_STATES>(-1);
-
-        return res;
-    }
-
-    void Device::FlushReleaseHeap(ResourceReleasePolicy releasePolicy)
-    {
-        const AZ::u32 RESOURCE_RECYCLE_LATENCY = 8;
-        const AZ::u32 RESOURCE_RELEASE_LATENCY = 32;
-        {
-            auto it = m_ReleaseHeap.begin();
-            while (it != m_ReleaseHeap.end())
-            {
-                AZ::u32 resourceFrameNumber = it->second.frameNumber;
-                if (m_FrameCounter > (resourceFrameNumber + RESOURCE_RECYCLE_LATENCY) || releasePolicy == ResourceReleasePolicy::Immediate)
-                {
-                    m_RecycleHeap.insert(*it);
-                    it = m_ReleaseHeap.erase(it);
-                }
-                else
-                {
-                    it++;
-                }
-            }
-        }
-        {
-            auto it = m_RecycleHeap.begin();
-            while (it != m_RecycleHeap.end())
-            {
-                AZ::u32 resourceFrameNumber = it->second.frameNumber;
-                if (m_FrameCounter > (resourceFrameNumber + RESOURCE_RELEASE_LATENCY) || releasePolicy == ResourceReleasePolicy::Immediate)
-                {
-                    it->second.resource->Release();
-                    it = m_RecycleHeap.erase(it);
-                }
-                else
-                {
-                    it++;
-                }
-            }
-        }
-    }
-
-    void Device::ReleaseLater(ID3D12Resource* object, D3D12_RESOURCE_STATES currentState, D3D12_RESOURCE_STATES announcedState)
-    {
-        if (object)
-        {
-            struct
-            {
-                D3D12_HEAP_FLAGS sHeapFlags;
-                D3D12_HEAP_PROPERTIES sHeapProperties;
-                D3D12_RESOURCE_DESC sResourceDesc;
-            }
-            hashableBlob;
-
-            object->GetHeapProperties(&hashableBlob.sHeapProperties, &hashableBlob.sHeapFlags);
-            hashableBlob.sResourceDesc = object->GetDesc();
-            // When creating a committed resource, D3D12_HEAP_FLAGS must not have either D3D12_HEAP_FLAG_DENY_NON_RT_DS_TEXTURES,
-            // D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES, nor D3D12_HEAP_FLAG_DENY_BUFFERS set. These flags will be set automatically
-            // to correspond with the committed resource type.
-            hashableBlob.sHeapFlags = D3D12_HEAP_FLAGS(hashableBlob.sHeapFlags & ~(D3D12_HEAP_FLAG_DENY_BUFFERS + D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES + D3D12_HEAP_FLAG_DENY_NON_RT_DS_TEXTURES));
-
-            // Clear spaces from alignment of members
-            void* ptr1 = ((char*)&hashableBlob.sResourceDesc.Dimension) + sizeof(hashableBlob.sResourceDesc.Dimension);
-            ZeroMemory(ptr1, offsetof(D3D12_RESOURCE_DESC, Alignment) - sizeof(hashableBlob.sResourceDesc.Dimension));
-            void* ptr2 = ((char*)&hashableBlob.sResourceDesc.Flags) + sizeof(hashableBlob.sResourceDesc.Flags);
-            ZeroMemory(ptr2, sizeof(hashableBlob.sResourceDesc) - offsetof(D3D12_RESOURCE_DESC, Flags) - sizeof(hashableBlob.sResourceDesc.Flags));
-
-            ReleaseInfo releaseInfo;
-
-            THash hash = ComputeSmallHash<sizeof(hashableBlob)>(&hashableBlob);
-
-            releaseInfo.resource = object;
-            releaseInfo.resourceStates.m_CurrentState = currentState;
-            releaseInfo.resourceStates.m_AnnouncedState = announcedState;
-            releaseInfo.frameNumber = m_FrameCounter;
-
-            m_ReleaseHeap.insert(AZStd::make_pair(hash, std::move(releaseInfo)));
-        }
-    }
-
-    DescriptorBlock Device::GetGlobalDescriptorBlock(D3D12_DESCRIPTOR_HEAP_TYPE eType, AZ::u32 size)
-    {
-        if (DX12_GLOBALHEAP_TYPES & (1 << eType))
-        {
-            AZ_Assert(m_GlobalDescriptorHeaps[eType].GetCapacity() - m_GlobalDescriptorHeaps[eType].GetCursor() >= size, "Exceeded capacity");
-            DescriptorBlock result(&m_GlobalDescriptorHeaps[eType], m_GlobalDescriptorHeaps[eType].GetCursor(), size);
-            m_GlobalDescriptorHeaps[eType].IncrementCursor(size);
-            return result;
-        }
-
-        DescriptorHeap* pResourceHeap = DX12::PassAddRef(new DescriptorHeap(this));
-
-        D3D12_DESCRIPTOR_HEAP_DESC desc = {};
-        desc.NumDescriptors = size;
-        desc.Type = eType;
-        desc.Flags = (eType == D3D12_DESCRIPTOR_HEAP_TYPE_RTV || eType == D3D12_DESCRIPTOR_HEAP_TYPE_DSV ? D3D12_DESCRIPTOR_HEAP_FLAG_NONE : D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE);
-        pResourceHeap->Init(desc);
-
-        DescriptorBlock result(pResourceHeap, pResourceHeap->GetCursor(), size);
-        pResourceHeap->Release();
-        return result;
-    }
-
-    void Device::CalibrateClocks(ID3D12CommandQueue* presentQueue)
-    {
-        presentQueue->GetClockCalibration(&m_CalibratedGpuTimestamp, &m_CalibratedCpuTimestamp);
-        presentQueue->GetTimestampFrequency(&m_CalibratedGpuTimestampFrequency);
-
-        QueryPerformanceFrequency((LARGE_INTEGER*)&m_CalibratedCpuTimestampFrequency);
-    }
-
-    AZ::u64 Device::MakeCpuTimestamp(AZ::u64 gpuTimestamp) const
-    {
-        INT64 timestampDelta = ((INT64)gpuTimestamp - (INT64)m_CalibratedGpuTimestamp);
-        INT64 calibratedTimestampDelta = (timestampDelta * (INT64)m_CalibratedCpuTimestampFrequency) / (INT64)m_CalibratedGpuTimestampFrequency;
-        return m_CalibratedCpuTimestamp + calibratedTimestampDelta;
-    }
-
-    AZ::u64 Device::MakeCpuTimestampMicroseconds(AZ::u64 gpuTimestamp) const
-    {
-        return (MakeCpuTimestamp(gpuTimestamp) * 1000) / (m_CalibratedCpuTimestampFrequency / 1000);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Device.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Device.hpp
deleted file mode 100644
index fb6f67e5a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Device.hpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12CommandList.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define DX12DEVICE_HPP_SECTION_1 1
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12DEVICE_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12Device_hpp)
-#else
-    #include <d3d12.h>
-#endif
-#include "DX12/API/DX12PSO.hpp"
-
-#include <AzCore/std/containers/unordered_map.h>
-
-namespace DX12
-{
-    enum DescriptorPoolType
-    {
-        DescriptorPoolSRV,
-        DescriptorPoolUAV,
-        DescriptorPoolNum
-    };
-    class Device : public AzRHI::ReferenceCounted
-    {
-    public:
-        enum class ResourceReleasePolicy
-        {
-            Immediate,
-            Deferred
-        };
-
-        static Device* Create(IDXGIAdapter* adapter, D3D_FEATURE_LEVEL* pFeatureLevel);
-        virtual ~Device();
-
-        inline ID3D12Device* GetD3D12Device() const
-        {
-            return m_Device;
-        }
-
-        inline PipelineStateCache& GetPSOCache()
-        {
-            return m_PipelineStateCache;
-        }
-
-        inline const PipelineStateCache& GetPSOCache() const
-        {
-            return m_PipelineStateCache;
-        }
-
-        inline RootSignatureCache& GetRootSignatureCache()
-        {
-            return m_RootSignatureCache;
-        }
-
-        inline const RootSignatureCache& GetRootSignatureCache() const
-        {
-            return m_RootSignatureCache;
-        }
-
-        DescriptorBlock GetGlobalDescriptorBlock(D3D12_DESCRIPTOR_HEAP_TYPE eType, AZ::u32 size);
-
-        D3D12_CPU_DESCRIPTOR_HANDLE CacheSampler(const D3D12_SAMPLER_DESC* pDesc);
-        D3D12_CPU_DESCRIPTOR_HANDLE CacheShaderResourceView(const D3D12_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D12Resource* pResource);
-        D3D12_CPU_DESCRIPTOR_HANDLE CacheUnorderedAccessView(const D3D12_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D12Resource* pResource);
-        D3D12_CPU_DESCRIPTOR_HANDLE CacheDepthStencilView(const D3D12_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D12Resource* pResource);
-        D3D12_CPU_DESCRIPTOR_HANDLE CacheRenderTargetView(const D3D12_RENDER_TARGET_VIEW_DESC* pDesc, ID3D12Resource* pResource);
-
-        void RecycleDescriptorHandle(DescriptorPoolType poolType, D3D12_CPU_DESCRIPTOR_HANDLE handle);
-
-        HRESULT STDMETHODCALLTYPE CreateOrReuseCommittedResource(
-            _In_  const D3D12_HEAP_PROPERTIES* pHeapProperties,
-            D3D12_HEAP_FLAGS HeapFlags,
-            _In_  const D3D12_RESOURCE_DESC* pResourceDesc,
-            D3D12_RESOURCE_STATES InitialResourceState,
-            _In_opt_  const D3D12_CLEAR_VALUE* pOptimizedClearValue,
-            REFIID riidResource,
-            _COM_Outptr_opt_  void** ppvResource,
-            ResourceStates& resourceStates);
-
-        void FlushReleaseHeap(ResourceReleasePolicy releasePolicy);
-        void ReleaseLater(ID3D12Resource* pObject, D3D12_RESOURCE_STATES currentState, D3D12_RESOURCE_STATES announcedState);
-
-        void FinishFrame();
-        void CalibrateClocks(ID3D12CommandQueue* presentQueue);
-
-        AZ::u64 MakeCpuTimestamp(AZ::u64 gpuTimestamp) const;
-        AZ::u64 MakeCpuTimestampMicroseconds(AZ::u64 gpuTimestamp) const;
-
-        inline AZ::u64 GetGpuTimestampFrequency() const
-        {
-            return m_CalibratedGpuTimestampFrequency;
-        }
-
-        inline D3D12_CPU_DESCRIPTOR_HANDLE GetNullShaderResourceView() const
-        {
-            return m_NullSRV;
-        }
-
-        inline D3D12_CPU_DESCRIPTOR_HANDLE GetNullUnorderedAccessView() const
-        {
-            return m_NullUAV;
-        }
-
-        inline D3D12_CPU_DESCRIPTOR_HANDLE GetNullSampler() const
-        {
-            return m_NullSampler;
-        }
-
-    private:
-        Device(ID3D12Device* d3d12Device);
-
-        SmartPtr<ID3D12Device> m_Device;
-
-        PipelineStateCache m_PipelineStateCache;
-        RootSignatureCache m_RootSignatureCache;
-
-        DescriptorHeap m_SamplerCache;
-        DescriptorHeap m_ShaderResourceDescriptorCache;
-        DescriptorHeap m_UnorderedAccessDescriptorCache;
-        DescriptorHeap m_DepthStencilDescriptorCache;
-        DescriptorHeap m_RenderTargetDescriptorCache;
-        DescriptorHeap m_GlobalDescriptorHeaps[D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES];
-
-        D3D12_CPU_DESCRIPTOR_HANDLE m_NullSRV;
-        D3D12_CPU_DESCRIPTOR_HANDLE m_NullUAV;
-        D3D12_CPU_DESCRIPTOR_HANDLE m_NullSampler;
-
-        // Free pool of descriptor handler offset
-        AZStd::list<AZStd::pair<AZ::u32, AZ::u32>> m_DescriptorPools[DescriptorPoolNum];
-
-        struct ReleaseInfo
-        {
-            ID3D12Resource* resource;
-            ResourceStates resourceStates;
-            AZ::s32 frameNumber;
-        };
-
-        AZStd::unordered_multimap<THash, ReleaseInfo> m_ReleaseHeap;
-        AZStd::unordered_multimap<THash, ReleaseInfo> m_RecycleHeap;
-
-        AZ::u32 m_FrameCounter;
-        const AZ::u32 AllowedGPUFramesLatency = 5;
-
-        AZ::u64 m_CalibratedGpuTimestampFrequency;
-        AZ::u64 m_CalibratedGpuTimestamp;
-        AZ::u64 m_CalibratedCpuTimestampFrequency;
-        AZ::u64 m_CalibratedCpuTimestamp;
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12PSO.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12PSO.cpp
deleted file mode 100644
index b451ee218e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12PSO.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12PSO.hpp"
-#include "DX12Device.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DX12PSO_CPP_SECTION_1 1
-#define DX12PSO_CPP_SECTION_2 2
-#define DX12PSO_CPP_SECTION_3 3
-#define DX12PSO_CPP_SECTION_4 4
-#define DX12PSO_CPP_SECTION_5 5
-#define DX12PSO_CPP_SECTION_6 6
-#endif
-
-namespace DX12
-{
-    bool PipelineState::Init(const RootSignature* rootSignature, ID3D12PipelineState* pipelineState)
-    {
-        m_RootSignature = rootSignature;
-        m_PipelineState = pipelineState;
-
-        return true;
-    }
-
-    bool GraphicsPipelineState::Init(const InitParams& params)
-    {
-        AZ_TRACE_METHOD();
-        m_Desc = params.desc;
-        m_Desc.pRootSignature = params.rootSignature->GetD3D12RootSignature();
-
-        ID3D12PipelineState* pipelineState12 = nullptr;
-        HRESULT result = GetDevice()->GetD3D12Device()->CreateGraphicsPipelineState(&m_Desc, IID_GRAPHICS_PPV_ARGS(&pipelineState12));
-
-        if (result != S_OK)
-        {
-            DX12_ERROR("Could not create graphics pipeline state!");
-            return false;
-        }
-
-        PipelineState::Init(params.rootSignature, pipelineState12);
-        pipelineState12->Release();
-
-        return true;
-    }
-
-    bool GraphicsPipelineState::Init(const InitParams& params, ID3D12PipelineState* pipelineState)
-    {
-        AZ_TRACE_METHOD();
-        m_Desc = params.desc;
-        m_Desc.pRootSignature = params.rootSignature->GetD3D12RootSignature();
-
-        return PipelineState::Init(params.rootSignature, pipelineState);
-    }
-
-    bool ComputePipelineState::Init(const InitParams& params)
-    {
-        AZ_TRACE_METHOD();
-        m_Desc = params.desc;
-        m_Desc.pRootSignature = params.rootSignature->GetD3D12RootSignature();
-
-        ID3D12PipelineState* pipelineState12 = nullptr;
-        HRESULT result = GetDevice()->GetD3D12Device()->CreateComputePipelineState(&m_Desc, IID_GRAPHICS_PPV_ARGS(&pipelineState12));
-
-        if (FAILED(result))
-        {
-            DX12_ERROR("Could not create graphics pipeline state!");
-            return false;
-        }
-
-        PipelineState::Init(params.rootSignature, pipelineState12);
-        pipelineState12->Release();
-
-        return true;
-    }
-
-    bool ComputePipelineState::Init(const InitParams& params, ID3D12PipelineState* pipelineState)
-    {
-        AZ_TRACE_METHOD();
-        m_Desc = params.desc;
-        m_Desc.pRootSignature = params.rootSignature->GetD3D12RootSignature();
-
-        return PipelineState::Init(params.rootSignature, pipelineState);
-    }
-
-    PipelineStateCache::PipelineStateCache()
-        : m_Device(nullptr)
-    {
-    }
-
-    PipelineStateCache::~PipelineStateCache()
-    {
-    }
-
-    bool PipelineStateCache::Init(Device* device)
-    {
-        m_Device = device;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(DX12PSO_cpp)
-#endif
-
-        return true;
-    }
-
-    GraphicsPipelineState* PipelineStateCache::AcquirePipelineState(const GraphicsPipelineState::InitParams& params)
-    {
-        // LSB cleared marks graphics pipeline states, in case graphics and compute hashes collide
-        THash hash = (~1) & params.hash;
-
-        auto iter = m_Cache.find(hash);
-
-        if (iter != m_Cache.end())
-        {
-            return static_cast<GraphicsPipelineState*>(iter->second.get());
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(DX12PSO_cpp)
-#endif
-        DX12::GraphicsPipelineState* result = new DX12::GraphicsPipelineState(m_Device);
-
-        if (!result->Init(params))
-        {
-            DX12_ERROR("Could not create PSO!");
-            return nullptr;
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(DX12PSO_cpp)
-#endif
-
-        m_Cache[hash] = result;
-
-        return result;
-    }
-
-    ComputePipelineState* PipelineStateCache::AcquirePipelineState(const ComputePipelineState::InitParams& params)
-    {
-        // LSB filled marks compute pipeline states, in case graphics and compute hashes collide
-        THash hash = (1) | params.hash;
-
-        auto iter = m_Cache.find(hash);
-        if (iter != m_Cache.end())
-        {
-            return static_cast<ComputePipelineState*>(iter->second.get());
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(DX12PSO_cpp)
-#endif
-
-        ComputePipelineState* result = new ComputePipelineState(m_Device);
-        if (!result->Init(params))
-        {
-            DX12_ERROR("Could not create PSO!");
-            return nullptr;
-        }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(DX12PSO_cpp)
-#endif
-
-        m_Cache[hash] = result;
-        return result;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12PSO_cpp)
-#endif
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12PSO.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12PSO.hpp
deleted file mode 100644
index db6f566631..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12PSO.hpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12RootSignature.hpp"
-#include <AzCore/std/containers/unordered_map.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DX12PSO_H_SECTION_1 1
-#define DX12PSO_H_SECTION_2 2
-#endif
-
-namespace DX12
-{
-    class PipelineState : public DeviceObject
-    {
-    public:
-        PipelineState(Device* device) : DeviceObject(device) {}
-        ~PipelineState() {}
-
-        bool Init(const RootSignature* rootSignature, ID3D12PipelineState* pipelineState);
-
-        THash GetHash() const
-        {
-            return m_Hash;
-        }
-
-        ID3D12PipelineState* GetD3D12PipelineState() const
-        {
-            return m_PipelineState;
-        }
-
-    private:
-        THash m_Hash = 0;
-        SmartPtr<ID3D12PipelineState> m_PipelineState;
-        const RootSignature* m_RootSignature = nullptr;
-    };
-
-    class GraphicsPipelineState : public PipelineState
-    {
-    public:
-        GraphicsPipelineState(Device* device) : PipelineState(device) {}
-        ~GraphicsPipelineState() {}
-
-        struct InitParams
-        {
-            const RootSignature* rootSignature;
-            D3D12_GRAPHICS_PIPELINE_STATE_DESC desc;
-            AZ::u32 hash;
-        };
-
-        bool Init(const InitParams& params);
-        bool Init(const InitParams& params, ID3D12PipelineState* pipelineState);
-
-        inline D3D12_GRAPHICS_PIPELINE_STATE_DESC& GetDesc()
-        {
-            return m_Desc;
-        }
-
-        inline const D3D12_GRAPHICS_PIPELINE_STATE_DESC& GetDesc() const
-        {
-            return m_Desc;
-        }
-
-    private:
-        D3D12_GRAPHICS_PIPELINE_STATE_DESC m_Desc;
-    };
-
-    class ComputePipelineState : public PipelineState
-    {
-    public:
-        ComputePipelineState(Device* device) : PipelineState(device) {}
-        ~ComputePipelineState() {}
-
-        struct InitParams
-        {
-            const RootSignature* rootSignature;
-            D3D12_COMPUTE_PIPELINE_STATE_DESC desc;
-            AZ::u32 hash;
-        };
-
-        bool Init(const InitParams& params);
-        bool Init(const InitParams& params, ID3D12PipelineState* pipelineState);
-
-        inline D3D12_COMPUTE_PIPELINE_STATE_DESC& GetDesc()
-        {
-            return m_Desc;
-        }
-
-        inline const D3D12_COMPUTE_PIPELINE_STATE_DESC& GetDesc() const
-        {
-            return m_Desc;
-        }
-
-    private:
-        D3D12_COMPUTE_PIPELINE_STATE_DESC m_Desc;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12PSO_h)
-#endif
-
-    class PipelineStateCache
-    {
-    public:
-        PipelineStateCache();
-        ~PipelineStateCache();
-
-        bool Init(Device* device);
-
-        GraphicsPipelineState* AcquirePipelineState(const GraphicsPipelineState::InitParams& params);
-        ComputePipelineState* AcquirePipelineState(const ComputePipelineState::InitParams& params);
-
-    private:
-        Device* m_Device;
-        AZStd::unordered_map<THash, SmartPtr<PipelineState>> m_Cache;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12PSO_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(DX12PSO_h)
-#endif
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12QueryHeap.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12QueryHeap.cpp
deleted file mode 100644
index d7754de09c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12QueryHeap.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12QueryHeap.hpp"
-
-namespace DX12
-{
-    QueryHeap::QueryHeap(Device* device)
-        : DeviceObject(device)
-    {
-    }
-
-    QueryHeap::~QueryHeap()
-    {
-    }
-
-    bool QueryHeap::Init(Device* device, const D3D12_QUERY_HEAP_DESC& desc)
-    {
-        if (!IsInitialized())
-        {
-            SetDevice(device);
-
-            ID3D12QueryHeap* heap;
-            GetDevice()->GetD3D12Device()->CreateQueryHeap(&desc, IID_GRAPHICS_PPV_ARGS(&heap));
-
-            m_QueryHeap = heap;
-            heap->Release();
-
-            m_Desc12 = desc;
-
-            IsInitialized(true);
-        }
-
-        Reset();
-        return true;
-    }
-
-    void QueryHeap::Reset()
-    {
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12QueryHeap.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12QueryHeap.hpp
deleted file mode 100644
index 6fea3fcb38..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12QueryHeap.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12Base.hpp"
-
-namespace DX12
-{
-    class QueryHeap : public DeviceObject
-    {
-    public:
-        QueryHeap(Device* device);
-        virtual ~QueryHeap();
-
-        bool Init(Device* device, const D3D12_QUERY_HEAP_DESC& desc);
-        void Reset();
-
-        ID3D12QueryHeap* GetD3D12QueryHeap() const { return /*PassAddRef*/ (m_QueryHeap); }
-
-        UINT GetType() const { return m_Desc12.Type; }
-        UINT GetCapacity() const { return m_Desc12.Count; }
-
-    private:
-        SmartPtr<ID3D12QueryHeap> m_QueryHeap;
-        D3D12_QUERY_HEAP_DESC m_Desc12;
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Resource.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Resource.cpp
deleted file mode 100644
index b9e2df8cb7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Resource.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12Resource.hpp"
-#include "DX12Device.hpp"
-
-namespace DX12
-{
-    Resource::Resource(Device* pDevice)
-        : DeviceObject(pDevice)
-        , m_HeapType(D3D12_HEAP_TYPE_DEFAULT)
-        , m_GPUVirtualAddress(DX12_GPU_VIRTUAL_ADDRESS_NULL)
-        , m_pD3D12Resource(nullptr)
-        , m_States(D3D12_RESOURCE_STATE_COMMON, static_cast<D3D12_RESOURCE_STATES>(-1))
-        , m_pSwapChainOwner(NULL)
-    {
-        memset(&m_FenceValues, 0, sizeof(m_FenceValues));
-    }
-
-    Resource::Resource(Resource&& r)
-        : DeviceObject(std::move(r))
-        , m_HeapType(std::move(r.m_HeapType))
-        , m_GPUVirtualAddress(std::move(r.m_GPUVirtualAddress))
-        , m_pD3D12Resource(std::move(r.m_pD3D12Resource))
-        , m_States(std::move(r.m_States))
-        , m_InitialData(std::move(r.m_InitialData))
-        , m_pSwapChainOwner(std::move(r.m_pSwapChainOwner))
-    {
-        memcpy(&m_FenceValues, &r.m_FenceValues, sizeof(m_FenceValues));
-
-        r.m_pD3D12Resource = nullptr;
-        r.m_pSwapChainOwner = nullptr;
-    }
-
-    Resource& Resource::operator=(Resource&& r)
-    {
-        DeviceObject::operator=(std::move(r));
-
-        m_HeapType = std::move(r.m_HeapType);
-        m_GPUVirtualAddress = std::move(r.m_GPUVirtualAddress);
-        m_pD3D12Resource = std::move(r.m_pD3D12Resource);
-        m_States = std::move(r.m_States);
-        m_InitialData = std::move(r.m_InitialData);
-        m_pSwapChainOwner = std::move(r.m_pSwapChainOwner);
-
-        memcpy(&m_FenceValues, &r.m_FenceValues, sizeof(m_FenceValues));
-
-        r.m_pD3D12Resource = nullptr;
-        r.m_pSwapChainOwner = nullptr;
-
-        return *this;
-    }
-
-    Resource::~Resource()
-    {
-        m_pD3D12Resource->AddRef();
-
-        GetDevice()->ReleaseLater(m_pD3D12Resource, GetCurrentState(), GetAnnouncedState());
-    }
-
-    UINT64 Resource::GetRequiredUploadSize(UINT FirstSubresource, UINT NumSubresources) const
-    {
-        UINT64 Size;
-        GetDevice()->GetD3D12Device()->GetCopyableFootprints(&m_Desc, FirstSubresource, NumSubresources, 0, nullptr, nullptr, nullptr, &Size);
-        return Size;
-    }
-
-    bool Resource::IsUsed(CommandListPool& commandListPool, const int type)
-    {
-        return !commandListPool.IsCompleted(m_FenceValues[type]);
-    }
-
-    void Resource::WaitForUnused(CommandListPool& commandListPool, const int type)
-    {
-        commandListPool.WaitForFenceOnCPU(m_FenceValues[type]);
-    }
-
-    bool Resource::Init(ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const D3D12_RESOURCE_DESC& desc)
-    {
-        m_pD3D12Resource = pResource;
-        m_Desc = desc;
-
-        D3D12_HEAP_PROPERTIES sHeap;
-
-        if (m_pD3D12Resource->GetHeapProperties(&sHeap, nullptr) == S_OK)
-        {
-            m_HeapType = sHeap.Type;
-
-            if (m_HeapType == D3D12_HEAP_TYPE_UPLOAD)
-            {
-                SetCurrentState(D3D12_RESOURCE_STATE_GENERIC_READ);
-            }
-            else if (m_HeapType == D3D12_HEAP_TYPE_READBACK)
-            {
-                SetCurrentState(D3D12_RESOURCE_STATE_COPY_DEST);
-            }
-            else
-            {
-                SetCurrentState(eInitialState);
-            }
-        }
-
-        if (pResource && desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
-        {
-            m_GPUVirtualAddress = m_pD3D12Resource->GetGPUVirtualAddress();
-        }
-
-        m_pSwapChainOwner = NULL;
-
-        return true;
-    }
-
-    void Resource::TryStagingUpload(CommandList* commandList)
-    {
-        if (m_InitialData)
-        {
-            DX12_LOG("Uploading initial data");
-            DX12_ASSERT(!IsUsed(commandList->GetCommandListPool()), "Resource is used prior to initialization!");
-
-            AZStd::unique_ptr<InitialData> initialData = AZStd::move(m_InitialData);
-
-            commandList->UpdateSubresources(*this,
-                initialData->m_UploadSize,
-                static_cast<UINT>(initialData->m_SubResourceData.size()),
-                &(initialData->m_SubResourceData[0]));
-        }
-    }
-
-    Resource::InitialData* Resource::GetOrCreateInitialData()
-    {
-        if (!m_InitialData)
-        {
-            m_InitialData.reset(new InitialData());
-        }
-
-        return m_InitialData.get();
-    }
-
-    void Resource::MapDiscard(CommandList* pCmdList)
-    {
-        m_pD3D12Resource->AddRef();
-
-        GetDevice()->ReleaseLater(m_pD3D12Resource, GetCurrentState(), GetAnnouncedState());
-
-        D3D12_RESOURCE_STATES usage = D3D12_RESOURCE_STATE_GENERIC_READ;
-        D3D12_HEAP_TYPE heapType = D3D12_HEAP_TYPE_UPLOAD;
-        ID3D12Resource* resource = NULL;
-
-        ResourceStates resourceStates;
-        const CD3DX12_HEAP_PROPERTIES heapProperties(heapType);
-        if (S_OK != GetDevice()->CreateOrReuseCommittedResource(
-                &heapProperties,
-                D3D12_HEAP_FLAG_ALLOW_ALL_BUFFERS_AND_TEXTURES,
-                &m_Desc,
-                usage,
-                NULL,
-                IID_GRAPHICS_PPV_ARGS(&resource),
-                resourceStates
-                ))
-        {
-            DX12_ASSERT(0, "Could not create buffer resource!");
-            return;
-        }
-
-        m_pD3D12Resource = resource;
-        
-        resource->Release();
-
-        if (m_pD3D12Resource && m_Desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
-        {
-            m_GPUVirtualAddress = m_pD3D12Resource->GetGPUVirtualAddress();
-        }
-
-        SetCurrentState(usage);
-        SetAnnouncedState(static_cast<D3D12_RESOURCE_STATES>(-1));
-
-        // If it is reused resource,  we have to transition the state to new state
-        if(m_States != resourceStates)
-            pCmdList->QueueTransitionBarrier(*this, resourceStates.m_CurrentState);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Resource.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Resource.hpp
deleted file mode 100644
index 416c0f1cd3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Resource.hpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __DX12RESOURCE__
-#define __DX12RESOURCE__
-
-#include "DX12Base.hpp"
-#include "DX12/API/DX12CommandListFence.hpp"
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-
-namespace DX12
-{
-    class CommandList;
-    class SwapChain;
-
-    struct ResourceStates
-    {
-        ResourceStates()
-            :m_CurrentState(static_cast<D3D12_RESOURCE_STATES>(-1)),
-            m_AnnouncedState(static_cast<D3D12_RESOURCE_STATES>(-1))
-        {}
-        ResourceStates(D3D12_RESOURCE_STATES currentState, D3D12_RESOURCE_STATES announcedState)
-            :m_CurrentState(currentState),
-            m_AnnouncedState(announcedState)
-        {}
-
-        bool operator ==(const ResourceStates& states) const
-        {
-            return m_CurrentState == states.m_CurrentState && m_AnnouncedState == states.m_AnnouncedState;
-        }
-        bool operator !=(const ResourceStates& states) const
-        {
-            return !(*this == states);
-        }
-        D3D12_RESOURCE_STATES m_CurrentState;
-        D3D12_RESOURCE_STATES m_AnnouncedState;
-    };
-
-    class Resource : public DeviceObject
-    {
-    public:
-        Resource(Device* pDevice);
-        virtual ~Resource();
-
-        Resource(Resource&& r);
-        Resource& operator=(Resource&& r);
-
-        void TryStagingUpload(CommandList* pCmdList);
-        bool Init(ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const D3D12_RESOURCE_DESC& desc);
-        bool Init(ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState)
-        {
-            return Init(pResource, eInitialState, pResource->GetDesc());
-        }
-
-        // Initialization of contents
-        struct InitialData
-        {
-            std::vector<D3D12_SUBRESOURCE_DATA> m_SubResourceData{};
-            UINT64 m_Size{0};
-            UINT64 m_UploadSize{0};
-        };
-
-        InitialData* GetOrCreateInitialData();
-
-        inline bool InitHasBeenDeferred() const
-        {
-            return m_InitialData != nullptr;
-        }
-
-        // Swap-chain associativity
-        inline void SetDX12SwapChain(SwapChain* pOwner)
-        {
-            m_pSwapChainOwner = pOwner;
-        }
-
-        inline SwapChain* GetDX12SwapChain() const
-        {
-            return m_pSwapChainOwner;
-        }
-
-        inline bool IsBackBuffer() const
-        {
-            return m_pSwapChainOwner != NULL;
-        }
-
-        inline bool IsOffCard() const
-        {
-            return m_HeapType == D3D12_HEAP_TYPE_READBACK || m_HeapType == D3D12_HEAP_TYPE_UPLOAD;
-        }
-
-        inline D3D12_RESOURCE_STATES GetRequiredResourceState() const
-        {
-            return m_HeapType == D3D12_HEAP_TYPE_READBACK ? D3D12_RESOURCE_STATE_COPY_DEST : D3D12_RESOURCE_STATE_GENERIC_READ;
-        }
-
-        inline bool IsTarget() const
-        {
-            return !!(GetCurrentState() & (D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_DEPTH_WRITE));
-        }
-
-        inline bool IsGeneric() const
-        {
-            return !!(GetCurrentState() & (D3D12_RESOURCE_STATE_UNORDERED_ACCESS | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE));
-        }
-
-        inline D3D12_RESOURCE_DESC& GetDesc()
-        {
-            return m_Desc;
-        }
-
-        inline const D3D12_RESOURCE_DESC& GetDesc() const
-        {
-            return m_Desc;
-        }
-
-        UINT64 GetRequiredUploadSize(UINT FirstSubresource, UINT NumSubresources) const;
-
-        inline ID3D12Resource* GetD3D12Resource() const
-        {
-            return m_pD3D12Resource;
-        }
-        inline D3D12_GPU_VIRTUAL_ADDRESS GetGPUVirtualAddress() const
-        {
-            return m_GPUVirtualAddress;
-        }
-
-        // Get current known resource barrier state
-        inline D3D12_RESOURCE_STATES GetCurrentState() const
-        {
-            return m_States.m_CurrentState;
-        }
-
-        inline D3D12_RESOURCE_STATES GetAnnouncedState() const
-        {
-            return m_States.m_AnnouncedState;
-        }
-
-        inline void SetCurrentState(D3D12_RESOURCE_STATES state)
-        {
-            m_States.m_CurrentState = state;
-        }
-
-        inline void SetAnnouncedState(D3D12_RESOURCE_STATES state)
-        {
-            m_States.m_AnnouncedState = state;
-        }
-
-        UINT64 SetFenceValue(UINT64 fenceValue, const int id, const int type)
-        {
-            // Check submitted completed fence
-            UINT64 previousValue = m_FenceValues[type][id];
-
-#define DX12_FREETHREADED_RESOURCES
-#ifndef DX12_FREETHREADED_RESOURCES
-            m_FenceValues[type][id] = (previousValue > fenceValue ? previousValue : fenceValue);
-
-            if (type == CMDTYPE_ANY)
-            {
-                m_FenceValues[CMDTYPE_READ ][id] =
-                    m_FenceValues[CMDTYPE_WRITE][id] =
-                        m_FenceValues[CMDTYPE_ANY][id];
-            }
-            else
-            {
-                m_FenceValues[CMDTYPE_ANY  ][id] = std::max(
-                        m_FenceValues[CMDTYPE_READ ][id],
-                        m_FenceValues[CMDTYPE_WRITE][id]);
-            }
-#else
-            // CLs may submit in any order. Is it higher than last known completed fence? If so, update it!
-            MaxFenceValue(m_FenceValues[type][id], fenceValue);
-
-            if (type == CMDTYPE_ANY)
-            {
-                MaxFenceValue(m_FenceValues[CMDTYPE_READ ][id], m_FenceValues[CMDTYPE_ANY][id]);
-                MaxFenceValue(m_FenceValues[CMDTYPE_WRITE][id], m_FenceValues[CMDTYPE_ANY][id]);
-            }
-            else
-            {
-                MaxFenceValue(m_FenceValues[CMDTYPE_ANY  ][id], std::max(m_FenceValues[CMDTYPE_READ][id], m_FenceValues[CMDTYPE_WRITE][id]));
-            }
-#endif // !NDEBUG
-
-            return previousValue;
-        }
-
-        inline UINT64 GetFenceValue(const int id, const int type)
-        {
-            return m_FenceValues[type][id];
-        }
-
-        inline const std::atomic<AZ::u64> (& GetFenceValues(const int type))[CMDQUEUE_NUM]
-        {
-            return m_FenceValues[type];
-        }
-
-        inline void MaxFenceValues(std::atomic<AZ::u64> (&rFenceValues)[CMDTYPE_NUM][CMDQUEUE_NUM], const int type)
-        {
-            if ((type == CMDTYPE_READ) || (type == CMDTYPE_ANY))
-            {
-                MaxFenceValue(rFenceValues[CMDTYPE_READ ][CMDQUEUE_COPY    ], m_FenceValues[CMDTYPE_READ ][CMDQUEUE_COPY    ]);
-                MaxFenceValue(rFenceValues[CMDTYPE_READ ][CMDQUEUE_GRAPHICS], m_FenceValues[CMDTYPE_READ ][CMDQUEUE_GRAPHICS]);
-            }
-
-            if ((type == CMDTYPE_WRITE) || (type == CMDTYPE_ANY))
-            {
-                MaxFenceValue(rFenceValues[CMDTYPE_WRITE][CMDQUEUE_COPY    ], m_FenceValues[CMDTYPE_WRITE][CMDQUEUE_COPY    ]);
-                MaxFenceValue(rFenceValues[CMDTYPE_WRITE][CMDQUEUE_GRAPHICS], m_FenceValues[CMDTYPE_WRITE][CMDQUEUE_GRAPHICS]);
-            }
-        }
-
-        bool IsUsed(CommandListPool& pCmdListPool, const int type = CMDTYPE_ANY);
-        void WaitForUnused(CommandListPool& pCmdListPool, const int type = CMDTYPE_ANY);
-
-        void MapDiscard(CommandList* pCmdList);
-
-    protected:
-        friend class CommandList;
-
-        void DiscardInitialData();
-
-        // Never changes after construction
-        D3D12_RESOURCE_DESC m_Desc;
-        D3D12_HEAP_TYPE m_HeapType;
-        D3D12_GPU_VIRTUAL_ADDRESS m_GPUVirtualAddress;
-        SmartPtr<ID3D12Resource> m_pD3D12Resource;  // can be replaced by MAP_DISCARD, which is deprecated
-
-        SwapChain* m_pSwapChainOwner;
-
-        // Potentially changes on every resource-use
-        ResourceStates m_States;
-        mutable std::atomic<AZ::u64> m_FenceValues[CMDTYPE_NUM][CMDQUEUE_NUM];
-
-        // Used when using the resource the first time
-        AZStd::unique_ptr<InitialData> m_InitialData;
-    };
-}
-
-#endif // __DX12RESOURCE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12ResourceBarrierCache.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12ResourceBarrierCache.cpp
deleted file mode 100644
index 61d506256b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12ResourceBarrierCache.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12ResourceBarrierCache.h"
-
-namespace DX12
-{
-    const char* BarrierFlagsToString(D3D12_RESOURCE_BARRIER_FLAGS flags)
-    {
-        if (flags & D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY)
-        {
-            return "BEGIN_ONLY";
-        }
-        else if (flags & D3D12_RESOURCE_BARRIER_FLAG_END_ONLY)
-        {
-            return "END_ONLY";
-        }
-
-        return "NONE";
-    }
-
-    void ResourceBarrierCache::EnqueueTransition(
-        ID3D12GraphicsCommandList* commandList,
-        const D3D12_RESOURCE_BARRIER_FLAGS flags,
-        const D3D12_RESOURCE_TRANSITION_BARRIER& transition)
-    {
-        bool bFoundChain = false;
-
-        for (TransitionChainRoot& chain : m_TransitionChains)
-        {
-            if (chain.resource == transition.pResource)
-            {
-                TransitionNode& prevNode = m_TransitionNodes[chain.tailIdx];
-
-                // We can collapse split barriers right here if we find them. We know the previous
-                // barrier must be a BEGIN_ONLY because we've seen this resource before. Therefore
-                // we assert that they match and simply remove the split. This simplifies the flattening
-                // process later on.
-                if (flags == D3D12_RESOURCE_BARRIER_FLAG_END_ONLY)
-                {
-                    D3D12_RESOURCE_BARRIER& prevBarrier = m_TransitionBarriers[prevNode.barrierIdx];
-
-                    AZ_Assert(
-                        prevBarrier.Flags == D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY &&
-                        prevBarrier.Transition.StateBefore == transition.StateBefore &&
-                        prevBarrier.Transition.StateAfter == transition.StateAfter,
-                        "Split barrier not properly closed");
-
-                    prevBarrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
-                    return;
-                }
-
-                TransitionNode self;
-                self.barrierIdx = AZ::u8(m_TransitionBarriers.size());
-                self.selfIdx = AZ::u8(m_TransitionNodes.size());
-                self.nextIdx = InvalidNodeIndex;
-                prevNode.nextIdx = self.selfIdx;
-
-                m_TransitionNodes.push_back(self);
-
-                // Reset the tail of the list to the new node.
-                chain.tailIdx = self.selfIdx;
-
-                bFoundChain = true;
-                break;
-            }
-        }
-
-        if (!bFoundChain)
-        {
-            TransitionNode self;
-            self.barrierIdx = AZ::u8(m_TransitionBarriers.size());
-            self.selfIdx = AZ::u8(m_TransitionNodes.size());
-            self.nextIdx = InvalidNodeIndex;
-            m_TransitionNodes.push_back(self);
-
-            TransitionChainRoot root;
-            root.resource = transition.pResource;
-            root.tailIdx = self.selfIdx;
-            root.headIdx = self.selfIdx;
-            m_TransitionChains.push_back(root);
-        }
-
-        m_TransitionBarriers.emplace_back();
-
-        D3D12_RESOURCE_BARRIER& barrier = m_TransitionBarriers.back();
-        barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
-        barrier.Flags = flags;
-        barrier.Transition = transition;
-
-        TryCapacityFlush(commandList);
-    }
-
-    void ResourceBarrierCache::EnqueueUAV(ID3D12GraphicsCommandList* commandList, Resource& resource)
-    {
-        m_Barriers.emplace_back();
-
-        D3D12_RESOURCE_BARRIER& barrierDesc = m_Barriers.back();
-        barrierDesc.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV;
-        barrierDesc.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
-        barrierDesc.UAV.pResource = resource.GetD3D12Resource();
-
-        TryCapacityFlush(commandList);
-    }
-
-    void ResourceBarrierCache::Flush(ID3D12GraphicsCommandList* commandList)
-    {
-        AZ_TRACE_METHOD();
-        for (TransitionChainRoot& chain : m_TransitionChains)
-        {
-            TransitionNode* node = &m_TransitionNodes[chain.headIdx];
-
-            m_Barriers.emplace_back();
-            D3D12_RESOURCE_BARRIER* pendingBarrier = &m_Barriers.back();
-            *pendingBarrier = m_TransitionBarriers[node->barrierIdx];
-
-            while (node->nextIdx != InvalidNodeIndex)
-            {
-                node = &m_TransitionNodes[node->nextIdx];
-                D3D12_RESOURCE_BARRIER& nextBarrier = m_TransitionBarriers[node->barrierIdx];
-
-                bool bFlattenable =
-                    nextBarrier.Flags == D3D12_RESOURCE_BARRIER_FLAG_NONE &&
-                    pendingBarrier->Flags == D3D12_RESOURCE_BARRIER_FLAG_NONE;
-
-                // If we can flatten, we don't need to emit a new barrier, we just fix up the pending one.
-                if (bFlattenable)
-                {
-                    pendingBarrier->Transition.StateAfter = nextBarrier.Transition.StateAfter;
-                }
-                else
-                {
-                    // Emit current barrier and reset.
-                    m_Barriers.emplace_back();
-                    pendingBarrier = &m_Barriers.back();
-                    *pendingBarrier = nextBarrier;
-                }
-            }
-
-            // Remove barrier if it ended up as a noop.
-            if (pendingBarrier->Transition.StateBefore == pendingBarrier->Transition.StateAfter)
-            {
-                m_Barriers.pop_back();
-            }
-        }
-
-        if (m_Barriers.size())
-        {
-            commandList->ResourceBarrier((UINT)m_Barriers.size(), m_Barriers.data());
-            m_Barriers.clear();
-        }
-
-        m_TransitionBarriers.clear();
-        m_TransitionChains.clear();
-        m_TransitionNodes.clear();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12ResourceBarrierCache.h b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12ResourceBarrierCache.h
deleted file mode 100644
index fe27758657..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12ResourceBarrierCache.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12Base.hpp"
-#include <AzCore/std/containers/vector.h>
-
-namespace DX12
-{
-    class ResourceBarrierCache
-    {
-    public:
-        ResourceBarrierCache()
-        {
-            m_Barriers.reserve(BarrierCountMax);
-            m_TransitionChains.reserve(BarrierCountMax);
-            m_TransitionNodes.reserve(BarrierCountMax);
-            m_TransitionBarriers.reserve(BarrierCountMax);
-        }
-
-        void EnqueueTransition(ID3D12GraphicsCommandList* commandList, const D3D12_RESOURCE_BARRIER_FLAGS flags, const D3D12_RESOURCE_TRANSITION_BARRIER& barrier);
-        void EnqueueUAV(ID3D12GraphicsCommandList* commandList, Resource& resource);
-        void Flush(ID3D12GraphicsCommandList* commandList);
-
-        inline bool IsFlushNeeded() const
-        {
-            return m_TransitionBarriers.size() || m_Barriers.size();
-        }
-
-    private:
-        static const AZ::u32 BarrierCountMax = 32;
-        static const AZ::u8 InvalidNodeIndex = -1;
-
-        struct TransitionNode
-        {
-            AZ::u8 selfIdx;
-            AZ::u8 nextIdx;
-            AZ::u8 barrierIdx;
-        };
-
-        struct TransitionChainRoot
-        {
-            ID3D12Resource* resource;
-            AZ::u8 headIdx;
-            AZ::u8 tailIdx;
-        };
-
-        inline void TryCapacityFlush(ID3D12GraphicsCommandList* commandList)
-        {
-            if (AZ::u32(m_Barriers.size() + m_TransitionBarriers.size()) >= BarrierCountMax)
-            {
-                Flush(commandList);
-            }
-        }
-
-        AZStd::vector<TransitionChainRoot> m_TransitionChains;
-        AZStd::vector<TransitionNode> m_TransitionNodes;
-        AZStd::vector<D3D12_RESOURCE_BARRIER> m_TransitionBarriers;
-        AZStd::vector<D3D12_RESOURCE_BARRIER> m_Barriers;
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12RootSignature.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12RootSignature.cpp
deleted file mode 100644
index dd7daa4036..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12RootSignature.cpp
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12RootSignature.hpp"
-
-#define DX12_DESCRIPTORTABLE_MERGERANGES_CBV    1
-#define DX12_DESCRIPTORTABLE_MERGERANGES_SRV    2
-#define DX12_DESCRIPTORTABLE_MERGERANGES_UAV    4
-#define DX12_DESCRIPTORTABLE_MERGERANGES_SMP    8
-#define DX12_DESCRIPTORTABLE_MERGERANGES_ALL    (DX12_DESCRIPTORTABLE_MERGERANGES_SRV | DX12_DESCRIPTORTABLE_MERGERANGES_UAV | DX12_DESCRIPTORTABLE_MERGERANGES_SMP)
-#define DX12_DESCRIPTORTABLE_MERGERANGES_MODE   DX12_DESCRIPTORTABLE_MERGERANGES_ALL
-
-namespace DX12
-{
-    PipelineLayout::PipelineLayout()
-    {
-        Clear();
-    }
-
-    void PipelineLayout::Build(Shader* vs, Shader* hs, Shader* ds, Shader* gs, Shader* ps)
-    {
-        Clear();
-
-        Shader* shaders[] = { ps, vs, hs, ds, gs };
-        EShaderStage shaderStages[] = { ESS_Pixel, ESS_Vertex, ESS_Hull, ESS_Domain, ESS_Geometry };
-
-        for (size_t stageIdx = 0; stageIdx < AZ_ARRAY_SIZE(shaders); ++stageIdx)
-        {
-            if (shaders[stageIdx])
-            {
-                AZ::u32 parameterCount = m_NumRootParameters;
-                AppendRootConstantBuffers(shaders[stageIdx], shaderStages[stageIdx]);
-                if (parameterCount != m_NumRootParameters)
-                {
-                    m_ShaderStageAccess |= BIT(shaderStages[stageIdx]);
-                }
-            }
-        }
-
-        for (size_t stageIdx = 0; stageIdx < AZ_ARRAY_SIZE(shaders); ++stageIdx)
-        {
-            if (shaders[stageIdx])
-            {
-                AZ::u32 parameterCount = m_NumRootParameters;
-                AppendDescriptorTables(shaders[stageIdx], shaderStages[stageIdx]);
-                if (parameterCount != m_NumRootParameters)
-                {
-                    m_ShaderStageAccess |= BIT(shaderStages[stageIdx]);
-                }
-            }
-        }
-    }
-
-    void PipelineLayout::Build(Shader* cs)
-    {
-        Clear();
-
-        if (cs)
-        {
-            AppendRootConstantBuffers(cs, ESS_Compute);
-            AppendDescriptorTables(cs, ESS_Compute);
-            m_ShaderStageAccess |= ESS_Compute;
-        }
-    }
-
-    void PipelineLayout::Clear()
-    {
-        m_ConstantViews.clear();
-        m_TableResources.clear();
-        m_Samplers.clear();
-
-        m_DescRangeCursor = 0;
-        m_NumDescriptors = 0;
-        m_NumDynamicSamplers = 0;
-        m_NumDescriptorTables = 0;
-        m_NumRootParameters = 0;
-        m_NumStaticSamplers = 0;
-
-        m_ShaderStageAccess = ESS_None;
-    }
-
-    void PipelineLayout::MakeDescriptorTable(
-        AZ::u32 rangeCursorEnd,
-        AZ::u32& rangeCursorBegin,
-        AZ::u32 offsetEnd,
-        AZ::u32& offsetBegin,
-        D3D12_DESCRIPTOR_HEAP_TYPE eHeap,
-        D3D12_SHADER_VISIBILITY visibility)
-    {
-        const AZ::u32 numRanges = rangeCursorEnd - rangeCursorBegin;
-        if (numRanges > 0)
-        {
-            PipelineLayout::DescriptorTableInfo tableInfo;
-            tableInfo.m_Type = eHeap;
-            tableInfo.m_Offset = offsetBegin;
-            m_DescriptorTables[m_NumDescriptorTables++] = tableInfo;
-
-            // Setup the configuration of the root signature entry (a descriptor table range in this case)
-            m_RootParameters[m_NumRootParameters++].InitAsDescriptorTable(numRanges, m_DescRanges + rangeCursorBegin, visibility);
-
-            rangeCursorBegin = rangeCursorEnd;
-            offsetBegin = offsetEnd;
-        }
-    }
-
-    static D3D12_SHADER_VISIBILITY ToShaderVisibility(EShaderStage stage)
-    {
-        static const D3D12_SHADER_VISIBILITY visibility[] =
-        {
-            D3D12_SHADER_VISIBILITY_VERTEX,
-            D3D12_SHADER_VISIBILITY_HULL,
-            D3D12_SHADER_VISIBILITY_DOMAIN,
-            D3D12_SHADER_VISIBILITY_GEOMETRY,
-            D3D12_SHADER_VISIBILITY_PIXEL,
-            D3D12_SHADER_VISIBILITY_ALL
-        };
-
-        return visibility[stage];
-    }
-
-    static bool IsRootConstantBuffer(const ReflectedBindingRange& range)
-    {
-        return !range.m_bUsed || range.m_Count == 1;
-    }
-
-    void PipelineLayout::AppendRootConstantBuffers(Shader* shader, EShaderStage shaderStage)
-    {
-        const D3D12_SHADER_VISIBILITY visibility = ToShaderVisibility(shaderStage);
-
-        const ReflectedBindings& bindings = shader->GetReflectedBindings();
-
-        if (bindings.m_ConstantBuffers.m_DescriptorCount)
-        {
-            auto& ranges = bindings.m_ConstantBuffers.m_Ranges;
-            for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-            {
-                const ReflectedBindingRange range = ranges[rangeIdx];
-
-                AZ::u32 rangeBegin = range.m_ShaderRegister;
-                AZ::u32 rangeEnd = range.m_ShaderRegister + range.m_Count;
-
-                if (!IsRootConstantBuffer(range))
-                {
-                    continue;
-                }
-
-                if (range.m_bShared)
-                {
-                    bool bFound = false;
-
-                    // only pick up the first occurrence
-                    for (const ConstantBufferLayoutBinding& binding : m_ConstantViews)
-                    {
-                        if (binding.ShaderSlot == rangeBegin)
-                        {
-                            bFound = true;
-                            break;
-                        }
-                    }
-
-                    if (!bFound)
-                    {
-                        ConstantBufferLayoutBinding constant;
-                        constant.ShaderStage = shaderStage;
-                        constant.ShaderSlot = rangeBegin;
-                        constant.RootParameterIndex = m_NumRootParameters;
-                        m_ConstantViews.push_back(constant);
-
-                        m_RootParameters[m_NumRootParameters++].InitAsConstantBufferView(rangeBegin, 0, D3D12_SHADER_VISIBILITY_ALL);
-                    }
-                }
-                else if (!range.m_bUsed)
-                {
-                    // Setup the configuration of the root signature entry (a constant dummy CBV in this case)
-                    for (AZ::u32 rootParameterIdx = rangeBegin; rootParameterIdx < rangeEnd; ++rootParameterIdx)
-                    {
-                        m_RootParameters[m_NumRootParameters++].InitAsConstantBufferView(rootParameterIdx, 0, visibility);
-                    }
-                }
-                else
-                {
-                    ConstantBufferLayoutBinding constant;
-                    constant.ShaderStage = shaderStage;
-                    constant.ShaderSlot = rangeBegin;
-                    constant.RootParameterIndex = m_NumRootParameters;
-                    m_ConstantViews.push_back(constant);
-
-                    m_RootParameters[m_NumRootParameters++].InitAsConstantBufferView(rangeBegin, 0, visibility);
-                }
-            }
-        }
-    }
-
-    void PipelineLayout::AppendDescriptorTables(Shader* pShader, EShaderStage shaderStage)
-    {
-        const D3D12_SHADER_VISIBILITY visibility = ToShaderVisibility(shaderStage);
-
-        const ReflectedBindings& bindings = pShader->GetReflectedBindings();
-
-        AZ::u32 rangeCursorBegin = m_DescRangeCursor;
-        AZ::u32 rangeCursorEnd = m_DescRangeCursor;
-        AZ::u32 descriptorBegin = m_NumDescriptors;
-        AZ::u32 descriptorEnd = m_NumDescriptors;
-
-        if (bindings.m_ConstantBuffers.m_DescriptorCount)
-        {
-            auto& ranges = bindings.m_ConstantBuffers.m_Ranges;
-            for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-            {
-                const ReflectedBindingRange range = ranges[rangeIdx];
-
-                AZ::u32 rangeBegin = range.m_ShaderRegister;
-                AZ::u32 rangeEnd = range.m_ShaderRegister + range.m_Count;
-
-                if (IsRootConstantBuffer(range))
-                {
-                    continue;
-                }
-
-                // Setup the configuration of the descriptor table range (a number of CBVs in this case)
-                m_DescRanges[rangeCursorEnd++].Init(D3D12_DESCRIPTOR_RANGE_TYPE_CBV, range.m_Count, range.m_ShaderRegister);
-
-                for (size_t shaderRegister = rangeBegin; shaderRegister < rangeEnd; ++shaderRegister)
-                {
-                    ResourceLayoutBinding bindingLayout;
-                    ZeroStruct(bindingLayout);
-
-                    bindingLayout.ViewType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
-                    bindingLayout.ShaderStage = shaderStage;
-                    bindingLayout.ShaderSlot = shaderRegister;
-
-#ifdef GFX_DEBUG
-                    bindingLayout.DescriptorOffset = descriptorEnd;
-#endif
-
-                    m_TableResources.push_back(bindingLayout);
-                    ++descriptorEnd;
-                }
-
-                if constexpr (!(DX12_DESCRIPTORTABLE_MERGERANGES_MODE & DX12_DESCRIPTORTABLE_MERGERANGES_CBV))
-                {
-                    MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, descriptorEnd, descriptorBegin, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, visibility);
-                }
-            }
-        }
-
-        if constexpr (!(DX12_DESCRIPTORTABLE_MERGERANGES_MODE & DX12_DESCRIPTORTABLE_MERGERANGES_SRV))
-        {
-            MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, descriptorEnd, descriptorBegin, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, visibility);
-        }
-
-        if (bindings.m_InputResources.m_DescriptorCount)
-        {
-            auto& ranges = bindings.m_InputResources.m_Ranges;
-            for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-            {
-                const ReflectedBindingRange range = ranges[rangeIdx];
-                AZ::u32 rangeBegin = range.m_ShaderRegister;
-                AZ::u32 rangeEnd = range.m_ShaderRegister + range.m_Count;
-
-                if (!range.m_bUsed)
-                {
-                    // Setup the configuration of the root signature entry (a constant dummy SRV in this case)
-                    for (AZ::u32 rootParameterIdx = rangeBegin; rootParameterIdx < rangeEnd; ++rootParameterIdx)
-                    {
-                        m_RootParameters[m_NumRootParameters++].InitAsShaderResourceView(rootParameterIdx, 0, visibility);
-                    }
-
-                    continue;
-                }
-
-                // Setup the configuration of the descriptor table range (a number of SRVs in this case)
-                m_DescRanges[rangeCursorEnd++].Init(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, range.m_Count, range.m_ShaderRegister);
-
-                for (size_t shaderRegister = rangeBegin; shaderRegister < rangeEnd; ++shaderRegister)
-                {
-                    ResourceLayoutBinding bindingLayout;
-                    ZeroStruct(bindingLayout);
-
-                    bindingLayout.ViewType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
-                    bindingLayout.ShaderStage = shaderStage;
-                    bindingLayout.ShaderSlot = shaderRegister;
-#ifdef GFX_DEBUG
-                    bindingLayout.DescriptorOffset = descriptorEnd;
-#endif
-                    m_TableResources.push_back(bindingLayout);
-                    ++descriptorEnd;
-                }
-
-                if constexpr (!(DX12_DESCRIPTORTABLE_MERGERANGES_MODE & DX12_DESCRIPTORTABLE_MERGERANGES_SRV))
-                {
-                    MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, descriptorEnd, descriptorBegin, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, visibility);
-                }
-            }
-        }
-
-        if constexpr (!(DX12_DESCRIPTORTABLE_MERGERANGES_MODE & DX12_DESCRIPTORTABLE_MERGERANGES_UAV))
-        {
-            MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, descriptorEnd, descriptorBegin, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, visibility);
-        }
-
-        if (bindings.m_OutputResources.m_DescriptorCount)
-        {
-            auto& ranges = bindings.m_OutputResources.m_Ranges;
-            for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-            {
-                const ReflectedBindingRange range = ranges[rangeIdx];
-                AZ::u32 rangeBegin = range.m_ShaderRegister;
-                AZ::u32 rangeEnd = range.m_ShaderRegister + range.m_Count;
-
-                if (!range.m_bUsed)
-                {
-                    // Setup the configuration of the root signature entry (a constant dummy UAV in this case)
-                    for (AZ::u32 rootParameterIdx = rangeBegin; rootParameterIdx < rangeEnd; ++rootParameterIdx)
-                    {
-                        m_RootParameters[m_NumRootParameters++].InitAsUnorderedAccessView(rootParameterIdx, 0, visibility);
-                    }
-
-                    continue;
-                }
-
-                // Setup the configuration of the descriptor table range (a number of UAVs in this case)
-                m_DescRanges[rangeCursorEnd++].Init(D3D12_DESCRIPTOR_RANGE_TYPE_UAV, range.m_Count, range.m_ShaderRegister);
-
-                for (size_t shaderRegister = rangeBegin; shaderRegister < rangeEnd; ++shaderRegister)
-                {
-                    ResourceLayoutBinding bindingLayout;
-                    ZeroStruct(bindingLayout);
-
-                    bindingLayout.ViewType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
-                    bindingLayout.ShaderStage = shaderStage;
-                    bindingLayout.ShaderSlot = shaderRegister;
-#ifdef GFX_DEBUG
-                    bindingLayout.DescriptorOffset = descriptorEnd;
-#endif
-                    m_TableResources.push_back(bindingLayout);
-                    ++descriptorEnd;
-                }
-
-                if constexpr (!(DX12_DESCRIPTORTABLE_MERGERANGES_MODE & DX12_DESCRIPTORTABLE_MERGERANGES_UAV))
-                {
-                    MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, descriptorEnd, descriptorBegin, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, visibility);
-                }
-            }
-        }
-
-        if constexpr (DX12_DESCRIPTORTABLE_MERGERANGES_MODE != 0)
-        {
-            MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, descriptorEnd, descriptorBegin, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, visibility);
-        }
-
-        m_NumDescriptors = descriptorEnd;
-
-        AZ::u32 lastSamplers = m_NumDynamicSamplers;
-        AZ::u32 currentSamplers = m_NumDynamicSamplers;
-
-        if (bindings.m_Samplers.m_DescriptorCount)
-        {
-            auto& ranges = bindings.m_Samplers.m_Ranges;
-            for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-            {
-                const ReflectedBindingRange range = ranges[rangeIdx];
-                AZ::u32 rangeBegin = range.m_ShaderRegister;
-                AZ::u32 rangeEnd = range.m_ShaderRegister + range.m_Count;
-
-                if (!range.m_bUsed)
-                {
-                    // Setup the configuration of the root signature entry (a constant dummy UAV in this case)
-                    for (AZ::u32 rootParameterIdx = rangeBegin; rootParameterIdx < rangeEnd; ++rootParameterIdx)
-                    {
-                        __debugbreak();
-                        //                      m_StaticSamplers[m_NumStaticSamplers++].Init(rj, 0, ..., static_cast<D3D12_SHADER_VISIBILITY>((stage + 1) % (D3D12_SHADER_VISIBILITY_PIXEL + 1)));
-                    }
-
-                    continue;
-                }
-
-                // Setup the configuration of the descriptor table range (a number of Samplers in this case)
-                m_DescRanges[rangeCursorEnd++].Init(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, range.m_Count, range.m_ShaderRegister);
-
-                for (size_t shaderRegister = rangeBegin; shaderRegister < rangeEnd; ++shaderRegister)
-                {
-                    ResourceLayoutBinding bindingLayout;
-                    ZeroStruct(bindingLayout);
-
-                    bindingLayout.ViewType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
-                    bindingLayout.ShaderStage = shaderStage;
-                    bindingLayout.ShaderSlot = shaderRegister;
-#ifdef GFX_DEBUG
-                    bindingLayout.DescriptorOffset = currentSamplers;
-#endif
-                    m_Samplers.push_back(bindingLayout);
-                    ++currentSamplers;
-                }
-
-                if constexpr (!(DX12_DESCRIPTORTABLE_MERGERANGES_MODE & DX12_DESCRIPTORTABLE_MERGERANGES_SMP))
-                {
-                    MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, currentSamplers, lastSamplers, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, visibility);
-                }
-            }
-        }
-
-        if constexpr (bool(DX12_DESCRIPTORTABLE_MERGERANGES_MODE & DX12_DESCRIPTORTABLE_MERGERANGES_SMP))
-        {
-            MakeDescriptorTable(rangeCursorEnd, rangeCursorBegin, currentSamplers, lastSamplers, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, visibility);
-        }
-
-        m_NumDynamicSamplers = currentSamplers;
-        m_DescRangeCursor = rangeCursorEnd;
-    }
-
-    void PipelineLayout::DebugPrint() const
-    {
-        DX12_LOG("Root Signature:");
-        for (AZ::u32 p = 0, r = 0; p < m_NumRootParameters; ++p)
-        {
-            DX12_LOG(" %s: %c [%2d to %2d] -> %s [%2d to %2d]",
-                m_RootParameters[p].ShaderVisibility == D3D12_SHADER_VISIBILITY_ALL      ? "Every    shader stage" :
-                m_RootParameters[p].ShaderVisibility == D3D12_SHADER_VISIBILITY_VERTEX   ? "Vertex   shader stage" :
-                m_RootParameters[p].ShaderVisibility == D3D12_SHADER_VISIBILITY_HULL     ? "Hull     shader stage" :
-                m_RootParameters[p].ShaderVisibility == D3D12_SHADER_VISIBILITY_DOMAIN   ? "Domain   shader stage" :
-                m_RootParameters[p].ShaderVisibility == D3D12_SHADER_VISIBILITY_GEOMETRY ? "Geometry shader stage" :
-                m_RootParameters[p].ShaderVisibility == D3D12_SHADER_VISIBILITY_PIXEL    ? "Pixel    shader stage" : "Unknown  shader stage",
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE && m_RootParameters[p].DescriptorTable.pDescriptorRanges->RangeType == D3D12_DESCRIPTOR_RANGE_TYPE_CBV ? 'C' :
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE && m_RootParameters[p].DescriptorTable.pDescriptorRanges->RangeType == D3D12_DESCRIPTOR_RANGE_TYPE_SRV ? 'T' :
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE && m_RootParameters[p].DescriptorTable.pDescriptorRanges->RangeType == D3D12_DESCRIPTOR_RANGE_TYPE_UAV ? 'U' :
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE && m_RootParameters[p].DescriptorTable.pDescriptorRanges->RangeType == D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER ? 'S' :
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_CBV ? 'c' :
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_SRV ? 't' :
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_UAV ? 'u' : '?',
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE ? m_RootParameters[p].DescriptorTable.pDescriptorRanges->BaseShaderRegister : m_RootParameters[p].Descriptor.ShaderRegister,
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE ? m_RootParameters[p].DescriptorTable.pDescriptorRanges->BaseShaderRegister + m_RootParameters[p].DescriptorTable.pDescriptorRanges->NumDescriptors : 1,
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE ? "descriptor table" :
-                m_RootParameters[p].ParameterType != D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS ? "descriptor" : "32bit constant",
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE ? m_DescriptorTables[r].m_Offset : -1,
-                m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE ? m_DescriptorTables[r].m_Offset + m_RootParameters[p].DescriptorTable.pDescriptorRanges->NumDescriptors : -1);
-
-            r += m_RootParameters[p].ParameterType == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
-        }
-    }
-
-    RootSignature::RootSignature(Device* device)
-        : DeviceObject(device)
-        , m_nodeMask(0)
-    {
-    }
-
-    RootSignature::~RootSignature()
-    {
-    }
-
-    bool RootSignature::Init(const ComputeInitParams& params)
-    {
-        m_PipelineLayout.Build(params.m_ComputeShader);
-        return Init(CommandModeCompute);
-    }
-
-    bool RootSignature::Init(const GraphicsInitParams& params)
-    {
-        m_PipelineLayout.Build(
-            params.m_VertexShader,
-            params.m_HullShader ,
-            params.m_DomainShader,
-            params.m_GeometryShader,
-            params.m_PixelShader);
-
-        return Init(CommandModeGraphics);
-    }
-
-    bool RootSignature::Init(PipelineLayout& pipelineLayout, CommandMode commandType)
-    {
-        m_PipelineLayout = pipelineLayout;
-        return Init(commandType);
-    }
-
-    bool RootSignature::Init(CommandMode commandType)
-    {
-        ID3D12RootSignature* rootSign = NULL;
-        CD3DX12_ROOT_SIGNATURE_DESC descRootSignature;
-
-        if (commandType == CommandModeGraphics)
-        {
-            D3D12_ROOT_SIGNATURE_FLAGS flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
-            flags |= (m_PipelineLayout.m_ShaderStageAccess & BIT(ESS_Vertex)) == 0 ? D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS : D3D12_ROOT_SIGNATURE_FLAG_NONE;
-            flags |= (m_PipelineLayout.m_ShaderStageAccess & BIT(ESS_Hull)) == 0 ? D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS : D3D12_ROOT_SIGNATURE_FLAG_NONE;
-            flags |= (m_PipelineLayout.m_ShaderStageAccess & BIT(ESS_Domain)) == 0 ? D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS : D3D12_ROOT_SIGNATURE_FLAG_NONE;
-            flags |= (m_PipelineLayout.m_ShaderStageAccess & BIT(ESS_Geometry)) == 0 ? D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS : D3D12_ROOT_SIGNATURE_FLAG_NONE;
-            flags |= (m_PipelineLayout.m_ShaderStageAccess & BIT(ESS_Pixel)) == 0 ? D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS : D3D12_ROOT_SIGNATURE_FLAG_NONE;
-
-            descRootSignature.Init(
-                m_PipelineLayout.m_NumRootParameters,
-                m_PipelineLayout.m_RootParameters,
-                m_PipelineLayout.m_NumStaticSamplers,
-                m_PipelineLayout.m_StaticSamplers,
-                flags);
-        }
-        else
-        {
-            descRootSignature.Init(
-                m_PipelineLayout.m_NumRootParameters,
-                m_PipelineLayout.m_RootParameters,
-                0, NULL,
-                D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS |
-                D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
-                D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
-                D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS |
-                D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS);
-        }
-
-        {
-            ID3DBlob* pOutBlob = NULL;
-            ID3DBlob* pErrorBlob = NULL;
-
-            if (S_OK != D3D12SerializeRootSignature(&descRootSignature, D3D_ROOT_SIGNATURE_VERSION_1, &pOutBlob, &pErrorBlob))
-            {
-                DX12_ERROR("Could not serialize root signature!");
-                return false;
-            }
-
-            if (S_OK != GetDevice()->GetD3D12Device()->CreateRootSignature(m_nodeMask, pOutBlob->GetBufferPointer(), pOutBlob->GetBufferSize(), IID_GRAPHICS_PPV_ARGS(&rootSign)))
-            {
-                DX12_ERROR("Could not create root signature!");
-                return false;
-            }
-
-            if (pOutBlob)
-            {
-                pOutBlob->Release();
-            }
-
-            if (pErrorBlob)
-            {
-                pErrorBlob->Release();
-            }
-        }
-
-        m_pRootSignature = rootSign;
-        rootSign->Release();
-        return true;
-    }
-
-    RootSignatureCache::RootSignatureCache()
-    {
-    }
-
-    RootSignatureCache::~RootSignatureCache()
-    {
-    }
-
-    bool RootSignatureCache::Init(Device* device)
-    {
-        m_pDevice = device;
-        return true;
-    }
-
-    static const THash ComputeBit = 1;
-
-    RootSignature* RootSignatureCache::AcquireRootSignature(const RootSignature::GraphicsInitParams& params)
-    {
-        struct HashKey
-        {
-            AZ::u32 vs;
-            AZ::u32 hs;
-            AZ::u32 ds;
-            AZ::u32 gs;
-            AZ::u32 ps;
-        } hashKey;
-
-        hashKey.vs = params.m_VertexShader   ? params.m_VertexShader->GetReflectedBindingHash()   : 0;
-        hashKey.hs = params.m_HullShader     ? params.m_HullShader->GetReflectedBindingHash()     : 0;
-        hashKey.ds = params.m_DomainShader   ? params.m_DomainShader->GetReflectedBindingHash()   : 0;
-        hashKey.gs = params.m_GeometryShader ? params.m_GeometryShader->GetReflectedBindingHash() : 0;
-        hashKey.ps = params.m_PixelShader    ? params.m_PixelShader->GetReflectedBindingHash()    : 0;
-
-        // LSB filled marks compute pipeline states, in case graphics and compute hashes collide
-        THash hash = ~ComputeBit & ComputeSmallHash<sizeof(HashKey)>(&hashKey);
-        {
-            auto iter = m_RootSignatureMap.find(hash);
-            if (iter != m_RootSignatureMap.end())
-            {
-                return iter->second.get();
-            }
-        }
-
-        RootSignature* result = new RootSignature(m_pDevice);
-        if (!result->Init(params))
-        {
-            DX12_ERROR("Could not create root signature!");
-            return nullptr;
-        }
-
-        m_RootSignatureMap[hash] = result;
-        return result;
-    }
-
-    RootSignature* RootSignatureCache::AcquireRootSignature(const RootSignature::ComputeInitParams& params)
-    {
-        THash hash = ComputeBit | params.m_ComputeShader->GetReflectedBindingHash();
-        {
-            auto iter = m_RootSignatureMap.find(hash);
-            if (iter != m_RootSignatureMap.end())
-            {
-                return iter->second;
-            }
-        }
-
-        RootSignature* result = new RootSignature(m_pDevice);
-        if (!result->Init(params))
-        {
-            DX12_ERROR("Could not create root signature!");
-            return nullptr;
-        }
-
-        m_RootSignatureMap[hash] = result;
-        return result;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12RootSignature.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12RootSignature.hpp
deleted file mode 100644
index 9747d7eb45..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12RootSignature.hpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __DX12ROOTSIGNATURE__
-#define __DX12ROOTSIGNATURE__
-
-#include "DX12Shader.hpp"
-#include <XRenderD3D9/DeviceManager/Enums.h>
-
-namespace DX12
-{
-    // Map of all <stage,slot> pairs to descriptor-tables offsets (the CBV+SRV+UAV/SMP index is the offset)
-    struct ResourceLayoutBinding
-    {
-        D3D12_DESCRIPTOR_RANGE_TYPE ViewType;
-        EShaderStage ShaderStage;
-        uint8_t ShaderSlot;
-#ifdef GFX_DEBUG
-        uint8_t DescriptorOffset;
-#endif // !NDEBUG
-    };
-
-    struct ConstantBufferLayoutBinding
-    {
-        EShaderStage ShaderStage;
-        uint8_t ShaderSlot;
-        uint8_t RootParameterIndex;
-    };
-
-    struct PipelineLayout
-    {
-        std::vector<ConstantBufferLayoutBinding> m_ConstantViews;
-        std::vector<ResourceLayoutBinding> m_TableResources;
-        std::vector<ResourceLayoutBinding> m_Samplers;
-
-        AZ::u32 m_ShaderStageAccess;
-
-        // Memory holding all descriptor-ranges which will be added to the root-signature (basically a heap)
-        CD3DX12_DESCRIPTOR_RANGE m_DescRanges[256];
-        AZ::u32 m_DescRangeCursor;
-
-        // Consecutive list of all root-parameter descriptions of all types (points to m_DescRanges)
-        CD3DX12_ROOT_PARAMETER m_RootParameters[256];
-        AZ::u32 m_NumRootParameters;
-
-        // Static samplers, directly embedded in the shaders once PSO is created with correspondig root signature
-        D3D12_STATIC_SAMPLER_DESC m_StaticSamplers[16];
-        AZ::u32 m_NumStaticSamplers;
-
-        // Consecutive list of all descriptor-tables which are in the root-signature (without holes)
-        struct DescriptorTableInfo
-        {
-            D3D12_DESCRIPTOR_HEAP_TYPE m_Type;
-            AZ::u32 m_Offset;
-        };
-
-        DescriptorTableInfo m_DescriptorTables[256];
-        AZ::u32 m_NumDescriptorTables;
-
-        // Total number of resources bound to all shader stages (CBV+SRV+UAV)
-        size_t m_NumDescriptors;
-
-        // Total number of samplers bound to all shader stages
-        size_t m_NumDynamicSamplers;
-
-        PipelineLayout();
-
-        void Build(Shader* vs, Shader* hs, Shader* ds, Shader* gs, Shader* ps);
-        void Build(Shader* cs);
-
-        void Clear();
-        void DebugPrint() const;
-
-    private:
-        void AppendDescriptorTables(Shader* pShader, EShaderStage eStage);
-        void AppendRootConstantBuffers(Shader* pShader, EShaderStage eStage);
-        void MakeDescriptorTable(AZ::u32 currentRangeCursor, AZ::u32& lastRangeCursor, AZ::u32 currentOffset, AZ::u32& lastOffset, D3D12_DESCRIPTOR_HEAP_TYPE eHeap, D3D12_SHADER_VISIBILITY eVisibility);
-    };
-
-    class RootSignature
-        : public DeviceObject
-    {
-    public:
-        struct GraphicsInitParams
-        {
-            Shader* m_VertexShader;
-            Shader* m_HullShader;
-            Shader* m_DomainShader;
-            Shader* m_GeometryShader;
-            Shader* m_PixelShader;
-        };
-
-        struct ComputeInitParams
-        {
-            Shader* m_ComputeShader;
-        };
-
-        RootSignature(Device* device);
-        ~RootSignature();
-
-        bool Init(const GraphicsInitParams& params);
-        bool Init(const ComputeInitParams& params);
-        bool Init(PipelineLayout& resourceMappings, CommandMode commandType);
-
-        inline THash GetHash() const
-        {
-            return m_Hash;
-        }
-
-        inline const PipelineLayout& GetPipelineLayout() const
-        {
-            return m_PipelineLayout;
-        }
-
-        inline ID3D12RootSignature* GetD3D12RootSignature() const
-        {
-            return /*PassAddRef*/ (m_pRootSignature);
-        }
-
-    private:
-        bool Init(CommandMode commandType);
-
-        PipelineLayout m_PipelineLayout;
-        SmartPtr<ID3D12RootSignature> m_pRootSignature;
-        AZ::u32 m_nodeMask;
-        THash m_Hash;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    class RootSignatureCache
-    {
-    public:
-        RootSignatureCache();
-        ~RootSignatureCache();
-
-        bool Init(Device* device);
-
-        RootSignature* AcquireRootSignature(const RootSignature::ComputeInitParams& params);
-        RootSignature* AcquireRootSignature(const RootSignature::GraphicsInitParams& params);
-
-    private:
-        Device* m_pDevice;
-
-        AZStd::unordered_map<THash, SmartPtr<RootSignature>> m_RootSignatureMap;
-    };
-}
-
-#endif // __DX12ROOTSIGNATURE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SamplerState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SamplerState.cpp
deleted file mode 100644
index 82a176fe6a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SamplerState.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12SamplerState.hpp"
-
-namespace DX12
-{
-    //---------------------------------------------------------------------------------------------------------------------
-    SamplerState::SamplerState()
-        : AzRHI::ReferenceCounted()
-        , m_DescriptorHandle(INVALID_CPU_DESCRIPTOR_HANDLE)
-    {
-        // clear before use
-        memset(&m_unSamplerDesc, 0, sizeof(m_unSamplerDesc));
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    SamplerState::~SamplerState()
-    {
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SamplerState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SamplerState.hpp
deleted file mode 100644
index af11c2b9db..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SamplerState.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12Base.hpp"
-
-namespace DX12
-{
-    class SamplerState : public AzRHI::ReferenceCounted
-    {
-    public:
-        SamplerState();
-        virtual ~SamplerState();
-
-        D3D12_SAMPLER_DESC& GetSamplerDesc()
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL));
-            return m_unSamplerDesc;
-        }
-        const D3D12_SAMPLER_DESC& GetSamplerDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL));
-            return m_unSamplerDesc;
-        }
-
-        void SetDescriptorHandle(const D3D12_CPU_DESCRIPTOR_HANDLE& descriptorHandle) { m_DescriptorHandle = descriptorHandle; }
-        D3D12_CPU_DESCRIPTOR_HANDLE GetDescriptorHandle() const { return m_DescriptorHandle; }
-
-    private:
-        D3D12_CPU_DESCRIPTOR_HANDLE m_DescriptorHandle;
-
-        union
-        {
-            D3D12_SAMPLER_DESC m_unSamplerDesc;
-        };
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Shader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Shader.cpp
deleted file mode 100644
index 2ee987c52f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Shader.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12Shader.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define DX12SHADER_CPP_SECTION_1 1
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12SHADER_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12Shader_cpp)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #include <d3d11shader.h>
-    #include <d3dcompiler.h>
-#endif
-
-namespace DX12
-{
-    namespace
-    {
-        AZ::u32 MakeHashFromDesc(const D3D11_SHADER_DESC& desc11)
-        {
-            // Don't hash pointers. Hashing pointers will make the hash inconsistent between multiple app runs. Making it consistent allows the objects to be serialized to disk and reloaded
-            // on subsequent runs.
-            D3D11_SHADER_DESC noPointers = desc11;
-            noPointers.Creator = nullptr;
-            return DX12::ComputeSmallHash<sizeof(D3D11_SHADER_DESC)>(&noPointers);
-        }
-
-        AZ::u32 MakeHashFromBindings(ReflectedBindings& bindings)
-        {
-            const ReflectedBindingRangeList* lists[] =
-            {
-                &bindings.m_ConstantBuffers,
-                &bindings.m_InputResources,
-                &bindings.m_OutputResources,
-                &bindings.m_Samplers
-            };
-
-            AZ::Crc32 hash = 0;
-
-            for (AZ::u32 i = 0; i < AZ_ARRAY_SIZE(lists); ++i)
-            {
-                const ReflectedBindingRangeList& list = *lists[i];
-                if (list.m_DescriptorCount)
-                {
-                    hash.Add(&i, sizeof(AZ::u32));
-                    hash.Add(list.m_Ranges.data(), list.m_Ranges.size() * sizeof(ReflectedBindingRange));
-                }
-            }
-
-            return hash;
-        }
-
-        void AppendResourceToRanges(
-            ReflectedBindingRangeList& bindings,
-            AZ::u8 shaderRegister,
-            AZ::u8 count,
-            AZ::u8 type,
-            AZ::u8 dimension,
-            bool bUsed = true,
-            bool bShared = false,
-            bool bMergeable = true)
-        {
-            AZ::u32 rangeIdx = 0;
-            AZ::u32 rangeCount = bindings.m_Ranges.size();
-
-            // Attempts to merge a resource into an existing range. We can do this if
-            // the resource is marked as mergeable, and it's not shared across different
-            // shader stages.
-            bool bMerged = false;
-
-            if (bMergeable && !bShared)
-            {
-                for (; rangeIdx < rangeCount; ++rangeIdx)
-                {
-                    ReflectedBindingRange& r = bindings.m_Ranges[rangeIdx];
-                    if (r.m_bMergeable || r.m_bShared || (r.m_bUsed != bUsed))
-                    {
-                        continue; // Non-Mergeable
-                    }
-
-                    // Can we join new range with an existing one?
-                    if (r.m_ShaderRegister + r.m_Count == shaderRegister)
-                    {
-#ifdef GFX_DEBUG
-                        for (size_t j = 0; j < count; ++j)
-                        {
-                            r.m_Types[r.m_Count + j] = type;
-                            r.m_Dimensions[r.m_Count + j] = dimension;
-                        }
-#endif
-
-                        r.m_Count += count;
-                        bMerged = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!bMerged)
-            {
-                bindings.m_Ranges.push_back(ReflectedBindingRange(shaderRegister, count, type, dimension, bUsed, bShared, bMergeable));
-            }
-
-            bindings.m_DescriptorCount += count;
-        }
-    }
-
-    Shader::Shader(Device* device)
-        : DeviceObject(device)
-    {}
-
-    Shader::~Shader()
-    {}
-
-    Shader* Shader::CreateFromD3D11(Device* device, const D3D12_SHADER_BYTECODE& byteCode)
-    {
-        ID3D11ShaderReflection* shaderReflection = NULL;
-
-        // Reflect shader internals
-        if (S_OK != D3DReflect(byteCode.pShaderBytecode, byteCode.BytecodeLength, IID_ID3D11ShaderReflection, (void**)&shaderReflection))
-        {
-            DX12_ASSERT(0, "Could not do a shader reflection!");
-            return NULL;
-        }
-
-        D3D11_SHADER_DESC desc11;
-        shaderReflection->GetDesc(&desc11);
-
-        Shader* result = DX12::PassAddRef(new Shader(device));
-        result->m_Bytecode = byteCode;
-        result->m_hash = MakeHashFromDesc(desc11);
-
-        for (UINT i = 0; i < desc11.BoundResources; ++i)
-        {
-            D3D11_SHADER_INPUT_BIND_DESC bindDesc11;
-            shaderReflection->GetResourceBindingDesc(i, &bindDesc11);
-
-            bool bBindPointUsed = true;
-            bool bBindingSharable =
-                bindDesc11.BindPoint == eConstantBufferShaderSlot_PerMaterial ||
-                bindDesc11.BindPoint == eConstantBufferShaderSlot_PerPass ||
-                bindDesc11.BindPoint == eConstantBufferShaderSlot_PerView ||
-                bindDesc11.BindPoint == eConstantBufferShaderSlot_PerFrame;
-
-            bool bBindingMergeable = bindDesc11.BindPoint > eConstantBufferShaderSlot_PerInstanceLegacy;
-
-            switch (bindDesc11.Type)
-            {
-            case D3D10_SIT_CBUFFER:
-                DX12_ASSERT(bindDesc11.BindCount == 1, "Arrays of ConstantBuffers are not allowed!");
-
-                if (bindDesc11.BindCount == 1)
-                {
-                    ID3D11ShaderReflectionConstantBuffer* constantBuffer = shaderReflection->GetConstantBufferByName(bindDesc11.Name);
-                    D3D11_SHADER_BUFFER_DESC constantBufferDesc;
-                    UINT variableUsedCount = 0;
-
-                    constantBuffer->GetDesc(&constantBufferDesc);
-                    for (UINT j = 0; j < constantBufferDesc.Variables; j++)
-                    {
-                        ID3D11ShaderReflectionVariable* variable = constantBuffer->GetVariableByIndex(j);
-                        D3D11_SHADER_VARIABLE_DESC variableDesc;
-                        variable->GetDesc(&variableDesc);
-
-                        variableUsedCount += (variableDesc.uFlags & D3D10_SVF_USED);
-                    }
-
-                    bBindPointUsed = (variableUsedCount > 0);
-                }
-
-                // We need separate descriptor tables for dynamic CB's
-                AppendResourceToRanges(
-                    result->m_Bindings.m_ConstantBuffers,
-                    bindDesc11.BindPoint,
-                    bindDesc11.BindCount,
-                    static_cast<UINT8>(bindDesc11.Type),
-                    static_cast<UINT8>(bindDesc11.Dimension),
-                    bBindPointUsed,
-                    bBindingSharable,
-                    bBindingMergeable);
-                break;
-
-            // ID3D12Device::CreateGraphicsPipelineState: SRV or UAV root descriptors can only be Raw or Structured buffers.
-            case D3D10_SIT_TEXTURE:
-            case D3D10_SIT_TBUFFER:
-                AppendResourceToRanges(
-                    result->m_Bindings.m_InputResources,
-                    bindDesc11.BindPoint,
-                    bindDesc11.BindCount,
-                    static_cast<UINT8>(bindDesc11.Type),
-                    static_cast<UINT8>(bindDesc11.Dimension));
-                break;
-            case D3D11_SIT_STRUCTURED:
-            case D3D11_SIT_BYTEADDRESS:
-                AppendResourceToRanges(
-                    result->m_Bindings.m_InputResources,
-                    bindDesc11.BindPoint,
-                    bindDesc11.BindCount,
-                    static_cast<UINT8>(bindDesc11.Type),
-                    static_cast<UINT8>(bindDesc11.Dimension),
-                    bBindPointUsed);
-                break;
-
-            case D3D11_SIT_UAV_RWTYPED:
-                AppendResourceToRanges(
-                    result->m_Bindings.m_OutputResources,
-                    bindDesc11.BindPoint,
-                    bindDesc11.BindCount,
-                    static_cast<UINT8>(bindDesc11.Type),
-                    static_cast<UINT8>(bindDesc11.Dimension));
-                break;
-            case D3D11_SIT_UAV_RWSTRUCTURED:
-            case D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER:
-            case D3D11_SIT_UAV_RWBYTEADDRESS:
-            case D3D11_SIT_UAV_APPEND_STRUCTURED:
-            case D3D11_SIT_UAV_CONSUME_STRUCTURED:
-                AppendResourceToRanges(result->m_Bindings.m_OutputResources,
-                    bindDesc11.BindPoint,
-                    bindDesc11.BindCount,
-                    static_cast<UINT8>(bindDesc11.Type),
-                    static_cast<UINT8>(bindDesc11.Dimension),
-                    bBindPointUsed);
-                break;
-
-            case D3D10_SIT_SAMPLER:
-                DX12_ASSERT(bindDesc11.BindCount == 1, "Arrays of SamplerStates are not allowed!");
-                AppendResourceToRanges(
-                    result->m_Bindings.m_Samplers,
-                    bindDesc11.BindPoint,
-                    bindDesc11.BindCount,
-                    static_cast<UINT8>(bindDesc11.Type),
-                    static_cast<UINT8>(bindDesc11.Dimension));
-                break;
-            }
-        }
-
-        result->m_BindingHash = MakeHashFromBindings(result->m_Bindings);
-        return result;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Shader.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Shader.hpp
deleted file mode 100644
index 9f501ebad7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12Shader.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __DX12SHADER__
-#define __DX12SHADER__
-
-#include "DX12Base.hpp"
-
-namespace DX12
-{
-    enum EShaderStage : int8
-    {
-        // Graphics pipeline
-        ESS_Vertex,
-        ESS_Hull,
-        ESS_Domain,
-        ESS_Geometry,
-        ESS_Pixel,
-
-        // Compute pipeline
-        ESS_Compute,
-
-        // Complete pipeline
-        ESS_All = ESS_Compute,
-
-        ESS_LastWithoutCompute = ESS_Compute,
-        ESS_Num = ESS_Compute + 1,
-        ESS_None = -1,
-        ESS_First = ESS_Vertex
-    };
-
-    struct ReflectedBindingRange
-    {
-        AZ::u8 m_ShaderRegister;
-        AZ::u8 m_Count;
-
-        // Whether the bind point is actually used in the shader. Ideally, this is compiled out, but in order to support
-        // lower tier hardware we have to define a root parameter and bind a null descriptor for it.
-        AZ::u8 m_bUsed : 1;
-
-        // Shared bindings are marked as visible across all shader stages. Practically, this means the binding
-        // is not merged and will be de-duplicated when the final layout is built. Candidates for sharing are constant
-        // buffers that are accessed by every stage and have a well-defined layout across all stages.
-        AZ::u8 m_bShared : 1;
-
-        // We currently merge any range where the layout contents aren't reflected by the shader. Practically,
-        // this means that any constant buffer that's reflected gets placed into a root constant buffer parameter.
-        AZ::u8 m_bMergeable : 1;
-
-#ifdef GFX_DEBUG
-        AZ::u8 m_Types[56];
-        AZ::u8 m_Dimensions[56];
-#endif
-
-        ReflectedBindingRange()
-            : m_ShaderRegister(0)
-            , m_Count(0)
-            , m_bUsed(true)
-            , m_bShared(false)
-            , m_bMergeable(true)
-        {}
-
-        ReflectedBindingRange(
-            AZ::u8 shaderRegister,
-            AZ::u8 count,
-            [[maybe_unused]] AZ::u8 type,
-            [[maybe_unused]] AZ::u8 dimension,
-            bool bUsed,
-            bool bShared,
-            bool bMergeable)
-            : m_ShaderRegister(shaderRegister)
-            , m_Count(count)
-            , m_bUsed(bUsed)
-            , m_bShared(bShared)
-            , m_bMergeable(bMergeable)
-        {
-#ifdef GFX_DEBUG
-            for (AZ::u32 i = 0; i < count; ++i)
-            {
-                m_Types[i] = type;
-                m_Dimensions[i] = dimension;
-            }
-#endif
-        }
-    };
-
-    struct ReflectedBindingRangeList
-    {
-        std::vector<ReflectedBindingRange> m_Ranges;
-        AZ::u32 m_DescriptorCount;
-
-        ReflectedBindingRangeList()
-            : m_DescriptorCount(0)
-        {}
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    struct ReflectedBindings
-    {
-        ReflectedBindingRangeList m_ConstantBuffers;    // CBV
-        ReflectedBindingRangeList m_InputResources;     // SRV
-        ReflectedBindingRangeList m_OutputResources;    // UAV
-        ReflectedBindingRangeList m_Samplers;           // SMP
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    class Shader : public DeviceObject
-    {
-    public:
-        // Create new shader using DX11 reflection interface
-        static Shader* CreateFromD3D11(Device* device, const D3D12_SHADER_BYTECODE& byteCode);
-
-        Shader(Device* device);
-
-        const AZ::Crc32 GetHash() const
-        {
-            return m_hash;
-        }
-
-        const ReflectedBindings& GetReflectedBindings() const
-        {
-            return m_Bindings;
-        }
-
-        const AZ::u32 GetReflectedBindingHash() const
-        {
-            return m_BindingHash;
-        }
-
-    protected:
-        virtual ~Shader();
-
-    private:
-
-        D3D12_SHADER_BYTECODE m_Bytecode;
-        ReflectedBindings m_Bindings;
-        AZ::u32 m_BindingHash = 0;
-        AZ::Crc32 m_hash;
-    };
-}
-
-#endif // __DX12SHADER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SwapChain.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SwapChain.cpp
deleted file mode 100644
index a025eff446..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SwapChain.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12SwapChain.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DX12SWAPCHAIN_CPP_SECTION_1 1
-#endif
-
-namespace DX12
-{
-    SwapChain* SwapChain::Create(
-        CommandList* commandList,
-        IDXGIFactory1* pFactory,
-        DXGI_SWAP_CHAIN_DESC* pDesc)
-    {
-        IDXGISwapChain* dxgiSwapChain = NULL;
-        IDXGISwapChain3* dxgiSwapChain3 = NULL;
-        ID3D12CommandQueue* commandQueue = commandList->GetD3D12CommandQueue();
-
-        // If discard isn't implemented/supported/fails, try the newer swap-types
-        // - flip_discard is win 10
-        // - flip_sequentially is win 8
-        HRESULT hr;
-        if (pDesc->SwapEffect == DXGI_SWAP_EFFECT_DISCARD)
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DX12SWAPCHAIN_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DX12SwapChain_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else 
-            pDesc->SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
-#endif
-            pDesc->BufferCount = std::max(2U, pDesc->BufferCount);
-            hr = pFactory->CreateSwapChain(commandQueue, pDesc, &dxgiSwapChain);
-        }
-        else if (pDesc->SwapEffect == DXGI_SWAP_EFFECT_SEQUENTIAL)
-        {
-            pDesc->SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
-            pDesc->BufferCount = std::max(2U, pDesc->BufferCount);
-            hr = pFactory->CreateSwapChain(commandQueue, pDesc, &dxgiSwapChain);
-        }
-        else
-        {
-            hr = pFactory->CreateSwapChain(commandQueue, pDesc, &dxgiSwapChain);
-        }
-
-        if (hr == S_OK && dxgiSwapChain)
-        {
-            hr = dxgiSwapChain->QueryInterface(IID_PPV_ARGS(&dxgiSwapChain3));
-            dxgiSwapChain->Release();
-
-            if (hr == S_OK && dxgiSwapChain3)
-            {
-                return DX12::PassAddRef(new SwapChain(commandList, dxgiSwapChain3, pDesc));
-            }
-        }
-
-        return nullptr;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    SwapChain::SwapChain(CommandList* commandList, IDXGISwapChain3* dxgiSwapChain, DXGI_SWAP_CHAIN_DESC* pDesc)
-        : AzRHI::ReferenceCounted()
-        , m_CommandList(commandList)
-        , m_AsyncQueue(commandList->GetCommandListPool().GetAsyncCommandQueue())
-    {
-        if (pDesc)
-        {
-            m_Desc = *pDesc;
-        }
-        else
-        {
-            dxgiSwapChain->GetDesc(&m_Desc);
-        }
-
-        m_NativeSwapChain = dxgiSwapChain;
-        dxgiSwapChain->Release();
-    }
-
-    SwapChain::~SwapChain()
-    {
-        ForfeitBuffers();
-
-        m_NativeSwapChain->Release();
-    }
-
-    HRESULT SwapChain::Present(AZ::u32 SyncInterval, AZ::u32 Flags)
-    {
-        m_AsyncQueue.Flush();
-
-        HRESULT hr = m_NativeSwapChain->Present(SyncInterval, Flags);
-        return hr;
-    }
-
-    void SwapChain::AcquireBuffers(AZStd::vector<Resource*>&& buffers)
-    {
-        AZ_Assert(m_BackBuffers.empty(), "must forfeit buffers before assigning");
-
-        m_BackBuffers = std::move(buffers);
-        m_BackBufferViews.reserve(buffers.size());
-        for (Resource* buffer : m_BackBuffers)
-        {
-            m_BackBufferViews.emplace_back();
-            m_BackBufferViews.back().Init(*buffer, EVT_RenderTargetView);
-        }
-    }
-
-    void SwapChain::ForfeitBuffers()
-    {
-        AZ_TRACE_METHOD();
-        m_BackBuffers.clear();
-        m_BackBufferViews.clear();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SwapChain.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SwapChain.hpp
deleted file mode 100644
index 04e2611f53..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12SwapChain.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __DX12SWAPCHAIN__
-#define __DX12SWAPCHAIN__
-
-#include "DX12Base.hpp"
-#include "DX12CommandList.hpp"
-#include "DX12AsyncCommandQueue.hpp"
-
-#include <AzCore/std/containers/vector.h>
-
-class CCryDX12SwapChain;
-
-namespace DX12
-{
-    class SwapChain : public AzRHI::ReferenceCounted
-    {
-    public:
-        static SwapChain* Create(CommandList* pDevice, IDXGIFactory1* factory, DXGI_SWAP_CHAIN_DESC* pDesc);
-
-    protected:
-        SwapChain(CommandList* pDevice, IDXGISwapChain3* dxgiSwapChain, DXGI_SWAP_CHAIN_DESC* pDesc);
-
-        virtual ~SwapChain();
-
-    public:
-        inline IDXGISwapChain3* GetDXGISwapChain() const
-        {
-            return m_NativeSwapChain;
-        }
-
-        inline Resource& GetBackBuffer(AZ::u32 index)
-        {
-            Resource* resource = m_BackBuffers[index];
-            AZ_Assert(resource, "null backbuffer");
-            return *resource;
-        }
-        inline Resource& GetCurrentBackBuffer()
-        {
-            Resource* resource = m_BackBuffers[m_NativeSwapChain->GetCurrentBackBufferIndex()];
-            AZ_Assert(resource, "Resource is null");
-            return *resource;
-        }
-
-        inline ResourceView& GetBackBufferView(AZ::u32 index)
-        {
-            return m_BackBufferViews[index];
-        }
-
-        inline ResourceView& GetCurrentBackBufferView()
-        {
-            return m_BackBufferViews[m_NativeSwapChain->GetCurrentBackBufferIndex()];
-        }
-
-        inline AZ::u32 GetCurrentBackBufferIndex() const
-        {
-            return m_NativeSwapChain->GetCurrentBackBufferIndex();
-        }
-
-        inline const DXGI_SWAP_CHAIN_DESC& GetDesc() const
-        {
-            return m_Desc;
-        }
-
-        HRESULT Present(AZ::u32 SyncInterval, AZ::u32 Flags);
-
-    private:
-        friend class ::CCryDX12SwapChain;
-        void AcquireBuffers(AZStd::vector<Resource*>&& resource);
-        void ForfeitBuffers();
-
-        AsyncCommandQueue& m_AsyncQueue;
-        CommandList* m_CommandList;
-
-        DXGI_SWAP_CHAIN_DESC m_Desc;
-
-        SmartPtr<IDXGISwapChain3> m_NativeSwapChain;
-
-        AZStd::vector<Resource*> m_BackBuffers;
-        AZStd::vector<ResourceView> m_BackBufferViews;
-    };
-}
-
-#endif // __DX12SWAPCHAIN__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12TimerHeap.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12TimerHeap.cpp
deleted file mode 100644
index 47b8e81b83..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12TimerHeap.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12TimerHeap.h"
-#include "DX12CommandList.hpp"
-
-namespace DX12
-{
-    TimerHeap::TimerHeap(Device& device)
-        : m_TimerCountMax{}
-        , m_TimestampDownloadBuffer{}
-        , m_TimestampHeap{ &device }
-    {}
-
-    void TimerHeap::Init(AZ::u32 timerCountMax)
-    {
-        Shutdown();
-
-        D3D12_QUERY_HEAP_DESC m_Desc;
-        m_Desc.NodeMask = 1;
-        m_Desc.Type = D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
-        m_Desc.Count = timerCountMax * 2;
-
-        Device& device = *m_TimestampHeap.GetDevice();
-
-        m_TimerCountMax = timerCountMax;
-        m_TimestampHeap.Init(m_TimestampHeap.GetDevice(), m_Desc);
-
-        ID3D12Resource* resource = nullptr;
-        const CD3DX12_HEAP_PROPERTIES heapProperties(D3D12_HEAP_TYPE_READBACK);
-        const CD3DX12_RESOURCE_DESC timestampHeapBuffer = CD3DX12_RESOURCE_DESC::Buffer(sizeof(UINT64) * m_TimestampHeap.GetCapacity());
-        if (S_OK != device.GetD3D12Device()->CreateCommittedResource(
-            &heapProperties,
-            D3D12_HEAP_FLAG_NONE,
-            &timestampHeapBuffer,
-            D3D12_RESOURCE_STATE_COPY_DEST,
-            nullptr,
-            IID_GRAPHICS_PPV_ARGS(&resource)))
-        {
-            DX12_ERROR("Could not create intermediate timestamp download buffer!");
-        }
-
-        m_TimestampDownloadBuffer.attach(resource);
-        m_Timers.reserve(timerCountMax);
-    }
-
-    void TimerHeap::Shutdown()
-    {
-        m_TimestampHeap.Reset();
-        m_TimestampDownloadBuffer.reset();
-        m_Timers.clear();
-        m_TimerCountMax = 0;
-    }
-
-    void TimerHeap::Begin()
-    {
-        m_Timers.clear();
-    }
-
-    void TimerHeap::End(CommandList& commandList)
-    {
-        commandList.ResolveQueryData(m_TimestampHeap, D3D12_QUERY_TYPE_TIMESTAMP, 0, m_TimestampHeap.GetCapacity(), m_TimestampDownloadBuffer, 0);
-    }
-
-    TimerHandle TimerHeap::BeginTimer(CommandList& commandList, const char* name)
-    {
-        if (m_Timers.size() < m_TimerCountMax)
-        {
-            TimerHandle handle = TimerHandle(m_Timers.size());
-
-            m_Timers.emplace_back();
-
-            Timer& timer = m_Timers.back();
-            timer.m_Name = name;
-            timer.m_Duration = 0;
-            timer.m_Timestamp = 0;
-
-            commandList.EndQuery(m_TimestampHeap, D3D12_QUERY_TYPE_TIMESTAMP, handle * 2);
-            return handle;
-        }
-
-        return TimerHandle(-1);
-    }
-
-    void TimerHeap::EndTimer(CommandList& commandList, TimerHandle handle)
-    {
-        if (handle != TimerHandle(-1))
-        {
-            commandList.EndQuery(m_TimestampHeap, D3D12_QUERY_TYPE_TIMESTAMP, handle * 2 + 1);
-        }
-    }
-
-    void TimerHeap::ReadbackTimers()
-    {
-        AZ::u64* timestamps = nullptr;
-        const D3D12_RANGE readRange = { 0, sizeof(UINT64) * m_TimestampHeap.GetCapacity() };
-        m_TimestampDownloadBuffer->Map(0, &readRange, (void**)&timestamps);
-
-        Device& device = *m_TimestampHeap.GetDevice();
-
-        for (AZ::u64 i = 0; i < m_Timers.size(); ++i)
-        {
-            AZ::u64 timestampBegin = device.MakeCpuTimestampMicroseconds(timestamps[i * 2]);
-            AZ::u64 timestampEnd = device.MakeCpuTimestampMicroseconds(timestamps[i * 2 + 1]);
-
-            m_Timers[i].m_Timestamp = timestampBegin;
-            m_Timers[i].m_Duration = AZ::u32(timestampEnd - timestampBegin);
-        }
-
-        m_TimestampDownloadBuffer->Unmap(0, nullptr);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12TimerHeap.h b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12TimerHeap.h
deleted file mode 100644
index 095f47e241..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12TimerHeap.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DX12QueryHeap.hpp"
-
-#include <AzCore/std/containers/vector.h>
-
-#define DX12_GPU_PROFILE_MODE_OFF       0       // Turn off profiling
-#define DX12_GPU_PROFILE_MODE_BASIC     1       // Profiles command list lifetime
-#define DX12_GPU_PROFILE_MODE_DETAIL    2       // Profiles draw call state changes
-#define DX12_GPU_PROFILE_MODE DX12_GPU_PROFILE_MODE_OFF
-
-namespace DX12
-{
-    struct Timer
-    {
-        const char* m_Name;
-        AZ::u64 m_Timestamp;
-        AZ::u32 m_Duration;
-    };
-
-    class CommandList;
-
-    using TimerHandle = AZ::u32;
-
-    class TimerHeap
-    {
-    public:
-        TimerHeap(Device& device);
-
-        void Init(AZ::u32 timerCountMax);
-        void Shutdown();
-
-        void Begin();
-        void End(CommandList& commandList);
-
-        TimerHandle BeginTimer(CommandList& commandList, const char* name);
-        void EndTimer(CommandList& commandList, TimerHandle handle);
-
-        void ReadbackTimers();
-
-        const AZStd::vector<Timer>& GetTimers() const
-        {
-            return m_Timers;
-        }
-
-    private:
-        QueryHeap m_TimestampHeap;
-        SmartPtr<ID3D12Resource> m_TimestampDownloadBuffer;
-        AZStd::vector<Timer> m_Timers;
-        AZ::u32 m_TimerCountMax;
-    };
-
-    class ScopedTimer
-    {
-    public:
-        ScopedTimer(TimerHeap& timers, CommandList& commandList, const char* name)
-            : m_Timers(timers)
-            , m_CommandList(commandList)
-        {
-            m_Handle = timers.BeginTimer(commandList, name);
-        }
-
-        ~ScopedTimer()
-        {
-            m_Timers.EndTimer(m_CommandList, m_Handle);
-        }
-
-    private:
-        TimerHeap& m_Timers;
-        CommandList& m_CommandList;
-        TimerHandle m_Handle;
-    };
-}
-
-    // Conditionally disable timing at compile-time based on profile policy
-#if DX12_GPU_PROFILE_MODE == DX12_GPU_PROFILE_MODE_DETAIL
-#define DX12_COMMANDLIST_TIMER(name) DX12::ScopedTimer timer__(m_Timers, *this, name);
-#define DX12_COMMANDLIST_TIMER_DETAIL(name) DX12_COMMANDLIST_TIMER(name)
-#elif DX12_GPU_PROFILE_MODE == DX12_GPU_PROFILE_MODE_BASIC
-#define DX12_COMMANDLIST_TIMER(name) DX12::ScopedTimer timer__(m_Timers, *this, name);
-#define DX12_COMMANDLIST_TIMER_DETAIL(name)
-#else
-#define DX12_COMMANDLIST_TIMER(name)
-#define DX12_COMMANDLIST_TIMER_DETAIL(name)
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12View.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12View.cpp
deleted file mode 100644
index ecf2a3ad2f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12View.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "DX12View.hpp"
-#include "DX12Resource.hpp"
-#include "DX12SwapChain.hpp"
-
-namespace DX12
-{
-    //---------------------------------------------------------------------------------------------------------------------
-    ResourceView::ResourceView()
-        : AzRHI::ReferenceCounted()
-        , m_pResource(nullptr)
-        , m_DescriptorHandle(INVALID_CPU_DESCRIPTOR_HANDLE)
-        , m_Type(EVT_Unknown)
-        , m_HasDesc(true)
-        , m_Size(0)
-    {
-        // clear before use
-        memset(&m_unDSVDesc, 0, sizeof(m_unDSVDesc));
-        memset(&m_unRTVDesc, 0, sizeof(m_unRTVDesc));
-        memset(&m_unVBVDesc, 0, sizeof(m_unVBVDesc));
-        memset(&m_unCBVDesc, 0, sizeof(m_unCBVDesc));
-        memset(&m_unSRVDesc, 0, sizeof(m_unSRVDesc));
-        memset(&m_unUAVDesc, 0, sizeof(m_unUAVDesc));
-    }
-
-    ResourceView::ResourceView(ResourceView&& v)
-        : m_pResource(std::move(v.m_pResource))
-        , m_DescriptorHandle(std::move(v.m_DescriptorHandle))
-        , m_Type(std::move(v.m_Type))
-        , m_HasDesc(std::move(v.m_HasDesc))
-        , m_Size(std::move(v.m_Size))
-    {
-        m_unDSVDesc = std::move(v.m_unDSVDesc);
-        m_unRTVDesc = std::move(v.m_unRTVDesc);
-        m_unVBVDesc = std::move(v.m_unVBVDesc);
-        m_unCBVDesc = std::move(v.m_unCBVDesc);
-        m_unSRVDesc = std::move(v.m_unSRVDesc);
-        m_unUAVDesc = std::move(v.m_unUAVDesc);
-
-        v.m_pResource = nullptr;
-        v.m_DescriptorHandle = INVALID_CPU_DESCRIPTOR_HANDLE;
-    }
-
-    ResourceView& ResourceView::operator=(ResourceView&& v)
-    {
-        m_pResource = std::move(v.m_pResource);
-        m_DescriptorHandle = std::move(v.m_DescriptorHandle);
-        m_Type = std::move(v.m_Type);
-        m_HasDesc = std::move(v.m_HasDesc);
-        m_Size = std::move(v.m_Size);
-
-        m_unDSVDesc = std::move(v.m_unDSVDesc);
-        m_unRTVDesc = std::move(v.m_unRTVDesc);
-        m_unVBVDesc = std::move(v.m_unVBVDesc);
-        m_unCBVDesc = std::move(v.m_unCBVDesc);
-        m_unSRVDesc = std::move(v.m_unSRVDesc);
-        m_unUAVDesc = std::move(v.m_unUAVDesc);
-
-        v.m_pResource = nullptr;
-        v.m_DescriptorHandle = INVALID_CPU_DESCRIPTOR_HANDLE;
-
-        return *this;
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    ResourceView::~ResourceView()
-    {
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    //template<class T = ID3D12Resource>
-    ID3D12Resource* ResourceView::GetD3D12Resource() const
-    {
-        return m_pResource->GetD3D12Resource();
-    }
-
-    //---------------------------------------------------------------------------------------------------------------------
-    bool ResourceView::Init(Resource& resource, EViewType type, UINT64 size)
-    {
-        DX12_ASSERT(type != EVT_Unknown);
-        const D3D12_RESOURCE_DESC& desc = resource.GetDesc();
-
-        m_pResource = &resource;
-        m_Type = type;
-        m_Size = size;
-
-        switch (type)
-        {
-        case EVT_VertexBufferView:
-            m_unVBVDesc.BufferLocation = resource.GetGPUVirtualAddress();
-            m_unVBVDesc.SizeInBytes = static_cast<UINT>(m_Size);
-            break;
-
-        case EVT_IndexBufferView:
-            m_unIBVDesc.BufferLocation = resource.GetGPUVirtualAddress();
-            m_unIBVDesc.SizeInBytes = static_cast<UINT>(m_Size);
-            break;
-
-        case EVT_ConstantBufferView:
-            // Align to 256 bytes as required by DX12
-            m_Size = (m_Size + 255) & ~255;
-
-            m_unCBVDesc.BufferLocation = resource.GetGPUVirtualAddress();
-            m_unCBVDesc.SizeInBytes = static_cast<UINT>(m_Size);
-            break;
-
-        // The *View descriptions have all the same structure and identical enums
-        case EVT_ShaderResourceView:
-        case EVT_UnorderedAccessView:
-        case EVT_DepthStencilView:
-        case EVT_RenderTargetView:
-            m_unSRVDesc.Format = desc.Format;
-
-            switch (desc.Dimension)
-            {
-            case D3D12_RESOURCE_DIMENSION_BUFFER:
-                m_unSRVDesc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
-                break;
-            case D3D12_RESOURCE_DIMENSION_TEXTURE1D:
-                m_unSRVDesc.ViewDimension = desc.DepthOrArraySize <= 1 ? D3D12_SRV_DIMENSION_TEXTURE1D : D3D12_SRV_DIMENSION_TEXTURE1DARRAY;
-                break;
-            case D3D12_RESOURCE_DIMENSION_TEXTURE2D:
-                m_unSRVDesc.ViewDimension = desc.DepthOrArraySize <= 1 ? (desc.SampleDesc.Count <= 1 ? D3D12_SRV_DIMENSION_TEXTURE2D : D3D12_SRV_DIMENSION_TEXTURE2DMS) : (desc.SampleDesc.Count <= 1 ? D3D12_SRV_DIMENSION_TEXTURE2DARRAY : D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY);
-                break;
-            case D3D12_RESOURCE_DIMENSION_TEXTURE3D:
-                m_unSRVDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE3D;
-                break;
-
-            default:
-                DX12_NOT_IMPLEMENTED;
-                break;
-            }
-            break;
-        }
-
-        return true;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12View.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12View.hpp
deleted file mode 100644
index 26547dce73..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/API/DX12View.hpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __DX12VIEW__
-#define __DX12VIEW__
-
-#include "DX12Base.hpp"
-
-namespace DX12
-{
-    class SwapChain;
-
-    enum EViewType
-    {
-        EVT_Unknown = 0,
-        EVT_VertexBufferView,
-        EVT_IndexBufferView,
-        EVT_ConstantBufferView,
-        EVT_ShaderResourceView,
-        EVT_UnorderedAccessView,
-        EVT_DepthStencilView,
-        EVT_RenderTargetView
-    };
-
-    class ResourceView
-        : public AzRHI::ReferenceCounted
-    {
-    public:
-        ResourceView();
-        virtual ~ResourceView();
-
-        ResourceView(ResourceView&& r);
-        ResourceView& operator=(ResourceView&& r);
-
-        bool Init(Resource& resource, EViewType type, UINT64 size = 0);
-
-        //template<class T = ID3D12Resource>
-        ID3D12Resource* GetD3D12Resource() const;
-
-        ILINE Resource& GetDX12Resource() const
-        {
-            return *m_pResource;
-        }
-
-        ILINE void SetType(EViewType evt)
-        {
-            m_Type = evt;
-        }
-        ILINE EViewType GetType() const
-        {
-            return m_Type;
-        }
-
-        ILINE void HasDesc(bool has)
-        {
-            m_HasDesc = has;
-        }
-        ILINE bool HasDesc() const
-        {
-            return m_HasDesc;
-        }
-
-        ILINE void SetSize(UINT64 size)
-        {
-            m_Size = size;
-        }
-        ILINE UINT64 GetSize() const
-        {
-            return m_Size;
-        }
-
-        ILINE D3D12_DEPTH_STENCIL_VIEW_DESC& GetDSVDesc()
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL));
-            return m_unDSVDesc;
-        }
-        ILINE const D3D12_DEPTH_STENCIL_VIEW_DESC& GetDSVDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL));
-            return m_unDSVDesc;
-        }
-
-        ILINE D3D12_RENDER_TARGET_VIEW_DESC& GetRTVDesc()
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET));
-            return m_unRTVDesc;
-        }
-        ILINE const D3D12_RENDER_TARGET_VIEW_DESC& GetRTVDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET));
-            return m_unRTVDesc;
-        }
-
-        ILINE D3D12_VERTEX_BUFFER_VIEW& GetVBVDesc()
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unVBVDesc;
-        }
-        ILINE const D3D12_VERTEX_BUFFER_VIEW& GetVBVDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unVBVDesc;
-        }
-
-        ILINE D3D12_INDEX_BUFFER_VIEW& GetIBVDesc()
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unIBVDesc;
-        }
-        ILINE const D3D12_INDEX_BUFFER_VIEW& GetIBVDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unIBVDesc;
-        }
-
-        ILINE D3D12_CONSTANT_BUFFER_VIEW_DESC& GetCBVDesc()
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unCBVDesc;
-        }
-        ILINE const D3D12_CONSTANT_BUFFER_VIEW_DESC& GetCBVDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unCBVDesc;
-        }
-
-        ILINE D3D12_SHADER_RESOURCE_VIEW_DESC& GetSRVDesc()
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unSRVDesc;
-        }
-        ILINE const D3D12_SHADER_RESOURCE_VIEW_DESC& GetSRVDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && true);
-            return m_unSRVDesc;
-        }
-
-        ILINE D3D12_UNORDERED_ACCESS_VIEW_DESC& GetUAVDesc()
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS));
-            return m_unUAVDesc;
-        }
-        ILINE const D3D12_UNORDERED_ACCESS_VIEW_DESC& GetUAVDesc() const
-        {
-            //      DX12_ASSERT(m_pResource && (m_pResource->GetDesc().Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS));
-            return m_unUAVDesc;
-        }
-
-        ILINE void SetDescriptorHandle(const D3D12_CPU_DESCRIPTOR_HANDLE& descriptorHandle)
-        {
-            m_DescriptorHandle = descriptorHandle;
-        }
-        ILINE D3D12_CPU_DESCRIPTOR_HANDLE GetDescriptorHandle() const
-        {
-            return m_DescriptorHandle;
-        }
-
-    private:
-        Resource* m_pResource;
-        EViewType m_Type;
-        D3D12_CPU_DESCRIPTOR_HANDLE m_DescriptorHandle;
-
-        union
-        {
-            D3D12_VERTEX_BUFFER_VIEW m_unVBVDesc;
-            D3D12_INDEX_BUFFER_VIEW m_unIBVDesc;
-            D3D12_CONSTANT_BUFFER_VIEW_DESC m_unCBVDesc;
-            D3D12_SHADER_RESOURCE_VIEW_DESC m_unSRVDesc;
-            D3D12_UNORDERED_ACCESS_VIEW_DESC m_unUAVDesc;
-            D3D12_DEPTH_STENCIL_VIEW_DESC m_unDSVDesc;
-            D3D12_RENDER_TARGET_VIEW_DESC m_unRTVDesc;
-        };
-
-        // Some views can be created without descriptor (DSV)
-        bool m_HasDesc;
-
-        // View size in bytes
-        UINT64 m_Size;
-    };
-}
-
-#endif // __DX12VIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CCryDX12Object.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CCryDX12Object.cpp
deleted file mode 100644
index ae48152e2c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CCryDX12Object.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Object.hpp"
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CCryDX12Object.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CCryDX12Object.hpp
deleted file mode 100644
index ab61c5647f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CCryDX12Object.hpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12OBJECT__
-#define __CCRYDX12OBJECT__
-
-#include "API/DX12Base.hpp"
-
-#define DX12_BASE_OBJECT(DerivedType, InterfaceType) \
-    typedef DerivedType Class;                       \
-    typedef DX12::SmartPtr<Class> Ptr;               \
-    typedef DX12::SmartPtr<const Class> ConstPtr;    \
-    typedef InterfaceType Super;                     \
-    typedef InterfaceType Interface;                 \
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) \
-    {                                                                               \
-        if (riid == __uuidof(Super))                                                \
-        {                                                                           \
-            if (ppvObject)                                                          \
-            {                                                                       \
-                *reinterpret_cast<Super**>(ppvObject) = static_cast<Super*>(this);  \
-                static_cast<Super*>(this)->AddRef();                                \
-            }                                                                       \
-           return S_OK;                                                             \
-        }                                                                           \
-        return E_NOINTERFACE;                                                       \
-    }                                                                               \
-
-#define DX12_OBJECT(DerivedType, SuperType)       \
-    typedef DerivedType Class;                    \
-    typedef DX12::SmartPtr<Class> Ptr;            \
-    typedef DX12::SmartPtr<const Class> ConstPtr; \
-    typedef SuperType Super;                      \
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) \
-    {                                                                               \
-        if (riid == __uuidof(DerivedType))                                          \
-        {                                                                           \
-            if (ppvObject)                                                          \
-            {                                                                       \
-                *reinterpret_cast<DerivedType**>(ppvObject) = static_cast<DerivedType*>(this);    \
-                static_cast<DerivedType*>(this)->AddRef();                          \
-            }                                                                       \
-           return S_OK;                                                             \
-        }                                                                           \
-        return Super::QueryInterface(riid, ppvObject);                              \
-    }                                                                               \
-
-#include "CryDX12Guid.hpp"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CCryDX12Buffer;
-class CCryDX12DepthStencilView;
-class CCryDX12Device;
-class CCryDX12DeviceContext;
-class CCryDX12MemoryManager;
-class CCryDX12Query;
-class CCryDX12RenderTargetView;
-class CCryDX12SamplerState;
-class CCryDX12Shader;
-class CCryDX12ShaderResourceView;
-class CCryDX12SwapChain;
-class CCryDX12Texture1D;
-class CCryDX12Texture2D;
-class CCryDX12Texture3D;
-class CCryDX12UnorderedAccessView;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-class CCryDX12Object
-    : public T
-{
-public:
-    DX12_BASE_OBJECT(CCryDX12Object, T);
-
-    CCryDX12Object()
-        : m_RefCount(0)
-    {
-    }
-
-    virtual ~CCryDX12Object()
-    {
-        DX12_LOG("CCryDX12 object destroyed: %p", this);
-    }
-
-    #pragma region /* IUnknown implementation */
-
-    virtual ULONG STDMETHODCALLTYPE AddRef()
-    {
-        return CryInterlockedIncrement(&m_RefCount);
-    }
-
-    virtual ULONG STDMETHODCALLTYPE Release()
-    {
-        ULONG RefCount = CryInterlockedDecrement(&m_RefCount);
-        if (!RefCount)
-        {
-            delete this;
-            return 0;
-        }
-
-        return RefCount;
-    }
-
-    #pragma endregion
-
-private:
-    int m_RefCount;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-class CCryDX12GIObject
-    : public T
-{
-public:
-    DX12_BASE_OBJECT(CCryDX12GIObject, T);
-
-    CCryDX12GIObject()
-        : m_RefCount(0)
-    {
-    }
-
-    virtual ~CCryDX12GIObject()
-    {
-    }
-
-    #pragma region /* IUnknown implementation */
-
-    virtual ULONG STDMETHODCALLTYPE AddRef()
-    {
-        return CryInterlockedIncrement(&m_RefCount);
-    }
-
-    virtual ULONG STDMETHODCALLTYPE Release()
-    {
-        ULONG RefCount = CryInterlockedDecrement(&m_RefCount);
-        if (!RefCount)
-        {
-            delete this;
-            return 0;
-        }
-
-        return RefCount;
-    }
-
-    #pragma endregion
-
-    #pragma region /* IDXGIObject implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(
-        [[maybe_unused]] _In_  REFGUID Name,
-        [[maybe_unused]] UINT DataSize,
-        [[maybe_unused]] _In_reads_bytes_(DataSize) const void* pData)
-    {
-        return -1;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
-        [[maybe_unused]] _In_  REFGUID Name,
-        [[maybe_unused]] _In_  const IUnknown* pUnknown)
-    {
-        return -1;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
-        [[maybe_unused]] _In_  REFGUID Name,
-        [[maybe_unused]] _Inout_  UINT* pDataSize,
-        [[maybe_unused]] _Out_writes_bytes_(*pDataSize) void* pData)
-    {
-        return -1;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetParent(
-        [[maybe_unused]] _In_  REFIID riid,
-        [[maybe_unused]] _Out_ void** ppParent)
-    {
-        return -1;
-    }
-
-    #pragma endregion
-
-private:
-    int m_RefCount;
-};
-
-#endif // __CCRYDX12OBJECT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12.cpp
deleted file mode 100644
index 2a4125265c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CryDX12.hpp"
-
-#include "GI/CCryDX12GIFactory.hpp"
-#include "Device/CCryDX12Device.hpp"
-#include "Device/CCryDX12DeviceContext.hpp"
-
-HRESULT WINAPI DX12CreateDXGIFactory1([[maybe_unused]] REFIID riid, void** ppFactory)
-{
-    *ppFactory = CCryDX12GIFactory::Create();
-    return *ppFactory ? 0 : -1;
-}
-
-HRESULT WINAPI DX12CreateDevice(
-    IDXGIAdapter* pAdapter,
-    [[maybe_unused]] D3D_DRIVER_TYPE DriverType,
-    [[maybe_unused]] HMODULE Software,
-    [[maybe_unused]] UINT Flags,
-    [[maybe_unused]] CONST D3D_FEATURE_LEVEL* pFeatureLevels,
-    [[maybe_unused]] UINT FeatureLevels,
-    [[maybe_unused]] UINT SDKVersion,
-    ID3D11Device** ppDevice,
-    D3D_FEATURE_LEVEL* pFeatureLevel,
-    ID3D11DeviceContext** ppImmediateContext)
-{
-    *ppDevice = CCryDX12Device::Create(pAdapter, pFeatureLevel);
-
-    if (!*ppDevice)
-    {
-        return -1;
-    }
-
-    (*ppDevice)->GetImmediateContext(ppImmediateContext);
-
-    if (!*ppImmediateContext)
-    {
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12.hpp
deleted file mode 100644
index 679b1ea3e4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "CryDX12Legacy.hpp"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "API/DX12Base.hpp"
-#include "API/DX12PSO.hpp"
-#include "Misc/SCryDX11PipelineState.hpp"
-
-#include "XRenderD3D9/DX12/GI/CCryDX12GIFactory.hpp"
-#include "XRenderD3D9/DX12/GI/CCryDX12SwapChain.hpp"
-#include "XRenderD3D9/DX12/Device/CCryDX12Device.hpp"
-#include "XRenderD3D9/DX12/Device/CCryDX12DeviceContext.hpp"
-typedef IDXGIDevice1            DXGIDevice;
-typedef IDXGIAdapter1           DXGIAdapter;
-typedef CCryDX12GIFactory       DXGIFactory;
-typedef IDXGIOutput             DXGIOutput;
-typedef CCryDX12SwapChain       DXGISwapChain;
-typedef CCryDX12Device          D3DDevice;
-typedef CCryDX12DeviceContext   D3DDeviceContext;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-HRESULT WINAPI DX12CreateDXGIFactory1(REFIID riid, void** ppFactory);
-
-HRESULT WINAPI DX12CreateDevice(
-    IDXGIAdapter* pAdapter,
-    D3D_DRIVER_TYPE DriverType,
-    HMODULE Software,
-    UINT Flags,
-    CONST D3D_FEATURE_LEVEL* pFeatureLevels,
-    UINT FeatureLevels,
-    UINT SDKVersion,
-    ID3D11Device** ppDevice,
-    D3D_FEATURE_LEVEL* pFeatureLevel,
-    ID3D11DeviceContext** ppImmediateContext);
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Base.h b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Base.h
deleted file mode 100644
index 16828a9627..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Base.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Guid.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Guid.hpp
deleted file mode 100644
index 70fb9b3b23..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Guid.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define CRYDX12GUID_HPP_SECTION_1 1
-#endif
-
-#define DX12_DEFINE_TYPE_GUID(_CLASS, _TYPE, X) \
-  _CLASS __declspec(uuid(X)) _TYPE;
-
-DX12_DEFINE_TYPE_GUID(class, CCryDX12GIAdapter, "59e4cc3a-87bb-4b7b-a1e3-06787231384a");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12GIFactory, "af688514-87ba-4c1c-9927-5a349ede6d74");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12GIOutput, "038b29e3-2d4b-49c0-a726-494675697b76");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12SwapChain, "d9e49be8-2651-4bc7-bfaa-303cb964a76e");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12Device, "f9c01631-d950-444c-a480-68bbb85fb28c");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12DeviceContext, "23ec965a-a01c-4862-b8b8-f53cf8cd7dcc");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12Texture1D, "dd8eb017-6cdb-4790-a767-52817c222d57");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12Texture2D, "4dff2102-e08a-497e-b519-1c07124b36b3");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12Texture3D, "003527af-f60d-4d93-b5d8-6370964e7692");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12DepthStencilView, "4fdfce9f-c7c9-44e7-99c5-64c24e5ed31a");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12RenderTargetView, "8b1d7ea0-0313-4eaa-8ddb-6e25b7eb7a7c");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12UnorderedAccessView, "ce7c421a-b6a5-42b2-a8cd-7a34bf23426b");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12ShaderResourceView, "b4639da3-fc4e-4907-942a-dae7e86e9eeb");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12Query, "3dd1b810-4a04-4719-bb8b-14f5936479f9");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12BlendState, "3bb119a1-5c56-4251-8fbf-c874d5d3f101");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12RasterizerState, "4c3c2198-2011-4dbd-a310-7dabca10e55d");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12DepthStencilState, "f28f8fb4-e55d-4f98-88ed-fa3aab12be7b");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12InputLayout, "3b74fa4e-c2b6-4167-a014-bf2f91f16ddd");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12Buffer, "06b2a225-e1aa-4509-b5da-f0fd1d846ba6");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12Shader, "7052b765-cc86-42e8-b116-36dc3bf4cfee");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12SamplerState, "a841545b-c5a6-4481-9383-a46ec1c2c380");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12EventQuery, "0d8f741f-4051-4935-a50d-58353f825e45");
-DX12_DEFINE_TYPE_GUID(class, CCryDX12ResourceQuery, "6f1c2c43-3da7-489a-b1df-0c27362addbe");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYDX12GUID_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(CryDX12Guid_hpp)
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Legacy.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Legacy.hpp
deleted file mode 100644
index 9f570c386c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/CryDX12Legacy.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#if defined(WIN32)
-  #include <objbase.h>
-  #include <mmsyscom.h>
-  #include <d3d11.h>
-  #include <dxgi.h>
-  #include <dxgi1_2.h>
-#endif
-
-#if !defined(D3D_OK)
-#define D3D_OK 0
-#endif
-
-#if !defined(S_OK)
-#define S_OK 0
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12Device.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12Device.cpp
deleted file mode 100644
index ce8d70ee70..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12Device.cpp
+++ /dev/null
@@ -1,781 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Device.hpp"
-
-#include "CCryDX12DeviceContext.hpp"
-
-#include "DX12/Resource/Misc/CCryDX12Buffer.hpp"
-#include "DX12/Resource/Misc/CCryDX12InputLayout.hpp"
-#include "DX12/Resource/Misc/CCryDX12Query.hpp"
-#include "DX12/Resource/Misc/CCryDX12Shader.hpp"
-
-#include "DX12/Resource/State/CCryDX12BlendState.hpp"
-#include "DX12/Resource/State/CCryDX12DepthStencilState.hpp"
-#include "DX12/Resource/State/CCryDX12RasterizerState.hpp"
-#include "DX12/Resource/State/CCryDX12SamplerState.hpp"
-
-#include "DX12/Resource/Texture/CCryDX12Texture1D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture2D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture3D.hpp"
-
-#include "DX12/Resource/View/CCryDX12DepthStencilView.hpp"
-#include "DX12/Resource/View/CCryDX12RenderTargetView.hpp"
-#include "DX12/Resource/View/CCryDX12ShaderResourceView.hpp"
-#include "DX12/Resource/View/CCryDX12UnorderedAccessView.hpp"
-
-CCryDX12Device* CCryDX12Device::Create(IDXGIAdapter* pAdapter, D3D_FEATURE_LEVEL* pFeatureLevel)
-{
-    DX12::SmartPtr<DX12::Device> device;
-    device.attach(DX12::Device::Create(pAdapter, pFeatureLevel));
-
-    if (!device)
-    {
-        DX12_ERROR("Could not create DX12 Device!");
-        return NULL;
-    }
-
-    return DX12::PassAddRef(new CCryDX12Device(device));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Device::CCryDX12Device(DX12::Device* device)
-    : Super()
-    , m_pDevice(device)
-{
-    DX12_FUNC_LOG
-    m_pContext.attach(CCryDX12DeviceContext::Create(this));
-}
-
-CCryDX12Device::~CCryDX12Device()
-{
-    DX12_FUNC_LOG
-}
-
-#pragma region /* ID3D11Device implementation */
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateBuffer(
-    _In_  const D3D11_BUFFER_DESC* pDesc,
-    _In_opt_  const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _Out_opt_  ID3D11Buffer** ppBuffer)
-{
-    AZ_TRACE_METHOD();
-    *ppBuffer = CCryDX12Buffer::Create(this, pDesc, pInitialData);
-    return *ppBuffer ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateTexture1D(
-    _In_  const D3D11_TEXTURE1D_DESC* pDesc,
-    _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _Out_opt_  ID3D11Texture1D** ppTexture1D)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-    * ppTexture1D = CCryDX12Texture1D::Create(this, nullptr, pDesc, pInitialData);
-    return *ppTexture1D ? S_OK : S_FALSE;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateTexture2D(
-    _In_  const D3D11_TEXTURE2D_DESC* pDesc,
-    _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _Out_opt_  ID3D11Texture2D** ppTexture2D)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-    * ppTexture2D = CCryDX12Texture2D::Create(this, nullptr, pDesc, pInitialData);
-    return *ppTexture2D ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateTexture3D(
-    _In_  const D3D11_TEXTURE3D_DESC* pDesc,
-    _In_reads_opt_(_Inexpressible_(pDesc->MipLevels))  const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _Out_opt_  ID3D11Texture3D** ppTexture3D)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-    * ppTexture3D = CCryDX12Texture3D::Create(this, nullptr, pDesc, pInitialData);
-    return *ppTexture3D ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateShaderResourceView(
-    _In_  ID3D11Resource* pResource,
-    _In_opt_  const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc,
-    _Out_opt_  ID3D11ShaderResourceView** ppSRView)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-    * ppSRView = NULL;
-
-    if (CCryDX12ShaderResourceView* pResult = CCryDX12ShaderResourceView::Create(this, pResource, pDesc))
-    {
-        auto descriptorHandle = GetDX12Device()->CacheShaderResourceView(&pResult->GetDX12View().GetSRVDesc(), DX12_EXTRACT_D3D12RESOURCE(pResource));
-        pResult->GetDX12View().SetDescriptorHandle(descriptorHandle);
-
-        if (INVALID_CPU_DESCRIPTOR_HANDLE == descriptorHandle)
-        {
-            SAFE_RELEASE(pResult);
-        }
-
-        *ppSRView = pResult;
-    }
-
-    return *ppSRView ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateUnorderedAccessView(
-    _In_  ID3D11Resource* pResource,
-    _In_opt_  const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc,
-    _Out_opt_  ID3D11UnorderedAccessView** ppUAView)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-    * ppUAView = NULL;
-
-    if (CCryDX12UnorderedAccessView* pResult = CCryDX12UnorderedAccessView::Create(this, pResource, pDesc))
-    {
-        auto descriptorHandle = GetDX12Device()->CacheUnorderedAccessView(&pResult->GetDX12View().GetUAVDesc(), DX12_EXTRACT_D3D12RESOURCE(pResource));
-        pResult->GetDX12View().SetDescriptorHandle(descriptorHandle);
-
-        if (INVALID_CPU_DESCRIPTOR_HANDLE == descriptorHandle)
-        {
-            SAFE_RELEASE(pResult);
-        }
-
-        *ppUAView = pResult;
-    }
-
-    return *ppUAView ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateRenderTargetView(
-    _In_  ID3D11Resource* pResource,
-    _In_opt_  const D3D11_RENDER_TARGET_VIEW_DESC* pDesc,
-    _Out_opt_  ID3D11RenderTargetView** ppRTView)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-    * ppRTView = NULL;
-
-    if (CCryDX12RenderTargetView* pResult = CCryDX12RenderTargetView::Create(this, pResource, pDesc))
-    {
-        auto descriptorHandle = GetDX12Device()->CacheRenderTargetView(&pResult->GetDX12View().GetRTVDesc(), DX12_EXTRACT_D3D12RESOURCE(pResource));
-        pResult->GetDX12View().SetDescriptorHandle(descriptorHandle);
-
-        if (INVALID_CPU_DESCRIPTOR_HANDLE == descriptorHandle)
-        {
-            SAFE_RELEASE(pResult);
-        }
-
-        *ppRTView = pResult;
-    }
-
-    return *ppRTView ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateDepthStencilView(
-    _In_  ID3D11Resource* pResource,
-    _In_opt_  const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc,
-    _Out_opt_  ID3D11DepthStencilView** ppDSView)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-    * ppDSView = NULL;
-
-    if (CCryDX12DepthStencilView* pResult = CCryDX12DepthStencilView::Create(this, pResource, pDesc))
-    {
-        auto descriptorHandle = GetDX12Device()->CacheDepthStencilView(&pResult->GetDX12View().GetDSVDesc(), DX12_EXTRACT_D3D12RESOURCE(pResource));
-        pResult->GetDX12View().SetDescriptorHandle(descriptorHandle);
-
-        if (INVALID_CPU_DESCRIPTOR_HANDLE == descriptorHandle)
-        {
-            SAFE_RELEASE(pResult);
-        }
-
-        *ppDSView = pResult;
-    }
-
-    return *ppDSView ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateInputLayout(
-    _In_reads_(NumElements)  const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs,
-    _In_range_(0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT)  UINT NumElements,
-    _In_  const void* pShaderBytecodeWithInputSignature,
-    _In_  SIZE_T BytecodeLength,
-    _Out_opt_  ID3D11InputLayout** ppInputLayout)
-{
-    DX12_FUNC_LOG
-    * ppInputLayout = CCryDX12InputLayout::Create(this, pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength);
-    return *ppInputLayout ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateVertexShader(
-    _In_  const void* pShaderBytecode,
-    _In_  SIZE_T BytecodeLength,
-    _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-    _Out_opt_  ID3D11VertexShader** ppVertexShader)
-{
-    DX12_FUNC_LOG
-    * ppVertexShader = reinterpret_cast<ID3D11VertexShader*>(CCryDX12Shader::Create(this, pShaderBytecode, BytecodeLength, pClassLinkage));
-    return *ppVertexShader ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateGeometryShader(
-    _In_  const void* pShaderBytecode,
-    _In_  SIZE_T BytecodeLength,
-    _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-    _Out_opt_  ID3D11GeometryShader** ppGeometryShader)
-{
-    DX12_FUNC_LOG
-    * ppGeometryShader = reinterpret_cast<ID3D11GeometryShader*>(CCryDX12Shader::Create(this, pShaderBytecode, BytecodeLength, pClassLinkage));
-    return *ppGeometryShader ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateGeometryShaderWithStreamOutput(
-    [[maybe_unused]] _In_  const void* pShaderBytecode,
-    [[maybe_unused]] _In_  SIZE_T BytecodeLength,
-    [[maybe_unused]] _In_reads_opt_(NumEntries)  const D3D11_SO_DECLARATION_ENTRY* pSODeclaration,
-    [[maybe_unused]] _In_range_(0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT)  UINT NumEntries,
-    [[maybe_unused]] _In_reads_opt_(NumStrides)  const UINT* pBufferStrides,
-    [[maybe_unused]] _In_range_(0, D3D11_SO_BUFFER_SLOT_COUNT)  UINT NumStrides,
-    [[maybe_unused]] _In_  UINT RasterizedStream,
-    [[maybe_unused]] _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-    [[maybe_unused]] _Out_opt_  ID3D11GeometryShader** ppGeometryShader)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreatePixelShader(
-    _In_  const void* pShaderBytecode,
-    _In_  SIZE_T BytecodeLength,
-    _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-    _Out_opt_  ID3D11PixelShader** ppPixelShader)
-{
-    DX12_FUNC_LOG
-    * ppPixelShader = reinterpret_cast<ID3D11PixelShader*>(CCryDX12Shader::Create(this, pShaderBytecode, BytecodeLength, pClassLinkage));
-    return *ppPixelShader ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateHullShader(
-    _In_  const void* pShaderBytecode,
-    _In_  SIZE_T BytecodeLength,
-    _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-    _Out_opt_  ID3D11HullShader** ppHullShader)
-{
-    DX12_FUNC_LOG
-    * ppHullShader = reinterpret_cast<ID3D11HullShader*>(CCryDX12Shader::Create(this, pShaderBytecode, BytecodeLength, pClassLinkage));
-    return *ppHullShader ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateDomainShader(
-    _In_  const void* pShaderBytecode,
-    _In_  SIZE_T BytecodeLength,
-    _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-    _Out_opt_  ID3D11DomainShader** ppDomainShader)
-{
-    DX12_FUNC_LOG
-    * ppDomainShader = reinterpret_cast<ID3D11DomainShader*>(CCryDX12Shader::Create(this, pShaderBytecode, BytecodeLength, pClassLinkage));
-    return *ppDomainShader ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateComputeShader(
-    _In_  const void* pShaderBytecode,
-    _In_  SIZE_T BytecodeLength,
-    _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-    _Out_opt_  ID3D11ComputeShader** ppComputeShader)
-{
-    DX12_FUNC_LOG
-    * ppComputeShader = reinterpret_cast<ID3D11ComputeShader*>(CCryDX12Shader::Create(this, pShaderBytecode, BytecodeLength, pClassLinkage));
-    return *ppComputeShader ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateClassLinkage(
-    [[maybe_unused]] _Out_  ID3D11ClassLinkage** ppLinkage)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateBlendState(
-    _In_  const D3D11_BLEND_DESC* pBlendStateDesc,
-    _Out_opt_  ID3D11BlendState** ppBlendState)
-{
-    DX12_FUNC_LOG
-    * ppBlendState = CCryDX12BlendState::Create(pBlendStateDesc);
-    return *ppBlendState ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateDepthStencilState(
-    _In_  const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc,
-    _Out_opt_  ID3D11DepthStencilState** ppDepthStencilState)
-{
-    DX12_FUNC_LOG
-    * ppDepthStencilState = CCryDX12DepthStencilState::Create(pDepthStencilDesc);
-    return *ppDepthStencilState ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateRasterizerState(
-    _In_  const D3D11_RASTERIZER_DESC* pRasterizerDesc,
-    _Out_opt_  ID3D11RasterizerState** ppRasterizerState)
-{
-    DX12_FUNC_LOG
-    * ppRasterizerState = CCryDX12RasterizerState::Create(pRasterizerDesc);
-    return *ppRasterizerState ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateSamplerState(
-    _In_  const D3D11_SAMPLER_DESC* pSamplerDesc,
-    _Out_opt_  ID3D11SamplerState** ppSamplerState)
-{
-    DX12_FUNC_LOG
-    * ppSamplerState = NULL;
-
-    if (CCryDX12SamplerState* pResult = CCryDX12SamplerState::Create(pSamplerDesc))
-    {
-        auto descriptorHandle = GetDX12Device()->CacheSampler(&pResult->GetDX12SamplerState().GetSamplerDesc());
-        pResult->GetDX12SamplerState().SetDescriptorHandle(descriptorHandle);
-
-        if (INVALID_CPU_DESCRIPTOR_HANDLE == descriptorHandle)
-        {
-            SAFE_RELEASE(pResult);
-        }
-
-        *ppSamplerState = pResult;
-    }
-
-    return *ppSamplerState ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateQuery(
-    _In_  const D3D11_QUERY_DESC* pQueryDesc,
-    _Out_opt_  ID3D11Query** ppQuery)
-{
-    *ppQuery = CCryDX12Query::Create(GetD3D12Device(), pQueryDesc);
-    return *ppQuery ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreatePredicate(
-    [[maybe_unused]] _In_  const D3D11_QUERY_DESC* pPredicateDesc,
-    [[maybe_unused]] _Out_opt_  ID3D11Predicate** ppPredicate)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateCounter(
-    [[maybe_unused]] _In_  const D3D11_COUNTER_DESC* pCounterDesc,
-    [[maybe_unused]] _Out_opt_  ID3D11Counter** ppCounter)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateDeferredContext(
-    [[maybe_unused]] UINT ContextFlags,
-    [[maybe_unused]] _Out_opt_  ID3D11DeviceContext** ppDeferredContext)
-{
-    DX12_FUNC_LOG
-    DX12_NOT_IMPLEMENTED
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::OpenSharedResource(
-    [[maybe_unused]] _In_  HANDLE hResource,
-    [[maybe_unused]] _In_  REFIID ReturnedInterface,
-    [[maybe_unused]] _Out_opt_  void** ppResource)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CheckFormatSupport(
-    _In_  DXGI_FORMAT Format,
-    _Out_  UINT* pFormatSupport)
-{
-    DX12_FUNC_LOG
-    D3D12_FEATURE_DATA_FORMAT_SUPPORT data;
-    data.Format = Format;
-
-    if (S_OK != m_pDevice->GetD3D12Device()->CheckFeatureSupport(D3D12_FEATURE_FORMAT_SUPPORT, &data, sizeof(D3D12_FEATURE_DATA_FORMAT_SUPPORT)))
-    {
-        return S_FALSE;
-    }
-
-    *pFormatSupport = data.Support1;
-    return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CheckMultisampleQualityLevels(
-    [[maybe_unused]] _In_  DXGI_FORMAT Format,
-    [[maybe_unused]] _In_  UINT SampleCount,
-    [[maybe_unused]] _Out_  UINT* pNumQualityLevels)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-void STDMETHODCALLTYPE CCryDX12Device::CheckCounterInfo(
-    [[maybe_unused]] _Out_  D3D11_COUNTER_INFO* pCounterInfo)
-{
-    DX12_FUNC_LOG
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CheckCounter(
-    [[maybe_unused]] _In_  const D3D11_COUNTER_DESC* pDesc,
-    [[maybe_unused]] _Out_  D3D11_COUNTER_TYPE* pType,
-    [[maybe_unused]] _Out_  UINT* pActiveCounters,
-    [[maybe_unused]] _Out_writes_opt_(*pNameLength)  LPSTR szName,
-    [[maybe_unused]] _Inout_opt_  UINT* pNameLength,
-    [[maybe_unused]] _Out_writes_opt_(*pUnitsLength)  LPSTR szUnits,
-    [[maybe_unused]] _Inout_opt_  UINT* pUnitsLength,
-    [[maybe_unused]] _Out_writes_opt_(*pDescriptionLength)  LPSTR szDescription,
-    [[maybe_unused]] _Inout_opt_  UINT* pDescriptionLength)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CheckFeatureSupport(
-    D3D11_FEATURE Feature,
-    _Out_writes_bytes_(FeatureSupportDataSize)  void* pFeatureSupportData,
-    [[maybe_unused]] UINT FeatureSupportDataSize)
-{
-    DX12_FUNC_LOG
-
-    switch (Feature)
-    {
-    case D3D11_FEATURE_D3D11_OPTIONS2:
-    {
-        D3D11_FEATURE_DATA_D3D11_OPTIONS2* dx11FeatureDataOptions2 = static_cast<D3D11_FEATURE_DATA_D3D11_OPTIONS2*>(pFeatureSupportData);
-        HRESULT result;
-
-        D3D12_FEATURE_DATA_D3D12_OPTIONS dx12FeatureDataOptions;
-        result = m_pDevice->GetD3D12Device()->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &dx12FeatureDataOptions, sizeof(dx12FeatureDataOptions));
-        if (result == S_OK)
-        {
-            dx11FeatureDataOptions2->PSSpecifiedStencilRefSupported = dx12FeatureDataOptions.PSSpecifiedStencilRefSupported;
-            dx11FeatureDataOptions2->TypedUAVLoadAdditionalFormats = dx12FeatureDataOptions.TypedUAVLoadAdditionalFormats;
-            dx11FeatureDataOptions2->ROVsSupported = dx12FeatureDataOptions.ROVsSupported;
-            dx11FeatureDataOptions2->MapOnDefaultTextures = true; // Assumed true in DX12
-            dx11FeatureDataOptions2->StandardSwizzle = dx12FeatureDataOptions.StandardSwizzle64KBSupported;
-
-            switch (dx12FeatureDataOptions.ConservativeRasterizationTier)
-            {
-            case D3D12_CONSERVATIVE_RASTERIZATION_TIER_NOT_SUPPORTED:
-                dx11FeatureDataOptions2->ConservativeRasterizationTier = D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED;
-                break;
-            case D3D12_CONSERVATIVE_RASTERIZATION_TIER_1:
-                dx11FeatureDataOptions2->ConservativeRasterizationTier = D3D11_CONSERVATIVE_RASTERIZATION_TIER_1;
-                break;
-            case D3D12_CONSERVATIVE_RASTERIZATION_TIER_2:
-                dx11FeatureDataOptions2->ConservativeRasterizationTier = D3D11_CONSERVATIVE_RASTERIZATION_TIER_2;
-                break;
-            case D3D12_CONSERVATIVE_RASTERIZATION_TIER_3:
-                dx11FeatureDataOptions2->ConservativeRasterizationTier = D3D11_CONSERVATIVE_RASTERIZATION_TIER_3;
-                break;
-            }
-
-            switch (dx12FeatureDataOptions.TiledResourcesTier)
-            {
-            case D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED:
-                dx11FeatureDataOptions2->TiledResourcesTier = D3D11_TILED_RESOURCES_NOT_SUPPORTED;
-                break;
-            case D3D12_TILED_RESOURCES_TIER_1:
-                dx11FeatureDataOptions2->TiledResourcesTier = D3D11_TILED_RESOURCES_TIER_1;
-                break;
-            case D3D12_TILED_RESOURCES_TIER_2:
-                dx11FeatureDataOptions2->TiledResourcesTier = D3D11_TILED_RESOURCES_TIER_2;
-                break;
-            case D3D12_TILED_RESOURCES_TIER_3:
-                dx11FeatureDataOptions2->TiledResourcesTier = D3D11_TILED_RESOURCES_TIER_3;
-                break;
-            }
-        }
-        else
-        {
-            return E_INVALIDARG;
-        }
-
-
-        D3D12_FEATURE_DATA_ARCHITECTURE dx12FeatureDataArchitecture;
-        dx12FeatureDataArchitecture.NodeIndex = 0;
-        result = m_pDevice->GetD3D12Device()->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE, &dx12FeatureDataArchitecture, sizeof(dx12FeatureDataArchitecture));
-        if (result == S_OK)
-        {
-            dx11FeatureDataOptions2->UnifiedMemoryArchitecture = dx12FeatureDataArchitecture.UMA;
-        }
-        else
-        {
-            return E_INVALIDARG;
-        }
-
-        break;
-    }
-    default:
-        AZ_Assert(false, "No conversion to DX12 has been written for this feature support check.");
-        return E_INVALIDARG;
-    }
-
-    return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::GetPrivateData(
-    [[maybe_unused]] _In_  REFGUID guid,
-    [[maybe_unused]] _Inout_  UINT* pDataSize,
-    [[maybe_unused]] _Out_writes_bytes_opt_(*pDataSize)  void* pData)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::SetPrivateData(
-    [[maybe_unused]] _In_  REFGUID guid,
-    [[maybe_unused]] _In_  UINT DataSize,
-    [[maybe_unused]] _In_reads_bytes_opt_(DataSize)  const void* pData)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::SetPrivateDataInterface(
-    [[maybe_unused]] _In_  REFGUID guid,
-    [[maybe_unused]] _In_opt_  const IUnknown* pData)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-D3D_FEATURE_LEVEL STDMETHODCALLTYPE CCryDX12Device::GetFeatureLevel()
-{
-    DX12_FUNC_LOG
-    return D3D_FEATURE_LEVEL_11_1;
-}
-
-UINT STDMETHODCALLTYPE CCryDX12Device::GetCreationFlags()
-{
-    DX12_FUNC_LOG
-    return 0;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::GetDeviceRemovedReason()
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-void STDMETHODCALLTYPE CCryDX12Device::GetImmediateContext(
-    _Out_  ID3D11DeviceContext** ppImmediateContext)
-{
-    DX12_FUNC_LOG
-    if (ppImmediateContext)
-    {
-        *ppImmediateContext = m_pContext;
-        (*ppImmediateContext)->AddRef();
-    }
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::SetExceptionMode(
-    [[maybe_unused]] UINT RaiseFlags)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-UINT STDMETHODCALLTYPE CCryDX12Device::GetExceptionMode()
-{
-    DX12_FUNC_LOG
-    return 0;
-}
-
-#pragma endregion
-
-#pragma region /* ID3D11Device1 implementation */
-
-void STDMETHODCALLTYPE CCryDX12Device::GetImmediateContext1(
-    _Out_  ID3D11DeviceContext1** ppImmediateContext)
-{
-    DX12_FUNC_LOG
-
-    if (ppImmediateContext)
-    {
-        *ppImmediateContext = m_pContext;
-        (*ppImmediateContext)->AddRef();
-    }
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateDeferredContext1(
-    [[maybe_unused]] UINT ContextFlags,
-    /* [annotation] */
-    [[maybe_unused]] _COM_Outptr_opt_  ID3D11DeviceContext1** ppDeferredContext)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateBlendState1(
-    /* [annotation] */
-    [[maybe_unused]] _In_  const D3D11_BLEND_DESC1* pBlendStateDesc,
-    /* [annotation] */
-    [[maybe_unused]] _COM_Outptr_opt_  ID3D11BlendState1** ppBlendState)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateRasterizerState1(
-    /* [annotation] */
-    [[maybe_unused]] _In_  const D3D11_RASTERIZER_DESC1* pRasterizerDesc,
-    /* [annotation] */
-    [[maybe_unused]] _COM_Outptr_opt_  ID3D11RasterizerState1** ppRasterizerState)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateDeviceContextState(
-    [[maybe_unused]] UINT Flags,
-    /* [annotation] */
-    [[maybe_unused]] _In_reads_(FeatureLevels)  const D3D_FEATURE_LEVEL* pFeatureLevels,
-    [[maybe_unused]] UINT FeatureLevels,
-    [[maybe_unused]] UINT SDKVersion,
-    [[maybe_unused]] REFIID EmulatedInterface,
-    /* [annotation] */
-    [[maybe_unused]] _Out_opt_  D3D_FEATURE_LEVEL* pChosenFeatureLevel,
-    /* [annotation] */
-    [[maybe_unused]] _Out_opt_  ID3DDeviceContextState** ppContextState)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::OpenSharedResource1(
-    /* [annotation] */
-    [[maybe_unused]] _In_  HANDLE hResource,
-    /* [annotation] */
-    [[maybe_unused]] _In_  REFIID returnedInterface,
-    /* [annotation] */
-    [[maybe_unused]] _COM_Outptr_  void** ppResource)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::OpenSharedResourceByName(
-    /* [annotation] */
-    [[maybe_unused]] _In_  LPCWSTR lpName,
-    /* [annotation] */
-    [[maybe_unused]] _In_  DWORD dwDesiredAccess,
-    /* [annotation] */
-    [[maybe_unused]] _In_  REFIID returnedInterface,
-    /* [annotation] */
-    [[maybe_unused]] _COM_Outptr_  void** ppResource)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-#pragma endregion
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateTexture1D(
-    _In_  const D3D11_TEXTURE1D_DESC* pDesc,
-    _In_  const FLOAT cClearValue[4],
-    _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _Out_opt_  ID3D11Texture1D** ppTexture1D)
-{
-    DX12_FUNC_LOG
-    * ppTexture1D = CCryDX12Texture1D::Create(this, cClearValue, pDesc, pInitialData);
-    return *ppTexture1D ? S_OK : S_FALSE;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateTexture2D(
-    _In_  const D3D11_TEXTURE2D_DESC* pDesc,
-    _In_  const FLOAT cClearValue[4],
-    _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _Out_opt_  ID3D11Texture2D** ppTexture2D)
-{
-    DX12_FUNC_LOG
-    * ppTexture2D = CCryDX12Texture2D::Create(this, cClearValue, pDesc, pInitialData);
-    return *ppTexture2D ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateTexture3D(
-    _In_  const D3D11_TEXTURE3D_DESC* pDesc,
-    _In_  const FLOAT cClearValue[4],
-    _In_reads_opt_(_Inexpressible_(pDesc->MipLevels))  const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _Out_opt_  ID3D11Texture3D** ppTexture3D)
-{
-    DX12_FUNC_LOG
-    * ppTexture3D = CCryDX12Texture3D::Create(this, cClearValue, pDesc, pInitialData);
-    return *ppTexture3D ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::CreateStagingResource(
-    _In_  ID3D11Resource* pInputResource,
-    _Out_ ID3D11Resource** ppStagingResource,
-    _In_  BOOL Upload)
-{
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pInputResource);
-    DX12::Resource& rResource = dx12Resource->GetDX12Resource();
-
-    D3D12_RESOURCE_DESC resourceDesc = rResource.GetDesc();
-    UINT64 requiredSize;
-    UINT numSubResources = resourceDesc.MipLevels * (resourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? 1 : resourceDesc.DepthOrArraySize);
-    GetD3D12Device()->GetCopyableFootprints(&resourceDesc, 0, numSubResources, 0, nullptr, nullptr, nullptr, &requiredSize);
-
-    D3D12_RESOURCE_STATES initialState = Upload ? D3D12_RESOURCE_STATE_GENERIC_READ : D3D12_RESOURCE_STATE_COPY_DEST;
-    D3D12_HEAP_TYPE heapType = Upload ? D3D12_HEAP_TYPE_UPLOAD : D3D12_HEAP_TYPE_READBACK;
-
-    ID3D12Resource* stagingResource = NULL;
-    const CD3DX12_HEAP_PROPERTIES heapProperties(heapType);
-    const CD3DX12_RESOURCE_DESC resourceBuffer = CD3DX12_RESOURCE_DESC::Buffer(requiredSize);
-    HRESULT result = GetDX12Device()->GetD3D12Device()->CreateCommittedResource(
-            &heapProperties,
-            D3D12_HEAP_FLAG_NONE,
-            &resourceBuffer,
-            initialState,
-            nullptr,
-            IID_GRAPHICS_PPV_ARGS(&stagingResource));
-
-    if (result == S_OK && stagingResource != nullptr)
-    {
-        *ppStagingResource = CCryDX12Buffer::Create(this, stagingResource, initialState);
-        stagingResource->Release();
-
-        return S_OK;
-    }
-
-    return result;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12Device::ReleaseStagingResource(
-    _In_  ID3D11Resource* pStagingResource)
-{
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pStagingResource);
-    DX12::Resource& rResource = dx12Resource->GetDX12Resource();
-    ID3D12Resource* d3d12Resource = rResource.GetD3D12Resource();
-
-    d3d12Resource->AddRef();
-    d3d12Resource->SetName(L"StagingResource");
-    GetDX12Device()->ReleaseLater(d3d12Resource, rResource.GetCurrentState(), rResource.GetAnnouncedState());
-
-    pStagingResource->Release();
-    return S_OK;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12Device.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12Device.hpp
deleted file mode 100644
index 0ee5393c5b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12Device.hpp
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12DEVICE__
-#define __CCRYDX12DEVICE__
-
-#include "DX12/CCryDX12Object.hpp"
-#include "DX12/API/DX12Device.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define CCRYDX12DEVICE_HPP_SECTION_1 1
-    #define CCRYDX12DEVICE_HPP_SECTION_2 2
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CCRYDX12DEVICE_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(CCryDX12Device_hpp)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    using ICCryDX12Device = ID3D11Device1;
-#endif
-
-class CCryDX12Device
-    : public CCryDX12Object<ICCryDX12Device>
-{
-public:
-    DX12_OBJECT(CCryDX12Device, CCryDX12Object<ICCryDX12Device>);
-
-    static CCryDX12Device* Create(IDXGIAdapter* pAdapter, D3D_FEATURE_LEVEL* pFeatureLevel);
-
-    CCryDX12Device(DX12::Device* device);
-
-    virtual ~CCryDX12Device();
-
-    DX12::Device* GetDX12Device() const { return m_pDevice; }
-
-    ID3D12Device* GetD3D12Device() const { return m_pDevice->GetD3D12Device(); }
-
-    CCryDX12DeviceContext* GetDeviceContext() const { return m_pContext; }
-
-    #pragma region /* ID3D11Device implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE CreateBuffer(
-        _In_  const D3D11_BUFFER_DESC* pDesc,
-        _In_opt_  const D3D11_SUBRESOURCE_DATA* pInitialData,
-        _Out_opt_  ID3D11Buffer** ppBuffer) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture1D(
-        _In_  const D3D11_TEXTURE1D_DESC * pDesc,
-        _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize))  const D3D11_SUBRESOURCE_DATA * pInitialData,
-        _Out_opt_  ID3D11Texture1D * *ppTexture1D) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture2D(
-        _In_  const D3D11_TEXTURE2D_DESC * pDesc,
-        _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize))  const D3D11_SUBRESOURCE_DATA * pInitialData,
-        _Out_opt_  ID3D11Texture2D * *ppTexture2D) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture3D(
-        _In_  const D3D11_TEXTURE3D_DESC * pDesc,
-        _In_reads_opt_(_Inexpressible_(pDesc->MipLevels))  const D3D11_SUBRESOURCE_DATA * pInitialData,
-        _Out_opt_  ID3D11Texture3D * *ppTexture3D) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView(
-        _In_  ID3D11Resource* pResource,
-        _In_opt_  const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc,
-        _Out_opt_  ID3D11ShaderResourceView** ppSRView) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(
-        _In_  ID3D11Resource* pResource,
-        _In_opt_  const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc,
-        _Out_opt_  ID3D11UnorderedAccessView** ppUAView) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView(
-        _In_  ID3D11Resource* pResource,
-        _In_opt_  const D3D11_RENDER_TARGET_VIEW_DESC* pDesc,
-        _Out_opt_  ID3D11RenderTargetView** ppRTView) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView(
-        _In_  ID3D11Resource* pResource,
-        _In_opt_  const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc,
-        _Out_opt_  ID3D11DepthStencilView** ppDepthStencilView) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateInputLayout(
-        _In_reads_(NumElements)  const D3D11_INPUT_ELEMENT_DESC * pInputElementDescs,
-        _In_range_(0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT)  UINT NumElements,
-        _In_  const void* pShaderBytecodeWithInputSignature,
-        _In_  SIZE_T BytecodeLength,
-        _Out_opt_  ID3D11InputLayout * *ppInputLayout) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateVertexShader(
-        _In_  const void* pShaderBytecode,
-        _In_  SIZE_T BytecodeLength,
-        _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-        _Out_opt_  ID3D11VertexShader** ppVertexShader) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader(
-        _In_  const void* pShaderBytecode,
-        _In_  SIZE_T BytecodeLength,
-        _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-        _Out_opt_  ID3D11GeometryShader** ppGeometryShader) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(
-        _In_  const void* pShaderBytecode,
-        _In_  SIZE_T BytecodeLength,
-        _In_reads_opt_(NumEntries)  const D3D11_SO_DECLARATION_ENTRY * pSODeclaration,
-        _In_range_(0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT)  UINT NumEntries,
-        _In_reads_opt_(NumStrides)  const UINT * pBufferStrides,
-        _In_range_(0, D3D11_SO_BUFFER_SLOT_COUNT)  UINT NumStrides,
-        _In_  UINT RasterizedStream,
-        _In_opt_  ID3D11ClassLinkage * pClassLinkage,
-        _Out_opt_  ID3D11GeometryShader * *ppGeometryShader) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreatePixelShader(
-        _In_  const void* pShaderBytecode,
-        _In_  SIZE_T BytecodeLength,
-        _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-        _Out_opt_  ID3D11PixelShader** ppPixelShader) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateHullShader(
-        _In_  const void* pShaderBytecode,
-        _In_  SIZE_T BytecodeLength,
-        _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-        _Out_opt_  ID3D11HullShader** ppHullShader) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDomainShader(
-        _In_  const void* pShaderBytecode,
-        _In_  SIZE_T BytecodeLength,
-        _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-        _Out_opt_  ID3D11DomainShader** ppDomainShader) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateComputeShader(
-        _In_  const void* pShaderBytecode,
-        _In_  SIZE_T BytecodeLength,
-        _In_opt_  ID3D11ClassLinkage* pClassLinkage,
-        _Out_opt_  ID3D11ComputeShader** ppComputeShader) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateClassLinkage(
-        _Out_  ID3D11ClassLinkage** ppLinkage) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateBlendState(
-        _In_  const D3D11_BLEND_DESC* pBlendStateDesc,
-        _Out_opt_  ID3D11BlendState** ppBlendState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState(
-        _In_  const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc,
-        _Out_opt_  ID3D11DepthStencilState** ppDepthStencilState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState(
-        _In_  const D3D11_RASTERIZER_DESC* pRasterizerDesc,
-        _Out_opt_  ID3D11RasterizerState** ppRasterizerState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateSamplerState(
-        _In_  const D3D11_SAMPLER_DESC* pSamplerDesc,
-        _Out_opt_  ID3D11SamplerState** ppSamplerState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateQuery(
-        _In_  const D3D11_QUERY_DESC* pQueryDesc,
-        _Out_opt_  ID3D11Query** ppQuery) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreatePredicate(
-        _In_  const D3D11_QUERY_DESC* pPredicateDesc,
-        _Out_opt_  ID3D11Predicate** ppPredicate) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateCounter(
-        _In_  const D3D11_COUNTER_DESC* pCounterDesc,
-        _Out_opt_  ID3D11Counter** ppCounter) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext(
-        UINT ContextFlags,
-        _Out_opt_  ID3D11DeviceContext** ppDeferredContext) final;
-
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResource(
-        _In_  HANDLE hResource,
-        _In_  REFIID ReturnedInterface,
-        _Out_opt_  void** ppResource) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport(
-        _In_  DXGI_FORMAT Format,
-        _Out_  UINT* pFormatSupport) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(
-        _In_  DXGI_FORMAT Format,
-        _In_  UINT SampleCount,
-        _Out_  UINT* pNumQualityLevels) final;
-
-    virtual void STDMETHODCALLTYPE CheckCounterInfo(
-        _Out_  D3D11_COUNTER_INFO* pCounterInfo) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CheckCounter(
-        _In_  const D3D11_COUNTER_DESC* pDesc,
-        _Out_  D3D11_COUNTER_TYPE* pType,
-        _Out_  UINT* pActiveCounters,
-        _Out_writes_opt_(*pNameLength)  LPSTR szName,
-        _Inout_opt_  UINT* pNameLength,
-        _Out_writes_opt_(*pUnitsLength)  LPSTR szUnits,
-        _Inout_opt_  UINT* pUnitsLength,
-        _Out_writes_opt_(*pDescriptionLength)  LPSTR szDescription,
-        _Inout_opt_  UINT* pDescriptionLength) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport(
-        D3D11_FEATURE Feature,
-        _Out_writes_bytes_(FeatureSupportDataSize)  void* pFeatureSupportData,
-        UINT FeatureSupportDataSize) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
-        _In_  REFGUID guid,
-        _Inout_  UINT* pDataSize,
-        _Out_writes_bytes_opt_(*pDataSize)  void* pData) final;
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(
-        _In_  REFGUID guid,
-        _In_  UINT DataSize,
-        _In_reads_bytes_opt_(DataSize)  const void* pData) final;
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
-        _In_  REFGUID guid,
-        _In_opt_  const IUnknown* pData) final;
-
-    virtual D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel() final;
-
-    virtual UINT STDMETHODCALLTYPE GetCreationFlags() final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason() final;
-
-    virtual void STDMETHODCALLTYPE GetImmediateContext(
-        _Out_  ID3D11DeviceContext** ppImmediateContext) final;
-
-    virtual HRESULT STDMETHODCALLTYPE SetExceptionMode(
-        UINT RaiseFlags) final;
-
-    virtual UINT STDMETHODCALLTYPE GetExceptionMode() final;
-
-    #pragma endregion
-
-    #pragma region /* ID3D11Device1 implementation */
-
-    virtual void STDMETHODCALLTYPE GetImmediateContext1(
-        /* [annotation] */
-        _Outptr_  ID3D11DeviceContext1** ppImmediateContext) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext1(
-        UINT ContextFlags,
-        /* [annotation] */
-        _COM_Outptr_opt_  ID3D11DeviceContext1** ppDeferredContext) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateBlendState1(
-        /* [annotation] */
-        _In_  const D3D11_BLEND_DESC1* pBlendStateDesc,
-        /* [annotation] */
-        _COM_Outptr_opt_  ID3D11BlendState1** ppBlendState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState1(
-        /* [annotation] */
-        _In_  const D3D11_RASTERIZER_DESC1* pRasterizerDesc,
-        /* [annotation] */
-        _COM_Outptr_opt_  ID3D11RasterizerState1** ppRasterizerState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDeviceContextState(
-        UINT Flags,
-        /* [annotation] */
-        _In_reads_(FeatureLevels)  const D3D_FEATURE_LEVEL * pFeatureLevels,
-        UINT FeatureLevels,
-        UINT SDKVersion,
-        REFIID EmulatedInterface,
-        /* [annotation] */
-        _Out_opt_  D3D_FEATURE_LEVEL * pChosenFeatureLevel,
-        /* [annotation] */
-        _Out_opt_  ID3DDeviceContextState * *ppContextState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResource1(
-        /* [annotation] */
-        _In_  HANDLE hResource,
-        /* [annotation] */
-        _In_  REFIID returnedInterface,
-        /* [annotation] */
-        _COM_Outptr_  void** ppResource) final;
-
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResourceByName(
-        /* [annotation] */
-        _In_  LPCWSTR lpName,
-        /* [annotation] */
-        _In_  DWORD dwDesiredAccess,
-        /* [annotation] */
-        _In_  REFIID returnedInterface,
-        /* [annotation] */
-        _COM_Outptr_  void** ppResource) final;
-
-    #pragma endregion
-
-    HRESULT STDMETHODCALLTYPE CreateTexture1D(
-        _In_  const D3D11_TEXTURE1D_DESC * pDesc,
-        _In_  const FLOAT cClearValue[4],
-        _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize))  const D3D11_SUBRESOURCE_DATA * pInitialData,
-        _Out_opt_  ID3D11Texture1D * *ppTexture1D);
-
-    HRESULT STDMETHODCALLTYPE CreateTexture2D(
-        _In_  const D3D11_TEXTURE2D_DESC * pDesc,
-        _In_  const FLOAT cClearValue[4],
-        _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize))  const D3D11_SUBRESOURCE_DATA * pInitialData,
-        _Out_opt_  ID3D11Texture2D * *ppTexture2D);
-
-    HRESULT STDMETHODCALLTYPE CreateTexture3D(
-        _In_  const D3D11_TEXTURE3D_DESC * pDesc,
-        _In_  const FLOAT cClearValue[4],
-        _In_reads_opt_(_Inexpressible_(pDesc->MipLevels))  const D3D11_SUBRESOURCE_DATA * pInitialData,
-        _Out_opt_  ID3D11Texture3D * *ppTexture3D);
-
-    HRESULT STDMETHODCALLTYPE CreateStagingResource(
-        _In_  ID3D11Resource* pInputResource,
-        _Out_ ID3D11Resource** ppStagingResource,
-        _In_  BOOL Upload);
-
-    HRESULT STDMETHODCALLTYPE ReleaseStagingResource(
-        _In_  ID3D11Resource* pStagingResource);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CCRYDX12DEVICE_HPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(CCryDX12Device_hpp)
-#endif
-
-private:
-    DX12::SmartPtr<DX12::Device> m_pDevice;
-
-    DX12::SmartPtr<CCryDX12DeviceContext> m_pContext;
-};
-
-#endif // __CCRYDX12DEVICE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceChild.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceChild.cpp
deleted file mode 100644
index 6e0b4c51ec..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceChild.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-
-EXTERN_C const GUID DECLSPEC_SELECTANY WKPDID_D3DDebugClearValue = { 0x01234567, 0x0123, 0x0123, { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 } };
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceChild.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceChild.hpp
deleted file mode 100644
index a35cfd4df6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceChild.hpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12DEVICECHILD__
-#define __CCRYDX12DEVICECHILD__
-
-#include "DX12/CCryDX12Object.hpp"
-
-DEFINE_GUID(WKPDID_D3DDebugObjectName, 0x429b8c22, 0x9188, 0x4b0c, 0x87, 0x42, 0xac, 0xb0, 0xbf, 0x85, 0xc2, 0x00);
-DEFINE_GUID(WKPDID_D3DDebugObjectNameW, 0x4cca5fd8, 0x921f, 0x42c8, 0x85, 0x66, 0x70, 0xca, 0xf2, 0xa9, 0xb7, 0x41);
-DEFINE_GUID(WKPDID_D3DDebugClearValue, 0x01234567, 0x0123, 0x0123, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01);
-
-// Specialize std::hash
-namespace std {
-    template<>
-    struct hash<GUID>
-    {
-        size_t operator()(const GUID& guid) const /*noexcept*/
-        {
-            //  RPC_STATUS status;
-            //  return UuidHash((UUID*)&guid, &status);
-
-            const uint64_t* p = reinterpret_cast<const uint64_t*>(&guid);
-            std::hash<uint64_t> hash;
-            return hash(p[0]) ^ hash(p[1]);
-        }
-    };
-}
-
-template <typename T>
-class CCryDX12DeviceChild
-    : public CCryDX12Object<T>
-{
-public:
-    DX12_OBJECT(CCryDX12DeviceChild, CCryDX12Object<T>);
-
-    virtual ~CCryDX12DeviceChild()
-    {
-    }
-
-#if !defined(RELEASE)
-    std::string GetName()
-    {
-        UINT len = 512;
-        char str[512] = "-";
-
-        GetPrivateData(WKPDID_D3DDebugObjectName, &len, str);
-
-        return str;
-    }
-
-    HRESULT STDMETHODCALLTYPE GetPrivateCustomData(
-        _In_  REFGUID guid,
-        _Inout_  UINT* pDataSize,
-        _Out_writes_bytes_opt_(*pDataSize)  void* pData)
-    {
-        TDatas::iterator elm = m_Data.find(guid);
-        if (elm != m_Data.end())
-        {
-            void* Blob = (*elm).second.second;
-            UINT nCopied = std::min(*pDataSize, (*elm).second.first);
-
-            *pDataSize = nCopied;
-            if (pData)
-            {
-                memcpy(pData, Blob, nCopied);
-            }
-
-            return S_OK;
-        }
-
-        return E_FAIL;
-    }
-
-    HRESULT STDMETHODCALLTYPE SetPrivateCustomData(
-        _In_  REFGUID guid,
-        _In_  UINT DataSize,
-        _In_reads_bytes_opt_(DataSize)  const void* pData)
-    {
-        TDatas::iterator elm = m_Data.find(guid);
-        if (elm != m_Data.end())
-        {
-            CryModuleFree((*elm).second.second);
-        }
-
-        if (pData)
-        {
-            void* Blob = CryModuleMalloc(DataSize);
-            m_Data[guid] = std::make_pair(DataSize, Blob);
-            memcpy(Blob, pData, DataSize);
-        }
-        else
-        {
-            m_Data.erase(elm);
-        }
-
-        return S_OK;
-    }
-#endif
-
-    #pragma region /* ID3D11DeviceChild implementation */
-
-    virtual void STDMETHODCALLTYPE GetDevice(
-        _Out_  ID3D11Device** ppDevice)
-    {
-        *ppDevice = m_Device;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
-        [[maybe_unused]] _In_  REFGUID guid,
-        [[maybe_unused]] _Inout_  UINT* pDataSize,
-        [[maybe_unused]] _Out_writes_bytes_opt_(*pDataSize)  void* pData)
-    {
-#if !defined(RELEASE)
-        if (m_pChild)
-        {
-            return m_pChild->GetPrivateData(guid, pDataSize, pData);
-        }
-
-        return GetPrivateCustomData(guid, pDataSize, pData);
-#else
-        return E_FAIL;
-#endif
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(
-        [[maybe_unused]] _In_  REFGUID guid,
-        [[maybe_unused]] _In_  UINT DataSize,
-        [[maybe_unused]] _In_reads_bytes_opt_(DataSize)  const void* pData)
-    {
-#if !defined(RELEASE)
-        if (m_pChild)
-        {
-            return m_pChild->SetPrivateData(guid, DataSize, pData);
-        }
-
-        return SetPrivateCustomData(guid, DataSize, pData);
-#else
-        return E_FAIL;
-#endif
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
-        [[maybe_unused]] _In_  REFGUID guid,
-        [[maybe_unused]] _In_opt_  const IUnknown* pData)
-    {
-#if !defined(RELEASE)
-        if (m_pChild)
-        {
-            return m_pChild->SetPrivateDataInterface(guid, pData);
-        }
-#endif
-
-        return E_FAIL;
-    }
-
-    #pragma endregion
-
-    CCryDX12Device* GetDevice()
-    {
-        return m_Device;
-    }
-
-protected:
-    CCryDX12DeviceChild(CCryDX12Device* pDevice, [[maybe_unused]] ID3D12DeviceChild* pChild)
-    {
-        m_Device = pDevice;
-#if !defined(RELEASE)
-        m_pChild = pChild;
-#endif
-    }
-
-private:
-    CCryDX12Device* m_Device;
-#if !defined(RELEASE)
-    typedef std::unordered_map<GUID, std::pair<UINT, void*> > TDatas;
-    TDatas m_Data;
-    ID3D12DeviceChild* m_pChild;
-#endif
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceContext.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceContext.cpp
deleted file mode 100644
index 0215635619..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceContext.cpp
+++ /dev/null
@@ -1,3074 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12DeviceContext.hpp"
-#include "CCryDX12Device.hpp"
-
-#include "DX12/Resource/CCryDX12Resource.hpp"
-
-#include "DX12/Resource/Misc/CCryDX12Buffer.hpp"
-#include "DX12/Resource/Misc/CCryDX12Shader.hpp"
-#include "DX12/Resource/Misc/CCryDX12Query.hpp"
-
-#include "DX12/Resource/State/CCryDX12SamplerState.hpp"
-
-#include "DX12/Resource/Texture/CCryDX12Texture1D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture2D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture3D.hpp"
-
-#include "DX12/Resource/View/CCryDX12DepthStencilView.hpp"
-#include "DX12/Resource/View/CCryDX12RenderTargetView.hpp"
-#include "DX12/Resource/View/CCryDX12ShaderResourceView.hpp"
-#include "DX12/Resource/View/CCryDX12UnorderedAccessView.hpp"
-
-#include "DX12/API/DX12Device.hpp"
-
-#define DX12_SUBMISSION_UNBOUND 3 // never commit, only when the heaps overflow, or on present
-#define DX12_SUBMISSION_PERPSO  2 // commit whenever the PSO changes
-#define DX12_SUBMISSION_PERDRAW 1 // commit whenever a new draw is requested
-#define DX12_SUBMISSION_SYNC    0 // commit always and wait as well
-
-#define DX12_SUBMISSION_MODE   DX12_SUBMISSION_UNBOUND
-
-CCryDX12DeviceContext* CCryDX12DeviceContext::Create(CCryDX12Device* pDeviced)
-{
-    return DX12::PassAddRef(new CCryDX12DeviceContext(pDeviced));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12DeviceContext::CCryDX12DeviceContext(CCryDX12Device* pDevice)
-    : Super()
-    , m_pDevice(pDevice)
-    , m_pDX12Device(pDevice->GetDX12Device())
-    , m_CmdFenceSet(pDevice->GetDX12Device())
-    , m_DirectListPool(pDevice->GetDX12Device(), m_CmdFenceSet, CMDQUEUE_GRAPHICS)
-    , m_CopyListPool(pDevice->GetDX12Device(), m_CmdFenceSet, CMDQUEUE_COPY)
-    , m_TimestampHeap(pDevice->GetDX12Device())
-    , m_PipelineHeap(pDevice->GetDX12Device())
-    , m_OcclusionHeap(pDevice->GetDX12Device())
-    , m_CurrentRootSignature{}
-    , m_CurrentPSO{}
-    , m_OutstandingQueries{}
-    , m_TimestampIndex{}
-    , m_OcclusionIndex{}
-    , m_bInCopyRegion{}
-{
-    DX12_FUNC_LOG
-
-    // Timer query heap
-    {
-        D3D12_QUERY_HEAP_DESC desc = {};
-        desc.Count = 1024;
-        desc.Type = D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
-
-        m_TimestampHeap.Init(m_pDX12Device, desc);
-    }
-
-    // Occlusion query heap
-    {
-        D3D12_QUERY_HEAP_DESC desc = {};
-        desc.Count = 64;
-        desc.Type = D3D12_QUERY_HEAP_TYPE_OCCLUSION;
-
-        m_OcclusionHeap.Init(m_pDX12Device, desc);
-    }
-
-    // Pipeline query heap
-    {
-        D3D12_QUERY_HEAP_DESC desc = {};
-        desc.Count = 16;
-        desc.Type = D3D12_QUERY_HEAP_TYPE_PIPELINE_STATISTICS;
-
-        m_PipelineHeap.Init(m_pDX12Device, desc);
-    }
-
-    const CD3DX12_HEAP_PROPERTIES heapProperties(D3D12_HEAP_TYPE_READBACK);
-    const CD3DX12_RESOURCE_DESC timestampHeapBuffer = CD3DX12_RESOURCE_DESC::Buffer(sizeof(UINT64) * m_TimestampHeap.GetCapacity());
-    if(S_OK != m_pDX12Device->GetD3D12Device()->CreateCommittedResource(
-        &heapProperties,
-        D3D12_HEAP_FLAG_NONE,
-        &timestampHeapBuffer,
-        D3D12_RESOURCE_STATE_COPY_DEST,
-        nullptr,
-        IID_GRAPHICS_PPV_ARGS(&m_TimestampDownloadBuffer)))
-    {
-        DX12_ERROR("Could not create intermediate timestamp download buffer!");
-    }
-
-    const CD3DX12_RESOURCE_DESC occlusionHeapBuffer = CD3DX12_RESOURCE_DESC::Buffer(sizeof(UINT64) * m_OcclusionHeap.GetCapacity());
-    if (S_OK != m_pDX12Device->GetD3D12Device()->CreateCommittedResource(
-            &heapProperties,
-            D3D12_HEAP_FLAG_NONE,
-            &occlusionHeapBuffer,
-            D3D12_RESOURCE_STATE_COPY_DEST,
-            nullptr,
-            IID_GRAPHICS_PPV_ARGS(&m_OcclusionDownloadBuffer)))
-    {
-        DX12_ERROR("Could not create intermediate occlusion download buffer!");
-    }
-
-    m_pSamplerHeap = NULL;
-    m_pResourceHeap = NULL;
-    m_bCurrentNative = false;
-    m_nResDynOffset = 0;
-    m_nFrame = 0;
-    m_nStencilRef = -1;
-
-    m_TimestampMemory = nullptr;
-    m_OcclusionMemory = nullptr;
-    m_TimestampMapValid = false;
-    m_OcclusionMapValid = false;
-
-    m_CmdFenceSet.Init();
-
-    m_DirectListPool.Init();
-    m_CopyListPool.Init(D3D12_COMMAND_LIST_TYPE_COPY);
-
-    m_DirectListPool.AcquireCommandList(m_DirectCommandList);
-    m_CopyListPool.AcquireCommandList(m_CopyCommandList);
-
-    m_DirectCommandList->Begin();
-    m_DirectCommandList->SetResourceAndSamplerStateHeaps();
-
-    m_CopyCommandList->Begin();
-
-    m_pDX12Device->CalibrateClocks(m_DirectCommandList->GetD3D12CommandQueue());
-}
-
-CCryDX12DeviceContext::~CCryDX12DeviceContext()
-{
-    DX12_FUNC_LOG
-
-    D3D12_RANGE sNoWrite = { 0, 0 };
-    if (m_TimestampMemory)
-    {
-        m_TimestampDownloadBuffer->Unmap(0, &sNoWrite);
-    }
-    if (m_OcclusionMemory)
-    {
-        m_OcclusionDownloadBuffer->Unmap(0, &sNoWrite);
-    }
-
-    m_TimestampDownloadBuffer->Release();
-    m_OcclusionDownloadBuffer->Release();
-}
-
-bool CCryDX12DeviceContext::PreparePSO(DX12::CommandMode commandMode)
-{
-    DX12::Device* device = m_pDevice->GetDX12Device();
-
-    auto& state = m_PipelineState[commandMode];
-    const DX12::RootSignature* newRootSignature = m_CurrentRootSignature[commandMode];
-    const DX12::PipelineState* newPipelineState = m_CurrentPSO;
-
-    bool bForceFlush = false;
-
-    if (state.m_StateFlags & EPSPB_PipelineState)
-    {
-        if (commandMode == DX12::CommandModeGraphics)
-        {
-            DX12::RootSignature::GraphicsInitParams rootSignatureParams;
-            state.MakeInitParams(rootSignatureParams);
-            newRootSignature = device->GetRootSignatureCache().AcquireRootSignature(rootSignatureParams);
-
-            DX12::GraphicsPipelineState::InitParams psoParams;
-            psoParams.rootSignature = newRootSignature;
-            state.MakeInitParams(psoParams);
-            newPipelineState = device->GetPSOCache().AcquirePipelineState(psoParams);
-        }
-        else
-        {
-            DX12::RootSignature::ComputeInitParams rootSignatureParams;
-            state.MakeInitParams(rootSignatureParams);
-            newRootSignature = device->GetRootSignatureCache().AcquireRootSignature(rootSignatureParams);
-
-            DX12::ComputePipelineState::InitParams psoParams;
-            psoParams.rootSignature = newRootSignature;
-            state.MakeInitParams(psoParams);
-            newPipelineState = device->GetPSOCache().AcquirePipelineState(psoParams);
-        }
-
-        if (!newPipelineState)
-        {
-            return false;
-        }
-
-        if constexpr (DX12_SUBMISSION_MODE == DX12_SUBMISSION_PERPSO)
-        {
-            if (m_OutstandingQueries == 0)
-            {
-                bForceFlush = true;
-            }
-        }
-    }
-
-    // check for overflow and submit early
-    if (bForceFlush || m_DirectCommandList->IsFull(
-        /* 256, */ newRootSignature->GetPipelineLayout().m_NumDescriptors,
-        /*  16, */ newRootSignature->GetPipelineLayout().m_NumDynamicSamplers,
-        /*   8, */ state.OutputMerger.NumRenderTargets.Get(),
-        /*   1, */ state.OutputMerger.DepthStencilView ? 1 : 0))
-    {
-        const bool bWait = false;
-        SubmitDirectCommands(bWait);
-
-#ifdef DX12_STATS
-        m_NumCommandListOverflows++;
-#endif // DX12_STATS
-
-        ResetCachedState();
-    }
-
-    if (state.m_StateFlags & EPSPB_PipelineState)
-    {
-        if (newPipelineState != m_CurrentPSO)
-        {
-#ifdef DX12_STATS
-            m_NumPSOs += 1;
-#endif
-            m_DirectCommandList->SetPipelineState(newPipelineState);
-            m_CurrentPSO = newPipelineState;
-        }
-
-        if (newRootSignature != m_CurrentRootSignature[commandMode])
-        {
-#ifdef DX12_STATS
-            m_NumRootSignatures += 1;
-#endif
-            m_DirectCommandList->SetRootSignature(commandMode, newRootSignature);
-            m_CurrentRootSignature[commandMode] = newRootSignature;
-            state.m_StateFlags |= EPSPB_InputResources;
-        }
-    }
-
-    return true;
-}
-
-void CCryDX12DeviceContext::PrepareGraphicsFF()
-{
-    auto& state = m_PipelineState[DX12::CommandModeGraphics];
-    const UINT& stateFlags = state.m_StateFlags;
-
-    if (stateFlags & EPSPB_IndexBuffer & (state.InputAssembler.IndexBuffer ? ~0 : 0))
-    {
-        AZ_Assert(state.InputAssembler.IndexBuffer, "IndexBuffer is required by the Draw but has not been set!");
-        m_DirectCommandList->BindAndSetIndexBufferView(state.InputAssembler.IndexBuffer->GetDX12View(), state.InputAssembler.IndexBufferFormat.Get(), state.InputAssembler.IndexBufferOffset.Get());
-    }
-
-    if (stateFlags & EPSPB_PrimitiveTopology)
-    {
-        m_DirectCommandList->SetPrimitiveTopology(static_cast<D3D12_PRIMITIVE_TOPOLOGY> (state.InputAssembler.PrimitiveTopology.Get()));
-    }
-
-    if (stateFlags & EPSPB_VertexBuffers)
-    {
-        m_DirectCommandList->ClearVertexBufferHeap(state.InputAssembler.NumVertexBuffers.Get());
-
-        for (UINT i = 0, S = state.InputAssembler.NumVertexBuffers.Get(); i < S; ++i)
-        {
-            CCryDX12Buffer* buffer = state.InputAssembler.VertexBuffers.Get(i);
-
-            if (buffer)
-            {
-                TRange<UINT> bindRange = TRange<UINT> (state.InputAssembler.Offsets.Get(i), state.InputAssembler.Offsets.Get(i));
-                UINT bindStride = state.InputAssembler.Strides.Get(i);
-                AZ_Assert(buffer, "VertexBuffer is required by the PSO but has not been set!");
-                m_DirectCommandList->BindVertexBufferView(buffer->GetDX12View(), i, bindRange, bindStride);
-            }
-        }
-
-        m_DirectCommandList->SetVertexBufferHeap(state.InputAssembler.NumVertexBuffers.Get());
-    }
-
-    if (stateFlags & EPSPB_Viewports)
-    {
-        UINT numScissors = state.Rasterizer.ScissorEnabled.Get() ? state.Rasterizer.NumScissors.Get() : 0;
-        if (state.Rasterizer.NumViewports.Get() >= numScissors)
-        {
-            D3D12_VIEWPORT viewports[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-            D3D12_RECT scissors[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-
-            for (UINT i = 0, S = state.Rasterizer.NumViewports.Get(); i < S; ++i)
-            {
-                const D3D11_VIEWPORT& v = state.Rasterizer.Viewports.Get(i);
-                viewports[i].TopLeftX = v.TopLeftX;
-                viewports[i].TopLeftY = v.TopLeftY;
-                viewports[i].Width = v.Width;
-                viewports[i].Height = v.Height;
-                viewports[i].MinDepth = v.MinDepth;
-                viewports[i].MaxDepth = v.MaxDepth;
-
-                if (i < numScissors)
-                {
-                    const D3D11_RECT& s = state.Rasterizer.Scissors.Get(i);
-
-                    scissors[i].bottom = s.bottom;
-                    scissors[i].left = s.left;
-                    scissors[i].right = s.right;
-                    scissors[i].top = s.top;
-                }
-                else
-                {
-                    scissors[i].top = static_cast<LONG>(v.TopLeftY);
-                    scissors[i].left = static_cast<LONG>(v.TopLeftX);
-                    scissors[i].right = static_cast<LONG>(v.TopLeftX + v.Width);
-                    scissors[i].bottom = static_cast<LONG>(v.TopLeftY + v.Height);
-                }
-            }
-
-            m_DirectCommandList->SetViewports(state.Rasterizer.NumViewports.Get(), viewports);
-            m_DirectCommandList->SetScissorRects(state.Rasterizer.NumViewports.Get(), scissors);
-        }
-        else
-        {
-            // This should not happen, ever!
-            DX12_NOT_IMPLEMENTED;
-        }
-    }
-
-    if (stateFlags & EPSPB_StencilRef)
-    {
-        m_DirectCommandList->SetStencilRef(state.OutputMerger.StencilRef.Get());
-    }
-
-    if (stateFlags & EPSPB_OutputResources)
-    {
-        BindOutputViews();
-    }
-}
-
-bool CCryDX12DeviceContext::PrepareGraphicsState()
-{
-    if (!m_PipelineState[DX12::CommandModeGraphics].AreShadersBound() || m_PipelineState[DX12::CommandModeGraphics].InputAssembler.InputLayout.m_Value == NULL)
-    {
-        return false;
-    }
-
-    if (!PreparePSO(DX12::CommandModeGraphics))
-    {
-        return false;
-    }
-
-    PrepareGraphicsFF();
-    BindResources(DX12::CommandModeGraphics);
-
-    m_PipelineState[DX12::CommandModeGraphics].m_StateFlags = 0;
-    return true;
-}
-
-bool CCryDX12DeviceContext::PrepareComputeState()
-{
-    if (!m_PipelineState[DX12::CommandModeCompute].AreShadersBound())
-    {
-        return false;
-    }
-
-    if (!PreparePSO(DX12::CommandModeCompute))
-    {
-        return false;
-    }
-
-    BindResources(DX12::CommandModeCompute);
-
-    m_PipelineState[DX12::CommandModeCompute].m_StateFlags = 0;
-    return true;
-}
-
-void CCryDX12DeviceContext::BindResources(DX12::CommandMode commandMode)
-{
-    const auto& state = m_PipelineState[commandMode];
-    const auto stateFlags = state.m_StateFlags;
-
-    if ((stateFlags & EPSPB_InputResources) == 0)
-    {
-        return;
-    }
-    DX12_ASSERT(stateFlags & (BIT(EPSP_ConstantBuffers) | BIT(EPSP_Resources) | BIT(EPSP_Samplers)), "Redundant BindResources() called without state-changes");
-
-    const DX12::PipelineLayout& layout = m_CurrentRootSignature[commandMode]->GetPipelineLayout();
-    AZ::u32 resourceDescriptorOffset = 0;
-    AZ::u32 samplerDescriptorOffset = 0;
-
-    if (stateFlags & (EPSPB_ConstantBuffers | EPSPB_Resources))
-    {
-        for (const DX12::ResourceLayoutBinding& resourceBinding : layout.m_TableResources)
-        {
-            auto& stage = state.Stages[resourceBinding.ShaderStage];
-
-            switch (resourceBinding.ViewType)
-            {
-            case D3D12_DESCRIPTOR_RANGE_TYPE_CBV:
-            {
-                CCryDX12Buffer* buffer = stage.ConstantBufferViews.Get(resourceBinding.ShaderSlot);
-                TRange<UINT> bindRange = stage.ConstBufferBindRange.Get(resourceBinding.ShaderSlot);
-                DX12_ASSERT(resourceDescriptorOffset == resourceBinding.DescriptorOffset, "ConstantBuffer offset has shifted: resource mapping invalid!");
-                m_DirectCommandList->WriteConstantBufferDescriptor(buffer ? &buffer->GetDX12View() : nullptr, resourceDescriptorOffset++, bindRange.start, bindRange.Length());
-                break;
-            }
-            case D3D12_DESCRIPTOR_RANGE_TYPE_SRV:
-            {
-                CCryDX12ShaderResourceView* resource = stage.ShaderResourceViews.Get(resourceBinding.ShaderSlot);
-                DX12_ASSERT(resourceDescriptorOffset == resourceBinding.DescriptorOffset, "ShaderResourceView offset has shifted: resource mapping invalid!");
-                m_DirectCommandList->WriteShaderResourceDescriptor(resource ? &resource->GetDX12View() : nullptr, resourceDescriptorOffset++);
-                break;
-            }
-            case D3D12_DESCRIPTOR_RANGE_TYPE_UAV:
-            {
-                CCryDX12UnorderedAccessView* resource = stage.UnorderedAccessViews.Get(resourceBinding.ShaderSlot);
-                DX12_ASSERT(resourceDescriptorOffset == resourceBinding.DescriptorOffset, "UnorderedAccessView offset has shifted: resource mapping invalid!");
-                m_DirectCommandList->WriteUnorderedAccessDescriptor(resource ? &resource->GetDX12View() : nullptr, resourceDescriptorOffset++);
-                break;
-            }
-            }
-        }
-
-        if (stateFlags & EPSPB_ConstantBuffers)
-        {
-            for (const DX12::ConstantBufferLayoutBinding& constantBufferBinding : layout.m_ConstantViews)
-            {
-                auto& stage = state.Stages[constantBufferBinding.ShaderStage];
-
-                CCryDX12Buffer* buffer = stage.ConstantBufferViews.Get(constantBufferBinding.ShaderSlot);
-                TRange<UINT> bindRange = stage.ConstBufferBindRange.Get(constantBufferBinding.ShaderSlot);
-
-                D3D12_GPU_VIRTUAL_ADDRESS gpuAddress = { 0ull };
-                if (buffer)
-                {
-                    gpuAddress = buffer->GetDX12View().GetCBVDesc().BufferLocation + bindRange.start;
-                }
-                m_DirectCommandList->SetConstantBufferView(commandMode, constantBufferBinding.RootParameterIndex, gpuAddress);
-            }
-        }
-    }
-
-    // Bind samplers
-    if (stateFlags & EPSPB_Samplers)
-    {
-        for (const DX12::ResourceLayoutBinding& samplerBinding : layout.m_Samplers)
-        {
-            const DX12::EShaderStage i = samplerBinding.ShaderStage;
-            DX12_ASSERT(samplerBinding.ViewType == D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, "");
-            {
-                CCryDX12SamplerState* sampler = state.Stages[i].SamplerState.Get(samplerBinding.ShaderSlot);
-                DX12_ASSERT(samplerDescriptorOffset == samplerBinding.DescriptorOffset, "Sampler offset has shifted: resource mapping invalid!");
-                m_DirectCommandList->WriteSamplerStateDescriptor(sampler ? &sampler->GetDX12SamplerState() : nullptr, samplerDescriptorOffset++);
-            }
-        }
-    }
-
-    if (stateFlags & (BIT(EPSP_ConstantBuffers) | BIT(EPSP_Resources)))
-    {
-        m_DirectCommandList->SetDescriptorTables(commandMode, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-        m_DirectCommandList->IncrementInputCursors(layout.m_NumDescriptors, 0);
-    }
-
-    if (stateFlags & (BIT(EPSP_Samplers)))
-    {
-        m_DirectCommandList->SetDescriptorTables(commandMode, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
-        m_DirectCommandList->IncrementInputCursors(0, layout.m_NumDynamicSamplers);
-    }
-}
-
-void CCryDX12DeviceContext::BindOutputViews()
-{
-    const DX12::ResourceView* dsv = NULL;
-    const DX12::ResourceView* rtv[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT];
-    size_t numRTVs = 0;
-
-    auto& outputMerger = m_PipelineState[DX12::CommandModeGraphics].OutputMerger;
-
-    // Get current depth stencil views
-    {
-        CCryDX12DepthStencilView* view = outputMerger.DepthStencilView;
-        if (view)
-        {
-            dsv = &view->GetDX12View();
-        }
-    }
-
-    // Get current render target views
-    for (UINT i = 0, S = outputMerger.NumRenderTargets.Get(); i < S; ++i)
-    {
-        CCryDX12RenderTargetView* view = outputMerger.RenderTargetViews.Get(i);
-        if (view)
-        {
-            rtv[numRTVs++] = &view->GetDX12View();
-        }
-    }
-
-    m_DirectCommandList->BindAndSetOutputViews(numRTVs, rtv, dsv);
-#ifdef DX12_STATS
-    m_NumberSettingOutputViews++;
-#endif
-}
-
-namespace DX12
-{
-    const char* StateToString(D3D12_RESOURCE_STATES state);
-}
-
-void CCryDX12DeviceContext::DebugPrintResources(DX12::CommandMode commandMode)
-{
-    const DX12::PipelineLayout& layout = m_CurrentRootSignature[commandMode]->GetPipelineLayout();
-
-    DX12_LOG("Resource Heap Descriptor Tables:");
-
-    auto& state = m_PipelineState[commandMode];
-#ifdef GFX_DEBUG
-    UINT resourceDescriptorOffset = 0;
-    UINT samplerDescriptorOffset = 0;
-#endif
-
-    // Bind constant buffers
-    for (const DX12::ResourceLayoutBinding& resourceBinding : layout.m_TableResources)
-    {
-        const DX12::EShaderStage i = resourceBinding.ShaderStage;
-        if (resourceBinding.ViewType == D3D12_DESCRIPTOR_RANGE_TYPE_CBV)
-        {
-            auto bindRange = state.Stages[i].ConstBufferBindRange.Get(resourceBinding.ShaderSlot);
-#ifdef GFX_DEBUG
-            CCryDX12Buffer* buffer = state.Stages[i].ConstantBufferViews.Get(resourceBinding.ShaderSlot);
-            AZ_Assert(buffer, "ConstantBuffer is required by the PSO but has not been set!");
-            AZ_Assert(resourceDescriptorOffset == resourceBinding.DescriptorOffset, "ConstantBuffer offset has shifted: resource mapping invalid!");
-#endif
-            DX12_LOG(" %s: C %2d -> %2d %s [%s]",
-                i == DX12::ESS_Compute  ? "Every    shader stage" :
-                i == DX12::ESS_Vertex   ? "Vertex   shader stage" :
-                i == DX12::ESS_Hull     ? "Hull     shader stage" :
-                i == DX12::ESS_Domain   ? "Domain   shader stage" :
-                i == DX12::ESS_Geometry ? "Geometry shader stage" :
-                i == DX12::ESS_Pixel    ? "Pixel    shader stage" : "Unknown  shader stage",
-                resourceBinding.ShaderSlot,
-                resourceDescriptorOffset++,
-                buffer ? buffer->GetName().c_str() : "nullptr",
-                buffer ? DX12::StateToString(buffer->GetDX12Resource().GetCurrentState()) : "-");
-        }
-        else if (resourceBinding.ViewType == D3D12_DESCRIPTOR_RANGE_TYPE_SRV)
-        {
-#ifdef GFX_DEBUG
-            CCryDX12ShaderResourceView* resource = state.Stages[i].ShaderResourceViews.Get(resourceBinding.ShaderSlot);
-            AZ_Assert(resource, "ShaderResourceView is required by the PSO but has not been set!");
-            AZ_Assert(resourceDescriptorOffset == resourceBinding.DescriptorOffset, "ShaderResourceView offset has shifted: resource mapping invalid!");
-#endif
-            DX12_LOG(" %s: T %2d -> %2d %s [%s]",
-                i == DX12::ESS_Compute  ? "Every    shader stage" :
-                i == DX12::ESS_Vertex   ? "Vertex   shader stage" :
-                i == DX12::ESS_Hull     ? "Hull     shader stage" :
-                i == DX12::ESS_Domain   ? "Domain   shader stage" :
-                i == DX12::ESS_Geometry ? "Geometry shader stage" :
-                i == DX12::ESS_Pixel    ? "Pixel    shader stage" : "Unknown  shader stage",
-                resourceBinding.ShaderSlot,
-                resourceDescriptorOffset++,
-                resource ? resource->GetResourceName().c_str() : "nullptr",
-                resource ? DX12::StateToString(resource->GetDX12Resource().GetCurrentState()) : "-");
-        }
-        else if (resourceBinding.ViewType == D3D12_DESCRIPTOR_RANGE_TYPE_UAV)
-        {
-#ifdef GFX_DEBUG
-            CCryDX12UnorderedAccessView* resource = state.Stages[i].UnorderedAccessViews.Get(resourceBinding.ShaderSlot);
-            AZ_Assert(resource, "UnorderedAccessView is required by the PSO but has not been set!");
-            AZ_Assert(resourceDescriptorOffset == resourceBinding.DescriptorOffset, "UnorderedAccessView offset has shifted: resource mapping invalid!");
-#endif
-            DX12_LOG(" %s: U %2d -> %2d %s [%s]",
-                i == DX12::ESS_Compute  ? "Every    shader stage" :
-                i == DX12::ESS_Vertex   ? "Vertex   shader stage" :
-                i == DX12::ESS_Hull     ? "Hull     shader stage" :
-                i == DX12::ESS_Domain   ? "Domain   shader stage" :
-                i == DX12::ESS_Geometry ? "Geometry shader stage" :
-                i == DX12::ESS_Pixel    ? "Pixel    shader stage" : "Unknown  shader stage",
-                resourceBinding.ShaderSlot,
-                resourceDescriptorOffset++,
-                resource ? resource->GetResourceName().c_str() : "nullptr",
-                resource ? DX12::StateToString(resource->GetDX12Resource().GetCurrentState()) : "-");
-        }
-    }
-
-    // Bind samplers
-    for (const DX12::ResourceLayoutBinding& samplerBinding : layout.m_Samplers)
-    {
-        const DX12::EShaderStage i = samplerBinding.ShaderStage;
-        AZ_Assert(samplerBinding.ViewType == D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, "");
-        {
-#ifdef GFX_DEBUG
-            CCryDX12SamplerState* sampler = state.Stages[i].SamplerState.Get(samplerBinding.ShaderSlot);
-            AZ_Assert(sampler, "Sampler is required by the PSO but has not been set!");
-            AZ_Assert(samplerDescriptorOffset == samplerBinding.DescriptorOffset, "Sampler offset has shifted: resource mapping invalid!");
-#endif
-            DX12_LOG(" %s: S %2d -> %2d",
-                i == DX12::ESS_Compute  ? "Every    shader stage" :
-                i == DX12::ESS_Vertex   ? "Vertex   shader stage" :
-                i == DX12::ESS_Hull     ? "Hull     shader stage" :
-                i == DX12::ESS_Domain   ? "Domain   shader stage" :
-                i == DX12::ESS_Geometry ? "Geometry shader stage" :
-                i == DX12::ESS_Pixel    ? "Pixel    shader stage" : "Unknown  shader stage",
-                samplerBinding.ShaderSlot,
-                samplerDescriptorOffset++);
-        }
-    }
-}
-
-void CCryDX12DeviceContext::CeaseDirectCommandQueue(bool wait)
-{
-    AZ_TRACE_METHOD();
-    AZ_Assert(m_DirectCommandList != nullptr, "CommandList hasn't been allocated!");
-    AZ_Assert(m_OutstandingQueries == 0, "Flushing command list with outstanding queries!");
-
-    m_DirectCommandList->End();
-    m_DirectListPool.ForfeitCommandList(m_DirectCommandList, wait);
-}
-
-void CCryDX12DeviceContext::ResumeDirectCommandQueue()
-{
-    AZ_TRACE_METHOD();
-    AZ_Assert(m_DirectCommandList == nullptr, "CommandList hasn't been submitted!");
-    m_DirectListPool.AcquireCommandList(m_DirectCommandList);
-
-    m_DirectCommandList->Begin();
-    m_DirectCommandList->SetResourceAndSamplerStateHeaps();
-
-    ResetCachedState();
-}
-
-void CCryDX12DeviceContext::CeaseCopyCommandQueue(bool wait)
-{
-    AZ_TRACE_METHOD();
-    AZ_Assert(m_CopyCommandList != nullptr, "CommandList hasn't been allocated!");
-
-    m_CopyCommandList->End();
-    m_CopyListPool.ForfeitCommandList(m_CopyCommandList, wait);
-}
-
-void CCryDX12DeviceContext::ResumeCopyCommandQueue()
-{
-    AZ_TRACE_METHOD();
-    AZ_Assert(m_CopyCommandList == nullptr, "CommandList hasn't been submitted!");
-    m_CopyListPool.AcquireCommandList(m_CopyCommandList);
-
-    m_CopyCommandList->Begin();
-}
-
-void CCryDX12DeviceContext::CeaseAllCommandQueues(bool wait)
-{
-    AZ_TRACE_METHOD();
-    CeaseDirectCommandQueue(wait);
-    CeaseCopyCommandQueue(wait);
-}
-
-void CCryDX12DeviceContext::ResumeAllCommandQueues()
-{
-    AZ_TRACE_METHOD();
-    ResumeDirectCommandQueue();
-    ResumeCopyCommandQueue();
-}
-
-void CCryDX12DeviceContext::SubmitDirectCommands(bool wait)
-{
-    if (m_DirectCommandList->IsUtilized())
-    {
-        AZ_TRACE_METHOD();
-        CeaseDirectCommandQueue(wait);
-        ResumeDirectCommandQueue();
-    }
-}
-
-void CCryDX12DeviceContext::SubmitCopyCommands(bool wait)
-{
-    if (m_CopyCommandList->IsUtilized())
-    {
-        AZ_TRACE_METHOD();
-        CeaseCopyCommandQueue(wait);
-        ResumeCopyCommandQueue();
-    }
-}
-
-void CCryDX12DeviceContext::SubmitDirectCommands(bool wait, const UINT64 fenceValue)
-{
-    if (m_DirectCommandList->IsUtilized() && (m_CmdFenceSet.GetCurrentValue(CMDQUEUE_GRAPHICS) == fenceValue))
-    {
-#ifdef DX12_STATS
-        m_NumCommandListSplits++;
-#endif // DX12_STATS
-
-        SubmitDirectCommands(wait);
-    }
-}
-
-void CCryDX12DeviceContext::SubmitCopyCommands(bool wait, const UINT64 fenceValue)
-{
-    if (m_CopyCommandList->IsUtilized() && (m_CmdFenceSet.GetCurrentValue(CMDQUEUE_COPY) == fenceValue))
-    {
-#ifdef DX12_STATS
-        m_NumCommandListSplits++;
-#endif // DX12_STATS
-
-        SubmitCopyCommands(wait);
-    }
-}
-
-void CCryDX12DeviceContext::SubmitAllCommands(bool bWaitForGpu)
-{
-    SubmitAllCommands(bWaitForGpu, m_CmdFenceSet.GetCurrentValues());
-}
-
-void CCryDX12DeviceContext::SubmitAllCommands(bool wait, const UINT64 (&fenceValues)[CMDQUEUE_NUM])
-{
-    SubmitDirectCommands(wait, fenceValues[CMDQUEUE_GRAPHICS]);
-    SubmitCopyCommands(wait, fenceValues[CMDQUEUE_COPY]);
-}
-
-
-void CCryDX12DeviceContext::SubmitAllCommands(bool wait, const UINT64(&fenceValues)[CMDQUEUE_NUM], int fenceId)
-{
-    AZ::u64 fenceValuesMasked[CMDQUEUE_NUM];
-    fenceValuesMasked[CMDQUEUE_GRAPHICS] = fenceValues[CMDQUEUE_GRAPHICS];
-    fenceValuesMasked[CMDQUEUE_COPY] = fenceValues[CMDQUEUE_COPY];
-    fenceValuesMasked[fenceId] = 0;
-
-    SubmitDirectCommands(wait, fenceValuesMasked[CMDQUEUE_GRAPHICS]);
-    SubmitCopyCommands(wait, fenceValuesMasked[CMDQUEUE_COPY]);
-}
-
-void CCryDX12DeviceContext::SubmitAllCommands(bool wait, const std::atomic<AZ::u64>(&fenceValues)[CMDQUEUE_NUM])
-{
-    SubmitDirectCommands(wait, fenceValues[CMDQUEUE_GRAPHICS]);
-    SubmitCopyCommands(wait, fenceValues[CMDQUEUE_COPY]);
-}
-
-void CCryDX12DeviceContext::SubmitAllCommands(bool wait, const std::atomic<AZ::u64>(&fenceValues)[CMDQUEUE_NUM], int fenceId)
-{
-    AZ::u64 fenceValuesMasked[CMDQUEUE_NUM];
-    fenceValuesMasked[CMDQUEUE_GRAPHICS] = fenceValues[CMDQUEUE_GRAPHICS];
-    fenceValuesMasked[CMDQUEUE_COPY] = fenceValues[CMDQUEUE_COPY];
-    fenceValuesMasked[fenceId] = 0;
-
-    SubmitDirectCommands(wait, fenceValuesMasked[CMDQUEUE_GRAPHICS]);
-    SubmitCopyCommands(wait, fenceValuesMasked[CMDQUEUE_COPY]);
-}
-
-void CCryDX12DeviceContext::Finish(DX12::SwapChain* pDX12SwapChain)
-{
-    AZ_TRACE_METHOD();
-    m_DirectCommandList->PresentRenderTargetView(pDX12SwapChain);
-
-    SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, m_CmdFenceSet.GetCurrentValues());
-
-    // Release resource after pass fence and FRAME_FENCE_LATENCY later
-    m_pDX12Device->FlushReleaseHeap(DX12::Device::ResourceReleasePolicy::Deferred);
-
-    m_pDX12Device->FinishFrame();
-    m_pDX12Device->CalibrateClocks(m_DirectListPool.GetD3D12CommandQueue());
-
-#ifdef DX12_STATS
-    m_NumMapDiscardSkips = 0;
-    m_NumMapDiscards = 0;
-
-    m_NumCommandListOverflows = 0;
-    m_NumCommandListSplits = 0;
-    m_NumPSOs = 0;
-    m_NumRootSignatures = 0;
-    m_NumberSettingOutputViews = 0;
-#endif // DX12_STATS
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-UINT CCryDX12DeviceContext::TimestampIndex([[maybe_unused]] DX12::CommandList* pCmdList)
-{
-    UINT index = m_TimestampIndex;
-    m_TimestampIndex = (m_TimestampIndex + 1) % m_TimestampHeap.GetCapacity();
-    return index;
-}
-
-ID3D12Resource* CCryDX12DeviceContext::QueryTimestamp(DX12::CommandList* pCmdList, UINT index)
-{
-    pCmdList->EndQuery(m_TimestampHeap, D3D12_QUERY_TYPE_TIMESTAMP, index);
-
-    m_TimestampMapValid = false;
-    if (m_TimestampMemory)
-    {
-        const D3D12_RANGE sNoWrite = { 0, 0 };
-        m_TimestampDownloadBuffer->Unmap(0, &sNoWrite);
-        m_TimestampMemory = nullptr;
-    }
-
-    return m_TimestampDownloadBuffer;
-}
-
-void CCryDX12DeviceContext::ResolveTimestamp(DX12::CommandList* pCmdList, UINT index, void* mem)
-{
-    if (mem)
-    {
-        if (!m_TimestampMapValid)
-        {
-            if (m_TimestampMemory)
-            {
-                const D3D12_RANGE sNoWrite = { 0, 0 };
-                m_TimestampDownloadBuffer->Unmap(0, &sNoWrite);
-                m_TimestampMemory = nullptr;
-            }
-
-            pCmdList->ResolveQueryData(m_TimestampHeap, D3D12_QUERY_TYPE_TIMESTAMP, 0, m_TimestampHeap.GetCapacity(), m_TimestampDownloadBuffer, 0);
-
-            // Resources on D3D12_HEAP_TYPE_READBACK heaps do not support persistent map.
-            const D3D12_RANGE sFullRead = { 0, sizeof(UINT64) * m_TimestampHeap.GetCapacity() };
-            m_TimestampDownloadBuffer->Map(0, &sFullRead, &m_TimestampMemory);
-            m_TimestampMapValid = true;
-        }
-
-        memcpy(mem, (char*)m_TimestampMemory + index * 8, 8);
-    }
-}
-
-UINT64 CCryDX12DeviceContext::MakeCpuTimestamp(UINT64 gpuTimestamp) const
-{
-    return m_pDX12Device->MakeCpuTimestamp(gpuTimestamp);
-}
-
-UINT64 CCryDX12DeviceContext::MakeCpuTimestampMicroseconds(UINT64 gpuTimestamp) const
-{
-    return m_pDX12Device->MakeCpuTimestampMicroseconds(gpuTimestamp);
-}
-
-UINT CCryDX12DeviceContext::OcclusionIndex(DX12::CommandList* pCmdList, bool counter)
-{
-    UINT index = m_OcclusionIndex;
-    m_OcclusionIndex = (m_OcclusionIndex + 1) % m_OcclusionHeap.GetCapacity();
-    pCmdList->BeginQuery(m_OcclusionHeap, counter ? D3D12_QUERY_TYPE_OCCLUSION : D3D12_QUERY_TYPE_BINARY_OCCLUSION, index);
-    return index;
-}
-
-ID3D12Resource* CCryDX12DeviceContext::QueryOcclusion(DX12::CommandList* pCmdList, UINT index, bool counter)
-{
-    pCmdList->EndQuery(m_OcclusionHeap, counter ? D3D12_QUERY_TYPE_OCCLUSION : D3D12_QUERY_TYPE_BINARY_OCCLUSION, index);
-
-    m_OcclusionMapValid = false;
-    if (m_OcclusionMemory)
-    {
-        const D3D12_RANGE sNoWrite = { 0, 0 };
-        m_OcclusionDownloadBuffer->Unmap(0, &sNoWrite);
-        m_OcclusionMemory = nullptr;
-    }
-
-    return m_OcclusionDownloadBuffer;
-}
-
-void CCryDX12DeviceContext::ResolveOcclusion(DX12::CommandList* pCmdList, UINT index, void* mem)
-{
-    if (mem)
-    {
-        if (!m_OcclusionMapValid)
-        {
-            if (m_OcclusionMemory)
-            {
-                const D3D12_RANGE sNoWrite = { 0, 0 };
-                m_OcclusionDownloadBuffer->Unmap(0, &sNoWrite);
-                m_OcclusionMemory = nullptr;
-            }
-
-            pCmdList->ResolveQueryData(m_OcclusionHeap, D3D12_QUERY_TYPE_OCCLUSION, 0, m_OcclusionHeap.GetCapacity(), m_OcclusionDownloadBuffer, 0);
-
-            // Resources on D3D12_HEAP_TYPE_READBACK heaps do not support persistent map.
-            const D3D12_RANGE sFullRead = { 0, sizeof(UINT64) * m_OcclusionHeap.GetCapacity() };
-            m_OcclusionDownloadBuffer->Map(0, &sFullRead, &m_OcclusionMemory);
-            m_OcclusionMapValid = true;
-        }
-
-        memcpy(mem, (char*)m_OcclusionMemory + index * 8, 8);
-    }
-}
-
-void CCryDX12DeviceContext::WaitForIdle()
-{
-    DX12::CommandListFence fence(m_pDX12Device);
-    fence.Init();
-
-    m_DirectListPool.GetD3D12CommandQueue()->Signal(fence.GetFence(), 1);
-
-    fence.WaitForFence(1);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma region /* ID3D11DeviceChild implementation */
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GetDevice(
-    [[maybe_unused]] _Out_  ID3D11Device** ppDevice)
-{
-    DX12_FUNC_LOG
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::GetPrivateData(
-    [[maybe_unused]] _In_  REFGUID guid,
-    [[maybe_unused]] _Inout_  UINT* pDataSize,
-    [[maybe_unused]] _Out_writes_bytes_opt_(*pDataSize)  void* pData)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::SetPrivateData(
-    [[maybe_unused]] _In_  REFGUID guid,
-    [[maybe_unused]] _In_  UINT DataSize,
-    [[maybe_unused]] _In_reads_bytes_opt_(DataSize)  const void* pData)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::SetPrivateDataInterface(
-    [[maybe_unused]] _In_  REFGUID guid,
-    [[maybe_unused]] _In_opt_  const IUnknown* pData)
-{
-    DX12_FUNC_LOG
-    return -1;
-}
-
-#pragma endregion
-
-#pragma region /* ID3D11DeviceContext implementation */
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSSetConstantBuffers(
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppConstantBuffers)
-{
-    VSSetConstantBuffers1(StartSlot, NumBuffers, ppConstantBuffers, NULL, NULL);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSSetShaderResources(
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    _In_reads_opt_(NumViews)  ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumViews; i < S; ++i, ++ppShaderResourceViews)
-    {
-        CCryDX12ShaderResourceView* srv = reinterpret_cast<CCryDX12ShaderResourceView*>(*ppShaderResourceViews);
-        if (m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Pixel].ShaderResourceViews.Set(i, srv) && srv)
-        {
-            srv->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSSetShader(
-    _In_opt_  ID3D11PixelShader* pPixelShader,
-    [[maybe_unused]] _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance* const* ppClassInstances,
-    [[maybe_unused]] UINT NumClassInstances)
-{
-    DX12_FUNC_LOG
-    m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Pixel].Shader.Set(reinterpret_cast<CCryDX12Shader*>(pPixelShader));
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSSetSamplers(
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    _In_reads_opt_(NumSamplers)  ID3D11SamplerState* const* ppSamplers)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumSamplers; i < S; ++i, ++ppSamplers)
-    {
-        m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Pixel].SamplerState.Set(i, reinterpret_cast<CCryDX12SamplerState*>(*ppSamplers));
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSSetShader(
-    _In_opt_  ID3D11VertexShader* pVertexShader,
-    [[maybe_unused]] _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance* const* ppClassInstances,
-    [[maybe_unused]] UINT NumClassInstances)
-{
-    DX12_FUNC_LOG
-    m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Vertex].Shader.Set(reinterpret_cast<CCryDX12Shader*>(pVertexShader));
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DrawIndexed(
-    _In_  UINT IndexCount,
-    _In_  UINT StartIndexLocation,
-    _In_  INT BaseVertexLocation)
-{
-    DX12_FUNC_LOG
-
-    SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-
-    if (PrepareGraphicsState())
-    {
-        m_DirectCommandList->DrawIndexedInstanced(IndexCount, 1, StartIndexLocation, BaseVertexLocation, 0);
-#ifdef AZ_DEBUG_BUILD
-        m_PipelineState[DX12::CommandModeGraphics].DebugPrint();
-#endif
-        if constexpr (DX12_SUBMISSION_MODE <= DX12_SUBMISSION_PERDRAW)
-        {
-            if (m_OutstandingQueries == 0)
-            {
-                SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-            }
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::Draw(
-    _In_  UINT VertexCount,
-    _In_  UINT StartVertexLocation)
-{
-    DX12_FUNC_LOG
-
-    SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-
-    if (PrepareGraphicsState())
-    {
-        m_DirectCommandList->DrawInstanced(VertexCount, 1, StartVertexLocation, 0);
-#ifdef AZ_DEBUG_BUILD
-        m_PipelineState[DX12::CommandModeGraphics].DebugPrint();
-#endif
-        if constexpr (DX12_SUBMISSION_MODE <= DX12_SUBMISSION_PERDRAW)
-        {
-            if (m_OutstandingQueries == 0)
-            {
-                SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-            }
-        }
-    }
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::Map(
-    _In_  ID3D11Resource* pResource,
-    _In_  UINT Subresource,
-    _In_  D3D11_MAP MapType,
-    [[maybe_unused]] _In_  UINT MapFlags,
-    _Out_  D3D11_MAPPED_SUBRESOURCE* pMappedResource)
-{
-    DX12_FUNC_LOG
-
-    ZeroMemory(pMappedResource, sizeof(D3D11_MAPPED_SUBRESOURCE));
-
-    DX12_LOG("  Mapping resource: %p (%d)", pResource, Subresource);
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pResource);
-    DX12::Resource& resource = dx12Resource->GetDX12Resource();
-
-    if (!resource.IsOffCard())
-    {
-        return S_FALSE;
-    }
-
-    switch (MapType)
-    {
-    case D3D11_MAP_READ:
-        // Ensure the command-list using the resource is executed
-        SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, resource.GetFenceValues(CMDTYPE_WRITE));
-
-        // Block the CPU-thread until the resource is safe to map
-        resource.WaitForUnused(m_DirectListPool, CMDTYPE_WRITE);
-        break;
-    case D3D11_MAP_WRITE:
-    case D3D11_MAP_READ_WRITE:
-        // Ensure the command-list using the resource is executed
-        SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, resource.GetFenceValues(CMDTYPE_ANY));
-
-        // Block the CPU-thread until the resource is safe to map
-        resource.WaitForUnused(m_DirectListPool, CMDTYPE_ANY);
-        break;
-    case D3D11_MAP_WRITE_DISCARD:
-        DX12_LOG("Using D3D11_MAP_WRITE_DISCARD on old ID3D12Resource: %p", DX12_EXTRACT_D3D12RESOURCE(pResource));
-
-#ifdef DX12_STATS
-        m_NumMapDiscardSkips += !resource.IsUsed(m_DirectListPool);
-        m_NumMapDiscards++;
-#endif // DX12_STATS
-
-        // If the resource is not currently used, we do not need to discard the memory
-        if (resource.IsUsed(m_DirectListPool))
-        {
-            dx12Resource->MapDiscard(m_DirectCommandList);
-        }
-
-        DX12_LOG("New ID3D12Resource: %p", DX12_EXTRACT_D3D12RESOURCE(pResource));
-        break;
-    case D3D11_MAP_WRITE_NO_OVERWRITE:
-        break;
-    default:
-        break;
-    }
-
-    static D3D12_RANGE sRg[] =
-    {
-        { 0, 0 }, // It is valid to specify the CPU won't read any data by passing a range where End is less than or equal to Begin
-        { 0, 0 }  // It is valid to specify the CPU didn't write any data by passing a range where End is less than or equal to Begin.
-    };
-
-    static D3D12_RANGE* pRanges[] =
-    {
-        nullptr, // D3D11_MAP_READ = 1,
-        nullptr, // D3D11_MAP_WRITE = 2,
-        nullptr, // D3D11_MAP_READ_WRITE = 3,
-        &sRg[0], // D3D11_MAP_WRITE_DISCARD = 4,
-        &sRg[0], // D3D11_MAP_WRITE_NO_OVERWRITE = 5
-    };
-    AZ_Assert((MapType - 1) < AZ_ARRAY_SIZE(pRanges), "Invalid map type");
-
-    AZ_Assert(!D3D12IsLayoutOpaque(resource.GetDesc().Layout), "Opaque layouts are unmappable until 12.2!");
-    HRESULT hr = dx12Resource->GetD3D12Resource()->Map(Subresource, pRanges[MapType - 1], &(pMappedResource->pData));
-
-    if (S_OK != hr)
-    {
-        AZ_Assert(0, "Could not map resource!");
-        return hr;
-    }
-
-    return S_OK;
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::Unmap(
-    _In_  ID3D11Resource* pResource,
-    _In_  UINT Subresource)
-{
-    DX12_FUNC_LOG
-
-    DX12_LOG("Unmapping resource: %p (%d)", pResource, Subresource);
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pResource);
-
-    // NOTE: Don't know MapType, can't optimize writeRange!
-
-    AZ_Assert(!D3D12IsLayoutOpaque(dx12Resource->GetDX12Resource().GetDesc().Layout), "Opaque layouts are unmappable until 12.2!");
-    dx12Resource->GetD3D12Resource()->Unmap(Subresource, NULL);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSSetConstantBuffers(
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppConstantBuffers)
-{
-    PSSetConstantBuffers1(StartSlot, NumBuffers, ppConstantBuffers, NULL, NULL);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IASetInputLayout(
-    _In_opt_  ID3D11InputLayout* pInputLayout)
-{
-    DX12_FUNC_LOG
-
-    m_PipelineState[DX12::CommandModeGraphics].InputAssembler.InputLayout.Set(reinterpret_cast<CCryDX12InputLayout*>(pInputLayout));
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IASetVertexBuffers(
-    _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppVertexBuffers,
-    _In_reads_opt_(NumBuffers)  const UINT* pStrides,
-    _In_reads_opt_(NumBuffers)  const UINT* pOffsets)
-{
-    DX12_FUNC_LOG
-
-    auto& inputAssembler = m_PipelineState[DX12::CommandModeGraphics].InputAssembler;
-    for (UINT i = StartSlot, S = StartSlot + NumBuffers; i < S; ++i, ++ppVertexBuffers, ++pStrides, ++pOffsets)
-    {
-        CCryDX12Buffer* vb = reinterpret_cast<CCryDX12Buffer*>(*ppVertexBuffers);
-
-        inputAssembler.Strides.Set(i, *pStrides);
-        inputAssembler.Offsets.Set(i, *pOffsets);
-        if (inputAssembler.VertexBuffers.Set(i, vb) && vb)
-        {
-            vb->BeginResourceStateTransition(m_DirectCommandList.get(), D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER);
-        }
-    }
-
-    UINT numVertexBuffers = 0;
-    for (UINT i = 0; i < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i)
-    {
-        if (inputAssembler.VertexBuffers.Get(i))
-        {
-            numVertexBuffers = i + 1;
-        }
-    }
-
-    inputAssembler.NumVertexBuffers.Set(numVertexBuffers);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IASetIndexBuffer(
-    _In_opt_  ID3D11Buffer* pIndexBuffer,
-    _In_  DXGI_FORMAT Format,
-    _In_  UINT Offset)
-{
-    DX12_FUNC_LOG
-
-    auto& inputAssembler = m_PipelineState[DX12::CommandModeGraphics].InputAssembler;
-    CCryDX12Buffer* ib = reinterpret_cast<CCryDX12Buffer*>(pIndexBuffer);
-
-    inputAssembler.IndexBufferFormat.Set(Format);
-    inputAssembler.IndexBufferOffset.Set(Offset);
-    if (inputAssembler.IndexBuffer.Set(ib) && ib)
-    {
-        ib->BeginResourceStateTransition(m_DirectCommandList.get(), D3D12_RESOURCE_STATE_INDEX_BUFFER);
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DrawIndexedInstanced(
-    _In_  UINT IndexCountPerInstance,
-    _In_  UINT InstanceCount,
-    _In_  UINT StartIndexLocation,
-    _In_  INT BaseVertexLocation,
-    _In_  UINT StartInstanceLocation)
-{
-    DX12_FUNC_LOG
-
-    SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-
-    if (PrepareGraphicsState())
-    {
-        m_DirectCommandList->DrawIndexedInstanced(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation);
-#ifdef AZ_DEBUG_BUILD
-        m_PipelineState[DX12::CommandModeGraphics].DebugPrint();
-#endif
-        if constexpr (DX12_SUBMISSION_MODE <= DX12_SUBMISSION_PERDRAW)
-        {
-            if (m_OutstandingQueries == 0)
-            {
-                SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-            }
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DrawInstanced(
-    _In_  UINT VertexCountPerInstance,
-    _In_  UINT InstanceCount,
-    _In_  UINT StartVertexLocation,
-    _In_  UINT StartInstanceLocation)
-{
-    DX12_FUNC_LOG
-
-    SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-
-    if (PrepareGraphicsState())
-    {
-        m_DirectCommandList->DrawInstanced(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation);
-#ifdef AZ_DEBUG_BUILD
-        m_PipelineState[DX12::CommandModeGraphics].DebugPrint();
-#endif
-        if constexpr (DX12_SUBMISSION_MODE <= DX12_SUBMISSION_PERDRAW)
-        {
-            if (m_OutstandingQueries == 0)
-            {
-                SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-            }
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSSetConstantBuffers(
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppConstantBuffers)
-{
-    GSSetConstantBuffers1(StartSlot, NumBuffers, ppConstantBuffers, NULL, NULL);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSSetShader(
-    _In_opt_  ID3D11GeometryShader* pShader,
-    [[maybe_unused]] _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance* const* ppClassInstances,
-    [[maybe_unused]] UINT NumClassInstances)
-{
-    DX12_FUNC_LOG
-    m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Geometry].Shader.Set(reinterpret_cast<CCryDX12Shader*>(pShader));
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IASetPrimitiveTopology(
-    _In_  D3D11_PRIMITIVE_TOPOLOGY Topology)
-{
-    DX12_FUNC_LOG
-    m_PipelineState[DX12::CommandModeGraphics].InputAssembler.PrimitiveTopology.Set(Topology);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSSetShaderResources(
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    _In_reads_opt_(NumViews)  ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumViews; i < S; ++i, ++ppShaderResourceViews)
-    {
-        CCryDX12ShaderResourceView* srv = reinterpret_cast<CCryDX12ShaderResourceView*>(*ppShaderResourceViews);
-        if (m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Vertex].ShaderResourceViews.Set(i, srv) && srv)
-        {
-            srv->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSSetSamplers(
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    _In_reads_opt_(NumSamplers)  ID3D11SamplerState* const* ppSamplers)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumSamplers; i < S; ++i, ++ppSamplers)
-    {
-        m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Vertex].SamplerState.Set(i, reinterpret_cast<CCryDX12SamplerState*>(*ppSamplers));
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::Begin(
-    _In_  ID3D11Asynchronous* pAsync)
-{
-    DX12_FUNC_LOG
-    auto pQuery = reinterpret_cast<CCryDX12Query*>(pAsync);
-
-    D3D11_QUERY_DESC desc;
-    pQuery->GetDesc(&desc);
-
-    if (desc.Query == D3D11_QUERY_EVENT)
-    {
-        return;
-    }
-    else if (desc.Query == D3D11_QUERY_TIMESTAMP_DISJOINT)
-    {
-        return;
-    }
-    else if (desc.Query == D3D11_QUERY_TIMESTAMP)
-    {
-        return;
-    }
-    else if (desc.Query == D3D11_QUERY_OCCLUSION || desc.Query == D3D11_QUERY_OCCLUSION_PREDICATE)
-    {
-        auto pOcclusionQuery = reinterpret_cast<CCryDX12ResourceQuery*>(pAsync);
-        pOcclusionQuery->SetFenceValue(m_CmdFenceSet.GetCurrentValue(CMDQUEUE_GRAPHICS));
-        pOcclusionQuery->SetQueryIndex(OcclusionIndex(m_DirectCommandList, desc.Query == D3D11_QUERY_OCCLUSION));
-        ++m_OutstandingQueries;
-    }
-    else
-    {
-        __debugbreak();
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::End(
-    _In_  ID3D11Asynchronous* pAsync)
-{
-    DX12_FUNC_LOG
-    auto pQuery = reinterpret_cast<CCryDX12Query*>(pAsync);
-
-    D3D11_QUERY_DESC desc;
-    pQuery->GetDesc(&desc);
-
-    if (desc.Query == D3D11_QUERY_EVENT)
-    {
-        // Record fence of commands prior to this point
-        auto pEventQuery = reinterpret_cast<CCryDX12EventQuery*>(pAsync);
-        pEventQuery->SetFenceValue(InsertFence());
-    }
-    else if (desc.Query == D3D11_QUERY_TIMESTAMP_DISJOINT)
-    {
-        return;
-    }
-    else if (desc.Query == D3D11_QUERY_TIMESTAMP)
-    {
-        // Record fence of commands following at this point
-        auto pTimestampQuery = reinterpret_cast<CCryDX12ResourceQuery*>(pAsync);
-        pTimestampQuery->SetFenceValue(InsertFence());
-        pTimestampQuery->SetQueryIndex(TimestampIndex(m_DirectCommandList));
-        pTimestampQuery->SetQueryResource(QueryTimestamp(m_DirectCommandList, pTimestampQuery->GetQueryIndex()));
-    }
-    else if (desc.Query == D3D11_QUERY_OCCLUSION)
-    {
-        auto pOcclusionQuery = reinterpret_cast<CCryDX12ResourceQuery*>(pAsync);
-        pOcclusionQuery->SetFenceValue(InsertFence());
-        pOcclusionQuery->SetQueryResource(QueryOcclusion(m_DirectCommandList, pOcclusionQuery->GetQueryIndex(), desc.Query == D3D11_QUERY_OCCLUSION));
-
-        AZ_Assert(m_OutstandingQueries != 0, "End without a Start");
-        --m_OutstandingQueries;
-    }
-    else // || desc.Query == D3D11_QUERY_OCCLUSION_PREDICATE)
-    {
-        __debugbreak();
-    }
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::GetData(
-    _In_  ID3D11Asynchronous* pAsync,
-    _Out_writes_bytes_opt_(DataSize)  void* pData,
-    [[maybe_unused]] _In_  UINT DataSize,
-    _In_  UINT GetDataFlags)
-{
-    DX12_FUNC_LOG
-    auto pQuery = reinterpret_cast<CCryDX12Query*>(pAsync);
-
-    D3D11_QUERY_DESC desc;
-    pQuery->GetDesc(&desc);
-
-    if (desc.Query == D3D11_QUERY_EVENT)
-    {
-        AZ_Assert(DataSize >= sizeof(BOOL), "Invalid data size");
-
-        auto pEventQuery = reinterpret_cast<CCryDX12EventQuery*>(pAsync);
-        bool bComplete = TestForFence(pEventQuery->GetFenceValue()) == S_OK;
-
-        if (!bComplete && !(GetDataFlags & D3D11_ASYNC_GETDATA_DONOTFLUSH))
-        {
-            // Ensure the command-list issuing the query is executed
-            SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, pEventQuery->GetFenceValue());
-            FlushToFence(pEventQuery->GetFenceValue());
-        }
-
-        *reinterpret_cast<BOOL*>(pData) = bComplete;
-        return bComplete ? S_OK : S_FALSE;
-    }
-    else if (desc.Query == D3D11_QUERY_TIMESTAMP_DISJOINT)
-    {
-        AZ_Assert(DataSize >= sizeof(D3D11_QUERY_DATA_TIMESTAMP_DISJOINT), "Invalid data size");
-        D3D11_QUERY_DATA_TIMESTAMP_DISJOINT sData;
-
-        // D3D12 WARNING: ID3D12CommandQueue::ID3D12CommandQueue::GetTimestampFrequency: Use
-        // ID3D12Device::SetStablePowerstate for reliable timestamp queries [ EXECUTION WARNING #736: UNSTABLE_POWER_STATE]
-        sData.Disjoint = FALSE;
-        sData.Frequency = m_pDX12Device->GetGpuTimestampFrequency();
-
-        *reinterpret_cast<D3D11_QUERY_DATA_TIMESTAMP_DISJOINT*>(pData) = sData;
-
-        return S_OK;
-    }
-    else if (desc.Query == D3D11_QUERY_TIMESTAMP)
-    {
-        AZ_Assert(DataSize >= sizeof(UINT64), "Invalid data size");
-
-        auto pTimestampQuery = reinterpret_cast<CCryDX12ResourceQuery*>(pAsync);
-        bool bComplete = TestForFence(pTimestampQuery->GetFenceValue()) == S_OK;
-
-        if (!bComplete && !(GetDataFlags & D3D11_ASYNC_GETDATA_DONOTFLUSH))
-        {
-            // Ensure the command-list issuing the timestamp is executed
-            SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, pTimestampQuery->GetFenceValue());
-            FlushToFence(pTimestampQuery->GetFenceValue());
-        }
-
-        // Since we do FlushToFence if not completed, it will be completed now.
-        ResolveTimestamp(m_DirectCommandList, pTimestampQuery->GetQueryIndex(), pData);
-
-        return S_OK;
-    }
-    else if (desc.Query == D3D11_QUERY_OCCLUSION)
-    {
-        AZ_Assert(DataSize >= sizeof(UINT64), "Invalid data size");
-
-        auto pOcclusionQuery = reinterpret_cast<CCryDX12ResourceQuery*>(pAsync);
-        bool bComplete = TestForFence(pOcclusionQuery->GetFenceValue()) == S_OK;
-
-        if (!bComplete && !(GetDataFlags & D3D11_ASYNC_GETDATA_DONOTFLUSH))
-        {
-            // Ensure the command-list issuing the query is executed
-            SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, pOcclusionQuery->GetFenceValue());
-            FlushToFence(pOcclusionQuery->GetFenceValue());
-        }
-
-        if (bComplete)
-        {
-            ResolveOcclusion(m_DirectCommandList, pOcclusionQuery->GetQueryIndex(), pData);
-        }
-
-        return (bComplete) ? S_OK : S_FALSE;
-    }
-    else // || desc.Query == D3D11_QUERY_OCCLUSION_PREDICATE
-    {
-        __debugbreak();
-    }
-
-    return S_OK;
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::SetPredication(
-    [[maybe_unused]] _In_opt_  ID3D11Predicate* pPredicate,
-    [[maybe_unused]] _In_  BOOL PredicateValue)
-{
-    DX12_FUNC_LOG
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSSetShaderResources(
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    _In_reads_opt_(NumViews)  ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-    auto& geometry = m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Geometry];
-    for (UINT i = StartSlot, S = StartSlot + NumViews; i < S; ++i, ++ppShaderResourceViews)
-    {
-        CCryDX12ShaderResourceView* srv = reinterpret_cast<CCryDX12ShaderResourceView*>(*ppShaderResourceViews);
-        if (geometry.ShaderResourceViews.Set(i, srv) && srv)
-        {
-            srv->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSSetSamplers(
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    _In_reads_opt_(NumSamplers)  ID3D11SamplerState* const* ppSamplers)
-{
-    DX12_FUNC_LOG
-    auto& geometry = m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Geometry];
-    for (UINT i = StartSlot, S = StartSlot + NumSamplers; i < S; ++i, ++ppSamplers)
-    {
-        geometry.SamplerState.Set(i, reinterpret_cast<CCryDX12SamplerState*>(*ppSamplers));
-    }
-}
-
-static void ValidateSwapChain([[maybe_unused]] CCryDX12RenderTargetView& rtv)
-{
-#if defined(DEBUG)
-    if (DX12::SwapChain* swapChain = rtv.GetDX12Resource().GetDX12SwapChain())
-    {
-        AZ_Assert(swapChain->GetCurrentBackBuffer().GetD3D12Resource() == rtv.GetDX12Resource().GetD3D12Resource(), "invalid swap chain buffer");
-    }
-#endif
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMSetRenderTargets(
-    _In_range_(0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT)  UINT NumViews,
-    _In_reads_opt_(NumViews)  ID3D11RenderTargetView* const* ppRenderTargetViews,
-    _In_opt_  ID3D11DepthStencilView* pDepthStencilView)
-{
-    DX12_FUNC_LOG
-    auto& outputMerger = m_PipelineState[DX12::CommandModeGraphics].OutputMerger;
-
-    outputMerger.NumRenderTargets.Set(NumViews);
-    for (UINT i = 0; i < NumViews; ++i)
-    {
-        CCryDX12RenderTargetView* rtv = reinterpret_cast<CCryDX12RenderTargetView*>(ppRenderTargetViews[i]);
-        if (outputMerger.RenderTargetViews.Set(i, rtv))
-        {
-            if (!rtv)
-            {
-                outputMerger.RTVFormats.Set(i, DXGI_FORMAT_UNKNOWN);
-                continue;
-            }
-
-            ValidateSwapChain(*rtv);
-
-            DX12_LOG("Setting render target: %p (%d)", rtv, i);
-
-            // TODO: this might not be the earliest moment when it is known that the resource is used as render-target
-            D3D11_RENDER_TARGET_VIEW_DESC desc;
-            rtv->GetDesc(&desc);
-            rtv->BeginResourceStateTransition(m_DirectCommandList.get());
-
-            outputMerger.RTVFormats.Set(i, desc.Format);
-        }
-    }
-
-    for (UINT i = NumViews; i < D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
-    {
-        outputMerger.RenderTargetViews.Set(i, nullptr);
-        outputMerger.RTVFormats.Set(i, DXGI_FORMAT_UNKNOWN);
-    }
-
-    {
-        CCryDX12DepthStencilView* dsv = reinterpret_cast<CCryDX12DepthStencilView*>(pDepthStencilView);
-        if (outputMerger.DepthStencilView.Set(dsv))
-        {
-            if (!dsv)
-            {
-                outputMerger.DSVFormat.Set(DXGI_FORMAT_UNKNOWN);
-                return;
-            }
-
-            DX12_LOG("Setting depth stencil view: %p", dsv);
-
-            // TODO: this might not be the earliest moment when it is known that the resource is used as depth-stencil
-            D3D11_DEPTH_STENCIL_VIEW_DESC desc;
-            dsv->GetDesc(&desc);
-            dsv->BeginResourceStateTransition(m_DirectCommandList.get());
-
-            outputMerger.DSVFormat.Set(desc.Format);
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMSetRenderTargetsAndUnorderedAccessViews(
-    _In_  UINT NumRTVs,
-    [[maybe_unused]] _In_reads_opt_(NumRTVs)  ID3D11RenderTargetView* const* ppRenderTargetViews,
-    [[maybe_unused]] _In_opt_  ID3D11DepthStencilView* pDepthStencilView,
-    _In_range_(0, D3D11_1_UAV_SLOT_COUNT - 1)  UINT UAVStartSlot,
-    _In_  UINT NumUAVs,
-    _In_reads_opt_(NumUAVs)  ID3D11UnorderedAccessView* const* ppUnorderedAccessViews,
-    [[maybe_unused]] _In_reads_opt_(NumUAVs)  const UINT* pUAVInitialCounts)
-{
-    DX12_FUNC_LOG
-    if (NumRTVs > 0 && NumRTVs != D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL)
-    {
-        DX12_NOT_IMPLEMENTED //@TODO: Only the Unordered Access View portion of this function is implemented.
-    }
-
-    auto& graphicsStage = m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Pixel];
-    for (UINT i = UAVStartSlot, S = UAVStartSlot + NumUAVs; i < S; ++i, ++ppUnorderedAccessViews)
-    {
-        CCryDX12UnorderedAccessView* uav = reinterpret_cast<CCryDX12UnorderedAccessView*>(*ppUnorderedAccessViews);
-        if (graphicsStage.UnorderedAccessViews.Set(i, uav) && uav)
-        {
-            uav->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMSetBlendState(
-    _In_opt_  ID3D11BlendState* pBlendState,
-    [[maybe_unused]] _In_opt_  const FLOAT BlendFactor[4],
-    _In_  UINT SampleMask)
-{
-    DX12_FUNC_LOG
-
-    auto& outputMerger = m_PipelineState[DX12::CommandModeGraphics].OutputMerger;
-    outputMerger.BlendState.Set(reinterpret_cast<CCryDX12BlendState*>(pBlendState));
-    outputMerger.SampleMask.Set(SampleMask);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMSetDepthStencilState(
-    _In_opt_  ID3D11DepthStencilState* pDepthStencilState,
-    _In_  UINT StencilRef)
-{
-    DX12_FUNC_LOG
-
-    auto& state = m_PipelineState[DX12::CommandModeGraphics];
-    state.Rasterizer.DepthStencilState.Set(reinterpret_cast<CCryDX12DepthStencilState*>(pDepthStencilState));
-    state.OutputMerger.StencilRef.Set(StencilRef);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::SOSetTargets(
-    [[maybe_unused]] _In_range_(0, D3D11_SO_BUFFER_SLOT_COUNT)  UINT NumBuffers,
-    [[maybe_unused]] _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppSOTargets,
-    [[maybe_unused]] _In_reads_opt_(NumBuffers)  const UINT* pOffsets)
-{
-    DX12_FUNC_LOG
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DrawAuto()
-{
-    DX12_FUNC_LOG
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DrawIndexedInstancedIndirect(
-    [[maybe_unused]] _In_  ID3D11Buffer* pBufferForArgs,
-    [[maybe_unused]] _In_  UINT AlignedByteOffsetForArgs)
-{
-    DX12_FUNC_LOG
-    DX12_ASSERT(false, "unimplemented");
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DrawInstancedIndirect(
-    [[maybe_unused]] _In_  ID3D11Buffer* pBufferForArgs,
-    [[maybe_unused]] _In_  UINT AlignedByteOffsetForArgs)
-{
-    DX12_FUNC_LOG
-    DX12_ASSERT(false, "unimplemented");
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::Dispatch(
-    _In_  UINT ThreadGroupCountX,
-    _In_  UINT ThreadGroupCountY,
-    _In_  UINT ThreadGroupCountZ)
-{
-    DX12_FUNC_LOG
-
-    SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-
-    if (PrepareComputeState())
-    {
-        m_DirectCommandList->Dispatch(ThreadGroupCountX, ThreadGroupCountY, ThreadGroupCountZ);
-#ifdef AZ_DEBUG_BUILD
-        m_PipelineState[DX12::CommandModeCompute].DebugPrint();
-#endif
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DispatchIndirect(
-    [[maybe_unused]] _In_  ID3D11Buffer* pBufferForArgs,
-    [[maybe_unused]] _In_  UINT AlignedByteOffsetForArgs)
-{
-    DX12_FUNC_LOG
-    DX12_ASSERT(false, "unimplemented");
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::RSSetState(
-    _In_opt_  ID3D11RasterizerState* pRasterizerState)
-{
-    DX12_FUNC_LOG
-
-    auto& rasterizer = m_PipelineState[DX12::CommandModeGraphics].Rasterizer;
-    rasterizer.RasterizerState.Set(reinterpret_cast<CCryDX12RasterizerState*>(pRasterizerState));
-    if (pRasterizerState)
-    {
-        const D3D11_RASTERIZER_DESC& d3d11Desc = rasterizer.RasterizerState->GetD3D11RasterizerDesc();
-        rasterizer.ScissorEnabled.Set(d3d11Desc.ScissorEnable);
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::RSSetViewports(
-    _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE)  UINT NumViewports,
-    _In_reads_opt_(NumViewports)  const D3D11_VIEWPORT* pViewports)
-{
-    DX12_FUNC_LOG
-
-    auto& rasterizer = m_PipelineState[DX12::CommandModeGraphics].Rasterizer;
-    rasterizer.NumViewports.Set(NumViewports);
-    if (NumViewports)
-    {
-        for (UINT i = 0; i < NumViewports; ++i, ++pViewports)
-        {
-            rasterizer.Viewports.Set(i, *pViewports);
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::RSSetScissorRects(
-    _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE)  UINT NumRects,
-    _In_reads_opt_(NumRects)  const D3D11_RECT* pRects)
-{
-    DX12_FUNC_LOG
-
-    auto& rasterizer = m_PipelineState[DX12::CommandModeGraphics].Rasterizer;
-    rasterizer.NumScissors.Set(NumRects);
-    if (NumRects)
-    {
-        for (UINT i = 0; i < NumRects; ++i, ++pRects)
-        {
-            rasterizer.Scissors.Set(i, *pRects);
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CopySubresourceRegion(
-    _In_  ID3D11Resource* pDstResource,
-    _In_  UINT DstSubresource,
-    _In_  UINT DstX,
-    _In_  UINT DstY,
-    _In_  UINT DstZ,
-    _In_  ID3D11Resource* pSrcResource,
-    _In_  UINT SrcSubresource,
-    _In_opt_  const D3D11_BOX* pSrcBox)
-{
-    DX12_FUNC_LOG
-
-    CopySubresourceRegion1(
-        pDstResource,
-        DstSubresource,
-        DstX,
-        DstY,
-        DstZ,
-        pSrcResource,
-        SrcSubresource,
-        pSrcBox,
-        0);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CopyResource(
-    _In_  ID3D11Resource* pDstResource,
-    _In_  ID3D11Resource* pSrcResource)
-{
-    DX12_FUNC_LOG
-
-    CopyResource1(
-        pDstResource,
-        pSrcResource,
-        0);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::UploadResource(
-    _In_  ICryDX12Resource* pDstResource,
-    _In_  const D3D11_SUBRESOURCE_DATA* pInitialData,
-    _In_  size_t numInitialData)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-
-    DX12::Resource& dstResource = pDstResource->GetDX12Resource();
-    DX12::Resource::InitialData* id = dstResource.GetOrCreateInitialData();
-
-
-    D3D12_RESOURCE_DESC desc = dstResource.GetDesc();
-    const UINT maxSubResource = 64;
-    D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[maxSubResource];
-    UINT nRows[maxSubResource];
-    UINT64 rowSizes[maxSubResource];
-    CRY_ASSERT(numInitialData <= maxSubResource);
-
-    dstResource.GetDevice()->GetD3D12Device()->GetCopyableFootprints(&desc, 0, numInitialData, 0, layouts, nRows, rowSizes, &id->m_UploadSize);
-
-    id->m_SubResourceData.resize(numInitialData);
-
-    //Manually compute id->m_Size. This number is used to figure out the size of the intermediate CPU/GPU buffer into which the texture data is copied.
-    //The reason for doing this manually is because pTotalBytes (set by GetCopyableFootprints) is not  completely accurate. For some reason it
-    //seems like it doesnt take into account the 256 byte alignment padding of the last mip of a texture. Hence manually calculating the size
-    //using the pNumRows (in this case nRows) and pRowSizeInBytes (in this case rowSizes).
-    UINT64 totalBufferSize = 0;
-
-    for (UINT i = 0; i < numInitialData; ++i)
-    {
-        D3D12_SUBRESOURCE_DATA initialDestData;
-
-        initialDestData.RowPitch = pInitialData[i].SysMemPitch;
-        initialDestData.SlicePitch = pInitialData[i].SysMemSlicePitch;
-
-        UINT64 slicePitchSize = 0;
-        slicePitchSize = pInitialData[i].SysMemSlicePitch * desc.DepthOrArraySize; // Exact size of the texture data. No padding.
-        //TODO: pInitialData[i].SysMemSlicePitch can be 0 if the texture loading code doesnt set it. Fix this. For now we just query the GPU for the size (which is padded and wastes memory).
-        if (slicePitchSize == 0)
-        {
-            slicePitchSize = dstResource.GetRequiredUploadSize(i, 1);
-        }
-
-        BYTE* destMemory = new uint8_t[slicePitchSize];
-        UINT gpuSlicePitchSize = layouts[i].Footprint.RowPitch * nRows[i];
-        D3D12_MEMCPY_DEST destData = { destMemory, layouts[i].Footprint.RowPitch, gpuSlicePitchSize };
-
-        const BYTE* pSrc = static_cast<const BYTE*> (pInitialData[i].pSysMem);
-
-        for (UINT z = 0; z < layouts[i].Footprint.Depth; ++z)
-        {
-            BYTE* pDestSlice = static_cast<BYTE*> (destData.pData) + pInitialData[i].SysMemSlicePitch * z;
-            const BYTE* pSrcSlice = pSrc + pInitialData[i].SysMemSlicePitch * z;
-            for (UINT y = 0; y < nRows[i]; ++y)
-            {
-                memcpy(pDestSlice + pInitialData[i].SysMemPitch * y,
-                    pSrcSlice + pInitialData[i].SysMemPitch * y,
-                    pInitialData[i].SysMemPitch);
-            }
-        }
-        initialDestData.pData = destMemory;
-        id->m_SubResourceData[i] = initialDestData;
-        totalBufferSize += gpuSlicePitchSize;
-    }
-    id->m_Size = totalBufferSize;
-    UploadResource(&dstResource, id);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::UploadResource(
-    [[maybe_unused]] _In_  DX12::Resource* pDstResource,
-    [[maybe_unused]] _In_  const DX12::Resource::InitialData* pSrcData)
-{
-    DX12_FUNC_LOG
-
-    // TODO: This needs to be thread-safe
-    // pDstResource->InitDeferred(m_pGraphicsCmdList);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::UpdateSubresource(
-    _In_  ID3D11Resource* pDstResource,
-    _In_  UINT DstSubresource,
-    _In_opt_  const D3D11_BOX* pDstBox,
-    _In_  const void* pSrcData,
-    _In_  UINT SrcRowPitch,
-    _In_  UINT SrcDepthPitch)
-{
-    DX12_FUNC_LOG
-
-    UpdateSubresource1(
-        pDstResource,
-        DstSubresource,
-        pDstBox,
-        pSrcData,
-        SrcRowPitch,
-        SrcDepthPitch,
-        0);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CopyStructureCount(
-    [[maybe_unused]] _In_  ID3D11Buffer* pDstBuffer,
-    [[maybe_unused]] _In_  UINT DstAlignedByteOffset,
-    [[maybe_unused]] _In_  ID3D11UnorderedAccessView* pSrcView)
-{
-    DX12_FUNC_LOG
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearRenderTargetView(
-    _In_  ID3D11RenderTargetView* pRenderTargetView,
-    _In_  const FLOAT ColorRGBA[4])
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pRenderTargetView);
-    CCryDX12RenderTargetView* rtv = reinterpret_cast<CCryDX12RenderTargetView*>(pRenderTargetView);
-    DX12_LOG("Clearing render target view: %p %s", pRenderTargetView, rtv->GetResourceName().c_str());
-
-    ValidateSwapChain(*rtv);
-    m_DirectCommandList->ClearRenderTargetView(*view, ColorRGBA);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearUnorderedAccessViewUint(
-    _In_  ID3D11UnorderedAccessView* pUnorderedAccessView,
-    _In_  const UINT Values[4])
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pUnorderedAccessView);
-#ifndef NDEBUG
-    CCryDX12UnorderedAccessView* uav = reinterpret_cast<CCryDX12UnorderedAccessView*>(pUnorderedAccessView);
-    DX12_LOG("Clearing unordered access view [int]: %p %s", pUnorderedAccessView, uav->GetResourceName().c_str());
-#endif
-
-    m_DirectCommandList->ClearUnorderedAccessView(*view, Values);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearUnorderedAccessViewFloat(
-    _In_  ID3D11UnorderedAccessView* pUnorderedAccessView,
-    _In_  const FLOAT Values[4])
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pUnorderedAccessView);
-#ifndef NDEBUG
-    CCryDX12UnorderedAccessView* uav = reinterpret_cast<CCryDX12UnorderedAccessView*>(pUnorderedAccessView);
-    DX12_LOG("Clearing unordered access view [float]: %p %s", pUnorderedAccessView, uav->GetResourceName().c_str());
-#endif
-
-    m_DirectCommandList->ClearUnorderedAccessView(*view, Values);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearDepthStencilView(
-    _In_  ID3D11DepthStencilView* pDepthStencilView,
-    _In_  UINT ClearFlags,     // DX11 and DX12 clear flags are identical
-    _In_  FLOAT Depth,
-    _In_  UINT8 Stencil)
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pDepthStencilView);
-#ifndef NDEBUG
-    CCryDX12DepthStencilView* dsv = reinterpret_cast<CCryDX12DepthStencilView*>(pDepthStencilView);
-    DX12_LOG("Clearing depth stencil view: %p %s", pDepthStencilView, dsv->GetResourceName().c_str());
-#endif
-
-    m_DirectCommandList->ClearDepthStencilView(*view, D3D12_CLEAR_FLAGS(ClearFlags), Depth, Stencil);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GenerateMips(
-    [[maybe_unused]] _In_  ID3D11ShaderResourceView* pShaderResourceView)
-{
-    DX12_FUNC_LOG
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::SetResourceMinLOD(
-    [[maybe_unused]] _In_  ID3D11Resource* pResource,
-    [[maybe_unused]] FLOAT MinLOD)
-{
-    DX12_FUNC_LOG
-}
-
-FLOAT STDMETHODCALLTYPE CCryDX12DeviceContext::GetResourceMinLOD(
-    [[maybe_unused]] _In_  ID3D11Resource* pResource)
-{
-    DX12_FUNC_LOG
-    return 0.0f;
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ResolveSubresource(
-    [[maybe_unused]] _In_  ID3D11Resource* pDstResource,
-    [[maybe_unused]] _In_  UINT DstSubresource,
-    [[maybe_unused]] _In_  ID3D11Resource* pSrcResource,
-    [[maybe_unused]] _In_  UINT SrcSubresource,
-    [[maybe_unused]] _In_  DXGI_FORMAT Format)
-{
-    DX12_FUNC_LOG
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSSetShaderResources(
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    _In_reads_opt_(NumViews)  ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumViews; i < S; ++i, ++ppShaderResourceViews)
-    {
-        CCryDX12ShaderResourceView* srv = reinterpret_cast<CCryDX12ShaderResourceView*>(*ppShaderResourceViews);
-        if (m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Hull].ShaderResourceViews.Set(i, srv) && srv)
-        {
-            srv->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSSetShader(
-    _In_opt_  ID3D11HullShader* pHullShader,
-    [[maybe_unused]] _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance* const* ppClassInstances,
-    [[maybe_unused]] UINT NumClassInstances)
-{
-    DX12_FUNC_LOG
-    m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Hull].Shader.Set(reinterpret_cast<CCryDX12Shader*>(pHullShader));
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSSetSamplers(
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    _In_reads_opt_(NumSamplers)  ID3D11SamplerState* const* ppSamplers)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumSamplers; i < S; ++i, ++ppSamplers)
-    {
-        m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Hull].SamplerState.Set(i, reinterpret_cast<CCryDX12SamplerState*>(*ppSamplers));
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSSetConstantBuffers(
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppConstantBuffers)
-{
-    HSSetConstantBuffers1(StartSlot, NumBuffers, ppConstantBuffers, NULL, NULL);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSSetShaderResources(
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    _In_reads_opt_(NumViews)  ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumViews; i < S; ++i, ++ppShaderResourceViews)
-    {
-        CCryDX12ShaderResourceView* srv = reinterpret_cast<CCryDX12ShaderResourceView*>(*ppShaderResourceViews);
-        if (m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Domain].ShaderResourceViews.Set(i, srv) && srv)
-        {
-            srv->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSSetShader(
-    _In_opt_  ID3D11DomainShader* pDomainShader,
-    [[maybe_unused]] _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance* const* ppClassInstances,
-    [[maybe_unused]] UINT NumClassInstances)
-{
-    DX12_FUNC_LOG
-    m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Domain].Shader.Set(reinterpret_cast<CCryDX12Shader*>(pDomainShader));
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSSetSamplers(
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    _In_reads_opt_(NumSamplers)  ID3D11SamplerState* const* ppSamplers)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumSamplers; i < S; ++i, ++ppSamplers)
-    {
-        m_PipelineState[DX12::CommandModeGraphics].Stages[DX12::ESS_Domain].SamplerState.Set(i, reinterpret_cast<CCryDX12SamplerState*>(*ppSamplers));
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSSetConstantBuffers(
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppConstantBuffers)
-{
-    DSSetConstantBuffers1(StartSlot, NumBuffers, ppConstantBuffers, NULL, NULL);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSSetShaderResources(
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    _In_reads_opt_(NumViews)  ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-    auto& compute = m_PipelineState[DX12::CommandModeCompute].Stages[DX12::ESS_Compute];
-    for (UINT i = StartSlot, S = StartSlot + NumViews; i < S; ++i, ++ppShaderResourceViews)
-    {
-        CCryDX12ShaderResourceView* srv = reinterpret_cast<CCryDX12ShaderResourceView*>(*ppShaderResourceViews);
-        if (compute.ShaderResourceViews.Set(i, srv) && srv)
-        {
-            srv->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSSetUnorderedAccessViews(
-    _In_range_(0, D3D11_1_UAV_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_1_UAV_SLOT_COUNT - StartSlot)  UINT NumUAVs,
-    _In_reads_opt_(NumUAVs)  ID3D11UnorderedAccessView* const* ppUnorderedAccessViews,
-    [[maybe_unused]] _In_reads_opt_(NumUAVs)  const UINT* pUAVInitialCounts)
-{
-    DX12_FUNC_LOG
-    auto& compute = m_PipelineState[DX12::CommandModeCompute].Stages[DX12::ESS_Compute];
-    for (UINT i = StartSlot, S = StartSlot + NumUAVs; i < S; ++i, ++ppUnorderedAccessViews)
-    {
-        CCryDX12UnorderedAccessView* uav = reinterpret_cast<CCryDX12UnorderedAccessView*>(*ppUnorderedAccessViews);
-        if (compute.UnorderedAccessViews.Set(i, uav) && uav)
-        {
-            uav->BeginResourceStateTransition(m_DirectCommandList.get());
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSSetShader(
-    _In_opt_  ID3D11ComputeShader* pComputeShader,
-    [[maybe_unused]] _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance* const* ppClassInstances,
-    [[maybe_unused]] UINT NumClassInstances)
-{
-    DX12_FUNC_LOG
-    m_PipelineState[DX12::CommandModeCompute].Stages[DX12::ESS_Compute].Shader.Set(reinterpret_cast<CCryDX12Shader*>(pComputeShader));
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSSetSamplers(
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    _In_reads_opt_(NumSamplers)  ID3D11SamplerState* const* ppSamplers)
-{
-    DX12_FUNC_LOG
-    for (UINT i = StartSlot, S = StartSlot + NumSamplers; i < S; ++i, ++ppSamplers)
-    {
-        m_PipelineState[DX12::CommandModeCompute].Stages[DX12::ESS_Compute].SamplerState.Set(i, reinterpret_cast<CCryDX12SamplerState*>(*ppSamplers));
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSSetConstantBuffers(
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    _In_reads_opt_(NumBuffers)  ID3D11Buffer* const* ppConstantBuffers)
-{
-    CSSetConstantBuffers1(StartSlot, NumBuffers, ppConstantBuffers, NULL, NULL);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSGetConstantBuffers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppConstantBuffers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSGetShaderResources(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    [[maybe_unused]] _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSGetShader(
-    [[maybe_unused]] _Out_  ID3D11PixelShader** ppPixelShader,
-    [[maybe_unused]] _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-    [[maybe_unused]] _Inout_opt_  UINT* pNumClassInstances)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSGetSamplers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    [[maybe_unused]] _Out_writes_opt_(NumSamplers)  ID3D11SamplerState** ppSamplers)
-{
-    DX12_FUNC_LOG
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSGetShader(
-    [[maybe_unused]] _Out_  ID3D11VertexShader** ppVertexShader,
-    [[maybe_unused]] _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-    [[maybe_unused]] _Inout_opt_  UINT* pNumClassInstances)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::PSGetConstantBuffers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppConstantBuffers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IAGetInputLayout(
-    _Out_  ID3D11InputLayout** ppInputLayout)
-{
-    DX12_FUNC_LOG
-    *ppInputLayout = m_PipelineState[DX12::CommandModeGraphics].InputAssembler.InputLayout;
-    if (*ppInputLayout)
-    {
-        (*ppInputLayout)->AddRef();
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IAGetVertexBuffers(
-   [[maybe_unused]] _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-   [[maybe_unused]] _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-   [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppVertexBuffers,
-   [[maybe_unused]] _Out_writes_opt_(NumBuffers)  UINT* pStrides,
-   [[maybe_unused]] _Out_writes_opt_(NumBuffers)  UINT* pOffsets)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IAGetIndexBuffer(
-    _Out_opt_  ID3D11Buffer** pIndexBuffer,
-    _Out_opt_  DXGI_FORMAT* Format,
-    _Out_opt_  UINT* Offset)
-{
-    DX12_FUNC_LOG
-    auto& inputAssembler = m_PipelineState[DX12::CommandModeGraphics].InputAssembler;
-    * pIndexBuffer = inputAssembler.IndexBuffer;
-    if (*pIndexBuffer)
-    {
-        (*pIndexBuffer)->AddRef();
-    }
-
-    *Format = inputAssembler.IndexBufferFormat.Get();
-    *Offset = inputAssembler.IndexBufferOffset.Get();
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSGetConstantBuffers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppConstantBuffers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSGetShader(
-    [[maybe_unused]] _Out_  ID3D11GeometryShader** ppGeometryShader,
-    [[maybe_unused]] _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-    [[maybe_unused]] _Inout_opt_  UINT* pNumClassInstances)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::IAGetPrimitiveTopology(
-    _Out_  D3D11_PRIMITIVE_TOPOLOGY* pTopology)
-{
-    DX12_FUNC_LOG
-    *pTopology = m_PipelineState[DX12::CommandModeGraphics].InputAssembler.PrimitiveTopology.Get();
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSGetShaderResources(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    [[maybe_unused]] _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::VSGetSamplers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    [[maybe_unused]] _Out_writes_opt_(NumSamplers)  ID3D11SamplerState** ppSamplers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GetPredication(
-    [[maybe_unused]] _Out_opt_  ID3D11Predicate** ppPredicate,
-    [[maybe_unused]] _Out_opt_  BOOL* pPredicateValue)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSGetShaderResources(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    [[maybe_unused]] _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::GSGetSamplers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    [[maybe_unused]] _Out_writes_opt_(NumSamplers)  ID3D11SamplerState** ppSamplers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMGetRenderTargets(
-    [[maybe_unused]] _In_range_(0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT)  UINT NumViews,
-    [[maybe_unused]] _Out_writes_opt_(NumViews)  ID3D11RenderTargetView** ppRenderTargetViews,
-    [[maybe_unused]] _Out_opt_  ID3D11DepthStencilView** ppDepthStencilView)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMGetRenderTargetsAndUnorderedAccessViews(
-    [[maybe_unused]] _In_range_(0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT)  UINT NumRTVs,
-    [[maybe_unused]] _Out_writes_opt_(NumRTVs)  ID3D11RenderTargetView** ppRenderTargetViews,
-    [[maybe_unused]] _Out_opt_  ID3D11DepthStencilView** ppDepthStencilView,
-    [[maybe_unused]] _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1)  UINT UAVStartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot)  UINT NumUAVs,
-    [[maybe_unused]] _Out_writes_opt_(NumUAVs)  ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMGetBlendState(
-    [[maybe_unused]] _Out_opt_  ID3D11BlendState** ppBlendState,
-    [[maybe_unused]] _Out_opt_  FLOAT BlendFactor[4],
-    [[maybe_unused]] _Out_opt_  UINT* pSampleMask)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::OMGetDepthStencilState(
-    [[maybe_unused]] _Out_opt_  ID3D11DepthStencilState** ppDepthStencilState,
-    [[maybe_unused]] _Out_opt_  UINT* pStencilRef)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::SOGetTargets(
-    [[maybe_unused]] _In_range_(0, D3D11_SO_BUFFER_SLOT_COUNT)  UINT NumBuffers,
-    [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppSOTargets)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::RSGetState(
-    [[maybe_unused]] _Out_  ID3D11RasterizerState** ppRasterizerState)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::RSGetViewports(
-    [[maybe_unused]] _Inout_  UINT* pNumViewports,
-    [[maybe_unused]] _Out_writes_opt_(*pNumViewports)  D3D11_VIEWPORT* pViewports)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::RSGetScissorRects(
-    [[maybe_unused]] _Inout_  UINT* pNumRects,
-    [[maybe_unused]] _Out_writes_opt_(*pNumRects)  D3D11_RECT* pRects)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSGetShaderResources(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    [[maybe_unused]] _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSGetShader(
-    [[maybe_unused]] _Out_  ID3D11HullShader** ppHullShader,
-    [[maybe_unused]] _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-    [[maybe_unused]] _Inout_opt_  UINT* pNumClassInstances)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSGetSamplers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    [[maybe_unused]] _Out_writes_opt_(NumSamplers)  ID3D11SamplerState** ppSamplers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::HSGetConstantBuffers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppConstantBuffers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSGetShaderResources(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    [[maybe_unused]] _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSGetShader(
-    [[maybe_unused]] _Out_  ID3D11DomainShader** ppDomainShader,
-    [[maybe_unused]] _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-    [[maybe_unused]] _Inout_opt_  UINT* pNumClassInstances)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSGetSamplers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    [[maybe_unused]] _Out_writes_opt_(NumSamplers)  ID3D11SamplerState** ppSamplers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::DSGetConstantBuffers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppConstantBuffers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSGetShaderResources(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-    [[maybe_unused]] _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSGetUnorderedAccessViews(
-    [[maybe_unused]] _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - StartSlot)  UINT NumUAVs,
-    [[maybe_unused]] _Out_writes_opt_(NumUAVs)  ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSGetShader(
-    [[maybe_unused]] _Out_  ID3D11ComputeShader** ppComputeShader,
-    [[maybe_unused]] _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-    [[maybe_unused]] _Inout_opt_  UINT* pNumClassInstances)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSGetSamplers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-    [[maybe_unused]] _Out_writes_opt_(NumSamplers)  ID3D11SamplerState** ppSamplers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CSGetConstantBuffers(
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-    [[maybe_unused]] _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-    [[maybe_unused]] _Out_writes_opt_(NumBuffers)  ID3D11Buffer** ppConstantBuffers)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearState()
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::Flush()
-{
-    DX12_FUNC_LOG
-
-    SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, m_CmdFenceSet.GetCurrentValues());
-}
-
-D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE CCryDX12DeviceContext::GetType()
-{
-    DX12_FUNC_LOG
-    return D3D11_DEVICE_CONTEXT_IMMEDIATE;
-}
-
-UINT STDMETHODCALLTYPE CCryDX12DeviceContext::GetContextFlags()
-{
-    DX12_FUNC_LOG
-    return 0;
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ExecuteCommandList(
-    [[maybe_unused]] _In_  ID3D11CommandList* pCommandList,
-    [[maybe_unused]] _In_  BOOL RestoreContextState)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::FinishCommandList(
-    [[maybe_unused]] BOOL RestoreDeferredContextState,
-    [[maybe_unused]] _Out_opt_  ID3D11CommandList** ppCommandList)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-#pragma endregion
-
-#pragma region /* D3D 11.1 specific functions */
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CopySubresourceRegion1(
-    _In_  ID3D11Resource* pDstResource,
-    _In_  UINT DstSubresource,
-    _In_  UINT DstX,
-    _In_  UINT DstY,
-    _In_  UINT DstZ,
-    _In_  ID3D11Resource* pSrcResource,
-    _In_  UINT SrcSubresource,
-    _In_opt_  const D3D11_BOX* pSrcBox,
-    _In_  UINT CopyFlags)
-{
-    DX12_FUNC_LOG
-
-    ICryDX12Resource* dstDX12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pDstResource);
-    ICryDX12Resource* srcDX12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pSrcResource);
-    DX12::Resource& dstResource = dstDX12Resource->GetDX12Resource();
-    DX12::Resource& srcResource = srcDX12Resource->GetDX12Resource();
-
-    // TODO: copy command on the swap chain are special (can't execute on any other queue), make an API for that
-    const bool bDirect = !m_bInCopyRegion;
-
-    DX12::CommandListPool& rCmdListPool = bDirect ? m_DirectListPool :  m_CopyListPool;
-    DX12::CommandList*     pCmdList     = bDirect ? m_DirectCommandList : m_CopyCommandList;
-
-    // TODO: move into the command-list function
-    UINT64 maxFenceValues[CMDQUEUE_NUM];
-    switch (CopyFlags)
-    {
-    case D3D11_COPY_NO_OVERWRITE:
-        // If the resource is currently used, the flag lied!
-        AZ_Assert(!dstResource.IsUsed(rCmdListPool), "Destination resource is in use for non-discard copy!");
-
-        SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC,
-            srcResource.GetFenceValues(CMDTYPE_WRITE),
-            rCmdListPool.GetFenceID());
-        break;
-    default:
-        SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, DX12::MaxFenceValues(
-            srcResource.GetFenceValues(CMDTYPE_WRITE),
-            dstResource.GetFenceValues(CMDTYPE_ANY),
-            maxFenceValues),
-            rCmdListPool.GetFenceID());
-
-        // Block the GPU-thread until the resource is safe to be updated (unlike Map() we stage the copy and don't need to block the CPU)
-        break;
-    }
-
-    D3D12_BOX box;
-    if (pSrcBox)
-    {
-        box.top = pSrcBox->top;
-        box.bottom = pSrcBox->bottom;
-        box.left = pSrcBox->left;
-        box.right = pSrcBox->right;
-        box.front = pSrcBox->front;
-        box.back = pSrcBox->back;
-    }
-
-    // TODO: copy from active render-target should be more elegant
-    if (m_DirectCommandList->IsUsedByOutputViews(srcResource) ||
-        m_DirectCommandList->IsUsedByOutputViews(dstResource))
-    {
-        // Make the render-targets rebind, so the resource-barrier is closed
-        m_PipelineState[DX12::CommandModeGraphics].m_StateFlags |= EPSPB_OutputResources;
-    }
-
-    AZ_Assert(dstResource.GetDX12SwapChain() == nullptr, "Can't copy to swap chain buffer");
-    pCmdList->CopySubresource(dstResource, DstSubresource, DstX, DstY, DstZ, srcResource, SrcSubresource, pSrcBox ? &box : NULL);
-
-    if constexpr (DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC)
-    {
-        if (!bDirect)
-        {
-            SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-        }
-        else
-        {
-            SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::CopyResource1(
-    _In_  ID3D11Resource* pDstResource,
-    _In_  ID3D11Resource* pSrcResource,
-    _In_  UINT CopyFlags)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-
-    ICryDX12Resource* dstDX12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pDstResource);
-    ICryDX12Resource* srcDX12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pSrcResource);
-    DX12::Resource& dstResource = dstDX12Resource->GetDX12Resource();
-    DX12::Resource& srcResource = srcDX12Resource->GetDX12Resource();
-
-    const bool bDirect = !m_bInCopyRegion;
-    DX12::CommandListPool& rCmdListPool = bDirect ? m_DirectListPool    : m_CopyListPool;
-    DX12::CommandList*     pCmdList     = bDirect ? m_DirectCommandList : m_CopyCommandList;
-
-    // TODO: move into the command-list function
-    UINT64 maxFenceValues[CMDQUEUE_NUM];
-    switch (CopyFlags)
-    {
-    case D3D11_COPY_NO_OVERWRITE:
-        // If the resource is currently used, the flag lied!
-        AZ_Assert(!dstResource.IsUsed(rCmdListPool), "Destination resource is in use for non-discard copy!");
-        SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC,
-            srcResource.GetFenceValues(CMDTYPE_WRITE),
-            rCmdListPool.GetFenceID());
-        break;
-    default:
-        SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, DX12::MaxFenceValues(
-            srcResource.GetFenceValues(CMDTYPE_WRITE),
-            dstResource.GetFenceValues(CMDTYPE_ANY),
-            maxFenceValues),
-            rCmdListPool.GetFenceID());
-
-        // Block the GPU-thread until the resource is safe to be updated (unlike Map() we stage the update and don't need to block the CPU)
-        break;
-    }
-
-    // TODO: copy from active render-target should be more elegant
-    if (m_DirectCommandList->IsUsedByOutputViews(srcResource) ||
-        m_DirectCommandList->IsUsedByOutputViews(dstResource))
-    {
-        // Make the render-targets rebind, so the resource-barrier is closed
-        m_PipelineState[DX12::CommandModeGraphics].m_StateFlags |= EPSPB_OutputResources;
-    }
-
-    AZ_Assert(dstResource.GetDX12SwapChain() == nullptr, "Can't copy to swap chain buffer");
-    pCmdList->CopyResource(dstResource, srcResource);
-    if constexpr (DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC)
-    {
-        if (!bDirect)
-        {
-            SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-        }
-        else
-        {
-            SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-        }
-    }
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::UpdateSubresource1(
-    _In_  ID3D11Resource* pDstResource,
-    _In_  UINT DstSubresource,
-    _In_opt_  const D3D11_BOX* pDstBox,
-    _In_  const void* pSrcData,
-    _In_  UINT SrcRowPitch,
-    _In_  UINT SrcDepthPitch,
-    _In_  UINT CopyFlags)
-{
-    DX12_FUNC_LOG
-    AZ_TRACE_METHOD();
-
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pDstResource);
-    DX12::Resource& resource = dx12Resource->GetDX12Resource();
-
-    // TODO: copy command on the swap chain are special (can't execute on any other queue), make an API for that
-    const bool bDirect = !m_bInCopyRegion;
-
-    DX12::CommandListPool& rCmdListPool = bDirect ?  m_DirectListPool :  m_CopyListPool;
-    DX12::CommandList*     pCmdList     = bDirect ? m_DirectCommandList     : m_CopyCommandList;
-
-    // TODO: move into the command-list function
-    switch (CopyFlags)
-    {
-    case D3D11_COPY_NO_OVERWRITE:
-        // If the resource is currently used, the flag lied!
-        AZ_Assert(!resource.IsUsed(rCmdListPool), "Destination resource is in use for non-discard copy!");
-        break;
-    default:
-        SubmitAllCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC, resource.GetFenceValues(CMDTYPE_ANY), rCmdListPool.GetFenceID());
-
-        // Block the GPU-thread until the resource is safe to be updated (unlike Map() we stage the update and don't need to block the CPU)
-        break;
-    }
-
-    D3D12_BOX box;
-    if (pDstBox)
-    {
-        box.top = pDstBox->top;
-        box.bottom = pDstBox->bottom;
-        box.left = pDstBox->left;
-        box.right = pDstBox->right;
-        box.front = pDstBox->front;
-        box.back = pDstBox->back;
-    }
-
-    // TODO: copy from active render-target should be more elegant
-    if (m_DirectCommandList->IsUsedByOutputViews(resource))
-    {
-        // Make the render-targets rebind, so the resource-barrier is closed
-        m_PipelineState[DX12::CommandModeGraphics].m_StateFlags |= EPSPB_OutputResources;
-    }
-
-    AZ_Assert(resource.GetDX12SwapChain() == nullptr, "Can't copy to swap chain buffer");
-    pCmdList->UpdateSubresourceRegion(resource, DstSubresource, pDstBox ? &box : NULL, pSrcData, SrcRowPitch, SrcDepthPitch);
-
-    if constexpr (DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC)
-    {
-        if (!bDirect)
-        {
-            SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-        }
-        else
-        {
-            SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-        }
-    }
-}
-
-void CCryDX12DeviceContext::DiscardResource(ID3D11Resource* pResource)
-{
-    DX12_FUNC_LOG
-
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pResource);
-    DX12::Resource& resource = dx12Resource->GetDX12Resource();
-
-    // Ensure the command-list using the resource is executed
-    SubmitDirectCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC,
-        resource.GetFenceValue(CMDQUEUE_GRAPHICS, CMDTYPE_ANY)
-        );
-
-    m_CopyCommandList->DiscardResource(resource, nullptr);
-    SubmitCopyCommands(DX12_SUBMISSION_MODE == DX12_SUBMISSION_SYNC);
-}
-
-void CCryDX12DeviceContext::DiscardView([[maybe_unused]] ID3D11View* pResourceView)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::VSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-    SetConstantBuffers1(DX12::ESS_Vertex, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants, DX12::CommandModeGraphics);
-}
-
-void CCryDX12DeviceContext::HSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-    SetConstantBuffers1(DX12::ESS_Hull, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants, DX12::CommandModeGraphics);
-}
-
-void CCryDX12DeviceContext::DSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-    SetConstantBuffers1(DX12::ESS_Domain, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants, DX12::CommandModeGraphics);
-}
-
-void CCryDX12DeviceContext::GSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-    SetConstantBuffers1(DX12::ESS_Geometry, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants, DX12::CommandModeGraphics);
-}
-
-void CCryDX12DeviceContext::PSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-    SetConstantBuffers1(DX12::ESS_Pixel, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants, DX12::CommandModeGraphics);
-}
-
-void CCryDX12DeviceContext::CSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-    SetConstantBuffers1(DX12::ESS_Compute, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants, DX12::CommandModeCompute);
-}
-
-void CCryDX12DeviceContext::SetConstantBuffers1(
-    DX12::EShaderStage shaderStage,
-    UINT StartSlot,
-    UINT NumBuffers,
-    ID3D11Buffer* const* ppConstantBuffers,
-    const UINT* pFirstConstant,
-    const UINT* pNumConstants,
-    DX12::CommandMode commandMode)
-{
-    auto& stage = m_PipelineState[commandMode].Stages[shaderStage];
-    for (UINT i = StartSlot, S = StartSlot + NumBuffers, j = 0; i < S; ++i, ++ppConstantBuffers, ++j)
-    {
-        CCryDX12Buffer* cb = reinterpret_cast<CCryDX12Buffer*>(*ppConstantBuffers);
-
-        TRange < UINT > bindRange;
-        if (pFirstConstant)
-        {
-            bindRange.start = pFirstConstant[j] * DX12::CONSTANT_BUFFER_ELEMENT_SIZE;
-            bindRange.end = bindRange.start + pNumConstants[j] * DX12::CONSTANT_BUFFER_ELEMENT_SIZE;
-        }
-
-        stage.ConstBufferBindRange.Set(i, bindRange);
-        if (stage.ConstantBufferViews.Set(i, cb) && cb)
-        {
-            cb->BeginResourceStateTransition(m_DirectCommandList, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER);
-        }
-    }
-}
-
-void CCryDX12DeviceContext::VSGetConstantBuffers1([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer** ppConstantBuffers, [[maybe_unused]] UINT* pFirstConstant, [[maybe_unused]] UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::HSGetConstantBuffers1([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer** ppConstantBuffers, [[maybe_unused]] UINT* pFirstConstant, [[maybe_unused]] UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::DSGetConstantBuffers1([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer** ppConstantBuffers, [[maybe_unused]] UINT* pFirstConstant, [[maybe_unused]] UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::GSGetConstantBuffers1([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer** ppConstantBuffers, [[maybe_unused]] UINT* pFirstConstant, [[maybe_unused]] UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::PSGetConstantBuffers1([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer** ppConstantBuffers, [[maybe_unused]] UINT* pFirstConstant, [[maybe_unused]] UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::CSGetConstantBuffers1([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer** ppConstantBuffers, [[maybe_unused]] UINT* pFirstConstant, [[maybe_unused]] UINT* pNumConstants)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::SwapDeviceContextState([[maybe_unused]] ID3DDeviceContextState* pState, [[maybe_unused]] ID3DDeviceContextState** ppPreviousState)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void CCryDX12DeviceContext::ClearView(ID3D11View* pView, const FLOAT Color[4], const D3D11_RECT* pRect, UINT NumRects)
-{
-    DX12_FUNC_LOG
-    DX12_LOG("Clearing view: %p", pView);
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pView);
-
-    m_DirectCommandList->ClearView(*view, Color, NumRects, pRect);
-}
-
-void CCryDX12DeviceContext::DiscardView1([[maybe_unused]] ID3D11View* pResourceView, [[maybe_unused]] const D3D11_RECT* pRects, [[maybe_unused]] UINT NumRects)
-{
-    DX12_FUNC_LOG
-        DX12_NOT_IMPLEMENTED
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearRectsRenderTargetView(
-    _In_  ID3D11RenderTargetView* pRenderTargetView,
-    _In_  const FLOAT ColorRGBA[4],
-    _In_  UINT NumRects,
-    _In_reads_opt_(NumRects)  const D3D11_RECT* pRects)
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pRenderTargetView);
-#ifndef NDEBUG
-    CCryDX12RenderTargetView* rtv = reinterpret_cast<CCryDX12RenderTargetView*>(pRenderTargetView);
-    DX12_LOG("Clearing render target view: %p %s", pRenderTargetView, rtv->GetResourceName().c_str());
-#endif
-
-    m_DirectCommandList->ClearRenderTargetView(*view, ColorRGBA, NumRects, pRects);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearRectsUnorderedAccessViewUint(
-    _In_  ID3D11UnorderedAccessView* pUnorderedAccessView,
-    _In_  const UINT Values[4],
-    _In_  UINT NumRects,
-    _In_reads_opt_(NumRects)  const D3D11_RECT* pRects)
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pUnorderedAccessView);
-#ifndef NDEBUG
-    CCryDX12UnorderedAccessView* uav = reinterpret_cast<CCryDX12UnorderedAccessView*>(pUnorderedAccessView);
-    DX12_LOG("Clearing unordered access view [int]: %p %s", pUnorderedAccessView, uav->GetResourceName().c_str());
-#endif
-
-    m_DirectCommandList->ClearUnorderedAccessView(*view, Values, NumRects, pRects);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearRectsUnorderedAccessViewFloat(
-    _In_  ID3D11UnorderedAccessView* pUnorderedAccessView,
-    _In_  const FLOAT Values[4],
-    _In_  UINT NumRects,
-    _In_reads_opt_(NumRects)  const D3D11_RECT* pRects)
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pUnorderedAccessView);
-#ifndef NDEBUG
-    CCryDX12UnorderedAccessView* uav = reinterpret_cast<CCryDX12UnorderedAccessView*>(pUnorderedAccessView);
-    DX12_LOG("Clearing unordered access view [float]: %p %s", pUnorderedAccessView, uav->GetResourceName().c_str());
-#endif
-
-    m_DirectCommandList->ClearUnorderedAccessView(*view, Values, NumRects, pRects);
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::ClearRectsDepthStencilView(
-    _In_  ID3D11DepthStencilView* pDepthStencilView,
-    _In_  UINT ClearFlags,     // DX11 and DX12 clear flags are identical
-    _In_  FLOAT Depth,
-    _In_  UINT8 Stencil,
-    _In_  UINT NumRects,
-    _In_reads_opt_(NumRects)  const D3D11_RECT* pRects)
-{
-    DX12_FUNC_LOG
-
-    DX12::ResourceView* view = DX12_EXTRACT_DX12VIEW(pDepthStencilView);
-#ifndef NDEBUG
-    CCryDX12DepthStencilView* dsv = reinterpret_cast<CCryDX12DepthStencilView*>(pDepthStencilView);
-    DX12_LOG("Clearing depth stencil view: %p %s", pDepthStencilView, dsv->GetResourceName().c_str());
-#endif
-
-    m_DirectCommandList->ClearDepthStencilView(*view, D3D12_CLEAR_FLAGS(ClearFlags), Depth, Stencil, NumRects, pRects);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::CopyStagingResource(
-    _In_  ID3D11Resource* pStagingResource,
-    _In_  ID3D11Resource* pSourceResource,
-    _In_  UINT SubResource,
-    _In_  BOOL Upload)
-{
-    DX12_FUNC_LOG
-
-    if (Upload)
-    {
-        CopySubresourceRegion1(pSourceResource, SubResource, 0, 0, 0, pStagingResource, 0, nullptr, D3D11_COPY_NO_OVERWRITE);
-    }
-    else
-    {
-        CopySubresourceRegion1(pStagingResource, 0, 0, 0, 0, pSourceResource, SubResource, nullptr, D3D11_COPY_NO_OVERWRITE);
-    }
-
-    return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::MapStagingResource(
-    _In_  ID3D11Resource* pTextureResource,
-    _In_  ID3D11Resource* pStagingResource,
-    _In_  UINT SubResource,
-    _In_  BOOL Upload,
-    _Out_ void** ppStagingMemory,
-    _Out_ uint32* pRowPitch)
-{
-    DX12_FUNC_LOG
-
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pStagingResource);
-    DX12::Resource& rResource = dx12Resource->GetDX12Resource();
-
-    ICryDX12Resource* dx12TextureResource = DX12_EXTRACT_ICRYDX12RESOURCE(pTextureResource);
-    DX12::Resource& rTextureResource = dx12TextureResource->GetDX12Resource();
-
-    // If this assert trips, you may need to increase MAX_SUBRESOURCES.  Just be wary of growing the stack too much.
-    AZ_Assert(SubResource < MAX_SUBRESOURCES, "Too many sub resources: (sub ID %d requested, %d allowed)", SubResource, MAX_SUBRESOURCES);
-    D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[MAX_SUBRESOURCES];
-
-    // From our source texture resource, get the offset and description information for all the subresources up through the one we're trying
-    // to map.  Our staging resource will contain a buffer large enough for *all* the subresources, so we need to get the correct offset
-    // into this buffer.  If we just get the Layout for the one SubResource, it will come back with an offset of 0, which is incorrect.
-    GetDevice()->GetD3D12Device()->GetCopyableFootprints(&rTextureResource.GetDesc(), 0, SubResource + 1, 0, layouts, nullptr, nullptr, nullptr);
-
-    const D3D12_RANGE sNoRead = { 0, 0 }; // It is valid to specify the CPU won't read any data by passing a range where End is less than or equal to Begin
-    const D3D12_RANGE sFullRead = { 0, rResource.GetRequiredUploadSize(0, 1) }; // Our buffer only has 1 subresource, so get the full size of it to map.
-
-    HRESULT result = rResource.GetD3D12Resource()->Map(0, Upload ? &sNoRead : &sFullRead, ppStagingMemory);
-
-    // Map() will return a pointer to the start of our buffer.  Adjust the pointer to the offset of the desired mapped subresource within the buffer.
-    *ppStagingMemory = *reinterpret_cast<uint8**>(ppStagingMemory) + layouts[SubResource].Offset;
-
-    *pRowPitch = layouts[SubResource].Footprint.RowPitch;
-
-    return result;
-}
-
-void STDMETHODCALLTYPE CCryDX12DeviceContext::UnmapStagingResource(
-    _In_  ID3D11Resource* pStagingResource,
-    _In_  BOOL Upload)
-{
-    DX12_FUNC_LOG
-
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pStagingResource);
-    DX12::Resource& rResource = dx12Resource->GetDX12Resource();
-
-    const D3D12_RANGE sNoWrite = { 0, 0 }; // It is valid to specify the CPU didn't write any data by passing a range where End is less than or equal to Begin.
-    const D3D12_RANGE sFullWrite = { 0, rResource.GetRequiredUploadSize(0, 1) };
-
-    rResource.GetD3D12Resource()->Unmap(0, Upload ? &sFullWrite : &sNoWrite);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::TestStagingResource(
-    _In_  ID3D11Resource* pStagingResource)
-{
-    DX12_FUNC_LOG
-
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pStagingResource);
-    DX12::Resource& rResource = dx12Resource->GetDX12Resource();
-
-    return
-        TestForFence(rResource.GetFenceValue(CMDQUEUE_GRAPHICS, CMDTYPE_ANY)) &&
-        TestForFence(rResource.GetFenceValue(CMDQUEUE_COPY, CMDTYPE_ANY));
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12DeviceContext::WaitStagingResource(
-    _In_  ID3D11Resource* pStagingResource)
-{
-    DX12_FUNC_LOG
-
-    ICryDX12Resource* dx12Resource = DX12_EXTRACT_ICRYDX12RESOURCE(pStagingResource);
-    DX12::Resource& rResource = dx12Resource->GetDX12Resource();
-
-    if (rResource.GetFenceValue(CMDQUEUE_GRAPHICS, CMDTYPE_WRITE) == m_DirectListPool.GetCurrentFenceValue())
-    {
-        SubmitDirectCommands(false);
-    }
-
-    if (rResource.GetFenceValue(CMDQUEUE_COPY, CMDTYPE_WRITE) == m_CopyListPool.GetCurrentFenceValue())
-    {
-        SubmitCopyCommands(false);
-    }
-
-    rResource.WaitForUnused(m_DirectListPool, CMDTYPE_ANY);
-    rResource.WaitForUnused(m_CopyListPool, CMDTYPE_ANY);
-
-    return S_OK;
-}
-
-void CCryDX12DeviceContext::ResetCachedState()
-{
-    m_PipelineState[DX12::CommandModeGraphics].Invalidate();
-    m_PipelineState[DX12::CommandModeCompute].Invalidate();
-
-    m_CurrentPSO = nullptr;
-    m_CurrentRootSignature[DX12::CommandModeGraphics] = m_CurrentRootSignature[DX12::CommandModeCompute] = nullptr;
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceContext.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceContext.hpp
deleted file mode 100644
index d58a577f25..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Device/CCryDX12DeviceContext.hpp
+++ /dev/null
@@ -1,899 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12DEVICECONTEXT__
-#define __CCRYDX12DEVICECONTEXT__
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define CCRYDX12DEVICECONTEXT_HPP_SECTION_1 1
-    #define CCRYDX12DEVICECONTEXT_HPP_SECTION_2 2
-#endif
-
-#include "DX12/CCryDX12Object.hpp"
-#include "DX12/Misc/SCryDX11PipelineState.hpp"
-
-#include "DX12/API/DX12Base.hpp"
-#include "DX12/API/DX12CommandList.hpp"
-
-#include <pix.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CCRYDX12DEVICECONTEXT_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(CCryDX12DeviceContext_hpp)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    using ICCryDX12DeviceContext = ID3D11DeviceContext1;
-#endif
-
-class CCryDX12Device;
-
-class CCryDX12DeviceContext
-    : public CCryDX12Object<ICCryDX12DeviceContext>
-{
-    friend class CDeviceManager;
-    friend class CDeviceObjectFactory;
-
-public:
-    DX12_OBJECT(CCryDX12DeviceContext, CCryDX12Object<ICCryDX12DeviceContext>);
-
-    static CCryDX12DeviceContext* Create(CCryDX12Device* pDevice);
-
-    CCryDX12DeviceContext(CCryDX12Device* pDevice);
-
-    virtual ~CCryDX12DeviceContext();
-
-    ILINE void CeaseCoreCommandList(uint32 nPoolId)
-    {
-        if (nPoolId == CMDQUEUE_GRAPHICS)
-        {
-            CeaseDirectCommandQueue(false);
-        }
-        else if (nPoolId == CMDQUEUE_COPY)
-        {
-            CeaseCopyCommandQueue(false);
-        }
-    }
-
-    ILINE void ResumeCoreCommandList(uint32 nPoolId)
-    {
-        if (nPoolId == CMDQUEUE_GRAPHICS)
-        {
-            ResumeDirectCommandQueue();
-        }
-        else if (nPoolId == CMDQUEUE_COPY)
-        {
-            ResumeCopyCommandQueue();
-        }
-    }
-
-    ILINE DX12::CommandListPool& GetCoreCommandListPool(int nPoolId)
-    {
-        if (nPoolId == CMDQUEUE_GRAPHICS)
-        {
-            return m_DirectListPool;
-        }
-        else if (nPoolId == CMDQUEUE_COPY)
-        {
-            return m_CopyListPool;
-        }
-
-        __debugbreak();
-        abort();
-    }
-
-    ILINE DX12::CommandListPool& GetCoreGraphicsCommandListPool()
-    {
-        return m_DirectListPool;
-    }
-
-    ILINE DX12::CommandList* GetCoreGraphicsCommandList() const
-    {
-        return m_DirectCommandList;
-    }
-
-    ILINE CCryDX12Device* GetDevice() const
-    {
-        return m_pDevice;
-    }
-
-    ILINE ID3D12Device* GetD3D12Device() const
-    {
-        return m_pDevice->GetD3D12Device();
-    }
-
-    void Finish(DX12::SwapChain* pDX12SwapChain);
-
-    #pragma region /* ID3D11DeviceChild implementation */
-
-    virtual void STDMETHODCALLTYPE GetDevice(
-        _Out_  ID3D11Device** ppDevice) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
-        _In_  REFGUID guid,
-        _Inout_  UINT* pDataSize,
-        _Out_writes_bytes_opt_(*pDataSize)  void* pData) final;
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(
-        _In_  REFGUID guid,
-        _In_  UINT DataSize,
-        _In_reads_bytes_opt_(DataSize)  const void* pData) final;
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
-        _In_  REFGUID guid,
-        _In_opt_  const IUnknown* pData) final;
-
-    #pragma endregion
-
-    #pragma region /* ID3D11DeviceContext implementation */
-
-    virtual void STDMETHODCALLTYPE VSSetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE PSSetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _In_reads_opt_(NumViews)  ID3D11ShaderResourceView * const* ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE PSSetShader(
-        _In_opt_  ID3D11PixelShader * pPixelShader,
-        _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance * const* ppClassInstances,
-        UINT NumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE PSSetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _In_reads_opt_(NumSamplers)  ID3D11SamplerState * const* ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE VSSetShader(
-        _In_opt_  ID3D11VertexShader * pVertexShader,
-        _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance * const* ppClassInstances,
-        UINT NumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE DrawIndexed(
-        _In_  UINT IndexCount,
-        _In_  UINT StartIndexLocation,
-        _In_  INT BaseVertexLocation) final;
-
-    virtual void STDMETHODCALLTYPE Draw(
-        _In_  UINT VertexCount,
-        _In_  UINT StartVertexLocation) final;
-
-    virtual HRESULT STDMETHODCALLTYPE Map(
-        _In_  ID3D11Resource* pResource,
-        _In_  UINT Subresource,
-        _In_  D3D11_MAP MapType,
-        _In_  UINT MapFlags,
-        _Out_  D3D11_MAPPED_SUBRESOURCE* pMappedResource) final;
-
-    virtual void STDMETHODCALLTYPE Unmap(
-        _In_  ID3D11Resource* pResource,
-        _In_  UINT Subresource) final;
-
-    virtual void STDMETHODCALLTYPE PSSetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE IASetInputLayout(
-        _In_opt_  ID3D11InputLayout* pInputLayout) final;
-
-    virtual void STDMETHODCALLTYPE IASetVertexBuffers(
-        _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppVertexBuffers,
-        _In_reads_opt_(NumBuffers)  const UINT * pStrides,
-        _In_reads_opt_(NumBuffers)  const UINT * pOffsets) final;
-
-    virtual void STDMETHODCALLTYPE IASetIndexBuffer(
-        _In_opt_  ID3D11Buffer* pIndexBuffer,
-        _In_  DXGI_FORMAT Format,
-        _In_  UINT Offset) final;
-
-    virtual void STDMETHODCALLTYPE DrawIndexedInstanced(
-        _In_  UINT IndexCountPerInstance,
-        _In_  UINT InstanceCount,
-        _In_  UINT StartIndexLocation,
-        _In_  INT BaseVertexLocation,
-        _In_  UINT StartInstanceLocation) final;
-
-    virtual void STDMETHODCALLTYPE DrawInstanced(
-        _In_  UINT VertexCountPerInstance,
-        _In_  UINT InstanceCount,
-        _In_  UINT StartVertexLocation,
-        _In_  UINT StartInstanceLocation) final;
-
-    virtual void STDMETHODCALLTYPE GSSetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE GSSetShader(
-        _In_opt_  ID3D11GeometryShader * pShader,
-        _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance * const* ppClassInstances,
-        UINT NumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE IASetPrimitiveTopology(
-        _In_  D3D11_PRIMITIVE_TOPOLOGY Topology) final;
-
-    virtual void STDMETHODCALLTYPE VSSetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _In_reads_opt_(NumViews)  ID3D11ShaderResourceView * const* ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE VSSetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _In_reads_opt_(NumSamplers)  ID3D11SamplerState * const* ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE Begin(
-        _In_  ID3D11Asynchronous* pAsync) final;
-
-    virtual void STDMETHODCALLTYPE End(
-        _In_  ID3D11Asynchronous* pAsync) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetData(
-        _In_  ID3D11Asynchronous * pAsync,
-        _Out_writes_bytes_opt_(DataSize)  void* pData,
-        _In_  UINT DataSize,
-        _In_  UINT GetDataFlags) final;
-
-    virtual void STDMETHODCALLTYPE SetPredication(
-        _In_opt_  ID3D11Predicate* pPredicate,
-        _In_  BOOL PredicateValue) final;
-
-    virtual void STDMETHODCALLTYPE GSSetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _In_reads_opt_(NumViews)  ID3D11ShaderResourceView * const* ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE GSSetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _In_reads_opt_(NumSamplers)  ID3D11SamplerState * const* ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE OMSetRenderTargets(
-        _In_range_(0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT)  UINT NumViews,
-        _In_reads_opt_(NumViews)  ID3D11RenderTargetView * const* ppRenderTargetViews,
-        _In_opt_  ID3D11DepthStencilView * pDepthStencilView) final;
-
-    virtual void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(
-        _In_  UINT NumRTVs,
-        _In_reads_opt_(NumRTVs)  ID3D11RenderTargetView * const* ppRenderTargetViews,
-        _In_opt_  ID3D11DepthStencilView * pDepthStencilView,
-        _In_range_(0, D3D11_1_UAV_SLOT_COUNT - 1)  UINT UAVStartSlot,
-        _In_  UINT NumUAVs,
-        _In_reads_opt_(NumUAVs)  ID3D11UnorderedAccessView * const* ppUnorderedAccessViews,
-        _In_reads_opt_(NumUAVs)  const UINT * pUAVInitialCounts) final;
-
-    virtual void STDMETHODCALLTYPE OMSetBlendState(
-        _In_opt_  ID3D11BlendState* pBlendState,
-        _In_opt_  const FLOAT BlendFactor[4],
-        _In_  UINT SampleMask) final;
-
-    virtual void STDMETHODCALLTYPE OMSetDepthStencilState(
-        _In_opt_  ID3D11DepthStencilState* pDepthStencilState,
-        _In_  UINT StencilRef) final;
-
-    virtual void STDMETHODCALLTYPE SOSetTargets(
-        _In_range_(0, D3D11_SO_BUFFER_SLOT_COUNT)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppSOTargets,
-        _In_reads_opt_(NumBuffers)  const UINT * pOffsets) final;
-
-    virtual void STDMETHODCALLTYPE DrawAuto() final;
-
-    virtual void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(
-        _In_  ID3D11Buffer* pBufferForArgs,
-        _In_  UINT AlignedByteOffsetForArgs) final;
-
-    virtual void STDMETHODCALLTYPE DrawInstancedIndirect(
-        _In_  ID3D11Buffer* pBufferForArgs,
-        _In_  UINT AlignedByteOffsetForArgs) final;
-
-    virtual void STDMETHODCALLTYPE Dispatch(
-        _In_  UINT ThreadGroupCountX,
-        _In_  UINT ThreadGroupCountY,
-        _In_  UINT ThreadGroupCountZ) final;
-
-    virtual void STDMETHODCALLTYPE DispatchIndirect(
-        _In_  ID3D11Buffer* pBufferForArgs,
-        _In_  UINT AlignedByteOffsetForArgs) final;
-
-    virtual void STDMETHODCALLTYPE RSSetState(
-        _In_opt_  ID3D11RasterizerState* pRasterizerState) final;
-
-    virtual void STDMETHODCALLTYPE RSSetViewports(
-        _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE)  UINT NumViewports,
-        _In_reads_opt_(NumViewports)  const D3D11_VIEWPORT * pViewports) final;
-
-    virtual void STDMETHODCALLTYPE RSSetScissorRects(
-        _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE)  UINT NumRects,
-        _In_reads_opt_(NumRects)  const D3D11_RECT * pRects) final;
-
-    virtual void STDMETHODCALLTYPE CopySubresourceRegion(
-        _In_  ID3D11Resource* pDstResource,
-        _In_  UINT DstSubresource,
-        _In_  UINT DstX,
-        _In_  UINT DstY,
-        _In_  UINT DstZ,
-        _In_  ID3D11Resource* pSrcResource,
-        _In_  UINT SrcSubresource,
-        _In_opt_  const D3D11_BOX* pSrcBox) final;
-
-    virtual void STDMETHODCALLTYPE CopyResource(
-        _In_  ID3D11Resource* pDstResource,
-        _In_  ID3D11Resource* pSrcResource) final;
-
-    virtual void STDMETHODCALLTYPE UpdateSubresource(
-        _In_  ID3D11Resource* pDstResource,
-        _In_  UINT DstSubresource,
-        _In_opt_  const D3D11_BOX* pDstBox,
-        _In_  const void* pSrcData,
-        _In_  UINT SrcRowPitch,
-        _In_  UINT SrcDepthPitch) final;
-
-    virtual void STDMETHODCALLTYPE CopyStructureCount(
-        _In_  ID3D11Buffer* pDstBuffer,
-        _In_  UINT DstAlignedByteOffset,
-        _In_  ID3D11UnorderedAccessView* pSrcView) final;
-
-    virtual void STDMETHODCALLTYPE ClearRenderTargetView(
-        _In_  ID3D11RenderTargetView* pRenderTargetView,
-        _In_  const FLOAT ColorRGBA[4]) final;
-
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(
-        _In_  ID3D11UnorderedAccessView* pUnorderedAccessView,
-        _In_  const UINT Values[4]) final;
-
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(
-        _In_  ID3D11UnorderedAccessView* pUnorderedAccessView,
-        _In_  const FLOAT Values[4]) final;
-
-    virtual void STDMETHODCALLTYPE ClearDepthStencilView(
-        _In_  ID3D11DepthStencilView* pDepthStencilView,
-        _In_  UINT ClearFlags,
-        _In_  FLOAT Depth,
-        _In_  UINT8 Stencil) final;
-
-    virtual void STDMETHODCALLTYPE GenerateMips(
-        _In_  ID3D11ShaderResourceView* pShaderResourceView) final;
-
-    virtual void STDMETHODCALLTYPE SetResourceMinLOD(
-        _In_  ID3D11Resource* pResource,
-        FLOAT MinLOD) final;
-
-    virtual FLOAT STDMETHODCALLTYPE GetResourceMinLOD(
-        _In_  ID3D11Resource* pResource) final;
-
-    virtual void STDMETHODCALLTYPE ResolveSubresource(
-        _In_  ID3D11Resource* pDstResource,
-        _In_  UINT DstSubresource,
-        _In_  ID3D11Resource* pSrcResource,
-        _In_  UINT SrcSubresource,
-        _In_  DXGI_FORMAT Format) final;
-
-    virtual void STDMETHODCALLTYPE HSSetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _In_reads_opt_(NumViews)  ID3D11ShaderResourceView * const* ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE HSSetShader(
-        _In_opt_  ID3D11HullShader * pHullShader,
-        _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance * const* ppClassInstances,
-        UINT NumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE HSSetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _In_reads_opt_(NumSamplers)  ID3D11SamplerState * const* ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE HSSetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE DSSetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _In_reads_opt_(NumViews)  ID3D11ShaderResourceView * const* ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE DSSetShader(
-        _In_opt_  ID3D11DomainShader * pDomainShader,
-        _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance * const* ppClassInstances,
-        UINT NumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE DSSetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _In_reads_opt_(NumSamplers)  ID3D11SamplerState * const* ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE DSSetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE CSSetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _In_reads_opt_(NumViews)  ID3D11ShaderResourceView * const* ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE CSSetUnorderedAccessViews(
-        _In_range_(0, D3D11_1_UAV_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_1_UAV_SLOT_COUNT - StartSlot)  UINT NumUAVs,
-        _In_reads_opt_(NumUAVs)  ID3D11UnorderedAccessView * const* ppUnorderedAccessViews,
-        _In_reads_opt_(NumUAVs)  const UINT * pUAVInitialCounts) final;
-
-    virtual void STDMETHODCALLTYPE CSSetShader(
-        _In_opt_  ID3D11ComputeShader * pComputeShader,
-        _In_reads_opt_(NumClassInstances)  ID3D11ClassInstance * const* ppClassInstances,
-        UINT NumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE CSSetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _In_reads_opt_(NumSamplers)  ID3D11SamplerState * const* ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE CSSetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _In_reads_opt_(NumBuffers)  ID3D11Buffer * const* ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE VSGetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE PSGetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView * *ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE PSGetShader(
-        _Out_  ID3D11PixelShader** ppPixelShader,
-        _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-        _Inout_opt_  UINT* pNumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE PSGetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _Out_writes_opt_(NumSamplers)  ID3D11SamplerState * *ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE VSGetShader(
-        _Out_  ID3D11VertexShader** ppVertexShader,
-        _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-        _Inout_opt_  UINT* pNumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE PSGetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE IAGetInputLayout(
-        _Out_  ID3D11InputLayout** ppInputLayout) final;
-
-    virtual void STDMETHODCALLTYPE IAGetVertexBuffers(
-        _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppVertexBuffers,
-        _Out_writes_opt_(NumBuffers)  UINT * pStrides,
-        _Out_writes_opt_(NumBuffers)  UINT * pOffsets) final;
-
-    virtual void STDMETHODCALLTYPE IAGetIndexBuffer(
-        _Out_opt_  ID3D11Buffer** pIndexBuffer,
-        _Out_opt_  DXGI_FORMAT* Format,
-        _Out_opt_  UINT* Offset) final;
-
-    virtual void STDMETHODCALLTYPE GSGetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE GSGetShader(
-        _Out_  ID3D11GeometryShader** ppGeometryShader,
-        _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-        _Inout_opt_  UINT* pNumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology(
-        _Out_  D3D11_PRIMITIVE_TOPOLOGY* pTopology) final;
-
-    virtual void STDMETHODCALLTYPE VSGetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView * *ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE VSGetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _Out_writes_opt_(NumSamplers)  ID3D11SamplerState * *ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE GetPredication(
-        _Out_opt_  ID3D11Predicate** ppPredicate,
-        _Out_opt_  BOOL* pPredicateValue) final;
-
-    virtual void STDMETHODCALLTYPE GSGetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView * *ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE GSGetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _Out_writes_opt_(NumSamplers)  ID3D11SamplerState * *ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE OMGetRenderTargets(
-        _In_range_(0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT)  UINT NumViews,
-        _Out_writes_opt_(NumViews)  ID3D11RenderTargetView * *ppRenderTargetViews,
-        _Out_opt_  ID3D11DepthStencilView * *ppDepthStencilView) final;
-
-    virtual void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(
-        _In_range_(0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT)  UINT NumRTVs,
-        _Out_writes_opt_(NumRTVs)  ID3D11RenderTargetView * *ppRenderTargetViews,
-        _Out_opt_  ID3D11DepthStencilView * *ppDepthStencilView,
-        _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1)  UINT UAVStartSlot,
-        _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot)  UINT NumUAVs,
-        _Out_writes_opt_(NumUAVs)  ID3D11UnorderedAccessView * *ppUnorderedAccessViews) final;
-
-    virtual void STDMETHODCALLTYPE OMGetBlendState(
-        _Out_opt_  ID3D11BlendState * *ppBlendState,
-        _Out_opt_  FLOAT BlendFactor[4],
-        _Out_opt_  UINT * pSampleMask) final;
-
-    virtual void STDMETHODCALLTYPE OMGetDepthStencilState(
-        _Out_opt_  ID3D11DepthStencilState** ppDepthStencilState,
-        _Out_opt_  UINT* pStencilRef) final;
-
-    virtual void STDMETHODCALLTYPE SOGetTargets(
-        _In_range_(0, D3D11_SO_BUFFER_SLOT_COUNT)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppSOTargets) final;
-
-    virtual void STDMETHODCALLTYPE RSGetState(
-        _Out_  ID3D11RasterizerState** ppRasterizerState) final;
-
-    virtual void STDMETHODCALLTYPE RSGetViewports(
-        _Inout_  UINT* pNumViewports,
-        _Out_writes_opt_(*pNumViewports)  D3D11_VIEWPORT* pViewports) final;
-
-    virtual void STDMETHODCALLTYPE RSGetScissorRects(
-        _Inout_  UINT* pNumRects,
-        _Out_writes_opt_(*pNumRects)  D3D11_RECT* pRects) final;
-
-    virtual void STDMETHODCALLTYPE HSGetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView * *ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE HSGetShader(
-        _Out_  ID3D11HullShader** ppHullShader,
-        _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-        _Inout_opt_  UINT* pNumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE HSGetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _Out_writes_opt_(NumSamplers)  ID3D11SamplerState * *ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE HSGetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE DSGetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView * *ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE DSGetShader(
-        _Out_  ID3D11DomainShader** ppDomainShader,
-        _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-        _Inout_opt_  UINT* pNumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE DSGetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _Out_writes_opt_(NumSamplers)  ID3D11SamplerState * *ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE DSGetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE CSGetShaderResources(
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot)  UINT NumViews,
-        _Out_writes_opt_(NumViews)  ID3D11ShaderResourceView * *ppShaderResourceViews) final;
-
-    virtual void STDMETHODCALLTYPE CSGetUnorderedAccessViews(
-        _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_PS_CS_UAV_REGISTER_COUNT - StartSlot)  UINT NumUAVs,
-        _Out_writes_opt_(NumUAVs)  ID3D11UnorderedAccessView * *ppUnorderedAccessViews) final;
-
-    virtual void STDMETHODCALLTYPE CSGetShader(
-        _Out_  ID3D11ComputeShader** ppComputeShader,
-        _Out_writes_opt_(*pNumClassInstances)  ID3D11ClassInstance** ppClassInstances,
-        _Inout_opt_  UINT* pNumClassInstances) final;
-
-    virtual void STDMETHODCALLTYPE CSGetSamplers(
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot)  UINT NumSamplers,
-        _Out_writes_opt_(NumSamplers)  ID3D11SamplerState * *ppSamplers) final;
-
-    virtual void STDMETHODCALLTYPE CSGetConstantBuffers(
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1)  UINT StartSlot,
-        _In_range_(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot)  UINT NumBuffers,
-        _Out_writes_opt_(NumBuffers)  ID3D11Buffer * *ppConstantBuffers) final;
-
-    virtual void STDMETHODCALLTYPE ClearState() final;
-
-    virtual void STDMETHODCALLTYPE Flush() final;
-
-    virtual D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType() final;
-
-    virtual UINT STDMETHODCALLTYPE GetContextFlags() final;
-
-    virtual void STDMETHODCALLTYPE ExecuteCommandList(
-        _In_  ID3D11CommandList* pCommandList,
-        BOOL RestoreContextState) final;
-
-    virtual HRESULT STDMETHODCALLTYPE FinishCommandList(
-        _In_  BOOL RestoreDeferredContextState,
-        _Out_opt_  ID3D11CommandList** ppCommandList) final;
-
-    #pragma endregion
-
-    #pragma region /* D3D 11.1 specific functions */
-
-    virtual void STDMETHODCALLTYPE CopySubresourceRegion1(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox, UINT CopyFlags) final;
-    virtual void STDMETHODCALLTYPE CopyResource1(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource, UINT CopyFlags) final;
-    virtual void STDMETHODCALLTYPE UpdateSubresource1(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch, UINT CopyFlags) final;
-    virtual void STDMETHODCALLTYPE DiscardResource(ID3D11Resource* pResource) final;
-    virtual void STDMETHODCALLTYPE DiscardView(ID3D11View* pResourceView) final;
-
-    virtual void STDMETHODCALLTYPE VSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE HSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE DSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE GSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE PSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE CSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) final;
-
-    virtual void STDMETHODCALLTYPE VSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE HSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE DSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE GSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE PSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) final;
-    virtual void STDMETHODCALLTYPE CSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) final;
-
-    virtual void STDMETHODCALLTYPE SwapDeviceContextState(ID3DDeviceContextState* pState, ID3DDeviceContextState** ppPreviousState) final;
-    virtual void STDMETHODCALLTYPE ClearView(ID3D11View* pView, const FLOAT Color[4], const D3D11_RECT* pRect, UINT NumRects) final;
-    virtual void STDMETHODCALLTYPE DiscardView1(ID3D11View* pResourceView, const D3D11_RECT* pRects, UINT NumRects) final;
-
-    #pragma endregion
-
-    virtual void STDMETHODCALLTYPE ClearRectsRenderTargetView(
-        _In_  ID3D11RenderTargetView * pRenderTargetView,
-        _In_  const FLOAT ColorRGBA[4],
-        _In_  UINT NumRects,
-        _In_reads_opt_(NumRects)  const D3D11_RECT * pRects);
-
-    virtual void STDMETHODCALLTYPE ClearRectsUnorderedAccessViewUint(
-        _In_  ID3D11UnorderedAccessView * pUnorderedAccessView,
-        _In_  const UINT Values[4],
-        _In_  UINT NumRects,
-        _In_reads_opt_(NumRects)  const D3D11_RECT * pRects);
-
-    virtual void STDMETHODCALLTYPE ClearRectsUnorderedAccessViewFloat(
-        _In_  ID3D11UnorderedAccessView * pUnorderedAccessView,
-        _In_  const FLOAT Values[4],
-        _In_  UINT NumRects,
-        _In_reads_opt_(NumRects)  const D3D11_RECT * pRects);
-
-    virtual void STDMETHODCALLTYPE ClearRectsDepthStencilView(
-        _In_  ID3D11DepthStencilView * pDepthStencilView,
-        _In_  UINT ClearFlags,
-        _In_  FLOAT Depth,
-        _In_  UINT8 Stencil,
-        _In_  UINT NumRects,
-        _In_reads_opt_(NumRects)  const D3D11_RECT * pRects);
-
-    HRESULT STDMETHODCALLTYPE CopyStagingResource(
-        _In_  ID3D11Resource* pStagingResource,
-        _In_  ID3D11Resource* pSourceResource,
-        _In_  UINT SubResource,
-        _In_  BOOL Upload);
-
-    HRESULT STDMETHODCALLTYPE TestStagingResource(
-        _In_  ID3D11Resource* pStagingResource);
-
-    HRESULT STDMETHODCALLTYPE WaitStagingResource(
-        _In_  ID3D11Resource* pStagingResource);
-
-    HRESULT STDMETHODCALLTYPE MapStagingResource(
-        _In_  ID3D11Resource* pTextureResource,
-        _In_  ID3D11Resource* pStagingResource,
-        _In_  UINT SubResource,
-        _In_  BOOL Upload,
-        _Out_ void** ppStagingMemory,
-        _Out_ uint32* pRowPitch);
-
-    void STDMETHODCALLTYPE UnmapStagingResource(
-        _In_  ID3D11Resource* pStagingResource,
-        _In_  BOOL Upload);
-
-    void STDMETHODCALLTYPE UploadResource(
-        _In_  ICryDX12Resource* pDstResource,
-        _In_  const D3D11_SUBRESOURCE_DATA* pInitialData,
-        _In_  size_t numInitialData);
-
-    void STDMETHODCALLTYPE UploadResource(
-        _In_  DX12::Resource* pDstResource,
-        _In_  const DX12::Resource::InitialData* pSrcData);
-
-    ILINE UINT64 InsertFence()
-    {
-        return m_CmdFenceSet.GetCurrentValue(CMDQUEUE_GRAPHICS) - !m_DirectCommandList->IsUtilized();
-    }
-
-    ILINE HRESULT FlushToFence(UINT64 fenceValue)
-    {
-        m_DirectListPool.GetAsyncCommandQueue().Flush(fenceValue);
-        return S_OK;
-    }
-
-    ILINE HRESULT TestForFence(UINT64 fenceValue)
-    {
-        return m_CmdFenceSet.IsCompleted(fenceValue, CMDQUEUE_GRAPHICS) ? S_OK : S_FALSE;
-    }
-
-    ILINE HRESULT WaitForFence(UINT64 fenceValue)
-    {
-        m_CmdFenceSet.WaitForFence(fenceValue, CMDQUEUE_GRAPHICS);
-        return S_OK;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CCRYDX12DEVICECONTEXT_HPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(CCryDX12DeviceContext_hpp)
-#endif
-
-    void WaitForIdle();
-
-    void ResetCachedState();
-
-    void PushMarker(const char* name)
-    {
-        ::PIXBeginEvent(m_DirectCommandList->GetD3D12CommandList(), 0, name);
-    }
-
-    void PopMarker()
-    {
-        ::PIXEndEvent(m_DirectCommandList->GetD3D12CommandList());
-    }
-
-    UINT64 MakeCpuTimestamp(UINT64 gpuTimestamp) const;
-    UINT64 MakeCpuTimestampMicroseconds(UINT64 gpuTimestamp) const;
-
-    void BeginCopyRegion()
-    {
-        m_bInCopyRegion = true;
-    }
-
-    void EndCopyRegion()
-    {
-        m_bInCopyRegion = false;
-    }
-
-    void SubmitAllCommands(bool wait);
-
-    UINT TimestampIndex(DX12::CommandList* pCmdList);
-    ID3D12Resource* QueryTimestamp(DX12::CommandList* pCmdList, UINT index);
-    void ResolveTimestamp(DX12::CommandList* pCmdList, UINT index, void* mem);
-
-    UINT OcclusionIndex(DX12::CommandList* pCmdList, bool counter);
-    ID3D12Resource* QueryOcclusion(DX12::CommandList* pCmdList, UINT index, bool counter);
-    void ResolveOcclusion(DX12::CommandList* pCmdList, UINT index, void* mem);
-
-    // This is a somewhat arbitrary number that affects stack usage for methods that get subresource descriptors.
-    static constexpr int MAX_SUBRESOURCES = 64;
-
-private:
-    bool PreparePSO(DX12::CommandMode commandMode);
-    void PrepareGraphicsFF();
-
-    bool PrepareGraphicsState();
-    bool PrepareComputeState();
-
-    void CeaseDirectCommandQueue(bool wait);
-    void ResumeDirectCommandQueue();
-    void CeaseCopyCommandQueue(bool wait);
-    void ResumeCopyCommandQueue();
-    void CeaseAllCommandQueues(bool wait);
-    void ResumeAllCommandQueues();
-
-    void SubmitDirectCommands(bool wait);
-    void SubmitDirectCommands(bool wait, const UINT64 fenceValue);
-    void SubmitCopyCommands(bool wait);
-    void SubmitCopyCommands(bool wait, const UINT64 fenceValue);
-    void SubmitAllCommands(bool wait, const UINT64(&fenceValues)[CMDQUEUE_NUM]);
-    void SubmitAllCommands(bool wait, const UINT64(&fenceValues)[CMDQUEUE_NUM], int fenceId);
-    void SubmitAllCommands(bool wait, const std::atomic<AZ::u64>(&fenceValues)[CMDQUEUE_NUM]);
-    void SubmitAllCommands(bool wait, const std::atomic<AZ::u64>(&fenceValues)[CMDQUEUE_NUM], int fenceId);
-
-    void BindResources(DX12::CommandMode commandMode);
-    void BindOutputViews();
-
-    void DebugPrintResources(DX12::CommandMode commandMode);
-
-    void SetConstantBuffers1(
-        DX12::EShaderStage shaderStage,
-        UINT StartSlot,
-        UINT NumBuffers,
-        ID3D11Buffer* const* ppConstantBuffers,
-        const UINT* pFirstConstant,
-        const UINT* pNumConstants,
-        DX12::CommandMode commandMode);
-
-    bool m_bInCopyRegion;
-
-    CCryDX12Device* m_pDevice;
-    DX12::Device* m_pDX12Device;
-
-    DX12::CommandListFenceSet m_CmdFenceSet;
-
-    DX12::CommandListPool m_DirectListPool;
-    DX12::CommandListPool m_CopyListPool;
-
-    DX12::SmartPtr<DX12::CommandList> m_DirectCommandList;
-    DX12::SmartPtr<DX12::CommandList> m_CopyCommandList;
-
-    const DX12::PipelineState* m_CurrentPSO;
-    const DX12::RootSignature* m_CurrentRootSignature[DX12::CommandModeCount];
-    SCryDX11PipelineState m_PipelineState[DX12::CommandModeCount];
-
-    UINT m_OutstandingQueries;
-
-    ID3D12Resource* m_TimestampDownloadBuffer;
-    ID3D12Resource* m_OcclusionDownloadBuffer;
-    UINT m_TimestampIndex;
-    UINT m_OcclusionIndex;
-    void* m_TimestampMemory;
-    void* m_OcclusionMemory;
-    bool m_TimestampMapValid;
-    bool m_OcclusionMapValid;
-    DX12::DescriptorHeap* m_pResourceHeap;
-    DX12::DescriptorHeap* m_pSamplerHeap;
-    bool m_bCurrentNative;
-    int m_nResDynOffset;
-    int m_nFrame;
-    uint32 m_nStencilRef;
-
-    DX12::QueryHeap m_TimestampHeap;
-    DX12::QueryHeap m_OcclusionHeap;
-    DX12::QueryHeap m_PipelineHeap;
-
-#ifdef DX12_STATS
-    size_t m_NumMapDiscardSkips;
-    size_t m_NumMapDiscards;
-
-    size_t m_NumCommandListOverflows;
-    size_t m_NumCommandListSplits;
-    size_t m_NumPSOs;
-    size_t m_NumRootSignatures;
-    size_t m_NumberSettingOutputViews;
-#endif // DX12_STATS
-};
-
-#endif // __CCRYDX12DEVICECONTEXT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12GIFactory.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12GIFactory.cpp
deleted file mode 100644
index 9069b43c03..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12GIFactory.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12GIFactory.hpp"
-#include "CCryDX12SwapChain.hpp"
-
-#include "DX12/Device/CCryDX12Device.hpp"
-#include "DX12/Device/CCryDX12DeviceContext.hpp"
-
-#include "DX12/API/DX12SwapChain.hpp"
-
-CCryDX12GIFactory* CCryDX12GIFactory::Create()
-{
-    IDXGIFactory1* pDXGIFactory1 = NULL;
-
-    if (S_OK != CreateDXGIFactory1(IID_PPV_ARGS(&pDXGIFactory1)))
-    {
-        DX12_ASSERT("Failed to create underlying DXGI factory!");
-        return NULL;
-    }
-
-    return DX12::PassAddRef(new CCryDX12GIFactory(pDXGIFactory1));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12GIFactory::CCryDX12GIFactory(IDXGIFactory1* pDXGIFactory1)
-    : Super()
-    , m_pDXGIFactory1(pDXGIFactory1)
-{
-    DX12_FUNC_LOG
-}
-
-CCryDX12GIFactory::~CCryDX12GIFactory()
-{
-    DX12_FUNC_LOG
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12GIFactory::EnumAdapters(UINT Adapter, _Out_ IDXGIAdapter** ppAdapter)
-{
-    DX12_FUNC_LOG
-    return m_pDXGIFactory1->EnumAdapters(Adapter, ppAdapter);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12GIFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags)
-{
-    DX12_FUNC_LOG
-    return m_pDXGIFactory1->MakeWindowAssociation(WindowHandle, Flags);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12GIFactory::GetWindowAssociation(_Out_ HWND* pWindowHandle)
-{
-    DX12_FUNC_LOG
-    return m_pDXGIFactory1->GetWindowAssociation(pWindowHandle);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12GIFactory::CreateSwapChain(_In_ IUnknown* pDevice, _In_ DXGI_SWAP_CHAIN_DESC* pDesc, _Out_ IDXGISwapChain** ppSwapChain)
-{
-    DX12_FUNC_LOG
-    * ppSwapChain = CCryDX12SwapChain::Create(static_cast<CCryDX12Device*>(pDevice), m_pDXGIFactory1, pDesc);
-    return ppSwapChain ? S_OK : E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12GIFactory::CreateSoftwareAdapter(HMODULE Module, _Out_ IDXGIAdapter** ppAdapter)
-{
-    DX12_FUNC_LOG
-    return m_pDXGIFactory1->CreateSoftwareAdapter(Module, ppAdapter);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12GIFactory::EnumAdapters1(UINT Adapter, _Out_ IDXGIAdapter1** ppAdapter)
-{
-    DX12_FUNC_LOG
-    return m_pDXGIFactory1->EnumAdapters1(Adapter, ppAdapter);
-}
-
-BOOL STDMETHODCALLTYPE CCryDX12GIFactory::IsCurrent()
-{
-    DX12_FUNC_LOG
-    return m_pDXGIFactory1->IsCurrent();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12GIFactory.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12GIFactory.hpp
deleted file mode 100644
index 3e81400a35..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12GIFactory.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12GIFACTORY__
-#define __CCRYDX12GIFACTORY__
-
-#include "DX12/CCryDX12Object.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #undef AZ_RESTRICTED_SECTION
-    #define CCRYDX12GIFACTORY_HPP_SECTION_1 1
-#endif
-
-class CCryDX12GIFactory
-    : public CCryDX12GIObject<IDXGIFactory1>
-{
-public:
-    DX12_OBJECT(CCryDX12GIFactory, CCryDX12GIObject<IDXGIFactory1>);
-
-    static CCryDX12GIFactory* Create();
-
-    virtual ~CCryDX12GIFactory();
-
-    IDXGIFactory1* GetDXGIFactory() const { return m_pDXGIFactory1; }
-
-    #pragma region /* IDXGIFactory implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters(
-        UINT Adapter,
-        _Out_ IDXGIAdapter** ppAdapter) final;
-
-    virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation(
-        HWND WindowHandle,
-        UINT Flags) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation(
-        _Out_ HWND* pWindowHandle) final;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(
-        _In_ IUnknown* pDevice,
-        _In_ DXGI_SWAP_CHAIN_DESC* pDesc,
-        _Out_ IDXGISwapChain** ppSwapChain) final;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CCRYDX12GIFACTORY_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(CCryDX12GIFactory_hpp)
-#endif
-
-    virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(
-        HMODULE Module,
-        _Out_ IDXGIAdapter** ppAdapter) final;
-
-    #pragma endregion
-
-    #pragma region /* IDXGIFactory1 implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters1(
-        UINT Adapter,
-        _Out_ IDXGIAdapter1** ppAdapter) final;
-
-    virtual BOOL STDMETHODCALLTYPE IsCurrent() final;
-
-    #pragma endregion
-
-protected:
-    CCryDX12GIFactory(IDXGIFactory1* pDXGIFactory1);
-
-private:
-    DX12::SmartPtr<IDXGIFactory1> m_pDXGIFactory1;
-};
-
-#endif // __CRYDX12GIFACTORY__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12SwapChain.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12SwapChain.cpp
deleted file mode 100644
index 671dc9d70e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12SwapChain.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12SwapChain.hpp"
-
-#include "DX12/Device/CCryDX12Device.hpp"
-#include "DX12/Device/CCryDX12DeviceContext.hpp"
-#include "DX12/Resource/CCryDX12Resource.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture1D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture2D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture3D.hpp"
-
-#include "DX12/API/DX12Device.hpp"
-#include "DX12/API/DX12SwapChain.hpp"
-#include "DX12/API/DX12Resource.hpp"
-#include "Dx12/API/DX12AsyncCommandQueue.hpp"
-
-#include <AzCore/Debug/EventTraceDrillerBus.h>
-
-#ifdef WIN32
-#include <dwmapi.h>
-#pragma comment(lib, "dwmapi.lib")
-#endif
-
-static const char* s_globalVsyncName = "V-Sync";
-static const char* s_globalEmptyCategory = "";
-
-static void RecordVSyncInstantEvent()
-{
-#ifdef WIN32
-    DWM_TIMING_INFO timingInfo = { sizeof(DWM_TIMING_INFO) };
-    HRESULT hr = DwmGetCompositionTimingInfo(NULL, &timingInfo);
-    if (SUCCEEDED(hr))
-    {
-        UINT64 frequency;
-        QueryPerformanceFrequency((LARGE_INTEGER*)&frequency);
-        UINT64 vsyncMicroSeconds = (timingInfo.qpcVBlank * 1000) / (frequency / 1000);
-        EBUS_QUEUE_EVENT(AZ::Debug::EventTraceDrillerBus, RecordInstantGlobal, s_globalVsyncName, s_globalEmptyCategory, (AZ::u64)vsyncMicroSeconds);
-    }
-#endif
-}
-
-
-CCryDX12SwapChain* CCryDX12SwapChain::Create(CCryDX12Device* device, IDXGIFactory1* factory, DXGI_SWAP_CHAIN_DESC* pDesc)
-{
-    CCryDX12DeviceContext* deviceContext = device->GetDeviceContext();
-    DX12::SwapChain* swapChain = DX12::SwapChain::Create(deviceContext->GetCoreGraphicsCommandList(), factory, pDesc);
-
-    return DX12::PassAddRef(new CCryDX12SwapChain(device, swapChain));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12SwapChain::CCryDX12SwapChain(CCryDX12Device* device, DX12::SwapChain* swapChain)
-    : Super()
-    , m_Device(device)
-    , m_SwapChain(swapChain)
-{
-    DX12_FUNC_LOG
-    AcquireBuffers();
-}
-
-CCryDX12SwapChain::~CCryDX12SwapChain()
-{
-    DX12_FUNC_LOG
-    ForfeitBuffers();
-
-    SAFE_RELEASE(m_SwapChain);
-}
-
-void CCryDX12SwapChain::AcquireBuffers()
-{
-    const DXGI_SWAP_CHAIN_DESC& desc = m_SwapChain->GetDesc();
-    IDXGISwapChain* swapChain = m_SwapChain->GetDXGISwapChain();
-
-    AZStd::vector<DX12::Resource*> resources;
-    m_BackBuffers.reserve(desc.BufferCount);
-    resources.reserve(desc.BufferCount);
-
-    for (int i = 0; i < desc.BufferCount; ++i)
-    {
-        ID3D12Resource* resource12 = NULL;
-        if (S_OK == swapChain->GetBuffer(i, IID_GRAPHICS_PPV_ARGS(&resource12)))
-        {
-            m_BackBuffers.emplace_back();
-            m_BackBuffers.back().attach(CCryDX12Texture2D::Create(GetDevice(), this, resource12));
-            resources.emplace_back(&m_BackBuffers.back()->GetDX12Resource());
-            resource12->Release();
-        }
-    }
-
-    m_SwapChain->AcquireBuffers(std::move(resources));
-}
-
-void CCryDX12SwapChain::ForfeitBuffers()
-{
-    m_SwapChain->ForfeitBuffers();
-    m_BackBuffers.clear();
-}
-
-/* IDXGIDeviceSubObject implementation */
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::GetDevice(
-    _In_  REFIID riid,
-    _Out_  void** ppDevice)
-{
-    DX12_FUNC_LOG
-    return m_SwapChain->GetDXGISwapChain()->GetDevice(riid, ppDevice);
-}
-
-/* IDXGISwapChain implementation */
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::Present(
-    UINT SyncInterval,
-    UINT Flags)
-{
-    AZ_TRACE_METHOD();
-    DX12_FUNC_LOG
-
-    m_Device->GetDeviceContext()->Finish(m_SwapChain);
-
-    DX12_LOG("------------------------------------------------ PRESENT ------------------------------------------------");
-    HRESULT hr = m_SwapChain->Present(SyncInterval, Flags);
-    RecordVSyncInstantEvent();
-    return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::GetBuffer(
-    UINT Buffer,
-    _In_  REFIID riid,
-    _Out_  void** ppSurface)
-{
-    DX12_FUNC_LOG
-    if (riid == __uuidof(ID3D11Texture2D))
-    {
-        AZ_Assert(Buffer < m_BackBuffers.size(), "Invalid buffer index");
-        CCryDX12Texture2D* texture = m_BackBuffers[Buffer];
-        texture->AddRef();
-        *ppSurface = texture;
-    }
-    else
-    {
-        DX12_ASSERT(0, "Not implemented!");
-        return -1;
-    }
-
-    return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::SetFullscreenState(
-    BOOL Fullscreen,
-    _In_opt_  IDXGIOutput* pTarget)
-{
-    DX12_FUNC_LOG
-    m_Device->GetDeviceContext()->SubmitAllCommands(true);
-    return m_SwapChain->GetDXGISwapChain()->SetFullscreenState(Fullscreen, pTarget);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::GetFullscreenState(
-    _Out_opt_  BOOL* pFullscreen,
-    _Out_opt_  IDXGIOutput** ppTarget)
-{
-    DX12_FUNC_LOG
-    return m_SwapChain->GetDXGISwapChain()->GetFullscreenState(pFullscreen, ppTarget);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::GetDesc(
-    _Out_  DXGI_SWAP_CHAIN_DESC* pDesc)
-{
-    DX12_FUNC_LOG
-    return m_SwapChain->GetDXGISwapChain()->GetDesc(pDesc);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::ResizeBuffers(
-    UINT BufferCount,
-    UINT Width,
-    UINT Height,
-    DXGI_FORMAT NewFormat,
-    UINT SwapChainFlags)
-{
-    DX12_FUNC_LOG
-
-    ID3D11RenderTargetView* views[8] = {};
-    m_Device->GetDeviceContext()->OMSetRenderTargets(8, views, nullptr);
-
-    m_Device->GetDeviceContext()->SubmitAllCommands(true);
-
-    m_Device->GetDeviceContext()->WaitForIdle();
-
-    ForfeitBuffers();
-
-    m_Device->GetDX12Device()->FlushReleaseHeap(DX12::Device::ResourceReleasePolicy::Immediate);
-
-    HRESULT res = m_SwapChain->GetDXGISwapChain()->ResizeBuffers(BufferCount, Width, Height, NewFormat, SwapChainFlags);
-    if (res == S_OK)
-    {
-        AcquireBuffers();
-    }
-
-    return res;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::ResizeTarget(
-    _In_  const DXGI_MODE_DESC* pNewTargetParameters)
-{
-    DX12_FUNC_LOG
-
-    ID3D11RenderTargetView* views[8] = {};
-    m_Device->GetDeviceContext()->OMSetRenderTargets(8, views, nullptr);
-
-    m_Device->GetDeviceContext()->SubmitAllCommands(true);
-
-    m_Device->GetDeviceContext()->WaitForIdle();
-
-    ForfeitBuffers();
-
-    HRESULT hr = m_SwapChain->GetDXGISwapChain()->ResizeTarget(pNewTargetParameters);
-    return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::GetContainingOutput(
-    _Out_  IDXGIOutput** ppOutput)
-{
-    DX12_FUNC_LOG
-    return m_SwapChain->GetDXGISwapChain()->GetContainingOutput(ppOutput);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::GetFrameStatistics(
-    _Out_  DXGI_FRAME_STATISTICS* pStats)
-{
-    DX12_FUNC_LOG
-    return m_SwapChain->GetDXGISwapChain()->GetFrameStatistics(pStats);
-}
-
-HRESULT STDMETHODCALLTYPE CCryDX12SwapChain::GetLastPresentCount(
-    _Out_  UINT* pLastPresentCount)
-{
-    DX12_FUNC_LOG
-    return m_SwapChain->GetDXGISwapChain()->GetLastPresentCount(pLastPresentCount);
-}
-
-/* IDXGISwapChain1 implementation */
-
-/* IDXGISwapChain2 implementation */
-
-/* IDXGISwapChain3 implementation */
-
-UINT STDMETHODCALLTYPE CCryDX12SwapChain::GetCurrentBackBufferIndex(
-    void)
-{
-    DX12_FUNC_LOG
-    return m_SwapChain->GetCurrentBackBufferIndex();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12SwapChain.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12SwapChain.hpp
deleted file mode 100644
index 5b5c0b3290..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/GI/CCryDX12SwapChain.hpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12GISWAPCHAIN__
-#define __CCRYDX12GISWAPCHAIN__
-
-#include "DX12/CCryDX12Object.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture2D.hpp"
-
-#include "DX12/API/DX12SwapChain.hpp"
-
-#include <AzCore/std/containers/vector.h>
-
-class CCryDX12SwapChain
-    : public CCryDX12GIObject<IDXGISwapChain3>
-{
-public:
-    DX12_OBJECT(CCryDX12SwapChain, CCryDX12GIObject<IDXGISwapChain3>);
-
-    static CCryDX12SwapChain* Create(CCryDX12Device* pDevice, IDXGIFactory1* factory, DXGI_SWAP_CHAIN_DESC* pDesc);
-
-    virtual ~CCryDX12SwapChain();
-
-    ILINE CCryDX12Device* GetDevice() const
-    {
-        return m_Device;
-    }
-
-    ILINE IDXGISwapChain3* GetDXGISwapChain() const
-    {
-        return m_SwapChain->GetDXGISwapChain();
-    }
-
-    ILINE DX12::SwapChain* GetDX12SwapChain()
-    {
-        return m_SwapChain;
-    }
-
-    #pragma region /* IDXGIDeviceSubObject implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE GetDevice(
-        _In_  REFIID riid,
-        _Out_  void** ppDevice) final;
-
-    #pragma endregion
-
-    #pragma region /* IDXGISwapChain implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE Present(
-        UINT SyncInterval,
-        UINT Flags) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetBuffer(
-        UINT Buffer,
-        _In_  REFIID riid,
-        _Out_  void** ppSurface) final;
-
-    virtual HRESULT STDMETHODCALLTYPE SetFullscreenState(
-        BOOL Fullscreen,
-        _In_opt_  IDXGIOutput* pTarget) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetFullscreenState(
-        _Out_opt_  BOOL* pFullscreen,
-        _Out_opt_  IDXGIOutput** ppTarget) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(
-        _Out_  DXGI_SWAP_CHAIN_DESC* pDesc) final;
-
-    virtual HRESULT STDMETHODCALLTYPE ResizeBuffers(
-        UINT BufferCount,
-        UINT Width,
-        UINT Height,
-        DXGI_FORMAT NewFormat,
-        UINT SwapChainFlags) final;
-
-    virtual HRESULT STDMETHODCALLTYPE ResizeTarget(
-        _In_  const DXGI_MODE_DESC* pNewTargetParameters) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetContainingOutput(
-        _Out_  IDXGIOutput** ppOutput) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(
-        _Out_  DXGI_FRAME_STATISTICS* pStats) final;
-
-    virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount(
-        _Out_  UINT* pLastPresentCount) final;
-
-    #pragma endregion
-
-    #pragma region /* IDXGISwapChain1 implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE GetDesc1(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  DXGI_SWAP_CHAIN_DESC1* pDesc) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetFullscreenDesc(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pDesc) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetHwnd(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  HWND* pHwnd) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetCoreWindow(
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  REFIID refiid,
-        /* [annotation][out] */
-        [[maybe_unused]] _COM_Outptr_  void** ppUnk) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE Present1(
-        [[maybe_unused]] /* [in] */ UINT SyncInterval,
-        [[maybe_unused]] /* [in] */ UINT PresentFlags,
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  const DXGI_PRESENT_PARAMETERS* pPresentParameters) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual BOOL STDMETHODCALLTYPE IsTemporaryMonoSupported() final
-    {
-        DX12_NOT_IMPLEMENTED
-        return FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetRestrictToOutput(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  IDXGIOutput** ppRestrictToOutput) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetBackgroundColor(
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  const DXGI_RGBA* pColor) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetBackgroundColor(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  DXGI_RGBA* pColor) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetRotation(
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  DXGI_MODE_ROTATION Rotation) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetRotation(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  DXGI_MODE_ROTATION* pRotation) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    #pragma endregion
-
-    #pragma region /* IDXGISwapChain2 implementation */
-
-    virtual HRESULT STDMETHODCALLTYPE SetSourceSize(
-        [[maybe_unused]] UINT Width,
-        [[maybe_unused]] UINT Height) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetSourceSize(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  UINT* pWidth,
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  UINT* pHeight) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(
-        UINT MaxLatency) final
-    {
-        return m_SwapChain->GetDXGISwapChain()->SetMaximumFrameLatency(MaxLatency);
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  UINT* pMaxLatency) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HANDLE STDMETHODCALLTYPE GetFrameLatencyWaitableObject() final
-    {
-        return m_SwapChain->GetDXGISwapChain()->GetFrameLatencyWaitableObject();
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetMatrixTransform(
-        [[maybe_unused]] const DXGI_MATRIX_3X2_F* pMatrix) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetMatrixTransform(
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  DXGI_MATRIX_3X2_F* pMatrix) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    #pragma endregion
-
-    #pragma region /* IDXGISwapChain3 implementation */
-
-    virtual UINT STDMETHODCALLTYPE GetCurrentBackBufferIndex() final;
-
-    virtual HRESULT STDMETHODCALLTYPE CheckColorSpaceSupport(
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  DXGI_COLOR_SPACE_TYPE ColorSpace,
-        /* [annotation][out] */
-        [[maybe_unused]] _Out_  UINT* pColorSpaceSupport) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetColorSpace1(
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  DXGI_COLOR_SPACE_TYPE ColorSpace) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE ResizeBuffers1(
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  UINT BufferCount,
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  UINT Width,
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  UINT Height,
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  DXGI_FORMAT Format,
-        /* [annotation][in] */
-        [[maybe_unused]] _In_  UINT SwapChainFlags,
-        /* [annotation][in] */
-        [[maybe_unused]] _In_reads_(BufferCount) const UINT* pCreationNodeMask,
-        /* [annotation][in] */
-        [[maybe_unused]] _In_reads_(BufferCount) IUnknown* const* ppPresentQueue) final
-    {
-        DX12_NOT_IMPLEMENTED
-        return S_OK;
-    }
-
-    #pragma endregion
-
-protected:
-    CCryDX12SwapChain(CCryDX12Device* pDevice, DX12::SwapChain* pSwapChain);
-
-private:
-    void AcquireBuffers();
-    void ForfeitBuffers();
-
-    CCryDX12Device* m_Device;
-
-    DX12::SwapChain* m_SwapChain;
-    AZStd::vector<DX12::SmartPtr<CCryDX12Texture2D>> m_BackBuffers;
-};
-
-#endif // __CCRYDX12GISWAPCHAIN__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-mpmc-bounded.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-mpmc-bounded.hpp
deleted file mode 100644
index f051a0abd6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-mpmc-bounded.hpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-// This is free and unencumbered software released into the public domain.
-
-// Anyone is free to copy, modify, publish, use, compile, sell, or
-// distribute this software, either in source code form or as a compiled
-// binary, for any purpose, commercial or non-commercial, and by any
-// means.
-
-// In jurisdictions that recognize copyright laws, the author or authors
-// of this software dedicate any and all copyright interest in the
-// software to the public domain. We make this dedication for the benefit
-// of the public at large and to the detriment of our heirs and
-// successors. We intend this dedication to be an overt act of
-// relinquishment in perpetuity of all present and future rights to this
-// software under copyright law.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// For more information, please refer to <http://unlicense.org/>
-
-// Implementation of Dmitry Vyukov's MPMC algorithm
-// http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
-
-
-#ifndef __MPMC_BOUNDED_QUEUE_INCLUDED__
-#define __MPMC_BOUNDED_QUEUE_INCLUDED__
-
-#include <atomic>
-#include <assert.h>
-
-namespace concqueue
-{
-    template<typename T>
-    class mpmc_bounded_queue_t
-    {
-    public:
-
-        mpmc_bounded_queue_t(size_t size)
-            : _size(size)
-            , _mask(size - 1)
-            , _buffer(reinterpret_cast<node_t*>(new aligned_node_t[_size]))
-            , _head_seq(0)
-            , _tail_seq(0)
-        {
-            // make sure it's a power of 2
-            assert((_size != 0) && ((_size & (~_size + 1)) == _size));
-
-            // populate the sequence initial values
-            for (size_t i = 0; i < _size; ++i)
-            {
-                _buffer[i].seq.store(i, std::memory_order_relaxed);
-            }
-        }
-
-        ~mpmc_bounded_queue_t()
-        {
-            delete[] _buffer;
-        }
-
-        bool enqueue(const T& data)
-        {
-            // _head_seq only wraps at MAX(_head_seq) instead we use a mask to convert the sequence to an array index
-            // this is why the ring buffer must be a size which is a power of 2. this also allows the sequence to double as a ticket/lock.
-            size_t  head_seq = _head_seq.load(std::memory_order_relaxed);
-
-            for (;; )
-            {
-                node_t*  node = &_buffer[head_seq & _mask];
-                size_t   node_seq = node->seq.load(std::memory_order_acquire);
-                intptr_t dif = (intptr_t)node_seq - (intptr_t)head_seq;
-
-                // if seq and head_seq are the same then it means this slot is empty
-                if (dif == 0)
-                {
-                    // claim our spot by moving head
-                    // if head isn't the same as we last checked then that means someone beat us to the punch
-                    // weak compare is faster, but can return spurious results
-                    // which in this instance is OK, because it's in the loop
-                    if (_head_seq.compare_exchange_weak(head_seq, head_seq + 1, std::memory_order_relaxed))
-                    {
-                        // set the data
-                        node->data = data;
-                        // increment the sequence so that the tail knows it's accessible
-                        node->seq.store(head_seq + 1, std::memory_order_release);
-                        return true;
-                    }
-                }
-                else if (dif < 0)
-                {
-                    // if seq is less than head seq then it means this slot is full and therefore the buffer is full
-                    return false;
-                }
-                else
-                {
-                    // under normal circumstances this branch should never be taken
-                    head_seq = _head_seq.load(std::memory_order_relaxed);
-                }
-            }
-
-            // never taken
-            return false;
-        }
-
-        bool dequeue(T& data)
-        {
-            size_t tail_seq = _tail_seq.load(std::memory_order_relaxed);
-
-            for (;; )
-            {
-                node_t*  node = &_buffer[tail_seq & _mask];
-                size_t   node_seq = node->seq.load(std::memory_order_acquire);
-                intptr_t dif = (intptr_t)node_seq - (intptr_t)(tail_seq + 1);
-
-                // if seq and head_seq are the same then it means this slot is empty
-                if (dif == 0)
-                {
-                    // claim our spot by moving head
-                    // if head isn't the same as we last checked then that means someone beat us to the punch
-                    // weak compare is faster, but can return spurious results
-                    // which in this instance is OK, because it's in the loop
-                    if (_tail_seq.compare_exchange_weak(tail_seq, tail_seq + 1, std::memory_order_relaxed))
-                    {
-                        // set the output
-                        data = node->data;
-                        // set the sequence to what the head sequence should be next time around
-                        node->seq.store(tail_seq + _mask + 1, std::memory_order_release);
-                        return true;
-                    }
-                }
-                else if (dif < 0)
-                {
-                    // if seq is less than head seq then it means this slot is full and therefore the buffer is full
-                    return false;
-                }
-                else
-                {
-                    // under normal circumstances this branch should never be taken
-                    tail_seq = _tail_seq.load(std::memory_order_relaxed);
-                }
-            }
-
-            // never taken
-            return false;
-        }
-
-    private:
-
-        struct node_t
-        {
-            T                     data;
-            std::atomic<size_t>   seq;
-        };
-
-        typedef typename std::aligned_storage<sizeof(node_t), std::alignment_of<node_t>::value>::type aligned_node_t;
-        typedef char cache_line_pad_t[64]; // it's either 32 or 64 so 64 is good enough
-
-        cache_line_pad_t    _pad0;
-        const size_t        _size;
-        const size_t        _mask;
-        node_t* const       _buffer;
-        cache_line_pad_t    _pad1;
-        std::atomic<size_t> _head_seq;
-        cache_line_pad_t    _pad2;
-        std::atomic<size_t> _tail_seq;
-        cache_line_pad_t    _pad3;
-
-        mpmc_bounded_queue_t(const mpmc_bounded_queue_t&) {}
-        void operator=(const mpmc_bounded_queue_t&) {}
-    };
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-mpsc.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-mpsc.hpp
deleted file mode 100644
index d36700440a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-mpsc.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-// This is free and unencumbered software released into the public domain.
-
-// Anyone is free to copy, modify, publish, use, compile, sell, or
-// distribute this software, either in source code form or as a compiled
-// binary, for any purpose, commercial or non-commercial, and by any
-// means.
-
-// In jurisdictions that recognize copyright laws, the author or authors
-// of this software dedicate any and all copyright interest in the
-// software to the public domain. We make this dedication for the benefit
-// of the public at large and to the detriment of our heirs and
-// successors. We intend this dedication to be an overt act of
-// relinquishment in perpetuity of all present and future rights to this
-// software under copyright law.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// For more information, please refer to <http://unlicense.org/>
-
-// C++ implementation of Dmitry Vyukov's non-intrusive lock free unbound MPSC queue
-// http://www.1024cores.net/home/lock-free-algorithms/queues/non-intrusive-mpsc-node-based-queue
-
-#ifndef __MPSC_BOUNDED_QUEUE_INCLUDED__
-#define __MPSC_BOUNDED_QUEUE_INCLUDED__
-
-#include <atomic>
-#include <assert.h>
-
-namespace concqueue
-{
-    template<typename T>
-    class mpsc_queue_t
-    {
-    public:
-
-        mpsc_queue_t()
-            : _head(reinterpret_cast<buffer_node_t*>(new buffer_node_aligned_t))
-            , _tail(_head.load(std::memory_order_relaxed))
-        {
-            buffer_node_t* front = _head.load(std::memory_order_relaxed);
-            front->next.store(NULL, std::memory_order_relaxed);
-        }
-
-        ~mpsc_queue_t()
-        {
-            T output;
-            while (this->dequeue(output))
-            {
-            }
-            buffer_node_t* front = _head.load(std::memory_order_relaxed);
-            delete front;
-        }
-
-        bool enqueue(const T& input)
-        {
-            buffer_node_t* node = reinterpret_cast<buffer_node_t*>(new buffer_node_aligned_t);
-            node->data = input;
-            node->next.store(NULL, std::memory_order_relaxed);
-
-            buffer_node_t* prev_head = _head.exchange(node, std::memory_order_acq_rel);
-            prev_head->next.store(node, std::memory_order_release);
-            return true;
-        }
-
-        bool dequeue(T& output)
-        {
-            buffer_node_t* tail = _tail.load(std::memory_order_relaxed);
-            buffer_node_t* next = tail->next.load(std::memory_order_acquire);
-
-            if (next == NULL)
-            {
-                return false;
-            }
-
-            output = next->data;
-            _tail.store(next, std::memory_order_release);
-            delete tail;
-            return true;
-        }
-
-
-    private:
-
-        struct buffer_node_t
-        {
-            T                           data;
-            std::atomic<buffer_node_t*> next;
-        };
-
-        typedef typename std::aligned_storage<sizeof(buffer_node_t), std::alignment_of<buffer_node_t>::value>::type buffer_node_aligned_t;
-
-        std::atomic<buffer_node_t*> _head;
-        std::atomic<buffer_node_t*> _tail;
-
-        mpsc_queue_t(const mpsc_queue_t&) {}
-        void operator=(const mpsc_queue_t&) {}
-    };
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-spsc-bounded.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-spsc-bounded.hpp
deleted file mode 100644
index 77ac6ad0c5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-spsc-bounded.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-// This is free and unencumbered software released into the public domain.
-
-// Anyone is free to copy, modify, publish, use, compile, sell, or
-// distribute this software, either in source code form or as a compiled
-// binary, for any purpose, commercial or non-commercial, and by any
-// means.
-
-// In jurisdictions that recognize copyright laws, the author or authors
-// of this software dedicate any and all copyright interest in the
-// software to the public domain. We make this dedication for the benefit
-// of the public at large and to the detriment of our heirs and
-// successors. We intend this dedication to be an overt act of
-// relinquishment in perpetuity of all present and future rights to this
-// software under copyright law.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// For more information, please refer to <http://unlicense.org/>
-
-// Note:
-// A combination of the algorithms described by the circular buffers
-// documentation found in the Linux kernel, and the bounded MPMC queue
-// by Dmitry Vyukov[1]. Implemented in pure C++11. Should work across
-// most CPU architectures.
-//
-// [1] http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
-
-#ifndef __SPSC_BOUNDED_QUEUE_INCLUDED__
-#define __SPSC_BOUNDED_QUEUE_INCLUDED__
-
-#include <atomic>
-#include <assert.h>
-
-namespace concqueue
-{
-    template<typename T>
-    class spsc_bounded_queue_t
-    {
-    public:
-
-        spsc_bounded_queue_t(size_t size)
-            : _size(size)
-            , _mask(size - 1)
-            , _buffer(reinterpret_cast<T*>(new aligned_t[_size + 1])) // need one extra element for a guard
-            , _head(0)
-            , _tail(0)
-        {
-            // make sure it's a power of 2
-            assert((_size != 0) && ((_size & (~_size + 1)) == _size));
-        }
-
-        ~spsc_bounded_queue_t()
-        {
-            delete[] _buffer;
-        }
-
-        bool enqueue(T& input)
-        {
-            const size_t head = _head.load(std::memory_order_relaxed);
-
-            if (((_tail.load(std::memory_order_acquire) - (head + 1)) & _mask) >= 1)
-            {
-                _buffer[head & _mask] = input;
-                _head.store(head + 1, std::memory_order_release);
-                return true;
-            }
-            return false;
-        }
-
-        bool dequeue(T& output)
-        {
-            const size_t tail = _tail.load(std::memory_order_relaxed);
-
-            if (((_head.load(std::memory_order_acquire) - tail) & _mask) >= 1)
-            {
-                output = _buffer[_tail & _mask];
-                _tail.store(tail + 1, std::memory_order_release);
-                return true;
-            }
-            return false;
-        }
-
-
-    private:
-
-        typedef typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type aligned_t;
-        typedef char cache_line_pad_t[64];
-
-        cache_line_pad_t    _pad0;
-        const size_t        _size;
-        const size_t        _mask;
-        T* const            _buffer;
-
-        cache_line_pad_t    _pad1;
-        std::atomic<size_t> _head;
-
-        cache_line_pad_t    _pad2;
-        std::atomic<size_t> _tail;
-
-        spsc_bounded_queue_t(const spsc_bounded_queue_t&) {}
-        void operator=(const spsc_bounded_queue_t&) {}
-    };
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-spsc.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-spsc.hpp
deleted file mode 100644
index 880b53f084..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue-spsc.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-// This is free and unencumbered software released into the public domain.
-
-// Anyone is free to copy, modify, publish, use, compile, sell, or
-// distribute this software, either in source code form or as a compiled
-// binary, for any purpose, commercial or non-commercial, and by any
-// means.
-
-// In jurisdictions that recognize copyright laws, the author or authors
-// of this software dedicate any and all copyright interest in the
-// software to the public domain. We make this dedication for the benefit
-// of the public at large and to the detriment of our heirs and
-// successors. We intend this dedication to be an overt act of
-// relinquishment in perpetuity of all present and future rights to this
-// software under copyright law.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// For more information, please refer to <http://unlicense.org/>
-
-
-// non-intrusive lock free unbounded SPSC queue
-// the algorithm was taken from the blog post below, and converted to C++11
-// http://cbloomrants.blogspot.com/2009/02/02-26-09-low-level-threading-part-51.html
-
-#ifndef __SPSC_QUEUE_INCLUDED__
-#define __SPSC_QUEUE_INCLUDED__
-
-#include <atomic>
-
-namespace concqueue
-{
-    template<typename T>
-    class spsc_queue_t
-    {
-    public:
-
-        spsc_queue_t()
-            : _head(reinterpret_cast<node_t*>(new node_aligned_t))
-            , _tail(_head)
-        {
-            _head->next = NULL;
-        }
-
-        ~spsc_queue_t()
-        {
-            T output;
-            while (this->dequeue(output))
-            {
-            }
-            delete _head;
-        }
-
-        bool enqueue(const T& input)
-        {
-            node_t* node = reinterpret_cast<node_t*>(new node_aligned_t);
-            node->data = input;
-            node->next = NULL;
-
-            std::atomic_thread_fence(std::memory_order_acq_rel);
-            _head->next = node;
-            _head = node;
-            return true;
-        }
-
-        bool dequeue(T& output)
-        {
-            std::atomic_thread_fence(std::memory_order_consume);
-            if (!_tail->next)
-            {
-                return false;
-            }
-
-            output = _tail->next->data;
-            std::atomic_thread_fence(std::memory_order_acq_rel);
-            _back = _tail;
-            _tail = _back->next;
-
-            delete _back;
-            return true;
-        }
-
-
-    private:
-
-        struct node_t
-        {
-            node_t* next;
-            T       data;
-        };
-
-        typedef typename std::aligned_storage<sizeof(node_t), std::alignment_of<node_t>::value>::type node_aligned_t;
-
-        node_t* _head;
-        char    _cache_line[64];
-        node_t* _tail;
-        node_t* _back;
-
-        spsc_queue_t(const spsc_queue_t&) {}
-        void operator=(const spsc_queue_t&) {}
-    };
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue.hpp
deleted file mode 100644
index be39e36bd9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/concqueue.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#ifndef __CONC_QUEUE_INCLUDED__
-#define __CONC_QUEUE_INCLUDED__
-
-#include "concqueue-mpmc-bounded.hpp"
-#include "concqueue-mpsc.hpp"
-#include "concqueue-spsc.hpp"
-#include "concqueue-spsc-bounded.hpp"
-
-#define BoundMPMC   concqueue::mpmc_bounded_queue_t
-#define BoundSPSC   concqueue::spsc_bounded_queue_t
-#define UnboundMPSC concqueue::mpsc_queue_t
-#define UnboundSPSC concqueue::spsc_queue_t
-
-template<template <typename> class queue, typename subject>
-class ConcQueue
-    : public queue<subject>
-{
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/d3d11TokenizedProgramFormat.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/d3d11TokenizedProgramFormat.hpp
deleted file mode 100644
index 64c3d9bcde..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/d3d11TokenizedProgramFormat.hpp
+++ /dev/null
@@ -1,2293 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-// ----------------------------------------------------------------------------
-//
-// D3D11 Tokenized Program Format
-//
-// Copyright (c) Microsoft Corporation.
-//
-// ----------------------------------------------------------------------------
-//
-// High Level Goals
-//
-// - Serve as the runtime/DDI representation for all D3D11 tokenized code,
-//   for all classes of programs, including pixel program, vertex program,
-//   geometry program, etc.
-//
-// - Any information that HLSL needs to give to drivers is encoded in
-//   this token format in some form.
-//
-// - Enable common tools and source code for managing all tokenizable
-//   program formats.
-//
-// - Support extensible token definitions, allowing full customizations for
-//   specific program classes, while maintaining general conventions for all
-//   program models.
-//
-// - Binary backwards compatible with D3D10.  Any token name that was originally
-//   defined with "D3D10" in it is unchanged; D3D11 only adds new tokens.
-//
-// ----------------------------------------------------------------------------
-//
-// Low Level Feature Summary
-//
-// - DWORD based tokens always, for simplicity
-// - Opcode token is generally a single DWORD, though there is a bit indicating
-//   if extended information (extra DWORD(s)) are present
-// - Operand tokens are a completely self contained, extensible format,
-//   with scalar and 4-vector data types as first class citizens, but
-//   allowance for extension to n-component vectors.
-// - Initial operand token identifies register type, register file
-//   structure/dimensionality and mode of indexing for each dimension,
-//   and choice of component selection mechanism (i.e. mask vs. swizzle etc).
-// - Optional additional extended operand tokens can defined things like
-//   modifiers (which are not needed by default).
-// - Operand's immediate index value(s), if needed, appear as subsequent DWORD
-//   values, and if relative addressing is specified, an additional completely
-//   self contained operand definition appears nested in the token sequence.
-//
-// ----------------------------------------------------------------------------
-
-
-// ----------------------------------------------------------------------------
-// Version Token (VerTok)
-//
-// [07:00] minor version number (0-255)
-// [15:08] major version number (0-255)
-// [31:16] D3D10_SB_TOKENIZED_PROGRAM_TYPE
-//
-// ----------------------------------------------------------------------------
-
-typedef enum D3D10_SB_TOKENIZED_PROGRAM_TYPE
-{
-    D3D10_SB_PIXEL_SHADER    = 0,
-    D3D10_SB_VERTEX_SHADER   = 1,
-    D3D10_SB_GEOMETRY_SHADER = 2,
-
-    // D3D11 Shaders
-    D3D11_SB_HULL_SHADER                     = 3,
-    D3D11_SB_DOMAIN_SHADER                   = 4,
-    D3D11_SB_COMPUTE_SHADER                  = 5
-} D3D10_SB_TOKENIZED_PROGRAM_TYPE;
-
-#define D3D10_SB_TOKENIZED_PROGRAM_TYPE_MASK  0xffff0000
-#define D3D10_SB_TOKENIZED_PROGRAM_TYPE_SHIFT 16
-
-// DECODER MACRO: Retrieve program type from version token
-#define DECODE_D3D10_SB_TOKENIZED_PROGRAM_TYPE(VerTok) ((D3D10_SB_TOKENIZED_PROGRAM_TYPE)(((VerTok) & D3D10_SB_TOKENIZED_PROGRAM_TYPE_MASK) >> D3D10_SB_TOKENIZED_PROGRAM_TYPE_SHIFT))
-
-#define D3D10_SB_TOKENIZED_PROGRAM_MAJOR_VERSION_MASK  0x000000f0
-#define D3D10_SB_TOKENIZED_PROGRAM_MAJOR_VERSION_SHIFT 4
-#define D3D10_SB_TOKENIZED_PROGRAM_MINOR_VERSION_MASK  0x0000000f
-
-// DECODER MACRO: Retrieve major version # from version token
-#define DECODE_D3D10_SB_TOKENIZED_PROGRAM_MAJOR_VERSION(VerTok) (((VerTok) & D3D10_SB_TOKENIZED_PROGRAM_MAJOR_VERSION_MASK) >> D3D10_SB_TOKENIZED_PROGRAM_MAJOR_VERSION_SHIFT)
-// DECODER MACRO: Retrieve minor version # from version token
-#define DECODE_D3D10_SB_TOKENIZED_PROGRAM_MINOR_VERSION(VerTok) ((VerTok) & D3D10_SB_TOKENIZED_PROGRAM_MINOR_VERSION_MASK)
-
-// ENCODER MACRO: Create complete VerTok
-#define ENCODE_D3D10_SB_TOKENIZED_PROGRAM_VERSION_TOKEN(ProgType, MajorVer, MinorVer) ((((ProgType) << D3D10_SB_TOKENIZED_PROGRAM_TYPE_SHIFT) & D3D10_SB_TOKENIZED_PROGRAM_TYPE_MASK) |                     \
-                                                                                       ((((MajorVer) << D3D10_SB_TOKENIZED_PROGRAM_MAJOR_VERSION_SHIFT) & D3D10_SB_TOKENIZED_PROGRAM_MAJOR_VERSION_MASK)) | \
-                                                                                       ((MinorVer) & D3D10_SB_TOKENIZED_PROGRAM_MINOR_VERSION_MASK))
-
-// ----------------------------------------------------------------------------
-// Length Token (LenTok)
-//
-// Always follows VerTok
-//
-// [31:00] Unsigned integer count of number of
-//              DWORDs in program code, including version
-//              and length tokens.  So the minimum value
-//              is 0x00000002 (if an empty program is ever
-//              valid).
-//
-// ----------------------------------------------------------------------------
-
-// DECODER MACRO: Retrieve program length
-#define DECODE_D3D10_SB_TOKENIZED_PROGRAM_LENGTH(LenTok) (LenTok)
-// ENCODER MACRO: Create complete LenTok
-#define ENCODE_D3D10_SB_TOKENIZED_PROGRAM_LENGTH(Length) (Length)
-#define MAX_D3D10_SB_TOKENIZED_PROGRAM_LENGTH (0xffffffff)
-
-// ----------------------------------------------------------------------------
-// Opcode Format (OpcodeToken0)
-//
-// [10:00] D3D10_SB_OPCODE_TYPE
-// if( [10:00] == D3D10_SB_OPCODE_CUSTOMDATA )
-// {
-//    Token starts a custom-data block.  See "Custom-Data Block Format".
-// }
-// else // standard opcode token
-// {
-//    [23:11] Opcode-Specific Controls
-//    [30:24] Instruction length in DWORDs including the opcode token.
-//    [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//            contains extended opcode token.
-// }
-//
-// ----------------------------------------------------------------------------
-
-typedef enum D3D10_SB_OPCODE_TYPE
-{
-    D3D10_SB_OPCODE_ADD,
-    D3D10_SB_OPCODE_AND,
-    D3D10_SB_OPCODE_BREAK,
-    D3D10_SB_OPCODE_BREAKC,
-    D3D10_SB_OPCODE_CALL,
-    D3D10_SB_OPCODE_CALLC,
-    D3D10_SB_OPCODE_CASE,
-    D3D10_SB_OPCODE_CONTINUE,
-    D3D10_SB_OPCODE_CONTINUEC,
-    D3D10_SB_OPCODE_CUT,
-    D3D10_SB_OPCODE_DEFAULT,
-    D3D10_SB_OPCODE_DERIV_RTX,
-    D3D10_SB_OPCODE_DERIV_RTY,
-    D3D10_SB_OPCODE_DISCARD,
-    D3D10_SB_OPCODE_DIV,
-    D3D10_SB_OPCODE_DP2,
-    D3D10_SB_OPCODE_DP3,
-    D3D10_SB_OPCODE_DP4,
-    D3D10_SB_OPCODE_ELSE,
-    D3D10_SB_OPCODE_EMIT,
-    D3D10_SB_OPCODE_EMITTHENCUT,
-    D3D10_SB_OPCODE_ENDIF,
-    D3D10_SB_OPCODE_ENDLOOP,
-    D3D10_SB_OPCODE_ENDSWITCH,
-    D3D10_SB_OPCODE_EQ,
-    D3D10_SB_OPCODE_EXP,
-    D3D10_SB_OPCODE_FRC,
-    D3D10_SB_OPCODE_FTOI,
-    D3D10_SB_OPCODE_FTOU,
-    D3D10_SB_OPCODE_GE,
-    D3D10_SB_OPCODE_IADD,
-    D3D10_SB_OPCODE_IF,
-    D3D10_SB_OPCODE_IEQ,
-    D3D10_SB_OPCODE_IGE,
-    D3D10_SB_OPCODE_ILT,
-    D3D10_SB_OPCODE_IMAD,
-    D3D10_SB_OPCODE_IMAX,
-    D3D10_SB_OPCODE_IMIN,
-    D3D10_SB_OPCODE_IMUL,
-    D3D10_SB_OPCODE_INE,
-    D3D10_SB_OPCODE_INEG,
-    D3D10_SB_OPCODE_ISHL,
-    D3D10_SB_OPCODE_ISHR,
-    D3D10_SB_OPCODE_ITOF,
-    D3D10_SB_OPCODE_LABEL,
-    D3D10_SB_OPCODE_LD,
-    D3D10_SB_OPCODE_LD_MS,
-    D3D10_SB_OPCODE_LOG,
-    D3D10_SB_OPCODE_LOOP,
-    D3D10_SB_OPCODE_LT,
-    D3D10_SB_OPCODE_MAD,
-    D3D10_SB_OPCODE_MIN,
-    D3D10_SB_OPCODE_MAX,
-    D3D10_SB_OPCODE_CUSTOMDATA,
-    D3D10_SB_OPCODE_MOV,
-    D3D10_SB_OPCODE_MOVC,
-    D3D10_SB_OPCODE_MUL,
-    D3D10_SB_OPCODE_NE,
-    D3D10_SB_OPCODE_NOP,
-    D3D10_SB_OPCODE_NOT,
-    D3D10_SB_OPCODE_OR,
-    D3D10_SB_OPCODE_RESINFO,
-    D3D10_SB_OPCODE_RET,
-    D3D10_SB_OPCODE_RETC,
-    D3D10_SB_OPCODE_ROUND_NE,
-    D3D10_SB_OPCODE_ROUND_NI,
-    D3D10_SB_OPCODE_ROUND_PI,
-    D3D10_SB_OPCODE_ROUND_Z,
-    D3D10_SB_OPCODE_RSQ,
-    D3D10_SB_OPCODE_SAMPLE,
-    D3D10_SB_OPCODE_SAMPLE_C,
-    D3D10_SB_OPCODE_SAMPLE_C_LZ,
-    D3D10_SB_OPCODE_SAMPLE_L,
-    D3D10_SB_OPCODE_SAMPLE_D,
-    D3D10_SB_OPCODE_SAMPLE_B,
-    D3D10_SB_OPCODE_SQRT,
-    D3D10_SB_OPCODE_SWITCH,
-    D3D10_SB_OPCODE_SINCOS,
-    D3D10_SB_OPCODE_UDIV,
-    D3D10_SB_OPCODE_ULT,
-    D3D10_SB_OPCODE_UGE,
-    D3D10_SB_OPCODE_UMUL,
-    D3D10_SB_OPCODE_UMAD,
-    D3D10_SB_OPCODE_UMAX,
-    D3D10_SB_OPCODE_UMIN,
-    D3D10_SB_OPCODE_USHR,
-    D3D10_SB_OPCODE_UTOF,
-    D3D10_SB_OPCODE_XOR,
-    D3D10_SB_OPCODE_DCL_RESOURCE,                      // DCL* opcodes have
-    D3D10_SB_OPCODE_DCL_CONSTANT_BUFFER,               // custom operand formats.
-    D3D10_SB_OPCODE_DCL_SAMPLER,
-    D3D10_SB_OPCODE_DCL_INDEX_RANGE,
-    D3D10_SB_OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY,
-    D3D10_SB_OPCODE_DCL_GS_INPUT_PRIMITIVE,
-    D3D10_SB_OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT,
-    D3D10_SB_OPCODE_DCL_INPUT,
-    D3D10_SB_OPCODE_DCL_INPUT_SGV,
-    D3D10_SB_OPCODE_DCL_INPUT_SIV,
-    D3D10_SB_OPCODE_DCL_INPUT_PS,
-    D3D10_SB_OPCODE_DCL_INPUT_PS_SGV,
-    D3D10_SB_OPCODE_DCL_INPUT_PS_SIV,
-    D3D10_SB_OPCODE_DCL_OUTPUT,
-    D3D10_SB_OPCODE_DCL_OUTPUT_SGV,
-    D3D10_SB_OPCODE_DCL_OUTPUT_SIV,
-    D3D10_SB_OPCODE_DCL_TEMPS,
-    D3D10_SB_OPCODE_DCL_INDEXABLE_TEMP,
-    D3D10_SB_OPCODE_DCL_GLOBAL_FLAGS,
-
-    // -----------------------------------------------
-
-    D3D10_SB_OPCODE_RESERVED0,
-
-    // ---------- DX 10.1 op codes---------------------
-
-    D3D10_1_SB_OPCODE_LOD,
-    D3D10_1_SB_OPCODE_GATHER4,
-    D3D10_1_SB_OPCODE_SAMPLE_POS,
-    D3D10_1_SB_OPCODE_SAMPLE_INFO,
-
-    // -----------------------------------------------
-
-    // This should be 10.1's version of D3D10_SB_NUM_OPCODES
-    D3D10_1_SB_OPCODE_RESERVED1,
-
-    // ---------- DX 11 op codes---------------------
-    D3D11_SB_OPCODE_HS_DECLS,                          // token marks beginning of HS sub-shader
-    D3D11_SB_OPCODE_HS_CONTROL_POINT_PHASE,            // token marks beginning of HS sub-shader
-    D3D11_SB_OPCODE_HS_FORK_PHASE,                     // token marks beginning of HS sub-shader
-    D3D11_SB_OPCODE_HS_JOIN_PHASE,                     // token marks beginning of HS sub-shader
-
-    D3D11_SB_OPCODE_EMIT_STREAM,
-    D3D11_SB_OPCODE_CUT_STREAM,
-    D3D11_SB_OPCODE_EMITTHENCUT_STREAM,
-    D3D11_SB_OPCODE_INTERFACE_CALL,
-
-    D3D11_SB_OPCODE_BUFINFO,
-    D3D11_SB_OPCODE_DERIV_RTX_COARSE,
-    D3D11_SB_OPCODE_DERIV_RTX_FINE,
-    D3D11_SB_OPCODE_DERIV_RTY_COARSE,
-    D3D11_SB_OPCODE_DERIV_RTY_FINE,
-    D3D11_SB_OPCODE_GATHER4_C,
-    D3D11_SB_OPCODE_GATHER4_PO,
-    D3D11_SB_OPCODE_GATHER4_PO_C,
-    D3D11_SB_OPCODE_RCP,
-    D3D11_SB_OPCODE_F32TOF16,
-    D3D11_SB_OPCODE_F16TOF32,
-    D3D11_SB_OPCODE_UADDC,
-    D3D11_SB_OPCODE_USUBB,
-    D3D11_SB_OPCODE_COUNTBITS,
-    D3D11_SB_OPCODE_FIRSTBIT_HI,
-    D3D11_SB_OPCODE_FIRSTBIT_LO,
-    D3D11_SB_OPCODE_FIRSTBIT_SHI,
-    D3D11_SB_OPCODE_UBFE,
-    D3D11_SB_OPCODE_IBFE,
-    D3D11_SB_OPCODE_BFI,
-    D3D11_SB_OPCODE_BFREV,
-    D3D11_SB_OPCODE_SWAPC,
-
-    D3D11_SB_OPCODE_DCL_STREAM,
-    D3D11_SB_OPCODE_DCL_FUNCTION_BODY,
-    D3D11_SB_OPCODE_DCL_FUNCTION_TABLE,
-    D3D11_SB_OPCODE_DCL_INTERFACE,
-
-    D3D11_SB_OPCODE_DCL_INPUT_CONTROL_POINT_COUNT,
-    D3D11_SB_OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT,
-    D3D11_SB_OPCODE_DCL_TESS_DOMAIN,
-    D3D11_SB_OPCODE_DCL_TESS_PARTITIONING,
-    D3D11_SB_OPCODE_DCL_TESS_OUTPUT_PRIMITIVE,
-    D3D11_SB_OPCODE_DCL_HS_MAX_TESSFACTOR,
-    D3D11_SB_OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT,
-    D3D11_SB_OPCODE_DCL_HS_JOIN_PHASE_INSTANCE_COUNT,
-
-    D3D11_SB_OPCODE_DCL_THREAD_GROUP,
-    D3D11_SB_OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED,
-    D3D11_SB_OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW,
-    D3D11_SB_OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED,
-    D3D11_SB_OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW,
-    D3D11_SB_OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED,
-    D3D11_SB_OPCODE_DCL_RESOURCE_RAW,
-    D3D11_SB_OPCODE_DCL_RESOURCE_STRUCTURED,
-    D3D11_SB_OPCODE_LD_UAV_TYPED,
-    D3D11_SB_OPCODE_STORE_UAV_TYPED,
-    D3D11_SB_OPCODE_LD_RAW,
-    D3D11_SB_OPCODE_STORE_RAW,
-    D3D11_SB_OPCODE_LD_STRUCTURED,
-    D3D11_SB_OPCODE_STORE_STRUCTURED,
-    D3D11_SB_OPCODE_ATOMIC_AND,
-    D3D11_SB_OPCODE_ATOMIC_OR,
-    D3D11_SB_OPCODE_ATOMIC_XOR,
-    D3D11_SB_OPCODE_ATOMIC_CMP_STORE,
-    D3D11_SB_OPCODE_ATOMIC_IADD,
-    D3D11_SB_OPCODE_ATOMIC_IMAX,
-    D3D11_SB_OPCODE_ATOMIC_IMIN,
-    D3D11_SB_OPCODE_ATOMIC_UMAX,
-    D3D11_SB_OPCODE_ATOMIC_UMIN,
-    D3D11_SB_OPCODE_IMM_ATOMIC_ALLOC,
-    D3D11_SB_OPCODE_IMM_ATOMIC_CONSUME,
-    D3D11_SB_OPCODE_IMM_ATOMIC_IADD,
-    D3D11_SB_OPCODE_IMM_ATOMIC_AND,
-    D3D11_SB_OPCODE_IMM_ATOMIC_OR,
-    D3D11_SB_OPCODE_IMM_ATOMIC_XOR,
-    D3D11_SB_OPCODE_IMM_ATOMIC_EXCH,
-    D3D11_SB_OPCODE_IMM_ATOMIC_CMP_EXCH,
-    D3D11_SB_OPCODE_IMM_ATOMIC_IMAX,
-    D3D11_SB_OPCODE_IMM_ATOMIC_IMIN,
-    D3D11_SB_OPCODE_IMM_ATOMIC_UMAX,
-    D3D11_SB_OPCODE_IMM_ATOMIC_UMIN,
-    D3D11_SB_OPCODE_SYNC,
-
-    D3D11_SB_OPCODE_DADD,
-    D3D11_SB_OPCODE_DMAX,
-    D3D11_SB_OPCODE_DMIN,
-    D3D11_SB_OPCODE_DMUL,
-    D3D11_SB_OPCODE_DEQ,
-    D3D11_SB_OPCODE_DGE,
-    D3D11_SB_OPCODE_DLT,
-    D3D11_SB_OPCODE_DNE,
-    D3D11_SB_OPCODE_DMOV,
-    D3D11_SB_OPCODE_DMOVC,
-    D3D11_SB_OPCODE_DTOF,
-    D3D11_SB_OPCODE_FTOD,
-
-    D3D11_SB_OPCODE_EVAL_SNAPPED,
-    D3D11_SB_OPCODE_EVAL_SAMPLE_INDEX,
-    D3D11_SB_OPCODE_EVAL_CENTROID,
-
-    D3D11_SB_OPCODE_DCL_GS_INSTANCE_COUNT,
-
-    D3D10_SB_NUM_OPCODES                                     // Should be the last entry
-} D3D10_SB_OPCODE_TYPE;
-
-#define D3D10_SB_OPCODE_TYPE_MASK 0x00007ff
-// DECODER MACRO: Retrieve program opcode
-#define DECODE_D3D10_SB_OPCODE_TYPE(OpcodeToken0) ((D3D10_SB_OPCODE_TYPE)((OpcodeToken0) & D3D10_SB_OPCODE_TYPE_MASK))
-// ENCODER MACRO: Create the opcode-type portion of OpcodeToken0
-#define ENCODE_D3D10_SB_OPCODE_TYPE(OpcodeName) ((OpcodeName) & D3D10_SB_OPCODE_TYPE_MASK)
-
-#define D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH_MASK 0x7f000000
-#define D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH_SHIFT 24
-// DECODER MACRO: Retrieve instruction length
-// in # of DWORDs including the opcode token(s).
-// The range is 1-127.
-#define DECODE_D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH(OpcodeToken0) (((OpcodeToken0) & D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH_MASK) >> D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH_SHIFT)
-
-// ENCODER MACRO: Store instruction length
-// portion of OpcodeToken0, in # of DWORDs
-// including the opcode token(s).
-// Valid range is 1-127.
-#define ENCODE_D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH(Length) (((Length) << D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH_SHIFT) & D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH_MASK)
-#define MAX_D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH 127
-
-#define D3D10_SB_INSTRUCTION_SATURATE_MASK 0x00002000
-// DECODER MACRO: Check OpcodeToken0 to see if an instruction
-// is to saturate the result [0..1]
-// This flag is indicated by one of the bits in the
-// opcode specific control range.
-#define DECODE_IS_D3D10_SB_INSTRUCTION_SATURATE_ENABLED(OpcodeToken0) ((OpcodeToken0) & D3D10_SB_INSTRUCTION_SATURATE_MASK)
-// ENCODER MACRO: Encode in OpcodeToken0 if instruction is to saturate the result.
-#define ENCODE_D3D10_SB_INSTRUCTION_SATURATE(bSat) (((bSat) != 0) ? D3D10_SB_INSTRUCTION_SATURATE_MASK : 0)
-
-// Boolean test for conditional instructions such as if (if_z or if_nz)
-// This is part of the opcode specific control range.
-typedef enum D3D10_SB_INSTRUCTION_TEST_BOOLEAN
-{
-    D3D10_SB_INSTRUCTION_TEST_ZERO       = 0,
-    D3D10_SB_INSTRUCTION_TEST_NONZERO    = 1
-} D3D10_SB_INSTRUCTION_TEST_BOOLEAN;
-#define D3D10_SB_INSTRUCTION_TEST_BOOLEAN_MASK  0x00040000
-#define D3D10_SB_INSTRUCTION_TEST_BOOLEAN_SHIFT 18
-
-// DECODER MACRO: For an OpcodeToken0 for requires either a
-// zero or non-zero test, determine which test was chosen.
-#define DECODE_D3D10_SB_INSTRUCTION_TEST_BOOLEAN(OpcodeToken0) ((D3D10_SB_INSTRUCTION_TEST_BOOLEAN)(((OpcodeToken0) & D3D10_SB_INSTRUCTION_TEST_BOOLEAN_MASK) >> D3D10_SB_INSTRUCTION_TEST_BOOLEAN_SHIFT))
-// ENCODER MACRO: Store "zero" or "nonzero" in the opcode
-// specific control range of OpcodeToken0
-#define ENCODE_D3D10_SB_INSTRUCTION_TEST_BOOLEAN(Boolean) (((Boolean) << D3D10_SB_INSTRUCTION_TEST_BOOLEAN_SHIFT) & D3D10_SB_INSTRUCTION_TEST_BOOLEAN_MASK)
-
-// Precise value mask (bits 19-22)
-// This is part of the opcode specific control range.
-// It's 1 bit per-channel of the output, for instructions with multiple
-// output operands, it applies to that component in each operand. This
-// uses the components defined in D3D10_SB_4_COMPONENT_NAME.
-#define D3D11_SB_INSTRUCTION_PRECISE_VALUES_MASK  0x00780000
-#define D3D11_SB_INSTRUCTION_PRECISE_VALUES_SHIFT 19
-
-// DECODER MACRO: this macro extracts from OpcodeToken0 the 4 component
-// (xyzw) mask, as a field of D3D10_SB_4_COMPONENT_[X|Y|Z|W] flags.
-#define DECODE_D3D11_SB_INSTRUCTION_PRECISE_VALUES(OpcodeToken0) ((((OpcodeToken0) & D3D11_SB_INSTRUCTION_PRECISE_VALUES_MASK) >> D3D11_SB_INSTRUCTION_PRECISE_VALUES_SHIFT))
-// ENCODER MACRO: Given a set of
-// D3D10_SB_OPERAND_4_COMPONENT_[X|Y|Z|W] values
-// or'd together, encode them in OpcodeToken0.
-#define ENCODE_D3D11_SB_INSTRUCTION_PRECISE_VALUES(ComponentMask) (((ComponentMask) << D3D11_SB_INSTRUCTION_PRECISE_VALUES_SHIFT) & D3D11_SB_INSTRUCTION_PRECISE_VALUES_MASK)
-
-// resinfo instruction return type
-typedef enum D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE
-{
-    D3D10_SB_RESINFO_INSTRUCTION_RETURN_FLOAT      = 0,
-    D3D10_SB_RESINFO_INSTRUCTION_RETURN_RCPFLOAT   = 1,
-    D3D10_SB_RESINFO_INSTRUCTION_RETURN_UINT       = 2
-} D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE;
-
-#define D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE_MASK  0x00001800
-#define D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE_SHIFT 11
-
-// DECODER MACRO: For an OpcodeToken0 for the resinfo instruction,
-// determine the return type.
-#define DECODE_D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE(OpcodeToken0) ((D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE)(((OpcodeToken0) & D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE_MASK) >> D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE_SHIFT))
-// ENCODER MACRO: Encode the return type for the resinfo instruction
-// in the opcode specific control range of OpcodeToken0
-#define ENCODE_D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE(ReturnType) (((ReturnType) << D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE_SHIFT) & D3D10_SB_RESINFO_INSTRUCTION_RETURN_TYPE_MASK)
-
-// sync instruction flags
-#define D3D11_SB_SYNC_THREADS_IN_GROUP              0x00000800
-#define D3D11_SB_SYNC_THREAD_GROUP_SHARED_MEMORY    0x00001000
-#define D3D11_SB_SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GROUP  0x00002000
-#define D3D11_SB_SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GLOBAL  0x00004000
-#define D3D11_SB_SYNC_FLAGS_MASK                    0x00007800
-
-// DECODER MACRO: Retrieve flags for sync instruction from OpcodeToken0.
-#define DECODE_D3D11_SB_SYNC_FLAGS(OperandToken0) ((OperandToken0) & D3D11_SB_SYNC_FLAGS_MASK)
-
-// ENCODER MACRO: Given a set of sync instruciton flags, encode them in OpcodeToken0.
-#define ENCODE_D3D11_SB_SYNC_FLAGS(Flags) ((Flags) & D3D11_SB_SYNC_FLAGS_MASK)
-
-#define D3D10_SB_OPCODE_EXTENDED_MASK 0x80000000
-#define D3D10_SB_OPCODE_EXTENDED_SHIFT 31
-// DECODER MACRO: Determine if the opcode is extended
-// by an additional opcode token.  Currently there are no
-// extended opcodes.
-#define DECODE_IS_D3D10_SB_OPCODE_EXTENDED(OpcodeToken0) (((OpcodeToken0) & D3D10_SB_OPCODE_EXTENDED_MASK) >> D3D10_SB_OPCODE_EXTENDED_SHIFT)
-// ENCODER MACRO: Store in OpcodeToken0 whether the opcode is extended
-// by an additional opcode token.
-#define ENCODE_D3D10_SB_OPCODE_EXTENDED(bExtended) (((bExtended) != 0) ? D3D10_SB_OPCODE_EXTENDED_MASK : 0)
-
-// ----------------------------------------------------------------------------
-// Extended Opcode Format (OpcodeToken1)
-//
-// If bit31 of an opcode token is set, the
-// opcode has an additional extended opcode token DWORD
-// directly following OpcodeToken0.  Other tokens
-// expected for the opcode, such as the operand
-// token(s) always follow
-// OpcodeToken0 AND OpcodeToken1..n (extended
-// opcode tokens, if present).
-//
-// [05:00] D3D10_SB_EXTENDED_OPCODE_TYPE
-// [30:06] if([05:00] == D3D10_SB_EXTENDED_OPCODE_SAMPLE_CONTROLS)
-//         {
-//              This custom opcode contains controls for SAMPLE.
-//              [08:06] Ignored, 0.
-//              [12:09] U texel immediate offset (4 bit 2's comp) (0 default)
-//              [16:13] V texel immediate offset (4 bit 2's comp) (0 default)
-//              [20:17] W texel immediate offset (4 bit 2's comp) (0 default)
-//              [30:14] Ignored, 0.
-//         }
-//         else if( [05:00] == D3D11_SB_EXTENDED_OPCODE_RESOURCE_DIM )
-//         {
-//              [10:06] D3D10_SB_RESOURCE_DIMENSION
-//              [30:11] Ignored, 0.
-//         }
-//         else if( [05:00] == D3D11_SB_EXTENDED_OPCODE_RESOURCE_RETURN_TYPE )
-//         {
-//              [09:06] D3D10_SB_RESOURCE_RETURN_TYPE for component X
-//              [13:10] D3D10_SB_RESOURCE_RETURN_TYPE for component Y
-//              [17:14] D3D10_SB_RESOURCE_RETURN_TYPE for component Z
-//              [21:18] D3D10_SB_RESOURCE_RETURN_TYPE for component W
-//              [30:22] Ignored, 0.
-//         }
-//         else
-//         {
-//              [30:04] Ignored, 0.
-//         }
-// [31]    0 normally. 1 there is another extended opcode.  Any number
-//         of extended opcode tokens can be chained.  It is possible that some extended
-//         opcode tokens could include multiple DWORDS - that is defined
-//         on a case by case basis.
-//
-// ----------------------------------------------------------------------------
-typedef enum D3D10_SB_EXTENDED_OPCODE_TYPE
-{
-    D3D10_SB_EXTENDED_OPCODE_EMPTY           = 0,
-    D3D10_SB_EXTENDED_OPCODE_SAMPLE_CONTROLS = 1,
-    D3D11_SB_EXTENDED_OPCODE_RESOURCE_DIM = 2,
-    D3D11_SB_EXTENDED_OPCODE_RESOURCE_RETURN_TYPE = 3,
-} D3D10_SB_EXTENDED_OPCODE_TYPE;
-#define D3D11_SB_MAX_SIMULTANEOUS_EXTENDED_OPCODES 3
-
-#define D3D10_SB_EXTENDED_OPCODE_TYPE_MASK 0x0000003f
-
-// DECODER MACRO: Given an extended opcode
-// token (OpcodeToken1), figure out what type
-// of token it is (from D3D10_SB_EXTENDED_OPCODE_TYPE enum)
-// to be able to interpret the rest of the token's contents.
-#define DECODE_D3D10_SB_EXTENDED_OPCODE_TYPE(OpcodeToken1) ((D3D10_SB_EXTENDED_OPCODE_TYPE)((OpcodeToken1) & D3D10_SB_EXTENDED_OPCODE_TYPE_MASK))
-
-// ENCODER MACRO: Store extended opcode token
-// type in OpcodeToken1.
-#define ENCODE_D3D10_SB_EXTENDED_OPCODE_TYPE(ExtOpcodeType) ((ExtOpcodeType) & D3D10_SB_EXTENDED_OPCODE_TYPE_MASK)
-
-typedef enum D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_COORD
-{
-    D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_U        = 0,
-    D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_V        = 1,
-    D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_W        = 2,
-} D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_COORD;
-#define D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_COORD_MASK (3)
-#define D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord) (9 + 4 * ((Coord) & D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_COORD_MASK))
-#define D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_MASK(Coord) (0x0000000f << D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord))
-
-// DECODER MACRO: Given an extended opcode token
-// (OpcodeToken1), and extended token type ==
-// D3D10_SB_EXTENDED_OPCODE_SAMPLE_CONTROLS, determine the immediate
-// texel address offset for u/v/w (D3D10_SB_ADDRESS_OFFSET_COORD)
-// This macro returns a (signed) integer, by sign extending the
-// decoded 4 bit 2's complement immediate value.
-#define DECODE_IMMEDIATE_D3D10_SB_ADDRESS_OFFSET(Coord, OpcodeToken1) ((((OpcodeToken1) & D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_MASK(Coord)) >> (D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord))))
-
-// ENCODER MACRO: Store the immediate texel address offset
-// for U or V or W Coord (D3D10_SB_ADDRESS_OFFSET_COORD) in an extended
-// opcode token (OpcodeToken1) that has extended opcode
-// type == D3D10_SB_EXTENDED_OPCODE_SAMPLE_CONTROLS (opcode type encoded separately)
-// A 2's complement number is expected as input, from which the LSB 4 bits are extracted.
-#define ENCODE_IMMEDIATE_D3D10_SB_ADDRESS_OFFSET(Coord, ImmediateOffset) (((ImmediateOffset) << D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord)) & D3D10_SB_IMMEDIATE_ADDRESS_OFFSET_MASK(Coord))
-
-#define D3D11_SB_EXTENDED_RESOURCE_DIMENSION_MASK  0x000007C0
-#define D3D11_SB_EXTENDED_RESOURCE_DIMENSION_SHIFT 6
-
-// DECODER MACRO: Given an extended resource declaration token,
-// (D3D11_SB_EXTENDED_OPCODE_RESOURCE_DIM), determine the resource dimension
-// (D3D10_SB_RESOURCE_DIMENSION enum)
-#define DECODE_D3D11_SB_EXTENDED_RESOURCE_DIMENSION(OpcodeTokenN) ((D3D10_SB_RESOURCE_DIMENSION)(((OpcodeTokenN) & D3D11_SB_EXTENDED_RESOURCE_DIMENSION_MASK) >> D3D11_SB_EXTENDED_RESOURCE_DIMENSION_SHIFT))
-
-// ENCODER MACRO: Store resource dimension
-// (D3D10_SB_RESOURCE_DIMENSION enum) into a
-// an extended resource declaration token (D3D11_SB_EXTENDED_OPCODE_RESOURCE_DIM)
-#define ENCODE_D3D11_SB_EXTENDED_RESOURCE_DIMENSION(ResourceDim) (((ResourceDim) << D3D11_SB_EXTENDED_RESOURCE_DIMENSION_SHIFT) & D3D11_SB_EXTENDED_RESOURCE_DIMENSION_MASK)
-
-#define D3D10_SB_RESOURCE_RETURN_TYPE_MASK    0x0000000f
-#define D3D10_SB_RESOURCE_RETURN_TYPE_NUMBITS 0x00000004
-#define D3D11_SB_EXTENDED_RESOURCE_RETURN_TYPE_SHIFT 6
-
-// DECODER MACRO: Get the resource return type for component (0-3) from
-// an extended resource declaration token (D3D11_SB_EXTENDED_OPCODE_RESOURCE_RETURN_TYPE)
-#define DECODE_D3D11_SB_EXTENDED_RESOURCE_RETURN_TYPE(OpcodeTokenN, Component) \
-    ((D3D10_SB_RESOURCE_RETURN_TYPE)(((OpcodeTokenN) >>                        \
-                                      (Component * D3D10_SB_RESOURCE_RETURN_TYPE_NUMBITS + D3D11_SB_EXTENDED_RESOURCE_RETURN_TYPE_SHIFT)) & D3D10_SB_RESOURCE_RETURN_TYPE_MASK))
-
-// ENCODER MACRO: Generate a resource return type for a component in an extended
-// resource delcaration token (D3D11_SB_EXTENDED_OPCODE_RESOURCE_RETURN_TYPE)
-#define ENCODE_D3D11_SB_EXTENDED_RESOURCE_RETURN_TYPE(ReturnType, Component) \
-    (((ReturnType) & D3D10_SB_RESOURCE_RETURN_TYPE_MASK) << (Component * D3D10_SB_RESOURCE_RETURN_TYPE_NUMBITS + D3D11_SB_EXTENDED_RESOURCE_RETURN_TYPE_SHIFT))
-
-// ----------------------------------------------------------------------------
-// Custom-Data Block Format
-//
-// DWORD 0 (CustomDataDescTok):
-// [10:00] == D3D10_SB_OPCODE_CUSTOMDATA
-// [31:11] == D3D10_SB_CUSTOMDATA_CLASS
-//
-// DWORD 1:
-//          32-bit unsigned integer count of number
-//          of DWORDs in custom-data block,
-//          including DWORD 0 and DWORD 1.
-//          So the minimum value is 0x00000002,
-//          meaning empty custom-data.
-//
-// Layout of custom-data contents, for the various meta-data classes,
-// not defined in this file.
-//
-// ----------------------------------------------------------------------------
-
-typedef enum D3D10_SB_CUSTOMDATA_CLASS
-{
-    D3D10_SB_CUSTOMDATA_COMMENT = 0,
-    D3D10_SB_CUSTOMDATA_DEBUGINFO,
-    D3D10_SB_CUSTOMDATA_OPAQUE,
-    D3D10_SB_CUSTOMDATA_DCL_IMMEDIATE_CONSTANT_BUFFER,
-} D3D10_SB_CUSTOMDATA_CLASS;
-
-#define D3D10_SB_CUSTOMDATA_CLASS_MASK 0xfffff800
-#define D3D10_SB_CUSTOMDATA_CLASS_SHIFT 11
-// DECODER MACRO: Find out what class of custom-data is present.
-// The contents of the custom-data block are defined
-// for each class of custom-data.
-#define DECODE_D3D10_SB_CUSTOMDATA_CLASS(CustomDataDescTok) ((D3D10_SB_CUSTOMDATA_CLASS)(((CustomDataDescTok) & D3D10_SB_CUSTOMDATA_CLASS_MASK) >> D3D10_SB_CUSTOMDATA_CLASS_SHIFT))
-// ENCODER MACRO: Create complete CustomDataDescTok
-#define ENCODE_D3D10_SB_CUSTOMDATA_CLASS(CustomDataClass) (ENCODE_D3D10_SB_OPCODE_TYPE(D3D10_SB_OPCODE_CUSTOMDATA) | (((CustomDataClass) << D3D10_SB_CUSTOMDATA_CLASS_SHIFT) & D3D10_SB_CUSTOMDATA_CLASS_MASK))
-
-// ----------------------------------------------------------------------------
-// Instruction Operand Format (OperandToken0)
-//
-// [01:00] D3D10_SB_OPERAND_NUM_COMPONENTS
-// [11:02] Component Selection
-//         if([01:00] == D3D10_SB_OPERAND_0_COMPONENT)
-//              [11:02] = Ignored, 0
-//         else if([01:00] == D3D10_SB_OPERAND_1_COMPONENT
-//              [11:02] = Ignored, 0
-//         else if([01:00] == D3D10_SB_OPERAND_4_COMPONENT
-//         {
-//              [03:02] = D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE
-//              if([03:02] == D3D10_SB_OPERAND_4_COMPONENT_MASK_MODE)
-//              {
-//                  [07:04] = D3D10_SB_OPERAND_4_COMPONENT_MASK
-//                  [11:08] = Ignored, 0
-//              }
-//              else if([03:02] == D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_MODE)
-//              {
-//                  [11:04] = D3D10_SB_4_COMPONENT_SWIZZLE
-//              }
-//              else if([03:02] == D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MODE)
-//              {
-//                  [05:04] = D3D10_SB_4_COMPONENT_NAME
-//                  [11:06] = Ignored, 0
-//              }
-//         }
-//         else if([01:00] == D3D10_SB_OPERAND_N_COMPONENT)
-//         {
-//              Currently not defined.
-//         }
-// [19:12] D3D10_SB_OPERAND_TYPE
-// [21:20] D3D10_SB_OPERAND_INDEX_DIMENSION:
-//            Number of dimensions in the register
-//            file (NOT the # of dimensions in the
-//            individual register or memory
-//            resource being referenced).
-// [24:22] if( [21:20] >= D3D10_SB_OPERAND_INDEX_1D )
-//             D3D10_SB_OPERAND_INDEX_REPRESENTATION for first operand index
-//         else
-//             Ignored, 0
-// [27:25] if( [21:20] >= D3D10_SB_OPERAND_INDEX_2D )
-//             D3D10_SB_OPERAND_INDEX_REPRESENTATION for second operand index
-//         else
-//             Ignored, 0
-// [30:28] if( [21:20] == D3D10_SB_OPERAND_INDEX_3D )
-//             D3D10_SB_OPERAND_INDEX_REPRESENTATION for third operand index
-//         else
-//             Ignored, 0
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.
-//
-// ----------------------------------------------------------------------------
-
-// Number of components in data vector referred to by operand.
-typedef enum D3D10_SB_OPERAND_NUM_COMPONENTS
-{
-    D3D10_SB_OPERAND_0_COMPONENT = 0,
-    D3D10_SB_OPERAND_1_COMPONENT = 1,
-    D3D10_SB_OPERAND_4_COMPONENT = 2,
-    D3D10_SB_OPERAND_N_COMPONENT = 3 // unused for now
-} D3D10_SB_OPERAND_NUM_COMPONENTS;
-#define D3D10_SB_OPERAND_NUM_COMPONENTS_MASK 0x00000003
-
-// DECODER MACRO: Extract from OperandToken0 how many components
-// the data vector referred to by the operand contains.
-// (D3D10_SB_OPERAND_NUM_COMPONENTS enum)
-#define DECODE_D3D10_SB_OPERAND_NUM_COMPONENTS(OperandToken0) ((D3D10_SB_OPERAND_NUM_COMPONENTS)((OperandToken0) & D3D10_SB_OPERAND_NUM_COMPONENTS_MASK))
-
-// ENCODER MACRO: Define in OperandToken0 how many components
-// the data vector referred to by the operand contains.
-// (D3D10_SB_OPERAND_NUM_COMPONENTS enum).
-#define ENCODE_D3D10_SB_OPERAND_NUM_COMPONENTS(NumComp) ((NumComp) & D3D10_SB_OPERAND_NUM_COMPONENTS_MASK)
-
-typedef enum D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE
-{
-    D3D10_SB_OPERAND_4_COMPONENT_MASK_MODE    = 0,  // mask 4 components
-    D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_MODE = 1,  // swizzle 4 components
-    D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MODE = 2, // select 1 of 4 components
-} D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE;
-
-#define D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE_MASK  0x0000000c
-#define D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE_SHIFT 2
-
-// DECODER MACRO: For an operand representing 4component data,
-// extract from OperandToken0 the method for selecting data from
-// the 4 components (D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE).
-#define DECODE_D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE(OperandToken0) ((D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE)(((OperandToken0) & D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE_MASK) >> D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE_SHIFT))
-
-// ENCODER MACRO: For an operand representing 4component data,
-// encode in OperandToken0 a value from D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE
-#define ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE(SelectionMode) (((SelectionMode) << D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE_SHIFT) & D3D10_SB_OPERAND_4_COMPONENT_SELECTION_MODE_MASK)
-
-typedef enum D3D10_SB_4_COMPONENT_NAME
-{
-    D3D10_SB_4_COMPONENT_X = 0,
-    D3D10_SB_4_COMPONENT_Y = 1,
-    D3D10_SB_4_COMPONENT_Z = 2,
-    D3D10_SB_4_COMPONENT_W = 3,
-    D3D10_SB_4_COMPONENT_R = 0,
-    D3D10_SB_4_COMPONENT_G = 1,
-    D3D10_SB_4_COMPONENT_B = 2,
-    D3D10_SB_4_COMPONENT_A = 3
-} D3D10_SB_4_COMPONENT_NAME;
-#define D3D10_SB_4_COMPONENT_NAME_MASK 3
-
-// MACROS FOR USE IN D3D10_SB_OPERAND_4_COMPONENT_MASK_MODE:
-
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_MASK   0x000000f0
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_SHIFT  4
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_X      0x00000010
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_Y      0x00000020
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_Z      0x00000040
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_W      0x00000080
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_R      D3D10_SB_OPERAND_4_COMPONENT_MASK_X
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_G      D3D10_SB_OPERAND_4_COMPONENT_MASK_Y
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_B      D3D10_SB_OPERAND_4_COMPONENT_MASK_Z
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_A      D3D10_SB_OPERAND_4_COMPONENT_MASK_W
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK_ALL    D3D10_SB_OPERAND_4_COMPONENT_MASK_MASK
-
-// DECODER MACRO: When 4 component selection mode is
-// D3D10_SB_OPERAND_4_COMPONENT_MASK_MODE, this macro
-// extracts from OperandToken0 the 4 component (xyzw) mask,
-// as a field of D3D10_SB_OPERAND_4_COMPONENT_MASK_[X|Y|Z|W] flags.
-// Alternatively, the D3D10_SB_OPERAND_4_COMPONENT_MASK_[X|Y|Z|W] masks
-// can be tested on OperandToken0 directly, without this macro.
-#define DECODE_D3D10_SB_OPERAND_4_COMPONENT_MASK(OperandToken0) ((OperandToken0) & D3D10_SB_OPERAND_4_COMPONENT_MASK_MASK)
-
-// ENCODER MACRO: Given a set of
-// D3D10_SB_OPERAND_4_COMPONENT_MASK_[X|Y|Z|W] values
-// or'd together, encode them in OperandToken0.
-#define ENCODE_D3D10_SB_OPERAND_4_COMPONENT_MASK(ComponentMask) ((ComponentMask) & D3D10_SB_OPERAND_4_COMPONENT_MASK_MASK)
-
-// ENCODER/DECODER MACRO: Given a D3D10_SB_4_COMPONENT_NAME,
-// generate the 4-component mask for it.
-// This can be used in loops that build masks or read masks.
-// Alternatively, the D3D10_SB_OPERAND_4_COMPONENT_MASK_[X|Y|Z|W] masks
-// can be used directly, without this macro.
-#define D3D10_SB_OPERAND_4_COMPONENT_MASK(ComponentName) ((1 << (D3D10_SB_OPERAND_4_COMPONENT_MASK_SHIFT + ComponentName)) & D3D10_SB_OPERAND_4_COMPONENT_MASK_MASK)
-
-// MACROS FOR USE IN D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_MODE:
-
-#define D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_MASK 0x00000ff0
-#define D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_SHIFT 4
-
-// DECODER MACRO: When 4 component selection mode is
-// D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_MODE, this macro
-// extracts from OperandToken0 the 4 component swizzle,
-// as a field of D3D10_SB_OPERAND_4_COMPONENT_MASK_[X|Y|Z|W] flags.
-#define DECODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE(OperandToken0) ((OperandToken0) & D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_MASK)
-
-// DECODER MACRO: Pass a D3D10_SB_4_COMPONENT_NAME as "DestComp" in following
-// macro to extract, from OperandToken0 or from a decoded swizzle,
-// the swizzle source component (D3D10_SB_4_COMPONENT_NAME enum):
-#define DECODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_SOURCE(OperandToken0, DestComp) ((D3D10_SB_4_COMPONENT_NAME)(((OperandToken0) >> (D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_SHIFT + 2 * ((DestComp) & D3D10_SB_4_COMPONENT_NAME_MASK))) & D3D10_SB_4_COMPONENT_NAME_MASK))
-
-// ENCODER MACRO: Generate a 4 component swizzle given
-// 4 D3D10_SB_4_COMPONENT_NAME source values for dest
-// components x, y, z, w respectively.
-#define ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE(XSrc, YSrc, ZSrc, WSrc) ((((XSrc) & D3D10_SB_4_COMPONENT_NAME_MASK) |        \
-                                                                              (((YSrc) & D3D10_SB_4_COMPONENT_NAME_MASK) << 2) | \
-                                                                              (((ZSrc) & D3D10_SB_4_COMPONENT_NAME_MASK) << 4) | \
-                                                                              (((WSrc) & D3D10_SB_4_COMPONENT_NAME_MASK) << 6)   \
-                                                                              ) << D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE_SHIFT)
-
-// ENCODER/DECODER MACROS: Various common swizzle patterns
-// (noswizzle and replicate of each channels)
-#define D3D10_SB_OPERAND_4_COMPONENT_NOSWIZZLE   ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE(D3D10_SB_4_COMPONENT_X, \
-    D3D10_SB_4_COMPONENT_Y,                                                                                          \
-    D3D10_SB_4_COMPONENT_Z,                                                                                          \
-    D3D10_SB_4_COMPONENT_W)
-
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATEX  ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE(D3D10_SB_4_COMPONENT_X, \
-    D3D10_SB_4_COMPONENT_X,                                                                                          \
-    D3D10_SB_4_COMPONENT_X,                                                                                          \
-    D3D10_SB_4_COMPONENT_X)
-
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATEY  ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE(D3D10_SB_4_COMPONENT_Y, \
-    D3D10_SB_4_COMPONENT_Y,                                                                                          \
-    D3D10_SB_4_COMPONENT_Y,                                                                                          \
-    D3D10_SB_4_COMPONENT_Y)
-
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATEZ  ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE(D3D10_SB_4_COMPONENT_Z, \
-    D3D10_SB_4_COMPONENT_Z,                                                                                          \
-    D3D10_SB_4_COMPONENT_Z,                                                                                          \
-    D3D10_SB_4_COMPONENT_Z)
-
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATEW  ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SWIZZLE(D3D10_SB_4_COMPONENT_W, \
-    D3D10_SB_4_COMPONENT_W,                                                                                          \
-    D3D10_SB_4_COMPONENT_W,                                                                                          \
-    D3D10_SB_4_COMPONENT_W)
-
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATERED    D3D10_SB_OPERAND_4_COMPONENT_REPLICATEX
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATEGREEN  D3D10_SB_OPERAND_4_COMPONENT_REPLICATEY
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATEBLUE   D3D10_SB_OPERAND_4_COMPONENT_REPLICATEZ
-#define D3D10_SB_OPERAND_4_COMPONENT_REPLICATEALPHA  D3D10_SB_OPERAND_4_COMPONENT_REPLICATEW
-
-// MACROS FOR USE IN D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MODE:
-#define D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MASK   0x00000030
-#define D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_SHIFT  4
-
-// DECODER MACRO: When 4 component selection mode is
-// D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MODE, this macro
-// extracts from OperandToken0 a D3D10_SB_4_COMPONENT_NAME
-// which picks one of the 4 components.
-#define DECODE_D3D10_SB_OPERAND_4_COMPONENT_SELECT_1(OperandToken0) ((D3D10_SB_4_COMPONENT_NAME)(((OperandToken0) & D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MASK) >> D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_SHIFT))
-
-// ENCODER MACRO: Given a D3D10_SB_4_COMPONENT_NAME selecting
-// a single component for D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MODE,
-// encode it into OperandToken0
-#define ENCODE_D3D10_SB_OPERAND_4_COMPONENT_SELECT_1(SelectedComp) (((SelectedComp) << D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_SHIFT) & D3D10_SB_OPERAND_4_COMPONENT_SELECT_1_MASK)
-
-// MACROS FOR DETERMINING OPERAND TYPE:
-
-typedef enum D3D10_SB_OPERAND_TYPE
-{
-    D3D10_SB_OPERAND_TYPE_TEMP           = 0,  // Temporary Register File
-    D3D10_SB_OPERAND_TYPE_INPUT          = 1,  // General Input Register File
-    D3D10_SB_OPERAND_TYPE_OUTPUT         = 2,  // General Output Register File
-    D3D10_SB_OPERAND_TYPE_INDEXABLE_TEMP = 3,  // Temporary Register File (indexable)
-    D3D10_SB_OPERAND_TYPE_IMMEDIATE32    = 4,  // 32bit/component immediate value(s)
-    // If for example, operand token bits
-    // [01:00]==D3D10_SB_OPERAND_4_COMPONENT,
-    // this means that the operand type:
-    // D3D10_SB_OPERAND_TYPE_IMMEDIATE32
-    // results in 4 additional 32bit
-    // DWORDS present for the operand.
-    D3D10_SB_OPERAND_TYPE_IMMEDIATE64    = 5,  // 64bit/comp.imm.val(s)HI:LO
-    D3D10_SB_OPERAND_TYPE_SAMPLER        = 6,  // Reference to sampler state
-    D3D10_SB_OPERAND_TYPE_RESOURCE       = 7,  // Reference to memory resource (e.g. texture)
-    D3D10_SB_OPERAND_TYPE_CONSTANT_BUFFER = 8,  // Reference to constant buffer
-    D3D10_SB_OPERAND_TYPE_IMMEDIATE_CONSTANT_BUFFER = 9,  // Reference to immediate constant buffer
-    D3D10_SB_OPERAND_TYPE_LABEL          = 10, // Label
-    D3D10_SB_OPERAND_TYPE_INPUT_PRIMITIVEID = 11, // Input primitive ID
-    D3D10_SB_OPERAND_TYPE_OUTPUT_DEPTH   = 12, // Output Depth
-    D3D10_SB_OPERAND_TYPE_NULL           = 13, // Null register, used to discard results of operations
-                                               // Below Are operands new in DX 10.1
-    D3D10_SB_OPERAND_TYPE_RASTERIZER     = 14, // DX10.1 Rasterizer register, used to denote the depth/stencil and render target resources
-    D3D10_SB_OPERAND_TYPE_OUTPUT_COVERAGE_MASK = 15, // DX10.1 PS output MSAA coverage mask (scalar)
-    // Below Are operands new in DX 11
-    D3D11_SB_OPERAND_TYPE_STREAM         = 16, // Reference to GS stream output resource
-    D3D11_SB_OPERAND_TYPE_FUNCTION_BODY  = 17, // Reference to a function definition
-    D3D11_SB_OPERAND_TYPE_FUNCTION_TABLE = 18, // Reference to a set of functions used by a class
-    D3D11_SB_OPERAND_TYPE_INTERFACE      = 19, // Reference to an interface
-    D3D11_SB_OPERAND_TYPE_FUNCTION_INPUT = 20, // Reference to an input parameter to a function
-    D3D11_SB_OPERAND_TYPE_FUNCTION_OUTPUT = 21, // Reference to an output parameter to a function
-    D3D11_SB_OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID = 22, // HS Control Point phase input saying which output control point ID this is
-    D3D11_SB_OPERAND_TYPE_INPUT_FORK_INSTANCE_ID = 23, // HS Fork Phase input instance ID
-    D3D11_SB_OPERAND_TYPE_INPUT_JOIN_INSTANCE_ID = 24, // HS Join Phase input instance ID
-    D3D11_SB_OPERAND_TYPE_INPUT_CONTROL_POINT = 25, // HS Fork+Join, DS phase input control points (array of them)
-    D3D11_SB_OPERAND_TYPE_OUTPUT_CONTROL_POINT = 26, // HS Fork+Join phase output control points (array of them)
-    D3D11_SB_OPERAND_TYPE_INPUT_PATCH_CONSTANT = 27, // DS+HSJoin Input Patch Constants (array of them)
-    D3D11_SB_OPERAND_TYPE_INPUT_DOMAIN_POINT = 28, // DS Input Domain point
-    D3D11_SB_OPERAND_TYPE_THIS_POINTER       = 29, // Reference to an interface this pointer
-    D3D11_SB_OPERAND_TYPE_UNORDERED_ACCESS_VIEW = 30, // Reference to UAV u#
-    D3D11_SB_OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY = 31, // Reference to Thread Group Shared Memory g#
-    D3D11_SB_OPERAND_TYPE_INPUT_THREAD_ID = 32, // Compute Shader Thread ID
-    D3D11_SB_OPERAND_TYPE_INPUT_THREAD_GROUP_ID = 33, // Compute Shader Thread Group ID
-    D3D11_SB_OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP = 34, // Compute Shader Thread ID In Thread Group
-    D3D11_SB_OPERAND_TYPE_INPUT_COVERAGE_MASK = 35, // Pixel shader coverage mask input
-    D3D11_SB_OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED = 36, // Compute Shader Thread ID In Group Flattened to a 1D value.
-    D3D11_SB_OPERAND_TYPE_INPUT_GS_INSTANCE_ID = 37, // Input GS instance ID
-    D3D11_SB_OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL = 38, // Output Depth, forced to be greater than or equal than current depth
-    D3D11_SB_OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL    = 39, // Output Depth, forced to be less than or equal to current depth
-    D3D11_SB_OPERAND_TYPE_CYCLE_COUNTER = 40, // Cycle counter
-} D3D10_SB_OPERAND_TYPE;
-
-#define D3D10_SB_OPERAND_TYPE_MASK   0x000ff000
-#define D3D10_SB_OPERAND_TYPE_SHIFT  12
-
-// DECODER MACRO: Determine operand type from OperandToken0.
-#define DECODE_D3D10_SB_OPERAND_TYPE(OperandToken0) ((D3D10_SB_OPERAND_TYPE)(((OperandToken0) & D3D10_SB_OPERAND_TYPE_MASK) >> D3D10_SB_OPERAND_TYPE_SHIFT))
-
-// ENCODER MACRO: Store operand type in OperandToken0.
-#define ENCODE_D3D10_SB_OPERAND_TYPE(OperandType) (((OperandType) << D3D10_SB_OPERAND_TYPE_SHIFT) & D3D10_SB_OPERAND_TYPE_MASK)
-
-typedef enum D3D10_SB_OPERAND_INDEX_DIMENSION
-{
-    D3D10_SB_OPERAND_INDEX_0D = 0, // e.g. Position
-    D3D10_SB_OPERAND_INDEX_1D = 1, // Most common.  e.g. Temp registers.
-    D3D10_SB_OPERAND_INDEX_2D = 2, // e.g. Geometry Program Input registers.
-    D3D10_SB_OPERAND_INDEX_3D = 3, // 3D rarely if ever used.
-} D3D10_SB_OPERAND_INDEX_DIMENSION;
-#define D3D10_SB_OPERAND_INDEX_DIMENSION_MASK  0x00300000
-#define D3D10_SB_OPERAND_INDEX_DIMENSION_SHIFT 20
-
-// DECODER MACRO: Determine operand index dimension from OperandToken0.
-#define DECODE_D3D10_SB_OPERAND_INDEX_DIMENSION(OperandToken0) ((D3D10_SB_OPERAND_INDEX_DIMENSION)(((OperandToken0) & D3D10_SB_OPERAND_INDEX_DIMENSION_MASK) >> D3D10_SB_OPERAND_INDEX_DIMENSION_SHIFT))
-
-// ENCODER MACRO: Store operand index dimension
-// (D3D10_SB_OPERAND_INDEX_DIMENSION enum) in OperandToken0.
-#define ENCODE_D3D10_SB_OPERAND_INDEX_DIMENSION(OperandIndexDim) (((OperandIndexDim) << D3D10_SB_OPERAND_INDEX_DIMENSION_SHIFT) & D3D10_SB_OPERAND_INDEX_DIMENSION_MASK)
-
-typedef enum D3D10_SB_OPERAND_INDEX_REPRESENTATION
-{
-    D3D10_SB_OPERAND_INDEX_IMMEDIATE32               = 0, // Extra DWORD
-    D3D10_SB_OPERAND_INDEX_IMMEDIATE64               = 1, // 2 Extra DWORDs
-    //   (HI32:LO32)
-    D3D10_SB_OPERAND_INDEX_RELATIVE                  = 2, // Extra operand
-    D3D10_SB_OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE = 3, // Extra DWORD followed by
-    //   extra operand
-    D3D10_SB_OPERAND_INDEX_IMMEDIATE64_PLUS_RELATIVE = 4, // 2 Extra DWORDS
-    //   (HI32:LO32) followed
-    //   by extra operand
-} D3D10_SB_OPERAND_INDEX_REPRESENTATION;
-#define D3D10_SB_OPERAND_INDEX_REPRESENTATION_SHIFT(Dim) (22 + 3 * ((Dim) & 3))
-#define D3D10_SB_OPERAND_INDEX_REPRESENTATION_MASK(Dim) (0x3 << D3D10_SB_OPERAND_INDEX_REPRESENTATION_SHIFT(Dim))
-
-// DECODER MACRO: Determine from OperandToken0 what representation
-// an operand index is provided as (D3D10_SB_OPERAND_INDEX_REPRESENTATION enum),
-// for index dimension [0], [1] or [2], depending on D3D10_SB_OPERAND_INDEX_DIMENSION.
-#define DECODE_D3D10_SB_OPERAND_INDEX_REPRESENTATION(Dim, OperandToken0) ((D3D10_SB_OPERAND_INDEX_REPRESENTATION)(((OperandToken0) & D3D10_SB_OPERAND_INDEX_REPRESENTATION_MASK(Dim)) >> D3D10_SB_OPERAND_INDEX_REPRESENTATION_SHIFT(Dim)))
-
-// ENCODER MACRO: Store in OperandToken0 what representation
-// an operand index is provided as (D3D10_SB_OPERAND_INDEX_REPRESENTATION enum),
-// for index dimension [0], [1] or [2], depending on D3D10_SB_OPERAND_INDEX_DIMENSION.
-#define ENCODE_D3D10_SB_OPERAND_INDEX_REPRESENTATION(Dim, IndexRepresentation) (((IndexRepresentation) << D3D10_SB_OPERAND_INDEX_REPRESENTATION_SHIFT(Dim)) & D3D10_SB_OPERAND_INDEX_REPRESENTATION_MASK(Dim))
-
-#define D3D10_SB_OPERAND_EXTENDED_MASK  0x80000000
-#define D3D10_SB_OPERAND_EXTENDED_SHIFT 31
-
-// DECODER MACRO: Determine if the operand is extended
-// by an additional opcode token.
-#define DECODE_IS_D3D10_SB_OPERAND_EXTENDED(OperandToken0) (((OperandToken0) & D3D10_SB_OPERAND_EXTENDED_MASK) >> D3D10_SB_OPERAND_EXTENDED_SHIFT)
-
-// ENCODER MACRO: Store in OperandToken0 whether the operand is extended
-// by an additional operand token.
-#define ENCODE_D3D10_SB_OPERAND_EXTENDED(bExtended) (((bExtended) != 0) ? D3D10_SB_OPERAND_EXTENDED_MASK : 0)
-
-// ----------------------------------------------------------------------------
-// Extended Instruction Operand Format (OperandToken1)
-//
-// If bit31 of an operand token is set, the
-// operand has additional data in a second DWORD
-// directly following OperandToken0.  Other tokens
-// expected for the operand, such as immmediate
-// values or relative address operands (full
-// operands in themselves) always follow
-// OperandToken0 AND OperandToken1..n (extended
-// operand tokens, if present).
-//
-// [05:00] D3D10_SB_EXTENDED_OPERAND_TYPE
-// [30:06] if([05:00] == D3D10_SB_EXTENDED_OPERAND_MODIFIER)
-//         {
-//              [13:06] D3D10_SB_OPERAND_MODIFIER
-//              [30:14] Ignored, 0.
-//         }
-//         else
-//         {
-//              [30:06] Ignored, 0.
-//         }
-// [31]    0 normally. 1 if second order extended operand definition,
-//         meaning next DWORD contains yet ANOTHER extended operand
-//         description. Currently no second order extensions defined.
-//         This would be useful if a particular extended operand does
-//         not have enough space to store the required information in
-//         a single token and so is extended further.
-//
-// ----------------------------------------------------------------------------
-
-typedef enum D3D10_SB_EXTENDED_OPERAND_TYPE
-{
-    D3D10_SB_EXTENDED_OPERAND_EMPTY            = 0, // Might be used if this
-    // enum is full and
-    // further extended opcode
-    // is needed.
-    D3D10_SB_EXTENDED_OPERAND_MODIFIER         = 1,
-} D3D10_SB_EXTENDED_OPERAND_TYPE;
-#define D3D10_SB_EXTENDED_OPERAND_TYPE_MASK 0x0000003f
-
-// DECODER MACRO: Given an extended operand
-// token (OperandToken1), figure out what type
-// of token it is (from D3D10_SB_EXTENDED_OPERAND_TYPE enum)
-// to be able to interpret the rest of the token's contents.
-#define DECODE_D3D10_SB_EXTENDED_OPERAND_TYPE(OperandToken1) ((D3D10_SB_EXTENDED_OPERAND_TYPE)((OperandToken1) & D3D10_SB_EXTENDED_OPERAND_TYPE_MASK))
-
-// ENCODER MACRO: Store extended operand token
-// type in OperandToken1.
-#define ENCODE_D3D10_SB_EXTENDED_OPERAND_TYPE(ExtOperandType) ((ExtOperandType) & D3D10_SB_EXTENDED_OPERAND_TYPE_MASK)
-
-typedef enum D3D10_SB_OPERAND_MODIFIER
-{
-    D3D10_SB_OPERAND_MODIFIER_NONE     = 0, // Nop.  This is the implied
-                                            // default if the extended
-                                            // operand is not present for
-                                            // an operand for which source
-                                            // modifiers are meaningful
-    D3D10_SB_OPERAND_MODIFIER_NEG      = 1, // Negate
-    D3D10_SB_OPERAND_MODIFIER_ABS      = 2, // Absolute value, abs()
-    D3D10_SB_OPERAND_MODIFIER_ABSNEG   = 3, // -abs()
-} D3D10_SB_OPERAND_MODIFIER;
-#define D3D10_SB_OPERAND_MODIFIER_MASK  0x00003fc0
-#define D3D10_SB_OPERAND_MODIFIER_SHIFT 6
-
-// DECODER MACRO: Given a D3D10_SB_EXTENDED_OPERAND_MODIFIER
-// extended token (OperandToken1), determine the source modifier
-// (D3D10_SB_OPERAND_MODIFIER enum)
-#define DECODE_D3D10_SB_OPERAND_MODIFIER(OperandToken1) ((D3D10_SB_OPERAND_MODIFIER)(((OperandToken1) & D3D10_SB_OPERAND_MODIFIER_MASK) >> D3D10_SB_OPERAND_MODIFIER_SHIFT))
-
-// ENCODER MACRO: Generate a complete source modifier extended token
-// (OperandToken1), given D3D10_SB_OPERAND_MODIFIER enum (the
-// ext. operand type is also set to D3D10_SB_EXTENDED_OPERAND_MODIFIER).
-#define ENCODE_D3D10_SB_EXTENDED_OPERAND_MODIFIER(SourceMod)  ((((SourceMod) << D3D10_SB_OPERAND_MODIFIER_SHIFT) & D3D10_SB_OPERAND_MODIFIER_MASK) | \
-                                                               ENCODE_D3D10_SB_EXTENDED_OPERAND_TYPE(D3D10_SB_EXTENDED_OPERAND_MODIFIER) |           \
-                                                               ENCODE_D3D10_SB_OPERAND_DOUBLE_EXTENDED(0))
-
-#define D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK  0x80000000
-#define D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT 31
-// DECODER MACRO: Determine if an extended operand token
-// (OperandToken1) is further extended by yet another token
-// (OperandToken2).  Currently there are no secondary
-// extended operand tokens.
-#define DECODE_IS_D3D10_SB_OPERAND_DOUBLE_EXTENDED(OperandToken1) (((OperandToken1) & D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT)
-
-// ENCODER MACRO: Store in OperandToken1 whether the operand is extended
-// by an additional operand token.  Currently there are no secondary
-// extended operand tokens.
-#define ENCODE_D3D10_SB_OPERAND_DOUBLE_EXTENDED(bExtended) (((bExtended) != 0) ? D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK : 0)
-
-// ----------------------------------------------------------------------------
-// Name Token (NameToken) (used in declaration statements)
-//
-// [15:00] D3D10_SB_NAME enumeration
-// [31:16] Reserved, 0
-//
-// ----------------------------------------------------------------------------
-#define D3D10_SB_NAME_MASK  0x0000ffff
-
-// DECODER MACRO: Get the name from NameToken
-#define DECODE_D3D10_SB_NAME(NameToken) ((D3D10_SB_NAME)((NameToken) & D3D10_SB_NAME_MASK))
-
-// ENCODER MACRO: Generate a complete NameToken given a D3D10_SB_NAME
-#define ENCODE_D3D10_SB_NAME(Name) ((Name) & D3D10_SB_NAME_MASK)
-
-//---------------------------------------------------------------------
-// Declaration Statements
-//
-// Declarations start with a standard opcode token,
-// having opcode type being D3D10_SB_OPCODE_DCL*.
-// Each particular declaration type has custom
-// operand token(s), described below.
-//---------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Global Flags Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_GLOBAL_FLAGS
-// [11:11] Refactoring allowed if bit set.
-// [12:12] Enable double precision float ops.
-// [13:13] Force early depth-stencil test.
-// [14:14] Enable RAW and structured buffers in non-CS 4.x shaders.
-// [23:15] Reserved for future flags.
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by no operands.
-//
-// ----------------------------------------------------------------------------
-#define D3D10_SB_GLOBAL_FLAG_REFACTORING_ALLOWED (1 << 11)
-#define D3D11_SB_GLOBAL_FLAG_ENABLE_DOUBLE_PRECISION_FLOAT_OPS (1 << 12)
-#define D3D11_SB_GLOBAL_FLAG_FORCE_EARLY_DEPTH_STENCIL (1 << 13)
-#define D3D11_SB_GLOBAL_FLAG_ENABLE_RAW_AND_STRUCTURED_BUFFERS (1 << 14)
-#define D3D10_SB_GLOBAL_FLAGS_MASK  0x00fff800
-
-// DECODER MACRO: Get global flags
-#define DECODE_D3D10_SB_GLOBAL_FLAGS(OpcodeToken0) ((OpcodeToken0) & D3D10_SB_GLOBAL_FLAGS_MASK)
-
-// ENCODER MACRO: Encode global flags
-#define ENCODE_D3D10_SB_GLOBAL_FLAGS(Flags) ((Flags) & D3D10_SB_GLOBAL_FLAGS_MASK)
-
-// ----------------------------------------------------------------------------
-// Resource Declaration (non multisampled)
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_RESOURCE
-// [15:11] D3D10_SB_RESOURCE_DIMENSION
-// [23:16] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     t# register (D3D10_SB_OPERAND_TYPE_RESOURCE) is being declared.
-// (2) a Resource Return Type token (ResourceReturnTypeToken)
-//
-// ----------------------------------------------------------------------------
-#define D3D10_SB_RESOURCE_DIMENSION_MASK  0x0000F800
-#define D3D10_SB_RESOURCE_DIMENSION_SHIFT 11
-
-// DECODER MACRO: Given a resource declaration token,
-// (OpcodeToken0), determine the resource dimension
-// (D3D10_SB_RESOURCE_DIMENSION enum)
-#define DECODE_D3D10_SB_RESOURCE_DIMENSION(OpcodeToken0) ((D3D10_SB_RESOURCE_DIMENSION)(((OpcodeToken0) & D3D10_SB_RESOURCE_DIMENSION_MASK) >> D3D10_SB_RESOURCE_DIMENSION_SHIFT))
-
-// ENCODER MACRO: Store resource dimension
-// (D3D10_SB_RESOURCE_DIMENSION enum) into a
-// a resource declaration token (OpcodeToken0)
-#define ENCODE_D3D10_SB_RESOURCE_DIMENSION(ResourceDim) (((ResourceDim) << D3D10_SB_RESOURCE_DIMENSION_SHIFT) & D3D10_SB_RESOURCE_DIMENSION_MASK)
-
-// ----------------------------------------------------------------------------
-// Resource Declaration (multisampled)
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_RESOURCE (same opcode as non-multisampled case)
-// [15:11] D3D10_SB_RESOURCE_DIMENSION (must be TEXTURE2DMS or TEXTURE2DMSARRAY)
-// [22:16] Sample count 1...127.  0 is currently disallowed, though
-//         in future versions 0 could mean "configurable" sample count
-// [23:23] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     t# register (D3D10_SB_OPERAND_TYPE_RESOURCE) is being declared.
-// (2) a Resource Return Type token (ResourceReturnTypeToken)
-//
-// ----------------------------------------------------------------------------
-
-// use same macro for encoding/decoding resource dimension aas the non-msaa declaration
-
-#define D3D10_SB_RESOURCE_SAMPLE_COUNT_MASK  0x07F0000
-#define D3D10_SB_RESOURCE_SAMPLE_COUNT_SHIFT 16
-
-// DECODER MACRO: Given a resource declaration token,
-// (OpcodeToken0), determine the resource sample count (1..127)
-#define DECODE_D3D10_SB_RESOURCE_SAMPLE_COUNT(OpcodeToken0) ((UINT)(((OpcodeToken0) & D3D10_SB_RESOURCE_SAMPLE_COUNT_MASK) >> D3D10_SB_RESOURCE_SAMPLE_COUNT_SHIFT))
-
-// ENCODER MACRO: Store resource sample count up to 127 into a
-// a resource declaration token (OpcodeToken0)
-#define ENCODE_D3D10_SB_RESOURCE_SAMPLE_COUNT(SampleCount) (((SampleCount > 127 ? 127 : SampleCount) << D3D10_SB_RESOURCE_SAMPLE_COUNT_SHIFT) & D3D10_SB_RESOURCE_SAMPLE_COUNT_MASK)
-
-// ----------------------------------------------------------------------------
-// Resource Return Type Token (ResourceReturnTypeToken) (used in resource
-// declaration statements)
-//
-// [03:00] D3D10_SB_RESOURCE_RETURN_TYPE for component X
-// [07:04] D3D10_SB_RESOURCE_RETURN_TYPE for component Y
-// [11:08] D3D10_SB_RESOURCE_RETURN_TYPE for component Z
-// [15:12] D3D10_SB_RESOURCE_RETURN_TYPE for component W
-// [31:16] Reserved, 0
-//
-// ----------------------------------------------------------------------------
-// DECODER MACRO: Get the resource return type for component (0-3) from
-// ResourceReturnTypeToken
-#define DECODE_D3D10_SB_RESOURCE_RETURN_TYPE(ResourceReturnTypeToken, Component) \
-    ((D3D10_SB_RESOURCE_RETURN_TYPE)(((ResourceReturnTypeToken) >>               \
-                                      (Component * D3D10_SB_RESOURCE_RETURN_TYPE_NUMBITS)) & D3D10_SB_RESOURCE_RETURN_TYPE_MASK))
-
-// ENCODER MACRO: Generate a resource return type for a component
-#define ENCODE_D3D10_SB_RESOURCE_RETURN_TYPE(ReturnType, Component) \
-    (((ReturnType) & D3D10_SB_RESOURCE_RETURN_TYPE_MASK) << (Component * D3D10_SB_RESOURCE_RETURN_TYPE_NUMBITS))
-
-// ----------------------------------------------------------------------------
-// Sampler Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_SAMPLER
-// [14:11] D3D10_SB_SAMPLER_MODE
-// [23:15] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 1 operand:
-// (1) Operand starting with OperandToken0, defining which sampler
-//     (D3D10_SB_OPERAND_TYPE_SAMPLER) register # is being declared.
-//
-// ----------------------------------------------------------------------------
-typedef enum D3D10_SB_SAMPLER_MODE
-{
-    D3D10_SB_SAMPLER_MODE_DEFAULT      = 0,
-    D3D10_SB_SAMPLER_MODE_COMPARISON   = 1,
-    D3D10_SB_SAMPLER_MODE_MONO         = 2,
-} D3D10_SB_SAMPLER_MODE;
-
-#define D3D10_SB_SAMPLER_MODE_MASK  0x00007800
-#define D3D10_SB_SAMPLER_MODE_SHIFT 11
-
-// DECODER MACRO: Find out if a Constant Buffer is going to be indexed or not
-#define DECODE_D3D10_SB_SAMPLER_MODE(OpcodeToken0) ((D3D10_SB_SAMPLER_MODE)(((OpcodeToken0) & D3D10_SB_SAMPLER_MODE_MASK) >> D3D10_SB_SAMPLER_MODE_SHIFT))
-
-// ENCODER MACRO: Generate a resource return type for a component
-#define ENCODE_D3D10_SB_SAMPLER_MODE(SamplerMode) (((SamplerMode) << D3D10_SB_SAMPLER_MODE_SHIFT) & D3D10_SB_SAMPLER_MODE_MASK)
-
-// ----------------------------------------------------------------------------
-// Input Register Declaration (see separate declarations for Pixel Shaders)
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INPUT
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 1 operand:
-// (1) Operand, starting with OperandToken0, defining which input
-//     v# register (D3D10_SB_OPERAND_TYPE_INPUT) is being declared,
-//     including writemask.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Input Register Declaration w/System Interpreted Value
-// (see separate declarations for Pixel Shaders)
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INPUT_SIV
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) Operand, starting with OperandToken0, defining which input
-//     v# register (D3D10_SB_OPERAND_TYPE_INPUT) is being declared,
-//     including writemask.  For Geometry Shaders, the input is
-//     v[vertex][attribute], and this declaration is only for which register
-//     on the attribute axis is being declared.  The vertex axis value must
-//     be equal to the # of vertices in the current input primitive for the GS
-//     (i.e. 6 for triangle + adjacency).
-// (2) a System Interpreted Value Name (NameToken)
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Input Register Declaration w/System Generated Value
-// (available for all shaders incl. Pixel Shader, no interpolation mode needed)
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INPUT_SGV
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) Operand, starting with OperandToken0, defining which input
-//     v# register (D3D10_SB_OPERAND_TYPE_INPUT) is being declared,
-//     including writemask.
-// (2) a System Generated Value Name (NameToken)
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Pixel Shader Input Register Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INPUT_PS
-// [14:11] D3D10_SB_INTERPOLATION_MODE
-// [23:15] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 1 operand:
-// (1) Operand, starting with OperandToken0, defining which input
-//     v# register (D3D10_SB_OPERAND_TYPE_INPUT) is being declared,
-//     including writemask.
-//
-// ----------------------------------------------------------------------------
-#define D3D10_SB_INPUT_INTERPOLATION_MODE_MASK  0x00007800
-#define D3D10_SB_INPUT_INTERPOLATION_MODE_SHIFT 11
-
-// DECODER MACRO: Find out interpolation mode for the input register
-#define DECODE_D3D10_SB_INPUT_INTERPOLATION_MODE(OpcodeToken0) ((D3D10_SB_INTERPOLATION_MODE)(((OpcodeToken0) & D3D10_SB_INPUT_INTERPOLATION_MODE_MASK) >> D3D10_SB_INPUT_INTERPOLATION_MODE_SHIFT))
-
-// ENCODER MACRO: Encode interpolation mode for a register.
-#define ENCODE_D3D10_SB_INPUT_INTERPOLATION_MODE(InterpolationMode) (((InterpolationMode) << D3D10_SB_INPUT_INTERPOLATION_MODE_SHIFT) & D3D10_SB_INPUT_INTERPOLATION_MODE_MASK)
-
-// ----------------------------------------------------------------------------
-// Pixel Shader Input Register Declaration w/System Interpreted Value
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INPUT_PS_SIV
-// [14:11] D3D10_SB_INTERPOLATION_MODE
-// [23:15] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) Operand, starting with OperandToken0, defining which input
-//     v# register (D3D10_SB_OPERAND_TYPE_INPUT) is being declared.
-// (2) a System Interpreted Value Name (NameToken)
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Pixel Shader Input Register Declaration w/System Generated Value
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INPUT_PS_SGV
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) Operand, starting with OperandToken0, defining which input
-//     v# register (D3D10_SB_OPERAND_TYPE_INPUT) is being declared.
-// (2) a System Generated Value Name (NameToken)
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Output Register Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_OUTPUT
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 1 operand:
-// (1) Operand, starting with OperandToken0, defining which
-//     o# register (D3D10_SB_OPERAND_TYPE_OUTPUT) is being declared,
-//     including writemask.
-//     (in Pixel Shader, output can also be one of
-//     D3D10_SB_OPERAND_TYPE_OUTPUT_DEPTH,
-//     D3D11_SB_OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL, or
-//     D3D11_SB_OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL )
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Output Register Declaration w/System Interpreted Value
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_OUTPUT_SIV
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     o# register (D3D10_SB_OPERAND_TYPE_OUTPUT) is being declared,
-//     including writemask.
-// (2) a System Interpreted Name token (NameToken)
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Output Register Declaration w/System Generated Value
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_OUTPUT_SGV
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     o# register (D3D10_SB_OPERAND_TYPE_OUTPUT) is being declared,
-//     including writemask.
-// (2) a System Generated Name token (NameToken)
-//
-// ----------------------------------------------------------------------------
-
-
-// ----------------------------------------------------------------------------
-// Input or Output Register Indexing Range Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INDEX_RANGE
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     input (v#) or output (o#) register is having its array indexing range
-//     declared, including writemask.  For Geometry Shader inputs,
-//     it is assumed that the vertex axis is always fully indexable,
-//     and 0 must be specified as the vertex# in this declaration, so that
-//     only the a range of attributes are having their index range defined.
-//
-// (2) a DWORD representing the count of registers starting from the one
-//     indicated in (1).
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Temp Register Declaration r0...r(n-1)
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_TEMPS
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 1 operand:
-// (1) DWORD (unsigned int) indicating how many temps are being declared.
-//     i.e. 5 means r0...r4 are declared.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Indexable Temp Register (x#[size]) Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INDEXABLE_TEMP
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 3 DWORDs:
-// (1) Register index (defines which x# register is declared)
-// (2) Number of registers in this register bank
-// (3) Number of components in the array (1-4). 1 means .x, 2 means .xy etc.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Constant Buffer Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_CONSTANT_BUFFER
-// [11]    D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN
-// [23:12] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 1 operand:
-// (1) Operand, starting with OperandToken0, defining which CB slot (cb#[size])
-//     is being declared. (operand type: D3D10_SB_OPERAND_TYPE_CONSTANT_BUFFER)
-//     The indexing dimension for the register must be
-//     D3D10_SB_OPERAND_INDEX_DIMENSION_2D, where the first index specifies
-//     which cb#[] is being declared, and the second (array) index specifies the size
-//     of the buffer, as a count of 32-bit*4 elements.  (As opposed to when the
-//     cb#[] is used in shader instructions, and the array index represents which
-//     location in the constant buffer is being referenced.)
-//     If the size is specified as 0, the CB size is not known (any size CB
-//     can be bound to the slot).
-//
-// The order of constant buffer declarations in a shader indicates their
-// relative priority from highest to lowest (hint to driver).
-//
-// ----------------------------------------------------------------------------
-
-typedef enum D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN
-{
-    D3D10_SB_CONSTANT_BUFFER_IMMEDIATE_INDEXED  = 0,
-    D3D10_SB_CONSTANT_BUFFER_DYNAMIC_INDEXED    = 1
-} D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN;
-
-#define D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN_MASK  0x00000800
-#define D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN_SHIFT 11
-
-// DECODER MACRO: Find out if a Constant Buffer is going to be indexed or not
-#define DECODE_D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN(OpcodeToken0) ((D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN)(((OpcodeToken0) & D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN_MASK) >> D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN_SHIFT))
-
-// ENCODER MACRO: Encode the access pattern for the Constant Buffer
-#define ENCODE_D3D10_SB_D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN(AccessPattern) (((AccessPattern) << D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN_SHIFT) & D3D10_SB_CONSTANT_BUFFER_ACCESS_PATTERN_MASK)
-
-// ----------------------------------------------------------------------------
-// Immediate Constant Buffer Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_CUSTOMDATA
-// [31:11] == D3D10_SB_CUSTOMDATA_DCL_IMMEDIATE_CONSTANT_BUFFER
-//
-// OpcodeToken1 is followed by:
-// (1) DWORD indicating length of declaration, including OpcodeToken0 and 1.
-//     This length must = 2(for OpcodeToken0 and 1) + a multiple of 4
-//                                                    (# of immediate constants)
-// (2) Sequence of 4-tuples of DWORDs defining the Immediate Constant Buffer.
-//     The number of 4-tuples is (length above - 1) / 4
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Geometry Shader Input Primitive Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_GS_INPUT_PRIMITIVE
-// [16:11] D3D10_SB_PRIMITIVE [not D3D10_SB_PRIMITIVE_TOPOLOGY]
-// [23:17] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// ----------------------------------------------------------------------------
-
-#define D3D10_SB_GS_INPUT_PRIMITIVE_MASK  0x0001f800
-#define D3D10_SB_GS_INPUT_PRIMITIVE_SHIFT 11
-
-// DECODER MACRO: Given a primitive topology declaration,
-// (OpcodeToken0), determine the primitive topology
-// (D3D10_SB_PRIMITIVE enum)
-#define DECODE_D3D10_SB_GS_INPUT_PRIMITIVE(OpcodeToken0) ((D3D10_SB_PRIMITIVE)(((OpcodeToken0) & D3D10_SB_GS_INPUT_PRIMITIVE_MASK) >> D3D10_SB_GS_INPUT_PRIMITIVE_SHIFT))
-
-// ENCODER MACRO: Store primitive topology
-// (D3D10_SB_PRIMITIVE enum) into a
-// a primitive topology declaration token (OpcodeToken0)
-#define ENCODE_D3D10_SB_GS_INPUT_PRIMITIVE(Prim) (((Prim) << D3D10_SB_GS_INPUT_PRIMITIVE_SHIFT) & D3D10_SB_GS_INPUT_PRIMITIVE_MASK)
-
-// ----------------------------------------------------------------------------
-// Geometry Shader Output Topology Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY
-// [17:11] D3D10_SB_PRIMITIVE_TOPOLOGY
-// [23:18] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// ----------------------------------------------------------------------------
-
-#define D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY_MASK  0x0001f800
-#define D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY_SHIFT 11
-
-// DECODER MACRO: Given a primitive topology declaration,
-// (OpcodeToken0), determine the primitive topology
-// (D3D10_SB_PRIMITIVE_TOPOLOGY enum)
-#define DECODE_D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY(OpcodeToken0) ((D3D10_SB_PRIMITIVE_TOPOLOGY)(((OpcodeToken0) & D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY_MASK) >> D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY_SHIFT))
-
-// ENCODER MACRO: Store primitive topology
-// (D3D10_SB_PRIMITIVE_TOPOLOGY enum) into a
-// a primitive topology declaration token (OpcodeToken0)
-#define ENCODE_D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY(PrimTopology) (((PrimTopology) << D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY_SHIFT) & D3D10_SB_GS_OUTPUT_PRIMITIVE_TOPOLOGY_MASK)
-
-// ----------------------------------------------------------------------------
-// Geometry Shader Maximum Output Vertex Count Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by a DWORD representing the
-// maximum number of primitives that could be output
-// by the Geometry Shader.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Geometry Shader Instance Count Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_GS_INSTANCE_COUNT
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by a UINT32 representing the
-// number of instances of the geometry shader program to execute.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Hull Shader Declaration Phase: HS/DS Input Control Point Count
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_INPUT_CONTROL_POINT_COUNT
-// [16:11] Control point count
-// [23:17] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// ----------------------------------------------------------------------------
-#define D3D11_SB_INPUT_CONTROL_POINT_COUNT_MASK  0x0001f800
-#define D3D11_SB_INPUT_CONTROL_POINT_COUNT_SHIFT 11
-
-// DECODER MACRO: Given an input control point count declaration token,
-// (OpcodeToken0), determine the control point count
-#define DECODE_D3D11_SB_INPUT_CONTROL_POINT_COUNT(OpcodeToken0) ((UINT)(((OpcodeToken0) & D3D11_SB_INPUT_CONTROL_POINT_COUNT_MASK) >> D3D11_SB_INPUT_CONTROL_POINT_COUNT_SHIFT))
-
-// ENCODER MACRO: Store input control point count into a declaration token
-#define ENCODE_D3D11_SB_INPUT_CONTROL_POINT_COUNT(Count) (((Count) << D3D11_SB_INPUT_CONTROL_POINT_COUNT_SHIFT) & D3D11_SB_INPUT_CONTROL_POINT_COUNT_MASK)
-
-// ----------------------------------------------------------------------------
-// Hull Shader Declaration Phase: HS Output Control Point Count
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT
-// [16:11] Control point count
-// [23:17] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// ----------------------------------------------------------------------------
-#define D3D11_SB_OUTPUT_CONTROL_POINT_COUNT_MASK  0x0001f800
-#define D3D11_SB_OUTPUT_CONTROL_POINT_COUNT_SHIFT 11
-
-// DECODER MACRO: Given an output control point count declaration token,
-// (OpcodeToken0), determine the control point count
-#define DECODE_D3D11_SB_OUTPUT_CONTROL_POINT_COUNT(OpcodeToken0) ((UINT)(((OpcodeToken0) & D3D11_SB_OUTPUT_CONTROL_POINT_COUNT_MASK) >> D3D11_SB_OUTPUT_CONTROL_POINT_COUNT_SHIFT))
-
-// ENCODER MACRO: Store output control point count into a declaration token
-#define ENCODE_D3D11_SB_OUTPUT_CONTROL_POINT_COUNT(Count) (((Count) << D3D11_SB_OUTPUT_CONTROL_POINT_COUNT_SHIFT) & D3D11_SB_OUTPUT_CONTROL_POINT_COUNT_MASK)
-
-// ----------------------------------------------------------------------------
-// Hull Shader Declaration Phase: Tessellator Domain
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_TESS_DOMAIN
-// [12:11] Domain
-// [23:13] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// ----------------------------------------------------------------------------
-typedef enum D3D11_SB_TESSELLATOR_DOMAIN
-{
-    D3D11_SB_TESSELLATOR_DOMAIN_UNDEFINED = 0,
-    D3D11_SB_TESSELLATOR_DOMAIN_ISOLINE   = 1,
-    D3D11_SB_TESSELLATOR_DOMAIN_TRI       = 2,
-    D3D11_SB_TESSELLATOR_DOMAIN_QUAD      = 3
-} D3D11_SB_TESSELLATOR_DOMAIN;
-
-#define D3D11_SB_TESS_DOMAIN_MASK  0x00001800
-#define D3D11_SB_TESS_DOMAIN_SHIFT 11
-
-// DECODER MACRO: Given a tessellator domain declaration,
-// (OpcodeToken0), determine the domain
-// (D3D11_SB_TESSELLATOR_DOMAIN enum)
-#define DECODE_D3D11_SB_TESS_DOMAIN(OpcodeToken0) ((D3D11_SB_TESSELLATOR_DOMAIN)(((OpcodeToken0) & D3D11_SB_TESS_DOMAIN_MASK) >> D3D11_SB_TESS_DOMAIN_SHIFT))
-
-// ENCODER MACRO: Store tessellator domain
-// (D3D11_SB_TESSELLATOR_DOMAIN enum) into a
-// a tessellator domain declaration token (OpcodeToken0)
-#define ENCODE_D3D11_SB_TESS_DOMAIN(Domain) (((Domain) << D3D11_SB_TESS_DOMAIN_SHIFT) & D3D11_SB_TESS_DOMAIN_MASK)
-
-// ----------------------------------------------------------------------------
-// Hull Shader Declaration Phase: Tessellator Partitioning
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_TESS_PARTITIONING
-// [13:11] Partitioning
-// [23:14] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// ----------------------------------------------------------------------------
-typedef enum D3D11_SB_TESSELLATOR_PARTITIONING
-{
-    D3D11_SB_TESSELLATOR_PARTITIONING_UNDEFINED       = 0,
-    D3D11_SB_TESSELLATOR_PARTITIONING_INTEGER         = 1,
-    D3D11_SB_TESSELLATOR_PARTITIONING_POW2            = 2,
-    D3D11_SB_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD  = 3,
-    D3D11_SB_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4
-} D3D11_SB_TESSELLATOR_PARTITIONING;
-
-#define D3D11_SB_TESS_PARTITIONING_MASK  0x00003800
-#define D3D11_SB_TESS_PARTITIONING_SHIFT 11
-
-// DECODER MACRO: Given a tessellator partitioning declaration,
-// (OpcodeToken0), determine the domain
-// (D3D11_SB_TESSELLATOR_PARTITIONING enum)
-#define DECODE_D3D11_SB_TESS_PARTITIONING(OpcodeToken0) ((D3D11_SB_TESSELLATOR_PARTITIONING)(((OpcodeToken0) & D3D11_SB_TESS_PARTITIONING_MASK) >> D3D11_SB_TESS_PARTITIONING_SHIFT))
-
-// ENCODER MACRO: Store tessellator partitioning
-// (D3D11_SB_TESSELLATOR_PARTITIONING enum) into a
-// a tessellator partitioning declaration token (OpcodeToken0)
-#define ENCODE_D3D11_SB_TESS_PARTITIONING(Partitioning) (((Partitioning) << D3D11_SB_TESS_PARTITIONING_SHIFT) & D3D11_SB_TESS_PARTITIONING_MASK)
-
-// ----------------------------------------------------------------------------
-// Hull Shader Declaration Phase: Tessellator Output Primitive
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_TESS_OUTPUT_PRIMITIVE
-// [13:11] Output Primitive
-// [23:14] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token. == 1
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// ----------------------------------------------------------------------------
-typedef enum D3D11_SB_TESSELLATOR_OUTPUT_PRIMITIVE
-{
-    D3D11_SB_TESSELLATOR_OUTPUT_UNDEFINED     = 0,
-    D3D11_SB_TESSELLATOR_OUTPUT_POINT         = 1,
-    D3D11_SB_TESSELLATOR_OUTPUT_LINE          = 2,
-    D3D11_SB_TESSELLATOR_OUTPUT_TRIANGLE_CW   = 3,
-    D3D11_SB_TESSELLATOR_OUTPUT_TRIANGLE_CCW  = 4
-} D3D11_SB_TESSELLATOR_OUTPUT_PRIMITIVE;
-
-#define D3D11_SB_TESS_OUTPUT_PRIMITIVE_MASK  0x00003800
-#define D3D11_SB_TESS_OUTPUT_PRIMITIVE_SHIFT 11
-
-// DECODER MACRO: Given a tessellator output primitive declaration,
-// (OpcodeToken0), determine the domain
-// (D3D11_SB_TESSELLATOR_OUTPUT_PRIMITIVE enum)
-#define DECODE_D3D11_SB_TESS_OUTPUT_PRIMITIVE(OpcodeToken0) ((D3D11_SB_TESSELLATOR_OUTPUT_PRIMITIVE)(((OpcodeToken0) & D3D11_SB_TESS_OUTPUT_PRIMITIVE_MASK) >> D3D11_SB_TESS_OUTPUT_PRIMITIVE_SHIFT))
-
-// ENCODER MACRO: Store tessellator output primitive
-// (D3D11_SB_TESSELLATOR_OUTPUT_PRIMITIVE enum) into a
-// a tessellator output primitive declaration token (OpcodeToken0)
-#define ENCODE_D3D11_SB_TESS_OUTPUT_PRIMITIVE(OutputPrimitive) (((OutputPrimitive) << D3D11_SB_TESS_OUTPUT_PRIMITIVE_SHIFT) & D3D11_SB_TESS_OUTPUT_PRIMITIVE_MASK)
-
-
-// ----------------------------------------------------------------------------
-// Hull Shader Declaration Phase: Hull Shader Max Tessfactor
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_HS_MAX_TESSFACTOR
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by a float32 representing the
-// maximum TessFactor.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Hull Shader Declaration Phase: Hull Shader Fork Phase Instance Count
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by a UINT32 representing the
-// number of instances of the current fork phase program to execute.
-//
-// ----------------------------------------------------------------------------
-
-typedef enum D3D10_SB_INTERPOLATION_MODE
-{
-    D3D10_SB_INTERPOLATION_UNDEFINED = 0,
-    D3D10_SB_INTERPOLATION_CONSTANT = 1,
-    D3D10_SB_INTERPOLATION_LINEAR = 2,
-    D3D10_SB_INTERPOLATION_LINEAR_CENTROID = 3,
-    D3D10_SB_INTERPOLATION_LINEAR_NOPERSPECTIVE = 4,
-    D3D10_SB_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID = 5,
-    D3D10_SB_INTERPOLATION_LINEAR_SAMPLE = 6, // DX10.1
-    D3D10_SB_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE = 7, // DX10.1
-} D3D10_SB_INTERPOLATION_MODE;
-
-// Keep PRIMITIVE_TOPOLOGY values in sync with earlier DX versions (HW consumes values directly).
-typedef enum D3D10_SB_PRIMITIVE_TOPOLOGY
-{
-    D3D10_SB_PRIMITIVE_TOPOLOGY_UNDEFINED = 0,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_POINTLIST = 1,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_LINESTRIP = 3,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5,
-    // 6 is reserved for legacy triangle fans
-    // Adjacency values should be equal to (0x8 & non-adjacency):
-    D3D10_SB_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    D3D10_SB_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13,
-} D3D10_SB_PRIMITIVE_TOPOLOGY;
-
-typedef enum D3D10_SB_PRIMITIVE
-{
-    D3D10_SB_PRIMITIVE_UNDEFINED = 0,
-    D3D10_SB_PRIMITIVE_POINT = 1,
-    D3D10_SB_PRIMITIVE_LINE = 2,
-    D3D10_SB_PRIMITIVE_TRIANGLE = 3,
-    // Adjacency values should be equal to (0x4 & non-adjacency):
-    D3D10_SB_PRIMITIVE_LINE_ADJ = 6,
-    D3D10_SB_PRIMITIVE_TRIANGLE_ADJ = 7,
-    D3D11_SB_PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    D3D11_SB_PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    D3D11_SB_PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    D3D11_SB_PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    D3D11_SB_PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    D3D11_SB_PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    D3D11_SB_PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    D3D11_SB_PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    D3D11_SB_PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    D3D11_SB_PRIMITIVE_10_CONTROL_POINT_PATCH = 17,
-    D3D11_SB_PRIMITIVE_11_CONTROL_POINT_PATCH = 18,
-    D3D11_SB_PRIMITIVE_12_CONTROL_POINT_PATCH = 19,
-    D3D11_SB_PRIMITIVE_13_CONTROL_POINT_PATCH = 20,
-    D3D11_SB_PRIMITIVE_14_CONTROL_POINT_PATCH = 21,
-    D3D11_SB_PRIMITIVE_15_CONTROL_POINT_PATCH = 22,
-    D3D11_SB_PRIMITIVE_16_CONTROL_POINT_PATCH = 23,
-    D3D11_SB_PRIMITIVE_17_CONTROL_POINT_PATCH = 24,
-    D3D11_SB_PRIMITIVE_18_CONTROL_POINT_PATCH = 25,
-    D3D11_SB_PRIMITIVE_19_CONTROL_POINT_PATCH = 26,
-    D3D11_SB_PRIMITIVE_20_CONTROL_POINT_PATCH = 27,
-    D3D11_SB_PRIMITIVE_21_CONTROL_POINT_PATCH = 28,
-    D3D11_SB_PRIMITIVE_22_CONTROL_POINT_PATCH = 29,
-    D3D11_SB_PRIMITIVE_23_CONTROL_POINT_PATCH = 30,
-    D3D11_SB_PRIMITIVE_24_CONTROL_POINT_PATCH = 31,
-    D3D11_SB_PRIMITIVE_25_CONTROL_POINT_PATCH = 32,
-    D3D11_SB_PRIMITIVE_26_CONTROL_POINT_PATCH = 33,
-    D3D11_SB_PRIMITIVE_27_CONTROL_POINT_PATCH = 34,
-    D3D11_SB_PRIMITIVE_28_CONTROL_POINT_PATCH = 35,
-    D3D11_SB_PRIMITIVE_29_CONTROL_POINT_PATCH = 36,
-    D3D11_SB_PRIMITIVE_30_CONTROL_POINT_PATCH = 37,
-    D3D11_SB_PRIMITIVE_31_CONTROL_POINT_PATCH = 38,
-    D3D11_SB_PRIMITIVE_32_CONTROL_POINT_PATCH = 39,
-} D3D10_SB_PRIMITIVE;
-
-typedef enum D3D10_SB_COMPONENT_MASK
-{
-    D3D10_SB_COMPONENT_MASK_X = 1,
-    D3D10_SB_COMPONENT_MASK_Y = 2,
-    D3D10_SB_COMPONENT_MASK_Z = 4,
-    D3D10_SB_COMPONENT_MASK_W = 8,
-    D3D10_SB_COMPONENT_MASK_R = 1,
-    D3D10_SB_COMPONENT_MASK_G = 2,
-    D3D10_SB_COMPONENT_MASK_B = 4,
-    D3D10_SB_COMPONENT_MASK_A = 8,
-    D3D10_SB_COMPONENT_MASK_ALL = 15,
-} D3D10_SB_COMPONENT_MASK;
-
-typedef enum D3D10_SB_NAME
-{
-    D3D10_SB_NAME_UNDEFINED = 0,
-    D3D10_SB_NAME_POSITION = 1,
-    D3D10_SB_NAME_CLIP_DISTANCE = 2,
-    D3D10_SB_NAME_CULL_DISTANCE = 3,
-    D3D10_SB_NAME_RENDER_TARGET_ARRAY_INDEX = 4,
-    D3D10_SB_NAME_VIEWPORT_ARRAY_INDEX = 5,
-    D3D10_SB_NAME_VERTEX_ID = 6,
-    D3D10_SB_NAME_PRIMITIVE_ID = 7,
-    D3D10_SB_NAME_INSTANCE_ID = 8,
-    D3D10_SB_NAME_IS_FRONT_FACE = 9,
-    D3D10_SB_NAME_SAMPLE_INDEX = 10,
-    // The following are added for D3D11
-    D3D11_SB_NAME_FINAL_QUAD_U_EQ_0_EDGE_TESSFACTOR = 11,
-    D3D11_SB_NAME_FINAL_QUAD_V_EQ_0_EDGE_TESSFACTOR = 12,
-    D3D11_SB_NAME_FINAL_QUAD_U_EQ_1_EDGE_TESSFACTOR = 13,
-    D3D11_SB_NAME_FINAL_QUAD_V_EQ_1_EDGE_TESSFACTOR = 14,
-    D3D11_SB_NAME_FINAL_QUAD_U_INSIDE_TESSFACTOR = 15,
-    D3D11_SB_NAME_FINAL_QUAD_V_INSIDE_TESSFACTOR = 16,
-    D3D11_SB_NAME_FINAL_TRI_U_EQ_0_EDGE_TESSFACTOR = 17,
-    D3D11_SB_NAME_FINAL_TRI_V_EQ_0_EDGE_TESSFACTOR = 18,
-    D3D11_SB_NAME_FINAL_TRI_W_EQ_0_EDGE_TESSFACTOR = 19,
-    D3D11_SB_NAME_FINAL_TRI_INSIDE_TESSFACTOR = 20,
-    D3D11_SB_NAME_FINAL_LINE_DETAIL_TESSFACTOR = 21,
-    D3D11_SB_NAME_FINAL_LINE_DENSITY_TESSFACTOR = 22,
-} D3D10_SB_NAME;
-
-typedef enum D3D10_SB_RESOURCE_DIMENSION
-{
-    D3D10_SB_RESOURCE_DIMENSION_UNKNOWN = 0,
-    D3D10_SB_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURE1D = 2,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURE2D = 3,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURE2DMS = 4,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURE3D = 5,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURECUBE = 6,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURE1DARRAY = 7,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURE2DARRAY = 8,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURE2DMSARRAY = 9,
-    D3D10_SB_RESOURCE_DIMENSION_TEXTURECUBEARRAY = 10,
-    D3D11_SB_RESOURCE_DIMENSION_RAW_BUFFER = 11,
-    D3D11_SB_RESOURCE_DIMENSION_STRUCTURED_BUFFER = 12,
-} D3D10_SB_RESOURCE_DIMENSION;
-
-typedef enum D3D10_SB_RESOURCE_RETURN_TYPE
-{
-    D3D10_SB_RETURN_TYPE_UNORM = 1,
-    D3D10_SB_RETURN_TYPE_SNORM = 2,
-    D3D10_SB_RETURN_TYPE_SINT = 3,
-    D3D10_SB_RETURN_TYPE_UINT = 4,
-    D3D10_SB_RETURN_TYPE_FLOAT = 5,
-    D3D10_SB_RETURN_TYPE_MIXED = 6,
-    D3D11_SB_RETURN_TYPE_DOUBLE = 7,
-    D3D11_SB_RETURN_TYPE_CONTINUED = 8,
-    D3D11_SB_RETURN_TYPE_UNUSED = 9,
-} D3D10_SB_RESOURCE_RETURN_TYPE;
-
-typedef enum D3D10_SB_REGISTER_COMPONENT_TYPE
-{
-    D3D10_SB_REGISTER_COMPONENT_UNKNOWN = 0,
-    D3D10_SB_REGISTER_COMPONENT_UINT32 = 1,
-    D3D10_SB_REGISTER_COMPONENT_SINT32 = 2,
-    D3D10_SB_REGISTER_COMPONENT_FLOAT32 = 3
-} D3D10_SB_REGISTER_COMPONENT_TYPE;
-
-typedef enum D3D10_SB_INSTRUCTION_RETURN_TYPE
-{
-    D3D10_SB_INSTRUCTION_RETURN_FLOAT      = 0,
-    D3D10_SB_INSTRUCTION_RETURN_UINT       = 1
-} D3D10_SB_INSTRUCTION_RETURN_TYPE;
-
-#define D3D10_SB_INSTRUCTION_RETURN_TYPE_MASK  0x00001800
-#define D3D10_SB_INSTRUCTION_RETURN_TYPE_SHIFT 11
-
-// DECODER MACRO: For an OpcodeToken0 with the return type
-// determine the return type.
-#define DECODE_D3D10_SB_INSTRUCTION_RETURN_TYPE(OpcodeToken0) ((D3D10_SB_INSTRUCTION_RETURN_TYPE)(((OpcodeToken0) & D3D10_SB_INSTRUCTION_RETURN_TYPE_MASK) >> D3D10_SB_INSTRUCTION_RETURN_TYPE_SHIFT))
-// ENCODER MACRO: Encode the return type for instructions
-// in the opcode specific control range of OpcodeToken0
-#define ENCODE_D3D10_SB_INSTRUCTION_RETURN_TYPE(ReturnType) (((ReturnType) << D3D10_SB_INSTRUCTION_RETURN_TYPE_SHIFT) & D3D10_SB_INSTRUCTION_RETURN_TYPE_MASK)
-
-// ----------------------------------------------------------------------------
-// Interface function body Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_FUNCTION_BODY
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  If it is extended, then
-//         it contains the actual instruction length in DWORDs, since
-//         it may not fit into 7 bits if enough operands are defined.
-//
-// OpcodeToken0 is followed by a DWORD that represents the function body
-// identifier.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Interface function table Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_FUNCTION_TABLE
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  If it is extended, then
-//         it contains the actual instruction length in DWORDs, since
-//         it may not fit into 7 bits if enough functions are defined.
-//
-// OpcodeToken0 is followed by a DWORD that represents the function table
-// identifier and another DWORD (TableLength) that gives the number of
-// functions in the table.
-//
-// This is followed by TableLength DWORDs which are function body indices.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Interface Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_DCL_INTERFACE
-// [11]    1 if the interface is indexed dynamically, 0 otherwise.
-// [23:12] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  If it is extended, then
-//         it contains the actual instruction length in DWORDs, since
-//         it may not fit into 7 bits if enough types are used.
-//
-// OpcodeToken0 is followed by a DWORD that represents the interface
-// identifier. Next is a DWORD that gives the expected function table
-// length. Then another DWORD (OpcodeToken3) with the following layout:
-//
-// [15:00] TableLength, the number of types that implement this interface
-// [31:16] ArrayLength, the number of interfaces that are defined in this array.
-//
-// This is followed by TableLength DWORDs which are function table
-// identifiers, representing possible tables for a given interface.
-//
-// ----------------------------------------------------------------------------
-
-#define D3D11_SB_INTERFACE_INDEXED_BIT_MASK  0x00000800
-#define D3D11_SB_INTERFACE_INDEXED_BIT_SHIFT 11
-
-#define D3D11_SB_INTERFACE_TABLE_LENGTH_MASK  0x0000ffff
-#define D3D11_SB_INTERFACE_TABLE_LENGTH_SHIFT 0
-
-#define D3D11_SB_INTERFACE_ARRAY_LENGTH_MASK  0xffff0000
-#define D3D11_SB_INTERFACE_ARRAY_LENGTH_SHIFT 16
-
-// get/set the indexed bit for an interface definition
-#define DECODE_D3D11_SB_INTERFACE_INDEXED_BIT(OpcodeToken0) ((((OpcodeToken0) & D3D11_SB_INTERFACE_INDEXED_BIT_MASK) >> D3D11_SB_INTERFACE_INDEXED_BIT_SHIFT) ? true : false)
-#define ENCODE_D3D11_SB_INTERFACE_INDEXED_BIT(IndexedBit) (((IndexedBit) << D3D11_SB_INTERFACE_INDEXED_BIT_SHIFT) & D3D11_SB_INTERFACE_INDEXED_BIT_MASK)
-
-// get/set the table length for an interface definition
-#define DECODE_D3D11_SB_INTERFACE_TABLE_LENGTH(OpcodeToken0) ((UINT)(((OpcodeToken0) & D3D11_SB_INTERFACE_TABLE_LENGTH_MASK) >> D3D11_SB_INTERFACE_TABLE_LENGTH_SHIFT))
-#define ENCODE_D3D11_SB_INTERFACE_TABLE_LENGTH(TableLength) (((TableLength) << D3D11_SB_INTERFACE_TABLE_LENGTH_SHIFT) & D3D11_SB_INTERFACE_TABLE_LENGTH_MASK)
-
-// get/set the array length for an interface definition
-#define DECODE_D3D11_SB_INTERFACE_ARRAY_LENGTH(OpcodeToken0) ((UINT)(((OpcodeToken0) & D3D11_SB_INTERFACE_ARRAY_LENGTH_MASK) >> D3D11_SB_INTERFACE_ARRAY_LENGTH_SHIFT))
-#define ENCODE_D3D11_SB_INTERFACE_ARRAY_LENGTH(ArrayLength) (((ArrayLength) << D3D11_SB_INTERFACE_ARRAY_LENGTH_SHIFT) & D3D11_SB_INTERFACE_ARRAY_LENGTH_MASK)
-
-// ----------------------------------------------------------------------------
-// Interface call
-//
-// OpcodeToken0:
-//
-// [10:00] D3D10_SB_OPCODE_INTERFACE_CALL
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  If it is extended, then
-//         it contains the actual instruction length in DWORDs, since
-//         it may not fit into 7 bits if enough types are used.
-//
-// OpcodeToken0 is followed by a DWORD that gives the function index to
-// call in the function table specified for the given interface.
-// Next is the interface operand.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Thread Group Declaration (Compute Shader)
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_THREAD_GROUP
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  If it is extended, then
-//         it contains the actual instruction length in DWORDs, since
-//         it may not fit into 7 bits if enough types are used.
-//
-// OpcodeToken0 is followed by 3 DWORDs, the Thread Group dimensions as UINT32:
-// x, y, z
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Typed Unordered Access View Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED
-// [15:11] D3D10_SB_RESOURCE_DIMENSION
-// [16:16] D3D11_SB_GLOBALLY_COHERENT_ACCESS or 0 (LOCALLY_COHERENT)
-// [23:17] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     u# register (D3D11_SB_OPERAND_TYPE_UNORDERED_ACCESS_VIEW) is being declared.
-// (2) a Resource Return Type token (ResourceReturnTypeToken)
-//
-// ----------------------------------------------------------------------------
-// UAV access scope flags
-#define D3D11_SB_GLOBALLY_COHERENT_ACCESS 0x00010000
-#define D3D11_SB_ACCESS_COHERENCY_MASK    0x00010000
-
-// DECODER MACRO: Retrieve flags for sync instruction from OpcodeToken0.
-#define DECODE_D3D11_SB_ACCESS_COHERENCY_FLAGS(OperandToken0) ((OperandToken0) & D3D11_SB_ACCESS_COHERENCY_MASK)
-
-// ENCODER MACRO: Given a set of sync instruciton flags, encode them in OpcodeToken0.
-#define ENCODE_D3D11_SB_ACCESS_COHERENCY_FLAGS(Flags) ((Flags) & D3D11_SB_ACCESS_COHERENCY_MASK)
-
-
-// ----------------------------------------------------------------------------
-// Raw Unordered Access View Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW
-// [15:11] Ignored, 0
-// [16:16] D3D11_SB_GLOBALLY_COHERENT_ACCESS or 0 (LOCALLY_COHERENT)
-// [23:17] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 1 operand:
-// (1) an operand, starting with OperandToken0, defining which
-//     u# register (D3D11_SB_OPERAND_TYPE_UNORDERED_ACCESS_VIEW) is being declared.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Structured Unordered Access View Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED
-// [15:11] Ignored, 0
-// [16:16] D3D11_SB_GLOBALLY_COHERENT_ACCESS or 0 (LOCALLY_COHERENT)
-// [22:17] Ignored, 0
-// [23:23] D3D11_SB_UAV_HAS_ORDER_PRESERVING_COUNTER or 0
-//
-//            The presence of this flag means that if a UAV is bound to the
-//            corresponding slot, it must have been created with
-//            D3D11_BUFFER_UAV_FLAG_COUNTER at the API.  Also, the shader
-//            can contain either imm_atomic_alloc or _consume instructions
-//            operating on the given UAV.
-//
-//            If this flag is not present, the shader can still contain
-//            either imm_atomic_alloc or imm_atomic_consume instructions for
-//            this UAV.  But if such instructions are present in this case,
-//            and a UAV is bound corresponding slot, it must have been created
-//            with the D3D11_BUFFER_UAV_FLAG_APPEND flag at the API.
-//            Append buffers have a counter as well, but values returned
-//            to the shader are only valid for the lifetime of the shader
-//            invocation.
-//
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     u# register (D3D11_SB_OPERAND_TYPE_UNORDERED_ACCESS_VIEW) is
-//     being declared.
-// (2) a DWORD indicating UINT32 byte stride
-//
-// ----------------------------------------------------------------------------
-// UAV flags
-#define D3D11_SB_UAV_HAS_ORDER_PRESERVING_COUNTER 0x00800000
-#define D3D11_SB_UAV_FLAGS_MASK                   0x00800000
-
-// DECODER MACRO: Retrieve flags about UAV from OpcodeToken0.
-#define DECODE_D3D11_SB_UAV_FLAGS(OperandToken0) ((OperandToken0) & D3D11_SB_UAV_FLAGS_MASK)
-
-// ENCODER MACRO: Given a set of UAV flags, encode them in OpcodeToken0.
-#define ENCODE_D3D11_SB_UAV_FLAGS(Flags) ((Flags) & D3D11_SB_UAV_FLAGS_MASK)
-
-// ----------------------------------------------------------------------------
-// Raw Thread Group Shared Memory Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     g# register (D3D11_SB_OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY) is being declared.
-// (2) a DWORD indicating the element count, # of 32-bit scalars..
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Structured Thread Group Shared Memory Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 3 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     g# register (D3D11_SB_OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY) is
-//     being declared.
-// (2) a DWORD indicating UINT32 struct byte stride
-// (3) a DWORD indicating UINT32 struct count
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Raw Shader Resource View Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_RESOURCE_RAW
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     t# register (D3D10_SB_OPERAND_TYPE_RESOURCE) is being declared.
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Structured Shader Resource View Declaration
-//
-// OpcodeToken0:
-//
-// [10:00] D3D11_SB_OPCODE_DCL_RESOURCE_STRUCTURED
-// [23:11] Ignored, 0
-// [30:24] Instruction length in DWORDs including the opcode token.
-// [31]    0 normally. 1 if extended operand definition, meaning next DWORD
-//         contains extended operand description.  This dcl is currently not
-//         extended.
-//
-// OpcodeToken0 is followed by 2 operands:
-// (1) an operand, starting with OperandToken0, defining which
-//     g# register (D3D10_SB_OPERAND_TYPE_RESOURCE) is
-//     being declared.
-// (2) a DWORD indicating UINT32 struct byte stride
-//
-// ----------------------------------------------------------------------------
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/d3dx12.h b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/d3dx12.h
deleted file mode 100644
index 9143a0c1a3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/d3dx12.h
+++ /dev/null
@@ -1,1585 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-//////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) Microsoft Corporation.  All Rights Reserved.
-//
-//  File:       d3dx12.h
-//  Content:    D3DX12 utility library
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef __D3DX12_H__
-#define __D3DX12_H__
-
-#include "d3d12.h"
-
-#if defined(__cplusplus)
-
-struct CD3DX12_DEFAULT {};
-extern const DECLSPEC_SELECTANY CD3DX12_DEFAULT D3D12_DEFAULT;
-
-//------------------------------------------------------------------------------------------------
-inline bool operator==(const D3D12_VIEWPORT& l, const D3D12_VIEWPORT& r)
-{
-    return l.TopLeftX == r.TopLeftX && l.TopLeftY == r.TopLeftY && l.Width == r.Width &&
-           l.Height == r.Height && l.MinDepth == r.MinDepth && l.MaxDepth == r.MaxDepth;
-}
-
-//------------------------------------------------------------------------------------------------
-inline bool operator!=(const D3D12_VIEWPORT& l, const D3D12_VIEWPORT& r)
-{
-    return !(l == r);
-}
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_RECT
-    : public D3D12_RECT
-{
-    CD3DX12_RECT()
-    {}
-    explicit CD3DX12_RECT(const D3D12_RECT& o)
-        : D3D12_RECT(o)
-    {}
-    explicit CD3DX12_RECT(
-        LONG Left,
-        LONG Top,
-        LONG Right,
-        LONG Bottom)
-    {
-        left = Left;
-        top = Top;
-        right = Right;
-        bottom = Bottom;
-    }
-    ~CD3DX12_RECT() {}
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_BOX
-    : public D3D12_BOX
-{
-    CD3DX12_BOX()
-    {}
-    explicit CD3DX12_BOX(const D3D12_BOX& o)
-        : D3D12_BOX(o)
-    {}
-    explicit CD3DX12_BOX(
-        LONG Left,
-        LONG Right)
-    {
-        left = Left;
-        top = 0;
-        front = 0;
-        right = Right;
-        bottom = 1;
-        back = 1;
-    }
-    explicit CD3DX12_BOX(
-        LONG Left,
-        LONG Top,
-        LONG Right,
-        LONG Bottom)
-    {
-        left = Left;
-        top = Top;
-        front = 0;
-        right = Right;
-        bottom = Bottom;
-        back = 1;
-    }
-    explicit CD3DX12_BOX(
-        LONG Left,
-        LONG Top,
-        LONG Front,
-        LONG Right,
-        LONG Bottom,
-        LONG Back)
-    {
-        left = Left;
-        top = Top;
-        front = Front;
-        right = Right;
-        bottom = Bottom;
-        back = Back;
-    }
-    ~CD3DX12_BOX() {}
-};
-inline bool operator==(const D3D12_BOX& l, const D3D12_BOX& r)
-{
-    return l.left == r.left && l.top == r.top && l.front == r.front &&
-           l.right == r.right && l.bottom == r.bottom && l.back == r.back;
-}
-inline bool operator!=(const D3D12_BOX& l, const D3D12_BOX& r)
-{
-    return !(l == r);
-}
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_DEPTH_STENCIL_DESC
-    : public D3D12_DEPTH_STENCIL_DESC
-{
-    CD3DX12_DEPTH_STENCIL_DESC()
-    {}
-    explicit CD3DX12_DEPTH_STENCIL_DESC(const D3D12_DEPTH_STENCIL_DESC& o)
-        : D3D12_DEPTH_STENCIL_DESC(o)
-    {}
-    explicit CD3DX12_DEPTH_STENCIL_DESC(CD3DX12_DEFAULT)
-    {
-        DepthEnable = TRUE;
-        DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
-        DepthFunc = D3D12_COMPARISON_FUNC_LESS;
-        StencilEnable = FALSE;
-        StencilReadMask = D3D12_DEFAULT_STENCIL_READ_MASK;
-        StencilWriteMask = D3D12_DEFAULT_STENCIL_WRITE_MASK;
-        const D3D12_DEPTH_STENCILOP_DESC defaultStencilOp =
-        { D3D12_STENCIL_OP_KEEP, D3D12_STENCIL_OP_KEEP, D3D12_STENCIL_OP_KEEP, D3D12_COMPARISON_FUNC_ALWAYS };
-        FrontFace = defaultStencilOp;
-        BackFace = defaultStencilOp;
-    }
-    explicit CD3DX12_DEPTH_STENCIL_DESC(
-        BOOL depthEnable,
-        D3D12_DEPTH_WRITE_MASK depthWriteMask,
-        D3D12_COMPARISON_FUNC depthFunc,
-        BOOL stencilEnable,
-        UINT8 stencilReadMask,
-        UINT8 stencilWriteMask,
-        D3D12_STENCIL_OP frontStencilFailOp,
-        D3D12_STENCIL_OP frontStencilDepthFailOp,
-        D3D12_STENCIL_OP frontStencilPassOp,
-        D3D12_COMPARISON_FUNC frontStencilFunc,
-        D3D12_STENCIL_OP backStencilFailOp,
-        D3D12_STENCIL_OP backStencilDepthFailOp,
-        D3D12_STENCIL_OP backStencilPassOp,
-        D3D12_COMPARISON_FUNC backStencilFunc)
-    {
-        DepthEnable = depthEnable;
-        DepthWriteMask = depthWriteMask;
-        DepthFunc = depthFunc;
-        StencilEnable = stencilEnable;
-        StencilReadMask = stencilReadMask;
-        StencilWriteMask = stencilWriteMask;
-        FrontFace.StencilFailOp = frontStencilFailOp;
-        FrontFace.StencilDepthFailOp = frontStencilDepthFailOp;
-        FrontFace.StencilPassOp = frontStencilPassOp;
-        FrontFace.StencilFunc = frontStencilFunc;
-        BackFace.StencilFailOp = backStencilFailOp;
-        BackFace.StencilDepthFailOp = backStencilDepthFailOp;
-        BackFace.StencilPassOp = backStencilPassOp;
-        BackFace.StencilFunc = backStencilFunc;
-    }
-    ~CD3DX12_DEPTH_STENCIL_DESC() {}
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_BLEND_DESC
-    : public D3D12_BLEND_DESC
-{
-    CD3DX12_BLEND_DESC()
-    {}
-    explicit CD3DX12_BLEND_DESC(const D3D12_BLEND_DESC& o)
-        : D3D12_BLEND_DESC(o)
-    {}
-    explicit CD3DX12_BLEND_DESC(CD3DX12_DEFAULT)
-    {
-        AlphaToCoverageEnable = FALSE;
-        IndependentBlendEnable = FALSE;
-        const D3D12_RENDER_TARGET_BLEND_DESC defaultRenderTargetBlendDesc =
-        {
-            FALSE, FALSE,
-            D3D12_BLEND_ONE, D3D12_BLEND_ZERO, D3D12_BLEND_OP_ADD,
-            D3D12_BLEND_ONE, D3D12_BLEND_ZERO, D3D12_BLEND_OP_ADD,
-            D3D12_LOGIC_OP_NOOP,
-            D3D12_COLOR_WRITE_ENABLE_ALL,
-        };
-        for (UINT i = 0; i < D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
-        {
-            RenderTarget[ i ] = defaultRenderTargetBlendDesc;
-        }
-    }
-    ~CD3DX12_BLEND_DESC() {}
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_RASTERIZER_DESC
-    : public D3D12_RASTERIZER_DESC
-{
-    CD3DX12_RASTERIZER_DESC()
-    {}
-    explicit CD3DX12_RASTERIZER_DESC(const D3D12_RASTERIZER_DESC& o)
-        : D3D12_RASTERIZER_DESC(o)
-    {}
-    explicit CD3DX12_RASTERIZER_DESC(CD3DX12_DEFAULT)
-    {
-        FillMode = D3D12_FILL_MODE_SOLID;
-        CullMode = D3D12_CULL_MODE_BACK;
-        FrontCounterClockwise = FALSE;
-        DepthBias = D3D12_DEFAULT_DEPTH_BIAS;
-        DepthBiasClamp = D3D12_DEFAULT_DEPTH_BIAS_CLAMP;
-        SlopeScaledDepthBias = D3D12_DEFAULT_SLOPE_SCALED_DEPTH_BIAS;
-        DepthClipEnable = TRUE;
-        MultisampleEnable = FALSE;
-        AntialiasedLineEnable = FALSE;
-        ForcedSampleCount = 0;
-        ConservativeRaster = D3D12_CONSERVATIVE_RASTERIZATION_MODE_OFF;
-    }
-    explicit CD3DX12_RASTERIZER_DESC(
-        D3D12_FILL_MODE fillMode,
-        D3D12_CULL_MODE cullMode,
-        BOOL frontCounterClockwise,
-        INT depthBias,
-        FLOAT depthBiasClamp,
-        FLOAT slopeScaledDepthBias,
-        BOOL depthClipEnable,
-        BOOL multisampleEnable,
-        BOOL antialiasedLineEnable,
-        UINT forcedSampleCount,
-        D3D12_CONSERVATIVE_RASTERIZATION_MODE conservativeRaster)
-    {
-        FillMode = fillMode;
-        CullMode = cullMode;
-        FrontCounterClockwise = frontCounterClockwise;
-        DepthBias = depthBias;
-        DepthBiasClamp = depthBiasClamp;
-        SlopeScaledDepthBias = slopeScaledDepthBias;
-        DepthClipEnable = depthClipEnable;
-        MultisampleEnable = multisampleEnable;
-        AntialiasedLineEnable = antialiasedLineEnable;
-        ForcedSampleCount = forcedSampleCount;
-        ConservativeRaster = conservativeRaster;
-    }
-    ~CD3DX12_RASTERIZER_DESC() {}
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_RESOURCE_ALLOCATION_INFO
-    : public D3D12_RESOURCE_ALLOCATION_INFO
-{
-    CD3DX12_RESOURCE_ALLOCATION_INFO()
-    {}
-    explicit CD3DX12_RESOURCE_ALLOCATION_INFO(const D3D12_RESOURCE_ALLOCATION_INFO& o)
-        : D3D12_RESOURCE_ALLOCATION_INFO(o)
-    {}
-    CD3DX12_RESOURCE_ALLOCATION_INFO(
-        UINT64 size,
-        UINT64 alignment)
-    {
-        SizeInBytes = size;
-        Alignment = alignment;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_HEAP_PROPERTIES
-    : public D3D12_HEAP_PROPERTIES
-{
-    CD3DX12_HEAP_PROPERTIES()
-    {}
-    explicit CD3DX12_HEAP_PROPERTIES(const D3D12_HEAP_PROPERTIES& o)
-        : D3D12_HEAP_PROPERTIES(o)
-    {}
-    CD3DX12_HEAP_PROPERTIES(
-        D3D12_CPU_PAGE_PROPERTY cpuPageProperty,
-        D3D12_MEMORY_POOL memoryPoolPreference,
-        UINT creationNodeMask = 1,
-        UINT nodeMask = 1)
-    {
-        Type = D3D12_HEAP_TYPE_CUSTOM;
-        CPUPageProperty = cpuPageProperty;
-        MemoryPoolPreference = memoryPoolPreference;
-        CreationNodeMask = creationNodeMask;
-        VisibleNodeMask = nodeMask;
-    }
-    explicit CD3DX12_HEAP_PROPERTIES(
-        D3D12_HEAP_TYPE type,
-        UINT creationNodeMask = 1,
-        UINT nodeMask = 1)
-    {
-        Type = type;
-        CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
-        MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN;
-        CreationNodeMask = creationNodeMask;
-        VisibleNodeMask = nodeMask;
-    }
-    bool IsCPUAccessible() const
-    {
-        return Type == D3D12_HEAP_TYPE_UPLOAD || Type == D3D12_HEAP_TYPE_READBACK || (Type == D3D12_HEAP_TYPE_CUSTOM &&
-                                                                                      (CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE || CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK));
-    }
-};
-inline bool operator==(const D3D12_HEAP_PROPERTIES& l, const D3D12_HEAP_PROPERTIES& r)
-{
-    return l.Type == r.Type && l.CPUPageProperty == r.CPUPageProperty &&
-           l.MemoryPoolPreference == r.MemoryPoolPreference &&
-           l.CreationNodeMask == r.CreationNodeMask &&
-           l.VisibleNodeMask == r.VisibleNodeMask;
-}
-inline bool operator!=(const D3D12_HEAP_PROPERTIES& l, const D3D12_HEAP_PROPERTIES& r)
-{
-    return !(l == r);
-}
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_HEAP_DESC
-    : public D3D12_HEAP_DESC
-{
-    CD3DX12_HEAP_DESC()
-    {}
-    explicit CD3DX12_HEAP_DESC(const D3D12_HEAP_DESC& o)
-        : D3D12_HEAP_DESC(o)
-    {}
-    CD3DX12_HEAP_DESC(
-        UINT64 size,
-        D3D12_HEAP_PROPERTIES properties,
-        UINT64 alignment = 0,
-        D3D12_HEAP_FLAGS flags = D3D12_HEAP_FLAG_NONE)
-    {
-        SizeInBytes = size;
-        Properties = properties;
-        Alignment = alignment;
-        Flags = flags;
-    }
-    CD3DX12_HEAP_DESC(
-        UINT64 size,
-        D3D12_HEAP_TYPE type,
-        UINT64 alignment = 0,
-        D3D12_HEAP_FLAGS flags = D3D12_HEAP_FLAG_NONE)
-    {
-        SizeInBytes = size;
-        Properties = CD3DX12_HEAP_PROPERTIES(type);
-        Alignment = alignment;
-        Flags = flags;
-    }
-    CD3DX12_HEAP_DESC(
-        UINT64 size,
-        D3D12_CPU_PAGE_PROPERTY cpuPageProperty,
-        D3D12_MEMORY_POOL memoryPoolPreference,
-        UINT64 alignment = 0,
-        D3D12_HEAP_FLAGS flags = D3D12_HEAP_FLAG_NONE)
-    {
-        SizeInBytes = size;
-        Properties = CD3DX12_HEAP_PROPERTIES(cpuPageProperty, memoryPoolPreference);
-        Alignment = alignment;
-        Flags = flags;
-    }
-    CD3DX12_HEAP_DESC(
-        const D3D12_RESOURCE_ALLOCATION_INFO& resAllocInfo,
-        D3D12_HEAP_PROPERTIES properties,
-        D3D12_HEAP_FLAGS flags = D3D12_HEAP_FLAG_NONE)
-    {
-        SizeInBytes = resAllocInfo.SizeInBytes;
-        Properties = properties;
-        Alignment = resAllocInfo.Alignment;
-        Flags = flags;
-    }
-    CD3DX12_HEAP_DESC(
-        const D3D12_RESOURCE_ALLOCATION_INFO& resAllocInfo,
-        D3D12_HEAP_TYPE type,
-        D3D12_HEAP_FLAGS flags = D3D12_HEAP_FLAG_NONE)
-    {
-        SizeInBytes = resAllocInfo.SizeInBytes;
-        Properties = CD3DX12_HEAP_PROPERTIES(type);
-        Alignment = resAllocInfo.Alignment;
-        Flags = flags;
-    }
-    CD3DX12_HEAP_DESC(
-        const D3D12_RESOURCE_ALLOCATION_INFO& resAllocInfo,
-        D3D12_CPU_PAGE_PROPERTY cpuPageProperty,
-        D3D12_MEMORY_POOL memoryPoolPreference,
-        D3D12_HEAP_FLAGS flags = D3D12_HEAP_FLAG_NONE)
-    {
-        SizeInBytes = resAllocInfo.SizeInBytes;
-        Properties = CD3DX12_HEAP_PROPERTIES(cpuPageProperty, memoryPoolPreference);
-        Alignment = resAllocInfo.Alignment;
-        Flags = flags;
-    }
-    bool IsCPUAccessible() const
-    {
-        return static_cast< const CD3DX12_HEAP_PROPERTIES* >(&Properties)->IsCPUAccessible();
-    }
-};
-inline bool operator==(const D3D12_HEAP_DESC& l, const D3D12_HEAP_DESC& r)
-{
-    return l.SizeInBytes == r.SizeInBytes &&
-           l.Properties == r.Properties &&
-           l.Alignment == r.Alignment &&
-           l.Flags == r.Flags;
-}
-inline bool operator!=(const D3D12_HEAP_DESC& l, const D3D12_HEAP_DESC& r)
-{
-    return !(l == r);
-}
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_CLEAR_VALUE
-    : public D3D12_CLEAR_VALUE
-{
-    CD3DX12_CLEAR_VALUE()
-    {}
-    explicit CD3DX12_CLEAR_VALUE(const D3D12_CLEAR_VALUE& o)
-        : D3D12_CLEAR_VALUE(o)
-    {}
-    CD3DX12_CLEAR_VALUE(
-        DXGI_FORMAT format,
-        const FLOAT color[4])
-    {
-        Format = format;
-        memcpy(Color, color, sizeof(Color));
-    }
-    CD3DX12_CLEAR_VALUE(
-        DXGI_FORMAT format,
-        FLOAT depth,
-        UINT8 stencil)
-    {
-        Format = format;
-        /* Use memcpy to preserve NAN values */
-        memcpy(&DepthStencil.Depth, &depth, sizeof(depth));
-        DepthStencil.Stencil = stencil;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_RANGE
-    : public D3D12_RANGE
-{
-    CD3DX12_RANGE()
-    {}
-    explicit CD3DX12_RANGE(const D3D12_RANGE& o)
-        : D3D12_RANGE(o)
-    {}
-    CD3DX12_RANGE(
-        SIZE_T begin,
-        SIZE_T end)
-    {
-        Begin = begin;
-        End = end;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_TILED_RESOURCE_COORDINATE
-    : public D3D12_TILED_RESOURCE_COORDINATE
-{
-    CD3DX12_TILED_RESOURCE_COORDINATE()
-    {}
-    explicit CD3DX12_TILED_RESOURCE_COORDINATE(const D3D12_TILED_RESOURCE_COORDINATE& o)
-        : D3D12_TILED_RESOURCE_COORDINATE(o)
-    {}
-    CD3DX12_TILED_RESOURCE_COORDINATE(
-        UINT x,
-        UINT y,
-        UINT z,
-        UINT subresource)
-    {
-        X = x;
-        Y = y;
-        Z = z;
-        Subresource = subresource;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_TILE_REGION_SIZE
-    : public D3D12_TILE_REGION_SIZE
-{
-    CD3DX12_TILE_REGION_SIZE()
-    {}
-    explicit CD3DX12_TILE_REGION_SIZE(const D3D12_TILE_REGION_SIZE& o)
-        : D3D12_TILE_REGION_SIZE(o)
-    {}
-    CD3DX12_TILE_REGION_SIZE(
-        UINT numTiles,
-        BOOL useBox,
-        UINT width,
-        UINT16 height,
-        UINT16 depth)
-    {
-        NumTiles = numTiles;
-        UseBox = useBox;
-        Width = width;
-        Height = height;
-        Depth = depth;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_SUBRESOURCE_TILING
-    : public D3D12_SUBRESOURCE_TILING
-{
-    CD3DX12_SUBRESOURCE_TILING()
-    {}
-    explicit CD3DX12_SUBRESOURCE_TILING(const D3D12_SUBRESOURCE_TILING& o)
-        : D3D12_SUBRESOURCE_TILING(o)
-    {}
-    CD3DX12_SUBRESOURCE_TILING(
-        UINT widthInTiles,
-        UINT16 heightInTiles,
-        UINT16 depthInTiles,
-        UINT startTileIndexInOverallResource)
-    {
-        WidthInTiles = widthInTiles;
-        HeightInTiles = heightInTiles;
-        DepthInTiles = depthInTiles;
-        StartTileIndexInOverallResource = startTileIndexInOverallResource;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_TILE_SHAPE
-    : public D3D12_TILE_SHAPE
-{
-    CD3DX12_TILE_SHAPE()
-    {}
-    explicit CD3DX12_TILE_SHAPE(const D3D12_TILE_SHAPE& o)
-        : D3D12_TILE_SHAPE(o)
-    {}
-    CD3DX12_TILE_SHAPE(
-        UINT widthInTexels,
-        UINT heightInTexels,
-        UINT depthInTexels)
-    {
-        WidthInTexels = widthInTexels;
-        HeightInTexels = heightInTexels;
-        DepthInTexels = depthInTexels;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_RESOURCE_BARRIER
-    : public D3D12_RESOURCE_BARRIER
-{
-    CD3DX12_RESOURCE_BARRIER()
-    {}
-    explicit CD3DX12_RESOURCE_BARRIER(const D3D12_RESOURCE_BARRIER& o)
-        : D3D12_RESOURCE_BARRIER(o)
-    {}
-    static inline CD3DX12_RESOURCE_BARRIER Transition(
-        _In_ ID3D12Resource* pResource,
-        D3D12_RESOURCE_STATES stateBefore,
-        D3D12_RESOURCE_STATES stateAfter,
-        UINT subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES,
-        D3D12_RESOURCE_BARRIER_FLAGS flags = D3D12_RESOURCE_BARRIER_FLAG_NONE)
-    {
-        CD3DX12_RESOURCE_BARRIER result;
-        ZeroMemory(&result, sizeof(result));
-        D3D12_RESOURCE_BARRIER& barrier = result;
-        result.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
-        result.Flags = flags;
-        barrier.Transition.pResource = pResource;
-        barrier.Transition.StateBefore = stateBefore;
-        barrier.Transition.StateAfter = stateAfter;
-        barrier.Transition.Subresource = subresource;
-        return result;
-    }
-    static inline CD3DX12_RESOURCE_BARRIER Aliasing(
-        _In_ ID3D12Resource* pResourceBefore,
-        _In_ ID3D12Resource* pResourceAfter)
-    {
-        CD3DX12_RESOURCE_BARRIER result;
-        ZeroMemory(&result, sizeof(result));
-        D3D12_RESOURCE_BARRIER& barrier = result;
-        result.Type = D3D12_RESOURCE_BARRIER_TYPE_ALIASING;
-        barrier.Aliasing.pResourceBefore = pResourceBefore;
-        barrier.Aliasing.pResourceAfter = pResourceAfter;
-        return result;
-    }
-    static inline CD3DX12_RESOURCE_BARRIER UAV(
-        _In_ ID3D12Resource* pResource)
-    {
-        CD3DX12_RESOURCE_BARRIER result;
-        ZeroMemory(&result, sizeof(result));
-        D3D12_RESOURCE_BARRIER& barrier = result;
-        result.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV;
-        barrier.UAV.pResource = pResource;
-        return result;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_PACKED_MIP_INFO
-    : public D3D12_PACKED_MIP_INFO
-{
-    CD3DX12_PACKED_MIP_INFO()
-    {}
-    explicit CD3DX12_PACKED_MIP_INFO(const D3D12_PACKED_MIP_INFO& o)
-        : D3D12_PACKED_MIP_INFO(o)
-    {}
-    CD3DX12_PACKED_MIP_INFO(
-        UINT8 numStandardMips,
-        UINT8 numPackedMips,
-        UINT numTilesForPackedMips,
-        UINT startTileIndexInOverallResource)
-    {
-        NumStandardMips = numStandardMips;
-        NumPackedMips = numPackedMips;
-        NumTilesForPackedMips = numTilesForPackedMips;
-        StartTileIndexInOverallResource = startTileIndexInOverallResource;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_SUBRESOURCE_FOOTPRINT
-    : public D3D12_SUBRESOURCE_FOOTPRINT
-{
-    CD3DX12_SUBRESOURCE_FOOTPRINT()
-    {}
-    explicit CD3DX12_SUBRESOURCE_FOOTPRINT(const D3D12_SUBRESOURCE_FOOTPRINT& o)
-        : D3D12_SUBRESOURCE_FOOTPRINT(o)
-    {}
-    CD3DX12_SUBRESOURCE_FOOTPRINT(
-        DXGI_FORMAT format,
-        UINT width,
-        UINT height,
-        UINT depth,
-        UINT rowPitch)
-    {
-        Format = format;
-        Width = width;
-        Height = height;
-        Depth = depth;
-        RowPitch = rowPitch;
-    }
-    explicit CD3DX12_SUBRESOURCE_FOOTPRINT(
-        const D3D12_RESOURCE_DESC& resDesc,
-        UINT rowPitch)
-    {
-        Format = resDesc.Format;
-        Width = UINT(resDesc.Width);
-        Height = resDesc.Height;
-        Depth = (resDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? resDesc.DepthOrArraySize : 1);
-        RowPitch = rowPitch;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_TEXTURE_COPY_LOCATION
-    : public D3D12_TEXTURE_COPY_LOCATION
-{
-    CD3DX12_TEXTURE_COPY_LOCATION()
-    {}
-    explicit CD3DX12_TEXTURE_COPY_LOCATION(const D3D12_TEXTURE_COPY_LOCATION& o)
-        : D3D12_TEXTURE_COPY_LOCATION(o)
-    {}
-    CD3DX12_TEXTURE_COPY_LOCATION(ID3D12Resource* pRes)
-    {
-        pResource = pRes;
-    }
-    CD3DX12_TEXTURE_COPY_LOCATION(ID3D12Resource* pRes, D3D12_PLACED_SUBRESOURCE_FOOTPRINT const& Footprint)
-    {
-        pResource = pRes;
-        Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
-        PlacedFootprint = Footprint;
-    }
-    CD3DX12_TEXTURE_COPY_LOCATION(ID3D12Resource* pRes, UINT Sub)
-    {
-        pResource = pRes;
-        Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
-        SubresourceIndex = Sub;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_DESCRIPTOR_RANGE
-    : public D3D12_DESCRIPTOR_RANGE
-{
-    CD3DX12_DESCRIPTOR_RANGE() { }
-    explicit CD3DX12_DESCRIPTOR_RANGE(const D3D12_DESCRIPTOR_RANGE& o)
-        : D3D12_DESCRIPTOR_RANGE(o)
-    {}
-    CD3DX12_DESCRIPTOR_RANGE(
-        D3D12_DESCRIPTOR_RANGE_TYPE rangeType,
-        UINT numDescriptors,
-        UINT baseShaderRegister,
-        UINT registerSpace = 0,
-        UINT offsetInDescriptorsFromTableStart =
-            D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
-    {
-        Init(rangeType, numDescriptors, baseShaderRegister, registerSpace, offsetInDescriptorsFromTableStart);
-    }
-
-    inline void Init(
-        D3D12_DESCRIPTOR_RANGE_TYPE rangeType,
-        UINT numDescriptors,
-        UINT baseShaderRegister,
-        UINT registerSpace = 0,
-        UINT offsetInDescriptorsFromTableStart =
-            D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
-    {
-        Init(*this, rangeType, numDescriptors, baseShaderRegister, registerSpace, offsetInDescriptorsFromTableStart);
-    }
-
-    static inline void Init(
-        _Out_ D3D12_DESCRIPTOR_RANGE& range,
-        D3D12_DESCRIPTOR_RANGE_TYPE rangeType,
-        UINT numDescriptors,
-        UINT baseShaderRegister,
-        UINT registerSpace = 0,
-        UINT offsetInDescriptorsFromTableStart =
-            D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
-    {
-        range.RangeType = rangeType;
-        range.NumDescriptors = numDescriptors;
-        range.BaseShaderRegister = baseShaderRegister;
-        range.RegisterSpace = registerSpace;
-        range.OffsetInDescriptorsFromTableStart = offsetInDescriptorsFromTableStart;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_ROOT_DESCRIPTOR_TABLE
-    : public D3D12_ROOT_DESCRIPTOR_TABLE
-{
-    CD3DX12_ROOT_DESCRIPTOR_TABLE() {}
-    explicit CD3DX12_ROOT_DESCRIPTOR_TABLE(const D3D12_ROOT_DESCRIPTOR_TABLE& o)
-        : D3D12_ROOT_DESCRIPTOR_TABLE(o)
-    {}
-    CD3DX12_ROOT_DESCRIPTOR_TABLE(
-        UINT numDescriptorRanges,
-        _In_reads_opt_(numDescriptorRanges) const D3D12_DESCRIPTOR_RANGE* _pDescriptorRanges)
-    {
-        Init(numDescriptorRanges, _pDescriptorRanges);
-    }
-
-    inline void Init(
-        UINT numDescriptorRanges,
-        _In_reads_opt_(numDescriptorRanges) const D3D12_DESCRIPTOR_RANGE* _pDescriptorRanges)
-    {
-        Init(*this, numDescriptorRanges, _pDescriptorRanges);
-    }
-
-    static inline void Init(
-        _Out_ D3D12_ROOT_DESCRIPTOR_TABLE& rootDescriptorTable,
-        UINT numDescriptorRanges,
-        _In_reads_opt_(numDescriptorRanges) const D3D12_DESCRIPTOR_RANGE* _pDescriptorRanges)
-    {
-        rootDescriptorTable.NumDescriptorRanges = numDescriptorRanges;
-        rootDescriptorTable.pDescriptorRanges = _pDescriptorRanges;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_ROOT_CONSTANTS
-    : public D3D12_ROOT_CONSTANTS
-{
-    CD3DX12_ROOT_CONSTANTS() {}
-    explicit CD3DX12_ROOT_CONSTANTS(const D3D12_ROOT_CONSTANTS& o)
-        : D3D12_ROOT_CONSTANTS(o)
-    {}
-    CD3DX12_ROOT_CONSTANTS(
-        UINT num32BitValues,
-        UINT shaderRegister,
-        UINT registerSpace = 0)
-    {
-        Init(num32BitValues, shaderRegister, registerSpace);
-    }
-
-    inline void Init(
-        UINT num32BitValues,
-        UINT shaderRegister,
-        UINT registerSpace = 0)
-    {
-        Init(*this, num32BitValues, shaderRegister, registerSpace);
-    }
-
-    static inline void Init(
-        _Out_ D3D12_ROOT_CONSTANTS& rootConstants,
-        UINT num32BitValues,
-        UINT shaderRegister,
-        UINT registerSpace = 0)
-    {
-        rootConstants.Num32BitValues = num32BitValues;
-        rootConstants.ShaderRegister = shaderRegister;
-        rootConstants.RegisterSpace = registerSpace;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_ROOT_DESCRIPTOR
-    : public D3D12_ROOT_DESCRIPTOR
-{
-    CD3DX12_ROOT_DESCRIPTOR() {}
-    explicit CD3DX12_ROOT_DESCRIPTOR(const D3D12_ROOT_DESCRIPTOR& o)
-        : D3D12_ROOT_DESCRIPTOR(o)
-    {}
-    CD3DX12_ROOT_DESCRIPTOR(
-        UINT shaderRegister,
-        UINT registerSpace = 0)
-    {
-        Init(shaderRegister, registerSpace);
-    }
-
-    inline void Init(
-        UINT shaderRegister,
-        UINT registerSpace = 0)
-    {
-        Init(*this, shaderRegister, registerSpace);
-    }
-
-    static inline void Init(_Out_ D3D12_ROOT_DESCRIPTOR& table, UINT shaderRegister, UINT registerSpace = 0)
-    {
-        table.ShaderRegister = shaderRegister;
-        table.RegisterSpace = registerSpace;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_ROOT_PARAMETER
-    : public D3D12_ROOT_PARAMETER
-{
-    CD3DX12_ROOT_PARAMETER() {}
-    explicit CD3DX12_ROOT_PARAMETER(const D3D12_ROOT_PARAMETER& o)
-        : D3D12_ROOT_PARAMETER(o)
-    {}
-
-    static inline void InitAsDescriptorTable(
-        _Out_ D3D12_ROOT_PARAMETER& rootParam,
-        UINT numDescriptorRanges,
-        _In_reads_(numDescriptorRanges) const D3D12_DESCRIPTOR_RANGE* pDescriptorRanges,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
-        rootParam.ShaderVisibility = visibility;
-        CD3DX12_ROOT_DESCRIPTOR_TABLE::Init(rootParam.DescriptorTable, numDescriptorRanges, pDescriptorRanges);
-    }
-
-    static inline void InitAsConstants(
-        _Out_ D3D12_ROOT_PARAMETER& rootParam,
-        UINT num32BitValues,
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
-        rootParam.ShaderVisibility = visibility;
-        CD3DX12_ROOT_CONSTANTS::Init(rootParam.Constants, num32BitValues, shaderRegister, registerSpace);
-    }
-
-    static inline void InitAsConstantBufferView(
-        _Out_ D3D12_ROOT_PARAMETER& rootParam,
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
-        rootParam.ShaderVisibility = visibility;
-        CD3DX12_ROOT_DESCRIPTOR::Init(rootParam.Descriptor, shaderRegister, registerSpace);
-    }
-
-    static inline void InitAsShaderResourceView(
-        _Out_ D3D12_ROOT_PARAMETER& rootParam,
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV;
-        rootParam.ShaderVisibility = visibility;
-        CD3DX12_ROOT_DESCRIPTOR::Init(rootParam.Descriptor, shaderRegister, registerSpace);
-    }
-
-    static inline void InitAsUnorderedAccessView(
-        _Out_ D3D12_ROOT_PARAMETER& rootParam,
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
-        rootParam.ShaderVisibility = visibility;
-        CD3DX12_ROOT_DESCRIPTOR::Init(rootParam.Descriptor, shaderRegister, registerSpace);
-    }
-
-    inline void InitAsDescriptorTable(
-        UINT numDescriptorRanges,
-        _In_reads_(numDescriptorRanges) const D3D12_DESCRIPTOR_RANGE* pDescriptorRanges,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        InitAsDescriptorTable(*this, numDescriptorRanges, pDescriptorRanges, visibility);
-    }
-
-    inline void InitAsConstants(
-        UINT num32BitValues,
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        InitAsConstants(*this, num32BitValues, shaderRegister, registerSpace, visibility);
-    }
-
-    inline void InitAsConstantBufferView(
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        InitAsConstantBufferView(*this, shaderRegister, registerSpace, visibility);
-    }
-
-    inline void InitAsShaderResourceView(
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        InitAsShaderResourceView(*this, shaderRegister, registerSpace, visibility);
-    }
-
-    inline void InitAsUnorderedAccessView(
-        UINT shaderRegister,
-        UINT registerSpace = 0,
-        D3D12_SHADER_VISIBILITY visibility = D3D12_SHADER_VISIBILITY_ALL)
-    {
-        InitAsUnorderedAccessView(*this, shaderRegister, registerSpace, visibility);
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_STATIC_SAMPLER_DESC
-    : public D3D12_STATIC_SAMPLER_DESC
-{
-    CD3DX12_STATIC_SAMPLER_DESC() {}
-    explicit CD3DX12_STATIC_SAMPLER_DESC(const D3D12_STATIC_SAMPLER_DESC& o)
-        : D3D12_STATIC_SAMPLER_DESC(o)
-    {}
-    CD3DX12_STATIC_SAMPLER_DESC(
-        UINT shaderRegister,
-        D3D12_FILTER filter = D3D12_FILTER_ANISOTROPIC,
-        D3D12_TEXTURE_ADDRESS_MODE addressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        D3D12_TEXTURE_ADDRESS_MODE addressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        D3D12_TEXTURE_ADDRESS_MODE addressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        FLOAT mipLODBias = 0,
-        UINT maxAnisotropy = 16,
-        D3D12_COMPARISON_FUNC comparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL,
-        D3D12_STATIC_BORDER_COLOR borderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE,
-        FLOAT minLOD = 0.f,
-        FLOAT maxLOD = D3D12_FLOAT32_MAX,
-        D3D12_SHADER_VISIBILITY shaderVisibility = D3D12_SHADER_VISIBILITY_ALL,
-        UINT registerSpace = 0)
-    {
-        Init(
-            shaderRegister,
-            filter,
-            addressU,
-            addressV,
-            addressW,
-            mipLODBias,
-            maxAnisotropy,
-            comparisonFunc,
-            borderColor,
-            minLOD,
-            maxLOD,
-            shaderVisibility,
-            registerSpace);
-    }
-
-    static inline void Init(
-        _Out_ D3D12_STATIC_SAMPLER_DESC& samplerDesc,
-        UINT shaderRegister,
-        D3D12_FILTER filter = D3D12_FILTER_ANISOTROPIC,
-        D3D12_TEXTURE_ADDRESS_MODE addressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        D3D12_TEXTURE_ADDRESS_MODE addressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        D3D12_TEXTURE_ADDRESS_MODE addressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        FLOAT mipLODBias = 0,
-        UINT maxAnisotropy = 16,
-        D3D12_COMPARISON_FUNC comparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL,
-        D3D12_STATIC_BORDER_COLOR borderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE,
-        FLOAT minLOD = 0.f,
-        FLOAT maxLOD = D3D12_FLOAT32_MAX,
-        D3D12_SHADER_VISIBILITY shaderVisibility = D3D12_SHADER_VISIBILITY_ALL,
-        UINT registerSpace = 0)
-    {
-        samplerDesc.ShaderRegister = shaderRegister;
-        samplerDesc.Filter = filter;
-        samplerDesc.AddressU = addressU;
-        samplerDesc.AddressV = addressV;
-        samplerDesc.AddressW = addressW;
-        samplerDesc.MipLODBias = mipLODBias;
-        samplerDesc.MaxAnisotropy = maxAnisotropy;
-        samplerDesc.ComparisonFunc = comparisonFunc;
-        samplerDesc.BorderColor = borderColor;
-        samplerDesc.MinLOD = minLOD;
-        samplerDesc.MaxLOD = maxLOD;
-        samplerDesc.ShaderVisibility = shaderVisibility;
-        samplerDesc.RegisterSpace = registerSpace;
-    }
-    inline void Init(
-        UINT shaderRegister,
-        D3D12_FILTER filter = D3D12_FILTER_ANISOTROPIC,
-        D3D12_TEXTURE_ADDRESS_MODE addressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        D3D12_TEXTURE_ADDRESS_MODE addressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        D3D12_TEXTURE_ADDRESS_MODE addressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-        FLOAT mipLODBias = 0,
-        UINT maxAnisotropy = 16,
-        D3D12_COMPARISON_FUNC comparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL,
-        D3D12_STATIC_BORDER_COLOR borderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE,
-        FLOAT minLOD = 0.f,
-        FLOAT maxLOD = D3D12_FLOAT32_MAX,
-        D3D12_SHADER_VISIBILITY shaderVisibility = D3D12_SHADER_VISIBILITY_ALL,
-        UINT registerSpace = 0)
-    {
-        Init(
-            *this,
-            shaderRegister,
-            filter,
-            addressU,
-            addressV,
-            addressW,
-            mipLODBias,
-            maxAnisotropy,
-            comparisonFunc,
-            borderColor,
-            minLOD,
-            maxLOD,
-            shaderVisibility,
-            registerSpace);
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_ROOT_SIGNATURE_DESC
-    : public D3D12_ROOT_SIGNATURE_DESC
-{
-    CD3DX12_ROOT_SIGNATURE_DESC() {}
-    explicit CD3DX12_ROOT_SIGNATURE_DESC(const D3D12_ROOT_SIGNATURE_DESC& o)
-        : D3D12_ROOT_SIGNATURE_DESC(o)
-    {}
-    CD3DX12_ROOT_SIGNATURE_DESC(
-        UINT numParameters,
-        _In_reads_opt_(numParameters) const D3D12_ROOT_PARAMETER* _pParameters,
-        UINT numStaticSamplers = 0,
-        _In_reads_opt_(numStaticSamplers) const D3D12_STATIC_SAMPLER_DESC* _pStaticSamplers = NULL,
-        D3D12_ROOT_SIGNATURE_FLAGS flags = D3D12_ROOT_SIGNATURE_FLAG_NONE)
-    {
-        Init(numParameters, _pParameters, numStaticSamplers, _pStaticSamplers, flags);
-    }
-    CD3DX12_ROOT_SIGNATURE_DESC(CD3DX12_DEFAULT)
-    {
-        Init(0, NULL, 0, NULL, D3D12_ROOT_SIGNATURE_FLAG_NONE);
-    }
-
-    inline void Init(
-        UINT numParameters,
-        _In_reads_opt_(numParameters) const D3D12_ROOT_PARAMETER* _pParameters,
-        UINT numStaticSamplers = 0,
-        _In_reads_opt_(numStaticSamplers) const D3D12_STATIC_SAMPLER_DESC* _pStaticSamplers = NULL,
-        D3D12_ROOT_SIGNATURE_FLAGS flags = D3D12_ROOT_SIGNATURE_FLAG_NONE)
-    {
-        Init(*this, numParameters, _pParameters, numStaticSamplers, _pStaticSamplers, flags);
-    }
-
-    static inline void Init(
-        _Out_ D3D12_ROOT_SIGNATURE_DESC& desc,
-        UINT numParameters,
-        _In_reads_opt_(numParameters) const D3D12_ROOT_PARAMETER* _pParameters,
-        UINT numStaticSamplers = 0,
-        _In_reads_opt_(numStaticSamplers) const D3D12_STATIC_SAMPLER_DESC* _pStaticSamplers = NULL,
-        D3D12_ROOT_SIGNATURE_FLAGS flags = D3D12_ROOT_SIGNATURE_FLAG_NONE)
-    {
-        desc.NumParameters = numParameters;
-        desc.pParameters = _pParameters;
-        desc.NumStaticSamplers = numStaticSamplers;
-        desc.pStaticSamplers = _pStaticSamplers;
-        desc.Flags = flags;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_CPU_DESCRIPTOR_HANDLE
-    : public D3D12_CPU_DESCRIPTOR_HANDLE
-{
-    CD3DX12_CPU_DESCRIPTOR_HANDLE() {}
-    explicit CD3DX12_CPU_DESCRIPTOR_HANDLE(const D3D12_CPU_DESCRIPTOR_HANDLE& o)
-        : D3D12_CPU_DESCRIPTOR_HANDLE(o)
-    {}
-    CD3DX12_CPU_DESCRIPTOR_HANDLE(CD3DX12_DEFAULT)
-    {
-        ptr = 0;
-    }
-    CD3DX12_CPU_DESCRIPTOR_HANDLE(_In_ const D3D12_CPU_DESCRIPTOR_HANDLE& other, INT offsetScaledByIncrementSize)
-    {
-        InitOffsetted(other, offsetScaledByIncrementSize);
-    }
-    CD3DX12_CPU_DESCRIPTOR_HANDLE(_In_ const D3D12_CPU_DESCRIPTOR_HANDLE& other, INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        InitOffsetted(other, offsetInDescriptors, descriptorIncrementSize);
-    }
-    CD3DX12_CPU_DESCRIPTOR_HANDLE& Offset(INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        ptr += offsetInDescriptors * descriptorIncrementSize;
-        return *this;
-    }
-    CD3DX12_CPU_DESCRIPTOR_HANDLE& Offset(INT offsetScaledByIncrementSize)
-    {
-        ptr += offsetScaledByIncrementSize;
-        return *this;
-    }
-    bool operator==(_In_ const D3D12_CPU_DESCRIPTOR_HANDLE& other)
-    {
-        return (ptr == other.ptr);
-    }
-    bool operator!=(_In_ const D3D12_CPU_DESCRIPTOR_HANDLE& other)
-    {
-        return (ptr != other.ptr);
-    }
-    CD3DX12_CPU_DESCRIPTOR_HANDLE& operator=(const D3D12_CPU_DESCRIPTOR_HANDLE& other)
-    {
-        ptr = other.ptr;
-        return *this;
-    }
-
-    inline void InitOffsetted(_In_ const D3D12_CPU_DESCRIPTOR_HANDLE& base, INT offsetScaledByIncrementSize)
-    {
-        InitOffsetted(*this, base, offsetScaledByIncrementSize);
-    }
-
-    inline void InitOffsetted(_In_ const D3D12_CPU_DESCRIPTOR_HANDLE& base, INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        InitOffsetted(*this, base, offsetInDescriptors, descriptorIncrementSize);
-    }
-
-    static inline void InitOffsetted(_Out_ D3D12_CPU_DESCRIPTOR_HANDLE& handle, _In_ const D3D12_CPU_DESCRIPTOR_HANDLE& base, INT offsetScaledByIncrementSize)
-    {
-        handle.ptr = base.ptr + offsetScaledByIncrementSize;
-    }
-
-    static inline void InitOffsetted(_Out_ D3D12_CPU_DESCRIPTOR_HANDLE& handle, _In_ const D3D12_CPU_DESCRIPTOR_HANDLE& base, INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        handle.ptr = base.ptr + offsetInDescriptors * descriptorIncrementSize;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_GPU_DESCRIPTOR_HANDLE
-    : public D3D12_GPU_DESCRIPTOR_HANDLE
-{
-    CD3DX12_GPU_DESCRIPTOR_HANDLE() {}
-    explicit CD3DX12_GPU_DESCRIPTOR_HANDLE(const D3D12_GPU_DESCRIPTOR_HANDLE& o)
-        : D3D12_GPU_DESCRIPTOR_HANDLE(o)
-    {}
-    CD3DX12_GPU_DESCRIPTOR_HANDLE(CD3DX12_DEFAULT)
-    {
-        ptr = 0;
-    }
-    CD3DX12_GPU_DESCRIPTOR_HANDLE(_In_ const D3D12_GPU_DESCRIPTOR_HANDLE& other, INT offsetScaledByIncrementSize)
-    {
-        InitOffsetted(other, offsetScaledByIncrementSize);
-    }
-    CD3DX12_GPU_DESCRIPTOR_HANDLE(_In_ const D3D12_GPU_DESCRIPTOR_HANDLE& other, INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        InitOffsetted(other, offsetInDescriptors, descriptorIncrementSize);
-    }
-    CD3DX12_GPU_DESCRIPTOR_HANDLE& Offset(INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        ptr += offsetInDescriptors * descriptorIncrementSize;
-        return *this;
-    }
-    CD3DX12_GPU_DESCRIPTOR_HANDLE& Offset(INT offsetScaledByIncrementSize)
-    {
-        ptr += offsetScaledByIncrementSize;
-        return *this;
-    }
-    inline bool operator==(_In_ const D3D12_GPU_DESCRIPTOR_HANDLE& other)
-    {
-        return (ptr == other.ptr);
-    }
-    inline bool operator!=(_In_ const D3D12_GPU_DESCRIPTOR_HANDLE& other)
-    {
-        return (ptr != other.ptr);
-    }
-    CD3DX12_GPU_DESCRIPTOR_HANDLE& operator=(const D3D12_GPU_DESCRIPTOR_HANDLE& other)
-    {
-        ptr = other.ptr;
-        return *this;
-    }
-
-    inline void InitOffsetted(_In_ const D3D12_GPU_DESCRIPTOR_HANDLE& base, INT offsetScaledByIncrementSize)
-    {
-        InitOffsetted(*this, base, offsetScaledByIncrementSize);
-    }
-
-    inline void InitOffsetted(_In_ const D3D12_GPU_DESCRIPTOR_HANDLE& base, INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        InitOffsetted(*this, base, offsetInDescriptors, descriptorIncrementSize);
-    }
-
-    static inline void InitOffsetted(_Out_ D3D12_GPU_DESCRIPTOR_HANDLE& handle, _In_ const D3D12_GPU_DESCRIPTOR_HANDLE& base, INT offsetScaledByIncrementSize)
-    {
-        handle.ptr = base.ptr + offsetScaledByIncrementSize;
-    }
-
-    static inline void InitOffsetted(_Out_ D3D12_GPU_DESCRIPTOR_HANDLE& handle, _In_ const D3D12_GPU_DESCRIPTOR_HANDLE& base, INT offsetInDescriptors, UINT descriptorIncrementSize)
-    {
-        handle.ptr = base.ptr + offsetInDescriptors * descriptorIncrementSize;
-    }
-};
-
-//------------------------------------------------------------------------------------------------
-inline UINT D3D12CalcSubresource(UINT MipSlice, UINT ArraySlice, UINT PlaneSlice, UINT MipLevels, UINT ArraySize)
-{
-    return MipSlice + ArraySlice * MipLevels + PlaneSlice * MipLevels * ArraySize;
-}
-
-//------------------------------------------------------------------------------------------------
-template <typename T, typename U, typename V>
-inline void D3D12DecomposeSubresource(UINT Subresource, UINT MipLevels, UINT ArraySize, _Out_ T& MipSlice, _Out_ U& ArraySlice, _Out_ V& PlaneSlice)
-{
-    MipSlice = static_cast<T>(Subresource % MipLevels);
-    ArraySlice = static_cast<U>((Subresource / MipLevels) % ArraySize);
-    PlaneSlice = static_cast<V>(Subresource / (MipLevels * ArraySize));
-}
-
-//------------------------------------------------------------------------------------------------
-inline UINT8 D3D12GetFormatPlaneCount(
-    _In_ ID3D12Device* pDevice,
-    DXGI_FORMAT Format
-    )
-{
-    D3D12_FEATURE_DATA_FORMAT_INFO formatInfo = {Format};
-    if (FAILED(pDevice->CheckFeatureSupport(D3D12_FEATURE_FORMAT_INFO, &formatInfo, sizeof(formatInfo))))
-    {
-        return 0;
-    }
-    return formatInfo.PlaneCount;
-}
-
-//------------------------------------------------------------------------------------------------
-struct CD3DX12_RESOURCE_DESC
-    : public D3D12_RESOURCE_DESC
-{
-    CD3DX12_RESOURCE_DESC()
-    {}
-    explicit CD3DX12_RESOURCE_DESC(const D3D12_RESOURCE_DESC& o)
-        : D3D12_RESOURCE_DESC(o)
-    {}
-    CD3DX12_RESOURCE_DESC(
-        D3D12_RESOURCE_DIMENSION dimension,
-        UINT64 alignment,
-        UINT64 width,
-        UINT height,
-        UINT16 depthOrArraySize,
-        UINT16 mipLevels,
-        DXGI_FORMAT format,
-        UINT sampleCount,
-        UINT sampleQuality,
-        D3D12_TEXTURE_LAYOUT layout,
-        D3D12_RESOURCE_FLAGS flags)
-    {
-        Dimension = dimension;
-        Alignment = alignment;
-        Width = width;
-        Height = height;
-        DepthOrArraySize = depthOrArraySize;
-        MipLevels = mipLevels;
-        Format = format;
-        SampleDesc.Count = sampleCount;
-        SampleDesc.Quality = sampleQuality;
-        Layout = layout;
-        Flags = flags;
-    }
-    static inline CD3DX12_RESOURCE_DESC Buffer(
-        const D3D12_RESOURCE_ALLOCATION_INFO& resAllocInfo,
-        D3D12_RESOURCE_FLAGS flags = D3D12_RESOURCE_FLAG_NONE)
-    {
-        return CD3DX12_RESOURCE_DESC(D3D12_RESOURCE_DIMENSION_BUFFER, resAllocInfo.Alignment, resAllocInfo.SizeInBytes,
-            1, 1, 1, DXGI_FORMAT_UNKNOWN, 1, 0, D3D12_TEXTURE_LAYOUT_ROW_MAJOR, flags);
-    }
-    static inline CD3DX12_RESOURCE_DESC Buffer(
-        UINT64 width,
-        D3D12_RESOURCE_FLAGS flags = D3D12_RESOURCE_FLAG_NONE,
-        UINT64 alignment = 0)
-    {
-        return CD3DX12_RESOURCE_DESC(D3D12_RESOURCE_DIMENSION_BUFFER, alignment, width, 1, 1, 1,
-            DXGI_FORMAT_UNKNOWN, 1, 0, D3D12_TEXTURE_LAYOUT_ROW_MAJOR, flags);
-    }
-    static inline CD3DX12_RESOURCE_DESC Tex1D(
-        DXGI_FORMAT format,
-        UINT64 width,
-        UINT16 arraySize = 1,
-        UINT16 mipLevels = 0,
-        D3D12_RESOURCE_FLAGS flags = D3D12_RESOURCE_FLAG_NONE,
-        D3D12_TEXTURE_LAYOUT layout = D3D12_TEXTURE_LAYOUT_UNKNOWN,
-        UINT64 alignment = 0)
-    {
-        return CD3DX12_RESOURCE_DESC(D3D12_RESOURCE_DIMENSION_TEXTURE1D, alignment, width, 1, arraySize,
-            mipLevels, format, 1, 0, layout, flags);
-    }
-    static inline CD3DX12_RESOURCE_DESC Tex2D(
-        DXGI_FORMAT format,
-        UINT64 width,
-        UINT height,
-        UINT16 arraySize = 1,
-        UINT16 mipLevels = 0,
-        UINT sampleCount = 1,
-        UINT sampleQuality = 0,
-        D3D12_RESOURCE_FLAGS flags = D3D12_RESOURCE_FLAG_NONE,
-        D3D12_TEXTURE_LAYOUT layout = D3D12_TEXTURE_LAYOUT_UNKNOWN,
-        UINT64 alignment = 0)
-    {
-        return CD3DX12_RESOURCE_DESC(D3D12_RESOURCE_DIMENSION_TEXTURE2D, alignment, width, height, arraySize,
-            mipLevels, format, sampleCount, sampleQuality, layout, flags);
-    }
-    static inline CD3DX12_RESOURCE_DESC Tex3D(
-        DXGI_FORMAT format,
-        UINT64 width,
-        UINT height,
-        UINT16 depth,
-        UINT16 mipLevels = 0,
-        D3D12_RESOURCE_FLAGS flags = D3D12_RESOURCE_FLAG_NONE,
-        D3D12_TEXTURE_LAYOUT layout = D3D12_TEXTURE_LAYOUT_UNKNOWN,
-        UINT64 alignment = 0)
-    {
-        return CD3DX12_RESOURCE_DESC(D3D12_RESOURCE_DIMENSION_TEXTURE3D, alignment, width, height, depth,
-            mipLevels, format, 1, 0, layout, flags);
-    }
-    inline UINT16 Depth() const
-    {
-        return (Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? DepthOrArraySize : 1);
-    }
-    inline UINT16 ArraySize() const
-    {
-        return (Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? DepthOrArraySize : 1);
-    }
-    inline UINT8 PlaneCount(_In_ ID3D12Device* pDevice) const
-    {
-        return D3D12GetFormatPlaneCount(pDevice, Format);
-    }
-    inline UINT Subresources(_In_ ID3D12Device* pDevice) const
-    {
-        return MipLevels * ArraySize() * PlaneCount(pDevice);
-    }
-    inline UINT CalcSubresource(UINT MipSlice, UINT ArraySlice, UINT PlaneSlice)
-    {
-        return D3D12CalcSubresource(MipSlice, ArraySlice, PlaneSlice, MipLevels, ArraySize());
-    }
-};
-inline bool operator==(const D3D12_RESOURCE_DESC& l, const D3D12_RESOURCE_DESC& r)
-{
-    return l.Dimension == r.Dimension &&
-           l.Alignment == r.Alignment &&
-           l.Width == r.Width &&
-           l.Height == r.Height &&
-           l.DepthOrArraySize == r.DepthOrArraySize &&
-           l.MipLevels == r.MipLevels &&
-           l.Format == r.Format &&
-           l.SampleDesc.Count == r.SampleDesc.Count &&
-           l.SampleDesc.Quality == r.SampleDesc.Quality &&
-           l.Layout == r.Layout &&
-           l.Flags == r.Flags;
-}
-inline bool operator!=(const D3D12_RESOURCE_DESC& l, const D3D12_RESOURCE_DESC& r)
-{
-    return !(l == r);
-}
-
-//------------------------------------------------------------------------------------------------
-// Row-by-row memcpy
-inline void MemcpySubresource(
-    _In_ const D3D12_MEMCPY_DEST* pDest,
-    _In_ const D3D12_SUBRESOURCE_DATA* pSrc,
-    [[maybe_unused]] SIZE_T RowSizeInBytes,
-    UINT NumRows,
-    UINT NumSlices)
-{
-    for (UINT z = 0; z < NumSlices; ++z)
-    {
-        BYTE* pDestSlice = reinterpret_cast<BYTE*>(pDest->pData) + pDest->SlicePitch * z;
-        const BYTE* pSrcSlice = reinterpret_cast<const BYTE*>(pSrc->pData) + pSrc->SlicePitch * z;
-        for (UINT y = 0; y < NumRows; ++y)
-        {
-            // CryDX12 Integrate: Replace last parameter RowSizeInBytes with RowPitch, RowSizeInBytes is Dest memory pitch, RowPitch is Src memory pitch,
-            // Copying with RowSizeInBytes would have read beyond the memory boundary and wasted bandwidth.
-            memcpy(pDestSlice + pDest->RowPitch * y,
-                pSrcSlice + pSrc->RowPitch * y,
-                pSrc->RowPitch); 
-        }
-    }
-}
-
-//------------------------------------------------------------------------------------------------
-// Returns required size of a buffer to be used for data upload
-inline UINT64 GetRequiredIntermediateSize(
-    _In_ ID3D12Resource* pDestinationResource,
-    _In_range_(0, D3D12_REQ_SUBRESOURCES) UINT FirstSubresource,
-    _In_range_(0, D3D12_REQ_SUBRESOURCES - FirstSubresource) UINT NumSubresources)
-{
-    D3D12_RESOURCE_DESC Desc = pDestinationResource->GetDesc();
-    UINT64 RequiredSize = 0;
-
-    ID3D12Device* pDevice;
-    pDestinationResource->GetDevice(__uuidof(ID3D12Device), reinterpret_cast<void**>(&pDevice));
-    pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, 0, nullptr, nullptr, nullptr, &RequiredSize);
-    pDevice->Release();
-
-    return RequiredSize;
-}
-
-//------------------------------------------------------------------------------------------------
-// All arrays must be populated (e.g. by calling GetCopyableFootprints)
-inline UINT64 UpdateSubresources(
-    _In_ ID3D12GraphicsCommandList* pCmdList,
-    _In_ ID3D12Resource* pDestinationResource,
-    _In_ ID3D12Resource* pIntermediate,
-    _In_range_(0, D3D12_REQ_SUBRESOURCES) UINT FirstSubresource,
-    _In_range_(0, D3D12_REQ_SUBRESOURCES - FirstSubresource) UINT NumSubresources,
-    UINT64 RequiredSize,
-    _In_reads_(NumSubresources) const D3D12_PLACED_SUBRESOURCE_FOOTPRINT* pLayouts,
-    _In_reads_(NumSubresources) const UINT* pNumRows,
-    _In_reads_(NumSubresources) const UINT64* pRowSizesInBytes,
-    _In_reads_(NumSubresources) const D3D12_SUBRESOURCE_DATA* pSrcData,
-    _In_ const D3D12_BOX* pDstBox)
-{
-    // Minor validation
-    D3D12_RESOURCE_DESC IntermediateDesc = pIntermediate->GetDesc();
-    D3D12_RESOURCE_DESC DestinationDesc = pDestinationResource->GetDesc();
-    if (IntermediateDesc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER ||
-        IntermediateDesc.Width < RequiredSize + pLayouts[0].Offset ||
-        RequiredSize > (SIZE_T) -1 ||
-        (DestinationDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
-         (FirstSubresource != 0 || NumSubresources != 1)))
-    {
-        return 0;
-    }
-
-    BYTE* pData;
-    HRESULT hr = pIntermediate->Map(0, NULL, reinterpret_cast<void**>(&pData));
-    if (FAILED(hr))
-    {
-        return 0;
-    }
-
-    for (UINT i = 0; i < NumSubresources; ++i)
-    {
-        if (pRowSizesInBytes[i] > (SIZE_T) -1)
-        {
-            return 0;
-        }
-        D3D12_MEMCPY_DEST DestData = { pData + pLayouts[i].Offset, pLayouts[i].Footprint.RowPitch, pLayouts[i].Footprint.RowPitch * pNumRows[i] };
-        MemcpySubresource(&DestData, &pSrcData[i], (SIZE_T)pRowSizesInBytes[i], pNumRows[i], pLayouts[i].Footprint.Depth);
-    }
-    pIntermediate->Unmap(0, NULL);
-
-    if (DestinationDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
-    {
-        CD3DX12_BOX SrcBox(UINT(pLayouts[0].Offset), UINT(pLayouts[0].Offset + pLayouts[0].Footprint.Width));
-        pCmdList->CopyBufferRegion(pDestinationResource, 0, pIntermediate, pLayouts[0].Offset, pLayouts[0].Footprint.Width);
-    }
-    else if (pDstBox)
-    {
-        CD3DX12_TEXTURE_COPY_LOCATION Dst(pDestinationResource, FirstSubresource);
-        CD3DX12_TEXTURE_COPY_LOCATION Src(pIntermediate, pLayouts[0]);
-        pCmdList->CopyTextureRegion(&Dst, pDstBox->left, pDstBox->top, pDstBox->front, &Src, nullptr);
-    }
-    else
-    {
-        for (UINT i = 0; i < NumSubresources; ++i)
-        {
-            CD3DX12_TEXTURE_COPY_LOCATION Dst(pDestinationResource, i + FirstSubresource);
-            CD3DX12_TEXTURE_COPY_LOCATION Src(pIntermediate, pLayouts[i]);
-            pCmdList->CopyTextureRegion(&Dst, 0, 0, 0, &Src, nullptr);
-        }
-    }
-    return RequiredSize;
-}
-
-//------------------------------------------------------------------------------------------------
-// Heap-allocating UpdateSubresources implementation
-inline UINT64 UpdateSubresources(
-    _In_ ID3D12GraphicsCommandList* pCmdList,
-    _In_ ID3D12Resource* pDestinationResource,
-    _In_ ID3D12Resource* pIntermediate,
-    UINT64 IntermediateOffset,
-    _In_range_(0, D3D12_REQ_SUBRESOURCES) UINT FirstSubresource,
-    _In_range_(0, D3D12_REQ_SUBRESOURCES - FirstSubresource) UINT NumSubresources,
-    _In_reads_(NumSubresources) D3D12_SUBRESOURCE_DATA* pSrcData,
-    _In_ const D3D12_BOX* pDstBox)
-{
-    UINT64 RequiredSize = 0;
-    UINT64 MemToAlloc = static_cast<UINT64>(sizeof(D3D12_PLACED_SUBRESOURCE_FOOTPRINT) + sizeof(UINT) + sizeof(UINT64)) * NumSubresources;
-    if (MemToAlloc > SIZE_MAX)
-    {
-        return 0;
-    }
-    void* pMem = HeapAlloc(GetProcessHeap(), 0, static_cast<SIZE_T>(MemToAlloc));
-    if (pMem == NULL)
-    {
-        return 0;
-    }
-    D3D12_PLACED_SUBRESOURCE_FOOTPRINT* pLayouts = reinterpret_cast<D3D12_PLACED_SUBRESOURCE_FOOTPRINT*>(pMem);
-    UINT64* pRowSizesInBytes = reinterpret_cast<UINT64*>(pLayouts + NumSubresources);
-    UINT* pNumRows = reinterpret_cast<UINT*>(pRowSizesInBytes + NumSubresources);
-
-    D3D12_RESOURCE_DESC Desc = pDestinationResource->GetDesc();
-    ID3D12Device* pDevice;
-    pDestinationResource->GetDevice(__uuidof(ID3D12Device), reinterpret_cast<void**>(&pDevice));
-    pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);
-    pDevice->Release();
-
-    UINT64 Result = UpdateSubresources(pCmdList, pDestinationResource, pIntermediate, FirstSubresource, NumSubresources, RequiredSize, pLayouts, pNumRows, pRowSizesInBytes, pSrcData, pDstBox);
-    HeapFree(GetProcessHeap(), 0, pMem);
-    return Result;
-}
-
-//------------------------------------------------------------------------------------------------
-// Stack-allocating UpdateSubresources implementation
-template <UINT MaxSubresources>
-inline UINT64 UpdateSubresources(
-    _In_ ID3D12GraphicsCommandList* pCmdList,
-    _In_ ID3D12Resource* pDestinationResource,
-    _In_ ID3D12Resource* pIntermediate,
-    UINT64 IntermediateOffset,
-    _In_range_(0, MaxSubresources) UINT FirstSubresource,
-    _In_range_(1, MaxSubresources - FirstSubresource) UINT NumSubresources,
-    _In_reads_(NumSubresources) D3D12_SUBRESOURCE_DATA* pSrcData,
-    _In_ const D3D12_BOX* pDstBox)
-{
-    UINT64 RequiredSize = 0;
-    D3D12_PLACED_SUBRESOURCE_FOOTPRINT Layouts[MaxSubresources];
-    UINT NumRows[MaxSubresources];
-    UINT64 RowSizesInBytes[MaxSubresources];
-
-    D3D12_RESOURCE_DESC Desc = pDestinationResource->GetDesc();
-
-    if (pDstBox)
-    {
-        Desc.Width = pDstBox->right - pDstBox->left;
-        Desc.Height = pDstBox->bottom - pDstBox->top;
-        Desc.DepthOrArraySize = pDstBox->back - pDstBox->front;
-    }
-
-    ID3D12Device* pDevice;
-    pDestinationResource->GetDevice(__uuidof(ID3D12Device), reinterpret_cast<void**>(&pDevice));
-    pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, Layouts, NumRows, RowSizesInBytes, &RequiredSize);
-    pDevice->Release();
-
-    return UpdateSubresources(pCmdList, pDestinationResource, pIntermediate, FirstSubresource, NumSubresources, RequiredSize, Layouts, NumRows, RowSizesInBytes, pSrcData, pDstBox);
-}
-
-//------------------------------------------------------------------------------------------------
-inline bool D3D12IsLayoutOpaque(D3D12_TEXTURE_LAYOUT Layout)
-{
-    return Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN || Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE;
-}
-
-//------------------------------------------------------------------------------------------------
-inline ID3D12CommandList* const* CommandListCast(ID3D12GraphicsCommandList* const* pp)
-{
-    // This cast is useful for passing strongly typed command list pointers into
-    // ExecuteCommandLists.
-    // This cast is valid as long as the const-ness is respected. D3D12 APIs do
-    // respect the const-ness of their arguments.
-    return reinterpret_cast<ID3D12CommandList* const*>(pp);
-}
-
-
-#endif // defined( __cplusplus )
-
-#endif //__D3DX12_H__
-
-
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/fasthash.h b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/fasthash.h
deleted file mode 100644
index 418a0b3044..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/fasthash.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-/* The MIT License
-
-   Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the "Software"), to deal in the Software without
-   restriction, including without limitation the rights to use, copy,
-   modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
-
-#ifndef _FASTHASH_H
-#define _FASTHASH_H
-
-#include <stdint.h>
-#include <stdio.h>
-
-namespace fasthash
-{
-    /**
-     * fasthash32 - 32-bit implementation of fasthash
-     * @buf:  data buffer
-     * @len:  data size
-     * @seed: the seed
-     */
-    template<size_t len>
-    inline uint32_t fasthash32(const void* buf, uint32_t seed);
-
-    /**
-     * fasthash64 - 64-bit implementation of fasthash
-     * @buf:  data buffer
-     * @len:  data size
-     * @seed: the seed
-     */
-    template<size_t len>
-    inline uint64_t fasthash64(const void* buf, uint32_t seed);
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/fasthash.inl b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/fasthash.inl
deleted file mode 100644
index 05832aaf09..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Includes/fasthash.inl
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-/* The MIT License
-
-   Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the "Software"), to deal in the Software without
-   restriction, including without limitation the rights to use, copy,
-   modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
-
-#include "fasthash.h"
-
-namespace fasthash
-{
-    // Compression function for Merkle-Damgard construction.
-    // This function is generated using the framework provided.
-    ILINE uint64_t MerkleDamgard(uint64_t& h)
-    {
-        (h) ^= (h) >> 23;
-        (h) *= 0x2127599bf4325c37ULL;
-        (h) ^= (h) >> 47;
-
-        return h;
-    }
-
-    template<size_t len>
-    ILINE uint64_t fasthash64(const void* buf, uint32_t seed)
-    {
-        const uint64_t    m = 0x880355f21e6d1965ULL;
-        const uint64_t* pos = (const uint64_t*)buf;
-        const uint64_t* end = pos + (len / sizeof(*pos));
-        const unsigned char* pos2;
-AZ_PUSH_DISABLE_WARNING(4307, "-Wunknown-warning-option") // '*': integral constant overflow
-        uint64_t h = seed ^ uint64_t(len * m);
-AZ_POP_DISABLE_WARNING
-        uint64_t v;
-
-        while (pos != end)
-        {
-            v = *pos++;
-            h ^= MerkleDamgard(v);
-            h *= m;
-        }
-
-        pos2 = (const unsigned char*)pos;
-        v = 0;
-
-        switch (len & (sizeof(*pos) - 1))
-        {
-        case 7:
-            v ^= (uint64_t)pos2[6] << 48;
-        case 6:
-            v ^= (uint64_t)pos2[5] << 40;
-        case 5:
-            v ^= (uint64_t)pos2[4] << 32;
-        case 4:
-            v ^= (uint64_t)pos2[3] << 24;
-        case 3:
-            v ^= (uint64_t)pos2[2] << 16;
-        case 2:
-            v ^= (uint64_t)pos2[1] << 8;
-        case 1:
-            v ^= (uint64_t)pos2[0];
-            h ^= MerkleDamgard(v);
-            h *= m;
-        case 0:
-            break;
-        }
-
-        return MerkleDamgard(h);
-    }
-
-    ILINE uint32_t fasthash64_to_32(uint64_t h)
-    {
-        return uint32_t(h - (h >> 32));
-    }
-
-    template<size_t len>
-    ILINE uint32_t fasthash32(const void* buf, uint32_t seed)
-    {
-        // the following trick converts the 64-bit hashcode to Fermat
-        // residue, which shall retain information from both the higher
-        // and lower parts of hashcode.
-        uint64_t h = fasthash64<len>(buf, seed);
-        return fasthash64_to_32(h);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Misc/SCryDX11PipelineState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Misc/SCryDX11PipelineState.cpp
deleted file mode 100644
index e28309f476..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Misc/SCryDX11PipelineState.cpp
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "SCryDX11PipelineState.hpp"
-
-#include "DX12/API/DX12Shader.hpp"
-#include "DX12/API/DX12RootSignature.hpp"
-#include "DX12/Device/CCryDX12DeviceContext.hpp"
-
-static D3D12_SHADER_BYTECODE g_EmptyShader = { NULL, 0 };
-
-const D3D12_SHADER_BYTECODE& SCryDX11ShaderStageState::GetD3D12ShaderBytecode() const
-{
-    return Shader.m_Value ? Shader.m_Value->GetD3D12ShaderBytecode() : g_EmptyShader;
-}
-
-AZ::u32 SCryDX11ShaderStageState::GetShaderHash() const 
-{
-    return Shader.m_Value ? static_cast<AZ::u32>(Shader.m_Value->GetDX12Shader()->GetHash()) : 0;
-}
-
-#ifndef NDEBUG
-static const char* TopologyToString(D3D11_PRIMITIVE_TOPOLOGY type)
-{
-    switch (type)
-    {
-    case D3D_PRIMITIVE_TOPOLOGY_POINTLIST:
-        return "point list";
-    case D3D_PRIMITIVE_TOPOLOGY_LINELIST:
-        return "line list";
-    case D3D_PRIMITIVE_TOPOLOGY_LINESTRIP:
-        return "line strip";
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST:
-        return "triangle list";
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP:
-        return "triangle strip";
-    case D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ:
-        return "line list adj";
-    case D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ:
-        return "line strip adj";
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ:
-        return "triangle list adj";
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ:
-        return "triangle strip adj";
-    default:
-        return "unmapped type";
-    }
-}
-
-static const char* TypeToString(UINT8 dim)
-{
-    switch (dim)
-    {
-    case D3D_SIT_CBUFFER:
-        return "constant buffer";
-    case D3D_SIT_TBUFFER:
-        return "texture buffer";
-    case D3D_SIT_TEXTURE:
-        return "texture";
-    case D3D_SIT_SAMPLER:
-        return "sampler";
-    case D3D_SIT_UAV_RWTYPED:
-        return "typed r/w texture";
-    case D3D_SIT_STRUCTURED:
-        return "structured buffer";
-    case D3D_SIT_UAV_RWSTRUCTURED:
-        return "structured r/w buffer";
-    case D3D_SIT_BYTEADDRESS:
-        return "raw buffer";
-    case D3D_SIT_UAV_RWBYTEADDRESS:
-        return "raw r/w buffer";
-    case D3D_SIT_UAV_APPEND_STRUCTURED:
-        return "append buffer";
-    case D3D_SIT_UAV_CONSUME_STRUCTURED:
-        return "consume buffer";
-    case D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER:
-        return "structured r/w buffer with counter";
-    default:
-        return "unmapped dimension";
-    }
-}
-
-static const char* DimensionToString(UINT8 dim)
-{
-    switch (dim)
-    {
-    case D3D_SRV_DIMENSION_UNKNOWN:
-        return "unknown";
-    case D3D_SRV_DIMENSION_BUFFER:
-        return "buffer";
-    case D3D_SRV_DIMENSION_TEXTURE1D:
-        return "texture1d";
-    case D3D_SRV_DIMENSION_TEXTURE1DARRAY:
-        return "texture1d array";
-    case D3D_SRV_DIMENSION_TEXTURE2D:
-        return "texture2d";
-    case D3D_SRV_DIMENSION_TEXTURE2DARRAY:
-        return "texture2d array";
-    case D3D_SRV_DIMENSION_TEXTURE2DMS:
-        return "texture2d ms";
-    case D3D_SRV_DIMENSION_TEXTURE2DMSARRAY:
-        return "texture2d ms array";
-    case D3D_SRV_DIMENSION_TEXTURE3D:
-        return "texture3d";
-    case D3D_SRV_DIMENSION_TEXTURECUBE:
-        return "texturecube";
-    case D3D_SRV_DIMENSION_TEXTURECUBEARRAY:
-        return "texturecube array";
-    case D3D_SRV_DIMENSION_BUFFEREX:
-        return "buffer ex";
-    default:
-        return "unmapped dimension";
-    }
-}
-
-static const char* DimensionToString(const D3D12_SHADER_RESOURCE_VIEW_DESC& desc)
-{
-    switch (static_cast<D3D_SRV_DIMENSION>(desc.ViewDimension))
-    {
-    case D3D_SRV_DIMENSION_UNKNOWN:
-        return "unknown";
-    case D3D_SRV_DIMENSION_BUFFER:
-        return desc.Buffer.Flags == D3D12_BUFFER_SRV_FLAG_RAW ? "raw buffer" : desc.Buffer.StructureByteStride > 0 ? "structured buffer" : "buffer";
-    case D3D_SRV_DIMENSION_TEXTURE1D:
-        return "texture1d";
-    case D3D_SRV_DIMENSION_TEXTURE1DARRAY:
-        return "texture1d array";
-    case D3D_SRV_DIMENSION_TEXTURE2D:
-        return "texture2d";
-    case D3D_SRV_DIMENSION_TEXTURE2DARRAY:
-        return "texture2d array";
-    case D3D_SRV_DIMENSION_TEXTURE2DMS:
-        return "texture2d ms";
-    case D3D_SRV_DIMENSION_TEXTURE2DMSARRAY:
-        return "texture2d ms array";
-    case D3D_SRV_DIMENSION_TEXTURE3D:
-        return "texture3d";
-    case D3D_SRV_DIMENSION_TEXTURECUBE:
-        return "texturecube";
-    case D3D_SRV_DIMENSION_TEXTURECUBEARRAY:
-        return "texturecube array";
-    case D3D_SRV_DIMENSION_BUFFEREX:
-        return desc.Buffer.Flags == D3D12_BUFFER_SRV_FLAG_RAW ? "raw buffer ex" : desc.Buffer.StructureByteStride > 0 ? "structured buffer" : "buffer ex";
-    default:
-        return "unmapped dimension";
-    }
-}
-
-static const char* DimensionToString(const D3D12_UNORDERED_ACCESS_VIEW_DESC& desc)
-{
-    switch (static_cast<D3D_SRV_DIMENSION>(desc.ViewDimension))
-    {
-    case D3D_SRV_DIMENSION_UNKNOWN:
-        return "r/w unknown";
-    case D3D_SRV_DIMENSION_BUFFER:
-        return desc.Buffer.Flags == D3D12_BUFFER_UAV_FLAG_RAW ? "raw r/w buffer" : desc.Buffer.StructureByteStride > 0 ? "structured r/w buffer" : "r/w buffer";
-    case D3D_SRV_DIMENSION_TEXTURE1D:
-        return "r/w texture1d";
-    case D3D_SRV_DIMENSION_TEXTURE1DARRAY:
-        return "r/w texture1d array";
-    case D3D_SRV_DIMENSION_TEXTURE2D:
-        return "r/w texture2d";
-    case D3D_SRV_DIMENSION_TEXTURE2DARRAY:
-        return "r/w texture2d array";
-    case D3D_SRV_DIMENSION_TEXTURE2DMS:
-        return "r/w texture2d ms";
-    case D3D_SRV_DIMENSION_TEXTURE2DMSARRAY:
-        return "r/w texture2d ms array";
-    case D3D_SRV_DIMENSION_TEXTURE3D:
-        return "r/w texture3d";
-    case D3D_SRV_DIMENSION_TEXTURECUBE:
-        return "r/w texturecube";
-    case D3D_SRV_DIMENSION_TEXTURECUBEARRAY:
-        return "r/w texturecube array";
-    case D3D_SRV_DIMENSION_BUFFEREX:
-        return desc.Buffer.Flags == D3D12_BUFFER_UAV_FLAG_RAW ? "raw r/w buffer ex" : desc.Buffer.StructureByteStride > 0 ? "structured r/w buffer ex" : "r/w buffer ex";
-    default:
-        return "r/w unmapped dimension";
-    }
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define ASSIGN_TARGET(member) \
-    member.m_pStateFlags = &(pParent->m_StateFlags);
-
-void SCryDX11ShaderStageState::Init(SCryDX11PipelineState* pParent)
-{
-    ASSIGN_TARGET(Shader);
-    ASSIGN_TARGET(ConstantBufferViews);
-    ASSIGN_TARGET(ConstBufferBindRange);
-    ASSIGN_TARGET(ShaderResourceViews);
-    ASSIGN_TARGET(UnorderedAccessViews);
-    ASSIGN_TARGET(SamplerState);
-}
-
-void SCryDX11ShaderStageState::DebugPrint()
-{
-    switch (Type)
-    {
-    case DX12::ESS_Vertex:
-        DX12_LOG("Vertex shader stage:");
-        break;
-    case DX12::ESS_Hull:
-        DX12_LOG("Hull shader stage:");
-        break;
-    case DX12::ESS_Domain:
-        DX12_LOG("Domain shader stage:");
-        break;
-    case DX12::ESS_Geometry:
-        DX12_LOG("Geometry shader stage:");
-        break;
-    case DX12::ESS_Pixel:
-        DX12_LOG("Pixel shader stage:");
-        break;
-    case DX12::ESS_Compute:
-        DX12_LOG("Compute shader stage:");
-        break;
-    }
-
-    DX12_LOG("Shader = %p %s",
-        Shader.Get(),
-        Shader.Get()->GetName().c_str()
-        );
-
-    const DX12::ReflectedBindings& reflectedBindings = Shader.Get()->GetDX12Shader()->GetReflectedBindings();
-    if (reflectedBindings.m_ConstantBuffers.m_DescriptorCount +
-        reflectedBindings.m_InputResources.m_DescriptorCount +
-        reflectedBindings.m_OutputResources.m_DescriptorCount +
-        reflectedBindings.m_Samplers.m_DescriptorCount)
-    {
-        DX12_LOG(" Resource Binding Table:");
-    }
-
-    if (reflectedBindings.m_ConstantBuffers.m_DescriptorCount)
-    {
-        const auto& ranges = reflectedBindings.m_ConstantBuffers.m_Ranges;
-        for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-        {
-            const DX12::ReflectedBindingRange range = ranges[rangeIdx];
-
-            DX12_LOG(" C [%2d to %2d]:", range.m_ShaderRegister, range.m_ShaderRegister + range.m_Count);
-            for (size_t i = range.m_ShaderRegister; i < range.m_ShaderRegister + range.m_Count; ++i)
-            {
-                if (ConstantBufferViews.Get(i))
-                {
-                    DX12_LOG("  %2d: %p %p %p+%d[%d] %s", i,
-                        ConstantBufferViews.Get(i).get(),
-                        &ConstantBufferViews.Get(i)->GetDX12Resource(),
-                        ConstantBufferViews.Get(i)->GetDX12View().GetCBVDesc().BufferLocation,
-                        ConstBufferBindRange.Get(i).start,
-                        ConstBufferBindRange.Get(i).end - ConstBufferBindRange.Get(i).start,
-                        ConstantBufferViews.Get(i)->GetName().c_str()
-                        );
-                }
-                else
-                {
-                    DX12_LOG("  %2d: ERROR! Null resource.", i);
-                }
-            }
-        }
-    }
-
-    if (reflectedBindings.m_InputResources.m_DescriptorCount)
-    {
-        const auto& ranges = reflectedBindings.m_InputResources.m_Ranges;
-        for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-        {
-            const DX12::ReflectedBindingRange range = ranges[rangeIdx];
-
-            DX12_LOG(" T [%2d to %2d]:", range.m_ShaderRegister, range.m_ShaderRegister + range.m_Count);
-            for (size_t i = range.m_ShaderRegister; i < (range.m_ShaderRegister + range.m_Count); ++i)
-            {
-                if (ShaderResourceViews.Get(i))
-                {
-                    DX12_LOG("  %2d: %p %p [%s, %s, %s] %s", i,
-                        ShaderResourceViews.Get(i).get(),
-                        ShaderResourceViews.Get(i)->GetD3D12Resource(),
-                        TypeToString(range.m_Types[i - range.m_ShaderRegister]),
-                        DimensionToString(range.m_Dimensions[i - range.m_ShaderRegister]),
-                        DimensionToString(ShaderResourceViews.Get(i)->GetDX12View().GetSRVDesc()),
-                        ShaderResourceViews.Get(i)->GetResourceName().c_str()
-                        );
-                }
-                else
-                {
-                    DX12_LOG("  %2d: ERROR! Null resource.", i);
-                }
-            }
-        }
-    }
-
-    if (reflectedBindings.m_OutputResources.m_DescriptorCount)
-    {
-        const auto& ranges = reflectedBindings.m_OutputResources.m_Ranges;
-        for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-        {
-            const DX12::ReflectedBindingRange range = ranges[rangeIdx];
-
-            DX12_LOG(" U [%2d to %2d]:", range.m_ShaderRegister, range.m_ShaderRegister + range.m_Count);
-            for (size_t i = range.m_ShaderRegister; i < range.m_ShaderRegister + range.m_Count; ++i)
-            {
-                if (UnorderedAccessViews.Get(i))
-                {
-                    DX12_LOG("  %2d: %p %p [%s, %s, %s] %s", i,
-                        UnorderedAccessViews.Get(i).get(),
-                        UnorderedAccessViews.Get(i)->GetD3D12Resource(),
-                        TypeToString(range.m_Types[i - range.m_ShaderRegister]),
-                        DimensionToString(range.m_Dimensions[i - range.m_ShaderRegister]),
-                        DimensionToString(UnorderedAccessViews.Get(i)->GetDX12View().GetUAVDesc()),
-                        UnorderedAccessViews.Get(i)->GetResourceName().c_str()
-                        );
-                }
-                else
-                {
-                    DX12_LOG("  %2d: ERROR! Null resource.", i);
-                }
-            }
-        }
-    }
-
-    if (reflectedBindings.m_Samplers.m_DescriptorCount)
-    {
-        const auto& ranges = reflectedBindings.m_Samplers.m_Ranges;
-        for (size_t rangeIdx = 0; rangeIdx < ranges.size(); ++rangeIdx)
-        {
-            const DX12::ReflectedBindingRange range = ranges[rangeIdx];
-
-            DX12_LOG(" S [%2d to %2d]", range.m_ShaderRegister, range.m_ShaderRegister + range.m_Count);
-            for (size_t i = range.m_ShaderRegister; i < range.m_ShaderRegister + range.m_Count; ++i)
-            {
-                if (SamplerState.Get(i))
-                {
-                    DX12_LOG("  %2d: %p", i, SamplerState.Get(i).get());
-                }
-                else
-                {
-                    DX12_LOG("  %2d: ERROR! Null resource.", i);
-                }
-            }
-        }
-    }
-
-    DX12_LOG("");
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SCryDX11IAState::Init(SCryDX11PipelineState* pParent)
-{
-    ASSIGN_TARGET(PrimitiveTopology);
-    ASSIGN_TARGET(InputLayout);
-    ASSIGN_TARGET(VertexBuffers);
-    ASSIGN_TARGET(Strides);
-    ASSIGN_TARGET(Offsets);
-    ASSIGN_TARGET(NumVertexBuffers);
-    ASSIGN_TARGET(IndexBuffer);
-    ASSIGN_TARGET(IndexBufferFormat);
-    ASSIGN_TARGET(IndexBufferOffset);
-}
-
-void SCryDX11IAState::DebugPrint()
-{
-    DX12_LOG("IA:");
-    DX12_LOG(" PrimitiveTopology: %d => %s", PrimitiveTopology.Get(), TopologyToString(PrimitiveTopology.Get()));
-    DX12_LOG(" InputLayout: %p", InputLayout.Get());
-
-    if (NumVertexBuffers.Get())
-    {
-        DX12_LOG(" VertexBuffers:");
-    }
-    for (size_t i = 0; i < NumVertexBuffers.Get(); ++i)
-    {
-        if (VertexBuffers.Get(i))
-        {
-            DX12_LOG("  %2d: %p %p %s", i,
-                VertexBuffers.Get(i).get(),
-                VertexBuffers.Get(i)->GetD3D12Resource(),
-                VertexBuffers.Get(i)->GetName().c_str()
-                );
-        }
-    }
-
-    DX12_LOG(" IndexBuffer:");
-    DX12_LOG("  --: %p %p %s",
-        IndexBuffer.Get(),
-        IndexBuffer.Get() ? IndexBuffer.Get()->GetD3D12Resource() : nullptr,
-        IndexBuffer.Get() ? IndexBuffer.Get()->GetName().c_str() : "-"
-        );
-
-    DX12_LOG("");
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SCryDX11RasterizerState::Init(SCryDX11PipelineState* pParent)
-{
-    ASSIGN_TARGET(DepthStencilState);
-    ASSIGN_TARGET(RasterizerState);
-    ASSIGN_TARGET(Viewports);
-    ASSIGN_TARGET(NumViewports);
-    ASSIGN_TARGET(Scissors);
-    ASSIGN_TARGET(NumScissors);
-    ASSIGN_TARGET(ScissorEnabled);
-}
-
-void SCryDX11RasterizerState::DebugPrint()
-{
-    DX12_LOG("Rasterizer state:");
-    DX12_LOG(" DepthStencilState: %p", DepthStencilState.Get());
-    DX12_LOG(" RasterizerState: %p", RasterizerState.Get());
-
-    DX12_LOG("");
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SCryDX11OutputMergerState::Init(SCryDX11PipelineState* pParent)
-{
-    ASSIGN_TARGET(BlendState);
-    ASSIGN_TARGET(RenderTargetViews);
-    ASSIGN_TARGET(DepthStencilView);
-    ASSIGN_TARGET(SampleMask);
-    ASSIGN_TARGET(NumRenderTargets);
-    ASSIGN_TARGET(RTVFormats);
-    ASSIGN_TARGET(DSVFormat);
-    ASSIGN_TARGET(SampleDesc);
-    ASSIGN_TARGET(StencilRef);
-}
-
-#undef ASSIGN_TARGET
-
-void SCryDX11OutputMergerState::DebugPrint()
-{
-    DX12_LOG("Output merger:");
-    DX12_LOG(" BlendState: %p", BlendState.Get());
-
-    DX12_LOG(" DepthStencilView:");
-    DX12_LOG("  --: %p %p %s",
-        DepthStencilView.Get(),
-        DepthStencilView.Get() ? DepthStencilView.Get()->GetD3D12Resource() : nullptr,
-        DepthStencilView.Get() ? DepthStencilView.Get()->GetResourceName().c_str() : "-"
-        );
-
-    if (NumRenderTargets.Get())
-    {
-        DX12_LOG(" RenderTargetViews:");
-    }
-    for (size_t i = 0; i < NumRenderTargets.Get(); ++i)
-    {
-        if (RenderTargetViews.Get(i))
-        {
-            DX12_LOG("  %2d: %p %p %s", i,
-                RenderTargetViews.Get(i).get(),
-                RenderTargetViews.Get(i)->GetD3D12Resource(),
-                RenderTargetViews.Get(i)->GetResourceName().c_str()
-                );
-        }
-    }
-
-    DX12_LOG("");
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SCryDX11PipelineState::MakeInitParams(DX12::ComputePipelineState::InitParams& params)
-{
-    D3D12_COMPUTE_PIPELINE_STATE_DESC& desc = params.desc;
-    ZeroMemory(&desc, sizeof(D3D12_COMPUTE_PIPELINE_STATE_DESC));
-
-    desc.CS = Stages[DX12::ESS_Compute ].GetD3D12ShaderBytecode();
-    params.hash = Stages[DX12::ESS_Compute].GetShaderHash();
-}
-
-void SCryDX11PipelineState::MakeInitParams(DX12::GraphicsPipelineState::InitParams& params)
-{
-    D3D12_GRAPHICS_PIPELINE_STATE_DESC& desc = params.desc;
-    ZeroMemory(&desc, sizeof(D3D12_GRAPHICS_PIPELINE_STATE_DESC));
-    size_t hash = 0;
-
-    // Set blend state
-    if (OutputMerger.BlendState)
-    {
-        desc.BlendState = OutputMerger.BlendState->GetD3D12BlendDesc();
-    }
-
-    // Set sample mask
-    desc.SampleMask = OutputMerger.SampleMask.Get();
-
-    // Set rasterizer state
-    if (Rasterizer.RasterizerState)
-    {
-        desc.RasterizerState = Rasterizer.RasterizerState->GetD3D12RasterizerDesc();
-    }
-    else
-    {
-        desc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID;
-        desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
-    }
-
-    // Set depth/stencil state
-    if (Rasterizer.DepthStencilState)
-    {
-        desc.DepthStencilState = Rasterizer.DepthStencilState->GetD3D12DepthStencilDesc();
-    }
-
-    desc.IBStripCutValue = D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED;
-
-    // Set primitive topology type
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED;
-    switch (InputAssembler.PrimitiveTopology.Get())
-    {
-    case D3D_PRIMITIVE_TOPOLOGY_POINTLIST:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_LINELIST:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_LINESTRIP:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
-        break;
-    case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ:
-        primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
-        break;
-    default:
-        if (InputAssembler.PrimitiveTopology.Get() >= D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST)
-        {
-            primTopo12 = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH;
-        }
-    }
-
-    desc.PrimitiveTopologyType = primTopo12;
-
-    // Set render targets
-    desc.NumRenderTargets = OutputMerger.NumRenderTargets.Get();
-
-    for (UINT i = 0; i < D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
-    {
-        desc.RTVFormats[i] = i < desc.NumRenderTargets ? OutputMerger.RTVFormats.Get(i) : DXGI_FORMAT_UNKNOWN;
-    }
-
-    desc.DSVFormat = OutputMerger.DSVFormat.Get();
-
-    // Set sample descriptor
-    desc.SampleDesc.Count = 1;
-    desc.SampleDesc.Quality = 0;
-
-    // Be careful to not hash pointers. We want this hash consistent between runs so the PSO can be saved to disk and reloaded on subsequent runs
-    hash = DX12::ComputeSmallHash<sizeof(D3D12_GRAPHICS_PIPELINE_STATE_DESC)>(&desc);
-
-    desc.VS = Stages[DX12::ESS_Vertex].GetD3D12ShaderBytecode();
-    desc.PS = Stages[DX12::ESS_Pixel].GetD3D12ShaderBytecode();
-    desc.HS = Stages[DX12::ESS_Hull].GetD3D12ShaderBytecode();
-    desc.DS = Stages[DX12::ESS_Domain].GetD3D12ShaderBytecode();
-    desc.GS = Stages[DX12::ESS_Geometry].GetD3D12ShaderBytecode();
-
-    for (int i = 0; i < DX12::ESS_LastWithoutCompute; ++i)
-    {
-        AZStd::hash_combine(hash, Stages[i].GetShaderHash());
-    }
-
-    // Apply input layout
-    if (InputAssembler.InputLayout)
-    {
-        const CCryDX12InputLayout::TDescriptors& descriptors = InputAssembler.InputLayout->GetDescriptors();
-
-        desc.InputLayout.pInputElementDescs = descriptors.empty() ? NULL : &(descriptors[0]);
-        desc.InputLayout.NumElements = static_cast<UINT>(descriptors.size());
-
-        AZStd::hash_combine(hash, InputAssembler.InputLayout->GetHash());
-    }
-
-    params.hash = fasthash::fasthash64_to_32(hash);
-}
-
-void SCryDX11PipelineState::MakeInitParams(DX12::RootSignature::ComputeInitParams& params)
-{
-    params.m_ComputeShader = nullptr;
-    if (Stages[DX12::ESS_Compute].Shader)
-    {
-        params.m_ComputeShader = Stages[DX12::ESS_Compute].Shader->GetDX12Shader();
-    }
-}
-
-void SCryDX11PipelineState::MakeInitParams(DX12::RootSignature::GraphicsInitParams& params)
-{
-    params.m_VertexShader   = Stages[DX12::ESS_Vertex].Shader   ? Stages[DX12::ESS_Vertex].Shader->GetDX12Shader()   : nullptr;
-    params.m_HullShader     = Stages[DX12::ESS_Hull].Shader     ? Stages[DX12::ESS_Hull].Shader->GetDX12Shader()     : nullptr;
-    params.m_DomainShader   = Stages[DX12::ESS_Domain].Shader   ? Stages[DX12::ESS_Domain].Shader->GetDX12Shader()   : nullptr;
-    params.m_GeometryShader = Stages[DX12::ESS_Geometry].Shader ? Stages[DX12::ESS_Geometry].Shader->GetDX12Shader() : nullptr;
-    params.m_PixelShader    = Stages[DX12::ESS_Pixel].Shader    ? Stages[DX12::ESS_Pixel].Shader->GetDX12Shader()    : nullptr;
-}
-
-extern int g_nPrintDX12;
-
-void SCryDX11PipelineState::DebugPrint()
-{
-    if (!g_nPrintDX12)
-    {
-        return;
-    }
-
-    // General
-    for (size_t i = 0; i < DX12::ESS_Num; ++i)
-    {
-        if (Stages[i].Shader.Get())
-        {
-            Stages[i].DebugPrint();
-        }
-    }
-
-    // Graphics Fixed Function
-    InputAssembler.DebugPrint();
-    Rasterizer.DebugPrint();
-    OutputMerger.DebugPrint();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Misc/SCryDX11PipelineState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Misc/SCryDX11PipelineState.hpp
deleted file mode 100644
index 3a9d47029a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Misc/SCryDX11PipelineState.hpp
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12PSO__
-#define __CCRYDX12PSO__
-
-#include "DX12/Resource/Misc/CCryDX12InputLayout.hpp"
-#include "DX12/Resource/Misc/CCryDX12Shader.hpp"
-
-#include "DX12/Resource/State/CCryDX12BlendState.hpp"
-#include "DX12/Resource/State/CCryDX12DepthStencilState.hpp"
-#include "DX12/Resource/State/CCryDX12SamplerState.hpp"
-#include "DX12/Resource/State/CCryDX12RasterizerState.hpp"
-
-#include "DX12/Resource/View/CCryDX12DepthStencilView.hpp"
-#include "DX12/Resource/View/CCryDX12RenderTargetView.hpp"
-#include "DX12/Resource/View/CCryDX12ShaderResourceView.hpp"
-#include "DX12/Resource/View/CCryDX12UnorderedAccessView.hpp"
-
-#include "DX12/API/DX12PSO.hpp"
-
-struct SCryDX11PipelineState;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-enum EPipelineStateProperty
-{
-    // Generic
-    EPSP_PipelineState,
-    EPSP_ConstantBuffers,
-    EPSP_Resources,
-    EPSP_Samplers,
-
-    // Graphics Fixed Function
-    EPSP_VertexBuffers,
-    EPSP_IndexBuffer,
-    EPSP_PrimitiveTopology,
-    EPSP_Viewports,
-    EPSP_RenderTargetViews,
-    EPSP_DepthStencilView,
-    EPSP_StencilRef,
-
-    EPSP_Last,
-};
-
-enum EPipelineStatePropertyBits
-{
-    // Generic
-    EPSPB_PipelineState = BIT(EPSP_PipelineState),
-    EPSPB_ConstantBuffers = BIT(EPSP_ConstantBuffers),
-    EPSPB_Resources = BIT(EPSP_Resources),
-    EPSPB_Samplers = BIT(EPSP_Samplers),
-
-    // Graphics Fixed Function
-    EPSPB_VertexBuffers = BIT(EPSP_VertexBuffers),
-    EPSPB_IndexBuffer = BIT(EPSP_IndexBuffer),
-    EPSPB_PrimitiveTopology = BIT(EPSP_PrimitiveTopology),
-    EPSPB_Viewports = BIT(EPSP_Viewports),
-    EPSPB_RenderTargetViews = BIT(EPSP_RenderTargetViews),
-    EPSPB_DepthStencilView = BIT(EPSP_DepthStencilView),
-    EPSPB_StencilRef = BIT(EPSP_StencilRef),
-
-    EPSPB_OutputResources = EPSPB_RenderTargetViews | EPSPB_DepthStencilView,
-
-    EPSPB_RenderTargetFormats = EPSPB_RenderTargetViews | EPSPB_PipelineState,
-    EPSPB_DepthStencilFormat = EPSPB_DepthStencilView | EPSPB_PipelineState,
-
-    EPSPB_InputResources = EPSPB_ConstantBuffers | EPSPB_Resources | EPSPB_Samplers,
-
-    EPSPB_ComputeMask = EPSPB_PipelineState | EPSPB_InputResources
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <typename T, EPipelineStatePropertyBits P>
-struct SChangeTrackingValue
-{
-    UINT* m_pStateFlags;
-    T m_Value;
-
-    SChangeTrackingValue(UINT* pStateFlags = NULL)
-        : m_pStateFlags(pStateFlags)
-    {
-    }
-
-    template <typename X>
-    bool Set(const X& value)
-    {
-        if (m_Value != value)
-        {
-            m_Value = value;
-            * m_pStateFlags |= (P);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    T& Get()
-    {
-        return m_Value;
-    }
-    const T& Get() const
-    {
-        return m_Value;
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <typename T, EPipelineStatePropertyBits P>
-struct SChangeTrackingValue<DX12::SmartPtr<T>, P>
-{
-    UINT* m_pStateFlags;
-    DX12::SmartPtr<T> m_Value;
-
-    SChangeTrackingValue(UINT* pStateFlags = NULL)
-        : m_pStateFlags(pStateFlags)
-    {
-    }
-
-    template <typename X>
-    bool Set(const X& value)
-    {
-        if (m_Value != value)
-        {
-            m_Value = value;
-            *m_pStateFlags |= (P);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    T* Get() const
-    {
-        return m_Value.get();
-    }
-
-    operator T* () const
-    {
-        return m_Value.get();
-    }
-    T* operator->() const
-    {
-        return m_Value.get();
-    }
-    T& operator*() const
-    {
-        return *(m_Value.get());
-    }
-    bool operator!() const
-    {
-        return m_Value.get() == nullptr;
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <typename T, size_t SIZE, EPipelineStatePropertyBits P>
-struct SChangeTrackingArray
-{
-    UINT* m_pStateFlags;
-    T m_Array[SIZE];
-
-    SChangeTrackingArray(UINT* pStateFlags = NULL)
-        : m_pStateFlags(pStateFlags)
-    {
-    }
-
-    template <typename X>
-    bool Set(size_t index, const X& value)
-    {
-        if (m_Array[index] != value)
-        {
-            m_Array[index] = value;
-            * m_pStateFlags |= (P);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    T& Get(size_t index)
-    {
-        return m_Array[index];
-    }
-    const T& Get(size_t index) const
-    {
-        return m_Array[index];
-    }
-
-    T* Ptr(size_t index)
-    {
-        return m_Array + index;
-    }
-    const T* Ptr(size_t index) const
-    {
-        return m_Array + index;
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct SCryDX11ShaderStageState
-{
-    DX12::EShaderStage Type;
-
-    SChangeTrackingValue<DX12::SmartPtr<CCryDX12Shader>, EPSPB_PipelineState> Shader;
-    SChangeTrackingArray<DX12::SmartPtr<CCryDX12Buffer>, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, EPSPB_ConstantBuffers> ConstantBufferViews;
-    SChangeTrackingArray<TRange<UINT>, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, EPSPB_ConstantBuffers> ConstBufferBindRange;
-    SChangeTrackingArray<DX12::SmartPtr<CCryDX12ShaderResourceView>, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, EPSPB_Resources> ShaderResourceViews;
-    SChangeTrackingArray<DX12::SmartPtr<CCryDX12UnorderedAccessView>, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, EPSPB_Resources> UnorderedAccessViews;
-    SChangeTrackingArray<DX12::SmartPtr<CCryDX12SamplerState>, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, EPSPB_Samplers> SamplerState;
-
-    void Init(SCryDX11PipelineState* pParent);
-
-    const D3D12_SHADER_BYTECODE& GetD3D12ShaderBytecode() const;
-    AZ::u32 GetShaderHash() const;
-
-    void DebugPrint();
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct SCryDX11IAState
-{
-    SChangeTrackingValue<D3D11_PRIMITIVE_TOPOLOGY, EPSPB_PrimitiveTopology> PrimitiveTopology;
-
-    SChangeTrackingValue<DX12::SmartPtr<CCryDX12InputLayout>, EPSPB_PipelineState> InputLayout;
-    SChangeTrackingArray<DX12::SmartPtr<CCryDX12Buffer>, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT, EPSPB_VertexBuffers> VertexBuffers;
-    SChangeTrackingArray<UINT, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT, EPSPB_VertexBuffers> Strides;
-    SChangeTrackingArray<UINT, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT, EPSPB_VertexBuffers> Offsets;
-    SChangeTrackingValue<UINT, EPSPB_VertexBuffers> NumVertexBuffers;
-
-    SChangeTrackingValue<DX12::SmartPtr<CCryDX12Buffer>, EPSPB_IndexBuffer> IndexBuffer;
-    SChangeTrackingValue<DXGI_FORMAT, EPSPB_IndexBuffer> IndexBufferFormat;
-    SChangeTrackingValue<UINT, EPSPB_IndexBuffer> IndexBufferOffset;
-
-    SCryDX11IAState()
-    {
-        PrimitiveTopology.m_Value = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
-        NumVertexBuffers.m_Value = 0;
-    }
-
-    void Init(SCryDX11PipelineState* pParent);
-
-    void DebugPrint();
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct SCryDX11RasterizerState
-{
-    SChangeTrackingValue<DX12::SmartPtr<CCryDX12DepthStencilState>, EPSPB_PipelineState> DepthStencilState;
-    SChangeTrackingValue<DX12::SmartPtr<CCryDX12RasterizerState>, EPSPB_PipelineState> RasterizerState;
-
-    SChangeTrackingArray<D3D11_VIEWPORT, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, EPSPB_Viewports> Viewports;
-    SChangeTrackingValue<UINT, EPSPB_Viewports> NumViewports;
-
-    SChangeTrackingArray<D3D11_RECT, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, EPSPB_Viewports> Scissors;
-    SChangeTrackingValue<UINT, EPSPB_Viewports> NumScissors;
-    SChangeTrackingValue<BOOL, EPSPB_Viewports> ScissorEnabled;
-
-    SCryDX11RasterizerState()
-    {
-        NumViewports.m_Value = 0;
-        NumScissors.m_Value = 0;
-        ScissorEnabled.m_Value = 0;
-    }
-
-    void Init(SCryDX11PipelineState* pParent);
-
-    void DebugPrint();
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct SCryDX11OutputMergerState
-{
-    SChangeTrackingValue<DX12::SmartPtr<CCryDX12BlendState>, EPSPB_PipelineState> BlendState;
-
-    SChangeTrackingArray<DX12::SmartPtr<CCryDX12RenderTargetView>, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, EPSPB_RenderTargetViews> RenderTargetViews;
-    SChangeTrackingValue<UINT, EPSPB_RenderTargetViews> NumRenderTargets;
-    SChangeTrackingArray<DXGI_FORMAT, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, EPSPB_RenderTargetFormats> RTVFormats;
-
-    SChangeTrackingValue<DX12::SmartPtr<CCryDX12DepthStencilView>, EPSPB_DepthStencilView> DepthStencilView;
-    SChangeTrackingValue<DXGI_FORMAT, EPSPB_DepthStencilFormat> DSVFormat;
-
-    SChangeTrackingValue<UINT, EPSPB_PipelineState> SampleMask;
-    SChangeTrackingValue<DXGI_SAMPLE_DESC, EPSPB_PipelineState> SampleDesc;
-
-    SChangeTrackingValue<UINT, EPSPB_StencilRef> StencilRef;
-
-    SCryDX11OutputMergerState()
-    {
-        SampleMask.m_Value = UINT_MAX;
-        NumRenderTargets.m_Value = 0;
-        DSVFormat.m_Value = DXGI_FORMAT_UNKNOWN;
-        SampleDesc.m_Value.Count = 1;
-        SampleDesc.m_Value.Quality = 0;
-        StencilRef.m_Value = 0;
-    }
-
-    void Init(SCryDX11PipelineState* pParent);
-
-    void DebugPrint();
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct SHashResource
-{
-    uint32 m_CB_PI;
-    uint32 m_CB_PB;
-    uint32 m_CB_PM;
-    uint32 m_Samplers;
-    uint32 m_Textures;
-
-    SHashResource()
-    {
-        m_CB_PI = 0;
-        m_CB_PB = 0;
-        m_CB_PM = 0;
-        m_Samplers = 0;
-        m_Textures = 0;
-    }
-};
-
-
-struct SCryDX11PipelineState
-{
-    UINT m_StateFlags;
-    SHashResource m_HashRes;
-
-    // General
-    SCryDX11ShaderStageState Stages[DX12::ESS_Num];
-
-    // Graphics Fixed Function
-    SCryDX11IAState InputAssembler;
-    SCryDX11RasterizerState Rasterizer;
-    SCryDX11OutputMergerState OutputMerger;
-
-    SCryDX11PipelineState()
-        : m_StateFlags(0)
-    {
-        // Generic
-        for (size_t i = 0; i < DX12::ESS_Num; ++i)
-        {
-            Stages[i].Type = static_cast<DX12::EShaderStage>(i);
-            Stages[i].Init(this);
-        }
-
-        // Graphics Fixed Function
-        InputAssembler.Init(this);
-        Rasterizer.Init(this);
-        OutputMerger.Init(this);
-    }
-
-    void Invalidate()
-    {
-        m_StateFlags = 0xFFFFFFFF;
-    }
-
-    bool AreShadersBound() const
-    {
-        return !(
-            Stages[DX12::ESS_Vertex  ].Shader.m_Value == NULL &&
-            Stages[DX12::ESS_Hull    ].Shader.m_Value == NULL &&
-            Stages[DX12::ESS_Domain  ].Shader.m_Value == NULL &&
-            Stages[DX12::ESS_Geometry].Shader.m_Value == NULL &&
-            Stages[DX12::ESS_Pixel   ].Shader.m_Value == NULL &&
-            Stages[DX12::ESS_Compute ].Shader.m_Value == NULL
-            );
-    }
-
-    void MakeInitParams(DX12::GraphicsPipelineState::InitParams& params);
-    void MakeInitParams(DX12::ComputePipelineState::InitParams& params);
-    void MakeInitParams(DX12::RootSignature::ComputeInitParams& params);
-    void MakeInitParams(DX12::RootSignature::GraphicsInitParams& params);
-
-    void DebugPrint();
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/RenderCapabilities.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/RenderCapabilities.cpp
deleted file mode 100644
index b36eb7eed4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/RenderCapabilities.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include "..\Common\RenderCapabilities.h"
-
-namespace RenderCapabilities
-{
-    bool SupportsTextureViews()
-    {
-        return true;
-    }
-
-    bool SupportsStencilTextures()
-    {
-        return true;
-    }
-
-    bool SupportsPLSExtension()
-    {
-        return false;
-    }
-
-    FrameBufferFetchMask GetFrameBufferFetchCapabilities()
-    {
-        return FrameBufferFetchMask();
-    }
-
-    bool SupportsDualSourceBlending()
-    {
-        return true;
-    }
-
-    bool SupportsDepthClipping()
-    {
-        return true;
-    }
-
-    bool SupportsStructuredBuffer([[maybe_unused]] EShaderStage stage)
-    {
-        return true;
-    }
-
-    bool SupportsIndependentBlending()
-    {
-        return true;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Asynchronous.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Asynchronous.cpp
deleted file mode 100644
index f4ec65b270..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Asynchronous.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Asynchronous.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Asynchronous.hpp
deleted file mode 100644
index 647162da38..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Asynchronous.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12ASYNCHRONOUS__
-#define __CCRYDX12ASYNCHRONOUS__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-
-template <typename T>
-class CCryDX12Asynchronous
-    : public CCryDX12DeviceChild<T>
-{
-public:
-    DX12_OBJECT(CCryDX12Asynchronous, CCryDX12DeviceChild<T>);
-
-    virtual ~CCryDX12Asynchronous()
-    {
-    }
-
-    #pragma region /* ID3D11Asynchronous implementation */
-
-    virtual UINT STDMETHODCALLTYPE GetDataSize()
-    {
-        return 0;
-    }
-
-    #pragma endregion
-
-protected:
-    CCryDX12Asynchronous()
-        : Super(nullptr, nullptr)
-    {
-    }
-
-private:
-};
-
-
-#endif // __CCRYDX12ASYNCHRONOUS__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Resource.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Resource.cpp
deleted file mode 100644
index daddc24cca..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Resource.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-
-template class CCryDX12Resource<ID3D11Resource>;
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Resource.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Resource.hpp
deleted file mode 100644
index 7fb84b9059..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Resource.hpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12RESOURCE__
-#define __CCRYDX12RESOURCE__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-
-#include "DX12/API/DX12Resource.hpp"
-
-// "res" must be ID3D11Resource
-// This is potentialy dangerous, but easy & fast...
-#define DX12_EXTRACT_RESOURCE(res) \
-    (reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(res))
-#define DX12_EXTRACT_RESOURCE_TYPE(res) \
-    (reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(res))->GetDX12ResourceType()
-
-#define DX12_EXTRACT_ICRYDX12RESOURCE(res) \
-    ((res) ? (static_cast<ICryDX12Resource*>(reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(res))) : NULL)
-
-#define DX12_EXTRACT_D3D12RESOURCE(res) \
-    ((res) ? (static_cast<ICryDX12Resource*>(reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(res)))->GetD3D12Resource() : NULL)
-
-#define DX12_EXTRACT_BUFFER(res) \
-    (reinterpret_cast<CCryDX12Buffer*>(res))
-#define DX12_EXTRACT_TEXTURE1D(res) \
-    (reinterpret_cast<CCryDX12Texture1D*>(res))
-#define DX12_EXTRACT_TEXTURE2D(res) \
-    (reinterpret_cast<CCryDX12Texture2D*>(res))
-#define DX12_EXTRACT_TEXTURE3D(res) \
-    (reinterpret_cast<CCryDX12Texture3D*>(res))
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-enum EDX12ResourceType
-{
-    eDX12RT_Unknown = 0,
-    eDX12RT_Buffer,
-    eDX12RT_Texture1D,
-    eDX12RT_Texture2D,
-    eDX12RT_Texture3D
-};
-
-struct ICryDX12Resource
-{
-    virtual EDX12ResourceType GetDX12ResourceType() const = 0;
-    virtual ID3D12Resource* GetD3D12Resource() const = 0;
-    virtual DX12::Resource& GetDX12Resource() = 0;
-
-    virtual void MapDiscard(DX12::CommandList* commandList) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-class CCryDX12Resource
-    : public CCryDX12DeviceChild<T>
-    , public ICryDX12Resource
-{
-public:
-    DX12_OBJECT(CCryDX12Resource, CCryDX12DeviceChild<T>);
-
-    virtual ~CCryDX12Resource() { }
-
-    #pragma region /* ICryDX12Resource implementation */
-
-    virtual EDX12ResourceType GetDX12ResourceType() const
-    {
-        return eDX12RT_Unknown;
-    }
-
-    virtual ID3D12Resource* GetD3D12Resource() const final
-    {
-        return m_DX12Resource.GetD3D12Resource();
-    }
-
-    virtual DX12::Resource& GetDX12Resource() final
-    {
-        return m_DX12Resource;
-    }
-
-    virtual void MapDiscard(DX12::CommandList* commandList)
-    {
-        m_DX12Resource.MapDiscard(commandList);
-    }
-
-    #pragma endregion
-
-    #pragma region /* ID3D11Resource implementation */
-
-    virtual void STDMETHODCALLTYPE GetType(
-        _Out_  D3D11_RESOURCE_DIMENSION* pResourceDimension)
-    {
-        if (pResourceDimension)
-        {
-            *pResourceDimension = D3D11_RESOURCE_DIMENSION_UNKNOWN;
-        }
-    }
-
-    virtual void STDMETHODCALLTYPE SetEvictionPriority(
-        [[maybe_unused]] _In_  UINT EvictionPriority)
-    {
-    }
-
-    virtual UINT STDMETHODCALLTYPE GetEvictionPriority()
-    {
-        return 0;
-    }
-
-    #pragma endregion
-
-    D3D12_GPU_VIRTUAL_ADDRESS GetGPUVirtualAddress() const
-    {
-        return m_DX12Resource.GetGPUVirtualAddress();
-    }
-
-    void BeginResourceStateTransition([[maybe_unused]] DX12::CommandList* commandList, [[maybe_unused]] D3D12_RESOURCE_STATES desiredState)
-    {
-        //commandList->QueueTransitionBarrierBegin(m_DX12Resource, desiredState);
-    }
-
-protected:
-    CCryDX12Resource(CCryDX12Device* pDevice, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const D3D12_RESOURCE_DESC& desc, const D3D11_SUBRESOURCE_DATA* pInitialData = NULL, size_t numInitialData = 0)
-        : Super(pDevice, pResource)
-        , m_DX12Resource(pDevice->GetDX12Device())
-    {
-        m_DX12Resource.Init(pResource, eInitialState, desc);
-
-        if (pInitialData && numInitialData)
-        {
-            pDevice->GetDeviceContext()->UploadResource(this, pInitialData, numInitialData);
-        }
-    }
-
-    DX12::Resource m_DX12Resource;
-};
-
-#endif // __CCRYDX12RESOURCE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12View.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12View.cpp
deleted file mode 100644
index f4ec65b270..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12View.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12View.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12View.hpp
deleted file mode 100644
index ef9e73da34..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12View.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12VIEW__
-#define __CCRYDX12VIEW__
-
-#include "CCryDX12Resource.hpp"
-
-#include "DX12/Resource/Misc/CCryDX12Buffer.hpp"
-
-#include "DX12/API/DX12View.hpp"
-
-// "view" must be ID3D11*View
-// This is potentialy dangerous, but easy & fast...
-#define DX12_EXTRACT_ICRYDX12VIEW(view) \
-    ((view) ?  (static_cast<ICryDX12View*>(reinterpret_cast<CCryDX12RenderTargetView*>(view))) : NULL)
-
-#define DX12_EXTRACT_DX12VIEW(view) \
-    ((view) ? &(static_cast<ICryDX12View*>(reinterpret_cast<CCryDX12RenderTargetView*>(view)))->GetDX12View() : NULL)
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct ICryDX12View
-{
-    virtual ID3D12Resource* GetD3D12Resource() const = 0;
-
-    virtual DX12::ResourceView& GetDX12View() = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-class CCryDX12View
-    : public CCryDX12DeviceChild<T>
-    , public ICryDX12View
-{
-public:
-    DX12_OBJECT(CCryDX12View, CCryDX12DeviceChild<T>);
-
-    virtual ~CCryDX12View()
-    {
-    }
-
-    ID3D11Resource* GetD3D11Resource() const
-    {
-        return m_pResource11;
-    }
-
-    ID3D12Resource* GetD3D12Resource() const
-    {
-        return m_rDX12Resource.GetD3D12Resource();
-    }
-
-    DX12::Resource& GetDX12Resource() const
-    {
-        return m_rDX12Resource;
-    }
-
-    DX12::ResourceView& GetDX12View()
-    {
-        return m_DX12View;
-    }
-
-    std::string GetResourceName()
-    {
-        ICryDX12Resource* ires = DX12_EXTRACT_ICRYDX12RESOURCE(m_pResource11.get());
-        CCryDX12Resource<ID3D11Resource>* cres = static_cast<CCryDX12Resource<ID3D11Resource>*>(ires);
-        return cres ? cres->GetName() : "-";
-    }
-
-    void SetBarrier(ID3D12Device* pDevice, ID3D12GraphicsCommandList* pCmdList, UINT newState)
-    {
-        DX12_EXTRACT_ICRYDX12RESOURCE(m_pResource11.get())->SetBarrier(pDevice, pCmdList, newState);
-    }
-
-    #pragma region /* ID3D11View implementation */
-
-    virtual void STDMETHODCALLTYPE GetResource(
-        _Out_  ID3D11Resource** ppResource)
-    {
-        if (m_pResource11)
-        {
-            *ppResource = m_pResource11.get();
-            (*ppResource)->AddRef();
-        }
-        else
-        {
-            *ppResource = NULL;
-        }
-    }
-
-    #pragma endregion
-
-protected:
-    CCryDX12View(ID3D11Resource* pResource11, DX12::EViewType viewType)
-        : Super(nullptr, nullptr)
-        , m_pResource11(pResource11)
-        , m_rDX12Resource(DX12_EXTRACT_ICRYDX12RESOURCE(pResource11)->GetDX12Resource())
-    {
-        m_DX12View.Init(m_rDX12Resource, viewType);
-    }
-
-    DX12::ResourceView m_DX12View;
-
-    DX12::SmartPtr<ID3D11Resource> m_pResource11;
-
-    DX12::Resource& m_rDX12Resource;
-};
-
-#endif // __CCRYDX12VIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Buffer.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Buffer.cpp
deleted file mode 100644
index b5af6eb314..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Buffer.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Buffer.hpp"
-#include "../GI/CCryDX12SwapChain.hpp"
-
-CCryDX12Buffer* CCryDX12Buffer::Create(CCryDX12Device* pDevice, ID3D12Resource* pResource, D3D12_RESOURCE_STATES initialState)
-{
-    DX12_ASSERT(pResource);
-
-    D3D12_RESOURCE_DESC desc12 = pResource->GetDesc();
-
-    D3D11_BUFFER_DESC desc11;
-    desc11.ByteWidth = 0; // static_cast<UINT>(desc12.ByteWidth);
-    desc11.StructureByteStride = 0; // static_cast<UINT>(desc12.StructureByteStride);
-    desc11.Usage = D3D11_USAGE_DEFAULT;
-    desc11.CPUAccessFlags = 0;
-    desc11.BindFlags = 0;
-    desc11.MiscFlags = 0;
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET)
-    {
-        desc11.BindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)
-    {
-        desc11.BindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)
-    {
-        desc11.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-
-    CCryDX12Buffer* result = DX12::PassAddRef(new CCryDX12Buffer(pDevice, desc11, pResource, initialState, CD3DX12_RESOURCE_DESC(desc12), NULL));
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Buffer* CCryDX12Buffer::Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource)
-{
-    CCryDX12Buffer* result = Create(pDevice, pResource, D3D12_RESOURCE_STATE_RENDER_TARGET);
-    result->GetDX12Resource().SetDX12SwapChain(pSwapChain->GetDX12SwapChain());
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Buffer* CCryDX12Buffer::Create(CCryDX12Device* pDevice, const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData)
-{
-    DX12_ASSERT(pDesc, "CreateBuffer() called without description!");
-
-    D3D12_RESOURCE_DESC desc12 = CD3DX12_RESOURCE_DESC::Buffer((pDesc->ByteWidth + 255) & ~255);
-
-    D3D12_HEAP_PROPERTIES heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
-    D3D12_RESOURCE_STATES resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-
-    D3D11_SUBRESOURCE_DATA sInitialData;
-    if (pInitialData)
-    {
-        sInitialData = *pInitialData;
-        sInitialData.SysMemPitch = pDesc->ByteWidth;
-        sInitialData.SysMemSlicePitch = pDesc->ByteWidth;
-        pInitialData = &sInitialData;
-    }
-
-    if (pDesc->Usage == D3D11_USAGE_IMMUTABLE)
-    {
-        heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_STAGING)
-    {
-        heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_READBACK);
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_DYNAMIC)
-    {
-        heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD);
-        resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-    }
-
-    if (pDesc->CPUAccessFlags != 0)
-    {
-        // TODO: Check feasibility and performance of allocating staging textures as row major buffers
-        // and using CopyTextureRegion instead of ReadFromSubresource/WriteToSubresource
-
-        if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_WRITE)
-        {
-            heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD);
-            resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-        }
-        else if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_READ)
-        {
-            heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_READBACK);
-            resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-        }
-        else
-        {
-            DX12_NOT_IMPLEMENTED;
-            return nullptr;
-        }
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_UNORDERED_ACCESS)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
-        resourceUsage = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
-        resourceUsage = D3D12_RESOURCE_STATE_DEPTH_WRITE;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_RENDER_TARGET)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
-        resourceUsage = D3D12_RESOURCE_STATE_RENDER_TARGET;
-    }
-
-    ID3D12Resource* resource = NULL;
-
-    HRESULT hr = pDevice->GetD3D12Device()->CreateCommittedResource(
-        &heapProperties,
-        D3D12_HEAP_FLAG_NONE,
-        &desc12,
-        resourceUsage,
-        NULL,
-        IID_GRAPHICS_PPV_ARGS(&resource));
-
-    if (hr != S_OK || !resource)
-    {
-        DX12_ASSERT(0, "Could not create buffer resource!");
-        return NULL;
-    }
-
-    auto result = DX12::PassAddRef(new CCryDX12Buffer(pDevice, *pDesc, resource, resourceUsage, CD3DX12_RESOURCE_DESC(resource->GetDesc()), pInitialData, 1));
-    resource->Release();
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Buffer::CCryDX12Buffer(CCryDX12Device* pDevice, const D3D11_BUFFER_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const D3D12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData, size_t numInitialData)
-    : Super(pDevice, pResource, eInitialState, desc12, pInitialData, numInitialData)
-    , m_Desc11(desc11)
-{
-    m_Desc11.StructureByteStride = (m_Desc11.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) ? m_Desc11.StructureByteStride : 0U;
-    m_DX12View.Init(m_DX12Resource, DX12::EVT_ConstantBufferView, m_Desc11.ByteWidth);
-}
-
-
-CCryDX12Buffer::~CCryDX12Buffer()
-{
-}
-
-CCryDX12Buffer* CCryDX12Buffer::AcquireUploadBuffer()
-{
-    if (m_UploadBuffer)
-    {
-        return m_UploadBuffer;
-    }
-
-    CCryDX12Buffer* resource = nullptr;
-    GetDevice()->CreateStagingResource(this, (ID3D11Resource**)&resource, true);
-    m_UploadBuffer.attach(resource);
-    return m_UploadBuffer.get();
-}
-
-void CCryDX12Buffer::MapDiscard(DX12::CommandList* pCmdList)
-{
-    Super::MapDiscard(pCmdList);
-    m_DX12View.Init(m_DX12Resource, DX12::EVT_ConstantBufferView, m_Desc11.ByteWidth);
-}
-
-#pragma region /* ID3D11Buffer implementation */
-
-void STDMETHODCALLTYPE CCryDX12Buffer::GetDesc(
-    _Out_  D3D11_BUFFER_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Buffer.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Buffer.hpp
deleted file mode 100644
index 69eeeaa12d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Buffer.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12BUFFER__
-#define __CCRYDX12BUFFER__
-
-#include "DX12/Resource/CCryDX12Resource.hpp"
-#include "DX12/API/DX12View.hpp"
-
-class CCryDX12Buffer
-    : public CCryDX12Resource<ID3D11Buffer>
-{
-public:
-    DX12_OBJECT(CCryDX12Buffer, CCryDX12Resource<ID3D11Buffer>);
-
-    static CCryDX12Buffer* Create(CCryDX12Device* pDevice, ID3D12Resource* pResource, D3D12_RESOURCE_STATES initialState);
-
-    static CCryDX12Buffer* Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource);
-
-    static CCryDX12Buffer* Create(CCryDX12Device* pDevice, const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData);
-
-    virtual ~CCryDX12Buffer();
-
-    ILINE UINT GetStructureByteStride() const
-    {
-        // NOTE: masking by (m_Desc11.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) was done in the constructor, no need to check here
-        return m_Desc11.StructureByteStride;
-    }
-
-    DX12::ResourceView& GetDX12View()
-    {
-        return m_DX12View;
-    }
-
-    #pragma region /* ICryDX12Resource implementation */
-
-    virtual EDX12ResourceType GetDX12ResourceType() const final
-    {
-        return eDX12RT_Buffer;
-    }
-
-    virtual void STDMETHODCALLTYPE GetType(_Out_  D3D11_RESOURCE_DIMENSION* pResourceDimension) final
-    {
-        if (pResourceDimension)
-        {
-            *pResourceDimension = D3D11_RESOURCE_DIMENSION_BUFFER;
-        }
-    }
-
-    void MapDiscard(DX12::CommandList* pCmdList);
-
-    CCryDX12Buffer* AcquireUploadBuffer();
-
-    #pragma endregion
-
-    #pragma region /* ID3D11Buffer implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_BUFFER_DESC* pDesc) final;
-
-    #pragma endregion
-
-protected:
-    CCryDX12Buffer(CCryDX12Device* pDevice, const D3D11_BUFFER_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const D3D12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData = NULL, size_t numInitialData = 0);
-
-private:
-    D3D11_BUFFER_DESC m_Desc11;
-
-    DX12::SmartPtr<CCryDX12Buffer> m_UploadBuffer;
-
-    DX12::ResourceView m_DX12View;
-};
-
-#endif // __CCRYDX12BUFFER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12InputLayout.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12InputLayout.cpp
deleted file mode 100644
index aa67ff6772..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12InputLayout.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12InputLayout.hpp"
-
-CCryDX12InputLayout* CCryDX12InputLayout::Create([[maybe_unused]] CCryDX12Device* pDevice, const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs11, UINT NumElements, [[maybe_unused]] const void* pShaderBytecodeWithInputSignature, [[maybe_unused]] SIZE_T BytecodeLength)
-{
-    CCryDX12InputLayout* pResult = DX12::PassAddRef(new CCryDX12InputLayout());
-    pResult->m_Descriptors.resize(NumElements);
-
-    for (UINT i = 0; i < NumElements; ++i)
-    {
-        pResult->m_SemanticNames.push_back(pInputElementDescs11[i].SemanticName);
-    }
-
-    for (UINT i = 0; i < NumElements; ++i)
-    {
-        D3D12_INPUT_ELEMENT_DESC& desc12 = pResult->m_Descriptors[i];
-        ZeroMemory(&desc12, sizeof(D3D12_INPUT_ELEMENT_DESC));
-
-        desc12.SemanticIndex = pInputElementDescs11[i].SemanticIndex;
-        desc12.Format = pInputElementDescs11[i].Format;
-        desc12.InputSlot = pInputElementDescs11[i].InputSlot;
-        desc12.AlignedByteOffset = pInputElementDescs11[i].AlignedByteOffset;
-        desc12.InputSlotClass = static_cast<D3D12_INPUT_CLASSIFICATION>(pInputElementDescs11[i].InputSlotClass);
-        desc12.InstanceDataStepRate = pInputElementDescs11[i].InstanceDataStepRate;
-
-        // Hash everything except the pointers. Hashing pointers would make the hash inconsistent between multiple program runs.
-        pResult->m_hash.Add(&desc12, sizeof(desc12));
-
-        desc12.SemanticName = pResult->m_SemanticNames[i].c_str();
-    }
-
-    return pResult;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12InputLayout::CCryDX12InputLayout()
-    : Super(nullptr, nullptr)
-{
-}
-
-CCryDX12InputLayout::~CCryDX12InputLayout()
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12InputLayout.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12InputLayout.hpp
deleted file mode 100644
index 94d531e6aa..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12InputLayout.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12INPUTLAYOUT__
-#define __CCRYDX12INPUTLAYOUT__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-
-class CCryDX12InputLayout
-    : public CCryDX12DeviceChild<ID3D11InputLayout>
-{
-public:
-    DX12_OBJECT(CCryDX12InputLayout, CCryDX12DeviceChild<ID3D11InputLayout>);
-
-    static CCryDX12InputLayout* Create(CCryDX12Device* pDevice, const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs11, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength);
-
-    virtual ~CCryDX12InputLayout();
-
-    typedef std::vector<D3D12_INPUT_ELEMENT_DESC> TDescriptors;
-
-    const TDescriptors& GetDescriptors() const
-    {
-        return m_Descriptors;
-    }
-
-    AZ::u32 GetHash() const
-    {
-        return m_hash;
-    }
-
-protected:
-    CCryDX12InputLayout();
-
-private:
-    TDescriptors m_Descriptors;
-    std::vector<std::string> m_SemanticNames;
-    AZ::Crc32 m_hash;
-};
-
-#endif // __CCRYDX12INPUTLAYOUT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Query.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Query.cpp
deleted file mode 100644
index 2759cfac92..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Query.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Query.hpp"
-
-CCryDX12Query* CCryDX12Query::Create(ID3D12Device* pDevice, const D3D11_QUERY_DESC* pDesc)
-{
-    switch (pDesc->Query)
-    {
-    case D3D11_QUERY_EVENT:
-    {
-        auto pResult = DX12::PassAddRef(new CCryDX12EventQuery(pDesc));
-        if (!pResult->Init(pDevice))
-        {
-            SAFE_RELEASE(pResult);
-        }
-
-        return pResult;
-    }
-    break;
-    case D3D11_QUERY_TIMESTAMP:
-    case D3D11_QUERY_OCCLUSION:
-    case D3D11_QUERY_OCCLUSION_PREDICATE:
-    {
-        auto pResult = DX12::PassAddRef(new CCryDX12ResourceQuery(pDesc));
-        if (!pResult->Init(pDevice))
-        {
-            SAFE_RELEASE(pResult);
-        }
-
-        return pResult;
-    }
-    break;
-
-    case D3D11_QUERY_TIMESTAMP_DISJOINT:
-    default:
-        return DX12::PassAddRef(new CCryDX12Query(pDesc));
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Query::CCryDX12Query(const D3D11_QUERY_DESC* pDesc)
-    : Super()
-    , m_Desc(*pDesc)
-{
-}
-
-CCryDX12Query::~CCryDX12Query()
-{
-}
-
-/* ID3D11Query implementation */
-
-void STDMETHODCALLTYPE CCryDX12Query::GetDesc(
-    _Out_  D3D11_QUERY_DESC* pDesc)
-{
-    *pDesc = m_Desc;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12EventQuery::CCryDX12EventQuery(const D3D11_QUERY_DESC* pDesc)
-    : Super(pDesc)
-    , m_FenceValue(0)
-{
-}
-
-CCryDX12EventQuery::~CCryDX12EventQuery()
-{
-}
-
-bool CCryDX12EventQuery::Init([[maybe_unused]] ID3D12Device* pDevice)
-{
-    m_FenceValue = 0LL;
-    return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12ResourceQuery::CCryDX12ResourceQuery(const D3D11_QUERY_DESC* pDesc)
-    : Super(pDesc)
-    , m_QueryIndex(0)
-    , m_pResource(nullptr)
-{
-}
-
-CCryDX12ResourceQuery::~CCryDX12ResourceQuery()
-{
-}
-
-bool CCryDX12ResourceQuery::Init(ID3D12Device* pDevice)
-{
-    Super::Init(pDevice);
-    m_QueryIndex = 0;
-    m_pResource = nullptr;
-    return true;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Query.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Query.hpp
deleted file mode 100644
index abe549e549..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Query.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12QUERY__
-#define __CCRYDX12QUERY__
-
-#include "DX12/Resource/CCryDX12Asynchronous.hpp"
-
-class CCryDX12Query
-    : public CCryDX12Asynchronous<ID3D11Query>
-{
-public:
-    DX12_OBJECT(CCryDX12Query, CCryDX12Asynchronous<ID3D11Query>);
-
-    static CCryDX12Query* Create(ID3D12Device* pDevice, const D3D11_QUERY_DESC* pDesc);
-
-    virtual ~CCryDX12Query();
-
-    #pragma region /* ID3D11Asynchronous implementation */
-
-    virtual UINT STDMETHODCALLTYPE GetDataSize()
-    {
-        if (m_Desc.Query == D3D11_QUERY_EVENT)
-        {
-            return sizeof(BOOL);
-        }
-        else if (m_Desc.Query == D3D11_QUERY_TIMESTAMP)
-        {
-            return sizeof(UINT64);
-        }
-        else if (m_Desc.Query == D3D11_QUERY_TIMESTAMP_DISJOINT)
-        {
-            return sizeof(D3D11_QUERY_DATA_TIMESTAMP_DISJOINT);
-        }
-        else if (m_Desc.Query == D3D11_QUERY_OCCLUSION)
-        {
-            return sizeof(UINT64);
-        }
-        else if (m_Desc.Query == D3D11_QUERY_OCCLUSION_PREDICATE)
-        {
-            return sizeof(UINT64);
-        }
-        else if (m_Desc.Query == D3D11_QUERY_PIPELINE_STATISTICS)
-        {
-            return sizeof(D3D11_QUERY_DATA_PIPELINE_STATISTICS);
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    #pragma endregion
-
-    #pragma region /* ID3D11Query implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_QUERY_DESC* pDesc);
-
-    #pragma endregion
-
-protected:
-    CCryDX12Query(const D3D11_QUERY_DESC* pDesc);
-
-    D3D11_QUERY_DESC m_Desc;
-};
-
-class CCryDX12EventQuery
-    : public CCryDX12Query
-{
-public:
-    DX12_OBJECT(CCryDX12EventQuery, CCryDX12Query);
-
-    CCryDX12EventQuery(const D3D11_QUERY_DESC* pDesc);
-    virtual ~CCryDX12EventQuery();
-
-    bool Init(ID3D12Device* pDevice);
-
-    UINT64 GetFenceValue() const
-    {
-        return m_FenceValue;
-    }
-
-    void SetFenceValue(UINT64 fenceValue)
-    {
-        m_FenceValue = fenceValue;
-    }
-
-private:
-    UINT64 m_FenceValue;
-};
-
-class CCryDX12ResourceQuery
-    : public CCryDX12EventQuery
-{
-public:
-    DX12_OBJECT(CCryDX12ResourceQuery, CCryDX12EventQuery);
-
-    CCryDX12ResourceQuery(const D3D11_QUERY_DESC* pDesc);
-    virtual ~CCryDX12ResourceQuery();
-
-    bool Init(ID3D12Device* pDevice);
-
-    UINT GetQueryIndex() const
-    {
-        return m_QueryIndex;
-    }
-
-    void SetQueryIndex(UINT queryIndex)
-    {
-        m_QueryIndex = queryIndex;
-    }
-
-    ID3D12Resource* GetQueryResource() const
-    {
-        return m_pResource;
-    }
-
-    void SetQueryResource(ID3D12Resource* pResource)
-    {
-        m_pResource = pResource;
-    }
-
-private:
-    UINT m_QueryIndex;
-    ID3D12Resource* m_pResource;
-};
-
-
-#endif // __CCRYDX12QUERY__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Shader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Shader.cpp
deleted file mode 100644
index b3e7c4221b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Shader.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Shader.hpp"
-
-CCryDX12Shader* CCryDX12Shader::Create(CCryDX12Device* pDevice, const void* pShaderBytecode, SIZE_T BytecodeLength, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage)
-{
-    CCryDX12Shader* pResult = DX12::PassAddRef(new CCryDX12Shader(pShaderBytecode, BytecodeLength));
-    pResult->m_pShader = DX12::Shader::CreateFromD3D11(pDevice->GetDX12Device(), pResult->GetD3D12ShaderBytecode());
-
-    return pResult;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Shader::CCryDX12Shader(const void* pShaderBytecode, SIZE_T BytecodeLength)
-    : Super(nullptr, nullptr)
-    , m_pShaderBytecodeData(NULL)
-{
-    if (pShaderBytecode && BytecodeLength)
-    {
-        m_pShaderBytecodeData = new uint8_t[BytecodeLength];
-        memcpy(m_pShaderBytecodeData, pShaderBytecode, BytecodeLength);
-
-        m_ShaderBytecode12.pShaderBytecode = m_pShaderBytecodeData;
-        m_ShaderBytecode12.BytecodeLength = BytecodeLength;
-    }
-    else
-    {
-        m_ShaderBytecode12.pShaderBytecode = NULL;
-        m_ShaderBytecode12.BytecodeLength = 0;
-    }
-}
-
-CCryDX12Shader::~CCryDX12Shader()
-{
-    if (m_pShaderBytecodeData)
-    {
-        delete [] m_pShaderBytecodeData;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Shader.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Shader.hpp
deleted file mode 100644
index c90275ed4f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Misc/CCryDX12Shader.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12SHADER__
-#define __CCRYDX12SHADER__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-#include "DX12/API/DX12Shader.hpp"
-
-class CCryDX12Shader
-    : public CCryDX12DeviceChild<ID3D11DeviceChild>
-{
-public:
-    DX12_OBJECT(CCryDX12Shader, CCryDX12DeviceChild<ID3D11DeviceChild>);
-
-    static CCryDX12Shader* Create(CCryDX12Device* pDevice, const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage);
-
-    virtual ~CCryDX12Shader();
-
-    DX12::Shader* GetDX12Shader() const
-    {
-        return m_pShader;
-    }
-
-    const D3D12_SHADER_BYTECODE& GetD3D12ShaderBytecode() const
-    {
-        return m_ShaderBytecode12;
-    }
-
-protected:
-    CCryDX12Shader(const void* pShaderBytecode, SIZE_T BytecodeLength);
-
-private:
-    DX12::SmartPtr<DX12::Shader> m_pShader;
-
-    uint8_t* m_pShaderBytecodeData;
-
-    D3D12_SHADER_BYTECODE m_ShaderBytecode12;
-};
-
-#endif // __CCRYDX12SHADER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12BlendState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12BlendState.cpp
deleted file mode 100644
index a4c213f38b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12BlendState.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12BlendState.hpp"
-
-CCryDX12BlendState* CCryDX12BlendState::Create(const D3D11_BLEND_DESC* pBlendStateDesc)
-{
-    D3D12_BLEND_DESC desc12;
-    ZeroMemory(&desc12, sizeof(D3D11_BLEND_DESC));
-
-    desc12.AlphaToCoverageEnable = pBlendStateDesc->AlphaToCoverageEnable;
-    desc12.IndependentBlendEnable = pBlendStateDesc->IndependentBlendEnable;
-
-    for (UINT i = 0; i < D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
-    {
-        const D3D11_RENDER_TARGET_BLEND_DESC& rt11 = pBlendStateDesc->RenderTarget[i];
-        D3D12_RENDER_TARGET_BLEND_DESC& rt12 = desc12.RenderTarget[i];
-
-        rt12.BlendEnable = rt11.BlendEnable;
-        rt12.BlendOp = static_cast<D3D12_BLEND_OP>(rt11.BlendOp);
-        rt12.BlendOpAlpha = static_cast<D3D12_BLEND_OP>(rt11.BlendOpAlpha);
-        rt12.DestBlend = static_cast<D3D12_BLEND>(rt11.DestBlend);
-        rt12.DestBlendAlpha = static_cast<D3D12_BLEND>(rt11.DestBlendAlpha);
-        rt12.SrcBlend = static_cast<D3D12_BLEND>(rt11.SrcBlend);
-        rt12.SrcBlendAlpha = static_cast<D3D12_BLEND>(rt11.SrcBlendAlpha);
-        rt12.RenderTargetWriteMask = rt11.RenderTargetWriteMask;
-        rt12.LogicOpEnable = FALSE;
-        rt12.LogicOp = D3D12_LOGIC_OP_CLEAR;
-    }
-
-    return DX12::PassAddRef(new CCryDX12BlendState(*pBlendStateDesc, desc12));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12BlendState::CCryDX12BlendState(const D3D11_BLEND_DESC& desc11, const D3D12_BLEND_DESC& desc12)
-    : Super(nullptr, nullptr)
-    , m_Desc11(desc11)
-    , m_Desc12(desc12)
-{
-}
-
-CCryDX12BlendState::~CCryDX12BlendState()
-{
-}
-
-#pragma region /* ID3D11BlendState implementation */
-
-void STDMETHODCALLTYPE CCryDX12BlendState::GetDesc(
-    _Out_  D3D11_BLEND_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12BlendState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12BlendState.hpp
deleted file mode 100644
index 4cf16e24e3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12BlendState.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12BLENDSTATE__
-#define __CCRYDX12BLENDSTATE__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-
-class CCryDX12BlendState
-    : public CCryDX12DeviceChild<ID3D11BlendState>
-{
-public:
-    DX12_OBJECT(CCryDX12BlendState, CCryDX12DeviceChild<ID3D11BlendState>);
-
-    static CCryDX12BlendState* Create(const D3D11_BLEND_DESC* pBlendStateDesc);
-
-    virtual ~CCryDX12BlendState();
-
-    const D3D12_BLEND_DESC& GetD3D12BlendDesc() const
-    {
-        return m_Desc12;
-    }
-
-    #pragma region /* ID3D11BlendState implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_BLEND_DESC* pDesc);
-
-    #pragma endregion
-
-protected:
-    CCryDX12BlendState(const D3D11_BLEND_DESC& desc11, const D3D12_BLEND_DESC& desc12);
-
-private:
-    D3D11_BLEND_DESC m_Desc11;
-
-    D3D12_BLEND_DESC m_Desc12;
-};
-
-#endif // __CCRYDX12BLENDSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12DepthStencilState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12DepthStencilState.cpp
deleted file mode 100644
index 5c3ec82c36..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12DepthStencilState.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12DepthStencilState.hpp"
-
-CCryDX12DepthStencilState* CCryDX12DepthStencilState::Create(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc)
-{
-    D3D12_DEPTH_STENCIL_DESC desc12;
-    ZeroMemory(&desc12, sizeof(D3D12_DEPTH_STENCIL_DESC));
-
-    desc12.BackFace.StencilDepthFailOp = static_cast<D3D12_STENCIL_OP>(pDepthStencilDesc->BackFace.StencilDepthFailOp);
-    desc12.BackFace.StencilFailOp = static_cast<D3D12_STENCIL_OP>(pDepthStencilDesc->BackFace.StencilFailOp);
-    desc12.BackFace.StencilPassOp = static_cast<D3D12_STENCIL_OP>(pDepthStencilDesc->BackFace.StencilPassOp);
-    desc12.BackFace.StencilFunc = static_cast<D3D12_COMPARISON_FUNC>(pDepthStencilDesc->BackFace.StencilFunc);
-
-    desc12.FrontFace.StencilDepthFailOp = static_cast<D3D12_STENCIL_OP>(pDepthStencilDesc->FrontFace.StencilDepthFailOp);
-    desc12.FrontFace.StencilFailOp = static_cast<D3D12_STENCIL_OP>(pDepthStencilDesc->FrontFace.StencilFailOp);
-    desc12.FrontFace.StencilPassOp = static_cast<D3D12_STENCIL_OP>(pDepthStencilDesc->FrontFace.StencilPassOp);
-    desc12.FrontFace.StencilFunc = static_cast<D3D12_COMPARISON_FUNC>(pDepthStencilDesc->FrontFace.StencilFunc);
-
-    desc12.DepthEnable = pDepthStencilDesc->DepthEnable;
-    desc12.DepthFunc = static_cast<D3D12_COMPARISON_FUNC>(pDepthStencilDesc->DepthFunc);
-    desc12.DepthWriteMask = static_cast<D3D12_DEPTH_WRITE_MASK>(pDepthStencilDesc->DepthWriteMask);
-    desc12.StencilEnable = pDepthStencilDesc->StencilEnable;
-    desc12.StencilReadMask = pDepthStencilDesc->StencilReadMask;
-    desc12.StencilWriteMask = pDepthStencilDesc->StencilWriteMask;
-
-    return DX12::PassAddRef(new CCryDX12DepthStencilState(*pDepthStencilDesc, desc12));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12DepthStencilState::CCryDX12DepthStencilState(const D3D11_DEPTH_STENCIL_DESC& desc11, const D3D12_DEPTH_STENCIL_DESC& desc12)
-    : Super(nullptr, nullptr)
-    , m_Desc11(desc11)
-    , m_Desc12(desc12)
-{
-}
-
-CCryDX12DepthStencilState::~CCryDX12DepthStencilState()
-{
-}
-
-#pragma region /* ID3D11DepthStencilState implementation */
-
-void STDMETHODCALLTYPE CCryDX12DepthStencilState::GetDesc(
-    _Out_  D3D11_DEPTH_STENCIL_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12DepthStencilState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12DepthStencilState.hpp
deleted file mode 100644
index a108bdc07b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12DepthStencilState.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12DEPTHSTENCILSTATE__
-#define __CCRYDX12DEPTHSTENCILSTATE__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-
-class CCryDX12DepthStencilState
-    : public CCryDX12DeviceChild<ID3D11DepthStencilState>
-{
-public:
-    DX12_OBJECT(CCryDX12DepthStencilState, CCryDX12DeviceChild<ID3D11DepthStencilState>);
-
-    static CCryDX12DepthStencilState* Create(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc);
-
-    virtual ~CCryDX12DepthStencilState();
-
-    const D3D12_DEPTH_STENCIL_DESC& GetD3D12DepthStencilDesc() const
-    {
-        return m_Desc12;
-    }
-
-    #pragma region /* ID3D11DepthStencilState implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_DEPTH_STENCIL_DESC* pDesc);
-
-    #pragma endregion
-
-protected:
-    CCryDX12DepthStencilState(const D3D11_DEPTH_STENCIL_DESC& desc11, const D3D12_DEPTH_STENCIL_DESC& desc12);
-
-private:
-    D3D11_DEPTH_STENCIL_DESC m_Desc11;
-    D3D12_DEPTH_STENCIL_DESC m_Desc12;
-};
-
-#endif // __CCRYDX12DEPTHSTENCILSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12RasterizerState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12RasterizerState.cpp
deleted file mode 100644
index 32aa77dfaa..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12RasterizerState.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12RasterizerState.hpp"
-
-CCryDX12RasterizerState* CCryDX12RasterizerState::Create(const D3D11_RASTERIZER_DESC* pRasterizerDesc)
-{
-    D3D12_RASTERIZER_DESC desc12;
-    ZeroMemory(&desc12, sizeof(D3D11_RASTERIZER_DESC));
-
-    desc12.AntialiasedLineEnable = pRasterizerDesc->AntialiasedLineEnable;
-    desc12.ConservativeRaster = D3D12_CONSERVATIVE_RASTERIZATION_MODE_OFF;
-    desc12.CullMode = static_cast<D3D12_CULL_MODE>(pRasterizerDesc->CullMode);
-    desc12.DepthBias = pRasterizerDesc->DepthBias;
-    desc12.DepthBiasClamp = pRasterizerDesc->DepthBiasClamp;
-    desc12.DepthClipEnable = pRasterizerDesc->DepthClipEnable;
-    desc12.FillMode = static_cast<D3D12_FILL_MODE>(pRasterizerDesc->FillMode);
-    desc12.ForcedSampleCount = 0;
-    desc12.FrontCounterClockwise = pRasterizerDesc->FrontCounterClockwise;
-    desc12.MultisampleEnable = pRasterizerDesc->MultisampleEnable;
-    desc12.SlopeScaledDepthBias = pRasterizerDesc->SlopeScaledDepthBias;
-
-    return DX12::PassAddRef(new CCryDX12RasterizerState(*pRasterizerDesc, desc12));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12RasterizerState::CCryDX12RasterizerState(const D3D11_RASTERIZER_DESC& desc11, const D3D12_RASTERIZER_DESC& desc12)
-    : Super(nullptr, nullptr)
-    , m_Desc11(desc11)
-    , m_Desc12(desc12)
-{
-}
-
-CCryDX12RasterizerState::~CCryDX12RasterizerState()
-{
-}
-
-#pragma region /* ID3D11RasterizerState implementation */
-
-void STDMETHODCALLTYPE CCryDX12RasterizerState::GetDesc(
-    _Out_  D3D11_RASTERIZER_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12RasterizerState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12RasterizerState.hpp
deleted file mode 100644
index dbbe9ccb5c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12RasterizerState.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-#ifndef __CCRYDX12RASTERIZERSTATE__
-#define __CCRYDX12RASTERIZERSTATE__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-
-class CCryDX12RasterizerState
-    : public CCryDX12DeviceChild<ID3D11RasterizerState>
-{
-public:
-    DX12_OBJECT(CCryDX12RasterizerState, CCryDX12DeviceChild<ID3D11RasterizerState>);
-
-    static CCryDX12RasterizerState* Create(const D3D11_RASTERIZER_DESC* pRasterizerDesc);
-
-    virtual ~CCryDX12RasterizerState();
-
-    const D3D12_RASTERIZER_DESC& GetD3D12RasterizerDesc() const
-    {
-        return m_Desc12;
-    }
-    const D3D11_RASTERIZER_DESC& GetD3D11RasterizerDesc() const
-    {
-        return m_Desc11;
-    }
-
-    #pragma region /* ID3D11RasterizerState implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_RASTERIZER_DESC* pDesc);
-
-    #pragma endregion
-
-protected:
-    CCryDX12RasterizerState(const D3D11_RASTERIZER_DESC& desc11, const D3D12_RASTERIZER_DESC& desc12);
-
-private:
-    D3D11_RASTERIZER_DESC m_Desc11;
-    D3D12_RASTERIZER_DESC m_Desc12;
-};
-
-#endif // __CCRYDX12RASTERIZERSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12SamplerState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12SamplerState.cpp
deleted file mode 100644
index f4634b8a67..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12SamplerState.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12SamplerState.hpp"
-
-CCryDX12SamplerState* CCryDX12SamplerState::Create(const D3D11_SAMPLER_DESC* pSamplerDesc)
-{
-    D3D12_SAMPLER_DESC desc12;
-    desc12.Filter = static_cast<D3D12_FILTER>(pSamplerDesc->Filter);
-    desc12.AddressU = static_cast<D3D12_TEXTURE_ADDRESS_MODE>(pSamplerDesc->AddressU);
-    desc12.AddressV = static_cast<D3D12_TEXTURE_ADDRESS_MODE>(pSamplerDesc->AddressV);
-    desc12.AddressW = static_cast<D3D12_TEXTURE_ADDRESS_MODE>(pSamplerDesc->AddressW);
-    desc12.MipLODBias = pSamplerDesc->MipLODBias;
-    desc12.MaxAnisotropy = pSamplerDesc->MaxAnisotropy;
-    desc12.ComparisonFunc = static_cast<D3D12_COMPARISON_FUNC>(pSamplerDesc->ComparisonFunc);
-    memcpy(desc12.BorderColor, pSamplerDesc->BorderColor, 4 * sizeof(float));
-    desc12.MinLOD = pSamplerDesc->MinLOD;
-    desc12.MaxLOD = pSamplerDesc->MaxLOD;
-
-    return DX12::PassAddRef(new CCryDX12SamplerState(*pSamplerDesc, desc12));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma region /* ID3D11SamplerState implementation */
-
-void STDMETHODCALLTYPE CCryDX12SamplerState::GetDesc(
-    _Out_  D3D11_SAMPLER_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12SamplerState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12SamplerState.hpp
deleted file mode 100644
index f590b99604..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/State/CCryDX12SamplerState.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12SAMPLERSTATE__
-#define __CCRYDX12SAMPLERSTATE__
-
-#include "DX12/Device/CCryDX12DeviceChild.hpp"
-
-#include "DX12/API/DX12SamplerState.hpp"
-
-class CCryDX12SamplerState
-    : public CCryDX12DeviceChild<ID3D11SamplerState>
-{
-public:
-    DX12_OBJECT(CCryDX12SamplerState, CCryDX12DeviceChild<ID3D11SamplerState>);
-
-    static CCryDX12SamplerState* Create(const D3D11_SAMPLER_DESC* pSamplerDesc);
-
-    DX12::SamplerState& GetDX12SamplerState()
-    {
-        return m_DX12SamplerState;
-    }
-
-    #pragma region /* ID3D11SamplerState implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_SAMPLER_DESC* pDesc);
-
-    #pragma endregion
-
-protected:
-    CCryDX12SamplerState(const D3D11_SAMPLER_DESC& desc11, const D3D12_SAMPLER_DESC& desc12)
-        : Super(nullptr, nullptr)
-        , m_Desc11(desc11)
-    {
-        m_DX12SamplerState.GetSamplerDesc() = desc12;
-    }
-
-private:
-    D3D11_SAMPLER_DESC m_Desc11;
-
-    DX12::SamplerState m_DX12SamplerState;
-};
-
-#endif // __CCRYDX12SAMPLERSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture1D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture1D.cpp
deleted file mode 100644
index f3e05dcc19..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture1D.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Texture1D.hpp"
-#include "../GI/CCryDX12SwapChain.hpp"
-
-#include "DX12/Device/CCryDX12Device.hpp"
-
-CCryDX12Texture1D* CCryDX12Texture1D::Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource)
-{
-    DX12_ASSERT(pResource);
-
-    D3D12_RESOURCE_DESC desc12 = pResource->GetDesc();
-
-    D3D11_TEXTURE1D_DESC desc11;
-    desc11.Width = static_cast<UINT>(desc12.Width);
-    desc11.MipLevels = static_cast<UINT>(desc12.MipLevels);
-    desc11.ArraySize = static_cast<UINT>(desc12.DepthOrArraySize);
-    desc11.Format = desc12.Format;
-    desc11.Usage = D3D11_USAGE_DEFAULT;
-    desc11.CPUAccessFlags = 0;
-    desc11.BindFlags = 0;
-    desc11.MiscFlags = 0;
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET)
-    {
-        desc11.BindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)
-    {
-        desc11.BindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)
-    {
-        desc11.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-
-    CCryDX12Texture1D* result = DX12::PassAddRef(new CCryDX12Texture1D(pDevice, desc11, pResource, D3D12_RESOURCE_STATE_RENDER_TARGET, CD3DX12_RESOURCE_DESC(desc12), NULL));
-    result->GetDX12Resource().SetDX12SwapChain(pSwapChain->GetDX12SwapChain());
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Texture1D* CCryDX12Texture1D::Create(CCryDX12Device* pDevice, const FLOAT cClearValue[4], const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData)
-{
-    DX12_ASSERT(pDesc, "CreateTexture() called without description!");
-
-    CD3DX12_RESOURCE_DESC desc12 = CD3DX12_RESOURCE_DESC::Tex1D(
-            pDesc->Format,
-            pDesc->Width,
-            pDesc->ArraySize,
-            pDesc->MipLevels,
-            D3D12_RESOURCE_FLAG_NONE,
-            D3D12_TEXTURE_LAYOUT_UNKNOWN,
-
-            // Alignment
-            0);
-
-    D3D12_HEAP_PROPERTIES heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
-    D3D12_RESOURCE_STATES resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    D3D12_CLEAR_VALUE clearValue = DX12::GetDXGIFormatClearValue(desc12.Format, (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL) != 0);
-    bool allowClearValue = desc12.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER;
-
-    if (pDesc->Usage == D3D11_USAGE_IMMUTABLE)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_STAGING)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_DYNAMIC)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-    }
-
-    if (pDesc->CPUAccessFlags != 0)
-    {
-        if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_WRITE)
-        {
-            resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-        }
-        else if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_READ)
-        {
-            resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-        }
-        else
-        {
-            DX12_NOT_IMPLEMENTED;
-            return nullptr;
-        }
-    }
-
-    if (cClearValue)
-    {
-        if (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL)
-        {
-            clearValue.DepthStencil.Depth   = FLOAT(cClearValue[0]);
-            clearValue.DepthStencil.Stencil = UINT8(cClearValue[1]);
-        }
-        else
-        {
-            clearValue.Color[0] = cClearValue[0];
-            clearValue.Color[1] = cClearValue[1];
-            clearValue.Color[2] = cClearValue[2];
-            clearValue.Color[3] = cClearValue[3];
-        }
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_UNORDERED_ACCESS)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
-        allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
-        allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_DEPTH_WRITE;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_RENDER_TARGET)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
-        allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_RENDER_TARGET;
-    }
-
-    ID3D12Resource* resource = NULL;
-
-    if (S_OK != pDevice->GetD3D12Device()->CreateCommittedResource(
-            &heapProperties,
-            D3D12_HEAP_FLAG_NONE,
-            &desc12,
-            resourceUsage,
-            allowClearValue ? &clearValue : NULL,
-            IID_GRAPHICS_PPV_ARGS(&resource)
-            ) || !resource)
-    {
-        DX12_ASSERT(0, "Could not create texture 1D resource!");
-        return NULL;
-    }
-
-    auto result = DX12::PassAddRef(new CCryDX12Texture1D(pDevice, *pDesc, resource, resourceUsage, CD3DX12_RESOURCE_DESC(resource->GetDesc()), pInitialData, desc12.DepthOrArraySize * desc12.MipLevels));
-    resource->Release();
-
-#if !defined(RELEASE) && defined(GFX_DEBUG)
-    resource->SetPrivateData(WKPDID_D3DDebugClearValue, sizeof(clearValue), &clearValue);
-#endif
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Texture1D::CCryDX12Texture1D(CCryDX12Device* pDevice, const D3D11_TEXTURE1D_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const CD3DX12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData, size_t numInitialData)
-    : Super(pDevice, pResource, eInitialState, desc12, pInitialData, numInitialData)
-    , m_Desc11(desc11)
-{
-}
-
-CCryDX12Texture1D::~CCryDX12Texture1D()
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture1D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture1D.hpp
deleted file mode 100644
index 31dce758c3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture1D.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12TEXTURE1D__
-#define __CCRYDX12TEXTURE1D__
-
-#include "DX12/Resource/CCryDX12Resource.hpp"
-
-class CCryDX12Texture1D
-    : public CCryDX12Resource<ID3D11Texture1D>
-{
-public:
-    DX12_OBJECT(CCryDX12Texture1D, CCryDX12Resource<ID3D11Texture1D>);
-
-    static CCryDX12Texture1D* Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource);
-
-    static CCryDX12Texture1D* Create(CCryDX12Device* pDevice, const FLOAT cClearValue[4], const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData);
-
-    virtual ~CCryDX12Texture1D();
-
-    #pragma region /* ICryDX12Resource implementation */
-
-    virtual EDX12ResourceType GetDX12ResourceType() const final
-    {
-        return eDX12RT_Texture1D;
-    }
-
-    virtual void STDMETHODCALLTYPE GetType(_Out_  D3D11_RESOURCE_DIMENSION* pResourceDimension) final
-    {
-        if (pResourceDimension)
-        {
-            *pResourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE1D;
-        }
-    }
-
-    #pragma endregion
-
-    #pragma region /* ID3D11Texture1D implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_TEXTURE1D_DESC* pDesc) final
-    {
-        if (pDesc)
-        {
-            *pDesc = m_Desc11;
-        }
-    }
-
-    #pragma endregion
-
-protected:
-    CCryDX12Texture1D(CCryDX12Device* pDevice, const D3D11_TEXTURE1D_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const CD3DX12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData = NULL, size_t numInitialData = 0);
-
-private:
-    D3D11_TEXTURE1D_DESC m_Desc11;
-};
-
-#endif // __CCRYDX12TEXTURE1D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture2D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture2D.cpp
deleted file mode 100644
index 121de5de91..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture2D.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Texture2D.hpp"
-#include "../GI/CCryDX12SwapChain.hpp"
-
-#include "DX12/Device/CCryDX12Device.hpp"
-
-CCryDX12Texture2D* CCryDX12Texture2D::Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource)
-{
-    DX12_ASSERT(pResource);
-
-    D3D12_RESOURCE_DESC desc12 = pResource->GetDesc();
-
-    D3D11_TEXTURE2D_DESC desc11;
-    desc11.Width = static_cast<UINT>(desc12.Width);
-    desc11.Height = desc12.Height;
-    desc11.MipLevels = static_cast<UINT>(desc12.MipLevels);
-    desc11.ArraySize = static_cast<UINT>(desc12.DepthOrArraySize);
-    desc11.Format = desc12.Format;
-    desc11.SampleDesc = desc12.SampleDesc;
-    desc11.Usage = D3D11_USAGE_DEFAULT;
-    desc11.CPUAccessFlags = 0;
-    desc11.BindFlags = 0;
-    desc11.MiscFlags = 0;
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET)
-    {
-        desc11.BindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)
-    {
-        desc11.BindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)
-    {
-        desc11.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-
-    CCryDX12Texture2D* result = DX12::PassAddRef(new CCryDX12Texture2D(pDevice, desc11, pResource, D3D12_RESOURCE_STATE_PRESENT, CD3DX12_RESOURCE_DESC(desc12), NULL));
-    result->GetDX12Resource().SetDX12SwapChain(pSwapChain->GetDX12SwapChain());
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Texture2D* CCryDX12Texture2D::Create(CCryDX12Device* pDevice, const FLOAT cClearValue[4], const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData)
-{
-    DX12_ASSERT(pDesc, "CreateTexture() called without description!");
-
-    CD3DX12_RESOURCE_DESC desc12 = CD3DX12_RESOURCE_DESC::Tex2D(
-            pDesc->Format,
-            pDesc->Width, pDesc->Height,
-            pDesc->ArraySize,
-            pDesc->MipLevels,
-            pDesc->SampleDesc.Count,
-            pDesc->SampleDesc.Quality,
-            D3D12_RESOURCE_FLAG_NONE,
-            D3D12_TEXTURE_LAYOUT_UNKNOWN,
-
-            // Alignment
-            0);
-
-    D3D12_HEAP_PROPERTIES heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
-    D3D12_RESOURCE_STATES resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    D3D12_CLEAR_VALUE clearValue = DX12::GetDXGIFormatClearValue(desc12.Format, (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL) != 0);
-    bool allowClearValue = desc12.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER;
-
-    if (pDesc->Usage == D3D11_USAGE_IMMUTABLE)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_STAGING)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_DYNAMIC)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-    }
-
-    if (pDesc->CPUAccessFlags != 0)
-    {
-        if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_WRITE)
-        {
-            resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-        }
-        else if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_READ)
-        {
-            resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-        }
-        else
-        {
-            DX12_NOT_IMPLEMENTED;
-            return nullptr;
-        }
-    }
-
-    if (cClearValue)
-    {
-        if (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL)
-        {
-            clearValue.DepthStencil.Depth   = FLOAT(cClearValue[0]);
-            clearValue.DepthStencil.Stencil = UINT8(cClearValue[1]);
-        }
-        else
-        {
-            clearValue.Color[0] = cClearValue[0];
-            clearValue.Color[1] = cClearValue[1];
-            clearValue.Color[2] = cClearValue[2];
-            clearValue.Color[3] = cClearValue[3];
-        }
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_UNORDERED_ACCESS)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
-        resourceUsage = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
-        allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_DEPTH_WRITE;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_RENDER_TARGET)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
-        allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_RENDER_TARGET;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CCryDX12Texture2D_cpp)
-#endif
-
-    ID3D12Resource* resource = NULL;
-
-    if (S_OK != pDevice->GetD3D12Device()->CreateCommittedResource(
-            &heapProperties,
-            D3D12_HEAP_FLAG_NONE,
-            &desc12,
-            resourceUsage,
-            allowClearValue ? &clearValue : NULL,
-            IID_GRAPHICS_PPV_ARGS(&resource)
-            ) || !resource)
-    {
-        DX12_ASSERT(0, "Could not create texture 2D resource!");
-        return NULL;
-    }
-
-    auto result = DX12::PassAddRef(new CCryDX12Texture2D(pDevice, *pDesc, resource, resourceUsage, CD3DX12_RESOURCE_DESC(resource->GetDesc()), pInitialData, desc12.DepthOrArraySize * desc12.MipLevels));
-    resource->Release();
-
-#if !defined(RELEASE) || defined(GFX_DEBUG)
-    resource->SetPrivateData(WKPDID_D3DDebugClearValue, sizeof(clearValue), &clearValue);
-#endif
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Texture2D::CCryDX12Texture2D(CCryDX12Device* pDevice, const D3D11_TEXTURE2D_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const CD3DX12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData, size_t numInitialData)
-    : Super(pDevice, pResource, eInitialState, desc12, pInitialData, numInitialData)
-    , m_Desc11(desc11)
-{
-}
-
-CCryDX12Texture2D::~CCryDX12Texture2D()
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture2D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture2D.hpp
deleted file mode 100644
index e435d1016a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture2D.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12TEXTURE2D__
-#define __CCRYDX12TEXTURE2D__
-
-#include "DX12/Resource/CCryDX12Resource.hpp"
-
-class CCryDX12SwapChain;
-
-class CCryDX12Texture2D
-    : public CCryDX12Resource<ID3D11Texture2D>
-{
-public:
-    DX12_OBJECT(CCryDX12Texture2D, CCryDX12Resource<ID3D11Texture2D>);
-
-    static CCryDX12Texture2D* Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource);
-
-    static CCryDX12Texture2D* Create(CCryDX12Device* pDevice, const FLOAT cClearValue[4], const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData);
-
-    virtual ~CCryDX12Texture2D();
-
-    #pragma region /* ICryDX12Resource implementation */
-
-    virtual EDX12ResourceType GetDX12ResourceType() const final
-    {
-        return eDX12RT_Texture2D;
-    }
-
-    virtual void STDMETHODCALLTYPE GetType(_Out_  D3D11_RESOURCE_DIMENSION* pResourceDimension) final
-    {
-        if (pResourceDimension)
-        {
-            *pResourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE2D;
-        }
-    }
-
-    #pragma endregion
-
-    #pragma region /* ID3D11Texture2D implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_TEXTURE2D_DESC* pDesc) final
-    {
-        if (pDesc)
-        {
-            *pDesc = m_Desc11;
-        }
-    }
-
-    #pragma endregion
-
-protected:
-    CCryDX12Texture2D(CCryDX12Device* pDevice, const D3D11_TEXTURE2D_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const CD3DX12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData = NULL, size_t numInitialData = 0);
-
-private:
-    D3D11_TEXTURE2D_DESC m_Desc11;
-};
-
-#endif // __CCRYDX12TEXTURE2D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture3D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture3D.cpp
deleted file mode 100644
index 802f31c652..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture3D.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12Texture3D.hpp"
-#include "../GI/CCryDX12SwapChain.hpp"
-
-#include "DX12/Device/CCryDX12Device.hpp"
-
-CCryDX12Texture3D* CCryDX12Texture3D::Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource)
-{
-    DX12_ASSERT(pResource);
-
-    D3D12_RESOURCE_DESC desc12 = pResource->GetDesc();
-
-    D3D11_TEXTURE3D_DESC desc11;
-    desc11.Width = static_cast<UINT>(desc12.Width);
-    desc11.Height = desc12.Height;
-    desc11.MipLevels = static_cast<UINT>(desc12.MipLevels);
-    desc11.Format = desc12.Format;
-    desc11.Usage = D3D11_USAGE_DEFAULT;
-    desc11.CPUAccessFlags = 0;
-    desc11.BindFlags = 0;
-    desc11.MiscFlags = 0;
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET)
-    {
-        desc11.BindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)
-    {
-        desc11.BindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-
-    if (desc12.Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)
-    {
-        desc11.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-
-    CCryDX12Texture3D* result = DX12::PassAddRef(new CCryDX12Texture3D(pDevice, desc11, pResource, D3D12_RESOURCE_STATE_RENDER_TARGET, CD3DX12_RESOURCE_DESC(desc12), NULL));
-    result->GetDX12Resource().SetDX12SwapChain(pSwapChain->GetDX12SwapChain());
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Texture3D* CCryDX12Texture3D::Create(CCryDX12Device* pDevice, const FLOAT cClearValue[4], const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData)
-{
-    DX12_ASSERT(pDesc, "CreateTexture() called without description!");
-
-    CD3DX12_RESOURCE_DESC desc12 = CD3DX12_RESOURCE_DESC::Tex3D(
-            pDesc->Format,
-            pDesc->Width, pDesc->Height, pDesc->Depth,
-            pDesc->MipLevels,
-            D3D12_RESOURCE_FLAG_NONE,
-            D3D12_TEXTURE_LAYOUT_UNKNOWN,
-
-            // Alignment
-            0);
-
-    D3D12_HEAP_PROPERTIES heapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
-    D3D12_RESOURCE_STATES resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    D3D12_CLEAR_VALUE clearValue = DX12::GetDXGIFormatClearValue(desc12.Format, (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL) != 0);
-    bool allowClearValue = desc12.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER;
-
-    if (pDesc->Usage == D3D11_USAGE_IMMUTABLE)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_STAGING)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-    }
-    else if (pDesc->Usage == D3D11_USAGE_DYNAMIC)
-    {
-        resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-    }
-
-    if (pDesc->CPUAccessFlags != 0)
-    {
-        if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_WRITE)
-        {
-            resourceUsage = D3D12_RESOURCE_STATE_GENERIC_READ;
-        }
-        else if (pDesc->CPUAccessFlags == D3D11_CPU_ACCESS_READ)
-        {
-            resourceUsage = D3D12_RESOURCE_STATE_COPY_DEST;
-        }
-        else
-        {
-            DX12_NOT_IMPLEMENTED;
-            return nullptr;
-        }
-    }
-
-    if (cClearValue)
-    {
-        if (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL)
-        {
-            clearValue.DepthStencil.Depth   = FLOAT(cClearValue[0]);
-            clearValue.DepthStencil.Stencil = UINT8(cClearValue[1]);
-        }
-        else
-        {
-            clearValue.Color[0] = cClearValue[0];
-            clearValue.Color[1] = cClearValue[1];
-            clearValue.Color[2] = cClearValue[2];
-            clearValue.Color[3] = cClearValue[3];
-        }
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_UNORDERED_ACCESS)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
-        //allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_DEPTH_STENCIL)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
-        allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_DEPTH_WRITE;
-    }
-
-    if (pDesc->BindFlags & D3D11_BIND_RENDER_TARGET)
-    {
-        desc12.Flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
-        allowClearValue = true;
-        resourceUsage = D3D12_RESOURCE_STATE_RENDER_TARGET;
-    }
-
-    ID3D12Resource* resource = NULL;
-
-    if (S_OK != pDevice->GetD3D12Device()->CreateCommittedResource(
-            &heapProperties,
-            D3D12_HEAP_FLAG_NONE,
-            &desc12,
-            resourceUsage,
-            allowClearValue ? &clearValue : NULL,
-            IID_GRAPHICS_PPV_ARGS(&resource)
-            ) || !resource)
-    {
-        DX12_ASSERT(0, "Could not create texture 3D resource!");
-        return NULL;
-    }
-
-    auto result = DX12::PassAddRef(new CCryDX12Texture3D(pDevice, *pDesc, resource, resourceUsage, CD3DX12_RESOURCE_DESC(resource->GetDesc()), pInitialData, desc12.MipLevels));
-    resource->Release();
-
-#if !defined(RELEASE) || defined(GFX_DEBUG)
-    resource->SetPrivateData(WKPDID_D3DDebugClearValue, sizeof(clearValue), &clearValue);
-#endif
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12Texture3D::CCryDX12Texture3D(CCryDX12Device* pDevice, const D3D11_TEXTURE3D_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const CD3DX12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData, size_t numInitialData)
-    : Super(pDevice, pResource, eInitialState, desc12, pInitialData, numInitialData)
-    , m_Desc11(desc11)
-{
-}
-
-CCryDX12Texture3D::~CCryDX12Texture3D()
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture3D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture3D.hpp
deleted file mode 100644
index f8e227c25e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12Texture3D.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12TEXTURE3D__
-#define __CCRYDX12TEXTURE3D__
-
-#include "DX12/Resource/CCryDX12Resource.hpp"
-
-class CCryDX12Texture3D
-    : public CCryDX12Resource<ID3D11Texture3D>
-{
-public:
-    DX12_OBJECT(CCryDX12Texture3D, CCryDX12Resource<ID3D11Texture3D>);
-
-    static CCryDX12Texture3D* Create(CCryDX12Device* pDevice, CCryDX12SwapChain* pSwapChain, ID3D12Resource* pResource);
-
-    static CCryDX12Texture3D* Create(CCryDX12Device* pDevice, const FLOAT cClearValue[4], const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData);
-
-    virtual ~CCryDX12Texture3D();
-
-    #pragma region /* ICryDX12Resource implementation */
-
-    virtual EDX12ResourceType GetDX12ResourceType() const final
-    {
-        return eDX12RT_Texture3D;
-    }
-
-    virtual void STDMETHODCALLTYPE GetType(_Out_  D3D11_RESOURCE_DIMENSION* pResourceDimension) final
-    {
-        if (pResourceDimension)
-        {
-            *pResourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE3D;
-        }
-    }
-
-    #pragma endregion
-
-    #pragma region /* ID3D11Texture3D implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_TEXTURE3D_DESC* pDesc) final
-    {
-        if (pDesc)
-        {
-            *pDesc = m_Desc11;
-        }
-    }
-
-    #pragma endregion
-
-protected:
-    CCryDX12Texture3D(CCryDX12Device* pDevice, const D3D11_TEXTURE3D_DESC& desc11, ID3D12Resource* pResource, D3D12_RESOURCE_STATES eInitialState, const CD3DX12_RESOURCE_DESC& desc12, const D3D11_SUBRESOURCE_DATA* pInitialData = NULL, size_t numInitialData = 0);
-
-private:
-    D3D11_TEXTURE3D_DESC m_Desc11;
-};
-
-#endif // __CCRYDX12TEXTURE3D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12TextureBase.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12TextureBase.cpp
deleted file mode 100644
index f4ec65b270..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12TextureBase.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12TextureBase.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12TextureBase.hpp
deleted file mode 100644
index d26882ee7a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12TextureBase.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12TEXTUREBASE__
-#define __CCRYDX12TEXTUREBASE__
-
-
-
-#endif // __CCRYDX12TEXTUREBASE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12DepthStencilView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12DepthStencilView.cpp
deleted file mode 100644
index ee20f04e05..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12DepthStencilView.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12DepthStencilView.hpp"
-
-#include "DX12/Device/CCryDX12Device.hpp"
-
-#include "DX12/Resource/Misc/CCryDX12Buffer.hpp"
-
-#include "DX12/Resource/Texture/CCryDX12Texture1D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture2D.hpp"
-
-CCryDX12DepthStencilView* CCryDX12DepthStencilView::Create([[maybe_unused]] CCryDX12Device* pDevice, ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
-{
-    ID3D12Resource* pResource12 = DX12_EXTRACT_D3D12RESOURCE(pResource);
-    D3D11_DEPTH_STENCIL_VIEW_DESC desc11 = pDesc ? *pDesc : D3D11_DEPTH_STENCIL_VIEW_DESC();
-    D3D12_DEPTH_STENCIL_VIEW_DESC desc12;
-    ZeroMemory(&desc12, sizeof(D3D12_DEPTH_STENCIL_VIEW_DESC));
-
-    if (pDesc)
-    {
-        desc12.Format = pDesc->Format;
-        desc12.ViewDimension = static_cast<D3D12_DSV_DIMENSION>(pDesc->ViewDimension);
-
-        desc12.Flags |= (desc11.Flags & D3D11_DSV_READ_ONLY_DEPTH   ? D3D12_DSV_FLAG_READ_ONLY_DEPTH   : D3D12_DSV_FLAG_NONE);
-        desc12.Flags |= (desc11.Flags & D3D11_DSV_READ_ONLY_STENCIL ? D3D12_DSV_FLAG_READ_ONLY_STENCIL : D3D12_DSV_FLAG_NONE);
-
-        switch (desc12.ViewDimension)
-        {
-        case D3D12_DSV_DIMENSION_TEXTURE1DARRAY:
-            desc12.Texture1DArray.ArraySize         = pDesc->Texture1DArray.ArraySize;
-            desc12.Texture1DArray.FirstArraySlice   = pDesc->Texture1DArray.FirstArraySlice;
-            desc12.Texture1DArray.MipSlice          = pDesc->Texture1DArray.MipSlice;
-            break;
-        case D3D12_DSV_DIMENSION_TEXTURE2DARRAY:
-            desc12.Texture2DArray.ArraySize         = pDesc->Texture2DArray.ArraySize;
-            desc12.Texture2DArray.FirstArraySlice   = pDesc->Texture2DArray.FirstArraySlice;
-            desc12.Texture2DArray.MipSlice          = pDesc->Texture2DArray.MipSlice;
-            break;
-        case D3D12_DSV_DIMENSION_TEXTURE2DMS:
-            break;
-        case D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY:
-            desc12.Texture2DMSArray.FirstArraySlice = pDesc->Texture2DMSArray.FirstArraySlice;
-            desc12.Texture2DMSArray.ArraySize       = pDesc->Texture2DMSArray.ArraySize;
-            break;
-        case D3D12_DSV_DIMENSION_TEXTURE1D:
-            desc12.Texture1D.MipSlice               = pDesc->Texture1D.MipSlice;
-            break;
-        case D3D12_DSV_DIMENSION_TEXTURE2D:
-            desc12.Texture2D.MipSlice               = pDesc->Texture2D.MipSlice;
-            break;
-        }
-    }
-    else
-    {
-        EDX12ResourceType type = DX12_EXTRACT_RESOURCE_TYPE(pResource);
-
-        switch (type)
-        {
-        case eDX12RT_Texture1D:
-        {
-            D3D11_TEXTURE1D_DESC desc;
-            (reinterpret_cast<CCryDX12Texture1D*>(pResource))->GetDesc(&desc);
-
-            desc11.Format = desc.Format;
-            desc11.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1D;
-
-            desc12.Format = desc.Format;
-            desc12.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE1D;
-        }
-        break;
-
-        case eDX12RT_Texture2D:
-        {
-            D3D11_TEXTURE2D_DESC desc;
-            (reinterpret_cast<CCryDX12Texture2D*>(pResource))->GetDesc(&desc);
-
-            desc11.Format = desc.Format;
-            desc11.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
-
-            desc12.Format = desc.Format;
-            desc12.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2D;
-        }
-        break;
-
-        default:
-            DX12_NOT_IMPLEMENTED;
-            return NULL;
-        }
-    }
-
-    CCryDX12DepthStencilView* result = NULL;
-
-    if (pDesc)
-    {
-        result = DX12::PassAddRef(new CCryDX12DepthStencilView(pResource, desc11, pResource12, desc12));
-    }
-    else
-    {
-        result = DX12::PassAddRef(new CCryDX12DepthStencilView(pResource, desc11, pResource12));
-    }
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12DepthStencilView::CCryDX12DepthStencilView(ID3D11Resource* pResource11, const D3D11_DEPTH_STENCIL_VIEW_DESC& rDesc11, [[maybe_unused]] ID3D12Resource* pResource12, const D3D12_DEPTH_STENCIL_VIEW_DESC& rDesc12)
-    : Super(pResource11, DX12::EVT_DepthStencilView)
-    , m_Desc11(rDesc11)
-{
-    m_DX12View.GetDSVDesc() = rDesc12;
-}
-
-CCryDX12DepthStencilView::CCryDX12DepthStencilView(ID3D11Resource* pResource11, const D3D11_DEPTH_STENCIL_VIEW_DESC& rDesc11, [[maybe_unused]] ID3D12Resource* pResource12)
-    : Super(pResource11, DX12::EVT_DepthStencilView)
-    , m_Desc11(rDesc11)
-{
-    m_DX12View.HasDesc(false);
-}
-
-CCryDX12DepthStencilView::~CCryDX12DepthStencilView()
-{
-}
-
-#pragma region /* ID3D11DepthStencilView implementation */
-
-void STDMETHODCALLTYPE CCryDX12DepthStencilView::GetDesc(
-    _Out_  D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12DepthStencilView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12DepthStencilView.hpp
deleted file mode 100644
index ebcbfa28f3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12DepthStencilView.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12DEPTHSTENCILVIEW__
-#define __CCRYDX12DEPTHSTENCILVIEW__
-
-#include "DX12/Resource/CCryDX12View.hpp"
-
-class CCryDX12DepthStencilView
-    : public CCryDX12View<ID3D11DepthStencilView>
-{
-public:
-    DX12_OBJECT(CCryDX12DepthStencilView, CCryDX12View<ID3D11DepthStencilView>);
-
-    static CCryDX12DepthStencilView* Create(CCryDX12Device* pDevice, ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc);
-
-    virtual ~CCryDX12DepthStencilView();
-
-    #pragma region /* ID3D11DepthStencilView implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc) final;
-
-    #pragma endregion
-
-    template<class T>
-    void BeginResourceStateTransition([[maybe_unused]] T* pCmdList)
-    {
-        //pCmdList->QueueTransitionBarrierBegin(GetDX12View().GetDX12Resource(), m_Desc11.Flags & D3D11_DSV_READ_ONLY_DEPTH ? D3D12_RESOURCE_STATE_DEPTH_READ : D3D12_RESOURCE_STATE_DEPTH_WRITE);
-    }
-
-    template<class T>
-    void EndResourceStateTransition(T* pCmdList)
-    {
-        pCmdList->QueueTransitionBarrier(GetDX12View().GetDX12Resource(), m_Desc11.Flags & D3D11_DSV_READ_ONLY_DEPTH ? D3D12_RESOURCE_STATE_DEPTH_READ : D3D12_RESOURCE_STATE_DEPTH_WRITE);
-    }
-
-protected:
-    CCryDX12DepthStencilView(ID3D11Resource* pResource11, const D3D11_DEPTH_STENCIL_VIEW_DESC& rDesc11, ID3D12Resource* pResource12, const D3D12_DEPTH_STENCIL_VIEW_DESC& rDesc12);
-
-    CCryDX12DepthStencilView(ID3D11Resource* pResource11, const D3D11_DEPTH_STENCIL_VIEW_DESC& rDesc11, ID3D12Resource* pResource12);
-
-private:
-    D3D11_DEPTH_STENCIL_VIEW_DESC m_Desc11;
-};
-
-#endif // __CCRYDX12DEPTHSTENCILVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12RenderTargetView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12RenderTargetView.cpp
deleted file mode 100644
index 8d4c9ec98c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12RenderTargetView.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12RenderTargetView.hpp"
-
-#include "DX12/Resource/Misc/CCryDX12Buffer.hpp"
-
-#include "DX12/Resource/Texture/CCryDX12Texture1D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture2D.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture3D.hpp"
-
-CCryDX12RenderTargetView* CCryDX12RenderTargetView::Create([[maybe_unused]] CCryDX12Device* pDevice, ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc)
-{
-    ID3D12Resource* pResource12 = DX12_EXTRACT_D3D12RESOURCE(pResource);
-    D3D11_RENDER_TARGET_VIEW_DESC desc11 = pDesc ? *pDesc : D3D11_RENDER_TARGET_VIEW_DESC();
-    D3D12_RENDER_TARGET_VIEW_DESC desc12;
-    ZeroMemory(&desc12, sizeof(D3D12_RENDER_TARGET_VIEW_DESC));
-
-    if (pDesc)
-    {
-        desc12.Format = pDesc->Format;
-        desc12.ViewDimension = static_cast<D3D12_RTV_DIMENSION>(pDesc->ViewDimension);
-        switch (desc12.ViewDimension)
-        {
-        case D3D12_RTV_DIMENSION_BUFFER:
-            desc12.Buffer.FirstElement              = pDesc->Buffer.FirstElement;
-            desc12.Buffer.NumElements               = pDesc->Buffer.NumElements;
-            break;
-        case D3D12_RTV_DIMENSION_TEXTURE1DARRAY:
-            desc12.Texture1DArray.ArraySize         = pDesc->Texture1DArray.ArraySize;
-            desc12.Texture1DArray.FirstArraySlice   = pDesc->Texture1DArray.FirstArraySlice;
-            desc12.Texture1DArray.MipSlice          = pDesc->Texture1DArray.MipSlice;
-            break;
-        case D3D12_RTV_DIMENSION_TEXTURE2DARRAY:
-            desc12.Texture2DArray.ArraySize         = pDesc->Texture2DArray.ArraySize;
-            desc12.Texture2DArray.FirstArraySlice   = pDesc->Texture2DArray.FirstArraySlice;
-            desc12.Texture2DArray.MipSlice          = pDesc->Texture2DArray.MipSlice;
-            break;
-        case D3D12_RTV_DIMENSION_TEXTURE2DMS:
-            break;
-        case D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY:
-            desc12.Texture2DMSArray.FirstArraySlice = pDesc->Texture2DMSArray.FirstArraySlice;
-            desc12.Texture2DMSArray.ArraySize       = pDesc->Texture2DMSArray.ArraySize;
-            break;
-        case D3D12_RTV_DIMENSION_TEXTURE1D:
-            desc12.Texture1D.MipSlice               = pDesc->Texture1D.MipSlice;
-            break;
-        case D3D12_RTV_DIMENSION_TEXTURE2D:
-            desc12.Texture2D.MipSlice               = pDesc->Texture2D.MipSlice;
-            break;
-        case D3D12_RTV_DIMENSION_TEXTURE3D:
-            desc12.Texture3D.FirstWSlice            = pDesc->Texture3D.FirstWSlice;
-            desc12.Texture3D.MipSlice               = pDesc->Texture3D.MipSlice;
-            desc12.Texture3D.WSize                  = pDesc->Texture3D.WSize;
-            break;
-        }
-    }
-    else
-    {
-        EDX12ResourceType type = DX12_EXTRACT_RESOURCE_TYPE(pResource);
-
-        switch (type)
-        {
-        case eDX12RT_Buffer:
-        {
-            D3D11_BUFFER_DESC desc;
-            (reinterpret_cast<CCryDX12Buffer*>(pResource))->GetDesc(&desc);
-
-            desc11.Format = DXGI_FORMAT_UNKNOWN;
-            desc11.ViewDimension = D3D11_RTV_DIMENSION_BUFFER;
-
-            desc12.Format = DXGI_FORMAT_UNKNOWN;
-            desc12.ViewDimension = D3D12_RTV_DIMENSION_BUFFER;
-        }
-        break;
-
-        case eDX12RT_Texture1D:
-        {
-            D3D11_TEXTURE1D_DESC desc;
-            (reinterpret_cast<CCryDX12Texture1D*>(pResource))->GetDesc(&desc);
-
-            desc11.Format = desc.Format;
-            desc11.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1D;
-
-            desc12.Format = desc.Format;
-            desc12.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE1D;
-        }
-        break;
-
-        case eDX12RT_Texture2D:
-        {
-            D3D11_TEXTURE2D_DESC desc;
-            (reinterpret_cast<CCryDX12Texture2D*>(pResource))->GetDesc(&desc);
-
-            desc11.Format = desc.Format;
-            desc11.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
-
-            desc12.Format = desc.Format;
-            desc12.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
-        }
-        break;
-
-        case eDX12RT_Texture3D:
-        {
-            D3D11_TEXTURE3D_DESC desc;
-            (reinterpret_cast<CCryDX12Texture3D*>(pResource))->GetDesc(&desc);
-
-            desc11.Format = desc.Format;
-            desc11.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D;
-
-            desc12.Format = desc.Format;
-            desc12.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE3D;
-        }
-        break;
-
-        default:
-            DX12_NOT_IMPLEMENTED;
-            return NULL;
-        }
-    }
-
-    CCryDX12RenderTargetView* result;
-
-    if (pDesc)
-    {
-        result = DX12::PassAddRef(new CCryDX12RenderTargetView(pResource, desc11, pResource12, desc12));
-    }
-    else
-    {
-        result = DX12::PassAddRef(new CCryDX12RenderTargetView(pResource, desc11, pResource12));
-    }
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12RenderTargetView::CCryDX12RenderTargetView(ID3D11Resource* pResource11, const D3D11_RENDER_TARGET_VIEW_DESC& rDesc11, [[maybe_unused]] ID3D12Resource* pResource12, const D3D12_RENDER_TARGET_VIEW_DESC& rDesc12)
-    : Super(pResource11, DX12::EVT_RenderTargetView)
-    , m_Desc11(rDesc11)
-{
-    m_DX12View.GetRTVDesc() = rDesc12;
-}
-
-CCryDX12RenderTargetView::CCryDX12RenderTargetView(ID3D11Resource* pResource11, const D3D11_RENDER_TARGET_VIEW_DESC& rDesc11, [[maybe_unused]] ID3D12Resource* pResource12)
-    : Super(pResource11, DX12::EVT_RenderTargetView)
-    , m_Desc11(rDesc11)
-{
-    m_DX12View.HasDesc(false);
-}
-
-CCryDX12RenderTargetView::~CCryDX12RenderTargetView()
-{
-}
-
-/* ID3D11RenderTargetView implementation */
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12RenderTargetView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12RenderTargetView.hpp
deleted file mode 100644
index aec50092e0..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12RenderTargetView.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12RENDERTARGETVIEW__
-#define __CCRYDX12RENDERTARGETVIEW__
-
-#include "DX12/Resource/CCryDX12View.hpp"
-
-class CCryDX12RenderTargetView
-    : public CCryDX12View<ID3D11RenderTargetView>
-{
-public:
-    DX12_OBJECT(CCryDX12RenderTargetView, CCryDX12View<ID3D11RenderTargetView>);
-
-    static CCryDX12RenderTargetView* Create(CCryDX12Device* pDevice, ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc);
-
-    virtual ~CCryDX12RenderTargetView();
-
-    #pragma region /* ID3D11RenderTargetView implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_RENDER_TARGET_VIEW_DESC* pDesc) final
-    {
-        if (pDesc)
-        {
-            *pDesc = m_Desc11;
-        }
-    }
-
-    #pragma endregion
-
-    template<class T>
-    void BeginResourceStateTransition([[maybe_unused]] T* pCmdList)
-    {
-        //pCmdList->QueueTransitionBarrierBegin(GetDX12View().GetDX12Resource(), D3D12_RESOURCE_STATE_RENDER_TARGET);
-    }
-
-    template<class T>
-    void EndResourceStateTransition(T* pCmdList)
-    {
-        pCmdList->QueueTransitionBarrier(GetDX12View().GetDX12Resource(), D3D12_RESOURCE_STATE_RENDER_TARGET);
-    }
-
-protected:
-    CCryDX12RenderTargetView(ID3D11Resource* pResource11, const D3D11_RENDER_TARGET_VIEW_DESC& rDesc11, ID3D12Resource* pResource12, const D3D12_RENDER_TARGET_VIEW_DESC& rDesc12);
-
-    CCryDX12RenderTargetView(ID3D11Resource* pResource11, const D3D11_RENDER_TARGET_VIEW_DESC& rDesc11, ID3D12Resource* pResource12);
-
-private:
-    D3D11_RENDER_TARGET_VIEW_DESC m_Desc11;
-};
-
-#endif // __CCRYDX12RENDERTARGETVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12ShaderResourceView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12ShaderResourceView.cpp
deleted file mode 100644
index 7263f6d55d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12ShaderResourceView.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12ShaderResourceView.hpp"
-
-#include "DX12/Device/CCryDX12Device.hpp"
-#include "DX12/Resource/Misc/CCryDX12Buffer.hpp"
-#include "DX12/Resource/Texture/CCryDX12Texture2D.hpp"
-
-static UINT GetPlaneSlice(DXGI_FORMAT fmt)
-{
-    switch (fmt)
-    {
-    case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
-    case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-CCryDX12ShaderResourceView* CCryDX12ShaderResourceView::Create([[maybe_unused]] CCryDX12Device* pDevice, ID3D11Resource* pResource11, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc)
-{
-    ID3D12Resource* pD3D12Resource = DX12_EXTRACT_D3D12RESOURCE(pResource11);
-    if (!pD3D12Resource)
-    {
-        DX12_ASSERT(0, "Unknown resource type!");
-        return NULL;
-    }
-
-    D3D12_SHADER_RESOURCE_VIEW_DESC desc12;
-    ZeroMemory(&desc12, sizeof(D3D12_SHADER_RESOURCE_VIEW_DESC));
-
-    desc12.Format = pDesc->Format;
-    desc12.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
-    desc12.ViewDimension = static_cast<D3D12_SRV_DIMENSION>(pDesc->ViewDimension);
-    switch (desc12.ViewDimension)
-    {
-    case D3D12_SRV_DIMENSION_BUFFER:
-        desc12.Buffer.FirstElement                  = pDesc->Buffer.FirstElement;
-        desc12.Buffer.NumElements                   = pDesc->Buffer.NumElements;
-        desc12.Buffer.Flags                         = D3D12_BUFFER_SRV_FLAG_NONE;
-        desc12.Buffer.StructureByteStride           = DX12_EXTRACT_BUFFER(pResource11)->GetStructureByteStride();
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURE1DARRAY:
-        desc12.Texture1DArray.ArraySize             = pDesc->Texture1DArray.ArraySize;
-        desc12.Texture1DArray.FirstArraySlice       = pDesc->Texture1DArray.FirstArraySlice;
-        desc12.Texture1DArray.MipLevels             = pDesc->Texture1DArray.MipLevels;
-        desc12.Texture1DArray.MostDetailedMip       = pDesc->Texture1DArray.MostDetailedMip;
-        desc12.Texture1DArray.ResourceMinLODClamp   = 0.0f;
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURE2DARRAY:
-        desc12.Texture2DArray.ArraySize             = pDesc->Texture2DArray.ArraySize;
-        desc12.Texture2DArray.FirstArraySlice       = pDesc->Texture2DArray.FirstArraySlice;
-        desc12.Texture2DArray.MipLevels             = pDesc->Texture2DArray.MipLevels;
-        desc12.Texture2DArray.MostDetailedMip       = pDesc->Texture2DArray.MostDetailedMip;
-        desc12.Texture2DArray.ResourceMinLODClamp   = 0.0f;
-        desc12.Texture2DArray.PlaneSlice            = GetPlaneSlice(pDesc->Format);
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURECUBEARRAY:
-        desc12.TextureCubeArray.First2DArrayFace    = pDesc->TextureCubeArray.First2DArrayFace;
-        desc12.TextureCubeArray.MipLevels           = pDesc->TextureCubeArray.MipLevels;
-        desc12.TextureCubeArray.MostDetailedMip     = pDesc->TextureCubeArray.MostDetailedMip;
-        desc12.TextureCubeArray.NumCubes            = pDesc->TextureCubeArray.NumCubes;
-        desc12.TextureCubeArray.ResourceMinLODClamp = 0.0f;
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURE2DMS:
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY:
-        desc12.Texture2DMSArray.FirstArraySlice     = pDesc->Texture2DMSArray.FirstArraySlice;
-        desc12.Texture2DMSArray.ArraySize           = pDesc->Texture2DMSArray.ArraySize;
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURE1D:
-        desc12.Texture1D.MipLevels                  = pDesc->Texture1D.MipLevels;
-        desc12.Texture1D.MostDetailedMip            = pDesc->Texture1D.MostDetailedMip;
-        desc12.Texture1D.ResourceMinLODClamp        = 0.0f;
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURE2D:
-        desc12.Texture2D.MipLevels                  = pDesc->Texture2D.MipLevels;
-        desc12.Texture2D.MostDetailedMip            = pDesc->Texture2D.MostDetailedMip;
-        desc12.Texture2D.ResourceMinLODClamp        = 0.0f;
-        desc12.Texture2D.PlaneSlice                 = GetPlaneSlice(pDesc->Format);
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURECUBE:
-        desc12.TextureCube.MipLevels                = pDesc->TextureCube.MipLevels;
-        desc12.TextureCube.MostDetailedMip          = pDesc->TextureCube.MostDetailedMip;
-        desc12.TextureCube.ResourceMinLODClamp      = 0.0f;
-        break;
-    case D3D12_SRV_DIMENSION_TEXTURE3D:
-        desc12.Texture3D.MipLevels                  = pDesc->Texture3D.MipLevels;
-        desc12.Texture3D.MostDetailedMip            = pDesc->Texture3D.MostDetailedMip;
-        desc12.Texture3D.ResourceMinLODClamp        = 0.0f;
-        break;
-    }
-
-    return DX12::PassAddRef(new CCryDX12ShaderResourceView(pResource11, *pDesc, pD3D12Resource, desc12));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12ShaderResourceView::CCryDX12ShaderResourceView(ID3D11Resource* pResource11, const D3D11_SHADER_RESOURCE_VIEW_DESC& desc11, [[maybe_unused]] ID3D12Resource* pResource12, const D3D12_SHADER_RESOURCE_VIEW_DESC& desc12)
-    : Super(pResource11, DX12::EVT_ShaderResourceView)
-    , m_Desc11(desc11)
-{
-    m_DX12View.GetSRVDesc() = desc12;
-}
-
-CCryDX12ShaderResourceView::~CCryDX12ShaderResourceView()
-{
-}
-
-/* ID3D11ShaderResourceView implementation */
-
-void STDMETHODCALLTYPE CCryDX12ShaderResourceView::GetDesc(
-    _Out_  D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12ShaderResourceView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12ShaderResourceView.hpp
deleted file mode 100644
index 3c8e95e229..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12ShaderResourceView.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CRYDX12SHADERRESOURCEVIEW__
-#define __CRYDX12SHADERRESOURCEVIEW__
-
-#include "DX12/Resource/CCryDX12View.hpp"
-
-class CCryDX12ShaderResourceView
-    : public CCryDX12View<ID3D11ShaderResourceView>
-{
-public:
-    DX12_OBJECT(CCryDX12ShaderResourceView, CCryDX12View<ID3D11ShaderResourceView>);
-
-    static CCryDX12ShaderResourceView* Create(CCryDX12Device* pDevice, ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc);
-
-    virtual ~CCryDX12ShaderResourceView();
-
-    #pragma region /* ID3D11ShaderResourceView implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc) final;
-
-    #pragma endregion
-
-    void BeginResourceStateTransition([[maybe_unused]] DX12::CommandList* commandList)
-    {
-        //commandList->QueueTransitionBarrierBegin(GetDX12View().GetDX12Resource(), D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
-    }
-
-protected:
-    CCryDX12ShaderResourceView(ID3D11Resource* pResource11, const D3D11_SHADER_RESOURCE_VIEW_DESC& desc11, ID3D12Resource* pResource12, const D3D12_SHADER_RESOURCE_VIEW_DESC& desc12);
-
-private:
-    D3D11_SHADER_RESOURCE_VIEW_DESC m_Desc11;
-};
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12UnorderedAccessView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12UnorderedAccessView.cpp
deleted file mode 100644
index a9da1e6361..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12UnorderedAccessView.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
-#include "CCryDX12UnorderedAccessView.hpp"
-
-CCryDX12UnorderedAccessView* CCryDX12UnorderedAccessView::Create([[maybe_unused]] CCryDX12Device* pDevice, ID3D11Resource* pResource11, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc11)
-{
-    ID3D12Resource* pD3D12Resource = DX12_EXTRACT_D3D12RESOURCE(pResource11);
-    if (!pD3D12Resource)
-    {
-        DX12_ASSERT(0, "Unknown resource type!");
-        return NULL;
-    }
-
-    DX12_ASSERT(pDesc11->ViewDimension != D3D11_UAV_DIMENSION_BUFFER || !(pDesc11->Buffer.Flags & D3D11_BUFFER_UAV_FLAG_APPEND), "No append/consume supported under DX12!");
-    DX12_ASSERT(pDesc11->ViewDimension != D3D11_UAV_DIMENSION_BUFFER || !(pDesc11->Buffer.Flags & D3D11_BUFFER_UAV_FLAG_COUNTER), "Counters have significantly changed under DX12! Please rewrite the algorithm for DX12 on a higher level.");
-
-    D3D12_UNORDERED_ACCESS_VIEW_DESC desc12;
-    ZeroMemory(&desc12, sizeof(D3D12_UNORDERED_ACCESS_VIEW_DESC));
-
-    desc12.Format = pDesc11->Format;
-    desc12.ViewDimension = static_cast<D3D12_UAV_DIMENSION>(pDesc11->ViewDimension);
-    switch (desc12.ViewDimension)
-    {
-    case D3D12_UAV_DIMENSION_BUFFER:
-        desc12.Buffer.FirstElement            = static_cast<UINT64>(pDesc11->Buffer.FirstElement);
-        desc12.Buffer.NumElements             = pDesc11->Buffer.NumElements;
-        desc12.Buffer.Flags                   = (pDesc11->Buffer.Flags & D3D11_BUFFER_UAV_FLAG_RAW ? D3D12_BUFFER_UAV_FLAG_RAW : D3D12_BUFFER_UAV_FLAG_NONE);
-        desc12.Buffer.CounterOffsetInBytes    = 0;     // NOTE: not yet implemented/supported
-        desc12.Buffer.StructureByteStride     = DX12_EXTRACT_BUFFER(pResource11)->GetStructureByteStride();
-        break;
-    case D3D12_UAV_DIMENSION_TEXTURE1DARRAY:
-        desc12.Texture1DArray.MipSlice        = pDesc11->Texture1DArray.MipSlice;
-        desc12.Texture1DArray.FirstArraySlice = pDesc11->Texture1DArray.FirstArraySlice;
-        desc12.Texture1DArray.ArraySize       = pDesc11->Texture1DArray.ArraySize;
-        break;
-    case D3D12_UAV_DIMENSION_TEXTURE2DARRAY:
-        desc12.Texture2DArray.MipSlice        = pDesc11->Texture2DArray.MipSlice;
-        desc12.Texture2DArray.FirstArraySlice = pDesc11->Texture2DArray.FirstArraySlice;
-        desc12.Texture2DArray.ArraySize       = pDesc11->Texture2DArray.ArraySize;
-        desc12.Texture2DArray.PlaneSlice      = 0;     // NOTE: not yet implemented/supported
-        break;
-    case D3D12_UAV_DIMENSION_TEXTURE1D:
-        desc12.Texture1D.MipSlice             = pDesc11->Texture1D.MipSlice;
-        break;
-    case D3D12_UAV_DIMENSION_TEXTURE2D:
-        desc12.Texture2D.MipSlice             = pDesc11->Texture2D.MipSlice;
-        desc12.Texture2D.PlaneSlice           = 0;     // NOTE: not yet implemented/supported
-        break;
-    case D3D12_UAV_DIMENSION_TEXTURE3D:
-        desc12.Texture3D.MipSlice             = pDesc11->Texture3D.MipSlice;
-        desc12.Texture3D.FirstWSlice          = pDesc11->Texture3D.FirstWSlice;
-        desc12.Texture3D.WSize                = pDesc11->Texture3D.WSize;
-        break;
-    }
-
-    return DX12::PassAddRef(new CCryDX12UnorderedAccessView(pResource11, *pDesc11, pD3D12Resource, desc12));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CCryDX12UnorderedAccessView::CCryDX12UnorderedAccessView(ID3D11Resource* pResource11, const D3D11_UNORDERED_ACCESS_VIEW_DESC& desc11, [[maybe_unused]] ID3D12Resource* pResource12, const D3D12_UNORDERED_ACCESS_VIEW_DESC& desc12)
-    : Super(pResource11, DX12::EVT_UnorderedAccessView)
-    , m_Desc11(desc11)
-{
-    m_DX12View.GetUAVDesc() = desc12;
-}
-
-CCryDX12UnorderedAccessView::~CCryDX12UnorderedAccessView()
-{
-}
-
-#pragma region /* ID3D11UnorderedAccessView implementation */
-
-void STDMETHODCALLTYPE CCryDX12UnorderedAccessView::GetDesc(
-    _Out_  D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc)
-{
-    if (pDesc)
-    {
-        *pDesc = m_Desc11;
-    }
-}
-
-#pragma endregion
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12UnorderedAccessView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12UnorderedAccessView.hpp
deleted file mode 100644
index 98e8c73c8f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/View/CCryDX12UnorderedAccessView.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#ifndef __CCRYDX12UNORDEREDACCESSVIEW__
-#define __CCRYDX12UNORDEREDACCESSVIEW__
-
-#include "DX12/Resource/CCryDX12View.hpp"
-
-class CCryDX12UnorderedAccessView
-    : public CCryDX12View<ID3D11UnorderedAccessView>
-{
-public:
-    DX12_OBJECT(CCryDX12UnorderedAccessView, CCryDX12View<ID3D11UnorderedAccessView>);
-
-    static CCryDX12UnorderedAccessView* Create(CCryDX12Device* pDevice, ID3D11Resource* pResource11, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc11);
-
-    virtual ~CCryDX12UnorderedAccessView();
-
-    #pragma region /* ID3D11UnorderedAccessView implementation */
-
-    virtual void STDMETHODCALLTYPE GetDesc(
-        _Out_  D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc) final;
-
-    #pragma endregion
-
-    template<class T>
-    void BeginResourceStateTransition([[maybe_unused]] T* pCmdList)
-    {
-        //pCmdList->QueueTransitionBarrierBegin(GetDX12View().GetDX12Resource(), D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
-    }
-
-    template<class T>
-    void EndResourceStateTransition(T* pCmdList)
-    {
-        pCmdList->QueueTransitionBarrier(GetDX12View().GetDX12Resource(), D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
-    }
-
-protected:
-    CCryDX12UnorderedAccessView(ID3D11Resource* pResource11, const D3D11_UNORDERED_ACCESS_VIEW_DESC& desc11, ID3D12Resource* pResource12, const D3D12_UNORDERED_ACCESS_VIEW_DESC& desc12);
-
-private:
-    D3D11_UNORDERED_ACCESS_VIEW_DESC m_Desc11;
-};
-
-#endif // __CCRYDX12UNORDEREDACCESSVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CMakeLists.txt b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CMakeLists.txt
deleted file mode 100644
index 0b612f0883..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-
-include(${pal_dir}/DXGL_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-
-if(DXGL_TRAIT_BUILD_OPENGL_SUPPORTED AND (NOT LY_MONOLITHIC_GAME OR LY_TRAIT_USE_LEGACY_IN_MONOLITHIC)) # Only Atom is supported in monolithic builds
-    ly_add_target(
-        NAME CryRenderGL.Static STATIC
-        NAMESPACE Legacy
-        FILES_CMAKE
-            ../core_renderer_files.cmake
-            opengl_renderer_files.cmake
-            ${pal_dir}/DXGL_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/DXGL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        COMPILE_DEFINITIONS
-            PUBLIC
-                DO_RENDERLOG
-                DO_RENDERSTATS
-                DIRECT3D10
-                XRENDERGL_EXPORTS
-                _RENDERER
-                EXCLUDE_CINEMIZER_SDK
-                OPENGL
-                #XRENDERD3D10_EXPORTS
-                #EXCLUDE_CINEMIZER_SDK
-        INCLUDE_DIRECTORIES
-            PUBLIC
-                .
-                ../Common
-                ..
-                ../..
-                ../../Common
-                Specification
-                ${pal_dir}
-        BUILD_DEPENDENCIES
-            PUBLIC
-                AZ::AzFramework
-                AZ::HLSLcc.Headers
-                3rdParty::lz4
-                3rdParty::glad
-                Legacy::CryCommon
-    )
-    ly_add_source_properties(
-        SOURCES
-            ../../Common/Shaders/RemoteCompiler.cpp
-            ../../Common/Textures/Image/DDSImage.cpp
-        PROPERTY COMPILE_DEFINITIONS 
-        VALUES ${LY_PAL_TOOLS_DEFINES}
-    )
-
-    ly_add_target(
-        NAME CryRenderGL ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            opengl_renderer_shared_files.cmake
-        BUILD_DEPENDENCIES
-            PRIVATE
-                Legacy::CryRenderGL.Static
-    )
-
-    if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-        ly_add_target(
-            NAME CryRenderGL.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-            NAMESPACE Legacy
-            FILES_CMAKE
-                opengl_test_files.cmake
-            PLATFORM_INCLUDE_FILES
-                ${pal_dir}/DXGL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-            BUILD_DEPENDENCIES
-                PRIVATE
-                    AZ::AzTest
-                    Legacy::CryRenderGL.Static
-        )
-        # SPEC-1548: disabling since it fails in mac with memory issues
-        #ly_add_googletest(
-        #    NAME Legacy::CryRenderGL.Tests
-        #)
-    endif()
-endif()
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CryDXGL.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CryDXGL.cpp
deleted file mode 100644
index eb401f7a91..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CryDXGL.cpp
+++ /dev/null
@@ -1,701 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains the definitions of the global functions defined in
-//               CryDXGL
-
-
-#include "RenderDll_precompiled.h"
-#include "Interfaces/CCryDXGLGIAdapter.hpp"
-#include "Interfaces/CCryDXGLBlob.hpp"
-#include "Interfaces/CCryDXGLDevice.hpp"
-#include "Interfaces/CCryDXGLShaderReflection.hpp"
-#include "Interfaces/CCryDXGLDeviceContext.hpp"
-#include "Interfaces/CCryDXGLGIFactory.hpp"
-#include "Implementation/GLShader.hpp"
-#include "Implementation/GLDevice.hpp"
-#if defined(ANDROID)
-#include "Implementation/GLView.hpp"
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define CRYDXGL_CPP_SECTION_1 1
-#define CRYDXGL_CPP_SECTION_2 2
-#define CRYDXGL_CPP_SECTION_3 3
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYDXGL_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(CryDXGL_cpp)
-#endif
-
-template <typename Factory>
-HRESULT CreateDXGIFactoryInternal(REFIID riid, void** ppFactory)
-{
-    if (riid == __uuidof(Factory))
-    {
-        CCryDXGLGIFactory* pFactory(new CCryDXGLGIFactory());
-        if (!pFactory->Initialize())
-        {
-            pFactory->Release();
-            *ppFactory = NULL;
-            return E_FAIL;
-        }
-        CCryDXGLGIFactory::ToInterface(reinterpret_cast<IDXGIFactory**>(ppFactory), pFactory);
-        return S_OK;
-    }
-
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3D11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI D3D11CreateDeviceAndSwapChain(
-    IDXGIAdapter* pAdapter,
-    D3D_DRIVER_TYPE DriverType,
-    HMODULE Software,
-    UINT Flags,
-    CONST D3D_FEATURE_LEVEL* pFeatureLevels,
-    UINT FeatureLevels,
-    UINT SDKVersion,
-    CONST DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
-    IDXGISwapChain** ppSwapChain,
-    ID3D11Device** ppDevice,
-    D3D_FEATURE_LEVEL* pFeatureLevel,
-    ID3D11DeviceContext** ppImmediateContext)
-{
-    if (pAdapter == NULL)
-    {
-        // Get the first adapter enumerated by the factory according to the specification
-        void* pvFactory(NULL);
-        HRESULT iResult = CreateDXGIFactoryInternal<IDXGIFactory1>(__uuidof(IDXGIFactory1), &pvFactory);
-        if (FAILED(iResult))
-        {
-            return iResult;
-        }
-        CCryDXGLGIFactory* pFactory(CCryDXGLGIFactory::FromInterface(static_cast<IDXGIFactory1*>(pvFactory)));
-        iResult = pFactory->EnumAdapters(0, &pAdapter);
-        pFactory->Release();
-        if (FAILED(iResult))
-        {
-            return iResult;
-        }
-    }
-
-    assert(pAdapter != NULL);
-    CCryDXGLGIAdapter* pDXGLAdapter(CCryDXGLGIAdapter::FromInterface(pAdapter));
-
-    D3D_FEATURE_LEVEL eDevFeatureLevel;
-    if (pDXGLAdapter != NULL)
-    {
-        eDevFeatureLevel = pDXGLAdapter->GetSupportedFeatureLevel();
-    }
-    else
-    {
-        DXGL_TODO("Get the supported feature level even if no adapter is specified")
-        eDevFeatureLevel = D3D_FEATURE_LEVEL_11_0;
-    }
-
-    if (pFeatureLevels != NULL && FeatureLevels > 0)
-    {
-        D3D_FEATURE_LEVEL uMaxAllowedFL(*pFeatureLevels);
-        while (FeatureLevels > 1)
-        {
-            ++pFeatureLevels;
-            uMaxAllowedFL = max(uMaxAllowedFL, *pFeatureLevels);
-            --FeatureLevels;
-        }
-        eDevFeatureLevel = min(eDevFeatureLevel, uMaxAllowedFL);
-    }
-
-    if (pFeatureLevel != NULL)
-    {
-        *pFeatureLevel = eDevFeatureLevel;
-    }
-
-    if (ppDevice != NULL)
-    {
-        _smart_ptr<CCryDXGLDevice> spDevice(new CCryDXGLDevice(pDXGLAdapter, eDevFeatureLevel));
-        if (!spDevice->Initialize(pSwapChainDesc, ppSwapChain))
-        {
-            return E_FAIL;
-        }
-
-        CCryDXGLDevice::ToInterface(ppDevice, spDevice);
-
-        if (ppImmediateContext != NULL)
-        {
-            (*ppDevice)->GetImmediateContext(ppImmediateContext);
-        }
-    }
-
-    return S_OK;
-}
-
-DXGL_API HRESULT WINAPI D3D10CreateBlob(SIZE_T NumBytes, LPD3D10BLOB* ppBuffer)
-{
-    CCryDXGLBlob::ToInterface(ppBuffer, new CCryDXGLBlob(NumBytes));
-    return (*ppBuffer)->GetBufferPointer() != NULL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DCompiler.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI D3DReflect(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    REFIID pInterface,
-    void** ppReflector)
-{
-    if (pInterface == IID_ID3D11ShaderReflection)
-    {
-        CCryDXGLShaderReflection* pReflection(new CCryDXGLShaderReflection());
-        if (pReflection->Initialize(pSrcData))
-        {
-            CCryDXGLShaderReflection::ToInterface(reinterpret_cast<ID3D11ShaderReflection**>(ppReflector), pReflection);
-            return S_OK;
-        }
-        pReflection->Release();
-    }
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI D3DDisassemble(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    UINT Flags,
-    LPCSTR szComments,
-    ID3DBlob** ppDisassembly)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DX11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI D3DX11CreateTextureFromMemory(
-    ID3D11Device* pDevice,
-    const void* pSrcData,
-    size_t SrcDataSize,
-    D3DX11_IMAGE_LOAD_INFO* pLoadInfo,
-    ID3DX11ThreadPump* pPump,
-    ID3D11Resource** ppTexture,
-    long* pResult)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI D3DX11SaveTextureToFile(ID3D11DeviceContext* pDevice,
-    ID3D11Resource* pSrcResource,
-    D3DX11_IMAGE_FILE_FORMAT fmt,
-    const char* pDestFile)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI D3DX11CompileFromMemory(
-    LPCSTR pSrcData,
-    SIZE_T SrcDataLen,
-    LPCSTR pFileName,
-    CONST D3D10_SHADER_MACRO* pDefines,
-    LPD3D10INCLUDE pInclude,
-    LPCSTR pFunctionName,
-    LPCSTR pProfile,
-    UINT Flags1,
-    UINT Flags2,
-    ID3DX11ThreadPump* pPump,
-    ID3D10Blob** ppShader,
-    ID3D10Blob** ppErrorMsgs,
-    HRESULT* pHResult)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in dxgi.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI CreateDXGIFactory(REFIID riid, void** ppFactory)
-{
-    return CreateDXGIFactoryInternal<IDXGIFactory>(riid, ppFactory);
-}
-
-DXGL_API HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void** ppFactory)
-{
-    return CreateDXGIFactoryInternal<IDXGIFactory1>(riid, ppFactory);
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Frame debugging functions
-////////////////////////////////////////////////////////////////////////////
-
-#define DXGL_PROFILE_USE_GREMEDY_STRING_MARKER 0
-#if defined(ENABLE_FRAME_PROFILER_LABELS)
-#   define DXGL_PROFILE_USE_KHR_DEBUG 1
-#else
-#   define DXGL_PROFILE_USE_KHR_DEBUG 0
-#endif
-
-#if DXGL_PROFILE_USE_GREMEDY_STRING_MARKER
-
-template <size_t uSuffixSize>
-struct SDebugStringBuffer
-{
-    enum
-    {
-        MAX_TEXT_LENGTH = 1024
-    };
-    char s_acBuffer[MAX_TEXT_LENGTH + uSuffixSize];
-
-    SDebugStringBuffer(const char* szSuffix)
-    {
-        cryMemcpy(s_acBuffer + MAX_TEXT_LENGTH, szSuffix, uSuffixSize);
-    }
-
-    const char* Write(const char* szText)
-    {
-        size_t uTextLength(min((size_t)MAX_TEXT_LENGTH, strlen(szText)));
-        char* szDest(s_acBuffer + MAX_TEXT_LENGTH - uTextLength);
-        cryMemcpy(szDest, szText, uTextLength);
-        return szDest;
-    }
-};
-
-#define DXGL_DEBUG_STRING_BUFFER(_Suffix, _Name) SDebugStringBuffer<DXGL_ARRAY_SIZE(_Suffix)> _Name(_Suffix)
-
-DXGL_DEBUG_STRING_BUFFER(": enter", g_kEnterDebugBuffer);
-DXGL_DEBUG_STRING_BUFFER(": leave", g_kLeaveDebugBuffer);
-
-#endif //DXGL_PROFILE_USE_GREMEDY_STRING_MARKER
-
-
-
-DXGL_API void DXGLProfileLabel(const char* szName)
-{
-#if DXGL_PROFILE_USE_GREMEDY_STRING_MARKER && DXGL_EXTENSION_LOADER
-    if (DXGL_GL_EXTENSION_SUPPORTED(GREMEDY_string_marker))
-    {
-        glStringMarkerGREMEDY(0, szName);
-    }
-#endif //DXGL_PROFILE_USE_GREMEDY_STRING_MARKER && DXGL_EXTENSION_LOADER
-#if DXGL_PROFILE_USE_KHR_DEBUG && DXGL_SUPPORT_DEBUG_OUTPUT
-    {
-        if (glDebugMessageInsert)
-        {
-            glDebugMessageInsert(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_MARKER, 0, GL_DEBUG_SEVERITY_NOTIFICATION, strlen(szName), szName);
-        }
-#if defined(OPENGL_ES)
-        else if(glDebugMessageInsertKHR)
-        {
-            glDebugMessageInsertKHR(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_MARKER, 0, GL_DEBUG_SEVERITY_NOTIFICATION, strlen(szName), szName);
-        }
-#endif
-    }
-#endif //DXGL_PROFILE_USE_KHR_DEBUG && DXGL_SUPPORT_DEBUG_OUTPUT
-}
-
-DXGL_API void DXGLProfileLabelPush(const char* szName)
-{
-#if DXGL_PROFILE_USE_GREMEDY_STRING_MARKER && DXGL_EXTENSION_LOADER
-    if (DXGL_GL_EXTENSION_SUPPORTED(GREMEDY_string_marker))
-    {
-        glStringMarkerGREMEDY(0, g_kEnterDebugBuffer.Write(szName));
-    }
-#endif //DXGL_PROFILE_USE_GREMEDY_STRING_MARKER && DXGL_EXTENSION_LOADER
-#if DXGL_PROFILE_USE_KHR_DEBUG && DXGL_SUPPORT_DEBUG_OUTPUT
-    {
-        if (glPushDebugGroup)
-        {
-            glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, strlen(szName), szName);
-        }
-#if defined(OPENGL_ES)
-        else if(glPushDebugGroupKHR)
-        {
-            glPushDebugGroupKHR(GL_DEBUG_SOURCE_APPLICATION, 0, strlen(szName), szName);
-        }
-#endif
-    }
-#endif //DXGL_PROFILE_USE_KHR_DEBUG && DXGL_SUPPORT_DEBUG_OUTPUT
-#if defined(AZ_PLATFORM_MAC)
-    glPushGroupMarkerEXT(0, szName);
-#endif
-}
-
-DXGL_API void DXGLProfileLabelPop(const char* szName)
-{
-#if DXGL_PROFILE_USE_GREMEDY_STRING_MARKER && DXGL_EXTENSION_LOADER
-    if (DXGL_GL_EXTENSION_SUPPORTED(GREMEDY_string_marker))
-    {
-        glStringMarkerGREMEDY(0, g_kLeaveDebugBuffer.Write(szName));
-    }
-#endif //DXGL_PROFILE_USE_GREMEDY_STRING_MARKER && DXGL_EXTENSION_LOADER
-#if DXGL_PROFILE_USE_KHR_DEBUG && DXGL_SUPPORT_DEBUG_OUTPUT
-    {
-        if (glPopDebugGroup)
-        {
-            glPopDebugGroup();
-        }
-#if defined(OPENGL_ES)
-        else if(glPopDebugGroupKHR)
-        {
-            glPopDebugGroupKHR();
-        }
-#endif
-    }
-#endif //DXGL_PROFILE_USE_KHR_DEBUG && DXGL_SUPPORT_DEBUG_OUTPUT
-#if defined(AZ_PLATFORM_MAC)
-    glPopGroupMarkerEXT();
-#endif
-}
-
-inline CCryDXGLDevice* GetDXGLDevice(ID3D11Device* pDevice)
-{
-    return CCryDXGLDevice::FromInterface(pDevice);
-}
-
-inline CCryDXGLDeviceContext* GetDXGLDeviceContext(ID3D11DeviceContext* pDeviceContext)
-{
-    return CCryDXGLDeviceContext::FromInterface(pDeviceContext);
-}
-
-////////////////////////////////////////////////////////////////////////////
-//  DXGL Extensions
-////////////////////////////////////////////////////////////////////////////
-
-#if !DXGL_FULL_EMULATION
-
-#if defined(OPENGL_ES) && !defined(DESKTOP_GLES)
-void DXGLSetColorDontCareActions(ID3D11RenderTargetView* const rtv,
-    bool const loadDontCare,
-    bool const storeDontCare)
-{
-    CRY_ASSERT(NULL != rtv);
-
-    NCryOpenGL::SOutputMergerView* somv = rtv->GetGLView();
-    CRY_ASSERT(somv);
-
-    NCryOpenGL::SOutputMergerTextureView* somtv = somv->AsSOutputMergerTextureView();
-    CRY_ASSERT(somtv);
-
-    NCryOpenGL::STexture* tex = somtv->m_pTexture;
-    CRY_ASSERT(tex);
-
-    tex->m_bColorLoadDontCare = loadDontCare;
-    tex->m_bColorStoreDontCare = storeDontCare;
-}
-
-void DXGLSetDepthDontCareActions(ID3D11DepthStencilView* const rtv,
-    bool const loadDontCare,
-    bool const storeDontCare)
-{
-    CRY_ASSERT(NULL != rtv);
-
-    NCryOpenGL::SOutputMergerView* somv = rtv->GetGLView();
-    CRY_ASSERT(somv);
-
-    NCryOpenGL::SOutputMergerTextureView* somtv = somv->AsSOutputMergerTextureView();
-    CRY_ASSERT(somtv);
-
-    NCryOpenGL::STexture* tex = somtv->m_pTexture;
-    CRY_ASSERT(tex);
-
-    tex->m_bDepthLoadDontCare = loadDontCare;
-    tex->m_bDepthStoreDontCare = storeDontCare;
-}
-
-void DXGLSetStencilDontCareActions(ID3D11DepthStencilView* const rtv,
-    bool const loadDontCare,
-    bool const storeDontCare)
-{
-    CRY_ASSERT(NULL != rtv);
-
-    NCryOpenGL::SOutputMergerView* somv = rtv->GetGLView();
-    CRY_ASSERT(somv);
-
-    NCryOpenGL::SOutputMergerTextureView* somtv = somv->AsSOutputMergerTextureView();
-    CRY_ASSERT(somtv);
-
-    NCryOpenGL::STexture* tex = somtv->m_pTexture;
-    CRY_ASSERT(tex);
-
-    tex->m_bStencilLoadDontCare = loadDontCare;
-    tex->m_bStencilStoreDontCare = storeDontCare;
-}
-
-void DXGLTogglePLS(ID3D11DeviceContext* pDeviceContext, bool const enable)
-{
-    if (DXGL_GL_EXTENSION_SUPPORTED(EXT_shader_pixel_local_storage))
-    {
-        NCryOpenGL::CContext* pGLContext(GetDXGLDeviceContext(pDeviceContext)->GetGLContext());
-        pGLContext->TogglePLS(enable);
-    }
-}
-#endif // defined(OPENGL_ES)
-
-void DXGLInitializeIHVSpecifix()
-{
-    NCryOpenGL::SGlobalConfig::SetIHVDefaults();
-}
-
-void DXGLInitialize(uint32 uNumSharedContexts)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYDXGL_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(CryDXGL_cpp)
-#endif
-    NCryOpenGL::SGlobalConfig::RegisterVariables();
-    NCryOpenGL::CDevice::Configure(uNumSharedContexts);
-}
-
-void DXGLFinalize()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYDXGL_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(CryDXGL_cpp)
-#endif
-}
-
-void DXGLReserveContext(ID3D11Device* pDevice)
-{
-    GetDXGLDevice(pDevice)->GetGLDevice()->ReserveContext();
-}
-
-void DXGLReleaseContext(ID3D11Device* pDevice)
-{
-    GetDXGLDevice(pDevice)->GetGLDevice()->ReleaseContext();
-}
-
-void DXGLBindDeviceContext(ID3D11DeviceContext* pDeviceContext, bool bReserved)
-{
-    NCryOpenGL::CContext* pGLContext(GetDXGLDeviceContext(pDeviceContext)->GetGLContext());
-    pGLContext->GetDevice()->BindContext(pGLContext);
-    if (bReserved)
-    {
-        pGLContext->SetReservedContext(pGLContext);
-        pGLContext->GetDevice()->ReserveContext();
-    }
-}
-
-void DXGLUnbindDeviceContext(ID3D11DeviceContext* pDeviceContext, bool bReserved)
-{
-    NCryOpenGL::CContext* pGLContext(GetDXGLDeviceContext(pDeviceContext)->GetGLContext());
-    if (bReserved)
-    {
-        pGLContext->GetDevice()->ReleaseContext();
-    }
-    pGLContext->GetDevice()->UnbindContext(pGLContext);
-}
-
-HRESULT DXGLMapBufferRange(ID3D11DeviceContext* pDeviceContext, ID3D11Buffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource)
-{
-    NCryOpenGL::CContext* pGLContext(static_cast<CCryDXGLDeviceContext*>(pDeviceContext)->GetGLContext());
-    NCryOpenGL::SBuffer* pGLBuffer(pBuffer->GetGLBuffer());
-    return (*pGLBuffer->m_pfMapBufferRange)(pGLBuffer, uOffset, uSize, MapType, MapFlags, pMappedResource, pGLContext) ? S_OK : E_FAIL;
-}
-
-void DXGLSetDepthBoundsTest(bool bEnabled, float fMin, float fMax)
-{
-#if defined(GL_EXT_depth_bounds_test)
-    if (bEnabled)
-    {
-        glEnable(GL_DEPTH_BOUNDS_TEST_EXT);
-    }
-    else
-    {
-        glDisable(GL_DEPTH_BOUNDS_TEST_EXT);
-    }
-    glDepthBoundsEXT(fMin, fMax);
-#else
-    DXGL_WARNING("Depths Bounds Test extension not available on this platform");
-#endif
-}
-
-void DXGLTogglePixelTracing(ID3D11DeviceContext* pDeviceContext, bool bEnable, uint32 uShaderHash, uint32 uPixelX, uint32 uPixelY)
-{
-#if DXGL_ENABLE_SHADER_TRACING
-    GetDXGLDeviceContext(pDeviceContext)->GetGLContext()->TogglePixelTracing(bEnable, uShaderHash, uPixelX, uPixelY);
-#endif //DXGL_ENABLE_SHADER_TRACING
-}
-
-void DXGLToggleVertexTracing(ID3D11DeviceContext* pDeviceContext, bool bEnable, uint32 uShaderHash, uint32 uVertexID)
-{
-#if DXGL_ENABLE_SHADER_TRACING
-    GetDXGLDeviceContext(pDeviceContext)->GetGLContext()->ToggleVertexTracing(bEnable, uShaderHash, uVertexID);
-#endif //DXGL_ENABLE_SHADER_TRACING
-}
-
-void DXGLCSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    GetDXGLDeviceContext(pDeviceContext)->CSSetConstantBuffers1(StartSlot, NumBuffers, pConstantBuffers, pFirstConstant, pNumConstants);
-}
-
-void DXGLPSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    GetDXGLDeviceContext(pDeviceContext)->PSSetConstantBuffers1(StartSlot, NumBuffers, pConstantBuffers, pFirstConstant, pNumConstants);
-}
-
-void DXGLVSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    GetDXGLDeviceContext(pDeviceContext)->VSSetConstantBuffers1(StartSlot, NumBuffers, pConstantBuffers, pFirstConstant, pNumConstants);
-}
-
-void DXGLGSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    GetDXGLDeviceContext(pDeviceContext)->GSSetConstantBuffers1(StartSlot, NumBuffers, pConstantBuffers, pFirstConstant, pNumConstants);
-}
-
-void DXGLHSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    GetDXGLDeviceContext(pDeviceContext)->HSSetConstantBuffers1(StartSlot, NumBuffers, pConstantBuffers, pFirstConstant, pNumConstants);
-}
-
-void DXGLDSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    GetDXGLDeviceContext(pDeviceContext)->DSSetConstantBuffers1(StartSlot, NumBuffers, pConstantBuffers, pFirstConstant, pNumConstants);
-}
-
-void DXGLIssueFrameFences(ID3D11Device* pDevice)
-{
-    GetDXGLDevice(pDevice)->GetGLDevice()->IssueFrameFences();
-}
-
-#endif //!DXGL_FULL_EMULATION
-
-#if !defined(WIN32)
-DXGL_API bool DXGLCreateWindow(
-    const char* szTitle,
-    uint32 uWidth,
-    uint32 uHeight,
-    bool bFullScreen,
-    HWND* pHandle)
-{
-    return NCryOpenGL::CDevice::CreateWindow(szTitle, uWidth, uHeight, bFullScreen, pHandle);
-}
-
-DXGL_API void DXGLDestroyWindow(HWND kHandle)
-{
-    NCryOpenGL::CDevice::DestroyWindow(kHandle);
-}
-#endif // !defined(WIN32)
-
-////////////////////////////////////////////////////////////////////////////
-//  DxErr Logging and error functions
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API const char*  WINAPI DXGetErrorStringA(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return "";
-}
-
-DXGL_API const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return L"";
-}
-
-DXGL_API const char*  WINAPI DXGetErrorDescriptionA(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return "";
-}
-
-DXGL_API const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return L"";
-}
-
-DXGL_API HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-#if !DXGL_FULL_EMULATION
-
-SDXGLContextThreadLocalHandle::SDXGLContextThreadLocalHandle()
-{
-    m_pTLSHandle = NCryOpenGL::CreateTLS();
-}
-
-SDXGLContextThreadLocalHandle::~SDXGLContextThreadLocalHandle()
-{
-    NCryOpenGL::DestroyTLS(m_pTLSHandle);
-}
-
-void SDXGLContextThreadLocalHandle::Set(ID3D11Device* pDevice)
-{
-    ID3D11Device* pPrevDevice(static_cast<ID3D11Device*>(NCryOpenGL::GetTLSValue(m_pTLSHandle)));
-    if (pPrevDevice != pDevice)
-    {
-        if (pPrevDevice != NULL)
-        {
-            DXGLReleaseContext(pPrevDevice);
-        }
-        NCryOpenGL::SetTLSValue(m_pTLSHandle, pDevice);
-        if (pDevice != NULL)
-        {
-            DXGLReserveContext(pDevice);
-        }
-    }
-}
-
-SDXGLDeviceContextThreadLocalHandle::SDXGLDeviceContextThreadLocalHandle()
-{
-    m_pTLSHandle = NCryOpenGL::CreateTLS();
-}
-
-SDXGLDeviceContextThreadLocalHandle::~SDXGLDeviceContextThreadLocalHandle()
-{
-    NCryOpenGL::DestroyTLS(m_pTLSHandle);
-}
-
-void SDXGLDeviceContextThreadLocalHandle::Set(ID3D11DeviceContext* pDeviceContext, bool bReserved)
-{
-    ID3D11DeviceContext* pPrevDeviceContext(static_cast<ID3D11DeviceContext*>(NCryOpenGL::GetTLSValue(m_pTLSHandle)));
-    if (pPrevDeviceContext != pDeviceContext)
-    {
-        if (pPrevDeviceContext != NULL)
-        {
-            DXGLUnbindDeviceContext(pPrevDeviceContext, bReserved);
-        }
-        NCryOpenGL::SetTLSValue(m_pTLSHandle, pDeviceContext);
-        if (pDeviceContext != NULL)
-        {
-            DXGLBindDeviceContext(pDeviceContext, bReserved);
-        }
-    }
-}
-
-#endif //!DXGL_FULL_EMULATION
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CryDXGL.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CryDXGL.hpp
deleted file mode 100644
index 9fda13c614..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/CryDXGL.hpp
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Entry point header for the DXGL wrapper library
-
-
-#ifndef __CRYDXGL__
-#define __CRYDXGL__
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define CRYDXGL_HPP_SECTION_1 1
-#endif
-
-#if !defined(DXGL_FULL_EMULATION)
-#define DXGL_FULL_EMULATION 0
-#endif //!defined(DXGL_FULL_EMULATION)
-
-#include "Definitions/CryDXGLMisc.hpp"
-
-#if DXGL_FULL_EMULATION
-    #include "Definitions/DXGL_IDXGISwapChain.h"
-    #include "Definitions/DXGL_IDXGIFactory1.h"
-#endif
-
-#if !DXGL_FULL_EMULATION
-#include "Interfaces/CCryDXGLBlob.hpp"
-#include "Interfaces/CCryDXGLSwapChain.hpp"
-#include "Interfaces/CCryDXGLQuery.hpp"
-#include "Interfaces/CCryDXGLSwitchToRef.hpp"
-
-#include "Interfaces/CCryDXGLBuffer.hpp"
-#include "Interfaces/CCryDXGLDepthStencilView.hpp"
-#include "Interfaces/CCryDXGLInputLayout.hpp"
-#include "Interfaces/CCryDXGLRenderTargetView.hpp"
-#include "Interfaces/CCryDXGLShader.hpp"
-#include "Interfaces/CCryDXGLShaderReflection.hpp"
-#include "Interfaces/CCryDXGLDepthStencilView.hpp"
-#include "Interfaces/CCryDXGLShaderResourceView.hpp"
-#include "Interfaces/CCryDXGLUnorderedAccessView.hpp"
-#include "Interfaces/CCryDXGLView.hpp"
-#include "Interfaces/CCryDXGLBlendState.hpp"
-#include "Interfaces/CCryDXGLDepthStencilState.hpp"
-#include "Interfaces/CCryDXGLRasterizerState.hpp"
-#include "Interfaces/CCryDXGLSamplerState.hpp"
-#include "Interfaces/CCryDXGLTexture1D.hpp"
-#include "Interfaces/CCryDXGLTexture2D.hpp"
-#include "Interfaces/CCryDXGLTexture3D.hpp"
-#include "Interfaces/CCryDXGLGIAdapter.hpp"
-#include "Interfaces/CCryDXGLGIFactory.hpp"
-#include "Interfaces/CCryDXGLGIOutput.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT || DXGL_FULL_EMULATION
-    #include "Definitions/DXGL_ID3D11Device.h"
-    #include "Definitions/DXGL_ID3D11DeviceContext.h"
-#else
-    #include "Interfaces/CCryDXGLDevice.hpp"
-    #include "Interfaces/CCryDXGLDeviceContext.hpp"
-#endif
-
-// Set to 0 to force runtime shader translation
-#define DXGL_INPUT_GLSL !DXGL_FULL_EMULATION
-
-// TODO: Investigate what prevents framebuffer completeness in some framebuffers with depth stencil bigger than color buffers (which is ok according to the standard)
-#define CRY_OPENGL_DO_NOT_ALLOW_LARGER_RT
-
-//  need this because the engine needs to know if we are running GL ES 3.0 or GL ES 3.1
-#define DXGL_VERSION_32 320 /* DX 10.1 10.2 */
-#define DXGL_VERSION_41 410
-#define DXGL_VERSION_42 420
-#define DXGL_VERSION_43 430 /* DX 11 */
-#define DXGL_VERSION_44 440
-
-#define DXGLES_VERSION_30 300
-#define DXGLES_VERSION_31 310
-#define DXGLES_VERSION_32 320
-
-#define DXGL_USE_ADRENO_ES_EMULATOR 0
-#define DXGL_USE_POWERVR_ES_EMULATOR 0
-
-// Set to 1 to enable NVidia's Tegra-specific extensions for Android
-#if defined(ANDROID) && !defined(DXGL_ANDROID_GLES_30) // TODO: TEGRA DXT texture support shouldn't be an ifdef in the first place
-#define DXGL_SUPPORT_TEGRA 1
-#endif
-
-//This is also defined in GLCommon.hpp
-#if (defined(ANDROID) && !defined(DXGL_ANDROID_GL)) || DXGL_USE_ADRENO_ES_EMULATOR || DXGL_USE_POWERVR_ES_EMULATOR
-#define OPENGL_ES
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYDXGL_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(CryDXGL_hpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(ANDROID)
-#define DXGL_USE_EGL
-#define DXGL_USE_LOADER_GLAD
-#define DXGL_REQUIRED_VERSION 0
-#define DXGLES_REQUIRED_VERSION DXGLES_VERSION_30
-#elif defined(AZ_PLATFORM_LINUX)
-#define OPENGL_ES
-#if defined(OPENGL_ES)
-#   define DESKTOP_GLES // Differentiate between mobile and desktop OpenGL ES
-#   define DXGL_USE_EGL
-#   define DXGL_USE_LOADER_GLAD
-#   define DXGLES_REQUIRED_VERSION DXGLES_VERSION_30
-#   define DXGL_REQUIRED_VERSION 0
-#else
-#   define DXGL_USE_EGL
-#   define DXGL_USE_LOADER_GLAD
-#   define DXGL_REQUIRED_VERSION DXGL_VERSION_43
-#   define DXGLES_REQUIRED_VERSION 0
-#endif // defined(OPENGL_ES)
-#elif defined(WIN32)
-#if defined(OPENGL_ES)
-#   define DXGL_USE_EGL
-#   define DXGL_USE_LOADER_GLAD
-#   define DXGLES_REQUIRED_VERSION DXGLES_VERSION_30
-#   define DXGL_REQUIRED_VERSION 0
-#else
-#   define DXGL_USE_WGL
-#   define DXGL_USE_LOADER_GLAD
-#   define DXGL_REQUIRED_VERSION DXGL_VERSION_44
-#   define DXGLES_REQUIRED_VERSION 0
-#endif // defined(OPENGL_ES)
-#else
-#error "OpenGL is not supported on this platform"
-#endif
-
-typedef ID3D10Blob* LPD3D10BLOB;
-typedef ID3D10Blob ID3DBlob;
-
-#if DXGL_FULL_EMULATION
-    #if defined(OPENGL)
-        #define DXGL_API DXGL_IMPORT
-    #else
-        #define DXGL_API DXGL_EXPORT
-    #endif
-#else
-    #define DXGL_API
-#endif
-
-#if DXGL_FULL_EMULATION && !defined(WIN32)
-#define DXGL_EXTERN extern "C"
-#else
-#define DXGL_EXTERN
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3D11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-typedef HRESULT (WINAPI * PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)(IDXGIAdapter*,
-    D3D_DRIVER_TYPE, HMODULE, UINT,
-    CONST D3D_FEATURE_LEVEL*,
-    UINT FeatureLevels, UINT, CONST DXGI_SWAP_CHAIN_DESC*,
-    IDXGISwapChain**, ID3D11Device**,
-    D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3D11CreateDeviceAndSwapChain(
-    IDXGIAdapter* pAdapter,
-    D3D_DRIVER_TYPE DriverType,
-    HMODULE Software,
-    UINT Flags,
-    CONST D3D_FEATURE_LEVEL* pFeatureLevels,
-    UINT FeatureLevels,
-    UINT SDKVersion,
-    CONST DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
-    IDXGISwapChain** ppSwapChain,
-    ID3D11Device** ppDevice,
-    D3D_FEATURE_LEVEL* pFeatureLevel,
-    ID3D11DeviceContext** ppImmediateContext);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3D10CreateBlob(SIZE_T NumBytes, LPD3D10BLOB* ppBuffer);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DCompiler.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DReflect(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    REFIID pInterface,
-    void** ppReflector);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DDisassemble(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    UINT Flags,
-    LPCSTR szComments,
-    ID3DBlob** ppDisassembly);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DX11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DX11CreateTextureFromMemory(
-    ID3D11Device* pDevice,
-    const void* pSrcData,
-    size_t SrcDataSize,
-    D3DX11_IMAGE_LOAD_INFO* pLoadInfo,
-    ID3DX11ThreadPump* pPump,
-    ID3D11Resource** ppTexture,
-    long* pResult);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DX11SaveTextureToFile(ID3D11DeviceContext* pDevice,
-    ID3D11Resource* pSrcResource,
-    D3DX11_IMAGE_FILE_FORMAT fmt,
-    const char* pDestFile);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DX11CompileFromMemory(
-    LPCSTR pSrcData,
-    SIZE_T SrcDataLen,
-    LPCSTR pFileName,
-    CONST D3D10_SHADER_MACRO* pDefines,
-    LPD3D10INCLUDE pInclude,
-    LPCSTR pFunctionName,
-    LPCSTR pProfile,
-    UINT Flags1,
-    UINT Flags2,
-    ID3DX11ThreadPump* pPump,
-    ID3D10Blob** ppShader,
-    ID3D10Blob** ppErrorMsgs,
-    HRESULT* pHResult);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in dxgi.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI CreateDXGIFactory(REFIID riid, void** ppFactory);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void** ppFactory);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Frame debugging functions
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API void DXGLProfileLabel(const char* szName);
-
-DXGL_EXTERN DXGL_API void DXGLProfileLabelPush(const char* szName);
-
-DXGL_EXTERN DXGL_API void DXGLProfileLabelPop(const char* szName);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  DXGL Extensions
-////////////////////////////////////////////////////////////////////////////
-
-#if defined(OPENGL_ES) && !defined(DESKTOP_GLES)
-void DXGLSetColorDontCareActions(ID3D11RenderTargetView* const rtv,
-    bool const loadDontCare = false,
-    bool const storeDontCare = false);
-void DXGLSetDepthDontCareActions(ID3D11DepthStencilView* const dsv,
-    bool const loadDontCare = false,
-    bool const storeDontCare = false);
-void DXGLSetStencilDontCareActions(ID3D11DepthStencilView* const dsv,
-    bool const loadDontCare = false,
-    bool const storeDontCare = false);
-
-void DXGLTogglePLS(ID3D11DeviceContext* pDeviceContext, bool const enable);
-#endif // defined(OPENGL_ES)
-
-void DXGLInitializeIHVSpecifix();
-
-
-#if !DXGL_FULL_EMULATION
-
-// Statically initialize DXGL. Specify with uNumSharedContexts the maximum
-// number of threads expected to call device methods at the same time.
-void DXGLInitialize(uint32 uNumSharedContexts);
-
-// Finalize DXGL. Free memory and release graphic resources
-void DXGLFinalize();
-
-// Any thread frequently using the device should keep a reserved context
-// to avoid performance penalty of context switching.
-// In order to do so, call DXGLReserveContext before using the device
-// and DXGLReleaseContext after.
-void DXGLReserveContext(ID3D11Device* pDevice);
-void DXGLReleaseContext(ID3D11Device* pDevice);
-
-// Direct3D mandates that access to the device context by multiple threads
-// has to be serialized. DXGL additionally requires that each thread taking
-// control over the device context calls DXGLBindDeviceContext before
-// calling any of its functions, and DXGLUnbindDeviceContext after.
-void DXGLBindDeviceContext(ID3D11DeviceContext* pDeviceContext, bool bReserved);
-void DXGLUnbindDeviceContext(ID3D11DeviceContext* pDeviceContext, bool bReserved);
-
-HRESULT DXGLMapBufferRange(ID3D11DeviceContext* pDeviceContext, ID3D11Buffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource);
-
-void DXGLSetDepthBoundsTest(bool bEnabled, float fMin, float fMax);
-
-void DXGLTogglePixelTracing(ID3D11DeviceContext* pDeviceContext, bool bEnable, uint32 uShaderHash, uint32 uPixelX = 0, uint32 uPixelY = 0);
-void DXGLToggleVertexTracing(ID3D11DeviceContext* pDeviceContext, bool bEnable, uint32 uShaderHash, uint32 uVertexID = 0);
-
-void DXGLCSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-void DXGLPSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-void DXGLVSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-void DXGLGSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-void DXGLHSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-void DXGLDSSetConstantBuffers(ID3D11DeviceContext* pDeviceContext, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-
-void DXGLIssueFrameFences(ID3D11Device* pDevice);
-
-#endif //!DXGL_FULL_EMULATION
-
-#if !defined(WIN32)
-DXGL_EXTERN DXGL_API bool DXGLCreateWindow(const char* szTitle, uint32 uWidth, uint32 uHeight, bool bFullScreen, HWND* pHandle);
-DXGL_EXTERN DXGL_API void DXGLDestroyWindow(HWND kHandle);
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-//  DxErr Logging and error functions
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API const char*  WINAPI DXGetErrorStringA(HRESULT hr);
-DXGL_EXTERN DXGL_API const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr);
-
-DXGL_EXTERN DXGL_API const char*  WINAPI DXGetErrorDescriptionA(HRESULT hr);
-DXGL_EXTERN DXGL_API const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox);
-DXGL_EXTERN DXGL_API HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox);
-
-#ifdef UNICODE
-    #define DXGetErrorString DXGetErrorStringW
-    #define DXGetErrorDescription DXGetErrorDescriptionW
-    #define DXTrace DXTraceW
-#else
-    #define DXGetErrorString DXGetErrorStringA
-    #define DXGetErrorDescription DXGetErrorDescriptionA
-    #define DXTrace DXTraceA
-#endif
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Renderer helpers
-////////////////////////////////////////////////////////////////////////////
-
-#if !DXGL_FULL_EMULATION
-
-struct SDXGLContextThreadLocalHandle
-{
-    void* m_pTLSHandle;
-
-    SDXGLContextThreadLocalHandle();
-    ~SDXGLContextThreadLocalHandle();
-
-    void Set(ID3D11Device* pDevice);
-};
-
-struct SDXGLDeviceContextThreadLocalHandle
-{
-    void* m_pTLSHandle;
-
-    SDXGLDeviceContextThreadLocalHandle();
-    ~SDXGLDeviceContextThreadLocalHandle();
-
-    void Set(ID3D11DeviceContext* pDeviceContext, bool bReserved);
-};
-
-#endif //!DXGL_FULL_EMULATION
-
-#endif //__CRYDXGL__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLGuid.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLGuid.hpp
deleted file mode 100644
index 80f753544a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLGuid.hpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains the definition of a cross platform unique
-//               identifier for DXGL interfaces and names
-
-
-#ifndef __CRYDXGLGUID__
-#define __CRYDXGLGUID__
-
-#define DXGL_DEFINE_GUID(_NAME, _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7) \
-    const GUID _NAME =                                                                 \
-    {                                                                                  \
-        0x ## _D0,                                                                     \
-        0x ## _W0,                                                                     \
-        0x ## _W1,                                                                     \
-        {                                                                              \
-            0x ## _B0,                                                                 \
-            0x ## _B1,                                                                 \
-            0x ## _B2,                                                                 \
-            0x ## _B3,                                                                 \
-            0x ## _B4,                                                                 \
-            0x ## _B5,                                                                 \
-            0x ## _B6,                                                                 \
-            0x ## _B7                                                                  \
-        }                                                                              \
-    };
-
-#if defined(WIN32)
-
-#define DXGL_GUID_QUOTE(_STRING) #_STRING
-#define DXGL_GUID_STRING(_D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7) \
-    DXGL_GUID_QUOTE(_D0-_W0-_W1-_B0##_B1-_B2##_B3##_B4##_B5##_B6##_B7)
-#define DXGL_DEFINE_TYPE_GUID(_CLASS, _TYPE, _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7) \
-    _CLASS __declspec(uuid(DXGL_GUID_STRING(_D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7))) _TYPE;
-
-#else //defined(WIN32)
-# ifndef GUID_DEFINED
-# define GUID_DEFINED
-typedef struct _GUID
-{
-    uint32 Data1;
-    ushort Data2;
-    ushort Data3;
-    uchar Data4[8];
-} GUID;
-# endif
-
-# ifndef IID_DEFINED
-# define IID_DEFINED
-typedef GUID IID;
-# endif
-
-#ifndef _SYS_GUID_OPERATOR_EQ_
-#define _SYS_GUID_OPERATOR_EQ_
-inline bool operator==(const GUID& kLeft, const GUID& kRight)
-{
-    return memcmp(&kLeft, &kRight, sizeof(GUID)) == 0;
-}
-#endif
-
-# ifndef _REFGUID_DEFINED
-# define _REFGUID_DEFINED
-typedef const GUID& REFGUID;
-# endif
-#ifndef _REFIID_DEFINED
-#define _REFIID_DEFINED
-typedef const GUID& REFIID;
-#endif
-
-template <typename T>
-struct SCryDXGLTypeGuid{};
-
-#define DXGL_TYPE_GUID_NAME(_TYPE) gDXGLTypeGUID__ ## _TYPE
-#define DXGL_DEFINE_TYPE_GUID(_CLASS, _TYPE, _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7)        \
-    DXGL_DEFINE_GUID(DXGL_TYPE_GUID_NAME(_TYPE), _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7)    \
-    template <>                                                                                            \
-    struct SCryDXGLTypeGuid<_CLASS _TYPE>{ static const GUID& Get() { return DXGL_TYPE_GUID_NAME(_TYPE); } \
-    };
-
-#ifndef UUIDOF_DEFINED
-#define UUIDOF_DEFINED
-#define __uuidof(_TYPE) SCryDXGLTypeGuid<_TYPE>::Get()
-#endif
-
-#endif //!defined(WIN32)
-
-// Disable Uncrustify : *INDENT-OFF* because the missing 0x prefix messes it up
-#if DXGL_FULL_EMULATION
-
-DXGL_DEFINE_TYPE_GUID(struct, IUnknown,                             00000000, 0000, 0000, C0, 00, 00, 00, 00, 00, 00, 46)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D10Blob,                           8BA5FB08, 5195, 40e2, AC, 58, 0D, 98, 9C, 3A, 01, 02)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DeviceChild,                    1841E5C8, 16B0, 489B, BC, C8, 44, CF, B0, D5, DE, AE)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DepthStencilState,              03823EFB, 8D8F, 4E1C, 9A, A2, F6, 4B, B2, CB, FD, F1)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11BlendState,                     75B68FAA, 347D, 4159, 8F, 45, A0, 64, 0F, 01, CD, 9A)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11RasterizerState,                9BB4AB81, AB1A, 4D8F, B5, 06, FC, 04, 20, 0B, 6E, E7)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Resource,                       DC8E63F3, D12B, 4952, B4, 7B, 5E, 45, 02, 6A, 86, 2D)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Buffer,                         48570B85, D1EE, 4FCD, A2, 50, EB, 35, 07, 22, B0, 37)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Texture1D,                      F8FB5C27, C6B3, 4F75, A4, C8, 43, 9A, F2, EF, 56, 4C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Texture2D,                      6F15AAF2, D208, 4E89, 9A, B4, 48, 95, 35, D3, 4F, 9C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Texture3D,                      037E866E, F56D, 4357, A8, AF, 9D, AB, BE, 6E, 25, 0E)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11View,                           839D1216, BB2E, 412B, B7, F4, A9, DB, EB, E0, 8E, D1)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderResourceView,             B0E06FE0, 8192, 4E1A, B1, CA, 36, D7, 41, 47, 10, B2)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11RenderTargetView,               DFDBA067, 0B8D, 4865, 87, 5B, D7, B4, 51, 6C, C1, 64)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DepthStencilView,               9FDAC92A, 1876, 48C3, AF, AD, 25, B9, 4F, 84, A9, B6)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11UnorderedAccessView,            28ACF509, 7F5C, 48F6, 86, 11, F3, 16, 01, 0A, 63, 80)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11VertexShader,                   3B301D64, D678, 4289, 88, 97, 22, F8, 92, 8B, 72, F3)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11HullShader,                     8E5C6061, 628A, 4C8E, 82, 64, BB, E4, 5C, B3, D5, DD)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DomainShader,                   F582C508, 0F36, 490C, 99, 77, 31, EE, CE, 26, 8C, FA)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11GeometryShader,                 38325B96, EFFB, 4022, BA, 02, 2E, 79, 5B, 70, 27, 5C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11PixelShader,                    EA82E40D, 51DC, 4F33, 93, D4, DB, 7C, 91, 25, AE, 8C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ComputeShader,                  4F5B196E, C2BD, 495E, BD, 01, 1F, DE, D3, 8E, 49, 69)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11InputLayout,                    E4819DDC, 4CF0, 4025, BD, 26, 5D, E8, 2A, 3E, 07, B7)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11SamplerState,                   DA6FEA51, 564C, 4487, 98, 10, F0, D0, F9, B4, E3, A5)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Asynchronous,                   4B35D0CD, 1E15, 4258, 9C, 98, 1B, 13, 33, F6, DD, 3B)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Query,                          D6C00747, 87B7, 425E, B8, 4D, 44, D1, 08, 56, 0A, FD)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Predicate,                      9EB576DD, 9F77, 4D86, 81, AA, 8B, AB, 5F, E4, 90, E2)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Counter,                        6E8C49FB, A371, 4770, B4, 40, 29, 08, 60, 22, B7, 41)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ClassInstance,                  A6CD7FAA, B0B7, 4A2F, 94, 36, 86, 62, A6, 57, 97, CB)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ClassLinkage,                   DDF57CBA, 9543, 46E4, A1, 2B, F2, 07, A0, FE, 7F, ED)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11CommandList,                    A24BC4D1, 769E, 43F7, 80, 13, 98, FF, 56, 6C, 18, E2)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DeviceContext,                  C0BFA96C, E089, 44FB, 8E, AF, 26, F8, 79, 61, 90, DA)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Device,                         DB6F6DDB, AC77, 4E88, 82, 53, 81, 9D, F9, BB, F1, 40)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflection,               8D536CA1, 0CCA, 4956, A8, 37, 78, 69, 63, 75, 55, 84)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflectionType,           6E6FFA6A, 9BAE, 4613, A5, 1E, 91, 65, 2D, 50, 8C, 21)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflectionVariable,       51F23923, F3E5, 4BD1, 91, CB, 60, 61, 77, D8, DB, 4C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflectionConstantBuffer, EB62D63D, 93DD, 4318, 8A, E8, C6, F8, 3A, D3, 71, B8)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11SwitchToRef,                    1EF337E3, 58E7, 4F83, A6, 92, DB, 22, 1F, 5E, D4, 7E)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIObject,                          AEC22FB8, 76F3, 4639, 9B, E0, 28, EB, 43, A6, 7A, 2E)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIDeviceSubObject,                 3D3E0379, F9DE, 4D58, BB, 6C, 18, D6, 29, 92, F1, A6)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIOutput,                          AE02EEDB, C735, 4690, 8D, 52, 5A, 8D, C2, 02, 13, AA)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIAdapter,                         2411E7E1, 12AC, 4CCF, BD, 14, 97, 98, E8, 53, 4D, C0)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIAdapter1,                        29038f61, 3839, 4626, 91, fd, 08, 68, 79, 01, 1a, 05)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIFactory,                         7b7166ec, 21c7, 44ae, b2, 1a, c9, ae, 32, 1a, e3, 69)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIFactory1,                        770AAE78, F26F, 4DBA, A8, 29, 25, 3C, 83, D1, B3, 87)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIDevice,                          54EC77FA, 1377, 44E6, 8C, 32, 88, FD, 5F, 44, C8, 4C)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGISwapChain,                       310d36a0, d2e7, 4c0a, aa, 04, 6a, 9d, 23, b8, 88, 6a)
-DXGL_DEFINE_GUID(WKPDID_D3DDebugObjectName, 429B8C22, 9188, 4B0C, 87, 42, AC, B0, BF, 85, C2, 00)
-
-#else
-
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLTexture1D,         637BD3A1, 3507, 4ECA, B0, 24, F4, 5E, 72, 1A, 93, CA)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLTexture2D,         810C3ECB, 11EA, 48C6, 92, EE, FE, 1F, 56, CC, A1, FB)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLTexture3D,         AD18E34A, 1879, 4329, 8A, 38, 47, 3E, 98, 92, 11, F6)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLBuffer,            2FC0ECFE, C29D, 468C, 96, B1, B4, 7E, A0, 02, 6B, AC)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLResource,          2B819A4A, B3DE, 4999, 93, DA, 03, 31, D7, 94, AE, 2E)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLView,              D2D7D83A, 77D1, 4112, A7, 80, 67, 98, 30, 70, 2F, 59)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLQuery,             EF4578BD, D215, 4EF8, 9B, C3, D5, AD, 83, DA, 77, EC)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLDebug,             AAEE26AF, 2E73, 478F, B6, 0C, 8B, 1D, 90, 4D, 5F, 4D)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLShaderReflection,  4B1CFC1E, 4E1E, 4954, A3, BB, E5, 17, 90, E3, 5F, A6)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLDevice,            36525D64, 2382, 4130, 81, 00, 78, DE, 5D, 43, 9F, 33)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLDeviceChild,       E61E0A3E, F6BD, 4998, B0, 1B, 9A, D8, F9, CA, 67, 30)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLSwitchToRef,       AD18E34A, 1879, 4329, 8A, 38, 47, 3E, 98, 92, 11, F6)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIFactory,         408D1CF0, 64A9, 4B2D, 99, 53, B0, D8, CD, CE, BA, AF)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIAdapter,         BA6BC4F4, 7419, 4CDA, A4, 76, 0C, 89, 35, 6B, 48, 6F)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIDevice,          ED665E26, B530, 432F, 83, 19, BB, 2D, 87, FA, 71, C2)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIObject,          CB223673, 742A, 458F, 90, ED, AC, 1E, 25, 94, 83, 46)
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Device,             2203D7E1, 1491, 4D0A, BA, E1, 28, F3, AD, 1A, 24, 56)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DeviceContext,      649E1339, C585, 4F31, 8B, F6, E2, 6C, D4, 20, EA, 82)
-#endif //DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-
-DXGL_DEFINE_GUID(WKPDID_D3DDebugObjectName, BD6C7F86, 6C13, 453C, 92, B9, 70, 31, B4, D1, 51, D5)
-
-#endif //DXGL_FULL_EMULATION
-// Enable Uncrustify : *INDENT-ON*
-
-#undef DXGL_DEFINE_GUID
-#undef DXGL_QUOTE
-
-#endif
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLLegacy.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLLegacy.hpp
deleted file mode 100644
index 487e77f601..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLLegacy.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums from
-//               Direct3D 9 still required by the Direct3D 11 renderer
-
-
-#ifndef __CRYDXGLLEGACY__
-#define __CRYDXGLLEGACY__
-
-#if !defined(APPLE) // This is defined in RenderDll/RenderDll_precompiled.h for APPLE
-/* Pool types */
-typedef enum _D3DPOOL
-{
-    D3DPOOL_DEFAULT                 = 0,
-    D3DPOOL_MANAGED                 = 1,
-    D3DPOOL_SYSTEMMEM               = 2,
-    D3DPOOL_SCRATCH                 = 3,
-
-    D3DPOOL_FORCE_DWORD             = 0x7fffffff
-} D3DPOOL;
-#endif
-
-#define D3D10_SHADER_DEBUG                              D3DCOMPILE_DEBUG
-#define D3D10_SHADER_SKIP_VALIDATION                    D3DCOMPILE_SKIP_VALIDATION
-#define D3D10_SHADER_SKIP_OPTIMIZATION                  D3DCOMPILE_SKIP_OPTIMIZATION
-#define D3D10_SHADER_PACK_MATRIX_ROW_MAJOR              D3DCOMPILE_PACK_MATRIX_ROW_MAJOR
-#define D3D10_SHADER_PACK_MATRIX_COLUMN_MAJOR           D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR
-#define D3D10_SHADER_PARTIAL_PRECISION                  D3DCOMPILE_PARTIAL_PRECISION
-#define D3D10_SHADER_FORCE_VS_SOFTWARE_NO_OPT           D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT
-#define D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT           D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT
-#define D3D10_SHADER_NO_PRESHADER                       D3DCOMPILE_NO_PRESHADER
-#define D3D10_SHADER_AVOID_FLOW_CONTROL                 D3DCOMPILE_AVOID_FLOW_CONTROL
-#define D3D10_SHADER_PREFER_FLOW_CONTROL                D3DCOMPILE_PREFER_FLOW_CONTROL
-#define D3D10_SHADER_ENABLE_STRICTNESS                  D3DCOMPILE_ENABLE_STRICTNESS
-#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY     D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY
-#define D3D10_SHADER_IEEE_STRICTNESS                    D3DCOMPILE_IEEE_STRICTNESS
-#define D3D10_SHADER_WARNINGS_ARE_ERRORS                D3DCOMPILE_WARNINGS_ARE_ERRORS
-
-#define D3DCOLOR_ARGB(a, r, g, b) ((D3DCOLOR)((((a) & 0xff) << 24) | (((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff)))
-#define D3DCOLOR_RGBA(r, g, b, a) D3DCOLOR_ARGB(a, r, g, b)
-#define D3DCOLOR_XRGB(r, g, b)   D3DCOLOR_ARGB(0xff, r, g, b)
-
-#define D3DSTREAMSOURCE_INDEXEDDATA  (1 << 30)
-#define D3DSTREAMSOURCE_INSTANCEDATA (2 << 30)
-
-typedef uint32 D3DCOLOR;
-
-typedef uint32 D3DFORMAT;
-
-typedef ID3D11Device ID3D10Device;
-typedef ID3D10Blob* LPD3D10BLOB;
-typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO;
-typedef D3D10_SHADER_MACRO* LPD3D10_SHADER_MACRO;
-typedef D3D_SHADER_MACRO D3D11_SHADER_MACRO;
-typedef D3D10_SHADER_MACRO* LPD3D11_SHADER_MACRO;
-typedef interface ID3DInclude ID3D10Include;
-typedef interface ID3DInclude* LPD3D10INCLUDE;
-#define IID_ID3D11ShaderReflection __uuidof(ID3D11ShaderReflection)
-
-typedef
-    enum D3D10_RESOURCE_DIMENSION
-{
-    D3D10_RESOURCE_DIMENSION_UNKNOWN    = 0,
-    D3D10_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D10_RESOURCE_DIMENSION_TEXTURE1D  = 2,
-    D3D10_RESOURCE_DIMENSION_TEXTURE2D  = 3,
-    D3D10_RESOURCE_DIMENSION_TEXTURE3D  = 4
-}   D3D10_RESOURCE_DIMENSION;
-
-
-#endif //__CRYDXGLLEGACY__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLMisc.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLMisc.hpp
deleted file mode 100644
index 8c6e183320..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/CryDXGLMisc.hpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Internal declarations of types and macros required by the
-//               DXGL library
-
-
-#ifndef __CRYDXGLMISC__
-#define __CRYDXGLMISC__
-
-#if defined(WIN32)
-#include <windows.h>
-#include <objbase.h>
-#include <mmsyscom.h>
-#endif //defined(WIN32)
-
-#if defined(DO_RENDERLOG) || !defined(_RELEASE)
-#define DXGL_VIRTUAL_DEVICE_AND_CONTEXT 1
-#else
-#define DXGL_VIRTUAL_DEVICE_AND_CONTEXT 0
-#endif
-
-#include "CryDXGLGuid.hpp"
-
-#if !defined(WIN32)
-
-#ifdef NO_ILINE
-    #define FORCEINLINE inline
-#else
-    #define FORCEINLINE __attribute__((always_inline)) inline
-#endif
-
-#define SEVERITY_SUCCESS    0
-#define SEVERITY_ERROR      1
-
-#undef SUCCEEDED
-#define SUCCEEDED(x) ((x) >= 0)
-#undef FAILED
-#define FAILED(x) (!(SUCCEEDED(x)))
-
-#define MAKE_HRESULT(sev, fac, code) \
-    ((HRESULT) (((unsigned long)(sev) << 31) | ((unsigned long)(fac) << 16) | ((unsigned long)(code))))
-
-#define S_OK                         0
-#define S_FALSE                      1
-
-#define CCHDEVICENAME 32
-
-#define CONST const
-#define VOID void
-#define THIS void
-#define THIS_
-#if !defined(TRUE) || !defined(FALSE)
-#undef TRUE
-#undef FALSE
-#define TRUE true
-#define FALSE false
-#endif //!defined(TRUE) || !defined(FALSE)
-
-#define interface struct
-#define STDMETHOD(method)        virtual HRESULT STDMETHODCALLTYPE method
-#define STDMETHOD_(type, method)  virtual type STDMETHODCALLTYPE method
-#define STDMETHODV(method)       virtual HRESULT STDMETHODVCALLTYPE method
-#define STDMETHODV_(type, method) virtual type STDMETHODVCALLTYPE method
-
-#if defined(UNICODE)
-#define TEXT(_STRING) L ## _STRING
-#else
-#define TEXT(_STRING) _STRING
-#endif
-
-typedef char CHAR;
-typedef int32 INT;
-typedef unsigned char UCHAR;
-typedef uint8 UINT8;
-typedef uint32 UINT32;
-typedef uint32 UINT;
-typedef const void* LPCVOID;
-
-typedef uint32 HMONITOR;
-typedef void* HINSTANCE;
-
-typedef struct _LUID
-{
-    uint32 LowPart;
-    long HighPart;
-} LUID, * PLUID;
-
-typedef RECT* LPRECT;
-typedef const RECT* LPCRECT;
-
-#ifndef HRESULT_VALUES_DEFINED
-#define HRESULT_VALUES_DEFINED
-enum
-{
-    E_OUTOFMEMORY  = 0x8007000E,
-    E_FAIL         = 0x80004005,
-    E_ABORT        = 0x80004004,
-    E_INVALIDARG   = 0x80070057,
-    E_NOINTERFACE  = 0x80004002,
-    E_NOTIMPL      = 0x80004001,
-    E_UNEXPECTED   = 0x8000FFFF
-};
-#endif
-
-#else
-
-// Required as long as Windows builds allow compilation through a separate DLL (CryD3DCompilerStub) to distinguish between ID3D11Blob and CCryDXGLBlob
-#define DXGL_BLOB_INTEROPERABILITY
-
-typedef RECT D3D11_RECT;
-
-#endif  // !defined(WIN32)
-
-#if defined(_MSC_VER)
-    #define DXGL_EXPORT __declspec(dllexport)
-    #define DXGL_IMPORT __declspec(dllimport)
-#elif defined(__GNUC__)
-    #define DXGL_EXPORT __attribute__ ((visibility("default")))
-    #define DXGL_IMPORT __attribute__ ((visibility("default")))
-#else
-    #define DXGL_EXPORT
-    #define DXGL_IMPORT
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of typedef interfaces
-////////////////////////////////////////////////////////////////////////////
-
-#if !DXGL_FULL_EMULATION
-
-typedef class CCryDXGLResource ID3D11Resource;
-typedef class CCryDXGLBuffer ID3D11Buffer;
-typedef class CCryDXGLTexture1D ID3D11Texture1D;
-typedef class CCryDXGLTexture2D ID3D11Texture2D;
-typedef class CCryDXGLTexture3D ID3D11Texture3D;
-typedef class CCryDXGLView ID3D11View;
-typedef class CCryDXGLRenderTargetView ID3D11RenderTargetView;
-typedef class CCryDXGLDepthStencilView ID3D11DepthStencilView;
-typedef class CCryDXGLShaderResourceView ID3D11ShaderResourceView;
-typedef class CCryDXGLUnorderedAccessView ID3D11UnorderedAccessView;
-typedef class CCryDXGLInputLayout ID3D11InputLayout;
-typedef class CCryDXGLVertexShader ID3D11VertexShader;
-typedef class CCryDXGLHullShader ID3D11HullShader;
-typedef class CCryDXGLDomainShader ID3D11DomainShader;
-typedef class CCryDXGLGeometryShader ID3D11GeometryShader;
-typedef class CCryDXGLPixelShader ID3D11PixelShader;
-typedef class CCryDXGLComputeShader ID3D11ComputeShader;
-typedef class CCryDXGLSamplerState ID3D11SamplerState;
-typedef class CCryDXGLQuery ID3D11Asynchronous;
-typedef class CCryDXGLQuery ID3D11Predicate;
-typedef class CCryDXGLQuery ID3D11Query;
-typedef class CCryDXGLGIOutput IDXGIOutput;
-typedef class CCryDXGLSwapChain IDXGISwapChain;
-typedef class CCryDXGLGIFactory IDXGIFactory;
-typedef class CCryDXGLGIFactory IDXGIFactory1;
-typedef class CCryDXGLGIObject IDXGIObject;
-typedef class CCryDXGLGIAdapter IDXGIAdapter;
-typedef class CCryDXGLGIAdapter IDXGIAdapter1;
-typedef class CCryDXGLDeviceChild ID3D11DeviceChild;
-typedef class CCryDXGLSwitchToRef ID3D11SwitchToRef;
-typedef class CCryDXGLShaderReflection ID3D11ShaderReflection;
-typedef class CCryDXGLShaderReflectionVariable ID3D11ShaderReflectionVariable;
-typedef class CCryDXGLShaderReflectionVariable ID3D11ShaderReflectionType;
-typedef class CCryDXGLShaderReflectionConstBuffer ID3D11ShaderReflectionConstantBuffer;
-typedef class CCryDXGLShaderReflection ID3D11ShaderReflection;
-typedef class CCryDXGLBlendState ID3D11BlendState;
-typedef class CCryDXGLDepthStencilState ID3D11DepthStencilState;
-typedef class CCryDXGLRasterizerState ID3D11RasterizerState;
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-#else
-typedef class CCryDXGLDevice ID3D11Device;
-typedef class CCryDXGLDevice IDXGIDevice;
-typedef class CCryDXGLDeviceContext ID3D11DeviceContext;
-#endif
-
-#endif //!DXGL_FULL_EMULATION
-
-#if defined (DXGL_BLOB_INTEROPERABILITY) || DXGL_FULL_EMULATION
-typedef struct ID3D10Blob ID3DBlob;
-#else
-typedef class CCryDXGLBlob ID3D10Blob;
-typedef class CCryDXGLBlob ID3DBlob;
-#endif
-
-#include "ICryDXGLUnknown.hpp"
-#include "DXGL_D3D11.h"
-#include "DXGL_D3DX11.h"
-#include "DXGL_D3DCompiler.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Helper functions
-////////////////////////////////////////////////////////////////////////////
-
-inline UINT D3D11CalcSubresource(UINT MipSlice, UINT ArraySlice, UINT MipLevels)
-{
-    return MipSlice + ArraySlice * MipLevels;
-}
-
-
-#include "CryDXGLLegacy.hpp"
-
-#endif //__CRYDXGLMISC__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3D11.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3D11.h
deleted file mode 100644
index 1a376bc013..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3D11.h
+++ /dev/null
@@ -1,1964 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3D11.h in the DirectX SDK
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3D11_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3D11_H
-#pragma once
-
-
-#include "DXGL_dxgi.h"
-#include "DXGL_D3DCommon.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef _D3D11_CONSTANTS
-#define _D3D11_CONSTANTS
-#define D3D11_16BIT_INDEX_STRIP_CUT_VALUE   (0xffff)
-
-#define D3D11_32BIT_INDEX_STRIP_CUT_VALUE   (0xffffffff)
-
-#define D3D11_8BIT_INDEX_STRIP_CUT_VALUE    (0xff)
-
-#define D3D11_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT    (9)
-
-#define D3D11_CLIP_OR_CULL_DISTANCE_COUNT   (8)
-
-#define D3D11_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT   (2)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT   (14)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS   (4)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT    (15)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS  (4)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT   (15)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST  (1)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS  (1)
-
-#define D3D11_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT    (64)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS    (4)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST    (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS    (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT    (128)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT    (128)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT   (16)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT   (16)
-
-#define D3D11_COMMONSHADER_SUBROUTINE_NESTING_LIMIT (32)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENTS (4)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COUNT  (4096)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_READS_PER_INST (3)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_READ_PORTS (3)
-
-#define D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX (10)
-
-#define D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN (-10)
-
-#define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE    (-8)
-
-#define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE    (7)
-
-#define D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (256)
-
-#define D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP (64)
-
-#define D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (240)
-
-#define D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP (68)
-
-#define D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (224)
-
-#define D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP (72)
-
-#define D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (208)
-
-#define D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP (76)
-
-#define D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (192)
-
-#define D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP (84)
-
-#define D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (176)
-
-#define D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP (92)
-
-#define D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (160)
-
-#define D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP (100)
-
-#define D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (144)
-
-#define D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP (112)
-
-#define D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (128)
-
-#define D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP (128)
-
-#define D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (112)
-
-#define D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP (144)
-
-#define D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (96)
-
-#define D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP (168)
-
-#define D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (80)
-
-#define D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP (204)
-
-#define D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (64)
-
-#define D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP (256)
-
-#define D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (48)
-
-#define D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP (340)
-
-#define D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (32)
-
-#define D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP (512)
-
-#define D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (16)
-
-#define D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP (768)
-
-#define D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION  (1)
-
-#define D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT (256)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP (768)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_X (768)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_Y (768)
-
-#define D3D11_CS_4_X_UAV_REGISTER_COUNT (1)
-
-#define D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION   (65535)
-
-#define D3D11_CS_TGSM_REGISTER_COUNT    (8192)
-
-#define D3D11_CS_TGSM_REGISTER_READS_PER_INST   (1)
-
-#define D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS  (1)
-
-#define D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS  (1)
-
-#define D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_X (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_Y (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_Z (64)
-
-#define D3D11_CS_THREAD_GROUP_MIN_X (1)
-
-#define D3D11_CS_THREAD_GROUP_MIN_Y (1)
-
-#define D3D11_CS_THREAD_GROUP_MIN_Z (1)
-
-#define D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL    (16384)
-
-#define D3D11_DEFAULT_BLEND_FACTOR_ALPHA    (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_BLUE (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_GREEN    (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_RED  (1.0f)
-#define D3D11_DEFAULT_BORDER_COLOR_COMPONENT    (0.0f)
-#define D3D11_DEFAULT_DEPTH_BIAS    (0)
-
-#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP  (0.0f)
-#define D3D11_DEFAULT_MAX_ANISOTROPY    (16)
-#define D3D11_DEFAULT_MIP_LOD_BIAS  (0.0f)
-#define D3D11_DEFAULT_RENDER_TARGET_ARRAY_INDEX (0)
-
-#define D3D11_DEFAULT_SAMPLE_MASK   (0xffffffff)
-
-#define D3D11_DEFAULT_SCISSOR_ENDX  (0)
-
-#define D3D11_DEFAULT_SCISSOR_ENDY  (0)
-
-#define D3D11_DEFAULT_SCISSOR_STARTX    (0)
-
-#define D3D11_DEFAULT_SCISSOR_STARTY    (0)
-
-#define D3D11_DEFAULT_SLOPE_SCALED_DEPTH_BIAS   (0.0f)
-#define D3D11_DEFAULT_STENCIL_READ_MASK (0xff)
-
-#define D3D11_DEFAULT_STENCIL_REFERENCE (0)
-
-#define D3D11_DEFAULT_STENCIL_WRITE_MASK    (0xff)
-
-#define D3D11_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX    (0)
-
-#define D3D11_DEFAULT_VIEWPORT_HEIGHT   (0)
-
-#define D3D11_DEFAULT_VIEWPORT_MAX_DEPTH    (0.0f)
-#define D3D11_DEFAULT_VIEWPORT_MIN_DEPTH    (0.0f)
-#define D3D11_DEFAULT_VIEWPORT_TOPLEFTX (0)
-
-#define D3D11_DEFAULT_VIEWPORT_TOPLEFTY (0)
-
-#define D3D11_DEFAULT_VIEWPORT_WIDTH    (0)
-
-#define D3D11_DS_INPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS (3968)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENTS    (4)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COUNT (32)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READS_PER_INST    (2)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READ_PORTS    (1)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENTS (3)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COUNT  (1)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READS_PER_INST (2)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READ_PORTS (1)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENTS   (4)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COUNT    (32)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST   (2)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READ_PORTS   (1)
-
-#define D3D11_DS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_DS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_DS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_FLOAT16_FUSED_TOLERANCE_IN_ULP    (0.6)
-#define D3D11_FLOAT32_MAX   (3.402823466e+38f)
-#define D3D11_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP   (0.6f)
-#define D3D11_FLOAT_TO_SRGB_EXPONENT_DENOMINATOR    (2.4f)
-#define D3D11_FLOAT_TO_SRGB_EXPONENT_NUMERATOR  (1.0f)
-#define D3D11_FLOAT_TO_SRGB_OFFSET  (0.055f)
-#define D3D11_FLOAT_TO_SRGB_SCALE_1 (12.92f)
-#define D3D11_FLOAT_TO_SRGB_SCALE_2 (1.055f)
-#define D3D11_FLOAT_TO_SRGB_THRESHOLD   (0.0031308f)
-#define D3D11_FTOI_INSTRUCTION_MAX_INPUT    (2147483647.999f)
-#define D3D11_FTOI_INSTRUCTION_MIN_INPUT    (-2147483648.999f)
-#define D3D11_FTOU_INSTRUCTION_MAX_INPUT    (4294967295.999f)
-#define D3D11_FTOU_INSTRUCTION_MIN_INPUT    (0.0f)
-#define D3D11_GS_INPUT_INSTANCE_ID_READS_PER_INST   (2)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_READ_PORTS   (1)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENTS  (1)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COUNT   (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENTS   (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COUNT    (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_READS_PER_INST   (2)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_READ_PORTS   (1)
-
-#define D3D11_GS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_GS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_GS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_GS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_GS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_GS_INPUT_REGISTER_VERTICES    (32)
-
-#define D3D11_GS_MAX_INSTANCE_COUNT (32)
-
-#define D3D11_GS_MAX_OUTPUT_VERTEX_COUNT_ACROSS_INSTANCES   (1024)
-
-#define D3D11_GS_OUTPUT_ELEMENTS    (32)
-
-#define D3D11_GS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_GS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_GS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_HS_CONTROL_POINT_PHASE_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_HS_CONTROL_POINT_PHASE_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND  (0xffffffff)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND  (0xffffffff)
-
-#define D3D11_HS_MAXTESSFACTOR_LOWER_BOUND  (1.0f)
-#define D3D11_HS_MAXTESSFACTOR_UPPER_BOUND  (64.0f)
-#define D3D11_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS    (3968)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENTS    (1)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COUNT (1)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READS_PER_INST    (2)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READ_PORTS    (1)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COUNT   (32)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_IA_DEFAULT_INDEX_BUFFER_OFFSET_IN_BYTES   (0)
-
-#define D3D11_IA_DEFAULT_PRIMITIVE_TOPOLOGY (0)
-
-#define D3D11_IA_DEFAULT_VERTEX_BUFFER_OFFSET_IN_BYTES  (0)
-
-#define D3D11_IA_INDEX_INPUT_RESOURCE_SLOT_COUNT    (1)
-
-#define D3D11_IA_INSTANCE_ID_BIT_COUNT  (32)
-
-#define D3D11_IA_INTEGER_ARITHMETIC_BIT_COUNT   (32)
-
-#define D3D11_IA_PATCH_MAX_CONTROL_POINT_COUNT  (32)
-
-#define D3D11_IA_PRIMITIVE_ID_BIT_COUNT (32)
-
-#define D3D11_IA_VERTEX_ID_BIT_COUNT    (32)
-
-#define D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT   (32)
-
-#define D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS (128)
-
-#define D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT   (32)
-
-#define D3D11_INTEGER_DIVIDE_BY_ZERO_QUOTIENT   (0xffffffff)
-
-#define D3D11_INTEGER_DIVIDE_BY_ZERO_REMAINDER  (0xffffffff)
-
-#define D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL (0xffffffff)
-
-#define D3D11_KEEP_UNORDERED_ACCESS_VIEWS   (0xffffffff)
-
-#define D3D11_LINEAR_GAMMA  (1.0f)
-#define D3D11_MAJOR_VERSION (11)
-
-#define D3D11_MAX_BORDER_COLOR_COMPONENT    (1.0f)
-#define D3D11_MAX_DEPTH (1.0f)
-#define D3D11_MAX_MAXANISOTROPY (16)
-
-#define D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT  (32)
-
-#define D3D11_MAX_POSITION_VALUE    (3.402823466e+34f)
-#define D3D11_MAX_TEXTURE_DIMENSION_2_TO_EXP    (17)
-
-#define D3D11_MINOR_VERSION (0)
-
-#define D3D11_MIN_BORDER_COLOR_COMPONENT    (0.0f)
-#define D3D11_MIN_DEPTH (0.0f)
-#define D3D11_MIN_MAXANISOTROPY (0)
-
-#define D3D11_MIP_LOD_BIAS_MAX  (15.99f)
-#define D3D11_MIP_LOD_BIAS_MIN  (-16.0f)
-#define D3D11_MIP_LOD_FRACTIONAL_BIT_COUNT  (8)
-
-#define D3D11_MIP_LOD_RANGE_BIT_COUNT   (8)
-
-#define D3D11_MULTISAMPLE_ANTIALIAS_LINE_WIDTH  (1.4f)
-#define D3D11_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT    (0)
-
-#define D3D11_PIXEL_ADDRESS_RANGE_BIT_COUNT (15)
-
-#define D3D11_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT (16)
-
-#define D3D11_PS_CS_UAV_REGISTER_COMPONENTS (1)
-
-#define D3D11_PS_CS_UAV_REGISTER_COUNT  (8)
-
-#define D3D11_PS_CS_UAV_REGISTER_READS_PER_INST (1)
-
-#define D3D11_PS_CS_UAV_REGISTER_READ_PORTS (1)
-
-#define D3D11_PS_FRONTFACING_DEFAULT_VALUE  (0xffffffff)
-
-#define D3D11_PS_FRONTFACING_FALSE_VALUE    (0)
-
-#define D3D11_PS_FRONTFACING_TRUE_VALUE (0xffffffff)
-
-#define D3D11_PS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_PS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_PS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_PS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT   (0.0f)
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS   (1)
-
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COUNT    (1)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENTS    (1)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COUNT (1)
-
-#define D3D11_PS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_PS_OUTPUT_REGISTER_COUNT  (8)
-
-#define D3D11_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT  (0.5f)
-#define D3D11_RAW_UAV_SRV_BYTE_ALIGNMENT    (16)
-
-#define D3D11_REQ_BLEND_OBJECT_COUNT_PER_DEVICE (4096)
-
-#define D3D11_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP  (27)
-
-#define D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT (4096)
-
-#define D3D11_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE (4096)
-
-#define D3D11_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP  (32)
-
-#define D3D11_REQ_DRAW_VERTEX_COUNT_2_TO_EXP    (32)
-
-#define D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION   (16384)
-
-#define D3D11_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT    (1024)
-
-#define D3D11_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT   (4096)
-
-#define D3D11_REQ_MAXANISOTROPY (16)
-
-#define D3D11_REQ_MIP_LEVELS    (15)
-
-#define D3D11_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES (2048)
-
-#define D3D11_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE    (4096)
-
-#define D3D11_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH (16384)
-
-#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM  (128)
-
-#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM  (0.25f)
-#define D3D11_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP   (20)
-
-#define D3D11_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE   (4096)
-
-#define D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION    (2048)
-
-#define D3D11_REQ_TEXTURE1D_U_DIMENSION (16384)
-
-#define D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION    (2048)
-
-#define D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION    (16384)
-
-#define D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION  (2048)
-
-#define D3D11_REQ_TEXTURECUBE_DIMENSION (16384)
-
-#define D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL  (0)
-
-#define D3D11_SHADER_MAJOR_VERSION  (5)
-
-#define D3D11_SHADER_MAX_INSTANCES  (65535)
-
-#define D3D11_SHADER_MAX_INTERFACES (253)
-
-#define D3D11_SHADER_MAX_INTERFACE_CALL_SITES   (4096)
-
-#define D3D11_SHADER_MAX_TYPES  (65535)
-
-#define D3D11_SHADER_MINOR_VERSION  (0)
-
-#define D3D11_SHIFT_INSTRUCTION_PAD_VALUE   (0)
-
-#define D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT   (5)
-
-#define D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT  (8)
-
-#define D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES (2048)
-
-#define D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES   (512)
-
-#define D3D11_SO_BUFFER_SLOT_COUNT  (4)
-
-#define D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP    (0xffffffff)
-
-#define D3D11_SO_NO_RASTERIZED_STREAM   (0xffffffff)
-
-#define D3D11_SO_OUTPUT_COMPONENT_COUNT (128)
-
-#define D3D11_SO_STREAM_COUNT   (4)
-
-#define D3D11_SPEC_DATE_DAY (04)
-
-#define D3D11_SPEC_DATE_MONTH   (06)
-
-#define D3D11_SPEC_DATE_YEAR    (2009)
-
-#define D3D11_SPEC_VERSION  (1.0)
-#define D3D11_SRGB_GAMMA    (2.2f)
-#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_1   (12.92f)
-#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_2   (1.055f)
-#define D3D11_SRGB_TO_FLOAT_EXPONENT    (2.4f)
-#define D3D11_SRGB_TO_FLOAT_OFFSET  (0.055f)
-#define D3D11_SRGB_TO_FLOAT_THRESHOLD   (0.04045f)
-#define D3D11_SRGB_TO_FLOAT_TOLERANCE_IN_ULP    (0.5f)
-#define D3D11_STANDARD_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_STANDARD_COMPONENT_BIT_COUNT_DOUBLED  (64)
-
-#define D3D11_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE  (4)
-
-#define D3D11_STANDARD_PIXEL_COMPONENT_COUNT    (128)
-
-#define D3D11_STANDARD_PIXEL_ELEMENT_COUNT  (32)
-
-#define D3D11_STANDARD_VECTOR_SIZE  (4)
-
-#define D3D11_STANDARD_VERTEX_ELEMENT_COUNT (32)
-
-#define D3D11_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT (64)
-
-#define D3D11_SUBPIXEL_FRACTIONAL_BIT_COUNT (8)
-
-#define D3D11_SUBTEXEL_FRACTIONAL_BIT_COUNT (8)
-
-#define D3D11_TESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR  (64)
-
-#define D3D11_TESSELLATOR_MAX_ISOLINE_DENSITY_TESSELLATION_FACTOR   (64)
-
-#define D3D11_TESSELLATOR_MAX_ODD_TESSELLATION_FACTOR   (63)
-
-#define D3D11_TESSELLATOR_MAX_TESSELLATION_FACTOR   (64)
-
-#define D3D11_TESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR  (2)
-
-#define D3D11_TESSELLATOR_MIN_ISOLINE_DENSITY_TESSELLATION_FACTOR   (1)
-
-#define D3D11_TESSELLATOR_MIN_ODD_TESSELLATION_FACTOR   (1)
-
-#define D3D11_TEXEL_ADDRESS_RANGE_BIT_COUNT (16)
-
-#define D3D11_UNBOUND_MEMORY_ACCESS_RESULT  (0)
-
-#define D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX    (15)
-
-#define D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE    (16)
-
-#define D3D11_VIEWPORT_BOUNDS_MAX   (32767)
-
-#define D3D11_VIEWPORT_BOUNDS_MIN   (-32768)
-
-#define D3D11_VS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_VS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_VS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_VS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_VS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_VS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_VS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_VS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT (10)
-
-#define D3D11_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP (25)
-
-#define D3D11_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP   (25)
-
-#endif
-
-#ifndef _D3D11_1_CONSTANTS
-#define _D3D11_1_CONSTANTS
-#define D3D11_1_UAV_SLOT_COUNT  (64)
-
-#endif
-
-#define D3D11_SDK_VERSION   (7)
-
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef
-    enum D3D11_INPUT_CLASSIFICATION
-{
-    D3D11_INPUT_PER_VERTEX_DATA = 0,
-    D3D11_INPUT_PER_INSTANCE_DATA   = 1
-}   D3D11_INPUT_CLASSIFICATION;
-
-typedef
-    enum D3D11_FILL_MODE
-{
-    D3D11_FILL_WIREFRAME    = 2,
-    D3D11_FILL_SOLID    = 3
-}   D3D11_FILL_MODE;
-
-typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY;
-
-typedef D3D_PRIMITIVE D3D11_PRIMITIVE;
-
-typedef
-    enum D3D11_CULL_MODE
-{
-    D3D11_CULL_NONE = 1,
-    D3D11_CULL_FRONT    = 2,
-    D3D11_CULL_BACK = 3
-}   D3D11_CULL_MODE;
-
-typedef
-    enum D3D11_RESOURCE_DIMENSION
-{
-    D3D11_RESOURCE_DIMENSION_UNKNOWN    = 0,
-    D3D11_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D11_RESOURCE_DIMENSION_TEXTURE1D  = 2,
-    D3D11_RESOURCE_DIMENSION_TEXTURE2D  = 3,
-    D3D11_RESOURCE_DIMENSION_TEXTURE3D  = 4
-}   D3D11_RESOURCE_DIMENSION;
-
-typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION;
-
-typedef
-    enum D3D11_DSV_DIMENSION
-{
-    D3D11_DSV_DIMENSION_UNKNOWN = 0,
-    D3D11_DSV_DIMENSION_TEXTURE1D   = 1,
-    D3D11_DSV_DIMENSION_TEXTURE1DARRAY  = 2,
-    D3D11_DSV_DIMENSION_TEXTURE2D   = 3,
-    D3D11_DSV_DIMENSION_TEXTURE2DARRAY  = 4,
-    D3D11_DSV_DIMENSION_TEXTURE2DMS = 5,
-    D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY    = 6
-}   D3D11_DSV_DIMENSION;
-
-typedef
-    enum D3D11_RTV_DIMENSION
-{
-    D3D11_RTV_DIMENSION_UNKNOWN = 0,
-    D3D11_RTV_DIMENSION_BUFFER  = 1,
-    D3D11_RTV_DIMENSION_TEXTURE1D   = 2,
-    D3D11_RTV_DIMENSION_TEXTURE1DARRAY  = 3,
-    D3D11_RTV_DIMENSION_TEXTURE2D   = 4,
-    D3D11_RTV_DIMENSION_TEXTURE2DARRAY  = 5,
-    D3D11_RTV_DIMENSION_TEXTURE2DMS = 6,
-    D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY    = 7,
-    D3D11_RTV_DIMENSION_TEXTURE3D   = 8
-}   D3D11_RTV_DIMENSION;
-
-typedef
-    enum D3D11_UAV_DIMENSION
-{
-    D3D11_UAV_DIMENSION_UNKNOWN = 0,
-    D3D11_UAV_DIMENSION_BUFFER  = 1,
-    D3D11_UAV_DIMENSION_TEXTURE1D   = 2,
-    D3D11_UAV_DIMENSION_TEXTURE1DARRAY  = 3,
-    D3D11_UAV_DIMENSION_TEXTURE2D   = 4,
-    D3D11_UAV_DIMENSION_TEXTURE2DARRAY  = 5,
-    D3D11_UAV_DIMENSION_TEXTURE3D   = 8
-}   D3D11_UAV_DIMENSION;
-
-typedef
-    enum D3D11_USAGE
-{
-    D3D11_USAGE_DEFAULT = 0,
-    D3D11_USAGE_IMMUTABLE   = 1,
-    D3D11_USAGE_DYNAMIC = 2,
-    D3D11_USAGE_STAGING = 3,
-    D3D11_USAGE_TRANSIENT = 4,  //Not implemented for opengl. Only metal
-    D3D11_USAGE_DIRECT_ACCESS = 5  //Not implemented for opengl. Only metal
-}   D3D11_USAGE;
-
-typedef
-    enum D3D11_BIND_FLAG
-{
-    D3D11_BIND_VERTEX_BUFFER    = 0x1L,
-    D3D11_BIND_INDEX_BUFFER = 0x2L,
-    D3D11_BIND_CONSTANT_BUFFER  = 0x4L,
-    D3D11_BIND_SHADER_RESOURCE  = 0x8L,
-    D3D11_BIND_STREAM_OUTPUT    = 0x10L,
-    D3D11_BIND_RENDER_TARGET    = 0x20L,
-    D3D11_BIND_DEPTH_STENCIL    = 0x40L,
-    D3D11_BIND_UNORDERED_ACCESS = 0x80L
-}   D3D11_BIND_FLAG;
-
-typedef
-    enum D3D11_CPU_ACCESS_FLAG
-{
-    D3D11_CPU_ACCESS_WRITE  = 0x10000L,
-    D3D11_CPU_ACCESS_READ   = 0x20000L
-}   D3D11_CPU_ACCESS_FLAG;
-
-typedef
-    enum D3D11_RESOURCE_MISC_FLAG
-{
-    D3D11_RESOURCE_MISC_GENERATE_MIPS   = 0x1L,
-    D3D11_RESOURCE_MISC_SHARED  = 0x2L,
-    D3D11_RESOURCE_MISC_TEXTURECUBE = 0x4L,
-    D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS   = 0x10L,
-    D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS  = 0x20L,
-    D3D11_RESOURCE_MISC_BUFFER_STRUCTURED   = 0x40L,
-    D3D11_RESOURCE_MISC_RESOURCE_CLAMP  = 0x80L,
-    D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX   = 0x100L,
-    D3D11_RESOURCE_MISC_GDI_COMPATIBLE  = 0x200L,
-    D3D11_RESOURCE_MISC_DXGL_NO_STREAMING = 0x10000000L,
-    D3D11_RESOURCE_MISC_DXGL_MAP_PERSISTENT = 0x20000000L,
-    D3D11_RESOURCE_MISC_DXGL_MAP_COHERENT = 0x40000000L,
-    D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY = 0x80000000L
-}   D3D11_RESOURCE_MISC_FLAG;
-
-typedef
-    enum D3D11_MAP
-{
-    D3D11_MAP_READ  = 1,
-    D3D11_MAP_WRITE = 2,
-    D3D11_MAP_READ_WRITE    = 3,
-    D3D11_MAP_WRITE_DISCARD = 4,
-    D3D11_MAP_WRITE_NO_OVERWRITE    = 5
-}   D3D11_MAP;
-
-typedef
-    enum D3D11_MAP_FLAG
-{
-    D3D11_MAP_FLAG_DO_NOT_WAIT  = 0x100000L,
-    D3D11_MAP_FLAG_DXGL_PERSISTENT = 0x40000000L,
-    D3D11_MAP_FLAG_DXGL_COHERENT = 0x80000000L
-}   D3D11_MAP_FLAG;
-
-typedef
-    enum D3D11_RAISE_FLAG
-{
-    D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR  = 0x1L
-}   D3D11_RAISE_FLAG;
-
-typedef
-    enum D3D11_CLEAR_FLAG
-{
-    D3D11_CLEAR_DEPTH   = 0x1L,
-    D3D11_CLEAR_STENCIL = 0x2L
-}   D3D11_CLEAR_FLAG;
-
-typedef RECT D3D11_RECT;
-
-typedef
-    enum D3D11_COMPARISON_FUNC
-{
-    D3D11_COMPARISON_NEVER  = 1,
-    D3D11_COMPARISON_LESS   = 2,
-    D3D11_COMPARISON_EQUAL  = 3,
-    D3D11_COMPARISON_LESS_EQUAL = 4,
-    D3D11_COMPARISON_GREATER    = 5,
-    D3D11_COMPARISON_NOT_EQUAL  = 6,
-    D3D11_COMPARISON_GREATER_EQUAL  = 7,
-    D3D11_COMPARISON_ALWAYS = 8
-}   D3D11_COMPARISON_FUNC;
-
-typedef
-    enum D3D11_DEPTH_WRITE_MASK
-{
-    D3D11_DEPTH_WRITE_MASK_ZERO = 0,
-    D3D11_DEPTH_WRITE_MASK_ALL  = 1
-}   D3D11_DEPTH_WRITE_MASK;
-
-typedef
-    enum D3D11_STENCIL_OP
-{
-    D3D11_STENCIL_OP_KEEP   = 1,
-    D3D11_STENCIL_OP_ZERO   = 2,
-    D3D11_STENCIL_OP_REPLACE    = 3,
-    D3D11_STENCIL_OP_INCR_SAT   = 4,
-    D3D11_STENCIL_OP_DECR_SAT   = 5,
-    D3D11_STENCIL_OP_INVERT = 6,
-    D3D11_STENCIL_OP_INCR   = 7,
-    D3D11_STENCIL_OP_DECR   = 8
-}   D3D11_STENCIL_OP;
-
-typedef
-    enum D3D11_BLEND
-{
-    D3D11_BLEND_ZERO    = 1,
-    D3D11_BLEND_ONE = 2,
-    D3D11_BLEND_SRC_COLOR   = 3,
-    D3D11_BLEND_INV_SRC_COLOR   = 4,
-    D3D11_BLEND_SRC_ALPHA   = 5,
-    D3D11_BLEND_INV_SRC_ALPHA   = 6,
-    D3D11_BLEND_DEST_ALPHA  = 7,
-    D3D11_BLEND_INV_DEST_ALPHA  = 8,
-    D3D11_BLEND_DEST_COLOR  = 9,
-    D3D11_BLEND_INV_DEST_COLOR  = 10,
-    D3D11_BLEND_SRC_ALPHA_SAT   = 11,
-    D3D11_BLEND_BLEND_FACTOR    = 14,
-    D3D11_BLEND_INV_BLEND_FACTOR    = 15,
-    D3D11_BLEND_SRC1_COLOR  = 16,
-    D3D11_BLEND_INV_SRC1_COLOR  = 17,
-    D3D11_BLEND_SRC1_ALPHA  = 18,
-    D3D11_BLEND_INV_SRC1_ALPHA  = 19
-}   D3D11_BLEND;
-
-typedef
-    enum D3D11_BLEND_OP
-{
-    D3D11_BLEND_OP_ADD  = 1,
-    D3D11_BLEND_OP_SUBTRACT = 2,
-    D3D11_BLEND_OP_REV_SUBTRACT = 3,
-    D3D11_BLEND_OP_MIN  = 4,
-    D3D11_BLEND_OP_MAX  = 5
-}   D3D11_BLEND_OP;
-
-typedef
-    enum D3D11_COLOR_WRITE_ENABLE
-{
-    D3D11_COLOR_WRITE_ENABLE_RED    = 1,
-    D3D11_COLOR_WRITE_ENABLE_GREEN  = 2,
-    D3D11_COLOR_WRITE_ENABLE_BLUE   = 4,
-    D3D11_COLOR_WRITE_ENABLE_ALPHA  = 8,
-    D3D11_COLOR_WRITE_ENABLE_ALL    = (((D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN)  | D3D11_COLOR_WRITE_ENABLE_BLUE)  | D3D11_COLOR_WRITE_ENABLE_ALPHA)
-}   D3D11_COLOR_WRITE_ENABLE;
-
-typedef
-    enum D3D11_TEXTURECUBE_FACE
-{
-    D3D11_TEXTURECUBE_FACE_POSITIVE_X   = 0,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_X   = 1,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Y   = 2,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Y   = 3,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Z   = 4,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Z   = 5
-}   D3D11_TEXTURECUBE_FACE;
-
-typedef
-    enum D3D11_BUFFEREX_SRV_FLAG
-{
-    D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1
-}   D3D11_BUFFEREX_SRV_FLAG;
-
-typedef
-    enum D3D11_DSV_FLAG
-{
-    D3D11_DSV_READ_ONLY_DEPTH   = 0x1L,
-    D3D11_DSV_READ_ONLY_STENCIL = 0x2L
-}   D3D11_DSV_FLAG;
-
-typedef
-    enum D3D11_BUFFER_UAV_FLAG
-{
-    D3D11_BUFFER_UAV_FLAG_RAW   = 0x1,
-    D3D11_BUFFER_UAV_FLAG_APPEND    = 0x2,
-    D3D11_BUFFER_UAV_FLAG_COUNTER   = 0x4
-}   D3D11_BUFFER_UAV_FLAG;
-
-typedef
-    enum D3D11_FILTER
-{
-    D3D11_FILTER_MIN_MAG_MIP_POINT  = 0,
-    D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR   = 0x1,
-    D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4,
-    D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR   = 0x5,
-    D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT   = 0x10,
-    D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR    = 0x11,
-    D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT   = 0x14,
-    D3D11_FILTER_MIN_MAG_MIP_LINEAR = 0x15,
-    D3D11_FILTER_ANISOTROPIC    = 0x55,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT   = 0x80,
-    D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR    = 0x81,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT  = 0x84,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR    = 0x85,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT    = 0x90,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91,
-    D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT    = 0x94,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR  = 0x95,
-    D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5
-}   D3D11_FILTER;
-
-typedef
-    enum D3D11_FILTER_TYPE
-{
-    D3D11_FILTER_TYPE_POINT = 0,
-    D3D11_FILTER_TYPE_LINEAR    = 1
-}   D3D11_FILTER_TYPE;
-
-typedef
-    enum D3D11_TEXTURE_ADDRESS_MODE
-{
-    D3D11_TEXTURE_ADDRESS_WRAP  = 1,
-    D3D11_TEXTURE_ADDRESS_MIRROR    = 2,
-    D3D11_TEXTURE_ADDRESS_CLAMP = 3,
-    D3D11_TEXTURE_ADDRESS_BORDER    = 4,
-    D3D11_TEXTURE_ADDRESS_MIRROR_ONCE   = 5
-}   D3D11_TEXTURE_ADDRESS_MODE;
-
-typedef
-    enum D3D11_FORMAT_SUPPORT
-{
-    D3D11_FORMAT_SUPPORT_BUFFER = 0x1,
-    D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER   = 0x2,
-    D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER    = 0x4,
-    D3D11_FORMAT_SUPPORT_SO_BUFFER  = 0x8,
-    D3D11_FORMAT_SUPPORT_TEXTURE1D  = 0x10,
-    D3D11_FORMAT_SUPPORT_TEXTURE2D  = 0x20,
-    D3D11_FORMAT_SUPPORT_TEXTURE3D  = 0x40,
-    D3D11_FORMAT_SUPPORT_TEXTURECUBE    = 0x80,
-    D3D11_FORMAT_SUPPORT_SHADER_LOAD    = 0x100,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE  = 0x200,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON   = 0x400,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT    = 0x800,
-    D3D11_FORMAT_SUPPORT_MIP    = 0x1000,
-    D3D11_FORMAT_SUPPORT_MIP_AUTOGEN    = 0x2000,
-    D3D11_FORMAT_SUPPORT_RENDER_TARGET  = 0x4000,
-    D3D11_FORMAT_SUPPORT_BLENDABLE  = 0x8000,
-    D3D11_FORMAT_SUPPORT_DEPTH_STENCIL  = 0x10000,
-    D3D11_FORMAT_SUPPORT_CPU_LOCKABLE   = 0x20000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE    = 0x40000,
-    D3D11_FORMAT_SUPPORT_DISPLAY    = 0x80000,
-    D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT = 0x100000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET   = 0x200000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD   = 0x400000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER  = 0x800000,
-    D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST   = 0x1000000,
-    D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW    = 0x2000000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON   = 0x4000000
-}   D3D11_FORMAT_SUPPORT;
-
-typedef
-    enum D3D11_FORMAT_SUPPORT2
-{
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD    = 0x1,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS    = 0x2,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE  = 0x4,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE   = 0x8,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX  = 0x10,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX    = 0x20,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD    = 0x40,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE   = 0x80
-}   D3D11_FORMAT_SUPPORT2;
-
-typedef
-    enum D3D11_ASYNC_GETDATA_FLAG
-{
-    D3D11_ASYNC_GETDATA_DONOTFLUSH  = 0x1
-}   D3D11_ASYNC_GETDATA_FLAG;
-
-typedef
-    enum D3D11_QUERY
-{
-    D3D11_QUERY_EVENT   = 0,
-    D3D11_QUERY_OCCLUSION   = (D3D11_QUERY_EVENT + 1),
-    D3D11_QUERY_TIMESTAMP   = (D3D11_QUERY_OCCLUSION + 1),
-    D3D11_QUERY_TIMESTAMP_DISJOINT  = (D3D11_QUERY_TIMESTAMP + 1),
-    D3D11_QUERY_PIPELINE_STATISTICS = (D3D11_QUERY_TIMESTAMP_DISJOINT + 1),
-    D3D11_QUERY_OCCLUSION_PREDICATE = (D3D11_QUERY_PIPELINE_STATISTICS + 1),
-    D3D11_QUERY_SO_STATISTICS   = (D3D11_QUERY_OCCLUSION_PREDICATE + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE   = (D3D11_QUERY_SO_STATISTICS + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM0   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0   = (D3D11_QUERY_SO_STATISTICS_STREAM0 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM1   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1   = (D3D11_QUERY_SO_STATISTICS_STREAM1 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM2   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2   = (D3D11_QUERY_SO_STATISTICS_STREAM2 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM3   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3   = (D3D11_QUERY_SO_STATISTICS_STREAM3 + 1)
-}   D3D11_QUERY;
-
-typedef
-    enum D3D11_QUERY_MISC_FLAG
-{
-    D3D11_QUERY_MISC_PREDICATEHINT  = 0x1
-}   D3D11_QUERY_MISC_FLAG;
-
-typedef
-    enum D3D11_COUNTER
-{
-    D3D11_COUNTER_DEVICE_DEPENDENT_0    = 0x40000000
-}   D3D11_COUNTER;
-
-typedef
-    enum D3D11_COUNTER_TYPE
-{
-    D3D11_COUNTER_TYPE_FLOAT32  = 0,
-    D3D11_COUNTER_TYPE_UINT16   = (D3D11_COUNTER_TYPE_FLOAT32 + 1),
-    D3D11_COUNTER_TYPE_UINT32   = (D3D11_COUNTER_TYPE_UINT16 + 1),
-    D3D11_COUNTER_TYPE_UINT64   = (D3D11_COUNTER_TYPE_UINT32 + 1)
-}   D3D11_COUNTER_TYPE;
-
-typedef
-    enum D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS
-{
-    D3D11_STANDARD_MULTISAMPLE_PATTERN  = 0xffffffff,
-    D3D11_CENTER_MULTISAMPLE_PATTERN    = 0xfffffffe
-}   D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS;
-
-typedef
-    enum D3D11_DEVICE_CONTEXT_TYPE
-{
-    D3D11_DEVICE_CONTEXT_IMMEDIATE  = 0,
-    D3D11_DEVICE_CONTEXT_DEFERRED   = (D3D11_DEVICE_CONTEXT_IMMEDIATE + 1)
-}   D3D11_DEVICE_CONTEXT_TYPE;
-
-typedef 
-    enum D3D11_FEATURE
-{
-    D3D11_FEATURE_THREADING = 0,
-    D3D11_FEATURE_DOUBLES = (D3D11_FEATURE_THREADING + 1),
-    D3D11_FEATURE_FORMAT_SUPPORT = (D3D11_FEATURE_DOUBLES + 1),
-    D3D11_FEATURE_FORMAT_SUPPORT2 = (D3D11_FEATURE_FORMAT_SUPPORT + 1),
-    D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS = (D3D11_FEATURE_FORMAT_SUPPORT2 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS = (D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS + 1),
-    D3D11_FEATURE_ARCHITECTURE_INFO = (D3D11_FEATURE_D3D11_OPTIONS + 1),
-    D3D11_FEATURE_D3D9_OPTIONS = (D3D11_FEATURE_ARCHITECTURE_INFO + 1),
-    D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT = (D3D11_FEATURE_D3D9_OPTIONS + 1),
-    D3D11_FEATURE_D3D9_SHADOW_SUPPORT = (D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT + 1),
-    D3D11_FEATURE_D3D11_OPTIONS1 = (D3D11_FEATURE_D3D9_SHADOW_SUPPORT + 1),
-    D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT = (D3D11_FEATURE_D3D11_OPTIONS1 + 1),
-    D3D11_FEATURE_MARKER_SUPPORT = (D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT + 1),
-    D3D11_FEATURE_D3D9_OPTIONS1 = (D3D11_FEATURE_MARKER_SUPPORT + 1),
-    D3D11_FEATURE_D3D11_OPTIONS2 = (D3D11_FEATURE_D3D9_OPTIONS1 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS3 = (D3D11_FEATURE_D3D11_OPTIONS2 + 1),
-    D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = (D3D11_FEATURE_D3D11_OPTIONS3 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS4 = (D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT + 1)
-} D3D11_FEATURE;
-
-typedef
-    enum D3D11_CONSERVATIVE_RASTERIZATION_TIER
-{
-    D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED = 0,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_1 = 1,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_2 = 2,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_3 = 3
-} D3D11_CONSERVATIVE_RASTERIZATION_TIER;
-
-typedef
-    enum _D3D11_TILED_RESOURCES_TIER
-{
-    D3D11_TILED_RESOURCES_NOT_SUPPORTED = 0,
-    D3D11_TILED_RESOURCES_TIER_1 = 1,
-    D3D11_TILED_RESOURCES_TIER_2 = 2,
-    D3D11_TILED_RESOURCES_TIER_3 = 3
-} D3D11_TILED_RESOURCES_TIER;
-
-typedef
-    enum D3D11_CREATE_DEVICE_FLAG
-{
-    D3D11_CREATE_DEVICE_SINGLETHREADED  = 0x1,
-    D3D11_CREATE_DEVICE_DEBUG   = 0x2,
-    D3D11_CREATE_DEVICE_SWITCH_TO_REF   = 0x4,
-    D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS    = 0x8,
-    D3D11_CREATE_DEVICE_BGRA_SUPPORT    = 0x20
-}   D3D11_CREATE_DEVICE_FLAG;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct D3D11_INPUT_ELEMENT_DESC
-{
-    LPCSTR SemanticName;
-    UINT SemanticIndex;
-    DXGI_FORMAT Format;
-    UINT InputSlot;
-    UINT AlignedByteOffset;
-    D3D11_INPUT_CLASSIFICATION InputSlotClass;
-    UINT InstanceDataStepRate;
-}   D3D11_INPUT_ELEMENT_DESC;
-
-typedef struct D3D11_SO_DECLARATION_ENTRY
-{
-    UINT Stream;
-    LPCSTR SemanticName;
-    UINT SemanticIndex;
-    BYTE StartComponent;
-    BYTE ComponentCount;
-    BYTE OutputSlot;
-}   D3D11_SO_DECLARATION_ENTRY;
-
-typedef struct D3D11_VIEWPORT
-{
-    FLOAT TopLeftX;
-    FLOAT TopLeftY;
-    FLOAT Width;
-    FLOAT Height;
-    FLOAT MinDepth;
-    FLOAT MaxDepth;
-}   D3D11_VIEWPORT;
-
-typedef struct D3D11_BOX
-{
-    UINT left;
-    UINT top;
-    UINT front;
-    UINT right;
-    UINT bottom;
-    UINT back;
-}   D3D11_BOX;
-
-typedef struct D3D11_DEPTH_STENCILOP_DESC
-{
-    D3D11_STENCIL_OP StencilFailOp;
-    D3D11_STENCIL_OP StencilDepthFailOp;
-    D3D11_STENCIL_OP StencilPassOp;
-    D3D11_COMPARISON_FUNC StencilFunc;
-}   D3D11_DEPTH_STENCILOP_DESC;
-
-typedef struct D3D11_DEPTH_STENCIL_DESC
-{
-    BOOL DepthEnable;
-    D3D11_DEPTH_WRITE_MASK DepthWriteMask;
-    D3D11_COMPARISON_FUNC DepthFunc;
-    BOOL StencilEnable;
-    UINT8 StencilReadMask;
-    UINT8 StencilWriteMask;
-    D3D11_DEPTH_STENCILOP_DESC FrontFace;
-    D3D11_DEPTH_STENCILOP_DESC BackFace;
-}   D3D11_DEPTH_STENCIL_DESC;
-
-typedef struct D3D11_RENDER_TARGET_BLEND_DESC
-{
-    BOOL BlendEnable;
-    D3D11_BLEND SrcBlend;
-    D3D11_BLEND DestBlend;
-    D3D11_BLEND_OP BlendOp;
-    D3D11_BLEND SrcBlendAlpha;
-    D3D11_BLEND DestBlendAlpha;
-    D3D11_BLEND_OP BlendOpAlpha;
-    UINT8 RenderTargetWriteMask;
-}   D3D11_RENDER_TARGET_BLEND_DESC;
-
-typedef struct D3D11_BLEND_DESC
-{
-    BOOL AlphaToCoverageEnable;
-    BOOL IndependentBlendEnable;
-    D3D11_RENDER_TARGET_BLEND_DESC RenderTarget[ 8 ];
-}   D3D11_BLEND_DESC;
-
-typedef struct D3D11_RASTERIZER_DESC
-{
-    D3D11_FILL_MODE FillMode;
-    D3D11_CULL_MODE CullMode;
-    BOOL FrontCounterClockwise;
-    INT DepthBias;
-    FLOAT DepthBiasClamp;
-    FLOAT SlopeScaledDepthBias;
-    BOOL DepthClipEnable;
-    BOOL ScissorEnable;
-    BOOL MultisampleEnable;
-    BOOL AntialiasedLineEnable;
-}   D3D11_RASTERIZER_DESC;
-
-typedef struct D3D11_SUBRESOURCE_DATA
-{
-    const void* pSysMem;
-    UINT SysMemPitch;
-    UINT SysMemSlicePitch;
-}   D3D11_SUBRESOURCE_DATA;
-
-typedef struct D3D11_MAPPED_SUBRESOURCE
-{
-    void* pData;
-    UINT RowPitch;
-    UINT DepthPitch;
-}   D3D11_MAPPED_SUBRESOURCE;
-
-typedef struct D3D11_BUFFER_DESC
-{
-    UINT ByteWidth;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-    UINT StructureByteStride;
-}   D3D11_BUFFER_DESC;
-
-typedef struct D3D11_TEXTURE1D_DESC
-{
-    UINT Width;
-    UINT MipLevels;
-    UINT ArraySize;
-    DXGI_FORMAT Format;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE1D_DESC;
-
-typedef struct D3D11_TEXTURE2D_DESC
-{
-    UINT Width;
-    UINT Height;
-    UINT MipLevels;
-    UINT ArraySize;
-    DXGI_FORMAT Format;
-    DXGI_SAMPLE_DESC SampleDesc;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE2D_DESC;
-
-typedef struct D3D11_TEXTURE3D_DESC
-{
-    UINT Width;
-    UINT Height;
-    UINT Depth;
-    UINT MipLevels;
-    DXGI_FORMAT Format;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE3D_DESC;
-
-typedef struct D3D11_BUFFER_SRV
-{
-    union
-    {
-        UINT FirstElement;
-        UINT ElementOffset;
-    };
-    union
-    {
-        UINT NumElements;
-        UINT ElementWidth;
-    };
-}   D3D11_BUFFER_SRV;
-
-typedef struct D3D11_BUFFEREX_SRV
-{
-    UINT FirstElement;
-    UINT NumElements;
-    UINT Flags;
-}   D3D11_BUFFEREX_SRV;
-
-typedef struct D3D11_TEX1D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX1D_SRV;
-
-typedef struct D3D11_TEX1D_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_SRV;
-
-typedef struct D3D11_TEX2D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX2D_SRV;
-
-typedef struct D3D11_TEX2D_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_SRV;
-
-typedef struct D3D11_TEX3D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX3D_SRV;
-
-typedef struct D3D11_TEXCUBE_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEXCUBE_SRV;
-
-typedef struct D3D11_TEXCUBE_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT First2DArrayFace;
-    UINT NumCubes;
-}   D3D11_TEXCUBE_ARRAY_SRV;
-
-typedef struct D3D11_TEX2DMS_SRV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_SRV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_SRV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_SRV;
-
-typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_SRV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_SRV Buffer;
-        D3D11_TEX1D_SRV Texture1D;
-        D3D11_TEX1D_ARRAY_SRV Texture1DArray;
-        D3D11_TEX2D_SRV Texture2D;
-        D3D11_TEX2D_ARRAY_SRV Texture2DArray;
-        D3D11_TEX2DMS_SRV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_SRV Texture2DMSArray;
-        D3D11_TEX3D_SRV Texture3D;
-        D3D11_TEXCUBE_SRV TextureCube;
-        D3D11_TEXCUBE_ARRAY_SRV TextureCubeArray;
-        D3D11_BUFFEREX_SRV BufferEx;
-    };
-}   D3D11_SHADER_RESOURCE_VIEW_DESC;
-
-typedef struct D3D11_BUFFER_RTV
-{
-    union
-    {
-        UINT FirstElement;
-        UINT ElementOffset;
-    };
-    union
-    {
-        UINT NumElements;
-        UINT ElementWidth;
-    };
-}   D3D11_BUFFER_RTV;
-
-typedef struct D3D11_TEX1D_RTV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_RTV;
-
-typedef struct D3D11_TEX1D_ARRAY_RTV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_RTV;
-
-typedef struct D3D11_TEX2D_RTV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_RTV;
-
-typedef struct D3D11_TEX2DMS_RTV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_RTV;
-
-typedef struct D3D11_TEX2D_ARRAY_RTV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_RTV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_RTV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_RTV;
-
-typedef struct D3D11_TEX3D_RTV
-{
-    UINT MipSlice;
-    UINT FirstWSlice;
-    UINT WSize;
-}   D3D11_TEX3D_RTV;
-
-typedef struct D3D11_RENDER_TARGET_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_RTV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_RTV Buffer;
-        D3D11_TEX1D_RTV Texture1D;
-        D3D11_TEX1D_ARRAY_RTV Texture1DArray;
-        D3D11_TEX2D_RTV Texture2D;
-        D3D11_TEX2D_ARRAY_RTV Texture2DArray;
-        D3D11_TEX2DMS_RTV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_RTV Texture2DMSArray;
-        D3D11_TEX3D_RTV Texture3D;
-    };
-}   D3D11_RENDER_TARGET_VIEW_DESC;
-
-typedef struct D3D11_TEX1D_DSV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_DSV;
-
-typedef struct D3D11_TEX1D_ARRAY_DSV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_DSV;
-
-typedef struct D3D11_TEX2D_DSV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_DSV;
-
-typedef struct D3D11_TEX2D_ARRAY_DSV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_DSV;
-
-typedef struct D3D11_TEX2DMS_DSV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_DSV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_DSV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_DSV;
-
-typedef struct D3D11_DEPTH_STENCIL_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_DSV_DIMENSION ViewDimension;
-    UINT Flags;
-    union
-    {
-        D3D11_TEX1D_DSV Texture1D;
-        D3D11_TEX1D_ARRAY_DSV Texture1DArray;
-        D3D11_TEX2D_DSV Texture2D;
-        D3D11_TEX2D_ARRAY_DSV Texture2DArray;
-        D3D11_TEX2DMS_DSV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_DSV Texture2DMSArray;
-    };
-}   D3D11_DEPTH_STENCIL_VIEW_DESC;
-
-typedef struct D3D11_BUFFER_UAV
-{
-    UINT FirstElement;
-    UINT NumElements;
-    UINT Flags;
-}   D3D11_BUFFER_UAV;
-
-typedef struct D3D11_TEX1D_UAV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_UAV;
-
-typedef struct D3D11_TEX1D_ARRAY_UAV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_UAV;
-
-typedef struct D3D11_TEX2D_UAV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_UAV;
-
-typedef struct D3D11_TEX2D_ARRAY_UAV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_UAV;
-
-typedef struct D3D11_TEX3D_UAV
-{
-    UINT MipSlice;
-    UINT FirstWSlice;
-    UINT WSize;
-}   D3D11_TEX3D_UAV;
-
-typedef struct D3D11_UNORDERED_ACCESS_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_UAV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_UAV Buffer;
-        D3D11_TEX1D_UAV Texture1D;
-        D3D11_TEX1D_ARRAY_UAV Texture1DArray;
-        D3D11_TEX2D_UAV Texture2D;
-        D3D11_TEX2D_ARRAY_UAV Texture2DArray;
-        D3D11_TEX3D_UAV Texture3D;
-    };
-}   D3D11_UNORDERED_ACCESS_VIEW_DESC;
-
-typedef struct D3D11_SAMPLER_DESC
-{
-    D3D11_FILTER Filter;
-    D3D11_TEXTURE_ADDRESS_MODE AddressU;
-    D3D11_TEXTURE_ADDRESS_MODE AddressV;
-    D3D11_TEXTURE_ADDRESS_MODE AddressW;
-    FLOAT MipLODBias;
-    UINT MaxAnisotropy;
-    D3D11_COMPARISON_FUNC ComparisonFunc;
-    FLOAT BorderColor[ 4 ];
-    FLOAT MinLOD;
-    FLOAT MaxLOD;
-}   D3D11_SAMPLER_DESC;
-
-typedef struct D3D11_QUERY_DESC
-{
-    D3D11_QUERY Query;
-    UINT MiscFlags;
-}   D3D11_QUERY_DESC;
-
-typedef struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT
-{
-    UINT64 Frequency;
-    BOOL Disjoint;
-}   D3D11_QUERY_DATA_TIMESTAMP_DISJOINT;
-
-typedef struct D3D11_QUERY_DATA_PIPELINE_STATISTICS
-{
-    UINT64 IAVertices;
-    UINT64 IAPrimitives;
-    UINT64 VSInvocations;
-    UINT64 GSInvocations;
-    UINT64 GSPrimitives;
-    UINT64 CInvocations;
-    UINT64 CPrimitives;
-    UINT64 PSInvocations;
-    UINT64 HSInvocations;
-    UINT64 DSInvocations;
-    UINT64 CSInvocations;
-}   D3D11_QUERY_DATA_PIPELINE_STATISTICS;
-
-typedef struct D3D11_QUERY_DATA_SO_STATISTICS
-{
-    UINT64 NumPrimitivesWritten;
-    UINT64 PrimitivesStorageNeeded;
-}   D3D11_QUERY_DATA_SO_STATISTICS;
-
-typedef struct D3D11_COUNTER_DESC
-{
-    D3D11_COUNTER Counter;
-    UINT MiscFlags;
-}   D3D11_COUNTER_DESC;
-
-typedef struct D3D11_COUNTER_INFO
-{
-    D3D11_COUNTER LastDeviceDependentCounter;
-    UINT NumSimultaneousCounters;
-    UINT8 NumDetectableParallelUnits;
-}   D3D11_COUNTER_INFO;
-
-typedef struct D3D11_CLASS_INSTANCE_DESC
-{
-    UINT InstanceId;
-    UINT InstanceIndex;
-    UINT TypeId;
-    UINT ConstantBuffer;
-    UINT BaseConstantBufferOffset;
-    UINT BaseTexture;
-    UINT BaseSampler;
-    BOOL Created;
-}   D3D11_CLASS_INSTANCE_DESC;
-
-typedef struct D3D11_FEATURE_DATA_THREADING
-{
-    BOOL DriverConcurrentCreates;
-    BOOL DriverCommandLists;
-}   D3D11_FEATURE_DATA_THREADING;
-
-typedef struct D3D11_FEATURE_DATA_DOUBLES
-{
-    BOOL DoublePrecisionFloatShaderOps;
-}   D3D11_FEATURE_DATA_DOUBLES;
-
-typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT
-{
-    DXGI_FORMAT InFormat;
-    UINT OutFormatSupport;
-}   D3D11_FEATURE_DATA_FORMAT_SUPPORT;
-
-typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT2
-{
-    DXGI_FORMAT InFormat;
-    UINT OutFormatSupport2;
-}   D3D11_FEATURE_DATA_FORMAT_SUPPORT2;
-
-typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS
-{
-    BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x;
-}   D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS;
-
-typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS
-{
-    BOOL OutputMergerLogicOp;
-    BOOL UAVOnlyRenderingForcedSampleCount;
-    BOOL DiscardAPIsSeenByDriver;
-    BOOL FlagsForUpdateAndCopySeenByDriver;
-    BOOL ClearView;
-    BOOL CopyWithOverlap;
-    BOOL ConstantBufferPartialUpdate;
-    BOOL ConstantBufferOffsetting;
-    BOOL MapNoOverwriteOnDynamicConstantBuffer;
-    BOOL MapNoOverwriteOnDynamicBufferSRV;
-    BOOL MultisampleRTVWithForcedSampleCountOne;
-    BOOL SAD4ShaderInstructions;
-    BOOL ExtendedDoublesShaderInstructions;
-    BOOL ExtendedResourceSharing;
-} D3D11_FEATURE_DATA_D3D11_OPTIONS;
-
-typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS2
-{
-    BOOL                                  PSSpecifiedStencilRefSupported;
-    BOOL                                  TypedUAVLoadAdditionalFormats;
-    BOOL                                  ROVsSupported;
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER ConservativeRasterizationTier;
-    D3D11_TILED_RESOURCES_TIER            TiledResourcesTier;
-    BOOL                                  MapOnDefaultTextures;
-    BOOL                                  StandardSwizzle;
-    BOOL                                  UnifiedMemoryArchitecture;
-} D3D11_FEATURE_DATA_D3D11_OPTIONS2;
-
-////////////////////////////////////////////////////////////////////////////
-//  Constants
-////////////////////////////////////////////////////////////////////////////
-
-const UINT D3D11_APPEND_ALIGNED_ELEMENT = 0xffffffff;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-
-//struct ID3D11DeviceChild;         // Typedef as CCryDXGLDeviceChild
-//struct ID3D11DepthStencilState;   // Typedef as CCryDXGLDepthStencilState
-//struct ID3D11BlendState;          // Typedef as CCryDXGLBlendState
-//struct ID3D11RasterizerState;     // Typedef as CCryDXGLRasterizerState
-//struct ID3D11Resource;            // Typedef as CCryDXGLResource
-//struct ID3D11Buffer;              // Typedef as CCryDXGLBuffer
-//struct ID3D11Texture1D;           // Typedef as CCryDXGLTexture1D
-//struct ID3D11Texture2D;           // Typedef as CCryDXGLTexture2D
-//struct ID3D11Texture3D;           // Typedef as CCryDXGLTexture3D
-//struct ID3D11View;                // Typedef as CCryDXGLView
-//struct ID3D11ShaderResourceView;  // Typedef as CCryDXGLShaderResourceView
-//struct ID3D11RenderTargetView;    // Typedef as CCryDXGLRenderTargetView
-//struct ID3D11DepthStencilView;    // Typedef as CCryDXGLDepthStencilView
-//struct ID3D11UnorderedAccessView; // Typedef as CCryDXGLUnorderedAccessView
-//struct ID3D11VertexShader;        // Typedef as CCryDXGLVertexShader
-//struct ID3D11HullShader;          // Typedef as CCryDXGLHullShader
-//struct ID3D11DomainShader;        // Typedef as CCryDXGLDomainShader
-//struct ID3D11GeometryShader;      // Typedef as CCryDXGLGeometryShader
-//struct ID3D11PixelShader;         // Typedef as CCryDXGLPixelShader
-//struct ID3D11ComputeShader;       // Typedef as CCryDXGLComputeShader
-//struct ID3D11InputLayout;         // Typedef as CCryDXGLInputLayout
-//struct ID3D11SamplerState;        // Typedef as CCryDXGLSamplerState
-//struct ID3D11Asynchronous;        // Typedef as CCryDXGLQuery
-//struct ID3D11Query;               // Typedef as CCryDXGLQuery
-//struct ID3D11Predicate            // Typedef as CCryDXGLQuery
-//struct ID3D11Counter              // Typedef as CCryDXGLDeviceChild
-//struct ID3D11ClassLinkage         // Typedef as CCryDXGLDeviceChild
-struct ID3D11ClassInstance;
-struct ID3D11CommandList;
-//struct ID3D11DeviceContext;       // Typedef as CCryDXGLDeviceContext
-//struct ID3D11Device;              // Typedef as CCryDXGLDevice
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Interfaces for full DX emulation
-////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-struct ID3D11DeviceChild
-    : IUnknown
-{
-    virtual void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData) = 0;
-};
-
-struct ID3D11ClassLinkage
-    : ID3D11DeviceChild {};
-struct ID3D11ClassInstance
-    : ID3D11DeviceChild {};
-struct ID3D11CommandList
-    : ID3D11DeviceChild {};
-
-struct ID3D11DepthStencilState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc) = 0;
-};
-
-struct ID3D11BlendState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_BLEND_DESC* pDesc) = 0;
-};
-
-struct ID3D11RasterizerState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_RASTERIZER_DESC* pDesc) = 0;
-};
-
-struct ID3D11Resource
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension) = 0;
-    virtual void STDMETHODCALLTYPE SetEvictionPriority(UINT EvictionPriority) = 0;
-    virtual UINT STDMETHODCALLTYPE GetEvictionPriority() = 0;
-};
-
-struct ID3D11Buffer
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_BUFFER_DESC* pDesc) = 0;
-};
-
-struct ID3D11Texture1D
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE1D_DESC* pDesc) = 0;
-};
-
-struct ID3D11Texture2D
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE2D_DESC* pDesc) = 0;
-};
-
-struct ID3D11Texture3D
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE3D_DESC* pDesc) = 0;
-};
-
-struct ID3D11View
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetResource(ID3D11Resource** ppResource) = 0;
-};
-
-struct ID3D11ShaderResourceView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11RenderTargetView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11DepthStencilView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11UnorderedAccessView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11VertexShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11HullShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11DomainShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11GeometryShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11PixelShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11ComputeShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11InputLayout
-    : ID3D11DeviceChild {};
-
-struct ID3D11SamplerState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_SAMPLER_DESC* pDesc) = 0;
-};
-
-struct ID3D11Asynchronous
-    : ID3D11DeviceChild
-{
-    virtual UINT STDMETHODCALLTYPE GetDataSize() = 0;
-};
-
-struct ID3D11Query
-    : ID3D11Asynchronous
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_QUERY_DESC* pDesc) = 0;
-};
-
-struct ID3D11Counter
-    : ID3D11Asynchronous {};
-
-struct ID3D11Predicate
-    : ID3D11Query
-{
-};
-
-//struct ID3D11Counter : ID3D11Asynchronous
-//{
-//  virtual void STDMETHODCALLTYPE GetDesc(D3D11_COUNTER_DESC *pDesc) = 0;
-//};
-//
-//struct ID3D11ClassLinkage : ID3D11DeviceChild
-//{
-//  virtual HRESULT STDMETHODCALLTYPE GetClassInstance(LPCSTR pClassInstanceName, UINT InstanceIndex, ID3D11ClassInstance **ppInstance) = 0;
-//  virtual HRESULT STDMETHODCALLTYPE CreateClassInstance(LPCSTR pClassTypeName, UINT ConstantBufferOffset, UINT ConstantVectorOffset, UINT TextureOffset, UINT SamplerOffset, ID3D11ClassInstance **ppInstance) = 0;
-//};
-
-struct ID3D11SwitchToRef
-    : IUnknown
-{
-    virtual BOOL STDMETHODCALLTYPE SetUseRef(BOOL UseRef) = 0;
-    virtual BOOL STDMETHODCALLTYPE GetUseRef() = 0;
-};
-
-#endif //DXGL_FULL_EMULATION
-
-#if defined(DXGL_BLOB_INTEROPERABILITY) || DXGL_FULL_EMULATION
-
-struct ID3D10Blob
-    : IUnknown
-{
-    virtual LPVOID STDMETHODCALLTYPE GetBufferPointer() = 0;
-    virtual SIZE_T STDMETHODCALLTYPE GetBufferSize() = 0;
-};
-
-#endif //defined(DXGL_BLOB_INTEROPERABILITY) || DXGL_FULL_EMULATION
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3D11_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3D11Shader.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3D11Shader.h
deleted file mode 100644
index 635f5937f7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3D11Shader.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3D11Shader h in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3D11SHADER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3D11SHADER_H
-#pragma once
-
-
-#include "DXGL_D3DCommon.h"
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef enum D3D11_SHADER_VERSION_TYPE
-{
-    D3D11_SHVER_PIXEL_SHADER    = 0,
-    D3D11_SHVER_VERTEX_SHADER   = 1,
-    D3D11_SHVER_GEOMETRY_SHADER = 2,
-
-    // D3D11 Shaders
-    D3D11_SHVER_HULL_SHADER     = 3,
-    D3D11_SHVER_DOMAIN_SHADER   = 4,
-    D3D11_SHVER_COMPUTE_SHADER  = 5,
-
-    D3D11_SHVER_RESERVED0       = 0xFFF0,
-} D3D11_SHADER_VERSION_TYPE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct _D3D11_SIGNATURE_PARAMETER_DESC
-{
-    LPCSTR                      SemanticName;   // Name of the semantic
-    UINT                        SemanticIndex;  // Index of the semantic
-    UINT                        Register;       // Number of member variables
-    D3D_NAME                    SystemValueType;// A predefined system value, or D3D_NAME_UNDEFINED if not applicable
-    D3D_REGISTER_COMPONENT_TYPE ComponentType;// Scalar type (e.g. uint, float, etc.)
-    BYTE                        Mask;           // Mask to indicate which components of the register
-                                                // are used (combination of D3D10_COMPONENT_MASK values)
-    BYTE                        ReadWriteMask;  // Mask to indicate whether a given component is
-                                                // never written (if this is an output signature) or
-                                                // always read (if this is an input signature).
-                                                // (combination of D3D10_COMPONENT_MASK values)
-    UINT Stream;                                // Stream index
-    D3D_MIN_PRECISION           MinPrecision;   // Minimum desired interpolation precision
-} D3D11_SIGNATURE_PARAMETER_DESC;
-
-typedef struct _D3D11_SHADER_BUFFER_DESC
-{
-    LPCSTR                  Name;           // Name of the constant buffer
-    D3D_CBUFFER_TYPE        Type;           // Indicates type of buffer content
-    UINT                    Variables;      // Number of member variables
-    UINT                    Size;           // Size of CB (in bytes)
-    UINT                    uFlags;         // Buffer description flags
-} D3D11_SHADER_BUFFER_DESC;
-
-typedef struct _D3D11_SHADER_VARIABLE_DESC
-{
-    LPCSTR                  Name;           // Name of the variable
-    UINT                    StartOffset;    // Offset in constant buffer's backing store
-    UINT                    Size;           // Size of variable (in bytes)
-    UINT                    uFlags;         // Variable flags
-    LPVOID                  DefaultValue;   // Raw pointer to default value
-    UINT                    StartTexture;   // First texture index (or -1 if no textures used)
-    UINT                    TextureSize;    // Number of texture slots possibly used.
-    UINT                    StartSampler;   // First sampler index (or -1 if no textures used)
-    UINT                    SamplerSize;    // Number of sampler slots possibly used.
-} D3D11_SHADER_VARIABLE_DESC;
-
-typedef struct _D3D11_SHADER_TYPE_DESC
-{
-    D3D_SHADER_VARIABLE_CLASS   Class;          // Variable class (e.g. object, matrix, etc.)
-    D3D_SHADER_VARIABLE_TYPE    Type;           // Variable type (e.g. float, sampler, etc.)
-    UINT                        Rows;           // Number of rows (for matrices, 1 for other numeric, 0 if not applicable)
-    UINT                        Columns;        // Number of columns (for vectors & matrices, 1 for other numeric, 0 if not applicable)
-    UINT                        Elements;       // Number of elements (0 if not an array)
-    UINT                        Members;        // Number of members (0 if not a structure)
-    UINT                        Offset;         // Offset from the start of structure (0 if not a structure member)
-    LPCSTR                      Name;           // Name of type, can be NULL
-} D3D11_SHADER_TYPE_DESC;
-
-typedef struct _D3D11_SHADER_DESC
-{
-    UINT                    Version;                     // Shader version
-    LPCSTR                  Creator;                     // Creator string
-    UINT                    Flags;                       // Shader compilation/parse flags
-
-    UINT                    ConstantBuffers;             // Number of constant buffers
-    UINT                    BoundResources;              // Number of bound resources
-    UINT                    InputParameters;             // Number of parameters in the input signature
-    UINT                    OutputParameters;            // Number of parameters in the output signature
-
-    UINT                    InstructionCount;            // Number of emitted instructions
-    UINT                    TempRegisterCount;           // Number of temporary registers used
-    UINT                    TempArrayCount;              // Number of temporary arrays used
-    UINT                    DefCount;                    // Number of constant defines
-    UINT                    DclCount;                    // Number of declarations (input + output)
-    UINT                    TextureNormalInstructions;   // Number of non-categorized texture instructions
-    UINT                    TextureLoadInstructions;     // Number of texture load instructions
-    UINT                    TextureCompInstructions;     // Number of texture comparison instructions
-    UINT                    TextureBiasInstructions;     // Number of texture bias instructions
-    UINT                    TextureGradientInstructions; // Number of texture gradient instructions
-    UINT                    FloatInstructionCount;       // Number of floating point arithmetic instructions used
-    UINT                    IntInstructionCount;         // Number of signed integer arithmetic instructions used
-    UINT                    UintInstructionCount;        // Number of unsigned integer arithmetic instructions used
-    UINT                    StaticFlowControlCount;      // Number of static flow control instructions used
-    UINT                    DynamicFlowControlCount;     // Number of dynamic flow control instructions used
-    UINT                    MacroInstructionCount;       // Number of macro instructions used
-    UINT                    ArrayInstructionCount;       // Number of array instructions used
-    UINT                    CutInstructionCount;         // Number of cut instructions used
-    UINT                    EmitInstructionCount;        // Number of emit instructions used
-    D3D_PRIMITIVE_TOPOLOGY   GSOutputTopology;           // Geometry shader output topology
-    UINT                    GSMaxOutputVertexCount;      // Geometry shader maximum output vertex count
-    D3D_PRIMITIVE           InputPrimitive;              // GS/HS input primitive
-    UINT                    PatchConstantParameters;     // Number of parameters in the patch constant signature
-    UINT                    cGSInstanceCount;            // Number of Geometry shader instances
-    UINT                    cControlPoints;              // Number of control points in the HS->DS stage
-    D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive;  // Primitive output by the tessellator
-    D3D_TESSELLATOR_PARTITIONING HSPartitioning;         // Partitioning mode of the tessellator
-    D3D_TESSELLATOR_DOMAIN  TessellatorDomain;           // Domain of the tessellator (quad, tri, isoline)
-    // instruction counts
-    UINT cBarrierInstructions;                           // Number of barrier instructions in a compute shader
-    UINT cInterlockedInstructions;                       // Number of interlocked instructions
-    UINT cTextureStoreInstructions;                      // Number of texture writes
-} D3D11_SHADER_DESC;
-
-typedef struct _D3D11_SHADER_INPUT_BIND_DESC
-{
-    LPCSTR                      Name;           // Name of the resource
-    D3D_SHADER_INPUT_TYPE       Type;           // Type of resource (e.g. texture, cbuffer, etc.)
-    UINT                        BindPoint;      // Starting bind point
-    UINT                        BindCount;      // Number of contiguous bind points (for arrays)
-
-    UINT                        uFlags;         // Input binding flags
-    D3D_RESOURCE_RETURN_TYPE    ReturnType;     // Return type (if texture)
-    D3D_SRV_DIMENSION           Dimension;      // Dimension (if texture)
-    UINT                        NumSamples;     // Number of samples (0 if not MS texture)
-} D3D11_SHADER_INPUT_BIND_DESC;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Interfaces for full DX emulation
-////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-struct ID3D11ShaderReflectionType
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_TYPE_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByIndex(UINT Index) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByName(LPCSTR Name) = 0;
-    virtual LPCSTR STDMETHODCALLTYPE GetMemberTypeName(UINT Index) = 0;
-    virtual HRESULT STDMETHODCALLTYPE IsEqual(ID3D11ShaderReflectionType* pType) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetSubType() = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetBaseClass() = 0;
-    virtual UINT STDMETHODCALLTYPE GetNumInterfaces() = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetInterfaceByIndex(UINT uIndex) = 0;
-    virtual HRESULT STDMETHODCALLTYPE IsOfType(ID3D11ShaderReflectionType* pType) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ImplementsInterface(ID3D11ShaderReflectionType* pBase) = 0;
-};
-
-struct ID3D11ShaderReflectionConstantBuffer;
-
-struct ID3D11ShaderReflectionVariable
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetType() = 0;
-    virtual ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetBuffer() = 0;
-    virtual UINT STDMETHODCALLTYPE GetInterfaceSlot(UINT uArrayIndex) = 0;
-};
-
-struct ID3D11ShaderReflectionConstantBuffer
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByIndex(UINT Index) = 0;
-    virtual ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name) = 0;
-};
-
-struct ID3D11ShaderReflection
-    : IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID* ppv) = 0;
-    virtual ULONG STDMETHODCALLTYPE AddRef() = 0;
-    virtual ULONG STDMETHODCALLTYPE Release() = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByIndex(UINT Index) = 0;
-    virtual ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByName(LPCSTR Name) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc) = 0;
-    virtual UINT STDMETHODCALLTYPE GetMovInstructionCount() = 0;
-    virtual UINT STDMETHODCALLTYPE GetMovcInstructionCount() = 0;
-    virtual UINT STDMETHODCALLTYPE GetConversionInstructionCount() = 0;
-    virtual UINT STDMETHODCALLTYPE GetBitwiseInstructionCount() = 0;
-    virtual D3D_PRIMITIVE STDMETHODCALLTYPE GetGSInputPrimitive() = 0;
-    virtual BOOL STDMETHODCALLTYPE IsSampleFrequencyShader() = 0;
-    virtual UINT STDMETHODCALLTYPE GetNumInterfaceSlots() = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetMinFeatureLevel(D3D_FEATURE_LEVEL* pLevel) = 0;
-};
-
-#endif //DXGL_FULL_EMULATION
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3D11SHADER_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DCommon.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DCommon.h
deleted file mode 100644
index d1bf177201..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DCommon.h
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in DXGL_D3DCommon.h in the DirectX SDK
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DCOMMON_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DCOMMON_H
-#pragma once
-
-
-typedef
-    enum D3D_DRIVER_TYPE
-{
-    D3D_DRIVER_TYPE_UNKNOWN = 0,
-    D3D_DRIVER_TYPE_HARDWARE    = (D3D_DRIVER_TYPE_UNKNOWN + 1),
-    D3D_DRIVER_TYPE_REFERENCE   = (D3D_DRIVER_TYPE_HARDWARE + 1),
-    D3D_DRIVER_TYPE_NULL    = (D3D_DRIVER_TYPE_REFERENCE + 1),
-    D3D_DRIVER_TYPE_SOFTWARE    = (D3D_DRIVER_TYPE_NULL + 1),
-    D3D_DRIVER_TYPE_WARP    = (D3D_DRIVER_TYPE_SOFTWARE + 1)
-}   D3D_DRIVER_TYPE;
-
-typedef
-    enum D3D_FEATURE_LEVEL
-{
-    D3D_FEATURE_LEVEL_9_1   = 0x9100,
-    D3D_FEATURE_LEVEL_9_2   = 0x9200,
-    D3D_FEATURE_LEVEL_9_3   = 0x9300,
-    D3D_FEATURE_LEVEL_10_0  = 0xa000,
-    D3D_FEATURE_LEVEL_10_1  = 0xa100,
-    D3D_FEATURE_LEVEL_11_0  = 0xb000,
-    D3D_FEATURE_LEVEL_11_1  = 0xb100
-}   D3D_FEATURE_LEVEL;
-
-typedef
-    enum D3D_PRIMITIVE_TOPOLOGY
-{
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED    = 0,
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST    = 1,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP    = 3,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP    = 5,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ    = 11,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ    = 13,
-    D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST    = 33,
-    D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST    = 34,
-    D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST    = 35,
-    D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST    = 36,
-    D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST    = 37,
-    D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST    = 38,
-    D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST    = 39,
-    D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST    = 40,
-    D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST    = 41,
-    D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST   = 42,
-    D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST   = 43,
-    D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST   = 44,
-    D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST   = 45,
-    D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST   = 46,
-    D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST   = 47,
-    D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST   = 48,
-    D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST   = 49,
-    D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST   = 50,
-    D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST   = 51,
-    D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST   = 52,
-    D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST   = 53,
-    D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST   = 54,
-    D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST   = 55,
-    D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST   = 56,
-    D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST   = 57,
-    D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST   = 58,
-    D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST   = 59,
-    D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST   = 60,
-    D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST   = 61,
-    D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST   = 62,
-    D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST   = 63,
-    D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST   = 64,
-    D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED  = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,
-    D3D10_PRIMITIVE_TOPOLOGY_POINTLIST  = D3D_PRIMITIVE_TOPOLOGY_POINTLIST,
-    D3D10_PRIMITIVE_TOPOLOGY_LINELIST   = D3D_PRIMITIVE_TOPOLOGY_LINELIST,
-    D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-    D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED  = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,
-    D3D11_PRIMITIVE_TOPOLOGY_POINTLIST  = D3D_PRIMITIVE_TOPOLOGY_POINTLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_LINELIST   = D3D_PRIMITIVE_TOPOLOGY_LINELIST,
-    D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-    D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST
-}   D3D_PRIMITIVE_TOPOLOGY;
-
-typedef
-    enum D3D_PRIMITIVE
-{
-    D3D_PRIMITIVE_UNDEFINED = 0,
-    D3D_PRIMITIVE_POINT = 1,
-    D3D_PRIMITIVE_LINE  = 2,
-    D3D_PRIMITIVE_TRIANGLE  = 3,
-    D3D_PRIMITIVE_LINE_ADJ  = 6,
-    D3D_PRIMITIVE_TRIANGLE_ADJ  = 7,
-    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH    = 17,
-    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH    = 18,
-    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH    = 19,
-    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH    = 20,
-    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH    = 21,
-    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH    = 22,
-    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH    = 23,
-    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH    = 24,
-    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH    = 25,
-    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH    = 26,
-    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH    = 28,
-    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH    = 29,
-    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH    = 30,
-    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH    = 31,
-    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH    = 32,
-    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH    = 33,
-    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH    = 34,
-    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH    = 35,
-    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH    = 36,
-    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH    = 37,
-    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH    = 38,
-    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH    = 39,
-    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH    = 40,
-    D3D10_PRIMITIVE_UNDEFINED   = D3D_PRIMITIVE_UNDEFINED,
-    D3D10_PRIMITIVE_POINT   = D3D_PRIMITIVE_POINT,
-    D3D10_PRIMITIVE_LINE    = D3D_PRIMITIVE_LINE,
-    D3D10_PRIMITIVE_TRIANGLE    = D3D_PRIMITIVE_TRIANGLE,
-    D3D10_PRIMITIVE_LINE_ADJ    = D3D_PRIMITIVE_LINE_ADJ,
-    D3D10_PRIMITIVE_TRIANGLE_ADJ    = D3D_PRIMITIVE_TRIANGLE_ADJ,
-    D3D11_PRIMITIVE_UNDEFINED   = D3D_PRIMITIVE_UNDEFINED,
-    D3D11_PRIMITIVE_POINT   = D3D_PRIMITIVE_POINT,
-    D3D11_PRIMITIVE_LINE    = D3D_PRIMITIVE_LINE,
-    D3D11_PRIMITIVE_TRIANGLE    = D3D_PRIMITIVE_TRIANGLE,
-    D3D11_PRIMITIVE_LINE_ADJ    = D3D_PRIMITIVE_LINE_ADJ,
-    D3D11_PRIMITIVE_TRIANGLE_ADJ    = D3D_PRIMITIVE_TRIANGLE_ADJ,
-    D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_1_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_2_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_3_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_4_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_5_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_6_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_7_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_8_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_9_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_10_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_11_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_12_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_13_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_14_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_15_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_16_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_17_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_18_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_19_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_20_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_21_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_22_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_23_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_24_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_25_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_26_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_27_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_28_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_29_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_30_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_31_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_32_CONTROL_POINT_PATCH
-}   D3D_PRIMITIVE;
-
-typedef
-    enum D3D_SRV_DIMENSION
-{
-    D3D_SRV_DIMENSION_UNKNOWN   = 0,
-    D3D_SRV_DIMENSION_BUFFER    = 1,
-    D3D_SRV_DIMENSION_TEXTURE1D = 2,
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY    = 3,
-    D3D_SRV_DIMENSION_TEXTURE2D = 4,
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY    = 5,
-    D3D_SRV_DIMENSION_TEXTURE2DMS   = 6,
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY  = 7,
-    D3D_SRV_DIMENSION_TEXTURE3D = 8,
-    D3D_SRV_DIMENSION_TEXTURECUBE   = 9,
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY  = 10,
-    D3D_SRV_DIMENSION_BUFFEREX  = 11,
-    D3D10_SRV_DIMENSION_UNKNOWN = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D10_SRV_DIMENSION_BUFFER  = D3D_SRV_DIMENSION_BUFFER,
-    D3D10_SRV_DIMENSION_TEXTURE1D   = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D10_SRV_DIMENSION_TEXTURE1DARRAY  = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2D   = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D10_SRV_DIMENSION_TEXTURE2DARRAY  = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2DMS = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY    = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE3D   = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D10_SRV_DIMENSION_TEXTURECUBE = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D10_1_SRV_DIMENSION_UNKNOWN   = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D10_1_SRV_DIMENSION_BUFFER    = D3D_SRV_DIMENSION_BUFFER,
-    D3D10_1_SRV_DIMENSION_TEXTURE1D = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY    = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE2D = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY    = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMS   = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY  = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE3D = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBE   = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY  = D3D_SRV_DIMENSION_TEXTURECUBEARRAY,
-    D3D11_SRV_DIMENSION_UNKNOWN = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D11_SRV_DIMENSION_BUFFER  = D3D_SRV_DIMENSION_BUFFER,
-    D3D11_SRV_DIMENSION_TEXTURE1D   = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D11_SRV_DIMENSION_TEXTURE1DARRAY  = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE2D   = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D11_SRV_DIMENSION_TEXTURE2DARRAY  = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE2DMS = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY    = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE3D   = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D11_SRV_DIMENSION_TEXTURECUBE = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D11_SRV_DIMENSION_TEXTURECUBEARRAY    = D3D_SRV_DIMENSION_TEXTURECUBEARRAY,
-    D3D11_SRV_DIMENSION_BUFFEREX    = D3D_SRV_DIMENSION_BUFFEREX
-}   D3D_SRV_DIMENSION;
-
-typedef
-    enum _D3D_INCLUDE_TYPE
-{
-    D3D_INCLUDE_LOCAL   = 0,
-    D3D_INCLUDE_SYSTEM  = (D3D_INCLUDE_LOCAL + 1),
-    D3D10_INCLUDE_LOCAL = D3D_INCLUDE_LOCAL,
-    D3D10_INCLUDE_SYSTEM    = D3D_INCLUDE_SYSTEM,
-    D3D_INCLUDE_FORCE_DWORD = 0x7fffffff
-}   D3D_INCLUDE_TYPE;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_CLASS
-{
-    D3D_SVC_SCALAR  = 0,
-    D3D_SVC_VECTOR  = (D3D_SVC_SCALAR + 1),
-    D3D_SVC_MATRIX_ROWS = (D3D_SVC_VECTOR + 1),
-    D3D_SVC_MATRIX_COLUMNS  = (D3D_SVC_MATRIX_ROWS + 1),
-    D3D_SVC_OBJECT  = (D3D_SVC_MATRIX_COLUMNS + 1),
-    D3D_SVC_STRUCT  = (D3D_SVC_OBJECT + 1),
-    D3D_SVC_INTERFACE_CLASS = (D3D_SVC_STRUCT + 1),
-    D3D_SVC_INTERFACE_POINTER   = (D3D_SVC_INTERFACE_CLASS + 1),
-    D3D10_SVC_SCALAR    = D3D_SVC_SCALAR,
-    D3D10_SVC_VECTOR    = D3D_SVC_VECTOR,
-    D3D10_SVC_MATRIX_ROWS   = D3D_SVC_MATRIX_ROWS,
-    D3D10_SVC_MATRIX_COLUMNS    = D3D_SVC_MATRIX_COLUMNS,
-    D3D10_SVC_OBJECT    = D3D_SVC_OBJECT,
-    D3D10_SVC_STRUCT    = D3D_SVC_STRUCT,
-    D3D11_SVC_INTERFACE_CLASS   = D3D_SVC_INTERFACE_CLASS,
-    D3D11_SVC_INTERFACE_POINTER = D3D_SVC_INTERFACE_POINTER,
-    D3D_SVC_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_CLASS;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_FLAGS
-{
-    D3D_SVF_USERPACKED  = 1,
-    D3D_SVF_USED    = 2,
-    D3D_SVF_INTERFACE_POINTER   = 4,
-    D3D_SVF_INTERFACE_PARAMETER = 8,
-    D3D10_SVF_USERPACKED    = D3D_SVF_USERPACKED,
-    D3D10_SVF_USED  = D3D_SVF_USED,
-    D3D11_SVF_INTERFACE_POINTER = D3D_SVF_INTERFACE_POINTER,
-    D3D11_SVF_INTERFACE_PARAMETER   = D3D_SVF_INTERFACE_PARAMETER,
-    D3D_SVF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_FLAGS;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_TYPE
-{
-    D3D_SVT_VOID    = 0,
-    D3D_SVT_BOOL    = 1,
-    D3D_SVT_INT = 2,
-    D3D_SVT_FLOAT   = 3,
-    D3D_SVT_STRING  = 4,
-    D3D_SVT_TEXTURE = 5,
-    D3D_SVT_TEXTURE1D   = 6,
-    D3D_SVT_TEXTURE2D   = 7,
-    D3D_SVT_TEXTURE3D   = 8,
-    D3D_SVT_TEXTURECUBE = 9,
-    D3D_SVT_SAMPLER = 10,
-    D3D_SVT_SAMPLER1D   = 11,
-    D3D_SVT_SAMPLER2D   = 12,
-    D3D_SVT_SAMPLER3D   = 13,
-    D3D_SVT_SAMPLERCUBE = 14,
-    D3D_SVT_PIXELSHADER = 15,
-    D3D_SVT_VERTEXSHADER    = 16,
-    D3D_SVT_PIXELFRAGMENT   = 17,
-    D3D_SVT_VERTEXFRAGMENT  = 18,
-    D3D_SVT_UINT    = 19,
-    D3D_SVT_UINT8   = 20,
-    D3D_SVT_GEOMETRYSHADER  = 21,
-    D3D_SVT_RASTERIZER  = 22,
-    D3D_SVT_DEPTHSTENCIL    = 23,
-    D3D_SVT_BLEND   = 24,
-    D3D_SVT_BUFFER  = 25,
-    D3D_SVT_CBUFFER = 26,
-    D3D_SVT_TBUFFER = 27,
-    D3D_SVT_TEXTURE1DARRAY  = 28,
-    D3D_SVT_TEXTURE2DARRAY  = 29,
-    D3D_SVT_RENDERTARGETVIEW    = 30,
-    D3D_SVT_DEPTHSTENCILVIEW    = 31,
-    D3D_SVT_TEXTURE2DMS = 32,
-    D3D_SVT_TEXTURE2DMSARRAY    = 33,
-    D3D_SVT_TEXTURECUBEARRAY    = 34,
-    D3D_SVT_HULLSHADER  = 35,
-    D3D_SVT_DOMAINSHADER    = 36,
-    D3D_SVT_INTERFACE_POINTER   = 37,
-    D3D_SVT_COMPUTESHADER   = 38,
-    D3D_SVT_DOUBLE  = 39,
-    D3D_SVT_RWTEXTURE1D = 40,
-    D3D_SVT_RWTEXTURE1DARRAY    = 41,
-    D3D_SVT_RWTEXTURE2D = 42,
-    D3D_SVT_RWTEXTURE2DARRAY    = 43,
-    D3D_SVT_RWTEXTURE3D = 44,
-    D3D_SVT_RWBUFFER    = 45,
-    D3D_SVT_BYTEADDRESS_BUFFER  = 46,
-    D3D_SVT_RWBYTEADDRESS_BUFFER    = 47,
-    D3D_SVT_STRUCTURED_BUFFER   = 48,
-    D3D_SVT_RWSTRUCTURED_BUFFER = 49,
-    D3D_SVT_APPEND_STRUCTURED_BUFFER    = 50,
-    D3D_SVT_CONSUME_STRUCTURED_BUFFER   = 51,
-    D3D10_SVT_VOID  = D3D_SVT_VOID,
-    D3D10_SVT_BOOL  = D3D_SVT_BOOL,
-    D3D10_SVT_INT   = D3D_SVT_INT,
-    D3D10_SVT_FLOAT = D3D_SVT_FLOAT,
-    D3D10_SVT_STRING    = D3D_SVT_STRING,
-    D3D10_SVT_TEXTURE   = D3D_SVT_TEXTURE,
-    D3D10_SVT_TEXTURE1D = D3D_SVT_TEXTURE1D,
-    D3D10_SVT_TEXTURE2D = D3D_SVT_TEXTURE2D,
-    D3D10_SVT_TEXTURE3D = D3D_SVT_TEXTURE3D,
-    D3D10_SVT_TEXTURECUBE   = D3D_SVT_TEXTURECUBE,
-    D3D10_SVT_SAMPLER   = D3D_SVT_SAMPLER,
-    D3D10_SVT_SAMPLER1D = D3D_SVT_SAMPLER1D,
-    D3D10_SVT_SAMPLER2D = D3D_SVT_SAMPLER2D,
-    D3D10_SVT_SAMPLER3D = D3D_SVT_SAMPLER3D,
-    D3D10_SVT_SAMPLERCUBE   = D3D_SVT_SAMPLERCUBE,
-    D3D10_SVT_PIXELSHADER   = D3D_SVT_PIXELSHADER,
-    D3D10_SVT_VERTEXSHADER  = D3D_SVT_VERTEXSHADER,
-    D3D10_SVT_PIXELFRAGMENT = D3D_SVT_PIXELFRAGMENT,
-    D3D10_SVT_VERTEXFRAGMENT    = D3D_SVT_VERTEXFRAGMENT,
-    D3D10_SVT_UINT  = D3D_SVT_UINT,
-    D3D10_SVT_UINT8 = D3D_SVT_UINT8,
-    D3D10_SVT_GEOMETRYSHADER    = D3D_SVT_GEOMETRYSHADER,
-    D3D10_SVT_RASTERIZER    = D3D_SVT_RASTERIZER,
-    D3D10_SVT_DEPTHSTENCIL  = D3D_SVT_DEPTHSTENCIL,
-    D3D10_SVT_BLEND = D3D_SVT_BLEND,
-    D3D10_SVT_BUFFER    = D3D_SVT_BUFFER,
-    D3D10_SVT_CBUFFER   = D3D_SVT_CBUFFER,
-    D3D10_SVT_TBUFFER   = D3D_SVT_TBUFFER,
-    D3D10_SVT_TEXTURE1DARRAY    = D3D_SVT_TEXTURE1DARRAY,
-    D3D10_SVT_TEXTURE2DARRAY    = D3D_SVT_TEXTURE2DARRAY,
-    D3D10_SVT_RENDERTARGETVIEW  = D3D_SVT_RENDERTARGETVIEW,
-    D3D10_SVT_DEPTHSTENCILVIEW  = D3D_SVT_DEPTHSTENCILVIEW,
-    D3D10_SVT_TEXTURE2DMS   = D3D_SVT_TEXTURE2DMS,
-    D3D10_SVT_TEXTURE2DMSARRAY  = D3D_SVT_TEXTURE2DMSARRAY,
-    D3D10_SVT_TEXTURECUBEARRAY  = D3D_SVT_TEXTURECUBEARRAY,
-    D3D11_SVT_HULLSHADER    = D3D_SVT_HULLSHADER,
-    D3D11_SVT_DOMAINSHADER  = D3D_SVT_DOMAINSHADER,
-    D3D11_SVT_INTERFACE_POINTER = D3D_SVT_INTERFACE_POINTER,
-    D3D11_SVT_COMPUTESHADER = D3D_SVT_COMPUTESHADER,
-    D3D11_SVT_DOUBLE    = D3D_SVT_DOUBLE,
-    D3D11_SVT_RWTEXTURE1D   = D3D_SVT_RWTEXTURE1D,
-    D3D11_SVT_RWTEXTURE1DARRAY  = D3D_SVT_RWTEXTURE1DARRAY,
-    D3D11_SVT_RWTEXTURE2D   = D3D_SVT_RWTEXTURE2D,
-    D3D11_SVT_RWTEXTURE2DARRAY  = D3D_SVT_RWTEXTURE2DARRAY,
-    D3D11_SVT_RWTEXTURE3D   = D3D_SVT_RWTEXTURE3D,
-    D3D11_SVT_RWBUFFER  = D3D_SVT_RWBUFFER,
-    D3D11_SVT_BYTEADDRESS_BUFFER    = D3D_SVT_BYTEADDRESS_BUFFER,
-    D3D11_SVT_RWBYTEADDRESS_BUFFER  = D3D_SVT_RWBYTEADDRESS_BUFFER,
-    D3D11_SVT_STRUCTURED_BUFFER = D3D_SVT_STRUCTURED_BUFFER,
-    D3D11_SVT_RWSTRUCTURED_BUFFER   = D3D_SVT_RWSTRUCTURED_BUFFER,
-    D3D11_SVT_APPEND_STRUCTURED_BUFFER  = D3D_SVT_APPEND_STRUCTURED_BUFFER,
-    D3D11_SVT_CONSUME_STRUCTURED_BUFFER = D3D_SVT_CONSUME_STRUCTURED_BUFFER,
-    D3D_SVT_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_TYPE;
-
-typedef
-    enum _D3D_SHADER_INPUT_FLAGS
-{
-    D3D_SIF_USERPACKED  = 1,
-    D3D_SIF_COMPARISON_SAMPLER  = 2,
-    D3D_SIF_TEXTURE_COMPONENT_0 = 4,
-    D3D_SIF_TEXTURE_COMPONENT_1 = 8,
-    D3D_SIF_TEXTURE_COMPONENTS  = 12,
-    D3D10_SIF_USERPACKED    = D3D_SIF_USERPACKED,
-    D3D10_SIF_COMPARISON_SAMPLER    = D3D_SIF_COMPARISON_SAMPLER,
-    D3D10_SIF_TEXTURE_COMPONENT_0   = D3D_SIF_TEXTURE_COMPONENT_0,
-    D3D10_SIF_TEXTURE_COMPONENT_1   = D3D_SIF_TEXTURE_COMPONENT_1,
-    D3D10_SIF_TEXTURE_COMPONENTS    = D3D_SIF_TEXTURE_COMPONENTS,
-    D3D_SIF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_INPUT_FLAGS;
-
-typedef
-    enum _D3D_SHADER_INPUT_TYPE
-{
-    D3D_SIT_CBUFFER = 0,
-    D3D_SIT_TBUFFER = (D3D_SIT_CBUFFER + 1),
-    D3D_SIT_TEXTURE = (D3D_SIT_TBUFFER + 1),
-    D3D_SIT_SAMPLER = (D3D_SIT_TEXTURE + 1),
-    D3D_SIT_UAV_RWTYPED = (D3D_SIT_SAMPLER + 1),
-    D3D_SIT_STRUCTURED  = (D3D_SIT_UAV_RWTYPED + 1),
-    D3D_SIT_UAV_RWSTRUCTURED    = (D3D_SIT_STRUCTURED + 1),
-    D3D_SIT_BYTEADDRESS = (D3D_SIT_UAV_RWSTRUCTURED + 1),
-    D3D_SIT_UAV_RWBYTEADDRESS   = (D3D_SIT_BYTEADDRESS + 1),
-    D3D_SIT_UAV_APPEND_STRUCTURED   = (D3D_SIT_UAV_RWBYTEADDRESS + 1),
-    D3D_SIT_UAV_CONSUME_STRUCTURED  = (D3D_SIT_UAV_APPEND_STRUCTURED + 1),
-    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER   = (D3D_SIT_UAV_CONSUME_STRUCTURED + 1),
-    D3D10_SIT_CBUFFER   = D3D_SIT_CBUFFER,
-    D3D10_SIT_TBUFFER   = D3D_SIT_TBUFFER,
-    D3D10_SIT_TEXTURE   = D3D_SIT_TEXTURE,
-    D3D10_SIT_SAMPLER   = D3D_SIT_SAMPLER,
-    D3D11_SIT_UAV_RWTYPED   = D3D_SIT_UAV_RWTYPED,
-    D3D11_SIT_STRUCTURED    = D3D_SIT_STRUCTURED,
-    D3D11_SIT_UAV_RWSTRUCTURED  = D3D_SIT_UAV_RWSTRUCTURED,
-    D3D11_SIT_BYTEADDRESS   = D3D_SIT_BYTEADDRESS,
-    D3D11_SIT_UAV_RWBYTEADDRESS = D3D_SIT_UAV_RWBYTEADDRESS,
-    D3D11_SIT_UAV_APPEND_STRUCTURED = D3D_SIT_UAV_APPEND_STRUCTURED,
-    D3D11_SIT_UAV_CONSUME_STRUCTURED    = D3D_SIT_UAV_CONSUME_STRUCTURED,
-    D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER = D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER
-}   D3D_SHADER_INPUT_TYPE;
-
-typedef
-    enum _D3D_SHADER_CBUFFER_FLAGS
-{
-    D3D_CBF_USERPACKED  = 1,
-    D3D10_CBF_USERPACKED    = D3D_CBF_USERPACKED,
-    D3D_CBF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_CBUFFER_FLAGS;
-
-typedef
-    enum _D3D_CBUFFER_TYPE
-{
-    D3D_CT_CBUFFER  = 0,
-    D3D_CT_TBUFFER  = (D3D_CT_CBUFFER + 1),
-    D3D_CT_INTERFACE_POINTERS   = (D3D_CT_TBUFFER + 1),
-    D3D_CT_RESOURCE_BIND_INFO   = (D3D_CT_INTERFACE_POINTERS + 1),
-    D3D10_CT_CBUFFER    = D3D_CT_CBUFFER,
-    D3D10_CT_TBUFFER    = D3D_CT_TBUFFER,
-    D3D11_CT_CBUFFER    = D3D_CT_CBUFFER,
-    D3D11_CT_TBUFFER    = D3D_CT_TBUFFER,
-    D3D11_CT_INTERFACE_POINTERS = D3D_CT_INTERFACE_POINTERS,
-    D3D11_CT_RESOURCE_BIND_INFO = D3D_CT_RESOURCE_BIND_INFO
-}   D3D_CBUFFER_TYPE;
-
-typedef
-    enum D3D_NAME
-{
-    D3D_NAME_UNDEFINED  = 0,
-    D3D_NAME_POSITION   = 1,
-    D3D_NAME_CLIP_DISTANCE  = 2,
-    D3D_NAME_CULL_DISTANCE  = 3,
-    D3D_NAME_RENDER_TARGET_ARRAY_INDEX  = 4,
-    D3D_NAME_VIEWPORT_ARRAY_INDEX   = 5,
-    D3D_NAME_VERTEX_ID  = 6,
-    D3D_NAME_PRIMITIVE_ID   = 7,
-    D3D_NAME_INSTANCE_ID    = 8,
-    D3D_NAME_IS_FRONT_FACE  = 9,
-    D3D_NAME_SAMPLE_INDEX   = 10,
-    D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR = 11,
-    D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR   = 12,
-    D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR  = 13,
-    D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR    = 14,
-    D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR   = 15,
-    D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR  = 16,
-    D3D_NAME_TARGET = 64,
-    D3D_NAME_DEPTH  = 65,
-    D3D_NAME_COVERAGE   = 66,
-    D3D_NAME_DEPTH_GREATER_EQUAL    = 67,
-    D3D_NAME_DEPTH_LESS_EQUAL   = 68,
-    D3D10_NAME_UNDEFINED    = D3D_NAME_UNDEFINED,
-    D3D10_NAME_POSITION = D3D_NAME_POSITION,
-    D3D10_NAME_CLIP_DISTANCE    = D3D_NAME_CLIP_DISTANCE,
-    D3D10_NAME_CULL_DISTANCE    = D3D_NAME_CULL_DISTANCE,
-    D3D10_NAME_RENDER_TARGET_ARRAY_INDEX    = D3D_NAME_RENDER_TARGET_ARRAY_INDEX,
-    D3D10_NAME_VIEWPORT_ARRAY_INDEX = D3D_NAME_VIEWPORT_ARRAY_INDEX,
-    D3D10_NAME_VERTEX_ID    = D3D_NAME_VERTEX_ID,
-    D3D10_NAME_PRIMITIVE_ID = D3D_NAME_PRIMITIVE_ID,
-    D3D10_NAME_INSTANCE_ID  = D3D_NAME_INSTANCE_ID,
-    D3D10_NAME_IS_FRONT_FACE    = D3D_NAME_IS_FRONT_FACE,
-    D3D10_NAME_SAMPLE_INDEX = D3D_NAME_SAMPLE_INDEX,
-    D3D10_NAME_TARGET   = D3D_NAME_TARGET,
-    D3D10_NAME_DEPTH    = D3D_NAME_DEPTH,
-    D3D10_NAME_COVERAGE = D3D_NAME_COVERAGE,
-    D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR   = D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR,
-    D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR = D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR,
-    D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR    = D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR,
-    D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR  = D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR,
-    D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR = D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR,
-    D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR    = D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR,
-    D3D11_NAME_DEPTH_GREATER_EQUAL  = D3D_NAME_DEPTH_GREATER_EQUAL,
-    D3D11_NAME_DEPTH_LESS_EQUAL = D3D_NAME_DEPTH_LESS_EQUAL
-}   D3D_NAME;
-
-typedef
-    enum D3D_RESOURCE_RETURN_TYPE
-{
-    D3D_RETURN_TYPE_UNORM   = 1,
-    D3D_RETURN_TYPE_SNORM   = 2,
-    D3D_RETURN_TYPE_SINT    = 3,
-    D3D_RETURN_TYPE_UINT    = 4,
-    D3D_RETURN_TYPE_FLOAT   = 5,
-    D3D_RETURN_TYPE_MIXED   = 6,
-    D3D_RETURN_TYPE_DOUBLE  = 7,
-    D3D_RETURN_TYPE_CONTINUED   = 8,
-    D3D10_RETURN_TYPE_UNORM = D3D_RETURN_TYPE_UNORM,
-    D3D10_RETURN_TYPE_SNORM = D3D_RETURN_TYPE_SNORM,
-    D3D10_RETURN_TYPE_SINT  = D3D_RETURN_TYPE_SINT,
-    D3D10_RETURN_TYPE_UINT  = D3D_RETURN_TYPE_UINT,
-    D3D10_RETURN_TYPE_FLOAT = D3D_RETURN_TYPE_FLOAT,
-    D3D10_RETURN_TYPE_MIXED = D3D_RETURN_TYPE_MIXED,
-    D3D11_RETURN_TYPE_UNORM = D3D_RETURN_TYPE_UNORM,
-    D3D11_RETURN_TYPE_SNORM = D3D_RETURN_TYPE_SNORM,
-    D3D11_RETURN_TYPE_SINT  = D3D_RETURN_TYPE_SINT,
-    D3D11_RETURN_TYPE_UINT  = D3D_RETURN_TYPE_UINT,
-    D3D11_RETURN_TYPE_FLOAT = D3D_RETURN_TYPE_FLOAT,
-    D3D11_RETURN_TYPE_MIXED = D3D_RETURN_TYPE_MIXED,
-    D3D11_RETURN_TYPE_DOUBLE    = D3D_RETURN_TYPE_DOUBLE,
-    D3D11_RETURN_TYPE_CONTINUED = D3D_RETURN_TYPE_CONTINUED
-}   D3D_RESOURCE_RETURN_TYPE;
-
-typedef
-    enum D3D_REGISTER_COMPONENT_TYPE
-{
-    D3D_REGISTER_COMPONENT_UNKNOWN  = 0,
-    D3D_REGISTER_COMPONENT_UINT32   = 1,
-    D3D_REGISTER_COMPONENT_SINT32   = 2,
-    D3D_REGISTER_COMPONENT_FLOAT32  = 3,
-    D3D10_REGISTER_COMPONENT_UNKNOWN    = D3D_REGISTER_COMPONENT_UNKNOWN,
-    D3D10_REGISTER_COMPONENT_UINT32 = D3D_REGISTER_COMPONENT_UINT32,
-    D3D10_REGISTER_COMPONENT_SINT32 = D3D_REGISTER_COMPONENT_SINT32,
-    D3D10_REGISTER_COMPONENT_FLOAT32    = D3D_REGISTER_COMPONENT_FLOAT32
-}   D3D_REGISTER_COMPONENT_TYPE;
-
-typedef
-    enum D3D_TESSELLATOR_DOMAIN
-{
-    D3D_TESSELLATOR_DOMAIN_UNDEFINED    = 0,
-    D3D_TESSELLATOR_DOMAIN_ISOLINE  = 1,
-    D3D_TESSELLATOR_DOMAIN_TRI  = 2,
-    D3D_TESSELLATOR_DOMAIN_QUAD = 3,
-    D3D11_TESSELLATOR_DOMAIN_UNDEFINED  = D3D_TESSELLATOR_DOMAIN_UNDEFINED,
-    D3D11_TESSELLATOR_DOMAIN_ISOLINE    = D3D_TESSELLATOR_DOMAIN_ISOLINE,
-    D3D11_TESSELLATOR_DOMAIN_TRI    = D3D_TESSELLATOR_DOMAIN_TRI,
-    D3D11_TESSELLATOR_DOMAIN_QUAD   = D3D_TESSELLATOR_DOMAIN_QUAD
-}   D3D_TESSELLATOR_DOMAIN;
-
-typedef
-    enum D3D_TESSELLATOR_PARTITIONING
-{
-    D3D_TESSELLATOR_PARTITIONING_UNDEFINED  = 0,
-    D3D_TESSELLATOR_PARTITIONING_INTEGER    = 1,
-    D3D_TESSELLATOR_PARTITIONING_POW2   = 2,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN    = 4,
-    D3D11_TESSELLATOR_PARTITIONING_UNDEFINED    = D3D_TESSELLATOR_PARTITIONING_UNDEFINED,
-    D3D11_TESSELLATOR_PARTITIONING_INTEGER  = D3D_TESSELLATOR_PARTITIONING_INTEGER,
-    D3D11_TESSELLATOR_PARTITIONING_POW2 = D3D_TESSELLATOR_PARTITIONING_POW2,
-    D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD   = D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD,
-    D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN  = D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN
-}   D3D_TESSELLATOR_PARTITIONING;
-
-typedef
-    enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE
-{
-    D3D_TESSELLATOR_OUTPUT_UNDEFINED    = 0,
-    D3D_TESSELLATOR_OUTPUT_POINT    = 1,
-    D3D_TESSELLATOR_OUTPUT_LINE = 2,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW  = 3,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4,
-    D3D11_TESSELLATOR_OUTPUT_UNDEFINED  = D3D_TESSELLATOR_OUTPUT_UNDEFINED,
-    D3D11_TESSELLATOR_OUTPUT_POINT  = D3D_TESSELLATOR_OUTPUT_POINT,
-    D3D11_TESSELLATOR_OUTPUT_LINE   = D3D_TESSELLATOR_OUTPUT_LINE,
-    D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW    = D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW,
-    D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW   = D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW
-}   D3D_TESSELLATOR_OUTPUT_PRIMITIVE;
-
-typedef
-    enum D3D_MIN_PRECISION
-{
-    D3D_MIN_PRECISION_DEFAULT   = 0,
-    D3D_MIN_PRECISION_FLOAT_16  = 1,
-    D3D_MIN_PRECISION_FLOAT_2_8 = 2,
-    D3D_MIN_PRECISION_RESERVED  = 3,
-    D3D_MIN_PRECISION_SINT_16   = 4,
-    D3D_MIN_PRECISION_UINT_16   = 5,
-    D3D_MIN_PRECISION_ANY_16    = 0xf0,
-    D3D_MIN_PRECISION_ANY_10    = 0xf1
-}   D3D_MIN_PRECISION;
-
-typedef struct _D3D_SHADER_MACRO
-{
-    LPCSTR Name;
-    LPCSTR Definition;
-}   D3D_SHADER_MACRO;
-
-typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO;
-
-struct ID3DInclude
-{
-    virtual HRESULT STDMETHODCALLTYPE Open(D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID* ppData, UINT* pBytes) = 0;
-    virtual HRESULT STDMETHODCALLTYPE Open(LPCVOID pData) = 0;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DCOMMON_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DCompiler.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DCompiler.h
deleted file mode 100644
index 2cda73f4b2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DCompiler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DCompiler.h in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DCOMPILER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DCOMPILER_H
-#pragma once
-
-
-#include "DXGL_D3D11Shader.h"
-
-#define D3DCOMPILE_DEBUG                          (1 << 0)
-#define D3DCOMPILE_SKIP_VALIDATION                (1 << 1)
-#define D3DCOMPILE_SKIP_OPTIMIZATION              (1 << 2)
-#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR          (1 << 3)
-#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR       (1 << 4)
-#define D3DCOMPILE_PARTIAL_PRECISION              (1 << 5)
-#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT       (1 << 6)
-#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT       (1 << 7)
-#define D3DCOMPILE_NO_PRESHADER                   (1 << 8)
-#define D3DCOMPILE_AVOID_FLOW_CONTROL             (1 << 9)
-#define D3DCOMPILE_PREFER_FLOW_CONTROL            (1 << 10)
-#define D3DCOMPILE_ENABLE_STRICTNESS              (1 << 11)
-#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY (1 << 12)
-#define D3DCOMPILE_IEEE_STRICTNESS                (1 << 13)
-#define D3DCOMPILE_OPTIMIZATION_LEVEL0            (1 << 14)
-#define D3DCOMPILE_OPTIMIZATION_LEVEL1            0
-#define D3DCOMPILE_OPTIMIZATION_LEVEL2            ((1 << 14) | (1 << 15))
-#define D3DCOMPILE_OPTIMIZATION_LEVEL3            (1 << 15)
-#define D3DCOMPILE_RESERVED16                     (1 << 16)
-#define D3DCOMPILE_RESERVED17                     (1 << 17)
-#define D3DCOMPILE_WARNINGS_ARE_ERRORS            (1 << 18)
-
-typedef HRESULT (WINAPI * pD3DCompile)
-    (LPCVOID                         pSrcData,
-    SIZE_T                          SrcDataSize,
-    LPCSTR                          pFileName,
-    CONST D3D_SHADER_MACRO*         pDefines,
-    ID3DInclude*                    pInclude,
-    LPCSTR                          pEntrypoint,
-    LPCSTR                          pTarget,
-    UINT                            Flags1,
-    UINT                            Flags2,
-    ID3DBlob**                      ppCode,
-    ID3DBlob**                      ppErrorMsgs);
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DCOMPILER_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DX11.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DX11.h
deleted file mode 100644
index 1440179fb4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DX11.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DX11tex h in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DX11_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DX11_H
-#pragma once
-
-
-#include "DXGL_D3DX11tex.h"
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-struct ID3DX11ThreadPump;
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DX11_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DX11tex.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DX11tex.h
deleted file mode 100644
index 7dbd24b834..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_D3DX11tex.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DX11tex.h in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DX11TEX_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DX11TEX_H
-#pragma once
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef enum D3DX11_FILTER_FLAG
-{
-    D3DX11_FILTER_NONE            =   (1 << 0),
-    D3DX11_FILTER_POINT           =   (2 << 0),
-    D3DX11_FILTER_LINEAR          =   (3 << 0),
-    D3DX11_FILTER_TRIANGLE        =   (4 << 0),
-    D3DX11_FILTER_BOX             =   (5 << 0),
-
-    D3DX11_FILTER_MIRROR_U        =   (1 << 16),
-    D3DX11_FILTER_MIRROR_V        =   (2 << 16),
-    D3DX11_FILTER_MIRROR_W        =   (4 << 16),
-    D3DX11_FILTER_MIRROR          =   (7 << 16),
-
-    D3DX11_FILTER_DITHER          =   (1 << 19),
-    D3DX11_FILTER_DITHER_DIFFUSION =   (2 << 19),
-
-    D3DX11_FILTER_SRGB_IN         =   (1 << 21),
-    D3DX11_FILTER_SRGB_OUT        =   (2 << 21),
-    D3DX11_FILTER_SRGB            =   (3 << 21),
-} D3DX11_FILTER_FLAG;
-
-typedef enum D3DX11_NORMALMAP_FLAG
-{
-    D3DX11_NORMALMAP_MIRROR_U          =   (1 << 16),
-    D3DX11_NORMALMAP_MIRROR_V          =   (2 << 16),
-    D3DX11_NORMALMAP_MIRROR            =   (3 << 16),
-    D3DX11_NORMALMAP_INVERTSIGN        =   (8 << 16),
-    D3DX11_NORMALMAP_COMPUTE_OCCLUSION =   (16 << 16),
-} D3DX11_NORMALMAP_FLAG;
-
-typedef enum D3DX11_CHANNEL_FLAG
-{
-    D3DX11_CHANNEL_RED           =    (1 << 0),
-    D3DX11_CHANNEL_BLUE          =    (1 << 1),
-    D3DX11_CHANNEL_GREEN         =    (1 << 2),
-    D3DX11_CHANNEL_ALPHA         =    (1 << 3),
-    D3DX11_CHANNEL_LUMINANCE     =    (1 << 4),
-} D3DX11_CHANNEL_FLAG;
-
-typedef enum D3DX11_IMAGE_FILE_FORMAT
-{
-    D3DX11_IFF_BMP         = 0,
-    D3DX11_IFF_JPG         = 1,
-    D3DX11_IFF_PNG         = 3,
-    D3DX11_IFF_DDS         = 4,
-    D3DX11_IFF_TIFF       = 10,
-    D3DX11_IFF_GIF        = 11,
-    D3DX11_IFF_WMP        = 12,
-    D3DX11_IFF_FORCE_DWORD = 0x7fffffff
-} D3DX11_IMAGE_FILE_FORMAT;
-
-typedef enum D3DX11_SAVE_TEXTURE_FLAG
-{
-    D3DX11_STF_USEINPUTBLOB      = 0x0001,
-} D3DX11_SAVE_TEXTURE_FLAG;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct D3DX11_IMAGE_INFO
-{
-    UINT                        Width;
-    UINT                        Height;
-    UINT                        Depth;
-    UINT                        ArraySize;
-    UINT                        MipLevels;
-    UINT                        MiscFlags;
-    DXGI_FORMAT                 Format;
-    D3D11_RESOURCE_DIMENSION    ResourceDimension;
-    D3DX11_IMAGE_FILE_FORMAT    ImageFileFormat;
-} D3DX11_IMAGE_INFO;
-
-typedef struct D3DX11_IMAGE_LOAD_INFO
-{
-    UINT                       Width;
-    UINT                       Height;
-    UINT                       Depth;
-    UINT                       FirstMipLevel;
-    UINT                       MipLevels;
-    D3D11_USAGE                Usage;
-    UINT                       BindFlags;
-    UINT                       CpuAccessFlags;
-    UINT                       MiscFlags;
-    DXGI_FORMAT                Format;
-    UINT                       Filter;
-    UINT                       MipFilter;
-    D3DX11_IMAGE_INFO*         pSrcInfo;
-} D3DX11_IMAGE_LOAD_INFO;
-
-typedef struct _D3DX11_TEXTURE_LOAD_INFO
-{
-    D3D11_BOX* pSrcBox;
-    D3D11_BOX* pDstBox;
-    UINT            SrcFirstMip;
-    UINT            DstFirstMip;
-    UINT            NumMips;
-    UINT            SrcFirstElement;
-    UINT            DstFirstElement;
-    UINT            NumElements;
-    UINT            Filter;
-    UINT            MipFilter;
-} D3DX11_TEXTURE_LOAD_INFO;
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_D3DX11TEX_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_ID3D11Device.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_ID3D11Device.h
deleted file mode 100644
index c0680bc81b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_ID3D11Device.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the ID3D11Device interface
-//               matching the one in the DirectX SDK
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_ID3D11DEVICE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_ID3D11DEVICE_H
-#pragma once
-
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXGLBase.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-struct ID3D11DeviceContext;
-
-struct ID3D11Device
-#if DXGL_FULL_EMULATION
-    : IUnknown
-#else
-    : CCryDXGLBase
-#endif
-{
-    // ID3D11Device interface (adapted from DXSDK/include/D3D11.h)
-    virtual HRESULT STDMETHODCALLTYPE CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext) = 0;
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels) = 0;
-    virtual void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData) = 0;
-    virtual D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel(void) = 0;
-    virtual UINT STDMETHODCALLTYPE GetCreationFlags(void) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason(void) = 0;
-    virtual void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags) = 0;
-    virtual UINT STDMETHODCALLTYPE GetExceptionMode(void) = 0;
-
-    // IDXGIDevice interface (adapted from DXSDK/include/dxgi.h)
-    virtual HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority) {return E_NOTIMPL; }
-
-    // IDXGIDevice1 interface (adapted from DXSDK/include/dxgi.h)
-    virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(UINT MaxLatency) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(UINT* pMaxLatency) {return E_NOTIMPL; }
-};
-
-#if !DXGL_FULL_EMULATION
-typedef ID3D11Device IDXGIDevice;
-typedef ID3D11Device IDXGIDevice1;
-#endif // !DXGL_FULL_EMULATION
-
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_ID3D11DEVICE_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_ID3D11DeviceContext.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_ID3D11DeviceContext.h
deleted file mode 100644
index 251477b2c1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_ID3D11DeviceContext.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the ID3D11DeviceContext interface
-//               matching the one in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_ID3D11DEVICECONTEXT_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_ID3D11DEVICECONTEXT_H
-#pragma once
-
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXGLDeviceChild.hpp"
-#endif //DXGL_FULL_EMULATION
-
-struct ID3DDevice;
-
-struct ID3D11DeviceContext
-#if DXGL_FULL_EMULATION
-    : ID3D11DeviceChild
-#else
-    : CCryDXGLDeviceChild
-#endif
-{
-    // ID3D11DeviceContext interface (adapted from DXSDK/include/D3D11.h)
-    virtual void STDMETHODCALLTYPE VSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE PSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE PSSetShader(ID3D11PixelShader* pPixelShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE VSSetShader(ID3D11VertexShader* pVertexShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation) = 0;
-    virtual void STDMETHODCALLTYPE Draw(UINT VertexCount, UINT StartVertexLocation) = 0;
-    virtual HRESULT STDMETHODCALLTYPE Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource) = 0;
-    virtual void STDMETHODCALLTYPE Unmap(ID3D11Resource* pResource, UINT Subresource) = 0;
-    virtual void STDMETHODCALLTYPE PSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE IASetInputLayout(ID3D11InputLayout* pInputLayout) = 0;
-    virtual void STDMETHODCALLTYPE IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation) = 0;
-    virtual void STDMETHODCALLTYPE DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation) = 0;
-    virtual void STDMETHODCALLTYPE GSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE GSSetShader(ID3D11GeometryShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology) = 0;
-    virtual void STDMETHODCALLTYPE VSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE VSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE Begin(ID3D11Asynchronous* pAsync) = 0;
-    virtual void STDMETHODCALLTYPE End(ID3D11Asynchronous* pAsync) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags) = 0;
-    virtual void STDMETHODCALLTYPE SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue) = 0;
-    virtual void STDMETHODCALLTYPE GSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE GSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView) = 0;
-    virtual void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts) = 0;
-    virtual void STDMETHODCALLTYPE OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask) = 0;
-    virtual void STDMETHODCALLTYPE OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef) = 0;
-    virtual void STDMETHODCALLTYPE SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE DrawAuto(void) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ) = 0;
-    virtual void STDMETHODCALLTYPE DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE RSSetState(ID3D11RasterizerState* pRasterizerState) = 0;
-    virtual void STDMETHODCALLTYPE RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports) = 0;
-    virtual void STDMETHODCALLTYPE RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects) = 0;
-    virtual void STDMETHODCALLTYPE CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox) = 0;
-    virtual void STDMETHODCALLTYPE CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource) = 0;
-    virtual void STDMETHODCALLTYPE UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch) = 0;
-    virtual void STDMETHODCALLTYPE CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView) = 0;
-    virtual void STDMETHODCALLTYPE ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil) = 0;
-    virtual void STDMETHODCALLTYPE GenerateMips(ID3D11ShaderResourceView* pShaderResourceView) = 0;
-    virtual void STDMETHODCALLTYPE SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD) = 0;
-    virtual FLOAT STDMETHODCALLTYPE GetResourceMinLOD(ID3D11Resource* pResource) = 0;
-    virtual void STDMETHODCALLTYPE ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format) = 0;
-    virtual void STDMETHODCALLTYPE ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState) = 0;
-    virtual void STDMETHODCALLTYPE HSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE HSSetShader(ID3D11HullShader* pHullShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE HSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE HSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE DSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE DSSetShader(ID3D11DomainShader* pDomainShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE DSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE CSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts) = 0;
-    virtual void STDMETHODCALLTYPE CSSetShader(ID3D11ComputeShader* pComputeShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE CSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE CSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE VSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE PSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout) = 0;
-    virtual void STDMETHODCALLTYPE IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset) = 0;
-    virtual void STDMETHODCALLTYPE GSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology) = 0;
-    virtual void STDMETHODCALLTYPE VSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE VSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue) = 0;
-    virtual void STDMETHODCALLTYPE GSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE GSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView) = 0;
-    virtual void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews) = 0;
-    virtual void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState * *ppBlendState, FLOAT BlendFactor[ 4 ], UINT * pSampleMask) = 0;
-    virtual void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef) = 0;
-    virtual void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets) = 0;
-    virtual void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState) = 0;
-    virtual void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports) = 0;
-    virtual void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects) = 0;
-    virtual void STDMETHODCALLTYPE HSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE HSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE HSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE DSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE DSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE CSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews) = 0;
-    virtual void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE CSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE CSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE ClearState(void) = 0;
-    virtual void STDMETHODCALLTYPE Flush(void) = 0;
-    virtual D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType(void) = 0;
-    virtual UINT STDMETHODCALLTYPE GetContextFlags(void) = 0;
-    virtual HRESULT STDMETHODCALLTYPE FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList) = 0;
-};
-
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_ID3D11DEVICECONTEXT_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_IDXGIFactory1.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_IDXGIFactory1.h
deleted file mode 100644
index ae9c2a2c32..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_IDXGIFactory1.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the IDXGIFactory1 interface
-//               matching the one in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_IDXGIFACTORY1_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_IDXGIFACTORY1_H
-#pragma once
-
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXGLGIObject.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-struct IDXGIFactory1
-#if DXGL_FULL_EMULATION
-    : IDXGIFactory
-#else
-    : CCryDXGLGIObject
-#endif
-{
-    // IDXGIFactory interface
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter) = 0;
-
-    // IDXGIFactory1 interface
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter) = 0;
-    virtual BOOL STDMETHODCALLTYPE IsCurrent() = 0;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_IDXGIFACTORY1_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_IDXGISwapChain.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_IDXGISwapChain.h
deleted file mode 100644
index 33b20d142d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_IDXGISwapChain.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the IDXGISwapChain interface
-//               matching the one in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_IDXGISWAPCHAIN_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_IDXGISWAPCHAIN_H
-#pragma once
-
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXGLGIObject.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-#if DXGL_FULL_EMULATION
-struct IDXGISwapChain
-    : IDXGIDeviceSubObject
-#else
-struct IDXGISwapChain
-    : CCryDXGLGIObject
-#endif
-{
-    // IDXGISwapChain interface
-    virtual HRESULT STDMETHODCALLTYPE Present(UINT SyncInterval, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetBuffer(UINT Buffer, REFIID riid, void** ppSurface) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetContainingOutput(IDXGIOutput** ppOutput) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount(UINT* pLastPresentCount) = 0;
-
-    // IDXGIDeviceSubObject interface
-    virtual HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) = 0;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_IDXGISWAPCHAIN_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_dxgi.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_dxgi.h
deleted file mode 100644
index 8354f733cb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_dxgi.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in DXGI h in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_DXGI_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_DXGI_H
-#pragma once
-
-
-#include "DXGL_dxgitype.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#define DXGI_MAX_SWAP_CHAIN_BUFFERS        (16)
-#define DXGI_PRESENT_TEST               0x00000001UL
-#define DXGI_PRESENT_DO_NOT_SEQUENCE    0x00000002UL
-#define DXGI_PRESENT_RESTART            0x00000004UL
-
-#define DXGI_USAGE_SHADER_INPUT             (1L << (0 + 4))
-#define DXGI_USAGE_RENDER_TARGET_OUTPUT     (1L << (1 + 4))
-#define DXGI_USAGE_BACK_BUFFER              (1L << (2 + 4))
-#define DXGI_USAGE_SHARED                   (1L << (3 + 4))
-#define DXGI_USAGE_READ_ONLY                (1L << (4 + 4))
-#define DXGI_USAGE_DISCARD_ON_PRESENT       (1L << (5 + 4))
-#define DXGI_USAGE_UNORDERED_ACCESS         (1L << (6 + 4))
-
-#define DXGI_ENUM_MODES_INTERLACED  (1UL)
-
-#define DXGI_ENUM_MODES_SCALING (2UL)
-
-#define DXGI_MWA_NO_WINDOW_CHANGES      (1 << 0)
-#define DXGI_MWA_NO_ALT_ENTER           (1 << 1)
-#define DXGI_MWA_NO_PRINT_SCREEN        (1 << 2)
-#define DXGI_MWA_VALID                  (0x7)
-
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef
-    enum DXGI_RESIDENCY
-{
-    DXGI_RESIDENCY_FULLY_RESIDENT   = 1,
-    DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY    = 2,
-    DXGI_RESIDENCY_EVICTED_TO_DISK  = 3
-}   DXGI_RESIDENCY;
-
-typedef
-    enum DXGI_SWAP_EFFECT
-{
-    DXGI_SWAP_EFFECT_DISCARD    = 0,
-    DXGI_SWAP_EFFECT_SEQUENTIAL = 1
-}   DXGI_SWAP_EFFECT;
-
-typedef
-    enum DXGI_SWAP_CHAIN_FLAG
-{
-    DXGI_SWAP_CHAIN_FLAG_NONPREROTATED  = 1,
-    DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH  = 2,
-    DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4
-}   DXGI_SWAP_CHAIN_FLAG;
-
-typedef
-    enum DXGI_ADAPTER_FLAG
-{
-    DXGI_ADAPTER_FLAG_NONE  = 0,
-    DXGI_ADAPTER_FLAG_REMOTE    = 1,
-    DXGI_ADAPTER_FLAG_FORCE_DWORD   = 0xffffffff
-}   DXGI_ADAPTER_FLAG;
-
-typedef UINT DXGI_USAGE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct DXGI_FRAME_STATISTICS
-{
-    UINT PresentCount;
-    UINT PresentRefreshCount;
-    UINT SyncRefreshCount;
-    LARGE_INTEGER SyncQPCTime;
-    LARGE_INTEGER SyncGPUTime;
-}   DXGI_FRAME_STATISTICS;
-
-typedef struct DXGI_MAPPED_RECT
-{
-    INT Pitch;
-    BYTE* pBits;
-}   DXGI_MAPPED_RECT;
-
-typedef struct DXGI_ADAPTER_DESC
-{
-    WCHAR Description[ 128 ];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-}   DXGI_ADAPTER_DESC;
-
-typedef struct DXGI_OUTPUT_DESC
-{
-    WCHAR DeviceName[ 32 ];
-    RECT DesktopCoordinates;
-    BOOL AttachedToDesktop;
-    DXGI_MODE_ROTATION Rotation;
-    HMONITOR Monitor;
-}   DXGI_OUTPUT_DESC;
-
-typedef struct DXGI_SHARED_RESOURCE
-{
-    HANDLE Handle;
-}   DXGI_SHARED_RESOURCE;
-
-typedef struct DXGI_SURFACE_DESC
-{
-    UINT Width;
-    UINT Height;
-    DXGI_FORMAT Format;
-    DXGI_SAMPLE_DESC SampleDesc;
-}   DXGI_SURFACE_DESC;
-
-typedef struct DXGI_SWAP_CHAIN_DESC
-{
-    DXGI_MODE_DESC BufferDesc;
-    DXGI_SAMPLE_DESC SampleDesc;
-    DXGI_USAGE BufferUsage;
-    UINT BufferCount;
-    HWND OutputWindow;
-    BOOL Windowed;
-    DXGI_SWAP_EFFECT SwapEffect;
-    UINT Flags;
-}   DXGI_SWAP_CHAIN_DESC;
-
-typedef struct DXGI_ADAPTER_DESC1
-{
-    WCHAR Description[ 128 ];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-    UINT Flags;
-}   DXGI_ADAPTER_DESC1;
-
-typedef struct DXGI_DISPLAY_COLOR_SPACE
-{
-    FLOAT PrimaryCoordinates[ 8 ][ 2 ];
-    FLOAT WhitePoints[ 16 ][ 2 ];
-}   DXGI_DISPLAY_COLOR_SPACE;
-
-
-typedef UINT DXGI_USAGE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-
-//struct IDXGIObject;            // Typedef as CCryDXGLGIObject
-struct IDXGIDeviceSubObject;
-struct IDXGIResource;
-struct IDXGIKeyedMutex;
-struct IDXGISurface;
-struct IDXGISurface1;
-//struct IDXGIAdapter;           // Typedef as CCryDXGLGIAdapter
-//struct IDXGIOutput;            // Typedef as CCryDXGLGIOutput
-//struct IDXGISwapChain;         // Typedef as CCryDXGLSwapChain
-//struct IDXGIFactory;           // Typedef as CCryDXGLGIFactory
-//struct IDXGIDevice;            // Typedef as CCryDXGLDevice
-//struct IDXGIFactory1;          // Typedef as CCryDXGLGIFactory
-//struct IDXGIAdapter1;          // Typedef as CCryDXGLGIAdapter
-//struct IDXGIDevice1;           // Typedef as CCryDXGLDevice
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Interfaces for full DX emulation
-////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-struct IDXGIObject
-    : IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID Name, UINT DataSize, const void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetParent(REFIID riid, void** ppParent) = 0;
-};
-
-struct IDXGIOutput
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(DXGI_OUTPUT_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice) = 0;
-    virtual HRESULT STDMETHODCALLTYPE WaitForVBlank() = 0;
-    virtual HRESULT STDMETHODCALLTYPE TakeOwnership(IUnknown* pDevice, BOOL Exclusive) = 0;
-    virtual void STDMETHODCALLTYPE ReleaseOwnership() = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetGammaControl(const DXGI_GAMMA_CONTROL* pArray) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetGammaControl(DXGI_GAMMA_CONTROL* pArray) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetDisplaySurface(IDXGISurface* pScanoutSurface) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData(IDXGISurface* pDestination) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats) = 0;
-};
-
-struct IDXGIAdapter
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE EnumOutputs(UINT Output, IDXGIOutput** ppOutput) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(DXGI_ADAPTER_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion) = 0;
-};
-
-struct IDXGISwapChain;
-
-struct IDXGIFactory
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter) = 0;
-};
-
-struct IDXGIDevice
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface) = 0;
-    virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority) = 0;
-};
-
-struct IDXGIDeviceSubObject
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) = 0;
-};
-
-struct IDXGIAdapter1
-    : IDXGIAdapter
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc1(DXGI_ADAPTER_DESC1* pDesc) = 0;
-};
-
-struct IDXGIDevice1
-    : IDXGIDevice
-{
-    virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(UINT MaxLatency) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(UINT* pMaxLatency) = 0;
-};
-
-#endif //DXGL_FULL_EMULATION
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_DXGI_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_dxgitype.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_dxgitype.h
deleted file mode 100644
index 26cf054d65..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/DXGL_dxgitype.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in dxgitype.h in the DirectX SDK
-
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_DXGITYPE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_DXGITYPE_H
-#pragma once
-
-
-#include <AzDXGIFormat.h>
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#define _FACDXGI    0x87a
-#define MAKE_DXGI_HRESULT(code) MAKE_HRESULT(1, _FACDXGI, code)
-#define MAKE_DXGI_STATUS(code)  MAKE_HRESULT(0, _FACDXGI, code)
-
-#if !defined(DXGI_STATUS_OCCLUDED) ||                     \
-    !defined(DXGI_STATUS_CLIPPED) ||                      \
-    !defined(DXGI_STATUS_NO_REDIRECTION) ||               \
-    !defined(DXGI_STATUS_NO_DESKTOP_ACCESS) ||            \
-    !defined(DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE) || \
-    !defined(DXGI_STATUS_MODE_CHANGED) ||                 \
-    !defined(DXGI_STATUS_MODE_CHANGE_IN_PROGRESS)
-#undef DXGI_STATUS_OCCLUDED
-#undef DXGI_STATUS_CLIPPED
-#undef DXGI_STATUS_NO_REDIRECTION
-#undef DXGI_STATUS_NO_DESKTOP_ACCESS
-#undef DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE
-#undef DXGI_STATUS_MODE_CHANGED
-#undef DXGI_STATUS_MODE_CHANGE_IN_PROGRESS
-#define DXGI_STATUS_OCCLUDED                    MAKE_DXGI_STATUS(1)
-#define DXGI_STATUS_CLIPPED                     MAKE_DXGI_STATUS(2)
-#define DXGI_STATUS_NO_REDIRECTION              MAKE_DXGI_STATUS(4)
-#define DXGI_STATUS_NO_DESKTOP_ACCESS           MAKE_DXGI_STATUS(5)
-#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6)
-#define DXGI_STATUS_MODE_CHANGED                MAKE_DXGI_STATUS(7)
-#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS     MAKE_DXGI_STATUS(8)
-#endif
-#if !defined(DXGI_ERROR_INVALID_CALL) ||                 \
-    !defined(DXGI_ERROR_NOT_FOUND) ||                    \
-    !defined(DXGI_ERROR_MORE_DATA) ||                    \
-    !defined(DXGI_ERROR_UNSUPPORTED) ||                  \
-    !defined(DXGI_ERROR_DEVICE_REMOVED) ||               \
-    !defined(DXGI_ERROR_DEVICE_HUNG) ||                  \
-    !defined(DXGI_ERROR_DEVICE_RESET) ||                 \
-    !defined(DXGI_ERROR_WAS_STILL_DRAWING) ||            \
-    !defined(DXGI_ERROR_FRAME_STATISTICS_DISJOINT) ||    \
-    !defined(DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE) || \
-    !defined(DXGI_ERROR_DRIVER_INTERNAL_ERROR) ||        \
-    !defined(DXGI_ERROR_NONEXCLUSIVE) ||                 \
-    !defined(DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) ||      \
-    !defined(DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED) ||   \
-    !defined(DXGI_ERROR_REMOTE_OUTOFMEMORY)
-#undef DXGI_ERROR_INVALID_CALL
-#undef DXGI_ERROR_NOT_FOUND
-#undef DXGI_ERROR_MORE_DATA
-#undef DXGI_ERROR_UNSUPPORTED
-#undef DXGI_ERROR_DEVICE_REMOVED
-#undef DXGI_ERROR_DEVICE_HUNG
-#undef DXGI_ERROR_DEVICE_RESET
-#undef DXGI_ERROR_WAS_STILL_DRAWING
-#undef DXGI_ERROR_FRAME_STATISTICS_DISJOINT
-#undef DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE
-#undef DXGI_ERROR_DRIVER_INTERNAL_ERROR
-#undef DXGI_ERROR_NONEXCLUSIVE
-#undef DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
-#undef DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED
-#undef DXGI_ERROR_REMOTE_OUTOFMEMORY
-#define DXGI_ERROR_INVALID_CALL                 MAKE_DXGI_HRESULT(1)
-#define DXGI_ERROR_NOT_FOUND                    MAKE_DXGI_HRESULT(2)
-#define DXGI_ERROR_MORE_DATA                    MAKE_DXGI_HRESULT(3)
-#define DXGI_ERROR_UNSUPPORTED                  MAKE_DXGI_HRESULT(4)
-#define DXGI_ERROR_DEVICE_REMOVED               MAKE_DXGI_HRESULT(5)
-#define DXGI_ERROR_DEVICE_HUNG                  MAKE_DXGI_HRESULT(6)
-#define DXGI_ERROR_DEVICE_RESET                 MAKE_DXGI_HRESULT(7)
-#define DXGI_ERROR_WAS_STILL_DRAWING            MAKE_DXGI_HRESULT(10)
-#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT    MAKE_DXGI_HRESULT(11)
-#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)
-#define DXGI_ERROR_DRIVER_INTERNAL_ERROR        MAKE_DXGI_HRESULT(32)
-#define DXGI_ERROR_NONEXCLUSIVE                 MAKE_DXGI_HRESULT(33)
-#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE      MAKE_DXGI_HRESULT(34)
-#define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED   MAKE_DXGI_HRESULT(35)
-#define DXGI_ERROR_REMOTE_OUTOFMEMORY           MAKE_DXGI_HRESULT(36)
-#endif
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct DXGI_RGB
-{
-    float Red;
-    float Green;
-    float Blue;
-} DXGI_RGB;
-
-typedef struct DXGI_GAMMA_CONTROL
-{
-    DXGI_RGB Scale;
-    DXGI_RGB Offset;
-    DXGI_RGB GammaCurve[ 1025 ];
-} DXGI_GAMMA_CONTROL;
-
-typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES
-{
-    BOOL ScaleAndOffsetSupported;
-    float MaxConvertedValue;
-    float MinConvertedValue;
-    UINT NumGammaControlPoints;
-    float ControlPointPositions[1025];
-} DXGI_GAMMA_CONTROL_CAPABILITIES;
-
-typedef struct DXGI_RATIONAL
-{
-    UINT Numerator;
-    UINT Denominator;
-} DXGI_RATIONAL;
-
-typedef enum DXGI_MODE_SCANLINE_ORDER
-{
-    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED        = 0,
-    DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE        = 1,
-    DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST  = 2,
-    DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST  = 3
-} DXGI_MODE_SCANLINE_ORDER;
-
-typedef enum DXGI_MODE_SCALING
-{
-    DXGI_MODE_SCALING_UNSPECIFIED   = 0,
-    DXGI_MODE_SCALING_CENTERED      = 1,
-    DXGI_MODE_SCALING_STRETCHED     = 2
-} DXGI_MODE_SCALING;
-
-typedef enum DXGI_MODE_ROTATION
-{
-    DXGI_MODE_ROTATION_UNSPECIFIED  = 0,
-    DXGI_MODE_ROTATION_IDENTITY     = 1,
-    DXGI_MODE_ROTATION_ROTATE90     = 2,
-    DXGI_MODE_ROTATION_ROTATE180    = 3,
-    DXGI_MODE_ROTATION_ROTATE270    = 4
-} DXGI_MODE_ROTATION;
-
-typedef struct DXGI_MODE_DESC
-{
-    UINT Width;
-    UINT Height;
-    DXGI_RATIONAL RefreshRate;
-    DXGI_FORMAT Format;
-    DXGI_MODE_SCANLINE_ORDER ScanlineOrdering;
-    DXGI_MODE_SCALING Scaling;
-} DXGI_MODE_DESC;
-
-typedef struct DXGI_SAMPLE_DESC
-{
-    UINT Count;
-    UINT Quality;
-} DXGI_SAMPLE_DESC;
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_DEFINITIONS_DXGL_DXGITYPE_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/ICryDXGLUnknown.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/ICryDXGLUnknown.hpp
deleted file mode 100644
index c5ae2318f1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Definitions/ICryDXGLUnknown.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains the cross platform replacement for COM IUnknown
-//               interface on non-windows platforms
-
-
-#ifndef __CRYDXGLUNKNOWN__
-#define __CRYDXGLUNKNOWN__
-
-#if !defined(WIN32)
-
-#include "CryDXGLGuid.hpp"
-
-struct IUnknown
-{
-public:
-#if !DXGL_FULL_EMULATION
-    virtual ~IUnknown(){};
-#endif //!DXGL_FULL_EMULATION
-
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) = 0;
-    virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;
-    virtual ULONG STDMETHODCALLTYPE Release(void) = 0;
-};
-
-#endif //!defined(WIN32)
-
-#endif //__CRYDXGLUNKNOWN__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/AppleGPUInfoUtils.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/AppleGPUInfoUtils.h
deleted file mode 100644
index 224c1ec69b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/AppleGPUInfoUtils.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_IMPLEMENTATION_APPLEGPUINFOUTILS_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_IMPLEMENTATION_APPLEGPUINFOUTILS_H
-#pragma once
-
-
-// Return -1 on failure and availabe VRAM otherwise
-long GetVRAMForDisplay(const int dspNum);
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DXGL_IMPLEMENTATION_APPLEGPUINFOUTILS_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/AppleGPUInfoUtils.mm b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/AppleGPUInfoUtils.mm
deleted file mode 100644
index e7c2b5a2b1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/AppleGPUInfoUtils.mm
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "AppleGPUInfoUtils.h"
-
-
-#include <Cocoa/Cocoa.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreGraphics/CoreGraphics.h>
-
-// this file needs to be sparate since CryEngine headers conflict with the
-// Cocoa definitions
-
-// this will be removed in the next version of OS X, but for now
-// we can still use it.
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-long GetVRAMForDisplay(const int dspNum)
-{
-    CGError                    err = CGDisplayNoErr;
-    io_service_t              *dspPorts = NULL;
-    CGDirectDisplayID    *displays = NULL;
-    CGDisplayCount        dspCount = 0;
-    CFTypeRef                 typeCode;
-    uint32_t vram = 0;
-    
-    // How many active displays do we have?
-    err = CGGetActiveDisplayList(0, NULL, &dspCount);
-    
-    if (err != kCGErrorSuccess)
-        return -1;
-    
-    // If the display number is higher than the available display count, return
-    if (dspCount < dspNum)
-        return -1;
-    
-    // Allocate enough memory to hold all the display IDs we have
-    displays = (CGDirectDisplayID*)calloc((size_t)dspCount, sizeof(CGDirectDisplayID));
-   
-    // Allocate memory for our service ports
-    dspPorts = (io_service_t*)calloc((size_t)dspCount, sizeof(io_service_t));
-    
-    // Get the list of active displays
-    err = CGGetActiveDisplayList(dspCount,
-                                 displays,
-                                 &dspCount);
-    
-    if (err == kCGErrorSuccess)
-    {
-        // Get the service port for the display
-        dspPorts[dspNum] = CGDisplayIOServicePort(displays[dspNum]);
-        // Ask IOKit for the VRAM size property
-        typeCode = IORegistryEntryCreateCFProperty(dspPorts[dspNum],
-                                                   CFSTR(kIOFBMemorySizeKey),
-                                                   kCFAllocatorDefault,
-                                                   kNilOptions);
-        
-        // Ensure we have valid data from IOKit
-        if(typeCode && CFGetTypeID(typeCode) == CFNumberGetTypeID())
-        {
-            // If so, convert the CFNumber into a plain unsigned long
-            CFNumberGetValue((CFNumberRef)typeCode, kCFNumberSInt32Type, &vram);
-            if(typeCode)
-                CFRelease(typeCode);
-        }
-    }
-    
-    free(displays);
-    free(dspPorts);
-    // Return the total number of displays we found
-    return (long)vram;
-}
-#pragma clang diagnostic pop
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLADLoader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLADLoader.cpp
deleted file mode 100644
index 45efb6f9f3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLADLoader.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-
-// For definitions
-#include <CryDXGL.hpp>
-
-#define NO_INCLUDE_GL_FEATURES
-#include <Implementation/GLCommon.hpp>
-#undef NO_INCLUDE_GL_FEATURES
-
-// Need to explicitly include glad with the IMPLEMENTATION defines
-#if defined(DXGL_USE_LOADER_GLAD)
-#   if DXGLES && !defined(DXGL_ES_SUBSET)
-#       define GLAD_GLES2_IMPLEMENTATION
-#       include <glad/gles2.h>
-#       undef GLAD_GLES2_IMPLEMENTATION
-#   else
-#       define GLAD_GL_IMPLEMENTATION
-#       include <glad/gl.h>
-#       undef GLAD_GL_IMPLEMENTATION
-#   endif
-#   if defined(DXGL_USE_WGL)
-#       define GLAD_WGL_IMPLEMENTATION
-#       include <glad/wgl.h>
-#       undef GLAD_WGL_IMPLEMENTATION
-#   elif defined(DXGL_USE_EGL)
-#       define GLAD_EGL_IMPLEMENTATION
-#       include <glad/egl.h>
-#       undef GLAD_EGL_IMPLEMENTATION
-#   elif defined(DXGL_USE_GLX)
-#       define GLAD_GLX_IMPLEMENTATION
-#       include <glad/glx.h>
-#       undef GLAD_GLX_IMPLEMENTATION
-#   endif
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.cpp
deleted file mode 100644
index cb26d81c89..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-#include <Implementation/GLBlitFramebufferHelper.hpp>
-#include <Implementation/GLBlitShaders.hpp>
-#include <Implementation/GLContext.hpp>
-#if DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-#include <hlslcc.hpp>
-#endif //DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-#include <hlslcc_bin.hpp>
-
-namespace NCryOpenGL
-{
-    GLBlitFramebufferHelper::GLBlitFramebufferHelper(CContext& context)
-        : m_context(context)
-        , m_initialized(false)
-        , m_UVMatrixCache(ZERO)
-    {
-        ZeroMemory(&m_samplerState, sizeof(m_samplerState));
-    }
-
-    GLBlitFramebufferHelper::~GLBlitFramebufferHelper()
-    {
-        Reset();
-    }
-
-    bool GLBlitFramebufferHelper::Initialize()
-    {
-        if (m_initialized)
-        {
-            return true;
-        }
-
-        m_vertexShader.m_eType = eST_Vertex;
-        m_fragmentShader.m_eType = eST_Fragment;
-
-        size_t vsLength = strlen(s_blitVertexShader) + 1;
-        size_t fsLength = strlen(s_blitFragmentShader) + 1;
-        size_t vsDataSize = GLSL_RESOURCE_SIZE + vsLength;
-        size_t fsDataSize = GLSL_SAMPLER_SIZE + fsLength;
-
-        // In order to reuse the code to compile the vertex/fragment shaders and initialize the resources
-        // we add some DXBC metadata to the shaders data.
-        AZStd::vector<uint8> buffer(AZStd::max(vsDataSize, fsDataSize));
-        SDXBCOutputBuffer vertStream(buffer.data(), buffer.data() + buffer.size());
-        const char* uniformBufferPos = strstr(s_blitVertexShader, s_uniformBufferName);
-        if (!uniformBufferPos)
-        {
-            Reset();
-            return false;
-        }
-
-        uint32 uniformBufferOffset = static_cast<uint32>(uniformBufferPos - s_blitVertexShader);
-        DXBCWriteUint32(vertStream, DXBC::EncodeResourceIndex(0));
-        DXBCWriteUint32(vertStream, DXBC::EncodeEmbeddedName(uniformBufferOffset, strlen(s_uniformBufferName)));
-        vertStream.Write(s_blitVertexShader, vsLength);
-
-        m_vertexShader.m_akVersions[eSV_Normal].m_kReflection.m_uNumUniformBuffers = 1;
-        m_vertexShader.m_akVersions[eSV_Normal].m_kReflection.m_uGLSLSourceOffset = GLSL_RESOURCE_SIZE;
-        m_vertexShader.m_akVersions[eSV_Normal].m_kSource.SetData(reinterpret_cast<const char*>(buffer.data()), vsDataSize);
-
-        SDXBCOutputBuffer fragStream(buffer.data(), buffer.data() + buffer.size());
-        const char* textureName = strstr(s_blitFragmentShader, s_tex0SamplerName);
-        if (!textureName)
-        {
-            Reset();
-            return false;
-        }
-
-        uint32 textureOffset = static_cast<uint32>(textureName - s_blitFragmentShader);
-        DXBCWriteUint32(fragStream, DXBC::EncodeTextureData(0, 0, 0, true, false));
-        DXBCWriteUint32(fragStream, DXBC::EncodeEmbeddedName(textureOffset, strlen(s_tex0SamplerName)));
-        DXBCWriteUint32(fragStream, 0);
-        fragStream.Write(s_blitFragmentShader, fsLength);
-
-        m_fragmentShader.m_akVersions[eSV_Normal].m_kReflection.m_uNumSamplers = 1;
-        m_fragmentShader.m_akVersions[eSV_Normal].m_kReflection.m_uGLSLSourceOffset = GLSL_SAMPLER_SIZE;
-        m_fragmentShader.m_akVersions[eSV_Normal].m_kSource.SetData(reinterpret_cast<const char*>(buffer.data()), buffer.size());
-
-        SShaderReflectionParameter paramReflection;
-        paramReflection.m_kDesc.SemanticName = s_vertexInput0;
-        paramReflection.m_kDesc.SemanticIndex = 0;
-        paramReflection.m_kDesc.Register = 0;
-        paramReflection.m_kDesc.ComponentType = D3D_REGISTER_COMPONENT_FLOAT32;
-        m_vertexShader.m_akVersions[eSV_Normal].m_kReflection.m_kInputs.push_back(paramReflection);
-
-        // Pos.x, Pos.y, U, V
-        const float QUAD[] =
-        {
-            -1.0f, 1.0f, 0.0f, 1.0f,
-            -1.0f, -1.0f, 0.0f, 0.0f,
-            1.0f, 1.0f, 1.0f, 1.0f,
-            1.0f, -1.0f, 1.0f, 0.0f,
-        };
-
-        D3D11_BUFFER_DESC desc;
-        ZeroMemory(&desc, sizeof(desc));
-        desc.ByteWidth = sizeof(QUAD);
-        desc.Usage = D3D11_USAGE_IMMUTABLE;
-        desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-        desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-
-        D3D11_SUBRESOURCE_DATA data;
-        ZeroMemory(&data, sizeof(data));
-        data.pSysMem = &QUAD;
-        m_vertexBuffer = CreateBuffer(desc, &data, &m_context);
-        if (!m_vertexBuffer)
-        {
-            Reset();
-            return false;
-        }
-
-        ZeroMemory(&desc, sizeof(desc));
-        m_UVMatrixCache.SetIdentity();
-        desc.ByteWidth = sizeof(m_UVMatrixCache);
-        desc.Usage = D3D11_USAGE_DYNAMIC;
-        desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-        desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-        ZeroMemory(&data, sizeof(data));
-        data.pSysMem = m_UVMatrixCache.GetData();
-        m_constantBuffer = CreateBuffer(desc, &data, &m_context);
-
-        if (!m_constantBuffer)
-        {
-            Reset();
-            return false;
-        }
-
-        D3D11_INPUT_ELEMENT_DESC inputDesc;
-        inputDesc.SemanticName = s_vertexInput0;
-        inputDesc.SemanticIndex = 0;
-        inputDesc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-        inputDesc.InputSlot = 0;
-        inputDesc.AlignedByteOffset = 0;
-        inputDesc.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-        inputDesc.InstanceDataStepRate = 0;
-        m_layout = CreateInputLayout(&inputDesc, 1, m_vertexShader.m_akVersions[eSV_Normal].m_kReflection, m_context.m_pDevice);
-        if (!m_layout)
-        {
-            Reset();
-            return false;
-        }
-
-        D3D11_SAMPLER_DESC samplerDesc;
-        ZeroMemory(&samplerDesc, sizeof(samplerDesc));
-        samplerDesc.Filter   = D3D11_FILTER_MIN_MAG_MIP_POINT;
-        samplerDesc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
-        samplerDesc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
-        samplerDesc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
-        if (!InitializeSamplerState(samplerDesc, m_samplerState, &m_context))
-        {
-            Reset();
-            return false;
-        }
-
-        m_minFilterCache = GL_NEAREST;
-        m_magFilterCache = GL_NEAREST;
-
-        m_depthStencilState.m_bDepthTestingEnabled = false;
-        m_depthStencilState.m_bStencilTestingEnabled = false;
-        m_depthStencilState.m_bDepthWriteMask = false;
-
-        m_rasterState.m_bCullingEnabled = false;
-        m_rasterState.m_bDepthClipEnabled = true;
-        m_rasterState.m_bPolygonOffsetEnabled = false;
-        m_rasterState.m_eFrontFaceMode = GL_CCW;
-#if !DXGLES
-        m_rasterState.m_ePolygonMode = GL_FILL;
-        m_rasterState.m_bMultisampleEnabled = false;
-        m_rasterState.m_bLineSmoothEnabled = false;
-#endif
-
-        m_blendState.m_bAlphaToCoverageEnable = false;
-        m_blendState.m_bIndependentBlendEnable = false;
-        for (int i = 0; i < DXGL_ARRAY_SIZE(m_blendState.m_kTargets); ++i)
-        {
-            STargetBlendState& targetBlendState = m_blendState.m_kTargets[i];
-            targetBlendState.m_bEnable = false;
-            targetBlendState.m_bSeparateAlpha = false;
-            for (int j = 0; j < DXGL_ARRAY_SIZE(targetBlendState.m_kWriteMask.m_abRGBA); ++j)
-            {
-                targetBlendState.m_kWriteMask.m_abRGBA[j] = true;
-            }
-
-        }
-        m_initialized = true;
-        return m_initialized;
-    }
-
-    bool GLBlitFramebufferHelper::BlitTexture(SShaderTextureView* srcTexture,
-                                                SFrameBufferObject& dstFBO,
-                                                GLenum dstColorBuffer,
-                                                GLint srcXMin, GLint srcYMin, GLint srcXMax, GLint srcYMax,
-                                                GLint dstXMin, GLint dstYMin, GLint dstXMax, GLint dstYMax,
-                                                GLenum minFilter, GLenum magFilter)
-    {
-        PROFILE_LABEL_SCOPE("BlitTexture");
-        if (!Initialize())
-        {
-            AZ_Assert(false, "Failed to initialize GLBlitFrameBufferHelper");
-            return false;
-        }
-
-        float textWidth = static_cast<float>(srcTexture->m_pTexture->m_iWidth);
-        float textHeight = static_cast<float>(srcTexture->m_pTexture->m_iHeight);
-        Vec3 scale(1.0f);
-        scale.x = (srcXMax - srcXMin) / textWidth;
-        scale.y = (srcYMax - srcYMin) / textHeight;
-
-        Vec3 translate(0.f);
-        translate.x = srcXMin / textWidth;
-        translate.y = srcYMin / textHeight;
-
-        Matrix34 UVMatrix = Matrix34::CreateScale(scale);
-        UVMatrix.SetTranslation(translate);
-        // Check if we need to update the constant buffer
-        if (!Matrix34::IsEquivalent(m_UVMatrixCache, UVMatrix))
-        {
-            D3D11_MAPPED_SUBRESOURCE mappedResource;
-            // Map buffer and discard previous content
-            if (!(*m_constantBuffer->m_pfMapSubresource)(m_constantBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource, &m_context))
-            {
-                AZ_Assert(false, "Failed to map constant buffer");
-                return false;
-            }
-
-            memcpy(mappedResource.pData, UVMatrix.GetData(), sizeof(UVMatrix));
-            (*m_constantBuffer->m_pfUnmapSubresource)(m_constantBuffer, 0, &m_context);
-            m_UVMatrixCache = UVMatrix;
-        }
-
-        // Check if we need to update the sampler
-        if (m_minFilterCache != minFilter)
-        {
-            glSamplerParameteri(m_samplerState.m_uSamplerObjectNoMip, GL_TEXTURE_MIN_FILTER, minFilter);
-            glSamplerParameteri(m_samplerState.m_uSamplerObjectMip, GL_TEXTURE_MIN_FILTER, minFilter);
-        }
-
-        if (m_magFilterCache != magFilter)
-        {
-            glSamplerParameteri(m_samplerState.m_uSamplerObjectNoMip, GL_TEXTURE_MAG_FILTER, magFilter);
-            glSamplerParameteri(m_samplerState.m_uSamplerObjectMip, GL_TEXTURE_MIN_FILTER, minFilter);
-        }
-
-        D3D11_VIEWPORT viewport;
-        viewport.TopLeftX = static_cast<FLOAT>(dstXMin);
-        viewport.TopLeftY = static_cast<FLOAT>(dstYMin);
-        viewport.Width = static_cast<FLOAT>(dstXMax - dstXMin);
-        viewport.Height = static_cast<FLOAT>(dstYMax - dstYMin);
-        viewport.MinDepth = 0.f;
-        viewport.MaxDepth = 1.f;
-
-        // Set context states
-        m_context.SetViewports(1, &viewport);
-        m_context.SetDepthStencilState(m_depthStencilState, 0);
-        m_context.SetRasterizerState(m_rasterState);
-        m_context.SetBlendState(m_blendState);
-        m_context.SetVertexBuffer(0, m_vertexBuffer, sizeof(float) * 4, 0);
-        m_context.SetInputLayout(m_layout);
-        m_context.SetShader(&m_vertexShader, eST_Vertex);
-        m_context.SetShader(&m_fragmentShader, eST_Fragment);
-        m_context.SetSampler(&m_samplerState, eST_Fragment, 0);
-        m_context.SetShaderTexture(srcTexture, eST_Fragment, 0);
-        m_context.SetConstantBuffer(m_constantBuffer, SBufferRange(0, sizeof(UVMatrix)), eST_Vertex, 0);
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        m_context.SetVertexOffset(0);
-#endif 
-
-        // Flush context states
-        m_context.FlushInputAssemblerState();
-        m_context.FlushPipelineState();
-        m_context.FlushTextureUnits();
-        m_context.FlushUniformBufferUnits();
-
-        // We manually bind the draw framebuffer and enable the correct draw buffer
-        m_context.BindDrawFrameBuffer(dstFBO.m_kName);
-        SFrameBufferObject::TColorAttachmentMask kDstDrawMask(false);
-        if (GL_COLOR_ATTACHMENT0 <= dstColorBuffer && (dstColorBuffer - GL_COLOR_ATTACHMENT0) < SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS)
-        {
-            kDstDrawMask.Set(dstColorBuffer - GL_COLOR_ATTACHMENT0, true);
-        }
-
-        if (CACHE_VAR(dstFBO.m_kDrawMaskCache, kDstDrawMask))
-        {
-            glDrawBuffers(1, &dstColorBuffer);
-        }
-
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-        return true;
-    }
-
-    void GLBlitFramebufferHelper::Reset()
-    {
-        m_vertexBuffer = nullptr;
-        m_constantBuffer = nullptr;
-        m_layout = nullptr;
-        ResetSamplerState(m_samplerState);
-        m_initialized = false;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.hpp
deleted file mode 100644
index 6c64ebc446..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <Implementation/GLCommon.hpp>
-#include <Implementation/GLState.hpp>
-#include <Implementation/GLResource.hpp>
-#include <Implementation/GLShader.hpp>
-
-namespace NCryOpenGL
-{
-    class CContext;
-
-    // Helper class to blit a texture into a framebuffer using a shader.
-    // This should only be used if glBlitFramebuffer is not an option.
-    class GLBlitFramebufferHelper
-    {
-    public:
-        explicit GLBlitFramebufferHelper(CContext& context);
-        ~GLBlitFramebufferHelper();
-
-        bool BlitTexture(SShaderTextureView* srcTexture,
-                        SFrameBufferObject& dstFBO,
-                        GLenum dstColorBuffer,
-                        GLint srcXMin, GLint srcYMin, GLint srcXMax, GLint srcYMax,
-                        GLint dstXMin, GLint dstYMin, GLint dstXMax, GLint dstYMax,
-                        GLenum minFilter, GLenum magFilter);
-
-    private:
-        bool Initialize();
-        void Reset();
-
-        // Shader source code definitions
-        static const char* s_uniformBufferName;
-        static const char* s_tex0SamplerName;
-        static const char* s_vertexInput0;
-        static const char* s_blitVertexShader;
-        static const char* s_blitFragmentShader;
-
-        bool m_initialized;
-        CContext& m_context;
-        SShader m_vertexShader;
-        SShader m_fragmentShader;
-        SBufferPtr m_vertexBuffer;
-        SBufferPtr m_constantBuffer;
-        SInputLayoutPtr m_layout;
-        SSamplerState m_samplerState;
-        SDepthStencilState m_depthStencilState;
-        SRasterizerState m_rasterState;
-        SBlendState m_blendState;
-
-        // Cache variables
-        GLenum m_minFilterCache;
-        GLenum m_magFilterCache;
-        Matrix34 m_UVMatrixCache;
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitShaders.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitShaders.hpp
deleted file mode 100644
index a144e57c81..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitShaders.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-namespace NCryOpenGL
-{
-    const char* GLBlitFramebufferHelper::s_uniformBufferName = "vcPER_BATCH";
-    const char* GLBlitFramebufferHelper::s_tex0SamplerName   = "text0";
-    const char* GLBlitFramebufferHelper::s_vertexInput0      = "Input0";
-    
-    const char* GLBlitFramebufferHelper::s_blitVertexShader =
-                                                            "precision highp float;"
-                                                            "layout(std140) uniform;"
-                                                            "layout(location = 0) in highp vec4 Input0;"
-                                                            "layout(location = 0) out highp vec4 VtxOutput0;"
-                                                            "uniform vcPER_BATCH"
-                                                            "{"
-                                                            "   mat4x3 UVMatrix;"
-                                                            "};"
-                                                            "void main()"
-                                                            "{"
-                                                            "   gl_Position = vec4(Input0.xy, 0, 1);"
-                                                            "   VtxOutput0 = vec3(Input0.zw, 1.0) * UVMatrix;"
-                                                            "}";
-
-    const char* GLBlitFramebufferHelper::s_blitFragmentShader = 
-                                                                "precision highp float;"
-                                                                "layout(location = 0) in highp vec4 VtxOutput0;"
-                                                                "layout(location = 0) out vec4 Output0;"
-                                                                "uniform sampler2D text0;"
-                                                                "void main()"
-                                                                "{"
-                                                                "   Output0 = texture(text0, VtxOutput0.xy);"
-                                                                "}";
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLCommon.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLCommon.hpp
deleted file mode 100644
index 87626def90..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLCommon.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the types and functions that implement the
-//               OpenGL rendering functionality of DXGL
-
-
-#ifndef __GLCOMMON__
-#define __GLCOMMON__
-
-#include "GLPlatform.hpp"
-
-#define DXGLES DXGLES_REQUIRED_VERSION > 0
-
-//This is also defined in CryDXGL.hpp
-#if DXGLES && !defined(OPENGL_ES)
-    #define OPENGL_ES
-#endif //DXGLES && !defined(OPENGL_ES)
-
-#ifdef WIN32
-#include <WinGDI.h>
-#endif //WIN32
-
-#define DXGL_NSIGHT_VERSION_3_0      30
-#define DXGL_NSIGHT_VERSION_3_1      31
-#define DXGL_NSIGHT_VERSION_3_2      32
-#define DXGL_NSIGHT_VERSION_4_0      40
-#define DXGL_NSIGHT_VERSION_4_1      41
-#define DXGL_NSIGHT_VERSION_4_5      45
-
-#define DXGL_SUPPORT_NSIGHT_VERSION  0
-#define DXGL_SUPPORT_APITRACE        0
-#define DXGL_SUPPORT_VOGL            0
-#define DXGL_GLSL_FROM_HLSLCROSSCOMPILER 1
-// Uncomment to enable temporary fix for AMD drivers with a fixed number of texture units
-// #define DXGL_MAX_TEXTURE_UNITS 32
-
-#define DXGL_SUPPORT_NSIGHT(_Version) (DXGL_SUPPORT_NSIGHT_VERSION == DXGL_NSIGHT_VERSION_ ## _Version)
-#define DXGL_SUPPORT_NSIGHT_SINCE(_Version) (DXGL_SUPPORT_NSIGHT_VERSION && DXGL_SUPPORT_NSIGHT_VERSION <= DXGL_NSIGHT_VERSION_ ## _Version)
-
-#define DXGL_TRACE_CALLS 0
-#define DXGL_TRACE_CALLS_FLUSH 0
-#define DXGL_CHECK_ERRORS 0
-
-#ifndef NO_INCLUDE_GL_FEATURES
-#include "GLFeatures.hpp"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(GLCommon_hpp)
-#endif
-
-namespace NCryOpenGL
-{
-#if defined(DXGL_USE_EGL)
-    struct SDisplayConnection;
-    typedef _smart_ptr<SDisplayConnection> TWindowContext;
-    typedef EGLContext TRenderingContext;
-#elif defined(WIN32)
-    typedef HDC TWindowContext;
-    typedef HGLRC TRenderingContext;
-#else
-#error "Platform specific context not defined"
-#endif
-}
-
-#endif // NO_INCLUDE_GL_FEATURES
-
-#endif //__GLCOMMON__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLContext.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLContext.cpp
deleted file mode 100644
index d23935fe18..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLContext.cpp
+++ /dev/null
@@ -1,4192 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the type CContext.
-
-
-#include "RenderDll_precompiled.h"
-#include "GLContext.hpp"
-#include "GLDevice.hpp"
-#include "GLShader.hpp"
-#include "GLView.hpp"
-#include "GLExtensions.hpp"
-
-#if defined(ANDROID)
-#include <AzCore/Android/Utils.h>
-#endif
-
-#define DXGL_VALIDATE_PROGRAMS_ON_DRAW 0
-
-namespace NCryOpenGL
-{
-    ////////////////////////////////////////////////////////////////////////////
-    // Global configuration variables
-    ////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-    int SGlobalConfig::iStreamingConstantBuffersMode = 0;
-    int SGlobalConfig::iStreamingConstantBuffersPersistentMap = 0;
-    int SGlobalConfig::iStreamingConstantBuffersGranularity = 0;
-    int SGlobalConfig::iStreamingConstantBuffersGrowth = 0;
-    int SGlobalConfig::iStreamingConstantBuffersMaxUnits = 0;
-#endif
-    int SGlobalConfig::iMinFramePoolSize = 0;
-    int SGlobalConfig::iMaxFramePoolSize = 0;
-    int SGlobalConfig::iBufferUploadMode = 0;
-#if DXGL_ENABLE_SHADER_TRACING
-    int SGlobalConfig::iShaderTracingMode = 0;
-    int SGlobalConfig::iShaderTracingHash = 0;
-    int SGlobalConfig::iVertexTracingID = 0;
-    int SGlobalConfig::iPixelTracingX = 0;
-    int SGlobalConfig::iPixelTracingY = 0;
-#endif
-
-
-    void SGlobalConfig::RegisterVariables()
-    {
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        RegisterConfigVariable("dxgl_streaming_constant_buffers_mode", &iStreamingConstantBuffersMode, 1);
-        RegisterConfigVariable("dxgl_streaming_constant_buffer_persistent_map", &iStreamingConstantBuffersPersistentMap, 1);
-        RegisterConfigVariable("dxgl_streaming_constant_buffers_granularity", &iStreamingConstantBuffersGranularity, 1024);
-        RegisterConfigVariable("dxgl_streaming_constant_buffers_growth", &iStreamingConstantBuffersGrowth, 2);
-        RegisterConfigVariable("dxgl_streaming_constant_buffers_max_units", &iStreamingConstantBuffersMaxUnits, 16 * 1024);
-#endif
-        RegisterConfigVariable("dxgl_min_frame_pool_size", &iMinFramePoolSize, 16);
-        RegisterConfigVariable("dxgl_max_frame_pool_size", &iMaxFramePoolSize, 1024);
-        //  we don't know yet what GPU we are running
-        RegisterConfigVariable("dxgl_buffer_upload_mode", &iBufferUploadMode, 1);
-#if DXGL_ENABLE_SHADER_TRACING
-        RegisterConfigVariable("dxgl_shader_tracing_mode", &iShaderTracingMode, 0);
-        RegisterConfigVariable("dxgl_shader_tracing_hash", &iShaderTracingHash, 0);
-        RegisterConfigVariable("dxgl_vertex_tracing_id", &iVertexTracingID, 0);
-        RegisterConfigVariable("dxgl_pixel_tracing_x", &iPixelTracingX, 0);
-        RegisterConfigVariable("dxgl_pixel_tracing_y", &iPixelTracingY, 0);
-#endif //DXGL_ENABLE_SHADER_TRACING
-    }
-    void SGlobalConfig::SetIHVDefaults()
-    {
-        if (gRenDev->GetFeatures() & (RFT_HW_QUALCOMM | RFT_HW_ARM_MALI))
-        {
-            iBufferUploadMode = 0;
-        }
-        else
-        {
-            iBufferUploadMode = 1;
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // State management helper functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    inline void SetEnabledState(GLenum eState, bool bEnabled)
-    {
-        if (bEnabled)
-        {
-            glEnable(eState);
-        }
-        else
-        {
-            glDisable(eState);
-        }
-    }
-
-    inline void SetEnabledStatei(GLenum eState, GLuint uIndex, bool bEnabled)
-    {
-        if (bEnabled)
-        {
-            glEnablei(eState, uIndex);
-        }
-        else
-        {
-            glDisablei(eState, uIndex);
-        }
-    }
-
-    inline void GetStateVar(GLenum eTarget, GLint* pData)                     { glGetIntegerv (eTarget, pData); }
-    inline void GetStateVar(GLenum eTarget, GLenum* pData)                    { glGetIntegerv (eTarget, reinterpret_cast<GLint*>(pData)); }
-    inline void GetStateVar(GLenum eTarget, GLboolean* pData)                 { glGetBooleanv (eTarget, pData); }
-    inline void GetStateVar(GLenum eTarget, GLfloat* pData)                   { glGetFloatv   (eTarget, pData); }
-
-    inline void GetStateVari(GLenum eTarget, uint32 uIndex, GLint* pData)     { glGetIntegeri_v (eTarget, uIndex, pData); }
-    inline void GetStateVari(GLenum eTarget, uint32 uIndex, GLenum* pData)    { glGetIntegeri_v (eTarget, uIndex, reinterpret_cast<GLint*>(pData)); }
-#if DXGL_SUPPORT_INDEXED_BOOL_STATE
-    inline void GetStateVari(GLenum eTarget, uint32 uIndex, GLboolean* pData) { glGetBooleani_v (eTarget, uIndex, pData); }
-#endif //DXGL_SUPPORT_INDEXED_BOOL_STATE
-#if DXGL_SUPPORT_INDEXED_FLOAT_STATE
-    inline void GetStateVari(GLenum eTarget, uint32 uIndex, GLfloat* pData)   { glGetFloati_v   (eTarget, uIndex, pData); }
-    inline void GetStateVari(GLenum eTarget, uint32 uIndex, GLdouble* pData)  { glGetDoublei_v  (eTarget, uIndex, pData); }
-#endif //DXGL_SUPPORT_INDEXED_FLOAT_STATE
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Cache of heavy weight objects indexed by configuration
-    ////////////////////////////////////////////////////////////////////////////
-
-    struct SFrameBufferCache
-    {
-        struct SHashCompare
-        {
-            size_t operator()(const SFrameBufferConfiguration& kConfig) const
-            {
-                return (size_t)NCryOpenGL::GetCRC32(kConfig.m_akAttachments, sizeof(kConfig.m_akAttachments));
-            }
-
-            bool operator()(const SFrameBufferConfiguration& kLeft, const SFrameBufferConfiguration& kRight) const
-            {
-                return memcmp(kLeft.m_akAttachments, kRight.m_akAttachments, sizeof(kLeft.m_akAttachments)) == 0;
-            }
-        };
-
-        typedef AZStd::unordered_map<SFrameBufferConfiguration, SFrameBufferPtr, SHashCompare, SHashCompare> TMap;
-
-        TMap m_kMap;
-    };
-
-    struct SPipelineCache
-    {
-        struct SHashCompare
-        {
-            size_t operator()(const SPipelineConfiguration& kConfig) const
-            {
-                return (size_t)
-                       NCryOpenGL::GetCRC32(reinterpret_cast<const char*>(&kConfig.m_apShaders), sizeof(kConfig.m_apShaders))
-#if DXGL_ENABLE_SHADER_TRACING
-                       ^ NCryOpenGL::GetCRC32(reinterpret_cast<const char*>(&kConfig.m_aeShaderVersions), sizeof(kConfig.m_aeShaderVersions))
-#endif //DXGL_ENABLE_SHADER_TRACING
-#if !DXGL_SUPPORT_DEPTH_CLAMP
-                       ^ ((uint32)kConfig.m_bEmulateDepthClamp)
-#endif //!DXGL_SUPPORT_DEPTH_CLAMP
-                       ^ ((uint32)kConfig.m_eMode) << 2;
-            }
-
-            bool operator()(const SPipelineConfiguration& kLeft, const SPipelineConfiguration& kRight) const
-            {
-                int iCmp(memcmp(kLeft.m_apShaders, kRight.m_apShaders, sizeof(kLeft.m_apShaders)));
-                if (iCmp != 0)
-                {
-                    return false;
-                }
-
-#if DXGL_ENABLE_SHADER_TRACING
-                iCmp = memcmp(kLeft.m_aeShaderVersions, kRight.m_aeShaderVersions, sizeof(kLeft.m_aeShaderVersions));
-                if (iCmp != 0)
-                {
-                    return false;
-                }
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-                iCmp = (int)kRight.m_eMode - (int)kLeft.m_eMode;
-                if (iCmp != 0)
-                {
-                    return false;
-                }
-
-#if !DXGL_SUPPORT_DEPTH_CLAMP
-                iCmp = (int)kRight.m_bEmulateDepthClamp - (int)kLeft.m_bEmulateDepthClamp;
-                if (iCmp != 0)
-                {
-                    return false;
-                }
-#endif //!DXGL_SUPPORT_DEPTH_CLAMP
-
-                return true;
-            }
-        };
-
-        typedef AZStd::unordered_map<SPipelineConfiguration, SPipelinePtr, SHashCompare, SHashCompare> TMap;
-
-        TMap m_kMap;
-    };
-
-    struct SUnitMapCache
-    {
-        struct SHashCompare
-        {
-            size_t operator()(const SUnitMapPtr& kMap) const
-            {
-                return (size_t)(kMap->m_uNumUnits ^ NCryOpenGL::GetCRC32(kMap->m_akUnits, sizeof(kMap->m_akUnits[0]) * kMap->m_uNumUnits));
-            }
-
-            bool operator()(const SUnitMapPtr& kLeft, const SUnitMapPtr& kRight) const
-            {
-                return (kLeft->m_uNumUnits == kRight->m_uNumUnits &&
-                        memcmp(kLeft->m_akUnits, kRight->m_akUnits, sizeof(kLeft->m_akUnits[0]) * kLeft->m_uNumUnits) == 0);
-            }
-        };
-
-        typedef AZStd::unordered_map<SUnitMapPtr, SUnitMapPtr, SHashCompare, SHashCompare> TMap;
-
-        TMap m_kMap;
-    };
-
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Shader tracing helpers
-    ////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_ENABLE_SHADER_TRACING
-
-    uint32 DumpShaderTrace(const uint32* puValues, const SShaderTraceIndex& kIndex, uint32 uStride, uint32 uSize, uint32 uCapacity)
-    {
-        if (uSize > uCapacity)
-        {
-            DXGL_WARNING(
-                "The shader tracing buffer was not big enough to store all selected shader invocations. Only the first %d out of %d will be logged",
-                (uCapacity + uStride - 1) / uStride,
-                (uSize     + uStride - 1) / uStride);
-            uSize = uCapacity;
-        }
-
-        uint32 uNumElements((uSize + uStride - 1) / uStride);
-        if (uNumElements > 0)
-        {
-            STraceFile kTraceFile;
-            char acFileName[MAX_PATH];
-            static LONG s_uTraceID = 0;
-            LONG uTraceID = AtomicIncrement(&s_uTraceID);
-            sprintf_s(acFileName, "shader_trace_%d.txt", uTraceID);
-            kTraceFile.Open(acFileName, false);
-
-            for (uint32 uElement = 0; uElement < uNumElements; ++uElement)
-            {
-                uint32 uStep;
-                const uint32* puValue(puValues + uElement * uStride);
-                const uint32* puEnd(puValue + uStride);
-                ++puValue; // Skip first element which serves as dummy for unselected invocations
-                while (puValue < puEnd && (uStep = *(puValue++)) < kIndex.m_kTraceStepSizes.size())
-                {
-                    kTraceFile.Printf("Element %d - step %d\n", uElement, uStep);
-
-                    uint32 uStepVariablesBegin = kIndex.m_kTraceStepOffsets.at(uStep);
-
-                    for (uint32 uVariable = 0; puValue < puEnd && uVariable < kIndex.m_kTraceStepSizes.at(uStep); ++uVariable)
-                    {
-                        const VariableTraceInfo* pVariable(&kIndex.m_kTraceVariables.at(uStepVariablesBegin + uVariable));
-                        char cPrefix;
-                        switch (pVariable->eGroup)
-                        {
-                        case TRACE_VARIABLE_INPUT:
-                            cPrefix = 'v';
-                            break;
-                        case TRACE_VARIABLE_TEMP:
-                            cPrefix = 'r';
-                            break;
-                        case TRACE_VARIABLE_OUTPUT:
-                            cPrefix = 'o';
-                            break;
-                        default:
-                            DXGL_ERROR("Invalid trace variable group");
-                            return 0;
-                        }
-                        char cComponent("xyzw"[pVariable->ui8Component]);
-                        switch (pVariable->eType)
-                        {
-                        case TRACE_VARIABLE_UNKNOWN:
-                            kTraceFile.Printf("\t%c%d.%c = 0x%08X\n", cPrefix, pVariable->ui8Index, cComponent, *(puValue++));
-                            break;
-                        case TRACE_VARIABLE_UINT:
-                            kTraceFile.Printf("\t%c%d.%c = %u\n", cPrefix, pVariable->ui8Index, cComponent, *(puValue++));
-                            break;
-                        case TRACE_VARIABLE_SINT:
-                            kTraceFile.Printf("\t%c%d.%c = %i\n", cPrefix, pVariable->ui8Index, cComponent, *reinterpret_cast<const int32*>(puValue++));
-                            break;
-                        case TRACE_VARIABLE_FLOAT:
-                            kTraceFile.Printf("\t%c%d.%c = %f\n", cPrefix, pVariable->ui8Index, cComponent, *reinterpret_cast<const float*>(puValue++));
-                            break;
-                        case TRACE_VARIABLE_DOUBLE:
-                            DXGL_NOT_IMPLEMENTED;
-                            break;
-                        default:
-                            DXGL_ERROR("Invalid trace variable type");
-                            return 0;
-                        }
-                    }
-                }
-                CRY_ASSERT(puValue > puValues && *(puValue - 1) == 0xFFFFFFFF);
-            }
-        }
-        return uNumElements;
-    }
-
-    struct SShaderTraceBufferCommon
-    {
-        enum
-        {
-            CAPACITY = 0x100000
-        };
-
-        uint32 m_uSize;
-        uint32 m_uStride;
-        uint32 m_uCapacity;
-    };
-
-    template <typename StageHeader>
-    struct SShaderTraceBufferHeader
-        : SShaderTraceBufferCommon
-    {
-        StageHeader m_kStageHeader;
-    };
-
-    template <typename StageHeader>
-    struct SShaderTraceBuffer
-        : SShaderTraceBufferHeader<StageHeader>
-    {
-        uint32 m_auValues[SShaderTraceBufferCommon::CAPACITY];
-    };
-
-    template <typename StageHeader>
-    void BeginTraceInternal(uint32 uBufferName, const StageHeader& kStageHeader, uint32 uStride)
-    {
-        typedef SShaderTraceBufferHeader<StageHeader> THeader;
-
-        THeader* pHeader(static_cast<THeader*>(glMapNamedBufferRangeEXT(uBufferName, 0, sizeof(THeader), GL_MAP_WRITE_BIT)));
-        pHeader->m_uSize = 0;
-        pHeader->m_uStride = uStride;
-        pHeader->m_uCapacity = SShaderTraceBufferCommon::CAPACITY;
-        pHeader->m_kStageHeader = kStageHeader;
-        glUnmapNamedBufferEXT(uBufferName);
-    }
-
-    template <typename StageHeader>
-    uint32 EndTraceInternal(uint32 uBufferName, EShaderType eShaderType, const SShaderTraceIndex& kIndex)
-    {
-        typedef SShaderTraceBuffer<StageHeader> TBuffer;
-
-        glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT | GL_BUFFER_UPDATE_BARRIER_BIT);
-
-        const TBuffer* pBuffer(static_cast<TBuffer*>(glMapNamedBufferRangeEXT(uBufferName, 0, sizeof(TBuffer), GL_MAP_READ_BIT)));
-        uint32 uNumTraces = DumpShaderTrace(pBuffer->m_auValues, kIndex, pBuffer->m_uStride, pBuffer->m_uSize, pBuffer->m_uCapacity);
-        glUnmapNamedBufferEXT(uBufferName);
-
-        return uNumTraces;
-    }
-
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-
-    ////////////////////////////////////////////////////////////////////////////
-    // SStreamingBufferContext implementation
-    ////////////////////////////////////////////////////////////////////////////
-
-    SStreamingBufferContext::SStreamingBufferContext()
-        : m_uPreviousFrameIndex(0)
-        , m_uNumPreviousFrames(0)
-        , m_pFreeFramesHead(NULL)
-        , m_uNumStreamingBuffersUnits(0)
-#if DXGL_SUPPORT_BUFFER_STORAGE
-        , m_bFlushNeeded(false)
-#endif
-    {
-    }
-
-    SStreamingBufferContext::~SStreamingBufferContext()
-    {
-        for (uint32 uFramePool = 0; uFramePool < m_kFramePools.size(); ++uFramePool)
-        {
-            Free(m_kFramePools.at(uFramePool));
-        }
-    }
-
-    void SStreamingBufferContext::SwitchFrame(CDevice* pDevice)
-    {
-        if (SGlobalConfig::iStreamingConstantBuffersMode <= 0)
-        {
-            return;
-        }
-
-        while (m_uNumPreviousFrames > 0)
-        {
-            uint32 uOldestIndex((m_uPreviousFrameIndex +  m_uNumPreviousFrames - 1) % MAX_PREVIOUS_FRAMES);
-
-            GLint iResult(GL_UNSIGNALED);
-            glGetSynciv(m_aspPreviousFrames[uOldestIndex]->m_pEndFence, GL_SYNC_STATUS, sizeof(iResult), NULL, &iResult);
-            if (iResult != GL_SIGNALED)
-            {
-                break;
-            }
-
-            glDeleteSync(m_aspPreviousFrames[uOldestIndex]->m_pEndFence);
-            m_aspPreviousFrames[uOldestIndex] = NULL;
-            --m_uNumPreviousFrames;
-        }
-
-        if (m_spCurrentFrame == NULL || m_uNumPreviousFrames < MAX_PREVIOUS_FRAMES)
-        {
-            if (m_spCurrentFrame != NULL)
-            {
-                m_spCurrentFrame->m_pEndFence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-                m_aspPreviousFrames[(m_uPreviousFrameIndex +  m_uNumPreviousFrames) % MAX_PREVIOUS_FRAMES] = m_spCurrentFrame;
-                ++m_uNumPreviousFrames;
-            }
-
-            if (m_pFreeFramesHead == NULL)
-            {
-                uint32 uSize(min((uint32)(SGlobalConfig::iMinFramePoolSize << m_kFramePools.size()), (uint32)SGlobalConfig::iMaxFramePoolSize));
-                SContextFrame* pNewPool(static_cast<SContextFrame*>(Malloc(sizeof(SContextFrame) * uSize)));
-                m_kFramePools.push_back(pNewPool);
-
-                m_pFreeFramesHead = pNewPool;
-                uint32 uLast(uSize - 1);
-                pNewPool[uLast].m_pNext = NULL;
-                for (uint32 uElement = 0; uElement < uLast; ++uElement)
-                {
-                    pNewPool[uElement].m_pNext = pNewPool + uElement + 1;
-                }
-            }
-
-            SContextFrame* pNextFreeFrame(m_pFreeFramesHead->m_pNext);
-            m_spCurrentFrame = new (m_pFreeFramesHead) SContextFrame(&m_pFreeFramesHead);
-            m_pFreeFramesHead = pNextFreeFrame;
-        }
-
-        UpdateStreamingSizes(pDevice);
-    }
-
-    void SStreamingBufferContext::UpdateStreamingSizes(CDevice* pDevice)
-    {
-        if (SGlobalConfig::iStreamingConstantBuffersMode <= 0)
-        {
-            return;
-        }
-
-        DXGL_TODO("Add some type of lazy constant buffer unit reclaiming scheme to release units that have not been used for several frames")
-
-        SStreamingBuffer * pBuffersEnd(m_akStreamingBuffers + MAX_CONSTANT_BUFFER_SLOTS);
-        for (SStreamingBuffer* pBuffer = m_akStreamingBuffers; pBuffer < pBuffersEnd; ++pBuffer)
-        {
-            if (pBuffer->m_uRequestedSectionSize > pBuffer->m_uSectionCapacity)
-            {
-                uint32 uGranularity((uint32)SGlobalConfig::iStreamingConstantBuffersGranularity);
-                uint32 uMinUnits((pBuffer->m_uRequestedSectionSize + uGranularity - 1) / uGranularity);
-                uint32 uOldUnits(pBuffer->m_uSectionCapacity / uGranularity);
-                uint32 uDesiredUnits(uOldUnits);
-                while (uDesiredUnits < uMinUnits)
-                {
-                    uDesiredUnits = max(1u, uDesiredUnits * (uint32)SGlobalConfig::iStreamingConstantBuffersGrowth);
-                }
-                uint32 uMissingUnits(uDesiredUnits - uOldUnits);
-
-                if (m_uNumStreamingBuffersUnits + uMissingUnits < SGlobalConfig::iStreamingConstantBuffersMaxUnits)
-                {
-                    DXGL_TODO("Evaluate the possibility of pooling freed streaming buffer storages by size rather than deleting and creating a new one each time");
-
-                    GLuint uName;
-                    if (pBuffer->m_kName.IsValid())
-                    {
-                        uName = pBuffer->m_kName.GetName();
-                        glDeleteBuffers(1, &uName);
-                    }
-                    glGenBuffers(1, &uName);
-                    pBuffer->m_kName = pDevice->GetBufferNamePool().Create(uName);
-
-                    pBuffer->m_uSectionCapacity = uDesiredUnits * uGranularity;
-                    pBuffer->m_uNextPosition = 0;
-                    pBuffer->m_uEndPosition  = pBuffer->m_uSectionCapacity;
-                    GLsizeiptr iNewSize(pBuffer->m_uSectionCapacity * MAX_PREVIOUS_FRAMES);
-#if DXGL_SUPPORT_BUFFER_STORAGE
-                    if (pDevice->IsFeatureSupported(eF_BufferStorage) && SGlobalConfig::iStreamingConstantBuffersPersistentMap)
-                    {
-                        glNamedBufferStorageEXT(pBuffer->m_kName.GetName(), iNewSize, NULL, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
-                        pBuffer->m_pMappedData = glMapNamedBufferRangeEXT(pBuffer->m_kName.GetName(), 0, iNewSize, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
-                    }
-                    else
-#endif //DXGL_SUPPORT_BUFFER_STORAGE
-                    {
-                        glNamedBufferDataEXT(pBuffer->m_kName.GetName(), iNewSize, NULL, GL_STREAM_DRAW);
-                    }
-                    m_uNumStreamingBuffersUnits += uMissingUnits;
-                }
-            }
-            else if (pBuffer->m_uSectionCapacity > 0)
-            {
-                pBuffer->m_uNextPosition =
-                    (pBuffer->m_uNextPosition + pBuffer->m_uSectionCapacity - 1 - (pBuffer->m_uNextPosition - 1) % pBuffer->m_uSectionCapacity) %
-                    (pBuffer->m_uSectionCapacity * MAX_PREVIOUS_FRAMES);
-                pBuffer->m_uEndPosition = pBuffer->m_uNextPosition + pBuffer->m_uSectionCapacity;
-            }
-            pBuffer->m_uRequestedSectionSize = 0;
-        }
-    }
-
-    void SStreamingBufferContext::UploadAndBindUniformData(CContext* pContext, const SConstantBufferSlot& kSlot, uint32 uUnit)
-    {
-        uint32 uStreamingAlignment(pContext->GetDevice()->GetAdapter()->m_kCapabilities.m_iUniformBufferOffsetAlignment);
-        uint32 uContextIndex(pContext->GetIndex());
-
-        if (kSlot.m_pBuffer != NULL)
-        {
-            SBuffer* pBuffer(kSlot.m_pBuffer);
-            SStreamingBuffer* pStreaming(m_akStreamingBuffers + uUnit);
-            uint32 uStreamingSize(kSlot.m_kRange.m_uSize + uStreamingAlignment - 1 - (kSlot.m_kRange.m_uSize - 1) % uStreamingAlignment);
-            SBuffer::SContextCache* pContextCache(pBuffer->m_akContextCaches + uContextIndex);
-
-            if (pBuffer->m_bStreaming)
-            {
-                bool bDataDirty(!pBuffer->m_kContextCachesValid.Get(uContextIndex));
-                bool bCopyDirty(
-                    (pContextCache->m_spFrame != NULL && (
-                         pContextCache->m_spFrame != m_spCurrentFrame ||
-                         pContextCache->m_uUnit   != uUnit ||
-                         pContextCache->m_kRange  != kSlot.m_kRange)));
-                if (bDataDirty || bCopyDirty)
-                {
-                    if (pStreaming->m_uNextPosition  + uStreamingSize < pStreaming->m_uEndPosition)
-                    {
-                        pContextCache->m_spFrame       = m_spCurrentFrame;
-                        pContextCache->m_uUnit         = uUnit;
-                        pContextCache->m_kRange        = kSlot.m_kRange;
-                        pContextCache->m_uStreamOffset = pStreaming->m_uNextPosition;
-
-                        void* pSrcData(pBuffer->m_pSystemMemoryCopy + kSlot.m_kRange.m_uOffset);
-                        size_t uSize(kSlot.m_kRange.m_uSize);
-
-#if DXGL_SUPPORT_BUFFER_STORAGE
-                        if (pStreaming->m_pMappedData != NULL)
-                        {
-                            GLvoid* pData(static_cast<uint8*>(pStreaming->m_pMappedData) + pStreaming->m_uNextPosition);
-                            cryMemcpy(pData, pSrcData, uSize);
-                            m_bFlushNeeded = true;
-                        }
-                        else
-#endif
-                        {
-                            GLintptr piDstOffset((GLintptr)pStreaming->m_uNextPosition);
-                            if (SGlobalConfig::iBufferUploadMode > 0)
-                            {
-                                pContext->NamedBufferSubDataFast(pStreaming->m_kName, piDstOffset, (GLsizeiptr)uSize, pSrcData);
-                            }
-                            else
-                            {
-                                GLvoid* pData(
-                                    pContext->MapNamedBufferRangeFast(
-                                        pStreaming->m_kName,
-                                        piDstOffset,
-                                        (GLsizeiptr)uStreamingSize,
-                                        GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT));
-                                cryMemcpy(pData, pSrcData, uSize);
-                                pContext->UnmapNamedBufferFast(pStreaming->m_kName);
-                            }
-                        }
-
-                        pStreaming->m_uNextPosition += uStreamingSize;
-                    }
-                    else if (pBuffer->m_bStreaming)
-                    {
-                        pBuffer->m_akContextCaches[uContextIndex].m_spFrame = NULL;
-                        pContext->NamedBufferDataFast(pBuffer->m_kName, pBuffer->m_uSize, pBuffer->m_pSystemMemoryCopy, pBuffer->m_eUsage);
-                    }
-
-                    pBuffer->m_kContextCachesValid.Set(uContextIndex, true);
-                    pStreaming->m_uRequestedSectionSize += uStreamingSize;
-                }
-            }
-
-            if (pBuffer->m_akContextCaches[uContextIndex].m_spFrame == NULL)
-            {
-                pBuffer->m_kCreationFence.IssueWait(pContext);
-                pContext->BindUniformBuffer(TIndexedBufferBinding(pBuffer->m_kName, kSlot.m_kRange), uUnit);
-            }
-            else
-            {
-                SBufferRange kStreamingRange(pBuffer->m_akContextCaches[uContextIndex].m_uStreamOffset, uStreamingSize);
-                pContext->BindUniformBuffer(TIndexedBufferBinding(pStreaming->m_kName, kStreamingRange), uUnit);
-            }
-        }
-    }
-
-    void SStreamingBufferContext::FlushUniformData()
-    {
-#if DXGL_SUPPORT_BUFFER_STORAGE
-        if (m_bFlushNeeded)
-        {
-            glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
-        }
-#endif //DXGL_SUPPORT_BUFFER_STORAGE
-    }
-
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-
-
-    ////////////////////////////////////////////////////////////////////////////
-    // CContext implementation
-    ////////////////////////////////////////////////////////////////////////////
-
-    CContext::CContext(CDevice* pDevice, const TRenderingContext& kRenderingContext, const TWindowContext& kDefaultWindowContext, uint32 uIndex, ContextType type)
-        : m_pDevice(pDevice)
-        , m_kRenderingContext(kRenderingContext)
-        , m_kWindowContext(kDefaultWindowContext)
-        , m_uIndex(uIndex)
-        , m_pFrameBufferCache(new SFrameBufferCache)
-        , m_pPipelineCache(new SPipelineCache)
-        , m_pUnitMapCache(new SUnitMapCache)
-        , m_pInputLayout(NULL)
-        , m_bFrameBufferStateDirty(false)
-        , m_bPipelineDirty(false)
-        , m_bInputLayoutDirty(false)
-        , m_bInputAssemblerSlotsDirty(false)
-        , m_eIndexType(GL_NONE)
-        , m_uIndexStride(0)
-        , m_uReservationCount(0)
-        , m_PlsExtensionState(PLS_IGNORE)
-        , m_pReservedContext(NULL)
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        , m_uVertexOffset(0)
-#endif //!DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-#if DXGL_ENABLE_SHADER_TRACING
-        , m_eStageTracing(eST_NUM)
-        , m_uShaderTraceCount(0)
-#endif //DXGL_ENABLE_SHADER_TRACING
-        , m_type(type)
-        , m_blitHelper(*this)
-    {
-        for (uint32 uUnitType = 0; uUnitType < eRUT_NUM; ++uUnitType)
-        {
-            m_abResourceUnitsDirty[uUnitType] = false;
-        }
-        memset(m_apResourceUnitMaps, 0, sizeof(m_apResourceUnitMaps));
-        AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusConnect();
-    }
-
-    CContext::~CContext()
-    {
-#if DXGL_ENABLE_SHADER_TRACING
-        if (m_kShaderTracingBuffer.IsValid())
-        {
-            GLuint uName(m_kShaderTracingBuffer.GetName());
-            glDeleteBuffers(1, &uName);
-        }
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-        glBindVertexArray(0);
-        glDeleteVertexArrays(1, &m_uGlobalVAO);
-
-        if (m_kCopyPixelBuffer.IsValid())
-        {
-            GLuint uCopyPixelBufferName(m_kCopyPixelBuffer.GetName());
-            glDeleteBuffers(1, &uCopyPixelBufferName);
-        }
-
-        delete m_pFrameBufferCache;
-        delete m_pPipelineCache;
-        delete m_pUnitMapCache;
-
-        AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusDisconnect();
-    }
-
-    bool CContext::Initialize()
-    {
-        DXGL_SCOPED_PROFILE("CContext::Initialize")
-
-        memset(&m_kStateCache, 0, sizeof(m_kStateCache));
-
-#if DXGL_TRACE_CALLS
-        char acTraceFileName[16];
-        sprintf_s(acTraceFileName, "Calls_%d", m_uIndex);
-        m_kCallTrace.Open(acTraceFileName, false);
-#endif
-
-        DXGL_TODO("Try with separate cached VAOs for each input layout and vertex buffer to see if it improves performance");
-        glGenVertexArrays(1, &m_uGlobalVAO);
-        glBindVertexArray(m_uGlobalVAO);
-
-        if (!GetDevice()->IsFeatureSupported(eF_CopyImage))
-        {
-            GLuint uCopyPixelBufferName;
-            glGenBuffers(1, &uCopyPixelBufferName);
-            m_kCopyPixelBuffer = m_pDevice->GetBufferNamePool().Create(uCopyPixelBufferName);
-        }
-
-#if !DXGLES //Seamless cube map filtering is not optional in GL ES
-        glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
-#endif //!DXGLES
-
-        const SCapabilities& kCapabilities(m_pDevice->GetAdapter()->m_kCapabilities);
-        uint32 uNumTextureUnits(min((uint32)DXGL_ARRAY_SIZE(m_kStateCache.m_akTextureUnits), (uint32)kCapabilities.m_akResourceUnits[eRUT_Texture].m_aiMaxTotal));
-#if DXGL_SUPPORT_SHADER_IMAGES
-        uint32 uNumImageUnits(min((uint32)DXGL_ARRAY_SIZE(m_kStateCache.m_akImageUnits), (uint32)kCapabilities.m_akResourceUnits[eRUT_Image].m_aiMaxTotal));
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-        for (uint32 uUnit = 0; uUnit < uNumTextureUnits; ++uUnit)
-        {
-            GetTextureUnitCache(uUnit, m_kStateCache.m_akTextureUnits[uUnit]);
-        }
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-        if (m_pDevice->GetFeatureSpec().m_kFeatures.Get(eF_ShaderImages))
-        {
-            for (uint32 uUnit = 0; uUnit < uNumImageUnits; ++uUnit)
-            {
-                GetImageUnitCache(uUnit, m_kStateCache.m_akImageUnits[uUnit]);
-            }
-        }
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-#if DXGL_SUPPORT_SCISSOR_RECT_ARRAY
-        for (uint32 uScissorRect = 0; uScissorRect < DXGL_NUM_SUPPORTED_SCISSOR_RECTS; ++uScissorRect)
-        {
-            GetStateVari(GL_SCISSOR_BOX, uScissorRect, m_kStateCache.m_akGLScissorData + 4 * uScissorRect);
-        }
-#else
-        GetStateVar(GL_SCISSOR_BOX, m_kStateCache.m_akGLScissorData);
-#endif
-        return GetImplicitStateCache(m_kStateCache) &&
-               GetBlendCache(m_kStateCache.m_kBlend) &&
-               GetDepthStencilCache(m_kStateCache.m_kDepthStencil) &&
-               GetRasterizerCache(m_kStateCache.m_kRasterizer) &&
-               GetInputAssemblerCache(m_kStateCache.m_kInputAssembler);
-    }
-
-    void CContext::SetWindowContext(const TWindowContext& kWindowContext)
-    {
-        if (m_kWindowContext != kWindowContext)
-        {
-            m_kWindowContext = kWindowContext;
-
-            // Update the current target window if this context is current
-            if (m_pDevice->GetCurrentContext() == this)
-            {
-                m_pDevice->SetCurrentContext(this);
-            }
-        }
-    }
-
-    bool CContext::GetBlendCache(SBlendCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetBlendCache")
-
-        kCache.m_bAlphaToCoverageEnable = glIsEnabled(GL_SAMPLE_ALPHA_TO_COVERAGE) == GL_TRUE;
-
-        if (m_pDevice->IsFeatureSupported(eF_IndependentBlending))
-        {
-            kCache.m_bIndependentBlendEnable = false; // Enabled only if render target blend states are not compatible
-            uint32 uTarget;
-            for (uTarget = 0; uTarget < DXGL_ARRAY_SIZE(kCache.m_kTargets); ++uTarget)
-            {
-                STargetBlendState& kRTCache(kCache.m_kTargets[uTarget]);
-
-#if DXGL_SUPPORT_INDEXED_BOOL_STATE
-                if (m_pDevice->IsFeatureSupported(eF_IndexedBoolState))
-                {
-                    GetStateVari(GL_COLOR_WRITEMASK, uTarget, kRTCache.m_kWriteMask.m_abRGBA);
-                }
-#endif
-                kRTCache.m_bEnable = glIsEnabledi(GL_BLEND, uTarget) == TRUE;
-                if (kRTCache.m_bEnable)
-                {
-                    GetStateVari(GL_BLEND_EQUATION_RGB, uTarget, &kRTCache.m_kRGB.m_eEquation);
-                    GetStateVari(GL_BLEND_EQUATION_ALPHA, uTarget, &kRTCache.m_kAlpha.m_eEquation);
-
-                    GetStateVari(GL_BLEND_SRC_RGB, uTarget, &kRTCache.m_kRGB.m_kFunction.m_eSrc);
-                    GetStateVari(GL_BLEND_SRC_ALPHA, uTarget, &kRTCache.m_kAlpha.m_kFunction.m_eSrc);
-
-                    GetStateVari(GL_BLEND_DST_RGB, uTarget, &kRTCache.m_kRGB.m_kFunction.m_eDst);
-                    GetStateVari(GL_BLEND_DST_ALPHA, uTarget, &kRTCache.m_kAlpha.m_kFunction.m_eDst);
-
-                    kRTCache.m_bSeparateAlpha = kRTCache.m_kRGB != kRTCache.m_kAlpha; // Enable separate alpha blending if the rgb and alpha parameters are different
-
-                    if (uTarget > 0 && kCache.m_kTargets[0].m_bEnable)
-                    {
-                        // Check if the parameters for this target are compatible with the default ones (target 0)
-                        if (kCache.m_kTargets[0] != kRTCache)
-                        {
-                            kCache.m_bIndependentBlendEnable = true;
-                        }
-                    }
-                }
-                else
-                {
-                    if (uTarget == 0)
-                    {
-                        kCache.m_bIndependentBlendEnable = true; // Can't use unique blending parameters as the default ones (target 0) are not present
-                    }
-                }
-            }
-        }
-        else
-        {
-            STargetBlendState& kRTCache(kCache.m_kTargets[0]);
-
-            GetStateVar(GL_COLOR_WRITEMASK, kRTCache.m_kWriteMask.m_abRGBA);
-            kRTCache.m_bEnable = glIsEnabled(GL_BLEND) == TRUE;
-            if (kRTCache.m_bEnable)
-            {
-                GetStateVar(GL_BLEND_EQUATION_RGB, &kRTCache.m_kRGB.m_eEquation);
-                GetStateVar(GL_BLEND_EQUATION_ALPHA, &kRTCache.m_kAlpha.m_eEquation);
-
-                GetStateVar(GL_BLEND_SRC_RGB, &kRTCache.m_kRGB.m_kFunction.m_eSrc);
-                GetStateVar(GL_BLEND_SRC_ALPHA, &kRTCache.m_kAlpha.m_kFunction.m_eSrc);
-
-                GetStateVar(GL_BLEND_DST_RGB, &kRTCache.m_kRGB.m_kFunction.m_eDst);
-                GetStateVar(GL_BLEND_DST_ALPHA, &kRTCache.m_kAlpha.m_kFunction.m_eDst);
-
-                kRTCache.m_bSeparateAlpha = kRTCache.m_kRGB != kRTCache.m_kAlpha; // Enable separate alpha blending if the rgb and alpha parameters are different
-            }
-
-            for (uint32 uOverriddenTarget = 1; uOverriddenTarget < DXGL_ARRAY_SIZE(kCache.m_kTargets); ++uOverriddenTarget)
-            {
-                kCache.m_kTargets[uOverriddenTarget] = kCache.m_kTargets[0];
-            }
-        }
-
-        return true;
-    }
-
-    bool CContext::GetDepthStencilCache(
-        SDepthStencilCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetDepthStencilCache")
-
-        kCache.m_bDepthTestingEnabled = glIsEnabled(GL_DEPTH_TEST) == GL_TRUE;
-        GetStateVar(GL_DEPTH_FUNC, reinterpret_cast<GLint*>(&kCache.m_eDepthTestFunc));
-        GetStateVar(GL_DEPTH_WRITEMASK, &kCache.m_bDepthWriteMask);
-        kCache.m_bStencilTestingEnabled = glIsEnabled(GL_STENCIL_TEST) == GL_TRUE;
-
-        GetStateVar(GL_STENCIL_FUNC,                  &kCache.m_kStencilFrontFaces.m_eFunction);
-        GetStateVar(GL_STENCIL_FAIL,                  &kCache.m_kStencilFrontFaces.m_eStencilFailOperation);
-        GetStateVar(GL_STENCIL_PASS_DEPTH_FAIL,       &kCache.m_kStencilFrontFaces.m_eDepthFailOperation);
-        GetStateVar(GL_STENCIL_PASS_DEPTH_PASS,       &kCache.m_kStencilFrontFaces.m_eDepthPassOperation);
-        GetStateVar(GL_STENCIL_WRITEMASK,             &kCache.m_kStencilFrontFaces.m_uStencilWriteMask);
-        GetStateVar(GL_STENCIL_VALUE_MASK,            &kCache.m_kStencilFrontFaces.m_uStencilReadMask);
-        GetStateVar(GL_STENCIL_REF,                   &kCache.m_kStencilRef.m_iFrontFacesReference);
-
-        GetStateVar(GL_STENCIL_BACK_FUNC,             &kCache.m_kStencilBackFaces.m_eFunction);
-        GetStateVar(GL_STENCIL_BACK_FAIL,             &kCache.m_kStencilBackFaces.m_eStencilFailOperation);
-        GetStateVar(GL_STENCIL_BACK_PASS_DEPTH_FAIL,  &kCache.m_kStencilBackFaces.m_eDepthFailOperation);
-        GetStateVar(GL_STENCIL_BACK_PASS_DEPTH_PASS,  &kCache.m_kStencilBackFaces.m_eDepthPassOperation);
-        GetStateVar(GL_STENCIL_BACK_WRITEMASK,        &kCache.m_kStencilBackFaces.m_uStencilWriteMask);
-        GetStateVar(GL_STENCIL_BACK_VALUE_MASK,       &kCache.m_kStencilBackFaces.m_uStencilReadMask);
-        GetStateVar(GL_STENCIL_BACK_REF,              &kCache.m_kStencilRef.m_iBackFacesReference);
-
-        return true;
-    }
-
-    bool CContext::GetRasterizerCache(SRasterizerCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetRasterizerCache")
-
-        GetStateVar(GL_FRONT_FACE,            reinterpret_cast<GLint*>(&kCache.m_eFrontFaceMode));
-        GetStateVar(GL_CULL_FACE_MODE,        reinterpret_cast<GLint*>(&kCache.m_eCullFaceMode));
-        GetStateVar(GL_POLYGON_OFFSET_UNITS,  &kCache.m_fPolygonOffsetUnits);
-        GetStateVar(GL_POLYGON_OFFSET_FACTOR, &kCache.m_fPolygonOffsetFactor);
-#if !DXGLES
-        GetStateVar(GL_POLYGON_MODE,          reinterpret_cast<GLint*>(&kCache.m_ePolygonMode));
-#endif //!DXGLES
-
-        kCache.m_bCullingEnabled =           glIsEnabled(GL_CULL_FACE) == GL_TRUE;
-        kCache.m_bPolygonOffsetFillEnabled = glIsEnabled(GL_POLYGON_OFFSET_FILL) == GL_TRUE;
-        kCache.m_bScissorEnabled =           glIsEnabled(GL_SCISSOR_TEST) == GL_TRUE;
-#if DXGL_SUPPORT_DEPTH_CLAMP
-        kCache.m_bDepthClipEnabled =         glIsEnabled(GL_DEPTH_CLAMP) == GL_FALSE;
-#else
-        kCache.m_bDepthClipEnabled =         false;
-#endif
-#if !DXGLES
-        kCache.m_bLineSmoothEnabled =        glIsEnabled(GL_LINE_SMOOTH) == GL_TRUE;
-        kCache.m_bPolygonOffsetLineEnabled = glIsEnabled(GL_POLYGON_OFFSET_LINE) == GL_TRUE;
-        kCache.m_bMultisampleEnabled =       glIsEnabled(GL_MULTISAMPLE) == GL_TRUE;
-#endif //!DXGLES
-
-#if !DXGLES
-        switch (kCache.m_ePolygonMode)
-        {
-        case GL_LINE:
-            kCache.m_bPolygonOffsetEnabled = kCache.m_bPolygonOffsetLineEnabled;
-            break;
-        case GL_FILL:
-            kCache.m_bPolygonOffsetEnabled = kCache.m_bPolygonOffsetFillEnabled;
-            break;
-        default:
-            DXGL_WARNING("Unexpected value for GL_POLYGON_MODE - should be GL_LINE or GL_FILL");
-            break;
-        }
-#else
-        kCache.m_bPolygonOffsetEnabled = kCache.m_bPolygonOffsetFillEnabled;
-#endif
-
-        // There is only polygon offset fill in OpenGL ES and no support for custom
-        // clip planes
-#if !DXGLES
-        if ((glIsEnabled(GL_POLYGON_OFFSET_LINE) == GL_TRUE) != kCache.m_bPolygonOffsetEnabled)
-        {
-            DXGL_WARNING("GL_POLYGON_OFFSET_LINE is required to have the same state of GL_POLYGON_OFFSET_FILL for cache coherence - overriding it now.");
-            SetEnabledState(GL_POLYGON_OFFSET_LINE, kCache.m_bPolygonOffsetEnabled);
-        }
-
-        GLenum eUserClipPlane(GL_CLIP_DISTANCE1);
-        GLenum eLastUserClipPlane(GL_CLIP_DISTANCE5);
-        while (eUserClipPlane <= eLastUserClipPlane)
-        {
-            if (glIsEnabled(eUserClipPlane))
-            {
-                DXGL_WARNING("User clip planes are not exposed to Direct3D (deprecated in DX10) - disabling it now for coherence");
-                glDisable(eUserClipPlane);
-            }
-            ++eUserClipPlane;
-        }
-#endif //!DXGLES
-
-        return true;
-    }
-
-    bool CContext::GetTextureUnitCache(uint32 uUnit, STextureUnitCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetTextureUnitCache")
-
-        struct STarget
-        {
-            GLenum m_eName;
-            GLenum m_eBinding;
-        };
-        static STarget s_akTargets[] =
-        {
-            {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D               },
-            {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY         },
-            {GL_TEXTURE_CUBE_MAP, GL_TEXTURE_BINDING_CUBE_MAP         },
-            {GL_TEXTURE_3D, GL_TEXTURE_BINDING_3D               },
-#if !DXGLES
-            {GL_TEXTURE_1D, GL_TEXTURE_BINDING_1D               },
-            {GL_TEXTURE_1D_ARRAY, GL_TEXTURE_BINDING_1D_ARRAY         },
-            {GL_TEXTURE_RECTANGLE, GL_TEXTURE_BINDING_RECTANGLE        },
-#endif //!DXGLES
-#if DXGL_SUPPORT_TEXTURE_BUFFERS
-            {GL_TEXTURE_BUFFER, GL_TEXTURE_BINDING_BUFFER           },
-#endif //DXGL_SUPPORT_TEXTURE_BUFFERS
-#if DXGL_SUPPORT_CUBEMAP_ARRAYS
-            {GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_BINDING_CUBE_MAP_ARRAY   },
-#endif //DXGL_SUPPORT_CUBEMAP_ARRAYS
-        };
-
-        m_kStateCache.m_glActiveTexture = GL_TEXTURE0 + uUnit;
-        glActiveTexture(m_kStateCache.m_glActiveTexture);
-
-        GLint iSamplerBinding;
-        GetStateVar(GL_SAMPLER_BINDING, &iSamplerBinding);
-
-        kCache.m_kTextureName = CResourceName();
-        kCache.m_eTextureTarget = 0;
-        kCache.m_uSampler = static_cast<GLuint>(iSamplerBinding);
-
-        uint32 uTarget;
-        for (uTarget = 0; uTarget < DXGL_ARRAY_SIZE(s_akTargets); ++uTarget)
-        {
-            GLint iTargetTexture;
-            GetStateVar(s_akTargets[uTarget].m_eBinding, &iTargetTexture);
-
-            if (iTargetTexture != 0)
-            {
-                if (kCache.m_eTextureTarget != 0)
-                {
-                    DXGL_ERROR("At most one resource binding per texture unit supported");
-                    return false;
-                }
-
-                kCache.m_kTextureName = m_pDevice->GetTextureNamePool().Create((GLuint)iTargetTexture);
-                kCache.m_eTextureTarget = s_akTargets[uTarget].m_eName;
-            }
-        }
-
-        return true;
-    }
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-
-    bool CContext::GetImageUnitCache(uint32 uUnit, SImageUnitCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetImageUnitCache")
-        if (!m_pDevice->IsFeatureSupported(eF_ShaderImages))
-        {
-            DXGL_ERROR("Shader Images are not supported on this device.");
-            return false;
-        }
-
-        GLint iTexture;
-        GLboolean bLayered;
-        GLint iLayer;
-        GLint iFormat;
-        GetStateVari(GL_IMAGE_BINDING_NAME, uUnit, &iTexture);
-        GetStateVari(GL_IMAGE_BINDING_LEVEL, uUnit, &kCache.m_kConfiguration.m_iLevel);
-        GetStateVari(GL_IMAGE_BINDING_LAYERED, uUnit, &bLayered);
-        GetStateVari(GL_IMAGE_BINDING_LAYER, uUnit, &iLayer);
-        GetStateVari(GL_IMAGE_BINDING_ACCESS, uUnit, &kCache.m_kConfiguration.m_eAccess);
-        GetStateVari(GL_IMAGE_BINDING_FORMAT, uUnit, &iFormat);
-
-        kCache.m_kConfiguration.m_eFormat = (GLenum)iFormat;
-        kCache.m_kConfiguration.m_iLayer = bLayered ? iLayer : -1;
-        kCache.m_kTextureName = iTexture == 0 ? CResourceName() : m_pDevice->GetTextureNamePool().Create((GLuint)iTexture);
-
-        return true;
-    }
-
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-    template <typename T>
-    void GetVertexAttrib(GLuint uSlot, GLenum eParameter, T* pValue)
-    {
-        GLint iValue;
-        glGetVertexAttribiv(uSlot, eParameter, &iValue);
-        *pValue = (T)iValue;
-    }
-
-    bool CContext::GetInputAssemblerCache(SInputAssemblerCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetInputAssemblerCache")
-
-        GLint iNumVertexAttribs(m_pDevice->GetAdapter()->m_kCapabilities.m_iMaxVertexAttribs);
-        if (iNumVertexAttribs > sizeof(kCache.m_uVertexAttribsEnabled) * 8)
-        {
-            DXGL_WARNING("Currently %d vertex attribute slots supported at most, additional attributes will not be used", (int)sizeof(kCache.m_uVertexAttribsEnabled) * 8);
-            iNumVertexAttribs = sizeof(kCache.m_uVertexAttribsEnabled) * 8;
-        }
-
-        kCache.m_uVertexAttribsEnabled = 0;
-        uint32 uSlot;
-        for (uSlot = 0; uSlot < iNumVertexAttribs; ++uSlot)
-        {
-            GLint iEnabled;
-            glGetVertexAttribiv(uSlot, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &iEnabled);
-            if (iEnabled != GL_FALSE)
-            {
-                kCache.m_uVertexAttribsEnabled |= 1 << uSlot;
-            }
-
-            GetVertexAttrib(uSlot, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, &kCache.m_auVertexAttribDivisors[uSlot]);
-        }
-
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        if (m_pDevice->GetFeatureSpec().m_kFeatures.Get(eF_VertexAttribBinding))
-        {
-            for (uint32 uSlot = 0; uSlot < iNumVertexAttribs; ++uSlot)
-            {
-                GetVertexAttrib(uSlot, GL_VERTEX_ATTRIB_ARRAY_SIZE,        &kCache.m_aVertexAttribFormats[uSlot].m_iSize);
-                GetVertexAttrib(uSlot, GL_VERTEX_ATTRIB_RELATIVE_OFFSET,   &kCache.m_aVertexAttribFormats[uSlot].m_uRelativeOffset);
-                GetVertexAttrib(uSlot, GL_VERTEX_ATTRIB_ARRAY_TYPE,        &kCache.m_aVertexAttribFormats[uSlot].m_eType);
-                GetVertexAttrib(uSlot, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,  &kCache.m_aVertexAttribFormats[uSlot].m_bNormalized);
-                GetVertexAttrib(uSlot, GL_VERTEX_ATTRIB_ARRAY_INTEGER,     &kCache.m_aVertexAttribFormats[uSlot].m_bInteger);
-
-                GetVertexAttrib(uSlot, GL_VERTEX_ATTRIB_BINDING, &kCache.m_auVertexBindingIndices[uSlot]);
-            }
-
-            const GLint iNumVertexAttribBindings(m_pDevice->GetAdapter()->m_kCapabilities.m_iMaxVertexAttribBindings);
-
-            for (uint32 uBinding = 0; uBinding < iNumVertexAttribBindings; ++uBinding)
-            {
-                GetStateVari(GL_VERTEX_BINDING_DIVISOR, uBinding, kCache.m_auVertexBindingDivisors + uBinding);
-            }
-            kCache.m_iLastNonZeroBindingSlot = -1;
-        }
-#endif //DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-
-        return true;
-    }
-
-    bool CContext::GetImplicitStateCache(SImplicitStateCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetImplicitStateCache")
-
-#if DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-        if (m_pDevice->GetFeatureSpec().m_kFeatures.Get(eF_MultiSampledTextures))
-        {
-            // Direct3D11 supports at most 32 bit sample mask
-            GetStateVari(GL_SAMPLE_MASK_VALUE, 0, &kCache.m_aSampleMask);
-            kCache.m_bSampleMaskEnabled = glIsEnabled(GL_SAMPLE_MASK) == GL_TRUE;
-        }
-#endif //DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-
-        GLuint uDrawFrameBuffer;
-        GLuint uReadFrameBuffer;
-#if defined(IOS)
-        uDrawFrameBuffer = 1;
-        uReadFrameBuffer = 0;
-#else
-        GetStateVar(GL_DRAW_FRAMEBUFFER_BINDING, &uDrawFrameBuffer);
-        GetStateVar(GL_READ_FRAMEBUFFER_BINDING, &uReadFrameBuffer);
-#endif
-        kCache.m_kDrawFrameBuffer = m_pDevice->GetFrameBufferNamePool().Create(uDrawFrameBuffer);
-        kCache.m_kReadFrameBuffer = m_pDevice->GetFrameBufferNamePool().Create(uReadFrameBuffer);
-
-        GetStateVar(GL_BLEND_COLOR,              kCache.m_akBlendColor.m_afRGBA);
-
-        GetStateVar(GL_UNPACK_ROW_LENGTH,        &kCache.m_iUnpackRowLength);
-        GetStateVar(GL_UNPACK_IMAGE_HEIGHT,      &kCache.m_iUnpackImageHeight);
-        GetStateVar(GL_UNPACK_ALIGNMENT,         &kCache.m_iUnpackAlignment);
-        GetStateVar(GL_PACK_ROW_LENGTH,          &kCache.m_iPackRowLength);
-#if !DXGLES
-        GetStateVar(GL_PACK_IMAGE_HEIGHT,        &kCache.m_iPackImageHeight);
-#endif //!DXGLES
-        GetStateVar(GL_PACK_ALIGNMENT,           &kCache.m_iPackAlignment);
-
-        GetStateVar(GL_ACTIVE_TEXTURE,           &kCache.m_glActiveTexture);
-
-#if DXGL_SUPPORT_TESSELLATION
-        GetStateVar(GL_PATCH_VERTICES,           &kCache.m_iNumPatchControlPoints);
-#endif //DXGL_SUPPORT_TESSELLATION
-
-#if !DXGLES
-        kCache.m_bFrameBufferSRGBEnabled = glIsEnabled(GL_FRAMEBUFFER_SRGB) == GL_TRUE;
-#endif //!DXGLES
-
-#if DXGL_SUPPORT_VIEWPORT_ARRAY
-        for (uint32 uViewport = 0; uViewport < DXGL_NUM_SUPPORTED_VIEWPORTS; ++uViewport)
-        {
-            GetStateVari(GL_VIEWPORT,    uViewport, kCache.m_akViewportData + 4 * uViewport);
-            GetStateVari(GL_DEPTH_RANGE, uViewport, kCache.m_akDepthRangeData + 2 * uViewport);
-        }
-#else
-        GetStateVar(GL_VIEWPORT,    kCache.m_akViewportData);
-        GetStateVar(GL_DEPTH_RANGE, kCache.m_akDepthRangeData);
-#endif
-
-        for (uint32 uBufferBinding = 0; uBufferBinding < eBB_NUM; ++uBufferBinding)
-        {
-            GLuint uBufferBound(0);
-            GetStateVar(GetBufferBindingPoint((EBufferBinding)uBufferBinding), &uBufferBound);
-            kCache.m_akBuffersBound[uBufferBinding] = uBufferBound == 0 ? CResourceName() : m_pDevice->GetBufferNamePool().Create(uBufferBound);
-        }
-
-        const SCapabilities& kCapabilities = m_pDevice->GetAdapter()->m_kCapabilities;
-
-        uint32 uNumUniformBuffers = kCapabilities.m_akResourceUnits[eRUT_UniformBuffer].m_aiMaxTotal;
-        for (uint32 uIndex = 0; uIndex < uNumUniformBuffers && uIndex < MAX_UNIFORM_BUFFER_UNITS; ++uIndex)
-        {
-            GLint uBufferBound(0);
-            // Qualcomm driver crash when calling glGetIntegeri_v with GL_UNIFORM_BUFFER_BINDING.
-            // We use the initial value specified by the OpenGLES standard (0)
-            if (m_pDevice->GetAdapter()->m_sVersion.ToUint() != DXGLES_VERSION_30)
-            {
-                GetStateVari(GL_UNIFORM_BUFFER_BINDING, uIndex, &uBufferBound);
-            }
-            kCache.m_akUniformBuffersBound[uIndex] = uBufferBound == 0 ? CResourceName() : m_pDevice->GetBufferNamePool().Create(uBufferBound);
-        }
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        uint32 uNumStorageBuffers = kCapabilities.m_akResourceUnits[eRUT_StorageBuffer].m_aiMaxTotal;
-        for (uint32 uIndex = 0; uIndex < uNumStorageBuffers; ++uIndex)
-        {
-            GLuint uBufferBound(0);
-            GetStateVari(GL_SHADER_STORAGE_BUFFER_BINDING, uIndex, &uBufferBound);
-            kCache.m_akStorageBuffersBound[uIndex] = uBufferBound == 0 ? CResourceName() : m_pDevice->GetBufferNamePool().Create(uBufferBound);
-        }
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-        return true;
-    }
-
-    struct SSetTargetIndependentBlendState
-    {
-        static inline void SetBlendEnable(bool bEnable, GLuint)                                           { SetEnabledState(GL_BLEND, bEnable); }
-        static inline void SetBlendEquation(GLenum eRGBA, GLuint)                                         { glBlendEquation(eRGBA); }
-        static inline void SetBlendFunction(SBlendFunction kRGBA, GLuint)                                 { glBlendFunc(kRGBA.m_eSrc, kRGBA.m_eDst); }
-        static inline void SetBlendEquation(GLenum eRGB, GLenum eAlpha, GLuint)                           { glBlendEquationSeparate(eRGB, eAlpha); }
-        static inline void SetBlendFunction(SBlendFunction kRGB, SBlendFunction kAlpha, GLuint)           { glBlendFuncSeparate(kRGB.m_eSrc, kRGB.m_eDst, kAlpha.m_eSrc, kAlpha.m_eDst); }
-        static inline void SetWriteMask(const GLboolean abRGBA[4], GLuint)                                { glColorMask(abRGBA[0], abRGBA[1], abRGBA[2], abRGBA[3]); }
-    };
-
-    struct SSetTargetDependentBlendState
-    {
-        static inline void SetBlendEnable(bool bEnable, GLuint uTarget)                                   { SetEnabledStatei(GL_BLEND, uTarget, bEnable); }
-        static inline void SetBlendEquation(GLenum eRGBA, GLuint uTarget)                                 { glBlendEquationi(uTarget, eRGBA); }
-        static inline void SetBlendFunction(SBlendFunction kRGBA, GLuint uTarget)                         { glBlendFunci(uTarget, kRGBA.m_eSrc, kRGBA.m_eDst); }
-        static inline void SetBlendEquation(GLenum eRGB, GLenum eAlpha, GLuint uTarget)                   { glBlendEquationSeparatei(uTarget, eRGB, eAlpha); }
-        static inline void SetBlendFunction(SBlendFunction kRGB, SBlendFunction kAlpha, GLuint uTarget)   { glBlendFuncSeparatei(uTarget, kRGB.m_eSrc, kRGB.m_eDst, kAlpha.m_eSrc, kAlpha.m_eDst); }
-        static inline void SetWriteMask(const GLboolean abRGBA[4], GLuint uTarget)                        { glColorMaski(uTarget, abRGBA[0], abRGBA[1], abRGBA[2], abRGBA[3]); }
-    };
-
-    template <typename TSetBlendState>
-    void SetChannelsBlendState(STargetBlendState& kRTCache, const STargetBlendState& kRTState, GLuint uTargetIndex)
-    {
-        if (CACHE_FIELD(kRTCache, kRTState, m_kRGB.m_eEquation))
-        {
-            TSetBlendState::SetBlendEquation(kRTState.m_kRGB.m_eEquation, uTargetIndex);
-        }
-
-        if (CACHE_FIELD(kRTCache, kRTState, m_kRGB.m_kFunction))
-        {
-            TSetBlendState::SetBlendFunction(kRTState.m_kRGB.m_kFunction, uTargetIndex);
-        }
-    }
-
-    template <typename TSetBlendState>
-    void SetChannelsBlendStateSeparate(STargetBlendState& kRTCache, const STargetBlendState& kRTState, GLuint uTargetIndex)
-    {
-        bool bNewRGBEquation(CACHE_FIELD(kRTCache, kRTState, m_kRGB.m_eEquation));
-        bool bNewAlphaEquation(CACHE_FIELD(kRTCache, kRTState, m_kAlpha.m_eEquation));
-        if (bNewRGBEquation || bNewAlphaEquation)
-        {
-            TSetBlendState::SetBlendEquation(kRTState.m_kRGB.m_eEquation, kRTState.m_kAlpha.m_eEquation, uTargetIndex);
-        }
-
-        bool bNewRGBFunction(CACHE_FIELD(kRTCache, kRTState, m_kRGB.m_kFunction));
-        bool bNewAlphaFunction(CACHE_FIELD(kRTCache, kRTState, m_kAlpha.m_kFunction));
-        if (bNewRGBFunction || bNewAlphaFunction)
-        {
-            TSetBlendState::SetBlendFunction(kRTState.m_kRGB.m_kFunction, kRTState.m_kAlpha.m_kFunction, uTargetIndex);
-        }
-    }
-
-    template <typename TSetBlendState>
-    void SetTargetsBlendState(STargetBlendState* pRTCache, const STargetBlendState* pRTState, uint32 uNumTargets)
-    {
-        uint32 uTarget;
-        for (uTarget = 0; uTarget < uNumTargets; ++uTarget)
-        {
-            if (CACHE_FIELD(*pRTCache, *pRTState, m_bEnable))
-            {
-                TSetBlendState::SetBlendEnable(pRTState->m_bEnable, uTarget);
-            }
-
-            pRTCache->m_bSeparateAlpha = pRTState->m_bSeparateAlpha;
-
-            if (CACHE_FIELD(*pRTCache, *pRTState, m_kWriteMask))
-            {
-                TSetBlendState::SetWriteMask(pRTState->m_kWriteMask.m_abRGBA, uTarget);
-            }
-
-            if (pRTState->m_bEnable)
-            {
-                if (pRTState->m_bSeparateAlpha)
-                {
-                    SetChannelsBlendStateSeparate<TSetBlendState>(*pRTCache, *pRTState, uTarget);
-                }
-                else
-                {
-                    SetChannelsBlendState<TSetBlendState>(*pRTCache, *pRTState, uTarget);
-                }
-            }
-
-            ++pRTCache;
-            ++pRTState;
-        }
-    }
-
-    bool CContext::SetBlendState(const SBlendState& kState)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetBlendState")        
-        if (kState.m_bIndependentBlendEnable && !m_pDevice->IsFeatureSupported(eF_IndependentBlending))
-        {
-            DXGL_ERROR("Independent blending is not supported on this device.");
-            return false;
-        }
-
-        if (CACHE_FIELD(m_kStateCache.m_kBlend, kState, m_bAlphaToCoverageEnable))
-        {
-            SetEnabledState(GL_SAMPLE_ALPHA_TO_COVERAGE, kState.m_bAlphaToCoverageEnable);
-        }
-
-        if (kState.m_bIndependentBlendEnable)
-        {
-            SetTargetsBlendState<SSetTargetDependentBlendState>(m_kStateCache.m_kBlend.m_kTargets, kState.m_kTargets, DXGL_ARRAY_SIZE(kState.m_kTargets));
-        }
-        else
-        {
-            SetTargetsBlendState<SSetTargetIndependentBlendState>(m_kStateCache.m_kBlend.m_kTargets, kState.m_kTargets, 1);
-            uint32 uOverriddenTarget;
-            for (uOverriddenTarget = 1; uOverriddenTarget < DXGL_ARRAY_SIZE(kState.m_kTargets); ++uOverriddenTarget)
-            {
-                m_kStateCache.m_kBlend.m_kTargets[uOverriddenTarget] = m_kStateCache.m_kBlend.m_kTargets[0];
-            }
-        }
-
-        return true;
-    }
-
-    void CContext::SetSampleMask(GLbitfield aSampleMask)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetSampleMask")
-
-#if DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-        if (m_pDevice->IsFeatureSupported(eF_MultiSampledTextures))
-        {
-            // Automatically enable/disable sample masking according to the mask value
-            bool bSampleMaskEnabled(aSampleMask != ~(GLuint)0);
-            if (CACHE_VAR(m_kStateCache.m_bSampleMaskEnabled, bSampleMaskEnabled))
-            {
-                SetEnabledState(GL_SAMPLE_MASK, bSampleMaskEnabled);
-            }
-
-            if (bSampleMaskEnabled)
-            {
-                if (CACHE_VAR(m_kStateCache.m_aSampleMask, aSampleMask))
-                {
-                    glSampleMaski(0, aSampleMask);
-                }
-            }
-        }
-#endif //DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-    }
-
-    void CContext::SetBlendColor(GLfloat fRed, GLfloat fGreen, GLfloat fBlue, GLfloat fAlpha)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetBlendColor")
-
-        SColor kBlendColor;
-        kBlendColor.m_afRGBA[0] = fRed;
-        kBlendColor.m_afRGBA[1] = fGreen;
-        kBlendColor.m_afRGBA[2] = fBlue;
-        kBlendColor.m_afRGBA[3] = fAlpha;
-        if (CACHE_VAR(m_kStateCache.m_akBlendColor, kBlendColor))
-        {
-            glBlendColor(fRed, fGreen, fBlue, fAlpha);
-        }
-    }
-
-    void SetStencilState(
-        GLenum eFace,
-        SDepthStencilState::SFace& kDSCache, const SDepthStencilState::SFace& kDSState,
-        GLint& iRefCache, GLint iRefState)
-    {
-        if (CACHE_FIELD(kDSCache, kDSState, m_uStencilWriteMask))
-        {
-            glStencilMaskSeparate(eFace, kDSState.m_uStencilWriteMask);
-        }
-
-        DXGL_TODO("Verify that glStencilFuncSeparate works as intended: specification is (face, func...) , while glew declares as (frontfunc, backfunc...)");
-        bool bNewStencilFunc(CACHE_FIELD(kDSCache, kDSState, m_eFunction));
-        bool bNewRef(CACHE_VAR(iRefCache, iRefState));
-        bool bNewStencilReadMask(CACHE_FIELD(kDSCache, kDSState, m_uStencilReadMask));
-        if (bNewStencilFunc || bNewRef || bNewStencilReadMask)
-        {
-            glStencilFuncSeparate(eFace, kDSState.m_eFunction, iRefState, kDSState.m_uStencilReadMask);
-        }
-
-        bool bNewStencilFailOperation(CACHE_FIELD(kDSCache, kDSState, m_eStencilFailOperation));
-        bool bNewDepthFailOperation(CACHE_FIELD(kDSCache, kDSState, m_eDepthFailOperation));
-        bool bNewDepthPassOperation(CACHE_FIELD(kDSCache, kDSState, m_eDepthPassOperation));
-        if (bNewStencilFailOperation || bNewDepthFailOperation || bNewDepthPassOperation)
-        {
-            glStencilOpSeparate(eFace, kDSState.m_eStencilFailOperation, kDSState.m_eDepthFailOperation, kDSState.m_eDepthPassOperation);
-        }
-    }
-
-    bool CContext::SetDepthStencilState(
-        const SDepthStencilState& kDSState,
-        GLint iStencilRef)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetDepthStencilState")
-
-        SDepthStencilCache & kDSCache(m_kStateCache.m_kDepthStencil);
-        SStencilRefCache& kRefCache(m_kStateCache.m_kStencilRef);
-
-        if (CACHE_FIELD(kDSCache, kDSState, m_bDepthTestingEnabled))
-        {
-            SetEnabledState(GL_DEPTH_TEST, kDSState.m_bDepthTestingEnabled);
-        }
-
-        if (kDSState.m_bDepthTestingEnabled)
-        {
-            if (CACHE_FIELD(kDSCache, kDSState, m_eDepthTestFunc))
-            {
-                glDepthFunc(kDSState.m_eDepthTestFunc);
-            }
-        }
-
-        if (CACHE_FIELD(kDSCache, kDSState, m_bDepthWriteMask))
-        {
-            glDepthMask(kDSState.m_bDepthWriteMask);
-        }
-
-        if (CACHE_FIELD(kDSCache, kDSState, m_bStencilTestingEnabled))
-        {
-            SetEnabledState(GL_STENCIL_TEST, kDSState.m_bStencilTestingEnabled);
-        }
-
-        if (kDSState.m_bStencilTestingEnabled)
-        {
-            SetStencilState(GL_BACK,  kDSCache.m_kStencilBackFaces,  kDSState.m_kStencilBackFaces,  kRefCache.m_iBackFacesReference,  iStencilRef);
-            SetStencilState(GL_FRONT, kDSCache.m_kStencilFrontFaces, kDSState.m_kStencilFrontFaces, kRefCache.m_iFrontFacesReference, iStencilRef);
-        }
-
-        return true;
-    }
-
-    bool CContext::SetRasterizerState(const SRasterizerState& kState)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetRasterizerState")
-
-        SRasterizerCache & kCache(m_kStateCache.m_kRasterizer);
-
-        if (CACHE_FIELD(kCache, kState, m_bCullingEnabled))
-        {
-            SetEnabledState(GL_CULL_FACE, kState.m_bCullingEnabled);
-        }
-
-        if (kState.m_bCullingEnabled)
-        {
-            if (CACHE_FIELD(kCache, kState, m_eCullFaceMode))
-            {
-                glCullFace(kState.m_eCullFaceMode);
-            }
-        }
-
-        if (CACHE_FIELD(kCache, kState, m_eFrontFaceMode))
-        {
-            glFrontFace(kState.m_eFrontFaceMode);
-        }
-
-        kCache.m_bPolygonOffsetEnabled = kState.m_bPolygonOffsetEnabled;
-#if !DXGLES
-        switch (kState.m_ePolygonMode)
-        {
-        case GL_FILL:
-            if (CACHE_VAR(kCache.m_bPolygonOffsetFillEnabled, kState.m_bPolygonOffsetEnabled))
-            {
-                SetEnabledState(GL_POLYGON_OFFSET_FILL, kState.m_bPolygonOffsetEnabled);
-            }
-            break;
-        case GL_LINE:
-            if (CACHE_VAR(kCache.m_bPolygonOffsetLineEnabled, kState.m_bPolygonOffsetEnabled))
-            {
-                SetEnabledState(GL_POLYGON_OFFSET_LINE, kState.m_bPolygonOffsetEnabled);
-            }
-            break;
-        default:
-            DXGL_WARNING("Unexpected value for GL_POLYGON_MODE - should be GL_LINE or GL_FILL");
-            break;
-        }
-#else
-        if (CACHE_VAR(kCache.m_bPolygonOffsetFillEnabled, kState.m_bPolygonOffsetEnabled))
-        {
-            SetEnabledState(GL_POLYGON_OFFSET_FILL, kState.m_bPolygonOffsetEnabled);
-        }
-#endif
-
-        if (kState.m_bPolygonOffsetEnabled)
-        {
-            bool bNewUnits(CACHE_FIELD(kCache, kState, m_fPolygonOffsetUnits));
-            bool bNewFactor(CACHE_FIELD(kCache, kState, m_fPolygonOffsetFactor));
-            if (bNewUnits || bNewFactor)
-            {
-                glPolygonOffset(kState.m_fPolygonOffsetFactor, kState.m_fPolygonOffsetUnits);
-            }
-        }
-
-        if (CACHE_FIELD(kCache, kState, m_bScissorEnabled))
-        {
-            SetEnabledState(GL_SCISSOR_TEST, kState.m_bScissorEnabled);
-        }
-
-#if !DXGLES
-        if (CACHE_FIELD(kCache, kState, m_bMultisampleEnabled))
-        {
-            SetEnabledState(GL_MULTISAMPLE, kState.m_bMultisampleEnabled);
-        }
-#endif
-
-        bool bDepthClamp(!kState.m_bDepthClipEnabled);
-        AZ_Assert(!(bDepthClamp && !GetDevice()->IsFeatureSupported(eF_DepthClipping)), "DepthClipping is not supported on this device");
-#if DXGL_SUPPORT_DEPTH_CLAMP
-        if (CACHE_FIELD(kCache, kState, m_bDepthClipEnabled))
-        {
-            SetEnabledState(GL_DEPTH_CLAMP, bDepthClamp);
-        }
-#else
-        if (CACHE_VAR(m_kPipelineConfiguration.m_bEmulateDepthClamp, bDepthClamp))
-        {
-            m_bPipelineDirty = true;
-        }
-#endif
-
-#if !DXGLES && !defined(DXGL_ANDROID_GL) && !defined(DXGL_SKIP_SETTING_POLYGON_MODE_TO_FRONT_AND_BACK)
-        if (CACHE_FIELD(kCache, kState, m_ePolygonMode))
-        {
-            glPolygonMode(GL_FRONT_AND_BACK, kState.m_ePolygonMode);
-        }
-
-        if (CACHE_FIELD(kCache, kState, m_bLineSmoothEnabled))
-        {
-            SetEnabledState(GL_LINE_SMOOTH, kState.m_bLineSmoothEnabled);
-        }
-#endif //!DXGLES && !defined(DXGL_ANDROID_GL)
-
-        return true;
-    }
-
-    void CContext::FlushTextureUnits()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushTextureUnits");
-
-        const SUnitMap* pTextureUnitMap = m_apResourceUnitMaps[eRUT_Texture];
-
-        if (m_abResourceUnitsDirty[eRUT_Texture] && pTextureUnitMap != NULL)
-        {
-            m_kTextureUnitContext.m_kModifiedTextures.clear();
-            uint32 uNumMapElements(pTextureUnitMap->m_uNumUnits);
-
-            for (uint32 uMapElement = 0; uMapElement < uNumMapElements; ++uMapElement)
-            {
-                SUnitMap::SElement kMapElement(pTextureUnitMap->m_akUnits[uMapElement]);
-                uint32 uUnit(kMapElement.GetTextureUnit());
-                uint32 uTextureSlot(kMapElement.GetTextureSlot());
-
-                CRY_ASSERT(uTextureSlot < MAX_TEXTURE_SLOTS);
-                CRY_ASSERT(uUnit < MAX_TEXTURE_UNITS);
-
-                STextureUnitCache& kCache(m_kStateCache.m_akTextureUnits[uUnit]);
-                SShaderTextureBasedView* pTextureView(m_akTextureSlots[uTextureSlot].m_pView);
-
-                SSamplerState* pSamplerState(NULL);
-                if (kMapElement.HasSampler())
-                {
-                    uint32 uSamplerSlot(kMapElement.GetSamplerSlot());
-                    CRY_ASSERT(uSamplerSlot < MAX_SAMPLER_SLOTS);
-                    pSamplerState = m_akSamplerSlots[uSamplerSlot].m_pSampler;
-                }
-
-                SSamplerState kNullSamplerState;
-                if (pSamplerState == NULL)
-                {
-                    kNullSamplerState.m_uSamplerObjectMip = 0;
-                    kNullSamplerState.m_uSamplerObjectNoMip = 0;
-                    pSamplerState = &kNullSamplerState;
-                }
-
-                if (pTextureView != NULL &&
-                    pTextureView->BindTextureUnit(pSamplerState, m_kTextureUnitContext, this, m_kStateCache.m_akTextureUnits[m_kStateCache.m_glActiveTexture - GL_TEXTURE0]))
-                {
-                    bool bNewTexture(CACHE_FIELD(kCache, m_kTextureUnitContext.m_kCurrentUnitState, m_kTextureName));
-                    bool bNewTarget(CACHE_FIELD(kCache, m_kTextureUnitContext.m_kCurrentUnitState, m_eTextureTarget));
-                    if (bNewTexture || bNewTarget)
-                    {
-                        if (CACHE_VAR(m_kStateCache.m_glActiveTexture, GL_TEXTURE0 + uUnit))
-                        {
-                            glActiveTexture(m_kStateCache.m_glActiveTexture);
-                        }
-
-                        glBindTexture(kCache.m_eTextureTarget, kCache.m_kTextureName.GetName());
-                    }
-
-                    if (CACHE_FIELD(kCache, m_kTextureUnitContext.m_kCurrentUnitState, m_uSampler))
-                    {
-                        glBindSampler(uUnit, kCache.m_uSampler);
-                    }
-                }
-                else
-                {
-                    GLenum eOldTarget(kCache.m_eTextureTarget);
-                    if (CACHE_VAR(kCache.m_kTextureName, CResourceName()) && eOldTarget != 0)
-                    {
-                        if (CACHE_VAR(m_kStateCache.m_glActiveTexture, GL_TEXTURE0 + uUnit))
-                        {
-                            glActiveTexture(m_kStateCache.m_glActiveTexture);
-                        }
-
-                        glBindTexture(eOldTarget, 0);
-                    }
-                }
-            }
-
-            uint32 uTexReset;
-            for (uTexReset = 0; uTexReset < m_kTextureUnitContext.m_kModifiedTextures.size(); ++uTexReset)
-            {
-                m_kTextureUnitContext.m_kModifiedTextures.at(uTexReset)->m_pBoundModifier = NULL;
-            }
-
-            m_abResourceUnitsDirty[eRUT_Texture] = false;
-        }
-    }
-
-    void CContext::FlushUniformBufferUnits()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushUniformBufferUnits");
-
-        bool bUniformBuffersDirty = m_abResourceUnitsDirty[eRUT_UniformBuffer];
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        bUniformBuffersDirty |= SGlobalConfig::iStreamingConstantBuffersMode > 0;
-#endif
-
-        const SUnitMap* pUniformBufferUnitMap = m_apResourceUnitMaps[eRUT_UniformBuffer];
-        if (bUniformBuffersDirty && pUniformBufferUnitMap != NULL)
-        {
-            uint32 uNumUnits = pUniformBufferUnitMap->m_uNumUnits;
-            const SUnitMap::SElement* pUnitsBegin = pUniformBufferUnitMap->m_akUnits;
-            const SUnitMap::SElement* pUnitsEnd   = pUnitsBegin + uNumUnits;
-            for (const SUnitMap::SElement* pUnit = pUnitsBegin; pUnit < pUnitsEnd; ++pUnit)
-            {
-                SUnitMap::SElement kUnit = *pUnit;
-                uint16 uSlot = kUnit.GetResourceSlot();
-                uint16 uUnit = kUnit.GetResourceUnit();
-
-                CRY_ASSERT(uSlot < MAX_CONSTANT_BUFFER_SLOTS);
-                CRY_ASSERT(uUnit < MAX_UNIFORM_BUFFER_UNITS);
-
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-                if (SGlobalConfig::iStreamingConstantBuffersMode > 0)
-                {
-                    m_kStreamingBuffers.UploadAndBindUniformData(this, m_akConstantBufferSlots[uSlot], uUnit);
-                }
-                else
-                {
-                    SBuffer* pBuffer = m_akConstantBufferSlots[uSlot].m_pBuffer;
-                    if (pBuffer == NULL)
-                    {
-                        BindUniformBuffer(TIndexedBufferBinding(), uUnit);
-                    }
-                    else
-                    {
-                        pBuffer->m_kCreationFence.IssueWait(this);
-                        BindUniformBuffer(TIndexedBufferBinding(pBuffer->m_kName, m_akConstantBufferSlots[uSlot].m_kRange), uUnit);
-                    }
-                }
-#else
-                BindUniformBuffer(m_akConstantBufferSlots[uSlot], uUnit);
-#endif
-            }
-        }
-
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        if (SGlobalConfig::iStreamingConstantBuffersMode > 0)
-        {
-            m_kStreamingBuffers.FlushUniformData();
-        }
-#endif
-    }
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-    void CContext::FlushStorageBufferUnits()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushStorageBufferUnits");
-
-        const SUnitMap* pStorageBufferUnitMap = m_apResourceUnitMaps[eRUT_StorageBuffer];
-
-        if (m_abResourceUnitsDirty[eRUT_StorageBuffer] && pStorageBufferUnitMap != NULL)
-        {
-            uint32 uNumUnits = pStorageBufferUnitMap->m_uNumUnits;
-            const SUnitMap::SElement* pUnitsBegin = pStorageBufferUnitMap->m_akUnits;
-            const SUnitMap::SElement* pUnitsEnd   = pUnitsBegin + uNumUnits;
-            for (const SUnitMap::SElement* pUnit = pUnitsBegin; pUnit < pUnitsEnd; ++pUnit)
-            {
-                SUnitMap::SElement kUnit = *pUnit;
-                uint16 uSlot = kUnit.GetResourceSlot();
-                uint16 uUnit = kUnit.GetResourceUnit();
-
-                CRY_ASSERT(uSlot < MAX_STORAGE_BUFFER_SLOTS);
-                CRY_ASSERT(uUnit < MAX_STORAGE_BUFFER_UNITS);
-
-                BindStorageBuffer(m_akStorageBufferSlots[uSlot], uUnit);
-            }
-        }
-    }
-
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-    void CContext::FlushImageUnits()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushImageUnits");
-        if (!m_pDevice->IsFeatureSupported(eF_ShaderImages))
-        {
-            DXGL_ERROR("Shader Images are not supported on this device.");
-            return;
-        }
-
-        const SUnitMap* pImageUnitMap = m_apResourceUnitMaps[eRUT_Image];
-
-        if (m_abResourceUnitsDirty[eRUT_Image] && pImageUnitMap != NULL)
-        {
-            uint32 uNumUnits = pImageUnitMap->m_uNumUnits;
-            const SUnitMap::SElement* pUnitsBegin = pImageUnitMap->m_akUnits;
-            const SUnitMap::SElement* pUnitsEnd   = pUnitsBegin + uNumUnits;
-            for (const SUnitMap::SElement* pUnit = pUnitsBegin; pUnit < pUnitsEnd; ++pUnit)
-            {
-                SUnitMap::SElement kUnit = *pUnit;
-                uint16 uSlot = kUnit.GetResourceSlot();
-                uint16 uUnit = kUnit.GetResourceUnit();
-
-                CRY_ASSERT(uSlot < MAX_IMAGE_SLOTS);
-                CRY_ASSERT(uUnit < MAX_IMAGE_UNITS);
-
-                const SImageUnitCache& kSlot(m_akImageSlots[uSlot]);
-                BindImage(kSlot.m_kTextureName, kSlot.m_kConfiguration, uUnit);
-            }
-        }
-    }
-
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-
-    void CContext::FlushInputAssemblerStateVab()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushInputAssemblerStateVab")
-        if (!m_pDevice->IsFeatureSupported(eF_VertexAttribBinding))
-        {
-            DXGL_ERROR("Vertex attribute binding is not supported on this device");
-            return;
-        }
-
-        if (m_bInputLayoutDirty)
-        {
-            if (m_pInputLayout != NULL)
-            {
-                SInputAssemblerCache::TAttributeBitMask uAttribsEnabled(0);
-
-                GLuint auUpdatedDivisors[MAX_VERTEX_ATTRIB_BINDINGS] = { 0 };
-
-                SInputAssemblerCache::SVertexAttribFormat aUpdatedVertexAttribFormats[MAX_VERTEX_ATTRIBUTES] = {
-                    { 0 }
-                };
-                GLuint aUpdatedVertexBindingIndices[MAX_VERTEX_ATTRIBUTES] = { 0 };
-
-                for (uint32 uSlot = 0; uSlot < m_pInputLayout->m_akVertexAttribFormats.size(); ++uSlot)
-                {
-                    const SInputLayout::SAttributeFormats& kAttrib(m_pInputLayout->m_akVertexAttribFormats[uSlot]);
-                    SInputAssemblerCache::SVertexAttribFormat& kUpdatedVertexAttribFormat(aUpdatedVertexAttribFormats[kAttrib.m_uAttributeIndex]);
-
-                    uAttribsEnabled |= (1 << kAttrib.m_uAttributeIndex);
-
-                    kUpdatedVertexAttribFormat.m_bInteger        = kAttrib.m_bInteger;
-                    kUpdatedVertexAttribFormat.m_bNormalized     = kAttrib.m_bNormalized;
-                    kUpdatedVertexAttribFormat.m_uRelativeOffset = kAttrib.m_uPointerOffset;
-                    kUpdatedVertexAttribFormat.m_eType           = kAttrib.m_eType;
-                    kUpdatedVertexAttribFormat.m_iSize           = kAttrib.m_iDimension;
-
-                    aUpdatedVertexBindingIndices[kAttrib.m_uAttributeIndex] = kAttrib.m_uBindingIndex;
-
-                    auUpdatedDivisors[kAttrib.m_uBindingIndex] = kAttrib.m_uVertexAttribDivisor;
-                }
-
-                SInputAssemblerCache& kCache(m_kStateCache.m_kInputAssembler);
-
-                // loop through all bindings since we don't know how many actually will have VBs bound to them later on.
-                {
-                    const GLint iNumVertexAttribBindings(m_pDevice->GetAdapter()->m_kCapabilities.m_iMaxVertexAttribBindings);
-                    for (uint32 uBindingSlot = 0; uBindingSlot < iNumVertexAttribBindings; ++uBindingSlot)
-                    {
-                        if (CACHE_VAR(kCache.m_auVertexBindingDivisors[uBindingSlot], auUpdatedDivisors[uBindingSlot]))
-                        {
-                            glVertexBindingDivisor(uBindingSlot, auUpdatedDivisors[uBindingSlot]);
-                        }
-                    }
-                }
-
-                // toggle attribute enables/disables for those that we changed
-                SInputAssemblerCache::TAttributeBitMask uAttribEnabledChanged (kCache.m_uVertexAttribsEnabled ^ uAttribsEnabled);
-
-                if (uAttribEnabledChanged)
-                {
-                    const uint32 uMaxChangedVertexAttribIndex = m_pDevice->GetAdapter()->m_kCapabilities.m_iMaxVertexAttribs;
-
-                    for (uint32 uAttribIndex = 0; uAttribIndex < uMaxChangedVertexAttribIndex; ++uAttribIndex)
-                    {
-                        const uint32 uAttribEnabledBit = 1 << uAttribIndex;
-
-                        if (uAttribEnabledChanged & uAttribEnabledBit)
-                        {
-                            if (uAttribsEnabled & uAttribEnabledBit)
-                            {
-                                glEnableVertexAttribArray(uAttribIndex);
-                            }
-                            else
-                            {
-                                glDisableVertexAttribArray(uAttribIndex);
-                            }
-                        }
-                    }
-                    kCache.m_uVertexAttribsEnabled = uAttribsEnabled;
-                }
-
-                // now update the format and bindings for *all* enabled vertex attribs (and not just those that we might just have enabled)
-                {
-                    const GLint iNumVertexAttribs(m_pDevice->GetAdapter()->m_kCapabilities.m_iMaxVertexAttribs);
-                    for (uint32 uAttribIndex = 0; uAttribIndex < iNumVertexAttribs; ++uAttribIndex)
-                    {
-                        const SInputAssemblerCache::SVertexAttribFormat& kUpdatedVertexAttribFormat = aUpdatedVertexAttribFormats[uAttribIndex];
-                        const uint32 uAttribEnabledBit = 1 << uAttribIndex;
-                        const SInputAssemblerCache::TAttributeBitMask uEnabledAttribs = kCache.m_uVertexAttribsEnabled;
-                        if (uEnabledAttribs & uAttribEnabledBit)
-                        {
-                            if (CACHE_VAR(kCache.m_aVertexAttribFormats[uAttribIndex], kUpdatedVertexAttribFormat))
-                            {
-                                if (kUpdatedVertexAttribFormat.m_bInteger)
-                                {
-                                    glVertexAttribIFormat(uAttribIndex, kUpdatedVertexAttribFormat.m_iSize, kUpdatedVertexAttribFormat.m_eType, kUpdatedVertexAttribFormat.m_uRelativeOffset);
-                                }
-                                else
-                                {
-                                    glVertexAttribFormat(uAttribIndex, kUpdatedVertexAttribFormat.m_iSize, kUpdatedVertexAttribFormat.m_eType, kUpdatedVertexAttribFormat.m_bNormalized, kUpdatedVertexAttribFormat.m_uRelativeOffset);
-                                }
-                            }
-
-                            if (CACHE_VAR(kCache.m_auVertexBindingIndices[uAttribIndex],  aUpdatedVertexBindingIndices[uAttribIndex]))
-                            {
-                                glVertexAttribBinding(uAttribIndex, aUpdatedVertexBindingIndices[uAttribIndex]);
-                            }
-                        }
-                    }
-                }
-            }
-
-            m_bInputLayoutDirty = false;
-        }
-
-        if (m_bInputAssemblerSlotsDirty)
-        {
-            GLuint   auUpdatedVertexBindingBuffers[MAX_VERTEX_ATTRIB_BINDINGS] = {0};
-            GLintptr auUpdatedVertexBindingOffsets[MAX_VERTEX_ATTRIB_BINDINGS] = {0};
-            GLsizei  auUpdatedVertexBindingStrides[MAX_VERTEX_ATTRIB_BINDINGS] = {0};
-
-            GLint iLastNonZeroBindingSlot = -1;
-
-            for (int uSlot = 0; uSlot < MAX_VERTEX_ATTRIB_BINDINGS; ++uSlot)
-            {
-                SInputAssemblerSlot& kSlot(m_akInputAssemblerSlots[uSlot]);
-
-                if (kSlot.m_pVertexBuffer)
-                {
-                    auUpdatedVertexBindingBuffers[uSlot] = kSlot.m_pVertexBuffer->m_kName.GetName();
-                    auUpdatedVertexBindingOffsets[uSlot] = GLintptr (kSlot.m_uOffset);
-                    auUpdatedVertexBindingStrides[uSlot] = kSlot.m_uStride;
-                    iLastNonZeroBindingSlot = uSlot;
-                }
-            }
-
-            SInputAssemblerCache& kCache(m_kStateCache.m_kInputAssembler);
-
-            const GLuint uFirstSlotToUpdate = 0;
-            GLuint uBindingSlotsToUpdate = std::max<GLint>(iLastNonZeroBindingSlot, kCache.m_iLastNonZeroBindingSlot) + 1;
-            kCache.m_iLastNonZeroBindingSlot = iLastNonZeroBindingSlot;
-
-            if (uBindingSlotsToUpdate)
-            {
-#if !DXGLES
-                if (m_pDevice->IsFeatureSupported(eF_MultiBind))
-                {
-                    glBindVertexBuffers(uFirstSlotToUpdate, uBindingSlotsToUpdate, auUpdatedVertexBindingBuffers, auUpdatedVertexBindingOffsets, auUpdatedVertexBindingStrides);
-                }
-                else
-#endif //!DXGLES
-                {
-                    for (GLuint uSlot = 0; uSlot < uBindingSlotsToUpdate; ++uSlot)
-                    {
-                        glBindVertexBuffer(uFirstSlotToUpdate + uSlot, auUpdatedVertexBindingBuffers[uSlot], auUpdatedVertexBindingOffsets[uSlot], auUpdatedVertexBindingStrides[uSlot]);
-                    }
-                }
-            }
-            m_bInputAssemblerSlotsDirty = false;
-        }
-    }
-
-#endif //DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-
-    void CContext::FlushInputAssemblerState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushInputAssemblerState")
-
-        if (m_bInputLayoutDirty || m_bInputAssemblerSlotsDirty)
-        {
-            SInputAssemblerCache& kCache(m_kStateCache.m_kInputAssembler);
-
-            uint32 uAttribute(0);
-            uint32 uSlot;
-            SInputAssemblerCache::TAttributeBitMask uAttribsEnabled(0);
-            if (m_pInputLayout != NULL)
-            {
-                for (uSlot = 0; uSlot < DXGL_ARRAY_SIZE(m_akInputAssemblerSlots); ++uSlot)
-                {
-                    if (m_akInputAssemblerSlots[uSlot].m_pVertexBuffer != NULL)
-                    {
-                        BindBuffer(m_akInputAssemblerSlots[uSlot].m_pVertexBuffer, eBB_Array);
-
-                        SInputLayout::TAttributes::const_iterator kAttrIter(m_pInputLayout->m_akSlotAttributes[uSlot].begin());
-                        const SInputLayout::TAttributes::const_iterator kAttrEnd(m_pInputLayout->m_akSlotAttributes[uSlot].end());
-                        for (; kAttrIter != kAttrEnd; ++kAttrIter)
-                        {
-                            SInputAssemblerCache::TAttributeBitMask uFlag(1 << kAttrIter->m_uAttributeIndex);
-                            uAttribsEnabled |= uFlag;
-                            if ((kCache.m_uVertexAttribsEnabled & uFlag) == 0)
-                            {
-                                glEnableVertexAttribArray(kAttrIter->m_uAttributeIndex);
-                            }
-
-                            if (CACHE_VAR(kCache.m_auVertexAttribDivisors[kAttrIter->m_uAttributeIndex], kAttrIter->m_uVertexAttribDivisor))
-                            {
-                                glVertexAttribDivisor(kAttrIter->m_uAttributeIndex, kAttrIter->m_uVertexAttribDivisor);
-                            }
-
-                            GLsizei uStride(m_akInputAssemblerSlots[uSlot].m_uStride);
-                            GLvoid* pPointer(reinterpret_cast<GLvoid*>(static_cast<uintptr_t>(m_akInputAssemblerSlots[uSlot].m_uOffset + kAttrIter->m_uPointerOffset)));
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-                            pPointer = reinterpret_cast<GLbyte*>(pPointer) + m_uVertexOffset * uStride;
-#endif //!DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-
-                            SInputAssemblerCache::SVertexAttribPointer& kVertexAttribPointer(kCache.m_auVertexAttribPointer[kAttrIter->m_uAttributeIndex]);
-
-                            bool bUpdatePointer;
-
-                            bUpdatePointer = CACHE_VAR(kVertexAttribPointer.m_iSize, kAttrIter->m_iDimension);
-                            bUpdatePointer |= CACHE_VAR(kVertexAttribPointer.m_eType, kAttrIter->m_eType);
-                            bUpdatePointer |= CACHE_VAR(kVertexAttribPointer.m_bNormalized, kAttrIter->m_bNormalized);
-                            bUpdatePointer |= CACHE_VAR(kVertexAttribPointer.m_iStride, uStride);
-                            bUpdatePointer |= CACHE_VAR(kVertexAttribPointer.m_pPointer, pPointer);
-                            bUpdatePointer |= CACHE_VAR(kVertexAttribPointer.m_bInteger, static_cast<GLboolean>(kAttrIter->m_bInteger ? GL_TRUE : GL_FALSE));
-
-                            // this cache is temporary disabled - doesn't work as expected.
-                            //if (bUpdatePointer)
-                            {
-                                if (!kAttrIter->m_bInteger)
-                                {
-                                    glVertexAttribPointer(
-                                        kAttrIter->m_uAttributeIndex,
-                                        kAttrIter->m_iDimension,
-                                        kAttrIter->m_eType,
-                                        kAttrIter->m_bNormalized,
-                                        uStride,
-                                        pPointer);
-                                }
-                                else
-                                {
-                                    glVertexAttribIPointer(
-                                        kAttrIter->m_uAttributeIndex,
-                                        kAttrIter->m_iDimension,
-                                        kAttrIter->m_eType,
-                                        uStride,
-                                        pPointer);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            SInputAssemblerCache::TAttributeBitMask uToDisable(kCache.m_uVertexAttribsEnabled & ~uAttribsEnabled);
-
-            for (uSlot = 0; uToDisable != 0; ++uSlot)
-            {
-                if ((uToDisable & 1) != 0)
-                {
-                    glDisableVertexAttribArray(uSlot);
-                }
-                uToDisable = uToDisable >> 1;
-            }
-
-            kCache.m_uVertexAttribsEnabled = uAttribsEnabled;
-
-            m_bInputLayoutDirty = false;
-            m_bInputAssemblerSlotsDirty = false;
-        }
-    }
-
-#if defined(ANDROID)
-    void CContext::FlushFrameBufferDontCareState(bool bOnBind)
-    {
-        if (!m_spFrameBuffer)
-        {
-            return;
-        }
-
-        //  discard the data of the old frame buffer if any.
-        {
-            AZStd::vector<GLenum> drawBuffers;
-            drawBuffers.reserve(SFrameBufferConfiguration::MAX_ATTACHMENTS);
-            for (uint32 uAttachment = 0; uAttachment < SFrameBufferConfiguration::MAX_ATTACHMENTS; ++uAttachment)
-            {
-                SOutputMergerView* pAttachedView(m_spFrameBuffer->m_kConfiguration.m_akAttachments[uAttachment]);
-                if (pAttachedView != nullptr)
-                {
-                    NCryOpenGL::SOutputMergerTextureView* somtv = pAttachedView->AsSOutputMergerTextureView();
-                    if (somtv)
-                    {
-                        NCryOpenGL::STexture* tex = somtv->m_pTexture;
-                        CRY_ASSERT(tex);
-
-                        GLenum eAttachmentID(SFrameBufferConfiguration::AttachmentIndexToID(uAttachment));
-                        AZ_Assert(eAttachmentID != GL_NONE, "Invalid attachment point %d", uAttachment);
-
-                        if (eAttachmentID == GL_DEPTH_ATTACHMENT || eAttachmentID == GL_STENCIL_ATTACHMENT || eAttachmentID == GL_DEPTH_STENCIL_ATTACHMENT)
-                        {
-                            if (bOnBind ? tex->m_bDepthLoadDontCare : tex->m_bDepthStoreDontCareWhenUnbound)
-                            {
-                                drawBuffers.push_back(GL_DEPTH_ATTACHMENT);
-                            }
-
-                            if (bOnBind ? tex->m_bStencilLoadDontCare : tex->m_bStencilStoreDontCareWhenUnbound)
-                            {
-                                drawBuffers.push_back(GL_STENCIL_ATTACHMENT);
-                            }
-                        }
-                        else if (bOnBind ? tex->m_bColorLoadDontCare : tex->m_bColorStoreDontCareWhenUnbound)
-                        {
-                            drawBuffers.push_back(eAttachmentID);
-                        }
-
-                        if (bOnBind)
-                        {
-                            tex->UpdateDontCareActionFlagsOnBound();
-                        }
-                        else
-                        {
-                            tex->UpdateDontCareActionFlagsOnUnbound();
-                        }
-                    }
-                }
-            }
-
-            if (drawBuffers.empty())
-            {
-                return;
-            }
-
-            if (bOnBind)
-            {
-                // In OpenGL(ES) there's no way to tell the driver that we don't want to restore the framebuffer attachments.
-                // Fortunately we can give the driver a hint by doing a clear operation.
-                // https://community.arm.com/graphics/b/blog/posts/mali-performance-2-how-to-correctly-handle-framebuffers
-
-                if (gRenDev->GetFeatures() & RFT_HW_NVIDIA) // Immediate mode rendering doesn't benefit from clearing the buffer
-                {
-                    return;
-                }
-
-                // Make sure that scissor test is disabled as glClearBufferfv is affected as well
-                bool scissorTestState = m_kStateCache.m_kRasterizer.m_bScissorEnabled;
-                if (scissorTestState)
-                {
-                    SetEnabledState(GL_SCISSOR_TEST, false);
-                    m_kStateCache.m_kRasterizer.m_bScissorEnabled = false;
-                }
-
-                AZStd::vector<ClearColorArg> colorBufferArgs;
-                bool clearDepth = false;
-                bool clearStencil = false;
-                for (const GLenum buffer : drawBuffers)
-                {
-                    switch (buffer)
-                    {
-                    case GL_DEPTH_STENCIL_ATTACHMENT:
-                        clearDepth = true;
-                        clearStencil = true;
-                        break;
-                    case GL_DEPTH_ATTACHMENT:
-                        clearDepth = true;
-                        break;
-                    case GL_STENCIL_ATTACHMENT:
-                        clearStencil = true;
-                        break;
-                    default:
-                        colorBufferArgs.push_back(AZStd::make_pair(buffer - GL_COLOR_ATTACHMENT0, ColorF(0.f)));
-                        break;
-                    }
-                }
-
-                ClearRenderTargetInternal(colorBufferArgs);
-                ClearDepthStencilInternal(clearDepth, clearStencil, 0.f, 0);
-
-                // Restore that scissor test switch as specified by the rasterizer state
-                if (scissorTestState)
-                {
-                    SetEnabledState(GL_SCISSOR_TEST, true);
-                    m_kStateCache.m_kRasterizer.m_bScissorEnabled = true;
-                }
-            }
-            else
-            {
-                // Tell the driver that it doesn't need to resolve certain framebuffer attachments into memory.
-                glInvalidateFramebuffer(GL_FRAMEBUFFER, drawBuffers.size(), drawBuffers.data());
-            }
-        }
-    }
-#endif
-#if defined(DXGL_USE_LAZY_CLEAR)
-    void CContext::FlushFrameBufferLazyClearState()
-    {
-        if (!m_spFrameBuffer)
-        {
-            return;
-        }
-
-        //  discard the data of the old frame buffer if any.
-        {
-            GLuint uNumDrawBuffers = 0;
-
-            GLenum depthBuffer = GL_NONE;
-            GLenum stencilBuffer = GL_NONE;
-
-            uint32 uAttachment;
-            for (uAttachment = 0; uAttachment < SFrameBufferConfiguration::MAX_ATTACHMENTS; ++uAttachment)
-            {
-                SOutputMergerView* pAttachedView(m_spFrameBuffer->m_kConfiguration.m_akAttachments[uAttachment]);
-                if (pAttachedView != nullptr)
-                {
-                    NCryOpenGL::SOutputMergerTextureView* somtv = pAttachedView->AsSOutputMergerTextureView();
-                    if (somtv)
-                    {
-                        NCryOpenGL::STexture* tex = somtv->m_pTexture;
-                        CRY_ASSERT(tex);
-
-                        if (tex->m_spViewToClear == pAttachedView)
-                        {
-                            if (tex->m_bClearDepth || tex->m_bClearStencil)
-                            {
-                                ClearDepthStencil(tex->m_spViewToClear, tex->m_bClearDepth, tex->m_bClearStencil, tex->m_fClearDepthValue, tex->m_uClearStencilValue);
-                            }
-                            else
-                            {
-                                ClearRenderTarget(tex->m_spViewToClear, tex->m_ClearColor);
-                            }
-
-                            tex->m_spViewToClear.reset();
-                            tex->m_bClearStencil = false;
-                            tex->m_bClearDepth = false;
-                        }
-                    }
-                }
-            }
-        }
-    }
-#endif
-
-    void CContext::FlushFrameBufferState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushFrameBufferState")
-
-        if (m_bFrameBufferStateDirty)
-        {
-#if defined(ANDROID)
-            FlushFrameBufferDontCareState(false);
-#endif
-
-            m_spFrameBuffer = AllocateFrameBuffer(m_kFrameBufferConfig);
-
-            if (m_spFrameBuffer != NULL)
-            {
-                BindDrawFrameBuffer(m_spFrameBuffer->m_kObject.m_kName);
-#if !DXGLES
-                if (CACHE_VAR(m_kStateCache.m_bFrameBufferSRGBEnabled, m_spFrameBuffer->m_kObject.m_bUsesSRGB))
-                {
-                    SetEnabledState(GL_FRAMEBUFFER_SRGB, m_spFrameBuffer->m_kObject.m_bUsesSRGB);
-                }
-#endif //!DXGLES
-                if (CACHE_VAR(m_spFrameBuffer->m_kObject.m_kDrawMaskCache, m_spFrameBuffer->m_kDrawMask))
-                {
-                    glDrawBuffers(m_spFrameBuffer->m_uNumDrawBuffers, m_spFrameBuffer->m_aeDrawBuffers);
-                }
-
-                uint32 uAttachment;
-                for (uAttachment = 0; uAttachment < SFrameBufferConfiguration::MAX_ATTACHMENTS; ++uAttachment)
-                {
-                    SOutputMergerView* pAttachedView(m_spFrameBuffer->m_kConfiguration.m_akAttachments[uAttachment]);
-                    if (pAttachedView != NULL)
-                    {
-                        pAttachedView->Bind(*m_spFrameBuffer, this);
-                    }
-                }
-
-#if defined(ANDROID)
-                FlushFrameBufferDontCareState(true);
-#endif
-
-                m_bFrameBufferStateDirty = false;
-
-#if defined(DXGL_USE_LAZY_CLEAR)
-                FlushFrameBufferLazyClearState();
-#endif
-            }
-        }
-    }
-
-    void CContext::FlushPipelineState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushPipelineState")
-
-        if (m_bPipelineDirty)
-        {
-            m_spPipeline = AllocatePipeline(m_kPipelineConfiguration);
-            if (m_spPipeline != NULL)
-            {
-#if DXGL_VALIDATE_PROGRAMS_ON_DRAW
-                if (m_pDevice->IsFeatureSupported(eF_SeparablePrograms))
-                {
-                    glValidateProgramPipeline(m_spPipeline->m_uName);
-                    VerifyProgramPipelineStatus(m_spPipeline->m_uName, GL_VALIDATE_STATUS);
-                }
-                else
-                {
-                    glValidateProgram(m_spPipeline->m_uName);
-                    VerifyProgramStatus(m_spPipeline->m_uName, GL_VALIDATE_STATUS);
-                }
-#endif //DXGL_VALIDATE_PROGRAMS_ON_DRAW
-
-                if (m_pDevice->IsFeatureSupported(eF_SeparablePrograms))
-                {
-                    glBindProgramPipeline(m_spPipeline->m_uName);
-                }
-                else
-                {
-                    glUseProgram(m_spPipeline->m_uName);
-                }
-
-                for (uint32 uUnitType = 0; uUnitType < eRUT_NUM; ++uUnitType)
-                {
-                    SUnitMap* pUnitMap = m_spPipeline->m_aspResourceUnitMaps[uUnitType];
-                    m_abResourceUnitsDirty[uUnitType] |= CACHE_VAR(m_apResourceUnitMaps[uUnitType], pUnitMap);
-                }
-            }
-            else
-            {
-                for (uint32 uUnitType = 0; uUnitType < eRUT_NUM; ++uUnitType)
-                {
-                    m_apResourceUnitMaps[uUnitType] = NULL;
-                }
-            }
-
-            m_bPipelineDirty = false;
-        }
-    }
-
-    void CContext::FlushDrawState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushDrawState")
-
-        if (m_pDevice->FlushFrameFence(m_uIndex))
-        {
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-            if (SGlobalConfig::iStreamingConstantBuffersMode > 0)
-            {
-                m_kStreamingBuffers.SwitchFrame(m_pDevice);
-            }
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-#if DXGL_ENABLE_SHADER_TRACING
-            bool bAutoVertexTracing = SGlobalConfig::iShaderTracingMode == 1 && m_uShaderTraceCount == 0;
-            bool bAutoPixelTracing = SGlobalConfig::iShaderTracingMode == 2 && m_uShaderTraceCount == 0;
-            ToggleVertexTracing(bAutoVertexTracing, SGlobalConfig::iShaderTracingHash, SGlobalConfig::iVertexTracingID);
-            TogglePixelTracing(bAutoPixelTracing, SGlobalConfig::iShaderTracingHash, SGlobalConfig::iPixelTracingX, SGlobalConfig::iPixelTracingY);
-#endif //DXGL_ENABLE_SHADER_TRACING
-        }
-
-#if DXGL_ENABLE_SHADER_TRACING
-        FlushShaderTracingState();
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-        if (CACHE_VAR(m_kPipelineConfiguration.m_eMode, ePM_Graphics))
-        {
-            m_bPipelineDirty = true;
-        }
-
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        if (m_pDevice->IsFeatureSupported(eF_VertexAttribBinding))
-        {
-            FlushInputAssemblerStateVab();
-        }
-        else
-#endif //DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        {
-            FlushInputAssemblerState();
-        }
-
-        FlushPipelineState();
-        FlushTextureUnits();
-        FlushUniformBufferUnits();
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        FlushStorageBufferUnits();
-#endif
-#if DXGL_SUPPORT_SHADER_IMAGES
-        if (m_pDevice->IsFeatureSupported(eF_ShaderImages))
-        {
-            FlushImageUnits();
-        }
-#endif
-        FlushFrameBufferState();
-    }
-
-#if DXGL_SUPPORT_COMPUTE
-
-    void CContext::FlushDispatchState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushDispatchState")
-
-        if (CACHE_VAR(m_kPipelineConfiguration.m_eMode, ePM_Compute))
-        {
-            m_bPipelineDirty = true;
-        }
-
-        FlushPipelineState();
-        FlushTextureUnits();
-        FlushUniformBufferUnits();
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        FlushStorageBufferUnits();
-#endif
-#if DXGL_SUPPORT_SHADER_IMAGES
-        if (m_pDevice->IsFeatureSupported(eF_ShaderImages))
-        {
-            FlushImageUnits();
-        }
-#endif
-    }
-
-#endif //DXGL_SUPPORT_COMPUTE
-
-    void CContext::SwitchFrame()
-    {
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        if (SGlobalConfig::iStreamingConstantBuffersMode > 0)
-        {
-            m_kStreamingBuffers.SwitchFrame(m_pDevice);
-        }
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-    }
-
-    void CContext::UpdatePlsState(bool const preFramebufferBind)
-    {
-#if DXGLES
-        if (m_PlsExtensionState && DXGL_GL_EXTENSION_SUPPORTED(EXT_shader_pixel_local_storage))
-        {
-            if (preFramebufferBind && PLS_DISABLE == m_PlsExtensionState)
-            {
-                glDisable(GL_SHADER_PIXEL_LOCAL_STORAGE_EXT);
-                m_PlsExtensionState = PLS_IGNORE;
-            }
-            else if (!preFramebufferBind && PLS_ENABLE == m_PlsExtensionState)
-            {
-                glEnable(GL_SHADER_PIXEL_LOCAL_STORAGE_EXT);
-                m_PlsExtensionState = PLS_IGNORE;
-            }
-        }
-#endif
-    }
-
-    void CContext::BindDrawFrameBuffer(const CResourceName& kName)
-    {
-        DXGL_SCOPED_PROFILE("CContext::BindDrawFrameBuffer")
-
-        if (CACHE_VAR(m_kStateCache.m_kDrawFrameBuffer, kName))
-        {
-            UpdatePlsState(true);
-            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, kName.GetName());
-            m_bFrameBufferStateDirty = true;
-            UpdatePlsState(false);
-        }
-    }
-
-    void CContext::BindReadFrameBuffer(const CResourceName& kName)
-    {
-        DXGL_SCOPED_PROFILE("CContext::BindReadFrameBuffer")
-        if (CACHE_VAR(m_kStateCache.m_kReadFrameBuffer, kName))
-        {
-            //  this improves ProjectLEO behaviour on Mali's firefly device but obviously slows down everything.
-            //  Please, keep this until the Mali's driver bug will be solved completely
-            //glFinish();
-
-            glBindFramebuffer(GL_READ_FRAMEBUFFER, kName.GetName());
-        }
-    }
-
-    void CContext::SetNumPatchControlPoints(GLint iNumPatchControlPoints)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetNumPatchControlPoints");
-
-#if DXGL_SUPPORT_TESSELLATION
-        if (CACHE_VAR(m_kStateCache.m_iNumPatchControlPoints, iNumPatchControlPoints))
-        {
-            glPatchParameteri(GL_PATCH_VERTICES, iNumPatchControlPoints);
-        }
-#else
-        DXGL_WARNING("CContext::SetNumPatchControlPoints - OpenGL(ES) Version does not support tesselation");
-#endif
-    }
-
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-
-    void CContext::SetVertexOffset(uint32 uVertexOffset)
-    {
-        if (CACHE_VAR(m_uVertexOffset, uVertexOffset))
-        {
-            m_bInputLayoutDirty = true;
-        }
-    }
-
-#endif //!DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-
-    GLenum CContext::BindBuffer(const CResourceName& kBufferName, EBufferBinding eBinding)
-    {
-        DXGL_SCOPED_PROFILE("CContext::BindBuffer")
-
-        GLenum eTarget(GetBufferBindingTarget(eBinding));
-        CRY_ASSERT(eTarget != 0);
-        if (CACHE_VAR(m_kStateCache.m_akBuffersBound[eBinding], kBufferName))
-        {
-            glBindBuffer(eTarget, kBufferName.GetName());
-        }
-        return eTarget;
-    }
-
-    GLenum CContext::BindBuffer(SBuffer* pBuffer, EBufferBinding eBinding)
-    {
-        DXGL_SCOPED_PROFILE("CContext::BindBuffer")
-
-        if (pBuffer == NULL)
-        {
-            return BindBuffer(CResourceName(), eBinding);
-        }
-        else
-        {
-            pBuffer->m_kCreationFence.IssueWait(this);
-            return BindBuffer(pBuffer->m_kName, eBinding);
-        }
-    }
-
-    void CContext::BindUniformBuffer(const TIndexedBufferBinding& kBinding, uint32 uUnit)
-    {
-        if (CACHE_VAR(m_kStateCache.m_akUniformBuffersBound[uUnit], kBinding))
-        {
-            //Indexed glBindBufferBase/glBindBufferRange also internally changes the general GL_UNIFORM_BUFFER binding
-            m_kStateCache.m_akBuffersBound[eBB_UniformBuffer] = kBinding.m_kName;
-
-            if (kBinding.m_kRange.m_uOffset == 0 && kBinding.m_kRange.m_uSize == 0)
-            {
-                glBindBufferBase(GL_UNIFORM_BUFFER, uUnit, kBinding.m_kName.GetName());
-            }
-            else
-            {
-                glBindBufferRange(GL_UNIFORM_BUFFER, uUnit, kBinding.m_kName.GetName(), kBinding.m_kRange.m_uOffset, kBinding.m_kRange.m_uSize);
-            }
-        }
-    }
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-    void CContext::BindStorageBuffer(const TIndexedBufferBinding& kBinding, uint32 uUnit)
-    {
-        if (CACHE_VAR(m_kStateCache.m_akStorageBuffersBound[uUnit], kBinding))
-        {
-            //Indexed glBindBufferBase/glBindBufferRange also internally changes the general GL_SHADER_STORAGE_BUFFER binding
-            m_kStateCache.m_akBuffersBound[eBB_ShaderStorage] = kBinding.m_kName;
-
-            if (kBinding.m_kRange.m_uOffset == 0 && kBinding.m_kRange.m_uSize == 0)
-            {
-                glBindBufferBase(GL_SHADER_STORAGE_BUFFER, uUnit, kBinding.m_kName.GetName());
-            }
-            else
-            {
-                glBindBufferRange(GL_SHADER_STORAGE_BUFFER, uUnit, kBinding.m_kName.GetName(), kBinding.m_kRange.m_uOffset, kBinding.m_kRange.m_uSize);
-            }
-        }
-    }
-
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-
-    void CContext::BindImage(const CResourceName& kName, SShaderImageViewConfiguration kConfiguration, uint32 uUnit)
-    {
-        if (!m_pDevice->IsFeatureSupported(eF_ShaderImages))
-        {
-            DXGL_ERROR("Shader Images are not supported on this device.");
-            return;
-        }
-
-        SImageUnitCache& kImageUnit(m_kStateCache.m_akImageUnits[uUnit]);
-        bool bNewTexture = CACHE_VAR(kImageUnit.m_kTextureName, kName);
-        bool bNewConfig  = CACHE_VAR(kImageUnit.m_kConfiguration, kConfiguration);
-        if (bNewTexture || bNewConfig)
-        {
-            glBindImageTexture(
-                uUnit,
-                kName.GetName(),
-                kConfiguration.m_iLevel,
-                kConfiguration.m_iLayer >= 0,
-                kConfiguration.m_iLayer >= 0 ? kConfiguration.m_iLayer : 0,
-                kConfiguration.m_eAccess,
-                kConfiguration.m_eFormat);
-        }
-    }
-
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-    void CContext::SetUnpackRowLength(GLint iValue)
-    {
-        if (CACHE_VAR(m_kStateCache.m_iUnpackRowLength, iValue))
-        {
-            glPixelStorei(GL_UNPACK_ROW_LENGTH, iValue);
-        }
-    }
-
-    void CContext::SetUnpackImageHeight(GLint iValue)
-    {
-        if (CACHE_VAR(m_kStateCache.m_iUnpackImageHeight, iValue))
-        {
-            glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, iValue);
-        }
-    }
-
-    void CContext::SetUnpackAlignment(GLint iValue)
-    {
-        if (CACHE_VAR(m_kStateCache.m_iUnpackAlignment, iValue))
-        {
-            glPixelStorei(GL_UNPACK_ALIGNMENT, iValue);
-        }
-    }
-
-    void CContext::SetPackRowLength(GLint iValue)
-    {
-        if (CACHE_VAR(m_kStateCache.m_iPackRowLength, iValue))
-        {
-            glPixelStorei(GL_PACK_ROW_LENGTH, iValue);
-        }
-    }
-
-    void CContext::SetPackImageHeight(GLint iValue)
-    {
-#if !DXGLES
-        if (CACHE_VAR(m_kStateCache.m_iPackImageHeight, iValue))
-        {
-            glPixelStorei(GL_PACK_IMAGE_HEIGHT, iValue);
-        }
-#else
-        DXGL_WARNING("OpenGL ES does not support GL_PACK_IMAGE_HEIGHT");
-#endif
-    }
-
-    void CContext::SetPackAlignment(GLint iValue)
-    {
-        if (CACHE_VAR(m_kStateCache.m_iPackAlignment, iValue))
-        {
-            glPixelStorei(GL_PACK_ALIGNMENT, iValue);
-        }
-    }
-
-    void CContext::SetViewports(uint32 uNumViewports, const D3D11_VIEWPORT* pViewports)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetViewports")
-
-        if (uNumViewports > DXGL_NUM_SUPPORTED_VIEWPORTS)
-        {
-            DXGL_WARNING("Setting more viewports than supported (" DXGL_QUOTE(NUM_SUPPORTED_VIEWPORTS) "), additional viewports are ignored");
-            uNumViewports = DXGL_NUM_SUPPORTED_VIEWPORTS;
-        }
-
-        TViewportValue* pGLViewportIter(m_kStateCache.m_akViewportData);
-        TDepthRangeValue* pGLDepthRangeIter(m_kStateCache.m_akDepthRangeData);
-        const D3D11_VIEWPORT* pViewport;
-        bool bWantToSetDepthRange = false;
-        for (pViewport = pViewports; pViewport < pViewports + uNumViewports; ++pViewport)
-        {
-            *(pGLViewportIter++) = (TViewportValue)pViewport->TopLeftX;
-            *(pGLViewportIter++) = (TViewportValue)pViewports->TopLeftY;
-            *(pGLViewportIter++) = (TViewportValue)pViewport->Width;
-            *(pGLViewportIter++) = (TViewportValue)pViewport->Height;
-
-            bWantToSetDepthRange |= (pViewport->MinDepth != (*pGLDepthRangeIter));
-            bWantToSetDepthRange |= (pViewport->MaxDepth != (*(pGLDepthRangeIter + 1)));
-
-            *(pGLDepthRangeIter++) = pViewport->MinDepth;
-            *(pGLDepthRangeIter++) = pViewport->MaxDepth;
-        }
-
-        CRY_ASSERT(pGLViewportIter < m_kStateCache.m_akViewportData + sizeof(m_kStateCache.m_akViewportData));
-        CRY_ASSERT(pGLDepthRangeIter < m_kStateCache.m_akDepthRangeData + sizeof(m_kStateCache.m_akDepthRangeData));
-#if DXGL_SUPPORT_VIEWPORT_ARRAY
-        glViewportArrayv(0, uNumViewports, m_kStateCache.m_akViewportData);
-
-        if (bWantToSetDepthRange)
-        {
-            glDepthRangeArrayv(0, uNumViewports, m_kStateCache.m_akDepthRangeData);
-        }
-#else
-        glViewport(
-            m_kStateCache.m_akViewportData[0],
-            m_kStateCache.m_akViewportData[1],
-            m_kStateCache.m_akViewportData[2],
-            m_kStateCache.m_akViewportData[3]);
-
-        if (bWantToSetDepthRange)
-        {
-            glDepthRangef(
-                m_kStateCache.m_akDepthRangeData[0],
-                m_kStateCache.m_akDepthRangeData[1]);
-        }
-#endif
-    }
-
-    void CContext::SetScissorRects(uint32 uNumRects, const D3D11_RECT* pRects)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetScissorRects")
-
-        if (uNumRects > DXGL_NUM_SUPPORTED_SCISSOR_RECTS)
-        {
-            DXGL_WARNING("Setting more scissor rectangles than supported (" DXGL_QUOTE(DXGL_NUM_SUPPORTED_SCISSOR_RECTS) "), additional scissor rectangles are ignored");
-            uNumRects = DXGL_NUM_SUPPORTED_SCISSOR_RECTS;
-        }
-
-        GLint* piScissorIter(m_kStateCache.m_akGLScissorData);
-        const D3D11_RECT* pRect;
-        bool bWantToUpdateScissors = false;
-        for (pRect = pRects; pRect < pRects + uNumRects; ++pRect)
-        {
-            LONG width = pRect->right - pRect->left;
-            LONG height = pRect->bottom - pRect->top;
-
-            bWantToUpdateScissors |= ((*piScissorIter) != pRect->left);
-            bWantToUpdateScissors |= ((*(piScissorIter + 1)) != pRect->top);
-            bWantToUpdateScissors |= ((*(piScissorIter + 2)) != width);
-            bWantToUpdateScissors |= ((*(piScissorIter + 3)) != height);
-
-            *(piScissorIter++) = pRect->left;
-            *(piScissorIter++) = pRect->top;
-            *(piScissorIter++) = width;
-            *(piScissorIter++) = height;
-        }
-        CRY_ASSERT(piScissorIter < m_kStateCache.m_akGLScissorData + sizeof(m_kStateCache.m_akGLScissorData));
-#if DXGL_SUPPORT_SCISSOR_RECT_ARRAY
-        if (bWantToUpdateScissors)
-        {
-            glScissorArrayv(0, uNumRects, m_kStateCache.m_akGLScissorData);
-        }
-#else
-        if (bWantToUpdateScissors)
-        {
-            glScissor(
-                m_kStateCache.m_akGLScissorData[0],
-                m_kStateCache.m_akGLScissorData[1],
-                m_kStateCache.m_akGLScissorData[2],
-                m_kStateCache.m_akGLScissorData[3]);
-        }
-#endif
-    }
-
-    uint32 MatchColorAttachmentIndex(SOutputMergerView* pView, SFrameBufferConfiguration& kFrameBufferConfig)
-    {
-        uint32 uAttachment(0);
-        while (uAttachment < SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS &&
-               kFrameBufferConfig.m_akAttachments[uAttachment] != pView)
-        {
-            ++uAttachment;
-        }
-        return uAttachment;
-    }
-
-    bool MatchDepthStencilAttachment(SOutputMergerView* pView, bool bDepth, bool bStencil, SFrameBufferConfiguration& kFrameBufferConfig)
-    {
-        return (!bDepth   || kFrameBufferConfig.m_akAttachments[SFrameBufferConfiguration::DEPTH_ATTACHMENT_INDEX]   == pView) &&
-               (!bStencil || kFrameBufferConfig.m_akAttachments[SFrameBufferConfiguration::STENCIL_ATTACHMENT_INDEX] == pView);
-    }
-
-    SFrameBufferPtr GetCompatibleColorAttachmentFrameBuffer(SOutputMergerView* pOMView, uint32& uAttachment, CContext* pContext)
-    {
-        // Check if there is a suitable cached frame buffer with this view attached at the requested point
-        SOutputMergerView::SContextData* pOMContextData(pOMView->m_kContextMap[pContext->GetIndex()]);
-        if (pOMContextData != NULL)
-        {
-            uint32 uTexFrameBuffer;
-            for (uTexFrameBuffer = 0; uTexFrameBuffer < pOMContextData->m_kBoundFrameBuffers.size(); ++uTexFrameBuffer)
-            {
-                SFrameBuffer* pTexFrameBuffer(pOMContextData->m_kBoundFrameBuffers.at(uTexFrameBuffer).m_spFrameBuffer);
-                uAttachment = MatchColorAttachmentIndex(pOMView, pTexFrameBuffer->m_kConfiguration);
-
-                // Qualcomm and Mali devices do not appear to support using glDrawBuffers with an attachment index that is not 0.  Force create and cache a new FBO if one does not exist with the 0th index.
-                if (gRenDev->GetFeatures() & (RFT_HW_QUALCOMM | RFT_HW_ARM_MALI))
-                {
-                    if (uAttachment == SFrameBufferConfiguration::FIRST_COLOR_ATTACHMENT_INDEX)
-                    {
-                        return pTexFrameBuffer;
-                    }
-                }
-                else
-                {
-                    if (uAttachment != SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS)
-                    {
-                        return pTexFrameBuffer;
-                    }
-                }
-            }
-        }
-
-        // If not then create a new one specifically for the purpose
-        SFrameBufferConfiguration kCustomConfig;
-        uAttachment = SFrameBufferConfiguration::FIRST_COLOR_ATTACHMENT_INDEX;
-        kCustomConfig.m_akAttachments[uAttachment] = pOMView;
-        return pContext->AllocateFrameBuffer(kCustomConfig);
-    }
-
-    SFrameBufferPtr GetCompatibleDepthStencilAttachmentFrameBuffer(SOutputMergerView* pOMView, bool bDepth, bool bStencil, CContext* pContext)
-    {
-        // Check if there is a suitable cached frame buffer with this view attached at the requested point
-        SOutputMergerView::SContextData* pOMContextData(pOMView->m_kContextMap[pContext->GetIndex()]);
-        if (pOMContextData != NULL)
-        {
-            uint32 uTexFrameBuffer;
-            for (uTexFrameBuffer = 0; uTexFrameBuffer < pOMContextData->m_kBoundFrameBuffers.size(); ++uTexFrameBuffer)
-            {
-                SFrameBuffer* pTexFrameBuffer(pOMContextData->m_kBoundFrameBuffers.at(uTexFrameBuffer).m_spFrameBuffer);
-                if (MatchDepthStencilAttachment(pOMView, bDepth, bStencil, pTexFrameBuffer->m_kConfiguration))
-                {
-                    return pTexFrameBuffer;
-                }
-            }
-        }
-
-        // If not then create a new one specifically for the purpose
-        SFrameBufferConfiguration kCustomConfig;
-        if (bDepth)
-        {
-            kCustomConfig.m_akAttachments[SFrameBufferConfiguration::DEPTH_ATTACHMENT_INDEX] = pOMView;
-        }
-        if (bStencil)
-        {
-            kCustomConfig.m_akAttachments[SFrameBufferConfiguration::STENCIL_ATTACHMENT_INDEX] = pOMView;
-        }
-        return pContext->AllocateFrameBuffer(kCustomConfig);
-    }
-
-    void CContext::ClearRenderTarget(SOutputMergerView* pRenderTargetView, const float afColor[4])
-    {
-        DXGL_SCOPED_PROFILE("CContext::ClearRenderTarget")
-
-        pRenderTargetView->m_kCreationFence.IssueWait(this);
-
-#if defined(ANDROID)
-        NCryOpenGL::SOutputMergerTextureView* somtv = pRenderTargetView->AsSOutputMergerTextureView();
-        if (somtv)
-        {
-            NCryOpenGL::STexture* tex = somtv->m_pTexture;
-            CRY_ASSERT(tex);
-            //  reset invalid state since clear makes the resource valid again
-            tex->m_bColorWasInvalidatedWhenUnbound = false;
-        }
-#endif
-
-        // First see if the view is in the current frame buffer configuration color attachments
-        uint32 uAttachment(MatchColorAttachmentIndex(pRenderTargetView, m_kFrameBufferConfig));
-
-#if defined(DXGL_USE_LAZY_CLEAR)
-        //  this will force lazy clear if the next draw call will switch the rendering layout
-        if (m_bFrameBufferStateDirty)
-        {
-            uAttachment = SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS;
-        }
-#endif
-
-        if (uAttachment != SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS)
-        {
-            FlushFrameBufferState();
-        }
-        else
-        {
-#if defined(DXGL_USE_LAZY_CLEAR)
-            SOutputMergerTextureView* pTextureView = pRenderTargetView ? pRenderTargetView->AsSOutputMergerTextureView() : NULL;
-            STexture* resToClear = pTextureView ? pTextureView->m_pTexture : NULL;
-
-            if (resToClear)
-            {
-                CRY_ASSERT(!resToClear->m_spViewToClear.get() || (resToClear->m_spViewToClear.get() == pRenderTargetView));
-                if (resToClear->m_spViewToClear.get() && (resToClear->m_spViewToClear.get() != pRenderTargetView))
-                {
-                    DXGL_ERROR("Render target's view was already cleared. Don't support multiple view clears on the same texture.");
-                }
-
-#if defined(ANDROID)
-                CRY_ASSERT(!resToClear->m_bColorLoadDontCare);
-                if (resToClear->m_bColorLoadDontCare)
-                {
-                    DXGL_ERROR("Resource was given MTLLoadActionDontCare flag. Render target's view cannot be set to be cleared.");
-                }
-#endif
-
-                //  Store deferred clear information.
-                resToClear->m_spViewToClear = pRenderTargetView;
-                for (int i = 0; i < 4; ++i)
-                {
-                    resToClear->m_ClearColor[i] = afColor[i];
-                }
-
-                return;
-            }
-            //  fallback to old behaviour
-#endif
-
-            SFrameBufferPtr spClearFrameBuffer(GetCompatibleColorAttachmentFrameBuffer(pRenderTargetView, uAttachment, this));
-
-            // Finally bind the suitable frame buffer
-#if !DXGLES
-            if (CACHE_VAR(m_kStateCache.m_bFrameBufferSRGBEnabled, spClearFrameBuffer->m_kObject.m_bUsesSRGB))
-            {
-                SetEnabledState(GL_FRAMEBUFFER_SRGB, spClearFrameBuffer->m_kObject.m_bUsesSRGB);
-            }
-#endif //DXGLES
-            BindDrawFrameBuffer(spClearFrameBuffer->m_kObject.m_kName);
-        }
-
-        uint32 uDrawBufferIndex((uint32)(SFrameBufferConfiguration::AttachmentIndexToID(uAttachment) - GL_COLOR_ATTACHMENT0));
-        AZStd::vector<ClearColorArg> clearArgs;
-        clearArgs.push_back(AZStd::make_pair(uDrawBufferIndex, ColorF(afColor[0], afColor[1], afColor[2], afColor[3])));
-        ClearRenderTargetInternal(clearArgs);
-    }
-
-    void CContext::ClearRenderTargetInternal(const AZStd::vector<ClearColorArg>& args)
-    {
-        if (args.empty())
-        {
-            return;
-        }
-
-        // Make sure the color mask includes all channels as glClearBufferfv is masked as well
-        SColorMask requiredColorMask = {
-            { GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE }
-        };
-        
-        SColorMask originalColorMask(m_kStateCache.m_kBlend.m_kTargets[0].m_kWriteMask);
-        if (requiredColorMask != originalColorMask && !m_pDevice->IsFeatureSupported(eF_IndependentBlending))
-        {
-            SSetTargetIndependentBlendState::SetWriteMask(requiredColorMask.m_abRGBA, 0);
-        }
-
-        // Make sure that scissor test is disabled as glClearBufferfv is affected as well
-        if (m_kStateCache.m_kRasterizer.m_bScissorEnabled)
-        {
-            SetEnabledState(GL_SCISSOR_TEST, false);
-        }
-
-        for (AZStd::vector<ClearColorArg>::const_iterator it = args.begin(); it != args.end(); ++it)
-        {
-            uint32 drawBufferIndex = (*it).first;
-            if (m_pDevice->IsFeatureSupported(eF_IndependentBlending))
-            {
-                SColorMask originalColorMask(m_kStateCache.m_kBlend.m_kTargets[drawBufferIndex].m_kWriteMask);
-                if (requiredColorMask != originalColorMask)
-                {
-                    SSetTargetDependentBlendState::SetWriteMask(requiredColorMask.m_abRGBA, drawBufferIndex);
-                }
-            }
-
-            const ColorF color = (*it).second;
-            const float clearColor[] = { color.r, color.g, color.b, color.a };
-            glClearBufferfv(GL_COLOR, drawBufferIndex, clearColor);
-
-            if (m_pDevice->IsFeatureSupported(eF_IndependentBlending) && requiredColorMask != originalColorMask)
-            {
-                SSetTargetDependentBlendState::SetWriteMask(originalColorMask.m_abRGBA, drawBufferIndex);
-            }
-        }
-
-        // Restore the color mask as specified by the blend state
-        if (requiredColorMask != originalColorMask && !m_pDevice->IsFeatureSupported(eF_IndependentBlending))
-        {
-            SSetTargetIndependentBlendState::SetWriteMask(originalColorMask.m_abRGBA, 0);
-        }
-
-        // Restore that scissor test switch as specified by the rasterizer state
-        if (m_kStateCache.m_kRasterizer.m_bScissorEnabled)
-        {
-            SetEnabledState(GL_SCISSOR_TEST, true);
-        }
-    }
-
-    void CContext::ClearDepthStencil(SOutputMergerView* pDepthStencilView, bool bClearDepth, bool bClearStencil, float fDepthValue, uint8 uStencilValue)
-    {
-        DXGL_SCOPED_PROFILE("CContext::ClearDepthStencil")
-
-        pDepthStencilView->m_kCreationFence.IssueWait(this);
-
-        // bClearDepth/bClearStencil could be true even if the format is not depth/stencil-renderable, verify that before
-        const SGIFormatInfo* pGIFormat(GetGIFormatInfo(pDepthStencilView->m_eFormat));
-        if (pGIFormat == NULL || pGIFormat->m_pUncompressed == NULL)
-        {
-            DXGL_ERROR("Depth-stencil view to be cleared does not have a valid format");
-            return;
-        }
-        bool bDepthRenderable(pGIFormat->m_pUncompressed->m_eDepthType != eGICT_UNUSED);
-        bool bStencilRenderable(pGIFormat->m_pUncompressed->m_eStencilType != eGICT_UNUSED);
-        if (!bDepthRenderable && !bStencilRenderable)
-        {
-            DXGL_ERROR("Depth-stencil view to be cleared is neither depth-renderable nor stencil-renderable");
-            return;
-        }
-
-        if (!bDepthRenderable)
-        {
-            bClearDepth = false;
-        }
-        if (!bStencilRenderable)
-        {
-            bClearStencil = false;
-        }
-
-#if defined(ANDROID)
-        NCryOpenGL::SOutputMergerTextureView* somtv = pDepthStencilView->AsSOutputMergerTextureView();
-        if (somtv)
-        {
-            NCryOpenGL::STexture* tex = somtv->m_pTexture;
-            CRY_ASSERT(tex);
-            //  reset invalid state since clear makes the resource valid again
-            if (bClearDepth)
-            {
-                tex->m_bDepthWasInvalidatedWhenUnbound = false;
-            }
-            if (bClearStencil)
-            {
-                tex->m_bStencilWasInvalidatedWhenUnbound = false;
-            }
-        }
-#endif
-
-        // First see if the view is in the current frame buffer configuration depth/stencil attachments
-        bool shouldFlushFrameBufferState = MatchDepthStencilAttachment(pDepthStencilView, bClearDepth, bClearStencil, m_kFrameBufferConfig);
-
-#if defined(DXGL_USE_LAZY_CLEAR)
-        shouldFlushFrameBufferState &= !m_bFrameBufferStateDirty;
-#endif
-
-        if (shouldFlushFrameBufferState)
-        {
-            FlushFrameBufferState();
-        }
-        else
-        {
-#if defined(DXGL_USE_LAZY_CLEAR)
-            SOutputMergerTextureView* pTextureView = pDepthStencilView ? pDepthStencilView->AsSOutputMergerTextureView() : NULL;
-            STexture* resToClear = pTextureView ? pTextureView->m_pTexture : NULL;
-
-            if (resToClear)
-            {
-                //  Once the texture is cleared, it must be bound as rt before second clear can be issued unless we clear the same view and different plane (depth and stencil can be cleared in 2 calls).
-                CRY_ASSERT(!resToClear->m_spViewToClear.get() || resToClear->m_spViewToClear == pDepthStencilView);
-                if (resToClear->m_spViewToClear.get() && resToClear->m_spViewToClear != pDepthStencilView)
-                {
-                    DXGL_ERROR("Different view of this depth buffer was already cleared. Don't support multiple clears on different views.");
-                }
-
-                //  Store deferred clear information.
-                resToClear->m_spViewToClear = pDepthStencilView;
-
-                if (bClearDepth)
-                {
-#if defined(ANDROID)
-                    if (resToClear->m_bDepthLoadDontCare)
-                    {
-                        DXGL_ERROR("Resource was given MTLLoadActionDontCare depth flag. Depth target's view cannot be set to be cleared.");
-                        resToClear->m_bDepthLoadDontCare = false;
-                    }
-#endif
-
-                    resToClear->m_bClearDepth = bClearDepth;
-                    resToClear->m_fClearDepthValue = fDepthValue;
-                }
-
-                if (bClearStencil)
-                {
-#if defined(ANDROID)
-                    if (resToClear->m_bStencilLoadDontCare)
-                    {
-                        DXGL_ERROR("Resource was given MTLLoadActionDontCare stencil flag. Stencil target's view cannot be set to be cleared.");
-                        resToClear->m_bStencilLoadDontCare = false;
-                    }
-#endif
-
-                    resToClear->m_bClearStencil = bClearStencil;
-                    resToClear->m_uClearStencilValue = uStencilValue;
-                }
-
-                return;
-            }
-#endif
-
-            SFrameBufferPtr spClearFrameBuffer(GetCompatibleDepthStencilAttachmentFrameBuffer(pDepthStencilView, bClearDepth, bClearStencil, this));
-
-#if !DXGLES
-            if (CACHE_VAR(m_kStateCache.m_bFrameBufferSRGBEnabled, false))
-            {
-                SetEnabledState(GL_FRAMEBUFFER_SRGB, false);
-            }
-#endif //!DXGLES
-            BindDrawFrameBuffer(spClearFrameBuffer->m_kObject.m_kName);
-        }
-
-        ClearDepthStencilInternal(bClearDepth, bClearStencil, fDepthValue, uStencilValue);
-    }
-
-    void CContext::ClearDepthStencilInternal(bool clearDepth, bool clearStencil, float depthValue, uint8 stencilValue)
-    {
-        if (!clearDepth && !clearStencil)
-        {
-            return;
-        }
-
-        if (clearDepth)
-        {
-            // Make sure the depth mask includes depth writing as glClearBufferf[i|v] are masked as well
-            if (m_kStateCache.m_kDepthStencil.m_bDepthWriteMask != GL_TRUE)
-            {
-                glDepthMask(GL_TRUE);
-            }
-
-            // Make sure that the depth range for viewport 0 is [0.0f, 1.0f] as glClearBufferf[i|v] clamp depth values to that range in case of fixed point target
-            if (m_kStateCache.m_akDepthRangeData[0] != 0.0f || m_kStateCache.m_akDepthRangeData[1] != 1.0f)
-            {
-                glDepthRangef(0.0f, 1.0f);
-            }
-        }
-
-        // Make sure the stencil mask includes depth writing as glClearBufferf[i|v] are masked as well
-        if (clearStencil)
-        {
-            if (m_kStateCache.m_kDepthStencil.m_kStencilFrontFaces.m_uStencilWriteMask != 0xFF)
-            {
-                glStencilMaskSeparate(GL_FRONT, 0xFF);
-            }
-            if (m_kStateCache.m_kDepthStencil.m_kStencilBackFaces.m_uStencilWriteMask != 0xFF)
-            {
-                glStencilMaskSeparate(GL_BACK, 0xFF);
-            }
-        }
-
-        // Make sure that scissor test is disabled as glClearBufferf[i|v] is affected as well
-        if (m_kStateCache.m_kRasterizer.m_bScissorEnabled)
-        {
-            SetEnabledState(GL_SCISSOR_TEST, false);
-        }
-
-        GLenum eBuffer(0);
-        if (clearDepth && clearStencil)
-        {
-            glClearBufferfi(GL_DEPTH_STENCIL, 0, depthValue, static_cast<GLint>(stencilValue));
-        }
-        else if (clearDepth)
-        {
-            glClearBufferfv(GL_DEPTH, 0, &depthValue);
-        }
-        else if (clearStencil)
-        {
-            GLint iStencilValue(stencilValue);
-            glClearBufferiv(GL_STENCIL, 0, &iStencilValue);
-        }
-
-        if (clearDepth)
-        {
-            // Restore the depth mask as specified by the depth stencil state
-            if (m_kStateCache.m_kDepthStencil.m_bDepthWriteMask != GL_TRUE)
-            {
-                glDepthMask(m_kStateCache.m_kDepthStencil.m_bDepthWriteMask);
-            }
-
-            // Restore the depth range for viewport 0 as specified by the viewport state
-            if (m_kStateCache.m_akDepthRangeData[0] != 0.0f || m_kStateCache.m_akDepthRangeData[1] != 1.0f)
-#if DXGL_SUPPORT_VIEWPORT_ARRAY
-            {
-                glDepthRangeIndexed(0, m_kStateCache.m_akDepthRangeData[0], m_kStateCache.m_akDepthRangeData[1]);
-            }
-#else
-            {
-                glDepthRangef(m_kStateCache.m_akDepthRangeData[0], m_kStateCache.m_akDepthRangeData[1]);
-            }
-#endif
-        }
-
-        // Restore the stencil mask as specified by the depth stencil state
-        if (clearStencil)
-        {
-            if (m_kStateCache.m_kDepthStencil.m_kStencilFrontFaces.m_uStencilWriteMask != 0xFF)
-            {
-                glStencilMaskSeparate(GL_FRONT, m_kStateCache.m_kDepthStencil.m_kStencilFrontFaces.m_uStencilWriteMask);
-            }
-            if (m_kStateCache.m_kDepthStencil.m_kStencilBackFaces.m_uStencilWriteMask != 0xFF)
-            {
-                glStencilMaskSeparate(GL_BACK, m_kStateCache.m_kDepthStencil.m_kStencilBackFaces.m_uStencilWriteMask);
-            }
-        }
-
-        // Restore that scissor test switch as specified by the rasterizer state
-        if (m_kStateCache.m_kRasterizer.m_bScissorEnabled)
-        {
-            SetEnabledState(GL_SCISSOR_TEST, false);
-        }
-    }
-
-    void CContext::SetRenderTargets(uint32 uNumRTViews, SOutputMergerView** apRenderTargetViews, SOutputMergerView* pDepthStencilView)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetRenderTargets")
-
-        m_kFrameBufferConfig = SFrameBufferConfiguration();
-        m_bFrameBufferStateDirty = true;
-
-        uint32 uColorView;
-        for (uColorView = 0; uColorView < uNumRTViews; ++uColorView)
-        {
-            if (apRenderTargetViews[uColorView] != NULL)
-            {
-                SOutputMergerView* pOMView(apRenderTargetViews[uColorView]);
-                pOMView->m_kCreationFence.IssueWait(this);
-                m_kFrameBufferConfig.m_akAttachments[SFrameBufferConfiguration::FIRST_COLOR_ATTACHMENT_INDEX + uColorView] = pOMView;
-            }
-        }
-
-        if (pDepthStencilView != NULL)
-        {
-            pDepthStencilView->m_kCreationFence.IssueWait(this);
-
-            uint32 uAttachmentIndex(SFrameBufferConfiguration::MAX_ATTACHMENTS);
-            const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pDepthStencilView->m_eFormat));
-            GLenum eBaseFormat(GL_NONE);
-            if (pFormatInfo != NULL && pFormatInfo->m_pTexture != NULL)
-            {
-                eBaseFormat = pFormatInfo->m_pTexture->m_eBaseFormat;
-            }
-
-            switch (eBaseFormat)
-            {
-            default:
-                DXGL_WARNING("Invalid format for depth stencil view - using it as depth attachment");
-            case GL_DEPTH_COMPONENT:
-                m_kFrameBufferConfig.m_akAttachments[SFrameBufferConfiguration::DEPTH_ATTACHMENT_INDEX] = pDepthStencilView;
-                break;
-#if DXGL_SUPPORT_STENCIL_ONLY_FORMAT
-            case GL_STENCIL_INDEX:
-                if (m_pDevice->IsFeatureSupported(eF_StencilOnlyFormat))
-                {
-                    m_kFrameBufferConfig.m_akAttachments[SFrameBufferConfiguration::STENCIL_ATTACHMENT_INDEX] = pDepthStencilView;
-                }
-                else
-                {
-                    DXGL_ERROR("Device doesn't support stencil only format");
-                }
-                break;
-#endif //DXGL_SUPPORT_STENCIL_ONLY_FORMAT
-            case GL_DEPTH_STENCIL:
-                m_kFrameBufferConfig.m_akAttachments[SFrameBufferConfiguration::DEPTH_ATTACHMENT_INDEX] = pDepthStencilView;
-                m_kFrameBufferConfig.m_akAttachments[SFrameBufferConfiguration::STENCIL_ATTACHMENT_INDEX] = pDepthStencilView;
-                break;
-            }
-        }
-    }
-
-    void CContext::SetShader(SShader* pShader, uint32 uStage)
-    {
-        CRY_ASSERT(uStage < DXGL_ARRAY_SIZE(m_kPipelineConfiguration.m_apShaders));
-
-        m_bPipelineDirty |= (m_kPipelineConfiguration.m_apShaders[uStage] != pShader);
-        m_kPipelineConfiguration.m_apShaders[uStage] = pShader;
-    }
-
-    void CContext::SetShaderTexture(SShaderTextureBasedView* pView, uint32 uStage, uint32 uIndex)
-    {
-        uint32 uSlot = TextureSlot((EShaderType)uStage, uIndex);
-        if (uSlot >= MAX_TEXTURE_SLOTS)
-        {
-            if (pView != NULL)
-            {
-                DXGL_WARNING("Texture %d not available for stage %d - setting ignored", uIndex, uStage);
-            }
-            return;
-        }
-
-        if (pView != NULL)
-        {
-            pView->m_kCreationFence.IssueWait(this);
-        }
-        m_abResourceUnitsDirty[eRUT_Texture] |= CACHE_VAR(m_akTextureSlots[uSlot].m_pView, pView);
-    }
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-
-    void CContext::SetShaderImage(SShaderImageView* pView, uint32 uStage, uint32 uIndex)
-    {
-        if (!m_pDevice->IsFeatureSupported(eF_ShaderImages))
-        {
-            DXGL_ERROR("Shader Images are not supported on this device.");
-            return;
-        }
-
-        uint32 uSlot = ImageSlot((EShaderType)uStage, uIndex);
-        if (uSlot >= MAX_IMAGE_SLOTS)
-        {
-            if (pView != NULL)
-            {
-                DXGL_WARNING("Image %d not available for stage %d - setting ignored", uIndex, uStage);
-            }
-            return;
-        }
-
-        SImageUnitCache& kSlot(m_akImageSlots[uSlot]);
-        if (pView == NULL)
-        {
-            m_abResourceUnitsDirty[eRUT_Image] |= CACHE_VAR(kSlot.m_kTextureName, CResourceName());
-        }
-        else
-        {
-            pView->m_kCreationFence.IssueWait(this);
-            bool bNewTexture = CACHE_VAR(kSlot.m_kTextureName, pView->m_kName);
-            bool bNewConfig  = CACHE_VAR(kSlot.m_kConfiguration, pView->m_kConfiguration);
-            m_abResourceUnitsDirty[eRUT_Image] |= bNewTexture || bNewConfig;
-        }
-    }
-
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-    void CContext::SetShaderBuffer(SShaderBufferView* pView, uint32 uStage, uint32 uIndex)
-    {
-        uint32 uSlot = StorageBufferSlot((EShaderType)uStage, uIndex);
-        if (uSlot >= MAX_STORAGE_BUFFER_SLOTS)
-        {
-            if (pView != NULL)
-            {
-                DXGL_WARNING("Shader storage buffer %d not available for stage %d - setting ignored", uIndex, uStage);
-            }
-            return;
-        }
-
-        TIndexedBufferBinding& kSlot(m_akStorageBufferSlots[uSlot]);
-        if (pView == NULL)
-        {
-            m_abResourceUnitsDirty[eRUT_StorageBuffer] |= CACHE_VAR(kSlot, TIndexedBufferBinding());
-        }
-        else
-        {
-            pView->m_kCreationFence.IssueWait(this);
-            m_abResourceUnitsDirty[eRUT_StorageBuffer] |= CACHE_VAR(kSlot, TIndexedBufferBinding(pView->m_kName, pView->m_kRange));
-        }
-    }
-
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-    void CContext::SetShaderResourceView(SShaderView* pView, uint32 uStage, uint32 uSlot)
-    {
-        if (pView == NULL)
-        {
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-            SetShaderBuffer(NULL, uStage, uSlot);
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-            SetShaderTexture(NULL, uStage, uSlot);
-        }
-        else
-        {
-            pView->m_kCreationFence.IssueWait(this);
-            switch (pView->m_eType)
-            {
-            case SShaderView::eSVT_Texture:
-                SetShaderTexture(static_cast<SShaderTextureBasedView*>(pView), uStage, uSlot);
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                SetShaderBuffer(NULL, uStage, uSlot);
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                break;
-            case SShaderView::eSVT_Buffer:
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                SetShaderBuffer(static_cast<SShaderBufferView*>(pView), uStage, uSlot);
-                SetShaderTexture(NULL, uStage, uSlot);
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                break;
-            default:
-                DXGL_ERROR("Cannot bind view of this type as shader resource");
-                break;
-            }
-        }
-    }
-
-    void CContext::SetUnorderedAccessView(SShaderView* pView, uint32 uStage, uint32 uSlot)
-    {
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS && DXGL_SUPPORT_SHADER_IMAGES
-        if (!m_pDevice->IsFeatureSupported(eF_ShaderImages))
-        {
-            DXGL_ERROR("Shader Images are not supported on this device.");
-            return;
-        }
-
-        if (pView == NULL)
-        {
-            SetShaderBuffer(NULL, uStage, uSlot);
-            SetShaderImage(NULL, uStage, uSlot);
-        }
-        else
-        {
-            pView->m_kCreationFence.IssueWait(this);
-            switch (pView->m_eType)
-            {
-            case SShaderView::eSVT_Image:
-                SetShaderImage(static_cast<SShaderImageView*>(pView), uStage, uSlot);
-                SetShaderBuffer(NULL, uStage, uSlot);
-                break;
-            case SShaderView::eSVT_Buffer:
-                SetShaderBuffer(static_cast<SShaderBufferView*>(pView), uStage, uSlot);
-                SetShaderImage(NULL, uStage, uSlot);
-                break;
-            default:
-                DXGL_ERROR("Cannot bind view of this type as shader resource");
-                break;
-            }
-        }
-#else
-        DXGL_ERROR("CContext::SetUnorderedAccessView is not supported in this configuration");
-#endif
-    }
-
-    void CContext::SetSampler(SSamplerState* pSampler, uint32 uStage, uint32 uIndex)
-    {
-        uint32 uSlot = SamplerSlot((EShaderType)uStage, uIndex);
-        if (uSlot >= MAX_SAMPLER_SLOTS)
-        {
-            DXGL_WARNING("Sampler %d not available for stage %d - setting ignored", uIndex, uStage);
-            return;
-        }
-
-        m_abResourceUnitsDirty[eRUT_Texture] |= CACHE_VAR(m_akSamplerSlots[uSlot].m_pSampler, pSampler);
-    }
-
-    void CContext::SetConstantBuffer(SBuffer* pConstantBuffer, SBufferRange kRange, uint32 uStage, uint32 uIndex)
-    {
-        uint32 uSlot = ConstantBufferSlot((EShaderType)uStage, uIndex);
-        if (uSlot >= MAX_CONSTANT_BUFFER_SLOTS)
-        {
-            DXGL_WARNING("Constant buffer %d not available for stage %d - setting ignored", uIndex, uStage);
-            return;
-        }
-
-        TConstantBufferSlot& kSlot(m_akConstantBufferSlots[uSlot]);
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        kSlot.m_kRange = kRange;
-        kSlot.m_pBuffer = pConstantBuffer;
-#else
-        if (pConstantBuffer == NULL)
-        {
-            m_abResourceUnitsDirty[eRUT_UniformBuffer] |= CACHE_VAR(kSlot, TIndexedBufferBinding());
-        }
-        else
-        {
-            pConstantBuffer->m_kCreationFence.IssueWait(this);
-            m_abResourceUnitsDirty[eRUT_UniformBuffer] |= CACHE_VAR(kSlot, TIndexedBufferBinding(pConstantBuffer->m_kName, kRange));
-        }
-#endif
-    }
-
-    void CContext::SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY eTopology)
-    {
-        switch (eTopology)
-        {
-#define _CASE(_D3DValue, _GLMode, _AdditionalInstr) \
-case _D3DValue:                                     \
-    m_ePrimitiveTopologyMode = _GLMode;             \
-    _AdditionalInstr                                \
-    break;
-#define CASE_PRIM(_D3DValue, _GLMode)   _CASE(_D3DValue, _GLMode, )
-#define CASE_CTRL(_D3DValue, _GLMode, _NumCtrlPoints)   _CASE(_D3DValue, _GLMode, SetNumPatchControlPoints(_NumCtrlPoints); )
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_UNDEFINED, GL_NONE)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_POINTLIST, GL_POINTS)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_LINELIST, GL_LINES)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_LINESTRIP, GL_LINE_STRIP)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, GL_TRIANGLES)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, GL_TRIANGLE_STRIP)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ, GL_LINE_STRIP)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ, GL_TRIANGLE_STRIP)
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ, GL_LINES_ADJACENCY)
-            CASE_PRIM(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ, GL_TRIANGLES_ADJACENCY)
-#endif //DXGL_SUPPORT_GEOMETRY_SHADERS
-#if DXGL_SUPPORT_TESSELLATION
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST, GL_PATCHES,  1)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST, GL_PATCHES,  2)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST, GL_PATCHES,  3)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, GL_PATCHES,  4)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST, GL_PATCHES,  5)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST, GL_PATCHES,  6)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST, GL_PATCHES,  7)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST, GL_PATCHES,  8)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST, GL_PATCHES,  9)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST, GL_PATCHES, 10)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST, GL_PATCHES, 11)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST, GL_PATCHES, 12)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST, GL_PATCHES, 13)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST, GL_PATCHES, 14)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST, GL_PATCHES, 15)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST, GL_PATCHES, 16)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST, GL_PATCHES, 17)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST, GL_PATCHES, 18)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST, GL_PATCHES, 19)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST, GL_PATCHES, 20)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST, GL_PATCHES, 21)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST, GL_PATCHES, 22)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST, GL_PATCHES, 23)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST, GL_PATCHES, 24)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST, GL_PATCHES, 25)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST, GL_PATCHES, 26)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST, GL_PATCHES, 27)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST, GL_PATCHES, 28)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST, GL_PATCHES, 29)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST, GL_PATCHES, 30)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST, GL_PATCHES, 31)
-            CASE_CTRL(D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, GL_PATCHES, 32)
-#endif //DXGL_SUPPORT_TESSELLATION
-#undef _CASE
-#undef CASE_CTRL
-#undef CASE_PRIM
-        default:
-            DXGL_ERROR("Invalid primitive topology");
-            break;
-        }
-    }
-
-    void CContext::SetInputLayout(SInputLayout* pInputLayout)
-    {
-        m_pInputLayout = pInputLayout;
-        m_bInputLayoutDirty = true;
-    }
-
-    void CContext::SetVertexBuffer(uint32 uSlot, SBuffer* pVertexBuffer, uint32 uStride, uint32 uOffset)
-    {
-        SInputAssemblerSlot& kSlot(m_akInputAssemblerSlots[uSlot]);
-        kSlot.m_pVertexBuffer = pVertexBuffer;
-        kSlot.m_uStride = uStride;
-        kSlot.m_uOffset = uOffset;
-        m_bInputAssemblerSlotsDirty = true;
-    }
-
-    void CContext::SetIndexBuffer(SBuffer* pIndexBuffer, GLenum eIndexType, GLuint uIndexStride, GLuint uOffset)
-    {
-        BindBuffer(pIndexBuffer, eBB_ElementArray);
-        m_eIndexType = eIndexType;
-        m_uIndexStride = uIndexStride;
-        m_uIndexOffset = uOffset;
-    }
-
-#if DXGL_ENABLE_SHADER_TRACING
-
-    void CContext::PrepareTraceHeader(uint32 uFirstVertex, uint32 uFirstIndex)
-    {
-        switch (m_eStageTracing)
-        {
-        case eST_Vertex:
-        {
-            uint32 uIndex = uFirstIndex + m_kStageTracingInfo.m_kVertex.m_uVertexIndex;
-
-            const CResourceName& kIndexBuffer(m_kStateCache.m_akBuffersBound[eBB_ElementArray]);
-            uint32 uVertexID = ~0;
-            if (kIndexBuffer.IsValid())
-            {
-                GLvoid* pIndex = glMapNamedBufferRangeEXT(kIndexBuffer.GetName(), m_uIndexOffset + m_uIndexStride * uIndex, m_uIndexStride, GL_MAP_READ_BIT);
-                if (pIndex == NULL)
-                {
-                    DXGL_ERROR("Could not read back vertex ID for index %d", uIndex);
-                }
-                else
-                {
-                    switch (m_eIndexType)
-                    {
-                    case GL_UNSIGNED_INT:
-                        uVertexID = (uint32) * static_cast<GLuint*  >(pIndex);
-                        break;
-                    case GL_UNSIGNED_SHORT:
-                        uVertexID = (uint32) * static_cast<GLushort*>(pIndex);
-                        break;
-                    case GL_UNSIGNED_BYTE:
-                        uVertexID = (uint32) * static_cast<GLubyte* >(pIndex);
-                        break;
-                    default:
-                        DXGL_ERROR("Unsupported index type 0x%X", m_eIndexType);
-                        uVertexID = ~0;
-                    }
-
-                    glUnmapNamedBufferEXT(kIndexBuffer.GetName());
-                }
-            }
-            else
-            {
-                uVertexID = uIndex;
-            }
-
-            m_kStageTracingInfo.m_kVertex.m_kHeader.m_uVertexID = uFirstVertex + uVertexID;
-        }
-        break;
-        case eST_Fragment:
-        {
-            uint32 uFragmentX = m_kStageTracingInfo.m_kFragment.m_uFragmentCoordX;
-            uint32 uFragmentY = m_kStageTracingInfo.m_kFragment.m_uFragmentCoordY;
-
-            m_kStageTracingInfo.m_kFragment.m_kHeader.m_afFragmentCoordX = 0.5f + (float)uFragmentX;
-            m_kStageTracingInfo.m_kFragment.m_kHeader.m_afFragmentCoordY = 0.5f + (float)uFragmentY;
-        }
-        break;
-        default:
-            DXGL_NOT_IMPLEMENTED;
-            break;
-        }
-    }
-
-    void CContext::FlushShaderTracingState()
-    {
-        if (m_eStageTracing != eST_NUM)
-        {
-            uint32 uCurrentConfigHash(m_kPipelineConfiguration.m_apShaders[m_eStageTracing]->m_akVersions[eSV_Normal].m_kReflection.m_uInputHash);
-            if (uCurrentConfigHash == m_uShaderTraceHash)
-            {
-                m_kPipelineConfiguration.m_aeShaderVersions[m_eStageTracing] = eSV_Tracing;
-                m_bPipelineDirty = true;
-            }
-        }
-    }
-
-    void CContext::BeginTrace(uint32 uFirstVertex, uint32 uFirstIndex)
-    {
-        enum
-        {
-            MAX_TRACED_VERTEX_INVOCATONS   = 0x04,
-            MAX_TRACED_FRAGMENT_INVOCATONS = 0x10,
-            VERTEX_TRACE_STRIDE            = SShaderTraceBufferCommon::CAPACITY / MAX_TRACED_VERTEX_INVOCATONS,
-            FRAGMENT_TRACE_STRIDE          = SShaderTraceBufferCommon::CAPACITY / MAX_TRACED_FRAGMENT_INVOCATONS,
-        };
-
-        union UShaderTraceBufferStorage
-        {
-            SShaderTraceBuffer<SVertexShaderTraceHeader>   m_kVertex;
-            SShaderTraceBuffer<SFragmentShaderTraceHeader> m_kPixel;
-        };
-
-        if (m_eStageTracing != eST_NUM)
-        {
-            uint32 uCurrentPipelineHash(m_spPipeline->m_kConfiguration.m_apShaders[m_eStageTracing]->m_akVersions[eSV_Normal].m_kReflection.m_uInputHash);
-            if (uCurrentPipelineHash != m_uShaderTraceHash)
-            {
-                return;
-            }
-
-            PrepareTraceHeader(uFirstVertex, uFirstIndex);
-
-            GLuint uBufferName;
-            if (!m_kShaderTracingBuffer.IsValid())
-            {
-                glGenBuffers(1, &uBufferName);
-                glNamedBufferDataEXT(uBufferName, sizeof(UShaderTraceBufferStorage), NULL, GL_DYNAMIC_READ);
-                m_kShaderTracingBuffer = m_pDevice->GetBufferNamePool().Create(uBufferName);
-            }
-            else
-            {
-                uBufferName = m_kShaderTracingBuffer.GetName();
-            }
-
-            switch (m_eStageTracing)
-            {
-            case eST_Vertex:
-                BeginTraceInternal(uBufferName, m_kStageTracingInfo.m_kVertex.m_kHeader,   VERTEX_TRACE_STRIDE);
-                break;
-            case eST_Fragment:
-                BeginTraceInternal(uBufferName, m_kStageTracingInfo.m_kFragment.m_kHeader, FRAGMENT_TRACE_STRIDE);
-                break;
-            default:
-                DXGL_NOT_IMPLEMENTED;
-                break;
-            }
-
-            uint32 uTraceBufferUnit = m_spPipeline->m_uTraceBufferUnit;
-            m_kReplacedStorageBuffer = m_kStateCache.m_akStorageBuffersBound[uTraceBufferUnit];
-            BindStorageBuffer(TIndexedBufferBinding(m_kShaderTracingBuffer, SBufferRange()), uTraceBufferUnit);
-        }
-    }
-
-    void CContext::EndTrace()
-    {
-        if (m_eStageTracing != eST_NUM)
-        {
-            uint32 uCurrentPipelineHash(m_spPipeline->m_kConfiguration.m_apShaders[m_eStageTracing]->m_akVersions[eSV_Normal].m_kReflection.m_uInputHash);
-            if (uCurrentPipelineHash != m_uShaderTraceHash)
-            {
-                return;
-            }
-
-            BindStorageBuffer(m_kReplacedStorageBuffer, m_spPipeline->m_uTraceBufferUnit);
-
-            GLuint uBufferName(m_kShaderTracingBuffer.GetName());
-            const SShaderTraceIndex& kTraceIndex(m_kPipelineConfiguration.m_apShaders[m_eStageTracing]->m_kTraceIndex);
-
-            switch (m_eStageTracing)
-            {
-            case eST_Vertex:
-                m_uShaderTraceCount += EndTraceInternal<SVertexShaderTraceHeader  >(uBufferName, eST_Vertex,   kTraceIndex);
-                break;
-            case eST_Fragment:
-                m_uShaderTraceCount += EndTraceInternal<SFragmentShaderTraceHeader>(uBufferName, eST_Fragment, kTraceIndex);
-                break;
-            default:
-                DXGL_NOT_IMPLEMENTED;
-                break;
-            }
-
-            m_kPipelineConfiguration.m_aeShaderVersions[m_eStageTracing] = eSV_Normal;
-        }
-    }
-
-#define BEGIN_TRACE(_FirstVertex, _FirstIndex) BeginTrace(_FirstVertex, _FirstIndex)
-#define END_TRACE() EndTrace()
-
-#else
-
-#define BEGIN_TRACE(_FirstVertex, _FirstIndex)
-#define END_TRACE()
-
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-    void CContext::DrawIndexed(uint32 uIndexCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::DrawIndexed")
-
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        SetVertexOffset(uBaseVertexLocation);
-#endif //!DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-
-        FlushDrawState();
-
-        BEGIN_TRACE(uBaseVertexLocation, uStartIndexLocation);
-
-        GLvoid* pvOffset(reinterpret_cast<GLvoid*>(static_cast<uintptr_t>(m_uIndexOffset + uStartIndexLocation * m_uIndexStride)));
-        CRY_ASSERT(m_ePrimitiveTopologyMode != GL_NONE);
-#if DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        glDrawElementsBaseVertex(m_ePrimitiveTopologyMode, uIndexCount, m_eIndexType, pvOffset, uBaseVertexLocation);
-#else
-        glDrawElements(m_ePrimitiveTopologyMode, uIndexCount, m_eIndexType, pvOffset);
-#endif
-
-        O3de::OpenGL::CheckError();
-
-        END_TRACE();
-    }
-
-    void CContext::Draw(uint32 uVertexCount, uint32 uStartVertexLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::Draw")
-
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        // Reset the vertex offset in case previous draw calls set it.
-        SetVertexOffset(0);
-#endif //!DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-
-        FlushDrawState();
-
-        BEGIN_TRACE(uStartVertexLocation, 0);
-
-        CRY_ASSERT(m_ePrimitiveTopologyMode != GL_NONE);
-        glDrawArrays(m_ePrimitiveTopologyMode, uStartVertexLocation, uVertexCount);
-
-        O3de::OpenGL::CheckError();
-
-        END_TRACE();
-    }
-
-    void CContext::DrawIndexedInstanced(uint32 uIndexCountPerInstance, uint32 uInstanceCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation, uint32 uStartInstanceLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::DrawIndexedInstanced")
-
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        SetVertexOffset(uBaseVertexLocation);
-#endif //!DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-
-        FlushDrawState();
-
-        BEGIN_TRACE(uBaseVertexLocation, uStartIndexLocation);
-
-        GLvoid* pvOffset(reinterpret_cast<GLvoid*>(static_cast<uintptr_t>(m_uIndexOffset + uStartIndexLocation * m_uIndexStride)));
-        CRY_ASSERT(m_ePrimitiveTopologyMode != GL_NONE);
-#if DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        glDrawElementsInstancedBaseVertexBaseInstance(m_ePrimitiveTopologyMode, uIndexCountPerInstance, m_eIndexType, pvOffset, uInstanceCount, uBaseVertexLocation, uStartInstanceLocation);
-#else
-        if (uStartInstanceLocation == 0)
-        {
-            glDrawElementsInstanced(m_ePrimitiveTopologyMode, uIndexCountPerInstance, m_eIndexType, pvOffset, uInstanceCount);
-        }
-        else
-        {
-            DXGL_NOT_IMPLEMENTED
-        }
-#endif
-
-        END_TRACE();
-    }
-
-    void CContext::DrawInstanced(uint32 uVertexCountPerInstance, uint32 uInstanceCount, uint32 uStartVertexLocation, uint32 uStartInstanceLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::DrawInstanced")
-
-        FlushDrawState();
-
-        BEGIN_TRACE(uStartVertexLocation, 0);
-
-        CRY_ASSERT(m_ePrimitiveTopologyMode != GL_NONE);
-#if DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        glDrawArraysInstancedBaseInstance(m_ePrimitiveTopologyMode, uStartVertexLocation, uVertexCountPerInstance, uInstanceCount, uStartInstanceLocation);
-#else
-        if (uStartInstanceLocation == 0)
-        {
-            glDrawArraysInstanced(m_ePrimitiveTopologyMode, uStartVertexLocation, uVertexCountPerInstance, uInstanceCount);
-        }
-        else
-        {
-            DXGL_NOT_IMPLEMENTED
-        }
-#endif
-
-        END_TRACE();
-    }
-
-#if DXGL_SUPPORT_COMPUTE
-
-    void CContext::Dispatch(uint32 uGroupX, uint32 uGroupY, uint32 uGroupZ)
-    {
-        DXGL_SCOPED_PROFILE("CContext::Dispatch")
-
-        FlushDispatchState();
-
-        glDispatchCompute(uGroupX, uGroupY, uGroupZ);
-    }
-
-    void CContext::DispatchIndirect(uint32 uIndirectOffset)
-    {
-        DXGL_SCOPED_PROFILE("CContext::DispatchIndirect")
-
-        FlushDispatchState();
-
-        glDispatchComputeIndirect(uIndirectOffset);
-    }
-
-#endif //DXGL_SUPPORT_COMPUTE
-
-    void CContext::Flush()
-    {
-        DXGL_SCOPED_PROFILE("CContext::Flush")
-
-        glFlush();
-    }
-
-    SFrameBufferPtr CContext::AllocateFrameBuffer(const SFrameBufferConfiguration& kConfiguration)
-    {
-        DXGL_SCOPED_PROFILE("CContext::AllocateFrameBuffer")
-
-        // First see if there is an equivalent frame buffer in the cache
-        SFrameBufferCache::TMap::iterator kFound(m_pFrameBufferCache->m_kMap.find(kConfiguration));
-        if (kFound != m_pFrameBufferCache->m_kMap.end())
-        {
-            return kFound->second;
-        }
-
-        DXGL_TODO("Add the possibility of using the default frame buffer (0) if the configuration only contains the default fb texture");
-
-        // Create a new one and cache it
-        GLuint uFrameBufferName;
-        glGenFramebuffers(1, &uFrameBufferName);
-        SFrameBufferPtr spFrameBuffer(new SFrameBuffer(kConfiguration));
-        spFrameBuffer->m_uNumDrawBuffers = 0;
-        spFrameBuffer->m_kDrawMask.SetZero();
-        spFrameBuffer->m_kObject.m_bUsesSRGB = false;
-        spFrameBuffer->m_pContext = this;
-        spFrameBuffer->m_kObject.m_kName = m_pDevice->GetFrameBufferNamePool().Create(uFrameBufferName);
-
-        bool bDepthStencilAttached(false);
-
-        bool bSuccess(true);
-        uint32 uAttachment;
-        for (uAttachment = 0; uAttachment < SFrameBufferConfiguration::MAX_ATTACHMENTS; ++uAttachment)
-        {
-            SOutputMergerView* pAttachedView(kConfiguration.m_akAttachments[uAttachment]);
-            if (pAttachedView != NULL)
-            {
-                GLenum eAttachmentID(SFrameBufferConfiguration::AttachmentIndexToID(uAttachment));
-                CRY_ASSERT(eAttachmentID != GL_NONE);
-
-                const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pAttachedView->m_eFormat));
-                if (pFormatInfo != NULL && pFormatInfo->m_pTexture != NULL && pFormatInfo->m_pTexture->m_bSRGB)
-                {
-                    spFrameBuffer->m_kObject.m_bUsesSRGB = true;
-                }
-
-                if (uAttachment >= SFrameBufferConfiguration::FIRST_COLOR_ATTACHMENT_INDEX && uAttachment < SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS)
-                {
-                    spFrameBuffer->m_aeDrawBuffers[spFrameBuffer->m_uNumDrawBuffers] = eAttachmentID;
-                    spFrameBuffer->m_kDrawMask.Set(uAttachment - SFrameBufferConfiguration::FIRST_COLOR_ATTACHMENT_INDEX, true);
-                    ++spFrameBuffer->m_uNumDrawBuffers;
-                }
-
-#if !DXGL_SUPPORT_STENCIL_ONLY_FORMAT
-                if (!m_pDevice->IsFeatureSupported(eF_StencilOnlyFormat))
-                {
-                    if (eAttachmentID == GL_DEPTH_ATTACHMENT || eAttachmentID == GL_STENCIL_ATTACHMENT)
-                    {
-                        if (bDepthStencilAttached)
-                        {
-                            continue;
-                        }
-                        GLenum eOtherID(eAttachmentID == GL_DEPTH_ATTACHMENT ? GL_STENCIL_ATTACHMENT : GL_DEPTH_ATTACHMENT);
-                        if (kConfiguration.m_akAttachments[SFrameBufferConfiguration::AttachmentIDToIndex(eOtherID)] == pAttachedView)
-                        {
-                            eAttachmentID = GL_DEPTH_STENCIL_ATTACHMENT;
-                            bDepthStencilAttached = true;
-                        }
-                    }
-                }
-#endif //!DXGL_SUPPORT_STENCIL_ONLY_FORMAT
-
-                if (!pAttachedView->AttachFrameBuffer(spFrameBuffer, eAttachmentID, this))
-                {
-                    bSuccess = false;
-                }
-            }
-        }
-        glFramebufferDrawBuffersEXT(spFrameBuffer->m_kObject.m_kName.GetName(), spFrameBuffer->m_uNumDrawBuffers, spFrameBuffer->m_aeDrawBuffers);
-        spFrameBuffer->m_kObject.m_kDrawMaskCache = spFrameBuffer->m_kDrawMask;
-
-        bSuccess = spFrameBuffer->Validate() && bSuccess;
-
-        m_pFrameBufferCache->m_kMap.insert(SFrameBufferCache::TMap::value_type(kConfiguration, spFrameBuffer));
-
-        if (!bSuccess)
-        {
-            RemoveFrameBuffer(spFrameBuffer, NULL);
-            return NULL;
-        }
-
-        return spFrameBuffer;
-    }
-
-    void CContext::RemoveFrameBuffer(SFrameBuffer* pFrameBuffer, SOutputMergerView* pInvalidView)
-    {
-        DXGL_SCOPED_PROFILE("CContext::RemoveFrameBuffer")
-
-        SFrameBufferCache::TMap::iterator kFound(m_pFrameBufferCache->m_kMap.find(pFrameBuffer->m_kConfiguration));
-        if (kFound == m_pFrameBufferCache->m_kMap.end())
-        {
-            DXGL_ERROR("Frame buffer to remove was not found in the cache map");
-            return;
-        }
-
-        // Remove all references of the frame buffer from the attached textures, except pInvalidView which is being destroyed
-        uint32 uAttachment;
-        for (uAttachment = 0; uAttachment < SFrameBufferConfiguration::MAX_ATTACHMENTS; ++uAttachment)
-        {
-            SOutputMergerView* pAttachedView(pFrameBuffer->m_kConfiguration.m_akAttachments[uAttachment]);
-            if (pAttachedView != pInvalidView && pAttachedView != NULL)
-            {
-                pAttachedView->DetachFrameBuffer(pFrameBuffer);
-            }
-        }
-
-        if (m_spFrameBuffer == pFrameBuffer)
-        {
-            m_spFrameBuffer = nullptr;
-        }
-
-        m_pFrameBufferCache->m_kMap.erase(kFound);
-    }
-
-    SPipelinePtr CContext::AllocatePipeline(const SPipelineConfiguration& kConfiguration)
-    {
-        DXGL_SCOPED_PROFILE("CContext::AllocatePipeline")
-
-        // First see if there is an equivalent pipeline in the cache
-        SPipelineCache::TMap::iterator kFound(m_pPipelineCache->m_kMap.find(kConfiguration));
-        if (kFound != m_pPipelineCache->m_kMap.end())
-        {
-            return kFound->second;
-        }
-
-        // Create a new one and cache it
-        SPipelinePtr spPipeline(new SPipeline(kConfiguration, this));
-
-        if (!InitializePipeline(spPipeline))
-        {
-            return NULL;
-        }
-
-        m_pPipelineCache->m_kMap.insert(SPipelineCache::TMap::value_type(kConfiguration, spPipeline));
-        for (uint32 uShader = 0; uShader < eST_NUM; ++uShader)
-        {
-            SShader* pShader(kConfiguration.m_apShaders[uShader]);
-            if (IsPipelineStageUsed(kConfiguration.m_eMode, (EShaderType)uShader) && pShader != NULL)
-            {
-                pShader->AttachPipeline(spPipeline);
-            }
-        }
-
-        return spPipeline;
-    }
-
-    void CContext::RemovePipeline(SPipeline* pPipeline, SShader* pInvalidShader)
-    {
-        DXGL_SCOPED_PROFILE("CContext::RemovePipeline")
-
-        SPipelineCache::TMap::iterator kFound(m_pPipelineCache->m_kMap.find(pPipeline->m_kConfiguration));
-        if (kFound == m_pPipelineCache->m_kMap.end())
-        {
-            DXGL_ERROR("Pipeline to remove was not found in the cache map");
-            return;
-        }
-
-        // Remove all references of the pipeline from the attached shaders, except pInvalidShader which is being destroyed
-        for (uint32 uShader = 0; uShader < eST_NUM; ++uShader)
-        {
-            SShader* pAttachedShader(pPipeline->m_kConfiguration.m_apShaders[uShader]);
-            if (IsPipelineStageUsed(pPipeline->m_kConfiguration.m_eMode, (EShaderType)uShader) &&
-                pAttachedShader != pInvalidShader &&
-                pAttachedShader != NULL)
-            {
-                pAttachedShader->DetachPipeline(pPipeline);
-            }
-        }
-
-        m_pPipelineCache->m_kMap.erase(kFound);
-    }
-
-    SUnitMapPtr CContext::AllocateUnitMap(SUnitMapPtr spConfiguration)
-    {
-        m_pUnitMapCache->m_kMap[spConfiguration] = spConfiguration;
-        return spConfiguration;
-    }
-
-    bool CContext::InitializePipeline(SPipeline* pPipeline)
-    {
-        DXGL_SCOPED_PROFILE("CContext::InitializePipeline")
-
-        if (!CompilePipeline(pPipeline, &m_kPipelineCompilationBuffer, m_pDevice))
-        {
-            return false;
-        }
-
-        return InitializePipelineResources(pPipeline, this);
-    }
-
-    void CContext::BlitFrameBuffer(
-        SFrameBufferObject& kSrcFBO, SFrameBufferObject& kDstFBO,
-        GLenum eSrcColorBuffer, GLenum eDstColorBuffer,
-        GLint iSrcXMin, GLint iSrcYMin, GLint iSrcXMax, GLint iSrcYMax,
-        GLint iDstXMin, GLint iDstYMin, GLint iDstXMax, GLint iDstYMax,
-        GLbitfield uMask, GLenum eFilter)
-    {
-        DXGL_SCOPED_PROFILE("CContext::BlitFrameBuffer")
-
-        BindReadFrameBuffer(kSrcFBO.m_kName);
-        glReadBuffer(eSrcColorBuffer);
-
-        BindDrawFrameBuffer(kDstFBO.m_kName);
-        SFrameBufferObject::TColorAttachmentMask kDstDrawMask(false);
-        if (GL_COLOR_ATTACHMENT0 <= eDstColorBuffer && (eDstColorBuffer - GL_COLOR_ATTACHMENT0) < SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS)
-        {
-            kDstDrawMask.Set(eDstColorBuffer - GL_COLOR_ATTACHMENT0, true);
-        }
-        if (CACHE_VAR(kDstFBO.m_kDrawMaskCache, kDstDrawMask))
-        {
-            glDrawBuffers(1, &eDstColorBuffer);
-        }
-
-#if !DXGLES
-        bool bEnableFrameBufferSRGB(kSrcFBO.m_bUsesSRGB || kDstFBO.m_bUsesSRGB);
-        if (CACHE_VAR(m_kStateCache.m_bFrameBufferSRGBEnabled, bEnableFrameBufferSRGB))
-        {
-            SetEnabledState(GL_FRAMEBUFFER_SRGB, bEnableFrameBufferSRGB);
-        }
-#endif //!DXGLES
-
-        // Make sure that scissor test is disabled as glBlitFramebuffer is affected as well
-        if (m_kStateCache.m_kRasterizer.m_bScissorEnabled)
-        {
-            SetEnabledState(GL_SCISSOR_TEST, false);
-        }
-
-        glBlitFramebuffer(iSrcXMin, iSrcYMin, iSrcXMax, iSrcYMax, iDstXMin, iDstYMin, iDstXMax, iDstYMax, uMask, eFilter);
-
-        // Restore that scissor test switch as specified by the rasterizer state
-        if (m_kStateCache.m_kRasterizer.m_bScissorEnabled)
-        {
-            SetEnabledState(GL_SCISSOR_TEST, true);
-        }
-
-        m_bFrameBufferStateDirty = true;
-    }
-
-    bool CContext::BlitOutputMergerView(
-        SOutputMergerView* pSrcView, SOutputMergerView* pDstView,
-        GLint iSrcXMin, GLint iSrcYMin, GLint iSrcXMax, GLint iSrcYMax,
-        GLint iDstXMin, GLint iDstYMin, GLint iDstXMax, GLint iDstYMax,
-        GLbitfield uMask, GLenum eFilter)
-    {
-        const SGIFormatInfo* pSrcFormatInfo(GetGIFormatInfo(pSrcView->m_eFormat));
-        const SGIFormatInfo* pDstFormatInfo(GetGIFormatInfo(pDstView->m_eFormat));
-
-        if (pSrcFormatInfo->m_pUncompressed == NULL || pDstFormatInfo->m_pUncompressed == NULL)
-        {
-            return false;
-        }
-
-        bool bColor((uMask & GL_COLOR_BUFFER_BIT)   != 0 && pSrcFormatInfo->m_pUncompressed->m_eColorType   != eGICT_UNUSED);
-        bool bDepth((uMask & GL_DEPTH_BUFFER_BIT)   != 0 && pSrcFormatInfo->m_pUncompressed->m_eDepthType   != eGICT_UNUSED);
-        bool bStencil((uMask & GL_STENCIL_BUFFER_BIT) != 0 && pSrcFormatInfo->m_pUncompressed->m_eStencilType != eGICT_UNUSED);
-
-        if (bColor)
-        {
-            uint32 uSrcAttachment, uDstAttachment;
-            SFrameBufferPtr spSrcFrameBuffer(GetCompatibleColorAttachmentFrameBuffer(pSrcView, uSrcAttachment, this));
-            SFrameBufferPtr spDstFrameBuffer(GetCompatibleColorAttachmentFrameBuffer(pDstView, uDstAttachment, this));
-
-            if (spSrcFrameBuffer == NULL || spDstFrameBuffer == NULL)
-            {
-                return false;
-            }
-
-            BlitFrameBuffer(
-                spSrcFrameBuffer->m_kObject, spDstFrameBuffer->m_kObject,
-                SFrameBufferConfiguration::AttachmentIndexToID(uSrcAttachment),
-                SFrameBufferConfiguration::AttachmentIndexToID(uDstAttachment),
-                iSrcXMin, iSrcYMin, iSrcXMax, iSrcYMax,
-                iDstXMin, iDstYMin, iDstXMax, iDstYMax,
-                GL_COLOR_BUFFER_BIT, eFilter);
-        }
-
-        if (bDepth || bStencil)
-        {
-            SFrameBufferPtr spSrcFrameBuffer(GetCompatibleDepthStencilAttachmentFrameBuffer(pSrcView, bDepth, bStencil, this));
-            SFrameBufferPtr spDstFrameBuffer(GetCompatibleDepthStencilAttachmentFrameBuffer(pDstView, bDepth, bStencil, this));
-
-            if (spSrcFrameBuffer == NULL || spDstFrameBuffer == NULL)
-            {
-                return false;
-            }
-
-            GLenum eDSMask((bDepth ? GL_DEPTH_BUFFER_BIT : 0) | (bStencil ? GL_STENCIL_BUFFER_BIT : 0));
-            BlitFrameBuffer(
-                spSrcFrameBuffer->m_kObject, spDstFrameBuffer->m_kObject,
-                0, 0,
-                iSrcXMin, iSrcYMin, iSrcXMax, iSrcYMax,
-                iDstXMin, iDstYMin, iDstXMax, iDstYMax,
-                eDSMask, eFilter);
-        }
-
-        return true;
-    }
-
-    void CContext::ReadbackFrameBufferAttachment(
-        SFrameBufferObject& kFBO, GLenum eColorBuffer,
-        GLint iXMin, GLint iYMin, GLsizei iWidth, GLint iHeight,
-        GLenum eBaseFormat, GLenum eDataType,
-        GLvoid* pvData)
-    {
-        BindReadFrameBuffer(kFBO.m_kName);
-        glReadBuffer(eColorBuffer);
-
-#if !DXGLES
-        if (CACHE_VAR(m_kStateCache.m_bFrameBufferSRGBEnabled, kFBO.m_bUsesSRGB))
-        {
-            SetEnabledState(GL_FRAMEBUFFER_SRGB, kFBO.m_bUsesSRGB);
-        }
-#endif //!DXGLES
-
-        glReadPixels(iXMin, iYMin, iWidth, iHeight, eBaseFormat, eDataType, pvData);
-    }
-
-    bool CContext::ReadBackOutputMergerView(SOutputMergerView* pView, GLint iXMin, GLint iYMin, GLsizei iWidth, GLint iHeight, GLvoid* pvData)
-    {
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pView->m_eFormat));
-
-        if (pFormatInfo->m_pUncompressed == NULL)
-        {
-            return false;
-        }
-
-        bool bDepth(pFormatInfo->m_pUncompressed->m_eDepthType   != eGICT_UNUSED);
-        bool bStencil(pFormatInfo->m_pUncompressed->m_eStencilType != eGICT_UNUSED);
-        if (bDepth || bStencil)
-        {
-            return false;
-        }
-
-        uint32 uAttachment;
-        SFrameBufferPtr spFrameBuffer(GetCompatibleColorAttachmentFrameBuffer(pView, uAttachment, this));
-
-        if (spFrameBuffer == NULL)
-        {
-            return false;
-        }
-
-        ReadbackFrameBufferAttachment(
-            spFrameBuffer->m_kObject,
-            SFrameBufferConfiguration::AttachmentIndexToID(uAttachment),
-            iXMin, iYMin, iWidth, iHeight,
-            pFormatInfo->m_pTexture->m_eBaseFormat, pFormatInfo->m_pTexture->m_eDataType,
-            pvData);
-
-        return true;
-    }
-
-#if DXGL_ENABLE_SHADER_TRACING
-
-    void CContext::TogglePixelTracing(bool bEnable, uint32 uShaderHash, uint32 uPixelX, uint32 uPixelY)
-    {
-        if (bEnable)
-        {
-            m_eStageTracing = eST_Fragment;
-            m_uShaderTraceHash = uShaderHash;
-            m_kStageTracingInfo.m_kFragment.m_uFragmentCoordX = uPixelX;
-            m_kStageTracingInfo.m_kFragment.m_uFragmentCoordY = uPixelY;
-        }
-        else if (m_eStageTracing == eST_Fragment)
-        {
-            m_eStageTracing = eST_NUM;
-        }
-    }
-
-    void CContext::ToggleVertexTracing(bool bEnable, uint32 uShaderHash, uint32 uVertexIndex)
-    {
-        if (bEnable)
-        {
-            m_eStageTracing = eST_Vertex;
-            m_uShaderTraceHash = uShaderHash;
-            m_kStageTracingInfo.m_kVertex.m_uVertexIndex = uVertexIndex;
-        }
-        else if (m_eStageTracing == eST_Vertex)
-        {
-            m_eStageTracing = eST_NUM;
-        }
-    }
-
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-#if DXGL_TRACE_CALLS
-
-    void CContext::CallTraceWrite(const char* szTrace)
-    {
-        fprintf(m_kCallTrace.m_pFile, szTrace);
-    }
-
-    void CContext::CallTraceFlush()
-    {
-        fflush(m_kCallTrace.m_pFile);
-    }
-
-#endif //DXGL_TRACE_CALLS
-
-    void CContext::OnApplicationWindowCreated()
-    {
-#if defined(DXGL_USE_EGL)
-        if (m_type != RenderingType)
-        {
-            return;
-        }
-
-        AZ_Assert(m_kWindowContext, "Null WindowContext");
-        EGLNativeWindowType window = EGL_NULL_VALUE;
-#   if defined(ANDROID)
-        window = AZ::Android::Utils::GetWindow();
-#   else
-        DXGL_NOT_IMPLEMENTED;
-        return;
-#   endif // defined(ANDROID)
-        m_kWindowContext->SetWindow(window);
-#else
-        DXGL_NOT_IMPLEMENTED;
-#endif
-    }
-
-    void CContext::OnApplicationWindowDestroy()
-    {
-#if defined(DXGL_USE_EGL)
-        AZ_Assert(m_kWindowContext, "Null WindowContext");
-        m_kWindowContext->SetWindow(EGL_NULL_VALUE);
-#else
-        DXGL_NOT_IMPLEMENTED
-#endif
-    }
-
-
-#undef CACHE_VAR
-#undef CACHE_FIELD
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLContext.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLContext.hpp
deleted file mode 100644
index 20ad188bd1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLContext.hpp
+++ /dev/null
@@ -1,926 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the type CContext.
-
-
-#ifndef __GLCONTEXT__
-#define __GLCONTEXT__
-
-#include "GLCommon.hpp"
-#include "GLFormat.hpp"
-#include "GLState.hpp"
-#include "GLResource.hpp"
-#include "GLShader.hpp"
-#include "GLView.hpp"
-#include "GLBlitFramebufferHelper.hpp"
-
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzFramework/API/ApplicationAPI.h>
-
-namespace NCryOpenGL
-{
-    enum
-    {
-        // Slots are the virtual binding points accessible through the Direct3D interface
-        MAX_STAGE_TEXTURE_SLOTS         = D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT,
-        MAX_STAGE_SAMPLER_SLOTS         = D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT,
-        MAX_STAGE_IMAGE_SLOTS           = D3D11_PS_CS_UAV_REGISTER_COUNT,
-        MAX_STAGE_STORAGE_BUFFER_SLOTS  = D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT,
-        MAX_STAGE_CONSTANT_BUFFER_SLOTS = D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT,
-
-        MAX_TEXTURE_SLOTS               = eST_NUM * MAX_STAGE_TEXTURE_SLOTS,
-        MAX_SAMPLER_SLOTS               = eST_NUM * MAX_STAGE_SAMPLER_SLOTS,
-        MAX_IMAGE_SLOTS                 = eST_NUM * MAX_STAGE_IMAGE_SLOTS,
-        MAX_STORAGE_BUFFER_SLOTS        = eST_NUM * MAX_STAGE_STORAGE_BUFFER_SLOTS,
-        MAX_CONSTANT_BUFFER_SLOTS       = eST_NUM * MAX_STAGE_CONSTANT_BUFFER_SLOTS,
-
-        // Units are the actual OpenGL binding points for resources - these are maximum numbers -
-        // the actual supported counts are queried at runtime.
-        MAX_TEXTURE_UNITS               = eST_NUM * 64,
-        MAX_IMAGE_UNITS                 = eST_NUM * 8,
-        MAX_STORAGE_BUFFER_UNITS        = eST_NUM * 64,
-        MAX_UNIFORM_BUFFER_UNITS        = eST_NUM * 16,
-
-        MAX_VERTEX_ATTRIBUTES = D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT,
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        MAX_VERTEX_ATTRIB_BINDINGS = MAX_VERTEX_ATTRIBUTES,
-#endif //DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        MAX_PREVIOUS_FRAMES = 4,
-#endif // DXGL_STREAMING_CONSTANT_BUFFERS
-    };
-
-    COMPILE_TIME_ASSERT((uint32)MAX_TEXTURE_SLOTS <= (uint32)SUnitMap::MAX_TEXTURE_SLOT_IN_MAP);
-    COMPILE_TIME_ASSERT((uint32)MAX_SAMPLER_SLOTS <= (uint32)SUnitMap::MAX_SAMPLER_SLOT_IN_MAP);
-    COMPILE_TIME_ASSERT((uint32)MAX_TEXTURE_UNITS <= (uint32)SUnitMap::MAX_TEXTURE_UNIT_IN_MAP);
-
-    inline uint32 TextureSlot(EShaderType eStage, uint32 uIndex) { return uIndex + eStage * MAX_STAGE_TEXTURE_SLOTS; }
-    inline uint32 SamplerSlot(EShaderType eStage, uint32 uIndex) { return uIndex + eStage * MAX_STAGE_SAMPLER_SLOTS; }
-    inline uint32 ImageSlot(EShaderType eStage, uint32 uIndex) { return uIndex + eStage * MAX_STAGE_IMAGE_SLOTS; }
-    inline uint32 StorageBufferSlot(EShaderType eStage, uint32 uIndex) { return uIndex + eStage * MAX_STAGE_STORAGE_BUFFER_SLOTS; }
-    inline uint32 ConstantBufferSlot(EShaderType eStage, uint32 uIndex) { return uIndex + eStage * MAX_STAGE_CONSTANT_BUFFER_SLOTS; }
-
-    struct SGlobalConfig
-    {
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        static int iStreamingConstantBuffersMode;
-        static int iStreamingConstantBuffersPersistentMap;
-        static int iStreamingConstantBuffersGranularity;
-        static int iStreamingConstantBuffersGrowth;
-        static int iStreamingConstantBuffersMaxUnits;
-#endif
-        static int iMinFramePoolSize;
-        static int iMaxFramePoolSize;
-        static int iBufferUploadMode;
-#if DXGL_ENABLE_SHADER_TRACING
-        static int iShaderTracingMode;
-        static int iShaderTracingHash;
-        static int iVertexTracingID;
-        static int iPixelTracingX;
-        static int iPixelTracingY;
-#endif
-
-        static void RegisterVariables();
-        static void SetIHVDefaults();
-    };
-
-    // The reference values for the stencil operations
-    struct SStencilRefCache
-    {
-        // Stencil reference value for front-facing polygons and non-polygons
-        GLint m_iFrontFacesReference;
-
-        // Stencil reference value for back-facing polygons
-        GLint m_iBackFacesReference;
-    };
-
-    // Additional OpenGL internal state that is implicitly mapped to the depth stencil state
-    struct SDepthStencilCache
-        : SDepthStencilState
-    {
-        SStencilRefCache m_kStencilRef;
-    };
-
-    typedef SBlendState SBlendCache;
-
-    // Additional OpenGL internal state that is implicitly mapped to the rasterizer state
-    struct SRasterizerCache
-        : SRasterizerState
-    {
-        bool m_bPolygonOffsetFillEnabled;
-#if !DXGLES
-        bool m_bPolygonOffsetLineEnabled;
-#endif //!DXGLES
-    };
-
-    // Additional OpenGL internal state that is implicitly mapped to the texture unit state
-    struct STextureUnitCache
-    {
-        CResourceName m_kTextureName;
-        GLenum m_eTextureTarget;
-        GLuint m_uSampler;
-    };
-
-    struct STextureSlot
-    {
-        SShaderTextureBasedView* m_pView;
-
-        STextureSlot()
-            : m_pView(NULL)
-        {
-        }
-
-        bool operator==(const STextureSlot& kOther) const
-        {
-            return m_pView == kOther.m_pView;
-        }
-
-        bool operator!=(const STextureSlot& kOther) const
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    struct SSamplerSlot
-    {
-        SSamplerState* m_pSampler;
-
-        SSamplerSlot(SSamplerState* pSampler = NULL)
-            : m_pSampler(pSampler)
-        {
-        }
-
-        bool operator==(const SSamplerSlot& kOther) const
-        {
-            return m_pSampler == kOther.m_pSampler;
-        }
-
-        bool operator!=(const SSamplerSlot& kOther) const
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    struct STextureUnitContext
-    {
-        STextureUnitCache m_kCurrentUnitState;
-        std::vector<STexture*> m_kModifiedTextures;
-    };
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-
-    struct SImageUnitCache
-    {
-        CResourceName m_kTextureName;
-        SShaderImageViewConfiguration m_kConfiguration;
-    };
-
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-    // Additional OpenGL internal state that is implicitly mapped to the input assembler state
-    struct SInputAssemblerCache
-    {
-        typedef uint32 TAttributeBitMask;
-
-        // Bit mask with 1 in the position of every vertex attribute enabled
-        TAttributeBitMask m_uVertexAttribsEnabled;
-
-        GLuint m_auVertexAttribDivisors[MAX_VERTEX_ATTRIBUTES];
-
-        struct SVertexAttribPointer
-        {
-            GLint m_iSize;
-            GLenum m_eType;
-            GLboolean m_bNormalized;
-            GLsizei m_iStride;
-            GLvoid* m_pPointer;
-            GLboolean m_bInteger;
-
-            bool operator == (const SVertexAttribPointer& kOther) const
-            {
-                return
-                    m_iSize == kOther.m_iSize &&
-                    m_eType == kOther.m_eType &&
-                    m_bNormalized == kOther.m_bNormalized &&
-                    m_iStride == kOther.m_iStride &&
-                    m_pPointer == kOther.m_pPointer &&
-                    m_bInteger == kOther.m_bInteger;
-            }
-
-            bool operator != (const SVertexAttribPointer& kOther) const
-            {
-                return !operator==(kOther);
-            }
-        };
-        SVertexAttribPointer m_auVertexAttribPointer[MAX_VERTEX_ATTRIBUTES];
-
-        struct SVertexAttribFormat
-        {
-            GLint m_iSize;
-            GLuint m_uRelativeOffset;
-            GLenum m_eType;
-            GLboolean m_bNormalized;
-            GLboolean m_bInteger;
-
-            bool operator == (const SVertexAttribFormat& kOther) const
-            {
-                return
-                    m_iSize           == kOther.m_iSize &&
-                    m_uRelativeOffset == kOther.m_uRelativeOffset &&
-                    m_eType           == kOther.m_eType &&
-                    m_bNormalized     == kOther.m_bNormalized &&
-                    m_bInteger        == kOther.m_bInteger;
-            }
-
-            bool operator != (const SVertexAttribFormat& kOther) const
-            {
-                return !operator==(kOther);
-            }
-        };
-
-        SVertexAttribFormat m_aVertexAttribFormats[MAX_VERTEX_ATTRIBUTES];
-
-        GLuint m_auVertexBindingIndices[MAX_VERTEX_ATTRIBUTES];
-
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        // vertex buffer bindings (note that we don't cache buffer, offset and stride since those change for each call to glBindVertexBuffers
-        GLuint m_auVertexBindingDivisors[MAX_VERTEX_ATTRIB_BINDINGS];
-
-        // watermark so we can avoid sending redundant state
-        GLint m_iLastNonZeroBindingSlot;
-#endif //DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-    };
-
-    struct SInputAssemblerSlot
-    {
-        SBuffer* m_pVertexBuffer;
-        uint32 m_uStride;
-        uint32 m_uOffset;
-
-        SInputAssemblerSlot()
-            : m_pVertexBuffer(NULL)
-            , m_uStride(0)
-            , m_uOffset(0)
-        {
-        }
-    };
-
-    struct SColor
-    {
-        GLfloat m_afRGBA[4];
-
-        inline bool operator==(const SColor& kOther) const
-        {
-            return memcmp(m_afRGBA, kOther.m_afRGBA, sizeof(m_afRGBA)) == 0;
-        }
-
-        inline bool operator!=(const SColor& kOther) const
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    struct SIndexedBufferBinding
-    {
-        CResourceName m_kName;
-        SBufferRange m_kRange;
-
-        SIndexedBufferBinding(const CResourceName& kName = CResourceName(), SBufferRange kRange = SBufferRange())
-            : m_kName(kName)
-            , m_kRange(kRange)
-        {
-        }
-
-        bool operator==(const SIndexedBufferBinding& kOther) const
-        {
-            return
-                m_kName   == kOther.m_kName &&
-                m_kRange  == kOther.m_kRange;
-        }
-
-        bool operator!=(const SIndexedBufferBinding& kOther) const
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    typedef SIndexedBufferBinding TIndexedBufferBinding;
-
-#if DXGL_SUPPORT_VIEWPORT_ARRAY
-    typedef GLdouble TDepthRangeValue;
-    typedef GLfloat  TViewportValue;
-#else
-    typedef GLclampf TDepthRangeValue;
-    typedef GLuint   TViewportValue;
-#endif
-
-    // The state that is not directly mapped to any of the DirectX 11 states
-    struct SImplicitStateCache
-    {
-        // The name of the frame buffer currently to GL_DRAW_FRAMEBUFFER
-        CResourceName m_kDrawFrameBuffer;
-
-        // The name of the frame buffer currently to GL_READ_FRAMEBUFFER
-        CResourceName m_kReadFrameBuffer;
-
-#if !DXGLES
-        // The enable state of GL_FRAMEBUFFER_SRGB
-        bool m_bFrameBufferSRGBEnabled;
-#endif //!DXGLES
-
-#if DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-        bool m_bSampleMaskEnabled;
-        GLbitfield m_aSampleMask;
-#endif //DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-
-        SColor m_akBlendColor;
-
-        // Viewport xy ranges
-        TViewportValue m_akViewportData[DXGL_NUM_SUPPORTED_VIEWPORTS * 4];
-
-        // Viewport depth ranges
-        TDepthRangeValue m_akDepthRangeData[DXGL_NUM_SUPPORTED_VIEWPORTS * 2];
-
-#if DXGL_SUPPORT_TESSELLATION
-        GLint m_iNumPatchControlPoints;
-#endif //DXGL_SUPPORT_TESSELLATION
-
-        // The buffer currently bound to each buffer target
-        CResourceName m_akBuffersBound[eBB_NUM];
-
-        // The buffer range currently bound to each indexed buffer
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        TIndexedBufferBinding m_akStorageBuffersBound[MAX_STORAGE_BUFFER_UNITS];
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        TIndexedBufferBinding m_akUniformBuffersBound[MAX_UNIFORM_BUFFER_UNITS];
-
-        // Pixelstore values
-        GLint m_iUnpackRowLength;
-        GLint m_iUnpackImageHeight;
-        GLint m_iUnpackAlignment;
-        GLint m_iPackRowLength;
-#if !DXGLES
-        GLint m_iPackImageHeight;
-#endif //!DXGLES
-        GLint m_iPackAlignment;
-        GLenum m_glActiveTexture;
-    };
-
-    // Stores the current state of an OpenGL so that the device can lazily update
-    // states without the overhead of calling glGet* functions.
-    struct SStateCache
-        : SImplicitStateCache
-    {
-        SBlendCache m_kBlend;
-        SDepthStencilCache m_kDepthStencil;
-        SRasterizerCache m_kRasterizer;
-        SStencilRefCache m_kStencilRef;
-        STextureUnitCache m_akTextureUnits[MAX_TEXTURE_UNITS];
-#if DXGL_SUPPORT_SHADER_IMAGES
-        SImageUnitCache m_akImageUnits[MAX_IMAGE_UNITS];
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-        SInputAssemblerCache m_kInputAssembler;
-        GLint m_akGLScissorData[DXGL_NUM_SUPPORTED_SCISSOR_RECTS * 4];
-    };
-
-#if DXGL_ENABLE_SHADER_TRACING
-
-    struct SVertexShaderTraceHeader
-    {
-        uint32 m_uVertexID;
-    };
-
-    struct SFragmentShaderTraceHeader
-    {
-        float m_afFragmentCoordX;
-        float m_afFragmentCoordY;
-    };
-
-    struct SVertexShaderTraceInfo
-    {
-        SVertexShaderTraceHeader m_kHeader;
-        uint32 m_uVertexIndex;
-    };
-
-    struct SFragmentShaderTraceInfo
-    {
-        SFragmentShaderTraceHeader m_kHeader;
-        uint32 m_uFragmentCoordX;
-        uint32 m_uFragmentCoordY;
-    };
-
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-
-    struct SConstantBufferSlot
-    {
-        SBuffer* m_pBuffer;
-        SBufferRange m_kRange;
-
-        SConstantBufferSlot()
-            : m_pBuffer(NULL) {}
-    };
-
-    typedef SConstantBufferSlot TConstantBufferSlot;
-
-    struct SContextFrame
-    {
-        GLsync m_pEndFence;
-        uint32 m_uRefCount;
-        SContextFrame** m_pFreeHead;
-        SContextFrame* m_pNext;
-
-        SContextFrame(SContextFrame** pFreeHead)
-            : m_uRefCount(0)
-            , m_pFreeHead(pFreeHead)
-            , m_pEndFence(NULL)
-        {
-        }
-
-        ~SContextFrame()
-        {
-            m_pNext = *m_pFreeHead;
-            * m_pFreeHead = this;
-        }
-
-        void AddRef()
-        {
-            ++m_uRefCount;
-        }
-
-        void Release()
-        {
-            if (--m_uRefCount == 0)
-            {
-                this->~SContextFrame();
-            }
-        }
-    };
-
-    struct SStreamingBuffer
-    {
-        CResourceName m_kName;
-        uint32 m_uSectionCapacity;
-        uint32 m_uRequestedSectionSize;
-        uint32 m_uNextPosition;
-        uint32 m_uEndPosition;
-#if DXGL_SUPPORT_BUFFER_STORAGE
-        GLvoid* m_pMappedData;
-#endif
-
-        SStreamingBuffer()
-            : m_uSectionCapacity(0)
-            , m_uRequestedSectionSize(0)
-            , m_uNextPosition(0)
-            , m_uEndPosition(0)
-#if DXGL_SUPPORT_BUFFER_STORAGE
-            , m_pMappedData(NULL)
-#endif
-        {
-        }
-
-        ~SStreamingBuffer()
-        {
-            if (m_kName.IsValid())
-            {
-                GLuint uName(m_kName.GetName());
-                glDeleteBuffers(1, &uName);
-            }
-        }
-    };
-
-    struct SStreamingBufferContext
-    {
-        SContextFramePtr m_spCurrentFrame;
-        SContextFramePtr m_aspPreviousFrames[MAX_PREVIOUS_FRAMES];
-        SContextFrame* m_pFreeFramesHead;
-        std::vector<SContextFrame*> m_kFramePools;
-        uint32 m_uPreviousFrameIndex, m_uNumPreviousFrames;
-#if DXGL_SUPPORT_BUFFER_STORAGE
-        bool m_bFlushNeeded;
-#endif
-
-        SStreamingBuffer m_akStreamingBuffers[MAX_UNIFORM_BUFFER_UNITS];
-        uint32 m_uNumStreamingBuffersUnits;
-
-        SStreamingBufferContext();
-        ~SStreamingBufferContext();
-
-        void SwitchFrame(CDevice* pDevice);
-        void UpdateStreamingSizes(CDevice* pDevice);
-
-        void UploadAndBindUniformData(CContext* pContext, const SConstantBufferSlot& kSlot, uint32 uUnit);
-        void FlushUniformData();
-    };
-
-#else
-
-    typedef TIndexedBufferBinding TConstantBufferSlot;
-
-#endif
-
-    class CContext
-        : public SList::TListEntry
-        , public AzFramework::ApplicationLifecycleEvents::Bus::Handler
-    {
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        friend struct SStreamingBufferContext;
-#endif
-    public:
-        enum ContextType
-        {
-            RenderingType, // Context used to render to a window
-            ResourceType, // Context used for loading resources
-            NumContextTypes // Must be last one
-        };
-
-        CContext(
-            CDevice* pDevice,
-            const TRenderingContext& kRenderingContext,
-            const TWindowContext& kDefaultWindowContext,
-            uint32 uIndex,
-            ContextType type);
-        ~CContext();
-
-        bool Initialize();
-
-        // Context management
-        uint32 IncReservationCount() { return ++m_uReservationCount; }
-        uint32 DecReservationCount() { return --m_uReservationCount; }
-        const TRenderingContext& GetRenderingContext() { return m_kRenderingContext; }
-        const TWindowContext& GetWindowContext() { return m_kWindowContext; }
-        CDevice* GetDevice() { return m_pDevice; }
-        uint32 GetIndex() { return m_uIndex; }
-        ContextType GetType() const { return m_type; }
-        CContext* GetReservedContext() { return m_pReservedContext; }
-        void SetReservedContext(CContext* pReservedContext) { m_pReservedContext = pReservedContext; }
-        void SetWindowContext(const TWindowContext& kWindowContext);
-
-        // Explicit state
-        bool SetBlendState(const SBlendState& kState);
-        bool SetRasterizerState(const SRasterizerState& kState);
-        bool SetDepthStencilState(const SDepthStencilState& kDepthStencilState, GLint iStencilRef);
-        void SetBlendColor(GLfloat afRed, GLfloat fGreen, GLfloat fBlue, GLfloat fAlpha);
-        void SetSampleMask(GLbitfield aSampleMask);
-        void SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY eTopology);
-        void SetViewports(uint32 uNumViewports, const D3D11_VIEWPORT* pViewports);
-        void SetScissorRects(uint32 uNumRects, const D3D11_RECT* pRects);
-        void SetRenderTargets(uint32 uNumRTViews, SOutputMergerView** apRenderTargetViews, SOutputMergerView* pDepthStencilView);
-        void SetShader(SShader* pShader, uint32 uStage);
-        void SetInputLayout(SInputLayout* pInputLayout);
-        void SetVertexBuffer(uint32 uSlot, SBuffer* pVertexBuffer, uint32 uStride, uint32 uOffset);
-        void SetIndexBuffer(SBuffer* pIndexBuffer, GLenum eIndexType, GLuint uIndexStride, GLuint uOffset);
-        void SetShaderResourceView(SShaderView* pShaderResourceView, uint32 uStage, uint32 uIndex);
-        void SetUnorderedAccessView(SShaderView* pUnorderedResourceView, uint32 uStage, uint32 uIndex);
-        void SetSampler(SSamplerState* pState, uint32 uStage, uint32 uIndex);
-        void SetConstantBuffer(SBuffer* pConstantBuffer, SBufferRange kRange, uint32 uStage, uint32 uIndex);
-
-        // Implicit state
-        void SetShaderTexture(SShaderTextureBasedView* pView, uint32 uStage, uint32 uIndex);
-#if DXGL_SUPPORT_SHADER_IMAGES
-        void SetShaderImage(SShaderImageView* pView, uint32 uStage, uint32 uIndex);
-#endif
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        void SetShaderBuffer(SShaderBufferView* pView, uint32 uStage, uint32 uIndex);
-#endif
-        void SetUnpackRowLength(GLint iValue);
-        void SetUnpackImageHeight(GLint iValue);
-        void SetUnpackAlignment(GLint iValue);
-        void SetPackRowLength(GLint iValue);
-        void SetPackImageHeight(GLint iValue);
-        void SetPackAlignment(GLint iValue);
-        GLenum BindBuffer(const CResourceName& kBufferName, EBufferBinding eBinding);
-        GLenum BindBuffer(SBuffer* pBuffer, EBufferBinding eBinding);
-
-        // Commands
-        void ClearRenderTarget(SOutputMergerView* pRenderTargetView, const float afColor[4]);
-        void ClearDepthStencil(SOutputMergerView* pDepthStencilView, bool bClearDepth, bool bClearStencil, float fDepthValue, uint8 uStencilValue);
-        void DrawIndexed(uint32 uIndexCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation);
-        void Draw(uint32 uVertexCount, uint32 uStartVertexLocation);
-        void DrawIndexedInstanced(uint32 uIndexCountPerInstance, uint32 uInstanceCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation, uint32 uStartInstanceLocation);
-        void DrawInstanced(uint32 uVertexCountPerInstance, uint32 uInstanceCount, uint32 uStartVertexLocation, uint32 uStartInstanceLocation);
-#if DXGL_SUPPORT_COMPUTE
-        void Dispatch(uint32 uGroupX, uint32 uGroupY, uint32 uGroupZ);
-        void DispatchIndirect(uint32 uIndirectOffset);
-#endif
-        void Flush();
-
-        // Cached objects
-        _smart_ptr<SFrameBuffer> AllocateFrameBuffer(const SFrameBufferConfiguration& kConfiguration);
-        void RemoveFrameBuffer(SFrameBuffer* pFrameBuffer, SOutputMergerView* pInvalidView);
-        _smart_ptr<SPipeline> AllocatePipeline(const SPipelineConfiguration& kConfiguration);
-        void RemovePipeline(SPipeline* pPipeline, SShader* pInvalidShader);
-        _smart_ptr<SUnitMap> AllocateUnitMap(_smart_ptr<SUnitMap> spConfiguration);
-
-        // Copying
-        void BlitFrameBuffer(SFrameBufferObject& kSrcFBO, SFrameBufferObject& kDstFBO, GLenum eSrcColorBuffer, GLenum eDstColorBuffer, GLint iSrcXMin, GLint iSrcYMin, GLint iSrcXMax, GLint iSrcYMax, GLint iDstXMin, GLint iDstYMin, GLint iDstXMax, GLint iDstYMax, GLbitfield uMask, GLenum eFilter);
-        bool BlitOutputMergerView(SOutputMergerView* pSrcView, SOutputMergerView* pDstView, GLint iSrcXMin, GLint iSrcYMin, GLint iSrcXMax, GLint iSrcYMax, GLint iDstXMin, GLint iDstYMin, GLint iDstXMax, GLint iDstYMax, GLbitfield uMask, GLenum eFilter);
-        void ReadbackFrameBufferAttachment(SFrameBufferObject& kFBO, GLenum eColorBuffer, GLint iXMin, GLint iYMin, GLsizei iWidth, GLint iHeight, GLenum eBaseFormat, GLenum eDataType, GLvoid* pvData);
-        bool ReadBackOutputMergerView(SOutputMergerView* pView, GLint iXMin, GLint iYMin, GLsizei iWidth, GLint iHeight, GLvoid* pvData);
-
-#if DXGL_ENABLE_SHADER_TRACING
-        void TogglePixelTracing(bool bEnable, uint32 uShaderHash, uint32 uPixelX = 0, uint32 uPixelY = 0);
-        void ToggleVertexTracing(bool bEnable, uint32 uShaderHash, uint32 uVertexID = 0);
-#endif
-
-#if DXGL_TRACE_CALLS
-        void CallTraceWrite(const char* szTrace);
-        void CallTraceFlush();
-#endif
-
-        const CResourceName& GetCopyPixelBuffer() { AZ_Assert(m_kCopyPixelBuffer.IsValid(), "Invalid copy pixel buffer.");  return m_kCopyPixelBuffer; }
-
-        inline void NamedBufferDataFast(CResourceName kBufferName, GLsizeiptr iSize, const void* pData, GLenum eUsage);
-        inline void NamedBufferSubDataFast(CResourceName kBufferName, GLintptr iOffset, GLsizeiptr iSize, const void* pData);
-        inline GLvoid* MapNamedBufferRangeFast(CResourceName kBufferName, GLintptr iOffset, GLsizeiptr iLength, GLbitfield uAccess);
-        inline GLboolean UnmapNamedBufferFast(CResourceName kBufferName);
-
-        // Confetti Begin: David Srour
-        // Since binding framebuffers is deferred, we have to ensure that enabling/disabling PLS extension comes after binings.
-        inline void TogglePLS(bool const enable);
-
-        // Should only be called by DXGL layer only.
-        // This should not be called directly by and should never have to be exposed
-        // to the higher abstractions of the engine.
-        void UpdatePlsState(bool const preFramebufferBind);
-        //  Confetti End: David Srour
-
-    private:
-        bool GetBlendCache(SBlendCache& kCache);
-        bool GetDepthStencilCache(SDepthStencilCache& kDepthStencilCache);
-        bool GetRasterizerCache(SRasterizerCache& kCache);
-        bool GetTextureUnitCache(uint32 uUnit, STextureUnitCache& kCache);
-#if DXGL_SUPPORT_SHADER_IMAGES
-        bool GetImageUnitCache(uint32 uUnit, SImageUnitCache& kCache);
-#endif
-        bool GetInputAssemblerCache(SInputAssemblerCache& kCache);
-        bool GetImplicitStateCache(SImplicitStateCache& kCache);
-
-        bool InitializePipeline(SPipeline* pPipeline);
-
-        void BindUniformBuffer(const TIndexedBufferBinding& kBufferRange, uint32 uUnit);
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        void BindStorageBuffer(const TIndexedBufferBinding& kBufferRange, uint32 uUnit);
-#endif
-#if DXGL_SUPPORT_SHADER_IMAGES
-        void BindImage(const CResourceName& kName, SShaderImageViewConfiguration kConfiguration, uint32 uUnit);
-#endif
-
-        void BindDrawFrameBuffer(const CResourceName& kName);
-        void BindReadFrameBuffer(const CResourceName& kName);
-        void SetNumPatchControlPoints(GLint uNumControlPoints);
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        void SetVertexOffset(uint32 uVertexOffset);
-#endif
-
-        void FlushDrawState();
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        void FlushInputAssemblerStateVab();
-#endif
-        void FlushInputAssemblerState();
-        void FlushFrameBufferState();
-        void FlushPipelineState();
-#if DXGL_SUPPORT_COMPUTE
-        void FlushDispatchState();
-#endif
-        void FlushTextureUnits();
-        void FlushUniformBufferUnits();
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        void FlushStorageBufferUnits();
-#endif
-#if DXGL_SUPPORT_SHADER_IMAGES
-        void FlushImageUnits();
-#endif
-        void FlushResourceUnits();
-#if DXGL_ENABLE_SHADER_TRACING
-        void FlushShaderTracingState();
-#endif
-
-#if defined(ANDROID)
-        void FlushFrameBufferDontCareState(bool bOnBind);
-#endif
-#if defined(DXGL_USE_LAZY_CLEAR)
-        void FlushFrameBufferLazyClearState();
-#endif
-
-        void SwitchFrame();
-
-#if DXGL_ENABLE_SHADER_TRACING
-        void PrepareTraceHeader(uint32 uFirstVertex, uint32 uFirstIndex);
-        void BeginTrace(uint32 uFirstVertex, uint32 uFirstIndex);
-        void EndTrace();
-#endif
-
-        void OnApplicationWindowCreated() override;
-        void OnApplicationWindowDestroy() override;
-
-    protected:
-        typedef AZStd::pair<uint32, ColorF> ClearColorArg;
-        void ClearDepthStencilInternal(bool clearDepth, bool clearStencil, float depthValue, uint8 stencilValue);
-        void ClearRenderTargetInternal(const AZStd::vector<ClearColorArg>& args);
-
-    private:
-        uint32 m_uIndex;
-        CContext* m_pReservedContext;
-        CDevice* m_pDevice;
-        TRenderingContext m_kRenderingContext;
-        TWindowContext m_kWindowContext;
-        uint32 m_uReservationCount;
-
-        SStateCache m_kStateCache;
-        GLenum m_ePrimitiveTopologyMode;
-        GLenum m_eIndexType;
-        GLuint m_uIndexStride;
-        GLuint m_uIndexOffset;
-        SPipelinePtr m_spPipeline;
-        SFrameBufferPtr m_spFrameBuffer;
-        GLuint m_uGlobalVAO;
-        STextureUnitContext m_kTextureUnitContext;
-
-        // State that is only synchronized during draw calls
-        SFrameBufferConfiguration m_kFrameBufferConfig;
-        SPipelineConfiguration m_kPipelineConfiguration;
-        SInputLayout* m_pInputLayout;
-        SInputAssemblerSlot m_akInputAssemblerSlots[MAX_VERTEX_ATTRIBUTES];
-        STextureSlot m_akTextureSlots[MAX_TEXTURE_SLOTS];
-        SSamplerSlot m_akSamplerSlots[MAX_SAMPLER_SLOTS];
-#if DXGL_SUPPORT_SHADER_IMAGES
-        SImageUnitCache m_akImageSlots[MAX_IMAGE_SLOTS];
-#endif
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        TIndexedBufferBinding m_akStorageBufferSlots[MAX_STORAGE_BUFFER_SLOTS];
-#endif
-        TConstantBufferSlot m_akConstantBufferSlots[MAX_CONSTANT_BUFFER_SLOTS];
-        SUnitMap* m_apResourceUnitMaps[eRUT_NUM];
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        SStreamingBufferContext m_kStreamingBuffers;
-#endif
-#if !DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX
-        uint32 m_uVertexOffset;
-#endif
-
-        // Flags that tell which parts of the state need to be synchronized during the next draw call
-        bool m_bFrameBufferStateDirty;
-        bool m_bPipelineDirty;
-        bool m_bInputLayoutDirty;
-        bool m_bInputAssemblerSlotsDirty;
-        bool m_abResourceUnitsDirty[eRUT_NUM];
-
-        // Confetti Begin: David Srour
-        // Since binding framebuffers is deferred, we have to ensure that :
-        // - enabling PLS extension comes after biding FBO.
-        // - disabling PLS extension before biding FBO.
-        enum PLS_STATE
-        {
-            PLS_IGNORE = 0,
-            PLS_ENABLE,
-            PLS_DISABLE
-        };
-        PLS_STATE m_PlsExtensionState;
-        // Confetti End: David Srour
-
-#if DXGL_ENABLE_SHADER_TRACING
-        CResourceName m_kShaderTracingBuffer;
-        TIndexedBufferBinding m_kReplacedStorageBuffer;
-        EShaderType m_eStageTracing;
-        uint32 m_uShaderTraceHash;
-        uint32 m_uShaderTraceCount;
-        union
-        {
-            SVertexShaderTraceInfo   m_kVertex;
-            SFragmentShaderTraceInfo m_kFragment;
-        } m_kStageTracingInfo;
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-#if DXGL_TRACE_CALLS
-        STraceFile m_kCallTrace;
-#endif
-
-        CResourceName m_kCopyPixelBuffer;
-        SPipelineCompilationBuffer m_kPipelineCompilationBuffer;
-
-        // Hash maps of persistent frame buffers, pipelines and sampler unit maps that can be re-used every time
-        // a compatible configuration is requested.
-        struct SFrameBufferCache* m_pFrameBufferCache;
-        struct SPipelineCache* m_pPipelineCache;
-        struct SUnitMapCache* m_pUnitMapCache;
-
-        ContextType m_type;
-
-    public:
-        // Blit a texture into a framebuffer using a shader instead of the glBlitFramebuffer function.
-        // If possible use Context::BlitFrameBuffer instead.
-        bool BlitTextureToFrameBuffer(SShaderTextureView* srcTexture,
-                                        SFrameBufferObject& kDstFBO,
-                                        GLenum eDstColorBuffer,
-                                        GLint iSrcXMin, GLint iSrcYMin, GLint iSrcXMax, GLint iSrcYMax,
-                                        GLint iDstXMin, GLint iDstYMin, GLint iDstXMax, GLint iDstYMax,
-                                        GLenum minFilter, GLenum magFilter) 
-        {
-            return m_blitHelper.BlitTexture(srcTexture, kDstFBO, eDstColorBuffer, 
-                                            iSrcXMin, iSrcYMin, iSrcXMax, iSrcYMax, 
-                                            iDstXMin, iDstYMin, iDstXMax, iDstYMax, 
-                                            minFilter, magFilter);
-        }
-
-    private:
-        friend class GLBlitFramebufferHelper;
-        GLBlitFramebufferHelper m_blitHelper;
-    };
-
-    template <typename T>
-    inline bool RefreshCache(T& kCache, T kState)
-    {
-        bool bDirty(kCache != kState);
-        kCache = kState;
-        return bDirty;
-    }
-
-#define CACHE_VAR(_Cache, _State) RefreshCache(_Cache, _State)
-#define CACHE_FIELD(_Cache, _State, _Member) RefreshCache((_Cache)._Member, (_State)._Member)
-
-    inline void CContext::NamedBufferDataFast(CResourceName kBufferName, GLsizeiptr iSize, const void* pData, GLenum eUsage)
-    {
-#if defined(glNamedBufferDataEXT) || !defined(USE_FAST_NAMED_APPROXIMATION)
-        glNamedBufferDataEXT(kBufferName.GetName(), iSize, pData, eUsage);
-#else
-        if (CACHE_VAR(m_kStateCache.m_akBuffersBound[eBB_CopyWrite], kBufferName))
-        {
-            glBindBuffer(GL_COPY_WRITE_BUFFER, kBufferName.GetName());
-        }
-
-        glBufferData(GL_COPY_WRITE_BUFFER, iSize, pData, eUsage);
-#endif
-    }
-
-    inline void CContext::NamedBufferSubDataFast(CResourceName kBufferName, GLintptr iOffset, GLsizeiptr iSize, const void* pData)
-    {
-#if defined(glNamedBufferSubDataEXT) || !defined(USE_FAST_NAMED_APPROXIMATION)
-        glNamedBufferSubDataEXT(kBufferName.GetName(), iOffset, iSize, pData);
-#else
-        if (CACHE_VAR(m_kStateCache.m_akBuffersBound[eBB_CopyWrite], kBufferName))
-        {
-            glBindBuffer(GL_COPY_WRITE_BUFFER, kBufferName.GetName());
-        }
-
-        glBufferSubData(GL_COPY_WRITE_BUFFER, iOffset, iSize, pData);
-#endif
-    }
-
-    inline GLvoid* CContext::MapNamedBufferRangeFast(CResourceName kBufferName, GLintptr iOffset, GLsizeiptr iLength, GLbitfield uAccess)
-    {
-#if defined(glMapNamedBufferRangeEXT) || !defined(USE_FAST_NAMED_APPROXIMATION)
-        return glMapNamedBufferRangeEXT(kBufferName.GetName(), iOffset, iLength, uAccess);
-#else
-        if (CACHE_VAR(m_kStateCache.m_akBuffersBound[eBB_CopyWrite], kBufferName))
-        {
-            glBindBuffer(GL_COPY_WRITE_BUFFER, kBufferName.GetName());
-        }
-
-        return glMapBufferRange(GL_COPY_WRITE_BUFFER, iOffset, iLength, uAccess);
-#endif
-    }
-
-    inline GLboolean CContext::UnmapNamedBufferFast(CResourceName kBufferName)
-    {
-#if defined(glUnmapNamedBufferEXT) || !defined(USE_FAST_NAMED_APPROXIMATION)
-        return glUnmapNamedBufferEXT(kBufferName.GetName());
-#else
-        if (CACHE_VAR(m_kStateCache.m_akBuffersBound[eBB_CopyWrite], kBufferName))
-        {
-            glBindBuffer(GL_COPY_WRITE_BUFFER, kBufferName.GetName());
-        }
-
-        return glUnmapBuffer(GL_COPY_WRITE_BUFFER);
-#endif
-    }
-
-    inline void CContext::TogglePLS(bool const enable)
-    {
-        // 0 = don't do anything, 1 = enable, 2 = disable
-        // Toggling the extension must be done in a deferred manner.  See m_PlsExtensionState' decleration for further details.
-        if (enable)
-        {
-            m_PlsExtensionState = PLS_ENABLE;
-        }
-        else
-        {
-            m_PlsExtensionState = PLS_DISABLE;
-        }
-    }
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLCryPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLCryPlatform.hpp
deleted file mode 100644
index c77ef17a36..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLCryPlatform.hpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Platform specific DXGL requirements implementation relying
-//               on CryCommon and CrySystem.
-
-
-#ifndef __GLCRYPLATFORM__
-#define __GLCRYPLATFORM__
-
-#include "DriverD3D.h"
-#include <AzCore/IO/FileIO.h>
-#include <AzFramework/IO/FileOperations.h>
-
-namespace NCryOpenGL
-{
-    inline void* Malloc(size_t size)
-    {
-        return CryModuleMalloc(size);
-    }
-
-    inline void* Calloc(size_t num, size_t size)
-    {
-        return CryModuleCalloc(num, size);
-    }
-
-    inline void* Realloc(void* memblock, size_t size)
-    {
-        return CryModuleRealloc(memblock, size);
-    }
-
-    inline void Free(void* memblock)
-    {
-        CryModuleFree(memblock);
-    }
-
-    inline void* Memalign(size_t size, size_t alignment)
-    {
-        return CryModuleMemalign(size, alignment);
-    }
-
-    inline void MemalignFree(void* memblock)
-    {
-        return CryModuleMemalignFree(memblock);
-    }
-
-    void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-
-    inline void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...)
-    {
-        EValidatorSeverity eValidatorSeverity(VALIDATOR_COMMENT);
-        switch (eSeverity)
-        {
-        case eLS_Error:
-            eValidatorSeverity = VALIDATOR_ERROR;
-            break;
-        case eLS_Warning:
-            eValidatorSeverity = VALIDATOR_WARNING;
-            break;
-        case eLS_Info:
-            eValidatorSeverity = VALIDATOR_COMMENT;
-            break;
-        }
-
-        va_list kArgs;
-        va_start(kArgs, szFormat);
-        GetISystem()->WarningV(VALIDATOR_MODULE_RENDERER, eValidatorSeverity, 0, 0, szFormat, kArgs);
-        va_end(kArgs);
-    }
-
-    inline void BreakUnique(const char* file, uint32 line, const char* functionName)
-    {
-        AZ_Error("OpenGL Layer", false, "Unimplemented DirectX function %s being called in OpenGL in file %s line %d. Continuing but rendering artifacts may be present.", functionName, file, line);
-    }
-
-    inline uint32 GetCRC32(const void* pData, size_t uSize)
-    {
-        return CCrc32::Compute(pData, uSize);
-    }
-
-    inline LONG Exchange(LONG volatile* piDestination, LONG iExchange)
-    {
-#if defined(WIN32)
-        return InterlockedExchange(piDestination, iExchange);
-#else
-        LONG iOldValue(__sync_lock_test_and_set(piDestination, iExchange));
-        __sync_synchronize();
-        return iOldValue;
-#endif
-    }
-
-    inline LONG CompareExchange(LONG volatile* piDestination, LONG iExchange, LONG iComparand)
-    {
-        return CryInterlockedCompareExchange(piDestination, iExchange, iComparand);
-    }
-
-    inline LONG AtomicIncrement(LONG volatile* piDestination)
-    {
-        return CryInterlockedIncrement(reinterpret_cast<int volatile*>(piDestination));
-    }
-
-    inline LONG AtomicDecrement(LONG volatile* piDestination)
-    {
-        return CryInterlockedDecrement(reinterpret_cast<int volatile*>(piDestination));
-    }
-
-    typedef CryCriticalSection TCriticalSection;
-
-    inline void LockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Lock();
-    }
-
-    inline void UnlockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Unlock();
-    }
-
-    struct STraceFile
-    {
-        STraceFile()
-            : m_fileHandle(AZ::IO::InvalidHandle)
-        {
-        }
-
-        ~STraceFile()
-        {
-            if (m_fileHandle != AZ::IO::InvalidHandle)
-            {
-                gEnv->pCryPak->FClose(m_fileHandle);
-            }
-        }
-
-        bool Open(const char* szFileName, bool bBinary)
-        {
-            static const char* s_szTraceDirectory = "DXGLTrace";
-
-            if (m_fileHandle != AZ::IO::InvalidHandle)
-            {
-                return false;
-            }
-
-            char acFullPath[MAX_PATH];
-            sprintf_s(acFullPath, "%s/%s", s_szTraceDirectory, szFileName);
-            const char* szMode(bBinary ? "wb" : "w");
-            m_fileHandle = gEnv->pCryPak->FOpen(acFullPath, szMode);
-            if (m_fileHandle != AZ::IO::InvalidHandle)
-            {
-                return true;
-            }
-
-            gEnv->pCryPak->MakeDir(s_szTraceDirectory, 0);
-            m_fileHandle = gEnv->pCryPak->FOpen(acFullPath, szMode);
-            return m_fileHandle != AZ::IO::InvalidHandle;
-        }
-
-        void Write(const void* pvData, uint32 uSize)
-        {
-            gEnv->pCryPak->FWrite(pvData, (size_t)uSize, 1, m_fileHandle);
-        }
-
-        void Printf(const char* szFormat, ...)
-        {
-            va_list kArgs;
-            va_start(kArgs, szFormat);
-            AZ::IO::PrintV(m_fileHandle, szFormat, kArgs);
-            va_end(kArgs);
-        }
-
-        AZ::IO::HandleType m_fileHandle;
-    };
-
-    inline void RegisterConfigVariable(const char* szName, int* piVariable, int iDefaultValue)
-    {
-        gEnv->pConsole->Register(szName, piVariable, iDefaultValue);
-    }
-
-    inline void PushProfileLabel(const char* szName)
-    {
-        PROFILE_LABEL_PUSH(szName);
-    }
-
-    inline void PopProfileLabel(const char* szName)
-    {
-        PROFILE_LABEL_POP(szName);
-    }
-}
-
-
-
-#endif //__GLCRYPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLDevice.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLDevice.cpp
deleted file mode 100644
index 3508d23176..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLDevice.cpp
+++ /dev/null
@@ -1,2997 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the type CDevice and the functions to
-//               initialize OpenGL contexts and detect hardware
-//               capabilities
-
-#include "RenderDll_precompiled.h"
-
-#include "GLDevice.hpp"
-#include "GLResource.hpp"
-#include <Common/RenderCapabilities.h>
-#include <SFunctor.h>
-
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/Module/DynamicModuleHandle.h>
-
-#if defined(ANDROID)
-#include <AzCore/Android/Utils.h>
-#include <android/native_window.h>
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define GLDEVICE_CPP_SECTION_1 1
-#define GLDEVICE_CPP_SECTION_2 2
-#define GLDEVICE_CPP_SECTION_3 3
-#define GLDEVICE_CPP_SECTION_4 4
-#define GLDEVICE_CPP_SECTION_5 5
-#define GLDEVICE_CPP_SECTION_6 6
-#define GLDEVICE_CPP_SECTION_7 7
-#define GLDEVICE_CPP_SECTION_8 8
-#define GLDEVICE_CPP_SECTION_9 9
-#define GLDEVICE_CPP_SECTION_10 10
-#endif
-
-#if defined(DEBUG) && !defined(MAC)
-#define DXGL_DEBUG_CONTEXT 1
-#else
-#define DXGL_DEBUG_CONTEXT 0
-#endif
-
-#if defined(RELEASE)
-#define DXGL_DEBUG_OUTPUT_VERBOSITY 0
-#elif DXGL_SUPPORT_DEBUG_OUTPUT
-#define DXGL_DEBUG_OUTPUT_VERBOSITY 1
-#if defined(DEBUG)
-#define DXGL_DEBUG_OUTPUT_SYNCHRONOUS 1
-#endif //defined(DEBUG)
-#endif
-
-// This is the minimum number of uniform buffers required by the engine in order to run.
-// Used when checking the capabilities of an adapter.
-static const int MIN_UNIFORM_BUFFERS_REQUIRED = 8;
-
-namespace NCryOpenGL
-{
-    extern const DXGI_FORMAT DXGI_FORMAT_INVALID = DXGI_FORMAT_FORCE_UINT;
-
-    CDevice::WindowSizeList CDevice::m_windowSizes;
-
-#if defined(AZ_PLATFORM_LINUX)
-    // Unfortunately this cannot be a member variable because it gets initialized in the static function CreateWindow,
-    // which only intends to return the handle of the created window.  That function is called before CDevice is ever created,
-    // so we can't simply initialize the display in that class.
-    Display* s_defaultDisplay = nullptr;
-#endif
-
-#if DXGL_DEBUG_OUTPUT_VERBOSITY
-    #if defined(WIN32)
-        #define DXGL_DEBUG_CALLBACK_CONVENTION APIENTRY
-    #else
-        #define DXGL_DEBUG_CALLBACK_CONVENTION
-    #endif
-    void DXGL_DEBUG_CALLBACK_CONVENTION DebugCallback(GLenum eSource, GLenum eType, GLuint uId, GLenum eSeverity, GLsizei uLength, const GLchar* szMessage, void* pUserParam);
-#endif //DXGL_DEBUG_OUTPUT_VERBOSITY
-
-    SVersion GetRequiredGLVersion()
-    {
-#if defined(OPENGL_ES)
-        uint32 version = DXGLES_REQUIRED_VERSION;
-#else
-        uint32 version = DXGL_REQUIRED_VERSION;
-#endif
-        return SVersion(version);
-    }
-
-#if defined(DXGL_USE_EGL)
-    SDisplayConnection::SDisplayConnection()
-        : m_display(EGL_NO_DISPLAY)
-        , m_surface(EGL_NO_SURFACE)
-        , m_config(nullptr)
-        , m_window(EGL_NULL_VALUE)
-        , m_dirtyFlag(false)
-    {}
-
-    SDisplayConnection::~SDisplayConnection()
-    {
-        if (m_display != EGL_NO_DISPLAY)
-        {
-            if (m_surface != EGL_NO_SURFACE)
-            {
-                eglDestroySurface(m_display, m_surface);
-            }
-            eglTerminate(m_display);
-        }
-    }
-
-    SDisplayConnection* SDisplayConnection::Create(const SPixelFormatSpec& pixelFormatSpec, const TNativeDisplay& defaultNativeDisplay)
-    {
-        SDisplayConnection* displayConnection = new SDisplayConnection();
-        if (!displayConnection->Init(pixelFormatSpec, defaultNativeDisplay))
-        {
-            delete displayConnection;
-            return nullptr;
-        }
-
-        return displayConnection;
-    }
-
-    bool SDisplayConnection::Init(const SPixelFormatSpec& kPixelFormatSpec, const TNativeDisplay& kDefaultNativeDisplay)
-    {
-#   if defined(OPENGL_ES)
-        EGLenum api = EGL_OPENGL_ES_API;
-        EGLint renderableType = EGL_OPENGL_ES3_BIT;
-#   else
-        EGLenum api = EGL_OPENGL_API;
-        EGLint renderableType = EGL_OPENGL_BIT;
-#   endif
-        AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
-        
-        m_window = kDefaultNativeDisplay->second;
-
-        // Desktop egl platforms only currently support OpenGL ES while mobile egl platforms support OpenGL and OpenGL ES.
-        // The api selection function is unavailable on desktop egl platforms
-        if (eglBindAPI != NULL)
-        {
-            if (eglBindAPI(api) == EGL_FALSE)
-            {
-                DXGL_ERROR("eglBindAPI failed");
-                return false;
-            }
-        }
-
-#if !defined(AZ_PLATFORM_LINUX)
-        m_display = eglGetDisplay(kDefaultNativeDisplay->first);
-#else
-        // If we use the EGL_DEFAULT_DISPLAY for the remaining code in this function when doing some of these operations
-        // many operations fail and we end up failing to initialize anything.  Always use the default egl dislpay created
-        // from the XOpenDisplay results instead of whatever the kDefaultNativeDisplay has
-        m_display = eglGetDisplay(s_defaultDisplay);
-#endif
-
-        if (m_display == EGL_NO_DISPLAY)
-        {
-            DXGL_ERROR("eglGetDisplay failed");
-            return false;
-        }
-
-        if (eglInitialize(m_display, NULL, NULL) != EGL_TRUE)
-        {
-            DXGL_ERROR("eglInitialize failed");
-            return false;
-        }
-
-        bool usePbuffer = m_window == EGL_NULL_VALUE;
-        EGLint aiAttributes[] =
-        {
-            EGL_RENDERABLE_TYPE,          renderableType,
-            EGL_SURFACE_TYPE,             usePbuffer ? EGL_PBUFFER_BIT : EGL_WINDOW_BIT,
-            EGL_RED_SIZE,                 static_cast<EGLint>(kPixelFormatSpec.m_pLayout->m_uRedBits),
-            EGL_GREEN_SIZE,               static_cast<EGLint>(kPixelFormatSpec.m_pLayout->m_uGreenBits),
-            EGL_BLUE_SIZE,                static_cast<EGLint>(kPixelFormatSpec.m_pLayout->m_uBlueBits),
-            EGL_ALPHA_SIZE,               static_cast<EGLint>(kPixelFormatSpec.m_pLayout->m_uAlphaBits),
-            EGL_BUFFER_SIZE,              static_cast<EGLint>(kPixelFormatSpec.m_pLayout->GetColorBits()),
-            EGL_DEPTH_SIZE,               static_cast<EGLint>(kPixelFormatSpec.m_pLayout->m_uDepthBits),
-            EGL_STENCIL_SIZE,             static_cast<EGLint>(kPixelFormatSpec.m_pLayout->m_uStencilBits),
-            EGL_SAMPLE_BUFFERS,           static_cast<EGLint>(kPixelFormatSpec.m_uNumSamples > 1 ? 1 : 0),
-            EGL_SAMPLES,                  static_cast<EGLint>(kPixelFormatSpec.m_uNumSamples > 1 ? kPixelFormatSpec.m_uNumSamples : 0),
-            EGL_NONE
-        };
-
-        EGLint iFoundConfigs;
-        if (eglChooseConfig(m_display, aiAttributes, &m_config, 1, &iFoundConfigs) != EGL_TRUE || iFoundConfigs < 1)
-        {
-            DXGL_ERROR("eglChooseConfig failed");
-            return false;
-        }
-
-#if !defined(AZ_PLATFORM_LINUX)
-        CreateSurface();
-#else
-        // If we want to run in headless mode and not create a window, for optimal setup when rendering video from the server,
-        // then do not create an X11 window and only create an offscreen pixel buffer surface.
-        // r_GetScreenShot can then be triggered to capture a screenshot to user/screenshots/
-        ICVar* skipWindowCreationCvar = gEnv->pConsole->GetCVar("r_linuxSkipWindowCreation");
-        if (skipWindowCreationCvar && (skipWindowCreationCvar->GetIVal() > 0))
-        {
-            usePbuffer = true;
-        }
-
-        if (usePbuffer)
-        {
-            CreateSurface();
-        }
-        else
-        {
-            bool result = CreateX11Window();
-            if (!result)
-            {
-                DXGL_ERROR("Failed to create X11 window");
-                return false;
-            }
-        }
-#endif
-
-        if (m_surface == EGL_NO_SURFACE)
-        {
-            DXGL_ERROR("Failed to create EGL surface");
-            return false;
-        }
-
-        return true;
-    }
-
-    bool SDisplayConnection::CreateSurface()
-    {
-        if (m_display == EGL_NO_DISPLAY || m_config == nullptr)
-        {
-            return false;
-        }
-
-        if (m_window)
-        {
-            m_surface = eglCreateWindowSurface(m_display, m_config, m_window, NULL);
-        }
-        else
-        {
-            const EGLint surfaceAttributes[] = {
-                EGL_WIDTH, 1,
-                EGL_HEIGHT, 1,
-                EGL_NONE
-            };
-            m_surface = eglCreatePbufferSurface(m_display, m_config, surfaceAttributes);
-        }
-
-        return m_surface != EGL_NO_SURFACE;
-    }
-
-    bool SDisplayConnection::DestroySurface()
-    {
-        if (m_display == EGL_NO_DISPLAY || m_surface == EGL_NO_SURFACE)
-        {
-            return false;
-        }
-
-        EGLBoolean result = eglDestroySurface(m_display, m_surface);
-        m_surface = EGL_NO_SURFACE;
-        return result == EGL_TRUE;
-    }
-
-#if defined(AZ_PLATFORM_LINUX)
-    bool SDisplayConnection::CreateX11Window()
-    {
-        // We need to create an actual window and a window-renderable surface
-        EGLint visualID;
-        if (!eglGetConfigAttrib(m_display, m_config, EGL_NATIVE_VISUAL_ID, &visualID))
-        {
-            AZ_Assert(false, "Error: eglGetConfigAttrib failed - [0x%08x]", eglGetError());
-            return false;
-        }
-
-        // TODO Linux - Get these from somewhere else besides the cvars
-        ICVar* widthCVar = gEnv->pConsole->GetCVar("r_width");
-        ICVar* heightCVar = gEnv->pConsole->GetCVar("r_height");
-        int width = static_cast<int>(widthCVar->GetIVal());
-        int height = static_cast<int>(heightCVar->GetIVal());
-        const char* title = "Placeholder Title";
-
-
-        // Get the XVisualInfo config that matches the EGL config.
-        int numberXVisuals = 0;
-        XVisualInfo visualInfoTemplate;
-        visualInfoTemplate.visualid = visualID;
-        XVisualInfo* visualInfo = XGetVisualInfo(s_defaultDisplay, VisualIDMask, &visualInfoTemplate, &numberXVisuals);
-        if (numberXVisuals == 0)
-        {
-            AZ_Assert(false, "XGetVisualInfo failed to match egl configurations");
-            return false;
-        }
-
-        Window rootWindow = DefaultRootWindow(s_defaultDisplay);
-        Colormap colorMap = XCreateColormap(s_defaultDisplay, rootWindow, visualInfo->visual, AllocNone);
-
-        XSetWindowAttributes windowAttributes;
-        windowAttributes.colormap = colorMap;
-        windowAttributes.event_mask = ExposureMask | KeyPressMask;
-
-        Window applicationWindow = XCreateWindow(s_defaultDisplay, rootWindow, 0, 0, width, height, 0, visualInfo->depth, InputOutput, visualInfo->visual, CWColormap | CWEventMask, &windowAttributes);
-
-        m_surface = eglCreateWindowSurface(m_display, m_config, applicationWindow, NULL);
-        if (!m_surface)
-        {
-            AZ_Assert(false, "Error: eglCreateWindowSurface failed - [0x%08x]", eglGetError());
-            return false;
-        }
-
-        // Map the window and set the name
-        XMapWindow(s_defaultDisplay, applicationWindow);
-        XStoreName(s_defaultDisplay, applicationWindow, title);
-        return true;
-    }
-#endif
-
-    void SDisplayConnection::SetWindow(EGLNativeWindowType window)
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
-        if (window != m_window)
-        {
-            if (m_window)
-            {
-                DestroySurface();
-            }
-
-            m_window = window;
-
-            if (window)
-            {
-                CreateSurface();
-                m_dirtyFlag = true;
-            }
-        }
-    }
-
-    bool SDisplayConnection::MakeCurrent(const TRenderingContext context) const
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
-        EGLSurface surface = context ? m_surface : EGL_NO_SURFACE;
-        EGLBoolean res = eglMakeCurrent(m_display, surface, surface, context);
-        AZ_Warning("Rendering", res == EGL_TRUE, "eglMakeCurrent failed [0x%08x]", eglGetError());
-        return res == EGL_TRUE;
-    }
-
-    bool SDisplayConnection::SwapBuffers(const TRenderingContext context)
-    {
-        if (m_dirtyFlag)
-        {
-            // The surface was recreated so we need to make current again before doing the swap.
-            if (!MakeCurrent(context))
-            {
-                return false;
-            }
-        }
-
-        AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
-        m_dirtyFlag = false;
-        if (m_surface == EGL_NO_SURFACE)
-        {
-            return false;
-        }
-
-        return eglSwapBuffers(m_display, m_surface) == EGL_TRUE;
-    }
-
-#elif defined(DXGL_USE_WGL)
-
-    bool SetWindowPixelFormat(const TWindowContext& kWindowContext, const SPixelFormatSpec* pPixelFormatSpec)
-    {
-        int32 iPixelFormat(0);
-        PIXELFORMATDESCRIPTOR kPixDesc;
-        ZeroMemory(&kPixDesc, sizeof(PIXELFORMATDESCRIPTOR));
-        // Check for wgl pixel format extension availability
-        if (DXGL_WGL_EXTENSION_SUPPORTED(ARB_pixel_format) && pPixelFormatSpec)
-        {
-            int32 aiAttributes[128];
-            int32* pAttrCursor = aiAttributes;
-
-            *pAttrCursor++ = WGL_DRAW_TO_WINDOW_ARB;
-            *pAttrCursor++ = GL_TRUE;
-            *pAttrCursor++ = WGL_SUPPORT_OPENGL_ARB;
-            *pAttrCursor++ = GL_TRUE;
-            *pAttrCursor++ = WGL_DOUBLE_BUFFER_ARB;
-            *pAttrCursor++ = GL_TRUE;
-            *pAttrCursor++ = WGL_PIXEL_TYPE_ARB;
-            *pAttrCursor++ = WGL_TYPE_RGBA_ARB;
-            *pAttrCursor++ = WGL_RED_BITS_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uRedBits;
-            *pAttrCursor++ = WGL_GREEN_BITS_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uGreenBits;
-            *pAttrCursor++ = WGL_BLUE_BITS_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uBlueBits;
-            *pAttrCursor++ = WGL_ALPHA_BITS_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uAlphaBits;
-            *pAttrCursor++ = WGL_RED_SHIFT_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uRedShift;
-            *pAttrCursor++ = WGL_GREEN_SHIFT_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uGreenShift;
-            *pAttrCursor++ = WGL_BLUE_SHIFT_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uBlueShift;
-            *pAttrCursor++ = WGL_ALPHA_SHIFT_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uAlphaShift;
-            *pAttrCursor++ = WGL_COLOR_BITS_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->GetColorBits();
-            *pAttrCursor++ = WGL_DEPTH_BITS_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uDepthBits;
-            *pAttrCursor++ = WGL_STENCIL_BITS_ARB;
-            *pAttrCursor++ = pPixelFormatSpec->m_pLayout->m_uStencilBits;
-
-            // Sample counts 0 and 1 do not require multisampling attribute
-            if (pPixelFormatSpec->m_uNumSamples > 1)
-            {
-                *pAttrCursor++ = WGL_SAMPLES_ARB;
-                *pAttrCursor++ = pPixelFormatSpec->m_uNumSamples;
-            }
-
-            // Request SRGB pixel format only when needed, skip this attribute otherwise (fix for pedantic drivers)
-            if (pPixelFormatSpec->m_bSRGB)
-            {
-                *pAttrCursor++ = WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB;
-                *pAttrCursor++ = GL_TRUE;
-            }
-
-            // Mark end of the attribute list
-            *pAttrCursor = 0;
-
-            uint32 uNumFormats;
-            if (!DXGL_UNWRAPPED_FUNCTION(wglChoosePixelFormatARB)(kWindowContext, aiAttributes, NULL, 1, &iPixelFormat, &uNumFormats))
-            {
-                DXGL_ERROR("wglChoosePixelFormatARB failed");
-                return false;
-            }
-        }
-        else
-        {
-            kPixDesc.nSize           = sizeof(PIXELFORMATDESCRIPTOR);
-            kPixDesc.nVersion        = 1;
-            kPixDesc.dwFlags         = PFD_DOUBLEBUFFER | PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;
-            kPixDesc.iPixelType      = PFD_TYPE_RGBA;
-            kPixDesc.iLayerType      = PFD_MAIN_PLANE;
-            if (pPixelFormatSpec != NULL)
-            {
-                kPixDesc.cRedBits        = pPixelFormatSpec->m_pLayout->m_uRedBits;
-                kPixDesc.cGreenBits      = pPixelFormatSpec->m_pLayout->m_uGreenBits;
-                kPixDesc.cBlueBits       = pPixelFormatSpec->m_pLayout->m_uBlueBits;
-                kPixDesc.cAlphaBits      = pPixelFormatSpec->m_pLayout->m_uAlphaBits;
-                kPixDesc.cRedShift       = pPixelFormatSpec->m_pLayout->m_uRedShift;
-                kPixDesc.cGreenShift     = pPixelFormatSpec->m_pLayout->m_uGreenShift;
-                kPixDesc.cBlueShift      = pPixelFormatSpec->m_pLayout->m_uBlueShift;
-                kPixDesc.cAlphaShift     = pPixelFormatSpec->m_pLayout->m_uAlphaShift;
-                kPixDesc.cColorBits      = pPixelFormatSpec->m_pLayout->GetColorBits();
-                kPixDesc.cDepthBits      = pPixelFormatSpec->m_pLayout->m_uDepthBits;
-                kPixDesc.cStencilBits    = pPixelFormatSpec->m_pLayout->m_uStencilBits;
-                if (pPixelFormatSpec->m_uNumSamples > 1 || pPixelFormatSpec->m_bSRGB)
-                {
-                    DXGL_WARNING("wglChoosePixelFormatARB not available - multisampling and sRGB settings will be ignored");
-                }
-            }
-            else
-            {
-                kPixDesc.cColorBits      = 32;
-            }
-
-            iPixelFormat = ChoosePixelFormat(kWindowContext, &kPixDesc);
-            if (iPixelFormat == 0)
-            {
-                DXGL_ERROR("ChoosePixelFormat failed");
-                return false;
-            }
-
-            if (pPixelFormatSpec == NULL &&
-                DescribePixelFormat(kWindowContext, iPixelFormat, sizeof(kPixDesc), &kPixDesc) == 0)
-            {
-                DXGL_ERROR("DescribePixelFormat failed");
-                return false;
-            }
-        }
-
-        if (!SetPixelFormat(kWindowContext, iPixelFormat, &kPixDesc))
-        {
-            DXGL_ERROR("SetPixelFormat failed");
-            return false;
-        }
-        return true;
-    }
-
-#endif
-
-#if defined(WIN32)
-
-    namespace NWin32Helper
-    {
-        enum
-        {
-            eWS_Windowed   = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX,
-            eWS_FullScreen = WS_POPUP
-        };
-
-        bool GetDisplayRect(RECT* pRect, SOutput* pOutput)
-        {
-            DEVMODEA kCurrentMode;
-            if (EnumDisplaySettingsA(pOutput->m_strDeviceName.c_str(), ENUM_CURRENT_SETTINGS, &kCurrentMode) != TRUE)
-            {
-                DXGL_ERROR("Could not retrieve the current display settings for display %s", pOutput->m_strDeviceName.c_str());
-                return false;
-            }
-
-            DXGL_TODO("Check if scaling according to the GetDeviceCaps is required");
-            pRect->left   = kCurrentMode.dmPosition.x;
-            pRect->top    = kCurrentMode.dmPosition.y;
-            pRect->right  = kCurrentMode.dmPosition.x + kCurrentMode.dmPelsWidth;
-            pRect->bottom = kCurrentMode.dmPosition.y + kCurrentMode.dmPelsHeight;
-            return true;
-        }
-
-        bool SetFullScreenContext(SOutput* pOutput, TNativeDisplay kNativeDisplay, DEVMODEA& kDevMode)
-        {
-            if (ChangeDisplaySettingsExA(pOutput->m_strDeviceName.c_str(), &kDevMode, NULL, CDS_FULLSCREEN, NULL) != DISP_CHANGE_SUCCESSFUL)
-            {
-                DXGL_ERROR("Could not change display settings");
-                return false;
-            }
-
-            RECT kFullScreenRect;
-            if (!GetDisplayRect(&kFullScreenRect, pOutput))
-            {
-                return false;
-            }
-
-            HWND kWindowHandle(WindowFromDC(kNativeDisplay));
-            DWORD uStyle(GetWindowLong(kWindowHandle, GWL_STYLE));
-            uStyle &= ~eWS_Windowed;
-            uStyle |= eWS_FullScreen;
-            if (SetWindowLong(kWindowHandle, GWL_STYLE, uStyle) == 0)
-            {
-                DXGL_WARNING("Could not set the window style");
-            }
-            if (SetWindowPos(kWindowHandle, NULL, kFullScreenRect.left, kFullScreenRect.top, kFullScreenRect.right - kFullScreenRect.left, kFullScreenRect.bottom - kFullScreenRect.top, SWP_NOCOPYBITS) != TRUE)
-            {
-                DXGL_WARNING("Could not set window posititon");
-            }
-            return true;
-        }
-
-        bool UnsetFullScreenContext(SOutput* pOutput)
-        {
-            if (ChangeDisplaySettingsExA(pOutput->m_strDeviceName.c_str(), NULL, NULL, CDS_FULLSCREEN, NULL) != DISP_CHANGE_SUCCESSFUL)
-            {
-                DXGL_ERROR("Could not restore original display settings");
-                return false;
-            }
-            return true;
-        }
-
-        bool ResizeWindowContext(TNativeDisplay kNativeDisplay, uint32 uWidth, uint32 uHeight)
-        {
-            HWND kWindowHandle(WindowFromDC(kNativeDisplay));
-
-            RECT kWindowRect;
-            if (!GetWindowRect(kWindowHandle, &kWindowRect))
-            {
-                DXGL_WARNING("Could not retrieve window rectangle - moving to origin");
-                kWindowRect.left = kWindowRect.right = kWindowRect.top = kWindowRect.bottom = 0;
-            }
-            kWindowRect.right =  kWindowRect.left + GetSystemMetrics(SM_CXDLGFRAME) * 2 + uWidth;
-            kWindowRect.bottom = kWindowRect.top  + GetSystemMetrics(SM_CXDLGFRAME) * 2 + GetSystemMetrics(SM_CYCAPTION) + uHeight;
-
-            DWORD uStyle(GetWindowLong(kWindowHandle, GWL_STYLE));
-            uStyle &= ~eWS_FullScreen;
-            uStyle |= eWS_Windowed;
-
-            if (SetWindowLong(kWindowHandle, GWL_STYLE, uStyle) == 0)
-            {
-                DXGL_WARNING("Could not set the window style");
-            }
-            if (SetWindowPos(kWindowHandle, NULL, kWindowRect.left, kWindowRect.top, kWindowRect.right - kWindowRect.left, kWindowRect.bottom - kWindowRect.top, SWP_NOCOPYBITS) != TRUE)
-            {
-                DXGL_WARNING("Could not set window posititon");
-            }
-
-            return true;
-        }
-    };
-
-#endif
-
-#if defined(WIN32)
-    SOutput* GetWindowOutput(SAdapter* pAdapter, const TNativeDisplay& kNativeDisplay)
-    {
-        RECT kWindowRect;
-        HWND kWindowHandle(WindowFromDC(kNativeDisplay));
-        if (kWindowHandle == NULL || GetWindowRect(kWindowHandle, &kWindowRect) != TRUE)
-        {
-            DXGL_ERROR("Could not retrieve the device window rectangle");
-            return nullptr;
-        }
-
-        int32 iWindowCenterX((kWindowRect.left + kWindowRect.right) / 2);
-        int32 iWindowCenterY((kWindowRect.top + kWindowRect.bottom) / 2);
-
-        uint32 uOutput;
-        SOutput* pMinDistOutput(NULL);
-        uint32 uMinDistSqr;
-        for (uOutput = 0; uOutput < pAdapter->m_kOutputs.size(); ++uOutput)
-        {
-            SOutput* pOutput(pAdapter->m_kOutputs.at(uOutput));
-            RECT kDisplayRect;
-            if (!NWin32Helper::GetDisplayRect(&kDisplayRect, pOutput))
-            {
-                return nullptr;
-            }
-
-            if (kWindowRect.left   >= kDisplayRect.left  &&
-                kWindowRect.right  <= kDisplayRect.right &&
-                kWindowRect.top    >= kDisplayRect.top   &&
-                kWindowRect.bottom <= kDisplayRect.bottom)
-            {
-                return pOutput; // Window completely inside the display rectangle
-            }
-            int32 iDistX(iWindowCenterX - (kDisplayRect.left + kDisplayRect.right) / 2);
-            int32 iDistY(iWindowCenterY - (kDisplayRect.top + kDisplayRect.bottom) / 2);
-            uint32 uCenterDistSqr(iDistX * iDistX + iDistY * iDistY);
-            if (uOutput == 0 || uCenterDistSqr < uMinDistSqr)
-            {
-                uMinDistSqr = uCenterDistSqr;
-                pMinDistOutput = pOutput;
-            }
-        }
-
-        return pMinDistOutput;
-    }
-#endif // defined(WIN32)
-
-#if defined(WIN32)
-
-    void DevModeToDisplayMode(SDisplayMode* pDisplayMode, const DEVMODEA& kDevMode)
-    {
-        pDisplayMode->m_uBitsPerPixel = kDevMode.dmBitsPerPel;
-        pDisplayMode->m_uWidth        = kDevMode.dmPelsWidth;
-        pDisplayMode->m_uHeight       = kDevMode.dmPelsHeight;
-        pDisplayMode->m_uFrequency    = kDevMode.dmDisplayFrequency;
-    }
-
-#endif // defined(WIN32)
-
-    struct SDummyWindow
-    {
-        TNativeDisplay m_kNativeDisplay;
-#if defined(WIN32)
-        HWND m_kWndHandle;
-        ATOM m_kWndClassAtom;
-
-        static LRESULT CALLBACK DummyWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-        {
-            return DefWindowProc(hWnd, uMsg, wParam, lParam);
-        }
-#endif //defined(WIN32)
-
-        SDummyWindow()
-            : m_kNativeDisplay()
-#if defined(WIN32)
-            , m_kWndHandle(NULL)
-            , m_kWndClassAtom(0)
-#endif //defined(WIN32)
-        {
-        }
-
-        bool Initialize(const SPixelFormatSpec* pPixelFormatSpec)
-        {
-#if defined(DXGL_USE_EGL)
-            // No need to create a window because we are going to use an EGL pixel buffer surface.
-            m_kNativeDisplay = AZStd::make_shared<EGLNativePlatform>(EGL_DEFAULT_DISPLAY, EGL_NULL_VALUE);
-#elif defined(WIN32)
-            WNDCLASSW kWndClass;
-            kWndClass.style = CS_HREDRAW | CS_VREDRAW;
-            kWndClass.lpfnWndProc = (WNDPROC)iSystem->GetRootWindowMessageHandler();
-            kWndClass.cbClsExtra = 0;
-            kWndClass.cbWndExtra = 0;
-            kWndClass.hInstance = NULL;
-            kWndClass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_WINLOGO);
-            kWndClass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW);
-            kWndClass.hbrBackground = NULL;
-            kWndClass.lpszMenuName = NULL;
-            kWndClass.lpszClassName = L"Dummy DXGL window class";
-
-            if ((m_kWndClassAtom = RegisterClassW(&kWndClass)) == NULL ||
-                (m_kWndHandle = CreateWindowW((LPCWSTR)MAKEINTATOM(m_kWndClassAtom), L"Dummy DXGL window", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL)) == NULL ||
-                (m_kNativeDisplay = GetDC(m_kWndHandle)) == NULL)
-            {
-                DXGL_ERROR("Creation of the dummy DXGL window failed (%d)", GetLastError());
-                return false;
-            }
-
-    #if defined(DXGL_USE_WGL)
-            if (!SetWindowPixelFormat(m_kNativeDisplay, pPixelFormatSpec))
-            {
-                return false;
-            }
-    #endif //DXGL_USE_WGL
-#endif
-            return true;
-        }
-
-        void Shutdown()
-        {
-#if defined(WIN32)
-            if (m_kWndHandle != NULL)
-            {
-                DestroyWindow(m_kWndHandle);
-            }
-            if (m_kWndClassAtom != 0)
-            {
-                UnregisterClassW((LPCWSTR)MAKEINTATOM(m_kWndClassAtom), NULL);
-            }
-#endif
-        }
-    };
-
-
-    ////////////////////////////////////////////////////////////////////////////
-    // CDevice implementation
-    ////////////////////////////////////////////////////////////////////////////
-
-
-#if DXGL_FULL_EMULATION
-    uint32 CDevice::ms_uNumContextsPerDevice = 16;
-#else
-    uint32 CDevice::ms_uNumContextsPerDevice = 1;
-#endif
-
-#if DXGL_EXTENSION_LOADER && defined(AZ_PLATFORM_LINUX)
-    // Linux needs an early call to LoadEarlyGLEntryPoints, so we need to forward declare it.
-    bool LoadEarlyGLEntryPoints();
-#endif // DXGL_EXTENSION_LOADER
-
-    CDevice* CDevice::ms_pCurrentDevice = NULL;
-
-    CDevice::CDevice(SAdapter* pAdapter, const SFeatureSpec& kFeatureSpec, const SPixelFormatSpec& kPixelFormatSpec)
-        : m_spAdapter(pAdapter)
-        , m_kFeatureSpec(kFeatureSpec)
-        , m_kPixelFormatSpec(kPixelFormatSpec)
-        , m_kContextFenceIssued(false)
-        , m_texturesStreamingFunctorId(0)
-    {
-        if (ms_pCurrentDevice == NULL)
-        {
-            ms_pCurrentDevice = this;
-        }
-        m_pCurrentContextTLS = CreateTLS();
-        AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusConnect();
-    }
-
-    CDevice::~CDevice()
-    {
-        Shutdown();
-        DestroyTLS(m_pCurrentContextTLS);
-        if (ms_pCurrentDevice == this)
-        {
-            ms_pCurrentDevice = NULL;
-        }
-        AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusDisconnect();
-    }
-
-#if !defined(WIN32)
-    bool CDevice::CreateWindow(const char* title, uint32 width, uint32 height, bool fullscreen, HWND * handle)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(ANDROID)
-        // Windows is already created by the Native Activity. We just return a pointer to the ANativeWindow.
-        ANativeWindow* nativeWindow = AZ::Android::Utils::GetWindow();
-        *handle = reinterpret_cast<HWND>(nativeWindow);
-#elif defined(AZ_PLATFORM_LINUX)
-        // Get the default display and root window handles.
-        // We are currently only rendering to a pixel buffer and not yet creating an actual window via X11
-        Display* defaultDisplay = XOpenDisplay(NULL);
-        AZ_Assert(defaultDisplay, "XOpenDisplay failed");
-
-        Window rootWindow = DefaultRootWindow(defaultDisplay);
-
-#if DXGL_EXTENSION_LOADER
-        if (!LoadEarlyGLEntryPoints())
-        {
-            return false;
-        }
-#endif // DXGL_EXTENSION_LOADER
-
-        *handle = reinterpret_cast<HWND>(rootWindow);
-        s_defaultDisplay = defaultDisplay;
-#else
-#error "Not implemented for this platform"
-#endif
-        InitWindow(*handle, width, height);
-        m_windowSizes[handle] = std::make_pair(width, height);
-        return true;
-    }
-
-    void CDevice::DestroyWindow(HWND handle)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(ANDROID)
-        // Nothing to do since the window is destroyed by the OS when the Native Activity is destroyed
-#elif defined(AZ_PLATFORM_LINUX)
-        AZ_Assert(0, "TODO Linux OpenGL");
-#else
-#error "Not implemented for this platform"
-#endif
-        m_windowSizes.erase(handle);
-    }
-
-    void CDevice::InitWindow(HWND handle, uint32 width, uint32 height)
-    {
-#if defined(ANDROID)
-        ANativeWindow* nativeWindow = reinterpret_cast<ANativeWindow*>(handle);
-        // We need to set the windows size to match the engine width and height. The Android compositor will upscale it to fullscreen.
-        ANativeWindow_setBuffersGeometry(nativeWindow, width, height, WINDOW_FORMAT_RGBX_8888); // discard alpha
-#elif defined(AZ_PLATFORM_LINUX)
-        // TODO Linux - What needs done here?
-        //AZ_Assert(0, "TODO Linux OpenGL");
-#endif
-    }
-#endif // !defined(WIN32)
-
-    void CDevice::OnApplicationWindowCreated()
-    {
-#if defined(ANDROID)
-        uint32 width, height;
-        if (m_windowSizes.empty())
-        {
-            AZ_Error("OpenGL", false, "Could not find window size. Using backbuffer size.");
-            width = gcpRendD3D->GetBackbufferWidth();
-            height = gcpRendD3D->GetBackbufferHeight();
-        }
-        else
-        {
-            // Android only uses one screen. Just use the first one in the list.
-            std::pair<uint32, uint32> windowSize = m_windowSizes.begin()->second;
-            width = windowSize.first;
-            height = windowSize.second;
-        }
-
-        HWND window = reinterpret_cast<HWND>(AZ::Android::Utils::GetWindow());
-        CDevice::InitWindow(window, width, height);
-#elif defined(AZ_PLATFORM_LINUX)
-        AZ_Assert(0, "TODO Linux OpenGL");
-#endif
-    }
-
-    void CDevice::OnApplicationWindowRedrawNeeded()
-    {
-#if defined(ANDROID)
-        if (gEnv && gEnv->pConsole && gEnv->pRenderer)
-        {
-            ICVar* widthCVar = gEnv->pConsole->GetCVar("r_width");
-            ICVar* heightCVar = gEnv->pConsole->GetCVar("r_height");
-
-            int width, height;
-            if (AZ::Android::Utils::GetWindowSize(width, height))
-            {
-                gcpRendD3D->GetClampedWindowSize(width, height);
-
-                widthCVar->Set(width);
-                heightCVar->Set(height);
-
-                // We need to wait for the render thread to finish before we set the new dimensions.
-                // Since Android has a separate render thread, it'll be in the middle of rendering the scene when this function is called.
-                if (!gRenDev->m_pRT->IsRenderThread(true))
-                {
-                    gEnv->pRenderer->GetRenderThread()->WaitFlushFinishedCond();
-                }
-
-                gcpRendD3D->SetWidth(widthCVar->GetIVal());
-                gcpRendD3D->SetHeight(heightCVar->GetIVal());
-
-                InitWindow(AZ::Android::Utils::GetWindow(), width, height);
-                DetectOutputs(*m_spAdapter, m_spAdapter->m_kOutputs);
-            }
-        }
-#elif defined(AZ_PLATFORM_LINUX)
-        AZ_Assert(0, "TODO Linux OpenGL");
-#endif
-    }
-
-    void CDevice::Configure(uint32 uNumSharedContexts)
-    {
-        ms_uNumContextsPerDevice = min((uint32)MAX_NUM_CONTEXT_PER_DEVICE, 1 + uNumSharedContexts);
-    }
-
-
-    static void OnChangeTexturesStreaming(ICVar* pCVar, CDevice* device)
-    {
-        int32 newVal = pCVar->GetIVal();
-        if (newVal > 0 && !device->IsFeatureSupported(NCryOpenGL::eF_CopyImage))
-        {
-            AZ_Warning("Rendering", false, "Disabling Textures Streaming because is not supported on this device.");
-            newVal = 0;
-        }
-
-        pCVar->Set(newVal);
-    }
-
-    bool CDevice::Initialize(const TNativeDisplay& kDefaultNativeDisplay)
-    {
-        if (kDefaultNativeDisplay == NULL)
-        {
-            return false;
-        }
-        else
-        {
-            m_kDefaultNativeDisplay = kDefaultNativeDisplay;
-        }
-
-        std::vector<TRenderingContext> kRenderingContexts;
-        if (!CreateRenderingContexts(m_kDefaultWindowContext, kRenderingContexts, m_kFeatureSpec, m_kPixelFormatSpec, m_kDefaultNativeDisplay))
-        {
-            return false;
-        }
-
-        m_kContexts.reserve(kRenderingContexts.size());
-        uint32 uContext;
-        for (uContext = 0; uContext < kRenderingContexts.size(); ++uContext)
-        {
-            const TRenderingContext& kRenderingContext(kRenderingContexts.at(uContext));
-            TWindowContext windowContext = m_kDefaultWindowContext;
-            CContext::ContextType type = uContext == 0 ? CContext::RenderingType : CContext::ResourceType;
-#if defined(DXGL_USE_EGL)
-            // We use the window's surface for the context that will do the actual rendering and 1x1 PBuffer surfaces for the loading threads.
-            if (type == CContext::ResourceType)
-            {
-                windowContext.reset(SDisplayConnection::Create(m_kPixelFormatSpec, AZStd::make_shared<EGLNativePlatform>(EGL_DEFAULT_DISPLAY, EGL_NULL_VALUE)));
-            }
-#endif // ANDROID
-
-            CContext* pContext(new CContext(this, kRenderingContext, windowContext, uContext, type));
-            MakeCurrent(windowContext, kRenderingContext);
-
-            if (uContext == 0)
-            {
-                InitializeResourceUnitPartitions();
-            }
-
-            if (!pContext->Initialize())
-            {
-                delete pContext;
-                return false;
-            }
-
-            m_kFreeContexts[pContext->GetType()].Push(*pContext);
-            m_kContexts.push_back(pContext);
-        }
-
-        MakeCurrent(m_kDefaultWindowContext, NULL);
-
-        // Check for textures streaming support
-        if (ICVar* cVar = gEnv->pConsole->GetCVar("r_texturesStreaming"))
-        {
-            SFunctor onChange;
-            onChange.Set(OnChangeTexturesStreaming, cVar, this);
-            m_texturesStreamingFunctorId = cVar->AddOnChangeFunctor(onChange);
-            onChange.Call();
-        }
-
-        return true;
-    }
-
-    void CDevice::Shutdown()
-    {
-        MakeCurrent(m_kDefaultWindowContext, NULL);
-
-        TContexts::const_iterator kContextIter = m_kContexts.begin();
-        const TContexts::const_iterator kContextEnd = m_kContexts.end();
-        while (kContextIter != kContextEnd)
-        {
-            TRenderingContext kRenderingContext((*kContextIter)->GetRenderingContext());
-            delete *kContextIter;
-            // Delete context after all resources have been released. Avoids memory
-            // leaks an crashes with non-nvidia drivers
-#if defined(DXGL_USE_EGL)
-            eglDestroyContext(m_kDefaultWindowContext->GetDisplay(), kRenderingContext);
-#elif defined(DXGL_USE_WGL)
-            wglDeleteContext(kRenderingContext);
-#else
-#error "Not supported on this platform"
-#endif
-            ++kContextIter;
-        }
-        m_kContexts.clear();
-
-        if (m_kDefaultWindowContext != NULL)
-        {
-            ReleaseWindowContext(m_kDefaultWindowContext);
-        }
-
-        if (ICVar* cVar = gEnv->pConsole->GetCVar("r_texturesStreaming"))
-        {
-            cVar->RemoveOnChangeFunctor(m_texturesStreamingFunctorId);
-        }
-    }
-
-    bool CDevice::Present(const TWindowContext& kTargetWindowContext)
-    {
-#if defined(DXGL_USE_EGL)
-        CContext* currentContext = GetCurrentContext();
-        return kTargetWindowContext->SwapBuffers(currentContext ? currentContext->GetRenderingContext() : nullptr);
-#elif defined(WIN32)
-        return SwapBuffers(kTargetWindowContext) == TRUE;
-#else
-        DXGL_NOT_IMPLEMENTED;
-        return false;
-#endif
-    }
-
-    CContext* CDevice::ReserveContext()
-    {
-        CContext* pCurrentContext(static_cast<CContext*>(GetTLSValue(m_pCurrentContextTLS)));
-        CContext* pReservedContext(NULL);
-        if (pCurrentContext != NULL)
-        {
-            pReservedContext = pCurrentContext->GetReservedContext();
-        }
-
-        if (pReservedContext == NULL)
-        {
-            pReservedContext = AllocateContext();
-            if (pReservedContext == NULL)
-            {
-                return NULL;
-            }
-        }
-
-        if (pCurrentContext == NULL)
-        {
-            pCurrentContext = pReservedContext;
-            SetCurrentContext(pCurrentContext);
-        }
-
-        pReservedContext->IncReservationCount();
-        pCurrentContext->SetReservedContext(pReservedContext);
-
-        return pCurrentContext;
-    }
-
-    void CDevice::ReleaseContext()
-    {
-        CContext* pCurrentContext(GetCurrentContext());
-        assert(pCurrentContext != NULL);
-        CContext* pReservedContext(pCurrentContext->GetReservedContext());
-        assert(pReservedContext != NULL);
-
-        if (pReservedContext->DecReservationCount() == 0)
-        {
-            if (pCurrentContext == pReservedContext)
-            {
-                SetCurrentContext(NULL);
-            }
-            pCurrentContext->SetReservedContext(NULL);
-            FreeContext(pReservedContext);
-        }
-    }
-
-    CContext* CDevice::AllocateContext(CContext::ContextType type /*= CContext::ResourceType*/)
-    {
-        CContext* pContext(static_cast<CContext*>(m_kFreeContexts[type].Pop()));
-        if (pContext == NULL)
-        {
-            DXGL_ERROR("CDevice::AllocateContext failed - no free context available. Please increase the number of contexts at initialization time (currently %d).", (int)m_kContexts.size());
-        }
-        return pContext;
-    }
-
-    void CDevice::FreeContext(CContext* pContext)
-    {
-        m_kFreeContexts[pContext->GetType()].Push(*pContext);
-    }
-
-    void CDevice::BindContext(CContext* pContext)
-    {
-        CContext* pCurrentContext(GetCurrentContext());
-        if (pCurrentContext != NULL)
-        {
-            pContext->SetReservedContext(pCurrentContext->GetReservedContext());
-        }
-
-        SetCurrentContext(pContext);
-    }
-
-    void CDevice::UnbindContext(CContext* pContext)
-    {
-        CContext* pCurrentContext(static_cast<CContext*>(GetTLSValue(m_pCurrentContextTLS)));
-        assert(pCurrentContext != NULL);
-        SetCurrentContext(pCurrentContext->GetReservedContext());
-    }
-
-    void CDevice::SetCurrentContext(CContext* pContext)
-    {
-        CContext* pPreviousContext(static_cast<CContext*>(GetTLSValue(m_pCurrentContextTLS)));
-
-        bool bSuccess = false;
-        if (pContext != NULL)
-        {
-            bSuccess = MakeCurrent(pContext->GetWindowContext(), pContext->GetRenderingContext());
-        }
-        else if (pPreviousContext != NULL)
-        {
-            bSuccess = MakeCurrent(pPreviousContext->GetWindowContext(), NULL);
-        }
-
-        SetTLSValue(m_pCurrentContextTLS, pContext);
-
-        if (!bSuccess)
-        {
-            DXGL_ERROR("SetCurrentContext failed");
-        }
-    }
-
-    NCryOpenGL::CContext* CDevice::GetCurrentContext()
-    {
-        return static_cast<CContext*>(GetTLSValue(m_pCurrentContextTLS));
-    }
-
-    uint32 CDevice::GetMaxContextCount()
-    {
-        return ms_uNumContextsPerDevice;
-    }
-
-    void CDevice::IssueFrameFences()
-    {
-        for (uint32 uContext = 0; uContext < m_kContexts.size(); ++uContext)
-        {
-            m_kContextFenceIssued.Set(uContext, true);
-        }
-    }
-
-    bool CDevice::CreateRenderingContexts(
-        TWindowContext& kWindowContext,
-        std::vector<TRenderingContext>& kRenderingContexts,
-        const SFeatureSpec& kFeatureSpec,
-        const SPixelFormatSpec& kPixelFormatSpec,
-        const TNativeDisplay& kNativeDisplay)
-    {
-        if (!CreateWindowContext(kWindowContext, kFeatureSpec, kPixelFormatSpec, kNativeDisplay))
-        {
-            return false;
-        }
-
-#if defined(DXGL_USE_EGL)
-    #if defined(AZ_PLATFORM_LINUX)
-        EGLint aiContextAttributes[] = {
-            EGL_CONTEXT_CLIENT_VERSION, 2,
-            EGL_NONE};
-    #else
-        SVersion version = GetRequiredGLVersion();
-        EGLint aiContextAttributes[] = 
-        {
-            EGL_CONTEXT_MAJOR_VERSION, static_cast<EGLint>(version.m_uMajorVersion),
-            EGL_CONTEXT_MINOR_VERSION, static_cast<EGLint>(version.m_uMinorVersion),
-            EGL_NONE
-        };
-    #endif
-#elif defined(DXGL_USE_WGL)
-        int32 aiAttributes[] =
-        {
-            WGL_CONTEXT_MAJOR_VERSION_ARB, kFeatureSpec.m_kVersion.m_uMajorVersion,
-            WGL_CONTEXT_MINOR_VERSION_ARB, kFeatureSpec.m_kVersion.m_uMinorVersion,
-            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-#if DXGL_DEBUG_CONTEXT
-            WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
-#endif // DXGL_DEBUG_CONTEXT
-            0
-        };
-#endif
-
-        kRenderingContexts.reserve(ms_uNumContextsPerDevice);
-        for (uint32 uContext = 0; uContext < ms_uNumContextsPerDevice; ++uContext)
-        {
-#if defined(DXGL_USE_EGL)
-            TRenderingContext kRenderingContext(eglCreateContext(kWindowContext->GetDisplay(), 
-                                                                kWindowContext->GetConfig(), 
-                                                                uContext > 0 ? kRenderingContexts.at(0) : EGL_NO_CONTEXT,
-                                                                aiContextAttributes));
-#elif defined(DXGL_USE_WGL)
-            TRenderingContext kSharedRenderingContext(NULL);
-            if (uContext > 0)
-            {
-                kSharedRenderingContext = kRenderingContexts.at(0);
-            }
-            TRenderingContext kRenderingContext(DXGL_UNWRAPPED_FUNCTION(wglCreateContextAttribsARB)(kWindowContext, kSharedRenderingContext, aiAttributes));
-#endif
-
-            if (!kRenderingContext)
-            {
-                DXGL_ERROR("Failed to create context %d", uContext);
-                return false;
-            }
-
-            kRenderingContexts.push_back(kRenderingContext);
-        }
-
-#if DXGL_DEBUG_OUTPUT_VERBOSITY
-        if (kFeatureSpec.m_kFeatures.Get(eF_DebugOutput))
-        {
-            GLenum aeSeverityLevels[] =
-            {
-                GL_DEBUG_SEVERITY_HIGH,
-                GL_DEBUG_SEVERITY_MEDIUM,
-                GL_DEBUG_SEVERITY_LOW,
-                GL_DEBUG_SEVERITY_NOTIFICATION
-            };
-
-            for (uint32 uContext = 0; uContext < kRenderingContexts.size(); ++uContext)
-            {
-                MakeCurrent(kWindowContext, kRenderingContexts.at(uContext));
-                glEnable(GL_DEBUG_OUTPUT);
-#if defined(DXGL_DEBUG_OUTPUT_SYNCHRONOUS)
-                glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-#endif //defined(DXGL_DEBUG_OUTPUT_SYNCHRONOUS)
-                if (glDebugMessageCallback)
-                {
-                    glDebugMessageCallback((GLDEBUGPROC)&DebugCallback, NULL);
-                }
-#if defined(OPENGL_ES)
-                else
-                {
-                    glDebugMessageCallbackKHR((GLDEBUGPROC)&DebugCallback, NULL);
-                }
-#endif //defined(OPENGL_ES)
-
-                for (uint32 uSeverityLevel = 0; uSeverityLevel < DXGL_ARRAY_SIZE(aeSeverityLevels); ++uSeverityLevel)
-                {
-                    if (glDebugMessageControl)
-                    {
-                        glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, aeSeverityLevels[uSeverityLevel], 0, NULL, (uSeverityLevel <= DXGL_DEBUG_OUTPUT_VERBOSITY) ? GL_TRUE : GL_FALSE);
-                    }
-#if defined(OPENGL_ES)
-                    else
-                    {
-                        glDebugMessageControlKHR(GL_DONT_CARE, GL_DONT_CARE, aeSeverityLevels[uSeverityLevel], 0, NULL, (uSeverityLevel <= DXGL_DEBUG_OUTPUT_VERBOSITY) ? GL_TRUE : GL_FALSE);
-                    }
-#endif //defined(OPENGL_ES)
-                }
-            }
-            MakeCurrent(kWindowContext, NULL);
-        }
-#endif // DXGL_DEBUG_OUTPUT_VERBOSITY
-
-        return true;
-    }
-
-    bool CDevice::SetFullScreenState(const SFrameBufferSpec& kFrameBufferSpec, bool bFullScreen, SOutput* pOutput)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-        if (bFullScreen)
-        {
-            if (pOutput == NULL)
-            {
-                pOutput = GetWindowOutput(m_spAdapter, m_kDefaultNativeDisplay);
-            }
-            if (pOutput == NULL)
-            {
-                DXGL_ERROR("Could not retrieve the display output corresponding to the window context");
-                return false;
-            }
-
-            if (pOutput != m_spFullScreenOutput)
-            {
-                DEVMODEA kReqDevMode;
-                memset(&kReqDevMode, 0, sizeof(kReqDevMode));
-                kReqDevMode.dmSize = sizeof(kReqDevMode);
-                kReqDevMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL;
-                kReqDevMode.dmPelsWidth = kFrameBufferSpec.m_uWidth;
-                kReqDevMode.dmPelsHeight = kFrameBufferSpec.m_uHeight;
-                kReqDevMode.dmBitsPerPel = kFrameBufferSpec.m_pLayout->GetPixelBits();
-
-                if (!NWin32Helper::SetFullScreenContext(pOutput, m_kDefaultNativeDisplay, kReqDevMode))
-                {
-                    return false;
-                }
-
-                m_spFullScreenOutput = pOutput;
-            }
-        }
-        else
-        {
-            if (m_spFullScreenOutput != NULL)
-            {
-                if (!NWin32Helper::UnsetFullScreenContext(m_spFullScreenOutput))
-                {
-                    return false;
-                }
-
-                m_spFullScreenOutput = NULL;
-            }
-        }
-        return true;
-#elif defined(ANDROID)
-        // Android is always full screen.
-        return true;
-#else
-        DXGL_NOT_IMPLEMENTED;
-        return false;
-#endif
-    }
-
-    bool CDevice::ResizeTarget(const SDisplayMode& kTargetMode)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-        if (kTargetMode.m_uBitsPerPixel != m_kPixelFormatSpec.m_pLayout->GetPixelBits())
-        {
-            DXGL_WARNING("ResizeTarget does not support changing the window pixel format");
-            return false;
-        }
-
-        if (m_spFullScreenOutput != NULL)
-        {
-            DEVMODEA kDevMode;
-            memset(&kDevMode, 0, sizeof(kDevMode));
-            kDevMode.dmSize = sizeof(kDevMode);
-            kDevMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL;
-            kDevMode.dmPelsWidth = kTargetMode.m_uWidth;
-            kDevMode.dmPelsHeight = kTargetMode.m_uHeight;
-            kDevMode.dmBitsPerPel = kTargetMode.m_uBitsPerPixel;
-            if (kTargetMode.m_uFrequency != 0)
-            {
-                kDevMode.dmFields |= DM_DISPLAYFREQUENCY;
-                kDevMode.dmDisplayFrequency = kTargetMode.m_uFrequency;
-            }
-
-            return NWin32Helper::SetFullScreenContext(m_spFullScreenOutput, m_kDefaultNativeDisplay, kDevMode);
-        }
-        else
-        {
-            return NWin32Helper::ResizeWindowContext(m_kDefaultNativeDisplay, kTargetMode.m_uWidth, kTargetMode.m_uHeight);
-        }
-#elif defined(ANDROID)
-        DXGL_WARNING("ResizeTarget is not supported on this platform");
-        return false;
-#elif defined(AZ_PLATFORM_LINUX)
-        AZ_Assert(0, "TODO Linux OpenGL");
-#else
-#error "Not implemented on this platform"
-#endif
-        return false;
-    }
-
-    bool CDevice::MakeCurrent(const TWindowContext& kWindowContext, TRenderingContext kRenderingContext)
-    {
-#if defined(DXGL_USE_EGL)
-        return kWindowContext->MakeCurrent(kRenderingContext);
-#elif defined(DXGL_USE_WGL)
-        return wglMakeCurrent(kRenderingContext == NULL ? NULL : kWindowContext, kRenderingContext) == TRUE;
-#else
-        DXGL_NOT_IMPLEMENTED;
-        return false;
-#endif
-    }
-
-    DXGL_TODO("Move default partitions somewhere else/find a better way since it's not engine-related - possibly pass through DXGLInitialize");
-
-#define _PARTITION_PRED(_First, _Count) { _First, _Count },
-#define PARTITION_PRED(_Argument) _PARTITION_PRED _Argument
-#define PARTITION(_Vertex, _Fragment, _Geometry, _TessControl, _TessEvaluation, _Compute) \
-    { DXGL_SHADER_TYPE_MAP(PARTITION_PRED, _Vertex, _Fragment, _Geometry, _TessControl, _TessEvaluation, _Compute) },
-
-    const TPipelineResourceUnitPartitionBound g_akTextureUnitBounds[] =
-    {
-        //         VERTEX      FRAGMENT    GEOMETRY    TESSCTL     TESSEVAL    COMPUTE
-        PARTITION((0,  10), (0,  16), (0,   6), (0,   0), (0,   0), (0,   0))           // Graphics
-        PARTITION((0,   0), (0,   0), (0,   0), (0,   0), (0,   0), (0,  32))           // Compute
-    };
-
-    const TPipelineResourceUnitPartitionBound g_akUniformBufferUnitBounds[] =
-    {
-        //         VERTEX      FRAGMENT    GEOMETRY    TESSCTL     TESSEVAL    COMPUTE
-        PARTITION((0,   12), (0,   12), (0,   12), (0,   12), (0,   12), (0,   0))           // Graphics
-        PARTITION((0,   0), (0,   0), (0,   0), (0,   0), (0,   0), (0,  16))           // Compute
-    };
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-    const TPipelineResourceUnitPartitionBound g_akStorageBufferUnitBounds[] =
-    {
-        //         VERTEX      FRAGMENT    GEOMETRY    TESSCTL     TESSEVAL    COMPUTE
-        PARTITION((14,   2), (16,   8), (0,   0), (0,   0), (0,   0), (0,   0))         // Graphics
-        PARTITION((0,   0), (0,   0), (0,   0), (0,   0), (0,   0), (16,   8))          // Compute
-    };
-
-#endif
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-
-    const TPipelineResourceUnitPartitionBound g_akImageUnitBounds[] =
-    {
-        //         VERTEX      FRAGMENT    GEOMETRY    TESSCTL     TESSEVAL    COMPUTE
-        PARTITION((0,   0), (0,   8), (0,   0), (0,   0), (0,   0), (0,   0))           // Graphics
-        PARTITION((0,   0), (0,   0), (0,   0), (0,   0), (0,   0), (0,   8))           // Compute
-    };
-
-#endif
-
-#undef PARTITION
-#undef PARTITION_PRED
-#undef _PARTITION_PRED
-
-    void CDevice::InitializeResourceUnitPartitions()
-    {
-        const SCapabilities& kCapabilities(m_spAdapter->m_kCapabilities);
-
-        PartitionResourceIndices(eRUT_Texture,       g_akTextureUnitBounds,       DXGL_ARRAY_SIZE(g_akTextureUnitBounds));
-        PartitionResourceIndices(eRUT_UniformBuffer, g_akUniformBufferUnitBounds, DXGL_ARRAY_SIZE(g_akUniformBufferUnitBounds));
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        PartitionResourceIndices(eRUT_StorageBuffer, g_akStorageBufferUnitBounds, DXGL_ARRAY_SIZE(g_akStorageBufferUnitBounds));
-#endif
-#if DXGL_SUPPORT_SHADER_IMAGES
-        if (m_spAdapter->m_kFeatures.Get(eF_ShaderImages))
-        {
-            PartitionResourceIndices(eRUT_Image, g_akImageUnitBounds, DXGL_ARRAY_SIZE(g_akImageUnitBounds));
-        }
-#endif
-    }
-
-    bool CDevice::IsFeatureSupported(EFeature feature) const
-    {
-        AZ_Assert(feature < eF_NUM, "Invalid EFeature %d", feature);
-        return m_kFeatureSpec.m_kFeatures.Get(feature);
-    }
-
-    const char* GetResourceUnitTypeName(EResourceUnitType eUnitType)
-    {
-        switch (eUnitType)
-        {
-        case eRUT_Texture:
-            return "Texture unit";
-        case eRUT_UniformBuffer:
-            return "Uniform buffer unit";
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        case eRUT_StorageBuffer:
-            return "Storage buffer unit";
-#endif
-#if DXGL_SUPPORT_SHADER_IMAGES
-        case eRUT_Image:
-            return "Image unit";
-#endif
-        default:
-            assert(false);
-            return "?";
-        }
-    }
-
-    bool TryDistributeResourceIndices(
-        SIndexPartition& kPartition,
-        const SResourceUnitCapabilities& kCapabilities,
-        const TPipelineResourceUnitPartitionBound& akStageBounds)
-    {
-        uint32 uTotBelowLimit = 0;
-        uint32 uTotAvailable = kCapabilities.m_aiMaxTotal;
-
-        uint32 uTotUsed = 0;
-        for (uint32 uStage = 0; uStage < eST_NUM; ++uStage)
-        {
-            kPartition.m_akStages[uStage].m_uCount = akStageBounds[uStage].m_uNumUnits;
-            uTotUsed += akStageBounds[uStage].m_uNumUnits;
-
-            if (kCapabilities.m_aiMaxPerStage[uStage] < kPartition.m_akStages[uStage].m_uCount)
-            {
-                return false;
-            }
-
-            uTotBelowLimit += kCapabilities.m_aiMaxPerStage[uStage] - kPartition.m_akStages[uStage].m_uCount;
-        }
-
-        if (uTotUsed > uTotAvailable)
-        {
-            return false;
-        }
-
-        while (uTotAvailable > uTotUsed && uTotBelowLimit > 0)
-        {
-            uint32 uTotRemaining = uTotAvailable - uTotUsed;
-            uint32 uTotAssigned = 0;
-            for (uint32 uStage = 0; uStage < eST_NUM; ++uStage)
-            {
-                uint32 uBelowLimit = kCapabilities.m_aiMaxPerStage[uStage] - kPartition.m_akStages[uStage].m_uCount;
-                if (uBelowLimit > 0)
-                {
-                    uint32 uAssigned = min(uTotRemaining - uTotAssigned, max(1u, uTotRemaining * uBelowLimit / uTotBelowLimit));
-                    kPartition.m_akStages[uStage].m_uCount += uAssigned;
-                    uTotAssigned += uAssigned;
-                }
-            }
-            assert(uTotAssigned > 0 && uTotAssigned <= uTotRemaining);
-            uTotUsed += uTotAssigned;
-        }
-
-        for (uint32 uStage = 0, uFirstSlot = 0; uStage < eST_NUM; ++uStage)
-        {
-            kPartition.m_akStages[uStage].m_uFirstIn = akStageBounds[uStage].m_uFirstUnit;
-            kPartition.m_akStages[uStage].m_uFirstOut = uFirstSlot;
-            uFirstSlot += kPartition.m_akStages[uStage].m_uCount;
-        }
-
-        return true;
-    }
-
-    void CDevice::PartitionResourceIndices(
-        EResourceUnitType eUnitType,
-        const TPipelineResourceUnitPartitionBound* akPartitionBounds,
-        uint32 uNumPartitions)
-    {
-        CDevice::TPartitions& kPartitions = m_kResourceUnitPartitions[eUnitType];
-        const SResourceUnitCapabilities& kCapabilities = m_spAdapter->m_kCapabilities.m_akResourceUnits[eUnitType];
-
-        kPartitions.reserve(uNumPartitions);
-
-        for (uint32 uPartition = 0; uPartition < uNumPartitions; ++uPartition)
-        {
-            const TPipelineResourceUnitPartitionBound& akStageBounds(akPartitionBounds[uPartition]);
-
-            SIndexPartition kPartition;
-            if (TryDistributeResourceIndices(kPartition, kCapabilities, akStageBounds))
-            {
-                kPartitions.push_back(kPartition);
-            }
-            else
-            {
-                DXGL_WARNING("%s partition %d is not supported by this configuration - it will not be used", GetResourceUnitTypeName(eUnitType), uPartition);
-            }
-        }
-    }
-
-    struct SDummyContext
-    {
-        SDummyWindow m_kDummyWindow;
-        TRenderingContext m_kRenderingContext;
-#if defined(DXGL_USE_EGL)
-        TWindowContext m_kDisplayConnection;
-#endif //DXGL_USE_EGL
-        bool m_kIsInitialized;
-
-        SDummyContext()
-            : m_kRenderingContext(NULL)
-            , m_kIsInitialized(false)
-        {
-        }
-
-        ~SDummyContext()
-        {
-            Shutdown();
-        }
-
-        bool Initialize()
-        {
-            if (m_kIsInitialized)
-            {
-                return true;
-            }
-
-            if (!m_kDummyWindow.Initialize(NULL))
-            {
-                return false;
-            }
-#if defined(DXGL_USE_EGL)
-            SPixelFormatSpec pixelFormat;
-            SUncompressedLayout layout;
-            ZeroMemory(&pixelFormat, sizeof(pixelFormat));
-            ZeroMemory(&layout, sizeof(layout));
-            pixelFormat.m_pLayout = &layout;
-
-            m_kDisplayConnection.reset(SDisplayConnection::Create(pixelFormat, m_kDummyWindow.m_kNativeDisplay));
-            if (!m_kDisplayConnection)
-            {
-                DXGL_ERROR("Creation of the dummy DXGL window failed");
-                return false;
-            }
-
-#if defined(AZ_PLATFORM_LINUX)
-            SVersion version = GetRequiredGLVersion();
-            EGLint aiContextAttributes[] = {
-                EGL_CONTEXT_CLIENT_VERSION, 2,
-                EGL_NONE};
-#else
-            SVersion version = GetRequiredGLVersion();
-            EGLint aiContextAttributes[] = {
-                EGL_CONTEXT_MAJOR_VERSION, static_cast<EGLint>(version.m_uMajorVersion),
-                EGL_CONTEXT_MINOR_VERSION, static_cast<EGLint>(version.m_uMinorVersion),
-                EGL_NONE};
-#endif
-            m_kRenderingContext = eglCreateContext(m_kDisplayConnection->GetDisplay(),
-                                                   m_kDisplayConnection->GetConfig(), 
-                                                    EGL_NO_CONTEXT, 
-                                                    aiContextAttributes);
-            if (m_kRenderingContext == EGL_NO_CONTEXT)
-            {
-                DXGL_ERROR("Dummy DXGL context creation failed: [0x%08x]", eglGetError());
-                return false;
-            }
-            if (!m_kDisplayConnection->MakeCurrent(m_kRenderingContext))
-            {
-                DXGL_ERROR("Dummy DXGL context MakeCurrent failed: [0x%08x]", eglGetError());
-                return false;
-            }
-#elif defined(DXGL_USE_WGL)
-            m_kRenderingContext = wglCreateContext(m_kDummyWindow.m_kNativeDisplay);
-            if (m_kRenderingContext == NULL ||
-                wglMakeCurrent(m_kDummyWindow.m_kNativeDisplay, m_kRenderingContext) != TRUE)
-            {
-                DXGL_ERROR("Dummy DXGL context creation failed");
-                return false;
-            }
-#else
-#   error "Not Implemented"
-#endif
-            m_kIsInitialized = true;
-            return true;
-        }
-
-        void Shutdown()
-        {
-            if (!m_kIsInitialized)
-            {
-                return;
-            }
-
-#if defined(DXGL_USE_EGL)
-            m_kDisplayConnection->MakeCurrent(nullptr);
-            if (m_kRenderingContext != NULL)
-            {
-                eglDestroyContext(m_kDisplayConnection->GetDisplay(), m_kRenderingContext);
-            }
-#elif defined(DXGL_USE_WGL)
-            wglMakeCurrent(NULL, NULL);
-            if (m_kRenderingContext != 0)
-            {
-                wglDeleteContext(m_kRenderingContext);
-            }
-#else
-#   error "Not Implemented"
-#endif
-            m_kDummyWindow.Shutdown();
-            m_kIsInitialized = false;
-        }
-    };
-
-    bool FeatureLevelToFeatureSpec(SFeatureSpec& kFeatureSpec, D3D_FEATURE_LEVEL eFeatureLevel, NCryOpenGL::SAdapter* pGLAdapter)
-    {
-#if DXGLES && !defined(DXGL_ES_SUBSET)
-        //LYTODO: seems like our ES version should line up differently with eFeatureLevel
-        if (eFeatureLevel == D3D_FEATURE_LEVEL_11_0)
-        {
-            uint32 adapterGLVersion = pGLAdapter->m_sVersion.ToUint();
-            if (adapterGLVersion >= DXGLES_VERSION_31)
-            {
-                kFeatureSpec.m_kVersion.m_uMajorVersion = 3;
-                kFeatureSpec.m_kVersion.m_uMinorVersion = 1;
-            }
-            else if (adapterGLVersion == DXGLES_VERSION_30)
-            {
-                kFeatureSpec.m_kVersion.m_uMajorVersion = 3;
-                kFeatureSpec.m_kVersion.m_uMinorVersion = 0;
-            }
-            else
-            {
-                DXGL_ERROR("Could not match feature level to openGL version. Feature level = %d, Adapter GL Version = %u", eFeatureLevel, adapterGLVersion);
-                return false;
-            }
-        }
-        else
-        {
-            DXGL_ERROR("Feature level not implemented on OpenGL ES");
-            return false;
-        }
-#else
-        switch (eFeatureLevel)
-        {
-        case D3D_FEATURE_LEVEL_9_1:
-        case D3D_FEATURE_LEVEL_9_2:
-        case D3D_FEATURE_LEVEL_9_3:
-            kFeatureSpec.m_kVersion.m_uMajorVersion = 2;
-            kFeatureSpec.m_kVersion.m_uMinorVersion = 0;
-            break;
-        case D3D_FEATURE_LEVEL_10_0:
-        case D3D_FEATURE_LEVEL_10_1:
-            kFeatureSpec.m_kVersion.m_uMajorVersion = 3;
-            kFeatureSpec.m_kVersion.m_uMinorVersion = 3;
-            break;
-        case D3D_FEATURE_LEVEL_11_0:
-            kFeatureSpec.m_kVersion.m_uMajorVersion = 4;
-            kFeatureSpec.m_kVersion.m_uMinorVersion = 3;
-            break;
-        default:
-            DXGL_ERROR("Unknown feature level");
-            return false;
-        }
-#endif
-
-        kFeatureSpec.m_kFeatures.Set(eF_ComputeShader, eFeatureLevel >= D3D_FEATURE_LEVEL_10_0);
-        return true;
-    }
-
-    void GetStandardPixelFormatSpec(SPixelFormatSpec& kPixelFormatSpec)
-    {
-        kPixelFormatSpec.m_pLayout = GetGIFormatInfo(eGIF_R8G8B8A8_UNORM_SRGB)->m_pUncompressed;
-        kPixelFormatSpec.m_uNumSamples = 1;
-        kPixelFormatSpec.m_bSRGB = true;
-    }
-
-    bool SwapChainDescToFrameBufferSpec(SFrameBufferSpec& kFrameBufferSpec, const DXGI_SWAP_CHAIN_DESC& kSwapChainDesc)
-    {
-        EGIFormat eGIFormat(GetGIFormat(kSwapChainDesc.BufferDesc.Format));
-        if (eGIFormat == eGIF_NUM)
-        {
-            return false;
-        }
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(eGIFormat));
-
-        kFrameBufferSpec.m_uWidth = kSwapChainDesc.BufferDesc.Width;
-        kFrameBufferSpec.m_uHeight = kSwapChainDesc.BufferDesc.Height;
-        kFrameBufferSpec.m_uNumSamples = kSwapChainDesc.SampleDesc.Count;
-        kFrameBufferSpec.m_bSRGB = pFormatInfo->m_pTexture->m_bSRGB;
-        kFrameBufferSpec.m_pLayout = pFormatInfo->m_pUncompressed;
-
-        return true;
-    }
-
-    bool GetNativeDisplay(TNativeDisplay& kNativeDisplay, HWND kWindowHandle)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-        HDC deviceContext = GetDC(kWindowHandle);
-        if (deviceContext == NULL)
-        {
-            DXGL_ERROR("Could not retrieve the DC of the swap chain output window");
-            return false;
-        }
-#   if defined(DXGL_USE_EGL)
-        HWND nativeWindow = WindowFromDC(deviceContext);
-        if (!nativeWindow)
-        {
-            DXGL_ERROR("Could not retrieve window from device context");
-            return false;
-        }
-        kNativeDisplay = AZStd::make_shared<EGLNativePlatform>(deviceContext, nativeWindow);
-#   else
-        kNativeDisplay = deviceContext;
-#   endif // defined(DXGL_USE_EGL)
-        return true;
-#elif defined(ANDROID)
-        kNativeDisplay = AZStd::make_shared<EGLNativePlatform>(static_cast<EGLNativeDisplayType>(EGL_DEFAULT_DISPLAY), static_cast<EGLNativeWindowType>(kWindowHandle));
-        return true;
-#elif defined(AZ_PLATFORM_LINUX)
-        kNativeDisplay = AZStd::make_shared<EGLNativePlatform>(s_defaultDisplay, reinterpret_cast<EGLNativeWindowType>(kWindowHandle));
-        return true;
-#else
-#error "Not supported on this platform"
-#endif
-    }
-
-    bool CreateWindowContext(
-        TWindowContext& kWindowContext,
-        const SFeatureSpec& kFeatureSpec,
-        const SPixelFormatSpec& kPixelFormatSpec,
-        const TNativeDisplay& kNativeDisplay)
-    {
-#if defined(DXGL_USE_EGL)
-        kWindowContext.reset(SDisplayConnection::Create(kPixelFormatSpec, kNativeDisplay));
-        if (kWindowContext == NULL)
-        {
-            return false;
-        }
-#elif defined(WIN32)
-        kWindowContext = kNativeDisplay;
-        if (!SetWindowPixelFormat(kWindowContext, &kPixelFormatSpec))
-        {
-            return false;
-        }
-#endif
-
-        return true;
-    }
-
-    void ReleaseWindowContext(TWindowContext& kWindowContext)
-    {
-#if defined(DXGL_USE_EGL)
-        kWindowContext = nullptr;
-#endif //DXGL_USE_EGL
-    }
-
-#if DXGL_SUPPORT_QUERY_INTERNAL_FORMAT_SUPPORT
-
-    bool QueryInternalFormatSupport(GLenum eTarget, GLenum eInternalFormat, GLenum eQueryName, uint32 uFlag, uint32& uMask)
-    {
-        if (DXGL_GL_EXTENSION_SUPPORTED(ARB_internalformat_query2))
-        {
-            GLint iSupported;
-            glGetInternalformativ(eTarget, eInternalFormat, eQueryName, 1, &iSupported);
-            bool bSupported;
-            switch (iSupported)
-            {
-            case GL_NONE:
-                bSupported = false;
-                break;
-            case GL_CAVEAT_SUPPORT:
-                DXGL_WARNING("Internal format supported but not optimal");
-                bSupported = true;
-                break;
-            case GL_FULL_SUPPORT:
-            case GL_TRUE:
-                bSupported = true;
-                break;
-            default:
-                DXGL_ERROR("Invalid parameter returned by internal format query");
-                return false;
-            }
-            uMask = bSupported ? uMask | uFlag : uMask & ~uFlag;
-            return true;
-        }
-        return false;
-    }
-
-    void QueryInternalFormatTexSupport(GLenum eTarget, GLenum eInternalFormat, uint32 uTexFlag, uint32& uMask)
-    {
-        if (QueryInternalFormatSupport(eTarget, eInternalFormat, GL_INTERNALFORMAT_SUPPORTED, uTexFlag, uMask) && (uMask & uTexFlag) != 0)
-        {
-#if !defined(_RELEASE)
-            GLint iPreferred;
-            glGetInternalformativ(eTarget, eInternalFormat, GL_INTERNALFORMAT_PREFERRED, 1, &iPreferred);
-            if (iPreferred != eInternalFormat)
-            {
-                DXGL_WARNING("Internal format supported but not preferred");
-            }
-#endif //!defined(_RELEASE)
-        }
-    }
-
-#endif // DXGL_SUPPORT_QUERY_INTERNAL_FORMAT_SUPPORT
-
-    uint32 DetectGIFormatSupport(EGIFormat eGIFormat)
-    {
-        uint32 uSupport(0);
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(eGIFormat));
-        if (pFormatInfo == NULL)
-        {
-            return uSupport;
-        }
-
-        uSupport = pFormatInfo->m_uDefaultSupport;
-
-        const STextureFormat* pTextureFormat(pFormatInfo->m_pTexture);
-        if (pTextureFormat != NULL)
-        {
-#if DXGL_SUPPORT_QUERY_INTERNAL_FORMAT_SUPPORT
-            QueryInternalFormatTexSupport(GL_TEXTURE_1D, pTextureFormat->m_iInternalFormat, D3D11_FORMAT_SUPPORT_TEXTURE1D, uSupport);
-            QueryInternalFormatTexSupport(GL_TEXTURE_2D, pTextureFormat->m_iInternalFormat, D3D11_FORMAT_SUPPORT_TEXTURE2D, uSupport);
-            QueryInternalFormatTexSupport(GL_TEXTURE_3D, pTextureFormat->m_iInternalFormat, D3D11_FORMAT_SUPPORT_TEXTURE3D, uSupport);
-            QueryInternalFormatTexSupport(GL_TEXTURE_CUBE_MAP, pTextureFormat->m_iInternalFormat, D3D11_FORMAT_SUPPORT_TEXTURECUBE, uSupport);
-            QueryInternalFormatSupport(GL_TEXTURE_2D, pTextureFormat->m_iInternalFormat, GL_MIPMAP, D3D11_FORMAT_SUPPORT_MIP, uSupport);
-#else
-            DXGL_TODO("Use an alternative way to detect texture format support such as proxy textures");
-            uSupport |=
-                D3D11_FORMAT_SUPPORT_TEXTURE1D
-                | D3D11_FORMAT_SUPPORT_TEXTURE2D
-                | D3D11_FORMAT_SUPPORT_TEXTURE3D
-                | D3D11_FORMAT_SUPPORT_TEXTURECUBE
-                | D3D11_FORMAT_SUPPORT_MIP;
-#endif
-        }
-        else
-        {
-            uSupport &= ~(
-                    D3D11_FORMAT_SUPPORT_TEXTURE1D
-                    | D3D11_FORMAT_SUPPORT_TEXTURE2D
-                    | D3D11_FORMAT_SUPPORT_TEXTURE3D
-                    | D3D11_FORMAT_SUPPORT_TEXTURECUBE
-                    | D3D11_FORMAT_SUPPORT_MIP);
-        }
-
-        const SUncompressedLayout* pUncompressedLayout(pFormatInfo->m_pUncompressed);
-        if (pUncompressedLayout != NULL && pTextureFormat != NULL)
-        {
-#if DXGL_SUPPORT_QUERY_INTERNAL_FORMAT_SUPPORT
-            if (QueryInternalFormatSupport(GL_TEXTURE_2D, pTextureFormat->m_iInternalFormat, GL_FRAMEBUFFER_RENDERABLE,  D3D11_FORMAT_SUPPORT_RENDER_TARGET | D3D11_FORMAT_SUPPORT_DEPTH_STENCIL, uSupport))
-            {
-                uint32 uColorRenderable(0);
-                QueryInternalFormatSupport(GL_TEXTURE_2D, pTextureFormat->m_iInternalFormat, GL_COLOR_RENDERABLE, D3D11_FORMAT_SUPPORT_RENDER_TARGET, uColorRenderable);
-                uint32 uDepthRenderable(0);
-                QueryInternalFormatSupport(GL_TEXTURE_2D, pTextureFormat->m_iInternalFormat, GL_DEPTH_RENDERABLE, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL, uDepthRenderable);
-                uint32 uStencilRenderable(0);
-                QueryInternalFormatSupport(GL_TEXTURE_2D, pTextureFormat->m_iInternalFormat, GL_STENCIL_RENDERABLE, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL, uStencilRenderable);
-                uSupport |= uColorRenderable | uDepthRenderable | uStencilRenderable;
-
-                QueryInternalFormatSupport(GL_TEXTURE_2D, pTextureFormat->m_iInternalFormat, GL_FRAMEBUFFER_BLEND, D3D11_FORMAT_SUPPORT_BLENDABLE, uSupport);
-            }
-#else
-            DXGL_TODO("Use an alternative way to detect format renderability such as per-platform tables in GLFormat.cpp");
-            uSupport |=
-                D3D11_FORMAT_SUPPORT_RENDER_TARGET
-                | D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET
-                | D3D11_FORMAT_SUPPORT_BLENDABLE
-                | D3D11_FORMAT_SUPPORT_DEPTH_STENCIL;
-#endif
-        }
-        else
-        {
-            uSupport &= ~(
-                    D3D11_FORMAT_SUPPORT_RENDER_TARGET
-                    | D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET
-                    | D3D11_FORMAT_SUPPORT_BLENDABLE
-                    | D3D11_FORMAT_SUPPORT_DEPTH_STENCIL);
-        }
-        return uSupport;
-    }
-
-#if DXGL_SUPPORT_GETTEXIMAGE
-
-    bool DetectIfCopyImageWorksOnCubeMapFaces()
-    {
-        GLuint auInput[16 * 3 * 3];
-        for (uint32 uPixel = 0; uPixel < DXGL_ARRAY_SIZE(auInput); ++uPixel)
-        {
-            auInput[uPixel] = (GLuint)uPixel;
-        }
-
-        GLuint auTextures[2];
-        glGenTextures(2, auTextures);
-        glTextureStorage2DEXT(auTextures[0], GL_TEXTURE_2D, 1, GL_RGBA8, 4 * 3, 4 * 3);
-        glTextureStorage2DEXT(auTextures[1], GL_TEXTURE_CUBE_MAP, 1, GL_RGBA8, 4, 4);
-
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-        glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-        glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-        glPixelStorei(GL_UNPACK_SKIP_IMAGES, 0);
-        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-
-        glTextureSubImage2DEXT(auTextures[0], GL_TEXTURE_2D, 0, 0, 0, 4 * 3, 4 * 3, GL_RGBA, GL_UNSIGNED_BYTE, auInput);
-
-        glPixelStorei(GL_PACK_ALIGNMENT, 1);
-        glPixelStorei(GL_PACK_ROW_LENGTH, 0);
-        glPixelStorei(GL_PACK_SKIP_ROWS, 0);
-        glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
-        glPixelStorei(GL_PACK_SKIP_IMAGES, 0);
-        glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
-
-        GLuint auFace[16];
-        GLuint auOutput[16 * 6];
-        bool bCopied(true);
-        for (uint32 uFace = 0; uFace < 6; ++uFace)
-        {
-            uint32 uX((uFace % 3) * 4), uY((uFace / 3) * 4);
-            glCopyImageSubData(auTextures[0], GL_TEXTURE_2D, 0, uX, uY, 0, auTextures[1], GL_TEXTURE_CUBE_MAP, 0, 0, 0, uFace, 4, 4, 1);
-            glGetTextureImageEXT(auTextures[1], GL_TEXTURE_CUBE_MAP_POSITIVE_X + uFace, 0, GL_RGBA, GL_UNSIGNED_BYTE, auFace);
-            for (uint32 uRow = 0; uRow < 4; ++uRow)
-            {
-                memcpy(auOutput + (uRow + uY) * 4 * 3 + uX, auFace + uRow * 4, 4 * sizeof(GLuint));
-            }
-        }
-
-        glDeleteTextures(2, auTextures);
-
-        return memcmp(auInput, auOutput, sizeof(auOutput)) == 0;
-    }
-
-#endif //DXGL_SUPPORT_GETTEXIMAGE
-
-#define ELEMENT(_Enum) _Enum,
-
-    static const GLenum g_aeMaxTextureUnits[] =
-    {
-        DXGL_SHADER_TYPE_MAP(ELEMENT,
-            GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS,
-            GL_MAX_TEXTURE_IMAGE_UNITS,
-            GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS,
-            GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS,
-            GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS,
-            GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS)
-        GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
-    };
-
-    static const GLenum g_aeMaxUniformBufferUnits[] =
-    {
-        DXGL_SHADER_TYPE_MAP(ELEMENT,
-            GL_MAX_VERTEX_UNIFORM_BLOCKS,
-            GL_MAX_FRAGMENT_UNIFORM_BLOCKS,
-            GL_MAX_GEOMETRY_UNIFORM_BLOCKS,
-            GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS,
-            GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS,
-            GL_MAX_COMPUTE_UNIFORM_BLOCKS)
-        GL_MAX_UNIFORM_BUFFER_BINDINGS
-    };
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-    static const GLenum g_aeMaxStorageBufferUnits[] =
-    {
-        DXGL_SHADER_TYPE_MAP(ELEMENT,
-            GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS,
-            GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS,
-            GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS,
-            GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS,
-            GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS,
-            GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS)
-        GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS
-    };
-
-#endif
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-
-    static const GLenum g_aeMaxImageUnits[] =
-    {
-        DXGL_SHADER_TYPE_MAP(ELEMENT,
-            GL_MAX_VERTEX_IMAGE_UNIFORMS,
-            GL_MAX_FRAGMENT_IMAGE_UNIFORMS,
-            GL_MAX_GEOMETRY_IMAGE_UNIFORMS,
-            GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS,
-            GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS,
-            GL_MAX_COMPUTE_IMAGE_UNIFORMS)
-        GL_MAX_IMAGE_UNITS
-    };
-
-#endif
-
-#undef ELEMENT
-
-    void DetectResourceUnitCapabilities(SResourceUnitCapabilities* pCapabilities, const GLenum* aeMaxUnits)
-    {
-        memset(pCapabilities->m_aiMaxPerStage, 0, sizeof(pCapabilities->m_aiMaxPerStage));
-        for (uint32 uStage = 0; uStage < eST_NUM; ++uStage)
-        {
-            glGetIntegerv(aeMaxUnits[uStage], pCapabilities->m_aiMaxPerStage + uStage);
-        }
-
-        pCapabilities->m_aiMaxTotal = 0;
-        glGetIntegerv(aeMaxUnits[eST_NUM], &pCapabilities->m_aiMaxTotal);
-    }
-
-    void DetectContextFeatures(TFeatures& kFeatures, const SCapabilities& kCapabilities, const SVersion& version, const unsigned int driverVendor)
-    {
-        uint32 glVersion = version.ToUint();
-#if DXGLES || defined(DXGL_ES_SUBSET)
-        bool gles30orHigher = glVersion >= DXGLES_VERSION_30;
-        bool gles31orHigher = glVersion >= DXGLES_VERSION_31;
-        bool gles32orHigher = glVersion >= DXGLES_VERSION_32;
-
-        kFeatures.Set(eF_IndexedBoolState, gles31orHigher);
-        kFeatures.Set(eF_StencilOnlyFormat, gles31orHigher);
-        kFeatures.Set(eF_MultiSampledTextures, gles31orHigher);
-        kFeatures.Set(eF_DrawIndirect, gles31orHigher);
-        kFeatures.Set(eF_StencilTextures, gles31orHigher);
-        kFeatures.Set(eF_AtomicCounters, gles31orHigher);
-        kFeatures.Set(eF_DispatchIndirect, gles31orHigher);
-        kFeatures.Set(eF_ShaderImages, gles31orHigher);
-        kFeatures.Set(eF_TextureViews, gles30orHigher && DXGL_GL_EXTENSION_SUPPORTED(EXT_texture_view) && !DXGL_SUPPORT_NSIGHT_SINCE(4_1) && !DXGL_SUPPORT_VOGL);
-        kFeatures.Set(eF_SeparablePrograms, gles31orHigher || DXGL_GL_EXTENSION_SUPPORTED(EXT_separate_shader_objects));
-        kFeatures.Set(eF_ComputeShader, gles31orHigher);
-        kFeatures.Set(eF_DualSourceBlending, false);
-        kFeatures.Set(eF_IndependentBlending, gles32orHigher);
-        // glCopyImageSubData causes a crash on Mali GPUs. Disabling it for now.
-        kFeatures.Set(eF_CopyImage, (gles32orHigher || DXGL_GL_EXTENSION_SUPPORTED(EXT_copy_image)) && driverVendor != RenderCapabilities::s_gpuVendorIdARM);
-        // OpenGLES doesn't support depth clamping but we emulate it by writing the depth in the pixel shader.
-        // Unfortunately Qualcomm OpenGL ES 3.0 drivers have a bug and they don't support modifying the depth in the pixel shader.
-        kFeatures.Set(eF_DepthClipping, !(glVersion == DXGLES_VERSION_30 && driverVendor == RenderCapabilities::s_gpuVendorIdQualcomm));
-
-        bool isAnisotropicFilteringEnabled = DXGL_GL_EXTENSION_SUPPORTED(EXT_texture_filter_anisotropic);
-        kFeatures.Set(eF_TextureAnisotropicFiltering, isAnisotropicFilteringEnabled);
-
-        bool textureBorderClamp = false;
-#if defined(DXGL_ES_SUBSET)
-        textureBorderClamp = true;
-#endif // defined(DXGL_ES_SUBSET)
-        kFeatures.Set(eF_TextureBorderClamp, textureBorderClamp || DXGL_GL_EXTENSION_SUPPORTED(EXT_texture_border_clamp));
-        kFeatures.Set(eF_DebugOutput, DXGL_GL_EXTENSION_SUPPORTED(KHR_debug));
-
-#else
-        // OpenGL
-        bool gl32orHigher = glVersion >= DXGL_VERSION_32;
-        bool gl41orHigher = glVersion >= DXGL_VERSION_41;
-        bool gl42orHigher = glVersion >= DXGL_VERSION_42;
-        bool gl43orHigher = glVersion >= DXGL_VERSION_43;
-        bool gl44orHigher = glVersion >= DXGL_VERSION_44;
-
-        kFeatures.Set(eF_DepthClipping, true);
-        kFeatures.Set(eF_IndexedBoolState, gl32orHigher);
-        kFeatures.Set(eF_StencilOnlyFormat, gl32orHigher);
-        kFeatures.Set(eF_TextureBorderClamp, gl32orHigher);
-        kFeatures.Set(eF_MultiSampledTextures, gl41orHigher);
-        kFeatures.Set(eF_DrawIndirect, gl41orHigher);
-        kFeatures.Set(eF_SeparablePrograms, gl41orHigher || DXGL_GL_EXTENSION_SUPPORTED(ARB_separate_shader_objects));
-        kFeatures.Set(eF_StencilTextures, gl42orHigher);
-        kFeatures.Set(eF_AtomicCounters, gl42orHigher);
-        kFeatures.Set(eF_DispatchIndirect, gl43orHigher);
-        kFeatures.Set(eF_ShaderImages, gl43orHigher);
-        kFeatures.Set(eF_VertexAttribBinding, gl43orHigher || DXGL_GL_EXTENSION_SUPPORTED(ARB_vertex_attrib_binding));
-        kFeatures.Set(eF_TextureViews, (gl43orHigher || DXGL_GL_EXTENSION_SUPPORTED(ARB_texture_view)) && !DXGL_SUPPORT_NSIGHT_SINCE(4_1) && !DXGL_SUPPORT_VOGL);
-        kFeatures.Set(eF_DebugOutput, gl43orHigher || DXGL_GL_EXTENSION_SUPPORTED(KHR_debug));
-        kFeatures.Set(eF_ComputeShader, gl43orHigher || DXGL_GL_EXTENSION_SUPPORTED(ARB_compute_shader));
-        kFeatures.Set(eF_BufferStorage, gl44orHigher || DXGL_GL_EXTENSION_SUPPORTED(ARB_buffer_storage));
-        kFeatures.Set(eF_IndependentBlending, true);
-        kFeatures.Set(eF_CopyImage, gl43orHigher);
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-        // Technically dual source blending is supported since OpenGL 3.3 but you need to declare the fragment shader output with the 
-        // position and the index (for OpenGL < 4.4): 
-        // layout(location = 0, index = 1) out vec4 diffuseColor1; <== SR1 for dual source blending      
-        // Unfortunately the DX shader bytecode doesn't distinguish between a normal COLOR1 output or a COLOR1 for dual blending so the HLSL cross compiler
-        // doesn't know that it needs to generate a different declaration.
-        kFeatures.Set(eF_DualSourceBlending, gl44orHigher);
-#else
-        kFeatures.Set(eF_DualSourceBlending, gl41orHigher);
-#endif // DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-
-#endif //#if DXGLES || defined(DXGL_ES_SUBSET)
-
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-        DXGL_TODO(
-            "At the moment HLSLcc does guarantee exact interface matching between programs. "
-            "This can lead to pipelines that fail validation or worse with undefined behavior because they have "
-            "in one stage user-defined output variables that are ignored by the following stage."
-            "Investigate if this can be fixed.")
-            kFeatures.Set(eF_SeparablePrograms, false);
-#endif
-
-#ifndef AZ_PLATFORM_ANDROID
-        DXGL_TODO("Workaround for the NVIDIA 331.113 x64 linux driver crash - investigate");
-        kFeatures.Set(eF_VertexAttribBinding, false);
-#endif // !AZ_PLATFORM_ANDROID
-
-        DXGL_TODO("Workaround for the multi-threaded GL driver crash - investigate");
-        kFeatures.Set(eF_MultiBind, false);
-    }
-
-    bool DetectFeaturesAndCapabilities(TFeatures& kFeatures, SCapabilities& kCapabilities, const SVersion& version, const unsigned int driverVendor)
-    {
-        glGetIntegerv(GL_MAX_SAMPLES, &kCapabilities.m_iMaxSamples);
-        glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &kCapabilities.m_iMaxVertexAttribs);
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        glGetIntegerv(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT, &kCapabilities.m_iShaderStorageBufferOffsetAlignment);
-#endif
-        glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &kCapabilities.m_iUniformBufferOffsetAlignment);
-        glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &kCapabilities.m_iMaxUniformBlockSize);
-
-        DetectResourceUnitCapabilities(&kCapabilities.m_akResourceUnits[eRUT_Texture],       g_aeMaxTextureUnits);
-        DetectResourceUnitCapabilities(&kCapabilities.m_akResourceUnits[eRUT_UniformBuffer], g_aeMaxUniformBufferUnits);
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        DetectResourceUnitCapabilities(&kCapabilities.m_akResourceUnits[eRUT_StorageBuffer], g_aeMaxStorageBufferUnits);
-#endif
-        DetectContextFeatures(kFeatures, kCapabilities, version, driverVendor);
-#if DXGL_SUPPORT_SHADER_IMAGES
-        if (kFeatures.Get(eF_ShaderImages))
-        {
-            DetectResourceUnitCapabilities(&kCapabilities.m_akResourceUnits[eRUT_Image], g_aeMaxImageUnits);
-        }
-#endif
-
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        if (kFeatures.Get(eF_VertexAttribBinding))
-        {
-            glGetIntegerv(GL_MAX_VERTEX_ATTRIB_BINDINGS, &kCapabilities.m_iMaxVertexAttribBindings);
-            glGetIntegerv(GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET, &kCapabilities.m_iMaxVertexAttribRelativeOffset);
-
-            if (kCapabilities.m_iMaxVertexAttribBindings > MAX_VERTEX_ATTRIB_BINDINGS)
-            {
-                kCapabilities.m_iMaxVertexAttribBindings = MAX_VERTEX_ATTRIB_BINDINGS;
-            }
-        }
-#endif
-
-        for (uint32 uGIFormat = 0; uGIFormat < eGIF_NUM; ++uGIFormat)
-        {
-            kCapabilities.m_auFormatSupport[uGIFormat] = DetectGIFormatSupport((EGIFormat)uGIFormat);
-        }
-        
-        // Assume it works
-        kCapabilities.m_bCopyImageWorksOnCubeMapFaces = true;
-#if DXGL_SUPPORT_GETTEXIMAGE
-        if(kFeatures.Get(eF_CopyImage))
-        {
-            kCapabilities.m_bCopyImageWorksOnCubeMapFaces = DetectIfCopyImageWorksOnCubeMapFaces();
-        }
-#endif // DXGL_SUPPORT_GETTEXIMAGE
-
-
-        glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &kCapabilities.m_maxRenderTargets);
-        kCapabilities.m_plsSizeInBytes = 0;
-#if defined(GL_EXT_shader_pixel_local_storage)
-        if (DXGL_GL_EXTENSION_SUPPORTED(EXT_shader_pixel_local_storage))
-        {
-            glGetIntegerv(GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE_EXT, &kCapabilities.m_plsSizeInBytes);
-        }
-#endif // GL_EXT_shader_pixel_local_storage
-
-#if defined(GL_EXT_shader_framebuffer_fetch)
-        if (DXGL_GL_EXTENSION_SUPPORTED(EXT_shader_framebuffer_fetch))
-        {
-            kCapabilities.m_frameBufferFetchSupport.set(RenderCapabilities::FBF_ALL_COLORS);
-            kCapabilities.m_frameBufferFetchSupport.set(RenderCapabilities::FBF_COLOR0);
-        }
-#endif // GL_EXT_shader_framebuffer_fetch
-
-#if defined(GL_ARM_shader_framebuffer_fetch)
-        if (DXGL_GL_EXTENSION_SUPPORTED(ARM_shader_framebuffer_fetch))
-        {
-            // Check that we can fetch COLOR0 when using multiple render targets.
-            GLboolean mrtSupport = GL_FALSE;
-            glGetBooleanv(GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM, &mrtSupport);
-            if (mrtSupport)
-            {
-                kCapabilities.m_frameBufferFetchSupport.set(RenderCapabilities::FBF_COLOR0);
-            }
-        }
-#endif // GL_ARM_shader_framebuffer_fetch
-
-#if defined(GL_ARM_shader_framebuffer_fetch_depth_stencil)
-        if (DXGL_GL_EXTENSION_SUPPORTED(ARM_shader_framebuffer_fetch_depth_stencil))
-        {
-            kCapabilities.m_frameBufferFetchSupport.set(RenderCapabilities::FBF_DEPTH);
-            kCapabilities.m_frameBufferFetchSupport.set(RenderCapabilities::FBF_STENCIL);
-        }
-#endif // GL_ARM_shader_framebuffer_fetch_depth_stencil
-
-        return true;
-    }
-
-    size_t DetectVideoMemory()
-    {
-#if DXGL_EXTENSION_LOADER
-    #if !DXGLES
-        if (DXGL_GL_EXTENSION_SUPPORTED(NVX_gpu_memory_info))
-        {
-            GLint iVMemKB = 0;
-            glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &iVMemKB);
-            return iVMemKB * 1024;
-        }
-        else if (DXGL_GL_EXTENSION_SUPPORTED(ATI_meminfo))
-        {
-            GLint aiTexFreeMemoryInfo[4] = {0, 0, 0, 0};
-            glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, aiTexFreeMemoryInfo);
-            return aiTexFreeMemoryInfo[0] * 1024;
-        }
-    #else
-        DXGL_TODO("Not yet implemented for GLES");
-    #endif
-        return 0;
-#elif defined(MAC)
-        return static_cast<size_t>(GetVRAMForDisplay(0));
-#elif defined(IOS)
-        DXGL_TODO("Not yet implemented for iOS")
-        return 0;
-#elif defined(DXGL_USE_EGL)
-        DXGL_TODO("Not yet implemented for EGL");
-        return 0;
-#else
-#error "Not implemented on this platform"
-#endif
-    }
-
-    unsigned int DetectDriverVendor(const char* szVendorName)
-    {
-        struct
-        {
-            uint16 m_uPCIID;
-            const char* m_szName;
-        } akKnownVendors[] =
-        {
-            { RenderCapabilities::s_gpuVendorIdNVIDIA, "NVIDIA Corporation" },
-            { RenderCapabilities::s_gpuVendorIdNVIDIA, "Nouveau" },
-            { RenderCapabilities::s_gpuVendorIdAMD, "ATI Technologies Inc." },
-            { RenderCapabilities::s_gpuVendorIdAMD, "Advanced Micro Devices, Inc." },
-            { RenderCapabilities::s_gpuVendorIdIntel, "Intel" },
-            { RenderCapabilities::s_gpuVendorIdIntel, "Intel Inc." },
-            { RenderCapabilities::s_gpuVendorIdIntel, "Intel Corporation" },
-            { RenderCapabilities::s_gpuVendorIdIntel, "Intel Open Source Technology Center" },
-            { RenderCapabilities::s_gpuVendorIdQualcomm, "Qualcomm" },
-            { RenderCapabilities::s_gpuVendorIdARM, "ARM" },
-            // Rally US2888 - VendorID detection for Imagination, Samsung, etc.
-        };
-
-        for (uint32 uVendor = 0; uVendor < DXGL_ARRAY_SIZE(akKnownVendors); ++uVendor)
-        {
-            if (azstricmp(szVendorName, akKnownVendors[uVendor].m_szName) == 0)
-            {
-                return akKnownVendors[uVendor].m_uPCIID;
-            }
-        }
-
-        return 0;
-    }
-
-#if DXGL_EXTENSION_LOADER
-    bool LoadEarlyGLEntryPoints()
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(DXGL_USE_LOADER_GLAD)
-#   if defined(DXGL_USE_EGL)
-        if (gladLoaderLoadEGL(NULL) == 0)
-        {
-            DXGL_ERROR("Failed to retrieve EGL entry points");
-            return false;
-        }
-#   endif
-#else
-#error "Not implemented on this platform"
-#endif
-        return true;
-    }
-
-    bool LoadGLEntryPoints(SDummyContext& kDummyContext)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(DXGL_USE_LOADER_GLAD)
-#   if defined(DXGL_USE_EGL)
-        if (gladLoaderLoadEGL(NULL) == 0)
-        {
-            DXGL_ERROR("Failed to retrieve EGL entry points");
-            return false;
-        }
-#   elif defined(DXGL_USE_GLX)
-        if (gladLoaderLoadGLX(NULL, 0) == 0)
-        {
-            DXGL_ERROR("Failed to retrieve GLX entry points");
-            return false;
-        }
-#   endif
-
-#if defined(OPENGL_ES)
-        int ret = gladLoaderLoadGLES2();
-#else
-        int ret = gladLoaderLoadGL();
-#endif //defined(OPENGL_ES)
-        
-        if (ret == 0)
-        {
-            DXGL_ERROR("Failed to retrieve GL entry points");
-            return false;
-        }
-
-#   if defined(DXGL_USE_WGL)
-        if (gladLoaderLoadWGL(kDummyContext.m_kDummyWindow.m_kNativeDisplay) == 0)
-        {
-            DXGL_ERROR("Failed to retrieve WGL entry points");
-            return false;
-        }
-#   endif 
-
-#elif defined(DXGL_USE_LOADER_GLEW)
-        GLenum err = glewInit();
-        if (GLEW_OK != err)
-        {
-            DXGL_ERROR("Failed to init GLEW. Error %s", glewGetErrorString(err));
-            return false;
-        }
-#   if defined(DXGL_USE_WGL)
-        err = wglewInit();
-        if (GLEW_OK != err)
-        {
-            DXGL_ERROR("Failed to init WGL GLEW. Error %s", glewGetErrorString(err));
-            return false;
-        }
-#   elif defined(DXGL_USE_GLX)
-        err = glxewInit();
-        if (GLEW_OK != err)
-        {
-            DXGL_ERROR("Failed to init WGL GLEW. Error %s", glewGetErrorString(err));
-            return false;
-        }
-#   endif
-#else
-#error "Not implemented on this platform"
-#endif
-        return true;
-    }
-#endif //DXGL_EXTENSION_LOADER
-    bool GetGLVersion(SAdapterPtr& pAdapter)
-    {
-        if (!pAdapter)
-        {
-            return false;
-        }
-
-        O3de::OpenGL::ClearErrors();
-        GLint major = 0, minor = 0;
-        glGetIntegerv(GL_MAJOR_VERSION, &major);
-        glGetIntegerv(GL_MINOR_VERSION, &minor);
-        AZ_Assert(major >=0, "Invalid OpenGL major version %d", major);
-        AZ_Assert(minor >= 0, "Invalid OpenGL minor version %d", minor);
-
-        pAdapter->m_sVersion.m_uMajorVersion = static_cast<uint32>(major);
-        pAdapter->m_sVersion.m_uMinorVersion = static_cast<uint32>(minor);
-        return O3de::OpenGL::CheckError() == GL_NO_ERROR;
-    }
-
-    bool ParseExtensions(SAdapterPtr& pAdapter)
-    {
-        if (!pAdapter)
-        {
-            return false;
-        }
-
-        int num = 0, index;
-        bool result = true;
-        O3de::OpenGL::ClearErrors();
-        glGetIntegerv(GL_NUM_EXTENSIONS, &num);
-        for (index = 0; index < num; ++index)
-        {
-            const char* extension = reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, index));
-            if (!extension)
-            {
-                result = false;
-                AZ_Warning("Renderer", false, "Failed to get extension %d for adapter %s %s", index, pAdapter->m_strVendor.c_str(), pAdapter->m_strRenderer.c_str());
-                continue;
-            }
-
-            pAdapter->AddExtension(extension);
-        }
-
-        return result && O3de::OpenGL::CheckError() == GL_NO_ERROR;
-    }
-
-    bool DetectAdapters(std::vector<SAdapterPtr>& kAdapters)
-    {
-        // Linux needs access to EGL much earlier than other EGL platforms do, so the EGL entry points are loaded in CreateWindow
-#if DXGL_EXTENSION_LOADER && !defined(AZ_PLATFORM_LINUX)
-        if (!LoadEarlyGLEntryPoints())
-        {
-            return false;
-        }
-#endif // DXGL_EXTENSION_LOADER
-
-        SDummyContext kDummyContext;
-        if (!kDummyContext.Initialize())
-        {
-            return false;
-        }
-
-#if DXGL_EXTENSION_LOADER
-        if (!LoadGLEntryPoints(kDummyContext))
-        {
-            return false;
-        }
-#endif // DXGL_EXTENSION_LOADER
-
-        SAdapterPtr spAdapter(new SAdapter);
-        spAdapter->m_strRenderer = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
-        spAdapter->m_strVendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
-        spAdapter->m_strVersion = reinterpret_cast<const char*>(glGetString(GL_VERSION));
-        spAdapter->m_uVRAMBytes = DetectVideoMemory();
-        spAdapter->m_eDriverVendor = DetectDriverVendor(spAdapter->m_strVendor.c_str());
-        spAdapter->m_sVersion.m_uMajorVersion = 0;
-        spAdapter->m_sVersion.m_uMinorVersion = 0;
-        bool result = GetGLVersion(spAdapter);
-        AZ_Warning("Renderer", result, "Failed to get the OpenGL version for adapter %s %s", spAdapter->m_strVendor.c_str(), spAdapter->m_strRenderer.c_str());
-        result = ParseExtensions(spAdapter);
-        AZ_Warning("Renderer", result, "Failed to parse OpenGL Extensions for adapter %s %s", spAdapter->m_strVendor.c_str(), spAdapter->m_strRenderer.c_str());
-
-        if (gEnv->pRenderer)
-        {
-            gEnv->pRenderer->SetApiVersion(spAdapter->m_strVersion.c_str());
-        }
-
-        if (!DetectFeaturesAndCapabilities(spAdapter->m_kFeatures, spAdapter->m_kCapabilities, spAdapter->m_sVersion, spAdapter->m_eDriverVendor))
-        {
-            return false;
-        }
-        kAdapters.push_back(spAdapter);
-        return true;
-    }
-
-    bool CheckAdapterCapabilities(const SAdapter& kAdapter, AZStd::string* pErrorMsg /*=nullptr*/)
-    {
-        // Check the openGL(ES) version
-        uint32 version = kAdapter.m_sVersion.ToUint();
-        uint32 requiredVersion;
-#if DXGLES
-        requiredVersion = DXGLES_REQUIRED_VERSION;
-#else
-        requiredVersion = DXGL_REQUIRED_VERSION;
-#endif
-
-        if (version < requiredVersion)
-        {
-            if (pErrorMsg)
-            {
-                *pErrorMsg = AZStd::string::format("Device %s %s doesn't support the minimum version needed of OpenGL (ES). Required %u, found %u.", kAdapter.m_strVendor.c_str(),
-                                                                                                                                                kAdapter.m_strRenderer.c_str(),
-                                                                                                                                                requiredVersion, version);
-            }
-            return false;
-        }
-
-        int maxBufferUniform = kAdapter.m_kCapabilities.m_akResourceUnits[eRUT_UniformBuffer].m_aiMaxTotal;
-        if (maxBufferUniform < MIN_UNIFORM_BUFFERS_REQUIRED)
-        {
-            if (pErrorMsg)
-            {
-                *pErrorMsg = AZStd::string::format("Device %s %s doesn't support enough uniform buffers. Required %d, found %d",  kAdapter.m_strVendor.c_str(), kAdapter.m_strRenderer.c_str(), 
-                                                                                                                                MIN_UNIFORM_BUFFERS_REQUIRED, maxBufferUniform);
-            }
-            return false;
-        }
-                
-        return true;
-    }
-
-    bool DetectOutputs(const SAdapter& kAdapter, std::vector<SOutputPtr>& kOutputs)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_8
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-        uint32 uDisplay(0);
-        DISPLAY_DEVICEA kDisplayDevice;
-        ZeroMemory(&kDisplayDevice, sizeof(kDisplayDevice));
-        kDisplayDevice.cb = sizeof(kDisplayDevice);
-        while (EnumDisplayDevicesA(NULL, uDisplay, &kDisplayDevice, 0))
-        {
-            SOutputPtr spOutput(new SOutput);
-            spOutput->m_strDeviceID = kDisplayDevice.DeviceID;
-            spOutput->m_strDeviceName = kDisplayDevice.DeviceName;
-
-            DEVMODEA kDevMode;
-            ZeroMemory(&kDevMode, sizeof(kDevMode));
-            kDevMode.dmSize = sizeof(kDevMode);
-
-            SDisplayMode kDisplayMode;
-            uint32 uModeID(0);
-            while (EnumDisplaySettingsA(kDisplayDevice.DeviceName, uModeID, &kDevMode))
-            {
-                DevModeToDisplayMode(&kDisplayMode, kDevMode);
-                ++uModeID;
-
-                spOutput->m_kModes.push_back(kDisplayMode);
-            }
-
-            if (!spOutput->m_kModes.empty())
-            {
-                if (!EnumDisplaySettingsA(kDisplayDevice.DeviceName, ENUM_CURRENT_SETTINGS, &kDevMode))
-                {
-                    DXGL_ERROR("Could not retrieve the desktop display mode mode for display %d", uDisplay);
-                    return false;
-                }
-                DevModeToDisplayMode(&spOutput->m_kDesktopMode, kDevMode);
-
-                kOutputs.push_back(spOutput);
-            }
-            ++uDisplay;
-        }
-        return true;
-#elif defined(ANDROID)
-        ANativeWindow* nativeWindow = AZ::Android::Utils::GetWindow();
-        if (!nativeWindow)
-        {
-            DXGL_ERROR("Failed to get native window");
-            return false;
-        }
-
-        int widthPixels, heightPixels;
-        if (!AZ::Android::Utils::GetWindowSize(widthPixels, heightPixels))
-        {
-            DXGL_ERROR("Failed to get window size");
-            return false;
-        }
-
-        gcpRendD3D->GetClampedWindowSize(widthPixels, heightPixels);
-
-        SDisplayMode mode;
-        mode.m_uWidth = static_cast<uint32>(widthPixels);
-        mode.m_uHeight = static_cast<uint32>(heightPixels);
-        mode.m_uFrequency = 0;
-        mode.m_nativeFormat = ANativeWindow_getFormat(nativeWindow);
-
-        SOutputPtr output(new SOutput());
-        output->m_strDeviceID = "0";
-        output->m_strDeviceName = "Main Output";
-        output->m_kModes.push_back(mode);
-        output->m_kDesktopMode = mode;
-        kOutputs.push_back(output);
-        return true;
-#elif defined(AZ_PLATFORM_LINUX)
-        // TODO Linux - Query window dims from adapter
-        int widthPixels = 1280;
-        int heightPixels = 720;
-        gcpRendD3D->GetClampedWindowSize(widthPixels, heightPixels);
-
-        SDisplayMode mode;
-        mode.m_uWidth = static_cast<uint32>(widthPixels);
-        mode.m_uHeight = static_cast<uint32>(heightPixels);
-        mode.m_uFrequency = 0;
-
-        SOutputPtr output(new SOutput());
-        output->m_strDeviceID = "0";
-        output->m_strDeviceName = "Main Output";
-        output->m_kModes.push_back(mode);
-        output->m_kDesktopMode = mode;
-        kOutputs.push_back(output);
-        return true;
-#else
-        DXGL_NOT_IMPLEMENTED;
-        return false;
-#endif
-    }
-
-    bool CheckFormatMultisampleSupport(SAdapter* pAdapter, EGIFormat eFormat, uint32 uNumSamples)
-    {
-        return
-            uNumSamples <= pAdapter->m_kCapabilities.m_iMaxSamples;
-    }
-
-    void GetDXGIModeDesc(DXGI_MODE_DESC* pDXGIModeDesc, const SDisplayMode& kDisplayMode)
-    {
-        pDXGIModeDesc->Width = kDisplayMode.m_uWidth;
-        pDXGIModeDesc->Height = kDisplayMode.m_uHeight;
-        pDXGIModeDesc->RefreshRate.Numerator = kDisplayMode.m_uFrequency;
-        pDXGIModeDesc->RefreshRate.Denominator = 1;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_9
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-        DXGL_TODO("Check if there is a better way of mapping GL display modes to formats")
-        switch (kDisplayMode.m_uBitsPerPixel)
-        {
-        case 32:
-            pDXGIModeDesc->Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-            break;
-        case 64:
-            pDXGIModeDesc->Format = DXGI_FORMAT_R16G16B16A16_UNORM;
-            break;
-        default:
-            pDXGIModeDesc->Format = DXGI_FORMAT_UNKNOWN;
-            break;
-        }
-#elif defined(ANDROID)
-        switch (kDisplayMode.m_nativeFormat)
-        {
-        case WINDOW_FORMAT_RGBA_8888:
-            pDXGIModeDesc->Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-            break;
-        case WINDOW_FORMAT_RGBX_8888:
-            pDXGIModeDesc->Format = DXGI_FORMAT_B8G8R8X8_UNORM;
-            break;
-        case WINDOW_FORMAT_RGB_565:
-            pDXGIModeDesc->Format = DXGI_FORMAT_B5G6R5_UNORM;
-            break;
-        default:
-            pDXGIModeDesc->Format = DXGI_FORMAT_UNKNOWN;
-            break;
-        }
-#elif defined(AZ_PLATFORM_LINUX)
-        // Do nothing?
-#else
-        DXGL_NOT_IMPLEMENTED;
-#endif
-
-        pDXGIModeDesc->ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
-        pDXGIModeDesc->Scaling =  DXGI_MODE_SCALING_UNSPECIFIED;
-    }
-
-    bool GetDisplayMode(SDisplayMode* pDisplayMode, const DXGI_MODE_DESC& kDXGIModeDesc)
-    {
-        pDisplayMode->m_uWidth = kDXGIModeDesc.Width;
-        pDisplayMode->m_uHeight = kDXGIModeDesc.Height;
-        if (kDXGIModeDesc.RefreshRate.Denominator != 0)
-        {
-            pDisplayMode->m_uFrequency = kDXGIModeDesc.RefreshRate.Numerator / kDXGIModeDesc.RefreshRate.Denominator;
-        }
-        else
-        {
-            pDisplayMode->m_uFrequency = 0;
-        }
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_CPP_SECTION_10
-    #include AZ_RESTRICTED_FILE(GLDevice_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-        switch (kDXGIModeDesc.Format)
-        {
-        case DXGI_FORMAT_R8G8B8A8_UNORM:
-            pDisplayMode->m_uBitsPerPixel = 32;
-            break;
-        case DXGI_FORMAT_R16G16B16A16_UNORM:
-            pDisplayMode->m_uBitsPerPixel = 64;
-            break;
-        default:
-        {
-            EGIFormat eGIFormat(GetGIFormat(kDXGIModeDesc.Format));
-            const SGIFormatInfo* pFormatInfo;
-            if (eGIFormat == eGIF_NUM ||
-                (pFormatInfo = GetGIFormatInfo(eGIFormat)) == NULL ||
-                pFormatInfo->m_pUncompressed == NULL)
-            {
-                DXGL_ERROR("Invalid DXGI format for display mode");
-                return false;
-            }
-            pDisplayMode->m_uBitsPerPixel = pFormatInfo->m_pUncompressed->GetPixelBits();
-        }
-        break;
-        }
-#elif defined(ANDROID)
-        switch (kDXGIModeDesc.Format)
-        {
-        case DXGI_FORMAT_R8G8B8A8_UNORM:
-            pDisplayMode->m_nativeFormat = WINDOW_FORMAT_RGBA_8888;
-            break;
-        case DXGI_FORMAT_B8G8R8X8_UNORM:
-            pDisplayMode->m_nativeFormat = WINDOW_FORMAT_RGBX_8888;
-            break;
-        case DXGI_FORMAT_B5G6R5_UNORM:
-            pDisplayMode->m_nativeFormat = WINDOW_FORMAT_RGB_565;
-            break;
-        default:
-            AZ_Assert(false, "Invalid DXGI_MODE_DESC format %d", kDXGIModeDesc.Format);
-            return false;
-        }
-#endif
-        DXGL_TODO("Consider scanline order and scaling if possible");
-
-        return true;
-    }
-
-#if DXGL_DEBUG_OUTPUT_VERBOSITY
-
-    void DXGL_DEBUG_CALLBACK_CONVENTION DebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, void* userParam)
-    {
-        //  this filters out the debug messages earlier saving the performance which might be broken by excessive string creation.
-        if ((type == GL_DEBUG_SEVERITY_LOW) || (type == GL_DEBUG_SEVERITY_NOTIFICATION))
-        {
-            return;
-        }
-
-        ::string errorMessage, sourceStr, typeStr, severityStr;
-        ELogSeverity eLogSeverity = eLS_Warning;
-
-        switch (source)
-        {
-        case GL_DEBUG_SOURCE_API:
-            sourceStr = "OpenGL";
-            break;
-        case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
-            sourceStr = "Windows";
-            break;
-        case GL_DEBUG_SOURCE_SHADER_COMPILER:
-            sourceStr = "Shader Compiler";
-            break;
-        case GL_DEBUG_SOURCE_THIRD_PARTY:
-            sourceStr = "Third Party";
-            break;
-        case GL_DEBUG_SOURCE_APPLICATION:
-            sourceStr = "Application";
-            break;
-        case GL_DEBUG_SOURCE_OTHER:
-            sourceStr = "Other";
-            break;
-        }
-
-        switch (type)
-        {
-        case GL_DEBUG_TYPE_ERROR:
-            typeStr = "Error";
-            break;
-        case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
-            typeStr = "Deprecated behavior";
-            break;
-        case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
-            typeStr = "Undefined behavior";
-            break;
-        case GL_DEBUG_TYPE_PORTABILITY:
-            typeStr = "Portability";
-            break;
-        case GL_DEBUG_TYPE_PERFORMANCE:
-            typeStr = "Performance";
-            break;
-        case GL_DEBUG_TYPE_OTHER:
-            typeStr = "Other";
-            break;
-        }
-
-        switch (severity)
-        {
-        case GL_DEBUG_SEVERITY_HIGH:
-            severityStr = "High";
-            eLogSeverity = eLS_Error;
-            break;
-        case GL_DEBUG_SEVERITY_MEDIUM:
-            severityStr = "Medium";
-            eLogSeverity = eLS_Warning;
-            break;
-        case GL_DEBUG_SEVERITY_LOW:
-            severityStr = "Low";
-            eLogSeverity = eLS_Info;
-            break;
-        case GL_DEBUG_SEVERITY_NOTIFICATION:
-            severityStr = "Info";
-            eLogSeverity = eLS_Info;
-            break;
-        }
-        
-        //Anyone needing more information on OpenGL rendering in non-debug builds should enable this section of code for additional information
-        //It's DEBUG only to help obtain a cleaner log on some Android devices which would otherwise be inundated with messages from this section of code
-#if defined(DEBUG) 
-        if (eLogSeverity != eLS_Info)
-        {
-            errorMessage.Format("OpenGLError:\nSource: %s\nType: %s\nId: %i\nSeverity: %s\nMessage: %s\n", sourceStr.c_str(), typeStr.c_str(), id, severityStr.c_str(), message);
-            NCryOpenGL::LogMessage(eLogSeverity,  errorMessage.c_str());
-        }
-#endif
-    }
-
-#endif //DXGL_DEBUG_OUTPUT_VERBOSITY
-
-#if DXGL_TRACE_CALLS
-
-    void CallTracePrintf(const char* szFormat, ...)
-    {
-        CDevice* pDevice(CDevice::GetCurrentDevice());
-        if (pDevice == NULL)
-        {
-            return;
-        }
-
-        CContext* pCurrentContext(pDevice->GetCurrentContext());
-        if (pCurrentContext == NULL)
-        {
-            return;
-        }
-
-        char acBuffer[512];
-        va_list kArgs;
-        va_start(kArgs, szFormat);
-        vsprintf_s(acBuffer, szFormat, kArgs);
-        va_end(kArgs);
-
-        pCurrentContext->CallTraceWrite(acBuffer);
-    }
-
-    void CallTraceFlush()
-    {
-        CDevice* pDevice(CDevice::GetCurrentDevice());
-        if (pDevice == NULL)
-        {
-            return;
-        }
-
-        CContext* pCurrentContext(pDevice->GetCurrentContext());
-        if (pCurrentContext == NULL)
-        {
-            return;
-        }
-
-        pCurrentContext->CallTraceFlush();
-    }
-
-#endif
-
-#if DXGL_CHECK_ERRORS
-
-    void CheckErrors()
-    {
-        enum
-        {
-            MAX_ERROR_QUERIES = 4
-        };
-        uint32 uNumQueries(0);
-        GLenum eErrorCode;
-        while ((eErrorCode = DXGL_UNWRAPPED_FUNCTION(glGetError)()) != GL_NO_ERROR)
-        {
-            const char* szName;
-            const char* szMessage;
-            switch (eErrorCode)
-            {
-#if defined(WIN32)
-            case GL_CONTEXT_LOST:
-                szName = "GL_CONTEXT_LOST";
-                szMessage = "Context has been lost and reset by the driver";
-                break;
-#endif
-            case GL_INVALID_ENUM:
-                szName = "GL_INVALID_ENUM";
-                szMessage = "Enum argument out of range";
-                break;
-            case GL_INVALID_VALUE:
-                szName = "GL_INVALID_VALUE";
-                szMessage = "Numeric argument out of range";
-                break;
-            case GL_INVALID_OPERATION:
-                szName = "GL_INVALID_OPERATION";
-                szMessage = "Operation illegal in current state";
-                break;
-            case GL_INVALID_FRAMEBUFFER_OPERATION:
-                szName = "GL_INVALID_FRAMEBUFFER_OPERATION";
-                szMessage = "Framebuffer object is not complete";
-                break;
-            case GL_OUT_OF_MEMORY:
-                szName = "GL_OUT_OF_MEMORY";
-                szMessage = "Not enough memory left to execute command";
-                break;
-            case GL_STACK_OVERFLOW:
-                szName = "GL_STACK_OVERFLOW";
-                szMessage = "Command would cause a stack overflow";
-                break;
-            case GL_STACK_UNDERFLOW:
-                szName = "GL_STACK_UNDERFLOW";
-                szMessage = "Command would cause a stack underflow";
-                break;
-            default:
-                szName = "?";
-                szMessage = "Unknown GL error";
-                break;
-            }
-            DXGL_ERROR("GL error: %s (0x%04X) - %s", szName, eErrorCode, szMessage);
-            if (++uNumQueries > MAX_ERROR_QUERIES)
-            {
-                DXGL_ERROR("GL error limit reached - probably no context set");
-                break;
-            }
-        }
-    }
-
-#endif //DXGL_CHECK_ERRORS
-} // namespace NCryOpenGL
-
-namespace O3de
-{
-    namespace OpenGL
-    {
-#if defined(LY_ENABLE_OPENGL_ERROR_CHECKING)
-        unsigned int CheckError()
-        {
-            GLenum errorCode = glGetError();
-            while (errorCode != GL_NO_ERROR)
-            {
-                ::string errorMessage = string().Format("OpenGL Error: [0x%08x]\n!", errorCode);
-                NCryOpenGL::LogMessage(NCryOpenGL::ELogSeverity::eLS_Warning,  errorMessage.c_str());
-                errorCode = glGetError();
-            }
-            return errorCode;
-        }
-
-        void ClearErrors()
-        {
-            while (glGetError() != GL_NO_ERROR);
-        }
-#endif
-    } // namespace OpenGL
-} // namespace O3de
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLDevice.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLDevice.hpp
deleted file mode 100644
index ade0e8346f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLDevice.hpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the type CDevice and the functions to
-//               initialize OpenGL contexts and detect hardware
-//               capabilities.
-
-
-#ifndef __GLDEVICE__
-#define __GLDEVICE__
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define GLDEVICE_HPP_SECTION_1 1
-#define GLDEVICE_HPP_SECTION_2 2
-#endif
-
-#include "GLCommon.hpp"
-#include "GLContext.hpp"
-
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzCore/std/containers/map.h>
-
-// EGL Windows are pointers on some platforms and integers on other platforms, so we can't globally use nullptr
-#if defined(AZ_PLATFORM_LINUX)
-    #define EGL_NULL_VALUE 0
-#else
-    #define EGL_NULL_VALUE nullptr
-#endif
-
-namespace NCryOpenGL
-{
-    // Optional device context features
-    enum EFeature
-    {
-        eF_ComputeShader,
-        eF_IndexedBoolState,
-        eF_StencilOnlyFormat,
-        eF_MultiSampledTextures,
-        eF_DrawIndirect,
-        eF_StencilTextures,
-        eF_AtomicCounters,
-        eF_DispatchIndirect,
-        eF_ShaderImages,
-        eF_VertexAttribBinding,
-        eF_TextureViews,
-        eF_DepthClipping,
-        eF_SeparablePrograms,
-        eF_TextureBorderClamp,
-        eF_TextureAnisotropicFiltering,
-        eF_BufferStorage,
-        eF_MultiBind,
-        eF_DebugOutput,
-        eF_DualSourceBlending,
-        eF_IndependentBlending,
-        eF_CopyImage,
-        eF_NUM // Must be last one
-    };
-
-    struct SResourceUnitCapabilities
-    {
-        GLint m_aiMaxTotal;
-        GLint m_aiMaxPerStage[eST_NUM];
-    };
-
-    // Hardware capabilities of a device context
-    struct SCapabilities
-    {
-        GLint m_iMaxSamples;
-        GLint m_iMaxVertexAttribs;
-        GLint m_maxRenderTargets;
-        GLint m_plsSizeInBytes; // 0 when PLS is not supported
-        RenderCapabilities::FrameBufferFetchMask m_frameBufferFetchSupport;
-
-        SResourceUnitCapabilities m_akResourceUnits[eRUT_NUM];
-
-        GLint m_iUniformBufferOffsetAlignment;
-        GLint m_iMaxUniformBlockSize;
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        GLint m_iShaderStorageBufferOffsetAlignment;
-#endif
-
-        // vertex attrib binding
-        GLint m_iMaxVertexAttribBindings;
-        GLint m_iMaxVertexAttribRelativeOffset;
-
-        // The supported usage for each GI format (union of D3D11_FORMAT_SUPPORT flags)
-        uint32 m_auFormatSupport[eGIF_NUM];
-
-        // Some drivers implementation of glCopyImageSubData does not work on cube map faces as specified by the standard
-        bool m_bCopyImageWorksOnCubeMapFaces;
-    };
-
-    struct SVersion
-    {
-        int32 m_uMajorVersion;
-        int32 m_uMinorVersion;
-
-        SVersion()
-            : m_uMajorVersion(0)
-            , m_uMinorVersion(0)
-        {}
-
-        SVersion(int32 version)
-        {
-            m_uMajorVersion = version / 100;
-            m_uMinorVersion = (version / 10) % 10;
-        }
-
-        uint32 ToUint() const
-        {
-            return m_uMajorVersion * 100 + m_uMinorVersion * 10;
-        }
-    };
-
-    struct SPixelFormatSpec
-    {
-        const SUncompressedLayout* m_pLayout;
-        uint32 m_uNumSamples;
-        bool m_bSRGB;
-    };
-
-    struct SFrameBufferSpec
-        : SPixelFormatSpec
-    {
-        uint32 m_uWidth;
-        uint32 m_uHeight;
-    };
-
-    typedef SBitMask<eF_NUM, SUnsafeBitMaskWord> TFeatures;
-
-    struct SFeatureSpec
-    {
-        TFeatures m_kFeatures;
-        SVersion m_kVersion;
-    };
-
-    struct SDisplayMode
-    {
-        uint32 m_uWidth;
-        uint32 m_uHeight;
-        uint32 m_uFrequency;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(GLDevice_hpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-        uint32 m_uBitsPerPixel;
-#elif defined(ANDROID)
-        int32_t m_nativeFormat;
-#endif
-    };
-
-    struct SResourceUnitPartitionBound
-    {
-        uint32 m_uFirstUnit; // Lowest unit index used
-        uint32 m_uNumUnits; // Number of contiguous unit indices used
-    };
-
-    typedef SResourceUnitPartitionBound TPipelineResourceUnitPartitionBound[eST_NUM];
-
-
-#if defined(DXGL_USE_EGL)
-    typedef std::pair<EGLNativeDisplayType, EGLNativeWindowType> EGLNativePlatform;
-    typedef AZStd::shared_ptr<EGLNativePlatform> TNativeDisplay;
-#else
-    typedef TWindowContext TNativeDisplay;
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLDEVICE_HPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(GLDevice_hpp)
-#endif
-
-#if defined(DXGL_USE_EGL)
-
-    DXGL_DECLARE_REF_COUNTED(struct, SDisplayConnection)
-    {
-    public:
-        static SDisplayConnection* Create(const SPixelFormatSpec& kPixelFormatSpec, const TNativeDisplay& kDefaultNativeDisplay);
-
-        SDisplayConnection();
-        ~SDisplayConnection();
-        bool Init(const SPixelFormatSpec& pixelFormatSpec, const TNativeDisplay& defaultNativeDisplay);
-        bool MakeCurrent(const TRenderingContext context) const;
-        bool SwapBuffers(const TRenderingContext context);
-        void SetWindow(EGLNativeWindowType window);
-
-        EGLDisplay GetDisplay() const { return m_display; }
-        EGLConfig GetConfig() const { return m_config; }
-        EGLDisplay GetSurface() const { return m_surface; }
-        EGLNativeWindowType GetWindow() const { return  m_window; }
-
-    protected:
-        bool CreateSurface();
-        bool DestroySurface();
-
-#if defined(AZ_PLATFORM_LINUX)
-        bool CreateX11Window();
-#endif
-
-        EGLDisplay m_display;
-        EGLSurface m_surface;
-        EGLConfig m_config;
-        EGLNativeWindowType m_window;
-        bool m_dirtyFlag;
-        mutable AZStd::mutex m_mutex; // Synchronize window destroy/create events.
-    };
-
-#endif //defined(DXGL_USE_EGL)
-
-    DXGL_DECLARE_REF_COUNTED(struct, SOutput)
-    {
-        string m_strDeviceID;
-        string m_strDeviceName;
-        std::vector<SDisplayMode> m_kModes;
-        SDisplayMode m_kDesktopMode;
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SAdapter)
-    {
-        string m_strRenderer;
-        string m_strVendor;
-        string m_strVersion;
-        SVersion m_sVersion;
-
-        SCapabilities m_kCapabilities;
-        std::vector<SOutputPtr> m_kOutputs;
-
-        TFeatures m_kFeatures;
-        size_t m_uVRAMBytes;
-        unsigned int m_eDriverVendor;
-        AZStd::unordered_set<size_t> m_kExtensions;
-
-        void AddExtension(const AZStd::string& kExtension)
-        {
-            m_kExtensions.insert(AZStd::hash<AZStd::string>()(kExtension));
-        }
-
-        bool HasExtension(const AZStd::string& kExtension) const
-        {
-            return m_kExtensions.find(AZStd::hash<AZStd::string>()(kExtension)) != m_kExtensions.end();
-        }
-    };
-
-    DXGL_DECLARE_REF_COUNTED(class, CDevice)
-        , public AzFramework::ApplicationLifecycleEvents::Bus::Handler
-    {
-    public:
-
-        CDevice(SAdapter * pAdapter, const SFeatureSpec&kFeatureSpec, const SPixelFormatSpec&kPixelFormatSpec);
-        ~CDevice();
-
-#if !DXGL_FULL_EMULATION
-        static void Configure(uint32 uNumSharedContexts);
-#endif //!DXGL_FULL_EMULATION
-
-#if !defined(WIN32)
-        static bool CreateWindow(const char* title, uint32 width, uint32 height, bool fullscreen, HWND * handle);
-        static void DestroyWindow(HWND handle);
-        static void InitWindow(HWND handle, uint32 width, uint32 height);
-#endif
-
-        bool Initialize(const TNativeDisplay&kDefaultNativeDisplay);
-        void Shutdown();
-        bool Present(const TWindowContext&kTargetWindowContext);
-
-        CContext* ReserveContext();
-        void ReleaseContext();
-        CContext* AllocateContext(CContext::ContextType type = CContext::ResourceType);
-        void FreeContext(CContext * pContext);
-        void BindContext(CContext * pContext);
-        void UnbindContext(CContext * pContext);
-        void SetCurrentContext(CContext * pContext);
-        CContext* GetCurrentContext();
-        uint32 GetMaxContextCount();
-
-        void IssueFrameFences();
-        bool FlushFrameFence(uint32 uContext) { return m_kContextFenceIssued.Set(uContext, false); }
-
-        SResourceNamePool& GetTextureNamePool() { return m_kTextureNamePool; }
-        SResourceNamePool& GetBufferNamePool()  { return m_kBufferNamePool; }
-        SResourceNamePool& GetFrameBufferNamePool()  { return m_kFrameBufferNamePool; }
-
-        const SIndexPartition& GetResourceUnitPartition(EResourceUnitType eType, uint32 uID) { return m_kResourceUnitPartitions[eType][uID]; }
-        uint32 GetNumResourceUnitPartitions(EResourceUnitType eType) { return (uint32)m_kResourceUnitPartitions[eType].size(); }
-
-        bool SetFullScreenState(const SFrameBufferSpec&kFrameBufferSpec, bool bFullScreen, SOutput * pOutput);
-        bool ResizeTarget(const SDisplayMode&kTargetMode);
-        void SetBackBufferTexture(SDefaultFrameBufferTexture * pBackTexture);
-        SAdapter* GetAdapter() { return m_spAdapter; }
-        const TWindowContext& GetDefaultWindowContext() { return m_kDefaultWindowContext; }
-        const SFeatureSpec& GetFeatureSpec() { return m_kFeatureSpec; }
-        const SPixelFormatSpec& GetPixelFormatSpec() { return m_kPixelFormatSpec; }
-        bool IsFeatureSupported(EFeature feature) const;
-        static CDevice* GetCurrentDevice() { return ms_pCurrentDevice; }
-
-    protected:
-
-        typedef std::vector<CContext*> TContexts;
-        typedef std::vector<SIndexPartition> TPartitions;
-
-        void InitializeResourceUnitPartitions();
-
-        void PartitionResourceIndices(
-            EResourceUnitType eUnitType,
-            const TPipelineResourceUnitPartitionBound * akPartitionBounds,
-            uint32 uNumPartitions);
-
-        static bool CreateRenderingContexts(
-            TWindowContext & kWindowContext,
-            std::vector<TRenderingContext>&kRenderingContexts,
-            const SFeatureSpec&kFeatureSpec,
-            const SPixelFormatSpec&kPixelFormat,
-            const TNativeDisplay &kNativeDisplay);
-
-        static bool MakeCurrent(const TWindowContext&kWindowContext, TRenderingContext kRenderingContext);
-
-        void OnApplicationWindowCreated() override;
-        void OnApplicationWindowRedrawNeeded() override;
-
-        static uint32 ms_uNumContextsPerDevice;
-        static CDevice* ms_pCurrentDevice;
-
-        SOutputPtr m_spFullScreenOutput;
-        SAdapterPtr m_spAdapter;
-        SFeatureSpec m_kFeatureSpec;
-        SPixelFormatSpec m_kPixelFormatSpec;
-        TWindowContext m_kDefaultWindowContext;
-        TNativeDisplay m_kDefaultNativeDisplay;
-        TContexts m_kContexts;
-        SList m_kFreeContexts[CContext::NumContextTypes];
-        void* m_pCurrentContextTLS;
-
-        SBitMask<MAX_NUM_CONTEXT_PER_DEVICE, SSpinlockBitMaskWord> m_kContextFenceIssued;
-
-        SResourceNamePool m_kTextureNamePool;
-        SResourceNamePool m_kBufferNamePool;
-        SResourceNamePool m_kFrameBufferNamePool;
-
-        TPartitions m_kResourceUnitPartitions[eRUT_NUM];
-
-        typedef AZStd::map<HWND, std::pair<uint32, uint32>> WindowSizeList;
-        static WindowSizeList m_windowSizes;
-
-        uint64 m_texturesStreamingFunctorId;
-    };
-
-    bool FeatureLevelToFeatureSpec(SFeatureSpec& kContextSpec, D3D_FEATURE_LEVEL eFeatureLevel, NCryOpenGL::SAdapter* pGLAdapter);
-    void GetStandardPixelFormatSpec(SPixelFormatSpec& kPixelFormatSpec);
-    bool SwapChainDescToFrameBufferSpec(SFrameBufferSpec& kFrameBufferSpec, const DXGI_SWAP_CHAIN_DESC& kSwapChainDesc);
-    bool GetNativeDisplay(TNativeDisplay& kNativeDisplay, HWND kWindowHandle);
-    bool CreateWindowContext(TWindowContext& kWindowContext, const SFeatureSpec& kFeatureSpec, const SPixelFormatSpec& kPixelFormatSpec, const TNativeDisplay& kNativeDisplay);
-    void ReleaseWindowContext(TWindowContext& kWindowContext);
-    uint32 DetectGIFormatSupport(EGIFormat eGIFormat);
-    bool DetectFeaturesAndCapabilities(TFeatures& kFeatures, SCapabilities& kCapabilities, const SVersion& version);
-    bool DetectAdapters(std::vector<SAdapterPtr>& kAdapters);
-    bool CheckAdapterCapabilities(const SAdapter& kAdapter, AZStd::string* pErrorMsg = nullptr);
-    bool DetectOutputs(const SAdapter& kAdapter, std::vector<SOutputPtr>& kOutputs);
-    bool CheckFormatMultisampleSupport(SAdapter* pAdapter, EGIFormat eFormat, uint32 uNumSamples);
-    void GetDXGIModeDesc(DXGI_MODE_DESC* pDXGIModeDesc, const SDisplayMode& kDisplayMode);
-    bool GetDisplayMode(SDisplayMode* pDisplayMode, const DXGI_MODE_DESC& kDXGIModeDesc);
-}
-
-
-#endif //__GLDEVICE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensionFunctions.inl b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensionFunctions.inl
deleted file mode 100644
index 7782318542..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensionFunctions.inl
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#undef glUseProgramStages
-EXTENSION_FUNC(glUseProgramStages, glUseProgramStagesEXT, void, GLuint, GLbitfield, GLuint)
-#define glUseProgramStages DXGL_EXT_FUNCPTR(glUseProgramStages)
-#undef glActiveShaderProgram
-EXTENSION_FUNC(glActiveShaderProgram, glActiveShaderProgramEXT, void, GLuint, GLuint)
-#define glActiveShaderProgram DXGL_EXT_FUNCPTR(glActiveShaderProgram)
-#undef glCreateShaderProgramv
-EXTENSION_FUNC(glCreateShaderProgramv, glCreateShaderProgramvEXT, GLuint, GLenum, GLsizei, const GLchar**)
-#define glCreateShaderProgramv DXGL_EXT_FUNCPTR(glCreateShaderProgramv)
-#undef glBindProgramPipeline
-EXTENSION_FUNC(glBindProgramPipeline, glBindProgramPipelineEXT, void, GLuint)
-#define glBindProgramPipeline DXGL_EXT_FUNCPTR(glBindProgramPipeline)
-#undef glDeleteProgramPipelines
-EXTENSION_FUNC(glDeleteProgramPipelines, glDeleteProgramPipelinesEXT, void, GLsizei, const GLuint*)
-#define glDeleteProgramPipelines DXGL_EXT_FUNCPTR(glDeleteProgramPipelines)
-#undef glGenProgramPipelines
-EXTENSION_FUNC(glGenProgramPipelines, glGenProgramPipelinesEXT, void, GLsizei, GLuint*)
-#define glGenProgramPipelines DXGL_EXT_FUNCPTR(glGenProgramPipelines)
-#undef glIsProgramPipeline
-EXTENSION_FUNC(glIsProgramPipeline, glIsProgramPipelineEXT, GLboolean, GLuint)
-#define glIsProgramPipeline DXGL_EXT_FUNCPTR(glIsProgramPipeline)
-#undef glProgramParameteri
-EXTENSION_FUNC(glProgramParameteri, glProgramParameteriEXT, void, GLuint, GLenum, GLint)
-#define glProgramParameteri DXGL_EXT_FUNCPTR(glProgramParameteri)
-#undef glGetProgramPipelineiv
-EXTENSION_FUNC(glGetProgramPipelineiv, glGetProgramPipelineivEXT, void, GLuint, GLenum, GLint*)
-#define glGetProgramPipelineiv DXGL_EXT_FUNCPTR(glGetProgramPipelineiv)
-#undef glValidateProgramPipeline
-EXTENSION_FUNC(glValidateProgramPipeline, glValidateProgramPipelineEXT, void, GLuint)
-#define glValidateProgramPipeline DXGL_EXT_FUNCPTR(glValidateProgramPipeline)
-#undef glGetProgramPipelineInfoLog
-EXTENSION_FUNC(glGetProgramPipelineInfoLog, glGetProgramPipelineInfoLogEXT, void, GLuint, GLsizei, GLsizei*, GLchar*)
-#define glGetProgramPipelineInfoLog DXGL_EXT_FUNCPTR(glGetProgramPipelineInfoLog)
-#undef glProgramUniform1i
-EXTENSION_FUNC(glProgramUniform1i, glProgramUniform1iEXT, void, GLuint, GLint, GLint)
-#define glProgramUniform1i DXGL_EXT_FUNCPTR(glProgramUniform1i)
-#undef glProgramUniform2i
-EXTENSION_FUNC(glProgramUniform2i, glProgramUniform2iEXT, void, GLuint, GLint, GLint, GLint)
-#define glProgramUniform2i DXGL_EXT_FUNCPTR(glProgramUniform2i)
-#undef glProgramUniform3i
-EXTENSION_FUNC(glProgramUniform3i, glProgramUniform3iEXT, void, GLuint, GLint, GLint, GLint, GLint)
-#define glProgramUniform3i DXGL_EXT_FUNCPTR(glProgramUniform3i)
-#undef glProgramUniform4i
-EXTENSION_FUNC(glProgramUniform4i, glProgramUniform4iEXT, void, GLuint, GLint, GLint, GLint, GLint, GLint)
-#define glProgramUniform4i DXGL_EXT_FUNCPTR(glProgramUniform4i)
-#undef glProgramUniform1f
-EXTENSION_FUNC(glProgramUniform1f, glProgramUniform1fEXT, void, GLuint, GLint, GLfloat)
-#define glProgramUniform1f DXGL_EXT_FUNCPTR(glProgramUniform1f)
-#undef glProgramUniform2f
-EXTENSION_FUNC(glProgramUniform2f, glProgramUniform2fEXT, void, GLuint, GLint, GLfloat, GLfloat)
-#define glProgramUniform2f DXGL_EXT_FUNCPTR(glProgramUniform2f)
-#undef glProgramUniform3f
-EXTENSION_FUNC(glProgramUniform3f, glProgramUniform3fEXT, void, GLuint, GLint, GLfloat, GLfloat, GLfloat)
-#define glProgramUniform3f DXGL_EXT_FUNCPTR(glProgramUniform3f)
-#undef glProgramUniform4f
-EXTENSION_FUNC(glProgramUniform4f, glProgramUniform4fEXT, void, GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat)
-#define glProgramUniform4f DXGL_EXT_FUNCPTR(glProgramUniform4f)
-#undef glProgramUniform1ui
-EXTENSION_FUNC(glProgramUniform1ui, glProgramUniform1uiEXT, void, GLuint, GLint, GLuint)
-#define glProgramUniform1ui DXGL_EXT_FUNCPTR(glProgramUniform1ui)
-#undef glProgramUniform2ui
-EXTENSION_FUNC(glProgramUniform2ui, glProgramUniform2uiEXT, void, GLuint, GLint, GLuint, GLuint)
-#define glProgramUniform2ui DXGL_EXT_FUNCPTR(glProgramUniform2ui)
-#undef glProgramUniform3ui
-EXTENSION_FUNC(glProgramUniform3ui, glProgramUniform3uiEXT, void, GLuint, GLint, GLuint, GLuint, GLuint)
-#define glProgramUniform3ui DXGL_EXT_FUNCPTR(glProgramUniform3ui)
-#undef glProgramUniform4ui
-EXTENSION_FUNC(glProgramUniform4ui, glProgramUniform4uiEXT, void, GLuint, GLint, GLuint, GLuint, GLuint, GLuint)
-#define glProgramUniform4ui DXGL_EXT_FUNCPTR(glProgramUniform4ui)
-#undef glProgramUniform1iv
-EXTENSION_FUNC(glProgramUniform1iv, glProgramUniform1ivEXT, void, GLuint, GLint, GLsizei, const GLint*)
-#define glProgramUniform1iv DXGL_EXT_FUNCPTR(glProgramUniform1iv)
-#undef glProgramUniform2iv
-EXTENSION_FUNC(glProgramUniform2iv, glProgramUniform2ivEXT, void, GLuint, GLint, GLsizei, const GLint*)
-#define glProgramUniform2iv DXGL_EXT_FUNCPTR(glProgramUniform2iv)
-#undef glProgramUniform3iv
-EXTENSION_FUNC(glProgramUniform3iv, glProgramUniform3ivEXT, void, GLuint, GLint, GLsizei, const GLint*)
-#define glProgramUniform3iv DXGL_EXT_FUNCPTR(glProgramUniform3iv)
-#undef glProgramUniform4iv
-EXTENSION_FUNC(glProgramUniform4iv, glProgramUniform4ivEXT, void, GLuint, GLint, GLsizei, const GLint*)
-#define glProgramUniform4iv DXGL_EXT_FUNCPTR(glProgramUniform4iv)
-#undef glProgramUniform1fv
-EXTENSION_FUNC(glProgramUniform1fv, glProgramUniform1fvEXT, void, GLuint, GLint, GLsizei, const GLfloat*)
-#define glProgramUniform1fv DXGL_EXT_FUNCPTR(glProgramUniform1fv)
-#undef glProgramUniform2fv
-EXTENSION_FUNC(glProgramUniform2fv, glProgramUniform2fvEXT, void, GLuint, GLint, GLsizei, const GLfloat*)
-#define glProgramUniform2fv DXGL_EXT_FUNCPTR(glProgramUniform2fv)
-#undef glProgramUniform3fv
-EXTENSION_FUNC(glProgramUniform3fv, glProgramUniform3fvEXT, void, GLuint, GLint, GLsizei, const GLfloat*)
-#define glProgramUniform3fv DXGL_EXT_FUNCPTR(glProgramUniform3fv)
-#undef glProgramUniform4fv
-EXTENSION_FUNC(glProgramUniform4fv, glProgramUniform4fvEXT, void, GLuint, GLint, GLsizei, const GLfloat*)
-#define glProgramUniform4fv DXGL_EXT_FUNCPTR(glProgramUniform4fv)
-#undef glProgramUniform1uiv
-EXTENSION_FUNC(glProgramUniform1uiv, glProgramUniform1uivEXT, void, GLuint, GLint, GLsizei, const GLuint*)
-#define glProgramUniform1uiv DXGL_EXT_FUNCPTR(glProgramUniform1uiv)
-#undef glProgramUniform2uiv
-EXTENSION_FUNC(glProgramUniform2uiv, glProgramUniform2uivEXT, void, GLuint, GLint, GLsizei, const GLuint*)
-#define glProgramUniform2uiv DXGL_EXT_FUNCPTR(glProgramUniform2uiv)
-#undef glProgramUniform3uiv
-EXTENSION_FUNC(glProgramUniform3uiv, glProgramUniform3uivEXT, void, GLuint, GLint, GLsizei, const GLuint*)
-#define glProgramUniform3uiv DXGL_EXT_FUNCPTR(glProgramUniform3uiv)
-#undef glProgramUniform4uiv
-EXTENSION_FUNC(glProgramUniform4uiv, glProgramUniform4uivEXT, void, GLuint, GLint, GLsizei, const GLuint*)
-#define glProgramUniform4uiv DXGL_EXT_FUNCPTR(glProgramUniform4uiv)
-#undef glProgramUniformMatrix2fv
-EXTENSION_FUNC(glProgramUniformMatrix2fv, glProgramUniformMatrix2fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix2fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix2fv)
-#undef glProgramUniformMatrix3fv
-EXTENSION_FUNC(glProgramUniformMatrix3fv, glProgramUniformMatrix3fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix3fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix3fv)
-#undef glProgramUniformMatrix4fv
-EXTENSION_FUNC(glProgramUniformMatrix4fv, glProgramUniformMatrix4fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix4fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix4fv)
-#undef glProgramUniformMatrix2x3fv
-EXTENSION_FUNC(glProgramUniformMatrix2x3fv, glProgramUniformMatrix2x3fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix2x3fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix2x3fv)
-#undef glProgramUniformMatrix3x2fv
-EXTENSION_FUNC(glProgramUniformMatrix3x2fv, glProgramUniformMatrix3x2fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix3x2fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix3x2fv)
-#undef glProgramUniformMatrix2x4fv
-EXTENSION_FUNC(glProgramUniformMatrix2x4fv, glProgramUniformMatrix2x4fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix2x4fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix2x4fv)
-#undef glProgramUniformMatrix4x2fv
-EXTENSION_FUNC(glProgramUniformMatrix4x2fv, glProgramUniformMatrix4x2fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix4x2fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix4x2fv)
-#undef glProgramUniformMatrix3x4fv
-EXTENSION_FUNC(glProgramUniformMatrix3x4fv, glProgramUniformMatrix3x4fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix3x4fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix3x4fv)
-#undef glProgramUniformMatrix4x3fv
-EXTENSION_FUNC(glProgramUniformMatrix4x3fv, glProgramUniformMatrix4x3fvEXT, void, GLuint, GLint, GLsizei, GLboolean, const GLfloat*)
-#define glProgramUniformMatrix4x3fv DXGL_EXT_FUNCPTR(glProgramUniformMatrix4x3fv)
-#undef glCopyImageSubData
-EXTENSION_FUNC(glCopyImageSubData, glCopyImageSubDataEXT, void, GLuint, GLenum, GLint, GLint, GLint, GLint, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei)
-#define glCopyImageSubData DXGL_EXT_FUNCPTR(glCopyImageSubData)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensions.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensions.hpp
deleted file mode 100644
index 6983bd4fdf..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensions.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-//
-//  GLExtensions.hpp
-//  CryEngine
-//
-//  Created by Duhon, Eric on 10/29/14.
-//
-//
-
-#ifndef CryEngine_GLExtensions_hpp
-#define CryEngine_GLExtensions_hpp
-#pragma once
-
-#if DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-#include "hlslcc.hpp"
-#include "hlslcc_bin.hpp"
-#endif //DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-
-#if DXGLES && DXGLES_VERSION == DXGLES_VERSION_30 && defined(GL_EXT_separate_shader_objects) && defined(IOS)
-// On OpenGL ES separate shader programs are available as an extesion, so we
-// just define the normal api here to avoid ifdefing the entire code
-#define GL_VERTEX_SHADER_BIT GL_VERTEX_SHADER_BIT_EXT
-#define GL_FRAGMENT_SHADER_BIT GL_FRAGMENT_SHADER_BIT_EXT
-#define GL_ALL_SHADER_BITS GL_ALL_SHADER_BITS_EXT
-#define GL_PROGRAM_SEPARABLE GL_PROGRAM_SEPARABLE_EXT
-#define GL_ACTIVE_PROGRAM GL_ACTIVE_PROGRAM_EXT
-#define GL_PROGRAM_PIPELINE_BINDING GL_PROGRAM_PIPELINE_BINDING_EXT
-
-#define glUseProgramStages glUseProgramStagesEXT
-#define glActiveShaderProgram glActiveShaderProgramEXT
-#define glCreateShaderProgramv glCreateShaderProgramvEXT
-#define glBindProgramPipeline glBindProgramPipelineEXT
-#define glDeleteProgramPipelines glDeleteProgramPipelinesEXT
-#define glGenProgramPipelines glGenProgramPipelinesEXT
-#define glIsProgramPipeline glIsProgramPipelineEXT
-#define glProgramParameteri glProgramParameteriEXT
-#define glGetProgramPipelineiv glGetProgramPipelineivEXT
-#define glValidateProgramPipeline glValidateProgramPipelineEXT
-#define glGetProgramPipelineInfoLog glGetProgramPipelineInfoLogEXT
-
-#define glProgramUniform1i glProgramUniform1iEXT
-#define glProgramUniform2i glProgramUniform2iEXT
-#define glProgramUniform2i glProgramUniform2iEXT
-#define glProgramUniform2i glProgramUniform2iEXT
-
-#define glProgramUniform1f glProgramUniform1fEXT
-#define glProgramUniform2f glProgramUniform2fEXT
-#define glProgramUniform3f glProgramUniform3fEXT
-#define glProgramUniform4f glProgramUniform4fEXT
-
-#define glProgramUniform1ui glProgramUniform1uiEXT
-#define glProgramUniform2ui glProgramUniform2uiEXT
-#define glProgramUniform3ui glProgramUniform3uiEXT
-#define glProgramUniform4ui glProgramUniform4uiEXT
-
-#define glProgramUniform1iv glProgramUniform1ivEXT
-#define glProgramUniform2iv glProgramUniform2ivEXT
-#define glProgramUniform3iv glProgramUniform3ivEXT
-#define glProgramUniform4iv glProgramUniform4ivEXT
-
-#define glProgramUniform1fv glProgramUniform1fvEXT
-#define glProgramUniform2fv glProgramUniform2fvEXT
-#define glProgramUniform3fv glProgramUniform3fvEXT
-#define glProgramUniform4fv glProgramUniform4fvEXT
-
-#define glProgramUniform1uiv glProgramUniform1uivEXT
-#define glProgramUniform2uiv glProgramUniform2uivEXT
-#define glProgramUniform3uiv glProgramUniform3uivEXT
-#define glProgramUniform4uiv glProgramUniform4uivEXT
-
-#define glProgramUniformMatrix2fv glProgramUniformMatrix2fvEXT
-#define glProgramUniformMatrix3fv glProgramUniformMatrix3fvEXT
-#define glProgramUniformMatrix4fv glProgramUniformMatrix4fvEXT
-#define glProgramUniformMatrix2x3fv glProgramUniformMatrix2x3fvEXT
-#define glProgramUniformMatrix3x2fv glProgramUniformMatrix3x2fvEXT
-#define glProgramUniformMatrix2x4fv glProgramUniformMatrix2x4fvEXT
-#define glProgramUniformMatrix4x2fv glProgramUniformMatrix4x2fvEXT
-#define glProgramUniformMatrix3x4fv glProgramUniformMatrix3x4fvEXT
-#define glProgramUniformMatrix4x3fv glProgramUniformMatrix4x3fvEXT
-#endif
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFeatures.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFeatures.hpp
deleted file mode 100644
index bc1e86e266..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFeatures.hpp
+++ /dev/null
@@ -1,791 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : OpenGL feature detection and emulation
-
-
-#ifndef __GLFEATURES__
-#define __GLFEATURES__
-
-#if DXGL_TRACE_CALLS || DXGL_CHECK_ERRORS
-#   include "GLInstrument.hpp"
-#else
-#   define DXGL_UNWRAPPED_FUNCTION(_Name) _Name
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define GLFEATURES_HPP_SECTION_1 1
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GLFEATURES_HPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(GLFeatures_hpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(DXGL_USE_LOADER_GLAD)
-#   define DXGL_EXTENSION_LOADER 1
-#   if DXGLES && !defined(DXGL_ES_SUBSET)
-#       include <glad/gles2.h>
-#   else
-#       include <glad/gl.h>
-#   endif
-#   define DXGL_GL_EXTENSION_SUPPORTED(_Extension) (GLAD_GL_ ## _Extension == 1)
-#   define DXGL_GL_LOADER_FUNCTION_PTR(_Func) (glad_ ## _Func)
-#   define DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(_Func) DXGL_GL_LOADER_FUNCTION_PTR(gl ## _Func)
-#   if defined(DXGL_USE_WGL)
-#       include <glad/wgl.h>
-#       define DXGL_WGL_EXTENSION_SUPPORTED(_Extension) (GLAD_WGL_ ## _Extension == 1)
-#   elif defined(DXGL_USE_EGL)
-#       include <glad/egl.h>
-#   elif defined(DXGL_USE_GLX)
-#       include <glad/glx.h>
-#   endif
-#elif defined(DXGL_USE_LOADER_GLEW)
-#   define DXGL_EXTENSION_LOADER 1
-#   define DXGL_GL_EXTENSION_SUPPORTED(_Extension) (glewIsExtensionSupported("GL_" # _Extension) == GL_TRUE)
-#   define DXGL_GL_LOADER_FUNCTION_PTR(_Func) (_Func)
-#   define DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(_Func) (__glew ## _Func)
-#   include <GL/glew.h>
-#   if defined(DXGL_USE_WGL)
-#       define DXGL_WGL_EXTENSION_SUPPORTED(_Extension) (wglewIsSupported("WGL_" # _Extension) == GL_TRUE)
-#       include <GL/wglew.h>
-#   elif defined(DXGL_USE_EGL)
-#       include <EGL/egl.h>
-#   elif defined(DXGL_USE_GLX)
-#       include <GL/glxew.h>
-#   endif
-#else
-#   define DXGL_EXTENSION_LOADER 0
-#   define DXGL_GL_EXTENSION_SUPPORTED(_Extension) (false)
-#   define DXGL_GL_LOADER_FUNCTION_PTR(_Func) (_Func)
-#   if defined(MAC)
-#       define GL3_PROTOTYPES
-#       include <OpenGL/gl3.h>
-#       include <OpenGL/gl3ext.h>
-#   elif defined(IOS)
-#       include <OpenGLES/ES3/gl.h>
-#       include <OpenGLES/ES3/glext.h>
-#   endif
-#endif
-
-#if defined(AZ_PLATFORM_LINUX)
-    // The X11 library, which is included by GLAD, defines some macros that we use as function names in the Linux implementation.
-    static const int X11_Success = Success;
-    static const int X11_None = None;
-    #undef Success
-    #undef None
-#endif
-
-#include <Common/RenderCapabilities.h>
-
-#define DXGL_SUPPORT_INDEXED_BOOL_STATE             (DXGL_REQUIRED_VERSION >= DXGL_VERSION_32 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_INDEXED_ENABLE_STATE           !DXGLES
-#define DXGL_SUPPORT_INDEXED_FLOAT_STATE            !DXGLES
-#define DXGL_SUPPORT_VIEWPORT_ARRAY                 !DXGLES
-#define DXGL_SUPPORT_SCISSOR_RECT_ARRAY             !DXGLES
-#define DXGL_SUPPORT_DRAW_WITH_BASE_VERTEX          (DXGL_REQUIRED_VERSION >= DXGL_VERSION_42 && !DXGLES)
-#define DXGL_SUPPORT_GETTEXIMAGE                    !DXGLES
-#define DXGL_SUPPORT_DEPTH_CLAMP                    !DXGLES
-#define DXGL_SUPPORT_TIMER_QUERIES                  !DXGLES
-#define DXGL_SUPPORT_S3TC_TEXTURES                  (!DXGLES || DXGL_SUPPORT_TEGRA)
-#define DXGL_SUPPORT_BGRA_TEXTURES                  !DXGLES
-#define DXGL_SUPPORT_STENCIL_ONLY_FORMAT            (DXGL_REQUIRED_VERSION >= DXGL_VERSION_32 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_MULTISAMPLED_TEXTURES          (DXGL_REQUIRED_VERSION >= DXGL_VERSION_41 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_TESSELLATION                   (DXGL_REQUIRED_VERSION >= DXGL_VERSION_41)
-#define DXGL_SUPPORT_GEOMETRY_SHADERS               (DXGL_REQUIRED_VERSION >= DXGL_VERSION_41)
-#define DXGL_SUPPORT_TEXTURE_BUFFERS                (DXGL_REQUIRED_VERSION >= DXGL_VERSION_41)
-#define DXGL_SUPPORT_CUBEMAP_ARRAYS                 (DXGL_REQUIRED_VERSION >= DXGL_VERSION_41)
-#define DXGL_SUPPORT_DRAW_INDIRECT                  (DXGL_REQUIRED_VERSION >= DXGL_VERSION_41 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_BPTC                           (DXGL_REQUIRED_VERSION >= DXGL_VERSION_42)
-#define DXGL_SUPPORT_STENCIL_TEXTURES               ((DXGL_REQUIRED_VERSION >= DXGL_VERSION_42 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30) && !DXGL_SUPPORT_NSIGHT_SINCE(4_1))
-#define DXGL_SUPPORT_ATOMIC_COUNTERS                (DXGL_REQUIRED_VERSION >= DXGL_VERSION_42 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#ifdef MAC
-    #define DXGL_SUPPORT_COMPUTE                    0
-    #define DXGL_SUPPORT_DEBUG_OUTPUT               0
-#else
-    #define DXGL_SUPPORT_COMPUTE                    1
-    #define DXGL_SUPPORT_DEBUG_OUTPUT               !DXGL_SUPPORT_NSIGHT_SINCE(4_1)
-#endif
-#define DXGL_SUPPORT_DISPATCH_INDIRECT              (DXGL_REQUIRED_VERSION >= DXGL_VERSION_43 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_SHADER_STORAGE_BLOCKS          (DXGL_REQUIRED_VERSION >= DXGL_VERSION_43 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_SHADER_IMAGES                  (DXGL_REQUIRED_VERSION >= DXGL_VERSION_43 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_VERTEX_ATTRIB_BINDING          (DXGL_REQUIRED_VERSION >= DXGL_VERSION_43 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_TEXTURE_VIEWS                  (DXGL_REQUIRED_VERSION >= DXGL_VERSION_43 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-#define DXGL_SUPPORT_QUERY_INTERNAL_FORMAT_SUPPORT  (DXGL_REQUIRED_VERSION >= DXGL_VERSION_43 && !DXGL_SUPPORT_NSIGHT_SINCE(3_0) && !DXGL_SUPPORT_VOGL)
-#define DXGL_SUPPORT_BUFFER_STORAGE                 (DXGL_REQUIRED_VERSION >= DXGL_VERSION_44 && !DXGL_SUPPORT_NSIGHT_SINCE(4_5))
-#define DXGL_SUPPORT_ETC2_EAC_COMPRESSION           (DXGL_REQUIRED_VERSION >= DXGL_VERSION_43 || DXGLES_REQUIRED_VERSION >= DXGLES_VERSION_30)
-
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-#  define DXGL_ENABLE_GEOMETRY_SHADERS     1
-#else
-#  define DXGL_ENABLE_GEOMETRY_SHADERS     0
-#endif
-#if DXGL_SUPPORT_TESSELLATION
-#  define DXGL_ENABLE_TESSELLATION_SHADERS 1
-#else
-#  define DXGL_ENABLE_TESSELLATION_SHADERS 0
-#endif
-#if DXGL_SUPPORT_COMPUTE
-#  define DXGL_ENABLE_COMPUTE_SHADERS      1
-#else
-#  define DXGL_ENABLE_COMPUTE_SHADERS      0
-#endif
-
-#if defined(ANDROID)
-#define USE_FAST_NAMED_APPROXIMATION
-#endif
-
-enum
-{
-#if DXGL_SUPPORT_VIEWPORT_ARRAY
-    DXGL_NUM_SUPPORTED_VIEWPORTS = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
-#else
-    DXGL_NUM_SUPPORTED_VIEWPORTS = 1,
-#endif
-#if DXGL_SUPPORT_SCISSOR_RECT_ARRAY
-    DXGL_NUM_SUPPORTED_SCISSOR_RECTS = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
-#else
-    DXGL_NUM_SUPPORTED_SCISSOR_RECTS = 1,
-#endif
-    DXGL_NUM_SUPPORTED_BLEND_STATES = D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT,
-};
-
-
-////////////////////////////////////////////////////////////////////////////
-// Conform extension definitions
-////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_SUPPORT_S3TC_TEXTURES
-    #if !defined(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT) || \
-    !defined(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT) ||     \
-    !defined(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT)
-        #undef GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT
-        #undef GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT
-        #undef GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT
-        #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV
-        #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV
-        #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV
-    #endif
-#endif
-#if DXGL_SUPPORT_BGRA_TEXTURES
-    #if !defined(GL_BGRA)
-        #if defined(GL_BGRA_EXT)
-            #define GL_BGRA GL_BGRA_EXT
-        #else
-            #define GL_BGRA GL_BGRA_IMG
-        #endif
-    #endif
-#endif
-#if DXGL_REQUIRED_VERSION > 0 || defined(DXGL_ES_SUBSET)
-    #define GL_CLAMP_TO_BORDER_EXT GL_CLAMP_TO_BORDER
-    #define GL_TEXTURE_BORDER_COLOR_EXT GL_TEXTURE_BORDER_COLOR
-    #define glTextureViewEXT glTextureView
-#endif
-
-#if !defined(GL_COPY_READ_BUFFER_BINDING) || \
-    !defined(GL_COPY_WRITE_BUFFER_BINDING)
-    #undef GL_COPY_READ_BUFFER_BINDING
-    #undef GL_COPY_WRITE_BUFFER_BINDING
-    #define GL_COPY_READ_BUFFER_BINDING  GL_COPY_READ_BUFFER
-    #define GL_COPY_WRITE_BUFFER_BINDING GL_COPY_WRITE_BUFFER
-#endif
-
-#if DXGLES
-#undef GL_TEXTURE_1D
-#undef GL_TEXTURE_1D_ARRAY
-// Emulate 1D textures as 2D textures on OpenGL ES
-#define GL_TEXTURE_1D GL_TEXTURE_2D
-#define GL_TEXTURE_1D_ARRAY GL_TEXTURE_2D_ARRAY
-#endif //DXGLES
-
-#if DXGL_SUPPORT_NSIGHT_SINCE(3_0) || DXGL_SUPPORT_VOGL || defined(MAC)
-#undef glClearBufferData
-#undef glClearBufferSubData
-#undef glClearNamedBufferDataEXT
-#undef glClearNamedBufferSubDataEXT
-#undef glDispatchCompute
-#undef glDispatchComputeIndirect
-#undef glFramebufferParameteri
-#undef glGetFramebufferParameteriv
-#undef glGetNamedFramebufferParameterivEXT
-#undef glNamedFramebufferParameteriEXT
-#undef glInvalidateBufferData
-#undef glInvalidateBufferSubData
-#undef glInvalidateFramebuffer
-#undef glInvalidateSubFramebuffer
-#undef glInvalidateTexImage
-#undef glInvalidateTexSubImage
-#undef glMultiDrawArraysIndirect
-#undef glMultiDrawElementsIndirect
-#undef glTexStorage2DMultisample
-#undef glTexStorage3DMultisample
-#undef glBindVertexBuffer
-#undef glVertexAttribBinding
-#undef glVertexAttribFormat
-#undef glVertexAttribIFormat
-#undef glVertexAttribLFormat
-#undef glVertexBindingDivisor
-#undef glTextureImage2DEXT
-#undef glCompressedTextureImage2DEXT
-#undef glCompressedTextureSubImage2DEXT
-#undef glNamedFramebufferTextureEXT
-#undef glNamedFramebufferTextureLayerEXT
-#undef glCheckNamedFramebufferStatusEXT
-#undef glGetNamedFramebufferAttachmentParameterivEXT
-#undef glGetTextureLevelParameterivEXT
-#endif //DXGL_SUPPORT_NSIGHT_SINCE(3_0) || DXGL_SUPPORT_VOGL || defined(MAC)
-
-#if DXGL_SUPPORT_NSIGHT_SINCE(3_0) || defined(MAC)
-#undef glGetProgramInterfaceiv
-#undef glGetProgramResourceIndex
-#undef glGetProgramResourceLocation
-#undef glGetProgramResourceLocationIndex
-#undef glGetProgramResourceName
-#undef glGetProgramResourceiv
-#undef glShaderStorageBlockBinding
-#endif //DXGL_SUPPORT_NSIGHT_SINCE(3_0) || defined(MAC)
-
-#if DXGL_SUPPORT_NSIGHT_SINCE(4_1) || defined(MAC)
-#undef glDebugMessageCallback
-#undef glDebugMessageInsert
-#undef glGetDebugMessageLog
-#undef glGetObjectLabel
-#undef glGetObjectPtrLabel
-#undef glTextureSubImage2DEXT
-#endif // DXGL_SUPPORT_NSIGHT_SINCE(4_1)
-
-#if DXGL_SUPPORT_NSIGHT_SINCE(4_1) || DXGL_SUPPORT_VOGL || defined(MAC)
-#undef glDebugMessageControl
-#undef glPushDebugGroup
-#undef glNamedBufferDataEXT
-#undef glNamedBufferSubDataEXT
-#undef glMapNamedBufferEXT
-#undef glMapNamedBufferRangeEXT
-#undef glUnmapNamedBufferEXT
-#undef glTexBufferRange
-#undef glTextureBufferRangeEXT
-#endif // DXGL_SUPPORT_NSIGHT_SINCE(4_1) || DXGL_SUPPORT_VOGL || defined(MAC)
-
-#if DXGL_SUPPORT_NSIGHT_SINCE(4_5)
-#undef glNamedBufferStorageEXT
-#endif
-
-#if DXGL_SUPPORT_VOGL
-#undef glReleaseShaderCompiler
-#endif //DXGL_SUPPORT_VOGL
-
-
-////////////////////////////////////////////////////////////////////////////
-// Direct state access framebuffer attachment emulation when not available
-////////////////////////////////////////////////////////////////////////////
-
-#if !defined(glNamedFramebufferTextureEXT) ||      \
-    !defined(glNamedFramebufferTextureLayerEXT) || \
-    !defined(glCheckNamedFramebufferStatusEXT) ||  \
-    !defined(glFramebufferDrawBuffersEXT) ||       \
-    !defined(glGetNamedFramebufferAttachmentParameterivEXT)
-#undef glNamedFramebufferTextureEXT
-#undef glNamedFramebufferTextureLayerEXT
-#undef glCheckNamedFramebufferStatusEXT
-#undef glFramebufferDrawBuffersEXT
-#undef glGetNamedFramebufferAttachmentParameterivEXT
-
-struct SAutoBindFrameBuffer
-{
-    SAutoBindFrameBuffer(GLenum eTarget, GLuint uFrameBuffer)
-        : m_eTarget(eTarget)
-    {
-        glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &m_iPrevFrameBuffer);
-        glBindFramebuffer(m_eTarget, uFrameBuffer);
-    }
-
-    ~SAutoBindFrameBuffer()
-    {
-        glBindFramebuffer(m_eTarget, m_iPrevFrameBuffer);
-    }
-
-    GLint m_eTarget;
-    GLint m_iPrevFrameBuffer;
-};
-
-
-inline void glNamedFramebufferTextureEXT(GLuint uFramebuffer, GLenum eAttachment, GLuint uTexture, GLint iLevel)
-{
-    SAutoBindFrameBuffer kAutoBind(GL_DRAW_FRAMEBUFFER, uFramebuffer);
-#if DXGL_REQUIRED_VERSION >= DXGL_VERSION_41
-    glFramebufferTexture(GL_DRAW_FRAMEBUFFER, eAttachment, uTexture, iLevel);
-#else
-    // Note ES can only bind a cubemap face or a 2D texture
-    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, eAttachment, GL_TEXTURE_2D, uTexture, iLevel);
-#endif
-}
-
-inline void glNamedFramebufferTextureLayerEXT(GLuint uFramebuffer, GLenum eAttachment, GLuint uTexture, GLint iLevel, GLint iLayer)
-{
-    SAutoBindFrameBuffer kAutoBind(GL_DRAW_FRAMEBUFFER, uFramebuffer);
-    glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, eAttachment, uTexture, iLevel, iLayer);
-}
-
-inline GLenum glCheckNamedFramebufferStatusEXT(GLuint uFramebuffer, GLenum eTarget)
-{
-    SAutoBindFrameBuffer kAutoBind(eTarget, uFramebuffer);
-    return glCheckFramebufferStatus(eTarget);
-}
-
-inline void glFramebufferDrawBuffersEXT(GLuint uFramebuffer, GLsizei uNumber, const GLenum* aeBuffers)
-{
-    SAutoBindFrameBuffer kAutoBind(GL_DRAW_FRAMEBUFFER, uFramebuffer);
-    glDrawBuffers(uNumber, aeBuffers);
-}
-
-inline void glGetNamedFramebufferAttachmentParameterivEXT(GLuint uFramebuffer, GLenum eAttachment, GLenum ePName, GLint* aiParams)
-{
-    SAutoBindFrameBuffer kAutoBind(GL_DRAW_FRAMEBUFFER, uFramebuffer);
-    glGetFramebufferAttachmentParameteriv(GL_DRAW_FRAMEBUFFER, eAttachment, ePName, aiParams);
-}
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-// Direct state access texture functions emulation when not available
-////////////////////////////////////////////////////////////////////////////
-
-#if !defined(glTextureStorage1DEXT) ||            \
-    !defined(glTextureStorage2DEXT) ||            \
-    !defined(glTextureStorage3DEXT) ||            \
-    !defined(glTextureImage1DEXT) ||              \
-    !defined(glTextureImage2DEXT) ||              \
-    !defined(glTextureImage3DEXT) ||              \
-    !defined(glCompressedTextureImage1DEXT) ||    \
-    !defined(glCompressedTextureImage2DEXT) ||    \
-    !defined(glCompressedTextureImage3DEXT) ||    \
-    !defined(glTextureSubImage1DEXT) ||           \
-    !defined(glTextureSubImage2DEXT) ||           \
-    !defined(glTextureSubImage3DEXT) ||           \
-    !defined(glCompressedTextureSubImage1DEXT) || \
-    !defined(glCompressedTextureSubImage2DEXT) || \
-    !defined(glCompressedTextureSubImage3DEXT) || \
-    !defined(glGetTextureImageEXT) ||             \
-    !defined(glGetCompressedTextureImageEXT) ||   \
-    !defined(glGenerateTextureMipmapEXT) ||       \
-    !defined(glTextureBufferEXT) ||               \
-    !defined(glTextureBufferRangeEXT) ||          \
-    !defined(glTextureParameterfEXT) ||           \
-    !defined(glTextureParameteriEXT) ||           \
-    !defined(glTextureParameterfvEXT) ||          \
-    !defined(glTextureParameterivEXT) ||          \
-    !defined(glGetTextureLevelParameterivEXT)
-#undef glTextureStorage1DEXT
-#undef glTextureStorage2DEXT
-#undef glTextureStorage3DEXT
-#undef glTextureImage1DEXT
-#undef glTextureImage2DEXT
-#undef glTextureImage3DEXT
-#undef glCompressedTextureImage1DEXT
-#undef glCompressedTextureImage2DEXT
-#undef glCompressedTextureImage3DEXT
-#undef glTextureSubImage1DEXT
-#undef glTextureSubImage2DEXT
-#undef glTextureSubImage3DEXT
-#undef glCompressedTextureSubImage1DEXT
-#undef glCompressedTextureSubImage2DEXT
-#undef glCompressedTextureSubImage3DEXT
-#undef glGetTextureImageEXT
-#undef glGetCompressedTextureImageEXT
-#undef glGenerateTextureMipmapEXT
-#undef glTextureBufferEXT
-#undef glTextureBufferRangeEXT
-#undef glTextureParameterfEXT
-#undef glTextureParameteriEXT
-#undef glTextureParameterfvEXT
-#undef glTextureParameterivEXT
-#undef glGetTextureLevelParameterivEXT
-
-struct SAutoTexBind
-{
-    SAutoTexBind(GLenum eSubTarget, GLuint uTexture)
-    {
-        switch (eSubTarget)
-        {
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
-            m_eTarget = GL_TEXTURE_CUBE_MAP;
-            break;
-        default:
-            m_eTarget = eSubTarget;
-            break;
-        }
-
-        GLenum eBindingName;
-        switch (m_eTarget)
-        {
-        case GL_TEXTURE_CUBE_MAP:
-            eBindingName = GL_TEXTURE_BINDING_CUBE_MAP;
-            break;
-        case GL_TEXTURE_2D:
-            eBindingName = GL_TEXTURE_BINDING_2D;
-            break;
-        case GL_TEXTURE_2D_ARRAY:
-            eBindingName = GL_TEXTURE_BINDING_2D_ARRAY;
-            break;
-        case GL_TEXTURE_3D:
-            eBindingName = GL_TEXTURE_BINDING_3D;
-            break;
-#if !DXGLES
-        case GL_TEXTURE_1D:
-            eBindingName = GL_TEXTURE_BINDING_1D;
-            break;
-        case GL_TEXTURE_1D_ARRAY:
-            eBindingName = GL_TEXTURE_BINDING_1D_ARRAY;
-            break;
-        case GL_TEXTURE_RECTANGLE:
-            eBindingName = GL_TEXTURE_BINDING_RECTANGLE;
-            break;
-        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-            eBindingName = GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY;
-            break;
-#endif //!DXGLES
-#if DXGL_SUPPORT_CUBEMAP_ARRAYS
-        case GL_TEXTURE_CUBE_MAP_ARRAY:
-            eBindingName = GL_TEXTURE_BINDING_CUBE_MAP_ARRAY;
-            break;
-#endif //DXGL_SUPPORT_CUBEMAP_ARRAYS
-#if DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-        case GL_TEXTURE_2D_MULTISAMPLE:
-            eBindingName = GL_TEXTURE_BINDING_2D_MULTISAMPLE;
-            break;
-#endif //DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-#if DXGL_SUPPORT_TEXTURE_BUFFERS
-        case GL_TEXTURE_BUFFER:
-            eBindingName = GL_TEXTURE_BINDING_BUFFER;
-            break;
-#endif //DXGL_SUPPORT_TEXTURE_BUFFERS
-        default:
-            assert(false);
-            eBindingName = 0;
-            break;
-        }
-        GLint iBinding;
-        glGetIntegerv(eBindingName, &iBinding);
-        m_uPreviousBinding = (GLuint)iBinding;
-        glBindTexture(m_eTarget, uTexture);
-    }
-
-    ~SAutoTexBind()
-    {
-        glBindTexture(m_eTarget, m_uPreviousBinding);
-    }
-
-    GLuint m_uPreviousBinding;
-    GLenum m_eTarget;
-};
-
-
-inline void glTextureStorage1DEXT(GLuint uTexture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
-{
-    SAutoTexBind kAutoBind(target, uTexture);
-#if DXGLES
-    glTexStorage2D(target, levels, internalformat, width, 1);
-#else
-    glTexStorage1D(target, levels, internalformat, width);
-#endif
-}
-
-inline void glTextureStorage2DEXT (GLuint uTexture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
-{
-    SAutoTexBind kAutoBind(target, uTexture);
-    glTexStorage2D(target, levels, internalformat, width, height);
-}
-
-inline void glTextureStorage3DEXT (GLuint uTexture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
-{
-    SAutoTexBind kAutoBind(target, uTexture);
-    glTexStorage3D(target, levels, internalformat, width, height, depth);
-}
-
-inline void glTextureImage1DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eInternalFormat, GLsizei iSizeX, GLint iBorder, GLenum eBaseFormat, GLenum eDataType, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-#if DXGLES
-    glTexImage2D(eTarget, iLevel, eInternalFormat, iSizeX, 1, iBorder, eBaseFormat, eDataType, pData);
-#else
-    glTexImage1D(eTarget, iLevel, eInternalFormat, iSizeX, iBorder, eBaseFormat, eDataType, pData);
-#endif
-}
-
-inline void glTextureImage2DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eInternalFormat, GLsizei iSizeX, GLsizei iSizeY, GLint iBorder, GLenum eBaseFormat, GLenum eDataType, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexImage2D(eTarget, iLevel, eInternalFormat, iSizeX, iSizeY, iBorder, eBaseFormat, eDataType, pData);
-}
-
-inline void glTextureImage3DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eInternalFormat, GLsizei iSizeX, GLsizei iSizeY, GLsizei iSizeZ, GLint iBorder, GLenum eBaseFormat, GLenum eDataType, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexImage3D(eTarget, iLevel, eInternalFormat, iSizeX, iSizeY, iSizeZ, iBorder, eBaseFormat, eDataType, pData);
-}
-
-inline void glCompressedTextureImage1DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eInternalFormat, GLsizei iSizeX, GLint iBorder, GLsizei iImageSize, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-#if DXGLES
-    glCompressedTexImage2D(eTarget, iLevel, eInternalFormat, iSizeX, 1, iBorder, iImageSize, pData);
-#else
-    glCompressedTexImage1D(eTarget, iLevel, eInternalFormat, iSizeX, iBorder, iImageSize, pData);
-#endif
-}
-
-inline void glCompressedTextureImage2DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eInternalFormat, GLsizei iSizeX, GLsizei iSizeY, GLint iBorder, GLsizei iImageSize, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glCompressedTexImage2D(eTarget, iLevel, eInternalFormat, iSizeX, iSizeY, iBorder, iImageSize, pData);
-}
-
-inline void glCompressedTextureImage3DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eInternalFormat, GLsizei iSizeX, GLsizei iSizeY, GLsizei iSizeZ, GLint iBorder, GLsizei iImageSize, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glCompressedTexImage3D(eTarget, iLevel, eInternalFormat, iSizeX, iSizeY, iSizeZ, iBorder, iImageSize, pData);
-}
-
-inline void glTextureSubImage1DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLint iOffsetX, GLsizei iSizeX, GLenum eFormat, GLenum eDataType, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-#if DXGLES
-    glTexSubImage2D(eTarget, iLevel, iOffsetX, 0, iSizeX, 1, eFormat, eDataType, pData);
-#else
-    glTexSubImage1D(eTarget, iLevel, iOffsetX, iSizeX, eFormat, eDataType, pData);
-#endif
-}
-
-inline void glTextureSubImage2DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLint iOffsetX, GLint iOffsetY, GLsizei iSizeX, GLsizei iSizeY, GLenum eFormat, GLenum eDataType, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexSubImage2D(eTarget, iLevel, iOffsetX, iOffsetY, iSizeX, iSizeY, eFormat, eDataType, pData);
-}
-
-inline void glTextureSubImage3DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLint iOffsetX, GLint iOffsetY, GLint iOffsetZ, GLsizei iSizeX, GLsizei iSizeY, GLsizei iSizeZ, GLenum eFormat, GLenum eDataType, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexSubImage3D(eTarget, iLevel, iOffsetX, iOffsetY, iOffsetZ, iSizeX, iSizeY, iSizeZ, eFormat, eDataType, pData);
-}
-
-inline void glCompressedTextureSubImage1DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLint iOffsetX, GLsizei iSizeX, GLenum eFormat, GLsizei iImageSize, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-#if DXGLES
-    glCompressedTexSubImage2D(eTarget, iLevel, iOffsetX, 0, iSizeX, 1, eFormat, iImageSize, pData);
-#else
-    glCompressedTexSubImage1D(eTarget, iLevel, iOffsetX, iSizeX, eFormat, iImageSize, pData);
-#endif
-}
-
-inline void glCompressedTextureSubImage2DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLint iOffsetX, GLint iOffsetY, GLsizei iSizeX, GLsizei iSizeY, GLenum eFormat, GLsizei iImageSize, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glCompressedTexSubImage2D(eTarget, iLevel, iOffsetX, iOffsetY, iSizeX, iSizeY, eFormat, iImageSize, pData);
-}
-
-inline void glCompressedTextureSubImage3DEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLint iOffsetX, GLint iOffsetY, GLint iOffsetZ, GLsizei iSizeX, GLsizei iSizeY, GLsizei iSizeZ, GLenum eFormat, GLsizei iImageSize, const GLvoid* pData)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glCompressedTexSubImage3D(eTarget, iLevel, iOffsetX, iOffsetY, iOffsetZ, iSizeX, iSizeY, iSizeZ, eFormat, iImageSize, pData);
-}
-
-#if !DXGLES
-
-inline void glGetTextureImageEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eFormat, GLenum eType, void* pPixels)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glGetTexImage(eTarget, iLevel, eFormat, eType, pPixels);
-}
-
-inline void glGetCompressedTextureImageEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, void* pImg)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glGetCompressedTexImage(eTarget, iLevel, pImg);
-}
-
-inline void glTextureBufferEXT(GLuint uTexture, GLenum eTarget, GLenum eInternalFormat, GLuint uBuffer)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexBuffer(eTarget, eInternalFormat, uBuffer);
-}
-
-#endif //!DXGLES
-
-inline void glGenerateTextureMipmapEXT(GLuint uTexture, GLenum eTarget)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glGenerateMipmap(eTarget);
-}
-
-#if defined(glTexBufferRange)
-inline void glTextureBufferRangeEXT(GLuint uTexture, GLenum eTarget, GLenum eInternalformat, GLuint uBuffer, GLintptr iOffset, GLsizeiptr iSize)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexBufferRange(eTarget, eInternalformat, uBuffer, iOffset, iSize);
-}
-#endif //defined(glTexBufferRange)
-
-inline void glTextureParameterfEXT(GLuint uTexture, GLenum eTarget, GLenum eName, GLfloat fParam)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexParameterf(eTarget, eName, fParam);
-}
-
-inline void glTextureParameteriEXT(GLuint uTexture, GLenum eTarget, GLenum eName, GLint iParam)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexParameteri(eTarget, eName, iParam);
-}
-
-inline void glTextureParameterfvEXT(GLuint uTexture, GLenum eTarget, GLenum eName, const GLfloat* pfParam)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexParameterfv(eTarget, eName, pfParam);
-}
-
-inline void glTextureParameterivEXT(GLuint uTexture, GLenum eTarget, GLenum eName, const GLint* piParam)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-    glTexParameteriv(eTarget, eName, piParam);
-}
-
-inline void glGetTextureLevelParameterivEXT(GLuint uTexture, GLenum eTarget, GLint iLevel, GLenum eName, GLint* piParam)
-{
-    SAutoTexBind kAutoBind(eTarget, uTexture);
-#if DXGLES
-    uint32 glVersion = RenderCapabilities::GetDeviceGLVersion();
-    if (glVersion < DXGLES_VERSION_31)
-    {
-        DXGL_NOT_IMPLEMENTED;
-    }
-    else
-#endif
-    {
-        glGetTexLevelParameteriv(eTarget, iLevel, eName, piParam);
-    }
-}
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-// Direct state access buffer functions emulation when not available
-////////////////////////////////////////////////////////////////////////////
-
-template <GLenum eTarget = GL_COPY_WRITE_BUFFER, GLenum eBinding = GL_COPY_WRITE_BUFFER_BINDING>
-struct SAutoBufferBind
-{
-    enum
-    {
-        TARGET = eTarget, BINDING = eBinding
-    };
-
-    SAutoBufferBind(GLuint uBuffer)
-    {
-        GLint iBinding;
-        glGetIntegerv(BINDING, &iBinding);
-        m_uPreviousBinding = (GLuint)iBinding;
-        glBindBuffer(TARGET, uBuffer);
-    }
-
-    ~SAutoBufferBind()
-    {
-        glBindBuffer(TARGET, m_uPreviousBinding);
-    }
-
-    GLuint m_uPreviousBinding;
-};
-
-#if !defined(glNamedBufferDataEXT)
-inline void glNamedBufferDataEXT(GLuint uBuffer, GLsizeiptr iSize, const void* pData, GLenum eUsage)
-{
-    SAutoBufferBind<> kAutoBind(uBuffer);
-    glBufferData(kAutoBind.TARGET, iSize, pData, eUsage);
-}
-#endif
-
-#if !defined(glNamedBufferSubDataEXT)
-inline void glNamedBufferSubDataEXT(GLuint uBuffer, GLintptr iOffset, GLsizeiptr iSize, const void* pData)
-{
-    SAutoBufferBind<> kAutoBind(uBuffer);
-    glBufferSubData(kAutoBind.TARGET, iOffset, iSize, pData);
-}
-#endif
-
-#if !defined(glMapNamedBufferEXT)
-inline GLvoid* glMapNamedBufferEXT(GLuint uBuffer, GLenum eAccess)
-{
-    SAutoBufferBind<> kAutoBind(uBuffer);
-#if DXGLES
-    // Workaround, bind full buffer with range
-    DXGL_NOT_IMPLEMENTED;
-    return NULL;
-#else
-    return glMapBuffer(kAutoBind.TARGET, eAccess);
-#endif
-}
-#endif
-
-#if !defined(glMapNamedBufferRangeEXT)
-inline GLvoid* glMapNamedBufferRangeEXT(GLuint uBuffer, GLintptr iOffset, GLsizeiptr iLength, GLbitfield uAccess)
-{
-    SAutoBufferBind<> kAutoBind(uBuffer);
-    return glMapBufferRange(kAutoBind.TARGET, iOffset, iLength, uAccess);
-}
-#endif
-
-#if !defined(glUnmapNamedBufferEXT)
-inline GLboolean glUnmapNamedBufferEXT(GLuint uBuffer)
-{
-    SAutoBufferBind<> kAutoBind(uBuffer);
-    return glUnmapBuffer(kAutoBind.TARGET);
-}
-#endif
-
-#if !defined(glGetNamedBufferSubDataEXT) && !DXGLES
-inline void glGetNamedBufferSubDataEXT(GLuint uBuffer, GLintptr iOffset, GLsizeiptr iSize, void* pData)
-{
-    SAutoBufferBind<> kAutoBind(uBuffer);
-    glGetBufferSubData(kAutoBind.TARGET, iOffset, iSize, pData);
-}
-#endif
-
-#if !defined(glNamedCopyBufferSubDataEXT)
-inline void glNamedCopyBufferSubDataEXT(GLuint uReadBuffer, GLuint uWriteBuffer, GLintptr iReadOffset, GLintptr iWriteOffset, GLsizeiptr iSize)
-{
-    SAutoBufferBind<GL_COPY_READ_BUFFER, GL_COPY_READ_BUFFER_BINDING> kAutoBindRead(uReadBuffer);
-    SAutoBufferBind<GL_COPY_WRITE_BUFFER, GL_COPY_WRITE_BUFFER_BINDING> kAutoBindWrite(uWriteBuffer);
-    glCopyBufferSubData(kAutoBindRead.TARGET, kAutoBindWrite.TARGET, iReadOffset, iWriteOffset, iSize);
-}
-#endif
-
-#if !defined(glNamedBufferStorageEXT) && DXGL_SUPPORT_BUFFER_STORAGE
-inline void glNamedBufferStorageEXT(GLuint uBuffer, GLsizeiptr iSize, const GLvoid* pData, GLbitfield uFlags)
-{
-    SAutoBufferBind<> kAutoBind(uBuffer);
-    glBufferStorage(kAutoBind.TARGET, iSize, pData, uFlags);
-}
-#endif
-
-#if defined(ANDROID) && !defined(EGL_OPENGL_API)
-#define EGL_OPENGL_API 0x30A2
-#endif
-
-#endif //__GLFEATURES__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFormat.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFormat.cpp
deleted file mode 100644
index eef5a430ab..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFormat.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Defines the required information about image formats used
-//               by DXGL as well as utility functions.
-
-#include "RenderDll_precompiled.h"
-#include <AzDXGIFormat.h>
-
-#include "GLFormat.hpp"
-
-namespace NCryOpenGL
-{
-#define NA UINT_MAX
-
-#define DXGL_DXGI_FORMAT(_FormatID) DXGI_FORMAT_ ## _FormatID
-#define DXGL_UNCOMPRESSED_LAYOUT(_FormatID) g_kUncompressedLayout_ ## _FormatID
-#define DXGL_TEXTURE_FORMAT(_FormatID) g_kTextureFormat_ ## _FormatID
-#define DXGL_GL_INTERNAL_FORMAT(_InternalID) GL ## _InternalID
-#define DXGL_GI_CHANNEL_TYPE(_Type) eGICT_ ## _Type
-
-#define _PTR_MAP(_Type) _Type ## PtrMap
-#define _PTR_MAP_DEFAULT(_Type, _Enum, _Ptr)               \
-    template <_Enum eValue>                                \
-    struct _PTR_MAP(_Type){static const _Type* ms_pPtr; }; \
-    template <_Enum eValue>                                \
-    const _Type * _PTR_MAP(_Type) < eValue > ::ms_pPtr = _Ptr;
-#define _PTR_MAP_VALUE(_Type, _Value, _Ptr)                            \
-    template <>                                                        \
-    struct _PTR_MAP(_Type) < _Value > {static const _Type* ms_pPtr; }; \
-    const _Type* _PTR_MAP(_Type) < _Value > ::ms_pPtr = _Ptr;
-
-#define _UINT_MAP(_Name) S ## _Name ## UintMap
-#define _UINT_MAP_DEFAULT(_Name, _Enum, _UIntVal) \
-    template <_Enum eValue>                       \
-    struct _UINT_MAP(_Name){enum {VALUE = _UIntVal}; };
-#define _UINT_MAP_VALUE(_Name, _Value, _UIntVal) \
-    template <>                                  \
-    struct _UINT_MAP(_Name) < _Value > {enum {VALUE = _UIntVal}; };
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Uncompressed layouts for renderable formats
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _PTR_MAP_DEFAULT(SUncompressedLayout, EGIFormat, NULL)
-
-#define _UNCOMPR_LAY(_FormatID, _NumR, _NumG, _NumB, _NumA, _ShiftR, _ShiftG, _ShiftB, _ShiftA, _TypeRGBA, _Depth, _TypeD, _Stencil, _TypeS, _Spare) \
-    static const SUncompressedLayout DXGL_UNCOMPRESSED_LAYOUT(_FormatID) =                                                                           \
-    {                                                                                                                                                \
-        _NumR, _NumG, _NumB, _NumA,                                                                                                                  \
-        _ShiftR, _ShiftG, _ShiftB, _ShiftA,                                                                                                          \
-        DXGL_GI_CHANNEL_TYPE(_TypeRGBA),                                                                                                             \
-        _Depth, DXGL_GI_CHANNEL_TYPE(_TypeD),                                                                                                        \
-        _Stencil, DXGL_GI_CHANNEL_TYPE(_TypeS),                                                                                                      \
-        _Spare                                                                                                                                       \
-    };                                                                                                                                               \
-    _PTR_MAP_VALUE(SUncompressedLayout,  DXGL_GI_FORMAT(_FormatID), &DXGL_UNCOMPRESSED_LAYOUT(_FormatID))
-
-    //          | FORMAT_ID           | RGBA_SIZES        | RGBA_SHIFTS       | RGBA    | DEPTH      | STENCIL    | -  |
-    //          |                     | NR   NG   NB   NA | SR   SG   SB   SA | TYPE    | N    TYPE  | N    TYPE  | X  |
-    _UNCOMPR_LAY(R32G32B32A32_FLOAT,    32,  32,  32,  32,   0,  32,  64,  96,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32A32_UINT,     32,  32,  32,  32,   0,  32,  64,  96,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32A32_SINT,     32,  32,  32,  32,   0,  32,  64,  96,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32_FLOAT,       32,  32,  32,   0,   0,  32,  64,  96,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32_UINT,        32,  32,  32,   0,   0,  32,  64,  96,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32_SINT,        32,  32,  32,   0,   0,  32,  64,  96,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_FLOAT,    16,  16,  16,  16,   0,  16,  32,  48,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_UNORM,    16,  16,  16,  16,   0,  16,  32,  48,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_UINT,     16,  16,  16,  16,   0,  16,  32,  48,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_SNORM,    16,  16,  16,  16,   0,  16,  32,  48,  SNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_SINT,     16,  16,  16,  16,   0,  16,  32,  48,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32_FLOAT,          32,  32,   0,   0,   0,  32,  NA,  NA,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32_UINT,           32,  32,   0,   0,   0,  32,  NA,  NA,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32_SINT,           32,  32,   0,   0,   0,  32,  NA,  NA,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(D32_FLOAT_S8X24_UINT,   0,   0,   0,   0,  NA,  NA,  NA,  NA,  UNUSED,  32, FLOAT,    8, UINT,    24)
-    _UNCOMPR_LAY(R10G10B10A2_UNORM,     10,  10,  10,   2,   0,  10,  20,  30,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R10G10B10A2_UINT,      10,  10,  10,   2,   0,  10,  20,  30,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R11G11B10_FLOAT,       11,  11,  10,   0,   0,  11,  22,  NA,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_UNORM,         8,   8,   8,   8,   0,   8,  16,  24,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_UNORM_SRGB,    8,   8,   8,   8,   0,   8,  16,  24,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_UINT,          8,   8,   8,   8,   0,   8,  16,  24,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_SNORM,         8,   8,   8,   8,   0,   8,  16,  24,  SNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_SINT,          8,   8,   8,   8,   0,   8,  16,  24,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_FLOAT,          16,  16,   0,   0,   0,  16,  NA,  NA,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_UNORM,          16,  16,   0,   0,   0,  16,  NA,  NA,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_UINT,           16,  16,   0,   0,   0,  16,  NA,  NA,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_SNORM,          16,  16,   0,   0,   0,  16,  NA,  NA,  SNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_SINT,           16,  16,   0,   0,   0,  16,  NA,  NA,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(D32_FLOAT,              0,   0,   0,   0,  NA,  NA,  NA,  NA,  UNUSED,  32, FLOAT,    0, UNUSED,   0)
-    _UNCOMPR_LAY(R32_FLOAT,             32,   0,   0,   0,   0,  NA,  NA,  NA,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32_UINT,              32,   0,   0,   0,   0,  NA,  NA,  NA,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32_SINT,              32,   0,   0,   0,   0,  NA,  NA,  NA,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(D24_UNORM_S8_UINT,      0,   0,   0,   0,  NA,  NA,  NA,  NA,  UNUSED,  24, UNORM,    8, UINT,     0)
-    _UNCOMPR_LAY(R24_UNORM_X8_TYPELESS, 24,   0,   0,   0,  NA,  NA,  NA,  NA,  UNORM,    0, UNUSED,   0, UNUSED,   8)
-    _UNCOMPR_LAY(R8G8_UNORM,             8,   8,   0,   0,   0,   8,  NA,  NA,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8_UINT,              8,   8,   0,   0,   0,   8,  NA,  NA,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8_SNORM,             8,   8,   0,   0,   0,   8,  NA,  NA,  SNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8_SINT,              8,   8,   0,   0,   0,   8,  NA,  NA,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_FLOAT,             16,   0,   0,   0,   0,  NA,  NA,  NA,  FLOAT,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(D16_UNORM,              0,   0,   0,   0,  NA,  NA,  NA,  NA,  UNUSED,  16, UNORM,    0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_UNORM,             16,   0,   0,   0,   0,  NA,  NA,  NA,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_UINT,              16,   0,   0,   0,   0,  NA,  NA,  NA,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_SNORM,             16,   0,   0,   0,   0,  NA,  NA,  NA,  SNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_SINT,              16,   0,   0,   0,   0,  NA,  NA,  NA,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_UNORM,               8,   0,   0,   0,   0,  NA,  NA,  NA,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_UINT,                8,   0,   0,   0,   0,  NA,  NA,  NA,  UINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_SNORM,               8,   0,   0,   0,   0,  NA,  NA,  NA,  SNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_SINT,                8,   0,   0,   0,   0,  NA,  NA,  NA,  SINT,     0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(A8_UNORM,               0,   0,   0,   8,  NA,  NA,  NA,   0,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B5G6R5_UNORM,           5,   6,   5,   0,  11,   5,   0,  NA,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B5G5R5A1_UNORM,         5,   5,   5,   1,  10,   5,   0,  15,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B8G8R8A8_UNORM,         8,   8,   8,   8,  16,   8,   0,  24,  UNORM,    0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B8G8R8X8_UNORM,         8,   8,   8,   0,  16,   8,   0,  NA,  UNORM,    0, UNUSED,   0, UNUSED,   8)
-
-#undef _UNCOMPR_LAY
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Swizzle required to map each texture format to the corresponding DXGI format
-    ////////////////////////////////////////////////////////////////////////////////
-
-#define DXGL_SWIZZLE_RED   0
-#define DXGL_SWIZZLE_GREEN 1
-#define DXGL_SWIZZLE_BLUE  2
-#define DXGL_SWIZZLE_ALPHA 3
-#define DXGL_SWIZZLE_ZERO  4
-#define DXGL_SWIZZLE_ONE   5
-#define _SWIZZLE_MASK(_Red, _Green, _Blue, _Alpha) \
-    DXGL_SWIZZLE_ ## _Red   << 9 |                 \
-    DXGL_SWIZZLE_ ## _Green << 6 |                 \
-    DXGL_SWIZZLE_ ## _Blue  << 3 |                 \
-    DXGL_SWIZZLE_ ## _Alpha
-
-    _UINT_MAP_DEFAULT(DXGITextureSwizzle, TSwizzleMask, _SWIZZLE_MASK(RED, GREEN, BLUE, ALPHA))
-#define _DXGI_TEX_SWIZZLE(_FormatID, _Red, _Green, _Blue, _Alpha) _UINT_MAP_VALUE(DXGITextureSwizzle, DXGL_GI_FORMAT(_FormatID), _SWIZZLE_MASK(_Red, _Green, _Blue, _Alpha))
-    _DXGI_TEX_SWIZZLE(A8_UNORM, ZERO, ZERO, ZERO, RED)
-#if DXGLES
-    _DXGI_TEX_SWIZZLE(B8G8R8A8_UNORM, BLUE, GREEN, RED, ALPHA)
-    _DXGI_TEX_SWIZZLE(B8G8R8X8_UNORM, BLUE, GREEN, RED, ALPHA)
-    _DXGI_TEX_SWIZZLE(B8G8R8A8_UNORM_SRGB, BLUE, GREEN, RED, ALPHA)
-    _DXGI_TEX_SWIZZLE(B8G8R8X8_UNORM_SRGB, BLUE, GREEN, RED, ALPHA)
-#endif
-#undef _DXGI_TEX_SWIZZLE
-#undef _SWIZZLE_MASK
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Texturable formats (split between uncompressed and compressed)
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _PTR_MAP_DEFAULT(STextureFormat, EGIFormat, NULL)
-
-#define _TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, _Compressed, _GLType, _BlockWidth, _BlockHeight, _BlockDepth, _NumBlockBytes, _SRGB) \
-    static const STextureFormat DXGL_TEXTURE_FORMAT(_FormatID) =                                                                               \
-    {                                                                                                                                          \
-        _GLInternalFormat,                                                                                                                     \
-        _GLBaseFormat,                                                                                                                         \
-        _Compressed,                                                                                                                           \
-        _SRGB,                                                                                                                                 \
-        _GLType,                                                                                                                               \
-        _BlockWidth,                                                                                                                           \
-        _BlockHeight,                                                                                                                          \
-        _BlockDepth,                                                                                                                           \
-        _NumBlockBytes                                                                                                                         \
-    };                                                                                                                                         \
-    _PTR_MAP_VALUE(STextureFormat,  DXGL_GI_FORMAT(_FormatID), &DXGL_TEXTURE_FORMAT(_FormatID))
-
-#define _UNCOMPR_TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, _GLType, _SRGB, _Bytes) _TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, false, _GLType, 1, 1, 1, _Bytes, _SRGB)
-#define _COMPR_TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, _BlockWidth, _BlockHeight, _BlockDepth, _NumBlockBytes, _SRGB) _TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, true, 0, _BlockWidth, _BlockHeight, _BlockDepth, _NumBlockBytes, _SRGB)
-
-    //          | FORMAT_ID               | GL_INTERNAL_FORMAT     | GL_FORMAT          | GL_TYPE                           | SRGB  | BYTES |
-    _UNCOMPR_TEX(R32G32B32A32_FLOAT, GL_RGBA32F, GL_RGBA, GL_FLOAT, false,     16)
-    _UNCOMPR_TEX(R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA, GL_UNSIGNED_INT, false,     16)
-    _UNCOMPR_TEX(R32G32B32A32_SINT, GL_RGBA32I, GL_RGBA, GL_INT, false,     16)
-    _UNCOMPR_TEX(R32G32B32_FLOAT, GL_RGB32F, GL_RGB, GL_FLOAT, false,     12)
-    _UNCOMPR_TEX(R32G32B32_UINT, GL_RGB32UI, GL_RGB, GL_UNSIGNED_INT, false,     12)
-    _UNCOMPR_TEX(R32G32B32_SINT, GL_RGB32I, GL_RGB, GL_INT, false,     12)
-    _UNCOMPR_TEX(R16G16B16A16_FLOAT, GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, false,      8)
-#if DXGLES
-    _UNCOMPR_TEX(R16G16B16A16_UNORM, GL_RGBA16UI, GL_RGBA, GL_UNSIGNED_SHORT, false,      8)
-#else
-    _UNCOMPR_TEX(R16G16B16A16_UNORM, GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, false,      8)
-#endif
-    _UNCOMPR_TEX(R16G16B16A16_UINT, GL_RGBA16UI, GL_RGBA, GL_UNSIGNED_SHORT, false,      8)
-#if !DXGLES
-    _UNCOMPR_TEX(R16G16B16A16_SNORM, GL_RGBA16_SNORM, GL_RGBA, GL_SHORT, false,      8)
-#else
-    _UNCOMPR_TEX(R16G16B16A16_SNORM, GL_NONE, GL_RGBA, GL_SHORT, false,      8)
-#endif
-    _UNCOMPR_TEX(R16G16B16A16_SINT, GL_RGBA16I, GL_RGBA, GL_SHORT, false,      8)
-    _UNCOMPR_TEX(R32G32_FLOAT, GL_RG32F, GL_RG, GL_FLOAT, false,      8)
-    _UNCOMPR_TEX(R32G32_UINT, GL_RG32UI, GL_RG, GL_UNSIGNED_INT, false,      8)
-    _UNCOMPR_TEX(R32G32_SINT, GL_RG32I, GL_RG, GL_INT, false,      8)
-    _UNCOMPR_TEX(D32_FLOAT_S8X24_UINT, GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, false,      8)
-#if DXGLES
-    _UNCOMPR_TEX(R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, false,      4)
-    _UNCOMPR_TEX(R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, false,      4)
-#else
-    _UNCOMPR_TEX(R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_10_10_10_2, false,      4)
-    _UNCOMPR_TEX(R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGBA, GL_UNSIGNED_INT_10_10_10_2, false,      4)
-#endif
-    _UNCOMPR_TEX(R11G11B10_FLOAT, GL_R11F_G11F_B10F, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV, false,      4)
-    _UNCOMPR_TEX(R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4)
-    _UNCOMPR_TEX(R8G8B8A8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, true,      4)
-    _UNCOMPR_TEX(R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA, GL_UNSIGNED_BYTE, false,      4)
-    _UNCOMPR_TEX(R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA, GL_BYTE, false,      4)
-    _UNCOMPR_TEX(R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA, GL_BYTE, false,      4)
-    _UNCOMPR_TEX(R16G16_FLOAT, GL_RG16F, GL_RG, GL_HALF_FLOAT, false,      4)
-#if DXGLES
-    // https://www.khronos.org/opengles/sdk/docs/man3/html/glRenderbufferStorage.xhtml
-    // GL ES Can't convert to a render target with a different internal format... Framebuffer will error to "incomplete" if so
-    _UNCOMPR_TEX(R16G16_UNORM, GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT, false,      4)
-#else
-    _UNCOMPR_TEX(R16G16_UNORM, GL_RG16, GL_RG, GL_UNSIGNED_SHORT, false,      4)
-#endif
-    _UNCOMPR_TEX(R16G16_UINT, GL_RG16UI, GL_RG, GL_UNSIGNED_SHORT, false,      4)
-    _UNCOMPR_TEX(R16G16_SINT, GL_RG16I, GL_RG, GL_SHORT, false,      4)
-    _UNCOMPR_TEX(D32_FLOAT, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, false,      4)
-    _UNCOMPR_TEX(R32_FLOAT, GL_R32F, GL_RED, GL_FLOAT, false,      4)
-    _UNCOMPR_TEX(R32_UINT, GL_R32UI, GL_RED, GL_UNSIGNED_INT, false,      4)
-    _UNCOMPR_TEX(R32_SINT, GL_R32I, GL_RED, GL_INT, false,      4)
-    _UNCOMPR_TEX(D24_UNORM_S8_UINT, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, false,      4)
-    _UNCOMPR_TEX(R8G8_UNORM, GL_RG8, GL_RG, GL_UNSIGNED_BYTE, false,      2)
-    _UNCOMPR_TEX(R8G8_UINT, GL_RG8UI, GL_RG, GL_UNSIGNED_BYTE, false,      2)
-    _UNCOMPR_TEX(R8G8_SNORM, GL_RG8_SNORM, GL_RG, GL_BYTE, false,      2)
-    _UNCOMPR_TEX(R8G8_SINT, GL_RG8I, GL_RG, GL_BYTE, false,      2)
-    _UNCOMPR_TEX(R16_FLOAT, GL_R16F, GL_RED, GL_HALF_FLOAT, false,      2)
-    _UNCOMPR_TEX(D16_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, false,      2)
-#if DXGLES
-    _UNCOMPR_TEX(R16_UNORM, GL_R16UI, GL_RED, GL_UNSIGNED_SHORT, false,      2)
-#else
-    _UNCOMPR_TEX(R16_UNORM, GL_R16, GL_RED, GL_UNSIGNED_SHORT, false,      2)
-#endif
-    _UNCOMPR_TEX(R16_UINT, GL_R16UI, GL_RED, GL_UNSIGNED_SHORT, false,      2)
-    _UNCOMPR_TEX(R16_SINT, GL_R16I, GL_RED, GL_SHORT, false,      2)
-    _UNCOMPR_TEX(R8_UNORM, GL_R8, GL_RED, GL_UNSIGNED_BYTE, false,      1)
-    _UNCOMPR_TEX(R8_UINT, GL_R8UI, GL_RED, GL_UNSIGNED_BYTE, false,      1)
-    _UNCOMPR_TEX(R8_SNORM, GL_R8_SNORM, GL_RED, GL_BYTE, false,      1)
-    _UNCOMPR_TEX(R8_SINT, GL_R8I, GL_RED, GL_BYTE, false,      1)
-    _UNCOMPR_TEX(A8_UNORM, GL_R8, GL_RED, GL_UNSIGNED_BYTE, false,      1)
-    _UNCOMPR_TEX(R9G9B9E5_SHAREDEXP, GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV, false,      4)
-
-#if DXGLES
-    _UNCOMPR_TEX(B8G8R8A8_UNORM, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4)
-    _UNCOMPR_TEX(B8G8R8A8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, true,      4)
-    _UNCOMPR_TEX(B8G8R8X8_UNORM, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4)
-    _UNCOMPR_TEX(B8G8R8X8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, true,      4)
-#else
-    _UNCOMPR_TEX(B8G8R8A8_UNORM, GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, false,      4)
-    _UNCOMPR_TEX(B8G8R8A8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_BGRA, GL_UNSIGNED_BYTE, true,      4)
-    _UNCOMPR_TEX(B8G8R8X8_UNORM, GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, false,      4)
-    _UNCOMPR_TEX(B8G8R8X8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_BGRA, GL_UNSIGNED_BYTE, true,      4)
-#endif
-
-#if !DXGLES
-    _UNCOMPR_TEX(B5G6R5_UNORM, GL_RGB565, GL_BGR, GL_UNSIGNED_SHORT_5_6_5_REV, false,      2)
-    _UNCOMPR_TEX(B5G5R5A1_UNORM, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1, false,      2)
-    _UNCOMPR_TEX(R16_SNORM, GL_R16_SNORM, GL_RED, GL_SHORT, false,      2)
-    _UNCOMPR_TEX(R16G16_SNORM, GL_RG16_SNORM, GL_RG, GL_SHORT, false,      4)
-#endif
-
-    //        | FORMAT_ID       | GL_INTERNAL_FORMAT                        | GL_FORMAT  |      BLOCK        | SRGB  |
-    //        |                 |                                           |            | X | Y | Z | BYTES |       |
-#if DXGL_SUPPORT_ETC2_EAC_COMPRESSION
-    _COMPR_TEX(EAC_R11_UNORM, GL_COMPRESSED_R11_EAC, GL_RED,  4,  4,  1,      8, false)
-    _COMPR_TEX(EAC_R11_SNORM, GL_COMPRESSED_SIGNED_R11_EAC, GL_RED,  4,  4,  1,      8, false)
-    _COMPR_TEX(EAC_RG11_UNORM, GL_COMPRESSED_RG11_EAC, GL_RG,  4,  4,  1,     16, false)
-    _COMPR_TEX(EAC_RG11_SNORM, GL_COMPRESSED_SIGNED_RG11_EAC, GL_RG,  4,  4,  1,     16, false)
-    _COMPR_TEX(ETC2_UNORM, GL_COMPRESSED_RGB8_ETC2, GL_RGB,  4,  4,  1,      8, false)
-    _COMPR_TEX(ETC2_UNORM_SRGB, GL_COMPRESSED_SRGB8_ETC2, GL_RGB,  4,  4,  1,      8, true)
-    _COMPR_TEX(ETC2A_UNORM, GL_COMPRESSED_RGBA8_ETC2_EAC, GL_RGBA,  4,  4,  1,     16, false)
-    _COMPR_TEX(ETC2A_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, GL_RGBA,  4,  4,  1,     16, true)
-#endif //DXGL_SUPPORT_ETC2_EAC_COMPRESSION
-#if DXGL_SUPPORT_S3TC_TEXTURES
-    _COMPR_TEX(BC1_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_RGBA,  4,  4,  1,      8, false)
-    _COMPR_TEX(BC1_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_RGBA,  4,  4,  1,      8, true)
-    _COMPR_TEX(BC2_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_RGBA,  4,  4,  1,     16, false)
-    _COMPR_TEX(BC2_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_RGBA,  4,  4,  1,     16, true)
-    _COMPR_TEX(BC3_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_RGBA,  4,  4,  1,     16, false)
-    _COMPR_TEX(BC3_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_RGBA,  4,  4,  1,     16, true)
-#endif //DXGL_SUPPORT_S3TC_TEXTURES
-#if !DXGLES
-    _COMPR_TEX(BC4_UNORM, GL_COMPRESSED_RED_RGTC1, GL_RED,  4,  4,  1,      8, false)
-    _COMPR_TEX(BC4_SNORM, GL_COMPRESSED_SIGNED_RED_RGTC1, GL_RED,  4,  4,  1,      8, false)
-    _COMPR_TEX(BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_RG,  4,  4,  1,     16, false)
-    _COMPR_TEX(BC5_SNORM, GL_COMPRESSED_SIGNED_RG_RGTC2, GL_RG,  4,  4,  1,     16, false)
-    #if DXGL_SUPPORT_BPTC
-    _COMPR_TEX(BC6H_UF16, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, GL_RGB,  4,  4,  1,     16, false)
-    _COMPR_TEX(BC6H_SF16, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB, GL_RGB,  4,  4,  1,     16, false)
-    _COMPR_TEX(BC7_UNORM, GL_COMPRESSED_RGBA_BPTC_UNORM_ARB, GL_RGBA,  4,  4,  1,     16, false)
-    _COMPR_TEX(BC7_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB, GL_RGBA,  4,  4,  1,     16, true)
-    #endif //DXGL_SUPPORT_BPTC
-#endif //!DXGLES
-       //        | FORMAT_ID              | GL_INTERNAL_FORMAT                        | GL_FORMAT  |      BLOCK        | SRGB  |
-       //        |                        |                                           |            | X | Y | Z | BYTES |       |
-#if defined(ANDROID) && DXGLES
-    _COMPR_TEX(ASTC_4x4_UNORM, GL_COMPRESSED_RGBA_ASTC_4x4_KHR, GL_RGBA,  4,  4,  1,     16, false)
-    _COMPR_TEX(ASTC_4x4_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, GL_RGBA,  4,  4,  1,     16, true)
-    _COMPR_TEX(ASTC_5x4_UNORM, GL_COMPRESSED_RGBA_ASTC_5x4_KHR, GL_RGBA,  5,  4,  1,     16, false)
-    _COMPR_TEX(ASTC_5x4_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, GL_RGBA,  5,  4,  1,     16, true)
-    _COMPR_TEX(ASTC_5x5_UNORM, GL_COMPRESSED_RGBA_ASTC_5x5_KHR, GL_RGBA,  5,  5,  1,     16, false)
-    _COMPR_TEX(ASTC_5x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, GL_RGBA,  5,  5,  1,     16, true)
-    _COMPR_TEX(ASTC_6x5_UNORM, GL_COMPRESSED_RGBA_ASTC_6x5_KHR, GL_RGBA,  6,  5,  1,     16, false)
-    _COMPR_TEX(ASTC_6x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, GL_RGBA,  6,  5,  1,     16, true)
-    _COMPR_TEX(ASTC_6x6_UNORM, GL_COMPRESSED_RGBA_ASTC_6x6_KHR, GL_RGBA,  6,  6,  1,     16, false)
-    _COMPR_TEX(ASTC_6x6_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, GL_RGBA,  6,  6,  1,     16, true)
-    _COMPR_TEX(ASTC_8x5_UNORM, GL_COMPRESSED_RGBA_ASTC_8x5_KHR, GL_RGBA,  8,  5,  1,     16, false)
-    _COMPR_TEX(ASTC_8x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, GL_RGBA,  8,  5,  1,     16, true)
-    _COMPR_TEX(ASTC_8x6_UNORM, GL_COMPRESSED_RGBA_ASTC_8x6_KHR, GL_RGBA,  8,  6,  1,     16, false)
-    _COMPR_TEX(ASTC_8x6_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, GL_RGBA,  8,  6,  1,     16, true)
-    _COMPR_TEX(ASTC_8x8_UNORM, GL_COMPRESSED_RGBA_ASTC_8x8_KHR, GL_RGBA,  8,  8,  1,     16, false)
-    _COMPR_TEX(ASTC_8x8_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, GL_RGBA,  8,  8,  1,     16, true)
-    _COMPR_TEX(ASTC_10x5_UNORM, GL_COMPRESSED_RGBA_ASTC_10x5_KHR, GL_RGBA, 10,  5,  1,     16, false)
-    _COMPR_TEX(ASTC_10x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, GL_RGBA, 10,  5,  1,     16, true)
-    _COMPR_TEX(ASTC_10x6_UNORM, GL_COMPRESSED_RGBA_ASTC_10x6_KHR, GL_RGBA, 10,  6,  1,     16, false)
-    _COMPR_TEX(ASTC_10x6_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, GL_RGBA, 10,  6,  1,     16, true)
-    _COMPR_TEX(ASTC_10x8_UNORM, GL_COMPRESSED_RGBA_ASTC_10x8_KHR, GL_RGBA, 10,  8,  1,     16, false)
-    _COMPR_TEX(ASTC_10x8_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, GL_RGBA, 10,  8,  1,     16, true)
-    _COMPR_TEX(ASTC_10x10_UNORM, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, GL_RGBA, 10, 10,  1,     16, false)
-    _COMPR_TEX(ASTC_10x10_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, GL_RGBA, 10, 10,  1,     16, true)
-    _COMPR_TEX(ASTC_12x10_UNORM, GL_COMPRESSED_RGBA_ASTC_12x10_KHR, GL_RGBA, 12, 10,  1,     16, false)
-    _COMPR_TEX(ASTC_12x10_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, GL_RGBA, 12, 10,  1,     16, true)
-    _COMPR_TEX(ASTC_12x12_UNORM, GL_COMPRESSED_RGBA_ASTC_12x12_KHR, GL_RGBA, 12, 12,  1,     16, false)
-    _COMPR_TEX(ASTC_12x12_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, GL_RGBA, 12, 12,  1,     16, true)
-#endif
-
-#undef _TEX
-#undef _UNCOMPR_TEX
-#undef _COMPR_TEX
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Default support for each format
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _UINT_MAP_DEFAULT(DefaultSupport, EGIFormat, 0)
-
-#define _SUPPORT(_FormatID, _Mask) _UINT_MAP_VALUE(DefaultSupport, DXGL_GI_FORMAT(_FormatID), _Mask)
-
-    DXGL_TODO("Add here hardcoded default support masks (see _SUPPORT) for each format to use when format queries are not supported and for particular features")
-
-#undef _SUPPORT
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Typeless format mappings
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _UINT_MAP_DEFAULT(TypelessFormat, EGIFormat, eGIF_NUM)
-    _UINT_MAP_DEFAULT(TypelessConversion, EGIFormat, eGIFC_UNSUPPORTED)
-
-#define _TYPED_CONVERT(_FormatID, _TypelessID, _Conversion)                                 \
-    _UINT_MAP_VALUE(TypelessFormat, DXGL_GI_FORMAT(_FormatID), DXGL_GI_FORMAT(_TypelessID)) \
-    _UINT_MAP_VALUE(TypelessConversion, DXGL_GI_FORMAT(_FormatID), eGIFC_ ## _Conversion)
-#define _TYPED_DEFAULT(_FormatID, _TypelessID)                                                                                               \
-    _PTR_MAP_VALUE(STextureFormat,  DXGL_GI_FORMAT(_TypelessID), &DXGL_TEXTURE_FORMAT(_FormatID))                                            \
-    _PTR_MAP_VALUE(SUncompressedLayout,  DXGL_GI_FORMAT(_TypelessID), _PTR_MAP(SUncompressedLayout) < DXGL_GI_FORMAT(_FormatID) > ::ms_pPtr) \
-    _TYPED_CONVERT(_FormatID, _TypelessID, NONE)
-
-    _TYPED_DEFAULT(R32G32B32A32_FLOAT, R32G32B32A32_TYPELESS)
-    _TYPED_CONVERT(R32G32B32A32_UINT, R32G32B32A32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R32G32B32A32_SINT, R32G32B32A32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R32G32B32_FLOAT, R32G32B32_TYPELESS)
-    _TYPED_CONVERT(R32G32B32_UINT, R32G32B32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R32G32B32_SINT, R32G32B32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R16G16B16A16_FLOAT, R16G16B16A16_TYPELESS)
-    _TYPED_CONVERT(R16G16B16A16_UNORM, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16B16A16_UINT, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16B16A16_SNORM, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16B16A16_SINT, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R32G32_FLOAT, R32G32_TYPELESS)
-    _TYPED_CONVERT(R32G32_UINT, R32G32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R32G32_SINT, R32G32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(D32_FLOAT_S8X24_UINT, R32G8X24_TYPELESS)
-    _TYPED_CONVERT(R32_FLOAT_X8X24_TYPELESS, R32G8X24_TYPELESS, DEPTH_TO_RED)
-    _TYPED_CONVERT(X32_TYPELESS_G8X24_UINT, R32G8X24_TYPELESS, STENCIL_TO_RED)
-    _TYPED_DEFAULT(R10G10B10A2_UNORM, R10G10B10A2_TYPELESS)
-    _TYPED_CONVERT(R10G10B10A2_UINT, R10G10B10A2_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R8G8B8A8_UNORM, R8G8B8A8_TYPELESS)
-    _TYPED_CONVERT(R8G8B8A8_UNORM_SRGB, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8B8A8_UINT, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8B8A8_SNORM, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8B8A8_SINT, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R16G16_FLOAT, R16G16_TYPELESS)
-    _TYPED_CONVERT(R16G16_UNORM, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16_UINT, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16_SNORM, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16_SINT, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(D32_FLOAT, R32_TYPELESS)
-    _TYPED_CONVERT(R32_FLOAT, R32_TYPELESS, DEPTH_TO_RED)
-    _TYPED_DEFAULT(D24_UNORM_S8_UINT, R24G8_TYPELESS)
-    _TYPED_CONVERT(R24_UNORM_X8_TYPELESS, R24G8_TYPELESS, DEPTH_TO_RED)
-    _TYPED_CONVERT(X24_TYPELESS_G8_UINT, R24G8_TYPELESS, STENCIL_TO_RED)
-    _TYPED_DEFAULT(R8G8_UNORM, R8G8_TYPELESS)
-    _TYPED_CONVERT(R8G8_UINT, R8G8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8_SNORM, R8G8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8_SINT, R8G8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(D16_UNORM, R16_TYPELESS)
-    _TYPED_CONVERT(R16_UNORM, R16_TYPELESS, DEPTH_TO_RED)
-    _TYPED_DEFAULT(R8_UNORM, R8_TYPELESS)
-    _TYPED_CONVERT(R8_UINT, R8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8_SNORM, R8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8_SINT, R8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(B8G8R8A8_UNORM, B8G8R8A8_TYPELESS)
-    _TYPED_CONVERT(B8G8R8A8_UNORM_SRGB, B8G8R8A8_TYPELESS, TEXTURE_VIEW)
-#if DXGL_SUPPORT_ETC2_EAC_COMPRESSION
-    _TYPED_DEFAULT(EAC_R11_UNORM, EAC_R11_TYPELESS)
-    _TYPED_CONVERT(EAC_R11_SNORM, EAC_R11_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(EAC_RG11_UNORM, EAC_RG11_TYPELESS)
-    _TYPED_CONVERT(EAC_RG11_SNORM, EAC_RG11_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(ETC2_UNORM, ETC2_TYPELESS)
-    _TYPED_CONVERT(ETC2_UNORM_SRGB, ETC2_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(ETC2A_UNORM, ETC2A_TYPELESS)
-    _TYPED_CONVERT(ETC2A_UNORM_SRGB, ETC2A_TYPELESS, TEXTURE_VIEW)
-#endif
-    _TYPED_DEFAULT(B8G8R8X8_UNORM, B8G8R8X8_TYPELESS)
-    _TYPED_CONVERT(B8G8R8X8_UNORM_SRGB, B8G8R8X8_TYPELESS, TEXTURE_VIEW)
-#if DXGL_SUPPORT_S3TC_TEXTURES
-    _TYPED_DEFAULT(BC1_UNORM, BC1_TYPELESS)
-    _TYPED_CONVERT(BC1_UNORM_SRGB, BC1_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(BC2_UNORM, BC2_TYPELESS)
-    _TYPED_CONVERT(BC2_UNORM_SRGB, BC2_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(BC3_UNORM, BC3_TYPELESS)
-    _TYPED_CONVERT(BC3_UNORM_SRGB, BC3_TYPELESS, TEXTURE_VIEW)
-#endif //DXGL_SUPPORT_S3TC_TEXTURES
-#if !DXGLES
-    _TYPED_DEFAULT(BC4_UNORM, BC4_TYPELESS)
-    _TYPED_CONVERT(BC4_SNORM, BC4_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(BC5_UNORM, BC5_TYPELESS)
-    _TYPED_CONVERT(BC5_SNORM, BC5_TYPELESS, TEXTURE_VIEW)
-    #if DXGL_SUPPORT_BPTC
-    _TYPED_DEFAULT(BC6H_UF16, BC6H_TYPELESS)
-    _TYPED_CONVERT(BC6H_SF16, BC6H_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(BC7_UNORM, BC7_TYPELESS)
-    _TYPED_CONVERT(BC7_UNORM_SRGB, BC7_TYPELESS, TEXTURE_VIEW)
-    #endif //DXGL_SUPPORT_BPTC
-#endif //!DXGLES
-
-#undef _TYPED_DEFAULT
-#undef _TYPED_CONVERT
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Format information accessors
-    ////////////////////////////////////////////////////////////////////////////////
-
-    static SGIFormatInfo g_akFormatInfo[] =
-    {
-#define _FORMAT_INFO(_FormatID)                                                                                \
-    {                                                                                                          \
-        DXGL_DXGI_FORMAT(_FormatID),                                                                           \
-        _UINT_MAP(DefaultSupport) < DXGL_GI_FORMAT(_FormatID) > ::VALUE,                                       \
-        _PTR_MAP(STextureFormat) < DXGL_GI_FORMAT(_FormatID) > ::ms_pPtr,                                      \
-        _PTR_MAP(SUncompressedLayout) < DXGL_GI_FORMAT(_FormatID) > ::ms_pPtr,                                 \
-        static_cast<EGIFormat>(_UINT_MAP(TypelessFormat) < DXGL_GI_FORMAT(_FormatID) > ::VALUE),               \
-        static_cast<EGIFormatConversion>(_UINT_MAP(TypelessConversion) < DXGL_GI_FORMAT(_FormatID) > ::VALUE), \
-        _UINT_MAP(DXGITextureSwizzle) < DXGL_GI_FORMAT(_FormatID) > ::VALUE,                                   \
-    },
-
-        DXGL_GI_FORMATS(_FORMAT_INFO)
-
-#undef _FORMAT_INFO
-    };
-
-    const SGIFormatInfo* GetGIFormatInfo(EGIFormat eGIFormat)
-    {
-        assert(eGIFormat < eGIF_NUM);
-        return &g_akFormatInfo[eGIFormat];
-    }
-
-    DXGI_FORMAT GetDXGIFormat(EGIFormat eGIFormat)
-    {
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(eGIFormat));
-        return (pFormatInfo == NULL) ? DXGI_FORMAT_INVALID : pFormatInfo->m_eDXGIFormat;
-    }
-
-    EGIFormat GetGIFormat(DXGI_FORMAT eDXGIFormat)
-    {
-        switch (eDXGIFormat)
-        {
-#define _FORMAT_CASE(_FormatID, ...) \
-case DXGL_DXGI_FORMAT(_FormatID):    \
-    return DXGL_GI_FORMAT(_FormatID);
-
-            DXGL_GI_FORMATS(_FORMAT_CASE)
-#undef _FORMAT_CASE
-
-        default:
-            return eGIF_NUM;
-        }
-    }
-
-#undef _PTR_MAP_VALUE
-#undef _PTR_MAP_DEFAULT
-#undef _PTR_MAP
-#undef _UINT_MAP_VALUE
-#undef _UINT_MAP_DEFAULT
-#undef _UINT_MAP
-
-#undef DXGL_DXGI_FORMAT
-#undef DXGL_UNCOMPRESSED_LAYOUT
-#undef DXGL_TEXTURE_FORMAT
-#undef DXGL_GL_INTERNAL_FORMAT
-#undef DXGL_GI_CHANNEL_TYPE
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Texture swizzle encoding
-    ////////////////////////////////////////////////////////////////////////////////
-
-    void SwizzleMaskToRGBA(TSwizzleMask uMask, GLint aiRGBA[4])
-    {
-        uint32 uChannel(4);
-        while (uChannel--)
-        {
-            switch (uMask & 7)
-            {
-            case DXGL_SWIZZLE_RED:
-                aiRGBA[uChannel] = GL_RED;
-                break;
-            case DXGL_SWIZZLE_GREEN:
-                aiRGBA[uChannel] = GL_GREEN;
-                break;
-            case DXGL_SWIZZLE_BLUE:
-                aiRGBA[uChannel] = GL_BLUE;
-                break;
-            case DXGL_SWIZZLE_ALPHA:
-                aiRGBA[uChannel] = GL_ALPHA;
-                break;
-            case DXGL_SWIZZLE_ZERO:
-                aiRGBA[uChannel] = GL_ZERO;
-                break;
-            case DXGL_SWIZZLE_ONE:
-                aiRGBA[uChannel] = GL_ONE;
-                break;
-            default:
-                assert(false);
-            }
-            uMask >>= 3;
-        }
-    }
-
-    bool RGBAToSwizzleMask(const GLint aiRGBA[4], TSwizzleMask& uMask)
-    {
-        uMask = 0;
-        uint32 uChannel;
-        for (uChannel = 0; uChannel < 4; ++uChannel, uMask <<= 3)
-        {
-            switch (aiRGBA[uChannel])
-            {
-            case GL_RED:
-                uMask |= DXGL_SWIZZLE_RED;
-                break;
-            case GL_GREEN:
-                uMask |= DXGL_SWIZZLE_GREEN;
-                break;
-            case GL_BLUE:
-                uMask |= DXGL_SWIZZLE_BLUE;
-                break;
-            case GL_ALPHA:
-                uMask |= DXGL_SWIZZLE_ALPHA;
-                break;
-            case GL_ZERO:
-                uMask |= DXGL_SWIZZLE_ZERO;
-                break;
-            case GL_ONE:
-                uMask |= DXGL_SWIZZLE_ONE;
-                break;
-            default:
-                return false;
-            }
-        }
-        return true;
-    }
-
-#undef DXGL_SWIZZLE_RED
-#undef DXGL_SWIZZLE_GREEN
-#undef DXGL_SWIZZLE_BLUE
-#undef DXGL_SWIZZLE_ALPHA
-#undef DXGL_SWIZZLE_ZERO
-#undef DXGL_SWIZZLE_ONE
-
-    bool GetImageFormat(EGIFormat eGIFormat, GLenum* peImageFormat)
-    {
-        const SGIFormatInfo* pFormatInfo;
-        DXGL_TODO("If possible add a specific list of valid image formats rather than re-using texture formats and checking that it's not compressed")
-        if (eGIFormat == eGIF_NUM ||
-            (pFormatInfo = GetGIFormatInfo(eGIFormat)) == NULL ||
-            pFormatInfo->m_pTexture == NULL ||
-            pFormatInfo->m_pTexture->m_bCompressed)
-        {
-            return false;
-        }
-
-        *peImageFormat = (GLenum)pFormatInfo->m_pTexture->m_iInternalFormat;
-        return true;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFormat.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFormat.hpp
deleted file mode 100644
index 0938f06e21..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFormat.hpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the image formats used by DXGL and the utility
-//               methods for converting to and from DXGI formats.
-
-
-#ifndef __GLFORMAT__
-#define __GLFORMAT__
-
-#include "GLCommon.hpp"
-
-// Enumeration of the IDs of all the supported GI format (each ID must match one
-// DXGI_FORMAT enumeration value - excluding the DXGI_FORMAT prefix).
-#define DXGL_UNCOMPRESSED_GI_FORMATS(_Func) \
-    _Func(R32G32B32A32_TYPELESS)            \
-    _Func(R32G32B32A32_FLOAT)               \
-    _Func(R32G32B32A32_UINT)                \
-    _Func(R32G32B32A32_SINT)                \
-    _Func(R32G32B32_TYPELESS)               \
-    _Func(R32G32B32_FLOAT)                  \
-    _Func(R32G32B32_UINT)                   \
-    _Func(R32G32B32_SINT)                   \
-    _Func(R16G16B16A16_TYPELESS)            \
-    _Func(R16G16B16A16_FLOAT)               \
-    _Func(R16G16B16A16_UNORM)               \
-    _Func(R16G16B16A16_UINT)                \
-    _Func(R16G16B16A16_SNORM)               \
-    _Func(R16G16B16A16_SINT)                \
-    _Func(R32G32_TYPELESS)                  \
-    _Func(R32G32_FLOAT)                     \
-    _Func(R32G32_UINT)                      \
-    _Func(R32G32_SINT)                      \
-    _Func(R32G8X24_TYPELESS)                \
-    _Func(D32_FLOAT_S8X24_UINT)             \
-    _Func(R32_FLOAT_X8X24_TYPELESS)         \
-    _Func(X32_TYPELESS_G8X24_UINT)          \
-    _Func(R10G10B10A2_TYPELESS)             \
-    _Func(R10G10B10A2_UNORM)                \
-    _Func(R10G10B10A2_UINT)                 \
-    _Func(R11G11B10_FLOAT)                  \
-    _Func(R8G8B8A8_TYPELESS)                \
-    _Func(R8G8B8A8_UNORM)                   \
-    _Func(R8G8B8A8_UNORM_SRGB)              \
-    _Func(R8G8B8A8_UINT)                    \
-    _Func(R8G8B8A8_SNORM)                   \
-    _Func(R8G8B8A8_SINT)                    \
-    _Func(R16G16_TYPELESS)                  \
-    _Func(R16G16_FLOAT)                     \
-    _Func(R16G16_UNORM)                     \
-    _Func(R16G16_UINT)                      \
-    _Func(R16G16_SNORM)                     \
-    _Func(R16G16_SINT)                      \
-    _Func(R32_TYPELESS)                     \
-    _Func(D32_FLOAT)                        \
-    _Func(R32_FLOAT)                        \
-    _Func(R32_UINT)                         \
-    _Func(R32_SINT)                         \
-    _Func(R24G8_TYPELESS)                   \
-    _Func(D24_UNORM_S8_UINT)                \
-    _Func(R24_UNORM_X8_TYPELESS)            \
-    _Func(X24_TYPELESS_G8_UINT)             \
-    _Func(R8G8_TYPELESS)                    \
-    _Func(R8G8_UNORM)                       \
-    _Func(R8G8_UINT)                        \
-    _Func(R8G8_SNORM)                       \
-    _Func(R8G8_SINT)                        \
-    _Func(R16_TYPELESS)                     \
-    _Func(R16_FLOAT)                        \
-    _Func(D16_UNORM)                        \
-    _Func(R16_UNORM)                        \
-    _Func(R16_UINT)                         \
-    _Func(R16_SNORM)                        \
-    _Func(R16_SINT)                         \
-    _Func(R8_TYPELESS)                      \
-    _Func(R8_UNORM)                         \
-    _Func(R8_UINT)                          \
-    _Func(R8_SNORM)                         \
-    _Func(R8_SINT)                          \
-    _Func(A8_UNORM)                         \
-    _Func(R9G9B9E5_SHAREDEXP)               \
-    _Func(B5G6R5_UNORM)                     \
-    _Func(B5G5R5A1_UNORM)                   \
-    _Func(B8G8R8A8_TYPELESS)                \
-    _Func(B8G8R8A8_UNORM)                   \
-    _Func(B8G8R8A8_UNORM_SRGB)              \
-    _Func(B8G8R8X8_TYPELESS)                \
-    _Func(B8G8R8X8_UNORM)                   \
-    _Func(B8G8R8X8_UNORM_SRGB)
-#define DXGL_COMPRESSED_GI_FORMATS(_Func) \
-    _Func(BC1_TYPELESS)                   \
-    _Func(BC1_UNORM)                      \
-    _Func(BC1_UNORM_SRGB)                 \
-    _Func(BC2_TYPELESS)                   \
-    _Func(BC2_UNORM)                      \
-    _Func(BC2_UNORM_SRGB)                 \
-    _Func(BC3_TYPELESS)                   \
-    _Func(BC3_UNORM)                      \
-    _Func(BC3_UNORM_SRGB)                 \
-    _Func(BC4_TYPELESS)                   \
-    _Func(BC4_UNORM)                      \
-    _Func(BC4_SNORM)                      \
-    _Func(BC5_TYPELESS)                   \
-    _Func(BC5_UNORM)                      \
-    _Func(BC5_SNORM)                      \
-    _Func(BC6H_TYPELESS)                  \
-    _Func(BC6H_UF16)                      \
-    _Func(BC6H_SF16)                      \
-    _Func(BC7_TYPELESS)                   \
-    _Func(BC7_UNORM)                      \
-    _Func(BC7_UNORM_SRGB)                 \
-    _Func(EAC_R11_TYPELESS)               \
-    _Func(EAC_R11_UNORM)                  \
-    _Func(EAC_R11_SNORM)                  \
-    _Func(EAC_RG11_TYPELESS)              \
-    _Func(EAC_RG11_UNORM)                 \
-    _Func(EAC_RG11_SNORM)                 \
-    _Func(ETC2_TYPELESS)                  \
-    _Func(ETC2_UNORM)                     \
-    _Func(ETC2_UNORM_SRGB)                \
-    _Func(ETC2A_TYPELESS)                 \
-    _Func(ETC2A_UNORM)                    \
-    _Func(ETC2A_UNORM_SRGB)               \
-    _Func(ASTC_4x4_TYPELESS)              \
-    _Func(ASTC_4x4_UNORM)                 \
-    _Func(ASTC_4x4_UNORM_SRGB)            \
-    _Func(ASTC_5x4_TYPELESS)              \
-    _Func(ASTC_5x4_UNORM)                 \
-    _Func(ASTC_5x4_UNORM_SRGB)            \
-    _Func(ASTC_5x5_TYPELESS)              \
-    _Func(ASTC_5x5_UNORM)                 \
-    _Func(ASTC_5x5_UNORM_SRGB)            \
-    _Func(ASTC_6x5_TYPELESS)              \
-    _Func(ASTC_6x5_UNORM)                 \
-    _Func(ASTC_6x5_UNORM_SRGB)            \
-    _Func(ASTC_6x6_TYPELESS)              \
-    _Func(ASTC_6x6_UNORM)                 \
-    _Func(ASTC_6x6_UNORM_SRGB)            \
-    _Func(ASTC_8x5_TYPELESS)              \
-    _Func(ASTC_8x5_UNORM)                 \
-    _Func(ASTC_8x5_UNORM_SRGB)            \
-    _Func(ASTC_8x6_TYPELESS)              \
-    _Func(ASTC_8x6_UNORM)                 \
-    _Func(ASTC_8x6_UNORM_SRGB)            \
-    _Func(ASTC_8x8_TYPELESS)              \
-    _Func(ASTC_8x8_UNORM)                 \
-    _Func(ASTC_8x8_UNORM_SRGB)            \
-    _Func(ASTC_10x5_TYPELESS)             \
-    _Func(ASTC_10x5_UNORM)                \
-    _Func(ASTC_10x5_UNORM_SRGB)           \
-    _Func(ASTC_10x6_TYPELESS)             \
-    _Func(ASTC_10x6_UNORM)                \
-    _Func(ASTC_10x6_UNORM_SRGB)           \
-    _Func(ASTC_10x8_TYPELESS)             \
-    _Func(ASTC_10x8_UNORM)                \
-    _Func(ASTC_10x8_UNORM_SRGB)           \
-    _Func(ASTC_10x10_TYPELESS)            \
-    _Func(ASTC_10x10_UNORM)               \
-    _Func(ASTC_10x10_UNORM_SRGB)          \
-    _Func(ASTC_12x10_TYPELESS)            \
-    _Func(ASTC_12x10_UNORM)               \
-    _Func(ASTC_12x10_UNORM_SRGB)          \
-    _Func(ASTC_12x12_TYPELESS)            \
-    _Func(ASTC_12x12_UNORM)               \
-    _Func(ASTC_12x12_UNORM_SRGB)
-
-
-#define DXGL_GI_FORMATS(_Func)          \
-    DXGL_UNCOMPRESSED_GI_FORMATS(_Func) \
-    DXGL_COMPRESSED_GI_FORMATS(_Func)
-
-namespace NCryOpenGL
-{
-    // Supported DXGI format identifiers
-    enum EGIFormat
-    {
-#define DXGL_GI_FORMAT(_FormatID) eGIF_ ## _FormatID
-#define _GI_FORMAT_ENUM_FUNC(_FormatID, ...) DXGL_GI_FORMAT(_FormatID),
-        DXGL_GI_FORMATS(_GI_FORMAT_ENUM_FUNC)
-#undef _GI_FORMAT_ENUM_FUNC
-        DXGL_GI_FORMAT(NUM)
-    };
-
-    // Data types supported for DXGI format channels
-    enum EGIChannelType
-    {
-        eGICT_UNUSED,   // Not used by the format
-        eGICT_UNORM,    // Unsigned normalized integer (range linearly mapped to [0, 1])
-        eGICT_UINT,     // Unsigned integer
-        eGICT_FLOAT,    // Floating point value
-        eGICT_SNORM,    // Signed normalized integer (range linearly mapped to [-1, 1])
-        eGICT_SINT,     // Signed integer
-    };
-
-    // Utility information about an uncompressed pixel format
-    struct SUncompressedLayout
-    {
-        // Number of bits per pixel for the red, green, blue and alpha channels
-        uint32 m_uRedBits;
-        uint32 m_uGreenBits;
-        uint32 m_uBlueBits;
-        uint32 m_uAlphaBits;
-
-        // Position for the red, green, blue and alpha channels within each pixel
-        uint32 m_uRedShift;
-        uint32 m_uGreenShift;
-        uint32 m_uBlueShift;
-        uint32 m_uAlphaShift;
-
-        // The data type for the red, green, blue and alpha channels
-        EGIChannelType m_eColorType;
-
-        // Number of bits of the depth channel
-        uint32 m_uDepthBits;
-        // The data type for the depth channel
-        EGIChannelType m_eDepthType;
-
-        // Number of bits of the stencil channel
-        uint32 m_uStencilBits;
-        // The data type for the stencil channel
-        EGIChannelType m_eStencilType;
-
-        // Number of spare bits not used by the format layout
-        uint32 m_uSpareBits;
-
-        inline uint32 GetColorBits() const
-        {
-            return m_uRedBits + m_uGreenBits + m_uBlueBits + m_uAlphaBits;
-        }
-
-        inline uint32 GetDepthStencilBits() const
-        {
-            return m_uDepthBits + m_uStencilBits;
-        }
-
-        inline uint32 GetPixelBits() const
-        {
-            return GetColorBits() + GetDepthStencilBits() + m_uSpareBits;
-        }
-
-        inline uint32 GetPixelBytes() const
-        {
-            uint32 uPixelBits(GetPixelBits());
-            assert(uPixelBits % 8 == 0);
-            return uPixelBits >> 3;
-        }
-    };
-
-    // Identifies a set of swizzle modes for each color channel
-    typedef uint16 TSwizzleMask;
-
-    struct STextureFormat
-    {
-        // The OpenGL image format used to store textures internally
-        GLint m_iInternalFormat;
-
-        // The OpenGL image format used at application level for pixel data
-        GLenum m_eBaseFormat;
-
-        // Tells if the image data is compressed
-        bool m_bCompressed;
-
-        // Tells if the the format assumes data in sRGB space
-        bool m_bSRGB;
-
-        // Native OpenGL pixel data type (not meaningful if m_bCompressed is true)
-        GLenum m_eDataType;
-
-        // The size in pixels of a texture block (compression block if m_bCompressed is true, otherwise one pixel).
-        uint32 m_uBlockWidth;
-        uint32 m_uBlockHeight;
-        uint32 m_uBlockDepth;
-
-        // The size in bytes of a texture block (compression block if m_bCompressed is true, otherwise one pixel).
-        uint32 m_uNumBlockBytes;
-    };
-
-    // Identifies the possible format conversion procedures available
-    enum EGIFormatConversion
-    {
-        // A texture view is required to reinterpret the source format as the destination format
-        eGIFC_TEXTURE_VIEW,
-
-        // The depth channel of the source is mapped to the red channel of the destination
-        eGIFC_DEPTH_TO_RED,
-
-        // The stencil channel of the source is mapped to the red channel of the destination
-        eGIFC_STENCIL_TO_RED,
-
-        // The source format cannot be converted to the destination format
-        eGIFC_UNSUPPORTED,
-
-        // The source format can be used in place of the destination format without conversion
-        eGIFC_NONE
-    };
-
-    struct SGIFormatInfo
-    {
-        // Equivalent DXGI format
-        DXGI_FORMAT m_eDXGIFormat;
-
-        // Default supported usage mask for features/GL versions where support detection is not possible (union of D3D11_FORMAT_SUPPORT flags)
-        uint32 m_uDefaultSupport;
-
-        // Pointer to the texture information, or NULL if not a valid texture format
-        const STextureFormat* m_pTexture;
-
-        // Pointer to the uncompressed layout information, or NULL if compressed
-        const SUncompressedLayout* m_pUncompressed;
-
-        // Identifies the the compatible typeless format, or eGIF_NUM if no such format exists
-        EGIFormat m_eTypelessFormat;
-
-        // Describes how to convert to the compatible typeless format
-        EGIFormatConversion m_eTypelessConversion;
-
-        // The color channel swizzle modes required to map this format to the associated DXGI format
-        TSwizzleMask m_uDXGISwizzleMask;
-    };
-
-    extern const DXGI_FORMAT DXGI_FORMAT_INVALID;
-
-    // Finds the DXGI format corresponding to the given EGIFormat value.
-    // Returns DXGI_FORMAT_INVALID if the format was not found.
-    DXGI_FORMAT GetDXGIFormat(EGIFormat eGIFormat);
-
-    // Finds the DXGL EGIFormat value corresponding to the given DXGI_FORMAT.
-    // Returns eGIF_NUM if the given format is not supported.
-    EGIFormat GetGIFormat(DXGI_FORMAT eDXGIFormat);
-
-    // Gets the global format information for the given EGIFormat
-    const SGIFormatInfo* GetGIFormatInfo(EGIFormat eGIFormat);
-
-    // Converts a TSwizzleMask to red, green, blue and alpha texture swizzle modes
-    void SwizzleMaskToRGBA(TSwizzleMask uMask, GLint aiRGBA[4]);
-
-    // Converts a combination of red, green, blue and alpha texture swizzle modes to a TSwizzleMask
-    bool RGBAToSwizzleMask(const GLint aRGBA[4], TSwizzleMask& uMask);
-
-    // Tries to match a valid image format for a given EGIFormat value and returns true on success
-    bool GetImageFormat(EGIFormat eGIFormat, GLenum* peImageFormat);
-};
-
-
-#endif //__GLFORMAT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLInstrument.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLInstrument.hpp
deleted file mode 100644
index 5fd05368d9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLInstrument.hpp
+++ /dev/null
@@ -1,1115 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Wrappers for OpenGL function call data and error logging
-
-#ifndef __GLINSTRUMENT__
-#define __GLINSTRUMENT__
-
-#if defined(DXGL_USE_LOADER_GLAD)
-#   define DXGL_UNWRAPPED_FUNCTION(_Name) glad_ ## _Name
-#elif defined(DXGL_USE_LOADER_GLEW)
-#   define DXGL_UNWRAPPED_FUNCTION(_Name) __glew ## _Name
-#else
-#   error "Not implemented in this configuration"
-#endif //defined(DXGL_USE_LOADER_GLAD)
-
-namespace NCryOpenGL
-{
-    template <typename T>
-    struct Array
-    {
-        T* m_pElements;
-        size_t m_iSize;
-
-        Array(T* pElements, size_t iSize)
-            : m_pElements(pElements)
-            , m_iSize(iSize)
-        {
-        }
-    };
-
-#if DXGL_TRACE_CALLS
-
-    void CallTracePrintf(const char* szFormat, ...) PRINTF_PARAMS(1, 2);
-    void CallTraceFlush();
-
-    template <typename T>
-    inline void TraceValue(const T&) { CallTracePrintf("[?]"); }
-    template <typename T>
-    inline void TraceValue(const T*) { CallTracePrintf("[ptr]"); }
-    inline void TraceValue(char cValue)           { CallTracePrintf("%c", cValue); }
-    inline void TraceValue(unsigned int uValue)   { CallTracePrintf("%u", uValue); }
-    inline void TraceValue(int iValue)            { CallTracePrintf("%i", iValue); }
-    inline void TraceValue(uint64_t uValue)       { CallTracePrintf("%" PRIu64, uValue); }
-    inline void TraceValue(int64_t iValue)        { CallTracePrintf("%" PRId64, iValue); }
-    inline void TraceValue(double fValue)         { CallTracePrintf("%f", fValue); }
-    inline void TraceValue(unsigned short uValue) { TraceValue((unsigned int)uValue); }
-    inline void TraceValue(unsigned char uValue)  { TraceValue((unsigned int)uValue); }
-    inline void TraceValue(short iValue)          { TraceValue((int)iValue); }
-    inline void TraceValue(signed char iValue)    { TraceValue((int)iValue); }
-    inline void TraceValue(float fValue)          { TraceValue((double)fValue); }
-
-    template <typename T>
-    inline void TraceValue(const Array<T>& kArray)
-    {
-        CallTracePrintf("[");
-        for (size_t i = 0; i < kArray.m_iSize; ++i)
-        {
-            if (i > 0)
-            {
-                CallTracePrintf(", ");
-            }
-            TraceValue(kArray.m_pElements[i]);
-        }
-        CallTracePrintf("]");
-    }
-
-    inline void TraceFunction(const char* szName)
-    {
-        CallTracePrintf("%s(", szName);
-    }
-
-    template <typename T>
-    inline void TraceArgument(uint32 uIndex, const T& kValue)
-    {
-        if (uIndex > 0)
-        {
-            CallTracePrintf(", ");
-        }
-        TraceValue(kValue);
-    }
-
-    inline void TracePreArgument(uint32 uIndex, const char* szName)
-    {
-        if (uIndex > 0)
-        {
-            CallTracePrintf(", ");
-        }
-        CallTracePrintf("[%s]", szName);
-    }
-
-    template <typename T>
-    inline void TracePostArgument(const char* szName, const T& kValue)
-    {
-        CallTracePrintf(", %s = ", szName);
-        TraceValue(kValue);
-    }
-
-    inline void TraceCall()
-    {
-        CallTracePrintf(")");
-#if DXGL_TRACE_CALLS_FLUSH
-        CallTraceFlush();
-#endif
-    }
-
-    template <typename T>
-    inline void TraceReturn(const T& kValue)
-    {
-        CallTracePrintf(" = ");
-        TraceValue(kValue);
-#if DXGL_TRACE_CALLS_FLUSH
-        CallTraceFlush();
-#endif
-    }
-
-    inline void TraceNext()
-    {
-        CallTracePrintf("\n");
-    }
-
-#endif //DXGL_TRACE_CALLS
-
-#if DXGL_CHECK_ERRORS
-    void CheckErrors();
-#endif //DXGL_CHECK_ERRORS
-
-#if DXGL_TRACE_CALLS
-#   define TRACE_FUNCTION(_Name) TraceFunction(_Name)
-#   define TRACE_ARGUMENT(_Index, _Value) TraceArgument(_Index, _Value)
-#   define TRACE_PRE_ARGUMENT(_Index, _Name) TracePreArgument(_Index, _Name)
-#   define TRACE_POST_ARGUMENT(_Name, _Value) TracePostArgument(_Name, _Value)
-#   define TRACE_CALL() TraceCall()
-#   define TRACE_RETURN(_Value) TraceReturn(_Value)
-#   define TRACE_NEXT() TraceNext()
-#else
-#   define TRACE_FUNCTION(_Name)
-#   define TRACE_ARGUMENT(_Index, _Value)
-#   define TRACE_PRE_ARGUMENT(_Index, _Name)
-#   define TRACE_POST_ARGUMENT(_Name, _Value)
-#   define TRACE_CALL()
-#   define TRACE_RETURN(_Value)
-#   define TRACE_NEXT()
-#endif
-
-#if DXGL_CHECK_ERRORS
-#   define CHECK_ERRORS() CheckErrors()
-#else
-#   define CHECK_ERRORS()
-#endif
-
-
-    template <typename T>
-    struct Instrument
-    {
-        inline static void Call(const char* szName, void (pfCall)())
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_CALL();
-            pfCall();
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0>
-        inline static void Call(const char* szName, void (pfCall)(Arg0), Arg0 kArg0)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_CALL();
-            pfCall(kArg0);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1), Arg0 kArg0, Arg1 kArg1)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16, typename Arg17>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16, Arg17 kArg17)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_ARGUMENT(17, kArg17);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16, kArg17);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16, typename Arg17, typename Arg18>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16, Arg17 kArg17, Arg18 kArg18)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_ARGUMENT(17, kArg17);
-            TRACE_ARGUMENT(18, kArg18);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16, kArg17, kArg18);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16, typename Arg17, typename Arg18, typename Arg19>
-        inline static void Call(const char* szName, void (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16, Arg17 kArg17, Arg18 kArg18, Arg19 kArg19)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_ARGUMENT(17, kArg17);
-            TRACE_ARGUMENT(18, kArg18);
-            TRACE_ARGUMENT(19, kArg19);
-            TRACE_CALL();
-            pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16, kArg17, kArg18, kArg19);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-
-        template <typename Ret>
-        inline static Ret Call(const char* szName, Ret (pfCall)())
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_CALL();
-            Ret kResult = pfCall();
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0), Arg0 kArg0)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1), Arg0 kArg0, Arg1 kArg1)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16, typename Arg17>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16, Arg17 kArg17)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_ARGUMENT(17, kArg17);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16, kArg17);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16, typename Arg17, typename Arg18>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16, Arg17 kArg17, Arg18 kArg18)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_ARGUMENT(17, kArg17);
-            TRACE_ARGUMENT(18, kArg18);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16, kArg17, kArg18);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-
-        template <typename Ret, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9, typename Arg10, typename Arg11, typename Arg12, typename Arg13, typename Arg14, typename Arg15, typename Arg16, typename Arg17, typename Arg18, typename Arg19>
-        inline static Ret Call(const char* szName, Ret (pfCall)(Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19), Arg0 kArg0, Arg1 kArg1, Arg2 kArg2, Arg3 kArg3, Arg4 kArg4, Arg5 kArg5, Arg6 kArg6, Arg7 kArg7, Arg8 kArg8, Arg9 kArg9, Arg10 kArg10, Arg11 kArg11, Arg12 kArg12, Arg13 kArg13, Arg14 kArg14, Arg15 kArg15, Arg16 kArg16, Arg17 kArg17, Arg18 kArg18, Arg19 kArg19)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, kArg0);
-            TRACE_ARGUMENT(1, kArg1);
-            TRACE_ARGUMENT(2, kArg2);
-            TRACE_ARGUMENT(3, kArg3);
-            TRACE_ARGUMENT(4, kArg4);
-            TRACE_ARGUMENT(5, kArg5);
-            TRACE_ARGUMENT(6, kArg6);
-            TRACE_ARGUMENT(7, kArg7);
-            TRACE_ARGUMENT(8, kArg8);
-            TRACE_ARGUMENT(9, kArg9);
-            TRACE_ARGUMENT(10, kArg10);
-            TRACE_ARGUMENT(11, kArg11);
-            TRACE_ARGUMENT(12, kArg12);
-            TRACE_ARGUMENT(13, kArg13);
-            TRACE_ARGUMENT(14, kArg14);
-            TRACE_ARGUMENT(15, kArg15);
-            TRACE_ARGUMENT(16, kArg16);
-            TRACE_ARGUMENT(17, kArg17);
-            TRACE_ARGUMENT(18, kArg18);
-            TRACE_ARGUMENT(19, kArg19);
-            TRACE_CALL();
-            Ret kResult = pfCall(kArg0, kArg1, kArg2, kArg3, kArg4, kArg5, kArg6, kArg7, kArg8, kArg9, kArg10, kArg11, kArg12, kArg13, kArg14, kArg15, kArg16, kArg17, kArg18, kArg19);
-            TRACE_RETURN(kResult);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-            return kResult;
-        }
-    };
-
-    struct InstrumentCategoryGen
-    {
-        template <typename Count, typename Name>
-        inline static void Call(const char* szName, void (pfCall)(Count, Name*), Count iCount, Name* pNames)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, iCount);
-            TRACE_PRE_ARGUMENT(1, "names");
-            TRACE_CALL();
-            pfCall(iCount, pNames);
-            TRACE_POST_ARGUMENT("names", Array<Name>(pNames, iCount));
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-    };
-
-    struct InstrumentCategoryDelete
-    {
-        template <typename Count, typename Name>
-        inline static void Call(const char* szName, void (pfCall)(Count, Name*), Count iCount, Name* pNames)
-        {
-            TRACE_FUNCTION(szName);
-            TRACE_ARGUMENT(0, iCount);
-            TRACE_ARGUMENT(1, Array<Name>(pNames, iCount));
-            TRACE_CALL();
-            pfCall(iCount, pNames);
-            TRACE_NEXT();
-            CHECK_ERRORS();
-        }
-    };
-
-#undef TRACE_FUNCTION
-#undef TRACE_ARGUMENT
-#undef TRACE_CALL
-#undef TRACE_RETURN
-#undef TRACE_ERRORS
-}
-
-#define CUSTOM_INSTRUMENT(_Category, _Name)       \
-    struct glad_tag_ ## _Name;                    \
-    namespace NCryOpenGL                          \
-    {                                             \
-        template <>                               \
-        struct Instrument<glad_tag_ ## _Name>     \
-            : InstrumentCategory ## _Category {}; \
-    }
-
-CUSTOM_INSTRUMENT(Gen, glGenTextures)
-CUSTOM_INSTRUMENT(Gen, glGenQueries)
-CUSTOM_INSTRUMENT(Gen, glGenBuffers)
-CUSTOM_INSTRUMENT(Gen, glGenRenderbuffers)
-CUSTOM_INSTRUMENT(Gen, glGenFramebuffers)
-CUSTOM_INSTRUMENT(Gen, glGenVertexArrays)
-CUSTOM_INSTRUMENT(Gen, glGenSamplers)
-CUSTOM_INSTRUMENT(Gen, glGenTransformFeedbacks)
-CUSTOM_INSTRUMENT(Gen, glGenProgramPipelines)
-
-CUSTOM_INSTRUMENT(Delete, glDeleteTextures)
-CUSTOM_INSTRUMENT(Delete, glDeleteQueries)
-CUSTOM_INSTRUMENT(Delete, glDeleteBuffers)
-CUSTOM_INSTRUMENT(Delete, glDeleteRenderbuffers)
-CUSTOM_INSTRUMENT(Delete, glDeleteFramebuffers)
-CUSTOM_INSTRUMENT(Delete, glDeleteVertexArrays)
-CUSTOM_INSTRUMENT(Delete, glDeleteSamplers)
-CUSTOM_INSTRUMENT(Delete, glDeleteTransformFeedbacks)
-CUSTOM_INSTRUMENT(Delete, glDeleteProgramPipelines)
-
-#endif //__GLINSTRUMENT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLPlatform.hpp
deleted file mode 100644
index a7acee99ac..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLPlatform.hpp
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Platform specific DXGL requirements implementation
-
-
-#ifndef __GLPLATFORM__
-#define __GLPLATFORM__
-
-namespace NCryOpenGL
-{
-    enum ELogSeverity
-    {
-        eLS_Info,
-        eLS_Warning,
-        eLS_Error
-    };
-}
-
-#define CUSTOM_SCOPED_PROFILE(_Name)
-
-#if defined(OPENGL)
-#include "GLCryPlatform.hpp"
-#elif defined(WIN32)
-#include "../Standalone/GLWinPlatform.hpp"
-#elif defined(LINUX)
-#include "../Standalone/GLLinuxPlatform.hpp"
-#else
-#error "Platform is not supported"
-#endif
-
-#define DXGL_PROFILING 0
-
-#if defined(AZ_COMPILER_MSVC)
-#define _DXGL_LOG_STRINGIFY_(x) #x
-#define _DXGL_LOG_STRINGIFY(x) _DXGL_LOG_STRINGIFY_(x)
-#define _DXGL_LOG_MSG(_TEXT, _FILE, _LINE, _FUNC) "DXGL: " _TEXT " : [@" _FUNC "] " _FILE "(" _LINE ")"
-#define DXGL_LOG_MSG(_TEXT) _DXGL_LOG_MSG(_TEXT, __FILE__, _DXGL_LOG_STRINGIFY(__LINE__), __FUNCSIG__)
-#else
-#define _DXGL_LOG_MSG(_TEXT, _FILE, _FUNC) "DXGL: " _TEXT " : [@" _FUNC "] " _FILE "(%d)"
-#define DXGL_LOG_MSG(_TEXT) _DXGL_LOG_MSG(_TEXT, __FILE__, "?") // GCC can't resolve __FUNCTION__ in  the preprocessor
-#endif
-
-#if defined(_MSC_VER)
-#define DXGL_WARNING(_Format, ...) NCryOpenGL::LogMessage(NCryOpenGL::eLS_Warning, DXGL_LOG_MSG(_Format), __VA_ARGS__)
-#define DXGL_ERROR(_Format, ...)   NCryOpenGL::LogMessage(NCryOpenGL::eLS_Error,   DXGL_LOG_MSG(_Format), __VA_ARGS__)
-#define DXGL_INFO(_Format, ...)    NCryOpenGL::LogMessage(NCryOpenGL::eLS_Info,    DXGL_LOG_MSG(_Format), __VA_ARGS__)
-#else
-#define DXGL_WARNING(_Format, ...) NCryOpenGL::LogMessage(NCryOpenGL::eLS_Warning, DXGL_LOG_MSG(_Format), ##__VA_ARGS__, __LINE__)
-#define DXGL_ERROR(_Format, ...)   NCryOpenGL::LogMessage(NCryOpenGL::eLS_Error,   DXGL_LOG_MSG(_Format), ##__VA_ARGS__, __LINE__)
-#define DXGL_INFO(_Format, ...)    NCryOpenGL::LogMessage(NCryOpenGL::eLS_Info,    DXGL_LOG_MSG(_Format), ##__VA_ARGS__, __LINE__)
-#endif
-
-#define DXGL_NOT_IMPLEMENTED NCryOpenGL::BreakUnique(__FILE__, __LINE__, __func__);
-
-
-#define DXGL_TODO(_DESC)
-
-#define DXGL_ARRAY_SIZE(_Array) (sizeof(_Array) / sizeof(_Array[0]))
-#define _DXGL_QUOTE(X) #X
-#define DXGL_QUOTE(X) _DXGL_QUOTE(X)
-#define DXGL_CAT(_Left, _Right) _Left ## _Right
-#define _DXGL_IF_0(...)
-#define _DXGL_IF_1(...) __VA_ARGS__
-#define DXGL_IF(_Condition) DXGL_CAT(_DXGL_IF_, _Condition)
-
-#define DXGL_DECLARE_PTR(_Qualifier, _TypeName) \
-    _Qualifier _TypeName;                       \
-    typedef _smart_ptr<_TypeName> _TypeName ## Ptr;
-#define DXGL_DECLARE_REF_COUNTED(_Qualifier, _TypeName) \
-    DXGL_DECLARE_PTR(_Qualifier, _TypeName)             \
-    _Qualifier _TypeName: public NCryOpenGL::SRefCounted < _TypeName >
-
-namespace NCryOpenGL
-{
-    template <typename T>
-    struct SRefCounted
-    {
-        uint32 m_uRefCnt;
-
-        SRefCounted()
-            : m_uRefCnt(0)
-        {
-        }
-
-        void AddRef()
-        {
-            ++m_uRefCnt;
-        }
-
-        void Release()
-        {
-            if (--m_uRefCnt == 0)
-            {
-                delete static_cast<T*>(this);
-            }
-        }
-    };
-
-    struct SSpinlockBitMaskWord
-    {
-        typedef LONG Word;
-        enum
-        {
-            BIT_SIZE = sizeof(Word) * 8
-        };
-        volatile Word m_aMask;
-
-        void Set(Word kNewValue)
-        {
-            Exchange(&m_aMask, kNewValue);
-        }
-
-        Word Get() const
-        {
-            return CompareExchange(const_cast<Word*>(&m_aMask), 0, 0);
-        }
-
-        bool Set(uint32 uIndex, bool bFlag)
-        {
-            while (true)
-            {
-                Word kOld(m_aMask);
-                Word uFlagMask(1 << uIndex);
-                Word kNew(bFlag ? (kOld | uFlagMask) : (kOld & ~uFlagMask));
-                if (CompareExchange(&m_aMask, kNew, kOld) == kOld)
-                {
-                    return (kOld & uFlagMask) != 0;
-                }
-            }
-        }
-
-        bool Get(uint32 uIndex) const
-        {
-            assert(uIndex <= BIT_SIZE);
-            return ((m_aMask >> uIndex) & 1) != 0;
-        }
-    };
-
-    struct SUnsafeBitMaskWord
-    {
-        typedef uint32 Word;
-        enum
-        {
-            BIT_SIZE = sizeof(Word) * 8
-        };
-        Word m_aMask;
-
-        void Set(Word kNewValue)
-        {
-            m_aMask = kNewValue;
-        }
-
-        Word Get() const
-        {
-            return m_aMask;
-        }
-
-        bool Set(uint32 uIndex, bool bFlag)
-        {
-            assert(uIndex <= BIT_SIZE);
-            Word uFlagMask(1 << uIndex);
-            Word kOld(m_aMask);
-            m_aMask = bFlag ? (kOld | uFlagMask) : (kOld & ~uFlagMask);
-            return (kOld & uFlagMask) != 0;
-        }
-
-        bool Get(uint32 uIndex) const
-        {
-            assert(uIndex <= BIT_SIZE);
-            return ((m_aMask >> uIndex) & 1) != 0;
-        }
-    };
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    struct SBitMaskMultiWord
-    {
-        typedef BitMaskWord Word;
-        Word m_akWords[uNumWords];
-
-        bool Set(uint32 uIndex, bool bFlag)
-        {
-            return m_akWords[uIndex / Word::BIT_SIZE].Set(uIndex % Word::BIT_SIZE, bFlag);
-        }
-
-        bool Get(uint32 uIndex) const
-        {
-            return m_akWords[uIndex / Word::BIT_SIZE].Get(uIndex % Word::BIT_SIZE);
-        }
-    };
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    struct SBitMaskImpl
-    {
-        typedef SBitMaskMultiWord<uNumWords, BitMaskWord> Type;
-        typedef typename BitMaskWord::Word Word;
-
-        static void Init(Type* pMask, bool bValue, Word kUsedMask)
-        {
-            memset(pMask->m_akWords, bValue ? (Word) ~0 : (Word)0, sizeof(Word) * (uNumWords - 1));
-            pMask->m_akWords[uNumWords - 1].m_aMask = bValue ? kUsedMask : (Word)0;
-        }
-
-        static void SetZero(Type* pMask)
-        {
-            for (uint32 uPosition = 0; uPosition < uNumWords; ++uPosition)
-            {
-                pMask->m_akWords[uPosition].Set((Word)0);
-            }
-        }
-
-        static void SetOne(Type* pMask, Word kUsedMask)
-        {
-            for (uint32 uPosition = 0; uPosition < uNumWords - 1; ++uPosition)
-            {
-                pMask->m_akWords[uPosition].Set(~(Word)0);
-            }
-            pMask->m_akWords[uNumWords - 1].Set(kUsedMask);
-        }
-
-        static bool IsZero(Type* pMask, Word kUsedMask)
-        {
-            for (uint32 uPosition = 0; uPosition < uNumWords - 1; ++uPosition)
-            {
-                if (pMask->m_akWords[uPosition].Get() != (Word)0)
-                {
-                    return false;
-                }
-            }
-            return (pMask->m_akWords[uNumWords - 1].Get() & kUsedMask) == (Word)0;
-        }
-
-        static bool IsOne(Type* pMask, Word kUsedMask)
-        {
-            for (uint32 uPosition = 0; uPosition < uNumWords - 1; ++uPosition)
-            {
-                if (pMask->m_akWords[uPosition].Get() != ~(Word)0)
-                {
-                    return false;
-                }
-            }
-            return (pMask->m_akWords[uNumWords - 1].Get() & kUsedMask) == kUsedMask;
-        }
-
-        static void BitwiseOr(BitMaskWord* pResult, const BitMaskWord& kLeft, const BitMaskWord& kRight)
-        {
-            for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-            {
-                pResult->m_akWords[uIndex].Set(kLeft.m_akWords[uIndex].Get() | kRight.m_akWords[uIndex].Get());
-            }
-        }
-
-        static void BitwiseAnd(BitMaskWord* pResult, const BitMaskWord& kLeft, const BitMaskWord& kRight)
-        {
-            for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-            {
-                pResult->m_akWords[uIndex].Set(kLeft.m_akWords[uIndex].Get() & kRight.m_akWords[uIndex].Get());
-            }
-        }
-
-        static bool Equals(const BitMaskWord& kLeft, const BitMaskWord& kRight)
-        {
-            for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-            {
-                if (kLeft.m_akWords[uIndex].Get() != kRight.m_akWords[uIndex].Get())
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        static void Copy(BitMaskWord* pDestination, const BitMaskWord& kSource)
-        {
-            for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-            {
-                pDestination->m_akWords[uIndex].Set(kSource.m_akWords[uIndex].Get());
-            }
-        }
-    };
-
-    template <typename BitMaskWord>
-    struct SBitMaskImpl<1, BitMaskWord>
-    {
-        typedef BitMaskWord Type;
-        typedef typename BitMaskWord::Word Word;
-
-        static void Init(Type* pMask, bool bValue, Word kUsedMask)
-        {
-            pMask->m_aMask = bValue ? kUsedMask : (Word)0;
-        }
-
-        static void SetZero(Type* pMask)
-        {
-            pMask->Set((Word)0);
-        }
-
-        static void SetOne(Type* pMask, Word kUsedMask)
-        {
-            pMask->Set(kUsedMask);
-        }
-
-        static bool IsZero(const Type* pMask, Word kUsedMask)
-        {
-            return (pMask->Get() & kUsedMask) == (Word)0;
-        }
-
-        static bool IsOne(const Type* pMask, Word kUsedMask)
-        {
-            return (pMask->Get() & kUsedMask) == kUsedMask;
-        }
-
-        static void BitwiseOr(Type* pResult, const Type& kLeft, const Type& kRight)
-        {
-            pResult->Set(kLeft.Get() | kRight.Get());
-        }
-
-        static void BitwiseAnd(Type* pResult, const Type& kLeft, const Type& kRight)
-        {
-            pResult->Set(kLeft.Get() & kRight.Get());
-        }
-
-        static bool Equals(const Type& kLeft, const Type& kRight)
-        {
-            return kLeft.Get() == kRight.Get();
-        }
-
-        static void Copy(Type* pDestination, const Type& kSource)
-        {
-            pDestination->Set(kSource.Get());
-        }
-    };
-
-    template <uint32 uSize, typename BitMaskWord>
-    struct SBitMask
-        : SBitMaskImpl<(uSize + BitMaskWord::BIT_SIZE - 1) / BitMaskWord::BIT_SIZE, BitMaskWord>::Type
-    {
-        typedef SBitMaskImpl<(uSize + BitMaskWord::BIT_SIZE - 1) / BitMaskWord::BIT_SIZE, BitMaskWord> Impl;
-        typedef typename BitMaskWord::Word Word;
-        enum
-        {
-            USED_MASK = ~(~(Word)0 << uSize % BitMaskWord::BIT_SIZE)
-        };
-
-        // The following methods are not thread safe regardless of the BitMaskWord type
-
-        SBitMask(bool bInitValue = false)
-        {
-            Impl::Init(this, bInitValue, (Word)USED_MASK);
-        }
-
-        SBitMask(const SBitMask& kOther)
-        {
-            Impl::Copy(this, kOther);
-        }
-
-        void SetZero()
-        {
-            return Impl::SetZero(this);
-        }
-
-        void SetOne()
-        {
-            return Impl::SetOne(this, (Word)USED_MASK);
-        }
-
-        bool IsZero() const
-        {
-            return Impl::IsZero(this, (Word)USED_MASK);
-        }
-
-        bool IsOne() const
-        {
-            return Impl::IsOne(this, (Word)USED_MASK);
-        }
-
-        SBitMask& operator|=(const SBitMask& kOther)
-        {
-            Impl::BitwiseOr(this, *this, kOther);
-            return *this;
-        }
-
-        SBitMask& operator&=(const SBitMask& kOther)
-        {
-            Impl::BitwiseAnd(this, *this, kOther);
-            return *this;
-        }
-
-        SBitMask operator|(const SBitMask& kOther) const
-        {
-            SBitMask kResult;
-            Impl::BitwiseOr(&kResult, *this, kOther);
-            return kResult;
-        }
-
-        SBitMask operator&(const SBitMask& kOther) const
-        {
-            SBitMask kResult;
-            Impl::BitwiseAnd(&kResult, *this, kOther);
-            return kResult;
-        }
-
-        bool operator==(const SBitMask& kOther) const
-        {
-            return Impl::Equals(*this, kOther);
-        }
-
-        bool operator!=(const SBitMask& kOther) const
-        {
-            return !Impl::Equals(*this, kOther);
-        }
-
-        SBitMask& operator=(const SBitMask& kOther)
-        {
-            Impl::Copy(this, kOther);
-            return *this;
-        }
-    };
-
-    inline void* CreateTLS()
-    {
-#if defined(WIN32)
-        return alias_cast<void*>(TlsAlloc());
-#elif AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
-        pthread_key_t* pKey(new pthread_key_t());
-        pthread_key_create(pKey, NULL);
-        return alias_cast<void*>(pKey);
-#else
-#error "Not implemented on this platform"
-#endif
-    }
-
-    inline void DestroyTLS(void* pTLSHandle)
-    {
-#if defined(WIN32)
-        TlsFree(alias_cast<DWORD>(pTLSHandle));
-#elif AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
-        pthread_key_t* pKey(alias_cast<pthread_key_t*>(pTLSHandle));
-        pthread_key_delete(*pKey);
-#else
-#error "Not implemented on this platform"
-#endif
-    }
-
-    inline void* GetTLSValue(void* pTLSHandle)
-    {
-#if defined(WIN32)
-        return TlsGetValue(alias_cast<DWORD>(pTLSHandle));
-#elif AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
-        return pthread_getspecific(*alias_cast<pthread_key_t*>(pTLSHandle));
-#else
-#error "Not implemented on this platform"
-#endif
-    }
-
-    inline void SetTLSValue(void* pTLSHandle, void* pValue)
-    {
-#if defined(WIN32)
-        TlsSetValue(alias_cast<DWORD>(pTLSHandle), pValue);
-#elif AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
-        pthread_setspecific(*alias_cast<pthread_key_t*>(pTLSHandle), pValue);
-#else
-#error "Not implemented on this platform"
-#endif
-    }
-
-    struct SList
-    {
-        typedef SLockFreeSingleLinkedListHeader TListHeader;
-        typedef SLockFreeSingleLinkedListEntry TListEntry;
-
-        SList()
-        {
-            CryInitializeSListHead(m_kHeader);
-        }
-
-        void Push(TListEntry& kEntry)
-        {
-            CryInterlockedPushEntrySList(m_kHeader, kEntry);
-        }
-
-        TListEntry* Pop()
-        {
-            return alias_cast<TListEntry*>(CryInterlockedPopEntrySList(m_kHeader));
-        }
-
-        TListHeader m_kHeader;
-    };
-
-    struct SScopedProfileLabel
-    {
-        const char* m_szName;
-
-        SScopedProfileLabel(const char* szName)
-            : m_szName(szName)
-        {
-            PushProfileLabel(m_szName);
-        }
-
-        ~SScopedProfileLabel()
-        {
-            PopProfileLabel(m_szName);
-        }
-    };
-}
-
-#if DXGL_PROFILING
-#define DXGL_SCOPED_PROFILE(_Name) NCryOpenGL::SScopedProfileLabel kDXGLScopedProfileLabel(_Name);
-#else
-#define DXGL_SCOPED_PROFILE(_Name)
-#endif
-
-#endif //__GLPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLResource.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLResource.cpp
deleted file mode 100644
index ae6d6b8f4e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLResource.cpp
+++ /dev/null
@@ -1,3973 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implements the resource related functions
-
-
-#include "RenderDll_precompiled.h"
-#include "GLResource.hpp"
-#include "GLContext.hpp"
-#include "GLDevice.hpp"
-#include "GLView.hpp"
-
-#define DXGL_USE_IMMUTABLE_TEXTURES !DXGL_SUPPORT_NSIGHT_SINCE(3_0)
-#define DXGL_CHECK_TEXTURE_UPLOAD_READ_BOUNDS 0
-#define DXGL_LOG_TEXTURE_SIZES 0
-#define DXGL_SERVER_SIDE_SHARED_OBJECT_SYNCHRONIZATION 1
-#define DXGL_PREVENT_NVIDIA_SUB_BUFFER_DATA_SYNCHRONIZATION 1
-
-// NVidia NSight supports only OpenGL 4.2 API. The NamedFramebuffer functions are OpenGL 4.5
-// and so captures fail when they are used. Change this define to 1 to enable the game to run
-// with NSight and be able to get captures
-#define USE_NVIDIA_NISGHT 0
-
-namespace NCryOpenGL
-{
-    enum
-    {
-        MIN_MAPPED_RESOURCE_ALIGNMENT = 64, // DX10+ mapped resources are 16-aligned but GL_ARB_map_buffer_alignment ensures 64-alignment for AVX
-        MAX_UNPACK_ALIGNMENT = 8,
-        MAX_PACK_ALIGNMENT = 8
-    };
-
-    uint32 GetRowPitch(uint32 uWidth, uint32 uRowBytes, const SGIFormatInfo* pFormatInfo)
-    {
-        uint32 uNumElementsPerRow(uRowBytes * pFormatInfo->m_pTexture->m_uBlockWidth / pFormatInfo->m_pTexture->m_uNumBlockBytes);
-        return uNumElementsPerRow == uWidth ? 0 : uNumElementsPerRow;
-    }
-
-    uint32 GetImagePitch(uint32 uHeight, uint32 uImageBytes, uint32 uRowBytes)
-    {
-        uint32 uNumRowsPerImage(uImageBytes / uRowBytes);
-        return uNumRowsPerImage == uHeight ? 0 : uNumRowsPerImage;
-    }
-
-    struct STexBox
-    {
-        STexPos m_kOffset;
-        STexSize m_kSize;
-    };
-
-    struct SPackedLayout
-    {
-        uint32 m_uRowPitch;
-        uint32 m_uImagePitch;
-        uint32 m_uTextureSize;
-    };
-
-    static GLint GetMaxMipLevels(const D3D11_TEXTURE1D_DESC& kTexDesc)
-    {
-        return (GLint)IntegerLog2(kTexDesc.Width);
-    }
-
-    static GLint GetMaxMipLevels(const D3D11_TEXTURE2D_DESC& kTexDesc)
-    {
-        return (GLint)max(IntegerLog2(kTexDesc.Width), IntegerLog2(kTexDesc.Height));
-    }
-
-    static GLint GetMaxMipLevels(const D3D11_TEXTURE3D_DESC& kTexDesc)
-    {
-        return (GLint)max(max(IntegerLog2(kTexDesc.Width), IntegerLog2(kTexDesc.Height)), IntegerLog2(kTexDesc.Depth));
-    }
-
-    template <typename TextureDesc>
-    static GLint GetNumMipLevels(const TextureDesc& kTexDesc)
-    {
-        return kTexDesc.MipLevels != 0 ? kTexDesc.MipLevels : GetMaxMipLevels(kTexDesc);
-    }
-
-    static STexSize GetMipSize(STexture* pTexture, GLint iLevel, const SGIFormatInfo* pFormat, bool bClampToBlockSize)
-    {
-        STexSize kMinSize(1, 1, 1);
-        if (bClampToBlockSize && pFormat->m_pTexture->m_bCompressed)
-        {
-            kMinSize = STexSize(
-                    pFormat->m_pTexture->m_uBlockWidth,
-                    pFormat->m_pTexture->m_uBlockHeight,
-                    pFormat->m_pTexture->m_uBlockDepth);
-        }
-
-        return STexSize(
-            max(kMinSize.x, pTexture->m_iWidth >> iLevel),
-            max(kMinSize.y, pTexture->m_iHeight >> iLevel),
-            max(kMinSize.z, pTexture->m_iDepth >> iLevel));
-    }
-
-    void GetTextureBox(STexBox& kTexBox, STexture* pTexture, GLint iLevel, const SGIFormatInfo* pFormat, bool bClampToBlockSize)
-    {
-        kTexBox.m_kOffset = STexPos(0, 0, 0);
-        kTexBox.m_kSize = GetMipSize(pTexture, iLevel, pFormat, bClampToBlockSize);
-    }
-
-    void GetTextureBox(STexBox& kTexBox, STexture* pTexture, GLint iLevel, const D3D11_BOX* pBox, const SGIFormatInfo* pFormat, bool bClampToBlockSize)
-    {
-        if (pBox != NULL)
-        {
-            kTexBox.m_kOffset = STexPos(pBox->left, pBox->top, pBox->front);
-            kTexBox.m_kSize = STexSize(pBox->right - pBox->left, pBox->bottom - pBox->top, pBox->back - pBox->front);
-        }
-        else
-        {
-            GetTextureBox(kTexBox, pTexture, iLevel, pFormat, bClampToBlockSize);
-        }
-    }
-
-    SOutputMergerTextureViewPtr GetCopyOutputMergerView(STexture* pTexture, STexSubresourceID kSubID, CContext* pContext, const SGIFormatInfo* pFormatInfo)
-    {
-        uint32 uSubresource(D3D11CalcSubresource(kSubID.m_iMipLevel, kSubID.m_uElement, pTexture->m_uNumMipLevels));
-
-        DXGL_TODO("This is not thread-safe, as multiple threads can use the same texture as source/destination of copies. Add synchronization primitive.");
-
-        if (pTexture->m_kCopySubTextureViews.size() <= uSubresource)
-        {
-            pTexture->m_kCopySubTextureViews.resize(uSubresource + 1);
-        }
-        SOutputMergerTextureViewPtr spOMView(pTexture->m_kCopySubTextureViews.at(uSubresource));
-        if (spOMView == NULL)
-        {
-            spOMView = pTexture->GetCompatibleOutputMergerView(
-                    SOutputMergerTextureViewConfiguration(pTexture->m_eFormat, kSubID.m_iMipLevel, kSubID.m_uElement, 1),
-                    pContext);
-            pTexture->m_kCopySubTextureViews.at(uSubresource) = spOMView;
-        }
-
-        return spOMView;
-    }
-
-    struct STex1DBase
-    {
-        static GLsizei GetBCImageSize(STexSize kSize, const STextureFormat* pTexFormat)
-        {
-            return pTexFormat->m_uNumBlockBytes *
-                   ((kSize.x + pTexFormat->m_uBlockWidth - 1) / pTexFormat->m_uBlockWidth);
-        }
-    };
-
-    struct STex2DBase
-    {
-        static GLsizei GetBCImageSize(STexSize kSize, const STextureFormat* pTexFormat)
-        {
-            return pTexFormat->m_uNumBlockBytes *
-                   ((kSize.x + pTexFormat->m_uBlockWidth  - 1) / pTexFormat->m_uBlockWidth) *
-                   ((kSize.y + pTexFormat->m_uBlockHeight - 1) / pTexFormat->m_uBlockHeight);
-        }
-    };
-
-    struct STex3DBase
-    {
-        static GLsizei GetBCImageSize(STexSize kSize, const STextureFormat* pTexFormat)
-        {
-            return pTexFormat->m_uNumBlockBytes *
-                   ((kSize.x + pTexFormat->m_uBlockWidth  - 1) / pTexFormat->m_uBlockWidth) *
-                   ((kSize.y + pTexFormat->m_uBlockHeight - 1) / pTexFormat->m_uBlockHeight) *
-                   ((kSize.z + pTexFormat->m_uBlockDepth  - 1) / pTexFormat->m_uBlockDepth);
-        }
-    };
-
-    struct SDefaultTexBase
-    {
-        static void AllocateResource(STexture* pTexture, CDevice* pDevice)
-        {
-            GLuint uName;
-            glGenTextures(1, &uName);
-            pTexture->m_kName = pDevice->GetTextureNamePool().Create(uName);
-        }
-    };
-
-    struct SDefaultTex1DBase
-        : SDefaultTexBase
-        , STex1DBase
-    {
-        static void TexStorage(STexture* pTexture, STexSize kSize, GLsizei iLevels, const STextureFormat* pTexFormat)
-        {
-            glTextureStorage1DEXT(pTexture->m_kName.GetName(), pTexture->m_eTarget, iLevels, pTexFormat->m_iInternalFormat, kSize.x);
-        }
-
-        static void ApplyUnpackState(CContext* pContext, STexSize kSize, uint32 uLogDataAlignment, uint32 uRowPitch, uint32, const SGIFormatInfo* pFormat)
-        {
-            pContext->SetUnpackAlignment(min((int)MAX_UNPACK_ALIGNMENT, 1 << uLogDataAlignment));
-        }
-
-        static void ApplyPackState(CContext* pContext, STexSize kSize, uint32 uLogDataAlignment, uint32 uRowPitch, uint32, const SGIFormatInfo* pFormat)
-        {
-            pContext->SetPackAlignment(min((int)MAX_PACK_ALIGNMENT, 1 << uLogDataAlignment));
-        }
-    };
-
-    struct SDefaultTex2DBase
-        : SDefaultTexBase
-        , STex2DBase
-    {
-        typedef SDefaultTex1DBase TArrayElement;
-
-        static void TexStorage(STexture* pTexture, STexSize kSize, GLsizei iLevels, const STextureFormat* pTexFormat)
-        {
-            glTextureStorage2DEXT(pTexture->m_kName.GetName(), pTexture->m_eTarget, iLevels, pTexFormat->m_iInternalFormat, kSize.x, kSize.y);
-
-            if ((pTexFormat->m_iInternalFormat == GL_DEPTH32F_STENCIL8) ||
-                (pTexFormat->m_iInternalFormat == GL_DEPTH_COMPONENT32F) ||
-                (pTexFormat->m_iInternalFormat == GL_DEPTH24_STENCIL8) ||
-                (pTexFormat->m_iInternalFormat == GL_DEPTH_COMPONENT16) ||
-                (pTexFormat->m_iInternalFormat == GL_R16UI) ||
-                (pTexFormat->m_iInternalFormat == GL_RG16UI) ||
-                (pTexFormat->m_iInternalFormat == GL_RGB10_A2UI))
-            {
-                glTextureParameteriEXT(pTexture->m_kName.GetName(), pTexture->m_eTarget, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-                glTextureParameteriEXT(pTexture->m_kName.GetName(), pTexture->m_eTarget, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-            }
-        }
-
-        static void ApplyUnpackState(CContext* pContext, STexSize kSize, uint32 uLogDataAlignment, uint32 uRowPitch, uint32, const SGIFormatInfo* pFormat)
-        {
-            pContext->SetUnpackRowLength(GetRowPitch(kSize.x, uRowPitch, pFormat));
-            pContext->SetUnpackAlignment(min((int)MAX_UNPACK_ALIGNMENT, 1 << min(uLogDataAlignment, (uint32)countTrailingZeroes(uRowPitch))));
-        }
-
-        static void ApplyPackState(CContext* pContext, STexSize kSize, uint32 uLogDataAlignment, uint32 uRowPitch, uint32, const SGIFormatInfo* pFormat)
-        {
-            pContext->SetPackRowLength(GetRowPitch(kSize.x, uRowPitch, pFormat));
-            pContext->SetPackAlignment(min((int)MAX_PACK_ALIGNMENT, 1 << min(uLogDataAlignment, (uint32)countTrailingZeroes(uRowPitch))));
-        }
-
-        template <typename T>
-        static void SetLayerComponent(STexVec<T>& kVec, T kLayer)
-        {
-            kVec.y = kLayer;
-        }
-    };
-
-    struct SDefaultTex3DBase
-        : SDefaultTexBase
-        , STex3DBase
-    {
-        typedef SDefaultTex2DBase TArrayElement;
-
-        static void TexStorage(STexture* pTexture, STexSize kSize, GLsizei iLevels, const STextureFormat* pTexFormat)
-        {
-            glTextureStorage3DEXT(pTexture->m_kName.GetName(), pTexture->m_eTarget, iLevels, pTexFormat->m_iInternalFormat, kSize.x, kSize.y, kSize.z);
-        }
-
-        static void ApplyUnpackState(CContext* pContext, STexSize kSize, uint32 uLogDataAlignment, uint32 uRowPitch, uint32 uImagePitch, const SGIFormatInfo* pFormat)
-        {
-            pContext->SetUnpackRowLength(GetRowPitch(kSize.x, uRowPitch, pFormat));
-            pContext->SetUnpackImageHeight(GetImagePitch(kSize.y, uImagePitch, uRowPitch));
-            pContext->SetUnpackAlignment(min((int)MAX_UNPACK_ALIGNMENT, 1 << min(uLogDataAlignment, (uint32)min(countTrailingZeroes(uRowPitch), countTrailingZeroes(uImagePitch)))));
-        }
-
-        static void ApplyPackState(CContext* pContext, STexSize kSize, uint32 uLogDataAlignment, uint32 uRowPitch, uint32 uImagePitch, const SGIFormatInfo* pFormat)
-        {
-            pContext->SetPackRowLength(GetRowPitch(kSize.x, uRowPitch, pFormat));
-            pContext->SetPackImageHeight(GetImagePitch(kSize.y, uImagePitch, uRowPitch));
-            pContext->SetPackAlignment(min((int)MAX_PACK_ALIGNMENT, 1 << min(uLogDataAlignment, (uint32)min(countTrailingZeroes(uRowPitch), countTrailingZeroes(uImagePitch)))));
-        }
-
-        template <typename T>
-        static void SetLayerComponent(STexVec<T>& kVec, T kLayer)
-        {
-            kVec.z = kLayer;
-        }
-    };
-
-    struct STexCompressed
-    {
-#if DXGL_SUPPORT_GETTEXIMAGE
-        static void GetTexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, GLvoid* pData, CContext*, const SGIFormatInfo*)
-        {
-            glGetCompressedTextureImageEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pData);
-        }
-#endif //DXGL_SUPPORT_GETTEXIMAGE
-
-        static bool GetPackedRange(const STexBox& kPixels, STexBox* pPackedRange, const SGIFormatInfo* pFormat)
-        {
-            const STextureFormat* pTexFormat(pFormat->m_pTexture);
-            if ((kPixels.m_kOffset.x % pTexFormat->m_uBlockWidth)  != 0 ||
-                (kPixels.m_kOffset.y % pTexFormat->m_uBlockHeight) != 0 ||
-                (kPixels.m_kOffset.z % pTexFormat->m_uBlockDepth)  != 0 ||
-                (kPixels.m_kSize.x   % pTexFormat->m_uBlockWidth)  != 0 ||
-                (kPixels.m_kSize.y   % pTexFormat->m_uBlockHeight) != 0 ||
-                (kPixels.m_kSize.z   % pTexFormat->m_uBlockDepth)  != 0)
-            {
-                return false;
-            }
-
-            pPackedRange->m_kOffset.x = pTexFormat->m_uNumBlockBytes * kPixels.m_kOffset.x / pTexFormat->m_uBlockWidth;
-            pPackedRange->m_kSize.x   = pTexFormat->m_uNumBlockBytes * kPixels.m_kSize.x   / pTexFormat->m_uBlockWidth;
-
-            pPackedRange->m_kOffset.y = kPixels.m_kOffset.y / pTexFormat->m_uBlockHeight;
-            pPackedRange->m_kSize.y   = kPixels.m_kSize.y   / pTexFormat->m_uBlockHeight;
-
-            pPackedRange->m_kOffset.z = kPixels.m_kOffset.z / pTexFormat->m_uBlockDepth;
-            pPackedRange->m_kSize.z   = kPixels.m_kSize.z   / pTexFormat->m_uBlockDepth;
-            return true;
-        }
-    };
-
-    struct STexUncompressed
-    {
-#if DXGL_SUPPORT_GETTEXIMAGE
-        static void GetTexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, GLvoid* pData, CContext* pContext, const SGIFormatInfo* pFormatInfo)
-        {
-            glGetTextureImageEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pFormatInfo->m_pTexture->m_eBaseFormat, pFormatInfo->m_pTexture->m_eDataType, pData);
-        }
-#endif //DXGL_SUPPORT_GETTEXIMAGE
-
-        static bool GetPackedRange(const STexBox& kPixels, STexBox* pPackedRange, const SGIFormatInfo* pFormat)
-        {
-            uint32 uPixelBytes(pFormat->m_pTexture->m_uNumBlockBytes);
-
-            pPackedRange->m_kOffset.x = kPixels.m_kOffset.x * uPixelBytes;
-            pPackedRange->m_kSize.x   = kPixels.m_kSize.x   * uPixelBytes;
-
-            pPackedRange->m_kOffset.y = kPixels.m_kOffset.y;
-            pPackedRange->m_kSize.y   = kPixels.m_kSize.y;
-
-            pPackedRange->m_kOffset.z = kPixels.m_kOffset.z;
-            pPackedRange->m_kSize.z   = kPixels.m_kSize.z;
-            return true;
-        }
-    };
-
-    struct STex1DUncompressed
-        : SDefaultTex1DBase
-        , STexUncompressed
-    {
-        static void TexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexSize kSize, GLint iBorder, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glTextureImage1DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pTexFormat->m_iInternalFormat, kSize.x, iBorder, pTexFormat->m_eBaseFormat, pTexFormat->m_eDataType, pData);
-        }
-
-        static void TexSubImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glTextureSubImage1DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, kBox.m_kOffset.x, kBox.m_kSize.x, pTexFormat->m_eBaseFormat, pTexFormat->m_eDataType, pData);
-        }
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = kRect.x * pFormat->m_pTexture->m_uNumBlockBytes;
-            pLayout->m_uImagePitch  = pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = pLayout->m_uRowPitch;
-        }
-    };
-
-    struct STex2DUncompressed
-        : SDefaultTex2DBase
-        , STexUncompressed
-    {
-        static void TexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexSize kSize, GLint iBorder, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glTextureImage2DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pTexFormat->m_iInternalFormat, kSize.x, kSize.y, iBorder, pTexFormat->m_eBaseFormat, pTexFormat->m_eDataType, pData);
-        }
-
-        static void TexSubImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glTextureSubImage2DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, kBox.m_kOffset.x, kBox.m_kOffset.y, kBox.m_kSize.x, kBox.m_kSize.y, pTexFormat->m_eBaseFormat, pTexFormat->m_eDataType, pData);
-        }
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = kRect.x * pFormat->m_pTexture->m_uNumBlockBytes;
-            pLayout->m_uImagePitch  = kRect.y * pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = pLayout->m_uImagePitch;
-        }
-    };
-
-    struct STex3DUncompressed
-        : SDefaultTex3DBase
-        , STexUncompressed
-    {
-        static void TexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexSize kSize, GLint iBorder, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glTextureImage3DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pTexFormat->m_iInternalFormat, kSize.x, kSize.y, kSize.z, iBorder, pTexFormat->m_eBaseFormat, pTexFormat->m_eDataType, pData);
-        }
-
-        static void TexSubImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glTextureSubImage3DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, kBox.m_kOffset.x, kBox.m_kOffset.y, kBox.m_kOffset.z, kBox.m_kSize.x, kBox.m_kSize.y, kBox.m_kSize.z, pTexFormat->m_eBaseFormat, pTexFormat->m_eDataType, pData);
-        }
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = kRect.x * pFormat->m_pTexture->m_uNumBlockBytes;
-            pLayout->m_uImagePitch  = kRect.y * pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = kRect.z * pLayout->m_uImagePitch;
-        }
-    };
-
-    struct STex1DCompressed
-        : SDefaultTex1DBase
-        , STexCompressed
-    {
-        static void TexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexSize kSize, GLint iBorder, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glCompressedTextureImage1DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pTexFormat->m_iInternalFormat, kSize.x, iBorder, GetBCImageSize(kSize, pTexFormat), pData);
-        }
-
-        static void TexSubImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            // Note: According to the specification this takes the internal format and not the base format
-            DXGL_TODO("Verify the format parameter");
-            glCompressedTextureSubImage1DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, kBox.m_kOffset.x, kBox.m_kSize.x, pTexFormat->m_iInternalFormat, GetBCImageSize(kBox.m_kSize, pTexFormat), pData);
-        }
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = GetBCImageSize(kRect, pFormat->m_pTexture);
-            pLayout->m_uImagePitch  = pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = pLayout->m_uRowPitch;
-        }
-    };
-
-    struct STex2DCompressed
-        : SDefaultTex2DBase
-        , STexCompressed
-    {
-        static void TexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexSize kSize, GLint iBorder, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glCompressedTextureImage2DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pTexFormat->m_iInternalFormat, kSize.x, kSize.y, iBorder, GetBCImageSize(kSize, pTexFormat), pData);
-        }
-
-        static void TexSubImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            // Note: According to the specification this takes the internal format and not the base format
-            DXGL_TODO("Verify the format parameter");
-            glCompressedTextureSubImage2DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, kBox.m_kOffset.x, kBox.m_kOffset.y, kBox.m_kSize.x, kBox.m_kSize.y, pTexFormat->m_iInternalFormat, GetBCImageSize(kBox.m_kSize, pTexFormat), pData);
-        }
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = GetBCImageSize(STexSize(kRect.x, 1, 1), pFormat->m_pTexture);
-            pLayout->m_uImagePitch  = GetBCImageSize(kRect, pFormat->m_pTexture);
-            pLayout->m_uTextureSize = pLayout->m_uImagePitch;
-        }
-    };
-
-    struct STex3DCompressed
-        : SDefaultTex3DBase
-        , STexCompressed
-    {
-        static void TexImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexSize kSize, GLint iBorder, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            glCompressedTextureImage3DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, pTexFormat->m_iInternalFormat, kSize.x, kSize.y, kSize.z, iBorder, GetBCImageSize(kSize, pTexFormat), pData);
-        }
-
-        static void TexSubImage(STexture* pTexture, GLenum eTarget, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData)
-        {
-            // Note: According to the specification this takes the internal format and not the base format
-            DXGL_TODO("Verify the format parameter");
-            glCompressedTextureSubImage3DEXT(pTexture->m_kName.GetName(), eTarget, iLevel, kBox.m_kOffset.x, kBox.m_kOffset.y, kBox.m_kOffset.z, kBox.m_kSize.x, kBox.m_kSize.y, kBox.m_kSize.z, pTexFormat->m_iInternalFormat, GetBCImageSize(kBox.m_kSize, pTexFormat), pData);
-        }
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = GetBCImageSize(STexSize(kRect.x, 1, 1), pFormat->m_pTexture);
-            pLayout->m_uImagePitch  = GetBCImageSize(STexSize(kRect.x, kRect.y, 1), pFormat->m_pTexture);
-            pLayout->m_uTextureSize = GetBCImageSize(kRect, pFormat->m_pTexture);
-        }
-    };
-
-
-    struct STexPartition
-    {
-        static void GetSubTargetAndLayer(STexture* pTexture, uint32 uElement, GLenum& eTarget, GLint& iLayer)
-        {
-            eTarget = pTexture->m_eTarget;
-            iLayer = (GLint)uElement;
-        }
-
-        static uint32 GetNumLayers(STexture* pTexture)
-        {
-            return pTexture->m_uNumElements;
-        }
-
-        static void InitializeCopyImageView(STexture* pTexture, const SGIFormatInfo* pFormat, CContext* pContext)
-        {
-            AZ_Assert(pContext->GetDevice()->IsFeatureSupported(eF_CopyImage), "Copy image is not supported on this platform");
-            pTexture->m_kCopyImageView = pTexture->m_kName;
-            pTexture->m_eCopyImageTarget = pTexture->m_eTarget;
-        }
-    };
-
-    struct SCubePartition
-    {
-        static void GetSubTargetAndLayer(STexture* pTexture, uint32 uElement, GLenum& eTarget, GLint& iLayer)
-        {
-            static const GLenum s_aeFaceTargets[] =
-            {
-                GL_TEXTURE_CUBE_MAP_POSITIVE_X, // 0
-                GL_TEXTURE_CUBE_MAP_NEGATIVE_X, // 1
-                GL_TEXTURE_CUBE_MAP_POSITIVE_Y, // 2
-                GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, // 3
-                GL_TEXTURE_CUBE_MAP_POSITIVE_Z, // 4
-                GL_TEXTURE_CUBE_MAP_NEGATIVE_Z // 5
-            };
-
-            eTarget = s_aeFaceTargets[uElement % 6];
-            iLayer = uElement / 6;
-        }
-
-        static uint32 GetNumLayers(STexture* pTexture)
-        {
-            return pTexture->m_uNumElements / 6;
-        }
-
-        static void InitializeCopyImageView(STexture* pTexture, const SGIFormatInfo* pFormat, CContext* pContext)
-        {
-            CDevice* pDevice(pContext->GetDevice());
-            AZ_Assert(pDevice->IsFeatureSupported(eF_CopyImage), "Copy image is not supported on this platform");
-            if (!pDevice->GetAdapter()->m_kCapabilities.m_bCopyImageWorksOnCubeMapFaces && pDevice->IsFeatureSupported(eF_TextureViews))
-            {
-                GLuint uCopyViewName;
-                glGenTextures(1, &uCopyViewName);
-                glTextureViewEXT(uCopyViewName, GL_TEXTURE_2D_ARRAY, pTexture->m_kName.GetName(), pFormat->m_pTexture->m_iInternalFormat, 0, pTexture->m_uNumMipLevels, 0, pTexture->m_uNumElements);
-                pTexture->m_kCopyImageView = pDevice->GetTextureNamePool().Create(uCopyViewName);
-                pTexture->m_eCopyImageTarget = GL_TEXTURE_2D_ARRAY;
-            }
-            else
-            {
-                pTexture->m_kCopyImageView = pTexture->m_kName;
-                pTexture->m_eCopyImageTarget = pTexture->m_eTarget;
-            }
-        }
-    };
-
-#if DXGL_CHECK_TEXTURE_UPLOAD_READ_BOUNDS
-
-    uint32 GetPageSize()
-    {
-#if defined(WIN32)
-        SYSTEM_INFO kInfo;
-        ::GetSystemInfo(&kInfo);
-        return kInfo.dwPageSize;
-#else
-        return getpagesize();
-#endif
-    }
-
-    template <typename Interface>
-    void TestUploadBounds(STexture* pTexture, GLenum eTarget, GLint iLevel, STexBox kBox, const SGIFormatInfo* pFormat, const GLvoid* pData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch)
-    {
-        static uint32 s_uPageSize = GetPageSize();
-        static std::map<uint32, char*> s_kBuffers;
-        static uint32 s_uNumBufferPages = 0;
-
-        uint32 uSize;
-        if (pFormat->m_pTexture->m_bCompressed)
-        {
-            uSize = Interface::GetBCImageSize(kBox.m_kSize, pFormat->m_pTexture);
-        }
-        else if (kBox.m_kSize.z > 1)
-        {
-            uSize = kBox.m_kSize.z * uSrcDepthPitch;
-        }
-        else if (kBox.m_kSize.y > 1)
-        {
-            uSize = kBox.m_kSize.y * uSrcRowPitch;
-        }
-        else
-        {
-            uSize = kBox.m_kSize.x * pFormat->m_pTexture->m_uNumBlockBytes;
-        }
-        uint32 uRequiredPages(2 + (uSize + s_uPageSize) / s_uPageSize);
-
-        char* pBuffer;
-        std::map<uint32, char*>::iterator kFound(s_kBuffers.find(uRequiredPages));
-        if (kFound != s_kBuffers.end())
-        {
-            pBuffer = kFound->second;
-        }
-        else
-        {
-#if defined(WIN32)
-            pBuffer = reinterpret_cast<char*>(VirtualAlloc(NULL, uRequiredPages * s_uPageSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE));
-            DWORD uUnused;
-            VirtualProtect(pBuffer, s_uPageSize, PAGE_NOACCESS, &uUnused);
-            VirtualProtect(pBuffer + s_uPageSize * (uRequiredPages - 1), s_uPageSize, PAGE_NOACCESS, &uUnused);
-#else
-            pBuffer = reinterpret_cast<char*>(mmap(NULL, uRequiredPages * s_uPageSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0));
-            mprotect(pBuffer, s_uPageSize, PROT_NONE);
-            mprotect(pBuffer + s_uPageSize * (uRequiredPages - 1), s_uPageSize, PROT_NONE);
-#endif
-        }
-
-        Interface::TexSubImage(pTexture, eTarget, iLevel, kBox, pFormat->m_pTexture, pBuffer + s_uPageSize);
-        Interface::TexSubImage(pTexture, eTarget, iLevel, kBox, pFormat->m_pTexture, pBuffer + (uRequiredPages - 1) * s_uPageSize - uSize);
-    }
-
-#else
-
-    template <typename Interface>
-    void TestUploadBounds(STexture*, GLenum, GLint, STexBox, const SGIFormatInfo*, const GLvoid*, uint32, uint32){}
-
-#endif
-
-    template <typename Interface, typename Partition>
-    void LogTextureSize(STexture* pTexture)
-    {
-#if DXGL_LOG_TEXTURE_SIZES
-        const char* szFormatName = "(invalid)";
-        switch (pTexture->m_eFormat)
-        {
-#define _GI_FORMAT_ENUM_FUNC(_FormatID, ...) case DXGL_GI_FORMAT(_FormatID): \
-    szFormatName = DXGL_QUOTE(_FormatID); break;
-            DXGL_GI_FORMATS(_GI_FORMAT_ENUM_FUNC)
-#undef _GI_FORMAT_ENUM_FUNC
-        }
-        GLint iLayer;
-        GLenum eTarget;
-        Partition::GetSubTargetAndLayer(pTexture, 0, eTarget, iLayer);
-
-        uint32 uLevel;
-        for (uLevel = 0; uLevel < pTexture->m_uNumMipLevels; ++uLevel)
-        {
-            GLint iWidth, iHeight, iDepth;
-            glGetTextureLevelParameterivEXT(pTexture->m_kName.GetName(), eTarget, uLevel, GL_TEXTURE_WIDTH, &iWidth);
-            glGetTextureLevelParameterivEXT(pTexture->m_kName.GetName(), eTarget, uLevel, GL_TEXTURE_HEIGHT, &iHeight);
-            glGetTextureLevelParameterivEXT(pTexture->m_kName.GetName(), eTarget, uLevel, GL_TEXTURE_DEPTH, &iDepth);
-            CryLogAlways(" TEXTURE SIZE name=%d format=%s level=%d size=[%d, %d, %d]\n", pTexture->m_kName.GetName(), szFormatName, uLevel, iWidth, iHeight, iDepth);
-        }
-#endif
-    }
-
-    template <typename Interface, typename Partition = STexPartition>
-    struct SSingleTexImpl
-        : Interface
-    {
-        static void InitializeStorage(STexture* pTexture, uint32, const SGIFormatInfo* pFormat, CContext* pContext)
-        {
-#if DXGL_USE_IMMUTABLE_TEXTURES
-            Interface::TexStorage(pTexture, GetMipSize(pTexture, 0, pFormat, false), pTexture->m_uNumMipLevels, pFormat->m_pTexture);
-#else
-            GLint iLevel;
-            uint32 uElement;
-            for (uElement = 0; uElement < pTexture->m_uNumElements; ++uElement)
-            {
-                GLenum eSubTarget;
-                GLint iLayer;
-                Partition::GetSubTargetAndLayer(pTexture, uElement, eSubTarget, iLayer);
-                assert(iLayer == 0);
-
-                for (iLevel = 0; iLevel < (GLint)pTexture->m_uNumMipLevels; ++iLevel)
-                {
-                    Interface::TexImage(pTexture, eSubTarget, iLevel, GetMipSize(pTexture, iLevel, pFormat, false), 0, pFormat->m_pTexture, NULL);
-                }
-            }
-#endif
-
-            if (pContext->GetDevice()->IsFeatureSupported(eF_CopyImage))
-            {
-                Partition::InitializeCopyImageView(pTexture, pFormat, pContext);
-            }
-
-            LogTextureSize<Interface, Partition>(pTexture);
-        }
-
-        static void UploadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            GLenum eSubTarget;
-            GLint iLayer;
-            Partition::GetSubTargetAndLayer(pTexture, kSubID.m_uElement, eSubTarget, iLayer);
-            assert(iLayer == 0);
-
-            Interface::ApplyUnpackState(pContext, kBox.m_kSize, (uint32)countTrailingZeroes((unsigned int)reinterpret_cast<uintptr_t>(pSrcData)), uSrcRowPitch, uSrcDepthPitch, pFormat);
-            TestUploadBounds<Interface>(pTexture, eSubTarget, kSubID.m_iMipLevel, kBox, pFormat, pSrcData, uSrcRowPitch, uSrcDepthPitch);
-            Interface::TexSubImage(pTexture, eSubTarget, kSubID.m_iMipLevel, kBox, pFormat->m_pTexture, pSrcData);
-        }
-
-        static void DownloadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, void* pDstData, uint32 uDstRowPitch, uint32 uDstDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            Interface::ApplyPackState(pContext, kBox.m_kSize, (uint32)countTrailingZeroes((unsigned int)reinterpret_cast<uintptr_t>(pDstData)), uDstRowPitch, uDstDepthPitch, pFormat);
-
-#if DXGL_SUPPORT_GETTEXIMAGE
-            GLenum eSubTarget;
-            GLint iLayer;
-            Partition::GetSubTargetAndLayer(pTexture, kSubID.m_uElement, eSubTarget, iLayer);
-            assert(iLayer == 0);
-
-            Interface::GetTexImage(pTexture, eSubTarget, kSubID.m_iMipLevel, pDstData, pContext, pFormat);
-#else
-            if (kBox.m_kOffset.z > 0 || kBox.m_kSize.z > 1)
-            {
-                DXGL_NOT_IMPLEMENTED
-            }
-
-            SOutputMergerTextureViewPtr spView(GetCopyOutputMergerView(pTexture, kSubID, pContext, pFormat));
-            if (spView == NULL)
-            {
-                DXGL_ERROR("Could not create an output merger view for texture readback");
-                return;
-            }
-
-            if (!pContext->ReadBackOutputMergerView(spView, kBox.m_kOffset.x, kBox.m_kOffset.y, kBox.m_kSize.x, kBox.m_kSize.y, pDstData))
-            {
-                DXGL_ERROR("Texture readback failed");
-                return;
-            }
-#endif
-        }
-
-        static void Map(STexture* pTexture, STexSubresourceID kSubID, bool bDownload, SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            STexBox kBox;
-            GetTextureBox(kBox, pTexture, kSubID.m_iMipLevel, pFormat, true);
-            SPackedLayout kPackedLayout;
-            Interface::GetPackedLayout(kBox.m_kSize, pFormat, &kPackedLayout);
-
-            DXGL_TODO("Check if it's worth to keep an allocation pool");
-            kMappedSubTex.m_pBuffer = static_cast<uint8*>(Memalign(kPackedLayout.m_uTextureSize, MIN_MAPPED_RESOURCE_ALIGNMENT));
-            kMappedSubTex.m_uRowPitch = kPackedLayout.m_uRowPitch;
-            kMappedSubTex.m_uImagePitch = kPackedLayout.m_uImagePitch;
-            kMappedSubTex.m_uDataOffset = 0;
-
-            if (bDownload)
-            {
-                DownloadImage(pTexture, kSubID, kBox, kMappedSubTex.m_pBuffer, kPackedLayout.m_uRowPitch, kPackedLayout.m_uImagePitch, pContext, pFormat);
-            }
-        }
-
-        static void Unmap(STexture* pTexture, STexSubresourceID kSubID, const SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            if (kMappedSubTex.m_bUpload)
-            {
-                STexBox kBox;
-                GetTextureBox(kBox, pTexture, kSubID.m_iMipLevel, pFormat, true);
-
-                UploadImage(pTexture, kSubID, kBox, kMappedSubTex.m_pBuffer, kMappedSubTex.m_uRowPitch, kMappedSubTex.m_uImagePitch, pContext, pFormat);
-            }
-
-            MemalignFree(kMappedSubTex.m_pBuffer);
-        }
-    };
-
-    template <typename Interface, typename Partition = STexPartition>
-    struct SArrayTexImpl
-        : Interface
-    {
-        static void InitializeStorage(STexture* pTexture, uint32, const SGIFormatInfo* pFormat, CContext* pContext)
-        {
-#if DXGL_USE_IMMUTABLE_TEXTURES
-            STexSize kTexSize(GetMipSize(pTexture, 0, pFormat, false));
-            Interface::SetLayerComponent(kTexSize, (GLsizei)pTexture->m_uNumElements);
-            Interface::TexStorage(pTexture, kTexSize, pTexture->m_uNumMipLevels, pFormat->m_pTexture);
-#else
-            GLint iLevel;
-            for (iLevel = 0; iLevel < (GLint)pTexture->m_uNumMipLevels; ++iLevel)
-            {
-                STexSize kMipSize(GetMipSize(pTexture, iLevel, pFormat, false));
-                Interface::SetLayerComponent(kMipSize, (GLsizei)pTexture->m_uNumElements);
-                Interface::TexImage(pTexture, pTexture->m_eTarget, iLevel, kMipSize, 0, pFormat->m_pTexture, NULL);
-            }
-#endif
-
-            if (pContext->GetDevice()->IsFeatureSupported(eF_CopyImage))
-            {
-                Partition::InitializeCopyImageView(pTexture, pFormat, pContext);
-            }
-
-            LogTextureSize<Interface, Partition>(pTexture);
-        }
-
-        static void UploadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            GLenum eSubTarget;
-            GLint iLayer;
-            Partition::GetSubTargetAndLayer(pTexture, kSubID.m_uElement, eSubTarget, iLayer);
-
-            Interface::SetLayerComponent(kBox.m_kOffset, iLayer);
-            Interface::SetLayerComponent(kBox.m_kSize, 1);
-
-            Interface::ApplyUnpackState(pContext, kBox.m_kSize, (uint32)countTrailingZeroes((unsigned int)reinterpret_cast<uintptr_t>(pSrcData)), uSrcRowPitch, uSrcDepthPitch, pFormat);
-            TestUploadBounds<Interface>(pTexture, eSubTarget, kSubID.m_iMipLevel, kBox, pFormat, pSrcData, uSrcRowPitch, uSrcDepthPitch);
-            Interface::TexSubImage(pTexture, eSubTarget, kSubID.m_iMipLevel, kBox, pFormat->m_pTexture, pSrcData);
-        }
-
-        static void DownloadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, void* pDstData, uint32 uDstRowPitch, uint32 uDstDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            Interface::ApplyPackState(pContext, kBox.m_kSize, (uint32)countTrailingZeroes((unsigned int)reinterpret_cast<uintptr_t>(pDstData)), uDstRowPitch, uDstDepthPitch, pFormat);
-
-#if DXGL_SUPPORT_GETTEXIMAGE
-            GLenum eSubTarget;
-            GLint iLayer;
-            Partition::GetSubTargetAndLayer(pTexture, kSubID.m_uElement, eSubTarget, iLayer);
-
-            Interface::GetTexImage(pTexture, eSubTarget, kSubID.m_iMipLevel, pDstData, pContext, pFormat);
-#else
-            DXGL_NOT_IMPLEMENTED
-#endif
-        }
-
-        static void Map(STexture* pTexture, STexSubresourceID kSubID, bool bDownload, SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            GLenum eSubTarget;
-            GLint iLayer;
-            Partition::GetSubTargetAndLayer(pTexture, kSubID.m_uElement, eSubTarget, iLayer);
-
-            STexBox kBox;
-            GetTextureBox(kBox, pTexture, kSubID.m_iMipLevel, pFormat, true);
-
-            uint32 uNumTextures(1);
-            uint32 uTextureIndex(0);
-
-            if (bDownload)
-            {
-                // The box must include all layers since glGetTexImage can only copy all layers at once.
-                // This is quite a waste, but as of 4.3 there's no way to only download a single layer
-                // (excluding glReadPixels that only works for renderable formats, i.e. not compressed formats).
-                Interface::SetLayerComponent(kBox.m_kSize, (GLsizei)Partition::GetNumLayers(pTexture));
-            }
-
-            SPackedLayout kPackedLayout;
-            Interface::GetPackedLayout(kBox.m_kSize, pFormat, &kPackedLayout);
-
-            DXGL_TODO("Check if it's worth to keep an allocation pool");
-            kMappedSubTex.m_pBuffer = static_cast<uint8*>(Memalign(kPackedLayout.m_uTextureSize, MIN_MAPPED_RESOURCE_ALIGNMENT));
-            kMappedSubTex.m_uRowPitch = kPackedLayout.m_uRowPitch;
-            kMappedSubTex.m_uImagePitch = kPackedLayout.m_uImagePitch;
-            kMappedSubTex.m_uDataOffset = 0;
-            if (bDownload)
-            {
-                kMappedSubTex.m_uDataOffset = iLayer * kPackedLayout.m_uImagePitch;
-                DownloadImage(pTexture, kSubID, kBox, kMappedSubTex.m_pBuffer, kPackedLayout.m_uRowPitch, kPackedLayout.m_uImagePitch, pContext, pFormat);
-            }
-        }
-
-        static void Unmap(STexture* pTexture, STexSubresourceID kSubID, const SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            if (kMappedSubTex.m_bUpload)
-            {
-                GLenum eSubTarget;
-                GLint iLayer;
-                Partition::GetSubTargetAndLayer(pTexture, kSubID.m_uElement, eSubTarget, iLayer);
-
-                STexBox kBox;
-                GetTextureBox(kBox, pTexture, kSubID.m_iMipLevel, pFormat, true);
-
-                GLvoid* pData(kMappedSubTex.m_pBuffer + kMappedSubTex.m_uDataOffset);
-                UploadImage(pTexture, kSubID, kBox, pData, kMappedSubTex.m_uRowPitch, kMappedSubTex.m_uImagePitch, pContext, pFormat);
-            }
-
-            MemalignFree(kMappedSubTex.m_pBuffer);
-        }
-    };
-
-    template <typename Interface>
-    uint32 GetSystemMemoryTextureOffset(STexture* pTexture, const SGIFormatInfo* pFormat, STexSubresourceID kID)
-    {
-        uint32 uOffset(0);
-        uint32 uTotSize(0);
-        uint32 uLevel;
-        for (uLevel = 0; uLevel < pTexture->m_uNumMipLevels; ++uLevel)
-        {
-            STexSize kLevelSize(GetMipSize(pTexture, (GLint)uLevel, pFormat, true));
-
-            SPackedLayout kPackedLayout;
-            Interface::GetPackedLayout(kLevelSize, pFormat, &kPackedLayout);
-
-            uTotSize += kPackedLayout.m_uTextureSize;
-
-            // Keep every subresource aligned so that it can be directly mapped
-            uTotSize += MIN_MAPPED_RESOURCE_ALIGNMENT - 1;
-            uTotSize -= (uTotSize % MIN_MAPPED_RESOURCE_ALIGNMENT);
-            if (uLevel < kID.m_iMipLevel)
-            {
-                uOffset = uTotSize;
-            }
-        }
-
-        return uTotSize * kID.m_uElement + uOffset;
-    }
-
-    template <typename Interface>
-    struct SStagingTexImpl
-        : Interface
-    {
-        static void AllocateResource(STexture* pTexture, CDevice* pDevice)
-        {
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-            uint32 uNumPixelBuffers(pTexture->m_uNumMipLevels * pTexture->m_uNumElements);
-            pTexture->m_akPixelBuffers = new CResourceName[uNumPixelBuffers];
-            for (uint32 uPixelBuffer = 0; uPixelBuffer < uNumPixelBuffers; ++uPixelBuffer)
-            {
-                GLuint uPixelBufferName;
-                glGenBuffers(1, &uPixelBufferName);
-                pTexture->m_akPixelBuffers[uPixelBuffer] = pDevice->GetBufferNamePool().Create(uPixelBufferName);
-            }
-#endif //DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        }
-
-        static void InitializeStorage(STexture* pTexture, uint32 uCPUAccess, const SGIFormatInfo* pFormat, CContext* pContext)
-        {
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-            GLenum eUsage;
-            if ((uCPUAccess & D3D11_CPU_ACCESS_WRITE) == 0)
-            {
-                eUsage = GL_STREAM_READ;
-            }
-            else if ((uCPUAccess & D3D11_CPU_ACCESS_READ) == 0)
-            {
-                eUsage = GL_STREAM_DRAW;
-            }
-            else
-            {
-                eUsage = GL_STREAM_COPY;
-            }
-
-            STexSubresourceID kSubID;
-            for (kSubID.m_iMipLevel = 0; kSubID.m_iMipLevel < pTexture->m_uNumMipLevels; ++kSubID.m_iMipLevel)
-            {
-                STexSize kLevelSize(GetMipSize(pTexture, kSubID.m_iMipLevel, pFormat, true));
-
-                SPackedLayout kPackedLayout;
-                Interface::GetPackedLayout(kLevelSize, pFormat, &kPackedLayout);
-
-                for (kSubID.m_uElement = 0; kSubID.m_uElement < pTexture->m_uNumElements; ++kSubID.m_uElement)
-                {
-                    uint32 uSubResource(D3D11CalcSubresource(kSubID.m_iMipLevel, kSubID.m_uElement, pTexture->m_uNumMipLevels));
-                    glNamedBufferDataEXT(pTexture->m_akPixelBuffers[uSubResource].GetName(), kPackedLayout.m_uTextureSize, NULL, eUsage);
-                }
-            }
-#else
-            STexSubresourceID kEndID = {pTexture->m_uNumMipLevels, pTexture->m_uNumElements};
-            uint32 uMappedSize(GetSystemMemoryTextureOffset<Interface>(pTexture, pFormat, kEndID));
-            pTexture->m_pSystemMemoryCopy = static_cast<uint8*>(Memalign(uMappedSize, MIN_MAPPED_RESOURCE_ALIGNMENT));
-#endif
-        }
-
-        static void UploadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            STexSize kDstSize(GetMipSize(pTexture, kSubID.m_iMipLevel, pFormat, true));
-            SPackedLayout kDstLayout;
-            Interface::GetPackedLayout(kDstSize, pFormat, &kDstLayout);
-
-            STexBox kPackedRange;
-            if (!Interface::GetPackedRange(kBox, &kPackedRange, pFormat))
-            {
-                DXGL_ERROR("Texture upload box is not compatible with the format of the texture");
-                return;
-            }
-
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-            uint32 uSubResource(D3D11CalcSubresource(kSubID.m_iMipLevel, kSubID.m_uElement, pTexture->m_uNumMipLevels));
-            GLvoid* pvMappedData(pContext->MapNamedBufferRangeFast(pTexture->m_akPixelBuffers[uSubResource], 0, (GLsizei)kDstLayout.m_uTextureSize, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT));
-            uint8* puDstData(static_cast<uint8*>(pvMappedData) + kPackedRange.m_kOffset.x);
-#else
-            uint8* puDstData(
-                pTexture->m_pSystemMemoryCopy +
-                GetSystemMemoryTextureOffset<Interface>(pTexture, pFormat, kSubID) +
-                kPackedRange.m_kOffset.x);
-#endif
-
-            const uint8* puSrcData(reinterpret_cast<const uint8*>(pSrcData));
-
-            uint32 uImage, uRow;
-            for (uImage = kPackedRange.m_kOffset.z; uImage < kPackedRange.m_kSize.z; ++uImage)
-            {
-                for (uRow = kPackedRange.m_kOffset.y; uRow < kPackedRange.m_kSize.y; ++uRow)
-                {
-                    cryMemcpy(
-                        puDstData + uImage * kDstLayout.m_uImagePitch + uRow * kDstLayout.m_uRowPitch + kPackedRange.m_kOffset.x,
-                        puSrcData + uImage * uSrcDepthPitch + uRow * uSrcRowPitch,
-                        kPackedRange.m_kSize.x);
-                }
-            }
-
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-            pContext->UnmapNamedBufferFast(pTexture->m_akPixelBuffers[uSubResource]);
-#endif //DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        }
-
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        static void DownloadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pDstData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            DXGL_NOT_IMPLEMENTED
-        }
-#endif //DXGL_USE_PBO_FOR_STAGING_TEXTURES
-
-        static void Map(STexture* pTexture, STexSubresourceID kSubID, bool bDownload, SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            STexSize kSubSize(GetMipSize(pTexture, kSubID.m_iMipLevel, pFormat, true));
-            SPackedLayout kPackedLayout;
-            Interface::GetPackedLayout(kSubSize, pFormat, &kPackedLayout);
-
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-            uint32 uSubResource(D3D11CalcSubresource(kSubID.m_iMipLevel, kSubID.m_uElement, pTexture->m_uNumMipLevels));
-            GLint iPixelBufferName(pTexture->m_akPixelBuffers[uSubResource].GetName());
-            if (bDownload)
-            {
-                kMappedSubTex.m_pBuffer = static_cast<uint8*>(pContext->MapNamedBufferRangeFast(pTexture->m_akPixelBuffers[uSubResource], 0, kPackedLayout.m_uTextureSize, GL_MAP_READ_BIT));
-            }
-            else
-            {
-                kMappedSubTex.m_pBuffer = static_cast<uint8*>(pContext->MapNamedBufferRangeFast(pTexture->m_akPixelBuffers[uSubResource], 0, kPackedLayout.m_uTextureSize, GL_MAP_WRITE_BIT));
-            }
-#else
-            kMappedSubTex.m_pBuffer = pTexture->m_pSystemMemoryCopy + GetSystemMemoryTextureOffset<Interface>(pTexture, pFormat, kSubID);
-#endif
-
-            kMappedSubTex.m_uRowPitch = kPackedLayout.m_uRowPitch;
-            kMappedSubTex.m_uImagePitch = kPackedLayout.m_uImagePitch;
-            kMappedSubTex.m_uDataOffset = 0;
-        }
-
-        static void Unmap(STexture* pTexture, STexSubresourceID kSubID, const SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo*)
-        {
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-            uint32 uSubResource(D3D11CalcSubresource(kSubID.m_iMipLevel, kSubID.m_uElement, pTexture->m_uNumMipLevels));
-            pContext->UnmapNamedBufferFast(pTexture->m_akPixelBuffers[uSubResource]);
-#endif //DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        }
-    };
-
-    inline STexSubresourceID GetTexSubresourceID(STexture* pTexture, uint32 uSubresource)
-    {
-        STexSubresourceID kID;
-        kID.m_iMipLevel = uSubresource % pTexture->m_uNumMipLevels;
-        kID.m_uElement = uSubresource / pTexture->m_uNumMipLevels;
-        assert(kID.m_uElement < pTexture->m_uNumElements);
-        return kID;
-    }
-
-    template <typename Impl>
-    void UpdateTexSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("UpdateTexSubresource")
-
-        STexture * pTexture(static_cast<STexture*>(pResource));
-        pTexture->m_kCreationFence.IssueWait(pContext);
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pTexture->m_eFormat));
-        assert(pFormatInfo != NULL);
-        assert(pFormatInfo->m_pTexture != NULL);
-
-        STexSubresourceID kSubID(GetTexSubresourceID(pTexture, uSubresource));
-
-        STexBox kTexBox;
-        GetTextureBox(kTexBox, pTexture, kSubID.m_iMipLevel, pDstBox, pFormatInfo, false);
-        Impl::UploadImage(pTexture, kSubID, kTexBox, pSrcData, uSrcRowPitch, uSrcDepthPitch, pContext, pFormatInfo);
-    }
-
-    template <typename Impl>
-    bool MapTexSubresource(SResource* pResource, uint32 uSubresource, D3D11_MAP eMapType, uint32 uMapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("MapTexSubresource")
-
-        STexture * pTexture(static_cast<STexture*>(pResource));
-        pTexture->m_kCreationFence.IssueWait(pContext);
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pTexture->m_eFormat));
-        assert(pFormatInfo != NULL);
-        assert(pFormatInfo->m_pTexture != NULL);
-
-        if (uSubresource >= pTexture->m_kMappedSubTextures.size())
-        {
-            pTexture->m_kMappedSubTextures.resize(uSubresource + 1);
-        }
-        SMappedSubTexture& kMappedSubTexture(pTexture->m_kMappedSubTextures.at(uSubresource));
-
-        if (kMappedSubTexture.m_pBuffer != NULL)
-        {
-            DXGL_ERROR("Texture subresource is already mapped");
-            return false;
-        }
-
-        bool bDownload(eMapType == D3D11_MAP_READ || eMapType == D3D11_MAP_WRITE || eMapType == D3D11_MAP_READ_WRITE);
-        Impl::Map(pTexture, GetTexSubresourceID(pTexture, uSubresource), bDownload, kMappedSubTexture, pContext, pFormatInfo);
-        kMappedSubTexture.m_bUpload = (eMapType != D3D11_MAP_READ);
-
-        pMappedResource->pData = kMappedSubTexture.m_pBuffer + kMappedSubTexture.m_uDataOffset;
-        pMappedResource->RowPitch = kMappedSubTexture.m_uRowPitch;
-        pMappedResource->DepthPitch = kMappedSubTexture.m_uImagePitch;
-
-        return kMappedSubTexture.m_pBuffer != NULL;
-    }
-
-    template <typename Impl>
-    void UnmapTexSubresource(SResource* pResource, UINT uSubresource, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("UnmapTexSubresource")
-
-        STexture * pTexture(static_cast<STexture*>(pResource));
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pTexture->m_eFormat));
-        assert(pFormatInfo != NULL);
-        assert(pFormatInfo->m_pTexture != NULL);
-
-        if (uSubresource >= pTexture->m_kMappedSubTextures.size())
-        {
-            pTexture->m_kMappedSubTextures.resize(uSubresource + 1);
-        }
-        SMappedSubTexture& kMappedSubTexture(pTexture->m_kMappedSubTextures.at(uSubresource));
-
-        if (kMappedSubTexture.m_pBuffer == NULL)
-        {
-            DXGL_ERROR("Texture subresource is not mapped");
-            return;
-        }
-
-        Impl::Unmap(pTexture, GetTexSubresourceID(pTexture, uSubresource), kMappedSubTexture, pContext, pFormatInfo);
-        kMappedSubTexture.m_pBuffer = NULL;
-    }
-
-    template <typename Impl>
-    void UnpackTexData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("UnpackTexData")
-
-        STexBox kBox;
-        kBox.m_kOffset = kOffset;
-        kBox.m_kSize = kSize;
-        const SGIFormatInfo* pFormat(GetGIFormatInfo(pTexture->m_eFormat));
-
-        Impl::UploadImage(pTexture, kSubID, kBox, kDataLocation.m_pBuffer + kDataLocation.m_uDataOffset, kDataLocation.m_uRowPitch, kDataLocation.m_uImagePitch, pContext, pFormat);
-    }
-
-    template <typename Impl>
-    void PackTexData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("PackTexData")
-
-        STexBox kBox;
-        kBox.m_kOffset = kOffset;
-        kBox.m_kSize = kSize;
-        const SGIFormatInfo* pFormat(GetGIFormatInfo(pTexture->m_eFormat));
-
-        Impl::DownloadImage(pTexture, kSubID, kBox, kDataLocation.m_pBuffer + kDataLocation.m_uDataOffset, kDataLocation.m_uRowPitch, kDataLocation.m_uImagePitch, pContext, pFormat);
-    }
-
-    template <typename Impl>
-    uint32 LocateTexPackedData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, SMappedSubTexture& kDataLocation)
-    {
-        const SGIFormatInfo* pFormat(GetGIFormatInfo(pTexture->m_eFormat));
-
-        STexBox kBox;
-        GetTextureBox(kBox, pTexture, kSubID.m_iMipLevel, pFormat, true);
-        SPackedLayout kPackedLayout;
-        Impl::GetPackedLayout(kBox.m_kSize, pFormat, &kPackedLayout);
-
-        SPackedLayout kPackedOffset;
-        Impl::GetPackedLayout(STexSize((GLsizei)kOffset.x, (GLsizei)kOffset.y, (GLsizei)kOffset.z), pFormat, &kPackedOffset);
-
-        kDataLocation.m_pBuffer = NULL;
-        kDataLocation.m_uDataOffset = kPackedOffset.m_uTextureSize;
-        kDataLocation.m_uRowPitch = kPackedLayout.m_uRowPitch;
-        kDataLocation.m_uImagePitch = kPackedLayout.m_uImagePitch;
-
-        return kPackedLayout.m_uTextureSize;
-    }
-
-    template <typename Impl>
-    void InitializeTexture(STexture* pTexture, const D3D11_SUBRESOURCE_DATA* pInitialData, uint32 uCPUAccess, CContext* pContext, const SGIFormatInfo* pFormatInfo)
-    {
-        pTexture->m_pfUpdateSubresource = &UpdateTexSubresource<Impl>;
-        pTexture->m_pfMapSubresource = &MapTexSubresource<Impl>;
-        pTexture->m_pfUnmapSubresource = &UnmapTexSubresource<Impl>;
-        pTexture->m_pfUnpackData = &UnpackTexData<Impl>;
-        pTexture->m_pfPackData = &PackTexData<Impl>;
-        pTexture->m_pfLocatePackedDataFunc = &LocateTexPackedData<Impl>;
-
-        Impl::AllocateResource(pTexture, pContext->GetDevice());
-
-        Impl::InitializeStorage(pTexture, uCPUAccess, pFormatInfo, pContext);
-
-        if (pInitialData)
-        {
-            STexBox kMipBox;
-            kMipBox.m_kOffset = STexPos(0, 0, 0);
-
-            STexSubresourceID kSubID;
-            for (kSubID.m_uElement = 0; kSubID.m_uElement < pTexture->m_uNumElements; ++kSubID.m_uElement)
-            {
-                for (kSubID.m_iMipLevel = 0; kSubID.m_iMipLevel < (GLint)pTexture->m_uNumMipLevels; ++kSubID.m_iMipLevel)
-                {
-                    kMipBox.m_kSize = GetMipSize(pTexture, kSubID.m_iMipLevel, pFormatInfo, false);
-
-                    Impl::UploadImage(pTexture, kSubID, kMipBox, pInitialData->pSysMem, pInitialData->SysMemPitch, pInitialData->SysMemSlicePitch, pContext, pFormatInfo);
-
-                    ++pInitialData;
-                }
-            }
-        }
-
-        pTexture->m_kCreationFence.IssueFence(pContext->GetDevice());
-    }
-
-    // Helper class to bind and unbind a framebuffer that is not being used for rendering
-    // but we still want to operate against. Necessary for OpenGL versions below 4.5 that
-    // don't have the glNamedFramebuffer* functions in the core api
-    struct AutoFramebufferBinder
-    {
-        GLint m_lastFbo;
-        GLenum m_fboTarget;
-        AutoFramebufferBinder(GLint fbo, GLenum target = GL_DRAW_FRAMEBUFFER)
-        {
-            m_fboTarget = target;
-            glGetIntegerv(GL_FRAMEBUFFER_BINDING, &m_lastFbo);
-            glBindFramebuffer(m_fboTarget, fbo);
-        }
-        ~AutoFramebufferBinder()
-        {
-            glBindFramebuffer(m_fboTarget, m_lastFbo);
-        }
-    };
-
-#if DXGLES || MAC || defined(DXGL_SUPPORTS_NAMED_FRAMEBUFFER_EXTENSION_FUNCTIONS)
-#define CryGlCheckFramebufferStatus glCheckNamedFramebufferStatusEXT
-#define CryGlNamedFramebufferTexture glNamedFramebufferTextureEXT
-#define CryGlNamedFramebufferTextureLayer glNamedFramebufferTextureLayerEXT
-#else
-    GLenum CheckFrameBufferStatus(GLuint framebufferObject, GLenum framebufferType)
-    {
-        AutoFramebufferBinder autoFboBinder(framebufferObject, framebufferType);
-        return glCheckFramebufferStatus(framebufferType);
-    }
-
-    void NamedFramebufferTexture(GLuint framebufferObject, GLenum attachmentId, GLuint texture, GLint mipLevel)
-    {
-        AutoFramebufferBinder autoFboBinder(framebufferObject);
-        glFramebufferTexture(GL_DRAW_FRAMEBUFFER, attachmentId, texture, mipLevel);
-    }
-
-    void NamedFramebufferTextureLayer(GLuint framebufferObject, GLenum attachmentId, GLuint texture, GLint mipLevel, GLint layer)
-    {
-        AutoFramebufferBinder autoFboBinder(framebufferObject);
-        glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, attachmentId, texture, mipLevel, layer);
-    }
-
-    static PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC CryGlCheckFramebufferStatus = nullptr;
-    static PFNGLNAMEDFRAMEBUFFERTEXTUREPROC CryGlNamedFramebufferTexture = nullptr;
-    static PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC CryGlNamedFramebufferTextureLayer = nullptr;
-#endif
-
-    void InitializeCryGlFramebufferFunctions()
-    {
-        // Making the function empty for DXGLES support since we just define the CryGL
-        // functions as the correct gl es functions.
-#if !DXGLES && !MAC && !defined(DXGL_SUPPORTS_NAMED_FRAMEBUFFER_EXTENSION_FUNCTIONS)
-        static bool sAreCryGlFunctionsSet = false;
-        if (sAreCryGlFunctionsSet == false)
-        {
-            sAreCryGlFunctionsSet = true;
-
-            // We want to use the core API functions instead of the EXT functions because
-            // the EXT functions require that all textures that are bound to a FBO are of
-            // the same dimensions. When running OpenGL in the editor we can't run with
-            // that restriction (depth texture is the frame buffer size but the render to
-            // textures are smaller, hence a mismatch). Not all platforms support the core
-            // API (OpenGL 4.5 added the named versions, 3.0+ added the framebuffer objects
-            // with no size restrictions, ES/2.0 does not have the API but has the extensions)
-            // we need to select the version we are going to use here and hide the details
-            // from the calling code to keep it cleaner
-            CryGlCheckFramebufferStatus = DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(CheckNamedFramebufferStatusEXT);
-
-#if !USE_NVIDIA_NISGHT
-            if (DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(CheckNamedFramebufferStatus))
-            {
-                CryGlCheckFramebufferStatus = DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(CheckNamedFramebufferStatus);
-            }
-            else if (DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(CheckFramebufferStatus))
-#endif
-            {
-                CryGlCheckFramebufferStatus = (PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC)&CheckFrameBufferStatus;
-            }
-
-            CryGlNamedFramebufferTexture = DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(NamedFramebufferTextureEXT);
-#if !USE_NVIDIA_NISGHT
-            if (DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(NamedFramebufferTexture))
-            {
-                CryGlNamedFramebufferTexture = DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(NamedFramebufferTexture);
-            }
-            else if (DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(FramebufferTexture))
-#endif
-            {
-                CryGlNamedFramebufferTexture = (PFNGLNAMEDFRAMEBUFFERTEXTUREPROC)&NamedFramebufferTexture;
-            }
-
-            CryGlNamedFramebufferTextureLayer = DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(NamedFramebufferTextureLayerEXT);
-#if !USE_NVIDIA_NISGHT
-            if (DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(NamedFramebufferTextureLayer))
-            {
-                CryGlNamedFramebufferTextureLayer = DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(NamedFramebufferTextureLayer);
-            }
-            else if (DXGL_GL_LOADER_FUNCTION_PTR_PREFIX(FramebufferTexture))
-#endif
-            {
-                CryGlNamedFramebufferTextureLayer = (PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC)&NamedFramebufferTextureLayer;
-            }
-        }
-#endif
-    }
-
-    SFrameBufferConfiguration::SFrameBufferConfiguration()
-    {
-        memset(m_akAttachments, 0, sizeof(m_akAttachments));
-    }
-
-    GLenum SFrameBufferConfiguration::AttachmentIndexToID(uint32 uIndex)
-    {
-        if (uIndex >= FIRST_COLOR_ATTACHMENT_INDEX &&
-            uIndex < FIRST_COLOR_ATTACHMENT_INDEX + MAX_COLOR_ATTACHMENTS)
-        {
-            return GL_COLOR_ATTACHMENT0 + uIndex - FIRST_COLOR_ATTACHMENT_INDEX;
-        }
-
-        if (uIndex == DEPTH_ATTACHMENT_INDEX)
-        {
-            return GL_DEPTH_ATTACHMENT;
-        }
-
-        if (uIndex == STENCIL_ATTACHMENT_INDEX)
-        {
-            return GL_STENCIL_ATTACHMENT;
-        }
-
-        return GL_NONE;
-    }
-
-    uint32 SFrameBufferConfiguration::AttachmentIDToIndex(GLenum eID)
-    {
-        if (eID >= GL_COLOR_ATTACHMENT0 &&
-            eID < GL_COLOR_ATTACHMENT0 + MAX_COLOR_ATTACHMENTS)
-        {
-            return FIRST_COLOR_ATTACHMENT_INDEX + eID - GL_COLOR_ATTACHMENT0;
-        }
-
-        if (eID == GL_DEPTH_ATTACHMENT)
-        {
-            return DEPTH_ATTACHMENT_INDEX;
-        }
-
-        if (eID == GL_STENCIL_ATTACHMENT)
-        {
-            return STENCIL_ATTACHMENT_INDEX;
-        }
-
-        return MAX_ATTACHMENTS;
-    }
-
-    SSharingFence::SSharingFence()
-#if DXGL_SHARED_OBJECT_SYNCHRONIZATION
-        : m_pFence(NULL)
-#endif //DXGL_SHARED_OBJECT_SYNCHRONIZATION
-    {
-    }
-
-    SSharingFence::~SSharingFence()
-    {
-#if DXGL_SHARED_OBJECT_SYNCHRONIZATION
-        if (m_pFence != NULL)
-        {
-            glDeleteSync(m_pFence);
-        }
-#endif //DXGL_SHARED_OBJECT_SYNCHRONIZATION
-    }
-
-    void SSharingFence::IssueFence(CDevice*, bool bAvoidFlushing)
-    {
-#if DXGL_SHARED_OBJECT_SYNCHRONIZATION
-        assert(m_pFence == NULL);
-        m_akWaitIssued.SetZero();
-        m_pFence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-
-        DXGL_TODO(
-            "Check whether flushing here has performance implications, and if so find "
-            "a place that would make it less frequent. It can be avoided on drivers "
-            "that prehemptively flush every now and then, otherwise IssueWait could wait "
-            "indefinitely (or expire on server side, failing to synchronize).");
-        if (!bAvoidFlushing)
-        {
-            glFlush();
-        }
-#endif //DXGL_SHARED_OBJECT_SYNCHRONIZATION
-    }
-
-    void SSharingFence::IssueWait(CContext* pContext)
-    {
-#if DXGL_SHARED_OBJECT_SYNCHRONIZATION
-        if (m_pFence && !m_akWaitIssued.Get(pContext->GetIndex()))
-        {
-#if DXGL_SERVER_SIDE_SHARED_OBJECT_SYNCHRONIZATION
-            glWaitSync(m_pFence, 0, GL_TIMEOUT_IGNORED);
-            m_akWaitIssued.Set(pContext->GetIndex(), true);
-#else
-            while (glClientWaitSync(m_pFence, 0, 100) == GL_TIMEOUT_EXPIRED)
-            {
-            }
-            m_akWaitIssued.SetOne();
-#endif
-        }
-#endif //DXGL_SHARED_OBJECT_SYNCHRONIZATION
-    }
-
-    SResourceNamePool::SResourceNamePool()
-        : m_pBlocksHead(NULL)
-    {
-    }
-
-    SResourceNamePool::~SResourceNamePool()
-    {
-        LockCriticalSection(&m_kBlockSection);
-
-        while (m_pBlocksHead != NULL)
-        {
-            TBlockHeader* pBlockHeader(alias_cast<TBlockHeader*>(m_pBlocksHead));
-            TSlot* pNextBlock(pBlockHeader->m_pNext);
-            if (AtomicDecrement(&pBlockHeader->m_uRefCount))
-            {
-                TSlot* pSlot(m_pBlocksHead + NUM_HEADER_SLOTS + 1);
-                TSlot* pEnd(pSlot + pBlockHeader->m_uSize);
-                while (pSlot < pEnd)
-                {
-                    pSlot->~TSlot();
-                    ++pSlot;
-                }
-
-                pBlockHeader->~TBlockHeader();
-                Free(m_pBlocksHead);
-            }
-            m_pBlocksHead = pNextBlock;
-        }
-
-        UnlockCriticalSection(&m_kBlockSection);
-    }
-
-    CResourceName SResourceNamePool::Create(GLuint uName)
-    {
-        TSlot* pBlock(m_pBlocksHead);
-        while (pBlock != NULL)
-        {
-            TBlockHeader* pBlockHeader(alias_cast<TBlockHeader*>(pBlock));
-            TSlot* pNextBlock(pBlockHeader->m_pNext);
-            TSlot* pFreeSlot(alias_cast<TSlot*>(pBlockHeader->m_kFreeList.Pop()));
-            if (pFreeSlot != NULL)
-            {
-                pFreeSlot->m_kUsed.m_pBlock = pBlock;
-                pFreeSlot->m_kUsed.m_uName = uName;
-                pFreeSlot->m_kUsed.m_uRefCount = 0;
-                return CResourceName(pFreeSlot);
-            }
-            pBlock = pNextBlock;
-        }
-
-        LockCriticalSection(&m_kBlockSection);
-
-        uint32 uNewBlockSize(m_pBlocksHead == NULL ? MIN_BLOCK_SIZE : alias_cast<TBlockHeader*>(m_pBlocksHead)->m_uSize * GROWTH_FACTOR);
-        TSlot* pNewBlock(static_cast<TSlot*>(Malloc(sizeof(TSlot) * (NUM_HEADER_SLOTS + max(1u, uNewBlockSize)))));
-
-        TBlockHeader* pNewBlockHeader(alias_cast<TBlockHeader*>(pNewBlock));
-        new (pNewBlockHeader) TBlockHeader();
-        pNewBlockHeader->m_pNext = m_pBlocksHead;
-        pNewBlockHeader->m_pPool = this;
-        pNewBlockHeader->m_uRefCount = 1;
-        pNewBlockHeader->m_uSize = uNewBlockSize;
-        m_pBlocksHead = pNewBlock;
-
-        UnlockCriticalSection(&m_kBlockSection);
-
-        TSlot* pFreeSlot(pNewBlock + NUM_HEADER_SLOTS + 1);
-        TSlot* pFreeSlotsEnd(pNewBlock + uNewBlockSize);
-        while (pFreeSlot != pFreeSlotsEnd)
-        {
-            new (pFreeSlot) TSlot;
-            pNewBlockHeader->m_kFreeList.Push(pFreeSlot->m_kNextFree);
-            ++pFreeSlot;
-        }
-
-        TSlot* pUsedSlot(pNewBlock + NUM_HEADER_SLOTS);
-        new (pUsedSlot) TSlot;
-        pUsedSlot->m_kUsed.m_pBlock = pNewBlock;
-        pUsedSlot->m_kUsed.m_uName = uName;
-        pUsedSlot->m_kUsed.m_uRefCount = 0;
-        return CResourceName(pUsedSlot);
-    }
-
-    SResource::SResource()
-        : m_pfUpdateSubresource(NULL)
-        , m_pfMapSubresource(NULL)
-        , m_pfUnmapSubresource(NULL)
-    {
-    }
-
-    SResource::SResource(const SResource& kOther)
-        : m_kName(kOther.m_kName)
-        , m_pfUpdateSubresource(kOther.m_pfUpdateSubresource)
-        , m_pfMapSubresource(kOther.m_pfMapSubresource)
-        , m_pfUnmapSubresource(kOther.m_pfUnmapSubresource)
-    {
-    }
-
-    SResource::~SResource()
-    {
-    }
-
-    SFrameBufferObject::SFrameBufferObject()
-        : m_bUsesSRGB(false)
-    {
-    }
-
-    SFrameBufferObject::~SFrameBufferObject()
-    {
-    }
-
-    SFrameBuffer::SFrameBuffer(const SFrameBufferConfiguration& kConfiguration)
-        : m_kConfiguration(kConfiguration)
-        , m_pContext(NULL)
-        , m_uNumDrawBuffers(0)
-    {
-    }
-
-    SFrameBuffer::~SFrameBuffer()
-    {
-        if (m_kObject.m_kName.IsValid() &&
-            m_kObject.m_kName.GetName() != 0) // Index 0 is reserved for default FBO
-        {
-            GLuint uName(m_kObject.m_kName.GetName());
-            glDeleteFramebuffers(1, &uName);
-        }
-    }
-
-    void PrintFBOInfo(SFrameBuffer* pFrameBuffer, bool error = true)
-    {
-        static FILE* s_pFile = nullptr;
-        if (!s_pFile)
-        {
-            azfopen(&s_pFile, "fbo_info.txt", "w");
-        }
-        GLuint uFBOName(pFrameBuffer->m_kObject.m_kName.GetName());
-        fprintf(s_pFile, "Frame buffer %d Error: %d\n", uFBOName, error);
-        uint32 uAttachment;
-        for (uAttachment = 0; uAttachment < SFrameBufferConfiguration::MAX_ATTACHMENTS; ++uAttachment)
-        {
-            if (pFrameBuffer->m_kConfiguration.m_akAttachments[uAttachment] != NULL)
-            {
-                GLenum eAttachmentID(SFrameBufferConfiguration::AttachmentIndexToID(uAttachment));
-                fprintf(s_pFile, "\tAttachment #%d (0x%x) ", uFBOName, eAttachmentID);
-                GLint iParams[16], iTexName, iTexLevel;
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, iParams);
-                fprintf(s_pFile, "OBJECT_TYPE=0x%x ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, iParams);
-                fprintf(s_pFile, "OBJECT_NAME=0x%x ", iParams[0]);
-                iTexName = iParams[0];
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL, iParams);
-                fprintf(s_pFile, "TEXTURE_LEVEL=0x%x ", iParams[0]);
-                iTexLevel = iParams[0];
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE, iParams);
-                fprintf(s_pFile, "TEXTURE_CUBE_MAP_FACE=0x%x ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER, iParams);
-#if !DXGLES
-                fprintf(s_pFile, "TEXTURE_LAYER=0x%x ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_LAYERED, iParams);
-#endif
-                fprintf(s_pFile, "LAYERED=0x%x ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, iParams);
-                fprintf(s_pFile, "COLOR_ENCODING=0x%x ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, iParams);
-                fprintf(s_pFile, "COMPONENT_TYPE=0x%x ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE, iParams);
-                fprintf(s_pFile, "R=%d ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE, iParams);
-                fprintf(s_pFile, "G=%d ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE, iParams);
-                fprintf(s_pFile, "B=%d ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE, iParams);
-                fprintf(s_pFile, "A=%d ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE, iParams);
-                fprintf(s_pFile, "D=%d ", iParams[0]);
-                glGetNamedFramebufferAttachmentParameterivEXT(uFBOName, eAttachmentID, GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE, iParams);
-                fprintf(s_pFile, "S=%d ", iParams[0]);
-
-                fprintf(s_pFile, "\n\t\tTexture: ");
-#if !DXGLES
-                // These are not available on GL ES
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_WIDTH, iParams);
-                fprintf(s_pFile, "WIDTH=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_HEIGHT, iParams);
-                fprintf(s_pFile, "HEIGHT=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_DEPTH, iParams);
-                fprintf(s_pFile, "DEPTH=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_SAMPLES, iParams);
-                fprintf(s_pFile, "SAMPLES=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_FIXED_SAMPLE_LOCATIONS, iParams);
-                fprintf(s_pFile, "FIXED_SAMPLE_LOCATIONS=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_INTERNAL_FORMAT, iParams);
-                fprintf(s_pFile, "FIXED_SAMPLE_LOCATIONS=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_RED_SIZE, iParams);
-                fprintf(s_pFile, "R=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_GREEN_SIZE, iParams);
-                fprintf(s_pFile, "G=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_BLUE_SIZE, iParams);
-                fprintf(s_pFile, "B=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_ALPHA_SIZE, iParams);
-                fprintf(s_pFile, "A=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_DEPTH_SIZE, iParams);
-                fprintf(s_pFile, "D=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_STENCIL_SIZE, iParams);
-                fprintf(s_pFile, "S=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_SHARED_SIZE, iParams);
-                fprintf(s_pFile, "SHR=%d ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_RED_TYPE, iParams);
-                fprintf(s_pFile, "RT=0x%x ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_GREEN_TYPE, iParams);
-                fprintf(s_pFile, "GT=0x%x ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_BLUE_TYPE, iParams);
-                fprintf(s_pFile, "BT=0x%x ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_ALPHA_TYPE, iParams);
-                fprintf(s_pFile, "AT=0x%x ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_DEPTH_TYPE, iParams);
-                fprintf(s_pFile, "DT=0x%x ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_COMPRESSED, iParams);
-                fprintf(s_pFile, "COMP=0x%x ", iParams[0]);
-                glGetTextureLevelParameterivEXT(iTexName, GL_TEXTURE_2D, iTexLevel, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, iParams);
-#endif
-                fprintf(s_pFile, "COMP_SIZE=%d ", iParams[0]);
-            }
-            fprintf(s_pFile, "\n");
-            fflush(s_pFile);
-        }
-    }
-
-    bool SFrameBuffer::Validate()
-    {
-        GLenum eStatus(glCheckNamedFramebufferStatusEXT(m_kObject.m_kName.GetName(), GL_DRAW_FRAMEBUFFER));
-        if (eStatus != GL_FRAMEBUFFER_COMPLETE)
-        {
-            switch (eStatus)
-            {
-            case GL_FRAMEBUFFER_UNDEFINED:
-                DXGL_ERROR("Framebuffer is not complete: Default framebuffer does not exist");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-                DXGL_ERROR("Framebuffer is not complete: Any of the framebuffer attachment points are framebuffer incomplete");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-                DXGL_ERROR("Framebuffer is not complete: Does not have at least one image attached to it");
-                break;
-            case GL_FRAMEBUFFER_UNSUPPORTED:
-                DXGL_ERROR("Framebuffer is not complete: Unsupported framebuffer setup, check settings.");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
-                DXGL_ERROR("Framebuffer is not complete: Mismatch in multisample setup.");
-                break;
-            default:
-                DXGL_ERROR("Framebuffer is not complete (unknown status = %X)", eStatus);
-            }
-            return false;
-        }
-        return true;
-    }
-
-    void STextureState::ApplyFormatMode(GLuint uTexture, GLenum eTarget)
-    {
-        GLint aiSwizzleRGBA[4];
-        SwizzleMaskToRGBA(m_uSwizzleMask, aiSwizzleRGBA);
-#if !DXGLES
-        glTextureParameterivEXT(uTexture, eTarget, GL_TEXTURE_SWIZZLE_RGBA, aiSwizzleRGBA);
-#else
-        glTextureParameterivEXT(uTexture, eTarget, GL_TEXTURE_SWIZZLE_R, &aiSwizzleRGBA[0]);
-        glTextureParameterivEXT(uTexture, eTarget, GL_TEXTURE_SWIZZLE_G, &aiSwizzleRGBA[1]);
-        glTextureParameterivEXT(uTexture, eTarget, GL_TEXTURE_SWIZZLE_B, &aiSwizzleRGBA[2]);
-        glTextureParameterivEXT(uTexture, eTarget, GL_TEXTURE_SWIZZLE_A, &aiSwizzleRGBA[3]);
-#endif
-
-#if DXGL_SUPPORT_STENCIL_TEXTURES
-        if (m_iDepthStencilTextureMode)
-        {
-            glTextureParameteriEXT(uTexture, eTarget, GL_DEPTH_STENCIL_TEXTURE_MODE, m_iDepthStencilTextureMode);
-        }
-#endif //DXGL_SUPPORT_STENCIL_TEXTURES
-    }
-
-    void STextureState::ApplyFormatMode(GLenum eTarget)
-    {
-        GLint aiSwizzleRGBA[4];
-        SwizzleMaskToRGBA(m_uSwizzleMask, aiSwizzleRGBA);
-#if !DXGLES
-        glTexParameteriv(eTarget, GL_TEXTURE_SWIZZLE_RGBA, aiSwizzleRGBA);
-#else
-        glTexParameteriv(eTarget, GL_TEXTURE_SWIZZLE_R, &aiSwizzleRGBA[0]);
-        glTexParameteriv(eTarget, GL_TEXTURE_SWIZZLE_G, &aiSwizzleRGBA[1]);
-        glTexParameteriv(eTarget, GL_TEXTURE_SWIZZLE_B, &aiSwizzleRGBA[2]);
-        glTexParameteriv(eTarget, GL_TEXTURE_SWIZZLE_A, &aiSwizzleRGBA[3]);
-#endif
-
-#if DXGL_SUPPORT_STENCIL_TEXTURES
-        if (m_iDepthStencilTextureMode)
-        {
-            glTexParameteri(eTarget, GL_DEPTH_STENCIL_TEXTURE_MODE, m_iDepthStencilTextureMode);
-        }
-#endif //DXGL_SUPPORT_STENCIL_TEXTURES
-    }
-
-    void STextureState::Apply(GLuint uTexture, GLenum eTarget, const STextureUnitCache& kCurrentUnitCache)
-    {
-#if (defined(glTextureParameteriEXT) && defined(glTextureParameterivEXT)) || !defined(USE_FAST_NAMED_APPROXIMATION)
-        ApplyFormatMode(uTexture, eTarget);
-
-        glTextureParameteriEXT(uTexture, eTarget, GL_TEXTURE_BASE_LEVEL, m_iBaseMipLevel);
-        glTextureParameteriEXT(uTexture, eTarget, GL_TEXTURE_MAX_LEVEL, m_iMaxMipLevel);
-#else
-        switch (eTarget)
-        {
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
-            eTarget = GL_TEXTURE_CUBE_MAP;
-            break;
-        default:
-            eTarget = eTarget;
-            break;
-        }
-
-        glBindTexture(eTarget, uTexture);
-
-        ApplyFormatMode(eTarget);
-
-        glTexParameteri(eTarget, GL_TEXTURE_BASE_LEVEL, m_iBaseMipLevel);
-        glTexParameteri(eTarget, GL_TEXTURE_MAX_LEVEL, m_iMaxMipLevel);
-
-        if (kCurrentUnitCache.m_eTextureTarget == eTarget)
-        {
-            glBindTexture(kCurrentUnitCache.m_eTextureTarget, kCurrentUnitCache.m_kTextureName.GetName());
-        }
-        else
-        {
-            glBindTexture(eTarget, 0);
-        }
-
-#endif
-    }
-
-    // Default value of -1000 is from the OpenGL spec and is the default value
-    // it uses when the min LOD is not specified.
-    static const float OPENGL_DEFAULT_MIN_LOD = -1000.0f;
-
-    STexture::STexture(GLsizei iWidth, GLsizei iHeight, GLsizei iDepth, GLenum eTarget, EGIFormat eFormat, uint32 uNumMipLevels, uint32 uNumElements)
-        : m_eTarget(eTarget)
-        , m_eFormat(eFormat)
-        , m_uNumMipLevels(uNumMipLevels)
-        , m_uNumElements(uNumElements)
-        , m_iWidth(iWidth)
-        , m_iHeight(iHeight)
-        , m_iDepth(iDepth)
-        , m_pShaderViewsHead(NULL)
-        , m_pOutputMergerViewsHead(NULL)
-        , m_pBoundModifier(NULL)
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        , m_akPixelBuffers(NULL)
-#else
-        , m_pSystemMemoryCopy(NULL)
-#endif
-        , m_fMinLod(OPENGL_DEFAULT_MIN_LOD)
-    {
-#if DXGL_FULL_EMULATION
-        m_uNumElements = max(1u, m_uNumElements);
-#endif //DXGL_FULL_EMULATION
-#if defined(ANDROID)
-        ResetDontCareActionFlags();
-#endif
-    }
-
-    STexture::~STexture()
-    {
-        if (m_kCopyImageView.IsValid())
-        {
-            GLuint uViewName(m_kCopyImageView.GetName());
-            if (uViewName != m_kName.GetName())
-            {
-                glDeleteTextures(1, &uViewName);
-            }
-        }
-
-        if (m_kName.IsValid())
-        {
-            GLuint uName(m_kName.GetName());
-            glDeleteTextures(1, &uName);
-        }
-
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        if (m_akPixelBuffers != NULL)
-        {
-            CResourceName* pPixelBuffersEnd(m_akPixelBuffers + m_uNumElements * m_uNumMipLevels);
-            for (CResourceName* pPixelBuffer = m_akPixelBuffers; pPixelBuffer < pPixelBuffersEnd; ++pPixelBuffer)
-            {
-                GLuint uName(pPixelBuffer->GetName());
-                glDeleteBuffers(1, &uName);
-            }
-            delete [] m_akPixelBuffers;
-        }
-#else
-        if (m_pSystemMemoryCopy != NULL)
-        {
-            MemalignFree(m_pSystemMemoryCopy);
-        }
-#endif
-    }
-
-    void STexture::SetMinLod(float minLod)
-    {
-        m_fMinLod = minLod;
-        glTextureParameterfEXT(m_kName.GetName(), m_eTarget, GL_TEXTURE_MIN_LOD, minLod);
-    }
-
-    SShaderTextureViewPtr STexture::CreateShaderResourceView(const SShaderTextureViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        DXGL_TODO("This is not thread-safe, as multiple threads can create shader views for the same texture. Add synchronization primitive.");
-
-        SShaderTextureViewPtr spView(new SShaderTextureView(kConfiguration));
-        if (!spView->Init(this, pContext))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SShaderImageViewPtr STexture::CreateUnorderedAccessView(const SShaderImageViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        DXGL_TODO("This is not thread-safe, as multiple threads can create unordered access view for the same texture. Add synchronization primitive.");
-
-        SShaderImageViewPtr spView(new SShaderImageView(kConfiguration));
-        if (!spView->Init(this, pContext))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SOutputMergerTextureViewPtr STexture::CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        SOutputMergerTextureViewPtr spView(new SOutputMergerTextureView(this, kConfiguration));
-        if (!spView->Init(pContext))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SOutputMergerTextureViewPtr STexture::GetCompatibleOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        DXGL_TODO("This is not thread-safe, as multiple threads can create output merger views for the same texture. Add synchronization primitive.");
-
-        SOutputMergerTextureView* pExistingView(m_pOutputMergerViewsHead);
-        while (pExistingView != NULL)
-        {
-            if (pExistingView->m_kConfiguration == kConfiguration)
-            {
-                return pExistingView;
-            }
-            pExistingView = pExistingView->m_pNextView;
-        }
-
-        return CreateOutputMergerView(kConfiguration, pContext);
-    }
-
-#if defined(ANDROID)
-    void STexture::ResetDontCareActionFlags()
-    {
-        m_bColorLoadDontCare = false;
-        m_bDepthLoadDontCare = false;
-        m_bStencilLoadDontCare = false;
-        m_bColorStoreDontCare = false;
-        m_bDepthStoreDontCare = false;
-        m_bStencilStoreDontCare = false;
-        m_bColorStoreDontCareWhenUnbound = false;
-        m_bDepthStoreDontCareWhenUnbound = false;
-        m_bStencilStoreDontCareWhenUnbound = false;
-        m_bColorWasInvalidatedWhenUnbound = false;
-        m_bDepthWasInvalidatedWhenUnbound = false;
-        m_bStencilWasInvalidatedWhenUnbound = false;
-    }
-
-    void STexture::UpdateDontCareActionFlagsOnBound()
-    {
-        m_bColorStoreDontCareWhenUnbound = m_bColorStoreDontCare;
-        m_bDepthStoreDontCareWhenUnbound = m_bDepthStoreDontCare;
-        m_bStencilStoreDontCareWhenUnbound = m_bStencilStoreDontCare;
-
-        //  open gl marks buffer invalid until it is cleared or something is rendered into it.
-        //  If you bump into one of these asserts this means that you've dsicarded buffer content on
-        //  resolve and try to restore. Although this behaviur is perfectly ok for Metal
-        //  this won't work for GL. Render buffer won't be restored and might be either cleared
-        //  or pixel state might become undefined (depending on GPU vendor).
-        assert((!m_bColorWasInvalidatedWhenUnbound) || (m_bColorWasInvalidatedWhenUnbound && m_bColorLoadDontCare));
-        assert((!m_bDepthWasInvalidatedWhenUnbound) || (m_bDepthWasInvalidatedWhenUnbound && m_bDepthLoadDontCare));
-        assert((!m_bStencilWasInvalidatedWhenUnbound) || (m_bStencilWasInvalidatedWhenUnbound && m_bStencilLoadDontCare));
-
-        m_bColorLoadDontCare = false;
-        m_bDepthLoadDontCare = false;
-        m_bStencilLoadDontCare = false;
-        m_bColorStoreDontCare = false;
-        m_bDepthStoreDontCare = false;
-        m_bStencilStoreDontCare = false;
-        m_bColorWasInvalidatedWhenUnbound = false;
-        m_bDepthWasInvalidatedWhenUnbound = false;
-        m_bStencilWasInvalidatedWhenUnbound = false;
-    }
-
-    void STexture::UpdateDontCareActionFlagsOnUnbound()
-    {
-        m_bColorWasInvalidatedWhenUnbound = m_bColorStoreDontCareWhenUnbound;
-        m_bDepthWasInvalidatedWhenUnbound = m_bDepthStoreDontCareWhenUnbound;
-        m_bStencilWasInvalidatedWhenUnbound = m_bStencilStoreDontCareWhenUnbound;
-
-        m_bColorStoreDontCareWhenUnbound = false;
-        m_bDepthStoreDontCareWhenUnbound = false;
-        m_bStencilStoreDontCareWhenUnbound = false;
-    }
-#endif
-
-#if DXGL_SUPPORT_APITRACE && defined(WIN32)
-
-#if defined(WIN32)
-    uint32 SDynamicBufferCopy::ms_uPageSize = 0;
-#endif //defined(WIN32)
-
-    SDynamicBufferCopy::SDynamicBufferCopy()
-        : m_pData(NULL)
-        , m_uSize(0)
-    #if defined(WIN32)
-        , m_apDirtyPages(NULL)
-        , m_uNumPages(0)
-    #endif //defined(WIN32)
-    {
-    }
-
-    SDynamicBufferCopy::~SDynamicBufferCopy()
-    {
-        Free();
-    }
-
-    uint8* SDynamicBufferCopy::Allocate(uint32 uSize)
-    {
-        m_uSize = uSize;
-#if defined(WIN32)
-        if (ms_uPageSize == 0)
-        {
-            SYSTEM_INFO kInfo;
-            GetSystemInfo(&kInfo);
-            ms_uPageSize = kInfo.dwPageSize;
-        }
-
-        m_uNumPages = (uSize + ms_uPageSize - 1) / ms_uPageSize;
-        m_pData = reinterpret_cast<uint8*>(VirtualAlloc(NULL, m_uNumPages * ms_uPageSize, MEM_COMMIT | MEM_RESERVE | MEM_WRITE_WATCH, PAGE_READWRITE));
-        m_apDirtyPages = new void*[m_uNumPages];
-        return m_pData;
-#else
-        #error "Not implemented on this platform"
-#endif
-    }
-
-    void SDynamicBufferCopy::Free()
-    {
-#if defined(WIN32)
-        if (m_pData != NULL)
-        {
-            VirtualFree(m_pData, 0, MEM_RELEASE);
-        }
-        delete [] m_apDirtyPages;
-        m_apDirtyPages = NULL;
-#else
-        #error "Not implemented on this platform"
-#endif
-        m_pData = NULL;
-    }
-
-    void SDynamicBufferCopy::ResetDirtyRegion()
-    {
-#if defined(WIN32)
-        ResetWriteWatch(m_pData, m_uNumPages * ms_uPageSize);
-#else
-    #error "Not implemented on this platform"
-#endif
-    }
-
-    bool SDynamicBufferCopy::GetDirtyRegion(uint32& uOffset, uint32& uSize)
-    {
-#if defined(WIN32)
-        ULONG uGranularity;
-        ULONG_PTR uCount(m_uNumPages);
-        if (GetWriteWatch(0, m_pData, m_uNumPages * ms_uPageSize, m_apDirtyPages, &uCount, &uGranularity) != 0)
-        {
-            return false;
-        }
-
-        uint32 uMin(0xFFFFFFFF), uMax(0);
-        uint32 uChange;
-        for (uChange = 0; uChange < uCount; ++uChange)
-        {
-            assert(m_apDirtyPages[uChange] >= m_pData);
-            uint32 uOffset((uint32)(reinterpret_cast<char*>(m_apDirtyPages[uChange]) - reinterpret_cast<char*>(m_pData)));
-            uMin = min(uMin, uOffset);
-            uMax = max(uMax, uOffset);
-        }
-
-        if (uMin > uMax)
-        {
-            uSize = 0;
-            uOffset = 0;
-        }
-        else
-        {
-            uMax = min(uMax + ms_uPageSize, m_uSize) - 1;
-
-            uOffset = uMin;
-            uSize = uMax - uMin + 1;
-        }
-
-        return true;
-#else
-    #error "Not implemented on this platform"
-#endif
-    }
-
-#endif //DXGL_SUPPORT_APITRACE
-
-    SBuffer::SBuffer()
-        : m_pSystemMemoryCopy(NULL)
-        , m_bMapped(false)
-        , m_pTextureBuffersHead(NULL)
-#if DXGL_SUPPORT_APITRACE
-        , m_bSystemMemoryCopyOwner(true)
-#endif //DXGL_SUPPORT_APITRACE
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        , m_bStreaming(false)
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-    {
-    }
-
-    SBuffer::~SBuffer()
-    {
-        if (m_kName.IsValid())
-        {
-            GLuint uName(m_kName.GetName());
-            glDeleteBuffers(1, &uName);
-        }
-        if (
-#if DXGL_SUPPORT_APITRACE
-            m_bSystemMemoryCopyOwner &&
-#endif //DXGL_SUPPORT_APITRACE
-            m_pSystemMemoryCopy != NULL)
-        {
-            MemalignFree(m_pSystemMemoryCopy);
-        }
-    }
-
-    SShaderViewPtr SBuffer::CreateShaderResourceView(EGIFormat eFormat, uint32 uFirstElement, uint32 uNumElements, uint32 uFlags, CContext* pContext)
-    {
-        DXGL_TODO("Consider uFlags as well if required")
-
-        if (m_uElementSize > 0) // Structured buffer
-        {
-            return CreateBufferView(uFirstElement, uNumElements, pContext);
-        }
-
-        SShaderTextureBufferViewConfiguration kTextureBufferConfiguration(eFormat, uFirstElement, uNumElements);
-        SShaderTextureBufferViewPtr spTextureBufferView(GetTextureBuffer(kTextureBufferConfiguration, pContext));
-
-        return spTextureBufferView;
-    }
-
-    SShaderViewPtr SBuffer::CreateUnorderedAccessView(EGIFormat eFormat, uint32 uFirstElement, uint32 uNumElements, uint32 uFlags, CContext* pContext)
-    {
-        DXGL_TODO("Consider uFlags as well if required")
-
-        if (m_uElementSize > 0) // Structured buffer
-        {
-            return CreateBufferView(uFirstElement, uNumElements, pContext);
-        }
-
-        SShaderTextureBufferViewConfiguration kTextureBufferConfiguration(eFormat, uFirstElement, uNumElements);
-        SShaderTextureBufferViewPtr spTextureBufferView(GetTextureBuffer(kTextureBufferConfiguration, pContext));
-
-        GLenum eImageFormat(GL_NONE);
-        if (!GetImageFormat(eFormat, &eImageFormat))
-        {
-            DXGL_ERROR("Unsupported format for unordered access view");
-            return NULL;
-        }
-
-        SShaderImageViewPtr spImageView(new SShaderImageView(SShaderImageViewConfiguration(eImageFormat, 0, -1, GL_READ_WRITE)));
-        if (!spImageView->Init(spTextureBufferView, pContext))
-        {
-            return NULL;
-        }
-
-        return spImageView;
-    }
-
-    SShaderTextureBufferViewPtr SBuffer::GetTextureBuffer(SShaderTextureBufferViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        SShaderTextureBufferView* pExistingTextureBuffer(m_pTextureBuffersHead);
-        while (pExistingTextureBuffer != NULL)
-        {
-            if (pExistingTextureBuffer->m_kConfiguration == kConfiguration)
-            {
-                return pExistingTextureBuffer;
-            }
-            pExistingTextureBuffer = pExistingTextureBuffer->m_pNextView;
-        }
-
-        SShaderTextureBufferViewPtr spNewView(new SShaderTextureBufferView(kConfiguration));
-        if (!spNewView->Init(this, pContext))
-        {
-            return NULL;
-        }
-
-        return spNewView;
-    }
-
-    SShaderBufferViewPtr SBuffer::CreateBufferView(uint32 uFirstElement, uint32 uNumElements, CContext* pContext)
-    {
-        SBufferRange kRange(uFirstElement * m_uElementSize, uNumElements * m_uElementSize);
-        SShaderBufferView* pBufferView;
-        if (kRange.m_uOffset == 0 && kRange.m_uSize == m_uSize)
-        {
-            pBufferView = new SShaderBufferView(SBufferRange());
-        }
-        else
-        {
-            pBufferView = new SShaderBufferView(kRange);
-        }
-        pBufferView->Init(this, pContext);
-        return pBufferView;
-    }
-
-    SQuery::~SQuery()
-    {
-    }
-
-    void SQuery::Begin()
-    {
-    }
-
-    void SQuery::End()
-    {
-    }
-
-    uint32 SQuery::GetDataSize()
-    {
-        return 0;
-    }
-
-    SPlainQuery::SPlainQuery(GLenum eTarget)
-        : m_eTarget(eTarget)
-        , m_bBegun(false)
-    {
-    }
-
-    SPlainQuery::~SPlainQuery()
-    {
-        glDeleteQueries(1, &m_uName);
-    }
-
-    void SPlainQuery::Begin()
-    {
-        glBeginQuery(m_eTarget, m_uName);
-        m_bBegun = true;
-    }
-
-    void SPlainQuery::End()
-    {
-        glEndQuery(m_eTarget);
-    }
-
-    SOcclusionQuery::SOcclusionQuery()
-#if DXGLES
-    // GLES does not have GL_SAMPLES_PASSED
-        : SPlainQuery(GL_ANY_SAMPLES_PASSED)
-#else
-        : SPlainQuery(GL_SAMPLES_PASSED)
-#endif
-    {
-    }
-
-    bool SOcclusionQuery::GetData(void* pData, uint32 uDataSize, bool bFlush)
-    {
-        if (m_bBegun) // Query objects are only defined after the first glBeginQuery call
-        {
-            GLuint uResultAvailable(GL_FALSE);
-            glGetQueryObjectuiv(m_uName, GL_QUERY_RESULT_AVAILABLE, &uResultAvailable);
-            // Prevent garbage reads https://plus.google.com/+RomainGuy/posts/DgemC8aa7qH
-            if ((uResultAvailable & GL_TRUE) == GL_TRUE)
-            {
-#if DXGLES
-                GLuint uResult;
-                glGetQueryObjectuiv(m_uName, GL_QUERY_RESULT, &uResult);
-#else
-                GLuint64 uResult;
-                glGetQueryObjectui64v(m_uName, GL_QUERY_RESULT, &uResult);
-#endif
-                *reinterpret_cast<UINT64*>(pData) = uResult;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    uint32 SOcclusionQuery::GetDataSize()
-    {
-        return (uint32)sizeof(UINT64);
-    }
-
-    SFenceSync::SFenceSync()
-        : m_pFence(NULL)
-    {
-    }
-
-    SFenceSync::~SFenceSync()
-    {
-        if (m_pFence)
-        {
-            glDeleteSync(m_pFence);
-        }
-    }
-
-    void SFenceSync::End()
-    {
-        if (m_pFence)
-        {
-            glDeleteSync(m_pFence);
-        }
-        m_pFence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-        AZ_Assert(m_pFence, "Failed to create fence");
-    }
-
-    bool SFenceSync::GetData(void* pData, uint32 uDataSize, bool bFlush)
-    {
-        assert(m_pFence != NULL);
-        GLbitfield flags = 0;
-        if (bFlush)
-        {
-            if (gRenDev->GetFeatures() & RFT_HW_QUALCOMM)
-            {
-                // There's a driver bug with some Qualcomm devices that don't apply the GL_SYNC_FLUSH_COMMANDS_BIT flag.
-                // We manually do a glFlush before calling glClientWaitSync.
-                glFlush();
-            }
-            else
-            {
-                flags |= GL_SYNC_FLUSH_COMMANDS_BIT;
-            }
-        }
-
-        GLenum eResult(glClientWaitSync(m_pFence, flags, 0));
-        if (eResult != GL_TIMEOUT_EXPIRED)
-        {
-            *reinterpret_cast<BOOL*>(pData) = eResult == GL_WAIT_FAILED ? FALSE : TRUE;
-            return true;
-        }
-        return false;
-    }
-
-    uint32 SFenceSync::GetDataSize()
-    {
-        return (uint32)sizeof(BOOL);
-    }
-
-#if DXGL_SUPPORT_TIMER_QUERIES
-
-    bool STimestampDisjointQuery::GetData(void* pData, uint32 uDataSize, bool bFlush)
-    {
-        D3D11_QUERY_DATA_TIMESTAMP_DISJOINT* pTimestampDisjoint(alias_cast<D3D11_QUERY_DATA_TIMESTAMP_DISJOINT*>(pData));
-        pTimestampDisjoint->Frequency = 1000000000; // Timestamps are expressed in nanoseconds
-        DXGL_TODO("Check if there's a way to detect the reliability of timestamps/time elapsed");
-        pTimestampDisjoint->Disjoint = FALSE;
-        return true;
-    }
-
-    uint32 STimestampDisjointQuery::GetDataSize()
-    {
-        return (uint32)sizeof(D3D11_QUERY_DATA_TIMESTAMP_DISJOINT);
-    }
-
-    STimestampQuery::STimestampQuery()
-    {
-        glGenQueries(1, &m_uName);
-    }
-
-    STimestampQuery::~STimestampQuery()
-    {
-        glDeleteQueries(1, &m_uName);
-    }
-
-    void STimestampQuery::End()
-    {
-        glQueryCounter(m_uName, GL_TIMESTAMP);
-    }
-
-    bool STimestampQuery::GetData(void* pData, uint32 uDataSize, bool bFlush)
-    {
-        GLint iAvailable;
-        glGetQueryObjectiv(m_uName, GL_QUERY_RESULT_AVAILABLE, &iAvailable);
-        if (iAvailable == 0 && bFlush)
-        {
-            glFlush();
-            glGetQueryObjectiv(m_uName, GL_QUERY_RESULT_AVAILABLE, &iAvailable);
-        }
-        if (iAvailable != 0)
-        {
-            GLuint64 uResult;
-            glGetQueryObjectui64v(m_uName, GL_QUERY_RESULT, &uResult);
-            UINT64* puTimestampData(alias_cast<UINT64*>(pData));
-            *puTimestampData = uResult;
-            return true;
-        }
-        return false;
-    }
-
-    uint32 STimestampQuery::GetDataSize()
-    {
-        return (uint32)sizeof(UINT64);
-    }
-
-#endif //DXGL_SUPPORT_TIMER_QUERIES
-
-
-    SDefaultFrameBufferTexture::SDefaultFrameBufferTexture(GLsizei iWidth, GLsizei iHeight, EGIFormat eFormat, GLbitfield uBufferMask)
-        : STexture(iWidth, iHeight, 1, GL_TEXTURE_2D, eFormat, 1, 1)
-        , m_uBufferMask(uBufferMask)
-        , m_eInputColorBuffer(GL_INVALID_ENUM)
-        , m_eOutputColorBuffer(GL_INVALID_ENUM)
-        , m_uTextureRefCount(0)
-        , m_iDefaultFBOWidth(iWidth)
-        , m_iDefaultFBOHeight(iHeight)
-        , m_bInputDirty(false)
-        , m_bOutputDirty(false)
-#if DXGL_FULL_EMULATION
-        , m_kCustomWindowContext(NULL)
-#endif //DXGL_FULL_EMULATION
-    {
-        m_pfUpdateSubresource = &UpdateSubresource;
-        m_pfMapSubresource       = &MapSubresource;
-        m_pfUnmapSubresource     = &UnmapSubresource;
-        m_pfUnpackData           = &UnpackData;
-        m_pfPackData             = &PackData;
-        m_pfLocatePackedDataFunc = &LocatePackedData;
-    }
-
-    SDefaultFrameBufferTexture::~SDefaultFrameBufferTexture()
-    {
-        if (m_uTextureRefCount > 0)
-        {
-            ReleaseTexture();
-        }
-    }
-
-    SShaderTextureViewPtr SDefaultFrameBufferTexture::CreateShaderResourceView(const SShaderTextureViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        SShaderTextureViewPtr spView(new SDefaultFrameBufferShaderTextureView(kConfiguration));
-        if (!spView->Init(this, pContext))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SShaderImageViewPtr SDefaultFrameBufferTexture::CreateUnorderedAccessView(const SShaderImageViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        SShaderImageViewPtr spView(new SShaderImageView(kConfiguration));
-        if (!spView->Init(this, pContext))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SOutputMergerTextureViewPtr SDefaultFrameBufferTexture::CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CContext* pContext)
-    {
-        SOutputMergerTextureViewPtr spView(new SDefaultFrameBufferOutputMergerView(this, kConfiguration));
-        if (!spView->Init(pContext))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    void SDefaultFrameBufferTexture::OnCopyRead(CContext* pContext)
-    {
-        EnsureTextureExists(pContext);
-        OnRead(pContext);
-    }
-
-    void SDefaultFrameBufferTexture::OnCopyWrite(CContext* pContext)
-    {
-        EnsureTextureExists(pContext);
-        OnWrite(pContext, false);
-    }
-
-
-    void SDefaultFrameBufferTexture::IncTextureRefCount(CContext* pContext)
-    {
-        ++m_uTextureRefCount;
-        if (m_uTextureRefCount == 1)
-        {
-            const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(m_eFormat));
-            if (pFormatInfo == NULL || pFormatInfo->m_pTexture == NULL)
-            {
-                DXGL_ERROR("Invalid format for frame buffer texture (could not retrieve texture format info)");
-                return;
-            }
-
-            GLuint uName;
-            glGenTextures(1, &uName);
-            m_kName = pContext->GetDevice()->GetTextureNamePool().Create(uName);
-            if (pContext->GetDevice()->IsFeatureSupported(eF_CopyImage))
-            {
-                m_kCopyImageView = m_kName;
-                m_eCopyImageTarget = m_eTarget;
-            }
-            m_kInputFBO.m_bUsesSRGB   = pFormatInfo->m_pTexture->m_bSRGB;
-            m_kDefaultFBO.m_bUsesSRGB = pFormatInfo->m_pTexture->m_bSRGB;
-
-#if DXGL_USE_IMMUTABLE_TEXTURES
-            glTextureStorage2DEXT(uName, m_eTarget, m_uNumMipLevels, pFormatInfo->m_pTexture->m_iInternalFormat, m_iWidth, m_iHeight);
-#else
-            glTextureImage2DEXT(uName, m_eTarget, 0, pFormatInfo->m_pTexture->m_iInternalFormat, m_iWidth, m_iHeight, 0, pFormatInfo->m_pTexture->m_eBaseFormat, pFormatInfo->m_pTexture->m_eDataType, NULL);
-#endif
-            GLuint uInputFBOName;
-#if !DXGLES && !USE_NVIDIA_NISGHT && !MAC
-            if (glCreateFramebuffers)
-            {
-                // Use create framebuffers instead of gen otherwise we would have to
-                // bind the framebuffer once to create the actual FBO before we can
-                // call the glNamedFramebuffer* functions. If this function does not
-                // exist, then the glNamedFramebuffers will not either and we handle
-                // that case already
-                glCreateFramebuffers(1, &uInputFBOName);
-            }
-            else
-#endif
-            {
-                glGenFramebuffers(1, &uInputFBOName);
-            }
-
-            m_kInputFBO.m_kName = pContext->GetDevice()->GetFrameBufferNamePool().Create(uInputFBOName);
-
-            if ((m_uBufferMask & GL_COLOR_BUFFER_BIT) != 0)
-            {
-                glNamedFramebufferTextureEXT(uInputFBOName, GL_COLOR_ATTACHMENT0, uName, 0);
-                m_eInputColorBuffer = GL_COLOR_ATTACHMENT0;
-#if !DXGLES
-                m_eOutputColorBuffer = GL_BACK_LEFT; // This has to be one of GL_BACK_LEFT, GL_BACK_RIGHT, GL_FRONT_LEFT, GL_FRONT_RIGHT or glDrawBuffer will fail
-#else
-#if     defined(IOS)
-                // There is no default framebuffer on IOS. There is only one created by the UIKit API.
-                m_eOutputColorBuffer = GL_COLOR_ATTACHMENT0;
-#       else
-                m_eOutputColorBuffer = GL_BACK;
-#       endif // defined(IOS)
-#endif
-            }
-            else
-            {
-                m_eInputColorBuffer = GL_NONE;
-                m_eOutputColorBuffer = GL_NONE;
-            }
-
-            if ((m_uBufferMask & GL_DEPTH_BUFFER_BIT) != 0)
-            {
-                glNamedFramebufferTextureEXT(uInputFBOName, GL_DEPTH_ATTACHMENT, uName, 0);
-            }
-
-            if ((m_uBufferMask & GL_STENCIL_BUFFER_BIT) != 0)
-            {
-                glNamedFramebufferTextureEXT(uInputFBOName, GL_STENCIL_ATTACHMENT, uName, 0);
-            }
-
-            GLenum eStatus(glCheckNamedFramebufferStatusEXT(uInputFBOName, GL_DRAW_FRAMEBUFFER));
-            if (eStatus != GL_FRAMEBUFFER_COMPLETE)
-            {
-                DXGL_ERROR("Default input framebuffer is not complete (status = %d)", eStatus);
-                glDeleteFramebuffers(1, &uInputFBOName);
-                m_kInputFBO.m_kName = CResourceName();
-            }
-            //TODO: Remove this hack to clear the default engine framebuffer color buffer on startup
-            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, uInputFBOName);
-            glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-            glClear(GL_COLOR_BUFFER_BIT);
-            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, uInputFBOName);
-        }
-    }
-
-    void SDefaultFrameBufferTexture::DecTextureRefCount()
-    {
-        // Custom FBO
-        --m_uTextureRefCount;
-        if (m_uTextureRefCount == 0)
-        {
-            ReleaseTexture();
-        }
-    }
-
-    void SDefaultFrameBufferTexture::EnsureTextureExists(CContext* pContext)
-    {
-        if (m_uTextureRefCount == 0)
-        {
-            DXGL_WARNING("Extra default framebuffer texture was forced as a fallback for a currently missing implementation");
-            IncTextureRefCount(pContext);
-        }
-    }
-
-    void SDefaultFrameBufferTexture::ReleaseTexture()
-    {
-        m_kInputFBOColorTextureView = nullptr;
-        if (m_kInputFBO.m_kName.IsValid())
-        {
-            GLuint uInputFBOName(m_kInputFBO.m_kName.GetName());
-            glDeleteFramebuffers(1, &uInputFBOName);
-            m_kInputFBO.m_kName = CResourceName();
-        }
-        if (m_kName.IsValid())
-        {
-            GLuint uTextureName(m_kName.GetName());
-            glDeleteTextures(1, &uTextureName);
-            m_kName = CResourceName();
-        }
-        m_kCopyImageView = m_kName;
-    }
-
-    void SDefaultFrameBufferTexture::OnWrite(CContext* pContext, bool bDefaultFrameBuffer)
-    {
-#if DXGL_FULL_EMULATION
-        if (m_kCustomWindowContext != NULL)
-        {
-            pContext->SetWindowContext(m_kCustomWindowContext);
-        }
-#endif //DXGL_FULL_EMULATION
-        if (bDefaultFrameBuffer)
-        {
-            m_bInputDirty = true; // Default frame buffer - write to output directly
-        }
-        else
-        {
-            m_bOutputDirty = true; // Custom FBO - write to input
-        }
-    }
-
-    void SDefaultFrameBufferTexture::OnRead(CContext* pContext)
-    {
-        if (m_bInputDirty)
-        {
-            // Copy default buffer (output) to texture (input)
-            pContext->BlitFrameBuffer(
-                m_kDefaultFBO, m_kInputFBO,
-                m_eOutputColorBuffer, m_eInputColorBuffer,
-#if CRY_OPENGL_FLIP_Y
-                0, m_iDefaultFBOHeight, m_iDefaultFBOWidth, 0,
-#else
-                0, 0, m_iDefaultFBOWidth, m_iDefaultFBOHeight,
-#endif
-                0, 0, m_iWidth, m_iHeight,
-                m_uBufferMask, (m_iDefaultFBOWidth == m_iWidth) ? GL_NEAREST : GL_LINEAR);
-        }
-    }
-
-    void SDefaultFrameBufferTexture::Flush(CContext* pContext)
-    {
-        if (m_bOutputDirty)
-        {
-            GLint iSrcYMin = 0;
-            GLint iSrcYMax = m_iHeight;
-#if CRY_OPENGL_FLIP_Y
-            AZStd::swap(iSrcYMin, iSrcYMax);
-#endif
-
-            // Copy texture (input) to default buffer (output)
-            GLenum filter = (m_iDefaultFBOWidth == m_iWidth) ? GL_NEAREST : GL_LINEAR;
-            uint32 glVersion = pContext->GetDevice()->GetFeatureSpec().m_kVersion.ToUint();
-            if (DXGLES && glVersion == DXGLES_VERSION_30 && gRenDev->GetFeatures() & RFT_HW_QUALCOMM)
-            {
-                // OpenGLES 3.0 Qualcomm driver has a bug that rotates the image 90 degrees when doing a
-                // glBlitFramebuffer into the default framebuffer when in landscape mode. Because of this we
-                // do the blitting using a shader instead.
-                if (!m_kInputFBOColorTextureView)
-                {
-                    SShaderTextureViewConfiguration conf(m_eFormat, m_eTarget, 0, m_uNumMipLevels, 0, m_uNumElements);
-                    m_kInputFBOColorTextureView = CreateShaderResourceView(conf, pContext);
-                }
-
-                pContext->BlitTextureToFrameBuffer(
-                    m_kInputFBOColorTextureView,
-                    m_kDefaultFBO,
-                    m_eOutputColorBuffer,
-                    0, iSrcYMin, m_iWidth, iSrcYMax,
-                    0, 0, m_iDefaultFBOWidth, m_iDefaultFBOHeight,
-                    filter, filter);
-            }
-            else
-            {
-                pContext->BlitFrameBuffer(
-                    m_kInputFBO, m_kDefaultFBO,
-                    m_eInputColorBuffer, m_eOutputColorBuffer,
-                    0, iSrcYMin, m_iWidth, iSrcYMax,
-                    0, 0, m_iDefaultFBOWidth, m_iDefaultFBOHeight,
-                    m_uBufferMask, filter);
-            }
-        }
-    }
-
-#if DXGL_FULL_EMULATION
-
-    void SDefaultFrameBufferTexture::SetCustomWindowContext(const TWindowContext& kCustomWindowContext)
-    {
-        m_kCustomWindowContext = kCustomWindowContext;
-    }
-
-#endif //DXGL_FULL_EMULATION
-
-    typedef SSingleTexImpl<STex2DUncompressed, STexPartition> TDefaultFrameBufferTextureImpl;
-
-    void SDefaultFrameBufferTexture::UpdateSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext)
-    {
-        SDefaultFrameBufferTexture* pDefaultFrameBufferTexture = static_cast<SDefaultFrameBufferTexture*>(pResource);
-
-        DXGL_TODO(
-            "Currently only the texture FBO case is handled so we have to make sure that the texture "
-            "exists during this function call. The default framebuffer case should be supported too.");
-        pDefaultFrameBufferTexture->EnsureTextureExists(pContext);
-
-        if (uSubresource > 0)
-        {
-            DXGL_ERROR("The only valid subresource index for the default frame buffer is 0 - cannot update subresource");
-            return;
-        }
-
-        UpdateTexSubresource<TDefaultFrameBufferTextureImpl>(pDefaultFrameBufferTexture, uSubresource, pDstBox, pSrcData, uSrcRowPitch, uSrcDepthPitch, pContext);
-        pDefaultFrameBufferTexture->OnWrite(pContext, false);
-    }
-
-    bool SDefaultFrameBufferTexture::MapSubresource(SResource* pResource, uint32 uSubresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-    {
-        SDefaultFrameBufferTexture* pDefaultFrameBufferTexture = static_cast<SDefaultFrameBufferTexture*>(pResource);
-
-        DXGL_TODO(
-            "Currently only the texture FBO case is handled so we have to make sure that the texture "
-            "exists during this function call. The default framebuffer case should be supported too.");
-        pDefaultFrameBufferTexture->EnsureTextureExists(pContext);
-
-        if (uSubresource > 0)
-        {
-            DXGL_ERROR("The only valid subresource index for the default frame buffer is 0 - cannot map subresource");
-            return false;
-        }
-
-        switch (MapType)
-        {
-        case D3D11_MAP_READ:
-        case D3D11_MAP_READ_WRITE:
-            pDefaultFrameBufferTexture->OnRead(pContext);
-            break;
-        case D3D11_MAP_WRITE:
-            break;
-        default:
-            DXGL_ERROR("Unsupported map operation type for default frame buffer");
-            return false;
-        }
-
-        return MapTexSubresource<TDefaultFrameBufferTextureImpl>(pDefaultFrameBufferTexture, uSubresource, MapType, MapFlags, pMappedResource, pContext);
-    }
-
-    void SDefaultFrameBufferTexture::UnmapSubresource(SResource* pResource, uint32 uSubresource, CContext* pContext)
-    {
-        SDefaultFrameBufferTexture* pDefaultFrameBufferTexture = static_cast<SDefaultFrameBufferTexture*>(pResource);
-
-        DXGL_TODO(
-            "Currently only the texture FBO case is handled so we have to make sure that the texture "
-            "exists during this function call. The default framebuffer case should be supported too.");
-        pDefaultFrameBufferTexture->EnsureTextureExists(pContext);
-
-        if (uSubresource > 0)
-        {
-            DXGL_ERROR("The only valid subresource index for the default frame buffer is 0 - cannot unmap subresource");
-            return;
-        }
-
-        if (pDefaultFrameBufferTexture->m_kMappedSubTextures.size() > 0 && pDefaultFrameBufferTexture->m_kMappedSubTextures.at(0).m_bUpload)
-        {
-            pDefaultFrameBufferTexture->OnWrite(pContext, false);
-        }
-
-        UnmapTexSubresource<TDefaultFrameBufferTextureImpl>(pDefaultFrameBufferTexture, uSubresource, pContext);
-    }
-
-    void SDefaultFrameBufferTexture::UnpackData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext)
-    {
-        SDefaultFrameBufferTexture* pDefaultFrameBufferTexture = static_cast<SDefaultFrameBufferTexture*>(pTexture);
-
-        DXGL_TODO(
-            "Currently only the texture FBO case is handled so we have to make sure that the texture "
-            "exists during this function call. The default framebuffer case should be supported too.");
-        pDefaultFrameBufferTexture->EnsureTextureExists(pContext);
-
-        UnpackTexData<TDefaultFrameBufferTextureImpl>(pDefaultFrameBufferTexture, kSubID, kOffset, kSize, kDataLocation, pContext);
-
-        pDefaultFrameBufferTexture->OnWrite(pContext, false);
-    }
-
-    void SDefaultFrameBufferTexture::PackData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext)
-    {
-        SDefaultFrameBufferTexture* pDefaultFrameBufferTexture = static_cast<SDefaultFrameBufferTexture*>(pTexture);
-
-        DXGL_TODO(
-            "Currently only the texture FBO case is handled so we have to make sure that the texture "
-            "exists during this function call. The default framebuffer case should be supported too.");
-        pDefaultFrameBufferTexture->EnsureTextureExists(pContext);
-
-        pDefaultFrameBufferTexture->OnRead(pContext);
-
-        PackTexData<TDefaultFrameBufferTextureImpl>(pDefaultFrameBufferTexture, kSubID, kOffset, kSize, kDataLocation, pContext);
-    }
-
-    uint32 SDefaultFrameBufferTexture::LocatePackedData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, SMappedSubTexture& kDataLocation)
-    {
-        DXGL_TODO(
-            "Currently only the texture FBO case is handled so we have to make sure that the texture "
-            "exists during this function call. The default framebuffer case should be supported too.");
-
-        return LocateTexPackedData<TDefaultFrameBufferTextureImpl>(pTexture, kSubID, kOffset, kDataLocation);
-    }
-
-    const SGIFormatInfo* GetCompatibleTextureFormatInfo(EGIFormat* peGIFormat)
-    {
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(*peGIFormat));
-        if (pFormatInfo->m_pTexture != NULL)
-        {
-            return pFormatInfo;
-        }
-        if (pFormatInfo->m_eTypelessFormat != eGIF_NUM && pFormatInfo->m_eTypelessFormat != *peGIFormat)
-        {
-            *peGIFormat = pFormatInfo->m_eTypelessFormat;
-            pFormatInfo = GetGIFormatInfo(pFormatInfo->m_eTypelessFormat);
-            if (pFormatInfo->m_pTexture != NULL)
-            {
-                return pFormatInfo;
-            }
-        }
-        *peGIFormat = eGIF_NUM;
-        return NULL;
-    }
-
-    STexturePtr CreateTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateTexture1D")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM ||
-            (pFormatInfo = GetCompatibleTextureFormatInfo(&eGIFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for 1D texture");
-            return NULL;
-        }
-
-        uint32 uNumElements(kDesc.ArraySize);
-        bool bArray(kDesc.ArraySize > 1 || (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY));
-
-        STexturePtr spTexture(
-            new STexture(
-                kDesc.Width, 1, 1,
-                bArray ? GL_TEXTURE_1D : GL_TEXTURE_1D_ARRAY,
-                eGIFormat, GetNumMipLevels(kDesc), kDesc.ArraySize));
-
-        if (kDesc.Usage == D3D11_USAGE_STAGING)
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SStagingTexImpl<STex1DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-            }
-            else
-            {
-                InitializeTexture<SStagingTexImpl<STex1DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-            }
-        }
-        else
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex2DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex1DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-                }
-            }
-            else
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex2DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex1DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-                }
-            }
-        }
-
-        return spTexture;
-    }
-
-    template <typename Partition>
-    void InitializeTexture2D(STexture* pTexture, bool bArray, bool bStaging, const D3D11_SUBRESOURCE_DATA* pInitialData, uint32 uCPUAccess, CContext* pContext, const SGIFormatInfo* pFormatInfo)
-    {
-        if (bStaging)
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SStagingTexImpl<STex2DCompressed> >(pTexture, pInitialData, uCPUAccess, pContext, pFormatInfo);
-            }
-            else
-            {
-                InitializeTexture<SStagingTexImpl<STex2DUncompressed> >(pTexture, pInitialData, uCPUAccess, pContext, pFormatInfo);
-            }
-        }
-        else
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex3DCompressed, Partition> >(pTexture, pInitialData, uCPUAccess, pContext, pFormatInfo);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex2DCompressed, Partition> >(pTexture, pInitialData, uCPUAccess, pContext, pFormatInfo);
-                }
-            }
-            else
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex3DUncompressed, Partition> >(pTexture, pInitialData, uCPUAccess, pContext, pFormatInfo);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex2DUncompressed, Partition> >(pTexture, pInitialData, uCPUAccess, pContext, pFormatInfo);
-                }
-            }
-        }
-    }
-
-    STexturePtr CreateTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateTexture2D")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM ||
-            (pFormatInfo = GetCompatibleTextureFormatInfo(&eGIFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for 2D texture");
-            return NULL;
-        }
-
-        bool bStaging(kDesc.Usage == D3D11_USAGE_STAGING);
-
-        if (kDesc.SampleDesc.Count > 1)
-        {
-            DXGL_NOT_IMPLEMENTED
-            return NULL;
-        }
-        else
-        {
-            if ((kDesc.MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE) != 0)
-            {
-                bool bArray(kDesc.ArraySize > 6 || (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY));
-
-#if DXGL_FULL_EMULATION
-                if (!pContext->GetDevice()->IsFeatureSupported(eF_TextureViews))
-                {
-                    // Hack to specify array of textures with a single element without using texture views
-                    if (kDesc.ArraySize == 0)
-                    {
-                        bArray = true;
-                    }
-                }
-#endif //DXGL_FULL_EMULATION
-
-#if !DXGL_SUPPORT_CUBEMAP_ARRAYS
-                if (bArray)
-                {
-                    DXGL_NOT_IMPLEMENTED;
-                    return NULL;
-                }
-                STexturePtr spTexture(
-                    new STexture(
-                        kDesc.Width, kDesc.Height, 1,
-                        GL_TEXTURE_CUBE_MAP,
-                        eGIFormat, GetNumMipLevels(kDesc), kDesc.ArraySize));
-#else
-                STexturePtr spTexture(
-                    new STexture(
-                        kDesc.Width, kDesc.Height, 1,
-                        bArray ? GL_TEXTURE_CUBE_MAP_ARRAY : GL_TEXTURE_CUBE_MAP,
-                        eGIFormat, GetNumMipLevels(kDesc), kDesc.ArraySize));
-#endif
-
-                InitializeTexture2D<SCubePartition>(spTexture, bArray, bStaging, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-
-                return spTexture;
-            }
-            else
-            {
-                bool bArray(kDesc.ArraySize > 1 || (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY));
-
-                STexturePtr spTexture(
-                    new STexture(
-                        kDesc.Width, kDesc.Height, 1,
-                        bArray ? GL_TEXTURE_2D_ARRAY : GL_TEXTURE_2D,
-                        eGIFormat, GetNumMipLevels(kDesc), kDesc.ArraySize));
-
-                InitializeTexture2D<STexPartition>(spTexture, bArray, bStaging, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-
-                return spTexture;
-            }
-        }
-    }
-
-    STexturePtr CreateTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateTexture3D")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM ||
-            (pFormatInfo = GetCompatibleTextureFormatInfo(&eGIFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for 3D texture");
-            return NULL;
-        }
-
-        STexturePtr spTexture(
-            new STexture(
-                kDesc.Width, kDesc.Height, kDesc.Depth,
-                GL_TEXTURE_3D,
-                eGIFormat, GetNumMipLevels(kDesc), 1));
-
-        if (kDesc.Usage == D3D11_USAGE_STAGING)
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SStagingTexImpl<STex3DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-            }
-            else
-            {
-                InitializeTexture<SStagingTexImpl<STex3DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-            }
-        }
-        else
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SSingleTexImpl<STex3DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-            }
-            else
-            {
-                InitializeTexture<SSingleTexImpl<STex3DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pContext, pFormatInfo);
-            }
-        }
-
-        return spTexture;
-    }
-
-    void glNamedBufferSubDataAsync(GLuint uBuffer, GLintptr iOffset, GLsizeiptr iSize, const GLvoid* pvData)
-    {
-#if DXGL_PREVENT_NVIDIA_SUB_BUFFER_DATA_SYNCHRONIZATION
-        DXGL_TODO("TODO: Move to a per-device variable that is detected on startup. This value seems to be optimal for current NVIDIA drivers. Also experiment different values on test scenarios.");
-        enum
-        {
-            MAX_UPLOAD_SIZE = 256 * 1024
-        };
-
-        while (iSize > 0)
-        {
-            uint32 uUploadSize((uint32)min(iSize, (GLintptr)MAX_UPLOAD_SIZE));
-            glNamedBufferSubDataEXT(uBuffer, iOffset, iSize, pvData);
-            iOffset += uUploadSize;
-            iSize -= uUploadSize;
-            pvData = static_cast<const uint8*>(pvData) + uUploadSize;
-        }
-#else
-        glNamedBufferSubDataEXT(uBuffer, iOffset, iSize, pvData);
-#endif
-    }
-
-    void NamedBufferSubDataAsyncFast(CContext* pContext, CResourceName kBufferName, GLintptr iOffset, GLsizeiptr iSize, const GLvoid* pvData)
-    {
-#if defined(glNamedBufferSubDataEXT) || !defined(USE_FAST_NAMED_APPROXIMATION)
-        glNamedBufferSubDataAsync(kBufferName.GetName(), iOffset, iSize, pvData);
-#else
-        pContext->BindBuffer(kBufferName, eBB_CopyWrite);
-
-#if DXGL_PREVENT_NVIDIA_SUB_BUFFER_DATA_SYNCHRONIZATION
-        DXGL_TODO("TODO: Move to a per-device variable that is detected on startup. This value seems to be optimal for current NVIDIA drivers. Also experiment different values on test scenarios.");
-        enum
-        {
-            MAX_UPLOAD_SIZE = 256 * 1024
-        };
-
-        while (iSize > 0)
-        {
-            uint32 uUploadSize((uint32)min(iSize, (GLintptr)MAX_UPLOAD_SIZE));
-            glBufferSubData(GL_COPY_WRITE_BUFFER, iOffset, iSize, pvData);
-            iOffset += uUploadSize;
-            iSize -= uUploadSize;
-            pvData = static_cast<const uint8*>(pvData) + uUploadSize;
-        }
-#else
-        glBufferSubData(GL_COPY_WRITE_BUFFER, iOffset, iSize, pvData);
-#endif
-#endif
-    }
-
-    struct SDefaultBufferImpl
-    {
-        static void UpdateBufferSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32, uint32, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDefaultBufferImpl::UpdateBufferSubresource")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            pBuffer->m_kCreationFence.IssueWait(pContext);
-
-            assert(uSubresource == 0);
-
-            if (pDstBox != NULL)
-            {
-                NamedBufferSubDataAsyncFast(pContext, pBuffer->m_kName, pDstBox->left, pDstBox->right - pDstBox->left, pSrcData);
-            }
-            else
-            {
-                NamedBufferSubDataAsyncFast(pContext, pBuffer->m_kName, 0, pBuffer->m_uSize, pSrcData);
-            }
-        }
-    };
-
-    struct SDynamicBufferImpl
-    {
-        static bool MapBufferRange(SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP eMapType, uint32 uMapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::MapBufferRange")
-
-            pBuffer->m_kCreationFence.IssueWait(pContext);
-#if DXGL_SUPPORT_APITRACE
-            pMappedResource->pData = pBuffer->m_kDynamicCopy.m_pData + uOffset;
-            pBuffer->m_kDynamicCopy.ResetDirtyRegion();
-#else
-#if DXGL_SUPPORT_BUFFER_STORAGE
-            if (uMapFlags & (D3D11_MAP_FLAG_DXGL_COHERENT | D3D11_MAP_FLAG_DXGL_PERSISTENT))
-            {
-                if (!pContext->GetDevice()->IsFeatureSupported(eF_BufferStorage))
-                {
-                    DXGL_ERROR("Cannot map buffer with persistent/coherent access since buffer storage is not supported");
-                    return false;
-                }
-
-                pBuffer->m_bMapped = false;
-                GLbitfield uAccess(GL_MAP_WRITE_BIT);
-                if (uMapFlags & D3D11_MAP_FLAG_DXGL_COHERENT)
-                {
-                    uAccess |= GL_MAP_COHERENT_BIT;
-                }
-                if (uMapFlags & D3D11_MAP_FLAG_DXGL_PERSISTENT)
-                {
-                    uAccess |= GL_MAP_PERSISTENT_BIT;
-                }
-                pMappedResource->pData = pContext->MapNamedBufferRangeFast(pBuffer->m_kName, (GLintptr)uOffset, (GLsizeiptr)uSize, uAccess);
-            }
-            else
-#endif //DXGL_SUPPORT_BUFFER_STORAGE
-            if (eMapType == D3D11_MAP_WRITE_NO_OVERWRITE)
-            {
-                pBuffer->m_bMapped = true;
-                pMappedResource->pData = pContext->MapNamedBufferRangeFast(pBuffer->m_kName, (GLintptr)uOffset, (GLsizeiptr)uSize, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
-            }
-            else
-            {
-                // The only other possible mode for dynamic buffers is D3D11_MAP_WRITE_DISCARD
-                assert(eMapType == D3D11_MAP_WRITE_DISCARD);
-
-                if (SGlobalConfig::iBufferUploadMode == 2 ||
-                    (SGlobalConfig::iBufferUploadMode == 1 && pBuffer->m_eUsage == GL_DYNAMIC_DRAW))
-                {
-                    pBuffer->m_bMapped = false;
-                    pMappedResource->pData = pBuffer->m_pSystemMemoryCopy;
-                    pContext->NamedBufferDataFast(pBuffer->m_kName, pBuffer->m_uSize, NULL, pBuffer->m_eUsage);
-                }
-                else
-                {
-                    pBuffer->m_bMapped = true;
-                    //  when GL_MAP_INVALIDATE_BUFFER_BIT is set GL_MAP_UNSYNCHRONIZED_BIT will be ignored.
-                    //  Remove GL_MAP_UNSYNCHRONIZED_BIT to reduce Qualcomm driver's debug spew
-                    pMappedResource->pData = pContext->MapNamedBufferRangeFast(pBuffer->m_kName, (GLintptr)uOffset, (GLsizeiptr)uSize, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
-                }
-            }
-#endif
-
-            pMappedResource->RowPitch = 0;  // Meaningless for buffers
-            pMappedResource->DepthPitch = 0; // Meaningless for buffers
-
-            pBuffer->m_uMapOffset = uOffset;
-            pBuffer->m_uMapSize   = uSize;
-
-            return true;
-        }
-
-        static bool MapBuffer(SResource* pResource, uint32 uSubresource, D3D11_MAP eMapType, uint32 uMapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::MapBuffer")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            return MapBufferRange(pBuffer, (size_t)0, (size_t)pBuffer->m_uSize, eMapType, uMapFlags, pMappedResource, pContext);
-        }
-
-        static void UnmapBuffer(SResource* pResource, UINT Subresource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::UnmapBuffer")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-
-#if DXGL_SUPPORT_APITRACE
-            uint32 uOffset, uSize;
-            if (!pBuffer->m_kDynamicCopy.GetDirtyRegion(uOffset, uSize))
-            {
-                DXGL_WARNING("GetDirtyRegion failed - performing full buffer upload");
-                uOffset = 0;
-                uSize = pBuffer->m_uSize;
-            }
-
-            if (uSize > 0)
-            {
-                NamedBufferSubDataAsyncFast(pContext, pBuffer->m_kName, uOffset, uSize, pBuffer->m_kDynamicCopy.m_pData + uOffset);
-            }
-#else
-            if (pBuffer->m_bMapped)
-            {
-                pContext->UnmapNamedBufferFast(pBuffer->m_kName);
-                pBuffer->m_bMapped = false;
-            }
-            else
-            {
-                // This was mapped with D3D11_MAP_WRITE_DISCARD - orphan the current storage and upload the system memory buffer
-                NamedBufferSubDataAsyncFast(pContext, pBuffer->m_kName, pBuffer->m_uMapOffset, pBuffer->m_uMapSize, pBuffer->m_pSystemMemoryCopy);
-            }
-#endif
-        }
-
-        static void UpdateBufferSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32, uint32, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::UpdateBufferSubresource")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            pBuffer->m_kCreationFence.IssueWait(pContext);
-
-            assert(uSubresource == 0);
-
-            uint32 uDstOffset, uDstSize;
-            if (pDstBox != NULL)
-            {
-                uDstOffset = pDstBox->left;
-                uDstSize   = pDstBox->right - pDstBox->left;
-            }
-            else
-            {
-                uDstOffset = 0;
-                uDstSize   = pBuffer->m_uSize;
-            }
-            NamedBufferSubDataAsyncFast(pContext, pBuffer->m_kName, uDstOffset, uDstSize, pSrcData);
-            cryMemcpy(pBuffer->m_pSystemMemoryCopy, static_cast<const uint8*>(pSrcData) + uDstOffset, uDstSize);
-        }
-    };
-
-    void MapBufferSystemMemoryRange(SBuffer* pBuffer, uint32 uOffset, D3D11_MAPPED_SUBRESOURCE* pMappedResource)
-    {
-        pMappedResource->pData = pBuffer->m_pSystemMemoryCopy + uOffset;
-        pMappedResource->RowPitch = 0;  // Meaningless for buffers
-        pMappedResource->DepthPitch = 0; // Meaningless for buffers
-    }
-
-    void UpdateBufferSystemMemory(SBuffer* pBuffer, const D3D11_BOX* pDstBox, const void* pSrcData)
-    {
-        if (pDstBox != NULL)
-        {
-            cryMemcpy(pBuffer->m_pSystemMemoryCopy + pDstBox->left, pSrcData, pDstBox->right - pDstBox->left);
-        }
-        else
-        {
-            cryMemcpy(pBuffer->m_pSystemMemoryCopy, pSrcData, pBuffer->m_uSize);
-        }
-    }
-
-    struct SStagingBufferImpl
-    {
-        static bool MapBufferRange(SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::MapBufferRange")
-            MapBufferSystemMemoryRange(pBuffer, uOffset, pMappedResource);
-            return true;
-        }
-
-        static bool MapBuffer(SResource* pResource, uint32, D3D11_MAP, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::MapBuffer")
-            MapBufferSystemMemoryRange(static_cast<SBuffer*>(pResource), 0, pMappedResource);
-            return true;
-        }
-
-        static void UnmapBuffer(SResource*, UINT, CContext*)
-        {
-        }
-
-        static void UpdateBufferSubresource(SResource* pResource, uint32, const D3D11_BOX* pDstBox, const void* pSrcData, uint32, uint32, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::UpdateBufferSubresource")
-            UpdateBufferSystemMemory(static_cast<SBuffer*>(pResource), pDstBox, pSrcData);
-        }
-    };
-
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-
-    struct SStreamingBufferImpl
-    {
-        static bool MapBufferRange(SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP eMap, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::MapBufferRange")
-            MapBufferSystemMemoryRange(pBuffer, uOffset, pMappedResource);
-            if (eMap == D3D11_MAP_WRITE || eMap == D3D11_MAP_READ_WRITE || eMap == D3D11_MAP_WRITE_DISCARD || eMap == D3D11_MAP_WRITE_NO_OVERWRITE)
-            {
-                pBuffer->m_kContextCachesValid.SetZero();
-            }
-            return true;
-        }
-
-        static bool MapBuffer(SResource* pResource, uint32, D3D11_MAP eMap, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::MapBuffer")
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            MapBufferSystemMemoryRange(pBuffer, 0, pMappedResource);
-            if (eMap == D3D11_MAP_WRITE || eMap == D3D11_MAP_READ_WRITE || eMap == D3D11_MAP_WRITE_DISCARD || eMap == D3D11_MAP_WRITE_NO_OVERWRITE)
-            {
-                pBuffer->m_kContextCachesValid.SetZero();
-            }
-            return true;
-        }
-
-        static void UnmapBuffer(SResource*, UINT, CContext*)
-        {
-        }
-
-        static void UpdateBufferSubresource(SResource* pResource, uint32, const D3D11_BOX* pDstBox, const void* pSrcData, uint32, uint32, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::UpdateBufferSubresource")
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            UpdateBufferSystemMemory(pBuffer, pDstBox, pSrcData);
-            pBuffer->m_kContextCachesValid.SetZero();
-        }
-    };
-
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-
-    SBufferPtr CreateBuffer(const D3D11_BUFFER_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateBuffer")
-
-        SBufferPtr spBuffer(new SBuffer());
-        spBuffer->m_uSize = kDesc.ByteWidth;
-        spBuffer->m_uElementSize = 0;
-        spBuffer->m_kBindings.SetZero();
-
-        for (UINT uBindMask = 1; uBindMask != 0; uBindMask <<= 1)
-        {
-            switch (kDesc.BindFlags & uBindMask)
-            {
-            case 0:
-                break;
-            case D3D11_BIND_VERTEX_BUFFER:
-                spBuffer->m_kBindings.Set(eBB_Array, true);
-                break;
-            case D3D11_BIND_INDEX_BUFFER:
-                spBuffer->m_kBindings.Set(eBB_ElementArray, true);
-                break;
-            case D3D11_BIND_CONSTANT_BUFFER:
-                spBuffer->m_kBindings.Set(eBB_UniformBuffer, true);
-                break;
-            case D3D11_BIND_SHADER_RESOURCE:
-            case D3D11_BIND_UNORDERED_ACCESS:
-                if ((kDesc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) != 0)
-                {
-                    spBuffer->m_uElementSize = kDesc.StructureByteStride;
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                    spBuffer->m_kBindings.Set(eBB_ShaderStorage, true);
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                }
-                break;
-            default:
-                DXGL_TODO("Support more buffer bindings");
-                DXGL_ERROR("Buffer binding not supported");
-                return NULL;
-            }
-        }
-
-        bool bVideoMemory, bAllocateSystemMemory;
-        GLbitfield uStorageFlags(0);
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        if (SGlobalConfig::iStreamingConstantBuffersMode > 0 &&
-            (kDesc.BindFlags & D3D11_BIND_CONSTANT_BUFFER) != 0 &&
-            (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_NO_STREAMING) == 0)
-        {
-            spBuffer->m_pfMapSubresource    = &SStreamingBufferImpl::MapBuffer;
-            spBuffer->m_pfUnmapSubresource  = &SStreamingBufferImpl::UnmapBuffer;
-            spBuffer->m_pfUpdateSubresource = &SStreamingBufferImpl::UpdateBufferSubresource;
-            spBuffer->m_pfMapBufferRange    = &SStreamingBufferImpl::MapBufferRange;
-            spBuffer->m_bStreaming = true;
-            bVideoMemory = true;
-            bAllocateSystemMemory = true;
-            uStorageFlags = GL_MAP_WRITE_BIT;
-
-            switch (kDesc.Usage)
-            {
-            case D3D11_USAGE_IMMUTABLE:
-                spBuffer->m_eUsage = GL_STATIC_DRAW;
-                break;
-            case D3D11_USAGE_DEFAULT:
-                spBuffer->m_eUsage = GL_STREAM_DRAW;
-                break;
-            case D3D11_USAGE_DYNAMIC:
-                spBuffer->m_eUsage = GL_DYNAMIC_DRAW;
-                break;
-            default:
-                DXGL_ERROR("Buffer usage not supported");
-                return NULL;
-            }
-        }
-        else
-        {
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-        switch (kDesc.Usage)
-        {
-        case D3D11_USAGE_DEFAULT:
-            spBuffer->m_pfUpdateSubresource = &SDefaultBufferImpl::UpdateBufferSubresource;
-        case D3D11_USAGE_IMMUTABLE:
-            if ((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_WRITE) == 0)
-            {
-                spBuffer->m_eUsage = GL_STATIC_READ;
-            }
-            else if ((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ) == 0)
-            {
-                spBuffer->m_eUsage = GL_STATIC_DRAW;
-            }
-            else
-            {
-                spBuffer->m_eUsage = GL_STATIC_COPY;
-            }
-            bVideoMemory = true;
-            bAllocateSystemMemory = false;
-            break;
-        case D3D11_USAGE_DYNAMIC:
-            spBuffer->m_pfMapSubresource    = &SDynamicBufferImpl::MapBuffer;
-            spBuffer->m_pfUnmapSubresource  = &SDynamicBufferImpl::UnmapBuffer;
-            spBuffer->m_pfUpdateSubresource = &SDynamicBufferImpl::UpdateBufferSubresource;
-            spBuffer->m_pfMapBufferRange    = &SDynamicBufferImpl::MapBufferRange;
-            if ((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ) != 0)
-            {
-                DXGL_ERROR("Cannot create a buffer with dynamic usage that is CPU readable");
-                return NULL;
-            }
-            if ((kDesc.BindFlags & D3D11_BIND_CONSTANT_BUFFER) != 0)
-            {
-                // Assuming that constant buffers are accessed more frequently and usually discarded on updates
-                spBuffer->m_eUsage = GL_DYNAMIC_DRAW;
-            }
-            else
-            {
-                spBuffer->m_eUsage = GL_STREAM_DRAW;
-            }
-            bVideoMemory = true;
-#if DXGL_SUPPORT_BUFFER_STORAGE
-            uStorageFlags = GL_MAP_WRITE_BIT;
-            if (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_MAP_COHERENT)
-            {
-                uStorageFlags |= GL_MAP_COHERENT_BIT;
-            }
-            if (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_MAP_PERSISTENT)
-            {
-                uStorageFlags |= GL_MAP_PERSISTENT_BIT;
-            }
-#endif //DXGL_SUPPORT_BUFFER_STORAGE
-#if DXGL_SUPPORT_APITRACE
-            spBuffer->m_pSystemMemoryCopy = spBuffer->m_kDynamicCopy.Allocate(kDesc.ByteWidth);
-            spBuffer->m_bSystemMemoryCopyOwner = false;
-            bAllocateSystemMemory = false;
-#else
-            bAllocateSystemMemory = true;
-#endif
-            break;
-        case D3D11_USAGE_STAGING:
-            spBuffer->m_pfMapSubresource    = &SStagingBufferImpl::MapBuffer;
-            spBuffer->m_pfUnmapSubresource  = &SStagingBufferImpl::UnmapBuffer;
-            spBuffer->m_pfUpdateSubresource = &SStagingBufferImpl::UpdateBufferSubresource;
-            spBuffer->m_pfMapBufferRange    = &SStagingBufferImpl::MapBufferRange;
-            spBuffer->m_eUsage = GL_NONE;
-            bVideoMemory = false;
-            bAllocateSystemMemory = true;
-            break;
-        default:
-            DXGL_ERROR("Buffer usage not supported");
-            return NULL;
-        }
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-    }
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-
-        if (bVideoMemory)
-        {
-            GLuint uName;
-            glGenBuffers(1, &uName);
-            spBuffer->m_kName = pContext->GetDevice()->GetBufferNamePool().Create(uName);
-
-            DXGL_TODO("Handle all required conversions");
-
-            const GLvoid* pData(pInitialData == NULL ? NULL : pInitialData->pSysMem);
-#if DXGL_SUPPORT_BUFFER_STORAGE
-            if ((uStorageFlags & (GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)))
-            {
-                if (pContext->GetDevice()->IsFeatureSupported(eF_BufferStorage))
-                {
-                    glNamedBufferStorageEXT(uName, kDesc.ByteWidth, pData, uStorageFlags);
-                }
-                else
-                {
-                    DXGL_ERROR("Cannot create a persistent/coherent-mappable buffer since buffer storage is not supported");
-                    return NULL;
-                }
-            }
-            else
-#endif //DXGL_SUPPORT_BUFFER_STORAGE
-            {
-                glNamedBufferDataEXT(uName, kDesc.ByteWidth, pData, spBuffer->m_eUsage);
-            }
-
-            spBuffer->m_kCreationFence.IssueFence(pContext->GetDevice());
-        }
-
-        if (bAllocateSystemMemory)
-        {
-            spBuffer->m_pSystemMemoryCopy = static_cast<uint8*>(Memalign(kDesc.ByteWidth, MIN_MAPPED_RESOURCE_ALIGNMENT));
-        }
-
-        if (spBuffer->m_pSystemMemoryCopy != NULL && pInitialData != NULL)
-        {
-            cryMemcpy(spBuffer->m_pSystemMemoryCopy, pInitialData->pSysMem, kDesc.ByteWidth);
-        }
-
-        return spBuffer;
-    }
-
-    SQueryPtr CreateQuery(const D3D11_QUERY_DESC& kDesc, CContext*)
-    {
-        DXGL_SCOPED_PROFILE("CreateQuery")
-
-        SQueryPtr spQuery(NULL);
-        switch (kDesc.Query)
-        {
-        case D3D11_QUERY_OCCLUSION:
-        {
-            SOcclusionQuery* pOcclusionQuery(new SOcclusionQuery());
-            spQuery = pOcclusionQuery;
-            glGenQueries(1, &pOcclusionQuery->m_uName);
-        }
-        break;
-        case D3D11_QUERY_EVENT:
-            spQuery = new SFenceSync();
-            break;
-#if DXGL_SUPPORT_TIMER_QUERIES
-        case D3D11_QUERY_TIMESTAMP:
-            spQuery = new STimestampQuery();
-            break;
-        case D3D11_QUERY_TIMESTAMP_DISJOINT:
-            spQuery = new STimestampDisjointQuery();
-            break;
-#endif //DXGL_SUPPORT_TIMER_QUERIES
-        default:
-            DXGL_NOT_IMPLEMENTED
-            break;
-        }
-
-        return spQuery;
-    }
-
-    SDefaultFrameBufferTexturePtr CreateBackBufferTexture(const D3D11_TEXTURE2D_DESC& kDesc)
-    {
-        DXGL_SCOPED_PROFILE("CreateBackBufferTexture")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        if (eGIFormat == eGIF_NUM)
-        {
-            return NULL;
-        }
-
-        return new SDefaultFrameBufferTexture(kDesc.Width, kDesc.Height, eGIFormat, GL_COLOR_BUFFER_BIT);
-    }
-
-    typedef void (* CopyTextureBoxFunc)(STexture*, STexPos, STexSubresourceID, STexture*, STexPos, STexSubresourceID, STexSize, CContext*);
-
-    void CopyVideoTextureBoxWithCopyImage(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        glCopyImageSubData(
-            pSrcTexture->m_kCopyImageView.GetName(), pSrcTexture->m_eCopyImageTarget, kSrcSubID.m_iMipLevel, kSrcPos.x, kSrcPos.y, kSrcPos.z + kSrcSubID.m_uElement,
-            pDstTexture->m_kCopyImageView.GetName(), pDstTexture->m_eCopyImageTarget, kDstSubID.m_iMipLevel, kDstPos.x, kDstPos.y, kDstPos.z + kDstSubID.m_uElement,
-            kBoxSize.x, kBoxSize.y, kBoxSize.z);
-    }
-
-    void CopyVideoTextureBoxWithBlitFrameBuffer(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        SOutputMergerTextureViewPtr spSrcView(GetCopyOutputMergerView(pSrcTexture, kSrcSubID, pContext, GetGIFormatInfo(pSrcTexture->m_eFormat)));
-        SOutputMergerTextureViewPtr spDstView(GetCopyOutputMergerView(pDstTexture, kDstSubID, pContext, GetGIFormatInfo(pDstTexture->m_eFormat)));
-
-        if (!pContext->BlitOutputMergerView(
-                spSrcView, spDstView,
-                kSrcPos.x, kSrcPos.y, kSrcPos.x + kBoxSize.x, kSrcPos.y + kBoxSize.y,
-                kDstPos.x, kDstPos.y, kDstPos.x + kBoxSize.x, kDstPos.y + kBoxSize.y,
-                GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT,
-                GL_NEAREST))
-        {
-            DXGL_ERROR("Error copying texture box with BlitFrameBuffer");
-        }
-    }
-
-    void CopyVideoTextureBoxWithPixelBuffer(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        SMappedSubTexture kDataLocation;
-        uint32 uPackedSize(pSrcTexture->m_pfLocatePackedDataFunc(pSrcTexture, kSrcSubID, kSrcPos, kDataLocation));
-
-        const CResourceName& kCopyPixelBuffer(pContext->GetCopyPixelBuffer());
-        glNamedBufferDataEXT(kCopyPixelBuffer.GetName(), uPackedSize, NULL, GL_STREAM_COPY);
-
-        pContext->BindBuffer(kCopyPixelBuffer, eBB_PixelPack);
-        pSrcTexture->m_pfPackData(pSrcTexture, kSrcSubID, kSrcPos, kBoxSize, kDataLocation, pContext);
-        pContext->BindBuffer(CResourceName(), eBB_PixelPack);
-
-        pContext->BindBuffer(kCopyPixelBuffer, eBB_PixelUnpack);
-        pDstTexture->m_pfUnpackData(pDstTexture, kDstSubID, kDstPos, kBoxSize, kDataLocation, pContext);
-        pContext->BindBuffer(CResourceName(), eBB_PixelUnpack);
-    }
-
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-
-    void CopyVideoToSystemTextureBox(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        uint32 uDstSubResource(D3D11CalcSubresource(kDstSubID.m_iMipLevel, kDstSubID.m_uElement, pDstTexture->m_uNumMipLevels));
-        if (pContext->BindBuffer(pDstTexture->m_akPixelBuffers[uDstSubResource], eBB_PixelPack) == 0)
-        {
-            return;
-        }
-
-        SMappedSubTexture kDataLocation;
-        pDstTexture->m_pfLocatePackedDataFunc(pDstTexture, kDstSubID, kDstPos, kDataLocation);
-        pSrcTexture->m_pfPackData(pSrcTexture, kSrcSubID, kSrcPos, kBoxSize, kDataLocation, pContext);
-        pContext->BindBuffer(CResourceName(), eBB_PixelPack);
-    }
-
-    void CopySystemToVideoTextureBox(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        uint32 uSrcSubResource(D3D11CalcSubresource(kSrcSubID.m_iMipLevel, kSrcSubID.m_uElement, pSrcTexture->m_uNumMipLevels));
-        if (!pSrcTexture->m_akPixelBuffers)
-        {
-            DXGL_WARNING("Error - NULL PBO in CopySystemToVideoTextureBox");
-            return;
-        }
-
-        if (pContext->BindBuffer(pSrcTexture->m_akPixelBuffers[uSrcSubResource], eBB_PixelUnpack) == 0)
-        {
-            return;
-        }
-
-        SMappedSubTexture kDataLocation;
-        pSrcTexture->m_pfLocatePackedDataFunc(pSrcTexture, kSrcSubID, kSrcPos, kDataLocation);
-        pDstTexture->m_pfUnpackData(pDstTexture, kDstSubID, kDstPos, kBoxSize, kDataLocation, pContext);
-        pContext->BindBuffer(CResourceName(), eBB_PixelUnpack);
-    }
-
-#endif //DXGL_USE_PBO_FOR_STAGING_TEXTURES
-
-    void CopySystemTextureBox(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        UINT uDstSubresource(D3D11CalcSubresource(kDstSubID.m_iMipLevel, kDstSubID.m_uElement, pDstTexture->m_uNumMipLevels));
-        UINT uSrcSubresource(D3D11CalcSubresource(kSrcSubID.m_iMipLevel, kSrcSubID.m_uElement, pSrcTexture->m_uNumMipLevels));
-
-        D3D11_BOX kDstBox;
-        kDstBox.left    = kDstPos.x;
-        kDstBox.top     = kDstPos.y;
-        kDstBox.front   = kDstPos.z;
-        kDstBox.right   = kDstPos.x + kBoxSize.x;
-        kDstBox.bottom  = kDstPos.y + kBoxSize.y;
-        kDstBox.back    = kDstPos.z + kBoxSize.z;
-
-        D3D11_MAPPED_SUBRESOURCE kSrcMapped;
-        pSrcTexture->m_pfMapSubresource(pSrcTexture, uSrcSubresource, D3D11_MAP_READ, 0, &kSrcMapped, pContext);
-        pDstTexture->m_pfUpdateSubresource(pDstTexture, uDstSubresource, &kDstBox, kSrcMapped.pData, kSrcMapped.RowPitch, kSrcMapped.DepthPitch, pContext);
-        pSrcTexture->m_pfUnmapSubresource(pSrcTexture, uSrcSubresource, pContext);
-    }
-
-
-    template <CopyTextureBoxFunc pfCopyTextureBox>
-    void CopyTextureImpl(STexture* pDstTexture, STexture* pSrcTexture, CContext* pContext)
-    {
-        DXGL_TODO("Check if there's a better way to do this");
-        STexSubresourceID kSubID;
-        for (kSubID.m_iMipLevel = 0; kSubID.m_iMipLevel < (GLint)pDstTexture->m_uNumMipLevels; ++kSubID.m_iMipLevel)
-        {
-            STexBox kBox;
-            GetTextureBox(kBox, pDstTexture, kSubID.m_iMipLevel, GetGIFormatInfo(pDstTexture->m_eFormat), true);
-
-            for (kSubID.m_uElement = 0; kSubID.m_uElement < pDstTexture->m_uNumElements; ++kSubID.m_uElement)
-            {
-                pfCopyTextureBox(
-                    pDstTexture, kBox.m_kOffset, kSubID,
-                    pSrcTexture, kBox.m_kOffset, kSubID,
-                    kBox.m_kSize, pContext);
-            }
-        }
-    }
-
-    void CopyTexture(STexture* pDstTexture, STexture* pSrcTexture, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopyTexture")
-
-        if (pSrcTexture->m_uNumMipLevels    != pDstTexture->m_uNumMipLevels ||
-            pSrcTexture->m_uNumElements     != pDstTexture->m_uNumElements ||
-            pSrcTexture->m_iWidth           != pDstTexture->m_iWidth ||
-            pSrcTexture->m_iHeight          != pDstTexture->m_iHeight ||
-            pSrcTexture->m_iDepth           != pDstTexture->m_iDepth)
-        {
-            DXGL_ERROR("Source and destination textures to copy don't match");
-            return;
-        }
-
-        pDstTexture->m_kCreationFence.IssueWait(pContext);
-        pSrcTexture->m_kCreationFence.IssueWait(pContext);
-
-        // Handle the default framebuffer texture case
-        DXGL_TODO("This is not the most efficient way to copy from or to the default frame buffer - we are forcing the copy texture to exist. Use glReadPixels and glBlitFrameBuffer when possible.")
-        pDstTexture->OnCopyWrite(pContext);
-        pSrcTexture->OnCopyRead(pContext);
-
-        if (pDstTexture->m_kName.IsValid() && pSrcTexture->m_kName.IsValid())
-        {
-            if (pContext->GetDevice()->IsFeatureSupported(eF_CopyImage))
-            {
-                CopyTextureImpl<CopyVideoTextureBoxWithCopyImage>(pDstTexture, pSrcTexture, pContext);
-            }
-            else
-            {
-                const SGIFormatInfo* pSrcFormatInfo(GetGIFormatInfo(pSrcTexture->m_eFormat));
-                if (pSrcFormatInfo->m_pUncompressed != NULL && pSrcTexture->m_iDepth == 1)
-                {
-                    const SGIFormatInfo* pDstFormatInfo(GetGIFormatInfo(pDstTexture->m_eFormat));
-                    if (pDstFormatInfo->m_pUncompressed != NULL && pDstTexture->m_iDepth == 1)
-                    {
-                        CopyTextureImpl<CopyVideoTextureBoxWithBlitFrameBuffer>(pDstTexture, pSrcTexture, pContext);
-                    }
-                    else
-                    {
-                        CopyTextureImpl<CopyVideoTextureBoxWithPixelBuffer>(pDstTexture, pSrcTexture, pContext);
-                    }
-                }
-                else
-                {
-                    CopyTextureImpl<CopySystemTextureBox>(pDstTexture, pSrcTexture, pContext);
-                }
-            }
-        }
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        else if (pDstTexture->m_kName.IsValid())
-        {
-            CopyTextureImpl<CopySystemToVideoTextureBox>(pDstTexture, pSrcTexture, pContext);
-        }
-        else if (pSrcTexture->m_kName.IsValid())
-        {
-            CopyTextureImpl<CopyVideoToSystemTextureBox>(pDstTexture, pSrcTexture, pContext);
-        }
-#endif //DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        else
-        {
-            CopyTextureImpl<CopySystemTextureBox>(pDstTexture, pSrcTexture, pContext);
-        }
-    }
-
-    template <CopyTextureBoxFunc pfCopyTextureBox>
-    void CopySubTextureImpl(
-        STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ,
-        STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext)
-    {
-        STexSubresourceID kDstSubID;
-        kDstSubID.m_iMipLevel = uDstSubresource % pDstTexture->m_uNumMipLevels;
-        kDstSubID.m_uElement  = uDstSubresource / pDstTexture->m_uNumMipLevels;
-
-        STexSubresourceID kSrcSubID;
-        kSrcSubID.m_iMipLevel = uSrcSubresource % pSrcTexture->m_uNumMipLevels;
-        kSrcSubID.m_uElement  = uSrcSubresource / pSrcTexture->m_uNumMipLevels;
-
-        STexBox kSrcBox;
-        GetTextureBox(kSrcBox, pSrcTexture, kSrcSubID.m_iMipLevel, pSrcBox, GetGIFormatInfo(pSrcTexture->m_eFormat), true);
-
-        STexPos kDstPos(uDstX, uDstY, uDstZ);
-
-        pfCopyTextureBox(
-            pDstTexture, kDstPos, kDstSubID,
-            pSrcTexture, kSrcBox.m_kOffset, kSrcSubID,
-            kSrcBox.m_kSize, pContext);
-    }
-
-    void CopySubTexture(
-        STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ,
-        STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopySubTexture")
-
-        pDstTexture->m_kCreationFence.IssueWait(pContext);
-        pSrcTexture->m_kCreationFence.IssueWait(pContext);
-
-        // Handle the default framebuffer texture case
-        DXGL_TODO("This is not the most efficient way to copy from or to the default frame buffer - we are forcing the copy texture to exist. Use glReadPixels and glBlitFrameBuffer when possible.")
-        pDstTexture->OnCopyWrite(pContext);
-        pSrcTexture->OnCopyRead(pContext);
-
-        if (pDstTexture->m_kName.IsValid() && pSrcTexture->m_kName.IsValid())
-        {
-            if (pContext->GetDevice()->IsFeatureSupported(eF_CopyImage))
-            {
-                CopySubTextureImpl<CopyVideoTextureBoxWithCopyImage>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-            }
-            else
-            {
-                const SGIFormatInfo* pSrcFormatInfo(GetGIFormatInfo(pSrcTexture->m_eFormat));
-                if (pSrcFormatInfo->m_pUncompressed != NULL && pSrcTexture->m_iDepth == 1)
-                {
-                    const SGIFormatInfo* pDstFormatInfo(GetGIFormatInfo(pDstTexture->m_eFormat));
-                    if (pDstFormatInfo->m_pUncompressed != NULL && pDstTexture->m_iDepth == 1)
-                    {
-                        CopySubTextureImpl<CopyVideoTextureBoxWithBlitFrameBuffer>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-                    }
-                    else
-                    {
-                        CopySubTextureImpl<CopyVideoTextureBoxWithPixelBuffer>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-                    }
-                }
-                else
-                {
-                    CopySubTextureImpl<CopySystemTextureBox>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-                }
-            }
-        }
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        else if (pDstTexture->m_kName.IsValid())
-        {
-            CopySubTextureImpl<CopySystemToVideoTextureBox>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-        }
-        else if (pSrcTexture->m_kName.IsValid())
-        {
-            CopySubTextureImpl<CopyVideoToSystemTextureBox>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-        }
-#endif //DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        else
-        {
-            CopySubTextureImpl<CopySystemTextureBox>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-        }
-    }
-
-    void CopySubBufferInternal(SBuffer* pDstBuffer, SBuffer* pSrcBuffer, uint32 uDstOffset, uint32 uSrcOffset, uint32 uSize)
-    {
-        if (pSrcBuffer->m_pSystemMemoryCopy != NULL && pDstBuffer->m_pSystemMemoryCopy != NULL)
-        {
-            cryMemcpy(pDstBuffer->m_pSystemMemoryCopy + uDstOffset, pSrcBuffer->m_pSystemMemoryCopy + uSrcOffset, uSize);
-        }
-
-        if (pDstBuffer->m_kName.IsValid())
-        {
-            if (pSrcBuffer->m_kName.IsValid())
-            {
-                glNamedCopyBufferSubDataEXT(pSrcBuffer->m_kName.GetName(), pDstBuffer->m_kName.GetName(), uSrcOffset, uDstOffset, uSize);
-            }
-            else
-            {
-                glNamedBufferSubDataAsync(pDstBuffer->m_kName.GetName(), uDstOffset, uSize, pSrcBuffer->m_pSystemMemoryCopy + uSrcOffset);
-            }
-        }
-        else if (pSrcBuffer->m_kName.IsValid() && pSrcBuffer->m_pSystemMemoryCopy == NULL)
-        {
-#if DXGLES
-            GLvoid* pvData(glMapNamedBufferRangeEXT(pSrcBuffer->m_kName.GetName(), uSrcOffset, uSize, GL_MAP_READ_BIT));
-            if (pvData == NULL)
-            {
-                DXGL_ERROR("CopySubBufferInternal - could not map buffer for reading");
-                return;
-            }
-            memcpy(pDstBuffer->m_pSystemMemoryCopy + uDstOffset, pvData, uSize);
-            glUnmapBuffer(pSrcBuffer->m_kName.GetName());
-#else
-            glGetNamedBufferSubDataEXT(pSrcBuffer->m_kName.GetName(), uSrcOffset, uSize, pDstBuffer->m_pSystemMemoryCopy + uDstOffset);
-#endif
-        }
-    }
-
-    void CopyBuffer(SBuffer* pDstBuffer, SBuffer* pSrcBuffer, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopyBuffer")
-
-        if (pSrcBuffer->m_uSize != pDstBuffer->m_uSize)
-        {
-            DXGL_ERROR("Source and destination buffers to copy don't match");
-            return;
-        }
-
-        pDstBuffer->m_kCreationFence.IssueWait(pContext);
-        pSrcBuffer->m_kCreationFence.IssueWait(pContext);
-
-        CopySubBufferInternal(pDstBuffer, pSrcBuffer, 0, 0, pSrcBuffer->m_uSize);
-    }
-
-    void CopySubBuffer(
-        SBuffer* pDstBuffer, uint32 uDstSubresource, uint32 uDstX, uint32, uint32,
-        SBuffer* pSrcBuffer, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopySubBuffer")
-
-        uint32 uSrcBegin, uSrcEnd;
-        if (pSrcBox != NULL)
-        {
-            uSrcBegin = pSrcBox->left;
-            uSrcEnd   = pSrcBox->right;
-        }
-        else
-        {
-            uSrcBegin = 0;
-            uSrcEnd   = pSrcBuffer->m_uSize;
-        }
-        uint32 uSize(uSrcEnd - uSrcBegin);
-
-        if (uSrcBegin > pSrcBuffer->m_uSize ||
-            uSrcEnd > pSrcBuffer->m_uSize ||
-            uDstX + uSize > pDstBuffer->m_uSize)
-        {
-            DXGL_ERROR("Source or destination range out of bounds");
-            return;
-        }
-
-        pDstBuffer->m_kCreationFence.IssueWait(pContext);
-        pSrcBuffer->m_kCreationFence.IssueWait(pContext);
-
-        CopySubBufferInternal(pDstBuffer, pSrcBuffer, uDstX, uSrcBegin, uSize);
-    }
-
-    GLenum GetBufferBindingTarget(EBufferBinding eBinding)
-    {
-        switch (eBinding)
-        {
-        case eBB_Array:
-            return GL_ARRAY_BUFFER;
-        case eBB_CopyRead:
-            return GL_COPY_READ_BUFFER;
-        case eBB_CopyWrite:
-            return GL_COPY_WRITE_BUFFER;
-        case eBB_ElementArray:
-            return GL_ELEMENT_ARRAY_BUFFER;
-        case eBB_PixelPack:
-            return GL_PIXEL_PACK_BUFFER;
-        case eBB_PixelUnpack:
-            return GL_PIXEL_UNPACK_BUFFER;
-        case eBB_TransformFeedback:
-            return GL_TRANSFORM_FEEDBACK_BUFFER;
-        case eBB_UniformBuffer:
-            return GL_UNIFORM_BUFFER;
-#if DXGL_SUPPORT_DRAW_INDIRECT
-        case eBB_DrawIndirect:
-            return GL_DRAW_INDIRECT_BUFFER;
-#endif //DXGL_SUPPORT_DRAW_INDIRECT
-#if DXGL_SUPPORT_ATOMIC_COUNTERS
-        case eBB_AtomicCounter:
-            return GL_ATOMIC_COUNTER_BUFFER;
-#endif //DXGL_SUPPORT_ATOMIC_COUNTERS
-#if DXGL_SUPPORT_DISPATCH_INDIRECT
-        case eBB_DispachIndirect:
-            return GL_DISPATCH_INDIRECT_BUFFER;
-#endif //DXGL_SUPPORT_DISPATCH_INDIRECT
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        case eBB_ShaderStorage:
-            return GL_SHADER_STORAGE_BUFFER;
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        }
-        DXGL_ERROR("Invalid buffer binding");
-        return 0;
-    }
-
-    GLenum GetBufferBindingPoint(EBufferBinding eBinding)
-    {
-        switch (eBinding)
-        {
-        case eBB_Array:
-            return GL_ARRAY_BUFFER_BINDING;
-        case eBB_CopyRead:
-            return GL_COPY_READ_BUFFER_BINDING;
-        case eBB_CopyWrite:
-            return GL_COPY_WRITE_BUFFER_BINDING;
-        case eBB_ElementArray:
-            return GL_ELEMENT_ARRAY_BUFFER_BINDING;
-        case eBB_PixelPack:
-            return GL_PIXEL_PACK_BUFFER_BINDING;
-        case eBB_PixelUnpack:
-            return GL_PIXEL_UNPACK_BUFFER_BINDING;
-        case eBB_TransformFeedback:
-            return GL_TRANSFORM_FEEDBACK_BUFFER_BINDING;
-        case eBB_UniformBuffer:
-            return GL_UNIFORM_BUFFER_BINDING;
-#if DXGL_SUPPORT_DRAW_INDIRECT
-        case eBB_DrawIndirect:
-            return GL_DRAW_INDIRECT_BUFFER_BINDING;
-#endif //DXGL_SUPPORT_DRAW_INDIRECT
-#if DXGL_SUPPORT_ATOMIC_COUNTERS
-        case eBB_AtomicCounter:
-            return GL_ATOMIC_COUNTER_BUFFER_BINDING;
-#endif //DXGL_SUPPORT_ATOMIC_COUNTERS
-#if DXGL_SUPPORT_DISPATCH_INDIRECT
-        case eBB_DispachIndirect:
-            return GL_DISPATCH_INDIRECT_BUFFER_BINDING;
-#endif //DXGL_SUPPORT_DISPATCH_INDIRECT
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        case eBB_ShaderStorage:
-            return GL_SHADER_STORAGE_BUFFER_BINDING;
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        }
-        DXGL_ERROR("Invalid buffer binding");
-        return 0;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLResource.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLResource.hpp
deleted file mode 100644
index 46f223fe09..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLResource.hpp
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the resource types and related functions
-
-
-#ifndef __GLRESOURCE__
-#define __GLRESOURCE__
-
-#include "GLCommon.hpp"
-#include "GLFormat.hpp"
-
-#define DXGL_USE_PBO_FOR_STAGING_TEXTURES !DXGL_FULL_EMULATION
-#define DXGL_SHARED_OBJECT_SYNCHRONIZATION 1
-#define DXGL_STREAMING_CONSTANT_BUFFERS 1
-
-namespace NCryOpenGL
-{
-    class CDevice;
-    class CContext;
-    struct STextureUnitContext;
-    struct SSamplerState;
-    struct SShaderTextureViewConfiguration;
-    struct SShaderTextureBufferViewConfiguration;
-    struct SShaderImageViewConfiguration;
-    struct SOutputMergerTextureViewConfiguration;
-
-    DXGL_DECLARE_PTR(struct, SFrameBuffer);
-    DXGL_DECLARE_PTR(struct, SOutputMergerView);
-    DXGL_DECLARE_PTR(struct, SOutputMergerTextureView);
-    DXGL_DECLARE_PTR(struct, STexture);
-    DXGL_DECLARE_PTR(struct, SShaderView);
-    DXGL_DECLARE_PTR(struct, SShaderTextureBasedView);
-    DXGL_DECLARE_PTR(struct, SShaderTextureView);
-    DXGL_DECLARE_PTR(struct, SShaderTextureBufferView);
-    DXGL_DECLARE_PTR(struct, SShaderImageView);
-    DXGL_DECLARE_PTR(struct, SShaderBufferView);
-    DXGL_DECLARE_PTR(struct, SDefaultFrameBufferTexture);
-    DXGL_DECLARE_PTR(struct, SBuffer);
-    DXGL_DECLARE_PTR(struct, SQuery);
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-    DXGL_DECLARE_PTR(struct, SContextFrame)
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-
-    enum
-    {
-        MAX_NUM_CONTEXT_PER_DEVICE = 32
-    };
-
-    struct SFrameBufferConfiguration
-    {
-        enum
-        {
-            DEPTH_ATTACHMENT_INDEX = 0,
-            STENCIL_ATTACHMENT_INDEX = 1,
-            FIRST_COLOR_ATTACHMENT_INDEX = STENCIL_ATTACHMENT_INDEX + 1,
-            MAX_COLOR_ATTACHMENTS = D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT,
-            MAX_ATTACHMENTS = FIRST_COLOR_ATTACHMENT_INDEX + MAX_COLOR_ATTACHMENTS
-        };
-
-        SOutputMergerView* m_akAttachments[MAX_ATTACHMENTS];
-
-        SFrameBufferConfiguration();
-
-        static GLenum AttachmentIndexToID(uint32 uIndex);
-        static uint32 AttachmentIDToIndex(GLenum eID);
-    };
-
-    struct SSharingFence
-    {
-#if DXGL_SHARED_OBJECT_SYNCHRONIZATION
-        GLsync m_pFence;
-        SBitMask<MAX_NUM_CONTEXT_PER_DEVICE, SSpinlockBitMaskWord> m_akWaitIssued;
-#endif //DXGL_SHARED_OBJECT_SYNCHRONIZATION
-
-        SSharingFence();
-        ~SSharingFence();
-
-        void IssueFence(CDevice* pDevice, bool bAvoidFlushing = false);
-        void IssueWait(CContext* pContext);
-    };
-
-    struct SResourceNamePool;
-
-    struct UResourceNameSlot
-    {
-        SList::TListEntry m_kNextFree;
-        struct SUsed
-        {
-            GLuint m_uName;
-            UResourceNameSlot* m_pBlock;
-            volatile LONG m_uRefCount;
-        } m_kUsed;
-    };
-
-    struct SResourceNameBlockHeader
-    {
-        UResourceNameSlot* m_pNext;
-        SResourceNamePool* m_pPool;
-        volatile LONG m_uRefCount;
-        SList m_kFreeList;
-        uint32 m_uSize;
-    };
-
-    class CResourceName
-    {
-    public:
-        CResourceName();
-        CResourceName(UResourceNameSlot* pSlot);
-        CResourceName(const CResourceName& kOther);
-        ~CResourceName();
-
-        CResourceName& operator=(const CResourceName& kOther);
-        bool operator==(const CResourceName& kOther) const;
-        bool operator!=(const CResourceName& kOther) const;
-
-        GLuint GetName() const;
-        bool IsValid() const;
-    protected:
-        void Acquire();
-        void Release();
-
-        UResourceNameSlot* m_pSlot;
-    };
-
-    struct SResourceNamePool
-    {
-        typedef UResourceNameSlot TSlot;
-        typedef SResourceNameBlockHeader TBlockHeader;
-
-        enum
-        {
-            MIN_BLOCK_SIZE = 256, GROWTH_FACTOR = 2, NUM_HEADER_SLOTS = (sizeof(TBlockHeader) + sizeof(TSlot) - 1) / sizeof(TSlot)
-        };
-
-        TSlot* m_pBlocksHead;
-        TCriticalSection m_kBlockSection;
-
-        SResourceNamePool();
-        ~SResourceNamePool();
-
-        CResourceName Create(GLuint uName);
-    };
-
-    inline CResourceName::CResourceName()
-        : m_pSlot(NULL)
-    {
-    }
-
-    inline CResourceName::CResourceName(UResourceNameSlot* pSlot)
-        : m_pSlot(pSlot)
-    {
-        if (AtomicIncrement(&m_pSlot->m_kUsed.m_uRefCount) == 1)
-        {
-            AtomicIncrement(&alias_cast<SResourceNameBlockHeader*>(m_pSlot->m_kUsed.m_pBlock)->m_uRefCount);
-        }
-    }
-
-    inline CResourceName::CResourceName(const CResourceName& kOther)
-        : m_pSlot(kOther.m_pSlot)
-    {
-        Acquire();
-    }
-
-    inline CResourceName::~CResourceName()
-    {
-        Release();
-    }
-
-    inline CResourceName& CResourceName::operator=(const CResourceName& kOther)
-    {
-        Release();
-        m_pSlot = kOther.m_pSlot;
-        Acquire();
-        return *this;
-    }
-
-    inline bool CResourceName::operator==(const CResourceName& kOther) const
-    {
-        return m_pSlot == kOther.m_pSlot;
-    }
-
-    inline bool CResourceName::operator!=(const CResourceName& kOther) const
-    {
-        return !operator==(kOther);
-    }
-
-    inline void CResourceName::Acquire()
-    {
-        if (m_pSlot != NULL && AtomicIncrement(&m_pSlot->m_kUsed.m_uRefCount) == 1)
-        {
-            AtomicIncrement(&alias_cast<SResourceNameBlockHeader*>(m_pSlot->m_kUsed.m_pBlock)->m_uRefCount);
-        }
-    }
-
-    inline void CResourceName::Release()
-    {
-        if (m_pSlot != NULL && AtomicDecrement(&m_pSlot->m_kUsed.m_uRefCount) == 0)
-        {
-            SResourceNameBlockHeader* pBlockHeader(alias_cast<SResourceNameBlockHeader*>(m_pSlot->m_kUsed.m_pBlock));
-            if (AtomicDecrement(&pBlockHeader->m_uRefCount) == 0)
-            {
-                delete [] m_pSlot->m_kUsed.m_pBlock;
-            }
-            else
-            {
-                pBlockHeader->m_kFreeList.Push(m_pSlot->m_kNextFree);
-            }
-        }
-    }
-
-    inline GLuint CResourceName::GetName() const
-    {
-        return m_pSlot == NULL ? 0 : m_pSlot->m_kUsed.m_uName;
-    }
-
-    inline bool CResourceName::IsValid() const
-    {
-        return m_pSlot != NULL;
-    }
-
-    DXGL_DECLARE_REF_COUNTED(struct, SResource)
-    {
-        typedef void (* UpdateSubresourceFunc) (SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext);
-        typedef bool (* MapSubresourceFunc) (SResource* pResource, uint32 uSubresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext);
-        typedef void (* UnmapSubresourceFunc) (SResource* pResource, uint32 uSubresource, CContext* pContext);
-
-        CResourceName m_kName;
-        UpdateSubresourceFunc m_pfUpdateSubresource;
-        MapSubresourceFunc m_pfMapSubresource;
-        UnmapSubresourceFunc m_pfUnmapSubresource;
-        SSharingFence m_kCreationFence;
-
-        SResource();
-        SResource(const SResource&kOther);
-
-        virtual ~SResource();
-    };
-
-    struct SFrameBufferObject
-    {
-        typedef SBitMask<SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS, SUnsafeBitMaskWord> TColorAttachmentMask;
-
-        CResourceName m_kName;
-        bool m_bUsesSRGB;
-        TColorAttachmentMask m_kDrawMaskCache;
-
-        SFrameBufferObject();
-        ~SFrameBufferObject();
-    };
-
-    void InitializeCryGlFramebufferFunctions();
-
-    DXGL_DECLARE_REF_COUNTED(struct, SFrameBuffer)
-    {
-        SFrameBufferConfiguration m_kConfiguration;
-        SFrameBufferObject m_kObject;
-        CContext* m_pContext;
-
-        // Specification of the list of color attachments that are enabled for writing
-        GLenum m_aeDrawBuffers[SFrameBufferConfiguration::MAX_COLOR_ATTACHMENTS];
-        GLuint m_uNumDrawBuffers;
-        SFrameBufferObject::TColorAttachmentMask m_kDrawMask;
-
-        SFrameBuffer(const SFrameBufferConfiguration&kConfiguration);
-        ~SFrameBuffer();
-
-        bool Validate();
-    };
-
-    struct SMappedSubTexture
-    {
-        uint8* m_pBuffer;
-        uint32 m_uDataOffset;
-        bool m_bUpload;
-        uint32 m_uRowPitch;
-        uint32 m_uImagePitch;
-
-        SMappedSubTexture()
-            : m_pBuffer(NULL)
-        {
-        }
-    };
-
-    struct STextureUnitCache;
-
-    struct STextureState
-    {
-        GLint m_iBaseMipLevel;
-        GLint m_iMaxMipLevel;
-#if DXGL_SUPPORT_STENCIL_TEXTURES
-        GLint m_iDepthStencilTextureMode; // 0 if not used
-#endif //DXGL_SUPPORT_STENCIL_TEXTURES
-        TSwizzleMask m_uSwizzleMask;
-
-        void ApplyFormatMode(GLuint uTexture, GLenum eTarget);
-        void ApplyFormatMode(GLenum eTarget);
-        void Apply(GLuint uTexture, GLenum eTarget, const STextureUnitCache& kCurrentUnitCache);
-
-        bool operator==(const STextureState& kOther) const
-        {
-            return
-                m_iBaseMipLevel            == kOther.m_iBaseMipLevel            &&
-                m_iMaxMipLevel             == kOther.m_iMaxMipLevel             &&
-#if DXGL_SUPPORT_STENCIL_TEXTURES
-                m_iDepthStencilTextureMode == kOther.m_iDepthStencilTextureMode &&
-#endif //DXGL_SUPPORT_STENCIL_TEXTURES
-                m_uSwizzleMask             == kOther.m_uSwizzleMask;
-        }
-
-        bool operator!=(const STextureState& kOther) const
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    template <typename T>
-    struct STexVec
-    {
-        T x, y, z;
-
-        STexVec() {}
-        STexVec(T kX, T kY, T kZ)
-            : x(kX)
-            , y(kY)
-            , z(kZ) {}
-    };
-
-    typedef STexVec<GLsizei> STexSize;
-    typedef STexVec<GLint> STexPos;
-
-    struct STexSubresourceID
-    {
-        GLint m_iMipLevel;
-        uint32 m_uElement;
-    };
-
-    enum EBufferBinding
-    {
-        eBB_Array,
-        eBB_CopyRead,
-        eBB_CopyWrite,
-#if DXGL_SUPPORT_DRAW_INDIRECT
-        eBB_DrawIndirect,
-#endif //DXGL_SUPPORT_DRAW_INDIRECT
-        eBB_ElementArray,
-        eBB_PixelPack,
-        eBB_PixelUnpack,
-        eBB_TransformFeedback,
-        eBB_UniformBuffer,
-#if DXGL_SUPPORT_ATOMIC_COUNTERS
-        eBB_AtomicCounter,
-#endif //DXGL_SUPPORT_ATOMIC_COUNTERS
-#if DXGL_SUPPORT_DISPATCH_INDIRECT
-        eBB_DispachIndirect,
-#endif //DXGL_SUPPORT_DISPATCH_INDIRECT
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        eBB_ShaderStorage,
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        eBB_NUM
-    };
-
-    struct SBufferRange
-    {
-        uint32 m_uOffset;
-        uint32 m_uSize;
-
-        SBufferRange(uint32 uOffset = 0, uint32 uSize = 0)
-            : m_uOffset(uOffset)
-            , m_uSize(uSize)
-        {
-        }
-
-        bool operator==(const SBufferRange& kOther) const
-        {
-            return
-                m_uOffset == kOther.m_uOffset &&
-                m_uSize   == kOther.m_uSize;
-        }
-
-        bool operator!=(const SBufferRange& kOther) const
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    //#define DXGL_USE_LAZY_CLEAR
-
-    struct STexture
-        : SResource
-    {
-        STexture(GLsizei iWidth, GLsizei iHeight, GLsizei iDepth, GLenum eTarget, EGIFormat eFormat, uint32 uNumMipLevels, uint32 uNumElements);
-        virtual ~STexture();
-
-        virtual SShaderTextureViewPtr CreateShaderResourceView(const SShaderTextureViewConfiguration& kConfiguration, CContext* pContext);
-        virtual SShaderImageViewPtr CreateUnorderedAccessView(const SShaderImageViewConfiguration& kConfiguration, CContext* pContext);
-        virtual SOutputMergerTextureViewPtr CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CContext* pContext);
-        SOutputMergerTextureViewPtr GetCompatibleOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CContext* pContext);
-
-        virtual void OnCopyRead(CContext* pContext) {};
-        virtual void OnCopyWrite(CContext* pContext) {};
-
-        void SetMinLod(float minLod);
-        float GetMinLod() const { return m_fMinLod; }
-
-#if defined(ANDROID)
-        void ResetDontCareActionFlags();
-        void UpdateDontCareActionFlagsOnBound();
-        void UpdateDontCareActionFlagsOnUnbound();
-#endif
-
-        typedef std::vector<SMappedSubTexture> TMappedSubTextures;
-        typedef std::vector<SOutputMergerTextureViewPtr> TCopySubTextureViews;
-
-        GLsizei m_iWidth, m_iHeight, m_iDepth;
-        GLenum m_eTarget;
-        EGIFormat m_eFormat;
-        uint32 m_uNumMipLevels;
-        uint32 m_uNumElements; // array_size * number_of_faces
-
-        // Texture view used for glCopyImageSubData if the driver requires a custom view for that, texture name otherwise
-        CResourceName m_kCopyImageView;
-        GLenum m_eCopyImageTarget;
-
-        typedef void(*TransferDataFunc) (STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext);
-        typedef uint32(*LocatePackedDataFunc) (STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, SMappedSubTexture& kDataLocation);
-
-        TransferDataFunc m_pfUnpackData;
-        TransferDataFunc m_pfPackData;
-        LocatePackedDataFunc m_pfLocatePackedDataFunc;
-
-#if DXGL_USE_PBO_FOR_STAGING_TEXTURES
-        CResourceName* m_akPixelBuffers; // Only used for staging textures
-#else
-        uint8* m_pSystemMemoryCopy;   // Only used for staging textures
-#endif
-
-        TMappedSubTextures m_kMappedSubTextures;
-        TCopySubTextureViews m_kCopySubTextureViews;
-
-        STextureState m_kCache;
-        SShaderTextureView* m_pShaderViewsHead;
-        SOutputMergerTextureView* m_pOutputMergerViewsHead;
-        SShaderTextureView* m_pBoundModifier; // NULL if no SRV for this texture has bound custom texture parameters
-
-#if defined(DXGL_USE_LAZY_CLEAR)
-        float                           m_ClearColor[4];
-        _smart_ptr<SOutputMergerView>   m_spViewToClear;
-        float                           m_fClearDepthValue;
-        bool                            m_bClearDepth;
-        bool                            m_bClearStencil;
-        uint8                           m_uClearStencilValue;
-#endif
-
-#if defined(ANDROID)
-        bool m_bColorLoadDontCare;
-        bool m_bDepthLoadDontCare;
-        bool m_bStencilLoadDontCare;
-        bool m_bColorStoreDontCare;
-        bool m_bDepthStoreDontCare;
-        bool m_bStencilStoreDontCare;
-        bool m_bColorStoreDontCareWhenUnbound;
-        bool m_bDepthStoreDontCareWhenUnbound;
-        bool m_bStencilStoreDontCareWhenUnbound;
-        bool m_bColorWasInvalidatedWhenUnbound;
-        bool m_bDepthWasInvalidatedWhenUnbound;
-        bool m_bStencilWasInvalidatedWhenUnbound;
-#endif
-    private:
-        // Making this private so that users have to use the Set/Get since there
-        // is a corresponding gl call that needs to be called when this variable
-        // is set.
-        GLfloat m_fMinLod;
-    };
-
-#if DXGL_SUPPORT_APITRACE
-
-    struct SDynamicBufferCopy
-    {
-        uint8* m_pData;
-        uint32 m_uSize;
-
-    #if defined(WIN32)
-        void** m_apDirtyPages;
-        uint32 m_uNumPages;
-        static uint32 ms_uPageSize;
-    #endif //defined(WIN32)
-
-        SDynamicBufferCopy();
-        ~SDynamicBufferCopy();
-
-        uint8* Allocate(uint32 uSize);
-        void Free();
-        void ResetDirtyRegion();
-        bool GetDirtyRegion(uint32& uOffset, uint32& uSize);
-    };
-
-#endif //DXGL_SUPPORT_APITRACE
-
-    struct SBuffer
-        : SResource
-    {
-        SBuffer();
-        virtual ~SBuffer();
-
-        SShaderViewPtr CreateShaderResourceView(EGIFormat eFormat, uint32 uFirstElement, uint32 uNumElements, uint32 uFlags, CContext* pContext);
-        SShaderViewPtr CreateUnorderedAccessView(EGIFormat eFormat, uint32 uFirstElement, uint32 uNumElements, uint32 uFlags, CContext* pContext);
-
-        SShaderTextureBufferViewPtr GetTextureBuffer(SShaderTextureBufferViewConfiguration& kConfiguration, CContext* pContext);
-        SShaderBufferViewPtr CreateBufferView(uint32 uFirstElement, uint32 uNumElements, CContext* pContext);
-
-        typedef bool (* MapBufferRangeFunc) (SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext);
-        MapBufferRangeFunc m_pfMapBufferRange;
-
-        SBitMask<eBB_NUM, SUnsafeBitMaskWord> m_kBindings;
-        GLenum m_eUsage;
-        uint32 m_uSize;
-        uint32 m_uElementSize; // 0 if not structured
-        uint8* m_pSystemMemoryCopy;
-        bool m_bMapped;
-        size_t m_uMapOffset;
-        size_t m_uMapSize;
-
-        SShaderTextureBufferView* m_pTextureBuffersHead;
-
-#if DXGL_SUPPORT_APITRACE
-        SDynamicBufferCopy m_kDynamicCopy;
-        bool m_bSystemMemoryCopyOwner;
-#endif //DXGL_SUPPORT_APITRACE
-#if DXGL_STREAMING_CONSTANT_BUFFERS
-        struct SContextCache
-        {
-            SContextFramePtr m_spFrame;
-            SBufferRange m_kRange;
-            uint32 m_uUnit;
-            uint32 m_uStreamOffset;
-        } m_akContextCaches[MAX_NUM_CONTEXT_PER_DEVICE];
-        DXGL_TODO("Evaluate if it is worth to have multiple possible bindings cached - eventually add another dimension and keep items sorted by slot for binary search");
-        SBitMask<MAX_NUM_CONTEXT_PER_DEVICE, SSpinlockBitMaskWord> m_kContextCachesValid;
-        bool m_bStreaming;
-#endif //DXGL_STREAMING_CONSTANT_BUFFERS
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SQuery)
-    {
-        virtual ~SQuery();
-
-        virtual void Begin();
-        virtual void End();
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush) = 0;
-        virtual uint32 GetDataSize();
-    };
-
-    struct SPlainQuery
-        : SQuery
-    {
-        SPlainQuery(GLenum eTarget);
-        virtual ~SPlainQuery();
-
-        virtual void Begin();
-        virtual void End();
-
-        GLuint m_uName;
-        GLenum m_eTarget;
-        bool m_bBegun;
-    };
-
-    struct SOcclusionQuery
-        : SPlainQuery
-    {
-        SOcclusionQuery();
-
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush);
-        virtual uint32 GetDataSize();
-    };
-
-    struct SFenceSync
-        : SQuery
-    {
-        SFenceSync();
-        virtual ~SFenceSync();
-
-        virtual void End();
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush);
-        virtual uint32 GetDataSize();
-
-        GLsync m_pFence;
-    };
-
-#if DXGL_SUPPORT_TIMER_QUERIES
-
-    struct STimestampDisjointQuery
-        : SQuery
-    {
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush);
-        virtual uint32 GetDataSize();
-    };
-
-    struct STimestampQuery
-        : SQuery
-    {
-        STimestampQuery();
-        virtual ~STimestampQuery();
-
-        virtual void End();
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush);
-        virtual uint32 GetDataSize();
-
-        GLuint m_uName;
-    };
-
-#endif //DXGL_SUPPORT_TIMER_QUERIES
-
-    struct SDefaultFrameBufferTexture
-        : STexture
-    {
-        SDefaultFrameBufferTexture(GLsizei iWidth, GLsizei iHeight, EGIFormat eFormat, GLbitfield eBufferMask);
-        virtual ~SDefaultFrameBufferTexture();
-
-        virtual SShaderTextureViewPtr CreateShaderResourceView(const SShaderTextureViewConfiguration& kConfiguration, CContext* pContext);
-        virtual SShaderImageViewPtr CreateUnorderedAccessView(const SShaderImageViewConfiguration& kConfiguration, CContext* pContext);
-        virtual SOutputMergerTextureViewPtr CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CContext* pContext);
-
-        virtual void OnCopyRead(CContext* pContext);
-        virtual void OnCopyWrite(CContext* pContext);
-
-        void IncTextureRefCount(CContext* pContext);
-        void DecTextureRefCount();
-        void EnsureTextureExists(CContext* pContext);
-        void ReleaseTexture();
-        void OnWrite(CContext* pContext, bool bDefaultFrameBuffer);
-        void OnRead(CContext* pContext);
-        void Flush(CContext* pContext);
-#if DXGL_FULL_EMULATION
-        void SetCustomWindowContext(const TWindowContext& kCustomWindowContext);
-#endif //DXGL_FULL_EMULATION
-
-        static void UpdateSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext);
-        static bool MapSubresource(SResource* pResource, uint32 uSubresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext);
-        static void UnmapSubresource(SResource* pResource, uint32 uSubresource, CContext* pContext);
-
-        static void UnpackData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext);
-        static void PackData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext);
-        static uint32 LocatePackedData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, SMappedSubTexture& kDataLocation);
-
-
-        uint32 m_uTextureRefCount;
-        SFrameBufferObject m_kInputFBO;
-        SFrameBufferObject m_kDefaultFBO;
-        GLbitfield m_uBufferMask;
-        GLenum m_eInputColorBuffer, m_eOutputColorBuffer;
-        GLsizei m_iDefaultFBOWidth, m_iDefaultFBOHeight;
-        bool m_bInputDirty, m_bOutputDirty;
-        SShaderTextureViewPtr m_kInputFBOColorTextureView;
-#if DXGL_FULL_EMULATION
-        TWindowContext m_kCustomWindowContext;
-#endif //DXGL_FULL_EMULATION
-    };
-
-    STexturePtr CreateTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext);
-    STexturePtr CreateTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext);
-    STexturePtr CreateTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext);
-    SBufferPtr CreateBuffer(const D3D11_BUFFER_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CContext* pContext);
-    SQueryPtr CreateQuery(const D3D11_QUERY_DESC& kDesc, CContext* pContext);
-    SDefaultFrameBufferTexturePtr CreateBackBufferTexture(const D3D11_TEXTURE2D_DESC& kDesc);
-
-    CResourceName CreateTextureView(STexture* pTexture, const SGIFormatInfo* pFormatInfo, GLenum eTarget, GLuint uMinMipLevel, GLuint uNumMipLevels, GLuint uMinLayer, GLuint uNumLayers, CContext* pContext);
-
-    GLenum GetBufferBindingTarget(EBufferBinding eBinding);
-    GLenum GetBufferBindingPoint(EBufferBinding eBinding);
-
-    void CopyTexture(STexture* pDstTexture, STexture* pSrcTexture, CContext* pContext);
-    void CopyBuffer(SBuffer* pDstBuffer, SBuffer* pSrcBuffer, CContext* pContext);
-    void CopySubTexture(STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ, STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext);
-    void CopySubBuffer(SBuffer* pDstBuffer, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ, SBuffer* pSrcBuffer, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext);
-}
-
-#endif //__GLRESOURCE__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.cpp
deleted file mode 100644
index 7974411481..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.cpp
+++ /dev/null
@@ -1,2163 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implements the shader related functions
-
-
-#include "RenderDll_precompiled.h"
-#include "GLShader.hpp"
-#include "GLDevice.hpp"
-#include <Common/RenderCapabilities.h>
-
-#if DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-#include "hlslcc.hpp"
-#endif //DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-#include "hlslcc_bin.hpp"
-
-struct SAutoBindProgram
-{
-    SAutoBindProgram(const GLuint uProgram)
-    {
-        GLint iBinding;
-        glGetIntegerv(GL_CURRENT_PROGRAM, &iBinding);
-        m_uPreviousBinding = (GLuint)iBinding;
-        glUseProgram(uProgram);
-    }
-
-    ~SAutoBindProgram()
-    {
-        glUseProgram(m_uPreviousBinding);
-    }
-
-    GLuint m_uPreviousBinding;
-};
-
-#if DXGL_GLSL_FROM_HLSL2GLSL && DXGL_SUPPORT_NSIGHT_SINCE(4_1)
-// NSight shader instrumentation throws an exception when compiling shaders with functions with many parameters.
-// Shaders generated with HLSL2GLSL are simplified using glslOptimizer to exploit its function inlining and simplify instrumentation.
-#include "../../Tools/glslOptimizer/src/glsl/glsl_optimizer.h"
-struct SSimplifiedShader
-{
-    glslopt_shader* m_pOptimizedShader;
-
-    SSimplifiedShader()
-        : m_pOptimizedShader(NULL)
-    {
-    }
-
-    ~SSimplifiedShader()
-    {
-        if (m_pOptimizedShader != NULL)
-        {
-            glslopt_shader_delete(m_pOptimizedShader);
-        }
-    }
-
-    const char* Simplify(const char* szSource, NCryOpenGL::EShaderType eType)
-    {
-        struct SAutoContext
-        {
-            glslopt_ctx* m_pContext;
-            SAutoContext() { m_pContext = glslopt_initialize(kGlslTargetOpenGL); }
-            ~SAutoContext() { glslopt_cleanup(m_pContext); }
-        };
-
-        glslopt_shader_type eOptType;
-        switch (eType)
-        {
-        case NCryOpenGL::eST_Vertex:
-            eOptType = kGlslOptShaderVertex;
-            break;
-        case NCryOpenGL::eST_Fragment:
-            eOptType = kGlslOptShaderFragment;
-            break;
-        default:
-            DXGL_ERROR("Invalid shader type for glslOptimizer");
-            return NULL;
-        }
-
-        static SAutoContext s_kContext;
-        m_pOptimizedShader = glslopt_optimize(s_kContext.m_pContext, eOptType, szSource, 0);
-
-        if (!glslopt_get_status(m_pOptimizedShader))
-        {
-            DXGL_ERROR("Error during glslOptimizer execution: %s", glslopt_get_log(m_pOptimizedShader));
-            m_pOptimizedShader = NULL;
-            return NULL;
-        }
-
-        return glslopt_get_output (m_pOptimizedShader);
-    }
-};
-#endif
-
-namespace NCryOpenGL
-{
-    SSource::SSource(const char* pData, uint32 uDataSize)
-        : m_uDataSize(uDataSize)
-        , m_pData(pData)
-    {
-    }
-
-    SSource::~SSource()
-    {
-    }
-
-    struct SDXBCInfo
-    {
-        uint32 m_uMajorVersion, m_uMinorVersion;
-    };
-
-    struct SDXBCParseContext
-        : SDXBCInputBuffer
-    {
-        SDXBCInfo* m_pInfo;
-
-        SDXBCParseContext(const uint8* pBegin, const uint8* pEnd, SDXBCInfo* pInfo)
-            : SDXBCInputBuffer(pBegin, pEnd)
-            , m_pInfo(pInfo)
-        {
-        }
-
-        SDXBCParseContext(const SDXBCParseContext& kOther, uint32 uOffset)
-            : SDXBCInputBuffer(kOther.m_pBegin + uOffset, kOther.m_pEnd)
-            , m_pInfo(kOther.m_pInfo)
-        {
-            m_pIter = m_pBegin;
-        }
-
-        bool ReadString(char* pBuffer, uint32 uBufSize)
-        {
-            uint32 uSize((uint32)strlen(alias_cast<const char*>(m_pIter)) + 1);
-            if (uSize > uBufSize)
-            {
-                return false;
-            }
-            return Read(pBuffer, uSize);
-        }
-    };
-
-    bool DXBCRetrieveInfo(SDXBCParseContext& kContext)
-    {
-        uint32 uNumChunks;
-        DXBCReadUint32(kContext, uNumChunks);
-
-        uint32 uChunk;
-        for (uChunk = 0; uChunk < uNumChunks; ++uChunk)
-        {
-            uint32 uChunkBegin;
-            DXBCReadUint32(kContext, uChunkBegin);
-
-            SDXBCParseContext kChunkHeaderContext(kContext, uChunkBegin);
-
-            uint32 uChunkFourCC, uChunkSize;
-            DXBCReadUint32(kChunkHeaderContext, uChunkFourCC);
-            DXBCReadUint32(kChunkHeaderContext, uChunkSize);
-
-            if (uChunkFourCC == FOURCC_SHDR || uChunkFourCC == FOURCC_SHEX)
-            {
-                uint32 uEncodedInfo;
-                DXBCReadUint32(kChunkHeaderContext, uEncodedInfo);
-
-                kContext.m_pInfo->m_uMajorVersion = (uEncodedInfo >> 4) & 0xF;
-                kContext.m_pInfo->m_uMinorVersion = uEncodedInfo        & 0xF;
-
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    SShaderSource::SShaderSource()
-    {
-    }
-
-    SShaderSource::~SShaderSource()
-    {
-        delete [] m_pData;
-    }
-
-    void SShaderSource::SetData(const char* pData, uint32 uDataSize)
-    {
-        delete [] m_pData;
-        if (uDataSize > 0)
-        {
-            char* pBuffer = new char[uDataSize];
-            memcpy(pBuffer, pData, uDataSize);
-            m_pData = pBuffer;
-        }
-        else
-        {
-            m_pData = NULL;
-        }
-        m_uDataSize = uDataSize;
-    }
-
-
-    SGLShader::SGLShader()
-        : m_uName(0)
-        , m_separableProgramsSupported(false)
-    {
-    }
-
-    SGLShader::~SGLShader()
-    {
-        if (m_uName != 0)
-        {
-            if (m_separableProgramsSupported)
-            {
-                glDeleteProgram(m_uName);
-            }
-            else
-            {
-                glDeleteShader(m_uName);
-            }
-        }
-    }
-
-    SShader::SShader()
-        : m_eType(eST_NUM)
-    {
-    }
-
-    SShader::~SShader()
-    {
-        // All pipelines with this shader bound must be removed from the cache and deleted
-        TPipelines::const_iterator kPipelineIter(m_kBoundPipelines.begin());
-        const TPipelines::const_iterator kPipelineEnd(m_kBoundPipelines.end());
-        while (kPipelineIter != kPipelineEnd)
-        {
-            (*kPipelineIter)->m_pContext->RemovePipeline(*kPipelineIter, this);
-            ++kPipelineIter;
-        }
-    }
-
-    void SShader::AttachPipeline(SPipeline* pPipeline)
-    {
-        TPipelines::const_iterator kFound(std::find(m_kBoundPipelines.begin(), m_kBoundPipelines.end(), pPipeline));
-        if (kFound == m_kBoundPipelines.end())
-        {
-            m_kBoundPipelines.push_back(pPipeline);
-        }
-    }
-
-    void SShader::DetachPipeline(SPipeline* pPipeline)
-    {
-        TPipelines::iterator kFound(std::find(m_kBoundPipelines.begin(), m_kBoundPipelines.end(), pPipeline));
-        if (kFound != m_kBoundPipelines.end())
-        {
-            m_kBoundPipelines.erase(kFound);
-        }
-        else
-        {
-            DXGL_ERROR("Could not find the pipeline to be detached from the shader");
-        }
-    }
-
-    SPipeline::SPipeline(const SPipelineConfiguration& kConfiguration, CContext* pContext)
-        : m_kConfiguration(kConfiguration)
-        , m_pContext(pContext)
-#if DXGL_ENABLE_SHADER_TRACING
-        , m_uTraceBufferUnit(0)
-#endif //DXGL_ENABLE_SHADER_TRACING
-    {
-    }
-
-    SPipeline::~SPipeline()
-    {
-        if (m_pContext->GetDevice()->IsFeatureSupported(eF_SeparablePrograms))
-        {
-            glDeleteProgramPipelines(1, &m_uName);
-        }
-        else
-        {
-            glDeleteProgram(m_uName);
-        }
-    }
-
-    bool InitializeShaderReflectionVariable(SShaderReflectionVariable* pVariable, SDXBCParseContext* pContext)
-    {
-        uint32 uNamePos;
-        if (!DXBCReadUint32(*pContext, uNamePos) ||
-            !SDXBCParseContext(*pContext, uNamePos).ReadString(pVariable->m_acName, DXGL_ARRAY_SIZE(pVariable->m_acName)))
-        {
-            return false;
-        }
-
-        uint32 uPosType;
-        memset(&pVariable->m_kDesc, 0, sizeof(D3D11_SHADER_VARIABLE_DESC));
-        pVariable->m_kDesc.Name = pVariable->m_acName;
-        if (!DXBCReadUint32(*pContext, pVariable->m_kDesc.StartOffset) ||
-            !DXBCReadUint32(*pContext, pVariable->m_kDesc.Size) ||
-            !DXBCReadUint32(*pContext, pVariable->m_kDesc.uFlags) ||
-            !DXBCReadUint32(*pContext, uPosType))
-        {
-            return false;
-        }
-
-        {
-            SDXBCParseContext kTypeContext(*pContext);
-            memset(&pVariable->m_kType, 0, sizeof(D3D11_SHADER_TYPE_DESC));
-
-            if (!kTypeContext.SeekAbs(uPosType) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Class) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Type) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Rows) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Columns) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Elements) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Members) ||
-                !DXBCReadUint32(kTypeContext, pVariable->m_kType.Offset))
-            {
-                return false;
-            }
-            pVariable->m_kType.Name = NULL;
-        }
-
-        uint32 uPosDefaultValue;
-        if (!DXBCReadUint32(*pContext, uPosDefaultValue))
-        {
-            return false;
-        }
-        if (uPosDefaultValue != 0)
-        {
-            pVariable->m_kDefaultValue.resize(pVariable->m_kDesc.Size);
-            if (!pContext->Read(pVariable->m_kDefaultValue.data(), pVariable->m_kDesc.Size))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            pVariable->m_kDesc.DefaultValue = NULL;
-        }
-
-        if (pContext->m_pInfo->m_uMajorVersion >= 5)
-        {
-            if (!DXBCReadUint32(*pContext, pVariable->m_kDesc.StartTexture) ||
-                !DXBCReadUint32(*pContext, pVariable->m_kDesc.TextureSize) ||
-                !DXBCReadUint32(*pContext, pVariable->m_kDesc.StartSampler) ||
-                !DXBCReadUint32(*pContext, pVariable->m_kDesc.SamplerSize))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    bool InitializeShaderReflectionConstBuffer(SShaderReflectionConstBuffer* pConstBuffer, SDXBCParseContext* pContext)
-    {
-        uint32 uNamePos;
-        if (!DXBCReadUint32(*pContext, uNamePos) ||
-            !SDXBCParseContext(*pContext, uNamePos).ReadString(pConstBuffer->m_acName, DXGL_ARRAY_SIZE(pConstBuffer->m_acName)))
-        {
-            return false;
-        }
-
-        memset(&pConstBuffer->m_kDesc, 0, sizeof(pConstBuffer->m_kDesc));
-        pConstBuffer->m_kDesc.Name = pConstBuffer->m_acName;
-
-        uint32 uNumVariables, uPosVariables;
-        if (!DXBCReadUint32(*pContext, uNumVariables) ||
-            !DXBCReadUint32(*pContext, uPosVariables))
-        {
-            return false;
-        }
-        pConstBuffer->m_kDesc.Variables = uNumVariables;
-
-        SDXBCParseContext kVariablesContext(*pContext);
-        if (!kVariablesContext.SeekAbs(uPosVariables))
-        {
-            return false;
-        }
-        uint32 uVariable;
-        pConstBuffer->m_kVariables.resize(pConstBuffer->m_kDesc.Variables);
-        for (uVariable = 0; uVariable < pConstBuffer->m_kDesc.Variables; ++uVariable)
-        {
-            if (!InitializeShaderReflectionVariable(&pConstBuffer->m_kVariables.at(uVariable), &kVariablesContext))
-            {
-                return false;
-            }
-        }
-
-        if (!DXBCReadUint32(*pContext, pConstBuffer->m_kDesc.Size) ||
-            !DXBCReadUint32(*pContext, pConstBuffer->m_kDesc.uFlags) ||
-            !DXBCReadUint32(*pContext, pConstBuffer->m_kDesc.Type))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    bool InitializeShaderReflectionResource(SShaderReflectionResource* pParameter, SDXBCParseContext* pContext)
-    {
-        uint32 uNamePos;
-        if (!DXBCReadUint32(*pContext, uNamePos) ||
-            !SDXBCParseContext(*pContext, uNamePos).ReadString(pParameter->m_acName, DXGL_ARRAY_SIZE(pParameter->m_acName)))
-        {
-            return false;
-        }
-
-        memset(&pParameter->m_kDesc, 0, sizeof(pParameter->m_kDesc));
-
-        pParameter->m_kDesc.Name = pParameter->m_acName;
-        if (!DXBCReadUint32(*pContext, pParameter->m_kDesc.Type) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.ReturnType) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.Dimension) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.NumSamples) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.BindPoint) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.BindCount) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.uFlags))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    bool InitializeShaderReflectionParameters(SShaderReflection::TParameters& kParameters, SDXBCParseContext* pContext, bool extended = false)
-    {
-        uint32 uNumElements, uVersion;
-        if (!DXBCReadUint32(*pContext, uNumElements) ||
-            !DXBCReadUint32(*pContext, uVersion))
-        {
-            return false;
-        }
-
-        if (uNumElements > 0)
-        {
-            uint32 uPrevNumElements(kParameters.size());
-            kParameters.resize(kParameters.size() + uNumElements);
-
-            uint32 uElement;
-            for (uElement = uPrevNumElements; uElement < kParameters.size(); ++uElement)
-            {
-                SShaderReflectionParameter& kParameter(kParameters.at(uElement));
-                
-                memset(&kParameter.m_kDesc, 0, sizeof(kParameter.m_kDesc));
-                
-                // Only for extended parameters fxc adds two extra pieces of information, the stream index and the minimum precision.
-                if (extended && !DXBCReadUint32(*pContext, kParameter.m_kDesc.Stream))
-                {
-                    return false;
-                }
-
-                uint32 uSemNamePosition;
-                if (!DXBCReadUint32(*pContext, uSemNamePosition) ||
-                    !SDXBCParseContext(*pContext, uSemNamePosition).ReadString(kParameter.m_acSemanticName, DXGL_ARRAY_SIZE(kParameter.m_acSemanticName)))
-                {
-                    return false;
-                }
-                
-                kParameter.m_kDesc.SemanticName = kParameter.m_acSemanticName;
-                if (!DXBCReadUint32(*pContext, kParameter.m_kDesc.SemanticIndex) ||
-                    !DXBCReadUint32(*pContext, kParameter.m_kDesc.SystemValueType) ||
-                    !DXBCReadUint32(*pContext, kParameter.m_kDesc.ComponentType) ||
-                    !DXBCReadUint32(*pContext, kParameter.m_kDesc.Register) ||
-                    !DXBCReadUint8(*pContext, kParameter.m_kDesc.Mask) ||
-                    !DXBCReadUint8(*pContext, kParameter.m_kDesc.ReadWriteMask) ||
-                    !pContext->SeekRel(sizeof(uint16_t)) || // These two bytes are part of the mask but are not used, so we skip them.
-                    (extended && !DXBCReadUint32(*pContext, kParameter.m_kDesc.MinPrecision))) // Precision available only for extended parameters.
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    bool InitializeShaderReflection(SShaderReflection* pReflection, const void* pvData, uint32 uSize)
-    {
-        enum
-        {
-            CHUNKS_POSITION = sizeof(uint32) * 7
-        };
-        SDXBCInfo kInfo;
-        const uint8* puData(alias_cast<const uint8*>(pvData));
-        SDXBCParseContext kContext(puData, puData + uSize, &kInfo);
-
-        if (!kContext.SeekAbs(CHUNKS_POSITION))
-        {
-            return false;
-        }
-
-        {
-            SDXBCParseContext kParseContext(kContext);
-            if (!DXBCRetrieveInfo(kParseContext))
-            {
-                return false;
-            }
-        }
-        uint32 uNumChunks;
-        if (!DXBCReadUint32(kContext, uNumChunks))
-        {
-            return false;
-        }
-
-        uint32 uOffset;
-        for (uint32 uChunk = 0; uChunk < uNumChunks; ++uChunk)
-        {
-            uint32 uChunkBegin;
-            if (!DXBCReadUint32(kContext, uChunkBegin))
-            {
-                return false;
-            }
-
-            SDXBCParseContext kChunkHeaderContext(kContext, uChunkBegin);
-
-            uint32 uChunkFourCC, uChunkSize;
-            if (!DXBCReadUint32(kChunkHeaderContext, uChunkFourCC) ||
-                !DXBCReadUint32(kChunkHeaderContext, uChunkSize))
-            {
-                return false;
-            }
-
-            SDXBCParseContext kChunkContext(kChunkHeaderContext.m_pIter, kChunkHeaderContext.m_pEnd, &kInfo);
-            switch (uChunkFourCC)
-            {
-            case FOURCC_RDEF:
-            {
-                uint32 uNumConstBuffers, uPosConstBuffers, uNumResources, uPosResources;
-                if (!DXBCReadUint32(kChunkContext, uNumConstBuffers) ||
-                    !DXBCReadUint32(kChunkContext, uPosConstBuffers) ||
-                    !DXBCReadUint32(kChunkContext, uNumResources) ||
-                    !DXBCReadUint32(kChunkContext, uPosResources))
-                {
-                    return false;
-                }
-
-                SDXBCParseContext kConstBufferContext(kChunkContext);
-                if (!kConstBufferContext.SeekAbs(uPosConstBuffers))
-                {
-                    return false;
-                }
-                uint32 uConstBuffer;
-                uint32 uPrevNumConstBuffers(pReflection->m_kConstantBuffers.size());
-                pReflection->m_kConstantBuffers.resize(uNumConstBuffers);
-                for (uConstBuffer = uPrevNumConstBuffers; uConstBuffer < uNumConstBuffers; ++uConstBuffer)
-                {
-                    if (!InitializeShaderReflectionConstBuffer(&pReflection->m_kConstantBuffers.at(uConstBuffer), &kConstBufferContext))
-                    {
-                        return false;
-                    }
-                }
-
-                SDXBCParseContext kResourceContext(kChunkContext);
-                if (!kResourceContext.SeekAbs(uPosResources))
-                {
-                    return false;
-                }
-                uint32 uResource;
-                uint32 uPrevNumResources(pReflection->m_kResources.size());
-                pReflection->m_kResources.resize(uNumResources);
-                for (uResource = uPrevNumResources; uResource < uNumResources; ++uResource)
-                {
-                    if (!InitializeShaderReflectionResource(&pReflection->m_kResources.at(uResource), &kResourceContext))
-                    {
-                        return false;
-                    }
-                }
-            }
-            break;
-            case FOURCC_ISGN:
-            case FOURCC_ISG1:
-                if (!InitializeShaderReflectionParameters(pReflection->m_kInputs, &kChunkContext, uChunkFourCC == FOURCC_ISG1))
-                {
-                    return false;
-                }
-                break;
-            case FOURCC_OSGN:
-            case FOURCC_OSG1:
-                if (!InitializeShaderReflectionParameters(pReflection->m_kOutputs, &kChunkContext, uChunkFourCC == FOURCC_OSG1))
-                {
-                    return false;
-                }
-                break;
-            case FOURCC_PCSG:
-                if (!InitializeShaderReflectionParameters(pReflection->m_kPatchConstants, &kChunkContext))
-                {
-                    return false;
-                }
-                break;
-            case FOURCC_GLSL:
-                if (!DXBCReadUint32(kChunkContext, pReflection->m_uNumSamplers) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uNumImages) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uNumStorageBuffers) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uNumUniformBuffers) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uImportsSize) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uExportsSize) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uInputHash) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uSymbolsOffset))
-                {
-                    return false;
-                }
-
-                uOffset = (uint32)(kChunkContext.m_pIter - kContext.m_pBegin);
-                pReflection->m_uSamplersOffset       = uOffset;
-                uOffset += GLSL_SAMPLER_SIZE  * pReflection->m_uNumSamplers;
-                pReflection->m_uImagesOffset         = uOffset;
-                uOffset += GLSL_RESOURCE_SIZE * pReflection->m_uNumImages;
-                pReflection->m_uStorageBuffersOffset = uOffset;
-                uOffset += GLSL_RESOURCE_SIZE * pReflection->m_uNumStorageBuffers;
-                pReflection->m_uUniformBuffersOffset = uOffset;
-                uOffset += GLSL_RESOURCE_SIZE * pReflection->m_uNumUniformBuffers;
-                pReflection->m_uImportsOffset        = uOffset;
-                uOffset += GLSL_SYMBOL_SIZE   * pReflection->m_uImportsSize;
-                pReflection->m_uExportsOffset        = uOffset;
-                uOffset += GLSL_SYMBOL_SIZE   * pReflection->m_uExportsSize;
-                pReflection->m_uGLSLSourceOffset     = uOffset;
-                break;
-            }
-        }
-
-        memset(&pReflection->m_kDesc, 0, sizeof(D3D11_SHADER_DESC));
-        pReflection->m_kDesc.ConstantBuffers         = pReflection->m_kConstantBuffers.size();
-        pReflection->m_kDesc.BoundResources          = pReflection->m_kResources.size();
-        pReflection->m_kDesc.InputParameters         = pReflection->m_kInputs.size();
-        pReflection->m_kDesc.OutputParameters        = pReflection->m_kOutputs.size();
-        pReflection->m_kDesc.PatchConstantParameters = pReflection->m_kPatchConstants.size();
-
-        return true;
-    }
-
-
-#if !DXGL_INPUT_GLSL
-
-    struct SGLSLConversionOutput
-    {
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-        GLSLShader m_kGLSLShader;
-#endif //DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-
-        SGLSLConversionOutput()
-        {
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-            memset(&m_kGLSLShader, 0, sizeof(m_kGLSLShader));
-#endif //DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-        }
-
-        ~SGLSLConversionOutput()
-        {
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-            FreeGLSLShader(&m_kGLSLShader);
-#endif //DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-        }
-    };
-
-    bool ConvertDXBCToGLSL(const void* pvSourceData, size_t uSourceSize, EShaderVersion eVersion, SGLSLConversionOutput* pOutput)
-    {
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-        unsigned int uFlags(HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT);
-        GlExtensions kExtensions = {0};
-
-#if CRY_OPENGL_ADAPT_CLIP_SPACE
-        uFlags |= HLSLCC_FLAG_CONVERT_CLIP_SPACE_Z;
-    #if CRY_OPENGL_FLIP_Y
-        DXGL_TODO("Only do this if the shader is expected to be used to render into a texture so that a final blit for flipping is not required")
-        uFlags |= HLSLCC_FLAG_INVERT_CLIP_SPACE_Y;
-    #else
-        uFlags |= HLSLCC_FLAG_ORIGIN_UPPER_LEFT;
-    #endif
-#endif //CRY_OPENGL_ADAPT_CLIP_SPACE
-
-        DXGL_TODO("Currently we always specify bindings at run-time (slot ranges are determined during startup), and leave the default location for resources (mainly to prevent collisions between resources with the same register index in different non-separable shader stages). Evaluate the possibility of coding them into the shader source.");
-        uFlags |= HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS;
-
-        DXGL_TODO("This is currently the only correct setting as register aliasing is buggy when branches are present.");
-        uFlags |= HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING;
-
-#if DXGL_HLSL_TO_GLSL_DEBUG
-        uFlags |= HLSLCC_FLAG_HASH_INPUT;
-        uFlags |= HLSLCC_FLAG_ADD_DEBUG_HEADER;
-#endif //DXGL_HLSL_TO_GLSL_DEBUG
-
-#if DXGL_ENABLE_SHADER_TRACING
-        if (eVersion == eSV_Tracing)
-        {
-            uFlags |= HLSLCC_FLAG_TRACING_INSTRUMENTATION;
-        }
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-        // Some drivers (e.g. AMD Catalyst) have issues with certain version strings so we append a different version string at runtime as workaround
-        uFlags |= HLSLCC_FLAG_NO_VERSION_STRING;
-
-        //#if DXGLES
-        //  uFlags |= HLSLCC_FLAG_INOUT_SEMANTIC_NAMES;
-        //#endif
-
-        GLLang eLanguage;
-#if DXGL_REQUIRED_VERSION >= DXGL_VERSION_44
-        eLanguage = LANG_440;
-#elif DXGL_REQUIRED_VERSION >= DXGL_VERSION_43
-        eLanguage = LANG_430;
-#elif DXGL_REQUIRED_VERSION >= DXGL_VERSION_42
-        eLanguage = LANG_420;
-#elif DXGL_REQUIRED_VERSION >= DXGL_VERSION_41
-        eLanguage = LANG_410;
-#elif DXGLES
-        uint32 glVersion = RenderCapabilities::GetDeviceGLVersion();
-        if (glVersion == DXGLES_VERSION_30)
-        {
-            eLanguage = LANG_ES_300;
-        }
-        else
-        {
-            eLanguage = LANG_ES_310;
-        }
-#else
-    #error "Shading language revision not defined for this GL version"
-#endif
-
-        HLSLcc_SetMemoryFunctions(&Malloc, &Calloc, &Free, &Realloc);
-
-        if (TranslateHLSLFromMem(static_cast<const char*>(pvSourceData), uSourceSize, uFlags, eLanguage, &kExtensions, &pOutput->m_kGLSLShader) != 1)
-        {
-            DXGL_ERROR("HLSL to GLSL conversion failed");
-            return false;
-        }
-
-#else
-#pragma error "Not implemented on this configuration"
-#endif
-
-        return true;
-    }
-
-    bool InitializeTranslatedShaderSource(SShaderSource* pSource, const void* pvDXBCData, size_t uDXBCSize, const SGLSLConversionOutput& kConversionOutput)
-    {
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-        const uint8* puDXBC(static_cast<const uint8*>(pvDXBCData));
-
-        SDXBCInputBuffer kInputBuffer(puDXBC, puDXBC + uDXBCSize);
-        size_t uCombinedSize(DXBCGetCombinedSize(kInputBuffer, &kConversionOutput.m_kGLSLShader));
-        if (uCombinedSize == 0 || uCombinedSize > 0xFFFFFFFF)
-        {
-            return false;
-        }
-
-        uint8* puCombined(static_cast<uint8*>(Malloc(uCombinedSize)));
-        pSource->m_pData = alias_cast<const char*>(puCombined);
-        pSource->m_uDataSize = (uint32)uCombinedSize;
-
-        kInputBuffer = SDXBCInputBuffer(puDXBC, puDXBC + uDXBCSize);
-        SDXBCOutputBuffer kOutputBuffer(puCombined, puCombined + uCombinedSize);
-        return DXBCCombineWithGLSL(kInputBuffer, kOutputBuffer, &kConversionOutput.m_kGLSLShader);
-#else
-#pragma error "Not implemented on this configuration"
-#endif
-    }
-
-#endif // !DXGL_INPUT_GLSL
-
-    bool InitializeShaderReflectionFromInput(SShaderReflection* pReflection, const void* pvInputData)
-    {
-        enum
-        {
-            SIZE_POSITION = 6
-        };
-        uint32 uInputDataSize(alias_cast<const uint32*>(pvInputData)[SIZE_POSITION]);
-#if DXGL_INPUT_GLSL
-        return InitializeShaderReflection(pReflection, pvInputData, uInputDataSize);
-#else
-        SShaderSource kTempShaderSource;
-        SGLSLConversionOutput kTempConversionOutput;
-        return
-            ConvertDXBCToGLSL(pvInputData, uInputDataSize, eSV_Normal, &kTempConversionOutput) &&
-            InitializeTranslatedShaderSource(&kTempShaderSource, pvInputData, uInputDataSize, kTempConversionOutput) &&
-            InitializeShaderReflection(pReflection, kTempShaderSource.m_pData, kTempShaderSource.m_uDataSize);
-#endif
-    }
-
-
-    bool CompileShaderFromSources(SGLShader& shader, const GLchar* aszSources[], GLint aiSourceLengths[], uint32 uNumSources, GLenum eGLShaderType, bool isSeparableProgramsSupported)
-    {
-        shader.m_separableProgramsSupported = isSeparableProgramsSupported;
-        if (isSeparableProgramsSupported)
-        {
-            shader.m_uName = glCreateShaderProgramv(eGLShaderType, uNumSources, aszSources);
-
-            if (!shader.m_uName)
-            {
-                return false;
-            }
-
-            if (!VerifyProgramStatus(shader.m_uName, GL_LINK_STATUS))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            shader.m_uName = glCreateShader(eGLShaderType);
-            if (!shader.m_uName)
-            {
-                return false;
-            }
-            glShaderSource(shader.m_uName, uNumSources, aszSources, aiSourceLengths);
-            glCompileShader(shader.m_uName);
-
-            if (!VerifyShaderStatus(shader.m_uName, GL_COMPILE_STATUS))
-            {
-                return false;
-            }
-
-#if defined(glReleaseShaderCompiler)
-            DXGL_TODO("Check whether this is actually useful")
-            glReleaseShaderCompiler();
-#endif //defined(glReleaseShaderCompiler)
-        }
-        return true;
-    }
-
-    SShader::SVersion& GetPipelineShaderVersion(const SPipelineConfiguration& kPipelineConfig, EShaderType eStage)
-    {
-#if DXGL_ENABLE_SHADER_TRACING
-        EShaderVersion eVersion(kPipelineConfig.m_aeShaderVersions[eStage]);
-#else
-        EShaderVersion eVersion(eSV_Normal);
-#endif
-        return kPipelineConfig.m_apShaders[eStage]->m_akVersions[eVersion];
-    }
-
-    bool FindShaderSymbolByType(const uint32* puSymbols, uint32 uNumSymbols, SYMBOL_TYPE eType, uint32* puID, uint32* puValue)
-    {
-        const uint32* puSymbolsEnd = puSymbols + uNumSymbols * 3;
-        for (const uint32* puSymbol = puSymbols; puSymbol != puSymbolsEnd; puSymbol += 3)
-        {
-            if ((SYMBOL_TYPE)puSymbol[0] == eType)
-            {
-                *puID = puSymbol[1];
-                *puValue = puSymbol[2];
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool FindShaderSymbolByTypeAndID(const uint32* puSymbols, uint32 uNumSymbols, SYMBOL_TYPE eType, uint32 uID, uint32* puValue)
-    {
-        const uint32* puSymbolsEnd = puSymbols + uNumSymbols * 3;
-        for (const uint32* puSymbol = puSymbols; puSymbol != puSymbolsEnd; puSymbol += 3)
-        {
-            if ((SYMBOL_TYPE)puSymbol[0] == eType && puSymbol[1] == uID)
-            {
-                *puValue = puSymbol[2];
-                return true;
-            }
-        }
-        return false;
-    }
-
-    template <uint32 uMaxDigits>
-    uint32 WriteShaderDecimal(char* acOutput, uint32 uValue)
-    {
-        char acDigits[uMaxDigits];
-        char* pcDigit(acDigits + uMaxDigits - 1);
-        while (true)
-        {
-            uint32 uNext(uValue / 10);
-            uint32 uDigit(uValue % 10);
-            *pcDigit = '0' + uDigit;
-            if (uNext == 0 || pcDigit == acDigits)
-            {
-                break;
-            }
-            uValue = uNext;
-            --pcDigit;
-        }
-        uint32 uNumDigits((uint32)(acDigits + uMaxDigits - pcDigit));
-        memcpy(acOutput, pcDigit, uNumDigits);
-        return uNumDigits;
-    }
-
-    void BuildVersionString(SPipelineCompilationBuffer* pBuffer, CDevice* pDevice)
-    {
-#if DXGL_REQUIRED_VERSION >= DXGL_VERSION_44
-        const char* szVersion = "#version 440\n";
-        // Workaround for AMD Catalyst - as of version 15.7.1 using "#version 440" causes std140 uniform buffers
-        // to have random layouts (see https://community.amd.com/thread/185272)
-        if (pDevice->GetAdapter()->m_eDriverVendor == RenderCapabilities::s_gpuVendorIdAMD)
-        {
-            szVersion = "#version 430\n";
-        }
-#elif DXGL_REQUIRED_VERSION >= DXGL_VERSION_43
-        const char* szVersion = "#version 430\n";
-#elif DXGL_REQUIRED_VERSION >= DXGL_VERSION_42
-        const char* szVersion = "#version 420\n";
-#elif DXGL_REQUIRED_VERSION >= DXGL_VERSION_41
-        const char* szVersion = "#version 410\n";
-#elif DXGLES
-        uint32 glVersion = RenderCapabilities::GetDeviceGLVersion();
-        const char* szVersion;
-        if (glVersion == DXGLES_VERSION_30)
-        {
-            szVersion = "#version 300 es\n";
-        }
-        else
-        {
-            szVersion = "#version 310 es\n";
-        }
-#else
-    #error "Shading language revision not defined for this GL version"
-#endif
-        pBuffer->m_iVersionStringLength = min(strlen(szVersion), sizeof(pBuffer->m_acVersionString));
-        memcpy(pBuffer->m_acVersionString, szVersion, pBuffer->m_iVersionStringLength);
-    }
-
-    void BuildShaderImportHeader(SPipelineCompilationBuffer* pBuffer, const uint32* auImports, uint32 uNumImports, const SPipelineConfiguration& kConfiguration)
-    {
-        static const char acImportPrefix[] = "#define IMPORT_";
-        enum
-        {
-            IMPORT_INDEX_OFFSET = sizeof(acImportPrefix) - 1,
-            IMPORT_INDEX_MAX_DIGITS = 10,
-            IMPORT_VALUE_OFFSET = IMPORT_INDEX_OFFSET + IMPORT_INDEX_MAX_DIGITS + 1,
-            IMPORT_VALUE_MAX_DIGITS = 10,
-            IMPORT_NEWLINE_OFFSET = IMPORT_VALUE_OFFSET + IMPORT_VALUE_MAX_DIGITS,
-            IMPORT_STRIDE = IMPORT_NEWLINE_OFFSET + 1
-        };
-
-        if (pBuffer->m_uImportsHeaderCapacity < uNumImports)
-        {
-            pBuffer->m_acImportsHeader = static_cast<char*>(Realloc(pBuffer->m_acImportsHeader, IMPORT_STRIDE * uNumImports));
-            memset(pBuffer->m_acImportsHeader + IMPORT_STRIDE * pBuffer->m_uImportsHeaderCapacity, (int)' ', IMPORT_STRIDE * (uNumImports - pBuffer->m_uImportsHeaderCapacity));
-            for (uint32 uImport = pBuffer->m_uImportsHeaderCapacity; uImport < uNumImports; ++uImport)
-            {
-                char* acIter(pBuffer->m_acImportsHeader + IMPORT_STRIDE * uImport);
-                memcpy(acIter, acImportPrefix, IMPORT_INDEX_OFFSET);
-                WriteShaderDecimal<IMPORT_INDEX_MAX_DIGITS>(acIter + IMPORT_INDEX_OFFSET, uImport);
-                acIter[IMPORT_NEWLINE_OFFSET] = '\n';
-            }
-            pBuffer->m_uImportsHeaderCapacity = uNumImports;
-        }
-
-        pBuffer->m_uImportsBeginOffset = 0;
-        pBuffer->m_uImportsEndOffset = 0;
-
-        for (uint32 uImport = 0; uImport < uNumImports; ++uImport)
-        {
-            SYMBOL_TYPE eType((SYMBOL_TYPE)auImports[uImport * 3]);
-            uint32 uID(auImports[uImport * 3 + 1]);
-            uint32 uDefaultValue(auImports[uImport * 3 + 2]);
-
-            uint32 uReqValue = uDefaultValue;
-            switch (eType)
-            {
-#if DXGL_SUPPORT_TESSELLATION
-            case SYMBOL_TESSELLATOR_PARTITIONING:
-            case SYMBOL_TESSELLATOR_OUTPUT_PRIMITIVE:
-                if (kConfiguration.m_apShaders[eST_TessControl])
-                {
-                    const SShader::SVersion& kLinkVersion(GetPipelineShaderVersion(kConfiguration, eST_TessControl));
-                    const uint32* auLinkExports(alias_cast<const uint32*>(kLinkVersion.m_kSource.m_pData + kLinkVersion.m_kReflection.m_uExportsOffset));
-                    uint32 uNumLinkExports(kLinkVersion.m_kReflection.m_uExportsSize);
-
-                    uint32 uExportID;
-                    if (!FindShaderSymbolByType(auLinkExports, uNumLinkExports, eType, &uExportID, &uReqValue))
-                    {
-                        uReqValue = uDefaultValue;
-                    }
-                }
-                break;
-#endif //!DXGL_SUPPORT_TESSELLATION
-            case SYMBOL_INPUT_INTERPOLATION_MODE:
-                if (kConfiguration.m_apShaders[eST_Fragment])
-                {
-                    const SShader::SVersion& kLinkVersion(GetPipelineShaderVersion(kConfiguration, eST_Fragment));
-                    const uint32* auLinkExports(alias_cast<const uint32*>(kLinkVersion.m_kSource.m_pData + kLinkVersion.m_kReflection.m_uExportsOffset));
-                    uint32 uNumLinkExports(kLinkVersion.m_kReflection.m_uExportsSize);
-
-                    if (!FindShaderSymbolByTypeAndID(auLinkExports, uNumLinkExports, SYMBOL_INPUT_INTERPOLATION_MODE, uID, &uReqValue))
-                    {
-                        uReqValue = uDefaultValue;
-                    }
-                }
-                break;
-            case SYMBOL_EMULATE_DEPTH_CLAMP:
-#if DXGL_SUPPORT_DEPTH_CLAMP
-                uReqValue = 0;
-#else
-                uReqValue = kConfiguration.m_bEmulateDepthClamp;
-#endif
-                break;
-            default:
-                DXGL_ERROR("Unexpected shader import type");
-                break;
-            }
-
-            if (uReqValue != uDefaultValue || pBuffer->m_uImportsEndOffset > 0)
-            {
-                char* acIter(pBuffer->m_acImportsHeader + IMPORT_STRIDE * uImport + IMPORT_VALUE_OFFSET);
-                uint32 uNumDigits(WriteShaderDecimal<IMPORT_VALUE_MAX_DIGITS>(acIter, uReqValue));
-                if (uNumDigits < IMPORT_VALUE_MAX_DIGITS)
-                {
-                    memset(acIter + uNumDigits, ' ', IMPORT_VALUE_MAX_DIGITS - uNumDigits);
-                }
-                if (pBuffer->m_uImportsEndOffset == 0)
-                {
-                    pBuffer->m_uImportsBeginOffset = uImport * IMPORT_STRIDE;
-                }
-                pBuffer->m_uImportsEndOffset = (uImport + 1) * IMPORT_STRIDE;
-            }
-        }
-    }
-
-#if DXGL_DUMP_GLSL_SOURCES
-
-    void DumpShaderSources(const GLchar** aszSources, const GLint* aiSourceLengths, uint32 uNumSources, uint32 uHash, uint32 uVersion)
-    {
-        STraceFile kTraceFile;
-        char acBuffer[32];
-        if (uVersion == 0)
-        {
-            sprintf_s(acBuffer, "0x%08X.txt", uHash);
-        }
-        else
-        {
-            sprintf_s(acBuffer, "0x%08X_%1d.txt", uHash, uVersion);
-        }
-        if (!kTraceFile.Open(acBuffer, false))
-        {
-            DXGL_ERROR("Could not open file \"%s\" for writing", acBuffer);
-            return;
-        }
-        for (uint32 uSource = 0; uSource < uNumSources; ++uSource)
-        {
-            kTraceFile.Write(aszSources[uSource], aiSourceLengths[uSource] - 1);
-        }
-    }
-
-#endif //DXGL_DUMP_GLSL_SOURCES
-
-    bool CompilePipeline(SPipeline* pPipeline, SPipelineCompilationBuffer* pBuffer, CDevice* pDevice)
-    {
-        bool isSeparableProgramsSupported = pDevice->IsFeatureSupported(eF_SeparablePrograms);
-        if (isSeparableProgramsSupported)
-        {
-            glGenProgramPipelines(1, &pPipeline->m_uName);
-        }
-        else
-        {
-            pPipeline->m_uName = glCreateProgram();
-        }
-
-        for (uint32 uShader = 0; uShader < eST_NUM; ++uShader)
-        {
-            SShader* pShader(pPipeline->m_kConfiguration.m_apShaders[uShader]);
-
-            if (IsPipelineStageUsed(pPipeline->m_kConfiguration.m_eMode, (EShaderType)uShader) && pShader != NULL)
-            {
-                SShader::SVersion& kVersion(GetPipelineShaderVersion(pPipeline->m_kConfiguration, (EShaderType)uShader));
-                GLenum eGLShaderType;
-                if (!GetGLShaderType(eGLShaderType, (EShaderType)uShader))
-                {
-                    return false;
-                }
-
-                if (pBuffer->m_iVersionStringLength < 0)
-                {
-                    BuildVersionString(pBuffer, pDevice);
-                }
-
-                uint32 uGLSLOffset(kVersion.m_kReflection.m_uGLSLSourceOffset);
-                uint32 uSymbolsOffset(kVersion.m_kReflection.m_uSymbolsOffset);
-                SSource kGLSLSource(kVersion.m_kSource.m_pData + uGLSLOffset, kVersion.m_kSource.m_uDataSize - uGLSLOffset);
-                const uint32* auImports(alias_cast<const uint32*>(kVersion.m_kSource.m_pData + kVersion.m_kReflection.m_uImportsOffset));
-                uint32 uNumImports(kVersion.m_kReflection.m_uImportsSize);
-                BuildShaderImportHeader(pBuffer, auImports, uNumImports, pPipeline->m_kConfiguration);
-
-                const GLchar* aszSources[4];
-                GLint aiSourceLengths[4];
-                uint32 uNumSources = 0;
-
-                aszSources[uNumSources]      = pBuffer->m_acVersionString;
-                aiSourceLengths[uNumSources] = pBuffer->m_iVersionStringLength;
-                ++uNumSources;
-
-                if (pBuffer->m_uImportsEndOffset > pBuffer->m_uImportsBeginOffset)
-                {
-                    if (uSymbolsOffset > 0)
-                    {
-                        aszSources[uNumSources]      = kGLSLSource.m_pData;
-                        aiSourceLengths[uNumSources] = static_cast<GLint>(uSymbolsOffset);
-                        ++uNumSources;
-                    }
-
-                    aszSources[uNumSources]      = pBuffer->m_acImportsHeader + pBuffer->m_uImportsBeginOffset;
-                    aiSourceLengths[uNumSources] = static_cast<GLint>(pBuffer->m_uImportsEndOffset - pBuffer->m_uImportsBeginOffset);
-                    ++uNumSources;
-
-                    aszSources[uNumSources]      = kGLSLSource.m_pData + uSymbolsOffset;
-                    aiSourceLengths[uNumSources] = static_cast<GLint>(kGLSLSource.m_uDataSize - 1 - uSymbolsOffset);
-                    ++uNumSources;
-                }
-                else
-                {
-                    aszSources[uNumSources]      = kGLSLSource.m_pData;
-                    aiSourceLengths[uNumSources] = static_cast<GLint>(kGLSLSource.m_uDataSize - 1);
-                    ++uNumSources;
-                }
-
-#if DXGL_DUMP_GLSL_SOURCES
-                DumpShaderSources(
-                    aszSources + uFirstSource,
-                    aiSourceLengths + uFirstSource,
-                    uNumSources,
-                    kVersion.m_kReflection.m_uInputHash,
-                    pPipeline->m_kConfiguration.m_aeShaderVersions[uShader]);
-#endif //DXGL_DUMP_GLSL_SOURCES
-
-                if (!CompileShaderFromSources(
-                        pPipeline->m_akGLShaders[uShader],
-                        aszSources,
-                        aiSourceLengths,
-                        uNumSources,
-                        eGLShaderType,
-                        isSeparableProgramsSupported))
-                {
-                    DXGL_ERROR("Shader 0x%08X failed to compile", kVersion.m_kReflection.m_uInputHash);
-                    return false;
-                }
-
-                if (isSeparableProgramsSupported)
-                {
-                    GLbitfield uProgramStageBit(0);
-                    if (!GetGLProgramStageBit(uProgramStageBit, pShader->m_eType))
-                    {
-                        return false;
-                    }
-                    glUseProgramStages(pPipeline->m_uName, uProgramStageBit, pPipeline->m_akGLShaders[uShader].m_uName);
-                }
-                else
-                {
-                    glAttachShader(pPipeline->m_uName, pPipeline->m_akGLShaders[uShader].m_uName);
-                }
-            }
-        }
-
-        if (!isSeparableProgramsSupported)
-        {
-            glLinkProgram(pPipeline->m_uName);
-
-            if (!VerifyProgramStatus(pPipeline->m_uName, GL_LINK_STATUS))
-            {
-                CryLogAlways("Shader did not link properly !! ");
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    bool InitializeShader(SShader* pShader, const void* pvSourceData, size_t uSourceSize, const GLchar* szSourceOverride)
-    {
-#if DXGL_INPUT_GLSL
-        SShader::SVersion& kVersion(pShader->m_akVersions[eSV_Normal]);
-        kVersion.m_kSource.SetData(reinterpret_cast<const char*>(pvSourceData), uSourceSize);
-#else
-        SGLSLConversionOutput akConversionOutputs[eSV_NUM];
-        for (uint32 uVersion = 0; uVersion < eSV_NUM; ++uVersion)
-        {
-            SShader::SVersion& kVersion(pShader->m_akVersions[uVersion]);
-
-            if (!ConvertDXBCToGLSL(pvSourceData, uSourceSize, (EShaderVersion)uVersion, akConversionOutputs + uVersion) ||
-                !InitializeTranslatedShaderSource(&kVersion.m_kSource, pvSourceData, uSourceSize, akConversionOutputs[uVersion]))
-            {
-                return false;
-            }
-#endif
-
-        uint32 uGLSLOffset;
-        if (!InitializeShaderReflection(&kVersion.m_kReflection, kVersion.m_kSource.m_pData, kVersion.m_kSource.m_uDataSize) ||
-            (uGLSLOffset = kVersion.m_kReflection.m_uGLSLSourceOffset) >= (uint32)uSourceSize)
-        {
-            DXGL_ERROR("Could not retrieve shader reflection data");
-            return false;
-        }
-
-#if !DXGL_INPUT_GLSL
-    }
-#endif
-
-#if DXGL_ENABLE_SHADER_TRACING
-        const ShaderInfo* pTracingInfo(&akConversionOutputs[eSV_Tracing].m_kGLSLShader.reflection);
-        uint32 uOffset = 0;
-        for (uint32 uStep = 0; uStep < pTracingInfo->ui32NumTraceSteps; ++uStep)
-        {
-            const StepTraceInfo* pStep(pTracingInfo->psTraceSteps + uStep);
-            for (uint32 uVariable = 0; uVariable < pStep->ui32NumVariables; ++uVariable)
-            {
-                pShader->m_kTraceIndex.m_kTraceVariables.push_back(pStep->psVariables[uVariable]);
-            }
-            pShader->m_kTraceIndex.m_kTraceStepOffsets.push_back(uOffset);
-            pShader->m_kTraceIndex.m_kTraceStepSizes.push_back(pStep->ui32NumVariables);
-            uOffset += pStep->ui32NumVariables;
-        }
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-        return true;
-    }
-
-    GLuint GetProgramName(SPipeline* pPipeline, SShader* pShader)
-    {
-        if (!pPipeline->m_pContext->GetDevice()->IsFeatureSupported(eF_SeparablePrograms))
-        {
-            return pPipeline->m_uName;
-        }
-
-        return pPipeline->m_akGLShaders[pShader->m_eType].m_uName;
-    }
-
-    bool BindUniformBufferToUnit(GLuint uProgramName, uint32 uUnit, const char* szName, CContext* pContext)
-    {
-        GLuint uUniformBlockIndex(glGetUniformBlockIndex(uProgramName, szName));
-        if (uUniformBlockIndex == GL_INVALID_INDEX)
-        {
-            DXGL_WARNING("Could not find uniform buffer \"%s\" in program, probably optimized out by the GLSL compiler, ignoring binding", szName);
-            return true;
-        }
-
-        glUniformBlockBinding(uProgramName, uUniformBlockIndex, uUnit);
-        return true;
-    }
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS && !DXGLES
-    // GLES doesn't have the function glShaderStorageBlockBinding.
-    // Binding locations for shader storage is specified in the shader and can't be change.
-    bool BindStorageBufferToUnit(GLuint uProgramName, uint32 uUnit, const char* szName, CContext* pContext)
-    {
-        GLuint uStorageBlockIndex(glGetProgramResourceIndex(uProgramName, GL_SHADER_STORAGE_BLOCK, szName));
-        if (uStorageBlockIndex == GL_INVALID_INDEX)
-        {
-            DXGL_WARNING("Could not find storage buffer \"%s\" in program, probably optimized out by the GLSL compiler, ignoring binding", szName);
-            return true;
-        }
-
-        glShaderStorageBlockBinding(uProgramName, uStorageBlockIndex, uUnit);
-        return true;
-    }
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS && !DXGLES
-
-    bool BindUniformToUnit(GLuint uProgramName, uint32 uUnit, const char* szName, CContext* pContext)
-    {
-        GLint iUniformBlockIndex(glGetUniformLocation(uProgramName, szName));
-        if (iUniformBlockIndex < 0)
-        {
-            DXGL_WARNING("Could not find uniform \"%s\" in program, probably optimized out by the GLSL compiler, ignoring binding", szName);
-            return true;
-        }
-
-        if (pContext->GetDevice()->IsFeatureSupported(eF_SeparablePrograms))
-        {
-            if (iUniformBlockIndex >= 0)
-            {
-                glProgramUniform1i(uProgramName, iUniformBlockIndex, uUnit);
-            }
-        }
-        else
-        {
-            SAutoBindProgram kBindProgram(uProgramName);
-            if (iUniformBlockIndex >= 0)
-            {
-                glUniform1i(iUniformBlockIndex, uUnit);
-            }
-        }
-
-        return true;
-    }
-
-#if DXGL_ENABLE_SHADER_TRACING
-
-    uint32 FindUnusedShaderStorageBufferUnit(SPipeline* pPipeline, CDevice* pDevice)
-    {
-        SBitMask<MAX_STORAGE_BUFFER_UNITS, SUnsafeBitMaskWord> kUsedUnitsMask;
-
-        SUnitMap* pStorageBufferMap = pPipeline->m_aspResourceUnitMaps[eRUT_StorageBuffer];
-        if (pStorageBufferMap == NULL)
-        {
-            return 0;
-        }
-
-        const SUnitMap::SElement* pElementsBegin = pStorageBufferMap->m_akUnits;
-        const SUnitMap::SElement* pElementsEnd   = pElementsBegin + pStorageBufferMap->m_uNumUnits;
-        for (const SUnitMap::SElement* pElement = pElementsBegin; pElement < pElementsEnd; ++pElement)
-        {
-            kUsedUnitsMask.Set(pElement->GetResourceUnit(), true);
-        }
-
-        uint32 uNumSupportedStorageSlots((uint32)pDevice->GetAdapter()->m_kCapabilities.m_akResourceUnits[eRUT_StorageBuffer].m_aiMaxTotal);
-        for (uint32 uSlot = 0; uSlot < uNumSupportedStorageSlots; ++uSlot)
-        {
-            if (!kUsedUnitsMask.Get(uSlot))
-            {
-                return uSlot;
-            }
-        }
-
-        return MAX_STORAGE_BUFFER_UNITS;
-    }
-
-    bool BindShaderTracingUnit(SPipeline* pPipeline, SShader* pShader, CDevice* pDevice)
-    {
-        uint32 uUnusedUnit = FindUnusedShaderStorageBufferUnit(pPipeline, pDevice);
-        if (uUnusedUnit == MAX_STORAGE_BUFFER_UNITS)
-        {
-            DXGL_ERROR("Could not find an extra storage buffer unit for shader tracing");
-            return false;
-        }
-
-        GLuint uProgramName(GetProgramName(pPipeline, pShader));
-
-        GLuint uStorageBlockIndex(glGetProgramResourceIndex(uProgramName, GL_SHADER_STORAGE_BLOCK, "Trace"));
-        if (uStorageBlockIndex == GL_INVALID_INDEX)
-        {
-            DXGL_ERROR("Could not find \"Trace\" shader storage block in program");
-            return false;
-        }
-
-        pPipeline->m_uTraceBufferUnit = uUnusedUnit;
-        glShaderStorageBlockBinding(uProgramName, uStorageBlockIndex, uUnusedUnit);
-
-        return true;
-    }
-
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-    struct SResourceIndexRange
-    {
-        uint32 m_uMin;
-        uint32 m_uMax;
-
-        SResourceIndexRange()
-            : m_uMin(0xFFFFFFFF)
-            , m_uMax(0)
-        {
-        }
-
-        bool Fits(const SIndexPartitionRange& kPartitionRange)
-        {
-            return m_uMin >= kPartitionRange.m_uFirstIn && m_uMax <= kPartitionRange.m_uFirstIn + kPartitionRange.m_uCount;
-        }
-    };
-
-    enum
-    {
-        ENCODED_SAMPLER_STRIDE = 3, ENCODED_RESOURCE_STRIDE = 2
-    };
-
-    template <uint32 (* DecodeFunc)(uint32), uint32 uStride>
-    void GetResourceIndexRange(SResourceIndexRange* pRange, const uint32* puResources, uint32 uNumResources)
-    {
-        pRange->m_uMin = 0xFFFFFFFF;
-        pRange->m_uMax = 0;
-        if (uNumResources > 0)
-        {
-            const uint32* puResourcesEnd = puResources + (uNumResources * uStride);
-            for (const uint32* puResource = puResources; puResource < puResourcesEnd; puResource += uStride)
-            {
-                uint32 uIndex = DecodeFunc(*puResource);
-                pRange->m_uMin = min(pRange->m_uMin, uIndex);
-                pRange->m_uMax = max(pRange->m_uMax, uIndex);
-            }
-        }
-    }
-
-    struct SPipelineResourceRequirements
-    {
-        struct SResourceType
-        {
-            enum
-            {
-                INVALID_PARTITION_ID = 0xFFFFFFFF
-            };
-
-            uint32 m_uNumUnits;
-            uint32 m_uCompatiblePartitionID; // INVALID_PARTITION_ID if no partition is compatible
-
-            SResourceType()
-                : m_uNumUnits(0)
-                , m_uCompatiblePartitionID(0xFFFFFFFF)
-            {
-            }
-        };
-
-        SResourceType m_akTypes[eRUT_NUM];
-    };
-
-    void GetPipelineResourceRequirements(SPipelineResourceRequirements* pRequirements, const SPipeline* pPipeline, CContext* pContext)
-    {
-        DXGL_TODO("Instead of calculating the resource input ranges here, do it at translation-time and store them in the reflection");
-        SResourceIndexRange akInputRanges[eST_NUM][eRUT_NUM];
-        CDevice* pDevice = pContext->GetDevice();
-
-        for (uint32 uShader = 0; uShader < eST_NUM; ++uShader)
-        {
-            SShader* pShader(pPipeline->m_kConfiguration.m_apShaders[uShader]);
-            if (IsPipelineStageUsed(pPipeline->m_kConfiguration.m_eMode, (EShaderType)uShader) && pShader != NULL)
-            {
-                const SShader::SVersion& kVersion(GetPipelineShaderVersion(pPipeline->m_kConfiguration, (EShaderType)uShader));
-                const SShaderReflection& kReflection(kVersion.m_kReflection);
-
-                pRequirements->m_akTypes[eRUT_Texture].m_uNumUnits += kReflection.m_uNumSamplers;
-                GetResourceIndexRange<DXBC::DecodeTextureUnitIndex, ENCODED_SAMPLER_STRIDE>(
-                    &akInputRanges[uShader][eRUT_Texture],
-                    reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kReflection.m_uSamplersOffset),
-                    kReflection.m_uNumSamplers);
-
-                pRequirements->m_akTypes[eRUT_UniformBuffer].m_uNumUnits += kReflection.m_uNumUniformBuffers;
-                GetResourceIndexRange<DXBC::DecodeResourceIndex, ENCODED_RESOURCE_STRIDE>(
-                    &akInputRanges[uShader][eRUT_UniformBuffer],
-                    reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kReflection.m_uUniformBuffersOffset),
-                    kReflection.m_uNumUniformBuffers);
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                pRequirements->m_akTypes[eRUT_StorageBuffer].m_uNumUnits += kReflection.m_uNumStorageBuffers;
-                GetResourceIndexRange<DXBC::DecodeResourceIndex, ENCODED_RESOURCE_STRIDE>(
-                    &akInputRanges[uShader][eRUT_StorageBuffer],
-                    reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kReflection.m_uStorageBuffersOffset),
-                    kReflection.m_uNumStorageBuffers);
-#endif
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-                if (pDevice->IsFeatureSupported(eF_ShaderImages))
-                {
-                    pRequirements->m_akTypes[eRUT_Image].m_uNumUnits += kReflection.m_uNumImages;
-                    GetResourceIndexRange<DXBC::DecodeResourceIndex, ENCODED_RESOURCE_STRIDE>(
-                        &akInputRanges[uShader][eRUT_Image],
-                        reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kReflection.m_uImagesOffset),
-                        kReflection.m_uNumImages);
-                }
-#endif
-            }
-        }
-
-        for (uint32 uResourceType = 0; uResourceType < eRUT_NUM; ++uResourceType)
-        {
-            uint32 uNumPartitions = pDevice->GetNumResourceUnitPartitions((EResourceUnitType)uResourceType);
-            for (uint32 uPartition = 0; uPartition < uNumPartitions; ++uPartition)
-            {
-                const SIndexPartition& kPartition(pDevice->GetResourceUnitPartition((EResourceUnitType)uResourceType, uPartition));
-                uint32 uStage;
-                for (uStage = 0; uStage < eST_NUM; ++uStage)
-                {
-                    if (!akInputRanges[uStage][uResourceType].Fits(kPartition.m_akStages[uStage]))
-                    {
-                        break;
-                    }
-                }
-                if (uStage == eST_NUM)
-                {
-                    pRequirements->m_akTypes[uResourceType].m_uCompatiblePartitionID = uPartition;
-                    break;
-                }
-            }
-        }
-    }
-
-    bool InitializeTextureBindings(
-        SUnitMap* pMap,
-        uint32 uMapPosition,
-        const uint32* pSamplers,
-        uint32 uNumSamplers,
-        EShaderType eStage,
-        const char* szGLSL,
-        GLint iProgramName,
-        const SIndexPartition* pPartition,
-        CContext* pContext)
-    {
-        char acNameBuffer[MAX_REFLECT_STRING_LENGTH];
-        uint32 uNextTextureUnit = uMapPosition;
-        SUnitMap::SElement* pMapElementOut = pMap->m_akUnits + uMapPosition;
-        for (uint32 uElement = 0; uElement < uNumSamplers; ++uElement)
-        {
-            uint32 uSamplerField         = pSamplers[uElement * 3 + 0];
-            uint32 uEmbeddedNormalName   = pSamplers[uElement * 3 + 1];
-            uint32 uEmbeddedCompareName  = pSamplers[uElement * 3 + 2];
-
-            uint32 uTextureIndex     = DXBC::DecodeTextureIndex(uSamplerField);
-            uint32 uSamplerIndex     = DXBC::DecodeSamplerIndex(uSamplerField);
-            uint32 uTextureUnitIndex = DXBC::DecodeTextureUnitIndex(uSamplerField);
-            bool bNormalSample       = DXBC::DecodeNormalSample(uSamplerField);
-            bool bCompareSample      = DXBC::DecodeCompareSample(uSamplerField);
-
-            uint32 uTextureSlot = TextureSlot(eStage, uTextureIndex);
-            uint32 uSamplerSlot = SamplerSlot(eStage, uSamplerIndex);
-            uint32 uTextureUnit = pPartition ? pPartition->m_akStages[eStage](uTextureUnitIndex) : uMapPosition + uElement;
-
-            bool bSample(bNormalSample || bCompareSample);
-            if (bSample)
-            {
-                *pMapElementOut = SUnitMap::SElement::TextureWithSampler(uTextureSlot, uSamplerSlot, uTextureUnit);
-            }
-            else
-            {
-                *pMapElementOut = SUnitMap::SElement::TextureWithoutSampler(uTextureSlot, uTextureUnit);
-            }
-
-            if (bNormalSample || !bSample) // Both normal sampling and texture loads use the "normal sampler name" field
-            {
-                if (!DXBC::GetEmbeddedName(acNameBuffer, szGLSL, uEmbeddedNormalName) ||
-                    !BindUniformToUnit(iProgramName, uTextureUnit, acNameBuffer, pContext))
-                {
-                    return false;
-                }
-            }
-
-            if (bCompareSample)
-            {
-                if (!DXBC::GetEmbeddedName(acNameBuffer, szGLSL, uEmbeddedCompareName) ||
-                    !BindUniformToUnit(iProgramName, uTextureUnit, acNameBuffer, pContext))
-                {
-                    return false;
-                }
-            }
-
-            ++pMapElementOut;
-        }
-        return true;
-    }
-
-    bool InitializeResourceBindings(
-        AZStd::function<bool(GLuint, uint32, const char*, CContext*)> pfBindResourceToUnit,
-        AZStd::function<uint32(EShaderType, uint32)> pfIndexToSlot,
-        SUnitMap* pMap,
-        uint32 uMapPosition,
-        const uint32* pResources,
-        uint32 uNumResources,
-        EShaderType eStage,
-        const char* szGLSL,
-        GLint iProgramName,
-        const SIndexPartition* pPartition,
-        CContext* pContext)
-    {
-        char acNameBuffer[MAX_REFLECT_STRING_LENGTH];
-        uint32 uNextResourceUnit = uMapPosition;
-        SUnitMap::SElement* pMapElementOut = pMap->m_akUnits + uMapPosition;
-        for (uint32 uElement = 0; uElement < uNumResources; ++uElement)
-        {
-            uint32 uResourceField = pResources[uElement * 2 + 0];
-            uint32 uResourceName  = pResources[uElement * 2 + 1];
-
-            uint32 uResourceIndex = DXBC::DecodeResourceIndex(uResourceField);
-
-            uint32 uResourceSlot = pfIndexToSlot(eStage, uResourceIndex);
-            uint32 uResourceUnit;
-            if (pfBindResourceToUnit)
-            {
-                uResourceUnit = pPartition ? pPartition->m_akStages[eStage](uResourceIndex) : uMapPosition + uElement;
-                if (!DXBC::GetEmbeddedName(acNameBuffer, szGLSL, uResourceName) ||
-                !pfBindResourceToUnit(iProgramName, uResourceUnit, acNameBuffer, pContext))
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                // Some resources, like Storage Buffers in OpenGLES, don't allow changing binding point.
-                // Because of this we have to use the binding that was set in the shader (we get the location from the reflection info).
-                uResourceUnit = uResourceIndex;
-            }
-
-            *pMapElementOut = SUnitMap::SElement::Resource(uResourceSlot, uResourceUnit);
-            ++pMapElementOut;
-        }
-        return true;
-    }
-
-    bool InitializePipelineResources(SPipeline* pPipeline, CContext* pContext)
-    {
-        SPipelineResourceRequirements kRequirements;
-        GetPipelineResourceRequirements(&kRequirements, pPipeline, pContext);
-
-        CDevice* pDevice = pContext->GetDevice();
-
-        const SIndexPartition* apUnitPartitions[eRUT_NUM];
-        SUnitMapPtr aspUnitMaps[eRUT_NUM];
-        uint32 auUnitMapPositions[eRUT_NUM];
-        for (uint32 uUnitType = 0; uUnitType < eRUT_NUM; ++uUnitType)
-        {
-            SPipelineResourceRequirements::SResourceType kType = kRequirements.m_akTypes[uUnitType];
-            if (kType.m_uCompatiblePartitionID == SPipelineResourceRequirements::SResourceType::INVALID_PARTITION_ID)
-            {
-                apUnitPartitions[uUnitType] = NULL;
-            }
-            else
-            {
-                apUnitPartitions[uUnitType] = &pDevice->GetResourceUnitPartition((EResourceUnitType)uUnitType, kType.m_uCompatiblePartitionID);
-            }
-            if (kType.m_uNumUnits > 0)
-            {
-                aspUnitMaps[uUnitType] = new SUnitMap(kType.m_uNumUnits);
-            }
-            auUnitMapPositions[uUnitType] = 0;
-        }
-
-        bool bSuccess = true;
-        for (uint32 uShader = 0; uShader < eST_NUM; ++uShader)
-        {
-            SShader* pShader(pPipeline->m_kConfiguration.m_apShaders[uShader]);
-            if (!IsPipelineStageUsed(pPipeline->m_kConfiguration.m_eMode, (EShaderType)uShader) || pShader == NULL)
-            {
-                continue;
-            }
-
-            GLuint uProgramName = GetProgramName(pPipeline, pShader);
-            const SShader::SVersion& kVersion(GetPipelineShaderVersion(pPipeline->m_kConfiguration, (EShaderType)uShader));
-            const char* szGLSL = kVersion.m_kSource.m_pData + kVersion.m_kReflection.m_uGLSLSourceOffset;
-
-            // Initialize texture unit map and bind texture units to shader uniforms
-            uint32 uNumSamplers(kVersion.m_kReflection.m_uNumSamplers);
-            if (uNumSamplers > 0)
-            {
-                const uint32* pSamplers(reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kVersion.m_kReflection.m_uSamplersOffset));
-                SUnitMap* pTextureUnitMap = aspUnitMaps[eRUT_Texture].get();
-
-                bSuccess &= InitializeTextureBindings(
-                        pTextureUnitMap, auUnitMapPositions[eRUT_Texture],
-                        pSamplers, uNumSamplers, (EShaderType)uShader,
-                        szGLSL, uProgramName, apUnitPartitions[eRUT_Texture],
-                        pContext);
-
-                auUnitMapPositions[eRUT_Texture] += uNumSamplers;
-            }
-
-            // Initialize uniform buffer unit map and bind uniform buffer units to shader uniform blocks
-            uint32 uNumUniformBuffers(kVersion.m_kReflection.m_uNumUniformBuffers);
-            if (uNumUniformBuffers > 0)
-            {
-                const uint32* pUniformBuffers(reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kVersion.m_kReflection.m_uUniformBuffersOffset));
-                SUnitMap* pUniformBufferMap = aspUnitMaps[eRUT_UniformBuffer].get();
-
-                bSuccess &= InitializeResourceBindings(&BindUniformBufferToUnit, &ConstantBufferSlot,
-                        pUniformBufferMap, auUnitMapPositions[eRUT_UniformBuffer],
-                        pUniformBuffers, uNumUniformBuffers, (EShaderType)uShader,
-                        szGLSL, uProgramName, apUnitPartitions[eRUT_UniformBuffer],
-                        pContext);
-
-                auUnitMapPositions[eRUT_UniformBuffer] += uNumUniformBuffers;
-            }
-
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-            // Initialize shader storage unit map and bind shader storage units to shader storage blocks
-            uint32 uNumStorageBuffers(kVersion.m_kReflection.m_uNumStorageBuffers);
-            if (uNumStorageBuffers > 0)
-            {
-                const uint32* pStorageBuffers(reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kVersion.m_kReflection.m_uStorageBuffersOffset));
-                SUnitMap* pStorageBufferMap = aspUnitMaps[eRUT_StorageBuffer].get();
-
-#if DXGLES
-                // OpenGL ES doesn't support changing the binding point of storage buffers
-                auto bindStorageToUintFunc = nullptr;
-#else
-                auto bindStorageToUintFunc = &BindStorageBufferToUnit;
-#endif // DXGLES
-                    bSuccess &= InitializeResourceBindings(bindStorageToUintFunc, &StorageBufferSlot,
-                        pStorageBufferMap, auUnitMapPositions[eRUT_StorageBuffer],
-                        pStorageBuffers, uNumStorageBuffers, (EShaderType)uShader,
-                        szGLSL, uProgramName, apUnitPartitions[eRUT_StorageBuffer],
-                        pContext);
-
-                auUnitMapPositions[eRUT_StorageBuffer] += uNumStorageBuffers;
-            }
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-            if (pDevice->IsFeatureSupported(eF_ShaderImages))
-            {
-                // Initialize image unit map and bind image units to shader uniforms
-                uint32 uNumImages(kVersion.m_kReflection.m_uNumImages);
-                if (uNumImages > 0)
-                {
-                    const uint32* pImages(reinterpret_cast<const uint32*>(kVersion.m_kSource.m_pData + kVersion.m_kReflection.m_uImagesOffset));
-                    SUnitMap* pImageMap = aspUnitMaps[eRUT_Image].get();
-
-                    bSuccess &= InitializeResourceBindings(&BindUniformToUnit, &ImageSlot,
-                        pImageMap, auUnitMapPositions[eRUT_Image],
-                        pImages, uNumImages, (EShaderType)uShader,
-                        szGLSL, uProgramName, apUnitPartitions[eRUT_Image],
-                        pContext);
-
-                    auUnitMapPositions[eRUT_Image] += uNumImages;
-                }
-            }
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-#if DXGL_ENABLE_SHADER_TRACING
-            if (pPipeline->m_kConfiguration.m_aeShaderVersions[uShader] == eSV_Tracing)
-            {
-                bSuccess &= BindShaderTracingUnit(pPipeline, pShader, pDevice);
-            }
-#endif //DXGL_ENABLE_SHADER_TRACING
-        }
-
-        if (!bSuccess)
-        {
-            return false;
-        }
-
-        for (uint32 uUnitType = 0; uUnitType < eRUT_NUM; ++uUnitType)
-        {
-            if (aspUnitMaps[uUnitType] != NULL)
-            {
-                pPipeline->m_aspResourceUnitMaps[uUnitType] = pContext->AllocateUnitMap(aspUnitMaps[uUnitType]);
-                bSuccess &= pPipeline->m_aspResourceUnitMaps[uUnitType] != NULL;
-            }
-        }
-
-        return bSuccess;
-    }
-
-    SPipelineConfiguration::SPipelineConfiguration()
-        : m_eMode(ePM_Graphics)
-#if !DXGL_SUPPORT_DEPTH_CLAMP
-        , m_bEmulateDepthClamp(false)
-#endif //!DXGL_SUPPORT_DEPTH_CLAMP
-    {
-        memset(m_apShaders, 0, sizeof(m_apShaders));
-#if DXGL_ENABLE_SHADER_TRACING
-        memset(m_aeShaderVersions, 0, sizeof(m_aeShaderVersions));
-#endif //DXGL_ENABLE_SHADER_TRACING
-    }
-
-    SPipelineCompilationBuffer::SPipelineCompilationBuffer()
-        : m_uImportsBeginOffset(0)
-        , m_uImportsEndOffset(0)
-        , m_uImportsHeaderCapacity(0)
-        , m_iVersionStringLength(-1)
-        , m_acImportsHeader(NULL)
-    {
-        memset(m_acVersionString, 0, sizeof(m_acVersionString));
-    }
-
-    SPipelineCompilationBuffer::~SPipelineCompilationBuffer()
-    {
-        if (m_acImportsHeader)
-        {
-            Free(m_acImportsHeader);
-        }
-    }
-
-    SUnitMap::SUnitMap(uint16 uNumUnits)
-        : m_uNumUnits(uNumUnits)
-    {
-        if (uNumUnits == 0)
-        {
-            m_akUnits = NULL;
-        }
-        else
-        {
-            m_akUnits = new SElement[uNumUnits];
-        }
-    }
-
-    SUnitMap::SUnitMap(const SUnitMap& kOther)
-        : m_uNumUnits(kOther.m_uNumUnits)
-    {
-        if (m_uNumUnits == 0)
-        {
-            m_akUnits = NULL;
-        }
-        else
-        {
-            m_akUnits = new SElement[m_uNumUnits];
-            memcpy(m_akUnits, kOther.m_akUnits, sizeof(SElement) * m_uNumUnits);
-        }
-    }
-
-    SUnitMap::~SUnitMap()
-    {
-        delete [] m_akUnits;
-    }
-
-    bool IsPipelineStageUsed(EPipelineMode eMode, EShaderType eType)
-    {
-        switch (eType)
-        {
-        case eST_Vertex:
-        case eST_Fragment:
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-        case eST_Geometry:
-#endif //DXGL_SUPPORT_GEOMETRY_SHADERS
-#if DXGL_SUPPORT_TESSELLATION
-        case eST_TessControl:
-        case eST_TessEvaluation:
-#endif //DXGL_SUPPORT_TESSELLATION
-            return eMode == ePM_Graphics;
-#if DXGL_SUPPORT_COMPUTE
-        case eST_Compute:
-            return eMode == ePM_Compute;
-#endif //DXGL_SUPPORT_COMPUTE
-        default:
-            DXGL_ERROR("Invalid shader type");
-            return false;
-        }
-    }
-
-    bool GetGLShaderType(GLenum& eGLShaderType, EShaderType eType)
-    {
-        switch (eType)
-        {
-        case eST_Vertex:
-            eGLShaderType = GL_VERTEX_SHADER;
-            break;
-        case eST_Fragment:
-            eGLShaderType = GL_FRAGMENT_SHADER;
-            break;
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-        case eST_Geometry:
-            eGLShaderType = GL_GEOMETRY_SHADER;
-            break;
-#endif //DXGL_SUPPORT_GEOMETRY_SHADERS
-#if DXGL_SUPPORT_TESSELLATION
-        case eST_TessControl:
-            eGLShaderType = GL_TESS_CONTROL_SHADER;
-            break;
-        case eST_TessEvaluation:
-            eGLShaderType = GL_TESS_EVALUATION_SHADER;
-            break;
-#endif //DXGL_SUPPORT_TESSELLATION
-#if DXGL_SUPPORT_COMPUTE
-        case eST_Compute:
-            eGLShaderType = GL_COMPUTE_SHADER;
-            break;
-#endif //DXGL_SUPPORT_COMPUTE
-        default:
-            DXGL_ERROR("Invalid shader type");
-            return false;
-        }
-        return true;
-    }
-
-    bool GetGLProgramStageBit(GLbitfield& uProgramStageBit, EShaderType eType)
-    {
-        switch (eType)
-        {
-        case eST_Vertex:
-            uProgramStageBit = GL_VERTEX_SHADER_BIT;
-            break;
-        case eST_Fragment:
-            uProgramStageBit = GL_FRAGMENT_SHADER_BIT;
-            break;
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-        case eST_Geometry:
-            uProgramStageBit = GL_GEOMETRY_SHADER_BIT;
-            break;
-#endif //DXGL_SUPPORT_GEOMETRY_SHADERS
-#if DXGL_SUPPORT_TESSELLATION
-        case eST_TessControl:
-            uProgramStageBit = GL_TESS_CONTROL_SHADER_BIT;
-            break;
-        case eST_TessEvaluation:
-            uProgramStageBit = GL_TESS_EVALUATION_SHADER_BIT;
-            break;
-#endif //DXGL_SUPPORT_TESSELLATION
-#if DXGL_SUPPORT_COMPUTE
-        case eST_Compute:
-            uProgramStageBit = GL_COMPUTE_SHADER_BIT;
-            break;
-#endif //DXGL_SUPPORT_COMPUTE
-        default:
-            DXGL_ERROR("Invalid shader type");
-            return false;
-        }
-        return true;
-    }
-
-    bool GetDataTypeSize(GLenum eDataType, GLuint& uSize)
-    {
-        DXGL_TODO("Verify that the sizes are correct according to the packing in layout structures");
-        switch (eDataType)
-        {
-        case GL_BYTE:
-        case GL_UNSIGNED_BYTE:
-            uSize = 1;
-            return true;
-        case GL_SHORT:
-        case GL_UNSIGNED_SHORT:
-        case GL_HALF_FLOAT:
-            uSize = 2;
-            return true;
-        case GL_INT:
-        case GL_UNSIGNED_INT:
-        case GL_INT_2_10_10_10_REV:
-        case GL_UNSIGNED_INT_2_10_10_10_REV:
-        case GL_FLOAT:
-        case GL_FIXED:
-            uSize = 4;
-            return true;
-#if !DXGLES
-        // There is no GL_DOUBLE on OpenGL ES 3
-        case GL_DOUBLE:
-            uSize = 8;
-            return true;
-#endif //!DXGLES
-        }
-        return false;
-    }
-
-    bool GetFormatAttributeDimension(const SGIFormatInfo* pFormatInfo, GLint& iDimensions)
-    {
-        switch (pFormatInfo->m_pTexture->m_eBaseFormat)
-        {
-        case GL_RGBA:
-            iDimensions = 4;
-            break;
-        case GL_RGB:
-            iDimensions = 3;
-            break;
-        case GL_RG:
-            iDimensions = 2;
-            break;
-        case GL_RED:
-            iDimensions = 1;
-            break;
-#if (DXGLES && (GL_APPLE_texture_format_BGRA8888 || GL_IMG_read_format))
-        case GL_BGRA_IMG:
-            iDimensions = GL_BGRA_IMG;  // Special value for packed reverse formats (A2B10G10R10*)
-            break;
-#elif !DXGLES
-        case GL_BGRA:
-            iDimensions = GL_BGRA;  // Special value for packed reverse formats (A2B10G10R10*)
-            break;
-#endif
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool GetFormatNormalized(const SUncompressedLayout* pLayout, GLboolean& bNormalized)
-    {
-        if (pLayout->m_eDepthType != eGICT_UNUSED || pLayout->m_eStencilType != eGICT_UNUSED) // As of D3D11.1 no format with depth or stencil channels supports buffers
-        {
-            return false;
-        }
-
-        switch (pLayout->m_eColorType)
-        {
-        case eGICT_UNORM:
-        case eGICT_SNORM:
-            bNormalized = true;
-            break;
-        case eGICT_UINT:
-        case eGICT_SINT:
-        case eGICT_FLOAT:
-            bNormalized = false;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool PushInputLayoutAttribute(
-        SInputLayout& kLayout,
-        uint32 auSlotOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT],
-        const D3D11_INPUT_ELEMENT_DESC& kDesc,
-        uint32 uIndex,
-        bool bInteger,
-        const CDevice* pDevice)
-    {
-        SInputLayout::SAttributeParameters kParams;
-        SInputLayout::TAttributes& kSlotAttributes(kLayout.m_akSlotAttributes[kDesc.InputSlot]);
-
-        // The format must have texture and uncompressed layout information in order to determine
-        // the input layout
-        NCryOpenGL::EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const NCryOpenGL::SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM || (pFormatInfo = (GetGIFormatInfo(eGIFormat))) == NULL ||
-            pFormatInfo->m_pTexture == NULL || pFormatInfo->m_pUncompressed == NULL)
-        {
-            DXGL_ERROR("Invalid DXGI format for vertex attribute");
-            return false;
-        }
-
-        kParams.m_uAttributeIndex = uIndex;
-
-        if (!GetFormatAttributeDimension(pFormatInfo, kParams.m_iDimension))
-        {
-            DXGL_ERROR("Invalid dimension for vertex attribute");
-            return false;
-        }
-
-        kParams.m_eType = pFormatInfo->m_pTexture->m_eDataType;
-
-        if (!GetFormatNormalized(pFormatInfo->m_pUncompressed, kParams.m_bNormalized))
-        {
-            DXGL_ERROR("Invalid layout for vertex attribute");
-            return false;
-        }
-
-        uint32& uSlotOffset(auSlotOffsets[kDesc.InputSlot]);
-        kParams.m_uPointerOffset = (kDesc.AlignedByteOffset == D3D11_APPEND_ALIGNED_ELEMENT) ? uSlotOffset : kDesc.AlignedByteOffset;
-
-        uint32 uSize;
-        if (!GetDataTypeSize(pFormatInfo->m_pTexture->m_eDataType, uSize))
-        {
-            DXGL_ERROR("Invalid data type for vertex attribute");
-            return false;
-        }
-
-        kParams.m_bInteger = bInteger;
-        kParams.m_uVertexAttribDivisor = kDesc.InstanceDataStepRate;
-
-        kSlotAttributes.push_back(kParams);
-
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        if (pDevice->IsFeatureSupported(eF_VertexAttribBinding))
-        {
-            SInputLayout::SAttributeFormats kParamsVAB;
-            SInputLayout::TAttributeFormats& kSlotAttributesVAB(kLayout.m_akVertexAttribFormats);
-
-            kParamsVAB.m_bInteger = kParams.m_bInteger;
-            kParamsVAB.m_iDimension = kParams.m_iDimension;
-            kParamsVAB.m_uAttributeIndex = kParams.m_uAttributeIndex;
-            kParamsVAB.m_bNormalized = kParams.m_bNormalized;
-            kParamsVAB.m_uPointerOffset = kParams.m_uPointerOffset;
-            kParamsVAB.m_eType = kParams.m_eType;
-            kParamsVAB.m_uVertexAttribDivisor = kParams.m_uVertexAttribDivisor;
-
-            kParamsVAB.m_uBindingIndex = kDesc.InputSlot;
-            kSlotAttributesVAB.push_back(kParamsVAB);
-        }
-#endif //DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-
-        uSlotOffset += uSize;
-
-        return true;
-    }
-
-    SInputLayoutPtr CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, uint32 uNumElements, const TShaderReflection& kReflection, const CDevice* pDevice)
-    {
-        SInputLayoutPtr spLayout(new SInputLayout());
-        uint32 auSlotOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-        memset(auSlotOffsets, 0, sizeof(auSlotOffsets));
-
-        int attrMatchedNum = 0;
-        int reflectionAttrNum = 0;
-
-        //Calculate the number of attributes in the shader that does not start with 'SV_'
-        TShaderReflection::TParameters::const_iterator kInputSemanticIter(kReflection.m_kInputs.begin());
-        const TShaderReflection::TParameters::const_iterator kInputSemanticEnd(kReflection.m_kInputs.end());
-        while (kInputSemanticIter != kInputSemanticEnd)
-        {
-            if (strstr(kInputSemanticIter->m_kDesc.SemanticName, "SV_") == 0)
-            {
-                reflectionAttrNum++;
-            }
-            ++kInputSemanticIter;
-        }
-
-        for (uint32 uElement = 0; uElement < uNumElements; ++uElement)
-        {
-            const D3D11_INPUT_ELEMENT_DESC& kDesc(pInputElementDescs[uElement]);
-            // Find a match within the input signatures of the shader reflection data
-            TShaderReflection::TParameters::const_iterator kInputSemanticIter(kReflection.m_kInputs.begin());
-            const TShaderReflection::TParameters::const_iterator kInputSemanticEnd(kReflection.m_kInputs.end());
-            while (kInputSemanticIter != kInputSemanticEnd)
-            {
-                if (kInputSemanticIter->m_kDesc.SemanticIndex == kDesc.SemanticIndex &&
-                    strcmp(kInputSemanticIter->m_kDesc.SemanticName, kDesc.SemanticName) == 0)
-                {
-                    bool bInteger;
-                    switch (kInputSemanticIter->m_kDesc.ComponentType)
-                    {
-                    case D3D_REGISTER_COMPONENT_UNKNOWN:
-                        assert(false);
-                    case D3D_REGISTER_COMPONENT_FLOAT32:
-                        bInteger = false;
-                        break;
-                    case D3D_REGISTER_COMPONENT_UINT32:
-                    case D3D_REGISTER_COMPONENT_SINT32:
-                        bInteger = true;
-                        break;
-                    default:
-                        DXGL_ERROR("Invalid input signature component register type");
-                        return NULL;
-                    }
-
-                    if (!PushInputLayoutAttribute(*spLayout, auSlotOffsets, kDesc, kInputSemanticIter->m_kDesc.Register, bInteger, pDevice))
-                    {
-                        DXGL_ERROR("Failed to Push Input Layout");
-                        return NULL;
-                    }
-                    attrMatchedNum++;
-                    break;
-                }
-                ++kInputSemanticIter;
-            }
-        }
-
-        if (attrMatchedNum != reflectionAttrNum)
-        {
-            DXGL_ERROR("Shader input attributes count doesn not match with vertex format attributes count");
-            return NULL;
-        }
-
-        return spLayout;
-    }
-
-#if defined(CODEGEN_FUNCPTR)
-#define GL_ENTRY_POINT CODEGEN_FUNCPTR
-#elif defined(GLAPIENTRY)
-#define GL_ENTRY_POINT GLAPIENTRY
-#elif defined(GL_APIENTRY)
-#define GL_ENTRY_POINT GL_APIENTRY
-#elif defined(APIENTRY)
-#define GL_ENTRY_POINT APIENTRY
-#else
-#define GL_ENTRY_POINT
-#endif
-
-    bool VerifyStatus(GLuint uName, GLenum eStatus, void (GL_ENTRY_POINT * fGetIV)(GLuint, GLenum, GLint*), void (GL_ENTRY_POINT * fGetInfoLog)(GLuint, GLsizei, GLsizei*, GLchar*))
-    {
-        GLint iStatus;
-        fGetIV(uName, eStatus, &iStatus);
-        if (iStatus == GL_FALSE)
-        {
-            GLint iInfoLogLength;
-            fGetIV(uName, GL_INFO_LOG_LENGTH, &iInfoLogLength);
-            if (iInfoLogLength > 0)
-            {
-                GLchar* pBuffer = new GLchar[iInfoLogLength];
-                GLsizei iLength;
-                fGetInfoLog(uName, iInfoLogLength, &iLength, pBuffer);
-                if (iStatus == GL_FALSE)
-                {
-                    DXGL_ERROR("%s", pBuffer);
-                }
-                delete [] pBuffer;
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    bool VerifyShaderStatus(GLuint uShader, GLenum eStatus)
-    {
-        return VerifyStatus(uShader, eStatus, glGetShaderiv, glGetShaderInfoLog);
-    }
-
-    bool VerifyProgramStatus(GLuint uProgram, GLenum eStatus)
-    {
-        return VerifyStatus(uProgram, eStatus, glGetProgramiv, glGetProgramInfoLog);
-    }
-
-    bool VerifyProgramPipelineStatus(GLuint uPipelin, GLenum eStatus)
-    {
-        return VerifyStatus(uPipelin, eStatus, glGetProgramPipelineiv, glGetProgramPipelineInfoLog);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.hpp
deleted file mode 100644
index 430a5bf1c8..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.hpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the shader types and related functions
-
-
-#ifndef __GLSHADER__
-#define __GLSHADER__
-
-#include "GLCommon.hpp"
-#if !DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-#include "hlslcc.hpp"
-#endif //!DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
-
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER && !DXGL_INPUT_GLSL && DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-#define DXGL_ENABLE_SHADER_TRACING 1
-#else
-#define DXGL_ENABLE_SHADER_TRACING 0
-#endif
-
-#if DXGL_GLSL_FROM_HLSLCROSSCOMPILER && !DXGL_INPUT_GLSL
-#define DXGL_HLSL_TO_GLSL_DEBUG 1
-#else
-#define DXGL_HLSL_TO_GLSL_DEBUG 0
-#endif
-
-#define DXGL_DUMP_GLSL_SOURCES 0
-
-#define DXGL_SHADER_TYPE_MAP(_Predicate, _Vertex, _Fragment, _Geometry, _TessControl, _TessEvaluation, _Compute) \
-    _Predicate(_Vertex) _Predicate(_Fragment)                                                                    \
-    DXGL_IF(DXGL_ENABLE_GEOMETRY_SHADERS)(_Predicate(_Geometry))                                                 \
-    DXGL_IF(DXGL_ENABLE_TESSELLATION_SHADERS)(_Predicate(_TessControl) _Predicate(_TessEvaluation))              \
-    DXGL_IF(DXGL_ENABLE_COMPUTE_SHADERS)(_Predicate(_Compute))                                                   \
-
-namespace NCryOpenGL
-{
-    class CDevice;
-
-    enum EShaderType
-    {
-#define _ENUM(_Name) _Name,
-        DXGL_SHADER_TYPE_MAP(_ENUM, eST_Vertex, eST_Fragment, eST_Geometry, eST_TessControl, eST_TessEvaluation, eST_Compute)
-#undef _ENUM
-        eST_NUM
-    };
-
-    enum EPipelineMode
-    {
-        ePM_Graphics,
-        ePM_Compute
-    };
-
-    enum EShaderVersion
-    {
-        eSV_Normal = 0,
-#if DXGL_ENABLE_SHADER_TRACING
-        eSV_Tracing,
-#endif //DXGL_ENABLE_SHADER_TRACING
-        eSV_NUM
-    };
-
-    enum EResourceUnitType
-    {
-        eRUT_Texture,
-        eRUT_UniformBuffer,
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        eRUT_StorageBuffer,
-#endif
-#if DXGL_SUPPORT_SHADER_IMAGES
-        eRUT_Image,
-#endif
-        eRUT_NUM
-    };
-
-    struct SPipeline;
-    class CContext;
-
-    struct SSource
-    {
-        const char* m_pData;
-        uint32 m_uDataSize;
-
-        SSource(const char* pData = NULL, uint32 uDataSize = 0);
-        ~SSource();
-    };
-
-#if DXGL_ENABLE_SHADER_TRACING
-
-    struct SShaderTraceIndex
-    {
-        std::vector<uint32> m_kTraceStepSizes;
-        std::vector<uint32> m_kTraceStepOffsets;
-        std::vector<VariableTraceInfo> m_kTraceVariables;
-    };
-
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-    struct SShaderSource
-        : SSource
-    {
-        SShaderSource();
-        ~SShaderSource();
-
-        void SetData(const char* pData = NULL, uint32 uDataSize = 0);
-    };
-
-    enum
-    {
-        DXGL_MAX_REFLECT_STRING_LENGTH = 128
-    };
-
-    struct SShaderReflectionVariable
-    {
-        D3D11_SHADER_VARIABLE_DESC m_kDesc;
-        D3D11_SHADER_TYPE_DESC m_kType;
-        char m_acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-        std::vector<uint8> m_kDefaultValue;
-    };
-
-    struct SShaderReflectionConstBuffer
-    {
-        typedef std::vector<SShaderReflectionVariable> TVariables;
-
-        TVariables m_kVariables;
-        D3D11_SHADER_BUFFER_DESC m_kDesc;
-        char m_acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-    };
-
-    struct SShaderReflectionResource
-    {
-        D3D11_SHADER_INPUT_BIND_DESC m_kDesc;
-        char m_acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-    };
-
-    struct SShaderReflectionParameter
-    {
-        D3D11_SIGNATURE_PARAMETER_DESC m_kDesc;
-        char m_acSemanticName[DXGL_MAX_REFLECT_STRING_LENGTH];
-    };
-
-    struct SShaderReflection
-    {
-        typedef std::vector<SShaderReflectionConstBuffer> TConstantBuffers;
-        typedef std::vector<SShaderReflectionResource> TResources;
-        typedef std::vector<SShaderReflectionParameter> TParameters;
-
-        SShaderReflection()
-            : m_uGLSLSourceOffset(0)
-            , m_uSamplersOffset(0)
-            , m_uNumSamplers(0)
-            , m_uImagesOffset(0)
-            , m_uNumImages(0)
-            , m_uStorageBuffersOffset(0)
-            , m_uNumStorageBuffers(0)
-            , m_uUniformBuffersOffset(0)
-            , m_uNumUniformBuffers(0)
-            , m_uImportsOffset(0)
-            , m_uImportsSize(0)
-            , m_uExportsOffset(0)
-            , m_uExportsSize(0)
-            , m_uInputHash(0)
-            , m_uSymbolsOffset(0)
-        {}
-
-        uint32 m_uGLSLSourceOffset;
-        uint32 m_uSamplersOffset;
-        uint32 m_uNumSamplers;
-        uint32 m_uImagesOffset;
-        uint32 m_uNumImages;
-        uint32 m_uStorageBuffersOffset;
-        uint32 m_uNumStorageBuffers;
-        uint32 m_uUniformBuffersOffset;
-        uint32 m_uNumUniformBuffers;
-        uint32 m_uImportsOffset;
-        uint32 m_uImportsSize;
-        uint32 m_uExportsOffset;
-        uint32 m_uExportsSize;
-        uint32 m_uInputHash;
-        uint32 m_uSymbolsOffset;
-
-        TConstantBuffers m_kConstantBuffers;
-        TResources m_kResources;
-        TParameters m_kInputs, m_kOutputs, m_kPatchConstants;
-        D3D11_SHADER_DESC m_kDesc;
-    };
-
-    struct SGLShader
-    {
-        GLuint m_uName; // Name of the shader program if eF_SeparablePrograms is supported, name of the shader otherwise
-        bool m_separableProgramsSupported; // True if the device supports separable programs and we need to call glDeleteProgram instead of glDeleteShader
-
-        SGLShader();
-        ~SGLShader();
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SShader)
-    {
-        EShaderType m_eType;
-
-        struct SVersion
-        {
-            SShaderSource m_kSource;
-            SShaderReflection m_kReflection;
-        } m_akVersions[eSV_NUM];
-
-#if DXGL_ENABLE_SHADER_TRACING
-        SShaderTraceIndex m_kTraceIndex;
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-        typedef std::vector<SPipeline*> TPipelines;
-        TPipelines m_kBoundPipelines;
-
-        void AttachPipeline(SPipeline * pPipeline);
-        void DetachPipeline(SPipeline * pPipeline);
-
-        SShader();
-        ~SShader();
-    };
-
-    struct SPipelineConfiguration
-    {
-        SShader* m_apShaders[eST_NUM];
-#if DXGL_ENABLE_SHADER_TRACING
-        EShaderVersion m_aeShaderVersions[eST_NUM];
-#endif //DXGL_ENABLE_SHADER_TRACING
-        EPipelineMode m_eMode;
-#if !DXGL_SUPPORT_DEPTH_CLAMP
-        bool m_bEmulateDepthClamp;
-#endif //!DXGL_SUPPORT_DEPTH_CLAMP
-
-        SPipelineConfiguration();
-    };
-
-    struct SPipelineCompilationBuffer
-    {
-        enum
-        {
-            VERSION_STRING_CAPACITY = 32
-        };
-
-        GLchar* m_acImportsHeader;
-        uint32 m_uImportsBeginOffset;
-        uint32 m_uImportsEndOffset;
-        uint32 m_uImportsHeaderCapacity;
-        GLchar m_acVersionString[VERSION_STRING_CAPACITY];
-        GLint m_iVersionStringLength;
-
-        SPipelineCompilationBuffer();
-        ~SPipelineCompilationBuffer();
-    };
-
-    struct SIndexPartitionRange
-    {
-        enum
-        {
-            INVALID_INDEX = 0xFFFFFFFFu
-        };
-
-        uint32 m_uFirstIn;
-        uint32 m_uFirstOut;
-        uint32 m_uCount;
-
-        uint32 operator()(uint32 uSlot) const { return uSlot < m_uFirstIn || uSlot >= m_uFirstIn + m_uCount ? INVALID_INDEX : m_uFirstOut + uSlot - m_uFirstIn; }
-    };
-
-    struct SIndexPartition
-    {
-        SIndexPartitionRange m_akStages[eST_NUM];
-
-        SIndexPartitionRange& operator[](EShaderType eType){ return m_akStages[eType]; };
-        SIndexPartitionRange operator[](EShaderType eType) const { return m_akStages[eType]; };
-    };
-
-
-    DXGL_DECLARE_REF_COUNTED(struct, SUnitMap)
-    {
-        enum
-        {
-            MAX_TEXTURE_SLOT_IN_MAP = 0x400,
-            MAX_SAMPLER_SLOT_IN_MAP = 0x400,
-            MAX_TEXTURE_UNIT_IN_MAP = 0x400,
-        };
-
-        struct SElement
-        {
-            uint32 m_uMask;
-
-            // For non-texture unit maps
-            uint32 GetResourceSlot() const { return m_uMask >> 16; }
-            uint32 GetResourceUnit() const { return m_uMask & 0xFFFF; }
-
-            static SElement Resource(uint32 uSlot, uint32 uUnit)
-            {
-                SElement kElement = { uSlot << 16 | uUnit };
-                return kElement;
-            }
-
-            // For texture unit maps
-            uint32 GetTextureSlot() const { return m_uMask  >> 22; }
-            uint32 GetSamplerSlot() const { return (m_uMask  >> 12) & 0x3FF; }
-            uint32 GetTextureUnit() const { return (m_uMask  >>  2) & 0x3FF; }
-            bool   HasSampler()     const { return ((m_uMask >>  1) &   0x1) == 1; }
-
-            static SElement TextureWithoutSampler(uint32 uTextureSlot, uint32 uTextureUnit)
-            {
-                SElement kElement = { uTextureSlot << 22 | uTextureUnit << 2 };
-                return kElement;
-            }
-
-            static SElement TextureWithSampler(uint32 uTextureSlot, uint32 uSamplerSlot, uint32 uTextureUnit)
-            {
-                SElement kElement = { uTextureSlot << 22 | uSamplerSlot << 12 | uTextureUnit << 2 | 1 << 1 };
-                return kElement;
-            }
-        };
-
-        SElement* m_akUnits;
-        uint16 m_uNumUnits;
-
-        SUnitMap(uint16 uNumUnits = 0);
-        SUnitMap(const SUnitMap&kOther);
-        ~SUnitMap();
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SPipeline)
-    {
-        GLuint m_uName; // Name of the pipeline if eF_SeparablePrograms is supported, name of the program otherwise
-        SGLShader m_akGLShaders[eST_NUM];
-
-        CContext* m_pContext;
-        SPipelineConfiguration m_kConfiguration;
-        SUnitMapPtr m_aspResourceUnitMaps[eRUT_NUM];
-
-#if DXGL_ENABLE_SHADER_TRACING
-        uint32 m_uTraceBufferUnit;
-#endif //DXGL_ENABLE_SHADER_TRACING
-
-        SPipeline(const SPipelineConfiguration&kConfiguration, CContext * pContext);
-        ~SPipeline();
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SInputLayout)
-    {
-        // Parameters taken by glVertexAttribPointer (excluding stride and pointer base that are part of the vertex buffer data)
-        struct SAttributeParameters
-        {
-            GLuint m_uAttributeIndex;
-            GLint m_iDimension;
-            GLenum m_eType;
-            GLboolean m_bNormalized;
-            GLuint m_uPointerOffset;
-            GLuint m_uVertexAttribDivisor;
-            bool m_bInteger;
-        };
-
-        // Interleaved vertex attributes for a specific input assembler slot
-        typedef std::vector<SAttributeParameters> TAttributes;
-
-        // Vertex attributes for each input assembler slot
-        TAttributes m_akSlotAttributes[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-
-#if DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-        // for vertex_attrib_binding we need the binding slot in addition to the other data
-        struct SAttributeFormats
-            : SAttributeParameters
-        {
-            GLuint m_uBindingIndex;
-        };
-
-        typedef std::vector<SAttributeFormats> TAttributeFormats;
-        TAttributeFormats m_akVertexAttribFormats;
-#endif //DXGL_SUPPORT_VERTEX_ATTRIB_BINDING
-    };
-
-    namespace DXBC
-    {
-        const uint32 TextureIndexEncodeShift    = 22;
-        const uint32 SamplerIndexEncodeShift    = 12;
-        const uint32 TextureUnitEncodeShift     = 2;
-        const uint32 NormalSampleEncodeShift    = 1;
-        const uint32 EmbeddedNameEncodeShift    = 12;
-        const uint32 EncodeMask                 = 0x3FF;
-        const uint32 EncodeSampleModeMask       = 0x1;
-
-        template <size_t uSize>
-        bool GetEmbeddedName(char(&acBuffer)[uSize], const char* szGLSL, uint32 uNameMask)
-        {
-            uint32 uNameOffset = uNameMask >> EmbeddedNameEncodeShift;
-            uint32 uNameSize = uNameMask & EncodeMask;
-            if (uNameSize + 1 >= uSize)
-            {
-                DXGL_ERROR("Embedded name is too big");
-                return false;
-            }
-
-            memcpy(acBuffer, szGLSL + uNameOffset, uNameSize);
-            acBuffer[uNameSize] = '\0';
-            return true;
-        }
-
-        inline uint32 DecodeTextureIndex(uint32 uSamplerField) { return uSamplerField >> TextureIndexEncodeShift; }
-        inline uint32 DecodeSamplerIndex(uint32 uSamplerField) { return (uSamplerField >> SamplerIndexEncodeShift) & EncodeMask; }
-        inline uint32 DecodeTextureUnitIndex(uint32 uSamplerField) { return (uSamplerField >> TextureUnitEncodeShift) & EncodeMask; }
-        inline bool DecodeNormalSample(uint32 uSamplerField) { return ((uSamplerField >> NormalSampleEncodeShift) & EncodeSampleModeMask) == 1; }
-        inline bool DecodeCompareSample(uint32 uSamplerField) { return (uSamplerField & 0x1) == 1; }
-        inline uint32 DecodeResourceIndex(uint32 uResourceField) { return uResourceField; }
-        inline uint32 EncodeEmbeddedName(uint32 uNameOffset, uint32 uNameSize) { return uNameOffset << EmbeddedNameEncodeShift | uNameSize & EncodeMask; }
-        inline uint32 EncodeTextureData(uint32 uTextureIndex, uint32 uSamplerIndex, uint32 uTextureUnitIndex, bool bNormalSample, bool bCompareSample)
-        {
-            return uTextureIndex << TextureIndexEncodeShift | 
-                    (uSamplerIndex & EncodeSampleModeMask) << SamplerIndexEncodeShift |
-                    (uTextureUnitIndex & EncodeSampleModeMask) << TextureUnitEncodeShift |
-                    ((static_cast<uint32>(bNormalSample) & EncodeSampleModeMask) << NormalSampleEncodeShift) |
-                    static_cast<uint32>(bCompareSample);
-        }
-        inline uint32 EncodeResourceIndex(uint32 uResourceField) { return uResourceField; }
-    }
-
-
-    typedef SShaderReflection TShaderReflection;
-
-    bool InitializeShaderReflectionFromInput(SShaderReflection* pReflection, const void* pvData);
-
-    bool CompileShader(SShader* pShader, SSource* aSourceVersions, SGLShader* pGLShader);
-    bool CompilePipeline(SPipeline* pPipeline, SPipelineCompilationBuffer* pBuffer, CDevice* pDevice);
-    bool InitializeShader(SShader* pShader, const void* pvSourceData, size_t uSourceSize, const GLchar* szSourceOverride = NULL);
-    bool InitializePipelineResources(SPipeline* pPipeline, CContext* pContext);
-    SInputLayoutPtr CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, uint32 uNumElements, const TShaderReflection& kReflection, const CDevice* pDevice);
-
-    bool IsPipelineStageUsed(EPipelineMode eMode, EShaderType eType);
-    bool GetGLShaderType(GLenum& eGLShaderType, EShaderType eType);
-    bool GetGLProgramStageBit(GLbitfield& uProgramStageBit, EShaderType eType);
-
-    bool VerifyShaderStatus(GLuint uShader, GLenum eStatus);
-    bool VerifyProgramStatus(GLuint uProgram, GLenum eStatus);
-    bool VerifyProgramPipelineStatus(GLuint uPipeline, GLenum eStatus);
-
-    bool BindUniformToUnit(GLuint uProgramName, uint32 uUnit, const char* szName, CContext* pContext);
-    bool BindUniformBufferToUnit(GLuint uProgramName, uint32 uUnit, const char* szName, CContext* pContext);
-}
-
-#endif //__GLSHADER__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLState.cpp
deleted file mode 100644
index b5e6fcbad2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLState.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the functions used to create states
-//               and apply them to an OpenGL device
-
-
-#include "RenderDll_precompiled.h"
-#include "GLState.hpp"
-#include "GLDevice.hpp"
-
-namespace NCryOpenGL
-{
-    bool GetComparisonFunc(GLenum& eGLCompareFunc, D3D11_COMPARISON_FUNC eD3DCompareFunc)
-    {
-        switch (eD3DCompareFunc)
-        {
-        case D3D11_COMPARISON_NEVER:
-            eGLCompareFunc = GL_NEVER;
-            break;
-        case D3D11_COMPARISON_LESS:
-            eGLCompareFunc = GL_LESS;
-            break;
-        case D3D11_COMPARISON_EQUAL:
-            eGLCompareFunc = GL_EQUAL;
-            break;
-        case D3D11_COMPARISON_LESS_EQUAL:
-            eGLCompareFunc = GL_LEQUAL;
-            break;
-        case D3D11_COMPARISON_GREATER:
-            eGLCompareFunc = GL_GREATER;
-            break;
-        case D3D11_COMPARISON_NOT_EQUAL:
-            eGLCompareFunc = GL_NOTEQUAL;
-            break;
-        case D3D11_COMPARISON_GREATER_EQUAL:
-            eGLCompareFunc = GL_GEQUAL;
-            break;
-        case D3D11_COMPARISON_ALWAYS:
-            eGLCompareFunc = GL_ALWAYS;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool GetStencilOperation(GLenum& eGLStencilOp, D3D11_STENCIL_OP eD3DStencilOp)
-    {
-        switch (eD3DStencilOp)
-        {
-        case D3D11_STENCIL_OP_KEEP:
-            eGLStencilOp = GL_KEEP;
-            break;
-        case D3D11_STENCIL_OP_ZERO:
-            eGLStencilOp = GL_ZERO;
-            break;
-        case D3D11_STENCIL_OP_REPLACE:
-            eGLStencilOp = GL_REPLACE;
-            break;
-        case D3D11_STENCIL_OP_INCR_SAT:
-            eGLStencilOp = GL_INCR;
-            break;
-        case D3D11_STENCIL_OP_DECR_SAT:
-            eGLStencilOp = GL_DECR;
-            break;
-        case D3D11_STENCIL_OP_INVERT:
-            eGLStencilOp = GL_INVERT;
-            break;
-        case D3D11_STENCIL_OP_INCR:
-            eGLStencilOp = GL_INCR_WRAP;
-            break;
-        case D3D11_STENCIL_OP_DECR:
-            eGLStencilOp = GL_DECR_WRAP;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool GetBlendEquation(GLenum& eGLBlendEquation, D3D11_BLEND_OP eD3DBlendOp)
-    {
-        switch (eD3DBlendOp)
-        {
-        case D3D11_BLEND_OP_ADD:
-            eGLBlendEquation = GL_FUNC_ADD;
-            break;
-        case D3D11_BLEND_OP_SUBTRACT:
-            eGLBlendEquation = GL_FUNC_SUBTRACT;
-            break;
-        case D3D11_BLEND_OP_REV_SUBTRACT:
-            eGLBlendEquation = GL_FUNC_REVERSE_SUBTRACT;
-            break;
-        case D3D11_BLEND_OP_MIN:
-            eGLBlendEquation = GL_MIN;
-            break;
-        case D3D11_BLEND_OP_MAX:
-            eGLBlendEquation = GL_MAX;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool GetBlendFunction(GLenum& eGLBlendFunction, D3D11_BLEND eD3DBlend)
-    {
-        switch (eD3DBlend)
-        {
-        case D3D11_BLEND_ZERO:
-            eGLBlendFunction = GL_ZERO;
-            break;
-        case D3D11_BLEND_ONE:
-            eGLBlendFunction = GL_ONE;
-            break;
-        case D3D11_BLEND_SRC_COLOR:
-            eGLBlendFunction = GL_SRC_COLOR;
-            break;
-        case D3D11_BLEND_INV_SRC_COLOR:
-            eGLBlendFunction = GL_ONE_MINUS_SRC_COLOR;
-            break;
-        case D3D11_BLEND_SRC_ALPHA:
-            eGLBlendFunction = GL_SRC_ALPHA;
-            break;
-        case D3D11_BLEND_INV_SRC_ALPHA:
-            eGLBlendFunction = GL_ONE_MINUS_SRC_ALPHA;
-            break;
-        case D3D11_BLEND_DEST_ALPHA:
-            eGLBlendFunction = GL_DST_ALPHA;
-            break;
-        case D3D11_BLEND_INV_DEST_ALPHA:
-            eGLBlendFunction = GL_ONE_MINUS_DST_ALPHA;
-            break;
-        case D3D11_BLEND_DEST_COLOR:
-            eGLBlendFunction = GL_DST_COLOR;
-            break;
-        case D3D11_BLEND_INV_DEST_COLOR:
-            eGLBlendFunction = GL_ONE_MINUS_DST_COLOR;
-            break;
-        case D3D11_BLEND_SRC_ALPHA_SAT:
-            eGLBlendFunction = GL_SRC_ALPHA_SATURATE;
-            break;
-        case D3D11_BLEND_BLEND_FACTOR:
-            eGLBlendFunction = GL_CONSTANT_COLOR;
-            break;
-        case D3D11_BLEND_INV_BLEND_FACTOR:
-            eGLBlendFunction = GL_ONE_MINUS_CONSTANT_COLOR;
-            break;
-#if !DXGLES
-        case D3D11_BLEND_SRC1_COLOR:
-            eGLBlendFunction = GL_SRC1_COLOR;
-            break;
-        case D3D11_BLEND_INV_SRC1_COLOR:
-            eGLBlendFunction = GL_ONE_MINUS_SRC1_COLOR;
-            break;
-        case D3D11_BLEND_SRC1_ALPHA:
-            eGLBlendFunction = GL_SRC1_ALPHA;
-            break;
-        case D3D11_BLEND_INV_SRC1_ALPHA:
-            eGLBlendFunction = GL_ONE_MINUS_SRC1_ALPHA;
-            break;
-#endif
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool InitializeChannelBlendState(
-        D3D11_BLEND_OP eBlendOp, D3D11_BLEND eSrcBlend, D3D11_BLEND eDestBlend,
-        SChannelBlendState& kChannel)
-    {
-        if (!GetBlendEquation(kChannel.m_eEquation, eBlendOp))
-        {
-            DXGL_ERROR("Invalid blend operator");
-            return false;
-        }
-
-        if (!GetBlendFunction(kChannel.m_kFunction.m_eSrc, eSrcBlend) ||
-            !GetBlendFunction(kChannel.m_kFunction.m_eDst, eDestBlend))
-        {
-            DXGL_ERROR("Invalid blend factor");
-            return false;
-        }
-
-        return true;
-    }
-
-    bool InitializeBlendState(const D3D11_BLEND_DESC& kDesc, SBlendState& kState, CContext* context)
-    {
-        if (kDesc.IndependentBlendEnable && !context->GetDevice()->IsFeatureSupported(eF_IndependentBlending))
-        {
-            DXGL_ERROR("Independent blend state is not supported");
-            return false;
-        }
-
-        COMPILE_TIME_ASSERT(DXGL_ARRAY_SIZE(kDesc.RenderTarget) == DXGL_ARRAY_SIZE(kState.m_kTargets));
-        kState.m_bIndependentBlendEnable = kDesc.IndependentBlendEnable == TRUE;
-        kState.m_bAlphaToCoverageEnable = kDesc.AlphaToCoverageEnable == TRUE;
-
-        uint32 uTargetEnd(kState.m_bIndependentBlendEnable ? DXGL_ARRAY_SIZE(kDesc.RenderTarget) :  1);
-        for (uint32 uTarget = 0; uTarget < uTargetEnd; ++uTarget)
-        {
-            const D3D11_RENDER_TARGET_BLEND_DESC& kRTDesc(kDesc.RenderTarget[uTarget]);
-            STargetBlendState& kRTState(kState.m_kTargets[uTarget]);
-
-            kRTState.m_kWriteMask.m_abRGBA[0] = (kRTDesc.RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_RED)    != 0 ? GL_TRUE : GL_FALSE;
-            kRTState.m_kWriteMask.m_abRGBA[1] = (kRTDesc.RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_GREEN)  != 0 ? GL_TRUE : GL_FALSE;
-            kRTState.m_kWriteMask.m_abRGBA[2] = (kRTDesc.RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_BLUE)   != 0 ? GL_TRUE : GL_FALSE;
-            kRTState.m_kWriteMask.m_abRGBA[3] = (kRTDesc.RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_ALPHA)  != 0 ? GL_TRUE : GL_FALSE;
-
-            kRTState.m_bEnable = kRTDesc.BlendEnable == TRUE;
-            if (kRTState.m_bEnable)
-            {
-                kRTState.m_bSeparateAlpha =
-                    (kRTDesc.BlendOp != kRTDesc.BlendOpAlpha) ||
-                    (kRTDesc.SrcBlend != kRTDesc.SrcBlendAlpha) ||
-                    (kRTDesc.DestBlend != kRTDesc.DestBlendAlpha);
-
-                if (!InitializeChannelBlendState(kRTDesc.BlendOp, kRTDesc.SrcBlend, kRTDesc.DestBlend, kRTState.m_kRGB))
-                {
-                    return false;
-                }
-
-                if (kRTState.m_bSeparateAlpha &&
-                    !InitializeChannelBlendState(kRTDesc.BlendOpAlpha, kRTDesc.SrcBlendAlpha, kRTDesc.DestBlendAlpha, kRTState.m_kAlpha))
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    bool InitializeStencilFace(SDepthStencilState::SFace& kStencilFace, const D3D11_DEPTH_STENCILOP_DESC& kDesc, UINT8 uWriteMask, UINT8 uReadMask)
-    {
-        kStencilFace.m_uStencilWriteMask = uWriteMask;
-        kStencilFace.m_uStencilReadMask = uReadMask;
-
-        if (!GetComparisonFunc(kStencilFace.m_eFunction, kDesc.StencilFunc))
-        {
-            DXGL_ERROR("Invalid stencil comparison function");
-            return false;
-        }
-
-        if (!GetStencilOperation(kStencilFace.m_eStencilFailOperation, kDesc.StencilFailOp) ||
-            !GetStencilOperation(kStencilFace.m_eDepthFailOperation, kDesc.StencilDepthFailOp) ||
-            !GetStencilOperation(kStencilFace.m_eDepthPassOperation, kDesc.StencilPassOp))
-        {
-            DXGL_ERROR("Invalid stencil operation");
-            return false;
-        }
-
-        return true;
-    }
-
-    bool InitializeDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, SDepthStencilState& kState, CContext*)
-    {
-        kState.m_bDepthTestingEnabled = kDesc.DepthEnable == TRUE;
-
-        switch (kDesc.DepthWriteMask)
-        {
-        case D3D11_DEPTH_WRITE_MASK_ALL:
-            kState.m_bDepthWriteMask = GL_TRUE;
-            break;
-        case D3D11_DEPTH_WRITE_MASK_ZERO:
-            kState.m_bDepthWriteMask = GL_FALSE;
-            break;
-        default:
-            DXGL_ERROR("Invalid depth write mask");
-            return false;
-        }
-
-        if (kState.m_bDepthTestingEnabled)
-        {
-            if (!GetComparisonFunc(kState.m_eDepthTestFunc, kDesc.DepthFunc))
-            {
-                DXGL_ERROR("Invalid depth comparison function");
-                return false;
-            }
-        }
-
-        kState.m_bStencilTestingEnabled = kDesc.StencilEnable == TRUE;
-
-        if (kState.m_bStencilTestingEnabled)
-        {
-            if (!InitializeStencilFace(kState.m_kStencilFrontFaces, kDesc.FrontFace, kDesc.StencilWriteMask, kDesc.StencilReadMask) ||
-                !InitializeStencilFace(kState.m_kStencilBackFaces, kDesc.BackFace, kDesc.StencilWriteMask, kDesc.StencilReadMask))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    bool InitializeRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, SRasterizerState& kState, CContext*)
-    {
-#if !DXGLES
-        switch (kDesc.FillMode)
-        {
-        case D3D11_FILL_SOLID:
-            kState.m_ePolygonMode = GL_FILL;
-            break;
-        case D3D11_FILL_WIREFRAME:
-            kState.m_ePolygonMode = GL_LINE;
-            break;
-        }
-#else
-        if (kDesc.FillMode != D3D11_FILL_SOLID)
-        {
-            DXGL_WARNING("Fill modes other than solid are not supported on OpenGL ES. The setting will be ignored");
-        }
-#endif
-
-        switch (kDesc.CullMode)
-        {
-        case D3D11_CULL_NONE:
-            kState.m_bCullingEnabled = false;
-            break;
-        case D3D11_CULL_FRONT:
-            kState.m_eCullFaceMode = GL_FRONT;
-            kState.m_bCullingEnabled = true;
-            break;
-        case D3D11_CULL_BACK:
-            kState.m_eCullFaceMode = GL_BACK;
-            kState.m_bCullingEnabled = true;
-            break;
-        }
-
-#if CRY_OPENGL_FLIP_Y
-        kState.m_eFrontFaceMode = kDesc.FrontCounterClockwise ? GL_CW : GL_CCW;
-#else
-        kState.m_eFrontFaceMode = kDesc.FrontCounterClockwise ? GL_CCW : GL_CW;
-#endif
-
-        kState.m_fPolygonOffsetUnits = static_cast<GLfloat>(kDesc.DepthBias); // Same behavior as D3D11 except it's input as float
-        kState.m_fPolygonOffsetFactor = kDesc.SlopeScaledDepthBias;
-        kState.m_bPolygonOffsetEnabled = kDesc.DepthBias != 0.0f || kDesc.SlopeScaledDepthBias != 0.0f;
-
-        if (kDesc.DepthBiasClamp > 0.0f)
-        {
-            DXGL_WARNING("Direct3D Depth bias clamping is not supported by OpenGL. This setting will be ignored.");
-        }
-
-        kState.m_bScissorEnabled = kDesc.ScissorEnable == TRUE;
-        kState.m_bDepthClipEnabled = kDesc.DepthClipEnable == TRUE;
-#if !DXGLES
-        kState.m_bLineSmoothEnabled = kDesc.AntialiasedLineEnable == TRUE;
-        kState.m_bMultisampleEnabled = kDesc.MultisampleEnable == TRUE;
-#else
-        if (kDesc.AntialiasedLineEnable == TRUE)
-        {
-            DXGL_WARNING("Smooth line rasterization is not supported on OpenGL ES. This setting will be ignored.");
-        }
-        if (kDesc.MultisampleEnable == TRUE)
-        {
-            DXGL_WARNING("Specifying the multisampling mode globally is not supported on OpenGL ES. This setting will be ignored.");
-        }
-#endif
-        return true;
-    }
-
-    bool GetTexFilterParams(GLenum& eMinFilter, GLenum& eMagFilter, bool& bAnisotropic, bool& bComparison, D3D11_FILTER eD3DFilter, bool bMip)
-    {
-        switch (eD3DFilter)
-        {
-#define _FILTER_CASE(_D3D11FilterID, _MinFilter, _MagFilter, _MipFilter, _Anisotropic, _Comparison) \
-case _D3D11FilterID:                                                                                \
-    eMinFilter = bMip ? GL_ ## _MinFilter ## _MIPMAP_ ## _MipFilter : GL_ ## _MinFilter;            \
-    eMagFilter = GL_ ## _MagFilter;                                                                 \
-    bAnisotropic = _Anisotropic;                                                                    \
-    bComparison = _Comparison;                                                                      \
-    break;
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_MIP_POINT, NEAREST, NEAREST, NEAREST, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR, NEAREST, NEAREST, LINEAR, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT, NEAREST, LINEAR, NEAREST, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR, NEAREST, LINEAR, LINEAR, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT, LINEAR, NEAREST, NEAREST, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR, LINEAR, NEAREST, LINEAR, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT, LINEAR, LINEAR, NEAREST, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_MIP_LINEAR, LINEAR, LINEAR, LINEAR, false, false);
-            _FILTER_CASE(D3D11_FILTER_ANISOTROPIC, LINEAR, LINEAR, LINEAR, true, false);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT, NEAREST, NEAREST, NEAREST, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR, NEAREST, NEAREST, LINEAR, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT, NEAREST, LINEAR, NEAREST, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR, NEAREST, LINEAR, LINEAR, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT, LINEAR, NEAREST, NEAREST, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR, LINEAR, NEAREST, LINEAR, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT, LINEAR, LINEAR, NEAREST, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR, LINEAR, LINEAR, LINEAR, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_ANISOTROPIC, LINEAR, LINEAR, LINEAR, true, true);
-#undef _FILTER_CASE
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool GetTexWrapParams(GLint& iTexWrap, D3D11_TEXTURE_ADDRESS_MODE eD3DAddressMode, CContext* pContext)
-    {
-        switch (eD3DAddressMode)
-        {
-        case D3D11_TEXTURE_ADDRESS_WRAP:
-            iTexWrap = GL_REPEAT;
-            break;
-        case D3D11_TEXTURE_ADDRESS_MIRROR:
-            iTexWrap = GL_MIRRORED_REPEAT;
-            break;
-        case D3D11_TEXTURE_ADDRESS_CLAMP:
-            iTexWrap = GL_CLAMP_TO_EDGE;
-            break;
-        case D3D11_TEXTURE_ADDRESS_BORDER:
-#if !defined(IOS) // iOS cannot compile the below gl code
-            if (!pContext->GetDevice()->IsFeatureSupported(eF_TextureBorderClamp))
-            {
-                DXGL_WARNING("Sampler with texture border clamping is not supported");
-                iTexWrap = GL_CLAMP_TO_EDGE;
-                return true;
-            }
-            iTexWrap = GL_CLAMP_TO_BORDER_EXT;
-#else
-            DXGL_WARNING("Sampler with texture border clamping is not supported");
-            //LYTODO: Their is code that calls this function that is dependent on this succeeding, so lie for now
-            //set to clamp to edge and succeed.
-            iTexWrap = GL_CLAMP_TO_EDGE;
-            return true;
-#endif
-            break;
-        default:
-            DXGL_WARNING("Unsupported sampler address mode");
-            return false;
-        }
-        return true;
-    }
-
-    bool CreateSamplerObject(const D3D11_SAMPLER_DESC& kDesc, GLuint* puSampler, bool bMip, CContext* pContext)
-    {
-        GLenum eComparisonFunc, eMinFilter, eMagFilter;
-        bool bAnisotropic, bComparison;
-        GLint iWrapS, iWrapT, iWrapR;
-        if (!GetTexFilterParams(eMinFilter, eMagFilter, bAnisotropic, bComparison, kDesc.Filter, bMip) ||
-            !GetTexWrapParams(iWrapS, kDesc.AddressU, pContext) ||
-            !GetTexWrapParams(iWrapT, kDesc.AddressV, pContext) ||
-            !GetTexWrapParams(iWrapR, kDesc.AddressW, pContext))
-        {
-            return false;
-        }
-
-        if (bComparison && !GetComparisonFunc(eComparisonFunc, kDesc.ComparisonFunc))
-        {
-            return false;
-        }
-
-        CDevice* pDevice = pContext->GetDevice();
-        glGenSamplers(1, puSampler);
-        if (bComparison)
-        {
-            glSamplerParameteri(*puSampler, GL_TEXTURE_COMPARE_FUNC, eComparisonFunc);
-        }
-        if (pDevice->IsFeatureSupported(eF_TextureAnisotropicFiltering))
-        {
-            glSamplerParameterf(*puSampler, GL_TEXTURE_MAX_ANISOTROPY_EXT, bAnisotropic ? (float)kDesc.MaxAnisotropy : 1.0f);
-        }
-        glSamplerParameteri(*puSampler, GL_TEXTURE_COMPARE_MODE, bComparison ? GL_COMPARE_REF_TO_TEXTURE : GL_NONE);
-        glSamplerParameterf(*puSampler, GL_TEXTURE_MAX_LOD, kDesc.MaxLOD);
-        glSamplerParameteri(*puSampler, GL_TEXTURE_MAG_FILTER, eMagFilter);
-        glSamplerParameteri(*puSampler, GL_TEXTURE_MIN_FILTER, eMinFilter);
-        glSamplerParameterf(*puSampler, GL_TEXTURE_MIN_LOD, kDesc.MinLOD);
-        glSamplerParameteri(*puSampler, GL_TEXTURE_WRAP_S, iWrapS);
-        glSamplerParameteri(*puSampler, GL_TEXTURE_WRAP_T, iWrapT);
-        glSamplerParameteri(*puSampler, GL_TEXTURE_WRAP_R, iWrapR);
-
-#if !defined(IOS) // iOS cannot compile the below gl code
-        if (pDevice->IsFeatureSupported(eF_TextureBorderClamp))
-        {
-            glSamplerParameterfv(*puSampler, GL_TEXTURE_BORDER_COLOR_EXT, kDesc.BorderColor);
-        }
-#endif
-
-        if (kDesc.MipLODBias != 0.0f)
-        {
-#if DXGLES
-            DXGL_WARNING("MipLODBias not supported on GL ES");
-#else
-            glSamplerParameterf(*puSampler, GL_TEXTURE_LOD_BIAS, kDesc.MipLODBias);
-#endif
-        }
-
-        return true;
-    }
-
-    bool InitializeSamplerState(const D3D11_SAMPLER_DESC& kDesc, SSamplerState& kSamplerState, CContext* pContext)
-    {
-        return
-            CreateSamplerObject(kDesc, &kSamplerState.m_uSamplerObjectMip, true, pContext) &&
-            CreateSamplerObject(kDesc, &kSamplerState.m_uSamplerObjectNoMip, false, pContext);
-    }
-
-    void ResetSamplerState(SSamplerState& kSamplerState)
-    {
-        AZStd::vector<GLuint> samplers;
-        if (kSamplerState.m_uSamplerObjectMip)
-        {
-            samplers.push_back(kSamplerState.m_uSamplerObjectMip);
-        }
-
-        if (kSamplerState.m_uSamplerObjectNoMip)
-        {
-            samplers.push_back(kSamplerState.m_uSamplerObjectNoMip);
-        }
-
-        if (!samplers.empty())
-        {
-            glDeleteSamplers(samplers.size(), samplers.data());
-        }
-
-        kSamplerState.m_uSamplerObjectMip = 0;
-        kSamplerState.m_uSamplerObjectNoMip = 0;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLState.hpp
deleted file mode 100644
index 9c43f35c4f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLState.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the state types and the functions to modify them
-//               and apply to a device
-
-
-#ifndef __GLSTATE__
-#define __GLSTATE__
-
-#include "GLCommon.hpp"
-
-namespace NCryOpenGL
-{
-    class CDevice;
-    class CContext;
-
-    struct SBlendFunction
-    {
-        GLenum m_eSrc;
-        GLenum m_eDst;
-    };
-
-    struct SChannelBlendState
-    {
-        GLenum m_eEquation;
-        SBlendFunction m_kFunction;
-    };
-
-    struct SColorMask
-    {
-        GLboolean m_abRGBA[4];
-    };
-
-    struct STargetBlendState
-    {
-        bool m_bEnable;
-        bool m_bSeparateAlpha;
-        SChannelBlendState m_kRGB;
-        SChannelBlendState m_kAlpha;
-        SColorMask m_kWriteMask;
-    };
-
-    struct SBlendState
-    {
-        STargetBlendState m_kTargets[DXGL_NUM_SUPPORTED_BLEND_STATES];
-        bool m_bAlphaToCoverageEnable;
-        bool m_bIndependentBlendEnable;
-    };
-
-    struct SDepthStencilState
-    {
-        bool m_bDepthTestingEnabled;
-        GLenum m_eDepthTestFunc;
-        GLboolean m_bDepthWriteMask;
-        bool m_bStencilTestingEnabled;
-        struct SFace
-        {
-            GLenum m_eFunction;
-            GLenum m_eStencilFailOperation;
-            GLenum m_eDepthFailOperation;
-            GLenum m_eDepthPassOperation;
-            GLuint m_uStencilWriteMask;
-            GLuint m_uStencilReadMask;
-        } m_kStencilFrontFaces, m_kStencilBackFaces;
-    };
-
-    struct SRasterizerState
-    {
-        bool m_bCullingEnabled;
-        GLenum m_eCullFaceMode;
-        GLenum m_eFrontFaceMode;
-        bool m_bPolygonOffsetEnabled;
-        GLfloat m_fPolygonOffsetUnits;
-        GLfloat m_fPolygonOffsetFactor;
-        bool m_bScissorEnabled;
-        bool m_bDepthClipEnabled;
-#if !DXGLES
-        GLenum m_ePolygonMode;
-        bool m_bLineSmoothEnabled;
-        bool m_bMultisampleEnabled;
-#endif //!DXGLES
-    };
-
-    struct SSamplerState
-    {
-        // OpenGL doesn't allow a sampler object with mipmap filtering to be used with
-        // textures without mipmaps. For this reason two different sampler objects are needed.
-        GLuint m_uSamplerObjectMip;
-        GLuint m_uSamplerObjectNoMip;
-    };
-
-    bool InitializeBlendState(const D3D11_BLEND_DESC& kDesc, SBlendState& kState, CContext* pContext);
-    bool InitializeDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, SDepthStencilState& kState, CContext* pContext);
-    bool InitializeRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, SRasterizerState& kState, CContext* pContext);
-    bool InitializeSamplerState(const D3D11_SAMPLER_DESC& kDesc, SSamplerState& kState, CContext* pContext);
-    void ResetSamplerState(SSamplerState& kSamplerState);
-    bool GetTexFilterParams(GLenum& eMinFilter, GLenum& eMagFilter, bool& bAnisotropic, bool& bComparison, D3D11_FILTER eD3DFilter, bool bMip);
-
-    inline bool operator==(SBlendFunction kLeft, SBlendFunction kRight)
-    {
-        return
-            kLeft.m_eSrc == kRight.m_eSrc &&
-            kLeft.m_eDst == kRight.m_eDst;
-    }
-
-    inline bool operator==(SChannelBlendState kLeft, SChannelBlendState kRight)
-    {
-        return
-            kLeft.m_eEquation == kRight.m_eEquation &&
-            kLeft.m_kFunction == kRight.m_kFunction;
-    }
-
-    inline bool operator==(SColorMask kLeft, SColorMask kRight)
-    {
-        return 0 == memcmp(kLeft.m_abRGBA, kRight.m_abRGBA, sizeof(kRight.m_abRGBA));
-    }
-
-    inline bool operator==(const STargetBlendState& kLeft, const STargetBlendState& kRight)
-    {
-        return
-            kLeft.m_bEnable                         == kRight.m_bEnable                     &&
-            kLeft.m_bSeparateAlpha          == kRight.m_bSeparateAlpha      &&
-            kLeft.m_kRGB                                == kRight.m_kRGB                            &&
-            kLeft.m_kAlpha                          == kRight.m_kAlpha                      &&
-            kLeft.m_kWriteMask                  == kRight.m_kWriteMask;
-    }
-
-    inline bool operator!=(SBlendFunction kLeft, SBlendFunction kRight)
-    {
-        return !(kLeft == kRight);
-    }
-
-    inline bool operator!=(SChannelBlendState kLeft, SChannelBlendState kRight)
-    {
-        return !(kLeft == kRight);
-    }
-
-    inline bool operator!=(SColorMask kLeft, SColorMask kRight)
-    {
-        return !(kLeft == kRight);
-    }
-
-    inline bool operator!=(const STargetBlendState& kLeft, const STargetBlendState& kRight)
-    {
-        return !(kLeft == kRight);
-    }
-}
-
-
-#endif //__GLSTATE__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLView.cpp
deleted file mode 100644
index 330f4f64d2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLView.cpp
+++ /dev/null
@@ -1,1140 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implements the resource view related functions
-
-
-#include "RenderDll_precompiled.h"
-
-#include "GLView.hpp"
-#include "GLDevice.hpp"
-
-namespace NCryOpenGL
-{
-    CResourceName CreateTextureView(STexture* pTexture, const SGIFormatInfo* pFormatInfo, GLenum eTarget, GLuint uMinMipLevel, GLuint uNumMipLevels, GLuint uMinLayer, GLuint uNumLayers, CContext* pContext)
-    {
-#if DXGL_SUPPORT_TEXTURE_VIEWS
-        if (pContext->GetDevice()->IsFeatureSupported(eF_TextureViews))
-        {
-            GLint iInternalFormat;
-            if (pFormatInfo->m_eTypelessConversion != eGIFC_TEXTURE_VIEW)
-            {
-                // This can happen if lazy texture view creation is disabled or two views with different modifiers
-                // are bound at the same time (for example one view as DEPTH_TO_RED, one as STENCIL_TO_GREEN).
-                // In this case create a view with same format as the original texture, so that it will have its own
-                // separate format modifier.
-                iInternalFormat = GetGIFormatInfo(pTexture->m_eFormat)->m_pTexture->m_iInternalFormat;
-            }
-            else
-            {
-                if (pFormatInfo->m_pTexture == NULL)
-                {
-                    DXGL_ERROR("Invalid format for texture view");
-                    return CResourceName();
-                }
-
-                iInternalFormat = pFormatInfo->m_pTexture->m_iInternalFormat;
-            }
-
-            GLuint uView;
-            glGenTextures(1, &uView);
-            glTextureViewEXT(uView, eTarget, pTexture->m_kName.GetName(), iInternalFormat, uMinMipLevel, uNumMipLevels, uMinLayer, uNumLayers);
-            return pContext->GetDevice()->GetTextureNamePool().Create(uView);
-        }
-        else
-#endif
-        {
-            DXGL_ERROR("glTextureView not supported - cannot create the requested unique view for the texture");
-            return CResourceName();
-        }
-    }
-
-    CResourceName CreateTextureBuffer(SBuffer* pBuffer, const SGIFormatInfo* pFormatInfo, uint32 uFirstElement, uint32 uNumElements, CContext* pContext)
-    {
-#if DXGL_SUPPORT_TEXTURE_BUFFERS
-        uint32 uElementSize(pFormatInfo->m_pTexture->m_uNumBlockBytes);
-        uint32 uViewSize(uNumElements * uElementSize);
-        bool bEntireBuffer(uFirstElement == 0 && uViewSize == pBuffer->m_uSize);
-
-#if !defined(glTexBufferRange)
-        if (!bEntireBuffer)
-        {
-            DXGL_ERROR("glTexBufferRange is not supported - can't create an arbitrary texture buffer");
-            return CResourceName();
-        }
-#endif //!defined(glTexBufferRange)
-
-        GLuint uView;
-        glGenTextures(1, &uView);
-
-#if defined(glTexBufferRange)
-        if (!bEntireBuffer)
-        {
-            glTextureBufferRangeEXT(uView, GL_TEXTURE_BUFFER, pFormatInfo->m_pTexture->m_iInternalFormat, pBuffer->m_kName.GetName(), uFirstElement * uElementSize, uViewSize);
-        }
-        else
-#endif //defined(glTexBufferRange)
-        glTextureBufferEXT(uView, GL_TEXTURE_BUFFER, pFormatInfo->m_pTexture->m_iInternalFormat, pBuffer->m_kName.GetName());
-
-        return pContext->GetDevice()->GetTextureNamePool().Create(uView);
-#else
-        DXGL_ERROR("Buffer shader resource views are not supported on this configuration");
-        return CResourceName();
-#endif
-    }
-
-    SShaderView::SShaderView(Type eType)
-        : m_eType(eType)
-    {
-    }
-
-    SShaderView::~SShaderView()
-    {
-    }
-
-    SShaderBufferView::SShaderBufferView(const SBufferRange& kRange)
-        : SShaderView(eSVT_Buffer)
-        , m_kRange(kRange)
-    {
-    }
-
-    SShaderBufferView::~SShaderBufferView()
-    {
-    }
-
-    void SShaderBufferView::Init(SBuffer* pBuffer, CContext* pContext)
-    {
-        pBuffer->m_kCreationFence.IssueWait(pContext);
-        m_kName = pBuffer->m_kName;
-        m_kCreationFence.IssueFence(pContext->GetDevice());
-    }
-
-    SShaderTextureBasedView::SShaderTextureBasedView(Type eType)
-        : SShaderView(eType)
-        , m_bTextureOwned(false)
-    {
-    }
-
-    SShaderTextureBasedView::~SShaderTextureBasedView()
-    {
-        if (m_bTextureOwned)
-        {
-            GLuint uTextureName(m_kName.GetName());
-            glDeleteTextures(1, &uTextureName);
-        }
-    }
-
-    bool SShaderTextureBasedView::BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache)
-    {
-        DXGL_ERROR("Cannot bind this type of texture based view to a texture unit");
-        return false;
-    }
-
-    bool SShaderTextureBasedView::GenerateMipmaps(CContext*)
-    {
-        DXGL_ERROR("Cannot create mipmaps from this type of texture based view");
-        return false;
-    }
-
-    SShaderTextureBufferView::SShaderTextureBufferView(const SShaderTextureBufferViewConfiguration& kConfiguration)
-        : SShaderTextureBasedView(eSVT_Texture)
-        , m_pBuffer(NULL)
-        , m_kConfiguration(kConfiguration)
-        , m_pNextView(NULL)
-    {
-    }
-
-    SShaderTextureBufferView::~SShaderTextureBufferView()
-    {
-        if (m_pBuffer != NULL)
-        {
-            SShaderTextureBufferView** pLink = &m_pBuffer->m_pTextureBuffersHead;
-            while (*pLink != NULL)
-            {
-                if (*pLink == this)
-                {
-                    *pLink = m_pNextView;
-                    break;
-                }
-                pLink = &((*pLink)->m_pNextView);
-            }
-        }
-    }
-
-    bool SShaderTextureBufferView::Init(SBuffer* pBuffer, CContext* pContext)
-    {
-        const SGIFormatInfo* pFormatInfo;
-        if ((pFormatInfo = GetGIFormatInfo(m_kConfiguration.m_eFormat)) == NULL ||
-            pFormatInfo->m_pTexture == NULL)
-        {
-            DXGL_ERROR("Invalid format for buffer view");
-            return false;
-        }
-
-        pBuffer->m_kCreationFence.IssueWait(pContext);
-
-        CResourceName kTextureBufferName(CreateTextureBuffer(pBuffer, pFormatInfo, m_kConfiguration.m_uFirstElement, m_kConfiguration.m_uNumElements, pContext));
-        if (!kTextureBufferName.IsValid())
-        {
-            return false;
-        }
-
-        m_kName = kTextureBufferName;
-        m_kCreationFence.IssueFence(pContext->GetDevice());
-        m_bTextureOwned = true;
-
-        m_pBuffer = pBuffer;
-        m_pNextView = pBuffer->m_pTextureBuffersHead;
-        pBuffer->m_pTextureBuffersHead = this;
-
-        return true;
-    }
-
-    bool SShaderTextureBufferView::BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache)
-    {
-        kContext.m_kCurrentUnitState.m_kTextureName = m_kName;
-        kContext.m_kCurrentUnitState.m_uSampler = pSamplerState->m_uSamplerObjectNoMip;
-#if DXGLES
-        // OpenGL ES does not have texture buffers
-        DXGL_TODO("Find alternatives for TEXTURE BUFFER")
-        kContext.m_kCurrentUnitState.m_eTextureTarget = GL_INVALID_ENUM;
-#else
-        kContext.m_kCurrentUnitState.m_eTextureTarget = GL_TEXTURE_BUFFER;
-#endif
-        assert(m_kName.IsValid());
-        return true;
-    }
-
-    SShaderTextureView::SShaderTextureView(const SShaderTextureViewConfiguration& kConfiguration)
-        : SShaderTextureBasedView(eSVT_Texture)
-        , m_pTexture(NULL)
-        , m_kConfiguration(kConfiguration)
-        , m_pNextView(NULL)
-    {
-    }
-
-    SShaderTextureView::~SShaderTextureView()
-    {
-        if (m_pTexture != NULL)
-        {
-            SShaderTextureView** pLink = &m_pTexture->m_pShaderViewsHead;
-            while (*pLink != NULL)
-            {
-                if (*pLink == this)
-                {
-                    *pLink = m_pNextView;
-                    break;
-                }
-                pLink = &((*pLink)->m_pNextView);
-            }
-        }
-    }
-
-    bool SShaderTextureView::Init(STexture* pTexture, CContext* pContext)
-    {
-        const SGIFormatInfo* pFormatInfo;
-        if (m_kConfiguration.m_eFormat == eGIF_NUM ||
-            (pFormatInfo = GetGIFormatInfo(m_kConfiguration.m_eFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for shader resource view");
-            return false;
-        }
-
-        m_kViewState.m_iBaseMipLevel = (GLint)m_kConfiguration.m_uMinMipLevel;
-        m_kViewState.m_iMaxMipLevel =  (GLint)(m_kConfiguration.m_uMinMipLevel + m_kConfiguration.m_uNumMipLevels - 1);
-        m_kViewState.m_uSwizzleMask = pFormatInfo->m_uDXGISwizzleMask;
-#if DXGL_SUPPORT_STENCIL_TEXTURES
-        m_kViewState.m_iDepthStencilTextureMode = 0;
-#endif //DXGL_SUPPORT_STENCIL_TEXTURES
-        m_pTexture = pTexture;
-
-        m_bFormatRequiresUniqueView = false;
-        if (m_kConfiguration.m_eFormat != pTexture->m_eFormat)
-        {
-            if (pFormatInfo->m_eTypelessFormat != pTexture->m_eFormat)
-            {
-                DXGL_ERROR("Shader resource view format is not compatible with texture format");
-                return false;
-            }
-
-            switch (pFormatInfo->m_eTypelessConversion)
-            {
-            case eGIFC_DEPTH_TO_RED:
-#if DXGL_SUPPORT_STENCIL_TEXTURES
-                if (pContext->GetDevice()->IsFeatureSupported(eF_StencilTextures))
-                {
-                    m_kViewState.m_iDepthStencilTextureMode = GL_DEPTH_COMPONENT;
-                }
-#endif //DXGL_SUPPORT_STENCIL_TEXTURES
-                break;
-            case eGIFC_STENCIL_TO_RED:
-#if DXGL_SUPPORT_STENCIL_TEXTURES
-                if (pContext->GetDevice()->IsFeatureSupported(eF_StencilTextures))
-                {
-                    m_kViewState.m_iDepthStencilTextureMode = GL_STENCIL_INDEX;
-                }
-                else
-#endif //DXGL_SUPPORT_STENCIL_TEXTURES
-                {
-                    DXGL_ERROR("Stencil texturing not supported - cannot create shader resource view for stencil format");
-                    return false;
-                }
-                break;
-            case eGIFC_TEXTURE_VIEW:
-                m_bFormatRequiresUniqueView = true;
-                break;
-            case eGIFC_UNSUPPORTED:
-                DXGL_ERROR("Shader resource view conversion not supported for the requested format");
-                return false;
-            }
-        }
-
-        if (m_kConfiguration.m_eTarget != pTexture->m_eTarget)
-        {
-            m_bFormatRequiresUniqueView = true;
-        }
-
-        if (m_bFormatRequiresUniqueView ||
-            m_kConfiguration.m_uMinLayer > 0 ||
-            m_kConfiguration.m_uNumLayers != pTexture->m_uNumElements)
-        {
-            if (!CreateUniqueView(pContext))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            m_kName = pTexture->m_kName;
-            pTexture->m_kCreationFence.IssueWait(pContext);
-            m_kCreationFence.IssueFence(pContext->GetDevice());
-            m_bTextureOwned = false;
-        }
-
-        m_pNextView = pTexture->m_pShaderViewsHead;
-        pTexture->m_pShaderViewsHead = this;
-
-        return true;
-    }
-
-    bool SShaderTextureView::CreateUniqueView(CContext* pContext)
-    {
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(m_kConfiguration.m_eFormat));
-
-        m_pTexture->m_kCreationFence.IssueWait(pContext);
-
-        CResourceName kUniqueView = CreateTextureView(
-                m_pTexture, pFormatInfo, m_kConfiguration.m_eTarget,
-                m_kConfiguration.m_uMinMipLevel, m_kConfiguration.m_uNumMipLevels,
-                m_kConfiguration.m_uMinLayer, m_kConfiguration.m_uNumLayers,
-                pContext);
-
-        if (kUniqueView.IsValid())
-        {
-            m_kName = kUniqueView;
-            m_bTextureOwned = true;
-
-            m_kViewState.ApplyFormatMode(kUniqueView.GetName(), m_kConfiguration.m_eTarget);
-            m_kCreationFence.IssueFence(pContext->GetDevice());
-
-            return true;
-        }
-        return false;
-    }
-
-    bool SShaderTextureView::BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache)
-    {
-        kContext.m_kCurrentUnitState.m_uSampler = m_kConfiguration.m_uNumMipLevels > 1 ?
-            pSamplerState->m_uSamplerObjectMip :
-            pSamplerState->m_uSamplerObjectNoMip;
-        kContext.m_kCurrentUnitState.m_eTextureTarget = m_kConfiguration.m_eTarget;
-
-        if (!m_bTextureOwned)
-        {
-            if (m_kConfiguration.m_eTarget == m_pTexture->m_eTarget)
-            {
-                if (m_pTexture->m_pBoundModifier == this)
-                {
-                    kContext.m_kCurrentUnitState.m_kTextureName = m_pTexture->m_kName;
-                    return true;
-                }
-
-                if (m_pTexture->m_pBoundModifier == NULL || (m_pTexture->m_pBoundModifier && !m_bFormatRequiresUniqueView))
-                {
-                    if (m_pTexture->m_kCache != m_kViewState)
-                    {
-                        m_kViewState.Apply(m_pTexture->m_kName.GetName(), m_kConfiguration.m_eTarget, kCurrentUnitCache);
-                        m_pTexture->m_kCache = m_kViewState;
-                    }
-                    m_pTexture->m_pBoundModifier = this;
-                    kContext.m_kModifiedTextures.push_back(m_pTexture);
-                    kContext.m_kCurrentUnitState.m_kTextureName = m_pTexture->m_kName;
-                    return true;
-                }
-            }
-
-            if (!CreateUniqueView(pContext))
-            {
-                return false;
-            }
-        }
-
-        kContext.m_kCurrentUnitState.m_kTextureName = m_kName;
-        return true;
-    }
-
-    bool SShaderTextureView::GenerateMipmaps(CContext* pContext)
-    {
-        DXGL_TODO("Verify the expected behavior when the view has non-default parameters (currently ignored)")
-        glGenerateTextureMipmapEXT(m_pTexture->m_kName.GetName(), m_kConfiguration.m_eTarget);
-        m_kCreationFence.IssueWait(pContext);
-        return true;
-    }
-
-    SShaderImageView::SShaderImageView(const SShaderImageViewConfiguration& kConfiguration)
-        : SShaderTextureBasedView(eSVT_Image)
-        , m_kConfiguration(kConfiguration)
-    {
-    }
-
-    SShaderImageView::~SShaderImageView()
-    {
-    }
-
-    bool SShaderImageView::Init(STexture* pTexture, CContext* pContext)
-    {
-        m_kName = pTexture->m_kName;
-        pTexture->m_kCreationFence.IssueWait(pContext);
-        m_kCreationFence.IssueFence(pContext->GetDevice());
-        m_bTextureOwned = false;
-        return true;
-    }
-
-    bool SShaderImageView::Init(SShaderTextureBasedView* pTextureBufferView, CContext* pContext)
-    {
-        m_spAuxiliaryView = pTextureBufferView;
-        m_kName = pTextureBufferView->m_kName;
-        pTextureBufferView->m_kCreationFence.IssueWait(pContext);
-        m_kCreationFence.IssueFence(pContext->GetDevice());
-        m_bTextureOwned = false;
-        return true;
-    }
-
-    SOutputMergerView::SOutputMergerView(const CResourceName& kUniqueView, EGIFormat eFormat)
-        : m_kUniqueView(kUniqueView)
-        , m_eFormat(eFormat)
-    {
-        memset(m_kContextMap, 0, sizeof(m_kContextMap));
-    }
-
-    SOutputMergerView::~SOutputMergerView()
-    {
-        uint32 uContext;
-        for (uContext = 0; uContext < DXGL_ARRAY_SIZE(m_kContextMap); ++uContext)
-        {
-            SContextData* pContextData(m_kContextMap[uContext]);
-            if (pContextData != NULL)
-            {
-                // All frame buffers with this view bound must be removed from the cache and deleted
-                TFrameBufferRefs::iterator kFrameBufferRefIter(pContextData->m_kBoundFrameBuffers.begin());
-                const TFrameBufferRefs::iterator kFrameBufferRefEnd(pContextData->m_kBoundFrameBuffers.end());
-                while (kFrameBufferRefIter != kFrameBufferRefEnd)
-                {
-                    SFrameBuffer* pFrameBuffer(kFrameBufferRefIter->m_spFrameBuffer);
-                    pFrameBuffer->m_pContext->RemoveFrameBuffer(pFrameBuffer, this);
-                    ++kFrameBufferRefIter;
-                }
-
-                delete pContextData;
-            }
-        }
-
-        if (m_kUniqueView.IsValid())
-        {
-            GLuint uUniqueViewName(m_kUniqueView.GetName());
-            glDeleteTextures(1, &uUniqueViewName);
-        }
-    }
-
-    bool SOutputMergerView::AttachFrameBuffer(SFrameBuffer* pFrameBuffer, GLenum eAttachmentID, CContext* pContext)
-    {
-        SContextData* pContextData(m_kContextMap[pFrameBuffer->m_pContext->GetIndex()]);
-        if (pContextData == NULL)
-        {
-            pContextData = new SContextData();
-            m_kContextMap[pFrameBuffer->m_pContext->GetIndex()] = pContextData;
-        }
-
-        TFrameBufferRefs::iterator kFound(std::find(pContextData->m_kBoundFrameBuffers.begin(), pContextData->m_kBoundFrameBuffers.end(), pFrameBuffer));
-        if (kFound == pContextData->m_kBoundFrameBuffers.end())
-        {
-            pContextData->m_kBoundFrameBuffers.push_back(SFrameBufferRef(pFrameBuffer, 1));
-        }
-        else
-        {
-            ++kFound->m_uNumBindings;
-        }
-
-        // Might need to disable PLS off 1st
-        pContext->UpdatePlsState(true);
-
-        return FrameBufferTexture(pFrameBuffer->m_kObject.m_kName.GetName(), eAttachmentID);
-    }
-
-    void SOutputMergerView::DetachFrameBuffer(SFrameBuffer* pFrameBuffer)
-    {
-        SContextData* pContextData(m_kContextMap[pFrameBuffer->m_pContext->GetIndex()]);
-        if (pContextData == NULL)
-        {
-            DXGL_ERROR("Frame buffer context has not been registered to this output merger view");
-            return;
-        }
-
-        TFrameBufferRefs::iterator kFound(std::find(pContextData->m_kBoundFrameBuffers.begin(), pContextData->m_kBoundFrameBuffers.end(), pFrameBuffer));
-        if (kFound != pContextData->m_kBoundFrameBuffers.end())
-        {
-            if (--kFound->m_uNumBindings == 0)
-            {
-                pContextData->m_kBoundFrameBuffers.erase(kFound);
-            }
-        }
-        else
-        {
-            DXGL_ERROR("Could not find the frame buffer to be detached from the view");
-        }
-    }
-
-    bool SOutputMergerView::FrameBufferTexture(GLuint uFrameBuffer, GLenum eAttachmentID)
-    {
-        if (m_kUniqueView.IsValid())
-        {
-            glNamedFramebufferTextureEXT(uFrameBuffer, eAttachmentID, m_kUniqueView.GetName(), 0);
-            return true;
-        }
-        return false;
-    }
-
-    void SOutputMergerView::Bind(const SFrameBuffer&, CContext*)
-    {
-    }
-
-    const GLint SOutputMergerTextureView::INVALID_LAYER = -1;
-
-    SOutputMergerTextureView::SOutputMergerTextureView(STexture* pTexture, const SOutputMergerTextureViewConfiguration& kConfiguration)
-        : SOutputMergerView(CResourceName(), kConfiguration.m_eFormat)
-        , m_kConfiguration(kConfiguration)
-        , m_pTexture(pTexture)
-    {
-        m_pNextView = pTexture->m_pOutputMergerViewsHead;
-        pTexture->m_pOutputMergerViewsHead = this;
-    }
-
-    SOutputMergerTextureView::~SOutputMergerTextureView()
-    {
-        SOutputMergerTextureView*& pLink = m_pTexture->m_pOutputMergerViewsHead;
-        while (pLink != NULL)
-        {
-            if (pLink == this)
-            {
-                pLink = m_pNextView;
-            }
-            else
-            {
-                pLink = pLink->m_pNextView;
-            }
-        }
-    }
-
-    bool SOutputMergerTextureView::Init(CContext* pContext)
-    {
-        m_iMipLevel = (GLint)m_kConfiguration.m_uMipLevel;
-        if (m_kConfiguration.m_uMinLayer == 0 && m_kConfiguration.m_uNumLayers == m_pTexture->m_uNumElements)
-        {
-            m_iLayer = INVALID_LAYER;
-        }
-        else if (m_kConfiguration.m_uNumLayers == 1)
-        {
-            m_iLayer = m_kConfiguration.m_uMinLayer;
-        }
-        else
-        {
-            DXGL_NOT_IMPLEMENTED;
-        }
-
-        if (m_kConfiguration.m_eFormat != m_pTexture->m_eFormat)
-        {
-            const SGIFormatInfo* pFormatInfo;
-            if (m_kConfiguration.m_eFormat == eGIF_NUM ||
-                (pFormatInfo = GetGIFormatInfo(m_kConfiguration.m_eFormat)) == NULL ||
-                pFormatInfo->m_pTexture == NULL)
-            {
-                DXGL_ERROR("Invalid format for output merger view");
-                return false;
-            }
-
-            if (pFormatInfo->m_pTexture->m_iInternalFormat == GetGIFormatInfo(m_pTexture->m_eFormat)->m_pTexture->m_iInternalFormat)
-            {
-                return true;
-            }
-
-            // Frame buffer attachment does not support any kind of in-place conversion - texture view is required unless no conversion is needed at all
-            return CreateUniqueView(pFormatInfo, pContext);
-        }
-
-        return true;
-    }
-
-    bool SOutputMergerTextureView::FrameBufferTexture(GLuint uFrameBuffer, GLenum eAttachmentID)
-    {
-        GLuint uTexture(m_kUniqueView.IsValid() ? m_kUniqueView.GetName() : m_pTexture->m_kName.GetName());
-        if (m_iLayer == INVALID_LAYER)
-        {
-            glNamedFramebufferTextureEXT(uFrameBuffer, eAttachmentID, uTexture, m_iMipLevel);
-        }
-        else
-        {
-            glNamedFramebufferTextureLayerEXT(uFrameBuffer, eAttachmentID, uTexture, m_iMipLevel, m_iLayer);
-        }
-
-        return true;
-    }
-
-    bool SOutputMergerTextureView::CreateUniqueView(const SGIFormatInfo* pFormatInfo, CContext* pContext)
-    {
-        if (pFormatInfo->m_eTypelessFormat != m_pTexture->m_eFormat)
-        {
-            DXGL_ERROR("Output merger view format is not compatible with texture format");
-            return false;
-        }
-
-        m_kUniqueView = CreateTextureView(m_pTexture, pFormatInfo, m_pTexture->m_eTarget, 0, m_pTexture->m_uNumMipLevels, 0, m_pTexture->m_uNumElements, pContext);
-        m_pTexture->m_kCreationFence.IssueWait(pContext);
-        m_kCreationFence.IssueFence(pContext->GetDevice());
-
-        return true;
-    }
-
-    SDefaultFrameBufferOutputMergerView::SDefaultFrameBufferOutputMergerView(SDefaultFrameBufferTexture* pTexture, const SOutputMergerTextureViewConfiguration& kConfiguration)
-        : SOutputMergerTextureView(pTexture, kConfiguration)
-        , m_bUsesTexture(false)
-    {
-    }
-
-    SDefaultFrameBufferOutputMergerView::~SDefaultFrameBufferOutputMergerView()
-    {
-        if (m_bUsesTexture)
-        {
-            static_cast<SDefaultFrameBufferTexture*>(m_pTexture)->DecTextureRefCount();
-        }
-    }
-
-    bool SDefaultFrameBufferOutputMergerView::AttachFrameBuffer(SFrameBuffer* pFrameBuffer, GLenum eAttachmentID, CContext* pContext)
-    {
-        if (!m_bUsesTexture)
-        {
-            static_cast<SDefaultFrameBufferTexture*>(m_pTexture)->IncTextureRefCount(pContext);
-            m_bUsesTexture = true;
-        }
-        return SOutputMergerTextureView::AttachFrameBuffer(pFrameBuffer, eAttachmentID, pContext);
-    }
-
-    void SDefaultFrameBufferOutputMergerView::Bind(const SFrameBuffer& kFrameBuffer, CContext* pContext)
-    {
-        static_cast<SDefaultFrameBufferTexture*>(m_pTexture)->OnWrite(pContext, kFrameBuffer.m_kObject.m_kName.GetName() == 0);
-        SOutputMergerTextureView::Bind(kFrameBuffer, pContext);
-    }
-
-    bool SDefaultFrameBufferOutputMergerView::CreateUniqueView(const SGIFormatInfo* pFormatInfo, CContext* pContext)
-    {
-        if (!m_bUsesTexture)
-        {
-            static_cast<SDefaultFrameBufferTexture*>(m_pTexture)->IncTextureRefCount(pContext);
-            m_bUsesTexture = true;
-        }
-        return SOutputMergerTextureView::CreateUniqueView(pFormatInfo, pContext);
-    }
-
-    SDefaultFrameBufferShaderTextureView::SDefaultFrameBufferShaderTextureView(const SShaderTextureViewConfiguration& kConfiguration)
-        : SShaderTextureView(kConfiguration)
-        , m_bUsesTexture(false)
-    {
-    }
-
-    SDefaultFrameBufferShaderTextureView::~SDefaultFrameBufferShaderTextureView()
-    {
-    }
-
-    bool SDefaultFrameBufferShaderTextureView::BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache)
-    {
-        SDefaultFrameBufferTexture* pDefaultFrameBufferTexture(static_cast<SDefaultFrameBufferTexture*>(m_pTexture));
-        if (!m_bUsesTexture)
-        {
-            pDefaultFrameBufferTexture->IncTextureRefCount(pContext);
-            m_bUsesTexture = true;
-        }
-        pDefaultFrameBufferTexture->OnRead(pContext);
-        return SShaderTextureView::BindTextureUnit(pSamplerState, kContext, pContext, kCurrentUnitCache);
-    }
-
-    template <typename ViewDesc, typename View>
-    struct SResourceViewBaseImpl
-    {
-        typedef ViewDesc TViewDesc;
-        typedef View TView;
-        typedef _smart_ptr<TView> TViewPtr;
-    };
-
-    struct SShaderResourceViewImpl
-        : SResourceViewBaseImpl<D3D11_SHADER_RESOURCE_VIEW_DESC, SShaderView>
-    {
-        enum EViewDimension
-        {
-            DIMENSION_BUFFER           = D3D11_SRV_DIMENSION_BUFFER,
-            DIMENSION_TEXTURE1D        = D3D11_SRV_DIMENSION_TEXTURE1D,
-            DIMENSION_TEXTURE1DARRAY   = D3D11_SRV_DIMENSION_TEXTURE1DARRAY,
-            DIMENSION_TEXTURE2D        = D3D11_SRV_DIMENSION_TEXTURE2D,
-            DIMENSION_TEXTURE2DARRAY   = D3D11_SRV_DIMENSION_TEXTURE2DARRAY,
-            DIMENSION_TEXTURE2DMS      = D3D11_SRV_DIMENSION_TEXTURE2DMS,
-            DIMENSION_TEXTURE2DMSARRAY = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY,
-            DIMENSION_TEXTURE3D        = D3D11_SRV_DIMENSION_TEXTURE3D,
-            DIMENSION_TEXTURECUBE      = D3D11_SRV_DIMENSION_TEXTURECUBE,
-            DIMENSION_TEXTURECUBEARRAY = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY,
-            DIMENSION_BUFFEREX         = D3D11_SRV_DIMENSION_BUFFEREX
-        };
-
-        static SResourceViewBaseImpl::TViewPtr GetView(STexture* pTexture, DXGI_FORMAT eDXGIFormat, GLenum eTarget, uint32 uMinLevel, uint32 uNumLevels, uint32 uMinElement, uint32 uNumElements, CContext* pContext)
-        {
-            SShaderTextureViewConfiguration kConfiguration(GetGIFormat(eDXGIFormat), eTarget, uMinLevel, uNumLevels, uMinElement, uNumElements);
-
-            SShaderTextureView* pExistingView(pTexture->m_pShaderViewsHead);
-            while (pExistingView != NULL)
-            {
-                if (pExistingView->m_kConfiguration == kConfiguration)
-                {
-                    return pExistingView;
-                }
-                pExistingView = pExistingView->m_pNextView;
-            }
-
-            return pTexture->CreateShaderResourceView(kConfiguration, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewMip(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, GLenum eTarget, uint32 uMinElement, uint32 uNumElements, CContext* pContext)
-        {
-            uint32 uNumMipLevels(kDimDesc.MipLevels == -1 ? (pTexture->m_uNumMipLevels - kDimDesc.MostDetailedMip) : kDimDesc.MipLevels);
-            return GetView(pTexture, eDXGIFormat, eTarget, kDimDesc.MostDetailedMip, uNumMipLevels, uMinElement, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, uint32 uMinLevel, uint32 uNumLevels, GLenum eTarget, CContext* pContext)
-        {
-            uint32 uNumElements(kDimDesc.ArraySize == -1 ? (pTexture->m_uNumElements - kDimDesc.FirstArraySlice) : kDimDesc.ArraySize);
-            return GetView(pTexture, eDXGIFormat, eTarget, uMinLevel, uNumLevels, kDimDesc.FirstArraySlice, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewMipLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, GLenum eTarget, CContext* pContext)
-        {
-            uint32 uNumElements(kDimDesc.ArraySize == -1 ? (pTexture->m_uNumElements - kDimDesc.FirstArraySlice) : kDimDesc.ArraySize);
-            return GetViewMip(pTexture, kDimDesc, eDXGIFormat, eTarget, kDimDesc.FirstArraySlice, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetView(SBuffer* pBuffer, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, UINT uFlags, CContext* pContext)
-        {
-            return pBuffer->CreateShaderResourceView(GetGIFormat(eDXGIFormat), kDimDesc.FirstElement, kDimDesc.NumElements, uFlags, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewEx(SBuffer* pBuffer, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, CContext* pContext)
-        {
-            return GetView(pBuffer, kDimDesc, eDXGIFormat, kDimDesc.Flags, pContext);
-        }
-    };
-
-    struct SUnorderedAccessViewImpl
-        : SResourceViewBaseImpl<D3D11_UNORDERED_ACCESS_VIEW_DESC, SShaderView>
-    {
-        enum EViewDimension
-        {
-            DIMENSION_BUFFER           = D3D11_UAV_DIMENSION_BUFFER,
-            DIMENSION_TEXTURE1D        = D3D11_UAV_DIMENSION_TEXTURE1D,
-            DIMENSION_TEXTURE1DARRAY   = D3D11_UAV_DIMENSION_TEXTURE1DARRAY,
-            DIMENSION_TEXTURE2D        = D3D11_UAV_DIMENSION_TEXTURE2D,
-            DIMENSION_TEXTURE2DARRAY   = D3D11_UAV_DIMENSION_TEXTURE2DARRAY,
-            DIMENSION_TEXTURE3D        = D3D11_UAV_DIMENSION_TEXTURE3D,
-        };
-
-        static SResourceViewBaseImpl::TViewPtr GetView(STexture* pTexture, DXGI_FORMAT eDXGIFormat, GLenum eTarget, uint32 uMipSlice, uint32 uMinElement, uint32 uNumElements, CContext* pContext)
-        {
-            EGIFormat eGIFormat(GetGIFormat(eDXGIFormat));
-            GLenum eImageFormat(GL_NONE);
-            if (!GetImageFormat(eGIFormat, &eImageFormat))
-            {
-                DXGL_ERROR("Unsupported format for unordered access view");
-                return NULL;
-            }
-
-            if (uMinElement == 0 && uNumElements == pTexture->m_uNumElements)
-            {
-                SShaderImageViewConfiguration kConfiguration(eImageFormat, (GLint)uMipSlice, -1, GL_READ_WRITE);
-                return pTexture->CreateUnorderedAccessView(kConfiguration, pContext);
-            }
-            else if (uNumElements == 1)
-            {
-                SShaderImageViewConfiguration kConfiguration(eImageFormat, (GLint)uMipSlice, uMinElement, GL_READ_WRITE);
-                return pTexture->CreateUnorderedAccessView(kConfiguration, pContext);
-            }
-            else
-            {
-                // Need to first create a proxy view containing only the selected layers
-                SShaderTextureViewConfiguration kProxyConfiguration(pTexture->m_eFormat, eTarget, uMipSlice, 1, uMinElement, uNumElements);
-                SShaderTextureViewPtr spProxyTextureView(pTexture->CreateShaderResourceView(kProxyConfiguration, pContext));
-                if (spProxyTextureView == NULL)
-                {
-                    return NULL;
-                }
-
-                SShaderImageViewConfiguration kConfiguration(eImageFormat, (GLint)uMipSlice, -1, GL_READ_WRITE);
-                SShaderImageViewPtr spImageView(new SShaderImageView(kConfiguration));
-                if (!spImageView->Init(spProxyTextureView, pContext))
-                {
-                    return NULL;
-                }
-
-                return spImageView;
-            }
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewMip(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, GLenum eTarget, uint32 uMinElement, uint32 uNumElements, CContext* pContext)
-        {
-            return GetView(pTexture, eDXGIFormat, eTarget, kDimDesc.MipSlice, uMinElement, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, uint32 uMipSlice, GLenum eTarget, CContext* pContext)
-        {
-            uint32 uNumElements(kDimDesc.ArraySize == -1 ? (pTexture->m_uNumElements - kDimDesc.FirstArraySlice) : kDimDesc.ArraySize);
-            return GetView(pTexture, eDXGIFormat, eTarget, uMipSlice, kDimDesc.FirstArraySlice, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewMipLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, GLenum eTarget, CContext* pContext)
-        {
-            uint32 uNumElements(kDimDesc.ArraySize == -1 ? (pTexture->m_uNumElements - kDimDesc.FirstArraySlice) : kDimDesc.ArraySize);
-            return GetViewMip(pTexture, kDimDesc, eDXGIFormat, eTarget, kDimDesc.FirstArraySlice, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetView(SBuffer* pBuffer, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, UINT uFlags, CContext* pContext)
-        {
-            return pBuffer->CreateUnorderedAccessView(GetGIFormat(eDXGIFormat), kDimDesc.FirstElement, kDimDesc.NumElements, uFlags, pContext);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewEx(SBuffer* pBuffer, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, CContext* pContext)
-        {
-            return GetView(pBuffer, kDimDesc, eDXGIFormat, kDimDesc, kDimDesc.Flags);
-        }
-    };
-
-    template <typename ViewDesc>
-    struct SOutputMergerViewImpl
-        : SResourceViewBaseImpl<ViewDesc, SOutputMergerView>
-    {
-        static typename SOutputMergerViewImpl::TViewPtr GetView(STexture* pTexture, DXGI_FORMAT eDXGIFormat, GLenum, uint32 uMipLevel, uint32, uint32 uMinElement, uint32 uNumElements, CContext* pContext)
-        {
-            return pTexture->GetCompatibleOutputMergerView(SOutputMergerTextureViewConfiguration(GetGIFormat(eDXGIFormat), uMipLevel, uMinElement, uNumElements), pContext);
-        }
-
-        template <typename DimDesc>
-        static typename SOutputMergerViewImpl::TViewPtr GetViewMip(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, GLenum eTarget, uint32 uMinElement, uint32 uNumElements, CContext* pContext)
-        {
-            return GetView(pTexture, eDXGIFormat, eTarget, kDimDesc.MipSlice, 1, uMinElement, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static typename SOutputMergerViewImpl::TViewPtr GetViewLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, GLenum eTarget, uint32 uMinLevel, uint32 uNumLevels, CContext* pContext)
-        {
-            uint32 uNumElements(kDimDesc.ArraySize == -1 ? (pTexture->m_uNumElements - kDimDesc.FirstArraySlice) : kDimDesc.ArraySize);
-            return GetView(pTexture, eDXGIFormat, eTarget, uMinLevel, uNumLevels, kDimDesc.FirstArraySlice, uNumElements, pContext);
-        }
-
-        template <typename DimDesc>
-        static typename SOutputMergerViewImpl::TViewPtr GetViewMipLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, GLenum eTarget, CContext* pContext)
-        {
-            uint32 uNumElements(kDimDesc.ArraySize == -1 ? (pTexture->m_uNumElements - kDimDesc.FirstArraySlice) : kDimDesc.ArraySize);
-            return GetViewMip(pTexture, kDimDesc, eDXGIFormat, eTarget, kDimDesc.FirstArraySlice, uNumElements, pContext);
-        }
-    };
-
-    struct SRenderTargetViewImpl
-        : SOutputMergerViewImpl<D3D11_RENDER_TARGET_VIEW_DESC>
-    {
-        enum EViewDimension
-        {
-            DIMENSION_BUFFER           = D3D11_RTV_DIMENSION_BUFFER,
-            DIMENSION_TEXTURE1D        = D3D11_RTV_DIMENSION_TEXTURE1D,
-            DIMENSION_TEXTURE1DARRAY   = D3D11_RTV_DIMENSION_TEXTURE1DARRAY,
-            DIMENSION_TEXTURE2D        = D3D11_RTV_DIMENSION_TEXTURE2D,
-            DIMENSION_TEXTURE2DARRAY   = D3D11_RTV_DIMENSION_TEXTURE2DARRAY,
-            DIMENSION_TEXTURE2DMS      = D3D11_RTV_DIMENSION_TEXTURE2DMS,
-            DIMENSION_TEXTURE2DMSARRAY = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY,
-            DIMENSION_TEXTURE3D        = D3D11_RTV_DIMENSION_TEXTURE3D
-        };
-    };
-
-    struct SDepthStencilViewImpl
-        : SOutputMergerViewImpl<D3D11_DEPTH_STENCIL_VIEW_DESC>
-    {
-        enum EViewDimension
-        {
-            DIMENSION_TEXTURE1D        = D3D11_DSV_DIMENSION_TEXTURE1D,
-            DIMENSION_TEXTURE1DARRAY   = D3D11_DSV_DIMENSION_TEXTURE1DARRAY,
-            DIMENSION_TEXTURE2D        = D3D11_DSV_DIMENSION_TEXTURE2D,
-            DIMENSION_TEXTURE2DARRAY   = D3D11_DSV_DIMENSION_TEXTURE2DARRAY,
-            DIMENSION_TEXTURE2DMS      = D3D11_DSV_DIMENSION_TEXTURE2DMS,
-            DIMENSION_TEXTURE2DMSARRAY = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY,
-        };
-    };
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTexture1DView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CContext* pContext)
-    {
-        switch (static_cast<typename Impl::EViewDimension>(kViewDesc.ViewDimension))
-        {
-        case Impl::DIMENSION_TEXTURE1D:
-            return Impl::GetViewMip(pTexture,       kViewDesc.Texture1D,      kViewDesc.Format, GL_TEXTURE_1D,       0, 1, pContext);
-        case Impl::DIMENSION_TEXTURE1DARRAY:
-            return Impl::GetViewMipLayers(pTexture, kViewDesc.Texture1DArray, kViewDesc.Format, GL_TEXTURE_1D_ARRAY,       pContext);
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTexture2DView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CContext* pContext)
-    {
-        switch (static_cast<typename Impl::EViewDimension>(kViewDesc.ViewDimension))
-        {
-        case Impl::DIMENSION_TEXTURE2D:
-            return Impl::GetViewMip(pTexture,       kViewDesc.Texture2D,        kViewDesc.Format, GL_TEXTURE_2D,                   0, 1,       pContext);
-        case Impl::DIMENSION_TEXTURE2DARRAY:
-            return Impl::GetViewMipLayers(pTexture, kViewDesc.Texture2DArray,   kViewDesc.Format, GL_TEXTURE_2D_ARRAY,                         pContext);
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTexture2DMSView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CContext* pContext)
-    {
-        if (pContext->GetDevice()->IsFeatureSupported(eF_MultiSampledTextures))
-        {
-            switch (static_cast<typename Impl::EViewDimension>(kViewDesc.ViewDimension))
-            {
-#if DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-            case Impl::DIMENSION_TEXTURE2DMS:
-                return Impl::GetView(pTexture, kViewDesc.Format, GL_TEXTURE_2D_MULTISAMPLE, 0, 1, 0, 1, pContext);
-    #if !DXGLES
-            case Impl::DIMENSION_TEXTURE2DMSARRAY:
-                return Impl::GetViewLayers(pTexture, kViewDesc.Texture2DMSArray, kViewDesc.Format, GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 0, 1, pContext);
-    #endif //!DXGLES
-#endif //DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-            }
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTextureCubeView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CContext* pContext)
-    {
-        switch (static_cast<D3D_SRV_DIMENSION>(kViewDesc.ViewDimension))
-        {
-        case D3D11_SRV_DIMENSION_TEXTURECUBE:
-            return Impl::GetViewMip(pTexture, kViewDesc.TextureCube, kViewDesc.Format, GL_TEXTURE_CUBE_MAP, 0, 6, pContext);
-#if DXGL_SUPPORT_CUBEMAP_ARRAYS
-        case D3D11_SRV_DIMENSION_TEXTURECUBEARRAY:
-            return Impl::GetViewMip(pTexture, kViewDesc.TextureCubeArray, kViewDesc.Format, GL_TEXTURE_CUBE_MAP_ARRAY, kViewDesc.TextureCubeArray.First2DArrayFace, 6 * kViewDesc.TextureCubeArray.NumCubes - kViewDesc.TextureCubeArray.First2DArrayFace, pContext);
-#endif //DXGL_SUPPORT_CUBEMAP_ARRAYS
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTexture3DView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CContext* pContext)
-    {
-        if ((uint32)kViewDesc.ViewDimension == (uint32)Impl::DIMENSION_TEXTURE3D)
-        {
-            return Impl::GetViewMip(pTexture, kViewDesc.Texture3D, kViewDesc.Format, GL_TEXTURE_3D, 0, 1, pContext);
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetBufferView(SBuffer* pBuffer, const typename Impl::TViewDesc& kViewDesc, CContext* pContext)
-    {
-        if ((uint32)kViewDesc.ViewDimension == (uint32)Impl::DIMENSION_BUFFER)
-        {
-            return Impl::GetView(pBuffer, kViewDesc.Buffer, kViewDesc.Format, 0, pContext);
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetBufferViewEx(SBuffer* pBuffer, const typename Impl::TViewDesc& kViewDesc, CContext* pContext)
-    {
-        if ((uint32)kViewDesc.ViewDimension == (uint32)Impl::DIMENSION_BUFFEREX)
-        {
-            return Impl::GetViewEx(pBuffer, kViewDesc.BufferEx, kViewDesc.Format, pContext);
-        }
-        return NULL;
-    }
-
-    SShaderViewPtr CreateShaderResourceView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_SHADER_RESOURCE_VIEW_DESC& kViewDesc, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateShaderResourceView")
-
-        typedef SShaderResourceViewImpl TImpl;
-        SShaderViewPtr spView;
-        switch (eDimension)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-            spView = GetTexture1DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-            spView = GetTexture2DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            if (spView == NULL)
-            {
-                spView = GetTexture2DMSView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            }
-            if (spView == NULL)
-            {
-                spView = GetTextureCubeView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            }
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            spView = GetTexture3DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            spView = GetBufferView<TImpl>(static_cast<SBuffer*>(pResource), kViewDesc, pContext);
-            if (spView == NULL)
-            {
-                spView = GetBufferViewEx<TImpl>(static_cast<SBuffer*>(pResource), kViewDesc, pContext);
-            }
-            break;
-        default:
-            DXGL_ERROR("Invalid resource dimension for shader resource");
-            return NULL;
-        }
-
-        if (spView == NULL)
-        {
-            DXGL_ERROR("Invalid shader resource view parameters");
-        }
-        return spView;
-    }
-
-    SShaderViewPtr CreateUnorderedAccessView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_UNORDERED_ACCESS_VIEW_DESC& kViewDesc, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateShaderResourceView")
-
-        typedef SUnorderedAccessViewImpl TImpl;
-        SShaderViewPtr spView;
-        switch (eDimension)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-            spView = GetTexture1DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-            spView = GetTexture2DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            spView = GetTexture3DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            spView = GetBufferView<TImpl>(static_cast<SBuffer*>(pResource), kViewDesc, pContext);
-            break;
-        default:
-            DXGL_ERROR("Invalid resource dimension for shader resource");
-            return NULL;
-        }
-
-        if (spView == NULL)
-        {
-            DXGL_ERROR("Invalid shader resource view parameters");
-        }
-        return spView;
-    }
-
-    SOutputMergerViewPtr CreateRenderTargetView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_RENDER_TARGET_VIEW_DESC& kViewDesc, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateRenderTargetView")
-
-        typedef SRenderTargetViewImpl TImpl;
-        SOutputMergerViewPtr spView;
-        switch (eDimension)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-            spView = GetTexture1DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-            spView = GetTexture2DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            if (spView == NULL)
-            {
-                spView = GetTexture2DMSView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            }
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            spView = GetTexture3DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        default:
-            DXGL_ERROR("Invalid resource dimension for render target");
-            return NULL;
-        }
-        if (spView == NULL)
-        {
-            DXGL_ERROR("Invalid resource dimension for render target");
-        }
-        return spView;
-    }
-
-    SOutputMergerViewPtr CreateDepthStencilView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_DEPTH_STENCIL_VIEW_DESC& kViewDesc, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CreateDepthStencilView")
-
-        typedef SDepthStencilViewImpl TImpl;
-        SOutputMergerViewPtr spView;
-        switch (eDimension)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-            spView = GetTexture1DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-            spView = GetTexture2DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            if (spView == NULL)
-            {
-                spView = GetTexture2DMSView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pContext);
-            }
-            break;
-        default:
-            DXGL_ERROR("Invalid resource dimension for depth stencil");
-            return NULL;
-        }
-        if (spView == NULL)
-        {
-            DXGL_ERROR("Invalid resource dimension for depth stencil");
-        }
-        return spView;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLView.hpp
deleted file mode 100644
index e0a05bec6f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLView.hpp
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the resource view types and related functions
-
-
-#ifndef __GLVIEW__
-#define __GLVIEW__
-
-#include "GLResource.hpp"
-
-namespace NCryOpenGL
-{
-    struct SShaderTextureViewConfiguration
-    {
-        EGIFormat m_eFormat;
-        GLenum m_eTarget;
-        uint32 m_uMinMipLevel;
-        uint32 m_uNumMipLevels;
-        uint32 m_uMinLayer;
-        uint32 m_uNumLayers;
-
-        SShaderTextureViewConfiguration(EGIFormat eFormat, GLenum eTarget, uint32 uMinMipLevel, uint32 uNumMipLevels, uint32 uMinLayer, uint32 uNumLayers)
-            : m_eFormat(eFormat)
-            , m_eTarget(eTarget)
-            , m_uMinMipLevel(uMinMipLevel)
-            , m_uNumMipLevels(uNumMipLevels)
-            , m_uMinLayer(uMinLayer)
-            , m_uNumLayers(uNumLayers)
-        {
-        }
-
-        bool operator==(const SShaderTextureViewConfiguration& kOther)
-        {
-            return
-                m_eFormat       == kOther.m_eFormat &&
-                m_eTarget       == kOther.m_eTarget &&
-                m_uMinMipLevel  == kOther.m_uMinMipLevel &&
-                m_uNumMipLevels == kOther.m_uNumMipLevels &&
-                m_uMinLayer     == kOther.m_uMinLayer &&
-                m_uNumLayers    == kOther.m_uNumLayers;
-        }
-    };
-
-    struct SShaderTextureBufferViewConfiguration
-    {
-        EGIFormat m_eFormat;
-        uint32 m_uFirstElement;
-        uint32 m_uNumElements;
-
-        SShaderTextureBufferViewConfiguration(EGIFormat eFormat, uint32 uFirstElement, uint32 uNumElements)
-            : m_eFormat(eFormat)
-            , m_uFirstElement(uFirstElement)
-            , m_uNumElements(uNumElements)
-        {
-        }
-
-        bool operator==(const SShaderTextureBufferViewConfiguration& kOther)
-        {
-            return
-                m_eFormat        == kOther.m_eFormat &&
-                m_uFirstElement  == kOther.m_uFirstElement &&
-                m_uNumElements   == kOther.m_uNumElements;
-        }
-    };
-
-    struct SShaderImageViewConfiguration
-    {
-        GLint m_iLevel;
-        GLint m_iLayer; // -1 for all layers
-        GLenum m_eAccess;
-        GLenum m_eFormat;
-
-        SShaderImageViewConfiguration()
-            : m_iLevel(0)
-            , m_iLayer(-1)
-            , m_eAccess(GL_NONE)
-            , m_eFormat(GL_NONE)
-        {
-        }
-
-        SShaderImageViewConfiguration(GLenum eFormat, GLint iLevel, GLint iLayer, GLenum eAccess)
-            : m_eFormat(eFormat)
-            , m_iLevel(iLevel)
-            , m_iLayer(iLayer)
-            , m_eAccess(eAccess)
-        {
-        }
-
-        bool operator==(const SShaderImageViewConfiguration& kOther)
-        {
-            return
-                m_iLevel  == kOther.m_iLevel &&
-                m_iLayer  == kOther.m_iLayer &&
-                m_eAccess == kOther.m_eAccess &&
-                m_eFormat == kOther.m_eFormat;
-        }
-
-        bool operator!=(const SShaderImageViewConfiguration& kOther)
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    struct SOutputMergerTextureViewConfiguration
-    {
-        EGIFormat m_eFormat;
-        uint32 m_uMipLevel;
-        uint32 m_uMinLayer;
-        uint32 m_uNumLayers;
-
-        SOutputMergerTextureViewConfiguration(EGIFormat eFormat, uint32 uMipLevel, uint32 uMinLayer, uint32 uNumLayers)
-            : m_eFormat(eFormat)
-            , m_uMipLevel(uMipLevel)
-            , m_uMinLayer(uMinLayer)
-            , m_uNumLayers(uNumLayers)
-        {
-        }
-
-        bool operator==(const SOutputMergerTextureViewConfiguration& kOther)
-        {
-            return
-                m_eFormat == kOther.m_eFormat &&
-                m_uMipLevel == kOther.m_uMipLevel &&
-                m_uMinLayer == kOther.m_uMinLayer &&
-                m_uNumLayers == kOther.m_uNumLayers;
-        }
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SShaderView)
-    {
-        enum Type
-        {
-            eSVT_Buffer,
-            eSVT_Texture,
-            eSVT_Image
-        };
-
-        SShaderView(Type eType);
-        virtual ~SShaderView();
-
-        CResourceName m_kName;
-        SSharingFence m_kCreationFence;
-        Type m_eType;
-    };
-
-    struct SShaderBufferView
-        : SShaderView
-    {
-        SShaderBufferView(const SBufferRange& kRange);
-        virtual ~SShaderBufferView();
-
-        void Init(SBuffer* pBuffer, CContext* pContext);
-
-        SBufferRange m_kRange;
-    };
-
-    struct SShaderTextureBasedView
-        : SShaderView
-    {
-        SShaderTextureBasedView(Type eType);
-        virtual ~SShaderTextureBasedView();
-
-        virtual bool BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache);
-        virtual bool GenerateMipmaps(CContext* pContext);
-
-        bool m_bTextureOwned;
-
-        bool m_bFormatRequiresUniqueView;
-    };
-
-    struct SShaderTextureBufferView
-        : SShaderTextureBasedView
-    {
-        SShaderTextureBufferView(const SShaderTextureBufferViewConfiguration& kConfiguration);
-        virtual ~SShaderTextureBufferView();
-
-        bool Init(SBuffer* pBuffer, CContext* pContext);
-
-        virtual bool BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache);
-
-        SBuffer* m_pBuffer;
-        SShaderTextureBufferViewConfiguration m_kConfiguration;
-        SShaderTextureBufferView* m_pNextView;
-    };
-
-    struct SShaderTextureView
-        : SShaderTextureBasedView
-    {
-        SShaderTextureView(const SShaderTextureViewConfiguration& kConfiguration);
-        virtual ~SShaderTextureView();
-
-        bool Init(STexture* pTexture, CContext* pContext);
-        bool CreateUniqueView(CContext* pContext);
-
-        virtual bool BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache);
-        virtual bool GenerateMipmaps(CContext* pContext);
-
-        STexture* m_pTexture;
-        SShaderTextureViewConfiguration m_kConfiguration;
-        STextureState m_kViewState;
-        SShaderTextureView* m_pNextView;
-    };
-
-    struct SShaderImageView
-        : SShaderTextureBasedView
-    {
-        SShaderImageView(const SShaderImageViewConfiguration& kConfiguration);
-        virtual ~SShaderImageView();
-
-        bool Init(STexture* pTexture, CContext* pContext);
-        bool Init(SShaderTextureBasedView* pTextureBufferView, CContext* pContext);
-
-        SShaderImageViewConfiguration m_kConfiguration;
-        SShaderViewPtr m_spAuxiliaryView;
-    };
-
-    struct SOutputMergerTextureView;
-
-    DXGL_DECLARE_REF_COUNTED(struct, SOutputMergerView)
-    {
-        SOutputMergerView(const CResourceName&kUniqueView, EGIFormat eFormat);
-        virtual ~SOutputMergerView();
-
-        virtual bool AttachFrameBuffer(SFrameBuffer * pFrameBuffer, GLenum eAttachmentID, CContext * pContext);
-        virtual void DetachFrameBuffer(SFrameBuffer * pFrameBuffer);
-
-        virtual bool FrameBufferTexture(GLuint uFrameBuffer, GLenum eAttachmentID);
-
-        virtual void Bind(const SFrameBuffer&kFrameBuffer, CContext * pContext);
-
-        struct SFrameBufferRef
-        {
-            SFrameBufferPtr m_spFrameBuffer;
-            uint32 m_uNumBindings;
-
-            SFrameBufferRef(SFrameBuffer* pFrameBuffer, uint32 uNumBindings)
-                : m_spFrameBuffer(pFrameBuffer)
-                , m_uNumBindings(uNumBindings)
-            {
-            }
-
-            bool operator==(const SFrameBuffer* pOther)
-            {
-                return m_spFrameBuffer == pOther;
-            }
-        };
-
-        typedef std::vector<SFrameBufferRef> TFrameBufferRefs;
-
-        struct SContextData
-        {
-            TFrameBufferRefs m_kBoundFrameBuffers;
-        };
-
-        typedef SContextData* TContextMap[MAX_NUM_CONTEXT_PER_DEVICE];
-
-        CResourceName m_kUniqueView;
-        EGIFormat m_eFormat;
-        TContextMap m_kContextMap;
-        SSharingFence m_kCreationFence;
-
-#if defined(ANDROID) || defined(DXGL_USE_LAZY_CLEAR)
-        virtual SOutputMergerTextureView* AsSOutputMergerTextureView() { return NULL; }
-#endif
-    };
-
-    struct SOutputMergerTextureView
-        : SOutputMergerView
-    {
-        SOutputMergerTextureView(STexture* pTexture, const SOutputMergerTextureViewConfiguration& kConfiguration);
-        virtual ~SOutputMergerTextureView();
-
-        bool Init(CContext* pContext);
-
-        virtual bool FrameBufferTexture(GLuint uFrameBuffer, GLenum eAttachmentID);
-        virtual bool CreateUniqueView(const SGIFormatInfo* pFormatInfo, CContext* pContext);
-
-        STexture* m_pTexture;
-        SOutputMergerTextureViewConfiguration m_kConfiguration;
-        SOutputMergerTextureView* m_pNextView;
-        GLint m_iMipLevel;
-        GLint m_iLayer; //INVALID_LAYER for all layers
-
-        static const GLint INVALID_LAYER;
-
-#if defined(ANDROID) || defined(DXGL_USE_LAZY_CLEAR)
-        virtual SOutputMergerTextureView* AsSOutputMergerTextureView() { return this; }
-#endif
-    };
-
-    struct SDefaultFrameBufferOutputMergerView
-        : SOutputMergerTextureView
-    {
-        SDefaultFrameBufferOutputMergerView(SDefaultFrameBufferTexture* pTexture, const SOutputMergerTextureViewConfiguration& kConfiguration);
-        virtual ~SDefaultFrameBufferOutputMergerView();
-
-        virtual bool AttachFrameBuffer(SFrameBuffer* pFrameBuffer, GLenum eAttachmentID, CContext* pContext);
-        virtual void Bind(const SFrameBuffer& kFrameBuffer, CContext* pContext);
-        virtual bool CreateUniqueView(const SGIFormatInfo* pFormatInfo, CContext* pContext);
-
-        bool m_bUsesTexture;
-    };
-
-    struct SDefaultFrameBufferShaderTextureView
-        : SShaderTextureView
-    {
-        SDefaultFrameBufferShaderTextureView(const SShaderTextureViewConfiguration& kConfiguration);
-        virtual ~SDefaultFrameBufferShaderTextureView();
-
-        virtual bool BindTextureUnit(SSamplerState* pSamplerState, STextureUnitContext& kContext, CContext* pContext, const STextureUnitCache& kCurrentUnitCache);
-
-        bool m_bUsesTexture;
-    };
-
-
-    SShaderViewPtr CreateShaderResourceView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_SHADER_RESOURCE_VIEW_DESC& kViewDesc, CContext* pContext);
-    SShaderViewPtr CreateUnorderedAccessView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_UNORDERED_ACCESS_VIEW_DESC& kViewDesc, CContext* pContext);
-    SOutputMergerViewPtr CreateRenderTargetView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_RENDER_TARGET_VIEW_DESC& kViewDesc, CContext* pContext);
-    SOutputMergerViewPtr CreateDepthStencilView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_DEPTH_STENCIL_VIEW_DESC& kViewDesc, CContext* pContext);
-}
-
-#endif //__GLVIEW__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBase.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBase.cpp
deleted file mode 100644
index 73471bb918..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBase.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the reference counted base class for all
-//               DXGL interface implementations
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLBase.hpp"
-#include "../Implementation/GLCommon.hpp"
-
-CCryDXGLBase::CCryDXGLBase()
-    : m_uRefCount(1)
-{
-    DXGL_INITIALIZE_INTERFACE(Unknown);
-}
-
-CCryDXGLBase::~CCryDXGLBase()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of IUnknown
-////////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-SAggregateNode& CCryDXGLBase::GetAggregateHead()
-{
-    return m_kAggregateHead;
-}
-
-#else
-
-HRESULT CCryDXGLBase::QueryInterface(REFIID riid, void** ppvObject)
-{
-    return E_NOINTERFACE;
-}
-
-#endif
-
-ULONG CCryDXGLBase::AddRef(void)
-{
-    return ++m_uRefCount;
-}
-
-ULONG CCryDXGLBase::Release(void)
-{
-    --m_uRefCount;
-    if (m_uRefCount == 0)
-    {
-        delete this;
-        return 0;
-    }
-    return m_uRefCount;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLPrivateDataContainer
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLPrivateDataContainer::SPrivateData
-{
-    union
-    {
-        uint8* m_pBuffer;
-        IUnknown* m_pInterface;
-    };
-    uint32 m_uSize;
-    bool m_bInterface;
-
-    SPrivateData(const void* pData, uint32 uSize)
-    {
-        m_pBuffer = new uint8[uSize];
-        m_uSize = uSize;
-        m_bInterface = false;
-        memcpy(m_pBuffer, pData, uSize);
-    }
-
-    SPrivateData(IUnknown* pInterface)
-    {
-        pInterface->AddRef();
-        m_pInterface = pInterface;
-        m_uSize = sizeof(IUnknown*);
-        m_bInterface = true;
-    }
-
-    ~SPrivateData()
-    {
-        if (m_bInterface)
-        {
-            m_pInterface->Release();
-        }
-        else
-        {
-            delete [] m_pBuffer;
-        }
-    }
-};
-
-CCryDXGLPrivateDataContainer::CCryDXGLPrivateDataContainer()
-{
-}
-
-CCryDXGLPrivateDataContainer::~CCryDXGLPrivateDataContainer()
-{
-    TPrivateDataMap::iterator kPrivateIter(m_kPrivateDataMap.begin());
-    TPrivateDataMap::iterator kPrivateEnd(m_kPrivateDataMap.end());
-    for (; kPrivateIter != kPrivateEnd; ++kPrivateIter)
-    {
-        delete kPrivateIter->second;
-    }
-}
-
-HRESULT CCryDXGLPrivateDataContainer::GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData)
-{
-    if (pData == NULL)
-    {
-        if (*pDataSize != 0)
-        {
-            return E_FAIL;
-        }
-        RemovePrivateData(guid);
-    }
-    else
-    {
-        assert(pDataSize != NULL);
-        TPrivateDataMap::const_iterator kFound(m_kPrivateDataMap.find(guid));
-        if (kFound == m_kPrivateDataMap.end() || *pDataSize < kFound->second->m_uSize)
-        {
-            return E_FAIL;
-        }
-
-        if (kFound->second->m_bInterface)
-        {
-            kFound->second->m_pInterface->AddRef();
-            *static_cast<IUnknown**>(pData) = kFound->second->m_pInterface;
-        }
-        else
-        {
-            memcpy(pData, kFound->second->m_pBuffer, kFound->second->m_uSize);
-        }
-        *pDataSize = kFound->second->m_uSize;
-    }
-
-    return S_OK;
-}
-
-HRESULT CCryDXGLPrivateDataContainer::SetPrivateData(REFGUID guid, UINT DataSize, const void* pData)
-{
-    RemovePrivateData(guid);
-
-    m_kPrivateDataMap.insert(TPrivateDataMap::value_type(guid, new SPrivateData(pData, DataSize)));
-    return S_OK;
-}
-
-HRESULT CCryDXGLPrivateDataContainer::SetPrivateDataInterface(REFGUID guid, const IUnknown* pData)
-{
-    RemovePrivateData(guid);
-
-    m_kPrivateDataMap.insert(TPrivateDataMap::value_type(guid, new SPrivateData(const_cast<IUnknown*>(pData))));    // The specification requires that IUnknown::AddRef, Release are called on pData thus the const cast
-    return S_OK;
-}
-
-void CCryDXGLPrivateDataContainer::RemovePrivateData(REFGUID guid)
-{
-    TPrivateDataMap::iterator kFound(m_kPrivateDataMap.find(guid));
-    if (kFound != m_kPrivateDataMap.end())
-    {
-        delete kFound->second;
-        m_kPrivateDataMap.erase(kFound);
-    }
-}
-
-size_t CCryDXGLPrivateDataContainer::SGuidHashCompare::operator()(const GUID& kGuid) const
-{
-    return (size_t)NCryOpenGL::GetCRC32(&kGuid, sizeof(kGuid));
-}
-
-bool CCryDXGLPrivateDataContainer::SGuidHashCompare::operator()(const GUID& kLeft, const GUID& kRight) const
-{
-    return memcmp(&kLeft, &kRight, sizeof(kLeft)) == 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBase.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBase.hpp
deleted file mode 100644
index df00da6811..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBase.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description: Declaration of the reference counted base class for all
-//              DXGL interface implementations
-
-#ifndef __CRYDXGLBASE__
-#define __CRYDXGLBASE__
-
-#include "../Definitions/CryDXGLGuid.hpp"
-#include "../Definitions/ICryDXGLUnknown.hpp"
-
-template <typename Interface>
-struct SingleInterface
-{
-    template <typename Object>
-    static bool Query(Object* pThis, REFIID riid, void** ppvObject)
-    {
-        if (riid == __uuidof(Interface))
-        {
-            *reinterpret_cast<Interface**>(ppvObject) = static_cast<Interface*>(pThis);
-            static_cast<Interface*>(pThis)->AddRef();
-            return true;
-        }
-        return false;
-    }
-};
-
-#include "DXEmulation.hpp"
-
-////////////////////////////////////////////////////////////////////////////
-// Definition of basic types
-////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLBase
-#if !DXGL_FULL_EMULATION
-    : public IUnknown
-#endif //!DXGL_FULL_EMULATION
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBase, Unknown)
-
-    CCryDXGLBase();
-    virtual ~CCryDXGLBase();
-
-#if DXGL_FULL_EMULATION
-    SAggregateNode& GetAggregateHead();
-#else
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-#endif //!DXGL_FULL_EMULATION
-    ULONG STDMETHODCALLTYPE AddRef();
-    ULONG STDMETHODCALLTYPE Release();
-protected:
-    uint32 m_uRefCount;
-#if DXGL_FULL_EMULATION
-    SAggregateNode m_kAggregateHead;
-#endif //DXGL_FULL_EMULATION
-};
-
-class CCryDXGLPrivateDataContainer
-{
-public:
-    CCryDXGLPrivateDataContainer();
-    ~CCryDXGLPrivateDataContainer();
-
-    HRESULT GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData);
-    HRESULT SetPrivateData(REFGUID guid, UINT DataSize, const void* pData);
-    HRESULT SetPrivateDataInterface(REFGUID guid, const IUnknown* pData);
-protected:
-    void RemovePrivateData(REFGUID guid);
-protected:
-    struct SPrivateData;
-
-    struct SGuidHashCompare
-    {
-        size_t operator()(const GUID& kGuid) const;
-        bool operator()(const GUID& kLeft, const GUID& kRight) const;
-    };
-
-    typedef AZStd::unordered_map<GUID, SPrivateData*, SGuidHashCompare, SGuidHashCompare> TPrivateDataMap;
-    TPrivateDataMap m_kPrivateDataMap;
-};
-
-#endif //__CRYDXGLBASE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlendState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlendState.cpp
deleted file mode 100644
index 4c9e0e60f4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlendState.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11BlendState
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLBlendState.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/GLDevice.hpp"
-
-CCryDXGLBlendState::CCryDXGLBlendState(const D3D11_BLEND_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_pGLState(new NCryOpenGL::SBlendState)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11BlendState)
-}
-
-CCryDXGLBlendState::~CCryDXGLBlendState()
-{
-    delete m_pGLState;
-}
-
-bool CCryDXGLBlendState::Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext)
-{
-    return NCryOpenGL::InitializeBlendState(m_kDesc, *m_pGLState, pContext);
-}
-
-bool CCryDXGLBlendState::Apply(NCryOpenGL::CContext* pContext)
-{
-    return pContext->SetBlendState(*m_pGLState);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11BlendState
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLBlendState::GetDesc(D3D11_BLEND_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlendState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlendState.hpp
deleted file mode 100644
index c53f497800..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlendState.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11BlendState
-
-#ifndef __CRYDXGLBLENDSTATE__
-#define __CRYDXGLBLENDSTATE__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    struct SBlendState;
-    class CContext;
-}
-
-class CCryDXGLBlendState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBlendState, D3D11BlendState)
-
-    CCryDXGLBlendState(const D3D11_BLEND_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLBlendState();
-
-    bool Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext);
-    bool Apply(NCryOpenGL::CContext* pContext);
-
-    // Implementation of ID3D11BlendState
-    void GetDesc(D3D11_BLEND_DESC* pDesc);
-protected:
-    D3D11_BLEND_DESC m_kDesc;
-    NCryOpenGL::SBlendState* m_pGLState;
-};
-
-#endif //__CRYDXGLBLENDSTATE__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlob.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlob.cpp
deleted file mode 100644
index 30a46abb9e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlob.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D10Blob
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLBlob.hpp"
-
-CCryDXGLBlob::CCryDXGLBlob(size_t uBufferSize)
-    : m_uBufferSize(uBufferSize)
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-    , m_uRefCount(1)
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D10Blob)
-    m_pBuffer = new uint8[m_uBufferSize];
-}
-
-CCryDXGLBlob::~CCryDXGLBlob()
-{
-    delete [] m_pBuffer;
-}
-
-
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-
-////////////////////////////////////////////////////////////////////////////////
-// IUnknown implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLBlob::QueryInterface(REFIID riid, void** ppvObject)
-{
-    return E_NOINTERFACE;
-}
-
-ULONG CCryDXGLBlob::AddRef(void)
-{
-    return ++m_uRefCount;
-}
-
-ULONG CCryDXGLBlob::Release(void)
-{
-    --m_uRefCount;
-    if (m_uRefCount == 0)
-    {
-        delete this;
-        return 0;
-    }
-    return m_uRefCount;
-}
-
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D10Blob implementation
-////////////////////////////////////////////////////////////////////////////////
-
-LPVOID CCryDXGLBlob::GetBufferPointer()
-{
-    return m_pBuffer;
-}
-
-SIZE_T CCryDXGLBlob::GetBufferSize()
-{
-    return m_uBufferSize;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlob.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlob.hpp
deleted file mode 100644
index b4a98fe4dd..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlob.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D10Blob
-
-
-#ifndef __CRYDXGLBLOB__
-#define __CRYDXGLBLOB__
-
-#include "CCryDXGLBase.hpp"
-
-#if defined(DXGL_BLOB_INTEROPERABILITY) && !DXGL_FULL_EMULATION
-class CCryDXGLBlob
-    : public ID3D10Blob
-#else
-class CCryDXGLBlob
-    : public CCryDXGLBase
-#endif
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBlob, D3D10Blob)
-
-    CCryDXGLBlob(size_t uBufferSize);
-    virtual ~CCryDXGLBlob();
-
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-    //IUnknown implementation
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-    ULONG STDMETHODCALLTYPE AddRef();
-    ULONG STDMETHODCALLTYPE Release();
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-
-    // ID3D10Blob implementation
-    LPVOID STDMETHODCALLTYPE GetBufferPointer();
-    SIZE_T STDMETHODCALLTYPE GetBufferSize();
-protected:
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-    uint32 m_uRefCount;
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-
-    uint8 * m_pBuffer;
-    size_t m_uBufferSize;
-};
-
-
-#endif //__CRYDXGLBLOB__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBuffer.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBuffer.cpp
deleted file mode 100644
index f634de7f41..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBuffer.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Buffer
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLBuffer.hpp"
-#include "CCryDXGLDeviceContext.hpp"
-#include "../Implementation/GLResource.hpp"
-
-CCryDXGLBuffer::CCryDXGLBuffer(const D3D11_BUFFER_DESC& kDesc, NCryOpenGL::SBuffer* pGLBuffer, CCryDXGLDevice* pDevice)
-    : CCryDXGLResource(D3D11_RESOURCE_DIMENSION_BUFFER, pGLBuffer, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Buffer)
-}
-
-CCryDXGLBuffer::~CCryDXGLBuffer()
-{
-}
-
-NCryOpenGL::SBuffer* CCryDXGLBuffer::GetGLBuffer()
-{
-    return static_cast<NCryOpenGL::SBuffer*>(m_spGLResource.get());
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Buffer implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLBuffer::GetDesc(D3D11_BUFFER_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBuffer.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBuffer.hpp
deleted file mode 100644
index c78ed6c285..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBuffer.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Buffer
-
-
-#ifndef __CRYDXGLBUFFER__
-#define __CRYDXGLBUFFER__
-
-#include "CCryDXGLResource.hpp"
-
-namespace NCryOpenGL
-{
-    struct SBuffer;
-}
-
-class CCryDXGLBuffer
-    : public CCryDXGLResource
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBuffer, D3D11Buffer)
-
-    CCryDXGLBuffer(const D3D11_BUFFER_DESC& kDesc, NCryOpenGL::SBuffer* pGLBuffer, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLBuffer();
-
-    // ID3D11Buffer implementation
-    void GetDesc(D3D11_BUFFER_DESC* pDesc);
-
-    NCryOpenGL::SBuffer* GetGLBuffer();
-private:
-    D3D11_BUFFER_DESC m_kDesc;
-};
-
-#endif //__CRYDXGLBUFFER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilState.cpp
deleted file mode 100644
index c288761d27..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilState.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11DepthStencilState
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLDepthStencilState.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/GLDevice.hpp"
-
-CCryDXGLDepthStencilState::CCryDXGLDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_pGLState(new NCryOpenGL::SDepthStencilState)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DepthStencilState)
-}
-
-CCryDXGLDepthStencilState::~CCryDXGLDepthStencilState()
-{
-    delete m_pGLState;
-}
-
-bool CCryDXGLDepthStencilState::Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext)
-{
-    return NCryOpenGL::InitializeDepthStencilState(m_kDesc, *m_pGLState, pContext);
-}
-
-bool CCryDXGLDepthStencilState::Apply(uint32 uStencilReference, NCryOpenGL::CContext* pContext)
-{
-    return pContext->SetDepthStencilState(*m_pGLState, static_cast<GLint>(uStencilReference));
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11DepthStencilState
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLDepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilState.hpp
deleted file mode 100644
index 438997c1a1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilState.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11DepthStencilState
-
-#ifndef __CRYDXGLDEPTHSTENCILSTATE__
-#define __CRYDXGLDEPTHSTENCILSTATE__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    struct SDepthStencilState;
-    class CContext;
-}
-
-class CCryDXGLDepthStencilState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDepthStencilState, D3D11DepthStencilState)
-
-    CCryDXGLDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLDepthStencilState();
-
-    bool Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext);
-    bool Apply(uint32 uStencilReference, NCryOpenGL::CContext* pContext);
-
-    // Implementation of ID3D11DepthStencilState
-    void GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc);
-protected:
-    D3D11_DEPTH_STENCIL_DESC m_kDesc;
-    NCryOpenGL::SDepthStencilState* m_pGLState;
-};
-
-#endif //__CRYDXGLDEPTHSTENCILSTATE__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.cpp
deleted file mode 100644
index 1f4529f62f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11DepthStencilView
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLDepthStencilView.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "CCryDXGLResource.hpp"
-#include "../Implementation/GLDevice.hpp"
-#include "../Implementation/GLView.hpp"
-
-CCryDXGLDepthStencilView::CCryDXGLDepthStencilView(CCryDXGLResource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DepthStencilView)
-}
-
-CCryDXGLDepthStencilView::~CCryDXGLDepthStencilView()
-{
-}
-
-bool CCryDXGLDepthStencilView::Initialize(NCryOpenGL::CContext* pContext)
-{
-    D3D11_RESOURCE_DIMENSION eDimension;
-    m_spResource->GetType(&eDimension);
-    m_spGLView = NCryOpenGL::CreateDepthStencilView(m_spResource->GetGLResource(), eDimension, m_kDesc, pContext);
-    return m_spGLView  != NULL;
-}
-
-NCryOpenGL::SOutputMergerView* CCryDXGLDepthStencilView::GetGLView()
-{
-    return m_spGLView;
-}
-
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11DepthStencilView
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLDepthStencilView::GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.hpp
deleted file mode 100644
index 851df312c9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11DepthStencilView
-
-
-#ifndef __CRYDXGLDEPTHSTENCILVIEW__
-#define __CRYDXGLDEPTHSTENCILVIEW__
-
-#include "CCryDXGLView.hpp"
-
-namespace NCryOpenGL
-{
-    struct SOutputMergerView;
-    class CContext;
-}
-
-class CCryDXGLDepthStencilView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDepthStencilView, D3D11DepthStencilView)
-
-    CCryDXGLDepthStencilView(CCryDXGLResource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLDepthStencilView();
-
-    bool Initialize(NCryOpenGL::CContext* pContext);
-    NCryOpenGL::SOutputMergerView* GetGLView();
-
-    // Implementation of ID3D11DepthStencilView
-    void GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc);
-protected:
-    D3D11_DEPTH_STENCIL_VIEW_DESC m_kDesc;
-    _smart_ptr<NCryOpenGL::SOutputMergerView> m_spGLView;
-};
-
-#endif //__CRYDXGLDEPTHSTENCILVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDevice.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDevice.cpp
deleted file mode 100644
index fef6ad76d0..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDevice.cpp
+++ /dev/null
@@ -1,1018 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Device
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLBlendState.hpp"
-#include "CCryDXGLBuffer.hpp"
-#include "CCryDXGLDepthStencilState.hpp"
-#include "CCryDXGLDepthStencilView.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "CCryDXGLDeviceContext.hpp"
-#include "CCryDXGLGIAdapter.hpp"
-#include "CCryDXGLInputLayout.hpp"
-#include "CCryDXGLQuery.hpp"
-#include "CCryDXGLRasterizerState.hpp"
-#include "CCryDXGLRenderTargetView.hpp"
-#include "CCryDXGLSamplerState.hpp"
-#include "CCryDXGLSwapChain.hpp"
-#include "CCryDXGLShader.hpp"
-#include "CCryDXGLShaderResourceView.hpp"
-#include "CCryDXGLTexture1D.hpp"
-#include "CCryDXGLTexture2D.hpp"
-#include "CCryDXGLTexture3D.hpp"
-#include "CCryDXGLUnorderedAccessView.hpp"
-#include "../Implementation/GLDevice.hpp"
-#include "../Implementation/GLFormat.hpp"
-#include "../Implementation/GLResource.hpp"
-#include "../Implementation/GLShader.hpp"
-
-CCryDXGLDevice::CCryDXGLDevice(CCryDXGLGIAdapter* pAdapter, D3D_FEATURE_LEVEL eFeatureLevel)
-    : m_spAdapter(pAdapter)
-    , m_eFeatureLevel(eFeatureLevel)
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIDevice)
-    DXGL_INITIALIZE_INTERFACE(D3D11Device)
-
-    CCryDXGLDeviceContext * pImmediateContext(new CCryDXGLDeviceContext());
-    m_spImmediateContext = pImmediateContext;
-    pImmediateContext->Release();
-}
-
-CCryDXGLDevice::~CCryDXGLDevice()
-{
-    m_spImmediateContext->Shutdown();
-}
-
-#if !DXGL_FULL_EMULATION
-
-HRESULT CCryDXGLDevice::QueryInterface(REFIID riid, void** ppvObject)
-{
-    if (SingleInterface<ID3D11Device>::Query(this, riid, ppvObject) ||
-        SingleInterface<CCryDXGLDevice>::Query(this, riid, ppvObject))
-    {
-        return S_OK;
-    }
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-    return E_NOINTERFACE;
-#else
-    return CCryDXGLBase::QueryInterface(riid, ppvObject);
-#endif
-}
-
-#endif //!DXGL_FULL_EMULATION
-
-bool CCryDXGLDevice::Initialize(const DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain)
-{
-    NCryOpenGL::InitializeCryGlFramebufferFunctions();
-    NCryOpenGL::SAdapter* pGLAdapter(m_spAdapter->GetGLAdapter());
-
-    NCryOpenGL::SFeatureSpec kFeatureSpec;
-    // Enable all features so the FeatureLevelToFeatureSpec function can disable depending on the D3D_FEATURE_LEVEL
-    kFeatureSpec.m_kFeatures.SetOne();
-    if (!NCryOpenGL::FeatureLevelToFeatureSpec(kFeatureSpec, m_eFeatureLevel, pGLAdapter))
-    {
-        return false;
-    }
-
-    // Disable features not provided by the adapter
-    kFeatureSpec.m_kFeatures = pGLAdapter->m_kFeatures & kFeatureSpec.m_kFeatures;
-
-    NCryOpenGL::TNativeDisplay kNativeDisplay(NULL);
-    if (pDesc == NULL || ppSwapChain == NULL)
-    {
-#if DXGL_FULL_EMULATION
-        NCryOpenGL::SPixelFormatSpec kStandardPixelFormatSpec;
-        NCryOpenGL::GetStandardPixelFormatSpec(kStandardPixelFormatSpec);
-        m_spGLDevice = new NCryOpenGL::CDevice(pGLAdapter, kFeatureSpec, kStandardPixelFormatSpec);
-#else
-        return false;
-#endif //DXGL_FULL_EMULATION
-    }
-    else
-    {
-        NCryOpenGL::SFrameBufferSpec kFrameBufferSpec;
-        if (!NCryOpenGL::SwapChainDescToFrameBufferSpec(kFrameBufferSpec, *pDesc) ||
-            !NCryOpenGL::GetNativeDisplay(kNativeDisplay, pDesc->OutputWindow))
-        {
-            return false;
-        }
-
-        m_spGLDevice = new NCryOpenGL::CDevice(pGLAdapter, kFeatureSpec, kFrameBufferSpec);
-    }
-
-    if (!m_spGLDevice->Initialize(kNativeDisplay))
-    {
-        return false;
-    }
-
-#if DXGL_FULL_EMULATION
-    if (ppSwapChain != NULL && pDesc != NULL)
-#endif //!DXGL_FULL_EMULATION
-    {
-        CCryDXGLSwapChain* pDXGLSwapChain(new CCryDXGLSwapChain(this, *pDesc));
-        CCryDXGLSwapChain::ToInterface(ppSwapChain, pDXGLSwapChain);
-
-        if (!pDXGLSwapChain->Initialize())
-        {
-            return false;
-        }
-    }
-
-    return m_spImmediateContext->Initialize(this);
-}
-
-NCryOpenGL::CDevice* CCryDXGLDevice::GetGLDevice()
-{
-    return m_spGLDevice;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIObject overrides
-////////////////////////////////////////////////////////////////////////////////
-
-
-HRESULT CCryDXGLDevice::GetParent(REFIID riid, void** ppParent)
-{
-    IUnknown* pAdapterInterface;
-    CCryDXGLBase::ToInterface(&pAdapterInterface, m_spAdapter);
-    if (pAdapterInterface->QueryInterface(riid, ppParent) == S_OK && ppParent != NULL)
-    {
-        return S_OK;
-    }
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT && !DXGL_FULL_EMULATION
-    return E_FAIL;
-#else
-    return CCryDXGLGIObject::GetParent(riid, ppParent);
-#endif
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIDevice implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLDevice::GetAdapter(IDXGIAdapter** pAdapter)
-{
-    if (m_spAdapter == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLGIAdapter::ToInterface(pAdapter, m_spAdapter);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::SetGPUThreadPriority(INT Priority)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::GetGPUThreadPriority(INT* pPriority)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Device implementation
-////////////////////////////////////////////////////////////////////////////////
-
-struct SAutoContext
-{
-    SAutoContext(NCryOpenGL::CDevice* pDevice)
-        : m_pDevice(pDevice)
-    {
-        m_pContext = m_pDevice->ReserveContext();
-    }
-
-    ~SAutoContext()
-    {
-        m_pDevice->ReleaseContext();
-    }
-
-    NCryOpenGL::CContext* operator*()
-    {
-        return m_pContext;
-    }
-
-    NCryOpenGL::CContext* m_pContext;
-    NCryOpenGL::CDevice* m_pDevice;
-};
-
-HRESULT CCryDXGLDevice::CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer)
-{
-    if (ppBuffer == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    NCryOpenGL::SBufferPtr spGLBuffer(NCryOpenGL::CreateBuffer(*pDesc, pInitialData, *kAutoContext));
-    if (spGLBuffer == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLBuffer::ToInterface(ppBuffer, new CCryDXGLBuffer(*pDesc, spGLBuffer, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D)
-{
-    if (ppTexture1D == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    NCryOpenGL::STexturePtr spGLTexture(NCryOpenGL::CreateTexture1D(*pDesc, pInitialData, *kAutoContext));
-    if (spGLTexture == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLTexture1D::ToInterface(ppTexture1D, new CCryDXGLTexture1D(*pDesc, spGLTexture, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D)
-{
-    if (ppTexture2D == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    NCryOpenGL::STexturePtr spGLTexture(NCryOpenGL::CreateTexture2D(*pDesc, pInitialData, *kAutoContext));
-    if (spGLTexture == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLTexture2D::ToInterface(ppTexture2D, new CCryDXGLTexture2D(*pDesc, spGLTexture, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D)
-{
-    if (ppTexture3D == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    NCryOpenGL::STexturePtr spGLTexture(NCryOpenGL::CreateTexture3D(*pDesc, pInitialData, *kAutoContext));
-    if (spGLTexture == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLTexture3D::ToInterface(ppTexture3D, new CCryDXGLTexture3D(*pDesc, spGLTexture, this));
-    return S_OK;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture1D* pTexture, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE1D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY;
-        kStandardDesc.Texture1DArray.MostDetailedMip = 0;
-        kStandardDesc.Texture1DArray.MipLevels = -1;
-        kStandardDesc.Texture1DArray.FirstArraySlice = 0;
-        kStandardDesc.Texture1DArray.ArraySize = kTextureDesc.ArraySize;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D;
-        kStandardDesc.Texture1D.MostDetailedMip = 0;
-        kStandardDesc.Texture1DArray.MipLevels = -1;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture2D* pTexture, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE2D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 1)
-    {
-        if (kTextureDesc.SampleDesc.Count > 1)
-        {
-            kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
-            kStandardDesc.Texture2DMSArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DMSArray.ArraySize = kTextureDesc.ArraySize;
-        }
-        else
-        {
-            kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
-            kStandardDesc.Texture2DArray.MostDetailedMip = 0;
-            kStandardDesc.Texture2DArray.MipLevels = -1;
-            kStandardDesc.Texture2DArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DArray.ArraySize = kTextureDesc.ArraySize;
-        }
-    }
-    else if (kTextureDesc.SampleDesc.Count > 1)
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-        kStandardDesc.Texture2D.MostDetailedMip = 0;
-        kStandardDesc.Texture2D.MipLevels = -1;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture3D* pTexture, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE3D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
-    kStandardDesc.Texture3D.MostDetailedMip = 0;
-    kStandardDesc.Texture3D.MipLevels = -1;
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLBuffer* pBuffer, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_BUFFER_DESC kBufferDesc;
-    pBuffer->GetDesc(&kBufferDesc);
-
-    bool bSuccess((kBufferDesc.MiscFlags | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) != 0);
-    if (bSuccess)
-    {
-        kStandardDesc.Format = DXGI_FORMAT_UNKNOWN;
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-        kStandardDesc.Buffer.FirstElement = 0;
-        kStandardDesc.Buffer.NumElements = kBufferDesc.StructureByteStride;
-    }
-    else
-    {
-        DXGL_ERROR("Default shader resource view for a buffer requires element size specification");
-    }
-
-    pBuffer->Release();
-    return bSuccess;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture1D* pTexture, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE1D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1DARRAY;
-        kStandardDesc.Texture1DArray.MipSlice = 0;
-        kStandardDesc.Texture1DArray.FirstArraySlice = 0;
-        kStandardDesc.Texture1DArray.ArraySize = kTextureDesc.ArraySize;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1D;
-        kStandardDesc.Texture1D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture2D* pTexture, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE2D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 1)
-    {
-        if (kTextureDesc.SampleDesc.Count > 1)
-        {
-            kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY;
-            kStandardDesc.Texture2DMSArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DMSArray.ArraySize = kTextureDesc.ArraySize;
-        }
-        else
-        {
-            kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
-            kStandardDesc.Texture2DArray.MipSlice = 0;
-            kStandardDesc.Texture2DArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DArray.ArraySize = kTextureDesc.ArraySize;
-        }
-    }
-    else if (kTextureDesc.SampleDesc.Count > 1)
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
-        kStandardDesc.Texture2D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture3D* pTexture, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE3D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D;
-    kStandardDesc.Texture3D.MipSlice = 0;
-    kStandardDesc.Texture3D.FirstWSlice = 0;
-    kStandardDesc.Texture3D.WSize = -1;
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLBuffer* pBuffer, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_BUFFER_DESC kBufferDesc;
-    pBuffer->GetDesc(&kBufferDesc);
-
-    bool bSuccess((kBufferDesc.MiscFlags | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) != 0);
-    if (bSuccess)
-    {
-        kStandardDesc.Format = DXGI_FORMAT_UNKNOWN;
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_BUFFER;
-        kStandardDesc.Buffer.FirstElement = 0;
-        kStandardDesc.Buffer.NumElements = kBufferDesc.StructureByteStride;
-    }
-    else
-    {
-        DXGL_ERROR("Default render target view for a buffer requires element size specification");
-    }
-
-    pBuffer->Release();
-    return bSuccess;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture1D* pTexture, D3D11_DEPTH_STENCIL_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE1D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.Flags = 0;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1DARRAY;
-        kStandardDesc.Texture1DArray.MipSlice = 0;
-        kStandardDesc.Texture1DArray.FirstArraySlice = 0;
-        kStandardDesc.Texture1DArray.ArraySize = kTextureDesc.ArraySize;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1D;
-        kStandardDesc.Texture1D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture2D* pTexture, D3D11_DEPTH_STENCIL_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE2D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.Flags = 0;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        if (kTextureDesc.SampleDesc.Count > 1)
-        {
-            kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY;
-            kStandardDesc.Texture2DMSArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DMSArray.ArraySize = kTextureDesc.ArraySize;
-        }
-        else
-        {
-            kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
-            kStandardDesc.Texture2DArray.MipSlice = 0;
-            kStandardDesc.Texture2DArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DArray.ArraySize = kTextureDesc.ArraySize;
-        }
-    }
-    else if (kTextureDesc.SampleDesc.Count > 1)
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMS;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
-        kStandardDesc.Texture2D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture3D* pTexture, D3D11_DEPTH_STENCIL_VIEW_DESC&)
-{
-    DXGL_ERROR("Cannot bind a depth stencil view to a 3D texture");
-    pTexture->Release();
-    return false;
-}
-
-bool GetStandardViewDesc(CCryDXGLBuffer* pBuffer, D3D11_DEPTH_STENCIL_VIEW_DESC&)
-{
-    DXGL_ERROR("Cannot bind a depth stencil view to a buffer");
-    pBuffer->Release();
-    return false;
-}
-
-template <typename ViewDesc>
-bool GetStandardViewDesc(ID3D11Resource* pResource, ViewDesc& kStandardDesc)
-{
-    memset(&kStandardDesc, 0, sizeof(kStandardDesc));
-
-    void* pvData(NULL);
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Texture1D), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLTexture1D::FromInterface(reinterpret_cast<ID3D11Texture1D*>(pvData)), kStandardDesc);
-    }
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Texture2D), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLTexture2D::FromInterface(reinterpret_cast<ID3D11Texture2D*>(pvData)), kStandardDesc);
-    }
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Texture3D), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLTexture3D::FromInterface(reinterpret_cast<ID3D11Texture3D*>(pvData)), kStandardDesc);
-    }
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Buffer), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLBuffer::FromInterface(reinterpret_cast<ID3D11Buffer*>(pvData)), kStandardDesc);
-    }
-
-    DXGL_ERROR("Unknown resource type for standard view description");
-    return false;
-}
-
-HRESULT CCryDXGLDevice::CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView)
-{
-    D3D11_SHADER_RESOURCE_VIEW_DESC kStandardDesc;
-    if (pDesc == NULL)
-    {
-        if (!GetStandardViewDesc(pResource, kStandardDesc))
-        {
-            return E_INVALIDARG;
-        }
-        pDesc = &kStandardDesc;
-    }
-    assert(pDesc != NULL);
-
-    CCryDXGLShaderResourceView* pSRView(new CCryDXGLShaderResourceView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (pSRView->Initialize(*kAutoContext))
-    {
-        CCryDXGLShaderResourceView::ToInterface(ppSRView, pSRView);
-        return S_OK;
-    }
-
-    pSRView->Release();
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView)
-{
-    D3D11_UNORDERED_ACCESS_VIEW_DESC kStandardDesc;
-    if (pDesc == NULL)
-    {
-        if (!GetStandardViewDesc(pResource, kStandardDesc))
-        {
-            return E_INVALIDARG;
-        }
-        pDesc = &kStandardDesc;
-    }
-    assert(pDesc != NULL);
-
-    CCryDXGLUnorderedAccessView* pUAView(new CCryDXGLUnorderedAccessView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (pUAView->Initialize(*kAutoContext))
-    {
-        CCryDXGLUnorderedAccessView::ToInterface(ppUAView, pUAView);
-        return S_OK;
-    }
-
-    pUAView->Release();
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView)
-{
-    D3D11_RENDER_TARGET_VIEW_DESC kStandardDesc;
-    if (pDesc == NULL)
-    {
-        if (!GetStandardViewDesc(pResource, kStandardDesc))
-        {
-            return E_INVALIDARG;
-        }
-        pDesc = &kStandardDesc;
-    }
-    assert(pDesc != NULL);
-
-    CCryDXGLRenderTargetView* pRTView(new CCryDXGLRenderTargetView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (pRTView->Initialize(*kAutoContext))
-    {
-        CCryDXGLRenderTargetView::ToInterface(ppRTView, pRTView);
-        return S_OK;
-    }
-
-    pRTView->Release();
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView)
-{
-    D3D11_DEPTH_STENCIL_VIEW_DESC kStandardDesc;
-    if (pDesc == NULL)
-    {
-        if (!GetStandardViewDesc(pResource, kStandardDesc))
-        {
-            return E_INVALIDARG;
-        }
-        pDesc = &kStandardDesc;
-    }
-    assert(pDesc != NULL);
-
-    CCryDXGLDepthStencilView* pDSView(new CCryDXGLDepthStencilView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (pDSView->Initialize(*kAutoContext))
-    {
-        CCryDXGLDepthStencilView::ToInterface(ppDepthStencilView, pDSView);
-        return S_OK;
-    }
-
-    pDSView->Release();
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout)
-{
-    NCryOpenGL::TShaderReflection kShaderReflection;
-    if (!InitializeShaderReflectionFromInput(&kShaderReflection, pShaderBytecodeWithInputSignature))
-    {
-        return E_FAIL;
-    }
-
-    _smart_ptr<NCryOpenGL::SInputLayout> spGLInputLayout(NCryOpenGL::CreateInputLayout(pInputElementDescs, NumElements, kShaderReflection, m_spGLDevice));
-
-    if (spGLInputLayout == NULL)
-    {
-        return E_FAIL;
-    }
-
-    CCryDXGLInputLayout::ToInterface(ppInputLayout, new CCryDXGLInputLayout(spGLInputLayout, this));
-
-    return S_OK;
-}
-
-_smart_ptr<NCryOpenGL::SShader> CreateGLShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, NCryOpenGL::EShaderType eType, NCryOpenGL::CContext* pContext)
-{
-    if (pClassLinkage != NULL)
-    {
-        DXGL_ERROR("Class linkage not supported");
-        return NULL;
-    }
-
-    _smart_ptr<NCryOpenGL::SShader> spGLShader(new NCryOpenGL::SShader());
-    spGLShader->m_eType = eType;
-    if (!NCryOpenGL::InitializeShader(spGLShader, pShaderBytecode, BytecodeLength))
-    {
-        return NULL;
-    }
-    return spGLShader;
-}
-
-template <typename DXGLShader, typename D3DShader>
-HRESULT CreateShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, D3DShader** ppShader, NCryOpenGL::EShaderType eType, CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext)
-{
-    _smart_ptr<NCryOpenGL::SShader> spGLShader(CreateGLShader(pShaderBytecode, BytecodeLength, pClassLinkage, eType, pContext));
-    if (spGLShader == NULL)
-    {
-        return E_FAIL;
-    }
-
-    DXGLShader::ToInterface(ppShader, new DXGLShader(spGLShader, pDevice));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader)
-{
-    SAutoContext kAutoContext(m_spGLDevice);
-    return CreateShader<CCryDXGLVertexShader, ID3D11VertexShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader, NCryOpenGL::eST_Vertex, this, *kAutoContext);
-}
-
-HRESULT CCryDXGLDevice::CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader)
-{
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-    SAutoContext kAutoContext(m_spGLDevice);
-    return CreateShader<CCryDXGLGeometryShader, ID3D11GeometryShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader, NCryOpenGL::eST_Geometry, this, *kAutoContext);
-#else
-    DXGL_ERROR("Geometry shaders are not supported by this GL implementation.");
-    return E_FAIL;
-#endif
-}
-
-HRESULT CCryDXGLDevice::CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader)
-{
-    SAutoContext kAutoContext(m_spGLDevice);
-    return CreateShader<CCryDXGLPixelShader, ID3D11PixelShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader, NCryOpenGL::eST_Fragment, this, *kAutoContext);
-}
-
-HRESULT CCryDXGLDevice::CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader)
-{
-#if DXGL_SUPPORT_TESSELLATION
-    SAutoContext kAutoContext(m_spGLDevice);
-    return CreateShader<CCryDXGLHullShader, ID3D11HullShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader, NCryOpenGL::eST_TessControl, this, *kAutoContext);
-#else
-    DXGL_ERROR("Hull shaders are not supported by this GL implementation.");
-    return E_FAIL;
-#endif
-}
-
-HRESULT CCryDXGLDevice::CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader)
-{
-#if DXGL_SUPPORT_TESSELLATION
-    SAutoContext kAutoContext(m_spGLDevice);
-    return CreateShader<CCryDXGLDomainShader, ID3D11DomainShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader, NCryOpenGL::eST_TessEvaluation, this, *kAutoContext);
-#else
-    DXGL_ERROR("Domain shaders are not supported by this GL implementation.");
-    return E_FAIL;
-#endif
-}
-
-HRESULT CCryDXGLDevice::CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader)
-{
-#if DXGL_SUPPORT_COMPUTE
-    SAutoContext kAutoContext(m_spGLDevice);
-    return CreateShader<CCryDXGLComputeShader, ID3D11ComputeShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader, NCryOpenGL::eST_Compute, this, *kAutoContext);
-#else
-    DXGL_ERROR("Compute shaders are not supported by this GL implementation.");
-    return E_FAIL;
-#endif
-}
-
-HRESULT CCryDXGLDevice::CreateClassLinkage(ID3D11ClassLinkage** ppLinkage)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState)
-{
-    CCryDXGLBlendState* pState(new CCryDXGLBlendState(*pBlendStateDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (!pState->Initialize(this, *kAutoContext))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLBlendState::ToInterface(ppBlendState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState)
-{
-    CCryDXGLDepthStencilState* pState(new CCryDXGLDepthStencilState(*pDepthStencilDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (!pState->Initialize(this, *kAutoContext))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLDepthStencilState::ToInterface(ppDepthStencilState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState)
-{
-    CCryDXGLRasterizerState* pState(new CCryDXGLRasterizerState(*pRasterizerDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (!pState->Initialize(this, *kAutoContext))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLRasterizerState::ToInterface(ppRasterizerState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState)
-{
-    CCryDXGLSamplerState* pState(new CCryDXGLSamplerState(*pSamplerDesc, this));
-
-    SAutoContext kAutoContext(m_spGLDevice);
-    if (!pState->Initialize(this, *kAutoContext))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLSamplerState::ToInterface(ppSamplerState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery)
-{
-    SAutoContext kAutoContext(m_spGLDevice);
-    NCryOpenGL::SQueryPtr spGLQuery(NCryOpenGL::CreateQuery(*pQueryDesc, *kAutoContext));
-    if (spGLQuery == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLQuery::ToInterface(ppQuery, new CCryDXGLQuery(*pQueryDesc, spGLQuery, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport)
-{
-    NCryOpenGL::EGIFormat eGIFormat(NCryOpenGL::GetGIFormat(Format));
-    if (eGIFormat == NCryOpenGL::eGIF_NUM)
-    {
-        DXGL_ERROR("Unknown DXGI format");
-        return E_FAIL;
-    }
-
-    (*pFormatSupport) = m_spAdapter->GetGLAdapter()->m_kCapabilities.m_auFormatSupport[eGIFormat];
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels)
-{
-    NCryOpenGL::EGIFormat eGIFormat(NCryOpenGL::GetGIFormat(Format));
-    if (eGIFormat != NCryOpenGL::eGIF_NUM && NCryOpenGL::CheckFormatMultisampleSupport(m_spAdapter->GetGLAdapter(), eGIFormat, SampleCount))
-    {
-        *pNumQualityLevels = 1;
-    }
-    else
-    {
-        *pNumQualityLevels = 0;
-    }
-    DXGL_TODO("Check if there's a way to query for specific quality levels");
-    return S_OK;
-}
-
-void CCryDXGLDevice::CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-HRESULT CCryDXGLDevice::CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize)
-{
-    switch (Feature)
-    {
-    case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS:
-    {
-        D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS* pData(static_cast<D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS*>(pFeatureSupportData));
-        bool bComputeShaderSupported(m_spGLDevice->GetFeatureSpec().m_kFeatures.Get(NCryOpenGL::eF_ComputeShader));
-        pData->ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = bComputeShaderSupported ? TRUE : FALSE;
-        return S_OK;
-    }
-    break;
-    default:
-        DXGL_TODO("Add supported 11.1 features")
-        return E_FAIL;
-    }
-}
-
-HRESULT CCryDXGLDevice::GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData)
-{
-    return m_kPrivateDataContainer.GetPrivateData(guid, pDataSize, pData);
-}
-
-HRESULT CCryDXGLDevice::SetPrivateData(REFGUID guid, UINT DataSize, const void* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateData(guid, DataSize, pData);
-}
-
-HRESULT CCryDXGLDevice::SetPrivateDataInterface(REFGUID guid, const IUnknown* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateDataInterface(guid, pData);
-}
-
-D3D_FEATURE_LEVEL CCryDXGLDevice::GetFeatureLevel(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return D3D_FEATURE_LEVEL_11_0;
-}
-
-UINT CCryDXGLDevice::GetCreationFlags(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-HRESULT CCryDXGLDevice::GetDeviceRemovedReason(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-void CCryDXGLDevice::GetImmediateContext(ID3D11DeviceContext** ppImmediateContext)
-{
-    m_spImmediateContext->AddRef();
-    CCryDXGLDeviceContext::ToInterface(ppImmediateContext, m_spImmediateContext);
-}
-
-HRESULT CCryDXGLDevice::SetExceptionMode(UINT RaiseFlags)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-UINT CCryDXGLDevice::GetExceptionMode(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDevice.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDevice.hpp
deleted file mode 100644
index dd53d599a4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDevice.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Device
-
-
-#ifndef __CRYDXGLDEVICE__
-#define __CRYDXGLDEVICE__
-
-#include "CCryDXGLGIObject.hpp"
-
-namespace NCryOpenGL
-{
-    class CDevice;
-    struct SDummyContext;
-}
-
-class CCryDXGLGIAdapter;
-class CCryDXGLDeviceContext;
-
-class CCryDXGLDevice
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT && !DXGL_FULL_EMULATION
-    : public ID3D11Device
-#else
-    : public CCryDXGLGIObject
-#endif
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDevice, DXGIDevice)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDevice, D3D11Device)
-
-    CCryDXGLDevice(CCryDXGLGIAdapter* pAdapter, D3D_FEATURE_LEVEL eFeatureLevel);
-    virtual ~CCryDXGLDevice();
-
-    bool Initialize(const DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain);
-    NCryOpenGL::CDevice* GetGLDevice();
-
-    // IDXGIObject overrides
-    HRESULT GetParent(REFIID riid, void** ppParent);
-
-    // IDXGIDevice implementation
-    HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter);
-    HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface);
-    HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources);
-    HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority);
-    HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority);
-
-    // ID3D11Device implementation
-    HRESULT STDMETHODCALLTYPE CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer);
-    HRESULT STDMETHODCALLTYPE CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D);
-    HRESULT STDMETHODCALLTYPE CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D);
-    HRESULT STDMETHODCALLTYPE CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D);
-    HRESULT STDMETHODCALLTYPE CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView);
-    HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView);
-    HRESULT STDMETHODCALLTYPE CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView);
-    HRESULT STDMETHODCALLTYPE CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView);
-    HRESULT STDMETHODCALLTYPE CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout);
-    HRESULT STDMETHODCALLTYPE CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader);
-    HRESULT STDMETHODCALLTYPE CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader);
-    HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader);
-    HRESULT STDMETHODCALLTYPE CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader);
-    HRESULT STDMETHODCALLTYPE CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader);
-    HRESULT STDMETHODCALLTYPE CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader);
-    HRESULT STDMETHODCALLTYPE CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader);
-    HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage);
-    HRESULT STDMETHODCALLTYPE CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState);
-    HRESULT STDMETHODCALLTYPE CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState);
-    HRESULT STDMETHODCALLTYPE CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState);
-    HRESULT STDMETHODCALLTYPE CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState);
-    HRESULT STDMETHODCALLTYPE CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery);
-    HRESULT STDMETHODCALLTYPE CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate);
-    HRESULT STDMETHODCALLTYPE CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter);
-    HRESULT STDMETHODCALLTYPE CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext);
-    HRESULT STDMETHODCALLTYPE OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource);
-    HRESULT STDMETHODCALLTYPE CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport);
-    HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels);
-    void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo);
-    HRESULT STDMETHODCALLTYPE CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength);
-    HRESULT STDMETHODCALLTYPE CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize);
-    HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData);
-    D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel(void);
-    UINT STDMETHODCALLTYPE GetCreationFlags(void);
-    HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason(void);
-    void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext);
-    HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags);
-    UINT STDMETHODCALLTYPE GetExceptionMode(void);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLPrivateDataContainer m_kPrivateDataContainer;
-    _smart_ptr<CCryDXGLGIAdapter> m_spAdapter;
-    _smart_ptr<NCryOpenGL::CDevice> m_spGLDevice;
-    _smart_ptr<CCryDXGLDeviceContext> m_spImmediateContext;
-    D3D_FEATURE_LEVEL m_eFeatureLevel;
-#if DXGL_FULL_EMULATION
-    NCryOpenGL::SDummyContext* m_pDummyContext;
-#endif //DXGL_FULL_EMULATION
-};
-
-#endif //__CRYDXGLDEVICE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceChild.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceChild.cpp
deleted file mode 100644
index 702b7d8ec1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceChild.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11DeviceChild
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLDeviceChild.hpp"
-#include "CCryDXGLDevice.hpp"
-
-CCryDXGLDeviceChild::CCryDXGLDeviceChild(CCryDXGLDevice* pDevice)
-    : m_pDevice(pDevice)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DeviceChild)
-    if (m_pDevice != NULL)
-    {
-        m_pDevice->AddRef();
-    }
-}
-
-CCryDXGLDeviceChild::~CCryDXGLDeviceChild()
-{
-    if (m_pDevice != NULL)
-    {
-        m_pDevice->Release();
-    }
-}
-
-void CCryDXGLDeviceChild::SetDevice(CCryDXGLDevice* pDevice)
-{
-    if (m_pDevice != pDevice)
-    {
-        if (m_pDevice != NULL)
-        {
-            m_pDevice->Release();
-        }
-        m_pDevice = pDevice;
-        if (pDevice != NULL)
-        {
-            m_pDevice->AddRef();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11DeviceChild implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLDeviceChild::GetDevice(ID3D11Device** ppDevice)
-{
-    CCryDXGLDevice::ToInterface(ppDevice, m_pDevice);
-}
-
-HRESULT CCryDXGLDeviceChild::GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData)
-{
-    return m_kPrivateDataContainer.GetPrivateData(guid, pDataSize, pData);
-}
-
-HRESULT CCryDXGLDeviceChild::SetPrivateData(REFGUID guid, UINT DataSize, const void* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateData(guid, DataSize, pData);
-}
-
-HRESULT CCryDXGLDeviceChild::SetPrivateDataInterface(REFGUID guid, const IUnknown* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateDataInterface(guid, pData);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceChild.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceChild.hpp
deleted file mode 100644
index e45decad80..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceChild.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description: Declaration of the DXGL wrapper for ID3D11DeviceChild
-
-
-#ifndef __CRYDXGLDEVICECHILD__
-#define __CRYDXGLDEVICECHILD__
-
-#include "CCryDXGLBase.hpp"
-
-class CCryDXGLDevice;
-
-class CCryDXGLDeviceChild
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDeviceChild, D3D11DeviceChild)
-
-    CCryDXGLDeviceChild(CCryDXGLDevice* pDevice = NULL);
-    virtual ~CCryDXGLDeviceChild();
-
-    void SetDevice(CCryDXGLDevice* pDevice);
-
-    // ID3D11DeviceChild implementation
-    void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice);
-    HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData);
-
-#if !DXGL_FULL_EMULATION
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLDeviceChild>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLDevice* m_pDevice;
-    CCryDXGLPrivateDataContainer m_kPrivateDataContainer;
-};
-
-#if !DXGL_FULL_EMULATION
-struct ID3D11Counter
-    : CCryDXGLDeviceChild {};
-struct ID3D11ClassLinkage
-    : CCryDXGLDeviceChild {};
-#endif //!DXGL_FULL_EMULATION
-
-#endif //__CRYDXGLDEVICECHILD__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceContext.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceContext.cpp
deleted file mode 100644
index b897daff31..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceContext.cpp
+++ /dev/null
@@ -1,1484 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11DeviceContext
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLBlendState.hpp"
-#include "CCryDXGLBuffer.hpp"
-#include "CCryDXGLDepthStencilView.hpp"
-#include "CCryDXGLDeviceContext.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "CCryDXGLBlendState.hpp"
-#include "CCryDXGLDepthStencilState.hpp"
-#include "CCryDXGLInputLayout.hpp"
-#include "CCryDXGLQuery.hpp"
-#include "CCryDXGLRasterizerState.hpp"
-#include "CCryDXGLRenderTargetView.hpp"
-#include "CCryDXGLSamplerState.hpp"
-#include "CCryDXGLShader.hpp"
-#include "CCryDXGLShaderResourceView.hpp"
-#include "CCryDXGLUnorderedAccessView.hpp"
-#include "../Implementation/GLDevice.hpp"
-#include "../Implementation/GLFormat.hpp"
-#include "../Implementation/GLView.hpp"
-
-#define DXGL_CHECK_HAZARDS 0
-#define DXGL_CHECK_PIPELINE 0
-#define DXGL_CHECK_CURRENT_CONTEXT 0
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLDeviceContext
-////////////////////////////////////////////////////////////////////////////////
-
-CCryDXGLDeviceContext::CCryDXGLDeviceContext()
-    : m_uStencilRef(0)
-    , m_uIndexBufferOffset(0)
-    , m_eIndexBufferFormat(DXGI_FORMAT_UNKNOWN)
-    , m_ePrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED)
-    , m_uSampleMask(0xFFFFFFFF)
-    , m_uNumViewports(0)
-    , m_uNumScissorRects(0)
-    , m_pContext(NULL)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DeviceContext)
-
-    m_auBlendFactor[0] = 1.0f;
-    m_auBlendFactor[1] = 1.0f;
-    m_auBlendFactor[2] = 1.0f;
-    m_auBlendFactor[3] = 1.0f;
-
-    for (uint32 uVB = 0; uVB < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++uVB)
-    {
-        m_auVertexBufferStrides[uVB] = 0;
-        m_auVertexBufferOffsets[uVB] = 0;
-    }
-
-    for (uint32 uSO = 0; uSO < D3D11_SO_BUFFER_SLOT_COUNT; ++uSO)
-    {
-        m_auStreamOutputBufferOffsets[uSO] = 0;
-    }
-
-    m_kStages.resize(NCryOpenGL::eST_NUM);
-    std::vector<SStage>::iterator kStageIter(m_kStages.begin());
-    const std::vector<SStage>::iterator kStageEnd(m_kStages.end());
-    while (kStageIter != kStageEnd)
-    {
-        memset(kStageIter->m_auConstantBufferOffsets, 0, sizeof(kStageIter->m_auConstantBufferOffsets));
-        memset(kStageIter->m_auConstantBufferSizes, 0, sizeof(kStageIter->m_auConstantBufferSizes));
-        ++kStageIter;
-    }
-}
-
-CCryDXGLDeviceContext::~CCryDXGLDeviceContext()
-{
-    Shutdown();
-}
-
-bool CCryDXGLDeviceContext::Initialize(CCryDXGLDevice* pDevice)
-{
-    SetDevice(pDevice);
-
-    m_spDefaultBlendState = CreateDefaultBlendState(pDevice);
-    m_spDefaultDepthStencilState = CreateDefaultDepthStencilState(pDevice);
-    m_spDefaultRasterizerState = CreateDefaultRasterizerState(pDevice);
-    m_spDefaultSamplerState = CreateDefaultSamplerState(pDevice);
-
-    NCryOpenGL::CDevice* pGLDevice(pDevice->GetGLDevice());
-    m_pContext = pGLDevice->AllocateContext(NCryOpenGL::CContext::RenderingType);
-    pGLDevice->BindContext(m_pContext);
-
-    bool bResult =
-        m_spDefaultBlendState->Initialize(pDevice, m_pContext) &&
-        m_spDefaultDepthStencilState->Initialize(pDevice, m_pContext) &&
-        m_spDefaultRasterizerState->Initialize(pDevice, m_pContext) &&
-        m_spDefaultSamplerState->Initialize(pDevice, m_pContext);
-
-    pGLDevice->UnbindContext(m_pContext);
-
-    return bResult;
-}
-
-void CCryDXGLDeviceContext::Shutdown()
-{
-    if (m_pContext != NULL)
-    {
-        m_pContext->GetDevice()->FreeContext(m_pContext);
-        m_pContext = NULL;
-    }
-    m_pDevice = NULL;
-}
-
-NCryOpenGL::CContext* CCryDXGLDeviceContext::GetGLContext()
-{
-    return m_pContext;
-}
-
-_smart_ptr<CCryDXGLBlendState> CCryDXGLDeviceContext::CreateDefaultBlendState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_BLEND_DESC values from DXSDK
-    D3D11_BLEND_DESC kDesc;
-    ZeroMemory(&kDesc, sizeof(kDesc));
-    kDesc.AlphaToCoverageEnable                 = FALSE;
-    kDesc.IndependentBlendEnable                = FALSE;
-    kDesc.RenderTarget[0].BlendEnable           = FALSE;
-    kDesc.RenderTarget[0].SrcBlend              = D3D11_BLEND_ONE;
-    kDesc.RenderTarget[0].DestBlend             = D3D11_BLEND_ZERO;
-    kDesc.RenderTarget[0].BlendOp               = D3D11_BLEND_OP_ADD;
-    kDesc.RenderTarget[0].SrcBlendAlpha         = D3D11_BLEND_ONE;
-    kDesc.RenderTarget[0].DestBlendAlpha        = D3D11_BLEND_ZERO;
-    kDesc.RenderTarget[0].BlendOpAlpha          = D3D11_BLEND_OP_ADD;
-    kDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-
-    return new CCryDXGLBlendState(kDesc, pDevice);
-}
-
-_smart_ptr<CCryDXGLDepthStencilState> CCryDXGLDeviceContext::CreateDefaultDepthStencilState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_DEPTH_STENCIL_DESC values from DXSDK
-    D3D11_DEPTH_STENCIL_DESC kDesc;
-    kDesc.DepthEnable                  = TRUE;
-    kDesc.DepthWriteMask               = D3D11_DEPTH_WRITE_MASK_ALL;
-    kDesc.DepthFunc                    = D3D11_COMPARISON_LESS;
-    kDesc.StencilEnable                = FALSE;
-    kDesc.StencilReadMask              = D3D11_DEFAULT_STENCIL_READ_MASK;
-    kDesc.StencilWriteMask             = D3D11_DEFAULT_STENCIL_WRITE_MASK;
-    kDesc.FrontFace.StencilFunc        = D3D11_COMPARISON_ALWAYS;
-    kDesc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP;
-    kDesc.FrontFace.StencilPassOp      = D3D11_STENCIL_OP_KEEP;
-    kDesc.FrontFace.StencilFailOp      = D3D11_STENCIL_OP_KEEP;
-    kDesc.BackFace = kDesc.FrontFace;
-
-    return new CCryDXGLDepthStencilState(kDesc, pDevice);
-}
-
-_smart_ptr<CCryDXGLRasterizerState> CCryDXGLDeviceContext::CreateDefaultRasterizerState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_RASTERIZER_DESC values from DXSDK
-    D3D11_RASTERIZER_DESC kDesc;
-    kDesc.FillMode              = D3D11_FILL_SOLID;
-    kDesc.CullMode              = D3D11_CULL_BACK;
-    kDesc.FrontCounterClockwise = FALSE;
-    kDesc.DepthBias             = 0;
-    kDesc.SlopeScaledDepthBias  = 0.0f;
-    kDesc.DepthBiasClamp        = 0.0f;
-    kDesc.DepthClipEnable       = TRUE;
-    kDesc.ScissorEnable         = FALSE;
-    kDesc.MultisampleEnable     = FALSE;
-    kDesc.AntialiasedLineEnable = FALSE;
-
-    return new CCryDXGLRasterizerState(kDesc, pDevice);
-}
-
-_smart_ptr<CCryDXGLSamplerState> CCryDXGLDeviceContext::CreateDefaultSamplerState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_SAMPLER_DESC values from DXSDK
-    D3D11_SAMPLER_DESC kDesc;
-    kDesc.Filter         = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-    kDesc.AddressU       = D3D11_TEXTURE_ADDRESS_CLAMP;
-    kDesc.AddressV       = D3D11_TEXTURE_ADDRESS_CLAMP;
-    kDesc.AddressW       = D3D11_TEXTURE_ADDRESS_CLAMP;
-    kDesc.MinLOD         = -FLT_MAX;
-    kDesc.MaxLOD         = FLT_MAX;
-    kDesc.MipLODBias     = 0.0f;
-    kDesc.MaxAnisotropy  = 1;
-    kDesc.ComparisonFunc = D3D11_COMPARISON_NEVER;
-    kDesc.BorderColor[0] = 1.0f;
-    kDesc.BorderColor[1] = 1.0f;
-    kDesc.BorderColor[2] = 1.0f;
-    kDesc.BorderColor[3] = 1.0f;
-
-    return new CCryDXGLSamplerState(kDesc, pDevice);
-}
-
-#if DXGL_CHECK_HAZARDS
-void CheckHazard(uint32 uRTVIndex, CCryDXGLRenderTargetView* pRTView, CCryDXGLResource* pRTVResource, uint32 uSRVIndex, CCryDXGLShaderResourceView* pSRView, CCryDXGLResource* pSRVResource, uint32 uStage)
-{
-    if (pRTVResource == pSRVResource)
-    {
-        DXGL_WARNING("Hazard detected: render target view %d and shader resource view %d in stage %d refer to the same resource", uRTVIndex,  uSRVIndex, uStage);
-    }
-}
-
-void CheckHazard(uint32 uDSVIndex, CCryDXGLDepthStencilView* pDSView, CCryDXGLResource* pDSVResource, uint32 uSRVIndex, CCryDXGLShaderResourceView* pSRView, CCryDXGLResource* pSRVResource, uint32 uStage)
-{
-    if (pDSVResource == pSRVResource)
-    {
-        D3D11_DEPTH_STENCIL_VIEW_DESC kDSVDesc;
-        pDSView->GetDesc(&kDSVDesc);
-        if ((kDSVDesc.Flags & D3D11_DSV_READ_ONLY_DEPTH) == 0 || (kDSVDesc.Flags & D3D11_DSV_READ_ONLY_STENCIL) == 0)
-        {
-            DXGL_ERROR("Hazard detected: writable depth stencil view and shader resource view %d in stage %d refer to the same resource", uSRVIndex, uStage);
-        }
-    }
-}
-
-template <typename OMView>
-void CheckHazards(_smart_ptr<OMView>* pOMViews, uint32 uNumOMViews, _smart_ptr<CCryDXGLShaderResourceView>* pSRViews, uint32 uNumSRViews, uint32 uStage)
-{
-    uint32 uOMView;
-    for (uOMView = 0; uOMView < uNumOMViews; ++uOMView)
-    {
-        OMView* pOMView(pOMViews[uOMView]);
-        if (pOMView != NULL)
-        {
-            ID3D11Resource* pOMVResource(NULL);
-            pOMView->GetResource(&pOMVResource);
-
-            uint32 uSRView;
-            for (uSRView = 0; uSRView < uNumSRViews; ++uSRView)
-            {
-                CCryDXGLShaderResourceView* pSRView(pSRViews[uSRView]);
-                if (pSRView != NULL)
-                {
-                    ID3D11Resource* pSRVResource(NULL);
-                    pSRView->GetResource(&pSRVResource);
-
-                    CheckHazard(uOMView, pOMView, pOMVResource, uSRView, pSRView, pSRVResource, uStage);
-
-                    pSRVResource->Release();
-                }
-            }
-
-            pOMVResource->Release();
-        }
-    }
-}
-
-#endif //DXGL_CHECK_HAZARDS
-
-#if DXGL_CHECK_PIPELINE
-template <typename Stage>
-void CheckRequiredStage(std::vector<Stage>& kStages, uint32 uRequiredStage)
-{
-    if (kStages.size() <= uRequiredStage || kStages.at(uRequiredStage).m_spShader == NULL)
-    {
-        DXGL_ERROR("Required pipeline stage %d is not bound to a valid shader");
-    }
-}
-template <typename Stage>
-void CheckPipeline(std::vector<Stage>& kStages)
-{
-    CheckRequiredStage(kStages, NCryOpenGL::eST_Vertex);
-    CheckRequiredStage(kStages, NCryOpenGL::eST_Fragment);
-}
-#else
-template <typename Stage>
-ILINE void CheckPipeline(std::vector<Stage>& kStages) {}
-#endif //DXGL_CHECK_PIPELINE
-
-
-#if DXGL_FULL_EMULATION
-void CheckCurrentContext(NCryOpenGL::CContext* pContext)
-{
-    if (pContext->GetDevice()->GetCurrentContext() != pContext)
-    {
-        pContext->GetDevice()->BindContext(pContext);
-    }
-}
-#elif DXGL_CHECK_CURRENT_CONTEXT
-void CheckCurrentContext(NCryOpenGL::CContext* pContext)
-{
-    if (pContext->GetDevice()->GetCurrentContext() != pContext)
-    {
-        DXGL_ERROR("Device context has not been bound to this thread");
-    }
-}
-#else
-ILINE void CheckCurrentContext(NCryOpenGL::CContext*) {}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11DeviceContext implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLDeviceContext::SetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    CheckCurrentContext(m_pContext);
-
-    if (uStage >= m_kStages.size())
-    {
-        for (uint32 uView = 0; uView < NumViews; ++uView)
-        {
-            if (ppShaderResourceViews[uView] != NULL)
-            {
-                DXGL_ERROR("CCryDXGLDeviceContext::SetShaderResources: shader stage is not supported, setting will be ignored");
-                break;
-            }
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uView = 0; uView < NumViews; ++uView)
-    {
-        uint32 uSlot(StartSlot + uView);
-        CCryDXGLShaderResourceView* pDXGLShaderResourceView(CCryDXGLShaderResourceView::FromInterface(ppShaderResourceViews[uView]));
-        if (kStage.m_aspShaderResourceViews[uSlot] != pDXGLShaderResourceView)
-        {
-            kStage.m_aspShaderResourceViews[uSlot] = pDXGLShaderResourceView;
-            m_pContext->SetShaderResourceView(pDXGLShaderResourceView == NULL ? NULL : pDXGLShaderResourceView->GetGLView(), uStage, uSlot);
-        }
-    }
-
-#if DXGL_CHECK_HAZARDS
-    CheckHazards(m_aspRenderTargetViews, DXGL_ARRAY_SIZE(m_aspRenderTargetViews), kStage.m_aspShaderResourceViews, DXGL_ARRAY_SIZE(kStage.m_aspShaderResourceViews), uStage);
-    CheckHazards(&m_spDepthStencilView, 1, kStage.m_aspShaderResourceViews, DXGL_ARRAY_SIZE(kStage.m_aspShaderResourceViews), uStage);
-#endif //DXGL_CHECK_HAZARDS
-}
-
-void CCryDXGLDeviceContext::SetUnorderedAccessViews(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews)
-{
-    CheckCurrentContext(m_pContext);
-
-    if (uStage >= m_kStages.size())
-    {
-        for (uint32 uView = 0; uView < NumViews; ++uView)
-        {
-            if (ppUnorderedAccessViews[uView] != NULL)
-            {
-                DXGL_ERROR("CCryDXGLDeviceContext::SetUnorderedAccessViews: shader stage is not supported, setting will be ignored");
-                break;
-            }
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uView = 0; uView < NumViews; ++uView)
-    {
-        uint32 uSlot(StartSlot + uView);
-        CCryDXGLUnorderedAccessView* pDXGLUnorderedAccessView(CCryDXGLUnorderedAccessView::FromInterface(ppUnorderedAccessViews[uView]));
-        if (kStage.m_aspUnorderedAccessViews[uSlot] != pDXGLUnorderedAccessView)
-        {
-            kStage.m_aspUnorderedAccessViews[uSlot] = pDXGLUnorderedAccessView;
-            m_pContext->SetUnorderedAccessView(pDXGLUnorderedAccessView == NULL ? NULL : pDXGLUnorderedAccessView->GetGLView(), uStage, uSlot);
-        }
-    }
-
-#if DXGL_CHECK_HAZARDS
-    CheckHazards(m_aspRenderTargetViews, DXGL_ARRAY_SIZE(m_aspRenderTargetViews), kStage.m_aspUnorderedAccessViews, DXGL_ARRAY_SIZE(kStage.m_aspUnorderedAccessViews), uStage);
-    CheckHazards(&m_spDepthStencilView, 1, kStage.m_aspUnorderedAccessViews, DXGL_ARRAY_SIZE(kStage.m_aspUnorderedAccessViews), uStage);
-#endif //DXGL_CHECK_HAZARDS
-}
-
-void CCryDXGLDeviceContext::SetShader(uint32 uStage, CCryDXGLShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances)
-{
-    if (ppClassInstances != NULL && NumClassInstances != 0)
-    {
-        DXGL_WARNING("Class instances not supported");
-    }
-
-    if (uStage >= m_kStages.size())
-    {
-        if (pShader != NULL)
-        {
-            DXGL_ERROR("CCryDXGLDeviceContext::SetShader: shader stage is not supported, setting will be ignored");
-        }
-        return;
-    }
-
-    if (m_kStages[uStage].m_spShader != pShader)
-    {
-        CheckCurrentContext(m_pContext);
-        m_kStages[uStage].m_spShader = pShader;
-        m_pContext->SetShader(pShader == NULL ? NULL : pShader->GetGLShader(), uStage);
-    }
-}
-
-void CCryDXGLDeviceContext::SetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers)
-{
-    CheckCurrentContext(m_pContext);
-
-    if (uStage >= m_kStages.size())
-    {
-        for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-        {
-            if (ppSamplers[uSampler] != NULL)
-            {
-                DXGL_ERROR("CCryDXGLDeviceContext::SetSamplers: shader stage is not supported, setting will be ignored");
-                break;
-            }
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-    {
-        uint32 uSlot(uSampler + StartSlot);
-
-        CCryDXGLSamplerState* pSamplerState(CCryDXGLSamplerState::FromInterface(ppSamplers[uSampler]));
-        if (pSamplerState == NULL)
-        {
-            pSamplerState = m_spDefaultSamplerState.get();
-        }
-
-        if (pSamplerState != kStage.m_aspSamplerStates[uSlot])
-        {
-            kStage.m_aspSamplerStates[uSlot] = pSamplerState;
-            pSamplerState->Apply(uStage, uSlot, m_pContext);
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::SetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants)
-{
-    CheckCurrentContext(m_pContext);
-
-    if (uStage >= m_kStages.size())
-    {
-        //shader stage is not supported, setting will be ignored       
-        return;
-    }
-
-    assert(uStage < m_kStages.size());
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-    {
-        uint32 uSlot(StartSlot + uBuffer);
-        CCryDXGLBuffer* pConstantBuffer(CCryDXGLBuffer::FromInterface(ppConstantBuffers[uBuffer]));
-        uint32 uOffset(pFirstConstant == NULL ? 0 : pFirstConstant[uBuffer] * 16);
-        uint32 uSize(pNumConstants == NULL ? 0 : pNumConstants[uBuffer] * 16);
-        if (kStage.m_aspConstantBuffers[uSlot] != pConstantBuffer ||
-            kStage.m_auConstantBufferOffsets[uSlot] != uOffset ||
-            kStage.m_auConstantBufferSizes[uSlot] != uSize)
-        {
-            kStage.m_aspConstantBuffers[uSlot] = pConstantBuffer;
-            kStage.m_auConstantBufferOffsets[uSlot] = uOffset;
-            kStage.m_auConstantBufferSizes[uSlot] = uSize;
-            if (pConstantBuffer == NULL)
-            {
-                m_pContext->SetConstantBuffer(NULL, NCryOpenGL::SBufferRange(uOffset, uSize), uStage, uSlot);
-            }
-            else
-            {
-                NCryOpenGL::SBuffer* pGLBuffer(pConstantBuffer->GetGLBuffer());
-                if (uSize == 0)
-                {
-                    uSize = pGLBuffer->m_uSize;
-                }
-                m_pContext->SetConstantBuffer(pGLBuffer, NCryOpenGL::SBufferRange(uOffset, uSize), uStage, uSlot);
-            }
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::GetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetShaderResources: shader stage is not supported, no entries returned");
-        for (uint32 uView = 0; uView < NumViews; ++uView)
-        {
-            ppShaderResourceViews[uView] = NULL;
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uView = 0; uView < NumViews; ++uView)
-    {
-        uint32 uSlot(StartSlot + uView);
-        CCryDXGLShaderResourceView::ToInterface(ppShaderResourceViews + uView, kStage.m_aspShaderResourceViews[uSlot]);
-        if (ppShaderResourceViews[uView] != NULL)
-        {
-            ppShaderResourceViews[uView]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::GetUnorderedAccesses(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-{
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetUnorderedAccesses: shader stage is not supported, no entries returned");
-        for (uint32 uView = 0; uView < NumViews; ++uView)
-        {
-            ppUnorderedAccessViews[uView] = NULL;
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uView = 0; uView < NumViews; ++uView)
-    {
-        uint32 uSlot(StartSlot + uView);
-        CCryDXGLUnorderedAccessView::ToInterface(ppUnorderedAccessViews + uView, kStage.m_aspUnorderedAccessViews[uSlot]);
-        if (ppUnorderedAccessViews[uView] != NULL)
-        {
-            ppUnorderedAccessViews[uView]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::GetShader(uint32 uStage, CCryDXGLShader** ppShader, ID3D11ClassInstance** ppClassInstances, UINT* NumClassInstances)
-{
-    if (ppClassInstances != NULL)
-    {
-        DXGL_WARNING("Class instances not supported");
-    }
-    if (NumClassInstances != NULL)
-    {
-        *NumClassInstances = 0;
-    }
-
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetShader: shader stage is not supported, no shader returned");
-        *ppShader = NULL;
-        return;
-    }
-
-    *ppShader = m_kStages[uStage].m_spShader.get();
-    if (*ppShader != NULL)
-    {
-        (*ppShader)->AddRef();
-    }
-}
-
-void CCryDXGLDeviceContext::GetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-{
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetSamplers: shader stage is not supported, no entries returned");
-        for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-        {
-            ppSamplers[uSampler] = NULL;
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-    {
-        uint32 uSlot(uSampler + StartSlot);
-
-        CCryDXGLSamplerState::ToInterface(ppSamplers + uSampler, kStage.m_aspSamplerStates[uSlot]);
-        if (ppSamplers[uSampler] != NULL)
-        {
-            ppSamplers[uSampler]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::GetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants)
-{
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetConstantBuffers: shader stage is not supported, no entries returned");
-        for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-        {
-            ppConstantBuffers[uBuffer] = NULL;
-            if (pFirstConstant != NULL)
-            {
-                pFirstConstant[uBuffer] = 0;
-            }
-            if (pNumConstants != NULL)
-            {
-                pNumConstants[uBuffer] = 0;
-            }
-        }
-        return;
-    }
-
-    assert(uStage < m_kStages.size());
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-    {
-        uint32 uSlot(StartSlot + uBuffer);
-
-        CCryDXGLBuffer::ToInterface(ppConstantBuffers + uBuffer, kStage.m_aspConstantBuffers[uSlot]);
-        if (pFirstConstant != NULL)
-        {
-            pFirstConstant[uBuffer] = kStage.m_auConstantBufferOffsets[uSlot];
-        }
-        if (pNumConstants != NULL)
-        {
-            pNumConstants[uBuffer] = kStage.m_auConstantBufferSizes[uSlot];
-        }
-        if (ppConstantBuffers[uBuffer] != NULL)
-        {
-            ppConstantBuffers[uBuffer]->AddRef();
-        }
-    }
-}
-
-#define _IMPLEMENT_COMMON_SHADER_SETTERS(_Prefix, _ShaderInterface, _ShaderType, _Stage)                                                                                                        \
-    void CCryDXGLDeviceContext::_Prefix##SetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView * const* ppShaderResourceViews)                                             \
-    {                                                                                                                                                                                           \
-        SetShaderResources(_Stage, StartSlot, NumViews, ppShaderResourceViews);                                                                                                                 \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##SetShader(_ShaderInterface * pShader, ID3D11ClassInstance * const* ppClassInstances, UINT NumClassInstances)                                           \
-    {                                                                                                                                                                                           \
-        SetShader(_Stage, _ShaderType::FromInterface(pShader), ppClassInstances, NumClassInstances);                                                                                            \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##SetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState * const* ppSamplers)                                                                  \
-    {                                                                                                                                                                                           \
-        SetSamplers(_Stage, StartSlot, NumSamplers, ppSamplers);                                                                                                                                \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##SetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer * const* ppConstantBuffers)                                                           \
-    {                                                                                                                                                                                           \
-        SetConstantBuffers(_Stage, StartSlot, NumBuffers, ppConstantBuffers);                                                                                                                   \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##SetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer * const* ppConstantBuffers, const UINT * pFirstConstant, const UINT * pNumConstants) \
-    {                                                                                                                                                                                           \
-        SetConstantBuffers(_Stage, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants);                                                                                    \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##GetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView * *ppShaderResourceViews)                                                   \
-    {                                                                                                                                                                                           \
-        GetShaderResources(_Stage, StartSlot, NumViews, ppShaderResourceViews);                                                                                                                 \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##GetShader(_ShaderInterface * *ppShader, ID3D11ClassInstance * *ppClassInstances, UINT * NumClassInstances)                                             \
-    {                                                                                                                                                                                           \
-        CCryDXGLShader* pShader(NULL);                                                                                                                                                          \
-        GetShader(_Stage, &pShader, ppClassInstances, NumClassInstances);                                                                                                                       \
-        _ShaderType::ToInterface(ppShader, static_cast<_ShaderType*>(pShader));                                                                                                                 \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##GetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState * *ppSamplers)                                                                        \
-    {                                                                                                                                                                                           \
-        GetSamplers(_Stage, StartSlot, NumSamplers, ppSamplers);                                                                                                                                \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##GetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer * *ppConstantBuffers)                                                                 \
-    {                                                                                                                                                                                           \
-        GetConstantBuffers(_Stage, StartSlot, NumBuffers, ppConstantBuffers);                                                                                                                   \
-    }                                                                                                                                                                                           \
-    void CCryDXGLDeviceContext::_Prefix##GetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer * *ppConstantBuffers, UINT * pFirstConstant, UINT * pNumConstants)                   \
-    {                                                                                                                                                                                           \
-        GetConstantBuffers(_Stage, StartSlot, NumBuffers, ppConstantBuffers, pFirstConstant, pNumConstants);                                                                                    \
-    }
-_IMPLEMENT_COMMON_SHADER_SETTERS(VS, ID3D11VertexShader,   CCryDXGLVertexShader,   NCryOpenGL::eST_Vertex)
-_IMPLEMENT_COMMON_SHADER_SETTERS(PS, ID3D11PixelShader,    CCryDXGLPixelShader,    NCryOpenGL::eST_Fragment)
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-_IMPLEMENT_COMMON_SHADER_SETTERS(GS, ID3D11GeometryShader, CCryDXGLGeometryShader, NCryOpenGL::eST_Geometry)
-#else
-_IMPLEMENT_COMMON_SHADER_SETTERS(GS, ID3D11GeometryShader, CCryDXGLGeometryShader, NCryOpenGL::eST_NUM)
-#endif
-#if DXGL_SUPPORT_TESSELLATION
-_IMPLEMENT_COMMON_SHADER_SETTERS(HS, ID3D11HullShader,     CCryDXGLHullShader,     NCryOpenGL::eST_TessControl)
-_IMPLEMENT_COMMON_SHADER_SETTERS(DS, ID3D11DomainShader,   CCryDXGLDomainShader,   NCryOpenGL::eST_TessEvaluation)
-#else
-_IMPLEMENT_COMMON_SHADER_SETTERS(HS, ID3D11HullShader,     CCryDXGLHullShader,     NCryOpenGL::eST_NUM)
-_IMPLEMENT_COMMON_SHADER_SETTERS(DS, ID3D11DomainShader,   CCryDXGLDomainShader,   NCryOpenGL::eST_NUM)
-#endif
-#if DXGL_SUPPORT_COMPUTE
-_IMPLEMENT_COMMON_SHADER_SETTERS(CS, ID3D11ComputeShader,  CCryDXGLComputeShader,  NCryOpenGL::eST_Compute)
-#else
-_IMPLEMENT_COMMON_SHADER_SETTERS(CS, ID3D11ComputeShader,  CCryDXGLComputeShader,  NCryOpenGL::eST_NUM)
-#endif
-#undef _IMPLEMENT_COMMON_SHADER_SETTERS
-
-void CCryDXGLDeviceContext::DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->DrawIndexed(IndexCount, StartIndexLocation, BaseVertexLocation);
-}
-
-void CCryDXGLDeviceContext::Draw(UINT VertexCount, UINT StartVertexLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->Draw(VertexCount, StartVertexLocation);
-}
-
-HRESULT CCryDXGLDeviceContext::Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource)
-{
-    CheckCurrentContext(m_pContext);
-    NCryOpenGL::SResource* pGLResource(CCryDXGLResource::FromInterface(pResource)->GetGLResource());
-    if (pGLResource->m_pfMapSubresource)
-    {
-        return (*pGLResource->m_pfMapSubresource)(pGLResource, Subresource, MapType, MapFlags, pMappedResource, m_pContext) ? S_OK : E_FAIL;
-    }
-    else
-    {
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-}
-
-void CCryDXGLDeviceContext::Unmap(ID3D11Resource* pResource, UINT Subresource)
-{
-    CheckCurrentContext(m_pContext);
-    NCryOpenGL::SResource* pGLResource(CCryDXGLResource::FromInterface(pResource)->GetGLResource());
-    if (pGLResource->m_pfUnmapSubresource)
-    {
-        (*pGLResource->m_pfUnmapSubresource)(pGLResource, Subresource, m_pContext);
-    }
-    else
-    {
-        DXGL_NOT_IMPLEMENTED
-    }
-}
-
-void CCryDXGLDeviceContext::IASetInputLayout(ID3D11InputLayout* pInputLayout)
-{
-    CCryDXGLInputLayout* pDXGLInputLayout(CCryDXGLInputLayout::FromInterface(pInputLayout));
-    if (m_spInputLayout != pDXGLInputLayout)
-    {
-        CheckCurrentContext(m_pContext);
-        m_pContext->SetInputLayout(pDXGLInputLayout == NULL ? NULL : pDXGLInputLayout->GetGLLayout());
-        m_spInputLayout = pDXGLInputLayout;
-    }
-}
-
-void CCryDXGLDeviceContext::IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets)
-{
-    CheckCurrentContext(m_pContext);
-    uint32 uSlot;
-    for (uSlot = 0; uSlot < NumBuffers; ++uSlot)
-    {
-        uint32 uSlotIndex(StartSlot + uSlot);
-        CCryDXGLBuffer* pDXGLVertexBuffer(CCryDXGLBuffer::FromInterface(ppVertexBuffers[uSlot]));
-        if (m_aspVertexBuffers[uSlotIndex] != pDXGLVertexBuffer ||
-            m_auVertexBufferStrides[uSlotIndex] != pStrides[uSlot] ||
-            m_auVertexBufferOffsets[uSlotIndex] != pOffsets[uSlot])
-        {
-            m_aspVertexBuffers[uSlotIndex] = pDXGLVertexBuffer;
-            m_auVertexBufferStrides[uSlotIndex] = pStrides[uSlot];
-            m_auVertexBufferOffsets[uSlotIndex] = pOffsets[uSlot];
-            m_pContext->SetVertexBuffer(uSlotIndex, pDXGLVertexBuffer == NULL ? 0 : pDXGLVertexBuffer->GetGLBuffer(), pStrides[uSlot], pOffsets[uSlot]);
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset)
-{
-    CCryDXGLBuffer* pDXGLIndexBuffer(CCryDXGLBuffer::FromInterface(pIndexBuffer));
-
-    m_spIndexBuffer = pDXGLIndexBuffer;
-    m_eIndexBufferFormat = Format;
-    m_uIndexBufferOffset = Offset;
-
-    CheckCurrentContext(m_pContext);
-    if (pDXGLIndexBuffer == NULL)
-    {
-        m_pContext->SetIndexBuffer(NULL, GL_NONE, 0, 0);
-    }
-    else
-    {
-        const NCryOpenGL::SGIFormatInfo* pFormatInfo;
-        NCryOpenGL::EGIFormat eGIFormat(NCryOpenGL::GetGIFormat(Format));
-        if (eGIFormat == NCryOpenGL::eGIF_NUM ||
-            (pFormatInfo = NCryOpenGL::GetGIFormatInfo(eGIFormat)) == NULL ||
-            pFormatInfo->m_pTexture == NULL ||
-            pFormatInfo->m_pUncompressed == NULL)
-        {
-            DXGL_ERROR("Invalid format for index buffer");
-            return;
-        }
-        m_pContext->SetIndexBuffer(pDXGLIndexBuffer->GetGLBuffer(), pFormatInfo->m_pTexture->m_eDataType, pFormatInfo->m_pUncompressed->GetPixelBytes(), Offset);
-    }
-}
-
-void CCryDXGLDeviceContext::DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->DrawIndexedInstanced(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation);
-}
-
-void CCryDXGLDeviceContext::DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->DrawInstanced(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation);
-}
-
-void CCryDXGLDeviceContext::IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology)
-{
-    CheckCurrentContext(m_pContext);
-    m_ePrimitiveTopology = Topology;
-    m_pContext->SetPrimitiveTopology(Topology);
-}
-
-void CCryDXGLDeviceContext::Begin(ID3D11Asynchronous* pAsync)
-{
-    CheckCurrentContext(m_pContext);
-    NCryOpenGL::SQuery* pQuery(CCryDXGLQuery::FromInterface(pAsync)->GetGLQuery());
-    if (pQuery)
-    {
-        pQuery->Begin();
-    }
-}
-
-void CCryDXGLDeviceContext::End(ID3D11Asynchronous* pAsync)
-{
-    CheckCurrentContext(m_pContext);
-    NCryOpenGL::SQuery* pQuery(CCryDXGLQuery::FromInterface(pAsync)->GetGLQuery());
-    if (pQuery)
-    {
-        pQuery->End();
-    }
-}
-
-HRESULT CCryDXGLDeviceContext::GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags)
-{
-    CheckCurrentContext(m_pContext);
-    NCryOpenGL::SQuery* pQuery(CCryDXGLQuery::FromInterface(pAsync)->GetGLQuery());
-    if (pQuery)
-    {
-        return pQuery->GetData(pData, DataSize, (GetDataFlags & D3D11_ASYNC_GETDATA_DONOTFLUSH) == 0 ? true : false) ? S_OK : E_FAIL;
-    }
-    return E_FAIL;
-}
-
-void CCryDXGLDeviceContext::SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue)
-{
-    if (pPredicate != NULL)
-    {
-        DXGL_NOT_IMPLEMENTED
-    }
-    m_spPredicate = CCryDXGLQuery::FromInterface(pPredicate);
-    m_bPredicateValue = PredicateValue == TRUE;
-}
-
-void CCryDXGLDeviceContext::OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView)
-{
-    OMSetRenderTargetsAndUnorderedAccessViews(NumViews, ppRenderTargetViews, pDepthStencilView, NumViews, 0, NULL, NULL);
-}
-
-void CCryDXGLDeviceContext::OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts)
-{
-    NCryOpenGL::SOutputMergerView* apGLRenderTargetViews[DXGL_ARRAY_SIZE(m_aspRenderTargetViews)];
-    NCryOpenGL::SOutputMergerView* pGLDepthStencilView(NULL);
-
-    for (uint32 uRTV = 0; uRTV < NumRTVs; ++uRTV)
-    {
-        CCryDXGLRenderTargetView* pDXGLRenderTargetView(CCryDXGLRenderTargetView::FromInterface(ppRenderTargetViews[uRTV]));
-        m_aspRenderTargetViews[uRTV] = pDXGLRenderTargetView;
-        apGLRenderTargetViews[uRTV] = pDXGLRenderTargetView == NULL ? NULL : pDXGLRenderTargetView->GetGLView();
-    }
-    if (UAVStartSlot == NumRTVs)
-    {
-        SetUnorderedAccessViews(NCryOpenGL::eST_Fragment, 0, NumUAVs, ppUnorderedAccessViews);
-    }
-    else
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::OMSetRenderTargetsAndUnorderedAccessViews - UAVStartSlot is expected to be equal to NumRTVs");
-        NumUAVs = 0;
-    }
-
-    for (uint32 uRTV = NumRTVs; uRTV < DXGL_ARRAY_SIZE(m_aspRenderTargetViews); ++uRTV)
-    {
-        m_aspRenderTargetViews[uRTV] = NULL;
-        apGLRenderTargetViews[uRTV] = NULL;
-    }
-
-    CCryDXGLDepthStencilView* pDXGLDepthStencilView(CCryDXGLDepthStencilView::FromInterface(pDepthStencilView));
-    m_spDepthStencilView = pDXGLDepthStencilView;
-    if (pDXGLDepthStencilView != NULL)
-    {
-        pGLDepthStencilView = pDXGLDepthStencilView->GetGLView();
-    }
-
-#if DXGL_CHECK_HAZARDS
-    for (uint32 uStage = 0; uStage < m_kStages.size(); ++uStage)
-    {
-        CheckHazards(m_aspRenderTargetViews, DXGL_ARRAY_SIZE(m_aspRenderTargetViews), m_kStages.at(uStage).m_aspShaderResourceViews, DXGL_ARRAY_SIZE(m_kStages.at(uStage).m_aspShaderResourceViews), uStage);
-        CheckHazards(&m_spDepthStencilView, 1, m_kStages.at(uStage).m_aspShaderResourceViews, DXGL_ARRAY_SIZE(m_kStages.at(uStage).m_aspShaderResourceViews), uStage);
-    }
-#endif //DXGL_CHECK_HAZARDS
-
-    CheckCurrentContext(m_pContext);
-
-    m_pContext->SetRenderTargets(NumRTVs, apGLRenderTargetViews, pGLDepthStencilView);
-}
-
-void CCryDXGLDeviceContext::OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask)
-{
-    CheckCurrentContext(m_pContext);
-
-    CCryDXGLBlendState* pDXGLBlendState(
-        pBlendState == NULL ?
-        m_spDefaultBlendState.get() :
-        CCryDXGLBlendState::FromInterface(pBlendState));
-
-    if (pDXGLBlendState != m_spBlendState)
-    {
-        m_spBlendState = pDXGLBlendState;
-        pDXGLBlendState->Apply(m_pContext);
-    }
-
-    m_uSampleMask = SampleMask;
-    if (BlendFactor == NULL)
-    {
-        m_auBlendFactor[0] = 1.0f;
-        m_auBlendFactor[1] = 1.0f;
-        m_auBlendFactor[2] = 1.0f;
-        m_auBlendFactor[3] = 1.0f;
-    }
-    else
-    {
-        m_auBlendFactor[0] = BlendFactor[0];
-        m_auBlendFactor[1] = BlendFactor[1];
-        m_auBlendFactor[2] = BlendFactor[2];
-        m_auBlendFactor[3] = BlendFactor[3];
-    }
-
-    m_pContext->SetBlendColor(m_auBlendFactor[0], m_auBlendFactor[1], m_auBlendFactor[2], m_auBlendFactor[3]);
-    m_pContext->SetSampleMask(m_uSampleMask);
-}
-
-void CCryDXGLDeviceContext::OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef)
-{
-    CheckCurrentContext(m_pContext);
-
-    CCryDXGLDepthStencilState* pDXGLDepthStencilState(
-        pDepthStencilState == NULL ?
-        m_spDefaultDepthStencilState.get() :
-        CCryDXGLDepthStencilState::FromInterface(pDepthStencilState));
-
-    if (pDXGLDepthStencilState != m_spDepthStencilState || m_uStencilRef != StencilRef)
-    {
-        m_spDepthStencilState = pDXGLDepthStencilState;
-        m_uStencilRef = StencilRef;
-        pDXGLDepthStencilState->Apply(StencilRef, m_pContext);
-    }
-}
-
-void CCryDXGLDeviceContext::SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets)
-{
-    for (uint32 uBuffer = 0; uBuffer < D3D11_SO_BUFFER_SLOT_COUNT; ++uBuffer)
-    {
-        CCryDXGLBuffer* pDXGLSOBuffer(NULL);
-        uint32 uOffset(0);
-        if (uBuffer < NumBuffers)
-        {
-            pDXGLSOBuffer = CCryDXGLBuffer::FromInterface(ppSOTargets[uBuffer]);
-            uOffset = pOffsets[uBuffer];
-        }
-
-        if (m_aspStreamOutputBuffers[uBuffer] != pDXGLSOBuffer ||
-            m_auStreamOutputBufferOffsets[uBuffer] != uOffset)
-        {
-            DXGL_NOT_IMPLEMENTED
-                m_aspStreamOutputBuffers[uBuffer] = pDXGLSOBuffer;
-            m_auStreamOutputBufferOffsets[uBuffer] = uOffset;
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::DrawAuto(void)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ)
-{
-#if DXGL_SUPPORT_COMPUTE
-    CheckCurrentContext(m_pContext);
-    m_pContext->Dispatch(ThreadGroupCountX, ThreadGroupCountY, ThreadGroupCountZ);
-#else
-    DXGL_ERROR("CCryDXGLDeviceContext::Dispatch is not supported in this configuration");
-#endif
-}
-
-void CCryDXGLDeviceContext::DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::RSSetState(ID3D11RasterizerState* pRasterizerState)
-{
-    CCryDXGLRasterizerState* pDXGLRasterizerState(
-        pRasterizerState == NULL ?
-        m_spDefaultRasterizerState.get() :
-        CCryDXGLRasterizerState::FromInterface(pRasterizerState));
-
-    if (pDXGLRasterizerState != m_spRasterizerState)
-    {
-        CheckCurrentContext(m_pContext);
-        m_spRasterizerState = pDXGLRasterizerState;
-        m_spRasterizerState->Apply(m_pContext);
-    }
-}
-
-void CCryDXGLDeviceContext::RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports)
-{
-    m_uNumViewports = NumViewports;
-    cryMemcpy(m_akViewports, pViewports, min(sizeof(m_akViewports), sizeof(pViewports[0]) * NumViewports));
-
-    CheckCurrentContext(m_pContext);
-    m_pContext->SetViewports(NumViewports, pViewports);
-}
-
-void CCryDXGLDeviceContext::RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects)
-{
-    m_uNumScissorRects = NumRects;
-    if (NumRects > 0)
-    {
-        cryMemcpy(m_akScissorRects, pRects, min(sizeof(m_akScissorRects), sizeof(pRects[0]) * NumRects));
-    }
-
-    CheckCurrentContext(m_pContext);
-    m_pContext->SetScissorRects(NumRects, pRects);
-}
-
-void CCryDXGLDeviceContext::CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox)
-{
-    CCryDXGLResource* pDXGLDstResource(CCryDXGLResource::FromInterface(pDstResource));
-    CCryDXGLResource* pDXGLSrcResource(CCryDXGLResource::FromInterface(pSrcResource));
-
-    CheckCurrentContext(m_pContext);
-    D3D11_RESOURCE_DIMENSION kDstType, kSrcType;
-    pDXGLDstResource->GetType(&kDstType);
-    pDXGLSrcResource->GetType(&kSrcType);
-
-    if (kDstType == kSrcType)
-    {
-        switch (kDstType)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            NCryOpenGL::CopySubTexture(
-                static_cast<NCryOpenGL::STexture*>(pDXGLDstResource->GetGLResource()), DstSubresource, DstX, DstY, DstZ,
-                static_cast<NCryOpenGL::STexture*>(pDXGLSrcResource->GetGLResource()), SrcSubresource, pSrcBox, m_pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            NCryOpenGL::CopySubBuffer(
-                static_cast<NCryOpenGL::SBuffer*>(pDXGLDstResource->GetGLResource()), DstSubresource, DstX, DstY, DstZ,
-                static_cast<NCryOpenGL::SBuffer*>(pDXGLSrcResource->GetGLResource()), SrcSubresource, pSrcBox, m_pContext);
-            break;
-        default:
-            assert(false);
-            break;
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource)
-{
-    CCryDXGLResource* pDXGLDstResource(CCryDXGLResource::FromInterface(pDstResource));
-    CCryDXGLResource* pDXGLSrcResource(CCryDXGLResource::FromInterface(pSrcResource));
-
-    D3D11_RESOURCE_DIMENSION kDstType, kSrcType;
-    pDXGLDstResource->GetType(&kDstType);
-    pDXGLSrcResource->GetType(&kSrcType);
-
-    if (kDstType == kSrcType)
-    {
-        CheckCurrentContext(m_pContext);
-        switch (kDstType)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            NCryOpenGL::CopyTexture(
-                static_cast<NCryOpenGL::STexture*>(pDXGLDstResource->GetGLResource()),
-                static_cast<NCryOpenGL::STexture*>(pDXGLSrcResource->GetGLResource()),
-                m_pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            NCryOpenGL::CopyBuffer(
-                static_cast<NCryOpenGL::SBuffer*>(pDXGLDstResource->GetGLResource()),
-                static_cast<NCryOpenGL::SBuffer*>(pDXGLSrcResource->GetGLResource()),
-                m_pContext);
-            break;
-        default:
-            assert(false);
-            break;
-        }
-    }
-    else
-    {
-        DXGL_ERROR("CopyResource failed - source and destination are resources of different type");
-    }
-}
-
-void CCryDXGLDeviceContext::UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch)
-{
-    CheckCurrentContext(m_pContext);
-    NCryOpenGL::SResource* pGLResource(CCryDXGLResource::FromInterface(pDstResource)->GetGLResource());
-    if (pGLResource->m_pfUpdateSubresource)
-    {
-        (*pGLResource->m_pfUpdateSubresource)(pGLResource, DstSubresource, pDstBox, pSrcData, SrcRowPitch, SrcDepthPitch, m_pContext);
-    }
-    else
-    {
-        DXGL_NOT_IMPLEMENTED
-    }
-}
-
-void CCryDXGLDeviceContext::CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ])
-{
-    CheckCurrentContext(m_pContext);
-    CCryDXGLRenderTargetView* pDXGLRenderTargetView(CCryDXGLRenderTargetView::FromInterface(pRenderTargetView));
-    m_pContext->ClearRenderTarget(pDXGLRenderTargetView == NULL ? NULL : pDXGLRenderTargetView->GetGLView(), ColorRGBA);
-}
-
-void CCryDXGLDeviceContext::ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ])
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ])
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil)
-{
-    CheckCurrentContext(m_pContext);
-    CCryDXGLDepthStencilView* pDXGLDepthStencilView(CCryDXGLDepthStencilView::FromInterface(pDepthStencilView));
-    m_pContext->ClearDepthStencil(pDXGLDepthStencilView == NULL ? NULL : pDXGLDepthStencilView->GetGLView(), (ClearFlags & D3D11_CLEAR_DEPTH) != 0, (ClearFlags & D3D11_CLEAR_STENCIL) != 0, Depth, Stencil);
-}
-
-void CCryDXGLDeviceContext::GenerateMips(ID3D11ShaderResourceView* pShaderResourceView)
-{
-    CheckCurrentContext(m_pContext);
-    NCryOpenGL::SShaderView* pGLView(CCryDXGLShaderResourceView::FromInterface(pShaderResourceView)->GetGLView());
-    switch (pGLView->m_eType)
-    {
-    case NCryOpenGL::SShaderView::eSVT_Texture:
-        static_cast<NCryOpenGL::SShaderTextureBasedView*>(pGLView)->GenerateMipmaps(m_pContext);
-        break;
-    default:
-        DXGL_ERROR("Generation of mipmaps for this type of resource view is not supported");
-        break;
-    }
-}
-
-void CCryDXGLDeviceContext::SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD)
-{
-    CCryDXGLResource* pDXGLDstResource(CCryDXGLResource::FromInterface(pResource));
-    static_cast<NCryOpenGL::STexture*>(pDXGLDstResource->GetGLResource())->SetMinLod(MinLOD);
-}
-
-FLOAT CCryDXGLDeviceContext::GetResourceMinLOD(ID3D11Resource* pResource)
-{
-    CCryDXGLResource* pDXGLDstResource(CCryDXGLResource::FromInterface(pResource));
-    return static_cast<NCryOpenGL::STexture*>(pDXGLDstResource->GetGLResource())->GetMinLod();
-}
-
-void CCryDXGLDeviceContext::ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts)
-{
-#if DXGL_SUPPORT_COMPUTE
-    SetUnorderedAccessViews(NCryOpenGL::eST_Compute, StartSlot, NumUAVs, ppUnorderedAccessViews);
-#else
-    DXGL_ERROR("CCryDXGLDeviceContext::CSSetUnorderedAccessViews is not supported in this configuration");
-#endif //DXGL_SUPPORT_COMPUTE
-}
-
-void CCryDXGLDeviceContext::IAGetInputLayout(ID3D11InputLayout** ppInputLayout)
-{
-    CCryDXGLInputLayout::ToInterface(ppInputLayout, m_spInputLayout);
-    if ((*ppInputLayout) != NULL)
-    {
-        (*ppInputLayout)->AddRef();
-    }
-}
-
-void CCryDXGLDeviceContext::IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets)
-{
-    uint32 uSlot;
-    for (uSlot = 0; uSlot < NumBuffers; ++uSlot)
-    {
-        uint32 uSlotIndex(StartSlot + uSlot);
-
-        CCryDXGLBuffer::ToInterface(ppVertexBuffers + uSlot, m_aspVertexBuffers[uSlotIndex]);
-        if (ppVertexBuffers[uSlot] != NULL)
-        {
-            ppVertexBuffers[uSlot]->AddRef();
-        }
-        pStrides[uSlot] = m_auVertexBufferStrides[uSlotIndex];
-        pOffsets[uSlot] = m_auVertexBufferOffsets[uSlotIndex];
-    }
-}
-
-void CCryDXGLDeviceContext::IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset)
-{
-    CCryDXGLBuffer::ToInterface(pIndexBuffer, m_spIndexBuffer);
-    if ((*pIndexBuffer) != NULL)
-    {
-        (*pIndexBuffer)->AddRef();
-    }
-    *Format = m_eIndexBufferFormat;
-    *Offset = m_uIndexBufferOffset;
-}
-
-void CCryDXGLDeviceContext::IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology)
-{
-    *pTopology = m_ePrimitiveTopology;
-}
-
-void CCryDXGLDeviceContext::GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue)
-{
-    ID3D11Query* pQuery;
-    CCryDXGLQuery::ToInterface(&pQuery, m_spPredicate);
-    *ppPredicate = static_cast<ID3D11Predicate*>(pQuery);
-    *pPredicateValue = (m_bPredicateValue ? TRUE : FALSE);
-}
-
-void CCryDXGLDeviceContext::OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView)
-{
-    OMGetRenderTargetsAndUnorderedAccessViews(NumViews, ppRenderTargetViews, ppDepthStencilView, 0, 0, NULL);
-}
-
-void CCryDXGLDeviceContext::OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-{
-    for (uint32 uRTV = 0; uRTV < NumRTVs; ++uRTV)
-    {
-        CCryDXGLRenderTargetView::ToInterface(ppRenderTargetViews + uRTV, m_aspRenderTargetViews[uRTV]);
-        if (ppRenderTargetViews[uRTV] != NULL)
-        {
-            ppRenderTargetViews[uRTV]->AddRef();
-        }
-    }
-    CCryDXGLDepthStencilView::ToInterface(ppDepthStencilView, m_spDepthStencilView);
-    if ((*ppDepthStencilView) != NULL)
-    {
-        (*ppDepthStencilView)->AddRef();
-    }
-
-    GetUnorderedAccesses(NCryOpenGL::eST_Fragment, 0, NumUAVs, ppUnorderedAccessViews);
-}
-
-void CCryDXGLDeviceContext::OMGetBlendState(ID3D11BlendState** ppBlendState, FLOAT BlendFactor[ 4 ], UINT* pSampleMask)
-{
-    CCryDXGLBlendState::ToInterface(ppBlendState, m_spBlendState);
-    if ((*ppBlendState) != NULL)
-    {
-        (*ppBlendState)->AddRef();
-    }
-    BlendFactor[0] = m_auBlendFactor[0];
-    BlendFactor[1] = m_auBlendFactor[1];
-    BlendFactor[2] = m_auBlendFactor[2];
-    BlendFactor[3] = m_auBlendFactor[3];
-    *pSampleMask = m_uSampleMask;
-}
-
-void CCryDXGLDeviceContext::OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef)
-{
-    CCryDXGLDepthStencilState::ToInterface(ppDepthStencilState, m_spDepthStencilState);
-    if ((*ppDepthStencilState) != NULL)
-    {
-        (*ppDepthStencilState)->AddRef();
-    }
-    *pStencilRef = m_uStencilRef;
-}
-
-void CCryDXGLDeviceContext::SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets)
-{
-    for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-    {
-        CCryDXGLBuffer::ToInterface(ppSOTargets + uBuffer, m_aspStreamOutputBuffers[uBuffer]);
-        if (ppSOTargets[uBuffer] != NULL)
-        {
-            ppSOTargets[uBuffer]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::RSGetState(ID3D11RasterizerState** ppRasterizerState)
-{
-    CCryDXGLRasterizerState::ToInterface(ppRasterizerState, m_spRasterizerState);
-    if ((*ppRasterizerState) != NULL)
-    {
-        (*ppRasterizerState)->AddRef();
-    }
-}
-
-void CCryDXGLDeviceContext::RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports)
-{
-    if (pViewports != NULL)
-    {
-        cryMemcpy(pViewports, m_akViewports, min(sizeof(m_akViewports), sizeof(pViewports[0]) * *pNumViewports));
-    }
-    *pNumViewports = m_uNumViewports;
-}
-
-void CCryDXGLDeviceContext::RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects)
-{
-    if (pRects != NULL)
-    {
-        cryMemcpy(pRects, m_akScissorRects, min(sizeof(m_akScissorRects), sizeof(pRects[0]) * *pNumRects));
-    }
-    *pNumRects = m_uNumScissorRects;
-}
-
-void CCryDXGLDeviceContext::CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-{
-#if DXGL_SUPPORT_COMPUTE
-    GetUnorderedAccesses(NCryOpenGL::eST_Compute, StartSlot, NumUAVs, ppUnorderedAccessViews);
-#else
-    DXGL_ERROR("CCryDXGLDeviceContext::CSGetUnorderedAccessViews is not supported in this configuration");
-#endif //DXGL_SUPPORT_COMPUTE
-}
-
-void CCryDXGLDeviceContext::ClearState(void)
-{
-    CheckCurrentContext(m_pContext);
-
-    // Common shader state
-    for (uint32 uStage = 0; uStage < m_kStages.size(); ++uStage)
-    {
-        SStage& kStage(m_kStages.at(uStage));
-
-        for (uint32 uSRV = 0; uSRV < DXGL_ARRAY_SIZE(kStage.m_aspShaderResourceViews); ++uSRV)
-        {
-            if (kStage.m_aspShaderResourceViews[uSRV] != NULL)
-            {
-                m_pContext->SetShaderTexture(NULL, uStage, uSRV);
-                kStage.m_aspShaderResourceViews[uSRV] = NULL;
-            }
-        }
-
-#if DXGL_SUPPORT_SHADER_IMAGES
-        if (m_pContext->GetDevice()->IsFeatureSupported(NCryOpenGL::eF_ShaderImages))
-        {
-            for (uint32 uUAV = 0; uUAV < DXGL_ARRAY_SIZE(kStage.m_aspUnorderedAccessViews); ++uUAV)
-            {
-                if (kStage.m_aspUnorderedAccessViews[uUAV] != NULL)
-                {
-                    m_pContext->SetShaderImage(NULL, uStage, uUAV);
-                    kStage.m_aspUnorderedAccessViews[uUAV] = NULL;
-                }
-            }
-        }
-#endif //DXGL_SUPPORT_SHADER_IMAGES
-
-        for (uint32 uSampler = 0; uSampler < DXGL_ARRAY_SIZE(kStage.m_aspSamplerStates); ++uSampler)
-        {
-            if (kStage.m_aspSamplerStates[uSampler] != m_spDefaultSamplerState)
-            {
-                m_spDefaultSamplerState->Apply(uStage, uSampler, m_pContext);
-                kStage.m_aspSamplerStates[uSampler] = m_spDefaultSamplerState;
-            }
-        }
-
-        for (uint32 uCB = 0; uCB < DXGL_ARRAY_SIZE(kStage.m_aspConstantBuffers); ++uCB)
-        {
-            if (kStage.m_aspConstantBuffers[uCB] != NULL)
-            {
-                m_pContext->SetConstantBuffer(NULL, NCryOpenGL::SBufferRange(0, 0), uStage, uCB);
-                kStage.m_aspConstantBuffers[uCB] = NULL;
-                kStage.m_auConstantBufferOffsets[uCB] = 0;
-                kStage.m_auConstantBufferSizes[uCB] = 0;
-            }
-        }
-
-        if (m_kStages[uStage].m_spShader != NULL)
-        {
-            m_pContext->SetShader(NULL, uStage);
-            m_kStages[uStage].m_spShader = NULL;
-        }
-    }
-
-    // Vertex buffers
-    for (uint32 uVB = 0; uVB < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++uVB)
-    {
-        if (m_aspVertexBuffers[uVB] != NULL ||
-            m_auVertexBufferStrides[uVB] != 0 ||
-            m_auVertexBufferOffsets[uVB] != 0)
-        {
-            m_pContext->SetVertexBuffer(uVB, NULL, 0, 0);
-            m_aspVertexBuffers[uVB] = NULL;
-            m_auVertexBufferStrides[uVB] = 0;
-            m_auVertexBufferOffsets[uVB] = 0;
-        }
-    }
-
-    // Index buffer
-    if (m_spIndexBuffer != NULL ||
-        m_eIndexBufferFormat != DXGI_FORMAT_UNKNOWN ||
-        m_uIndexBufferOffset != 0)
-    {
-        m_pContext->SetIndexBuffer(NULL, GL_NONE, 0, 0);
-        m_spIndexBuffer = NULL;
-        m_eIndexBufferFormat = DXGI_FORMAT_UNKNOWN;
-        m_uIndexBufferOffset = 0;
-    }
-
-    // Input layout
-    if (m_spInputLayout != NULL)
-    {
-        m_pContext->SetInputLayout(NULL);
-        m_spInputLayout = NULL;
-    }
-
-    // Primitive topology
-    if (m_ePrimitiveTopology != D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED)
-    {
-        m_pContext->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED);
-        m_ePrimitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
-    }
-
-    // Output merger state
-    OMSetBlendState(NULL, NULL, 0xFFFFFFFF);
-    OMSetDepthStencilState(NULL, 0);
-    OMSetRenderTargetsAndUnorderedAccessViews(0, NULL, NULL, 0, 0, NULL, NULL);
-
-    // Rasterizer state
-    m_uNumScissorRects = 0;
-    m_pContext->SetScissorRects(0, NULL);
-    m_uNumViewports;
-    m_pContext->SetViewports(0, NULL);
-    RSSetState(NULL);
-
-    // Predication
-    SetPredication(NULL, FALSE);
-
-    // Stream output
-    SOSetTargets(0, NULL, NULL);
-}
-
-void CCryDXGLDeviceContext::Flush(void)
-{
-    CheckCurrentContext(m_pContext);
-    m_pContext->Flush();
-}
-
-D3D11_DEVICE_CONTEXT_TYPE CCryDXGLDeviceContext::GetType(void)
-{
-    DXGL_TODO("Modify when deferred contexts are supported")
-    return D3D11_DEVICE_CONTEXT_IMMEDIATE;
-}
-
-UINT CCryDXGLDeviceContext::GetContextFlags(void)
-{
-    return 0;
-}
-
-HRESULT CCryDXGLDeviceContext::FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceContext.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceContext.hpp
deleted file mode 100644
index 6208ba235f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDeviceContext.hpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11DeviceContext
-
-
-#ifndef __CRYDXGLDEVICECONTEXT__
-#define __CRYDXGLDEVICECONTEXT__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    class CContext;
-}
-
-class CCryDXGLBlendState;
-class CCryDXGLBuffer;
-class CCryDXGLDepthStencilState;
-class CCryDXGLDepthStencilView;
-class CCryDXGLInputLayout;
-class CCryDXGLQuery;
-class CCryDXGLRasterizerState;
-class CCryDXGLRenderTargetView;
-class CCryDXGLSamplerState;
-class CCryDXGLShader;
-class CCryDXGLShaderResourceView;
-class CCryDXGLUnorderedAccessView;
-
-class CCryDXGLDeviceContext
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT && !DXGL_FULL_EMULATION
-    : public ID3D11DeviceContext
-#else
-    : public CCryDXGLDeviceChild
-#endif
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDeviceContext, D3D11DeviceContext)
-
-    CCryDXGLDeviceContext();
-    virtual ~CCryDXGLDeviceContext();
-
-    bool Initialize(CCryDXGLDevice* pDevice);
-    void Shutdown();
-
-    NCryOpenGL::CContext* GetGLContext();
-
-    // ID3D11DeviceContext implementation
-    void STDMETHODCALLTYPE VSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE PSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE PSSetShader(ID3D11PixelShader* pPixelShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE PSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE VSSetShader(ID3D11VertexShader* pVertexShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation);
-    void STDMETHODCALLTYPE Draw(UINT VertexCount, UINT StartVertexLocation);
-    HRESULT STDMETHODCALLTYPE Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource);
-    void STDMETHODCALLTYPE Unmap(ID3D11Resource* pResource, UINT Subresource);
-    void STDMETHODCALLTYPE PSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE IASetInputLayout(ID3D11InputLayout* pInputLayout);
-    void STDMETHODCALLTYPE IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets);
-    void STDMETHODCALLTYPE IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset);
-    void STDMETHODCALLTYPE DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation);
-    void STDMETHODCALLTYPE DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation);
-    void STDMETHODCALLTYPE GSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE GSSetShader(ID3D11GeometryShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology);
-    void STDMETHODCALLTYPE VSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE VSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE Begin(ID3D11Asynchronous* pAsync);
-    void STDMETHODCALLTYPE End(ID3D11Asynchronous* pAsync);
-    HRESULT STDMETHODCALLTYPE GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags);
-    void STDMETHODCALLTYPE SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue);
-    void STDMETHODCALLTYPE GSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE GSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView);
-    void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts);
-    void STDMETHODCALLTYPE OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask);
-    void STDMETHODCALLTYPE OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef);
-    void STDMETHODCALLTYPE SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets);
-    void STDMETHODCALLTYPE DrawAuto(void);
-    void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs);
-    void STDMETHODCALLTYPE DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs);
-    void STDMETHODCALLTYPE Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ);
-    void STDMETHODCALLTYPE DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs);
-    void STDMETHODCALLTYPE RSSetState(ID3D11RasterizerState* pRasterizerState);
-    void STDMETHODCALLTYPE RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports);
-    void STDMETHODCALLTYPE RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects);
-    void STDMETHODCALLTYPE CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox);
-    void STDMETHODCALLTYPE CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource);
-    void STDMETHODCALLTYPE UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch);
-    void STDMETHODCALLTYPE CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView);
-    void STDMETHODCALLTYPE ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ]);
-    void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ]);
-    void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ]);
-    void STDMETHODCALLTYPE ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil);
-    void STDMETHODCALLTYPE GenerateMips(ID3D11ShaderResourceView* pShaderResourceView);
-    void STDMETHODCALLTYPE SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD);
-    FLOAT STDMETHODCALLTYPE GetResourceMinLOD(ID3D11Resource* pResource);
-    void STDMETHODCALLTYPE ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format);
-    void STDMETHODCALLTYPE ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState);
-    void STDMETHODCALLTYPE HSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE HSSetShader(ID3D11HullShader* pHullShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE HSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE HSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE DSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE DSSetShader(ID3D11DomainShader* pDomainShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE DSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE DSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE CSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts);
-    void STDMETHODCALLTYPE CSSetShader(ID3D11ComputeShader* pComputeShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE CSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE CSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE VSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE PSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE PSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE PSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout);
-    void STDMETHODCALLTYPE IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets);
-    void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset);
-    void STDMETHODCALLTYPE GSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology);
-    void STDMETHODCALLTYPE VSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE VSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue);
-    void STDMETHODCALLTYPE GSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE GSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView);
-    void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews);
-    void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState * *ppBlendState, FLOAT BlendFactor[ 4 ], UINT * pSampleMask);
-    void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef);
-    void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets);
-    void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState);
-    void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports);
-    void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects);
-    void STDMETHODCALLTYPE HSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE HSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE HSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE DSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE DSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE DSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE CSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews);
-    void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE CSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE CSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE ClearState(void);
-    void STDMETHODCALLTYPE Flush(void);
-    D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType(void);
-    UINT STDMETHODCALLTYPE GetContextFlags(void);
-    HRESULT STDMETHODCALLTYPE FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList);
-
-    // Partial ID3D11DeviceContext1 implementation
-    void STDMETHODCALLTYPE CSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-    void STDMETHODCALLTYPE PSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-    void STDMETHODCALLTYPE VSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-    void STDMETHODCALLTYPE GSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-    void STDMETHODCALLTYPE HSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-    void STDMETHODCALLTYPE DSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* pConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants);
-    void STDMETHODCALLTYPE CSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants);
-    void STDMETHODCALLTYPE PSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants);
-    void STDMETHODCALLTYPE VSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants);
-    void STDMETHODCALLTYPE GSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants);
-    void STDMETHODCALLTYPE HSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants);
-    void STDMETHODCALLTYPE DSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants);
-
-protected:
-    static _smart_ptr<CCryDXGLBlendState>         CreateDefaultBlendState(CCryDXGLDevice* pDevice);
-    static _smart_ptr<CCryDXGLDepthStencilState>  CreateDefaultDepthStencilState(CCryDXGLDevice* pDevice);
-    static _smart_ptr<CCryDXGLRasterizerState>    CreateDefaultRasterizerState(CCryDXGLDevice* pDevice);
-    static _smart_ptr<CCryDXGLSamplerState>       CreateDefaultSamplerState(CCryDXGLDevice* pDevice);
-
-    struct SStage
-    {
-        _smart_ptr<CCryDXGLShader> m_spShader;
-        _smart_ptr<CCryDXGLSamplerState> m_aspSamplerStates[D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT];
-        _smart_ptr<CCryDXGLShaderResourceView> m_aspShaderResourceViews[D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT];
-        _smart_ptr<CCryDXGLUnorderedAccessView> m_aspUnorderedAccessViews[D3D11_1_UAV_SLOT_COUNT];
-        _smart_ptr<CCryDXGLBuffer> m_aspConstantBuffers[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT];
-        uint32 m_auConstantBufferOffsets[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT];
-        uint32 m_auConstantBufferSizes[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT];
-    };
-
-    void SetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void SetUnorderedAccessViews(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews);
-    void SetShader(uint32 uStage, CCryDXGLShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void SetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void SetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant = NULL, const UINT* pNumConstants = NULL);
-
-    void GetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void GetUnorderedAccesses(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11UnorderedAccessView** ppUnorderedAccessViews);
-    void GetShader(uint32 uStage, CCryDXGLShader** pShader, ID3D11ClassInstance** ppClassInstances, UINT* NumClassInstances);
-    void GetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void GetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant = NULL, UINT* pNumConstants = NULL);
-protected:
-    NCryOpenGL::CContext* m_pContext;
-    _smart_ptr<CCryDXGLBlendState>        m_spBlendState;
-    _smart_ptr<CCryDXGLDepthStencilState> m_spDepthStencilState;
-    _smart_ptr<CCryDXGLRasterizerState>   m_spRasterizerState;
-
-    uint32 m_uStencilRef;
-    float m_auBlendFactor[4];
-    uint32 m_uSampleMask;
-
-    std::vector<SStage> m_kStages;
-
-    _smart_ptr<CCryDXGLBuffer> m_aspVertexBuffers[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-    uint32 m_auVertexBufferStrides[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-    uint32 m_auVertexBufferOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-    _smart_ptr<CCryDXGLInputLayout> m_spInputLayout;
-    _smart_ptr<CCryDXGLBuffer> m_spIndexBuffer;
-    DXGI_FORMAT m_eIndexBufferFormat;
-    uint32 m_uIndexBufferOffset;
-    D3D11_PRIMITIVE_TOPOLOGY m_ePrimitiveTopology;
-    _smart_ptr<CCryDXGLRenderTargetView> m_aspRenderTargetViews[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT];
-    _smart_ptr<CCryDXGLDepthStencilView> m_spDepthStencilView;
-    uint32 m_uNumViewports;
-    D3D11_VIEWPORT m_akViewports[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-    uint32 m_uNumScissorRects;
-    D3D11_RECT m_akScissorRects[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-    _smart_ptr<CCryDXGLQuery> m_spPredicate;
-    bool m_bPredicateValue;
-    _smart_ptr<CCryDXGLBuffer> m_aspStreamOutputBuffers[D3D11_SO_BUFFER_SLOT_COUNT];
-    uint32 m_auStreamOutputBufferOffsets[D3D11_SO_BUFFER_SLOT_COUNT];
-
-    _smart_ptr<CCryDXGLBlendState>        m_spDefaultBlendState;
-    _smart_ptr<CCryDXGLDepthStencilState> m_spDefaultDepthStencilState;
-    _smart_ptr<CCryDXGLRasterizerState>   m_spDefaultRasterizerState;
-    _smart_ptr<CCryDXGLSamplerState>      m_spDefaultSamplerState;
-};
-
-#endif //__CRYDXGLDEVICECONTEXT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIAdapter.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIAdapter.cpp
deleted file mode 100644
index dcbf0f9411..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIAdapter.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIAdapter
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLGIAdapter.hpp"
-#include "CCryDXGLGIFactory.hpp"
-#include "CCryDXGLGIOutput.hpp"
-#include "../Implementation/GLDevice.hpp"
-#include "UnicodeFunctions.h"
-#include "../../../Common/RenderCapabilities.h"
-
-CCryDXGLGIAdapter::CCryDXGLGIAdapter(CCryDXGLGIFactory* pFactory, NCryOpenGL::SAdapter* pGLAdapter)
-    : m_spGLAdapter(pGLAdapter)
-    , m_spFactory(pFactory)
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIAdapter)
-    DXGL_INITIALIZE_INTERFACE(DXGIAdapter1)
-}
-
-CCryDXGLGIAdapter::~CCryDXGLGIAdapter()
-{
-}
-
-bool CCryDXGLGIAdapter::Initialize()
-{
-    memset(&m_kDesc1, 0, sizeof(m_kDesc1));
-    Unicode::Convert(m_kDesc.Description, m_spGLAdapter->m_strRenderer);
-    memcpy(m_kDesc1.Description, m_kDesc.Description, sizeof(m_kDesc1.Description));
-    m_kDesc1.VendorId = m_spGLAdapter->m_eDriverVendor;
-    std::vector<NCryOpenGL::SOutputPtr> kGLOutputs;
-    if (!NCryOpenGL::DetectOutputs(*m_spGLAdapter, m_spGLAdapter->m_kOutputs))
-    {
-        return false;
-    }
-
-    m_kOutputs.reserve(m_spGLAdapter->m_kOutputs.size());
-
-    std::vector<NCryOpenGL::SOutputPtr>::const_iterator kGLOutputIter(m_spGLAdapter->m_kOutputs.begin());
-    const std::vector<NCryOpenGL::SOutputPtr>::const_iterator kGLOutputEnd(m_spGLAdapter->m_kOutputs.end());
-    for (; kGLOutputIter !=  kGLOutputEnd; ++kGLOutputIter)
-    {
-        _smart_ptr<CCryDXGLGIOutput> spOutput(new CCryDXGLGIOutput(*kGLOutputIter));
-        if (!spOutput->Initialize())
-        {
-            return false;
-        }
-        m_kOutputs.push_back(spOutput);
-    }
-
-    DXGL_TODO("Detect from available extensions")
-    m_eSupportedFeatureLevel = D3D_FEATURE_LEVEL_11_0;
-
-    m_kDesc1.DedicatedVideoMemory = m_spGLAdapter->m_uVRAMBytes;
-
-    return true;
-}
-
-D3D_FEATURE_LEVEL CCryDXGLGIAdapter::GetSupportedFeatureLevel()
-{
-    return m_eSupportedFeatureLevel;
-}
-
-NCryOpenGL::SAdapter* CCryDXGLGIAdapter::GetGLAdapter()
-{
-    return m_spGLAdapter.get();
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIObject overrides
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIAdapter::GetParent(REFIID riid, void** ppParent)
-{
-    IUnknown* pFactoryInterface;
-    CCryDXGLBase::ToInterface(&pFactoryInterface, m_spFactory);
-    if (pFactoryInterface->QueryInterface(riid, ppParent) == S_OK && ppParent != NULL)
-    {
-        return S_OK;
-    }
-    return CCryDXGLGIObject::GetParent(riid, ppParent);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIAdapter implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIAdapter::EnumOutputs(UINT Output, IDXGIOutput** ppOutput)
-{
-    if (Output >= m_kOutputs.size())
-    {
-        ppOutput = NULL;
-        return DXGI_ERROR_NOT_FOUND;
-    }
-
-    CCryDXGLGIOutput::ToInterface(ppOutput, m_kOutputs.at(Output));
-    (*ppOutput)->AddRef();
-
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIAdapter::GetDesc(DXGI_ADAPTER_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIAdapter::CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion)
-{
-    if (InterfaceName == __uuidof(ID3D10Device)
-        || InterfaceName == __uuidof(ID3D11Device)
-#if !DXGL_FULL_EMULATION
-        || InterfaceName == __uuidof(CCryDXGLDevice)
-#endif //!DXGL_FULL_EMULATION
-        )
-    {
-        if (pUMDVersion != NULL)
-        {
-            DXGL_TODO("Put useful data here");
-            pUMDVersion->HighPart = 0;
-            pUMDVersion->LowPart = 0;
-        }
-        return S_OK;
-    }
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIAdapter1 implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIAdapter::GetDesc1(DXGI_ADAPTER_DESC1* pDesc)
-{
-    *pDesc = m_kDesc1;
-    return S_OK;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIAdapter.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIAdapter.hpp
deleted file mode 100644
index 0c37d84fc6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIAdapter.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGIAdapter
-
-
-#ifndef __CRYDXGLGIADAPTER__
-#define __CRYDXGLGIADAPTER__
-
-#include "CCryDXGLGIObject.hpp"
-
-namespace NCryOpenGL
-{
-    struct SAdapter;
-}
-
-class CCryDXGLGIFactory;
-class CCryDXGLGIOutput;
-
-class CCryDXGLGIAdapter
-    : public CCryDXGLGIObject
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIAdapter, DXGIAdapter)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIAdapter, DXGIAdapter1)
-
-    CCryDXGLGIAdapter(CCryDXGLGIFactory* pFactory, NCryOpenGL::SAdapter* pGLAdapter);
-    virtual ~CCryDXGLGIAdapter();
-
-    bool Initialize();
-    D3D_FEATURE_LEVEL GetSupportedFeatureLevel();
-    NCryOpenGL::SAdapter* GetGLAdapter();
-
-    // IDXGIObject overrides
-    HRESULT GetParent(REFIID riid, void** ppParent);
-
-    // IDXGIAdapter implementation
-    HRESULT EnumOutputs(UINT Output, IDXGIOutput** ppOutput);
-    HRESULT GetDesc(DXGI_ADAPTER_DESC* pDesc);
-    HRESULT CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion);
-
-    // IDXGIAdapter1 implementation
-    HRESULT GetDesc1(DXGI_ADAPTER_DESC1* pDesc);
-protected:
-    std::vector<_smart_ptr<CCryDXGLGIOutput> > m_kOutputs;
-    _smart_ptr<CCryDXGLGIFactory> m_spFactory;
-
-    _smart_ptr<NCryOpenGL::SAdapter> m_spGLAdapter;
-    DXGI_ADAPTER_DESC m_kDesc;
-    DXGI_ADAPTER_DESC1 m_kDesc1;
-    D3D_FEATURE_LEVEL m_eSupportedFeatureLevel;
-};
-
-#endif //__CRYDXGLGIADAPTER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIFactory.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIFactory.cpp
deleted file mode 100644
index c959cd1199..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIFactory.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIFactory
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLGIAdapter.hpp"
-#include "CCryDXGLGIFactory.hpp"
-#include "CCryDXGLSwapChain.hpp"
-#include "../Interfaces/CCryDXGLDevice.hpp"
-#include "../Implementation/GLDevice.hpp"
-
-
-CCryDXGLGIFactory::CCryDXGLGIFactory()
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIFactory)
-    DXGL_INITIALIZE_INTERFACE(DXGIFactory1)
-}
-
-CCryDXGLGIFactory::~CCryDXGLGIFactory()
-{
-}
-
-bool CCryDXGLGIFactory::Initialize()
-{
-    std::vector<NCryOpenGL::SAdapterPtr> kAdapters;
-    if (!NCryOpenGL::DetectAdapters(kAdapters))
-    {
-        return false;
-    }
-
-    // Check if the adapters support what's needed for running the game.
-    bool foundCapableAdapter = false;
-    AZStd::string errorMsg;
-    for (const NCryOpenGL::SAdapterPtr& adapterPtr : kAdapters)
-    {
-        AZStd::string adapterError;
-        if (adapterPtr && NCryOpenGL::CheckAdapterCapabilities(*adapterPtr, &adapterError))
-        {
-            foundCapableAdapter = true;
-            break;
-        }
-
-        errorMsg += adapterError;
-    }
-
-    if (!foundCapableAdapter)
-    {
-        AZ_Assert(false, "The available graphic adapters don't meet the minimum requirements for running the game. \n%s", errorMsg.c_str());
-        return false;
-    }
-
-    uint32 uAdapter;
-    for (uAdapter = 0; uAdapter < kAdapters.size(); ++uAdapter)
-    {
-        _smart_ptr<CCryDXGLGIAdapter> spAdapter(new CCryDXGLGIAdapter(this, kAdapters.at(uAdapter).get()));
-        if (!spAdapter->Initialize())
-        {
-            return false;
-        }
-        m_kAdapters.push_back(spAdapter);
-    }
-
-    return true;
-}
-
-template <typename AdapterInterface>
-HRESULT EnumAdaptersInternal(UINT Adapter, AdapterInterface** ppAdapter, const std::vector<_smart_ptr<CCryDXGLGIAdapter> >& kAdapters)
-{
-    if (Adapter < kAdapters.size())
-    {
-        CCryDXGLGIAdapter::ToInterface(ppAdapter, kAdapters.at(Adapter));
-        return S_OK;
-    }
-    *ppAdapter = NULL;
-    return DXGI_ERROR_NOT_FOUND;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIFactory implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIFactory::EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter)
-{
-    return EnumAdaptersInternal(Adapter, ppAdapter, m_kAdapters);
-}
-
-HRESULT CCryDXGLGIFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags)
-{
-    DXGL_TODO("Implement ALT+ENTER handling in OpenGL if required")
-    Flags;
-
-    m_hWindowHandle = WindowHandle;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIFactory::GetWindowAssociation(HWND* pWindowHandle)
-{
-    *pWindowHandle = m_hWindowHandle;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIFactory::CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain)
-{
-    void* pvD3D11Device;
-    if (FAILED(pDevice->QueryInterface(__uuidof(ID3D11Device), &pvD3D11Device)) || pvD3D11Device == NULL)
-    {
-        DXGL_ERROR("CCryDXGLGIFactory::CreateSwapChain - device type is not compatible with swap chain creation");
-        return E_FAIL;
-    }
-    CCryDXGLDevice* pDXGLDevice(CCryDXGLDevice::FromInterface(static_cast<ID3D11Device*>(pvD3D11Device)));
-
-    _smart_ptr<CCryDXGLSwapChain> spSwapChain(new CCryDXGLSwapChain(pDXGLDevice, *pDesc));
-    if (!spSwapChain->Initialize())
-    {
-        return false;
-    }
-    CCryDXGLSwapChain::ToInterface(ppSwapChain, spSwapChain);
-    spSwapChain->AddRef();
-
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIFactory::CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIFactory1 implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIFactory::EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter)
-{
-    return EnumAdaptersInternal(Adapter, ppAdapter, m_kAdapters);
-}
-
-BOOL CCryDXGLGIFactory::IsCurrent()
-{
-    DXGL_NOT_IMPLEMENTED
-    return false;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIFactory.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIFactory.hpp
deleted file mode 100644
index 4acbe841ae..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIFactory.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGIFactory
-
-
-#ifndef __CRYDXGLGIFACTORY__
-#define __CRYDXGLGIFACTORY__
-
-#include "CCryDXGLGIObject.hpp"
-
-class CCryDXGLGIAdapter;
-
-class CCryDXGLGIFactory
-    : public CCryDXGLGIObject
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIFactory, DXGIFactory)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIFactory, DXGIFactory1)
-
-    CCryDXGLGIFactory();
-    ~CCryDXGLGIFactory();
-    bool Initialize();
-
-    // IDXGIFactory implementation
-    HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter);
-    HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags);
-    HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle);
-    HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain);
-    HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter);
-
-    // IDXGIFactory1 implementation
-    HRESULT STDMETHODCALLTYPE EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter);
-    BOOL STDMETHODCALLTYPE IsCurrent();
-protected:
-    typedef std::vector<_smart_ptr<CCryDXGLGIAdapter> > Adapters;
-protected:
-    // The adapters available on this system
-    Adapters m_kAdapters;
-    HWND m_hWindowHandle;
-};
-
-#endif //__CRYDXGLGIFACTORY__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIObject.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIObject.cpp
deleted file mode 100644
index bbec7eadfa..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIObject.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIObject
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLGIObject.hpp"
-#include "../Implementation/GLCommon.hpp"
-
-
-CCryDXGLGIObject::CCryDXGLGIObject()
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIObject)
-}
-
-CCryDXGLGIObject::~CCryDXGLGIObject()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIObject implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIObject::SetPrivateData(REFGUID Name, UINT DataSize, const void* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateData(Name, DataSize, pData);
-}
-
-HRESULT CCryDXGLGIObject::SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown)
-{
-    return m_kPrivateDataContainer.SetPrivateDataInterface(Name, pUnknown);
-}
-
-HRESULT CCryDXGLGIObject::GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData)
-{
-    return m_kPrivateDataContainer.GetPrivateData(Name, pDataSize, pData);
-}
-
-HRESULT CCryDXGLGIObject::GetParent(REFIID riid, void** ppParent)
-{
-    DXGL_TODO("Implement if required")
-    * ppParent = NULL;
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIObject.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIObject.hpp
deleted file mode 100644
index f593098fab..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIObject.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGIObject
-
-#ifndef __CRYDXGLGIOBJECT__
-#define __CRYDXGLGIOBJECT__
-
-#include "CCryDXGLBase.hpp"
-
-
-class CCryDXGLGIObject
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIObject, DXGIObject)
-
-    CCryDXGLGIObject();
-    virtual ~CCryDXGLGIObject();
-
-    // IDXGIObject implementation
-    HRESULT SetPrivateData(REFGUID Name, UINT DataSize, const void* pData);
-    HRESULT SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown);
-    HRESULT GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData);
-    HRESULT GetParent(REFIID riid, void** ppParent);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLGIObject>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-
-protected:
-    CCryDXGLPrivateDataContainer m_kPrivateDataContainer;
-};
-
-#endif //__CRYDXGLGIOBJECT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.cpp
deleted file mode 100644
index 74515d5eb5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIOutput
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLGIOutput.hpp"
-#include "../Implementation/GLDevice.hpp"
-#include "UnicodeFunctions.h"
-
-
-CCryDXGLGIOutput::CCryDXGLGIOutput(NCryOpenGL::SOutput* pGLOutput)
-    : m_spGLOutput(pGLOutput)
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIOutput)
-}
-
-CCryDXGLGIOutput::~CCryDXGLGIOutput()
-{
-}
-
-bool CCryDXGLGIOutput::Initialize()
-{
-    ZeroMemory(&m_kDesc, sizeof(m_kDesc));
-
-    Unicode::Convert(m_kDesc.DeviceName, m_spGLOutput->m_strDeviceName);
-
-    if (m_spGLOutput->m_kModes.empty())
-    {
-        DXGL_ERROR("GL Output has no display modes");
-        return false;
-    }
-
-    m_kDisplayModes.resize(m_spGLOutput->m_kModes.size());
-
-    std::vector<NCryOpenGL::SDisplayMode>::const_iterator kGLModeIter(m_spGLOutput->m_kModes.begin());
-    const std::vector<NCryOpenGL::SDisplayMode>::const_iterator kGLModeEnd(m_spGLOutput->m_kModes.end());
-    std::vector<DXGI_MODE_DESC>::iterator kModeIter;
-    for (kModeIter = m_kDisplayModes.begin(); kGLModeIter != kGLModeEnd; ++kGLModeIter, ++kModeIter)
-    {
-        NCryOpenGL::GetDXGIModeDesc(&*kModeIter, *kGLModeIter);
-    }
-
-    return true;
-}
-
-NCryOpenGL::SOutput* CCryDXGLGIOutput::GetGLOutput()
-{
-    return m_spGLOutput;
-}
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIOutput implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIOutput::GetDesc(DXGI_OUTPUT_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIOutput::GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc)
-{
-    DXGL_TODO("Take into account Flags as well (for filtering scaled/interlaced modes) if required")
-    Flags;
-
-    DXGI_MODE_DESC* pDescEnd(pDesc == NULL ? NULL : pDesc + *pNumModes);
-    std::vector<DXGI_MODE_DESC>::const_iterator kModeIter(m_kDisplayModes.begin());
-    const std::vector<DXGI_MODE_DESC>::const_iterator kModeEnd(m_kDisplayModes.end());
-    for (; kModeIter != kModeEnd; ++kModeIter)
-    {
-        if (EnumFormat == DXGI_FORMAT_UNKNOWN || EnumFormat == kModeIter->Format)
-        {
-            if (pDesc == NULL)
-            {
-                ++(*pNumModes);
-            }
-            else if (pDesc < pDescEnd)
-            {
-                *(pDesc++) = *kModeIter;
-            }
-            else
-            {
-                return DXGI_ERROR_MORE_DATA;
-            }
-        }
-    }
-
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIOutput::FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice)
-{
-    struct SRank
-    {
-        uint32 m_uOrdering;
-        uint32 m_uScaling;
-        uint32 m_uFormat;
-        uint32 m_uResolution;
-        uint32 m_uRefreshRate;
-
-        SRank(uint32 uDefaultValue)
-            : m_uOrdering(uDefaultValue)
-            , m_uScaling(uDefaultValue)
-            , m_uFormat(uDefaultValue)
-            , m_uResolution(uDefaultValue)
-            , m_uRefreshRate(uDefaultValue)
-        {
-        }
-
-        SRank(const DXGI_MODE_DESC& kDesc, const DXGI_MODE_DESC& kReference)
-        {
-            m_uOrdering = MatchOrdering(kDesc, kReference);
-            m_uScaling = MatchScaling(kDesc, kReference);
-            m_uFormat = kDesc.Format == kReference.Format;
-            m_uResolution = abs((int32)kDesc.Width * (int32)kDesc.Height - (int32)kReference.Width * (int32)kReference.Height);
-            m_uRefreshRate = (uint32)abs((float)kDesc.RefreshRate.Numerator / (float)kDesc.RefreshRate.Denominator - (float)kReference.RefreshRate.Numerator / (float)kReference.RefreshRate.Denominator);
-        }
-
-        static bool MatchScaling(const DXGI_MODE_DESC& kDesc, const DXGI_MODE_DESC& kReference)
-        {
-            return kReference.Scaling != DXGI_MODE_SCALING_UNSPECIFIED && kReference.Scaling != kDesc.Scaling;
-        }
-
-        static bool MatchOrdering(const DXGI_MODE_DESC& kDesc, const DXGI_MODE_DESC& kReference)
-        {
-            return kReference.ScanlineOrdering != DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED && kReference.ScanlineOrdering != kDesc.ScanlineOrdering;
-        }
-
-        static bool MatchFormat(const DXGI_MODE_DESC& kDesc, const DXGI_MODE_DESC& kReference)
-        {
-            return kReference.Format == kDesc.Format;
-        }
-
-        static bool MatchResolution(const DXGI_MODE_DESC& kDesc, const DXGI_MODE_DESC& kReference)
-        {
-            return kDesc.Height >= kReference.Height && kDesc.Width >= kReference.Width;
-        }
-
-        static bool MatchRefreshRate(const DXGI_MODE_DESC& kDesc, const DXGI_MODE_DESC& kReference)
-        {
-            return kDesc.RefreshRate.Numerator * kReference.RefreshRate.Denominator >= kReference.RefreshRate.Numerator *  kDesc.RefreshRate.Denominator;
-        }
-
-        bool operator<(const SRank& kOther) const
-        {
-            if (m_uOrdering != kOther.m_uOrdering)
-            {
-                return m_uOrdering < kOther.m_uOrdering;
-            }
-            if (m_uScaling != kOther.m_uScaling)
-            {
-                return m_uScaling < kOther.m_uScaling;
-            }
-            if (m_uFormat != kOther.m_uFormat)
-            {
-                return m_uFormat < kOther.m_uFormat;
-            }
-            if (m_uResolution != kOther.m_uResolution)
-            {
-                return m_uResolution < kOther.m_uResolution;
-            }
-            return m_uRefreshRate < kOther.m_uRefreshRate;
-        }
-    };
-
-    bool bScanlineOrdering(pModeToMatch->ScanlineOrdering != DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED);
-    bool bScaling(pModeToMatch->Scaling != DXGI_MODE_SCALING_UNSPECIFIED);
-    bool bFormat(pModeToMatch->Format != DXGI_FORMAT_UNKNOWN);
-    bool bResolution(pModeToMatch->Width != 0 || pModeToMatch->Height != 0);
-    bool bRefreshRate(pModeToMatch->RefreshRate.Numerator != 0 || pModeToMatch->RefreshRate.Denominator != 0);
-
-    if ((!bFormat && pConcernedDevice == NULL) ||
-        bResolution != (pModeToMatch->Width != 0 && pModeToMatch->Height != 0) ||
-        bRefreshRate != (pModeToMatch->RefreshRate.Numerator != 0 && pModeToMatch->RefreshRate.Denominator != 0))
-    {
-        return E_FAIL;
-    }
-
-    ID3D11Device* pConcernedD3D11Device(NULL);
-    DXGI_MODE_DESC kTarget(*pModeToMatch);
-    if (!bScanlineOrdering)
-    {
-        kTarget.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE;
-    }
-    if (!bScaling)
-    {
-        kTarget.Scaling = DXGI_MODE_SCALING_STRETCHED;
-    }
-    if (!bFormat || !bResolution || !bRefreshRate)
-    {
-        DXGI_MODE_DESC kDXGIDesktopModeDesc;
-        GetDXGIModeDesc(&kDXGIDesktopModeDesc, m_spGLOutput->m_kDesktopMode);
-
-        if (!bFormat)
-        {
-            void* pvConcernedD3D11Device(NULL);
-            if (pConcernedDevice != NULL && !FAILED(pConcernedDevice->QueryInterface(__uuidof(ID3D11Device), &pvConcernedD3D11Device)))
-            {
-                pConcernedD3D11Device = static_cast<ID3D11Device*>(pvConcernedD3D11Device);
-            }
-            else
-            {
-                kTarget.Format = kDXGIDesktopModeDesc.Format;
-            }
-        }
-
-        if (!bResolution)
-        {
-            kTarget.Width = kDXGIDesktopModeDesc.Width;
-            kTarget.Height = kDXGIDesktopModeDesc.Height;
-        }
-
-        if (!bRefreshRate)
-        {
-            kTarget.RefreshRate.Numerator = kDXGIDesktopModeDesc.RefreshRate.Numerator;
-            kTarget.RefreshRate.Denominator = kDXGIDesktopModeDesc.RefreshRate.Denominator;
-        }
-    }
-
-    uint32 uMinMode = m_kDisplayModes.size();
-    SRank kMinRank(~0);
-    for (uint32 uMode = 0; uMode < m_kDisplayModes.size(); ++uMode)
-    {
-        const DXGI_MODE_DESC& kMode(m_kDisplayModes.at(uMode));
-
-        if ((bScanlineOrdering && !SRank::MatchOrdering(kMode, kTarget)) ||
-            (bScaling          && !SRank::MatchScaling(kMode, kTarget)) ||
-            (bFormat           && !SRank::MatchFormat(kMode, kTarget)) ||
-            (bResolution       && !SRank::MatchResolution(kMode, kTarget)) ||
-            (bRefreshRate      && !SRank::MatchRefreshRate(kMode, kTarget)))
-        {
-            continue;
-        }
-
-        if (pConcernedD3D11Device != NULL)
-        {
-            UINT uModeFormatSuppport;
-            if (FAILED(pConcernedD3D11Device->CheckFormatSupport(kMode.Format, &uModeFormatSuppport)) ||
-                (uModeFormatSuppport & D3D11_FORMAT_SUPPORT_DISPLAY) == 0)
-            {
-                continue;
-            }
-        }
-
-        SRank kModeRank(kMode, kTarget);
-        if (kModeRank < kMinRank)
-        {
-            uMinMode = uMode;
-            kMinRank = kModeRank;
-        }
-    }
-
-    if (uMinMode < m_kDisplayModes.size())
-    {
-        *pClosestMatch = m_kDisplayModes.at(uMinMode);
-        if (pClosestMatch->Scaling == DXGI_MODE_SCALING_UNSPECIFIED)
-        {
-            pClosestMatch->Scaling = kTarget.Scaling;
-        }
-        if (pClosestMatch->ScanlineOrdering == DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED)
-        {
-            pClosestMatch->ScanlineOrdering = kTarget.ScanlineOrdering;
-        }
-        return S_OK;
-    }
-
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::WaitForVBlank(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::TakeOwnership(IUnknown* pDevice, BOOL Exclusive)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-void CCryDXGLGIOutput::ReleaseOwnership(void)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-HRESULT CCryDXGLGIOutput::GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::SetGammaControl(const DXGI_GAMMA_CONTROL* pArray)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::GetGammaControl(DXGI_GAMMA_CONTROL* pArray)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::SetDisplaySurface(IDXGISurface* pScanoutSurface)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::GetDisplaySurfaceData(IDXGISurface* pDestination)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.hpp
deleted file mode 100644
index 5321fa21df..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGIOutput
-
-
-#ifndef __CRYDXGLGIOUTPUT__
-#define __CRYDXGLGIOUTPUT__
-
-#include "CCryDXGLGIObject.hpp"
-
-namespace NCryOpenGL
-{
-    struct SOutput;
-}
-
-
-class CCryDXGLGIOutput
-    : public CCryDXGLGIObject
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIOutput, DXGIOutput)
-
-    CCryDXGLGIOutput(NCryOpenGL::SOutput* pGLOutput);
-    virtual ~CCryDXGLGIOutput();
-
-    bool Initialize();
-    NCryOpenGL::SOutput* GetGLOutput();
-
-    // IDXGIOutput implementation
-    HRESULT GetDesc(DXGI_OUTPUT_DESC* pDesc);
-    HRESULT GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc);
-    HRESULT FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice);
-    HRESULT WaitForVBlank(void);
-    HRESULT TakeOwnership(IUnknown* pDevice, BOOL Exclusive);
-    void ReleaseOwnership(void);
-    HRESULT GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps);
-    HRESULT SetGammaControl(const DXGI_GAMMA_CONTROL* pArray);
-    HRESULT GetGammaControl(DXGI_GAMMA_CONTROL* pArray);
-    HRESULT SetDisplaySurface(IDXGISurface* pScanoutSurface);
-    HRESULT GetDisplaySurfaceData(IDXGISurface* pDestination);
-    HRESULT GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats);
-
-protected:
-    _smart_ptr<NCryOpenGL::SOutput> m_spGLOutput;
-    std::vector<DXGI_MODE_DESC> m_kDisplayModes;
-    DXGI_OUTPUT_DESC m_kDesc;
-};
-
-#endif //__CRYDXGLGIOUTPUT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLInputLayout.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLInputLayout.cpp
deleted file mode 100644
index 724d9f3507..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLInputLayout.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11InputLayout
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLInputLayout.hpp"
-#include "../Implementation/GLShader.hpp"
-
-
-CCryDXGLInputLayout::CCryDXGLInputLayout(NCryOpenGL::SInputLayout* pGLLayout, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spGLLayout(pGLLayout)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11InputLayout)
-}
-
-CCryDXGLInputLayout::~CCryDXGLInputLayout()
-{
-}
-
-NCryOpenGL::SInputLayout* CCryDXGLInputLayout::GetGLLayout()
-{
-    return m_spGLLayout;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLInputLayout.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLInputLayout.hpp
deleted file mode 100644
index 2a4cc6f5cd..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLInputLayout.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11InputLayout
-
-
-#ifndef __CRYDXGLINPUTLAYOUT__
-#define __CRYDXGLINPUTLAYOUT__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    struct SInputLayout;
-}
-
-class CCryDXGLInputLayout
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLInputLayout, D3D11InputLayout)
-
-    CCryDXGLInputLayout(NCryOpenGL::SInputLayout* pGLLayout, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLInputLayout();
-
-    NCryOpenGL::SInputLayout* GetGLLayout();
-private:
-    _smart_ptr<NCryOpenGL::SInputLayout> m_spGLLayout;
-};
-
-#endif //__CRYDXGLINPUTLAYOUT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLQuery.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLQuery.cpp
deleted file mode 100644
index 50ba3c6d04..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLQuery.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Query
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLQuery.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-CCryDXGLQuery::CCryDXGLQuery(const D3D11_QUERY_DESC& kDesc, NCryOpenGL::SQuery* pGLQuery, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_spGLQuery(pGLQuery)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Asynchronous)
-    DXGL_INITIALIZE_INTERFACE(D3D11Query)
-}
-
-CCryDXGLQuery::~CCryDXGLQuery()
-{
-}
-
-NCryOpenGL::SQuery* CCryDXGLQuery::GetGLQuery()
-{
-    return m_spGLQuery;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Asynchronous implementation
-////////////////////////////////////////////////////////////////////////////////
-
-UINT CCryDXGLQuery::GetDataSize(void)
-{
-    return m_spGLQuery->GetDataSize();
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Query implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLQuery::GetDesc(D3D11_QUERY_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLQuery.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLQuery.hpp
deleted file mode 100644
index c115024e33..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLQuery.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Query
-
-
-#ifndef __CRYDXGLQUERY__
-#define __CRYDXGLQUERY__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    struct SQuery;
-}
-
-class CCryDXGLQuery
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLQuery, D3D11Query)
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLQuery, D3D11Asynchronous)
-#endif //DXGL_FULL_EMULATION
-
-    CCryDXGLQuery(const D3D11_QUERY_DESC& kDesc, NCryOpenGL::SQuery* pGLQuery, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLQuery();
-
-    NCryOpenGL::SQuery* GetGLQuery();
-
-    // ID3D11Asynchronous implementation
-    UINT GetDataSize(void);
-
-    // ID3D11Query implementation
-    void GetDesc(D3D11_QUERY_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLQuery>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLDeviceChild::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_QUERY_DESC m_kDesc;
-    _smart_ptr<NCryOpenGL::SQuery> m_spGLQuery;
-};
-
-#endif //__CRYDXGLQUERY__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRasterizerState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRasterizerState.cpp
deleted file mode 100644
index 8aeff9673a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRasterizerState.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11RasterizerState
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLRasterizerState.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/GLDevice.hpp"
-
-
-CCryDXGLRasterizerState::CCryDXGLRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_pGLState(new NCryOpenGL::SRasterizerState)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11RasterizerState)
-}
-
-CCryDXGLRasterizerState::~CCryDXGLRasterizerState()
-{
-    delete m_pGLState;
-}
-
-bool CCryDXGLRasterizerState::Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext)
-{
-    return NCryOpenGL::InitializeRasterizerState(m_kDesc, *m_pGLState, pContext);
-}
-
-bool CCryDXGLRasterizerState::Apply(NCryOpenGL::CContext* pContext)
-{
-    return pContext->SetRasterizerState(*m_pGLState);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11RasterizerState
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLRasterizerState::GetDesc(D3D11_RASTERIZER_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRasterizerState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRasterizerState.hpp
deleted file mode 100644
index 61b6fc6347..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRasterizerState.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11RasterizerState
-
-
-#ifndef __CRYDXGLRASTERIZERSTATE__
-#define __CRYDXGLRASTERIZERSTATE__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    struct SRasterizerState;
-    class CContext;
-};
-
-class CCryDXGLRasterizerState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLRasterizerState, D3D11RasterizerState)
-
-    CCryDXGLRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLRasterizerState();
-
-    bool Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext);
-    bool Apply(NCryOpenGL::CContext* pContext);
-
-    // Implementation of ID3D11RasterizerState
-    void GetDesc(D3D11_RASTERIZER_DESC* pDesc);
-protected:
-    D3D11_RASTERIZER_DESC m_kDesc;
-    NCryOpenGL::SRasterizerState* m_pGLState;
-};
-
-#endif //__CRYDXGLRASTERIZERSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRenderTargetView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRenderTargetView.cpp
deleted file mode 100644
index 423ad2d39a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRenderTargetView.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11RenderTargetView
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLDevice.hpp"
-#include "CCryDXGLRenderTargetView.hpp"
-#include "CCryDXGLResource.hpp"
-#include "../Implementation/GLDevice.hpp"
-#include "../Implementation/GLView.hpp"
-
-
-CCryDXGLRenderTargetView::CCryDXGLRenderTargetView(CCryDXGLResource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11RenderTargetView)
-}
-
-CCryDXGLRenderTargetView::~CCryDXGLRenderTargetView()
-{
-}
-
-bool CCryDXGLRenderTargetView::Initialize(NCryOpenGL::CContext* pContext)
-{
-    D3D11_RESOURCE_DIMENSION eDimension;
-    m_spResource->GetType(&eDimension);
-    m_spGLView = NCryOpenGL::CreateRenderTargetView(m_spResource->GetGLResource(), eDimension, m_kDesc, pContext);
-    return m_spGLView != NULL;
-}
-
-NCryOpenGL::SOutputMergerView* CCryDXGLRenderTargetView::GetGLView()
-{
-    return m_spGLView;
-}
-
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11RenderTargetView
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLRenderTargetView::GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRenderTargetView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRenderTargetView.hpp
deleted file mode 100644
index b8a581b2a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLRenderTargetView.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11RenderTargetView
-
-
-#ifndef __CRYDXGLRENDERTARGETVIEW__
-#define __CRYDXGLRENDERTARGETVIEW__
-
-#include "CCryDXGLView.hpp"
-
-namespace NCryOpenGL
-{
-    struct SOutputMergerView;
-    class CContext;
-}
-
-class CCryDXGLRenderTargetView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLRenderTargetView, D3D11RenderTargetView)
-
-    CCryDXGLRenderTargetView(CCryDXGLResource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLRenderTargetView();
-
-    bool Initialize(NCryOpenGL::CContext* pContext);
-    NCryOpenGL::SOutputMergerView* GetGLView();
-
-    // Implementation of ID3D11RenderTargetView
-    void GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc);
-private:
-    D3D11_RENDER_TARGET_VIEW_DESC m_kDesc;
-    _smart_ptr<NCryOpenGL::SOutputMergerView> m_spGLView;
-};
-
-#endif //__CRYDXGLRENDERTARGETVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLResource.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLResource.cpp
deleted file mode 100644
index 792bee2b4c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLResource.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Resource
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLResource.hpp"
-#include "../Implementation/GLResource.hpp"
-
-CCryDXGLResource::CCryDXGLResource(D3D11_RESOURCE_DIMENSION eDimension, NCryOpenGL::SResource* pGLResource, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spGLResource(pGLResource)
-    , m_eDimension(eDimension)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Resource)
-}
-
-CCryDXGLResource::~CCryDXGLResource()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Resource
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLResource::GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension)
-{
-    *pResourceDimension = m_eDimension;
-}
-
-void CCryDXGLResource::SetEvictionPriority(UINT EvictionPriority)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-UINT CCryDXGLResource::GetEvictionPriority(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLResource.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLResource.hpp
deleted file mode 100644
index 83c94f1ed1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLResource.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Resource
-
-
-#ifndef __CRYDXGLRESOURCE__
-#define __CRYDXGLRESOURCE__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    class CDevice;
-    struct SResource;
-};
-
-class CCryDXGLResource
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLResource, D3D11Resource)
-
-    virtual ~CCryDXGLResource();
-
-    ILINE NCryOpenGL::SResource* GetGLResource() { return m_spGLResource; }
-
-    // Implementation of ID3D11Resource
-    void GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension);
-    void SetEvictionPriority(UINT EvictionPriority);
-    UINT GetEvictionPriority(void);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLResource>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLDeviceChild::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLResource(D3D11_RESOURCE_DIMENSION eDimension, NCryOpenGL::SResource* pResource, CCryDXGLDevice* pDevice);
-protected:
-    _smart_ptr<NCryOpenGL::SResource> m_spGLResource;
-    D3D11_RESOURCE_DIMENSION m_eDimension;
-};
-
-#endif //__CRYDXGLRESOURCE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSamplerState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSamplerState.cpp
deleted file mode 100644
index e7a4da4622..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSamplerState.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11SamplerState
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLSamplerState.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/GLDevice.hpp"
-
-
-CCryDXGLSamplerState::CCryDXGLSamplerState(const D3D11_SAMPLER_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_pGLState(new NCryOpenGL::SSamplerState)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11SamplerState)
-}
-
-CCryDXGLSamplerState::~CCryDXGLSamplerState()
-{
-    delete m_pGLState;
-}
-
-bool CCryDXGLSamplerState::Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext)
-{
-    return NCryOpenGL::InitializeSamplerState(m_kDesc, *m_pGLState, pContext);
-}
-
-void CCryDXGLSamplerState::Apply(uint32 uStage, uint32 uSlot, NCryOpenGL::CContext* pContext)
-{
-    pContext->SetSampler(m_pGLState, uStage, uSlot);
-}
-
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11SamplerState
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLSamplerState::GetDesc(D3D11_SAMPLER_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSamplerState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSamplerState.hpp
deleted file mode 100644
index fa542a73fe..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSamplerState.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11SamplerState
-
-
-#ifndef __CRYDXGLSAMPLERSTATE__
-#define __CRYDXGLSAMPLERSTATE__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    struct SSamplerState;
-    class CContext;
-}
-
-class CCryDXGLSamplerState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSamplerState, D3D11SamplerState)
-
-    CCryDXGLSamplerState(const D3D11_SAMPLER_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLSamplerState();
-
-    bool Initialize(CCryDXGLDevice* pDevice, NCryOpenGL::CContext* pContext);
-    void Apply(uint32 uStage, uint32 uSlot, NCryOpenGL::CContext* pContext);
-
-    // Implementation of ID3D11SamplerState
-    void GetDesc(D3D11_SAMPLER_DESC* pDesc);
-protected:
-    D3D11_SAMPLER_DESC m_kDesc;
-    NCryOpenGL::SSamplerState* m_pGLState;
-};
-
-#endif //__CRYDXGLSAMPLERSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShader.cpp
deleted file mode 100644
index 93cc909937..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShader.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for D3D11 shader interfaces
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLShader.hpp"
-#include "../Implementation/GLShader.hpp"
-
-CCryDXGLShader::CCryDXGLShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spGLShader(pGLShader)
-{
-}
-
-CCryDXGLShader::~CCryDXGLShader()
-{
-}
-
-NCryOpenGL::SShader* CCryDXGLShader::GetGLShader()
-{
-    return m_spGLShader.get();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShader.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShader.hpp
deleted file mode 100644
index 03b6d1238d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShader.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for D3D11 shader interfaces
-
-
-#ifndef __CRYDXGLSHADER__
-#define __CRYDXGLSHADER__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-namespace NCryOpenGL
-{
-    struct SShader;
-}
-
-class CCryDXGLShader
-    : public CCryDXGLDeviceChild
-{
-public:
-    CCryDXGLShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLShader();
-
-    NCryOpenGL::SShader* GetGLShader();
-private:
-    _smart_ptr<NCryOpenGL::SShader> m_spGLShader;
-};
-
-class CCryDXGLVertexShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLVertexShader, D3D11VertexShader)
-
-    CCryDXGLVertexShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11VertexShader)
-    }
-};
-
-class CCryDXGLHullShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLHullShader, D3D11HullShader)
-
-    CCryDXGLHullShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11HullShader)
-    }
-};
-
-class CCryDXGLDomainShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDomainShader, D3D11DomainShader)
-
-    CCryDXGLDomainShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11DomainShader)
-    }
-};
-
-class CCryDXGLGeometryShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGeometryShader, D3D11GeometryShader)
-
-    CCryDXGLGeometryShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11GeometryShader)
-    }
-};
-
-class CCryDXGLPixelShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLPixelShader, D3D11PixelShader)
-
-    CCryDXGLPixelShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11PixelShader)
-    }
-};
-
-class CCryDXGLComputeShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLComputeShader, D3D11ComputeShader)
-
-    CCryDXGLComputeShader(NCryOpenGL::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11ComputeShader)
-    }
-};
-
-#endif  //__CRYDXGLSHADER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderReflection.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderReflection.cpp
deleted file mode 100644
index 1848493663..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderReflection.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrappers for D3D11 shader
-//               reflection interfaces
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLShaderReflection.hpp"
-#include "../Implementation/GLShader.hpp"
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionVariable
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLShaderReflectionVariable::Impl
-{
-    NCryOpenGL::SShaderReflectionVariable* m_pVariable;
-};
-
-CCryDXGLShaderReflectionVariable::CCryDXGLShaderReflectionVariable()
-    : m_pImpl(new Impl())
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflectionVariable)
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflectionType)
-}
-
-CCryDXGLShaderReflectionVariable::~CCryDXGLShaderReflectionVariable()
-{
-    delete m_pImpl;
-}
-
-bool CCryDXGLShaderReflectionVariable::Initialize(void* pvData)
-{
-    m_pImpl->m_pVariable = static_cast<NCryOpenGL::SShaderReflectionVariable*>(pvData);
-    return true;
-}
-
-
-HRESULT CCryDXGLShaderReflectionVariable::GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc)
-{
-    (*pDesc) = m_pImpl->m_pVariable->m_kDesc;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetType()
-{
-    ID3D11ShaderReflectionType* pType;
-    ToInterface(&pType, this);
-    return pType;
-}
-
-ID3D11ShaderReflectionConstantBuffer* CCryDXGLShaderReflectionVariable::GetBuffer()
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-UINT CCryDXGLShaderReflectionVariable::GetInterfaceSlot(UINT uArrayIndex)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::GetDesc(D3D11_SHADER_TYPE_DESC* pDesc)
-{
-    (*pDesc) = m_pImpl->m_pVariable->m_kType;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetMemberTypeByIndex(UINT Index)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetMemberTypeByName(LPCSTR Name)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-LPCSTR CCryDXGLShaderReflectionVariable::GetMemberTypeName(UINT Index)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::IsEqual(ID3D11ShaderReflectionType* pType)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetSubType()
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetBaseClass()
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-UINT CCryDXGLShaderReflectionVariable::GetNumInterfaces()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetInterfaceByIndex(UINT uIndex)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::IsOfType(ID3D11ShaderReflectionType* pType)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::ImplementsInterface(ID3D11ShaderReflectionType* pBase)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionConstBuffer
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLShaderReflectionConstBuffer::Impl
-{
-    typedef std::vector<_smart_ptr<CCryDXGLShaderReflectionVariable> > TVariables;
-    TVariables m_kVariables;
-    NCryOpenGL::SShaderReflectionConstBuffer* m_pConstBuffer;
-};
-
-CCryDXGLShaderReflectionConstBuffer::CCryDXGLShaderReflectionConstBuffer()
-    : m_pImpl(new Impl())
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflectionConstantBuffer)
-}
-
-CCryDXGLShaderReflectionConstBuffer::~CCryDXGLShaderReflectionConstBuffer()
-{
-    delete m_pImpl;
-}
-
-bool CCryDXGLShaderReflectionConstBuffer::Initialize(void* pvData)
-{
-    m_pImpl->m_pConstBuffer = static_cast<NCryOpenGL::SShaderReflectionConstBuffer*>(pvData);
-
-    NCryOpenGL::SShaderReflectionConstBuffer::TVariables::iterator kVarIter(m_pImpl->m_pConstBuffer->m_kVariables.begin());
-    const NCryOpenGL::SShaderReflectionConstBuffer::TVariables::iterator kVarEnd(m_pImpl->m_pConstBuffer->m_kVariables.end());
-    while (kVarIter != kVarEnd)
-    {
-        _smart_ptr<CCryDXGLShaderReflectionVariable> spVariable(new CCryDXGLShaderReflectionVariable());
-        m_pImpl->m_kVariables.push_back(spVariable);
-
-        if (!spVariable->Initialize(static_cast<void*>(&*kVarIter)))
-        {
-            return false;
-        }
-        ++kVarIter;
-    }
-    return true;
-}
-
-HRESULT CCryDXGLShaderReflectionConstBuffer::GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc)
-{
-    (*pDesc) = m_pImpl->m_pConstBuffer->m_kDesc;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionVariable* CCryDXGLShaderReflectionConstBuffer::GetVariableByIndex(UINT Index)
-{
-    if (Index >= m_pImpl->m_kVariables.size())
-    {
-        return NULL;
-    }
-    ID3D11ShaderReflectionVariable* pVariable;
-    CCryDXGLShaderReflectionVariable::ToInterface(&pVariable, m_pImpl->m_kVariables.at(Index));
-    return pVariable;
-}
-
-ID3D11ShaderReflectionVariable* CCryDXGLShaderReflectionConstBuffer::GetVariableByName(LPCSTR Name)
-{
-    Impl::TVariables::const_iterator kVarIter(m_pImpl->m_kVariables.begin());
-    const Impl::TVariables::const_iterator kVarEnd(m_pImpl->m_kVariables.end());
-    for (; kVarIter != kVarEnd; ++kVarIter)
-    {
-        D3D11_SHADER_VARIABLE_DESC kDesc;
-        if (FAILED((*kVarIter)->GetDesc(&kDesc)))
-        {
-            return NULL;
-        }
-        if (strcmp(kDesc.Name, Name) == 0)
-        {
-            ID3D11ShaderReflectionVariable* pVariable;
-            CCryDXGLShaderReflectionVariable::ToInterface(&pVariable, kVarIter->get());
-            return pVariable;
-        }
-    }
-    return NULL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflection
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLShaderReflection::Impl
-{
-    struct SResource
-    {
-        NCryOpenGL::SShaderReflectionResource* m_pResource;
-    };
-
-    struct SParameter
-    {
-        NCryOpenGL::SShaderReflectionParameter* m_pParameter;
-    };
-
-    typedef std::vector<_smart_ptr<CCryDXGLShaderReflectionConstBuffer> > TConstantBuffers;
-
-    TConstantBuffers m_kConstantBuffers;
-
-    NCryOpenGL::SShaderReflection m_kReflection;
-};
-
-CCryDXGLShaderReflection::CCryDXGLShaderReflection()
-    : m_pImpl(new Impl())
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflection)
-}
-
-CCryDXGLShaderReflection::~CCryDXGLShaderReflection()
-{
-    delete m_pImpl;
-}
-
-bool CCryDXGLShaderReflection::Initialize(const void* pvData)
-{
-    if (!InitializeShaderReflectionFromInput(&m_pImpl->m_kReflection, pvData))
-    {
-        return false;
-    }
-
-    NCryOpenGL::SShaderReflection::TConstantBuffers::iterator kConstBufferIter(m_pImpl->m_kReflection.m_kConstantBuffers.begin());
-    const NCryOpenGL::SShaderReflection::TConstantBuffers::iterator kConstBufferEnd(m_pImpl->m_kReflection.m_kConstantBuffers.end());
-    while (kConstBufferIter != kConstBufferEnd)
-    {
-        _smart_ptr<CCryDXGLShaderReflectionConstBuffer> spConstBuffer(new CCryDXGLShaderReflectionConstBuffer());
-        if (!spConstBuffer->Initialize(static_cast<void*>(&*kConstBufferIter)))
-        {
-            return false;
-        }
-        m_pImpl->m_kConstantBuffers.push_back(spConstBuffer);
-        ++kConstBufferIter;
-    }
-    return true;
-}
-
-HRESULT CCryDXGLShaderReflection::GetDesc(D3D11_SHADER_DESC* pDesc)
-{
-    (*pDesc) = m_pImpl->m_kReflection.m_kDesc;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionConstantBuffer* CCryDXGLShaderReflection::GetConstantBufferByIndex(UINT Index)
-{
-    if (Index >= m_pImpl->m_kConstantBuffers.size())
-    {
-        return NULL;
-    }
-    ID3D11ShaderReflectionConstantBuffer* pConstantBuffer;
-    CCryDXGLShaderReflectionConstBuffer::ToInterface(&pConstantBuffer, m_pImpl->m_kConstantBuffers.at(Index));
-    return pConstantBuffer;
-}
-
-ID3D11ShaderReflectionConstantBuffer* CCryDXGLShaderReflection::GetConstantBufferByName(LPCSTR Name)
-{
-    Impl::TConstantBuffers::const_iterator kCBIter(m_pImpl->m_kConstantBuffers.begin());
-    const Impl::TConstantBuffers::const_iterator kCBEnd(m_pImpl->m_kConstantBuffers.end());
-    for (; kCBIter != kCBEnd; ++kCBIter)
-    {
-        D3D11_SHADER_BUFFER_DESC kDesc;
-        if (FAILED((*kCBIter)->GetDesc(&kDesc)))
-        {
-            return NULL;
-        }
-        if (strcmp(kDesc.Name, Name) == 0)
-        {
-            ID3D11ShaderReflectionConstantBuffer* pConstantBuffer;
-            CCryDXGLShaderReflectionConstBuffer::ToInterface(&pConstantBuffer, kCBIter->get());
-            return pConstantBuffer;
-        }
-    }
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflection::GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc)
-{
-    if (ResourceIndex >= m_pImpl->m_kReflection.m_kResources.size())
-    {
-        return E_FAIL;
-    }
-    *pDesc = m_pImpl->m_kReflection.m_kResources[ResourceIndex].m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLShaderReflection::GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc)
-{
-    if (ParameterIndex >= m_pImpl->m_kReflection.m_kInputs.size())
-    {
-        return E_FAIL;
-    }
-    *pDesc = m_pImpl->m_kReflection.m_kInputs[ParameterIndex].m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLShaderReflection::GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc)
-{
-    if (ParameterIndex >= m_pImpl->m_kReflection.m_kOutputs.size())
-    {
-        return E_FAIL;
-    }
-    *pDesc = m_pImpl->m_kReflection.m_kOutputs[ParameterIndex].m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLShaderReflection::GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-ID3D11ShaderReflectionVariable* CCryDXGLShaderReflection::GetVariableByName(LPCSTR Name)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflection::GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-UINT CCryDXGLShaderReflection::GetMovInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-UINT CCryDXGLShaderReflection::GetMovcInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-UINT CCryDXGLShaderReflection::GetConversionInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-UINT CCryDXGLShaderReflection::GetBitwiseInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-D3D_PRIMITIVE CCryDXGLShaderReflection::GetGSInputPrimitive()
-{
-    DXGL_NOT_IMPLEMENTED
-    return D3D_PRIMITIVE_TRIANGLE;
-}
-
-BOOL CCryDXGLShaderReflection::IsSampleFrequencyShader()
-{
-    DXGL_NOT_IMPLEMENTED
-    return FALSE;
-}
-
-UINT CCryDXGLShaderReflection::GetNumInterfaceSlots()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-HRESULT CCryDXGLShaderReflection::GetMinFeatureLevel(enum D3D_FEATURE_LEVEL* pLevel)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-UINT CCryDXGLShaderReflection::GetThreadGroupSize(UINT* pSizeX, UINT* pSizeY, UINT* pSizeZ)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderReflection.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderReflection.hpp
deleted file mode 100644
index 147e5e0f90..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderReflection.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrappers for D3D11 shader
-//               reflection interfaces
-
-
-#ifndef __CRYDXGLSHADERREFLECTION__
-#define __CRYDXGLSHADERREFLECTION__
-
-#include "CCryDXGLBase.hpp"
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionVariable
-////////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLShaderReflectionVariable
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflectionVariable, D3D11ShaderReflectionVariable)
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflectionVariable, D3D11ShaderReflectionType)
-#endif //DXGL_FULL_EMULATION
-
-    CCryDXGLShaderReflectionVariable();
-    virtual ~CCryDXGLShaderReflectionVariable();
-
-    bool Initialize(void* pvData);
-
-    // Implementation of ID3D11ShaderReflectionVariable
-    HRESULT GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc);
-    ID3D11ShaderReflectionType* GetType();
-    ID3D11ShaderReflectionConstantBuffer* GetBuffer();
-    UINT GetInterfaceSlot(UINT uArrayIndex);
-
-    // Implementation of ID3D11ShaderReflectionType
-    HRESULT GetDesc(D3D11_SHADER_TYPE_DESC* pDesc);
-    ID3D11ShaderReflectionType* GetMemberTypeByIndex(UINT Index);
-    ID3D11ShaderReflectionType* GetMemberTypeByName(LPCSTR Name);
-    LPCSTR GetMemberTypeName(UINT Index);
-    HRESULT IsEqual(ID3D11ShaderReflectionType* pType);
-    ID3D11ShaderReflectionType* GetSubType();
-    ID3D11ShaderReflectionType* GetBaseClass();
-    UINT GetNumInterfaces();
-    ID3D11ShaderReflectionType* GetInterfaceByIndex(UINT uIndex);
-    HRESULT IsOfType(ID3D11ShaderReflectionType* pType);
-    HRESULT ImplementsInterface(ID3D11ShaderReflectionType* pBase);
-
-    struct Impl;
-    Impl* m_pImpl;
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionConstBuffer
-////////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLShaderReflectionConstBuffer
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflectionConstBuffer, D3D11ShaderReflectionConstantBuffer)
-
-    CCryDXGLShaderReflectionConstBuffer();
-    virtual ~CCryDXGLShaderReflectionConstBuffer();
-
-    bool Initialize(void* pvData);
-
-    // Implementation of ID3D11ShaderReflectionConstantBuffer
-    HRESULT GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc);
-    ID3D11ShaderReflectionVariable* GetVariableByIndex(UINT Index);
-    ID3D11ShaderReflectionVariable* GetVariableByName(LPCSTR Name);
-
-    struct Impl;
-    Impl* m_pImpl;
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflection
-////////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLShaderReflection
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflection, D3D11ShaderReflection)
-
-    CCryDXGLShaderReflection();
-    virtual ~CCryDXGLShaderReflection();
-
-    bool Initialize(const void* pvData);
-
-    // Implementation of ID3D11ShaderReflection
-    HRESULT GetDesc(D3D11_SHADER_DESC* pDesc);
-    ID3D11ShaderReflectionConstantBuffer* GetConstantBufferByIndex(UINT Index);
-    ID3D11ShaderReflectionConstantBuffer* GetConstantBufferByName(LPCSTR Name);
-    HRESULT GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc);
-    HRESULT GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc);
-    HRESULT GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc);
-    HRESULT GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc);
-    ID3D11ShaderReflectionVariable* GetVariableByName(LPCSTR Name);
-    HRESULT GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc);
-    UINT GetMovInstructionCount();
-    UINT GetMovcInstructionCount();
-    UINT GetConversionInstructionCount();
-    UINT GetBitwiseInstructionCount();
-    D3D_PRIMITIVE GetGSInputPrimitive();
-    BOOL IsSampleFrequencyShader();
-    UINT GetNumInterfaceSlots();
-    HRESULT GetMinFeatureLevel(enum D3D_FEATURE_LEVEL* pLevel);
-    UINT GetThreadGroupSize(UINT* pSizeX, UINT* pSizeY, UINT* pSizeZ);
-
-    struct Impl;
-    Impl* m_pImpl;
-};
-
-#endif //__CRYDXGLSHADERREFLECTION__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderResourceView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderResourceView.cpp
deleted file mode 100644
index 6c03dbea54..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderResourceView.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11ShaderResourceView
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLShaderResourceView.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "CCryDXGLResource.hpp"
-#include "../Implementation/GLView.hpp"
-#include "../Implementation/GLDevice.hpp"
-
-
-CCryDXGLShaderResourceView::CCryDXGLShaderResourceView(CCryDXGLResource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderResourceView)
-}
-
-CCryDXGLShaderResourceView::~CCryDXGLShaderResourceView()
-{
-}
-
-bool CCryDXGLShaderResourceView::Initialize(NCryOpenGL::CContext* pContext)
-{
-    D3D11_RESOURCE_DIMENSION eDimension;
-    m_spResource->GetType(&eDimension);
-    m_spGLView = NCryOpenGL::CreateShaderResourceView(m_spResource->GetGLResource(), eDimension, m_kDesc, pContext);
-    return m_spGLView != NULL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11ShaderResourceView
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLShaderResourceView::GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderResourceView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderResourceView.hpp
deleted file mode 100644
index ebebdc25a3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLShaderResourceView.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11ShaderResourceView
-
-
-#ifndef __CRYDXGLSHADERRESOURCEVIEW__
-#define __CRYDXGLSHADERRESOURCEVIEW__
-
-#include "CCryDXGLView.hpp"
-
-namespace NCryOpenGL
-{
-    struct SShaderView;
-    class CContext;
-}
-
-class CCryDXGLShaderResourceView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderResourceView, D3D11ShaderResourceView)
-
-    CCryDXGLShaderResourceView(CCryDXGLResource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLShaderResourceView();
-
-    bool Initialize(NCryOpenGL::CContext* pContext);
-    ILINE NCryOpenGL::SShaderView* GetGLView() { return m_spGLView; }
-
-    // Implementation of ID3D11ShaderResourceView
-    void GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc);
-protected:
-    D3D11_SHADER_RESOURCE_VIEW_DESC m_kDesc;
-    _smart_ptr<NCryOpenGL::SShaderView> m_spGLView;
-};
-
-#endif //__CRYDXGLSHADERRESOURCEVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwapChain.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwapChain.cpp
deleted file mode 100644
index 4c35ddb915..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwapChain.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGISwapChain
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLDevice.hpp"
-#include "CCryDXGLGIOutput.hpp"
-#include "CCryDXGLSwapChain.hpp"
-#include "CCryDXGLTexture2D.hpp"
-#include "../Implementation/GLDevice.hpp"
-#include "../Implementation/GLContext.hpp"
-#include "../Implementation/GLResource.hpp"
-
-CCryDXGLSwapChain::CCryDXGLSwapChain(CCryDXGLDevice* pDevice, const DXGI_SWAP_CHAIN_DESC& kDesc)
-    : m_spDevice(pDevice)
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIDeviceSubObject)
-    DXGL_INITIALIZE_INTERFACE(DXGISwapChain)
-
-    m_kDesc = kDesc;
-}
-
-CCryDXGLSwapChain::~CCryDXGLSwapChain()
-{
-}
-
-bool CCryDXGLSwapChain::Initialize()
-{
-    if (!m_kDesc.Windowed &&
-        FAILED(SetFullscreenState(TRUE, NULL)))
-    {
-        return false;
-    }
-
-    return UpdateTexture(true);
-}
-
-bool CCryDXGLSwapChain::UpdateTexture(bool bSetPixelFormat)
-{
-    // Create a dummy texture that represents the default back buffer
-    D3D11_TEXTURE2D_DESC kBackBufferDesc;
-    kBackBufferDesc.Width = m_kDesc.BufferDesc.Width;
-    kBackBufferDesc.Height = m_kDesc.BufferDesc.Height;
-    kBackBufferDesc.MipLevels = 1;
-    kBackBufferDesc.ArraySize = 1;
-    kBackBufferDesc.Format = m_kDesc.BufferDesc.Format;
-    kBackBufferDesc.SampleDesc = m_kDesc.SampleDesc;
-    kBackBufferDesc.Usage = D3D11_USAGE_DEFAULT;
-    kBackBufferDesc.BindFlags = D3D11_BIND_RENDER_TARGET;   // Default back buffer can only be bound as render target
-    kBackBufferDesc.CPUAccessFlags = 0;
-    kBackBufferDesc.MiscFlags = 0;
-
-    NCryOpenGL::SDefaultFrameBufferTexturePtr spBackBufferTex(NCryOpenGL::CreateBackBufferTexture(kBackBufferDesc));
-    m_spBackBufferTexture = new CCryDXGLTexture2D(kBackBufferDesc, spBackBufferTex, m_spDevice);
-
-#if DXGL_FULL_EMULATION
-    if (bSetPixelFormat)
-    {
-        NCryOpenGL::CDevice* pDevice(m_spDevice->GetGLDevice());
-        NCryOpenGL::TNativeDisplay kNativeDisplay(NULL);
-        NCryOpenGL::TWindowContext kCustomWindowContext(NULL);
-        if (!NCryOpenGL::GetNativeDisplay(kNativeDisplay, m_kDesc.OutputWindow) ||
-            !NCryOpenGL::CreateWindowContext(kCustomWindowContext, pDevice->GetFeatureSpec(), pDevice->GetPixelFormatSpec(), kNativeDisplay))
-        {
-            return false;
-        }
-
-        spBackBufferTex->SetCustomWindowContext(kCustomWindowContext);
-    }
-#endif //DXGL_FULL_EMULATION
-
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGISwapChain implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLSwapChain::Present(UINT SyncInterval, UINT Flags)
-{
-    NCryOpenGL::CDevice* pDevice(m_spDevice->GetGLDevice());
-    NCryOpenGL::CContext* pContext(pDevice->ReserveContext());
-    if (pContext == NULL)
-    {
-        return E_FAIL;
-    }
-
-    NCryOpenGL::SDefaultFrameBufferTexture* pGLBackBufferTexture(static_cast<NCryOpenGL::SDefaultFrameBufferTexture*>(m_spBackBufferTexture->GetGLTexture()));
-
-#if DXGL_FULL_EMULATION
-    const NCryOpenGL::TWindowContext& kWindowContext(
-        pGLBackBufferTexture->m_kCustomWindowContext != NULL ?
-        pGLBackBufferTexture->m_kCustomWindowContext :
-        pDevice->GetDefaultWindowContext());
-    pContext->SetWindowContext(kWindowContext);
-#else
-    const NCryOpenGL::TWindowContext& kWindowContext(pDevice->GetDefaultWindowContext());
-#endif
-
-    pGLBackBufferTexture->Flush(pContext);
-    HRESULT kResult(pDevice->Present(kWindowContext) ? S_OK : E_FAIL);
-
-    pDevice->ReleaseContext();
-    return kResult;
-}
-
-HRESULT CCryDXGLSwapChain::GetBuffer(UINT Buffer, REFIID riid, void** ppSurface)
-{
-    if (Buffer == 0 && riid == __uuidof(ID3D11Texture2D))
-    {
-        m_spBackBufferTexture->AddRef();
-        CCryDXGLTexture2D::ToInterface(reinterpret_cast<ID3D11Texture2D**>(ppSurface), m_spBackBufferTexture.get());
-        return S_OK;
-    }
-    DXGL_TODO("Support more than one swap chain buffer if required");
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget)
-{
-    NCryOpenGL::SFrameBufferSpec kFrameBufferSpec;
-    if (!SwapChainDescToFrameBufferSpec(kFrameBufferSpec, m_kDesc))
-    {
-        return E_FAIL;
-    }
-
-    NCryOpenGL::SOutput* pGLOutput(pTarget == NULL ? NULL : CCryDXGLGIOutput::FromInterface(pTarget)->GetGLOutput());
-    return m_spDevice->GetGLDevice()->SetFullScreenState(kFrameBufferSpec, Fullscreen == TRUE, pGLOutput) ? S_OK : E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLSwapChain::ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT Format, UINT SwapChainFlags)
-{
-    // MS Documentation states that a buffer count of 0 means to use the same
-    // number of existing buffers
-    BufferCount = BufferCount == 0 ? m_kDesc.BufferCount : BufferCount;
-
-    if (
-        Format         == m_kDesc.BufferDesc.Format &&
-        Width          == m_kDesc.BufferDesc.Width  &&
-        Height         == m_kDesc.BufferDesc.Height &&
-        BufferCount    == m_kDesc.BufferCount       &&
-        SwapChainFlags == m_kDesc.Flags)
-    {
-        return S_OK; // Nothing to do
-    }
-    if (BufferCount == m_kDesc.BufferCount)
-    {
-        m_kDesc.BufferDesc.Format = Format;
-        m_kDesc.BufferDesc.Width  = Width;
-        m_kDesc.BufferDesc.Height = Height;
-        m_kDesc.Flags             = SwapChainFlags;
-
-        if (UpdateTexture(false))
-        {
-            return S_OK;
-        }
-    }
-
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters)
-{
-    NCryOpenGL::SDisplayMode kDisplayMode;
-    if (!NCryOpenGL::GetDisplayMode(&kDisplayMode, *pNewTargetParameters) ||
-        m_spDevice->GetGLDevice()->ResizeTarget(kDisplayMode))
-    {
-        return E_FAIL;
-    }
-    return S_OK;
-}
-
-HRESULT CCryDXGLSwapChain::GetContainingOutput(IDXGIOutput** ppOutput)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetLastPresentCount(UINT* pLastPresentCount)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwapChain.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwapChain.hpp
deleted file mode 100644
index f427ff7c59..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwapChain.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description : Declaration of the DXGL wrapper for IDXGISwapChain
-
-#ifndef __CRYDXGLSWAPCHAIN__
-#define __CRYDXGLSWAPCHAIN__
-
-#include "CCryDXGLBase.hpp"
-#include "CCryDXGLGIObject.hpp"
-
-namespace NCryOpenGL
-{
-    class CDeviceContextProxy;
-}
-
-class CCryDXGLDevice;
-class CCryDXGLTexture2D;
-
-class CCryDXGLSwapChain
-    : public CCryDXGLGIObject
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSwapChain, DXGIDeviceSubObject)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSwapChain, DXGISwapChain)
-
-    CCryDXGLSwapChain(CCryDXGLDevice* pDevice, const DXGI_SWAP_CHAIN_DESC& kDesc);
-    ~CCryDXGLSwapChain();
-
-    bool Initialize();
-
-    // IDXGISwapChain implementation
-    HRESULT STDMETHODCALLTYPE Present(UINT SyncInterval, UINT Flags);
-    HRESULT STDMETHODCALLTYPE GetBuffer(UINT Buffer, REFIID riid, void** ppSurface);
-    HRESULT STDMETHODCALLTYPE SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget);
-    HRESULT STDMETHODCALLTYPE GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget);
-    HRESULT STDMETHODCALLTYPE GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc);
-    HRESULT STDMETHODCALLTYPE ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags);
-    HRESULT STDMETHODCALLTYPE ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters);
-    HRESULT STDMETHODCALLTYPE GetContainingOutput(IDXGIOutput** ppOutput);
-    HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats);
-    HRESULT STDMETHODCALLTYPE GetLastPresentCount(UINT* pLastPresentCount);
-
-    // IDXGIDeviceSubObject implementation
-    HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) { return E_NOTIMPL; }
-protected:
-    bool UpdateTexture(bool bSetPixelFormat);
-protected:
-    _smart_ptr<CCryDXGLDevice> m_spDevice;
-    _smart_ptr<CCryDXGLTexture2D> m_spBackBufferTexture;
-    DXGI_SWAP_CHAIN_DESC m_kDesc;
-};
-
-#endif //__CRYDXGLSWAPCHAIN__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwitchToRef.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwitchToRef.cpp
deleted file mode 100644
index 1d002230e7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwitchToRef.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11SwitchToRef
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLSwitchToRef.hpp"
-#include "../Implementation/GLCommon.hpp"
-
-
-CCryDXGLSwitchToRef::CCryDXGLSwitchToRef(CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11SwitchToRef)
-}
-
-CCryDXGLSwitchToRef::~CCryDXGLSwitchToRef()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11SwitchToRef implementation
-////////////////////////////////////////////////////////////////////////////////\
-// //
-BOOL CCryDXGLSwitchToRef::SetUseRef(BOOL UseRef)
-{
-    DXGL_NOT_IMPLEMENTED
-    return false;
-}
-
-BOOL CCryDXGLSwitchToRef::GetUseRef()
-{
-    DXGL_NOT_IMPLEMENTED
-    return false;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwitchToRef.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwitchToRef.hpp
deleted file mode 100644
index ee107272b8..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLSwitchToRef.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11SwitchToRef
-
-
-#ifndef __CRYDXGLSWITCHTOREF__
-#define __CRYDXGLSWITCHTOREF__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-class CCryDXGLSwitchToRef
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSwitchToRef, D3D11SwitchToRef)
-
-    CCryDXGLSwitchToRef(CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLSwitchToRef();
-
-    // ID3D11SwitchToRef implementation
-    BOOL SetUseRef(BOOL UseRef);
-    BOOL GetUseRef();
-};
-
-#endif //__CRYDXGLSWITCHTOREF__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture1D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture1D.cpp
deleted file mode 100644
index 6ee9caea73..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture1D.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Texture1D
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLTexture1D.hpp"
-
-
-CCryDXGLTexture1D::CCryDXGLTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION_TEXTURE1D, pGLTexture, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Texture1D)
-}
-
-CCryDXGLTexture1D::~CCryDXGLTexture1D()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Texture1D
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLTexture1D::GetDesc(D3D11_TEXTURE1D_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture1D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture1D.hpp
deleted file mode 100644
index f525f472ac..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture1D.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Texture1D
-
-
-#ifndef __CRYDXGLTEXTURE1D__
-#define __CRYDXGLTEXTURE1D__
-
-#include "CCryDXGLTextureBase.hpp"
-
-
-class CCryDXGLTexture1D
-    : public CCryDXGLTextureBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLTexture1D, D3D11Texture1D)
-
-    CCryDXGLTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTexture1D();
-
-    // Implementation of ID3D11Texture1D
-    void GetDesc(D3D11_TEXTURE1D_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLTexture1D>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLTextureBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_TEXTURE1D_DESC m_kDesc;
-};
-
-#endif //__CRYDXGLTEXTURE1D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture2D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture2D.cpp
deleted file mode 100644
index 6c75bec4eb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture2D.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Texture2D
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLTexture2D.hpp"
-
-
-CCryDXGLTexture2D::CCryDXGLTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION_TEXTURE2D, pGLTexture, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Texture2D)
-}
-
-CCryDXGLTexture2D::~CCryDXGLTexture2D()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Texture2D
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLTexture2D::GetDesc(D3D11_TEXTURE2D_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture2D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture2D.hpp
deleted file mode 100644
index e8b284eda3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture2D.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Texture2D
-
-
-#ifndef __CRYDXGLTEXTURE2D__
-#define __CRYDXGLTEXTURE2D__
-
-#include "CCryDXGLTextureBase.hpp"
-
-
-class CCryDXGLTexture2D
-    : public CCryDXGLTextureBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLTexture2D, D3D11Texture2D)
-
-    CCryDXGLTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTexture2D();
-
-    bool Initialize(const D3D11_SUBRESOURCE_DATA* pInitialData);
-
-    // Implementation of ID3D11Texture2D
-    void GetDesc(D3D11_TEXTURE2D_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLTexture2D>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLTextureBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_TEXTURE2D_DESC m_kDesc;
-};
-
-#endif //__CRYDXGLTEXTURE2D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture3D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture3D.cpp
deleted file mode 100644
index 1bc4f5975f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture3D.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Texture3D
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLTexture3D.hpp"
-
-
-CCryDXGLTexture3D::CCryDXGLTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION_TEXTURE3D, pGLTexture, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Texture3D)
-}
-
-CCryDXGLTexture3D::~CCryDXGLTexture3D()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Texture3D
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLTexture3D::GetDesc(D3D11_TEXTURE3D_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture3D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture3D.hpp
deleted file mode 100644
index a01015f517..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTexture3D.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Texture3D
-
-
-#ifndef __CRYDXGLTEXTURE3D__
-#define __CRYDXGLTEXTURE3D__
-
-#include "CCryDXGLTextureBase.hpp"
-
-
-class CCryDXGLTexture3D
-    : public CCryDXGLTextureBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLTexture3D, D3D11Texture3D)
-
-    CCryDXGLTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTexture3D();
-
-    // Implementation of ID3D11Texture3D
-    void GetDesc(D3D11_TEXTURE3D_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLTexture3D>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLTextureBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_TEXTURE3D_DESC m_kDesc;
-};
-
-#endif //__CRYDXGLTEXTURE3D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTextureBase.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTextureBase.cpp
deleted file mode 100644
index 081115e3f7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTextureBase.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL common base class for textures
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLTextureBase.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-CCryDXGLTextureBase::CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION eDimension, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLResource(eDimension, pGLTexture, pDevice)
-{
-}
-
-CCryDXGLTextureBase::~CCryDXGLTextureBase()
-{
-}
-
-NCryOpenGL::STexture* CCryDXGLTextureBase::GetGLTexture()
-{
-    return static_cast<NCryOpenGL::STexture*>(m_spGLResource.get());
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTextureBase.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTextureBase.hpp
deleted file mode 100644
index 7a2b7fc59e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLTextureBase.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL common base class for textures
-
-
-#ifndef __CRYDXGLTEXTUREBASE__
-#define __CRYDXGLTEXTUREBASE__
-
-#include "CCryDXGLResource.hpp"
-
-namespace NCryOpenGL
-{
-    struct STexture;
-};
-
-class CCryDXGLTextureBase
-    : public CCryDXGLResource
-{
-public:
-    CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION eDimension, NCryOpenGL::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTextureBase();
-
-    NCryOpenGL::STexture* GetGLTexture();
-};
-
-#endif //__CRYDXGLTEXTUREBASE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLUnorderedAccessView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLUnorderedAccessView.cpp
deleted file mode 100644
index d0f719e7d6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLUnorderedAccessView.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11UnorderedAccessView
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLUnorderedAccessView.hpp"
-#include "CCryDXGLDevice.hpp"
-#include "CCryDXGLResource.hpp"
-#include "../Implementation/GLView.hpp"
-#include "../Implementation/GLDevice.hpp"
-
-
-CCryDXGLUnorderedAccessView::CCryDXGLUnorderedAccessView(CCryDXGLResource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11UnorderedAccessView)
-}
-
-CCryDXGLUnorderedAccessView::~CCryDXGLUnorderedAccessView()
-{
-}
-
-bool CCryDXGLUnorderedAccessView::Initialize(NCryOpenGL::CContext* pContext)
-{
-    D3D11_RESOURCE_DIMENSION eDimension;
-    m_spResource->GetType(&eDimension);
-    m_spGLView = NCryOpenGL::CreateUnorderedAccessView(m_spResource->GetGLResource(), eDimension, m_kDesc, pContext);
-    return m_spGLView != NULL;
-}
-
-NCryOpenGL::SShaderView* CCryDXGLUnorderedAccessView::GetGLView()
-{
-    return m_spGLView;
-}
-
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11UnorderedAccessView
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLUnorderedAccessView::GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLUnorderedAccessView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLUnorderedAccessView.hpp
deleted file mode 100644
index 1db32dcbd3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLUnorderedAccessView.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11UnorderedAccessView
-
-
-#ifndef __CRYDXGLUNORDEREDACCESSVIEW__
-#define __CRYDXGLUNORDEREDACCESSVIEW__
-
-#include "CCryDXGLView.hpp"
-
-namespace NCryOpenGL
-{
-    struct SShaderView;
-    class CContext;
-}
-
-class CCryDXGLUnorderedAccessView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLUnorderedAccessView, D3D11UnorderedAccessView)
-
-    CCryDXGLUnorderedAccessView(CCryDXGLResource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLUnorderedAccessView();
-
-    bool Initialize(NCryOpenGL::CContext* pContext);
-    NCryOpenGL::SShaderView* GetGLView();
-
-    // Implementation of ID3D11UnorderedAccessView
-    void GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc);
-protected:
-    D3D11_UNORDERED_ACCESS_VIEW_DESC m_kDesc;
-    _smart_ptr<NCryOpenGL::SShaderView> m_spGLView;
-};
-
-#endif //__CRYDXGLUNORDEREDACCESSVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLView.cpp
deleted file mode 100644
index 485e70d0ac..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLView.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11View
-
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXGLView.hpp"
-#include "CCryDXGLResource.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-CCryDXGLView::CCryDXGLView(CCryDXGLResource* pResource, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spResource(pResource)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11View)
-}
-
-CCryDXGLView::~CCryDXGLView()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11View
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLView::GetResource(ID3D11Resource** ppResource)
-{
-    if (m_spResource != NULL)
-    {
-        m_spResource->AddRef();
-    }
-    CCryDXGLResource::ToInterface(ppResource, m_spResource);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLView.hpp
deleted file mode 100644
index a1d81f55ac..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLView.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11View
-
-
-#ifndef __CRYDXGLVIEW__
-#define __CRYDXGLVIEW__
-
-#include "CCryDXGLDeviceChild.hpp"
-
-class CCryDXGLResource;
-
-class CCryDXGLView
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLView, D3D11View)
-    virtual ~CCryDXGLView();
-
-    inline CCryDXGLResource* GetGLResource() { return m_spResource; }
-
-    // Implementation of ID3D11View
-    void GetResource(ID3D11Resource** ppResource);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLView>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLDeviceChild::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLView(CCryDXGLResource* pResource, CCryDXGLDevice* pDevice);
-
-    _smart_ptr<CCryDXGLResource> m_spResource;
-};
-
-#endif //__CRYDXGLVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/DXEmulation.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/DXEmulation.hpp
deleted file mode 100644
index de6f21b7ae..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/DXEmulation.hpp
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Interface wrappers used for full DirectX emulation.
-
-
-#ifndef __DXEmulation__
-#define __DXEmulation__
-
-#if DXGL_FULL_EMULATION
-
-template <typename Interface>
-struct SingleInheritance
-{
-    typedef void TBase;
-};
-#define SINGLE_INHERITANCE(_Derived, _Base) template <> \
-    struct SingleInheritance<_Derived> { typedef _Base TBase; };
-
-template <typename Interface>
-struct SingleInheritanceInterface
-{
-    template <typename Object>
-    static bool Query(Object* pThis, REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<Interface>::template Query<Object>(pThis, riid, ppvObject))
-        {
-            return true;
-        }
-        return SingleInheritanceInterface<typename SingleInheritance<Interface>::TBase>::template Query<Object>(pThis, riid, ppvObject);
-    }
-};
-
-template <>
-struct SingleInheritanceInterface<void>
-{
-    template <typename Object>
-    static bool Query(Object* pThis, REFIID riid, void** ppvObject)
-    {
-        *ppvObject = NULL;
-        return false;
-    }
-};
-
-SINGLE_INHERITANCE(IUnknown, void)
-SINGLE_INHERITANCE(ID3D10Blob, IUnknown)
-SINGLE_INHERITANCE(ID3D11DeviceChild, IUnknown)
-SINGLE_INHERITANCE(ID3D11DepthStencilState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11BlendState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11RasterizerState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Resource, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Buffer, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11Texture1D, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11Texture2D, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11Texture3D, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11View, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11ShaderResourceView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11RenderTargetView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11DepthStencilView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11UnorderedAccessView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11VertexShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11HullShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11DomainShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11GeometryShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11PixelShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11ComputeShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11InputLayout, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11SamplerState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Asynchronous, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Query, ID3D11Asynchronous)
-SINGLE_INHERITANCE(ID3D11ShaderReflectionType, void)
-SINGLE_INHERITANCE(ID3D11ShaderReflectionVariable, void)
-SINGLE_INHERITANCE(ID3D11ShaderReflectionConstantBuffer, void)
-SINGLE_INHERITANCE(ID3D11ShaderReflection, IUnknown)
-SINGLE_INHERITANCE(IDXGIObject, IUnknown)
-SINGLE_INHERITANCE(IDXGIDeviceSubObject, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIOutput, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIAdapter, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIAdapter1, IDXGIAdapter)
-SINGLE_INHERITANCE(IDXGIFactory, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIFactory1, IDXGIFactory)
-SINGLE_INHERITANCE(IDXGIDevice, IDXGIObject)
-SINGLE_INHERITANCE(IDXGISwapChain, IDXGIDeviceSubObject)
-SINGLE_INHERITANCE(ID3D11SwitchToRef, IUnknown)
-SINGLE_INHERITANCE(ID3D11Device, IUnknown)
-SINGLE_INHERITANCE(ID3D11DeviceContext, ID3D11DeviceChild)
-
-struct SAggregateNode
-{
-    SAggregateNode* m_pNext;
-
-    SAggregateNode()
-        : m_pNext(NULL)
-    {
-    }
-
-    void Insert(SAggregateNode* pHead)
-    {
-        m_pNext = pHead->m_pNext;
-        pHead->m_pNext = this;
-    }
-
-    virtual bool QueryInterfaceInternal(REFIID riid, void** ppvObject)
-    {
-        return false;
-    };
-};
-
-#define DXGL_WRAPPER_ROOT_NO_COM(_Interface)               \
-    typedef Impl TImpl;                                    \
-    TImpl* m_pImpl;                                        \
-    void InitializeWrapper(TImpl * pImpl)                  \
-    {                                                      \
-        m_pImpl = pImpl;                                   \
-        pImpl->m_pVirtual ## _Interface ## Wrapper = this; \
-    }
-#define DXGL_WRAPPER_ROOT(_Interface)                      \
-    typedef Impl TImpl;                                    \
-    TImpl* m_pImpl;                                        \
-    void InitializeWrapper(TImpl * pImpl)                  \
-    {                                                      \
-        m_pImpl = pImpl;                                   \
-        Insert(&pImpl->GetAggregateHead());                \
-        pImpl->m_pVirtual ## _Interface ## Wrapper = this; \
-    }
-#define DXGL_WRAPPER_DERIVED(_Interface, _Parent)                       \
-    void InitializeWrapper(typename _Parent<Impl, Base>::TImpl * pImpl) \
-    {                                                                   \
-        _Parent<Impl, Base>::InitializeWrapper(pImpl);                  \
-        pImpl->m_pVirtual ## _Interface ## Wrapper = this;              \
-    }
-
-namespace NDXGLWrappers
-{
-    template <typename Impl, typename Base>
-    struct SUnknown
-        : Base
-        , SAggregateNode
-    {
-        DXGL_WRAPPER_ROOT(Unknown)
-
-        SUnknown()
-            : m_pImpl(NULL) {}
-        virtual ~SUnknown(){}
-
-        ULONG STDMETHODCALLTYPE AddRef(){return m_pImpl->AddRef(); }
-        ULONG STDMETHODCALLTYPE Release(){return m_pImpl->Release(); }
-
-        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-        {
-            if (SingleInheritanceInterface<Base>::Query(this, riid, ppvObject))
-            {
-                return S_OK;
-            }
-            SAggregateNode* pNode(m_pImpl->GetAggregateHead().m_pNext);
-            while (pNode != NULL)
-            {
-                if (pNode->QueryInterfaceInternal(riid, ppvObject))
-                {
-                    return S_OK;
-                }
-                pNode = pNode->m_pNext;
-            }
-            return E_NOINTERFACE;
-        }
-
-        bool QueryInterfaceInternal(REFIID riid, void** ppvObject)
-        {
-            return SingleInheritanceInterface<Base>::Query(this, riid, ppvObject);
-        }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D10Blob
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D10Blob, SUnknown)
-        SD3D10Blob(){}
-        LPVOID STDMETHODCALLTYPE GetBufferPointer(){return this->m_pImpl->GetBufferPointer(); }
-        SIZE_T STDMETHODCALLTYPE GetBufferSize(){return this->m_pImpl->GetBufferSize(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DeviceChild
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DeviceChild, SUnknown)
-        SD3D11DeviceChild(){}
-        void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice){this->m_pImpl->GetDevice(ppDevice); }
-        HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData){return this->m_pImpl->GetPrivateData(guid, pDataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData){return this->m_pImpl->SetPrivateData(guid, DataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData){return this->m_pImpl->SetPrivateDataInterface(guid, pData); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DepthStencilState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DepthStencilState, SD3D11DeviceChild)
-        SD3D11DepthStencilState(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11BlendState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11BlendState, SD3D11DeviceChild)
-        SD3D11BlendState(){}
-        virtual void STDMETHODCALLTYPE GetDesc(D3D11_BLEND_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11RasterizerState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11RasterizerState, SD3D11DeviceChild)
-        SD3D11RasterizerState(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_RASTERIZER_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Resource
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Resource, SD3D11DeviceChild)
-        SD3D11Resource(){}
-        void STDMETHODCALLTYPE GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension){this->m_pImpl->GetType(pResourceDimension); }
-        void STDMETHODCALLTYPE SetEvictionPriority(UINT EvictionPriority){this->m_pImpl->SetEvictionPriority(EvictionPriority); }
-        UINT STDMETHODCALLTYPE GetEvictionPriority(){return this->m_pImpl->GetEvictionPriority(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Buffer
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Buffer, SD3D11Resource)
-        SD3D11Buffer(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_BUFFER_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Texture1D
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Texture1D, SD3D11Resource)
-        SD3D11Texture1D(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE1D_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Texture2D
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Texture2D, SD3D11Resource)
-        SD3D11Texture2D(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE2D_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Texture3D
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Texture3D, SD3D11Resource)
-        SD3D11Texture3D(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE3D_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11View
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11View, SD3D11DeviceChild)
-        SD3D11View(){}
-        void STDMETHODCALLTYPE GetResource(ID3D11Resource** ppResource){this->m_pImpl->GetResource(ppResource); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderResourceView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11ShaderResourceView, SD3D11View)
-        SD3D11ShaderResourceView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11RenderTargetView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11RenderTargetView, SD3D11View)
-        SD3D11RenderTargetView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DepthStencilView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DepthStencilView, SD3D11View)
-        SD3D11DepthStencilView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11UnorderedAccessView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11UnorderedAccessView, SD3D11View)
-        SD3D11UnorderedAccessView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11VertexShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11VertexShader, SD3D11DeviceChild) SD3D11VertexShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11HullShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11HullShader, SD3D11DeviceChild) SD3D11HullShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11DomainShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DomainShader, SD3D11DeviceChild) SD3D11DomainShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11GeometryShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11GeometryShader, SD3D11DeviceChild) SD3D11GeometryShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11PixelShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11PixelShader, SD3D11DeviceChild) SD3D11PixelShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11ComputeShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11ComputeShader, SD3D11DeviceChild) SD3D11ComputeShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11InputLayout
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11InputLayout, SD3D11DeviceChild) SD3D11InputLayout()
-        {
-        }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11SamplerState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11SamplerState, SD3D11DeviceChild)
-        SD3D11SamplerState(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_SAMPLER_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Asynchronous
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Asynchronous, SD3D11DeviceChild)
-        SD3D11Asynchronous(){}
-        UINT STDMETHODCALLTYPE GetDataSize(){return this->m_pImpl->GetDataSize(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Query
-        : SD3D11Asynchronous<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Query, SD3D11Asynchronous)
-        SD3D11Query(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_QUERY_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflectionType
-        : Base
-    {
-        DXGL_WRAPPER_ROOT_NO_COM(D3D11ShaderReflectionType)
-        SD3D11ShaderReflectionType()
-            : m_pImpl(NULL){}
-        ~SD3D11ShaderReflectionType(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_TYPE_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByIndex(UINT Index){return this->m_pImpl->GetMemberTypeByIndex(Index); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByName(LPCSTR Name){return this->m_pImpl->GetMemberTypeByName(Name); }
-        LPCSTR STDMETHODCALLTYPE GetMemberTypeName(UINT Index){return this->m_pImpl->GetMemberTypeName(Index); }
-        HRESULT STDMETHODCALLTYPE IsEqual(ID3D11ShaderReflectionType* pType){return this->m_pImpl->IsEqual(pType); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetSubType(){return this->m_pImpl->GetSubType(); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetBaseClass(){return this->m_pImpl->GetBaseClass(); }
-        UINT STDMETHODCALLTYPE GetNumInterfaces(){return this->m_pImpl->GetNumInterfaces(); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetInterfaceByIndex(UINT uIndex){return this->m_pImpl->GetInterfaceByIndex(uIndex); }
-        HRESULT STDMETHODCALLTYPE IsOfType(ID3D11ShaderReflectionType* pType){return this->m_pImpl->IsOfType(pType); }
-        HRESULT STDMETHODCALLTYPE ImplementsInterface(ID3D11ShaderReflectionType* pBase){return this->m_pImpl->ImplementsInterface(pBase); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflectionVariable
-        : Base
-    {
-        DXGL_WRAPPER_ROOT_NO_COM(D3D11ShaderReflectionVariable)
-        SD3D11ShaderReflectionVariable()
-            : m_pImpl(NULL){}
-        ~SD3D11ShaderReflectionVariable(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetType(){return this->m_pImpl->GetType(); }
-        ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetBuffer(){return this->m_pImpl->GetBuffer(); }
-        UINT STDMETHODCALLTYPE GetInterfaceSlot(UINT uArrayIndex){return this->m_pImpl->GetInterfaceSlot(uArrayIndex); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflectionConstantBuffer
-        : Base
-    {
-        DXGL_WRAPPER_ROOT_NO_COM(D3D11ShaderReflectionConstantBuffer)
-        SD3D11ShaderReflectionConstantBuffer()
-            : m_pImpl(NULL){}
-        ~SD3D11ShaderReflectionConstantBuffer(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByIndex(UINT Index){return this->m_pImpl->GetVariableByIndex(Index); }
-        ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name){return this->m_pImpl->GetVariableByName(Name); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflection
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11ShaderReflection, SUnknown)
-        SD3D11ShaderReflection(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByIndex(UINT Index){return this->m_pImpl->GetConstantBufferByIndex(Index); }
-        ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByName(LPCSTR Name){return this->m_pImpl->GetConstantBufferByName(Name); }
-        HRESULT STDMETHODCALLTYPE GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc){return this->m_pImpl->GetResourceBindingDesc(ResourceIndex, pDesc); }
-        HRESULT STDMETHODCALLTYPE GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc){return this->m_pImpl->GetInputParameterDesc(ParameterIndex, pDesc); }
-        HRESULT STDMETHODCALLTYPE GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc){return this->m_pImpl->GetOutputParameterDesc(ParameterIndex, pDesc); }
-        HRESULT STDMETHODCALLTYPE GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc){return this->m_pImpl->GetPatchConstantParameterDesc(ParameterIndex, pDesc); }
-        ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name){return this->m_pImpl->GetVariableByName(Name); }
-        HRESULT STDMETHODCALLTYPE GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc){return this->m_pImpl->GetResourceBindingDescByName(Name, pDesc); }
-        UINT STDMETHODCALLTYPE GetMovInstructionCount(){return this->m_pImpl->GetMovInstructionCount(); }
-        UINT STDMETHODCALLTYPE GetMovcInstructionCount(){return this->m_pImpl->GetMovcInstructionCount(); }
-        UINT STDMETHODCALLTYPE GetConversionInstructionCount(){return this->m_pImpl->GetConversionInstructionCount(); }
-        UINT STDMETHODCALLTYPE GetBitwiseInstructionCount(){return this->m_pImpl->GetBitwiseInstructionCount(); }
-        D3D_PRIMITIVE STDMETHODCALLTYPE GetGSInputPrimitive(){return this->m_pImpl->GetGSInputPrimitive(); }
-        BOOL STDMETHODCALLTYPE IsSampleFrequencyShader(){return this->m_pImpl->IsSampleFrequencyShader(); }
-        UINT STDMETHODCALLTYPE GetNumInterfaceSlots(){return this->m_pImpl->GetNumInterfaceSlots(); }
-        HRESULT STDMETHODCALLTYPE GetMinFeatureLevel(D3D_FEATURE_LEVEL* pLevel){return this->m_pImpl->GetMinFeatureLevel(pLevel); }
-    };
-
-
-    template <typename Impl, typename Base>
-    struct SDXGIObject
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIObject, SUnknown)
-        SDXGIObject(){}
-        HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID Name, UINT DataSize, const void* pData){return this->m_pImpl->SetPrivateData(Name, DataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown){return this->m_pImpl->SetPrivateDataInterface(Name, pUnknown); }
-        HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData){return this->m_pImpl->GetPrivateData(Name, pDataSize, pData); }
-        HRESULT STDMETHODCALLTYPE GetParent(REFIID riid, void** ppParent){return this->m_pImpl->GetParent(riid, ppParent); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIDeviceSubObject
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIDeviceSubObject, SDXGIObject)
-        SDXGIDeviceSubObject(){}
-        HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice){return this->m_pImpl->GetDevice(riid, ppDevice); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIOutput
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIOutput, SDXGIObject)
-        SDXGIOutput(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(DXGI_OUTPUT_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        HRESULT STDMETHODCALLTYPE GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc){return this->m_pImpl->GetDisplayModeList(EnumFormat, Flags, pNumModes, pDesc); }
-        HRESULT STDMETHODCALLTYPE FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice){return this->m_pImpl->FindClosestMatchingMode(pModeToMatch, pClosestMatch, pConcernedDevice); }
-        HRESULT STDMETHODCALLTYPE WaitForVBlank(){return this->m_pImpl->WaitForVBlank(); }
-        HRESULT STDMETHODCALLTYPE TakeOwnership(IUnknown* pDevice, BOOL Exclusive){return this->m_pImpl->TakeOwnership(pDevice, Exclusive); }
-        void STDMETHODCALLTYPE ReleaseOwnership(){this->m_pImpl->ReleaseOwnership(); }
-        HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps){return this->m_pImpl->GetGammaControlCapabilities(pGammaCaps); }
-        HRESULT STDMETHODCALLTYPE SetGammaControl(const DXGI_GAMMA_CONTROL* pArray){return this->m_pImpl->SetGammaControl(pArray); }
-        HRESULT STDMETHODCALLTYPE GetGammaControl(DXGI_GAMMA_CONTROL* pArray){return this->m_pImpl->GetGammaControl(pArray); }
-        HRESULT STDMETHODCALLTYPE SetDisplaySurface(IDXGISurface* pScanoutSurface){return this->m_pImpl->SetDisplaySurface(pScanoutSurface); }
-        HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData(IDXGISurface* pDestination){return this->m_pImpl->GetDisplaySurfaceData(pDestination); }
-        HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats){return this->m_pImpl->GetFrameStatistics(pStats); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIAdapter
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIAdapter, SDXGIObject)
-        SDXGIAdapter(){}
-        HRESULT STDMETHODCALLTYPE EnumOutputs(UINT Output, IDXGIOutput** ppOutput){return this->m_pImpl->EnumOutputs(Output, ppOutput); }
-        HRESULT STDMETHODCALLTYPE GetDesc(DXGI_ADAPTER_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        HRESULT STDMETHODCALLTYPE CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion){return this->m_pImpl->CheckInterfaceSupport(InterfaceName, pUMDVersion); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIAdapter1
-        : SDXGIAdapter<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIAdapter1, SDXGIAdapter)
-        SDXGIAdapter1(){}
-        HRESULT STDMETHODCALLTYPE GetDesc1(DXGI_ADAPTER_DESC1* pDesc){return this->m_pImpl->GetDesc1(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIFactory
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIFactory, SDXGIObject)
-        SDXGIFactory(){}
-        HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter){return this->m_pImpl->EnumAdapters(Adapter, ppAdapter); }
-        HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags){return this->m_pImpl->MakeWindowAssociation(WindowHandle, Flags); }
-        HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle){return this->m_pImpl->GetWindowAssociation(pWindowHandle); }
-        HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain){return this->m_pImpl->CreateSwapChain(pDevice, pDesc, ppSwapChain); }
-        HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter){return this->m_pImpl->CreateSoftwareAdapter(Module, ppAdapter); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIFactory1
-        : SDXGIFactory<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIFactory1, SDXGIFactory)
-        SDXGIFactory1(){}
-        HRESULT STDMETHODCALLTYPE EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter){return this->m_pImpl->EnumAdapters1(Adapter, ppAdapter); }
-        BOOL STDMETHODCALLTYPE IsCurrent(void){return this->m_pImpl->IsCurrent(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIDevice
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIDevice, SDXGIObject)
-        SDXGIDevice(){}
-        HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter){return this->m_pImpl->GetAdapter(pAdapter); }
-        HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface){return this->m_pImpl->CreateSurface(pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); }
-        HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources){return this->m_pImpl->QueryResourceResidency(ppResources, pResidencyStatus, NumResources); }
-        HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority){return this->m_pImpl->SetGPUThreadPriority(Priority); }
-        HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority){return this->m_pImpl->GetGPUThreadPriority(pPriority); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGISwapChain
-        : SDXGIDeviceSubObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGISwapChain, SDXGIDeviceSubObject)
-        SDXGISwapChain(){}
-        HRESULT STDMETHODCALLTYPE Present(UINT SyncInterval, UINT Flags){return this->m_pImpl->Present(SyncInterval, Flags); }
-        HRESULT STDMETHODCALLTYPE GetBuffer(UINT Buffer, REFIID riid, void** ppSurface){return this->m_pImpl->GetBuffer(Buffer, riid, ppSurface); }
-        HRESULT STDMETHODCALLTYPE SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget){return this->m_pImpl->SetFullscreenState(Fullscreen, pTarget); }
-        HRESULT STDMETHODCALLTYPE GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget){return this->m_pImpl->GetFullscreenState(pFullscreen, ppTarget); }
-        HRESULT STDMETHODCALLTYPE GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        HRESULT STDMETHODCALLTYPE ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags){return this->m_pImpl->ResizeBuffers(BufferCount, Width, Height, NewFormat, SwapChainFlags); }
-        HRESULT STDMETHODCALLTYPE ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters){return this->m_pImpl->ResizeTarget(pNewTargetParameters); }
-        HRESULT STDMETHODCALLTYPE GetContainingOutput(IDXGIOutput** ppOutput){return this->m_pImpl->GetContainingOutput(ppOutput); }
-        HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats){return this->m_pImpl->GetFrameStatistics(pStats); }
-        HRESULT STDMETHODCALLTYPE GetLastPresentCount(UINT* pLastPresentCount){return this->m_pImpl->GetLastPresentCount(pLastPresentCount); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11SwitchToRef
-        : public SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11SwitchToRef, SUnknown)
-        SD3D11SwitchToRef(){}
-        BOOL STDMETHODCALLTYPE SetUseRef(BOOL UseRef){return this->m_pImpl->SetUseRef(UseRef); }
-        BOOL STDMETHODCALLTYPE GetUseRef(){return this->m_pImpl->GetUseRef(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Device
-        : public SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Device, SUnknown)
-        HRESULT STDMETHODCALLTYPE CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer){return this->m_pImpl->CreateBuffer(pDesc, pInitialData, ppBuffer); }
-        HRESULT STDMETHODCALLTYPE CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D){return this->m_pImpl->CreateTexture1D(pDesc, pInitialData, ppTexture1D); }
-        HRESULT STDMETHODCALLTYPE CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D){return this->m_pImpl->CreateTexture2D(pDesc, pInitialData, ppTexture2D); }
-        HRESULT STDMETHODCALLTYPE CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D){return this->m_pImpl->CreateTexture3D(pDesc, pInitialData, ppTexture3D); }
-        HRESULT STDMETHODCALLTYPE CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView){return this->m_pImpl->CreateShaderResourceView(pResource, pDesc, ppSRView); }
-        HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView){return this->m_pImpl->CreateUnorderedAccessView(pResource, pDesc, ppUAView); }
-        HRESULT STDMETHODCALLTYPE CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView){return this->m_pImpl->CreateRenderTargetView(pResource, pDesc, ppRTView); }
-        HRESULT STDMETHODCALLTYPE CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView){return this->m_pImpl->CreateDepthStencilView(pResource, pDesc, ppDepthStencilView); }
-        HRESULT STDMETHODCALLTYPE CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout){return this->m_pImpl->CreateInputLayout(pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); }
-        HRESULT STDMETHODCALLTYPE CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader){return this->m_pImpl->CreateVertexShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); }
-        HRESULT STDMETHODCALLTYPE CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader){return this->m_pImpl->CreateGeometryShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); }
-        HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader){return this->m_pImpl->CreateGeometryShaderWithStreamOutput(pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); }
-        HRESULT STDMETHODCALLTYPE CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader){return this->m_pImpl->CreatePixelShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); }
-        HRESULT STDMETHODCALLTYPE CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader){return this->m_pImpl->CreateHullShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); }
-        HRESULT STDMETHODCALLTYPE CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader){return this->m_pImpl->CreateDomainShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); }
-        HRESULT STDMETHODCALLTYPE CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader){return this->m_pImpl->CreateComputeShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); }
-        HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage){return this->m_pImpl->CreateClassLinkage(ppLinkage); }
-        HRESULT STDMETHODCALLTYPE CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState){return this->m_pImpl->CreateBlendState(pBlendStateDesc, ppBlendState); }
-        HRESULT STDMETHODCALLTYPE CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState){return this->m_pImpl->CreateDepthStencilState(pDepthStencilDesc, ppDepthStencilState); }
-        HRESULT STDMETHODCALLTYPE CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState){return this->m_pImpl->CreateRasterizerState(pRasterizerDesc, ppRasterizerState); }
-        HRESULT STDMETHODCALLTYPE CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState){return this->m_pImpl->CreateSamplerState(pSamplerDesc, ppSamplerState); }
-        HRESULT STDMETHODCALLTYPE CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery){return this->m_pImpl->CreateQuery(pQueryDesc, ppQuery); }
-        HRESULT STDMETHODCALLTYPE CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate){return this->m_pImpl->CreatePredicate(pPredicateDesc, ppPredicate); }
-        HRESULT STDMETHODCALLTYPE CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter){return this->m_pImpl->CreateCounter(pCounterDesc, ppCounter); }
-        HRESULT STDMETHODCALLTYPE CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext){return this->m_pImpl->CreateDeferredContext(ContextFlags, ppDeferredContext); }
-        HRESULT STDMETHODCALLTYPE OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource){return this->m_pImpl->OpenSharedResource(hResource, ReturnedInterface, ppResource); }
-        HRESULT STDMETHODCALLTYPE CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport){return this->m_pImpl->CheckFormatSupport(Format, pFormatSupport); }
-        HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels){return this->m_pImpl->CheckMultisampleQualityLevels(Format, SampleCount, pNumQualityLevels); }
-        void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo){this->m_pImpl->CheckCounterInfo(pCounterInfo); }
-        HRESULT STDMETHODCALLTYPE CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength){return this->m_pImpl->CheckCounter(pDesc, pType, pActiveCounters, szName, pNameLength, szUnits, pUnitsLength, szDescription, pDescriptionLength); }
-        HRESULT STDMETHODCALLTYPE CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize) {return this->m_pImpl->CheckFeatureSupport(Feature, pFeatureSupportData, FeatureSupportDataSize); }
-        HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData){return this->m_pImpl->GetPrivateData(guid, pDataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData){return this->m_pImpl->SetPrivateData(guid, DataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData){return this->m_pImpl->SetPrivateDataInterface(guid, pData); }
-        D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel(void){return this->m_pImpl->GetFeatureLevel(); }
-        UINT STDMETHODCALLTYPE GetCreationFlags(void){return this->m_pImpl->GetCreationFlags(); }
-        HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason(void){return this->m_pImpl->GetDeviceRemovedReason(); }
-        void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext){this->m_pImpl->GetImmediateContext(ppImmediateContext); }
-        HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags){return this->m_pImpl->SetExceptionMode(RaiseFlags); }
-        UINT STDMETHODCALLTYPE GetExceptionMode(void){return this->m_pImpl->GetExceptionMode(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DeviceContext
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DeviceContext, SD3D11DeviceChild)
-        void STDMETHODCALLTYPE VSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->VSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE PSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->PSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE PSSetShader(ID3D11PixelShader* pPixelShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->PSSetShader(pPixelShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE PSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->PSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE VSSetShader(ID3D11VertexShader* pVertexShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->VSSetShader(pVertexShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation){this->m_pImpl->DrawIndexed(IndexCount, StartIndexLocation, BaseVertexLocation); }
-        void STDMETHODCALLTYPE Draw(UINT VertexCount, UINT StartVertexLocation){this->m_pImpl->Draw(VertexCount, StartVertexLocation); }
-        HRESULT STDMETHODCALLTYPE Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource){return this->m_pImpl->Map(pResource, Subresource, MapType, MapFlags, pMappedResource); }
-        void STDMETHODCALLTYPE Unmap(ID3D11Resource* pResource, UINT Subresource){this->m_pImpl->Unmap(pResource, Subresource); }
-        void STDMETHODCALLTYPE PSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->PSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE IASetInputLayout(ID3D11InputLayout* pInputLayout){this->m_pImpl->IASetInputLayout(pInputLayout); }
-        void STDMETHODCALLTYPE IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets){this->m_pImpl->IASetVertexBuffers(StartSlot, NumBuffers, ppVertexBuffers, pStrides, pOffsets); }
-        void STDMETHODCALLTYPE IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset){this->m_pImpl->IASetIndexBuffer(pIndexBuffer, Format, Offset); }
-        void STDMETHODCALLTYPE DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation){this->m_pImpl->DrawIndexedInstanced(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation); }
-        void STDMETHODCALLTYPE DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation){this->m_pImpl->DrawInstanced(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation); }
-        void STDMETHODCALLTYPE GSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->GSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE GSSetShader(ID3D11GeometryShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->GSSetShader(pShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology){this->m_pImpl->IASetPrimitiveTopology(Topology); }
-        void STDMETHODCALLTYPE VSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->VSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE VSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->VSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE Begin(ID3D11Asynchronous* pAsync){this->m_pImpl->Begin(pAsync); }
-        void STDMETHODCALLTYPE End(ID3D11Asynchronous* pAsync){this->m_pImpl->End(pAsync); }
-        HRESULT STDMETHODCALLTYPE GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags){return this->m_pImpl->GetData(pAsync, pData, DataSize, GetDataFlags); }
-        void STDMETHODCALLTYPE SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue){this->m_pImpl->SetPredication(pPredicate, PredicateValue); }
-        void STDMETHODCALLTYPE GSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->GSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE GSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->GSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView){this->m_pImpl->OMSetRenderTargets(NumViews, ppRenderTargetViews, pDepthStencilView); }
-        void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts){this->m_pImpl->OMSetRenderTargetsAndUnorderedAccessViews(NumRTVs, ppRenderTargetViews, pDepthStencilView, UAVStartSlot, NumUAVs, ppUnorderedAccessViews, pUAVInitialCounts); }
-        void STDMETHODCALLTYPE OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask){this->m_pImpl->OMSetBlendState(pBlendState, BlendFactor, SampleMask); }
-        void STDMETHODCALLTYPE OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef){this->m_pImpl->OMSetDepthStencilState(pDepthStencilState, StencilRef); }
-        void STDMETHODCALLTYPE SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets){this->m_pImpl->SOSetTargets(NumBuffers, ppSOTargets, pOffsets); }
-        void STDMETHODCALLTYPE DrawAuto(void){this->m_pImpl->DrawAuto(); }
-        void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs){this->m_pImpl->DrawIndexedInstancedIndirect(pBufferForArgs, AlignedByteOffsetForArgs); }
-        void STDMETHODCALLTYPE DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs){this->m_pImpl->DrawInstancedIndirect(pBufferForArgs, AlignedByteOffsetForArgs); }
-        void STDMETHODCALLTYPE Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ){this->m_pImpl->Dispatch(ThreadGroupCountX, ThreadGroupCountY, ThreadGroupCountZ); }
-        void STDMETHODCALLTYPE DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs){this->m_pImpl->DispatchIndirect(pBufferForArgs, AlignedByteOffsetForArgs); }
-        void STDMETHODCALLTYPE RSSetState(ID3D11RasterizerState* pRasterizerState){this->m_pImpl->RSSetState(pRasterizerState); }
-        void STDMETHODCALLTYPE RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports){this->m_pImpl->RSSetViewports(NumViewports, pViewports); }
-        void STDMETHODCALLTYPE RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects){this->m_pImpl->RSSetScissorRects(NumRects, pRects); }
-        void STDMETHODCALLTYPE CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox){this->m_pImpl->CopySubresourceRegion(pDstResource, DstSubresource, DstX, DstY, DstZ, pSrcResource, SrcSubresource, pSrcBox); }
-        void STDMETHODCALLTYPE CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource){this->m_pImpl->CopyResource(pDstResource, pSrcResource); }
-        void STDMETHODCALLTYPE UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch){this->m_pImpl->UpdateSubresource(pDstResource, DstSubresource, pDstBox, pSrcData, SrcRowPitch, SrcDepthPitch); }
-        void STDMETHODCALLTYPE CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView){this->m_pImpl->CopyStructureCount(pDstBuffer, DstAlignedByteOffset, pSrcView); }
-        void STDMETHODCALLTYPE ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ]){this->m_pImpl->ClearRenderTargetView(pRenderTargetView, ColorRGBA); }
-        void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ]){this->m_pImpl->ClearUnorderedAccessViewUint(pUnorderedAccessView, Values); }
-        void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ]){this->m_pImpl->ClearUnorderedAccessViewFloat(pUnorderedAccessView, Values); }
-        void STDMETHODCALLTYPE ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil){this->m_pImpl->ClearDepthStencilView(pDepthStencilView, ClearFlags, Depth, Stencil); }
-        void STDMETHODCALLTYPE GenerateMips(ID3D11ShaderResourceView* pShaderResourceView){this->m_pImpl->GenerateMips(pShaderResourceView); }
-        void STDMETHODCALLTYPE SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD){this->m_pImpl->SetResourceMinLOD(pResource, MinLOD); }
-        FLOAT STDMETHODCALLTYPE GetResourceMinLOD(ID3D11Resource* pResource){return this->m_pImpl->GetResourceMinLOD(pResource); }
-        void STDMETHODCALLTYPE ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format){this->m_pImpl->ResolveSubresource(pDstResource, DstSubresource, pSrcResource, SrcSubresource, Format); }
-        void STDMETHODCALLTYPE ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState){this->m_pImpl->ExecuteCommandList(pCommandList, RestoreContextState); }
-        void STDMETHODCALLTYPE HSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->HSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE HSSetShader(ID3D11HullShader* pHullShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->HSSetShader(pHullShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE HSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->HSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE HSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->HSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE DSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->DSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE DSSetShader(ID3D11DomainShader* pDomainShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->DSSetShader(pDomainShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE DSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->DSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE DSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->DSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE CSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->CSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts){this->m_pImpl->CSSetUnorderedAccessViews(StartSlot, NumUAVs, ppUnorderedAccessViews, pUAVInitialCounts); }
-        void STDMETHODCALLTYPE CSSetShader(ID3D11ComputeShader* pComputeShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->CSSetShader(pComputeShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE CSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->CSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE CSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->CSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE VSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->VSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE PSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->PSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->PSGetShader(ppPixelShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE PSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->PSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->VSGetShader(ppVertexShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE PSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->PSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout){this->m_pImpl->IAGetInputLayout(ppInputLayout); }
-        void STDMETHODCALLTYPE IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets){this->m_pImpl->IAGetVertexBuffers(StartSlot, NumBuffers, ppVertexBuffers, pStrides, pOffsets); }
-        void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset){this->m_pImpl->IAGetIndexBuffer(pIndexBuffer, Format, Offset); }
-        void STDMETHODCALLTYPE GSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->GSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->GSGetShader(ppGeometryShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology){this->m_pImpl->IAGetPrimitiveTopology(pTopology); }
-        void STDMETHODCALLTYPE VSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->VSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE VSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->VSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue){this->m_pImpl->GetPredication(ppPredicate, pPredicateValue); }
-        void STDMETHODCALLTYPE GSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->GSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE GSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->GSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView){this->m_pImpl->OMGetRenderTargets(NumViews, ppRenderTargetViews, ppDepthStencilView); }
-        void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews){this->m_pImpl->OMGetRenderTargetsAndUnorderedAccessViews(NumRTVs, ppRenderTargetViews, ppDepthStencilView, UAVStartSlot, NumUAVs, ppUnorderedAccessViews); }
-        void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState** ppBlendState, FLOAT BlendFactor[ 4 ], UINT* pSampleMask){this->m_pImpl->OMGetBlendState(ppBlendState, BlendFactor, pSampleMask); }
-        void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef){this->m_pImpl->OMGetDepthStencilState(ppDepthStencilState, pStencilRef); }
-        void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets){this->m_pImpl->SOGetTargets(NumBuffers, ppSOTargets); }
-        void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState){this->m_pImpl->RSGetState(ppRasterizerState); }
-        void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports){this->m_pImpl->RSGetViewports(pNumViewports, pViewports); }
-        void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects){this->m_pImpl->RSGetScissorRects(pNumRects, pRects); }
-        void STDMETHODCALLTYPE HSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->HSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->HSGetShader(ppHullShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE HSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->HSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE HSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->HSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE DSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->DSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->DSGetShader(ppDomainShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE DSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->DSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE DSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->DSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE CSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->CSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews){this->m_pImpl->CSGetUnorderedAccessViews(StartSlot, NumUAVs, ppUnorderedAccessViews); }
-        void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->CSGetShader(ppComputeShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE CSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->CSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE CSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->CSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE ClearState(void){this->m_pImpl->ClearState(); }
-        void STDMETHODCALLTYPE Flush(void){this->m_pImpl->Flush(); }
-        D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType(void){return this->m_pImpl->GetType(); }
-        UINT STDMETHODCALLTYPE GetContextFlags(void){return this->m_pImpl->GetContextFlags(); }
-        HRESULT STDMETHODCALLTYPE FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList){return this->m_pImpl->FinishCommandList(RestoreDeferredContextState, ppCommandList); }
-    };
-} //namespace NDXGLWrappers
-
-#undef DXGL_WRAPPER_ROOT_NO_COM
-#undef DXGL_WRAPPER_ROOT
-#undef DXGL_WRAPPER_DERIVED
-
-#define DXGL_IMPLEMENT_INTERFACE(_Class, _Interface)                                                      \
-    typedef NDXGLWrappers::S ## _Interface<_Class, I ## _Interface> T ## _Interface ## Wrapper;           \
-    T ## _Interface ## Wrapper m_k ## _Interface ## Wrapper;                                              \
-    I ## _Interface * m_pVirtual ## _Interface ## Wrapper;                                                \
-    static ILINE void ToInterface(I ## _Interface * *ppInterface, _Class * pObject)                       \
-    {                                                                                                     \
-        *ppInterface = (pObject == NULL ? NULL : pObject->m_pVirtual ## _Interface ## Wrapper);           \
-    }                                                                                                     \
-    static ILINE _Class* FromInterface(I ## _Interface * pInterface)                                      \
-    {                                                                                                     \
-        return pInterface == NULL ? NULL : static_cast<T ## _Interface ## Wrapper*>(pInterface)->m_pImpl; \
-    }
-#define DXGL_INITIALIZE_INTERFACE(_Interface) \
-    m_k ## _Interface ## Wrapper.InitializeWrapper(this);
-
-#else
-
-#define DXGL_IMPLEMENT_INTERFACE(_Class, _Interface)                                \
-    static ILINE void ToInterface(I ## _Interface * *ppInterface, _Class * pObject) \
-    {                                                                               \
-        *ppInterface = pObject;                                                     \
-    }                                                                               \
-    static ILINE _Class* FromInterface(I ## _Interface * pInterface)                \
-    {                                                                               \
-        return static_cast<_Class*>(pInterface);                                    \
-    }
-#define DXGL_INITIALIZE_INTERFACE(_Interface)
-
-#endif
-
-#endif //__DXEmulation__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_android.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_android.cmake
deleted file mode 100644
index 6790116803..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_android.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-        PRIVATE
-            GLESv2
-            EGL
-)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_android_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_android_files.cmake
deleted file mode 100644
index 69a8d44920..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_android_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../../../D3DMeshBaker.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_traits_android.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_traits_android.cmake
deleted file mode 100644
index 444f66e038..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Android/DXGL_traits_android.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_OPENGL_SUPPORTED TRUE)
-set(LY_TRAIT_USE_LEGACY_IN_MONOLITHIC FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_linux.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_linux.cmake
deleted file mode 100644
index 807c0796ce..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_linux.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        X11
-        GL
-        EGL
-)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_linux_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_linux_files.cmake
deleted file mode 100644
index 69a8d44920..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_linux_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../../../D3DMeshBaker.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_traits_linux.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_traits_linux.cmake
deleted file mode 100644
index 444f66e038..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Linux/DXGL_traits_linux.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_OPENGL_SUPPORTED TRUE)
-set(LY_TRAIT_USE_LEGACY_IN_MONOLITHIC FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_mac.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_mac.cmake
deleted file mode 100644
index aadbfe9789..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_mac.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_mac_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_mac_files.cmake
deleted file mode 100644
index f70c6040d3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_mac_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../../../D3DMeshBaker.cpp
-    ../../Implementation/AppleGPUInfoUtils.mm
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_traits_mac.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_traits_mac.cmake
deleted file mode 100644
index db02feef18..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Mac/DXGL_traits_mac.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_OPENGL_SUPPORTED FALSE)
-set(LY_TRAIT_USE_LEGACY_IN_MONOLITHIC FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_traits_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_traits_windows.cmake
deleted file mode 100644
index 8e3e2cf728..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_traits_windows.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if (LY_ENABLE_OPENGL_WINDOWS)
-    set(DXGL_TRAIT_BUILD_OPENGL_SUPPORTED TRUE)
-else()
-    set(DXGL_TRAIT_BUILD_OPENGL_SUPPORTED FALSE)
-endif()
-
-set(LY_TRAIT_USE_LEGACY_IN_MONOLITHIC FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_windows.cmake
deleted file mode 100644
index b48cb9edd7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_windows.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        opengl32
-        winmm
-        Ole32
-        Gdi32
-        wininet
-        Shell32
-        ws2_32
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_windows_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_windows_files.cmake
deleted file mode 100644
index 69a8d44920..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/Windows/DXGL_windows_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../../../D3DMeshBaker.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_ios.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_ios.cmake
deleted file mode 100644
index aadbfe9789..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_ios.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_ios_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_ios_files.cmake
deleted file mode 100644
index f70c6040d3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_ios_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../../../D3DMeshBaker.cpp
-    ../../Implementation/AppleGPUInfoUtils.mm
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_traits_ios.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_traits_ios.cmake
deleted file mode 100644
index db02feef18..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Platform/iOS/DXGL_traits_ios.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_OPENGL_SUPPORTED FALSE)
-set(LY_TRAIT_USE_LEGACY_IN_MONOLITHIC FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/RenderCapabilities.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/RenderCapabilities.cpp
deleted file mode 100644
index 4975e5906c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/RenderCapabilities.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include "../../Common/RenderCapabilities.h"
-#include "Implementation/GLCommon.hpp"
-#include "Interfaces/CCryDXGLDevice.hpp"
-#include "Implementation/GLDevice.hpp"
-#include <AzCore/std/algorithm.h>
-
-namespace RenderCapabilities
-{
-    NCryOpenGL::CDevice* GetGLDevice()
-    {
-        AZ_Assert(gcpRendD3D, "gcpRendD3D is NULL");
-        CCryDXGLDevice* pDXGLDevice(CCryDXGLDevice::FromInterface(static_cast<ID3D11Device*>(&gcpRendD3D->GetDevice())));
-        AZ_Assert(pDXGLDevice, "CCryDXGLDevice is NULL");
-        return pDXGLDevice->GetGLDevice();
-    }
-
-    bool SupportsTextureViews()
-    {
-        return GetGLDevice()->IsFeatureSupported(NCryOpenGL::eF_TextureViews);
-    }
-
-    bool SupportsStencilTextures()
-    {
-        return GetGLDevice()->IsFeatureSupported(NCryOpenGL::eF_StencilTextures);
-    }
-
-    bool SupportsDepthClipping()
-    {
-        return GetGLDevice()->IsFeatureSupported(NCryOpenGL::eF_DepthClipping);
-    }
-
-    bool SupportsDualSourceBlending()
-    {
-        return GetGLDevice()->IsFeatureSupported(NCryOpenGL::eF_DualSourceBlending);
-    }
-
-    bool SupportsStructuredBuffer(EShaderStage stageMask)
-    {
-        AZStd::vector<NCryOpenGL::EShaderType> shaderStages;
-        if (stageMask & EShaderStage_Vertex)
-        {
-            shaderStages.push_back(NCryOpenGL::eST_Vertex);
-        }
-
-        if (stageMask & EShaderStage_Pixel)
-        {
-            shaderStages.push_back(NCryOpenGL::eST_Fragment);
-        }
-
-        if (stageMask & EShaderStage_Geometry)
-        {
-#if DXGL_SUPPORT_GEOMETRY_SHADERS
-            shaderStages.push_back(NCryOpenGL::eST_Geometry);
-#else
-            return false;
-#endif
-        }
-
-        if (stageMask & EShaderStage_Compute)
-        {
-#if DXGL_SUPPORT_COMPUTE
-            shaderStages.push_back(NCryOpenGL::eST_Compute);
-#else
-            return false;
-#endif
-        }
-
-        if (stageMask & EShaderStage_Domain)
-        {
-#if DXGL_SUPPORT_TESSELLATION
-            shaderStages.push_back(NCryOpenGL::eST_TessEvaluation);
-#else
-            return false;
-#endif
-        }
-
-        if (stageMask & EShaderStage_Hull)
-        {
-#if DXGL_SUPPORT_TESSELLATION
-            shaderStages.push_back(NCryOpenGL::eST_TessControl);
-#else
-            return false;
-#endif
-        }
-
-        const NCryOpenGL::SResourceUnitCapabilities& capabilities = GetGLDevice()->GetAdapter()->m_kCapabilities.m_akResourceUnits[NCryOpenGL::eRUT_StorageBuffer];
-        for (AZStd::vector<NCryOpenGL::EShaderType>::iterator it = shaderStages.begin(); it != shaderStages.end(); ++it)
-        {
-            if (capabilities.m_aiMaxPerStage[*it] == 0)
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-#if defined(OPENGL_ES)
-    int GetAvailableMRTbpp()
-    {
-        const NCryOpenGL::SCapabilities& capabilities = GetGLDevice()->GetAdapter()->m_kCapabilities;
-        if (GetFrameBufferFetchCapabilities().test(FBF_ALL_COLORS))
-        {
-            // Assuming 32 bits per rendertarget when using all attachments.
-            GLint bitsPerRT = 32;
-            GLint numRT = capabilities.m_maxRenderTargets;
-            return numRT * bitsPerRT;
-        }
-
-        if (SupportsPLSExtension())
-        {
-            GLint bitsPerByte = 8;
-            GLint plsSize = capabilities.m_plsSizeInBytes;
-            // We only support PLS 128 for the moment.
-            return AZStd::min(plsSize * bitsPerByte, 128);
-        }
-
-        return 0;
-    }
-
-    bool Supports128bppGmemPath()
-    {
-        // We don't support GMEM on platforms without floating point rendertarget support 
-        return SupportsHalfFloatRendering() && 
-            (GetFrameBufferFetchCapabilities().test(FBF_ALL_COLORS) || SupportsPLSExtension()) &&
-            GetAvailableMRTbpp() >= 128;
-    }
-
-    bool Supports256bppGmemPath()
-    {
-        // We don't support GMEM on platforms without floating point rendertarget support 
-        return SupportsHalfFloatRendering() && 
-            (GetFrameBufferFetchCapabilities().test(FBF_ALL_COLORS) || SupportsPLSExtension())
-            && GetAvailableMRTbpp() >= 256;
-    }
-
-    bool SupportsHalfFloatRendering()
-    {
-        return DXGL_GL_EXTENSION_SUPPORTED(EXT_color_buffer_half_float);
-    }
-
-    bool SupportsRenderTargets(int numRTs)
-    {
-        const NCryOpenGL::SCapabilities& capabilities = GetGLDevice()->GetAdapter()->m_kCapabilities;
-        return capabilities.m_maxRenderTargets >= numRTs;
-    }
-#endif
-
-    bool SupportsPLSExtension()
-    {
-        // Favor framebuffer fetch over PLS (for compatibility with Metal)
-        const NCryOpenGL::SCapabilities& capabilities = GetGLDevice()->GetAdapter()->m_kCapabilities;
-        return !GetFrameBufferFetchCapabilities().test(FBF_ALL_COLORS) && capabilities.m_plsSizeInBytes > 0;
-    }
-
-    FrameBufferFetchMask GetFrameBufferFetchCapabilities()
-    {
-        const NCryOpenGL::SCapabilities& capabilities = GetGLDevice()->GetAdapter()->m_kCapabilities;
-        return capabilities.m_frameBufferFetchSupport;
-    }
-
-    bool SupportsIndependentBlending()
-    {
-        return GetGLDevice()->IsFeatureSupported(NCryOpenGL::eF_IndependentBlending);
-    }
-
-    uint32 GetDeviceGLVersion()
-    {
-        return GetGLDevice()->GetFeatureSpec().m_kVersion.ToUint();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Specification/KHR/khrplatform.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Specification/KHR/khrplatform.h
deleted file mode 100644
index 848874d016..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Specification/KHR/khrplatform.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#ifndef __khrplatform_h_
-#define __khrplatform_h_
-
-/*
-** Copyright (c) 2008-2009 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* Khronos platform-specific types and definitions.
- *
- * $Revision: 32517 $ on $Date: 2016-03-11 02:41:19 -0800 (Fri, 11 Mar 2016) $
- *
- * Adopters may modify this file to suit their platform. Adopters are
- * encouraged to submit platform specific modifications to the Khronos
- * group so that they can be included in future versions of this file.
- * Please submit changes by sending them to the public Khronos Bugzilla
- * (http://khronos.org/bugzilla) by filing a bug against product
- * "Khronos (general)" component "Registry".
- *
- * A predefined template which fills in some of the bug fields can be
- * reached using http://tinyurl.com/khrplatform-h-bugreport, but you
- * must create a Bugzilla login first.
- *
- *
- * See the Implementer's Guidelines for information about where this file
- * should be located on your system and for more details of its use:
- *    http://www.khronos.org/registry/implementers_guide.pdf
- *
- * This file should be included as
- *        #include <KHR/khrplatform.h>
- * by Khronos client API header files that use its types and defines.
- *
- * The types in khrplatform.h should only be used to define API-specific types.
- *
- * Types defined in khrplatform.h:
- *    khronos_int8_t              signed   8  bit
- *    khronos_uint8_t             unsigned 8  bit
- *    khronos_int16_t             signed   16 bit
- *    khronos_uint16_t            unsigned 16 bit
- *    khronos_int32_t             signed   32 bit
- *    khronos_uint32_t            unsigned 32 bit
- *    khronos_int64_t             signed   64 bit
- *    khronos_uint64_t            unsigned 64 bit
- *    khronos_intptr_t            signed   same number of bits as a pointer
- *    khronos_uintptr_t           unsigned same number of bits as a pointer
- *    khronos_ssize_t             signed   size
- *    khronos_usize_t             unsigned size
- *    khronos_float_t             signed   32 bit floating point
- *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
- *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
- *                                         nanoseconds
- *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
- *    khronos_boolean_enum_t      enumerated boolean type. This should
- *      only be used as a base type when a client API's boolean type is
- *      an enum. Client APIs which use an integer or other type for
- *      booleans cannot use this as the base type for their boolean.
- *
- * Tokens defined in khrplatform.h:
- *
- *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
- *
- *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
- *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
- *
- * Calling convention macros defined in this file:
- *    KHRONOS_APICALL
- *    KHRONOS_APIENTRY
- *    KHRONOS_APIATTRIBUTES
- *
- * These may be used in function prototypes as:
- *
- *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
- *                                  int arg1,
- *                                  int arg2) KHRONOS_APIATTRIBUTES;
- */
-
-/*-------------------------------------------------------------------------
- * Definition of KHRONOS_APICALL
- *-------------------------------------------------------------------------
- * This precedes the return type of the function in the function prototype.
- */
-#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
-#   define KHRONOS_APICALL __declspec(dllimport)
-#elif defined (__SYMBIAN32__)
-#   define KHRONOS_APICALL IMPORT_C
-#elif defined(__ANDROID__)
-#   define KHRONOS_APICALL __attribute__((visibility("default")))
-#else
-#   define KHRONOS_APICALL
-#endif
-
-/*-------------------------------------------------------------------------
- * Definition of KHRONOS_APIENTRY
- *-------------------------------------------------------------------------
- * This follows the return type of the function  and precedes the function
- * name in the function prototype.
- */
-#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
-    /* Win32 but not WinCE */
-#   define KHRONOS_APIENTRY __stdcall
-#else
-#   define KHRONOS_APIENTRY
-#endif
-
-/*-------------------------------------------------------------------------
- * Definition of KHRONOS_APIATTRIBUTES
- *-------------------------------------------------------------------------
- * This follows the closing parenthesis of the function prototype arguments.
- */
-#if defined (__ARMCC_2__)
-#define KHRONOS_APIATTRIBUTES __softfp
-#else
-#define KHRONOS_APIATTRIBUTES
-#endif
-
-/*-------------------------------------------------------------------------
- * basic type definitions
- *-----------------------------------------------------------------------*/
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
-
-
-/*
- * Using <stdint.h>
- */
-#include <stdint.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(__VMS ) || defined(__sgi)
-
-/*
- * Using <inttypes.h>
- */
-#include <inttypes.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
-
-/*
- * Win32
- */
-typedef __int32                 khronos_int32_t;
-typedef unsigned __int32        khronos_uint32_t;
-typedef __int64                 khronos_int64_t;
-typedef unsigned __int64        khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(__sun__) || defined(__digital__)
-
-/*
- * Sun or Digital
- */
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#if defined(__arch64__) || defined(_LP64)
-typedef long int                khronos_int64_t;
-typedef unsigned long int       khronos_uint64_t;
-#else
-typedef long long int           khronos_int64_t;
-typedef unsigned long long int  khronos_uint64_t;
-#endif /* __arch64__ */
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif 0
-
-/*
- * Hypothetical platform with no float or int64 support
- */
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#define KHRONOS_SUPPORT_INT64   0
-#define KHRONOS_SUPPORT_FLOAT   0
-
-#else
-
-/*
- * Generic fallback
- */
-#include <stdint.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#endif
-
-
-/*
- * Types that are (so far) the same on all platforms
- */
-typedef signed   char          khronos_int8_t;
-typedef unsigned char          khronos_uint8_t;
-typedef signed   short int     khronos_int16_t;
-typedef unsigned short int     khronos_uint16_t;
-
-/*
- * Types that differ between LLP64 and LP64 architectures - in LLP64,
- * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
- * to be the only LLP64 architecture in current use.
- */
-#ifdef _WIN64
-typedef signed   long long int khronos_intptr_t;
-typedef unsigned long long int khronos_uintptr_t;
-typedef signed   long long int khronos_ssize_t;
-typedef unsigned long long int khronos_usize_t;
-#else
-typedef signed   long  int     khronos_intptr_t;
-typedef unsigned long  int     khronos_uintptr_t;
-typedef signed   long  int     khronos_ssize_t;
-typedef unsigned long  int     khronos_usize_t;
-#endif
-
-#if KHRONOS_SUPPORT_FLOAT
-/*
- * Float type
- */
-typedef          float         khronos_float_t;
-#endif
-
-#if KHRONOS_SUPPORT_INT64
-/* Time types
- *
- * These types can be used to represent a time interval in nanoseconds or
- * an absolute Unadjusted System Time.  Unadjusted System Time is the number
- * of nanoseconds since some arbitrary system event (e.g. since the last
- * time the system booted).  The Unadjusted System Time is an unsigned
- * 64 bit value that wraps back to 0 every 584 years.  Time intervals
- * may be either signed or unsigned.
- */
-typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
-typedef khronos_int64_t        khronos_stime_nanoseconds_t;
-#endif
-
-/*
- * Dummy value used to pad enum types to 32 bits.
- */
-#ifndef KHRONOS_MAX_ENUM
-#define KHRONOS_MAX_ENUM 0x7FFFFFFF
-#endif
-
-/*
- * Enumerated boolean type
- *
- * Values other than zero should be considered to be true.  Therefore
- * comparisons should not be made against KHRONOS_TRUE.
- */
-typedef enum {
-    KHRONOS_FALSE = 0,
-    KHRONOS_TRUE  = 1,
-    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
-} khronos_boolean_enum_t;
-
-#endif /* __khrplatform_h_ */
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/DXGL_precompiled.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/DXGL_precompiled.h
deleted file mode 100644
index 4b5374fb5f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/DXGL_precompiled.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Utility header for standalone DXGL build
-
-
-#if defined(_MSC_VER)
-#define ILINE __forceinline
-#else
-#define ILINE inline
-#endif
-
-#define COMPILE_TIME_ASSERT(_Condition)
-
-#if !defined(SAFE_RELEASE)
-#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
-}
-#endif //!defined(SAFE_RELEASE)
-
-#include <cstring>
-typedef unsigned short ushort;
-typedef unsigned char uchar;
-typedef uchar uint8;
-typedef char int8;
-#if defined(WIN32)
-typedef unsigned __int16 uint16;
-typedef __int16 int16;
-typedef unsigned __int32 uint32;
-typedef __int32 int32;
-typedef unsigned __int64 uint64;
-typedef __int64 int64;
-#else
-#include <stdint.h>
-typedef uint16_t uint16;
-typedef int16_t int16;
-typedef uint32_t uint32;
-typedef int32_t int32;
-typedef uint64_t uint64;
-typedef int64_t int64;
-typedef uint32 ULONG;
-typedef uint32 DWORD;
-typedef void* HANDLE;
-typedef void* HWND;
-typedef void* HMODULE;
-typedef uchar BYTE;
-typedef uint64 UINT64;
-typedef int32 LONG;
-typedef float FLOAT;
-typedef int HRESULT;
-typedef wchar_t WCHAR;
-typedef size_t SIZE_T;
-typedef const char* LPCSTR;
-typedef char* LPSTR;
-typedef const void* LPCVOID;
-typedef void* LPVOID;
-#define WINAPI
-#endif
-
-#include <vector>
-
-#if defined(WIN32)
-
-#include <hash_map>
-
-namespace stl
-{
-    template <typename Key, typename Less = std::less<Key> >
-    struct hash_compare
-        : stdext::hash_compare<Key, Less>
-    {
-        hash_compare(){}
-    };
-
-    template <typename Key, typename Value, typename HashCompare = hash_compare<Key, std::less<Key> > >
-    struct hash_map
-        : stdext::hash_map<Key, Value, HashCompare, std::allocator<std::pair<const Key, Value> > >
-    {
-        hash_map(){}
-    };
-}
-
-#else
-
-#include <unordered_map>
-
-namespace stl
-{
-    template <typename Key, typename Less = std::less<Key> >
-    struct hash_compare
-        : Less
-    {
-        hash_compare(){}
-        size_t operator()(const Key& kKey) const{ return std::hash<Key>(kKey); }
-        bool operator()(const Key& kLeft, const Key& kRight) const{ return Less::operator()(kLeft, kRight); }
-    };
-
-    template <typename Key, typename HashCompare>
-    struct hash
-        : HashCompare
-    {
-        hash(){}
-        size_t operator()(const Key& kKey) const{ return HashCompare::operator()(kKey); }
-    };
-
-    template <typename Key, typename HashCompare>
-    struct equal_to
-        : HashCompare
-    {
-        equal_to(){}
-        bool operator()(const Key& kLeft, const Key& kRight) const{ return !HashCompare::operator()(kLeft, kRight) && !HashCompare::operator()(kRight, kLeft); }
-    };
-
-    template <typename Key, typename Value, typename HashCompare = hash_compare<Key, std::less<Key> > >
-    struct hash_map
-        : std::unordered_map<Key, Value, stl::hash<Key, HashCompare>, stl::equal_to<Key, HashCompare> >
-    {
-        hash_map(){}
-    };
-}
-
-#endif
-
-template <typename T>
-struct _smart_ptr
-{
-    _smart_ptr(T* pPtr = NULL)
-        : m_pPtr(pPtr)
-    {
-        if (m_pPtr)
-        {
-            m_pPtr->AddRef();
-        }
-    }
-
-    _smart_ptr(const _smart_ptr& kOther)
-        : m_pPtr(kOther.m_pPtr)
-    {
-        if (m_pPtr)
-        {
-            m_pPtr->AddRef();
-        }
-    }
-
-    template <typename S>
-    _smart_ptr(const _smart_ptr<S>& kOther)
-        : m_pPtr(kOther.m_pPtr)
-    {
-        if (m_pPtr)
-        {
-            m_pPtr->AddRef();
-        }
-    }
-
-    ~_smart_ptr()
-    {
-        if (m_pPtr)
-        {
-            m_pPtr->Release();
-        }
-    }
-
-    _smart_ptr& operator=(const _smart_ptr& kOther)
-    {
-        if (m_pPtr != kOther.m_pPtr)
-        {
-            if (m_pPtr)
-            {
-                m_pPtr->Release();
-            }
-            m_pPtr = kOther.m_pPtr;
-            if (m_pPtr)
-            {
-                m_pPtr->AddRef();
-            }
-        }
-        return *this;
-    }
-
-    template <typename S>
-    _smart_ptr& operator=(const _smart_ptr<S>& kOther)
-    {
-        if (m_pPtr != kOther.m_pPtr)
-        {
-            if (m_pPtr)
-            {
-                m_pPtr->Release();
-            }
-            m_pPtr = kOther.m_pPtr;
-            if (m_pPtr)
-            {
-                m_pPtr->AddRef();
-            }
-        }
-        return *this;
-    }
-
-    bool operator==(T* pPtr) const
-    {
-        return m_pPtr == pPtr;
-    }
-
-    bool operator!=(T* pPtr) const
-    {
-        return m_pPtr != pPtr;
-    }
-
-    T& operator*() const
-    {
-        return *get();
-    }
-
-    T* operator->() const
-    {
-        return get();
-    }
-
-    operator T*() const
-    {
-        return get();
-    }
-
-    T* get() const
-    {
-        return m_pPtr;
-    }
-
-
-    T* m_pPtr;
-};
-
-#if !defined(WIN32)
-
-typedef struct tagRECT
-{
-    LONG    left;
-    LONG    top;
-    LONG    right;
-    LONG    bottom;
-} RECT, * PRECT;
-
-typedef union _LARGE_INTEGER
-{
-    struct
-    {
-        DWORD LowPart;
-        LONG HighPart;
-    };
-    struct
-    {
-        DWORD LowPart;
-        LONG HighPart;
-    } u;
-    long long QuadPart;
-} LARGE_INTEGER;
-
-#endif //!defined(WIN32)
-
-#define D3D10CreateBlob D3DCreateBlob
-#define CRY_OPENGL_ADAPT_CLIP_SPACE 1
-#define CRY_OPENGL_FLIP_Y 1
-#define CRY_OPENGL_MODIFY_PROJECTIONS !CRY_OPENGL_ADAPT_CLIP_SPACE
-
-#include "../CryDXGL.hpp"
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLCrossPlatform.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLCrossPlatform.cpp
deleted file mode 100644
index 7bc1313a84..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLCrossPlatform.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Cross platform DXGL helper types implementation
-
-
-#include "DXGL_precompiled.h"
-#include "../Implementation/GLPlatform.hpp"
-
-namespace NCryOpenGL
-{
-    namespace NCrossPlatformImpl
-    {
-        SAutoLog g_kLog("DXGL.log");
-        SAutoTLSSlot g_kCRCTable;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLCrossPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLCrossPlatform.hpp
deleted file mode 100644
index 0d6b281c5b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLCrossPlatform.hpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Cross platform DXGL helper types
-
-
-#ifndef __GLCROSSPLATFORM__
-#define __GLCROSSPLATFORM__
-
-#include <algorithm>
-#include <cfloat>
-
-using namespace std;
-
-#if defined(_MSC_VER)
-#define ILINE __forceinline
-#elif defined(__GNUC__) || defined(__clang__)
-#define ILINE __attribute__((always_inline))
-#else
-#define ILINE inline
-#endif
-
-#if !defined(_MSC_VER)
-
-inline int sprintf_s(char* buffer, size_t size, const char* format, ...)
-{
-#if defined(LINUX) || defined(APPLE)
-    va_list args;
-    va_start(args, format);
-    int err = vsnprintf(buffer, size, format, args);
-    va_end(args);
-    return err;
-#else
-#error "Not implemented on this platform"
-#endif
-}
-
-template <size_t size>
-int sprintf_s(char (&buffer)[size], const char* format, ...)
-{
-#if defined(LINUX) || defined(APPLE)
-    va_list args;
-    va_start(args, format);
-    int err = vsnprintf(buffer, size, format, args);
-    va_end(args);
-    return err;
-#else
-#error "Not implemented on this platform"
-#endif
-}
-
-inline int strcpy_s(char* dst, size_t size, const char* src)
-{
-#if defined(LINUX) || defined(APPLE)
-    strncpy(dst, src, size);
-    dst[size - 1] = 0;
-    return 0;
-#else
-#error "Not implemented on this platform"
-#endif
-}
-
-template <size_t SIZE>
-int strcpy_s(char (&dst)[SIZE], const char* src)
-{
-    return strcpy_s(dst, SIZE, src);
-}
-
-inline void ZeroMemory(void* pPtr, int nSize)
-{
-    memset(pPtr, 0, nSize);
-}
-
-#endif //!defined(_MSC_VER)
-
-namespace NCryOpenGL
-{
-    inline void* Malloc(size_t size)
-    {
-        return malloc(size)
-    }
-
-    inline void* Calloc(size_t num, size_t size)
-    {
-        return calloc(num, size)
-    }
-
-    inline void* Realloc(void* memblock, size_t size)
-    {
-        return realloc(memblock, size)
-    }
-
-    inline void Free(void* memblock)
-    {
-        free(memblock)
-    }
-
-    void* CreateTLS();
-    void SetTLSValue(void* pTLSHandle, void* pValue);
-    void* GetTLSValue(void* pTLSHandle);
-    void DestroyTLS(void* pTLSHandle);
-    bool MakeDir(const char* szDirName);
-
-    namespace NCrossPlatformImpl
-    {
-        struct SAutoLog
-        {
-            FILE* m_pFile;
-
-            SAutoLog(const char* szFileName)
-            {
-                m_pFile = fopen("DXGL.log", "w");
-            }
-
-            ~SAutoLog()
-            {
-                if (m_pFile != NULL)
-                {
-                    fclose(m_pFile);
-                }
-            }
-        };
-
-        struct SAutoTLSSlot
-        {
-            void* m_pTLSHandle;
-
-            SAutoTLSSlot()
-            {
-                m_pTLSHandle = CreateTLS();
-            }
-
-            ~SAutoTLSSlot()
-            {
-                DestroyTLS(m_pTLSHandle);
-            }
-        };
-
-        inline uint32 CRC32Reflect(unsigned int ref, char ch)
-        {
-            unsigned int value = 0;
-
-            // Swap bit 0 for bit 7
-            // bit 1 for bit 6, etc.
-            for (int i = 1; i < (ch + 1); i++)
-            {
-                if (ref & 1)
-                {
-                    value |= 1 << (ch - i);
-                }
-                ref >>= 1;
-            }
-            return value;
-        }
-
-        extern SAutoLog g_kLog;
-        extern SAutoTLSSlot g_kCRCTable;
-    }
-
-#define PRINTF_PARAMS(a, b)
-
-    void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-    inline void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...)
-    {
-        if (NCrossPlatformImpl::g_kLog.m_pFile != NULL)
-        {
-            va_list kArgs;
-            va_start(kArgs, szFormat);
-            vfprintf(NCrossPlatformImpl::g_kLog.m_pFile, szFormat, kArgs);
-            va_end(kArgs);
-            fputc('\n', NCrossPlatformImpl::g_kLog.m_pFile);
-            fflush(NCrossPlatformImpl::g_kLog.m_pFile);
-        }
-    }
-
-    inline uint32 GetCRC32(const char* pData, size_t uSize, uint32 uCRC)
-    {
-        uint32* pCRCTable(static_cast<uint32*>(GetTLSValue(NCrossPlatformImpl::g_kCRCTable.m_pTLSHandle)));
-        if (pCRCTable == NULL)
-        {
-            pCRCTable = new uint32[256];
-            SetTLSValue(NCrossPlatformImpl::g_kCRCTable.m_pTLSHandle, pCRCTable);
-
-            // This is the official polynomial used by CRC-32
-            // in PKZip, WinZip and Ethernet.
-            unsigned int ulPolynomial = 0x04c11db7;
-
-            // 256 values representing ASCII character codes.
-            for (int i = 0; i <= 0xFF; i++)
-            {
-                pCRCTable[i] = NCrossPlatformImpl::CRC32Reflect(i, 8) << 24;
-                for (int j = 0; j < 8; j++)
-                {
-                    pCRCTable[i] = (pCRCTable[i] << 1) ^ (pCRCTable[i] & (1U << 31) ? ulPolynomial : 0);
-                }
-                pCRCTable[i] = NCrossPlatformImpl::CRC32Reflect(pCRCTable[i], 32);
-            }
-        }
-
-        int len;
-        unsigned char* buffer;
-
-        // Get the length.
-        len = uSize;
-
-        // Save the text in the buffer.
-        buffer = (unsigned char*)pData;
-        // Perform the algorithm on each character in the string, using the lookup table values.
-
-        while (len--)
-        {
-            uCRC = (uCRC >> 8) ^ pCRCTable[(uCRC & 0xFF) ^ *buffer++];
-        }
-        // Exclusive OR the result with the beginning value.
-        return uCRC ^ 0xffffffff;
-    }
-
-    using std::string;
-
-    struct STraceFile
-    {
-        STraceFile()
-            : m_pFile(NULL)
-        {
-        }
-
-        ~STraceFile()
-        {
-            if (m_pFile != NULL)
-            {
-                fclose(m_pFile);
-            }
-        }
-
-        bool Open(const char* szFileName, bool bBinary)
-        {
-            if (m_pFile != NULL)
-            {
-                return false;
-            }
-
-            const char* szDirName = "DXGLTrace";
-            do
-            {
-                char acFullPath[256];
-                sprintf_s(acFullPath, "%s/%s", szDirName, szFileName);
-                const char* szMode(bBinary ? "wb" : "w");
-                m_pFile = fopen(acFullPath, szMode);
-                if (m_pFile != NULL)
-                {
-                    return true;
-                }
-            } while (MakeDir(szDirName));
-
-            return false;
-        }
-
-        void Write(const void* pvData, uint32 uSize)
-        {
-            fwrite(pvData, (size_t)uSize, 1, m_pFile);
-        }
-
-        void Printf(const char* szFormat, ...)
-        {
-            va_list kArgs;
-            va_start(kArgs, szFormat);
-            vfprintf(m_pFile, szFormat, kArgs);
-            va_end(kArgs);
-        }
-
-        FILE* m_pFile;
-    };
-
-    inline void RegisterConfigVariable(const char*, int* piVariable, int iValue)
-    {
-        *piVariable = iValue;
-    }
-
-#define IL2VAL(mask, shift)         \
-    c |= ((x & mask) != 0) * shift; \
-    x >>= ((x & mask) != 0) * shift
-
-    inline uint32 IntegerLog2(uint32 x)
-    {
-        uint32 c = 0;
-        IL2VAL(0xffff0000u, 16);
-        IL2VAL(0xff00, 8);
-        IL2VAL(0xf0, 4);
-        IL2VAL(0xc, 2);
-        IL2VAL(0x2, 1);
-        return c;
-    }
-
-#undef IL2VAL
-
-    template <typename T>
-    inline size_t countTrailingZeroes(T v)
-    {
-        size_t n = 0;
-
-        v = ~v & (v - 1);
-        while (v)
-        {
-            ++n;
-            v >>= 1;
-        }
-
-        return n;
-    }
-
-    template<typename DestinationType, typename SourceType>
-    inline DestinationType alias_cast(SourceType pPtr)
-    {
-        union
-        {
-            SourceType pSrc;
-            DestinationType pDst;
-        } conv_union;
-        conv_union.pSrc = pPtr;
-        return conv_union.pDst;
-    }
-
-    inline void* cryMemcpy(void* pDst, const void* pSrc, size_t uLength)
-    {
-        return memcpy(pDst, pSrc, uLength);
-    }
-
-    inline void PushProfileLabel(const char* szName)
-    {
-        DXGLProfileLabelPush(szName);
-    }
-
-    inline void PopProfileLabel(const char* szName)
-    {
-        DXGLProfileLabelPop(szName);
-    }
-}
-
-#endif //__GLCROSSPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLLinuxPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLLinuxPlatform.hpp
deleted file mode 100644
index f0382f0636..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLLinuxPlatform.hpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Platform specific DXGL requirements implementation relying
-//               on Linux POSIX API
-
-
-#ifndef __GLLINUXPLATFORM__
-#define __GLLINUXPLATFORM__
-
-#include "GLCrossPlatform.hpp"
-#include <malloc.h>
-#include <pthread.h>
-#include <cassert>
-#include <sys/stat.h>
-
-#if !defined(TRUE) || !defined(FALSE)
-#undef TRUE
-#undef FALSE
-#define TRUE true
-#define FALSE false
-#endif //!defined(TRUE) || !defined(FALSE)
-#define MAX_PATH 256
-
-
-namespace NCryOpenGL
-{
-    namespace NLinuxPlatformImpl
-    {
-        struct SCriticalSection
-        {
-            pthread_mutex_t m_kMutex;
-
-            SCriticalSection()
-            {
-                pthread_mutex_init(&m_kMutex, NULL);
-            }
-
-            ~SCriticalSection()
-            {
-                pthread_mutex_destroy(&m_kMutex);
-            }
-
-            void Lock()
-            {
-                pthread_mutex_lock(&m_kMutex);
-            }
-
-            void Unlock()
-            {
-                pthread_mutex_unlock(&m_kMutex);
-            }
-        };
-    }
-
-    inline void BreakUnique(const char* szFile, uint32 uLine)
-    {
-        LogMessage(eLS_Warning, "Break at %s(%d)", szFile, uLine);
-        __builtin_trap();
-    }
-
-    inline LONG Exchange(LONG volatile* piDestination, LONG iExchange)
-    {
-        LONG iOldValue(__sync_lock_test_and_set(piDestination, iExchange));
-        __sync_synchronize();
-        return iOldValue;
-    }
-
-    inline LONG CompareExchange(LONG volatile* piDestination, LONG iExchange, LONG iComparand)
-    {
-        return __sync_val_compare_and_swap(piDestination, iComparand, iExchange);
-    }
-
-    inline LONG AtomicIncrement(LONG volatile* piDestination)
-    {
-        return __sync_fetch_and_add(piDestination, 1) + 1;
-    }
-
-    inline LONG AtomicDecrement(LONG volatile* piDestination)
-    {
-        return __sync_fetch_and_sub(piDestination, 1) - 1;
-    }
-
-    typedef NLinuxPlatformImpl::SCriticalSection TCriticalSection;
-
-    inline void LockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Lock();
-    }
-
-    inline void UnlockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Unlock();
-    }
-
-    struct SLockFreeSingleLinkedListEntry
-    {
-        SLockFreeSingleLinkedListEntry* volatile pNext;
-    } __attribute__((aligned(16)));
-
-    struct SLockFreeSingleLinkedListHeader
-    {
-        SLockFreeSingleLinkedListEntry* volatile pNext;
-        volatile uint64 salt;
-    } __attribute__((aligned(16)));
-
-    inline unsigned char _InterlockedCompareExchange128(int64 volatile* dst, int64 exchangehigh, int64 exchangelow, int64* comperand)
-    {
-        bool bEquals;
-        __asm__ __volatile__
-        (
-            "lock cmpxchg16b %1\n\t"
-            "setz %0"
-            : "=q" (bEquals), "+m" (*dst), "+d" (comperand[1]), "+a" (comperand[0])
-            : "c" (exchangehigh), "b" (exchangelow)
-            : "cc"
-        );
-        return (char)bEquals;
-    }
-
-    inline void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
-    {
-        uint64 curSetting[2];
-        uint64 newSetting[2];
-        uint64 newPointer = (uint64) & element;
-        do
-        {
-            curSetting[0] = (uint64)list.pNext;
-            curSetting[1] = list.salt;
-            element.pNext = (SLockFreeSingleLinkedListEntry*)curSetting[0];
-            newSetting[0] = newPointer; // new pointer
-            newSetting[1] = curSetting[1] + 1; // new salt
-        }
-        while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
-    }
-
-    inline void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
-    {
-        uint64 curSetting[2];
-        uint64 newSetting[2];
-        do
-        {
-            curSetting[1] = list.salt;
-            curSetting[0] = (uint64)list.pNext;
-            if (curSetting[0] == 0)
-            {
-                return NULL;
-            }
-            newSetting[0] = *(uint64*)curSetting[0]; // new pointer
-            newSetting[1] = curSetting[1] + 1; // new salt
-        }
-        while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
-        return (void*)curSetting[0];
-    }
-
-    inline void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
-    {
-        list.salt = 0;
-        list.pNext = NULL;
-    }
-
-    inline void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
-    {
-        uint64 curSetting[2];
-        uint64 newSetting[2];
-        uint64 newSalt;
-        uint64 newPointer;
-        do
-        {
-            curSetting[1] = list.salt;
-            curSetting[0] = (uint64)list.pNext;
-            if (curSetting[0] == 0)
-            {
-                return NULL;
-            }
-            newSetting[0] = 0;
-            newSetting[1] = curSetting[1] + 1;
-        }
-        while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
-        return (void*)curSetting[0];
-    }
-
-    inline void* Memalign(size_t size, size_t alignment)
-    {
-        return memalign(alignment, size);
-    }
-
-    inline void MemalignFree(void* memblock)
-    {
-        return free(memblock);
-    }
-
-    inline bool MakeDir(const char* szDirectory)
-    {
-        return mkdir(szDirectory, S_IRWXU) == 0;
-    }
-}
-
-#endif //__GLLINUXPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLWinPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLWinPlatform.hpp
deleted file mode 100644
index 5263569a91..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Standalone/GLWinPlatform.hpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Platform specific DXGL requirements implementation relying
-//               on Windows API
-
-
-#ifndef __GLWINPLATFORM__
-#define __GLWINPLATFORM__
-
-#include "GLCrossPlatform.hpp"
-#include <cassert>
-#include <direct.h>
-
-namespace NCryOpenGL
-{
-    namespace NWinPlatformImpl
-    {
-        struct SCriticalSection
-        {
-            CRITICAL_SECTION m_kCriticalSection;
-
-            SCriticalSection()
-            {
-                InitializeCriticalSection(&m_kCriticalSection);
-            }
-
-            ~SCriticalSection()
-            {
-                DeleteCriticalSection(&m_kCriticalSection);
-            }
-
-            void Lock()
-            {
-                EnterCriticalSection(&m_kCriticalSection);
-            }
-
-            void Unlock()
-            {
-                LeaveCriticalSection(&m_kCriticalSection);
-            }
-        };
-    }
-
-    inline void BreakUnique(const char* szFile, uint32 uLine)
-    {
-        LogMessage(eLS_Warning, "Break at %s(%d)", szFile, uLine);
-        if (IsDebuggerPresent())
-        {
-            ::DebugBreak();
-        }
-    }
-
-    inline LONG Exchange(LONG volatile* piDestination, LONG iExchange)
-    {
-        return InterlockedExchange(piDestination, iExchange);
-    }
-
-    inline LONG CompareExchange(LONG volatile* piDestination, LONG iExchange, LONG iComparand)
-    {
-        return InterlockedCompareExchange(piDestination, iExchange, iComparand);
-    }
-
-    inline LONG AtomicIncrement(LONG volatile* piDestination)
-    {
-        return InterlockedIncrement(piDestination);
-    }
-
-    inline LONG AtomicDecrement(LONG volatile* piDestination)
-    {
-        return InterlockedDecrement(piDestination);
-    }
-
-    typedef NWinPlatformImpl::SCriticalSection TCriticalSection;
-
-    inline void LockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Lock();
-    }
-
-    inline void UnlockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Unlock();
-    }
-
-    typedef SLIST_HEADER SLockFreeSingleLinkedListHeader;
-    typedef SLIST_ENTRY SLockFreeSingleLinkedListEntry;
-
-    inline void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
-    {
-        InterlockedPushEntrySList(alias_cast<PSLIST_HEADER>(&list), alias_cast<PSLIST_ENTRY>(&element));
-    }
-
-    inline void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
-    {
-        return reinterpret_cast<void*>(InterlockedPopEntrySList(alias_cast<PSLIST_HEADER>(&list)));
-    }
-
-    inline void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
-    {
-        InitializeSListHead(alias_cast<PSLIST_HEADER>(&list));
-    }
-
-    inline void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
-    {
-        return InterlockedFlushSList(alias_cast<PSLIST_HEADER>(&list));
-    }
-
-    inline void* CryModuleMemalign(size_t size, size_t alignment)
-    {
-        return _aligned_malloc(size, alignment);
-    }
-
-    inline void CryModuleMemalignFree(void* memblock)
-    {
-        return _aligned_free(memblock);
-    }
-
-    inline bool MakeDir(const char* szDirectory)
-    {
-        return _mkdir(szDirectory) == 0;
-    }
-}
-
-#endif //__GLWINPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Tests/test_Main.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Tests/test_Main.cpp
deleted file mode 100644
index e55e9ef2af..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Tests/test_Main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/UnitTest/UnitTest.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Memory/OSAllocator.h>
-#include <AzCore/Memory/AllocatorManager.h>
-namespace
-{
-    class RenderDllTestEnvironment final
-        : public AZ::Test::ITestEnvironment
-        , UnitTest::TraceBusRedirector // provide AZ_TEST_START_TRACE_SUPPRESSION
-    {
-    public:
-        AZ_TEST_CLASS_ALLOCATOR(RenderDllTestEnvironment);
-
-    protected:
-        void SetupEnvironment() override
-        {
-             AZ::Debug::TraceMessageBus::Handler::BusConnect();
-        }
-
-        void TeardownEnvironment() override
-        {           
-             AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
-        }
-    private:
-    };
-}
-AZ_UNIT_TEST_HOOK(new RenderDllTestEnvironment);
-
-TEST(CryRenderGL, Sanity)
-{
-    EXPECT_EQ(1, 1);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_mesh_baker_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_mesh_baker_files.cmake
deleted file mode 100644
index d13db68157..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_mesh_baker_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../D3DMeshBaker.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_renderer_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_renderer_files.cmake
deleted file mode 100644
index 0628baf4bd..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_renderer_files.cmake
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    CryDXGL.cpp
-    CryDXGL.hpp
-    RenderCapabilities.cpp
-    Definitions/CryDXGLGuid.hpp
-    Definitions/CryDXGLLegacy.hpp
-    Definitions/CryDXGLMisc.hpp
-    Definitions/DXGL_D3D11.h
-    Definitions/DXGL_D3D11Shader.h
-    Definitions/DXGL_D3DCommon.h
-    Definitions/DXGL_D3DCompiler.h
-    Definitions/DXGL_D3DX11.h
-    Definitions/DXGL_D3DX11tex.h
-    Definitions/DXGL_ID3D11Device.h
-    Definitions/DXGL_ID3D11DeviceContext.h
-    Definitions/DXGL_IDXGIFactory1.h
-    Definitions/DXGL_IDXGISwapChain.h
-    Definitions/DXGL_dxgi.h
-    Definitions/DXGL_dxgitype.h
-    Definitions/ICryDXGLUnknown.hpp
-    Implementation/AppleGPUInfoUtils.h
-    Implementation/GLCommon.hpp
-    Implementation/GLContext.cpp
-    Implementation/GLContext.hpp
-    Implementation/GLCryPlatform.hpp
-    Implementation/GLDevice.cpp
-    Implementation/GLDevice.hpp
-    Implementation/GLFeatures.hpp
-    Implementation/GLFormat.cpp
-    Implementation/GLFormat.hpp
-    Implementation/GLInstrument.hpp
-    Implementation/GLPlatform.hpp
-    Implementation/GLResource.cpp
-    Implementation/GLResource.hpp
-    Implementation/GLShader.cpp
-    Implementation/GLShader.hpp
-    Implementation/GLState.cpp
-    Implementation/GLState.hpp
-    Implementation/GLView.cpp
-    Implementation/GLView.hpp
-    Implementation/GLBlitFramebufferHelper.hpp
-    Implementation/GLBlitFramebufferHelper.cpp
-    Implementation/GLBlitShaders.hpp
-    Implementation/GLADLoader.cpp
-    Interfaces/CCryDXGLBase.cpp
-    Interfaces/CCryDXGLBase.hpp
-    Interfaces/CCryDXGLBlendState.cpp
-    Interfaces/CCryDXGLBlendState.hpp
-    Interfaces/CCryDXGLBlob.cpp
-    Interfaces/CCryDXGLBlob.hpp
-    Interfaces/CCryDXGLBuffer.cpp
-    Interfaces/CCryDXGLBuffer.hpp
-    Interfaces/CCryDXGLDepthStencilState.cpp
-    Interfaces/CCryDXGLDepthStencilState.hpp
-    Interfaces/CCryDXGLDepthStencilView.cpp
-    Interfaces/CCryDXGLDepthStencilView.hpp
-    Interfaces/CCryDXGLDevice.cpp
-    Interfaces/CCryDXGLDevice.hpp
-    Interfaces/CCryDXGLDeviceChild.cpp
-    Interfaces/CCryDXGLDeviceChild.hpp
-    Interfaces/CCryDXGLDeviceContext.cpp
-    Interfaces/CCryDXGLDeviceContext.hpp
-    Interfaces/CCryDXGLGIAdapter.cpp
-    Interfaces/CCryDXGLGIAdapter.hpp
-    Interfaces/CCryDXGLGIFactory.cpp
-    Interfaces/CCryDXGLGIFactory.hpp
-    Interfaces/CCryDXGLGIObject.cpp
-    Interfaces/CCryDXGLGIObject.hpp
-    Interfaces/CCryDXGLGIOutput.cpp
-    Interfaces/CCryDXGLGIOutput.hpp
-    Interfaces/CCryDXGLInputLayout.cpp
-    Interfaces/CCryDXGLInputLayout.hpp
-    Interfaces/CCryDXGLQuery.cpp
-    Interfaces/CCryDXGLQuery.hpp
-    Interfaces/CCryDXGLRasterizerState.cpp
-    Interfaces/CCryDXGLRasterizerState.hpp
-    Interfaces/CCryDXGLRenderTargetView.cpp
-    Interfaces/CCryDXGLRenderTargetView.hpp
-    Interfaces/CCryDXGLResource.cpp
-    Interfaces/CCryDXGLResource.hpp
-    Interfaces/CCryDXGLSamplerState.cpp
-    Interfaces/CCryDXGLSamplerState.hpp
-    Interfaces/CCryDXGLShader.cpp
-    Interfaces/CCryDXGLShader.hpp
-    Interfaces/CCryDXGLShaderReflection.cpp
-    Interfaces/CCryDXGLShaderReflection.hpp
-    Interfaces/CCryDXGLShaderResourceView.cpp
-    Interfaces/CCryDXGLShaderResourceView.hpp
-    Interfaces/CCryDXGLSwapChain.cpp
-    Interfaces/CCryDXGLSwapChain.hpp
-    Interfaces/CCryDXGLSwitchToRef.cpp
-    Interfaces/CCryDXGLSwitchToRef.hpp
-    Interfaces/CCryDXGLTexture1D.cpp
-    Interfaces/CCryDXGLTexture1D.hpp
-    Interfaces/CCryDXGLTexture2D.cpp
-    Interfaces/CCryDXGLTexture2D.hpp
-    Interfaces/CCryDXGLTexture3D.cpp
-    Interfaces/CCryDXGLTexture3D.hpp
-    Interfaces/CCryDXGLTextureBase.cpp
-    Interfaces/CCryDXGLTextureBase.hpp
-    Interfaces/CCryDXGLUnorderedAccessView.cpp
-    Interfaces/CCryDXGLUnorderedAccessView.hpp
-    Interfaces/CCryDXGLView.cpp
-    Interfaces/CCryDXGLView.hpp
-    Interfaces/DXEmulation.hpp
-    ../../RenderDll_precompiled.cpp
-)
-
-# Prevent the following files from being grouped in UNITY builds
-set(SKIP_UNITY_BUILD_INCLUSION_FILES
-    Implementation/GLADLoader.cpp
-    Implementation/GLBlitFramebufferHelper.hpp
-    Implementation/GLBlitFramebufferHelper.cpp
-    Implementation/GLShader.cpp
-    Implementation/GLShader.hpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_renderer_shared_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_renderer_shared_files.cmake
deleted file mode 100644
index 50563bb841..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_renderer_shared_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../DriverD3D.h
-    ../DriverD3D.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_test_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_test_files.cmake
deleted file mode 100644
index df244d9413..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/opengl_test_files.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Tests/test_Main.cpp
-    ../../Common/tests/RenderDLLUnitTests.cpp
-    ../../Common/Shaders/RemoteShaderCompilerUnitTests.cpp
-    ../DriverD3D.h
-    ../DriverD3D.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CMakeLists.txt b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CMakeLists.txt
deleted file mode 100644
index b8e97a1ca6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CMakeLists.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-
-include(${pal_dir}/DXMETAL_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-
-if(DXGL_TRAIT_BUILD_DXMETAL_SUPPORTED AND NOT LY_MONOLITHIC_GAME) # Only Atom is supported in monolithic builds
-    ly_add_target(
-        NAME CryRenderMetal.Static STATIC
-        NAMESPACE Legacy
-        FILES_CMAKE
-            metal_renderer_files.cmake
-            metal_mesh_baker_files.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/DXMETAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        COMPILE_DEFINITIONS
-            PUBLIC
-                DO_RENDERLOG
-                DO_RENDERSTATS
-                DIRECT3D10
-                XRENDERGL_EXPORTS
-                _RENDERER
-                OPENGL
-                CRY_USE_METAL
-        INCLUDE_DIRECTORIES
-            PUBLIC
-                ../..
-                .
-                ..
-                ../../Common
-                ${pal_dir}
-        BUILD_DEPENDENCIES
-            PUBLIC
-                AZ::AzFramework
-                AZ::HLSLcc.Headers
-                Legacy::CryCommon
-                Legacy::CryCommon.EngineSettings.Static
-    )
-
-    ly_add_target(
-        NAME CryRenderMetal ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            metal_renderer_shared_files.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/DXMETAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        BUILD_DEPENDENCIES
-            PRIVATE
-                Legacy::CryRenderMetal.Static
-    )
-
-    if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-        ly_add_target(
-            NAME CryRenderMetal.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-            NAMESPACE Legacy
-            FILES_CMAKE
-                metal_renderer_shared_files.cmake
-                metal_test_files.cmake
-            PLATFORM_INCLUDE_FILES
-                ${pal_dir}/DXMETAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-            BUILD_DEPENDENCIES
-                PRIVATE
-                    AZ::AzTest
-                    Legacy::CryRenderMetal.Static
-        )
-        # SPEC-1548: disabling since it fails in mac with memory issues
-        #ly_add_googletest(
-        #    NAME Legacy::CryRenderMetal.Tests
-        #)
-    endif()
-endif()
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CryDXMETAL.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CryDXMETAL.cpp
deleted file mode 100644
index 8c780c38f9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CryDXMETAL.cpp
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains the definitions of the global functions defined in
-//               CryDXGL
-
-#include "RenderDll_precompiled.h"
-#include "Interfaces/CCryDXMETALDevice.hpp"
-#include "Interfaces/CCryDXMETALBlob.hpp"
-#include "Interfaces/CCryDXMETALDevice.hpp"
-#include "Interfaces/CCryDXMETALDeviceContext.hpp"
-#include "Interfaces/CCryDXMETALDeviceContext.hpp"
-#include "Interfaces/CCryDXMETALGIFactory.hpp"
-#include "Implementation/GLShader.hpp"
-#include "Implementation/MetalDevice.hpp"
-
-//  Confetti BEGIN: Igor Lobanchikov
-#include "Interfaces/CCryDXMETALDeviceContext.hpp"
-#include "XRenderD3D9/DriverD3D.h"
-#include "Implementation/METALContext.hpp"
-//  Confetti End: Igor Lobanchikov
-
-#if defined(CRY_DXCAPTURE_ENABLED)
-#include "Debug/DXCapture.h"
-#endif //defined(CRY_DXCAPTURE_ENABLED)
-
-template <typename Factory>
-HRESULT CreateDXGIFactoryInternal(REFIID riid, void** ppFactory)
-{
-    if (riid == __uuidof(Factory))
-    {
-        CCryDXGLGIFactory* pFactory(new CCryDXGLGIFactory());
-        if (!pFactory->Initialize())
-        {
-            pFactory->Release();
-            *ppFactory = NULL;
-            return E_FAIL;
-        }
-#if defined(CRY_DXCAPTURE_ENABLED)
-        *ppFactory = DXCapture::GetWrapper(pFactory);
-        pFactory->Release();
-#else
-        CCryDXGLGIFactory::ToInterface(reinterpret_cast<IDXGIFactory**>(ppFactory), pFactory);
-#endif
-        return S_OK;
-    }
-
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3D11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI D3D11CreateDeviceAndSwapChain(
-    IDXGIAdapter* pAdapter,
-    D3D_DRIVER_TYPE DriverType,
-    HMODULE Software,
-    UINT Flags,
-    CONST D3D_FEATURE_LEVEL* pFeatureLevels,
-    UINT FeatureLevels,
-    UINT SDKVersion,
-    CONST DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
-    IDXGISwapChain** ppSwapChain,
-    ID3D11Device** ppDevice,
-    D3D_FEATURE_LEVEL* pFeatureLevel,
-    ID3D11DeviceContext** ppImmediateContext)
-{
-    if (pAdapter == NULL)
-    {
-        // Get the first adapter enumerated by the factory according to the specification
-        void* pvFactory(NULL);
-        HRESULT iResult = CreateDXGIFactoryInternal<IDXGIFactory1>(__uuidof(IDXGIFactory1), &pvFactory);
-        if (FAILED(iResult))
-        {
-            return iResult;
-        }
-        CCryDXGLGIFactory* pFactory(CCryDXGLGIFactory::FromInterface(static_cast<IDXGIFactory1*>(pvFactory)));
-        iResult = pFactory->EnumAdapters(0, &pAdapter);
-        pFactory->Release();
-        if (FAILED(iResult))
-        {
-            return iResult;
-        }
-    }
-
-    CRY_ASSERT(pAdapter != NULL);
-    CCryDXGLGIAdapter* pDXGLAdapter(CCryDXGLGIAdapter::FromInterface(pAdapter));
-
-    D3D_FEATURE_LEVEL eDevFeatureLevel;
-    if (pDXGLAdapter != NULL)
-    {
-        eDevFeatureLevel = pDXGLAdapter->GetSupportedFeatureLevel();
-    }
-    else
-    {
-        DXGL_TODO("Get the supported feature level even if no adapter is specified")
-        eDevFeatureLevel = D3D_FEATURE_LEVEL_11_0;
-    }
-
-    if (pFeatureLevels != NULL && FeatureLevels > 0)
-    {
-        D3D_FEATURE_LEVEL uMaxAllowedFL(*pFeatureLevels);
-        while (FeatureLevels > 1)
-        {
-            ++pFeatureLevels;
-            uMaxAllowedFL = max(uMaxAllowedFL, *pFeatureLevels);
-            --FeatureLevels;
-        }
-        eDevFeatureLevel = min(eDevFeatureLevel, uMaxAllowedFL);
-    }
-
-    if (pFeatureLevel != NULL)
-    {
-        *pFeatureLevel = eDevFeatureLevel;
-    }
-
-    if (ppDevice != NULL)
-    {
-        _smart_ptr<CCryDXGLDevice> spDevice(new CCryDXGLDevice(pDXGLAdapter, eDevFeatureLevel));
-        if (!spDevice->Initialize(pSwapChainDesc, ppSwapChain))
-        {
-            return E_FAIL;
-        }
-
-#if defined(CRY_DXCAPTURE_ENABLED)
-        if (ppSwapChain != NULL)
-        {
-            *ppSwapChain = DXCapture::GetWrapper(CCryDXGLSwapChain::FromInterface(*ppSwapChain));
-        }
-        *ppDevice = DXCapture::GetWrapper(spDevice.get());
-        spDevice->Release();
-#else
-        CCryDXGLDevice::ToInterface(ppDevice, spDevice);
-#endif
-
-        if (ppImmediateContext != NULL)
-        {
-            (*ppDevice)->GetImmediateContext(ppImmediateContext);
-        }
-    }
-
-    return S_OK;
-}
-
-DXGL_API HRESULT WINAPI D3D10CreateBlob(SIZE_T NumBytes, LPD3D10BLOB* ppBuffer)
-{
-    CCryDXGLBlob::ToInterface(ppBuffer, new CCryDXGLBlob(NumBytes));
-    return (*ppBuffer)->GetBufferPointer() != NULL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DCompiler.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI D3DReflect(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    REFIID pInterface,
-    void** ppReflector)
-{
-    if (pInterface == IID_ID3D11ShaderReflection)
-    {
-        CCryDXGLShaderReflection* pReflection(new CCryDXGLShaderReflection());
-
-        const void* pvData(pSrcData);
-
-        if (pReflection->Initialize(pvData))
-        {
-            CCryDXGLShaderReflection::ToInterface(reinterpret_cast<ID3D11ShaderReflection**>(ppReflector), pReflection);
-            return S_OK;
-        }
-        pReflection->Release();
-    }
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI D3DDisassemble(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    UINT Flags,
-    LPCSTR szComments,
-    ID3DBlob** ppDisassembly)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DX11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI D3DX11CreateTextureFromMemory(
-    ID3D11Device* pDevice,
-    const void* pSrcData,
-    size_t SrcDataSize,
-    D3DX11_IMAGE_LOAD_INFO* pLoadInfo,
-    ID3DX11ThreadPump* pPump,
-    ID3D11Resource** ppTexture,
-    long* pResult)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI D3DX11SaveTextureToFile(ID3D11DeviceContext* pDevice,
-    ID3D11Resource* pSrcResource,
-    D3DX11_IMAGE_FILE_FORMAT fmt,
-    const char* pDestFile)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI D3DX11CompileFromMemory(
-    LPCSTR pSrcData,
-    SIZE_T SrcDataLen,
-    LPCSTR pFileName,
-    CONST D3D10_SHADER_MACRO* pDefines,
-    LPD3D10INCLUDE pInclude,
-    LPCSTR pFunctionName,
-    LPCSTR pProfile,
-    UINT Flags1,
-    UINT Flags2,
-    ID3DX11ThreadPump* pPump,
-    ID3D10Blob** ppShader,
-    ID3D10Blob** ppErrorMsgs,
-    HRESULT* pHResult)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in dxgi.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API HRESULT WINAPI CreateDXGIFactory(REFIID riid, void** ppFactory)
-{
-    return CreateDXGIFactoryInternal<IDXGIFactory>(riid, ppFactory);
-}
-
-DXGL_API HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void** ppFactory)
-{
-    return CreateDXGIFactoryInternal<IDXGIFactory1>(riid, ppFactory);
-}
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Frame debugging functions
-////////////////////////////////////////////////////////////////////////////
-
-#define DXGL_PROFILE_USE_GREMEDY_STRING_MARKER 0
-#define DXGL_PROFILE_USE_KHR_DEBUG 1
-#define DXGL_PROFILE_USE_NVTX 0
-
-#if DXGL_PROFILE_USE_GREMEDY_STRING_MARKER
-
-template <size_t uSuffixSize>
-struct SDebugStringBuffer
-{
-    enum
-    {
-        MAX_TEXT_LENGTH = 1024
-    };
-    char s_acBuffer[MAX_TEXT_LENGTH + uSuffixSize];
-
-    SDebugStringBuffer(const char* szSuffix)
-    {
-        cryMemcpy(s_acBuffer + MAX_TEXT_LENGTH, szSuffix, uSuffixSize);
-    }
-
-    const char* Write(const char* szText)
-    {
-        size_t uTextLength(min((size_t)MAX_TEXT_LENGTH, strlen(szText)));
-        char* szDest(s_acBuffer + MAX_TEXT_LENGTH - uTextLength);
-        cryMemcpy(szDest, szText, uTextLength);
-        return szDest;
-    }
-};
-
-#define DXGL_DEBUG_STRING_BUFFER(_Suffix, _Name) SDebugStringBuffer<DXGL_ARRAY_SIZE(_Suffix)> _Name(_Suffix)
-
-DXGL_DEBUG_STRING_BUFFER(": enter", g_kEnterDebugBuffer);
-DXGL_DEBUG_STRING_BUFFER(": leave", g_kLeaveDebugBuffer);
-
-#endif //DXGL_PROFILE_USE_GREMEDY_STRING_MARKER
-
-#if DXGL_PROFILE_USE_NVTX
-#include <nvToolsExt.h>
-    #if defined(WIN32)
-        #pragma comment(lib, "nvToolsExt32_1.lib")
-    #elif defined(WIN64)
-        #pragma comment(lib, "nvToolsExt64_1.lib")
-    #endif
-#endif //DXGL_PROFILE_USE_NVTX
-
-DXGL_API void DXGLProfileLabel(const char* szName)
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    NCryMetal::CContext* pContext = CCryDXGLDeviceContext::FromInterface(((CD3D9Renderer*)gEnv->pRenderer)->DevInfo().Context())->GetMetalContext();
-    pContext->ProfileLabel(szName);
-    //  Confetti End: Igor Lobanchikov
-}
-
-DXGL_API void DXGLProfileLabelPush(const char* szName)
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    NCryMetal::CContext* pContext = CCryDXGLDeviceContext::FromInterface(((CD3D9Renderer*)gEnv->pRenderer)->DevInfo().Context())->GetMetalContext();
-    pContext->ProfileLabelPush(szName);
-    //  Confetti End: Igor Lobanchikov
-}
-
-DXGL_API void DXGLProfileLabelPop(const char* szName)
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    NCryMetal::CContext* pContext = CCryDXGLDeviceContext::FromInterface(((CD3D9Renderer*)gEnv->pRenderer)->DevInfo().Context())->GetMetalContext();
-    pContext->ProfileLabelPop(szName);
-    //  Confetti End: Igor Lobanchikov
-}
-
-inline CCryDXGLDevice* GetDXGLDevice(ID3D11Device* pDevice)
-{
-#if defined(CRY_DXCAPTURE_ENABLED)
-    return static_cast<CCryDXGLDevice*>(DXCapture::GetWrapped(pDevice));
-#else
-    return CCryDXGLDevice::FromInterface(pDevice);
-#endif
-}
-
-inline CCryDXGLDeviceContext* GetDXGLDeviceContext(ID3D11DeviceContext* pDeviceContext)
-{
-#if defined(CRY_DXCAPTURE_ENABLED)
-    return static_cast<CCryDXGLDeviceContext*>(DXCapture::GetWrapped(pDeviceContext));
-#else
-    return CCryDXGLDeviceContext::FromInterface(pDeviceContext);
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////
-//  DXMetal Extensions
-////////////////////////////////////////////////////////////////////////////
-
-void* DXMETALGetBufferStorage(ID3D11Buffer* pBuffer)
-{
-    NCryMetal::SBuffer* pGLBuffer(pBuffer->GetGLBuffer());
-
-    if (pGLBuffer->m_eUsage == NCryMetal::eBU_DirectAccess)
-    {
-        //DirectAccess buffers allocate from shared memory only.
-        CRY_ASSERT(pGLBuffer->m_BufferShared);
-        return pGLBuffer->m_BufferShared.contents;
-    }
-
-    return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////
-//  DXMetal Extensions
-////////////////////////////////////////////////////////////////////////////
-
-void DXMETALSetColorDontCareActions(ID3D11RenderTargetView* const rtv,
-    bool const loadDontCare,
-    bool const storeDontCare)
-{
-    CRY_ASSERT(NULL != rtv);
-
-    NCryMetal::SOutputMergerView* somv = rtv->GetGLView();
-    CRY_ASSERT(somv);
-
-    NCryMetal::SOutputMergerTextureView* somtv = somv->AsSOutputMergerTextureView();
-    CRY_ASSERT(somtv);
-
-    NCryMetal::STexture* tex = somtv->m_pTexture;
-    CRY_ASSERT(tex);
-
-    if (loadDontCare)
-    {
-        CRY_ASSERT(!tex->m_spTextureViewToClear);
-        if (tex->m_spTextureViewToClear)
-        {
-            DXGL_ERROR("Can't set MTLLoadActionDontCare if the resource is already set to be cleared.");
-        }
-    }
-
-    tex->m_bColorLoadDontCare   = loadDontCare;
-    tex->m_bColorStoreDontCare  = storeDontCare;
-}
-
-void DXMETALSetDepthDontCareActions(ID3D11DepthStencilView* const dsv,
-    bool const loadDontCare,
-    bool const storeDontCare)
-{
-    CRY_ASSERT(NULL != dsv);
-
-    NCryMetal::SOutputMergerView* somv = dsv->GetGLView();
-    CRY_ASSERT(somv);
-
-    NCryMetal::SOutputMergerTextureView* somtv = somv->AsSOutputMergerTextureView();
-    CRY_ASSERT(somtv);
-
-    NCryMetal::STexture* tex = somtv->m_pTexture;
-    CRY_ASSERT(tex);
-
-    if (loadDontCare)
-    {
-        CRY_ASSERT(!tex->m_spTextureViewToClear);
-        if (tex->m_spTextureViewToClear)
-        {
-            DXGL_ERROR("Can't set MTLLoadActionDontCare if the resource is already set to be cleared.");
-        }
-    }
-
-    tex->m_bDepthLoadDontCare   = loadDontCare;
-    tex->m_bDepthStoreDontCare  = storeDontCare;
-}
-
-void DXMETALSetStencilDontCareActions(ID3D11DepthStencilView* const dsv,
-    bool const loadDontCare,
-    bool const storeDontCare)
-{
-    CRY_ASSERT(NULL != dsv);
-
-    NCryMetal::SOutputMergerView* somv = dsv->GetGLView();
-    CRY_ASSERT(somv);
-
-    NCryMetal::SOutputMergerTextureView* somtv = somv->AsSOutputMergerTextureView();
-    CRY_ASSERT(somtv);
-
-    NCryMetal::STexture* tex = somtv->m_pTexture;
-    CRY_ASSERT(tex);
-
-    if (loadDontCare)
-    {
-        CRY_ASSERT(!tex->m_spStencilTextureViewToClear);
-        if (tex->m_spStencilTextureViewToClear)
-        {
-            DXGL_ERROR("Can't set MTLLoadActionDontCare if the resource is already set to be cleared.");
-        }
-    }
-
-    tex->m_bStencilLoadDontCare   = loadDontCare;
-    tex->m_bStencilStoreDontCare  = storeDontCare;
-}
-
-////////////////////////////////////////////////////////////////////////////
-//  DXGL Extensions
-////////////////////////////////////////////////////////////////////////////
-
-#if !CRY_DXGL_FULL_EMULATION
-HRESULT DXGLMapBufferRange(ID3D11DeviceContext* pDeviceContext, ID3D11Buffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource)
-{
-    NCryMetal::CContext* pGLContext(static_cast<CCryDXGLDeviceContext*>(pDeviceContext)->GetMetalContext());
-    NCryMetal::SBuffer* pGLBuffer(pBuffer->GetGLBuffer());
-    return (*pGLBuffer->m_pfMapBufferRange)(pGLBuffer, uOffset, uSize, MapType, MapFlags, pMappedResource, pGLContext) ? S_OK : E_FAIL;
-}
-
-void DXGLSetDepthBoundsTest(bool bEnabled, float fMin, float fMax)
-{
-#if defined(GL_EXT_depth_bounds_test)
-    if (bEnabled)
-    {
-        glEnable(GL_DEPTH_BOUNDS_TEST_EXT);
-    }
-    else
-    {
-        glDisable(GL_DEPTH_BOUNDS_TEST_EXT);
-    }
-    glDepthBoundsEXT(fMin, fMax);
-#else
-    DXGL_WARNING("Depths Bounds Test extension not available on this platform");
-#endif
-}
-
-#endif //!DXGL_FULL_EMULATION
-
-DXGL_API bool DXGLCreateMetalWindow(
-    const char* szTitle,
-    uint32 width,
-    uint32 height,
-    bool fullScreen,
-    HWND* pHandle)
-{
-    return NCryMetal::CDevice::CreateMetalWindow(pHandle, width, height, fullScreen);
-}
-
-DXGL_EXTERN DXGL_API void DXGLDestroyMetalWindow(HWND kHandle)
-{
-    return NCryMetal::CDevice::DestroyMetalWindow(kHandle);
-}
-
-////////////////////////////////////////////////////////////////////////////
-//  DxErr Logging and error functions
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_API const char*  WINAPI DXGetErrorStringA(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return "";
-}
-
-DXGL_API const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return L"";
-}
-
-DXGL_API const char*  WINAPI DXGetErrorDescriptionA(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return "";
-}
-
-DXGL_API const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr)
-{
-    DXGL_NOT_IMPLEMENTED
-    return L"";
-}
-
-DXGL_API HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-DXGL_API HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CryDXMETAL.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CryDXMETAL.hpp
deleted file mode 100644
index 12f6c50436..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/CryDXMETAL.hpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Entry point header for the DXGL wrapper library
-
-#ifndef __CRYMETALGL__
-#define __CRYMETALGL__
-
-#if !defined(DXGL_FULL_EMULATION)
-#define DXGL_FULL_EMULATION 0
-#endif //!defined(DXGL_FULL_EMULATION)
-
-#include "Definitions/CryDXMETALMisc.hpp"
-
-#if defined(CRY_DXCAPTURE_ENABLED) || DXGL_FULL_EMULATION
-    #include "Definitions/DXMETAL_IDXGISwapChain.h"
-    #include "Definitions/DXMETAL_IDXGIFactory1.h"
-#endif
-
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT || DXGL_FULL_EMULATION
-#include "Definitions/DXMETAL_ID3D11Device.h"
-#include "Definitions/DXMETAL_ID3D11DeviceContext.h"
-#else
-#include "Interfaces/CCryDXMETALDevice.hpp"
-#include "Interfaces/CCryDXMETALDeviceContext.hpp"
-#endif
-
-#if !DXGL_FULL_EMULATION
-#include "Interfaces/CCryDXMETALBlob.hpp"
-#include "Interfaces/CCryDXMETALSwapChain.hpp"
-#include "Interfaces/CCryDXMETALQuery.hpp"
-#include "Interfaces/CCryDXMETALSwitchToRef.hpp"
-
-#include "Interfaces/CCryDXMETALBuffer.hpp"
-#include "Interfaces/CCryDXMETALDepthStencilView.hpp"
-#include "Interfaces/CCryDXMETALInputLayout.hpp"
-#include "Interfaces/CCryDXMETALRenderTargetView.hpp"
-#include "Interfaces/CCryDXMETALShader.hpp"
-#include "Interfaces/CCryDXMETALDeviceContext.hpp"
-#include "Interfaces/CCryDXMETALDepthStencilView.hpp"
-#include "Interfaces/CCryDXMETALShaderResourceView.hpp"
-#include "Interfaces/CCryDXMETALUnorderedAccessView.hpp"
-#include "Interfaces/CCryDXMETALView.hpp"
-#include "Interfaces/CCryDXMETALBlendState.hpp"
-#include "Interfaces/CCryDXMETALDepthStencilState.hpp"
-#include "Interfaces/CCryDXMETALRasterizerState.hpp"
-#include "Interfaces/CCryDXMETALSamplerState.hpp"
-#include "Interfaces/CCryDXMETALTexture1D.hpp"
-#include "Interfaces/CCryDXMETALTexture2D.hpp"
-#include "Interfaces/CCryDXMETALTexture3D.hpp"
-#include "Interfaces/CCryDXMETALDevice.hpp"
-#include "Interfaces/CCryDXMETALGIFactory.hpp"
-#include "Interfaces/CCryDXMETALGIOutput.hpp"
-
-#include "Interfaces/CCryDXMETALShaderReflection.hpp"
-#include "Interfaces/CCryDXMETALGIAdapter.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-// Metal requires that all RTs and depth buffer have the same size.
-#define CRY_OPENGL_DO_NOT_ALLOW_LARGER_RT
-
-typedef ID3D10Blob* LPD3D10BLOB;
-typedef ID3D10Blob ID3DBlob;
-
-#if DXGL_FULL_EMULATION
-    #if defined(OPENGL)
-        #define DXGL_API DXGL_IMPORT
-    #else
-        #define DXGL_API DXGL_EXPORT
-    #endif
-#else
-    #define DXGL_API
-#endif
-
-#if DXGL_FULL_EMULATION && !defined(WIN32)
-#define DXGL_EXTERN extern "C"
-#else
-#define DXGL_EXTERN
-#endif
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3D11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-typedef HRESULT (WINAPI * PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)(IDXGIAdapter*,
-    D3D_DRIVER_TYPE, HMODULE, UINT,
-    CONST D3D_FEATURE_LEVEL*,
-    UINT FeatureLevels, UINT, CONST DXGI_SWAP_CHAIN_DESC*,
-    IDXGISwapChain**, ID3D11Device**,
-    D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3D11CreateDeviceAndSwapChain(
-    IDXGIAdapter* pAdapter,
-    D3D_DRIVER_TYPE DriverType,
-    HMODULE Software,
-    UINT Flags,
-    CONST D3D_FEATURE_LEVEL* pFeatureLevels,
-    UINT FeatureLevels,
-    UINT SDKVersion,
-    CONST DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
-    IDXGISwapChain** ppSwapChain,
-    ID3D11Device** ppDevice,
-    D3D_FEATURE_LEVEL* pFeatureLevel,
-    ID3D11DeviceContext** ppImmediateContext);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3D10CreateBlob(SIZE_T NumBytes, LPD3D10BLOB* ppBuffer);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DCompiler.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DReflect(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    REFIID pInterface,
-    void** ppReflector);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DDisassemble(
-    LPCVOID pSrcData,
-    SIZE_T SrcDataSize,
-    UINT Flags,
-    LPCSTR szComments,
-    ID3DBlob** ppDisassembly);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in D3DX11.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DX11CreateTextureFromMemory(
-    ID3D11Device* pDevice,
-    const void* pSrcData,
-    size_t SrcDataSize,
-    D3DX11_IMAGE_LOAD_INFO* pLoadInfo,
-    ID3DX11ThreadPump* pPump,
-    ID3D11Resource** ppTexture,
-    long* pResult);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DX11SaveTextureToFile(ID3D11DeviceContext* pDevice,
-    ID3D11Resource* pSrcResource,
-    D3DX11_IMAGE_FILE_FORMAT fmt,
-    const char* pDestFile);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI D3DX11CompileFromMemory(
-    LPCSTR pSrcData,
-    SIZE_T SrcDataLen,
-    LPCSTR pFileName,
-    CONST D3D10_SHADER_MACRO* pDefines,
-    LPD3D10INCLUDE pInclude,
-    LPCSTR pFunctionName,
-    LPCSTR pProfile,
-    UINT Flags1,
-    UINT Flags2,
-    ID3DX11ThreadPump* pPump,
-    ID3D10Blob** ppShader,
-    ID3D10Blob** ppErrorMsgs,
-    HRESULT* pHResult);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Required global functions declared in dxgi.h and included headers
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI CreateDXGIFactory(REFIID riid, void** ppFactory);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void** ppFactory);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Frame debugging functions
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API void DXGLProfileLabel(const char* szName);
-
-DXGL_EXTERN DXGL_API void DXGLProfileLabelPush(const char* szName);
-
-DXGL_EXTERN DXGL_API void DXGLProfileLabelPop(const char* szName);
-
-
-////////////////////////////////////////////////////////////////////////////
-//  DXMetal Extensions
-////////////////////////////////////////////////////////////////////////////
-
-void* DXMETALGetBufferStorage(ID3D11Buffer* pBuffer);
-
-////////////////////////////////////////////////////////////////////////////
-//  DXMetal Extensions
-////////////////////////////////////////////////////////////////////////////
-
-void DXMETALSetColorDontCareActions(ID3D11RenderTargetView* const rtv,
-    bool const loadDontCare     = false,
-    bool const storeDontCare    = false);
-void DXMETALSetDepthDontCareActions(ID3D11DepthStencilView* const dsv,
-    bool const loadDontCare     = false,
-    bool const storeDontCare    = false);
-void DXMETALSetStencilDontCareActions(ID3D11DepthStencilView* const dsv,
-    bool const loadDontCare     = false,
-    bool const storeDontCare    = false);
-////////////////////////////////////////////////////////////////////////////
-//  DXGL Extensions
-////////////////////////////////////////////////////////////////////////////
-
-#if !DXGL_FULL_EMULATION
-
-HRESULT DXGLMapBufferRange(ID3D11DeviceContext* pDeviceContext, ID3D11Buffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource);
-
-void DXGLSetDepthBoundsTest(bool bEnabled, float fMin, float fMax);
-
-#endif //!DXGL_FULL_EMULATION
-
-DXGL_EXTERN DXGL_API bool DXGLCreateMetalWindow(const char* szTitle, uint32 uWidth, uint32 uHeight, bool bFullScreen, HWND* pHandle);
-DXGL_EXTERN DXGL_API void DXGLDestroyMetalWindow(HWND kHandle);
-
-////////////////////////////////////////////////////////////////////////////
-//  DxErr Logging and error functions
-////////////////////////////////////////////////////////////////////////////
-
-DXGL_EXTERN DXGL_API const char*  WINAPI DXGetErrorStringA(HRESULT hr);
-DXGL_EXTERN DXGL_API const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr);
-
-DXGL_EXTERN DXGL_API const char*  WINAPI DXGetErrorDescriptionA(HRESULT hr);
-DXGL_EXTERN DXGL_API const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr);
-
-DXGL_EXTERN DXGL_API HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox);
-DXGL_EXTERN DXGL_API HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox);
-
-#ifdef UNICODE
-    #define DXGetErrorString DXGetErrorStringW
-    #define DXGetErrorDescription DXGetErrorDescriptionW
-    #define DXTrace DXTraceW
-#else
-    #define DXGetErrorString DXGetErrorStringA
-    #define DXGetErrorDescription DXGetErrorDescriptionA
-    #define DXTrace DXTraceA
-#endif
-
-#endif //__CRYMETALGL__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3D11.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3D11.h
deleted file mode 100644
index 6e852e0c60..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3D11.h
+++ /dev/null
@@ -1,1767 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3D11.h in the DirectX SDK
-
-#ifndef __DXGL_D3D11_h__
-#define __DXGL_D3D11_h__
-
-#include "DXGL_dxgi.h"
-#include "DXGL_D3DCommon.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef _D3D11_CONSTANTS
-#define _D3D11_CONSTANTS
-#define D3D11_16BIT_INDEX_STRIP_CUT_VALUE   (0xffff)
-
-#define D3D11_32BIT_INDEX_STRIP_CUT_VALUE   (0xffffffff)
-
-#define D3D11_8BIT_INDEX_STRIP_CUT_VALUE    (0xff)
-
-#define D3D11_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT    (9)
-
-#define D3D11_CLIP_OR_CULL_DISTANCE_COUNT   (8)
-
-#define D3D11_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT   (2)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT   (14)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS   (4)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT    (15)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS  (4)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT   (15)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST  (1)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS  (1)
-
-#define D3D11_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT    (64)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS    (4)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST    (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS    (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT    (128)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT    (128)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT   (16)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT   (16)
-
-#define D3D11_COMMONSHADER_SUBROUTINE_NESTING_LIMIT (32)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENTS (4)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COUNT  (4096)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_READS_PER_INST (3)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_READ_PORTS (3)
-
-#define D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX (10)
-
-#define D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN (-10)
-
-#define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE    (-8)
-
-#define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE    (7)
-
-#define D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (256)
-
-#define D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP (64)
-
-#define D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (240)
-
-#define D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP (68)
-
-#define D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (224)
-
-#define D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP (72)
-
-#define D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (208)
-
-#define D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP (76)
-
-#define D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (192)
-
-#define D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP (84)
-
-#define D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (176)
-
-#define D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP (92)
-
-#define D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (160)
-
-#define D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP (100)
-
-#define D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (144)
-
-#define D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP (112)
-
-#define D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (128)
-
-#define D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP (128)
-
-#define D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (112)
-
-#define D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP (144)
-
-#define D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (96)
-
-#define D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP (168)
-
-#define D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (80)
-
-#define D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP (204)
-
-#define D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (64)
-
-#define D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP (256)
-
-#define D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (48)
-
-#define D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP (340)
-
-#define D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (32)
-
-#define D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP (512)
-
-#define D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (16)
-
-#define D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP (768)
-
-#define D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION  (1)
-
-#define D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT (256)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP (768)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_X (768)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_Y (768)
-
-#define D3D11_CS_4_X_UAV_REGISTER_COUNT (1)
-
-#define D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION   (65535)
-
-#define D3D11_CS_TGSM_REGISTER_COUNT    (8192)
-
-#define D3D11_CS_TGSM_REGISTER_READS_PER_INST   (1)
-
-#define D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS  (1)
-
-#define D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS  (1)
-
-#define D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_X (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_Y (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_Z (64)
-
-#define D3D11_CS_THREAD_GROUP_MIN_X (1)
-
-#define D3D11_CS_THREAD_GROUP_MIN_Y (1)
-
-#define D3D11_CS_THREAD_GROUP_MIN_Z (1)
-
-#define D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL    (16384)
-
-#define D3D11_DEFAULT_BLEND_FACTOR_ALPHA    (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_BLUE (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_GREEN    (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_RED  (1.0f)
-#define D3D11_DEFAULT_BORDER_COLOR_COMPONENT    (0.0f)
-#define D3D11_DEFAULT_DEPTH_BIAS    (0)
-
-#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP  (0.0f)
-#define D3D11_DEFAULT_MAX_ANISOTROPY    (16)
-#define D3D11_DEFAULT_MIP_LOD_BIAS  (0.0f)
-#define D3D11_DEFAULT_RENDER_TARGET_ARRAY_INDEX (0)
-
-#define D3D11_DEFAULT_SAMPLE_MASK   (0xffffffff)
-
-#define D3D11_DEFAULT_SCISSOR_ENDX  (0)
-
-#define D3D11_DEFAULT_SCISSOR_ENDY  (0)
-
-#define D3D11_DEFAULT_SCISSOR_STARTX    (0)
-
-#define D3D11_DEFAULT_SCISSOR_STARTY    (0)
-
-#define D3D11_DEFAULT_SLOPE_SCALED_DEPTH_BIAS   (0.0f)
-#define D3D11_DEFAULT_STENCIL_READ_MASK (0xff)
-
-#define D3D11_DEFAULT_STENCIL_REFERENCE (0)
-
-#define D3D11_DEFAULT_STENCIL_WRITE_MASK    (0xff)
-
-#define D3D11_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX    (0)
-
-#define D3D11_DEFAULT_VIEWPORT_HEIGHT   (0)
-
-#define D3D11_DEFAULT_VIEWPORT_MAX_DEPTH    (0.0f)
-#define D3D11_DEFAULT_VIEWPORT_MIN_DEPTH    (0.0f)
-#define D3D11_DEFAULT_VIEWPORT_TOPLEFTX (0)
-
-#define D3D11_DEFAULT_VIEWPORT_TOPLEFTY (0)
-
-#define D3D11_DEFAULT_VIEWPORT_WIDTH    (0)
-
-#define D3D11_DS_INPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS (3968)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENTS    (4)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COUNT (32)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READS_PER_INST    (2)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READ_PORTS    (1)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENTS (3)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COUNT  (1)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READS_PER_INST (2)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READ_PORTS (1)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENTS   (4)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COUNT    (32)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST   (2)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READ_PORTS   (1)
-
-#define D3D11_DS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_DS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_DS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_FLOAT16_FUSED_TOLERANCE_IN_ULP    (0.6)
-#define D3D11_FLOAT32_MAX   (3.402823466e+38f)
-#define D3D11_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP   (0.6f)
-#define D3D11_FLOAT_TO_SRGB_EXPONENT_DENOMINATOR    (2.4f)
-#define D3D11_FLOAT_TO_SRGB_EXPONENT_NUMERATOR  (1.0f)
-#define D3D11_FLOAT_TO_SRGB_OFFSET  (0.055f)
-#define D3D11_FLOAT_TO_SRGB_SCALE_1 (12.92f)
-#define D3D11_FLOAT_TO_SRGB_SCALE_2 (1.055f)
-#define D3D11_FLOAT_TO_SRGB_THRESHOLD   (0.0031308f)
-#define D3D11_FTOI_INSTRUCTION_MAX_INPUT    (2147483647.999f)
-#define D3D11_FTOI_INSTRUCTION_MIN_INPUT    (-2147483648.999f)
-#define D3D11_FTOU_INSTRUCTION_MAX_INPUT    (4294967295.999f)
-#define D3D11_FTOU_INSTRUCTION_MIN_INPUT    (0.0f)
-#define D3D11_GS_INPUT_INSTANCE_ID_READS_PER_INST   (2)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_READ_PORTS   (1)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENTS  (1)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COUNT   (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENTS   (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COUNT    (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_READS_PER_INST   (2)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_READ_PORTS   (1)
-
-#define D3D11_GS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_GS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_GS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_GS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_GS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_GS_INPUT_REGISTER_VERTICES    (32)
-
-#define D3D11_GS_MAX_INSTANCE_COUNT (32)
-
-#define D3D11_GS_MAX_OUTPUT_VERTEX_COUNT_ACROSS_INSTANCES   (1024)
-
-#define D3D11_GS_OUTPUT_ELEMENTS    (32)
-
-#define D3D11_GS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_GS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_GS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_HS_CONTROL_POINT_PHASE_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_HS_CONTROL_POINT_PHASE_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND  (0xffffffff)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND  (0xffffffff)
-
-#define D3D11_HS_MAXTESSFACTOR_LOWER_BOUND  (1.0f)
-#define D3D11_HS_MAXTESSFACTOR_UPPER_BOUND  (64.0f)
-#define D3D11_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS    (3968)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENTS    (1)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COUNT (1)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READS_PER_INST    (2)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READ_PORTS    (1)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COUNT   (32)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_IA_DEFAULT_INDEX_BUFFER_OFFSET_IN_BYTES   (0)
-
-#define D3D11_IA_DEFAULT_PRIMITIVE_TOPOLOGY (0)
-
-#define D3D11_IA_DEFAULT_VERTEX_BUFFER_OFFSET_IN_BYTES  (0)
-
-#define D3D11_IA_INDEX_INPUT_RESOURCE_SLOT_COUNT    (1)
-
-#define D3D11_IA_INSTANCE_ID_BIT_COUNT  (32)
-
-#define D3D11_IA_INTEGER_ARITHMETIC_BIT_COUNT   (32)
-
-#define D3D11_IA_PATCH_MAX_CONTROL_POINT_COUNT  (32)
-
-#define D3D11_IA_PRIMITIVE_ID_BIT_COUNT (32)
-
-#define D3D11_IA_VERTEX_ID_BIT_COUNT    (32)
-
-#define D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT   (32)
-
-#define D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS (128)
-
-#define D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT   (32)
-
-#define D3D11_INTEGER_DIVIDE_BY_ZERO_QUOTIENT   (0xffffffff)
-
-#define D3D11_INTEGER_DIVIDE_BY_ZERO_REMAINDER  (0xffffffff)
-
-#define D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL (0xffffffff)
-
-#define D3D11_KEEP_UNORDERED_ACCESS_VIEWS   (0xffffffff)
-
-#define D3D11_LINEAR_GAMMA  (1.0f)
-#define D3D11_MAJOR_VERSION (11)
-
-#define D3D11_MAX_BORDER_COLOR_COMPONENT    (1.0f)
-#define D3D11_MAX_DEPTH (1.0f)
-#define D3D11_MAX_MAXANISOTROPY (16)
-
-#define D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT  (32)
-
-#define D3D11_MAX_POSITION_VALUE    (3.402823466e+34f)
-#define D3D11_MAX_TEXTURE_DIMENSION_2_TO_EXP    (17)
-
-#define D3D11_MINOR_VERSION (0)
-
-#define D3D11_MIN_BORDER_COLOR_COMPONENT    (0.0f)
-#define D3D11_MIN_DEPTH (0.0f)
-#define D3D11_MIN_MAXANISOTROPY (0)
-
-#define D3D11_MIP_LOD_BIAS_MAX  (15.99f)
-#define D3D11_MIP_LOD_BIAS_MIN  (-16.0f)
-#define D3D11_MIP_LOD_FRACTIONAL_BIT_COUNT  (8)
-
-#define D3D11_MIP_LOD_RANGE_BIT_COUNT   (8)
-
-#define D3D11_MULTISAMPLE_ANTIALIAS_LINE_WIDTH  (1.4f)
-#define D3D11_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT    (0)
-
-#define D3D11_PIXEL_ADDRESS_RANGE_BIT_COUNT (15)
-
-#define D3D11_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT (16)
-
-#define D3D11_PS_CS_UAV_REGISTER_COMPONENTS (1)
-
-#define D3D11_PS_CS_UAV_REGISTER_COUNT  (8)
-
-#define D3D11_PS_CS_UAV_REGISTER_READS_PER_INST (1)
-
-#define D3D11_PS_CS_UAV_REGISTER_READ_PORTS (1)
-
-#define D3D11_PS_FRONTFACING_DEFAULT_VALUE  (0xffffffff)
-
-#define D3D11_PS_FRONTFACING_FALSE_VALUE    (0)
-
-#define D3D11_PS_FRONTFACING_TRUE_VALUE (0xffffffff)
-
-#define D3D11_PS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_PS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_PS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_PS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT   (0.0f)
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS   (1)
-
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COUNT    (1)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENTS    (1)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COUNT (1)
-
-#define D3D11_PS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_PS_OUTPUT_REGISTER_COUNT  (8)
-
-#define D3D11_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT  (0.5f)
-#define D3D11_RAW_UAV_SRV_BYTE_ALIGNMENT    (16)
-
-#define D3D11_REQ_BLEND_OBJECT_COUNT_PER_DEVICE (4096)
-
-#define D3D11_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP  (27)
-
-#define D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT (4096)
-
-#define D3D11_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE (4096)
-
-#define D3D11_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP  (32)
-
-#define D3D11_REQ_DRAW_VERTEX_COUNT_2_TO_EXP    (32)
-
-#define D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION   (16384)
-
-#define D3D11_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT    (1024)
-
-#define D3D11_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT   (4096)
-
-#define D3D11_REQ_MAXANISOTROPY (16)
-
-#define D3D11_REQ_MIP_LEVELS    (15)
-
-#define D3D11_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES (2048)
-
-#define D3D11_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE    (4096)
-
-#define D3D11_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH (16384)
-
-#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM  (128)
-
-#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM  (0.25f)
-#define D3D11_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP   (20)
-
-#define D3D11_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE   (4096)
-
-#define D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION    (2048)
-
-#define D3D11_REQ_TEXTURE1D_U_DIMENSION (16384)
-
-#define D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION    (2048)
-
-#define D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION    (16384)
-
-#define D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION  (2048)
-
-#define D3D11_REQ_TEXTURECUBE_DIMENSION (16384)
-
-#define D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL  (0)
-
-#define D3D11_SHADER_MAJOR_VERSION  (5)
-
-#define D3D11_SHADER_MAX_INSTANCES  (65535)
-
-#define D3D11_SHADER_MAX_INTERFACES (253)
-
-#define D3D11_SHADER_MAX_INTERFACE_CALL_SITES   (4096)
-
-#define D3D11_SHADER_MAX_TYPES  (65535)
-
-#define D3D11_SHADER_MINOR_VERSION  (0)
-
-#define D3D11_SHIFT_INSTRUCTION_PAD_VALUE   (0)
-
-#define D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT   (5)
-
-#define D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT  (8)
-
-#define D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES (2048)
-
-#define D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES   (512)
-
-#define D3D11_SO_BUFFER_SLOT_COUNT  (4)
-
-#define D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP    (0xffffffff)
-
-#define D3D11_SO_NO_RASTERIZED_STREAM   (0xffffffff)
-
-#define D3D11_SO_OUTPUT_COMPONENT_COUNT (128)
-
-#define D3D11_SO_STREAM_COUNT   (4)
-
-#define D3D11_SPEC_DATE_DAY (04)
-
-#define D3D11_SPEC_DATE_MONTH   (06)
-
-#define D3D11_SPEC_DATE_YEAR    (2009)
-
-#define D3D11_SPEC_VERSION  (1.0)
-#define D3D11_SRGB_GAMMA    (2.2f)
-#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_1   (12.92f)
-#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_2   (1.055f)
-#define D3D11_SRGB_TO_FLOAT_EXPONENT    (2.4f)
-#define D3D11_SRGB_TO_FLOAT_OFFSET  (0.055f)
-#define D3D11_SRGB_TO_FLOAT_THRESHOLD   (0.04045f)
-#define D3D11_SRGB_TO_FLOAT_TOLERANCE_IN_ULP    (0.5f)
-#define D3D11_STANDARD_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_STANDARD_COMPONENT_BIT_COUNT_DOUBLED  (64)
-
-#define D3D11_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE  (4)
-
-#define D3D11_STANDARD_PIXEL_COMPONENT_COUNT    (128)
-
-#define D3D11_STANDARD_PIXEL_ELEMENT_COUNT  (32)
-
-#define D3D11_STANDARD_VECTOR_SIZE  (4)
-
-#define D3D11_STANDARD_VERTEX_ELEMENT_COUNT (32)
-
-#define D3D11_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT (64)
-
-#define D3D11_SUBPIXEL_FRACTIONAL_BIT_COUNT (8)
-
-#define D3D11_SUBTEXEL_FRACTIONAL_BIT_COUNT (8)
-
-#define D3D11_TESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR  (64)
-
-#define D3D11_TESSELLATOR_MAX_ISOLINE_DENSITY_TESSELLATION_FACTOR   (64)
-
-#define D3D11_TESSELLATOR_MAX_ODD_TESSELLATION_FACTOR   (63)
-
-#define D3D11_TESSELLATOR_MAX_TESSELLATION_FACTOR   (64)
-
-#define D3D11_TESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR  (2)
-
-#define D3D11_TESSELLATOR_MIN_ISOLINE_DENSITY_TESSELLATION_FACTOR   (1)
-
-#define D3D11_TESSELLATOR_MIN_ODD_TESSELLATION_FACTOR   (1)
-
-#define D3D11_TEXEL_ADDRESS_RANGE_BIT_COUNT (16)
-
-#define D3D11_UNBOUND_MEMORY_ACCESS_RESULT  (0)
-
-#define D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX    (15)
-
-#define D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE    (16)
-
-#define D3D11_VIEWPORT_BOUNDS_MAX   (32767)
-
-#define D3D11_VIEWPORT_BOUNDS_MIN   (-32768)
-
-#define D3D11_VS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_VS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_VS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_VS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_VS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_VS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_VS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_VS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT (10)
-
-#define D3D11_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP (25)
-
-#define D3D11_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP   (25)
-
-#endif
-
-#define D3D11_SDK_VERSION   (7)
-
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef
-    enum D3D11_INPUT_CLASSIFICATION
-{
-    D3D11_INPUT_PER_VERTEX_DATA = 0,
-    D3D11_INPUT_PER_INSTANCE_DATA   = 1
-}   D3D11_INPUT_CLASSIFICATION;
-
-typedef
-    enum D3D11_FILL_MODE
-{
-    D3D11_FILL_WIREFRAME    = 2,
-    D3D11_FILL_SOLID    = 3
-}   D3D11_FILL_MODE;
-
-typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY;
-
-typedef D3D_PRIMITIVE D3D11_PRIMITIVE;
-
-typedef
-    enum D3D11_CULL_MODE
-{
-    D3D11_CULL_NONE = 1,
-    D3D11_CULL_FRONT    = 2,
-    D3D11_CULL_BACK = 3
-}   D3D11_CULL_MODE;
-
-typedef
-    enum D3D11_RESOURCE_DIMENSION
-{
-    D3D11_RESOURCE_DIMENSION_UNKNOWN    = 0,
-    D3D11_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D11_RESOURCE_DIMENSION_TEXTURE1D  = 2,
-    D3D11_RESOURCE_DIMENSION_TEXTURE2D  = 3,
-    D3D11_RESOURCE_DIMENSION_TEXTURE3D  = 4
-}   D3D11_RESOURCE_DIMENSION;
-
-typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION;
-
-typedef
-    enum D3D11_DSV_DIMENSION
-{
-    D3D11_DSV_DIMENSION_UNKNOWN = 0,
-    D3D11_DSV_DIMENSION_TEXTURE1D   = 1,
-    D3D11_DSV_DIMENSION_TEXTURE1DARRAY  = 2,
-    D3D11_DSV_DIMENSION_TEXTURE2D   = 3,
-    D3D11_DSV_DIMENSION_TEXTURE2DARRAY  = 4,
-    D3D11_DSV_DIMENSION_TEXTURE2DMS = 5,
-    D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY    = 6
-}   D3D11_DSV_DIMENSION;
-
-typedef
-    enum D3D11_RTV_DIMENSION
-{
-    D3D11_RTV_DIMENSION_UNKNOWN = 0,
-    D3D11_RTV_DIMENSION_BUFFER  = 1,
-    D3D11_RTV_DIMENSION_TEXTURE1D   = 2,
-    D3D11_RTV_DIMENSION_TEXTURE1DARRAY  = 3,
-    D3D11_RTV_DIMENSION_TEXTURE2D   = 4,
-    D3D11_RTV_DIMENSION_TEXTURE2DARRAY  = 5,
-    D3D11_RTV_DIMENSION_TEXTURE2DMS = 6,
-    D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY    = 7,
-    D3D11_RTV_DIMENSION_TEXTURE3D   = 8
-}   D3D11_RTV_DIMENSION;
-
-typedef
-    enum D3D11_UAV_DIMENSION
-{
-    D3D11_UAV_DIMENSION_UNKNOWN = 0,
-    D3D11_UAV_DIMENSION_BUFFER  = 1,
-    D3D11_UAV_DIMENSION_TEXTURE1D   = 2,
-    D3D11_UAV_DIMENSION_TEXTURE1DARRAY  = 3,
-    D3D11_UAV_DIMENSION_TEXTURE2D   = 4,
-    D3D11_UAV_DIMENSION_TEXTURE2DARRAY  = 5,
-    D3D11_UAV_DIMENSION_TEXTURE3D   = 8
-}   D3D11_UAV_DIMENSION;
-
-typedef
-    enum D3D11_USAGE
-{
-    D3D11_USAGE_DEFAULT = 0,
-    D3D11_USAGE_IMMUTABLE   = 1,
-    D3D11_USAGE_DYNAMIC = 2,
-    D3D11_USAGE_STAGING = 3
-}   D3D11_USAGE;
-
-typedef
-    enum D3D11_BIND_FLAG
-{
-    D3D11_BIND_VERTEX_BUFFER    = 0x1L,
-    D3D11_BIND_INDEX_BUFFER = 0x2L,
-    D3D11_BIND_CONSTANT_BUFFER  = 0x4L,
-    D3D11_BIND_SHADER_RESOURCE  = 0x8L,
-    D3D11_BIND_STREAM_OUTPUT    = 0x10L,
-    D3D11_BIND_RENDER_TARGET    = 0x20L,
-    D3D11_BIND_DEPTH_STENCIL    = 0x40L,
-    D3D11_BIND_UNORDERED_ACCESS = 0x80L
-}   D3D11_BIND_FLAG;
-
-typedef
-    enum D3D11_CPU_ACCESS_FLAG
-{
-    D3D11_CPU_ACCESS_WRITE  = 0x10000L,
-    D3D11_CPU_ACCESS_READ   = 0x20000L
-}   D3D11_CPU_ACCESS_FLAG;
-
-typedef
-    enum D3D11_RESOURCE_MISC_FLAG
-{
-    D3D11_RESOURCE_MISC_GENERATE_MIPS   = 0x1L,
-    D3D11_RESOURCE_MISC_SHARED  = 0x2L,
-    D3D11_RESOURCE_MISC_TEXTURECUBE = 0x4L,
-    D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS   = 0x10L,
-    D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS  = 0x20L,
-    D3D11_RESOURCE_MISC_BUFFER_STRUCTURED   = 0x40L,
-    D3D11_RESOURCE_MISC_RESOURCE_CLAMP  = 0x80L,
-    D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX   = 0x100L,
-    D3D11_RESOURCE_MISC_GDI_COMPATIBLE  = 0x200L
-}   D3D11_RESOURCE_MISC_FLAG;
-
-typedef
-    enum D3D11_MAP
-{
-    D3D11_MAP_READ  = 1,
-    D3D11_MAP_WRITE = 2,
-    D3D11_MAP_READ_WRITE    = 3,
-    D3D11_MAP_WRITE_DISCARD = 4,
-    D3D11_MAP_WRITE_NO_OVERWRITE    = 5
-}   D3D11_MAP;
-
-typedef
-    enum D3D11_MAP_FLAG
-{
-    D3D11_MAP_FLAG_DO_NOT_WAIT  = 0x100000L
-}   D3D11_MAP_FLAG;
-
-typedef
-    enum D3D11_RAISE_FLAG
-{
-    D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR  = 0x1L
-}   D3D11_RAISE_FLAG;
-
-typedef
-    enum D3D11_CLEAR_FLAG
-{
-    D3D11_CLEAR_DEPTH   = 0x1L,
-    D3D11_CLEAR_STENCIL = 0x2L
-}   D3D11_CLEAR_FLAG;
-
-typedef RECT D3D11_RECT;
-
-typedef
-    enum D3D11_COMPARISON_FUNC
-{
-    D3D11_COMPARISON_NEVER  = 1,
-    D3D11_COMPARISON_LESS   = 2,
-    D3D11_COMPARISON_EQUAL  = 3,
-    D3D11_COMPARISON_LESS_EQUAL = 4,
-    D3D11_COMPARISON_GREATER    = 5,
-    D3D11_COMPARISON_NOT_EQUAL  = 6,
-    D3D11_COMPARISON_GREATER_EQUAL  = 7,
-    D3D11_COMPARISON_ALWAYS = 8
-}   D3D11_COMPARISON_FUNC;
-
-typedef
-    enum D3D11_DEPTH_WRITE_MASK
-{
-    D3D11_DEPTH_WRITE_MASK_ZERO = 0,
-    D3D11_DEPTH_WRITE_MASK_ALL  = 1
-}   D3D11_DEPTH_WRITE_MASK;
-
-typedef
-    enum D3D11_STENCIL_OP
-{
-    D3D11_STENCIL_OP_KEEP   = 1,
-    D3D11_STENCIL_OP_ZERO   = 2,
-    D3D11_STENCIL_OP_REPLACE    = 3,
-    D3D11_STENCIL_OP_INCR_SAT   = 4,
-    D3D11_STENCIL_OP_DECR_SAT   = 5,
-    D3D11_STENCIL_OP_INVERT = 6,
-    D3D11_STENCIL_OP_INCR   = 7,
-    D3D11_STENCIL_OP_DECR   = 8
-}   D3D11_STENCIL_OP;
-
-typedef
-    enum D3D11_BLEND
-{
-    D3D11_BLEND_ZERO    = 1,
-    D3D11_BLEND_ONE = 2,
-    D3D11_BLEND_SRC_COLOR   = 3,
-    D3D11_BLEND_INV_SRC_COLOR   = 4,
-    D3D11_BLEND_SRC_ALPHA   = 5,
-    D3D11_BLEND_INV_SRC_ALPHA   = 6,
-    D3D11_BLEND_DEST_ALPHA  = 7,
-    D3D11_BLEND_INV_DEST_ALPHA  = 8,
-    D3D11_BLEND_DEST_COLOR  = 9,
-    D3D11_BLEND_INV_DEST_COLOR  = 10,
-    D3D11_BLEND_SRC_ALPHA_SAT   = 11,
-    D3D11_BLEND_BLEND_FACTOR    = 14,
-    D3D11_BLEND_INV_BLEND_FACTOR    = 15,
-    D3D11_BLEND_SRC1_COLOR  = 16,
-    D3D11_BLEND_INV_SRC1_COLOR  = 17,
-    D3D11_BLEND_SRC1_ALPHA  = 18,
-    D3D11_BLEND_INV_SRC1_ALPHA  = 19
-}   D3D11_BLEND;
-
-typedef
-    enum D3D11_BLEND_OP
-{
-    D3D11_BLEND_OP_ADD  = 1,
-    D3D11_BLEND_OP_SUBTRACT = 2,
-    D3D11_BLEND_OP_REV_SUBTRACT = 3,
-    D3D11_BLEND_OP_MIN  = 4,
-    D3D11_BLEND_OP_MAX  = 5
-}   D3D11_BLEND_OP;
-
-typedef
-    enum D3D11_COLOR_WRITE_ENABLE
-{
-    D3D11_COLOR_WRITE_ENABLE_RED    = 1,
-    D3D11_COLOR_WRITE_ENABLE_GREEN  = 2,
-    D3D11_COLOR_WRITE_ENABLE_BLUE   = 4,
-    D3D11_COLOR_WRITE_ENABLE_ALPHA  = 8,
-    D3D11_COLOR_WRITE_ENABLE_ALL    = (((D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN)  | D3D11_COLOR_WRITE_ENABLE_BLUE)  | D3D11_COLOR_WRITE_ENABLE_ALPHA)
-}   D3D11_COLOR_WRITE_ENABLE;
-
-typedef
-    enum D3D11_TEXTURECUBE_FACE
-{
-    D3D11_TEXTURECUBE_FACE_POSITIVE_X   = 0,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_X   = 1,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Y   = 2,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Y   = 3,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Z   = 4,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Z   = 5
-}   D3D11_TEXTURECUBE_FACE;
-
-typedef
-    enum D3D11_BUFFEREX_SRV_FLAG
-{
-    D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1
-}   D3D11_BUFFEREX_SRV_FLAG;
-
-typedef
-    enum D3D11_DSV_FLAG
-{
-    D3D11_DSV_READ_ONLY_DEPTH   = 0x1L,
-    D3D11_DSV_READ_ONLY_STENCIL = 0x2L
-}   D3D11_DSV_FLAG;
-
-typedef
-    enum D3D11_BUFFER_UAV_FLAG
-{
-    D3D11_BUFFER_UAV_FLAG_RAW   = 0x1,
-    D3D11_BUFFER_UAV_FLAG_APPEND    = 0x2,
-    D3D11_BUFFER_UAV_FLAG_COUNTER   = 0x4
-}   D3D11_BUFFER_UAV_FLAG;
-
-typedef
-    enum D3D11_FILTER
-{
-    D3D11_FILTER_MIN_MAG_MIP_POINT  = 0,
-    D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR   = 0x1,
-    D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4,
-    D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR   = 0x5,
-    D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT   = 0x10,
-    D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR    = 0x11,
-    D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT   = 0x14,
-    D3D11_FILTER_MIN_MAG_MIP_LINEAR = 0x15,
-    D3D11_FILTER_ANISOTROPIC    = 0x55,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT   = 0x80,
-    D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR    = 0x81,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT  = 0x84,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR    = 0x85,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT    = 0x90,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91,
-    D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT    = 0x94,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR  = 0x95,
-    D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5
-}   D3D11_FILTER;
-
-typedef
-    enum D3D11_FILTER_TYPE
-{
-    D3D11_FILTER_TYPE_POINT = 0,
-    D3D11_FILTER_TYPE_LINEAR    = 1
-}   D3D11_FILTER_TYPE;
-
-typedef
-    enum D3D11_TEXTURE_ADDRESS_MODE
-{
-    D3D11_TEXTURE_ADDRESS_WRAP  = 1,
-    D3D11_TEXTURE_ADDRESS_MIRROR    = 2,
-    D3D11_TEXTURE_ADDRESS_CLAMP = 3,
-    D3D11_TEXTURE_ADDRESS_BORDER    = 4,
-    D3D11_TEXTURE_ADDRESS_MIRROR_ONCE   = 5
-}   D3D11_TEXTURE_ADDRESS_MODE;
-
-typedef
-    enum D3D11_FORMAT_SUPPORT
-{
-    D3D11_FORMAT_SUPPORT_BUFFER = 0x1,
-    D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER   = 0x2,
-    D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER    = 0x4,
-    D3D11_FORMAT_SUPPORT_SO_BUFFER  = 0x8,
-    D3D11_FORMAT_SUPPORT_TEXTURE1D  = 0x10,
-    D3D11_FORMAT_SUPPORT_TEXTURE2D  = 0x20,
-    D3D11_FORMAT_SUPPORT_TEXTURE3D  = 0x40,
-    D3D11_FORMAT_SUPPORT_TEXTURECUBE    = 0x80,
-    D3D11_FORMAT_SUPPORT_SHADER_LOAD    = 0x100,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE  = 0x200,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON   = 0x400,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT    = 0x800,
-    D3D11_FORMAT_SUPPORT_MIP    = 0x1000,
-    D3D11_FORMAT_SUPPORT_MIP_AUTOGEN    = 0x2000,
-    D3D11_FORMAT_SUPPORT_RENDER_TARGET  = 0x4000,
-    D3D11_FORMAT_SUPPORT_BLENDABLE  = 0x8000,
-    D3D11_FORMAT_SUPPORT_DEPTH_STENCIL  = 0x10000,
-    D3D11_FORMAT_SUPPORT_CPU_LOCKABLE   = 0x20000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE    = 0x40000,
-    D3D11_FORMAT_SUPPORT_DISPLAY    = 0x80000,
-    D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT = 0x100000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET   = 0x200000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD   = 0x400000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER  = 0x800000,
-    D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST   = 0x1000000,
-    D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW    = 0x2000000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON   = 0x4000000
-}   D3D11_FORMAT_SUPPORT;
-
-typedef
-    enum D3D11_FORMAT_SUPPORT2
-{
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD    = 0x1,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS    = 0x2,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE  = 0x4,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE   = 0x8,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX  = 0x10,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX    = 0x20,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD    = 0x40,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE   = 0x80
-}   D3D11_FORMAT_SUPPORT2;
-
-typedef
-    enum D3D11_ASYNC_GETDATA_FLAG
-{
-    D3D11_ASYNC_GETDATA_DONOTFLUSH  = 0x1
-}   D3D11_ASYNC_GETDATA_FLAG;
-
-typedef
-    enum D3D11_QUERY
-{
-    D3D11_QUERY_EVENT   = 0,
-    D3D11_QUERY_OCCLUSION   = (D3D11_QUERY_EVENT + 1),
-    D3D11_QUERY_TIMESTAMP   = (D3D11_QUERY_OCCLUSION + 1),
-    D3D11_QUERY_TIMESTAMP_DISJOINT  = (D3D11_QUERY_TIMESTAMP + 1),
-    D3D11_QUERY_PIPELINE_STATISTICS = (D3D11_QUERY_TIMESTAMP_DISJOINT + 1),
-    D3D11_QUERY_OCCLUSION_PREDICATE = (D3D11_QUERY_PIPELINE_STATISTICS + 1),
-    D3D11_QUERY_SO_STATISTICS   = (D3D11_QUERY_OCCLUSION_PREDICATE + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE   = (D3D11_QUERY_SO_STATISTICS + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM0   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0   = (D3D11_QUERY_SO_STATISTICS_STREAM0 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM1   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1   = (D3D11_QUERY_SO_STATISTICS_STREAM1 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM2   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2   = (D3D11_QUERY_SO_STATISTICS_STREAM2 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM3   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3   = (D3D11_QUERY_SO_STATISTICS_STREAM3 + 1)
-}   D3D11_QUERY;
-
-typedef
-    enum D3D11_QUERY_MISC_FLAG
-{
-    D3D11_QUERY_MISC_PREDICATEHINT  = 0x1
-}   D3D11_QUERY_MISC_FLAG;
-
-typedef
-    enum D3D11_COUNTER
-{
-    D3D11_COUNTER_DEVICE_DEPENDENT_0    = 0x40000000
-}   D3D11_COUNTER;
-
-typedef
-    enum D3D11_COUNTER_TYPE
-{
-    D3D11_COUNTER_TYPE_FLOAT32  = 0,
-    D3D11_COUNTER_TYPE_UINT16   = (D3D11_COUNTER_TYPE_FLOAT32 + 1),
-    D3D11_COUNTER_TYPE_UINT32   = (D3D11_COUNTER_TYPE_UINT16 + 1),
-    D3D11_COUNTER_TYPE_UINT64   = (D3D11_COUNTER_TYPE_UINT32 + 1)
-}   D3D11_COUNTER_TYPE;
-
-typedef
-    enum D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS
-{
-    D3D11_STANDARD_MULTISAMPLE_PATTERN  = 0xffffffff,
-    D3D11_CENTER_MULTISAMPLE_PATTERN    = 0xfffffffe
-}   D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS;
-
-typedef
-    enum D3D11_DEVICE_CONTEXT_TYPE
-{
-    D3D11_DEVICE_CONTEXT_IMMEDIATE  = 0,
-    D3D11_DEVICE_CONTEXT_DEFERRED   = (D3D11_DEVICE_CONTEXT_IMMEDIATE + 1)
-}   D3D11_DEVICE_CONTEXT_TYPE;
-
-typedef enum D3D11_FEATURE
-{
-    D3D11_FEATURE_THREADING = 0,
-    D3D11_FEATURE_DOUBLES = (D3D11_FEATURE_THREADING + 1),
-    D3D11_FEATURE_FORMAT_SUPPORT = (D3D11_FEATURE_DOUBLES + 1),
-    D3D11_FEATURE_FORMAT_SUPPORT2 = (D3D11_FEATURE_FORMAT_SUPPORT + 1),
-    D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS = (D3D11_FEATURE_FORMAT_SUPPORT2 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS = (D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS + 1),
-    D3D11_FEATURE_ARCHITECTURE_INFO = (D3D11_FEATURE_D3D11_OPTIONS + 1),
-    D3D11_FEATURE_D3D9_OPTIONS = (D3D11_FEATURE_ARCHITECTURE_INFO + 1),
-    D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT = (D3D11_FEATURE_D3D9_OPTIONS + 1),
-    D3D11_FEATURE_D3D9_SHADOW_SUPPORT = (D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT + 1),
-    D3D11_FEATURE_D3D11_OPTIONS1 = (D3D11_FEATURE_D3D9_SHADOW_SUPPORT + 1),
-    D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT = (D3D11_FEATURE_D3D11_OPTIONS1 + 1),
-    D3D11_FEATURE_MARKER_SUPPORT = (D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT + 1),
-    D3D11_FEATURE_D3D9_OPTIONS1 = (D3D11_FEATURE_MARKER_SUPPORT + 1),
-    D3D11_FEATURE_D3D11_OPTIONS2 = (D3D11_FEATURE_D3D9_OPTIONS1 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS3 = (D3D11_FEATURE_D3D11_OPTIONS2 + 1),
-    D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = (D3D11_FEATURE_D3D11_OPTIONS3 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS4 = (D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT + 1)
-} D3D11_FEATURE;
-
-typedef enum D3D11_CONSERVATIVE_RASTERIZATION_TIER
-{
-    D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED = 0,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_1 = 1,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_2 = 2,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_3 = 3
-} D3D11_CONSERVATIVE_RASTERIZATION_TIER;
-
-typedef enum _D3D11_TILED_RESOURCES_TIER
-{
-    D3D11_TILED_RESOURCES_NOT_SUPPORTED = 0,
-    D3D11_TILED_RESOURCES_TIER_1 = 1,
-    D3D11_TILED_RESOURCES_TIER_2 = 2,
-    D3D11_TILED_RESOURCES_TIER_3 = 3
-} D3D11_TILED_RESOURCES_TIER;
-
-typedef
-    enum D3D11_CREATE_DEVICE_FLAG
-{
-    D3D11_CREATE_DEVICE_SINGLETHREADED  = 0x1,
-    D3D11_CREATE_DEVICE_DEBUG   = 0x2,
-    D3D11_CREATE_DEVICE_SWITCH_TO_REF   = 0x4,
-    D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS    = 0x8,
-    D3D11_CREATE_DEVICE_BGRA_SUPPORT    = 0x20
-}   D3D11_CREATE_DEVICE_FLAG;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct D3D11_INPUT_ELEMENT_DESC
-{
-    LPCSTR SemanticName;
-    UINT SemanticIndex;
-    DXGI_FORMAT Format;
-    UINT InputSlot;
-    UINT AlignedByteOffset;
-    D3D11_INPUT_CLASSIFICATION InputSlotClass;
-    UINT InstanceDataStepRate;
-}   D3D11_INPUT_ELEMENT_DESC;
-
-typedef struct D3D11_SO_DECLARATION_ENTRY
-{
-    UINT Stream;
-    LPCSTR SemanticName;
-    UINT SemanticIndex;
-    BYTE StartComponent;
-    BYTE ComponentCount;
-    BYTE OutputSlot;
-}   D3D11_SO_DECLARATION_ENTRY;
-
-typedef struct D3D11_VIEWPORT
-{
-    FLOAT TopLeftX;
-    FLOAT TopLeftY;
-    FLOAT Width;
-    FLOAT Height;
-    FLOAT MinDepth;
-    FLOAT MaxDepth;
-}   D3D11_VIEWPORT;
-
-typedef struct D3D11_BOX
-{
-    UINT left;
-    UINT top;
-    UINT front;
-    UINT right;
-    UINT bottom;
-    UINT back;
-}   D3D11_BOX;
-
-typedef struct D3D11_DEPTH_STENCILOP_DESC
-{
-    D3D11_STENCIL_OP StencilFailOp;
-    D3D11_STENCIL_OP StencilDepthFailOp;
-    D3D11_STENCIL_OP StencilPassOp;
-    D3D11_COMPARISON_FUNC StencilFunc;
-}   D3D11_DEPTH_STENCILOP_DESC;
-
-typedef struct D3D11_DEPTH_STENCIL_DESC
-{
-    BOOL DepthEnable;
-    D3D11_DEPTH_WRITE_MASK DepthWriteMask;
-    D3D11_COMPARISON_FUNC DepthFunc;
-    BOOL StencilEnable;
-    UINT8 StencilReadMask;
-    UINT8 StencilWriteMask;
-    D3D11_DEPTH_STENCILOP_DESC FrontFace;
-    D3D11_DEPTH_STENCILOP_DESC BackFace;
-}   D3D11_DEPTH_STENCIL_DESC;
-
-typedef struct D3D11_RENDER_TARGET_BLEND_DESC
-{
-    BOOL BlendEnable;
-    D3D11_BLEND SrcBlend;
-    D3D11_BLEND DestBlend;
-    D3D11_BLEND_OP BlendOp;
-    D3D11_BLEND SrcBlendAlpha;
-    D3D11_BLEND DestBlendAlpha;
-    D3D11_BLEND_OP BlendOpAlpha;
-    UINT8 RenderTargetWriteMask;
-}   D3D11_RENDER_TARGET_BLEND_DESC;
-
-typedef struct D3D11_BLEND_DESC
-{
-    BOOL AlphaToCoverageEnable;
-    BOOL IndependentBlendEnable;
-    D3D11_RENDER_TARGET_BLEND_DESC RenderTarget[ 8 ];
-}   D3D11_BLEND_DESC;
-
-typedef struct D3D11_RASTERIZER_DESC
-{
-    D3D11_FILL_MODE FillMode;
-    D3D11_CULL_MODE CullMode;
-    BOOL FrontCounterClockwise;
-    INT DepthBias;
-    FLOAT DepthBiasClamp;
-    FLOAT SlopeScaledDepthBias;
-    BOOL DepthClipEnable;
-    BOOL ScissorEnable;
-    BOOL MultisampleEnable;
-    BOOL AntialiasedLineEnable;
-}   D3D11_RASTERIZER_DESC;
-
-typedef struct D3D11_SUBRESOURCE_DATA
-{
-    const void* pSysMem;
-    UINT SysMemPitch;
-    UINT SysMemSlicePitch;
-}   D3D11_SUBRESOURCE_DATA;
-
-typedef struct D3D11_MAPPED_SUBRESOURCE
-{
-    void* pData;
-    UINT RowPitch;
-    UINT DepthPitch;
-}   D3D11_MAPPED_SUBRESOURCE;
-
-typedef struct D3D11_BUFFER_DESC
-{
-    UINT ByteWidth;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-    UINT StructureByteStride;
-}   D3D11_BUFFER_DESC;
-
-typedef struct D3D11_TEXTURE1D_DESC
-{
-    UINT Width;
-    UINT MipLevels;
-    UINT ArraySize;
-    DXGI_FORMAT Format;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE1D_DESC;
-
-typedef struct D3D11_TEXTURE2D_DESC
-{
-    UINT Width;
-    UINT Height;
-    UINT MipLevels;
-    UINT ArraySize;
-    DXGI_FORMAT Format;
-    DXGI_SAMPLE_DESC SampleDesc;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE2D_DESC;
-
-typedef struct D3D11_TEXTURE3D_DESC
-{
-    UINT Width;
-    UINT Height;
-    UINT Depth;
-    UINT MipLevels;
-    DXGI_FORMAT Format;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE3D_DESC;
-
-typedef struct D3D11_BUFFER_SRV
-{
-    union
-    {
-        UINT FirstElement;
-        UINT ElementOffset;
-    };
-    union
-    {
-        UINT NumElements;
-        UINT ElementWidth;
-    };
-}   D3D11_BUFFER_SRV;
-
-typedef struct D3D11_BUFFEREX_SRV
-{
-    UINT FirstElement;
-    UINT NumElements;
-    UINT Flags;
-}   D3D11_BUFFEREX_SRV;
-
-typedef struct D3D11_TEX1D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX1D_SRV;
-
-typedef struct D3D11_TEX1D_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_SRV;
-
-typedef struct D3D11_TEX2D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX2D_SRV;
-
-typedef struct D3D11_TEX2D_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_SRV;
-
-typedef struct D3D11_TEX3D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX3D_SRV;
-
-typedef struct D3D11_TEXCUBE_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEXCUBE_SRV;
-
-typedef struct D3D11_TEXCUBE_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT First2DArrayFace;
-    UINT NumCubes;
-}   D3D11_TEXCUBE_ARRAY_SRV;
-
-typedef struct D3D11_TEX2DMS_SRV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_SRV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_SRV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_SRV;
-
-typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_SRV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_SRV Buffer;
-        D3D11_TEX1D_SRV Texture1D;
-        D3D11_TEX1D_ARRAY_SRV Texture1DArray;
-        D3D11_TEX2D_SRV Texture2D;
-        D3D11_TEX2D_ARRAY_SRV Texture2DArray;
-        D3D11_TEX2DMS_SRV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_SRV Texture2DMSArray;
-        D3D11_TEX3D_SRV Texture3D;
-        D3D11_TEXCUBE_SRV TextureCube;
-        D3D11_TEXCUBE_ARRAY_SRV TextureCubeArray;
-        D3D11_BUFFEREX_SRV BufferEx;
-    };
-}   D3D11_SHADER_RESOURCE_VIEW_DESC;
-
-typedef struct D3D11_BUFFER_RTV
-{
-    union
-    {
-        UINT FirstElement;
-        UINT ElementOffset;
-    };
-    union
-    {
-        UINT NumElements;
-        UINT ElementWidth;
-    };
-}   D3D11_BUFFER_RTV;
-
-typedef struct D3D11_TEX1D_RTV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_RTV;
-
-typedef struct D3D11_TEX1D_ARRAY_RTV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_RTV;
-
-typedef struct D3D11_TEX2D_RTV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_RTV;
-
-typedef struct D3D11_TEX2DMS_RTV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_RTV;
-
-typedef struct D3D11_TEX2D_ARRAY_RTV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_RTV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_RTV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_RTV;
-
-typedef struct D3D11_TEX3D_RTV
-{
-    UINT MipSlice;
-    UINT FirstWSlice;
-    UINT WSize;
-}   D3D11_TEX3D_RTV;
-
-typedef struct D3D11_RENDER_TARGET_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_RTV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_RTV Buffer;
-        D3D11_TEX1D_RTV Texture1D;
-        D3D11_TEX1D_ARRAY_RTV Texture1DArray;
-        D3D11_TEX2D_RTV Texture2D;
-        D3D11_TEX2D_ARRAY_RTV Texture2DArray;
-        D3D11_TEX2DMS_RTV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_RTV Texture2DMSArray;
-        D3D11_TEX3D_RTV Texture3D;
-    };
-}   D3D11_RENDER_TARGET_VIEW_DESC;
-
-typedef struct D3D11_TEX1D_DSV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_DSV;
-
-typedef struct D3D11_TEX1D_ARRAY_DSV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_DSV;
-
-typedef struct D3D11_TEX2D_DSV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_DSV;
-
-typedef struct D3D11_TEX2D_ARRAY_DSV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_DSV;
-
-typedef struct D3D11_TEX2DMS_DSV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_DSV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_DSV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_DSV;
-
-typedef struct D3D11_DEPTH_STENCIL_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_DSV_DIMENSION ViewDimension;
-    UINT Flags;
-    union
-    {
-        D3D11_TEX1D_DSV Texture1D;
-        D3D11_TEX1D_ARRAY_DSV Texture1DArray;
-        D3D11_TEX2D_DSV Texture2D;
-        D3D11_TEX2D_ARRAY_DSV Texture2DArray;
-        D3D11_TEX2DMS_DSV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_DSV Texture2DMSArray;
-    };
-}   D3D11_DEPTH_STENCIL_VIEW_DESC;
-
-typedef struct D3D11_BUFFER_UAV
-{
-    UINT FirstElement;
-    UINT NumElements;
-    UINT Flags;
-}   D3D11_BUFFER_UAV;
-
-typedef struct D3D11_TEX1D_UAV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_UAV;
-
-typedef struct D3D11_TEX1D_ARRAY_UAV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_UAV;
-
-typedef struct D3D11_TEX2D_UAV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_UAV;
-
-typedef struct D3D11_TEX2D_ARRAY_UAV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_UAV;
-
-typedef struct D3D11_TEX3D_UAV
-{
-    UINT MipSlice;
-    UINT FirstWSlice;
-    UINT WSize;
-}   D3D11_TEX3D_UAV;
-
-typedef struct D3D11_UNORDERED_ACCESS_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_UAV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_UAV Buffer;
-        D3D11_TEX1D_UAV Texture1D;
-        D3D11_TEX1D_ARRAY_UAV Texture1DArray;
-        D3D11_TEX2D_UAV Texture2D;
-        D3D11_TEX2D_ARRAY_UAV Texture2DArray;
-        D3D11_TEX3D_UAV Texture3D;
-    };
-}   D3D11_UNORDERED_ACCESS_VIEW_DESC;
-
-typedef struct D3D11_SAMPLER_DESC
-{
-    D3D11_FILTER Filter;
-    D3D11_TEXTURE_ADDRESS_MODE AddressU;
-    D3D11_TEXTURE_ADDRESS_MODE AddressV;
-    D3D11_TEXTURE_ADDRESS_MODE AddressW;
-    FLOAT MipLODBias;
-    UINT MaxAnisotropy;
-    D3D11_COMPARISON_FUNC ComparisonFunc;
-    FLOAT BorderColor[ 4 ];
-    FLOAT MinLOD;
-    FLOAT MaxLOD;
-}   D3D11_SAMPLER_DESC;
-
-typedef struct D3D11_QUERY_DESC
-{
-    D3D11_QUERY Query;
-    UINT MiscFlags;
-}   D3D11_QUERY_DESC;
-
-typedef struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT
-{
-    UINT64 Frequency;
-    BOOL Disjoint;
-}   D3D11_QUERY_DATA_TIMESTAMP_DISJOINT;
-
-typedef struct D3D11_QUERY_DATA_PIPELINE_STATISTICS
-{
-    UINT64 IAVertices;
-    UINT64 IAPrimitives;
-    UINT64 VSInvocations;
-    UINT64 GSInvocations;
-    UINT64 GSPrimitives;
-    UINT64 CInvocations;
-    UINT64 CPrimitives;
-    UINT64 PSInvocations;
-    UINT64 HSInvocations;
-    UINT64 DSInvocations;
-    UINT64 CSInvocations;
-}   D3D11_QUERY_DATA_PIPELINE_STATISTICS;
-
-typedef struct D3D11_QUERY_DATA_SO_STATISTICS
-{
-    UINT64 NumPrimitivesWritten;
-    UINT64 PrimitivesStorageNeeded;
-}   D3D11_QUERY_DATA_SO_STATISTICS;
-
-typedef struct D3D11_COUNTER_DESC
-{
-    D3D11_COUNTER Counter;
-    UINT MiscFlags;
-}   D3D11_COUNTER_DESC;
-
-typedef struct D3D11_COUNTER_INFO
-{
-    D3D11_COUNTER LastDeviceDependentCounter;
-    UINT NumSimultaneousCounters;
-    UINT8 NumDetectableParallelUnits;
-}   D3D11_COUNTER_INFO;
-
-typedef struct D3D11_CLASS_INSTANCE_DESC
-{
-    UINT InstanceId;
-    UINT InstanceIndex;
-    UINT TypeId;
-    UINT ConstantBuffer;
-    UINT BaseConstantBufferOffset;
-    UINT BaseTexture;
-    UINT BaseSampler;
-    BOOL Created;
-}   D3D11_CLASS_INSTANCE_DESC;
-
-typedef struct D3D11_FEATURE_DATA_THREADING
-{
-    BOOL DriverConcurrentCreates;
-    BOOL DriverCommandLists;
-}   D3D11_FEATURE_DATA_THREADING;
-
-typedef struct D3D11_FEATURE_DATA_DOUBLES
-{
-    BOOL DoublePrecisionFloatShaderOps;
-}   D3D11_FEATURE_DATA_DOUBLES;
-
-typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT
-{
-    DXGI_FORMAT InFormat;
-    UINT OutFormatSupport;
-}   D3D11_FEATURE_DATA_FORMAT_SUPPORT;
-
-typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT2
-{
-    DXGI_FORMAT InFormat;
-    UINT OutFormatSupport2;
-}   D3D11_FEATURE_DATA_FORMAT_SUPPORT2;
-
-typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS
-{
-    BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x;
-}   D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS;
-
-typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS
-{
-    BOOL OutputMergerLogicOp;
-    BOOL UAVOnlyRenderingForcedSampleCount;
-    BOOL DiscardAPIsSeenByDriver;
-    BOOL FlagsForUpdateAndCopySeenByDriver;
-    BOOL ClearView;
-    BOOL CopyWithOverlap;
-    BOOL ConstantBufferPartialUpdate;
-    BOOL ConstantBufferOffsetting;
-    BOOL MapNoOverwriteOnDynamicConstantBuffer;
-    BOOL MapNoOverwriteOnDynamicBufferSRV;
-    BOOL MultisampleRTVWithForcedSampleCountOne;
-    BOOL SAD4ShaderInstructions;
-    BOOL ExtendedDoublesShaderInstructions;
-    BOOL ExtendedResourceSharing;
-} D3D11_FEATURE_DATA_D3D11_OPTIONS;
-
-typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS2
-{
-    BOOL                                  PSSpecifiedStencilRefSupported;
-    BOOL                                  TypedUAVLoadAdditionalFormats;
-    BOOL                                  ROVsSupported;
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER ConservativeRasterizationTier;
-    D3D11_TILED_RESOURCES_TIER            TiledResourcesTier;
-    BOOL                                  MapOnDefaultTextures;
-    BOOL                                  StandardSwizzle;
-    BOOL                                  UnifiedMemoryArchitecture;
-} D3D11_FEATURE_DATA_D3D11_OPTIONS2;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Constants
-////////////////////////////////////////////////////////////////////////////
-
-const UINT D3D11_APPEND_ALIGNED_ELEMENT = 0xffffffff;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-
-//struct ID3D11DeviceChild;                 // Typedef as CCryDXGLDeviceChild
-//struct ID3D11DepthStencilState;       // Typedef as CCryDXGLDepthStencilState
-//struct ID3D11BlendState;                  // Typedef as CCryDXGLBlendState
-//struct ID3D11RasterizerState;         // Typedef as CCryDXGLRasterizerState
-//struct ID3D11Resource;                        // Typedef as CCryDXGLResource
-//struct ID3D11Buffer;                          // Typedef as CCryDXGLBuffer
-//struct ID3D11Texture1D;                       // Typedef as CCryDXGLTexture1D
-//struct ID3D11Texture2D;                       // Typedef as CCryDXGLTexture2D
-//struct ID3D11Texture3D;                       // Typedef as CCryDXGLTexture3D
-//struct ID3D11View;                                // Typedef as CCryDXGLView
-//struct ID3D11ShaderResourceView;  // Typedef as CCryDXGLShaderResourceView
-//struct ID3D11RenderTargetView;        // Typedef as CCryDXGLRenderTargetView
-//struct ID3D11DepthStencilView;        // Typedef as CCryDXGLDepthStencilView
-//struct ID3D11UnorderedAccessView;     // Typedef as CCryDXGLUnorderedAccessView
-//struct ID3D11VertexShader;                // Typedef as CCryDXGLVertexShader
-//struct ID3D11HullShader;                  // Typedef as CCryDXGLHullShader
-//struct ID3D11DomainShader;                // Typedef as CCryDXGLDomainShader
-//struct ID3D11GeometryShader;          // Typedef as CCryDXGLGeometryShader
-//struct ID3D11PixelShader;                 // Typedef as CCryDXGLPixelShader
-//struct ID3D11ComputeShader;               // Typedef as CCryDXGLComputeShader
-//struct ID3D11InputLayout;                 // Typedef as CCryDXGLInputLayout
-//struct ID3D11SamplerState;                // Typedef as CCryDXGLSamplerState
-//struct ID3D11Asynchronous;                // Typedef as CCryDXGLQuery
-//struct ID3D11Query;                               // Typedef as CCryDXGLQuery
-struct ID3D11Predicate;
-struct ID3D11Counter;
-struct ID3D11ClassInstance;
-struct ID3D11ClassLinkage;
-struct ID3D11CommandList;
-//struct ID3D11DeviceContext;               // Typedef as CCryDXGLDeviceContext
-//struct ID3D11Device;                          // Typedef as CCryDXGLDevice
-
-
-#endif // __DXGL_D3D11_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3D11Shader.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3D11Shader.h
deleted file mode 100644
index 346621440f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3D11Shader.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3D11Shader.h in the DirectX SDK
-
-#ifndef __DXGL_D3D11Shader_h__
-#define __DXGL_D3D11Shader_h__
-
-#include "DXGL_D3DCommon.h"
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct _D3D11_SIGNATURE_PARAMETER_DESC
-{
-    LPCSTR                      SemanticName;   // Name of the semantic
-    UINT                        SemanticIndex;  // Index of the semantic
-    UINT                        Register;       // Number of member variables
-    D3D_NAME                    SystemValueType;// A predefined system value, or D3D_NAME_UNDEFINED if not applicable
-    D3D_REGISTER_COMPONENT_TYPE ComponentType;// Scalar type (e.g. uint, float, etc.)
-    BYTE                        Mask;           // Mask to indicate which components of the register
-                                                // are used (combination of D3D10_COMPONENT_MASK values)
-    BYTE                        ReadWriteMask;  // Mask to indicate whether a given component is
-                                                // never written (if this is an output signature) or
-                                                // always read (if this is an input signature).
-                                                // (combination of D3D10_COMPONENT_MASK values)
-    UINT Stream;                                // Stream index
-    D3D_MIN_PRECISION           MinPrecision;   // Minimum desired interpolation precision
-} D3D11_SIGNATURE_PARAMETER_DESC;
-
-typedef struct _D3D11_SHADER_BUFFER_DESC
-{
-    LPCSTR                  Name;           // Name of the constant buffer
-    D3D_CBUFFER_TYPE        Type;           // Indicates type of buffer content
-    UINT                    Variables;      // Number of member variables
-    UINT                    Size;           // Size of CB (in bytes)
-    UINT                    uFlags;         // Buffer description flags
-} D3D11_SHADER_BUFFER_DESC;
-
-typedef struct _D3D11_SHADER_VARIABLE_DESC
-{
-    LPCSTR                  Name;           // Name of the variable
-    UINT                    StartOffset;    // Offset in constant buffer's backing store
-    UINT                    Size;           // Size of variable (in bytes)
-    UINT                    uFlags;         // Variable flags
-    LPVOID                  DefaultValue;   // Raw pointer to default value
-    UINT                    StartTexture;   // First texture index (or -1 if no textures used)
-    UINT                    TextureSize;    // Number of texture slots possibly used.
-    UINT                    StartSampler;   // First sampler index (or -1 if no textures used)
-    UINT                    SamplerSize;    // Number of sampler slots possibly used.
-} D3D11_SHADER_VARIABLE_DESC;
-
-typedef struct _D3D11_SHADER_TYPE_DESC
-{
-    D3D_SHADER_VARIABLE_CLASS   Class;          // Variable class (e.g. object, matrix, etc.)
-    D3D_SHADER_VARIABLE_TYPE    Type;           // Variable type (e.g. float, sampler, etc.)
-    UINT                        Rows;           // Number of rows (for matrices, 1 for other numeric, 0 if not applicable)
-    UINT                        Columns;        // Number of columns (for vectors & matrices, 1 for other numeric, 0 if not applicable)
-    UINT                        Elements;       // Number of elements (0 if not an array)
-    UINT                        Members;        // Number of members (0 if not a structure)
-    UINT                        Offset;         // Offset from the start of structure (0 if not a structure member)
-    LPCSTR                      Name;           // Name of type, can be NULL
-} D3D11_SHADER_TYPE_DESC;
-
-typedef struct _D3D11_SHADER_DESC
-{
-    UINT                    Version;                     // Shader version
-    LPCSTR                  Creator;                     // Creator string
-    UINT                    Flags;                       // Shader compilation/parse flags
-
-    UINT                    ConstantBuffers;             // Number of constant buffers
-    UINT                    BoundResources;              // Number of bound resources
-    UINT                    InputParameters;             // Number of parameters in the input signature
-    UINT                    OutputParameters;            // Number of parameters in the output signature
-
-    UINT                    InstructionCount;            // Number of emitted instructions
-    UINT                    TempRegisterCount;           // Number of temporary registers used
-    UINT                    TempArrayCount;              // Number of temporary arrays used
-    UINT                    DefCount;                    // Number of constant defines
-    UINT                    DclCount;                    // Number of declarations (input + output)
-    UINT                    TextureNormalInstructions;   // Number of non-categorized texture instructions
-    UINT                    TextureLoadInstructions;     // Number of texture load instructions
-    UINT                    TextureCompInstructions;     // Number of texture comparison instructions
-    UINT                    TextureBiasInstructions;     // Number of texture bias instructions
-    UINT                    TextureGradientInstructions; // Number of texture gradient instructions
-    UINT                    FloatInstructionCount;       // Number of floating point arithmetic instructions used
-    UINT                    IntInstructionCount;         // Number of signed integer arithmetic instructions used
-    UINT                    UintInstructionCount;        // Number of unsigned integer arithmetic instructions used
-    UINT                    StaticFlowControlCount;      // Number of static flow control instructions used
-    UINT                    DynamicFlowControlCount;     // Number of dynamic flow control instructions used
-    UINT                    MacroInstructionCount;       // Number of macro instructions used
-    UINT                    ArrayInstructionCount;       // Number of array instructions used
-    UINT                    CutInstructionCount;         // Number of cut instructions used
-    UINT                    EmitInstructionCount;        // Number of emit instructions used
-    D3D_PRIMITIVE_TOPOLOGY   GSOutputTopology;           // Geometry shader output topology
-    UINT                    GSMaxOutputVertexCount;      // Geometry shader maximum output vertex count
-    D3D_PRIMITIVE           InputPrimitive;              // GS/HS input primitive
-    UINT                    PatchConstantParameters;     // Number of parameters in the patch constant signature
-    UINT                    cGSInstanceCount;            // Number of Geometry shader instances
-    UINT                    cControlPoints;              // Number of control points in the HS->DS stage
-    D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive;  // Primitive output by the tessellator
-    D3D_TESSELLATOR_PARTITIONING HSPartitioning;         // Partitioning mode of the tessellator
-    D3D_TESSELLATOR_DOMAIN  TessellatorDomain;           // Domain of the tessellator (quad, tri, isoline)
-    // instruction counts
-    UINT cBarrierInstructions;                           // Number of barrier instructions in a compute shader
-    UINT cInterlockedInstructions;                       // Number of interlocked instructions
-    UINT cTextureStoreInstructions;                      // Number of texture writes
-} D3D11_SHADER_DESC;
-
-typedef struct _D3D11_SHADER_INPUT_BIND_DESC
-{
-    LPCSTR                      Name;           // Name of the resource
-    D3D_SHADER_INPUT_TYPE       Type;           // Type of resource (e.g. texture, cbuffer, etc.)
-    UINT                        BindPoint;      // Starting bind point
-    UINT                        BindCount;      // Number of contiguous bind points (for arrays)
-
-    UINT                        uFlags;         // Input binding flags
-    D3D_RESOURCE_RETURN_TYPE    ReturnType;     // Return type (if texture)
-    D3D_SRV_DIMENSION           Dimension;      // Dimension (if texture)
-    UINT                        NumSamples;     // Number of samples (0 if not MS texture)
-} D3D11_SHADER_INPUT_BIND_DESC;
-
-
-#endif //__DXGL_D3D11Shader_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DCommon.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DCommon.h
deleted file mode 100644
index 5f5c9d629d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DCommon.h
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in DXGL_D3DCommon.h in the DirectX SDK
-
-#ifndef __DXGL_D3DCommon_h__
-#define __DXGL_D3DCommon_h__
-
-typedef
-    enum D3D_DRIVER_TYPE
-{
-    D3D_DRIVER_TYPE_UNKNOWN = 0,
-    D3D_DRIVER_TYPE_HARDWARE    = (D3D_DRIVER_TYPE_UNKNOWN + 1),
-    D3D_DRIVER_TYPE_REFERENCE   = (D3D_DRIVER_TYPE_HARDWARE + 1),
-    D3D_DRIVER_TYPE_NULL    = (D3D_DRIVER_TYPE_REFERENCE + 1),
-    D3D_DRIVER_TYPE_SOFTWARE    = (D3D_DRIVER_TYPE_NULL + 1),
-    D3D_DRIVER_TYPE_WARP    = (D3D_DRIVER_TYPE_SOFTWARE + 1)
-}   D3D_DRIVER_TYPE;
-
-typedef
-    enum D3D_FEATURE_LEVEL
-{
-    D3D_FEATURE_LEVEL_9_1   = 0x9100,
-    D3D_FEATURE_LEVEL_9_2   = 0x9200,
-    D3D_FEATURE_LEVEL_9_3   = 0x9300,
-    D3D_FEATURE_LEVEL_10_0  = 0xa000,
-    D3D_FEATURE_LEVEL_10_1  = 0xa100,
-    D3D_FEATURE_LEVEL_11_0  = 0xb000,
-    D3D_FEATURE_LEVEL_11_1  = 0xb100
-}   D3D_FEATURE_LEVEL;
-
-typedef
-    enum D3D_PRIMITIVE_TOPOLOGY
-{
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED    = 0,
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST    = 1,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP    = 3,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP    = 5,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ    = 11,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ    = 13,
-    D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST    = 33,
-    D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST    = 34,
-    D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST    = 35,
-    D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST    = 36,
-    D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST    = 37,
-    D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST    = 38,
-    D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST    = 39,
-    D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST    = 40,
-    D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST    = 41,
-    D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST   = 42,
-    D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST   = 43,
-    D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST   = 44,
-    D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST   = 45,
-    D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST   = 46,
-    D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST   = 47,
-    D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST   = 48,
-    D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST   = 49,
-    D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST   = 50,
-    D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST   = 51,
-    D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST   = 52,
-    D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST   = 53,
-    D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST   = 54,
-    D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST   = 55,
-    D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST   = 56,
-    D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST   = 57,
-    D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST   = 58,
-    D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST   = 59,
-    D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST   = 60,
-    D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST   = 61,
-    D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST   = 62,
-    D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST   = 63,
-    D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST   = 64,
-    D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED  = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,
-    D3D10_PRIMITIVE_TOPOLOGY_POINTLIST  = D3D_PRIMITIVE_TOPOLOGY_POINTLIST,
-    D3D10_PRIMITIVE_TOPOLOGY_LINELIST   = D3D_PRIMITIVE_TOPOLOGY_LINELIST,
-    D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-    D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED  = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,
-    D3D11_PRIMITIVE_TOPOLOGY_POINTLIST  = D3D_PRIMITIVE_TOPOLOGY_POINTLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_LINELIST   = D3D_PRIMITIVE_TOPOLOGY_LINELIST,
-    D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-    D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST
-}   D3D_PRIMITIVE_TOPOLOGY;
-
-typedef
-    enum D3D_PRIMITIVE
-{
-    D3D_PRIMITIVE_UNDEFINED = 0,
-    D3D_PRIMITIVE_POINT = 1,
-    D3D_PRIMITIVE_LINE  = 2,
-    D3D_PRIMITIVE_TRIANGLE  = 3,
-    D3D_PRIMITIVE_LINE_ADJ  = 6,
-    D3D_PRIMITIVE_TRIANGLE_ADJ  = 7,
-    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH    = 17,
-    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH    = 18,
-    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH    = 19,
-    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH    = 20,
-    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH    = 21,
-    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH    = 22,
-    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH    = 23,
-    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH    = 24,
-    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH    = 25,
-    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH    = 26,
-    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH    = 28,
-    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH    = 29,
-    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH    = 30,
-    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH    = 31,
-    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH    = 32,
-    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH    = 33,
-    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH    = 34,
-    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH    = 35,
-    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH    = 36,
-    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH    = 37,
-    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH    = 38,
-    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH    = 39,
-    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH    = 40,
-    D3D10_PRIMITIVE_UNDEFINED   = D3D_PRIMITIVE_UNDEFINED,
-    D3D10_PRIMITIVE_POINT   = D3D_PRIMITIVE_POINT,
-    D3D10_PRIMITIVE_LINE    = D3D_PRIMITIVE_LINE,
-    D3D10_PRIMITIVE_TRIANGLE    = D3D_PRIMITIVE_TRIANGLE,
-    D3D10_PRIMITIVE_LINE_ADJ    = D3D_PRIMITIVE_LINE_ADJ,
-    D3D10_PRIMITIVE_TRIANGLE_ADJ    = D3D_PRIMITIVE_TRIANGLE_ADJ,
-    D3D11_PRIMITIVE_UNDEFINED   = D3D_PRIMITIVE_UNDEFINED,
-    D3D11_PRIMITIVE_POINT   = D3D_PRIMITIVE_POINT,
-    D3D11_PRIMITIVE_LINE    = D3D_PRIMITIVE_LINE,
-    D3D11_PRIMITIVE_TRIANGLE    = D3D_PRIMITIVE_TRIANGLE,
-    D3D11_PRIMITIVE_LINE_ADJ    = D3D_PRIMITIVE_LINE_ADJ,
-    D3D11_PRIMITIVE_TRIANGLE_ADJ    = D3D_PRIMITIVE_TRIANGLE_ADJ,
-    D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_1_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_2_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_3_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_4_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_5_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_6_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_7_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_8_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_9_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_10_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_11_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_12_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_13_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_14_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_15_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_16_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_17_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_18_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_19_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_20_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_21_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_22_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_23_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_24_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_25_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_26_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_27_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_28_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_29_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_30_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_31_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_32_CONTROL_POINT_PATCH
-}   D3D_PRIMITIVE;
-
-typedef
-    enum D3D_SRV_DIMENSION
-{
-    D3D_SRV_DIMENSION_UNKNOWN   = 0,
-    D3D_SRV_DIMENSION_BUFFER    = 1,
-    D3D_SRV_DIMENSION_TEXTURE1D = 2,
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY    = 3,
-    D3D_SRV_DIMENSION_TEXTURE2D = 4,
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY    = 5,
-    D3D_SRV_DIMENSION_TEXTURE2DMS   = 6,
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY  = 7,
-    D3D_SRV_DIMENSION_TEXTURE3D = 8,
-    D3D_SRV_DIMENSION_TEXTURECUBE   = 9,
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY  = 10,
-    D3D_SRV_DIMENSION_BUFFEREX  = 11,
-    D3D10_SRV_DIMENSION_UNKNOWN = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D10_SRV_DIMENSION_BUFFER  = D3D_SRV_DIMENSION_BUFFER,
-    D3D10_SRV_DIMENSION_TEXTURE1D   = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D10_SRV_DIMENSION_TEXTURE1DARRAY  = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2D   = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D10_SRV_DIMENSION_TEXTURE2DARRAY  = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2DMS = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY    = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE3D   = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D10_SRV_DIMENSION_TEXTURECUBE = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D10_1_SRV_DIMENSION_UNKNOWN   = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D10_1_SRV_DIMENSION_BUFFER    = D3D_SRV_DIMENSION_BUFFER,
-    D3D10_1_SRV_DIMENSION_TEXTURE1D = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY    = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE2D = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY    = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMS   = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY  = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE3D = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBE   = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY  = D3D_SRV_DIMENSION_TEXTURECUBEARRAY,
-    D3D11_SRV_DIMENSION_UNKNOWN = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D11_SRV_DIMENSION_BUFFER  = D3D_SRV_DIMENSION_BUFFER,
-    D3D11_SRV_DIMENSION_TEXTURE1D   = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D11_SRV_DIMENSION_TEXTURE1DARRAY  = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE2D   = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D11_SRV_DIMENSION_TEXTURE2DARRAY  = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE2DMS = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY    = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE3D   = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D11_SRV_DIMENSION_TEXTURECUBE = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D11_SRV_DIMENSION_TEXTURECUBEARRAY    = D3D_SRV_DIMENSION_TEXTURECUBEARRAY,
-    D3D11_SRV_DIMENSION_BUFFEREX    = D3D_SRV_DIMENSION_BUFFEREX
-}   D3D_SRV_DIMENSION;
-
-typedef
-    enum _D3D_INCLUDE_TYPE
-{
-    D3D_INCLUDE_LOCAL   = 0,
-    D3D_INCLUDE_SYSTEM  = (D3D_INCLUDE_LOCAL + 1),
-    D3D10_INCLUDE_LOCAL = D3D_INCLUDE_LOCAL,
-    D3D10_INCLUDE_SYSTEM    = D3D_INCLUDE_SYSTEM,
-    D3D_INCLUDE_FORCE_DWORD = 0x7fffffff
-}   D3D_INCLUDE_TYPE;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_CLASS
-{
-    D3D_SVC_SCALAR  = 0,
-    D3D_SVC_VECTOR  = (D3D_SVC_SCALAR + 1),
-    D3D_SVC_MATRIX_ROWS = (D3D_SVC_VECTOR + 1),
-    D3D_SVC_MATRIX_COLUMNS  = (D3D_SVC_MATRIX_ROWS + 1),
-    D3D_SVC_OBJECT  = (D3D_SVC_MATRIX_COLUMNS + 1),
-    D3D_SVC_STRUCT  = (D3D_SVC_OBJECT + 1),
-    D3D_SVC_INTERFACE_CLASS = (D3D_SVC_STRUCT + 1),
-    D3D_SVC_INTERFACE_POINTER   = (D3D_SVC_INTERFACE_CLASS + 1),
-    D3D10_SVC_SCALAR    = D3D_SVC_SCALAR,
-    D3D10_SVC_VECTOR    = D3D_SVC_VECTOR,
-    D3D10_SVC_MATRIX_ROWS   = D3D_SVC_MATRIX_ROWS,
-    D3D10_SVC_MATRIX_COLUMNS    = D3D_SVC_MATRIX_COLUMNS,
-    D3D10_SVC_OBJECT    = D3D_SVC_OBJECT,
-    D3D10_SVC_STRUCT    = D3D_SVC_STRUCT,
-    D3D11_SVC_INTERFACE_CLASS   = D3D_SVC_INTERFACE_CLASS,
-    D3D11_SVC_INTERFACE_POINTER = D3D_SVC_INTERFACE_POINTER,
-    D3D_SVC_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_CLASS;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_FLAGS
-{
-    D3D_SVF_USERPACKED  = 1,
-    D3D_SVF_USED    = 2,
-    D3D_SVF_INTERFACE_POINTER   = 4,
-    D3D_SVF_INTERFACE_PARAMETER = 8,
-    D3D10_SVF_USERPACKED    = D3D_SVF_USERPACKED,
-    D3D10_SVF_USED  = D3D_SVF_USED,
-    D3D11_SVF_INTERFACE_POINTER = D3D_SVF_INTERFACE_POINTER,
-    D3D11_SVF_INTERFACE_PARAMETER   = D3D_SVF_INTERFACE_PARAMETER,
-    D3D_SVF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_FLAGS;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_TYPE
-{
-    D3D_SVT_VOID    = 0,
-    D3D_SVT_BOOL    = 1,
-    D3D_SVT_INT = 2,
-    D3D_SVT_FLOAT   = 3,
-    D3D_SVT_STRING  = 4,
-    D3D_SVT_TEXTURE = 5,
-    D3D_SVT_TEXTURE1D   = 6,
-    D3D_SVT_TEXTURE2D   = 7,
-    D3D_SVT_TEXTURE3D   = 8,
-    D3D_SVT_TEXTURECUBE = 9,
-    D3D_SVT_SAMPLER = 10,
-    D3D_SVT_SAMPLER1D   = 11,
-    D3D_SVT_SAMPLER2D   = 12,
-    D3D_SVT_SAMPLER3D   = 13,
-    D3D_SVT_SAMPLERCUBE = 14,
-    D3D_SVT_PIXELSHADER = 15,
-    D3D_SVT_VERTEXSHADER    = 16,
-    D3D_SVT_PIXELFRAGMENT   = 17,
-    D3D_SVT_VERTEXFRAGMENT  = 18,
-    D3D_SVT_UINT    = 19,
-    D3D_SVT_UINT8   = 20,
-    D3D_SVT_GEOMETRYSHADER  = 21,
-    D3D_SVT_RASTERIZER  = 22,
-    D3D_SVT_DEPTHSTENCIL    = 23,
-    D3D_SVT_BLEND   = 24,
-    D3D_SVT_BUFFER  = 25,
-    D3D_SVT_CBUFFER = 26,
-    D3D_SVT_TBUFFER = 27,
-    D3D_SVT_TEXTURE1DARRAY  = 28,
-    D3D_SVT_TEXTURE2DARRAY  = 29,
-    D3D_SVT_RENDERTARGETVIEW    = 30,
-    D3D_SVT_DEPTHSTENCILVIEW    = 31,
-    D3D_SVT_TEXTURE2DMS = 32,
-    D3D_SVT_TEXTURE2DMSARRAY    = 33,
-    D3D_SVT_TEXTURECUBEARRAY    = 34,
-    D3D_SVT_HULLSHADER  = 35,
-    D3D_SVT_DOMAINSHADER    = 36,
-    D3D_SVT_INTERFACE_POINTER   = 37,
-    D3D_SVT_COMPUTESHADER   = 38,
-    D3D_SVT_DOUBLE  = 39,
-    D3D_SVT_RWTEXTURE1D = 40,
-    D3D_SVT_RWTEXTURE1DARRAY    = 41,
-    D3D_SVT_RWTEXTURE2D = 42,
-    D3D_SVT_RWTEXTURE2DARRAY    = 43,
-    D3D_SVT_RWTEXTURE3D = 44,
-    D3D_SVT_RWBUFFER    = 45,
-    D3D_SVT_BYTEADDRESS_BUFFER  = 46,
-    D3D_SVT_RWBYTEADDRESS_BUFFER    = 47,
-    D3D_SVT_STRUCTURED_BUFFER   = 48,
-    D3D_SVT_RWSTRUCTURED_BUFFER = 49,
-    D3D_SVT_APPEND_STRUCTURED_BUFFER    = 50,
-    D3D_SVT_CONSUME_STRUCTURED_BUFFER   = 51,
-    D3D10_SVT_VOID  = D3D_SVT_VOID,
-    D3D10_SVT_BOOL  = D3D_SVT_BOOL,
-    D3D10_SVT_INT   = D3D_SVT_INT,
-    D3D10_SVT_FLOAT = D3D_SVT_FLOAT,
-    D3D10_SVT_STRING    = D3D_SVT_STRING,
-    D3D10_SVT_TEXTURE   = D3D_SVT_TEXTURE,
-    D3D10_SVT_TEXTURE1D = D3D_SVT_TEXTURE1D,
-    D3D10_SVT_TEXTURE2D = D3D_SVT_TEXTURE2D,
-    D3D10_SVT_TEXTURE3D = D3D_SVT_TEXTURE3D,
-    D3D10_SVT_TEXTURECUBE   = D3D_SVT_TEXTURECUBE,
-    D3D10_SVT_SAMPLER   = D3D_SVT_SAMPLER,
-    D3D10_SVT_SAMPLER1D = D3D_SVT_SAMPLER1D,
-    D3D10_SVT_SAMPLER2D = D3D_SVT_SAMPLER2D,
-    D3D10_SVT_SAMPLER3D = D3D_SVT_SAMPLER3D,
-    D3D10_SVT_SAMPLERCUBE   = D3D_SVT_SAMPLERCUBE,
-    D3D10_SVT_PIXELSHADER   = D3D_SVT_PIXELSHADER,
-    D3D10_SVT_VERTEXSHADER  = D3D_SVT_VERTEXSHADER,
-    D3D10_SVT_PIXELFRAGMENT = D3D_SVT_PIXELFRAGMENT,
-    D3D10_SVT_VERTEXFRAGMENT    = D3D_SVT_VERTEXFRAGMENT,
-    D3D10_SVT_UINT  = D3D_SVT_UINT,
-    D3D10_SVT_UINT8 = D3D_SVT_UINT8,
-    D3D10_SVT_GEOMETRYSHADER    = D3D_SVT_GEOMETRYSHADER,
-    D3D10_SVT_RASTERIZER    = D3D_SVT_RASTERIZER,
-    D3D10_SVT_DEPTHSTENCIL  = D3D_SVT_DEPTHSTENCIL,
-    D3D10_SVT_BLEND = D3D_SVT_BLEND,
-    D3D10_SVT_BUFFER    = D3D_SVT_BUFFER,
-    D3D10_SVT_CBUFFER   = D3D_SVT_CBUFFER,
-    D3D10_SVT_TBUFFER   = D3D_SVT_TBUFFER,
-    D3D10_SVT_TEXTURE1DARRAY    = D3D_SVT_TEXTURE1DARRAY,
-    D3D10_SVT_TEXTURE2DARRAY    = D3D_SVT_TEXTURE2DARRAY,
-    D3D10_SVT_RENDERTARGETVIEW  = D3D_SVT_RENDERTARGETVIEW,
-    D3D10_SVT_DEPTHSTENCILVIEW  = D3D_SVT_DEPTHSTENCILVIEW,
-    D3D10_SVT_TEXTURE2DMS   = D3D_SVT_TEXTURE2DMS,
-    D3D10_SVT_TEXTURE2DMSARRAY  = D3D_SVT_TEXTURE2DMSARRAY,
-    D3D10_SVT_TEXTURECUBEARRAY  = D3D_SVT_TEXTURECUBEARRAY,
-    D3D11_SVT_HULLSHADER    = D3D_SVT_HULLSHADER,
-    D3D11_SVT_DOMAINSHADER  = D3D_SVT_DOMAINSHADER,
-    D3D11_SVT_INTERFACE_POINTER = D3D_SVT_INTERFACE_POINTER,
-    D3D11_SVT_COMPUTESHADER = D3D_SVT_COMPUTESHADER,
-    D3D11_SVT_DOUBLE    = D3D_SVT_DOUBLE,
-    D3D11_SVT_RWTEXTURE1D   = D3D_SVT_RWTEXTURE1D,
-    D3D11_SVT_RWTEXTURE1DARRAY  = D3D_SVT_RWTEXTURE1DARRAY,
-    D3D11_SVT_RWTEXTURE2D   = D3D_SVT_RWTEXTURE2D,
-    D3D11_SVT_RWTEXTURE2DARRAY  = D3D_SVT_RWTEXTURE2DARRAY,
-    D3D11_SVT_RWTEXTURE3D   = D3D_SVT_RWTEXTURE3D,
-    D3D11_SVT_RWBUFFER  = D3D_SVT_RWBUFFER,
-    D3D11_SVT_BYTEADDRESS_BUFFER    = D3D_SVT_BYTEADDRESS_BUFFER,
-    D3D11_SVT_RWBYTEADDRESS_BUFFER  = D3D_SVT_RWBYTEADDRESS_BUFFER,
-    D3D11_SVT_STRUCTURED_BUFFER = D3D_SVT_STRUCTURED_BUFFER,
-    D3D11_SVT_RWSTRUCTURED_BUFFER   = D3D_SVT_RWSTRUCTURED_BUFFER,
-    D3D11_SVT_APPEND_STRUCTURED_BUFFER  = D3D_SVT_APPEND_STRUCTURED_BUFFER,
-    D3D11_SVT_CONSUME_STRUCTURED_BUFFER = D3D_SVT_CONSUME_STRUCTURED_BUFFER,
-    D3D_SVT_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_TYPE;
-
-typedef
-    enum _D3D_SHADER_INPUT_FLAGS
-{
-    D3D_SIF_USERPACKED  = 1,
-    D3D_SIF_COMPARISON_SAMPLER  = 2,
-    D3D_SIF_TEXTURE_COMPONENT_0 = 4,
-    D3D_SIF_TEXTURE_COMPONENT_1 = 8,
-    D3D_SIF_TEXTURE_COMPONENTS  = 12,
-    D3D10_SIF_USERPACKED    = D3D_SIF_USERPACKED,
-    D3D10_SIF_COMPARISON_SAMPLER    = D3D_SIF_COMPARISON_SAMPLER,
-    D3D10_SIF_TEXTURE_COMPONENT_0   = D3D_SIF_TEXTURE_COMPONENT_0,
-    D3D10_SIF_TEXTURE_COMPONENT_1   = D3D_SIF_TEXTURE_COMPONENT_1,
-    D3D10_SIF_TEXTURE_COMPONENTS    = D3D_SIF_TEXTURE_COMPONENTS,
-    D3D_SIF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_INPUT_FLAGS;
-
-typedef
-    enum _D3D_SHADER_INPUT_TYPE
-{
-    D3D_SIT_CBUFFER = 0,
-    D3D_SIT_TBUFFER = (D3D_SIT_CBUFFER + 1),
-    D3D_SIT_TEXTURE = (D3D_SIT_TBUFFER + 1),
-    D3D_SIT_SAMPLER = (D3D_SIT_TEXTURE + 1),
-    D3D_SIT_UAV_RWTYPED = (D3D_SIT_SAMPLER + 1),
-    D3D_SIT_STRUCTURED  = (D3D_SIT_UAV_RWTYPED + 1),
-    D3D_SIT_UAV_RWSTRUCTURED    = (D3D_SIT_STRUCTURED + 1),
-    D3D_SIT_BYTEADDRESS = (D3D_SIT_UAV_RWSTRUCTURED + 1),
-    D3D_SIT_UAV_RWBYTEADDRESS   = (D3D_SIT_BYTEADDRESS + 1),
-    D3D_SIT_UAV_APPEND_STRUCTURED   = (D3D_SIT_UAV_RWBYTEADDRESS + 1),
-    D3D_SIT_UAV_CONSUME_STRUCTURED  = (D3D_SIT_UAV_APPEND_STRUCTURED + 1),
-    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER   = (D3D_SIT_UAV_CONSUME_STRUCTURED + 1),
-    D3D10_SIT_CBUFFER   = D3D_SIT_CBUFFER,
-    D3D10_SIT_TBUFFER   = D3D_SIT_TBUFFER,
-    D3D10_SIT_TEXTURE   = D3D_SIT_TEXTURE,
-    D3D10_SIT_SAMPLER   = D3D_SIT_SAMPLER,
-    D3D11_SIT_UAV_RWTYPED   = D3D_SIT_UAV_RWTYPED,
-    D3D11_SIT_STRUCTURED    = D3D_SIT_STRUCTURED,
-    D3D11_SIT_UAV_RWSTRUCTURED  = D3D_SIT_UAV_RWSTRUCTURED,
-    D3D11_SIT_BYTEADDRESS   = D3D_SIT_BYTEADDRESS,
-    D3D11_SIT_UAV_RWBYTEADDRESS = D3D_SIT_UAV_RWBYTEADDRESS,
-    D3D11_SIT_UAV_APPEND_STRUCTURED = D3D_SIT_UAV_APPEND_STRUCTURED,
-    D3D11_SIT_UAV_CONSUME_STRUCTURED    = D3D_SIT_UAV_CONSUME_STRUCTURED,
-    D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER = D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER
-}   D3D_SHADER_INPUT_TYPE;
-
-typedef
-    enum _D3D_SHADER_CBUFFER_FLAGS
-{
-    D3D_CBF_USERPACKED  = 1,
-    D3D10_CBF_USERPACKED    = D3D_CBF_USERPACKED,
-    D3D_CBF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_CBUFFER_FLAGS;
-
-typedef
-    enum _D3D_CBUFFER_TYPE
-{
-    D3D_CT_CBUFFER  = 0,
-    D3D_CT_TBUFFER  = (D3D_CT_CBUFFER + 1),
-    D3D_CT_INTERFACE_POINTERS   = (D3D_CT_TBUFFER + 1),
-    D3D_CT_RESOURCE_BIND_INFO   = (D3D_CT_INTERFACE_POINTERS + 1),
-    D3D10_CT_CBUFFER    = D3D_CT_CBUFFER,
-    D3D10_CT_TBUFFER    = D3D_CT_TBUFFER,
-    D3D11_CT_CBUFFER    = D3D_CT_CBUFFER,
-    D3D11_CT_TBUFFER    = D3D_CT_TBUFFER,
-    D3D11_CT_INTERFACE_POINTERS = D3D_CT_INTERFACE_POINTERS,
-    D3D11_CT_RESOURCE_BIND_INFO = D3D_CT_RESOURCE_BIND_INFO
-}   D3D_CBUFFER_TYPE;
-
-typedef
-    enum D3D_NAME
-{
-    D3D_NAME_UNDEFINED  = 0,
-    D3D_NAME_POSITION   = 1,
-    D3D_NAME_CLIP_DISTANCE  = 2,
-    D3D_NAME_CULL_DISTANCE  = 3,
-    D3D_NAME_RENDER_TARGET_ARRAY_INDEX  = 4,
-    D3D_NAME_VIEWPORT_ARRAY_INDEX   = 5,
-    D3D_NAME_VERTEX_ID  = 6,
-    D3D_NAME_PRIMITIVE_ID   = 7,
-    D3D_NAME_INSTANCE_ID    = 8,
-    D3D_NAME_IS_FRONT_FACE  = 9,
-    D3D_NAME_SAMPLE_INDEX   = 10,
-    D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR = 11,
-    D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR   = 12,
-    D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR  = 13,
-    D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR    = 14,
-    D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR   = 15,
-    D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR  = 16,
-    D3D_NAME_TARGET = 64,
-    D3D_NAME_DEPTH  = 65,
-    D3D_NAME_COVERAGE   = 66,
-    D3D_NAME_DEPTH_GREATER_EQUAL    = 67,
-    D3D_NAME_DEPTH_LESS_EQUAL   = 68,
-    D3D10_NAME_UNDEFINED    = D3D_NAME_UNDEFINED,
-    D3D10_NAME_POSITION = D3D_NAME_POSITION,
-    D3D10_NAME_CLIP_DISTANCE    = D3D_NAME_CLIP_DISTANCE,
-    D3D10_NAME_CULL_DISTANCE    = D3D_NAME_CULL_DISTANCE,
-    D3D10_NAME_RENDER_TARGET_ARRAY_INDEX    = D3D_NAME_RENDER_TARGET_ARRAY_INDEX,
-    D3D10_NAME_VIEWPORT_ARRAY_INDEX = D3D_NAME_VIEWPORT_ARRAY_INDEX,
-    D3D10_NAME_VERTEX_ID    = D3D_NAME_VERTEX_ID,
-    D3D10_NAME_PRIMITIVE_ID = D3D_NAME_PRIMITIVE_ID,
-    D3D10_NAME_INSTANCE_ID  = D3D_NAME_INSTANCE_ID,
-    D3D10_NAME_IS_FRONT_FACE    = D3D_NAME_IS_FRONT_FACE,
-    D3D10_NAME_SAMPLE_INDEX = D3D_NAME_SAMPLE_INDEX,
-    D3D10_NAME_TARGET   = D3D_NAME_TARGET,
-    D3D10_NAME_DEPTH    = D3D_NAME_DEPTH,
-    D3D10_NAME_COVERAGE = D3D_NAME_COVERAGE,
-    D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR   = D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR,
-    D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR = D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR,
-    D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR    = D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR,
-    D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR  = D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR,
-    D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR = D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR,
-    D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR    = D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR,
-    D3D11_NAME_DEPTH_GREATER_EQUAL  = D3D_NAME_DEPTH_GREATER_EQUAL,
-    D3D11_NAME_DEPTH_LESS_EQUAL = D3D_NAME_DEPTH_LESS_EQUAL
-}   D3D_NAME;
-
-typedef
-    enum D3D_RESOURCE_RETURN_TYPE
-{
-    D3D_RETURN_TYPE_UNORM   = 1,
-    D3D_RETURN_TYPE_SNORM   = 2,
-    D3D_RETURN_TYPE_SINT    = 3,
-    D3D_RETURN_TYPE_UINT    = 4,
-    D3D_RETURN_TYPE_FLOAT   = 5,
-    D3D_RETURN_TYPE_MIXED   = 6,
-    D3D_RETURN_TYPE_DOUBLE  = 7,
-    D3D_RETURN_TYPE_CONTINUED   = 8,
-    D3D10_RETURN_TYPE_UNORM = D3D_RETURN_TYPE_UNORM,
-    D3D10_RETURN_TYPE_SNORM = D3D_RETURN_TYPE_SNORM,
-    D3D10_RETURN_TYPE_SINT  = D3D_RETURN_TYPE_SINT,
-    D3D10_RETURN_TYPE_UINT  = D3D_RETURN_TYPE_UINT,
-    D3D10_RETURN_TYPE_FLOAT = D3D_RETURN_TYPE_FLOAT,
-    D3D10_RETURN_TYPE_MIXED = D3D_RETURN_TYPE_MIXED,
-    D3D11_RETURN_TYPE_UNORM = D3D_RETURN_TYPE_UNORM,
-    D3D11_RETURN_TYPE_SNORM = D3D_RETURN_TYPE_SNORM,
-    D3D11_RETURN_TYPE_SINT  = D3D_RETURN_TYPE_SINT,
-    D3D11_RETURN_TYPE_UINT  = D3D_RETURN_TYPE_UINT,
-    D3D11_RETURN_TYPE_FLOAT = D3D_RETURN_TYPE_FLOAT,
-    D3D11_RETURN_TYPE_MIXED = D3D_RETURN_TYPE_MIXED,
-    D3D11_RETURN_TYPE_DOUBLE    = D3D_RETURN_TYPE_DOUBLE,
-    D3D11_RETURN_TYPE_CONTINUED = D3D_RETURN_TYPE_CONTINUED
-}   D3D_RESOURCE_RETURN_TYPE;
-
-typedef
-    enum D3D_REGISTER_COMPONENT_TYPE
-{
-    D3D_REGISTER_COMPONENT_UNKNOWN  = 0,
-    D3D_REGISTER_COMPONENT_UINT32   = 1,
-    D3D_REGISTER_COMPONENT_SINT32   = 2,
-    D3D_REGISTER_COMPONENT_FLOAT32  = 3,
-    D3D10_REGISTER_COMPONENT_UNKNOWN    = D3D_REGISTER_COMPONENT_UNKNOWN,
-    D3D10_REGISTER_COMPONENT_UINT32 = D3D_REGISTER_COMPONENT_UINT32,
-    D3D10_REGISTER_COMPONENT_SINT32 = D3D_REGISTER_COMPONENT_SINT32,
-    D3D10_REGISTER_COMPONENT_FLOAT32    = D3D_REGISTER_COMPONENT_FLOAT32
-}   D3D_REGISTER_COMPONENT_TYPE;
-
-typedef
-    enum D3D_TESSELLATOR_DOMAIN
-{
-    D3D_TESSELLATOR_DOMAIN_UNDEFINED    = 0,
-    D3D_TESSELLATOR_DOMAIN_ISOLINE  = 1,
-    D3D_TESSELLATOR_DOMAIN_TRI  = 2,
-    D3D_TESSELLATOR_DOMAIN_QUAD = 3,
-    D3D11_TESSELLATOR_DOMAIN_UNDEFINED  = D3D_TESSELLATOR_DOMAIN_UNDEFINED,
-    D3D11_TESSELLATOR_DOMAIN_ISOLINE    = D3D_TESSELLATOR_DOMAIN_ISOLINE,
-    D3D11_TESSELLATOR_DOMAIN_TRI    = D3D_TESSELLATOR_DOMAIN_TRI,
-    D3D11_TESSELLATOR_DOMAIN_QUAD   = D3D_TESSELLATOR_DOMAIN_QUAD
-}   D3D_TESSELLATOR_DOMAIN;
-
-typedef
-    enum D3D_TESSELLATOR_PARTITIONING
-{
-    D3D_TESSELLATOR_PARTITIONING_UNDEFINED  = 0,
-    D3D_TESSELLATOR_PARTITIONING_INTEGER    = 1,
-    D3D_TESSELLATOR_PARTITIONING_POW2   = 2,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN    = 4,
-    D3D11_TESSELLATOR_PARTITIONING_UNDEFINED    = D3D_TESSELLATOR_PARTITIONING_UNDEFINED,
-    D3D11_TESSELLATOR_PARTITIONING_INTEGER  = D3D_TESSELLATOR_PARTITIONING_INTEGER,
-    D3D11_TESSELLATOR_PARTITIONING_POW2 = D3D_TESSELLATOR_PARTITIONING_POW2,
-    D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD   = D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD,
-    D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN  = D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN
-}   D3D_TESSELLATOR_PARTITIONING;
-
-typedef
-    enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE
-{
-    D3D_TESSELLATOR_OUTPUT_UNDEFINED    = 0,
-    D3D_TESSELLATOR_OUTPUT_POINT    = 1,
-    D3D_TESSELLATOR_OUTPUT_LINE = 2,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW  = 3,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4,
-    D3D11_TESSELLATOR_OUTPUT_UNDEFINED  = D3D_TESSELLATOR_OUTPUT_UNDEFINED,
-    D3D11_TESSELLATOR_OUTPUT_POINT  = D3D_TESSELLATOR_OUTPUT_POINT,
-    D3D11_TESSELLATOR_OUTPUT_LINE   = D3D_TESSELLATOR_OUTPUT_LINE,
-    D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW    = D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW,
-    D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW   = D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW
-}   D3D_TESSELLATOR_OUTPUT_PRIMITIVE;
-
-typedef
-    enum D3D_MIN_PRECISION
-{
-    D3D_MIN_PRECISION_DEFAULT   = 0,
-    D3D_MIN_PRECISION_FLOAT_16  = 1,
-    D3D_MIN_PRECISION_FLOAT_2_8 = 2,
-    D3D_MIN_PRECISION_RESERVED  = 3,
-    D3D_MIN_PRECISION_SINT_16   = 4,
-    D3D_MIN_PRECISION_UINT_16   = 5,
-    D3D_MIN_PRECISION_ANY_16    = 0xf0,
-    D3D_MIN_PRECISION_ANY_10    = 0xf1
-}   D3D_MIN_PRECISION;
-
-typedef struct _D3D_SHADER_MACRO
-{
-    LPCSTR Name;
-    LPCSTR Definition;
-}   D3D_SHADER_MACRO;
-
-typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO;
-
-struct ID3DInclude
-{
-    virtual HRESULT STDMETHODCALLTYPE Open(D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID* ppData, UINT* pBytes) = 0;
-    virtual HRESULT STDMETHODCALLTYPE Open(LPCVOID pData) = 0;
-};
-
-#endif //__DXGL_D3DCommon_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DCompiler.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DCompiler.h
deleted file mode 100644
index b12f1e997c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DCompiler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DCompiler.h in the DirectX SDK
-
-#ifndef __DXGL_D3D11Compiler_h__
-#define __DXGL_D3D11Compiler_h__
-
-#include "DXGL_D3D11Shader.h"
-
-#define D3DCOMPILE_DEBUG                          (1 << 0)
-#define D3DCOMPILE_SKIP_VALIDATION                (1 << 1)
-#define D3DCOMPILE_SKIP_OPTIMIZATION              (1 << 2)
-#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR          (1 << 3)
-#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR       (1 << 4)
-#define D3DCOMPILE_PARTIAL_PRECISION              (1 << 5)
-#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT       (1 << 6)
-#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT       (1 << 7)
-#define D3DCOMPILE_NO_PRESHADER                   (1 << 8)
-#define D3DCOMPILE_AVOID_FLOW_CONTROL             (1 << 9)
-#define D3DCOMPILE_PREFER_FLOW_CONTROL            (1 << 10)
-#define D3DCOMPILE_ENABLE_STRICTNESS              (1 << 11)
-#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY (1 << 12)
-#define D3DCOMPILE_IEEE_STRICTNESS                (1 << 13)
-#define D3DCOMPILE_OPTIMIZATION_LEVEL0            (1 << 14)
-#define D3DCOMPILE_OPTIMIZATION_LEVEL1            0
-#define D3DCOMPILE_OPTIMIZATION_LEVEL2            ((1 << 14) | (1 << 15))
-#define D3DCOMPILE_OPTIMIZATION_LEVEL3            (1 << 15)
-#define D3DCOMPILE_RESERVED16                     (1 << 16)
-#define D3DCOMPILE_RESERVED17                     (1 << 17)
-#define D3DCOMPILE_WARNINGS_ARE_ERRORS            (1 << 18)
-
-#endif //__DXGL_D3D11Compiler_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DX11.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DX11.h
deleted file mode 100644
index d54aa114f3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DX11.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DX11tex.h in the DirectX SDK
-
-#ifndef __DXGL_D3DX11_h__
-#define __DXGL_D3DX11_h__
-
-#include "DXGL_D3DX11tex.h"
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-struct ID3DX11ThreadPump;
-
-#endif //__DXGL_D3DX11_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DX11tex.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DX11tex.h
deleted file mode 100644
index aa408aa432..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_D3DX11tex.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DX11tex h in the DirectX SDK
-
-#ifndef __DXGL_D3DX11tex_h__
-#define __DXGL_D3DX11tex_h__
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef enum D3DX11_FILTER_FLAG
-{
-    D3DX11_FILTER_NONE            =   (1 << 0),
-    D3DX11_FILTER_POINT           =   (2 << 0),
-    D3DX11_FILTER_LINEAR          =   (3 << 0),
-    D3DX11_FILTER_TRIANGLE        =   (4 << 0),
-    D3DX11_FILTER_BOX             =   (5 << 0),
-
-    D3DX11_FILTER_MIRROR_U        =   (1 << 16),
-    D3DX11_FILTER_MIRROR_V        =   (2 << 16),
-    D3DX11_FILTER_MIRROR_W        =   (4 << 16),
-    D3DX11_FILTER_MIRROR          =   (7 << 16),
-
-    D3DX11_FILTER_DITHER          =   (1 << 19),
-    D3DX11_FILTER_DITHER_DIFFUSION =   (2 << 19),
-
-    D3DX11_FILTER_SRGB_IN         =   (1 << 21),
-    D3DX11_FILTER_SRGB_OUT        =   (2 << 21),
-    D3DX11_FILTER_SRGB            =   (3 << 21),
-} D3DX11_FILTER_FLAG;
-
-typedef enum D3DX11_NORMALMAP_FLAG
-{
-    D3DX11_NORMALMAP_MIRROR_U          =   (1 << 16),
-    D3DX11_NORMALMAP_MIRROR_V          =   (2 << 16),
-    D3DX11_NORMALMAP_MIRROR            =   (3 << 16),
-    D3DX11_NORMALMAP_INVERTSIGN        =   (8 << 16),
-    D3DX11_NORMALMAP_COMPUTE_OCCLUSION =   (16 << 16),
-} D3DX11_NORMALMAP_FLAG;
-
-typedef enum D3DX11_CHANNEL_FLAG
-{
-    D3DX11_CHANNEL_RED           =    (1 << 0),
-    D3DX11_CHANNEL_BLUE          =    (1 << 1),
-    D3DX11_CHANNEL_GREEN         =    (1 << 2),
-    D3DX11_CHANNEL_ALPHA         =    (1 << 3),
-    D3DX11_CHANNEL_LUMINANCE     =    (1 << 4),
-} D3DX11_CHANNEL_FLAG;
-
-typedef enum D3DX11_IMAGE_FILE_FORMAT
-{
-    D3DX11_IFF_BMP         = 0,
-    D3DX11_IFF_JPG         = 1,
-    D3DX11_IFF_PNG         = 3,
-    D3DX11_IFF_DDS         = 4,
-    D3DX11_IFF_TIFF       = 10,
-    D3DX11_IFF_GIF        = 11,
-    D3DX11_IFF_WMP        = 12,
-    D3DX11_IFF_FORCE_DWORD = 0x7fffffff
-} D3DX11_IMAGE_FILE_FORMAT;
-
-typedef enum D3DX11_SAVE_TEXTURE_FLAG
-{
-    D3DX11_STF_USEINPUTBLOB      = 0x0001,
-} D3DX11_SAVE_TEXTURE_FLAG;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct D3DX11_IMAGE_INFO
-{
-    UINT                        Width;
-    UINT                        Height;
-    UINT                        Depth;
-    UINT                        ArraySize;
-    UINT                        MipLevels;
-    UINT                        MiscFlags;
-    DXGI_FORMAT                 Format;
-    D3D11_RESOURCE_DIMENSION    ResourceDimension;
-    D3DX11_IMAGE_FILE_FORMAT    ImageFileFormat;
-} D3DX11_IMAGE_INFO;
-
-typedef struct D3DX11_IMAGE_LOAD_INFO
-{
-    UINT                       Width;
-    UINT                       Height;
-    UINT                       Depth;
-    UINT                       FirstMipLevel;
-    UINT                       MipLevels;
-    D3D11_USAGE                Usage;
-    UINT                       BindFlags;
-    UINT                       CpuAccessFlags;
-    UINT                       MiscFlags;
-    DXGI_FORMAT                Format;
-    UINT                       Filter;
-    UINT                       MipFilter;
-    D3DX11_IMAGE_INFO*         pSrcInfo;
-} D3DX11_IMAGE_LOAD_INFO;
-
-typedef struct _D3DX11_TEXTURE_LOAD_INFO
-{
-    D3D11_BOX* pSrcBox;
-    D3D11_BOX* pDstBox;
-    UINT            SrcFirstMip;
-    UINT            DstFirstMip;
-    UINT            NumMips;
-    UINT            SrcFirstElement;
-    UINT            DstFirstElement;
-    UINT            NumElements;
-    UINT            Filter;
-    UINT            MipFilter;
-} D3DX11_TEXTURE_LOAD_INFO;
-
-#endif //__DXGL_D3DX11tex_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_ID3D11Device.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_ID3D11Device.h
deleted file mode 100644
index ebd3fdc0b0..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_ID3D11Device.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the ID3D11Device interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_ID3D11Device_h__
-#define __DXGL_ID3D11Device_h__
-
-#include "../CCryDXGLBase.hpp"
-
-struct ID3D11DeviceContext;
-
-struct ID3D11Device
-    : CCryDXGLBase
-{
-    // ID3D11Device interface (adapted from DXSDK/include/D3D11.h)
-    virtual HRESULT STDMETHODCALLTYPE CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext) = 0;
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels) = 0;
-    virtual void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData) = 0;
-    virtual D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel(void) = 0;
-    virtual UINT STDMETHODCALLTYPE GetCreationFlags(void) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason(void) = 0;
-    virtual void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags) = 0;
-    virtual UINT STDMETHODCALLTYPE GetExceptionMode(void) = 0;
-
-    // IDXGIDevice interface (adapted from DXSDK/include/dxgi.h)
-    virtual HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority) {return E_NOTIMPL; }
-
-    // IDXGIDevice1 interface (adapted from DXSDK/include/dxgi.h)
-    virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(UINT MaxLatency) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(UINT* pMaxLatency) {return E_NOTIMPL; }
-};
-
-#if !defined(CRY_DXCAPTURE_ENABLED)
-typedef ID3D11Device IDXGIDevice;
-typedef ID3D11Device IDXGIDevice1;
-#endif // !defined(CRY_DXCAPTURE_ENABLED)
-
-
-#endif // __DXGL_ID3D11Device_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_ID3D11DeviceContext.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_ID3D11DeviceContext.h
deleted file mode 100644
index 4a54922b4a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_ID3D11DeviceContext.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Description : Contains a definition of the ID3D11DeviceContext interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_ID3D11DeviceContext_h__
-#define __DXGL_ID3D11DeviceContext_h__
-
-#include "../Device/CCryDXGLDeviceChild.hpp"
-
-struct ID3DDevice;
-
-struct ID3D11DeviceContext
-    : CCryDXGLDeviceChild
-{
-    // ID3D11DeviceContext interface (adapted from DXSDK/include/D3D11.h)
-    virtual void STDMETHODCALLTYPE VSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE PSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE PSSetShader(ID3D11PixelShader* pPixelShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE VSSetShader(ID3D11VertexShader* pVertexShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation) = 0;
-    virtual void STDMETHODCALLTYPE Draw(UINT VertexCount, UINT StartVertexLocation) = 0;
-    virtual HRESULT STDMETHODCALLTYPE Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource) = 0;
-    virtual void STDMETHODCALLTYPE Unmap(ID3D11Resource* pResource, UINT Subresource) = 0;
-    virtual void STDMETHODCALLTYPE PSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE IASetInputLayout(ID3D11InputLayout* pInputLayout) = 0;
-    virtual void STDMETHODCALLTYPE IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation) = 0;
-    virtual void STDMETHODCALLTYPE DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation) = 0;
-    virtual void STDMETHODCALLTYPE GSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE GSSetShader(ID3D11GeometryShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology) = 0;
-    virtual void STDMETHODCALLTYPE VSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE VSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE Begin(ID3D11Asynchronous* pAsync) = 0;
-    virtual void STDMETHODCALLTYPE End(ID3D11Asynchronous* pAsync) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags) = 0;
-    virtual void STDMETHODCALLTYPE SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue) = 0;
-    virtual void STDMETHODCALLTYPE GSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE GSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView) = 0;
-    virtual void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts) = 0;
-    virtual void STDMETHODCALLTYPE OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask) = 0;
-    virtual void STDMETHODCALLTYPE OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef) = 0;
-    virtual void STDMETHODCALLTYPE SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE DrawAuto(void) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ) = 0;
-    virtual void STDMETHODCALLTYPE DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE RSSetState(ID3D11RasterizerState* pRasterizerState) = 0;
-    virtual void STDMETHODCALLTYPE RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports) = 0;
-    virtual void STDMETHODCALLTYPE RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects) = 0;
-    virtual void STDMETHODCALLTYPE CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox) = 0;
-    virtual void STDMETHODCALLTYPE CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource) = 0;
-    virtual void STDMETHODCALLTYPE UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch) = 0;
-    virtual void STDMETHODCALLTYPE CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView) = 0;
-    virtual void STDMETHODCALLTYPE ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil) = 0;
-    virtual void STDMETHODCALLTYPE GenerateMips(ID3D11ShaderResourceView* pShaderResourceView) = 0;
-    virtual void STDMETHODCALLTYPE SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD) = 0;
-    virtual FLOAT STDMETHODCALLTYPE GetResourceMinLOD(ID3D11Resource* pResource) = 0;
-    virtual void STDMETHODCALLTYPE ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format) = 0;
-    virtual void STDMETHODCALLTYPE ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState) = 0;
-    virtual void STDMETHODCALLTYPE HSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE HSSetShader(ID3D11HullShader* pHullShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE HSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE HSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE DSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE DSSetShader(ID3D11DomainShader* pDomainShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE DSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE CSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts) = 0;
-    virtual void STDMETHODCALLTYPE CSSetShader(ID3D11ComputeShader* pComputeShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE CSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE CSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE VSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE PSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout) = 0;
-    virtual void STDMETHODCALLTYPE IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset) = 0;
-    virtual void STDMETHODCALLTYPE GSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology) = 0;
-    virtual void STDMETHODCALLTYPE VSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE VSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue) = 0;
-    virtual void STDMETHODCALLTYPE GSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE GSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView) = 0;
-    virtual void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews) = 0;
-    virtual void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState * *ppBlendState, FLOAT BlendFactor[ 4 ], UINT * pSampleMask) = 0;
-    virtual void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef) = 0;
-    virtual void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets) = 0;
-    virtual void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState) = 0;
-    virtual void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports) = 0;
-    virtual void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects) = 0;
-    virtual void STDMETHODCALLTYPE HSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE HSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE HSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE DSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE DSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE CSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews) = 0;
-    virtual void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE CSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE CSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE ClearState(void) = 0;
-    virtual void STDMETHODCALLTYPE Flush(void) = 0;
-    virtual D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType(void) = 0;
-    virtual UINT STDMETHODCALLTYPE GetContextFlags(void) = 0;
-    virtual HRESULT STDMETHODCALLTYPE FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList) = 0;
-};
-
-
-#endif // __DXGL_ID3D11DeviceContext_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_IDXGIFactory1.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_IDXGIFactory1.h
deleted file mode 100644
index 0c3ac3b43e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_IDXGIFactory1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the IDXGIFactory1 interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_IDXGIFactory1_h__
-#define __DXGL_IDXGIFactory1_h__
-
-#include "../DXGLGI/CCryDXGLGIObject.hpp"
-
-struct IDXGIFactory1
-    : CCryDXGLGIObject
-{
-    // IDXGIFactory interface
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter) = 0;
-
-    // IDXGIFactory1 interface
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter) = 0;
-    virtual BOOL STDMETHODCALLTYPE IsCurrent() = 0;
-};
-
-#endif // __DXGL_IDXGIFactory1_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_IDXGISwapChain.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_IDXGISwapChain.h
deleted file mode 100644
index 446cdcc9dc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_IDXGISwapChain.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the IDXGISwapChain interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_IDXGISwapChain_h__
-#define __DXGL_IDXGISwapChain_h__
-
-#include "../DXGLGI/CCryDXGLGIObject.hpp"
-
-struct IDXGISwapChain
-    : CCryDXGLGIObject
-{
-    // IDXGISwapChain interface
-    virtual HRESULT STDMETHODCALLTYPE Present(UINT SyncInterval, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetBuffer(UINT Buffer, REFIID riid, void** ppSurface) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetContainingOutput(IDXGIOutput** ppOutput) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount(UINT* pLastPresentCount) = 0;
-
-    // IDXGIDeviceSubObject interface
-    virtual HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) = 0;
-};
-
-#endif // __DXGL_IDXGISwapChain_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_dxgi.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_dxgi.h
deleted file mode 100644
index e40a520279..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_dxgi.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in DXGI.h in the DirectX SDK
-
-#ifndef __DXGL_DXGI_h__
-#define __DXGL_DXGI_h__
-
-#include "DXGL_dxgitype.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#define DXGI_MAX_SWAP_CHAIN_BUFFERS        (16)
-#define DXGI_PRESENT_TEST               0x00000001UL
-#define DXGI_PRESENT_DO_NOT_SEQUENCE    0x00000002UL
-#define DXGI_PRESENT_RESTART            0x00000004UL
-
-#define DXGI_USAGE_SHADER_INPUT             (1L << (0 + 4))
-#define DXGI_USAGE_RENDER_TARGET_OUTPUT     (1L << (1 + 4))
-#define DXGI_USAGE_BACK_BUFFER              (1L << (2 + 4))
-#define DXGI_USAGE_SHARED                   (1L << (3 + 4))
-#define DXGI_USAGE_READ_ONLY                (1L << (4 + 4))
-#define DXGI_USAGE_DISCARD_ON_PRESENT       (1L << (5 + 4))
-#define DXGI_USAGE_UNORDERED_ACCESS         (1L << (6 + 4))
-
-#define DXGI_ENUM_MODES_INTERLACED  (1UL)
-
-#define DXGI_ENUM_MODES_SCALING (2UL)
-
-#define DXGI_MWA_NO_WINDOW_CHANGES      (1 << 0)
-#define DXGI_MWA_NO_ALT_ENTER           (1 << 1)
-#define DXGI_MWA_NO_PRINT_SCREEN        (1 << 2)
-#define DXGI_MWA_VALID                  (0x7)
-
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef
-    enum DXGI_RESIDENCY
-{
-    DXGI_RESIDENCY_FULLY_RESIDENT   = 1,
-    DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY    = 2,
-    DXGI_RESIDENCY_EVICTED_TO_DISK  = 3
-}   DXGI_RESIDENCY;
-
-typedef
-    enum DXGI_SWAP_EFFECT
-{
-    DXGI_SWAP_EFFECT_DISCARD    = 0,
-    DXGI_SWAP_EFFECT_SEQUENTIAL = 1
-}   DXGI_SWAP_EFFECT;
-
-typedef
-    enum DXGI_SWAP_CHAIN_FLAG
-{
-    DXGI_SWAP_CHAIN_FLAG_NONPREROTATED  = 1,
-    DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH  = 2,
-    DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4
-}   DXGI_SWAP_CHAIN_FLAG;
-
-typedef
-    enum DXGI_ADAPTER_FLAG
-{
-    DXGI_ADAPTER_FLAG_NONE  = 0,
-    DXGI_ADAPTER_FLAG_REMOTE    = 1,
-    DXGI_ADAPTER_FLAG_FORCE_DWORD   = 0xffffffff
-}   DXGI_ADAPTER_FLAG;
-
-typedef UINT DXGI_USAGE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct DXGI_FRAME_STATISTICS
-{
-    UINT PresentCount;
-    UINT PresentRefreshCount;
-    UINT SyncRefreshCount;
-    LARGE_INTEGER SyncQPCTime;
-    LARGE_INTEGER SyncGPUTime;
-}   DXGI_FRAME_STATISTICS;
-
-typedef struct DXGI_MAPPED_RECT
-{
-    INT Pitch;
-    BYTE* pBits;
-}   DXGI_MAPPED_RECT;
-
-typedef struct DXGI_ADAPTER_DESC
-{
-    WCHAR Description[ 128 ];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-}   DXGI_ADAPTER_DESC;
-
-typedef struct DXGI_OUTPUT_DESC
-{
-    WCHAR DeviceName[ 32 ];
-    RECT DesktopCoordinates;
-    BOOL AttachedToDesktop;
-    DXGI_MODE_ROTATION Rotation;
-    HMONITOR Monitor;
-}   DXGI_OUTPUT_DESC;
-
-typedef struct DXGI_SHARED_RESOURCE
-{
-    HANDLE Handle;
-}   DXGI_SHARED_RESOURCE;
-
-typedef struct DXGI_SURFACE_DESC
-{
-    UINT Width;
-    UINT Height;
-    DXGI_FORMAT Format;
-    DXGI_SAMPLE_DESC SampleDesc;
-}   DXGI_SURFACE_DESC;
-
-typedef struct DXGI_SWAP_CHAIN_DESC
-{
-    DXGI_MODE_DESC BufferDesc;
-    DXGI_SAMPLE_DESC SampleDesc;
-    DXGI_USAGE BufferUsage;
-    UINT BufferCount;
-    HWND OutputWindow;
-    BOOL Windowed;
-    DXGI_SWAP_EFFECT SwapEffect;
-    UINT Flags;
-}   DXGI_SWAP_CHAIN_DESC;
-
-typedef struct DXGI_ADAPTER_DESC1
-{
-    WCHAR Description[ 128 ];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-    UINT Flags;
-}   DXGI_ADAPTER_DESC1;
-
-typedef struct DXGI_DISPLAY_COLOR_SPACE
-{
-    FLOAT PrimaryCoordinates[ 8 ][ 2 ];
-    FLOAT WhitePoints[ 16 ][ 2 ];
-}   DXGI_DISPLAY_COLOR_SPACE;
-
-
-typedef UINT DXGI_USAGE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-
-//struct IDXGIObject;                   // Typedef as CCryDXGLGIObject
-struct IDXGIDeviceSubObject;
-struct IDXGIResource;
-struct IDXGIKeyedMutex;
-struct IDXGISurface;
-struct IDXGISurface1;
-//struct IDXGIAdapter;              // Typedef as CCryDXGLGIAdapter
-//struct IDXGIOutput;                   // Typedef as CCryDXGLGIOutput
-//struct IDXGISwapChain;            // Typedef as CCryDXGLSwapChain
-//struct IDXGIFactory;              // Typedef as CCryDXGLGIFactory
-//struct IDXGIDevice;                   // Typedef as CCryDXGLDevice
-//struct IDXGIFactory1;             // Typedef as CCryDXGLGIFactory
-//struct IDXGIAdapter1;             // Typedef as CCryDXGLGIAdapter
-//struct IDXGIDevice1;              // Typedef as CCryDXGLDevice
-
-#endif //__DXGL_DXGI_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_dxgitype.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_dxgitype.h
deleted file mode 100644
index b04d6795cf..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/D3D11/DXMETAL_dxgitype.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-//  Description: Contains portable definition of structs and enums to match
-//               those in dxgitype.h in the DirectX SDK
-
-#ifndef __DXGL_dxgitype_h__
-#define __DXGL_dxgitype_h__
-
-#include <AzDXGIFormat.h>
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#define _FACDXGI    0x87a
-#define MAKE_DXGI_HRESULT(code) MAKE_HRESULT(1, _FACDXGI, code)
-#define MAKE_DXGI_STATUS(code)  MAKE_HRESULT(0, _FACDXGI, code)
-
-#define DXGI_STATUS_OCCLUDED                    MAKE_DXGI_STATUS(1)
-#define DXGI_STATUS_CLIPPED                     MAKE_DXGI_STATUS(2)
-#define DXGI_STATUS_NO_REDIRECTION              MAKE_DXGI_STATUS(4)
-#define DXGI_STATUS_NO_DESKTOP_ACCESS           MAKE_DXGI_STATUS(5)
-#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6)
-#define DXGI_STATUS_MODE_CHANGED                MAKE_DXGI_STATUS(7)
-#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS     MAKE_DXGI_STATUS(8)
-
-
-#define DXGI_ERROR_INVALID_CALL                 MAKE_DXGI_HRESULT(1)
-#define DXGI_ERROR_NOT_FOUND                    MAKE_DXGI_HRESULT(2)
-#define DXGI_ERROR_MORE_DATA                    MAKE_DXGI_HRESULT(3)
-#define DXGI_ERROR_UNSUPPORTED                  MAKE_DXGI_HRESULT(4)
-#define DXGI_ERROR_DEVICE_REMOVED               MAKE_DXGI_HRESULT(5)
-#define DXGI_ERROR_DEVICE_HUNG                  MAKE_DXGI_HRESULT(6)
-#define DXGI_ERROR_DEVICE_RESET                 MAKE_DXGI_HRESULT(7)
-#define DXGI_ERROR_WAS_STILL_DRAWING            MAKE_DXGI_HRESULT(10)
-#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT    MAKE_DXGI_HRESULT(11)
-#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)
-#define DXGI_ERROR_DRIVER_INTERNAL_ERROR        MAKE_DXGI_HRESULT(32)
-#define DXGI_ERROR_NONEXCLUSIVE                 MAKE_DXGI_HRESULT(33)
-#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE      MAKE_DXGI_HRESULT(34)
-#define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED   MAKE_DXGI_HRESULT(35)
-#define DXGI_ERROR_REMOTE_OUTOFMEMORY           MAKE_DXGI_HRESULT(36)
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct DXGI_RGB
-{
-    float Red;
-    float Green;
-    float Blue;
-} DXGI_RGB;
-
-typedef struct DXGI_GAMMA_CONTROL
-{
-    DXGI_RGB Scale;
-    DXGI_RGB Offset;
-    DXGI_RGB GammaCurve[ 1025 ];
-} DXGI_GAMMA_CONTROL;
-
-typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES
-{
-    BOOL ScaleAndOffsetSupported;
-    float MaxConvertedValue;
-    float MinConvertedValue;
-    UINT NumGammaControlPoints;
-    float ControlPointPositions[1025];
-} DXGI_GAMMA_CONTROL_CAPABILITIES;
-
-typedef struct DXGI_RATIONAL
-{
-    UINT Numerator;
-    UINT Denominator;
-} DXGI_RATIONAL;
-
-typedef enum DXGI_MODE_SCANLINE_ORDER
-{
-    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED        = 0,
-    DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE        = 1,
-    DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST  = 2,
-    DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST  = 3
-} DXGI_MODE_SCANLINE_ORDER;
-
-typedef enum DXGI_MODE_SCALING
-{
-    DXGI_MODE_SCALING_UNSPECIFIED   = 0,
-    DXGI_MODE_SCALING_CENTERED      = 1,
-    DXGI_MODE_SCALING_STRETCHED     = 2
-} DXGI_MODE_SCALING;
-
-typedef enum DXGI_MODE_ROTATION
-{
-    DXGI_MODE_ROTATION_UNSPECIFIED  = 0,
-    DXGI_MODE_ROTATION_IDENTITY     = 1,
-    DXGI_MODE_ROTATION_ROTATE90     = 2,
-    DXGI_MODE_ROTATION_ROTATE180    = 3,
-    DXGI_MODE_ROTATION_ROTATE270    = 4
-} DXGI_MODE_ROTATION;
-
-typedef struct DXGI_MODE_DESC
-{
-    UINT Width;
-    UINT Height;
-    DXGI_RATIONAL RefreshRate;
-    DXGI_FORMAT Format;
-    DXGI_MODE_SCANLINE_ORDER ScanlineOrdering;
-    DXGI_MODE_SCALING Scaling;
-} DXGI_MODE_DESC;
-
-typedef struct DXGI_SAMPLE_DESC
-{
-    UINT Count;
-    UINT Quality;
-} DXGI_SAMPLE_DESC;
-
-#endif // __DXGL_dxgitype_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALGuid.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALGuid.hpp
deleted file mode 100644
index 8370abc7c8..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALGuid.hpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-// Description : Contains the definition of a cross platform unique
-//               identifier for DXGL interfaces and names
-
-#ifndef __CRYDXGLGUID__
-#define __CRYDXGLGUID__
-
-#define DXGL_DEFINE_GUID(_NAME, _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7) \
-    const GUID _NAME =                                                                 \
-    {                                                                                  \
-        0x ## _D0,                                                                     \
-        0x ## _W0,                                                                     \
-        0x ## _W1,                                                                     \
-        {                                                                              \
-            0x ## _B0,                                                                 \
-            0x ## _B1,                                                                 \
-            0x ## _B2,                                                                 \
-            0x ## _B3,                                                                 \
-            0x ## _B4,                                                                 \
-            0x ## _B5,                                                                 \
-            0x ## _B6,                                                                 \
-            0x ## _B7                                                                  \
-        }                                                                              \
-    };
-
-#if defined(WIN32)
-
-#define DXGL_GUID_QUOTE(_STRING) #_STRING
-#define DXGL_GUID_STRING(_D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7) \
-    DXGL_GUID_QUOTE(_D0##-##_W0##-##_W1##-##_B0##_B1##-##_B2##_B3##_B4##_B5##_B6##_B7)
-#define DXGL_DEFINE_TYPE_GUID(_CLASS, _TYPE, _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7) \
-    _CLASS __declspec(uuid(DXGL_GUID_STRING(_D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7))) _TYPE;
-
-#else //defined(WIN32)
-# ifndef GUID_DEFINED
-# define GUID_DEFINED
-typedef struct _GUID
-{
-    uint32 Data1;
-    ushort Data2;
-    ushort Data3;
-    uchar Data4[8];
-} GUID;
-# endif
-
-# ifndef IID_DEFINED
-# define IID_DEFINED
-typedef GUID IID;
-# endif
-
-#ifndef _SYS_GUID_OPERATOR_EQ_
-#define _SYS_GUID_OPERATOR_EQ_
-inline bool operator==(const GUID& kLeft, const GUID& kRight)
-{
-    return memcmp(&kLeft, &kRight, sizeof(GUID)) == 0;
-}
-#endif
-
-# ifndef _REFGUID_DEFINED
-# define _REFGUID_DEFINED
-typedef const GUID& REFGUID;
-# endif
-# ifndef _REFIID_DEFINED
-# define _REFIID_DEFINED
-typedef const GUID& REFIID;
-# endif
-
-template <typename T>
-struct SCryDXGLTypeGuid{};
-
-#define DXGL_TYPE_GUID_NAME(_TYPE) gDXGLTypeGUID__ ## _TYPE
-#define DXGL_DEFINE_TYPE_GUID(_CLASS, _TYPE, _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7)        \
-    DXGL_DEFINE_GUID(DXGL_TYPE_GUID_NAME(_TYPE), _D0, _W0, _W1, _B0, _B1, _B2, _B3, _B4, _B5, _B6, _B7)    \
-    template <>                                                                                            \
-    struct SCryDXGLTypeGuid<_CLASS _TYPE>{ static const GUID& Get() { return DXGL_TYPE_GUID_NAME(_TYPE); } \
-    };
-
-#ifndef UUIDOF_DEFINED
-#define UUIDOF_DEFINED
-#define __uuidof(_TYPE) SCryDXGLTypeGuid<_TYPE>::Get()
-#endif
-
-#endif //!defined(WIN32)
-
-// Disable Uncrustify : *INDENT-OFF* because the missing 0x prefix messes it up
-#if DXGL_FULL_EMULATION
-
-DXGL_DEFINE_TYPE_GUID(struct, IUnknown,                             00000000, 0000, 0000, C0, 00, 00, 00, 00, 00, 00, 46)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D10Blob,                           8BA5FB08, 5195, 40e2, AC, 58, 0D, 98, 9C, 3A, 01, 02)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DeviceChild,                    1841E5C8, 16B0, 489B, BC, C8, 44, CF, B0, D5, DE, AE)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DepthStencilState,              03823EFB, 8D8F, 4E1C, 9A, A2, F6, 4B, B2, CB, FD, F1)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11BlendState,                     75B68FAA, 347D, 4159, 8F, 45, A0, 64, 0F, 01, CD, 9A)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11RasterizerState,                9BB4AB81, AB1A, 4D8F, B5, 06, FC, 04, 20, 0B, 6E, E7)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Resource,                       DC8E63F3, D12B, 4952, B4, 7B, 5E, 45, 02, 6A, 86, 2D)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Buffer,                         48570B85, D1EE, 4FCD, A2, 50, EB, 35, 07, 22, B0, 37)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Texture1D,                      F8FB5C27, C6B3, 4F75, A4, C8, 43, 9A, F2, EF, 56, 4C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Texture2D,                      6F15AAF2, D208, 4E89, 9A, B4, 48, 95, 35, D3, 4F, 9C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Texture3D,                      037E866E, F56D, 4357, A8, AF, 9D, AB, BE, 6E, 25, 0E)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11View,                           839D1216, BB2E, 412B, B7, F4, A9, DB, EB, E0, 8E, D1)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderResourceView,             B0E06FE0, 8192, 4E1A, B1, CA, 36, D7, 41, 47, 10, B2)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11RenderTargetView,               DFDBA067, 0B8D, 4865, 87, 5B, D7, B4, 51, 6C, C1, 64)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DepthStencilView,               9FDAC92A, 1876, 48C3, AF, AD, 25, B9, 4F, 84, A9, B6)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11UnorderedAccessView,            28ACF509, 7F5C, 48F6, 86, 11, F3, 16, 01, 0A, 63, 80)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11VertexShader,                   3B301D64, D678, 4289, 88, 97, 22, F8, 92, 8B, 72, F3)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11HullShader,                     8E5C6061, 628A, 4C8E, 82, 64, BB, E4, 5C, B3, D5, DD)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DomainShader,                   F582C508, 0F36, 490C, 99, 77, 31, EE, CE, 26, 8C, FA)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11GeometryShader,                 38325B96, EFFB, 4022, BA, 02, 2E, 79, 5B, 70, 27, 5C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11PixelShader,                    EA82E40D, 51DC, 4F33, 93, D4, DB, 7C, 91, 25, AE, 8C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ComputeShader,                  4F5B196E, C2BD, 495E, BD, 01, 1F, DE, D3, 8E, 49, 69)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11InputLayout,                    E4819DDC, 4CF0, 4025, BD, 26, 5D, E8, 2A, 3E, 07, B7)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11SamplerState,                   DA6FEA51, 564C, 4487, 98, 10, F0, D0, F9, B4, E3, A5)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Asynchronous,                   4B35D0CD, 1E15, 4258, 9C, 98, 1B, 13, 33, F6, DD, 3B)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Query,                          D6C00747, 87B7, 425E, B8, 4D, 44, D1, 08, 56, 0A, FD)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Predicate,                      9EB576DD, 9F77, 4D86, 81, AA, 8B, AB, 5F, E4, 90, E2)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Counter,                        6E8C49FB, A371, 4770, B4, 40, 29, 08, 60, 22, B7, 41)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ClassInstance,                  A6CD7FAA, B0B7, 4A2F, 94, 36, 86, 62, A6, 57, 97, CB)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ClassLinkage,                   DDF57CBA, 9543, 46E4, A1, 2B, F2, 07, A0, FE, 7F, ED)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11CommandList,                    A24BC4D1, 769E, 43F7, 80, 13, 98, FF, 56, 6C, 18, E2)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DeviceContext,                  C0BFA96C, E089, 44FB, 8E, AF, 26, F8, 79, 61, 90, DA)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Device,                         DB6F6DDB, AC77, 4E88, 82, 53, 81, 9D, F9, BB, F1, 40)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflection,               8D536CA1, 0CCA, 4956, A8, 37, 78, 69, 63, 75, 55, 84)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflectionType,           6E6FFA6A, 9BAE, 4613, A5, 1E, 91, 65, 2D, 50, 8C, 21)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflectionVariable,       51F23923, F3E5, 4BD1, 91, CB, 60, 61, 77, D8, DB, 4C)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11ShaderReflectionConstantBuffer, EB62D63D, 93DD, 4318, 8A, E8, C6, F8, 3A, D3, 71, B8)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11SwitchToRef,                    1EF337E3, 58E7, 4F83, A6, 92, DB, 22, 1F, 5E, D4, 7E)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIObject,                          AEC22FB8, 76F3, 4639, 9B, E0, 28, EB, 43, A6, 7A, 2E)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIDeviceSubObject,                 3D3E0379, F9DE, 4D58, BB, 6C, 18, D6, 29, 92, F1, A6)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIOutput,                          AE02EEDB, C735, 4690, 8D, 52, 5A, 8D, C2, 02, 13, AA)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIAdapter,                         2411E7E1, 12AC, 4CCF, BD, 14, 97, 98, E8, 53, 4D, C0)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIAdapter1,                        29038f61, 3839, 4626, 91, fd, 08, 68, 79, 01, 1a, 05)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIFactory,                         7b7166ec, 21c7, 44ae, b2, 1a, c9, ae, 32, 1a, e3, 69)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIFactory1,                        770AAE78, F26F, 4DBA, A8, 29, 25, 3C, 83, D1, B3, 87)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIDevice,                          54EC77FA, 1377, 44E6, 8C, 32, 88, FD, 5F, 44, C8, 4C)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGISwapChain,                       310d36a0, d2e7, 4c0a, aa, 04, 6a, 9d, 23, b8, 88, 6a)
-DXGL_DEFINE_GUID(WKPDID_D3DDebugObjectName, 429B8C22, 9188, 4B0C, 87, 42, AC, B0, BF, 85, C2, 00)
-
-#else
-
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLTexture1D,         637BD3A1, 3507, 4ECA, B0, 24, F4, 5E, 72, 1A, 93, CA)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLTexture2D,         810C3ECB, 11EA, 48C6, 92, EE, FE, 1F, 56, CC, A1, FB)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLTexture3D,         AD18E34A, 1879, 4329, 8A, 38, 47, 3E, 98, 92, 11, F6)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLBuffer,            2FC0ECFE, C29D, 468C, 96, B1, B4, 7E, A0, 02, 6B, AC)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLResource,          2B819A4A, B3DE, 4999, 93, DA, 03, 31, D7, 94, AE, 2E)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLView,              D2D7D83A, 77D1, 4112, A7, 80, 67, 98, 30, 70, 2F, 59)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLQuery,             EF4578BD, D215, 4EF8, 9B, C3, D5, AD, 83, DA, 77, EC)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLDebug,             AAEE26AF, 2E73, 478F, B6, 0C, 8B, 1D, 90, 4D, 5F, 4D)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLShaderReflection,  4B1CFC1E, 4E1E, 4954, A3, BB, E5, 17, 90, E3, 5F, A6)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLDevice,            36525D64, 2382, 4130, 81, 00, 78, DE, 5D, 43, 9F, 33)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLDeviceChild,       E61E0A3E, F6BD, 4998, B0, 1B, 9A, D8, F9, CA, 67, 30)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLSwitchToRef,       AD18E34A, 1879, 4329, 8A, 38, 47, 3E, 98, 92, 11, F6)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIFactory,         408D1CF0, 64A9, 4B2D, 99, 53, B0, D8, CD, CE, BA, AF)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIAdapter,         BA6BC4F4, 7419, 4CDA, A4, 76, 0C, 89, 35, 6B, 48, 6F)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIDevice,          ED665E26, B530, 432F, 83, 19, BB, 2D, 87, FA, 71, C2)
-DXGL_DEFINE_TYPE_GUID(class, CCryDXGLGIObject,          CB223673, 742A, 458F, 90, ED, AC, 1E, 25, 94, 83, 46)
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11Device,             2203D7E1, 1491, 4D0A, BA, E1, 28, F3, AD, 1A, 24, 56)
-DXGL_DEFINE_TYPE_GUID(struct, ID3D11DeviceContext,      649E1339, C585, 4F31, 8B, F6, E2, 6C, D4, 20, EA, 82)
-#endif //DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-#if defined(CRY_DXCAPTURE_ENABLED)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIDevice1,             F4E40FAC, 37F4, 43DA, 93, 0F, 13, 14, 51, D4, 3A, D2)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGISwapChain,           D8919204, 2ECB, 4685, A2, B4, 23, E0, 68, 0D, EC, 5E)
-DXGL_DEFINE_TYPE_GUID(struct, IDXGIFactory1,            00059F2F, 1E3F, 46A7, A4, 95, 67, 75, 8A, 6F, 55, A7)
-#endif //defined(CRY_DXCAPTURE_ENABLED)
-
-struct ID3D11ClassLinkage;
-struct ID3D11Counter;
-
-DXGL_DEFINE_GUID(WKPDID_D3DDebugObjectName, BD6C7F86, 6C13, 453C, 92, B9, 70, 31, B4, D1, 51, D5)
-
-#endif //DXGL_FULL_EMULATION
-// Enable Uncrustify : *INDENT-ON*
-
-#undef DXGL_DEFINE_GUID
-#undef DXGL_QUOTE
-
-#endif
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALLegacy.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALLegacy.hpp
deleted file mode 100644
index 9ca4872d16..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALLegacy.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums from
-//               Direct3D 9 still required by the Direct3D 11 renderer
-
-#ifndef __CRYMETALGLLEGACY__
-#define __CRYMETALGLLEGACY__
-
-#define D3D10_SHADER_DEBUG                              D3DCOMPILE_DEBUG
-#define D3D10_SHADER_SKIP_VALIDATION                    D3DCOMPILE_SKIP_VALIDATION
-#define D3D10_SHADER_SKIP_OPTIMIZATION                  D3DCOMPILE_SKIP_OPTIMIZATION
-#define D3D10_SHADER_PACK_MATRIX_ROW_MAJOR              D3DCOMPILE_PACK_MATRIX_ROW_MAJOR
-#define D3D10_SHADER_PACK_MATRIX_COLUMN_MAJOR           D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR
-#define D3D10_SHADER_PARTIAL_PRECISION                  D3DCOMPILE_PARTIAL_PRECISION
-#define D3D10_SHADER_FORCE_VS_SOFTWARE_NO_OPT           D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT
-#define D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT           D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT
-#define D3D10_SHADER_NO_PRESHADER                       D3DCOMPILE_NO_PRESHADER
-#define D3D10_SHADER_AVOID_FLOW_CONTROL                 D3DCOMPILE_AVOID_FLOW_CONTROL
-#define D3D10_SHADER_PREFER_FLOW_CONTROL                D3DCOMPILE_PREFER_FLOW_CONTROL
-#define D3D10_SHADER_ENABLE_STRICTNESS                  D3DCOMPILE_ENABLE_STRICTNESS
-#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY     D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY
-#define D3D10_SHADER_IEEE_STRICTNESS                    D3DCOMPILE_IEEE_STRICTNESS
-#define D3D10_SHADER_WARNINGS_ARE_ERRORS                D3DCOMPILE_WARNINGS_ARE_ERRORS
-
-#define D3DCOLOR_ARGB(a, r, g, b) ((D3DCOLOR)((((a) & 0xff) << 24) | (((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff)))
-#define D3DCOLOR_RGBA(r, g, b, a) D3DCOLOR_ARGB(a, r, g, b)
-#define D3DCOLOR_XRGB(r, g, b)   D3DCOLOR_ARGB(0xff, r, g, b)
-
-#define D3DSTREAMSOURCE_INDEXEDDATA  (1 << 30)
-#define D3DSTREAMSOURCE_INSTANCEDATA (2 << 30)
-
-typedef uint32 D3DCOLOR;
-
-typedef uint32 D3DFORMAT;
-
-typedef ID3D11Device ID3D10Device;
-typedef ID3D10Blob* LPD3D10BLOB;
-typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO;
-typedef D3D10_SHADER_MACRO* LPD3D10_SHADER_MACRO;
-typedef D3D_SHADER_MACRO D3D11_SHADER_MACRO;
-typedef D3D10_SHADER_MACRO* LPD3D11_SHADER_MACRO;
-
-typedef struct ID3DInclude ID3D10Include;
-typedef struct ID3DInclude* LPD3D10INCLUDE;
-
-#define IID_ID3D11ShaderReflection __uuidof(ID3D11ShaderReflection)
-
-typedef
-    enum D3D10_RESOURCE_DIMENSION
-{
-    D3D10_RESOURCE_DIMENSION_UNKNOWN    = 0,
-    D3D10_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D10_RESOURCE_DIMENSION_TEXTURE1D  = 2,
-    D3D10_RESOURCE_DIMENSION_TEXTURE2D  = 3,
-    D3D10_RESOURCE_DIMENSION_TEXTURE3D  = 4
-}   D3D10_RESOURCE_DIMENSION;
-
-
-#endif //__CRYMETALGLLEGACY__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALMisc.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALMisc.hpp
deleted file mode 100644
index b1e4717e9f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/CryDXMETALMisc.hpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Internal declarations of types and macros required by the
-//               DXGL library
-
-#ifndef __CRYMETALGLMISC__
-#define __CRYMETALGLMISC__
-
-#if defined(WIN32)
-#include <windows.h>
-#include <objbase.h>
-#include <mmsyscom.h>
-#endif //defined(WIN32)
-
-#if defined(DO_RENDERLOG) || defined(CRY_DXCAPTURE_ENABLED) || !defined(_RELEASE)
-#define DXGL_VIRTUAL_DEVICE_AND_CONTEXT 1
-#else
-#define DXGL_VIRTUAL_DEVICE_AND_CONTEXT 0
-#endif
-
-#include "CryDXMETALGuid.hpp"
-
-#if !defined(_MSC_VER)
-#define __in
-#define __in_opt
-#define __out
-#define __out_opt
-#define __inout
-#define __inout_opt
-#define __out_ecount_opt(X)
-#define __stdcall
-#define __noop ((void)0)
-#define STDMETHODCALLTYPE
-#define __in_range(Start, Count)
-#define __in_ecount(Count)
-#define __out_ecount(Count)
-#define __in_ecount_opt(Count)
-#define __in_bcount_opt(Count)
-#define __out_bcount(Count)
-#define __out_bcount_opt(Count)
-#define __in_xcount_opt(Count)
-#define __RPC__deref_out
-#define _In_
-#define _In_opt_
-#define _Out_
-#define _Out_opt_
-#define _Inout_
-#define _Inout_opt_
-#endif  // !defined(_MSC_VER)
-
-#if !defined(WIN32)
-
-#ifdef NO_ILINE
-    #define FORCEINLINE inline
-#else
-    #define FORCEINLINE __attribute__((always_inline)) inline
-#endif
-
-#define SEVERITY_SUCCESS    0
-#define SEVERITY_ERROR      1
-
-#undef SUCCEEDED
-#define SUCCEEDED(x) ((x) >= 0)
-#undef FAILED
-#define FAILED(x) (!(SUCCEEDED(x)))
-
-#define MAKE_HRESULT(sev, fac, code) \
-    ((HRESULT) (((unsigned long)(sev) << 31) | ((unsigned long)(fac) << 16) | ((unsigned long)(code))))
-
-#define S_OK                         0
-#define S_FALSE                      1
-
-#define CCHDEVICENAME 32
-
-#define CONST const
-#define VOID void
-#define THIS void
-#define THIS_
-#if !defined(TRUE) || !defined(FALSE)
-#undef TRUE
-#undef FALSE
-#define TRUE true
-#define FALSE false
-#endif //!defined(TRUE) || !defined(FALSE)
-
-#define STDMETHOD(method)        virtual HRESULT STDMETHODCALLTYPE method
-#define STDMETHOD_(type, method)  virtual type STDMETHODCALLTYPE method
-#define STDMETHODV(method)       virtual HRESULT STDMETHODVCALLTYPE method
-#define STDMETHODV_(type, method) virtual type STDMETHODVCALLTYPE method
-
-#if defined(UNICODE)
-#define TEXT(_STRING) L ## _STRING
-#else
-#define TEXT(_STRING) _STRING
-#endif
-
-typedef char CHAR;
-typedef int32 INT;
-typedef unsigned char UCHAR;
-typedef uint8 UINT8;
-typedef uint32 UINT32;
-typedef uint32 UINT;
-typedef const void* LPCVOID;
-
-typedef uint32 HMONITOR;
-typedef void* HINSTANCE;
-
-typedef struct _LUID
-{
-    uint32 LowPart;
-    long HighPart;
-} LUID, * PLUID;
-
-typedef RECT* LPRECT;
-typedef const RECT* LPCRECT;
-
-#ifndef HRESULT_VALUES_DEFINED
-#define HRESULT_VALUES_DEFINED
-enum
-{
-    E_OUTOFMEMORY  = 0x8007000E,
-    E_FAIL         = 0x80004005,
-    E_ABORT        = 0x80004004,
-    E_INVALIDARG   = 0x80070057,
-    E_NOINTERFACE  = 0x80004002,
-    E_NOTIMPL      = 0x80004001,
-    E_UNEXPECTED   = 0x8000FFFF
-};
-#endif
-
-#else
-
-// Required as long as WIN32 builds allow compilation through a separate DLL (CryD3DCompilerStub) to distinguish between ID3D11Blob and CCryDXGLBlob
-#define DXGL_BLOB_INTEROPERABILITY
-
-typedef RECT D3D11_RECT;
-
-#endif  // !defined(WIN32)
-
-#if defined(_MSC_VER)
-    #define DXGL_EXPORT __declspec(dllexport)
-    #define DXGL_IMPORT __declspec(dllimport)
-#elif defined(__GNUC__)
-    #define DXGL_EXPORT __attribute__ ((visibility("default")))
-    #define DXGL_IMPORT __attribute__ ((visibility("default")))
-#else
-    #define DXGL_EXPORT
-    #define DXGL_IMPORT
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of typedef interfaces
-////////////////////////////////////////////////////////////////////////////
-
-#if !DXGL_FULL_EMULATION
-
-typedef class CCryDXGLResource ID3D11Resource;
-typedef class CCryDXGLBuffer ID3D11Buffer;
-typedef class CCryDXGLTexture1D ID3D11Texture1D;
-typedef class CCryDXGLTexture2D ID3D11Texture2D;
-typedef class CCryDXGLTexture3D ID3D11Texture3D;
-typedef class CCryDXGLView ID3D11View;
-typedef class CCryDXGLRenderTargetView ID3D11RenderTargetView;
-typedef class CCryDXGLDepthStencilView ID3D11DepthStencilView;
-typedef class CCryDXGLShaderResourceView ID3D11ShaderResourceView;
-typedef class CCryDXGLUnorderedAccessView ID3D11UnorderedAccessView;
-typedef class CCryDXGLInputLayout ID3D11InputLayout;
-typedef class CCryDXGLVertexShader ID3D11VertexShader;
-typedef class CCryDXGLHullShader ID3D11HullShader;
-typedef class CCryDXGLDomainShader ID3D11DomainShader;
-typedef class CCryDXGLGeometryShader ID3D11GeometryShader;
-typedef class CCryDXGLPixelShader ID3D11PixelShader;
-typedef class CCryDXGLComputeShader ID3D11ComputeShader;
-typedef class CCryDXGLSamplerState ID3D11SamplerState;
-typedef class CCryDXGLQuery ID3D11Asynchronous;
-typedef class CCryDXGLQuery ID3D11Predicate;
-typedef class CCryDXGLQuery ID3D11Query;
-typedef class CCryDXGLGIOutput IDXGIOutput;
-#if !defined(CRY_DXCAPTURE_ENABLED)
-typedef class CCryDXGLSwapChain IDXGISwapChain;
-typedef class CCryDXGLGIFactory IDXGIFactory;
-typedef class CCryDXGLGIFactory IDXGIFactory1;
-#endif //!defined(CRY_DXCAPTURE_ENABLED)
-typedef class CCryDXGLGIObject IDXGIObject;
-typedef class CCryDXGLGIAdapter IDXGIAdapter;
-typedef class CCryDXGLGIAdapter IDXGIAdapter1;
-typedef class CCryDXGLDeviceChild ID3D11DeviceChild;
-typedef class CCryDXGLSwitchToRef ID3D11SwitchToRef;
-typedef class CCryDXGLShaderReflection ID3D11ShaderReflection;
-typedef class CCryDXGLShaderReflectionVariable ID3D11ShaderReflectionVariable;
-typedef class CCryDXGLShaderReflectionVariable ID3D11ShaderReflectionType;
-typedef class CCryDXGLShaderReflectionConstBuffer ID3D11ShaderReflectionConstantBuffer;
-typedef class CCryDXGLShaderReflection ID3D11ShaderReflection;
-typedef class CCryDXGLBlendState ID3D11BlendState;
-typedef class CCryDXGLDepthStencilState ID3D11DepthStencilState;
-typedef class CCryDXGLRasterizerState ID3D11RasterizerState;
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-#else
-typedef class CCryDXGLDevice ID3D11Device;
-typedef class CCryDXGLDevice IDXGIDevice;
-typedef class CCryDXGLDeviceContext ID3D11DeviceContext;
-#endif
-
-#endif //!DXGL_FULL_EMULATION
-
-#if defined (DXGL_BLOB_INTEROPERABILITY) || DXGL_FULL_EMULATION
-typedef struct ID3D10Blob ID3DBlob;
-#else
-typedef class CCryDXGLBlob ID3D10Blob;
-typedef class CCryDXGLBlob ID3DBlob;
-#endif
-
-#include "ICryDXMETALUnknown.hpp"
-#include "DXMETAL_D3D11.h"
-#include "DXMETAL_D3DX11.h"
-#include "DXMETAL_D3DCompiler.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Helper functions
-////////////////////////////////////////////////////////////////////////////
-
-inline UINT D3D11CalcSubresource(UINT MipSlice, UINT ArraySlice, UINT MipLevels)
-{
-    return MipSlice + ArraySlice * MipLevels;
-}
-
-
-#include "CryDXMETALLegacy.hpp"
-
-#endif //__CRYMETALGLMISC__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3D11.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3D11.h
deleted file mode 100644
index d2386f8d9b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3D11.h
+++ /dev/null
@@ -1,1960 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description : Contains portable definition of structs and enums to match
-//                those in D3D11.h in the DirectX SDK
-
-#ifndef __DXGL_D3D11_h__
-#define __DXGL_D3D11_h__
-
-#include "DXMETAL_dxgi.h"
-#include "DXMETAL_D3DCommon.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef _D3D11_CONSTANTS
-#define _D3D11_CONSTANTS
-#define D3D11_16BIT_INDEX_STRIP_CUT_VALUE   (0xffff)
-
-#define D3D11_32BIT_INDEX_STRIP_CUT_VALUE   (0xffffffff)
-
-#define D3D11_8BIT_INDEX_STRIP_CUT_VALUE    (0xff)
-
-#define D3D11_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT    (9)
-
-#define D3D11_CLIP_OR_CULL_DISTANCE_COUNT   (8)
-
-#define D3D11_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT   (2)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT   (14)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS   (4)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT    (15)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS  (4)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT   (15)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST  (1)
-
-#define D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS  (1)
-
-#define D3D11_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT    (64)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS    (4)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST    (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS    (1)
-
-#define D3D11_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT    (128)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS   (1)
-
-#define D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT    (128)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT   (16)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS  (1)
-
-#define D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT   (16)
-
-#define D3D11_COMMONSHADER_SUBROUTINE_NESTING_LIMIT (32)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENTS (4)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_COUNT  (4096)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_READS_PER_INST (3)
-
-#define D3D11_COMMONSHADER_TEMP_REGISTER_READ_PORTS (3)
-
-#define D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX (10)
-
-#define D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN (-10)
-
-#define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE    (-8)
-
-#define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE    (7)
-
-#define D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (256)
-
-#define D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP (64)
-
-#define D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (240)
-
-#define D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP (68)
-
-#define D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (224)
-
-#define D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP (72)
-
-#define D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (208)
-
-#define D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP (76)
-
-#define D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (192)
-
-#define D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP (84)
-
-#define D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (176)
-
-#define D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP (92)
-
-#define D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (160)
-
-#define D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP (100)
-
-#define D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (144)
-
-#define D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP (112)
-
-#define D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (128)
-
-#define D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP (128)
-
-#define D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (112)
-
-#define D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP (144)
-
-#define D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (96)
-
-#define D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP (168)
-
-#define D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (80)
-
-#define D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP (204)
-
-#define D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (64)
-
-#define D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP (256)
-
-#define D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (48)
-
-#define D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP (340)
-
-#define D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (32)
-
-#define D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP (512)
-
-#define D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD    (16)
-
-#define D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP (768)
-
-#define D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION  (1)
-
-#define D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT (256)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP (768)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_X (768)
-
-#define D3D11_CS_4_X_THREAD_GROUP_MAX_Y (768)
-
-#define D3D11_CS_4_X_UAV_REGISTER_COUNT (1)
-
-#define D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION   (65535)
-
-#define D3D11_CS_TGSM_REGISTER_COUNT    (8192)
-
-#define D3D11_CS_TGSM_REGISTER_READS_PER_INST   (1)
-
-#define D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS  (1)
-
-#define D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS  (1)
-
-#define D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_X (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_Y (1024)
-
-#define D3D11_CS_THREAD_GROUP_MAX_Z (64)
-
-#define D3D11_CS_THREAD_GROUP_MIN_X (1)
-
-#define D3D11_CS_THREAD_GROUP_MIN_Y (1)
-
-#define D3D11_CS_THREAD_GROUP_MIN_Z (1)
-
-#define D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL    (16384)
-
-#define D3D11_DEFAULT_BLEND_FACTOR_ALPHA    (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_BLUE (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_GREEN    (1.0f)
-#define D3D11_DEFAULT_BLEND_FACTOR_RED  (1.0f)
-#define D3D11_DEFAULT_BORDER_COLOR_COMPONENT    (0.0f)
-#define D3D11_DEFAULT_DEPTH_BIAS    (0)
-
-#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP  (0.0f)
-#define D3D11_DEFAULT_MAX_ANISOTROPY    (16)
-#define D3D11_DEFAULT_MIP_LOD_BIAS  (0.0f)
-#define D3D11_DEFAULT_RENDER_TARGET_ARRAY_INDEX (0)
-
-#define D3D11_DEFAULT_SAMPLE_MASK   (0xffffffff)
-
-#define D3D11_DEFAULT_SCISSOR_ENDX  (0)
-
-#define D3D11_DEFAULT_SCISSOR_ENDY  (0)
-
-#define D3D11_DEFAULT_SCISSOR_STARTX    (0)
-
-#define D3D11_DEFAULT_SCISSOR_STARTY    (0)
-
-#define D3D11_DEFAULT_SLOPE_SCALED_DEPTH_BIAS   (0.0f)
-#define D3D11_DEFAULT_STENCIL_READ_MASK (0xff)
-
-#define D3D11_DEFAULT_STENCIL_REFERENCE (0)
-
-#define D3D11_DEFAULT_STENCIL_WRITE_MASK    (0xff)
-
-#define D3D11_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX    (0)
-
-#define D3D11_DEFAULT_VIEWPORT_HEIGHT   (0)
-
-#define D3D11_DEFAULT_VIEWPORT_MAX_DEPTH    (0.0f)
-#define D3D11_DEFAULT_VIEWPORT_MIN_DEPTH    (0.0f)
-#define D3D11_DEFAULT_VIEWPORT_TOPLEFTX (0)
-
-#define D3D11_DEFAULT_VIEWPORT_TOPLEFTY (0)
-
-#define D3D11_DEFAULT_VIEWPORT_WIDTH    (0)
-
-#define D3D11_DS_INPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS (3968)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENTS    (4)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COUNT (32)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READS_PER_INST    (2)
-
-#define D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READ_PORTS    (1)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENTS (3)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COUNT  (1)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READS_PER_INST (2)
-
-#define D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READ_PORTS (1)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENTS   (4)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COUNT    (32)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST   (2)
-
-#define D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READ_PORTS   (1)
-
-#define D3D11_DS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_DS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_DS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_FLOAT16_FUSED_TOLERANCE_IN_ULP    (0.6)
-#define D3D11_FLOAT32_MAX   (3.402823466e+38f)
-#define D3D11_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP   (0.6f)
-#define D3D11_FLOAT_TO_SRGB_EXPONENT_DENOMINATOR    (2.4f)
-#define D3D11_FLOAT_TO_SRGB_EXPONENT_NUMERATOR  (1.0f)
-#define D3D11_FLOAT_TO_SRGB_OFFSET  (0.055f)
-#define D3D11_FLOAT_TO_SRGB_SCALE_1 (12.92f)
-#define D3D11_FLOAT_TO_SRGB_SCALE_2 (1.055f)
-#define D3D11_FLOAT_TO_SRGB_THRESHOLD   (0.0031308f)
-#define D3D11_FTOI_INSTRUCTION_MAX_INPUT    (2147483647.999f)
-#define D3D11_FTOI_INSTRUCTION_MIN_INPUT    (-2147483648.999f)
-#define D3D11_FTOU_INSTRUCTION_MAX_INPUT    (4294967295.999f)
-#define D3D11_FTOU_INSTRUCTION_MIN_INPUT    (0.0f)
-#define D3D11_GS_INPUT_INSTANCE_ID_READS_PER_INST   (2)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_READ_PORTS   (1)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENTS  (1)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COUNT   (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENTS   (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_COUNT    (1)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_READS_PER_INST   (2)
-
-#define D3D11_GS_INPUT_PRIM_CONST_REGISTER_READ_PORTS   (1)
-
-#define D3D11_GS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_GS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_GS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_GS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_GS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_GS_INPUT_REGISTER_VERTICES    (32)
-
-#define D3D11_GS_MAX_INSTANCE_COUNT (32)
-
-#define D3D11_GS_MAX_OUTPUT_VERTEX_COUNT_ACROSS_INSTANCES   (1024)
-
-#define D3D11_GS_OUTPUT_ELEMENTS    (32)
-
-#define D3D11_GS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_GS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_GS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_HS_CONTROL_POINT_PHASE_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_HS_CONTROL_POINT_PHASE_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_HS_CONTROL_POINT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND  (0xffffffff)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT  (1)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST (2)
-
-#define D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS (1)
-
-#define D3D11_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND  (0xffffffff)
-
-#define D3D11_HS_MAXTESSFACTOR_LOWER_BOUND  (1.0f)
-#define D3D11_HS_MAXTESSFACTOR_UPPER_BOUND  (64.0f)
-#define D3D11_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS    (3968)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENTS    (1)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COUNT (1)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READS_PER_INST    (2)
-
-#define D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READ_PORTS    (1)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COUNT   (32)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_IA_DEFAULT_INDEX_BUFFER_OFFSET_IN_BYTES   (0)
-
-#define D3D11_IA_DEFAULT_PRIMITIVE_TOPOLOGY (0)
-
-#define D3D11_IA_DEFAULT_VERTEX_BUFFER_OFFSET_IN_BYTES  (0)
-
-#define D3D11_IA_INDEX_INPUT_RESOURCE_SLOT_COUNT    (1)
-
-#define D3D11_IA_INSTANCE_ID_BIT_COUNT  (32)
-
-#define D3D11_IA_INTEGER_ARITHMETIC_BIT_COUNT   (32)
-
-#define D3D11_IA_PATCH_MAX_CONTROL_POINT_COUNT  (32)
-
-#define D3D11_IA_PRIMITIVE_ID_BIT_COUNT (32)
-
-#define D3D11_IA_VERTEX_ID_BIT_COUNT    (32)
-
-#define D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT   (32)
-
-#define D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS (128)
-
-#define D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT   (32)
-
-#define D3D11_INTEGER_DIVIDE_BY_ZERO_QUOTIENT   (0xffffffff)
-
-#define D3D11_INTEGER_DIVIDE_BY_ZERO_REMAINDER  (0xffffffff)
-
-#define D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL (0xffffffff)
-
-#define D3D11_KEEP_UNORDERED_ACCESS_VIEWS   (0xffffffff)
-
-#define D3D11_LINEAR_GAMMA  (1.0f)
-#define D3D11_MAJOR_VERSION (11)
-
-#define D3D11_MAX_BORDER_COLOR_COMPONENT    (1.0f)
-#define D3D11_MAX_DEPTH (1.0f)
-#define D3D11_MAX_MAXANISOTROPY (16)
-
-#define D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT  (32)
-
-#define D3D11_MAX_POSITION_VALUE    (3.402823466e+34f)
-#define D3D11_MAX_TEXTURE_DIMENSION_2_TO_EXP    (17)
-
-#define D3D11_MINOR_VERSION (0)
-
-#define D3D11_MIN_BORDER_COLOR_COMPONENT    (0.0f)
-#define D3D11_MIN_DEPTH (0.0f)
-#define D3D11_MIN_MAXANISOTROPY (0)
-
-#define D3D11_MIP_LOD_BIAS_MAX  (15.99f)
-#define D3D11_MIP_LOD_BIAS_MIN  (-16.0f)
-#define D3D11_MIP_LOD_FRACTIONAL_BIT_COUNT  (8)
-
-#define D3D11_MIP_LOD_RANGE_BIT_COUNT   (8)
-
-#define D3D11_MULTISAMPLE_ANTIALIAS_LINE_WIDTH  (1.4f)
-#define D3D11_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT    (0)
-
-#define D3D11_PIXEL_ADDRESS_RANGE_BIT_COUNT (15)
-
-#define D3D11_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT (16)
-
-#define D3D11_PS_CS_UAV_REGISTER_COMPONENTS (1)
-
-#define D3D11_PS_CS_UAV_REGISTER_COUNT  (8)
-
-#define D3D11_PS_CS_UAV_REGISTER_READS_PER_INST (1)
-
-#define D3D11_PS_CS_UAV_REGISTER_READ_PORTS (1)
-
-#define D3D11_PS_FRONTFACING_DEFAULT_VALUE  (0xffffffff)
-
-#define D3D11_PS_FRONTFACING_FALSE_VALUE    (0)
-
-#define D3D11_PS_FRONTFACING_TRUE_VALUE (0xffffffff)
-
-#define D3D11_PS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_PS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_PS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_PS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT   (0.0f)
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS   (1)
-
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_PS_OUTPUT_DEPTH_REGISTER_COUNT    (1)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENTS    (1)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT   (32)
-
-#define D3D11_PS_OUTPUT_MASK_REGISTER_COUNT (1)
-
-#define D3D11_PS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_PS_OUTPUT_REGISTER_COUNT  (8)
-
-#define D3D11_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT  (0.5f)
-#define D3D11_RAW_UAV_SRV_BYTE_ALIGNMENT    (16)
-
-#define D3D11_REQ_BLEND_OBJECT_COUNT_PER_DEVICE (4096)
-
-#define D3D11_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP  (27)
-
-#define D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT (4096)
-
-#define D3D11_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE (4096)
-
-#define D3D11_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP  (32)
-
-#define D3D11_REQ_DRAW_VERTEX_COUNT_2_TO_EXP    (32)
-
-#define D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION   (16384)
-
-#define D3D11_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT    (1024)
-
-#define D3D11_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT   (4096)
-
-#define D3D11_REQ_MAXANISOTROPY (16)
-
-#define D3D11_REQ_MIP_LEVELS    (15)
-
-#define D3D11_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES (2048)
-
-#define D3D11_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE    (4096)
-
-#define D3D11_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH (16384)
-
-#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM  (128)
-
-#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM  (0.25f)
-#define D3D11_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP   (20)
-
-#define D3D11_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE   (4096)
-
-#define D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION    (2048)
-
-#define D3D11_REQ_TEXTURE1D_U_DIMENSION (16384)
-
-#define D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION    (2048)
-
-#define D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION    (16384)
-
-#define D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION  (2048)
-
-#define D3D11_REQ_TEXTURECUBE_DIMENSION (16384)
-
-#define D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL  (0)
-
-#define D3D11_SHADER_MAJOR_VERSION  (5)
-
-#define D3D11_SHADER_MAX_INSTANCES  (65535)
-
-#define D3D11_SHADER_MAX_INTERFACES (253)
-
-#define D3D11_SHADER_MAX_INTERFACE_CALL_SITES   (4096)
-
-#define D3D11_SHADER_MAX_TYPES  (65535)
-
-#define D3D11_SHADER_MINOR_VERSION  (0)
-
-#define D3D11_SHIFT_INSTRUCTION_PAD_VALUE   (0)
-
-#define D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT   (5)
-
-#define D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT  (8)
-
-#define D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES (2048)
-
-#define D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES   (512)
-
-#define D3D11_SO_BUFFER_SLOT_COUNT  (4)
-
-#define D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP    (0xffffffff)
-
-#define D3D11_SO_NO_RASTERIZED_STREAM   (0xffffffff)
-
-#define D3D11_SO_OUTPUT_COMPONENT_COUNT (128)
-
-#define D3D11_SO_STREAM_COUNT   (4)
-
-#define D3D11_SPEC_DATE_DAY (04)
-
-#define D3D11_SPEC_DATE_MONTH   (06)
-
-#define D3D11_SPEC_DATE_YEAR    (2009)
-
-#define D3D11_SPEC_VERSION  (1.0)
-#define D3D11_SRGB_GAMMA    (2.2f)
-#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_1   (12.92f)
-#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_2   (1.055f)
-#define D3D11_SRGB_TO_FLOAT_EXPONENT    (2.4f)
-#define D3D11_SRGB_TO_FLOAT_OFFSET  (0.055f)
-#define D3D11_SRGB_TO_FLOAT_THRESHOLD   (0.04045f)
-#define D3D11_SRGB_TO_FLOAT_TOLERANCE_IN_ULP    (0.5f)
-#define D3D11_STANDARD_COMPONENT_BIT_COUNT  (32)
-
-#define D3D11_STANDARD_COMPONENT_BIT_COUNT_DOUBLED  (64)
-
-#define D3D11_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE  (4)
-
-#define D3D11_STANDARD_PIXEL_COMPONENT_COUNT    (128)
-
-#define D3D11_STANDARD_PIXEL_ELEMENT_COUNT  (32)
-
-#define D3D11_STANDARD_VECTOR_SIZE  (4)
-
-#define D3D11_STANDARD_VERTEX_ELEMENT_COUNT (32)
-
-#define D3D11_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT (64)
-
-#define D3D11_SUBPIXEL_FRACTIONAL_BIT_COUNT (8)
-
-#define D3D11_SUBTEXEL_FRACTIONAL_BIT_COUNT (8)
-
-#define D3D11_TESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR  (64)
-
-#define D3D11_TESSELLATOR_MAX_ISOLINE_DENSITY_TESSELLATION_FACTOR   (64)
-
-#define D3D11_TESSELLATOR_MAX_ODD_TESSELLATION_FACTOR   (63)
-
-#define D3D11_TESSELLATOR_MAX_TESSELLATION_FACTOR   (64)
-
-#define D3D11_TESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR  (2)
-
-#define D3D11_TESSELLATOR_MIN_ISOLINE_DENSITY_TESSELLATION_FACTOR   (1)
-
-#define D3D11_TESSELLATOR_MIN_ODD_TESSELLATION_FACTOR   (1)
-
-#define D3D11_TEXEL_ADDRESS_RANGE_BIT_COUNT (16)
-
-#define D3D11_UNBOUND_MEMORY_ACCESS_RESULT  (0)
-
-#define D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX    (15)
-
-#define D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE    (16)
-
-#define D3D11_VIEWPORT_BOUNDS_MAX   (32767)
-
-#define D3D11_VIEWPORT_BOUNDS_MIN   (-32768)
-
-#define D3D11_VS_INPUT_REGISTER_COMPONENTS  (4)
-
-#define D3D11_VS_INPUT_REGISTER_COMPONENT_BIT_COUNT (32)
-
-#define D3D11_VS_INPUT_REGISTER_COUNT   (32)
-
-#define D3D11_VS_INPUT_REGISTER_READS_PER_INST  (2)
-
-#define D3D11_VS_INPUT_REGISTER_READ_PORTS  (1)
-
-#define D3D11_VS_OUTPUT_REGISTER_COMPONENTS (4)
-
-#define D3D11_VS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT    (32)
-
-#define D3D11_VS_OUTPUT_REGISTER_COUNT  (32)
-
-#define D3D11_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT (10)
-
-#define D3D11_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP (25)
-
-#define D3D11_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP   (25)
-
-#endif
-
-#ifndef _D3D11_1_CONSTANTS
-#define _D3D11_1_CONSTANTS
-#define D3D11_1_UAV_SLOT_COUNT  (64)
-
-#endif
-
-#define D3D11_SDK_VERSION   (7)
-
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef
-    enum D3D11_INPUT_CLASSIFICATION
-{
-    D3D11_INPUT_PER_VERTEX_DATA = 0,
-    D3D11_INPUT_PER_INSTANCE_DATA   = 1
-}   D3D11_INPUT_CLASSIFICATION;
-
-typedef
-    enum D3D11_FILL_MODE
-{
-    D3D11_FILL_WIREFRAME    = 2,
-    D3D11_FILL_SOLID    = 3
-}   D3D11_FILL_MODE;
-
-typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY;
-
-typedef D3D_PRIMITIVE D3D11_PRIMITIVE;
-
-typedef
-    enum D3D11_CULL_MODE
-{
-    D3D11_CULL_NONE = 1,
-    D3D11_CULL_FRONT    = 2,
-    D3D11_CULL_BACK = 3
-}   D3D11_CULL_MODE;
-
-typedef
-    enum D3D11_RESOURCE_DIMENSION
-{
-    D3D11_RESOURCE_DIMENSION_UNKNOWN    = 0,
-    D3D11_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D11_RESOURCE_DIMENSION_TEXTURE1D  = 2,
-    D3D11_RESOURCE_DIMENSION_TEXTURE2D  = 3,
-    D3D11_RESOURCE_DIMENSION_TEXTURE3D  = 4
-}   D3D11_RESOURCE_DIMENSION;
-
-typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION;
-
-typedef
-    enum D3D11_DSV_DIMENSION
-{
-    D3D11_DSV_DIMENSION_UNKNOWN = 0,
-    D3D11_DSV_DIMENSION_TEXTURE1D   = 1,
-    D3D11_DSV_DIMENSION_TEXTURE1DARRAY  = 2,
-    D3D11_DSV_DIMENSION_TEXTURE2D   = 3,
-    D3D11_DSV_DIMENSION_TEXTURE2DARRAY  = 4,
-    D3D11_DSV_DIMENSION_TEXTURE2DMS = 5,
-    D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY    = 6
-}   D3D11_DSV_DIMENSION;
-
-typedef
-    enum D3D11_RTV_DIMENSION
-{
-    D3D11_RTV_DIMENSION_UNKNOWN = 0,
-    D3D11_RTV_DIMENSION_BUFFER  = 1,
-    D3D11_RTV_DIMENSION_TEXTURE1D   = 2,
-    D3D11_RTV_DIMENSION_TEXTURE1DARRAY  = 3,
-    D3D11_RTV_DIMENSION_TEXTURE2D   = 4,
-    D3D11_RTV_DIMENSION_TEXTURE2DARRAY  = 5,
-    D3D11_RTV_DIMENSION_TEXTURE2DMS = 6,
-    D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY    = 7,
-    D3D11_RTV_DIMENSION_TEXTURE3D   = 8
-}   D3D11_RTV_DIMENSION;
-
-typedef
-    enum D3D11_UAV_DIMENSION
-{
-    D3D11_UAV_DIMENSION_UNKNOWN = 0,
-    D3D11_UAV_DIMENSION_BUFFER  = 1,
-    D3D11_UAV_DIMENSION_TEXTURE1D   = 2,
-    D3D11_UAV_DIMENSION_TEXTURE1DARRAY  = 3,
-    D3D11_UAV_DIMENSION_TEXTURE2D   = 4,
-    D3D11_UAV_DIMENSION_TEXTURE2DARRAY  = 5,
-    D3D11_UAV_DIMENSION_TEXTURE3D   = 8
-}   D3D11_UAV_DIMENSION;
-
-typedef
-    enum D3D11_USAGE
-{
-    D3D11_USAGE_DEFAULT = 0,
-    D3D11_USAGE_IMMUTABLE   = 1,
-    D3D11_USAGE_DYNAMIC = 2,
-    D3D11_USAGE_STAGING = 3,
-    D3D11_USAGE_TRANSIENT = 4,
-    D3D11_USAGE_DIRECT_ACCESS = 5
-}   D3D11_USAGE;
-
-typedef
-    enum D3D11_BIND_FLAG
-{
-    D3D11_BIND_VERTEX_BUFFER    = 0x1L,
-    D3D11_BIND_INDEX_BUFFER = 0x2L,
-    D3D11_BIND_CONSTANT_BUFFER  = 0x4L,
-    D3D11_BIND_SHADER_RESOURCE  = 0x8L,
-    D3D11_BIND_STREAM_OUTPUT    = 0x10L,
-    D3D11_BIND_RENDER_TARGET    = 0x20L,
-    D3D11_BIND_DEPTH_STENCIL    = 0x40L,
-    D3D11_BIND_UNORDERED_ACCESS = 0x80L,
-    D3D11_BIND_MEMORYLESS       = 0x100L
-}   D3D11_BIND_FLAG;
-
-typedef
-    enum D3D11_CPU_ACCESS_FLAG
-{
-    D3D11_CPU_ACCESS_WRITE  = 0x10000L,
-    D3D11_CPU_ACCESS_READ   = 0x20000L
-}   D3D11_CPU_ACCESS_FLAG;
-
-typedef
-    enum D3D11_RESOURCE_MISC_FLAG
-{
-    D3D11_RESOURCE_MISC_GENERATE_MIPS   = 0x1L,
-    D3D11_RESOURCE_MISC_SHARED  = 0x2L,
-    D3D11_RESOURCE_MISC_TEXTURECUBE = 0x4L,
-    D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS   = 0x10L,
-    D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS  = 0x20L,
-    D3D11_RESOURCE_MISC_BUFFER_STRUCTURED   = 0x40L,
-    D3D11_RESOURCE_MISC_RESOURCE_CLAMP  = 0x80L,
-    D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX   = 0x100L,
-    D3D11_RESOURCE_MISC_GDI_COMPATIBLE  = 0x200L,
-    D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY = 0x80000000L
-}   D3D11_RESOURCE_MISC_FLAG;
-
-typedef
-    enum D3D11_MAP
-{
-    D3D11_MAP_READ  = 1,
-    D3D11_MAP_WRITE = 2,
-    D3D11_MAP_READ_WRITE    = 3,
-    D3D11_MAP_WRITE_DISCARD = 4,
-    D3D11_MAP_WRITE_NO_OVERWRITE    = 5
-}   D3D11_MAP;
-
-typedef
-    enum D3D11_MAP_FLAG
-{
-    D3D11_MAP_FLAG_DO_NOT_WAIT  = 0x100000L
-}   D3D11_MAP_FLAG;
-
-typedef
-    enum D3D11_RAISE_FLAG
-{
-    D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR  = 0x1L
-}   D3D11_RAISE_FLAG;
-
-typedef
-    enum D3D11_CLEAR_FLAG
-{
-    D3D11_CLEAR_DEPTH   = 0x1L,
-    D3D11_CLEAR_STENCIL = 0x2L
-}   D3D11_CLEAR_FLAG;
-
-typedef RECT D3D11_RECT;
-
-typedef
-    enum D3D11_COMPARISON_FUNC
-{
-    D3D11_COMPARISON_NEVER  = 1,
-    D3D11_COMPARISON_LESS   = 2,
-    D3D11_COMPARISON_EQUAL  = 3,
-    D3D11_COMPARISON_LESS_EQUAL = 4,
-    D3D11_COMPARISON_GREATER    = 5,
-    D3D11_COMPARISON_NOT_EQUAL  = 6,
-    D3D11_COMPARISON_GREATER_EQUAL  = 7,
-    D3D11_COMPARISON_ALWAYS = 8
-}   D3D11_COMPARISON_FUNC;
-
-typedef
-    enum D3D11_DEPTH_WRITE_MASK
-{
-    D3D11_DEPTH_WRITE_MASK_ZERO = 0,
-    D3D11_DEPTH_WRITE_MASK_ALL  = 1
-}   D3D11_DEPTH_WRITE_MASK;
-
-typedef
-    enum D3D11_STENCIL_OP
-{
-    D3D11_STENCIL_OP_KEEP   = 1,
-    D3D11_STENCIL_OP_ZERO   = 2,
-    D3D11_STENCIL_OP_REPLACE    = 3,
-    D3D11_STENCIL_OP_INCR_SAT   = 4,
-    D3D11_STENCIL_OP_DECR_SAT   = 5,
-    D3D11_STENCIL_OP_INVERT = 6,
-    D3D11_STENCIL_OP_INCR   = 7,
-    D3D11_STENCIL_OP_DECR   = 8
-}   D3D11_STENCIL_OP;
-
-typedef
-    enum D3D11_BLEND
-{
-    D3D11_BLEND_ZERO    = 1,
-    D3D11_BLEND_ONE = 2,
-    D3D11_BLEND_SRC_COLOR   = 3,
-    D3D11_BLEND_INV_SRC_COLOR   = 4,
-    D3D11_BLEND_SRC_ALPHA   = 5,
-    D3D11_BLEND_INV_SRC_ALPHA   = 6,
-    D3D11_BLEND_DEST_ALPHA  = 7,
-    D3D11_BLEND_INV_DEST_ALPHA  = 8,
-    D3D11_BLEND_DEST_COLOR  = 9,
-    D3D11_BLEND_INV_DEST_COLOR  = 10,
-    D3D11_BLEND_SRC_ALPHA_SAT   = 11,
-    D3D11_BLEND_BLEND_FACTOR    = 14,
-    D3D11_BLEND_INV_BLEND_FACTOR    = 15,
-    D3D11_BLEND_SRC1_COLOR  = 16,
-    D3D11_BLEND_INV_SRC1_COLOR  = 17,
-    D3D11_BLEND_SRC1_ALPHA  = 18,
-    D3D11_BLEND_INV_SRC1_ALPHA  = 19
-}   D3D11_BLEND;
-
-typedef
-    enum D3D11_BLEND_OP
-{
-    D3D11_BLEND_OP_ADD  = 1,
-    D3D11_BLEND_OP_SUBTRACT = 2,
-    D3D11_BLEND_OP_REV_SUBTRACT = 3,
-    D3D11_BLEND_OP_MIN  = 4,
-    D3D11_BLEND_OP_MAX  = 5
-}   D3D11_BLEND_OP;
-
-typedef
-    enum D3D11_COLOR_WRITE_ENABLE
-{
-    D3D11_COLOR_WRITE_ENABLE_RED    = 1,
-    D3D11_COLOR_WRITE_ENABLE_GREEN  = 2,
-    D3D11_COLOR_WRITE_ENABLE_BLUE   = 4,
-    D3D11_COLOR_WRITE_ENABLE_ALPHA  = 8,
-    D3D11_COLOR_WRITE_ENABLE_ALL    = (((D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN)  | D3D11_COLOR_WRITE_ENABLE_BLUE)  | D3D11_COLOR_WRITE_ENABLE_ALPHA)
-}   D3D11_COLOR_WRITE_ENABLE;
-
-typedef
-    enum D3D11_TEXTURECUBE_FACE
-{
-    D3D11_TEXTURECUBE_FACE_POSITIVE_X   = 0,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_X   = 1,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Y   = 2,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Y   = 3,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Z   = 4,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Z   = 5
-}   D3D11_TEXTURECUBE_FACE;
-
-typedef
-    enum D3D11_BUFFEREX_SRV_FLAG
-{
-    D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1
-}   D3D11_BUFFEREX_SRV_FLAG;
-
-typedef
-    enum D3D11_DSV_FLAG
-{
-    D3D11_DSV_READ_ONLY_DEPTH   = 0x1L,
-    D3D11_DSV_READ_ONLY_STENCIL = 0x2L
-}   D3D11_DSV_FLAG;
-
-typedef
-    enum D3D11_BUFFER_UAV_FLAG
-{
-    D3D11_BUFFER_UAV_FLAG_RAW   = 0x1,
-    D3D11_BUFFER_UAV_FLAG_APPEND    = 0x2,
-    D3D11_BUFFER_UAV_FLAG_COUNTER   = 0x4
-}   D3D11_BUFFER_UAV_FLAG;
-
-typedef
-    enum D3D11_FILTER
-{
-    D3D11_FILTER_MIN_MAG_MIP_POINT  = 0,
-    D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR   = 0x1,
-    D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4,
-    D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR   = 0x5,
-    D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT   = 0x10,
-    D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR    = 0x11,
-    D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT   = 0x14,
-    D3D11_FILTER_MIN_MAG_MIP_LINEAR = 0x15,
-    D3D11_FILTER_ANISOTROPIC    = 0x55,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT   = 0x80,
-    D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR    = 0x81,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT  = 0x84,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR    = 0x85,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT    = 0x90,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91,
-    D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT    = 0x94,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR  = 0x95,
-    D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5
-}   D3D11_FILTER;
-
-typedef
-    enum D3D11_FILTER_TYPE
-{
-    D3D11_FILTER_TYPE_POINT = 0,
-    D3D11_FILTER_TYPE_LINEAR    = 1
-}   D3D11_FILTER_TYPE;
-
-typedef
-    enum D3D11_TEXTURE_ADDRESS_MODE
-{
-    D3D11_TEXTURE_ADDRESS_WRAP  = 1,
-    D3D11_TEXTURE_ADDRESS_MIRROR    = 2,
-    D3D11_TEXTURE_ADDRESS_CLAMP = 3,
-    D3D11_TEXTURE_ADDRESS_BORDER    = 4,
-    D3D11_TEXTURE_ADDRESS_MIRROR_ONCE   = 5
-}   D3D11_TEXTURE_ADDRESS_MODE;
-
-typedef
-    enum D3D11_FORMAT_SUPPORT
-{
-    D3D11_FORMAT_SUPPORT_BUFFER = 0x1,
-    D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER   = 0x2,
-    D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER    = 0x4,
-    D3D11_FORMAT_SUPPORT_SO_BUFFER  = 0x8,
-    D3D11_FORMAT_SUPPORT_TEXTURE1D  = 0x10,
-    D3D11_FORMAT_SUPPORT_TEXTURE2D  = 0x20,
-    D3D11_FORMAT_SUPPORT_TEXTURE3D  = 0x40,
-    D3D11_FORMAT_SUPPORT_TEXTURECUBE    = 0x80,
-    D3D11_FORMAT_SUPPORT_SHADER_LOAD    = 0x100,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE  = 0x200,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON   = 0x400,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT    = 0x800,
-    D3D11_FORMAT_SUPPORT_MIP    = 0x1000,
-    D3D11_FORMAT_SUPPORT_MIP_AUTOGEN    = 0x2000,
-    D3D11_FORMAT_SUPPORT_RENDER_TARGET  = 0x4000,
-    D3D11_FORMAT_SUPPORT_BLENDABLE  = 0x8000,
-    D3D11_FORMAT_SUPPORT_DEPTH_STENCIL  = 0x10000,
-    D3D11_FORMAT_SUPPORT_CPU_LOCKABLE   = 0x20000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE    = 0x40000,
-    D3D11_FORMAT_SUPPORT_DISPLAY    = 0x80000,
-    D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT = 0x100000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET   = 0x200000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD   = 0x400000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER  = 0x800000,
-    D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST   = 0x1000000,
-    D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW    = 0x2000000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON   = 0x4000000
-}   D3D11_FORMAT_SUPPORT;
-
-typedef
-    enum D3D11_FORMAT_SUPPORT2
-{
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD    = 0x1,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS    = 0x2,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE  = 0x4,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE   = 0x8,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX  = 0x10,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX    = 0x20,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD    = 0x40,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE   = 0x80
-}   D3D11_FORMAT_SUPPORT2;
-
-typedef
-    enum D3D11_ASYNC_GETDATA_FLAG
-{
-    D3D11_ASYNC_GETDATA_DONOTFLUSH  = 0x1
-}   D3D11_ASYNC_GETDATA_FLAG;
-
-typedef
-    enum D3D11_QUERY
-{
-    D3D11_QUERY_EVENT   = 0,
-    D3D11_QUERY_OCCLUSION   = (D3D11_QUERY_EVENT + 1),
-    D3D11_QUERY_TIMESTAMP   = (D3D11_QUERY_OCCLUSION + 1),
-    D3D11_QUERY_TIMESTAMP_DISJOINT  = (D3D11_QUERY_TIMESTAMP + 1),
-    D3D11_QUERY_PIPELINE_STATISTICS = (D3D11_QUERY_TIMESTAMP_DISJOINT + 1),
-    D3D11_QUERY_OCCLUSION_PREDICATE = (D3D11_QUERY_PIPELINE_STATISTICS + 1),
-    D3D11_QUERY_SO_STATISTICS   = (D3D11_QUERY_OCCLUSION_PREDICATE + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE   = (D3D11_QUERY_SO_STATISTICS + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM0   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0   = (D3D11_QUERY_SO_STATISTICS_STREAM0 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM1   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1   = (D3D11_QUERY_SO_STATISTICS_STREAM1 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM2   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2   = (D3D11_QUERY_SO_STATISTICS_STREAM2 + 1),
-    D3D11_QUERY_SO_STATISTICS_STREAM3   = (D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 + 1),
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3   = (D3D11_QUERY_SO_STATISTICS_STREAM3 + 1)
-}   D3D11_QUERY;
-
-typedef
-    enum D3D11_QUERY_MISC_FLAG
-{
-    D3D11_QUERY_MISC_PREDICATEHINT  = 0x1
-}   D3D11_QUERY_MISC_FLAG;
-
-typedef
-    enum D3D11_COUNTER
-{
-    D3D11_COUNTER_DEVICE_DEPENDENT_0    = 0x40000000
-}   D3D11_COUNTER;
-
-typedef
-    enum D3D11_COUNTER_TYPE
-{
-    D3D11_COUNTER_TYPE_FLOAT32  = 0,
-    D3D11_COUNTER_TYPE_UINT16   = (D3D11_COUNTER_TYPE_FLOAT32 + 1),
-    D3D11_COUNTER_TYPE_UINT32   = (D3D11_COUNTER_TYPE_UINT16 + 1),
-    D3D11_COUNTER_TYPE_UINT64   = (D3D11_COUNTER_TYPE_UINT32 + 1)
-}   D3D11_COUNTER_TYPE;
-
-typedef
-    enum D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS
-{
-    D3D11_STANDARD_MULTISAMPLE_PATTERN  = 0xffffffff,
-    D3D11_CENTER_MULTISAMPLE_PATTERN    = 0xfffffffe
-}   D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS;
-
-typedef
-    enum D3D11_DEVICE_CONTEXT_TYPE
-{
-    D3D11_DEVICE_CONTEXT_IMMEDIATE  = 0,
-    D3D11_DEVICE_CONTEXT_DEFERRED   = (D3D11_DEVICE_CONTEXT_IMMEDIATE + 1)
-}   D3D11_DEVICE_CONTEXT_TYPE;
-
-typedef 
-    enum D3D11_FEATURE
-{
-    D3D11_FEATURE_THREADING = 0,
-    D3D11_FEATURE_DOUBLES = (D3D11_FEATURE_THREADING + 1),
-    D3D11_FEATURE_FORMAT_SUPPORT = (D3D11_FEATURE_DOUBLES + 1),
-    D3D11_FEATURE_FORMAT_SUPPORT2 = (D3D11_FEATURE_FORMAT_SUPPORT + 1),
-    D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS = (D3D11_FEATURE_FORMAT_SUPPORT2 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS = (D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS + 1),
-    D3D11_FEATURE_ARCHITECTURE_INFO = (D3D11_FEATURE_D3D11_OPTIONS + 1),
-    D3D11_FEATURE_D3D9_OPTIONS = (D3D11_FEATURE_ARCHITECTURE_INFO + 1),
-    D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT = (D3D11_FEATURE_D3D9_OPTIONS + 1),
-    D3D11_FEATURE_D3D9_SHADOW_SUPPORT = (D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT + 1),
-    D3D11_FEATURE_D3D11_OPTIONS1 = (D3D11_FEATURE_D3D9_SHADOW_SUPPORT + 1),
-    D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT = (D3D11_FEATURE_D3D11_OPTIONS1 + 1),
-    D3D11_FEATURE_MARKER_SUPPORT = (D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT + 1),
-    D3D11_FEATURE_D3D9_OPTIONS1 = (D3D11_FEATURE_MARKER_SUPPORT + 1),
-    D3D11_FEATURE_D3D11_OPTIONS2 = (D3D11_FEATURE_D3D9_OPTIONS1 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS3 = (D3D11_FEATURE_D3D11_OPTIONS2 + 1),
-    D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = (D3D11_FEATURE_D3D11_OPTIONS3 + 1),
-    D3D11_FEATURE_D3D11_OPTIONS4 = (D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT + 1)
-} D3D11_FEATURE;
-
-typedef
-    enum D3D11_CONSERVATIVE_RASTERIZATION_TIER
-{
-    D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED = 0,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_1 = 1,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_2 = 2,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_3 = 3
-} D3D11_CONSERVATIVE_RASTERIZATION_TIER;
-
-typedef
-    enum _D3D11_TILED_RESOURCES_TIER
-{
-    D3D11_TILED_RESOURCES_NOT_SUPPORTED = 0,
-    D3D11_TILED_RESOURCES_TIER_1 = 1,
-    D3D11_TILED_RESOURCES_TIER_2 = 2,
-    D3D11_TILED_RESOURCES_TIER_3 = 3
-} D3D11_TILED_RESOURCES_TIER;
-
-typedef
-    enum D3D11_CREATE_DEVICE_FLAG
-{
-    D3D11_CREATE_DEVICE_SINGLETHREADED  = 0x1,
-    D3D11_CREATE_DEVICE_DEBUG   = 0x2,
-    D3D11_CREATE_DEVICE_SWITCH_TO_REF   = 0x4,
-    D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS    = 0x8,
-    D3D11_CREATE_DEVICE_BGRA_SUPPORT    = 0x20
-}   D3D11_CREATE_DEVICE_FLAG;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct D3D11_INPUT_ELEMENT_DESC
-{
-    LPCSTR SemanticName;
-    UINT SemanticIndex;
-    DXGI_FORMAT Format;
-    UINT InputSlot;
-    UINT AlignedByteOffset;
-    D3D11_INPUT_CLASSIFICATION InputSlotClass;
-    UINT InstanceDataStepRate;
-}   D3D11_INPUT_ELEMENT_DESC;
-
-typedef struct D3D11_SO_DECLARATION_ENTRY
-{
-    UINT Stream;
-    LPCSTR SemanticName;
-    UINT SemanticIndex;
-    BYTE StartComponent;
-    BYTE ComponentCount;
-    BYTE OutputSlot;
-}   D3D11_SO_DECLARATION_ENTRY;
-
-typedef struct D3D11_VIEWPORT
-{
-    FLOAT TopLeftX;
-    FLOAT TopLeftY;
-    FLOAT Width;
-    FLOAT Height;
-    FLOAT MinDepth;
-    FLOAT MaxDepth;
-}   D3D11_VIEWPORT;
-
-typedef struct D3D11_BOX
-{
-    UINT left;
-    UINT top;
-    UINT front;
-    UINT right;
-    UINT bottom;
-    UINT back;
-}   D3D11_BOX;
-
-typedef struct D3D11_DEPTH_STENCILOP_DESC
-{
-    D3D11_STENCIL_OP StencilFailOp;
-    D3D11_STENCIL_OP StencilDepthFailOp;
-    D3D11_STENCIL_OP StencilPassOp;
-    D3D11_COMPARISON_FUNC StencilFunc;
-}   D3D11_DEPTH_STENCILOP_DESC;
-
-typedef struct D3D11_DEPTH_STENCIL_DESC
-{
-    BOOL DepthEnable;
-    D3D11_DEPTH_WRITE_MASK DepthWriteMask;
-    D3D11_COMPARISON_FUNC DepthFunc;
-    BOOL StencilEnable;
-    UINT8 StencilReadMask;
-    UINT8 StencilWriteMask;
-    D3D11_DEPTH_STENCILOP_DESC FrontFace;
-    D3D11_DEPTH_STENCILOP_DESC BackFace;
-}   D3D11_DEPTH_STENCIL_DESC;
-
-typedef struct D3D11_RENDER_TARGET_BLEND_DESC
-{
-    BOOL BlendEnable;
-    D3D11_BLEND SrcBlend;
-    D3D11_BLEND DestBlend;
-    D3D11_BLEND_OP BlendOp;
-    D3D11_BLEND SrcBlendAlpha;
-    D3D11_BLEND DestBlendAlpha;
-    D3D11_BLEND_OP BlendOpAlpha;
-    UINT8 RenderTargetWriteMask;
-}   D3D11_RENDER_TARGET_BLEND_DESC;
-
-typedef struct D3D11_BLEND_DESC
-{
-    BOOL AlphaToCoverageEnable;
-    BOOL IndependentBlendEnable;
-    D3D11_RENDER_TARGET_BLEND_DESC RenderTarget[ 8 ];
-}   D3D11_BLEND_DESC;
-
-typedef struct D3D11_RASTERIZER_DESC
-{
-    D3D11_FILL_MODE FillMode;
-    D3D11_CULL_MODE CullMode;
-    BOOL FrontCounterClockwise;
-    INT DepthBias;
-    FLOAT DepthBiasClamp;
-    FLOAT SlopeScaledDepthBias;
-    BOOL DepthClipEnable;
-    BOOL ScissorEnable;
-    BOOL MultisampleEnable;
-    BOOL AntialiasedLineEnable;
-}   D3D11_RASTERIZER_DESC;
-
-typedef struct D3D11_SUBRESOURCE_DATA
-{
-    const void* pSysMem;
-    UINT SysMemPitch;
-    UINT SysMemSlicePitch;
-}   D3D11_SUBRESOURCE_DATA;
-
-typedef struct D3D11_MAPPED_SUBRESOURCE
-{
-    void* pData;
-    UINT RowPitch;
-    UINT DepthPitch;
-}   D3D11_MAPPED_SUBRESOURCE;
-
-typedef struct D3D11_BUFFER_DESC
-{
-    UINT ByteWidth;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-    UINT StructureByteStride;
-}   D3D11_BUFFER_DESC;
-
-typedef struct D3D11_TEXTURE1D_DESC
-{
-    UINT Width;
-    UINT MipLevels;
-    UINT ArraySize;
-    DXGI_FORMAT Format;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE1D_DESC;
-
-typedef struct D3D11_TEXTURE2D_DESC
-{
-    UINT Width;
-    UINT Height;
-    UINT MipLevels;
-    UINT ArraySize;
-    DXGI_FORMAT Format;
-    DXGI_SAMPLE_DESC SampleDesc;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE2D_DESC;
-
-typedef struct D3D11_TEXTURE3D_DESC
-{
-    UINT Width;
-    UINT Height;
-    UINT Depth;
-    UINT MipLevels;
-    DXGI_FORMAT Format;
-    D3D11_USAGE Usage;
-    UINT BindFlags;
-    UINT CPUAccessFlags;
-    UINT MiscFlags;
-}   D3D11_TEXTURE3D_DESC;
-
-typedef struct D3D11_BUFFER_SRV
-{
-    union
-    {
-        UINT FirstElement;
-        UINT ElementOffset;
-    };
-    union
-    {
-        UINT NumElements;
-        UINT ElementWidth;
-    };
-}   D3D11_BUFFER_SRV;
-
-typedef struct D3D11_BUFFEREX_SRV
-{
-    UINT FirstElement;
-    UINT NumElements;
-    UINT Flags;
-}   D3D11_BUFFEREX_SRV;
-
-typedef struct D3D11_TEX1D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX1D_SRV;
-
-typedef struct D3D11_TEX1D_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_SRV;
-
-typedef struct D3D11_TEX2D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX2D_SRV;
-
-typedef struct D3D11_TEX2D_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_SRV;
-
-typedef struct D3D11_TEX3D_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEX3D_SRV;
-
-typedef struct D3D11_TEXCUBE_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-}   D3D11_TEXCUBE_SRV;
-
-typedef struct D3D11_TEXCUBE_ARRAY_SRV
-{
-    UINT MostDetailedMip;
-    UINT MipLevels;
-    UINT First2DArrayFace;
-    UINT NumCubes;
-}   D3D11_TEXCUBE_ARRAY_SRV;
-
-typedef struct D3D11_TEX2DMS_SRV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_SRV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_SRV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_SRV;
-
-typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_SRV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_SRV Buffer;
-        D3D11_TEX1D_SRV Texture1D;
-        D3D11_TEX1D_ARRAY_SRV Texture1DArray;
-        D3D11_TEX2D_SRV Texture2D;
-        D3D11_TEX2D_ARRAY_SRV Texture2DArray;
-        D3D11_TEX2DMS_SRV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_SRV Texture2DMSArray;
-        D3D11_TEX3D_SRV Texture3D;
-        D3D11_TEXCUBE_SRV TextureCube;
-        D3D11_TEXCUBE_ARRAY_SRV TextureCubeArray;
-        D3D11_BUFFEREX_SRV BufferEx;
-    };
-}   D3D11_SHADER_RESOURCE_VIEW_DESC;
-
-typedef struct D3D11_BUFFER_RTV
-{
-    union
-    {
-        UINT FirstElement;
-        UINT ElementOffset;
-    };
-    union
-    {
-        UINT NumElements;
-        UINT ElementWidth;
-    };
-}   D3D11_BUFFER_RTV;
-
-typedef struct D3D11_TEX1D_RTV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_RTV;
-
-typedef struct D3D11_TEX1D_ARRAY_RTV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_RTV;
-
-typedef struct D3D11_TEX2D_RTV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_RTV;
-
-typedef struct D3D11_TEX2DMS_RTV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_RTV;
-
-typedef struct D3D11_TEX2D_ARRAY_RTV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_RTV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_RTV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_RTV;
-
-typedef struct D3D11_TEX3D_RTV
-{
-    UINT MipSlice;
-    UINT FirstWSlice;
-    UINT WSize;
-}   D3D11_TEX3D_RTV;
-
-typedef struct D3D11_RENDER_TARGET_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_RTV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_RTV Buffer;
-        D3D11_TEX1D_RTV Texture1D;
-        D3D11_TEX1D_ARRAY_RTV Texture1DArray;
-        D3D11_TEX2D_RTV Texture2D;
-        D3D11_TEX2D_ARRAY_RTV Texture2DArray;
-        D3D11_TEX2DMS_RTV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_RTV Texture2DMSArray;
-        D3D11_TEX3D_RTV Texture3D;
-    };
-}   D3D11_RENDER_TARGET_VIEW_DESC;
-
-typedef struct D3D11_TEX1D_DSV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_DSV;
-
-typedef struct D3D11_TEX1D_ARRAY_DSV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_DSV;
-
-typedef struct D3D11_TEX2D_DSV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_DSV;
-
-typedef struct D3D11_TEX2D_ARRAY_DSV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_DSV;
-
-typedef struct D3D11_TEX2DMS_DSV
-{
-    UINT UnusedField_NothingToDefine;
-}   D3D11_TEX2DMS_DSV;
-
-typedef struct D3D11_TEX2DMS_ARRAY_DSV
-{
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2DMS_ARRAY_DSV;
-
-typedef struct D3D11_DEPTH_STENCIL_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_DSV_DIMENSION ViewDimension;
-    UINT Flags;
-    union
-    {
-        D3D11_TEX1D_DSV Texture1D;
-        D3D11_TEX1D_ARRAY_DSV Texture1DArray;
-        D3D11_TEX2D_DSV Texture2D;
-        D3D11_TEX2D_ARRAY_DSV Texture2DArray;
-        D3D11_TEX2DMS_DSV Texture2DMS;
-        D3D11_TEX2DMS_ARRAY_DSV Texture2DMSArray;
-    };
-}   D3D11_DEPTH_STENCIL_VIEW_DESC;
-
-typedef struct D3D11_BUFFER_UAV
-{
-    UINT FirstElement;
-    UINT NumElements;
-    UINT Flags;
-}   D3D11_BUFFER_UAV;
-
-typedef struct D3D11_TEX1D_UAV
-{
-    UINT MipSlice;
-}   D3D11_TEX1D_UAV;
-
-typedef struct D3D11_TEX1D_ARRAY_UAV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX1D_ARRAY_UAV;
-
-typedef struct D3D11_TEX2D_UAV
-{
-    UINT MipSlice;
-}   D3D11_TEX2D_UAV;
-
-typedef struct D3D11_TEX2D_ARRAY_UAV
-{
-    UINT MipSlice;
-    UINT FirstArraySlice;
-    UINT ArraySize;
-}   D3D11_TEX2D_ARRAY_UAV;
-
-typedef struct D3D11_TEX3D_UAV
-{
-    UINT MipSlice;
-    UINT FirstWSlice;
-    UINT WSize;
-}   D3D11_TEX3D_UAV;
-
-typedef struct D3D11_UNORDERED_ACCESS_VIEW_DESC
-{
-    DXGI_FORMAT Format;
-    D3D11_UAV_DIMENSION ViewDimension;
-    union
-    {
-        D3D11_BUFFER_UAV Buffer;
-        D3D11_TEX1D_UAV Texture1D;
-        D3D11_TEX1D_ARRAY_UAV Texture1DArray;
-        D3D11_TEX2D_UAV Texture2D;
-        D3D11_TEX2D_ARRAY_UAV Texture2DArray;
-        D3D11_TEX3D_UAV Texture3D;
-    };
-}   D3D11_UNORDERED_ACCESS_VIEW_DESC;
-
-typedef struct D3D11_SAMPLER_DESC
-{
-    D3D11_FILTER Filter;
-    D3D11_TEXTURE_ADDRESS_MODE AddressU;
-    D3D11_TEXTURE_ADDRESS_MODE AddressV;
-    D3D11_TEXTURE_ADDRESS_MODE AddressW;
-    FLOAT MipLODBias;
-    UINT MaxAnisotropy;
-    D3D11_COMPARISON_FUNC ComparisonFunc;
-    FLOAT BorderColor[ 4 ];
-    FLOAT MinLOD;
-    FLOAT MaxLOD;
-}   D3D11_SAMPLER_DESC;
-
-typedef struct D3D11_QUERY_DESC
-{
-    D3D11_QUERY Query;
-    UINT MiscFlags;
-}   D3D11_QUERY_DESC;
-
-typedef struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT
-{
-    UINT64 Frequency;
-    BOOL Disjoint;
-}   D3D11_QUERY_DATA_TIMESTAMP_DISJOINT;
-
-typedef struct D3D11_QUERY_DATA_PIPELINE_STATISTICS
-{
-    UINT64 IAVertices;
-    UINT64 IAPrimitives;
-    UINT64 VSInvocations;
-    UINT64 GSInvocations;
-    UINT64 GSPrimitives;
-    UINT64 CInvocations;
-    UINT64 CPrimitives;
-    UINT64 PSInvocations;
-    UINT64 HSInvocations;
-    UINT64 DSInvocations;
-    UINT64 CSInvocations;
-}   D3D11_QUERY_DATA_PIPELINE_STATISTICS;
-
-typedef struct D3D11_QUERY_DATA_SO_STATISTICS
-{
-    UINT64 NumPrimitivesWritten;
-    UINT64 PrimitivesStorageNeeded;
-}   D3D11_QUERY_DATA_SO_STATISTICS;
-
-typedef struct D3D11_COUNTER_DESC
-{
-    D3D11_COUNTER Counter;
-    UINT MiscFlags;
-}   D3D11_COUNTER_DESC;
-
-typedef struct D3D11_COUNTER_INFO
-{
-    D3D11_COUNTER LastDeviceDependentCounter;
-    UINT NumSimultaneousCounters;
-    UINT8 NumDetectableParallelUnits;
-}   D3D11_COUNTER_INFO;
-
-typedef struct D3D11_CLASS_INSTANCE_DESC
-{
-    UINT InstanceId;
-    UINT InstanceIndex;
-    UINT TypeId;
-    UINT ConstantBuffer;
-    UINT BaseConstantBufferOffset;
-    UINT BaseTexture;
-    UINT BaseSampler;
-    BOOL Created;
-}   D3D11_CLASS_INSTANCE_DESC;
-
-typedef struct D3D11_FEATURE_DATA_THREADING
-{
-    BOOL DriverConcurrentCreates;
-    BOOL DriverCommandLists;
-}   D3D11_FEATURE_DATA_THREADING;
-
-typedef struct D3D11_FEATURE_DATA_DOUBLES
-{
-    BOOL DoublePrecisionFloatShaderOps;
-}   D3D11_FEATURE_DATA_DOUBLES;
-
-typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT
-{
-    DXGI_FORMAT InFormat;
-    UINT OutFormatSupport;
-}   D3D11_FEATURE_DATA_FORMAT_SUPPORT;
-
-typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT2
-{
-    DXGI_FORMAT InFormat;
-    UINT OutFormatSupport2;
-}   D3D11_FEATURE_DATA_FORMAT_SUPPORT2;
-
-typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS
-{
-    BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x;
-}   D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS;
-
-typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS
-{
-    BOOL OutputMergerLogicOp;
-    BOOL UAVOnlyRenderingForcedSampleCount;
-    BOOL DiscardAPIsSeenByDriver;
-    BOOL FlagsForUpdateAndCopySeenByDriver;
-    BOOL ClearView;
-    BOOL CopyWithOverlap;
-    BOOL ConstantBufferPartialUpdate;
-    BOOL ConstantBufferOffsetting;
-    BOOL MapNoOverwriteOnDynamicConstantBuffer;
-    BOOL MapNoOverwriteOnDynamicBufferSRV;
-    BOOL MultisampleRTVWithForcedSampleCountOne;
-    BOOL SAD4ShaderInstructions;
-    BOOL ExtendedDoublesShaderInstructions;
-    BOOL ExtendedResourceSharing;
-} D3D11_FEATURE_DATA_D3D11_OPTIONS;
-
-typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS2
-{
-    BOOL                                  PSSpecifiedStencilRefSupported;
-    BOOL                                  TypedUAVLoadAdditionalFormats;
-    BOOL                                  ROVsSupported;
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER ConservativeRasterizationTier;
-    D3D11_TILED_RESOURCES_TIER            TiledResourcesTier;
-    BOOL                                  MapOnDefaultTextures;
-    BOOL                                  StandardSwizzle;
-    BOOL                                  UnifiedMemoryArchitecture;
-} D3D11_FEATURE_DATA_D3D11_OPTIONS2;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Constants
-////////////////////////////////////////////////////////////////////////////
-
-const UINT D3D11_APPEND_ALIGNED_ELEMENT = 0xffffffff;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-
-//struct ID3D11DeviceChild;         // Typedef as CCryDXGLDeviceChild
-//struct ID3D11DepthStencilState;   // Typedef as CCryDXGLDepthStencilState
-//struct ID3D11BlendState;          // Typedef as CCryDXGLBlendState
-//struct ID3D11RasterizerState;     // Typedef as CCryDXGLRasterizerState
-//struct ID3D11Resource;            // Typedef as CCryDXGLResource
-//struct ID3D11Buffer;              // Typedef as CCryDXGLBuffer
-//struct ID3D11Texture1D;           // Typedef as CCryDXGLTexture1D
-//struct ID3D11Texture2D;           // Typedef as CCryDXGLTexture2D
-//struct ID3D11Texture3D;           // Typedef as CCryDXGLTexture3D
-//struct ID3D11View;                // Typedef as CCryDXGLView
-//struct ID3D11ShaderResourceView;  // Typedef as CCryDXGLShaderResourceView
-//struct ID3D11RenderTargetView;    // Typedef as CCryDXGLRenderTargetView
-//struct ID3D11DepthStencilView;    // Typedef as CCryDXGLDepthStencilView
-//struct ID3D11UnorderedAccessView; // Typedef as CCryDXGLUnorderedAccessView
-//struct ID3D11VertexShader;        // Typedef as CCryDXGLVertexShader
-//struct ID3D11HullShader;          // Typedef as CCryDXGLHullShader
-//struct ID3D11DomainShader;        // Typedef as CCryDXGLDomainShader
-//struct ID3D11GeometryShader;      // Typedef as CCryDXGLGeometryShader
-//struct ID3D11PixelShader;         // Typedef as CCryDXGLPixelShader
-//struct ID3D11ComputeShader;       // Typedef as CCryDXGLComputeShader
-//struct ID3D11InputLayout;         // Typedef as CCryDXGLInputLayout
-//struct ID3D11SamplerState;        // Typedef as CCryDXGLSamplerState
-//struct ID3D11Asynchronous;        // Typedef as CCryDXGLQuery
-//struct ID3D11Query;               // Typedef as CCryDXGLQuery
-//struct ID3D11Predicate            // Typedef as CCryDXGLQuery
-//struct ID3D11Counter              // Typedef as CCryDXGLDeviceChild
-//struct ID3D11ClassLinkage         // Typedef as CCryDXGLDeviceChild
-struct ID3D11ClassInstance;
-struct ID3D11CommandList;
-//struct ID3D11DeviceContext;       // Typedef as CCryDXGLDeviceContext
-//struct ID3D11Device;              // Typedef as CCryDXGLDevice
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Interfaces for full DX emulation
-////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-struct ID3D11DeviceChild
-    : IUnknown
-{
-    virtual void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData) = 0;
-};
-
-struct ID3D11ClassLinkage
-    : ID3D11DeviceChild {};
-struct ID3D11ClassInstance
-    : ID3D11DeviceChild {};
-struct ID3D11CommandList
-    : ID3D11DeviceChild {};
-
-struct ID3D11DepthStencilState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc) = 0;
-};
-
-struct ID3D11BlendState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_BLEND_DESC* pDesc) = 0;
-};
-
-struct ID3D11RasterizerState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_RASTERIZER_DESC* pDesc) = 0;
-};
-
-struct ID3D11Resource
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension) = 0;
-    virtual void STDMETHODCALLTYPE SetEvictionPriority(UINT EvictionPriority) = 0;
-    virtual UINT STDMETHODCALLTYPE GetEvictionPriority() = 0;
-};
-
-struct ID3D11Buffer
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_BUFFER_DESC* pDesc) = 0;
-};
-
-struct ID3D11Texture1D
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE1D_DESC* pDesc) = 0;
-};
-
-struct ID3D11Texture2D
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE2D_DESC* pDesc) = 0;
-};
-
-struct ID3D11Texture3D
-    : ID3D11Resource
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE3D_DESC* pDesc) = 0;
-};
-
-struct ID3D11View
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetResource(ID3D11Resource** ppResource) = 0;
-};
-
-struct ID3D11ShaderResourceView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11RenderTargetView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11DepthStencilView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11UnorderedAccessView
-    : ID3D11View
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc) = 0;
-};
-
-struct ID3D11VertexShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11HullShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11DomainShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11GeometryShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11PixelShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11ComputeShader
-    : ID3D11DeviceChild {};
-
-struct ID3D11InputLayout
-    : ID3D11DeviceChild {};
-
-struct ID3D11SamplerState
-    : ID3D11DeviceChild
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_SAMPLER_DESC* pDesc) = 0;
-};
-
-struct ID3D11Asynchronous
-    : ID3D11DeviceChild
-{
-    virtual UINT STDMETHODCALLTYPE GetDataSize() = 0;
-};
-
-struct ID3D11Query
-    : ID3D11Asynchronous
-{
-    virtual void STDMETHODCALLTYPE GetDesc(D3D11_QUERY_DESC* pDesc) = 0;
-};
-
-struct ID3D11Counter
-    : ID3D11Asynchronous {};
-
-struct ID3D11Predicate
-    : ID3D11Query
-{
-};
-
-//struct ID3D11Counter : ID3D11Asynchronous
-//{
-//  virtual void STDMETHODCALLTYPE GetDesc(D3D11_COUNTER_DESC *pDesc) = 0;
-//};
-//
-//struct ID3D11ClassLinkage : ID3D11DeviceChild
-//{
-//  virtual HRESULT STDMETHODCALLTYPE GetClassInstance(LPCSTR pClassInstanceName, UINT InstanceIndex, ID3D11ClassInstance **ppInstance) = 0;
-//  virtual HRESULT STDMETHODCALLTYPE CreateClassInstance(LPCSTR pClassTypeName, UINT ConstantBufferOffset, UINT ConstantVectorOffset, UINT TextureOffset, UINT SamplerOffset, ID3D11ClassInstance **ppInstance) = 0;
-//};
-
-struct ID3D11SwitchToRef
-    : IUnknown
-{
-    virtual BOOL STDMETHODCALLTYPE SetUseRef(BOOL UseRef) = 0;
-    virtual BOOL STDMETHODCALLTYPE GetUseRef() = 0;
-};
-
-#endif //DXGL_FULL_EMULATION
-
-#if defined(DXGL_BLOB_INTEROPERABILITY) || DXGL_FULL_EMULATION
-
-struct ID3D10Blob
-    : IUnknown
-{
-    virtual LPVOID STDMETHODCALLTYPE GetBufferPointer() = 0;
-    virtual SIZE_T STDMETHODCALLTYPE GetBufferSize() = 0;
-};
-
-#endif //defined(DXGL_BLOB_INTEROPERABILITY) || DXGL_FULL_EMULATION
-
-#endif // __DXGL_D3D11_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3D11Shader.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3D11Shader.h
deleted file mode 100644
index 42e50bf035..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3D11Shader.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3D11Shader.h in the DirectX SDK
-
-#ifndef __DXGL_D3D11Shader_h__
-#define __DXGL_D3D11Shader_h__
-
-#include "DXMETAL_D3DCommon.h"
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef enum D3D11_SHADER_VERSION_TYPE
-{
-    D3D11_SHVER_PIXEL_SHADER    = 0,
-    D3D11_SHVER_VERTEX_SHADER   = 1,
-    D3D11_SHVER_GEOMETRY_SHADER = 2,
-
-    // D3D11 Shaders
-    D3D11_SHVER_HULL_SHADER     = 3,
-    D3D11_SHVER_DOMAIN_SHADER   = 4,
-    D3D11_SHVER_COMPUTE_SHADER  = 5,
-
-    D3D11_SHVER_RESERVED0       = 0xFFF0,
-} D3D11_SHADER_VERSION_TYPE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct _D3D11_SIGNATURE_PARAMETER_DESC
-{
-    LPCSTR                      SemanticName;   // Name of the semantic
-    UINT                        SemanticIndex;  // Index of the semantic
-    UINT                        Register;       // Number of member variables
-    D3D_NAME                    SystemValueType;// A predefined system value, or D3D_NAME_UNDEFINED if not applicable
-    D3D_REGISTER_COMPONENT_TYPE ComponentType;// Scalar type (e.g. uint, float, etc.)
-    BYTE                        Mask;           // Mask to indicate which components of the register
-                                                // are used (combination of D3D10_COMPONENT_MASK values)
-    BYTE                        ReadWriteMask;  // Mask to indicate whether a given component is
-                                                // never written (if this is an output signature) or
-                                                // always read (if this is an input signature).
-                                                // (combination of D3D10_COMPONENT_MASK values)
-    UINT Stream;                                // Stream index
-    D3D_MIN_PRECISION           MinPrecision;   // Minimum desired interpolation precision
-} D3D11_SIGNATURE_PARAMETER_DESC;
-
-typedef struct _D3D11_SHADER_BUFFER_DESC
-{
-    LPCSTR                  Name;           // Name of the constant buffer
-    D3D_CBUFFER_TYPE        Type;           // Indicates type of buffer content
-    UINT                    Variables;      // Number of member variables
-    UINT                    Size;           // Size of CB (in bytes)
-    UINT                    uFlags;         // Buffer description flags
-} D3D11_SHADER_BUFFER_DESC;
-
-typedef struct _D3D11_SHADER_VARIABLE_DESC
-{
-    LPCSTR                  Name;           // Name of the variable
-    UINT                    StartOffset;    // Offset in constant buffer's backing store
-    UINT                    Size;           // Size of variable (in bytes)
-    UINT                    uFlags;         // Variable flags
-    LPVOID                  DefaultValue;   // Raw pointer to default value
-    UINT                    StartTexture;   // First texture index (or -1 if no textures used)
-    UINT                    TextureSize;    // Number of texture slots possibly used.
-    UINT                    StartSampler;   // First sampler index (or -1 if no textures used)
-    UINT                    SamplerSize;    // Number of sampler slots possibly used.
-} D3D11_SHADER_VARIABLE_DESC;
-
-typedef struct _D3D11_SHADER_TYPE_DESC
-{
-    D3D_SHADER_VARIABLE_CLASS   Class;          // Variable class (e.g. object, matrix, etc.)
-    D3D_SHADER_VARIABLE_TYPE    Type;           // Variable type (e.g. float, sampler, etc.)
-    UINT                        Rows;           // Number of rows (for matrices, 1 for other numeric, 0 if not applicable)
-    UINT                        Columns;        // Number of columns (for vectors & matrices, 1 for other numeric, 0 if not applicable)
-    UINT                        Elements;       // Number of elements (0 if not an array)
-    UINT                        Members;        // Number of members (0 if not a structure)
-    UINT                        Offset;         // Offset from the start of structure (0 if not a structure member)
-    LPCSTR                      Name;           // Name of type, can be NULL
-} D3D11_SHADER_TYPE_DESC;
-
-typedef struct _D3D11_SHADER_DESC
-{
-    UINT                    Version;                     // Shader version
-    LPCSTR                  Creator;                     // Creator string
-    UINT                    Flags;                       // Shader compilation/parse flags
-
-    UINT                    ConstantBuffers;             // Number of constant buffers
-    UINT                    BoundResources;              // Number of bound resources
-    UINT                    InputParameters;             // Number of parameters in the input signature
-    UINT                    OutputParameters;            // Number of parameters in the output signature
-
-    UINT                    InstructionCount;            // Number of emitted instructions
-    UINT                    TempRegisterCount;           // Number of temporary registers used
-    UINT                    TempArrayCount;              // Number of temporary arrays used
-    UINT                    DefCount;                    // Number of constant defines
-    UINT                    DclCount;                    // Number of declarations (input + output)
-    UINT                    TextureNormalInstructions;   // Number of non-categorized texture instructions
-    UINT                    TextureLoadInstructions;     // Number of texture load instructions
-    UINT                    TextureCompInstructions;     // Number of texture comparison instructions
-    UINT                    TextureBiasInstructions;     // Number of texture bias instructions
-    UINT                    TextureGradientInstructions; // Number of texture gradient instructions
-    UINT                    FloatInstructionCount;       // Number of floating point arithmetic instructions used
-    UINT                    IntInstructionCount;         // Number of signed integer arithmetic instructions used
-    UINT                    UintInstructionCount;        // Number of unsigned integer arithmetic instructions used
-    UINT                    StaticFlowControlCount;      // Number of static flow control instructions used
-    UINT                    DynamicFlowControlCount;     // Number of dynamic flow control instructions used
-    UINT                    MacroInstructionCount;       // Number of macro instructions used
-    UINT                    ArrayInstructionCount;       // Number of array instructions used
-    UINT                    CutInstructionCount;         // Number of cut instructions used
-    UINT                    EmitInstructionCount;        // Number of emit instructions used
-    D3D_PRIMITIVE_TOPOLOGY   GSOutputTopology;           // Geometry shader output topology
-    UINT                    GSMaxOutputVertexCount;      // Geometry shader maximum output vertex count
-    D3D_PRIMITIVE           InputPrimitive;              // GS/HS input primitive
-    UINT                    PatchConstantParameters;     // Number of parameters in the patch constant signature
-    UINT                    cGSInstanceCount;            // Number of Geometry shader instances
-    UINT                    cControlPoints;              // Number of control points in the HS->DS stage
-    D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive;  // Primitive output by the tessellator
-    D3D_TESSELLATOR_PARTITIONING HSPartitioning;         // Partitioning mode of the tessellator
-    D3D_TESSELLATOR_DOMAIN  TessellatorDomain;           // Domain of the tessellator (quad, tri, isoline)
-    // instruction counts
-    UINT cBarrierInstructions;                           // Number of barrier instructions in a compute shader
-    UINT cInterlockedInstructions;                       // Number of interlocked instructions
-    UINT cTextureStoreInstructions;                      // Number of texture writes
-} D3D11_SHADER_DESC;
-
-typedef struct _D3D11_SHADER_INPUT_BIND_DESC
-{
-    LPCSTR                      Name;           // Name of the resource
-    D3D_SHADER_INPUT_TYPE       Type;           // Type of resource (e.g. texture, cbuffer, etc.)
-    UINT                        BindPoint;      // Starting bind point
-    UINT                        BindCount;      // Number of contiguous bind points (for arrays)
-
-    UINT                        uFlags;         // Input binding flags
-    D3D_RESOURCE_RETURN_TYPE    ReturnType;     // Return type (if texture)
-    D3D_SRV_DIMENSION           Dimension;      // Dimension (if texture)
-    UINT                        NumSamples;     // Number of samples (0 if not MS texture)
-    //Confetti Begin: And support for UAV type
-    UINT                        UAVBindingArea;
-    //Confetti End
-} D3D11_SHADER_INPUT_BIND_DESC;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Interfaces for full DX emulation
-////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-struct ID3D11ShaderReflectionType
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_TYPE_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByIndex(UINT Index) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByName(LPCSTR Name) = 0;
-    virtual LPCSTR STDMETHODCALLTYPE GetMemberTypeName(UINT Index) = 0;
-    virtual HRESULT STDMETHODCALLTYPE IsEqual(ID3D11ShaderReflectionType* pType) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetSubType() = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetBaseClass() = 0;
-    virtual UINT STDMETHODCALLTYPE GetNumInterfaces() = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetInterfaceByIndex(UINT uIndex) = 0;
-    virtual HRESULT STDMETHODCALLTYPE IsOfType(ID3D11ShaderReflectionType* pType) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ImplementsInterface(ID3D11ShaderReflectionType* pBase) = 0;
-};
-
-struct ID3D11ShaderReflectionConstantBuffer;
-
-struct ID3D11ShaderReflectionVariable
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetType() = 0;
-    virtual ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetBuffer() = 0;
-    virtual UINT STDMETHODCALLTYPE GetInterfaceSlot(UINT uArrayIndex) = 0;
-};
-
-struct ID3D11ShaderReflectionConstantBuffer
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByIndex(UINT Index) = 0;
-    virtual ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name) = 0;
-};
-
-struct ID3D11ShaderReflection
-    : IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID* ppv) = 0;
-    virtual ULONG STDMETHODCALLTYPE AddRef() = 0;
-    virtual ULONG STDMETHODCALLTYPE Release() = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByIndex(UINT Index) = 0;
-    virtual ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByName(LPCSTR Name) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc) = 0;
-    virtual ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc) = 0;
-    virtual UINT STDMETHODCALLTYPE GetMovInstructionCount() = 0;
-    virtual UINT STDMETHODCALLTYPE GetMovcInstructionCount() = 0;
-    virtual UINT STDMETHODCALLTYPE GetConversionInstructionCount() = 0;
-    virtual UINT STDMETHODCALLTYPE GetBitwiseInstructionCount() = 0;
-    virtual D3D_PRIMITIVE STDMETHODCALLTYPE GetGSInputPrimitive() = 0;
-    virtual BOOL STDMETHODCALLTYPE IsSampleFrequencyShader() = 0;
-    virtual UINT STDMETHODCALLTYPE GetNumInterfaceSlots() = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetMinFeatureLevel(D3D_FEATURE_LEVEL* pLevel) = 0;
-};
-
-#endif //DXGL_FULL_EMULATION
-
-#endif //__DXGL_D3D11Shader_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DCommon.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DCommon.h
deleted file mode 100644
index 8e07070cdf..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DCommon.h
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in DXMETAL_D3DCommon.h in the DirectX SDK
-
-#ifndef __DXGL_D3DCommon_h__
-#define __DXGL_D3DCommon_h__
-
-typedef
-    enum D3D_DRIVER_TYPE
-{
-    D3D_DRIVER_TYPE_UNKNOWN = 0,
-    D3D_DRIVER_TYPE_HARDWARE    = (D3D_DRIVER_TYPE_UNKNOWN + 1),
-    D3D_DRIVER_TYPE_REFERENCE   = (D3D_DRIVER_TYPE_HARDWARE + 1),
-    D3D_DRIVER_TYPE_NULL    = (D3D_DRIVER_TYPE_REFERENCE + 1),
-    D3D_DRIVER_TYPE_SOFTWARE    = (D3D_DRIVER_TYPE_NULL + 1),
-    D3D_DRIVER_TYPE_WARP    = (D3D_DRIVER_TYPE_SOFTWARE + 1)
-}   D3D_DRIVER_TYPE;
-
-typedef
-    enum D3D_FEATURE_LEVEL
-{
-    D3D_FEATURE_LEVEL_9_1   = 0x9100,
-    D3D_FEATURE_LEVEL_9_2   = 0x9200,
-    D3D_FEATURE_LEVEL_9_3   = 0x9300,
-    D3D_FEATURE_LEVEL_10_0  = 0xa000,
-    D3D_FEATURE_LEVEL_10_1  = 0xa100,
-    D3D_FEATURE_LEVEL_11_0  = 0xb000,
-    D3D_FEATURE_LEVEL_11_1  = 0xb100
-}   D3D_FEATURE_LEVEL;
-
-typedef
-    enum D3D_PRIMITIVE_TOPOLOGY
-{
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED    = 0,
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST    = 1,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP    = 3,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP    = 5,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ    = 11,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ    = 13,
-    D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST    = 33,
-    D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST    = 34,
-    D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST    = 35,
-    D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST    = 36,
-    D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST    = 37,
-    D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST    = 38,
-    D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST    = 39,
-    D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST    = 40,
-    D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST    = 41,
-    D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST   = 42,
-    D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST   = 43,
-    D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST   = 44,
-    D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST   = 45,
-    D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST   = 46,
-    D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST   = 47,
-    D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST   = 48,
-    D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST   = 49,
-    D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST   = 50,
-    D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST   = 51,
-    D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST   = 52,
-    D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST   = 53,
-    D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST   = 54,
-    D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST   = 55,
-    D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST   = 56,
-    D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST   = 57,
-    D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST   = 58,
-    D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST   = 59,
-    D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST   = 60,
-    D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST   = 61,
-    D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST   = 62,
-    D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST   = 63,
-    D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST   = 64,
-    D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED  = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,
-    D3D10_PRIMITIVE_TOPOLOGY_POINTLIST  = D3D_PRIMITIVE_TOPOLOGY_POINTLIST,
-    D3D10_PRIMITIVE_TOPOLOGY_LINELIST   = D3D_PRIMITIVE_TOPOLOGY_LINELIST,
-    D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-    D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ,
-    D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED  = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,
-    D3D11_PRIMITIVE_TOPOLOGY_POINTLIST  = D3D_PRIMITIVE_TOPOLOGY_POINTLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_LINELIST   = D3D_PRIMITIVE_TOPOLOGY_LINELIST,
-    D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-    D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ   = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ  = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ,
-    D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST  = D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST,
-    D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST
-}   D3D_PRIMITIVE_TOPOLOGY;
-
-typedef
-    enum D3D_PRIMITIVE
-{
-    D3D_PRIMITIVE_UNDEFINED = 0,
-    D3D_PRIMITIVE_POINT = 1,
-    D3D_PRIMITIVE_LINE  = 2,
-    D3D_PRIMITIVE_TRIANGLE  = 3,
-    D3D_PRIMITIVE_LINE_ADJ  = 6,
-    D3D_PRIMITIVE_TRIANGLE_ADJ  = 7,
-    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH    = 17,
-    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH    = 18,
-    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH    = 19,
-    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH    = 20,
-    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH    = 21,
-    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH    = 22,
-    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH    = 23,
-    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH    = 24,
-    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH    = 25,
-    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH    = 26,
-    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH    = 28,
-    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH    = 29,
-    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH    = 30,
-    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH    = 31,
-    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH    = 32,
-    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH    = 33,
-    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH    = 34,
-    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH    = 35,
-    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH    = 36,
-    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH    = 37,
-    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH    = 38,
-    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH    = 39,
-    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH    = 40,
-    D3D10_PRIMITIVE_UNDEFINED   = D3D_PRIMITIVE_UNDEFINED,
-    D3D10_PRIMITIVE_POINT   = D3D_PRIMITIVE_POINT,
-    D3D10_PRIMITIVE_LINE    = D3D_PRIMITIVE_LINE,
-    D3D10_PRIMITIVE_TRIANGLE    = D3D_PRIMITIVE_TRIANGLE,
-    D3D10_PRIMITIVE_LINE_ADJ    = D3D_PRIMITIVE_LINE_ADJ,
-    D3D10_PRIMITIVE_TRIANGLE_ADJ    = D3D_PRIMITIVE_TRIANGLE_ADJ,
-    D3D11_PRIMITIVE_UNDEFINED   = D3D_PRIMITIVE_UNDEFINED,
-    D3D11_PRIMITIVE_POINT   = D3D_PRIMITIVE_POINT,
-    D3D11_PRIMITIVE_LINE    = D3D_PRIMITIVE_LINE,
-    D3D11_PRIMITIVE_TRIANGLE    = D3D_PRIMITIVE_TRIANGLE,
-    D3D11_PRIMITIVE_LINE_ADJ    = D3D_PRIMITIVE_LINE_ADJ,
-    D3D11_PRIMITIVE_TRIANGLE_ADJ    = D3D_PRIMITIVE_TRIANGLE_ADJ,
-    D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_1_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_2_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_3_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_4_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_5_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_6_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_7_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_8_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH   = D3D_PRIMITIVE_9_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_10_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_11_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_12_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_13_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_14_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_15_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_16_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_17_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_18_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_19_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_20_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_21_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_22_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_23_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_24_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_25_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_26_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_27_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_28_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_29_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_30_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_31_CONTROL_POINT_PATCH,
-    D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH  = D3D_PRIMITIVE_32_CONTROL_POINT_PATCH
-}   D3D_PRIMITIVE;
-
-typedef
-    enum D3D_SRV_DIMENSION
-{
-    D3D_SRV_DIMENSION_UNKNOWN   = 0,
-    D3D_SRV_DIMENSION_BUFFER    = 1,
-    D3D_SRV_DIMENSION_TEXTURE1D = 2,
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY    = 3,
-    D3D_SRV_DIMENSION_TEXTURE2D = 4,
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY    = 5,
-    D3D_SRV_DIMENSION_TEXTURE2DMS   = 6,
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY  = 7,
-    D3D_SRV_DIMENSION_TEXTURE3D = 8,
-    D3D_SRV_DIMENSION_TEXTURECUBE   = 9,
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY  = 10,
-    D3D_SRV_DIMENSION_BUFFEREX  = 11,
-    D3D10_SRV_DIMENSION_UNKNOWN = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D10_SRV_DIMENSION_BUFFER  = D3D_SRV_DIMENSION_BUFFER,
-    D3D10_SRV_DIMENSION_TEXTURE1D   = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D10_SRV_DIMENSION_TEXTURE1DARRAY  = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2D   = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D10_SRV_DIMENSION_TEXTURE2DARRAY  = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2DMS = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY    = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE3D   = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D10_SRV_DIMENSION_TEXTURECUBE = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D10_1_SRV_DIMENSION_UNKNOWN   = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D10_1_SRV_DIMENSION_BUFFER    = D3D_SRV_DIMENSION_BUFFER,
-    D3D10_1_SRV_DIMENSION_TEXTURE1D = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY    = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE2D = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY    = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMS   = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY  = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D10_1_SRV_DIMENSION_TEXTURE3D = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBE   = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY  = D3D_SRV_DIMENSION_TEXTURECUBEARRAY,
-    D3D11_SRV_DIMENSION_UNKNOWN = D3D_SRV_DIMENSION_UNKNOWN,
-    D3D11_SRV_DIMENSION_BUFFER  = D3D_SRV_DIMENSION_BUFFER,
-    D3D11_SRV_DIMENSION_TEXTURE1D   = D3D_SRV_DIMENSION_TEXTURE1D,
-    D3D11_SRV_DIMENSION_TEXTURE1DARRAY  = D3D_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE2D   = D3D_SRV_DIMENSION_TEXTURE2D,
-    D3D11_SRV_DIMENSION_TEXTURE2DARRAY  = D3D_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE2DMS = D3D_SRV_DIMENSION_TEXTURE2DMS,
-    D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY    = D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D11_SRV_DIMENSION_TEXTURE3D   = D3D_SRV_DIMENSION_TEXTURE3D,
-    D3D11_SRV_DIMENSION_TEXTURECUBE = D3D_SRV_DIMENSION_TEXTURECUBE,
-    D3D11_SRV_DIMENSION_TEXTURECUBEARRAY    = D3D_SRV_DIMENSION_TEXTURECUBEARRAY,
-    D3D11_SRV_DIMENSION_BUFFEREX    = D3D_SRV_DIMENSION_BUFFEREX
-}   D3D_SRV_DIMENSION;
-
-typedef
-    enum _D3D_INCLUDE_TYPE
-{
-    D3D_INCLUDE_LOCAL   = 0,
-    D3D_INCLUDE_SYSTEM  = (D3D_INCLUDE_LOCAL + 1),
-    D3D10_INCLUDE_LOCAL = D3D_INCLUDE_LOCAL,
-    D3D10_INCLUDE_SYSTEM    = D3D_INCLUDE_SYSTEM,
-    D3D_INCLUDE_FORCE_DWORD = 0x7fffffff
-}   D3D_INCLUDE_TYPE;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_CLASS
-{
-    D3D_SVC_SCALAR  = 0,
-    D3D_SVC_VECTOR  = (D3D_SVC_SCALAR + 1),
-    D3D_SVC_MATRIX_ROWS = (D3D_SVC_VECTOR + 1),
-    D3D_SVC_MATRIX_COLUMNS  = (D3D_SVC_MATRIX_ROWS + 1),
-    D3D_SVC_OBJECT  = (D3D_SVC_MATRIX_COLUMNS + 1),
-    D3D_SVC_STRUCT  = (D3D_SVC_OBJECT + 1),
-    D3D_SVC_INTERFACE_CLASS = (D3D_SVC_STRUCT + 1),
-    D3D_SVC_INTERFACE_POINTER   = (D3D_SVC_INTERFACE_CLASS + 1),
-    D3D10_SVC_SCALAR    = D3D_SVC_SCALAR,
-    D3D10_SVC_VECTOR    = D3D_SVC_VECTOR,
-    D3D10_SVC_MATRIX_ROWS   = D3D_SVC_MATRIX_ROWS,
-    D3D10_SVC_MATRIX_COLUMNS    = D3D_SVC_MATRIX_COLUMNS,
-    D3D10_SVC_OBJECT    = D3D_SVC_OBJECT,
-    D3D10_SVC_STRUCT    = D3D_SVC_STRUCT,
-    D3D11_SVC_INTERFACE_CLASS   = D3D_SVC_INTERFACE_CLASS,
-    D3D11_SVC_INTERFACE_POINTER = D3D_SVC_INTERFACE_POINTER,
-    D3D_SVC_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_CLASS;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_FLAGS
-{
-    D3D_SVF_USERPACKED  = 1,
-    D3D_SVF_USED    = 2,
-    D3D_SVF_INTERFACE_POINTER   = 4,
-    D3D_SVF_INTERFACE_PARAMETER = 8,
-    D3D10_SVF_USERPACKED    = D3D_SVF_USERPACKED,
-    D3D10_SVF_USED  = D3D_SVF_USED,
-    D3D11_SVF_INTERFACE_POINTER = D3D_SVF_INTERFACE_POINTER,
-    D3D11_SVF_INTERFACE_PARAMETER   = D3D_SVF_INTERFACE_PARAMETER,
-    D3D_SVF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_FLAGS;
-
-typedef
-    enum _D3D_SHADER_VARIABLE_TYPE
-{
-    D3D_SVT_VOID    = 0,
-    D3D_SVT_BOOL    = 1,
-    D3D_SVT_INT = 2,
-    D3D_SVT_FLOAT   = 3,
-    D3D_SVT_STRING  = 4,
-    D3D_SVT_TEXTURE = 5,
-    D3D_SVT_TEXTURE1D   = 6,
-    D3D_SVT_TEXTURE2D   = 7,
-    D3D_SVT_TEXTURE3D   = 8,
-    D3D_SVT_TEXTURECUBE = 9,
-    D3D_SVT_SAMPLER = 10,
-    D3D_SVT_SAMPLER1D   = 11,
-    D3D_SVT_SAMPLER2D   = 12,
-    D3D_SVT_SAMPLER3D   = 13,
-    D3D_SVT_SAMPLERCUBE = 14,
-    D3D_SVT_PIXELSHADER = 15,
-    D3D_SVT_VERTEXSHADER    = 16,
-    D3D_SVT_PIXELFRAGMENT   = 17,
-    D3D_SVT_VERTEXFRAGMENT  = 18,
-    D3D_SVT_UINT    = 19,
-    D3D_SVT_UINT8   = 20,
-    D3D_SVT_GEOMETRYSHADER  = 21,
-    D3D_SVT_RASTERIZER  = 22,
-    D3D_SVT_DEPTHSTENCIL    = 23,
-    D3D_SVT_BLEND   = 24,
-    D3D_SVT_BUFFER  = 25,
-    D3D_SVT_CBUFFER = 26,
-    D3D_SVT_TBUFFER = 27,
-    D3D_SVT_TEXTURE1DARRAY  = 28,
-    D3D_SVT_TEXTURE2DARRAY  = 29,
-    D3D_SVT_RENDERTARGETVIEW    = 30,
-    D3D_SVT_DEPTHSTENCILVIEW    = 31,
-    D3D_SVT_TEXTURE2DMS = 32,
-    D3D_SVT_TEXTURE2DMSARRAY    = 33,
-    D3D_SVT_TEXTURECUBEARRAY    = 34,
-    D3D_SVT_HULLSHADER  = 35,
-    D3D_SVT_DOMAINSHADER    = 36,
-    D3D_SVT_INTERFACE_POINTER   = 37,
-    D3D_SVT_COMPUTESHADER   = 38,
-    D3D_SVT_DOUBLE  = 39,
-    D3D_SVT_RWTEXTURE1D = 40,
-    D3D_SVT_RWTEXTURE1DARRAY    = 41,
-    D3D_SVT_RWTEXTURE2D = 42,
-    D3D_SVT_RWTEXTURE2DARRAY    = 43,
-    D3D_SVT_RWTEXTURE3D = 44,
-    D3D_SVT_RWBUFFER    = 45,
-    D3D_SVT_BYTEADDRESS_BUFFER  = 46,
-    D3D_SVT_RWBYTEADDRESS_BUFFER    = 47,
-    D3D_SVT_STRUCTURED_BUFFER   = 48,
-    D3D_SVT_RWSTRUCTURED_BUFFER = 49,
-    D3D_SVT_APPEND_STRUCTURED_BUFFER    = 50,
-    D3D_SVT_CONSUME_STRUCTURED_BUFFER   = 51,
-    D3D10_SVT_VOID  = D3D_SVT_VOID,
-    D3D10_SVT_BOOL  = D3D_SVT_BOOL,
-    D3D10_SVT_INT   = D3D_SVT_INT,
-    D3D10_SVT_FLOAT = D3D_SVT_FLOAT,
-    D3D10_SVT_STRING    = D3D_SVT_STRING,
-    D3D10_SVT_TEXTURE   = D3D_SVT_TEXTURE,
-    D3D10_SVT_TEXTURE1D = D3D_SVT_TEXTURE1D,
-    D3D10_SVT_TEXTURE2D = D3D_SVT_TEXTURE2D,
-    D3D10_SVT_TEXTURE3D = D3D_SVT_TEXTURE3D,
-    D3D10_SVT_TEXTURECUBE   = D3D_SVT_TEXTURECUBE,
-    D3D10_SVT_SAMPLER   = D3D_SVT_SAMPLER,
-    D3D10_SVT_SAMPLER1D = D3D_SVT_SAMPLER1D,
-    D3D10_SVT_SAMPLER2D = D3D_SVT_SAMPLER2D,
-    D3D10_SVT_SAMPLER3D = D3D_SVT_SAMPLER3D,
-    D3D10_SVT_SAMPLERCUBE   = D3D_SVT_SAMPLERCUBE,
-    D3D10_SVT_PIXELSHADER   = D3D_SVT_PIXELSHADER,
-    D3D10_SVT_VERTEXSHADER  = D3D_SVT_VERTEXSHADER,
-    D3D10_SVT_PIXELFRAGMENT = D3D_SVT_PIXELFRAGMENT,
-    D3D10_SVT_VERTEXFRAGMENT    = D3D_SVT_VERTEXFRAGMENT,
-    D3D10_SVT_UINT  = D3D_SVT_UINT,
-    D3D10_SVT_UINT8 = D3D_SVT_UINT8,
-    D3D10_SVT_GEOMETRYSHADER    = D3D_SVT_GEOMETRYSHADER,
-    D3D10_SVT_RASTERIZER    = D3D_SVT_RASTERIZER,
-    D3D10_SVT_DEPTHSTENCIL  = D3D_SVT_DEPTHSTENCIL,
-    D3D10_SVT_BLEND = D3D_SVT_BLEND,
-    D3D10_SVT_BUFFER    = D3D_SVT_BUFFER,
-    D3D10_SVT_CBUFFER   = D3D_SVT_CBUFFER,
-    D3D10_SVT_TBUFFER   = D3D_SVT_TBUFFER,
-    D3D10_SVT_TEXTURE1DARRAY    = D3D_SVT_TEXTURE1DARRAY,
-    D3D10_SVT_TEXTURE2DARRAY    = D3D_SVT_TEXTURE2DARRAY,
-    D3D10_SVT_RENDERTARGETVIEW  = D3D_SVT_RENDERTARGETVIEW,
-    D3D10_SVT_DEPTHSTENCILVIEW  = D3D_SVT_DEPTHSTENCILVIEW,
-    D3D10_SVT_TEXTURE2DMS   = D3D_SVT_TEXTURE2DMS,
-    D3D10_SVT_TEXTURE2DMSARRAY  = D3D_SVT_TEXTURE2DMSARRAY,
-    D3D10_SVT_TEXTURECUBEARRAY  = D3D_SVT_TEXTURECUBEARRAY,
-    D3D11_SVT_HULLSHADER    = D3D_SVT_HULLSHADER,
-    D3D11_SVT_DOMAINSHADER  = D3D_SVT_DOMAINSHADER,
-    D3D11_SVT_INTERFACE_POINTER = D3D_SVT_INTERFACE_POINTER,
-    D3D11_SVT_COMPUTESHADER = D3D_SVT_COMPUTESHADER,
-    D3D11_SVT_DOUBLE    = D3D_SVT_DOUBLE,
-    D3D11_SVT_RWTEXTURE1D   = D3D_SVT_RWTEXTURE1D,
-    D3D11_SVT_RWTEXTURE1DARRAY  = D3D_SVT_RWTEXTURE1DARRAY,
-    D3D11_SVT_RWTEXTURE2D   = D3D_SVT_RWTEXTURE2D,
-    D3D11_SVT_RWTEXTURE2DARRAY  = D3D_SVT_RWTEXTURE2DARRAY,
-    D3D11_SVT_RWTEXTURE3D   = D3D_SVT_RWTEXTURE3D,
-    D3D11_SVT_RWBUFFER  = D3D_SVT_RWBUFFER,
-    D3D11_SVT_BYTEADDRESS_BUFFER    = D3D_SVT_BYTEADDRESS_BUFFER,
-    D3D11_SVT_RWBYTEADDRESS_BUFFER  = D3D_SVT_RWBYTEADDRESS_BUFFER,
-    D3D11_SVT_STRUCTURED_BUFFER = D3D_SVT_STRUCTURED_BUFFER,
-    D3D11_SVT_RWSTRUCTURED_BUFFER   = D3D_SVT_RWSTRUCTURED_BUFFER,
-    D3D11_SVT_APPEND_STRUCTURED_BUFFER  = D3D_SVT_APPEND_STRUCTURED_BUFFER,
-    D3D11_SVT_CONSUME_STRUCTURED_BUFFER = D3D_SVT_CONSUME_STRUCTURED_BUFFER,
-    D3D_SVT_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_VARIABLE_TYPE;
-
-typedef
-    enum _D3D_SHADER_INPUT_FLAGS
-{
-    D3D_SIF_USERPACKED  = 1,
-    D3D_SIF_COMPARISON_SAMPLER  = 2,
-    D3D_SIF_TEXTURE_COMPONENT_0 = 4,
-    D3D_SIF_TEXTURE_COMPONENT_1 = 8,
-    D3D_SIF_TEXTURE_COMPONENTS  = 12,
-    D3D10_SIF_USERPACKED    = D3D_SIF_USERPACKED,
-    D3D10_SIF_COMPARISON_SAMPLER    = D3D_SIF_COMPARISON_SAMPLER,
-    D3D10_SIF_TEXTURE_COMPONENT_0   = D3D_SIF_TEXTURE_COMPONENT_0,
-    D3D10_SIF_TEXTURE_COMPONENT_1   = D3D_SIF_TEXTURE_COMPONENT_1,
-    D3D10_SIF_TEXTURE_COMPONENTS    = D3D_SIF_TEXTURE_COMPONENTS,
-    D3D_SIF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_INPUT_FLAGS;
-
-typedef
-    enum _D3D_SHADER_INPUT_TYPE
-{
-    D3D_SIT_CBUFFER = 0,
-    D3D_SIT_TBUFFER = (D3D_SIT_CBUFFER + 1),
-    D3D_SIT_TEXTURE = (D3D_SIT_TBUFFER + 1),
-    D3D_SIT_SAMPLER = (D3D_SIT_TEXTURE + 1),
-    D3D_SIT_UAV_RWTYPED = (D3D_SIT_SAMPLER + 1),
-    D3D_SIT_STRUCTURED  = (D3D_SIT_UAV_RWTYPED + 1),
-    D3D_SIT_UAV_RWSTRUCTURED    = (D3D_SIT_STRUCTURED + 1),
-    D3D_SIT_BYTEADDRESS = (D3D_SIT_UAV_RWSTRUCTURED + 1),
-    D3D_SIT_UAV_RWBYTEADDRESS   = (D3D_SIT_BYTEADDRESS + 1),
-    D3D_SIT_UAV_APPEND_STRUCTURED   = (D3D_SIT_UAV_RWBYTEADDRESS + 1),
-    D3D_SIT_UAV_CONSUME_STRUCTURED  = (D3D_SIT_UAV_APPEND_STRUCTURED + 1),
-    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER   = (D3D_SIT_UAV_CONSUME_STRUCTURED + 1),
-    D3D10_SIT_CBUFFER   = D3D_SIT_CBUFFER,
-    D3D10_SIT_TBUFFER   = D3D_SIT_TBUFFER,
-    D3D10_SIT_TEXTURE   = D3D_SIT_TEXTURE,
-    D3D10_SIT_SAMPLER   = D3D_SIT_SAMPLER,
-    D3D11_SIT_UAV_RWTYPED   = D3D_SIT_UAV_RWTYPED,
-    D3D11_SIT_STRUCTURED    = D3D_SIT_STRUCTURED,
-    D3D11_SIT_UAV_RWSTRUCTURED  = D3D_SIT_UAV_RWSTRUCTURED,
-    D3D11_SIT_BYTEADDRESS   = D3D_SIT_BYTEADDRESS,
-    D3D11_SIT_UAV_RWBYTEADDRESS = D3D_SIT_UAV_RWBYTEADDRESS,
-    D3D11_SIT_UAV_APPEND_STRUCTURED = D3D_SIT_UAV_APPEND_STRUCTURED,
-    D3D11_SIT_UAV_CONSUME_STRUCTURED    = D3D_SIT_UAV_CONSUME_STRUCTURED,
-    D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER = D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER
-}   D3D_SHADER_INPUT_TYPE;
-
-typedef
-    enum _D3D_SHADER_CBUFFER_FLAGS
-{
-    D3D_CBF_USERPACKED  = 1,
-    D3D10_CBF_USERPACKED    = D3D_CBF_USERPACKED,
-    D3D_CBF_FORCE_DWORD = 0x7fffffff
-}   D3D_SHADER_CBUFFER_FLAGS;
-
-typedef
-    enum _D3D_CBUFFER_TYPE
-{
-    D3D_CT_CBUFFER  = 0,
-    D3D_CT_TBUFFER  = (D3D_CT_CBUFFER + 1),
-    D3D_CT_INTERFACE_POINTERS   = (D3D_CT_TBUFFER + 1),
-    D3D_CT_RESOURCE_BIND_INFO   = (D3D_CT_INTERFACE_POINTERS + 1),
-    D3D10_CT_CBUFFER    = D3D_CT_CBUFFER,
-    D3D10_CT_TBUFFER    = D3D_CT_TBUFFER,
-    D3D11_CT_CBUFFER    = D3D_CT_CBUFFER,
-    D3D11_CT_TBUFFER    = D3D_CT_TBUFFER,
-    D3D11_CT_INTERFACE_POINTERS = D3D_CT_INTERFACE_POINTERS,
-    D3D11_CT_RESOURCE_BIND_INFO = D3D_CT_RESOURCE_BIND_INFO
-}   D3D_CBUFFER_TYPE;
-
-typedef
-    enum D3D_NAME
-{
-    D3D_NAME_UNDEFINED  = 0,
-    D3D_NAME_POSITION   = 1,
-    D3D_NAME_CLIP_DISTANCE  = 2,
-    D3D_NAME_CULL_DISTANCE  = 3,
-    D3D_NAME_RENDER_TARGET_ARRAY_INDEX  = 4,
-    D3D_NAME_VIEWPORT_ARRAY_INDEX   = 5,
-    D3D_NAME_VERTEX_ID  = 6,
-    D3D_NAME_PRIMITIVE_ID   = 7,
-    D3D_NAME_INSTANCE_ID    = 8,
-    D3D_NAME_IS_FRONT_FACE  = 9,
-    D3D_NAME_SAMPLE_INDEX   = 10,
-    D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR = 11,
-    D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR   = 12,
-    D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR  = 13,
-    D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR    = 14,
-    D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR   = 15,
-    D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR  = 16,
-    D3D_NAME_TARGET = 64,
-    D3D_NAME_DEPTH  = 65,
-    D3D_NAME_COVERAGE   = 66,
-    D3D_NAME_DEPTH_GREATER_EQUAL    = 67,
-    D3D_NAME_DEPTH_LESS_EQUAL   = 68,
-    D3D10_NAME_UNDEFINED    = D3D_NAME_UNDEFINED,
-    D3D10_NAME_POSITION = D3D_NAME_POSITION,
-    D3D10_NAME_CLIP_DISTANCE    = D3D_NAME_CLIP_DISTANCE,
-    D3D10_NAME_CULL_DISTANCE    = D3D_NAME_CULL_DISTANCE,
-    D3D10_NAME_RENDER_TARGET_ARRAY_INDEX    = D3D_NAME_RENDER_TARGET_ARRAY_INDEX,
-    D3D10_NAME_VIEWPORT_ARRAY_INDEX = D3D_NAME_VIEWPORT_ARRAY_INDEX,
-    D3D10_NAME_VERTEX_ID    = D3D_NAME_VERTEX_ID,
-    D3D10_NAME_PRIMITIVE_ID = D3D_NAME_PRIMITIVE_ID,
-    D3D10_NAME_INSTANCE_ID  = D3D_NAME_INSTANCE_ID,
-    D3D10_NAME_IS_FRONT_FACE    = D3D_NAME_IS_FRONT_FACE,
-    D3D10_NAME_SAMPLE_INDEX = D3D_NAME_SAMPLE_INDEX,
-    D3D10_NAME_TARGET   = D3D_NAME_TARGET,
-    D3D10_NAME_DEPTH    = D3D_NAME_DEPTH,
-    D3D10_NAME_COVERAGE = D3D_NAME_COVERAGE,
-    D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR   = D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR,
-    D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR = D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR,
-    D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR    = D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR,
-    D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR  = D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR,
-    D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR = D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR,
-    D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR    = D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR,
-    D3D11_NAME_DEPTH_GREATER_EQUAL  = D3D_NAME_DEPTH_GREATER_EQUAL,
-    D3D11_NAME_DEPTH_LESS_EQUAL = D3D_NAME_DEPTH_LESS_EQUAL
-}   D3D_NAME;
-
-typedef
-    enum D3D_RESOURCE_RETURN_TYPE
-{
-    D3D_RETURN_TYPE_UNORM   = 1,
-    D3D_RETURN_TYPE_SNORM   = 2,
-    D3D_RETURN_TYPE_SINT    = 3,
-    D3D_RETURN_TYPE_UINT    = 4,
-    D3D_RETURN_TYPE_FLOAT   = 5,
-    D3D_RETURN_TYPE_MIXED   = 6,
-    D3D_RETURN_TYPE_DOUBLE  = 7,
-    D3D_RETURN_TYPE_CONTINUED   = 8,
-    D3D10_RETURN_TYPE_UNORM = D3D_RETURN_TYPE_UNORM,
-    D3D10_RETURN_TYPE_SNORM = D3D_RETURN_TYPE_SNORM,
-    D3D10_RETURN_TYPE_SINT  = D3D_RETURN_TYPE_SINT,
-    D3D10_RETURN_TYPE_UINT  = D3D_RETURN_TYPE_UINT,
-    D3D10_RETURN_TYPE_FLOAT = D3D_RETURN_TYPE_FLOAT,
-    D3D10_RETURN_TYPE_MIXED = D3D_RETURN_TYPE_MIXED,
-    D3D11_RETURN_TYPE_UNORM = D3D_RETURN_TYPE_UNORM,
-    D3D11_RETURN_TYPE_SNORM = D3D_RETURN_TYPE_SNORM,
-    D3D11_RETURN_TYPE_SINT  = D3D_RETURN_TYPE_SINT,
-    D3D11_RETURN_TYPE_UINT  = D3D_RETURN_TYPE_UINT,
-    D3D11_RETURN_TYPE_FLOAT = D3D_RETURN_TYPE_FLOAT,
-    D3D11_RETURN_TYPE_MIXED = D3D_RETURN_TYPE_MIXED,
-    D3D11_RETURN_TYPE_DOUBLE    = D3D_RETURN_TYPE_DOUBLE,
-    D3D11_RETURN_TYPE_CONTINUED = D3D_RETURN_TYPE_CONTINUED
-}   D3D_RESOURCE_RETURN_TYPE;
-
-typedef
-    enum D3D_REGISTER_COMPONENT_TYPE
-{
-    D3D_REGISTER_COMPONENT_UNKNOWN  = 0,
-    D3D_REGISTER_COMPONENT_UINT32   = 1,
-    D3D_REGISTER_COMPONENT_SINT32   = 2,
-    D3D_REGISTER_COMPONENT_FLOAT32  = 3,
-    D3D10_REGISTER_COMPONENT_UNKNOWN    = D3D_REGISTER_COMPONENT_UNKNOWN,
-    D3D10_REGISTER_COMPONENT_UINT32 = D3D_REGISTER_COMPONENT_UINT32,
-    D3D10_REGISTER_COMPONENT_SINT32 = D3D_REGISTER_COMPONENT_SINT32,
-    D3D10_REGISTER_COMPONENT_FLOAT32    = D3D_REGISTER_COMPONENT_FLOAT32
-}   D3D_REGISTER_COMPONENT_TYPE;
-
-typedef
-    enum D3D_TESSELLATOR_DOMAIN
-{
-    D3D_TESSELLATOR_DOMAIN_UNDEFINED    = 0,
-    D3D_TESSELLATOR_DOMAIN_ISOLINE  = 1,
-    D3D_TESSELLATOR_DOMAIN_TRI  = 2,
-    D3D_TESSELLATOR_DOMAIN_QUAD = 3,
-    D3D11_TESSELLATOR_DOMAIN_UNDEFINED  = D3D_TESSELLATOR_DOMAIN_UNDEFINED,
-    D3D11_TESSELLATOR_DOMAIN_ISOLINE    = D3D_TESSELLATOR_DOMAIN_ISOLINE,
-    D3D11_TESSELLATOR_DOMAIN_TRI    = D3D_TESSELLATOR_DOMAIN_TRI,
-    D3D11_TESSELLATOR_DOMAIN_QUAD   = D3D_TESSELLATOR_DOMAIN_QUAD
-}   D3D_TESSELLATOR_DOMAIN;
-
-typedef
-    enum D3D_TESSELLATOR_PARTITIONING
-{
-    D3D_TESSELLATOR_PARTITIONING_UNDEFINED  = 0,
-    D3D_TESSELLATOR_PARTITIONING_INTEGER    = 1,
-    D3D_TESSELLATOR_PARTITIONING_POW2   = 2,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN    = 4,
-    D3D11_TESSELLATOR_PARTITIONING_UNDEFINED    = D3D_TESSELLATOR_PARTITIONING_UNDEFINED,
-    D3D11_TESSELLATOR_PARTITIONING_INTEGER  = D3D_TESSELLATOR_PARTITIONING_INTEGER,
-    D3D11_TESSELLATOR_PARTITIONING_POW2 = D3D_TESSELLATOR_PARTITIONING_POW2,
-    D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD   = D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD,
-    D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN  = D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN
-}   D3D_TESSELLATOR_PARTITIONING;
-
-typedef
-    enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE
-{
-    D3D_TESSELLATOR_OUTPUT_UNDEFINED    = 0,
-    D3D_TESSELLATOR_OUTPUT_POINT    = 1,
-    D3D_TESSELLATOR_OUTPUT_LINE = 2,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW  = 3,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4,
-    D3D11_TESSELLATOR_OUTPUT_UNDEFINED  = D3D_TESSELLATOR_OUTPUT_UNDEFINED,
-    D3D11_TESSELLATOR_OUTPUT_POINT  = D3D_TESSELLATOR_OUTPUT_POINT,
-    D3D11_TESSELLATOR_OUTPUT_LINE   = D3D_TESSELLATOR_OUTPUT_LINE,
-    D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW    = D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW,
-    D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW   = D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW
-}   D3D_TESSELLATOR_OUTPUT_PRIMITIVE;
-
-typedef
-    enum D3D_MIN_PRECISION
-{
-    D3D_MIN_PRECISION_DEFAULT   = 0,
-    D3D_MIN_PRECISION_FLOAT_16  = 1,
-    D3D_MIN_PRECISION_FLOAT_2_8 = 2,
-    D3D_MIN_PRECISION_RESERVED  = 3,
-    D3D_MIN_PRECISION_SINT_16   = 4,
-    D3D_MIN_PRECISION_UINT_16   = 5,
-    D3D_MIN_PRECISION_ANY_16    = 0xf0,
-    D3D_MIN_PRECISION_ANY_10    = 0xf1
-}   D3D_MIN_PRECISION;
-
-typedef struct _D3D_SHADER_MACRO
-{
-    LPCSTR Name;
-    LPCSTR Definition;
-}   D3D_SHADER_MACRO;
-
-typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO;
-
-struct ID3DInclude
-{
-    virtual HRESULT STDMETHODCALLTYPE Open(D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID* ppData, UINT* pBytes) = 0;
-    virtual HRESULT STDMETHODCALLTYPE Open(LPCVOID pData) = 0;
-};
-
-#endif //__DXGL_D3DCommon_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DCompiler.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DCompiler.h
deleted file mode 100644
index 9679fd25f8..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DCompiler.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DCompiler h in the DirectX SDK
-
-#ifndef __DXGL_D3D11Compiler_h__
-#define __DXGL_D3D11Compiler_h__
-
-#include "DXMETAL_D3D11Shader.h"
-
-#define D3DCOMPILE_DEBUG                          (1 << 0)
-#define D3DCOMPILE_SKIP_VALIDATION                (1 << 1)
-#define D3DCOMPILE_SKIP_OPTIMIZATION              (1 << 2)
-#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR          (1 << 3)
-#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR       (1 << 4)
-#define D3DCOMPILE_PARTIAL_PRECISION              (1 << 5)
-#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT       (1 << 6)
-#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT       (1 << 7)
-#define D3DCOMPILE_NO_PRESHADER                   (1 << 8)
-#define D3DCOMPILE_AVOID_FLOW_CONTROL             (1 << 9)
-#define D3DCOMPILE_PREFER_FLOW_CONTROL            (1 << 10)
-#define D3DCOMPILE_ENABLE_STRICTNESS              (1 << 11)
-#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY (1 << 12)
-#define D3DCOMPILE_IEEE_STRICTNESS                (1 << 13)
-#define D3DCOMPILE_OPTIMIZATION_LEVEL0            (1 << 14)
-#define D3DCOMPILE_OPTIMIZATION_LEVEL1            0
-#define D3DCOMPILE_OPTIMIZATION_LEVEL2            ((1 << 14) | (1 << 15))
-#define D3DCOMPILE_OPTIMIZATION_LEVEL3            (1 << 15)
-#define D3DCOMPILE_RESERVED16                     (1 << 16)
-#define D3DCOMPILE_RESERVED17                     (1 << 17)
-#define D3DCOMPILE_WARNINGS_ARE_ERRORS            (1 << 18)
-
-typedef HRESULT (WINAPI * pD3DCompile)
-    (LPCVOID                         pSrcData,
-    SIZE_T                          SrcDataSize,
-    LPCSTR                          pFileName,
-    CONST D3D_SHADER_MACRO*         pDefines,
-    ID3DInclude*                    pInclude,
-    LPCSTR                          pEntrypoint,
-    LPCSTR                          pTarget,
-    UINT                            Flags1,
-    UINT                            Flags2,
-    ID3DBlob**                      ppCode,
-    ID3DBlob**                      ppErrorMsgs);
-
-#endif //__DXGL_D3D11Compiler_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DX11.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DX11.h
deleted file mode 100644
index fcafc0a8e4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DX11.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in D3DX11tex.h in the DirectX SDK
-
-#ifndef __DXGL_D3DX11_h__
-#define __DXGL_D3DX11_h__
-
-#include "DXMETAL_D3DX11tex.h"
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-struct ID3DX11ThreadPump;
-
-#endif //__DXGL_D3DX11_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DX11tex.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DX11tex.h
deleted file mode 100644
index ef19de2186..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_D3DX11tex.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description: Contains portable definition of structs and enums to match
-//               those in D3DX11tex.h in the DirectX SDK
-
-#ifndef __DXGL_D3DX11tex_h__
-#define __DXGL_D3DX11tex_h__
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef enum D3DX11_FILTER_FLAG
-{
-    D3DX11_FILTER_NONE            =   (1 << 0),
-    D3DX11_FILTER_POINT           =   (2 << 0),
-    D3DX11_FILTER_LINEAR          =   (3 << 0),
-    D3DX11_FILTER_TRIANGLE        =   (4 << 0),
-    D3DX11_FILTER_BOX             =   (5 << 0),
-
-    D3DX11_FILTER_MIRROR_U        =   (1 << 16),
-    D3DX11_FILTER_MIRROR_V        =   (2 << 16),
-    D3DX11_FILTER_MIRROR_W        =   (4 << 16),
-    D3DX11_FILTER_MIRROR          =   (7 << 16),
-
-    D3DX11_FILTER_DITHER          =   (1 << 19),
-    D3DX11_FILTER_DITHER_DIFFUSION =   (2 << 19),
-
-    D3DX11_FILTER_SRGB_IN         =   (1 << 21),
-    D3DX11_FILTER_SRGB_OUT        =   (2 << 21),
-    D3DX11_FILTER_SRGB            =   (3 << 21),
-} D3DX11_FILTER_FLAG;
-
-typedef enum D3DX11_NORMALMAP_FLAG
-{
-    D3DX11_NORMALMAP_MIRROR_U          =   (1 << 16),
-    D3DX11_NORMALMAP_MIRROR_V          =   (2 << 16),
-    D3DX11_NORMALMAP_MIRROR            =   (3 << 16),
-    D3DX11_NORMALMAP_INVERTSIGN        =   (8 << 16),
-    D3DX11_NORMALMAP_COMPUTE_OCCLUSION =   (16 << 16),
-} D3DX11_NORMALMAP_FLAG;
-
-typedef enum D3DX11_CHANNEL_FLAG
-{
-    D3DX11_CHANNEL_RED           =    (1 << 0),
-    D3DX11_CHANNEL_BLUE          =    (1 << 1),
-    D3DX11_CHANNEL_GREEN         =    (1 << 2),
-    D3DX11_CHANNEL_ALPHA         =    (1 << 3),
-    D3DX11_CHANNEL_LUMINANCE     =    (1 << 4),
-} D3DX11_CHANNEL_FLAG;
-
-typedef enum D3DX11_IMAGE_FILE_FORMAT
-{
-    D3DX11_IFF_BMP         = 0,
-    D3DX11_IFF_JPG         = 1,
-    D3DX11_IFF_PNG         = 3,
-    D3DX11_IFF_DDS         = 4,
-    D3DX11_IFF_TIFF       = 10,
-    D3DX11_IFF_GIF        = 11,
-    D3DX11_IFF_WMP        = 12,
-    D3DX11_IFF_FORCE_DWORD = 0x7fffffff
-} D3DX11_IMAGE_FILE_FORMAT;
-
-typedef enum D3DX11_SAVE_TEXTURE_FLAG
-{
-    D3DX11_STF_USEINPUTBLOB      = 0x0001,
-} D3DX11_SAVE_TEXTURE_FLAG;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct D3DX11_IMAGE_INFO
-{
-    UINT                        Width;
-    UINT                        Height;
-    UINT                        Depth;
-    UINT                        ArraySize;
-    UINT                        MipLevels;
-    UINT                        MiscFlags;
-    DXGI_FORMAT                 Format;
-    D3D11_RESOURCE_DIMENSION    ResourceDimension;
-    D3DX11_IMAGE_FILE_FORMAT    ImageFileFormat;
-} D3DX11_IMAGE_INFO;
-
-typedef struct D3DX11_IMAGE_LOAD_INFO
-{
-    UINT                       Width;
-    UINT                       Height;
-    UINT                       Depth;
-    UINT                       FirstMipLevel;
-    UINT                       MipLevels;
-    D3D11_USAGE                Usage;
-    UINT                       BindFlags;
-    UINT                       CpuAccessFlags;
-    UINT                       MiscFlags;
-    DXGI_FORMAT                Format;
-    UINT                       Filter;
-    UINT                       MipFilter;
-    D3DX11_IMAGE_INFO*         pSrcInfo;
-} D3DX11_IMAGE_LOAD_INFO;
-
-typedef struct _D3DX11_TEXTURE_LOAD_INFO
-{
-    D3D11_BOX* pSrcBox;
-    D3D11_BOX* pDstBox;
-    UINT            SrcFirstMip;
-    UINT            DstFirstMip;
-    UINT            NumMips;
-    UINT            SrcFirstElement;
-    UINT            DstFirstElement;
-    UINT            NumElements;
-    UINT            Filter;
-    UINT            MipFilter;
-} D3DX11_TEXTURE_LOAD_INFO;
-
-#endif //__DXGL_D3DX11tex_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_ID3D11Device.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_ID3D11Device.h
deleted file mode 100644
index 8ab6ae55ee..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_ID3D11Device.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the ID3D11Device interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_ID3D11Device_h__
-#define __DXGL_ID3D11Device_h__
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXMETALBase.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-struct ID3D11DeviceContext;
-
-struct ID3D11Device
-#if DXGL_FULL_EMULATION
-    : IUnknown
-#else
-    : CCryDXGLBase
-#endif
-{
-    // ID3D11Device interface (adapted from DXSDK/include/D3D11.h)
-    virtual HRESULT STDMETHODCALLTYPE CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext) = 0;
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels) = 0;
-    virtual void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData) = 0;
-    virtual D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel(void) = 0;
-    virtual UINT STDMETHODCALLTYPE GetCreationFlags(void) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason(void) = 0;
-    virtual void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags) = 0;
-    virtual UINT STDMETHODCALLTYPE GetExceptionMode(void) = 0;
-
-    // IDXGIDevice interface (adapted from DXSDK/include/dxgi.h)
-    virtual HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority) {return E_NOTIMPL; }
-
-    // IDXGIDevice1 interface (adapted from DXSDK/include/dxgi.h)
-    virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(UINT MaxLatency) {return E_NOTIMPL; }
-    virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(UINT* pMaxLatency) {return E_NOTIMPL; }
-};
-
-#if !defined(CRY_DXCAPTURE_ENABLED) && !DXGL_FULL_EMULATION
-typedef ID3D11Device IDXGIDevice;
-typedef ID3D11Device IDXGIDevice1;
-#endif // !defined(CRY_DXCAPTURE_ENABLED) && !DXGL_FULL_EMULATION
-
-
-#endif // __DXGL_ID3D11Device_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_ID3D11DeviceContext.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_ID3D11DeviceContext.h
deleted file mode 100644
index a62faa5e14..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_ID3D11DeviceContext.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the ID3D11DeviceContext interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_ID3D11DeviceContext_h__
-#define __DXGL_ID3D11DeviceContext_h__
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXMETALDeviceChild.hpp"
-#endif //DXGL_FULL_EMULATION
-
-struct ID3DDevice;
-
-struct ID3D11DeviceContext
-#if DXGL_FULL_EMULATION
-    : ID3D11DeviceChild
-#else
-    : CCryDXGLDeviceChild
-#endif
-{
-    // ID3D11DeviceContext interface (adapted from DXSDK/include/D3D11.h)
-    virtual void STDMETHODCALLTYPE VSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE PSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE PSSetShader(ID3D11PixelShader* pPixelShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE VSSetShader(ID3D11VertexShader* pVertexShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation) = 0;
-    virtual void STDMETHODCALLTYPE Draw(UINT VertexCount, UINT StartVertexLocation) = 0;
-    virtual HRESULT STDMETHODCALLTYPE Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource) = 0;
-    virtual void STDMETHODCALLTYPE Unmap(ID3D11Resource* pResource, UINT Subresource) = 0;
-    virtual void STDMETHODCALLTYPE PSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE IASetInputLayout(ID3D11InputLayout* pInputLayout) = 0;
-    virtual void STDMETHODCALLTYPE IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation) = 0;
-    virtual void STDMETHODCALLTYPE DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation) = 0;
-    virtual void STDMETHODCALLTYPE GSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE GSSetShader(ID3D11GeometryShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology) = 0;
-    virtual void STDMETHODCALLTYPE VSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE VSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE Begin(ID3D11Asynchronous* pAsync) = 0;
-    virtual void STDMETHODCALLTYPE End(ID3D11Asynchronous* pAsync) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags) = 0;
-    virtual void STDMETHODCALLTYPE SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue) = 0;
-    virtual void STDMETHODCALLTYPE GSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE GSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView) = 0;
-    virtual void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts) = 0;
-    virtual void STDMETHODCALLTYPE OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask) = 0;
-    virtual void STDMETHODCALLTYPE OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef) = 0;
-    virtual void STDMETHODCALLTYPE SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE DrawAuto(void) = 0;
-    virtual void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ) = 0;
-    virtual void STDMETHODCALLTYPE DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs) = 0;
-    virtual void STDMETHODCALLTYPE RSSetState(ID3D11RasterizerState* pRasterizerState) = 0;
-    virtual void STDMETHODCALLTYPE RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports) = 0;
-    virtual void STDMETHODCALLTYPE RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects) = 0;
-    virtual void STDMETHODCALLTYPE CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox) = 0;
-    virtual void STDMETHODCALLTYPE CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource) = 0;
-    virtual void STDMETHODCALLTYPE UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch) = 0;
-    virtual void STDMETHODCALLTYPE CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView) = 0;
-    virtual void STDMETHODCALLTYPE ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ]) = 0;
-    virtual void STDMETHODCALLTYPE ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil) = 0;
-    virtual void STDMETHODCALLTYPE GenerateMips(ID3D11ShaderResourceView* pShaderResourceView) = 0;
-    virtual void STDMETHODCALLTYPE SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD) = 0;
-    virtual FLOAT STDMETHODCALLTYPE GetResourceMinLOD(ID3D11Resource* pResource) = 0;
-    virtual void STDMETHODCALLTYPE ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format) = 0;
-    virtual void STDMETHODCALLTYPE ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState) = 0;
-    virtual void STDMETHODCALLTYPE HSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE HSSetShader(ID3D11HullShader* pHullShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE HSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE HSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE DSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE DSSetShader(ID3D11DomainShader* pDomainShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE DSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE CSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts) = 0;
-    virtual void STDMETHODCALLTYPE CSSetShader(ID3D11ComputeShader* pComputeShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE CSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE CSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE VSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE PSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE PSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout) = 0;
-    virtual void STDMETHODCALLTYPE IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets) = 0;
-    virtual void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset) = 0;
-    virtual void STDMETHODCALLTYPE GSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology) = 0;
-    virtual void STDMETHODCALLTYPE VSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE VSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue) = 0;
-    virtual void STDMETHODCALLTYPE GSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE GSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView) = 0;
-    virtual void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews) = 0;
-    virtual void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState * *ppBlendState, FLOAT BlendFactor[ 4 ], UINT * pSampleMask) = 0;
-    virtual void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef) = 0;
-    virtual void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets) = 0;
-    virtual void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState) = 0;
-    virtual void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports) = 0;
-    virtual void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects) = 0;
-    virtual void STDMETHODCALLTYPE HSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE HSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE HSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE DSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE DSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE DSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE CSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews) = 0;
-    virtual void STDMETHODCALLTYPE CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews) = 0;
-    virtual void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances) = 0;
-    virtual void STDMETHODCALLTYPE CSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers) = 0;
-    virtual void STDMETHODCALLTYPE CSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers) = 0;
-    virtual void STDMETHODCALLTYPE ClearState(void) = 0;
-    virtual void STDMETHODCALLTYPE Flush(void) = 0;
-    virtual D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType(void) = 0;
-    virtual UINT STDMETHODCALLTYPE GetContextFlags(void) = 0;
-    virtual HRESULT STDMETHODCALLTYPE FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList) = 0;
-};
-
-
-#endif // __DXGL_ID3D11DeviceContext_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_IDXGIFactory1.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_IDXGIFactory1.h
deleted file mode 100644
index 1b4944424e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_IDXGIFactory1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the IDXGIFactory1 interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_IDXGIFactory1_h__
-#define __DXGL_IDXGIFactory1_h__
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXMETALGIObject.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-struct IDXGIFactory1
-#if DXGL_FULL_EMULATION
-    : IDXGIFactory
-#else
-    : CCryDXGLGIObject
-#endif
-{
-    // IDXGIFactory interface
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter) = 0;
-
-    // IDXGIFactory1 interface
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter) = 0;
-    virtual BOOL STDMETHODCALLTYPE IsCurrent() = 0;
-};
-
-#endif // __DXGL_IDXGIFactory1_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_IDXGISwapChain.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_IDXGISwapChain.h
deleted file mode 100644
index 72396c31f7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_IDXGISwapChain.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains a definition of the IDXGISwapChain interface
-//               matching the one in the DirectX SDK
-
-#ifndef __DXGL_IDXGISwapChain_h__
-#define __DXGL_IDXGISwapChain_h__
-
-#if !DXGL_FULL_EMULATION
-#include "../Interfaces/CCryDXMETALGIObject.hpp"
-#endif //!DXGL_FULL_EMULATION
-
-#if DXGL_FULL_EMULATION
-struct IDXGISwapChain
-    : IDXGIDeviceSubObject
-#else
-struct IDXGISwapChain
-    : CCryDXGLGIObject
-#endif
-{
-    // IDXGISwapChain interface
-    virtual HRESULT STDMETHODCALLTYPE Present(UINT SyncInterval, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetBuffer(UINT Buffer, REFIID riid, void** ppSurface) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetContainingOutput(IDXGIOutput** ppOutput) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount(UINT* pLastPresentCount) = 0;
-
-    // IDXGIDeviceSubObject interface
-    virtual HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) = 0;
-};
-
-#endif // __DXGL_IDXGISwapChain_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_dxgi.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_dxgi.h
deleted file mode 100644
index 1a59ea3781..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_dxgi.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in DXGI.h in the DirectX SDK
-
-#ifndef __DXGL_DXGI_h__
-#define __DXGL_DXGI_h__
-
-#include "DXMETAL_dxgitype.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#define DXGI_MAX_SWAP_CHAIN_BUFFERS        (16)
-#define DXGI_PRESENT_TEST               0x00000001UL
-#define DXGI_PRESENT_DO_NOT_SEQUENCE    0x00000002UL
-#define DXGI_PRESENT_RESTART            0x00000004UL
-
-#define DXGI_USAGE_SHADER_INPUT             (1L << (0 + 4))
-#define DXGI_USAGE_RENDER_TARGET_OUTPUT     (1L << (1 + 4))
-#define DXGI_USAGE_BACK_BUFFER              (1L << (2 + 4))
-#define DXGI_USAGE_SHARED                   (1L << (3 + 4))
-#define DXGI_USAGE_READ_ONLY                (1L << (4 + 4))
-#define DXGI_USAGE_DISCARD_ON_PRESENT       (1L << (5 + 4))
-#define DXGI_USAGE_UNORDERED_ACCESS         (1L << (6 + 4))
-
-#define DXGI_ENUM_MODES_INTERLACED  (1UL)
-
-#define DXGI_ENUM_MODES_SCALING (2UL)
-
-#define DXGI_MWA_NO_WINDOW_CHANGES      (1 << 0)
-#define DXGI_MWA_NO_ALT_ENTER           (1 << 1)
-#define DXGI_MWA_NO_PRINT_SCREEN        (1 << 2)
-#define DXGI_MWA_VALID                  (0x7)
-
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Enums
-////////////////////////////////////////////////////////////////////////////
-
-typedef
-    enum DXGI_RESIDENCY
-{
-    DXGI_RESIDENCY_FULLY_RESIDENT   = 1,
-    DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY    = 2,
-    DXGI_RESIDENCY_EVICTED_TO_DISK  = 3
-}   DXGI_RESIDENCY;
-
-typedef
-    enum DXGI_SWAP_EFFECT
-{
-    DXGI_SWAP_EFFECT_DISCARD    = 0,
-    DXGI_SWAP_EFFECT_SEQUENTIAL = 1
-}   DXGI_SWAP_EFFECT;
-
-typedef
-    enum DXGI_SWAP_CHAIN_FLAG
-{
-    DXGI_SWAP_CHAIN_FLAG_NONPREROTATED  = 1,
-    DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH  = 2,
-    DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4
-}   DXGI_SWAP_CHAIN_FLAG;
-
-typedef
-    enum DXGI_ADAPTER_FLAG
-{
-    DXGI_ADAPTER_FLAG_NONE  = 0,
-    DXGI_ADAPTER_FLAG_REMOTE    = 1,
-    DXGI_ADAPTER_FLAG_FORCE_DWORD   = 0xffffffff
-}   DXGI_ADAPTER_FLAG;
-
-typedef UINT DXGI_USAGE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct DXGI_FRAME_STATISTICS
-{
-    UINT PresentCount;
-    UINT PresentRefreshCount;
-    UINT SyncRefreshCount;
-    LARGE_INTEGER SyncQPCTime;
-    LARGE_INTEGER SyncGPUTime;
-}   DXGI_FRAME_STATISTICS;
-
-typedef struct DXGI_MAPPED_RECT
-{
-    INT Pitch;
-    BYTE* pBits;
-}   DXGI_MAPPED_RECT;
-
-typedef struct DXGI_ADAPTER_DESC
-{
-    WCHAR Description[ 128 ];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-}   DXGI_ADAPTER_DESC;
-
-typedef struct DXGI_OUTPUT_DESC
-{
-    WCHAR DeviceName[ 32 ];
-    RECT DesktopCoordinates;
-    BOOL AttachedToDesktop;
-    DXGI_MODE_ROTATION Rotation;
-    HMONITOR Monitor;
-}   DXGI_OUTPUT_DESC;
-
-typedef struct DXGI_SHARED_RESOURCE
-{
-    HANDLE Handle;
-}   DXGI_SHARED_RESOURCE;
-
-typedef struct DXGI_SURFACE_DESC
-{
-    UINT Width;
-    UINT Height;
-    DXGI_FORMAT Format;
-    DXGI_SAMPLE_DESC SampleDesc;
-}   DXGI_SURFACE_DESC;
-
-typedef struct DXGI_SWAP_CHAIN_DESC
-{
-    DXGI_MODE_DESC BufferDesc;
-    DXGI_SAMPLE_DESC SampleDesc;
-    DXGI_USAGE BufferUsage;
-    UINT BufferCount;
-    HWND OutputWindow;
-    BOOL Windowed;
-    DXGI_SWAP_EFFECT SwapEffect;
-    UINT Flags;
-}   DXGI_SWAP_CHAIN_DESC;
-
-typedef struct DXGI_ADAPTER_DESC1
-{
-    WCHAR Description[ 128 ];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-    UINT Flags;
-}   DXGI_ADAPTER_DESC1;
-
-typedef struct DXGI_DISPLAY_COLOR_SPACE
-{
-    FLOAT PrimaryCoordinates[ 8 ][ 2 ];
-    FLOAT WhitePoints[ 16 ][ 2 ];
-}   DXGI_DISPLAY_COLOR_SPACE;
-
-
-typedef UINT DXGI_USAGE;
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Forward declaration of unused interfaces
-////////////////////////////////////////////////////////////////////////////
-
-//struct IDXGIObject;            // Typedef as CCryDXGLGIObject
-struct IDXGIDeviceSubObject;
-struct IDXGIResource;
-struct IDXGIKeyedMutex;
-struct IDXGISurface;
-struct IDXGISurface1;
-//struct IDXGIAdapter;           // Typedef as CCryDXGLGIAdapter
-//struct IDXGIOutput;            // Typedef as CCryDXGLGIOutput
-//struct IDXGISwapChain;         // Typedef as CCryDXGLSwapChain
-//struct IDXGIFactory;           // Typedef as CCryDXGLGIFactory
-//struct IDXGIDevice;            // Typedef as CCryDXGLDevice
-//struct IDXGIFactory1;          // Typedef as CCryDXGLGIFactory
-//struct IDXGIAdapter1;          // Typedef as CCryDXGLGIAdapter
-//struct IDXGIDevice1;           // Typedef as CCryDXGLDevice
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Interfaces for full DX emulation
-////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-struct IDXGIObject
-    : IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID Name, UINT DataSize, const void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetParent(REFIID riid, void** ppParent) = 0;
-};
-
-struct IDXGIOutput
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(DXGI_OUTPUT_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice) = 0;
-    virtual HRESULT STDMETHODCALLTYPE WaitForVBlank() = 0;
-    virtual HRESULT STDMETHODCALLTYPE TakeOwnership(IUnknown* pDevice, BOOL Exclusive) = 0;
-    virtual void STDMETHODCALLTYPE ReleaseOwnership() = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetGammaControl(const DXGI_GAMMA_CONTROL* pArray) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetGammaControl(DXGI_GAMMA_CONTROL* pArray) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetDisplaySurface(IDXGISurface* pScanoutSurface) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData(IDXGISurface* pDestination) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats) = 0;
-};
-
-struct IDXGIAdapter
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE EnumOutputs(UINT Output, IDXGIOutput** ppOutput) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetDesc(DXGI_ADAPTER_DESC* pDesc) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion) = 0;
-};
-
-struct IDXGISwapChain;
-
-struct IDXGIFactory
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter) = 0;
-};
-
-struct IDXGIDevice
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter) = 0;
-    virtual HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface) = 0;
-    virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources) = 0;
-    virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority) = 0;
-};
-
-struct IDXGIDeviceSubObject
-    : IDXGIObject
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) = 0;
-};
-
-struct IDXGIAdapter1
-    : IDXGIAdapter
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDesc1(DXGI_ADAPTER_DESC1* pDesc) = 0;
-};
-
-struct IDXGIDevice1
-    : IDXGIDevice
-{
-    virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(UINT MaxLatency) = 0;
-    virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(UINT* pMaxLatency) = 0;
-};
-
-#endif //DXGL_FULL_EMULATION
-
-#endif //__DXGL_DXGI_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_dxgitype.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_dxgitype.h
deleted file mode 100644
index 7761800e1a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/DXMETAL_dxgitype.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains portable definition of structs and enums to match
-//               those in dxgitype.h in the DirectX SDK
-
-#ifndef __DXGL_dxgitype_h__
-#define __DXGL_dxgitype_h__
-
-#include <AzDXGIFormat.h>
-
-////////////////////////////////////////////////////////////////////////////
-//  Defines
-////////////////////////////////////////////////////////////////////////////
-
-#define _FACDXGI    0x87a
-#define MAKE_DXGI_HRESULT(code) MAKE_HRESULT(1, _FACDXGI, code)
-#define MAKE_DXGI_STATUS(code)  MAKE_HRESULT(0, _FACDXGI, code)
-
-#if !defined(DXGI_STATUS_OCCLUDED) ||                     \
-    !defined(DXGI_STATUS_CLIPPED) ||                      \
-    !defined(DXGI_STATUS_NO_REDIRECTION) ||               \
-    !defined(DXGI_STATUS_NO_DESKTOP_ACCESS) ||            \
-    !defined(DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE) || \
-    !defined(DXGI_STATUS_MODE_CHANGED) ||                 \
-    !defined(DXGI_STATUS_MODE_CHANGE_IN_PROGRESS)
-#undef DXGI_STATUS_OCCLUDED
-#undef DXGI_STATUS_CLIPPED
-#undef DXGI_STATUS_NO_REDIRECTION
-#undef DXGI_STATUS_NO_DESKTOP_ACCESS
-#undef DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE
-#undef DXGI_STATUS_MODE_CHANGED
-#undef DXGI_STATUS_MODE_CHANGE_IN_PROGRESS
-#define DXGI_STATUS_OCCLUDED                    MAKE_DXGI_STATUS(1)
-#define DXGI_STATUS_CLIPPED                     MAKE_DXGI_STATUS(2)
-#define DXGI_STATUS_NO_REDIRECTION              MAKE_DXGI_STATUS(4)
-#define DXGI_STATUS_NO_DESKTOP_ACCESS           MAKE_DXGI_STATUS(5)
-#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6)
-#define DXGI_STATUS_MODE_CHANGED                MAKE_DXGI_STATUS(7)
-#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS     MAKE_DXGI_STATUS(8)
-#endif
-#if !defined(DXGI_ERROR_INVALID_CALL) ||                 \
-    !defined(DXGI_ERROR_NOT_FOUND) ||                    \
-    !defined(DXGI_ERROR_MORE_DATA) ||                    \
-    !defined(DXGI_ERROR_UNSUPPORTED) ||                  \
-    !defined(DXGI_ERROR_DEVICE_REMOVED) ||               \
-    !defined(DXGI_ERROR_DEVICE_HUNG) ||                  \
-    !defined(DXGI_ERROR_DEVICE_RESET) ||                 \
-    !defined(DXGI_ERROR_WAS_STILL_DRAWING) ||            \
-    !defined(DXGI_ERROR_FRAME_STATISTICS_DISJOINT) ||    \
-    !defined(DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE) || \
-    !defined(DXGI_ERROR_DRIVER_INTERNAL_ERROR) ||        \
-    !defined(DXGI_ERROR_NONEXCLUSIVE) ||                 \
-    !defined(DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) ||      \
-    !defined(DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED) ||   \
-    !defined(DXGI_ERROR_REMOTE_OUTOFMEMORY)
-#undef DXGI_ERROR_INVALID_CALL
-#undef DXGI_ERROR_NOT_FOUND
-#undef DXGI_ERROR_MORE_DATA
-#undef DXGI_ERROR_UNSUPPORTED
-#undef DXGI_ERROR_DEVICE_REMOVED
-#undef DXGI_ERROR_DEVICE_HUNG
-#undef DXGI_ERROR_DEVICE_RESET
-#undef DXGI_ERROR_WAS_STILL_DRAWING
-#undef DXGI_ERROR_FRAME_STATISTICS_DISJOINT
-#undef DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE
-#undef DXGI_ERROR_DRIVER_INTERNAL_ERROR
-#undef DXGI_ERROR_NONEXCLUSIVE
-#undef DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
-#undef DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED
-#undef DXGI_ERROR_REMOTE_OUTOFMEMORY
-#define DXGI_ERROR_INVALID_CALL                 MAKE_DXGI_HRESULT(1)
-#define DXGI_ERROR_NOT_FOUND                    MAKE_DXGI_HRESULT(2)
-#define DXGI_ERROR_MORE_DATA                    MAKE_DXGI_HRESULT(3)
-#define DXGI_ERROR_UNSUPPORTED                  MAKE_DXGI_HRESULT(4)
-#define DXGI_ERROR_DEVICE_REMOVED               MAKE_DXGI_HRESULT(5)
-#define DXGI_ERROR_DEVICE_HUNG                  MAKE_DXGI_HRESULT(6)
-#define DXGI_ERROR_DEVICE_RESET                 MAKE_DXGI_HRESULT(7)
-#define DXGI_ERROR_WAS_STILL_DRAWING            MAKE_DXGI_HRESULT(10)
-#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT    MAKE_DXGI_HRESULT(11)
-#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)
-#define DXGI_ERROR_DRIVER_INTERNAL_ERROR        MAKE_DXGI_HRESULT(32)
-#define DXGI_ERROR_NONEXCLUSIVE                 MAKE_DXGI_HRESULT(33)
-#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE      MAKE_DXGI_HRESULT(34)
-#define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED   MAKE_DXGI_HRESULT(35)
-#define DXGI_ERROR_REMOTE_OUTOFMEMORY           MAKE_DXGI_HRESULT(36)
-#endif
-
-
-////////////////////////////////////////////////////////////////////////////
-//  Structs
-////////////////////////////////////////////////////////////////////////////
-
-typedef struct DXGI_RGB
-{
-    float Red;
-    float Green;
-    float Blue;
-} DXGI_RGB;
-
-typedef struct DXGI_GAMMA_CONTROL
-{
-    DXGI_RGB Scale;
-    DXGI_RGB Offset;
-    DXGI_RGB GammaCurve[ 1025 ];
-} DXGI_GAMMA_CONTROL;
-
-typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES
-{
-    BOOL ScaleAndOffsetSupported;
-    float MaxConvertedValue;
-    float MinConvertedValue;
-    UINT NumGammaControlPoints;
-    float ControlPointPositions[1025];
-} DXGI_GAMMA_CONTROL_CAPABILITIES;
-
-typedef struct DXGI_RATIONAL
-{
-    UINT Numerator;
-    UINT Denominator;
-} DXGI_RATIONAL;
-
-typedef enum DXGI_MODE_SCANLINE_ORDER
-{
-    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED        = 0,
-    DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE        = 1,
-    DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST  = 2,
-    DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST  = 3
-} DXGI_MODE_SCANLINE_ORDER;
-
-typedef enum DXGI_MODE_SCALING
-{
-    DXGI_MODE_SCALING_UNSPECIFIED   = 0,
-    DXGI_MODE_SCALING_CENTERED      = 1,
-    DXGI_MODE_SCALING_STRETCHED     = 2
-} DXGI_MODE_SCALING;
-
-typedef enum DXGI_MODE_ROTATION
-{
-    DXGI_MODE_ROTATION_UNSPECIFIED  = 0,
-    DXGI_MODE_ROTATION_IDENTITY     = 1,
-    DXGI_MODE_ROTATION_ROTATE90     = 2,
-    DXGI_MODE_ROTATION_ROTATE180    = 3,
-    DXGI_MODE_ROTATION_ROTATE270    = 4
-} DXGI_MODE_ROTATION;
-
-typedef struct DXGI_MODE_DESC
-{
-    UINT Width;
-    UINT Height;
-    DXGI_RATIONAL RefreshRate;
-    DXGI_FORMAT Format;
-    DXGI_MODE_SCANLINE_ORDER ScanlineOrdering;
-    DXGI_MODE_SCALING Scaling;
-} DXGI_MODE_DESC;
-
-typedef struct DXGI_SAMPLE_DESC
-{
-    UINT Count;
-    UINT Quality;
-} DXGI_SAMPLE_DESC;
-
-#endif // __DXGL_dxgitype_h__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/ICryDXMETALUnknown.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/ICryDXMETALUnknown.hpp
deleted file mode 100644
index d55867e401..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Definitions/ICryDXMETALUnknown.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Contains the cross platform replacement for COM IUnknown
-//               interface on non-windows platforms
-
-#ifndef __CRYMETALGLUNKNOWN__
-#define __CRYMETALGLUNKNOWN__
-
-#if !defined(WIN32)
-
-#include "CryDXMETALGuid.hpp"
-
-struct IUnknown
-{
-public:
-#if !DXGL_FULL_EMULATION
-    virtual ~IUnknown(){};
-#endif //!DXGL_FULL_EMULATION
-
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) = 0;
-    virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;
-    virtual ULONG STDMETHODCALLTYPE Release(void) = 0;
-};
-
-#endif //!defined(WIN32)
-
-#endif //__CRYMETALGLUNKNOWN__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/AppleGPUInfoUtils.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/AppleGPUInfoUtils.h
deleted file mode 100644
index 8efe8ec358..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/AppleGPUInfoUtils.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description: Utilities to access GPU info on Mac OS X and iOS
-
-#ifndef __APPLEGPUINFOUTILS__
-#define __APPLEGPUINFOUTILS__
-
-// Return -1 on failure and availabe VRAM otherwise
-long GetVRAMForDisplay(const int dspNum);
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/AppleGPUInfoUtils.mm b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/AppleGPUInfoUtils.mm
deleted file mode 100644
index 8faa3f2831..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/AppleGPUInfoUtils.mm
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-#include "AppleGPUInfoUtils.h"
-
-#include <UIKit/UIKit.h>
-//#include <Cocoa/Cocoa.h>
-//#include <CoreFoundation/CoreFoundation.h>
-//#include <CoreGraphics/CoreGraphics.h>
-
-// this file needs to be sparate since CryEngine headers conflict with the
-// Cocoa definitions
-
-// this will be removed in the next version of OS X, but for now
-// we can still use it.
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-long GetVRAMForDisplay(const int dspNum)
-{
-    CGError                    err = CGDisplayNoErr;
-    io_service_t              *dspPorts = NULL;
-    CGDirectDisplayID    *displays = NULL;
-    CGDisplayCount        dspCount = 0;
-    CFTypeRef                 typeCode;
-    uint32_t vram = 0;
-    
-    // How many active displays do we have?
-    err = CGGetActiveDisplayList(0, NULL, &dspCount);
-    
-    if (err != kCGErrorSuccess)
-        return -1;
-    
-    // If the display number is higher than the available display count, return
-    if (dspCount < dspNum)
-        return -1;
-    
-    // Allocate enough memory to hold all the display IDs we have
-    displays = (CGDirectDisplayID*)calloc((size_t)dspCount, sizeof(CGDirectDisplayID));
-   
-    // Allocate memory for our service ports
-    dspPorts = (io_service_t*)calloc((size_t)dspCount, sizeof(io_service_t));
-    
-    // Get the list of active displays
-    err = CGGetActiveDisplayList(dspCount,
-                                 displays,
-                                 &dspCount);
-    
-    if (err == kCGErrorSuccess)
-    {
-        // Get the service port for the display
-        dspPorts[dspNum] = CGDisplayIOServicePort(displays[dspNum]);
-        // Ask IOKit for the VRAM size property
-        typeCode = IORegistryEntryCreateCFProperty(dspPorts[dspNum],
-                                                   CFSTR(kIOFBMemorySizeKey),
-                                                   kCFAllocatorDefault,
-                                                   kNilOptions);
-        
-        // Ensure we have valid data from IOKit
-        if(typeCode && CFGetTypeID(typeCode) == CFNumberGetTypeID())
-        {
-            // If so, convert the CFNumber into a plain unsigned long
-            CFNumberGetValue((CFNumberRef)typeCode, kCFNumberSInt32Type, &vram);
-            if(typeCode)
-                CFRelease(typeCode);
-        }
-    }
-    
-    free(displays);
-    free(dspPorts);
-    // Return the total number of displays we found
-    return (long)vram;
-}
-#pragma clang diagnostic pop
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCommon.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCommon.cpp
deleted file mode 100644
index 7c0cd6fb26..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCommon.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Description : Defines OS version and GPU family which can then be used to query if
-//               certain API calls are enabled/disabled.
-
-#include "RenderDll_precompiled.h"
-#include "GLCommon.hpp"
-
-namespace NCryMetal
-{
-    bool s_isIosMinVersion9_0 = false;
-    bool s_isOsxMinVersion10_11 = false;
-    bool s_isIOSGPUFamily3 = false;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCommon.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCommon.hpp
deleted file mode 100644
index 1013669966..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCommon.hpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the types and functions that implement the
-//               OpenGL rendering functionality of DXGL
-
-#ifndef __GLCOMMON__
-#define __GLCOMMON__
-
-#include "GLPlatform.hpp"
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#include <Metal/Metal.h>
-
-// Metal Debug Options
-#define DXMETAL_LOG_PIPELINE_ERRORS               1
-#define DXMETAL_LOG_SHADER_ERRORS                 1
-#define DXMETAL_LOG_SHADER_WARNINGS               0
-#define DXMETAL_LOG_SHADER_SOURCE                 0 // Dump shader source every time a new one is compiled
-#define DXMETAL_LOG_SHADER_REFLECTION_VALIDATION  0 // Dump verbouse shader inputs information during pipeline creation
-
-#if DXMETAL_LOG_PIPELINE_ERRORS
-#   define LOG_METAL_PIPELINE_ERRORS(...)               NSLog(__VA_ARGS__)
-#else
-#   define LOG_METAL_PIPELINE_ERRORS(...)
-#endif // DXMETAL_LOG_PIPELINE_ERRORS
-
-#if DXMETAL_LOG_SHADER_ERRORS
-#   define LOG_METAL_SHADER_ERRORS(...)                 NSLog(__VA_ARGS__)
-#else
-#   define LOG_METAL_SHADER_ERRORS(...)
-#endif // DXMETAL_LOG_SHADER_ERRORS
-
-#if DXMETAL_LOG_SHADER_WARNINGS
-#   define LOG_METAL_SHADER_WARNINGS(...)               NSLog(__VA_ARGS__)
-#else
-#   define LOG_METAL_SHADER_WARNINGS(...)
-#endif // DXMETAL_LOG_SHADER_WARNINGS
-
-#if DXMETAL_LOG_SHADER_SOURCE
-#   define LOG_METAL_SHADER_SOURCE(...)                 NSLog(__VA_ARGS__)
-#else
-#   define LOG_METAL_SHADER_SOURCE(...)
-#endif // DXMETAL_LOG_SHADER_SOURCE
-
-#if DXMETAL_LOG_SHADER_REFLECTION_VALIDATION
-#   define LOG_METAL_SHADER_REFLECTION_VALIDATION(...)  NSLog(__VA_ARGS__)
-#else
-#   define LOG_METAL_SHADER_REFLECTION_VALIDATION(...)
-#endif // DXMETAL_LOG_SHADER_REFLECTION_VALIDATION
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-DXMETAL_TODO("consider this floating around. Those defines define some points to modify for the future extensions.")
-//  Is implemented for GL ES 3.1+
-#define DXGL_SUPPORT_MULTISAMPLING                  0
-#define DXGL_SUPPORT_MULTISAMPLED_TEXTURES          0
-#define DXGL_SUPPORT_COMPUTE                        1
-#define DXGL_SUPPORT_SHADER_STORAGE_BLOCKS          1
-//  Is implemented for GL 4.1+
-#define DXGL_SUPPORT_TEXTURE_BUFFERS                1
-
-#define DXMETAL_MAX_ENTRIES_BUFFER_ARG_TABLE        31
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-namespace NCryMetal
-{
-    inline bool SupportTextureViews()
-    {
-        return true;
-    }
-
-    inline bool SupportsStencilTextures()
-    {
-        return true;
-    }
-    
-    inline int GetAvailableMRTbpp()
-    {
-#if defined(AZ_PLATFORM_MAC)
-        // Mac doesn't support Gmem
-        return 0;
-#else
-        static int ret = 0;
-        
-        if (ret == 0)
-        {
-            // Figure out availble MRT bpp
-            // https://developer.apple.com/library/mac/documentation/Miscellaneous/Conceptual/MetalProgrammingGuide/MetalFeatureSetTables/MetalFeatureSetTables.html
-            // "16 bytes per pixel in iOS GPU Family 1; 32 bytes per pixel in iOS GPU Family 2 and 3"
-            // There's no way to get GPU family via code, we have to deduct it from the device name.
-            // A7 is family 1 = 128bpp
-            // A8 is family 2 = 256bpp
-            // A9 is family 3 = 256bpp
-            // We only check for devices that support Metal which are shown in the link above on Table 2-1.
-            struct utsname sysInfo;
-            uname(&sysInfo);
-            NSString* deviceCode = [NSString stringWithCString:sysInfo.machine encoding:NSUTF8StringEncoding];
-            
-            // A7 GPUs only have 128bpp available
-            if ([deviceCode rangeOfString:@"iPhone6"].location != NSNotFound || // iPhone 5s
-                [deviceCode rangeOfString:@"iPad4"].location != NSNotFound)  // iPad Air, iPad Mini 2, iPad Mini 3
-            {
-                ret = 128;
-            }
-            else // Assume newer hardware
-            {
-                ret = 256;
-            }
-        }
-        
-        return ret;
-#endif
-    }
-    
-    static bool s_isIosMinVersion9_0 = false;
-    static bool s_isIosMinVersion11_0 = false;
-    static bool s_isOsxMinVersion10_11 = false;
-    static bool s_isIOSGPUFamily3 = false;
-    
-    //Cache the OS version which can then be used to query if certain API calls are enabled/disabled.
-    inline void CacheMinOSVersionInfo()
-    {
-#if defined(AZ_PLATFORM_MAC)
-        s_isOsxMinVersion10_11 = [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){10, 11, 0}];
-#elif defined(AZ_PLATFORM_IOS)
-        s_isIosMinVersion9_0 = [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){9, 0, 0}];
-        s_isIosMinVersion11_0 = [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){11, 0, 0}];
-#endif
-    }
-    
-    //Cache the GPU family which can then be used to query if certain API calls are enabled/disabled.
-    inline void CacheGPUFamilyFeaturSetInfo(id<MTLDevice> device)
-    {
-#if defined(AZ_PLATFORM_IOS)
-        s_isIOSGPUFamily3 = [device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily3_v1];
-#endif
-    }
-}
-
-
-enum
-{
-    DXGL_NUM_SUPPORTED_VIEWPORTS = 1,
-    DXGL_NUM_SUPPORTED_SCISSOR_RECTS = 1,
-};
-
-
-////////////////////////////////////////////////////////////////////////////
-// Conform extension definitions
-////////////////////////////////////////////////////////////////////////////
-
-namespace NCryMetal
-{
-    typedef void* TWindowContext;
-}
-
-#endif //__GLCOMMON__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCrossPlatform.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCrossPlatform.cpp
deleted file mode 100644
index 782b11a5d7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCrossPlatform.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Cross platform DXGL helper types implementation
-
-#include "RenderDll_precompiled.h"
-#include "GLPlatform.hpp"
-
-namespace NCryOpenGL
-{
-    namespace NCrossPlatformImpl
-    {
-        SAutoLog g_kLog("DXGL.log");
-        SAutoTLSSlot g_kCRCTable;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCrossPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCrossPlatform.hpp
deleted file mode 100644
index 1dd933f626..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCrossPlatform.hpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Cross platform DXGL helper types
-
-#ifndef __GLCROSSPLATFORM__
-#define __GLCROSSPLATFORM__
-
-namespace NCryOpenGL
-{
-    void* CreateTLS();
-    void SetTLSValue(void* pTLSHandle, void* pValue);
-    void* GetTLSValue(void* pTLSHandle);
-    void DestroyTLS(void* pTLSHandle);
-
-    namespace NCrossPlatformImpl
-    {
-        struct SAutoLog
-        {
-            FILE* m_pFile;
-
-            SAutoLog(const char* szFileName)
-            {
-                m_pFile = fopen("DXGL.log", "w");
-            }
-
-            ~SAutoLog()
-            {
-                if (m_pFile != NULL)
-                {
-                    fclose(m_pFile);
-                }
-            }
-        };
-
-        struct SAutoTLSSlot
-        {
-            void* m_pTLSHandle;
-
-            SAutoTLSSlot()
-            {
-                m_pTLSHandle = CreateTLS();
-            }
-
-            ~SAutoTLSSlot()
-            {
-                DestroyTLS(m_pTLSHandle);
-            }
-        };
-
-        inline uint32 CRC32Reflect(unsigned int ref, char ch)
-        {
-            unsigned int value = 0;
-
-            // Swap bit 0 for bit 7
-            // bit 1 for bit 6, etc.
-            for (int i = 1; i < (ch + 1); i++)
-            {
-                if (ref & 1)
-                {
-                    value |= 1 << (ch - i);
-                }
-                ref >>= 1;
-            }
-            return value;
-        }
-
-        extern SAutoLog g_kLog;
-        extern SAutoTLSSlot g_kCRCTable;
-    }
-
-#define PRINTF_PARAMS(a, b)
-
-    void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-    inline void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...)
-    {
-        if (NCrossPlatformImpl::g_kLog.m_pFile != NULL)
-        {
-            va_list kArgs;
-            va_start(kArgs, szFormat);
-            vfprintf(NCrossPlatformImpl::g_kLog.m_pFile, szFormat, kArgs);
-            va_end(kArgs);
-            fputc('\n', NCrossPlatformImpl::g_kLog.m_pFile);
-            fflush(NCrossPlatformImpl::g_kLog.m_pFile);
-        }
-    }
-
-    inline uint32 GetCRC32(const char* pData, size_t uSize, uint32 uCRC)
-    {
-        uint32* pCRCTable(static_cast<uint32*>(GetTLSValue(NCrossPlatformImpl::g_kCRCTable.m_pTLSHandle)));
-        if (pCRCTable == NULL)
-        {
-            pCRCTable = new uint32[256];
-            SetTLSValue(NCrossPlatformImpl::g_kCRCTable.m_pTLSHandle, pCRCTable);
-
-            // This is the official polynomial used by CRC-32
-            // in PKZip, WinZip and Ethernet.
-            unsigned int ulPolynomial = 0x04c11db7;
-
-            // 256 values representing ASCII character codes.
-            for (int i = 0; i <= 0xFF; i++)
-            {
-                pCRCTable[i] = NCrossPlatformImpl::CRC32Reflect(i, 8) << 24;
-                for (int j = 0; j < 8; j++)
-                {
-                    pCRCTable[i] = (pCRCTable[i] << 1) ^ (pCRCTable[i] & (1U << 31) ? ulPolynomial : 0);
-                }
-                pCRCTable[i] = NCrossPlatformImpl::CRC32Reflect(pCRCTable[i], 32);
-            }
-        }
-
-        int len;
-        unsigned char* buffer;
-
-        // Get the length.
-        len = uSize;
-
-        // Save the text in the buffer.
-        buffer = (unsigned char*)pData;
-        // Perform the algorithm on each character in the string, using the lookup table values.
-
-        while (len--)
-        {
-            uCRC = (uCRC >> 8) ^ pCRCTable[(uCRC & 0xFF) ^ *buffer++];
-        }
-        // Exclusive OR the result with the beginning value.
-        return uCRC ^ 0xffffffff;
-    }
-
-    inline void* cryMemcpy(void* pDst, const void* pSrc, size_t uLength)
-    {
-        return memcpy(pDst, pSrc, uLength);
-    }
-
-    using std::string;
-
-    struct STraceFile
-    {
-        STraceFile()
-            : m_pFile(NULL)
-        {
-        }
-
-        ~STraceFile()
-        {
-            if (m_pFile != NULL)
-            {
-                fclose(m_pFile);
-            }
-        }
-
-        bool Open(const char* szFileName, bool bBinary)
-        {
-            if (m_pFile != NULL)
-            {
-                return false;
-            }
-
-            const char* szMode(bBinary ? "wb" : "w");
-            m_pFile = fopen(szFileName, szMode);
-            if (m_pFile != NULL)
-            {
-                return true;
-            }
-
-            return m_pFile != NULL;
-        }
-
-        void Write(const void* pvData, uint32 uSize)
-        {
-            fwrite(pvData, (size_t)uSize, 1, m_pFile);
-        }
-
-        void Printf(const char* szFormat, ...)
-        {
-            va_list kArgs;
-            va_start(kArgs, szFormat);
-            vfprintf(m_pFile, szFormat, kArgs);
-            va_end(kArgs);
-        }
-
-        FILE* m_pFile;
-    };
-}
-
-#endif //__GLCROSSPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCryPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCryPlatform.hpp
deleted file mode 100644
index 76ffd0177c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLCryPlatform.hpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Platform specific DXGL requirements implementation relying
-//               on CryCommon and CrySystem.
-
-#ifndef __GLCRYPLATFORM__
-#define __GLCRYPLATFORM__
-#include <AzCore/IO/FileIO.h>
-#include <AzFramework/IO/FileOperations.h>
-
-#undef CUSTOM_SCOPED_PROFILE
-#define CUSTOM_SCOPED_PROFILE(_Name) FRAME_PROFILER_FAST(_Name, gEnv->pSystem, PROFILE_RENDERER, true);
-
-namespace NCryMetal
-{
-    inline void* Malloc(size_t size)
-    {
-        return CryModuleMalloc(size);
-    }
-
-    inline void* Calloc(size_t num, size_t size)
-    {
-        return CryModuleCalloc(num, size);
-    }
-
-    inline void* Realloc(void* memblock, size_t size)
-    {
-        return CryModuleRealloc(memblock, size);
-    }
-
-    inline void Free(void* memblock)
-    {
-        CryModuleFree(memblock);
-    }
-
-    inline void* Memalign(size_t size, size_t alignment)
-    {
-        return CryModuleMemalign(size, alignment);
-    }
-
-    inline void MemalignFree(void* memblock)
-    {
-        return CryModuleMemalignFree(memblock);
-    }
-
-    void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-
-    inline void LogMessage(ELogSeverity eSeverity, const char* szFormat, ...)
-    {
-        EValidatorSeverity eValidatorSeverity(VALIDATOR_COMMENT);
-        switch (eSeverity)
-        {
-        case eLS_Error:
-            eValidatorSeverity = VALIDATOR_ERROR;
-            break;
-        case eLS_Warning:
-            eValidatorSeverity = VALIDATOR_WARNING;
-            break;
-        case eLS_Info:
-            eValidatorSeverity = VALIDATOR_COMMENT;
-            break;
-        }
-
-        va_list kArgs;
-        va_start(kArgs, szFormat);
-        GetISystem()->WarningV(VALIDATOR_MODULE_RENDERER, eValidatorSeverity, 0, 0, szFormat, kArgs);
-        va_end(kArgs);
-    }
-
-    inline void BreakUnique(const char* file, uint32 line, const char* functionName)
-    {
-        AZ_Error("Metal Layer", false, "Unimplemented DirectX function %s being called in Metal in file %s line %d. Continuing but rendering artifacts may be present.", functionName, file, line);
-    }
-
-    inline uint32 GetCRC32(const char* pData, size_t uSize, uint32 uCRC)
-    {
-        return CCrc32::Compute(pData, uSize);
-    }
-
-    inline LONG CompareExchange(LONG volatile* piDestination, LONG iExchange, LONG iComparand)
-    {
-        return CryInterlockedCompareExchange(piDestination, iExchange, iComparand);
-    }
-
-    inline LONG AtomicIncrement(LONG volatile* piDestination)
-    {
-        return CryInterlockedIncrement(reinterpret_cast<int volatile*>(piDestination));
-    }
-
-    inline LONG AtomicDecrement(LONG volatile* piDestination)
-    {
-        return CryInterlockedDecrement(reinterpret_cast<int volatile*>(piDestination));
-    }
-
-    typedef CryCriticalSection TCriticalSection;
-
-    inline void LockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Lock();
-    }
-
-    inline void UnlockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Unlock();
-    }
-
-    struct STraceFile
-    {
-        STraceFile()
-            : m_fileHandle(AZ::IO::InvalidHandle)
-        {
-        }
-
-        ~STraceFile()
-        {
-            if (m_fileHandle != AZ::IO::InvalidHandle)
-            {
-                gEnv->pCryPak->FClose(m_fileHandle);
-            }
-        }
-
-        bool Open(const char* szFileName, bool bBinary)
-        {
-            static const char* s_szTraceDirectory = "DXGLTrace";
-
-            if (m_fileHandle != AZ::IO::InvalidHandle)
-            {
-                return false;
-            }
-
-            char acFullPath[MAX_PATH];
-            sprintf_s(acFullPath, "%s/%s", s_szTraceDirectory, szFileName);
-            const char* szMode(bBinary ? "wb" : "w");
-            m_fileHandle = gEnv->pCryPak->FOpen(acFullPath, szMode);
-            if (m_fileHandle != AZ::IO::InvalidHandle)
-            {
-                return true;
-            }
-
-            gEnv->pCryPak->MakeDir(s_szTraceDirectory, 0);
-            m_fileHandle = gEnv->pCryPak->FOpen(acFullPath, szMode);
-            return m_fileHandle != AZ::IO::InvalidHandle;
-        }
-
-        void Write(const void* pvData, uint32 uSize)
-        {
-            gEnv->pCryPak->FWrite(pvData, (size_t)uSize, 1, m_fileHandle);
-        }
-
-        void Printf(const char* szFormat, ...)
-        {
-            va_list kArgs;
-            va_start(kArgs, szFormat);
-            AZ::IO::Print(m_fileHandle, szFormat, kArgs);
-            va_end(kArgs);
-        }
-
-        AZ::IO::HandleType m_fileHandle;
-    };
-}
-
-#endif //__GLCRYPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLExtensions.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLExtensions.hpp
deleted file mode 100644
index d3dd989a66..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLExtensions.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-//
-//  GLExtensions.hpp
-//  CryEngine
-//
-//  Created by Duhon, Eric on 10/29/14.
-//
-//
-
-#ifndef CryEngine_GLExtensions_hpp
-#define CryEngine_GLExtensions_hpp
-#pragma once
-
-#if DXGLES && DXGLES_VERSION == DXGLES_VERSION_30 && defined(GL_EXT_separate_shader_objects)
-// On OpenGL ES separate shader programs are available as an extesion, so we
-// just define the normal api here to avoid ifdefing the entire code
-#define GL_VERTEX_SHADER_BIT GL_VERTEX_SHADER_BIT_EXT
-#define GL_FRAGMENT_SHADER_BIT GL_FRAGMENT_SHADER_BIT_EXT
-#define GL_ALL_SHADER_BITS GL_ALL_SHADER_BITS_EXT
-#define GL_PROGRAM_SEPARABLE GL_PROGRAM_SEPARABLE_EXT
-#define GL_ACTIVE_PROGRAM GL_ACTIVE_PROGRAM_EXT
-#define GL_PROGRAM_PIPELINE_BINDING GL_PROGRAM_PIPELINE_BINDING_EXT
-
-#define glUseProgramStages glUseProgramStagesEXT
-#define glActiveShaderProgram glActiveShaderProgramEXT
-#define glCreateShaderProgramv glCreateShaderProgramvEXT
-#define glBindProgramPipeline glBindProgramPipelineEXT
-#define glDeleteProgramPipelines glDeleteProgramPipelinesEXT
-#define glGenProgramPipelines glGenProgramPipelinesEXT
-#define glIsProgramPipeline glIsProgramPipelineEXT
-#define glProgramParameteri glProgramParameteriEXT
-#define glGetProgramPipelineiv glGetProgramPipelineivEXT
-#define glValidateProgramPipeline glValidateProgramPipelineEXT
-#define glGetProgramPipelineInfoLog glGetProgramPipelineInfoLogEXT
-
-#define glProgramUniform1i glProgramUniform1iEXT
-#define glProgramUniform2i glProgramUniform2iEXT
-#define glProgramUniform2i glProgramUniform2iEXT
-#define glProgramUniform2i glProgramUniform2iEXT
-
-#define glProgramUniform1f glProgramUniform1fEXT
-#define glProgramUniform2f glProgramUniform2fEXT
-#define glProgramUniform3f glProgramUniform3fEXT
-#define glProgramUniform4f glProgramUniform4fEXT
-
-#define glProgramUniform1ui glProgramUniform1uiEXT
-#define glProgramUniform2ui glProgramUniform2uiEXT
-#define glProgramUniform3ui glProgramUniform3uiEXT
-#define glProgramUniform4ui glProgramUniform4uiEXT
-
-#define glProgramUniform1iv glProgramUniform1ivEXT
-#define glProgramUniform2iv glProgramUniform2ivEXT
-#define glProgramUniform3iv glProgramUniform3ivEXT
-#define glProgramUniform4iv glProgramUniform4ivEXT
-
-#define glProgramUniform1fv glProgramUniform1fvEXT
-#define glProgramUniform2fv glProgramUniform2fvEXT
-#define glProgramUniform3fv glProgramUniform3fvEXT
-#define glProgramUniform4fv glProgramUniform4fvEXT
-
-#define glProgramUniform1uiv glProgramUniform1uivEXT
-#define glProgramUniform2uiv glProgramUniform2uivEXT
-#define glProgramUniform3uiv glProgramUniform3uivEXT
-#define glProgramUniform4uiv glProgramUniform4uivEXT
-
-#define glProgramUniformMatrix2fv glProgramUniformMatrix2fvEXT
-#define glProgramUniformMatrix3fv glProgramUniformMatrix3fvEXT
-#define glProgramUniformMatrix4fv glProgramUniformMatrix4fvEXT
-#define glProgramUniformMatrix2x3fv glProgramUniformMatrix2x3fvEXT
-#define glProgramUniformMatrix3x2fv glProgramUniformMatrix3x2fvEXT
-#define glProgramUniformMatrix2x4fv glProgramUniformMatrix2x4fvEXT
-#define glProgramUniformMatrix4x2fv glProgramUniformMatrix4x2fvEXT
-#define glProgramUniformMatrix3x4fv glProgramUniformMatrix3x4fvEXT
-#define glProgramUniformMatrix4x3fv glProgramUniformMatrix4x3fvEXT
-#endif
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLFormat.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLFormat.cpp
deleted file mode 100644
index fb0dbbc8f6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLFormat.cpp
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Defines the required information about image formats used
-//               by DXMETAL as well as utility functions.
-
-#include "RenderDll_precompiled.h"
-#include "GLFormat.hpp"
-
-namespace NCryMetal
-{
-#define DXGL_DXGI_FORMAT(_FormatID) DXGI_FORMAT_ ## _FormatID
-#define DXGL_UNCOMPRESSED_LAYOUT(_FormatID) g_kUncompressedLayout_ ## _FormatID
-#define DXGL_TEXTURE_FORMAT(_FormatID) g_kTextureFormat_ ## _FormatID
-#define DXGL_GL_INTERNAL_FORMAT(_InternalID) GL ## _InternalID
-#define DXGL_GI_CHANNEL_TYPE(_Type) eGICT_ ## _Type
-
-#define _PTR_MAP(_Type) _Type ## PtrMap
-#define _PTR_MAP_DEFAULT(_Type, _Enum, _Ptr)               \
-    template <_Enum eValue>                                \
-    struct _PTR_MAP(_Type){static const _Type* ms_pPtr; }; \
-    template <_Enum eValue>                                \
-    const _Type * _PTR_MAP(_Type) < eValue > ::ms_pPtr = _Ptr;
-#define _PTR_MAP_VALUE(_Type, _Value, _Ptr)                            \
-    template <>                                                        \
-    struct _PTR_MAP(_Type) < _Value > {static const _Type* ms_pPtr; }; \
-    const _Type* _PTR_MAP(_Type) < _Value > ::ms_pPtr = _Ptr;
-
-#define _UINT_MAP(_Name) S ## _Name ## UintMap
-#define _UINT_MAP_DEFAULT(_Name, _Enum, _UIntVal) \
-    template <_Enum eValue>                       \
-    struct _UINT_MAP(_Name){enum {VALUE = _UIntVal}; };
-#define _UINT_MAP_VALUE(_Name, _Value, _UIntVal) \
-    template <>                                  \
-    struct _UINT_MAP(_Name) < _Value > {enum {VALUE = _UIntVal}; };
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Uncompressed layouts for renderable formats
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _PTR_MAP_DEFAULT(SUncompressedLayout, EGIFormat, NULL)
-
-#define _UNCOMPR_LAY(_FormatID, _NumR, _NumG, _NumB, _NumA, _ShiftR, _ShiftG, _ShiftB, _ShiftA, _TypeRGBA, _Depth, _TypeD, _Stencil, _TypeS, _Spare) \
-    static const SUncompressedLayout DXGL_UNCOMPRESSED_LAYOUT(_FormatID) =                                                                           \
-    {                                                                                                                                                \
-        _NumR, _NumG, _NumB, _NumA,                                                                                                                  \
-        static_cast<uint32>(_ShiftR), static_cast<uint32>(_ShiftG), static_cast<uint32>(_ShiftB), static_cast<uint32>(_ShiftA),                      \
-        DXGL_GI_CHANNEL_TYPE(_TypeRGBA),                                                                                                             \
-        _Depth, DXGL_GI_CHANNEL_TYPE(_TypeD),                                                                                                        \
-        _Stencil, DXGL_GI_CHANNEL_TYPE(_TypeS),                                                                                                      \
-        _Spare                                                                                                                                       \
-    };                                                                                                                                               \
-    _PTR_MAP_VALUE(SUncompressedLayout,  DXGL_GI_FORMAT(_FormatID), &DXGL_UNCOMPRESSED_LAYOUT(_FormatID))
-
-    //          | FORMAT_ID           | RGBA_SIZES        | RGBA_SHIFTS       | RGBA     | DEPTH         | STENCIL       | -  |
-    //          |                     | NR   NG   NB   NA | SR   SG   SB   SA | TYPE     | N    TYPE     | N    TYPE     | X  |
-    _UNCOMPR_LAY(R32G32B32A32_FLOAT,  32,  32,  32,  32,   0,  32,  64,  96, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32A32_UINT,  32,  32,  32,  32,   0,  32,  64,  96, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32A32_SINT,  32,  32,  32,  32,   0,  32,  64,  96, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32_FLOAT,  32,  32,  32,   0,   0,  32,  64,  96, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32_UINT,  32,  32,  32,   0,   0,  32,  64,  96, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32B32_SINT,  32,  32,  32,   0,   0,  32,  64,  96, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_FLOAT,  16,  16,  16,  16,   0,  16,  32,  48, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_UNORM,  16,  16,  16,  16,   0,  16,  32,  48, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_UINT,  16,  16,  16,  16,   0,  16,  32,  48, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_SNORM,  16,  16,  16,  16,   0,  16,  32,  48, SNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16B16A16_SINT,  16,  16,  16,  16,   0,  16,  32,  48, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32_FLOAT,  32,  32,   0,   0,   0,  32,  -1,  -1, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32_UINT,  32,  32,   0,   0,   0,  32,  -1,  -1, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32G32_SINT,  32,  32,   0,   0,   0,  32,  -1,  -1, SINT,   0, UNUSED,   0, UNUSED,   0)
-
-    _UNCOMPR_LAY(R10G10B10A2_UNORM,  10,  10,  10,   2,   0,  10,  20,  30, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R10G10B10A2_UINT,  10,  10,  10,   2,   0,  10,  20,  30, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R11G11B10_FLOAT,  11,  11,  10,   0,   0,  11,  22,  -1, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_UNORM,   8,   8,   8,   8,   0,   8,  16,  24, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_UNORM_SRGB,   8,   8,   8,   8,   0,   8,  16,  24, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_UINT,   8,   8,   8,   8,   0,   8,  16,  24, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_SNORM,   8,   8,   8,   8,   0,   8,  16,  24, SNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8B8A8_SINT,   8,   8,   8,   8,   0,   8,  16,  24, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_FLOAT,  16,  16,   0,   0,   0,  16,  -1,  -1, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_UNORM,  16,  16,   0,   0,   0,  16,  -1,  -1, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_UINT,  16,  16,   0,   0,   0,  16,  -1,  -1, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_SNORM,  16,  16,   0,   0,   0,  16,  -1,  -1, SNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16G16_SINT,  16,  16,   0,   0,   0,  16,  -1,  -1, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(D32_FLOAT,   0,   0,   0,   0,  -1,  -1,  -1,  -1, UNUSED,  32, FLOAT,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32_FLOAT,  32,   0,   0,   0,   0,  -1,  -1,  -1, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32_UINT,  32,   0,   0,   0,   0,  -1,  -1,  -1, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R32_SINT,  32,   0,   0,   0,   0,  -1,  -1,  -1, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(D32_FLOAT_S8X24_UINT,   0,   0,   0,   0,  -1,  -1,  -1,  -1, UNUSED,  32, FLOAT,   8, UINT,  24)
-    _UNCOMPR_LAY(X32_TYPELESS_G8X24_UINT,   0,   0,   0,   0,  -1,  -1,  -1,  -1, UNUSED,  32, FLOAT,   8, UINT,   24)
-    _UNCOMPR_LAY(D24_UNORM_S8_UINT,   0,   0,   0,   0,  -1,  -1,  -1,  -1, UNUSED,  24, UNORM,   8, UINT,   0)
-    _UNCOMPR_LAY(X24_TYPELESS_G8_UINT,   0,   0,   0,   0,  -1,  -1,  -1,  -1, UNUSED,  24, UNORM,   8, UINT,   0)
-    _UNCOMPR_LAY(R24_UNORM_X8_TYPELESS,  24,   0,   0,   0,  -1,  -1,  -1,  -1, UNORM,   0, UNUSED,   0, UNUSED,   8)
-    _UNCOMPR_LAY(R8G8_UNORM,   8,   8,   0,   0,   0,   8,  -1,  -1, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8_UINT,   8,   8,   0,   0,   0,   8,  -1,  -1, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8_SNORM,   8,   8,   0,   0,   0,   8,  -1,  -1, SNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8G8_SINT,   8,   8,   0,   0,   0,   8,  -1,  -1, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_FLOAT,  16,   0,   0,   0,   0,  -1,  -1,  -1, FLOAT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(D16_UNORM,   0,   0,   0,   0,  -1,  -1,  -1,  -1, UNUSED,  16, UNORM,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_UNORM,  16,   0,   0,   0,   0,  -1,  -1,  -1, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_UINT,  16,   0,   0,   0,   0,  -1,  -1,  -1, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_SNORM,  16,   0,   0,   0,   0,  -1,  -1,  -1, SNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R16_SINT,  16,   0,   0,   0,   0,  -1,  -1,  -1, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_UNORM,   8,   0,   0,   0,   0,  -1,  -1,  -1, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_UINT,   8,   0,   0,   0,   0,  -1,  -1,  -1, UINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_SNORM,   8,   0,   0,   0,   0,  -1,  -1,  -1, SNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(R8_SINT,   8,   0,   0,   0,   0,  -1,  -1,  -1, SINT,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(A8_UNORM,   0,   0,   0,   8,  -1,  -1,  -1,   0, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B5G6R5_UNORM,   5,   6,   5,   0,  11,   5,   0,  -1, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B5G5R5A1_UNORM,   5,   5,   5,   1,  10,   5,   0,  15, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B8G8R8A8_UNORM,   8,   8,   8,   8,  16,   8,   0,  24, UNORM,   0, UNUSED,   0, UNUSED,   0)
-    _UNCOMPR_LAY(B8G8R8X8_UNORM,   8,   8,   8,   0,  16,   8,   0,  -1, UNORM,   0, UNUSED,   0, UNUSED,   8)
-
-#undef _UNCOMPR_LAY
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Swizzle required to map each texture format to the corresponding DXGI format
-    ////////////////////////////////////////////////////////////////////////////////
-
-#define DXGL_SWIZZLE_RED   0
-#define DXGL_SWIZZLE_GREEN 1
-#define DXGL_SWIZZLE_BLUE  2
-#define DXGL_SWIZZLE_ALPHA 3
-#define DXGL_SWIZZLE_ZERO  4
-#define DXGL_SWIZZLE_ONE   5
-#define _SWIZZLE_MASK(_Red, _Green, _Blue, _Alpha) \
-    DXGL_SWIZZLE_ ## _Red   << 9 |                 \
-    DXGL_SWIZZLE_ ## _Green << 6 |                 \
-    DXGL_SWIZZLE_ ## _Blue  << 3 |                 \
-    DXGL_SWIZZLE_ ## _Alpha
-
-    _UINT_MAP_DEFAULT(DXGITextureSwizzle, TSwizzleMask, _SWIZZLE_MASK(RED, GREEN, BLUE, ALPHA))
-
-#define _DXGI_TEX_SWIZZLE(_FormatID, _Red, _Green, _Blue, _Alpha) _UINT_MAP_VALUE(DXGITextureSwizzle, DXGL_GI_FORMAT(_FormatID), _SWIZZLE_MASK(_Red, _Green, _Blue, _Alpha))
-
-    _DXGI_TEX_SWIZZLE(A8_UNORM, ZERO, ZERO, ZERO, RED)
-    _DXGI_TEX_SWIZZLE(B8G8R8A8_UNORM, BLUE, GREEN, RED, ALPHA)
-    _DXGI_TEX_SWIZZLE(B8G8R8X8_UNORM, BLUE, GREEN, RED, ZERO)
-
-#undef _DXGI_TEX_SWIZZLE
-#undef _SWIZZLE_MASK
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Texturable formats (split between uncompressed and compressed)
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _PTR_MAP_DEFAULT(STextureFormat, EGIFormat, NULL)
-
-    //  Confetti BEGIN: Igor Lobanchikov
-#define _TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, _Compressed, _GLType, _BlockWidth, _BlockHeight, _BlockDepth, _NumBlockBytes, _SRGB, _METALPixelType, _METALVertexType) \
-    static const STextureFormat DXGL_TEXTURE_FORMAT(_FormatID) =                                                                                                                  \
-    {                                                                                                                                                                             \
-        _Compressed,                                                                                                                                                              \
-        _SRGB,                                                                                                                                                                    \
-        _BlockWidth,                                                                                                                                                              \
-        _BlockHeight,                                                                                                                                                             \
-        _BlockDepth,                                                                                                                                                              \
-        _NumBlockBytes,                                                                                                                                                           \
-        _METALPixelType,                                                                                                                                                          \
-        _METALVertexType                                                                                                                                                          \
-    };                                                                                                                                                                            \
-    _PTR_MAP_VALUE(STextureFormat,  DXGL_GI_FORMAT(_FormatID), &DXGL_TEXTURE_FORMAT(_FormatID))
-
-
-
-#define _UNCOMPR_TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, _GLType, _SRGB, _Bytes, _METALPixelType, _METALVertexType) _TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, false, _GLType, 1, 1, 1, _Bytes, _SRGB, _METALPixelType, _METALVertexType)
-#define _COMPR_TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, _BlockWidth, _BlockHeight, _BlockDepth, _NumBlockBytes, _SRGB, _METALPixelType) _TEX(_FormatID, _GLInternalFormat, _GLBaseFormat, true, 0, _BlockWidth, _BlockHeight, _BlockDepth, _NumBlockBytes, _SRGB, _METALPixelType, MTLVertexFormatInvalid)
-
-    //          | FORMAT_ID               | GL_INTERNAL_FORMAT     | GL_FORMAT          | GL_TYPE                           | SRGB  | BYTES | MTLPixelFormat                 | MTLVertexFormat
-    //          |                         |                        |                    |                                   | SRGB  | BYTES |                                |
-    _UNCOMPR_TEX(R32G32B32A32_FLOAT, GL_RGBA32F, GL_RGBA, GL_FLOAT, false,     16, MTLPixelFormatRGBA32Float,       MTLVertexFormatFloat4)
-    _UNCOMPR_TEX(R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA, GL_UNSIGNED_INT, false,     16, MTLPixelFormatRGBA32Uint,        MTLVertexFormatUInt4)
-    _UNCOMPR_TEX(R32G32B32A32_SINT, GL_RGBA32I, GL_RGBA, GL_INT, false,     16, MTLPixelFormatRGBA32Sint,        MTLVertexFormatInt4)
-    _UNCOMPR_TEX(R32G32B32_FLOAT, GL_RGB32F, GL_RGB, GL_FLOAT, false,     12, MTLPixelFormatInvalid,           MTLVertexFormatFloat3)
-    _UNCOMPR_TEX(R32G32B32_UINT, GL_RGB32UI, GL_RGB, GL_UNSIGNED_INT, false,     12, MTLPixelFormatInvalid,           MTLVertexFormatUInt3)
-    _UNCOMPR_TEX(R32G32B32_SINT, GL_RGB32I, GL_RGB, GL_INT, false,     12, MTLPixelFormatInvalid,           MTLVertexFormatInt3)
-    _UNCOMPR_TEX(R16G16B16A16_FLOAT, GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, false,      8, MTLPixelFormatRGBA16Float,       MTLVertexFormatHalf4)
-    _UNCOMPR_TEX(R16G16B16A16_UNORM, GL_RGBA16UI, GL_RGBA, GL_UNSIGNED_SHORT, false,      8, MTLPixelFormatRGBA16Unorm,       MTLVertexFormatUShort4Normalized)
-    _UNCOMPR_TEX(R16G16B16A16_UINT, GL_RGBA16UI, GL_RGBA, GL_UNSIGNED_SHORT, false,      8, MTLPixelFormatRGBA16Uint,        MTLVertexFormatUShort4)
-    _UNCOMPR_TEX(R16G16B16A16_SNORM, GL_NONE, GL_RGBA, GL_SHORT, false,      8, MTLPixelFormatRGBA16Snorm,       MTLVertexFormatShort4Normalized)
-    _UNCOMPR_TEX(R16G16B16A16_SINT, GL_RGBA16I, GL_RGBA, GL_SHORT, false,      8, MTLPixelFormatRGBA16Sint,        MTLVertexFormatShort4)
-    _UNCOMPR_TEX(R32G32_FLOAT, GL_RG32F, GL_RG, GL_FLOAT, false,      8, MTLPixelFormatRG32Float,         MTLVertexFormatFloat2)
-    _UNCOMPR_TEX(R32G32_UINT, GL_RG32UI, GL_RG, GL_UNSIGNED_INT, false,      8, MTLPixelFormatRG32Uint,          MTLVertexFormatUInt2)
-    _UNCOMPR_TEX(R32G32_SINT, GL_RG32I, GL_RG, GL_INT, false,      8, MTLPixelFormatRG32Sint,          MTLVertexFormatInt2)
-    _UNCOMPR_TEX(R10G10B10A2_UNORM, GL_RGB10_A2UI, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, false,      4, MTLPixelFormatRGB10A2Unorm,      MTLVertexFormatUInt1010102Normalized)
-    _UNCOMPR_TEX(R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, false,      4, MTLPixelFormatRGB10A2Uint,       MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R11G11B10_FLOAT, GL_R11F_G11F_B10F, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV, false,      4, MTLPixelFormatRG11B10Float,      MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4, MTLPixelFormatRGBA8Unorm,        MTLVertexFormatUChar4Normalized)
-    _UNCOMPR_TEX(R8G8B8A8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, true,      4, MTLPixelFormatRGBA8Unorm_sRGB,   MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA, GL_UNSIGNED_BYTE, false,      4, MTLPixelFormatRGBA8Uint,         MTLVertexFormatUChar4)
-    _UNCOMPR_TEX(R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA, GL_BYTE, false,      4, MTLPixelFormatRGBA8Snorm,        MTLVertexFormatChar4Normalized)
-    _UNCOMPR_TEX(R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA, GL_BYTE, false,      4, MTLPixelFormatRGBA8Sint,         MTLVertexFormatChar4)
-    _UNCOMPR_TEX(R16G16_FLOAT, GL_RG16F, GL_RG, GL_HALF_FLOAT, false,      4, MTLPixelFormatRG16Float,         MTLVertexFormatHalf2)
-    _UNCOMPR_TEX(R16G16_UNORM, GL_RG16UI, GL_RG, GL_UNSIGNED_SHORT, false,      4, MTLPixelFormatRG16Unorm,         MTLVertexFormatUShort2Normalized)
-    _UNCOMPR_TEX(R16G16_UINT, GL_RG16UI, GL_RG, GL_UNSIGNED_SHORT, false,      4, MTLPixelFormatRG16Uint,          MTLVertexFormatUShort2)
-    _UNCOMPR_TEX(R16G16_SINT, GL_RG16I, GL_RG, GL_SHORT, false,      4, MTLPixelFormatRG16Sint,          MTLVertexFormatShort2)
-    _UNCOMPR_TEX(D32_FLOAT, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, false,      4, MTLPixelFormatDepth32Float,      MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R32_FLOAT, GL_R32F, GL_RED, GL_FLOAT, false,      4, MTLPixelFormatR32Float,          MTLVertexFormatFloat)
-    _UNCOMPR_TEX(R32_UINT, GL_R32UI, GL_RED, GL_UNSIGNED_INT, false,      4, MTLPixelFormatR32Uint,           MTLVertexFormatUInt)
-    _UNCOMPR_TEX(R32_SINT, GL_R32I, GL_RED, GL_INT, false,      4, MTLPixelFormatR32Sint,           MTLVertexFormatInt)
-    _UNCOMPR_TEX(R8G8_UNORM, GL_RG8, GL_RG, GL_UNSIGNED_BYTE, false,      2, MTLPixelFormatRG8Unorm,          MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R8G8_UINT, GL_RG8UI, GL_RG, GL_UNSIGNED_BYTE, false,      2, MTLPixelFormatRG8Uint,           MTLVertexFormatUChar2Normalized)
-    _UNCOMPR_TEX(R8G8_SNORM, GL_RG8_SNORM, GL_RG, GL_BYTE, false,      2, MTLPixelFormatRG8Snorm,          MTLVertexFormatChar2Normalized)
-    _UNCOMPR_TEX(R8G8_SINT, GL_RG8I, GL_RG, GL_BYTE, false,      2, MTLPixelFormatRG8Sint,           MTLVertexFormatChar2)
-    _UNCOMPR_TEX(R16_FLOAT, GL_R16F, GL_RED, GL_HALF_FLOAT, false,      2, MTLPixelFormatR16Float,          MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(D16_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, false,      2, MTLPixelFormatInvalid,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R16_UNORM, GL_R16UI, GL_RED, GL_UNSIGNED_SHORT, false,      2, MTLPixelFormatR16Unorm,          MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R16_UINT, GL_R16UI, GL_RED, GL_UNSIGNED_SHORT, false,      2, MTLPixelFormatR16Uint,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R16_SINT, GL_R16I, GL_RED, GL_SHORT, false,      2, MTLPixelFormatR16Sint,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R8_UNORM, GL_R8, GL_RED, GL_UNSIGNED_BYTE, false,      1, MTLPixelFormatR8Unorm,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R8_UINT, GL_R8UI, GL_RED, GL_UNSIGNED_BYTE, false,      1, MTLPixelFormatR8Uint,            MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R8_SNORM, GL_R8_SNORM, GL_RED, GL_BYTE, false,      1, MTLPixelFormatR8Snorm,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R8_SINT, GL_R8I, GL_RED, GL_BYTE, false,      1, MTLPixelFormatR8Sint,            MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(A8_UNORM, GL_A8, GL_ALPHA, GL_UNSIGNED_BYTE, false,      1, MTLPixelFormatA8Unorm,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R9G9B9E5_SHAREDEXP, GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV, false,      4, MTLPixelFormatRGB9E5Float,       MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(B8G8R8A8_UNORM, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4, MTLPixelFormatBGRA8Unorm,        MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(B8G8R8A8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4, MTLPixelFormatBGRA8Unorm_sRGB,   MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(B8G8R8X8_UNORM, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4, MTLPixelFormatBGRA8Unorm,        MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(B8G8R8X8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, false,      4, MTLPixelFormatBGRA8Unorm_sRGB,   MTLVertexFormatInvalid)
-
-    _UNCOMPR_TEX(R16_SNORM, GL_R16_SNORM, GL_RED, GL_SHORT, false,      2, MTLPixelFormatR16Snorm,          MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(R16G16_SNORM, GL_RG16_SNORM, GL_RG, GL_SHORT, false,      4, MTLPixelFormatRG16Snorm,         MTLVertexFormatShort2Normalized)
-
-    _UNCOMPR_TEX(D32_FLOAT_S8X24_UINT, GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, false,      8, MTLPixelFormatDepth32Float_Stencil8,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(X32_TYPELESS_G8X24_UINT, GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, false,      8, MTLPixelFormatX32_Stencil8,           MTLVertexFormatInvalid)
-
-#if defined(AZ_PLATFORM_MAC)
-    _UNCOMPR_TEX(D24_UNORM_S8_UINT, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, false,      4, MTLPixelFormatDepth24Unorm_Stencil8,           MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(X24_TYPELESS_G8_UINT, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, false,      4, MTLPixelFormatX24_Stencil8,           MTLVertexFormatInvalid)
-
-    _COMPR_TEX(BC1_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_RGBA,  4,  4,  1,      8, false, MTLPixelFormatBC1_RGBA)
-    _COMPR_TEX(BC1_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_RGBA,  4,  4,  1,      8, true, MTLPixelFormatBC1_RGBA_sRGB)
-    _COMPR_TEX(BC2_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_RGBA,  4,  4,  1,     16, false, MTLPixelFormatBC2_RGBA)
-    _COMPR_TEX(BC2_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_RGBA,  4,  4,  1,     16, true, MTLPixelFormatBC2_RGBA_sRGB)
-    _COMPR_TEX(BC3_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_RGBA,  4,  4,  1,     16, false, MTLPixelFormatBC3_RGBA)
-    _COMPR_TEX(BC3_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_RGBA,  4,  4,  1,     16, true, MTLPixelFormatBC3_RGBA_sRGB)
-    _COMPR_TEX(BC4_UNORM, GL_COMPRESSED_RED_RGTC1, GL_RED,  4,  4,  1,      8, false, MTLPixelFormatBC4_RUnorm)
-    _COMPR_TEX(BC4_SNORM, GL_COMPRESSED_SIGNED_RED_RGTC1, GL_RED,  4,  4,  1,      8, false, MTLPixelFormatBC4_RSnorm)
-    _COMPR_TEX(BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_RG,  4,  4,  1,     16, false, MTLPixelFormatBC5_RGUnorm)
-    _COMPR_TEX(BC5_SNORM, GL_COMPRESSED_SIGNED_RG_RGTC2, GL_RG,  4,  4,  1,     16, false, MTLPixelFormatBC5_RGSnorm)
-
-    _COMPR_TEX(BC6H_UF16, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, GL_RGB,  4,  4,  1,     16, false, MTLPixelFormatBC6H_RGBUfloat)
-    _COMPR_TEX(BC6H_SF16, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB, GL_RGB,  4,  4,  1,     16, false, MTLPixelFormatBC6H_RGBFloat)
-    _COMPR_TEX(BC7_UNORM, GL_COMPRESSED_RGBA_BPTC_UNORM_ARB, GL_RGBA,  4,  4,  1,     16, false, MTLPixelFormatBC7_RGBAUnorm)
-    _COMPR_TEX(BC7_UNORM_SRGB, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB, GL_RGBA,  4,  4,  1,     16, true, MTLPixelFormatBC7_RGBAUnorm_sRGB)
-#else
-    _UNCOMPR_TEX(B5G6R5_UNORM, GL_RGB565, GL_BGR, GL_UNSIGNED_SHORT_5_6_5_REV, false,      2, MTLPixelFormatB5G6R5Unorm,       MTLVertexFormatInvalid)
-    _UNCOMPR_TEX(B5G5R5A1_UNORM, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1, false,      2, MTLPixelFormatA1BGR5Unorm,       MTLVertexFormatInvalid)
-
-    //        | FORMAT_ID       | GL_INTERNAL_FORMAT                        | GL_FORMAT  |      BLOCK        | SRGB  | MTLPixelFormat                 |
-    //        |                 |                                           |            | X | Y | Z | BYTES |       |                                |
-    _COMPR_TEX(EAC_R11_UNORM, GL_COMPRESSED_R11_EAC, GL_RED,  4,  4,  1,      8, false, MTLPixelFormatEAC_R11Unorm)
-    _COMPR_TEX(EAC_R11_SNORM, GL_COMPRESSED_SIGNED_R11_EAC, GL_RED,  4,  4,  1,      8, false, MTLPixelFormatEAC_R11Snorm)
-    _COMPR_TEX(EAC_RG11_UNORM, GL_COMPRESSED_RG11_EAC, GL_RG,  4,  4,  1,     16, false, MTLPixelFormatEAC_RG11Unorm)
-    _COMPR_TEX(EAC_RG11_SNORM, GL_COMPRESSED_SIGNED_RG11_EAC, GL_RG,  4,  4,  1,     16, false, MTLPixelFormatEAC_RG11Snorm)
-    _COMPR_TEX(ETC2_UNORM, GL_COMPRESSED_RGB8_ETC2, GL_RGB,  4,  4,  1,      8, false, MTLPixelFormatETC2_RGB8)
-    _COMPR_TEX(ETC2_UNORM_SRGB, GL_COMPRESSED_SRGB8_ETC2, GL_RGB,  4,  4,  1,      8, true, MTLPixelFormatETC2_RGB8_sRGB)
-    _COMPR_TEX(ETC2A_UNORM, GL_COMPRESSED_RGBA8_ETC2_EAC, GL_RGBA,  4,  4,  1,     16, false, MTLPixelFormatETC2_RGB8A1)
-    _COMPR_TEX(ETC2A_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, GL_RGBA,  4,  4,  1,     16, true, MTLPixelFormatETC2_RGB8A1_sRGB)
-    //  Igor: no sRGB support for GL ES 3.0 on iPhone?
-    //#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT             0x8A56
-    //#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT             0x8A57
-    _COMPR_TEX(PVRTC2_UNORM, GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG, GL_RGBA,  8,  4,  1,      8, false, MTLPixelFormatPVRTC_RGBA_2BPP)
-    _COMPR_TEX(PVRTC2_UNORM_SRGB, GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG, GL_RGBA,  8,  4,  1,      8, true, MTLPixelFormatPVRTC_RGBA_2BPP_sRGB)
-    _COMPR_TEX(PVRTC4_UNORM, GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG, GL_RGBA,  4,  4,  1,      8, false, MTLPixelFormatPVRTC_RGBA_4BPP)
-    _COMPR_TEX(PVRTC4_UNORM_SRGB, GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG, GL_RGBA,  4,  4,  1,      8, true, MTLPixelFormatPVRTC_RGBA_4BPP_sRGB)
-    //  Confetti End: Igor Lobanchikov
-
-    _COMPR_TEX(ASTC_4x4_UNORM, GL_COMPRESSED_RGBA_ASTC_4x4_KHR, GL_RGBA,  4,  4,  1,     16, false,   MTLPixelFormatASTC_4x4_LDR)
-    _COMPR_TEX(ASTC_4x4_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, GL_RGBA,  4,  4,  1,     16, true,   MTLPixelFormatASTC_4x4_sRGB)
-    _COMPR_TEX(ASTC_5x4_UNORM, GL_COMPRESSED_RGBA_ASTC_5x4_KHR, GL_RGBA,  5,  4,  1,     16, false,   MTLPixelFormatASTC_5x4_LDR)
-    _COMPR_TEX(ASTC_5x4_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, GL_RGBA,  5,  4,  1,     16, true,   MTLPixelFormatASTC_5x4_sRGB)
-    _COMPR_TEX(ASTC_5x5_UNORM, GL_COMPRESSED_RGBA_ASTC_5x5_KHR, GL_RGBA,  5,  5,  1,     16, false,   MTLPixelFormatASTC_5x5_LDR)
-    _COMPR_TEX(ASTC_5x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, GL_RGBA,  5,  5,  1,     16, true,   MTLPixelFormatASTC_5x5_sRGB)
-    _COMPR_TEX(ASTC_6x5_UNORM, GL_COMPRESSED_RGBA_ASTC_6x5_KHR, GL_RGBA,  6,  5,  1,     16, false,   MTLPixelFormatASTC_6x5_LDR)
-    _COMPR_TEX(ASTC_6x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, GL_RGBA,  6,  5,  1,     16, true,   MTLPixelFormatASTC_6x5_sRGB)
-    _COMPR_TEX(ASTC_6x6_UNORM, GL_COMPRESSED_RGBA_ASTC_6x6_KHR, GL_RGBA,  6,  6,  1,     16, false,   MTLPixelFormatASTC_6x6_LDR)
-    _COMPR_TEX(ASTC_6x6_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, GL_RGBA,  6,  6,  1,     16, true,   MTLPixelFormatASTC_6x6_sRGB)
-    _COMPR_TEX(ASTC_8x5_UNORM, GL_COMPRESSED_RGBA_ASTC_8x5_KHR, GL_RGBA,  8,  5,  1,     16, false,   MTLPixelFormatASTC_8x5_LDR)
-    _COMPR_TEX(ASTC_8x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, GL_RGBA,  8,  5,  1,     16, true,   MTLPixelFormatASTC_8x5_sRGB)
-    _COMPR_TEX(ASTC_8x6_UNORM, GL_COMPRESSED_RGBA_ASTC_8x6_KHR, GL_RGBA,  8,  6,  1,     16, false,   MTLPixelFormatASTC_8x6_LDR)
-    _COMPR_TEX(ASTC_8x6_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, GL_RGBA,  8,  6,  1,     16, true,   MTLPixelFormatASTC_8x6_sRGB)
-    _COMPR_TEX(ASTC_8x8_UNORM, GL_COMPRESSED_RGBA_ASTC_8x8_KHR, GL_RGBA,  8,  8,  1,     16, false,   MTLPixelFormatASTC_8x8_LDR)
-    _COMPR_TEX(ASTC_8x8_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, GL_RGBA,  8,  8,  1,     16, true,   MTLPixelFormatASTC_8x8_sRGB)
-    _COMPR_TEX(ASTC_10x5_UNORM, GL_COMPRESSED_RGBA_ASTC_10x5_KHR, GL_RGBA, 10,  5,  1,     16, false,   MTLPixelFormatASTC_10x5_LDR)
-    _COMPR_TEX(ASTC_10x5_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, GL_RGBA, 10,  5,  1,     16, true,   MTLPixelFormatASTC_10x5_sRGB)
-    _COMPR_TEX(ASTC_10x6_UNORM, GL_COMPRESSED_RGBA_ASTC_10x6_KHR, GL_RGBA, 10,  6,  1,     16, false,   MTLPixelFormatASTC_10x6_LDR)
-    _COMPR_TEX(ASTC_10x6_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, GL_RGBA, 10,  6,  1,     16, true,   MTLPixelFormatASTC_10x6_sRGB)
-    _COMPR_TEX(ASTC_10x8_UNORM, GL_COMPRESSED_RGBA_ASTC_10x8_KHR, GL_RGBA, 10,  8,  1,     16, false,   MTLPixelFormatASTC_10x8_LDR)
-    _COMPR_TEX(ASTC_10x8_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, GL_RGBA, 10,  8,  1,     16, true,   MTLPixelFormatASTC_10x8_sRGB)
-    _COMPR_TEX(ASTC_10x10_UNORM, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, GL_RGBA, 10, 10,  1,     16, false,   MTLPixelFormatASTC_10x10_LDR)
-    _COMPR_TEX(ASTC_10x10_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, GL_RGBA, 10, 10,  1,     16, true,   MTLPixelFormatASTC_10x10_sRGB)
-    _COMPR_TEX(ASTC_12x10_UNORM, GL_COMPRESSED_RGBA_ASTC_12x10_KHR, GL_RGBA, 12, 10,  1,     16, false,   MTLPixelFormatASTC_12x10_LDR)
-    _COMPR_TEX(ASTC_12x10_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, GL_RGBA, 12, 10,  1,     16, true,   MTLPixelFormatASTC_12x10_sRGB)
-    _COMPR_TEX(ASTC_12x12_UNORM, GL_COMPRESSED_RGBA_ASTC_12x12_KHR, GL_RGBA, 12, 12,  1,     16, false,   MTLPixelFormatASTC_12x12_LDR)
-    _COMPR_TEX(ASTC_12x12_UNORM_SRGB, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, GL_RGBA, 12, 12,  1,     16, true,   MTLPixelFormatASTC_12x12_sRGB)
-    //  Confetti End: Igor Lobanchikov
-#endif
-#undef _TEX
-#undef _UNCOMPR_TEX
-#undef _COMPR_TEX
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Default support for each format
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _UINT_MAP_DEFAULT(DefaultSupport, EGIFormat, 0)
-
-#define _SUPPORT(_FormatID, _Mask) _UINT_MAP_VALUE(DefaultSupport, DXGL_GI_FORMAT(_FormatID), _Mask)
-
-    DXGL_TODO("Add here hardcoded default support masks (see _SUPPORT) for each format to use when format queries are not supported and for particular features")
-
-#undef _SUPPORT
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Typeless format mappings
-    ////////////////////////////////////////////////////////////////////////////////
-
-    _UINT_MAP_DEFAULT(TypelessFormat, EGIFormat, eGIF_NUM)
-    _UINT_MAP_DEFAULT(TypelessConversion, EGIFormat, eGIFC_UNSUPPORTED)
-
-#define _TYPED_CONVERT(_FormatID, _TypelessID, _Conversion)                                 \
-    _UINT_MAP_VALUE(TypelessFormat, DXGL_GI_FORMAT(_FormatID), DXGL_GI_FORMAT(_TypelessID)) \
-    _UINT_MAP_VALUE(TypelessConversion, DXGL_GI_FORMAT(_FormatID), eGIFC_ ## _Conversion)
-#define _TYPED_DEFAULT(_FormatID, _TypelessID)                                                                                               \
-    _PTR_MAP_VALUE(STextureFormat,  DXGL_GI_FORMAT(_TypelessID), &DXGL_TEXTURE_FORMAT(_FormatID))                                            \
-    _PTR_MAP_VALUE(SUncompressedLayout,  DXGL_GI_FORMAT(_TypelessID), _PTR_MAP(SUncompressedLayout) < DXGL_GI_FORMAT(_FormatID) > ::ms_pPtr) \
-    _TYPED_CONVERT(_FormatID, _TypelessID, NONE)
-
-    _TYPED_DEFAULT(R32G32B32A32_FLOAT, R32G32B32A32_TYPELESS)
-    _TYPED_CONVERT(R32G32B32A32_UINT, R32G32B32A32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R32G32B32A32_SINT, R32G32B32A32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R32G32B32_FLOAT, R32G32B32_TYPELESS)
-    _TYPED_CONVERT(R32G32B32_UINT, R32G32B32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R32G32B32_SINT, R32G32B32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R16G16B16A16_FLOAT, R16G16B16A16_TYPELESS)
-    _TYPED_CONVERT(R16G16B16A16_UNORM, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16B16A16_UINT, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16B16A16_SNORM, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16B16A16_SINT, R16G16B16A16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R32G32_FLOAT, R32G32_TYPELESS)
-    _TYPED_CONVERT(R32G32_UINT, R32G32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R32G32_SINT, R32G32_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(D32_FLOAT_S8X24_UINT, R32G8X24_TYPELESS)
-    _TYPED_CONVERT(R32_FLOAT_X8X24_TYPELESS, R32G8X24_TYPELESS, DEPTH_TO_RED)
-    _TYPED_CONVERT(X32_TYPELESS_G8X24_UINT, R32G8X24_TYPELESS, STENCIL_TO_RED)
-    _TYPED_DEFAULT(R10G10B10A2_UNORM, R10G10B10A2_TYPELESS)
-    _TYPED_CONVERT(R10G10B10A2_UINT, R10G10B10A2_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R8G8B8A8_UNORM, R8G8B8A8_TYPELESS)
-    _TYPED_CONVERT(R8G8B8A8_UNORM_SRGB, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8B8A8_UINT, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8B8A8_SNORM, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8B8A8_SINT, R8G8B8A8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(R16G16_FLOAT, R16G16_TYPELESS)
-    _TYPED_CONVERT(R16G16_UNORM, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16_UINT, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16_SNORM, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R16G16_SINT, R16G16_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(D32_FLOAT, R32_TYPELESS)
-    _TYPED_CONVERT(R32_FLOAT, R32_TYPELESS, DEPTH_TO_RED)
-    _TYPED_DEFAULT(R8G8_UNORM, R8G8_TYPELESS)
-    _TYPED_CONVERT(R8G8_UINT, R8G8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8_SNORM, R8G8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8G8_SINT, R8G8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(D16_UNORM, R16_TYPELESS)
-    _TYPED_CONVERT(R16_UNORM, R16_TYPELESS, DEPTH_TO_RED)
-    _TYPED_DEFAULT(R8_UNORM, R8_TYPELESS)
-    _TYPED_CONVERT(R8_UINT, R8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8_SNORM, R8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(R8_SINT, R8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(B8G8R8A8_UNORM, B8G8R8A8_TYPELESS)
-    _TYPED_CONVERT(B8G8R8A8_UNORM_SRGB, B8G8R8A8_TYPELESS, TEXTURE_VIEW)
-
-    _TYPED_CONVERT(EAC_R11_SNORM, EAC_R11_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(EAC_RG11_SNORM, EAC_RG11_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(ETC2_UNORM_SRGB, ETC2_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(ETC2A_UNORM_SRGB, ETC2A_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(B8G8R8X8_UNORM, B8G8R8X8_TYPELESS)
-    _TYPED_CONVERT(B8G8R8X8_UNORM_SRGB, B8G8R8X8_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(PVRTC2_UNORM_SRGB, PVRTC2_TYPELESS, TEXTURE_VIEW)
-    _TYPED_CONVERT(PVRTC4_UNORM_SRGB, PVRTC4_TYPELESS, TEXTURE_VIEW)
-
-#if defined(AZ_PLATFORM_MAC)
-    _TYPED_DEFAULT(D24_UNORM_S8_UINT, R24G8_TYPELESS)
-    _TYPED_CONVERT(R24_UNORM_X8_TYPELESS, R24G8_TYPELESS, DEPTH_TO_RED)
-    _TYPED_CONVERT(X24_TYPELESS_G8_UINT, R24G8_TYPELESS, STENCIL_TO_RED)
-
-    _TYPED_DEFAULT(BC1_UNORM, BC1_TYPELESS)
-    _TYPED_CONVERT(BC1_UNORM_SRGB, BC1_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(BC2_UNORM, BC2_TYPELESS)
-    _TYPED_CONVERT(BC2_UNORM_SRGB, BC2_TYPELESS, TEXTURE_VIEW)
-    _TYPED_DEFAULT(BC3_UNORM, BC3_TYPELESS)
-    _TYPED_CONVERT(BC3_UNORM_SRGB, BC3_TYPELESS, TEXTURE_VIEW)
-
-#else
-    _TYPED_DEFAULT(EAC_R11_UNORM, EAC_R11_TYPELESS)
-    _TYPED_DEFAULT(EAC_RG11_UNORM, EAC_RG11_TYPELESS)
-    _TYPED_DEFAULT(ETC2_UNORM, ETC2_TYPELESS)
-    _TYPED_DEFAULT(ETC2A_UNORM, ETC2A_TYPELESS)
-    //  Confetti BEGIN: Igor Lobanchikov
-    _TYPED_DEFAULT(PVRTC2_UNORM, PVRTC2_TYPELESS)
-    _TYPED_DEFAULT(PVRTC4_UNORM, PVRTC4_TYPELESS)
-    //  Confetti End: Igor Lobanchikov
-#endif
-#undef _TYPED_DEFAULT
-#undef _TYPED_CONVERT
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Format information accessors
-    ////////////////////////////////////////////////////////////////////////////////
-
-    static SGIFormatInfo g_akFormatInfo[] =
-    {
-#define _FORMAT_INFO(_FormatID)                                                                                \
-    {                                                                                                          \
-        DXGL_DXGI_FORMAT(_FormatID),                                                                           \
-        _UINT_MAP(DefaultSupport) < DXGL_GI_FORMAT(_FormatID) > ::VALUE,                                       \
-        _PTR_MAP(STextureFormat) < DXGL_GI_FORMAT(_FormatID) > ::ms_pPtr,                                      \
-        _PTR_MAP(SUncompressedLayout) < DXGL_GI_FORMAT(_FormatID) > ::ms_pPtr,                                 \
-        static_cast<EGIFormat>(_UINT_MAP(TypelessFormat) < DXGL_GI_FORMAT(_FormatID) > ::VALUE),               \
-        static_cast<EGIFormatConversion>(_UINT_MAP(TypelessConversion) < DXGL_GI_FORMAT(_FormatID) > ::VALUE), \
-        _UINT_MAP(DXGITextureSwizzle) < DXGL_GI_FORMAT(_FormatID) > ::VALUE,                                   \
-    },
-
-        DXGL_GI_FORMATS(_FORMAT_INFO)
-
-#undef _FORMAT_INFO
-    };
-
-    const SGIFormatInfo* GetGIFormatInfo(EGIFormat eGIFormat)
-    {
-        assert(eGIFormat < eGIF_NUM);
-        return &g_akFormatInfo[eGIFormat];
-    }
-
-    DXGI_FORMAT GetDXGIFormat(EGIFormat eGIFormat)
-    {
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(eGIFormat));
-        return (pFormatInfo == NULL) ? DXGI_FORMAT_INVALID : pFormatInfo->m_eDXGIFormat;
-    }
-
-    EGIFormat GetGIFormat(DXGI_FORMAT eDXGIFormat)
-    {
-        switch (eDXGIFormat)
-        {
-#define _FORMAT_CASE(_FormatID, ...) \
-case DXGL_DXGI_FORMAT(_FormatID):    \
-    return DXGL_GI_FORMAT(_FormatID);
-
-            DXGL_GI_FORMATS(_FORMAT_CASE)
-#undef _FORMAT_CASE
-
-        default:
-            return eGIF_NUM;
-        }
-    }
-
-#undef _PTR_MAP_VALUE
-#undef _PTR_MAP_DEFAULT
-#undef _PTR_MAP
-#undef _UINT_MAP_VALUE
-#undef _UINT_MAP_DEFAULT
-#undef _UINT_MAP
-
-#undef DXGL_DXGI_FORMAT
-#undef DXGL_UNCOMPRESSED_LAYOUT
-#undef DXGL_TEXTURE_FORMAT
-#undef DXGL_GL_INTERNAL_FORMAT
-#undef DXGL_GI_CHANNEL_TYPE
-
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Texture swizzle encoding
-    ////////////////////////////////////////////////////////////////////////////////
-    DXMETAL_TODO("Consider removing swizzling data from the texture format structure.");
-#ifndef GL_RED
-#define GL_RED                                           0x1903
-#define GL_GREEN                                         0x1904
-#define GL_BLUE                                          0x1905
-#define GL_ALPHA                                         0x1906
-#define GL_ZERO                                          0
-#define GL_ONE                                           1
-#endif
-
-    void SwizzleMaskToRGBA(TSwizzleMask uMask, int aiRGBA[4])
-    {
-        uint32 uChannel(4);
-        while (uChannel--)
-        {
-            switch (uMask & 7)
-            {
-            case DXGL_SWIZZLE_RED:
-                aiRGBA[uChannel] = GL_RED;
-                break;
-            case DXGL_SWIZZLE_GREEN:
-                aiRGBA[uChannel] = GL_GREEN;
-                break;
-            case DXGL_SWIZZLE_BLUE:
-                aiRGBA[uChannel] = GL_BLUE;
-                break;
-            case DXGL_SWIZZLE_ALPHA:
-                aiRGBA[uChannel] = GL_ALPHA;
-                break;
-            case DXGL_SWIZZLE_ZERO:
-                aiRGBA[uChannel] = GL_ZERO;
-                break;
-            case DXGL_SWIZZLE_ONE:
-                aiRGBA[uChannel] = GL_ONE;
-                break;
-            default:
-                assert(false);
-            }
-            uMask >>= 3;
-        }
-    }
-
-    bool RGBAToSwizzleMask(const int aiRGBA[4], TSwizzleMask& uMask)
-    {
-        uMask = 0;
-        uint32 uChannel;
-        for (uChannel = 0; uChannel < 4; ++uChannel, uMask <<= 3)
-        {
-            switch (aiRGBA[uChannel])
-            {
-            case GL_RED:
-                uMask |= DXGL_SWIZZLE_RED;
-                break;
-            case GL_GREEN:
-                uMask |= DXGL_SWIZZLE_GREEN;
-                break;
-            case GL_BLUE:
-                uMask |= DXGL_SWIZZLE_BLUE;
-                break;
-            case GL_ALPHA:
-                uMask |= DXGL_SWIZZLE_ALPHA;
-                break;
-            case GL_ZERO:
-                uMask |= DXGL_SWIZZLE_ZERO;
-                break;
-            case GL_ONE:
-                uMask |= DXGL_SWIZZLE_ONE;
-                break;
-            default:
-                return false;
-            }
-        }
-        return true;
-    }
-
-#undef DXGL_SWIZZLE_RED
-#undef DXGL_SWIZZLE_GREEN
-#undef DXGL_SWIZZLE_BLUE
-#undef DXGL_SWIZZLE_ALPHA
-#undef DXGL_SWIZZLE_ZERO
-#undef DXGL_SWIZZLE_ONE
-
-#undef GL_RED
-#undef GL_GREEN
-#undef GL_BLUE
-#undef GL_ALPHA
-#undef GL_ZERO
-#undef GL_ONE
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLFormat.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLFormat.hpp
deleted file mode 100644
index c1545c36b0..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLFormat.hpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the image formats used by DXGL and the utility
-//               methods for converting to and from DXGI formats
-
-#ifndef __GLFORMAT__
-#define __GLFORMAT__
-
-#include "GLCommon.hpp"
-
-//  Confetti BEGIN: Igor Lobanchikov
-#import <Foundation/Foundation.h>
-#import <Metal/MTLDefines.h>
-#import <Metal/MTLPixelFormat.h>
-#import <Metal/MTLVertexDescriptor.h>
-//  Confetti END: Igor Lobanchikov
-
-// Enumeration of the IDs of all the supported GI format (each ID must match one
-// DXGI_FORMAT enumeration value - excluding the DXGI_FORMAT prefix).
-#define DXGL_UNCOMPRESSED_GI_FORMATS(_Func) \
-    _Func(R32G32B32A32_TYPELESS)            \
-    _Func(R32G32B32A32_FLOAT)               \
-    _Func(R32G32B32A32_UINT)                \
-    _Func(R32G32B32A32_SINT)                \
-    _Func(R32G32B32_TYPELESS)               \
-    _Func(R32G32B32_FLOAT)                  \
-    _Func(R32G32B32_UINT)                   \
-    _Func(R32G32B32_SINT)                   \
-    _Func(R16G16B16A16_TYPELESS)            \
-    _Func(R16G16B16A16_FLOAT)               \
-    _Func(R16G16B16A16_UNORM)               \
-    _Func(R16G16B16A16_UINT)                \
-    _Func(R16G16B16A16_SNORM)               \
-    _Func(R16G16B16A16_SINT)                \
-    _Func(R32G32_TYPELESS)                  \
-    _Func(R32G32_FLOAT)                     \
-    _Func(R32G32_UINT)                      \
-    _Func(R32G32_SINT)                      \
-    _Func(R32G8X24_TYPELESS)                \
-    _Func(D32_FLOAT_S8X24_UINT)             \
-    _Func(R32_FLOAT_X8X24_TYPELESS)         \
-    _Func(X32_TYPELESS_G8X24_UINT)          \
-    _Func(R10G10B10A2_TYPELESS)             \
-    _Func(R10G10B10A2_UNORM)                \
-    _Func(R10G10B10A2_UINT)                 \
-    _Func(R11G11B10_FLOAT)                  \
-    _Func(R8G8B8A8_TYPELESS)                \
-    _Func(R8G8B8A8_UNORM)                   \
-    _Func(R8G8B8A8_UNORM_SRGB)              \
-    _Func(R8G8B8A8_UINT)                    \
-    _Func(R8G8B8A8_SNORM)                   \
-    _Func(R8G8B8A8_SINT)                    \
-    _Func(R16G16_TYPELESS)                  \
-    _Func(R16G16_FLOAT)                     \
-    _Func(R16G16_UNORM)                     \
-    _Func(R16G16_UINT)                      \
-    _Func(R16G16_SNORM)                     \
-    _Func(R16G16_SINT)                      \
-    _Func(R32_TYPELESS)                     \
-    _Func(D32_FLOAT)                        \
-    _Func(R32_FLOAT)                        \
-    _Func(R32_UINT)                         \
-    _Func(R32_SINT)                         \
-    _Func(R24G8_TYPELESS)                   \
-    _Func(D24_UNORM_S8_UINT)                \
-    _Func(R24_UNORM_X8_TYPELESS)            \
-    _Func(X24_TYPELESS_G8_UINT)             \
-    _Func(R8G8_TYPELESS)                    \
-    _Func(R8G8_UNORM)                       \
-    _Func(R8G8_UINT)                        \
-    _Func(R8G8_SNORM)                       \
-    _Func(R8G8_SINT)                        \
-    _Func(R16_TYPELESS)                     \
-    _Func(R16_FLOAT)                        \
-    _Func(D16_UNORM)                        \
-    _Func(R16_UNORM)                        \
-    _Func(R16_UINT)                         \
-    _Func(R16_SNORM)                        \
-    _Func(R16_SINT)                         \
-    _Func(R8_TYPELESS)                      \
-    _Func(R8_UNORM)                         \
-    _Func(R8_UINT)                          \
-    _Func(R8_SNORM)                         \
-    _Func(R8_SINT)                          \
-    _Func(A8_UNORM)                         \
-    _Func(R9G9B9E5_SHAREDEXP)               \
-    _Func(B5G6R5_UNORM)                     \
-    _Func(B5G5R5A1_UNORM)                   \
-    _Func(B8G8R8A8_TYPELESS)                \
-    _Func(B8G8R8A8_UNORM)                   \
-    _Func(B8G8R8A8_UNORM_SRGB)              \
-    _Func(B8G8R8X8_TYPELESS)                \
-    _Func(B8G8R8X8_UNORM)                   \
-    _Func(B8G8R8X8_UNORM_SRGB)
-#define DXGL_COMPRESSED_GI_FORMATS(_Func) \
-    _Func(BC1_TYPELESS)                   \
-    _Func(BC1_UNORM)                      \
-    _Func(BC1_UNORM_SRGB)                 \
-    _Func(BC2_TYPELESS)                   \
-    _Func(BC2_UNORM)                      \
-    _Func(BC2_UNORM_SRGB)                 \
-    _Func(BC3_TYPELESS)                   \
-    _Func(BC3_UNORM)                      \
-    _Func(BC3_UNORM_SRGB)                 \
-    _Func(BC4_TYPELESS)                   \
-    _Func(BC4_UNORM)                      \
-    _Func(BC4_SNORM)                      \
-    _Func(BC5_TYPELESS)                   \
-    _Func(BC5_UNORM)                      \
-    _Func(BC5_SNORM)                      \
-    _Func(BC6H_TYPELESS)                  \
-    _Func(BC6H_UF16)                      \
-    _Func(BC6H_SF16)                      \
-    _Func(BC7_TYPELESS)                   \
-    _Func(BC7_UNORM)                      \
-    _Func(BC7_UNORM_SRGB)                 \
-    _Func(EAC_R11_TYPELESS)               \
-    _Func(EAC_R11_UNORM)                  \
-    _Func(EAC_R11_SNORM)                  \
-    _Func(EAC_RG11_TYPELESS)              \
-    _Func(EAC_RG11_UNORM)                 \
-    _Func(EAC_RG11_SNORM)                 \
-    _Func(ETC2_TYPELESS)                  \
-    _Func(ETC2_UNORM)                     \
-    _Func(ETC2_UNORM_SRGB)                \
-    _Func(ETC2A_TYPELESS)                 \
-    _Func(ETC2A_UNORM)                    \
-    _Func(ETC2A_UNORM_SRGB)               \
-    _Func(PVRTC2_TYPELESS)                \
-    _Func(PVRTC2_UNORM)                   \
-    _Func(PVRTC2_UNORM_SRGB)              \
-    _Func(PVRTC4_TYPELESS)                \
-    _Func(PVRTC4_UNORM)                   \
-    _Func(PVRTC4_UNORM_SRGB)              \
-    _Func(ASTC_4x4_TYPELESS)              \
-    _Func(ASTC_4x4_UNORM)                 \
-    _Func(ASTC_4x4_UNORM_SRGB)            \
-    _Func(ASTC_5x4_TYPELESS)              \
-    _Func(ASTC_5x4_UNORM)                 \
-    _Func(ASTC_5x4_UNORM_SRGB)            \
-    _Func(ASTC_5x5_TYPELESS)              \
-    _Func(ASTC_5x5_UNORM)                 \
-    _Func(ASTC_5x5_UNORM_SRGB)            \
-    _Func(ASTC_6x5_TYPELESS)              \
-    _Func(ASTC_6x5_UNORM)                 \
-    _Func(ASTC_6x5_UNORM_SRGB)            \
-    _Func(ASTC_6x6_TYPELESS)              \
-    _Func(ASTC_6x6_UNORM)                 \
-    _Func(ASTC_6x6_UNORM_SRGB)            \
-    _Func(ASTC_8x5_TYPELESS)              \
-    _Func(ASTC_8x5_UNORM)                 \
-    _Func(ASTC_8x5_UNORM_SRGB)            \
-    _Func(ASTC_8x6_TYPELESS)              \
-    _Func(ASTC_8x6_UNORM)                 \
-    _Func(ASTC_8x6_UNORM_SRGB)            \
-    _Func(ASTC_8x8_TYPELESS)              \
-    _Func(ASTC_8x8_UNORM)                 \
-    _Func(ASTC_8x8_UNORM_SRGB)            \
-    _Func(ASTC_10x5_TYPELESS)             \
-    _Func(ASTC_10x5_UNORM)                \
-    _Func(ASTC_10x5_UNORM_SRGB)           \
-    _Func(ASTC_10x6_TYPELESS)             \
-    _Func(ASTC_10x6_UNORM)                \
-    _Func(ASTC_10x6_UNORM_SRGB)           \
-    _Func(ASTC_10x8_TYPELESS)             \
-    _Func(ASTC_10x8_UNORM)                \
-    _Func(ASTC_10x8_UNORM_SRGB)           \
-    _Func(ASTC_10x10_TYPELESS)            \
-    _Func(ASTC_10x10_UNORM)               \
-    _Func(ASTC_10x10_UNORM_SRGB)          \
-    _Func(ASTC_12x10_TYPELESS)            \
-    _Func(ASTC_12x10_UNORM)               \
-    _Func(ASTC_12x10_UNORM_SRGB)          \
-    _Func(ASTC_12x12_TYPELESS)            \
-    _Func(ASTC_12x12_UNORM)               \
-    _Func(ASTC_12x12_UNORM_SRGB)
-
-#define DXGL_GI_FORMATS(_Func)          \
-    DXGL_UNCOMPRESSED_GI_FORMATS(_Func) \
-    DXGL_COMPRESSED_GI_FORMATS(_Func)
-
-namespace NCryMetal
-{
-    // Supported DXGI format identifiers
-    enum EGIFormat
-    {
-#define DXGL_GI_FORMAT(_FormatID) eGIF_ ## _FormatID
-#define _GI_FORMAT_ENUM_FUNC(_FormatID, ...) DXGL_GI_FORMAT(_FormatID),
-        DXGL_GI_FORMATS(_GI_FORMAT_ENUM_FUNC)
-#undef _GI_FORMAT_ENUM_FUNC
-        DXGL_GI_FORMAT(NUM)
-    };
-
-    // Data types supported for DXGI format channels
-    enum EGIChannelType
-    {
-        eGICT_UNUSED,   // Not used by the format
-        eGICT_UNORM,    // Unsigned normalized integer (range linearly mapped to [0, 1])
-        eGICT_UINT,     // Unsigned integer
-        eGICT_FLOAT,    // Floating point value
-        eGICT_SNORM,    // Signed normalized integer (range linearly mapped to [-1, 1])
-        eGICT_SINT,     // Signed integer
-    };
-
-    // Utility information about an uncompressed pixel format
-    struct SUncompressedLayout
-    {
-        // Number of bits per pixel for the red, green, blue and alpha channels
-        uint32 m_uRedBits;
-        uint32 m_uGreenBits;
-        uint32 m_uBlueBits;
-        uint32 m_uAlphaBits;
-
-        // Position for the red, green, blue and alpha channels within each pixel
-        uint32 m_uRedShift;
-        uint32 m_uGreenShift;
-        uint32 m_uBlueShift;
-        uint32 m_uAlphaShift;
-
-        // The data type for the red, green, blue and alpha channels
-        EGIChannelType m_eColorType;
-
-        // Number of bits of the depth channel
-        uint32 m_uDepthBits;
-        // The data type for the depth channel
-        EGIChannelType m_eDepthType;
-
-        // Number of bits of the stencil channel
-        uint32 m_uStencilBits;
-        // The data type for the stencil channel
-        EGIChannelType m_eStencilType;
-
-        // Number of spare bits not used by the format layout
-        uint32 m_uSpareBits;
-
-        inline uint32 GetColorBits() const
-        {
-            return m_uRedBits + m_uGreenBits + m_uBlueBits + m_uAlphaBits;
-        }
-
-        inline uint32 GetDepthStencilBits() const
-        {
-            return m_uDepthBits + m_uStencilBits;
-        }
-
-        inline uint32 GetPixelBits() const
-        {
-            return GetColorBits() + GetDepthStencilBits() + m_uSpareBits;
-        }
-
-        inline uint32 GetPixelBytes() const
-        {
-            uint32 uPixelBits(GetPixelBits());
-            CRY_ASSERT(uPixelBits % 8 == 0);
-            return uPixelBits >> 3;
-        }
-    };
-
-    // Identifies a set of swizzle modes for each color channel
-    typedef uint16 TSwizzleMask;
-
-    struct STextureFormat
-    {
-        // Tells if the image data is compressed
-        bool m_bCompressed;
-
-        // Tells if the the format assumes data in sRGB space
-        bool m_bSRGB;
-
-        // The size in pixels of a texture block (compression block if m_bCompressed is true, otherwise one pixel).
-        uint32 m_uBlockWidth;
-        uint32 m_uBlockHeight;
-        uint32 m_uBlockDepth;
-
-        // The size in bytes of a texture block (compression block if m_bCompressed is true, otherwise one pixel).
-        uint32 m_uNumBlockBytes;
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        MTLPixelFormat  m_eMetalFormat;
-        MTLVertexFormat m_eMetalVertexFormat;
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    // Identifies the possible format conversion procedures available
-    enum EGIFormatConversion
-    {
-        // A texture view is required to reinterpret the source format as the destination format
-        eGIFC_TEXTURE_VIEW,
-
-        // The depth channel of the source is mapped to the red channel of the destination
-        eGIFC_DEPTH_TO_RED,
-
-        // The stencil channel of the source is mapped to the red channel of the destination
-        eGIFC_STENCIL_TO_RED,
-
-        // The source format cannot be converted to the destination format
-        eGIFC_UNSUPPORTED,
-
-        // The source format can be used in place of the destination format without conversion
-        eGIFC_NONE
-    };
-
-    struct SGIFormatInfo
-    {
-        // Equivalent DXGI format
-        DXGI_FORMAT m_eDXGIFormat;
-
-        // Default supported usage mask for features/GL versions where support detection is not possible (union of D3D11_FORMAT_SUPPORT flags)
-        uint32 m_uDefaultSupport;
-
-        // Pointer to the texture information, or NULL if not a valid texture format
-        const STextureFormat* m_pTexture;
-
-        // Pointer to the uncompressed layout information, or NULL if compressed
-        const SUncompressedLayout* m_pUncompressed;
-
-        // Identifies the the compatible typeless format, or eGIF_NUM if no such format exists
-        EGIFormat m_eTypelessFormat;
-
-        // Describes how to convert to the compatible typeless format
-        EGIFormatConversion m_eTypelessConversion;
-
-        // The color channel swizzle modes required to map this format to the associated DXGI format
-        TSwizzleMask m_uDXGISwizzleMask;
-    };
-
-    extern const DXGI_FORMAT DXGI_FORMAT_INVALID;
-
-    // Finds the DXGI format corresponding to the given EGIFormat value.
-    // Returns DXGI_FORMAT_INVALID if the format was not found.
-    DXGI_FORMAT GetDXGIFormat(EGIFormat eGIFormat);
-
-    // Finds the DXGL EGIFormat value corresponding to the given DXGI_FORMAT.
-    // Returns eGIF_NUM if the given format is not supported.
-    EGIFormat GetGIFormat(DXGI_FORMAT eDXGIFormat);
-
-    // Gets the global format information for the given EGIFormat
-    const SGIFormatInfo* GetGIFormatInfo(EGIFormat eGIFormat);
-
-    DXMETAL_TODO("Consider removing swizzling data from the texture format structure.");
-    //  Igor: Motivation: texture swizzling is not supported by Metal. However, some texture formats swizzling is differnet from
-    //  DX11 ones. It is possible swizzling control will be added to Metal in future.
-    void SwizzleMaskToRGBA(TSwizzleMask uMask, int aiRGBA[4]);
-
-    // Converts a combination of red, green, blue and alpha texture swizzle modes to a TSwizzleMask
-    bool RGBAToSwizzleMask(const int aRGBA[4], TSwizzleMask& uMask);
-};
-
-
-#endif //__GLFORMAT__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLPlatform.hpp
deleted file mode 100644
index c295198665..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLPlatform.hpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Platform specific DXGL requirements implementation
-
-#ifndef __GLPLATFORM__
-#define __GLPLATFORM__
-
-namespace NCryMetal
-{
-    enum ELogSeverity
-    {
-        eLS_Info,
-        eLS_Warning,
-        eLS_Error
-    };
-}
-
-#define CUSTOM_SCOPED_PROFILE(_Name)
-
-#include "GLCryPlatform.hpp"
-
-#define DXGL_PROFILING 0
-
-#if defined(_MSC_VER)
-#define _DXGL_LOG_MSG(_TEXT, _FILE, _LINE, _FUNC) "DXGL: " _TEXT " : [@" _FUNC "] " _FILE "(" #_LINE ")"
-#define DXGL_LOG_MSG(_TEXT) _DXGL_LOG_MSG(_TEXT, __FILE__, __LINE__, __FUNCSIG__)
-#else
-#define _DXGL_LOG_MSG(_TEXT, _FILE, _FUNC) "DXGL: " _TEXT " : [@" _FUNC "] " _FILE "(%d)"
-#define DXGL_LOG_MSG(_TEXT) _DXGL_LOG_MSG(_TEXT, __FILE__, "?") // GCC can't resolve __FUNCTION__ in  the preprocessor
-#endif
-
-#if defined(_MSC_VER)
-#define DXGL_WARNING(_Format, ...) NCryMetal::LogMessage(NCryMetal::eLS_Warning, DXGL_LOG_MSG(_Format), __VA_ARGS__)
-#define DXGL_ERROR(_Format, ...)   NCryMetal::LogMessage(NCryMetal::eLS_Error,   DXGL_LOG_MSG(_Format), __VA_ARGS__)
-#define DXGL_INFO(_Format, ...)    NCryMetal::LogMessage(NCryMetal::eLS_Info,    DXGL_LOG_MSG(_Format), __VA_ARGS__)
-#else
-#define DXGL_WARNING(_Format, ...) NCryMetal::LogMessage(NCryMetal::eLS_Warning, DXGL_LOG_MSG(_Format), ##__VA_ARGS__, __LINE__)
-#define DXGL_ERROR(_Format, ...)   NCryMetal::LogMessage(NCryMetal::eLS_Error,   DXGL_LOG_MSG(_Format), ##__VA_ARGS__, __LINE__)
-#define DXGL_INFO(_Format, ...)    NCryMetal::LogMessage(NCryMetal::eLS_Info,    DXGL_LOG_MSG(_Format), ##__VA_ARGS__, __LINE__)
-#endif
-
-#define DXGL_NOT_IMPLEMENTED NCryMetal::BreakUnique(__FILE__, __LINE__, __func__);
-#define DXMETAL_NOT_IMPLEMENTED NCryMetal::BreakUnique(__FILE__, __LINE__, __func__);
-#define DXGL_TODO(_DESC)
-#define DXMETAL_TODO(_DESC)
-
-#define DXGL_ARRAY_SIZE(_Array) (sizeof(_Array) / sizeof(_Array[0]))
-#define _DXGL_QUOTE(X) #X
-#define DXGL_QUOTE(X) _DXGL_QUOTE(X)
-
-#define DXGL_DECLARE_PTR(_Qualifier, _TypeName) \
-    _Qualifier _TypeName;                       \
-    typedef _smart_ptr<_TypeName> _TypeName ## Ptr;
-#define DXGL_DECLARE_REF_COUNTED(_Qualifier, _TypeName) \
-    DXGL_DECLARE_PTR(_Qualifier, _TypeName)             \
-    _Qualifier _TypeName: public NCryMetal::SRefCounted < _TypeName >
-
-#if DXGL_PROFILING
-#define DXGL_SCOPED_PROFILE(_Name)                \
-    SScopedProfileLabel kDXGLProfileLabel(_Name); \
-    CUSTOM_SCOPED_PROFILE(_Name)
-#else
-#define DXGL_SCOPED_PROFILE(_Name)
-#endif
-
-namespace NCryMetal
-{
-    template <typename T>
-    struct SRefCounted
-    {
-        uint32 m_uRefCnt;
-
-        SRefCounted()
-            : m_uRefCnt(0)
-        {
-        }
-
-        void AddRef()
-        {
-            ++m_uRefCnt;
-        }
-
-        void Release()
-        {
-            if (--m_uRefCnt == 0)
-            {
-                delete static_cast<T*>(this);
-            }
-        }
-    };
-
-    struct SSpinlockBitMaskWord
-    {
-        typedef volatile LONG Word;
-        enum
-        {
-            BIT_SIZE = sizeof(Word) * 8
-        };
-        Word m_aMask;
-
-        void Set(uint32 uIndex, bool bFlag)
-        {
-            while (true)
-            {
-                Word kOld(m_aMask);
-                Word uFlagMask(1 << uIndex);
-                Word kNew(bFlag ? (kOld | uFlagMask) : (kOld & ~uFlagMask));
-                if (CompareExchange(&m_aMask, kNew, kOld) == kOld)
-                {
-                    break;
-                }
-            }
-        }
-
-        bool Get(uint32 uIndex) const
-        {
-            CRY_ASSERT(uIndex <= BIT_SIZE);
-            return ((m_aMask >> uIndex) & 1) != 0;
-        }
-
-        void Init(bool bValue)
-        {
-            m_aMask = bValue ? ~(LONG)0 : (LONG)0;
-        }
-    };
-
-    struct SUnsafeBitMaskWord
-    {
-        typedef uint32 Word;
-        enum
-        {
-            BIT_SIZE = sizeof(Word) * 8
-        };
-        Word m_aMask;
-
-        SUnsafeBitMaskWord operator|(const SUnsafeBitMaskWord& kOther)
-        {
-            SUnsafeBitMaskWord kRes = {m_aMask | kOther.m_aMask};
-            return kRes;
-        }
-
-        SUnsafeBitMaskWord operator&(const SUnsafeBitMaskWord& kOther)
-        {
-            SUnsafeBitMaskWord kRes = {m_aMask& kOther.m_aMask};
-            return kRes;
-        }
-
-        bool operator==(const SUnsafeBitMaskWord& kOther)
-        {
-            return m_aMask == kOther.m_aMask;
-        }
-
-        bool operator!=(const SUnsafeBitMaskWord& kOther)
-        {
-            return m_aMask != kOther.m_aMask;
-        }
-
-        SUnsafeBitMaskWord& operator=(const SUnsafeBitMaskWord& kOther)
-        {
-            m_aMask = kOther.m_aMask;
-            return *this;
-        }
-
-        void Set(uint32 uIndex, bool bFlag)
-        {
-            CRY_ASSERT(uIndex <= BIT_SIZE);
-            Word uFlagMask(1 << uIndex);
-            m_aMask = bFlag ? (m_aMask | uFlagMask) : (m_aMask & ~uFlagMask);
-        }
-
-        bool Get(uint32 uIndex) const
-        {
-            CRY_ASSERT(uIndex <= BIT_SIZE);
-            return ((m_aMask >> uIndex) & 1) != 0;
-        }
-
-        void Init(bool bValue)
-        {
-            m_aMask = bValue ? ~(Word)0 : (Word)0;
-        }
-    };
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    struct SBitMaskMultiWord
-    {
-        typedef BitMaskWord Word;
-        Word m_akWords[uNumWords];
-
-        void Set(uint32 uIndex, bool bFlag)
-        {
-            m_akWords[uIndex / Word::BIT_SIZE].Set(uIndex % Word::BIT_SIZE, bFlag);
-        }
-
-        bool Get(uint32 uIndex) const
-        {
-            return m_akWords[uIndex / Word::BIT_SIZE].Get(uIndex % Word::BIT_SIZE);
-        }
-
-        void Init(bool bValue)
-        {
-            memset(m_akWords, sizeof(m_akWords), bValue ? 0xFF : 0);
-        }
-
-        SBitMaskMultiWord& operator=(const SBitMaskMultiWord& kOther)
-        {
-            memcpy(&m_akWords, kOther.m_akWords, sizeof(m_akWords));
-        }
-    };
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    SBitMaskMultiWord<uNumWords, BitMaskWord> operator|(const SBitMaskMultiWord<uNumWords, BitMaskWord>& kLeft, const SBitMaskMultiWord<uNumWords, BitMaskWord>& kRight)
-    {
-        SBitMaskMultiWord<uNumWords, BitMaskWord> kRes;
-        for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-        {
-            kRes.m_akWords[uIndex] = kLeft.m_akWords[uIndex] | kRight.m_akWords[uIndex];
-        }
-        return kRes;
-    }
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    SBitMaskMultiWord<uNumWords, BitMaskWord> operator&(const SBitMaskMultiWord<uNumWords, BitMaskWord>& kLeft, const SBitMaskMultiWord<uNumWords, BitMaskWord>& kRight)
-    {
-        SBitMaskMultiWord<uNumWords, BitMaskWord> kRes;
-        for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-        {
-            kRes.m_akWords[uIndex] = kLeft.m_akWords[uIndex] & kRight.m_akWords[uIndex];
-        }
-        return kRes;
-    }
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    bool operator==(const SBitMaskMultiWord<uNumWords, BitMaskWord>& kLeft, const SBitMaskMultiWord<uNumWords, BitMaskWord>& kRight)
-    {
-        for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-        {
-            if (!(kLeft.m_akWords[uIndex] == kRight.m_akWords[uIndex]))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    bool operator!=(const SBitMaskMultiWord<uNumWords, BitMaskWord>& kLeft, const SBitMaskMultiWord<uNumWords, BitMaskWord>& kRight)
-    {
-        for (uint32 uIndex = 0; uIndex < uNumWords; ++uIndex)
-        {
-            if ((kLeft.m_akWords[uIndex] != kRight.m_akWords[uIndex]))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    template <uint32 uNumWords, typename BitMaskWord>
-    struct SBitMaskImpl
-    {
-        typedef SBitMaskMultiWord<uNumWords, BitMaskWord> Type;
-    };
-    template <typename BitMaskWord>
-    struct SBitMaskImpl<1, BitMaskWord>
-    {
-        typedef BitMaskWord Type;
-    };
-    template <uint32 uSize, typename BitMaskWord>
-    struct SBitMask
-    {
-        typedef typename SBitMaskImpl<(uSize + BitMaskWord::BIT_SIZE - 1) / BitMaskWord::BIT_SIZE, BitMaskWord>::Type Type;
-    };
-
-    struct SList
-    {
-        typedef SLockFreeSingleLinkedListHeader TListHeader;
-        typedef SLockFreeSingleLinkedListEntry TListEntry;
-
-        SList()
-        {
-            CryInitializeSListHead(m_kHeader);
-        }
-
-        void Push(TListEntry& kEntry)
-        {
-            CryInterlockedPushEntrySList(m_kHeader, kEntry);
-        }
-
-        TListEntry* Pop()
-        {
-            return alias_cast<TListEntry*>(CryInterlockedPopEntrySList(m_kHeader));
-        }
-
-        TListHeader m_kHeader;
-    };
-
-    struct SScopedProfileLabel
-    {
-        const char* m_szName;
-
-        SScopedProfileLabel(const char* szName)
-            : m_szName(szName)
-        {
-            DXGLProfileLabelPush(m_szName);
-        }
-
-        ~SScopedProfileLabel()
-        {
-            DXGLProfileLabelPop(m_szName);
-        }
-    };
-}
-
-#endif //__GLPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLResource.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLResource.cpp
deleted file mode 100644
index ebaa4a02c9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLResource.cpp
+++ /dev/null
@@ -1,3193 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implements the resource related functions
-
-#include "RenderDll_precompiled.h"
-#include "GLResource.hpp"
-#include "METALContext.hpp"
-#include "MetalDevice.hpp"
-#include <DriverD3D.h>
-
-namespace NCryMetal
-{
-    enum
-    {
-        MIN_MAPPED_RESOURCE_ALIGNMENT = 64, // DX10+ mapped resources are 16-aligned but GL_ARB_map_buffer_alignment ensures 64-alignment for AVX
-    };
-
-    MemRingBufferStorage GetMemAllocModeBasedOnSize(const size_t size)
-    {
-        MemRingBufferStorage memAllocMode = MEM_SHARED_RINGBUFFER;
-#if defined(AZ_PLATFORM_MAC)
-        if (size > FASTBUFFER_SIZE_THRESHHOLD)
-        {
-            memAllocMode = MEM_MANAGED_RINGBUFFER;
-        }
-#endif
-        return memAllocMode;
-    }
-
-    id<MTLBuffer> GetMtlBufferBasedOnSize(const SBuffer* pBuffer)
-    {
-        if (!pBuffer)
-        {
-            return NULL;
-        }
-        id<MTLBuffer> buffer = pBuffer->m_BufferShared;
-#if defined(AZ_PLATFORM_MAC)
-        if (pBuffer->m_BufferManaged && GetMemAllocModeBasedOnSize(pBuffer->m_uMapSize) == MEM_MANAGED_RINGBUFFER)
-        {
-            buffer = pBuffer->m_BufferManaged;
-        }
-#endif
-        return buffer;
-    }
-
-    uint32 GetRowPitch(uint32 uWidth, uint32 uRowBytes, const SGIFormatInfo* pFormatInfo)
-    {
-        uint32 uNumElementsPerRow(uRowBytes * pFormatInfo->m_pTexture->m_uBlockWidth / pFormatInfo->m_pTexture->m_uNumBlockBytes);
-        return uNumElementsPerRow == uWidth ? 0 : uNumElementsPerRow;
-    }
-
-    uint32 GetImagePitch(uint32 uHeight, uint32 uImageBytes, uint32 uRowBytes)
-    {
-        uint32 uNumRowsPerImage(uImageBytes / uRowBytes);
-        return uNumRowsPerImage == uHeight ? 0 : uNumRowsPerImage;
-    }
-
-    struct STexBox
-    {
-        STexPos m_kOffset;
-        STexSize m_kSize;
-    };
-
-    struct SPackedLayout
-    {
-        uint32 m_uRowPitch;
-        uint32 m_uImagePitch;
-        uint32 m_uTextureSize;
-    };
-
-    static GLint GetMaxMipLevels(const D3D11_TEXTURE1D_DESC& kTexDesc)
-    {
-        return (GLint)IntegerLog2(kTexDesc.Width);
-    }
-
-    static GLint GetMaxMipLevels(const D3D11_TEXTURE2D_DESC& kTexDesc)
-    {
-        return (GLint)max(IntegerLog2(kTexDesc.Width), IntegerLog2(kTexDesc.Height));
-    }
-
-    static GLint GetMaxMipLevels(const D3D11_TEXTURE3D_DESC& kTexDesc)
-    {
-        return (GLint)max(max(IntegerLog2(kTexDesc.Width), IntegerLog2(kTexDesc.Height)), IntegerLog2(kTexDesc.Depth));
-    }
-
-    template <typename TextureDesc>
-    static GLint GetNumMipLevels(const TextureDesc& kTexDesc)
-    {
-        return kTexDesc.MipLevels != 0 ? kTexDesc.MipLevels : GetMaxMipLevels(kTexDesc);
-    }
-
-    static STexSize GetMipSize(STexture* pTexture, GLint iLevel, const SGIFormatInfo* pFormat, bool bClampToBlockSize)
-    {
-        STexSize kMinSize(1, 1, 1);
-        if (bClampToBlockSize && pFormat->m_pTexture->m_bCompressed)
-        {
-            kMinSize = STexSize(
-                    pFormat->m_pTexture->m_uBlockWidth,
-                    pFormat->m_pTexture->m_uBlockHeight,
-                    pFormat->m_pTexture->m_uBlockDepth);
-        }
-
-        return STexSize(
-            max(kMinSize.x, pTexture->m_iWidth >> iLevel),
-            max(kMinSize.y, pTexture->m_iHeight >> iLevel),
-            max(kMinSize.z, pTexture->m_iDepth >> iLevel));
-    }
-
-    void GetTextureBox(STexBox& kTexBox, STexture* pTexture, GLint iLevel, const SGIFormatInfo* pFormat, bool bClampToBlockSize)
-    {
-        kTexBox.m_kOffset = STexPos(0, 0, 0);
-        kTexBox.m_kSize = GetMipSize(pTexture, iLevel, pFormat, bClampToBlockSize);
-    }
-
-    void GetTextureBox(STexBox& kTexBox, STexture* pTexture, GLint iLevel, const D3D11_BOX* pBox, const SGIFormatInfo* pFormat, bool bClampToBlockSize)
-    {
-        if (pBox != NULL)
-        {
-            kTexBox.m_kOffset = STexPos(pBox->left, pBox->top, pBox->front);
-            kTexBox.m_kSize = STexSize(pBox->right - pBox->left, pBox->bottom - pBox->top, pBox->back - pBox->front);
-        }
-        else
-        {
-            GetTextureBox(kTexBox, pTexture, iLevel, pFormat, bClampToBlockSize);
-        }
-    }
-
-    struct STex1DBase
-    {
-        static GLsizei GetBCImageSize(STexSize kSize, const STextureFormat* pTexFormat)
-        {
-            return pTexFormat->m_uNumBlockBytes *
-                   ((kSize.x + pTexFormat->m_uBlockWidth - 1) / pTexFormat->m_uBlockWidth);
-        }
-    };
-
-    struct STex2DBase
-    {
-        static GLsizei GetBCImageSize(STexSize kSize, const STextureFormat* pTexFormat)
-        {
-            return pTexFormat->m_uNumBlockBytes *
-                   ((kSize.x + pTexFormat->m_uBlockWidth  - 1) / pTexFormat->m_uBlockWidth) *
-                   ((kSize.y + pTexFormat->m_uBlockHeight - 1) / pTexFormat->m_uBlockHeight);
-        }
-    };
-
-    struct STex3DBase
-    {
-        static GLsizei GetBCImageSize(STexSize kSize, const STextureFormat* pTexFormat)
-        {
-            return pTexFormat->m_uNumBlockBytes *
-                   ((kSize.x + pTexFormat->m_uBlockWidth  - 1) / pTexFormat->m_uBlockWidth) *
-                   ((kSize.y + pTexFormat->m_uBlockHeight - 1) / pTexFormat->m_uBlockHeight) *
-                   ((kSize.z + pTexFormat->m_uBlockDepth  - 1) / pTexFormat->m_uBlockDepth);
-        }
-    };
-
-    struct SDefaultTex1DBase
-        : STex1DBase
-    {
-        static void TexStorage(STexture* pTexture, STexSize kSize, GLsizei iLevels, const SGIFormatInfo* pFormat, id<MTLDevice> mtlDevice, const uint32 uBindFlags)
-        {
-            assert(pFormat->m_pTexture);
-            DXMETAL_NOT_IMPLEMENTED
-        }
-    };
-
-    struct SDefaultTex2DBase
-        : STex2DBase
-    {
-        typedef SDefaultTex1DBase TArrayElement;
-
-        static void TexStorage(STexture* pTexture, STexSize kSize, GLsizei iLevels, const SGIFormatInfo* pFormat, id<MTLDevice> mtlDevice, const uint32 uBindFlags)
-        {
-            const STextureFormat* pTexFormat = pFormat->m_pTexture;
-            assert(pTexFormat);
-            //  Confetti BEGIN: Igor Lobanchikov
-            bool bHasStecnilAttachment = false;
-            MTLPixelFormat  eMetalFormat = pTexFormat->m_eMetalFormat;
-
-            bool isDepthStencilBuffer = pFormat->m_eTypelessFormat == eGIF_R32G8X24_TYPELESS || pFormat->m_eDXGIFormat == DXGI_FORMAT_R32G8X24_TYPELESS || pFormat->m_eDXGIFormat == DXGI_FORMAT_R16_TYPELESS || pFormat->m_eDXGIFormat == DXGI_FORMAT_R32_TYPELESS ;
-            
-            //  Igor: Special handling for the texture which is actually 2 textures
-            if (isDepthStencilBuffer)
-            {
-                bHasStecnilAttachment = true;
-#if defined(AZ_PLATFORM_MAC)
-                //The OSX_GPUFamily1_v1 feature set does not support separate depth and stencil render targets.
-                //If these render targets are needed, use the following newly introduced depth/stencil pixel formats
-                //to set the same texture as both the depth and stencil render target
-                eMetalFormat = MTLPixelFormatDepth32Float_Stencil8;
-#else
-                eMetalFormat = MTLPixelFormatDepth32Float;
-#endif
-            }
-
-            if (eMetalFormat != MTLPixelFormatInvalid)
-            {
-                MTLTextureDescriptor* Desc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:eMetalFormat
-                                              width:kSize.x
-                                              height:kSize.y
-                                              mipmapped:(iLevels > 1)];
-
-                switch (pTexture->m_eTextureType)
-                {
-                case MTLTextureTypeCube:
-                    assert(pTexture->m_uNumElements == 6);
-                    Desc.textureType = MTLTextureTypeCube;
-                    break;
-                case MTLTextureType2D:
-                    assert(pTexture->m_uNumElements == 1);
-                    break;
-                case MTLTextureType2DArray:
-                    Desc.textureType = MTLTextureType2DArray;
-                    Desc.arrayLength = pTexture->m_uNumElements;
-                    break;
-                default:
-                    DXGL_NOT_IMPLEMENTED;
-                }
-
-                Desc.mipmapLevelCount = iLevels;
-                
-                if (uBindFlags & D3D11_BIND_RENDER_TARGET)
-                {
-                    Desc.usage = MTLTextureUsageRenderTarget;
-                }
-                
-                if (uBindFlags & D3D11_BIND_SHADER_RESOURCE)
-                {
-                    Desc.usage |= MTLTextureUsageShaderRead;
-                }
-                
-                
-                if (isDepthStencilBuffer)
-                {
-                    //MTLStorageModePrivate on OS X makes it so that this resource is stored
-                    //in video memory for the GPU.
-                    Desc.storageMode = MTLStorageModePrivate;
-                    //Depth stencil buffer gets written into and sampled from.
-                    Desc.usage = MTLTextureUsageRenderTarget | MTLTextureUsageShaderRead;
-
-#if defined(AZ_PLATFORM_MAC)
-                    //On osx the depth/stencil texture is merged. You need to create a different
-                    //texture view to access stencil data. Hence we need this flag.
-                    Desc.usage |= MTLTextureUsagePixelFormatView;
-#endif
-                }
-                else if(CTexture::IsDeviceFormatTypeless(pFormat->m_eDXGIFormat))
-                {
-                    //Apple recommendation -> For sRGB variant views, you don't need the PFV flag when: - running on
-                    //iOS/tvOS 12.0 or newer - running on macOS 10.15 or newer
-                    //However, on older OSs (and in macOS case, older GPUs) you are still required to set the flag.
-#if defined(AZ_COMPILER_CLANG) && AZ_COMPILER_CLANG >= 9    //@available was added in Xcode 9
-                    if (@available(macOS 10.15, iOS 12.0, *))
-                    {
-                        //No need to do anything but if we want to add non sRGB view related flags it would go here.
-                    }
-                    else
-                    {
-                        Desc.usage |= MTLTextureUsagePixelFormatView;
-                    }
-#endif
-                }
-
-                pTexture->m_Texture = [mtlDevice newTextureWithDescriptor:Desc];
-
-                if (!pTexture->m_Texture)
-                {
-                    LOG_METAL_SHADER_ERRORS(@ "Failed to create texture: %@", Desc);
-                }
-                else if (isDepthStencilBuffer)
-                {
-#if defined(AZ_PLATFORM_MAC)
-                    pTexture->m_StencilTexture = pTexture->m_Texture;
-#else
-                    Desc.pixelFormat = MTLPixelFormatStencil8;
-                    pTexture->m_StencilTexture = [mtlDevice newTextureWithDescriptor: Desc];
-
-                    if (!pTexture->m_StencilTexture)
-                    {
-                        LOG_METAL_SHADER_ERRORS(@ "Failed to create stencil attachment: %@", Desc);
-                    }
-#endif
-                }
-            }
-            //  Confetti End: Igor Lobanchikov
-        }
-
-        template <typename T>
-        static void SetLayerComponent(STexVec<T>& kVec, T kLayer)
-        {
-            kVec.y = kLayer;
-        }
-    };
-
-    struct SDefaultTex3DBase
-        : STex3DBase
-    {
-        typedef SDefaultTex2DBase TArrayElement;
-
-        static void TexStorage(STexture* pTexture, STexSize kSize, GLsizei iLevels, const SGIFormatInfo* pFormat, id<MTLDevice> mtlDevice, const uint32 uBindFlags)
-        {
-            const STextureFormat* pTexFormat = pFormat->m_pTexture;
-            assert(pTexFormat);
-            //  Confetti BEGIN: Igor Lobanchikov
-            MTLPixelFormat  eMetalFormat = pTexFormat->m_eMetalFormat;
-
-            assert(pTexture->m_eTextureType == MTLTextureType3D || pTexture->m_eTextureType == MTLTextureType2DArray);
-            assert(pTexture->m_uNumElements == 1 || pTexture->m_eTextureType != MTLTextureType3D);
-
-            if (eMetalFormat != MTLPixelFormatInvalid)
-            {
-                MTLTextureDescriptor* Desc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:eMetalFormat
-                                              width:kSize.x
-                                              height:kSize.y
-                                              mipmapped:(iLevels > 1)];
-                Desc.depth = kSize.z;
-                Desc.textureType = MTLTextureType3D;
-                Desc.mipmapLevelCount = iLevels;
-
-                pTexture->m_Texture = [mtlDevice newTextureWithDescriptor:Desc];
-
-                if (!pTexture->m_Texture)
-                {
-                    LOG_METAL_SHADER_ERRORS(@ "Failed to create texture: %@", Desc);
-                }
-            }
-            //  Confetti End: Igor Lobanchikov
-        }
-
-
-        template <typename T>
-        static void SetLayerComponent(STexVec<T>& kVec, T kLayer)
-        {
-            kVec.z = kLayer;
-        }
-    };
-
-    struct STexCompressed
-    {
-        static bool GetPackedRange(const STexBox& kPixels, STexBox* pPackedRange, const SGIFormatInfo* pFormat)
-        {
-            const STextureFormat* pTexFormat(pFormat->m_pTexture);
-            if ((kPixels.m_kOffset.x % pTexFormat->m_uBlockWidth)  != 0 ||
-                (kPixels.m_kOffset.y % pTexFormat->m_uBlockHeight) != 0 ||
-                (kPixels.m_kOffset.z % pTexFormat->m_uBlockDepth)  != 0 ||
-                (kPixels.m_kSize.x   % pTexFormat->m_uBlockWidth)  != 0 ||
-                (kPixels.m_kSize.y   % pTexFormat->m_uBlockHeight) != 0 ||
-                (kPixels.m_kSize.z   % pTexFormat->m_uBlockDepth)  != 0)
-            {
-                return false;
-            }
-
-            pPackedRange->m_kOffset.x = pTexFormat->m_uNumBlockBytes * kPixels.m_kOffset.x / pTexFormat->m_uBlockWidth;
-            pPackedRange->m_kSize.x   = pTexFormat->m_uNumBlockBytes * kPixels.m_kSize.x   / pTexFormat->m_uBlockWidth;
-
-            pPackedRange->m_kOffset.y = kPixels.m_kOffset.y / pTexFormat->m_uBlockHeight;
-            pPackedRange->m_kSize.y   = kPixels.m_kSize.y   / pTexFormat->m_uBlockHeight;
-
-            pPackedRange->m_kOffset.z = kPixels.m_kOffset.z / pTexFormat->m_uBlockDepth;
-            pPackedRange->m_kSize.z   = kPixels.m_kSize.z   / pTexFormat->m_uBlockDepth;
-            return true;
-        }
-    };
-
-    struct STexUncompressed
-    {
-        static bool GetPackedRange(const STexBox& kPixels, STexBox* pPackedRange, const SGIFormatInfo* pFormat)
-        {
-            uint32 uPixelBytes(pFormat->m_pTexture->m_uNumBlockBytes);
-
-            pPackedRange->m_kOffset.x = kPixels.m_kOffset.x * uPixelBytes;
-            pPackedRange->m_kSize.x   = kPixels.m_kSize.x   * uPixelBytes;
-
-            pPackedRange->m_kOffset.y = kPixels.m_kOffset.y;
-            pPackedRange->m_kSize.y   = kPixels.m_kSize.y;
-
-            pPackedRange->m_kOffset.z = kPixels.m_kOffset.z;
-            pPackedRange->m_kSize.z   = kPixels.m_kSize.z;
-            return true;
-        }
-    };
-
-    struct STex1DUncompressed
-        : SDefaultTex1DBase
-        , STexUncompressed
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        static void TexSubImage(STexture* pTexture, uint32 slice, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData, uint32 uRowPitch, uint32 uImagePitch)
-        {
-            MTLRegion Region = MTLRegionMake3D(kBox.m_kOffset.x, 0, 0, kBox.m_kSize.x, 1, 1);
-            assert(kBox.m_kSize.y < 2);
-
-            [pTexture->m_Texture replaceRegion: Region mipmapLevel: iLevel slice: slice withBytes: pData bytesPerRow: uRowPitch bytesPerImage: uImagePitch];
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = kRect.x * pFormat->m_pTexture->m_uNumBlockBytes;
-            pLayout->m_uImagePitch  = pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = pLayout->m_uRowPitch;
-        }
-    };
-
-    struct STex2DUncompressed
-        : SDefaultTex2DBase
-        , STexUncompressed
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        static void TexSubImage(STexture* pTexture, uint32 slice, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData, uint32 uRowPitch, uint32 uImagePitch)
-        {
-            MTLRegion Region = MTLRegionMake3D(kBox.m_kOffset.x, kBox.m_kOffset.y, 0, kBox.m_kSize.x, kBox.m_kSize.y, 1);
-            assert(kBox.m_kSize.z < 2);
-
-            [pTexture->m_Texture replaceRegion: Region mipmapLevel: iLevel slice: slice withBytes: pData bytesPerRow: uRowPitch bytesPerImage: uImagePitch];
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = kRect.x * pFormat->m_pTexture->m_uNumBlockBytes;
-            pLayout->m_uImagePitch  = kRect.y * pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = pLayout->m_uImagePitch;
-        }
-    };
-
-    struct STex3DUncompressed
-        : SDefaultTex3DBase
-        , STexUncompressed
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        static void TexSubImage(STexture* pTexture, uint32 slice, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData, uint32 uRowPitch, uint32 uImagePitch)
-        {
-            MTLRegion Region = MTLRegionMake3D(kBox.m_kOffset.x, kBox.m_kOffset.y, kBox.m_kOffset.z, kBox.m_kSize.x, kBox.m_kSize.y, kBox.m_kSize.z);
-            assert(slice == 0);
-
-            [pTexture->m_Texture replaceRegion: Region mipmapLevel: iLevel slice: slice withBytes: pData bytesPerRow: uRowPitch bytesPerImage: uImagePitch];
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = kRect.x * pFormat->m_pTexture->m_uNumBlockBytes;
-            pLayout->m_uImagePitch  = kRect.y * pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = kRect.z * pLayout->m_uImagePitch;
-        }
-    };
-
-    struct STex1DCompressed
-        : SDefaultTex1DBase
-        , STexCompressed
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        static void TexSubImage(STexture* pTexture, uint32 slice, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData, uint32 uRowPitch, uint32 uImagePitch)
-        {
-            MTLRegion Region = MTLRegionMake3D(kBox.m_kOffset.x, 0, 0, kBox.m_kSize.x, 1, 1);
-            assert(kBox.m_kSize.y < 2);
-
-            //MTLPixelFormatPVRTC_RGB_2BPP/MTLPixelFormatPVRTC_RGBA_4BPP_sRGB not supported on OSX GPUs
-#if !defined AZ_PLATFORM_MAC
-            //  Igor: Metal requires these to be 0 for PVR formats
-            if (pTexFormat->m_eMetalFormat >= MTLPixelFormatPVRTC_RGB_2BPP && pTexFormat->m_eMetalFormat <= MTLPixelFormatPVRTC_RGBA_4BPP_sRGB)
-            {
-                uRowPitch = 0;
-                uImagePitch = 0;
-            }
-#endif
-
-            [pTexture->m_Texture replaceRegion: Region mipmapLevel: iLevel slice: slice withBytes: pData bytesPerRow: uRowPitch bytesPerImage: uImagePitch];
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = GetBCImageSize(kRect, pFormat->m_pTexture);
-            pLayout->m_uImagePitch  = pLayout->m_uRowPitch;
-            pLayout->m_uTextureSize = pLayout->m_uRowPitch;
-        }
-    };
-
-    struct STex2DCompressed
-        : SDefaultTex2DBase
-        , STexCompressed
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        static void TexSubImage(STexture* pTexture, uint32 slice, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData, uint32 uRowPitch, uint32 uImagePitch)
-        {
-            MTLRegion Region = MTLRegionMake3D(kBox.m_kOffset.x, kBox.m_kOffset.y, 0, kBox.m_kSize.x, kBox.m_kSize.y, 1);
-            assert(kBox.m_kSize.z < 2);
-
-            //MTLPixelFormatPVRTC_RGB_2BPP/MTLPixelFormatPVRTC_RGBA_4BPP_sRGB not supported on OSX GPUs
-#if !defined AZ_PLATFORM_MAC
-            //  Igor: Metal requires these to be 0 for PVR formats
-            if (pTexFormat->m_eMetalFormat >= MTLPixelFormatPVRTC_RGB_2BPP && pTexFormat->m_eMetalFormat <= MTLPixelFormatPVRTC_RGBA_4BPP_sRGB)
-            {
-                uRowPitch = 0;
-                uImagePitch = 0;
-            }
-#endif
-            [pTexture->m_Texture replaceRegion: Region mipmapLevel: iLevel slice: slice withBytes: pData bytesPerRow: uRowPitch bytesPerImage: uImagePitch];
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = GetBCImageSize(STexSize(kRect.x, 1, 1), pFormat->m_pTexture);
-            pLayout->m_uImagePitch  = GetBCImageSize(kRect, pFormat->m_pTexture);
-            pLayout->m_uTextureSize = pLayout->m_uImagePitch;
-        }
-    };
-
-    struct STex3DCompressed
-        : SDefaultTex3DBase
-        , STexCompressed
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        static void TexSubImage(STexture* pTexture, uint32 slice, GLint iLevel, STexBox kBox, const STextureFormat* pTexFormat, const GLvoid* pData, uint32 uRowPitch, uint32 uImagePitch)
-        {
-            MTLRegion Region = MTLRegionMake3D(kBox.m_kOffset.x, kBox.m_kOffset.y, kBox.m_kOffset.z, kBox.m_kSize.x, kBox.m_kSize.y, kBox.m_kSize.z);
-            assert(slice == 0);
-
-            //MTLPixelFormatPVRTC_RGB_2BPP/MTLPixelFormatPVRTC_RGBA_4BPP_sRGB not supported on OSX GPUs
-#if !defined AZ_PLATFORM_MAC
-            //  Igor: Metal requires these to be 0 for PVR formats
-            if (pTexFormat->m_eMetalFormat >= MTLPixelFormatPVRTC_RGB_2BPP && pTexFormat->m_eMetalFormat <= MTLPixelFormatPVRTC_RGBA_4BPP_sRGB)
-            {
-                uRowPitch = 0;
-                uImagePitch = 0;
-            }
-#endif
-
-            [pTexture->m_Texture replaceRegion: Region mipmapLevel: iLevel slice: slice withBytes: pData bytesPerRow: uRowPitch bytesPerImage: uImagePitch];
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        static void GetPackedLayout(STexSize kRect, const SGIFormatInfo* pFormat, SPackedLayout* pLayout)
-        {
-            pLayout->m_uRowPitch    = GetBCImageSize(STexSize(kRect.x, 1, 1), pFormat->m_pTexture);
-            pLayout->m_uImagePitch  = GetBCImageSize(STexSize(kRect.x, kRect.y, 1), pFormat->m_pTexture);
-            pLayout->m_uTextureSize = GetBCImageSize(kRect, pFormat->m_pTexture);
-        }
-    };
-
-    template <typename Interface>
-    struct SSingleTexImpl
-        : Interface
-    {
-        static void InitializeStorage(STexture* pTexture, uint32, const SGIFormatInfo* pFormat, CDevice* pDevice, const uint32 uBindFlags)
-        {
-            Interface::TexStorage(pTexture, GetMipSize(pTexture, 0, pFormat, false), pTexture->m_uNumMipLevels, pFormat, pDevice->GetMetalDevice(), uBindFlags);
-        }
-
-        static void UploadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            assert((kSubID.m_uElement == 0) ||
-                (pTexture->m_eTextureType == MTLTextureTypeCube && kSubID.m_uElement < 6));
-
-            //  Confetti BEGIN: Igor Lobanchikov
-            Interface::TexSubImage(pTexture, kSubID.m_uElement, kSubID.m_iMipLevel, kBox, pFormat->m_pTexture, pSrcData, uSrcRowPitch, uSrcDepthPitch);
-            //  Confetti End: Igor Lobanchikov
-        }
-
-        static void DownloadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, void* pDstData, uint32 uDstRowPitch, uint32 uDstDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            DXMETAL_NOT_IMPLEMENTED
-        }
-
-        static void Map(STexture* pTexture, STexSubresourceID kSubID, bool bDownload, SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            STexBox kBox;
-            GetTextureBox(kBox, pTexture, kSubID.m_iMipLevel, pFormat, true);
-            SPackedLayout kPackedLayout;
-            Interface::GetPackedLayout(kBox.m_kSize, pFormat, &kPackedLayout);
-
-            DXGL_TODO("Check if it's worth to keep an allocation pool");
-            kMappedSubTex.m_pBuffer = static_cast<uint8*>(Memalign(kPackedLayout.m_uTextureSize, MIN_MAPPED_RESOURCE_ALIGNMENT));
-            kMappedSubTex.m_uRowPitch = kPackedLayout.m_uRowPitch;
-            kMappedSubTex.m_uImagePitch = kPackedLayout.m_uImagePitch;
-            kMappedSubTex.m_uDataOffset = 0;
-
-            if (bDownload)
-            {
-                DownloadImage(pTexture, kSubID, kBox, kMappedSubTex.m_pBuffer, kPackedLayout.m_uRowPitch, kPackedLayout.m_uImagePitch, pContext, pFormat);
-            }
-        }
-
-        static void Unmap(STexture* pTexture, STexSubresourceID kSubID, const SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            if (kMappedSubTex.m_bUpload)
-            {
-                STexBox kBox;
-                GetTextureBox(kBox, pTexture, kSubID.m_iMipLevel, pFormat, true);
-
-                UploadImage(pTexture, kSubID, kBox, kMappedSubTex.m_pBuffer, kMappedSubTex.m_uRowPitch, kMappedSubTex.m_uImagePitch, pContext, pFormat);
-            }
-
-            MemalignFree(kMappedSubTex.m_pBuffer);
-        }
-    };
-
-    template <typename Interface>
-    struct SArrayTexImpl
-        : Interface
-    {
-        static void InitializeStorage(STexture* pTexture, uint32, const SGIFormatInfo* pFormat, CDevice* pDevice, const uint32 uBindFlags)
-        {
-            STexSize kTexSize(GetMipSize(pTexture, 0, pFormat, false));
-            Interface::SetLayerComponent(kTexSize, (GLsizei)pTexture->m_uNumElements);
-            Interface::TexStorage(pTexture, kTexSize, pTexture->m_uNumMipLevels, pFormat, pDevice->GetMetalDevice(), uBindFlags);
-        }
-
-        static void UploadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            assert(pTexture->m_eTextureType != MTLTextureTypeCube);
-
-            Interface::SetLayerComponent(kBox.m_kOffset, (int)kSubID.m_uElement);
-            Interface::SetLayerComponent(kBox.m_kSize, 1);
-
-            //  Confetti BEGIN: Igor Lobanchikov
-            Interface::TexSubImage(pTexture, kSubID.m_uElement, kSubID.m_iMipLevel, kBox, pFormat->m_pTexture, pSrcData, uSrcRowPitch, uSrcDepthPitch);
-            //  Confetti End: Igor Lobanchikov
-        }
-
-        static void DownloadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, void* pDstData, uint32 uDstRowPitch, uint32 uDstDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            DXGL_NOT_IMPLEMENTED
-        }
-
-        static void Map(STexture* pTexture, STexSubresourceID kSubID, bool bDownload, SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            DXMETAL_NOT_IMPLEMENTED
-        }
-
-        static void Unmap(STexture* pTexture, STexSubresourceID kSubID, const SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            DXMETAL_NOT_IMPLEMENTED
-        }
-    };
-
-    template <typename Interface>
-    uint32 GetSystemMemoryTextureOffset(STexture* pTexture, const SGIFormatInfo* pFormat, STexSubresourceID kID)
-    {
-        uint32 uOffset(0);
-        uint32 uTotSize(0);
-        uint32 uLevel;
-        for (uLevel = 0; uLevel < pTexture->m_uNumMipLevels; ++uLevel)
-        {
-            STexSize kLevelSize(GetMipSize(pTexture, (GLint)uLevel, pFormat, true));
-
-            SPackedLayout kPackedLayout;
-            Interface::GetPackedLayout(kLevelSize, pFormat, &kPackedLayout);
-
-            uTotSize += kPackedLayout.m_uTextureSize;
-
-            // Keep every subresource aligned so that it can be directly mapped
-            uTotSize += MIN_MAPPED_RESOURCE_ALIGNMENT - 1;
-            uTotSize -= (uTotSize % MIN_MAPPED_RESOURCE_ALIGNMENT);
-            if (uLevel < kID.m_iMipLevel)
-            {
-                uOffset = uTotSize;
-            }
-        }
-
-        return uTotSize * kID.m_uElement + uOffset;
-    }
-
-    template <typename Interface>
-    struct SStagingTexImpl
-        : Interface
-    {
-        static void InitializeStorage(STexture* pTexture, uint32 uCPUAccess, const SGIFormatInfo* pFormat, CDevice* pDevice, const uint32 uBindFlags)
-        {
-            Interface::TexStorage(pTexture, GetMipSize(pTexture, 0, pFormat, false), pTexture->m_uNumMipLevels, pFormat, pDevice->GetMetalDevice(), uBindFlags);
-            {
-                STexSubresourceID kEndID = {aznumeric_cast<int32>(pTexture->m_uNumMipLevels),
-                                            static_cast<uint32>(pTexture->m_uNumElements)};
-                uint32 uMappedSize(GetSystemMemoryTextureOffset<Interface>(pTexture, pFormat, kEndID));
-                pTexture->m_pMapMemoryCopy = static_cast<uint8*>(Memalign(uMappedSize, MIN_MAPPED_RESOURCE_ALIGNMENT));
-            }
-        }
-
-        static void UploadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            DXMETAL_NOT_IMPLEMENTED
-        }
-
-        static void DownloadImage(STexture* pTexture, STexSubresourceID kSubID, STexBox kBox, const void* pDstData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            DXGL_NOT_IMPLEMENTED
-        }
-
-        static void Map(STexture* pTexture, STexSubresourceID kSubID, bool bDownload, SMappedSubTexture& kMappedSubTex, CContext* pContext, const SGIFormatInfo* pFormat)
-        {
-            STexSize kSubSize(GetMipSize(pTexture, kSubID.m_iMipLevel, pFormat, true));
-            SPackedLayout kPackedLayout;
-            Interface::GetPackedLayout(kSubSize, pFormat, &kPackedLayout);
-
-            kMappedSubTex.m_pBuffer = pTexture->m_pMapMemoryCopy + GetSystemMemoryTextureOffset<Interface>(pTexture, pFormat, kSubID);
-            if (bDownload)
-            {
-                static ICVar* isScreenshot = gEnv->pConsole->GetCVar("e_ScreenShot");
-                static ICVar* isCaptureFrame = gEnv->pConsole->GetCVar("capture_frames");
-                if (isScreenshot->GetIVal() || isCaptureFrame->GetIVal())
-                {
-                    //This will stall the GPU so be very careful when using it. Only use it when you absolutely need the
-                    //work encoded by the current comman buffer.
-                    pContext->FlushBlitEncoderAndWait();
-                }
-                
-                MTLRegion region = {
-                    {0, 0, 0}, {pTexture->m_Texture.width, pTexture->m_Texture.height, pTexture->m_Texture.depth}
-                };
-                [pTexture->m_Texture getBytes: kMappedSubTex.m_pBuffer
-                                  bytesPerRow: kPackedLayout.m_uRowPitch
-                                bytesPerImage: kPackedLayout.m_uImagePitch
-                                   fromRegion: region
-                                  mipmapLevel: kSubID.m_iMipLevel
-                                        slice: kSubID.m_uElement];
-            }
-
-            kMappedSubTex.m_uRowPitch = kPackedLayout.m_uRowPitch;
-            kMappedSubTex.m_uImagePitch = kPackedLayout.m_uImagePitch;
-            kMappedSubTex.m_uDataOffset = 0;
-        }
-
-        static void Unmap(STexture* pTexture, STexSubresourceID kSubID, const SMappedSubTexture& kMappedSubTex, CContext*, const SGIFormatInfo*)
-        {
-            if (kMappedSubTex.m_bUpload)
-            {
-                MTLRegion region = {
-                    {0, 0, 0}, {pTexture->m_Texture.width, pTexture->m_Texture.height, pTexture->m_Texture.depth}
-                };
-                [pTexture->m_Texture replaceRegion: region
-                                       mipmapLevel: kSubID.m_iMipLevel
-                                             slice: kSubID.m_uElement
-                                         withBytes: kMappedSubTex.m_pBuffer
-                                       bytesPerRow: kMappedSubTex.m_uRowPitch
-                                     bytesPerImage: kMappedSubTex.m_uImagePitch];
-            }
-        }
-    };
-
-    inline STexSubresourceID GetTexSubresourceID(STexture* pTexture, uint32 uSubresource)
-    {
-        STexSubresourceID kID;
-        kID.m_iMipLevel = uSubresource % pTexture->m_uNumMipLevels;
-        kID.m_uElement = uSubresource / pTexture->m_uNumMipLevels;
-        assert(kID.m_uElement < pTexture->m_uNumElements);
-        return kID;
-    }
-
-    template <typename Impl>
-    void UpdateTexSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("UpdateTexSubresource")
-
-        STexture * pTexture(static_cast<STexture*>(pResource));
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pTexture->m_eFormat));
-        assert(pFormatInfo != NULL);
-        assert(pFormatInfo->m_pTexture != NULL);
-
-        STexSubresourceID kSubID(GetTexSubresourceID(pTexture, uSubresource));
-
-        STexBox kTexBox;
-        GetTextureBox(kTexBox, pTexture, kSubID.m_iMipLevel, pDstBox, pFormatInfo, false);
-        Impl::UploadImage(pTexture, kSubID, kTexBox, pSrcData, uSrcRowPitch, uSrcDepthPitch, pContext, pFormatInfo);
-    }
-
-    template <typename Impl>
-    bool MapTexSubresource(SResource* pResource, uint32 uSubresource, D3D11_MAP eMapType, uint32 uMapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("MapTexSubresource")
-        
-        STexture * pTexture(static_cast<STexture*>(pResource));
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pTexture->m_eFormat));
-        assert(pFormatInfo != NULL);
-        assert(pFormatInfo->m_pTexture != NULL);
-
-        if (uSubresource >= pTexture->m_kMappedSubTextures.size())
-        {
-            pTexture->m_kMappedSubTextures.resize(uSubresource + 1);
-        }
-        SMappedSubTexture& kMappedSubTexture(pTexture->m_kMappedSubTextures.at(uSubresource));
-
-        if (kMappedSubTexture.m_pBuffer != NULL)
-        {
-            DXGL_ERROR("Texture subresource is already mapped");
-            return false;
-        }
-
-        bool bDownload = (eMapType == D3D11_MAP_READ || eMapType == D3D11_MAP_READ_WRITE);
-        Impl::Map(pTexture, GetTexSubresourceID(pTexture, uSubresource), bDownload, kMappedSubTexture, pContext, pFormatInfo);
-        kMappedSubTexture.m_bUpload = (eMapType != D3D11_MAP_READ);
-
-        pMappedResource->pData = kMappedSubTexture.m_pBuffer + kMappedSubTexture.m_uDataOffset;
-        pMappedResource->RowPitch = kMappedSubTexture.m_uRowPitch;
-        pMappedResource->DepthPitch = kMappedSubTexture.m_uImagePitch;
-
-        return kMappedSubTexture.m_pBuffer != NULL;
-    }
-
-    template <typename Impl>
-    void UnmapTexSubresource(SResource* pResource, UINT uSubresource, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("UnmapTexSubresource")
-
-        STexture * pTexture(static_cast<STexture*>(pResource));
-
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(pTexture->m_eFormat));
-        assert(pFormatInfo != NULL);
-        assert(pFormatInfo->m_pTexture != NULL);
-
-        if (uSubresource >= pTexture->m_kMappedSubTextures.size())
-        {
-            pTexture->m_kMappedSubTextures.resize(uSubresource + 1);
-        }
-        SMappedSubTexture& kMappedSubTexture(pTexture->m_kMappedSubTextures.at(uSubresource));
-
-        if (kMappedSubTexture.m_pBuffer == NULL)
-        {
-            DXGL_ERROR("Texture subresource is not mapped");
-            return;
-        }
-
-        Impl::Unmap(pTexture, GetTexSubresourceID(pTexture, uSubresource), kMappedSubTexture, pContext, pFormatInfo);
-        kMappedSubTexture.m_pBuffer = NULL;
-    }
-
-    template <typename Impl>
-    void UnpackTexData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("UnpackTexData")
-
-        STexBox kBox;
-        kBox.m_kOffset = kOffset;
-        kBox.m_kSize = kSize;
-        const SGIFormatInfo* pFormat(GetGIFormatInfo(pTexture->m_eFormat));
-
-        Impl::UploadImage(pTexture, kSubID, kBox, kDataLocation.m_pBuffer + kDataLocation.m_uDataOffset, kDataLocation.m_uRowPitch, kDataLocation.m_uImagePitch, pContext, pFormat);
-    }
-
-    template <typename Impl>
-    void PackTexData(STexture* pTexture, STexSubresourceID kSubID, STexPos kOffset, STexSize kSize, const SMappedSubTexture& kDataLocation, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("PackTexData")
-
-        STexBox kBox;
-        kBox.m_kOffset = kOffset;
-        kBox.m_kSize = kSize;
-        const SGIFormatInfo* pFormat(GetGIFormatInfo(pTexture->m_eFormat));
-
-        Impl::DownloadImage(pTexture, kSubID, kBox, kDataLocation.m_pBuffer + kDataLocation.m_uDataOffset, kDataLocation.m_uRowPitch, kDataLocation.m_uImagePitch, pContext, pFormat);
-    }
-
-    template <typename Impl>
-    void InitializeTexture(STexture* pTexture, const D3D11_SUBRESOURCE_DATA* pInitialData, uint32 uCPUAccess, CDevice* pDevice /*CContext* pContext*/, const SGIFormatInfo* pFormatInfo, const uint32 uBindFlags)
-    {
-        pTexture->m_pfUpdateSubresource = &UpdateTexSubresource<Impl>;
-        pTexture->m_pfMapSubresource = &MapTexSubresource<Impl>;
-        pTexture->m_pfUnmapSubresource = &UnmapTexSubresource<Impl>;
-
-        Impl::InitializeStorage(pTexture, uCPUAccess, pFormatInfo, pDevice, uBindFlags);
-
-        if (pInitialData)
-        {
-            STexBox kMipBox;
-            kMipBox.m_kOffset = STexPos(0, 0, 0);
-
-            STexSubresourceID kSubID;
-            for (kSubID.m_uElement = 0; kSubID.m_uElement < pTexture->m_uNumElements; ++kSubID.m_uElement)
-            {
-                for (kSubID.m_iMipLevel = 0; kSubID.m_iMipLevel < (GLint)pTexture->m_uNumMipLevels; ++kSubID.m_iMipLevel)
-                {
-                    kMipBox.m_kSize = GetMipSize(pTexture, kSubID.m_iMipLevel, pFormatInfo, false);
-
-                    Impl::UploadImage(pTexture, kSubID, kMipBox, pInitialData->pSysMem, pInitialData->SysMemPitch, pInitialData->SysMemSlicePitch, /*pContext*/ 0, pFormatInfo);
-
-                    ++pInitialData;
-                }
-            }
-        }
-    }
-
-    SResource::SResource()
-        : m_pfUpdateSubresource(NULL)
-        , m_pfMapSubresource(NULL)
-        , m_pfUnmapSubresource(NULL)
-    {
-    }
-
-    SResource::SResource(const SResource& kOther)
-        : m_pfUpdateSubresource(kOther.m_pfUpdateSubresource)
-        , m_pfMapSubresource(kOther.m_pfMapSubresource)
-        , m_pfUnmapSubresource(kOther.m_pfUnmapSubresource)
-    {
-    }
-
-    SResource::~SResource()
-    {
-    }
-
-    STexture::STexture(GLsizei iWidth, GLsizei iHeight, GLsizei iDepth, MTLTextureType eTextureType, EGIFormat eFormat, uint32 uNumMipLevels, uint32 uNumElements)
-        : m_eTextureType(eTextureType)
-        , m_eFormat(eFormat)
-        , m_uNumMipLevels(uNumMipLevels)
-        , m_uNumElements(uNumElements)
-        , m_iWidth(iWidth)
-        , m_iHeight(iHeight)
-        , m_iDepth(iDepth)
-        , m_pShaderViewsHead(NULL)
-        , m_pOutputMergerViewsHead(NULL)
-        , m_pBoundModifier(NULL)
-        //  Confetti BEGIN: Igor Lobanchikov
-        , m_Texture(nil)
-        , m_StencilTexture(nil)
-        , m_bClearDepth(false)
-        , m_bClearStencil(false)
-        , m_bBackBuffer(false)
-        , m_pMapMemoryCopy(NULL)
-        //  Confetti End: Igor Lobanchikov
-    {
-#if DXGL_FULL_EMULATION
-        m_uNumElements = max(1u, m_uNumElements);
-#endif //DXGL_FULL_EMULATION
-        ResetDontCareActionFlags();
-    }
-
-    STexture::~STexture()
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_pMapMemoryCopy)
-        {
-            MemalignFree(m_pMapMemoryCopy);
-        }
-
-        if (m_Texture)
-        {
-            [m_Texture release];
-        }
-
-        bool isDepthStencilTexSeparate = m_StencilTexture != m_Texture;
-        if (m_StencilTexture && isDepthStencilTexSeparate)
-        {
-            [m_StencilTexture release];
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    SShaderTextureViewPtr STexture::CreateShaderView(const SShaderTextureViewConfiguration& kConfiguration, CDevice* pDevice)
-    {
-        DXGL_TODO("This is not thread-safe, as multiple threads can create shader views for the same texture. Add synchronization primitive.");
-
-        SShaderTextureViewPtr spView(new SShaderTextureView(this, kConfiguration));
-        if (!spView->Init(pDevice))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SShaderBufferViewPtr SBuffer::CreateShaderView(const SShaderBufferViewConfiguration& kConfiguration, CDevice* pDevice)
-    {
-        DXGL_TODO("This is not thread-safe, as multiple threads can create shader views for the same buffer. Add synchronization primitive.");
-
-        SShaderBufferViewPtr spView(new SShaderBufferView(this, kConfiguration));
-        if (!spView->Init(pDevice))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SOutputMergerTextureViewPtr STexture::CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CDevice* pDevice)
-    {
-        SOutputMergerTextureViewPtr spView(new SOutputMergerTextureView(this, kConfiguration));
-        if (!spView->Init(pDevice))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SOutputMergerTextureViewPtr STexture::GetCompatibleOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CDevice* pDevice)
-    {
-        DXGL_TODO("This is not thread-safe, as multiple threads can create output merger views for the same texture. Add synchronization primitive.");
-
-        SOutputMergerTextureView* pExistingView(m_pOutputMergerViewsHead);
-        while (pExistingView != NULL)
-        {
-            if (pExistingView->m_kConfiguration == kConfiguration)
-            {
-                return pExistingView;
-            }
-            pExistingView = pExistingView->m_pNextView;
-        }
-
-        return CreateOutputMergerView(kConfiguration, pDevice);
-    }
-
-    void STexture::ResetDontCareActionFlags()
-    {
-        m_bColorLoadDontCare =
-            m_bDepthLoadDontCare =
-                m_bStencilLoadDontCare =
-                    m_bColorStoreDontCare =
-                        m_bDepthStoreDontCare =
-                            m_bStencilStoreDontCare = false;
-    }
-
-
-    SShaderResourceView::SShaderResourceView(EGIFormat eFormat)
-        : m_eFormat(eFormat)
-    {
-    }
-
-    SShaderResourceView::~SShaderResourceView()
-    {
-    }
-
-    bool SShaderResourceView::GenerateMipmaps(CContext*)
-    {
-        DXGL_ERROR("Cannot create mipmaps from a generic shader resource view");
-        return false;
-    }
-
-    SShaderBufferView::SShaderBufferView(SBuffer* pBuffer, const SShaderBufferViewConfiguration& kConfiguration)
-        : SShaderResourceView(kConfiguration.m_eFormat)
-        , m_kConfiguration(kConfiguration)
-        , m_pBuffer(pBuffer)
-        , m_BufferView(0)
-    {
-    }
-
-    SShaderBufferView::~SShaderBufferView()
-    {
-        if (m_BufferView)
-        {
-            [m_BufferView release];
-        }
-    }
-
-    bool SShaderBufferView::Init(CDevice* pDevice)
-    {
-        if (!m_BufferView)
-        {
-            m_BufferView = GetMtlBufferBasedOnSize(m_pBuffer);
-            [m_BufferView retain];
-        }
-
-        return true;
-    }
-
-    id<MTLBuffer> SShaderBufferView::GetMetalBuffer()
-    {
-        id<MTLBuffer>  mtlBuffer = GetMtlBufferBasedOnSize(m_pBuffer);
-        return m_BufferView ? m_BufferView : mtlBuffer;
-    }
-
-    bool SShaderBufferView::GenerateMipmaps(CContext* pContext)
-    {
-        DXGL_ERROR("Cannot create mipmaps from a buffer shader resource view");
-        return false;
-    }
-
-    SShaderTextureView::SShaderTextureView(STexture* pTexture, const SShaderTextureViewConfiguration& kConfiguration)
-        : SShaderResourceView(kConfiguration.m_eFormat)
-        , m_kConfiguration(kConfiguration)
-        , m_pTexture(pTexture)
-        //  Confetti BEGIN: Igor Lobanchikov
-        , m_TextureView(0)
-        //  Confetti End: Igor Lobanchikov
-    {
-        m_pNextView = pTexture->m_pShaderViewsHead;
-        pTexture->m_pShaderViewsHead = this;
-    }
-
-    SShaderTextureView::~SShaderTextureView()
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_TextureView)
-        {
-            [m_TextureView release];
-        }
-        //  Confetti End: Igor Lobanchikov
-        SShaderTextureView** pLink = &m_pTexture->m_pShaderViewsHead;
-        while (*pLink != NULL)
-        {
-            if (*pLink == this)
-            {
-                *pLink = m_pNextView;
-                break;
-            }
-            pLink = &((*pLink)->m_pNextView);
-        }
-    }
-
-    bool SShaderTextureView::Init(CDevice* pDevice)
-    {
-        const SGIFormatInfo* pFormatInfo;
-        if (m_kConfiguration.m_eFormat == eGIF_NUM ||
-            (pFormatInfo = GetGIFormatInfo(m_kConfiguration.m_eFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for shader resource view");
-            return false;
-        }
-
-        if (m_kConfiguration.m_uMinMipLevel != 0
-            || m_kConfiguration.m_uNumMipLevels != m_pTexture->m_uNumMipLevels)
-        {
-            DXGL_ERROR("Metal doesn't support SRV which map to a part of resource.");
-        }
-
-        bool bFormatRequiresUniqueView(false);
-        if (m_kConfiguration.m_eFormat != m_pTexture->m_eFormat)
-        {
-            if (pFormatInfo->m_eTypelessFormat != m_pTexture->m_eFormat)
-            {
-                DXGL_ERROR("Shader resource view format is not compatible with texture format");
-                return false;
-            }
-
-            switch (pFormatInfo->m_eTypelessConversion)
-            {
-            case eGIFC_DEPTH_TO_RED:
-                break;
-            case eGIFC_STENCIL_TO_RED:
-#if defined AZ_PLATFORM_MAC
-                //Need a new texture view to access the stencil data. x32_stencil8 or x24_stencil8
-                bFormatRequiresUniqueView = true;
-#else
-                m_TextureView = m_pTexture->m_StencilTexture;
-                [m_TextureView retain];
-#endif
-                break;
-            case eGIFC_TEXTURE_VIEW:
-                bFormatRequiresUniqueView = true;
-                break;
-            case eGIFC_UNSUPPORTED:
-                DXGL_ERROR("Shader resource view conversion not supported for the requested format");
-                return false;
-            }
-        }
-
-        if (m_kConfiguration.m_eViewType != m_pTexture->m_eTextureType)
-        {
-            bFormatRequiresUniqueView = true;
-        }
-
-        if (bFormatRequiresUniqueView ||
-            m_kConfiguration.m_uMinLayer > 0 ||
-            m_kConfiguration.m_uNumLayers != m_pTexture->m_uNumElements)
-        {
-            //  Confetti BEGIN: Igor Lobanchikov
-            assert(!m_TextureView);
-
-            assert(!m_pTexture->m_bBackBuffer);
-
-            if (m_pTexture->m_bBackBuffer)
-            {
-                DXGL_ERROR("Back buffer doesn't support views other than native format view");
-                return false;
-            }
-            //  Confetti End: Igor Lobanchikov
-            if (!CreateUniqueView(pDevice))
-            {
-                return false;
-            }
-        }
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (!m_TextureView && !m_pTexture->m_bBackBuffer)
-        {
-            m_TextureView = m_pTexture->m_Texture;
-            [m_TextureView retain];
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        return true;
-    }
-
-    bool SShaderTextureView::CreateUniqueView(CDevice* pDevice)
-    {
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(m_kConfiguration.m_eFormat));
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_kConfiguration.m_uMinLayer > 0 ||
-            m_kConfiguration.m_uNumLayers != m_pTexture->m_uNumElements)
-        {
-            DXGL_ERROR("Not implemented. Metal doesn't support this functionality.");
-        }
-
-
-        if (pFormatInfo->m_eTypelessFormat != m_pTexture->m_eFormat)
-        {
-            DXGL_ERROR("Texture view format is not compatible with texture format");
-            return false;
-        }
-
-        m_TextureView = [m_pTexture->m_Texture newTextureViewWithPixelFormat:pFormatInfo->m_pTexture->m_eMetalFormat];
-
-        if (!m_TextureView)
-        {
-            DXGL_ERROR("Couldn't create output merger or depth-stencil view");
-            return false;
-        }
-        else
-        {
-            return true;
-        }
-
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    bool SShaderTextureView::GenerateMipmaps(CContext* pContext)
-    {
-        id<MTLBlitCommandEncoder> blitCommandEncoder = pContext->GetBlitCommandEncoder();
-        [blitCommandEncoder generateMipmapsForTexture: GetMetalTexture()];
-
-        return true;
-    }
-
-    SOutputMergerView::SOutputMergerView(EGIFormat eFormat)
-        : m_eFormat(eFormat)
-    {
-    }
-
-    SOutputMergerView::~SOutputMergerView()
-    {
-    }
-
-    const int32 SOutputMergerTextureView::INVALID_LAYER = -1;
-
-    SOutputMergerTextureView::SOutputMergerTextureView(STexture* pTexture, const SOutputMergerTextureViewConfiguration& kConfiguration)
-        : SOutputMergerView(kConfiguration.m_eFormat)
-        , m_kConfiguration(kConfiguration)
-        , m_pTexture(pTexture)
-        //  Confetti BEGIN: Igor Lobanchikov
-        , m_RTView(0)
-        //  Confetti End: Igor Lobanchikov
-    {
-        m_pNextView = pTexture->m_pOutputMergerViewsHead;
-        pTexture->m_pOutputMergerViewsHead = this;
-    }
-
-    SOutputMergerTextureView::~SOutputMergerTextureView()
-    {
-        SOutputMergerTextureView*& pLink = m_pTexture->m_pOutputMergerViewsHead;
-        while (pLink != NULL)
-        {
-            if (pLink == this)
-            {
-                pLink = m_pNextView;
-            }
-            else
-            {
-                pLink = pLink->m_pNextView;
-            }
-        }
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_RTView)
-        {
-            [m_RTView release];
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    bool    IsMetalRenderable(MTLPixelFormat format)
-    {
-        switch (format)
-        {
-#if !defined AZ_PLATFORM_MAC
-        case MTLPixelFormatB5G6R5Unorm:
-        case MTLPixelFormatR8Unorm_sRGB:
-        case MTLPixelFormatRG8Unorm_sRGB:
-        case MTLPixelFormatA1BGR5Unorm:
-        case MTLPixelFormatABGR4Unorm:
-#endif
-        case MTLPixelFormatR8Unorm:
-        case MTLPixelFormatRG8Unorm:
-        case MTLPixelFormatRGBA8Unorm:
-        case MTLPixelFormatRG32Float:
-        case MTLPixelFormatRGBA32Float:
-        case MTLPixelFormatR32Float:
-        case MTLPixelFormatBGRA8Unorm:
-        case MTLPixelFormatRGBA8Unorm_sRGB:
-        case MTLPixelFormatBGRA8Unorm_sRGB:
-        case MTLPixelFormatR8Uint:
-        case MTLPixelFormatR8Sint:
-        case MTLPixelFormatRG8Uint:
-        case MTLPixelFormatRG8Sint:
-        case MTLPixelFormatRGBA8Uint:
-        case MTLPixelFormatRGBA8Sint:
-        case MTLPixelFormatR16Uint:
-        case MTLPixelFormatR16Sint:
-        case MTLPixelFormatRG16Uint:
-        case MTLPixelFormatRG16Sint:
-        case MTLPixelFormatRGBA16Uint:
-        case MTLPixelFormatRGBA16Sint:
-        case MTLPixelFormatR16Float:
-        case MTLPixelFormatRG16Float:
-        case MTLPixelFormatRGBA16Float:
-        case MTLPixelFormatR32Uint:
-        case MTLPixelFormatR32Sint:
-        case MTLPixelFormatRG32Uint:
-        case MTLPixelFormatRG32Sint:
-        case MTLPixelFormatRGBA32Uint:
-        case MTLPixelFormatRGBA32Sint:
-        case MTLPixelFormatRGB10A2Unorm:
-        case MTLPixelFormatRG11B10Float:
-        case MTLPixelFormatRGB9E5Float:
-        case MTLPixelFormatRGB10A2Uint:
-        case MTLPixelFormatRG8Snorm:
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool IsMetalDepthRenderable(const SGIFormatInfo& formatInfo)
-    {
-        if (!formatInfo.m_pTexture)
-        {
-            return false;
-        }
-
-        bool isMetalDepthRenderable = formatInfo.m_pTexture->m_eMetalFormat == MTLPixelFormatDepth32Float ||
-            formatInfo.m_eTypelessFormat == eGIF_R32G8X24_TYPELESS || formatInfo.m_eTypelessFormat == eGIF_R16_TYPELESS ;
-
-#if defined(AZ_PLATFORM_MAC)
-        isMetalDepthRenderable = isMetalDepthRenderable ||
-            formatInfo.m_pTexture->m_eMetalFormat == MTLPixelFormatDepth32Float_Stencil8 ||
-            formatInfo.m_pTexture->m_eMetalFormat == MTLPixelFormatDepth24Unorm_Stencil8;
-#endif
-        return isMetalDepthRenderable;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    bool SOutputMergerTextureView::Init(CDevice* pDevice)
-    {
-        m_iMipLevel = (GLint)m_kConfiguration.m_uMipLevel;
-        if (m_kConfiguration.m_uMinLayer == 0 && m_kConfiguration.m_uNumLayers == m_pTexture->m_uNumElements)
-        //  Confetti BEGIN: Igor Lobanchikov
-        {
-            if (m_kConfiguration.m_uNumLayers != 1)
-            {
-                //  Igor: for obvoiuse reasons iOS supports only 2D RT views, no arrays, no 3D RT, only a slice of it
-                DXGL_NOT_IMPLEMENTED;
-            }
-            else
-            {
-                m_iLayer = m_kConfiguration.m_uMinLayer;
-            }
-        }
-        //  Confetti End: Igor Lobanchikov
-        else if (m_kConfiguration.m_uNumLayers == 1)
-        {
-            m_iLayer = m_kConfiguration.m_uMinLayer;
-        }
-        else
-        {
-            DXGL_NOT_IMPLEMENTED;
-        }
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        {
-            const SGIFormatInfo* pFormatInfo;
-            if (m_kConfiguration.m_eFormat == eGIF_NUM ||
-                (pFormatInfo = GetGIFormatInfo(m_kConfiguration.m_eFormat)) == NULL ||
-                pFormatInfo->m_pTexture == NULL ||
-                (!IsMetalRenderable(pFormatInfo->m_pTexture->m_eMetalFormat) && !IsMetalDepthRenderable(*pFormatInfo)))
-            {
-                DXGL_ERROR("Invalid format for output merger view");
-                return false;
-            }
-
-            assert(m_pTexture);
-            assert(m_pTexture->m_Texture);
-
-            if ((m_kConfiguration.m_eFormat != m_pTexture->m_eFormat) && !IsMetalDepthRenderable(*pFormatInfo))
-            {
-                assert(!m_pTexture->m_bBackBuffer);
-
-                if (m_pTexture->m_bBackBuffer)
-                {
-                    DXGL_ERROR("Back buffer doesn't support views other than native format view");
-                    return false;
-                }
-
-                return CreateUniqueView(pFormatInfo, pDevice);
-            }
-            else if (!m_pTexture->m_bBackBuffer)
-            {
-                m_RTView = m_pTexture->m_Texture;
-                [m_RTView retain];
-            }
-
-            return true;
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        if (m_kConfiguration.m_eFormat != m_pTexture->m_eFormat)
-        {
-            const SGIFormatInfo* pFormatInfo;
-            if (m_kConfiguration.m_eFormat == eGIF_NUM ||
-                (pFormatInfo = GetGIFormatInfo(m_kConfiguration.m_eFormat)) == NULL ||
-                pFormatInfo->m_pTexture == NULL)
-            {
-                DXGL_ERROR("Invalid format for output merger view");
-                return false;
-            }
-
-            if (pFormatInfo->m_pTexture->m_eMetalFormat == GetGIFormatInfo(m_pTexture->m_eFormat)->m_pTexture->m_eMetalFormat)
-            {
-                return true;
-            }
-
-            // Frame buffer attachment does not support any kind of in-place conversion - texture view is required unless no conversion is needed at all
-            return CreateUniqueView(pFormatInfo, pDevice);
-        }
-
-        return true;
-    }
-
-    bool SOutputMergerTextureView::CreateUniqueView(const SGIFormatInfo* pFormatInfo, CDevice* pDevice)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (pFormatInfo->m_eTypelessFormat != m_pTexture->m_eFormat)
-        {
-            DXGL_ERROR("Output merger view format is not compatible with texture format");
-            return false;
-        }
-
-        m_RTView = [m_pTexture->m_Texture newTextureViewWithPixelFormat:pFormatInfo->m_pTexture->m_eMetalFormat];
-
-        if (!m_RTView)
-        {
-            DXGL_ERROR("Couldn't create output merger or depth-stencil view");
-            return false;
-        }
-
-        return true;
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    SBuffer::SBuffer()
-        : m_pSystemMemoryCopy(NULL)
-        , m_bMapped(false)
-        //  Confetti BEGIN: Igor Lobanchikov
-        , m_BufferShared(0)
-#if defined(AZ_PLATFORM_MAC)
-        , m_BufferManaged(0)
-#endif
-        , m_pMappedData(0)
-        , m_uMapOffset(0)
-        , m_uMapSize(0)
-        , m_pfMapBufferRange(0)
-        //  Confetti End: Igor Lobanchikov
-    {
-    }
-
-    SBuffer::~SBuffer()
-    {
-        if (m_pSystemMemoryCopy != NULL)
-        {
-            MemalignFree(m_pSystemMemoryCopy);
-        }
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_BufferShared)
-        {
-            [m_BufferShared release];
-        }
-#if defined(AZ_PLATFORM_MAC)
-        if (m_BufferManaged)
-        {
-            [m_BufferManaged release];
-        }
-#endif
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    bool SBuffer::GetBufferAndOffset(CContext& context, uint32 uInputBufferOffset, uint32 uBaseOffset, uint32 uBaseStride, id<MTLBuffer>& tmpBuffer, uint32& offset, bool const popTransientMappedDataQueue)
-    {
-        offset = uInputBufferOffset;
-        tmpBuffer = GetMtlBufferBasedOnSize(this);
-
-        void* tmpMappedData = m_pMappedData;
-
-        //  Igor: for now vertex buffers always store data in Metal buffer
-        //  Dynamic updates are expected to use direct CPU access
-        //  Other updates are handled using GPU copies.
-        assert(tmpBuffer);
-
-        if (m_eUsage == eBU_MapInRingBufferTTLOnce)
-        {
-            assert(offset == uInputBufferOffset);
-            //  We assume that tmpMappedData has already map offest applied. Don't want to do it twice.
-            offset = 0;
-
-            // David: set appropriate mapped data if the buffer was mapped multiple times
-            //        Caller of this function is responsible to pop the m_pTransientMappedData list.
-            if (!m_pTransientMappedData.empty())
-            {
-                tmpMappedData = m_pTransientMappedData.front();
-
-                if (popTransientMappedDataQueue)
-                {
-                    m_pTransientMappedData.pop_front();
-                }
-            }
-        }
-
-        //  Igor: this is used to calculate offset correctly when ring buffer is used
-        if (tmpMappedData)
-        {
-            //  Check if offset in this situation is always 0
-            assert(!offset);
-            offset += (uint8*)(tmpMappedData) - (uint8*)(tmpBuffer.contents);
-        }
-
-        {
-            offset += uBaseOffset * uBaseStride;
-        }
-
-        return true;
-    }
-
-    SQuery::~SQuery()
-    {
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    void SQuery::Begin(CContext* pContext)
-    {
-    }
-
-    void SQuery::End(CContext* pContext)
-    {
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    uint32 SQuery::GetDataSize()
-    {
-        return 0;
-    }
-
-    SPlainQuery::SPlainQuery()
-    {
-    }
-
-    SPlainQuery::~SPlainQuery()
-    {
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    void SPlainQuery::Begin(CContext* pContext)
-    {
-        DXMETAL_NOT_IMPLEMENTED
-    }
-
-    void SPlainQuery::End(CContext* pContext)
-    {
-        DXMETAL_NOT_IMPLEMENTED
-    }
-
-    SOcclusionQuery::SOcclusionQuery()
-        : m_pEventHelper(NULL)
-        , m_pQueryData(NULL)
-    {
-    }
-
-    void SOcclusionQuery::Begin(CContext* pContext)
-    {
-        assert(pContext);
-
-        m_pEventHelper = 0;
-        m_pQueryData = 0;
-        pContext->BeginOcclusionQuery(this);
-    }
-
-    void SOcclusionQuery::End(CContext* pContext)
-    {
-        pContext->EndOcclusionQuery(this);
-    }
-
-    bool SOcclusionQuery::GetData(void* pData, uint32 uDataSize, bool bFlush)
-    {
-        //TODO: m_pEventHelper is null sometimes
-        if (!m_pEventHelper)
-        {
-            return false;
-        }
-        //assert(m_pEventHelper != nullptr);
-        assert(m_pQueryData);
-        //  Igor: If the command buffer is not submitted event will never be triggered.
-        //  Flushing of the command buffer is expensive (resolve/restore all RTs bound)
-        //  As the result we don't support flush operation.
-        //  This will lead to stall, if the command buffer is not submitted and application loops until
-        //  the event will be triggered which will never happen.
-        //  Assert chacks for this situation. If you are here, it is a good idea to reconsider
-        //  using the event the way you want to.
-        //  note: when the application is just initialized frame throttle events will assert
-        //  if there are no resources since command buffer has never been committed.
-        assert(!(bFlush) || (bFlush && m_pEventHelper->bCommandBufferSubmitted));
-        if (!(!(bFlush) || (bFlush && m_pEventHelper->bCommandBufferSubmitted)))
-        {
-            int i = 0;
-            ++i;
-            AZ_TracePrintf("Metal", "Potential dead lock is possible! Event is not triggered. Continue to prevent a deadlock");
-            *reinterpret_cast<UINT64*>(pData) = 0;
-            return true;
-        }
-
-        DXMETAL_TODO("Consider returning something big for true instead of one for occlusion query.");
-        //  Igor: Motivation: Cryengine uses threshold to determine visibility. 1 is usually below that threshold.
-        if (m_pEventHelper->bTriggered)
-        {
-            *reinterpret_cast<UINT64*>(pData) = *m_pQueryData;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    uint32 SOcclusionQuery::GetDataSize()
-    {
-        return sizeof(UINT64);
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    SFenceSync::SFenceSync()
-        : m_pEventHelper(NULL)
-    {
-    }
-
-    SFenceSync::~SFenceSync()
-    {
-    }
-
-    void SFenceSync::End(CContext* pContext)
-    {
-        assert(pContext);
-        m_pEventHelper = pContext->GetCurrentEventHelper();
-        assert(m_pEventHelper);
-    }
-
-    bool SFenceSync::GetData(void* pData, uint32 uDataSize, bool bFlush)
-    {
-        assert(m_pEventHelper != NULL);
-        //  Igor: If the command buffer is not submitted event will never be triggered.
-        //  Flushing of the command buffer is expensive (resolve/restore all RTs bound)
-        //  As the result we don't support flush operation.
-        //  This will lead to stall, if the command buffer is not submitted and application loops until
-        //  the event will be triggered which will never happen.
-        //  Assert chacks for this situation. If you are here, it is a good idea to reconsider
-        //  using the event the way you want to.
-        //  note: when the application is just initialized frame throttle events will assert
-        //  if there are no resources since command buffer has never been committed.
-        assert(!(bFlush) || (bFlush && m_pEventHelper->bCommandBufferSubmitted));
-        if (!(!(bFlush) || (bFlush && m_pEventHelper->bCommandBufferSubmitted)))
-        {
-            int i = 0;
-            ++i;
-            AZ_TracePrintf("Metal", "Potential dead lock is possible! Event is not triggered. Continue to prevent a deadlock");
-            *reinterpret_cast<BOOL*>(pData) = TRUE;
-            return true;
-        }
-
-        if (m_pEventHelper->bTriggered)
-        {
-            *reinterpret_cast<BOOL*>(pData) = TRUE;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    uint32 SFenceSync::GetDataSize()
-    {
-        return sizeof(BOOL);
-    }
-
-    struct SDefaultFrameBufferOutputMergerView
-        : SOutputMergerTextureView
-    {
-        SDefaultFrameBufferOutputMergerView(SDefaultFrameBufferTexture* pTexture, const SOutputMergerTextureViewConfiguration& kConfiguration)
-            : SOutputMergerTextureView(pTexture, kConfiguration)
-        {
-        }
-
-        virtual bool CreateUniqueView(const SGIFormatInfo* pFormatInfo, CDevice* pDevice)
-        {
-            return SOutputMergerTextureView::CreateUniqueView(pFormatInfo, 0);
-        }
-    };
-
-    struct SDefaultFrameBufferShaderView
-        : SShaderTextureView
-    {
-        SDefaultFrameBufferShaderView(SDefaultFrameBufferTexture* pTexture, const SShaderTextureViewConfiguration& kConfiguration)
-            : SShaderTextureView(pTexture, kConfiguration)
-        {
-        }
-    };
-
-    SDefaultFrameBufferTexture::SDefaultFrameBufferTexture(int32 iWidth, int32 iHeight, EGIFormat eFormat)
-        : STexture(iWidth, iHeight, 1, MTLTextureType2D, eFormat, 1, 1)
-#if CRY_DXGL_FULL_EMULATION
-        , m_kCustomWindowContext(NULL)
-#endif //DXGL_FULL_EMULATION
-    {
-        m_pfUpdateSubresource = &UpdateSubresource;
-        m_pfMapSubresource    = &MapSubresource;
-        m_pfUnmapSubresource  = &UnmapSubresource;
-    }
-
-    SShaderTextureViewPtr SDefaultFrameBufferTexture::CreateShaderView(const SShaderTextureViewConfiguration& kConfiguration, CDevice* pDevice)
-    {
-        SShaderTextureViewPtr spView(new SDefaultFrameBufferShaderView(this, kConfiguration));
-        if (!spView->Init(pDevice))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-    SOutputMergerTextureViewPtr SDefaultFrameBufferTexture::CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CDevice* pDevice)
-    {
-        SOutputMergerTextureViewPtr spView(new SDefaultFrameBufferOutputMergerView(this, kConfiguration));
-        if (!spView->Init(pDevice))
-        {
-            return NULL;
-        }
-        return spView;
-    }
-
-#if DXGL_FULL_EMULATION
-
-    void SDefaultFrameBufferTexture::SetCustomWindowContext(const TWindowContext& kCustomWindowContext)
-    {
-        m_kCustomWindowContext = kCustomWindowContext;
-    }
-
-#endif //DXGL_FULL_EMULATION
-
-    void SDefaultFrameBufferTexture::UpdateSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext)
-    {
-        if (uSubresource > 0)
-        {
-            DXGL_ERROR("The only valid subresource index for the default frame buffer is 0 - cannot update subresource");
-            return;
-        }
-
-        SDefaultFrameBufferTexture* pDefaultFramebufferTexture(static_cast<SDefaultFrameBufferTexture*>(pResource));
-        UpdateTexSubresource<SSingleTexImpl<STex2DUncompressed> >(pDefaultFramebufferTexture, uSubresource, pDstBox, pSrcData, uSrcRowPitch, uSrcDepthPitch, pContext);
-    }
-
-    bool SDefaultFrameBufferTexture::MapSubresource(SResource* pResource, uint32 uSubresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-    {
-        if (uSubresource > 0)
-        {
-            DXGL_ERROR("The only valid subresource index for the default frame buffer is 0 - cannot map subresource");
-            return false;
-        }
-
-        SDefaultFrameBufferTexture* pDefaultFramebufferTexture(static_cast<SDefaultFrameBufferTexture*>(pResource));
-        switch (MapType)
-        {
-        case D3D11_MAP_READ:
-        case D3D11_MAP_READ_WRITE:
-        case D3D11_MAP_WRITE:
-            break;
-        default:
-            DXGL_ERROR("Unsupported map operation type for default frame buffer");
-            return false;
-        }
-
-        return MapTexSubresource<SSingleTexImpl<STex2DUncompressed> >(pDefaultFramebufferTexture, uSubresource, MapType, MapFlags, pMappedResource, pContext);
-    }
-
-    void SDefaultFrameBufferTexture::UnmapSubresource(SResource* pResource, uint32 uSubresource, CContext* pContext)
-    {
-        if (uSubresource > 0)
-        {
-            DXGL_ERROR("The only valid subresource index for the default frame buffer is 0 - cannot unmap subresource");
-            return;
-        }
-
-        SDefaultFrameBufferTexture* pDefaultFramebufferTexture(static_cast<SDefaultFrameBufferTexture*>(pResource));
-
-        UnmapTexSubresource<SSingleTexImpl<STex2DUncompressed> >(pDefaultFramebufferTexture, uSubresource, pContext);
-    }
-
-    const SGIFormatInfo* GetCompatibleTextureFormatInfo(EGIFormat* peGIFormat)
-    {
-        const SGIFormatInfo* pFormatInfo(GetGIFormatInfo(*peGIFormat));
-        if (pFormatInfo->m_pTexture != NULL)
-        {
-            return pFormatInfo;
-        }
-        if (pFormatInfo->m_eTypelessFormat != eGIF_NUM && pFormatInfo->m_eTypelessFormat != *peGIFormat)
-        {
-            *peGIFormat = pFormatInfo->m_eTypelessFormat;
-            pFormatInfo = GetGIFormatInfo(pFormatInfo->m_eTypelessFormat);
-            if (pFormatInfo->m_pTexture != NULL)
-            {
-                return pFormatInfo;
-            }
-        }
-        *peGIFormat = eGIF_NUM;
-        return NULL;
-    }
-
-    STexturePtr CreateTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateTexture1D")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM ||
-            (pFormatInfo = GetCompatibleTextureFormatInfo(&eGIFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for 1D texture");
-            return NULL;
-        }
-
-        uint32 uNumElements(kDesc.ArraySize);
-        bool bArray(kDesc.ArraySize > 1 || (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY));
-
-        STexturePtr spTexture(
-            new STexture(
-                kDesc.Width, 1, 1,
-                bArray ? MTLTextureType1DArray : MTLTextureType1D,
-                eGIFormat, GetNumMipLevels(kDesc), kDesc.ArraySize));
-
-        if (kDesc.Usage == D3D11_USAGE_STAGING)
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SStagingTexImpl<STex1DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-            }
-            else
-            {
-                InitializeTexture<SStagingTexImpl<STex1DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-            }
-        }
-        else
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex2DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex1DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-                }
-            }
-            else
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex2DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex1DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-                }
-            }
-        }
-
-        return spTexture;
-    }
-
-    void InitializeTexture2D(STexture* pTexture, bool bArray, bool bStaging, const D3D11_SUBRESOURCE_DATA* pInitialData, uint32 uCPUAccess, CDevice* pDevice /*CContext* pContext*/, const SGIFormatInfo* pFormatInfo, const uint32 uBindFlags)
-    {
-        if (bStaging)
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SStagingTexImpl<STex2DCompressed> >(pTexture, pInitialData, uCPUAccess, pDevice, pFormatInfo, uBindFlags);
-            }
-            else
-            {
-                InitializeTexture<SStagingTexImpl<STex2DUncompressed> >(pTexture, pInitialData, uCPUAccess, pDevice, pFormatInfo, uBindFlags);
-            }
-        }
-        else
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex3DCompressed> >(pTexture, pInitialData, uCPUAccess, pDevice, pFormatInfo, uBindFlags);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex2DCompressed> >(pTexture, pInitialData, uCPUAccess, pDevice, pFormatInfo, uBindFlags);
-                }
-            }
-            else
-            {
-                if (bArray)
-                {
-                    InitializeTexture<SArrayTexImpl<STex3DUncompressed> >(pTexture, pInitialData, uCPUAccess, pDevice, pFormatInfo, uBindFlags);
-                }
-                else
-                {
-                    InitializeTexture<SSingleTexImpl<STex2DUncompressed> >(pTexture, pInitialData, uCPUAccess, pDevice, pFormatInfo, uBindFlags);
-                }
-            }
-        }
-    }
-
-    STexturePtr CreateTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateTexture2D")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM ||
-            (pFormatInfo = GetCompatibleTextureFormatInfo(&eGIFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for 2D texture");
-            return NULL;
-        }
-
-        bool bStaging(kDesc.Usage == D3D11_USAGE_STAGING);
-
-        if (kDesc.SampleDesc.Count > 1)
-        {
-            DXGL_NOT_IMPLEMENTED
-            return NULL;
-        }
-        else
-        {
-            if ((kDesc.MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE) != 0)
-            {
-                bool bArray(kDesc.ArraySize > 6 || (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY));
-
-                if (bArray)
-                {
-                    DXGL_NOT_IMPLEMENTED;
-                    return NULL;
-                }
-                STexturePtr spTexture(
-                    new STexture(
-                        kDesc.Width, kDesc.Height, 1,
-                        MTLTextureTypeCube,
-                        eGIFormat, GetNumMipLevels(kDesc), kDesc.ArraySize));
-
-                InitializeTexture2D(spTexture, bArray, bStaging, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-
-                return spTexture;
-            }
-            else
-            {
-                bool bArray(kDesc.ArraySize > 1 || (kDesc.MiscFlags & D3D11_RESOURCE_MISC_DXGL_FORCE_ARRAY));
-
-                STexturePtr spTexture(
-                    new STexture(
-                        kDesc.Width, kDesc.Height, 1,
-                        bArray ? MTLTextureType2DArray : MTLTextureType2D,
-                        eGIFormat, GetNumMipLevels(kDesc), kDesc.ArraySize));
-
-                InitializeTexture2D(spTexture, bArray, bStaging, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-
-                return spTexture;
-            }
-        }
-    }
-
-    STexturePtr CreateTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateTexture3D")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM ||
-            (pFormatInfo = GetCompatibleTextureFormatInfo(&eGIFormat)) == NULL)
-        {
-            DXGL_ERROR("Invalid format for 3D texture");
-            return NULL;
-        }
-
-        STexturePtr spTexture(
-            new STexture(
-                kDesc.Width, kDesc.Height, kDesc.Depth,
-                MTLTextureType3D,
-                eGIFormat, GetNumMipLevels(kDesc), 1));
-
-        if (kDesc.Usage == D3D11_USAGE_STAGING)
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SStagingTexImpl<STex3DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-            }
-            else
-            {
-                InitializeTexture<SStagingTexImpl<STex3DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-            }
-        }
-        else
-        {
-            if (pFormatInfo->m_pTexture->m_bCompressed)
-            {
-                InitializeTexture<SSingleTexImpl<STex3DCompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-            }
-            else
-            {
-                InitializeTexture<SSingleTexImpl<STex3DUncompressed> >(spTexture, pInitialData, kDesc.CPUAccessFlags, pDevice, pFormatInfo, kDesc.BindFlags);
-            }
-        }
-
-        return spTexture;
-    }
-
-    void UpdateRingBuffer(SBuffer* pBuffer, CContext* pContext, bool checkIfBufferIsMapped)
-    {
-        MemRingBufferStorage memAllocMode = GetMemAllocModeBasedOnSize(pBuffer->m_uMapSize);
-        id<MTLBuffer> mtlBuffer = GetMtlBufferBasedOnSize(pBuffer);
-
-        assert(pBuffer->m_BufferShared);
-
-        bool checkForMapping = checkIfBufferIsMapped ? pBuffer->m_bMapped : true;
-        //  Igor: pBuffer->m_bMapped is checked here because we don't want to do anything if the buffer is not mapped.
-        if ((pBuffer->m_eUsage == eBU_Default) && checkForMapping)
-        {
-            id<MTLBuffer> tmpBuffer = pContext->GetRingBuffer(memAllocMode);
-            size_t unusedOffset = 0;
-            void* pTempData = pContext->AllocateMemoryInRingBuffer(pBuffer->m_uMapSize, memAllocMode, unusedOffset);
-            size_t tmpOffset = (uint8*)pTempData - (uint8*)tmpBuffer.contents;
-
-            cryMemcpy(pTempData, pBuffer->m_pSystemMemoryCopy + pBuffer->m_uMapOffset, pBuffer->m_uMapSize);
-
-            id<MTLBlitCommandEncoder> blitCommandEncoder = pContext->GetBlitCommandEncoder();
-            [blitCommandEncoder copyFromBuffer: tmpBuffer
-                                sourceOffset: tmpOffset
-                                toBuffer: mtlBuffer
-                                destinationOffset: pBuffer->m_uMapOffset
-                                size: pBuffer->m_uMapSize];
-
-            pBuffer->m_uMapOffset = 0;
-            pBuffer->m_uMapSize = 0;
-        }
-#if defined(AZ_PLATFORM_MAC)
-        else
-        {
-            //If this buffer was using the faster ring buffer synchronize with the GPU
-            if (memAllocMode == MEM_MANAGED_RINGBUFFER)
-            {
-                [pBuffer->m_BufferManaged didModifyRange: NSMakeRange(pBuffer->m_uMapOffset, pBuffer->m_uMapSize)];
-            }
-        }
-#endif
-    }
-
-    struct SDefaultBufferImpl
-    {
-        static void UpdateBufferSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32, uint32, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDefaultBufferImpl::UpdateBufferSubresource")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            assert(pBuffer->m_BufferShared);
-            size_t ringBufferOffsetOut = 0;
-            
-            id<MTLBuffer> tmpBuffer = pContext->GetRingBuffer(MEM_SHARED_RINGBUFFER);
-            void* pTempData = pContext->AllocateMemoryInRingBuffer(pBuffer->m_uSize, MEM_SHARED_RINGBUFFER, ringBufferOffsetOut);
-            size_t tmpOffset = (uint8*)pTempData - (uint8*)tmpBuffer.contents;
-            
-            cryMemcpy(pTempData, pSrcData, pDstBox ? pDstBox->right - pDstBox->left : pBuffer->m_BufferShared.length);
-            
-            id<MTLBlitCommandEncoder> blitCommandEncoder = pContext->GetBlitCommandEncoder();
-            [blitCommandEncoder copyFromBuffer: tmpBuffer
-                                  sourceOffset: tmpOffset
-                                      toBuffer: pBuffer->m_BufferShared
-                             destinationOffset: pDstBox ? pDstBox->left : 0
-                                          size: pDstBox ? pDstBox->right - pDstBox->left : pBuffer->m_BufferShared.length];
-        }
-    };
-
-    struct SDynamicBufferImpl
-    {
-        static bool MapBufferRange(SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP eMapType, uint32 uMapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::MapBufferRange")
-
-            //  Confetti BEGIN: Igor Lobanchikov
-
-            size_t ringBufferOffsetOut = 0;
-
-            DXMETAL_TODO("Add more buffer usage types for optimization purposes.");
-            //  Igor: Use local copy now, copy it to ring buffer when rendering the actual geometry
-            //  Note: vertex buffer must be 256 bytes aligned when rendering.
-            //  Igor: eBU_MapInRingBuffer is set for constant buffer. So use ring buffer for constant buffer updates
-            switch (pBuffer->m_eUsage)
-            {
-            case eBU_Default:
-            {
-                assert(pBuffer->m_pSystemMemoryCopy);
-                pMappedResource->pData = pBuffer->m_pSystemMemoryCopy + uOffset;
-
-                assert(pBuffer->m_BufferShared);
-                pBuffer->m_bMapped = true;
-                break;
-            }
-
-            case eBU_MapInRingBufferTTLFrame:
-            {
-                MemRingBufferStorage memAllocMode = GetMemAllocModeBasedOnSize(uSize);
-
-                if (!pBuffer->m_BufferShared)
-                {
-                    pBuffer->m_BufferShared = pContext->GetRingBuffer(MEM_SHARED_RINGBUFFER);
-                    [pBuffer->m_BufferShared retain];
-                }
-#if defined(AZ_PLATFORM_MAC)
-                if (!pBuffer->m_BufferManaged)
-                {
-                    pBuffer->m_BufferManaged = pContext->GetRingBuffer(MEM_MANAGED_RINGBUFFER);
-                    [pBuffer->m_BufferManaged retain];
-                }
-#endif
-                pBuffer->m_bMapped = true;
-
-                if (eMapType == D3D11_MAP_WRITE_NO_OVERWRITE)
-                {
-                    if (!pBuffer->m_pMappedData)
-                    {
-                        pBuffer->m_pMappedData = pContext->AllocateMemoryInRingBuffer(pBuffer->m_uSize, memAllocMode, ringBufferOffsetOut);
-                    }
-                }
-                else
-                {
-                    // The only other possible mode for dynamic buffers is D3D11_MAP_WRITE_DISCARD
-                    assert(eMapType == D3D11_MAP_WRITE_DISCARD);
-                    pBuffer->m_pMappedData = pContext->AllocateMemoryInRingBuffer(pBuffer->m_uSize, memAllocMode, ringBufferOffsetOut);
-                }
-
-                pMappedResource->pData = (uint8*)pBuffer->m_pMappedData;
-                break;
-            }
-
-            default:
-                DXMETAL_NOT_IMPLEMENTED;
-            }
-            //  Confetti End: Igor Lobanchikov
-
-            pMappedResource->RowPitch = 0;  // Meaningless for buffers
-            pMappedResource->DepthPitch = 0; // Meaningless for buffers
-
-            pBuffer->m_uMapOffset = ringBufferOffsetOut; // This is needed to synchronize with the GPU (didModifyRange)
-            pBuffer->m_uMapSize   = uSize;
-
-            return true;
-        }
-
-        static bool MapBuffer(SResource* pResource, uint32 uSubresource, D3D11_MAP eMapType, uint32 uMapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::MapBuffer")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            return MapBufferRange(pBuffer, (size_t)0, (size_t)pBuffer->m_uSize, eMapType, uMapFlags, pMappedResource, pContext);
-        }
-
-        static void UnmapBuffer(SResource* pResource, UINT Subresource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::UnmapBuffer")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-
-            //Update the ring buffer with the final rendering data
-            bool checkIfBufferIsMapped = true;//Check to make sure this buffer is mapped if it is eBU_Default
-            UpdateRingBuffer(pBuffer, pContext, checkIfBufferIsMapped);
-
-            pBuffer->m_bMapped = false;
-        }
-
-        static void UpdateBufferSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32, uint32, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("SDynamicBufferImpl::UpdateBufferSubresource")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-
-            assert(uSubresource == 0);
-
-            uint32 uDstOffset, uDstSize;
-            if (pDstBox != NULL)
-            {
-                uDstOffset = pDstBox->left;
-                uDstSize   = pDstBox->right - pDstBox->left;
-            }
-            else
-            {
-                uDstOffset = 0;
-                uDstSize   = pBuffer->m_uSize;
-            }
-
-            //Update the resource
-            if (pBuffer->m_pSystemMemoryCopy)
-            {
-                cryMemcpy(pBuffer->m_pSystemMemoryCopy + uDstOffset, static_cast<const uint8*>(pSrcData), uDstSize);
-            }
-
-            assert(pBuffer->m_eUsage == eBU_Default);
-
-            assert(pBuffer->m_BufferShared);
-
-            //Update the ring buffer with the final rendering data
-            bool checkIfBufferIsMapped = false;//Check to make sure this buffer is mapped if it is eBU_Default
-            UpdateRingBuffer(pBuffer, pContext, checkIfBufferIsMapped);
-        }
-    };
-
-    struct SStagingBufferImpl
-    {
-        static bool MapBufferRange(SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::MapBufferRange")
-
-            //  Confetti BEGIN: Igor Lobanchikov
-            pMappedResource->pData = pBuffer->m_pSystemMemoryCopy + uOffset;
-            //  Confetti End: Igor Lobanchikov
-            pMappedResource->RowPitch = 0;  // Meaningless for buffers
-            pMappedResource->DepthPitch = 0; // Meaningless for buffers
-
-            return true;
-        }
-
-        static bool MapBuffer(SResource* pResource, uint32, D3D11_MAP, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::MapBuffer")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-            pMappedResource->pData = pBuffer->m_pSystemMemoryCopy;
-            //  Confetti End: Igor Lobanchikov
-            pMappedResource->RowPitch = 0;  // Meaningless for buffers
-            pMappedResource->DepthPitch = 0; // Meaningless for buffers
-
-            return true;
-        }
-
-        static void UnmapBuffer(SResource*, UINT, CContext*)
-        {
-        }
-
-        static void UpdateBufferSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32, uint32, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SStagingBufferImpl::UpdateBufferSubresource")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-
-            assert(uSubresource == 0);
-
-            //  Confetti BEGIN: Igor Lobanchikov
-            if (pDstBox != NULL)
-            {
-                cryMemcpy(pBuffer->m_pSystemMemoryCopy + pDstBox->left, pSrcData, pDstBox->right - pDstBox->left);
-            }
-            else
-            {
-                cryMemcpy(pBuffer->m_pSystemMemoryCopy, pSrcData, pBuffer->m_uSize);
-            }
-            //  Confetti End: Igor Lobanchikov
-        }
-    };
-
-    struct STransientBufferImpl
-    {
-        static bool MapBufferRange(SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP eMapType, uint32 uMapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("STransientBufferImpl::MapBufferRange")
-
-            assert(pBuffer->m_eUsage == eBU_MapInRingBufferTTLOnce);
-            assert(!pBuffer->m_pSystemMemoryCopy);
-
-            size_t ringBufferOffsetOut = 0;
-            MemRingBufferStorage memAllocMode = GetMemAllocModeBasedOnSize(uSize);
-
-            if (!pBuffer->m_BufferShared)
-            {
-                pBuffer->m_BufferShared = pContext->GetRingBuffer(MEM_SHARED_RINGBUFFER);
-                [pBuffer->m_BufferShared retain];
-            }
-#if defined(AZ_PLATFORM_MAC)
-            if (!pBuffer->m_BufferManaged)
-            {
-                pBuffer->m_BufferManaged = pContext->GetRingBuffer(MEM_MANAGED_RINGBUFFER);
-                [pBuffer->m_BufferManaged retain];
-            }
-#endif
-            pBuffer->m_bMapped = true;
-
-            if (eMapType == D3D11_MAP_WRITE_NO_OVERWRITE)
-            {
-                assert(uOffset + uSize <= pBuffer->m_uSize);
-                pBuffer->m_pMappedData = pContext->AllocateMemoryInRingBuffer(uSize, memAllocMode, ringBufferOffsetOut);
-            }
-            else
-            {
-                // The only other possible mode for dynamic buffers is D3D11_MAP_WRITE_DISCARD
-                assert(eMapType == D3D11_MAP_WRITE_DISCARD);
-                assert(uSize <= pBuffer->m_uSize);
-                pBuffer->m_pMappedData = pContext->AllocateMemoryInRingBuffer(uSize, memAllocMode, ringBufferOffsetOut);
-            }
-
-            pMappedResource->pData = (uint8*)pBuffer->m_pMappedData;
-
-            pMappedResource->RowPitch = 0;  // Meaningless for buffers
-            pMappedResource->DepthPitch = 0; // Meaningless for buffers
-
-            pBuffer->m_uMapOffset = ringBufferOffsetOut; // This is needed to synchronize with the GPU (didModifyRange)
-            pBuffer->m_uMapSize   = uSize;
-
-            pBuffer->m_pTransientMappedData.push_back(pBuffer->m_pMappedData);
-
-            return true;
-        }
-
-        static void UnmapBuffer(SResource* pResource, UINT Subresource, CContext* pContext)
-        {
-            DXGL_SCOPED_PROFILE("STransientBufferImpl::UnmapBuffer")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-
-            assert(pBuffer->m_eUsage == eBU_MapInRingBufferTTLOnce);
-#if defined(AZ_PLATFORM_MAC)
-            //If this buffer was using the faster ring buffer synchronize with the GPU
-            MemRingBufferStorage memAllocMode = GetMemAllocModeBasedOnSize(pBuffer->m_uMapSize);
-            if (memAllocMode == MEM_MANAGED_RINGBUFFER)
-            {
-                [pBuffer->m_BufferManaged didModifyRange: NSMakeRange(pBuffer->m_uMapOffset, pBuffer->m_uMapSize)];
-            }
-#endif
-            pBuffer->m_bMapped = false;
-        }
-    };
-
-    struct SDirectAccessBufferImpl
-    {
-        static bool MapBufferRange(SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SDirectAccessBufferImpl::MapBufferRange")
-
-            assert(pBuffer->m_BufferShared);
-            assert(pBuffer->m_eUsage == eBU_DirectAccess);
-
-            //DirectAccess buffers allocate from shared memory only.
-            pMappedResource->pData = (uint8*)pBuffer->m_BufferShared.contents + uOffset;
-            pMappedResource->RowPitch = 0;  // Meaningless for buffers
-            pMappedResource->DepthPitch = 0; // Meaningless for buffers
-
-            return true;
-        }
-
-        static bool MapBuffer(SResource* pResource, uint32, D3D11_MAP, uint32, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext*)
-        {
-            DXGL_SCOPED_PROFILE("SDirectAccessBufferImpl::MapBuffer")
-
-            SBuffer * pBuffer(static_cast<SBuffer*>(pResource));
-
-            assert(pBuffer->m_BufferShared);
-            assert(pBuffer->m_eUsage == eBU_DirectAccess);
-
-            //DirectAccess buffers allocate from shared memory only.
-            pMappedResource->pData = (uint8*)pBuffer->m_BufferShared.contents;
-
-            pMappedResource->RowPitch = 0;  // Meaningless for buffers
-            pMappedResource->DepthPitch = 0; // Meaningless for buffers
-
-            return true;
-        }
-
-        static void UnmapBuffer(SResource*, UINT, CContext*)
-        {
-        }
-    };
-
-    SBufferPtr CreateBuffer(const D3D11_BUFFER_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateBuffer")
-
-        SBufferPtr spBuffer(new SBuffer());
-        spBuffer->m_uSize = kDesc.ByteWidth;
-
-        for (UINT uBindMask = 1; uBindMask != 0; uBindMask <<= 1)
-        {
-            switch (kDesc.BindFlags & uBindMask)
-            {
-            case 0:
-                break;
-            case D3D11_BIND_VERTEX_BUFFER:
-                spBuffer->m_kBindings.Set(eBB_Array, true);
-                break;
-            case D3D11_BIND_INDEX_BUFFER:
-                spBuffer->m_kBindings.Set(eBB_ElementArray, true);
-                break;
-            case D3D11_BIND_CONSTANT_BUFFER:
-                spBuffer->m_kBindings.Set(eBB_UniformBuffer, true);
-                break;
-#if DXGL_SUPPORT_TEXTURE_BUFFERS
-            case D3D11_BIND_SHADER_RESOURCE:
-                spBuffer->m_kBindings.Set(eBB_Texture, true);
-                break;
-#endif //DXGL_SUPPORT_TEXTURE_BUFFERS
-            case D3D11_BIND_UNORDERED_ACCESS:
-                if ((kDesc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) != 0)
-                {
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                    spBuffer->m_kBindings.Set(eBB_ShaderStorage, true);
-                    break;
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-                }
-                else
-                {
-#if DXGL_SUPPORT_TEXTURE_BUFFERS
-                    spBuffer->m_kBindings.Set(eBB_Texture, true);
-                    break;
-#endif //DXGL_SUPPORT_TEXTURE_BUFFERS
-                }
-            default:
-                DXGL_TODO("Support more buffer bindings");
-                DXGL_ERROR("Buffer binding not supported");
-                return NULL;
-            }
-        }
-
-        bool bVideoMemory = false, bAllocateSystemMemory = false;
-        switch (kDesc.Usage)
-        {
-        case D3D11_USAGE_DEFAULT:
-            spBuffer->m_pfUpdateSubresource = &SDefaultBufferImpl::UpdateBufferSubresource;
-        case D3D11_USAGE_IMMUTABLE:
-            if ((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_WRITE) == 0)
-            {
-                spBuffer->m_eUsage = eBU_Default;//GL_STATIC_READ;
-            }
-            else if ((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ) == 0)
-            {
-                spBuffer->m_eUsage = eBU_Default;//GL_STATIC_DRAW;
-            }
-            else
-            {
-                spBuffer->m_eUsage = eBU_Default;//GL_STATIC_COPY;
-            }
-            bVideoMemory = true;
-            bAllocateSystemMemory = false;
-            break;
-        case D3D11_USAGE_DYNAMIC:
-            spBuffer->m_pfMapSubresource    = &SDynamicBufferImpl::MapBuffer;
-            spBuffer->m_pfUnmapSubresource  = &SDynamicBufferImpl::UnmapBuffer;
-            spBuffer->m_pfUpdateSubresource = &SDynamicBufferImpl::UpdateBufferSubresource;
-            spBuffer->m_pfMapBufferRange    = &SDynamicBufferImpl::MapBufferRange;
-            if ((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ) != 0)
-            {
-                DXGL_ERROR("Cannot create a buffer with dynamic usage that is CPU readable");
-                return NULL;
-            }
-            if ((kDesc.BindFlags & D3D11_BIND_CONSTANT_BUFFER) != 0)
-            {
-                // Assuming that constant buffers are accessed more frequently and usually discarded on updates
-                spBuffer->m_eUsage = eBU_MapInRingBufferTTLFrame;//GL_DYNAMIC_DRAW;
-            }
-            else
-            {
-                spBuffer->m_eUsage = eBU_Default;//GL_STREAM_DRAW;
-            }
-            //  Confetti BEGIN: Igor Lobanchikov
-            if (spBuffer->m_eUsage == eBU_Default)
-            {
-                bVideoMemory = true;
-                //  Igor: we always map the system memory, then copy to ring buffer and use GPU to copy from ring buffer to the actual buffer.
-                //  Slow but safe.
-                //  This path should never be used. Consider using other approaches.
-                bAllocateSystemMemory = true;
-            }
-            else
-            {
-                bVideoMemory = false;
-                bAllocateSystemMemory = false;
-            }
-            //  Confetti End: Igor Lobanchikov
-            break;
-        case D3D11_USAGE_STAGING:
-            spBuffer->m_pfMapSubresource    = &SStagingBufferImpl::MapBuffer;
-            spBuffer->m_pfUnmapSubresource  = &SStagingBufferImpl::UnmapBuffer;
-            spBuffer->m_pfUpdateSubresource = &SStagingBufferImpl::UpdateBufferSubresource;
-            spBuffer->m_pfMapBufferRange    = &SStagingBufferImpl::MapBufferRange;
-            spBuffer->m_eUsage = eBU_Default;//GL_NONE;
-            AZ_Assert(!(kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_WRITE), "The resource should not be writable by CPU");
-            AZ_Assert((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ), "The resource should be readable by CPU");
-            bVideoMemory = false;
-            bAllocateSystemMemory = true;
-            break;
-        case D3D11_USAGE_TRANSIENT:
-            spBuffer->m_pfUnmapSubresource  = &STransientBufferImpl::UnmapBuffer;
-            spBuffer->m_pfMapBufferRange    = &STransientBufferImpl::MapBufferRange;
-            spBuffer->m_eUsage = eBU_MapInRingBufferTTLOnce;
-            //  Igor: this buffer never own memory but rather borrows it from the ring buffer
-            bVideoMemory = false;
-            bAllocateSystemMemory = false;
-            if ((kDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ) != 0)
-            {
-                DXGL_ERROR("Cannot create a buffer with transient usage that is CPU readable");
-                return NULL;
-            }
-            break;
-        default:
-        case D3D11_USAGE_DIRECT_ACCESS:
-            spBuffer->m_pfUnmapSubresource  = &SDirectAccessBufferImpl::UnmapBuffer;
-            spBuffer->m_pfMapBufferRange    = &SDirectAccessBufferImpl::MapBufferRange;
-            spBuffer->m_pfMapSubresource    = &SDirectAccessBufferImpl::MapBuffer;
-            spBuffer->m_eUsage = eBU_DirectAccess;
-            bVideoMemory = true;
-            bAllocateSystemMemory = false;
-            break;
-            DXGL_ERROR("Buffer usage not supported");
-            return NULL;
-        }
-
-        if (bVideoMemory)
-        {
-            //  Confetti BEGIN: Igor Lobanchikov
-            id<MTLDevice> Device = pDevice->GetMetalDevice();
-            if (kDesc.BindFlags & D3D11_BIND_UNORDERED_ACCESS)
-            {
-                spBuffer->m_BufferShared = [Device newBufferWithLength:spBuffer->m_uSize options:MTLResourceStorageModeShared];
-            }
-            else
-            {
-                spBuffer->m_BufferShared = [Device newBufferWithLength:spBuffer->m_uSize options:MTLResourceCPUCacheModeWriteCombined | MTLResourceStorageModeShared];
-            }
-            if (pInitialData != NULL)
-            {
-                cryMemcpy(spBuffer->m_BufferShared.contents, pInitialData->pSysMem, kDesc.ByteWidth);
-            }
-            //  Confetti End: Igor Lobanchikov
-        }
-
-        if (bAllocateSystemMemory)
-        {
-            spBuffer->m_pSystemMemoryCopy = static_cast<uint8*>(Memalign(kDesc.ByteWidth, MIN_MAPPED_RESOURCE_ALIGNMENT));
-        }
-
-        if (spBuffer->m_pSystemMemoryCopy != NULL && pInitialData != NULL)
-        {
-            cryMemcpy(spBuffer->m_pSystemMemoryCopy, pInitialData->pSysMem, kDesc.ByteWidth);
-        }
-
-        return spBuffer;
-    }
-
-    template <typename ViewDesc, typename View>
-    struct SResourceViewBaseImpl
-    {
-        typedef ViewDesc TViewDesc;
-        typedef View TView;
-        typedef _smart_ptr<TView> TViewPtr;
-    };
-
-    struct SShaderResourceViewImpl
-        : SResourceViewBaseImpl<D3D11_SHADER_RESOURCE_VIEW_DESC, SShaderResourceView>
-    {
-        enum EViewDimension
-        {
-            DIMENSION_BUFFER           = D3D11_SRV_DIMENSION_BUFFER,
-            DIMENSION_TEXTURE1D        = D3D11_SRV_DIMENSION_TEXTURE1D,
-            DIMENSION_TEXTURE1DARRAY   = D3D11_SRV_DIMENSION_TEXTURE1DARRAY,
-            DIMENSION_TEXTURE2D        = D3D11_SRV_DIMENSION_TEXTURE2D,
-            DIMENSION_TEXTURE2DARRAY   = D3D11_SRV_DIMENSION_TEXTURE2DARRAY,
-            DIMENSION_TEXTURE2DMS      = D3D11_SRV_DIMENSION_TEXTURE2DMS,
-            DIMENSION_TEXTURE2DMSARRAY = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY,
-            DIMENSION_TEXTURE3D        = D3D11_SRV_DIMENSION_TEXTURE3D,
-            DIMENSION_TEXTURECUBE      = D3D11_SRV_DIMENSION_TEXTURECUBE,
-            DIMENSION_TEXTURECUBEARRAY = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY,
-            DIMENSION_BUFFEREX         = D3D11_SRV_DIMENSION_BUFFEREX
-        };
-
-        static SResourceViewBaseImpl::TViewPtr GetView(STexture* pTexture, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, uint32 uMinLevel, uint32 uNumLevels, uint32 uMinElement, uint32 uNumElements, CDevice* pDevice)
-        {
-            SShaderTextureViewConfiguration kConfiguration(GetGIFormat(eDXGIFormat), eViewType, uMinLevel, uNumLevels, uMinElement, uNumElements);
-
-            SShaderTextureView* pExistingView(pTexture->m_pShaderViewsHead);
-            while (pExistingView != NULL)
-            {
-                if (pExistingView->m_kConfiguration == kConfiguration)
-                {
-                    return pExistingView;
-                }
-                pExistingView = pExistingView->m_pNextView;
-            }
-
-            return pTexture->CreateShaderView(kConfiguration, pDevice);
-        }
-
-        static SResourceViewBaseImpl::TViewPtr GetBufferView(SBuffer* pBuffer, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, uint32 uMinLevel, uint32 uNumLevels, uint32 uMinElement, uint32 uNumElements, CDevice* pDevice)
-        {
-            SShaderBufferViewConfiguration kConfiguration(GetGIFormat(eDXGIFormat), eViewType, uMinLevel, uNumLevels, uMinElement, uNumElements);
-            return pBuffer->CreateShaderView(kConfiguration, pDevice);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewMip(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, uint32 uMinElement, uint32 uNumElements, CDevice* pDevice)
-        {
-            uint32 uNumMipLevels(kDimDesc.MipLevels == -1 ? (pTexture->m_uNumMipLevels - kDimDesc.MostDetailedMip) : kDimDesc.MipLevels);
-            return GetView(pTexture, eDXGIFormat, eViewType, kDimDesc.MostDetailedMip, uNumMipLevels, uMinElement, uNumElements, pDevice);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, uint32 uMinLevel, uint32 uNumLevels, MTLTextureType eViewType, CDevice* pDevice)
-        {
-            return GetView(pTexture, eDXGIFormat, eViewType, uMinLevel, uNumLevels, kDimDesc.FirstArraySlice, kDimDesc.ArraySize, pDevice);
-        }
-
-        template <typename DimDesc>
-        static TViewPtr GetViewMipLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, CDevice* pDevice)
-        {
-            return GetViewMip(pTexture, kDimDesc, eDXGIFormat, eViewType, kDimDesc.FirstArraySlice, kDimDesc.ArraySize, pDevice);
-        }
-    };
-
-    template <typename ViewDesc>
-    struct SOutputMergerViewImpl
-        : SResourceViewBaseImpl<ViewDesc, SOutputMergerView>
-    {
-        static typename SOutputMergerViewImpl::TViewPtr GetView(STexture* pTexture, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, uint32 uMipLevel, uint32, uint32 uMinElement, uint32 uNumElements, CDevice* pDevice)
-        {
-            return pTexture->GetCompatibleOutputMergerView(SOutputMergerTextureViewConfiguration(GetGIFormat(eDXGIFormat), uMipLevel, uMinElement, uNumElements), pDevice);
-        }
-        static typename SOutputMergerViewImpl::TViewPtr GetBufferView(SBuffer* pBuffer, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, uint32 uMinLevel, uint32 uNumLevels, uint32 uMinElement, uint32 uNumElements, CDevice* pDevice)
-        {
-            //not implemented
-            CRY_ASSERT(0);
-            return NULL;
-        }
-        template <typename DimDesc>
-        static typename SOutputMergerViewImpl::TViewPtr GetViewMip(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, uint32 uMinElement, uint32 uNumElements, CDevice* pDevice)
-        {
-            return GetView(pTexture, eDXGIFormat, eViewType, kDimDesc.MipSlice, 1, uMinElement, uNumElements, pDevice);
-        }
-
-        template <typename DimDesc>
-        static typename SOutputMergerViewImpl::TViewPtr GetViewLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, uint32 uMinLevel, uint32 uNumLevels, CDevice* pDevice)
-        {
-            return GetView(pTexture, eDXGIFormat, eViewType, uMinLevel, uNumLevels, kDimDesc.FirstArraySlice, kDimDesc.ArraySize, pDevice);
-        }
-
-        template <typename DimDesc>
-        static typename SOutputMergerViewImpl::TViewPtr GetViewMipLayers(STexture* pTexture, const DimDesc& kDimDesc, DXGI_FORMAT eDXGIFormat, MTLTextureType eViewType, CDevice* pDevice)
-        {
-            return GetViewMip(pTexture, kDimDesc, eDXGIFormat, eViewType, kDimDesc.FirstArraySlice, kDimDesc.ArraySize, pDevice);
-        }
-    };
-
-    struct SRenderTargetViewImpl
-        : SOutputMergerViewImpl<D3D11_RENDER_TARGET_VIEW_DESC>
-    {
-        enum EViewDimension
-        {
-            DIMENSION_BUFFER           = D3D11_RTV_DIMENSION_BUFFER,
-            DIMENSION_TEXTURE1D        = D3D11_RTV_DIMENSION_TEXTURE1D,
-            DIMENSION_TEXTURE1DARRAY   = D3D11_RTV_DIMENSION_TEXTURE1DARRAY,
-            DIMENSION_TEXTURE2D        = D3D11_RTV_DIMENSION_TEXTURE2D,
-            DIMENSION_TEXTURE2DARRAY   = D3D11_RTV_DIMENSION_TEXTURE2DARRAY,
-            DIMENSION_TEXTURE2DMS      = D3D11_RTV_DIMENSION_TEXTURE2DMS,
-            DIMENSION_TEXTURE2DMSARRAY = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY,
-            DIMENSION_TEXTURE3D        = D3D11_RTV_DIMENSION_TEXTURE3D
-        };
-    };
-
-    struct SDepthStencilViewImpl
-        : SOutputMergerViewImpl<D3D11_DEPTH_STENCIL_VIEW_DESC>
-    {
-        enum EViewDimension
-        {
-            DIMENSION_TEXTURE1D        = D3D11_DSV_DIMENSION_TEXTURE1D,
-            DIMENSION_TEXTURE1DARRAY   = D3D11_DSV_DIMENSION_TEXTURE1DARRAY,
-            DIMENSION_TEXTURE2D        = D3D11_DSV_DIMENSION_TEXTURE2D,
-            DIMENSION_TEXTURE2DARRAY   = D3D11_DSV_DIMENSION_TEXTURE2DARRAY,
-            DIMENSION_TEXTURE2DMS      = D3D11_DSV_DIMENSION_TEXTURE2DMS,
-            DIMENSION_TEXTURE2DMSARRAY = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY,
-        };
-    };
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTexture1DView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CDevice* pDevice)
-    {
-        using ViewDimensionType = decltype(kViewDesc.ViewDimension);
-
-        switch (kViewDesc.ViewDimension)
-        {
-        case static_cast<ViewDimensionType>(Impl::DIMENSION_TEXTURE1D):
-            return Impl::GetViewMip(pTexture,       kViewDesc.Texture1D,      kViewDesc.Format, MTLTextureType1D,       0, 1, pDevice);
-        case static_cast<ViewDimensionType>(Impl::DIMENSION_TEXTURE1DARRAY):
-            return Impl::GetViewMipLayers(pTexture, kViewDesc.Texture1DArray, kViewDesc.Format, MTLTextureType1DArray,       pDevice);
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTexture2DView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CDevice* pDevice)
-    {
-        using ViewDimensionType = decltype(kViewDesc.ViewDimension);
-
-        switch (kViewDesc.ViewDimension)
-        {
-        case static_cast<ViewDimensionType>(Impl::DIMENSION_TEXTURE2D):
-            return Impl::GetViewMip(pTexture,       kViewDesc.Texture2D,        kViewDesc.Format, MTLTextureType2D,                   0, 1,       pDevice);
-        case static_cast<ViewDimensionType>(Impl::DIMENSION_TEXTURE2DARRAY):
-            return Impl::GetViewMipLayers(pTexture, kViewDesc.Texture2DArray,   kViewDesc.Format, MTLTextureType2DArray,                         pDevice);
-#if DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-        case static_cast<ViewDimensionType>(Impl::DIMENSION_TEXTURE2DMS):
-            return Impl::GetView(pTexture,                                      kViewDesc.Format, GL_TEXTURE_2D_MULTISAMPLE,       0, 1, 0, 1, pDevice);
-#endif //DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTextureCubeView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CDevice* pDevice)
-    {
-        using ViewDimensionType = decltype(kViewDesc.ViewDimension);
-
-        switch (kViewDesc.ViewDimension)
-        {
-        case static_cast<ViewDimensionType>(D3D11_SRV_DIMENSION_TEXTURECUBE):
-            DXGL_TODO("Check if 6 is correct");
-            return Impl::GetViewMip(pTexture, kViewDesc.TextureCube, kViewDesc.Format, MTLTextureTypeCube, 0, 6, pDevice);
-        }
-        return NULL;
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetTexture3DView(STexture* pTexture, const typename Impl::TViewDesc& kViewDesc, CDevice* pDevice)
-    {
-        if ((uint32)kViewDesc.ViewDimension == (uint32)Impl::DIMENSION_TEXTURE3D)
-        {
-            return Impl::GetViewMip(pTexture, kViewDesc.Texture3D, kViewDesc.Format, MTLTextureType3D, 0, 1, pDevice);
-        }
-        return NULL;
-    }
-
-    SShaderResourceViewImpl a;
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    template <>
-    SRenderTargetViewImpl::TViewPtr GetTexture3DView<SRenderTargetViewImpl>(STexture* pTexture, const SRenderTargetViewImpl::TViewDesc& kViewDesc, CDevice* pDevice)
-    {
-        //  DX11 does not support the array 3D texture rendering so route 3D slice down as the arraiy slice
-        //  iOS does not support rendering into the multiple slices at the same time, so the check is performed later in
-        //  the pipeline.
-
-        //  Igor: double check the following code when we meet this firts. This wasn't used hence wasn't tested.
-        DXGL_NOT_IMPLEMENTED;
-
-        //  Confetti End: Igor Lobanchikov
-        if ((uint32)kViewDesc.ViewDimension == (uint32)SRenderTargetViewImpl::DIMENSION_TEXTURE3D)
-        {
-            return SRenderTargetViewImpl::GetViewMip(pTexture, kViewDesc.Texture3D, kViewDesc.Format, MTLTextureType3D,
-                kViewDesc.Texture3D.FirstWSlice, kViewDesc.Texture3D.WSize, pDevice);
-        }
-        return NULL;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetBufferView(SBuffer* pBuffer, const typename Impl::TViewDesc& kViewDesc, CDevice* pDevice)
-    {
-        return Impl::GetBufferView(pBuffer, kViewDesc.Format, MTLTextureType1D, 1, 1, 0, 1, pDevice);
-    }
-
-    template <typename Impl>
-    typename Impl::TViewPtr GetBufferViewEx(SBuffer* pBuffer, const typename Impl::TViewDesc& kViewDesc, CDevice* pDevice)
-    {
-        DXMETAL_NOT_IMPLEMENTED
-            CryLog("TODO: GetBufferViewEX");
-        return NULL;
-    }
-
-    SShaderResourceViewPtr CreateShaderResourceView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_SHADER_RESOURCE_VIEW_DESC& kViewDesc, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateShaderResourceView")
-
-        typedef SShaderResourceViewImpl TImpl;
-        SShaderResourceViewPtr spView;
-        switch (eDimension)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-            spView =   GetTexture1DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-            spView =   GetTexture2DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-            if (spView == NULL)
-            {
-                spView = GetTextureCubeView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-            }
-            break;
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            spView =   GetTexture3DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-            break;
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            spView =   GetBufferView<TImpl>(static_cast<SBuffer*>(pResource), kViewDesc, pDevice);
-            if (spView == NULL)
-            {
-                spView = GetBufferViewEx<TImpl>(static_cast<SBuffer*>(pResource), kViewDesc, pDevice);
-            }
-            break;
-        default:
-            DXGL_ERROR("Invalid resource dimension for shader resource");
-            return NULL;
-        }
-
-        if (spView == NULL)
-        {
-            DXGL_ERROR("Invalid shader resource view paramters");
-        }
-        return spView;
-    }
-
-    SOutputMergerViewPtr CreateRenderTargetView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_RENDER_TARGET_VIEW_DESC& kViewDesc, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateRenderTargetView")
-
-        typedef SRenderTargetViewImpl TImpl;
-        switch (eDimension)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-            return GetTexture1DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-            return GetTexture2DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            return GetTexture3DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            return GetBufferView<TImpl>(static_cast<SBuffer*>(pResource), kViewDesc, pDevice);
-        }
-        DXGL_ERROR("Invalid resource dimension for render target");
-        return NULL;
-    }
-
-    SOutputMergerViewPtr CreateDepthStencilView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_DEPTH_STENCIL_VIEW_DESC& kViewDesc, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateDepthStencilView")
-
-        typedef SDepthStencilViewImpl TImpl;
-        switch (eDimension)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-            return GetTexture1DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-            return GetTexture2DView<TImpl>(static_cast<STexture*>(pResource), kViewDesc, pDevice);
-        }
-        DXGL_ERROR("Invalid resource dimension for render target");
-        return NULL;
-    }
-
-    SQueryPtr CreateQuery(const D3D11_QUERY_DESC& kDesc, CDevice* pDevice /*CContext* pContext*/)
-    {
-        DXGL_SCOPED_PROFILE("CreateQuery")
-
-        SQueryPtr spQuery(NULL);
-        switch (kDesc.Query)
-        {
-        case D3D11_QUERY_OCCLUSION:
-        {
-            SOcclusionQuery* pOcclusionQuery(new SOcclusionQuery());
-            spQuery = pOcclusionQuery;
-        }
-        break;
-        case D3D11_QUERY_EVENT:
-            spQuery = new SFenceSync();
-            break;
-        case D3D11_QUERY_TIMESTAMP:
-        case D3D11_QUERY_TIMESTAMP_DISJOINT:
-        case D3D11_QUERY_PIPELINE_STATISTICS:
-        case D3D11_QUERY_OCCLUSION_PREDICATE:
-        case D3D11_QUERY_SO_STATISTICS:
-        case D3D11_QUERY_SO_OVERFLOW_PREDICATE:
-        case D3D11_QUERY_SO_STATISTICS_STREAM0:
-        case D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0:
-        case D3D11_QUERY_SO_STATISTICS_STREAM1:
-        case D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1:
-        case D3D11_QUERY_SO_STATISTICS_STREAM2:
-        case D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2:
-        case D3D11_QUERY_SO_STATISTICS_STREAM3:
-        case D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3:
-            DXGL_NOT_IMPLEMENTED
-            break;
-        }
-
-        return spQuery;
-    }
-
-    SDefaultFrameBufferTexturePtr CreateBackBufferTexture(const D3D11_TEXTURE2D_DESC& kDesc)
-    {
-        DXGL_SCOPED_PROFILE("CreateBackBufferTexture")
-
-        EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        if (eGIFormat == eGIF_NUM)
-        {
-            return NULL;
-        }
-
-        return new SDefaultFrameBufferTexture(kDesc.Width, kDesc.Height, eGIFormat);
-    }
-
-    typedef void (* CopyTextureBoxFunc)(STexture*, STexPos, STexSubresourceID, STexture*, STexPos, STexSubresourceID, STexSize, CContext*);
-
-    void CopySystemTextureBox(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        UINT uDstSubresource(D3D11CalcSubresource(kDstSubID.m_iMipLevel, kDstSubID.m_uElement, pDstTexture->m_uNumMipLevels));
-        UINT uSrcSubresource(D3D11CalcSubresource(kSrcSubID.m_iMipLevel, kSrcSubID.m_uElement, pSrcTexture->m_uNumMipLevels));
-
-        D3D11_BOX kDstBox;
-        kDstBox.left    = kDstPos.x;
-        kDstBox.top     = kDstPos.y;
-        kDstBox.front   = kDstPos.z;
-        kDstBox.right   = kDstPos.x + kBoxSize.x;
-        kDstBox.bottom  = kDstPos.y + kBoxSize.y;
-        kDstBox.back    = kDstPos.z + kBoxSize.z;
-
-        D3D11_MAPPED_SUBRESOURCE kSrcMapped;
-        pSrcTexture->m_pfMapSubresource(pSrcTexture, uSrcSubresource, D3D11_MAP_READ, 0, &kSrcMapped, pContext);
-        pDstTexture->m_pfUpdateSubresource(pDstTexture, uDstSubresource, &kDstBox, kSrcMapped.pData, kSrcMapped.RowPitch, kSrcMapped.DepthPitch, pContext);
-        pSrcTexture->m_pfUnmapSubresource(pSrcTexture, uSrcSubresource, pContext);
-    }
-
-    void CopyTextureWithBlitCommandEncoder(
-        STexture* pDstTexture, STexPos kDstPos, STexSubresourceID kDstSubID,
-        STexture* pSrcTexture, STexPos kSrcPos, STexSubresourceID kSrcSubID,
-        STexSize kBoxSize, CContext* pContext)
-    {
-        MTLOrigin sourceOrigin = MTLOriginMake(kSrcPos.x, kSrcPos.y, kSrcPos.z);
-        MTLSize sourceSize = MTLSizeMake(kBoxSize.x, kBoxSize.y, kBoxSize.z);
-        MTLOrigin destinationOrigin = {static_cast<NSUInteger>(kDstPos.x),
-                                       static_cast<NSUInteger>(kDstPos.y),
-                                       static_cast<NSUInteger>(kDstPos.z)};
-
-        id<MTLBlitCommandEncoder> blitCommandEncoder = pContext->GetBlitCommandEncoder();
-        [blitCommandEncoder copyFromTexture: pSrcTexture->m_Texture
-                                sourceSlice: kSrcSubID.m_uElement
-                                sourceLevel: kSrcSubID.m_iMipLevel
-                               sourceOrigin: sourceOrigin
-                                 sourceSize: sourceSize
-                                  toTexture: pDstTexture->m_Texture
-                           destinationSlice: kDstSubID.m_uElement
-                           destinationLevel: kDstSubID.m_iMipLevel
-                          destinationOrigin: destinationOrigin];
-        
-#if defined AZ_PLATFORM_MAC
-        if (pDstTexture->m_Texture.storageMode == MTLStorageModeManaged)
-        {
-            // Need to synchronize the CPU/GPU versions of the texture if it is
-            // in manged storage mode otherwise the CPU may not see any of the
-            // writes the GPU does to the texture
-            [blitCommandEncoder synchronizeTexture: pDstTexture->m_Texture
-                                             slice: kDstSubID.m_uElement
-                                             level: kDstSubID.m_iMipLevel];
-        }
-#endif
-    }
-
-    template <CopyTextureBoxFunc pfCopyTextureBox>
-    void CopyTextureImpl(STexture* pDstTexture, STexture* pSrcTexture, CContext* pContext)
-    {
-        DXGL_TODO("Check if there's a better way to do this");
-        STexSubresourceID kSubID;
-        for (kSubID.m_iMipLevel = 0; kSubID.m_iMipLevel < (GLint)pDstTexture->m_uNumMipLevels; ++kSubID.m_iMipLevel)
-        {
-            STexBox kBox;
-            GetTextureBox(kBox, pDstTexture, kSubID.m_iMipLevel, GetGIFormatInfo(pDstTexture->m_eFormat), true);
-
-            for (kSubID.m_uElement = 0; kSubID.m_uElement < pDstTexture->m_uNumElements; ++kSubID.m_uElement)
-            {
-                pfCopyTextureBox(
-                    pDstTexture, kBox.m_kOffset, kSubID,
-                    pSrcTexture, kBox.m_kOffset, kSubID,
-                    kBox.m_kSize, pContext);
-            }
-        }
-    }
-
-    void CopyTexture(STexture* pDstTexture, STexture* pSrcTexture, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopyTexture")
-
-        if (pSrcTexture->m_uNumMipLevels    != pDstTexture->m_uNumMipLevels ||
-            pSrcTexture->m_uNumElements     != pDstTexture->m_uNumElements ||
-            pSrcTexture->m_iWidth           != pDstTexture->m_iWidth ||
-            pSrcTexture->m_iHeight          != pDstTexture->m_iHeight ||
-            pSrcTexture->m_iDepth           != pDstTexture->m_iDepth)
-        {
-            DXGL_ERROR("Source and destination textures to copy don't match");
-            return;
-        }
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        CopyTextureImpl<CopyTextureWithBlitCommandEncoder>(pDstTexture, pSrcTexture, pContext);
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    template <CopyTextureBoxFunc pfCopyTextureBox>
-    void CopySubTextureImpl(
-        STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ,
-        STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext)
-    {
-        STexSubresourceID kDstSubID;
-        kDstSubID.m_iMipLevel = uDstSubresource % pDstTexture->m_uNumMipLevels;
-        kDstSubID.m_uElement  = uDstSubresource / pDstTexture->m_uNumMipLevels;
-
-        STexSubresourceID kSrcSubID;
-        kSrcSubID.m_iMipLevel = uSrcSubresource % pSrcTexture->m_uNumMipLevels;
-        kSrcSubID.m_uElement  = uSrcSubresource / pSrcTexture->m_uNumMipLevels;
-
-        STexBox kSrcBox;
-        GetTextureBox(kSrcBox, pSrcTexture, kSrcSubID.m_iMipLevel, pSrcBox, GetGIFormatInfo(pSrcTexture->m_eFormat), true);
-
-        STexPos kDstPos(uDstX, uDstY, uDstZ);
-
-        pfCopyTextureBox(
-            pDstTexture, kDstPos, kDstSubID,
-            pSrcTexture, kSrcBox.m_kOffset, kSrcSubID,
-            kSrcBox.m_kSize, pContext);
-    }
-
-    void CopySubTexture(
-        STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ,
-        STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopySubTexture")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        assert(pDstTexture->m_Texture);
-        assert(pSrcTexture->m_Texture);
-
-        if (pDstTexture->m_eFormat != pSrcTexture->m_eFormat)
-        {
-            pContext->TrySlowCopySubresource(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox);
-            return;
-        }
-
-        CopySubTextureImpl<CopyTextureWithBlitCommandEncoder>(pDstTexture, uDstSubresource, uDstX, uDstY, uDstZ, pSrcTexture, uSrcSubresource, pSrcBox, pContext);
-    }
-
-    void CopySubBufferInternal(SBuffer* pDstBuffer, SBuffer* pSrcBuffer, uint32 uDstOffset, uint32 uSrcOffset, uint32 uSize, CContext* pContext)
-    {
-        if (pSrcBuffer->m_pSystemMemoryCopy != NULL && pDstBuffer->m_pSystemMemoryCopy != NULL)
-        {
-            cryMemcpy(pDstBuffer->m_pSystemMemoryCopy + uDstOffset, pSrcBuffer->m_pSystemMemoryCopy + uSrcOffset, uSize);
-        }
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        assert(pDstBuffer->m_BufferShared);
-        //    assert(pSrcBuffer->m_Buffer);
-        size_t ringBufferOffsetOut = 0;
-        MemRingBufferStorage memAllocMode = GetMemAllocModeBasedOnSize(uSize);
-        id<MTLBuffer> tmpBuffer = pSrcBuffer->m_BufferShared;
-
-        if (!tmpBuffer)
-        {
-            assert(pSrcBuffer->m_pSystemMemoryCopy);
-            tmpBuffer = pContext->GetRingBuffer(memAllocMode);
-            void* pTempData = pContext->AllocateMemoryInRingBuffer(uSize, memAllocMode, ringBufferOffsetOut);
-            size_t tmpOffset = (uint8*)pTempData - (uint8*)tmpBuffer.contents;
-
-            cryMemcpy(pTempData, pSrcBuffer->m_pSystemMemoryCopy + uSrcOffset, uSize);
-
-            uSrcOffset = tmpOffset;
-        }
-
-        id<MTLBlitCommandEncoder> blitCommandEncoder = pContext->GetBlitCommandEncoder();
-        [blitCommandEncoder copyFromBuffer: tmpBuffer sourceOffset: uSrcOffset toBuffer: pDstBuffer->m_BufferShared destinationOffset: uDstOffset size: uSize];
-
-
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CopyBuffer(SBuffer* pDstBuffer, SBuffer* pSrcBuffer, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopyBuffer")
-
-        if (pSrcBuffer->m_uSize != pDstBuffer->m_uSize)
-        {
-            DXGL_ERROR("Source and destination buffers to copy don't match");
-            return;
-        }
-
-        CopySubBufferInternal(pDstBuffer, pSrcBuffer, 0, 0, pSrcBuffer->m_uSize, pContext);
-    }
-
-    void CopySubBuffer(
-        SBuffer* pDstBuffer, uint32 uDstSubresource, uint32 uDstX, uint32, uint32,
-        SBuffer* pSrcBuffer, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext)
-    {
-        DXGL_SCOPED_PROFILE("CopySubBuffer")
-
-        uint32 uSrcBegin, uSrcEnd;
-        if (pSrcBox != NULL)
-        {
-            uSrcBegin = pSrcBox->left;
-            uSrcEnd   = pSrcBox->right;
-        }
-        else
-        {
-            uSrcBegin = 0;
-            uSrcEnd   = pSrcBuffer->m_uSize;
-        }
-        uint32 uSize(uSrcEnd - uSrcBegin);
-
-        if (uSrcBegin > pSrcBuffer->m_uSize ||
-            uSrcEnd > pSrcBuffer->m_uSize ||
-            uDstX + uSize > pDstBuffer->m_uSize)
-        {
-            DXGL_ERROR("Source or destination range out of bounds");
-            return;
-        }
-
-        if (pDstBuffer != pSrcBuffer)
-        {
-            CopySubBufferInternal(pDstBuffer, pSrcBuffer, uDstX, uSrcBegin, uSize, pContext);
-        }
-        else
-        {
-            //  Igor: check if this works as expected once triggered.
-            assert(!"Not tested");
-            //  Igor: don't want to copy
-            if (uDstX == uSrcBegin)
-            {
-                return;
-            }
-            //  copy forward
-            else if (uSrcBegin > uDstX && uSrcBegin < uDstX + uSize)
-            {
-                uint32 chunkSize = uSrcBegin - uDstX;
-                while (uSize)
-                {
-                    chunkSize = min(chunkSize, uSize);
-                    CopySubBufferInternal(pDstBuffer, pSrcBuffer, uDstX, uSrcBegin, chunkSize, pContext);
-                    pDstBuffer += chunkSize;
-                    pSrcBuffer += chunkSize;
-                    uSize -= chunkSize;
-                }
-            }
-            //  copy backward
-            else if (uDstX > uSrcBegin && uDstX < uSrcBegin + uSize)
-            {
-                uint32 chunkSize = uDstX - uSrcBegin;
-                uDstX = uSrcBegin + uSize;
-                uSrcBegin = uDstX - chunkSize;
-                while (uSize)
-                {
-                    chunkSize = min(chunkSize, uSize);
-                    CopySubBufferInternal(pDstBuffer, pSrcBuffer, uDstX, uSrcBegin, chunkSize, pContext);
-                    pDstBuffer -= chunkSize;
-                    pSrcBuffer -= chunkSize;
-                    uSize -= chunkSize;
-                }
-            }
-            //  default behaviour
-            else
-            {
-                CopySubBufferInternal(pDstBuffer, pSrcBuffer, uDstX, uSrcBegin, uSize, pContext);
-            }
-        }
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLResource.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLResource.hpp
deleted file mode 100644
index 75b624895d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLResource.hpp
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the resource types and related functions
-
-#ifndef __GLRESOURCE__
-#define __GLRESOURCE__
-
-#include "GLCommon.hpp"
-#include "GLFormat.hpp"
-
-//  Confetti BEGIN: Igor Lobanchikov
-//@protocol MTLTexture;
-@protocol MTLBuffer;
-
-#import "Metal/MTLTexture.h"
-#import "Metal/MTLRenderPass.h"
-//  Confetti End: Igor Lobanchikov
-
-namespace NCryMetal
-{
-    class CDevice;
-    class CContext;
-    struct SSamplerState;
-    struct SInputAssemblerSlot;
-
-    DXGL_DECLARE_PTR(struct, SOutputMergerView);
-    DXGL_DECLARE_PTR(struct, SOutputMergerTextureView);
-    DXGL_DECLARE_PTR(struct, STexture);
-    DXGL_DECLARE_PTR(struct, SShaderResourceView);
-    DXGL_DECLARE_PTR(struct, SShaderTextureView);
-    DXGL_DECLARE_PTR(struct, SShaderBufferView);
-    DXGL_DECLARE_PTR(struct, SDefaultOuputMergerTextureView);
-    DXGL_DECLARE_PTR(struct, SDefaultFrameBufferTexture);
-    DXGL_DECLARE_PTR(struct, SBuffer);
-    DXGL_DECLARE_PTR(struct, SQuery);
-
-    DXGL_DECLARE_REF_COUNTED(struct, SResource)
-    {
-        typedef void (* UpdateSubresourceFunc) (SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext);
-        typedef bool (* MapSubresourceFunc) (SResource* pResource, uint32 uSubresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext);
-        typedef void (* UnmapSubresourceFunc) (SResource* pResource, uint32 uSubresource, CContext* pContext);
-
-        UpdateSubresourceFunc m_pfUpdateSubresource;
-        MapSubresourceFunc m_pfMapSubresource;
-        UnmapSubresourceFunc m_pfUnmapSubresource;
-
-        SResource();
-        SResource(const SResource&kOther);
-
-        virtual ~SResource();
-    };
-
-    struct SMappedSubTexture
-    {
-        uint8* m_pBuffer;
-        uint32 m_uDataOffset;
-        bool m_bUpload;
-        uint32 m_uRowPitch;
-        uint32 m_uImagePitch;
-
-        SMappedSubTexture()
-            : m_pBuffer(NULL)
-        {
-        }
-    };
-
-    struct SShaderBufferViewConfiguration
-    {
-        EGIFormat m_eFormat;
-        MTLTextureType  m_eViewType;
-        uint32 m_uMinMipLevel;
-        uint32 m_uNumMipLevels;
-        uint32 m_uMinLayer;
-        uint32 m_uNumLayers;
-
-        SShaderBufferViewConfiguration(EGIFormat eFormat, MTLTextureType eViewType, uint32 uMinMipLevel, uint32 uNumMipLevels, uint32 uMinLayer, uint32 uNumLayers)
-            : m_eFormat(eFormat)
-            , m_eViewType(eViewType)
-            , m_uMinMipLevel(uMinMipLevel)
-            , m_uNumMipLevels(uNumMipLevels)
-            , m_uMinLayer(uMinLayer)
-            , m_uNumLayers(uNumLayers)
-        {
-        }
-
-        bool operator==(const SShaderBufferViewConfiguration& kOther)
-        {
-            return
-                m_eFormat == kOther.m_eFormat &&
-                m_eViewType == kOther.m_eViewType &&
-                m_uMinMipLevel == kOther.m_uMinMipLevel &&
-                m_uNumMipLevels == kOther.m_uNumMipLevels &&
-                m_uMinLayer == kOther.m_uMinLayer &&
-                m_uNumLayers == kOther.m_uNumLayers;
-        }
-    };
-
-    struct SShaderTextureViewConfiguration
-    {
-        EGIFormat m_eFormat;
-        MTLTextureType  m_eViewType;
-        uint32 m_uMinMipLevel;
-        uint32 m_uNumMipLevels;
-        uint32 m_uMinLayer;
-        uint32 m_uNumLayers;
-
-        SShaderTextureViewConfiguration(EGIFormat eFormat, MTLTextureType eViewType, uint32 uMinMipLevel, uint32 uNumMipLevels, uint32 uMinLayer, uint32 uNumLayers)
-            : m_eFormat(eFormat)
-            , m_eViewType(eViewType)
-            , m_uMinMipLevel(uMinMipLevel)
-            , m_uNumMipLevels(uNumMipLevels)
-            , m_uMinLayer(uMinLayer)
-            , m_uNumLayers(uNumLayers)
-        {
-        }
-
-        bool operator==(const SShaderTextureViewConfiguration& kOther)
-        {
-            return
-                m_eFormat == kOther.m_eFormat &&
-                m_eViewType == kOther.m_eViewType &&
-                m_uMinMipLevel == kOther.m_uMinMipLevel &&
-                m_uNumMipLevels == kOther.m_uNumMipLevels &&
-                m_uMinLayer == kOther.m_uMinLayer &&
-                m_uNumLayers == kOther.m_uNumLayers;
-        }
-    };
-
-    struct SOutputMergerTextureViewConfiguration
-    {
-        EGIFormat m_eFormat;
-        uint32 m_uMipLevel;
-        uint32 m_uMinLayer;
-        uint32 m_uNumLayers;
-
-        SOutputMergerTextureViewConfiguration(EGIFormat eFormat, uint32 uMipLevel, uint32 uMinLayer, uint32 uNumLayers)
-            : m_eFormat(eFormat)
-            , m_uMipLevel(uMipLevel)
-            , m_uMinLayer(uMinLayer)
-            , m_uNumLayers(uNumLayers)
-        {
-        }
-
-        bool operator==(const SOutputMergerTextureViewConfiguration& kOther)
-        {
-            return
-                m_eFormat == kOther.m_eFormat &&
-                m_uMipLevel == kOther.m_uMipLevel &&
-                m_uMinLayer == kOther.m_uMinLayer &&
-                m_uNumLayers == kOther.m_uNumLayers;
-        }
-    };
-
-    template <typename T>
-    struct STexVec
-    {
-        T x, y, z;
-
-        STexVec() {}
-        STexVec(T kX, T kY, T kZ)
-            : x(kX)
-            , y(kY)
-            , z(kZ) {}
-    };
-
-    typedef STexVec<int32> STexSize;
-    typedef STexVec<int32> STexPos;
-
-    struct STexSubresourceID
-    {
-        int32 m_iMipLevel;
-        uint32 m_uElement;
-    };
-
-    enum EBufferBinding
-    {
-        eBB_Array,
-        eBB_ElementArray,
-#if DXGL_SUPPORT_TEXTURE_BUFFERS
-        eBB_Texture,
-#endif //DXGL_SUPPORT_TEXTURE_BUFFERS
-        eBB_UniformBuffer,
-#if DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        eBB_ShaderStorage,
-#endif //DXGL_SUPPORT_SHADER_STORAGE_BLOCKS
-        eBB_NUM
-    };
-
-    struct STexture
-        : SResource
-    {
-        STexture(int32 iWidth, int32 iHeight, int32 iDepth, MTLTextureType eTextureType, EGIFormat eFormat, uint32 uNumMipLevels, uint32 uNumElements);
-        virtual ~STexture();
-
-        virtual SShaderTextureViewPtr CreateShaderView(const SShaderTextureViewConfiguration& kConfiguration, CDevice* pDevice);
-        virtual SOutputMergerTextureViewPtr CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CDevice* pDevice);
-        SOutputMergerTextureViewPtr GetCompatibleOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CDevice* pDevice);
-
-        void ResetDontCareActionFlags();
-
-        typedef std::vector<SMappedSubTexture> TMappedSubTextures;
-
-        int32 m_iWidth, m_iHeight, m_iDepth;
-        MTLTextureType  m_eTextureType;
-        EGIFormat m_eFormat;
-        uint32 m_uNumMipLevels;
-        uint32 m_uNumElements; // array_size * number_of_faces
-
-        TMappedSubTextures m_kMappedSubTextures;
-
-        SShaderTextureView* m_pShaderViewsHead;
-        SOutputMergerTextureView* m_pOutputMergerViewsHead;
-        SShaderResourceView* m_pBoundModifier; // NULL if no SRV for this texture has bound custom texture parameters
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        id<MTLTexture>                  m_Texture;
-        id<MTLTexture>                  m_StencilTexture;
-        double                          m_ClearColor[4];
-        _smart_ptr<SOutputMergerView>   m_spTextureViewToClear;
-        _smart_ptr<SOutputMergerView>   m_spStencilTextureViewToClear;
-        float                           m_fClearDepthValue;
-        bool                            m_bClearDepth;
-        bool                            m_bClearStencil;
-        uint8                           m_uClearStencilValue;
-
-        uint8*                          m_pMapMemoryCopy;
-
-        bool                            m_bBackBuffer;
-
-
-        bool m_bColorLoadDontCare;
-        bool m_bDepthLoadDontCare;
-        bool m_bStencilLoadDontCare;
-        bool m_bColorStoreDontCare;
-        bool m_bDepthStoreDontCare;
-        bool m_bStencilStoreDontCare;
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SShaderResourceView)
-    {
-        EGIFormat m_eFormat;
-
-        SShaderResourceView(EGIFormat eFormat);
-        virtual ~SShaderResourceView();
-
-        virtual bool GenerateMipmaps(CContext * pContext);
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        virtual id<MTLTexture>  GetMetalTexture() { CRY_ASSERT(0); return 0; }
-        //  Confetti End: Igor Lobanchikov
-        virtual id<MTLBuffer>   GetMetalBuffer() { CRY_ASSERT(0); return 0; }
-    };
-
-    struct SShaderTextureView
-        : SShaderResourceView
-    {
-        SShaderTextureView(STexture* pTexture, const SShaderTextureViewConfiguration& kConfiguration);
-        virtual ~SShaderTextureView();
-
-        bool Init(CDevice* pDevice);
-        bool CreateUniqueView(CDevice* pDevice);
-
-        virtual bool GenerateMipmaps(CContext* pContext);
-
-        STexture* m_pTexture;
-        SShaderTextureViewConfiguration m_kConfiguration;
-        SShaderTextureView* m_pNextView;
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        id<MTLTexture>  m_TextureView;
-        virtual id<MTLTexture>  GetMetalTexture() { return m_TextureView ? m_TextureView : m_pTexture->m_Texture; }
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SOutputMergerView)
-    {
-        SOutputMergerView(EGIFormat eFormat);
-        virtual ~SOutputMergerView();
-
-        EGIFormat m_eFormat;
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        virtual SOutputMergerTextureView* AsSOutputMergerTextureView() { return NULL; }
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    struct SOutputMergerTextureView
-        : SOutputMergerView
-    {
-        SOutputMergerTextureView(STexture* pTexture, const SOutputMergerTextureViewConfiguration& kConfiguration);
-        virtual ~SOutputMergerTextureView();
-
-        bool Init(CDevice* pDevice);
-
-        virtual bool CreateUniqueView(const SGIFormatInfo* pFormatInfo, CDevice* pDevice);
-
-        STexture* m_pTexture;
-        SOutputMergerTextureViewConfiguration m_kConfiguration;
-        SOutputMergerTextureView* m_pNextView;
-        int32 m_iMipLevel;
-        int32 m_iLayer; //INVALID_LAYER for all layers
-
-        static const int32 INVALID_LAYER;
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        id<MTLTexture>      m_RTView;
-        virtual SOutputMergerTextureView* AsSOutputMergerTextureView() { return this; }
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    enum EBufferUsage
-    {
-        eBU_Default,      //  Generic behaviour. Slow but safe. GPU is used to update the buffer content for dynamic buffers.
-        eBU_DirectAccess, //  Engine can accesse buffer content directly. Engine is responsible for all CPU-GPU syncronizations.
-        eBU_MapInRingBufferTTLFrame, //  Buffer content is mapped in the ring buffer. This allows to use buffer content during the frame it was mapped only. This is super fast and used for constant buffers
-
-        eBU_MapInRingBufferTTLOnce, //  Buffer holds a reference to the content of the last map in the ring buffer. This allows to use the buffer content once (or untill the next map). This is super fast and used for font rendering and other dynamically generated content
-    };
-
-    //The enums that define the type of memory storage
-    enum MemRingBufferStorage
-    {
-        MEM_SHARED_RINGBUFFER,  //This is CPU/GPU shared memory. Available to IOS and OSX.
-#if defined(AZ_PLATFORM_MAC)
-        MEM_MANAGED_RINGBUFFER,   //OSX supports Managed memory which is faster than shared memory because it creates a seprate copy on the GPU and uses didModifyRange to synchronise with CPU.
-#endif
-    };
-    
-    struct SBuffer
-        : SResource
-    {
-        typedef bool (* MapBufferRangeFunc) (SBuffer* pBuffer, size_t uOffset, size_t uSize, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext);
-
-        SBuffer();
-        virtual ~SBuffer();
-
-        MapBufferRangeFunc m_pfMapBufferRange;
-
-        SBitMask<eBB_NUM, SUnsafeBitMaskWord>::Type m_kBindings;
-        EBufferUsage m_eUsage;
-        uint32 m_uSize;
-        uint8* m_pSystemMemoryCopy;
-        bool m_bMapped;
-        size_t m_uMapOffset;
-        size_t m_uMapSize;
-
-        //  Confetti BEGIN: Igor Lobanchikov
-
-        id<MTLBuffer>   m_BufferShared;
-#if defined(AZ_PLATFORM_MAC)
-        id<MTLBuffer>   m_BufferManaged; //Pointer to the fast buffer
-#endif
-        void*           m_pMappedData;
-
-        /* If popTransientMappedDataQueue = true, function will pop front of
-         * m_pTransientMappedData so that next call to GetBufferAndOffset can
-         * calculate the correct offset for next transient buffer to be bound.
-         */
-        bool GetBufferAndOffset(CContext& context,
-            uint32 uInputBufferOffset,
-            uint32 uBaseOffset,
-            uint32 uBaseStride,
-            id<MTLBuffer>& buffer,
-            uint32& offset,
-            bool const popTransientMappedDataQueue = true);
-        //  Confetti END: Igor Lobanchikov
-
-        // Confetti BEGIN: David Srour
-        /* Some passes like forward decals will cause the engine to map/unbind the
-         * same dynamic transient buffer multiple times.
-         * We must keep a list of offsets to ensure they are calculated appropriately in
-         * CContext::FlushInputAssemblerState().
-         *
-         * NOTE: THE ENGINE MUST MAP/UNMAP BUFFERS IN BINDING ORDER!
-         * Member "m_pMappedData" should equal the last mapped buffer in m_pTransientMappedData.
-         *
-         */
-        std::deque<void*> m_pTransientMappedData; // FIFO order based on map/unmap
-        // Confetti END: David Srour
-        virtual SShaderBufferViewPtr CreateShaderView(const SShaderBufferViewConfiguration& kConfiguration, CDevice* pDevice);
-    };
-
-    struct SShaderBufferView
-        : SShaderResourceView
-    {
-        SShaderBufferView(SBuffer* pBuffer, const SShaderBufferViewConfiguration& kConfiguration);
-        virtual ~SShaderBufferView();
-
-        bool Init(CDevice* pDevice);
-
-        virtual bool GenerateMipmaps(CContext* pContext);
-
-        SBuffer* m_pBuffer;
-        SShaderBufferViewConfiguration m_kConfiguration;
-        //SShaderBufferView* m_pNextView;
-
-        id<MTLBuffer>  m_BufferView;
-        virtual id<MTLBuffer>  GetMetalBuffer();
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SQuery)
-    {
-        virtual ~SQuery();
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        virtual void Begin(CContext * pContext);
-        virtual void End(CContext * pContext);
-        //  Confetti End: Igor Lobanchikov
-
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush) = 0;
-        virtual uint32 GetDataSize();
-
-        virtual bool IsBufferSubmitted() = 0;
-    };
-
-    struct SPlainQuery
-        : SQuery
-    {
-        SPlainQuery();
-        virtual ~SPlainQuery();
-        //  Confetti BEGIN: Igor Lobanchikov
-        virtual void Begin(CContext* pContext);
-        virtual void End(CContext* pContext);
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    struct SContextEventHelper
-    {
-        volatile bool bCommandBufferPreSubmitted;
-        volatile bool bCommandBufferSubmitted;
-        volatile bool bTriggered;
-    };
-    //  Confetti End: Igor Lobanchikov
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    struct SOcclusionQuery
-        : SQuery
-    {
-        SOcclusionQuery();
-
-        virtual void Begin(CContext* pContext);
-        virtual void End(CContext* pContext);
-
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush);
-        virtual uint32 GetDataSize();
-
-        virtual bool IsBufferSubmitted() {CRY_ASSERT(m_pEventHelper); return m_pEventHelper->bCommandBufferSubmitted; }
-
-        SContextEventHelper* m_pEventHelper;
-        uint64* m_pQueryData;
-    };
-    //  Confetti End: Igor Lobanchikov
-
-    struct SFenceSync
-        : SQuery
-    {
-        SFenceSync();
-        virtual ~SFenceSync();
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        virtual void End(CContext* pContext);
-        //  Confetti End: Igor Lobanchikov
-        virtual bool GetData(void* pData, uint32 uDataSize, bool bFlush);
-        virtual uint32 GetDataSize();
-
-        virtual bool IsBufferSubmitted() {CRY_ASSERT(m_pEventHelper); return m_pEventHelper->bCommandBufferSubmitted; }
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        SContextEventHelper* m_pEventHelper;
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    struct SDefaultFrameBufferTexture
-        : STexture
-    {
-        SDefaultFrameBufferTexture(int32 iWidth, int32 iHeight, EGIFormat eFormat);
-
-        virtual SShaderTextureViewPtr CreateShaderView(const SShaderTextureViewConfiguration& kConfiguration, CDevice* pDevice);
-        virtual SOutputMergerTextureViewPtr CreateOutputMergerView(const SOutputMergerTextureViewConfiguration& kConfiguration, CDevice* pDevice);
-
-        static void UpdateSubresource(SResource* pResource, uint32 uSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, uint32 uSrcRowPitch, uint32 uSrcDepthPitch, CContext* pContext);
-        static bool MapSubresource(SResource* pResource, uint32 uSubresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource, CContext* pContext);
-        static void UnmapSubresource(SResource* pResource, uint32 uSubresource, CContext* pContext);
-    };
-
-    STexturePtr CreateTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/);
-    STexturePtr CreateTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/);
-    STexturePtr CreateTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/);
-    SBufferPtr CreateBuffer(const D3D11_BUFFER_DESC& kDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, CDevice* pDevice /*CContext* pContext*/);
-    SShaderResourceViewPtr CreateShaderResourceView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_SHADER_RESOURCE_VIEW_DESC& kViewDesc, CDevice* pDevice /*CContext* pContext*/);
-    SOutputMergerViewPtr CreateRenderTargetView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_RENDER_TARGET_VIEW_DESC& kViewDesc, CDevice* pDevice /*CContext* pContext*/);
-    SOutputMergerViewPtr CreateDepthStencilView(SResource* pResource, D3D11_RESOURCE_DIMENSION eDimension, const D3D11_DEPTH_STENCIL_VIEW_DESC& kViewDesc, CDevice* pDevice /*CContext* pContext*/);
-    SQueryPtr CreateQuery(const D3D11_QUERY_DESC& kDesc, CDevice* pDevice /*CContext* pContext*/);
-    SDefaultFrameBufferTexturePtr CreateBackBufferTexture(const D3D11_TEXTURE2D_DESC& kDesc);
-
-    void CopyTexture(STexture* pDstTexture, STexture* pSrcTexture, CContext* pContext);
-    void CopyBuffer(SBuffer* pDstBuffer, SBuffer* pSrcBuffer, CContext* pContext);
-    void CopySubTexture(STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ, STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext);
-    void CopySubBuffer(SBuffer* pDstBuffer, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ, SBuffer* pSrcBuffer, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, CContext* pContext);
-    
-    MemRingBufferStorage GetMemAllocModeBasedOnSize(const size_t size);
-    id<MTLBuffer> GetMtlBufferBasedOnSize(const SBuffer* pBuffer);
-
-}
-
-#endif //__GLRESOURCE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.cpp
deleted file mode 100644
index 2834559226..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.cpp
+++ /dev/null
@@ -1,1373 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Description : Implements the shader related functions
-
-#include "RenderDll_precompiled.h"
-#include "GLShader.hpp"
-#include "MetalDevice.hpp"
-#include "GLExtensions.hpp"
-
-//  Confetti BEGIN: Igor Lobanchikov
-#include "hlslcc.hpp"
-#include "hlslcc_bin.hpp"
-//  Confetti End: Igor Lobanchikov
-
-namespace NCryMetal
-{
-    SSource::SSource(const char* pData, uint32 uDataSize)
-        : m_uDataSize(uDataSize)
-        , m_pData(pData)
-    {
-    }
-
-    SSource::~SSource()
-    {
-    }
-
-    struct SDXBCInfo
-    {
-        uint32 m_uMajorVersion, m_uMinorVersion;
-    };
-
-    struct SDXBCParseContext
-        : SDXBCInputBuffer
-    {
-        SDXBCInfo* m_pInfo;
-
-        SDXBCParseContext(const uint8* pBegin, const uint8* pEnd, SDXBCInfo* pInfo)
-            : SDXBCInputBuffer(pBegin, pEnd)
-            , m_pInfo(pInfo)
-        {
-        }
-
-        SDXBCParseContext(const SDXBCParseContext& kOther, uint32 uOffset)
-            : SDXBCInputBuffer(kOther.m_pBegin + uOffset, kOther.m_pEnd)
-            , m_pInfo(kOther.m_pInfo)
-        {
-            m_pIter = m_pBegin;
-        }
-
-        bool ReadString(char* pBuffer, uint32 uBufSize)
-        {
-            uint32 uSize((uint32)strlen(alias_cast<const char*>(m_pIter)) + 1);
-            if (uSize > uBufSize)
-            {
-                return false;
-            }
-            return Read(pBuffer, uSize);
-        }
-    };
-
-    bool DXBCRetrieveInfo(SDXBCParseContext& kContext)
-    {
-        uint32 uNumChunks;
-        DXBCReadUint32(kContext, uNumChunks);
-
-        uint32 uChunk;
-        for (uChunk = 0; uChunk < uNumChunks; ++uChunk)
-        {
-            uint32 uChunkBegin;
-            DXBCReadUint32(kContext, uChunkBegin);
-
-            SDXBCParseContext kChunkHeaderContext(kContext, uChunkBegin);
-
-            uint32 uChunkFourCC, uChunkSize;
-            DXBCReadUint32(kChunkHeaderContext, uChunkFourCC);
-            DXBCReadUint32(kChunkHeaderContext, uChunkSize);
-
-            if (uChunkFourCC == FOURCC_SHDR || uChunkFourCC == FOURCC_SHEX)
-            {
-                uint32 uEncodedInfo;
-                DXBCReadUint32(kChunkHeaderContext, uEncodedInfo);
-
-                kContext.m_pInfo->m_uMajorVersion = (uEncodedInfo >> 4) & 0xF;
-                kContext.m_pInfo->m_uMinorVersion = uEncodedInfo        & 0xF;
-
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    SShaderSource::SShaderSource()
-    {
-    }
-
-    SShaderSource::~SShaderSource()
-    {
-        delete [] m_pData;
-    }
-
-    void SShaderSource::SetData(const char* pData, uint32 uDataSize)
-    {
-        delete [] m_pData;
-        if (uDataSize > 0)
-        {
-            char* pBuffer = new char[uDataSize];
-            memcpy(pBuffer, pData, uDataSize);
-            m_pData = pBuffer;
-        }
-        else
-        {
-            m_pData = NULL;
-        }
-        m_uDataSize = uDataSize;
-    }
-
-
-    SGLShader::SGLShader()
-    //  Confetti BEGIN: Igor Lobanchikov
-        : m_pFunction(0)
-        //  Confetti End: Igor Lobanchikov
-    {
-    }
-
-    SGLShader::~SGLShader()
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_pFunction)
-        {
-            [m_pFunction release];
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    SShader::SShader()
-    {
-    }
-
-    SShader::~SShader()
-    {
-        // All pipelines with this shader bound must be removed from the cache and deleted
-        TPipelines::const_iterator kPipelineIter(m_kBoundPipelines.begin());
-        const TPipelines::const_iterator kPipelineEnd(m_kBoundPipelines.end());
-        while (kPipelineIter != kPipelineEnd)
-        {
-            (*kPipelineIter)->m_pContext->RemovePipeline(*kPipelineIter, this);
-            ++kPipelineIter;
-        }
-    }
-
-    void SShader::AttachPipeline(SPipeline* pPipeline)
-    {
-        TPipelines::const_iterator kFound(std::find(m_kBoundPipelines.begin(), m_kBoundPipelines.end(), pPipeline));
-        if (kFound == m_kBoundPipelines.end())
-        {
-            m_kBoundPipelines.push_back(pPipeline);
-        }
-    }
-
-    void SShader::DetachPipeline(SPipeline* pPipeline)
-    {
-        TPipelines::iterator kFound(std::find(m_kBoundPipelines.begin(), m_kBoundPipelines.end(), pPipeline));
-        if (kFound != m_kBoundPipelines.end())
-        {
-            m_kBoundPipelines.erase(kFound);
-        }
-        else
-        {
-            DXGL_ERROR("Could not find the pipeline to be detached from the shader");
-        }
-    }
-
-    SPipeline::SPipeline(const SPipelineConfiguration& kConfiguration, CContext* pContext)
-        : m_kConfiguration(kConfiguration)
-        , m_pContext(pContext)
-        //  Confetti BEGIN: Igor Lobanchikov
-        , m_PipelineState(0)
-        //  Confetti End: Igor Lobanchikov
-    {
-    }
-
-    SPipeline::~SPipeline()
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_PipelineState)
-        {
-            [m_PipelineState release];
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    SInputLayout::SInputLayout()
-        : m_pVertexDescriptor([[MTLVertexDescriptor alloc] init])
-    {
-        ;
-    }
-
-    SInputLayout::~SInputLayout()
-    {
-        [(MTLVertexDescriptor*)m_pVertexDescriptor release];
-    }
-    SInputLayout::SInputLayout(const SInputLayout& other)
-    {
-        m_pVertexDescriptor = other.m_pVertexDescriptor;
-        [(MTLVertexDescriptor*)m_pVertexDescriptor retain];
-    }
-
-    SInputLayout& SInputLayout::operator=(const SInputLayout& other)
-    {
-        [(MTLVertexDescriptor*)m_pVertexDescriptor release];
-        m_pVertexDescriptor = other.m_pVertexDescriptor;
-        [(MTLVertexDescriptor*)m_pVertexDescriptor retain];
-
-        return *this;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    bool InitializeShaderReflectionVariable(SShaderReflectionVariable* pVariable, SDXBCParseContext* pContext)
-    {
-        uint32 uNamePos;
-        if (!DXBCReadUint32(*pContext, uNamePos) ||
-            !SDXBCParseContext(*pContext, uNamePos).ReadString(pVariable->m_acName, DXGL_ARRAY_SIZE(pVariable->m_acName)))
-        {
-            return false;
-        }
-
-        uint32 uPosType;
-        memset(&pVariable->m_kDesc, 0, sizeof(D3D11_SHADER_VARIABLE_DESC));
-        pVariable->m_kDesc.Name = pVariable->m_acName;
-        if (!DXBCReadUint32(*pContext, pVariable->m_kDesc.StartOffset) ||
-            !DXBCReadUint32(*pContext, pVariable->m_kDesc.Size) ||
-            !DXBCReadUint32(*pContext, pVariable->m_kDesc.uFlags) ||
-            !DXBCReadUint32(*pContext, uPosType))
-        {
-            return false;
-        }
-
-        {
-            SDXBCParseContext kTypeContext(*pContext);
-            memset(&pVariable->m_kType, 0, sizeof(D3D11_SHADER_TYPE_DESC));
-
-            if (!kTypeContext.SeekAbs(uPosType) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Class) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Type) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Rows) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Columns) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Elements) ||
-                !DXBCReadUint16(kTypeContext, pVariable->m_kType.Members) ||
-                !DXBCReadUint32(kTypeContext, pVariable->m_kType.Offset))
-            {
-                return false;
-            }
-            pVariable->m_kType.Name = NULL;
-        }
-
-        uint32 uPosDefaultValue;
-        if (!DXBCReadUint32(*pContext, uPosDefaultValue))
-        {
-            return false;
-        }
-        if (uPosDefaultValue != 0)
-        {
-            pVariable->m_kDefaultValue.resize(pVariable->m_kDesc.Size);
-            if (!pContext->Read(pVariable->m_kDefaultValue.data(), pVariable->m_kDesc.Size))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            pVariable->m_kDesc.DefaultValue = NULL;
-        }
-
-        if (pContext->m_pInfo->m_uMajorVersion >= 5)
-        {
-            if (!DXBCReadUint32(*pContext, pVariable->m_kDesc.StartTexture) ||
-                !DXBCReadUint32(*pContext, pVariable->m_kDesc.TextureSize) ||
-                !DXBCReadUint32(*pContext, pVariable->m_kDesc.StartSampler) ||
-                !DXBCReadUint32(*pContext, pVariable->m_kDesc.SamplerSize))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    bool InitializeShaderReflectionConstBuffer(SShaderReflectionConstBuffer* pConstBuffer, SDXBCParseContext* pContext)
-    {
-        uint32 uNamePos;
-        if (!DXBCReadUint32(*pContext, uNamePos) ||
-            !SDXBCParseContext(*pContext, uNamePos).ReadString(pConstBuffer->m_acName, DXGL_ARRAY_SIZE(pConstBuffer->m_acName)))
-        {
-            return false;
-        }
-
-        memset(&pConstBuffer->m_kDesc, 0, sizeof(pConstBuffer->m_kDesc));
-        pConstBuffer->m_kDesc.Name = pConstBuffer->m_acName;
-
-        uint32 uNumVariables, uPosVariables;
-        if (!DXBCReadUint32(*pContext, uNumVariables) ||
-            !DXBCReadUint32(*pContext, uPosVariables))
-        {
-            return false;
-        }
-        pConstBuffer->m_kDesc.Variables = uNumVariables;
-
-        SDXBCParseContext kVariablesContext(*pContext);
-        if (!kVariablesContext.SeekAbs(uPosVariables))
-        {
-            return false;
-        }
-        uint32 uVariable;
-        pConstBuffer->m_kVariables.resize(pConstBuffer->m_kDesc.Variables);
-        for (uVariable = 0; uVariable < pConstBuffer->m_kDesc.Variables; ++uVariable)
-        {
-            if (!InitializeShaderReflectionVariable(&pConstBuffer->m_kVariables.at(uVariable), &kVariablesContext))
-            {
-                return false;
-            }
-        }
-
-        if (!DXBCReadUint32(*pContext, pConstBuffer->m_kDesc.Size) ||
-            !DXBCReadUint32(*pContext, pConstBuffer->m_kDesc.uFlags) ||
-            !DXBCReadUint32(*pContext, pConstBuffer->m_kDesc.Type))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    bool InitializeShaderReflectionResource(SShaderReflectionResource* pParameter, SDXBCParseContext* pContext)
-    {
-        uint32 uNamePos;
-        if (!DXBCReadUint32(*pContext, uNamePos) ||
-            !SDXBCParseContext(*pContext, uNamePos).ReadString(pParameter->m_acName, DXGL_ARRAY_SIZE(pParameter->m_acName)))
-        {
-            return false;
-        }
-
-        memset(&pParameter->m_kDesc, 0, sizeof(pParameter->m_kDesc));
-
-        pParameter->m_kDesc.Name = pParameter->m_acName;
-        if (!DXBCReadUint32(*pContext, pParameter->m_kDesc.Type) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.ReturnType) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.Dimension) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.NumSamples) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.BindPoint) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.BindCount) ||
-            !DXBCReadUint32(*pContext, pParameter->m_kDesc.uFlags))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    bool InitializeShaderReflectionParameters(SShaderReflection::TParameters& kParameters, SDXBCParseContext* pContext, bool extended = false)
-    {
-        uint32 uNumElements, uVersion;
-        if (!DXBCReadUint32(*pContext, uNumElements) ||
-            !DXBCReadUint32(*pContext, uVersion))
-        {
-            return false;
-        }
-
-        if (uNumElements > 0)
-        {
-            uint32 uPrevNumElements(kParameters.size());
-            kParameters.resize(kParameters.size() + uNumElements);
-
-            uint32 uElement;
-            for (uElement = uPrevNumElements; uElement < kParameters.size(); ++uElement)
-            {
-                SShaderReflectionParameter& kParameter(kParameters.at(uElement));
-                
-                memset(&kParameter.m_kDesc, 0, sizeof(kParameter.m_kDesc));
-                
-                // Only for extended parameters fxc adds two extra pieces of information, the stream index and the minimum precision.
-                if (extended && !DXBCReadUint32(*pContext, kParameter.m_kDesc.Stream))
-                {
-                    return false;
-                }
-                
-                uint32 uSemNamePosition;
-                if (!DXBCReadUint32(*pContext, uSemNamePosition) ||
-                    !SDXBCParseContext(*pContext, uSemNamePosition).ReadString(kParameter.m_acSemanticName, DXGL_ARRAY_SIZE(kParameter.m_acSemanticName)))
-                {
-                    return false;
-                }
-                
-                kParameter.m_kDesc.SemanticName = kParameter.m_acSemanticName;
-                if (!DXBCReadUint32(*pContext, kParameter.m_kDesc.SemanticIndex) ||
-                    !DXBCReadUint32(*pContext, kParameter.m_kDesc.SystemValueType) ||
-                    !DXBCReadUint32(*pContext, kParameter.m_kDesc.ComponentType) ||
-                    !DXBCReadUint32(*pContext, kParameter.m_kDesc.Register) ||
-                    !DXBCReadUint8(*pContext, kParameter.m_kDesc.Mask) ||
-                    !DXBCReadUint8(*pContext, kParameter.m_kDesc.ReadWriteMask) ||
-                    !pContext->SeekRel(sizeof(uint16_t)) || // These two bytes are part of the mask but are not used, so we skip them.
-                    (extended && !DXBCReadUint32(*pContext, kParameter.m_kDesc.MinPrecision))) // Precision available only for extended parameters.
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    bool InitializeShaderReflection(SShaderReflection* pReflection, const void* pvData)
-    {
-        enum
-        {
-            SIZE_POSITION = 6
-        };
-
-        uint32 uSize(alias_cast<const uint32*>(pvData)[SIZE_POSITION]);
-
-
-
-        enum
-        {
-            CHUNKS_POSITION = sizeof(uint32) * 7
-        };
-        SDXBCInfo kInfo;
-        const uint8* puData(alias_cast<const uint8*>(pvData));
-        SDXBCParseContext kContext(puData, puData + uSize, &kInfo);
-
-        if (!kContext.SeekAbs(CHUNKS_POSITION))
-        {
-            return false;
-        }
-
-        {
-            SDXBCParseContext kParseContext(kContext);
-            if (!DXBCRetrieveInfo(kParseContext))
-            {
-                return false;
-            }
-        }
-        uint32 uNumChunks;
-        if (!DXBCReadUint32(kContext, uNumChunks))
-        {
-            return false;
-        }
-
-        uint32 uChunk;
-        for (uChunk = 0; uChunk < uNumChunks; ++uChunk)
-        {
-            uint32 uChunkBegin;
-            if (!DXBCReadUint32(kContext, uChunkBegin))
-            {
-                return false;
-            }
-
-            SDXBCParseContext kChunkHeaderContext(kContext, uChunkBegin);
-
-            uint32 uChunkFourCC, uChunkSize;
-            if (!DXBCReadUint32(kChunkHeaderContext, uChunkFourCC) ||
-                !DXBCReadUint32(kChunkHeaderContext, uChunkSize))
-            {
-                return false;
-            }
-
-            SDXBCParseContext kChunkContext(kChunkHeaderContext.m_pIter, kChunkHeaderContext.m_pEnd, &kInfo);
-            switch (uChunkFourCC)
-            {
-            case FOURCC_RDEF:
-            {
-                uint32 uNumConstBuffers, uPosConstBuffers, uNumResources, uPosResources;
-                if (!DXBCReadUint32(kChunkContext, uNumConstBuffers) ||
-                    !DXBCReadUint32(kChunkContext, uPosConstBuffers) ||
-                    !DXBCReadUint32(kChunkContext, uNumResources) ||
-                    !DXBCReadUint32(kChunkContext, uPosResources))
-                {
-                    return false;
-                }
-
-                SDXBCParseContext kConstBufferContext(kChunkContext);
-                if (!kConstBufferContext.SeekAbs(uPosConstBuffers))
-                {
-                    return false;
-                }
-                uint32 uConstBuffer;
-                uint32 uPrevNumConstBuffers(pReflection->m_kConstantBuffers.size());
-                pReflection->m_kConstantBuffers.resize(uNumConstBuffers);
-                for (uConstBuffer = uPrevNumConstBuffers; uConstBuffer < uNumConstBuffers; ++uConstBuffer)
-                {
-                    if (!InitializeShaderReflectionConstBuffer(&pReflection->m_kConstantBuffers.at(uConstBuffer), &kConstBufferContext))
-                    {
-                        return false;
-                    }
-                }
-
-                SDXBCParseContext kResourceContext(kChunkContext);
-                if (!kResourceContext.SeekAbs(uPosResources))
-                {
-                    return false;
-                }
-                uint32 uResource;
-                uint32 uPrevNumResources(pReflection->m_kResources.size());
-                pReflection->m_kResources.resize(uNumResources);
-                for (uResource = uPrevNumResources; uResource < uNumResources; ++uResource)
-                {
-                    if (!InitializeShaderReflectionResource(&pReflection->m_kResources.at(uResource), &kResourceContext))
-                    {
-                        return false;
-                    }
-                }
-            }
-            break;
-            case FOURCC_ISGN:
-            case FOURCC_ISG1:
-                if (!InitializeShaderReflectionParameters(pReflection->m_kInputs, &kChunkContext, uChunkFourCC == FOURCC_ISG1))
-                {
-                    return false;
-                }
-                break;
-            case FOURCC_OSGN:
-            case FOURCC_OSG1:
-                if (!InitializeShaderReflectionParameters(pReflection->m_kOutputs, &kChunkContext, uChunkFourCC == FOURCC_OSG1))
-                {
-                    return false;
-                }
-                break;
-            case FOURCC_PCSG:
-                if (!InitializeShaderReflectionParameters(pReflection->m_kPatchConstants, &kChunkContext))
-                {
-                    return false;
-                }
-                break;
-            case FOURCC_GLSL:
-                if (!DXBCReadUint32(kChunkContext, pReflection->m_uSamplerMapSize) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uImportsSize) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uExportsSize) ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uInputHash)   ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uUAVBindingAreaSize)   ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uThread_x)   ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uThread_y)   ||
-                    !DXBCReadUint32(kChunkContext, pReflection->m_uThread_z))
-                {
-                    return false;
-                }
-                pReflection->m_uSamplerMapOffset = (uint32)(kChunkContext.m_pIter - kContext.m_pBegin);
-                pReflection->m_uImportsOffset =
-                    pReflection->m_uSamplerMapOffset +
-                    pReflection->m_uSamplerMapSize * 2 * 4; // Each sampler is {uint32 uTexture; uint32 uSampler;}
-                pReflection->m_uExportsOffset =
-                    pReflection->m_uImportsOffset +
-                    pReflection->m_uImportsSize * 3 * 4; // Each import is  {uint32 uType; uint32 uID; uint32 uValue;}
-                pReflection->m_uUAVBindingAreaOffset =
-                    pReflection->m_uExportsOffset +
-                    pReflection->m_uExportsSize * 3 * 4; // Each export is  {uint32 uType; uint32 uID; uint32 uValue;}
-                pReflection->m_uGLSLSourceOffset =
-                    pReflection->m_uUAVBindingAreaOffset +
-                    pReflection->m_uUAVBindingAreaSize * 2 * 4; // Each export is  {uint32 uResource; uint32 uValue;}
-
-                break;
-            }
-        }
-
-        SDXBCParseContext kConstUAVAreaContext(kContext);
-        if (!kConstUAVAreaContext.SeekAbs(pReflection->m_uUAVBindingAreaOffset))
-        {
-            return false;
-        }
-        for (uint uResource = 0; uResource < pReflection->m_uUAVBindingAreaSize; uResource++)
-        {
-            uint32 uResourceIndex;
-            if (!DXBCReadUint32(kConstUAVAreaContext, uResourceIndex))
-            {
-                return false;
-            }
-            if (!DXBCReadUint32(kConstUAVAreaContext, pReflection->m_kResources.at(uResourceIndex).m_kDesc.UAVBindingArea))
-            {
-                return false;
-            }
-        }
-
-        memset(&pReflection->m_kDesc, 0, sizeof(D3D11_SHADER_DESC));
-        pReflection->m_kDesc.ConstantBuffers         = pReflection->m_kConstantBuffers.size();
-        pReflection->m_kDesc.BoundResources          = pReflection->m_kResources.size();
-        pReflection->m_kDesc.InputParameters         = pReflection->m_kInputs.size();
-        pReflection->m_kDesc.OutputParameters        = pReflection->m_kOutputs.size();
-        pReflection->m_kDesc.PatchConstantParameters = pReflection->m_kPatchConstants.size();
-
-        return true;
-    }
-
-    MTLLanguageVersion GetMetalLanguage()
-    {
-#if defined(AZ_COMPILER_CLANG) && AZ_COMPILER_CLANG >= 9    //@available was added in Xcode 9
-#if defined(__MAC_10_13) || defined(__IPHONE_11_0) || defined(__TVOS_11_0)
-        if(@available(macOS 10.13, iOS 11.0, tvOS 11.0, *))
-        {
-            return MTLLanguageVersion2_0;
-        }
-#endif
-        
-#if defined(__MAC_10_12) || defined(__IPHONE_10_0) || defined(__TVOS_10_0)
-        if (@available(macOS 10.12, iOS 10.0, tvOS 10.0, *))
-        {
-            return MTLLanguageVersion1_2;
-        }
-#endif
-        
-#if defined(__MAC_10_11) || defined(__IPHONE_9_0) || defined(__TVOS_9_0)
-        if(@available(macOS 10.11, iOS 9.0, tvOS 9.0, *))
-        {
-            
-            return MTLLanguageVersion1_1;
-        }
-#endif
-#else  // Xcode 8.
-        
-        // NSFoundationVersionNumber10_10_4 is to check for iOS 10.0+ and macOS 10.12+
-        if (floor(NSFoundationVersionNumber) < NSFoundationVersionNumber10_10_4)
-        {
-            return MTLLanguageVersion1_1;
-        }
-        else
-        {
-            return MTLLanguageVersion1_2;
-        }
- 
-#endif
-        return MTLLanguageVersion1_2;
-    }
-    
-    bool CompileShader(SShader* pShader, SSource* aSourceVersions, SGLShader* pGLShader, id<MTLDevice> mtlDevice)
-    {
-        
-        NSMutableString* source = [[NSMutableString alloc] initWithBytes:aSourceVersions->m_pData
-                                                     length:(aSourceVersions->m_uDataSize - 1)
-                                                   encoding:NSASCIIStringEncoding];
-
-        MTLCompileOptions* options = [MTLCompileOptions alloc];
-        options.fastMathEnabled = CRenderer::CV_r_MetalShadersFastMath ? YES : NO;
-        
-        MTLLanguageVersion metalLang = GetMetalLanguage();
-        if(metalLang == MTLLanguageVersion1_1)
-        {
-            //Our cross compiler doesnt have support for different mtllanguageversions. In order to ensure
-            //that the game runs on ios 9.0 we simply have language specific macros in the metal shader
-            //and inserting the define language MTLLanguageVersion1_1 to ensure correct code is used
-            [source insertString:@"#define MTLLanguage1_1\n" atIndex:0];
-        }
-        options.languageVersion = metalLang;
-        NSError* error = nil;
-
-        id<MTLLibrary> lib = [mtlDevice newLibraryWithSource:source
-                              options:options
-                              error:&error];
-        
-
-        LOG_METAL_SHADER_SOURCE(@ "%@", source);
-
-        if (error)
-        {
-            // Error code 4 is warning, but sometimes a 3 (compile error) is returned on warnings only.
-            // The documentation indicates that if the lib is nil there is a compile error, otherwise anything
-            // in the error is really a warning. Therefore, we check the lib instead of the error code
-            if (!lib)
-            {
-                LOG_METAL_SHADER_ERRORS(@ "%@", error);
-                assert(!"HLSLcc compiler should generate valid code.");
-            }
-            else
-            {
-                LOG_METAL_SHADER_WARNINGS(@ "%@", error);
-            }
-
-            //  Igor: error string is an autorelease object.
-            error = 0;
-        }
-
-        if (lib)
-        {
-            pGLShader->m_pFunction = [lib newFunctionWithName:@ "metalMain"];
-            [lib release];
-        }
-
-        [options release];
-        [source release];
-
-        if (!pGLShader->m_pFunction)
-        {
-            return false;
-        }
-
-        if (pGLShader->m_pFunction.functionType == MTLFunctionTypeVertex)
-        {
-            LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "%@", pGLShader->m_pFunction.vertexAttributes);
-        }
-
-        return true;
-        
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    void LogMTLArgument(MTLArgument* arg)
-    {
-#if DXMETAL_LOG_SHADER_REFLECTION_VALIDATION
-        NSLog(@ "Name: %@", arg.name);
-
-        NSLog(@ "\tActive: %@", arg.active ? @ "true" : @ "false");
-
-        switch (arg.type)
-        {
-        case MTLArgumentTypeBuffer:
-            NSLog(@ "\tType: %@", @ "MTLArgumentTypeBuffer");
-            break;
-
-        case MTLArgumentTypeThreadgroupMemory:
-            NSLog(@ "\tType: %@", @ "MTLArgumentTypeThreadgroupMemory");
-            break;
-
-        case MTLArgumentTypeTexture:
-            NSLog(@ "\tType: %@", @ "MTLArgumentTypeTexture");
-            break;
-
-        case MTLArgumentTypeSampler:
-            NSLog(@ "\tType: %@", @ "MTLArgumentTypeSampler");
-            break;
-        }
-
-        NSLog(@ "\tIndex: %lu", arg.index);
-
-        switch (arg.access)
-        {
-        case MTLArgumentAccessReadOnly:
-            NSLog(@ "\tAccess: %@", @ "MTLArgumentAccessReadOnly");
-            break;
-        case MTLArgumentAccessReadWrite:
-            NSLog(@ "\tAccess: %@", @ "MTLArgumentAccessReadWrite");
-            break;
-        case MTLArgumentAccessWriteOnly:
-            NSLog(@ "\tAccess: %@", @ "MTLArgumentAccessWriteOnly");
-            break;
-        }
-
-        if (arg.type == MTLArgumentTypeBuffer)
-        {
-            NSLog(@ "StructType: %@", arg.bufferStructType);
-        }
-#endif // DXMETAL_LOG_SHADER_REFLECTION_VALIDATION
-    }
-
-    MTLArgumentType DX11SITToMetal(D3D_SHADER_INPUT_TYPE dx11Type)
-    {
-        switch (dx11Type)
-        {
-        case D3D_SIT_CBUFFER:
-        case D3D_SIT_TBUFFER:
-            return MTLArgumentTypeBuffer;
-
-        case D3D_SIT_TEXTURE:
-            return MTLArgumentTypeTexture;
-
-        case D3D_SIT_SAMPLER:
-            return MTLArgumentTypeSampler;
-
-        case D3D_SIT_STRUCTURED:
-            return MTLArgumentTypeBuffer;
-        case D3D_SIT_UAV_RWTYPED:
-            return MTLArgumentTypeBuffer;
-        case D3D_SIT_UAV_RWSTRUCTURED:
-            return MTLArgumentTypeBuffer;
-        default:
-            assert(!"Not supported for this platform yet");
-            return (MTLArgumentType)99;
-        }
-
-        //MTLArgumentTypeThreadgroupMemory= 1,
-    }
-
-    bool ValidateBindPoint(MTLArgument* arg, SShaderReflection& cryReflection)
-    {
-        SShaderReflection::TResources kResources = cryReflection.m_kResources;
-
-        char acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-        strncpy(acName, [arg.name UTF8String], DXGL_MAX_REFLECT_STRING_LENGTH - 1);
-        acName[DXGL_MAX_REFLECT_STRING_LENGTH - 1] = 0;
-
-        if (strstr(acName, "vertexBuffer.") == acName)
-        {
-            LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "Resource %@ is attached via input assembler.", arg.name);
-            return true;
-        }
-
-        size_t strArrLen = kResources.size();
-
-        size_t i = 0;
-        for (; i < strArrLen; ++i)
-        {
-            uint32 offset = 0;
-            if (kResources[i].m_kDesc.Type == D3D_SIT_UAV_RWTYPED || kResources[i].m_kDesc.Type == D3D_SIT_UAV_RWSTRUCTURED)
-            {
-                // UAV resources are after the constants buffers so set the offset appropriately
-                offset = SBufferStateStageCache::s_MaxConstantBuffersPerStage;
-            }
-            if (strstr(acName, kResources[i].m_acName) == acName)
-            {
-                if (((kResources[i].m_kDesc.BindPoint + offset) == arg.index && DX11SITToMetal(kResources[i].m_kDesc.Type) == arg.type))
-                {
-                    break;
-                }
-            }
-        }
-
-        if (i == strArrLen)
-        {
-            LOG_METAL_SHADER_ERRORS(@ "Resource \"%@\" or similar was not found in DX11 reflection or bind points do not match.", arg.name);
-            assert(!"HLSLcc code must pass validator");
-            return false;
-        }
-
-        LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "Resource %s is detected as \"%@\" in the metal shader.", kResources[i].m_acName, arg.name);
-
-        return true;
-    }
-
-    bool ValidateBufferResource(MTLArgument* arg, SShaderReflection& cryReflection)
-    {
-        assert(arg.type == MTLArgumentTypeBuffer);
-
-        char acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-        strncpy(acName, [arg.name UTF8String], DXGL_MAX_REFLECT_STRING_LENGTH - 1);
-        acName[DXGL_MAX_REFLECT_STRING_LENGTH - 1] = 0;
-
-        if (strstr(acName, "vertexBuffer.") == acName)
-        {
-            LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "Resource %@ is attached via input assembler.", arg.name);
-            return true;
-        }
-
-        SShaderReflection::TConstantBuffers& kConstantBuffers = cryReflection.m_kConstantBuffers;
-
-        size_t strArrLen = kConstantBuffers.size();
-
-        size_t i = 0;
-        for (; i < strArrLen; ++i)
-        {
-            if (strstr(acName, kConstantBuffers[i].m_acName) == acName)
-            {
-                break;
-            }
-        }
-
-        if (i == strArrLen)
-        {
-            LOG_METAL_SHADER_ERRORS(@ "Buffer \"%@\" description or similar was not found in DX11 reflection.", arg.name);
-            assert(!"HLSLcc code must pass validator");
-            return false;
-        }
-
-        SShaderReflectionConstBuffer::TVariables& kDX11Vars = kConstantBuffers[i].m_kVariables;
-        size_t dx11VarNum = kDX11Vars.size();
-
-        LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "Buffer %s is detected as \"%@\" in the metal shader.", kConstantBuffers[i].m_acName, arg.name);
-        LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "%@", arg.bufferStructType);
-
-        for (MTLStructMember* var in arg.bufferStructType.members)
-        {
-            if ([var.name rangeOfString:@ "offsetDummy"].location != NSNotFound)
-            {
-                continue;
-            }
-
-            char acVarName[DXGL_MAX_REFLECT_STRING_LENGTH];
-            strncpy(acVarName, [var.name UTF8String], DXGL_MAX_REFLECT_STRING_LENGTH - 1);
-            acVarName[DXGL_MAX_REFLECT_STRING_LENGTH - 1] = 0;
-
-            size_t j = 0;
-            int varOffset = var.offset;
-            for (; j < dx11VarNum; ++j)
-            {
-                if ((strstr(acVarName, kDX11Vars[j].m_acName) == acVarName) && (varOffset == kDX11Vars[j].m_kDesc.StartOffset) ||
-                    (strstr(kDX11Vars[j].m_acName, "$Element") == kDX11Vars[j].m_acName))
-                {
-                    break;
-                }
-            }
-
-            if (j == dx11VarNum)
-            {
-                LOG_METAL_SHADER_ERRORS(@ "Variable \"%@::%@\" or similar was not found in DX11 reflection or offsets in buffers do not match", arg.name, var.name);
-                assert(!"HLSLcc code must pass validator");
-                return false;
-            }
-
-            LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "Variable %s::%s is detected as \"%@::%@\" in the metal shader.", kConstantBuffers[i].m_acName, kDX11Vars[j].m_acName, arg.name, var.name);
-        }
-
-        return true;
-    }
-
-
-    bool ValidateReflection(EShaderType shaderType, NSArray* metalReflection, SShaderReflection& cryReflection)
-    {
-        LOG_METAL_SHADER_REFLECTION_VALIDATION(shaderType == eST_Vertex ? @ "Vertex Shader inputs validation" :
-            (shaderType == eST_Fragment ? @ "Fragment Shader inputs validation" : @ "Compute Shader inputs validation"));
-
-        bool res = true;
-
-        for (MTLArgument* arg in metalReflection)
-        {
-            if (!arg.active)
-            {
-                continue;
-            }
-            if (arg.access == MTLArgumentAccessWriteOnly)
-            {
-                continue;
-            }
-
-            if (!ValidateBindPoint(arg, cryReflection))
-            {
-                res = false;
-                LOG_METAL_SHADER_REFLECTION_VALIDATION(@ "%@", arg);
-                LogMTLArgument(arg);
-            }
-
-            if (shaderType != eST_Compute)
-            {
-                switch (arg.type)
-                {
-                case MTLArgumentTypeBuffer:
-                {
-                    if (!ValidateBufferResource(arg, cryReflection))
-                    {
-                        res = false;
-                        LogMTLArgument(arg);
-                    }
-                    break;
-                }
-                case MTLArgumentTypeTexture:
-                {
-                    break;
-                }
-                }
-            }
-        }
-
-        return res;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    MTLVertexDescriptor* CleanUnusedInputs(MTLVertexDescriptor* pIn, const TShaderReflection& kReflection)
-    {
-        MTLVertexDescriptor* pOut = nil;
-
-        bool bBufferUsed[DXMETAL_MAX_ENTRIES_BUFFER_ARG_TABLE];
-        memset(bBufferUsed, 0, sizeof(bBufferUsed));
-
-        //  TODO: Igor: figure out why input layout can come with vertex buffer being used without any inputs attached.
-        //  Note: disable the following line and metal pipeline will explaine what's wrong.
-        pOut = [pIn copyWithZone:nil];
-
-        //  Igor: For unused inputs clean input attribute record
-        //  Igor: For used inputs mark input buffer as used
-        TShaderReflection::TParameters::const_iterator kInputSemanticIter(kReflection.m_kInputs.begin());
-        const TShaderReflection::TParameters::const_iterator kInputSemanticEnd(kReflection.m_kInputs.end());
-        while (kInputSemanticIter != kInputSemanticEnd)
-        {
-            if (kInputSemanticIter->m_kDesc.ReadWriteMask)
-            {
-                bBufferUsed[pIn.attributes[kInputSemanticIter->m_kDesc.Register].bufferIndex] = true;
-            }
-            else
-            {
-                if (!pOut)
-                {
-                    pOut = [pIn copyWithZone:nil];
-                }
-
-                [pOut.attributes setObject : 0 atIndexedSubscript: kInputSemanticIter->m_kDesc.Register];
-            }
-
-            ++kInputSemanticIter;
-        }
-
-
-        //  pOut is not nil if had to patch at least single input
-        if (pOut)
-        {
-            const int iAttrCount = 31;
-            for (int i = 0; i < iAttrCount; ++i)
-            {
-                uint32 VBIndex = pOut.attributes[i].bufferIndex;
-                if ((pOut.attributes[i].format != MTLVertexFormatInvalid) && (!bBufferUsed[VBIndex]))
-                {
-                    [pOut.attributes setObject : 0 atIndexedSubscript: i];
-                }
-            }
-
-            const int bufCount = DXMETAL_MAX_ENTRIES_BUFFER_ARG_TABLE;
-            for (int VBIndex = 0; VBIndex < bufCount; ++VBIndex)
-            {
-                if (!bBufferUsed[VBIndex])
-                {
-                    [pOut.layouts setObject : 0 atIndexedSubscript: VBIndex];
-                }
-            }
-
-            return pOut;
-        }
-        else
-        {
-            //  Igor: the caller is responsible for releasing the result
-            [pIn retain];
-            return pIn;
-        }
-    }
-
-    bool CompilePipeline(SPipeline* pPipeline, CDevice* pDevice)
-    {
-        id<MTLDevice> mtlDevice = pDevice->GetMetalDevice();
-        if (pPipeline->m_kConfiguration.m_apShaders[eST_Compute] != NULL)
-        {
-            MTLComputePipelineDescriptor* desc = [[MTLComputePipelineDescriptor alloc] init];
-            desc.computeFunction = pPipeline->m_kConfiguration.m_apShaders[eST_Compute]->m_kGLShader.m_pFunction;
-
-            NSError* error = 0;
-            MTLComputePipelineReflection* ref;
-            pPipeline->m_ComputePipelineState = [mtlDevice newComputePipelineStateWithDescriptor:desc options : MTLPipelineOptionBufferTypeInfo reflection : &ref error : &error];
-
-            if (!pPipeline->m_ComputePipelineState)
-            {
-                LOG_METAL_PIPELINE_ERRORS(@ "Error generation compute pipeline object: %@", error);
-                LOG_METAL_PIPELINE_ERRORS(@ "Descriptor: %@", desc);
-                assert(!"Compute pipeline object shouldn't fail to be created.");
-                return false;
-            }
-
-            bool res = ValidateReflection(eST_Compute, ref.arguments, pPipeline->m_kConfiguration.m_apShaders[eST_Compute]->m_kReflection);
-
-            assert(res || !"compute shader must pass validation");
-
-            [desc release];
-
-        }
-
-        if (pPipeline->m_kConfiguration.m_apShaders[eST_Vertex] != NULL)
-        {
-            MTLRenderPipelineDescriptor* desc = [[MTLRenderPipelineDescriptor alloc] init];
-
-            for (int i = 0; i < SAttachmentConfiguration::s_ColorAttachmentDescCount; ++i)
-            {
-                desc.colorAttachments[i].pixelFormat = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].pixelFormat;
-
-                desc.colorAttachments[i].writeMask = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].writeMask;
-                desc.colorAttachments[i].blendingEnabled = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].blendingEnabled;
-                desc.colorAttachments[i].alphaBlendOperation = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].alphaBlendOperation;
-                desc.colorAttachments[i].rgbBlendOperation = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].rgbBlendOperation;
-                desc.colorAttachments[i].destinationAlphaBlendFactor = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].destinationAlphaBlendFactor;
-                desc.colorAttachments[i].destinationAlphaBlendFactor = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].destinationAlphaBlendFactor;
-                desc.colorAttachments[i].destinationRGBBlendFactor = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].destinationRGBBlendFactor;
-                desc.colorAttachments[i].sourceAlphaBlendFactor = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].sourceAlphaBlendFactor;
-                desc.colorAttachments[i].sourceRGBBlendFactor = pPipeline->m_kConfiguration.m_AttachmentConfiguration.colorAttachments[i].sourceRGBBlendFactor;
-            }
-            desc.depthAttachmentPixelFormat = pPipeline->m_kConfiguration.m_AttachmentConfiguration.depthAttachmentPixelFormat;
-            desc.stencilAttachmentPixelFormat = pPipeline->m_kConfiguration.m_AttachmentConfiguration.stencilAttachmentPixelFormat;
-
-            MTLVertexDescriptor* pCleanedDesctiptor = CleanUnusedInputs((MTLVertexDescriptor*)pPipeline->m_kConfiguration.m_pVertexDescriptor,
-                    pPipeline->m_kConfiguration.m_apShaders[eST_Vertex]->m_kReflection);
-
-            // set the bound shader state settings
-            desc.vertexDescriptor = pCleanedDesctiptor;
-            desc.vertexFunction = pPipeline->m_kConfiguration.m_apShaders[eST_Vertex]->m_kGLShader.m_pFunction;
-            desc.fragmentFunction = pPipeline->m_kConfiguration.m_apShaders[eST_Fragment] ? pPipeline->m_kConfiguration.m_apShaders[eST_Fragment]->m_kGLShader.m_pFunction : 0;
-
-            [pCleanedDesctiptor release];
-
-            NSError* error = 0;
-            MTLRenderPipelineReflection* ref;
-            pPipeline->m_PipelineState = [mtlDevice newRenderPipelineStateWithDescriptor:desc options : MTLPipelineOptionBufferTypeInfo reflection : &ref error : &error];
-
-            if (!pPipeline->m_PipelineState)
-            {
-                LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                LOG_METAL_PIPELINE_ERRORS(@ "Descriptor: %@", desc);
-                assert(!"Pipeline object shouldn't fail to be created.");
-                return false;
-            }
-
-            bool res = ValidateReflection(eST_Vertex, ref.vertexArguments, pPipeline->m_kConfiguration.m_apShaders[eST_Vertex]->m_kReflection);
-            res &= ValidateReflection(eST_Fragment, ref.fragmentArguments, pPipeline->m_kConfiguration.m_apShaders[eST_Fragment]->m_kReflection);
-
-            assert(res || !"shader must pass validation");
-
-            [desc release];
-        }
-
-        return true;
-    }
-
-    bool InitializeShader(SShader* pShader, const void* pvSourceData, size_t uSourceSize, id<MTLDevice> mtlDevice)
-    {
-        pShader->m_kSource.SetData(reinterpret_cast<const char*>(pvSourceData), uSourceSize);
-
-        uint32 uGLSLOffset;
-        if (!InitializeShaderReflection(&pShader->m_kReflection, pShader->m_kSource.m_pData) ||
-            (uGLSLOffset = pShader->m_kReflection.m_uGLSLSourceOffset) >= (uint32)uSourceSize)
-        {
-            DXGL_ERROR("Could not retrieve shader reflection data");
-            return false;
-        }
-
-        SSource kGLSLSource(pShader->m_kSource.m_pData + uGLSLOffset, pShader->m_kSource.m_uDataSize - uGLSLOffset);
-        if (!CompileShader(pShader, &kGLSLSource, &pShader->m_kGLShader, mtlDevice))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    SPipelineConfiguration::SPipelineConfiguration()
-    //  Confetti BEGIN: Igor Lobanchikov
-        : m_pVertexDescriptor([[MTLVertexDescriptor alloc] init])
-        //  Confetti End: Igor Lobanchikov
-    {
-        memset(m_apShaders, 0, sizeof(m_apShaders));
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    SPipelineConfiguration::~SPipelineConfiguration()
-    {
-        [(MTLVertexDescriptor*)m_pVertexDescriptor release];
-    }
-
-    SPipelineConfiguration::SPipelineConfiguration(const SPipelineConfiguration& other)
-    {
-        m_pVertexDescriptor = other.m_pVertexDescriptor;
-        [(MTLVertexDescriptor*)m_pVertexDescriptor retain];
-
-        memcpy(&m_apShaders, &other.m_apShaders, sizeof(m_apShaders));
-        memcpy(&m_AttachmentConfiguration, &other.m_AttachmentConfiguration, sizeof(m_AttachmentConfiguration));
-    }
-
-    SPipelineConfiguration& SPipelineConfiguration::operator=(const SPipelineConfiguration& other)
-    {
-        [(MTLVertexDescriptor*)m_pVertexDescriptor release];
-        m_pVertexDescriptor = other.m_pVertexDescriptor;
-        [(MTLVertexDescriptor*)m_pVertexDescriptor retain];
-
-        memcpy(&m_apShaders, &other.m_apShaders, sizeof(m_apShaders));
-        memcpy(&m_AttachmentConfiguration, &other.m_AttachmentConfiguration, sizeof(m_AttachmentConfiguration));
-
-        return *this;
-    }
-
-    void SPipelineConfiguration::SetVertexDescriptor(void* vertexDescriptor)
-    {
-        [(MTLVertexDescriptor*)m_pVertexDescriptor release];
-
-        m_pVertexDescriptor = [(MTLVertexDescriptor*)vertexDescriptor copyWithZone:nil];
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    bool GetMetalVertexFormatSize(const SGIFormatInfo* pFormatInfo, uint32& size)
-    {
-        switch (pFormatInfo->m_pTexture->m_eMetalVertexFormat)
-        {
-        case MTLVertexFormatInvalid:
-            return false;
-
-        case MTLVertexFormatUChar2:
-        case MTLVertexFormatChar2:
-        case MTLVertexFormatUChar2Normalized:
-        case MTLVertexFormatChar2Normalized:
-            size = 2;
-            break;
-
-        case MTLVertexFormatUChar3:
-        case MTLVertexFormatChar3:
-        case MTLVertexFormatUChar3Normalized:
-        case MTLVertexFormatChar3Normalized:
-            size = 3;
-            break;
-
-        case MTLVertexFormatUChar4:
-        case MTLVertexFormatChar4:
-        case MTLVertexFormatUChar4Normalized:
-        case MTLVertexFormatChar4Normalized:
-        case MTLVertexFormatUShort2:
-        case MTLVertexFormatShort2:
-        case MTLVertexFormatUShort2Normalized:
-        case MTLVertexFormatShort2Normalized:
-        case MTLVertexFormatHalf2:
-        case MTLVertexFormatFloat:
-        case MTLVertexFormatInt:
-        case MTLVertexFormatUInt:
-        case MTLVertexFormatInt1010102Normalized:
-        case MTLVertexFormatUInt1010102Normalized:
-            size = 4;
-            break;
-
-        case MTLVertexFormatUShort3:
-        case MTLVertexFormatShort3:
-        case MTLVertexFormatUShort3Normalized:
-        case MTLVertexFormatShort3Normalized:
-        case MTLVertexFormatHalf3:
-            size = 6;
-            break;
-
-        case MTLVertexFormatUShort4:
-        case MTLVertexFormatShort4:
-        case MTLVertexFormatUShort4Normalized:
-        case MTLVertexFormatShort4Normalized:
-        case MTLVertexFormatHalf4:
-        case MTLVertexFormatFloat2:
-        case MTLVertexFormatInt2:
-        case MTLVertexFormatUInt2:
-            size = 8;
-            break;
-
-        case MTLVertexFormatFloat3:
-        case MTLVertexFormatInt3:
-        case MTLVertexFormatUInt3:
-            size = 12;
-            break;
-
-        case MTLVertexFormatFloat4:
-        case MTLVertexFormatInt4:
-        case MTLVertexFormatUInt4:
-            size = 16;
-            break;
-
-        default:
-            assert(!"Unknown metal vertex format");
-            return false;
-        }
-        return true;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-
-    bool PushInputLayoutAttribute(
-        SInputLayout& kLayout,
-        uint32 auSlotOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT],
-        const D3D11_INPUT_ELEMENT_DESC& kDesc,
-        uint32 uIndex)
-    {
-        // The format must have texture and uncompressed layout information in order to determine
-        // the input layout
-        NCryMetal::EGIFormat eGIFormat(GetGIFormat(kDesc.Format));
-        const NCryMetal::SGIFormatInfo* pFormatInfo(NULL);
-        if (eGIFormat == eGIF_NUM || (pFormatInfo = (GetGIFormatInfo(eGIFormat))) == NULL ||
-            pFormatInfo->m_pTexture == NULL || pFormatInfo->m_pUncompressed == NULL)
-        {
-            DXGL_ERROR("Invalid DXGI format for vertex attribute");
-            return false;
-        }
-
-        uint32& uSlotOffset(auSlotOffsets[kDesc.InputSlot]);
-        uint32 uSize;
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (pFormatInfo->m_pTexture->m_eMetalVertexFormat == MTLVertexFormatInvalid)
-        {
-            DXGL_ERROR("Invalid data type for vertex attribute");
-            return false;
-        }
-
-        GetMetalVertexFormatSize(pFormatInfo, uSize);
-
-        assert(uSize == pFormatInfo->m_pTexture->m_uNumBlockBytes);
-
-        uint32 VBIndex = (DXMETAL_MAX_ENTRIES_BUFFER_ARG_TABLE - 1) - kDesc.InputSlot;
-        MTLVertexAttributeDescriptor* MetalDesc = ((MTLVertexDescriptor*)kLayout.m_pVertexDescriptor).attributes[uIndex];
-        MetalDesc.bufferIndex = VBIndex;
-        MetalDesc.offset = (kDesc.AlignedByteOffset == D3D11_APPEND_ALIGNED_ELEMENT) ? uSize : kDesc.AlignedByteOffset;
-
-        MetalDesc.format = pFormatInfo->m_pTexture->m_eMetalVertexFormat;
-
-        uSlotOffset = max(uSlotOffset, (uint32)MetalDesc.offset + uSize);
-
-        //  Igor: We calculate stride here assuming that the vertex structure won't have any additional padding at the end
-        //  which is not 100% true, since DX11 api allows to change vertex stride at vertex buffer bind time.
-        //  We override this padding later at vertex buffer bind time anyway. Just keep it here as the reference.
-        uint32 stride = ((uSlotOffset + 3) / 4) * 4;
-        ((MTLVertexDescriptor*)kLayout.m_pVertexDescriptor).layouts[VBIndex].stride = stride;
-        //  Confetti End: Igor Lobanchikov
-
-
-        return true;
-    }
-
-    SInputLayoutPtr CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, uint32 uNumElements, const TShaderReflection& kReflection)
-    {
-        SInputLayoutPtr spLayout(new SInputLayout());
-        uint32 auSlotOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-        memset(auSlotOffsets, 0, sizeof(auSlotOffsets));
-        
-        int attrMatchedNum = 0;
-        int reflectionAttrNum = 0;
-        
-        //Calculate the number of attributes in the vertex shader that dont start with 'SV_'.
-        TShaderReflection::TParameters::const_iterator kInputSemanticIter(kReflection.m_kInputs.begin());
-        const TShaderReflection::TParameters::const_iterator kInputSemanticEnd(kReflection.m_kInputs.end());
-        while (kInputSemanticIter != kInputSemanticEnd)
-        {
-            if(strstr(kInputSemanticIter->m_kDesc.SemanticName, "SV_") == 0)
-            {
-                reflectionAttrNum++;
-            }
-            ++kInputSemanticIter;
-        }
-
-        for (uint32 uElement = 0; uElement < uNumElements; ++uElement)
-        {
-            const D3D11_INPUT_ELEMENT_DESC& kDesc(pInputElementDescs[uElement]);
-
-            //  Confetti BEGIN: Igor Lobanchikov
-            {
-                uint32 VBIndex = (DXMETAL_MAX_ENTRIES_BUFFER_ARG_TABLE - 1) - kDesc.InputSlot;
-
-                //  TODO: do check here so that all values for the same buffer has the same parameters
-
-                //  Igor: set layout here
-                // Don't set stride here. Set it when the actual buffer is bound, since in dx11 this is the place wherer we know the stride
-                // Initial auto-calculated stride value will be set once the input layout is complete
-                //spLayout->layouts[VBIndex].stride = kDesk.;
-                ((MTLVertexDescriptor*)spLayout->m_pVertexDescriptor).layouts[VBIndex].stepFunction = (kDesc.InputSlotClass == D3D11_INPUT_PER_VERTEX_DATA) ? MTLVertexStepFunctionPerVertex : MTLVertexStepFunctionPerInstance;
-                ((MTLVertexDescriptor*)spLayout->m_pVertexDescriptor).layouts[VBIndex].stepRate = (kDesc.InputSlotClass == D3D11_INPUT_PER_VERTEX_DATA) ? 1 : kDesc.InstanceDataStepRate;
-            }
-            //  Confetti End: Igor Lobanchikov
-
-            
-            // Find a match within the input signatures of the shader reflection data
-            TShaderReflection::TParameters::const_iterator kInputSemanticIter(kReflection.m_kInputs.begin());
-            const TShaderReflection::TParameters::const_iterator kInputSemanticEnd(kReflection.m_kInputs.end());
-            while (kInputSemanticIter != kInputSemanticEnd)
-            {
-                if (kInputSemanticIter->m_kDesc.SemanticIndex == kDesc.SemanticIndex &&
-                    strcmp(kInputSemanticIter->m_kDesc.SemanticName, kDesc.SemanticName) == 0)
-                {
-                    if (!PushInputLayoutAttribute(*spLayout, auSlotOffsets, kDesc, kInputSemanticIter->m_kDesc.Register))
-                    {
-                        AZ_Assert(false, "Failed to Push Input Layout");
-                        return NULL;
-                    }
-                    attrMatchedNum++;
-                    break;
-                }
-                ++kInputSemanticIter;
-            }
-        }
-
-        if( attrMatchedNum != reflectionAttrNum)
-        {
-            AZ_Assert(false, "Shader input attributes count doesn not match with vertex format attributes count");
-            return NULL;
-        }
-
-        return spLayout;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.hpp
deleted file mode 100644
index f4244bc520..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.hpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declares the shader types and related functions
-
-#ifndef __GLSHADER__
-#define __GLSHADER__
-
-#include "GLCommon.hpp"
-
-//  Confetti BEGIN: Igor Lobanchikov
-@protocol MTLFunction;
-@protocol MTLRenderPipelineState;
-@class MTLArgument;
-@class MTLStructType;
-
-#include "GLState.hpp"
-#import <Metal/MTLPixelFormat.h>
-//  Confetti End: Igor Lobanchikov
-
-namespace NCryMetal
-{
-    enum
-    {
-        MAX_CONSTANT_BUFFER_BIND_POINTS = D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT
-    };
-
-    enum EShaderType
-    {
-        eST_Vertex,
-        eST_Fragment,
-#if DXGL_SUPPORT_COMPUTE
-        eST_Compute,
-#endif //DXGL_SUPPORT_COMPUTE
-        eST_NUM
-    };
-
-    struct SPipeline;
-    class CContext;
-
-    struct SSource
-    {
-        const char* m_pData;
-        uint32 m_uDataSize;
-
-        SSource(const char* pData = NULL, uint32 uDataSize = 0);
-        ~SSource();
-    };
-
-    struct SShaderSource
-        : SSource
-    {
-        SShaderSource();
-        ~SShaderSource();
-
-        void SetData(const char* pData = NULL, uint32 uDataSize = 0);
-    };
-
-    enum
-    {
-        DXGL_MAX_REFLECT_STRING_LENGTH = 128
-    };
-
-    struct SShaderReflectionVariable
-    {
-        D3D11_SHADER_VARIABLE_DESC m_kDesc;
-        D3D11_SHADER_TYPE_DESC m_kType;
-        char m_acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-        std::vector<uint8> m_kDefaultValue;
-    };
-
-    struct SShaderReflectionConstBuffer
-    {
-        typedef std::vector<SShaderReflectionVariable> TVariables;
-
-        TVariables m_kVariables;
-        D3D11_SHADER_BUFFER_DESC m_kDesc;
-        char m_acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-    };
-
-    struct SShaderReflectionResource
-    {
-        D3D11_SHADER_INPUT_BIND_DESC m_kDesc;
-        char m_acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-    };
-
-    struct SShaderReflectionParameter
-    {
-        D3D11_SIGNATURE_PARAMETER_DESC m_kDesc;
-        char m_acSemanticName[DXGL_MAX_REFLECT_STRING_LENGTH];
-    };
-
-    struct SShaderReflectionArgument
-    {
-        char m_acName[DXGL_MAX_REFLECT_STRING_LENGTH];
-        bool m_bActive;
-        uint32 m_uIndex;
-        uint32 m_eType;
-        uint32 m_eAccess;
-        uint32 m_uBufferAlignment;
-        uint32 m_uBufferDataSize;
-        uint32 m_eDataType;
-        uint32 m_eTextureType;
-    };
-
-    struct SShaderReflection
-    {
-        typedef std::vector<SShaderReflectionConstBuffer> TConstantBuffers;
-        typedef std::vector<SShaderReflectionResource> TResources;
-        typedef std::vector<SShaderReflectionParameter> TParameters;
-
-        uint32 m_uGLSLSourceOffset;
-        uint32 m_uSamplerMapOffset;
-        uint32 m_uSamplerMapSize;
-        uint32 m_uImportsOffset;
-        uint32 m_uImportsSize;
-        uint32 m_uExportsOffset;
-        uint32 m_uExportsSize;
-        uint32 m_uUAVBindingAreaOffset;
-        uint32 m_uUAVBindingAreaSize;
-        uint32 m_uInputHash;
-        uint32 m_uThread_x;
-        uint32 m_uThread_y;
-        uint32 m_uThread_z;
-
-        TConstantBuffers m_kConstantBuffers;
-        TResources m_kResources;
-        TParameters m_kInputs, m_kOutputs, m_kPatchConstants;
-        D3D11_SHADER_DESC m_kDesc;
-    };
-
-    struct SGLShader
-    {
-        SGLShader();
-        ~SGLShader();
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        id<MTLFunction> m_pFunction;
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SShader)
-    {
-        EShaderType m_eType;
-
-        SShaderSource m_kSource;
-
-        SGLShader m_kGLShader;
-        SShaderReflection m_kReflection;
-
-        typedef std::vector<SPipeline*> TPipelines;
-        TPipelines m_kBoundPipelines;
-
-        void AttachPipeline(SPipeline * pPipeline);
-        void DetachPipeline(SPipeline * pPipeline);
-
-        SShader();
-        ~SShader();
-    };
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    struct SColorAttachmentDesc
-        : public SMetalBlendState
-    {
-        MTLPixelFormat pixelFormat;
-    };
-
-    struct SAttachmentConfiguration
-    {
-        //  Igor: this is required so that all padding bits are set to 0 so that we can do memcmp to compare the structures.
-        SAttachmentConfiguration() {memset(this, 0, sizeof(*this)); }
-
-        static const int s_ColorAttachmentDescCount = 8;
-
-        SColorAttachmentDesc colorAttachments[8];
-        MTLPixelFormat depthAttachmentPixelFormat;
-        MTLPixelFormat stencilAttachmentPixelFormat;
-    };
-    //  Confetti End: Igor Lobanchikov
-
-    struct SPipelineConfiguration
-    {
-        SShader* m_apShaders[eST_NUM];
-
-        SPipelineConfiguration();
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        ~SPipelineConfiguration();
-        SPipelineConfiguration(const SPipelineConfiguration& other);
-        SPipelineConfiguration& operator=(const SPipelineConfiguration& other);
-        void    SetVertexDescriptor(void*);
-
-        void*   m_pVertexDescriptor;
-        SAttachmentConfiguration    m_AttachmentConfiguration;
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SPipeline)
-    {
-        CContext* m_pContext;
-        SPipelineConfiguration m_kConfiguration;
-
-        SPipeline(const SPipelineConfiguration&kConfiguration, CContext * pContext);
-        ~SPipeline();
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        id<MTLRenderPipelineState> m_PipelineState;
-        //  Confetti End: Igor Lobanchikov
-        id<MTLComputePipelineState> m_ComputePipelineState;
-    };
-
-    DXGL_DECLARE_REF_COUNTED(struct, SInputLayout)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        SInputLayout();
-        ~SInputLayout();
-        SInputLayout(const SInputLayout&other);
-        SInputLayout& operator=(const SInputLayout& other);
-
-        void*   m_pVertexDescriptor;
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    struct SResourceSlotMapping
-    {
-        enum
-        {
-            INVALID_INDEX = 0xFFFFFFFFu
-        };
-
-        uint32 m_uFirst;
-        uint32 m_uCount;
-
-        uint32 GetIndex(uint32 uSlot) const { return uSlot >= m_uCount ? INVALID_INDEX : m_uFirst + uSlot; }
-    };
-
-    typedef SShaderReflection TShaderReflection;
-
-    bool InitializeShaderReflection(SShaderReflection* pReflection, const void* pvData);
-
-    bool CompileShader(SShader* pShader, SSource* aSourceVersions, SGLShader* pGLShader, id<MTLDevice> mtlDevice);
-    bool CompilePipeline(SPipeline* pPipeline, CDevice* pDevice);
-    bool InitializeShader(SShader* pShader, const void* pvSourceData, size_t uSourceSize, id<MTLDevice> mtlDevice);
-    bool InitializeShaderUniformBufferSlots(SPipeline* pPipeline, SShader* pShader, const TShaderReflection& kReflection, SResourceSlotMapping kSlotMap);
-    bool InitializeShaderTextureUnitSlots(SPipeline* pPipeline, SShader* pShader, const TShaderReflection& kReflection, SResourceSlotMapping kSlotMap);
-    SInputLayoutPtr CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, uint32 uNumElements, const TShaderReflection& kReflection);
-}
-
-#endif //__GLSHADER__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLState.cpp
deleted file mode 100644
index 8cf2216e05..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLState.cpp
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the functions used to create states
-//               and apply them to an OpenGL device
-
-#include "RenderDll_precompiled.h"
-#include "GLState.hpp"
-#include "MetalDevice.hpp"
-
-namespace NCryMetal
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    bool GetComparisonFunc(MTLCompareFunction& eMTLCompareFunc, D3D11_COMPARISON_FUNC eD3DCompareFunc)
-    {
-        switch (eD3DCompareFunc)
-        {
-        case D3D11_COMPARISON_NEVER:
-            eMTLCompareFunc = MTLCompareFunctionNever;
-            break;
-        case D3D11_COMPARISON_LESS:
-            eMTLCompareFunc = MTLCompareFunctionLess;
-            break;
-        case D3D11_COMPARISON_EQUAL:
-            eMTLCompareFunc = MTLCompareFunctionEqual;
-            break;
-        case D3D11_COMPARISON_LESS_EQUAL:
-            eMTLCompareFunc = MTLCompareFunctionLessEqual;
-            break;
-        case D3D11_COMPARISON_GREATER:
-            eMTLCompareFunc = MTLCompareFunctionGreater;
-            break;
-        case D3D11_COMPARISON_NOT_EQUAL:
-            eMTLCompareFunc = MTLCompareFunctionNotEqual;
-            break;
-        case D3D11_COMPARISON_GREATER_EQUAL:
-            eMTLCompareFunc = MTLCompareFunctionGreaterEqual;
-            break;
-        case D3D11_COMPARISON_ALWAYS:
-            eMTLCompareFunc = MTLCompareFunctionAlways;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool GetStencilOperation(MTLStencilOperation& eMTLStencilOp, D3D11_STENCIL_OP eD3DStencilOp)
-    {
-        switch (eD3DStencilOp)
-        {
-        case D3D11_STENCIL_OP_KEEP:
-            eMTLStencilOp = MTLStencilOperationKeep;
-            break;
-        case D3D11_STENCIL_OP_ZERO:
-            eMTLStencilOp = MTLStencilOperationZero;
-            break;
-        case D3D11_STENCIL_OP_REPLACE:
-            eMTLStencilOp = MTLStencilOperationReplace;
-            break;
-        case D3D11_STENCIL_OP_INCR_SAT:
-            eMTLStencilOp = MTLStencilOperationIncrementClamp;
-            break;
-        case D3D11_STENCIL_OP_DECR_SAT:
-            eMTLStencilOp = MTLStencilOperationDecrementClamp;
-            break;
-        case D3D11_STENCIL_OP_INVERT:
-            eMTLStencilOp = MTLStencilOperationInvert;
-            break;
-        case D3D11_STENCIL_OP_INCR:
-            eMTLStencilOp = MTLStencilOperationIncrementWrap;
-            break;
-        case D3D11_STENCIL_OP_DECR:
-            eMTLStencilOp = MTLStencilOperationDecrementWrap;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    MTLColorWriteMask DX11ToMetalColorMask(UINT8 RenderTargetWriteMask)
-    {
-        uint32 res = ((RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_RED) ? MTLColorWriteMaskRed : 0)
-            | ((RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_GREEN) ? MTLColorWriteMaskGreen : 0)
-            | ((RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_BLUE) ? MTLColorWriteMaskBlue : 0)
-            | ((RenderTargetWriteMask & D3D11_COLOR_WRITE_ENABLE_ALPHA) ? MTLColorWriteMaskAlpha : 0);
-
-        return (MTLColorWriteMask)res;
-    }
-
-    bool DX11ToMetalBlendOperation(D3D11_BLEND_OP BlendOp, MTLBlendOperation& res)
-    {
-        switch (BlendOp)
-        {
-        case D3D11_BLEND_OP_ADD:
-            res = MTLBlendOperationAdd;
-            break;
-        case D3D11_BLEND_OP_SUBTRACT:
-            res = MTLBlendOperationSubtract;
-            break;
-        case D3D11_BLEND_OP_REV_SUBTRACT:
-            res = MTLBlendOperationReverseSubtract;
-            break;
-        case D3D11_BLEND_OP_MIN:
-            res = MTLBlendOperationMin;
-            break;
-        case D3D11_BLEND_OP_MAX:
-            res = MTLBlendOperationMax;
-            break;
-
-        default:
-            DXGL_ERROR("Invalid blend operator");
-            return false;
-        }
-        ;
-
-        return true;
-    }
-
-    bool DX11ToMetalBlendFactor(D3D11_BLEND factor, bool bAlpha, MTLBlendFactor& res)
-    {
-        switch (factor)
-        {
-        case D3D11_BLEND_ZERO:
-            res = MTLBlendFactorZero;
-            break;
-        case D3D11_BLEND_ONE:
-            res = MTLBlendFactorOne;
-            break;
-        case D3D11_BLEND_SRC_COLOR:
-            res = MTLBlendFactorSourceColor;
-            break;
-        case D3D11_BLEND_INV_SRC_COLOR:
-            res = MTLBlendFactorOneMinusSourceColor;
-            break;
-        case D3D11_BLEND_SRC_ALPHA:
-            res = MTLBlendFactorSourceAlpha;
-            break;
-        case D3D11_BLEND_INV_SRC_ALPHA:
-            res = MTLBlendFactorOneMinusSourceAlpha;
-            break;
-        case D3D11_BLEND_DEST_ALPHA:
-            res = MTLBlendFactorDestinationAlpha;
-            break;
-        case D3D11_BLEND_INV_DEST_ALPHA:
-            res = MTLBlendFactorOneMinusDestinationAlpha;
-            break;
-        case D3D11_BLEND_DEST_COLOR:
-            res = MTLBlendFactorDestinationColor;
-            break;
-        case D3D11_BLEND_INV_DEST_COLOR:
-            res = MTLBlendFactorOneMinusDestinationColor;
-            break;
-        case D3D11_BLEND_SRC_ALPHA_SAT:
-            res = MTLBlendFactorSourceAlphaSaturated;
-            break;
-        case D3D11_BLEND_BLEND_FACTOR:
-            res = bAlpha ? MTLBlendFactorBlendAlpha : MTLBlendFactorBlendColor;
-            break;
-        case D3D11_BLEND_INV_BLEND_FACTOR:
-            res = bAlpha ? MTLBlendFactorOneMinusBlendAlpha : MTLBlendFactorOneMinusBlendColor;
-            break;
-
-        default:
-            DXGL_ERROR("Invalid blend factor");
-            return false;
-        }
-
-        return true;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    bool InitializeBlendState(const D3D11_BLEND_DESC& kDesc, SBlendState& kState, CDevice*)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        assert(!kDesc.AlphaToCoverageEnable && "Not Implemented yet");
-
-        {
-            assert(DXGL_ARRAY_SIZE(kDesc.RenderTarget) == DXGL_ARRAY_SIZE(kState.colorAttachements));
-            for (uint32 uTarget = 0; uTarget <  DXGL_ARRAY_SIZE(kDesc.RenderTarget); ++uTarget)
-            {
-                if (uTarget && !kDesc.IndependentBlendEnable)
-                {
-                    kState.colorAttachements[uTarget] = kState.colorAttachements[0];
-                }
-                else
-                {
-                    const D3D11_RENDER_TARGET_BLEND_DESC& kRTDesc(kDesc.RenderTarget[uTarget]);
-                    SMetalBlendState& kRTState(kState.colorAttachements[uTarget]);
-
-                    //  Igor: warning: ResetToDefault resets all members. Please, be careful and set other members after reset.
-                    kRTState.blendingEnabled = kRTDesc.BlendEnable == TRUE;
-
-                    if (kRTState.blendingEnabled)
-                    {
-                        if (!DX11ToMetalBlendOperation(kRTDesc.BlendOp, kRTState.rgbBlendOperation))
-                        {
-                            return false;
-                        }
-                        if (!DX11ToMetalBlendOperation(kRTDesc.BlendOpAlpha, kRTState.alphaBlendOperation))
-                        {
-                            return false;
-                        }
-
-                        if (!DX11ToMetalBlendFactor(kRTDesc.SrcBlend, false, kRTState.sourceRGBBlendFactor))
-                        {
-                            return false;
-                        }
-                        if (!DX11ToMetalBlendFactor(kRTDesc.DestBlend, false, kRTState.destinationRGBBlendFactor))
-                        {
-                            return false;
-                        }
-
-                        if (!DX11ToMetalBlendFactor(kRTDesc.SrcBlendAlpha, true, kRTState.sourceAlphaBlendFactor))
-                        {
-                            return false;
-                        }
-                        if (!DX11ToMetalBlendFactor(kRTDesc.DestBlendAlpha, true, kRTState.destinationAlphaBlendFactor))
-                        {
-                            return false;
-                        }
-                    }
-                    else
-                    {
-                        kRTState.ResetToDefault();
-                    }
-
-                    kRTState.writeMask = DX11ToMetalColorMask(kRTDesc.RenderTargetWriteMask);
-                }
-            }
-        }
-
-        return true;
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-
-    bool InitializeStencilFace(MTLStencilDescriptor* kStencilFace, const D3D11_DEPTH_STENCILOP_DESC& kDesc, UINT8 uWriteMask, UINT8 uReadMask)
-    {
-        kStencilFace.readMask = uReadMask;
-        kStencilFace.writeMask = uWriteMask;
-
-
-        MTLCompareFunction cmpFunc;
-        if (!GetComparisonFunc(cmpFunc, kDesc.StencilFunc))
-        {
-            DXGL_ERROR("Invalid stencil comparison function");
-            return false;
-        }
-        kStencilFace.stencilCompareFunction = cmpFunc;
-
-        MTLStencilOperation eStencilFailOperation;
-        MTLStencilOperation eDepthFailOperation;
-        MTLStencilOperation eDepthPassOperation;
-
-        if (!GetStencilOperation(eStencilFailOperation, kDesc.StencilFailOp) ||
-            !GetStencilOperation(eDepthFailOperation, kDesc.StencilDepthFailOp) ||
-            !GetStencilOperation(eDepthPassOperation, kDesc.StencilPassOp))
-        {
-            DXGL_ERROR("Invalid stencil operation");
-            return false;
-        }
-        kStencilFace.stencilFailureOperation = eStencilFailOperation;
-        kStencilFace.depthFailureOperation = eDepthFailOperation;
-        kStencilFace.depthStencilPassOperation = eDepthPassOperation;
-
-        return true;
-    }
-
-    bool InitializeDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, id<MTLDepthStencilState>& kState, CDevice* pDevice)
-    {
-        MTLDepthStencilDescriptor* desc = [[MTLDepthStencilDescriptor alloc] init];
-        desc.depthWriteEnabled = (kDesc.DepthWriteMask == D3D11_DEPTH_WRITE_MASK_ALL);
-
-        if (kDesc.DepthEnable == TRUE)
-        {
-            MTLCompareFunction cmpFunc;
-            if (!GetComparisonFunc(cmpFunc, kDesc.DepthFunc))
-            {
-                [desc release];
-                DXGL_ERROR("Invalid depth comparison function");
-                return false;
-            }
-            desc.depthCompareFunction = cmpFunc;
-        }
-        else
-        {
-            desc.depthCompareFunction = MTLCompareFunctionAlways;
-        }
-
-        if (kDesc.StencilEnable == TRUE)
-        {
-            if (!InitializeStencilFace(desc.frontFaceStencil, kDesc.FrontFace, kDesc.StencilWriteMask, kDesc.StencilReadMask) ||
-                !InitializeStencilFace(desc.backFaceStencil, kDesc.BackFace, kDesc.StencilWriteMask, kDesc.StencilReadMask))
-            {
-                [desc release];
-                return false;
-            }
-        }
-
-        id<MTLDevice> mtlDevice = pDevice->GetMetalDevice();
-        kState = [mtlDevice newDepthStencilStateWithDescriptor:desc];
-        [desc release];
-
-        return true;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    bool InitializeRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, SRasterizerState& kState, CDevice*)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        switch (kDesc.FillMode)
-        {
-        case D3D11_FILL_SOLID:
-            kState.triangleFillMode = MTLTriangleFillModeFill;
-            break;
-        case D3D11_FILL_WIREFRAME:
-            kState.triangleFillMode = MTLTriangleFillModeLines;
-            break;
-        }
-
-        switch (kDesc.CullMode)
-        {
-        case D3D11_CULL_NONE:
-            kState.cullMode = MTLCullModeNone;
-            break;
-        case D3D11_CULL_FRONT:
-            kState.cullMode = MTLCullModeFront;
-            break;
-        case D3D11_CULL_BACK:
-            kState.cullMode = MTLCullModeBack;
-            break;
-        }
-
-        kState.frontFaceWinding = kDesc.FrontCounterClockwise ? MTLWindingCounterClockwise : MTLWindingClockwise;
-
-        kState.depthBias = (float)kDesc.DepthBias;
-        kState.depthBiasClamp = kDesc.DepthBiasClamp;
-        kState.depthSlopeScale = kDesc.SlopeScaledDepthBias;
-
-        if (!kDesc.DepthClipEnable)
-        {
-            kState.depthBias = 0;
-            kState.depthBiasClamp = 0;
-            kState.depthSlopeScale = 0;
-        }
-        
-        kState.depthClipMode = kDesc.DepthClipEnable ? MTLDepthClipModeClip : MTLDepthClipModeClamp;
-        
-        kState.scissorEnable = kDesc.ScissorEnable;
-
-        if (kDesc.AntialiasedLineEnable == TRUE)
-        {
-            DXGL_WARNING("Smooth line rasterization is not supported on Metal. This setting will be ignored.");
-        }
-        if (kDesc.MultisampleEnable == TRUE)
-        {
-            DXGL_WARNING("Specifying the multisampling mode globally is not supported on Metal. This setting will be ignored.");
-        }
-        //  Confetti End: Igor Lobanchikov
-        return true;
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-
-    bool DX11ToMetalTextureAddressMode(D3D11_TEXTURE_ADDRESS_MODE mode, MTLSamplerAddressMode& res)
-    {
-        switch (mode)
-        {
-        case D3D11_TEXTURE_ADDRESS_WRAP:
-            res = MTLSamplerAddressModeRepeat;
-            break;
-        case D3D11_TEXTURE_ADDRESS_MIRROR:
-            res = MTLSamplerAddressModeMirrorRepeat;
-            break;
-        case D3D11_TEXTURE_ADDRESS_CLAMP:
-            res = MTLSamplerAddressModeClampToEdge;
-            break;
-        case D3D11_TEXTURE_ADDRESS_BORDER:
-            DXGL_WARNING("Sampler with texture border clamping is not supported. Border Zero is used");
-            res = MTLSamplerAddressModeClampToZero;
-            break;
-            return true;
-        default:
-            DXGL_WARNING("Unsupported sampler address mode");
-            return false;
-        }
-        return true;
-    }
-
-    bool DX11ToMetalFilterMode(D3D11_FILTER FilterFunc, MTLSamplerMinMagFilter& minFilter, MTLSamplerMinMagFilter& maxFilter, MTLSamplerMipFilter& mipFilter, bool& bAnizotropic)
-    {
-        DXMETAL_TODO("Consider getting rid of the comparison samplers for Metal on the engine side.");
-        switch (FilterFunc)
-        {
-#define _FILTER_CASE(_D3D11FilterID, _MinFilter, _MagFilter, _MipFilter, _Anisotropic, _Comparison) \
-case _D3D11FilterID:                                                                                \
-    minFilter = MTLSamplerMinMagFilter##_MinFilter;                                                 \
-    maxFilter = MTLSamplerMinMagFilter##_MagFilter;                                                 \
-    mipFilter = MTLSamplerMipFilter##_MipFilter;                                                    \
-    bAnizotropic = _Anisotropic;                                                                    \
-    assert(!_Comparison || _Comparison);                                                            \
-    break;
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_MIP_POINT, Nearest, Nearest, Nearest, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR, Nearest, Nearest, Linear, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT, Nearest, Linear, Nearest, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR, Nearest, Linear, Linear, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT, Linear, Nearest, Nearest, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR, Linear, Nearest, Linear, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT, Linear, Linear, Nearest, false, false);
-            _FILTER_CASE(D3D11_FILTER_MIN_MAG_MIP_LINEAR, Linear, Linear, Linear, false, false);
-            _FILTER_CASE(D3D11_FILTER_ANISOTROPIC, Linear, Linear, Linear, true, false);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT, Nearest, Nearest, Nearest, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR, Nearest, Nearest, Linear, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT, Nearest, Linear, Nearest, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR, Nearest, Linear, Linear, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT, Linear, Nearest, Nearest, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR, Linear, Nearest, Linear, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT, Linear, Linear, Nearest, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR, Linear, Linear, Linear, false, true);
-            _FILTER_CASE(D3D11_FILTER_COMPARISON_ANISOTROPIC, Linear, Linear, Linear, true, true);
-#undef _FILTER_CASE
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    bool UpdateMtlSamplerDescriptor(const D3D11_SAMPLER_DESC& kDesc, MTLSamplerDescriptor* desc)
-    {
-        MTLSamplerAddressMode addressMode;
-        
-        if (!DX11ToMetalTextureAddressMode(kDesc.AddressU, addressMode))
-        {
-            return false;
-        }
-        desc.sAddressMode = addressMode;
-        
-        if (!DX11ToMetalTextureAddressMode(kDesc.AddressV, addressMode))
-        {
-            return false;
-        }
-        desc.tAddressMode = addressMode;
-        
-        if (!DX11ToMetalTextureAddressMode(kDesc.AddressW, addressMode))
-        {
-            return false;
-        }
-        desc.rAddressMode = addressMode;
-        
-        if (kDesc.MipLODBias)
-        {
-            DXGL_WARNING("Metal sampler: MipLODBias is not supported.");
-        }
-        
-        desc.maxAnisotropy = kDesc.MaxAnisotropy;
-        desc.lodMinClamp = kDesc.MinLOD;
-        desc.lodMaxClamp = kDesc.MaxLOD;
-        
-        MTLSamplerMinMagFilter minFilter;
-        MTLSamplerMinMagFilter maxFilter;
-        MTLSamplerMipFilter mipFilter;
-        bool bAnizotropic;
-        
-        if (!DX11ToMetalFilterMode(kDesc.Filter, minFilter, maxFilter, mipFilter, bAnizotropic))
-        {
-            DXGL_WARNING("Metal sampler: filter mode is not supported.");
-            return false;
-        }
-        
-        if (!bAnizotropic)
-        {
-            desc.maxAnisotropy = 1;
-        }
-        
-        desc.minFilter = minFilter;
-        desc.magFilter = maxFilter;
-        desc.mipFilter = mipFilter;
-        
-        //D3D11_COMPARISON_FUNC ComparisonFunc;
-        DXMETAL_TODO("Consider getting rid of the comparison samplers for Metal on the engine side.");
-        //  Igor: Motivation: Metal supports comparison sampler states but they must be declared in the
-        //  shader body. This is due to the fact that while newer iOS GPUs support comparison sampling
-        //  in hardware while the older ones emulate comparison sampler behaviour using shader maths.
-        //  This leads to the fact that the shader compiler has to know comparison sampler configuration
-        //  at compile time.
-        //  At the moment we still allow to create the sampler object (which can't be configured to be
-        //  comparison one) because the engine expects to have one. This might lead to confusion but at the
-        //  moment it seems to be the best solution.
-        
-        return true;
-    }
-    
-    bool InitializeSamplerState(const D3D11_SAMPLER_DESC& kDesc, id<MTLSamplerState>& kState,
-                                MTLSamplerDescriptor* mtlSamplerDesc, CDevice* pDevice)
-    {
-        bool result = UpdateMtlSamplerDescriptor(kDesc, mtlSamplerDesc);
-        if(result)
-        {
-            kState = [pDevice->GetMetalDevice() newSamplerStateWithDescriptor:mtlSamplerDesc];
-        }
-        return result;
-    }
-    
-    void SetLodMinClamp(id<MTLSamplerState>& mtlSamplerState, MTLSamplerDescriptor* mtlSamplerDesc, const float lodMinClamp, CDevice* pDevice)
-    {
-        //once mtlSamplerState is created the behavior of a sampler state object is fixed and cannot be changed.
-        //Hence we create a new object that has the updated samplerdescriptor.
-        mtlSamplerDesc.lodMinClamp = lodMinClamp;
-        mtlSamplerState = [pDevice->GetMetalDevice() newSamplerStateWithDescriptor:mtlSamplerDesc];
-    }
-
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLState.hpp
deleted file mode 100644
index bb6eb7780c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLState.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description: Declares the state types and the functions to modify them
-//              and apply to a device
-
-#ifndef __GLSTATE__
-#define __GLSTATE__
-
-#include "GLCommon.hpp"
-
-#import <Metal/MTLRenderPipeline.h>
-#import <Metal/MTLRenderCommandEncoder.h>
-#import <Metal/MTLSampler.h>
-
-namespace NCryMetal
-{
-    class CDevice;
-    class CContext;
-
-    struct SMetalBlendState
-    {
-        MTLColorWriteMask   writeMask;
-        bool                blendingEnabled;
-        MTLBlendOperation   alphaBlendOperation;
-        MTLBlendOperation   rgbBlendOperation;
-        MTLBlendFactor      destinationAlphaBlendFactor;
-        MTLBlendFactor      destinationRGBBlendFactor;
-        MTLBlendFactor      sourceAlphaBlendFactor;
-        MTLBlendFactor      sourceRGBBlendFactor;
-
-        void ResetToDefault()
-        {
-            writeMask = MTLColorWriteMaskAll;
-            blendingEnabled = false;
-            alphaBlendOperation = rgbBlendOperation = MTLBlendOperationAdd;
-            destinationAlphaBlendFactor = destinationRGBBlendFactor = MTLBlendFactorZero;
-            sourceAlphaBlendFactor = sourceRGBBlendFactor = MTLBlendFactorOne;
-        }
-    };
-
-    struct SBlendState
-    {
-        SMetalBlendState colorAttachements[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT];
-    };
-
-    struct SRasterizerState
-    {
-        MTLCullMode         cullMode;
-        float               depthBias;
-        float               depthSlopeScale;
-        float               depthBiasClamp;
-        MTLWinding          frontFaceWinding;
-        MTLTriangleFillMode triangleFillMode;
-        MTLDepthClipMode    depthClipMode;
-
-        //  Igor: this setting is not supported via Metal resterizer state
-        //  but rather via scissor rect property.
-        bool                scissorEnable;
-    };
-    
-    bool InitializeBlendState(const D3D11_BLEND_DESC& kDesc, SBlendState& kState, CDevice* pDevice);
-    bool InitializeDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, id<MTLDepthStencilState>& kState, CDevice* pDevice);
-    bool InitializeRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, SRasterizerState& kState, CDevice* pDevice);
-    bool InitializeSamplerState(const D3D11_SAMPLER_DESC& kDesc, id<MTLSamplerState>& kState, MTLSamplerDescriptor* mtlSamplerDesc, CDevice* pDevice);
-    void SetLodMinClamp(id<MTLSamplerState>& mtlSamplerState, MTLSamplerDescriptor* mtlSamplerDesc, const float lodMinClamp, CDevice* pDevice);
-}
-
-
-#endif //__GLSTATE__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLWinPlatform.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLWinPlatform.hpp
deleted file mode 100644
index fa7691a8db..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLWinPlatform.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Platform specific DXGL requirements implementation relying
-//               on Windows API
-
-#ifndef __GLWINPLATFORM__
-#define __GLWINPLATFORM__
-
-#include "GLCrossPlatform.hpp"
-
-namespace NCryOpenGL
-{
-    namespace NWinPlatformImpl
-    {
-        struct SCriticalSection
-        {
-            CRITICAL_SECTION m_kCriticalSection;
-
-            SCriticalSection()
-            {
-                InitializeCriticalSection(&m_kCriticalSection);
-            }
-
-            ~SCriticalSection()
-            {
-                DeleteCriticalSection(&m_kCriticalSection);
-            }
-
-            void Lock()
-            {
-                EnterCriticalSection(&m_kCriticalSection);
-            }
-
-            void Unlock()
-            {
-                LeaveCriticalSection(&m_kCriticalSection);
-            }
-        };
-    }
-
-    inline void BreakUnique(const char* szFile, uint32 uLine)
-    {
-        LogMessage(eLS_Warning, "Break at %s(%d)", szFile, uLine);
-        if (IsDebuggerPresent())
-        {
-            ::DebugBreak();
-        }
-    }
-
-    inline LONG CompareExchange(LONG volatile* piDestination, LONG iExchange, LONG iComparand)
-    {
-        return InterlockedCompareExchange(piDestination, iExchange, iComparand);
-    }
-
-    inline LONG AtomicIncrement(LONG volatile* piDestination)
-    {
-        return CryInterlockedIncrement(reinterpret_cast<int volatile*>(piDestination));
-    }
-
-    inline LONG AtomicDecrement(LONG volatile* piDestination)
-    {
-        return CryInterlockedDecrement(reinterpret_cast<int volatile*>(piDestination));
-    }
-
-    typedef NWinPlatformImpl::SCriticalSection TCriticalSection;
-
-    inline void LockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Lock();
-    }
-
-    inline void UnlockCriticalSection(TCriticalSection* pCriticalSection)
-    {
-        pCriticalSection->Unlock();
-    }
-
-#if defined(WIN64)
-    __declspec(align(16))
-#elif defined(WIN32)
-    __declspec(align(8))
-#endif
-    struct SLockFreeSingleLinkedListHeader
-    {
-        volatile SLockFreeSingleLinkedListEntry* pNext;
-    };
-
-    inline void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
-    {
-        InterlockedPushEntrySList(alias_cast<PSLIST_HEADER>(&list), alias_cast<PSLIST_ENTRY>(&element));
-    }
-
-    inline void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
-    {
-        return reinterpret_cast<void*>(InterlockedPopEntrySList(alias_cast<PSLIST_HEADER>(&list)));
-    }
-
-    inline void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
-    {
-        InitializeSListHead(alias_cast<PSLIST_HEADER>(&list));
-    }
-
-    inline void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
-    {
-        return InterlockedFlushSList(alias_cast<PSLIST_HEADER>(&list));
-    }
-
-    inline void* CryModuleMemalign(size_t size, size_t alignment)
-    {
-        return _aligned_malloc(size, alignment);
-    }
-
-    inline void CryModuleMemalignFree(void* memblock)
-    {
-        return _aligned_free(memblock);
-    }
-}
-
-#endif //__GLWINPLATFORM__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALContext.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALContext.cpp
deleted file mode 100644
index e891306f96..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALContext.cpp
+++ /dev/null
@@ -1,3123 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the type CContext.
-
-#include "RenderDll_precompiled.h"
-#include "METALContext.hpp"
-#include "MetalDevice.hpp"
-#include "METALCopyShaders.h"
-
-#include "GLShader.hpp"
-#include "GLExtensions.hpp"
-#include "RenderCapabilities.h"
-
-namespace NCryMetal
-{
-    static const int QUERY_SIZE = 8; // Size to store the query result data (64 bits)
-    ////////////////////////////////////////////////////////////////////////////
-    // Cache of heavy weight objects indexed by configuration
-    ////////////////////////////////////////////////////////////////////////////
-
-    struct SPipelineCache
-    {
-        struct SHashCompare
-        {
-            size_t operator()(const SPipelineConfiguration& kConfig) const
-            {
-                //  Confetti BEGIN: Igor Lobanchikov
-                uint32 hash = [(MTLVertexDescriptor*)kConfig.m_pVertexDescriptor hash];
-                hash = (uint32)NCryMetal::GetCRC32(reinterpret_cast<const char*>(kConfig.m_apShaders), sizeof(kConfig.m_apShaders), hash);
-                hash = (uint32)NCryMetal::GetCRC32(reinterpret_cast<const char*>(&kConfig.m_AttachmentConfiguration), sizeof(kConfig.m_AttachmentConfiguration), hash);
-
-                return (size_t)hash;
-                //  Confetti End: Igor Lobanchikov
-            }
-
-            bool operator()(const SPipelineConfiguration& kLeft, const SPipelineConfiguration& kRight) const
-            {
-                //  Confetti BEGIN: Igor Lobanchikov
-                {
-                    int iCmpShaders(memcmp(kLeft.m_apShaders, kRight.m_apShaders, sizeof(kLeft.m_apShaders)));
-
-                    if (iCmpShaders != 0)
-                    {
-                        return false;
-                    }
-                }
-
-                {
-                    int iCmpAttachmments(memcmp(&kLeft.m_AttachmentConfiguration, &kRight.m_AttachmentConfiguration, sizeof(kLeft.m_AttachmentConfiguration)));
-
-                    if (iCmpAttachmments != 0)
-                    {
-                        return false;
-                    }
-                }
-
-                //  Igor: Metal has 31 of those
-                for (int i = 0; i < 31; ++i)
-                {
-                    MTLVertexAttributeDescriptor* left = ((MTLVertexDescriptor*)kLeft.m_pVertexDescriptor).attributes[i];
-                    MTLVertexAttributeDescriptor* right = ((MTLVertexDescriptor*)kRight.m_pVertexDescriptor).attributes[i];
-                    if (left.format != right.format)
-                    {
-                        return false;
-                    }
-
-                    if (left.offset != right.offset)
-                    {
-                        return false;
-                    }
-
-                    if (left.bufferIndex != right.bufferIndex)
-                    {
-                        return false;
-                    }
-                }
-
-                //  Igor: Metal has 31 of those
-                for (int i = 0; i < 31; ++i)
-                {
-                    MTLVertexBufferLayoutDescriptor* left = ((MTLVertexDescriptor*)kLeft.m_pVertexDescriptor).layouts[i];
-                    MTLVertexBufferLayoutDescriptor* right = ((MTLVertexDescriptor*)kRight.m_pVertexDescriptor).layouts[i];
-                    if (left.stepFunction != right.stepFunction)
-                    {
-                        return false;
-                    }
-
-                    if (left.stepRate != right.stepRate)
-                    {
-                        return false;
-                    }
-
-                    if (left.stride != right.stride)
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-                //  Confetti End: Igor Lobanchikov
-            }
-        };
-
-        typedef AZStd::unordered_map<SPipelineConfiguration, SPipelinePtr, SHashCompare, SHashCompare> TMap;
-
-        TMap m_kMap;
-    };
-
-    void LogCommandBufferError(int errorCode)
-    {
-        switch (errorCode)
-        {
-            case MTLCommandBufferErrorNone:
-                break;
-            case MTLCommandBufferErrorInternal:
-                DXGL_ERROR("Internal error has occurred");
-                break;
-            case MTLCommandBufferErrorTimeout:
-                CryLog("Execution of this command buffer took more time than system allows. execution interrupted and aborted.");
-                break;
-            case MTLCommandBufferErrorPageFault:
-                DXGL_ERROR("Execution of this command generated an unserviceable GPU page fault. This error maybe caused by buffer read/write attribute mismatch or outof boundary access");
-                break;
-            case MTLCommandBufferErrorBlacklisted:
-                DXGL_ERROR("Access to this device has been revoked because this client has been responsible for too many timeouts or hangs");
-                break;
-            case MTLCommandBufferErrorNotPermitted:
-                DXGL_ERROR("This process does not have aceess to use device");
-                break;
-            case MTLCommandBufferErrorOutOfMemory:
-                DXGL_ERROR("Insufficient memory");
-                break;
-            case MTLCommandBufferErrorInvalidResource:
-                DXGL_ERROR("The command buffer referenced an invlid resource. This error is most commonly caused when caller deletes a resource before executing a command buffer that refers to it");
-                break;
-            default:
-                DXGL_ERROR("Unknown error status was set on the command buffer.");
-                break;
-        }
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    CContext::CRingBuffer::CRingBuffer(id<MTLDevice> device, unsigned int bufferSize, unsigned int alignment, MemRingBufferStorage memAllocMode)
-        : m_uiFreePositionPointer(0)
-        , m_uiDefaultAlignment(alignment)
-    {
-        memset(m_BufferUsedPerFrame, 0, sizeof(m_BufferUsedPerFrame));
-        memset(m_BufferPadPerFrame, 0, sizeof(m_BufferPadPerFrame));
-
-        
-        if (memAllocMode == MEM_SHARED_RINGBUFFER)
-        {
-            //  Igor: write combined is used so never write then read from this buffer. This won't work. This behaviour is actually
-            //  similar to DX11 implementation of write-only buffers. So just don't do anything fancy on metal and it will be fine.
-            m_Buffer = [device newBufferWithLength:bufferSize options:MTLCPUCacheModeWriteCombined|MTLResourceStorageModeShared ];  //Use shared memory
-        }
-#if defined(AZ_PLATFORM_MAC)
-        else
-        {
-            //Use Managed memory.
-            m_Buffer = [device newBufferWithLength:bufferSize options:MTLResourceStorageModeManaged ];
-        }
-#endif
-    }
-
-    void CContext::CRingBuffer::OnFrameStart(int iCurrentFrameSlot, int iNextFrameSlot)
-    {
-        CRY_ASSERT(!m_BufferPadPerFrame[iCurrentFrameSlot]);
-
-        m_BufferUsedPerFrame[iCurrentFrameSlot] = 0;
-        m_BufferPadPerFrame[iNextFrameSlot] = 0;
-    }
-
-    void CContext::CRingBuffer::ConsumeTrack(int iCurrentFrameSlot, unsigned int size, bool bPadding)
-    {
-        if (bPadding && !m_BufferUsedPerFrame[iCurrentFrameSlot])
-        {
-            m_BufferPadPerFrame[iCurrentFrameSlot] += size;
-        }
-        else
-        {
-            m_BufferUsedPerFrame[iCurrentFrameSlot] += size;
-        }
-    }
-
-    void CContext::CRingBuffer::ValidateBufferUsage()
-    {
-        unsigned int totalBufferUsed = 0;
-        for (int i = 0; i < sizeof(m_BufferUsedPerFrame) / sizeof(m_BufferUsedPerFrame[0]); ++i)
-        {
-            totalBufferUsed += m_BufferUsedPerFrame[i];
-            totalBufferUsed += m_BufferPadPerFrame[i];
-        }
-
-        CRY_ASSERT(totalBufferUsed <= m_Buffer.length);
-
-        if (totalBufferUsed > m_Buffer.length)
-        {
-            DXGL_LOG_MSG("Ring buffer overrun. Rendering artifacts expected.");
-        }
-    }
-
-    void* CContext::CRingBuffer::Allocate(int iCurrentFrameSlot, unsigned int size, size_t &ringBufferOffsetOut, unsigned int alignment)
-    {
-        CRY_ASSERT(size <= m_Buffer.length);
-
-        if (!alignment)
-        {
-            alignment = m_uiDefaultAlignment;
-        }
-
-        unsigned int OldFreePositionPointer = m_uiFreePositionPointer;
-        //  Igor: this alignes the pointer position
-        m_uiFreePositionPointer = (m_uiFreePositionPointer + alignment - 1) / alignment * alignment;
-        ConsumeTrack(iCurrentFrameSlot, m_uiFreePositionPointer - OldFreePositionPointer, true);
-
-        DXMETAL_TODO("Consider this ring buffer padding usage.");
-        //  Igor: Motivation: This padding is used because Cryengine sometimes binds 256b constant
-        //  buffer to the shader slot which expects 1424b constant buffer. Metal runtime considers
-        //  this an error, because on the one hand there's no guarantee shader won't try to access
-        //  all data it declared in the shader code, on the other hand accessing memory past the end
-        //  of the buffer leads to undefined GPU behaviour (this means GPU might hang or crash or whatever)
-        //if (m_uiFreePositionPointer + size > m_Buffer.length)
-        if (m_uiFreePositionPointer + max(size, 1424u) > m_Buffer.length)
-        {
-            ConsumeTrack(iCurrentFrameSlot, m_Buffer.length - m_uiFreePositionPointer, true);
-            m_uiFreePositionPointer = 0;
-        }
-
-        unsigned int res = m_uiFreePositionPointer;
-
-        m_uiFreePositionPointer += size;
-        ConsumeTrack(iCurrentFrameSlot, size, false);
-
-        ValidateBufferUsage();
-        ringBufferOffsetOut = res;
-
-        return (uint8*)m_Buffer.contents + res;
-    }
-
-    CContext::CCopyTextureHelper::CCopyTextureHelper()
-        : m_PipelineStateBGRA8Unorm(0)
-        , m_PipelineStateRGBA8Unorm(0)
-        , m_PipelineStateRGBA16Float(0)
-        , m_PipelineStateRGBA32Float(0)
-        , m_PipelineStateR16Float(0)
-        , m_PipelineStateR16Unorm(0)
-        , m_PipelineStateRG16Float(0)
-        , m_PipelineStateBGRA8UnormLanczos(0)
-        , m_PipelineStateRGBA8UnormLanczos(0)
-        , m_PipelineStateBGRA8UnormBicubic(0)
-        , m_PipelineStateRGBA8UnormBicubic(0)
-        , m_samplerState(0)
-        , m_samplerStateLinear(0)
-    {
-    }
-
-    CContext::CCopyTextureHelper::~CCopyTextureHelper()
-    {
-        if (m_PipelineStateBGRA8Unorm)
-        {
-            [m_PipelineStateBGRA8Unorm release];
-        }
-
-        if (m_PipelineStateRGBA8Unorm)
-        {
-            [m_PipelineStateRGBA8Unorm release];
-        }
-
-        if (m_PipelineStateRGBA16Float)
-        {
-            [m_PipelineStateRGBA16Float release];
-        }
-        
-        if (m_PipelineStateRGBA32Float)
-        {
-            [m_PipelineStateRGBA32Float release];
-        }
-        
-        if (m_PipelineStateR16Float)
-        {
-            [m_PipelineStateR16Float release];
-        }
-        
-        if (m_PipelineStateR16Unorm)
-        {
-            [m_PipelineStateR16Unorm release];
-        }
-
-        if (m_PipelineStateRG16Float)
-        {
-            [m_PipelineStateRG16Float release];
-        }
-
-        if (m_PipelineStateBGRA8UnormLanczos)
-        {
-            [m_PipelineStateBGRA8UnormLanczos release];
-        }
-
-        if (m_PipelineStateRGBA8UnormLanczos)
-        {
-            [m_PipelineStateRGBA8UnormLanczos release];
-        }
-
-        if (m_PipelineStateBGRA8UnormBicubic)
-        {
-            [m_PipelineStateBGRA8UnormBicubic release];
-        }
-
-        if (m_PipelineStateRGBA8UnormBicubic)
-        {
-            [m_PipelineStateRGBA8UnormBicubic release];
-        }
-
-        if (m_samplerState)
-        {
-            [m_samplerState release];
-        }
-
-        if (m_samplerStateLinear)
-        {
-            [m_samplerStateLinear release];
-        }
-    }
-
-    bool CContext::CCopyTextureHelper::Initialize(CDevice* pDevice)
-    {
-        id<MTLDevice> mtlDevice = pDevice->GetMetalDevice();
-
-        {
-            MTLCompileOptions* options = [MTLCompileOptions alloc];
-            NSError* error = nil;
-            
-            id<MTLLibrary> lib = [mtlDevice newLibraryWithSource:metalCopyShaderSource
-                                  options:nil //Use default language version which is the most recent language version available
-                                  error:&error];
-
-            LOG_METAL_SHADER_SOURCE(@ "%@", metalCopyShaderSource);
-
-            if (error)
-            {
-                // Error code 4 is warning, but sometimes a 3 (compile error) is returned on warnings only.
-                // The documentation indicates that if the lib is nil there is a compile error, otherwise anything
-                // in the error is really a warning. Therefore, we check the lib instead of the error code
-                if (!lib)
-                {
-                    LOG_METAL_SHADER_ERRORS(@ "%@", error);
-                }
-                else
-                {
-                    LOG_METAL_SHADER_WARNINGS(@ "%@", error);
-                }
-
-                error = 0;
-            }
-
-            id<MTLFunction> PS = 0;
-            id<MTLFunction> VS = 0;
-
-
-            if (lib)
-            {
-                PS = [lib newFunctionWithName:@ "mainPS"];
-                VS = [lib newFunctionWithName:@ "mainVS"];
-                [lib release];
-            }
-
-
-            [options release];
-
-
-            if (!PS || !VS)
-            {
-                CRY_ASSERT(!"Can't create copy shaders???");
-                return false;
-            }
-
-            MTLRenderPipelineDescriptor* desc = [[MTLRenderPipelineDescriptor alloc] init];
-
-            // set the bound shader state settings
-            desc.vertexFunction = VS;
-            desc.fragmentFunction = PS;
-
-            MTLRenderPipelineReflection* ref;
-
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatRGBA8Unorm;
-
-                m_PipelineStateRGBA8Unorm = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-
-                if (!m_PipelineStateRGBA8Unorm)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatRGBA16Float;
-
-                m_PipelineStateRGBA16Float = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-
-                if (!m_PipelineStateRGBA16Float)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-            
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatBGRA8Unorm;
-                
-                m_PipelineStateBGRA8Unorm = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-                
-                if (!m_PipelineStateBGRA8Unorm)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-            
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatRGBA32Float;
-                
-                m_PipelineStateRGBA32Float = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-                
-                if (!m_PipelineStateRGBA32Float)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatR16Float;
-
-                m_PipelineStateR16Float = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-
-                if (!m_PipelineStateR16Float)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-            
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatR16Unorm;
-                
-                m_PipelineStateR16Unorm = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-                
-                if (!m_PipelineStateR16Unorm)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatRG16Float;
-                m_PipelineStateRG16Float = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-                if (!m_PipelineStateRG16Float)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generating pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pippeline???");
-                    return false;
-                }
-            }
-            [PS release];
-            [VS release];
-        }
-
-        {
-            MTLCompileOptions* options = [MTLCompileOptions alloc];
-            NSError* error = nil;
-            
-            id<MTLLibrary> lib = [mtlDevice newLibraryWithSource:metalCopyShaderSourceLanczos
-                                  options:nil  //Use default language version which is the most recent language version available
-                                  error:&error];
-            
-            LOG_METAL_SHADER_SOURCE(@ "%@", metalCopyShaderSourceLanczos);
-
-            if (error)
-            {
-                // Error code 4 is warning, but sometimes a 3 (compile error) is returned on warnings only.
-                // The documentation indicates that if the lib is nil there is a compile error, otherwise anything
-                // in the error is really a warning. Therefore, we check the lib instead of the error code
-                if (!lib)
-                {
-                    LOG_METAL_SHADER_ERRORS(@ "%@", error);
-                }
-                else
-                {
-                    LOG_METAL_SHADER_WARNINGS(@ "%@", error);
-                }
-
-                error = 0;
-            }
-
-            id<MTLFunction> PS_Lanczos = 0;
-            id<MTLFunction> PS_Bicubic = 0;
-            id<MTLFunction> VS = 0;
-
-
-            if (lib)
-            {
-                PS_Lanczos = [lib newFunctionWithName:@ "mainLanczosPS"];
-                PS_Bicubic = [lib newFunctionWithName:@ "mainBicubicPS"];
-                VS = [lib newFunctionWithName:@ "mainVS"];
-                [lib release];
-            }
-
-
-            [options release];
-
-
-            if (!PS_Lanczos || !PS_Bicubic || !VS)
-            {
-                CRY_ASSERT(!"Can't create copy shaders???");
-                return false;
-            }
-
-            MTLRenderPipelineDescriptor* desc = [[MTLRenderPipelineDescriptor alloc] init];
-
-            // set the bound shader state settings
-            desc.vertexFunction = VS;
-
-            MTLRenderPipelineReflection* ref;
-
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatRGBA8Unorm;
-
-                desc.fragmentFunction = PS_Lanczos;
-                m_PipelineStateRGBA8UnormLanczos = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-
-                desc.fragmentFunction = PS_Bicubic;
-                m_PipelineStateRGBA8UnormBicubic = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-
-                if (!m_PipelineStateRGBA8UnormLanczos || !m_PipelineStateRGBA8UnormBicubic)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-
-            {
-                desc.colorAttachments[0].pixelFormat = MTLPixelFormatBGRA8Unorm;
-
-                desc.fragmentFunction = PS_Lanczos;
-                m_PipelineStateBGRA8UnormLanczos = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-
-                desc.fragmentFunction = PS_Bicubic;
-                m_PipelineStateBGRA8UnormBicubic = [mtlDevice newRenderPipelineStateWithDescriptor:desc error : &error];
-
-                if (!m_PipelineStateBGRA8UnormLanczos || !m_PipelineStateBGRA8UnormBicubic)
-                {
-                    LOG_METAL_PIPELINE_ERRORS(@ "Error generation pipeline object: %@", error);
-                    CRY_ASSERT(!"Can't create copy pipeline???");
-                    return false;
-                }
-            }
-
-            [PS_Lanczos release];
-            [PS_Bicubic release];
-            [VS release];
-        }
-
-        {
-            MTLSamplerDescriptor* desc = [[MTLSamplerDescriptor alloc] init];
-            m_samplerState = [mtlDevice newSamplerStateWithDescriptor:desc];
-
-            desc.magFilter = MTLSamplerMinMagFilterLinear;
-            desc.minFilter = MTLSamplerMinMagFilterLinear;
-            m_samplerStateLinear = [mtlDevice newSamplerStateWithDescriptor:desc];
-
-            [desc release];
-        }
-
-        m_DeviceRef = mtlDevice; // used to submit constant buffer when using custom filtering shaders
-
-        return true;
-    }
-
-    bool CContext::CCopyTextureHelper::DoTopMipSlowCopy(id<MTLTexture> texDst, id<MTLTexture> texSrc, CContext* pContext, CopyFilterType const filterType)
-    {
-        pContext->FlushCurrentEncoder();
-        id <MTLCommandBuffer> commandBuffer = pContext->GetCurrentCommandBuffer();
-
-        //  Igor: this is autoreleased object.
-        MTLRenderPassDescriptor* RenderPass = [MTLRenderPassDescriptor renderPassDescriptor];
-
-        id<MTLTexture> mtlTexture = texDst;
-        MTLRenderPassColorAttachmentDescriptor* ColorAttachment = RenderPass.colorAttachments[0];
-        ColorAttachment.texture = mtlTexture;
-        ColorAttachment.storeAction = MTLStoreActionStore;
-        //  Igor: do restore if upading only a part of the texture!
-        ColorAttachment.loadAction = MTLLoadActionDontCare;
-        ColorAttachment.level = 0;
-
-        if (mtlTexture.textureType == MTLTextureType3D)
-        {
-            ColorAttachment.depthPlane = 0;
-        }
-        else
-        {
-            ColorAttachment.slice = 0;
-        }
-
-        // MTLBlitCommandEncoder is an autorelease object
-        id<MTLRenderCommandEncoder> renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:RenderPass];
-
-        [renderEncoder setRenderPipelineState: SelectPipelineState(texDst.pixelFormat, filterType)];
-        if (filterType == BILINEAR || filterType == BICUBIC)
-        {
-            [renderEncoder setFragmentSamplerState: m_samplerStateLinear atIndex : 0];
-        }
-        else
-        {
-            [renderEncoder setFragmentSamplerState: m_samplerState atIndex : 0];
-        }
-        [renderEncoder setFragmentTexture: texSrc atIndex : 0];
-
-        // Upload uniforms for custom filtering
-        if (LANCZOS == filterType)
-        {
-            int srcWidth  = [texSrc width];
-            int srcHeight = [texSrc height];
-            int dstWidth  = [texDst width];
-            int dstHeight = [texDst height];
-
-            float pixelWidth  = 1.f / dstWidth;
-            float pixelHeight = 1.f / dstHeight;
-
-            m_Uniforms.params0[0] = 1.5;
-            m_Uniforms.params0[1] = 1.5;
-            m_Uniforms.params0[2] = 1.0;
-            m_Uniforms.params0[3] = 1.0;
-
-            m_Uniforms.params1[0] = 1.f / srcWidth;
-            m_Uniforms.params1[1] = 1.f / srcHeight;
-            m_Uniforms.params1[2] = 0.5f * m_Uniforms.params1[0] - m_Uniforms.params0[0] * pixelWidth;
-            m_Uniforms.params1[3] = 0.5f * m_Uniforms.params1[1] - m_Uniforms.params0[1] * pixelHeight;
-
-            m_Uniforms.params2[0] = 1.f / ((float)dstWidth / srcWidth);
-            m_Uniforms.params2[1] = 1.f / ((float)dstHeight / srcHeight);
-            m_Uniforms.params2[2] = -m_Uniforms.params0[0] + 0.5f * m_Uniforms.params2[0];
-            m_Uniforms.params2[3] = -m_Uniforms.params0[1] + 0.5f * m_Uniforms.params2[1];
-
-            {
-                id<MTLBuffer> uni_buff;
-                uni_buff = [m_DeviceRef newBufferWithBytes:(void*)&m_Uniforms length:sizeof(Uniforms)options:0];
-                [renderEncoder setFragmentBuffer: uni_buff offset : 0 atIndex : 0];
-            }
-        }
-
-
-
-        [renderEncoder drawPrimitives: MTLPrimitiveTypeTriangle vertexStart : 0 vertexCount : 3];
-
-        [renderEncoder endEncoding];
-
-        return true;
-    }
-
-    id<MTLRenderPipelineState> CContext::CCopyTextureHelper::SelectPipelineState(MTLPixelFormat pixelFormat, CopyFilterType const filterType)
-    {
-        switch (pixelFormat)
-        {
-        case MTLPixelFormatRGBA8Unorm:
-            if (filterType == LANCZOS)
-            {
-                return m_PipelineStateRGBA8UnormLanczos;
-            }
-            else if (filterType == BICUBIC)
-            {
-                return m_PipelineStateRGBA8UnormBicubic;
-            }
-            else
-            {
-                return m_PipelineStateRGBA8Unorm;
-            }
-
-        case MTLPixelFormatRGBA16Float:
-            return m_PipelineStateRGBA16Float;
-                
-        case MTLPixelFormatRGBA32Float:
-            return m_PipelineStateRGBA32Float;
-                
-        case MTLPixelFormatR16Float:
-            return m_PipelineStateR16Float;
-                
-        case MTLPixelFormatR16Unorm:
-            return m_PipelineStateR16Unorm;
-
-        case MTLPixelFormatRG16Float:
-            return m_PipelineStateRG16Float;
-
-        case MTLPixelFormatBGRA8Unorm:
-            if (filterType == LANCZOS)
-            {
-                return m_PipelineStateBGRA8UnormLanczos;
-            }
-            else if (filterType == BICUBIC)
-            {
-                return m_PipelineStateBGRA8UnormBicubic;
-            }
-            else
-            {
-                return m_PipelineStateBGRA8Unorm;
-            }
-
-        default:
-            return nil;
-        }
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    ////////////////////////////////////////////////////////////////////////////
-    // CGPUEventsHelper implementation
-    ////////////////////////////////////////////////////////////////////////////
-    CGPUEventsHelper::CGPUEventsHelper()
-        : m_uiRTSwitchedAt(m_sInvalidRTSwitchedAt)
-    {
-    }
-
-    CGPUEventsHelper::~CGPUEventsHelper()
-    {
-        for (int i = 0; i < m_currentMarkerStack.size(); ++i)
-        {
-            [m_currentMarkerStack[i] release];
-        }
-
-        for (int i = 0; i < m_aMarkerQueue.size(); ++i)
-        {
-            if (m_aMarkerQueue[i].m_pMessage)
-            {
-                [m_aMarkerQueue[i].m_pMessage release];
-            }
-        }
-    }
-
-    void CGPUEventsHelper::AddMarker(const char* pszMessage, EActionType eAction)
-    {
-        NSString* source = pszMessage ?
-            [[NSString alloc] initWithCString : pszMessage
-encoding: NSASCIIStringEncoding]
-            : nil;
-
-        m_aMarkerQueue.push_back(SMarkerQueueAction());
-        m_aMarkerQueue.back().m_pMessage = source;
-        m_aMarkerQueue.back().m_eAction = eAction;
-    }
-
-    void CGPUEventsHelper::FlushActions(id <MTLCommandEncoder> pEncoder, EFlushType eFlushType)
-    {
-        CRY_ASSERT(pEncoder);
-
-        switch (eFlushType)
-        {
-        case eFT_Default:
-            m_uiRTSwitchedAt = m_sInvalidRTSwitchedAt;
-            ReplayActions(pEncoder, m_aMarkerQueue.size());
-            break;
-        case eFT_FlushEncoder:
-            if (m_uiRTSwitchedAt != m_sInvalidRTSwitchedAt)
-            {
-                MovePushesToNextEncoder();
-                ReplayActions(pEncoder, m_uiRTSwitchedAt);
-                m_uiRTSwitchedAt = m_sInvalidRTSwitchedAt;
-            }
-            break;
-        case eFT_NewEncoder:
-            for (size_t i = 0; i < m_currentMarkerStack.size(); ++i)
-            {
-                [pEncoder pushDebugGroup: m_currentMarkerStack[i]];
-            }
-
-            m_uiRTSwitchedAt = m_sInvalidRTSwitchedAt;
-            ReplayActions(pEncoder, m_aMarkerQueue.size());
-            break;
-        default:
-            DXMETAL_NOT_IMPLEMENTED;
-        }
-    }
-
-    void CGPUEventsHelper::OnSetRenderTargets()
-    {
-        m_uiRTSwitchedAt = m_aMarkerQueue.size();
-    }
-
-    void CGPUEventsHelper::ReplayActions(id <MTLCommandEncoder> pEncoder, uint32 numActions)
-    {
-        CRY_ASSERT(numActions <= m_aMarkerQueue.size());
-
-        for (uint32 i = 0; i < numActions; ++i)
-        {
-            switch (m_aMarkerQueue[i].m_eAction)
-            {
-            case eAT_Push:
-                [pEncoder pushDebugGroup: m_aMarkerQueue[i].m_pMessage];
-                m_currentMarkerStack.push_back(m_aMarkerQueue[i].m_pMessage);
-                [m_currentMarkerStack.back() retain];
-                break;
-            case eAT_Pop:
-                [pEncoder popDebugGroup];
-                [m_currentMarkerStack.back() release];
-                m_currentMarkerStack.pop_back();
-                break;
-            case eAT_Event:
-                [pEncoder insertDebugSignpost: m_aMarkerQueue[i].m_pMessage];
-                break;
-            default:
-                DXMETAL_NOT_IMPLEMENTED;
-            }
-            if (m_aMarkerQueue[i].m_pMessage)
-            {
-                [m_aMarkerQueue[i].m_pMessage release];
-            }
-        }
-
-        m_aMarkerQueue.erase(m_aMarkerQueue.begin(), m_aMarkerQueue.begin() + numActions);
-    }
-
-    void CGPUEventsHelper::MovePushesToNextEncoder()
-    {
-        CRY_ASSERT(m_uiRTSwitchedAt <= m_aMarkerQueue.size());
-        uint32 i = m_uiRTSwitchedAt;
-        for (; i > 0; --i)
-        {
-            if (m_aMarkerQueue[i - 1].m_eAction == eAT_Pop)
-            {
-                break;
-            }
-
-            if (m_aMarkerQueue[i - 1].m_eAction == eAT_Push)
-            {
-                m_uiRTSwitchedAt = i - 1;
-            }
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // CContext implementation
-    ////////////////////////////////////////////////////////////////////////////
-
-    CContext::CContext(CDevice* pDevice)
-        : m_pDevice(pDevice)
-        , m_pPipelineCache(new SPipelineCache)
-        , m_pInputLayout(NULL)
-        , m_bFrameBufferStateDirty(false)
-        , m_bPipelineDirty(false)
-        , m_bInputLayoutDirty(false)
-        , m_bInputAssemblerSlotsDirty(false)
-        , m_uIndexStride(0)
-        , m_uVertexOffset(0)
-        //  Confetti BEGIN: Igor Lobanchikov
-        , m_CurrentCommandBuffer(nil)
-        , m_CurrentEncoder(0)
-        , m_CurrentComputeEncoder(0)
-        , m_CurrentBlitEncoder(0)
-        , m_iCurrentFrameSlot(-1)
-        , m_iCurrentFrameEventSlot(-1)
-        DXMETAL_TODO("Tune this parameter per project.")
-#if defined(AZ_PLATFORM_MAC)
-        , m_RingBufferShared(pDevice->GetMetalDevice(), 10 * 1024 * 1024, 256, MEM_SHARED_RINGBUFFER)
-        , m_RingBufferManaged(pDevice->GetMetalDevice(), 50 * 1024 * 1024, 256, MEM_MANAGED_RINGBUFFER)
-#else
-        , m_RingBufferShared(pDevice->GetMetalDevice(), 16 * 1024 * 1024, 256, MEM_SHARED_RINGBUFFER)
-#endif
-        , m_QueryRingBuffer(pDevice->GetMetalDevice(), 32 * 1024, 8, MEM_SHARED_RINGBUFFER)
-        , m_bPossibleClearPending(false)
-        //  Confetti End: Igor Lobanchikov
-        , m_MetalPrimitiveType(MTLPrimitiveTypePoint)
-        , m_MetalIndexType(MTLIndexTypeUInt16)
-        , m_defaultSamplerState(0)
-    {
-
-        m_kStateCache.m_kDepthStencil.m_DepthStencilState = 0;
-        m_kStateCache.m_kDepthStencil.m_iStencilRef = 0;
-        m_kStateCache.m_kDepthStencil.m_bDSSDirty = false;
-        m_kStateCache.m_kDepthStencil.m_bStencilRefDirty = true;
-
-        m_kStateCache.m_kRasterizer.m_RateriserDirty = SRasterizerCache::RS_NOT_INITIALIZED;
-
-        memset(&m_kStateCache.m_StageCache, 0, sizeof(m_kStateCache.m_StageCache));
-        for (int i = 0; i < SStageStateCache::eBST_Count; ++i)
-        {
-            m_kStateCache.m_StageCache.m_BufferState[i].m_MaxBufferUsed = -1;
-            m_kStateCache.m_StageCache.m_BufferState[i].m_MinBufferUsed = SBufferStateStageCache::s_MaxBuffersPerStage;
-            m_kStateCache.m_StageCache.m_TextureState[i].m_MaxTextureUsed = -1;
-            m_kStateCache.m_StageCache.m_TextureState[i].m_MinTextureUsed = STextureStageState::s_MaxTexturesPerStage;
-            m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed = -1;
-            m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed = SSamplerStageState::s_MaxSamplersPerStage;
-        }
-
-        for (int i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
-        {
-            m_kStateCache.m_kBlend.colorAttachements[i].ResetToDefault();
-        }
-        
-        NCryMetal::CacheMinOSVersionInfo();
-        NCryMetal::CacheGPUFamilyFeaturSetInfo(m_pDevice->GetMetalDevice());       
-    }
-
-    CContext::~CContext()
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_kStateCache.m_kDepthStencil.m_DepthStencilState)
-        {
-            [m_kStateCache.m_kDepthStencil.m_DepthStencilState release];
-        }
-
-        for (int i = 0; i < SStageStateCache::eBST_Count; ++i)
-        {
-            for (int j = 0; j < SBufferStateStageCache::s_MaxBuffersPerStage; ++j)
-            {
-                if (m_kStateCache.m_StageCache.m_BufferState[i].m_Buffers[j])
-                {
-                    [m_kStateCache.m_StageCache.m_BufferState[i].m_Buffers[j] release];
-                }
-            }
-
-            for (int j = 0; j < STextureStageState::s_MaxTexturesPerStage; ++j)
-            {
-                if (m_kStateCache.m_StageCache.m_SamplerState[i].m_Samplers[j])
-                {
-                    [m_kStateCache.m_StageCache.m_SamplerState[i].m_Samplers[j] release];
-                }
-            }
-        }
-
-        //  Confetti End: Igor Lobanchikov
-
-        delete m_pPipelineCache;
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_CurrentCommandBuffer)
-        {
-            [m_CurrentCommandBuffer release];
-        }
-        m_CurrentCommandBuffer = nil;
-        //  Confetti End: Igor Lobanchikov
-
-        if (m_defaultSamplerState)
-        {
-            [m_defaultSamplerState release];
-        }
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    void CContext::InitMetalFrameResources()
-    {
-        dispatch_semaphore_wait(m_FrameQueueSemaphore, DISPATCH_TIME_FOREVER);
-        m_iCurrentFrameSlot = (m_iCurrentFrameSlot + 1) % m_MaxFrameQueueSlots;
-        m_iCurrentFrameEventSlot = (m_iCurrentFrameEventSlot + 1) % m_MaxFrameEventSlots;
-
-        m_RingBufferShared.OnFrameStart(m_iCurrentFrameSlot, (m_iCurrentFrameSlot + 1) % m_MaxFrameQueueSlots);
-#if defined(AZ_PLATFORM_MAC)
-        m_RingBufferManaged.OnFrameStart(m_iCurrentFrameSlot, (m_iCurrentFrameSlot + 1) % m_MaxFrameQueueSlots);
-#endif
-        m_QueryRingBuffer.OnFrameStart(m_iCurrentFrameEventSlot, (m_iCurrentFrameEventSlot + 1) % m_MaxFrameEventSlots);
-
-        //  At this point all the resources at corresponding slots are considered unused
-        m_iCurrentEvent = -1;
-
-        NextCommandBuffer();
-    }
-
-    SContextEventHelper* CContext::GetCurrentEventHelper()
-    {
-        if (m_eEvents[m_iCurrentFrameEventSlot].size() <= m_iCurrentEvent)
-        {
-            m_eEvents[m_iCurrentFrameEventSlot].push_back((SContextEventHelper*)Malloc(sizeof(SContextEventHelper)));
-        }
-
-        return m_eEvents[m_iCurrentFrameEventSlot][m_iCurrentEvent];
-    }
-
-    void CContext::NextCommandBuffer()
-    {
-        CRY_ASSERT(!m_CurrentCommandBuffer);
-
-        //m_CurrentCommandBuffer = [m_pDevice->GetMetalCommandQueue() commandBufferWithUnretainedReferences];
-        m_CurrentCommandBuffer = [m_pDevice->GetMetalCommandQueue() commandBuffer];
-        [m_CurrentCommandBuffer retain];
-        ++m_iCurrentEvent;
-
-        __block SContextEventHelper* pEventHelper = GetCurrentEventHelper();
-        pEventHelper->bTriggered = false;
-        pEventHelper->bCommandBufferSubmitted = false;
-        pEventHelper->bCommandBufferPreSubmitted = false;
-
-        [m_CurrentCommandBuffer addCompletedHandler: ^ (id < MTLCommandBuffer > Buffer)
-         {
-             CRY_ASSERT(pEventHelper->bCommandBufferPreSubmitted);
-             if (!pEventHelper->bCommandBufferSubmitted)
-             {
-                 LOG_METAL_PIPELINE_ERRORS(@ "Command buffer was finished too fast. Do we have anything to render?");
-             }
-             pEventHelper->bTriggered = true;
-         }];
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    bool CContext::Initialize()
-    {
-        DXGL_SCOPED_PROFILE("CContext::Initialize")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        m_FrameQueueSemaphore = dispatch_semaphore_create(m_MaxFrameQueueDepth);
-        InitMetalFrameResources();
-
-        if (!m_CopyTextureHelper.Initialize(m_pDevice))
-        {
-            return false;
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        {
-            MTLSamplerDescriptor* desc = [[MTLSamplerDescriptor alloc] init];
-            m_defaultSamplerState = [m_pDevice->GetMetalDevice() newSamplerStateWithDescriptor:desc];
-            [desc release];
-        }
-
-        return GetImplicitStateCache(m_kStateCache);
-    }
-
-    bool CContext::GetImplicitStateCache(SImplicitStateCache& kCache)
-    {
-        DXGL_SCOPED_PROFILE("CContext::GetImplicitStateCache")
-
-        kCache.m_bBlendColorDirty = false;
-        memset(&kCache.m_akBlendColor.m_afRGBA, 0, sizeof(kCache.m_akBlendColor.m_afRGBA));
-
-        kCache.m_bViewportDirty = false;
-        kCache.m_bViewportDefault = true;
-        memset(&kCache.m_DefaultViewport, 0, sizeof(kCache.m_DefaultViewport));
-        kCache.m_DefaultViewport.zfar = 1.0;
-        kCache.m_CurrentViewport = kCache.m_DefaultViewport;
-
-        return true;
-    }
-
-    template <typename T>
-    inline bool RefreshCache(T& kCache, T kState)
-    {
-        bool bDirty(kCache != kState);
-        kCache = kState;
-        return bDirty;
-    }
-
-#define CACHE_VAR(_Cache, _State) RefreshCache(_Cache, _State)
-#define CACHE_FIELD(_Cache, _State, _Member) RefreshCache((_Cache)._Member, (_State)._Member)
-
-    bool CContext::SetBlendState(const SBlendState& kState)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetBlendState")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        //  Igor: this is important to keep RT count equal to metal RT count
-        CRY_ASSERT(D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT == SAttachmentConfiguration::s_ColorAttachmentDescCount);
-
-        for (int i = 0; i < SAttachmentConfiguration::s_ColorAttachmentDescCount; ++i)
-        {
-            SMetalBlendState& srcBlendState = m_kStateCache.m_kBlend.colorAttachements[i];
-            SMetalBlendState& targetBlendState = m_kPipelineConfiguration.m_AttachmentConfiguration.colorAttachments[i];
-            bool bTargetIsBound = (m_kPipelineConfiguration.m_AttachmentConfiguration.colorAttachments[i].pixelFormat != MTLPixelFormatInvalid);
-            srcBlendState = kState.colorAttachements[i];
-
-            if (!bTargetIsBound && targetBlendState.blendingEnabled)
-            {
-                m_bPipelineDirty = true;
-                targetBlendState.ResetToDefault();
-            }
-            else if (bTargetIsBound && memcmp(&srcBlendState, &targetBlendState, sizeof(srcBlendState)))
-            {
-                m_bPipelineDirty = true;
-                targetBlendState = srcBlendState;
-            }
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        return true;
-    }
-
-    void CContext::SetSampleMask(uint32 uSampleMask)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetSampleMask")
-        
-        //uSampleMask can be 0 when switching maps.
-        if(uSampleMask!=0)
-        {
-            //todo:add support for multisampling on metal
-            //Assert to check if calling code is expecting this support
-            CRY_ASSERT(uSampleMask & 0xFF == 0xFF);
-        }
-    }
-
-    void CContext::SetBlendColor(float fRed, float fGreen, float fBlue, float fAlpha)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetBlendColor")
-
-        SColor kBlendColor;
-        kBlendColor.m_afRGBA[0] = fRed;
-        kBlendColor.m_afRGBA[1] = fGreen;
-        kBlendColor.m_afRGBA[2] = fBlue;
-        kBlendColor.m_afRGBA[3] = fAlpha;
-        if (CACHE_VAR(m_kStateCache.m_akBlendColor, kBlendColor))
-        {
-            m_kStateCache.m_bBlendColorDirty = true;
-        }
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    bool CContext::SetDepthStencilState(
-        id<MTLDepthStencilState> depthStencilState,
-        uint32 iStencilRef)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetDepthStencilState")
-
-        SDepthStencilCache & kDSCache(m_kStateCache.m_kDepthStencil);
-        if (kDSCache.m_iStencilRef != iStencilRef)
-        {
-            kDSCache.m_iStencilRef = iStencilRef;
-            kDSCache.m_bStencilRefDirty = true;
-        }
-
-        if (depthStencilState != kDSCache.m_DepthStencilState)
-        {
-            if (kDSCache.m_DepthStencilState)
-            {
-                [kDSCache.m_DepthStencilState release];
-            }
-
-            kDSCache.m_DepthStencilState = depthStencilState;
-
-            if (kDSCache.m_DepthStencilState)
-            {
-                [kDSCache.m_DepthStencilState retain];
-            }
-
-            kDSCache.m_bDSSDirty = true;
-        }
-
-        return true;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    bool CContext::SetRasterizerState(const SRasterizerState& kState)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetRasterizerState")
-        //  Confetti BEGIN: Igor Lobanchikov
-        SRasterizerCache & kCache(m_kStateCache.m_kRasterizer);
-        SRasterizerState& kMetalCache(m_kStateCache.m_kRasterizer);
-        if (kCache.m_RateriserDirty & SRasterizerCache::RS_NOT_INITIALIZED)
-        {
-            kMetalCache = kState;
-            kCache.m_RateriserDirty = SRasterizerCache::RS_ALL_DIRTY;
-        }
-        else
-        {
-            if (kMetalCache.cullMode != kState.cullMode)
-            {
-                kMetalCache.cullMode = kState.cullMode;
-                kCache.m_RateriserDirty |= SRasterizerCache::RS_CULL_MODE_DIRTY;
-            }
-
-            if (kMetalCache.depthBias != kState.depthBias
-                || kMetalCache.depthBiasClamp != kState.depthBiasClamp
-                || kMetalCache.depthSlopeScale != kState.depthSlopeScale)
-            {
-                kMetalCache.depthBias = kState.depthBias;
-                kMetalCache.depthBiasClamp = kState.depthBiasClamp;
-                kMetalCache.depthSlopeScale = kState.depthSlopeScale;
-                kCache.m_RateriserDirty |= SRasterizerCache::RS_DEPTH_BIAS_DIRTY;
-            }
-
-            if (kMetalCache.frontFaceWinding != kState.frontFaceWinding)
-            {
-                kMetalCache.frontFaceWinding = kState.frontFaceWinding;
-                kCache.m_RateriserDirty |= SRasterizerCache::RS_WINDING_DIRTY;
-            }
-
-            if (kMetalCache.triangleFillMode != kState.triangleFillMode)
-            {
-                kMetalCache.triangleFillMode = kState.triangleFillMode;
-                kCache.m_RateriserDirty |= SRasterizerCache::RS_FILL_MODE_DIRTY;
-            }
-
-            if (kMetalCache.depthClipMode != kState.depthClipMode)
-            {
-                kMetalCache.depthClipMode = kState.depthClipMode;
-                kCache.m_RateriserDirty |= SRasterizerCache::RS_DEPTH_CLIP_MODE_DIRTY;
-            }
-
-            if (kMetalCache.scissorEnable != kState.scissorEnable)
-            {
-                kMetalCache.scissorEnable = kState.scissorEnable;
-                kCache.m_RateriserDirty |= SRasterizerCache::RS_SCISSOR_ENABLE_DIRTY;
-            }
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        return true;
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    id<MTLSamplerState>* patchSamplers(id<MTLSamplerState> samplers[SSamplerStageState::s_MaxSamplersPerStage], id<MTLDevice> device, id<MTLSamplerState> defaultState)
-    {
-        static id<MTLSamplerState> res[SSamplerStageState::s_MaxSamplersPerStage];
-        memcpy(res, samplers, sizeof(res));
-
-        for (int i = 0; i < SSamplerStageState::s_MaxSamplersPerStage; ++i)
-        {
-            if (!res[i])
-            {
-                res[i] = defaultState;
-            }
-        }
-
-        return res;
-    }
-    //  Confetti End: Igor Lobanchikov
-
-
-    void CContext::FlushTextureUnits()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushTextureUnits")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        {
-            //  Set VS Samplers
-            SSamplerStageState& samplerState = m_kStateCache.m_StageCache.m_SamplerState[SStageStateCache::eBST_Vertex];
-
-            NSRange range = {static_cast<NSUInteger>(samplerState.m_MinSamplerUsed),
-                             static_cast<NSUInteger>(samplerState.m_MaxSamplerUsed - samplerState.m_MinSamplerUsed + 1)};
-            //NSRange range = {samplerState.m_MinSamplerUsed, 1};
-            if (samplerState.m_MaxSamplerUsed >= samplerState.m_MinSamplerUsed)
-            {
-                //[m_CurrentEncoder setVertexSamplerStates:(samplerState.m_Samplers+samplerState.m_MinSamplerUsed)
-                [m_CurrentEncoder setVertexSamplerStates: (patchSamplers(samplerState.m_Samplers, GetDevice()->GetMetalDevice(), m_defaultSamplerState) + samplerState.m_MinSamplerUsed)
-withRange: range];
-            }
-
-            samplerState.m_MinSamplerUsed =  SSamplerStageState::s_MaxSamplersPerStage;
-            samplerState.m_MaxSamplerUsed = -1;
-        }
-
-        {
-            //  Set PS Samplers
-            SSamplerStageState& samplerState = m_kStateCache.m_StageCache.m_SamplerState[SStageStateCache::eBST_Fragment];
-
-            NSRange range = {static_cast<NSUInteger>(samplerState.m_MinSamplerUsed),
-                             static_cast<NSUInteger>(samplerState.m_MaxSamplerUsed - samplerState.m_MinSamplerUsed + 1)};
-            if (samplerState.m_MaxSamplerUsed >= samplerState.m_MinSamplerUsed)
-            {
-                //    [m_CurrentEncoder setFragmentSamplerStates:(samplerState.m_Samplers+samplerState.m_MinSamplerUsed)
-                [m_CurrentEncoder setFragmentSamplerStates: (patchSamplers(samplerState.m_Samplers, GetDevice()->GetMetalDevice(), m_defaultSamplerState) + samplerState.m_MinSamplerUsed)
-withRange: range];
-            }
-
-            samplerState.m_MinSamplerUsed =  SSamplerStageState::s_MaxSamplersPerStage;
-            samplerState.m_MaxSamplerUsed = -1;
-        }
-
-
-        {
-            //  Set VS textures
-            STextureStageState& textureState = m_kStateCache.m_StageCache.m_TextureState[SStageStateCache::eBST_Vertex];
-            id<MTLTexture> tmpTextures[STextureStageState::s_MaxTexturesPerStage];
-
-            for (int i = textureState.m_MinTextureUsed; i <= textureState.m_MaxTextureUsed; ++i)
-            {
-                tmpTextures[i] = textureState.m_Textures[i] ? textureState.m_Textures[i]->GetMetalTexture() : 0;
-            }
-
-            NSRange range = {static_cast<NSUInteger>(textureState.m_MinTextureUsed),
-                             static_cast<NSUInteger>(textureState.m_MaxTextureUsed - textureState.m_MinTextureUsed + 1)};
-            if (textureState.m_MaxTextureUsed >= textureState.m_MinTextureUsed)
-            {
-                [m_CurrentEncoder setVertexTextures: (tmpTextures + textureState.m_MinTextureUsed)
-withRange: range];
-            }
-
-            textureState.m_MinTextureUsed =  STextureStageState::s_MaxTexturesPerStage;
-            textureState.m_MaxTextureUsed = -1;
-        }
-
-        {
-            //  Set PS textures
-            STextureStageState& textureState = m_kStateCache.m_StageCache.m_TextureState[SStageStateCache::eBST_Fragment];
-            id<MTLTexture> tmpTextures[STextureStageState::s_MaxTexturesPerStage];
-
-            for (int i = textureState.m_MinTextureUsed; i <= textureState.m_MaxTextureUsed; ++i)
-            {
-                tmpTextures[i] = textureState.m_Textures[i] ? textureState.m_Textures[i]->GetMetalTexture() : 0;
-            }
-
-            NSRange range = {static_cast<NSUInteger>(textureState.m_MinTextureUsed),
-                             static_cast<NSUInteger>(textureState.m_MaxTextureUsed - textureState.m_MinTextureUsed + 1)};
-            if (textureState.m_MaxTextureUsed >= textureState.m_MinTextureUsed)
-            {
-                [m_CurrentEncoder setFragmentTextures: (tmpTextures + textureState.m_MinTextureUsed)
-withRange: range];
-            }
-
-            textureState.m_MinTextureUsed =  STextureStageState::s_MaxTexturesPerStage;
-            textureState.m_MaxTextureUsed = -1;
-        }
-
-        return;
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::FlushInputAssemblerState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushInputAssemblerState")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-
-        uint32  uMinVBSlot = 16;
-        int32   MaxSlot = -1;
-
-        DXMETAL_TODO("Allow to rebind buffers without full update. This will be handled during optimization pass later.");
-        //m_bInputAssemblerSlotsDirty = true;
-
-        if (!m_bInputAssemblerSlotsDirty)
-        {
-            for (uint32 uSlot = 0; uSlot < DXGL_ARRAY_SIZE(m_akInputAssemblerSlots); ++uSlot)
-            {
-                if (m_akInputAssemblerSlots[uSlot].m_pVertexBuffer != NULL)
-                {
-                    m_bInputAssemblerSlotsDirty |= m_akInputAssemblerSlots[uSlot].m_pVertexBuffer->m_eUsage == eBU_MapInRingBufferTTLFrame;
-                    m_bInputAssemblerSlotsDirty |= m_akInputAssemblerSlots[uSlot].m_pVertexBuffer->m_eUsage == eBU_MapInRingBufferTTLOnce;
-                }
-            }
-        }
-
-        if (m_bInputAssemblerSlotsDirty)
-        {
-            CRY_ASSERT(m_pInputLayout != NULL);
-            CRY_ASSERT(m_CurrentEncoder);
-
-            for (uint32 uSlot = 0; uSlot < DXGL_ARRAY_SIZE(m_akInputAssemblerSlots); ++uSlot)
-            {
-                SBuffer* vb = m_akInputAssemblerSlots[uSlot].m_pVertexBuffer;
-
-                if (vb != NULL)
-                {
-                    uint32 VBIndex = (DXMETAL_MAX_ENTRIES_BUFFER_ARG_TABLE - 1) - uSlot;
-
-                    if (((MTLVertexDescriptor*)m_pInputLayout->m_pVertexDescriptor).layouts[VBIndex].stride != m_akInputAssemblerSlots[uSlot].m_uStride)
-                    {
-                        m_bInputLayoutDirty = true;
-                    }
-
-                    uint32 offset = 0;
-                    id<MTLBuffer> tmpBuffer = nil;
-                    vb->GetBufferAndOffset(*this, m_akInputAssemblerSlots[uSlot].m_uOffset, m_uVertexOffset, m_akInputAssemblerSlots[uSlot].m_uStride, tmpBuffer, offset);
-
-                    [m_CurrentEncoder setVertexBuffer: tmpBuffer offset: offset atIndex: VBIndex];
-                    uMinVBSlot = VBIndex;
-                    MaxSlot = uSlot;
-                }
-            }
-
-            m_bInputAssemblerSlotsDirty = false;
-
-            //  Igor: check if vertex buffers bindings conflict with vertex constant buffer bindings
-            for (int i = uMinVBSlot; i <= m_kStateCache.m_StageCache.m_BufferState[SStageStateCache::eBST_Vertex].m_MaxBufferUsed; ++i)
-            {
-                CRY_ASSERT(!m_kStateCache.m_StageCache.m_BufferState[SStageStateCache::eBST_Vertex].m_Buffers[i]);
-            }
-
-            //  Igor: in case everything is fine and we just unbound constant buffer slots which are used by vertex buffes
-            //  make sure those slots won't be owervritten when we apply the constant buffer state
-            m_kStateCache.m_StageCache.m_BufferState[SStageStateCache::eBST_Vertex].m_MaxBufferUsed = min(m_kStateCache.m_StageCache.m_BufferState[SStageStateCache::eBST_Vertex].m_MaxBufferUsed, (int32)uMinVBSlot);
-
-            // David:   check if all transient buffers with usage eBU_MapInRingBufferTTLOnce have
-            //          had all their mapped data bound.
-            for (uint32 uSlot = 0; uSlot < DXGL_ARRAY_SIZE(m_akInputAssemblerSlots); ++uSlot)
-            {
-                SBuffer* vb = m_akInputAssemblerSlots[uSlot].m_pVertexBuffer;
-                if (vb != NULL && vb->m_eUsage == eBU_MapInRingBufferTTLOnce)
-                {
-                    // Before "setVertexBuffer", members of the list of transient mapped data are erased
-                    // in SBuffer::GetBufferAndOffset.
-                    // It should then be empty here. If not, some vertex data was mapped and never bound.
-                    CRY_ASSERT(vb->m_pTransientMappedData.empty());
-                    vb->m_pTransientMappedData.clear();
-                }
-            }
-        }
-        //  Confetti End: Igor Lobanchikov
-
-        if (m_bInputLayoutDirty)
-        {
-            if (m_pInputLayout != NULL)
-            {
-                for (uint32 uSlot = 0; uSlot < DXGL_ARRAY_SIZE(m_akInputAssemblerSlots); ++uSlot)
-                {
-                    if (m_akInputAssemblerSlots[uSlot].m_pVertexBuffer != NULL)
-                    {
-                        uint32 VBIndex = (DXMETAL_MAX_ENTRIES_BUFFER_ARG_TABLE - 1) - uSlot;
-                        ((MTLVertexDescriptor*)m_pInputLayout->m_pVertexDescriptor).layouts[VBIndex].stride = m_akInputAssemblerSlots[uSlot].m_uStride;
-                    }
-                }
-            }
-
-            m_bInputLayoutDirty = false;
-
-            m_bPipelineDirty = true;
-            //  Igor: make a copy of the vertex descriptor here, since the original one can be changed next time we
-            //  bind the buffer with the different stride. This is unlikely but we should better be on the safe side.
-            m_kPipelineConfiguration.SetVertexDescriptor(m_pInputLayout->m_pVertexDescriptor);
-        }
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    void CContext::ProfileLabel(const char* szName)
-    {
-        m_GPUEventsHelper.AddMarker(szName, CGPUEventsHelper::eAT_Event);
-    }
-
-    void CContext::ProfileLabelPush(const char* szName)
-    {
-        m_GPUEventsHelper.AddMarker(szName, CGPUEventsHelper::eAT_Push);
-    }
-
-    void CContext::ProfileLabelPop(const char* szName)
-    {
-        m_GPUEventsHelper.AddMarker(szName, CGPUEventsHelper::eAT_Pop);
-    }
-
-    void CContext::BeginOcclusionQuery(SOcclusionQuery* pQuery)
-    {
-        //  Igor: Sanity check. query must be started only once
-        for (size_t i = 0; i < m_OcclusionQueryList.size(); ++i)
-        {
-            CRY_ASSERT(m_OcclusionQueryList[i] != pQuery);
-        }
-
-        m_OcclusionQueryList.push_back(pQuery);
-
-        //  Igor: Metal supports one query at a time
-        //  Multiple queries can be simulated but this might slow down the rendering
-        //  and make the code too complicated. Stick to the simple solution for now.
-        CRY_ASSERT(m_OcclusionQueryList.size() <= 1);
-    }
-
-    void CContext::EndOcclusionQuery(SOcclusionQuery* pQuery)
-    {
-        for (size_t i = 0; i < m_OcclusionQueryList.size(); )
-        {
-            if (m_OcclusionQueryList[i] == pQuery)
-            {
-                m_OcclusionQueryList.erase(m_OcclusionQueryList.begin() + i);
-            }
-            else
-            {
-                ++i;
-            }
-        }
-
-        //  Igor: Metal supports one query at a time
-        //  Multiple queries can be simulated but this might slow down the rendering
-        //  and make the code too complicated. Stick to the simple solution for now.
-        CRY_ASSERT(m_OcclusionQueryList.size() <= 1);
-        if (m_CurrentEncoder)
-        {
-            [m_CurrentEncoder setVisibilityResultMode: MTLVisibilityResultModeDisabled offset : 0];
-        }
-    }
-
-    void CContext::FlushQueries()
-    {
-        //  Igor: Metal supports one query at a time
-        //  Multiple queries can be simulated but this might slow down the rendering
-        //  and make the code too complicated. Stick to the simple solution for now.
-        CRY_ASSERT(m_OcclusionQueryList.size() <= 1);
-        CRY_ASSERT(m_CurrentEncoder);
-
-        for (size_t i = 0; i < m_OcclusionQueryList.size(); ++i)
-        {
-            SOcclusionQuery*& pQuery = m_OcclusionQueryList[i];
-
-            pQuery->m_pEventHelper = GetCurrentEventHelper();
-
-            pQuery->m_pQueryData = (uint64*)AllocateQueryInRingBuffer();
-            *pQuery->m_pQueryData = 0;
-
-            uint32 uiOffset = (uint8*)pQuery->m_pQueryData - (uint8*)GetQueryRingBuffer().contents;
-
-            [m_CurrentEncoder setVisibilityResultMode: MTLVisibilityResultModeBoolean offset: uiOffset];
-        }
-    }
-
-    bool CContext::TrySlowCopySubresource(STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ,
-        STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, const CopyFilterType filterType)
-    {
-        //  Igor: Allow full copy only in this case. Might extend this later if need this.
-        CRY_ASSERT(!uDstSubresource && !uDstX && !uDstY && !uDstZ && !uSrcSubresource);
-        return m_CopyTextureHelper.DoTopMipSlowCopy(pDstTexture->m_Texture, pSrcTexture->m_Texture, this, filterType);
-    }
-
-
-    void CContext::FlushStateObjects()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushStateObjects")
-        CRY_ASSERT(m_CurrentEncoder);
-
-        //  Flush depth stencil
-        {
-            SDepthStencilCache& kDSCache(m_kStateCache.m_kDepthStencil);
-            if (kDSCache.m_bStencilRefDirty)
-            {
-                kDSCache.m_bStencilRefDirty = false;
-                [m_CurrentEncoder setStencilReferenceValue: kDSCache.m_iStencilRef];
-            }
-
-            if (kDSCache.m_bDSSDirty)
-            {
-                [m_CurrentEncoder setDepthStencilState: kDSCache.m_DepthStencilState];
-                kDSCache.m_bDSSDirty = false;
-            }
-        }
-
-        //  Flush vertex constant buffers
-        {
-            uint32 uStage = SStageStateCache::eBST_Vertex;
-            m_kStateCache.m_StageCache.m_BufferState[uStage].CheckForDynamicBufferUpdates();
-            int UsedBufferCount = m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed - m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed + 1;
-            if (UsedBufferCount > 0)
-            {
-                NSRange range = {static_cast<NSUInteger>(m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed),
-                                 static_cast<NSUInteger>(UsedBufferCount)};
-                [m_CurrentEncoder setVertexBuffers: m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers + m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed
-offsets: m_kStateCache.m_StageCache.m_BufferState[uStage].m_Offsets + m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed
-withRange: range];
-
-                m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed = -1;
-                m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed = SBufferStateStageCache::s_MaxBuffersPerStage;
-            }
-        }
-
-        //  Flush pixel constant buffers
-        {
-            uint32 uStage = SStageStateCache::eBST_Fragment;
-            m_kStateCache.m_StageCache.m_BufferState[uStage].CheckForDynamicBufferUpdates();
-            int UsedBufferCount = m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed - m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed + 1;
-            if (UsedBufferCount > 0)
-            {
-                NSRange range = {static_cast<NSUInteger>(m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed),
-                                 static_cast<NSUInteger>(UsedBufferCount)};
-                [m_CurrentEncoder setFragmentBuffers: m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers + m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed
-offsets: m_kStateCache.m_StageCache.m_BufferState[uStage].m_Offsets + m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed
-withRange: range];
-
-                m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed = -1;
-                m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed = SBufferStateStageCache::s_MaxBuffersPerStage;
-            }
-        }
-
-        //  Flush rasterizer state
-        if (m_kStateCache.m_kRasterizer.m_RateriserDirty & SRasterizerCache::RS_ALL_BUT_SCISSOR_DIRTY)
-        {
-            SRasterizerCache& kCache(m_kStateCache.m_kRasterizer);
-
-            if (kCache.m_RateriserDirty & SRasterizerCache::RS_CULL_MODE_DIRTY)
-            {
-                kCache.m_RateriserDirty &= ~SRasterizerCache::RS_CULL_MODE_DIRTY;
-                [m_CurrentEncoder setCullMode: kCache.cullMode];
-            }
-
-            if (kCache.m_RateriserDirty & SRasterizerCache::RS_DEPTH_BIAS_DIRTY)
-            {
-                kCache.m_RateriserDirty &= ~SRasterizerCache::RS_DEPTH_BIAS_DIRTY;
-                [m_CurrentEncoder setDepthBias: kCache.depthBias slopeScale: kCache.depthSlopeScale clamp: kCache.depthBiasClamp];
-            }
-
-            if (kCache.m_RateriserDirty & SRasterizerCache::RS_WINDING_DIRTY)
-            {
-                kCache.m_RateriserDirty &= ~SRasterizerCache::RS_WINDING_DIRTY;
-                [m_CurrentEncoder setFrontFacingWinding: kCache.frontFaceWinding];
-            }
-
-            if (kCache.m_RateriserDirty & SRasterizerCache::RS_FILL_MODE_DIRTY)
-            {
-                kCache.m_RateriserDirty &= ~SRasterizerCache::RS_FILL_MODE_DIRTY;
-                [m_CurrentEncoder setTriangleFillMode: kCache.triangleFillMode];
-            }
-            
-            //setDepthClipMode  not supported on ios.
-#if defined(AZ_COMPILER_CLANG) && AZ_COMPILER_CLANG >= 9    //@available was added in Xcode 9
-#if defined(__MAC_10_11) || defined(__IPHONE_11_0) || defined(__TVOS_11_0)
-            if (RenderCapabilities::SupportsDepthClipping() && kCache.m_RateriserDirty & SRasterizerCache::RS_DEPTH_CLIP_MODE_DIRTY)
-            {
-                kCache.m_RateriserDirty &= ~SRasterizerCache::RS_DEPTH_CLIP_MODE_DIRTY;
-                if(@available(macOS 10.11, iOS 11.0, tvOS 11.0, *))
-                {
-                    [m_CurrentEncoder setDepthClipMode: kCache.depthClipMode];
-                }
-            }
-#endif
-#endif
-        }
-
-        {
-            SRasterizerCache& kCache(m_kStateCache.m_kRasterizer);
-            if (kCache.m_RateriserDirty & SRasterizerCache::RS_SCISSOR_ENABLE_DIRTY)
-            {
-                kCache.m_RateriserDirty &= ~SRasterizerCache::RS_SCISSOR_ENABLE_DIRTY;
-                MTLViewport& viewport = m_kStateCache.m_bViewportDefault? m_kStateCache.m_DefaultViewport : m_kStateCache.m_CurrentViewport;
-                if (kCache.scissorEnable)
-                {
-                    DXMETAL_TODO("this is a hack to fix engine bugs. Can remove it if the bugs are fixed.");
-                    MTLScissorRect rect = kCache.m_scissorRect;
-                    {
-                        if (kCache.m_scissorRect.x + kCache.m_scissorRect.width > viewport.width)
-                        {
-                            //DXGL_WARNING("Metal: Warning: Scissor rect (x(%d) + width(%d))(%d) must be <= %d", (int)kCache.m_scissorRect.x, (int)kCache.m_scissorRect.width, (int)(kCache.m_scissorRect.x+kCache.m_scissorRect.width), //(int)m_kStateCache.m_DefaultViewport.width);
-                            rect.width = viewport.width - kCache.m_scissorRect.x;
-                            if (!rect.width)
-                            {
-                                rect.width = 1;
-                                rect.x -= 1;
-                            }
-                        }
-
-                        if (kCache.m_scissorRect.y + kCache.m_scissorRect.height > viewport.height)
-                        {
-                            //DXGL_WARNING("Metal: Warning: Scissor rect (y(%d) + height(%d))(%d) must be <= %d", (int)kCache.m_scissorRect.y, (int)kCache.m_scissorRect.height, (int)(kCache.m_scissorRect.y+kCache.m_scissorRect.height), (int)m_kStateCache.m_DefaultViewport.height);
-                            rect.height = viewport.height - kCache.m_scissorRect.y;
-                            if (!rect.height)
-                            {
-                                rect.height = 1;
-                                rect.y -= 1;
-                            }
-                        }
-                    }
-
-                    [m_CurrentEncoder setScissorRect: rect];
-                }
-                else
-                {
-                    MTLScissorRect rect = {static_cast<NSUInteger>(viewport.originX),
-                                           static_cast<NSUInteger>(viewport.originY),
-                                           static_cast<NSUInteger>(viewport.width),
-                                           static_cast<NSUInteger>(viewport.height)};
-                    [m_CurrentEncoder setScissorRect: rect];
-                }
-            }
-        }
-
-        //  Igor: flush blend color
-        if (m_kStateCache.m_bBlendColorDirty)
-        {
-            m_kStateCache.m_bBlendColorDirty = false;
-            [m_CurrentEncoder setBlendColorRed: m_kStateCache.m_akBlendColor.m_afRGBA[0]
-                                         green: m_kStateCache.m_akBlendColor.m_afRGBA[1]
-                                          blue: m_kStateCache.m_akBlendColor.m_afRGBA[2]
-                                         alpha: m_kStateCache.m_akBlendColor.m_afRGBA[3]];
-        }
-
-        //  Flush viewport if needed
-        if (m_kStateCache.m_bViewportDirty)
-        {
-            bool bInvalidViewport = false;
-            if (m_kStateCache.m_CurrentViewport.originX + m_kStateCache.m_CurrentViewport.width > m_kStateCache.m_DefaultViewport.width)
-            {
-                LOG_METAL_PIPELINE_ERRORS(@ "DXMETAL: Error: (viewport.originX + viewport.width)(%f) must be between 0.0f and [framebuffer width](%f)", m_kStateCache.m_CurrentViewport.originX + m_kStateCache.m_CurrentViewport.width, m_kStateCache.m_DefaultViewport.width);
-
-                bInvalidViewport = true;
-            }
-
-            if (m_kStateCache.m_CurrentViewport.originY + m_kStateCache.m_CurrentViewport.height > m_kStateCache.m_DefaultViewport.height)
-            {
-                LOG_METAL_PIPELINE_ERRORS(@ "DXMETAL: Error: (viewport.originY + viewport.height)(%f) must be between 0.0f and [framebuffer height](%f)", m_kStateCache.m_CurrentViewport.originY + m_kStateCache.m_CurrentViewport.height, m_kStateCache.m_DefaultViewport.height);
-
-                bInvalidViewport = true;
-            }
-
-            if (!bInvalidViewport)
-            {
-                [m_CurrentEncoder setViewport: m_kStateCache.m_bViewportDefault ? m_kStateCache.m_DefaultViewport : m_kStateCache.m_CurrentViewport];
-            }
-
-            m_kStateCache.m_bViewportDirty = false;
-        }
-    }
-
-    void CContext::FlushCurrentEncoder()
-    {
-        if (m_CurrentEncoder)
-        {
-            m_GPUEventsHelper.FlushActions(m_CurrentEncoder, CGPUEventsHelper::eFT_FlushEncoder);
-
-            [m_CurrentEncoder endEncoding];
-            [m_CurrentEncoder release];
-            m_CurrentEncoder = nil;
-            DXMETAL_TODO("Might want to commit command buffer here.");
-            //  Pro: more command buffers mean less latency when synchronizing to GPU since we can sync to command buffer end only
-            //  Con: too many command buffers mean more work for CPU and less readable frame capture
-            //  Call Flush(false) to commit command buffer and start a new one.
-        }
-
-        if (m_CurrentBlitEncoder)
-        {
-            m_GPUEventsHelper.FlushActions(m_CurrentBlitEncoder, CGPUEventsHelper::eFT_FlushEncoder);
-
-            [m_CurrentBlitEncoder endEncoding];
-            [m_CurrentBlitEncoder release];
-            m_CurrentBlitEncoder = nil;
-            DXMETAL_TODO("Might want to commit command buffer here.");
-            //  Pro: more command buffers mean less latency when synchronizing to GPU since we can sync to command buffer end only
-            //  Con: too many command buffers mean more work for CPU and less readable frame capture
-            //  Call Flush(false) to commit command buffer and start a new one.
-        }
-
-        if (m_CurrentComputeEncoder)
-        {
-            m_GPUEventsHelper.FlushActions(m_CurrentComputeEncoder, CGPUEventsHelper::eFT_FlushEncoder);
-
-            [m_CurrentComputeEncoder endEncoding];
-            [m_CurrentComputeEncoder release];
-            m_CurrentComputeEncoder = nil;
-            //m_kPipelineConfiguration.m_apShaders[eST_Compute] = NULL;
-            DXMETAL_TODO("Might want to commit command buffer here.");
-            //  Pro: more command buffers mean less latency when synchronizing to GPU since we can sync to command buffer end only
-            //  Con: too many command buffers mean more work for CPU and less readable frame capture
-            //  Call Flush(false) to commit command buffer and start a new one.
-        }
-    }
-    //  Confetti End: Igor Lobanchikov
-    id <MTLBlitCommandEncoder> CContext::GetBlitCommandEncoder()
-    {
-        if (!m_CurrentBlitEncoder)
-        {
-            FlushCurrentEncoder();
-            m_CurrentBlitEncoder = [m_CurrentCommandBuffer blitCommandEncoder];
-            // MTLBlitCommandEncoder is an autorelease object
-            [m_CurrentBlitEncoder retain];
-            m_GPUEventsHelper.FlushActions(m_CurrentBlitEncoder, CGPUEventsHelper::eFT_NewEncoder);
-        }
-        else
-        {
-            m_GPUEventsHelper.FlushActions(m_CurrentBlitEncoder, CGPUEventsHelper::eFT_Default);
-        }
-
-        return m_CurrentBlitEncoder;
-    }
-    
-    void  CContext::ActivateComputeCommandEncoder()
-    {
-        if (!m_CurrentComputeEncoder)
-        {
-            FlushCurrentEncoder();
-            m_CurrentComputeEncoder = [m_CurrentCommandBuffer computeCommandEncoder];
-            // MTLComputeCommandEncoder is an autorelease object
-            [m_CurrentComputeEncoder retain];
-            m_GPUEventsHelper.FlushActions(m_CurrentComputeEncoder, CGPUEventsHelper::eFT_NewEncoder);
-        }
-        else
-        {
-            m_GPUEventsHelper.FlushActions(m_CurrentComputeEncoder, CGPUEventsHelper::eFT_Default);
-        }
-    }
-
-    void CContext::FlushFrameBufferState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushFrameBufferState")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-
-        bool bDoBindRTs = m_bFrameBufferStateDirty || !m_CurrentEncoder;
-
-        //  Igor: if someone requested clear check if this was for one of the current resources.
-        //  Rebind them if necessary.
-        if (!bDoBindRTs && m_bPossibleClearPending)
-        {
-            m_bPossibleClearPending = false;
-
-            for (int i = 0; i < DXGL_ARRAY_SIZE(m_CurrentRTs); ++i)
-            {
-                SOutputMergerTextureView* pTextureView = m_CurrentRTs[i] ? m_CurrentRTs[i]->AsSOutputMergerTextureView() : NULL;
-                STexture* pTexture = pTextureView ? pTextureView->m_pTexture : NULL;
-                if (pTexture)
-                {
-                    if (pTexture->m_spTextureViewToClear.get())
-                    {
-                        CRY_ASSERT(pTexture->m_spTextureViewToClear == m_CurrentRTs[i]);
-                        if (pTexture->m_spTextureViewToClear != m_CurrentRTs[i])
-                        {
-                            DXGL_ERROR("RT View used for rendering does not match view which was used to clear RT. This behaviour is not supported for METAL");
-                        }
-                        bDoBindRTs = true;
-                    }
-                }
-            }
-
-            if (m_CurrentDepth)
-            {
-                SOutputMergerTextureView* pTextureView = m_CurrentDepth ? m_CurrentDepth->AsSOutputMergerTextureView() : NULL;
-                STexture* pTexture = pTextureView ? pTextureView->m_pTexture : NULL;
-
-                {
-                    //  Igor: deside if need to clear at this point
-                    if (pTexture->m_spTextureViewToClear.get() && pTexture->m_bClearDepth)
-                    {
-                        CRY_ASSERT(pTexture->m_spTextureViewToClear == m_CurrentDepth);
-                        if (pTexture->m_spTextureViewToClear != m_CurrentDepth)
-                        {
-                            DXGL_ERROR("Depth View used for rendering does not match view which was used to clear RT. This behaviour is not supported for METAL");
-                        }
-                        bDoBindRTs = true;
-                    }
-                }
-
-                //  Igor: attach stencil too
-                if (pTexture->m_StencilTexture)
-                {
-                    //  Igor: deside if need to clear at this point
-                    if (pTexture->m_spStencilTextureViewToClear.get() && pTexture->m_bClearStencil)
-                    {
-                        CRY_ASSERT(pTexture->m_spStencilTextureViewToClear == m_CurrentDepth);
-                        if (pTexture->m_spStencilTextureViewToClear != m_CurrentDepth)
-                        {
-                            DXGL_ERROR("Stencil View used for rendering does not match view which was used to clear RT. This behaviour is not supported for METAL");
-                        }
-                        bDoBindRTs = true;
-                    }
-                }
-            }
-
-            if (bDoBindRTs)
-            {
-                ProfileLabel("Forced new MTLRenderCommandEncoder because of RT clear");
-            }
-        }
-
-
-        if (bDoBindRTs)
-        {
-            FlushCurrentEncoder();
-
-            //  Igor: this is autoreleased object.
-            MTLRenderPassDescriptor* RenderPass = [MTLRenderPassDescriptor renderPassDescriptor];
-
-            RenderPass.visibilityResultBuffer = m_QueryRingBuffer.m_Buffer;
-
-            //  Igor: this is important to keep RT count equal to metal RT count
-            CRY_ASSERT(DXGL_ARRAY_SIZE(m_CurrentRTs) == SAttachmentConfiguration::s_ColorAttachmentDescCount);
-
-            for (int i = 0; i < DXGL_ARRAY_SIZE(m_CurrentRTs); ++i)
-            {
-                SOutputMergerTextureView* pTextureView = m_CurrentRTs[i] ? m_CurrentRTs[i]->AsSOutputMergerTextureView() : NULL;
-                STexture* pTexture = pTextureView ? pTextureView->m_pTexture : NULL;
-                MTLRenderPassColorAttachmentDescriptor* ColorAttachment = RenderPass.colorAttachments[i];
-                if (pTexture)
-                {
-                    id<MTLTexture> mtlTexture = pTexture->m_bBackBuffer ? pTexture->m_Texture : pTextureView->m_RTView;
-                    ColorAttachment.texture = mtlTexture;
-
-                    // NOTE: ternary syntax crashes profile/release builds!!!
-                    // /BuildRoot/Library/Caches/com.apple.xbs/Sources/Metal/Metal-55.1.1/Framework/MTLRenderPass.m:117: failed assertion `storeAction is not a valid MTLStoreAction.'
-                    //ColorAttachment.storeAction = pTexture->m_bColorStoreDontCare ? MTLStoreActionDontCare : MTLStoreActionStore;
-                    if (pTexture->m_bColorStoreDontCare)
-                    {
-                        ColorAttachment.storeAction = MTLStoreActionDontCare;
-                    }
-                    else
-                    {
-                        ColorAttachment.storeAction = MTLStoreActionStore;
-                    }
-
-                    m_kStateCache.m_DefaultViewport.width = pTexture->m_iWidth >> pTextureView->m_iMipLevel;
-                    m_kStateCache.m_DefaultViewport.height = pTexture->m_iHeight >> pTextureView->m_iMipLevel;
-
-                    //  Igor: deside if need to clear at this point
-                    if (pTexture->m_spTextureViewToClear.get())
-                    {
-                        CRY_ASSERT(pTexture->m_spTextureViewToClear == m_CurrentRTs[i]);
-                        if (pTexture->m_spTextureViewToClear != m_CurrentRTs[i])
-                        {
-                            DXGL_ERROR("RT View used for rendering does not match view which was used to clear RT. This behaviour is not supported for METAL");
-                        }
-
-                        ColorAttachment.loadAction = MTLLoadActionClear;
-                        ColorAttachment.clearColor = MTLClearColorMake(pTexture->m_ClearColor[0], pTexture->m_ClearColor[1], pTexture->m_ClearColor[2], pTexture->m_ClearColor[3]);
-
-                        pTexture->m_spTextureViewToClear.reset();
-                    }
-                    else
-                    {
-                        // NOTE: ternary syntax crashes profile/release builds!!!
-                        // /BuildRoot/Library/Caches/com.apple.xbs/Sources/Metal/Metal-55.1.1/Framework/MTLRenderPass.m:117: failed assertion `storeAction is not a valid MTLStoreAction.'
-                        //ColorAttachment.loadAction = pTexture->m_bColorLoadDontCare ? MTLLoadActionDontCare : MTLLoadActionLoad;
-                        if (pTexture->m_bColorLoadDontCare)
-                        {
-                            ColorAttachment.loadAction = MTLLoadActionDontCare;
-                        }
-                        else
-                        {
-                            ColorAttachment.loadAction = MTLLoadActionLoad;
-                        }
-                    }
-
-
-                    ColorAttachment.level = pTextureView->m_iMipLevel;
-
-                    if (mtlTexture.textureType == MTLTextureType3D)
-                    {
-                        ColorAttachment.depthPlane = pTextureView->m_iLayer;
-                    }
-                    else
-                    {
-                        ColorAttachment.slice = pTextureView->m_iLayer;
-                    }
-                }
-                //  Igor: set color attachement data used for pipeline configuration here
-                {
-                    m_kPipelineConfiguration.m_AttachmentConfiguration.colorAttachments[i].pixelFormat = ColorAttachment.texture.pixelFormat;
-                }
-
-                SMetalBlendState& srcBlendState = m_kStateCache.m_kBlend.colorAttachements[i];
-                SMetalBlendState& targetBlendState = m_kPipelineConfiguration.m_AttachmentConfiguration.colorAttachments[i];
-                bool bTargetIsBound = (m_kPipelineConfiguration.m_AttachmentConfiguration.colorAttachments[i].pixelFormat != MTLPixelFormatInvalid);
-                if (bTargetIsBound)
-                {
-                    targetBlendState = srcBlendState;
-                }
-                else
-                {
-                    targetBlendState.ResetToDefault();
-                }
-            }
-
-            
-            if (m_CurrentDepth)
-            {
-                SOutputMergerTextureView* pTextureView = m_CurrentDepth ? m_CurrentDepth->AsSOutputMergerTextureView() : NULL;
-                STexture* pTexture = pTextureView ? pTextureView->m_pTexture : NULL;
-                
-                //Since the depth and stencil buffers are combined for OSX we reconfigure the DontCare flags
-                //to enforce the correct behaviour. Ideally the driver should be doing this internally but
-                //there is no documentation on it.
-#if defined(AZ_PLATFORM_MAC) 
-                
-                //Only do this if the buffers are combined.
-                if (pTexture->m_Texture.pixelFormat == MTLPixelFormatDepth32Float_Stencil8 ||
-                    pTexture->m_Texture.pixelFormat == MTLPixelFormatDepth24Unorm_Stencil8 ||
-                    pTexture->m_Texture.pixelFormat == MTLPixelFormatX32_Stencil8 ||
-                    pTexture->m_Texture.pixelFormat == MTLPixelFormatX24_Stencil8)
-                {
-                    //If depth/stencil is set to load/store dontcare but the other one is not
-                    //set the first one to true as well.
-                    if(!pTexture->m_bDepthStoreDontCare || !pTexture->m_bStencilStoreDontCare)
-                    {
-                        pTexture->m_bDepthStoreDontCare= false;
-                        pTexture->m_bStencilStoreDontCare = false;
-                    }
-                
-                    if(!pTexture->m_bDepthLoadDontCare || !pTexture->m_bStencilLoadDontCare)
-                    {
-                        pTexture->m_bDepthLoadDontCare= false;
-                        pTexture->m_bStencilLoadDontCare = false;
-                    }
-                
-                    //If depth/stencil is set to LoadDontcare but the other is set to clear set
-                    //the first one to clear as well.
-                    if(pTexture->m_bDepthLoadDontCare && pTexture->m_bClearStencil)
-                    {
-                        pTexture->m_bClearDepth = true;
-                    }
-                    
-                    if(pTexture->m_bStencilLoadDontCare && pTexture->m_bClearDepth)
-                    {
-                        pTexture->m_bClearStencil = true;
-                    }
-                }
-#endif
-                
-                {
-                    MTLRenderPassDepthAttachmentDescriptor* DepthAttachment = RenderPass.depthAttachment;
-
-                    DepthAttachment.texture = pTexture->m_Texture;
-
-                    // NOTE: ternary syntax crashes profile/release builds!!!
-                    // /BuildRoot/Library/Caches/com.apple.xbs/Sources/Metal/Metal-55.1.1/Framework/MTLRenderPass.m:117: failed assertion `storeAction is not a valid MTLStoreAction.'
-                    //DepthAttachment.storeAction = pTexture->m_bDepthStoreDontCare ? MTLStoreActionDontCare : MTLStoreActionStore;
-                    if (pTexture->m_bDepthStoreDontCare)
-                    {
-                        DepthAttachment.storeAction = MTLStoreActionDontCare;
-                    }
-                    else
-                    {
-                        DepthAttachment.storeAction = MTLStoreActionStore;
-                    }
-
-                    m_kStateCache.m_DefaultViewport.width = pTexture->m_iWidth >> pTextureView->m_iMipLevel;
-                    m_kStateCache.m_DefaultViewport.height = pTexture->m_iHeight >> pTextureView->m_iMipLevel;
-
-                    //  Igor: decide if need to clear at this point
-                    if (pTexture->m_spTextureViewToClear.get() &&
-                        pTexture->m_bClearDepth)
-                    {
-                        CRY_ASSERT(pTexture->m_spTextureViewToClear == m_CurrentDepth);
-                        if (pTexture->m_spTextureViewToClear != m_CurrentDepth)
-                        {
-                            DXGL_ERROR("Depth View used for rendering does not match view which was used to clear RT. This behaviour is not supported for METAL");
-                        }
-                        DepthAttachment.loadAction = MTLLoadActionClear;
-                        DepthAttachment.clearDepth = pTexture->m_fClearDepthValue;
-
-                        pTexture->m_bClearDepth = false;
-                    }
-                    else
-                    {
-                        // NOTE: ternary syntax crashes profile/release builds!!!
-                        // /BuildRoot/Library/Caches/com.apple.xbs/Sources/Metal/Metal-55.1.1/Framework/MTLRenderPass.m:117: failed assertion `storeAction is not a valid MTLStoreAction.'
-                        //DepthAttachment.loadAction = pTexture->m_bDepthLoadDontCare ? MTLLoadActionDontCare : MTLLoadActionLoad;
-                        if (pTexture->m_bDepthLoadDontCare)
-                        {
-                            DepthAttachment.loadAction = MTLLoadActionDontCare;
-                        }
-                        else
-                        {
-                            DepthAttachment.loadAction = MTLLoadActionLoad;
-                        }
-                    }
-                }
-
-                //  Igor: attach stencil too
-                if (pTexture->m_StencilTexture)
-                {
-                    MTLRenderPassStencilAttachmentDescriptor* StencilAttachment = RenderPass.stencilAttachment;
-
-                    StencilAttachment.texture = pTexture->m_StencilTexture;
-
-                    // NOTE: ternary syntax crashes profile/release builds!!!
-                    // /BuildRoot/Library/Caches/com.apple.xbs/Sources/Metal/Metal-55.1.1/Framework/MTLRenderPass.m:117: failed assertion `storeAction is not a valid MTLStoreAction.'
-                    //StencilAttachment.storeAction = pTexture->m_bStencilStoreDontCare ? MTLStoreActionDontCare : MTLStoreActionStore;
-                    if (pTexture->m_bStencilStoreDontCare)
-                    {
-                        StencilAttachment.storeAction = MTLStoreActionDontCare;
-                    }
-                    else
-                    {
-                        StencilAttachment.storeAction = MTLStoreActionStore;
-                    }
-
-                    //  Igor: deside if need to clear at this point
-                    if (pTexture->m_spStencilTextureViewToClear.get() &&
-                        pTexture->m_bClearStencil)
-                    {
-                        CRY_ASSERT(pTexture->m_spStencilTextureViewToClear == m_CurrentDepth);
-                        if (pTexture->m_spStencilTextureViewToClear != m_CurrentDepth)
-                        {
-                            DXGL_ERROR("Stencil View used for rendering does not match view which was used to clear RT. This behaviour is not supported for METAL");
-                        }
-                        StencilAttachment.loadAction = MTLLoadActionClear;
-                        StencilAttachment.clearStencil = pTexture->m_uClearStencilValue;
-
-                        pTexture->m_bClearStencil = false;
-                    }
-                    else
-                    {
-                        // NOTE: ternary syntax crashes profile/release builds!!!
-                        // /BuildRoot/Library/Caches/com.apple.xbs/Sources/Metal/Metal-55.1.1/Framework/MTLRenderPass.m:117: failed assertion `storeAction is not a valid MTLStoreAction.'
-                        //StencilAttachment.loadAction = pTexture->m_bStencilLoadDontCare ? MTLLoadActionDontCare : MTLLoadActionLoad;
-                        if (pTexture->m_bStencilLoadDontCare)
-                        {
-                            StencilAttachment.loadAction = MTLLoadActionDontCare;
-                        }
-                        else
-                        {
-                            StencilAttachment.loadAction = MTLLoadActionLoad;
-                        }
-                    }
-                }
-
-                if (pTexture)
-                {
-                    m_kPipelineConfiguration.m_AttachmentConfiguration.depthAttachmentPixelFormat = pTexture->m_Texture ? pTexture->m_Texture.pixelFormat : MTLPixelFormatInvalid;
-                    m_kPipelineConfiguration.m_AttachmentConfiguration.stencilAttachmentPixelFormat = pTexture->m_StencilTexture ? pTexture->m_StencilTexture.pixelFormat : MTLPixelFormatInvalid;
-                }
-                else
-                {
-                    m_kPipelineConfiguration.m_AttachmentConfiguration.depthAttachmentPixelFormat = MTLPixelFormatInvalid;
-                    m_kPipelineConfiguration.m_AttachmentConfiguration.stencilAttachmentPixelFormat = MTLPixelFormatInvalid;
-                }
-
-
-                pTexture->m_spTextureViewToClear.reset();
-                pTexture->m_spStencilTextureViewToClear.reset();
-
-                // Reset don't care flags
-                pTexture->ResetDontCareActionFlags();
-            }
-            else
-            {
-                m_kPipelineConfiguration.m_AttachmentConfiguration.depthAttachmentPixelFormat = MTLPixelFormatInvalid;
-                m_kPipelineConfiguration.m_AttachmentConfiguration.stencilAttachmentPixelFormat = MTLPixelFormatInvalid;
-            }
-
-
-            m_CurrentEncoder = [m_CurrentCommandBuffer renderCommandEncoderWithDescriptor:RenderPass];
-            [m_CurrentEncoder retain];
-            m_bFrameBufferStateDirty = false;
-
-            m_GPUEventsHelper.FlushActions(m_CurrentEncoder, CGPUEventsHelper::eFT_NewEncoder);
-            FlushQueries();
-
-            // Since pipeline state depends upon the current renter targets' configuration we
-            // need to make a new one and to rebind it.
-            m_bPipelineDirty = true;
-
-            //  It seems that the encoder is reset to the default state every time we create a new one.
-            //  Mark states as dirty here so that they a rebound.
-            m_bInputAssemblerSlotsDirty = true;
-            m_kStateCache.m_kDepthStencil.m_bDSSDirty = true;
-            m_kStateCache.m_kDepthStencil.m_bStencilRefDirty = true;
-            if (!(m_kStateCache.m_kRasterizer.m_RateriserDirty & SRasterizerCache::RS_NOT_INITIALIZED))
-            {
-                m_kStateCache.m_kRasterizer.m_RateriserDirty = SRasterizerCache::RS_ALL_DIRTY;
-            }
-            m_kStateCache.m_bBlendColorDirty = true;
-
-            //  Update viewport state
-            m_kStateCache.m_bViewportDirty = !m_kStateCache.m_bViewportDefault;
-
-            for (int i = 0; i < SStageStateCache::eBST_Count; ++i)
-            {
-                m_kStateCache.m_StageCache.m_BufferState[i].m_MaxBufferUsed = SBufferStateStageCache::s_MaxBuffersPerStage - 1;
-                m_kStateCache.m_StageCache.m_BufferState[i].m_MinBufferUsed = 0;
-                m_kStateCache.m_StageCache.m_TextureState[i].m_MaxTextureUsed = STextureStageState::s_MaxTexturesPerStage - 1;
-                m_kStateCache.m_StageCache.m_TextureState[i].m_MinTextureUsed = 0;
-
-
-                //m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed = SSamplerStageState::s_MaxSamplersPerStage-1;
-                //m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed = 0;
-                m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed = -1;
-                m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed = SSamplerStageState::s_MaxSamplersPerStage;
-                for (int j = 0; j < SSamplerStageState::s_MaxSamplersPerStage; ++j)
-                {
-                    if (m_kStateCache.m_StageCache.m_SamplerState[i].m_Samplers[j])
-                    {
-                        m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed = max(m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed, j);
-                        m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed = min(m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed, j);
-                    }
-                }
-            }
-        }
-        else
-        {
-            //  Igor: flush in this function since:
-            //  1. This is the first function which actually flushes the state
-            //  2. debug markers are applied to the command buffer encoder. Flushing before command buffer encoder is created for the new RTs will leave markers in incorrect encoder.
-            m_GPUEventsHelper.FlushActions(m_CurrentEncoder, CGPUEventsHelper::eFT_Default);
-            FlushQueries();
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::FlushComputeKernelState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushComputeKernelState")
-
-        int i = SStageStateCache::eBST_Compute;
-        {
-            m_kStateCache.m_StageCache.m_BufferState[i].m_MaxBufferUsed = SBufferStateStageCache::s_MaxBuffersPerStage - 1;
-            m_kStateCache.m_StageCache.m_BufferState[i].m_MinBufferUsed = 0;
-            m_kStateCache.m_StageCache.m_TextureState[i].m_MaxTextureUsed = STextureStageState::s_MaxTexturesPerStage - 1;
-            m_kStateCache.m_StageCache.m_TextureState[i].m_MinTextureUsed = 0;
-
-            m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed = -1;
-            m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed = SSamplerStageState::s_MaxSamplersPerStage;
-            for (int j = 0; j < SSamplerStageState::s_MaxSamplersPerStage; ++j)
-            {
-                if (m_kStateCache.m_StageCache.m_SamplerState[i].m_Samplers[j])
-                {
-                    m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed = max(m_kStateCache.m_StageCache.m_SamplerState[i].m_MaxSamplerUsed, j);
-                    m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed = min(m_kStateCache.m_StageCache.m_SamplerState[i].m_MinSamplerUsed, j);
-                }
-            }
-        }
-    }
-
-    void CContext::FlushComputeBufferUnits()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushComputeBufferUnits")
-        //  Flush compute constant buffers
-        {
-            uint32 uStage = SStageStateCache::eBST_Compute;
-            m_kStateCache.m_StageCache.m_BufferState[uStage].CheckForDynamicBufferUpdates();
-            int UsedBufferCount = m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed - m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed + 1;
-            if (UsedBufferCount > 0)
-            {
-                NSRange range = {static_cast<NSUInteger>(m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed),
-                                 static_cast<NSUInteger>(UsedBufferCount)};
-                [m_CurrentComputeEncoder setBuffers: m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers + m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed
-offsets: m_kStateCache.m_StageCache.m_BufferState[uStage].m_Offsets + m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed
-withRange: range];
-
-                m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed = -1;
-                m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed = SBufferStateStageCache::s_MaxBuffersPerStage;
-            }
-        }
-    }
-
-    void CContext::FlushComputeTextureUnits()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushComputeTextureUnits")
-        {
-            //  Set CS Samplers
-            SSamplerStageState& samplerState = m_kStateCache.m_StageCache.m_SamplerState[SStageStateCache::eBST_Compute];
-
-            NSRange range = {static_cast<NSUInteger>(samplerState.m_MinSamplerUsed),
-                             static_cast<NSUInteger>(samplerState.m_MaxSamplerUsed - samplerState.m_MinSamplerUsed + 1)};
-            if (samplerState.m_MaxSamplerUsed >= samplerState.m_MinSamplerUsed)
-            {
-                [m_CurrentComputeEncoder setSamplerStates: (patchSamplers(samplerState.m_Samplers, GetDevice()->GetMetalDevice(), m_defaultSamplerState) + samplerState.m_MinSamplerUsed)
-withRange: range];
-            }
-
-            samplerState.m_MinSamplerUsed =  SSamplerStageState::s_MaxSamplersPerStage;
-            samplerState.m_MaxSamplerUsed = -1;
-        }
-
-
-        {
-            //  Set CS textures
-            STextureStageState& textureState = m_kStateCache.m_StageCache.m_TextureState[SStageStateCache::eBST_Compute];
-            id<MTLTexture> tmpTextures[STextureStageState::s_MaxTexturesPerStage];
-
-            for (int i = textureState.m_MinTextureUsed; i <= textureState.m_MaxTextureUsed; ++i)
-            {
-                tmpTextures[i] = textureState.m_Textures[i] ? textureState.m_Textures[i]->GetMetalTexture() : 0;
-            }
-
-            NSRange range = {static_cast<NSUInteger>(textureState.m_MinTextureUsed),
-                             static_cast<NSUInteger>(textureState.m_MaxTextureUsed - textureState.m_MinTextureUsed + 1)};
-            if (textureState.m_MaxTextureUsed >= textureState.m_MinTextureUsed)
-            {
-                [m_CurrentComputeEncoder setTextures: (tmpTextures + textureState.m_MinTextureUsed)
-withRange: range];
-            }
-
-            textureState.m_MinTextureUsed =  STextureStageState::s_MaxTexturesPerStage;
-            textureState.m_MaxTextureUsed = -1;
-        }
-
-        {
-            //  Set CS UAV Textures
-            SUAVTextureStageCache& textureState = m_kStateCache.m_StageCache.m_UAVTextureState;
-            id<MTLTexture> tmpTextures[STextureStageState::s_MaxTexturesPerStage];
-
-            for (int i = 0; i <= textureState.s_MaxUAVTexturesPerStage; ++i)
-            {
-                tmpTextures[i] = textureState.m_UAVTextures[i] ? textureState.m_UAVTextures[i]->m_Texture : 0;
-            }
-
-            NSRange range = {STextureStageState::s_MaxTexturesPerStage, SUAVTextureStageCache::s_MaxUAVTexturesPerStage};
-            [m_CurrentComputeEncoder setTextures: (tmpTextures)
-withRange: range];
-        }
-    }
-
-    void CContext::FlushComputeThreadGroup(uint32 u32_Group_x, uint32 u32_Group_y, uint32 u32_Group_z)
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushComputeThreadGroup")
-        CRY_ASSERT(m_kPipelineConfiguration.m_apShaders[eST_Compute] != NULL);
-        uint32 thread_x = m_kPipelineConfiguration.m_apShaders[eST_Compute]->m_kReflection.m_uThread_x;
-        uint32 thread_y = m_kPipelineConfiguration.m_apShaders[eST_Compute]->m_kReflection.m_uThread_y;
-        uint32 thread_z = m_kPipelineConfiguration.m_apShaders[eST_Compute]->m_kReflection.m_uThread_z;
-
-        MTLSize threadsPerGroup = {thread_x, thread_y, thread_z};
-        MTLSize numThreadGroup = {u32_Group_x, u32_Group_y, u32_Group_z};
-
-        [m_CurrentComputeEncoder dispatchThreadgroups: numThreadGroup
-threadsPerThreadgroup: threadsPerGroup];
-    }
-
-    void CContext::FlushComputePipelineState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushComputePipelineState")
-        if (m_bPipelineDirty)
-        {
-            m_spPipeline = AllocatePipeline(m_kPipelineConfiguration);
-            if (m_spPipeline != NULL)
-            {
-                [m_CurrentComputeEncoder setComputePipelineState: m_spPipeline->m_ComputePipelineState];
-            }
-
-            m_bPipelineDirty = false;
-        }
-        else
-        {
-            [m_CurrentComputeEncoder setComputePipelineState: m_spPipeline->m_ComputePipelineState];
-        }
-    }
-
-    void CContext::Dispatch(uint32 u32_Group_x, uint32 u32_Group_y, uint32 u32_Group_z)
-    {
-        ActivateComputeCommandEncoder();
-        FlushComputeKernelState();
-        FlushComputePipelineState();
-        FlushComputeTextureUnits();
-        FlushComputeBufferUnits();
-        FlushComputeThreadGroup(u32_Group_x, u32_Group_y, u32_Group_z);
-    }
-
-    void CContext::SetUAVBuffer(SBuffer* pConstantBuffer, uint32 uStage, uint32 uSlot)
-    {
-        uSlot = uSlot + SBufferStateStageCache::s_MaxConstantBuffersPerStage;
-        CRY_ASSERT(uStage < SStageStateCache::eBST_Count);
-        CRY_ASSERT(uSlot < SBufferStateStageCache::s_MaxBuffersPerStage);
-
-        m_kStateCache.m_StageCache.m_BufferState[uStage].m_spBufferResource[uSlot].reset(pConstantBuffer);
-
-        if (m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot])
-        {
-            [m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] release];
-        }
-
-        if (pConstantBuffer)
-        {
-            id<MTLBuffer> mtlBuffer = GetMtlBufferBasedOnSize(pConstantBuffer);
-            CRY_ASSERT(mtlBuffer);
-            
-            CRY_ASSERT(pConstantBuffer->m_pMappedData || pConstantBuffer->m_pSystemMemoryCopy || !pConstantBuffer->m_pfMapBufferRange);
-
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] = mtlBuffer;
-            [m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] retain];
-            
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Offsets[uSlot] = (uint8*)pConstantBuffer->m_pMappedData - (uint8*)mtlBuffer.contents;
-        }
-        else
-        {
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] = 0;
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Offsets[uSlot] = 0;
-        }
-
-        m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed = max(m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed, (int32)uSlot);
-        m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed = min(m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed, (int32)uSlot);
-    }
-
-    void CContext::SetUAVTexture(STexture* pTexture, uint32 uStage, uint32 uSlot)
-    {
-        if (uSlot >= SUAVTextureStageCache::s_MaxUAVTexturesPerStage)
-        {
-            DXGL_WARNING("UAVTexture unit slot %d not available for stage %d - uav texture setting ignored", uSlot, uStage);
-            return;
-        }
-        if (pTexture != NULL && pTexture->m_spTextureViewToClear.get())
-        {
-            //dont clear uav
-            pTexture->m_spTextureViewToClear.reset();
-        }
-        SUAVTextureStageCache& uavState = m_kStateCache.m_StageCache.m_UAVTextureState;
-
-        uavState.m_UAVTextures[uSlot].reset(pTexture);
-    }
-
-    void CContext::FlushPipelineState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushPipelineState")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (m_bPipelineDirty)
-        {
-            m_spPipeline = AllocatePipeline(m_kPipelineConfiguration);
-            if (m_spPipeline != NULL)
-            {
-                [m_CurrentEncoder setRenderPipelineState: m_spPipeline->m_PipelineState];
-            }
-
-            m_bPipelineDirty = false;
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::FlushDrawState()
-    {
-        DXGL_SCOPED_PROFILE("CContext::FlushDrawState")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        FlushFrameBufferState();
-
-        FlushStateObjects();
-
-        FlushInputAssemblerState();
-        FlushPipelineState();
-        FlushTextureUnits();
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::SetNumPatchControlPoints(uint32 iNumPatchControlPoints)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetNumPatchControlPoints");
-
-        DXGL_WARNING("CContext::SetNumPatchControlPoints - OpenGL(ES) Version does not support tesselation");
-    }
-
-    void CContext::SetVertexOffset(uint32 uVertexOffset)
-    {
-        //  Igor: this will trigger vertex buffer rebinding but
-        //  won't cause input layout manipulations.
-        //  So we won't to rebind pipeline too.
-        if (CACHE_VAR(m_uVertexOffset, uVertexOffset))
-        {
-            m_bInputAssemblerSlotsDirty = true;
-        }
-    }
-
-    void CContext::SetViewports(uint32 uNumViewports, const D3D11_VIEWPORT* pViewports)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetViewports")
-
-        if (uNumViewports > DXGL_NUM_SUPPORTED_VIEWPORTS)
-        {
-            DXGL_WARNING("Setting more viewports than supported (" DXGL_QUOTE(NUM_SUPPORTED_VIEWPORTS) "), additional viewports are ignored");
-            uNumViewports = DXGL_NUM_SUPPORTED_VIEWPORTS;
-        }
-
-        if (uNumViewports && pViewports)
-        {
-            MTLViewport viewPort = {
-                pViewports->TopLeftX, pViewports->TopLeftY,
-                pViewports->Width,    pViewports->Height,
-                pViewports->MinDepth, pViewports->MaxDepth
-            };
-
-            if (memcmp(&m_kStateCache.m_CurrentViewport, &viewPort, sizeof(m_kStateCache.m_CurrentViewport)))
-            {
-                m_kStateCache.m_CurrentViewport = viewPort;
-                m_kStateCache.m_bViewportDirty = true;
-                m_kStateCache.m_bViewportDefault = false;
-            }
-        }
-        else
-        {
-            if (memcmp(&m_kStateCache.m_CurrentViewport, &m_kStateCache.m_DefaultViewport, sizeof(m_kStateCache.m_CurrentViewport)))
-            {
-                m_kStateCache.m_bViewportDirty = true;
-                m_kStateCache.m_bViewportDefault = true;
-            }
-        }
-    }
-
-    void CContext::SetScissorRects(uint32 uNumRects, const D3D11_RECT* pRects)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetScissorRects")
-
-        if (uNumRects > DXGL_NUM_SUPPORTED_SCISSOR_RECTS)
-        {
-            DXGL_WARNING("Setting more scissor rectangles than supported (" DXGL_QUOTE(DXGL_NUM_SUPPORTED_SCISSOR_RECTS) "), additional scissor rectangles are ignored");
-            uNumRects = DXGL_NUM_SUPPORTED_SCISSOR_RECTS;
-        }
-
-        MTLScissorRect& rect = m_kStateCache.m_kRasterizer.m_scissorRect;
-        rect.x = pRects->left;
-        rect.y = pRects->top;
-        rect.width = pRects->right - pRects->left;
-        rect.height = pRects->bottom - pRects->top;
-
-        m_kStateCache.m_kRasterizer.m_RateriserDirty |= SRasterizerCache::RS_SCISSOR_ENABLE_DIRTY;
-    }
-
-    void CContext::ClearRenderTarget(SOutputMergerView* pRenderTargetView, const float afColor[4])
-    {
-        DXGL_SCOPED_PROFILE("CContext::ClearRenderTarget")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-
-        SOutputMergerTextureView * pTextureView = pRenderTargetView ? pRenderTargetView->AsSOutputMergerTextureView() : NULL;
-        STexture* resToClear = pTextureView ? pTextureView->m_pTexture : NULL;
-
-        if (resToClear)
-        {
-            CRY_ASSERT(!resToClear->m_spTextureViewToClear.get() || (resToClear->m_spTextureViewToClear.get() == pRenderTargetView));
-            if (resToClear->m_spTextureViewToClear.get() && (resToClear->m_spTextureViewToClear.get() != pRenderTargetView))
-            {
-                DXGL_ERROR("Render target's view was already cleared. Don't support multiple view clears on the same texture.");
-            }
-
-            CRY_ASSERT(!resToClear->m_bColorLoadDontCare);
-            if (resToClear->m_bColorLoadDontCare)
-            {
-                DXGL_ERROR("Resource was given MTLLoadActionDontCare flag. Render target's view cannot be set to be cleared.");
-            }
-
-
-            //  Store deferred clear information.
-            resToClear->m_spTextureViewToClear = pRenderTargetView;
-            for (int i = 0; i < 4; ++i)
-            {
-                resToClear->m_ClearColor[i] = afColor[i];
-            }
-
-            m_bPossibleClearPending = true;
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::ClearDepthStencil(SOutputMergerView* pDepthStencilView, bool bClearDepth, bool bClearStencil, float fDepthValue, uint8 uStencilValue)
-    {
-        if (!bClearDepth && !bClearStencil)
-        {
-            return;
-        }
-        
-        DXGL_SCOPED_PROFILE("CContext::ClearDepthStencil")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-
-        SOutputMergerTextureView * pTextureView = pDepthStencilView ? pDepthStencilView->AsSOutputMergerTextureView() : NULL;
-        STexture* resToClear = pTextureView ? pTextureView->m_pTexture : NULL;
-
-        if (resToClear)
-        {
-            if (bClearDepth)
-            {
-                //  Once the texture is cleared, it must be bound as rt before second clear can be issued unless we clear the same view and different plane (depth and stencil can be cleared in 2 calls).
-                CRY_ASSERT(!resToClear->m_spTextureViewToClear.get() || resToClear->m_spTextureViewToClear == pDepthStencilView);
-                if (resToClear->m_spTextureViewToClear.get() && resToClear->m_spTextureViewToClear != pDepthStencilView)
-                {
-                    DXGL_ERROR("Different view of this depth buffer was already cleared. Don't support multiple clears on different views.");
-                }
-                
-                //  Store deferred clear information.
-                resToClear->m_spTextureViewToClear = pDepthStencilView;
-                
-                CRY_ASSERT(!resToClear->m_bDepthLoadDontCare);
-                if (resToClear->m_bDepthLoadDontCare)
-                {
-                    DXGL_ERROR("Resource was given MTLLoadActionDontCare depth flag. Depth target's view cannot be set to be cleared.");
-                }
-
-                resToClear->m_bClearDepth = bClearDepth;
-                resToClear->m_fClearDepthValue = fDepthValue;
-            }
-
-            if (bClearStencil)
-            {
-                //  Once the texture is cleared, it must be bound as rt before second clear can be issued unless we clear the same view and different plane (depth and stencil can be cleared in 2 calls).
-                CRY_ASSERT(!resToClear->m_spStencilTextureViewToClear.get() || resToClear->m_spStencilTextureViewToClear == pDepthStencilView);
-                if (resToClear->m_spStencilTextureViewToClear.get() && resToClear->m_spStencilTextureViewToClear != pDepthStencilView)
-                {
-                    DXGL_ERROR("Different view of this stencil buffer was already cleared. Don't support multiple clears on different views.");
-                }
-                
-                //  Store deferred clear information.
-                resToClear->m_spStencilTextureViewToClear = pDepthStencilView;
-                
-                CRY_ASSERT(!resToClear->m_bStencilLoadDontCare);
-                if (resToClear->m_bStencilLoadDontCare)
-                {
-                    DXGL_ERROR("Resource was given MTLLoadActionDontCare stencil flag. Stencil target's view cannot be set to be cleared.");
-                }
-
-                resToClear->m_bClearStencil = bClearStencil;
-                resToClear->m_uClearStencilValue = uStencilValue;
-            }
-
-            m_bPossibleClearPending = true;
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::SetRenderTargets(uint32 uNumRTViews, SOutputMergerView** apRenderTargetViews, SOutputMergerView* pDepthStencilView)
-    {
-        DXGL_SCOPED_PROFILE("CContext::SetRenderTargets")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        //  Igor: sometimes the engine re-assignes the same RT. Avoid flushing/resyoring RT in this case.
-        //m_bFrameBufferStateDirty = true;
-
-        uint32 uColorView;
-        for (uColorView = 0; uColorView < uNumRTViews; ++uColorView)
-        {
-            m_bFrameBufferStateDirty |= (m_CurrentRTs[uColorView] != apRenderTargetViews[uColorView]);
-            m_CurrentRTs[uColorView] = apRenderTargetViews[uColorView];
-        }
-
-        for (; uColorView < DXGL_ARRAY_SIZE(m_CurrentRTs); ++uColorView)
-        {
-            m_bFrameBufferStateDirty |= !!m_CurrentRTs[uColorView];
-            m_CurrentRTs[uColorView] = NULL;
-        }
-
-        m_bFrameBufferStateDirty |= (m_CurrentDepth != pDepthStencilView);
-        m_CurrentDepth = pDepthStencilView;
-        //  Confetti End: Igor Lobanchikov
-
-        if (m_bFrameBufferStateDirty)
-        {
-            m_GPUEventsHelper.OnSetRenderTargets();
-        }
-    }
-
-    void CContext::SetShader(SShader* pShader, uint32 uStage)
-    {
-        CRY_ASSERT(uStage < DXGL_ARRAY_SIZE(m_kPipelineConfiguration.m_apShaders));
-        m_kPipelineConfiguration.m_apShaders[uStage] = pShader;
-        m_bPipelineDirty = true;
-    }
-
-    void CContext::SetTexture(SShaderResourceView* pView, uint32 uStage, uint32 uSlot)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        if (uSlot >= STextureStageState::s_MaxTexturesPerStage)
-        {
-            DXGL_WARNING("Texture unit slot %d not available for stage %d - texture setting ignored", uSlot, uStage);
-            return;
-        }
-        STextureStageState& textureState = m_kStateCache.m_StageCache.m_TextureState[uStage];
-
-        textureState.m_MaxTextureUsed = max(textureState.m_MaxTextureUsed, (int32)uSlot);
-        textureState.m_MinTextureUsed = min(textureState.m_MinTextureUsed, (int32)uSlot);
-
-        textureState.m_Textures[uSlot].reset(pView);
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    void CContext::SetSampler(id<MTLSamplerState> pState, uint32 uStage, uint32 uSlot)
-    {
-        if (uSlot >= SSamplerStageState::s_MaxSamplersPerStage)
-        {
-            DXGL_WARNING("Sampler unit slot %d not available for stage %d - sampler setting ignored", uSlot, uStage);
-            return;
-        }
-        SSamplerStageState& samplerState = m_kStateCache.m_StageCache.m_SamplerState[uStage];
-
-        samplerState.m_MaxSamplerUsed = max(samplerState.m_MaxSamplerUsed, (int32)uSlot);
-        samplerState.m_MinSamplerUsed = min(samplerState.m_MinSamplerUsed, (int32)uSlot);
-
-        if (samplerState.m_Samplers[uSlot])
-        {
-            [samplerState.m_Samplers[uSlot] release];
-        }
-
-        samplerState.m_Samplers[uSlot] = pState;
-
-        if (samplerState.m_Samplers[uSlot])
-        {
-            [samplerState.m_Samplers[uSlot] retain];
-        }
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    //  Confetti BEGIN: Igor Lobanchikov
-
-    void SBufferStateStageCache::CheckForDynamicBufferUpdates()
-    {
-        for (int i = 0; i < s_MaxBuffersPerStage; ++i)
-        {
-            id<MTLBuffer> mtlBuffer = GetMtlBufferBasedOnSize(m_spBufferResource[i]);
-            NSUInteger offset = (m_spBufferResource[i] && m_spBufferResource[i]->m_pMappedData) ? (uint8*)m_spBufferResource[i]->m_pMappedData - (uint8*)mtlBuffer.contents : 0;
-
-            if (m_spBufferResource[i] &&
-                ((mtlBuffer != m_Buffers[i]) ||
-                 (offset != m_Offsets[i])))
-            {
-                if (m_Buffers[i])
-                {
-                    [m_Buffers[i] release];
-                }
-
-                m_Buffers[i] = mtlBuffer;
-                m_Offsets[i] = offset;
-
-                if (m_Buffers[i])
-                {
-                    [m_Buffers[i] retain];
-                }
-
-                m_MaxBufferUsed = max(m_MaxBufferUsed, i);
-                m_MinBufferUsed = min(m_MinBufferUsed, i);
-            }
-        }
-    }
-    //  Confetti End: Igor Lobanchikov
-
-    void CContext::SetConstantBuffer(SBuffer* pConstantBuffer, uint32 uStage, uint32 uSlot)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        CRY_ASSERT(uStage < SStageStateCache::eBST_Count);
-        CRY_ASSERT(uSlot < SBufferStateStageCache::s_MaxConstantBuffersPerStage);
-
-        m_kStateCache.m_StageCache.m_BufferState[uStage].m_spBufferResource[uSlot].reset(pConstantBuffer);
-
-        if (m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot])
-        {
-            [m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] release];
-        }
-
-        if (pConstantBuffer)
-        {
-            id<MTLBuffer> mtlBuffer = GetMtlBufferBasedOnSize(pConstantBuffer);
-            CRY_ASSERT(mtlBuffer);
-            //  Igor: Buffer must be initialized. Either it is static (and initialized at creation time) or dynamic and was mapped
-            CRY_ASSERT(pConstantBuffer->m_pMappedData || pConstantBuffer->m_pSystemMemoryCopy || !pConstantBuffer->m_pfMapBufferRange);
-
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] = mtlBuffer;
-            [m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] retain];
-
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Offsets[uSlot] = (uint8*)pConstantBuffer->m_pMappedData - (uint8*)pConstantBuffer->m_BufferShared.contents;
-            
-        }
-        else
-        {
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Buffers[uSlot] = 0;
-            m_kStateCache.m_StageCache.m_BufferState[uStage].m_Offsets[uSlot] = 0;
-        }
-
-        m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed = max(m_kStateCache.m_StageCache.m_BufferState[uStage].m_MaxBufferUsed, (int32)uSlot);
-        m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed = min(m_kStateCache.m_StageCache.m_BufferState[uStage].m_MinBufferUsed, (int32)uSlot);
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY eTopology)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        switch (eTopology)
-        {
-        case D3D_PRIMITIVE_TOPOLOGY_POINTLIST:
-            m_MetalPrimitiveType = MTLPrimitiveTypePoint;
-            break;
-
-        case D3D_PRIMITIVE_TOPOLOGY_LINELIST:
-            m_MetalPrimitiveType = MTLPrimitiveTypeLine;
-            break;
-
-        case D3D_PRIMITIVE_TOPOLOGY_LINESTRIP:
-            m_MetalPrimitiveType = MTLPrimitiveTypeLineStrip;
-            break;
-
-        case D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST:
-            m_MetalPrimitiveType = MTLPrimitiveTypeTriangle;
-            break;
-
-        case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP:
-            m_MetalPrimitiveType = MTLPrimitiveTypeTriangleStrip;
-            break;
-
-        default:
-            DXGL_ERROR("Invalid primitive topology");
-            break;
-        }
-        //  Confetti End: Igor Lobanchikov
-    }
-
-    void CContext::SetInputLayout(SInputLayout* pInputLayout)
-    {
-        m_pInputLayout = pInputLayout;
-        m_bInputLayoutDirty = true;
-    }
-
-    void CContext::SetVertexBuffer(uint32 uSlot, SBuffer* pVertexBuffer, uint32 uStride, uint32 uOffset)
-    {
-        SInputAssemblerSlot& kSlot(m_akInputAssemblerSlots[uSlot]);
-        kSlot.m_pVertexBuffer = pVertexBuffer;
-        kSlot.m_uStride = uStride;
-        kSlot.m_uOffset = uOffset;
-        m_bInputAssemblerSlotsDirty = true;
-    }
-
-    void CContext::SetIndexBuffer(SBuffer* pIndexBuffer, MTLIndexType eIndexType, GLuint uIndexStride, GLuint uOffset)
-    {
-        m_MetalIndexType = eIndexType;
-        m_uIndexStride = uIndexStride;
-        m_uIndexOffset = uOffset;
-
-        m_spIndexBufferResource.reset(pIndexBuffer);
-    }
-
-    void CContext::DrawIndexed(uint32 uIndexCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::DrawIndexed")
-
-        SetVertexOffset(uBaseVertexLocation);
-
-        FlushDrawState();        
-        CRY_ASSERT(m_spIndexBufferResource.get());
-        if (!m_spIndexBufferResource.get())
-        {
-            return;
-        }
-
-        uint32 offset = 0;
-        id<MTLBuffer> tmpBuffer = nil;
-        m_spIndexBufferResource->GetBufferAndOffset(*this, m_uIndexOffset, uStartIndexLocation, m_uIndexStride, tmpBuffer, offset);
-
-        [m_CurrentEncoder drawIndexedPrimitives: m_MetalPrimitiveType
-                                     indexCount: uIndexCount
-                                      indexType: m_MetalIndexType
-                                    indexBuffer: tmpBuffer
-                              indexBufferOffset: offset];
-
-        // assert that all transient mapped data was bound for this draw call
-        CRY_ASSERT(m_spIndexBufferResource->m_pTransientMappedData.empty());
-    }
-
-    void CContext::Draw(uint32 uVertexCount, uint32 uBaseVertexLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::Draw")
-        SetVertexOffset(0); // No need to use uBaseVertexLocation for vertex offset as it is used to indicate which vertex is the starting vertex when calling drawPrimitives below
-        
-        FlushDrawState();
-
-        [m_CurrentEncoder drawPrimitives: m_MetalPrimitiveType
-                             vertexStart: uBaseVertexLocation
-                             vertexCount: uVertexCount];
-    }
-
-    void CContext::DrawIndexedInstanced(uint32 uIndexCountPerInstance, uint32 uInstanceCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation, uint32 uStartInstanceLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::DrawIndexedInstanced")
-        SetVertexOffset(uBaseVertexLocation);
-
-        FlushDrawState();
-
-        CRY_ASSERT(m_spIndexBufferResource.get());
-        if (!m_spIndexBufferResource.get())
-        {
-            return;
-        }
-
-        uint32 offset = 0;
-        id<MTLBuffer> tmpBuffer = nil;
-        m_spIndexBufferResource->GetBufferAndOffset(*this, m_uIndexOffset, uStartIndexLocation, m_uIndexStride, tmpBuffer, offset);
-
-
-        id<MTLDevice> mtlDevice = m_pDevice->GetMetalDevice();
-        
-        bool isBaseVertexInstanceEnabled = true;
-#if defined(AZ_PLATFORM_IOS)
-        isBaseVertexInstanceEnabled = NCryMetal::s_isIOSGPUFamily3;
-#endif
-        if(isBaseVertexInstanceEnabled)
-        {
-            // `-[MTLDebugRenderCommandEncoder drawPrimitives:vertexStart:vertexCount:instanceCount:baseInstance:] is only supported on MTLFeatureSet_iOS_GPUFamily3_v1 and later'... (This is most likely related to the new A9 GPUS.)
-            // https://developer.apple.com/library/ios/documentation/Metal/Reference/MTLDevice_Ref/index.html#//apple_ref/c/econst/MTLFeatureSet_iOS_GPUFamily2_v1
-            [m_CurrentEncoder drawIndexedPrimitives: m_MetalPrimitiveType
-                                         indexCount: uIndexCountPerInstance
-                                          indexType: m_MetalIndexType
-                                        indexBuffer: tmpBuffer
-                                  indexBufferOffset: offset
-                                      instanceCount: uInstanceCount
-                                        baseVertex : 0
-                                       baseInstance: uStartInstanceLocation];
-        }
-        else if (uStartInstanceLocation == 0)
-        {
-            [m_CurrentEncoder drawIndexedPrimitives: m_MetalPrimitiveType
-                                         indexCount: uIndexCountPerInstance
-                                          indexType: m_MetalIndexType
-                                        indexBuffer: tmpBuffer
-                                  indexBufferOffset: offset
-                                      instanceCount: uInstanceCount];
-        }
-        else
-        {
-            // Not supported!
-            CRY_ASSERT(0);
-        }
-
-        // assert that all transient mapped data was bound for this draw call
-        CRY_ASSERT(m_spIndexBufferResource->m_pTransientMappedData.empty());
-    }
-
-    void CContext::DrawInstanced(uint32 uVertexCountPerInstance, uint32 uInstanceCount, uint32 uStartVertexLocation, uint32 uStartInstanceLocation)
-    {
-        DXGL_SCOPED_PROFILE("CContext::DrawInstanced")
-        SetVertexOffset(0); // No need to use uBaseVertexLocation for vertex offset as it is used to indicate which vertex is the starting vertex when calling drawPrimitives below
-        FlushDrawState();
-
-
-        id<MTLDevice> mtlDevice = m_pDevice->GetMetalDevice();
-        
-        bool isBaseInstanceEnabled = true;
-#if defined(AZ_PLATFORM_IOS)
-        isBaseInstanceEnabled = NCryMetal::s_isIOSGPUFamily3;
-#endif
-        if (isBaseInstanceEnabled)
-        {
-            // `-[MTLDebugRenderCommandEncoder drawPrimitives:vertexStart:vertexCount:instanceCount:baseInstance:] is only supported on MTLFeatureSet_iOS_GPUFamily3_v1 and later'... (This is most likely related to the new A9 GPUS.)
-            // https://developer.apple.com/library/ios/documentation/Metal/Reference/MTLDevice_Ref/index.html#//apple_ref/c/econst/MTLFeatureSet_iOS_GPUFamily2_v1
-            [m_CurrentEncoder drawPrimitives: m_MetalPrimitiveType
-                                 vertexStart: uStartVertexLocation
-                                 vertexCount: uVertexCountPerInstance
-                               instanceCount: uInstanceCount
-                                baseInstance: uStartInstanceLocation];
-        }
-        else if (uStartInstanceLocation == 0)
-        {
-            [m_CurrentEncoder drawPrimitives: m_MetalPrimitiveType
-                                 vertexStart: uStartVertexLocation
-                                 vertexCount: uVertexCountPerInstance
-                               instanceCount: uInstanceCount];
-        }
-        else
-        {
-            // Not supported!
-            CRY_ASSERT(0);
-        }
-    }
-
-    void CContext::Flush(id<CAMetalDrawable> drawable, float syncInterval)
-    {
-        DXGL_SCOPED_PROFILE("CContext::Flush")
-
-        FlushCurrentEncoder();
-
-        if (drawable)
-        {
-            // call the view's completion handler which is required by the view since it will signal its semaphore and set up the next buffer
-            __block dispatch_semaphore_t block_sema = m_FrameQueueSemaphore;
-            [m_CurrentCommandBuffer addCompletedHandler: ^ (id < MTLCommandBuffer > buffer) {
-                 dispatch_semaphore_signal(block_sema);
-             }];
-        }
-
-        GetCurrentEventHelper()->bCommandBufferPreSubmitted = true;
-        
-        if(drawable)
-        {
-            // presentAfterMinimumDuration only available on ios and appltv 10.3+
-#if defined(AZ_PLATFORM_IOS) && defined(__IPHONE_10_3)
-            bool hasPresentAfterMinimumDuration = [drawable respondsToSelector:@selector(presentAfterMinimumDuration:)];
-
-            if (hasPresentAfterMinimumDuration && syncInterval > 0.0f)
-            {
-                [m_CurrentCommandBuffer presentDrawable:drawable afterMinimumDuration:syncInterval];
-            }
-            else
-#endif
-            {
-                [m_CurrentCommandBuffer presentDrawable:drawable];
-            }
-        }
-        [m_CurrentCommandBuffer commit];
-        GetCurrentEventHelper()->bCommandBufferSubmitted = true;
-
-        MTLCommandBufferStatus stat = m_CurrentCommandBuffer.status;
-        if (stat == MTLCommandBufferStatusError)
-        {
-            LogCommandBufferError(m_CurrentCommandBuffer.error.code);
-        }
-
-        [m_CurrentCommandBuffer release];
-        m_CurrentCommandBuffer = nil;
-
-        if (!drawable)
-        {
-            NextCommandBuffer();
-        }
-    }
-
-    void CContext::FlushBlitEncoderAndWait()
-    {
-        DXGL_SCOPED_PROFILE("CContext::Flush")
-
-        if (m_CurrentBlitEncoder)
-        {
-            m_GPUEventsHelper.FlushActions(m_CurrentBlitEncoder, CGPUEventsHelper::eFT_FlushEncoder);
-
-            [m_CurrentBlitEncoder endEncoding];
-            [m_CurrentBlitEncoder release];
-            m_CurrentBlitEncoder = nil;
-
-            GetCurrentEventHelper()->bCommandBufferPreSubmitted = true;
-            [m_CurrentCommandBuffer commit];
-            GetCurrentEventHelper()->bCommandBufferSubmitted = true;
-
-            [m_CurrentCommandBuffer waitUntilCompleted];
-            MTLCommandBufferStatus stat = m_CurrentCommandBuffer.status;
-
-            if (stat == MTLCommandBufferStatusError)
-            {
-                LogCommandBufferError(m_CurrentCommandBuffer.error.code);
-            }
-
-            [m_CurrentCommandBuffer release];
-            m_CurrentCommandBuffer = nil;
-            NextCommandBuffer();
-        }
-    }
-
-    SPipelinePtr CContext::AllocatePipeline(const SPipelineConfiguration& kConfiguration)
-    {
-        DXGL_SCOPED_PROFILE("CContext::AllocatePipeline")
-
-        // First see if there is an equivalent pipeline in the cache
-        SPipelineCache::TMap::iterator kFound(m_pPipelineCache->m_kMap.find(kConfiguration));
-        if (kFound != m_pPipelineCache->m_kMap.end())
-        {
-            return kFound->second;
-        }
-
-        // Create a new one and cache it
-        SPipelinePtr spPipeline(new SPipeline(kConfiguration, this));
-
-        if (!InitializePipeline(spPipeline))
-        {
-            return NULL;
-        }
-
-        m_pPipelineCache->m_kMap.insert(SPipelineCache::TMap::value_type(kConfiguration, spPipeline));
-        for (uint32 uShader = 0; uShader < eST_NUM; ++uShader)
-        {
-            SShader* pShader(spPipeline->m_kConfiguration.m_apShaders[uShader]);
-            if (pShader != NULL)
-            {
-                pShader->AttachPipeline(spPipeline);
-            }
-        }
-
-        return spPipeline;
-    }
-
-    void CContext::RemovePipeline(SPipeline* pPipeline, SShader* pInvalidShader)
-    {
-        DXGL_SCOPED_PROFILE("CContext::RemovePipeline")
-
-        SPipelineCache::TMap::iterator kFound(m_pPipelineCache->m_kMap.find(pPipeline->m_kConfiguration));
-        if (kFound == m_pPipelineCache->m_kMap.end())
-        {
-            DXGL_ERROR("Pipeline to remove was not found in the cache map");
-            return;
-        }
-
-        // Remove all references of the pipeline from the attached shaders, except pInvalidShader which is being destroyed
-        uint32 uShader;
-        for (uShader = 0; uShader < eST_NUM; ++uShader)
-        {
-            SShader* pAttachedShader(pPipeline->m_kConfiguration.m_apShaders[uShader]);
-            if (pAttachedShader != pInvalidShader && pAttachedShader != NULL)
-            {
-                pAttachedShader->DetachPipeline(pPipeline);
-            }
-        }
-
-        m_pPipelineCache->m_kMap.erase(kFound);
-    }
-
-    bool CContext::InitializePipeline(SPipeline* pPipeline)
-    {
-        DXGL_SCOPED_PROFILE("CContext::InitializePipeline")
-
-        //  Confetti BEGIN: Igor Lobanchikov
-
-        if (!CompilePipeline(pPipeline, m_pDevice))
-        {
-            return false;
-        }
-
-        //  Confetti End: Igor Lobanchikov
-
-        return true;
-    }
-    
-    void* CContext::AllocateMemoryInRingBuffer(uint32 size, MemRingBufferStorage memAllocMode, size_t& ringBufferOffsetOut)
-    {
-#if defined(AZ_PLATFORM_MAC)
-        if (memAllocMode == MEM_SHARED_RINGBUFFER)
-        {
-            return m_RingBufferShared.Allocate(m_iCurrentFrameSlot, size, ringBufferOffsetOut);
-        }
-        else
-        {
-            return m_RingBufferManaged.Allocate(m_iCurrentFrameSlot, size, ringBufferOffsetOut);
-        }
-#else
-        return m_RingBufferShared.Allocate(m_iCurrentFrameSlot, size, ringBufferOffsetOut);
-#endif
-    }
-
-    id <MTLBuffer> CContext::GetRingBuffer(MemRingBufferStorage memAllocMode)
-    {
-#if defined(AZ_PLATFORM_MAC)
-        if (memAllocMode == MEM_SHARED_RINGBUFFER)
-        {
-            return m_RingBufferShared.m_Buffer;
-        }
-        else
-        {
-            return m_RingBufferManaged.m_Buffer;
-        }
-#else
-        return m_RingBufferShared.m_Buffer;
-#endif
-    }
-    
-    void* CContext::AllocateQueryInRingBuffer()
-    {
-        size_t ringBufferOffsetOut = 0;
-        return m_QueryRingBuffer.Allocate(m_iCurrentFrameEventSlot, QUERY_SIZE, ringBufferOffsetOut);
-    }
-
-#undef CACHE_VAR
-#undef CACHE_FIELD
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALContext.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALContext.hpp
deleted file mode 100644
index 7c6b893df9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALContext.hpp
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the type CContext.
-
-#ifndef __GLCONTEXT__
-#define __GLCONTEXT__
-
-#include "GLCommon.hpp"
-#include "GLFormat.hpp"
-#include "GLState.hpp"
-#include "GLResource.hpp"
-#include "GLShader.hpp"
-
-//  Confetti BEGIN: Igor Lobanchikov
-@protocol MTLCommandBuffer;
-@protocol MTLRenderCommandEncoder;
-@protocol MTLBuffer;
-@protocol MTLDevice;
-@protocol MTLDepthStencilState;
-@protocol MTLSamplerState;
-#import <Metal/MTLRenderCommandEncoder.h>
-//  Confetti End: Igor Lobanchikov
-
-namespace NCryMetal
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    struct SDepthStencilCache
-    {
-        id<MTLDepthStencilState>    m_DepthStencilState;
-        uint32                      m_iStencilRef;
-        bool                        m_bDSSDirty;
-        bool                        m_bStencilRefDirty;
-    };
-    //  Confetti End: Igor Lobanchikov
-
-    static const int FASTBUFFER_SIZE_THRESHHOLD = 4*1024;
-    
-    typedef SBlendState SBlendCache;
-
-    // Additional OpenGL internal state that is implicitly mapped to the rasterizer state
-    struct SRasterizerCache
-        : SRasterizerState
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        enum
-        {
-            RS_CULL_MODE_DIRTY = 0x01,
-            RS_DEPTH_BIAS_DIRTY = 0x02,
-            RS_WINDING_DIRTY = 0x04,
-            RS_FILL_MODE_DIRTY = 0x08,
-            RS_DEPTH_CLIP_MODE_DIRTY = 0x10,
-            RS_SCISSOR_ENABLE_DIRTY = 0x20,
-
-            RS_ALL_BUT_SCISSOR_DIRTY = 0x1F,
-            RS_ALL_DIRTY = 0x3F,
-            RS_NOT_INITIALIZED = 0x80
-        };
-
-        uint8 m_RateriserDirty;
-        //  Confetti End: Igor Lobanchikov
-
-        MTLScissorRect  m_scissorRect;
-    };
-
-    struct SInputAssemblerSlot
-    {
-        SBuffer* m_pVertexBuffer;
-        uint32 m_uStride;
-        uint32 m_uOffset;
-
-        SInputAssemblerSlot()
-            : m_pVertexBuffer(NULL)
-            , m_uStride(0)
-            , m_uOffset(0)
-        {
-        }
-    };
-
-    struct SColor
-    {
-        float m_afRGBA[4];
-
-        inline bool operator==(const SColor& kOther) const
-        {
-            return memcmp(m_afRGBA, kOther.m_afRGBA, sizeof(m_afRGBA)) == 0;
-        }
-
-        inline bool operator!=(const SColor& kOther) const
-        {
-            return !operator==(kOther);
-        }
-    };
-
-    // The state that is not directly mapped to any of the DirectX 11 states
-    struct SImplicitStateCache
-    {
-#if DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-        bool m_bSampleMaskEnabled;
-        GLbitfield m_aSampleMask;
-#endif //DXGL_SUPPORT_MULTISAMPLED_TEXTURES
-
-        SColor m_akBlendColor;
-
-        MTLViewport m_CurrentViewport;
-        MTLViewport m_DefaultViewport;
-
-        bool    m_bViewportDirty;
-        bool    m_bViewportDefault;
-        bool    m_bBlendColorDirty;
-    };
-
-    //  Confetti BEGIN: Igor Lobanchikov
-    struct SBufferStateStageCache
-    {
-        static const int s_MaxUAVBuffersPerStage = 5;
-        static const int s_MaxConstantBuffersPerStage = 25;
-        static const int s_MaxBuffersPerStage = s_MaxUAVBuffersPerStage + s_MaxConstantBuffersPerStage;
-
-        void    CheckForDynamicBufferUpdates();
-
-        _smart_ptr<NCryMetal::SBuffer>  m_spBufferResource[s_MaxBuffersPerStage + s_MaxUAVBuffersPerStage];
-        id<MTLBuffer>                   m_Buffers[s_MaxBuffersPerStage + s_MaxUAVBuffersPerStage];
-        NSUInteger                      m_Offsets[s_MaxBuffersPerStage + s_MaxUAVBuffersPerStage];
-
-        int32           m_MinBufferUsed;
-        int32           m_MaxBufferUsed;
-    };
-
-    struct SUAVTextureStageCache
-    {
-        static const int s_MaxUAVTexturesPerStage = 5;
-
-        _smart_ptr<NCryMetal::STexture>  m_UAVTextures[s_MaxUAVTexturesPerStage];
-    };
-
-
-    struct STextureStageState
-    {
-        //metal support up to 30 texture slots
-        static const int s_MaxTexturesPerStage = 25;
-
-        _smart_ptr<SShaderResourceView>     m_Textures[s_MaxTexturesPerStage];
-
-        int32           m_MinTextureUsed;
-        int32           m_MaxTextureUsed;
-    };
-
-    struct SSamplerStageState
-    {
-        static const int s_MaxSamplersPerStage = 17;
-
-        id<MTLSamplerState>      m_Samplers[s_MaxSamplersPerStage];
-
-        int32           m_MinSamplerUsed;
-        int32           m_MaxSamplerUsed;
-    };
-
-    struct SStageStateCache
-    {
-        enum
-        {
-            eBST_Vertex = 0,
-            eBST_Fragment = 1,
-#if DXGL_SUPPORT_COMPUTE
-            eBST_Compute = 2,
-#endif
-            eBST_Count
-        };
-
-        SBufferStateStageCache  m_BufferState[eBST_Count];
-        STextureStageState      m_TextureState[eBST_Count];
-        SSamplerStageState      m_SamplerState[eBST_Count];
-        SUAVTextureStageCache   m_UAVTextureState; //Only used in compute shader
-    };
-    //  Confetti End: Igor Lobanchikov
-
-    // Stores the current state of an OpenGL so that the device can lazily update
-    // states without the overhead of calling glGet* functions.
-    struct SStateCache
-        : SImplicitStateCache
-    {
-        SBlendCache m_kBlend;
-        SDepthStencilCache m_kDepthStencil;
-        SRasterizerCache m_kRasterizer;
-        //  Confetti BEGIN: Igor Lobanchikov
-        SStageStateCache   m_StageCache;
-        //  Confetti End: Igor Lobanchikov
-    };
-
-    class CGPUEventsHelper
-    {
-    public:
-        enum EActionType
-        {
-            eAT_Push,
-            eAT_Pop,
-            eAT_Event
-        };
-
-        enum EFlushType
-        {
-            eFT_Default,
-            eFT_FlushEncoder,
-            eFT_NewEncoder
-        };
-    public:
-        CGPUEventsHelper();
-        ~CGPUEventsHelper();
-
-        void    AddMarker(const char* pszMessage, EActionType eAction);
-        void    FlushActions(id <MTLCommandEncoder> pEncoder, EFlushType eFlushType);
-        void    OnSetRenderTargets();
-
-    private:
-        void    ReplayActions(id <MTLCommandEncoder> pEncoder, uint32 numActions);
-        void    MovePushesToNextEncoder();
-
-    private:
-        struct SMarkerQueueAction
-        {
-            NSString*   m_pMessage;
-            EActionType m_eAction;
-        };
-
-        std::vector<SMarkerQueueAction> m_aMarkerQueue;
-        uint32                          m_uiRTSwitchedAt;
-        std::vector<NSString*>          m_currentMarkerStack;
-
-        static const uint32 m_sInvalidRTSwitchedAt = 0xFFFFFFFF;
-    };
-
-    class CContext
-        : public SList::TListEntry
-    {
-    public:
-        enum CopyFilterType
-        {
-            POINT,
-            BILINEAR,
-            BICUBIC,
-            LANCZOS,
-        };
-
-
-        CContext(CDevice* pDevice);
-        ~CContext();
-
-        bool Initialize();
-        CDevice* GetDevice() { return m_pDevice; }
-
-        void FlushComputeKernelState();
-        void FlushComputeBufferUnits();
-        void FlushComputeTextureUnits();
-        void FlushComputePipelineState();
-        void FlushComputeThreadGroup(uint32 u32_Group_x, uint32 u32_Group_y, uint32 u32_Group_z);
-        void Dispatch(uint32 u32_Group_x, uint32 u32_Group_y, uint32 u32_Group_z);
-        void SetUAVBuffer(SBuffer* pBuffer, uint32 uStage, uint32 uSlot);
-        void SetUAVTexture(STexture* pTexture, uint32 uStage, uint32 uSlot);
-
-        //  Confetti BEGIN: Igor Lobanchikov
-        id <MTLCommandBuffer> GetCurrentCommandBuffer() { return m_CurrentCommandBuffer; }
-        void FlushFrameBufferState();
-        SContextEventHelper* GetCurrentEventHelper();
-        void* AllocateMemoryInRingBuffer(uint32 size, MemRingBufferStorage memAllocMode, size_t &ringBufferOffsetOut);
-        
-        id <MTLBuffer> GetRingBuffer(MemRingBufferStorage memAllocMode);
-        void* AllocateQueryInRingBuffer();
-        id <MTLBuffer> GetQueryRingBuffer() { return m_QueryRingBuffer.m_Buffer; }
-
-        void FlushCurrentEncoder();
-        id <MTLBlitCommandEncoder>  GetBlitCommandEncoder();
-        void  ActivateComputeCommandEncoder();
-
-        bool TrySlowCopySubresource(STexture* pDstTexture, uint32 uDstSubresource, uint32 uDstX, uint32 uDstY, uint32 uDstZ,
-            STexture* pSrcTexture, uint32 uSrcSubresource, const D3D11_BOX* pSrcBox, const CopyFilterType filterType = POINT);
-
-        void ProfileLabel(const char* szName);
-        void ProfileLabelPush(const char* szName);
-        void ProfileLabelPop(const char* szName);
-
-        void BeginOcclusionQuery(SOcclusionQuery* pQuery);
-        void EndOcclusionQuery(SOcclusionQuery* pQuery);
-
-        bool SetBlendState(const SBlendState& kState);
-        bool SetDepthStencilState(id<MTLDepthStencilState> depthStencilState, uint32 iStencilRef);
-        bool SetRasterizerState(const SRasterizerState& kState);
-
-        bool GetImplicitStateCache(SImplicitStateCache& kCache);
-
-        void SetViewports(uint32 uNumViewports, const D3D11_VIEWPORT* pViewports);
-        void SetScissorRects(uint32 uNumRects, const D3D11_RECT* pRects);
-        void ClearRenderTarget(SOutputMergerView* pRenderTargetView, const float afColor[4]);
-        void ClearDepthStencil(SOutputMergerView* pDepthStencilView, bool bClearDepth, bool bClearStencil, float fDepthValue, uint8 uStencilValue);
-        void SetRenderTargets(uint32 uNumRTViews, SOutputMergerView** apRenderTargetViews, SOutputMergerView* pDepthStencilView);
-        void SetBlendColor(float fRed, float fGreen, float fBlue, float fAlpha);
-        void SetSampleMask(uint32 uSampleMask);
-        void SetShader(SShader* pShader, uint32 uStage);
-        void SetTexture(SShaderResourceView* pView, uint32 uStage, uint32 uSlot);
-        void SetSampler(id<MTLSamplerState> pState, uint32 uStage, uint32 uSlot);
-        void SetConstantBuffer(SBuffer* pConstantBuffer, uint32 uStage, uint32 uSlot);
-        void SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY eTopology);
-        void SetInputLayout(SInputLayout* pInputLayout);
-        void SetVertexBuffer(uint32 uSlot, SBuffer* pVertexBuffer, uint32 uStride, uint32 uOffset);
-        void SetIndexBuffer(SBuffer* pIndexBuffer, MTLIndexType eIndexType, uint32 uIndexStride, uint32 uOffset);
-        void DrawIndexed(uint32 uIndexCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation);
-        void Draw(uint32 uVertexCount, uint32 uBaseVertexLocation);
-        void DrawIndexedInstanced(uint32 uIndexCountPerInstance, uint32 uInstanceCount, uint32 uStartIndexLocation, uint32 uBaseVertexLocation, uint32 uStartInstanceLocation);
-        void DrawInstanced(uint32 uVertexCountPerInstance, uint32 uInstanceCount, uint32 uStartVertexLocation, uint32 uStartInstanceLocation);
-
-        void Flush(id<CAMetalDrawable> drawable = nil, float syncInterval = 0.0f);
-        void FlushBlitEncoderAndWait();
-
-        _smart_ptr<SPipeline> AllocatePipeline(const SPipelineConfiguration& kConfiguration);
-        void RemovePipeline(SPipeline* pPipeline, SShader* pInvalidShader);
-
-        bool InitializePipeline(SPipeline* pPipeline);
-
-        void InitMetalFrameResources();
-
-    private:
-        void FlushQueries();
-        void SetNumPatchControlPoints(uint32 uNumControlPoints);
-        void SetVertexOffset(uint32 uVertexOffset);
-
-        void FlushInputAssemblerState();
-        void FlushTextureUnits();
-        void FlushStateObjects();
-        void NextCommandBuffer();
-        void FlushPipelineState();
-        void FlushDrawState();
-
-        CDevice* m_pDevice;
-
-        SStateCache m_kStateCache;
-        MTLIndexType    m_MetalIndexType;
-        uint32          m_uIndexStride;
-        uint32          m_uIndexOffset;
-        SPipelinePtr m_spPipeline;
-
-        // State that is only synchronized during draw calls
-        MTLPrimitiveType                m_MetalPrimitiveType;
-        _smart_ptr<NCryMetal::SBuffer>  m_spIndexBufferResource;
-
-        SPipelineConfiguration m_kPipelineConfiguration;
-        SInputLayout* m_pInputLayout;
-        SInputAssemblerSlot m_akInputAssemblerSlots[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-        uint32 m_uVertexOffset;
-
-        // Flags that tell which parts of the state need to be synchronized during the next draw call
-        bool m_bFrameBufferStateDirty;
-        bool m_bPipelineDirty;
-        bool m_bInputLayoutDirty;
-        bool m_bInputAssemblerSlotsDirty;
-
-        // Hash maps of persistent frame buffers, pipelines and sampler unit maps that can be re-used every time
-        // a compatible configuration is requested.
-        struct SPipelineCache* m_pPipelineCache;
-
-        static const int        m_MaxFrameQueueDepth = 3;
-        static const int        m_MaxFrameQueueSlots = m_MaxFrameQueueDepth;
-        //static const int        m_MaxFrameEventSlots = m_MaxFrameQueueDepth+1;
-        //  Need to keep this value at least max engine event queu + 2. At the moment the longest event queue in the engine is 4.
-        //  This must be m_MaxFrameQueueDepth+1 at least.
-        static const int        m_MaxEngineEvenQueueLength = 4;
-        static const int        m_MaxFrameEventSlots = m_MaxEngineEvenQueueLength + 2;
-        dispatch_semaphore_t    m_FrameQueueSemaphore;
-        int                     m_iCurrentFrameSlot;
-        int                     m_iCurrentFrameEventSlot;
-        //  there is extra slot to guarantee event data lives extra frame
-        std::vector<SContextEventHelper*>   m_eEvents[m_MaxFrameEventSlots];
-        int                     m_iCurrentEvent;
-
-        id <MTLCommandBuffer>           m_CurrentCommandBuffer;
-        id <MTLRenderCommandEncoder>    m_CurrentEncoder;
-        id <MTLComputeCommandEncoder>   m_CurrentComputeEncoder;
-        id <MTLBlitCommandEncoder>      m_CurrentBlitEncoder;
-
-        _smart_ptr<SOutputMergerView>   m_CurrentRTs[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT];
-        _smart_ptr<SOutputMergerView>   m_CurrentDepth;
-
-        CGPUEventsHelper   m_GPUEventsHelper;
-
-        std::vector<SOcclusionQuery*> m_OcclusionQueryList;
-
-        DXMETAL_TODO("Remove this if Metal rutime bug is fixed anytime soon.")
-        //  Motivations: this default state is used to replace NULL sampler state
-        //  since for some reason Metal runtime crashes when NULL sampler state is bound.
-        //  Metal runtime works just fine if any other NULL state object is bound.
-        id<MTLSamplerState> m_defaultSamplerState;
-
-        bool                    m_bPossibleClearPending;
-
-        struct CRingBuffer
-        {
-            CRingBuffer(id<MTLDevice> device, unsigned int bufferSize, unsigned int alignment, MemRingBufferStorage memAllocMode);
-
-            void    OnFrameStart(int iCurrentFrameSlot, int iNextFrameSlot);
-            void*   Allocate(int iCurrentFrameSlot, unsigned int size, size_t& ringBufferOffsetOut, unsigned int alignment = 0);
-            void*   AllocateTemp(int iCurrentFrameSlot, unsigned int size, size_t& ringBufferOffsetOut, unsigned int alignment = 0);
-
-            id<MTLBuffer>   m_Buffer;
-            unsigned int    m_uiFreePositionPointer;
-            unsigned int    m_uiDefaultAlignment;
-        private:
-            void    ConsumeTrack(int iCurrentFrameSlot, unsigned int size, bool bPadding);
-            void    ValidateBufferUsage();
-
-            //  Igor: since memory and performance losses are negligible
-            //  just use max number of slots from all usage patters.
-            //  If this becomes an issue in future (e.g. ValidateBufferUsage becomes too slow or memory
-            //  footprint too big) just move to template.
-            unsigned int m_BufferUsedPerFrame[m_MaxFrameEventSlots];
-            unsigned int m_BufferPadPerFrame[m_MaxFrameEventSlots];
-        };
-
-        CRingBuffer             m_RingBufferShared; //This ring buffer uses CPU/GPU shared memory
-#if defined(AZ_PLATFORM_MAC)
-        CRingBuffer             m_RingBufferManaged; //This ring buffer uses Managed memory.
-#endif
-        CRingBuffer             m_QueryRingBuffer;
-
-        class CCopyTextureHelper
-        {
-        public:
-            CCopyTextureHelper();
-            ~CCopyTextureHelper();
-
-            bool Initialize(CDevice* pDevice);
-
-            bool DoTopMipSlowCopy(id<MTLTexture> texDst, id<MTLTexture> texSrc, CContext* pContext, CopyFilterType const filterType = POINT);
-
-        private:
-            id<MTLRenderPipelineState> SelectPipelineState(MTLPixelFormat pixelFormat, CopyFilterType const filterType);
-
-            id<MTLRenderPipelineState> m_PipelineStateBGRA8Unorm;
-            id<MTLRenderPipelineState> m_PipelineStateRGBA8Unorm;
-            id<MTLRenderPipelineState> m_PipelineStateRGBA16Float;
-            id<MTLRenderPipelineState> m_PipelineStateRGBA32Float;
-            id<MTLRenderPipelineState> m_PipelineStateR16Float;
-            id<MTLRenderPipelineState> m_PipelineStateRG16Float;
-            id<MTLRenderPipelineState> m_PipelineStateR16Unorm;
-            id<MTLRenderPipelineState> m_PipelineStateBGRA8UnormLanczos;
-            id<MTLRenderPipelineState> m_PipelineStateRGBA8UnormLanczos;
-            id<MTLRenderPipelineState> m_PipelineStateBGRA8UnormBicubic;
-            id<MTLRenderPipelineState> m_PipelineStateRGBA8UnormBicubic;
-            id<MTLSamplerState> m_samplerState;
-            id<MTLSamplerState> m_samplerStateLinear;
-
-            struct Uniforms
-            {
-                float params0[4];
-                float params1[4];
-                float params2[4];
-            } m_Uniforms;
-
-            id<MTLDevice> m_DeviceRef;
-        };
-
-        CCopyTextureHelper  m_CopyTextureHelper;
-    };
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALCopyShaders.h b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALCopyShaders.h
deleted file mode 100644
index 0a60aa1d65..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALCopyShaders.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-//////////////////////////////////COPY SHADERS//////////////////////////////////
-namespace NCryMetal
-{
-NSString *metalCopyShaderSource = @"\n\
-#include <metal_stdlib>\n\
-    using namespace metal;\n\
-    struct metalVert_out\n\
-    {\n\
-        float4 position [[ position ]];\n\
-#define Output0 output.position\n\
-        float2 tc [[ user(varying1) ]];\n\
-    };\n\
-    vertex metalVert_out mainVS(\n\
-                                uint VertexID [[ vertex_id ]])\n\
-    {\n\
-        metalVert_out output;\n\
-        float4 position;\n\
-        position.x = (VertexID == 0)? 3.0 : -1.0;\n\
-        position.y = (VertexID == 2)? 3.0 : -1.0;\n\
-        position.zw = 1.0;\n\
-        output.position=position;\n\
-        output.tc = output.position.xy * float2(0.5, -0.5) + 0.5;\n\
-        return output;\n\
-    }\n\
-    struct metalFrag_stageIn\n\
-    {\n\
-        float2 tc [[ user(varying1) ]];\n\
-    };\n\
-    struct metalFrag_out\n\
-    {\n\
-        float4 PixOutput0 [[ color(0) ]];\n\
-    };\n\
-    fragment metalFrag_out mainPS(\n\
-                                  metalFrag_stageIn stageIn [[ stage_in ]],\n\
-                                  sampler Texture0_s[[ sampler(0) ]],\n\
-                                  texture2d<float> Texture0_t[[ texture(0) ]])\n\
-    {\n\
-        metalFrag_out output;\n\
-        float2 tc = stageIn.tc;\n\
-        output.PixOutput0 = ((Texture0_t.sample(Texture0_s, tc.xy)));\n\
-        return output;\n\
-    }\n\
-    ";
-    
-NSString *metalCopyShaderSourceLanczos = @"\n\
-#include <metal_stdlib>\n\
-    using namespace metal;\n\
-    struct metalVert_out\n\
-    {\n\
-        float4 position [[ position ]];\n\
-#define Output0 output.position\n\
-        float2 tc [[ user(varying1) ]];\n\
-    };\n\
-    vertex metalVert_out mainVS(\n\
-                                uint VertexID [[ vertex_id ]])\n\
-    {\n\
-        metalVert_out output;\n\
-        float4 position;\n\
-        position.x = (VertexID == 0)? 3.0 : -1.0;\n\
-        position.y = (VertexID == 2)? 3.0 : -1.0;\n\
-        position.zw = 1.0;\n\
-        output.position=position;\n\
-        output.tc = output.position.xy * float2(0.5, -0.5) + 0.5;\n\
-        return output;\n\
-    }\n\
-    struct metalFrag_stageIn\n\
-    {\n\
-        float2 tc [[ user(varying1) ]];\n\
-    };\n\
-    struct metalFrag_out\n\
-    {\n\
-        float4 PixOutput0 [[ color(0) ]];\n\
-    };\n\
-    struct Uniforms\n\
-    {\n\
-        float4 KernelRadius_ClippedRatio;\n\
-        float4 SampleSize_FirstSampleOffset;\n\
-        float4 SampleStep_FirstSamplePos;\n\
-    };\n\
-    fragment metalFrag_out mainLanczosPS(\n\
-                                         metalFrag_stageIn stageIn [[ stage_in ]],\n\
-                                         sampler Texture0_s[[ sampler(0) ]],\n\
-                                         texture2d<float> Texture0_t[[ texture(0) ]],\n\
-                                         constant Uniforms &uniforms [[buffer(0)]])\n\
-    {\n\
-        metalFrag_out output;\n\
-        float2 tc = stageIn.tc;\n\
-        float2 baseTc = tc + uniforms.SampleSize_FirstSampleOffset.zw;\n\
-        float2 kernelPos = uniforms.SampleStep_FirstSamplePos.zw;\n\
-        float4 accumSample = float4(0,0,0,0);\n\
-        float accumWeight = 0;\n\
-        for (; kernelPos.y < uniforms.KernelRadius_ClippedRatio.y; kernelPos.y += uniforms.SampleStep_FirstSamplePos.y)\n\
-        {\n\
-            tc.x = baseTc.x;\n\
-            for (kernelPos.x = uniforms.SampleStep_FirstSamplePos.x;\n\
-                 kernelPos.x < uniforms.KernelRadius_ClippedRatio.x;\n\
-                 kernelPos.x += uniforms.SampleStep_FirstSamplePos.x)\n\
-            {\n\
-                float2 piProduct = 3.14159265f * (kernelPos + 1e-4f);\n\
-                float2 weights2d = (sin(piProduct) * sin(piProduct * 0.5f) * 2.f) / (piProduct * piProduct);\n\
-                float weight = weights2d.x * weights2d.y;\n\
-                accumSample += weight * ((Texture0_t.sample(Texture0_s, tc.xy * uniforms.KernelRadius_ClippedRatio.zw)));\n\
-                accumWeight += weight;\n\
-                tc.x += uniforms.SampleSize_FirstSampleOffset.x;\n\
-            }\n\
-            tc.y += uniforms.SampleSize_FirstSampleOffset.y;\n\
-        }\n\
-        output.PixOutput0 = accumSample / accumWeight;\n\
-        return output;\n\
-    }\n\
-    fragment metalFrag_out mainBicubicPS(\n\
-                                         metalFrag_stageIn stageIn [[ stage_in ]],\n\
-                                         sampler Texture0_s[[ sampler(0) ]],\n\
-                                         texture2d<float> Texture0_t[[ texture(0) ]])\n\
-    {\n\
-        metalFrag_out output;\n\
-        int width = Texture0_t.get_width();\n\
-        int height = Texture0_t.get_height();\n\
-        float2 texSize = float2((float)width, (float)height);\n\
-        float2 unnormedTc = stageIn.tc * texSize;\n\
-        float2 unnormedCenteredTc = floor( unnormedTc - 0.5f ) + 0.5f;\n\
-        float2 f = unnormedTc - unnormedCenteredTc;\n\
-        float2 f2 = f*f;\n\
-        float2 f3 = f*f2;\n\
-        float2 w0 = f2 - 0.5f * (f3 + f);\n\
-        float2 w1 = 1.5 * f3 - 2.5 * f2 + 1.0;\n\
-        float2 w2 = -1.5 * f3 + 2 * f2 + 0.5 *f;\n\
-        float2 w3 = 0.5 * (f3 - f2);\n\
-        float2 s0 = w0 + w1;\n\
-        float2 s1 = w2 + w3;\n\
-        float2 f0 = w1 / (w0 + w1);\n\
-        float2 f1 = w3 / (w2 + w3);\n\
-        float2 t0 = (unnormedCenteredTc - 1.f + f0) / texSize;\n\
-        float2 t1 = (unnormedCenteredTc + 1.f + f1) / texSize;\n\
-        output.PixOutput0  = ( (Texture0_t.sample(Texture0_s, float2(t0.x, t0.y))) * s0.x \n\
-                              +   (Texture0_t.sample(Texture0_s, float2(t1.x, t0.y))) * s1.x) * s0.y\n\
-        + ( (Texture0_t.sample(Texture0_s, float2(t0.x, t1.y))) * s0.x \n\
-           +   (Texture0_t.sample(Texture0_s, float2(t1.x, t1.y))) * s1.x) * s1.y;\n\
-        return output;\n\
-    }\n\
-    ";
-    // Bicubic filtering based off Phill Djonov's blog: http://vec3.ca/bicubic-filtering-in-fewer-taps/
-    ////////////////////////////////////////////////////////////////////////////////
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALDevice.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALDevice.cpp
deleted file mode 100644
index 5d2070fc1b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/METALDevice.cpp
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the type CDevice and the functions to
-//               initialize Metal contexts and detect hardware capabilities.
-
-#include "RenderDll_precompiled.h"
-#include "MetalDevice.hpp"
-#include "GLResource.hpp"
-#include <DriverD3D.h>
-
-////////////////////////////////////////////////////////////////////////////////
-@implementation MetalView
-
-////////////////////////////////////////////////////////////////////////////////
-@synthesize metalLayer = _metalLayer;
-
-////////////////////////////////////////////////////////////////////////////////
-+ (id)layerClass
-{
-    return [CAMetalLayer class];
-}
-
-////////////////////////////////////////////////////////////////////////////////
-- (id)initWithFrame: (CGRect)frame
-              scale: (CGFloat)scale
-             device: (id<MTLDevice>)device
-{
-    if ((self = [super initWithFrame: frame]))
-    {
-
-#if defined(AZ_PLATFORM_MAC)
-        self.wantsLayer = YES;
-        self.layer = _metalLayer = [CAMetalLayer layer];
-        self.autoresizingMask = (NSViewWidthSizable | NSViewHeightSizable);
-#else
-        _metalLayer = (CAMetalLayer*)self.layer;
-        self.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
-        if ([self respondsToSelector : @selector(contentScaleFactor)])
-        {
-            self.contentScaleFactor = scale;
-        }
-#endif
-        _metalLayer.device = device;
-        _metalLayer.framebufferOnly = TRUE;
-        _metalLayer.drawsAsynchronously = TRUE;
-        _metalLayer.presentsWithTransaction = FALSE;
-        _metalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm;
-        CGFloat components[] = { 0.0, 0.0, 0.0, 1 };
-        _metalLayer.backgroundColor = CGColorCreate(CGColorSpaceCreateDeviceRGB(), components);
-
-        self.autoresizesSubviews = TRUE;
-
-        
-#if defined(AZ_PLATFORM_IOS)
-        self.multipleTouchEnabled = TRUE;
-#endif // defined(AZ_PLATFORM_IOS)
-
-    }
-
-    return self;
-}
-
-- (void)setFrameSize: (CGSize) size
-{
-#if defined(AZ_PLATFORM_MAC)
-    // iOS UiView may not respond to this message according to the compile error...
-    [super setFrameSize: size];
-#endif
-    [_metalLayer setDrawableSize: size];
-}
-@end // MetalView Implementation
-
-////////////////////////////////////////////////////////////////////////////////
-@implementation MetalViewController
-
-////////////////////////////////////////////////////////////////////////////////
-- (BOOL)prefersStatusBarHidden
-{
-    return TRUE;
-}
-
-#if defined(AZ_PLATFORM_IOS)
-- (void)viewWillTransitionToSize: (CGSize)size withTransitionCoordinator: (id<UIViewControllerTransitionCoordinator>) coordinator
-{
-    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
-    
-    NativeScreenType* nativeScreen = [NativeScreenType mainScreen];
-    CGFloat screenScale = [nativeScreen scale];
-    int width = static_cast<int>(size.width * screenScale);
-    int height = static_cast<int>(size.height * screenScale);
-    
-    ICVar* widthCVar = gEnv->pConsole->GetCVar("r_width");
-    ICVar* heightCVar = gEnv->pConsole->GetCVar("r_height");
-    
-    // We need to wait for the render thread to finish before we set the new dimensions.
-    if (!gRenDev->m_pRT->IsRenderThread(true))
-    {
-        gEnv->pRenderer->GetRenderThread()->WaitFlushFinishedCond();
-    }
-    
-    gcpRendD3D->GetClampedWindowSize(width, height);
-    
-    widthCVar->Set(width);
-    heightCVar->Set(height);
-    gcpRendD3D->SetWidth(widthCVar->GetIVal());
-    gcpRendD3D->SetHeight(heightCVar->GetIVal());
-}
-#endif
-
-#if defined(AZ_PLATFORM_MAC)
-////////////////////////////////////////////////////////////////////////////////
-- (void)keyDown: (NSEvent*)nsEvent
-{
-    // Override and do nothing to suppress beeping sound
-}
-#endif // defined(AZ_PLATFORM_MAC)
-
-@end // MetalViewController Implementation
-
-////////////////////////////////////////////////////////////////////////////////
-bool UIDeviceIsTablet()
-{
-#if defined(AZ_PLATFORM_IOS)
-    if([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad)
-    {
-        return true;
-    }
-#endif
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool UIKitGetPrimaryPhysicalDisplayDimensions(int& o_widthPixels, int& o_heightPixels)
-{
-
-    NativeScreenType* nativeScreen = [NativeScreenType mainScreen];
-#if defined(AZ_PLATFORM_MAC)
-    CGRect screenBounds = [nativeScreen frame];
-    CGFloat screenScale = 1.0f;
-#else
-    CGRect screenBounds = [nativeScreen bounds];
-    CGFloat screenScale = [nativeScreen scale];
-#endif
-    o_widthPixels = static_cast<int>(screenBounds.size.width * screenScale);
-    o_heightPixels = static_cast<int>(screenBounds.size.height * screenScale);
-
-#if defined(AZ_PLATFORM_IOS)
-    const bool isScreenLandscape = o_widthPixels > o_heightPixels;
-
-    UIInterfaceOrientation uiOrientation = UIInterfaceOrientationUnknown;
-#if defined(__IPHONE_13_0) || defined(__TVOS_13_0)
-    if(@available(iOS 13.0, tvOS 13.0, *))
-    {
-        UIWindow* foundWindow = nil;
-        
-        //Find the key window
-        NSArray* windows = [[UIApplication sharedApplication] windows];
-        for (UIWindow* window in windows)
-        {
-            if (window.isKeyWindow)
-            {
-                foundWindow = window;
-                break;
-            }
-        }
-        
-        //Check if the key window is found
-        if(foundWindow)
-        {
-            uiOrientation = foundWindow.windowScene.interfaceOrientation;
-        }
-        else
-        {
-            //If no key window is found create a temporary window in order to extract the orientation
-            //This can happen as this function gets called before the renderer is initialized
-            CGRect screenBounds = [[NativeScreenType mainScreen] bounds];
-            UIWindow* tempWindow = [[NativeWindowType alloc] initWithFrame: screenBounds];
-            uiOrientation = tempWindow.windowScene.interfaceOrientation;
-            [tempWindow release];
-        }
-    }
-#else
-    uiOrientation = UIApplication.sharedApplication.statusBarOrientation;
-#endif
-    
-    const bool isInterfaceLandscape = UIInterfaceOrientationIsLandscape(uiOrientation);
-    if (isScreenLandscape != isInterfaceLandscape)
-    {
-        const int width = o_widthPixels;
-        o_widthPixels = o_heightPixels;
-        o_heightPixels = width;
-    }
-#endif // defined(AZ_PLATFORM_IOS)
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-namespace NCryMetal
-{
-    extern const DXGI_FORMAT DXGI_FORMAT_INVALID = DXGI_FORMAT_FORCE_UINT;
-
-    ////////////////////////////////////////////////////////////////////////////
-    CDevice::CDevice()
-        : m_currentView(nullptr)
-        , m_viewController(nullptr)
-    {
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    CDevice::~CDevice()
-    {
-        Shutdown();
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    bool CDevice::CreateMetalWindow(HWND* handle,
-                                    uint32 width,
-                                    uint32 height,
-                                    bool fullScreen)
-    {
-#if defined(AZ_PLATFORM_MAC)
-        CGRect screenBounds = CGRectMake(0, 0, width, height);
-        //Make the window closeable and minimizeable.
-        NSUInteger styleMask = NSWindowStyleMaskClosable|NSWindowStyleMaskTitled|NSWindowStyleMaskMiniaturizable;
-        NativeWindowType* nativeWindow = [[NativeWindowType alloc] initWithContentRect: screenBounds styleMask: styleMask backing: NSBackingStoreBuffered defer:false];
-
-        [nativeWindow makeKeyAndOrderFront:nil];
-        
-        if(fullScreen)
-        {
-            [nativeWindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-            [nativeWindow toggleFullScreen:nil];
-        }
-#else
-        CGRect screenBounds = [[NativeScreenType mainScreen] bounds];
-        NativeWindowType* nativeWindow = [[NativeWindowType alloc] initWithFrame: screenBounds];
-        [nativeWindow makeKeyAndVisible];
-#endif
-    
-        *handle = nativeWindow;
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    void CDevice::DestroyMetalWindow(HWND handle)
-    {
-        NativeWindowType* nativeWindow = reinterpret_cast<NativeWindowType*>(handle);
-        [nativeWindow release];
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    CContext* CDevice::CreateContext()
-    {
-        CContext* pContext(new CContext(this));
-        if (!pContext->Initialize())
-        {
-            delete pContext;
-            pContext = nullptr;
-        }
-
-        return pContext;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    void CDevice::FreeContext(CContext* pContext)
-    {
-        delete pContext;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    bool CDevice::Initialize(const TWindowContext& defaultNativeDisplay)
-    {
-        m_metalDevice = MTLCreateSystemDefaultDevice();
-        m_commandQueue = [m_metalDevice newCommandQueue];
-
-        const bool isDisplayAWindow = ([(id)defaultNativeDisplay isKindOfClass:[NativeWindowType class]]) == YES;
-        if (isDisplayAWindow)
-        {
-            NativeScreenType* nativeScreen = [NativeScreenType mainScreen];
-            NativeWindowType* nativeWindow = reinterpret_cast<NativeWindowType*>(defaultNativeDisplay);
-            assert(nativeWindow != nullptr);
-            
-            // Create the MetalView
-#if defined(AZ_PLATFORM_MAC)
-            bool isFullScreen = (([nativeWindow styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen);
-            CGRect screenBounds = [nativeScreen visibleFrame];
-            if(isFullScreen)
-            {
-                [nativeWindow setFrame:screenBounds display: true animate: true];
-            }
-            else
-            {
-                CGRect screenFrame = [[nativeWindow screen] frame];
-                CGRect windowFrame = [nativeWindow frame];
-                
-                CGFloat xPos = NSWidth(screenFrame)/2 - NSWidth(windowFrame)/2;
-                CGFloat yPos = NSHeight(screenFrame)/2 - NSHeight(windowFrame)/2;
-                
-                //Put the window in the centre of the screen
-                [nativeWindow setFrame:NSMakeRect(xPos, yPos, NSWidth(windowFrame), NSHeight(windowFrame)) display:true];
-                screenBounds = [nativeWindow frame];
-            }
-            
-            CGFloat screenScale = 1.0f;
-#else
-            CGRect screenBounds = [nativeScreen bounds];
-            CGFloat screenScale = [nativeScreen scale];
-#endif
-            m_currentView = [[MetalView alloc] initWithFrame: screenBounds
-                                                       scale: screenScale
-                                                      device: m_metalDevice];
-
-            [m_currentView retain];
-            
-            // Create the MetalViewController
-            MetalViewController* metalViewController = [MetalViewController alloc];
-            m_viewController = [metalViewController init];
-            [m_viewController setView : m_currentView];
-            [m_viewController retain];
-            
-            // Add the MetalView and assign the MetalViewController to the UIWindow        
-#if defined(AZ_PLATFORM_MAC)
-            // Setting the contentViewController implicitly sets the contentView
-            nativeWindow.contentViewController = m_viewController;
-            [nativeWindow makeFirstResponder: m_currentView];
-#else
-            nativeWindow.rootViewController = m_viewController;
-#endif
-        }
-
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    void CDevice::Shutdown()
-    {
-        // Destroy the MetalViewController
-        if (m_viewController)
-        {
-            NativeWindowType* nativeWindow = static_cast<NativeWindowType*>(m_currentView.superview);
-#if defined(AZ_PLATFORM_MAC)
-            if (nativeWindow.contentViewController == m_viewController)
-            {
-                nativeWindow.contentViewController = nil;
-            }
-#else
-            if (nativeWindow.rootViewController == m_viewController)
-            {
-                nativeWindow.rootViewController = nil;
-            }
-            [m_viewController setView : nil];
-#endif
-            
-            [m_viewController release];
-            m_viewController = nullptr;
-        }
-
-        // Destroy the MetalView
-        if (m_currentView)
-        {
-            [m_currentView removeFromSuperview];
-            [m_currentView release];
-            m_currentView = nullptr;
-        }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    bool CDevice::Present()
-    {
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    uint32 DetectGIFormatSupport(EGIFormat eGIFormat)
-    {
-        const SGIFormatInfo* formatInfo = GetGIFormatInfo(eGIFormat);
-        if (!formatInfo)
-        {
-            return 0;
-        }
-
-        uint32 support = formatInfo->m_uDefaultSupport;
-
-        if (formatInfo->m_pTexture)
-        {
-            DXGL_TODO("Use an alternative way to detect texture format support such as proxy textures");
-            support |= D3D11_FORMAT_SUPPORT_TEXTURE1D |
-                       D3D11_FORMAT_SUPPORT_TEXTURE2D |
-                       D3D11_FORMAT_SUPPORT_TEXTURE3D |
-                       D3D11_FORMAT_SUPPORT_TEXTURECUBE |
-                       D3D11_FORMAT_SUPPORT_MIP;
-        }
-        else
-        {
-            support &= ~(D3D11_FORMAT_SUPPORT_TEXTURE1D |
-                         D3D11_FORMAT_SUPPORT_TEXTURE2D |
-                         D3D11_FORMAT_SUPPORT_TEXTURE3D |
-                         D3D11_FORMAT_SUPPORT_TEXTURECUBE |
-                         D3D11_FORMAT_SUPPORT_MIP);
-        }
-
-        if (formatInfo->m_pUncompressed && formatInfo->m_pTexture)
-        {
-            DXGL_TODO("Use an alternative way to detect format renderability such as per-platform tables in GLFormat.cpp");
-            support |= D3D11_FORMAT_SUPPORT_RENDER_TARGET |
-                       D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET |
-                       D3D11_FORMAT_SUPPORT_BLENDABLE |
-                       D3D11_FORMAT_SUPPORT_DEPTH_STENCIL;
-        }
-        else
-        {
-            support &= ~(D3D11_FORMAT_SUPPORT_RENDER_TARGET |
-                         D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET |
-                         D3D11_FORMAT_SUPPORT_BLENDABLE |
-                         D3D11_FORMAT_SUPPORT_DEPTH_STENCIL);
-        }
-
-        return support;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    bool DetectAdapters(std::vector<SAdapterPtr>& kAdapters)
-    {
-        SAdapterPtr spAdapter(new SAdapter);
-        spAdapter->m_description = "Metal Renderer iOS";
-        spAdapter->m_maxSamples = 4;
-        spAdapter->m_vramBytes = 0; // Not yet implemented
-        spAdapter->m_features.Set(eF_ComputeShader, DXGL_SUPPORT_COMPUTE ? true : false);
-
-        for (uint32 giFormat = 0; giFormat < NCryMetal::eGIF_NUM; ++giFormat)
-        {
-            spAdapter->m_giFormatSupport[giFormat] = DetectGIFormatSupport((EGIFormat)giFormat);
-        }
-
-        kAdapters.push_back(spAdapter);
-
-        return true;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/MetalDevice.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/MetalDevice.hpp
deleted file mode 100644
index ce0fc5bc09..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/MetalDevice.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Description : Declaration of the type CDevice and the functions to
-//               initialize Metal contexts and detect hardware capabilities.
-
-#pragma once
-
-#include "GLCommon.hpp"
-#include "METALContext.hpp"
-
-#if defined(AZ_PLATFORM_MAC)
-#include <AppKit/AppKit.h>
-using NativeViewType = NSView;
-using NativeViewControllerType = NSViewController;
-using NativeScreenType = NSScreen;
-using NativeApplicationType = NSApplication;
-using NativeWindowType = NSWindow;
-#else
-#include <UIKit/UIKit.h>
-using NativeViewType = UIView;
-using NativeViewControllerType = UIViewController;
-using NativeScreenType = UIScreen;
-using NativeApplicationType = UIApplication;
-using NativeWindowType = UIWindow;
-#endif
-
-
-#include     <Metal/Metal.h>
-#import <QuartzCore/CAMetalLayer.h>
-
-////////////////////////////////////////////////////////////////////////////////
-namespace NCryMetal
-{
-    ////////////////////////////////////////////////////////////////////////////
-    enum EFeature
-    {
-        eF_ComputeShader,
-        eF_NUM
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    DXGL_DECLARE_REF_COUNTED(class, CDevice)
-    {
-    public:
-        CDevice();
-        ~CDevice();
-
-        static bool CreateMetalWindow(HWND* handle, uint32 width, uint32 height, bool fullScreen);
-        static void DestroyMetalWindow(HWND handle);
-
-        CContext* CreateContext();
-        void FreeContext(CContext* pContext);
-
-        bool Initialize(const TWindowContext& defaultNativeDisplay);
-        void Shutdown();
-        bool Present();
-
-        const id<MTLDevice> GetMetalDevice() const { return m_metalDevice; }
-        const id<MTLCommandQueue> GetMetalCommandQueue() const { return m_commandQueue; }
-
-    protected:
-        NativeViewType* m_currentView;
-        NativeViewControllerType* m_viewController;
-
-        id<MTLDevice> m_metalDevice;
-        id<MTLCommandQueue> m_commandQueue;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    DXGL_DECLARE_REF_COUNTED(struct, SAdapter)
-    {
-        string m_description;
-
-        // The supported usage for each GI format (union of D3D11_FORMAT_SUPPORT flags)
-        uint32 m_giFormatSupport[eGIF_NUM];
-        SBitMask<eF_NUM, SUnsafeBitMaskWord>::Type m_features;
-
-        GLint m_maxSamples;
-        size_t m_vramBytes;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    bool DetectAdapters(std::vector<SAdapterPtr>& kAdapters);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-@interface MetalView : NativeViewType {}
-+ (id)layerClass;
-- (id)initWithFrame: (CGRect)frame scale: (CGFloat)scale device: (id<MTLDevice>)device;
-- (void)setFrameSize: (CGSize) size;
-
-@property  (nonatomic, assign )CAMetalLayer *metalLayer;
-
-@end    // MetalView Interface
-
-////////////////////////////////////////////////////////////////////////////////
-@interface MetalViewController : NativeViewControllerType {}
-- (BOOL)prefersStatusBarHidden;
-#if defined(AZ_PLATFORM_IOS)
-- (void)viewWillTransitionToSize: (CGSize)size withTransitionCoordinator: (id<UIViewControllerTransitionCoordinator>) coordinator;
-#endif
-@end    // MetalViewController Interface
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBase.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBase.cpp
deleted file mode 100644
index c14671f0ae..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBase.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description: Definition of the reference counted base class for all
-//               DXGL interface implementations
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALBase.hpp"
-#include "../Implementation/GLCommon.hpp"
-
-CCryDXGLBase::CCryDXGLBase()
-    : m_uRefCount(1)
-{
-    DXGL_INITIALIZE_INTERFACE(Unknown);
-}
-
-CCryDXGLBase::~CCryDXGLBase()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of IUnknown
-////////////////////////////////////////////////////////////////////////////////
-
-#if DXGL_FULL_EMULATION
-
-SAggregateNode& CCryDXGLBase::GetAggregateHead()
-{
-    return m_kAggregateHead;
-}
-
-#else
-
-HRESULT CCryDXGLBase::QueryInterface(REFIID riid, void** ppvObject)
-{
-    return E_NOINTERFACE;
-}
-
-#endif
-
-ULONG CCryDXGLBase::AddRef(void)
-{
-    return ++m_uRefCount;
-}
-
-ULONG CCryDXGLBase::Release(void)
-{
-    --m_uRefCount;
-    if (m_uRefCount == 0)
-    {
-        delete this;
-        return 0;
-    }
-    return m_uRefCount;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLPrivateDataContainer
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLPrivateDataContainer::SPrivateData
-{
-    union
-    {
-        uint8* m_pBuffer;
-        IUnknown* m_pInterface;
-    };
-    uint32 m_uSize;
-    bool m_bInterface;
-
-    SPrivateData(const void* pData, uint32 uSize)
-    {
-        m_pBuffer = new uint8[uSize];
-        m_uSize = uSize;
-        m_bInterface = false;
-        memcpy(m_pBuffer, pData, uSize);
-    }
-
-    SPrivateData(IUnknown* pInterface)
-    {
-        pInterface->AddRef();
-        m_pInterface = pInterface;
-        m_uSize = sizeof(IUnknown*);
-        m_bInterface = true;
-    }
-
-    ~SPrivateData()
-    {
-        if (m_bInterface)
-        {
-            m_pInterface->Release();
-        }
-        else
-        {
-            delete [] m_pBuffer;
-        }
-    }
-};
-
-CCryDXGLPrivateDataContainer::CCryDXGLPrivateDataContainer()
-{
-}
-
-CCryDXGLPrivateDataContainer::~CCryDXGLPrivateDataContainer()
-{
-    TPrivateDataMap::iterator kPrivateIter(m_kPrivateDataMap.begin());
-    TPrivateDataMap::iterator kPrivateEnd(m_kPrivateDataMap.end());
-    for (; kPrivateIter != kPrivateEnd; ++kPrivateIter)
-    {
-        delete kPrivateIter->second;
-    }
-}
-
-HRESULT CCryDXGLPrivateDataContainer::GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData)
-{
-    if (pData == NULL)
-    {
-        if (*pDataSize != 0)
-        {
-            return E_FAIL;
-        }
-        RemovePrivateData(guid);
-    }
-    else
-    {
-        CRY_ASSERT(pDataSize != NULL);
-        TPrivateDataMap::const_iterator kFound(m_kPrivateDataMap.find(guid));
-        if (kFound == m_kPrivateDataMap.end() || *pDataSize < kFound->second->m_uSize)
-        {
-            return E_FAIL;
-        }
-
-        if (kFound->second->m_bInterface)
-        {
-            kFound->second->m_pInterface->AddRef();
-            *static_cast<IUnknown**>(pData) = kFound->second->m_pInterface;
-        }
-        else
-        {
-            memcpy(pData, kFound->second->m_pBuffer, kFound->second->m_uSize);
-        }
-        *pDataSize = kFound->second->m_uSize;
-    }
-
-    return S_OK;
-}
-
-HRESULT CCryDXGLPrivateDataContainer::SetPrivateData(REFGUID guid, UINT DataSize, const void* pData)
-{
-    RemovePrivateData(guid);
-
-    m_kPrivateDataMap.insert(TPrivateDataMap::value_type(guid, new SPrivateData(pData, DataSize)));
-    return S_OK;
-}
-
-HRESULT CCryDXGLPrivateDataContainer::SetPrivateDataInterface(REFGUID guid, const IUnknown* pData)
-{
-    RemovePrivateData(guid);
-
-    m_kPrivateDataMap.insert(TPrivateDataMap::value_type(guid, new SPrivateData(const_cast<IUnknown*>(pData))));    // The specification requires that IUnknown::AddRef, Release are called on pData thus the const cast
-    return S_OK;
-}
-
-void CCryDXGLPrivateDataContainer::RemovePrivateData(REFGUID guid)
-{
-    TPrivateDataMap::iterator kFound(m_kPrivateDataMap.find(guid));
-    if (kFound != m_kPrivateDataMap.end())
-    {
-        delete kFound->second;
-        m_kPrivateDataMap.erase(kFound);
-    }
-}
-
-size_t CCryDXGLPrivateDataContainer::SGuidHashCompare::operator()(const GUID& kGuid) const
-{
-    return (size_t)NCryMetal::GetCRC32(reinterpret_cast<const char*>(&kGuid), sizeof(kGuid), 0xFFFFFFFF);
-}
-
-bool CCryDXGLPrivateDataContainer::SGuidHashCompare::operator()(const GUID& kLeft, const GUID& kRight) const
-{
-    return memcmp(&kLeft, &kRight, sizeof(kLeft)) == 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBase.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBase.hpp
deleted file mode 100644
index a81fbe7e72..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBase.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the reference counted base class for all
-//               DXGL interface implementations
-
-#ifndef __CRYMETALGLBASE__
-#define __CRYMETALGLBASE__
-
-#include "../Definitions/CryDXMETALGuid.hpp"
-#include "../Definitions/ICryDXMETALUnknown.hpp"
-
-template <typename Interface>
-struct SingleInterface
-{
-    template <typename Object>
-    static bool Query(Object* pThis, REFIID riid, void** ppvObject)
-    {
-        if (riid == __uuidof(Interface))
-        {
-            *reinterpret_cast<Interface**>(ppvObject) = static_cast<Interface*>(pThis);
-            static_cast<Interface*>(pThis)->AddRef();
-            return true;
-        }
-        return false;
-    }
-};
-
-#include "DXEmulation.hpp"
-
-////////////////////////////////////////////////////////////////////////////
-// Definition of basic types
-////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLBase
-#if !DXGL_FULL_EMULATION
-    : public IUnknown
-#endif //!DXGL_FULL_EMULATION
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBase, Unknown)
-
-    CCryDXGLBase();
-    virtual ~CCryDXGLBase();
-
-#if DXGL_FULL_EMULATION
-    SAggregateNode& GetAggregateHead();
-#else
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-#endif //!DXGL_FULL_EMULATION
-    ULONG STDMETHODCALLTYPE AddRef();
-    ULONG STDMETHODCALLTYPE Release();
-protected:
-    uint32 m_uRefCount;
-#if DXGL_FULL_EMULATION
-    SAggregateNode m_kAggregateHead;
-#endif //DXGL_FULL_EMULATION
-};
-
-class CCryDXGLPrivateDataContainer
-{
-public:
-    CCryDXGLPrivateDataContainer();
-    ~CCryDXGLPrivateDataContainer();
-
-    HRESULT GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData);
-    HRESULT SetPrivateData(REFGUID guid, UINT DataSize, const void* pData);
-    HRESULT SetPrivateDataInterface(REFGUID guid, const IUnknown* pData);
-protected:
-    void RemovePrivateData(REFGUID guid);
-protected:
-    struct SPrivateData;
-
-    struct SGuidHashCompare
-    {
-        size_t operator()(const GUID& kGuid) const;
-        bool operator()(const GUID& kLeft, const GUID& kRight) const;
-    };
-
-    typedef AZStd::unordered_map<GUID, SPrivateData*, SGuidHashCompare, SGuidHashCompare> TPrivateDataMap;
-    TPrivateDataMap m_kPrivateDataMap;
-};
-
-#endif //__CRYMETALGLBASE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlendState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlendState.cpp
deleted file mode 100644
index 0df54fceb1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlendState.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11BlendState
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALBlendState.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-CCryDXGLBlendState::CCryDXGLBlendState(const D3D11_BLEND_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_pGLState(new NCryMetal::SBlendState)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11BlendState)
-}
-
-CCryDXGLBlendState::~CCryDXGLBlendState()
-{
-    delete m_pGLState;
-}
-
-bool CCryDXGLBlendState::Initialize(CCryDXGLDevice* pDevice)
-{
-    return NCryMetal::InitializeBlendState(m_kDesc, *m_pGLState, pDevice->GetGLDevice());
-}
-
-bool CCryDXGLBlendState::Apply(NCryMetal::CContext* pContext)
-{
-    return pContext->SetBlendState(*m_pGLState);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11BlendState
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLBlendState::GetDesc(D3D11_BLEND_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlendState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlendState.hpp
deleted file mode 100644
index b09da46f22..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlendState.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11BlendState
-
-#ifndef __CRYMETALGLBLENDSTATE__
-#define __CRYMETALGLBLENDSTATE__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-namespace NCryMetal
-{
-    struct SBlendState;
-    class CContext;
-}
-
-class CCryDXGLBlendState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBlendState, D3D11BlendState)
-
-    CCryDXGLBlendState(const D3D11_BLEND_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLBlendState();
-
-    bool Initialize(CCryDXGLDevice* pDevice);
-    bool Apply(NCryMetal::CContext* pContext);
-
-    // Implementation of ID3D11BlendState
-    void GetDesc(D3D11_BLEND_DESC* pDesc);
-protected:
-    D3D11_BLEND_DESC m_kDesc;
-    NCryMetal::SBlendState* m_pGLState;
-};
-
-#endif //__CRYMETALGLBLENDSTATE__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlob.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlob.cpp
deleted file mode 100644
index 8e05fdaa0f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlob.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D10Blob
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALBlob.hpp"
-
-CCryDXGLBlob::CCryDXGLBlob(size_t uBufferSize)
-    : m_uBufferSize(uBufferSize)
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-    , m_uRefCount(1)
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D10Blob)
-    m_pBuffer = new uint8[m_uBufferSize];
-}
-
-CCryDXGLBlob::~CCryDXGLBlob()
-{
-    delete [] m_pBuffer;
-}
-
-
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-
-////////////////////////////////////////////////////////////////////////////////
-// IUnknown implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLBlob::QueryInterface(REFIID riid, void** ppvObject)
-{
-    return E_NOINTERFACE;
-}
-
-ULONG CCryDXGLBlob::AddRef(void)
-{
-    return ++m_uRefCount;
-}
-
-ULONG CCryDXGLBlob::Release(void)
-{
-    --m_uRefCount;
-    if (m_uRefCount == 0)
-    {
-        delete this;
-        return 0;
-    }
-    return m_uRefCount;
-}
-
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D10Blob implementation
-////////////////////////////////////////////////////////////////////////////////
-
-LPVOID CCryDXGLBlob::GetBufferPointer()
-{
-    return m_pBuffer;
-}
-
-SIZE_T CCryDXGLBlob::GetBufferSize()
-{
-    return m_uBufferSize;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlob.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlob.hpp
deleted file mode 100644
index 08407f87f3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBlob.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D10Blob
-
-#ifndef __CRYMETALGLBLOB__
-#define __CRYMETALGLBLOB__
-
-#include "CCryDXMETALBase.hpp"
-
-#if defined(DXGL_BLOB_INTEROPERABILITY) && !DXGL_FULL_EMULATION
-class CCryDXGLBlob
-    : public ID3D10Blob
-#else
-class CCryDXGLBlob
-    : public CCryDXGLBase
-#endif
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBlob, D3D10Blob)
-
-    CCryDXGLBlob(size_t uBufferSize);
-    virtual ~CCryDXGLBlob();
-
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-    //IUnknown implementation
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-    ULONG STDMETHODCALLTYPE AddRef();
-    ULONG STDMETHODCALLTYPE Release();
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-
-    // ID3D10Blob implementation
-    LPVOID STDMETHODCALLTYPE GetBufferPointer();
-    SIZE_T STDMETHODCALLTYPE GetBufferSize();
-protected:
-#if defined(DXGL_BLOB_INTEROPERABILITY)
-    uint32 m_uRefCount;
-#endif //defined(DXGL_BLOB_INTEROPERABILITY)
-
-    uint8 * m_pBuffer;
-    size_t m_uBufferSize;
-};
-
-
-#endif //__CRYMETALGLBLOB__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBuffer.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBuffer.cpp
deleted file mode 100644
index 84f2f6d3d1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBuffer.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Buffer
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALBuffer.hpp"
-#include "CCryDXMETALDeviceContext.hpp"
-#include "../Implementation/GLResource.hpp"
-
-CCryDXGLBuffer::CCryDXGLBuffer(const D3D11_BUFFER_DESC& kDesc, NCryMetal::SBuffer* pGLBuffer, CCryDXGLDevice* pDevice)
-    : CCryDXGLResource(D3D11_RESOURCE_DIMENSION_BUFFER, pGLBuffer, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Buffer)
-}
-
-CCryDXGLBuffer::~CCryDXGLBuffer()
-{
-}
-
-NCryMetal::SBuffer* CCryDXGLBuffer::GetGLBuffer()
-{
-    return static_cast<NCryMetal::SBuffer*>(m_spGLResource.get());
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Buffer implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLBuffer::GetDesc(D3D11_BUFFER_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBuffer.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBuffer.hpp
deleted file mode 100644
index bfcc78a9fd..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALBuffer.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Buffer
-
-#ifndef __CRYMETALGLBUFFER__
-#define __CRYMETALGLBUFFER__
-
-#include "CCryDXMETALResource.hpp"
-
-namespace NCryMetal
-{
-    struct SBuffer;
-}
-
-class CCryDXGLBuffer
-    : public CCryDXGLResource
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLBuffer, D3D11Buffer)
-
-    CCryDXGLBuffer(const D3D11_BUFFER_DESC& kDesc, NCryMetal::SBuffer* pGLBuffer, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLBuffer();
-
-    // ID3D11Buffer implementation
-    void GetDesc(D3D11_BUFFER_DESC* pDesc);
-
-    NCryMetal::SBuffer* GetGLBuffer();
-private:
-    D3D11_BUFFER_DESC m_kDesc;
-};
-
-#endif //__CRYMETALGLBUFFER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilState.cpp
deleted file mode 100644
index f75b57c3ff..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilState.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11DepthStencilState
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDepthStencilState.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-CCryDXGLDepthStencilState::CCryDXGLDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    //  Confetti BEGIN: Igor Lobanchikov
-    , m_MetalDepthStencilState(0)
-    //  Confetti End: Igor Lobanchikov
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DepthStencilState)
-}
-
-CCryDXGLDepthStencilState::~CCryDXGLDepthStencilState()
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    if (m_MetalDepthStencilState)
-    {
-        [m_MetalDepthStencilState release];
-    }
-    //  Confetti End: Igor Lobanchikov
-}
-
-bool CCryDXGLDepthStencilState::Initialize(CCryDXGLDevice* pDevice)
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    return NCryMetal::InitializeDepthStencilState(m_kDesc, m_MetalDepthStencilState, pDevice->GetGLDevice());
-    //  Confetti End: Igor Lobanchikov
-}
-
-bool CCryDXGLDepthStencilState::Apply(uint32 uStencilReference, NCryMetal::CContext* pContext)
-{
-    //  Confetti BEGIN: Igor Lobanchikov
-    return pContext->SetDepthStencilState(m_MetalDepthStencilState, uStencilReference);
-    //  Confetti End: Igor Lobanchikov
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11DepthStencilState
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLDepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilState.hpp
deleted file mode 100644
index 16db1cef4d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilState.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-//  Description: Declaration of the DXGL wrapper for ID3D11DepthStencilState
-
-#ifndef __CRYMETALGLDEPTHSTENCILSTATE__
-#define __CRYMETALGLDEPTHSTENCILSTATE__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-@protocol MTLDepthStencilState;
-
-namespace NCryMetal
-{
-    class CContext;
-}
-
-class CCryDXGLDepthStencilState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDepthStencilState, D3D11DepthStencilState)
-
-    CCryDXGLDepthStencilState(const D3D11_DEPTH_STENCIL_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLDepthStencilState();
-
-    bool Initialize(CCryDXGLDevice* pDevice);
-    bool Apply(uint32 uStencilReference, NCryMetal::CContext* pContext);
-
-    // Implementation of ID3D11DepthStencilState
-    void GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc);
-protected:
-    D3D11_DEPTH_STENCIL_DESC m_kDesc;
-    id<MTLDepthStencilState>        m_MetalDepthStencilState;
-};
-
-#endif //__CRYMETALGLDEPTHSTENCILSTATE__
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilView.cpp
deleted file mode 100644
index 4b508aada3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilView.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11DepthStencilView
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDepthStencilView.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALResource.hpp"
-#include "../Implementation/MetalDevice.hpp"
-#include "../Implementation/GLResource.hpp"
-
-CCryDXGLDepthStencilView::CCryDXGLDepthStencilView(CCryDXGLResource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DepthStencilView)
-}
-
-CCryDXGLDepthStencilView::~CCryDXGLDepthStencilView()
-{
-}
-
-bool CCryDXGLDepthStencilView::Initialize(NCryMetal::CDevice* pDevice)
-{
-    D3D11_RESOURCE_DIMENSION eDimension;
-    m_spResource->GetType(&eDimension);
-    m_spGLView = NCryMetal::CreateDepthStencilView(m_spResource->GetGLResource(), eDimension, m_kDesc, pDevice);
-    return m_spGLView  != NULL;
-}
-
-NCryMetal::SOutputMergerView* CCryDXGLDepthStencilView::GetGLView()
-{
-    return m_spGLView;
-}
-
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11DepthStencilView
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLDepthStencilView::GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilView.hpp
deleted file mode 100644
index e89b6d9737..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDepthStencilView.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11DepthStencilView
-
-#ifndef __CRYMETALGLDEPTHSTENCILVIEW__
-#define __CRYMETALGLDEPTHSTENCILVIEW__
-
-#include "CCryDXMETALView.hpp"
-
-namespace NCryMetal
-{
-    struct SOutputMergerView;
-    class CContext;
-}
-
-class CCryDXGLDepthStencilView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDepthStencilView, D3D11DepthStencilView)
-
-    CCryDXGLDepthStencilView(CCryDXGLResource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLDepthStencilView();
-
-    bool Initialize(NCryMetal::CDevice* pDevice);
-    NCryMetal::SOutputMergerView* GetGLView();
-
-    // Implementation of ID3D11DepthStencilView
-    void GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc);
-protected:
-    D3D11_DEPTH_STENCIL_VIEW_DESC m_kDesc;
-    _smart_ptr<NCryMetal::SOutputMergerView> m_spGLView;
-};
-
-#endif //__CRYMETALGLDEPTHSTENCILVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDevice.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDevice.cpp
deleted file mode 100644
index 1f8be8d39b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDevice.cpp
+++ /dev/null
@@ -1,909 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Device
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALBlendState.hpp"
-#include "CCryDXMETALBuffer.hpp"
-#include "CCryDXMETALDepthStencilState.hpp"
-#include "CCryDXMETALDepthStencilView.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALDeviceContext.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALInputLayout.hpp"
-#include "CCryDXMETALQuery.hpp"
-#include "CCryDXMETALRasterizerState.hpp"
-#include "CCryDXMETALRenderTargetView.hpp"
-#include "CCryDXMETALSamplerState.hpp"
-#include "CCryDXMETALSwapChain.hpp"
-#include "CCryDXMETALShader.hpp"
-#include "CCryDXMETALShaderResourceView.hpp"
-#include "CCryDXMETALTexture1D.hpp"
-#include "CCryDXMETALTexture2D.hpp"
-#include "CCryDXMETALTexture3D.hpp"
-#include "CCryDXMETALUnorderedAccessView.hpp"
-#include "../Implementation/MetalDevice.hpp"
-#include "../Implementation/GLFormat.hpp"
-#include "../Implementation/GLResource.hpp"
-#include "../Implementation/GLShader.hpp"
-
-CCryDXGLDevice::CCryDXGLDevice(CCryDXGLGIAdapter* pAdapter, D3D_FEATURE_LEVEL eFeatureLevel)
-    : m_spAdapter(pAdapter)
-    , m_eFeatureLevel(eFeatureLevel)
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIDevice)
-    DXGL_INITIALIZE_INTERFACE(D3D11Device)
-
-    CCryDXGLDeviceContext * pImmediateContext(new CCryDXGLDeviceContext());
-    m_spImmediateContext = pImmediateContext;
-    pImmediateContext->Release();
-}
-
-CCryDXGLDevice::~CCryDXGLDevice()
-{
-    m_spImmediateContext->Shutdown();
-}
-
-#if !DXGL_FULL_EMULATION
-
-HRESULT CCryDXGLDevice::QueryInterface(REFIID riid, void** ppvObject)
-{
-    if (SingleInterface<ID3D11Device>::Query(this, riid, ppvObject) ||
-        SingleInterface<CCryDXGLDevice>::Query(this, riid, ppvObject))
-    {
-        return S_OK;
-    }
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT
-    return E_NOINTERFACE;
-#else
-    return CCryDXGLBase::QueryInterface(riid, ppvObject);
-#endif
-}
-
-#endif //!DXGL_FULL_EMULATION
-
-bool CCryDXGLDevice::Initialize(const DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain)
-{
-    if (!pDesc || !ppSwapChain || !m_spAdapter || !m_spAdapter->GetGLAdapter())
-    {
-        return false;
-    }
-
-    m_spGLDevice = new NCryMetal::CDevice();
-    if (!m_spGLDevice->Initialize(pDesc->OutputWindow))
-    {
-        return false;
-    }
-
-    CCryDXGLSwapChain* pDXGLSwapChain(new CCryDXGLSwapChain(this, *pDesc));
-    CCryDXGLSwapChain::ToInterface(ppSwapChain, pDXGLSwapChain);
-    if (!pDXGLSwapChain->Initialize())
-    {
-        return false;
-    }
-
-    return m_spImmediateContext->Initialize(this);
-}
-
-NCryMetal::CDevice* CCryDXGLDevice::GetGLDevice()
-{
-    return m_spGLDevice;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIObject overrides
-////////////////////////////////////////////////////////////////////////////////
-
-
-HRESULT CCryDXGLDevice::GetParent(REFIID riid, void** ppParent)
-{
-    IUnknown* pAdapterInterface;
-    CCryDXGLBase::ToInterface(&pAdapterInterface, m_spAdapter);
-    if (pAdapterInterface->QueryInterface(riid, ppParent) == S_OK && ppParent != NULL)
-    {
-        return S_OK;
-    }
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT && !DXGL_FULL_EMULATION
-    return E_FAIL;
-#else
-    return CCryDXGLGIObject::GetParent(riid, ppParent);
-#endif
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIDevice implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLDevice::GetAdapter(IDXGIAdapter** pAdapter)
-{
-    if (m_spAdapter == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLGIAdapter::ToInterface(pAdapter, m_spAdapter);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::SetGPUThreadPriority(INT Priority)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::GetGPUThreadPriority(INT* pPriority)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Device implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLDevice::CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer)
-{
-    if (ppBuffer == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    NCryMetal::SBufferPtr spGLBuffer(NCryMetal::CreateBuffer(*pDesc, pInitialData, m_spGLDevice));
-    if (spGLBuffer == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLBuffer::ToInterface(ppBuffer, new CCryDXGLBuffer(*pDesc, spGLBuffer, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D)
-{
-    if (ppTexture1D == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    NCryMetal::STexturePtr spGLTexture(NCryMetal::CreateTexture1D(*pDesc, pInitialData, m_spGLDevice));
-    if (spGLTexture == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLTexture1D::ToInterface(ppTexture1D, new CCryDXGLTexture1D(*pDesc, spGLTexture, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D)
-{
-    if (ppTexture2D == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    NCryMetal::STexturePtr spGLTexture(NCryMetal::CreateTexture2D(*pDesc, pInitialData, m_spGLDevice));
-    if (spGLTexture == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLTexture2D::ToInterface(ppTexture2D, new CCryDXGLTexture2D(*pDesc, spGLTexture, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D)
-{
-    if (ppTexture3D == NULL)
-    {
-        // In this case the method should perform parameter validation and return the result
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-
-    NCryMetal::STexturePtr spGLTexture(NCryMetal::CreateTexture3D(*pDesc, pInitialData, m_spGLDevice));
-    if (spGLTexture == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLTexture3D::ToInterface(ppTexture3D, new CCryDXGLTexture3D(*pDesc, spGLTexture, this));
-    return S_OK;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture1D* pTexture, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE1D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY;
-        kStandardDesc.Texture1DArray.MostDetailedMip = 0;
-        kStandardDesc.Texture1DArray.MipLevels = -1;
-        kStandardDesc.Texture1DArray.FirstArraySlice = 0;
-        kStandardDesc.Texture1DArray.ArraySize = kTextureDesc.ArraySize;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D;
-        kStandardDesc.Texture1D.MostDetailedMip = 0;
-        kStandardDesc.Texture1DArray.MipLevels = -1;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture2D* pTexture, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE2D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 1)
-    {
-        if (kTextureDesc.SampleDesc.Count > 1)
-        {
-            kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
-            kStandardDesc.Texture2DMSArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DMSArray.ArraySize = kTextureDesc.ArraySize;
-        }
-        else
-        {
-            kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
-            kStandardDesc.Texture2DArray.MostDetailedMip = 0;
-            kStandardDesc.Texture2DArray.MipLevels = -1;
-            kStandardDesc.Texture2DArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DArray.ArraySize = kTextureDesc.ArraySize;
-        }
-    }
-    else if (kTextureDesc.SampleDesc.Count > 1)
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-        kStandardDesc.Texture2D.MostDetailedMip = 0;
-        kStandardDesc.Texture2D.MipLevels = -1;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture3D* pTexture, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE3D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
-    kStandardDesc.Texture3D.MostDetailedMip = 0;
-    kStandardDesc.Texture3D.MipLevels = -1;
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLBuffer* pBuffer, D3D11_SHADER_RESOURCE_VIEW_DESC& kStandardDesc)
-{
-    D3D11_BUFFER_DESC kBufferDesc;
-    pBuffer->GetDesc(&kBufferDesc);
-
-    bool bSuccess((kBufferDesc.MiscFlags | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) != 0);
-    if (bSuccess)
-    {
-        kStandardDesc.Format = DXGI_FORMAT_UNKNOWN;
-        kStandardDesc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-        kStandardDesc.Buffer.FirstElement = 0;
-        kStandardDesc.Buffer.NumElements = kBufferDesc.StructureByteStride;
-    }
-    else
-    {
-        DXGL_ERROR("Default shader resource view for a buffer requires element size specification");
-    }
-
-    pBuffer->Release();
-    return bSuccess;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture1D* pTexture, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE1D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1DARRAY;
-        kStandardDesc.Texture1DArray.MipSlice = 0;
-        kStandardDesc.Texture1DArray.FirstArraySlice = 0;
-        kStandardDesc.Texture1DArray.ArraySize = kTextureDesc.ArraySize;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1D;
-        kStandardDesc.Texture1D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture2D* pTexture, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE2D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    if (kTextureDesc.ArraySize > 1)
-    {
-        if (kTextureDesc.SampleDesc.Count > 1)
-        {
-            kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY;
-            kStandardDesc.Texture2DMSArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DMSArray.ArraySize = kTextureDesc.ArraySize;
-        }
-        else
-        {
-            kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
-            kStandardDesc.Texture2DArray.MipSlice = 0;
-            kStandardDesc.Texture2DArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DArray.ArraySize = kTextureDesc.ArraySize;
-        }
-    }
-    else if (kTextureDesc.SampleDesc.Count > 1)
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
-        kStandardDesc.Texture2D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture3D* pTexture, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE3D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D;
-    kStandardDesc.Texture3D.MipSlice = 0;
-    kStandardDesc.Texture3D.FirstWSlice = 0;
-    kStandardDesc.Texture3D.WSize = -1;
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLBuffer* pBuffer, D3D11_RENDER_TARGET_VIEW_DESC& kStandardDesc)
-{
-    D3D11_BUFFER_DESC kBufferDesc;
-    pBuffer->GetDesc(&kBufferDesc);
-
-    bool bSuccess((kBufferDesc.MiscFlags | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) != 0);
-    if (bSuccess)
-    {
-        kStandardDesc.Format = DXGI_FORMAT_UNKNOWN;
-        kStandardDesc.ViewDimension = D3D11_RTV_DIMENSION_BUFFER;
-        kStandardDesc.Buffer.FirstElement = 0;
-        kStandardDesc.Buffer.NumElements = kBufferDesc.StructureByteStride;
-    }
-    else
-    {
-        DXGL_ERROR("Default render target view for a buffer requires element size specification");
-    }
-
-    pBuffer->Release();
-    return bSuccess;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture1D* pTexture, D3D11_DEPTH_STENCIL_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE1D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.Flags = 0;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1DARRAY;
-        kStandardDesc.Texture1DArray.MipSlice = 0;
-        kStandardDesc.Texture1DArray.FirstArraySlice = 0;
-        kStandardDesc.Texture1DArray.ArraySize = kTextureDesc.ArraySize;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1D;
-        kStandardDesc.Texture1D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture2D* pTexture, D3D11_DEPTH_STENCIL_VIEW_DESC& kStandardDesc)
-{
-    D3D11_TEXTURE2D_DESC kTextureDesc;
-    pTexture->GetDesc(&kTextureDesc);
-
-    kStandardDesc.Format = kTextureDesc.Format;
-    kStandardDesc.Flags = 0;
-    if (kTextureDesc.ArraySize > 0)
-    {
-        if (kTextureDesc.SampleDesc.Count > 1)
-        {
-            kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY;
-            kStandardDesc.Texture2DMSArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DMSArray.ArraySize = kTextureDesc.ArraySize;
-        }
-        else
-        {
-            kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
-            kStandardDesc.Texture2DArray.MipSlice = 0;
-            kStandardDesc.Texture2DArray.FirstArraySlice = 0;
-            kStandardDesc.Texture2DArray.ArraySize = kTextureDesc.ArraySize;
-        }
-    }
-    else if (kTextureDesc.SampleDesc.Count > 1)
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMS;
-    }
-    else
-    {
-        kStandardDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
-        kStandardDesc.Texture2D.MipSlice = 0;
-    }
-    pTexture->Release();
-    return true;
-}
-
-bool GetStandardViewDesc(CCryDXGLTexture3D* pTexture, D3D11_DEPTH_STENCIL_VIEW_DESC&)
-{
-    DXGL_ERROR("Cannot bind a depth stencil view to a 3D texture");
-    pTexture->Release();
-    return false;
-}
-
-bool GetStandardViewDesc(CCryDXGLBuffer* pBuffer, D3D11_DEPTH_STENCIL_VIEW_DESC&)
-{
-    DXGL_ERROR("Cannot bind a depth stencil view to a buffer");
-    pBuffer->Release();
-    return false;
-}
-
-template <typename ViewDesc>
-bool GetStandardViewDesc(ID3D11Resource* pResource, ViewDesc& kStandardDesc)
-{
-    memset(&kStandardDesc, 0, sizeof(kStandardDesc));
-
-    void* pvData(NULL);
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Texture1D), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLTexture1D::FromInterface(reinterpret_cast<ID3D11Texture1D*>(pvData)), kStandardDesc);
-    }
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Texture2D), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLTexture2D::FromInterface(reinterpret_cast<ID3D11Texture2D*>(pvData)), kStandardDesc);
-    }
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Texture3D), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLTexture3D::FromInterface(reinterpret_cast<ID3D11Texture3D*>(pvData)), kStandardDesc);
-    }
-    if (!FAILED(pResource->QueryInterface(__uuidof(ID3D11Buffer), &pvData)) && pvData != NULL)
-    {
-        return GetStandardViewDesc(CCryDXGLBuffer::FromInterface(reinterpret_cast<ID3D11Buffer*>(pvData)), kStandardDesc);
-    }
-
-    DXGL_ERROR("Unknown resource type for standard view description");
-    return false;
-}
-
-HRESULT CCryDXGLDevice::CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView)
-{
-    D3D11_SHADER_RESOURCE_VIEW_DESC kStandardDesc;
-    if (pDesc == NULL)
-    {
-        if (!GetStandardViewDesc(pResource, kStandardDesc))
-        {
-            return E_INVALIDARG;
-        }
-        pDesc = &kStandardDesc;
-    }
-    CRY_ASSERT(pDesc != NULL);
-
-    CCryDXGLShaderResourceView* pSRView(new CCryDXGLShaderResourceView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-
-    if (pSRView->Initialize(m_spGLDevice))
-    {
-        CCryDXGLShaderResourceView::ToInterface(ppSRView, pSRView);
-        return S_OK;
-    }
-
-    pSRView->Release();
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView)
-{
-    CCryDXGLUnorderedAccessView::ToInterface(ppUAView, new CCryDXGLUnorderedAccessView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView)
-{
-    D3D11_RENDER_TARGET_VIEW_DESC kStandardDesc;
-    if (pDesc == NULL)
-    {
-        if (!GetStandardViewDesc(pResource, kStandardDesc))
-        {
-            return E_INVALIDARG;
-        }
-        pDesc = &kStandardDesc;
-    }
-    CRY_ASSERT(pDesc != NULL);
-
-    CCryDXGLRenderTargetView* pRTView(new CCryDXGLRenderTargetView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-
-    if (pRTView->Initialize(m_spGLDevice))
-    {
-        CCryDXGLRenderTargetView::ToInterface(ppRTView, pRTView);
-        return S_OK;
-    }
-
-    pRTView->Release();
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView)
-{
-    D3D11_DEPTH_STENCIL_VIEW_DESC kStandardDesc;
-    if (pDesc == NULL)
-    {
-        if (!GetStandardViewDesc(pResource, kStandardDesc))
-        {
-            return E_INVALIDARG;
-        }
-        pDesc = &kStandardDesc;
-    }
-    CRY_ASSERT(pDesc != NULL);
-
-    CCryDXGLDepthStencilView* pDSView(new CCryDXGLDepthStencilView(CCryDXGLResource::FromInterface(pResource), *pDesc, this));
-
-    if (pDSView->Initialize(m_spGLDevice))
-    {
-        CCryDXGLDepthStencilView::ToInterface(ppDepthStencilView, pDSView);
-        return S_OK;
-    }
-
-    pDSView->Release();
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout)
-{
-    NCryMetal::TShaderReflection kShaderReflection;
-    if (!InitializeShaderReflection(&kShaderReflection, pShaderBytecodeWithInputSignature))
-    {
-        return 0;
-    }
-
-    _smart_ptr<NCryMetal::SInputLayout> spGLInputLayout(NCryMetal::CreateInputLayout(pInputElementDescs, NumElements, kShaderReflection));
-
-    if (spGLInputLayout == NULL)
-    {
-        return E_FAIL;
-    }
-
-    CCryDXGLInputLayout::ToInterface(ppInputLayout, new CCryDXGLInputLayout(spGLInputLayout, this));
-
-    return S_OK;
-}
-
-_smart_ptr<NCryMetal::SShader> CreateGLShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, NCryMetal::EShaderType eType, NCryMetal::CDevice* pDevice)
-{
-    if (pClassLinkage != NULL)
-    {
-        DXGL_ERROR("Class linkage not supported");
-        return NULL;
-    }
-
-    _smart_ptr<NCryMetal::SShader> spGLShader(new NCryMetal::SShader());
-    spGLShader->m_eType = eType;
-    if (!NCryMetal::InitializeShader(spGLShader, pShaderBytecode, BytecodeLength, pDevice->GetMetalDevice()))
-    {
-        return NULL;
-    }
-    return spGLShader;
-}
-
-template <typename DXGLShader, typename D3DShader>
-HRESULT CreateShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, D3DShader** ppShader, NCryMetal::EShaderType eType, CCryDXGLDevice* pDevice)
-{
-    _smart_ptr<NCryMetal::SShader> spGLShader(CreateGLShader(pShaderBytecode, BytecodeLength, pClassLinkage, eType, pDevice->GetGLDevice()));
-    if (spGLShader == NULL)
-    {
-        return E_FAIL;
-    }
-
-    DXGLShader::ToInterface(ppShader, new DXGLShader(spGLShader, pDevice));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader)
-{
-    return CreateShader<CCryDXGLVertexShader, ID3D11VertexShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader, NCryMetal::eST_Vertex, this);
-}
-
-HRESULT CCryDXGLDevice::CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader)
-{
-    DXGL_ERROR("Geometry shaders are not supported by this GL implementation.");
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader)
-{
-    return CreateShader<CCryDXGLPixelShader, ID3D11PixelShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader, NCryMetal::eST_Fragment, this);
-}
-
-HRESULT CCryDXGLDevice::CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader)
-{
-    DXGL_ERROR("Hull shaders are not supported by this GL implementation.");
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader)
-{
-    DXGL_ERROR("Domain shaders are not supported by this GL implementation.");
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader)
-{
-#if DXGL_SUPPORT_COMPUTE
-    return CreateShader<CCryDXGLComputeShader, ID3D11ComputeShader>(pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader, NCryMetal::eST_Compute, this);
-#else
-    DXGL_ERROR("Compute shaders are not supported by this GL implementation.");
-    return E_FAIL;
-#endif
-}
-
-HRESULT CCryDXGLDevice::CreateClassLinkage(ID3D11ClassLinkage** ppLinkage)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState)
-{
-    CCryDXGLBlendState* pState(new CCryDXGLBlendState(*pBlendStateDesc, this));
-
-    if (!pState->Initialize(this))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLBlendState::ToInterface(ppBlendState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState)
-{
-    CCryDXGLDepthStencilState* pState(new CCryDXGLDepthStencilState(*pDepthStencilDesc, this));
-
-    if (!pState->Initialize(this))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLDepthStencilState::ToInterface(ppDepthStencilState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState)
-{
-    CCryDXGLRasterizerState* pState(new CCryDXGLRasterizerState(*pRasterizerDesc, this));
-
-    if (!pState->Initialize(this))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLRasterizerState::ToInterface(ppRasterizerState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState)
-{
-    CCryDXGLSamplerState* pState(new CCryDXGLSamplerState(*pSamplerDesc, this));
-
-    if (!pState->Initialize(this))
-    {
-        pState->Release();
-        return E_FAIL;
-    }
-
-    CCryDXGLSamplerState::ToInterface(ppSamplerState, pState);
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery)
-{
-    NCryMetal::SQueryPtr spGLQuery(NCryMetal::CreateQuery(*pQueryDesc, m_spGLDevice));
-    if (spGLQuery == NULL)
-    {
-        return E_FAIL;
-    }
-    CCryDXGLQuery::ToInterface(ppQuery, new CCryDXGLQuery(*pQueryDesc, spGLQuery, this));
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport)
-{
-    NCryMetal::EGIFormat eGIFormat(NCryMetal::GetGIFormat(Format));
-    if (eGIFormat == NCryMetal::eGIF_NUM)
-    {
-        DXGL_ERROR("Unknown DXGI format");
-        return E_FAIL;
-    }
-
-    (*pFormatSupport) = m_spAdapter->GetGLAdapter()->m_giFormatSupport[eGIFormat];
-    return S_OK;
-}
-
-HRESULT CCryDXGLDevice::CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels)
-{
-    NCryMetal::EGIFormat eGIFormat(NCryMetal::GetGIFormat(Format));
-    if (eGIFormat != NCryMetal::eGIF_NUM && (SampleCount <= m_spAdapter->GetGLAdapter()->m_maxSamples))
-    {
-        *pNumQualityLevels = 1;
-    }
-    else
-    {
-        *pNumQualityLevels = 0;
-    }
-    DXGL_TODO("Check if there's a way to query for specific quality levels");
-    return S_OK;
-}
-
-void CCryDXGLDevice::CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-HRESULT CCryDXGLDevice::CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLDevice::CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize)
-{
-    switch (Feature)
-    {
-    case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS:
-    {
-        D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS* pData(static_cast<D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS*>(pFeatureSupportData));
-        bool bComputeShaderSupported(m_spAdapter->GetGLAdapter()->m_features.Get(NCryMetal::eF_ComputeShader));
-        pData->ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = bComputeShaderSupported ? TRUE : FALSE;
-        return S_OK;
-    }
-    break;
-    default:
-        DXGL_TODO("Add supported 11.1 features")
-        return E_FAIL;
-    }
-}
-
-HRESULT CCryDXGLDevice::GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData)
-{
-    return m_kPrivateDataContainer.GetPrivateData(guid, pDataSize, pData);
-}
-
-HRESULT CCryDXGLDevice::SetPrivateData(REFGUID guid, UINT DataSize, const void* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateData(guid, DataSize, pData);
-}
-
-HRESULT CCryDXGLDevice::SetPrivateDataInterface(REFGUID guid, const IUnknown* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateDataInterface(guid, pData);
-}
-
-D3D_FEATURE_LEVEL CCryDXGLDevice::GetFeatureLevel(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return D3D_FEATURE_LEVEL_11_0;
-}
-
-UINT CCryDXGLDevice::GetCreationFlags(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-HRESULT CCryDXGLDevice::GetDeviceRemovedReason(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-void CCryDXGLDevice::GetImmediateContext(ID3D11DeviceContext** ppImmediateContext)
-{
-    m_spImmediateContext->AddRef();
-    CCryDXGLDeviceContext::ToInterface(ppImmediateContext, m_spImmediateContext);
-}
-
-HRESULT CCryDXGLDevice::SetExceptionMode(UINT RaiseFlags)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-UINT CCryDXGLDevice::GetExceptionMode(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDevice.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDevice.hpp
deleted file mode 100644
index c67e0d886d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDevice.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Device
-
-#ifndef __CRYMETALGLDEVICE__
-#define __CRYMETALGLDEVICE__
-
-#include "CCryDXMETALGIObject.hpp"
-
-namespace NCryMetal
-{
-    class CDevice;
-    struct SDummyContext;
-}
-
-class CCryDXGLGIAdapter;
-class CCryDXGLDeviceContext;
-
-class CCryDXGLDevice
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT && !DXGL_FULL_EMULATION
-    : public ID3D11Device
-#else
-    : public CCryDXGLGIObject
-#endif
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDevice, DXGIDevice)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDevice, D3D11Device)
-
-    CCryDXGLDevice(CCryDXGLGIAdapter* pAdapter, D3D_FEATURE_LEVEL eFeatureLevel);
-    virtual ~CCryDXGLDevice();
-
-    bool Initialize(const DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain);
-    NCryMetal::CDevice* GetGLDevice();
-
-    // IDXGIObject overrides
-    HRESULT GetParent(REFIID riid, void** ppParent);
-
-    // IDXGIDevice implementation
-    HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter);
-    HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface);
-    HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources);
-    HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority);
-    HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority);
-
-    // ID3D11Device implementation
-    HRESULT STDMETHODCALLTYPE CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer);
-    HRESULT STDMETHODCALLTYPE CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D);
-    HRESULT STDMETHODCALLTYPE CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D);
-    HRESULT STDMETHODCALLTYPE CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D);
-    HRESULT STDMETHODCALLTYPE CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView);
-    HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView);
-    HRESULT STDMETHODCALLTYPE CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView);
-    HRESULT STDMETHODCALLTYPE CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView);
-    HRESULT STDMETHODCALLTYPE CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout);
-    HRESULT STDMETHODCALLTYPE CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader);
-    HRESULT STDMETHODCALLTYPE CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader);
-    HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader);
-    HRESULT STDMETHODCALLTYPE CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader);
-    HRESULT STDMETHODCALLTYPE CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader);
-    HRESULT STDMETHODCALLTYPE CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader);
-    HRESULT STDMETHODCALLTYPE CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader);
-    HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage);
-    HRESULT STDMETHODCALLTYPE CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState);
-    HRESULT STDMETHODCALLTYPE CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState);
-    HRESULT STDMETHODCALLTYPE CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState);
-    HRESULT STDMETHODCALLTYPE CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState);
-    HRESULT STDMETHODCALLTYPE CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery);
-    HRESULT STDMETHODCALLTYPE CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate);
-    HRESULT STDMETHODCALLTYPE CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter);
-    HRESULT STDMETHODCALLTYPE CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext);
-    HRESULT STDMETHODCALLTYPE OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource);
-    HRESULT STDMETHODCALLTYPE CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport);
-    HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels);
-    void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo);
-    HRESULT STDMETHODCALLTYPE CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength);
-    HRESULT STDMETHODCALLTYPE CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize);
-    HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData);
-    D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel(void);
-    UINT STDMETHODCALLTYPE GetCreationFlags(void);
-    HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason(void);
-    void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext);
-    HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags);
-    UINT STDMETHODCALLTYPE GetExceptionMode(void);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLPrivateDataContainer m_kPrivateDataContainer;
-    _smart_ptr<CCryDXGLGIAdapter> m_spAdapter;
-    _smart_ptr<NCryMetal::CDevice> m_spGLDevice;
-    _smart_ptr<CCryDXGLDeviceContext> m_spImmediateContext;
-    D3D_FEATURE_LEVEL m_eFeatureLevel;
-};
-
-#endif //__CRYMETALGLDEVICE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceChild.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceChild.cpp
deleted file mode 100644
index b2ecd7ce57..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceChild.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description: Definition of the DXGL wrapper for ID3D11DeviceChild
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDeviceChild.hpp"
-#include "CCryDXMETALDevice.hpp"
-
-CCryDXGLDeviceChild::CCryDXGLDeviceChild(CCryDXGLDevice* pDevice)
-    : m_pDevice(pDevice)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DeviceChild)
-    if (m_pDevice != NULL)
-    {
-        m_pDevice->AddRef();
-    }
-}
-
-CCryDXGLDeviceChild::~CCryDXGLDeviceChild()
-{
-    if (m_pDevice != NULL)
-    {
-        m_pDevice->Release();
-    }
-}
-
-void CCryDXGLDeviceChild::SetDevice(CCryDXGLDevice* pDevice)
-{
-    if (m_pDevice != pDevice)
-    {
-        if (m_pDevice != NULL)
-        {
-            m_pDevice->Release();
-        }
-        m_pDevice = pDevice;
-        if (pDevice != NULL)
-        {
-            m_pDevice->AddRef();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11DeviceChild implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLDeviceChild::GetDevice(ID3D11Device** ppDevice)
-{
-    CCryDXGLDevice::ToInterface(ppDevice, m_pDevice);
-}
-
-HRESULT CCryDXGLDeviceChild::GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData)
-{
-    return m_kPrivateDataContainer.GetPrivateData(guid, pDataSize, pData);
-}
-
-HRESULT CCryDXGLDeviceChild::SetPrivateData(REFGUID guid, UINT DataSize, const void* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateData(guid, DataSize, pData);
-}
-
-HRESULT CCryDXGLDeviceChild::SetPrivateDataInterface(REFGUID guid, const IUnknown* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateDataInterface(guid, pData);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceChild.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceChild.hpp
deleted file mode 100644
index f9c6ec0c1c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceChild.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11DeviceChild
-
-#ifndef __CRYMETALGLDEVICECHILD__
-#define __CRYMETALGLDEVICECHILD__
-
-#include "CCryDXMETALBase.hpp"
-
-class CCryDXGLDevice;
-
-class CCryDXGLDeviceChild
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDeviceChild, D3D11DeviceChild)
-
-    CCryDXGLDeviceChild(CCryDXGLDevice* pDevice = NULL);
-    virtual ~CCryDXGLDeviceChild();
-
-    void SetDevice(CCryDXGLDevice* pDevice);
-
-    // ID3D11DeviceChild implementation
-    void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice);
-    HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData);
-    HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData);
-
-#if !DXGL_FULL_EMULATION
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLDeviceChild>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLDevice* m_pDevice;
-    CCryDXGLPrivateDataContainer m_kPrivateDataContainer;
-};
-
-#if !DXGL_FULL_EMULATION
-struct ID3D11Counter
-    : CCryDXGLDeviceChild {};
-struct ID3D11ClassLinkage
-    : CCryDXGLDeviceChild {};
-#endif //!DXGL_FULL_EMULATION
-
-#endif //__CRYMETALGLDEVICECHILD__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceContext.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceContext.cpp
deleted file mode 100644
index 2d455f52d5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceContext.cpp
+++ /dev/null
@@ -1,1421 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALBlendState.hpp"
-#include "CCryDXMETALBuffer.hpp"
-#include "CCryDXMETALDepthStencilView.hpp"
-#include "CCryDXMETALDeviceContext.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALBlendState.hpp"
-#include "CCryDXMETALDepthStencilState.hpp"
-#include "CCryDXMETALInputLayout.hpp"
-#include "CCryDXMETALQuery.hpp"
-#include "CCryDXMETALRasterizerState.hpp"
-#include "CCryDXMETALRenderTargetView.hpp"
-#include "CCryDXMETALSamplerState.hpp"
-#include "CCryDXMETALShader.hpp"
-#include "CCryDXMETALShaderResourceView.hpp"
-#include "CCryDXMETALUnorderedAccessView.hpp"
-#include "../Implementation/MetalDevice.hpp"
-#include "../Implementation/GLFormat.hpp"
-
-#define DXGL_CHECK_HAZARDS 0
-#define DXGL_CHECK_PIPELINE 0
-#define DXGL_CHECK_CURRENT_CONTEXT 0
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLDeviceContext
-////////////////////////////////////////////////////////////////////////////////
-
-CCryDXGLDeviceContext::CCryDXGLDeviceContext()
-    : m_uStencilRef(0)
-    , m_uIndexBufferOffset(0)
-    , m_eIndexBufferFormat(DXGI_FORMAT_UNKNOWN)
-    , m_ePrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED)
-    , m_uSampleMask(0xFFFFFFFF)
-    , m_uNumViewports(0)
-    , m_uNumScissorRects(0)
-    , m_pContext(NULL)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11DeviceContext)
-
-    m_auBlendFactor[0] = 1.0f;
-    m_auBlendFactor[1] = 1.0f;
-    m_auBlendFactor[2] = 1.0f;
-    m_auBlendFactor[3] = 1.0f;
-
-    for (uint32 uVB = 0; uVB < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++uVB)
-    {
-        m_auVertexBufferStrides[uVB] = 0;
-        m_auVertexBufferOffsets[uVB] = 0;
-    }
-
-    for (uint32 uSO = 0; uSO < D3D11_SO_BUFFER_SLOT_COUNT; ++uSO)
-    {
-        m_auStreamOutputBufferOffsets[uSO] = 0;
-    }
-
-    m_kStages.resize(NCryMetal::eST_NUM);
-}
-
-CCryDXGLDeviceContext::~CCryDXGLDeviceContext()
-{
-    Shutdown();
-}
-
-bool CCryDXGLDeviceContext::Initialize(CCryDXGLDevice* pDevice)
-{
-    SetDevice(pDevice);
-
-    m_spDefaultBlendState = CreateDefaultBlendState(pDevice);
-    m_spDefaultDepthStencilState = CreateDefaultDepthStencilState(pDevice);
-    m_spDefaultRasterizerState = CreateDefaultRasterizerState(pDevice);
-    m_spDefaultSamplerState = CreateDefaultSamplerState(pDevice);
-
-    NCryMetal::CDevice* pGLDevice(pDevice->GetGLDevice());
-    m_pContext = pGLDevice->CreateContext();
-
-    bool bResult =
-        m_spDefaultBlendState->Initialize(pDevice) &&
-        m_spDefaultDepthStencilState->Initialize(pDevice) &&
-        m_spDefaultRasterizerState->Initialize(pDevice) &&
-        m_spDefaultSamplerState->Initialize(pDevice);
-
-    return bResult;
-}
-
-void CCryDXGLDeviceContext::Shutdown()
-{
-    if (m_pContext != NULL)
-    {
-        m_pContext->GetDevice()->FreeContext(m_pContext);
-        m_pContext = NULL;
-    }
-    m_pDevice = NULL;
-}
-
-NCryMetal::CContext* CCryDXGLDeviceContext::GetMetalContext()
-{
-    return m_pContext;
-}
-
-_smart_ptr<CCryDXGLBlendState> CCryDXGLDeviceContext::CreateDefaultBlendState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_BLEND_DESC values from DXSDK
-    D3D11_BLEND_DESC kDesc;
-    ZeroMemory(&kDesc, sizeof(kDesc));
-    kDesc.AlphaToCoverageEnable                 = FALSE;
-    kDesc.IndependentBlendEnable                = FALSE;
-    kDesc.RenderTarget[0].BlendEnable           = FALSE;
-    kDesc.RenderTarget[0].SrcBlend              = D3D11_BLEND_ONE;
-    kDesc.RenderTarget[0].DestBlend             = D3D11_BLEND_ZERO;
-    kDesc.RenderTarget[0].BlendOp               = D3D11_BLEND_OP_ADD;
-    kDesc.RenderTarget[0].SrcBlendAlpha         = D3D11_BLEND_ONE;
-    kDesc.RenderTarget[0].DestBlendAlpha        = D3D11_BLEND_ZERO;
-    kDesc.RenderTarget[0].BlendOpAlpha          = D3D11_BLEND_OP_ADD;
-    kDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-
-    return new CCryDXGLBlendState(kDesc, pDevice);
-}
-
-_smart_ptr<CCryDXGLDepthStencilState> CCryDXGLDeviceContext::CreateDefaultDepthStencilState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_DEPTH_STENCIL_DESC values from DXSDK
-    D3D11_DEPTH_STENCIL_DESC kDesc;
-    kDesc.DepthEnable                  = TRUE;
-    kDesc.DepthWriteMask               = D3D11_DEPTH_WRITE_MASK_ALL;
-    kDesc.DepthFunc                    = D3D11_COMPARISON_LESS;
-    kDesc.StencilEnable                = FALSE;
-    kDesc.StencilReadMask              = D3D11_DEFAULT_STENCIL_READ_MASK;
-    kDesc.StencilWriteMask             = D3D11_DEFAULT_STENCIL_WRITE_MASK;
-    kDesc.FrontFace.StencilFunc        = D3D11_COMPARISON_ALWAYS;
-    kDesc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP;
-    kDesc.FrontFace.StencilPassOp      = D3D11_STENCIL_OP_KEEP;
-    kDesc.FrontFace.StencilFailOp      = D3D11_STENCIL_OP_KEEP;
-    kDesc.BackFace = kDesc.FrontFace;
-
-    return new CCryDXGLDepthStencilState(kDesc, pDevice);
-}
-
-_smart_ptr<CCryDXGLRasterizerState> CCryDXGLDeviceContext::CreateDefaultRasterizerState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_RASTERIZER_DESC values from DXSDK
-    D3D11_RASTERIZER_DESC kDesc;
-    kDesc.FillMode              = D3D11_FILL_SOLID;
-    kDesc.CullMode              = D3D11_CULL_BACK;
-    kDesc.FrontCounterClockwise = FALSE;
-    kDesc.DepthBias             = 0;
-    kDesc.SlopeScaledDepthBias  = 0.0f;
-    kDesc.DepthBiasClamp        = 0.0f;
-    kDesc.DepthClipEnable       = TRUE;
-    kDesc.ScissorEnable         = FALSE;
-    kDesc.MultisampleEnable     = FALSE;
-    kDesc.AntialiasedLineEnable = FALSE;
-
-    return new CCryDXGLRasterizerState(kDesc, pDevice);
-}
-
-_smart_ptr<CCryDXGLSamplerState> CCryDXGLDeviceContext::CreateDefaultSamplerState(CCryDXGLDevice* pDevice)
-{
-    // Default D3D11_SAMPLER_DESC values from DXSDK
-    D3D11_SAMPLER_DESC kDesc;
-    kDesc.Filter         = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-    kDesc.AddressU       = D3D11_TEXTURE_ADDRESS_CLAMP;
-    kDesc.AddressV       = D3D11_TEXTURE_ADDRESS_CLAMP;
-    kDesc.AddressW       = D3D11_TEXTURE_ADDRESS_CLAMP;
-    kDesc.MinLOD         = -FLT_MAX;
-    kDesc.MaxLOD         = FLT_MAX;
-    kDesc.MipLODBias     = 0.0f;
-    kDesc.MaxAnisotropy  = 1;
-    kDesc.ComparisonFunc = D3D11_COMPARISON_NEVER;
-    kDesc.BorderColor[0] = 1.0f;
-    kDesc.BorderColor[1] = 1.0f;
-    kDesc.BorderColor[2] = 1.0f;
-    kDesc.BorderColor[3] = 1.0f;
-
-    return new CCryDXGLSamplerState(kDesc, pDevice);
-}
-
-#if DXGL_CHECK_HAZARDS
-void CheckHazard(uint32 uRTVIndex, CCryDXGLRenderTargetView* pRTView, CCryDXGLResource* pRTVResource, uint32 uSRVIndex, CCryDXGLShaderResourceView* pSRView, CCryDXGLResource* pSRVResource, uint32 uStage)
-{
-    if (pRTVResource == pSRVResource)
-    {
-        DXGL_WARNING("Hazard detected: render target view %d and shader resource view %d in stage %d refer to the same resource", uRTVIndex,  uSRVIndex, uStage);
-    }
-}
-
-void CheckHazard(uint32 uDSVIndex, CCryDXGLDepthStencilView* pDSView, CCryDXGLResource* pDSVResource, uint32 uSRVIndex, CCryDXGLShaderResourceView* pSRView, CCryDXGLResource* pSRVResource, uint32 uStage)
-{
-    if (pDSVResource == pSRVResource)
-    {
-        D3D11_DEPTH_STENCIL_VIEW_DESC kDSVDesc;
-        pDSView->GetDesc(&kDSVDesc);
-        if ((kDSVDesc.Flags & D3D11_DSV_READ_ONLY_DEPTH) == 0 || (kDSVDesc.Flags & D3D11_DSV_READ_ONLY_STENCIL) == 0)
-        {
-            DXGL_ERROR("Hazard detected: writable depth stencil view and shader resource view %d in stage %d refer to the same resource", uSRVIndex, uStage);
-        }
-    }
-}
-
-template <typename OMView>
-void CheckHazards(_smart_ptr<OMView>* pOMViews, uint32 uNumOMViews, _smart_ptr<CCryDXGLShaderResourceView>* pSRViews, uint32 uNumSRViews, uint32 uStage)
-{
-    uint32 uOMView;
-    for (uOMView = 0; uOMView < uNumOMViews; ++uOMView)
-    {
-        OMView* pOMView(pOMViews[uOMView]);
-        if (pOMView != NULL)
-        {
-            ID3D11Resource* pOMVResource(NULL);
-            pOMView->GetResource(&pOMVResource);
-
-            uint32 uSRView;
-            for (uSRView = 0; uSRView < uNumSRViews; ++uSRView)
-            {
-                CCryDXGLShaderResourceView* pSRView(pSRViews[uSRView]);
-                if (pSRView != NULL)
-                {
-                    ID3D11Resource* pSRVResource(NULL);
-                    pSRView->GetResource(&pSRVResource);
-
-                    CheckHazard(uOMView, pOMView, pOMVResource, uSRView, pSRView, pSRVResource, uStage);
-
-                    pSRVResource->Release();
-                }
-            }
-
-            pOMVResource->Release();
-        }
-    }
-}
-
-#endif //DXGL_CHECK_HAZARDS
-
-#if DXGL_CHECK_PIPELINE
-template <typename Stage>
-void CheckRequiredStage(std::vector<Stage>& kStages, uint32 uRequiredStage)
-{
-    if (kStages.size() <= uRequiredStage || kStages.at(uRequiredStage).m_spShader == NULL)
-    {
-        DXGL_ERROR("Required pipeline stage %d is not bound to a valid shader");
-    }
-}
-template <typename Stage>
-void CheckPipeline(std::vector<Stage>& kStages)
-{
-    CheckRequiredStage(kStages, NCryMetal::eST_Vertex);
-    CheckRequiredStage(kStages, NCryMetal::eST_Fragment);
-}
-#else
-template <typename Stage>
-ILINE void CheckPipeline(std::vector<Stage>& kStages) {}
-#endif //DXGL_CHECK_PIPELINE
-
-
-#if DXGL_FULL_EMULATION
-void CheckCurrentContext(NCryMetal::CContext* pContext)
-{
-    if (pContext->GetDevice()->GetCurrentContext() != pContext)
-    {
-        pContext->GetDevice()->BindContext(pContext);
-    }
-}
-#elif DXGL_CHECK_CURRENT_CONTEXT
-void CheckCurrentContext(NCryMetal::CContext* pContext)
-{
-    if (pContext->GetDevice()->GetCurrentContext() != pContext)
-    {
-        DXGL_ERROR("Device context has not been bound to this thread");
-    }
-}
-#else
-ILINE void CheckCurrentContext(NCryMetal::CContext*) {}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11DeviceContext implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLDeviceContext::SetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews)
-{
-    CheckCurrentContext(m_pContext);
-
-    if (uStage >= m_kStages.size())
-    {
-        for (uint32 uView = 0; uView < NumViews; ++uView)
-        {
-            if (ppShaderResourceViews[uView] != NULL)
-            {
-                DXGL_ERROR("CCryDXGLDeviceContext::SetShaderResources: shader stage is not supported, setting will be ignored");
-                break;
-            }
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uView = 0; uView < NumViews; ++uView)
-    {
-        uint32 uSlot(StartSlot + uView);
-        CCryDXGLShaderResourceView* pDXGLShaderResourceView(CCryDXGLShaderResourceView::FromInterface(ppShaderResourceViews[uView]));
-        if (kStage.m_aspShaderResourceViews[uSlot] != pDXGLShaderResourceView)
-        {
-            kStage.m_aspShaderResourceViews[uSlot] = pDXGLShaderResourceView;
-            if (pDXGLShaderResourceView == NULL)
-            {
-                m_pContext->SetTexture(0, uStage, uSlot);
-                continue;
-            }
-
-            D3D11_SHADER_RESOURCE_VIEW_DESC m_kDesc;
-            pDXGLShaderResourceView->GetDesc(&m_kDesc);
-            if (m_kDesc.ViewDimension == D3D11_SRV_DIMENSION_BUFFER)
-            {
-                //It is buffer
-                m_pContext->SetConstantBuffer(pDXGLShaderResourceView == NULL ? 0 : ((NCryMetal::SShaderBufferView*)pDXGLShaderResourceView->GetGLView())->m_pBuffer, uStage, uSlot);
-            }
-            else
-            {
-                m_pContext->SetTexture(pDXGLShaderResourceView == NULL ? 0 : pDXGLShaderResourceView->GetGLView(), uStage, uSlot);
-            }
-        }
-    }
-
-#if DXGL_CHECK_HAZARDS
-    CheckHazards(m_aspRenderTargetViews, DXGL_ARRAY_SIZE(m_aspRenderTargetViews), kStage.m_aspShaderResourceViews, DXGL_ARRAY_SIZE(kStage.m_aspShaderResourceViews), uStage);
-    CheckHazards(&m_spDepthStencilView, 1, kStage.m_aspShaderResourceViews, DXGL_ARRAY_SIZE(kStage.m_aspShaderResourceViews), uStage);
-#endif //DXGL_CHECK_HAZARDS
-}
-
-void CCryDXGLDeviceContext::SetShader(uint32 uStage, CCryDXGLShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances)
-{
-    if (ppClassInstances != NULL && NumClassInstances != 0)
-    {
-        DXGL_WARNING("Class instances not supported");
-    }
-
-    if (uStage >= m_kStages.size())
-    {
-        if (pShader != NULL)
-        {
-            DXGL_ERROR("CCryDXGLDeviceContext::SetShader: shader stage is not supported, setting will be ignored");
-        }
-        return;
-    }
-
-    if (m_kStages[uStage].m_spShader != pShader)
-    {
-        CheckCurrentContext(m_pContext);
-        m_kStages[uStage].m_spShader = pShader;
-        m_pContext->SetShader(pShader == NULL ? NULL : pShader->GetGLShader(), uStage);
-    }
-}
-
-void CCryDXGLDeviceContext::SetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers)
-{
-    CheckCurrentContext(m_pContext);
-
-    if (uStage >= m_kStages.size())
-    {
-        for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-        {
-            if (ppSamplers[uSampler] != NULL)
-            {
-                DXGL_ERROR("CCryDXGLDeviceContext::SetSamplers: shader stage is not supported, setting will be ignored");
-                break;
-            }
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-    {
-        uint32 uSlot(uSampler + StartSlot);
-
-        CCryDXGLSamplerState* pSamplerState(CCryDXGLSamplerState::FromInterface(ppSamplers[uSampler]));
-        if (pSamplerState == NULL)
-        {
-            pSamplerState = m_spDefaultSamplerState.get();
-        }
-
-        if (pSamplerState != kStage.m_aspSamplerStates[uSlot])
-        {
-            kStage.m_aspSamplerStates[uSlot] = pSamplerState;
-            pSamplerState->Apply(uStage, uSlot, m_pContext);
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::SetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers)
-{
-    CheckCurrentContext(m_pContext);
-
-    if (uStage >= m_kStages.size())
-    {
-        //shader stage is not supported, setting will be ignored
-        return;
-    }
-
-    CRY_ASSERT(uStage < m_kStages.size());
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-    {
-        uint32 uSlot(StartSlot + uBuffer);
-        CCryDXGLBuffer* pConstantBuffer(CCryDXGLBuffer::FromInterface(ppConstantBuffers[uBuffer]));
-        if (kStage.m_aspConstantBuffers[uSlot] != pConstantBuffer)
-        {
-            kStage.m_aspConstantBuffers[uSlot] = pConstantBuffer;
-            m_pContext->SetConstantBuffer(pConstantBuffer == NULL ? NULL : pConstantBuffer->GetGLBuffer(), uStage, uSlot);
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::GetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-{
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetShaderResources: shader stage is not supported, no entries returned");
-        for (uint32 uView = 0; uView < NumViews; ++uView)
-        {
-            ppShaderResourceViews[uView] = NULL;
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uView = 0; uView < NumViews; ++uView)
-    {
-        uint32 uSlot(StartSlot + uView);
-        CCryDXGLShaderResourceView::ToInterface(ppShaderResourceViews + uView, kStage.m_aspShaderResourceViews[uSlot]);
-        if (ppShaderResourceViews[uView] != NULL)
-        {
-            ppShaderResourceViews[uView]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::GetShader(uint32 uStage, CCryDXGLShader** ppShader, ID3D11ClassInstance** ppClassInstances, UINT* NumClassInstances)
-{
-    if (ppClassInstances != NULL)
-    {
-        DXGL_WARNING("Class instances not supported");
-    }
-    if (NumClassInstances != NULL)
-    {
-        *NumClassInstances = 0;
-    }
-
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetShader: shader stage is not supported, no shader returned");
-        *ppShader = NULL;
-        return;
-    }
-
-    *ppShader = m_kStages[uStage].m_spShader.get();
-    if (*ppShader != NULL)
-    {
-        (*ppShader)->AddRef();
-    }
-}
-
-void CCryDXGLDeviceContext::GetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-{
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetSamplers: shader stage is not supported, no entries returned");
-        for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-        {
-            ppSamplers[uSampler] = NULL;
-        }
-        return;
-    }
-
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uSampler = 0; uSampler < NumSamplers; ++uSampler)
-    {
-        uint32 uSlot(uSampler + StartSlot);
-
-        CCryDXGLSamplerState::ToInterface(ppSamplers + uSampler, kStage.m_aspSamplerStates[uSlot]);
-        if (ppSamplers[uSampler] != NULL)
-        {
-            ppSamplers[uSampler]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::GetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers)
-{
-    if (uStage >= m_kStages.size())
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::GetConstantBuffers: shader stage is not supported, no entries returned");
-        for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-        {
-            ppConstantBuffers[uBuffer] = NULL;
-        }
-        return;
-    }
-
-    CRY_ASSERT(uStage < m_kStages.size());
-    SStage& kStage(m_kStages[uStage]);
-    for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-    {
-        uint32 uSlot(StartSlot + uBuffer);
-
-        CCryDXGLBuffer::ToInterface(ppConstantBuffers + uBuffer, kStage.m_aspConstantBuffers[uSlot]);
-        if (ppConstantBuffers[uBuffer] != NULL)
-        {
-            ppConstantBuffers[uBuffer]->AddRef();
-        }
-    }
-}
-
-#define _IMPLEMENT_COMMON_SHADER_SETTERS(_Prefix, _ShaderInterface, _ShaderType, _Stage)                                                              \
-    void CCryDXGLDeviceContext::_Prefix##SetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView * const* ppShaderResourceViews)   \
-    {                                                                                                                                                 \
-        SetShaderResources(_Stage, StartSlot, NumViews, ppShaderResourceViews);                                                                       \
-    }                                                                                                                                                 \
-    void CCryDXGLDeviceContext::_Prefix##SetShader(_ShaderInterface * pShader, ID3D11ClassInstance * const* ppClassInstances, UINT NumClassInstances) \
-    {                                                                                                                                                 \
-        SetShader(_Stage, _ShaderType::FromInterface(pShader), ppClassInstances, NumClassInstances);                                                  \
-    }                                                                                                                                                 \
-    void CCryDXGLDeviceContext::_Prefix##SetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState * const* ppSamplers)                        \
-    {                                                                                                                                                 \
-        SetSamplers(_Stage, StartSlot, NumSamplers, ppSamplers);                                                                                      \
-    }                                                                                                                                                 \
-    void CCryDXGLDeviceContext::_Prefix##SetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer * const* ppConstantBuffers)                 \
-    {                                                                                                                                                 \
-        SetConstantBuffers(_Stage, StartSlot, NumBuffers, ppConstantBuffers);                                                                         \
-    }                                                                                                                                                 \
-    void CCryDXGLDeviceContext::_Prefix##GetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView * *ppShaderResourceViews)         \
-    {                                                                                                                                                 \
-        GetShaderResources(_Stage, StartSlot, NumViews, ppShaderResourceViews);                                                                       \
-    }                                                                                                                                                 \
-    void CCryDXGLDeviceContext::_Prefix##GetShader(_ShaderInterface * *ppShader, ID3D11ClassInstance * *ppClassInstances, UINT * NumClassInstances)   \
-    {                                                                                                                                                 \
-        CCryDXGLShader* pShader(NULL);                                                                                                                \
-        GetShader(_Stage, &pShader, ppClassInstances, NumClassInstances);                                                                             \
-        _ShaderType::ToInterface(ppShader, static_cast<_ShaderType*>(pShader));                                                                       \
-    }                                                                                                                                                 \
-    void CCryDXGLDeviceContext::_Prefix##GetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState * *ppSamplers)                              \
-    {                                                                                                                                                 \
-        GetSamplers(_Stage, StartSlot, NumSamplers, ppSamplers);                                                                                      \
-    }                                                                                                                                                 \
-    void CCryDXGLDeviceContext::_Prefix##GetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer * *ppConstantBuffers)                       \
-    {                                                                                                                                                 \
-        GetConstantBuffers(_Stage, StartSlot, NumBuffers, ppConstantBuffers);                                                                         \
-    }
-_IMPLEMENT_COMMON_SHADER_SETTERS(VS, ID3D11VertexShader,   CCryDXGLVertexShader,   NCryMetal::eST_Vertex)
-_IMPLEMENT_COMMON_SHADER_SETTERS(PS, ID3D11PixelShader,    CCryDXGLPixelShader,    NCryMetal::eST_Fragment)
-_IMPLEMENT_COMMON_SHADER_SETTERS(GS, ID3D11GeometryShader, CCryDXGLGeometryShader, NCryMetal::eST_NUM)
-_IMPLEMENT_COMMON_SHADER_SETTERS(HS, ID3D11HullShader,     CCryDXGLHullShader,     NCryMetal::eST_NUM)
-_IMPLEMENT_COMMON_SHADER_SETTERS(DS, ID3D11DomainShader,   CCryDXGLDomainShader,   NCryMetal::eST_NUM)
-#if DXGL_SUPPORT_COMPUTE
-_IMPLEMENT_COMMON_SHADER_SETTERS(CS, ID3D11ComputeShader,  CCryDXGLComputeShader,  NCryMetal::eST_Compute)
-#else
-_IMPLEMENT_COMMON_SHADER_SETTERS(CS, ID3D11ComputeShader,  CCryDXGLComputeShader,  NCryMetal::eST_NUM)
-#endif
-#undef _IMPLEMENT_COMMON_SHADER_SETTERS
-
-void CCryDXGLDeviceContext::DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->DrawIndexed(IndexCount, StartIndexLocation, BaseVertexLocation);
-}
-
-void CCryDXGLDeviceContext::Draw(UINT VertexCount, UINT StartVertexLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->Draw(VertexCount, StartVertexLocation);
-}
-
-HRESULT CCryDXGLDeviceContext::Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource)
-{
-    CheckCurrentContext(m_pContext);
-    NCryMetal::SResource* pGLResource(CCryDXGLResource::FromInterface(pResource)->GetGLResource());
-    if (pGLResource->m_pfMapSubresource)
-    {
-        return (*pGLResource->m_pfMapSubresource)(pGLResource, Subresource, MapType, MapFlags, pMappedResource, m_pContext) ? S_OK : E_FAIL;
-    }
-    else
-    {
-        DXGL_NOT_IMPLEMENTED
-        return E_FAIL;
-    }
-}
-
-void CCryDXGLDeviceContext::Unmap(ID3D11Resource* pResource, UINT Subresource)
-{
-    CheckCurrentContext(m_pContext);
-    NCryMetal::SResource* pGLResource(CCryDXGLResource::FromInterface(pResource)->GetGLResource());
-    if (pGLResource->m_pfUnmapSubresource)
-    {
-        (*pGLResource->m_pfUnmapSubresource)(pGLResource, Subresource, m_pContext);
-    }
-    else
-    {
-        DXGL_NOT_IMPLEMENTED
-    }
-}
-
-void CCryDXGLDeviceContext::IASetInputLayout(ID3D11InputLayout* pInputLayout)
-{
-    CCryDXGLInputLayout* pDXGLInputLayout(CCryDXGLInputLayout::FromInterface(pInputLayout));
-    if (m_spInputLayout != pDXGLInputLayout)
-    {
-        CheckCurrentContext(m_pContext);
-        m_pContext->SetInputLayout(pDXGLInputLayout == NULL ? NULL : pDXGLInputLayout->GetGLLayout());
-        m_spInputLayout = pDXGLInputLayout;
-    }
-}
-
-void CCryDXGLDeviceContext::IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets)
-{
-    CheckCurrentContext(m_pContext);
-    uint32 uSlot;
-    for (uSlot = 0; uSlot < NumBuffers; ++uSlot)
-    {
-        uint32 uSlotIndex(StartSlot + uSlot);
-        CCryDXGLBuffer* pDXGLVertexBuffer(CCryDXGLBuffer::FromInterface(ppVertexBuffers[uSlot]));
-        if (m_aspVertexBuffers[uSlotIndex] != pDXGLVertexBuffer ||
-            m_auVertexBufferStrides[uSlotIndex] != pStrides[uSlot] ||
-            m_auVertexBufferOffsets[uSlotIndex] != pOffsets[uSlot])
-        {
-            m_aspVertexBuffers[uSlotIndex] = pDXGLVertexBuffer;
-            m_auVertexBufferStrides[uSlotIndex] = pStrides[uSlot];
-            m_auVertexBufferOffsets[uSlotIndex] = pOffsets[uSlot];
-            m_pContext->SetVertexBuffer(uSlotIndex, pDXGLVertexBuffer == NULL ? 0 : pDXGLVertexBuffer->GetGLBuffer(), pStrides[uSlot], pOffsets[uSlot]);
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset)
-{
-    CCryDXGLBuffer* pDXGLIndexBuffer(CCryDXGLBuffer::FromInterface(pIndexBuffer));
-
-    m_spIndexBuffer = pDXGLIndexBuffer;
-    m_eIndexBufferFormat = Format;
-    m_uIndexBufferOffset = Offset;
-
-    CheckCurrentContext(m_pContext);
-    if (pDXGLIndexBuffer == NULL)
-    {
-        m_pContext->SetIndexBuffer(NULL, MTLIndexTypeUInt16, 0, 0);
-    }
-    else
-    {
-        MTLIndexType mtlIndexType;
-        switch (Format)
-        {
-        case DXGI_FORMAT_R16_UINT:
-            mtlIndexType = MTLIndexTypeUInt16;
-            break;
-
-        case DXGI_FORMAT_R32_UINT:
-            mtlIndexType = MTLIndexTypeUInt32;
-            break;
-                
-        default:
-            DXGL_ERROR("Invalid format for index buffer");
-            return;
-        }
-        const NCryMetal::SGIFormatInfo* pFormatInfo;
-        NCryMetal::EGIFormat eGIFormat(NCryMetal::GetGIFormat(Format));
-        if (eGIFormat == NCryMetal::eGIF_NUM ||
-            (pFormatInfo = NCryMetal::GetGIFormatInfo(eGIFormat)) == NULL ||
-            pFormatInfo->m_pTexture == NULL ||
-            pFormatInfo->m_pUncompressed == NULL)
-        {
-            DXGL_ERROR("Invalid format for index buffer");
-            return;
-        }
-        m_pContext->SetIndexBuffer(pDXGLIndexBuffer->GetGLBuffer(), mtlIndexType, pFormatInfo->m_pUncompressed->GetPixelBytes(), Offset);
-    }
-}
-
-void CCryDXGLDeviceContext::DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->DrawIndexedInstanced(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation);
-}
-
-void CCryDXGLDeviceContext::DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation)
-{
-    CheckCurrentContext(m_pContext);
-    CheckPipeline(m_kStages);
-    m_pContext->DrawInstanced(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation);
-}
-
-void CCryDXGLDeviceContext::IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology)
-{
-    CheckCurrentContext(m_pContext);
-    m_ePrimitiveTopology = Topology;
-    m_pContext->SetPrimitiveTopology(Topology);
-}
-
-void CCryDXGLDeviceContext::Begin(ID3D11Asynchronous* pAsync)
-{
-    CheckCurrentContext(m_pContext);
-    NCryMetal::SQuery* pQuery(CCryDXGLQuery::FromInterface(pAsync)->GetGLQuery());
-    if (pQuery)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        pQuery->Begin(m_pContext);
-    }
-    //  Confetti End: Igor Lobanchikov
-}
-
-void CCryDXGLDeviceContext::End(ID3D11Asynchronous* pAsync)
-{
-    CheckCurrentContext(m_pContext);
-    NCryMetal::SQuery* pQuery(CCryDXGLQuery::FromInterface(pAsync)->GetGLQuery());
-    if (pQuery)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        pQuery->End(m_pContext);
-    }
-    //  Confetti End: Igor Lobanchikov
-}
-
-HRESULT CCryDXGLDeviceContext::GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags)
-{
-    CheckCurrentContext(m_pContext);
-    NCryMetal::SQuery* pQuery(CCryDXGLQuery::FromInterface(pAsync)->GetGLQuery());
-    if (pQuery)
-    {
-        //  Confetti BEGIN: Igor Lobanchikov
-        //  Igor: this slows down everything if not used wisely.
-        if (!(GetDataFlags & D3D11_ASYNC_GETDATA_DONOTFLUSH) && !pQuery->IsBufferSubmitted())
-        {
-            PROFILE_LABEL("WARNING: DXMETAL: Flushing pipeline because event or query wants flush.");
-            m_pContext->Flush();
-        }
-        return pQuery->GetData(pData, DataSize, (GetDataFlags & D3D11_ASYNC_GETDATA_DONOTFLUSH) == 0 ? true : false) ? S_OK : E_FAIL;
-    }
-    //  Confetti End: Igor Lobanchikov
-    return E_FAIL;
-}
-
-void CCryDXGLDeviceContext::SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue)
-{
-    if (pPredicate != NULL)
-    {
-        DXGL_NOT_IMPLEMENTED
-    }
-    m_spPredicate = CCryDXGLQuery::FromInterface(pPredicate);
-    m_bPredicateValue = PredicateValue == TRUE;
-}
-
-void CCryDXGLDeviceContext::OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView)
-{
-    OMSetRenderTargetsAndUnorderedAccessViews(NumViews, ppRenderTargetViews, pDepthStencilView, NumViews, 0, NULL, NULL);
-}
-
-void CCryDXGLDeviceContext::OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts)
-{
-    NCryMetal::SOutputMergerView* apGLRenderTargetViews[DXGL_ARRAY_SIZE(m_aspRenderTargetViews)];
-    NCryMetal::SOutputMergerView* pGLDepthStencilView(NULL);
-
-    for (uint32 uRTV = 0; uRTV < NumRTVs; ++uRTV)
-    {
-        CCryDXGLRenderTargetView* pDXGLRenderTargetView(CCryDXGLRenderTargetView::FromInterface(ppRenderTargetViews[uRTV]));
-        m_aspRenderTargetViews[uRTV] = pDXGLRenderTargetView;
-        apGLRenderTargetViews[uRTV] = pDXGLRenderTargetView == NULL ? NULL : pDXGLRenderTargetView->GetGLView();
-    }
-    if (UAVStartSlot == NumRTVs)
-    {
-        for (uint32 uUAV = 0; uUAV < NumUAVs; ++uUAV)
-        {
-            CCryDXGLUnorderedAccessView* pDXGLUnorderedAccessView(CCryDXGLUnorderedAccessView::FromInterface(ppUnorderedAccessViews[uUAV]));
-            if (pDXGLUnorderedAccessView != NULL)
-            {
-                DXGL_NOT_IMPLEMENTED;
-            }
-            else
-            {
-                m_aspRenderTargetViews[UAVStartSlot + uUAV] = NULL;
-                apGLRenderTargetViews[UAVStartSlot + uUAV] = NULL;
-            }
-        }
-    }
-    else
-    {
-        DXGL_ERROR("CCryDXGLDeviceContext::OMSetRenderTargetsAndUnorderedAccessViews - UAVStartSlot is expected to be equal to NumRTVs");
-        NumUAVs = 0;
-    }
-    for (uint32 uRTV = NumRTVs + NumUAVs; uRTV < DXGL_ARRAY_SIZE(m_aspRenderTargetViews); ++uRTV)
-    {
-        m_aspRenderTargetViews[uRTV] = NULL;
-        apGLRenderTargetViews[uRTV] = NULL;
-    }
-
-    CCryDXGLDepthStencilView* pDXGLDepthStencilView(CCryDXGLDepthStencilView::FromInterface(pDepthStencilView));
-    m_spDepthStencilView = pDXGLDepthStencilView;
-    if (pDXGLDepthStencilView != NULL)
-    {
-        pGLDepthStencilView = pDXGLDepthStencilView->GetGLView();
-    }
-
-#if DXGL_CHECK_HAZARDS
-    for (uint32 uStage = 0; uStage < m_kStages.size(); ++uStage)
-    {
-        CheckHazards(m_aspRenderTargetViews, DXGL_ARRAY_SIZE(m_aspRenderTargetViews), m_kStages.at(uStage).m_aspShaderResourceViews, DXGL_ARRAY_SIZE(m_kStages.at(uStage).m_aspShaderResourceViews), uStage);
-        CheckHazards(&m_spDepthStencilView, 1, m_kStages.at(uStage).m_aspShaderResourceViews, DXGL_ARRAY_SIZE(m_kStages.at(uStage).m_aspShaderResourceViews), uStage);
-    }
-#endif //DXGL_CHECK_HAZARDS
-
-    CheckCurrentContext(m_pContext);
-
-    m_pContext->SetRenderTargets(NumRTVs, apGLRenderTargetViews, pGLDepthStencilView);
-}
-
-void CCryDXGLDeviceContext::OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask)
-{
-    CheckCurrentContext(m_pContext);
-
-    CCryDXGLBlendState* pDXGLBlendState(
-        pBlendState == NULL ?
-        m_spDefaultBlendState.get() :
-        CCryDXGLBlendState::FromInterface(pBlendState));
-
-    if (pDXGLBlendState != m_spBlendState)
-    {
-        m_spBlendState = pDXGLBlendState;
-        pDXGLBlendState->Apply(m_pContext);
-    }
-
-    m_uSampleMask = SampleMask;
-    if (BlendFactor == NULL)
-    {
-        m_auBlendFactor[0] = 1.0f;
-        m_auBlendFactor[1] = 1.0f;
-        m_auBlendFactor[2] = 1.0f;
-        m_auBlendFactor[2] = 1.0f;
-    }
-    else
-    {
-        m_auBlendFactor[0] = BlendFactor[0];
-        m_auBlendFactor[1] = BlendFactor[1];
-        m_auBlendFactor[2] = BlendFactor[2];
-        m_auBlendFactor[2] = BlendFactor[3];
-    }
-
-    m_pContext->SetBlendColor(m_auBlendFactor[0], m_auBlendFactor[1], m_auBlendFactor[2], m_auBlendFactor[3]);
-    m_pContext->SetSampleMask(m_uSampleMask);
-}
-
-void CCryDXGLDeviceContext::OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef)
-{
-    CheckCurrentContext(m_pContext);
-
-    CCryDXGLDepthStencilState* pDXGLDepthStencilState(
-        pDepthStencilState == NULL ?
-        m_spDefaultDepthStencilState.get() :
-        CCryDXGLDepthStencilState::FromInterface(pDepthStencilState));
-
-    if (pDXGLDepthStencilState != m_spDepthStencilState || m_uStencilRef != StencilRef)
-    {
-        m_spDepthStencilState = pDXGLDepthStencilState;
-        m_uStencilRef = StencilRef;
-        pDXGLDepthStencilState->Apply(StencilRef, m_pContext);
-    }
-}
-
-void CCryDXGLDeviceContext::SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets)
-{
-    for (uint32 uBuffer = 0; uBuffer < D3D11_SO_BUFFER_SLOT_COUNT; ++uBuffer)
-    {
-        CCryDXGLBuffer* pDXGLSOBuffer(NULL);
-        uint32 uOffset(0);
-        if (uBuffer < NumBuffers)
-        {
-            pDXGLSOBuffer = CCryDXGLBuffer::FromInterface(ppSOTargets[uBuffer]);
-            uOffset = pOffsets[uBuffer];
-        }
-
-        if (m_aspStreamOutputBuffers[uBuffer] != pDXGLSOBuffer ||
-            m_auStreamOutputBufferOffsets[uBuffer] != uOffset)
-        {
-            DXGL_NOT_IMPLEMENTED
-                m_aspStreamOutputBuffers[uBuffer] = pDXGLSOBuffer;
-            m_auStreamOutputBufferOffsets[uBuffer] = uOffset;
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::DrawAuto(void)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ)
-{
-    CheckCurrentContext(m_pContext);
-    m_pContext->Dispatch(ThreadGroupCountX, ThreadGroupCountY, ThreadGroupCountZ);
-}
-
-void CCryDXGLDeviceContext::DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::RSSetState(ID3D11RasterizerState* pRasterizerState)
-{
-    CCryDXGLRasterizerState* pDXGLRasterizerState(
-        pRasterizerState == NULL ?
-        m_spDefaultRasterizerState.get() :
-        CCryDXGLRasterizerState::FromInterface(pRasterizerState));
-
-    if (pDXGLRasterizerState != m_spRasterizerState)
-    {
-        CheckCurrentContext(m_pContext);
-        m_spRasterizerState = pDXGLRasterizerState;
-        m_spRasterizerState->Apply(m_pContext);
-    }
-}
-
-void CCryDXGLDeviceContext::RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports)
-{
-    m_uNumViewports = NumViewports;
-    cryMemcpy(m_akViewports, pViewports, min(sizeof(m_akViewports), sizeof(pViewports[0]) * NumViewports));
-
-    CheckCurrentContext(m_pContext);
-    m_pContext->SetViewports(NumViewports, pViewports);
-}
-
-void CCryDXGLDeviceContext::RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects)
-{
-    m_uNumScissorRects = NumRects;
-    if (NumRects > 0)
-    {
-        cryMemcpy(m_akScissorRects, pRects, min(sizeof(m_akScissorRects), sizeof(pRects[0]) * NumRects));
-    }
-
-    CheckCurrentContext(m_pContext);
-    m_pContext->SetScissorRects(NumRects, pRects);
-}
-
-void CCryDXGLDeviceContext::CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox)
-{
-    CCryDXGLResource* pDXGLDstResource(CCryDXGLResource::FromInterface(pDstResource));
-    CCryDXGLResource* pDXGLSrcResource(CCryDXGLResource::FromInterface(pSrcResource));
-
-    CheckCurrentContext(m_pContext);
-    D3D11_RESOURCE_DIMENSION kDstType, kSrcType;
-    pDXGLDstResource->GetType(&kDstType);
-    pDXGLSrcResource->GetType(&kSrcType);
-
-    if (kDstType == kSrcType)
-    {
-        switch (kDstType)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            NCryMetal::CopySubTexture(
-                static_cast<NCryMetal::STexture*>(pDXGLDstResource->GetGLResource()), DstSubresource, DstX, DstY, DstZ,
-                static_cast<NCryMetal::STexture*>(pDXGLSrcResource->GetGLResource()), SrcSubresource, pSrcBox, m_pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            NCryMetal::CopySubBuffer(
-                static_cast<NCryMetal::SBuffer*>(pDXGLDstResource->GetGLResource()), DstSubresource, DstX, DstY, DstZ,
-                static_cast<NCryMetal::SBuffer*>(pDXGLSrcResource->GetGLResource()), SrcSubresource, pSrcBox, m_pContext);
-            break;
-        default:
-            CRY_ASSERT(false);
-            break;
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource)
-{
-    CCryDXGLResource* pDXGLDstResource(CCryDXGLResource::FromInterface(pDstResource));
-    CCryDXGLResource* pDXGLSrcResource(CCryDXGLResource::FromInterface(pSrcResource));
-
-    D3D11_RESOURCE_DIMENSION kDstType, kSrcType;
-    pDXGLDstResource->GetType(&kDstType);
-    pDXGLSrcResource->GetType(&kSrcType);
-
-    if (kDstType == kSrcType)
-    {
-        CheckCurrentContext(m_pContext);
-        switch (kDstType)
-        {
-        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
-        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
-            NCryMetal::CopyTexture(
-                static_cast<NCryMetal::STexture*>(pDXGLDstResource->GetGLResource()),
-                static_cast<NCryMetal::STexture*>(pDXGLSrcResource->GetGLResource()),
-                m_pContext);
-            break;
-        case D3D11_RESOURCE_DIMENSION_BUFFER:
-            NCryMetal::CopyBuffer(
-                static_cast<NCryMetal::SBuffer*>(pDXGLDstResource->GetGLResource()),
-                static_cast<NCryMetal::SBuffer*>(pDXGLSrcResource->GetGLResource()),
-                m_pContext);
-            break;
-        default:
-            CRY_ASSERT(false);
-            break;
-        }
-    }
-    else
-    {
-        DXGL_ERROR("CopyResource failed - source and destination are resources of different type");
-    }
-}
-
-void CCryDXGLDeviceContext::UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch)
-{
-    CheckCurrentContext(m_pContext);
-    NCryMetal::SResource* pGLResource(CCryDXGLResource::FromInterface(pDstResource)->GetGLResource());
-    if (pGLResource->m_pfUpdateSubresource)
-    {
-        (*pGLResource->m_pfUpdateSubresource)(pGLResource, DstSubresource, pDstBox, pSrcData, SrcRowPitch, SrcDepthPitch, m_pContext);
-    }
-    else
-    {
-        DXGL_NOT_IMPLEMENTED
-    }
-}
-
-void CCryDXGLDeviceContext::CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ])
-{
-    CheckCurrentContext(m_pContext);
-    CCryDXGLRenderTargetView* pDXGLRenderTargetView(CCryDXGLRenderTargetView::FromInterface(pRenderTargetView));
-    m_pContext->ClearRenderTarget(pDXGLRenderTargetView == NULL ? NULL : pDXGLRenderTargetView->GetGLView(), ColorRGBA);
-}
-
-void CCryDXGLDeviceContext::ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ])
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ])
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil)
-{
-    CheckCurrentContext(m_pContext);
-    CCryDXGLDepthStencilView* pDXGLDepthStencilView(CCryDXGLDepthStencilView::FromInterface(pDepthStencilView));
-    m_pContext->ClearDepthStencil(pDXGLDepthStencilView == NULL ? NULL : pDXGLDepthStencilView->GetGLView(), (ClearFlags & D3D11_CLEAR_DEPTH) != 0, (ClearFlags & D3D11_CLEAR_STENCIL) != 0, Depth, Stencil);
-}
-
-void CCryDXGLDeviceContext::GenerateMips(ID3D11ShaderResourceView* pShaderResourceView)
-{
-    CheckCurrentContext(m_pContext);
-    CCryDXGLShaderResourceView::FromInterface(pShaderResourceView)->GetGLView()->GenerateMipmaps(m_pContext);
-}
-
-void CCryDXGLDeviceContext::SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-FLOAT CCryDXGLDeviceContext::GetResourceMinLOD(ID3D11Resource* pResource)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0.0f;
-}
-
-void CCryDXGLDeviceContext::ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-void CCryDXGLDeviceContext::CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts)
-{
-    for (uint32 uUAV = 0; uUAV < NumUAVs; ++uUAV)
-    {
-        uint32 uSlot(StartSlot + uUAV);
-        CCryDXGLUnorderedAccessView* pDXGLUnorderedAccessView(CCryDXGLUnorderedAccessView::FromInterface(ppUnorderedAccessViews[uSlot]));
-        if (m_aspCSUnorderedAccessViews[uSlot] != pDXGLUnorderedAccessView)
-        {
-            m_aspCSUnorderedAccessViews[uSlot] = pDXGLUnorderedAccessView;
-            //Call context to set UAV buffer
-            if (pDXGLUnorderedAccessView == NULL)
-            {
-                m_pContext->SetUAVBuffer(NULL, NCryMetal::eST_Compute, uSlot);
-                m_pContext->SetUAVTexture(NULL, NCryMetal::eST_Compute, uSlot);
-                continue;
-            }
-            D3D11_UNORDERED_ACCESS_VIEW_DESC pDesc;
-            pDXGLUnorderedAccessView->GetDesc(&pDesc);
-            assert(pDesc.ViewDimension != D3D11_UAV_DIMENSION_UNKNOWN);
-            if (pDesc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER)
-            {
-                m_pContext->SetUAVBuffer(pDXGLUnorderedAccessView->GetGLBuffer(), NCryMetal::eST_Compute, uSlot);
-            }
-            else
-            {
-                m_pContext->SetUAVTexture(pDXGLUnorderedAccessView->GetGLTexture(), NCryMetal::eST_Compute, uSlot);
-            }
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::IAGetInputLayout(ID3D11InputLayout** ppInputLayout)
-{
-    CCryDXGLInputLayout::ToInterface(ppInputLayout, m_spInputLayout);
-    if ((*ppInputLayout) != NULL)
-    {
-        (*ppInputLayout)->AddRef();
-    }
-}
-
-void CCryDXGLDeviceContext::IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets)
-{
-    uint32 uSlot;
-    for (uSlot = 0; uSlot < NumBuffers; ++uSlot)
-    {
-        uint32 uSlotIndex(StartSlot + uSlot);
-
-        CCryDXGLBuffer::ToInterface(ppVertexBuffers + uSlot, m_aspVertexBuffers[uSlotIndex]);
-        if (ppVertexBuffers[uSlot] != NULL)
-        {
-            ppVertexBuffers[uSlot]->AddRef();
-        }
-        pStrides[uSlot] = m_auVertexBufferStrides[uSlotIndex];
-        pOffsets[uSlot] = m_auVertexBufferOffsets[uSlotIndex];
-    }
-}
-
-void CCryDXGLDeviceContext::IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset)
-{
-    CCryDXGLBuffer::ToInterface(pIndexBuffer, m_spIndexBuffer);
-    if ((*pIndexBuffer) != NULL)
-    {
-        (*pIndexBuffer)->AddRef();
-    }
-    *Format = m_eIndexBufferFormat;
-    *Offset = m_uIndexBufferOffset;
-}
-
-void CCryDXGLDeviceContext::IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology)
-{
-    *pTopology = m_ePrimitiveTopology;
-}
-
-void CCryDXGLDeviceContext::GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue)
-{
-    ID3D11Query* pQuery;
-    CCryDXGLQuery::ToInterface(&pQuery, m_spPredicate);
-    *ppPredicate = static_cast<ID3D11Predicate*>(pQuery);
-    *pPredicateValue = (m_bPredicateValue ? TRUE : FALSE);
-}
-
-void CCryDXGLDeviceContext::OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView)
-{
-    OMGetRenderTargetsAndUnorderedAccessViews(NumViews, ppRenderTargetViews, ppDepthStencilView, 0, 0, NULL);
-}
-
-void CCryDXGLDeviceContext::OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-{
-    for (uint32 uRTV = 0; uRTV < NumRTVs; ++uRTV)
-    {
-        CCryDXGLRenderTargetView::ToInterface(ppRenderTargetViews + uRTV, m_aspRenderTargetViews[uRTV]);
-        if (ppRenderTargetViews[uRTV] != NULL)
-        {
-            ppRenderTargetViews[uRTV]->AddRef();
-        }
-    }
-    CCryDXGLDepthStencilView::ToInterface(ppDepthStencilView, m_spDepthStencilView);
-    if ((*ppDepthStencilView) != NULL)
-    {
-        (*ppDepthStencilView)->AddRef();
-    }
-
-    for (uint32 uUAV = 0; uUAV < NumUAVs; ++uUAV)
-    {
-        DXGL_TODO("Implement together with OMSetRenderTargetsAndUnorderedAccessViews");
-        ppUnorderedAccessViews[uUAV] = NULL;
-    }
-}
-
-void CCryDXGLDeviceContext::OMGetBlendState(ID3D11BlendState** ppBlendState, FLOAT BlendFactor[ 4 ], UINT* pSampleMask)
-{
-    CCryDXGLBlendState::ToInterface(ppBlendState, m_spBlendState);
-    if ((*ppBlendState) != NULL)
-    {
-        (*ppBlendState)->AddRef();
-    }
-    BlendFactor[0] = m_auBlendFactor[0];
-    BlendFactor[1] = m_auBlendFactor[1];
-    BlendFactor[2] = m_auBlendFactor[2];
-    BlendFactor[2] = m_auBlendFactor[3];
-    *pSampleMask = m_uSampleMask;
-}
-
-void CCryDXGLDeviceContext::OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef)
-{
-    CCryDXGLDepthStencilState::ToInterface(ppDepthStencilState, m_spDepthStencilState);
-    if ((*ppDepthStencilState) != NULL)
-    {
-        (*ppDepthStencilState)->AddRef();
-    }
-    *pStencilRef = m_uStencilRef;
-}
-
-void CCryDXGLDeviceContext::SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets)
-{
-    for (uint32 uBuffer = 0; uBuffer < NumBuffers; ++uBuffer)
-    {
-        CCryDXGLBuffer::ToInterface(ppSOTargets + uBuffer, m_aspStreamOutputBuffers[uBuffer]);
-        if (ppSOTargets[uBuffer] != NULL)
-        {
-            ppSOTargets[uBuffer]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::RSGetState(ID3D11RasterizerState** ppRasterizerState)
-{
-    CCryDXGLRasterizerState::ToInterface(ppRasterizerState, m_spRasterizerState);
-    if ((*ppRasterizerState) != NULL)
-    {
-        (*ppRasterizerState)->AddRef();
-    }
-}
-
-void CCryDXGLDeviceContext::RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports)
-{
-    if (pViewports != NULL)
-    {
-        cryMemcpy(pViewports, m_akViewports, min(sizeof(m_akViewports), sizeof(pViewports[0]) * *pNumViewports));
-    }
-    *pNumViewports = m_uNumViewports;
-}
-
-void CCryDXGLDeviceContext::RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects)
-{
-    if (pRects != NULL)
-    {
-        cryMemcpy(pRects, m_akScissorRects, min(sizeof(m_akScissorRects), sizeof(pRects[0]) * *pNumRects));
-    }
-    *pNumRects = m_uNumScissorRects;
-}
-
-void CCryDXGLDeviceContext::CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-{
-    for (uint32 uUAV = 0; uUAV < NumUAVs; ++uUAV)
-    {
-        uint32 uSlot(StartSlot + uUAV);
-        CCryDXGLUnorderedAccessView::ToInterface(ppUnorderedAccessViews + uUAV, m_aspCSUnorderedAccessViews[uSlot]);
-        if (ppUnorderedAccessViews[uUAV] != NULL)
-        {
-            ppUnorderedAccessViews[uUAV]->AddRef();
-        }
-    }
-}
-
-void CCryDXGLDeviceContext::ClearState(void)
-{
-    CheckCurrentContext(m_pContext);
-
-    // Common shader state
-    for (uint32 uStage = 0; uStage < m_kStages.size(); ++uStage)
-    {
-        SStage& kStage(m_kStages.at(uStage));
-
-        for (uint32 uSRV = 0; uSRV < DXGL_ARRAY_SIZE(kStage.m_aspShaderResourceViews); ++uSRV)
-        {
-            if (kStage.m_aspShaderResourceViews[uSRV] != NULL)
-            {
-                m_pContext->SetTexture(NULL, uStage, uSRV);
-                kStage.m_aspShaderResourceViews[uSRV] = NULL;
-            }
-        }
-
-        for (uint32 uSampler = 0; uSampler < DXGL_ARRAY_SIZE(kStage.m_aspSamplerStates); ++uSampler)
-        {
-            if (kStage.m_aspSamplerStates[uSampler] != m_spDefaultSamplerState)
-            {
-                m_spDefaultSamplerState->Apply(uStage, uSampler, m_pContext);
-                kStage.m_aspSamplerStates[uSampler] = m_spDefaultSamplerState;
-            }
-        }
-
-        for (uint32 uCB = 0; uCB < DXGL_ARRAY_SIZE(kStage.m_aspConstantBuffers); ++uCB)
-        {
-            if (kStage.m_aspConstantBuffers[uCB] != NULL)
-            {
-                m_pContext->SetConstantBuffer(NULL, uStage, uCB);
-                kStage.m_aspConstantBuffers[uCB] = NULL;
-            }
-        }
-
-        if (m_kStages[uStage].m_spShader != NULL)
-        {
-            m_pContext->SetShader(NULL, uStage);
-            m_kStages[uStage].m_spShader = NULL;
-        }
-    }
-
-    // CS UAVs
-    for (uint32 uUAV = 0; uUAV < DXGL_ARRAY_SIZE(m_aspCSUnorderedAccessViews); ++uUAV)
-    {
-        if (m_aspCSUnorderedAccessViews[uUAV] != NULL)
-        {
-            DXGL_NOT_IMPLEMENTED;
-            m_aspCSUnorderedAccessViews[uUAV] = NULL;
-        }
-    }
-
-    // Vertex buffers
-    for (uint32 uVB = 0; uVB < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++uVB)
-    {
-        if (m_aspVertexBuffers[uVB] != NULL ||
-            m_auVertexBufferStrides[uVB] != 0 ||
-            m_auVertexBufferOffsets[uVB] != 0)
-        {
-            m_pContext->SetVertexBuffer(uVB, NULL, 0, 0);
-            m_aspVertexBuffers[uVB] = NULL;
-            m_auVertexBufferStrides[uVB] = 0;
-            m_auVertexBufferOffsets[uVB] = 0;
-        }
-    }
-
-    // Index buffer
-    if (m_spIndexBuffer != NULL ||
-        m_eIndexBufferFormat != DXGI_FORMAT_UNKNOWN ||
-        m_uIndexBufferOffset != 0)
-    {
-        m_pContext->SetIndexBuffer(NULL, MTLIndexTypeUInt16, 0, 0);
-        m_spIndexBuffer = NULL;
-        m_eIndexBufferFormat = DXGI_FORMAT_UNKNOWN;
-        m_uIndexBufferOffset = 0;
-    }
-
-    // Input layout
-    if (m_spInputLayout != NULL)
-    {
-        m_pContext->SetInputLayout(NULL);
-        m_spInputLayout = NULL;
-    }
-
-    // Primitive topology
-    if (m_ePrimitiveTopology != D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED)
-    {
-        m_pContext->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED);
-        m_ePrimitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
-    }
-
-    // Output merger state
-    OMSetBlendState(NULL, NULL, 0xFFFFFFFF);
-    OMSetDepthStencilState(NULL, 0);
-    OMSetRenderTargetsAndUnorderedAccessViews(0, NULL, NULL, 0, 0, NULL, NULL);
-
-    // Rasterizer state
-    m_uNumScissorRects = 0;
-    m_pContext->SetScissorRects(0, NULL);
-    m_uNumViewports;
-    m_pContext->SetViewports(0, NULL);
-    RSSetState(NULL);
-
-    // Predication
-    SetPredication(NULL, FALSE);
-
-    // Stream output
-    SOSetTargets(0, NULL, NULL);
-}
-
-void CCryDXGLDeviceContext::Flush(void)
-{
-    CheckCurrentContext(m_pContext);
-    m_pContext->Flush();
-}
-
-D3D11_DEVICE_CONTEXT_TYPE CCryDXGLDeviceContext::GetType(void)
-{
-    DXGL_TODO("Modify when deferred contexts are supported")
-    return D3D11_DEVICE_CONTEXT_IMMEDIATE;
-}
-
-UINT CCryDXGLDeviceContext::GetContextFlags(void)
-{
-    return 0;
-}
-
-HRESULT CCryDXGLDeviceContext::FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceContext.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceContext.hpp
deleted file mode 100644
index 60f2c7eac4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALDeviceContext.hpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11DeviceContext
-
-#ifndef __CRYMETALGLDEVICECONTEXT__
-#define __CRYMETALGLDEVICECONTEXT__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-namespace NCryMetal
-{
-    class CContext;
-}
-
-class CCryDXGLBlendState;
-class CCryDXGLBuffer;
-class CCryDXGLDepthStencilState;
-class CCryDXGLDepthStencilView;
-class CCryDXGLInputLayout;
-class CCryDXGLQuery;
-class CCryDXGLRasterizerState;
-class CCryDXGLRenderTargetView;
-class CCryDXGLSamplerState;
-class CCryDXGLShader;
-class CCryDXGLShaderResourceView;
-class CCryDXGLUnorderedAccessView;
-
-class CCryDXGLDeviceContext
-#if DXGL_VIRTUAL_DEVICE_AND_CONTEXT && !DXGL_FULL_EMULATION
-    : public ID3D11DeviceContext
-#else
-    : public CCryDXGLDeviceChild
-#endif
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDeviceContext, D3D11DeviceContext)
-
-    CCryDXGLDeviceContext();
-    virtual ~CCryDXGLDeviceContext();
-
-    bool Initialize(CCryDXGLDevice* pDevice);
-    void Shutdown();
-
-    NCryMetal::CContext* GetMetalContext();
-
-    // ID3D11DeviceContext implementation
-    void STDMETHODCALLTYPE VSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE PSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE PSSetShader(ID3D11PixelShader* pPixelShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE PSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE VSSetShader(ID3D11VertexShader* pVertexShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation);
-    void STDMETHODCALLTYPE Draw(UINT VertexCount, UINT StartVertexLocation);
-    HRESULT STDMETHODCALLTYPE Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource);
-    void STDMETHODCALLTYPE Unmap(ID3D11Resource* pResource, UINT Subresource);
-    void STDMETHODCALLTYPE PSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE IASetInputLayout(ID3D11InputLayout* pInputLayout);
-    void STDMETHODCALLTYPE IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets);
-    void STDMETHODCALLTYPE IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset);
-    void STDMETHODCALLTYPE DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation);
-    void STDMETHODCALLTYPE DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation);
-    void STDMETHODCALLTYPE GSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE GSSetShader(ID3D11GeometryShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology);
-    void STDMETHODCALLTYPE VSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE VSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE Begin(ID3D11Asynchronous* pAsync);
-    void STDMETHODCALLTYPE End(ID3D11Asynchronous* pAsync);
-    HRESULT STDMETHODCALLTYPE GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags);
-    void STDMETHODCALLTYPE SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue);
-    void STDMETHODCALLTYPE GSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE GSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView);
-    void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts);
-    void STDMETHODCALLTYPE OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask);
-    void STDMETHODCALLTYPE OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef);
-    void STDMETHODCALLTYPE SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets);
-    void STDMETHODCALLTYPE DrawAuto(void);
-    void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs);
-    void STDMETHODCALLTYPE DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs);
-    void STDMETHODCALLTYPE Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ);
-    void STDMETHODCALLTYPE DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs);
-    void STDMETHODCALLTYPE RSSetState(ID3D11RasterizerState* pRasterizerState);
-    void STDMETHODCALLTYPE RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports);
-    void STDMETHODCALLTYPE RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects);
-    void STDMETHODCALLTYPE CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox);
-    void STDMETHODCALLTYPE CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource);
-    void STDMETHODCALLTYPE UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch);
-    void STDMETHODCALLTYPE CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView);
-    void STDMETHODCALLTYPE ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ]);
-    void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ]);
-    void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ]);
-    void STDMETHODCALLTYPE ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil);
-    void STDMETHODCALLTYPE GenerateMips(ID3D11ShaderResourceView* pShaderResourceView);
-    void STDMETHODCALLTYPE SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD);
-    FLOAT STDMETHODCALLTYPE GetResourceMinLOD(ID3D11Resource* pResource);
-    void STDMETHODCALLTYPE ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format);
-    void STDMETHODCALLTYPE ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState);
-    void STDMETHODCALLTYPE HSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE HSSetShader(ID3D11HullShader* pHullShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE HSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE HSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE DSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE DSSetShader(ID3D11DomainShader* pDomainShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE DSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE DSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE CSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void STDMETHODCALLTYPE CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts);
-    void STDMETHODCALLTYPE CSSetShader(ID3D11ComputeShader* pComputeShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void STDMETHODCALLTYPE CSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void STDMETHODCALLTYPE CSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-    void STDMETHODCALLTYPE VSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE PSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE PSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE PSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout);
-    void STDMETHODCALLTYPE IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets);
-    void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset);
-    void STDMETHODCALLTYPE GSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology);
-    void STDMETHODCALLTYPE VSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE VSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue);
-    void STDMETHODCALLTYPE GSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE GSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView);
-    void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews);
-    void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState * *ppBlendState, FLOAT BlendFactor[ 4 ], UINT * pSampleMask);
-    void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef);
-    void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets);
-    void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState);
-    void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports);
-    void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects);
-    void STDMETHODCALLTYPE HSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE HSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE HSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE DSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE DSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE DSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE CSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void STDMETHODCALLTYPE CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews);
-    void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances);
-    void STDMETHODCALLTYPE CSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void STDMETHODCALLTYPE CSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-    void STDMETHODCALLTYPE ClearState(void);
-    void STDMETHODCALLTYPE Flush(void);
-    D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType(void);
-    UINT STDMETHODCALLTYPE GetContextFlags(void);
-    HRESULT STDMETHODCALLTYPE FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList);
-
-protected:
-    static _smart_ptr<CCryDXGLBlendState>         CreateDefaultBlendState(CCryDXGLDevice* pDevice);
-    static _smart_ptr<CCryDXGLDepthStencilState>  CreateDefaultDepthStencilState(CCryDXGLDevice* pDevice);
-    static _smart_ptr<CCryDXGLRasterizerState>    CreateDefaultRasterizerState(CCryDXGLDevice* pDevice);
-    static _smart_ptr<CCryDXGLSamplerState>       CreateDefaultSamplerState(CCryDXGLDevice* pDevice);
-
-    struct SStage
-    {
-        _smart_ptr<CCryDXGLShader> m_spShader;
-        _smart_ptr<CCryDXGLSamplerState> m_aspSamplerStates[D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT];
-        _smart_ptr<CCryDXGLShaderResourceView> m_aspShaderResourceViews[D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT];
-        _smart_ptr<CCryDXGLBuffer> m_aspConstantBuffers[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT];
-    };
-
-    void SetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews);
-    void SetShader(uint32 uStage, CCryDXGLShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances);
-    void SetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers);
-    void SetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers);
-
-    void GetShaderResources(uint32 uStage, UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
-    void GetShader(uint32 uStage, CCryDXGLShader** pShader, ID3D11ClassInstance** ppClassInstances, UINT* NumClassInstances);
-    void GetSamplers(uint32 uStage, UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers);
-    void GetConstantBuffers(uint32 uStage, UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers);
-protected:
-    NCryMetal::CContext* m_pContext;
-    _smart_ptr<CCryDXGLBlendState>        m_spBlendState;
-    _smart_ptr<CCryDXGLDepthStencilState> m_spDepthStencilState;
-    _smart_ptr<CCryDXGLRasterizerState>   m_spRasterizerState;
-
-    uint32 m_uStencilRef;
-    float m_auBlendFactor[4];
-    uint32 m_uSampleMask;
-
-    std::vector<SStage> m_kStages;
-
-    _smart_ptr<CCryDXGLBuffer> m_aspVertexBuffers[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-    uint32 m_auVertexBufferStrides[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-    uint32 m_auVertexBufferOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
-    _smart_ptr<CCryDXGLInputLayout> m_spInputLayout;
-    _smart_ptr<CCryDXGLBuffer> m_spIndexBuffer;
-    DXGI_FORMAT m_eIndexBufferFormat;
-    uint32 m_uIndexBufferOffset;
-    D3D11_PRIMITIVE_TOPOLOGY m_ePrimitiveTopology;
-    _smart_ptr<CCryDXGLRenderTargetView> m_aspRenderTargetViews[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT];
-    _smart_ptr<CCryDXGLDepthStencilView> m_spDepthStencilView;
-    _smart_ptr<CCryDXGLUnorderedAccessView> m_aspCSUnorderedAccessViews[D3D11_1_UAV_SLOT_COUNT];
-    uint32 m_uNumViewports;
-    D3D11_VIEWPORT m_akViewports[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-    uint32 m_uNumScissorRects;
-    D3D11_RECT m_akScissorRects[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-    _smart_ptr<CCryDXGLQuery> m_spPredicate;
-    bool m_bPredicateValue;
-    _smart_ptr<CCryDXGLBuffer> m_aspStreamOutputBuffers[D3D11_SO_BUFFER_SLOT_COUNT];
-    uint32 m_auStreamOutputBufferOffsets[D3D11_SO_BUFFER_SLOT_COUNT];
-
-    _smart_ptr<CCryDXGLBlendState>        m_spDefaultBlendState;
-    _smart_ptr<CCryDXGLDepthStencilState> m_spDefaultDepthStencilState;
-    _smart_ptr<CCryDXGLRasterizerState>   m_spDefaultRasterizerState;
-    _smart_ptr<CCryDXGLSamplerState>      m_spDefaultSamplerState;
-};
-
-#endif //__CRYMETALGLDEVICECONTEXT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIAdapter.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIAdapter.cpp
deleted file mode 100644
index 4bf3fda011..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIAdapter.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIAdapter
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALGIFactory.hpp"
-#include "CCryDXMETALGIOutput.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-CCryDXGLGIAdapter::CCryDXGLGIAdapter(CCryDXGLGIFactory* pFactory, NCryMetal::SAdapter* pGLAdapter)
-    : m_spGLAdapter(pGLAdapter)
-    , m_spFactory(pFactory)
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIAdapter)
-    DXGL_INITIALIZE_INTERFACE(DXGIAdapter1)
-}
-
-CCryDXGLGIAdapter::~CCryDXGLGIAdapter()
-{
-}
-
-bool CCryDXGLGIAdapter::Initialize()
-{
-    size_t uNumChars(mbstowcs(m_kDesc.Description, m_spGLAdapter->m_description.c_str(), DXGL_ARRAY_SIZE(m_kDesc.Description)));
-    memcpy(m_kDesc1.Description, m_kDesc.Description, sizeof(m_kDesc1.Description));
-
-    _smart_ptr<CCryDXGLGIOutput> spOutput(new CCryDXGLGIOutput());
-    if (!spOutput->Initialize())
-    {
-        return false;
-    }
-    m_kOutputs.push_back(spOutput);
-
-    DXGL_TODO("Detect from available extensions")
-    m_eSupportedFeatureLevel = D3D_FEATURE_LEVEL_11_0;
-
-    m_kDesc1.DedicatedVideoMemory = m_spGLAdapter->m_vramBytes;
-
-    return true;
-}
-
-D3D_FEATURE_LEVEL CCryDXGLGIAdapter::GetSupportedFeatureLevel()
-{
-    return m_eSupportedFeatureLevel;
-}
-
-NCryMetal::SAdapter* CCryDXGLGIAdapter::GetGLAdapter()
-{
-    return m_spGLAdapter.get();
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIObject overrides
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIAdapter::GetParent(REFIID riid, void** ppParent)
-{
-    IUnknown* pFactoryInterface;
-    CCryDXGLBase::ToInterface(&pFactoryInterface, m_spFactory);
-    if (pFactoryInterface->QueryInterface(riid, ppParent) == S_OK && ppParent != NULL)
-    {
-        return S_OK;
-    }
-    return CCryDXGLGIObject::GetParent(riid, ppParent);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIAdapter implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIAdapter::EnumOutputs(UINT Output, IDXGIOutput** ppOutput)
-{
-    if (Output >= m_kOutputs.size())
-    {
-        ppOutput = NULL;
-        return DXGI_ERROR_NOT_FOUND;
-    }
-
-    CCryDXGLGIOutput::ToInterface(ppOutput, m_kOutputs.at(Output));
-    (*ppOutput)->AddRef();
-
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIAdapter::GetDesc(DXGI_ADAPTER_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIAdapter::CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion)
-{
-    if (InterfaceName == __uuidof(ID3D10Device)
-        || InterfaceName == __uuidof(ID3D11Device)
-#if !DXGL_FULL_EMULATION
-        || InterfaceName == __uuidof(CCryDXGLDevice)
-#endif //!DXGL_FULL_EMULATION
-        )
-    {
-        if (pUMDVersion != NULL)
-        {
-            DXGL_TODO("Put useful data here");
-            pUMDVersion->HighPart = 0;
-            pUMDVersion->LowPart = 0;
-        }
-        return S_OK;
-    }
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIAdapter1 implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIAdapter::GetDesc1(DXGI_ADAPTER_DESC1* pDesc)
-{
-    *pDesc = m_kDesc1;
-    return S_OK;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIAdapter.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIAdapter.hpp
deleted file mode 100644
index 44e6038176..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIAdapter.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description : Declaration of the DXGL wrapper for IDXGIAdapter
-
-#ifndef __CRYMETALGLGIADAPTER__
-#define __CRYMETALGLGIADAPTER__
-
-#include "CCryDXMETALGIObject.hpp"
-
-namespace NCryMetal
-{
-    struct SAdapter;
-}
-
-class CCryDXGLGIFactory;
-class CCryDXGLGIOutput;
-
-class CCryDXGLGIAdapter
-    : public CCryDXGLGIObject
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIAdapter, DXGIAdapter)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIAdapter, DXGIAdapter1)
-
-    CCryDXGLGIAdapter(CCryDXGLGIFactory* pFactory, NCryMetal::SAdapter* pGLAdapter);
-    virtual ~CCryDXGLGIAdapter();
-
-    bool Initialize();
-    D3D_FEATURE_LEVEL GetSupportedFeatureLevel();
-    NCryMetal::SAdapter* GetGLAdapter();
-
-    // IDXGIObject overrides
-    HRESULT GetParent(REFIID riid, void** ppParent);
-
-    // IDXGIAdapter implementation
-    HRESULT EnumOutputs(UINT Output, IDXGIOutput** ppOutput);
-    HRESULT GetDesc(DXGI_ADAPTER_DESC* pDesc);
-    HRESULT CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion);
-
-    // IDXGIAdapter1 implementation
-    HRESULT GetDesc1(DXGI_ADAPTER_DESC1* pDesc);
-protected:
-    std::vector<_smart_ptr<CCryDXGLGIOutput> > m_kOutputs;
-    _smart_ptr<CCryDXGLGIFactory> m_spFactory;
-
-    _smart_ptr<NCryMetal::SAdapter> m_spGLAdapter;
-    DXGI_ADAPTER_DESC m_kDesc;
-    DXGI_ADAPTER_DESC1 m_kDesc1;
-    D3D_FEATURE_LEVEL m_eSupportedFeatureLevel;
-};
-
-#endif //__CRYMETALGLGIADAPTER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIFactory.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIFactory.cpp
deleted file mode 100644
index 97bae5f0c7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIFactory.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIFactory
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALGIFactory.hpp"
-#include "CCryDXMETALSwapChain.hpp"
-#include "../Interfaces/CCryDXMETALDevice.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-
-CCryDXGLGIFactory::CCryDXGLGIFactory()
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIFactory)
-    DXGL_INITIALIZE_INTERFACE(DXGIFactory1)
-}
-
-CCryDXGLGIFactory::~CCryDXGLGIFactory()
-{
-}
-
-bool CCryDXGLGIFactory::Initialize()
-{
-    std::vector<NCryMetal::SAdapterPtr> kAdapters;
-    if (!NCryMetal::DetectAdapters(kAdapters))
-    {
-        return false;
-    }
-
-    uint32 uAdapter;
-    for (uAdapter = 0; uAdapter < kAdapters.size(); ++uAdapter)
-    {
-        _smart_ptr<CCryDXGLGIAdapter> spAdapter(new CCryDXGLGIAdapter(this, kAdapters.at(uAdapter).get()));
-        if (!spAdapter->Initialize())
-        {
-            return false;
-        }
-        m_kAdapters.push_back(spAdapter);
-    }
-
-    return true;
-}
-
-template <typename AdapterInterface>
-HRESULT EnumAdaptersInternal(UINT Adapter, AdapterInterface** ppAdapter, const std::vector<_smart_ptr<CCryDXGLGIAdapter> >& kAdapters)
-{
-    if (Adapter < kAdapters.size())
-    {
-        CCryDXGLGIAdapter::ToInterface(ppAdapter, kAdapters.at(Adapter));
-        return S_OK;
-    }
-    *ppAdapter = NULL;
-    return DXGI_ERROR_NOT_FOUND;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIFactory implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIFactory::EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter)
-{
-    return EnumAdaptersInternal(Adapter, ppAdapter, m_kAdapters);
-}
-
-HRESULT CCryDXGLGIFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags)
-{
-    DXGL_TODO("Implement ALT+ENTER handling in OpenGL if required")
-    Flags;
-
-    m_hWindowHandle = WindowHandle;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIFactory::GetWindowAssociation(HWND* pWindowHandle)
-{
-    *pWindowHandle = m_hWindowHandle;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIFactory::CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain)
-{
-    void* pvD3D11Device;
-    if (FAILED(pDevice->QueryInterface(__uuidof(ID3D11Device), &pvD3D11Device)) || pvD3D11Device == NULL)
-    {
-        DXGL_ERROR("CCryDXGLGIFactory::CreateSwapChain - device type is not compatible with swap chain creation");
-        return E_FAIL;
-    }
-    CCryDXGLDevice* pDXGLDevice(CCryDXGLDevice::FromInterface(static_cast<ID3D11Device*>(pvD3D11Device)));
-
-    _smart_ptr<CCryDXGLSwapChain> spSwapChain(new CCryDXGLSwapChain(pDXGLDevice, *pDesc));
-    if (!spSwapChain->Initialize())
-    {
-        return false;
-    }
-    CCryDXGLSwapChain::ToInterface(ppSwapChain, spSwapChain);
-    spSwapChain->AddRef();
-
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIFactory::CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIFactory1 implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIFactory::EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter)
-{
-    return EnumAdaptersInternal(Adapter, ppAdapter, m_kAdapters);
-}
-
-BOOL CCryDXGLGIFactory::IsCurrent()
-{
-    DXGL_NOT_IMPLEMENTED
-    return false;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIFactory.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIFactory.hpp
deleted file mode 100644
index 805607dc94..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIFactory.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGIFactory
-
-#ifndef __CRYMETALGLGIFACTORY__
-#define __CRYMETALGLGIFACTORY__
-
-#include "CCryDXMETALGIObject.hpp"
-
-class CCryDXGLGIAdapter;
-
-class CCryDXGLGIFactory
-    : public CCryDXGLGIObject
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIFactory, DXGIFactory)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIFactory, DXGIFactory1)
-
-    CCryDXGLGIFactory();
-    ~CCryDXGLGIFactory();
-    bool Initialize();
-
-    // IDXGIFactory implementation
-    HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter);
-    HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags);
-    HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle);
-    HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain);
-    HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter);
-
-    // IDXGIFactory1 implementation
-    HRESULT STDMETHODCALLTYPE EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter);
-    BOOL STDMETHODCALLTYPE IsCurrent();
-protected:
-    typedef std::vector<_smart_ptr<CCryDXGLGIAdapter> > Adapters;
-protected:
-    // The adapters available on this system
-    Adapters m_kAdapters;
-    HWND m_hWindowHandle;
-};
-
-#endif //__CRYMETALGLGIFACTORY__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIObject.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIObject.cpp
deleted file mode 100644
index 4073f645a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIObject.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIObject
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALGIObject.hpp"
-#include "../Implementation/GLCommon.hpp"
-
-
-CCryDXGLGIObject::CCryDXGLGIObject()
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIObject)
-}
-
-CCryDXGLGIObject::~CCryDXGLGIObject()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIObject implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIObject::SetPrivateData(REFGUID Name, UINT DataSize, const void* pData)
-{
-    return m_kPrivateDataContainer.SetPrivateData(Name, DataSize, pData);
-}
-
-HRESULT CCryDXGLGIObject::SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown)
-{
-    return m_kPrivateDataContainer.SetPrivateDataInterface(Name, pUnknown);
-}
-
-HRESULT CCryDXGLGIObject::GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData)
-{
-    return m_kPrivateDataContainer.GetPrivateData(Name, pDataSize, pData);
-}
-
-HRESULT CCryDXGLGIObject::GetParent(REFIID riid, void** ppParent)
-{
-    DXGL_TODO("Implement if required")
-    * ppParent = NULL;
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIObject.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIObject.hpp
deleted file mode 100644
index 49e6417023..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIObject.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGIObject
-
-#ifndef __CRYMETALGLGIOBJECT__
-#define __CRYMETALGLGIOBJECT__
-
-#include "CCryDXMETALBase.hpp"
-
-
-class CCryDXGLGIObject
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIObject, DXGIObject)
-
-    CCryDXGLGIObject();
-    virtual ~CCryDXGLGIObject();
-
-    // IDXGIObject implementation
-    HRESULT SetPrivateData(REFGUID Name, UINT DataSize, const void* pData);
-    HRESULT SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown);
-    HRESULT GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData);
-    HRESULT GetParent(REFIID riid, void** ppParent);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLGIObject>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-
-protected:
-    CCryDXGLPrivateDataContainer m_kPrivateDataContainer;
-};
-
-#endif //__CRYMETALGLGIOBJECT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIOutput.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIOutput.cpp
deleted file mode 100644
index 85ed885a55..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIOutput.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGIOutput
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALGIOutput.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-
-CCryDXGLGIOutput::CCryDXGLGIOutput()
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIOutput)
-}
-
-CCryDXGLGIOutput::~CCryDXGLGIOutput()
-{
-}
-
-bool CCryDXGLGIOutput::Initialize()
-{
-    ZeroMemory(&m_OutputDesc, sizeof(m_OutputDesc));
-    mbstowcs(m_OutputDesc.DeviceName, "Metal Device", DXGL_ARRAY_SIZE(m_OutputDesc.DeviceName));
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGIOutput implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLGIOutput::GetDesc(DXGI_OUTPUT_DESC* pDesc)
-{
-    *pDesc = m_OutputDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLGIOutput::GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::WaitForVBlank(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::TakeOwnership(IUnknown* pDevice, BOOL Exclusive)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-void CCryDXGLGIOutput::ReleaseOwnership(void)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-HRESULT CCryDXGLGIOutput::GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::SetGammaControl(const DXGI_GAMMA_CONTROL* pArray)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::GetGammaControl(DXGI_GAMMA_CONTROL* pArray)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::SetDisplaySurface(IDXGISurface* pScanoutSurface)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::GetDisplaySurfaceData(IDXGISurface* pDestination)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLGIOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIOutput.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIOutput.hpp
deleted file mode 100644
index e5e21ead7e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALGIOutput.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGIOutput
-
-#ifndef __CRYMETALGLGIOUTPUT__
-#define __CRYMETALGLGIOUTPUT__
-
-#include "CCryDXMETALGIObject.hpp"
-
-class CCryDXGLGIOutput
-    : public CCryDXGLGIObject
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGIOutput, DXGIOutput)
-
-    CCryDXGLGIOutput();
-    virtual ~CCryDXGLGIOutput();
-
-    bool Initialize();
-
-    // IDXGIOutput implementation
-    HRESULT GetDesc(DXGI_OUTPUT_DESC* pDesc);
-    HRESULT GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc);
-    HRESULT FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice);
-    HRESULT WaitForVBlank(void);
-    HRESULT TakeOwnership(IUnknown* pDevice, BOOL Exclusive);
-    void ReleaseOwnership(void);
-    HRESULT GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps);
-    HRESULT SetGammaControl(const DXGI_GAMMA_CONTROL* pArray);
-    HRESULT GetGammaControl(DXGI_GAMMA_CONTROL* pArray);
-    HRESULT SetDisplaySurface(IDXGISurface* pScanoutSurface);
-    HRESULT GetDisplaySurfaceData(IDXGISurface* pDestination);
-    HRESULT GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats);
-
-protected:
-    DXGI_OUTPUT_DESC m_OutputDesc;
-};
-
-#endif //__CRYMETALGLGIOUTPUT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALInputLayout.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALInputLayout.cpp
deleted file mode 100644
index 1f35826658..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALInputLayout.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11InputLayout
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALInputLayout.hpp"
-#include "../Implementation/GLShader.hpp"
-
-
-CCryDXGLInputLayout::CCryDXGLInputLayout(NCryMetal::SInputLayout* pGLLayout, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spGLLayout(pGLLayout)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11InputLayout)
-}
-
-CCryDXGLInputLayout::~CCryDXGLInputLayout()
-{
-}
-
-NCryMetal::SInputLayout* CCryDXGLInputLayout::GetGLLayout()
-{
-    return m_spGLLayout;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALInputLayout.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALInputLayout.hpp
deleted file mode 100644
index be487d27c2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALInputLayout.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11InputLayout
-
-#ifndef __CRYMETALGLINPUTLAYOUT__
-#define __CRYMETALGLINPUTLAYOUT__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-namespace NCryMetal
-{
-    struct SInputLayout;
-}
-
-class CCryDXGLInputLayout
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLInputLayout, D3D11InputLayout)
-
-    CCryDXGLInputLayout(NCryMetal::SInputLayout* pGLLayout, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLInputLayout();
-
-    NCryMetal::SInputLayout* GetGLLayout();
-private:
-    _smart_ptr<NCryMetal::SInputLayout> m_spGLLayout;
-};
-
-#endif //__CRYMETALGLINPUTLAYOUT__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALQuery.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALQuery.cpp
deleted file mode 100644
index 7beb850f9b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALQuery.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Query
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALQuery.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-CCryDXGLQuery::CCryDXGLQuery(const D3D11_QUERY_DESC& kDesc, NCryMetal::SQuery* pGLQuery, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_spGLQuery(pGLQuery)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Asynchronous)
-    DXGL_INITIALIZE_INTERFACE(D3D11Query)
-}
-
-CCryDXGLQuery::~CCryDXGLQuery()
-{
-}
-
-NCryMetal::SQuery* CCryDXGLQuery::GetGLQuery()
-{
-    return m_spGLQuery;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Asynchronous implementation
-////////////////////////////////////////////////////////////////////////////////
-
-UINT CCryDXGLQuery::GetDataSize(void)
-{
-    return m_spGLQuery->GetDataSize();
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11Query implementation
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLQuery::GetDesc(D3D11_QUERY_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALQuery.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALQuery.hpp
deleted file mode 100644
index 0df668771c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALQuery.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Query
-
-#ifndef __CRYMETALGLQUERY__
-#define __CRYMETALGLQUERY__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-namespace NCryMetal
-{
-    struct SQuery;
-}
-
-class CCryDXGLQuery
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLQuery, D3D11Query)
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLQuery, D3D11Asynchronous)
-#endif //DXGL_FULL_EMULATION
-
-    CCryDXGLQuery(const D3D11_QUERY_DESC& kDesc, NCryMetal::SQuery* pGLQuery, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLQuery();
-
-    NCryMetal::SQuery* GetGLQuery();
-
-    // ID3D11Asynchronous implementation
-    UINT GetDataSize(void);
-
-    // ID3D11Query implementation
-    void GetDesc(D3D11_QUERY_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLQuery>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLDeviceChild::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_QUERY_DESC m_kDesc;
-    _smart_ptr<NCryMetal::SQuery> m_spGLQuery;
-};
-
-#endif //__CRYMETALGLQUERY__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRasterizerState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRasterizerState.cpp
deleted file mode 100644
index 0db9efae94..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRasterizerState.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11RasterizerState
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALRasterizerState.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-
-CCryDXGLRasterizerState::CCryDXGLRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_pGLState(new NCryMetal::SRasterizerState)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11RasterizerState)
-}
-
-CCryDXGLRasterizerState::~CCryDXGLRasterizerState()
-{
-    delete m_pGLState;
-}
-
-bool CCryDXGLRasterizerState::Initialize(CCryDXGLDevice* pDevice)
-{
-    return NCryMetal::InitializeRasterizerState(m_kDesc, *m_pGLState, pDevice->GetGLDevice());
-}
-
-bool CCryDXGLRasterizerState::Apply(NCryMetal::CContext* pContext)
-{
-    return pContext->SetRasterizerState(*m_pGLState);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11RasterizerState
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLRasterizerState::GetDesc(D3D11_RASTERIZER_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRasterizerState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRasterizerState.hpp
deleted file mode 100644
index da21f4d01d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRasterizerState.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11RasterizerState
-
-#ifndef __CRYMETALGLRASTERIZERSTATE__
-#define __CRYMETALGLRASTERIZERSTATE__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-namespace NCryMetal
-{
-    struct SRasterizerState;
-    class CContext;
-};
-
-class CCryDXGLRasterizerState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLRasterizerState, D3D11RasterizerState)
-
-    CCryDXGLRasterizerState(const D3D11_RASTERIZER_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLRasterizerState();
-
-    bool Initialize(CCryDXGLDevice* pDevice);
-    bool Apply(NCryMetal::CContext* pContext);
-
-    // Implementation of ID3D11RasterizerState
-    void GetDesc(D3D11_RASTERIZER_DESC* pDesc);
-protected:
-    D3D11_RASTERIZER_DESC m_kDesc;
-    NCryMetal::SRasterizerState* m_pGLState;
-};
-
-#endif //__CRYMETALGLRASTERIZERSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRenderTargetView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRenderTargetView.cpp
deleted file mode 100644
index df5d746e5d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRenderTargetView.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11RenderTargetView
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALRenderTargetView.hpp"
-#include "CCryDXMETALResource.hpp"
-#include "../Implementation/MetalDevice.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-CCryDXGLRenderTargetView::CCryDXGLRenderTargetView(CCryDXGLResource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11RenderTargetView)
-}
-
-CCryDXGLRenderTargetView::~CCryDXGLRenderTargetView()
-{
-}
-
-bool CCryDXGLRenderTargetView::Initialize(NCryMetal::CDevice* pDevice)
-{
-    D3D11_RESOURCE_DIMENSION eDimension;
-    m_spResource->GetType(&eDimension);
-    m_spGLView = NCryMetal::CreateRenderTargetView(m_spResource->GetGLResource(), eDimension, m_kDesc, pDevice);
-    return m_spGLView != NULL;
-}
-
-NCryMetal::SOutputMergerView* CCryDXGLRenderTargetView::GetGLView()
-{
-    return m_spGLView;
-}
-
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11RenderTargetView
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLRenderTargetView::GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRenderTargetView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRenderTargetView.hpp
deleted file mode 100644
index 5ffab07b56..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALRenderTargetView.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11RenderTargetView
-
-#ifndef __CRYMETALGLRENDERTARGETVIEW__
-#define __CRYMETALGLRENDERTARGETVIEW__
-
-#include "CCryDXMETALView.hpp"
-
-namespace NCryMetal
-{
-    struct SOutputMergerView;
-    class CContext;
-}
-
-class CCryDXGLRenderTargetView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLRenderTargetView, D3D11RenderTargetView)
-
-    CCryDXGLRenderTargetView(CCryDXGLResource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLRenderTargetView();
-
-    bool Initialize(NCryMetal::CDevice* pDevice);
-    NCryMetal::SOutputMergerView* GetGLView();
-
-    // Implementation of ID3D11RenderTargetView
-    void GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc);
-private:
-    D3D11_RENDER_TARGET_VIEW_DESC m_kDesc;
-    _smart_ptr<NCryMetal::SOutputMergerView> m_spGLView;
-};
-
-#endif //__CRYMETALGLRENDERTARGETVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALResource.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALResource.cpp
deleted file mode 100644
index 206642bcaa..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALResource.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Resource
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALResource.hpp"
-#include "../Implementation/GLResource.hpp"
-
-CCryDXGLResource::CCryDXGLResource(D3D11_RESOURCE_DIMENSION eDimension, NCryMetal::SResource* pGLResource, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spGLResource(pGLResource)
-    , m_eDimension(eDimension)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Resource)
-}
-
-CCryDXGLResource::~CCryDXGLResource()
-{
-}
-
-NCryMetal::SResource* CCryDXGLResource::GetGLResource()
-{
-    return m_spGLResource;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Resource
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLResource::GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension)
-{
-    *pResourceDimension = m_eDimension;
-}
-
-void CCryDXGLResource::SetEvictionPriority(UINT EvictionPriority)
-{
-    DXGL_NOT_IMPLEMENTED
-}
-
-UINT CCryDXGLResource::GetEvictionPriority(void)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALResource.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALResource.hpp
deleted file mode 100644
index 98ad37d131..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALResource.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Resource
-
-#ifndef __CRYMETALGLRESOURCE__
-#define __CRYMETALGLRESOURCE__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-namespace NCryMetal
-{
-    class CDevice;
-    struct SResource;
-};
-
-class CCryDXGLResource
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLResource, D3D11Resource)
-
-    virtual ~CCryDXGLResource();
-
-    NCryMetal::SResource* GetGLResource();
-
-    // Implementation of ID3D11Resource
-    void GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension);
-    void SetEvictionPriority(UINT EvictionPriority);
-    UINT GetEvictionPriority(void);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLResource>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLDeviceChild::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLResource(D3D11_RESOURCE_DIMENSION eDimension, NCryMetal::SResource* pResource, CCryDXGLDevice* pDevice);
-protected:
-    _smart_ptr<NCryMetal::SResource> m_spGLResource;
-    D3D11_RESOURCE_DIMENSION m_eDimension;
-};
-
-#endif //__CRYMETALGLRESOURCE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSamplerState.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSamplerState.cpp
deleted file mode 100644
index e7717d14fa..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSamplerState.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11SamplerState
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALSamplerState.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "../Implementation/GLState.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-
-CCryDXGLSamplerState::CCryDXGLSamplerState(const D3D11_SAMPLER_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_kDesc(kDesc)
-    , m_MetalSamplerState(nil)
-    , m_MetalSamplerDescriptor(nil)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11SamplerState)
-}
-
-CCryDXGLSamplerState::~CCryDXGLSamplerState()
-{
-    if (m_MetalSamplerDescriptor)
-    {
-        [m_MetalSamplerDescriptor release];
-        m_MetalSamplerDescriptor = nil;
-    }
-    
-    if (m_MetalSamplerState)
-    {
-        [m_MetalSamplerState release];
-        m_MetalSamplerState = nil;
-    }
-}
-
-bool CCryDXGLSamplerState::Initialize(CCryDXGLDevice* pDevice)
-{
-    m_pDevice = pDevice;
-    m_MetalSamplerDescriptor = [[MTLSamplerDescriptor alloc] init];
-    return NCryMetal::InitializeSamplerState(m_kDesc, m_MetalSamplerState, m_MetalSamplerDescriptor, pDevice->GetGLDevice());
-}
-
-void CCryDXGLSamplerState::Apply(uint32 uStage, uint32 uSlot, NCryMetal::CContext* pContext)
-{
-    pContext->SetSampler(m_MetalSamplerState, uStage, uSlot);
-}
-
-void CCryDXGLSamplerState::SetLodMinClamp(float lodMinClamp)
-{
-    //You can either release the MTLSamplerDescriptor object or modify its property values and reuse it to create more MTLSamplerState objects.
-    //The descriptor's properties are only used during object creation; once created the behavior of a sampler state object is fixed and cannot be changed.
-    //Hence we delete the old sampler state and create a new one if any property needs to be changed.
-    if (m_MetalSamplerState)
-    {
-        [m_MetalSamplerState release];
-        m_MetalSamplerState = nil;
-    }
-    NCryMetal::SetLodMinClamp(m_MetalSamplerState, m_MetalSamplerDescriptor, lodMinClamp, m_pDevice->GetGLDevice());
-}
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11SamplerState
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLSamplerState::GetDesc(D3D11_SAMPLER_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSamplerState.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSamplerState.hpp
deleted file mode 100644
index caf53e6de3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSamplerState.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11SamplerState
-
-#ifndef __CRYMETALGLSAMPLERSTATE__
-#define __CRYMETALGLSAMPLERSTATE__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-
-@protocol MTLSamplerState;
-#import <Metal/MTLSampler.h>
-
-namespace NCryMetal
-{
-    struct SSamplerState;
-    class CContext;
-}
-
-class CCryDXGLSamplerState
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSamplerState, D3D11SamplerState)
-
-    CCryDXGLSamplerState(const D3D11_SAMPLER_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLSamplerState();
-
-    bool Initialize(CCryDXGLDevice* pDevice);
-    void Apply(uint32 uStage, uint32 uSlot, NCryMetal::CContext* pContext);
-
-    void SetLodMinClamp(float lodMinClamp);
-    void GetDesc(D3D11_SAMPLER_DESC* pDesc);
-protected:
-    D3D11_SAMPLER_DESC m_kDesc;
-    
-    id<MTLSamplerState> m_MetalSamplerState;
-    MTLSamplerDescriptor* m_MetalSamplerDescriptor;
-    CCryDXGLDevice* m_pDevice;
-};
-
-#endif //__CRYMETALGLSAMPLERSTATE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShader.cpp
deleted file mode 100644
index 234394058e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShader.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for D3D11 shader interfaces
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALShader.hpp"
-#include "../Implementation/GLShader.hpp"
-
-CCryDXGLShader::CCryDXGLShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spGLShader(pGLShader)
-{
-}
-
-CCryDXGLShader::~CCryDXGLShader()
-{
-}
-
-NCryMetal::SShader* CCryDXGLShader::GetGLShader()
-{
-    return m_spGLShader.get();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShader.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShader.hpp
deleted file mode 100644
index 6527c035d3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShader.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for D3D11 shader interfaces
-
-#ifndef __CRYMETALGLSHADER__
-#define __CRYMETALGLSHADER__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-namespace NCryMetal
-{
-    struct SShader;
-}
-
-class CCryDXGLShader
-    : public CCryDXGLDeviceChild
-{
-public:
-    CCryDXGLShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLShader();
-
-    NCryMetal::SShader* GetGLShader();
-private:
-    _smart_ptr<NCryMetal::SShader> m_spGLShader;
-};
-
-class CCryDXGLVertexShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLVertexShader, D3D11VertexShader)
-
-    CCryDXGLVertexShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11VertexShader)
-    }
-};
-
-class CCryDXGLHullShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLHullShader, D3D11HullShader)
-
-    CCryDXGLHullShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11HullShader)
-    }
-};
-
-class CCryDXGLDomainShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLDomainShader, D3D11DomainShader)
-
-    CCryDXGLDomainShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11DomainShader)
-    }
-};
-
-class CCryDXGLGeometryShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLGeometryShader, D3D11GeometryShader)
-
-    CCryDXGLGeometryShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11GeometryShader)
-    }
-};
-
-class CCryDXGLPixelShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLPixelShader, D3D11PixelShader)
-
-    CCryDXGLPixelShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11PixelShader)
-    }
-};
-
-class CCryDXGLComputeShader
-    : public CCryDXGLShader
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLComputeShader, D3D11ComputeShader)
-
-    CCryDXGLComputeShader(NCryMetal::SShader* pGLShader, CCryDXGLDevice* pDevice)
-        : CCryDXGLShader(pGLShader, pDevice)
-    {
-        DXGL_INITIALIZE_INTERFACE(D3D11ComputeShader)
-    }
-};
-
-#endif  //__CRYMETALGLSHADER__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderReflection.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderReflection.cpp
deleted file mode 100644
index 3609316894..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderReflection.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrappers for D3D11 shader
-//               reflection interfaces
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDeviceContext.hpp"
-#include "../Implementation/GLShader.hpp"
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionVariable
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLShaderReflectionVariable::Impl
-{
-    NCryMetal::SShaderReflectionVariable* m_pVariable;
-};
-
-CCryDXGLShaderReflectionVariable::CCryDXGLShaderReflectionVariable()
-    : m_pImpl(new Impl())
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflectionVariable)
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflectionType)
-}
-
-CCryDXGLShaderReflectionVariable::~CCryDXGLShaderReflectionVariable()
-{
-    delete m_pImpl;
-}
-
-bool CCryDXGLShaderReflectionVariable::Initialize(void* pvData)
-{
-    m_pImpl->m_pVariable = static_cast<NCryMetal::SShaderReflectionVariable*>(pvData);
-    return true;
-}
-
-#define _REFLECTION_IMPL m_pImpl->m_pVariable
-
-HRESULT CCryDXGLShaderReflectionVariable::GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc)
-{
-    (*pDesc) = _REFLECTION_IMPL->m_kDesc;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetType()
-{
-    ID3D11ShaderReflectionType* pType;
-    ToInterface(&pType, this);
-    return pType;
-}
-
-ID3D11ShaderReflectionConstantBuffer* CCryDXGLShaderReflectionVariable::GetBuffer()
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-UINT CCryDXGLShaderReflectionVariable::GetInterfaceSlot(UINT uArrayIndex)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::GetDesc(D3D11_SHADER_TYPE_DESC* pDesc)
-{
-    (*pDesc) = _REFLECTION_IMPL->m_kType;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetMemberTypeByIndex(UINT Index)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetMemberTypeByName(LPCSTR Name)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-LPCSTR CCryDXGLShaderReflectionVariable::GetMemberTypeName(UINT Index)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::IsEqual(ID3D11ShaderReflectionType* pType)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetSubType()
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetBaseClass()
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-UINT CCryDXGLShaderReflectionVariable::GetNumInterfaces()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-ID3D11ShaderReflectionType* CCryDXGLShaderReflectionVariable::GetInterfaceByIndex(UINT uIndex)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::IsOfType(ID3D11ShaderReflectionType* pType)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLShaderReflectionVariable::ImplementsInterface(ID3D11ShaderReflectionType* pBase)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-#undef _REFLECTION_IMPL
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionConstBuffer
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLShaderReflectionConstBuffer::Impl
-{
-    typedef std::vector<_smart_ptr<CCryDXGLShaderReflectionVariable> > TVariables;
-    TVariables m_kVariables;
-    NCryMetal::SShaderReflectionConstBuffer* m_pConstBuffer;
-};
-
-CCryDXGLShaderReflectionConstBuffer::CCryDXGLShaderReflectionConstBuffer()
-    : m_pImpl(new Impl())
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflectionConstantBuffer)
-}
-
-CCryDXGLShaderReflectionConstBuffer::~CCryDXGLShaderReflectionConstBuffer()
-{
-    delete m_pImpl;
-}
-
-bool CCryDXGLShaderReflectionConstBuffer::Initialize(void* pvData)
-{
-    m_pImpl->m_pConstBuffer = static_cast<NCryMetal::SShaderReflectionConstBuffer*>(pvData);
-
-    NCryMetal::SShaderReflectionConstBuffer::TVariables::iterator kVarIter(m_pImpl->m_pConstBuffer->m_kVariables.begin());
-    const NCryMetal::SShaderReflectionConstBuffer::TVariables::iterator kVarEnd(m_pImpl->m_pConstBuffer->m_kVariables.end());
-    while (kVarIter != kVarEnd)
-    {
-        _smart_ptr<CCryDXGLShaderReflectionVariable> spVariable(new CCryDXGLShaderReflectionVariable());
-        m_pImpl->m_kVariables.push_back(spVariable);
-
-        if (!spVariable->Initialize(static_cast<void*>(&*kVarIter)))
-        {
-            return false;
-        }
-        ++kVarIter;
-    }
-    return true;
-}
-
-#define _REFLECTION_IMPL m_pImpl->m_pConstBuffer
-
-HRESULT CCryDXGLShaderReflectionConstBuffer::GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc)
-{
-    (*pDesc) = _REFLECTION_IMPL->m_kDesc;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionVariable* CCryDXGLShaderReflectionConstBuffer::GetVariableByIndex(UINT Index)
-{
-    if (Index >= m_pImpl->m_kVariables.size())
-    {
-        return NULL;
-    }
-    ID3D11ShaderReflectionVariable* pVariable;
-    CCryDXGLShaderReflectionVariable::ToInterface(&pVariable, m_pImpl->m_kVariables.at(Index));
-    return pVariable;
-}
-
-ID3D11ShaderReflectionVariable* CCryDXGLShaderReflectionConstBuffer::GetVariableByName(LPCSTR Name)
-{
-    Impl::TVariables::const_iterator kVarIter(m_pImpl->m_kVariables.begin());
-    const Impl::TVariables::const_iterator kVarEnd(m_pImpl->m_kVariables.end());
-    for (; kVarIter != kVarEnd; ++kVarIter)
-    {
-        D3D11_SHADER_VARIABLE_DESC kDesc;
-        if (FAILED((*kVarIter)->GetDesc(&kDesc)))
-        {
-            return NULL;
-        }
-        if (strcmp(kDesc.Name, Name) == 0)
-        {
-            ID3D11ShaderReflectionVariable* pVariable;
-            CCryDXGLShaderReflectionVariable::ToInterface(&pVariable, kVarIter->get());
-            return pVariable;
-        }
-    }
-    return NULL;
-}
-
-#undef _REFLECTION_IMPL
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflection
-////////////////////////////////////////////////////////////////////////////////
-
-struct CCryDXGLShaderReflection::Impl
-{
-    struct SResource
-    {
-        NCryMetal::SShaderReflectionResource* m_pResource;
-    };
-
-    struct SParameter
-    {
-        NCryMetal::SShaderReflectionParameter* m_pParameter;
-    };
-
-    typedef std::vector<_smart_ptr<CCryDXGLShaderReflectionConstBuffer> > TConstantBuffers;
-
-    TConstantBuffers m_kConstantBuffers;
-
-    NCryMetal::SShaderReflection m_kReflection;
-};
-
-CCryDXGLShaderReflection::CCryDXGLShaderReflection()
-    : m_pImpl(new Impl())
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderReflection)
-}
-
-CCryDXGLShaderReflection::~CCryDXGLShaderReflection()
-{
-    delete m_pImpl;
-}
-
-bool CCryDXGLShaderReflection::Initialize(const void* pvData)
-{
-    if (!InitializeShaderReflection(&m_pImpl->m_kReflection, pvData))
-    {
-        return false;
-    }
-
-    NCryMetal::SShaderReflection::TConstantBuffers::iterator kConstBufferIter(m_pImpl->m_kReflection.m_kConstantBuffers.begin());
-    const NCryMetal::SShaderReflection::TConstantBuffers::iterator kConstBufferEnd(m_pImpl->m_kReflection.m_kConstantBuffers.end());
-    while (kConstBufferIter != kConstBufferEnd)
-    {
-        _smart_ptr<CCryDXGLShaderReflectionConstBuffer> spConstBuffer(new CCryDXGLShaderReflectionConstBuffer());
-        if (!spConstBuffer->Initialize(static_cast<void*>(&*kConstBufferIter)))
-        {
-            return false;
-        }
-        m_pImpl->m_kConstantBuffers.push_back(spConstBuffer);
-        ++kConstBufferIter;
-    }
-    return true;
-}
-
-#define _REFLECTION_IMPL (&m_pImpl->m_kReflection)
-
-HRESULT CCryDXGLShaderReflection::GetDesc(D3D11_SHADER_DESC* pDesc)
-{
-    (*pDesc) = _REFLECTION_IMPL->m_kDesc;
-    return S_OK;
-}
-
-ID3D11ShaderReflectionConstantBuffer* CCryDXGLShaderReflection::GetConstantBufferByIndex(UINT Index)
-{
-    if (Index >= m_pImpl->m_kConstantBuffers.size())
-    {
-        return NULL;
-    }
-    ID3D11ShaderReflectionConstantBuffer* pConstantBuffer;
-    CCryDXGLShaderReflectionConstBuffer::ToInterface(&pConstantBuffer, m_pImpl->m_kConstantBuffers.at(Index));
-    return pConstantBuffer;
-}
-
-ID3D11ShaderReflectionConstantBuffer* CCryDXGLShaderReflection::GetConstantBufferByName(LPCSTR Name)
-{
-    Impl::TConstantBuffers::const_iterator kCBIter(m_pImpl->m_kConstantBuffers.begin());
-    const Impl::TConstantBuffers::const_iterator kCBEnd(m_pImpl->m_kConstantBuffers.end());
-    for (; kCBIter != kCBEnd; ++kCBIter)
-    {
-        D3D11_SHADER_BUFFER_DESC kDesc;
-        if (FAILED((*kCBIter)->GetDesc(&kDesc)))
-        {
-            return NULL;
-        }
-        if (strcmp(kDesc.Name, Name) == 0)
-        {
-            ID3D11ShaderReflectionConstantBuffer* pConstantBuffer;
-            CCryDXGLShaderReflectionConstBuffer::ToInterface(&pConstantBuffer, kCBIter->get());
-            return pConstantBuffer;
-        }
-    }
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflection::GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc)
-{
-    if (ResourceIndex >= _REFLECTION_IMPL->m_kResources.size())
-    {
-        return E_FAIL;
-    }
-    *pDesc = _REFLECTION_IMPL->m_kResources[ResourceIndex].m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLShaderReflection::GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc)
-{
-    if (ParameterIndex >= _REFLECTION_IMPL->m_kInputs.size())
-    {
-        return E_FAIL;
-    }
-    *pDesc = _REFLECTION_IMPL->m_kInputs[ParameterIndex].m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLShaderReflection::GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc)
-{
-    if (ParameterIndex >= _REFLECTION_IMPL->m_kOutputs.size())
-    {
-        return E_FAIL;
-    }
-    *pDesc = _REFLECTION_IMPL->m_kOutputs[ParameterIndex].m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLShaderReflection::GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-ID3D11ShaderReflectionVariable* CCryDXGLShaderReflection::GetVariableByName(LPCSTR Name)
-{
-    DXGL_NOT_IMPLEMENTED
-    return NULL;
-}
-
-HRESULT CCryDXGLShaderReflection::GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-UINT CCryDXGLShaderReflection::GetMovInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-UINT CCryDXGLShaderReflection::GetMovcInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-UINT CCryDXGLShaderReflection::GetConversionInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-UINT CCryDXGLShaderReflection::GetBitwiseInstructionCount()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-D3D_PRIMITIVE CCryDXGLShaderReflection::GetGSInputPrimitive()
-{
-    DXGL_NOT_IMPLEMENTED
-    return D3D_PRIMITIVE_TRIANGLE;
-}
-
-BOOL CCryDXGLShaderReflection::IsSampleFrequencyShader()
-{
-    DXGL_NOT_IMPLEMENTED
-    return FALSE;
-}
-
-UINT CCryDXGLShaderReflection::GetNumInterfaceSlots()
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-HRESULT CCryDXGLShaderReflection::GetMinFeatureLevel(enum D3D_FEATURE_LEVEL* pLevel)
-{
-    DXGL_NOT_IMPLEMENTED
-    return E_FAIL;
-}
-
-UINT CCryDXGLShaderReflection::GetThreadGroupSize(UINT* pSizeX, UINT* pSizeY, UINT* pSizeZ)
-{
-    DXGL_NOT_IMPLEMENTED
-    return 0;
-}
-
-#undef _REFLECTION_IMPL
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderReflection.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderReflection.hpp
deleted file mode 100644
index 673cf2dc21..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderReflection.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrappers for D3D11 shader
-//               reflection interfaces
-
-#ifndef __CRYMETALGLSHADERREFLECTION__
-#define __CRYMETALGLSHADERREFLECTION__
-
-#include "CCryDXMETALBase.hpp"
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionVariable
-////////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLShaderReflectionVariable
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflectionVariable, D3D11ShaderReflectionVariable)
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflectionVariable, D3D11ShaderReflectionType)
-#endif //DXGL_FULL_EMULATION
-
-    CCryDXGLShaderReflectionVariable();
-    virtual ~CCryDXGLShaderReflectionVariable();
-
-    bool Initialize(void* pvData);
-
-    // Implementation of ID3D11ShaderReflectionVariable
-    HRESULT GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc);
-    ID3D11ShaderReflectionType* GetType();
-    ID3D11ShaderReflectionConstantBuffer* GetBuffer();
-    UINT GetInterfaceSlot(UINT uArrayIndex);
-
-    // Implementation of ID3D11ShaderReflectionType
-    HRESULT GetDesc(D3D11_SHADER_TYPE_DESC* pDesc);
-    ID3D11ShaderReflectionType* GetMemberTypeByIndex(UINT Index);
-    ID3D11ShaderReflectionType* GetMemberTypeByName(LPCSTR Name);
-    LPCSTR GetMemberTypeName(UINT Index);
-    HRESULT IsEqual(ID3D11ShaderReflectionType* pType);
-    ID3D11ShaderReflectionType* GetSubType();
-    ID3D11ShaderReflectionType* GetBaseClass();
-    UINT GetNumInterfaces();
-    ID3D11ShaderReflectionType* GetInterfaceByIndex(UINT uIndex);
-    HRESULT IsOfType(ID3D11ShaderReflectionType* pType);
-    HRESULT ImplementsInterface(ID3D11ShaderReflectionType* pBase);
-
-    struct Impl;
-    Impl* m_pImpl;
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflectionConstBuffer
-////////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLShaderReflectionConstBuffer
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflectionConstBuffer, D3D11ShaderReflectionConstantBuffer)
-
-    CCryDXGLShaderReflectionConstBuffer();
-    virtual ~CCryDXGLShaderReflectionConstBuffer();
-
-    bool Initialize(void* pvData);
-
-    // Implementation of ID3D11ShaderReflectionConstantBuffer
-    HRESULT GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc);
-    ID3D11ShaderReflectionVariable* GetVariableByIndex(UINT Index);
-    ID3D11ShaderReflectionVariable* GetVariableByName(LPCSTR Name);
-
-    struct Impl;
-    Impl* m_pImpl;
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// CCryDXGLShaderReflection
-////////////////////////////////////////////////////////////////////////////////
-
-class CCryDXGLShaderReflection
-    : public CCryDXGLBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderReflection, D3D11ShaderReflection)
-
-    CCryDXGLShaderReflection();
-    virtual ~CCryDXGLShaderReflection();
-
-    bool Initialize(const void* pvData);
-
-    // Implementation of ID3D11ShaderReflection
-    HRESULT GetDesc(D3D11_SHADER_DESC* pDesc);
-    ID3D11ShaderReflectionConstantBuffer* GetConstantBufferByIndex(UINT Index);
-    ID3D11ShaderReflectionConstantBuffer* GetConstantBufferByName(LPCSTR Name);
-    HRESULT GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc);
-    HRESULT GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc);
-    HRESULT GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc);
-    HRESULT GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc);
-    ID3D11ShaderReflectionVariable* GetVariableByName(LPCSTR Name);
-    HRESULT GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc);
-    UINT GetMovInstructionCount();
-    UINT GetMovcInstructionCount();
-    UINT GetConversionInstructionCount();
-    UINT GetBitwiseInstructionCount();
-    D3D_PRIMITIVE GetGSInputPrimitive();
-    BOOL IsSampleFrequencyShader();
-    UINT GetNumInterfaceSlots();
-    HRESULT GetMinFeatureLevel(enum D3D_FEATURE_LEVEL* pLevel);
-    UINT GetThreadGroupSize(UINT* pSizeX, UINT* pSizeY, UINT* pSizeZ);
-
-    struct Impl;
-    Impl* m_pImpl;
-};
-
-#endif //__CRYMETALGLSHADERREFLECTION__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderResourceView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderResourceView.cpp
deleted file mode 100644
index 0ba8eb6733..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderResourceView.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11ShaderResourceView
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALShaderResourceView.hpp"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALResource.hpp"
-#include "../Implementation/GLResource.hpp"
-#include "../Implementation/MetalDevice.hpp"
-
-
-CCryDXGLShaderResourceView::CCryDXGLShaderResourceView(CCryDXGLResource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11ShaderResourceView)
-}
-
-CCryDXGLShaderResourceView::~CCryDXGLShaderResourceView()
-{
-}
-
-bool CCryDXGLShaderResourceView::Initialize(NCryMetal::CDevice* pDevice)
-{
-    D3D11_RESOURCE_DIMENSION eDimension;
-    m_spResource->GetType(&eDimension);
-    m_spGLView = NCryMetal::CreateShaderResourceView(m_spResource->GetGLResource(), eDimension, m_kDesc, pDevice);
-    return m_spGLView != NULL;
-}
-
-NCryMetal::SShaderResourceView* CCryDXGLShaderResourceView::GetGLView()
-{
-    return m_spGLView;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11ShaderResourceView
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLShaderResourceView::GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderResourceView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderResourceView.hpp
deleted file mode 100644
index 67bdfecf04..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALShaderResourceView.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11ShaderResourceView
-
-#ifndef __CRYMETALGLSHADERRESOURCEVIEW__
-#define __CRYMETALGLSHADERRESOURCEVIEW__
-
-#include "CCryDXMETALView.hpp"
-
-namespace NCryMetal
-{
-    struct SShaderResourceView;
-    class CContext;
-}
-
-class CCryDXGLShaderResourceView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLShaderResourceView, D3D11ShaderResourceView)
-
-    CCryDXGLShaderResourceView(CCryDXGLResource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLShaderResourceView();
-
-    bool Initialize(NCryMetal::CDevice* pDevice);
-    NCryMetal::SShaderResourceView* GetGLView();
-
-    // Implementation of ID3D11ShaderResourceView
-    void GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc);
-protected:
-    D3D11_SHADER_RESOURCE_VIEW_DESC m_kDesc;
-    _smart_ptr<NCryMetal::SShaderResourceView> m_spGLView;
-};
-
-#endif //__CRYMETALGLSHADERRESOURCEVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwapChain.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwapChain.cpp
deleted file mode 100644
index 4adf25c021..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwapChain.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for IDXGISwapChain
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALDevice.hpp"
-#include "CCryDXMETALGIOutput.hpp"
-#include "CCryDXMETALSwapChain.hpp"
-#include "CCryDXMETALTexture2D.hpp"
-#include "../Implementation/MetalDevice.hpp"
-#include "../Implementation/METALContext.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-#if defined(AZ_PLATFORM_MAC)
-#include <AppKit/AppKit.h>
-#else
-#include <UIKit/UIKit.h>
-#endif
-
-#include <Metal/Metal.h>
-#import <QuartzCore/CAMetalLayer.h>
-//  Confetti END: Igor Lobanchikov
-
-CCryDXGLSwapChain::CCryDXGLSwapChain(CCryDXGLDevice* pDevice, const DXGI_SWAP_CHAIN_DESC& kDesc)
-    : m_spDevice(pDevice)
-    , m_spBackBufferTexture(nullptr)
-    , m_spExposedBackBufferTexture(nullptr)
-    , m_Drawable(nullptr)
-    , m_currentView(nullptr)
-    //  Confetti BEGIN: Igor Lobanchikov
-    , m_pAutoreleasePool(0)
-    //  Confetti End: Igor Lobanchikov
-{
-    DXGL_INITIALIZE_INTERFACE(DXGIDeviceSubObject)
-    DXGL_INITIALIZE_INTERFACE(DXGISwapChain)
-
-    m_kDesc = kDesc;
-    CreateDrawableView();
-}
-
-CCryDXGLSwapChain::~CCryDXGLSwapChain()
-{
-}
-
-bool CCryDXGLSwapChain::Initialize()
-{
-    return UpdateTexture(true);
-}
-
-bool CCryDXGLSwapChain::CreateDrawableView()
-{
-    if (m_currentView != nullptr)
-    {
-        return false;
-    }
-
-    AZ_Assert(m_kDesc.OutputWindow != nullptr, "OutputWindow in the swap chain description is null. We are going to crash.");
-
-    if ([(id)m_kDesc.OutputWindow isKindOfClass:[NativeWindowType class]])
-    {
-        NativeWindowType* mainWindow = reinterpret_cast<NativeWindowType*>(m_kDesc.OutputWindow);
-        // Use the window's view as our own since the METALDevice class created
-        // it and not an outside tool like the editor
-#if defined(AZ_PLATFORM_MAC)
-        m_currentView = reinterpret_cast<MetalView*>([mainWindow.contentViewController view]);
-#else
-        m_currentView = reinterpret_cast<MetalView*>([mainWindow.rootViewController view]);
-#endif
-    }
-    else
-    {
-        NativeViewType* superView = reinterpret_cast<NativeViewType*>(m_kDesc.OutputWindow);
-        NCryMetal::CDevice* pDevice(m_spDevice->GetGLDevice());
-        // Use the superView bounds because we want the MetalView to appear at the origin of the
-        // superView
-        m_currentView = [[MetalView alloc] initWithFrame: [superView bounds]
-                                                   scale: 1.0f
-                                                  device: pDevice->GetMetalDevice()];
-        [superView addSubview: m_currentView];
-    }
-
-    return true;
-}
-
-bool CCryDXGLSwapChain::UpdateTexture(bool bSetPixelFormat)
-{
-    //  Igor: Propagate actual texture resolution back from the RT to swap chan
-    //  Check ho GL ES 3.0 does this
-    if (m_Drawable)
-    {
-        m_kDesc.BufferDesc.Width = min(m_kDesc.BufferDesc.Width, (UINT)m_Drawable.texture.width);
-        m_kDesc.BufferDesc.Height = min(m_kDesc.BufferDesc.Height, (UINT)m_Drawable.texture.height);
-    }
-
-    // Create a dummy texture that represents the default back buffer
-    D3D11_TEXTURE2D_DESC kBackBufferDesc;
-    kBackBufferDesc.Width = m_kDesc.BufferDesc.Width;
-    kBackBufferDesc.Height = m_kDesc.BufferDesc.Height;
-    kBackBufferDesc.MipLevels = 1;
-    kBackBufferDesc.ArraySize = 1;
-    kBackBufferDesc.Format = m_kDesc.BufferDesc.Format;
-    kBackBufferDesc.SampleDesc = m_kDesc.SampleDesc;
-    kBackBufferDesc.Usage = D3D11_USAGE_DEFAULT;
-    kBackBufferDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
-    kBackBufferDesc.CPUAccessFlags = 0;
-    kBackBufferDesc.MiscFlags = 0;
-
-    NCryMetal::SDefaultFrameBufferTexturePtr spBackBufferTex(NCryMetal::CreateBackBufferTexture(kBackBufferDesc));
-    m_spBackBufferTexture = new CCryDXGLTexture2D(kBackBufferDesc, spBackBufferTex, m_spDevice);
-    m_spBackBufferTexture->GetGLTexture()->m_bBackBuffer = true;
-
-    if (m_Drawable)
-    {
-        m_spBackBufferTexture->GetGLTexture()->m_Texture = m_Drawable.texture;
-    }
-    else
-    {
-        m_spBackBufferTexture->GetGLTexture()->m_Texture = nil;
-    }
-
-
-    //  Igor: this code is left here as a note about possible optimization.
-    //  At the moment it is not clear if keeping this code is optimization
-    //  or we will still need to copy data around at the different place at the
-    //  same or higher cost.
-    /*
-    if ( m_Drawable &&
-        ((m_kDesc.BufferDesc.Width == m_Drawable.texture.width) &&
-        (m_kDesc.BufferDesc.Height == m_Drawable.texture.height)))
-        m_spExposedBackBufferTexture = m_spBackBufferTexture;
-    else
-     */
-    {
-        // We need to release the existing texture before creating a new one.
-        SAFE_RELEASE(m_spExposedBackBufferTexture);
-        NCryMetal::STexturePtr spGLTexture(NCryMetal::CreateTexture2D(kBackBufferDesc, NULL, m_spDevice->GetGLDevice()));
-        m_spExposedBackBufferTexture = new CCryDXGLTexture2D(kBackBufferDesc, spGLTexture, m_spDevice);
-    }
-
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// IDXGISwapChain implementation
-////////////////////////////////////////////////////////////////////////////////
-
-HRESULT CCryDXGLSwapChain::Present(UINT SyncInterval, UINT Flags)
-{
-    NCryMetal::CDevice* pDevice(m_spDevice->GetGLDevice());
-    ID3D11DeviceContext* pContext;
-    m_spDevice->GetImmediateContext(&pContext);
-    
-    //  This forces clear if someone cleared RT but haven't not rendered anything before present.
-    CCryDXGLDeviceContext::FromInterface(pContext)->GetMetalContext()->FlushFrameBufferState();
-
-    //Just commit the main CB and get another commandbuffer to do the final upscale. This will help the
-    //gpu get started on the neext frame early and reduce latency.
-    CCryDXGLDeviceContext::FromInterface(pContext)->GetMetalContext()->Flush(nil, 0);
-    
-    if (!m_Drawable)
-    {
-        m_Drawable = [m_currentView.metalLayer nextDrawable];
-
-        if (m_Drawable)
-        {
-            m_spBackBufferTexture->GetGLTexture()->m_Texture = m_Drawable.texture;
-            [m_Drawable retain];
-        }
-        else
-        {
-            m_spBackBufferTexture->GetGLTexture()->m_Texture = nil;
-        }
-    }
-
-    //This assert is kept here as a reminder that m_Drawable can be NULL
-    CRY_ASSERT(m_Drawable);
-    
-    //  This essentially upscales virtual back buffer to the actual one.
-    if (m_Drawable && m_spExposedBackBufferTexture != m_spBackBufferTexture)
-    {
-        NCryMetal::CContext::CopyFilterType filterType = NCryMetal::CContext::POINT;
-        if (1 == CRenderer::CV_r_UpscalingQuality)
-        {
-            filterType = NCryMetal::CContext::BILINEAR;
-        }
-        else if (2 == CRenderer::CV_r_UpscalingQuality)
-        {
-            filterType = NCryMetal::CContext::BICUBIC;
-        }
-        else if (3 == CRenderer::CV_r_UpscalingQuality)
-        {
-            filterType = NCryMetal::CContext::LANCZOS;
-        }
-
-        bool bRes = CCryDXGLDeviceContext::FromInterface(pContext)->GetMetalContext()->
-                TrySlowCopySubresource(m_spBackBufferTexture->GetGLTexture(), 0, 0, 0, 0,
-                m_spExposedBackBufferTexture->GetGLTexture(), 0, 0, filterType);
-
-        //  Make sure copy actually happens.
-        CRY_ASSERT(bRes);
-    
-    }
-
-    float syncInterval = 0.0f;
-    static ICVar* vSyncCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("r_Vsync"): nullptr;
-    static ICVar* sysMaxFPSCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_MaxFPS") : nullptr;
-    if (sysMaxFPSCVar && vSyncCVar)
-    {
-        const int32 maxFPS = sysMaxFPSCVar->GetIVal();
-        uint32 vSync = vSyncCVar->GetIVal();
-        if (maxFPS > 0 && vSync != 0)
-        {
-            syncInterval = 1.0f/maxFPS;
-        }
-    }
-
-    //  This commits command buffer.
-    CCryDXGLDeviceContext::FromInterface(pContext)->GetMetalContext()->Flush(m_Drawable, syncInterval);
-
-    pContext->Release();
-    [m_Drawable release];
-    m_Drawable = nil;
-    
-    {
-        ID3D11DeviceContext* pContext;
-        m_spDevice->GetImmediateContext(&pContext);
-
-        //  Create a new command buffer here. Can't do this on flush because need to do present, then insertDebugCaptureBoundary first.
-        //  Although it is perfectly ok to flush then create a new command buffer, then do present and mark the end of frame,
-        //  XCode frame capture won't work at all in this case.
-        CCryDXGLDeviceContext::FromInterface(pContext)->GetMetalContext()->InitMetalFrameResources();
-
-        pContext->Release();
-    }
-
-    FlushAutoreleasePool();
-
-    return pDevice->Present();
-}
-
-HRESULT CCryDXGLSwapChain::GetBuffer(UINT Buffer, REFIID riid, void** ppSurface)
-{
-    if (Buffer == 0 && riid == __uuidof(ID3D11Texture2D))
-    {
-        m_spExposedBackBufferTexture->AddRef();
-        CCryDXGLTexture2D::ToInterface(reinterpret_cast<ID3D11Texture2D**>(ppSurface), m_spExposedBackBufferTexture.get());
-        return S_OK;
-    }
-    DXGL_TODO("Support more than one swap chain buffer if required");
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc)
-{
-    (*pDesc) = m_kDesc;
-    return S_OK;
-}
-
-HRESULT CCryDXGLSwapChain::ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT Format, UINT SwapChainFlags)
-{
-    // MS Documentation states that a buffer count of 0 means to use the same
-    // number of existing buffers
-    BufferCount = BufferCount == 0 ? m_kDesc.BufferCount : BufferCount;
-
-    if (
-        Format         == m_kDesc.BufferDesc.Format &&
-        Width          == m_kDesc.BufferDesc.Width  &&
-        Height         == m_kDesc.BufferDesc.Height &&
-        BufferCount    == m_kDesc.BufferCount       &&
-        SwapChainFlags == m_kDesc.Flags)
-    {
-        return S_OK; // Nothing to do
-    }
-
-    if (BufferCount == m_kDesc.BufferCount)
-    {
-        m_kDesc.BufferDesc.Format = Format;
-        m_kDesc.BufferDesc.Width  = Width;
-        m_kDesc.BufferDesc.Height = Height;
-        m_kDesc.Flags             = SwapChainFlags;
-
-        if (UpdateTexture(false))
-        {
-            CGSize drawableSize = CGSizeMake(Width, Height);
-            [m_currentView setFrameSize: drawableSize];
-            return S_OK;
-        }
-    }
-
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetContainingOutput(IDXGIOutput** ppOutput)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-HRESULT CCryDXGLSwapChain::GetLastPresentCount(UINT* pLastPresentCount)
-{
-    DXGL_NOT_IMPLEMENTED;
-    return E_FAIL;
-}
-
-void CCryDXGLSwapChain::FlushAutoreleasePool()
-{
-    if (m_pAutoreleasePool)
-    {
-        [(NSAutoreleasePool*)m_pAutoreleasePool release];
-        m_pAutoreleasePool = nullptr;
-    }
-}
-
-void CCryDXGLSwapChain::TryCreateAutoreleasePool()
-{
-    if (!m_pAutoreleasePool)
-    {
-        m_pAutoreleasePool = [[NSAutoreleasePool alloc] init];
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwapChain.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwapChain.hpp
deleted file mode 100644
index b6a307c580..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwapChain.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for IDXGISwapChain
-
-#ifndef __CRYMETALGLSWAPCHAIN__
-#define __CRYMETALGLSWAPCHAIN__
-
-#include "CCryDXMETALBase.hpp"
-#include "CCryDXMETALGIObject.hpp"
-
-@protocol CAMetalDrawable;
-
-
-namespace NCryMetal
-{
-    class CDeviceContextProxy;
-}
-
-class CCryDXGLDevice;
-class CCryDXGLTexture2D;
-
-@class MetalView;
-
-class CCryDXGLSwapChain
-    : public CCryDXGLGIObject
-{
-public:
-#if DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSwapChain, DXGIDeviceSubObject)
-#endif //DXGL_FULL_EMULATION
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSwapChain, DXGISwapChain)
-
-    CCryDXGLSwapChain(CCryDXGLDevice* pDevice, const DXGI_SWAP_CHAIN_DESC& kDesc);
-    ~CCryDXGLSwapChain();
-
-    bool Initialize();
-
-    // IDXGISwapChain implementation
-    HRESULT STDMETHODCALLTYPE Present(UINT SyncInterval, UINT Flags);
-    HRESULT STDMETHODCALLTYPE GetBuffer(UINT Buffer, REFIID riid, void** ppSurface);
-    HRESULT STDMETHODCALLTYPE SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget);
-    HRESULT STDMETHODCALLTYPE GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget);
-    HRESULT STDMETHODCALLTYPE GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc);
-    HRESULT STDMETHODCALLTYPE ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags);
-    HRESULT STDMETHODCALLTYPE ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters);
-    HRESULT STDMETHODCALLTYPE GetContainingOutput(IDXGIOutput** ppOutput);
-    HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats);
-    HRESULT STDMETHODCALLTYPE GetLastPresentCount(UINT* pLastPresentCount);
-
-    // IDXGIDeviceSubObject implementation
-    HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) { return E_NOTIMPL; }
-
-    void    TryCreateAutoreleasePool();
-    void    FlushAutoreleasePool();
-
-protected:
-    bool CreateDrawableView();
-    bool UpdateTexture(bool bSetPixelFormat);
-protected:
-    _smart_ptr<CCryDXGLDevice> m_spDevice;
-    _smart_ptr<CCryDXGLTexture2D> m_spBackBufferTexture;
-    _smart_ptr<CCryDXGLTexture2D> m_spExposedBackBufferTexture;
-    DXGI_SWAP_CHAIN_DESC m_kDesc;
-
-    MetalView* m_currentView;
-
-    id<CAMetalDrawable> m_Drawable;
-
-    void* m_pAutoreleasePool;
-};
-
-#endif //__CRYMETALGLSWAPCHAIN__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwitchToRef.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwitchToRef.cpp
deleted file mode 100644
index 74070cb1f2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwitchToRef.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11SwitchToRef
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALSwitchToRef.hpp"
-#include "../Implementation/GLCommon.hpp"
-
-
-CCryDXGLSwitchToRef::CCryDXGLSwitchToRef(CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11SwitchToRef)
-}
-
-CCryDXGLSwitchToRef::~CCryDXGLSwitchToRef()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// ID3D11SwitchToRef implementation
-////////////////////////////////////////////////////////////////////////////////\
-// //
-BOOL CCryDXGLSwitchToRef::SetUseRef(BOOL UseRef)
-{
-    DXGL_NOT_IMPLEMENTED
-    return false;
-}
-
-BOOL CCryDXGLSwitchToRef::GetUseRef()
-{
-    DXGL_NOT_IMPLEMENTED
-    return false;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwitchToRef.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwitchToRef.hpp
deleted file mode 100644
index 5cbe41ec27..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALSwitchToRef.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11SwitchToRef
-
-#ifndef __CRYMETALGLSWITCHTOREF__
-#define __CRYMETALGLSWITCHTOREF__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-class CCryDXGLSwitchToRef
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLSwitchToRef, D3D11SwitchToRef)
-
-    CCryDXGLSwitchToRef(CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLSwitchToRef();
-
-    // ID3D11SwitchToRef implementation
-    BOOL SetUseRef(BOOL UseRef);
-    BOOL GetUseRef();
-};
-
-#endif //__CRYMETALGLSWITCHTOREF__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture1D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture1D.cpp
deleted file mode 100644
index 91be242357..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture1D.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Texture1D
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALTexture1D.hpp"
-
-
-CCryDXGLTexture1D::CCryDXGLTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION_TEXTURE1D, pGLTexture, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Texture1D)
-}
-
-CCryDXGLTexture1D::~CCryDXGLTexture1D()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Texture1D
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLTexture1D::GetDesc(D3D11_TEXTURE1D_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture1D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture1D.hpp
deleted file mode 100644
index a818eaa05d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture1D.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Texture1D
-
-#ifndef __CRYMETALGLTEXTURE1D__
-#define __CRYMETALGLTEXTURE1D__
-
-#include "CCryDXMETALTextureBase.hpp"
-
-
-class CCryDXGLTexture1D
-    : public CCryDXGLTextureBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLTexture1D, D3D11Texture1D)
-
-    CCryDXGLTexture1D(const D3D11_TEXTURE1D_DESC& kDesc, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTexture1D();
-
-    // Implementation of ID3D11Texture1D
-    void GetDesc(D3D11_TEXTURE1D_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLTexture1D>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLTextureBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_TEXTURE1D_DESC m_kDesc;
-};
-
-#endif //__CRYMETALGLTEXTURE1D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture2D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture2D.cpp
deleted file mode 100644
index 25ee8358cc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture2D.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Texture2D
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALTexture2D.hpp"
-
-
-CCryDXGLTexture2D::CCryDXGLTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION_TEXTURE2D, pGLTexture, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Texture2D)
-}
-
-CCryDXGLTexture2D::~CCryDXGLTexture2D()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Texture2D
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLTexture2D::GetDesc(D3D11_TEXTURE2D_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture2D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture2D.hpp
deleted file mode 100644
index f497917fba..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture2D.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Texture2D
-
-#ifndef __CRYMETALGLTEXTURE2D__
-#define __CRYMETALGLTEXTURE2D__
-
-#include "CCryDXMETALTextureBase.hpp"
-
-
-class CCryDXGLTexture2D
-    : public CCryDXGLTextureBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLTexture2D, D3D11Texture2D)
-
-    CCryDXGLTexture2D(const D3D11_TEXTURE2D_DESC& kDesc, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTexture2D();
-
-    bool Initialize(const D3D11_SUBRESOURCE_DATA* pInitialData);
-
-    // Implementation of ID3D11Texture2D
-    void GetDesc(D3D11_TEXTURE2D_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLTexture2D>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLTextureBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_TEXTURE2D_DESC m_kDesc;
-};
-
-#endif //__CRYMETALGLTEXTURE2D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture3D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture3D.cpp
deleted file mode 100644
index 527a64a905..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture3D.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11Texture3D
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALTexture3D.hpp"
-
-
-CCryDXGLTexture3D::CCryDXGLTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION_TEXTURE3D, pGLTexture, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11Texture3D)
-}
-
-CCryDXGLTexture3D::~CCryDXGLTexture3D()
-{
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11Texture3D
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLTexture3D::GetDesc(D3D11_TEXTURE3D_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture3D.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture3D.hpp
deleted file mode 100644
index 8707218358..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTexture3D.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11Texture3D
-
-#ifndef __CRYMETALGLTEXTURE3D__
-#define __CRYMETALGLTEXTURE3D__
-
-#include "CCryDXMETALTextureBase.hpp"
-
-
-class CCryDXGLTexture3D
-    : public CCryDXGLTextureBase
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLTexture3D, D3D11Texture3D)
-
-    CCryDXGLTexture3D(const D3D11_TEXTURE3D_DESC& kDesc, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTexture3D();
-
-    // Implementation of ID3D11Texture3D
-    void GetDesc(D3D11_TEXTURE3D_DESC* pDesc);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLTexture3D>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLTextureBase::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-private:
-    D3D11_TEXTURE3D_DESC m_kDesc;
-};
-
-#endif //__CRYMETALGLTEXTURE3D__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTextureBase.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTextureBase.cpp
deleted file mode 100644
index 18e5ad983e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTextureBase.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL common base class for textures
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALTextureBase.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-CCryDXGLTextureBase::CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION eDimension, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice)
-    : CCryDXGLResource(eDimension, pGLTexture, pDevice)
-{
-}
-
-CCryDXGLTextureBase::~CCryDXGLTextureBase()
-{
-}
-
-NCryMetal::STexture* CCryDXGLTextureBase::GetGLTexture()
-{
-    return static_cast<NCryMetal::STexture*>(m_spGLResource.get());
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTextureBase.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTextureBase.hpp
deleted file mode 100644
index 6360182b03..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALTextureBase.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL common base class for textures
-
-#ifndef __CRYMETALGLTEXTUREBASE__
-#define __CRYMETALGLTEXTUREBASE__
-
-#include "CCryDXMETALResource.hpp"
-
-namespace NCryMetal
-{
-    struct STexture;
-};
-
-class CCryDXGLTextureBase
-    : public CCryDXGLResource
-{
-public:
-    CCryDXGLTextureBase(D3D11_RESOURCE_DIMENSION eDimension, NCryMetal::STexture* pGLTexture, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLTextureBase();
-
-    NCryMetal::STexture* GetGLTexture();
-};
-
-#endif //__CRYMETALGLTEXTUREBASE__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.cpp
deleted file mode 100644
index a53ce0f4b6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11UnorderedAccessView
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALUnorderedAccessView.hpp"
-#include "../Implementation/GLResource.hpp"
-
-CCryDXGLUnorderedAccessView::CCryDXGLUnorderedAccessView(CCryDXGLResource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice)
-    : CCryDXGLView(pResource, pDevice)
-    , m_kDesc(kDesc)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11UnorderedAccessView)
-}
-
-CCryDXGLUnorderedAccessView::~CCryDXGLUnorderedAccessView()
-{
-}
-
-NCryMetal::SBuffer* CCryDXGLUnorderedAccessView::GetGLBuffer()
-{
-    return static_cast<NCryMetal::SBuffer*>(m_spResource->GetGLResource());
-}
-
-NCryMetal::STexture* CCryDXGLUnorderedAccessView::GetGLTexture()
-{
-    return static_cast<NCryMetal::STexture*>(m_spResource->GetGLResource());
-}
-
-////////////////////////////////////////////////////////////////
-// Implementation of ID3D11UnorderedAccessView
-////////////////////////////////////////////////////////////////
-
-void CCryDXGLUnorderedAccessView::GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc)
-{
-    *pDesc = m_kDesc;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.hpp
deleted file mode 100644
index 61c81cce11..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//  Description: Declaration of the DXGL wrapper for ID3D11UnorderedAccessView
-
-#ifndef __CRYMETALGLUNORDEREDACCESSVIEW__
-#define __CRYMETALGLUNORDEREDACCESSVIEW__
-
-#include "CCryDXMETALView.hpp"
-namespace NCryMetal
-{
-    struct SBuffer;
-    struct STexture;
-}
-class CCryDXGLUnorderedAccessView
-    : public CCryDXGLView
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLUnorderedAccessView, D3D11UnorderedAccessView)
-
-    CCryDXGLUnorderedAccessView(CCryDXGLResource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC& kDesc, CCryDXGLDevice* pDevice);
-    virtual ~CCryDXGLUnorderedAccessView();
-    NCryMetal::SBuffer* GetGLBuffer();
-    NCryMetal::STexture* GetGLTexture();
-
-    // Implementation of ID3D11UnorderedAccessView
-    void GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc);
-protected:
-    D3D11_UNORDERED_ACCESS_VIEW_DESC m_kDesc;
-};
-
-#endif //__CRYMETALGLUNORDEREDACCESSVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALView.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALView.cpp
deleted file mode 100644
index 33bf3d9b6a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALView.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Definition of the DXGL wrapper for ID3D11View
-
-#include "RenderDll_precompiled.h"
-#include "CCryDXMETALView.hpp"
-#include "CCryDXMETALResource.hpp"
-#include "../Implementation/GLResource.hpp"
-
-
-CCryDXGLView::CCryDXGLView(CCryDXGLResource* pResource, CCryDXGLDevice* pDevice)
-    : CCryDXGLDeviceChild(pDevice)
-    , m_spResource(pResource)
-{
-    DXGL_INITIALIZE_INTERFACE(D3D11View)
-}
-
-CCryDXGLView::~CCryDXGLView()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation of ID3D11View
-////////////////////////////////////////////////////////////////////////////////
-
-void CCryDXGLView::GetResource(ID3D11Resource** ppResource)
-{
-    if (m_spResource != NULL)
-    {
-        m_spResource->AddRef();
-    }
-    CCryDXGLResource::ToInterface(ppResource, m_spResource);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALView.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALView.hpp
deleted file mode 100644
index 97d5c7cfd0..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/CCryDXMETALView.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Declaration of the DXGL wrapper for ID3D11View
-
-#ifndef __CRYMETALGLVIEW__
-#define __CRYMETALGLVIEW__
-
-#include "CCryDXMETALDeviceChild.hpp"
-
-class CCryDXGLResource;
-
-class CCryDXGLView
-    : public CCryDXGLDeviceChild
-{
-public:
-    DXGL_IMPLEMENT_INTERFACE(CCryDXGLView, D3D11View)
-
-    virtual ~CCryDXGLView();
-
-    // Implementation of ID3D11View
-    void GetResource(ID3D11Resource** ppResource);
-
-#if !DXGL_FULL_EMULATION
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<CCryDXGLView>::Query(this, riid, ppvObject))
-        {
-            return S_OK;
-        }
-        return CCryDXGLDeviceChild::QueryInterface(riid, ppvObject);
-    }
-#endif //!DXGL_FULL_EMULATION
-protected:
-    CCryDXGLView(CCryDXGLResource* pResource, CCryDXGLDevice* pDevice);
-
-    _smart_ptr<CCryDXGLResource> m_spResource;
-};
-
-#endif //__CRYMETALGLVIEW__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/DXEmulation.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/DXEmulation.hpp
deleted file mode 100644
index ee40bf535c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Interfaces/DXEmulation.hpp
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Interface wrappers used for full DirectX emulation.
-
-#ifndef __DXEmulation__
-#define __DXEmulation__
-
-#if DXGL_FULL_EMULATION
-
-template <typename Interface>
-struct SingleInheritance
-{
-    typedef void TBase;
-};
-#define SINGLE_INHERITANCE(_Derived, _Base) template <> \
-    struct SingleInheritance<_Derived> { typedef _Base TBase; };
-
-template <typename Interface>
-struct SingleInheritanceInterface
-{
-    template <typename Object>
-    static bool Query(Object* pThis, REFIID riid, void** ppvObject)
-    {
-        if (SingleInterface<Interface>::template Query<Object>(pThis, riid, ppvObject))
-        {
-            return true;
-        }
-        return SingleInheritanceInterface<typename SingleInheritance<Interface>::TBase>::template Query<Object>(pThis, riid, ppvObject);
-    }
-};
-
-template <>
-struct SingleInheritanceInterface<void>
-{
-    template <typename Object>
-    static bool Query(Object* pThis, REFIID riid, void** ppvObject)
-    {
-        *ppvObject = NULL;
-        return false;
-    }
-};
-
-SINGLE_INHERITANCE(IUnknown, void)
-SINGLE_INHERITANCE(ID3D10Blob, IUnknown)
-SINGLE_INHERITANCE(ID3D11DeviceChild, IUnknown)
-SINGLE_INHERITANCE(ID3D11DepthStencilState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11BlendState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11RasterizerState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Resource, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Buffer, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11Texture1D, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11Texture2D, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11Texture3D, ID3D11Resource)
-SINGLE_INHERITANCE(ID3D11View, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11ShaderResourceView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11RenderTargetView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11DepthStencilView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11UnorderedAccessView, ID3D11View)
-SINGLE_INHERITANCE(ID3D11VertexShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11HullShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11DomainShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11GeometryShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11PixelShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11ComputeShader, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11InputLayout, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11SamplerState, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Asynchronous, ID3D11DeviceChild)
-SINGLE_INHERITANCE(ID3D11Query, ID3D11Asynchronous)
-SINGLE_INHERITANCE(ID3D11ShaderReflectionType, void)
-SINGLE_INHERITANCE(ID3D11ShaderReflectionVariable, void)
-SINGLE_INHERITANCE(ID3D11ShaderReflectionConstantBuffer, void)
-SINGLE_INHERITANCE(ID3D11ShaderReflection, IUnknown)
-SINGLE_INHERITANCE(IDXGIObject, IUnknown)
-SINGLE_INHERITANCE(IDXGIDeviceSubObject, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIOutput, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIAdapter, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIAdapter1, IDXGIAdapter)
-SINGLE_INHERITANCE(IDXGIFactory, IDXGIObject)
-SINGLE_INHERITANCE(IDXGIFactory1, IDXGIFactory)
-SINGLE_INHERITANCE(IDXGIDevice, IDXGIObject)
-SINGLE_INHERITANCE(IDXGISwapChain, IDXGIDeviceSubObject)
-SINGLE_INHERITANCE(ID3D11SwitchToRef, IUnknown)
-SINGLE_INHERITANCE(ID3D11Device, IUnknown)
-SINGLE_INHERITANCE(ID3D11DeviceContext, ID3D11DeviceChild)
-
-struct SAggregateNode
-{
-    SAggregateNode* m_pNext;
-
-    SAggregateNode()
-        : m_pNext(NULL)
-    {
-    }
-
-    void Insert(SAggregateNode* pHead)
-    {
-        m_pNext = pHead->m_pNext;
-        pHead->m_pNext = this;
-    }
-
-    virtual bool QueryInterfaceInternal(REFIID riid, void** ppvObject)
-    {
-        return false;
-    };
-};
-
-#define DXGL_WRAPPER_ROOT_NO_COM(_Interface)               \
-    typedef Impl TImpl;                                    \
-    TImpl* m_pImpl;                                        \
-    void InitializeWrapper(TImpl * pImpl)                  \
-    {                                                      \
-        m_pImpl = pImpl;                                   \
-        pImpl->m_pVirtual ## _Interface ## Wrapper = this; \
-    }
-#define DXGL_WRAPPER_ROOT(_Interface)                      \
-    typedef Impl TImpl;                                    \
-    TImpl* m_pImpl;                                        \
-    void InitializeWrapper(TImpl * pImpl)                  \
-    {                                                      \
-        m_pImpl = pImpl;                                   \
-        Insert(&pImpl->GetAggregateHead());                \
-        pImpl->m_pVirtual ## _Interface ## Wrapper = this; \
-    }
-#define DXGL_WRAPPER_DERIVED(_Interface, _Parent)                       \
-    void InitializeWrapper(typename _Parent<Impl, Base>::TImpl * pImpl) \
-    {                                                                   \
-        _Parent<Impl, Base>::InitializeWrapper(pImpl);                  \
-        pImpl->m_pVirtual ## _Interface ## Wrapper = this;              \
-    }
-
-namespace NDXGLWrappers
-{
-    template <typename Impl, typename Base>
-    struct SUnknown
-        : Base
-        , SAggregateNode
-    {
-        DXGL_WRAPPER_ROOT(Unknown)
-
-        SUnknown()
-            : m_pImpl(NULL) {}
-        virtual ~SUnknown(){}
-
-        ULONG STDMETHODCALLTYPE AddRef(){return m_pImpl->AddRef(); }
-        ULONG STDMETHODCALLTYPE Release(){return m_pImpl->Release(); }
-
-        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
-        {
-            if (SingleInheritanceInterface<Base>::Query(this, riid, ppvObject))
-            {
-                return S_OK;
-            }
-            SAggregateNode* pNode(m_pImpl->GetAggregateHead().m_pNext);
-            while (pNode != NULL)
-            {
-                if (pNode->QueryInterfaceInternal(riid, ppvObject))
-                {
-                    return S_OK;
-                }
-                pNode = pNode->m_pNext;
-            }
-            return E_NOINTERFACE;
-        }
-
-        bool QueryInterfaceInternal(REFIID riid, void** ppvObject)
-        {
-            return SingleInheritanceInterface<Base>::Query(this, riid, ppvObject);
-        }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D10Blob
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D10Blob, SUnknown)
-        SD3D10Blob(){}
-        LPVOID STDMETHODCALLTYPE GetBufferPointer(){return this->m_pImpl->GetBufferPointer(); }
-        SIZE_T STDMETHODCALLTYPE GetBufferSize(){return this->m_pImpl->GetBufferSize(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DeviceChild
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DeviceChild, SUnknown)
-        SD3D11DeviceChild(){}
-        void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice){this->m_pImpl->GetDevice(ppDevice); }
-        HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData){return this->m_pImpl->GetPrivateData(guid, pDataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData){return this->m_pImpl->SetPrivateData(guid, DataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData){return this->m_pImpl->SetPrivateDataInterface(guid, pData); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DepthStencilState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DepthStencilState, SD3D11DeviceChild)
-        SD3D11DepthStencilState(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11BlendState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11BlendState, SD3D11DeviceChild)
-        SD3D11BlendState(){}
-        virtual void STDMETHODCALLTYPE GetDesc(D3D11_BLEND_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11RasterizerState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11RasterizerState, SD3D11DeviceChild)
-        SD3D11RasterizerState(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_RASTERIZER_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Resource
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Resource, SD3D11DeviceChild)
-        SD3D11Resource(){}
-        void STDMETHODCALLTYPE GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension){this->m_pImpl->GetType(pResourceDimension); }
-        void STDMETHODCALLTYPE SetEvictionPriority(UINT EvictionPriority){this->m_pImpl->SetEvictionPriority(EvictionPriority); }
-        UINT STDMETHODCALLTYPE GetEvictionPriority(){return this->m_pImpl->GetEvictionPriority(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Buffer
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Buffer, SD3D11Resource)
-        SD3D11Buffer(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_BUFFER_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Texture1D
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Texture1D, SD3D11Resource)
-        SD3D11Texture1D(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE1D_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Texture2D
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Texture2D, SD3D11Resource)
-        SD3D11Texture2D(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE2D_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Texture3D
-        : SD3D11Resource<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Texture3D, SD3D11Resource)
-        SD3D11Texture3D(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_TEXTURE3D_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11View
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11View, SD3D11DeviceChild)
-        SD3D11View(){}
-        void STDMETHODCALLTYPE GetResource(ID3D11Resource** ppResource){this->m_pImpl->GetResource(ppResource); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderResourceView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11ShaderResourceView, SD3D11View)
-        SD3D11ShaderResourceView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11RenderTargetView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11RenderTargetView, SD3D11View)
-        SD3D11RenderTargetView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DepthStencilView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DepthStencilView, SD3D11View)
-        SD3D11DepthStencilView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11UnorderedAccessView
-        : SD3D11View<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11UnorderedAccessView, SD3D11View)
-        SD3D11UnorderedAccessView(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11VertexShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11VertexShader, SD3D11DeviceChild) SD3D11VertexShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11HullShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11HullShader, SD3D11DeviceChild) SD3D11HullShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11DomainShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DomainShader, SD3D11DeviceChild) SD3D11DomainShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11GeometryShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11GeometryShader, SD3D11DeviceChild) SD3D11GeometryShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11PixelShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11PixelShader, SD3D11DeviceChild) SD3D11PixelShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11ComputeShader
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11ComputeShader, SD3D11DeviceChild) SD3D11ComputeShader()
-        {
-        }
-    };
-    template <typename Impl, typename Base>
-    struct SD3D11InputLayout
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11InputLayout, SD3D11DeviceChild) SD3D11InputLayout()
-        {
-        }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11SamplerState
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11SamplerState, SD3D11DeviceChild)
-        SD3D11SamplerState(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_SAMPLER_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Asynchronous
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Asynchronous, SD3D11DeviceChild)
-        SD3D11Asynchronous(){}
-        UINT STDMETHODCALLTYPE GetDataSize(){return this->m_pImpl->GetDataSize(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Query
-        : SD3D11Asynchronous<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Query, SD3D11Asynchronous)
-        SD3D11Query(){}
-        void STDMETHODCALLTYPE GetDesc(D3D11_QUERY_DESC* pDesc){this->m_pImpl->GetDesc(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflectionType
-        : Base
-    {
-        DXGL_WRAPPER_ROOT_NO_COM(D3D11ShaderReflectionType)
-        SD3D11ShaderReflectionType()
-            : m_pImpl(NULL){}
-        ~SD3D11ShaderReflectionType(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_TYPE_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByIndex(UINT Index){return this->m_pImpl->GetMemberTypeByIndex(Index); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetMemberTypeByName(LPCSTR Name){return this->m_pImpl->GetMemberTypeByName(Name); }
-        LPCSTR STDMETHODCALLTYPE GetMemberTypeName(UINT Index){return this->m_pImpl->GetMemberTypeName(Index); }
-        HRESULT STDMETHODCALLTYPE IsEqual(ID3D11ShaderReflectionType* pType){return this->m_pImpl->IsEqual(pType); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetSubType(){return this->m_pImpl->GetSubType(); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetBaseClass(){return this->m_pImpl->GetBaseClass(); }
-        UINT STDMETHODCALLTYPE GetNumInterfaces(){return this->m_pImpl->GetNumInterfaces(); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetInterfaceByIndex(UINT uIndex){return this->m_pImpl->GetInterfaceByIndex(uIndex); }
-        HRESULT STDMETHODCALLTYPE IsOfType(ID3D11ShaderReflectionType* pType){return this->m_pImpl->IsOfType(pType); }
-        HRESULT STDMETHODCALLTYPE ImplementsInterface(ID3D11ShaderReflectionType* pBase){return this->m_pImpl->ImplementsInterface(pBase); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflectionVariable
-        : Base
-    {
-        DXGL_WRAPPER_ROOT_NO_COM(D3D11ShaderReflectionVariable)
-        SD3D11ShaderReflectionVariable()
-            : m_pImpl(NULL){}
-        ~SD3D11ShaderReflectionVariable(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_VARIABLE_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionType* STDMETHODCALLTYPE GetType(){return this->m_pImpl->GetType(); }
-        ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetBuffer(){return this->m_pImpl->GetBuffer(); }
-        UINT STDMETHODCALLTYPE GetInterfaceSlot(UINT uArrayIndex){return this->m_pImpl->GetInterfaceSlot(uArrayIndex); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflectionConstantBuffer
-        : Base
-    {
-        DXGL_WRAPPER_ROOT_NO_COM(D3D11ShaderReflectionConstantBuffer)
-        SD3D11ShaderReflectionConstantBuffer()
-            : m_pImpl(NULL){}
-        ~SD3D11ShaderReflectionConstantBuffer(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_BUFFER_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByIndex(UINT Index){return this->m_pImpl->GetVariableByIndex(Index); }
-        ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name){return this->m_pImpl->GetVariableByName(Name); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11ShaderReflection
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11ShaderReflection, SUnknown)
-        SD3D11ShaderReflection(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(D3D11_SHADER_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByIndex(UINT Index){return this->m_pImpl->GetConstantBufferByIndex(Index); }
-        ID3D11ShaderReflectionConstantBuffer* STDMETHODCALLTYPE GetConstantBufferByName(LPCSTR Name){return this->m_pImpl->GetConstantBufferByName(Name); }
-        HRESULT STDMETHODCALLTYPE GetResourceBindingDesc(UINT ResourceIndex, D3D11_SHADER_INPUT_BIND_DESC* pDesc){return this->m_pImpl->GetResourceBindingDesc(ResourceIndex, pDesc); }
-        HRESULT STDMETHODCALLTYPE GetInputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc){return this->m_pImpl->GetInputParameterDesc(ParameterIndex, pDesc); }
-        HRESULT STDMETHODCALLTYPE GetOutputParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc){return this->m_pImpl->GetOutputParameterDesc(ParameterIndex, pDesc); }
-        HRESULT STDMETHODCALLTYPE GetPatchConstantParameterDesc(UINT ParameterIndex, D3D11_SIGNATURE_PARAMETER_DESC* pDesc){return this->m_pImpl->GetPatchConstantParameterDesc(ParameterIndex, pDesc); }
-        ID3D11ShaderReflectionVariable* STDMETHODCALLTYPE GetVariableByName(LPCSTR Name){return this->m_pImpl->GetVariableByName(Name); }
-        HRESULT STDMETHODCALLTYPE GetResourceBindingDescByName(LPCSTR Name, D3D11_SHADER_INPUT_BIND_DESC* pDesc){return this->m_pImpl->GetResourceBindingDescByName(Name, pDesc); }
-        UINT STDMETHODCALLTYPE GetMovInstructionCount(){return this->m_pImpl->GetMovInstructionCount(); }
-        UINT STDMETHODCALLTYPE GetMovcInstructionCount(){return this->m_pImpl->GetMovcInstructionCount(); }
-        UINT STDMETHODCALLTYPE GetConversionInstructionCount(){return this->m_pImpl->GetConversionInstructionCount(); }
-        UINT STDMETHODCALLTYPE GetBitwiseInstructionCount(){return this->m_pImpl->GetBitwiseInstructionCount(); }
-        D3D_PRIMITIVE STDMETHODCALLTYPE GetGSInputPrimitive(){return this->m_pImpl->GetGSInputPrimitive(); }
-        BOOL STDMETHODCALLTYPE IsSampleFrequencyShader(){return this->m_pImpl->IsSampleFrequencyShader(); }
-        UINT STDMETHODCALLTYPE GetNumInterfaceSlots(){return this->m_pImpl->GetNumInterfaceSlots(); }
-        HRESULT STDMETHODCALLTYPE GetMinFeatureLevel(D3D_FEATURE_LEVEL* pLevel){return this->m_pImpl->GetMinFeatureLevel(pLevel); }
-    };
-
-
-    template <typename Impl, typename Base>
-    struct SDXGIObject
-        : SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIObject, SUnknown)
-        SDXGIObject(){}
-        HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID Name, UINT DataSize, const void* pData){return this->m_pImpl->SetPrivateData(Name, DataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID Name, const IUnknown* pUnknown){return this->m_pImpl->SetPrivateDataInterface(Name, pUnknown); }
-        HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID Name, UINT* pDataSize, void* pData){return this->m_pImpl->GetPrivateData(Name, pDataSize, pData); }
-        HRESULT STDMETHODCALLTYPE GetParent(REFIID riid, void** ppParent){return this->m_pImpl->GetParent(riid, ppParent); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIDeviceSubObject
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIDeviceSubObject, SDXGIObject)
-        SDXGIDeviceSubObject(){}
-        HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice){return this->m_pImpl->GetDevice(riid, ppDevice); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIOutput
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIOutput, SDXGIObject)
-        SDXGIOutput(){}
-        HRESULT STDMETHODCALLTYPE GetDesc(DXGI_OUTPUT_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        HRESULT STDMETHODCALLTYPE GetDisplayModeList(DXGI_FORMAT EnumFormat, UINT Flags, UINT* pNumModes, DXGI_MODE_DESC* pDesc){return this->m_pImpl->GetDisplayModeList(EnumFormat, Flags, pNumModes, pDesc); }
-        HRESULT STDMETHODCALLTYPE FindClosestMatchingMode(const DXGI_MODE_DESC* pModeToMatch, DXGI_MODE_DESC* pClosestMatch, IUnknown* pConcernedDevice){return this->m_pImpl->FindClosestMatchingMode(pModeToMatch, pClosestMatch, pConcernedDevice); }
-        HRESULT STDMETHODCALLTYPE WaitForVBlank(){return this->m_pImpl->WaitForVBlank(); }
-        HRESULT STDMETHODCALLTYPE TakeOwnership(IUnknown* pDevice, BOOL Exclusive){return this->m_pImpl->TakeOwnership(pDevice, Exclusive); }
-        void STDMETHODCALLTYPE ReleaseOwnership(){this->m_pImpl->ReleaseOwnership(); }
-        HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps){return this->m_pImpl->GetGammaControlCapabilities(pGammaCaps); }
-        HRESULT STDMETHODCALLTYPE SetGammaControl(const DXGI_GAMMA_CONTROL* pArray){return this->m_pImpl->SetGammaControl(pArray); }
-        HRESULT STDMETHODCALLTYPE GetGammaControl(DXGI_GAMMA_CONTROL* pArray){return this->m_pImpl->GetGammaControl(pArray); }
-        HRESULT STDMETHODCALLTYPE SetDisplaySurface(IDXGISurface* pScanoutSurface){return this->m_pImpl->SetDisplaySurface(pScanoutSurface); }
-        HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData(IDXGISurface* pDestination){return this->m_pImpl->GetDisplaySurfaceData(pDestination); }
-        HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats){return this->m_pImpl->GetFrameStatistics(pStats); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIAdapter
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIAdapter, SDXGIObject)
-        SDXGIAdapter(){}
-        HRESULT STDMETHODCALLTYPE EnumOutputs(UINT Output, IDXGIOutput** ppOutput){return this->m_pImpl->EnumOutputs(Output, ppOutput); }
-        HRESULT STDMETHODCALLTYPE GetDesc(DXGI_ADAPTER_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        HRESULT STDMETHODCALLTYPE CheckInterfaceSupport(REFGUID InterfaceName, LARGE_INTEGER* pUMDVersion){return this->m_pImpl->CheckInterfaceSupport(InterfaceName, pUMDVersion); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIAdapter1
-        : SDXGIAdapter<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIAdapter1, SDXGIAdapter)
-        SDXGIAdapter1(){}
-        HRESULT STDMETHODCALLTYPE GetDesc1(DXGI_ADAPTER_DESC1* pDesc){return this->m_pImpl->GetDesc1(pDesc); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIFactory
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIFactory, SDXGIObject)
-        SDXGIFactory(){}
-        HRESULT STDMETHODCALLTYPE EnumAdapters(UINT Adapter, IDXGIAdapter** ppAdapter){return this->m_pImpl->EnumAdapters(Adapter, ppAdapter); }
-        HRESULT STDMETHODCALLTYPE MakeWindowAssociation(HWND WindowHandle, UINT Flags){return this->m_pImpl->MakeWindowAssociation(WindowHandle, Flags); }
-        HRESULT STDMETHODCALLTYPE GetWindowAssociation(HWND* pWindowHandle){return this->m_pImpl->GetWindowAssociation(pWindowHandle); }
-        HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain){return this->m_pImpl->CreateSwapChain(pDevice, pDesc, ppSwapChain); }
-        HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(HMODULE Module, IDXGIAdapter** ppAdapter){return this->m_pImpl->CreateSoftwareAdapter(Module, ppAdapter); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIFactory1
-        : SDXGIFactory<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIFactory1, SDXGIFactory)
-        SDXGIFactory1(){}
-        HRESULT STDMETHODCALLTYPE EnumAdapters1(UINT Adapter, IDXGIAdapter1** ppAdapter){return this->m_pImpl->EnumAdapters1(Adapter, ppAdapter); }
-        BOOL STDMETHODCALLTYPE IsCurrent(void){return this->m_pImpl->IsCurrent(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGIDevice
-        : SDXGIObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGIDevice, SDXGIObject)
-        SDXGIDevice(){}
-        HRESULT STDMETHODCALLTYPE GetAdapter(IDXGIAdapter** pAdapter){return this->m_pImpl->GetAdapter(pAdapter); }
-        HRESULT STDMETHODCALLTYPE CreateSurface(const DXGI_SURFACE_DESC* pDesc, UINT NumSurfaces, DXGI_USAGE Usage, const DXGI_SHARED_RESOURCE* pSharedResource, IDXGISurface** ppSurface){return this->m_pImpl->CreateSurface(pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); }
-        HRESULT STDMETHODCALLTYPE QueryResourceResidency(IUnknown* const* ppResources, DXGI_RESIDENCY* pResidencyStatus, UINT NumResources){return this->m_pImpl->QueryResourceResidency(ppResources, pResidencyStatus, NumResources); }
-        HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(INT Priority){return this->m_pImpl->SetGPUThreadPriority(Priority); }
-        HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(INT* pPriority){return this->m_pImpl->GetGPUThreadPriority(pPriority); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SDXGISwapChain
-        : SDXGIDeviceSubObject<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(DXGISwapChain, SDXGIDeviceSubObject)
-        SDXGISwapChain(){}
-        HRESULT STDMETHODCALLTYPE Present(UINT SyncInterval, UINT Flags){return this->m_pImpl->Present(SyncInterval, Flags); }
-        HRESULT STDMETHODCALLTYPE GetBuffer(UINT Buffer, REFIID riid, void** ppSurface){return this->m_pImpl->GetBuffer(Buffer, riid, ppSurface); }
-        HRESULT STDMETHODCALLTYPE SetFullscreenState(BOOL Fullscreen, IDXGIOutput* pTarget){return this->m_pImpl->SetFullscreenState(Fullscreen, pTarget); }
-        HRESULT STDMETHODCALLTYPE GetFullscreenState(BOOL* pFullscreen, IDXGIOutput** ppTarget){return this->m_pImpl->GetFullscreenState(pFullscreen, ppTarget); }
-        HRESULT STDMETHODCALLTYPE GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc){return this->m_pImpl->GetDesc(pDesc); }
-        HRESULT STDMETHODCALLTYPE ResizeBuffers(UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags){return this->m_pImpl->ResizeBuffers(BufferCount, Width, Height, NewFormat, SwapChainFlags); }
-        HRESULT STDMETHODCALLTYPE ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters){return this->m_pImpl->ResizeTarget(pNewTargetParameters); }
-        HRESULT STDMETHODCALLTYPE GetContainingOutput(IDXGIOutput** ppOutput){return this->m_pImpl->GetContainingOutput(ppOutput); }
-        HRESULT STDMETHODCALLTYPE GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats){return this->m_pImpl->GetFrameStatistics(pStats); }
-        HRESULT STDMETHODCALLTYPE GetLastPresentCount(UINT* pLastPresentCount){return this->m_pImpl->GetLastPresentCount(pLastPresentCount); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11SwitchToRef
-        : public SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11SwitchToRef, SUnknown)
-        SD3D11SwitchToRef(){}
-        BOOL STDMETHODCALLTYPE SetUseRef(BOOL UseRef){return this->m_pImpl->SetUseRef(UseRef); }
-        BOOL STDMETHODCALLTYPE GetUseRef(){return this->m_pImpl->GetUseRef(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11Device
-        : public SUnknown<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11Device, SUnknown)
-        HRESULT STDMETHODCALLTYPE CreateBuffer(const D3D11_BUFFER_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer){return this->m_pImpl->CreateBuffer(pDesc, pInitialData, ppBuffer); }
-        HRESULT STDMETHODCALLTYPE CreateTexture1D(const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D){return this->m_pImpl->CreateTexture1D(pDesc, pInitialData, ppTexture1D); }
-        HRESULT STDMETHODCALLTYPE CreateTexture2D(const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D){return this->m_pImpl->CreateTexture2D(pDesc, pInitialData, ppTexture2D); }
-        HRESULT STDMETHODCALLTYPE CreateTexture3D(const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D){return this->m_pImpl->CreateTexture3D(pDesc, pInitialData, ppTexture3D); }
-        HRESULT STDMETHODCALLTYPE CreateShaderResourceView(ID3D11Resource* pResource, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView){return this->m_pImpl->CreateShaderResourceView(pResource, pDesc, ppSRView); }
-        HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(ID3D11Resource* pResource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView){return this->m_pImpl->CreateUnorderedAccessView(pResource, pDesc, ppUAView); }
-        HRESULT STDMETHODCALLTYPE CreateRenderTargetView(ID3D11Resource* pResource, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView){return this->m_pImpl->CreateRenderTargetView(pResource, pDesc, ppRTView); }
-        HRESULT STDMETHODCALLTYPE CreateDepthStencilView(ID3D11Resource* pResource, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView){return this->m_pImpl->CreateDepthStencilView(pResource, pDesc, ppDepthStencilView); }
-        HRESULT STDMETHODCALLTYPE CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, UINT NumElements, const void* pShaderBytecodeWithInputSignature, SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout){return this->m_pImpl->CreateInputLayout(pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); }
-        HRESULT STDMETHODCALLTYPE CreateVertexShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader){return this->m_pImpl->CreateVertexShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); }
-        HRESULT STDMETHODCALLTYPE CreateGeometryShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader){return this->m_pImpl->CreateGeometryShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); }
-        HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(const void* pShaderBytecode, SIZE_T BytecodeLength, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, UINT NumEntries, const UINT* pBufferStrides, UINT NumStrides, UINT RasterizedStream, ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader){return this->m_pImpl->CreateGeometryShaderWithStreamOutput(pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); }
-        HRESULT STDMETHODCALLTYPE CreatePixelShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader){return this->m_pImpl->CreatePixelShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); }
-        HRESULT STDMETHODCALLTYPE CreateHullShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader){return this->m_pImpl->CreateHullShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); }
-        HRESULT STDMETHODCALLTYPE CreateDomainShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader){return this->m_pImpl->CreateDomainShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); }
-        HRESULT STDMETHODCALLTYPE CreateComputeShader(const void* pShaderBytecode, SIZE_T BytecodeLength, ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader){return this->m_pImpl->CreateComputeShader(pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); }
-        HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage){return this->m_pImpl->CreateClassLinkage(ppLinkage); }
-        HRESULT STDMETHODCALLTYPE CreateBlendState(const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState){return this->m_pImpl->CreateBlendState(pBlendStateDesc, ppBlendState); }
-        HRESULT STDMETHODCALLTYPE CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState){return this->m_pImpl->CreateDepthStencilState(pDepthStencilDesc, ppDepthStencilState); }
-        HRESULT STDMETHODCALLTYPE CreateRasterizerState(const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState){return this->m_pImpl->CreateRasterizerState(pRasterizerDesc, ppRasterizerState); }
-        HRESULT STDMETHODCALLTYPE CreateSamplerState(const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState){return this->m_pImpl->CreateSamplerState(pSamplerDesc, ppSamplerState); }
-        HRESULT STDMETHODCALLTYPE CreateQuery(const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery){return this->m_pImpl->CreateQuery(pQueryDesc, ppQuery); }
-        HRESULT STDMETHODCALLTYPE CreatePredicate(const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate){return this->m_pImpl->CreatePredicate(pPredicateDesc, ppPredicate); }
-        HRESULT STDMETHODCALLTYPE CreateCounter(const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter){return this->m_pImpl->CreateCounter(pCounterDesc, ppCounter); }
-        HRESULT STDMETHODCALLTYPE CreateDeferredContext(UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext){return this->m_pImpl->CreateDeferredContext(ContextFlags, ppDeferredContext); }
-        HRESULT STDMETHODCALLTYPE OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void** ppResource){return this->m_pImpl->OpenSharedResource(hResource, ReturnedInterface, ppResource); }
-        HRESULT STDMETHODCALLTYPE CheckFormatSupport(DXGI_FORMAT Format, UINT* pFormatSupport){return this->m_pImpl->CheckFormatSupport(Format, pFormatSupport); }
-        HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(DXGI_FORMAT Format, UINT SampleCount, UINT* pNumQualityLevels){return this->m_pImpl->CheckMultisampleQualityLevels(Format, SampleCount, pNumQualityLevels); }
-        void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo){this->m_pImpl->CheckCounterInfo(pCounterInfo); }
-        HRESULT STDMETHODCALLTYPE CheckCounter(const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength){return this->m_pImpl->CheckCounter(pDesc, pType, pActiveCounters, szName, pNameLength, szUnits, pUnitsLength, szDescription, pDescriptionLength); }
-        HRESULT STDMETHODCALLTYPE CheckFeatureSupport(D3D11_FEATURE Feature, void* pFeatureSupportData, UINT FeatureSupportDataSize) {return this->m_pImpl->CheckFeatureSupport(Feature, pFeatureSupportData, FeatureSupportDataSize); }
-        HRESULT STDMETHODCALLTYPE GetPrivateData(REFGUID guid, UINT* pDataSize, void* pData){return this->m_pImpl->GetPrivateData(guid, pDataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateData(REFGUID guid, UINT DataSize, const void* pData){return this->m_pImpl->SetPrivateData(guid, DataSize, pData); }
-        HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(REFGUID guid, const IUnknown* pData){return this->m_pImpl->SetPrivateDataInterface(guid, pData); }
-        D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel(void){return this->m_pImpl->GetFeatureLevel(); }
-        UINT STDMETHODCALLTYPE GetCreationFlags(void){return this->m_pImpl->GetCreationFlags(); }
-        HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason(void){return this->m_pImpl->GetDeviceRemovedReason(); }
-        void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext){this->m_pImpl->GetImmediateContext(ppImmediateContext); }
-        HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags){return this->m_pImpl->SetExceptionMode(RaiseFlags); }
-        UINT STDMETHODCALLTYPE GetExceptionMode(void){return this->m_pImpl->GetExceptionMode(); }
-    };
-
-    template <typename Impl, typename Base>
-    struct SD3D11DeviceContext
-        : SD3D11DeviceChild<Impl, Base>
-    {
-        DXGL_WRAPPER_DERIVED(D3D11DeviceContext, SD3D11DeviceChild)
-        void STDMETHODCALLTYPE VSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->VSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE PSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->PSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE PSSetShader(ID3D11PixelShader* pPixelShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->PSSetShader(pPixelShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE PSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->PSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE VSSetShader(ID3D11VertexShader* pVertexShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->VSSetShader(pVertexShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE DrawIndexed(UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation){this->m_pImpl->DrawIndexed(IndexCount, StartIndexLocation, BaseVertexLocation); }
-        void STDMETHODCALLTYPE Draw(UINT VertexCount, UINT StartVertexLocation){this->m_pImpl->Draw(VertexCount, StartVertexLocation); }
-        HRESULT STDMETHODCALLTYPE Map(ID3D11Resource* pResource, UINT Subresource, D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource){return this->m_pImpl->Map(pResource, Subresource, MapType, MapFlags, pMappedResource); }
-        void STDMETHODCALLTYPE Unmap(ID3D11Resource* pResource, UINT Subresource){this->m_pImpl->Unmap(pResource, Subresource); }
-        void STDMETHODCALLTYPE PSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->PSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE IASetInputLayout(ID3D11InputLayout* pInputLayout){this->m_pImpl->IASetInputLayout(pInputLayout); }
-        void STDMETHODCALLTYPE IASetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppVertexBuffers, const UINT* pStrides, const UINT* pOffsets){this->m_pImpl->IASetVertexBuffers(StartSlot, NumBuffers, ppVertexBuffers, pStrides, pOffsets); }
-        void STDMETHODCALLTYPE IASetIndexBuffer(ID3D11Buffer* pIndexBuffer, DXGI_FORMAT Format, UINT Offset){this->m_pImpl->IASetIndexBuffer(pIndexBuffer, Format, Offset); }
-        void STDMETHODCALLTYPE DrawIndexedInstanced(UINT IndexCountPerInstance, UINT InstanceCount, UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation){this->m_pImpl->DrawIndexedInstanced(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation); }
-        void STDMETHODCALLTYPE DrawInstanced(UINT VertexCountPerInstance, UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation){this->m_pImpl->DrawInstanced(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation); }
-        void STDMETHODCALLTYPE GSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->GSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE GSSetShader(ID3D11GeometryShader* pShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->GSSetShader(pShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology){this->m_pImpl->IASetPrimitiveTopology(Topology); }
-        void STDMETHODCALLTYPE VSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->VSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE VSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->VSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE Begin(ID3D11Asynchronous* pAsync){this->m_pImpl->Begin(pAsync); }
-        void STDMETHODCALLTYPE End(ID3D11Asynchronous* pAsync){this->m_pImpl->End(pAsync); }
-        HRESULT STDMETHODCALLTYPE GetData(ID3D11Asynchronous* pAsync, void* pData, UINT DataSize, UINT GetDataFlags){return this->m_pImpl->GetData(pAsync, pData, DataSize, GetDataFlags); }
-        void STDMETHODCALLTYPE SetPredication(ID3D11Predicate* pPredicate, BOOL PredicateValue){this->m_pImpl->SetPredication(pPredicate, PredicateValue); }
-        void STDMETHODCALLTYPE GSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->GSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE GSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->GSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE OMSetRenderTargets(UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView){this->m_pImpl->OMSetRenderTargets(NumViews, ppRenderTargetViews, pDepthStencilView); }
-        void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11DepthStencilView* pDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts){this->m_pImpl->OMSetRenderTargetsAndUnorderedAccessViews(NumRTVs, ppRenderTargetViews, pDepthStencilView, UAVStartSlot, NumUAVs, ppUnorderedAccessViews, pUAVInitialCounts); }
-        void STDMETHODCALLTYPE OMSetBlendState(ID3D11BlendState* pBlendState, const FLOAT BlendFactor[ 4 ], UINT SampleMask){this->m_pImpl->OMSetBlendState(pBlendState, BlendFactor, SampleMask); }
-        void STDMETHODCALLTYPE OMSetDepthStencilState(ID3D11DepthStencilState* pDepthStencilState, UINT StencilRef){this->m_pImpl->OMSetDepthStencilState(pDepthStencilState, StencilRef); }
-        void STDMETHODCALLTYPE SOSetTargets(UINT NumBuffers, ID3D11Buffer* const* ppSOTargets, const UINT* pOffsets){this->m_pImpl->SOSetTargets(NumBuffers, ppSOTargets, pOffsets); }
-        void STDMETHODCALLTYPE DrawAuto(void){this->m_pImpl->DrawAuto(); }
-        void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs){this->m_pImpl->DrawIndexedInstancedIndirect(pBufferForArgs, AlignedByteOffsetForArgs); }
-        void STDMETHODCALLTYPE DrawInstancedIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs){this->m_pImpl->DrawInstancedIndirect(pBufferForArgs, AlignedByteOffsetForArgs); }
-        void STDMETHODCALLTYPE Dispatch(UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ){this->m_pImpl->Dispatch(ThreadGroupCountX, ThreadGroupCountY, ThreadGroupCountZ); }
-        void STDMETHODCALLTYPE DispatchIndirect(ID3D11Buffer* pBufferForArgs, UINT AlignedByteOffsetForArgs){this->m_pImpl->DispatchIndirect(pBufferForArgs, AlignedByteOffsetForArgs); }
-        void STDMETHODCALLTYPE RSSetState(ID3D11RasterizerState* pRasterizerState){this->m_pImpl->RSSetState(pRasterizerState); }
-        void STDMETHODCALLTYPE RSSetViewports(UINT NumViewports, const D3D11_VIEWPORT* pViewports){this->m_pImpl->RSSetViewports(NumViewports, pViewports); }
-        void STDMETHODCALLTYPE RSSetScissorRects(UINT NumRects, const D3D11_RECT* pRects){this->m_pImpl->RSSetScissorRects(NumRects, pRects); }
-        void STDMETHODCALLTYPE CopySubresourceRegion(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox){this->m_pImpl->CopySubresourceRegion(pDstResource, DstSubresource, DstX, DstY, DstZ, pSrcResource, SrcSubresource, pSrcBox); }
-        void STDMETHODCALLTYPE CopyResource(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource){this->m_pImpl->CopyResource(pDstResource, pSrcResource); }
-        void STDMETHODCALLTYPE UpdateSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch){this->m_pImpl->UpdateSubresource(pDstResource, DstSubresource, pDstBox, pSrcData, SrcRowPitch, SrcDepthPitch); }
-        void STDMETHODCALLTYPE CopyStructureCount(ID3D11Buffer* pDstBuffer, UINT DstAlignedByteOffset, ID3D11UnorderedAccessView* pSrcView){this->m_pImpl->CopyStructureCount(pDstBuffer, DstAlignedByteOffset, pSrcView); }
-        void STDMETHODCALLTYPE ClearRenderTargetView(ID3D11RenderTargetView* pRenderTargetView, const FLOAT ColorRGBA[ 4 ]){this->m_pImpl->ClearRenderTargetView(pRenderTargetView, ColorRGBA); }
-        void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* pUnorderedAccessView, const UINT Values[ 4 ]){this->m_pImpl->ClearUnorderedAccessViewUint(pUnorderedAccessView, Values); }
-        void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* pUnorderedAccessView, const FLOAT Values[ 4 ]){this->m_pImpl->ClearUnorderedAccessViewFloat(pUnorderedAccessView, Values); }
-        void STDMETHODCALLTYPE ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil){this->m_pImpl->ClearDepthStencilView(pDepthStencilView, ClearFlags, Depth, Stencil); }
-        void STDMETHODCALLTYPE GenerateMips(ID3D11ShaderResourceView* pShaderResourceView){this->m_pImpl->GenerateMips(pShaderResourceView); }
-        void STDMETHODCALLTYPE SetResourceMinLOD(ID3D11Resource* pResource, FLOAT MinLOD){this->m_pImpl->SetResourceMinLOD(pResource, MinLOD); }
-        FLOAT STDMETHODCALLTYPE GetResourceMinLOD(ID3D11Resource* pResource){return this->m_pImpl->GetResourceMinLOD(pResource); }
-        void STDMETHODCALLTYPE ResolveSubresource(ID3D11Resource* pDstResource, UINT DstSubresource, ID3D11Resource* pSrcResource, UINT SrcSubresource, DXGI_FORMAT Format){this->m_pImpl->ResolveSubresource(pDstResource, DstSubresource, pSrcResource, SrcSubresource, Format); }
-        void STDMETHODCALLTYPE ExecuteCommandList(ID3D11CommandList* pCommandList, BOOL RestoreContextState){this->m_pImpl->ExecuteCommandList(pCommandList, RestoreContextState); }
-        void STDMETHODCALLTYPE HSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->HSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE HSSetShader(ID3D11HullShader* pHullShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->HSSetShader(pHullShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE HSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->HSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE HSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->HSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE DSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->DSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE DSSetShader(ID3D11DomainShader* pDomainShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->DSSetShader(pDomainShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE DSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->DSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE DSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->DSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE CSSetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView* const* ppShaderResourceViews){this->m_pImpl->CSSetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE CSSetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, const UINT* pUAVInitialCounts){this->m_pImpl->CSSetUnorderedAccessViews(StartSlot, NumUAVs, ppUnorderedAccessViews, pUAVInitialCounts); }
-        void STDMETHODCALLTYPE CSSetShader(ID3D11ComputeShader* pComputeShader, ID3D11ClassInstance* const* ppClassInstances, UINT NumClassInstances){this->m_pImpl->CSSetShader(pComputeShader, ppClassInstances, NumClassInstances); }
-        void STDMETHODCALLTYPE CSSetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState* const* ppSamplers){this->m_pImpl->CSSetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE CSSetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers){this->m_pImpl->CSSetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE VSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->VSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE PSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->PSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->PSGetShader(ppPixelShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE PSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->PSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->VSGetShader(ppVertexShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE PSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->PSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout){this->m_pImpl->IAGetInputLayout(ppInputLayout); }
-        void STDMETHODCALLTYPE IAGetVertexBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets){this->m_pImpl->IAGetVertexBuffers(StartSlot, NumBuffers, ppVertexBuffers, pStrides, pOffsets); }
-        void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset){this->m_pImpl->IAGetIndexBuffer(pIndexBuffer, Format, Offset); }
-        void STDMETHODCALLTYPE GSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->GSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->GSGetShader(ppGeometryShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology){this->m_pImpl->IAGetPrimitiveTopology(pTopology); }
-        void STDMETHODCALLTYPE VSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->VSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE VSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->VSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue){this->m_pImpl->GetPredication(ppPredicate, pPredicateValue); }
-        void STDMETHODCALLTYPE GSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->GSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE GSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->GSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView){this->m_pImpl->OMGetRenderTargets(NumViews, ppRenderTargetViews, ppDepthStencilView); }
-        void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews){this->m_pImpl->OMGetRenderTargetsAndUnorderedAccessViews(NumRTVs, ppRenderTargetViews, ppDepthStencilView, UAVStartSlot, NumUAVs, ppUnorderedAccessViews); }
-        void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState** ppBlendState, FLOAT BlendFactor[ 4 ], UINT* pSampleMask){this->m_pImpl->OMGetBlendState(ppBlendState, BlendFactor, pSampleMask); }
-        void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef){this->m_pImpl->OMGetDepthStencilState(ppDepthStencilState, pStencilRef); }
-        void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets){this->m_pImpl->SOGetTargets(NumBuffers, ppSOTargets); }
-        void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState){this->m_pImpl->RSGetState(ppRasterizerState); }
-        void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, D3D11_VIEWPORT* pViewports){this->m_pImpl->RSGetViewports(pNumViewports, pViewports); }
-        void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, D3D11_RECT* pRects){this->m_pImpl->RSGetScissorRects(pNumRects, pRects); }
-        void STDMETHODCALLTYPE HSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->HSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->HSGetShader(ppHullShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE HSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->HSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE HSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->HSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE DSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->DSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->DSGetShader(ppDomainShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE DSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->DSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE DSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->DSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE CSGetShaderResources(UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews){this->m_pImpl->CSGetShaderResources(StartSlot, NumViews, ppShaderResourceViews); }
-        void STDMETHODCALLTYPE CSGetUnorderedAccessViews(UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews){this->m_pImpl->CSGetUnorderedAccessViews(StartSlot, NumUAVs, ppUnorderedAccessViews); }
-        void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances){this->m_pImpl->CSGetShader(ppComputeShader, ppClassInstances, pNumClassInstances); }
-        void STDMETHODCALLTYPE CSGetSamplers(UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers){this->m_pImpl->CSGetSamplers(StartSlot, NumSamplers, ppSamplers); }
-        void STDMETHODCALLTYPE CSGetConstantBuffers(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers){this->m_pImpl->CSGetConstantBuffers(StartSlot, NumBuffers, ppConstantBuffers); }
-        void STDMETHODCALLTYPE ClearState(void){this->m_pImpl->ClearState(); }
-        void STDMETHODCALLTYPE Flush(void){this->m_pImpl->Flush(); }
-        D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType(void){return this->m_pImpl->GetType(); }
-        UINT STDMETHODCALLTYPE GetContextFlags(void){return this->m_pImpl->GetContextFlags(); }
-        HRESULT STDMETHODCALLTYPE FinishCommandList(BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList){return this->m_pImpl->FinishCommandList(RestoreDeferredContextState, ppCommandList); }
-    };
-} //namespace NDXGLWrappers
-
-#undef DXGL_WRAPPER_ROOT_NO_COM
-#undef DXGL_WRAPPER_ROOT
-#undef DXGL_WRAPPER_DERIVED
-
-#define DXGL_IMPLEMENT_INTERFACE(_Class, _Interface)                                                      \
-    typedef NDXGLWrappers::S ## _Interface<_Class, I ## _Interface> T ## _Interface ## Wrapper;           \
-    T ## _Interface ## Wrapper m_k ## _Interface ## Wrapper;                                              \
-    I ## _Interface * m_pVirtual ## _Interface ## Wrapper;                                                \
-    static void ToInterface(I ## _Interface * *ppInterface, _Class * pObject)                             \
-    {                                                                                                     \
-        *ppInterface = (pObject == NULL ? NULL : pObject->m_pVirtual ## _Interface ## Wrapper);           \
-    }                                                                                                     \
-    static _Class* FromInterface(I ## _Interface * pInterface)                                            \
-    {                                                                                                     \
-        return pInterface == NULL ? NULL : static_cast<T ## _Interface ## Wrapper*>(pInterface)->m_pImpl; \
-    }
-#define DXGL_INITIALIZE_INTERFACE(_Interface) \
-    m_k ## _Interface ## Wrapper.InitializeWrapper(this);
-
-#else
-
-#define DXGL_IMPLEMENT_INTERFACE(_Class, _Interface)                          \
-    static void ToInterface(I ## _Interface * *ppInterface, _Class * pObject) \
-    {                                                                         \
-        *ppInterface = pObject;                                               \
-    }                                                                         \
-    static _Class* FromInterface(I ## _Interface * pInterface)                \
-    {                                                                         \
-        return static_cast<_Class*>(pInterface);                              \
-    }
-#define DXGL_INITIALIZE_INTERFACE(_Interface)
-
-#endif
-
-#endif //__DXEmulation__
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Android/DXMETAL_android.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Android/DXMETAL_android.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Android/DXMETAL_android.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Android/DXMETAL_traits_android.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Android/DXMETAL_traits_android.cmake
deleted file mode 100644
index 92f8b7b892..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Android/DXMETAL_traits_android.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_DXMETAL_SUPPORTED FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Linux/DXMETAL_traits_linux.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Linux/DXMETAL_traits_linux.cmake
deleted file mode 100644
index 92f8b7b892..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Linux/DXMETAL_traits_linux.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_DXMETAL_SUPPORTED FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Mac/DXMETAL_mac.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Mac/DXMETAL_mac.cmake
deleted file mode 100644
index f39f45d73c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Mac/DXMETAL_mac.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_OPTIONS
-    PRIVATE
-        -xobjective-c++
-)
-
-
-find_library(METAL_LIBRARY Metal)
-find_library(CORE_GRAPHICS_LIBRARY CoreGraphics)
-find_library(CORE_SERVICES_LIBRARY CoreServices)
-find_library(QUARTZ_CORE_LIBRARY QuartzCore)
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        ${METAL_LIBRARY}
-        ${CORE_GRAPHICS_LIBRARY}
-        ${CORE_SERVICES_LIBRARY}
-        ${QUARTZ_CORE_LIBRARY}
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Mac/DXMETAL_traits_mac.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Mac/DXMETAL_traits_mac.cmake
deleted file mode 100644
index e7f061f84b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Mac/DXMETAL_traits_mac.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_DXMETAL_SUPPORTED TRUE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Windows/DXMETAL_traits_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Windows/DXMETAL_traits_windows.cmake
deleted file mode 100644
index 92f8b7b892..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Windows/DXMETAL_traits_windows.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_DXMETAL_SUPPORTED FALSE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/iOS/DXMETAL_ios.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/iOS/DXMETAL_ios.cmake
deleted file mode 100644
index 98fd1ab923..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/iOS/DXMETAL_ios.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-
-find_library(METAL_LIBRARY Metal)
-find_library(CORE_GRAPHICS_LIBRARY CoreGraphics)
-find_library(OPEN_GLES_LIBRARY OpenGLES)
-find_library(QUARTZ_CORE_LIBRARY QuartzCore)
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        ${METAL_LIBRARY}
-        ${CORE_GRAPHICS_LIBRARY}
-        ${OPEN_GLES_LIBRARY}
-        ${QUARTZ_CORE_LIBRARY}
-)
-
-set(LY_COMPILE_OPTIONS
-    PRIVATE
-        -xobjective-c++
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/iOS/DXMETAL_traits_ios.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/iOS/DXMETAL_traits_ios.cmake
deleted file mode 100644
index e7f061f84b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/iOS/DXMETAL_traits_ios.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DXGL_TRAIT_BUILD_DXMETAL_SUPPORTED TRUE)
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/RenderCapabilities.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/RenderCapabilities.cpp
deleted file mode 100644
index 18fa37fb96..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/RenderCapabilities.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <Common/RenderCapabilities.h>
-#include "Implementation/GLCommon.hpp"
-
-namespace RenderCapabilities
-{
-    bool SupportsTextureViews()
-    {
-        return NCryMetal::SupportTextureViews();
-    }
-
-    bool SupportsStencilTextures()
-    {
-        return NCryMetal::SupportsStencilTextures();
-    }
-
-    int GetAvailableMRTbpp()
-    {
-        return NCryMetal::GetAvailableMRTbpp();
-    }
-
-    bool Supports128bppGmemPath()
-    {
-        return GetAvailableMRTbpp() >= 128;
-    }
-
-    bool Supports256bppGmemPath()
-    {
-        return GetAvailableMRTbpp() >= 256;
-    }
-
-    bool SupportsPLSExtension()
-    {
-        return false;
-    }
-
-    FrameBufferFetchMask GetFrameBufferFetchCapabilities()
-    {
-        FrameBufferFetchMask mask;
-        mask.set(FBF_ALL_COLORS);
-        mask.set(FBF_COLOR0);
-        return mask;
-    }
-    
-    bool SupportsDepthClipping()
-    {
-        //https://developer.apple.com/documentation/metal/mtlrendercommandencoder/1516267-setdepthclipmode?language=objc
-#if defined(AZ_PLATFORM_MAC)
-        //There is a bug with the drivers where setDepthClipMode: MTLDepthClipModeClamp does not work. 
-        //Until that is fixed we are simulating this behavior in the vertex shader
-        //return NCryMetal::s_isOsxMinVersion10_11;
-        return false;
-#else
-        //There is a bug with the drivers where setDepthClipMode: MTLDepthClipModeClamp does not work. 
-        //Until that is fixed we are simulating this behavior in the vertex shader
-        //return NCryMetal::s_isIosMinVersion11_0;
-        return false;
-#endif
-    }
-    
-    bool SupportsDualSourceBlending()
-    {
-        // Metal supports dual source blending for devices running OXS >= 10.12 or iOS >= 11.0
-        // but you need to declare the "index" of the render target in the shader (half4 Source1 [[ color(0), index(1) ]])
-        // Unfortunately HLSLcc is not able to generate this type of declaration because the DX Shader bytecode doesn't
-        // distinguish between a normal output or one for dual source blending.
-        return false;
-    }    
-
-    
-    bool SupportsRenderTargets(int numRTs)
-    {
-#if defined(AZ_PLATFORM_MAC)
-        return true;
-#else
-        if (numRTs <= 4)
-        {
-            //128bpp means it will support 4 render targets
-            return GetAvailableMRTbpp() >= 128;
-        }
-        else if (numRTs <= 8)        
-        {
-            //256bpp means it will support 8 render targets
-            return GetAvailableMRTbpp() >= 256;
-        }
-
-        return false;        
-#endif
-    }
-    
-    bool SupportsStructuredBuffer(EShaderStage stage)
-    {
-        return true;
-    }
-
-    bool SupportsIndependentBlending()
-    {
-        return true;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Tests/test_Main.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Tests/test_Main.cpp
deleted file mode 100644
index bafbe544a4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Tests/test_Main.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Memory/OSAllocator.h>
-#include <AzCore/Memory/AllocatorManager.h>
-namespace
-{
-    class RenderDllTestEnvironment final
-        : public AZ::Test::ITestEnvironment
-    {
-    protected:
-        void SetupEnvironment() override
-        {
-            // required memory management
-            AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-            AZ::AllocatorInstance<AZ::OSAllocator>::Create();
-            // For some reason there's always an assert in ~AllocatorManager() after running the tests,
-            // even though we call Destroy on both allocators in the TeardownEnvironment function,
-            // so allow allocator leaking here to enable the tests to run without issue
-            AZ::AllocatorManager::Instance().SetAllocatorLeaking(true); 
-        }
-
-        void TeardownEnvironment() override
-        {           
-            AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();
-            AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-        }
-    private:
-    };
-}
-AZ_UNIT_TEST_HOOK(new(AZ_OS_MALLOC(sizeof(RenderDllTestEnvironment), alignof(RenderDllTestEnvironment))) RenderDllTestEnvironment);
-
-TEST(CryRenderMetalSanityTest, Sanity)
-{
-    EXPECT_EQ(1, 1);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_mesh_baker_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_mesh_baker_files.cmake
deleted file mode 100644
index d13db68157..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_mesh_baker_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../D3DMeshBaker.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_renderer_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_renderer_files.cmake
deleted file mode 100644
index fea78ae87f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_renderer_files.cmake
+++ /dev/null
@@ -1,384 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    RenderCapabilities.cpp
-    Definitions/DXMETAL_D3DX11.h
-    Definitions/DXMETAL_D3D11Shader.h
-    Definitions/DXMETAL_D3DCommon.h
-    Definitions/DXMETAL_D3DCompiler.h
-    Definitions/DXMETAL_D3D11.h
-    Definitions/DXMETAL_D3DX11tex.h
-    Definitions/DXMETAL_ID3D11Device.h
-    Definitions/DXMETAL_ID3D11DeviceContext.h
-    Definitions/DXMETAL_IDXGIFactory1.h
-    Definitions/DXMETAL_IDXGISwapChain.h
-    Definitions/DXMETAL_dxgi.h
-    Definitions/DXMETAL_dxgitype.h
-    Definitions/CryDXMETALGuid.hpp
-    Definitions/CryDXMETALLegacy.hpp
-    Definitions/CryDXMETALMisc.hpp
-    Definitions/ICryDXMETALUnknown.hpp
-    Implementation/AppleGPUInfoUtils.h
-    Implementation/GLFormat.cpp
-    Implementation/GLResource.cpp
-    Implementation/GLShader.cpp
-    Implementation/GLState.cpp
-    Implementation/METALCopyShaders.h
-    Implementation/METALContext.cpp
-    Implementation/METALDevice.cpp
-    Implementation/GLCommon.hpp
-    Implementation/GLCryPlatform.hpp
-    Implementation/GLExtensions.hpp
-    Implementation/GLFormat.hpp
-    Implementation/GLPlatform.hpp
-    Implementation/GLResource.hpp
-    Implementation/GLShader.hpp
-    Implementation/GLState.hpp
-    Implementation/METALContext.hpp
-    Implementation/MetalDevice.hpp
-    Interfaces/CCryDXMETALBase.cpp
-    Interfaces/CCryDXMETALBlendState.cpp
-    Interfaces/CCryDXMETALBlob.cpp
-    Interfaces/CCryDXMETALBuffer.cpp
-    Interfaces/CCryDXMETALDepthStencilState.cpp
-    Interfaces/CCryDXMETALDepthStencilView.cpp
-    Interfaces/CCryDXMETALDevice.cpp
-    Interfaces/CCryDXMETALDeviceChild.cpp
-    Interfaces/CCryDXMETALDeviceContext.cpp
-    Interfaces/CCryDXMETALGIAdapter.cpp
-    Interfaces/CCryDXMETALGIFactory.cpp
-    Interfaces/CCryDXMETALGIObject.cpp
-    Interfaces/CCryDXMETALGIOutput.cpp
-    Interfaces/CCryDXMETALInputLayout.cpp
-    Interfaces/CCryDXMETALQuery.cpp
-    Interfaces/CCryDXMETALRasterizerState.cpp
-    Interfaces/CCryDXMETALRenderTargetView.cpp
-    Interfaces/CCryDXMETALResource.cpp
-    Interfaces/CCryDXMETALSamplerState.cpp
-    Interfaces/CCryDXMETALShader.cpp
-    Interfaces/CCryDXMETALShaderReflection.cpp
-    Interfaces/CCryDXMETALShaderResourceView.cpp
-    Interfaces/CCryDXMETALSwapChain.cpp
-    Interfaces/CCryDXMETALSwitchToRef.cpp
-    Interfaces/CCryDXMETALTexture1D.cpp
-    Interfaces/CCryDXMETALTexture2D.cpp
-    Interfaces/CCryDXMETALTexture3D.cpp
-    Interfaces/CCryDXMETALTextureBase.cpp
-    Interfaces/CCryDXMETALUnorderedAccessView.cpp
-    Interfaces/CCryDXMETALView.cpp
-    Interfaces/CCryDXMETALBase.hpp
-    Interfaces/CCryDXMETALBlendState.hpp
-    Interfaces/CCryDXMETALBlob.hpp
-    Interfaces/CCryDXMETALBuffer.hpp
-    Interfaces/CCryDXMETALDepthStencilState.hpp
-    Interfaces/CCryDXMETALDepthStencilView.hpp
-    Interfaces/CCryDXMETALDevice.hpp
-    Interfaces/CCryDXMETALDeviceChild.hpp
-    Interfaces/CCryDXMETALDeviceContext.hpp
-    Interfaces/CCryDXMETALGIAdapter.hpp
-    Interfaces/CCryDXMETALGIFactory.hpp
-    Interfaces/CCryDXMETALGIObject.hpp
-    Interfaces/CCryDXMETALGIOutput.hpp
-    Interfaces/CCryDXMETALInputLayout.hpp
-    Interfaces/CCryDXMETALQuery.hpp
-    Interfaces/CCryDXMETALRasterizerState.hpp
-    Interfaces/CCryDXMETALRenderTargetView.hpp
-    Interfaces/CCryDXMETALResource.hpp
-    Interfaces/CCryDXMETALSamplerState.hpp
-    Interfaces/CCryDXMETALShader.hpp
-    Interfaces/CCryDXMETALShaderReflection.hpp
-    Interfaces/CCryDXMETALShaderResourceView.hpp
-    Interfaces/CCryDXMETALSwapChain.hpp
-    Interfaces/CCryDXMETALSwitchToRef.hpp
-    Interfaces/CCryDXMETALTexture1D.hpp
-    Interfaces/CCryDXMETALTexture2D.hpp
-    Interfaces/CCryDXMETALTexture3D.hpp
-    Interfaces/CCryDXMETALTextureBase.hpp
-    Interfaces/CCryDXMETALUnorderedAccessView.hpp
-    Interfaces/CCryDXMETALView.hpp
-    Interfaces/DXEmulation.hpp
-    ../../RenderDll_precompiled.cpp
-    ../D3DAmbientOcclusion.cpp
-    ../D3DColorGradingController.cpp
-    ../D3DDebug.cpp
-    ../D3DDeferredPasses.cpp
-    ../D3DDeferredRender.cpp
-    ../D3DDeferredShading.cpp
-    ../D3DFont.cpp
-    ../D3DFXPipeline.cpp
-    ../D3DHMDRenderer.cpp
-    ../D3DHDRRender.cpp
-    ../D3DHWShader.cpp
-    ../D3DHWShaderCompiling.cpp
-    ../D3DOcclQuery.cpp
-    ../D3D_SVO.cpp
-    ../D3DRECloud.cpp
-    ../D3DREImposter.cpp
-    ../D3DRenderAuxGeom.cpp
-    ../D3DRenderRE.cpp
-    ../D3DRenderThread.cpp
-    ../D3DRendPipeline.cpp
-    ../D3DRendPipeline_Jobs.cpp
-    ../D3DShaders.cpp
-    ../D3DShadows.cpp
-    ../D3DStereo.cpp
-    ../D3DSystem.cpp
-    ../D3DTexture.cpp
-    ../D3DTexturesStreaming.cpp
-    ../D3DTextureStreamPool.cpp
-    ../D3DTiledShading.cpp
-    ../D3DVolumetricFog.cpp
-    ../DriverD3D.cpp
-    ../GPUTimer.cpp
-    ../GPUTimerFactory.cpp
-    ../PipelineProfiler.cpp
-    ../MultiLayerAlphaBlendPass.cpp
-    ../D3DPostProcess.cpp
-    ../PostProcessFilters.cpp
-    ../PostProcessGame.cpp
-    ../PostProcessMisc.cpp
-    ../PostProcessRain.cpp
-    ../PostProcessMotionBlur.cpp
-    ../PostProcessSunShafts.cpp
-    ../PostProcessWater.cpp
-    ../PostProcessSnow.cpp
-    ../D3D_SVO.h
-    ../D3DVolumetricFog.h
-    ../D3DTiledShading.h
-    ../DeviceManager/DeviceManagerInline.h
-    ../../Common/Textures/ITextureStreamer.h
-    ../../Common/Shaders/ShaderAllocator.h
-    ../../Common/CryNameR.h
-    ../../Common/FencedIB.h
-    ../../Common/FencedVB.h
-    ../D3DColorGradingController.h
-    ../D3DDebug.h
-    ../D3DDeferredShading.h
-    ../D3DHMDRenderer.h
-    ../D3DHWShader.h
-    ../D3DPostProcess.h
-    ../D3DRenderAuxGeom.h
-    ../D3DStereo.h
-    ../../Common/Defs.h
-    ../DeviceInfo.h
-    ../DriverD3D.h
-    ../GPUTimer.h
-    ../GPUTimerFactory.h
-    ../NullD3D11Device.h
-    ../PipelineProfiler.h
-    ../resource.h
-    ../../RenderDll_precompiled.h
-    ../DeviceInfo.inl
-    ../MultiLayerAlphaBlendPass.h
-    ../../Common/Renderer_Jobs.cpp
-    ../../Common/CommonRender.cpp
-    ../../Common/DeferredRenderUtils.cpp
-    ../../Common/PerInstanceConstantBufferPool.cpp
-    ../../Common/RenderAuxGeom.cpp
-    ../../Common/Renderer.cpp
-    ../../Common/RenderPipeline.cpp
-    ../../Common/RenderThread.cpp
-    ../../Common/ResFile.cpp
-    ../../Common/ResFileLookupDataMan.cpp
-    ../../Common/ShadowUtils.cpp
-    ../../Common/TextMessages.cpp
-    ../../Common/WaterUtils.cpp
-    ../../Common/ResFileLookupDataMan.h
-    ../../Common/TextMessages.h
-    ../../Common/RenderView.cpp
-    ../../Common/CommonRender.h
-    ../../Common/DeferredRenderUtils.h
-    ../../Common/FrameProfiler.h
-    ../../Common/IColorGradingControllerInt.h
-    ../../Common/OcclQuery.h
-    ../../Common/PerInstanceConstantBufferPool.h
-    ../../Common/RenderAuxGeom.h
-    ../../Common/Renderer.h
-    ../../Common/RenderPipeline.h
-    ../../Common/RenderThread.h
-    ../../Common/ResFile.h
-    ../../Common/ResFile_info.h
-    ../../Common/Shadow_Renderer.h
-    ../../Common/ShadowUtils.h
-    ../../Common/WaterUtils.h
-    ../../Common/ReverseDepth.h
-    ../../Common/RenderView.h
-    ../../Common/RenderMesh_Render.cpp
-    ../../Common/RenderMesh_SetMesh.cpp
-    ../../Common/RenderMesh.cpp
-    ../../Common/RenderMesh.h
-    ../../Common/Shaders/Parser.cpp
-    ../../Common/Shaders/ParserBin.cpp
-    ../../Common/Shaders/PoundPoundParser.cpp
-    ../../Common/Shaders/RemoteCompiler.cpp
-    ../../Common/Shaders/ShaderCache.cpp
-    ../../Common/Shaders/ShaderComponents.cpp
-    ../../Common/Shaders/ShaderCore.cpp
-    ../../Common/Shaders/ShaderFXParseBin.cpp
-    ../../Common/Shaders/ShaderParse.cpp
-    ../../Common/Shaders/ShaderScript.cpp
-    ../../Common/Shaders/ShaderSerialize.cpp
-    ../../Common/Shaders/ShaderTemplate.cpp
-    ../../Common/Shaders/ShaderResources.cpp
-    ../../Common/Shaders/CShader.h
-    ../../Common/Shaders/CShaderBin.h
-    ../../Common/Shaders/Parser.h
-    ../../Common/Shaders/ParserBin.h
-    ../../Common/Shaders/PoundPoundParser.h
-    ../../Common/Shaders/RemoteCompiler.h
-    ../../Common/Shaders/Shader.h
-    ../../Common/Shaders/ShaderCache.h
-    ../../Common/Shaders/ShaderComponents.h
-    ../../Common/Shaders/ShaderSerialize.h
-    ../../Common/Shaders/ShaderResources.h
-    ../../Common/Shaders/ShadersResourcesGroups/PerFrame.h
-    ../../Common/PostProcess/PostEffects.cpp
-    ../../Common/PostProcess/PostProcess.cpp
-    ../../Common/PostProcess/PostProcessUtils.cpp
-    ../../Common/PostProcess/PostEffects.h
-    ../../Common/PostProcess/PostProcess.h
-    ../../Common/PostProcess/PostProcessUtils.h
-    ../../Common/Memory/VRAMDriller.cpp
-    ../../Common/Memory/VRAMDriller.h
-    ../../Common/Memory/VRAMDrillerBus.h
-    ../DevBuffer.cpp
-    ../DeviceManager/DeviceManager.cpp
-    ../../Common/DevBuffer.h
-    ../DeviceManager/ConstantBufferCache.h
-    ../DeviceManager/ConstantBufferCache.cpp
-    ../DeviceManager/TempDynBuffer.h
-    ../DeviceManager/DeviceManager.h
-    ../DeviceManager/DeviceWrapper12.h
-    ../DeviceManager/DeviceWrapper12.cpp
-    ../DeviceManager/DeviceWrapper12_D3D11.cpp
-    ../CRELensOpticsD3D.cpp
-    ../../Common/RendElements/CREBeam.cpp
-    ../../Common/RendElements/CREClientPoly.cpp
-    ../../Common/RendElements/CRECloud.cpp
-    ../../Common/RendElements/CREDeferredShading.cpp
-    ../../Common/RendElements/CREFogVolume.cpp
-    ../../Common/RendElements/CREGameEffect.cpp
-    ../../Common/RendElements/CREHDRProcess.cpp
-    ../../Common/RendElements/CREImposter.cpp
-    ../../Common/RendElements/CREMesh.cpp
-    ../../Common/RendElements/CREOclusionQuery.cpp
-    ../../Common/RendElements/CREGeomCache.cpp
-    ../../Common/RendElements/CREPostProcess.cpp
-    ../../Common/RendElements/CREPrismObject.cpp
-    ../../Common/RendElements/CRESky.cpp
-    ../../Common/RendElements/CREVolumeObject.cpp
-    ../../Common/RendElements/CREWaterOcean.cpp
-    ../../Common/RendElements/CREWaterVolume.cpp
-    ../../Common/RendElements/RendElement.cpp
-    ../../Common/RendElements/CRELensOptics.h
-    ../../Common/RendElements/CREBeam.h
-    ../../Common/RendElements/CREClientPoly.h
-    ../../Common/RendElements/CRECloud.h
-    ../../Common/RendElements/CREDeferredShading.h
-    ../../Common/RendElements/CREHDRProcess.h
-    ../../Common/RendElements/Stars.h
-    ../../Common/RendElements/Utils/PolygonMath2D.cpp
-    ../../Common/RendElements/Utils/PolygonMath2D.h
-    ../../Common/RendElements/Utils/SpatialHashGrid.h
-    ../../Common/RendElements/CameraOrbs.cpp
-    ../../Common/RendElements/AbstractMeshElement.cpp
-    ../../Common/RendElements/ChromaticRing.cpp
-    ../../Common/RendElements/Ghost.cpp
-    ../../Common/RendElements/Glow.cpp
-    ../../Common/RendElements/IrisShafts.cpp
-    ../../Common/RendElements/MeshUtil.cpp
-    ../../Common/RendElements/OpticsElement.cpp
-    ../../Common/RendElements/OpticsFactory.cpp
-    ../../Common/RendElements/RootOpticsElement.cpp
-    ../../Common/RendElements/Streaks.cpp
-    ../../Common/RendElements/FlareSoftOcclusionQuery.cpp
-    ../../Common/RendElements/ImageSpaceShafts.cpp
-    ../../Common/RendElements/AbstractMeshElement.h
-    ../../Common/RendElements/MeshUtil.h
-    ../../Common/RendElements/OpticsFactory.h
-    ../../Common/RendElements/Streaks.h
-    ../../Common/RendElements/Timeline.h
-    ../../Common/RendElements/CameraOrbs.h
-    ../../Common/RendElements/ChromaticRing.h
-    ../../Common/RendElements/Ghost.h
-    ../../Common/RendElements/Glow.h
-    ../../Common/RendElements/Interpolator.h
-    ../../Common/RendElements/IrisShafts.h
-    ../../Common/RendElements/OpticsElement.h
-    ../../Common/RendElements/OpticsPredef.hpp
-    ../../Common/RendElements/RootOpticsElement.h
-    ../../Common/RendElements/FlareSoftOcclusionQuery.h
-    ../../Common/RendElements/ImageSpaceShafts.h
-    ../../Common/RendElements/OpticsGroup.h
-    ../../Common/RendElements/OpticsGroup.cpp
-    ../../Common/RendElements/OpticsProxy.h
-    ../../Common/RendElements/OpticsProxy.cpp
-    ../../Common/RendElements/OpticsReference.h
-    ../../Common/RendElements/OpticsReference.cpp
-    ../../Common/Textures/ITextureStreamer.cpp
-    ../../Common/Textures/PlanningTextureStreamer.cpp
-    ../../Common/Textures/PlanningTextureStreamer_Jobs.cpp
-    ../../Common/Textures/DynTexture.cpp
-    ../../Common/Textures/PowerOf2BlockPacker.cpp
-    ../../Common/Textures/Texture.cpp
-    ../../Common/Textures/Texture.h
-    ../../Common/Textures/StereoTexture.cpp
-    ../../Common/Textures/StereoTexture.h
-    ../../Common/Textures/TextureManager.h
-    ../../Common/Textures/TextureManager.cpp
-    ../../Common/Textures/TextureStreaming.cpp
-    ../../Common/Textures/PlanningTextureStreamer.h
-    ../../Common/Textures/TextureArrayAlloc.h
-    ../../Common/Textures/TextureStreamPool.h
-    ../../Common/Textures/PowerOf2BlockPacker.h
-    ../../Common/Textures/TextureHelpers.cpp
-    ../../Common/Textures/TextureHelpers.h
-    ../../Common/Textures/Image/CImage.cpp
-    ../../Common/Textures/Image/DDSImage.cpp
-    ../../Common/Textures/Image/JpgImage.cpp
-    ../../Common/Textures/Image/TgaImage.cpp
-    ../../Common/Textures/Image/CImage.h
-    ../../Common/Textures/Image/DDSImage.h
-    ../GraphicsPipeline/Common/FullscreenPass.h
-    ../GraphicsPipeline/Common/FullscreenPass.cpp
-    ../GraphicsPipeline/Common/GraphicsPipeline.h
-    ../GraphicsPipeline/Common/GraphicsPipeline.cpp
-    ../GraphicsPipeline/Common/GraphicsPipelinePass.h
-    ../GraphicsPipeline/Common/UtilityPasses.h
-    ../GraphicsPipeline/Common/UtilityPasses.cpp
-    ../GraphicsPipeline/Common/GraphicsPipelineStateSet.h
-    ../GraphicsPipeline/Common/GraphicsPipelineStateSet.cpp
-    ../GraphicsPipeline/AutoExposure.h
-    ../GraphicsPipeline/AutoExposure.cpp
-    ../GraphicsPipeline/Bloom.h
-    ../GraphicsPipeline/Bloom.cpp
-    ../GraphicsPipeline/DepthOfField.h
-    ../GraphicsPipeline/DepthOfField.cpp
-    ../GraphicsPipeline/FurBendData.h
-    ../GraphicsPipeline/FurBendData.cpp
-    ../GraphicsPipeline/FurPasses.h
-    ../GraphicsPipeline/FurPasses.cpp
-    ../GraphicsPipeline/MotionBlur.h
-    ../GraphicsPipeline/MotionBlur.cpp
-    ../GraphicsPipeline/PostAA.h
-    ../GraphicsPipeline/PostAA.cpp
-    ../GraphicsPipeline/ScreenSpaceObscurance.h
-    ../GraphicsPipeline/ScreenSpaceObscurance.cpp
-    ../GraphicsPipeline/ScreenSpaceReflections.h
-    ../GraphicsPipeline/ScreenSpaceReflections.cpp
-    ../GraphicsPipeline/ScreenSpaceSSS.h
-    ../GraphicsPipeline/ScreenSpaceSSS.cpp
-    ../GraphicsPipeline/StandardGraphicsPipeline.h
-    ../GraphicsPipeline/StandardGraphicsPipeline.cpp
-    ../GraphicsPipeline/VideoRenderPass.h
-    ../GraphicsPipeline/VideoRenderPass.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_renderer_shared_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_renderer_shared_files.cmake
deleted file mode 100644
index 7fbce46258..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_renderer_shared_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    CryDXMETAL.cpp
-    CryDXMETAL.hpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_test_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_test_files.cmake
deleted file mode 100644
index ce134bacf6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/metal_test_files.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Tests/test_Main.cpp
-    ../../Common/tests/RenderDLLUnitTests.cpp
-    ../../Common/Shaders/RemoteShaderCompilerUnitTests.cpp
-    ../../Common/tests/Shaders/VertexTests.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DevBuffer.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DevBuffer.cpp
deleted file mode 100644
index d047f255db..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DevBuffer.cpp
+++ /dev/null
@@ -1,3508 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Generic device Buffer management
-
-
-#include "RenderDll_precompiled.h"
-#include <numeric>
-#include <IMemory.h>
-
-#include "DriverD3D.h"
-#include "DeviceManager/Base.h"
-#include "DeviceManager/PartitionTable.h"
-#include "AzCore/std/parallel/mutex.h"
-#include "Common/Memory/VRAMDrillerBus.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DEVBUFFER_CPP_SECTION_1 1
-#define DEVBUFFER_CPP_SECTION_2 2
-#define DEVBUFFER_CPP_SECTION_3 3
-#endif
-
-#if defined(min)
-# undef min
-#endif
-#if defined(max)
-# undef max
-#endif
-
-void ReleaseD3DBuffer(D3DBuffer*& buffer)
-{
-    if (buffer)
-    {
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, static_cast<void*>(buffer));
-        SAFE_RELEASE(buffer);
-    }
-}
-
-namespace
-{
-    static inline bool CopyData(void* dst, const void* src, size_t size)
-    {
-        bool requires_flush = true;
-#   if defined(_CPU_SSE)
-        if ((((uintptr_t)dst | (uintptr_t)src | size) & 0xf) == 0u)
-        {
-            __m128* d = (__m128*)dst;
-            const __m128* s = (const __m128*)src;
-            const __m128* e = (const __m128*)src + (size >> 4);
-            while (s < e)
-            {
-                _mm_stream_ps((float*)(d++), _mm_load_ps((const float*)(s++)));
-            }
-            _mm_sfence();
-            requires_flush = false;
-        }
-        else
-#   endif
-        {
-            cryMemcpy(dst, src, size, MC_CPU_TO_GPU);
-        }
-        return requires_flush;
-    }
-
-    struct PoolConfig
-    {
-        enum
-        {
-            POOL_STAGING_COUNT = 1,
-            POOL_ALIGNMENT = 128,
-            POOL_FRAME_QUERY_COUNT = 4,
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVBUFFER_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DevBuffer_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            POOL_MAX_ALLOCATION_SIZE = 64 << 20,
-#endif
-            POOL_FRAME_QUERY_MASK = POOL_FRAME_QUERY_COUNT - 1
-        };
-
-        size_t m_pool_bank_size;
-        size_t m_transient_pool_size;
-        size_t m_cb_bank_size;
-        size_t m_cb_threshold;
-        size_t m_pool_bank_mask;
-        size_t m_pool_max_allocs;
-        size_t m_pool_max_moves_per_update;
-        bool m_pool_defrag_static;
-        bool m_pool_defrag_dynamic;
-
-        bool Configure()
-        {
-            m_pool_bank_size = (size_t)NextPower2(gRenDev->CV_r_buffer_banksize) << 20;
-            m_transient_pool_size = (size_t)NextPower2(gRenDev->CV_r_transient_pool_size) << 20;
-            m_cb_bank_size = NextPower2(gRenDev->CV_r_constantbuffer_banksize) << 20;
-            m_cb_threshold = NextPower2(gRenDev->CV_r_constantbuffer_watermark) << 20;
-            m_pool_bank_mask = m_pool_bank_size - 1;
-            m_pool_max_allocs = gRenDev->CV_r_buffer_pool_max_allocs;
-            m_pool_defrag_static = gRenDev->CV_r_buffer_pool_defrag_static != 0;
-            m_pool_defrag_dynamic = gRenDev->CV_r_buffer_pool_defrag_dynamic != 0;
-            if (m_pool_defrag_static | m_pool_defrag_dynamic)
-            {
-                m_pool_max_moves_per_update = gRenDev->CV_r_buffer_pool_defrag_max_moves;
-            }
-            else
-            {
-                m_pool_max_moves_per_update = 0;
-            }
-            return true;
-        }
-    };
-    static PoolConfig s_PoolConfig;
-
-
-    static const char* ConstantToString(BUFFER_USAGE usage)
-    {
-        switch (usage)
-        {
-        case BU_IMMUTABLE:
-            return "IMMUTABLE";
-        case BU_STATIC:
-            return "STATIC";
-        case BU_DYNAMIC:
-            return "DYNAMIC";
-        case BU_TRANSIENT:
-            return "BU_TRANSIENT";
-        case BU_TRANSIENT_RT:
-            return "BU_TRANSIENT_RT";
-        case BU_WHEN_LOADINGTHREAD_ACTIVE:
-            return "BU_WHEN_LOADINGTHREAD_ACTIVE";
-        }
-        return NULL;
-    }
-
-    static const char* ConstantToString(BUFFER_BIND_TYPE type)
-    {
-        switch (type)
-        {
-        case BBT_VERTEX_BUFFER:
-            return "VB";
-        case BBT_INDEX_BUFFER:
-            return "IB";
-        }
-        return NULL;
-    }
-
-    static inline int _GetThreadID()
-    {
-        return gRenDev->m_pRT->IsRenderThread() ? gRenDev->m_RP.m_nProcessThreadID : gRenDev->m_RP.m_nFillThreadID;
-    }
-
-    static inline void UnsetStreamSources(D3DBuffer* buffer)
-    {
-        gcpRendD3D->FX_UnbindStreamSource(buffer);
-    }
-
-    struct BufferPoolBank;
-    struct BufferPool;
-    struct BufferPoolItem;
-
-    //////////////////////////////////////////////////////////////////////////////////////////
-    // A backing device buffer serving as a memory bank from which further allocations can be sliced out
-    //
-    struct BufferPoolBank
-    {
-        // The pointer to backing device buffer.
-        D3DBuffer* m_buffer;
-
-        // Base pointer to buffer (used on platforms with unified memory)
-        uint8* m_base_ptr;
-
-        // Size of the backing buffer
-        size_t m_capacity;
-
-        // Number of allocated bytes from within the buffer
-        size_t m_free_space;
-
-        // Handle into the bank table
-        size_t m_handle;
-
-        BufferPoolBank(size_t handle)
-            : m_buffer()
-            , m_base_ptr(NULL)
-            , m_capacity()
-            , m_free_space()
-            , m_handle(handle)
-        {}
-
-        ~BufferPoolBank()
-        {
-            UnsetStreamSources(m_buffer);
-            ReleaseD3DBuffer(m_buffer);
-        }
-    };
-
-    using BufferPoolBankTable = AzRHI::PartitionTable<BufferPoolBank>;
-
-    //////////////////////////////////////////////////////////////////////////
-    // An allocation within a pool bank is represented by this structure
-    //
-    // Note: In case the allocation request could not be satisfied by a pool
-    // the pool item contains a pointer to the backing buffer directly.
-    // On destruction the backing device buffer will be released.
-    struct BufferPoolItem
-    {
-        // The pointer to the backing buffer
-        D3DBuffer* m_buffer;
-
-        // The pool that maintains this item (will be null if pool-less)
-        BufferPool* m_pool;
-
-        // Base pointer to buffer
-        uint8* m_base_ptr;
-
-        // The pointer to the defragging allocator if backed by one
-        IDefragAllocator* m_defrag_allocator;
-
-        // The intrusive list member for deferred unpinning/deletion
-        // Note: only one list because deletion overrides unpinning
-        util::list<BufferPoolItem> m_deferred_list;
-
-        // The intrusive list member for deferred relocations
-        // due to copy on writes performed on non-renderthreads
-        util::list<BufferPoolItem> m_cow_list;
-
-        // The table handle for this item
-        item_handle_t m_handle;
-
-        // If this item has been relocated on update, this is the item
-        // handle of the new item (to be swapped)
-        item_handle_t m_cow_handle;
-
-        // The size of the item in bytes
-        uint32 m_size;
-
-        // The offset in bytes from the start of the buffer
-        uint32 m_offset;
-
-        // The bank index this item resides in
-        uint32 m_bank;
-
-        // The defrag allocation handle for this item
-        IDefragAllocator::Hdl m_defrag_handle;
-
-        // Set to one if the item was already used once
-        uint8 m_used : 1;
-
-        // Set to one if the item is backed by the defrag allocator (XXXX)
-        uint8 m_defrag : 1;
-
-        // Set to one if the item is backed by the defrag allocator (XXXX)
-        uint8 m_cpu_flush : 1;
-
-        // Set to one if the item is backed by the defrag allocator (XXXX)
-        uint8 m_gpu_flush : 1;
-
-        BufferPoolItem(size_t handle)
-            : m_buffer()
-            , m_pool()
-            , m_size()
-            , m_offset(~0u)
-            , m_bank(~0u)
-            , m_base_ptr(NULL)
-            , m_defrag_allocator()
-            , m_defrag_handle(IDefragAllocator::InvalidHdl)
-            , m_handle(handle)
-            , m_deferred_list()
-            , m_cow_list()
-            , m_cow_handle(~0u)
-            , m_used()
-            , m_defrag()
-            , m_cpu_flush()
-            , m_gpu_flush()
-        {
-        }
-
-        ~BufferPoolItem()
-        {
-        #ifdef AZRHI_DEBUG
-            m_offset = ~0u;
-            m_bank = ~0u;
-            m_base_ptr = (uint8*)-1;
-            m_defrag_handle = IDefragAllocator::InvalidHdl;
-        #endif
-        }
-
-        void Relocate(BufferPoolItem& item)
-        {
-            std::swap(m_buffer, item.m_buffer);
-            AZRHI_ASSERT(m_pool == item.m_pool);
-            AZRHI_ASSERT(m_size == item.m_size);
-            std::swap(m_offset, item.m_offset);
-            std::swap(m_bank, item.m_bank);
-            std::swap(m_base_ptr, item.m_base_ptr);
-            if (m_defrag)
-            {
-                AZRHI_ASSERT(m_defrag_allocator == item.m_defrag_allocator);
-                AZRHI_ASSERT(item.m_defrag_handle != m_defrag_handle);
-                m_defrag_allocator->ChangeContext(m_defrag_handle, reinterpret_cast<void*>(static_cast<uintptr_t>(item.m_handle)));
-                m_defrag_allocator->ChangeContext(item.m_defrag_handle, reinterpret_cast<void*>(static_cast<uintptr_t>(m_handle)));
-            }
-            std::swap(m_defrag_allocator, item.m_defrag_allocator);
-            std::swap(m_defrag_handle, item.m_defrag_handle);
-            m_cpu_flush = item.m_cpu_flush;
-            m_gpu_flush = item.m_gpu_flush;
-        }
-    };
-
-    using BufferItemTable = AzRHI::PartitionTable<BufferPoolItem>;
-
-    struct StagingResources
-    {
-        enum
-        {
-            WRITE = 0, READ = 1
-        };
-
-        D3DBuffer* m_staging_buffers[2];
-        size_t m_staged_open[2];
-        size_t m_staged_base;
-        size_t m_staged_size;
-        size_t m_staged_offset;
-        D3DBuffer* m_staged_buffer;
-
-        StagingResources() { memset(this, 0x0, sizeof(*this)); }
-    };
-
-    template<size_t BIND_FLAGS>
-    class StaticBufferUpdaterBase
-    {
-    protected:
-        StagingResources& m_resources;
-
-    public:
-        StaticBufferUpdaterBase(StagingResources& resources)
-            : m_resources(resources)
-        {}
-        ~StaticBufferUpdaterBase() { }
-
-        // Create the staging buffers if supported && enabled
-        bool CreateResources()
-        {
-            if (!m_resources.m_staging_buffers[StagingResources::WRITE] && gRenDev->m_DevMan.CreateBuffer(
-                s_PoolConfig.m_pool_bank_size
-                , 1
-                , CDeviceManager::USAGE_CPU_WRITE | CDeviceManager::USAGE_STAGING
-                , BIND_FLAGS
-                , &m_resources.m_staging_buffers[StagingResources::WRITE]) != S_OK)
-            {
-                CryLogAlways("SStaticBufferPool::CreateResources: could not create staging buffer");
-                FreeResources();
-                return false;
-            }
-            return true;
-        }
-
-        bool FreeResources()
-        {
-            for (size_t i = 0; i < 2; ++i)
-            {
-                UnsetStreamSources(m_resources.m_staging_buffers[i]);
-                SAFE_RELEASE(m_resources.m_staging_buffers[i]);
-                m_resources.m_staged_open[i] = 0;
-            }
-            m_resources.m_staged_base = 0;
-            m_resources.m_staged_size = 0;
-            m_resources.m_staged_offset = 0;
-            m_resources.m_staged_buffer = 0;
-            m_resources.m_staged_open[StagingResources::WRITE] = 1;
-            return true;
-        }
-
-        void* BeginRead(D3DBuffer* buffer, size_t size, size_t offset)
-        {
-            AZRHI_ASSERT(buffer && size && offset);
-            AZRHI_ASSERT(size <= s_PoolConfig.m_pool_bank_size);
-            AZRHI_VERIFY(m_resources.m_staged_open[StagingResources::READ] == 0);
-
-            D3D11_BOX contents;
-            contents.left = offset;
-            contents.right = offset + size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                m_resources.m_staging_buffers[StagingResources::READ]
-                , 0
-                , 0
-                , 0
-                , 0
-                , buffer
-                , 0
-                , &contents);
-
-            D3D11_MAPPED_SUBRESOURCE mapped_resource;
-            D3D11_MAP map = D3D11_MAP_READ;
-            HRESULT hr = gcpRendD3D->GetDeviceContext().Map(
-                m_resources.m_staging_buffers[StagingResources::READ]
-                , 0
-                , map
-                , 0
-                , &mapped_resource);
-            if (!CHECK_HRESULT(hr))
-            {
-                CryLogAlways("map of staging buffer for READING failed!");
-                return NULL;
-            }
-            m_resources.m_staged_open[StagingResources::READ] = 1;
-            return mapped_resource.pData;
-        }
-
-        void* BeginWrite(D3DBuffer* buffer, size_t size, size_t offset)
-        {
-            AZRHI_ASSERT(buffer && size);
-            AZRHI_ASSERT(size <= s_PoolConfig.m_pool_bank_size);
-
-            D3D11_MAPPED_SUBRESOURCE mapped_resource;
-            D3D11_MAP map = D3D11_MAP_WRITE;
-            HRESULT hr = gcpRendD3D->GetDeviceContext().Map(
-                m_resources.m_staging_buffers[StagingResources::WRITE]
-                , 0
-                , map
-                , 0
-                , &mapped_resource);
-            if (!CHECK_HRESULT(hr))
-            {
-                CryLogAlways("map of staging buffer for WRITING failed!");
-                return NULL;
-            }
-            void* result = reinterpret_cast<uint8*>(mapped_resource.pData);
-            m_resources.m_staged_size = size;
-            m_resources.m_staged_offset = offset;
-            m_resources.m_staged_buffer = buffer;
-            m_resources.m_staged_open[StagingResources::WRITE] = 1;
-            return result;
-        }
-
-        inline void EndRead()
-        {
-            if (m_resources.m_staged_open[StagingResources::READ])
-            {
-                gcpRendD3D->GetDeviceContext().Unmap(m_resources.m_staging_buffers[StagingResources::READ], 0);
-                m_resources.m_staged_open[StagingResources::READ] = 0;
-            }
-        }
-
-        void EndReadWrite()
-        {
-            D3D11_BOX contents;
-            EndRead();
-            if (m_resources.m_staged_open[StagingResources::WRITE])
-            {
-                AZRHI_ASSERT(m_resources.m_staged_buffer);
-                gcpRendD3D->GetDeviceContext().Unmap(m_resources.m_staging_buffers[StagingResources::WRITE], 0);
-                contents.left = 0;
-                contents.right = m_resources.m_staged_size;
-                contents.top = 0;
-                contents.bottom = 1;
-                contents.front = 0;
-                contents.back = 1;
-                gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                    m_resources.m_staged_buffer
-                    , 0
-                    , m_resources.m_staged_offset
-                    , 0
-                    , 0
-                    , m_resources.m_staging_buffers[StagingResources::WRITE]
-                    , 0
-                    , &contents);
-                m_resources.m_staged_size = 0;
-                m_resources.m_staged_offset = 0;
-                m_resources.m_staged_buffer = 0;
-                m_resources.m_staged_open[StagingResources::WRITE] = 0;
-            }
-        }
-
-        void Move(
-            D3DBuffer* dst_buffer
-            , [[maybe_unused]] size_t dst_size
-            , size_t dst_offset
-            , D3DBuffer* src_buffer
-            , size_t src_size
-            , size_t src_offset)
-
-        {
-            AZRHI_ASSERT(dst_buffer && src_buffer && dst_size == src_size);
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-            D3D11_BOX contents;
-            contents.left = src_offset;
-            contents.right = src_offset + src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(
-                dst_buffer
-                , 0
-                , dst_offset
-                , 0
-                , 0
-                , src_buffer
-                , 0
-                , &contents
-                , 0);
-#    else
-            D3D11_BOX contents;
-            contents.left = src_offset;
-            contents.right = src_offset + src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                m_resources.m_staging_buffers[StagingResources::READ]
-                , 0
-                , 0
-                , 0
-                , 0
-                , src_buffer
-                , 0
-                , &contents);
-#endif
-            contents.left = 0;
-            contents.right = src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                dst_buffer
-                , 0
-                , dst_offset
-                , 0
-                , 0
-                , m_resources.m_staging_buffers[StagingResources::READ]
-                , 0
-                , &contents);
-        }
-    };
-
-#ifdef CRY_USE_DX12
-    //
-    // Override staging path to perform writes over a dedicated upload buffer per bank. This allows
-    // mapping as WRITE_NO_OVERWRITE.
-    //
-    template<size_t BIND_FLAGS>
-    class StaticBufferUpdater
-        : public StaticBufferUpdaterBase<BIND_FLAGS>
-    {
-        using Super = StaticBufferUpdaterBase<BIND_FLAGS>;
-        D3DBuffer* m_uploadBuffer = nullptr;
-    public:
-        StaticBufferUpdater(StagingResources& resources)
-            : Super(resources)
-        {}
-
-        void* BeginWrite(D3DBuffer* buffer, size_t size, size_t offset)
-        {
-            AZRHI_ASSERT(buffer && size);
-            AZRHI_ASSERT(size <= s_PoolConfig.m_pool_bank_size);
-
-            // Use dedicated upload buffer to do staging.
-            D3DBuffer* uploadBuffer = static_cast<CCryDX12Buffer*>(buffer)->AcquireUploadBuffer();
-
-            D3D11_MAPPED_SUBRESOURCE mapped_resource;
-            HRESULT hr = gcpRendD3D->GetDeviceContext().Map(uploadBuffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mapped_resource);
-            if (!CHECK_HRESULT(hr))
-            {
-                CryLogAlways("map of staging buffer for WRITING failed!");
-                return NULL;
-            }
-            m_uploadBuffer = uploadBuffer;
-            this->m_resources.m_staged_size = size;
-            this->m_resources.m_staged_offset = offset;
-            this->m_resources.m_staged_buffer = buffer;
-            this->m_resources.m_staged_open[StagingResources::WRITE] = 1;
-            return reinterpret_cast<uint8*>(mapped_resource.pData) + offset;
-        }
-
-        void EndReadWrite()
-        {
-            Super::EndRead();
-
-            D3D11_BOX contents;
-            if (this->m_resources.m_staged_open[StagingResources::WRITE])
-            {
-                AZRHI_ASSERT(this->m_resources.m_staged_buffer);
-                gcpRendD3D->GetDeviceContext().Unmap(m_uploadBuffer, 0);
-                contents.left = this->m_resources.m_staged_offset;
-                contents.right = this->m_resources.m_staged_offset + this->m_resources.m_staged_size;
-                contents.top = 0;
-                contents.bottom = 1;
-                contents.front = 0;
-                contents.back = 1;
-
-                gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                    this->m_resources.m_staged_buffer, 0, this->m_resources.m_staged_offset, 0, 0, m_uploadBuffer, 0, &contents);
-
-                this->m_resources.m_staged_size = 0;
-                this->m_resources.m_staged_offset = 0;
-                this->m_resources.m_staged_buffer = 0;
-                this->m_resources.m_staged_open[StagingResources::WRITE] = 0;
-                m_uploadBuffer = nullptr;
-            }
-        }
-    };
-
-#else
-    template <size_t BIND_FLAGS>
-    class StaticBufferUpdater : public StaticBufferUpdaterBase<BIND_FLAGS>
-    {
-        using Super = StaticBufferUpdaterBase<BIND_FLAGS>;
-    public:
-        StaticBufferUpdater(StagingResources& resources)
-            : Super(resources)
-        {}
-    };
-#endif
-
-    //////////////////////////////////////////////////////////////////////////
-    // Performs buffer updates over dynamic updates
-    //
-    template<size_t BIND_FLAGS>
-    class DynamicBufferUpdater
-    {
-    private:
-        StagingResources& m_resources;
-        D3DBuffer* m_locked_buffer;
-
-    public:
-        DynamicBufferUpdater(StagingResources& resources)
-            : m_resources(resources)
-            , m_locked_buffer()
-        {}
-        ~DynamicBufferUpdater() { }
-
-        bool CreateResources()
-        {
-            if (!m_resources.m_staging_buffers[StagingResources::READ] &&
-                gRenDev->m_DevMan.CreateBuffer(
-                    s_PoolConfig.m_pool_bank_size
-                    , 1
-                    , CDeviceManager::USAGE_DEFAULT
-                    , BIND_FLAGS
-                    , &m_resources.m_staging_buffers[StagingResources::READ]) != S_OK)
-            {
-                CryLogAlways("SStaticBufferPool::CreateResources: could not create temporary buffer");
-                goto error;
-            }
-            if (false)
-            {
-error:
-                FreeResources();
-                return false;
-            }
-            return true;
-        }
-
-        bool FreeResources()
-        {
-            UnsetStreamSources(m_resources.m_staging_buffers[StagingResources::READ]);
-            SAFE_RELEASE(m_resources.m_staging_buffers[StagingResources::READ]);
-            return true;
-        }
-
-        void* BeginRead([[maybe_unused]] D3DBuffer* buffer, [[maybe_unused]] size_t size, [[maybe_unused]] size_t offset)
-        {
-            return NULL;
-        }
-
-        void* BeginWrite(D3DBuffer* buffer, [[maybe_unused]] size_t size, size_t offset)
-        {
-            AZRHI_ASSERT(buffer && size);
-            D3D11_MAPPED_SUBRESOURCE mapped_resource;
-            D3D11_MAP map = D3D11_MAP_WRITE_NO_OVERWRITE;
-            m_locked_buffer = buffer;
-#if defined(OPENGL) && !DXGL_FULL_EMULATION
-            HRESULT hr = DXGLMapBufferRange(
-                    &gcpRendD3D->GetDeviceContext()
-                    , m_locked_buffer
-                    , offset
-                    , size
-                    , map
-                    , 0
-                    , &mapped_resource);
-#else
-            HRESULT hr = gcpRendD3D->GetDeviceContext().Map(
-                    m_locked_buffer
-                    , 0
-                    , map
-                    , 0
-                    , &mapped_resource);
-#endif
-            if (!CHECK_HRESULT(hr))
-            {
-                CryLogAlways("map of staging buffer for WRITING failed!");
-                return NULL;
-            }
-#if defined(OPENGL) && !DXGL_FULL_EMULATION
-            return reinterpret_cast<uint8*>(mapped_resource.pData);
-#else
-            return reinterpret_cast<uint8*>(mapped_resource.pData) + offset;
-#endif
-        }
-
-        void EndReadWrite()
-        {
-            AZRHI_ASSERT(m_locked_buffer || CRenderer::CV_r_buffer_enable_lockless_updates == 1);
-            if (m_locked_buffer)
-            {
-                gcpRendD3D->GetDeviceContext().Unmap(m_locked_buffer, 0);
-                m_locked_buffer = NULL;
-            }
-        }
-
-        void Move(
-            D3DBuffer* dst_buffer
-            , [[maybe_unused]] size_t dst_size
-            , size_t dst_offset
-            , D3DBuffer* src_buffer
-            , size_t src_size
-            , size_t src_offset)
-
-        {
-            AZRHI_ASSERT(dst_buffer && src_buffer && dst_size == src_size);
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-            D3D11_BOX contents;
-            contents.left = src_offset;
-            contents.right = src_offset + src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(
-                dst_buffer
-                , 0
-                , dst_offset
-                , 0
-                , 0
-                , src_buffer
-                , 0
-                , &contents
-                , 0);
-#    else
-            D3D11_BOX contents;
-            contents.left = src_offset;
-            contents.right = src_offset + src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                m_resources.m_staging_buffers[StagingResources::READ]
-                , 0
-                , 0
-                , 0
-                , 0
-                , src_buffer
-                , 0
-                , &contents);
-#endif
-            contents.left = 0;
-            contents.right = src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                dst_buffer
-                , 0
-                , dst_offset
-                , 0
-                , 0
-                , m_resources.m_staging_buffers[StagingResources::READ]
-                , 0
-                , &contents);
-        }
-    };
-
-    template<size_t BIND_FLAGS>
-    class DirectBufferUpdater
-    {
-    public:
-        DirectBufferUpdater([[maybe_unused]] StagingResources& resources)
-        {}
-
-        bool CreateResources()
-        {
-            return true;
-        }
-
-        bool FreeResources()
-        {
-            return true;
-        }
-
-        void* BeginRead([[maybe_unused]] D3DBuffer* buffer, [[maybe_unused]] size_t size, [[maybe_unused]] size_t offset)
-        {
-            return NULL;
-        }
-
-        void* BeginWrite([[maybe_unused]] D3DBuffer* buffer, [[maybe_unused]] size_t size, [[maybe_unused]] size_t offset)
-        {
-            return NULL;
-        }
-
-        void EndReadWrite()
-        {
-        }
-
-        void Move(
-            D3DBuffer* dst_buffer
-            , [[maybe_unused]] size_t dst_size
-            , size_t dst_offset
-            , D3DBuffer* src_buffer
-            , size_t src_size
-            , size_t src_offset)
-
-        {
-            AZRHI_ASSERT(dst_buffer && src_buffer && dst_size == src_size);
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-            D3D11_BOX contents;
-            contents.left = src_offset;
-            contents.right = src_offset + src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(
-                dst_buffer
-                , 0
-                , dst_offset
-                , 0
-                , 0
-                , src_buffer
-                , 0
-                , &contents
-                , 0);
-# else
-            D3D11_BOX contents;
-            contents.left = src_offset;
-            contents.right = src_offset + src_size;
-            contents.top = 0;
-            contents.bottom = 1;
-            contents.front = 0;
-            contents.back = 1;
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion(
-                dst_buffer
-                , 0
-                , dst_offset
-                , 0
-                , 0
-                , src_buffer
-                , 0
-                , &contents);
-#endif
-        }
-    };
-
-    struct DynamicDefragAllocator
-    {
-        // Instance of the defragging allocator
-        IDefragAllocator* m_defrag_allocator;
-
-        // Instance of the defragging allocator policy (if not set, do not perform defragging)
-        IDefragAllocatorPolicy* m_defrag_policy;
-
-        // Manages the item storage
-        BufferItemTable& m_item_table;
-
-        DynamicDefragAllocator(BufferItemTable& table)
-            : m_defrag_allocator()
-            , m_defrag_policy()
-            , m_item_table(table)
-        {}
-
-        ~DynamicDefragAllocator() { AZRHI_VERIFY(m_defrag_allocator == NULL); }
-
-        bool Initialize(IDefragAllocatorPolicy* policy, bool bestFit)
-        {
-            m_defrag_allocator = CryGetIMemoryManager()->CreateDefragAllocator();
-            if (m_defrag_allocator)
-            {
-                IDefragAllocator::Policy pol;
-                pol.pDefragPolicy = m_defrag_policy = policy;
-                pol.maxAllocs = ((policy) ? s_PoolConfig.m_pool_max_allocs : 1024);
-                pol.maxSegments = 256;
-                pol.blockSearchKind = bestFit ? IDefragAllocator::eBSK_BestFit : IDefragAllocator::eBSK_FirstFit;
-                m_defrag_allocator->Init(0, PoolConfig::POOL_ALIGNMENT, pol);
-            }
-            return m_defrag_allocator != NULL;
-        }
-
-        bool Shutdown()
-        {
-            SAFE_RELEASE(m_defrag_allocator);
-            return m_defrag_allocator == NULL;
-        }
-
-        void GetStats(IDefragAllocatorStats& stats)
-        {
-            if (m_defrag_allocator)
-            {
-                stats = m_defrag_allocator->GetStats();
-            }
-        }
-
-        item_handle_t Allocate(size_t size, BufferPoolItem*& item)
-        {
-            FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-            AZRHI_VERIFY(size);
-            IDefragAllocator::Hdl hdl = m_defrag_allocator->Allocate(size, NULL);
-            if (hdl == IDefragAllocator::InvalidHdl)
-            {
-                return ~0u;
-            }
-            item_handle_t item_hdl = m_item_table.Allocate();
-            item = &m_item_table[item_hdl];
-            item->m_size   = size;
-            item->m_offset = (uint32)m_defrag_allocator->WeakPin(hdl);
-            item->m_defrag_allocator = m_defrag_allocator;
-            item->m_defrag_handle = hdl;
-            item->m_defrag = true;
-            m_defrag_allocator->ChangeContext(hdl, reinterpret_cast<void*>(static_cast<uintptr_t>(item_hdl)));
-            return item_hdl;
-        }
-
-        void Free(BufferPoolItem* item)
-        {
-            FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-            
-            IF (item->m_defrag_handle != IDefragAllocator::InvalidHdl, 1)
-            {
-                m_defrag_allocator->Free(item->m_defrag_handle);
-            }
-            m_item_table.Free(item->m_handle);
-        }
-
-        bool Extend(BufferPoolBank* bank) { return m_defrag_allocator->AppendSegment(bank->m_capacity); }
-
-        void Update(uint32 inflight, [[maybe_unused]] uint32 frame_id, bool allow_defragmentation)
-        {
-            IF (m_defrag_policy && allow_defragmentation, 1)
-            {
-                m_defrag_allocator->DefragmentTick(s_PoolConfig.m_pool_max_moves_per_update - inflight, s_PoolConfig.m_pool_bank_size);
-            }
-        }
-
-        void PinItem(BufferPoolItem* item)
-        {
-            AZRHI_VERIFY((m_defrag_allocator->Pin(item->m_defrag_handle) & s_PoolConfig.m_pool_bank_mask) == item->m_offset);
-        }
-        void UnpinItem(BufferPoolItem* item)
-        {
-            m_defrag_allocator->Unpin(item->m_defrag_handle);
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Partition based allocator for constant buffers of roughly the same size
-    struct PartitionAllocator
-    {
-        D3DBuffer* m_buffer;
-        void* m_base_ptr;
-        uint32 m_page_size;
-        uint32 m_bucket_size;
-        uint32 m_partition;
-        uint32 m_capacity;
-
-        std::vector<uint32> m_table;
-        std::vector<uint32> m_remap;
-
-        PartitionAllocator(
-            D3DBuffer* buffer, void* base_ptr, size_t page_size, size_t bucket_size)
-            : m_buffer(buffer)
-            , m_base_ptr(base_ptr)
-            , m_page_size((uint32)page_size)
-            , m_bucket_size((uint32)bucket_size)
-            , m_partition(0)
-            , m_capacity(page_size / bucket_size)
-            , m_table()
-            , m_remap()
-        {
-            m_table.resize(page_size / bucket_size);
-            m_remap.resize(page_size / bucket_size);
-            std::iota(m_table.begin(), m_table.end(), 0);
-        }
-        ~PartitionAllocator()
-        {
-            AZRHI_VERIFY(m_partition == 0);
-            UnsetStreamSources(m_buffer);
-            ReleaseD3DBuffer(m_buffer);
-        }
-
-        D3DBuffer* buffer() const { return m_buffer; }
-        void* base_ptr() const { return m_base_ptr; }
-        bool empty() const { return m_partition == 0; }
-
-        uint32 allocate()
-        {
-            size_t key = ~0u;
-            IF (m_partition + 1 >= m_capacity, 0)
-            {
-                return ~0u;
-            }
-            uint32 storage_index = m_table[key = m_partition++];
-            m_remap[storage_index] = key;
-            return storage_index;
-        }
-
-        void deallocate(size_t key)
-        {
-            AZRHI_ASSERT(m_partition && key < m_remap.size());
-            uint32 roster_index = m_remap[key];
-            std::swap(m_table[roster_index], m_table[--m_partition]);
-            std::swap(m_remap[key], m_remap[m_table[roster_index]]);
-        }
-    };
-
-} // namespace
-
-    //////////////////////////////////////////////////////////////////////////
-    // Special Allocator for constant buffers
-    //
-# if  CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-    struct ConstantBufferAllocator
-    {
-        // The page buckets
-        typedef std::vector<PartitionAllocator*> PageBucketsT;
-        PageBucketsT m_page_buckets[18];
-
-        // The retired allocations
-        typedef std::pair<PartitionAllocator*, uint16> RetiredSlot;
-        std::vector<RetiredSlot> m_retired_slots[PoolConfig::POOL_FRAME_QUERY_COUNT];
-
-        // Device fences issues at the end of a frame
-        DeviceFenceHandle m_fences[PoolConfig::POOL_FRAME_QUERY_COUNT];
-
-        // Current frameid
-        uint32 m_frameid;
-
-        // The number of allocate pages
-        uint32 m_pages;
-
-        ConstantBufferAllocator()
-            : m_frameid()
-            , m_pages()
-        {
-            memset(m_fences, 0, sizeof(m_fences));
-        }
-        ~ConstantBufferAllocator() {}
-
-        void ReleaseEmptyBanks()
-        {
-            if (m_pages * s_PoolConfig.m_cb_bank_size <= s_PoolConfig.m_cb_threshold)
-            {
-                return;
-            }
-            FUNCTION_PROFILER_RENDERER;
-            for (size_t i = 0; i < 16; ++i)
-            {
-                for (PageBucketsT::iterator j = m_page_buckets[i].begin(),
-                     end = m_page_buckets[i].end(); j != end; )
-                {
-                    if ((*j)->empty())
-                    {
-                        delete *j;
-                        --m_pages;
-                        j = m_page_buckets[i].erase(j);
-                        end = m_page_buckets[i].end();
-                    }
-                    else
-                    {
-                        ++j;
-                    }
-                }
-            }
-        }
-
-        bool Initialize() { return true; }
-
-        bool Shutdown()
-        {
-            for (size_t i = 0; i < PoolConfig::POOL_FRAME_QUERY_COUNT; ++i)
-            {
-                for (size_t j = 0; j < m_retired_slots[i].size(); ++j)
-                {
-                    const RetiredSlot& slot = m_retired_slots[i][j];
-                    slot.first->deallocate(slot.second);
-                }
-                m_retired_slots[i].clear();
-            }
-
-            for (size_t i = 0; i < 16; ++i)
-            {
-                for (size_t j = 0; j < m_page_buckets[i].size(); ++j)
-                {
-                    delete m_page_buckets[i][j];
-                }
-                m_page_buckets[i].clear();
-            }
-            return true;
-        }
-
-        bool Allocate(AzRHI::ConstantBuffer* cbuffer)
-        {
-            FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-            const unsigned size = cbuffer->m_size;
-            const unsigned nsize = NextPower2(size);
-            const unsigned bucket = IntegerLog2(nsize) - 8;
-            bool failed = false;
-retry:
-            for (size_t i = m_page_buckets[bucket].size(); i > 0; --i)
-            {
-                unsigned key = m_page_buckets[bucket][i - 1]->allocate();
-                if (key != ~0u)
-                {
-                    cbuffer->m_buffer = m_page_buckets[bucket][i - 1]->buffer();
-                    cbuffer->m_base_ptr = m_page_buckets[bucket][i - 1]->base_ptr();
-                    cbuffer->m_offset = key * nsize;
-                    cbuffer->m_allocator = reinterpret_cast<void*>(m_page_buckets[bucket][i - 1]);
-                    return true;
-                }
-            }
-            if (!failed)
-            {
-                uint8* base_ptr;
-                ++m_pages;
-                D3DBuffer* buffer = NULL;
-                if (gRenDev->m_DevMan.CreateBuffer(
-                        s_PoolConfig.m_cb_bank_size
-                        , 1
-                        , CDeviceManager::USAGE_DIRECT_ACCESS
-                        | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-                        | CDeviceManager::USAGE_DIRECT_ACCESS_GPU_COHERENT
-#ifdef CRY_USE_DX12
-                        // under dx12 there is direct access, but through the dynamic-usage flag
-                        | CDeviceManager::USAGE_DYNAMIC
-                        | CDeviceManager::USAGE_CPU_WRITE
-#endif
-                        , CDeviceManager::BIND_CONSTANT_BUFFER
-                        , &buffer) != S_OK)
-                {
-                    CryLogAlways("failed to create constant buffer pool");
-                    return false;
-                }
-                CDeviceManager::ExtractBasePointer(buffer, base_ptr);
-                m_page_buckets[bucket].push_back(
-                    new PartitionAllocator(buffer, base_ptr, s_PoolConfig.m_cb_bank_size, nsize));
-                failed = true;
-                goto retry;
-            }
-            return false;
-        }
-
-        void Free(AzRHI::ConstantBuffer* cbuffer)
-        {
-            const unsigned size = cbuffer->m_size;
-            const unsigned nsize = NextPower2(size);
-            const unsigned bucket = IntegerLog2(nsize) - 8;
-            PartitionAllocator* allocator =
-                reinterpret_cast<PartitionAllocator*>(cbuffer->m_allocator);
-            m_retired_slots[m_frameid].push_back(
-                std::make_pair(allocator, (uint16)(cbuffer->m_offset >> (bucket + 8))));
-        }
-
-        void Update(uint32 frame_id, DeviceFenceHandle fence, [[maybe_unused]] bool allow_defragmentation)
-        {
-            m_frameid = frame_id & PoolConfig::POOL_FRAME_QUERY_MASK;
-            for (size_t i = m_frameid; i < m_frameid + PoolConfig::POOL_FRAME_QUERY_COUNT; ++i)
-            {
-                size_t idx = i & PoolConfig::POOL_FRAME_QUERY_MASK;
-                if (m_fences[idx] && gRenDev->m_DevMan.SyncFence(m_fences[idx], false, false) == S_OK)
-                {
-                    for (size_t j = 0, end = m_retired_slots[idx].size(); j < end; ++j)
-                    {
-                        const RetiredSlot& slot = m_retired_slots[idx][j];
-                        slot.first->deallocate(slot.second);
-                    }
-                    m_retired_slots[idx].clear();
-                }
-            }
-            m_fences[m_frameid] = fence;
-        }
-    };
-# endif
-
-namespace
-{
-    struct BufferPool
-    {
-    protected:
-        BufferItemTable m_item_table;
-        BufferPoolBankTable m_bank_table;
-
-    public:
-        // This lock must be held when operating on the buffers
-        SRecursiveSpinLock m_lock;
-
-        BufferPool()
-            : m_item_table()
-            , m_bank_table()
-        {}
-        virtual ~BufferPool() {}
-
-        virtual item_handle_t Allocate(size_t) { return ~0u; }
-        virtual void Free([[maybe_unused]] BufferPoolItem* item) { }
-        virtual bool CreateResources(bool, bool) { return false; }
-        virtual bool FreeResources() { return false; }
-        virtual bool GetStats(SDeviceBufferPoolStats&) { return false; }
-        virtual bool DebugRender() { return false; }
-        virtual void Sync() {}
-        virtual void Update([[maybe_unused]] uint32 frameId, [[maybe_unused]] DeviceFenceHandle fence, [[maybe_unused]] bool allow_defragmentation) {}
-        virtual void ReleaseEmptyBanks() {}
-        virtual void* BeginRead([[maybe_unused]] BufferPoolItem* item) { return NULL; }
-        virtual void* BeginWrite([[maybe_unused]] BufferPoolItem* item) { return NULL; }
-        virtual void  EndReadWrite([[maybe_unused]] BufferPoolItem* item, [[maybe_unused]] bool requires_flush) {}
-        virtual void Write([[maybe_unused]] BufferPoolItem* item, [[maybe_unused]] const void* src, [[maybe_unused]] size_t size) { __debugbreak(); }
-        BufferPoolItem* Resolve(item_handle_t handle) { return &m_item_table[handle]; }
-    };
-
-    template<
-        size_t BIND_FLAGS,
-        size_t USAGE_FLAGS,
-        typename Allocator,
-        template<size_t> class Updater,
-        size_t ALIGNMENT = PoolConfig::POOL_ALIGNMENT>
-    struct BufferPoolImpl
-        : public BufferPool
-        , private IDefragAllocatorPolicy
-    {
-        typedef Allocator allocator_t;
-        typedef Updater<BIND_FLAGS> updater_t;
-
-        // The item allocator backing this storage
-        allocator_t m_allocator;
-
-        // The update strategy implementation
-        updater_t m_updater;
-
-        // The list of banks this pool uses
-        std::vector<size_t, stl::STLGlobalAllocator<size_t> > m_banks;
-
-        // Deferred items for unpinning && deletion
-        struct SDeferredItems
-        {
-            DeviceFenceHandle m_fence;
-            util::list<BufferPoolItem> m_deleted_items;
-            SDeferredItems()
-                : m_fence()
-                , m_deleted_items()
-            {}
-            ~SDeferredItems()
-            {
-                AZRHI_ASSERT(m_deleted_items.empty());
-            }
-        };
-        SDeferredItems m_deferred_items[PoolConfig::POOL_FRAME_QUERY_COUNT];
-
-        // The relocation list of all items that need to be relocated at the
-        // beginning of the next frame
-        util::list<BufferPoolItem> m_cow_relocation_list;
-
-        // The current frame id
-        uint32 m_current_frame;
-
-        // The current fence of the device
-        DeviceFenceHandle m_current_fence;
-
-        // The current fence of the device
-        DeviceFenceHandle m_lockstep_fence;
-
-        // Syncs to gpu should (debugging only)
-        void SyncToGPU([[maybe_unused]] bool block)
-        {
-#     if !defined(_RELEASE)
-            if (m_lockstep_fence && block)
-            {
-                gRenDev->m_DevMan.IssueFence(m_lockstep_fence);
-                gRenDev->m_DevMan.SyncFence(m_lockstep_fence, true);
-            }
-#     endif
-        }
-
-        // The list of moves we need to perform
-        struct SPendingMove
-        {
-            IDefragAllocatorCopyNotification* m_notification;
-            item_handle_t m_item_handle;
-            UINT_PTR m_src_offset;
-            UINT_PTR m_dst_offset;
-            UINT_PTR m_size;
-            DeviceFenceHandle m_copy_fence;
-            DeviceFenceHandle m_relocate_fence;
-            bool m_moving : 1;
-            bool m_relocating : 1;
-            bool m_relocated : 1;
-            bool m_canceled : 1;
-
-            SPendingMove()
-                : m_notification()
-                , m_item_handle(~0u)
-                , m_src_offset(-1)
-                , m_dst_offset(-1)
-                , m_size()
-                , m_copy_fence()
-                , m_relocate_fence()
-                , m_moving()
-                , m_relocating()
-                , m_relocated()
-                , m_canceled()
-            {}
-            ~SPendingMove()
-            {
-                if (m_copy_fence)
-                {
-                    gRenDev->m_DevMan.ReleaseFence(m_copy_fence);
-                }
-                if (m_relocate_fence)
-                {
-                    gRenDev->m_DevMan.ReleaseFence(m_relocate_fence);
-                }
-            }
-        };
-        std::vector<SPendingMove, stl::STLGlobalAllocator<SPendingMove> > m_pending_moves;
-
-        void ProcessPendingMove(SPendingMove& move, bool block)
-        {
-            bool done = false;
-            // Should have finished by now ... soft-sync to fence, if not done, don't finish
-            if (move.m_moving)
-            {
-                if (gRenDev->m_DevMan.SyncFence(move.m_copy_fence, block, block) == S_OK)
-                {
-                    move.m_notification->bDstIsValid = true;
-                    move.m_moving = false;
-                }
-            }
-            // Only finish the relocation by informing the defragger if the gpu has caught up to the
-            // point where the new destination has been considered valid
-            else if (move.m_relocating)
-            {
-                if (gRenDev->m_DevMan.SyncFence(move.m_relocate_fence, block, block) == S_OK)
-                {
-                    move.m_notification->bSrcIsUnneeded = true;
-                    move.m_relocating = false;
-                    done = true;
-                }
-            }
-            else if (move.m_canceled)
-            {
-                move.m_notification->bSrcIsUnneeded = true;
-                done = true;
-            }
-            if (done)
-            {
-                UINT_PTR nDecOffs = move.m_canceled && !move.m_relocated
-                    ? move.m_dst_offset
-                    : move.m_src_offset;
-
-                {
-                    int nSrcBank = nDecOffs / s_PoolConfig.m_pool_bank_size;
-                    BufferPoolBank* bank = &m_bank_table[m_banks[nSrcBank]];
-                    bank->m_free_space += move.m_size;
-                }
-
-                move.m_moving = false;
-                move.m_relocating = false;
-                move.m_relocated = false;
-                move.m_canceled = false;
-                move.m_notification = NULL;
-            }
-        }
-
-        // Creates a new bank for the buffer
-        BufferPoolBank* CreateBank()
-        {
-            FUNCTION_PROFILER_RENDERER;
-            // Allocate a new bank
-            size_t bank_index = ~0u;
-            D3DBuffer* buffer;
-            BufferPoolBank* bank = NULL;
-            {
-                if (gRenDev->m_DevMan.CreateBuffer(
-                        s_PoolConfig.m_pool_bank_size
-                        , 1
-                        , USAGE_FLAGS | CDeviceManager::USAGE_DIRECT_ACCESS
-                        , BIND_FLAGS
-                        , &buffer) != S_OK)
-                {
-                    CryLogAlways("SBufferPoolImpl::Allocate: could not allocate additional bank of size %" PRISIZE_T, s_PoolConfig.m_pool_bank_size);
-                    return NULL;
-                }
-            }
-            bank = &m_bank_table[bank_index = m_bank_table.Allocate()];
-            bank->m_buffer     = buffer;
-            bank->m_capacity   = s_PoolConfig.m_pool_bank_size;
-            bank->m_free_space = s_PoolConfig.m_pool_bank_size;
-            CDeviceManager::ExtractBasePointer(buffer, bank->m_base_ptr);
-            m_banks.push_back(bank_index);
-            return bank;
-        }
-
-        void PrintDebugStats()
-        {
-            SDeviceBufferPoolStats stats;
-            stats.bank_size = s_PoolConfig.m_pool_bank_size;
-            for (size_t i = 0, end = m_banks.size(); i < end; ++i)
-            {
-                const BufferPoolBank& bank = m_bank_table[m_banks[i]];
-                stats.num_banks += bank.m_buffer ? 1 : 0;
-            }
-            m_allocator.GetStats(stats.allocator_stats);
-            stats.num_allocs = stats.allocator_stats.nInUseBlocks;
-
-            CryLogAlways("SBufferPoolImpl Stats : %04" PRISIZE_T " num_banks %06" PRISIZE_T " allocations"
-                , stats.num_banks, stats.num_allocs);
-        }
-
-        // Recreates a previously freed bank
-        bool RecreateBank(BufferPoolBank* bank)
-        {
-            FUNCTION_PROFILER_RENDERER;
-            {
-                if (gRenDev->m_DevMan.CreateBuffer(
-                        s_PoolConfig.m_pool_bank_size
-                        , 1
-                        , USAGE_FLAGS | CDeviceManager::USAGE_DIRECT_ACCESS
-                        , BIND_FLAGS
-                        , &bank->m_buffer) != S_OK)
-                {
-                    CryLogAlways("SBufferPoolImpl::Allocate: could not re-allocate freed bank of size %" PRISIZE_T, s_PoolConfig.m_pool_bank_size);
-                    return false;
-                }
-            }
-            CDeviceManager::ExtractBasePointer(bank->m_buffer, bank->m_base_ptr);
-            return true;
-        }
-
-        void RetireEmptyBanks()
-        {
-            for (size_t i = 0, end = m_banks.size(); i < end; ++i)
-            {
-                BufferPoolBank& bank = m_bank_table[m_banks[i]];
-                IF (bank.m_capacity != bank.m_free_space, 1)
-                {
-                    continue;
-                }
-                UnsetStreamSources(bank.m_buffer);
-                ReleaseD3DBuffer(bank.m_buffer);
-                bank.m_base_ptr = NULL;
-            }
-        }
-
-        void RetirePendingFrees(SDeferredItems& deferred)
-        {
-            for (util::list<BufferPoolItem>* iter = deferred.m_deleted_items.next;
-                 iter != &deferred.m_deleted_items; iter = iter->next)
-            {
-                BufferPoolItem* item = iter->item<& BufferPoolItem::m_deferred_list>();
-                BufferPoolBank& bank = m_bank_table[m_banks[item->m_bank]];
-                bank.m_free_space += item->m_size;
-                m_allocator.Free(item);
-            }
-            deferred.m_deleted_items.erase();
-        }
-
-        void PerformPendingCOWRelocations()
-        {
-            for (util::list<BufferPoolItem>* iter = m_cow_relocation_list.next;
-                 iter != &m_cow_relocation_list; iter = iter->next)
-            {
-                BufferPoolItem* item = iter->item<& BufferPoolItem::m_deferred_list>();
-                BufferPoolItem* new_item = &m_item_table[item->m_cow_handle];
-
-                item->Relocate(*new_item);
-                Free(new_item);
-                item->m_cow_handle = ~0u;
-            }
-            m_cow_relocation_list.erase();
-        }
-
-        // Implementation of IDefragAllocatorPolicy below
-        uint32 BeginCopy(
-            void* pContext
-            , UINT_PTR dstOffset
-            , UINT_PTR srcOffset
-            , UINT_PTR size
-            , IDefragAllocatorCopyNotification* pNotification)
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVBUFFER_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(DevBuffer_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(APPLE)
-            // using a C-cast here breaks
-            item_handle_t handle = reinterpret_cast<TRUNCATE_PTR>(pContext);
-#elif defined(LINUX)
-            // using a C-cast here breaks
-            item_handle_t handle = reinterpret_cast<TRUNCATE_PTR>(pContext);
-#else
-            item_handle_t handle = static_cast<item_handle_t>(reinterpret_cast<uintptr_t>(pContext));
-#endif
-
-            BufferPoolItem* old_item = &m_item_table[handle];
-            BufferPoolBank* bank = NULL;
-            size_t pm = ~0u, bank_index;
-            for (size_t i = 0; i < m_pending_moves.size(); ++i)
-            {
-                if (m_pending_moves[i].m_notification != NULL)
-                {
-                    continue;
-                }
-                pm = i;
-                break;
-            }
-            if (pm == ~0u)
-            {
-                return 0;
-            }
-            old_item = &m_item_table[handle];
-            bank_index = (dstOffset / s_PoolConfig.m_pool_bank_size);
-            AZRHI_ASSERT(bank_index < m_banks.size());
-            bank = &m_bank_table[m_banks[bank_index]];
-            // The below should never happen in practice, but who knows for sure, so to be
-            // on the safe side we account for the fact that the allocator might want to move
-            // an allocation onto an empty bank.
-            IF (bank->m_buffer == NULL, 0)
-            {
-                if (RecreateBank(bank) == false)
-                {
-                    CryLogAlways("SBufferPoolImpl::Allocate: could not re-allocate freed bank of size %" PRISIZE_T, s_PoolConfig.m_pool_bank_size);
-                    return 0;
-                }
-            }
-            bank->m_free_space -= size;
-
-            SPendingMove& pending = m_pending_moves[pm];
-            pending.m_notification = pNotification;
-            pending.m_item_handle = handle;
-            pending.m_src_offset = srcOffset;
-            pending.m_dst_offset = dstOffset;
-            pending.m_size = size;
-
-            // Perform the actual move in (hopefully) hardware
-            m_updater.Move(
-                bank->m_buffer
-                , size
-                , dstOffset & s_PoolConfig.m_pool_bank_mask
-                , old_item->m_buffer
-                , old_item->m_size
-                , old_item->m_offset);
-
-            // Issue a fence so that the copy can be synced
-            gRenDev->m_DevMan.IssueFence(pending.m_copy_fence);
-            pending.m_moving = true;
-            // The move will be considered "done" (bDstIsValid) on the next Update call
-            // thanks to r_flush being one, this is always true!
-            return pm + 1;
-        }
-        void Relocate(uint32 userMoveId, [[maybe_unused]] void* pContext, [[maybe_unused]] UINT_PTR newOffset, [[maybe_unused]] UINT_PTR oldOffset, [[maybe_unused]] UINT_PTR size)
-        {
-            // Swap both items. The previous item will be the new item and will get freed upon
-            // the next update loop
-            SPendingMove& move = m_pending_moves[userMoveId - 1];
-            AZRHI_ASSERT(move.m_relocating == false);
-            BufferPoolItem& item = m_item_table[move.m_item_handle];
-            BufferPoolBank* bank = &m_bank_table[m_banks[item.m_bank]];
-            item.m_bank   = move.m_dst_offset / s_PoolConfig.m_pool_bank_size;
-            item.m_offset = move.m_dst_offset & s_PoolConfig.m_pool_bank_mask;
-            bank = &m_bank_table[m_banks[item.m_bank]];
-            item.m_buffer = bank->m_buffer;
-            // Issue a fence so that the previous location will only be able
-            // to be shelled after this point in terms of gpu execution
-            gRenDev->m_DevMan.IssueFence(move.m_relocate_fence);
-            move.m_relocating = true;
-            move.m_relocated = true;
-        }
-        void CancelCopy(uint32 userMoveId, [[maybe_unused]] void* pContext, [[maybe_unused]] bool bSync)
-        {
-            // Remove the move from the list of pending moves, free the destination item
-            // as it's not going to be used anymore
-            SPendingMove& move = m_pending_moves[userMoveId - 1];
-            move.m_canceled = true;
-        }
-        void SyncCopy([[maybe_unused]] void* pContext, [[maybe_unused]] UINT_PTR dstOffset, [[maybe_unused]] UINT_PTR srcOffset, [[maybe_unused]] UINT_PTR size) { __debugbreak(); }
-
-    public:
-        BufferPoolImpl(StagingResources& resources)
-            : m_allocator(m_item_table)
-            , m_updater(resources)
-            , m_banks()
-            , m_current_frame()
-            , m_current_fence()
-            , m_lockstep_fence()
-            , m_pending_moves()
-        {}
-        virtual ~BufferPoolImpl() {}
-
-        bool GetStats(SDeviceBufferPoolStats& stats)
-        {
-            stats.bank_size = s_PoolConfig.m_pool_bank_size;
-            for (size_t i = 0, end = m_banks.size(); i < end; ++i)
-            {
-                const BufferPoolBank& bank = m_bank_table[m_banks[i]];
-                stats.num_banks += bank.m_buffer ? 1 : 0;
-            }
-            m_allocator.GetStats(stats.allocator_stats);
-            stats.num_allocs = stats.allocator_stats.nInUseBlocks;
-            return true;
-        }
-
-        // Try to satisfy an allocation of a given size from within the pool
-        // allocating a new bank if all previously created banks are full
-        item_handle_t Allocate(size_t size)
-        {
-            D3DBuffer* buffer = NULL;
-            BufferPoolItem* item = NULL;
-            BufferPoolBank* bank = NULL;
-            size_t bank_index = 0u;
-            item_handle_t handle;
-            bool failed = false;
-
-            // Align the allocation size up to the configured allocation alignment
-            size = (max(size, size_t(1u)) + (ALIGNMENT - 1)) & ~(ALIGNMENT - 1);
-
-            // Handle the case where an allocation cannot be satisfied by a pool bank
-            // as the size is too large and create a free standing buffer therefore.
-            // Note: Care should be taken to reduce the amount of unpooled items!
-            IF (size > s_PoolConfig.m_pool_bank_size, 0)
-            {
-freestanding:
-                if (gRenDev->m_DevMan.CreateBuffer(
-                        size
-                        , 1
-                        , USAGE_FLAGS | CDeviceManager::USAGE_DIRECT_ACCESS
-                        , BIND_FLAGS
-                        , &buffer) != S_OK)
-                {
-                    CryLogAlways("SBufferPoolImpl::Allocate: could not allocate buffer of size %" PRISIZE_T, size);
-                    gEnv->bIsOutOfVideoMemory = true;
-                    return ~0u;
-                }
-                item = &m_item_table[handle = m_item_table.Allocate()];
-                item->m_buffer = buffer;
-                item->m_pool   = this;
-                item->m_offset = 0u;
-                item->m_bank   = ~0u;
-                item->m_size   = size;
-                item->m_defrag_handle = IDefragAllocator::InvalidHdl;
-                CDeviceManager::ExtractBasePointer(buffer, item->m_base_ptr);
-                return handle;
-            }
-
-            // Find a bank that can satisfy the allocation. If none could be found,
-            // add an additional bank and retry, if allocations still fail, flag error
-retry:
-            if ((handle = m_allocator.Allocate(size, item)) != ~0u)
-            {
-                item->m_pool   = this;
-                item->m_bank   = (bank_index = (item->m_offset / s_PoolConfig.m_pool_bank_size));
-                item->m_offset &= s_PoolConfig.m_pool_bank_mask;
-                AZRHI_ASSERT(bank_index < m_banks.size());
-                bank = &m_bank_table[m_banks[bank_index]];
-                IF (bank->m_buffer == NULL, 0)
-                {
-                    if (RecreateBank(bank) == false)
-                    {
-                        m_allocator.Free(item);
-                        return ~0u;
-                    }
-                }
-                item->m_buffer = bank->m_buffer;
-                bank->m_free_space -= size;
-                return handle;
-            }
-            if (failed) // already tried once
-            {
-                CryLogAlways("SBufferPoolImpl::Allocate: could not allocate pool item of size %" PRISIZE_T, size);
-                // Try to allocate a free standing buffer now ... fingers crossed
-                goto freestanding;
-            }
-            if ((bank = CreateBank()) == NULL)
-            {
-                gEnv->bIsOutOfVideoMemory = true;
-                return ~0u;
-            }
-            if (!m_allocator.Extend(bank))
-            {
-#       ifndef _RELEASE
-                CryLogAlways("SBufferPoolImpl::Allocate: WARNING: "
-                    "could not extend allocator segment. Performing a free standing allocation!"
-                    "(backing allocator might have run out of handles, please check)");
-                PrintDebugStats();
-#       endif
-
-                // Extending the allocator failed, so the newly created bank is rolled back
-                UnsetStreamSources(bank->m_buffer);
-                ReleaseD3DBuffer(bank->m_buffer);
-                m_bank_table.Free(bank->m_handle);
-                m_banks.erase(m_banks.end() - 1);
-                // Try to allocate a free standing buffer now ... fingers crossed
-                goto freestanding;
-            }
-
-            failed = true; // Prevents an infinite loop
-            goto retry;
-        }
-
-        // Free a previously made allocation
-        void Free(BufferPoolItem* item)
-        {
-            AZRHI_ASSERT(item);
-            // Handle un pooled buffers
-            IF ((item->m_bank) == ~0u, 0)
-            {
-                UnsetStreamSources(item->m_buffer);
-                ReleaseD3DBuffer(item->m_buffer);
-                m_item_table.Free(item->m_handle);
-                return;
-            }
-            item->m_deferred_list.relink_tail(m_deferred_items[m_current_frame].m_deleted_items);
-        }
-
-        bool CreateResources(bool enable_defragging, bool best_fit)
-        {
-            IDefragAllocatorPolicy* defrag_policy = enable_defragging ? this : NULL;
-            if (!m_allocator.Initialize(defrag_policy, best_fit))
-            {
-                CryLogAlways("buffer pool allocator failed to create resources");
-                return false;
-            }
-            if (!m_updater.CreateResources())
-            {
-                CryLogAlways("Buffer pool updater failed to create resources");
-                return false;
-            }
-            m_pending_moves.resize(s_PoolConfig.m_pool_max_moves_per_update);
-            for (size_t i = 0; i < s_PoolConfig.m_pool_max_moves_per_update; ++i)
-            {
-                if (gRenDev->m_DevMan.CreateFence(m_pending_moves[i].m_copy_fence) != S_OK)
-                {
-                    CryLogAlways("Could not create buffer pool copy gpu fence");
-                    return false;
-                }
-                if (gRenDev->m_DevMan.CreateFence(m_pending_moves[i].m_relocate_fence) != S_OK)
-                {
-                    CryLogAlways("Could not create buffer pool relocate fence");
-                    return false;
-                }
-            }
-            if (gRenDev->m_DevMan.CreateFence(m_lockstep_fence) != S_OK)
-            {
-                CryLogAlways("Could not create lockstep debugging fence");
-                return false;
-            }
-            return true;
-        }
-
-        bool FreeResources()
-        {
-            Sync();
-            if (m_updater.FreeResources() == false)
-            {
-                return false;
-            }
-            if (m_allocator.Shutdown() == false)
-            {
-                return false;
-            }
-            for (size_t i = 0, end = m_banks.size(); i < end; ++i)
-            {
-                m_bank_table.Free((item_handle_t)m_banks[i]);
-            }
-            if (m_lockstep_fence && gRenDev->m_DevMan.ReleaseFence(m_lockstep_fence) != S_OK)
-            {
-                return false;
-            }
-            stl::free_container(m_banks);
-            stl::free_container(m_pending_moves);
-            return true;
-        }
-
-        void ReleaseEmptyBanks() { RetireEmptyBanks(); }
-
-        void Sync()
-        {
-            for (size_t i = 0, end = m_pending_moves.size(); i < end; ++i)
-            {
-                SPendingMove& move = m_pending_moves[i];
-                if (move.m_notification == NULL)
-                {
-                    continue;
-                }
-                ProcessPendingMove(move, true);
-            }
-
-            // Update all deferred items
-            for (int32 i = 0; i < PoolConfig::POOL_FRAME_QUERY_COUNT; ++i)
-            {
-                RetirePendingFrees(m_deferred_items[i]);
-            }
-
-            PerformPendingCOWRelocations();
-
-            // Free any banks that remained free until now
-            RetireEmptyBanks();
-        }
-
-        void Update(uint32 frame_id, DeviceFenceHandle fence, bool allow_defragmentation)
-        {
-            // Loop over the pending moves and update their state accordingly
-            uint32 inflight = 0;
-            for (size_t i = 0, end = m_pending_moves.size(); i < end; ++i)
-            {
-                SPendingMove& move = m_pending_moves[i];
-                if (move.m_notification == NULL)
-                {
-                    continue;
-                }
-                ProcessPendingMove(move, false);
-                ++inflight;
-            }
-
-            // Update the current deferred items
-            m_current_frame = (frame_id + 1) & PoolConfig::POOL_FRAME_QUERY_MASK;
-            for (uint32 i = m_current_frame; i < m_current_frame + PoolConfig::POOL_FRAME_QUERY_COUNT; ++i)
-            {
-                SDeferredItems& deferred = m_deferred_items[i & PoolConfig::POOL_FRAME_QUERY_MASK];
-                if (deferred.m_fence && gRenDev->m_DevMan.SyncFence(deferred.m_fence, false, false) != S_OK)
-                {
-                    continue;
-                }
-                RetirePendingFrees(deferred);
-            }
-            m_deferred_items[m_current_frame & PoolConfig::POOL_FRAME_QUERY_MASK].m_fence = fence;
-            m_current_fence = fence;
-
-            PerformPendingCOWRelocations();
-
-            // Let the allocator free the items that were retired
-            m_allocator.Update(min(inflight, (uint32)s_PoolConfig.m_pool_max_moves_per_update)
-                , frame_id, allow_defragmentation);
-        }
-////////
-        // Buffer IO methods
-        void* BeginRead(BufferPoolItem* item)
-        {
-            SyncToGPU(CRenderer::CV_r_enable_full_gpu_sync != 0);
-
-            AZRHI_VERIFY(item->m_used);
-            IF (item->m_bank != ~0u, 1)
-            {
-                m_allocator.PinItem(item);
-            }
-            IF (item->m_bank != ~0u, 1)
-            {
-                BufferPoolBank& bank = m_bank_table[m_banks[item->m_bank]];
-                IF (bank.m_base_ptr != NULL && CRenderer::CV_r_buffer_enable_lockless_updates, 1)
-                {
-                    return bank.m_base_ptr + item->m_offset;
-                }
-            }
-            return m_updater.BeginRead(item->m_buffer, item->m_size, item->m_offset);
-        }
-
-        void* BeginWrite(BufferPoolItem* item)
-        {
-            SyncToGPU(CRenderer::CV_r_enable_full_gpu_sync != 0);
-            // In case item was previously used and the current last fence can not be
-            // synced already we allocate a new item and swap it with the existing one
-            // to make sure that we do not contend with the gpu on an already
-            // used item's buffer update.
-            IF (item->m_bank != ~0u, 1)
-            {
-                m_allocator.PinItem(item);
-            }
-            IF (item->m_bank != ~0u && item->m_used /*&& gRenDev->m_DevMan.SyncFence(m_current_fence, false) != S_OK*/, 0)
-            {
-                item_handle_t handle = Allocate(item->m_size);
-                if (handle == ~0u)
-                {
-                    CryLogAlways("failed to allocate new slot on write");
-                    return NULL;
-                }
-                item->m_cow_handle = handle;
-
-                BufferPoolItem* new_item = &m_item_table[handle];
-                // Pin the item so that the defragger does not come up with
-                // the idea of moving this item because it will be invalidated
-                // soon as we are moving the allocation to a pristine location (not used by the gpu).
-                // Relocate the old item to the new pristine allocation
-                IF (new_item->m_bank != ~0u, 1)
-                {
-                    m_allocator.PinItem(new_item);
-                }
-
-                // Return the memory of the newly allocated item
-                item = new_item;
-            }
-            item->m_used = 1u;
-            PREFAST_SUPPRESS_WARNING(6326)
-            if constexpr ((USAGE_FLAGS& CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT) == 0)
-            {
-                item->m_cpu_flush = 1;
-            }
-            if constexpr ((USAGE_FLAGS& CDeviceManager::USAGE_DIRECT_ACCESS_GPU_COHERENT) == 0)
-            {
-                item->m_gpu_flush = 1;
-            }
-            IF (item->m_bank != ~0u, 1)
-            {
-                BufferPoolBank& bank = m_bank_table[m_banks[item->m_bank]];
-                IF (bank.m_base_ptr != NULL && CRenderer::CV_r_buffer_enable_lockless_updates, 1)
-                {
-                    return bank.m_base_ptr + item->m_offset;
-                }
-            }
-            return m_updater.BeginWrite(item->m_buffer, item->m_size, item->m_offset);
-        }
-
-        void EndReadWrite(BufferPoolItem* item, [[maybe_unused]] bool requires_flush)
-        {
-            IF (item->m_cow_handle != ~0u, 0)
-            {
-                BufferPoolItem* new_item = &m_item_table[item->m_cow_handle];
-                IF (gRenDev->m_pRT->IsRenderThread(), 1)
-                {
-                    // As we are now relocating the allocation, we also need
-                    // to free the previous allocation
-                    item->Relocate(*new_item);
-                    Free(new_item);
-
-                    item->m_cow_handle = ~0u;
-                }
-                else
-                {
-                    item->m_cow_list.relink_tail(m_cow_relocation_list);
-                    item = new_item;
-                }
-            }
-            IF (item->m_bank != ~0u, 1)
-            {
-                m_allocator.UnpinItem(item);
-                if IsCVarConstAccess(constexpr) (CRenderer::CV_r_buffer_enable_lockless_updates)
-                {
-#         if BUFFER_ENABLE_DIRECT_ACCESS
-                    BufferPoolBank* bank = &m_bank_table[m_banks[item->m_bank]];
-                    if (item->m_cpu_flush)
-                    {
-                        if (requires_flush)
-                        {
-                            CDeviceManager::InvalidateCpuCache(
-                                bank->m_base_ptr, item->m_size, item->m_offset);
-                        }
-                        item->m_cpu_flush = 0;
-                    }
-                    if (item->m_gpu_flush)
-                    {
-                        gRenDev->m_DevMan.InvalidateBuffer(
-                            bank->m_buffer
-                            , bank->m_base_ptr
-                            , item->m_offset
-                            , item->m_size
-                            , _GetThreadID());
-                        item->m_gpu_flush = 0;
-                    }
-#         endif
-                }
-            }
-            m_updater.EndReadWrite();
-
-            SyncToGPU(CRenderer::CV_r_enable_full_gpu_sync != 0);
-        }
-
-        void Write(BufferPoolItem* item, const void* src, size_t size)
-        {
-            AZRHI_ASSERT(size <= item->m_size);
-
-            if (item->m_size <= s_PoolConfig.m_pool_bank_size)
-            {
-                void* const dst = BeginWrite(item);
-                IF (dst, 1)
-                {
-                    const size_t csize = min((size_t)item->m_size, size);
-                    const bool requires_flush = CopyData(dst, src, csize);
-                    EndReadWrite(item, requires_flush);
-                }
-                return;
-            }
-
-            AZRHI_ASSERT(item->m_bank == ~0u);
-            AZRHI_ASSERT(item->m_cow_handle == ~0u);
-
-            SyncToGPU(gRenDev->CV_r_enable_full_gpu_sync != 0);
-
-            item->m_used = 1u;
-
-            for (size_t offset = 0; offset < size; )
-            {
-                const size_t sz = min(size - offset, s_PoolConfig.m_pool_bank_size);
-                void* const dst = m_updater.BeginWrite(item->m_buffer, sz, item->m_offset + offset);
-                IF (dst, 1)
-                {
-                    const bool requires_flush = CopyData(dst, ((char*)src) + offset, sz);
-                }
-                m_updater.EndReadWrite();
-                offset += sz;
-            }
-
-            SyncToGPU(gRenDev->CV_r_enable_full_gpu_sync != 0);
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////////////////
-    // SStaticBufferPool A buffer pool for geometry that change infrequently and have a
-    // significant lifetime
-    //
-    // Use this pool for example for :
-    //    - streamed static geometry
-    //    - geometry that rarely changes
-    //
-    // Corresponding D3D_USAGE : USAGE_DEFAULT
-    // Corresponding update strategy : d3d11 staging buffers (CopySubResource)
-    //
-    typedef BufferPoolImpl<
-        CDeviceManager::BIND_VERTEX_BUFFER
-        , CDeviceManager::USAGE_DEFAULT | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        , DynamicDefragAllocator
-  #     if BUFFER_USE_STAGED_UPDATES
-        , StaticBufferUpdater
-  #     else
-        , DirectBufferUpdater
-  #     endif
-        > StaticBufferPoolVB;
-    typedef BufferPoolImpl<
-        CDeviceManager::BIND_INDEX_BUFFER
-        , CDeviceManager::USAGE_DEFAULT | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        , DynamicDefragAllocator
-  #     if BUFFER_USE_STAGED_UPDATES
-        , StaticBufferUpdater
-  #     else
-        , DirectBufferUpdater
-  #     endif
-        > StaticBufferPoolIB;
-
-    //////////////////////////////////////////////////////////////////////////////////////
-    // SDynamicBufferPool A buffer pool for geometry that can change frequently but rarely
-    // changes topology
-    //
-    // Use this pool for example for :
-    //    - deforming geometry that is updated on the CPU
-    //    - characters skinned in software
-    //
-    // Corresponding D3D_USAGE : USAGE_DYNAMIC
-    // Corresponding update strategy : NO_OVERWRITE direct map of the buffer
-    typedef BufferPoolImpl<
-        CDeviceManager::BIND_VERTEX_BUFFER
-        , CDeviceManager::USAGE_DYNAMIC
-        | CDeviceManager::USAGE_CPU_WRITE
-        | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        | CDeviceManager::USAGE_DIRECT_ACCESS_GPU_COHERENT
-        , DynamicDefragAllocator
-#     if BUFFER_USE_STAGED_UPDATES
-        , DynamicBufferUpdater
-#     else
-        , DirectBufferUpdater
-#     endif
-        > DynamicBufferPoolVB;
-    typedef BufferPoolImpl<
-        CDeviceManager::BIND_INDEX_BUFFER
-        , CDeviceManager::USAGE_DYNAMIC
-        | CDeviceManager::USAGE_CPU_WRITE
-        | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        | CDeviceManager::USAGE_DIRECT_ACCESS_GPU_COHERENT
-        , DynamicDefragAllocator
-#     if BUFFER_USE_STAGED_UPDATES
-        , DynamicBufferUpdater
-#     else
-        , DirectBufferUpdater
-#     endif
-        > DynamicBufferPoolIB;
-
-# if BUFFER_SUPPORT_TRANSIENT_POOLS
-    template<size_t BIND_FLAGS, size_t ALIGNMENT = PoolConfig::POOL_ALIGNMENT>
-    class TransientBufferPool
-        : public BufferPool
-    {
-        BufferPoolBank m_backing_buffer;
-        size_t m_allocation_count;
-        D3D11_MAP m_map_type;
-
-    public:
-        TransientBufferPool()
-            : m_backing_buffer(~0u)
-            , m_allocation_count()
-            , m_map_type(D3D11_MAP_WRITE_NO_OVERWRITE)
-        {
-        }
-
-        item_handle_t Allocate(size_t size)
-        {
-            // Align the allocation size up to the configured allocation alignment
-            size = (max(size, size_t(1u)) + (ALIGNMENT - 1)) & ~(ALIGNMENT - 1);
-
-            AZRHI_ASSERT(size <= m_backing_buffer.m_capacity);
-
-            if (m_backing_buffer.m_free_space + size >= m_backing_buffer.m_capacity)
-            {
-                m_map_type = D3D11_MAP_WRITE_DISCARD;
-                m_backing_buffer.m_free_space = 0;
-            }
-
-            BufferPoolItem* item = &m_item_table[m_item_table.Allocate()];
-            item->m_buffer = m_backing_buffer.m_buffer;
-            item->m_pool   = this;
-            item->m_offset = m_backing_buffer.m_free_space;
-            item->m_bank   = ~0u;
-            item->m_size   = size;
-            item->m_defrag_handle = IDefragAllocator::InvalidHdl;
-            CDeviceManager::ExtractBasePointer(m_backing_buffer.m_buffer, item->m_base_ptr);
-
-            m_backing_buffer.m_free_space += size;
-            ++m_allocation_count;
-
-            return item->m_handle;
-        }
-        void Free(BufferPoolItem* item)
-        {
-            m_item_table.Free(item->m_handle);
-            --m_allocation_count;
-        }
-        bool CreateResources(bool, bool)
-        {
-            if (gRenDev->m_DevMan.CreateBuffer(
-                    s_PoolConfig.m_transient_pool_size
-                    , 1
-                    , CDeviceManager::USAGE_CPU_WRITE | CDeviceManager::USAGE_DYNAMIC | CDeviceManager::USAGE_TRANSIENT
-                    , BIND_FLAGS
-                    , &m_backing_buffer.m_buffer) != S_OK)
-            {
-                CryLogAlways(
-                    "TransientBufferPool::CreateResources: could not allocate backing buffer of size %" PRISIZE_T
-                    , s_PoolConfig.m_transient_pool_size);
-                return false;
-            }
-            m_backing_buffer.m_capacity   = s_PoolConfig.m_transient_pool_size;
-            m_backing_buffer.m_free_space = 0;
-            m_backing_buffer.m_handle = ~0u;
-            CDeviceManager::ExtractBasePointer(m_backing_buffer.m_buffer, m_backing_buffer.m_base_ptr);
-            return true;
-        }
-        bool FreeResources()
-        {
-            UnsetStreamSources(m_backing_buffer.m_buffer);
-            ReleaseD3DBuffer(m_backing_buffer.m_buffer);
-            m_backing_buffer.m_capacity   = 0;
-            m_backing_buffer.m_free_space = 0;
-            m_backing_buffer.m_handle = ~0u;
-            return true;
-        }
-        bool GetStats(SDeviceBufferPoolStats&) { return false; }
-        bool DebugRender() { return false; }
-        void Sync() {}
-        void Update([[maybe_unused]] uint32 frameId, [[maybe_unused]] DeviceFenceHandle fence, [[maybe_unused]] bool allow_defragmentation)
-        {
-            if (m_allocation_count)
-            {
-                CryFatalError(
-                    "TransientBufferPool::Update %" PRISIZE_T " allocations still in transient pool!"
-                    , m_allocation_count);
-            }
-            m_map_type = D3D11_MAP_WRITE_DISCARD;
-            m_backing_buffer.m_free_space = 0;
-        }
-        void ReleaseEmptyBanks() {}
-        void* BeginRead([[maybe_unused]] BufferPoolItem* item) { return NULL; }
-        void* BeginWrite(BufferPoolItem* item)
-        {
-            D3DBuffer* buffer = m_backing_buffer.m_buffer;
-            D3D11_MAPPED_SUBRESOURCE mapped_resource;
-            D3D11_MAP map = m_map_type;
-#if defined(OPENGL) && !DXGL_FULL_EMULATION
-            HRESULT hr = DXGLMapBufferRange(
-                    &gcpRendD3D->GetDeviceContext()
-                    , buffer
-                    , item->m_offset
-                    , item->m_size
-                    , map
-                    , 0
-                    , &mapped_resource);
-#else
-            HRESULT hr = gcpRendD3D->GetDeviceContext().Map(
-                    buffer
-                    , 0
-                    , map
-                    , 0
-                    , &mapped_resource);
-#endif
-            if (!CHECK_HRESULT(hr))
-            {
-                CryLogAlways("map of staging buffer for WRITING failed!");
-                return NULL;
-            }
-#if defined(OPENGL) && !DXGL_FULL_EMULATION
-            return reinterpret_cast<uint8*>(mapped_resource.pData);
-#else
-            return reinterpret_cast<uint8*>(mapped_resource.pData) + item->m_offset;
-#endif
-        }
-        void EndReadWrite([[maybe_unused]] BufferPoolItem* item, [[maybe_unused]] bool requires_flush)
-        {
-            gcpRendD3D->GetDeviceContext().Unmap(m_backing_buffer.m_buffer, 0);
-            m_map_type = D3D11_MAP_WRITE_NO_OVERWRITE;
-        }
-        void Write(BufferPoolItem* item, const void* src, size_t size)
-        {
-            AZRHI_ASSERT(size <= item->m_size);
-            AZRHI_ASSERT(item->m_size <= m_backing_buffer.m_capacity);
-            void* const dst = BeginWrite(item);
-            IF (dst, 1)
-            {
-                const size_t csize = min((size_t)item->m_size, size);
-                const bool requires_flush = CopyData(dst, src, csize);
-                EndReadWrite(item, requires_flush);
-            }
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////////////////
-    // TransientBufferPool is a buffer pool for geometry that can change frequently and
-    // is only valid for a single frame (fire&forgot geometry).
-    //
-    // Corresponding D3D_USAGE : USAGE_DYNAMIC
-    // Corresponding update strategy : DISCARD + NO_OVERWRITE direct map of the buffer
-    typedef TransientBufferPool<CDeviceManager::BIND_VERTEX_BUFFER> TransientBufferPoolVB;
-    typedef TransientBufferPool<CDeviceManager::BIND_INDEX_BUFFER> TransientBufferPoolIB;
-# endif
-
-    //////////////////////////////////////////////////////////////////////////
-    // Freestanding buffer implementation
-    template<
-        size_t BIND_FLAGS,
-        size_t USAGE_FLAGS,
-        typename Allocator,
-        template<size_t> class Updater>
-    struct FreeBufferPoolImpl
-        : public BufferPool
-    {
-        typedef Updater<BIND_FLAGS> updater_t;
-
-        BufferPoolBank m_backing_buffer;
-        size_t m_allocation_size;
-        size_t m_item_handle;
-        updater_t m_updater;
-
-    public:
-        FreeBufferPoolImpl(StagingResources& resources, size_t size)
-            : m_backing_buffer(~0u)
-            , m_allocation_size((max(size, size_t(1u)) + (PoolConfig::POOL_ALIGNMENT - 1)) & ~(PoolConfig::POOL_ALIGNMENT - 1))
-            , m_item_handle(~0u)
-            , m_updater(resources)
-        {
-            if (!CreateResources(true, true))
-            {
-                CryLogAlways("DEVBUFFER WARNING: could not create free standing buffer");
-            }
-        }
-
-        virtual ~FreeBufferPoolImpl()  { FreeResources();  }
-
-        item_handle_t Allocate(size_t size)
-        {
-            // Align the allocation size up to the configured allocation alignment
-            size = (max(size, size_t(1u)) + (PoolConfig::POOL_ALIGNMENT - 1)) & ~(PoolConfig::POOL_ALIGNMENT - 1);
-            if (m_item_handle != ~0u || size != m_allocation_size)
-            {
-                CryFatalError("free standing buffer allocated twice?!");
-                return ~0u;
-            }
-
-            BufferPoolItem* item = &m_item_table[m_item_table.Allocate()];
-            item->m_buffer = m_backing_buffer.m_buffer;
-            item->m_pool   = this;
-            item->m_offset = 0u;
-            item->m_bank   = ~0u;
-            item->m_size   = size;
-            item->m_defrag_handle = IDefragAllocator::InvalidHdl;
-            CDeviceManager::ExtractBasePointer(m_backing_buffer.m_buffer, item->m_base_ptr);
-
-            m_backing_buffer.m_free_space += size;
-            return (m_item_handle = item->m_handle);
-        }
-
-        void Free(BufferPoolItem* item)
-        {
-            m_item_table.Free(item->m_handle);
-
-            // We can do this safely here as only the item has a reference to
-            // this instance.
-            delete this;
-        }
-
-        bool CreateResources(bool, bool)
-        {
-            if (gRenDev->m_DevMan.CreateBuffer(
-                    m_allocation_size
-                    , 1
-                    , USAGE_FLAGS
-                    , BIND_FLAGS
-                    , &m_backing_buffer.m_buffer) != S_OK)
-            {
-                CryLogAlways(
-                    "FreeStandingBuffer::CreateResources: could not allocate backing buffer of size %" PRISIZE_T
-                    , s_PoolConfig.m_transient_pool_size);
-                return false;
-            }
-            m_backing_buffer.m_capacity = m_allocation_size;
-            m_backing_buffer.m_free_space = 0;
-            m_backing_buffer.m_handle = ~0u;
-            CDeviceManager::ExtractBasePointer(m_backing_buffer.m_buffer, m_backing_buffer.m_base_ptr);
-            return true;
-        }
-        bool FreeResources()
-        {
-            UnsetStreamSources(m_backing_buffer.m_buffer);
-            ReleaseD3DBuffer(m_backing_buffer.m_buffer);
-            m_backing_buffer.m_capacity   = 0;
-            m_backing_buffer.m_free_space = 0;
-            m_backing_buffer.m_handle = ~0u;
-            return true;
-        }
-        bool GetStats(SDeviceBufferPoolStats&) { return false; }
-        bool DebugRender() { return false; }
-        void Sync() {}
-        void Update([[maybe_unused]] uint32 frameId, [[maybe_unused]] DeviceFenceHandle fence, [[maybe_unused]] bool allow_defragmentation) {}
-        void ReleaseEmptyBanks() {}
-        void* BeginRead([[maybe_unused]] BufferPoolItem* item) { return NULL; }
-        void* BeginWrite(BufferPoolItem* item)
-        {
-            return m_updater.BeginWrite(item->m_buffer, item->m_size, item->m_offset);
-        }
-        void EndReadWrite([[maybe_unused]] BufferPoolItem* item, [[maybe_unused]] bool requires_flush)
-        {
-            m_updater.EndReadWrite();
-        }
-        static BufferPool* Create(StagingResources& resources, size_t size)
-        { return new FreeBufferPoolImpl(resources, size); }
-    };
-    typedef BufferPool* (* BufferCreateFnc)(StagingResources&, size_t);
-
-    //////////////////////////////////////////////////////////////////////////////////////
-    // A freestanding buffer for geometry that change infrequently and have a
-    // significant lifetime
-    //
-    // Use this pool for example for :
-    //    - streamed static geometry
-    //    - geometry that rarely changes
-    //
-    // Corresponding D3D_USAGE : USAGE_DEFAULT
-    // Corresponding update strategy : d3d11 staging buffers (CopySubResource)
-    //
-    typedef FreeBufferPoolImpl<
-        CDeviceManager::BIND_VERTEX_BUFFER
-        , CDeviceManager::USAGE_DEFAULT | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        , DynamicDefragAllocator
-  #     if BUFFER_USE_STAGED_UPDATES
-        , StaticBufferUpdater
-  #     else
-        , DirectBufferUpdater
-  #     endif
-        > SStaticFreeBufferVB;
-    typedef FreeBufferPoolImpl<
-        CDeviceManager::BIND_INDEX_BUFFER
-        , CDeviceManager::USAGE_DEFAULT
-        , DynamicDefragAllocator
-  #     if BUFFER_USE_STAGED_UPDATES
-        , StaticBufferUpdater
-  #     else
-        , DirectBufferUpdater
-  #     endif
-        > SStaticFreeBufferIB;
-
-
-
-    //////////////////////////////////////////////////////////////////////////////////////
-    // A free standing buffer for geometry that can change frequently but rarely
-    // changes topology
-    //
-    // Use this pool for example for :
-    //    - deforming geometry that is updated on the CPU
-    //    - characters skinned in software
-    //
-    // Corresponding D3D_USAGE : USAGE_DYNAMIC
-    // Corresponding update strategy : NO_OVERWRITE direct map of the buffer
-    typedef FreeBufferPoolImpl<
-        CDeviceManager::BIND_VERTEX_BUFFER
-        , CDeviceManager::USAGE_DYNAMIC
-        | CDeviceManager::USAGE_CPU_WRITE
-        | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        | CDeviceManager::USAGE_DIRECT_ACCESS_GPU_COHERENT
-        , DynamicDefragAllocator
-#     if BUFFER_USE_STAGED_UPDATES
-        , DynamicBufferUpdater
-#     else
-        , DirectBufferUpdater
-#     endif
-        > SDynamicFreeBufferVB;
-    typedef FreeBufferPoolImpl<
-        CDeviceManager::BIND_INDEX_BUFFER
-        , CDeviceManager::USAGE_DYNAMIC
-        | CDeviceManager::USAGE_CPU_WRITE
-        | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        | CDeviceManager::USAGE_DIRECT_ACCESS_GPU_COHERENT
-        , DynamicDefragAllocator
-#     if BUFFER_USE_STAGED_UPDATES
-        , DynamicBufferUpdater
-#     else
-        , DirectBufferUpdater
-#     endif
-        > SDynamicFreeBufferIB;
-
-    //===============================================================================
-
-#if defined(CRY_USE_DX12)
-    class CDescriptorPool
-    {
-        struct SDescriptorBlockList
-        {
-            AzRHI::PartitionTable<SDescriptorBlock> items;
-            std::vector<DX12::DescriptorBlock> blocks;
-
-            SDescriptorBlockList() {}
-            SDescriptorBlockList(SDescriptorBlockList&& other)
-            {
-                items = std::move(other.items);
-                blocks = std::move(other.blocks);
-            }
-        };
-
-        struct SRetiredBlock
-        {
-            uint32 listIndex;
-            item_handle_t itemHandle;
-        };
-
-        std::unordered_map<uint32_t, SDescriptorBlockList > m_DescriptorBlocks;
-        std::array<std::vector<SRetiredBlock>, PoolConfig::POOL_FRAME_QUERY_COUNT> m_RetiredBlocks;
-        std::array<DeviceFenceHandle, PoolConfig::POOL_FRAME_QUERY_COUNT> m_fences;
-
-        uint32 m_frameID;
-        CryCriticalSection m_lock;
-
-    public:
-        CDescriptorPool()
-            : m_frameID(0)
-        {
-            m_fences.fill(0);
-        }
-
-        SDescriptorBlock* Allocate(size_t size)
-        {
-            AUTO_LOCK(m_lock);
-
-            SDescriptorBlockList& blockList = m_DescriptorBlocks[size];
-            item_handle_t itemHandle = blockList.items.Allocate();
-
-            if (blockList.blocks.size() < blockList.items.Capacity())
-            {
-                blockList.blocks.resize(blockList.items.Capacity());
-            }
-
-            DX12::DescriptorBlock& block = blockList.blocks[itemHandle];
-            if (block.GetCapacity() == 0)
-            {
-                DX12::Device* pDevice = reinterpret_cast<CCryDX12Device&>(gcpRendD3D->GetDevice()).GetDX12Device();
-                block = pDevice->GetGlobalDescriptorBlock(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, size);
-            }
-
-            SDescriptorBlock& item = blockList.items[itemHandle];
-            item.offset = block.GetStartOffset();
-            item.size = size;
-            item.pBuffer = block.GetDescriptorHeap();
-
-            return &item;
-        }
-
-        void Free(SDescriptorBlock* pItem)
-        {
-            AUTO_LOCK(m_lock);
-            SRetiredBlock retiredBlock = { pItem->size, pItem->blockID };
-            m_RetiredBlocks[m_frameID].push_back(retiredBlock);
-        }
-
-        void Update(uint32 frameId, DeviceFenceHandle fence)
-        {
-            m_frameID = frameId & PoolConfig::POOL_FRAME_QUERY_MASK;
-
-            for (auto& retiredBlockList : m_RetiredBlocks)
-            {
-                if (S_OK == gRenDev->m_DevMan.SyncFence(m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK], false, false))
-                {
-                    AUTO_LOCK(m_lock);
-                    for (auto& block : retiredBlockList)
-                    {
-                        m_DescriptorBlocks[block.listIndex].items.Free(block.itemHandle);
-                    }
-
-                    retiredBlockList.clear();
-                }
-            }
-
-            m_fences[m_frameID] = fence;
-        }
-
-        void FreeResources()
-        {
-            for (auto& retiredBlockList : m_RetiredBlocks)
-            {
-                retiredBlockList.clear();
-            }
-
-            m_DescriptorBlocks.clear();
-        }
-    };
-#endif
-
-    //////////////////////////////////////////////////////////////////////////////////////
-    // Manages all pool - in anonymous namespace to reduce recompiles
-    struct PoolManager
-    {
-        AZStd::mutex m_constantBufferLock;
-
-        // Storage for constant buffer wrapper instances
-        AzRHI::PartitionTable<AzRHI::ConstantBuffer> m_constant_buffers;
-
-        // The allocator for constant buffers
-#   if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-        ConstantBufferAllocator m_constant_allocator;
-#   endif
-
-#if defined(CRY_USE_DX12)
-        CDescriptorPool m_ResourceDescriptorPool;
-#endif
-
-        // The pools segregated by usage and binding
-        BufferPool* m_pools[BBT_MAX][BU_MAX];
-
-        // Freestanding buffer creator functions
-        BufferCreateFnc m_buffer_creators[BBT_MAX][BU_MAX];
-
-        // The pools fences
-        DeviceFenceHandle m_fences[PoolConfig::POOL_FRAME_QUERY_COUNT];
-
-        // The resources used for updating buffers
-        StagingResources m_staging_resources[BU_MAX];
-
-        // This lock must be held when operating on the buffers
-        SRecursiveSpinLock m_lock;
-
-        static PoolManager& GetInstance()
-        {
-            static PoolManager s_Instance;
-            return s_Instance;
-        }
-
-        bool m_initialized;
-
-        PoolManager()
-            : m_initialized()
-        {
-            memset(m_pools, 0x0, sizeof(m_pools));
-            memset(m_fences, 0x0, sizeof(m_fences));
-            memset(m_buffer_creators, 0x0, sizeof(m_buffer_creators));
-        }
-
-        ~PoolManager() {}
-
-        bool CreatePool(BUFFER_BIND_TYPE type, BUFFER_USAGE usage, bool enable_defragging, bool best_fit, BufferPool* pool)
-        {
-            if ((m_pools[type][usage] = pool)->CreateResources(enable_defragging, best_fit) == false)
-            {
-                CryLogAlways("SPoolManager::Initialize: could not initialize buffer pool of type '%s|%s'"
-                    , ConstantToString(type)
-                    , ConstantToString(usage));
-                return false;
-            }
-            return true;
-        }
-
-        bool Initialize()
-        {
-            bool success = true;
-            if (!s_PoolConfig.Configure())
-            {
-                goto error;
-            }
-
-            for (size_t i = 0; i < PoolConfig::POOL_FRAME_QUERY_COUNT; ++i)
-            {
-                if (gRenDev->m_DevMan.CreateFence(m_fences[i]) != S_OK)
-                {
-                    CryLogAlways("SPoolManager::Initialize: could not create per-frame gpu fence");
-                    goto error;
-                }
-            }
-
-#     if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-            m_constant_allocator.Initialize();
-#     endif
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_STATIC, gRenDev->CV_r_buffer_pool_defrag_static > 0  && gRenDev->GetActiveGPUCount() == 1, true, new StaticBufferPoolVB(m_staging_resources[BU_STATIC]));
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_STATIC, gRenDev->CV_r_buffer_pool_defrag_static > 0  && gRenDev->GetActiveGPUCount() == 1, true, new StaticBufferPoolIB(m_staging_resources[BU_STATIC]));
-
-
-#     if CRY_USE_DX12
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_DYNAMIC, gRenDev->CV_r_buffer_pool_defrag_dynamic > 0 && gRenDev->GetActiveGPUCount() == 1, true, new StaticBufferPoolVB(m_staging_resources[BU_DYNAMIC]));
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_DYNAMIC, gRenDev->CV_r_buffer_pool_defrag_dynamic > 0 && gRenDev->GetActiveGPUCount() == 1, true, new StaticBufferPoolIB(m_staging_resources[BU_DYNAMIC]));
-#     else
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_DYNAMIC, gRenDev->CV_r_buffer_pool_defrag_dynamic > 0 && gRenDev->GetActiveGPUCount() == 1, true, new DynamicBufferPoolVB(m_staging_resources[BU_DYNAMIC]));
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_DYNAMIC, gRenDev->CV_r_buffer_pool_defrag_dynamic > 0 && gRenDev->GetActiveGPUCount() == 1, true, new DynamicBufferPoolIB(m_staging_resources[BU_DYNAMIC]));
-#     endif
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_TRANSIENT, false, false, new DynamicBufferPoolVB(m_staging_resources[BU_TRANSIENT]));
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_TRANSIENT, false, false, new DynamicBufferPoolIB(m_staging_resources[BU_TRANSIENT]));
-
-#     if BUFFER_SUPPORT_TRANSIENT_POOLS
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_TRANSIENT_RT, false, false, new TransientBufferPoolVB());
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_TRANSIENT_RT, false, false, new TransientBufferPoolIB());
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_WHEN_LOADINGTHREAD_ACTIVE, false, false, new TransientBufferPoolVB());
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_WHEN_LOADINGTHREAD_ACTIVE, false, false, new TransientBufferPoolIB());
-#     else
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_TRANSIENT_RT, false, false, new DynamicBufferPoolVB(m_staging_resources[BU_TRANSIENT]));
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_TRANSIENT_RT, false, false, new DynamicBufferPoolIB(m_staging_resources[BU_TRANSIENT]));
-            success &= CreatePool(BBT_VERTEX_BUFFER, BU_WHEN_LOADINGTHREAD_ACTIVE, false, false, new DynamicBufferPoolVB(m_staging_resources[BU_TRANSIENT]));
-            success &= CreatePool(BBT_INDEX_BUFFER, BU_WHEN_LOADINGTHREAD_ACTIVE, false, false, new DynamicBufferPoolIB(m_staging_resources[BU_TRANSIENT]));
-#     endif
-
-            if (!success)
-            {
-                CryLogAlways("SPoolManager::Initialize: could not initialize a buffer pool");
-                goto error;
-            }
-
-            m_buffer_creators[BBT_VERTEX_BUFFER][BU_STATIC] = &SStaticFreeBufferVB::Create;
-            m_buffer_creators[BBT_INDEX_BUFFER ][BU_STATIC] = &SStaticFreeBufferIB::Create;
-            m_buffer_creators[BBT_VERTEX_BUFFER][BU_DYNAMIC] = &SDynamicFreeBufferVB::Create;
-            m_buffer_creators[BBT_INDEX_BUFFER ][BU_DYNAMIC] = &SDynamicFreeBufferIB::Create;
-            m_buffer_creators[BBT_VERTEX_BUFFER][BU_TRANSIENT] = &SDynamicFreeBufferVB::Create;
-            m_buffer_creators[BBT_INDEX_BUFFER ][BU_TRANSIENT] = &SDynamicFreeBufferIB::Create;
-            m_buffer_creators[BBT_VERTEX_BUFFER][BU_TRANSIENT_RT] = &SDynamicFreeBufferVB::Create;
-            m_buffer_creators[BBT_INDEX_BUFFER ][BU_TRANSIENT_RT] = &SDynamicFreeBufferIB::Create;
-
-            if (false)
-            {
-error:
-                Shutdown();
-                return false;
-            }
-            m_initialized = true;
-            return true;
-        }
-
-        bool Shutdown()
-        {
-            bool success = true;
-            for (size_t i = 0; i < BBT_MAX; ++i)
-            {
-                for (size_t j = 0; j < BU_MAX; ++j)
-                {
-                    if (m_pools[i][j] && !m_pools[i][j]->FreeResources())
-                    {
-                        CryLogAlways("SPoolManager::Initialize: could not shutdown buffer pool of type '%s|%s'"
-                            , ConstantToString((BUFFER_USAGE)i)
-                            , ConstantToString((BUFFER_USAGE)j));
-                        success = false;
-                    }
-                    SAFE_DELETE(m_pools[i][j]);
-                }
-            }
-
-#     if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-            m_constant_allocator.Shutdown();
-#     endif
-
-            m_constant_buffers.Clear();
-
-#if defined(CRY_USE_DX12)
-            m_ResourceDescriptorPool.FreeResources();
-#endif
-
-            for (size_t i = 0; i < PoolConfig::POOL_FRAME_QUERY_COUNT; ++i)
-            {
-                if (gRenDev->m_DevMan.ReleaseFence(m_fences[i]) != S_OK)
-                {
-                    CryLogAlways("SPoolManager::Initialize: could not releasefence");
-                    success = false;
-                }
-                m_fences[i] = DeviceFenceHandle();
-            }
-
-            m_initialized = false;
-            return success;
-        }
-    };
-}
-
-CDeviceBufferManager::CDeviceBufferManager()
-{
-}
-
-CDeviceBufferManager::~CDeviceBufferManager()
-{
-}
-
-void CDeviceBufferManager::LockDevMan()
-{
-    PoolManager::GetInstance().m_lock.Lock();
-}
-
-void CDeviceBufferManager::UnlockDevMan()
-{
-    PoolManager::GetInstance().m_lock.Unlock();
-}
-
-bool CDeviceBufferManager::Init()
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    LOADING_TIME_PROFILE_SECTION;
-    SREC_AUTO_LOCK(poolManager.m_lock);
-    if (poolManager.m_initialized == true)
-    {
-        return true;
-    }
-
-    // Initialize the pool manager
-    if (!poolManager.Initialize())
-    {
-        CryFatalError("CDeviceBufferManager::Init(): pool manager failed to initialize");
-        return false;
-    }
-
-    return true;
-}
-
-bool CDeviceBufferManager::Shutdown()
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    SREC_AUTO_LOCK(poolManager.m_lock);
-    if (poolManager.m_initialized == false)
-    {
-        return true;
-    }
-
-    // Initialize the pool manager
-    if (!poolManager.Shutdown())
-    {
-        CryFatalError("CDeviceBufferManager::Init(): pool manager failed during shutdown");
-        return false;
-    }
-
-    return true;
-}
-
-void CDeviceBufferManager::Sync(uint32 frameId)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    FUNCTION_PROFILER_RENDERER;
-    SREC_AUTO_LOCK(poolManager.m_lock);
-
-    for (int i = 0; i < PoolConfig::POOL_FRAME_QUERY_COUNT; ++i)
-    {
-        gRenDev->m_DevMan.SyncFence(poolManager.m_fences[i], true);
-    }
-
-    for (size_t i = 0; i < BBT_MAX; ++i)
-    {
-        for (size_t j = 0; j < BU_MAX; ++j)
-        {
-            IF (poolManager.m_pools[i][j] == NULL, 0)
-            {
-                continue;
-            }
-            SREC_AUTO_LOCK(poolManager.m_pools[i][j]->m_lock);
-            poolManager.m_pools[i][j]->Sync();
-        }
-    }
-
-    // Note: Issue the fence now for COPY_ON_WRITE. If the GPU has caught up to this point, no previous drawcall
-    // will be pending and therefore it is safe to just reuse the previous allocation.
-    gRenDev->m_DevMan.IssueFence(poolManager.m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK]);
-}
-
-void CDeviceBufferManager::ReleaseEmptyBanks(uint32 frameId)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    FUNCTION_PROFILER_RENDERER;
-    
-    SREC_AUTO_LOCK(poolManager.m_lock);
-
-    for (size_t i = 0; i < BBT_MAX; ++i)
-    {
-        for (size_t j = 0; j < BU_MAX; ++j)
-        {
-            IF (poolManager.m_pools[i][j] == NULL, 0)
-            {
-                continue;
-            }
-            SREC_AUTO_LOCK(poolManager.m_pools[i][j]->m_lock);
-            poolManager.m_pools[i][j]->ReleaseEmptyBanks();
-        }
-    }
-
-    // Release empty constant buffers
-# if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-    poolManager.m_constant_allocator.ReleaseEmptyBanks();
-# endif
-
-    // Note: Issue the current fence for retiring allocations. This is the same fence shelled out
-    // to the pools during the update stage for COW, now we are reusing it to ensure the gpu caught
-    // up to this point and therefore give out reclaimed memory again.
-    gRenDev->m_DevMan.IssueFence(poolManager.m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK]);
-}
-
-void CDeviceBufferManager::Update(uint32 frameId, bool called_during_loading)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    FUNCTION_PROFILER_RENDERER;
-    LOADING_TIME_PROFILE_SECTION;
-    
-    SREC_AUTO_LOCK(poolManager.m_lock);
-
-    gRenDev->m_DevMan.SyncFence(poolManager.m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK], true);
-
-    for (size_t i = 0; i < BBT_MAX; ++i)
-    {
-        for (size_t j = 0; j < BU_MAX; ++j)
-        {
-            IF (poolManager.m_pools[i][j] == NULL, 0)
-            {
-                continue;
-            }
-            SREC_AUTO_LOCK(poolManager.m_pools[i][j]->m_lock);
-            poolManager.m_pools[i][j]->Update(frameId
-                , poolManager.m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK]
-                , called_during_loading == false);
-        }
-    }
-
-    // Update the constant buffers
-# if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(poolManager.m_constantBufferLock);
-        poolManager.m_constant_allocator.Update(frameId
-            , poolManager.m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK]
-            , called_during_loading == false);
-    }
-# endif
-
-#if defined(CRY_USE_DX12)
-    poolManager.m_ResourceDescriptorPool.Update(frameId,
-        poolManager.m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK]);
-#endif
-
-    // Note: Issue the fence now for COPY_ON_WRITE. If the GPU has caught up to this point, no previous drawcall
-    // will be pending and therefore it is safe to just reuse the previous allocation.
-    gRenDev->m_DevMan.IssueFence(poolManager.m_fences[frameId & PoolConfig::POOL_FRAME_QUERY_MASK]);
-}
-
-AzRHI::ConstantBuffer* CDeviceBufferManager::CreateConstantBuffer(
-    const char* name,
-    AZ::u32 size,
-    AzRHI::ConstantBufferUsage usage,
-    AzRHI::ConstantBufferFlags flags)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    size = (max(size, AZ::u32(1)) + (255)) & ~(255);
-
-    AZStd::lock_guard<AZStd::mutex> lock(poolManager.m_constantBufferLock);
-    AZ::u32 handle = poolManager.m_constant_buffers.Allocate();
-
-    AzRHI::ConstantBuffer* buffer = &poolManager.m_constant_buffers[handle];
-    buffer->m_name = name;
-    buffer->m_usage = usage;
-    buffer->m_flags = flags;
-    buffer->m_size = size;
-    buffer->m_dynamic = (usage == AzRHI::ConstantBufferUsage::Dynamic);
-    return buffer;
-}
-
-#if defined(CRY_USE_DX12)
-SDescriptorBlock* CDeviceBufferManager::CreateDescriptorBlock(size_t size)
-{
-    return PoolManager::GetInstance().m_ResourceDescriptorPool.Allocate(size);
-}
-
-void CDeviceBufferManager::ReleaseDescriptorBlock(SDescriptorBlock* pBlock)
-{
-    CRY_ASSERT(pBlock != NULL);
-    PoolManager::GetInstance().m_ResourceDescriptorPool.Free(pBlock);
-}
-
-
-#else
-SDescriptorBlock* CDeviceBufferManager::CreateDescriptorBlock([[maybe_unused]] size_t size) { return NULL; }
-void CDeviceBufferManager::ReleaseDescriptorBlock([[maybe_unused]] SDescriptorBlock* pBlock) {}
-#endif
-
-buffer_handle_t CDeviceBufferManager::Create_Locked(
-    BUFFER_BIND_TYPE type
-    , BUFFER_USAGE usage
-    , size_t size)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    AZRHI_ASSERT((type >= BBT_VERTEX_BUFFER && type < BBT_MAX));
-    AZRHI_ASSERT((usage >= BU_IMMUTABLE && usage < BU_MAX));
-    AZRHI_ASSERT(poolManager.m_pools[type][usage] != NULL);
-
-    // Workaround for NVIDIA SLI issues with latest drivers. GFE should disable the cvar below when fixed
-    // Disabled for now
-# if (defined(WIN32) || defined(WIN64))
-    if (poolManager.m_buffer_creators[type][usage])
-    {
-        if (gRenDev->GetActiveGPUCount() > 1
-            && gRenDev->m_bVendorLibInitialized
-            && gRenDev->CV_r_buffer_sli_workaround
-            && (usage == BU_DYNAMIC || usage == BU_TRANSIENT))
-        {
-            BufferPool* pool = poolManager.m_buffer_creators[type][usage](
-                    poolManager.m_staging_resources[usage],
-                    size
-                    );
-            item_handle_t item_handle = pool->Allocate(size);
-            return item_handle == ~0u
-                   ? (buffer_handle_t) ~0u
-                   : (buffer_handle_t)pool->Resolve(item_handle);
-        }
-    }
-# endif
-
-    item_handle_t item_handle = poolManager.m_pools[type][usage]->Allocate(size);
-    return item_handle == ~0u ? (buffer_handle_t) ~0u : (buffer_handle_t)poolManager.m_pools[type][usage]->Resolve(item_handle);
-}
-
-buffer_handle_t CDeviceBufferManager::Create(
-    BUFFER_BIND_TYPE type
-    , BUFFER_USAGE usage
-    , size_t size)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    if (!poolManager.m_pools[type][usage])
-    {
-        return ~0u;
-    }
-# if (defined(WIN32) || defined(WIN64))
-    SRecursiveSpinLocker __lock(&poolManager.m_lock);
-# endif
-    SREC_AUTO_LOCK(poolManager.m_pools[type][usage]->m_lock);
-    return Create_Locked(type, usage, size);
-}
-
-void CDeviceBufferManager::Destroy_Locked(buffer_handle_t handle)
-{
-    FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_RENDERER);
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::RendererDetailed);
-    
-    AZRHI_ASSERT(handle != 0);
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    item.m_pool->Free(&item);
-}
-
-void CDeviceBufferManager::Destroy(buffer_handle_t handle)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-# if (defined(WIN32) || defined(WIN64))
-    SRecursiveSpinLocker __lock(&poolManager.m_lock);
-# endif
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    SREC_AUTO_LOCK(item.m_pool->m_lock);
-    Destroy_Locked(handle);
-}
-
-void* CDeviceBufferManager::BeginRead_Locked(buffer_handle_t handle)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    
-    AZRHI_ASSERT(handle != 0);
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    return item.m_pool->BeginRead(&item);
-}
-void* CDeviceBufferManager::BeginRead(buffer_handle_t handle)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-# if (defined(WIN32) || defined(WIN64))
-    SRecursiveSpinLocker __lock(&PoolManager::GetInstance().m_lock);
-# endif
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    SREC_AUTO_LOCK(item.m_pool->m_lock);
-    return BeginRead_Locked(handle);
-}
-
-size_t CDeviceBufferManager::Size_Locked(buffer_handle_t handle)
-{
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    return item.m_size;
-}
-size_t CDeviceBufferManager::Size(buffer_handle_t handle)
-{
-    return Size_Locked(handle);
-}
-
-void* CDeviceBufferManager::BeginWrite_Locked(buffer_handle_t handle)
-{
-    FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_RENDERER);
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::RendererDetailed);
-    
-    AZRHI_ASSERT(handle != 0);
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    return item.m_pool->BeginWrite(&item);
-}
-void* CDeviceBufferManager::BeginWrite(buffer_handle_t handle)
-{
-# if (defined(WIN32) || defined(WIN64))
-    SRecursiveSpinLocker __lock(&PoolManager::GetInstance().m_lock);
-# endif
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    SREC_AUTO_LOCK(item.m_pool->m_lock);
-    return BeginWrite_Locked(handle);
-}
-
-void CDeviceBufferManager::EndReadWrite_Locked(buffer_handle_t handle)
-{
-    FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_RENDERER);
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::RendererDetailed);
-    
-    AZRHI_ASSERT(handle != 0);
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    item.m_pool->EndReadWrite(&item, true);
-}
-void CDeviceBufferManager::EndReadWrite(buffer_handle_t handle)
-{
-# if (defined(WIN32) || defined(WIN64))
-    SRecursiveSpinLocker __lock(&PoolManager::GetInstance().m_lock);
-# endif
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    SREC_AUTO_LOCK(item.m_pool->m_lock);
-    return EndReadWrite_Locked(handle);
-}
-
-bool CDeviceBufferManager::UpdateBuffer_Locked(
-    buffer_handle_t handle, const void* src, size_t size)
-{
-    FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_RENDERER);
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::RendererDetailed);
-    
-    AZRHI_ASSERT(handle != 0);
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    item.m_pool->Write(&item, src, size);
-    return true;
-}
-bool CDeviceBufferManager::UpdateBuffer
-    (buffer_handle_t handle, const void* src, size_t size)
-{
-# if (defined(WIN32) || defined(WIN64))
-    SRecursiveSpinLocker __lock(&PoolManager::GetInstance().m_lock);
-# endif
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    SREC_AUTO_LOCK(item.m_pool->m_lock);
-    return UpdateBuffer_Locked(handle, src, size);
-}
-D3DBuffer* CDeviceBufferManager::GetD3D(buffer_handle_t handle, size_t* offset)
-{
-    
-    AZRHI_ASSERT(handle != 0);
-    BufferPoolItem& item = *reinterpret_cast<BufferPoolItem*>(handle);
-    *offset = item.m_offset;
-    AZRHI_ASSERT(item.m_buffer);
-    return item.m_buffer;
-}
-
-bool CDeviceBufferManager::GetStats(BUFFER_BIND_TYPE type, BUFFER_USAGE usage, SDeviceBufferPoolStats& stats)
-{
-    PoolManager& poolManager = PoolManager::GetInstance();
-
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    stats.buffer_descr =  string(ConstantToString(type));
-    stats.buffer_descr += "_";
-    stats.buffer_descr += string(ConstantToString(usage));
-    stats.buffer_descr += "_";
-    if (!poolManager.m_pools[type][usage])
-    {
-        return false;
-    }
-    SREC_AUTO_LOCK(poolManager.m_pools[type][usage]->m_lock);
-    return poolManager.m_pools[type][usage]->GetStats(stats);
-}
-
-/////////////////////////////////////////////////////////////
-// Legacy interface
-//
-// Use with care, can be removed at any point!
-void CDeviceBufferManager::ReleaseVBuffer(CVertexBuffer* pVB)
-{
-    SAFE_DELETE(pVB);
-}
-void CDeviceBufferManager::ReleaseIBuffer(CIndexBuffer* pIB)
-{
-    SAFE_DELETE(pIB);
-}
-CVertexBuffer* CDeviceBufferManager::CreateVBuffer(size_t nVerts, const AZ::Vertex::Format& vertexFormat, [[maybe_unused]] const char* szName, BUFFER_USAGE usage)
-{
-    CVertexBuffer* pVB = new CVertexBuffer(NULL, vertexFormat);
-    pVB->m_nVerts = nVerts;
-    pVB->m_VS.m_BufferHdl = Create(BBT_VERTEX_BUFFER, usage, nVerts * vertexFormat.GetStride());
-
-    return pVB;
-}
-
-CIndexBuffer* CDeviceBufferManager::CreateIBuffer(size_t nInds, [[maybe_unused]] const char* szNam, BUFFER_USAGE usage)
-{
-    CIndexBuffer* pIB = new CIndexBuffer(NULL);
-    pIB->m_nInds = nInds;
-    pIB->m_VS.m_BufferHdl = Create(BBT_INDEX_BUFFER, usage, nInds * sizeof(uint16));
-    return pIB;
-}
-
-bool CDeviceBufferManager::UpdateVBuffer(CVertexBuffer* pVB, void* pVerts, size_t nVerts)
-{
-    AZRHI_ASSERT(pVB->m_VS.m_BufferHdl != ~0u);
-    return UpdateBuffer(pVB->m_VS.m_BufferHdl, pVerts, nVerts * pVB->m_vertexFormat.GetStride());
-}
-
-bool CDeviceBufferManager::UpdateIBuffer(CIndexBuffer* pIB, void* pInds, size_t nInds)
-{
-    AZRHI_ASSERT(pIB->m_VS.m_BufferHdl != ~0u);
-    return UpdateBuffer(pIB->m_VS.m_BufferHdl, pInds, nInds * sizeof(uint16));
-}
-
-namespace AzRHI
-{
-    ConstantBuffer::ConstantBuffer(uint32 handle)
-        : m_buffer()
-        , m_allocator()
-        , m_base_ptr()
-        , m_handle(handle)
-        , m_offset()
-        , m_size()
-        , m_used()
-        , m_usage{ ConstantBufferUsage::Dynamic }
-        , m_flags{ ConstantBufferFlags::None }
-        , m_refCount{ 1 }
-    {}
-
-    void ConstantBuffer::AddRef()
-    {
-        ++m_refCount;
-    }
-
-    AZ::u32 ConstantBuffer::Release()
-    {
-        AZ::u32 refCount = --m_refCount;
-        if (!refCount)
-        {
-            PoolManager& poolManager = PoolManager::GetInstance();
-            AZStd::lock_guard<AZStd::mutex> lock(poolManager.m_constantBufferLock);
-
-#   if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-            if (m_used)
-            {
-                poolManager.m_constant_allocator.Free(this);
-                m_used = 0;
-            }
-#   endif
-            poolManager.m_constant_buffers.Free(m_handle);
-            return 0;
-        }
-        return refCount;
-    }
-
-    ConstantBuffer::~ConstantBuffer()
-    {
-#   if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS == 0
-        gcpRendD3D->m_DevMan.UnbindConstantBuffer(this);
-        gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_buffer);
-        m_buffer = nullptr;
-#   endif
-    }
-
-    void* ConstantBuffer::BeginWrite()
-    {
-
-# if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS
-        PoolManager& poolManager = PoolManager::GetInstance();
-        if (m_used)
-        {
-            poolManager.m_constant_allocator.Free(this);
-        }
-        if (poolManager.m_constant_allocator.Allocate(this))
-        {
-            m_used = 1;
-            return (void*)((uintptr_t)m_base_ptr + m_offset);
-        }
-# else
-        if (!m_used)
-        {
-            HRESULT hr;
-            D3D11_BUFFER_DESC bd;
-            ZeroStruct(bd);
-            bd.Usage = m_dynamic ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
-            bd.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-            bd.CPUAccessFlags = m_dynamic ? D3D11_CPU_ACCESS_WRITE : 0;
-            bd.MiscFlags = 0;
-#   if defined(OPENGL) && !(CRY_USE_METAL)
-            bd.MiscFlags |= AZ::u8(m_flags & ConstantBufferFlags::DenyStreaming) != 0 ? D3D11_RESOURCE_MISC_DXGL_NO_STREAMING : 0;
-#   endif
-            bd.ByteWidth = m_size;
-            hr = gcpRendD3D->m_DevMan.CreateD3D11Buffer(&bd, NULL, &m_buffer, "ConstantBuffer");
-            CHECK_HRESULT(hr);
-
-            m_used = (hr == S_OK);
-        }
-        if (m_dynamic)
-        {
-            if (m_used && m_buffer)
-            {
-                AZ_Assert(m_base_ptr == nullptr, "Already mapped when mapping");
-                D3D11_MAPPED_SUBRESOURCE mappedResource;
-                [[maybe_unused]] HRESULT hr = gcpRendD3D->GetDeviceContext().Map(m_buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-                AZ_Assert(hr == S_OK, "Map buffer failed");
-                m_base_ptr = mappedResource.pData;
-                return mappedResource.pData;
-            }
-        }
-        else
-        {
-            return m_base_ptr = new char[m_size];
-        }
-# endif
-        return nullptr;
-    }
-
-    void ConstantBuffer::EndWrite()
-    {
-# if CONSTANT_BUFFER_ENABLE_DIRECT_ACCESS == 0
-        if (m_dynamic)
-        {
-            AZ_Assert(m_base_ptr != nullptr, "Not mapped when unmapping");
-            gcpRendD3D->GetDeviceContext().Unmap(m_buffer, 0);
-        }
-        else
-        {
-            gcpRendD3D->GetDeviceContext().UpdateSubresource(m_buffer, 0, nullptr, m_base_ptr, m_size, 0);
-            delete[] alias_cast<char*>(m_base_ptr);
-        }
-        m_base_ptr = nullptr;
-# endif
-    }
-
-    void ConstantBuffer::UpdateBuffer(const void* src, AZ::u32 size)
-    {
-        if (void* dst = BeginWrite())
-        {
-            CopyData(dst, src, std::min(m_size, size));
-            EndWrite();
-        }
-    }
-
-    AZ::u32 GetConstantRegisterCountMax(EHWShaderClass shaderClass)
-    {
-        switch (shaderClass)
-        {
-        case eHWSC_Pixel:
-        case eHWSC_Vertex:
-        case eHWSC_Geometry:
-        case eHWSC_Domain:
-        case eHWSC_Hull:
-        case eHWSC_Compute:
-            return 512;
-        default:
-            assert(0);
-            return 0;
-        }
-    }
-}
-
-CVertexBuffer::~CVertexBuffer()
-{
-    if (m_VS.m_BufferHdl != ~0u)
-    {
-        if (gRenDev)
-        {
-            gRenDev->m_DevBufMan.Destroy(m_VS.m_BufferHdl);
-        }
-        m_VS.m_BufferHdl = ~0u;
-    }
-}
-
-CIndexBuffer::~CIndexBuffer()
-{    
-    if (m_VS.m_BufferHdl != ~0u)
-    {
-        if (gRenDev)
-        {
-            gRenDev->m_DevBufMan.Destroy(m_VS.m_BufferHdl);
-        }
-        m_VS.m_BufferHdl = ~0u;
-    }
-}
-
-WrappedDX11Buffer::WrappedDX11Buffer(const WrappedDX11Buffer& src)
-{
-    
-    m_pBuffer = src.m_pBuffer;
-    if (m_pBuffer)
-    {
-        m_pBuffer->AddRef();
-    }
-
-    for (uint32_t i = 0; i < MAX_VIEW_COUNT; ++i)
-    {
-        m_pSRV[i] = src.m_pSRV[i];
-        if (m_pSRV[i])
-        {
-            m_pSRV[i]->AddRef();
-        }
-
-        m_pUAV[i] = src.m_pUAV[i];
-        if (m_pUAV[i])
-        {
-            m_pUAV[i]->AddRef();
-        }
-    }
-
-    m_numElements = src.m_numElements;
-    m_flags = src.m_flags;
-}
-
-WrappedDX11Buffer& WrappedDX11Buffer::operator=(const WrappedDX11Buffer& rhs)
-{    
-    ID3D11Buffer* pOldBuffer = m_pBuffer;
-
-    m_pBuffer = rhs.m_pBuffer;
-    if (m_pBuffer)
-    {
-        m_pBuffer->AddRef();
-    }
-
-    for (uint32_t i = 0; i < MAX_VIEW_COUNT; ++i)
-    {
-        ID3D11ShaderResourceView* pOldSRV = m_pSRV[i];
-        m_pSRV[i] = rhs.m_pSRV[i];
-        if (m_pSRV[i])
-        {
-            m_pSRV[i]->AddRef();
-        }
-        SAFE_RELEASE(pOldSRV);
-
-        ID3D11UnorderedAccessView* pOldUAV = m_pUAV[i];
-        m_pUAV[i] = rhs.m_pUAV[i];
-        if (m_pUAV[i])
-        {
-            m_pUAV[i]->AddRef();
-        }
-        SAFE_RELEASE(pOldUAV);
-    }
-
-    SAFE_RELEASE(pOldBuffer);
-
-    m_numElements = rhs.m_numElements;
-    m_flags = rhs.m_flags;
-
-    return *this;
-}
-
-bool WrappedDX11Buffer::operator==(const WrappedDX11Buffer& other) const
-{
-    return memcmp(this, &other, sizeof(*this)) != 0;
-}
-
-WrappedDX11Buffer::~WrappedDX11Buffer()
-{
-    Release();
-}
-
-void WrappedDX11Buffer::Release()
-{    
-    for (uint32_t i = 0; i < MAX_VIEW_COUNT; ++i)
-    {
-        SAFE_RELEASE(m_pSRV[i]);
-        SAFE_RELEASE(m_pUAV[i]);
-    }
-    gcpRendD3D->m_DevMan.ReleaseD3D11Buffer(m_pBuffer);
-    m_pBuffer = nullptr;
-    m_numElements = 0;
-    m_flags = 0;
-}
-
-void WrappedDX11Buffer::Create(uint32 numElements, uint32 elementSize, DXGI_FORMAT elementFormat, uint32 flags, const void* pData, [[maybe_unused]] int32 nESRAMOffset /*=-1*/)
-{
-    assert(pData != NULL || (flags & (DX11BUF_DYNAMIC | DX11BUF_BIND_UAV | DX11BUF_STAGING)));
-    assert((flags & (DX11BUF_DYNAMIC | DX11BUF_BIND_UAV)) != (DX11BUF_DYNAMIC | DX11BUF_BIND_UAV));
-
-    Release();
-
-    const uint32 bufferCount = (flags & DX11BUF_DYNAMIC) ? 3 : 1;
-
-    D3D11_BUFFER_DESC Desc;
-    Desc.BindFlags = ((flags & DX11BUF_BIND_SRV) ? D3D11_BIND_SHADER_RESOURCE : 0) |
-        ((flags & DX11BUF_BIND_UAV) ? D3D11_BIND_UNORDERED_ACCESS : 0);
-    Desc.ByteWidth = numElements * elementSize * bufferCount;
-    Desc.CPUAccessFlags = (flags & DX11BUF_DYNAMIC) ? D3D11_CPU_ACCESS_WRITE : ((flags & DX11BUF_STAGING) ? D3D11_CPU_ACCESS_READ : 0);
-    Desc.MiscFlags = ((flags & DX11BUF_STRUCTURED) ? D3D11_RESOURCE_MISC_BUFFER_STRUCTURED : 0) |
-        ((flags & DX11BUF_DRAWINDIRECT) ? D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS : 0);
-    Desc.StructureByteStride = elementSize;
-    Desc.Usage = (flags & DX11BUF_DYNAMIC) ? D3D11_USAGE_DYNAMIC : (flags & DX11BUF_BIND_UAV) ? D3D11_USAGE_DEFAULT : (flags & DX11BUF_STAGING) ? D3D11_USAGE_STAGING : D3D11_USAGE_IMMUTABLE;
-    D3D11_SUBRESOURCE_DATA Data;
-    Data.pSysMem = pData;
-    Data.SysMemPitch = Desc.ByteWidth;
-    Data.SysMemSlicePitch = Desc.ByteWidth;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVBUFFER_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(DevBuffer_cpp)
-#endif
-
-    gcpRendD3D->m_DevMan.CreateD3D11Buffer(&Desc, (pData != NULL) ? &Data : NULL, &m_pBuffer, "WrappedDX11Buffer");
-
-    if (flags & DX11BUF_BIND_SRV)
-    {
-        for (uint32 i = 0; i < bufferCount; ++i)
-        {
-            D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
-            SRVDesc.Format = elementFormat;
-            SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-            SRVDesc.Buffer.ElementOffset = i * numElements;
-            SRVDesc.Buffer.ElementWidth = numElements;
-            gcpRendD3D->GetDevice().CreateShaderResourceView(m_pBuffer, &SRVDesc, &m_pSRV[i]);
-        }
-    }
-
-    if (flags & DX11BUF_BIND_UAV)
-    {
-        for (uint32 i = 0; i < bufferCount; ++i)
-        {
-            D3D11_UNORDERED_ACCESS_VIEW_DESC UAVDesc;
-            UAVDesc.Format = elementFormat;
-            UAVDesc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER;
-            UAVDesc.Buffer.FirstElement = i * numElements;
-            UAVDesc.Buffer.Flags = (flags & DX11BUF_UAV_APPEND) ? D3D11_BUFFER_UAV_FLAG_APPEND : 0;
-            UAVDesc.Buffer.NumElements = numElements;
-            gcpRendD3D->GetDevice().CreateUnorderedAccessView(m_pBuffer, &UAVDesc, &m_pUAV[i]);
-        }
-    }
-
-    m_numElements = numElements;
-    m_elementSize = elementSize;
-    m_elementFormat = elementFormat;
-    m_flags = flags;
-}
-
-void WrappedDX11Buffer::UpdateBufferContent(void* pData, size_t nSize)
-{
-    if (!m_pBuffer || !pData || nSize == 0)
-    {
-        return;
-    }
-
-    assert(m_flags & DX11BUF_DYNAMIC);
-
-    m_currentBuffer = (m_currentBuffer + 1) % MAX_VIEW_COUNT;
-
-    D3D11_MAPPED_SUBRESOURCE mappedRes;
-#ifdef CRY_USE_DX12
-    gcpRendD3D->GetDeviceContext().Map(m_pBuffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mappedRes);
-#else
-    // D3D11_MAP_WRITE_NO_OVERWRITE with buffers other than vertex and index buffer is not supported on os prior to windows 8 dx11.1.
-    gcpRendD3D->GetDeviceContext().Map(m_pBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedRes);
-#endif
-    uint8_t* memory = reinterpret_cast<uint8_t*>(mappedRes.pData) + m_currentBuffer * m_elementSize * m_numElements;
-    memcpy(memory, pData, nSize);
-    gcpRendD3D->GetDeviceContext().Unmap(m_pBuffer, 0);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceInfo.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceInfo.h
deleted file mode 100644
index bd061c8dc9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceInfo.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEINFO_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEINFO_H
-#pragma once
-
-#if defined(SUPPORT_DEVICE_INFO)
-
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-namespace DeviceInfoInternal
-{
-    struct MsgQueueItem
-    {
-        MsgQueueItem(ESystemEvent _event, UINT_PTR _wParam, UINT_PTR _lParam)
-            : event(_event)
-            , wParam(_wParam)
-            , lParam(_lParam) {}
-        ESystemEvent event;
-        UINT_PTR wParam;
-        UINT_PTR lParam;
-    };
-
-    typedef std::vector<MsgQueueItem> MsgQueue;
-}
-#endif
-
-typedef HRESULT (CALLBACK * OnCreateDeviceCallback)(D3DDevice*);
-typedef HWND (* CreateWindowCallback)();
-
-struct DeviceInfo
-{
-    DeviceInfo();
-    bool IsOk() const { return m_pFactory != 0 && m_pAdapter != 0 && m_pDevice != 0 && m_pContext != 0 && m_pSwapChain != 0 && m_pBackbufferRTVs.size() != 0; }
-    void Release();
-
-    bool CreateDevice(bool windowed, int width, int height, int backbufferWidth, int backbufferHeight, int zbpp, OnCreateDeviceCallback pCreateDeviceCallback, CreateWindowCallback pCreateWindowCallback);
-    bool CreateViews();
-    void SnapSettings();
-    void ResizeDXGIBuffers();
-
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-    void OnActivate(UINT_PTR wParam, UINT_PTR lParam);
-    void PushSystemEvent(ESystemEvent event, UINT_PTR wParam, UINT_PTR lParam);
-    void ProcessSystemEventQueue();
-#endif
-
-#if defined(WIN32) || defined(WIN64)
-    void EnforceFullscreenPreemption();
-    #ifdef CRY_INTEGRATE_DX12
-    void WaitForGPUFrames();
-    #endif
-#endif
-
-    // Properties
-    DXGIFactory* Factory() const { return m_pFactory; }
-    DXGIAdapter* Adapter() const { return m_pAdapter; }
-    DXGIOutput* Output() const { return m_pOutput; }
-    D3DDevice* Device() const { return m_pDevice; }
-    D3DDeviceContext* Context() const { return m_pContext; }
-    DXGISwapChain* SwapChain() const { return m_pSwapChain; }
-    D3DSurface* BackbufferRTV() const { return m_pBackbufferRTVs[m_pCurrentBackBufferRTVIndex]; }
-    std::vector<D3DSurface*> BackbufferRTVs() const { return m_pBackbufferRTVs; }
-
-    const DXGI_ADAPTER_DESC1& AdapterDesc() { return m_adapterDesc; }
-    DXGI_SWAP_CHAIN_DESC& SwapChainDesc() { return m_swapChainDesc; }
-    const DXGI_RATIONAL& RefreshRate() const { return m_refreshRate; }
-
-    D3D_DRIVER_TYPE DriverType() const { return m_driverType; }
-    unsigned int CreationFlags() const { return m_creationFlags; }
-    D3D_FEATURE_LEVEL FeatureLevel() const { return m_featureLevel; }
-    D3DFormat AutoDepthStencilFmt() const { return m_autoDepthStencilFmt; }
-
-    unsigned int OutputIndex() { return m_outputIndex; }
-    unsigned int& SyncInterval() { return m_syncInterval; }
-    unsigned int PresentFlags() const { return m_presentFlags; }
-
-protected:
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-    void ProcessSystemEvent(ESystemEvent event, UINT_PTR wParam, UINT_PTR lParam);
-#endif
-
-protected:
-    DXGIFactory* m_pFactory;
-    DXGIAdapter* m_pAdapter;
-    DXGIOutput* m_pOutput;
-    D3DDevice* m_pDevice;
-    D3DDeviceContext* m_pContext;
-    DXGISwapChain* m_pSwapChain;
-    std::vector<D3DSurface*> m_pBackbufferRTVs;
-    unsigned int m_pCurrentBackBufferRTVIndex;
-
-    DXGI_ADAPTER_DESC1 m_adapterDesc;
-    DXGI_SWAP_CHAIN_DESC m_swapChainDesc;
-    DXGI_RATIONAL m_refreshRate;
-    DXGI_RATIONAL m_desktopRefreshRate;
-
-    DXGI_ADAPTER_FLAG m_adapterFlag;
-    D3D_DRIVER_TYPE m_driverType;
-    unsigned int m_creationFlags;
-    D3D_FEATURE_LEVEL m_featureLevel;
-    D3DFormat m_autoDepthStencilFmt;
-
-    unsigned int m_outputIndex;
-    unsigned int m_syncInterval;
-    unsigned int m_presentFlags;
-
-    bool m_activated;
-    bool m_activatedMT;
-#ifdef  CRY_INTEGRATE_DX12
-    HANDLE m_frameLatencyWaitableObject;
-#endif
-
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-    CryCriticalSection m_msgQueueLock;
-    DeviceInfoInternal::MsgQueue m_msgQueue;
-#endif
-};
-
-#endif // #if defined(SUPPORT_DEVICE_INFO)
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEINFO_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceInfo.inl b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceInfo.inl
deleted file mode 100644
index b42a9053f7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceInfo.inl
+++ /dev/null
@@ -1,799 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#if defined(SUPPORT_DEVICE_INFO)
-
-#include <AzFramework/API/ApplicationAPI.h>
-
-enum
-{
-#if defined(WIN32) || defined(WIN64)
-    DefaultBufferCount = 3
-#else
-    DefaultBufferCount = 2
-#endif
-};
-
-static void InitSwapChain(DXGI_SWAP_CHAIN_DESC& desc, UINT width, UINT height, HWND hWnd, BOOL windowed)
-{
-    desc.BufferDesc.Width = width;
-    desc.BufferDesc.Height = height;
-    desc.BufferDesc.RefreshRate.Numerator = 0;
-    desc.BufferDesc.RefreshRate.Denominator = 0;
-#ifdef ANDROID
-    desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8X8_UNORM;
-#else
-    static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-    if (DolbyCvar->GetIVal() == 1)
-    {
-        // Dolby Maui HDR PQ output format (10 bits)
-        desc.BufferDesc.Format = DXGI_FORMAT_R10G10B10A2_UNORM;
-    }
-    else
-    {
-        // Conventional SDR RGBA8 output buffer
-        desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-    }
-#endif
-    desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
-    desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
-    desc.SampleDesc.Count = 1;
-    desc.SampleDesc.Quality = 0;
-    desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-    desc.BufferCount = gRenDev->CV_r_minimizeLatency > 0 ? 2 : DefaultBufferCount;
-    desc.OutputWindow = hWnd;
-    desc.Windowed = windowed ? 1 : 0;
-    desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
-    desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
-#ifdef CRY_INTEGRATE_DX12
-    desc.Flags |= DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT;
-#endif
-}
-
-DeviceInfo::DeviceInfo()
-    : m_pFactory(0)
-    , m_pAdapter(0)
-    , m_pOutput(0)
-    , m_pDevice(0)
-    , m_pContext(0)
-    , m_pSwapChain(0)
-    , m_adapterFlag(DXGI_ADAPTER_FLAG_NONE)
-    , m_driverType(D3D_DRIVER_TYPE_NULL)
-    , m_creationFlags(0)
-    , m_featureLevel(D3D_FEATURE_LEVEL_9_1)
-#ifdef CRY_USE_METAL
-    , m_autoDepthStencilFmt(DXGI_FORMAT_R32G8X24_TYPELESS)
-#else
-    , m_autoDepthStencilFmt(DXGI_FORMAT_R24G8_TYPELESS)
-#endif
-    , m_outputIndex(0)
-    , m_syncInterval(0)
-    , m_presentFlags(0)
-    , m_activated(true)
-    , m_activatedMT(true)
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-    , m_msgQueueLock()
-    , m_msgQueue()
-#endif
-{
-    memset(&m_adapterDesc, 0, sizeof(m_adapterDesc));
-    memset(&m_swapChainDesc, 0, sizeof(m_swapChainDesc));
-    memset(&m_refreshRate, 0, sizeof(m_refreshRate));
-    memset(&m_desktopRefreshRate, 0, sizeof(m_desktopRefreshRate));
-}
-
-void DeviceInfo::Release()
-{
-    memset(&m_adapterDesc, 0, sizeof(m_adapterDesc));
-    memset(&m_swapChainDesc, 0, sizeof(m_swapChainDesc));
-    memset(&m_refreshRate, 0, sizeof(m_refreshRate));
-    memset(&m_desktopRefreshRate, 0, sizeof(m_desktopRefreshRate));
-
-    for (unsigned int b = 0; b < m_pBackbufferRTVs.size(); ++b)
-    {
-        SAFE_RELEASE(m_pBackbufferRTVs[b]);
-    }
-    if (m_pSwapChain)
-    {
-        m_pSwapChain->SetFullscreenState(FALSE, 0);
-    }
-    SAFE_RELEASE(m_pSwapChain);
-    SAFE_RELEASE(m_pContext);
-    SAFE_RELEASE(m_pDevice);
-    SAFE_RELEASE(m_pOutput);
-    SAFE_RELEASE(m_pAdapter);
-    SAFE_RELEASE(m_pFactory);
-}
-
-static void SetupPreferredMonitorDimensions(HMONITOR hMonitor)
-{
-#if defined(WIN32) || defined(WIN64)
-    MONITORINFO monitorInfo;
-    monitorInfo.cbSize = sizeof(monitorInfo);
-    if (GetMonitorInfo(hMonitor, &monitorInfo))
-    {
-        gcpRendD3D->m_prefMonX = monitorInfo.rcMonitor.left;
-        gcpRendD3D->m_prefMonY = monitorInfo.rcMonitor.top;
-        gcpRendD3D->m_prefMonWidth = monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left;
-        gcpRendD3D->m_prefMonHeight = monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top;
-    }
-#endif
-}
-
-static void SetupMonitorAndGetAdapterDesc(IDXGIOutput* pOutput, IDXGIAdapter1* pAdapter, DXGI_ADAPTER_DESC1& adapterDesc)
-{
-    DXGI_OUTPUT_DESC outputDesc;
-    if (SUCCEEDED(pOutput->GetDesc(&outputDesc)))
-    {
-        SetupPreferredMonitorDimensions(outputDesc.Monitor);
-    }
-    pAdapter->GetDesc1(&adapterDesc);
-}
-
-static int GetDXGIAdapterOverride()
-{
-#if defined(WIN32) || defined(WIN64)
-    ICVar* pCVar = gEnv->pConsole ? gEnv->pConsole->GetCVar("r_overrideDXGIAdapter") : 0;
-    return pCVar ? pCVar->GetIVal() : -1;
-#else
-    return -1;
-#endif
-}
-
-static void ProcessWindowMessages([[maybe_unused]] HWND hWnd)
-{
-#if defined(WIN32) || defined(WIN64)
-    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
-#endif
-}
-
-#if defined(OPENGL)
-static int GetMultithreaded()
-{
-    ICVar* pCVar = gEnv->pConsole ? gEnv->pConsole->GetCVar("r_multithreaded") : 0;
-    return pCVar ? pCVar->GetIVal() : -1;
-}
-#endif
-
-#if !defined(_RELEASE)
-bool GetForcedFeatureLevel(D3D_FEATURE_LEVEL* pForcedFeatureLevel)
-{
-    struct FeatureLevel
-    {
-        const char* m_szName;
-        D3D_FEATURE_LEVEL m_eValue;
-    };
-    static FeatureLevel s_aLevels[] =
-    {
-        {"10.0", D3D_FEATURE_LEVEL_10_0},
-        {"10.1", D3D_FEATURE_LEVEL_10_1},
-        {"11.0", D3D_FEATURE_LEVEL_11_0},
-        #if SUPPORTS_WINDOWS_10_SDK 
-            {"11.1", D3D_FEATURE_LEVEL_11_1}
-        #endif
-    };
-
-    const char* szForcedName(gcpRendD3D->CV_d3d11_forcedFeatureLevel->GetString());
-    if (szForcedName == NULL || strlen(szForcedName) == 0)
-    {
-        return false;
-    }
-
-    FeatureLevel* pLevel;
-    for (pLevel = s_aLevels; pLevel < s_aLevels + SIZEOF_ARRAY(s_aLevels); ++pLevel)
-    {
-        if (strcmp(pLevel->m_szName, szForcedName) == 0)
-        {
-            *pForcedFeatureLevel = pLevel->m_eValue;
-            return true;
-        }
-    }
-
-    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Invalid value for d3d11_forcedFeatureLevel %s - using available feature level", szForcedName);
-    return false;
-}
-#endif // !defined(_RELEASE)
-
-bool DeviceInfo::CreateDevice(bool windowed, [[maybe_unused]] int width, [[maybe_unused]] int height, int backbufferWidth, int backbufferHeight, int zbpp, OnCreateDeviceCallback pCreateDeviceCallback, CreateWindowCallback pCreateWindowCallback)
-{
-#ifndef CRY_USE_METAL
-    m_autoDepthStencilFmt = zbpp == 32 ? DXGI_FORMAT_R32G8X24_TYPELESS : DXGI_FORMAT_R24G8_TYPELESS;
-#endif
-
-#if defined(OPENGL)
-
-    HWND hWnd = pCreateWindowCallback ? pCreateWindowCallback() : 0;
-    if (!hWnd)
-    {
-        Release();
-        return false;
-    }
-
-    const int r_overrideDXGIAdapter = GetDXGIAdapterOverride();
-    const int r_multithreaded = GetMultithreaded();
-    unsigned int nAdapterOrdinal = r_overrideDXGIAdapter >= 0 ? r_overrideDXGIAdapter : 0;
-    InitSwapChain(m_swapChainDesc, backbufferWidth, backbufferHeight, hWnd, windowed);
-
-    if (!SUCCEEDED(CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**) &m_pFactory)) || !m_pFactory)
-    {
-        Release();
-        return false;
-    }
-
-    while (m_pFactory->EnumAdapters1(nAdapterOrdinal, &m_pAdapter) != DXGI_ERROR_NOT_FOUND)
-    {
-        if (m_pAdapter)
-        {
-            m_driverType = D3D_DRIVER_TYPE_HARDWARE;
-            m_creationFlags = 0;
-
-            D3D_FEATURE_LEVEL* aFeatureLevels(NULL);
-            unsigned int uNumFeatureLevels(0);
-#if !defined(_RELEASE)
-            D3D_FEATURE_LEVEL eForcedFeatureLevel(D3D_FEATURE_LEVEL_11_0);
-            if (GetForcedFeatureLevel(&eForcedFeatureLevel))
-            {
-                aFeatureLevels = &eForcedFeatureLevel;
-                uNumFeatureLevels = 1;
-            }
-#endif //!defined(_RELEASE)
-
-            const D3D_DRIVER_TYPE driverType = m_driverType == D3D_DRIVER_TYPE_HARDWARE ? D3D_DRIVER_TYPE_UNKNOWN : m_driverType;
-            HRESULT hr = D3D11CreateDeviceAndSwapChain(m_pAdapter, driverType, 0, m_creationFlags, aFeatureLevels, uNumFeatureLevels, D3D11_SDK_VERSION, &m_swapChainDesc, &m_pSwapChain, &m_pDevice, &m_featureLevel, &m_pContext);
-            if (SUCCEEDED(hr) && m_pDevice && m_pSwapChain)
-            {
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-                const uint32 outputIdx = gRenDev->CV_r_overrideDXGIOutput > 0 ? gRenDev->CV_r_overrideDXGIOutput : 0;
-                if (outputIdx)
-                {
-                    if (SUCCEEDED(m_pAdapter->EnumOutputs(outputIdx, &m_pOutput)) && m_pOutput)
-                    {
-                        SetupMonitorAndGetAdapterDesc(m_pOutput, m_pAdapter, m_adapterDesc);
-                        break;
-                    }
-
-                    SAFE_RELEASE(m_pOutput);
-                    CryLogAlways("Failed to resolve DXGI display for override index %d. Falling back to primary display.", outputIdx);
-                }
-#endif
-                if (SUCCEEDED(m_pAdapter->EnumOutputs(0, &m_pOutput)) && m_pOutput)
-                {
-                    SetupMonitorAndGetAdapterDesc(m_pOutput, m_pAdapter, m_adapterDesc);
-                    break;
-                }
-                else if (r_overrideDXGIAdapter >= 0)
-                {
-                    CryLogAlways("No display connected to DXGI adapter override %d. Adapter cannot be used for rendering.", r_overrideDXGIAdapter);
-                }
-            }
-
-            SAFE_RELEASE(m_pOutput);
-            SAFE_RELEASE(m_pContext);
-            SAFE_RELEASE(m_pDevice);
-            SAFE_RELEASE(m_pSwapChain);
-            SAFE_RELEASE(m_pAdapter);
-        }
-    }
-
-    if (!m_pDevice || !m_pSwapChain)
-    {
-        Release();
-        return false;
-    }
-
-    m_pFactory->MakeWindowAssociation(m_swapChainDesc.OutputWindow, DXGI_MWA_NO_ALT_ENTER | DXGI_MWA_NO_WINDOW_CHANGES);
-
-    if (pCreateDeviceCallback)
-    {
-        pCreateDeviceCallback(m_pDevice);
-    }
-
-#if !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
-    if (r_multithreaded)
-    {
-        DXGLReserveContext(m_pDevice);
-    }
-    DXGLBindDeviceContext(m_pContext, !r_multithreaded);
-#endif //!DXGL_FULL_EMULATION
-    bool bSuccess = CreateViews();
-    if (!bSuccess)
-    {
-        Release();
-    }
-
-    return IsOk();
-#elif defined(WIN32) || defined(WIN64)
-    typedef HRESULT (WINAPI * FP_CreateDXGIFactory1)(REFIID, void**);
-
-    FP_CreateDXGIFactory1 pCDXGIF =
-#if defined(CRY_USE_DX12)
-        (FP_CreateDXGIFactory1) DX12CreateDXGIFactory1;
-#else
-        (FP_CreateDXGIFactory1) GetProcAddress(LoadLibraryA("dxgi.dll"), "CreateDXGIFactory1");
-#endif
-
-    IDXGIAdapter1* pAdapter = nullptr;
-    IDXGIOutput* pOutput = nullptr;
-    ID3D11Device* pDevice = nullptr;
-    ID3D11DeviceContext* pContext = nullptr;
-
-    if (pCDXGIF && SUCCEEDED(pCDXGIF(__uuidof(IDXGIFactory1), (void**) &m_pFactory)) && m_pFactory)
-    {
-        typedef HRESULT (WINAPI * CreateDeviceCallback)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
-
-        CreateDeviceCallback createDeviceCallback =
-#if defined(CRY_USE_DX12)
-            (CreateDeviceCallback)DX12CreateDevice;
-#else
-            (CreateDeviceCallback)GetProcAddress(LoadLibraryA("d3d11.dll"), "D3D11CreateDevice");
-#endif
-
-        if (createDeviceCallback)
-        {
-            const int r_overrideDXGIAdapter = GetDXGIAdapterOverride();
-            unsigned int nAdapterOrdinal = r_overrideDXGIAdapter >= 0 ? r_overrideDXGIAdapter : 0;
-
-            while (m_pFactory->EnumAdapters1(nAdapterOrdinal, &pAdapter) != DXGI_ERROR_NOT_FOUND)
-            {
-                if (pAdapter)
-                {
-                    // Promote interfaces to the required level
-                    pAdapter->QueryInterface(__uuidof(DXGIAdapter), (void**)&m_pAdapter);
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-                    const unsigned int debugRTFlag = gcpRendD3D->CV_d3d11_debugruntime ? D3D11_CREATE_DEVICE_DEBUG : 0;
-#else
-                    const unsigned int debugRTFlag = 0;
-#endif
-                    m_driverType = D3D_DRIVER_TYPE_HARDWARE;
-                    m_creationFlags = debugRTFlag;
-#if defined(WIN32) || defined(WIN64)
-                    // CRY DX12 DISABLED TEMPORARILY                    if (gcpRendD3D->CV_d3d11_preventDriverThreading)
-                    //                      m_creationFlags |= D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS;
-#endif
-
-                    D3D_FEATURE_LEVEL arrFeatureLevels[] = {
-                        #if SUPPORTS_WINDOWS_10_SDK 
-                            D3D_FEATURE_LEVEL_11_1, 
-                        #endif
-                        D3D_FEATURE_LEVEL_11_0
-                    };
-                    D3D_FEATURE_LEVEL* pFeatureLevels(arrFeatureLevels);
-                    unsigned int uNumFeatureLevels(sizeof(arrFeatureLevels) / sizeof(D3D_FEATURE_LEVEL));
-#if !defined(_RELEASE)
-                    D3D_FEATURE_LEVEL eForcedFeatureLevel;
-                    if (GetForcedFeatureLevel(&eForcedFeatureLevel))
-                    {
-                        pFeatureLevels = &eForcedFeatureLevel;
-                        uNumFeatureLevels = 1;
-                    }
-#endif //!defined(_RELEASE)
-
-                    DXGI_ADAPTER_DESC1 adapterDesc1;
-                    if (SUCCEEDED(m_pAdapter->GetDesc1(&adapterDesc1)))
-                    {
-                        // We need to know if this is a software adapter (e.g., WARP) which may not have any outputs
-                        m_adapterFlag = static_cast<DXGI_ADAPTER_FLAG>(adapterDesc1.Flags);
-                    }
-
-                    const D3D_DRIVER_TYPE driverType = m_driverType == D3D_DRIVER_TYPE_HARDWARE ? D3D_DRIVER_TYPE_UNKNOWN : m_driverType;
-                    HRESULT hr = createDeviceCallback(pAdapter, driverType, 0, m_creationFlags, pFeatureLevels, uNumFeatureLevels, D3D11_SDK_VERSION, &pDevice, &m_featureLevel, &pContext);
-                    if (SUCCEEDED(hr) && pDevice)
-                    {
-                        // Promote interfaces to the required level
-                        pDevice->QueryInterface(__uuidof(D3DDevice), (void**)&m_pDevice);
-                        pContext->QueryInterface(__uuidof(D3DDeviceContext), (void**)&m_pContext);
-
-                        {
-                            DXGIDevice* pDXGIDevice = 0;
-                            if (SUCCEEDED(pDevice->QueryInterface(__uuidof(DXGIDevice), (void**) &pDXGIDevice)) && pDXGIDevice)
-                            {
-                                // SetMaximumFrameLatency as 3 in editor mode to avoid waiting GPU during Present.
-                                // Because there might be multiple Presents in one update loop (main render present, material editor present...), 
-                                // setting it as 1 is not enough in this case, during the same update loop, the 2nd present can wait significant time for 1st presented GPU draw.
-                                pDXGIDevice->SetMaximumFrameLatency(gcpRendD3D->IsEditorMode() ? 3 : 1);
-                            }
-                            SAFE_RELEASE(pDXGIDevice);
-                        }
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-                        m_outputIndex = gRenDev->CV_r_overrideDXGIOutput > 0 ? gRenDev->CV_r_overrideDXGIOutput : 0;
-                        if (m_outputIndex)
-                        {
-                            if (SUCCEEDED(pAdapter->EnumOutputs(m_outputIndex, &pOutput)) && pOutput)
-                            {
-                                // Promote interfaces to the required level
-                                pOutput->QueryInterface(__uuidof(DXGIOutput), (void**)&m_pOutput);
-                                SetupMonitorAndGetAdapterDesc(m_pOutput, m_pAdapter, m_adapterDesc);
-                                break;
-                            }
-
-                            SAFE_RELEASE(pOutput);
-                            CryLogAlways("Failed to resolve DXGI display for override index %d. Falling back to primary display.", m_outputIndex);
-                            m_outputIndex = 0;
-                        }
-#endif
-                        if (SUCCEEDED(pAdapter->EnumOutputs(0, &pOutput)) && pOutput)
-                        {
-                            // Promote interfaces to the required level
-                            pOutput->QueryInterface(__uuidof(DXGIOutput), (void**)&m_pOutput);
-                            SetupMonitorAndGetAdapterDesc(m_pOutput, m_pAdapter, m_adapterDesc);
-                            break;
-                        }
-                        else if (m_adapterFlag == DXGI_ADAPTER_FLAG_SOFTWARE || m_driverType == D3D_DRIVER_TYPE_WARP)
-                        {
-                            break;
-                        }
-                        else if (r_overrideDXGIAdapter >= 0)
-                        {
-                            CryLogAlways("No display connected to DXGI adapter override %d. Adapter cannot be used for rendering.", r_overrideDXGIAdapter);
-                        }
-                    }
-
-                    // Decrement QueryInterface() increment
-                    SAFE_RELEASE(m_pOutput);
-                    SAFE_RELEASE(m_pContext);
-                    SAFE_RELEASE(m_pDevice);
-                    SAFE_RELEASE(m_pAdapter);
-
-                    // Decrement Create() increment
-                    SAFE_RELEASE(pOutput);
-                    SAFE_RELEASE(pContext);
-                    SAFE_RELEASE(pDevice);
-                    SAFE_RELEASE(pAdapter);
-                }
-
-                if (r_overrideDXGIAdapter >= 0)
-                {
-                    break;
-                }
-
-                ++nAdapterOrdinal;
-            }
-        }
-    }
-
-    if (!m_pFactory || !m_pAdapter || !m_pDevice || !m_pContext)
-    {
-        Release();
-        return false;
-    }
-
-    if (!m_pOutput && m_adapterFlag != DXGI_ADAPTER_FLAG_SOFTWARE && m_driverType != D3D_DRIVER_TYPE_WARP)
-    {
-        Release();
-        return false;
-    }
-
-    // Decrement Create() increment
-    SAFE_RELEASE(pOutput);
-    SAFE_RELEASE(pContext);
-    SAFE_RELEASE(pDevice);
-    SAFE_RELEASE(pAdapter);
-
-    // Get SDK level D3D device pointer
-#ifdef CRY_INTEGRATE_DX12
-        IUnknown* d3dDevice = static_cast<CCryDX12Device*>(m_pDevice)->GetD3D12Device();
-#else
-        IUnknown* d3dDevice = m_pDevice;
-#endif
-
-#if defined(WIN32) || defined(WIN64)
-    {
-        DXGI_MODE_DESC desc;
-        memset(&desc, 0, sizeof(desc));
-        desc.Width = gcpRendD3D->m_prefMonWidth;
-        desc.Height = gcpRendD3D->m_prefMonHeight;
-        desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-
-        DXGI_MODE_DESC match;
-        if (m_pOutput && SUCCEEDED(m_pOutput->FindClosestMatchingMode(&desc, &match, d3dDevice)))
-        {
-            m_desktopRefreshRate = match.RefreshRate;
-        }
-    }
-#endif
-
-    HWND hWnd = pCreateWindowCallback ? pCreateWindowCallback() : 0;
-    if (!hWnd)
-    {
-        Release();
-        return false;
-    }
-
-    ProcessWindowMessages(hWnd);
-
-    {
-        InitSwapChain(m_swapChainDesc, backbufferWidth, backbufferHeight, hWnd, windowed);
-
-        if (!windowed)
-        {
-            DXGI_MODE_DESC match;
-            if (m_pOutput && SUCCEEDED(m_pOutput->FindClosestMatchingMode(&m_swapChainDesc.BufferDesc, &match, d3dDevice)))
-            {
-                m_swapChainDesc.BufferDesc = match;
-            }
-        }
-
-        m_refreshRate = !windowed ? m_swapChainDesc.BufferDesc.RefreshRate : m_desktopRefreshRate;
-
-        IDXGISwapChain* pSwapChain;
-        HRESULT hr = m_pFactory->CreateSwapChain(m_pDevice, &m_swapChainDesc, &pSwapChain);
-        if (FAILED(hr) || !pSwapChain)
-        {
-            Release();
-            return false;
-        }
-
-        // Promote interfaces to the required level
-        hr = pSwapChain->QueryInterface(__uuidof(DXGISwapChain), (void**)&m_pSwapChain);
-        if (FAILED(hr) || !m_pSwapChain)
-        {
-            Release();
-            return false;
-        }
-#ifdef CRY_INTEGRATE_DX12
-        m_pSwapChain->SetMaximumFrameLatency(1);
-        m_frameLatencyWaitableObject = m_pSwapChain->GetFrameLatencyWaitableObject();
-#endif
-        // Decrement Create() increment
-        SAFE_RELEASE(pSwapChain);
-    }
-
-    {
-        m_pFactory->MakeWindowAssociation(m_swapChainDesc.OutputWindow, DXGI_MWA_NO_ALT_ENTER | DXGI_MWA_NO_WINDOW_CHANGES);
-
-        if (pCreateDeviceCallback)
-        {
-            pCreateDeviceCallback(m_pDevice);
-        }
-    }
-
-    if (!CreateViews())
-    {
-        Release();
-    }
-
-    ProcessWindowMessages(hWnd);
-
-    return IsOk();
-#else
-    #pragma message("DeviceInfo::CreateDevice not implemented on this platform")
-    return false;
-#endif
-}
-
-bool DeviceInfo::CreateViews()
-{
-    DXGI_SWAP_CHAIN_DESC scDesc;
-
-    m_pSwapChain->GetDesc(&scDesc);
-
-    AZ::u32 bufferCount = scDesc.BufferCount;
-#if !defined(CRY_USE_DX12)
-    bufferCount = 1;
-#endif
-
-    m_pBackbufferRTVs.resize(bufferCount);
-    for (unsigned int b = 0; b < bufferCount; ++b)
-    {
-        D3DTexture* pBackBuffer = 0;
-        HRESULT hr = m_pSwapChain->GetBuffer(b, __uuidof(D3DTexture), (void**) &pBackBuffer);
-
-        if (SUCCEEDED(hr) && pBackBuffer)
-        {
-            {
-                assert(!m_pBackbufferRTVs[b]);
-                hr = m_pDevice->CreateRenderTargetView(pBackBuffer, 0, &m_pBackbufferRTVs[b]);
-            }
-
-#if !defined(RELEASE) && defined(WIN64)
-            char str[32] = "";
-            azsprintf(str, "Swap-Chain back buffer %d", b);
-            pBackBuffer->SetPrivateData(WKPDID_D3DDebugObjectName, strlen(str), str);
-#endif
-        }
-
-        SAFE_RELEASE(pBackBuffer);
-    }
-
-    m_pCurrentBackBufferRTVIndex = CD3D9Renderer::GetCurrentBackBufferIndex(m_pSwapChain);
-
-    return true;
-}
-
-void DeviceInfo::SnapSettings()
-{
-    if (m_swapChainDesc.Windowed)
-    {
-        m_swapChainDesc.BufferDesc.RefreshRate.Denominator = 0;
-        m_swapChainDesc.BufferDesc.RefreshRate.Numerator = 0;
-        m_swapChainDesc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
-        m_swapChainDesc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
-
-        m_refreshRate = m_desktopRefreshRate;
-    }
-    else
-    {
-        DXGI_MODE_DESC desc;
-        memset(&desc, 0, sizeof(desc));
-        desc.Width = m_swapChainDesc.BufferDesc.Width;
-        desc.Height = m_swapChainDesc.BufferDesc.Height;
-        desc.Format = m_swapChainDesc.BufferDesc.Format;
-
-        DXGI_MODE_DESC match;
-#ifdef CRY_INTEGRATE_DX12
-        IUnknown* d3dDevice = static_cast<CCryDX12Device*>(m_pDevice)->GetD3D12Device();
-#else
-        IUnknown* d3dDevice = m_pDevice;
-#endif
-        if (m_pOutput && SUCCEEDED(m_pOutput->FindClosestMatchingMode(&desc, &match, d3dDevice)))
-        {
-            m_swapChainDesc.BufferDesc = match;
-
-            m_refreshRate = match.RefreshRate;
-        }
-    }
-}
-
-void DeviceInfo::ResizeDXGIBuffers()
-{
-    for (unsigned int b = 0; b < m_pBackbufferRTVs.size(); ++b)
-    {
-        SAFE_RELEASE(m_pBackbufferRTVs[b]);
-    }
-
-
-    UINT flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
-#ifdef CRY_INTEGRATE_DX12
-    flags |= DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT;
-#endif
-
-    m_pSwapChain->ResizeBuffers(0, m_swapChainDesc.BufferDesc.Width, m_swapChainDesc.BufferDesc.Height, m_swapChainDesc.BufferDesc.Format, flags);
-
-    CreateViews();
-}
-
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-void DeviceInfo::OnActivate(UINT_PTR wParam, UINT_PTR lParam)
-{
-    const bool activate = LOWORD(wParam) != 0;
-    if (m_activatedMT != activate)
-    {
-        if (gcpRendD3D->IsFullscreen())
-        {
-            HWND hWnd = (HWND) gcpRendD3D->GetHWND();
-            ShowWindow(hWnd, activate ? SW_RESTORE : SW_MINIMIZE);
-        }
-
-        m_activatedMT = activate;
-    }
-
-    PushSystemEvent(ESYSTEM_EVENT_ACTIVATE, wParam, lParam);
-}
-
-void DeviceInfo::PushSystemEvent(ESystemEvent event, UINT_PTR wParam, UINT_PTR lParam)
-{
-#if !defined(_RELEASE) && !defined(STRIP_RENDER_THREAD)
-    if (gcpRendD3D->m_pRT && !gcpRendD3D->m_pRT->IsMainThread())
-    {
-        __debugbreak();
-    }
-#endif
-    CryAutoCriticalSection lock(m_msgQueueLock);
-    m_msgQueue.push_back(DeviceInfoInternal::MsgQueueItem(event, wParam, lParam));
-}
-
-void DeviceInfo::ProcessSystemEventQueue()
-{
-#if !defined(_RELEASE)
-    if (gcpRendD3D->m_pRT && !gcpRendD3D->m_pRT->IsRenderThread())
-    {
-        __debugbreak();
-    }
-#endif
-
-    m_msgQueueLock.Lock();
-    DeviceInfoInternal::MsgQueue localQueue;
-    localQueue.swap(m_msgQueue);
-    m_msgQueueLock.Unlock();
-
-    for (size_t i = 0; i < localQueue.size(); ++i)
-    {
-        const DeviceInfoInternal::MsgQueueItem& item = localQueue[i];
-        ProcessSystemEvent(item.event, item.wParam, item.lParam);
-    }
-}
-
-void DeviceInfo::ProcessSystemEvent(ESystemEvent event, UINT_PTR wParam, [[maybe_unused]] UINT_PTR lParam)
-{
-#if !defined(_RELEASE)
-    if (gcpRendD3D->m_pRT && !gcpRendD3D->m_pRT->IsRenderThread())
-    {
-        __debugbreak();
-    }
-#endif
-
-    switch (event)
-    {
-    case ESYSTEM_EVENT_ACTIVATE:
-    {
-#if defined(WIN32)
-        // disable floating point exceptions due to driver bug with floating point exceptions
-        SCOPED_DISABLE_FLOAT_EXCEPTIONS;
-#endif
-        const bool activate = LOWORD(wParam) != 0;
-        if (m_activated != activate)
-        {
-
-            const bool isFullscreen = gcpRendD3D->IsFullscreen();
-            if (isFullscreen && !activate)
-            {
-                gcpRendD3D->GetS3DRend().ReleaseBuffers();
-                m_pSwapChain->SetFullscreenState(FALSE, 0);
-                ResizeDXGIBuffers();
-                gcpRendD3D->OnD3D11PostCreateDevice(m_pDevice);
-            }
-            else if (isFullscreen && activate)
-            {
-                gcpRendD3D->GetS3DRend().ReleaseBuffers();
-                m_pSwapChain->SetFullscreenState(TRUE, 0);
-                ResizeDXGIBuffers();
-                gcpRendD3D->GetS3DRend().OnResolutionChanged();
-                gcpRendD3D->OnD3D11PostCreateDevice(m_pDevice);
-            }
-
-            m_activated = activate;
-        }
-    }
-    break;
-
-    default:
-        assert(0);
-        break;
-    }
-}
-#endif // #if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-
-#if defined(WIN32) || defined(WIN64)
-void DeviceInfo::EnforceFullscreenPreemption()
-{
-    if (gRenDev->CV_r_FullscreenPreemption && gcpRendD3D->IsFullscreen())
-    {
-        HRESULT hr = m_pSwapChain->Present(0, DXGI_PRESENT_TEST);
-        if (hr == DXGI_STATUS_OCCLUDED)
-        {
-            HWND hWnd = (HWND) gcpRendD3D->GetHWND();
-            if (m_activated)
-            {
-                BringWindowToTop(hWnd);
-            }
-        }
-    }
-}
-
-#ifdef CRY_INTEGRATE_DX12
-void DeviceInfo::WaitForGPUFrames()
-{
-    FUNCTION_PROFILER_RENDER_FLAT
-    WaitForSingleObjectEx(
-        m_frameLatencyWaitableObject,
-        1000, // 1 second timeout (shouldn't ever occur)
-        true
-    );
-}
-#endif
-
-#endif // #if defined(WIN32) || defined(WIN64)
-
-#endif // #if defined(SUPPORT_DEVICE_INFO)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/Base.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/Base.h
deleted file mode 100644
index 8c6918cdca..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/Base.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "AzCore/std/parallel/atomic.h"
-
-#if !defined(_RELEASE)
-# define AZRHI_DEBUG 1
-#else
-# define AZRHI_DEBUG 0
-#endif
-
-#if AZRHI_DEBUG
-# define AZRHI_ASSERT(x) \
-    do {                        \
-        if (!(x)) {             \
-            __debugbreak(); }   \
-    } while (false)
-#else
-# define AZRHI_ASSERT(x) (void)0
-#endif
-
-#define AZRHI_VERIFY(x) \
-    do {                       \
-        if (!(x)) {            \
-            __debugbreak(); }  \
-    } while (false)
-
-namespace AzRHI
-{
-    inline void SIMDCopy(void* dst, const void* bytes, size_t registerCount)
-    {
-#if defined(_CPU_SSE)
-        if ((uintptr_t(bytes) & 0xF) == 0u)
-        {
-            __m128* const __restrict sseDst = (__m128*)dst;
-            const __m128* const __restrict sseSrc = (const __m128*)bytes;
-            for (size_t i = 0; i < registerCount; i++)
-            {
-               sseDst[i] = sseSrc[i];
-            }
-        }
-        else
-#endif
-        {
-            const float* const __restrict copySource = (const float*)bytes;
-            float* const __restrict copyDest = (float*)dst;
-            for (size_t i = 0; i < registerCount * 4; i += 4)
-            {
-                copyDest[i] = copySource[i];
-                copyDest[i + 1] = copySource[i + 1];
-                copyDest[i + 2] = copySource[i + 2];
-                copyDest[i + 3] = copySource[i + 3];
-            }
-        }
-    }
-
-    // BitScanReverse/BitScanForward available?
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(Base_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(LINUX)
-#define HAS_BIT_SCAN_REVERSE_FORWARD 0
-#elif defined(APPLE)
-#define HAS_BIT_SCAN_REVERSE_FORWARD 0
-#else
-#define HAS_BIT_SCAN_REVERSE_FORWARD 1
-#endif
-
-#if !HAS_BIT_SCAN_REVERSE_FORWARD
-    inline AZ::u32 ScanBitsReverse(AZ::u32 input)
-    {
-        signed mask = iszero((signed)input) - 1;
-        signed clz = __builtin_clz(input);
-        signed index = 31 - clz;
-        return (index & mask) | (32 & ~mask);
-    }
-    inline AZ::u32 ScanBitsForward(AZ::u32 input)
-    {
-        signed mask = iszero((signed)input) - 1;
-        signed ctz = __builtin_ctz(input);
-        signed index = ctz;
-        return (index & mask) | (32 & ~mask);
-    }
-#else
-    inline AZ::u32 ScanBitsReverse(AZ::u32 input)
-    {
-        unsigned long index;
-        signed result = BitScanReverse(&index, input);
-        signed mask = iszero(result) - 1;
-        return (index & mask) | (32 & ~mask);
-    }
-    inline AZ::u32 ScanBitsForward(AZ::u32 input)
-    {
-        unsigned long index;
-        signed result = BitScanForward(&index, input);
-        signed mask = iszero(result) - 1;
-        return (index & mask) | (32 & ~mask);
-    }
-#endif
-
-    class ReferenceCounted
-    {
-    public:
-        ReferenceCounted()
-            : m_refCount(0)
-        { }
-
-        ReferenceCounted(ReferenceCounted&& r)
-            : m_refCount(r.m_refCount.load())
-        {}
-
-        ReferenceCounted& operator=(ReferenceCounted&& r)
-        {
-            m_refCount = r.m_refCount.load();
-            return *this;
-        }
-
-        AZ::u32 AddRef()
-        {
-            return m_refCount++;
-        }
-
-        AZ::u32 Release()
-        {
-            AZ_Assert(m_refCount != 0, "Releasing an already released object");
-            const AZ::u32 refCount = --m_refCount;
-            if (refCount == 0)
-            {
-                delete this;
-                return 0;
-            }
-            return refCount;
-        }
-
-    protected:
-        virtual ~ReferenceCounted() {}
-
-    private:
-        AZStd::atomic_uint m_refCount;
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/ConstantBufferCache.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/ConstantBufferCache.cpp
deleted file mode 100644
index fce087e8b7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/ConstantBufferCache.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "ConstantBufferCache.h"
-
-namespace
-{
-    void ReportStatistics(AZ::u32 registerCountMax)
-    {
-#ifdef DO_RENDERLOG
-        if (CD3D9Renderer::CV_d3d11_CBUpdateStats)
-        {
-            static unsigned int s_lastFrame(0);
-            static unsigned int s_numCalls(0);
-            static unsigned int s_minUpdateBytes(0);
-            static unsigned int s_maxUpdateBytes(0);
-            static unsigned int s_totalUpdateBytes(0);
-
-            unsigned int updateBytes = (unsigned int)(registerCountMax * sizeof(Vec4));
-            unsigned int curFrame = gcpRendD3D->GetFrameID(false);
-            if (s_lastFrame != curFrame)
-            {
-                if (s_lastFrame != 0)
-                {
-                    unsigned int avgUpdateBytes = s_totalUpdateBytes / s_numCalls;
-                    gEnv->pLog->Log("-------------------------------------------------------");
-                    gEnv->pLog->Log("CB update statistics for frame %d:", s_lastFrame);
-                    gEnv->pLog->Log("#UpdateSubresource() = %d calls", s_numCalls);
-                    gEnv->pLog->Log("SmallestTransfer = %d kb (%d bytes)", (s_minUpdateBytes + 1023) >> 10, s_minUpdateBytes);
-                    gEnv->pLog->Log("BiggestTransfer = %d kb (%d bytes)", (s_maxUpdateBytes + 1023) >> 10, s_maxUpdateBytes);
-                    gEnv->pLog->Log("AvgTransfer = %d kb (%d bytes)", (avgUpdateBytes + 1023) >> 10, avgUpdateBytes);
-                    gEnv->pLog->Log("TotalTransfer = %d kb (%d bytes)", (s_totalUpdateBytes + 1023) >> 10, s_totalUpdateBytes);
-                }
-
-                s_lastFrame = curFrame;
-                s_numCalls = 1;
-                s_minUpdateBytes = updateBytes;
-                s_maxUpdateBytes = updateBytes;
-                s_totalUpdateBytes = updateBytes;
-            }
-            else
-            {
-                ++s_numCalls;
-                s_minUpdateBytes = min(updateBytes, s_minUpdateBytes);
-                s_maxUpdateBytes = max(updateBytes, s_maxUpdateBytes);
-                s_totalUpdateBytes += updateBytes;
-            }
-        }
-#endif
-    }
-}
-
-namespace AzRHI
-{
-    ConstantBufferCache::ConstantBufferCache()
-        : m_Cache{}
-        , m_DeviceManager{ gcpRendD3D->m_DevMan }
-        , m_DeviceBufferManager{ gcpRendD3D->m_DevBufMan }
-    {
-        for (AZ::u32 shaderClass = 0; shaderClass < eHWSC_Num; shaderClass++)
-        {
-            const AZ::u32 registerCountMax = GetConstantRegisterCountMax(EHWShaderClass(shaderClass));
-            if (registerCountMax)
-            {
-                for (AZ::u32 shaderSlot = 0; shaderSlot < eConstantBufferShaderSlot_Count; shaderSlot++)
-                {
-                    m_Buffers[shaderClass][shaderSlot].resize(registerCountMax);
-                }
-            }
-        }
-    }
-
-    void ConstantBufferCache::Reset()
-    {
-        for (AZ::u32 shaderClass = 0; shaderClass < eHWSC_Num; shaderClass++)
-        {
-            for (AZ::u32 shaderSlot = 0; shaderSlot < eConstantBufferShaderSlot_Count; shaderSlot++)
-            {
-                for (AzRHI::ConstantBuffer*& buffer : m_Buffers[shaderClass][shaderSlot])
-                {
-                    if (buffer)
-                    {
-                        buffer->Release();
-                        buffer = nullptr;
-                    }
-                }
-            }
-        }
-    }
-
-    void ConstantBufferCache::CommitAll()
-    {
-        for (CacheEntryKey key : m_DirtyEntries)
-        {
-            CacheEntry& entry = GetCacheEntry(key.shaderClass, key.shaderSlot);
-
-            TryCommitConstantBuffer(entry);
-
-            m_DeviceManager.BindConstantBuffer(key.shaderClass, entry.m_buffer, key.shaderSlot);
-        }
-        m_DirtyEntries.clear();
-    }
-
-    void* ConstantBufferCache::MapConstantBuffer(
-        EHWShaderClass shaderClass,
-        EConstantBufferShaderSlot shaderSlot,
-        AZ::u32 registerCountMax)
-    {
-        CacheEntry& entry = GetCacheEntry(shaderClass, shaderSlot);
-
-        if (entry.m_registerCountMax != registerCountMax)
-        {
-            TryCommitConstantBuffer(entry);
-        }
-
-        if (!entry.m_mappedData)
-        {
-            if (!entry.m_bExternalActive)
-            {
-                auto& bufferList = m_Buffers[shaderClass][shaderSlot];
-
-                if (!bufferList[registerCountMax])
-                {
-                    AzRHI::ConstantBuffer* constantBuffer = m_DeviceBufferManager.CreateConstantBuffer(
-                        "ConstantBufferCache",
-                        registerCountMax * sizeof(Vec4),
-                        AzRHI::ConstantBufferUsage::Dynamic,
-                        AzRHI::ConstantBufferFlags::None);
-
-                    if (!constantBuffer)
-                    {
-                        AZ_Error(
-                            "ConstantBufferCache",
-                            false,
-                            "ERROR: CBuffer %d Create() failed for shader %s result %d",
-                            (AZ::u32)shaderSlot,
-                            gRenDev->m_RP.m_pShader ? gRenDev->m_RP.m_pShader->GetName() : "Unknown",
-                            -1);
-                        return nullptr;
-                    }
-                    bufferList[registerCountMax] = constantBuffer;
-                }
-
-                entry.m_buffer = bufferList[registerCountMax];
-
-                CacheEntryKey dirty;
-                dirty.shaderClass = shaderClass;
-                dirty.shaderSlot = shaderSlot;
-                m_DirtyEntries.push_back(dirty);
-            }
-
-            {
-                STALL_PROFILER("set const_buffer");
-                AZ_Assert(entry.m_buffer, "buffer should be valid");
-                entry.m_registerCountMax = registerCountMax;
-                entry.m_mappedData = (Vec4*)entry.m_buffer->BeginWrite();
-            }
-
-            ReportStatistics(registerCountMax);
-        }
-
-        return entry.m_mappedData;
-    }
-
-    AzRHI::ConstantBuffer* ConstantBufferCache::GetConstantBuffer(EHWShaderClass shaderClass, EConstantBufferShaderSlot shaderSlot, AZ::u32 registerCount)
-    {
-        return m_Buffers[shaderClass][shaderSlot][registerCount];
-    }
-
-
-    bool ConstantBufferCache::TryCommitConstantBuffer(CacheEntry& entry)
-    {
-        if (entry.m_mappedData)
-        {
-            entry.m_buffer->EndWrite();
-            entry.m_mappedData = nullptr;
-            return true;
-        }
-        return false;
-    }
-
-    void ConstantBufferCache::BeginExternalConstantBuffer(
-        EHWShaderClass shaderClass,
-        EConstantBufferShaderSlot shaderSlot,
-        AzRHI::ConstantBuffer* externalBuffer,
-        AZ::u32 registerCountMax)
-    {
-        CacheEntry& entry = GetCacheEntry(shaderClass, shaderSlot);
-
-        if (entry.m_mappedData)
-        {
-            TryCommitConstantBuffer(entry);
-        }
-
-        AZ_Assert(entry.m_bExternalActive == false, "Already injected external constant buffer");
-        entry.m_bExternalActive = true;
-        entry.m_buffer = externalBuffer;
-        entry.m_mappedData = nullptr;
-        entry.m_registerCountMax = registerCountMax;
-    }
-
-    void ConstantBufferCache::EndExternalConstantBuffer(
-        EHWShaderClass shaderClass,
-        EConstantBufferShaderSlot shaderSlot)
-    {
-        CacheEntry& entry = GetCacheEntry(shaderClass, shaderSlot);
-
-        if (entry.m_mappedData)
-        {
-            entry.m_buffer->EndWrite();
-        }
-
-        entry.m_buffer = nullptr;
-        entry.m_mappedData = nullptr;
-        entry.m_registerCountMax = 0;
-        entry.m_bExternalActive = false;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/ConstantBufferCache.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/ConstantBufferCache.h
deleted file mode 100644
index f86253a6bc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/ConstantBufferCache.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-namespace AzRHI
-{
-    class ConstantBufferCache
-    {
-    public:
-        ConstantBufferCache();
-
-        static ConstantBufferCache& GetInstance()
-        {
-            static ConstantBufferCache instance;
-            return instance;
-        }
-
-        void Reset();
-
-        ConstantBuffer* GetConstantBuffer(EHWShaderClass shaderClass, EConstantBufferShaderSlot shaderSlot, AZ::u32 registerCountMax);
-
-        void* MapConstantBuffer(EHWShaderClass shaderClass, EConstantBufferShaderSlot shaderslot, AZ::u32 registerCountMax);
-
-        void CommitAll();
-
-        void BeginExternalConstantBuffer(
-            EHWShaderClass shaderClass,
-            EConstantBufferShaderSlot shaderSlot,
-            AzRHI::ConstantBuffer* externalBuffer,
-            AZ::u32 registerCountMax);
-
-        void EndExternalConstantBuffer(
-            EHWShaderClass shaderClass,
-            EConstantBufferShaderSlot shaderSlot);
-
-        inline void WriteConstants(
-            EHWShaderClass shaderClass,
-            EConstantBufferShaderSlot shaderSlot,
-            const Vec4* constants,
-            AZ::u32 registerOffset,
-            AZ::u32 registerCount,
-            AZ::u32 registerCountMax)
-        {
-#if !defined(RELEASE)
-            if (registerOffset + registerCount > registerCountMax)
-            {
-                AZ_Error(
-                    "ConstantBufferCache",
-                    false,
-                    "Attempt to modify constant buffer: %d outside of the range (%d+%d > %d) (Shader: %s)",
-                    (AZ::u32)shaderSlot, registerOffset, registerCount, registerCountMax,
-                    gRenDev->m_RP.m_pShader ? gRenDev->m_RP.m_pShader->GetName() : "Unknown");
-                return;
-            }
-#endif
-
-            Vec4* mappedData = reinterpret_cast<Vec4*>(MapConstantBuffer(shaderClass, shaderSlot, registerCountMax));
-            if (mappedData)
-            {
-                SIMDCopy(&mappedData[registerOffset], constants, registerCount);
-            }
-        }
-
-        inline void WriteConstants(
-            EHWShaderClass shaderClass,
-            const SCGBind* parameter,
-            const void* data,
-            AZ::u32 registerCountMax)
-        {
-            if (parameter)
-            {
-                EConstantBufferShaderSlot shaderSlot = (EConstantBufferShaderSlot)parameter->m_BindingSlot;
-                AZ_Assert(shaderSlot < eConstantBufferShaderSlot_Count, "Invalid shader slot");
-
-                WriteConstants(
-                    shaderClass,
-                    shaderSlot,
-                    reinterpret_cast<const Vec4*>(data),
-                    parameter->m_RegisterOffset,
-                    parameter->m_RegisterCount,
-                    registerCountMax);
-            }
-        }
-
-        inline void WriteConstants(
-            EHWShaderClass shaderClass,
-            const SCGBind* parameter,
-            const void* data,
-            AZ::u32 registerCount,
-            AZ::u32 registerCountMax)
-        {
-            if (parameter)
-            {
-                EConstantBufferShaderSlot shaderSlot = (EConstantBufferShaderSlot)parameter->m_BindingSlot;
-                AZ_Assert(shaderSlot < eConstantBufferShaderSlot_Count, "Invalid shader slot");
-
-                WriteConstants(
-                    shaderClass,
-                    shaderSlot,
-                    reinterpret_cast<const Vec4*>(data),
-                    parameter->m_RegisterOffset,
-                    registerCount,
-                    registerCountMax);
-            }
-        }
-
-    private:
-        struct CacheEntry
-        {
-            CacheEntry()
-                : m_registerCountMax{}
-                , m_bExternalActive{}
-                , m_mappedData{}
-                , m_buffer{}
-            {}
-
-            AZ::u32 m_registerCountMax : 16;
-            AZ::u32 m_bExternalActive  : 1;
-            Vec4* m_mappedData;
-            AzRHI::ConstantBuffer* m_buffer;
-        };
-
-        bool TryCommitConstantBuffer(CacheEntry& entry);
-
-        inline CacheEntry& GetCacheEntry(EHWShaderClass shaderClass, EConstantBufferShaderSlot shaderSlot)
-        {
-            return m_Cache[shaderClass][shaderSlot];
-        }
-
-        struct CacheEntryKey
-        {
-            EHWShaderClass shaderClass;
-            EConstantBufferShaderSlot shaderSlot;
-        };
-
-        CDeviceManager& m_DeviceManager;
-        CDeviceBufferManager& m_DeviceBufferManager;
-        CacheEntry m_Cache[eHWSC_Num][eConstantBufferShaderSlot_Count];
-        AZStd::vector<AzRHI::ConstantBuffer*> m_Buffers[eHWSC_Num][eConstantBufferShaderSlot_Count];
-        AZStd::vector<CacheEntryKey> m_DirtyEntries;
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager.cpp
deleted file mode 100644
index 95768c2042..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager.cpp
+++ /dev/null
@@ -1,1311 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "../DriverD3D.h"
-
-#include <Common/Memory/VRAMDrillerBus.h>
-#include "Base.h"
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DEVICEMANAGER_CPP_SECTION_1 1
-#define DEVICEMANAGER_CPP_SECTION_3 3
-#define DEVICEMANAGER_CPP_SECTION_4 4
-#define DEVICEMANAGER_CPP_SECTION_5 5
-#define DEVICEMANAGER_CPP_SECTION_6 6
-#define DEVICEMANAGER_CPP_SECTION_7 7
-#define DEVICEMANAGER_CPP_SECTION_8 8
-#define DEVICEMANAGER_CPP_SECTION_9 9
-#define DEVICEMANAGER_CPP_SECTION_10 10
-#define DEVICEMANAGER_CPP_SECTION_11 11
-#define DEVICEMANAGER_CPP_SECTION_12 12
-#define DEVICEMANAGER_CPP_SECTION_13 13
-#define DEVICEMANAGER_CPP_SECTION_14 14
-#define DEVICEMANAGER_CPP_SECTION_15 15
-#define DEVICEMANAGER_CPP_SECTION_16 16
-#define DEVICEMANAGER_CPP_SECTION_17 17
-#define DEVICEMANAGER_CPP_SECTION_18 18
-#define DEVICEMANAGER_CPP_SECTION_20 20
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(CRY_USE_DX12)
-    #include "DeviceManager_D3D12.inl"
-#else
-    #include "DeviceManager_D3D11.inl"
-#endif
-
-CDeviceManager::CDeviceManager()
-    : m_fence_handle()
-{
-}
-
-CDeviceManager::~CDeviceManager()
-{
-    if (m_fence_handle != DeviceFenceHandle() && FAILED(ReleaseFence(m_fence_handle)))
-    {
-        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING,
-            "could not create sync fence");
-    }
-}
-
-void CDeviceManager::Init()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-#if !DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    memset(m_CB, 0x0, sizeof(m_CB));
-    memset(m_SRV, 0x0, sizeof(m_SRV));
-    memset(m_UAV, 0x0, sizeof(m_UAV));
-    memset(m_Samplers, 0x0, sizeof(m_Samplers));
-    memset(&m_VBs, 0x0, sizeof(m_VBs));
-    memset(&m_IB, 0x0, sizeof(m_IB));
-    memset(&m_VertexDecl, 0x0, sizeof(m_VertexDecl));
-    memset(&m_Topology, 0x0, sizeof(m_Topology));
-    memset(&m_Shaders, 0x0, sizeof(m_Shaders));
-    memset(&m_RasterState, 0x0, sizeof(m_RasterState));
-    memset(&m_DepthStencilState, 0x0, sizeof(m_DepthStencilState));
-    memset(&m_BlendState, 0x0, sizeof(m_BlendState));
-#endif
-}
-
-void CDeviceManager::RT_Tick()
-{
-    m_numInvalidDrawcalls = 0;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-}
-
-HRESULT CDeviceManager::CreateD3D11Texture2D(const D3D11_TEXTURE2D_DESC* desc, [[maybe_unused]] const FLOAT clearValue[4], const D3D11_SUBRESOURCE_DATA* initialData, ID3D11Texture2D** texture2D, const char* textureName)
-{
-    HRESULT hr = gcpRendD3D->GetDevice().CreateTexture2D(
-        desc,
-#ifdef CRY_USE_DX12
-        clearValue,
-#endif
-        initialData, texture2D);
-
-    if (hr == S_OK)
-    {
-#if !defined(RELEASE) && defined(WIN64)
-        (*texture2D)->SetPrivateData(WKPDID_D3DDebugObjectName, strlen(textureName), textureName);
-#endif
-        void* address = static_cast<void*>(*texture2D);
-        size_t byteSize = CDeviceTexture::TextureDataSize(desc->Width, desc->Height, 1, desc->MipLevels, 1, CTexture::TexFormatFromDeviceFormat(desc->Format));
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, byteSize, textureName, Render::Debug::VRAM_CATEGORY_TEXTURE, Render::Debug::VRAM_SUBCATEGORY_TEXTURE_TEXTURE);
-    }
-    else
-    {
-        AZ_Warning("Rendering", false, "CreateD3D11Texture2D for %s failed! [0x%08x]", textureName, hr);
-    }
-
-    return hr;
-}
-
-void CDeviceManager::ReleaseD3D11Texture2D(ID3D11Texture2D* texture2D)
-{
-    if (texture2D)
-    {
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, static_cast<void*>(texture2D));
-        texture2D->Release();
-    }
-}
-
-HRESULT CDeviceManager::CreateD3D11Buffer(const D3D11_BUFFER_DESC* desc, const D3D11_SUBRESOURCE_DATA* initialData, D3DBuffer** buffer, const char* bufferName)
-{
-    HRESULT hr = gcpRendD3D->GetDevice().CreateBuffer(desc, initialData, (ID3D11Buffer**)buffer);
-
-    if (hr == S_OK)
-    {
-#if !defined(RELEASE) && defined(WIN64)
-        (*buffer)->SetPrivateData(WKPDID_D3DDebugObjectName, strlen(bufferName), bufferName);
-#endif
-
-        Render::Debug::VRAMAllocationSubcategory subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_OTHER_BUFFER;
-        if (desc->BindFlags & D3D11_BIND_VERTEX_BUFFER)
-        {
-            subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER;
-        }
-        else if (desc->BindFlags & D3D11_BIND_INDEX_BUFFER)
-        {
-            subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER;
-        }
-        else if (desc->BindFlags & D3D11_BIND_CONSTANT_BUFFER)
-        {
-            subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_CONSTANT_BUFFER;
-        }
-
-        void* address = static_cast<void*>(*buffer);
-        size_t byteSize = desc->ByteWidth;
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, byteSize, bufferName, Render::Debug::VRAM_CATEGORY_BUFFER, subcategory);
-    }
-    else
-    {
-        AZ_Warning("Rendering", false, "CreateD3D11Buffer for %s failed! [0x%08x]", bufferName, hr);
-    }
-
-    return hr;
-}
-
-void CDeviceManager::ReleaseD3D11Buffer(D3DBuffer* buffer)
-{
-    if (buffer)
-    {
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, static_cast<void*>(buffer));
-        buffer->Release();
-    }
-}
-
-void* CDeviceManager::GetBackingStorage([[maybe_unused]] D3DBuffer* buffer)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-    return NULL;
-}
-void CDeviceManager::FreebackingStorage([[maybe_unused]] void* base_ptr)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-}
-
-HRESULT CDeviceManager::CreateFence(DeviceFenceHandle& query)
-{
-    HRESULT hr = S_FALSE;
-# if CRY_USE_DX12
-    query = reinterpret_cast<DeviceFenceHandle>(new UINT64);
-    hr = query ? S_OK : S_FALSE;
-#   define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#   undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-# else
-    D3D11_QUERY_DESC QDesc;
-    QDesc.Query = D3D11_QUERY_EVENT;
-    QDesc.MiscFlags = 0;
-    D3DQuery* d3d_query;
-    hr = gcpRendD3D->GetDevice().CreateQuery(&QDesc, &d3d_query);
-    if (CHECK_HRESULT(hr))
-    {
-        query = reinterpret_cast<DeviceFenceHandle>(d3d_query);
-    }
-# endif
-    if (!FAILED(hr))
-    {
-        IssueFence(query);
-    }
-    return hr;
-}
-HRESULT CDeviceManager::ReleaseFence(DeviceFenceHandle query)
-{
-    HRESULT hr = S_FALSE;
-# if CRY_USE_DX12
-    delete reinterpret_cast<UINT64*>(query);
-    hr = S_OK;
-#   define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_8
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#   undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-# else
-    D3DQuery* d3d_query = reinterpret_cast<D3DQuery*>(query);
-    SAFE_RELEASE(d3d_query);
-    hr = S_OK;
-# endif
-    return hr;
-}
-HRESULT CDeviceManager::IssueFence(DeviceFenceHandle query)
-{
-    HRESULT hr = S_FALSE;
-# if CRY_USE_DX12
-    UINT64* handle = reinterpret_cast<UINT64*>(query);
-    if (handle)
-    {
-        *handle = gcpRendD3D->GetDeviceContext().InsertFence();
-        //  gcpRendD3D->GetDeviceContext().Flush();
-    }
-#   define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_9
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#   undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-# else
-    D3DQuery* d3d_query = reinterpret_cast<D3DQuery*>(query);
-    if (d3d_query)
-    {
-        gcpRendD3D->GetDeviceContext().End(d3d_query);
-        hr = S_OK;
-    }
-# endif
-    return hr;
-}
-
-HRESULT CDeviceManager::SyncFence(DeviceFenceHandle query, bool block, [[maybe_unused]] bool flush)
-{
-    HRESULT hr = S_FALSE;
-# if CRY_USE_DX12
-    UINT64* handle = reinterpret_cast<UINT64*>(query);
-    if (handle)
-    {
-        hr = gcpRendD3D->GetDeviceContext().TestForFence(*handle);
-        if (hr != S_OK)
-        {
-            if (flush)
-            {
-                AZ_Assert(GetCurrentThreadId() == gRenDev->m_pRT->m_nRenderThread, "Must flush in render thread!");
-                gcpRendD3D->GetDeviceContext().Flush();
-            }
-
-            if (block)
-            {
-                hr = gcpRendD3D->GetDeviceContext().WaitForFence(*handle);
-            }
-        }
-    }
-#   define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_10
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#   undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-# else
-    D3DQuery* d3d_query = reinterpret_cast<D3DQuery*>(query);
-    if (d3d_query)
-    {
-        BOOL bQuery = false;
-        do
-        {
-            hr = gcpRendD3D->GetDeviceContext().GetData(d3d_query, (void*)&bQuery, sizeof(BOOL), flush ? 0 : D3D11_ASYNC_GETDATA_DONOTFLUSH);
-#     if !defined(_RELEASE)
-            if (hr != S_OK && hr != S_FALSE)
-            {
-                CHECK_HRESULT(hr);
-
-                if (hr == DXGI_ERROR_DEVICE_REMOVED)
-                {
-                    // If the device has been removed we will be stuck here if this is a blocking sync (i.e. block == true) ).
-                    // It's a critical error, though, so we have to bail out and handle it elsewhere.
-                    ID3D11Device* device = nullptr;
-                    gcpRendD3D->GetDeviceContext().GetDevice(&device);
-                    if (device)
-                    {
-                        const HRESULT removedReason = device->GetDeviceRemovedReason();
-                        CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, "Graphical device was removed for the following reason: %x", removedReason);
-                    }
-                    return hr;
-                }
-            }
-#     endif
-        } while (block && hr != S_OK && hr != E_FAIL);
-    }
-# endif
-    return hr;
-}
-
-HRESULT CDeviceManager::InvalidateCpuCache([[maybe_unused]] void* buffer_ptr, [[maybe_unused]] size_t size, [[maybe_unused]] size_t offset)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_11
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-    return S_OK;
-}
-
-HRESULT CDeviceManager::InvalidateGpuCache([[maybe_unused]] D3DBuffer* buffer, [[maybe_unused]] void* buffer_ptr, [[maybe_unused]] size_t size, [[maybe_unused]] size_t offset)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_12
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-    return S_OK;
-}
-
-HRESULT CDeviceManager::CreateDirectAccessBuffer(uint32 nSize, uint32 elemSize, int32 nBindFlags, D3DBuffer** ppBuff)
-{
-    int32 nUsage =
-        CDeviceManager::USAGE_CPU_WRITE
-        | CDeviceManager::USAGE_DIRECT_ACCESS
-        | CDeviceManager::USAGE_DIRECT_ACCESS_CPU_COHERENT
-        | CDeviceManager::USAGE_DIRECT_ACCESS_GPU_COHERENT;
-
-    // under dx12 there is direct access, but through the dynamic-usage flag
-#ifdef CRY_USE_DX12
-    nUsage |= CDeviceManager::USAGE_DYNAMIC;
-    nUsage |= CDeviceManager::USAGE_CPU_WRITE;
-#endif
-
-    // if no direct access is available, let the driver handle preventing writing to VMEM while it is in use
-#if BUFFER_ENABLE_DIRECT_ACCESS == 0
-    nUsage |= CDeviceManager::USAGE_DYNAMIC;
-#endif
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_13
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-
-    return CreateBuffer(nSize, elemSize, nUsage, nBindFlags, ppBuff);
-}
-
-HRESULT CDeviceManager::DestroyDirectAccessBuffer(D3DBuffer* ppBuff)
-{
-    void* address = static_cast<void*>(ppBuff);
-    EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, address);
-
-    return ppBuff->Release();
-}
-
-HRESULT CDeviceManager::LockDirectAccessBuffer(D3DBuffer* pBuff, [[maybe_unused]] int32 nBindFlags, void** pBuffer)
-{
-    HRESULT hr = D3D_OK;
-    // get correct locking flags
-#if BUFFER_ENABLE_DIRECT_ACCESS == 1
-    uint8* ptr;
-    ExtractBasePointer(pBuff, ptr);
-    *pBuffer = reinterpret_cast<void*>(ptr);
-# else
-    D3D11_MAP nLockFlags = D3D11_MAP_WRITE_DISCARD;
-    D3D11_MAPPED_SUBRESOURCE mappedResource;
-    memset(&mappedResource, 0x0, sizeof(mappedResource));
-
-    hr = gcpRendD3D->GetDeviceContext().Map(pBuff, 0, nLockFlags, 0, &mappedResource);
-    IF (FAILED(hr), 0)
-    {
-        CHECK_HRESULT(hr);
-        return 0;
-    }
-    *pBuffer = mappedResource.pData;
-# endif
-    return hr;
-}
-
-void CDeviceManager::UnlockDirectAccessBuffer([[maybe_unused]] D3DBuffer* pBuff, [[maybe_unused]] int32 nBindFlags)
-{
-# if BUFFER_ENABLE_DIRECT_ACCESS == 0
-    gcpRendD3D->GetDeviceContext().Unmap(pBuff, 0);
-# endif
-}
-
-void CDeviceManager::InvalidateBuffer([[maybe_unused]] D3DBuffer* buffer, [[maybe_unused]] void* base_ptr, [[maybe_unused]] size_t offset, [[maybe_unused]] size_t size, [[maybe_unused]] uint32 id)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_14
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-# endif
-}
-
-ILINE bool CDeviceManager::ValidateDrawcall()
-{
-    if (CHWShader_D3D::s_nActivationFailMask != 0)
-    {
-        /*
-            A draw call is allowed to fail if we're currently processing
-            shader compilation asynchronously. If shader jobs are running
-            we don't want to count an "invalid" draw call because this is 
-            expected behavior. A draw call is only invalid if there are no 
-            shader jobs running.
-        */
-        if (gRenDev->m_cEF.m_ShaderCacheStats.m_nNumShaderAsyncCompiles == 0)
-        {
-            ++m_numInvalidDrawcalls;
-        }
-        return false;
-    }
-
-    return true;
-}
-
-void CDeviceManager::Draw(uint32 nVerticesCount, uint32 nStartVertex)
-{
-    if (!ValidateDrawcall())
-    {
-        return;
-    }
-
-    CommitDeviceStates();
-    gcpRendD3D->GetDeviceContext().Draw(nVerticesCount, nStartVertex);
-    SyncToGPU();
-}
-
-void CDeviceManager::DrawInstanced(uint32 nInstanceVerts, uint32 nInstances, uint32 nStartVertex, uint32 nStartInstance)
-{
-    if (!ValidateDrawcall())
-    {
-        return;
-    }
-
-    CommitDeviceStates();
-    gcpRendD3D->GetDeviceContext().DrawInstanced(nInstanceVerts, nInstances, nStartVertex, nStartInstance);
-    SyncToGPU();
-}
-
-void CDeviceManager::DrawIndexedInstanced(uint32 numIndices, uint32 nInsts, uint32 startIndex, uint32 v0, uint32 v1)
-{
-    if (!ValidateDrawcall())
-    {
-        return;
-    }
-
-    CommitDeviceStates();
-    gcpRendD3D->GetDeviceContext().DrawIndexedInstanced(numIndices, nInsts, startIndex, v0, v1);
-    SyncToGPU();
-}
-
-void CDeviceManager::DrawIndexed(uint32 numIndices, uint32 startIndex, uint32 vbOffset)
-{
-    if (!ValidateDrawcall())
-    {
-        return;
-    }
-
-    CommitDeviceStates();
-    gcpRendD3D->GetDeviceContext().DrawIndexed(numIndices, startIndex, vbOffset);
-    SyncToGPU();
-}
-
-
-void CDeviceManager::Dispatch(uint32 dX, uint32 dY, uint32 dZ)
-{
-    if (!ValidateDrawcall())
-    {
-        return;
-    }
-
-    CommitDeviceStates();
-    gcpRendD3D->GetDeviceContext().Dispatch(dX, dY, dZ);
-    SyncToGPU();
-}
-
-void CDeviceManager::DispatchIndirect(D3DBuffer* pBufferForArgs, uint32 AlignedOffsetForArgs)
-{
-    if (!ValidateDrawcall())
-    {
-        return;
-    }
-
-    CommitDeviceStates();
-    gcpRendD3D->GetDeviceContext().DispatchIndirect(pBufferForArgs, AlignedOffsetForArgs);
-    SyncToGPU();
-}
-
-void CDeviceManager::DrawIndexedInstancedIndirect(D3DBuffer* pBufferForArgs, uint32 AlignedOffsetForArgs)
-{
-    if (!ValidateDrawcall())
-    {
-        return;
-    }
-
-    CommitDeviceStates();
-    gcpRendD3D->GetDeviceContext().DrawIndexedInstancedIndirect(pBufferForArgs, AlignedOffsetForArgs);
-    SyncToGPU();
-}
-
-void CDeviceManager::BindPlatformConstantBuffer(
-    EHWShaderClass type,
-    D3DBuffer* platformBuffer,
-    AZ::u32 slot)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    switch (type)
-    {
-    case eHWSC_Vertex:
-        rDeviceContext.VSSetConstantBuffers(slot, 1, &platformBuffer);
-        break;
-    case eHWSC_Pixel:
-        rDeviceContext.PSSetConstantBuffers(slot, 1, &platformBuffer);
-        break;
-    case eHWSC_Geometry:
-        rDeviceContext.GSSetConstantBuffers(slot, 1, &platformBuffer);
-        break;
-    case eHWSC_Domain:
-        rDeviceContext.DSSetConstantBuffers(slot, 1, &platformBuffer);
-        break;
-    case eHWSC_Hull:
-        rDeviceContext.HSSetConstantBuffers(slot, 1, &platformBuffer);
-        break;
-    case eHWSC_Compute:
-        rDeviceContext.CSSetConstantBuffers(slot, 1, &platformBuffer);
-        break;
-    }
-#else
-    m_CB[type].buffers[slot] = platformBuffer;
-    m_CB[type].dirty |= 1 << slot;
-#endif
-}
-
-void CDeviceManager::BindPlatformConstantBuffer(
-    EHWShaderClass type,
-    ID3D11Buffer* platformBuffer,
-    AZ::u32 slot,
-    AZ::u32 registerOffset,
-    AZ::u32 registerCount)
-{
-# if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    switch (type)
-    {
-    case eHWSC_Vertex:
-        rDeviceContext.VSSetConstantBuffers1(slot, 1, &platformBuffer, &registerOffset, &registerCount);
-        break;
-    case eHWSC_Pixel:
-        rDeviceContext.PSSetConstantBuffers1(slot, 1, &platformBuffer, &registerOffset, &registerCount);
-        break;
-    case eHWSC_Geometry:
-        rDeviceContext.GSSetConstantBuffers1(slot, 1, &platformBuffer, &registerOffset, &registerCount);
-        break;
-    case eHWSC_Domain:
-        rDeviceContext.DSSetConstantBuffers1(slot, 1, &platformBuffer, &registerOffset, &registerCount);
-        break;
-    case eHWSC_Hull:
-        rDeviceContext.HSSetConstantBuffers1(slot, 1, &platformBuffer, &registerOffset, &registerCount);
-        break;
-    case eHWSC_Compute:
-        rDeviceContext.CSSetConstantBuffers1(slot, 1, &platformBuffer, &registerOffset, &registerCount);
-        break;
-    }
-#else
-    m_CB[type].buffers1[slot] = platformBuffer;
-    m_CB[type].offsets[slot] = registerOffset;
-    m_CB[type].sizes[slot] = registerCount;
-    m_CB[type].dirty1 |= 1 << slot;
-#endif
-}
-
-void CDeviceManager::UnbindConstantBuffer(AzRHI::ConstantBuffer* constantBuffer)
-{
-    if(!constantBuffer || !constantBuffer->GetPlatformBuffer())
-    {
-        return;
-    }
-
-    AZ::u64 myCode = constantBuffer->GetCode();
-    for (AZ::u32 shaderStage = 0; shaderStage < eHWSC_Num; ++shaderStage)
-    {
-        for (AZ::u32 shaderSlot = 0; shaderSlot < eConstantBufferShaderSlot_Count; ++shaderSlot)
-        {
-            const CDeviceManager::ConstantBufferBindState& bindState = m_constantBufferBindState[shaderStage][shaderSlot];
-            if (bindState.m_constantBufferCodes == myCode)
-            {
-                BindConstantBuffer(static_cast<EHWShaderClass>(shaderStage), nullptr, shaderSlot);
-            }
-        }
-    }
-
-    // Commit device state to immediately unbind the resource because we may be deleting it
-    CommitDeviceStates();
-}
-
-
-void CDeviceManager::UnbindSRV(D3DShaderResourceView* shaderResourceView)
-{
-# if !DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    if (!shaderResourceView)
-    {
-        return;
-    }
-
-    for (int type = 0; type < EHWShaderClass::eHWSC_Num; ++type)
-    {
-        for (uint32 slot = 0; slot < MAX_BOUND_SRVS; ++slot)
-        {
-            if (m_SRV[type].views[slot] == shaderResourceView)
-            {
-                BindSRV(static_cast<EHWShaderClass>(type), nullptr, slot);
-            }
-        }
-    }
-#endif
-}
-
-void CDeviceManager::BindConstantBuffer(
-    EHWShaderClass type,
-    AzRHI::ConstantBuffer* constantBuffer,
-    AZ::u32 slot)
-{
-    BindConstantBuffer(
-        type, constantBuffer, slot, 0,
-        constantBuffer ? constantBuffer->GetByteCount() : 0);
-}
-
-void CDeviceManager::BindConstantBuffer(
-    EHWShaderClass type,
-    AzRHI::ConstantBuffer* constantBuffer,
-    AZ::u32 slot,
-    AZ::u32 byteOffset,
-    [[maybe_unused]] AZ::u32 byteCount)
-{
-    AZ::u64 code = 0;
-    D3DBuffer* platformBuffer = nullptr;
-
-    if (constantBuffer)
-    {
-        platformBuffer = constantBuffer->GetPlatformBuffer();
-        byteOffset += constantBuffer->GetByteOffset();
-        code = constantBuffer->GetCode();
-    }
-
-# if defined(DEVICE_SUPPORTS_D3D11_1)
-    if ( (m_constantBufferBindState[type][slot].m_constantBufferCodes != code) || (m_constantBufferBindState[type][slot].m_constantBufferBindOffset != byteOffset) )
-    {
-        m_constantBufferBindState[type][slot].m_constantBufferCodes = code;
-        m_constantBufferBindState[type][slot].m_constantBufferBindOffset = byteOffset;
-
-        // Convert bytes to registers
-        AZ_Assert((byteOffset & 0xF) == 0, "16 byte alignment required");
-        const AZ::u32 registerOffset = byteOffset >> 4;
-        const AZ::u32 registerCount = Align(byteCount, 16) >> 4;
-
-        BindPlatformConstantBuffer(type, platformBuffer, slot, registerOffset, registerCount);
-    }
-#else
-    if(m_constantBufferBindState[type][slot].m_constantBufferCodes != code)
-    {
-        m_constantBufferBindState[type][slot].m_constantBufferCodes = code;
-
-        AZ_Assert(byteOffset == 0, "Offset not supported");
-        BindPlatformConstantBuffer(type, platformBuffer, slot);
-    }
-# endif
-}
-
-#if !DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-void CDeviceManager::BindConstantBuffers(EHWShaderClass type, D3DDeviceContext& rDeviceContext)
-{
-    while (m_CB[type].dirty)
-    {
-        const unsigned lsb   = m_CB[type].dirty & ~(m_CB[type].dirty - 1);
-        const unsigned lbit  = AzRHI::ScanBitsReverse(lsb);
-        const unsigned hbit  = AzRHI::ScanBitsForward(~(m_CB[type].dirty) & ~(lsb - 1));
-        const unsigned base  = lbit;
-        const unsigned count = hbit - lbit;
-        switch (type)
-        {
-        case eHWSC_Vertex:
-            rDeviceContext.VSSetConstantBuffers(base, count, &m_CB[eHWSC_Vertex].buffers[base]);
-            break;
-        case eHWSC_Pixel:
-            rDeviceContext.PSSetConstantBuffers(base, count, &m_CB[eHWSC_Pixel].buffers[base]);
-            break;
-        case eHWSC_Geometry:
-            rDeviceContext.GSSetConstantBuffers(base, count, &m_CB[eHWSC_Geometry].buffers[base]);
-            break;
-        case eHWSC_Domain:
-            rDeviceContext.DSSetConstantBuffers(base, count, &m_CB[eHWSC_Domain].buffers[base]);
-            break;
-        case eHWSC_Hull:
-            rDeviceContext.HSSetConstantBuffers(base, count, &m_CB[eHWSC_Hull].buffers[base]);
-            break;
-        case eHWSC_Compute:
-            rDeviceContext.CSSetConstantBuffers(base, count, &m_CB[eHWSC_Compute].buffers[base]);
-            break;
-        }
-        const signed mask = iszero(32 - (signed)hbit) - 1;
-        m_CB[type].dirty &= (~((1 << hbit) - (1 << lbit)) & mask);
-    }
-}
-
-void CDeviceManager::BindOffsetConstantBuffers([[maybe_unused]] EHWShaderClass type, [[maybe_unused]] D3DDeviceContext& rDeviceContext)
-{
-#   if defined(DEVICE_SUPPORTS_D3D11_1)
-    while (m_CB[type].dirty1)
-    {
-        const unsigned lsb   = m_CB[type].dirty1 & ~(m_CB[type].dirty1 - 1);
-        const unsigned lbit  = AzRHI::ScanBitsReverse(lsb);
-        const unsigned hbit  = AzRHI::ScanBitsForward(~(m_CB[type].dirty1) & ~(lsb - 1));
-        const unsigned base  = lbit;
-        const unsigned count = hbit - lbit;
-        switch (type)
-        {
-        case eHWSC_Vertex:
-            rDeviceContext.VSSetConstantBuffers1(base, count, &m_CB[eHWSC_Vertex].buffers1[base], &m_CB[eHWSC_Vertex].offsets[base], &m_CB[eHWSC_Vertex].sizes[base]);
-            break;
-        case eHWSC_Pixel:
-            rDeviceContext.PSSetConstantBuffers1(base, count, &m_CB[eHWSC_Pixel].buffers1[base], &m_CB[eHWSC_Pixel].offsets[base], &m_CB[eHWSC_Pixel].sizes[base]);
-            break;
-        case eHWSC_Geometry:
-            rDeviceContext.GSSetConstantBuffers1(base, count, &m_CB[eHWSC_Geometry].buffers1[base], &m_CB[eHWSC_Geometry].offsets[base], &m_CB[eHWSC_Geometry].sizes[base]);
-            break;
-        case eHWSC_Domain:
-            rDeviceContext.DSSetConstantBuffers1(base, count, &m_CB[eHWSC_Domain].buffers1[base], &m_CB[eHWSC_Domain].offsets[base], &m_CB[eHWSC_Domain].sizes[base]);
-            break;
-        case eHWSC_Hull:
-            rDeviceContext.HSSetConstantBuffers1(base, count, &m_CB[eHWSC_Hull].buffers1[base], &m_CB[eHWSC_Hull].offsets[base], &m_CB[eHWSC_Hull].sizes[base]);
-            break;
-        case eHWSC_Compute:
-            rDeviceContext.CSSetConstantBuffers1(base, count, &m_CB[eHWSC_Compute].buffers1[base], &m_CB[eHWSC_Compute].offsets[base], &m_CB[eHWSC_Compute].sizes[base]);
-            break;
-        }
-        const signed mask = iszero(32 - (signed)hbit) - 1;
-        m_CB[type].dirty1 &= (~((1 << hbit) - (1 << lbit)) & mask);
-    }
-# endif // DEVICE_SUPPORTS_D3D11_1
-}
-void CDeviceManager::BindSamplers(EHWShaderClass type, D3DDeviceContext& rDeviceContext)
-{
-    while (m_Samplers[type].dirty)
-    {
-        const unsigned lsb   = m_Samplers[type].dirty & ~(m_Samplers[type].dirty - 1);
-        const unsigned lbit  = AzRHI::ScanBitsReverse(lsb);
-        const unsigned hbit  = AzRHI::ScanBitsForward(~(m_Samplers[type].dirty) & ~(lsb - 1));
-        const unsigned base  = lbit;
-        const unsigned count = hbit - lbit;
-        switch (type)
-        {
-        case eHWSC_Vertex:
-            rDeviceContext.VSSetSamplers(base, count, &m_Samplers[eHWSC_Vertex].samplers[base]);
-            break;
-        case eHWSC_Pixel:
-            rDeviceContext.PSSetSamplers(base, count, &m_Samplers[eHWSC_Pixel].samplers[base]);
-            break;
-        case eHWSC_Geometry:
-            rDeviceContext.GSSetSamplers(base, count, &m_Samplers[eHWSC_Geometry].samplers[base]);
-            break;
-        case eHWSC_Domain:
-            rDeviceContext.DSSetSamplers(base, count, &m_Samplers[eHWSC_Domain].samplers[base]);
-            break;
-        case eHWSC_Hull:
-            rDeviceContext.HSSetSamplers(base, count, &m_Samplers[eHWSC_Hull].samplers[base]);
-            break;
-        case eHWSC_Compute:
-            rDeviceContext.CSSetSamplers(base, count, &m_Samplers[eHWSC_Compute].samplers[base]);
-            break;
-        }
-        ;
-        const signed mask = iszero(32 - (signed)hbit) - 1;
-        m_Samplers[type].dirty &= (~((1 << hbit) - (1 << lbit)) & mask);
-    }
-}
-
-void CDeviceManager::BindSRVs(EHWShaderClass type, D3DDeviceContext& rDeviceContext)
-{
-    for (size_t j = 0; j < MAX_SRV_DIRTY; ++j)
-    {
-        while (m_SRV[type].dirty[j])
-        {
-            const unsigned lsb   = m_SRV[type].dirty[j] & ~(m_SRV[type].dirty[j] - 1);
-            const unsigned lbit  = AzRHI::ScanBitsReverse(lsb);
-            const unsigned hbit  = AzRHI::ScanBitsForward(~(m_SRV[type].dirty[j]) & ~(lsb - 1));
-            const unsigned base  = j * 32 + lbit;
-            const unsigned count = hbit - lbit;
-            switch (type)
-            {
-            case eHWSC_Vertex:
-                rDeviceContext.VSSetShaderResources(base, count, &m_SRV[type].views[base]);
-                break;
-            case eHWSC_Pixel:
-                rDeviceContext.PSSetShaderResources(base, count, &m_SRV[type].views[base]);
-                break;
-            case eHWSC_Geometry:
-                rDeviceContext.GSSetShaderResources(base, count, &m_SRV[type].views[base]);
-                break;
-            case eHWSC_Domain:
-                rDeviceContext.DSSetShaderResources(base, count, &m_SRV[type].views[base]);
-                break;
-            case eHWSC_Hull:
-                rDeviceContext.HSSetShaderResources(base, count, &m_SRV[type].views[base]);
-                break;
-            case eHWSC_Compute:
-                rDeviceContext.CSSetShaderResources(base, count, &m_SRV[type].views[base]);
-                break;
-            }
-            const signed mask = iszero(32 - (signed)hbit) - 1;
-            m_SRV[type].dirty[j] &= (~((1 << hbit) - (1 << lbit)) & mask);
-        }
-    }
-}
-void CDeviceManager::BindUAVs(EHWShaderClass type, D3DDeviceContext& rDeviceContext)
-{
-    for (size_t j = 0; j < MAX_UAV_DIRTY; ++j)
-    {
-        while (m_UAV[type].dirty[j])
-        {
-            const unsigned lsb   = m_UAV[type].dirty[j] & ~(m_UAV[type].dirty[j] - 1);
-            const unsigned lbit  = AzRHI::ScanBitsReverse(lsb);
-            const unsigned hbit  = AzRHI::ScanBitsForward(~(m_UAV[type].dirty[j]) & ~(lsb - 1));
-            const unsigned base  = j * 32 + lbit;
-            const unsigned count = hbit - lbit;
-            switch (type)
-            {
-            case eHWSC_Vertex:
-                assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-                break;
-            case eHWSC_Pixel:
-                rDeviceContext.OMSetRenderTargetsAndUnorderedAccessViews(D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL, NULL, NULL, base, count, &m_UAV[type].views[base], &m_UAV[type].counts[base]);
-                break;
-            case eHWSC_Geometry:
-                assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-                break;
-            case eHWSC_Domain:
-                assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-                break;
-            case eHWSC_Hull:
-                assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-                break;
-            case eHWSC_Compute:
-                rDeviceContext.CSSetUnorderedAccessViews(base, count, &m_UAV[type].views[base], &m_UAV[type].counts[base]);
-                break;
-            }
-            const signed mask = iszero(32 - (signed)hbit) - 1;
-            m_UAV[type].dirty[j] &= (~((1 << hbit) - (1 << lbit)) & mask);
-        }
-    }
-}
-void CDeviceManager::BindIA(D3DDeviceContext& rDeviceContext)
-{
-    while (m_VBs.dirty)
-    {
-        const unsigned lsb   = m_VBs.dirty & ~(m_VBs.dirty - 1);
-        const unsigned lbit  = AzRHI::ScanBitsReverse(lsb);
-        const unsigned hbit  = AzRHI::ScanBitsForward(~(m_VBs.dirty) & ~(lsb - 1));
-        const unsigned base  = lbit;
-        const unsigned count = hbit - lbit;
-        const signed mask = iszero(32 - (signed)hbit) - 1;
-        rDeviceContext.IASetVertexBuffers(base, count, &m_VBs.buffers[base], &m_VBs.strides[base], &m_VBs.offsets[base]);
-        m_VBs.dirty &= (~((1 << hbit) - (1 << lbit)) & mask);
-    }
-    if (m_IB.dirty)
-    {
-        rDeviceContext.IASetIndexBuffer(m_IB.buffer, (DXGI_FORMAT)m_IB.format, m_IB.offset);
-        m_IB.dirty = 0;
-    }
-    if (m_VertexDecl.dirty)
-    {
-        rDeviceContext.IASetInputLayout(m_VertexDecl.decl);
-        m_VertexDecl.dirty = false;
-    }
-    if (m_Topology.dirty)
-    {
-        rDeviceContext.IASetPrimitiveTopology(m_Topology.topology);
-        m_Topology.dirty = false;
-    }
-}
-void CDeviceManager::BindState(D3DDeviceContext& rDeviceContext)
-{
-    if (m_RasterState.dirty)
-    {
-        rDeviceContext.RSSetState(m_RasterState.pRasterizerState);
-        m_RasterState.dirty = false;
-    }
-    if (m_BlendState.dirty)
-    {
-        rDeviceContext.OMSetBlendState(m_BlendState.pBlendState, m_BlendState.BlendFactor, m_BlendState.SampleMask);
-        m_BlendState.dirty = false;
-    }
-    if (m_DepthStencilState.dirty)
-    {
-        rDeviceContext.OMSetDepthStencilState(m_DepthStencilState.dss, m_DepthStencilState.stencilref);
-        m_DepthStencilState.dirty = false;
-    }
-}
-
-void CDeviceManager::BindShader(EHWShaderClass type, D3DDeviceContext& rDeviceContext)
-{
-    if (m_Shaders[type].dirty)
-    {
-        switch (type)
-        {
-        case eHWSC_Vertex:
-            rDeviceContext.VSSetShader((D3DVertexShader*)m_Shaders[type].shader, NULL, 0);
-            break;
-        case eHWSC_Pixel:
-            rDeviceContext.PSSetShader((D3DPixelShader*)m_Shaders[type].shader, NULL, 0);
-            break;
-        case eHWSC_Hull:
-            rDeviceContext.HSSetShader((ID3D11HullShader*)m_Shaders[type].shader, NULL, 0);
-            break;
-        case eHWSC_Geometry:
-            rDeviceContext.GSSetShader((ID3D11GeometryShader*)m_Shaders[type].shader, NULL, 0);
-            break;
-        case eHWSC_Domain:
-            rDeviceContext.DSSetShader((ID3D11DomainShader*)m_Shaders[type].shader, NULL, 0);
-            break;
-        case eHWSC_Compute:
-            rDeviceContext.CSSetShader((ID3D11ComputeShader*)m_Shaders[type].shader, NULL, 0);
-            break;
-        }
-        m_Shaders[type].dirty = false;
-    }
-}
-
-
-void CDeviceManager::CommitDeviceStates()
-{
-    FUNCTION_PROFILER_LEGACYONLY(gEnv->pSystem, PROFILE_RENDERER);
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::RendererDetailed);
-    DETAILED_PROFILE_MARKER("CommitDeviceStates");
-    {
-        DETAILED_PROFILE_MARKER("InvalidateBuffers");
-        const uint32 threadid = gRenDev->m_RP.m_nProcessThreadID;
-        BufferInvalidationsT& invalidated = m_buffer_invalidations[threadid];
-
-        for (size_t i = 0, end = invalidated.size(); i < end; ++i)
-        {
-            CDeviceManager::InvalidateGpuCache(
-                invalidated[i].buffer,
-                invalidated[i].base_ptr,
-                invalidated[i].size,
-                invalidated[i].offset);
-        }
-
-        invalidated.clear();
-    }
-
-    {
-        DETAILED_PROFILE_MARKER("BindDeviceResources");
-        D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-        BindIA(rDeviceContext);
-        BindState(rDeviceContext);
-        for (signed i = 0; i < eHWSC_Num; ++i)
-        {
-            BindShader(static_cast<EHWShaderClass>(i), rDeviceContext);
-        }
-        for (signed i = 0; i < eHWSC_Num; ++i)
-        {
-            BindConstantBuffers(static_cast<EHWShaderClass>(i), rDeviceContext);
-        }
-        for (signed i = 0; i < eHWSC_Num; ++i)
-        {
-            BindOffsetConstantBuffers(static_cast<EHWShaderClass>(i), rDeviceContext);
-        }
-        for (signed i = 0; i < eHWSC_Num; ++i)
-        {
-            BindSRVs(static_cast<EHWShaderClass>(i), rDeviceContext);
-        }
-        for (signed i = 0; i < eHWSC_Num; ++i)
-        {
-            BindUAVs((EHWShaderClass)i, rDeviceContext);
-        }
-        for (signed i = 0; i < eHWSC_Num; ++i)
-        {
-            BindSamplers(static_cast<EHWShaderClass>(i), rDeviceContext);
-        }
-    }
-}
-#endif
-
-void CDeviceManager::SyncToGPU()
-{
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_enable_full_gpu_sync)
-    {
-        if (m_fence_handle == DeviceFenceHandle() && FAILED(CreateFence(m_fence_handle)))
-        {
-            CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING,
-                "could not create sync fence");
-        }
-        if (m_fence_handle)
-        {
-            IssueFence(m_fence_handle);
-            SyncFence(m_fence_handle, true);
-        }
-    }
-}
-
-void CDeviceManager::DisplayMemoryUsage()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_20
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-}
-
-//=============================================================================
-
-int CDeviceTexture::Cleanup()
-{
-    Unbind();
-
-    // Unregister the VRAM allocation with the VRAM driller
-    RemoveFromTextureMemoryTracking();
-
-    int32 nRef = -1;
-    if (m_pD3DTexture)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_18
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        nRef = m_pD3DTexture->Release();
-#endif
-        m_pD3DTexture = NULL;
-    }
-
-#ifdef DEVMAN_USE_STAGING_POOL
-    if (m_pStagingResourceDownload)
-    {
-        gcpRendD3D->m_DevMan.ReleaseStagingResource(m_pStagingResourceDownload);
-        m_pStagingResourceDownload = nullptr;
-    }
-
-    for (int i = 0; i < NUM_UPLOAD_STAGING_RES; i++)
-    {
-        if (m_pStagingResourceUpload[i])
-        {
-            gcpRendD3D->m_DevMan.ReleaseStagingResource(m_pStagingResourceUpload[i]);
-            m_pStagingResourceUpload[i] = nullptr;
-        }
-    }
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_16
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-
-    return nRef;
-}
-
-CDeviceTexture::~CDeviceTexture()
-{
-    Cleanup();
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_CPP_SECTION_17
-    #include AZ_RESTRICTED_FILE(DeviceManager_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-uint32 CDeviceTexture::TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, const ETEX_Format eTF)
-{
-    return CTexture::TextureDataSize(nWidth, nHeight, nDepth, nMips, nSlices, eTF);
-}
-#endif
-
-uint32 CDeviceTexture::TextureDataSize(D3DBaseView* pView)
-{
-    D3DResource* pResource = nullptr;
-    if (pView)
-    {
-        pView->GetResource(&pResource);
-        if (pResource)
-        {
-            uint32 nWidth = 0;
-            uint32 nHeight = 0;
-            uint32 nDepth = 0;
-            uint32 nMips = 1;
-            uint32 nSlices = 1;
-            ETEX_Format eTF = eTF_Unknown;
-
-            D3D11_RESOURCE_DIMENSION eResourceDimension = D3D11_RESOURCE_DIMENSION_UNKNOWN;
-            pResource->GetType(&eResourceDimension);
-            pResource->Release();
-            if (eResourceDimension == D3D11_RESOURCE_DIMENSION_BUFFER)
-            {
-                D3D11_BUFFER_DESC sDesc;
-                ((D3DBuffer*)pResource)->GetDesc(&sDesc);
-                nWidth = sDesc.ByteWidth;
-                nHeight = 1;
-                nDepth = 1;
-                eTF = eTF_R8;
-            }
-            else if (eResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE1D)
-            {
-                D3D11_TEXTURE1D_DESC sDesc;
-                ((ID3D11Texture1D*)pResource)->GetDesc(&sDesc);
-                nWidth = sDesc.Width;
-                nHeight = 1;
-                nDepth = 1;
-                nMips = sDesc.MipLevels;
-                nSlices = sDesc.ArraySize;
-                eTF = CTexture::TexFormatFromDeviceFormat(sDesc.Format);
-            }
-            else if (eResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D)
-            {
-                D3D11_TEXTURE2D_DESC sDesc;
-                ((ID3D11Texture2D*)pResource)->GetDesc(&sDesc);
-                nWidth = sDesc.Width;
-                nHeight = sDesc.Height;
-                nDepth = 1;
-                nMips = sDesc.MipLevels;
-                nSlices = sDesc.ArraySize;
-                eTF = CTexture::TexFormatFromDeviceFormat(sDesc.Format);
-            }
-            else if (eResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D)
-            {
-                D3D11_TEXTURE3D_DESC sDesc;
-                ((ID3D11Texture3D*)pResource)->GetDesc(&sDesc);
-                nWidth = sDesc.Width;
-                nHeight = sDesc.Height;
-                nDepth = sDesc.Depth;
-                nMips = sDesc.MipLevels;
-                eTF = CTexture::TexFormatFromDeviceFormat(sDesc.Format);
-            }
-
-
-            return CTexture::TextureDataSize(nWidth, nHeight, nDepth, nMips, nSlices, eTF);
-        }
-    }
-
-    return 0;
-}
-
-uint32 CDeviceTexture::TextureDataSize(D3DBaseView* pView, const uint numRects, const RECT* pRects)
-{
-    uint32 fullSize = TextureDataSize(pView);
-    if (!numRects)
-    {
-        return fullSize;
-    }
-
-    D3DResource* pResource = nullptr;
-    pView->GetResource(&pResource);
-    if (pResource)
-    {
-        uint32 nWidth = 0;
-        uint32 nHeight = 0;
-
-        D3D11_RESOURCE_DIMENSION eResourceDimension = D3D11_RESOURCE_DIMENSION_UNKNOWN;
-        pResource->GetType(&eResourceDimension);
-        pResource->Release();
-        if (eResourceDimension == D3D11_RESOURCE_DIMENSION_BUFFER)
-        {
-            D3D11_BUFFER_DESC sDesc;
-            ((D3DBuffer*)pResource)->GetDesc(&sDesc);
-            nWidth = sDesc.ByteWidth;
-            nHeight = 1;
-        }
-        else if (eResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE1D)
-        {
-            D3D11_TEXTURE1D_DESC sDesc;
-            ((ID3D11Texture1D*)pResource)->GetDesc(&sDesc);
-            nWidth = sDesc.Width;
-            nHeight = 1;
-        }
-        else if (eResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D)
-        {
-            D3D11_TEXTURE2D_DESC sDesc;
-            ((ID3D11Texture2D*)pResource)->GetDesc(&sDesc);
-            nWidth = sDesc.Width;
-            nHeight = sDesc.Height;
-        }
-        else if (eResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D)
-        {
-            D3D11_TEXTURE3D_DESC sDesc;
-            ((ID3D11Texture3D*)pResource)->GetDesc(&sDesc);
-            nWidth = sDesc.Width;
-            nHeight = sDesc.Height;
-        }
-
-        // If overlapping rectangles are cleared multiple times is ambiguous
-        uint32 fullDim = nWidth * nHeight;
-        uint32 rectSize = 0;
-
-        for (uint i = 0; i < numRects; ++i)
-        {
-            uint32 nW = max(0, int32(min(uint32(pRects->right), nWidth)) - int32(max(0U, uint32(pRects->left))));
-            uint32 nH = max(0, int32(min(uint32(pRects->bottom), nHeight)) - int32(max(0U, uint32(pRects->top))));
-
-            uint32 rectDim = nW * nH;
-
-            rectSize += (uint64(fullSize) * uint64(rectDim)) / fullDim;
-        }
-
-        return rectSize;
-    }
-
-    return 0;
-}
-
-void CDeviceTexture::TrackTextureMemory(uint32 usageFlags, const char* name)
-{
-    AZ_Warning("Rendering", !m_isTracked, "Texture %s already being tracked by the VRAMDriller", name);
-
-    Render::Debug::VRAMAllocationSubcategory subcategory = Render::Debug::VRAM_SUBCATEGORY_TEXTURE_TEXTURE;
-    if (usageFlags & (CDeviceManager::USAGE_DEPTH_STENCIL | CDeviceManager::USAGE_RENDER_TARGET | CDeviceManager::USAGE_UNORDERED_ACCESS))
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_TEXTURE_RENDERTARGET;
-    }
-    else if (usageFlags & (CDeviceManager::USAGE_DYNAMIC | CDeviceManager::USAGE_STAGING))
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_TEXTURE_DYNAMIC;            
-    }
-    EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, this, m_nBaseAllocatedSize, name, Render::Debug::VRAM_CATEGORY_TEXTURE, subcategory);
-    m_isTracked = true;
-}
-
-void CDeviceTexture::RemoveFromTextureMemoryTracking()
-{
-    // We cannot naively remove the texture from tracking because dummy device textures are created at times that do not have a memory backing
-    if (m_isTracked)
-    {
-        EBUS_EVENT(Render::Debug::VRAMDrillerBus, UnregisterAllocation, static_cast<void*>(this));
-        m_isTracked = false;
-    }
-} 
-
-D3DResource* CDeviceTexture::GetCurrUploadStagingResource()
-{
-#ifdef DEVMAN_USE_STAGING_POOL
-    int resourceIndex = gcpRendD3D->GetFrameID() % NUM_UPLOAD_STAGING_RES;
-    return m_pStagingResourceUpload[resourceIndex];
-#else
-    return nullptr;
-#endif
-}
-
-D3DResource* CDeviceTexture::GetCurrDownloadStagingResource()
-{
-#ifdef DEVMAN_USE_STAGING_POOL
-    return m_pStagingResourceDownload;
-#else
-    return nullptr;
-#endif
-}
-
-void** CDeviceTexture::GetCurrUploadStagingMemoryPtr()
-{
-#ifdef DEVMAN_USE_STAGING_POOL
-    int resourceIndex = gcpRendD3D->GetFrameID() % NUM_UPLOAD_STAGING_RES;
-    return &m_pStagingMemoryUpload[resourceIndex];
-#else
-    return nullptr;
-#endif
-}
-
-void** CDeviceTexture::GetCurrDownloadStagingMemoryPtr()
-{
-#ifdef DEVMAN_USE_STAGING_POOL
-    return &m_pStagingMemoryDownload;
-#else
-    return nullptr;
-#endif
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager.h
deleted file mode 100644
index 0c35cc7e02..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager.h
+++ /dev/null
@@ -1,653 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DEVICEMANAGER_H_SECTION_1 1
-#define DEVICEMANAGER_H_SECTION_2 2
-#define DEVICEMANAGER_H_SECTION_3 3
-#define DEVICEMANAGER_H_SECTION_4 4
-#define DEVICEMANAGER_H_SECTION_5 5
-#define DEVICEMANAGER_H_SECTION_6 6
-#define DEVICEMANAGER_H_SECTION_7 7
-#define DEVICEMANAGER_H_SECTION_8 8
-#define DEVICEMANAGER_H_SECTION_9 9
-#define DEVICEMANAGER_H_SECTION_10 10
-#define DEVICEMANAGER_H_SECTION_11 11
-#define DEVICEMANAGER_H_SECTION_12 12
-#define DEVICEMANAGER_H_SECTION_13 13
-#define DEVICEMANAGER_H_SECTION_14 14
-#endif
-
-#pragma once
-
-#if !defined(NULL_RENDERER)
-#define DEVMAN_USE_STAGING_POOL
-#endif
-
-#include "Enums.h"
-#include <AzCore/PlatformDef.h>
-#ifndef CRY_USE_DX12
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#  endif
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-#define DEVICE_MANAGER_IMMEDIATE_STATE_WRITE 0
-#endif
-
-class CDeviceTexture;
-namespace AzRHI 
-{
-    class ConstantBuffer;
-}
-
-typedef CDeviceTexture* LPDEVICETEXTURE;
-typedef UINT_PTR DeviceFenceHandle;
-
-struct STextureInfoData
-{
-    const void* pSysMem;
-    uint32 SysMemPitch;
-    uint32 SysMemSlicePitch;
-    ETEX_TileMode SysMemTileMode;
-};
-
-struct STextureInfo
-{
-    uint8 m_nMSAASamples;
-    uint8 m_nMSAAQuality;
-    STextureInfoData* m_pData;
-    STextureInfo()
-    {
-        m_nMSAASamples = 1;
-        m_nMSAAQuality = 0;
-        m_pData = NULL;
-    }
-};
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-
-//===============================================================================================================
-
-class CDeviceManager
-{
-public:
-    enum
-    {
-        MAX_BOUND_VBS = 16,
-        MAX_BOUND_SRVS = 128,
-        MAX_BOUND_UAVS = 64,
-        MAX_BOUND_SAMPLERS = 16,
-        MAX_SRV_DIRTY = MAX_BOUND_SRVS / 32,
-        MAX_UAV_DIRTY = MAX_BOUND_UAVS / 32,
-        SRV_DIRTY_SHIFT = 5,
-        SRV_DIRTY_MASK = 31,
-        UAV_DIRTY_SHIFT = 5,
-        UAV_DIRTY_MASK = 31
-    };
-
-private:
-    friend class CD3DRenderer;
-    friend class CDeviceTexture;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_4
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-# endif
-
-private:
-
-# ifndef NULL_RENDERER
-
-    struct ConstantBufferBindState
-    {
-        AZ::u64 m_constantBufferCodes = 0;
-        AZ::u32 m_constantBufferBindOffset = 0;
-    };
-
-    ConstantBufferBindState m_constantBufferBindState[eHWSC_Num][eConstantBufferShaderSlot_Count];
-
-# if !DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    // Constant Buffers
-    struct
-    {
-        D3DBuffer* buffers[eConstantBufferShaderSlot_Count];
-        D3DBuffer* buffers1[eConstantBufferShaderSlot_Count];
-        uint32 offsets[eConstantBufferShaderSlot_Count];
-        uint32 sizes[eConstantBufferShaderSlot_Count];
-        uint32 dirty;
-        uint32 dirty1;
-    } m_CB[eHWSC_Num];
-
-    // Shader Resource Views
-    struct
-    {
-        D3DShaderResourceView* views[MAX_BOUND_SRVS];
-        uint32 dirty[MAX_SRV_DIRTY];
-    } m_SRV[eHWSC_Num];
-
-    // Unordered Access Views
-    struct
-    {
-        D3DUnorderedAccessView* views[MAX_BOUND_UAVS];
-        uint32 counts[MAX_BOUND_UAVS];
-        uint32 dirty[MAX_UAV_DIRTY];
-    } m_UAV[eHWSC_Num];
-
-    // SamplerStates
-    struct
-    {
-        D3DSamplerState* samplers[MAX_BOUND_SAMPLERS];
-        uint32 dirty;
-    } m_Samplers[eHWSC_Num];
-
-    // VertexBuffers
-    struct
-    {
-        D3DBuffer* buffers[MAX_BOUND_VBS];
-        uint32 offsets[MAX_BOUND_VBS];
-        uint32 strides[MAX_BOUND_VBS];
-        uint32 dirty;
-    } m_VBs;
-
-    // IndexBuffer
-    struct
-    {
-        D3DBuffer* buffer;
-        uint32 offset;
-        int format;
-        uint32 dirty;
-    } m_IB;
-
-    struct
-    {
-        D3DVertexDeclaration* decl;
-        bool dirty;
-    } m_VertexDecl;
-
-    struct
-    {
-        D3D11_PRIMITIVE_TOPOLOGY topology;
-        bool dirty;
-    } m_Topology;
-
-    struct
-    {
-        ID3D11DepthStencilState* dss;
-        uint32 stencilref;
-        bool dirty;
-    } m_DepthStencilState;
-
-    struct
-    {
-        ID3D11BlendState* pBlendState;
-        float BlendFactor[4];
-        uint32 SampleMask;
-        bool dirty;
-    } m_BlendState;
-
-    struct
-    {
-        ID3D11RasterizerState* pRasterizerState;
-        bool dirty;
-    } m_RasterState;
-
-
-    struct
-    {
-        ID3D11Resource* shader;
-        bool dirty;
-    } m_Shaders[eHWSC_Num];
-
-    // The buffer invalidations
-    struct SBufferInvalidation
-    {
-        D3DBuffer* buffer;
-        void* base_ptr;
-        size_t offset;
-        size_t size;
-        bool operator< (const SBufferInvalidation& other) const
-        {
-            if (buffer == other.buffer)
-            {
-                return offset < other.offset;
-            }
-            return buffer < other.buffer;
-        }
-        bool operator!= (const SBufferInvalidation& other) const
-        {
-            return buffer != other.buffer
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_5
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-            ;
-        }
-    };
-    typedef std::vector<SBufferInvalidation> BufferInvalidationsT;
-    BufferInvalidationsT m_buffer_invalidations[2];
-# endif
-
-    uint32 m_numInvalidDrawcalls;
-
-    // Internal handle for debugging
-    DeviceFenceHandle m_fence_handle;
-
-    void BindConstantBuffers(EHWShaderClass type, D3DDeviceContext& rDeviceContext);
-    void BindOffsetConstantBuffers(EHWShaderClass type, D3DDeviceContext& rDeviceContext);
-    void BindSRVs(EHWShaderClass type, D3DDeviceContext& rDeviceContext);
-    void BindUAVs(EHWShaderClass type, D3DDeviceContext& rDeviceContext);
-    void BindSamplers(EHWShaderClass type, D3DDeviceContext& rDeviceContext);
-    void BindShader(EHWShaderClass type, D3DDeviceContext& rDeviceContext);
-    void BindState(D3DDeviceContext& rDeviceContext);
-    void BindIA(D3DDeviceContext& rDeviceContext);
-
-    bool ValidateDrawcall();
-# endif
-
-    void BindPlatformConstantBuffer(
-        EHWShaderClass type,
-        D3DBuffer* platformBuffer,
-        AZ::u32 slot,
-        AZ::u32 registerOffset,
-        AZ::u32 registerCount);
-
-    void BindPlatformConstantBuffer(
-        EHWShaderClass type,
-        D3DBuffer* platformBuffer,
-        AZ::u32 slot);
-
-public:
-    enum
-    {
-        USAGE_DIRECT_ACCESS              = BIT(0),
-        USAGE_DIRECT_ACCESS_CPU_COHERENT = BIT(1),
-        USAGE_DIRECT_ACCESS_GPU_COHERENT = BIT(2),
-        USAGE_TRANSIENT                  = BIT(5), //This forces Metal runtime to create a special mode buffer. Mapped data is valid during a single frame only and until next map.
-        USAGE_TEXTURE_COMPATIBLE         = BIT(15),
-        USAGE_MEMORYLESS                 = BIT(16), //Used to tag memoryless textures on ios
-        USAGE_DEPTH_STENCIL              = BIT(17),
-        USAGE_RENDER_TARGET              = BIT(18),
-        USAGE_DYNAMIC                    = BIT(19),
-        USAGE_AUTOGENMIPS                = BIT(20),
-        USAGE_STREAMING                  = BIT(21),
-        USAGE_STAGE_ACCESS               = BIT(22),
-        USAGE_STAGING                    = BIT(23),
-        USAGE_IMMUTABLE                  = BIT(24),
-        USAGE_DEFAULT                    = BIT(25),
-        USAGE_CPU_READ                   = BIT(26),
-        USAGE_CPU_WRITE                  = BIT(27),
-        USAGE_CPU_CACHED_MEMORY          = BIT(28), // This flag is now redundant
-        USAGE_UNORDERED_ACCESS           = BIT(29),
-        USAGE_ETERNAL                    = BIT(30),
-        USAGE_UAV_RWTEXTURE              = BIT(31),
-
-        USAGE_CUSTOM = (USAGE_DEPTH_STENCIL | USAGE_RENDER_TARGET | USAGE_DYNAMIC | USAGE_AUTOGENMIPS)
-    };
-
-    enum
-    {
-        BIND_VERTEX_BUFFER       = BIT(0),
-        BIND_INDEX_BUFFER        = BIT(1),
-        BIND_CONSTANT_BUFFER     = BIT(2),
-        BIND_SHADER_RESOURCE     = BIT(3),
-        BIND_STREAM_OUTPUT       = BIT(4),
-        BIND_RENDER_TARGET       = BIT(5),
-        BIND_DEPTH_STENCIL       = BIT(6),
-        BIND_UNORDERED_ACCESS    = BIT(7)
-    };
-
-
-#ifndef NULL_RENDERER
-    CDeviceManager();
-    ~CDeviceManager();
-
-    void SyncToGPU();
-
-    void Init();
-    void RT_Tick();
-
-    HRESULT Create2DTexture(const string& textureName, uint32 nWidth, uint32 nHeight, uint32 nMips, uint32 nArraySize, uint32 nUsage, const ColorF& cClearValue, D3DFormat Format, D3DPOOL Pool, LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI = NULL, bool bShouldBeCreated = false, int32 nESRAMOffset = -1);
-    HRESULT CreateCubeTexture(const string& textureName, uint32 nSize, uint32 nMips, uint32 nArraySize, uint32 nUsage, const ColorF& cClearValue, D3DFormat Format, D3DPOOL Pool, LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI = NULL, bool bShouldBeCreated = false);
-    HRESULT CreateVolumeTexture(const string& textureName, uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nUsage, const ColorF& cClearValue, D3DFormat Format, D3DPOOL Pool, LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI = NULL);
-
-    //// Wrappers for legacy code that directly access the DX11 device.  Wrappers manage VRAM tracking as well resource creation/deletion. ////
-    HRESULT CreateD3D11Texture2D(const D3D11_TEXTURE2D_DESC* desc, const FLOAT clearValue[4], const D3D11_SUBRESOURCE_DATA* initialData, ID3D11Texture2D** texture2D, const char* textureName);
-    void ReleaseD3D11Texture2D(ID3D11Texture2D* texture2D);
-
-    HRESULT CreateD3D11Buffer(const D3D11_BUFFER_DESC* desc, const D3D11_SUBRESOURCE_DATA* initialData, D3DBuffer** buffer, const char* bufferName);
-    void ReleaseD3D11Buffer(D3DBuffer* buffer);
-    //// End legacy wrappers ////
-
-    HRESULT CreateBuffer(uint32 nSize, uint32 elemSize, int32 nUsage, int32 nBindFlags, D3DBuffer** ppBuff);
-
-    HRESULT CreateFence(DeviceFenceHandle& query);
-    HRESULT ReleaseFence(DeviceFenceHandle query);
-    HRESULT IssueFence(DeviceFenceHandle query);
-    // CRY DX12 temporarily set flush default to true
-    HRESULT SyncFence(DeviceFenceHandle query, bool block, bool flush = true);
-
-    static HRESULT InvalidateGpuCache(D3DBuffer* buffer, void* base_ptr, size_t size, size_t offset);
-    static HRESULT InvalidateCpuCache(void* base_ptr, size_t size, size_t offset);
-
-    HRESULT CreateDirectAccessBuffer(uint32 nSize, uint32 elemSize, int32 nBindFlags, D3DBuffer** ppBuff);
-    HRESULT DestroyDirectAccessBuffer(D3DBuffer* ppBuff);
-    HRESULT LockDirectAccessBuffer(D3DBuffer* pBuff, int32 nBindFlags, void** ppBuffer);
-    void UnlockDirectAccessBuffer(D3DBuffer* ppBuff, int32 nBindFlags);
-
-    void InvalidateBuffer(D3DBuffer* buffer, void* base_ptr, size_t offset, size_t size, uint32 id);
-
-    void BindConstantBuffer(
-        EHWShaderClass type,
-        AzRHI::ConstantBuffer* Buffer,
-        uint32 slot);
-
-    void BindConstantBuffer(
-        EHWShaderClass type,
-        AzRHI::ConstantBuffer* Buffer,
-        uint32 slot,
-        uint32 offset,
-        uint32 size);
-
-    // Unbind a constant buffer if it is bound to an active Constant buffer slot in hardware
-    void UnbindConstantBuffer(AzRHI::ConstantBuffer* constantBuffer);
-    void UnbindSRV(D3DShaderResourceView* shaderResourceView);
-
-    inline void BindSRV(EHWShaderClass type, D3DShaderResourceView* SRV, uint32 slot);
-    inline void BindSRV(EHWShaderClass type, D3DShaderResourceView** SRV, uint32 start_slot, uint32 count);
-    inline void BindUAV(EHWShaderClass type, D3DUnorderedAccessView* UAV, uint32 counts, uint32 slot);
-    inline void BindUAV(EHWShaderClass type, D3DUnorderedAccessView** UAV, const uint32* counts, uint32 start_slot, uint32 count);
-    inline void BindSampler(EHWShaderClass type, D3DSamplerState* Sampler, uint32 slot);
-    inline void BindSampler(EHWShaderClass type, D3DSamplerState** Samplers, uint32 start_slot, uint32 count);
-    inline void BindVB(D3DBuffer* VB, uint32 slot, uint32 offset, uint32 stride);
-    inline void BindVB(uint32 start, uint32 count, D3DBuffer** Buffers, uint32* offset, uint32* stride);
-    inline void BindIB(D3DBuffer* Buffer, uint32 offset, DXGI_FORMAT format);
-    inline void BindVtxDecl(D3DVertexDeclaration* decl);
-    inline void BindTopology(D3D11_PRIMITIVE_TOPOLOGY top);
-    inline void BindShader(EHWShaderClass type, ID3D11Resource* shader);
-    inline void SetDepthStencilState(ID3D11DepthStencilState* dss, uint32 stencilref);
-    inline void SetBlendState(ID3D11BlendState* pBlendState, float* BlendFactor, uint32 SampleMask);
-    inline void SetRasterState(ID3D11RasterizerState* pRasterizerState);
-    void CommitDeviceStates();
-    void Draw(uint32 nVerticesCount, uint32 nStartVertex);
-    void DrawInstanced(uint32 nInstanceVerts, uint32 nInsts, uint32 nStartVertex, uint32 nStartInstance);
-    void DrawIndexed(uint32, uint32, uint32);
-    void DrawIndexedInstanced(uint32 numIndices, uint32 nInsts, uint32 startIndex, uint32 v0, uint32 v1);
-    void DrawIndexedInstancedIndirect(D3DBuffer*, uint32);
-    void Dispatch(uint32, uint32, uint32);
-    void DispatchIndirect(D3DBuffer*, uint32);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_6
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-    uint32 GetNumInvalidDrawcalls() const
-    {
-        return m_numInvalidDrawcalls;
-    }
-
-    // On UMA system, return the pointer to the start of the buffer
-    static void ExtractBasePointer(D3DBuffer* buffer, uint8*& base_ptr);
-
-    static void* GetBackingStorage(D3DBuffer* buffer);
-    static void FreebackingStorage(void* base_ptr);
-
-    void DisplayMemoryUsage();
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_7
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-#endif
-
-#if defined(DEVMAN_USE_STAGING_POOL)
-    D3DResource* AllocateStagingResource(D3DResource* pForTex, bool bUpload);
-    void ReleaseStagingResource(D3DResource* pStagingTex);
-
-#if !defined(CRY_USE_DX12)
-private:
-    struct StagingTextureDef
-    {
-        D3D11_TEXTURE2D_DESC desc;
-        D3DTexture* pStagingTexture;
-
-        friend bool operator == (const StagingTextureDef& a, const D3D11_TEXTURE2D_DESC& b)
-        {
-            return memcmp(&a.desc, &b, sizeof(b)) == 0;
-        }
-    };
-
-    typedef std::vector<StagingTextureDef> StagingPoolVec;
-
-private:
-    StagingPoolVec m_stagingPool;
-#endif
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_8
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-};
-
-class CDeviceTexture
-{
-    friend class CDeviceManager;
-
-#ifndef NULL_RENDERER
-    D3DBaseTexture* m_pD3DTexture;
-    // for native hand-made textures
-    size_t m_nBaseAllocatedSize;
-#endif
-    // Keep track of the number of subresources we have, for validation purposes and because
-    // it can affect our allocation flags (whether or not we need to support partial writes).
-    uint32 m_numSubResources;
-    bool m_bNoDelete;
-    bool m_bCube;
-    bool m_isTracked = false;
-#ifdef DEVMAN_USE_STAGING_POOL
-    bool m_bStagingTextureAllocedOnLock;
-    D3DResource* m_pStagingResourceDownload;
-    void* m_pStagingMemoryDownload;
-    // For uploads, we use a ring buffer so that we can write new resources without blocking the GPU.
-    static constexpr int NUM_UPLOAD_STAGING_RES = 3;
-    D3DResource* m_pStagingResourceUpload[NUM_UPLOAD_STAGING_RES];
-    void* m_pStagingMemoryUpload[NUM_UPLOAD_STAGING_RES];
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_9
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-
-public:
-#ifndef NULL_RENDERER
-
-    void free();
-
-    inline D3DBaseTexture* GetBaseTexture()
-    {
-        return m_pD3DTexture;
-    }
-
-    D3DTexture* Get2DTexture()
-    {
-        return (D3DTexture*)GetBaseTexture();
-    }
-
-    D3DCubeTexture* GetCubeTexture()
-    {
-        return (D3DCubeTexture*)GetBaseTexture();
-    }
-
-    D3DVolumeTexture* GetVolumeTexture()
-    {
-        return (D3DVolumeTexture*)GetBaseTexture();
-    }
-
-    bool IsCube() const
-    {
-        return m_bCube;
-    }
-
-    void Unbind();
-
-    CDeviceTexture ()
-        : m_pD3DTexture(NULL)
-        , m_nBaseAllocatedSize(0)
-        , m_bNoDelete(false)
-        , m_bCube(false)
-        , m_numSubResources(0)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_10
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-    {
-#ifdef DEVMAN_USE_STAGING_POOL
-        m_pStagingResourceDownload = nullptr;
-        m_pStagingMemoryDownload = nullptr;
-        for (int i = 0; i < NUM_UPLOAD_STAGING_RES; i++)
-        {
-            m_pStagingResourceUpload[i] = nullptr;
-            m_pStagingMemoryUpload[i] = nullptr;
-        }
-#endif
-    }
-    CDeviceTexture (D3DBaseTexture* pBaseTexture)
-        : m_pD3DTexture(pBaseTexture)
-        , m_nBaseAllocatedSize(0)
-        , m_bNoDelete(false)
-        , m_bCube(false)
-        , m_numSubResources(0)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_11
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-    {
-#ifdef DEVMAN_USE_STAGING_POOL
-        m_pStagingResourceDownload = nullptr;
-        m_pStagingMemoryDownload = nullptr;
-        for (int i = 0; i < NUM_UPLOAD_STAGING_RES; i++)
-        {
-            m_pStagingResourceUpload[i] = nullptr;
-            m_pStagingMemoryUpload[i] = nullptr;
-        }
-#endif
-    }
-    CDeviceTexture (D3DCubeTexture* pBaseTexture)
-        : m_pD3DTexture(pBaseTexture)
-        , m_nBaseAllocatedSize(0)
-        , m_bNoDelete(false)
-        , m_bCube(true)
-        , m_numSubResources(0)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_12
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-    {
-#ifdef DEVMAN_USE_STAGING_POOL
-        m_pStagingResourceDownload = nullptr;
-        m_pStagingMemoryDownload = nullptr;
-        for (int i = 0; i < NUM_UPLOAD_STAGING_RES; i++)
-        {
-            m_pStagingResourceUpload[i] = nullptr;
-            m_pStagingMemoryUpload[i] = nullptr;
-        }
-#endif
-    }
-
-    ~CDeviceTexture();
-
-    using StagingHook = ITexture::StagingHook;
-    void DownloadToStagingResource(uint32 nSubRes, StagingHook cbTransfer);
-    void DownloadToStagingResource(uint32 nSubRes);
-    void DownloadToStagingResource();
-    void UploadFromStagingResource(uint32 nSubRes, StagingHook cbTransfer);
-    void UploadFromStagingResource(uint32 nSubRes);
-    void UploadFromStagingResource();
-    void AccessCurrStagingResource(uint32 nSubRes, bool forUpload, StagingHook cbTransfer);
-
-    size_t GetDeviceSize() const
-    {
-        return m_nBaseAllocatedSize;
-    }
-
-    static uint32 TextureDataSize(D3DBaseView* pView);
-    static uint32 TextureDataSize(D3DBaseView* pView, const uint numRects, const RECT* pRects);
-
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_13
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    static uint32 TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, const ETEX_Format eTF);
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_H_SECTION_14
-    #include AZ_RESTRICTED_FILE(DeviceManager_h)
-#endif
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-    }
-
-    int32 Release();
-    void SetNoDelete(bool noDelete)
-    {
-        m_bNoDelete = noDelete;
-    }
-
-    void TrackTextureMemory(uint32 usageFlags, const char* name);
-    void RemoveFromTextureMemoryTracking();
-
-private:
-    CDeviceTexture(const CDeviceTexture&);
-    CDeviceTexture& operator = (const CDeviceTexture&);
-    int Cleanup();
-
-#ifdef DEVMAN_USE_STAGING_POOL
-    D3DResource* GetCurrUploadStagingResource();
-    D3DResource* GetCurrDownloadStagingResource();
-    D3DResource* GetCurrStagingResource(bool forUpload)
-    {
-        return forUpload ? GetCurrUploadStagingResource() : GetCurrDownloadStagingResource();
-    }
-
-    void** GetCurrUploadStagingMemoryPtr();
-    void** GetCurrDownloadStagingMemoryPtr();
-    void** GetCurrStagingMemoryPtr(bool forUpload)
-    {
-        return forUpload ? GetCurrUploadStagingMemoryPtr() : GetCurrDownloadStagingMemoryPtr();
-    }
-#endif
-
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManagerInline.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManagerInline.h
deleted file mode 100644
index 4b406fa090..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManagerInline.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEMANAGER_DEVICEMANAGERINLINE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEMANAGER_DEVICEMANAGERINLINE_H
-#pragma once
-
-
-#if !defined(NULL_RENDERER) && DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-#include "../DriverD3D.h"
-#endif
-
-//===============================================================================================================
-//
-//  Inline implementation for CDeviceManager
-//
-//===============================================================================================================
-
-#if !defined(NULL_RENDERER)
-inline void CDeviceManager::BindSRV(EHWShaderClass type, D3DShaderResourceView* SRV, uint32 slot)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    switch (type)
-    {
-    case eHWSC_Vertex:
-        rDeviceContext.VSSetShaderResources(slot, 1, &SRV);
-        break;
-    case eHWSC_Pixel:
-        rDeviceContext.PSSetShaderResources(slot, 1, &SRV);
-        break;
-    case eHWSC_Geometry:
-        rDeviceContext.GSSetShaderResources(slot, 1, &SRV);
-        break;
-    case eHWSC_Domain:
-        rDeviceContext.DSSetShaderResources(slot, 1, &SRV);
-        break;
-    case eHWSC_Hull:
-        rDeviceContext.HSSetShaderResources(slot, 1, &SRV);
-        break;
-    case eHWSC_Compute:
-        rDeviceContext.CSSetShaderResources(slot, 1, &SRV);
-        break;
-    }
-#else
-    const unsigned dirty_base = slot >> SRV_DIRTY_SHIFT;
-    const unsigned dirty_bit  = slot & SRV_DIRTY_MASK;
-    m_SRV[type].views[slot] = SRV;
-    m_SRV[type].dirty[dirty_base] |= 1 << dirty_bit;
-#endif
-}
-inline void CDeviceManager::BindSRV(EHWShaderClass type, D3DShaderResourceView** SRV, uint32 start_slot, uint32 count)
-{
-    for (unsigned i = 0; i < count; ++i)
-    {
-        BindSRV(type, SRV[i], i + start_slot);
-    }
-}
-inline void CDeviceManager::BindUAV(EHWShaderClass type, D3DUnorderedAccessView* UAV, uint32 count, uint32 slot)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    switch (type)
-    {
-    case eHWSC_Vertex:
-        assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-        break;
-    case eHWSC_Pixel:
-        rDeviceContext.OMSetRenderTargetsAndUnorderedAccessViews(D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL, NULL, NULL, slot, 1, &UAV, &count);
-        break;
-    case eHWSC_Geometry:
-        assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-        break;
-    case eHWSC_Domain:
-        assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-        break;
-    case eHWSC_Hull:
-        assert(0 && "NOT IMPLEMENTED ON D3D11.0");
-        break;
-    case eHWSC_Compute:
-        rDeviceContext.CSSetUnorderedAccessViews(slot, 1, &UAV, &count);
-        break;
-    }
-#else
-    const unsigned dirty_base = slot >> UAV_DIRTY_SHIFT;
-    const unsigned dirty_bit  = slot & UAV_DIRTY_MASK;
-    m_UAV[type].views[slot] = UAV;
-    m_UAV[type].counts[slot] = count;
-    m_UAV[type].dirty[dirty_base] |= 1 << dirty_bit;
-#endif
-}
-inline void CDeviceManager::BindUAV(EHWShaderClass type, D3DUnorderedAccessView** UAV, const uint32* counts, uint32 start_slot, uint32 count)
-{
-    for (unsigned i = 0; i < count; ++i)
-    {
-        BindUAV(type, UAV[i], (counts ? counts[i] : -1), i + start_slot);
-    }
-}
-inline void CDeviceManager::BindSampler(EHWShaderClass type, D3DSamplerState* Sampler, uint32 slot)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    switch (type)
-    {
-    case eHWSC_Vertex:
-        rDeviceContext.VSSetSamplers(slot, 1, &Sampler);
-        break;
-    case eHWSC_Pixel:
-        rDeviceContext.PSSetSamplers(slot, 1, &Sampler);
-        break;
-    case eHWSC_Geometry:
-        rDeviceContext.GSSetSamplers(slot, 1, &Sampler);
-        break;
-    case eHWSC_Domain:
-        rDeviceContext.DSSetSamplers(slot, 1, &Sampler);
-        break;
-    case eHWSC_Hull:
-        rDeviceContext.HSSetSamplers(slot, 1, &Sampler);
-        break;
-    case eHWSC_Compute:
-        rDeviceContext.CSSetSamplers(slot, 1, &Sampler);
-        break;
-    }
-#else
-    if (Sampler != m_Samplers[type].samplers[slot])
-    {
-        m_Samplers[type].samplers[slot] = Sampler;
-        m_Samplers[type].dirty |= 1 << slot;
-    }
-#endif
-}
-inline void CDeviceManager::BindSampler(EHWShaderClass type, D3DSamplerState** Samplers, uint32 start_slot, uint32 count)
-{
-    for (unsigned i = 0; i < count; ++i)
-    {
-        BindSampler(type, Samplers[i], i + start_slot);
-    }
-}
-inline void CDeviceManager::BindVB(D3DBuffer* Buffer, uint32 slot, uint32 offset, uint32 stride)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    rDeviceContext.IASetVertexBuffers(slot, 1, &Buffer, &stride, &offset);
-#else
-    m_VBs.buffers[slot] = Buffer;
-    m_VBs.offsets[slot] = offset;
-    m_VBs.strides[slot] = stride;
-    m_VBs.dirty |= 1 << slot;
-#endif
-}
-inline void CDeviceManager::BindVB(uint32 start, uint32 count, D3DBuffer** Buffers, uint32* offset, uint32* stride)
-{
-    for (size_t i = 0; i < count; ++i)
-    {
-        BindVB(Buffers[i], start + i, offset[i], stride[i]);
-    }
-}
-inline void CDeviceManager::BindIB(D3DBuffer* Buffer, uint32 offset, DXGI_FORMAT format)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    rDeviceContext.IASetIndexBuffer(Buffer, format, offset);
-#else
-    m_IB.buffer = Buffer;
-    m_IB.offset = offset;
-    m_IB.format = format;
-    m_IB.dirty = 1;
-#endif
-}
-inline void CDeviceManager::BindVtxDecl(D3DVertexDeclaration* decl)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    rDeviceContext.IASetInputLayout(decl);
-#else
-    m_VertexDecl.decl = decl;
-    m_VertexDecl.dirty = true;
-#endif
-}
-inline void CDeviceManager::BindTopology(D3D11_PRIMITIVE_TOPOLOGY top)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    rDeviceContext.IASetPrimitiveTopology(top);
-#else
-    m_Topology.topology = top;
-    m_Topology.dirty = true;
-#endif
-}
-inline void CDeviceManager::BindShader(EHWShaderClass type, ID3D11Resource* shader)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    switch (type)
-    {
-    case eHWSC_Vertex:
-        rDeviceContext.VSSetShader((D3DVertexShader*)shader, NULL, 0);
-        break;
-    case eHWSC_Pixel:
-        rDeviceContext.PSSetShader((D3DPixelShader*)shader, NULL, 0);
-        break;
-    case eHWSC_Hull:
-        rDeviceContext.HSSetShader((ID3D11HullShader*)shader, NULL, 0);
-        break;
-    case eHWSC_Geometry:
-        rDeviceContext.GSSetShader((ID3D11GeometryShader*)shader, NULL, 0);
-        break;
-    case eHWSC_Domain:
-        rDeviceContext.DSSetShader((ID3D11DomainShader*)shader, NULL, 0);
-        break;
-    case eHWSC_Compute:
-        rDeviceContext.CSSetShader((ID3D11ComputeShader*)shader, NULL, 0);
-        break;
-    }
-#else
-    m_Shaders[type].shader = shader;
-    m_Shaders[type].dirty = true;
-#endif
-}
-inline void CDeviceManager::SetDepthStencilState(ID3D11DepthStencilState* dss, uint32 stencilref)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    rDeviceContext.OMSetDepthStencilState(dss, stencilref);
-#else
-    m_DepthStencilState.dss = dss;
-    m_DepthStencilState.stencilref = stencilref;
-    m_DepthStencilState.dirty = true;
-#endif
-}
-inline void CDeviceManager::SetBlendState(ID3D11BlendState* pBlendState, float* BlendFactor, uint32 SampleMask)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    rDeviceContext.OMSetBlendState(pBlendState, BlendFactor, SampleMask);
-#else
-    m_BlendState.pBlendState = pBlendState;
-    if (BlendFactor)
-    {
-        for (size_t i = 0; i < 4; ++i)
-        {
-            m_BlendState.BlendFactor[i] = BlendFactor[i];
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < 4; ++i)
-        {
-            m_BlendState.BlendFactor[i] = 1.f;
-        }
-    }
-    m_BlendState.SampleMask = SampleMask;
-    m_BlendState.dirty = true;
-#endif
-}
-inline void CDeviceManager::SetRasterState(ID3D11RasterizerState* pRasterizerState)
-{
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-    D3DDeviceContext& rDeviceContext = gcpRendD3D->GetDeviceContext();
-    rDeviceContext.RSSetState(pRasterizerState);
-#else
-    m_RasterState.pRasterizerState = pRasterizerState;
-    m_RasterState.dirty = true;
-#endif
-}
-#if DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-ILINE void CDeviceManager::CommitDeviceStates()
-{
-    // Nothing to do for DEVICE_MANAGER_IMMEDIATE_STATE_WRITE
-}
-#endif
-#endif
-//====================================================================================================
-
-#endif  // _DeviceManager_H_
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager_D3D11.inl b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager_D3D11.inl
deleted file mode 100644
index 2c1d5123fe..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager_D3D11.inl
+++ /dev/null
@@ -1,749 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-//=============================================================================
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DEVICEMANAGER_D3D11_INL_SECTION_1 1
-#define DEVICEMANAGER_D3D11_INL_SECTION_2 2
-#define DEVICEMANAGER_D3D11_INL_SECTION_3 3
-#define DEVICEMANAGER_D3D11_INL_SECTION_4 4
-#define DEVICEMANAGER_D3D11_INL_SECTION_5 5
-#define DEVICEMANAGER_D3D11_INL_SECTION_6 6
-#define DEVICEMANAGER_D3D11_INL_SECTION_7 7
-#define DEVICEMANAGER_D3D11_INL_SECTION_8 8
-#endif
-
-#ifdef DEVMAN_USE_STAGING_POOL
-D3DResource* CDeviceManager::AllocateStagingResource(D3DResource* pForTex, bool bUpload)
-{
-    D3D11_TEXTURE2D_DESC Desc;
-    memset(&Desc, 0, sizeof(Desc));
-    ((D3DTexture*)pForTex)->GetDesc(&Desc);
-
-    // If we're creating download resources or have multiple mips where we'll need to write to one mip at a time,
-    // we'll need a resource that we can read back to the CPU.  We can only use write-only for upload resources
-    // with a single mip level.
-    bool canUseWriteOnly = bUpload && (Desc.MipLevels == 1);
-    
-    Desc.Usage          = canUseWriteOnly ? D3D11_USAGE_DYNAMIC        : D3D11_USAGE_STAGING;
-    Desc.CPUAccessFlags = bUpload         ? D3D11_CPU_ACCESS_WRITE     : D3D11_CPU_ACCESS_READ;
-    Desc.BindFlags      = canUseWriteOnly ? D3D11_BIND_SHADER_RESOURCE : 0;
-
-
-#if defined(AZ_PLATFORM_MAC)
-    // For metal when we do a subresource copy we render to the texture so need to set the render target flag
-    Desc.BindFlags |= D3D11_BIND_RENDER_TARGET; //todo: Remove this for mac too
-#endif
-
-    // BindFlags play a part in matching the descriptions. Only search after we have finished
-    // modifying the description.
-    StagingPoolVec::iterator it = std::find(m_stagingPool.begin(), m_stagingPool.end(), Desc);
-
-    if (it == m_stagingPool.end())
-    {
-        D3DTexture* pStagingTexture = NULL;
-
-        gcpRendD3D->GetDevice().CreateTexture2D(&Desc, NULL, &pStagingTexture);
-
-#ifndef _RELEASE
-        if (pStagingTexture)
-        {
-            D3D11_TEXTURE2D_DESC stagingDesc;
-            memset(&stagingDesc, 0, sizeof(stagingDesc));
-
-            pStagingTexture->GetDesc(&stagingDesc);
-            stagingDesc.Usage          = canUseWriteOnly ? D3D11_USAGE_DYNAMIC        : D3D11_USAGE_STAGING;
-            stagingDesc.CPUAccessFlags = bUpload         ? D3D11_CPU_ACCESS_WRITE     : D3D11_CPU_ACCESS_READ;
-            stagingDesc.BindFlags      = canUseWriteOnly ? D3D11_BIND_SHADER_RESOURCE : 0;
-
-#if defined(AZ_PLATFORM_MAC)
-            // For metal when we do a subresource copy we render to the texture so need to set the render target flag
-            stagingDesc.BindFlags |= D3D11_BIND_RENDER_TARGET; //todo: Remove this for mac too
-#endif
-
-            if (memcmp(&stagingDesc, &Desc, sizeof(Desc)) != 0)
-            {
-                __debugbreak();
-            }
-        }
-#endif
-
-        return pStagingTexture;
-    }
-    else
-    {
-        D3DTexture* pStagingResource = NULL;
-
-        pStagingResource = it->pStagingTexture;
-        m_stagingPool.erase(it);
-
-        return pStagingResource;
-    }
-}
-
-void CDeviceManager::ReleaseStagingResource(D3DResource* pStagingRes)
-{
-    D3D11_TEXTURE2D_DESC Desc;
-    memset(&Desc, 0, sizeof(Desc));
-
-    ((D3DTexture*)pStagingRes)->GetDesc(&Desc);
-
-    StagingTextureDef def;
-    def.desc = Desc;
-    def.pStagingTexture = (D3DTexture*)pStagingRes;
-    m_stagingPool.push_back(def);
-}
-#endif
-
-//=============================================================================
-
-int32 CDeviceTexture::Release()
-{
-    int32 nRef = Cleanup();
-
-    if (nRef <= 0 && !m_bNoDelete)
-    {
-        delete this;
-    }
-
-    return nRef;
-}
-
-void CDeviceTexture::Unbind()
-{
-    for (uint32 i = 0; i < MAX_TMU; i++)
-    {
-        if (CTexture::s_TexStages[i].m_DevTexture == this)
-        {
-            CTexture::s_TexStages[i].m_DevTexture = NULL;
-
-            ID3D11ShaderResourceView* RV = NULL;
-            gcpRendD3D->GetDeviceContext().PSSetShaderResources(i, 1, &RV);
-        }
-    }
-}
-
-void CDeviceTexture::DownloadToStagingResource(uint32 nSubRes, StagingHook cbTransfer)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-    D3DResource* pStagingResource = GetCurrDownloadStagingResource();
-    if (!pStagingResource)
-    {
-        pStagingResource = gcpRendD3D->m_DevMan.AllocateStagingResource(m_pD3DTexture, FALSE);
-    }
-
-    AZ_Assert(pStagingResource, "Null download staging resource");
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-    gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(pStagingResource, nSubRes, 0, 0, 0, m_pD3DTexture, nSubRes, NULL, D3D11_COPY_NO_OVERWRITE);
-#else
-    gcpRendD3D->GetDeviceContext().CopySubresourceRegion (pStagingResource, nSubRes, 0, 0, 0, m_pD3DTexture, nSubRes, NULL);
-#endif
-
-    D3D11_MAPPED_SUBRESOURCE lrct;
-    HRESULT hr = gcpRendD3D->GetDeviceContext().Map(pStagingResource, nSubRes, D3D11_MAP_READ, 0, &lrct);
-
-    if (S_OK == hr)
-    {
-        const bool update = cbTransfer(lrct.pData, lrct.RowPitch, lrct.DepthPitch);
-        gcpRendD3D->GetDeviceContext().Unmap(pStagingResource, nSubRes);
-    }
-
-    if (!(GetCurrDownloadStagingResource()))
-    {
-        gcpRendD3D->m_DevMan.ReleaseStagingResource(pStagingResource);
-    }
-}
-
-void CDeviceTexture::DownloadToStagingResource(uint32 nSubRes)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-    AZ_Assert(GetCurrDownloadStagingResource(), "Null download staging resource");
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-    gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(GetCurrDownloadStagingResource(), nSubRes, 0, 0, 0, m_pD3DTexture, nSubRes, NULL, D3D11_COPY_NO_OVERWRITE);
-#else
-    gcpRendD3D->GetDeviceContext().CopySubresourceRegion(GetCurrDownloadStagingResource(), nSubRes, 0, 0, 0, m_pD3DTexture, nSubRes, NULL);
-#endif
-}
-
-void CDeviceTexture::DownloadToStagingResource()
-{
-    AZ_Assert(GetCurrDownloadStagingResource(), "Null download staging resource");
-    gcpRendD3D->GetDeviceContext().CopyResource(GetCurrDownloadStagingResource(), Get2DTexture());
-}
-
-void CDeviceTexture::UploadFromStagingResource(const uint32 nSubRes, StagingHook cbTransfer)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-    D3DResource* pStagingResource = GetCurrUploadStagingResource();
-    if (!pStagingResource)
-    {
-        pStagingResource = gcpRendD3D->m_DevMan.AllocateStagingResource(m_pD3DTexture, TRUE);
-    }
-
-    AZ_Assert(pStagingResource, "Null upload staging resource");
-
-    // If we have more than one mip, we'll need to do partial writes, so we can't just discard the previous GPU data.
-    D3D11_MAPPED_SUBRESOURCE lrct;
-    HRESULT hr = gcpRendD3D->GetDeviceContext().Map(pStagingResource, nSubRes, (m_numSubResources > 1) ? D3D11_MAP_WRITE : D3D11_MAP_WRITE_DISCARD, 0, &lrct);
-
-    if (S_OK == hr)
-    {
-        const bool update = cbTransfer(lrct.pData, lrct.RowPitch, lrct.DepthPitch);
-        gcpRendD3D->GetDeviceContext().Unmap(pStagingResource, nSubRes);
-        if (update)
-        {
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(m_pD3DTexture, nSubRes, 0, 0, 0, pStagingResource, nSubRes, NULL, D3D11_COPY_NO_OVERWRITE);
-#else
-            gcpRendD3D->GetDeviceContext().CopySubresourceRegion (m_pD3DTexture, nSubRes, 0, 0, 0, pStagingResource, nSubRes, NULL);
-#endif
-        }
-    }
-
-    if (!GetCurrUploadStagingResource())
-    {
-        gcpRendD3D->m_DevMan.ReleaseStagingResource(pStagingResource);
-    }
-}
-
-void CDeviceTexture::UploadFromStagingResource(const uint32 nSubRes)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-    AZ_Assert(GetCurrUploadStagingResource(), "Null upload staging resource");
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-    gcpRendD3D->GetDeviceContext().CopySubresourceRegion1(m_pD3DTexture, nSubRes, 0, 0, 0, GetCurrUploadStagingResource(), nSubRes, NULL, D3D11_COPY_NO_OVERWRITE);
-#else
-    gcpRendD3D->GetDeviceContext().CopySubresourceRegion(m_pD3DTexture, nSubRes, 0, 0, 0, GetCurrUploadStagingResource(), nSubRes, NULL);
-#endif
-}
-
-void CDeviceTexture::UploadFromStagingResource()
-{
-    AZ_Assert(GetCurrUploadStagingResource(), "Null upload staging resource");
-    gcpRendD3D->GetDeviceContext().CopyResource(Get2DTexture(), GetCurrUploadStagingResource());
-}
-
-void CDeviceTexture::AccessCurrStagingResource(uint32 nSubRes, bool forUpload, StagingHook cbTransfer)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-
-    D3D11_MAPPED_SUBRESOURCE lrct;
-    HRESULT hr = gcpRendD3D->GetDeviceContext().Map(GetCurrStagingResource(forUpload), nSubRes, forUpload ? D3D11_MAP_WRITE : D3D11_MAP_READ, D3D11_MAP_FLAG_DO_NOT_WAIT, &lrct);
-
-    if (S_OK == hr)
-    {
-        const bool update = cbTransfer(lrct.pData, lrct.RowPitch, lrct.DepthPitch);
-        gcpRendD3D->GetDeviceContext().Unmap(GetCurrStagingResource(forUpload), nSubRes);
-    }
-}
-
-
-//=============================================================================
-
-HRESULT CDeviceManager::Create2DTexture(const string& textureName, uint32 nWidth, uint32 nHeight, uint32 nMips, uint32 nArraySize, uint32 nUsage, [[maybe_unused]] const ColorF& cClearValue, D3DFormat Format, [[maybe_unused]] D3DPOOL Pool,
-    LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI, [[maybe_unused]] bool bShouldBeCreated, [[maybe_unused]] int32 nESRAMOffset)
-{
-    HRESULT hr = S_OK;
-
-    CDeviceTexture* pDeviceTexture = 0;//*/ new CDeviceTexture();
-    D3DTexture* pD3DTex = NULL;
-
-    uint32 nBindFlags = D3D11_BIND_SHADER_RESOURCE;
-    if (nUsage & USAGE_DEPTH_STENCIL)
-    {
-        nBindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-    else if (nUsage & USAGE_RENDER_TARGET)
-    {
-        nBindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-    
-#if defined(AZ_PLATFORM_IOS)
-    if (nUsage & USAGE_MEMORYLESS)
-    {
-        nBindFlags |= D3D11_BIND_MEMORYLESS;
-    }
-#endif
-    
-    if (nUsage & USAGE_UNORDERED_ACCESS)
-    {
-        nBindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-    
-    uint32 nMiscFlags = 0;
-    if (nUsage & USAGE_AUTOGENMIPS)
-    {
-        nMiscFlags |= D3D11_RESOURCE_MISC_GENERATE_MIPS;
-    }
-
-    D3D11_TEXTURE2D_DESC Desc;
-    ZeroStruct(Desc);
-    Desc.Width = nWidth;
-    Desc.Height = nHeight;
-    Desc.MipLevels = nMips;
-    Desc.Format = Format;
-    Desc.ArraySize = nArraySize;
-    Desc.BindFlags = nBindFlags;
-    Desc.CPUAccessFlags = (nUsage & USAGE_DYNAMIC) ? D3D11_CPU_ACCESS_WRITE : 0;
-
-    Desc.Usage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
-    Desc.Usage = (nUsage & USAGE_STAGING) ? D3D11_USAGE_STAGING : Desc.Usage;
-
-    Desc.SampleDesc.Count = pTI ? pTI->m_nMSAASamples : 1;
-    Desc.SampleDesc.Quality = pTI ? pTI->m_nMSAAQuality : 0;
-    // AntonK: supported only by DX11 feature set
-    // needs to be enabled for pure DX11 context
-    if (nUsage & USAGE_STREAMING)
-    {
-        nMiscFlags |= D3D11_RESOURCE_MISC_RESOURCE_CLAMP;
-    }
-    //if (nUsage & USAGE_STREAMING)
-    //    Desc.CPUAccessFlags |= D3D11_CPU_ACCESS_READ;
-    Desc.MiscFlags = nMiscFlags;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_1
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-
-    D3D11_SUBRESOURCE_DATA* pSRD = NULL;
-    D3D11_SUBRESOURCE_DATA SRD[20];
-    if (pTI && pTI->m_pData)
-    {
-        pSRD = &SRD[0];
-        for (int i = 0; i < nMips; i++)
-        {
-            SRD[i].pSysMem = pTI->m_pData[i].pSysMem;
-            SRD[i].SysMemPitch = pTI->m_pData[i].SysMemPitch;
-            SRD[i].SysMemSlicePitch = pTI->m_pData[i].SysMemSlicePitch;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_2
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-        }
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_3
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-
-    hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, pSRD, &pD3DTex);
-
-    if (SUCCEEDED(hr) && pDeviceTexture == 0)
-    {
-        pDeviceTexture = new CDeviceTexture();
-    }
-
-    if (SUCCEEDED(hr) && pD3DTex)
-    {
-        pDeviceTexture->m_pD3DTexture = pD3DTex;
-        pDeviceTexture->m_numSubResources = nMips * nArraySize;
-        if (!pDeviceTexture->m_nBaseAllocatedSize)
-        {
-            pDeviceTexture->m_nBaseAllocatedSize = CDeviceTexture::TextureDataSize(nWidth, nHeight, 1, nMips, 1, CTexture::TexFormatFromDeviceFormat(Format));
-
-            // Register the VRAM allocation with the driller
-            pDeviceTexture->TrackTextureMemory(nUsage, textureName.c_str());
-        }
-
-        if (nUsage & USAGE_STAGE_ACCESS)
-        {
-            if (nUsage & USAGE_CPU_READ)
-            {
-                pDeviceTexture->m_pStagingResourceDownload = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, FALSE);
-            }
-            if (nUsage & USAGE_CPU_WRITE)
-            {
-                for (int i = 0; i < CDeviceTexture::NUM_UPLOAD_STAGING_RES; i++)
-                {
-                    pDeviceTexture->m_pStagingResourceUpload[i] = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, TRUE);
-                }
-            }
-        }
-    }
-    else
-    {
-        SAFE_DELETE(pDeviceTexture);
-    }
-
-    *ppDevTexture = pDeviceTexture;
-
-    return hr;
-}
-
-HRESULT CDeviceManager::CreateCubeTexture(const string& textureName, uint32 nSize, uint32 nMips, uint32 nArraySize, uint32 nUsage, [[maybe_unused]] const ColorF& cClearValue, D3DFormat Format, [[maybe_unused]] D3DPOOL Pool, LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI, [[maybe_unused]] bool bShouldBeCreated)
-{
-    HRESULT hr = S_OK;
-
-    CDeviceTexture* pDeviceTexture = 0;//new CDeviceTexture();
-    D3DCubeTexture* pD3DTex = NULL;
-
-    uint32 nBindFlags = D3D11_BIND_SHADER_RESOURCE;
-    uint32 nMiscFlags = D3D11_RESOURCE_MISC_TEXTURECUBE;
-    if (nUsage & USAGE_DEPTH_STENCIL)
-    {
-        nBindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-    else if (nUsage & USAGE_RENDER_TARGET)
-    {
-        nBindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-    
-#if defined(AZ_PLATFORM_IOS)
-    if (nUsage & USAGE_MEMORYLESS)
-    {
-        nBindFlags |= D3D11_BIND_MEMORYLESS;
-    }
-#endif
-    
-    if (nUsage & USAGE_AUTOGENMIPS)
-    {
-        nMiscFlags |= D3D11_RESOURCE_MISC_GENERATE_MIPS;
-    }
-    D3D11_TEXTURE2D_DESC Desc;
-    ZeroStruct(Desc);
-    Desc.Width = nSize;
-    Desc.Height = nSize;
-    Desc.MipLevels = nMips;
-    Desc.Format = Format;
-    Desc.ArraySize = nArraySize * 6;
-    Desc.BindFlags |= nBindFlags;
-    Desc.CPUAccessFlags = (nUsage & USAGE_DYNAMIC) ? D3D11_CPU_ACCESS_WRITE : 0;
-    Desc.Usage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
-    Desc.SampleDesc.Count = 1;
-    Desc.SampleDesc.Quality = 0;
-    Desc.MiscFlags = nMiscFlags;
-    // AntonK: supported only by DX11 feature set
-    // needs to be enabled for pure DX11 context
-    //if(nUsage & USAGE_STREAMING)
-    //Desc.MiscFlags |= D3D11_RESOURCE_MISC_RESOURCE_CLAMP;
-
-    D3D11_SUBRESOURCE_DATA* pSRD = NULL;
-    D3D11_SUBRESOURCE_DATA SRD[g_nD3D10MaxSupportedSubres];
-    if (pTI && pTI->m_pData)
-    {
-        pSRD = &SRD[0];
-        for (int j = 0; j < 6; j++)
-        {
-            for (int i = 0; i < nMips; i++)
-            {
-                int nSubresInd = j * nMips + i;
-                SRD[nSubresInd].pSysMem = pTI->m_pData[nSubresInd].pSysMem;
-                SRD[nSubresInd].SysMemPitch = pTI->m_pData[nSubresInd].SysMemPitch;
-                SRD[nSubresInd].SysMemSlicePitch = pTI->m_pData[nSubresInd].SysMemSlicePitch;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_4
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-            }
-        }
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_5
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-
-    hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, pSRD, &pD3DTex);
-
-    if (SUCCEEDED(hr) && pDeviceTexture == 0)
-    {
-        pDeviceTexture = new CDeviceTexture();
-    }
-
-    if (SUCCEEDED(hr) && pD3DTex)
-    {
-        pDeviceTexture->m_pD3DTexture = pD3DTex;
-        pDeviceTexture->m_bCube = true;
-        pDeviceTexture->m_numSubResources = nMips * nArraySize;
-        if (!pDeviceTexture->m_nBaseAllocatedSize)
-        {
-            pDeviceTexture->m_nBaseAllocatedSize = CDeviceTexture::TextureDataSize(nSize, nSize, 1, nMips, 1, CTexture::TexFormatFromDeviceFormat(Format)) * 6;
-
-            // Register the VRAM allocation with the driller
-            pDeviceTexture->TrackTextureMemory(nUsage, textureName.c_str());
-        }
-
-        if (nUsage & USAGE_STAGE_ACCESS)
-        {
-            if (nUsage & USAGE_CPU_READ)
-            {
-                pDeviceTexture->m_pStagingResourceDownload = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, FALSE);
-            }
-            if (nUsage & USAGE_CPU_WRITE)
-            {
-                for (int i = 0; i < CDeviceTexture::NUM_UPLOAD_STAGING_RES; i++)
-                {
-                    pDeviceTexture->m_pStagingResourceUpload[i] = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, TRUE);
-                }
-            }
-        }
-    }
-    else
-    {
-        SAFE_DELETE(pDeviceTexture);
-    }
-
-    *ppDevTexture = pDeviceTexture;
-    return hr;
-}
-
-HRESULT CDeviceManager::CreateVolumeTexture(const string& textureName, uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nUsage, [[maybe_unused]] const ColorF& cClearValue, D3DFormat Format, [[maybe_unused]] D3DPOOL Pool, LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI)
-{
-    HRESULT hr = S_OK;
-    CDeviceTexture* pDeviceTexture = new CDeviceTexture();
-    D3DVolumeTexture* pD3DTex = NULL;
-    uint32 nBindFlags = D3D11_BIND_SHADER_RESOURCE;
-    if (nUsage & USAGE_DEPTH_STENCIL)
-    {
-        nBindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-    else if (nUsage & USAGE_RENDER_TARGET)
-    {
-        nBindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-    
-#if defined(AZ_PLATFORM_IOS)
-    if (nUsage & USAGE_MEMORYLESS)
-    {
-        nBindFlags |= D3D11_BIND_MEMORYLESS;
-    }
-#endif
-    
-    if (nUsage & USAGE_UNORDERED_ACCESS)
-    {
-        nBindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-    D3D11_TEXTURE3D_DESC Desc;
-    ZeroStruct(Desc);
-    Desc.Width = nWidth;
-    Desc.Height = nHeight;
-    Desc.Depth = nDepth;
-    Desc.MipLevels = nMips;
-    Desc.Format = (nUsage & USAGE_UAV_RWTEXTURE) ? CTexture::ConvertToTypelessFmt(Format) : Format;
-    Desc.BindFlags = nBindFlags;
-    Desc.CPUAccessFlags = 0;
-
-    Desc.Usage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
-    Desc.Usage = (nUsage & USAGE_STAGING) ? D3D11_USAGE_STAGING : Desc.Usage;
-
-    Desc.MiscFlags = 0;
-    D3D11_SUBRESOURCE_DATA* pSRD = NULL;
-    D3D11_SUBRESOURCE_DATA SRD[20] = { D3D11_SUBRESOURCE_DATA() };
-    if (pTI && pTI->m_pData)
-    {
-        pSRD = &SRD[0];
-        for (int i = 0; i < nMips; i++)
-        {
-            SRD[i].pSysMem = pTI->m_pData[i].pSysMem;
-            SRD[i].SysMemPitch = pTI->m_pData[i].SysMemPitch;
-            SRD[i].SysMemSlicePitch = pTI->m_pData[i].SysMemSlicePitch;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_6
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-        }
-    }
-    hr = gcpRendD3D->GetDevice().CreateTexture3D(&Desc, pSRD, &pD3DTex);
-
-    if (SUCCEEDED(hr) && pD3DTex)
-    {
-        pDeviceTexture->m_pD3DTexture = pD3DTex;
-        pDeviceTexture->m_numSubResources = nMips;
-
-        if (!pDeviceTexture->m_nBaseAllocatedSize)
-        {
-            pDeviceTexture->m_nBaseAllocatedSize = CDeviceTexture::TextureDataSize(nWidth, nHeight, nDepth, nMips, 1, CTexture::TexFormatFromDeviceFormat(Format));
-
-            // Register the VRAM allocation with the driller
-            pDeviceTexture->TrackTextureMemory(nUsage, textureName.c_str());
-        }
-
-        if (nUsage & USAGE_STAGE_ACCESS)
-        {
-            if (nUsage & USAGE_CPU_READ)
-            {
-                pDeviceTexture->m_pStagingResourceDownload = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, FALSE);
-            }
-            if (nUsage & USAGE_CPU_WRITE)
-            {
-                for (int i = 0; i < CDeviceTexture::NUM_UPLOAD_STAGING_RES; i++)
-                {
-                    pDeviceTexture->m_pStagingResourceUpload[i] = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, TRUE);
-                }
-            }
-        }
-    }
-    else
-    {
-        SAFE_DELETE(pDeviceTexture);
-    }
-
-    *ppDevTexture = pDeviceTexture;
-    return hr;
-}
-
-HRESULT CDeviceManager::CreateBuffer(
-    uint32 nSize
-    , uint32 elemSize
-    , int32 nUsage
-    , int32 nBindFlags
-    , D3DBuffer** ppBuff)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    HRESULT hr = S_OK;
-
-# ifndef _RELEASE
-    // ToDo verify that the usage and bindflags are correctly set (e.g certain
-    // bit groups are mutually exclusive).
-# endif
-
-    D3D11_BUFFER_DESC BufDesc;
-    ZeroStruct(BufDesc);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_7
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-
-    BufDesc.ByteWidth = nSize * elemSize;
-    int nD3DUsage = D3D11_USAGE_DEFAULT;
-    nD3DUsage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : nD3DUsage;
-    nD3DUsage = (nUsage & USAGE_IMMUTABLE) ? D3D11_USAGE_IMMUTABLE : nD3DUsage;
-    nD3DUsage = (nUsage & USAGE_STAGING) ? D3D11_USAGE_STAGING : nD3DUsage;
-    
-#if defined(CRY_USE_METAL)
-    nD3DUsage = (nUsage & USAGE_TRANSIENT) ? D3D11_USAGE_TRANSIENT : nD3DUsage;
-#if BUFFER_USE_STAGED_UPDATES == 0
-    //  direct access usage is allowed only if staged updates logic is off.
-    CRY_ASSERT(!(nUsage & USAGE_DIRECT_ACCESS) || !(nUsage & USAGE_STAGING));
-    nD3DUsage = (nUsage & USAGE_DIRECT_ACCESS) ? D3D11_USAGE_DIRECT_ACCESS : nD3DUsage;
-    
-    if ((nUsage & USAGE_DIRECT_ACCESS) && (nUsage & USAGE_STAGING))
-    {
-        CryFatalError("staging buffers not supported if BUFFER_USE_STAGED_UPDATES not defined");
-    }
-#endif  //  BUFFER_USE_STAGED_UPDATES == 0
-#endif  //  CRY_USE_METAL
-
-    
-    BufDesc.Usage = (D3D11_USAGE)nD3DUsage;
-
-# if !defined(OPENGL)
-    if (BufDesc.Usage != D3D11_USAGE_STAGING)
-# endif
-    {
-        switch (nBindFlags)
-        {
-        case BIND_VERTEX_BUFFER:
-            BufDesc.BindFlags |= D3D11_BIND_VERTEX_BUFFER;
-            break;
-        case BIND_INDEX_BUFFER:
-            BufDesc.BindFlags |= D3D11_BIND_INDEX_BUFFER;
-            break;
-        case BIND_CONSTANT_BUFFER:
-            BufDesc.BindFlags |= D3D11_BIND_CONSTANT_BUFFER;
-            break;
-
-        case BIND_SHADER_RESOURCE:
-        case BIND_UNORDERED_ACCESS:
-            if (nBindFlags & BIND_SHADER_RESOURCE)
-            {
-                BufDesc.BindFlags |= D3D11_BIND_SHADER_RESOURCE;
-            }
-            if (nBindFlags & BIND_UNORDERED_ACCESS)
-            {
-                BufDesc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-            }
-            break;
-
-        case BIND_STREAM_OUTPUT:
-        case BIND_RENDER_TARGET:
-        case BIND_DEPTH_STENCIL:
-            CryFatalError("trying to create (currently) unsupported buffer type");
-            break;
-
-        default:
-            CryFatalError("trying to create unknown buffer type");
-            break;
-        }
-    }
-# if !defined(OPENGL)
-    else
-    {
-        BufDesc.BindFlags = 0;
-    }
-# endif
-
-    BufDesc.MiscFlags = 0;
-    BufDesc.CPUAccessFlags = 0;
-    if (BufDesc.Usage != D3D11_USAGE_DEFAULT && BufDesc.Usage != D3D11_USAGE_IMMUTABLE)
-    {
-        BufDesc.CPUAccessFlags = (nUsage & USAGE_CPU_WRITE) ? D3D11_CPU_ACCESS_WRITE : 0;
-        BufDesc.CPUAccessFlags |= (nUsage & USAGE_CPU_READ) ? D3D11_CPU_ACCESS_READ : 0;
-    }
-
-    if (nBindFlags & BIND_UNORDERED_ACCESS)
-    {
-        BufDesc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED;
-    }
-
-    hr = gcpRendD3D->GetDevice().CreateBuffer(&BufDesc, NULL, ppBuff);
-    CHECK_HRESULT(hr);
-
-    Render::Debug::VRAMAllocationSubcategory subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_OTHER_BUFFER;
-    if (BufDesc.Usage & D3D11_BIND_VERTEX_BUFFER)
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER;
-    }
-    else if (BufDesc.Usage & D3D11_BIND_INDEX_BUFFER)
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER;
-    }
-    else if (BufDesc.Usage & D3D11_BIND_CONSTANT_BUFFER)
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_CONSTANT_BUFFER;
-    }
-    
-    void* address = static_cast<void*>(*ppBuff);
-    size_t byteSize = BufDesc.ByteWidth;
-    EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, byteSize, "CDeviceManager::CreateBuffer", Render::Debug::VRAM_CATEGORY_BUFFER, subcategory);
-
-    return hr;
-}
-
-void CDeviceManager::ExtractBasePointer([[maybe_unused]] D3DBuffer* buffer, uint8*& base_ptr)
-{
-#if defined(CRY_USE_METAL) && (BUFFER_USE_STAGED_UPDATES == 0)
-    base_ptr = (uint8*)DXMETALGetBufferStorage(buffer);
-#else
-#   if BUFFER_ENABLE_DIRECT_ACCESS
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D11_INL_SECTION_8
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D11_inl)
-#endif
-#   else
-    base_ptr = NULL;
-#   endif
-#endif
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager_D3D12.inl b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager_D3D12.inl
deleted file mode 100644
index d37bfa3acc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceManager_D3D12.inl
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef DEVMAN_USE_STAGING_POOL
-#error StagingPool is a requirement for DX12
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DEVICEMANAGER_D3D12_INL_SECTION_1 1
-#endif
-
-//=============================================================================
-
-#ifdef DEVMAN_USE_STAGING_POOL
-D3DResource* CDeviceManager::AllocateStagingResource(D3DResource* pForTex, bool bUpload)
-{
-    D3DResource* pStagingResource = nullptr;
-
-    if (S_OK == gcpRendD3D->GetDevice().CreateStagingResource(pForTex, &pStagingResource, bUpload))
-    {
-        pStagingResource;
-    }
-
-    return pStagingResource;
-}
-
-void CDeviceManager::ReleaseStagingResource(D3DResource* pStagingTex)
-{
-    if (pStagingTex && gcpRendD3D->GetDevice().ReleaseStagingResource(pStagingTex))
-    {
-        pStagingTex = nullptr;
-    }
-}
-#endif
-
-//=============================================================================
-
-int32 CDeviceTexture::Release()
-{
-    int32 nRef = Cleanup();
-
-    if (nRef <= 0 && !m_bNoDelete)
-    {
-        delete this;
-    }
-
-    return nRef;
-}
-
-void CDeviceTexture::Unbind()
-{
-    for (uint32 i = 0; i < MAX_TMU; i++)
-    {
-        if (CTexture::s_TexStages[i].m_DevTexture == this)
-        {
-            CTexture::s_TexStages[i].m_DevTexture = NULL;
-
-            ID3D11ShaderResourceView* RV = NULL;
-            gcpRendD3D->GetDeviceContext().PSSetShaderResources(i, 1, &RV);
-        }
-    }
-}
-
-void CDeviceTexture::DownloadToStagingResource(uint32 nSubRes, StagingHook cbTransfer)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-
-    D3D11_RESOURCE_DIMENSION eResourceDimension;
-    m_pD3DTexture->GetType(&eResourceDimension);
-
-    D3DResource* pStagingResource = GetCurrDownloadStagingResource();
-    void* pStagingMemory = nullptr;
-    if (!pStagingResource)
-    {
-        pStagingResource = gcpRendD3D->m_DevMan.AllocateStagingResource(m_pD3DTexture, FALSE);
-    }
-
-    AZ_Assert(pStagingResource, "Null download staging resource");
-
-    if (gcpRendD3D->GetDeviceContext().CopyStagingResource(pStagingResource, m_pD3DTexture, nSubRes, FALSE) == S_OK)
-    {
-        uint32 rowPitch = 0;
-
-        // Resources on D3D12_HEAP_TYPE_READBACK heaps do not support persistent map.
-        // Map and Unmap must be called between CPU and GPU accesses to the same memory
-        // address on some system architectures, when the page caching behavior is write-back.
-        // Map and Unmap invalidate and flush the last level CPU cache on some ARM systems,
-        // to marshal data between the CPU and GPU through memory addresses with write-back behavior.
-        gcpRendD3D->GetDeviceContext().WaitStagingResource(pStagingResource);
-        gcpRendD3D->GetDeviceContext().MapStagingResource(m_pD3DTexture, pStagingResource, nSubRes, FALSE, &pStagingMemory, &rowPitch);
-
-        cbTransfer(pStagingMemory, rowPitch, 0);
-
-        gcpRendD3D->GetDeviceContext().UnmapStagingResource(pStagingResource, FALSE);
-    }
-
-    if (!(GetCurrDownloadStagingResource()))
-    {
-        gcpRendD3D->m_DevMan.ReleaseStagingResource(pStagingResource);
-    }
-}
-
-void CDeviceTexture::DownloadToStagingResource(uint32 nSubRes)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-    AZ_Assert(GetCurrDownloadStagingResource(), "Null download staging resource");
-
-    gcpRendD3D->GetDeviceContext().CopyStagingResource(GetCurrDownloadStagingResource(), m_pD3DTexture, nSubRes, FALSE);
-}
-
-void CDeviceTexture::DownloadToStagingResource()
-{
-    // D3D12 doesn't allow direct copies from a buffer to a resource with multiple subresources, so copy each subresource
-    // one at a time.
-    for (uint32 subResource = 0; subResource < m_numSubResources; subResource++)
-    {
-        DownloadToStagingResource(subResource);
-    }
-}
-
-void CDeviceTexture::UploadFromStagingResource(uint32 nSubRes, StagingHook cbTransfer)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-    D3D11_RESOURCE_DIMENSION eResourceDimension;
-    m_pD3DTexture->GetType(&eResourceDimension);
-
-    D3DResource* pStagingResource = GetCurrUploadStagingResource();
-    void* pStagingMemory = nullptr;
-    if (!pStagingResource)
-    {
-        pStagingResource = gcpRendD3D->m_DevMan.AllocateStagingResource(m_pD3DTexture, TRUE);
-    }
-
-    AZ_Assert(pStagingResource, "Null upload staging resource");
-
-    uint32 rowPitch = 0;
-
-    // The first call to Map allocates a CPU virtual address range for the resource.
-    // The last call to Unmap deallocates the CPU virtual address range.
-    // Applications cannot rely on the address being consistent, unless Map is persistently nested.
-    gcpRendD3D->GetDeviceContext().WaitStagingResource(pStagingResource);
-    gcpRendD3D->GetDeviceContext().MapStagingResource(m_pD3DTexture, pStagingResource, nSubRes, TRUE, &pStagingMemory, &rowPitch);
-
-    if (cbTransfer(pStagingMemory, rowPitch, 0))
-    {
-        gcpRendD3D->GetDeviceContext().CopyStagingResource(pStagingResource, m_pD3DTexture, nSubRes, TRUE);
-    }
-
-    // Unmap also flushes the CPU cache, when necessary, so that GPU reads to this
-    // address reflect any modifications made by the CPU.
-    gcpRendD3D->GetDeviceContext().UnmapStagingResource(pStagingResource, TRUE);
-
-    if (!GetCurrUploadStagingResource())
-    {
-        gcpRendD3D->m_DevMan.ReleaseStagingResource(pStagingResource);
-    }
-}
-
-void CDeviceTexture::UploadFromStagingResource(uint32 nSubRes)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-    AZ_Assert(GetCurrUploadStagingResource(), "Null upload staging resource");
-
-    gcpRendD3D->GetDeviceContext().CopyStagingResource(GetCurrUploadStagingResource(), m_pD3DTexture, nSubRes, TRUE);
-}
-
-void CDeviceTexture::UploadFromStagingResource()
-{
-    // D3D12 doesn't allow direct copies from a buffer to a resource with multiple subresources, so copy each subresource
-    // one at a time.
-    for (uint32 subResource = 0; subResource < m_numSubResources; subResource++)
-    {
-        UploadFromStagingResource(subResource);
-    }
-}
-
-void CDeviceTexture::AccessCurrStagingResource(uint32 nSubRes, bool forUpload, StagingHook cbTransfer)
-{
-    AZ_Assert(nSubRes < m_numSubResources, "Invalid SubResource ID %d, (should be < %d)", nSubRes, m_numSubResources);
-
-    void** stagingMemoryPtr = GetCurrStagingMemoryPtr(forUpload);
-    D3DResource *stagingResource = GetCurrStagingResource(forUpload);
-    uint32 rowPitch = 0;
-
-    // Resources on D3D12_HEAP_TYPE_READBACK heaps do not support persistent map.
-    // Applications cannot rely on the address being consistent, unless Map is persistently nested.
-    gcpRendD3D->GetDeviceContext().WaitStagingResource(stagingResource);
-    gcpRendD3D->GetDeviceContext().MapStagingResource(m_pD3DTexture, stagingResource, nSubRes, forUpload, stagingMemoryPtr, &rowPitch);
-
-    cbTransfer(*stagingMemoryPtr, rowPitch, 0);
-
-    gcpRendD3D->GetDeviceContext().UnmapStagingResource(stagingResource, forUpload);
-}
-
-
-//=============================================================================
-
-HRESULT CDeviceManager::Create2DTexture(const string& textureName, uint32 nWidth, uint32 nHeight, uint32 nMips, uint32 nArraySize, uint32 nUsage, const ColorF& cClearValue, D3DFormat Format, [[maybe_unused]] D3DPOOL Pool,
-    LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI, [[maybe_unused]] bool bShouldBeCreated, [[maybe_unused]] int32 nESRAMOffset)
-{
-    HRESULT hr = S_OK;
-
-    CDeviceTexture* pDeviceTexture = 0;//*/ new CDeviceTexture();
-    D3DTexture* pD3DTex = NULL;
-
-    uint32 nBindFlags = D3D11_BIND_SHADER_RESOURCE;
-    if (nUsage & USAGE_DEPTH_STENCIL)
-    {
-        nBindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-    else if (nUsage & USAGE_RENDER_TARGET)
-    {
-        nBindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-    if (nUsage & USAGE_UNORDERED_ACCESS)
-    {
-        nBindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-    uint32 nMiscFlags = 0;
-    if (nUsage & USAGE_AUTOGENMIPS)
-    {
-        nMiscFlags |= D3D11_RESOURCE_MISC_GENERATE_MIPS;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D12_INL_SECTION_1
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D12)
-#endif
-
-    D3D11_TEXTURE2D_DESC Desc;
-    ZeroStruct(Desc);
-    Desc.Width = nWidth;
-    Desc.Height = nHeight;
-    Desc.MipLevels = nMips;
-    Desc.Format = Format;
-    Desc.ArraySize = nArraySize;
-    Desc.BindFlags = nBindFlags;
-    Desc.CPUAccessFlags = (nUsage & USAGE_DYNAMIC) ? D3D11_CPU_ACCESS_WRITE : 0;
-
-    Desc.Usage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
-    Desc.Usage = (nUsage & USAGE_STAGING) ? D3D11_USAGE_STAGING : Desc.Usage;
-
-    Desc.SampleDesc.Count = pTI ? pTI->m_nMSAASamples : 1;
-    Desc.SampleDesc.Quality = pTI ? pTI->m_nMSAAQuality : 0;
-    // AntonK: supported only by DX11 feature set
-    // needs to be enabled for pure DX11 context
-    //if(nUsage & USAGE_STREAMING)
-    //nMiscFlags |= D3D11_RESOURCE_MISC_RESOURCE_CLAMP;
-    //if (nUsage & USAGE_STREAMING)
-    //    Desc.CPUAccessFlags |= D3D11_CPU_ACCESS_READ;
-    Desc.MiscFlags = nMiscFlags;
-
-    D3D11_SUBRESOURCE_DATA* pSRD = NULL;
-    D3D11_SUBRESOURCE_DATA SRD[20];
-    if (pTI && pTI->m_pData)
-    {
-        pSRD = &SRD[0];
-        for (int i = 0; i < nMips; i++)
-        {
-            SRD[i].pSysMem = pTI->m_pData[i].pSysMem;
-            SRD[i].SysMemPitch = pTI->m_pData[i].SysMemPitch;
-            SRD[i].SysMemSlicePitch = pTI->m_pData[i].SysMemSlicePitch;
-        }
-    }
-
-    if (nUsage & (USAGE_DEPTH_STENCIL | USAGE_RENDER_TARGET | USAGE_UNORDERED_ACCESS))
-    {
-        hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, (const FLOAT*)&cClearValue, pSRD, &pD3DTex);
-    }
-    else
-    {
-        hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, pSRD, &pD3DTex);
-    }
-
-    if (SUCCEEDED(hr) && pDeviceTexture == 0)
-    {
-        pDeviceTexture = new CDeviceTexture();
-    }
-
-    if (SUCCEEDED(hr) && pD3DTex)
-    {
-        pDeviceTexture->m_pD3DTexture = pD3DTex;
-        pDeviceTexture->m_numSubResources = nMips * nArraySize;
-
-        if (!pDeviceTexture->m_nBaseAllocatedSize)
-        {
-            pDeviceTexture->m_nBaseAllocatedSize = CDeviceTexture::TextureDataSize(nWidth, nHeight, 1, nMips, 1, CTexture::TexFormatFromDeviceFormat(Format));
-            pDeviceTexture->TrackTextureMemory(nUsage, textureName.c_str());
-        }
-
-        if (nUsage & USAGE_STAGE_ACCESS)
-        {
-            if (nUsage & USAGE_CPU_READ)
-            {
-                // Resources on D3D12_HEAP_TYPE_READBACK heaps do not support persistent map.
-                pDeviceTexture->m_pStagingResourceDownload = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, FALSE);
-            }
-            if (nUsage & USAGE_CPU_WRITE)
-            {
-                // Applications cannot rely on the address being consistent, unless Map is persistently nested.
-                for (int i = 0; i < CDeviceTexture::NUM_UPLOAD_STAGING_RES; i++)
-                {
-                    uint32 rowPitch = 0;
-                    pDeviceTexture->m_pStagingResourceUpload[i] = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, TRUE);
-                    gcpRendD3D->GetDeviceContext().MapStagingResource(pD3DTex, pDeviceTexture->m_pStagingResourceUpload[i], 0, TRUE, &pDeviceTexture->m_pStagingMemoryUpload[i], &rowPitch);
-                }
-            }
-        }
-    }
-    else
-    {
-        SAFE_DELETE(pDeviceTexture);
-    }
-
-    *ppDevTexture = pDeviceTexture;
-
-    return hr;
-}
-
-HRESULT CDeviceManager::CreateCubeTexture(const string& textureName, uint32 nSize, uint32 nMips, uint32 nArraySize, uint32 nUsage, const ColorF& cClearValue, D3DFormat Format, [[maybe_unused]] D3DPOOL Pool, LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI, [[maybe_unused]] bool bShouldBeCreated)
-{
-    HRESULT hr = S_OK;
-
-    CDeviceTexture* pDeviceTexture = 0;//new CDeviceTexture();
-    D3DCubeTexture* pD3DTex = NULL;
-
-    uint32 nBindFlags = D3D11_BIND_SHADER_RESOURCE;
-    uint32 nMiscFlags = D3D11_RESOURCE_MISC_TEXTURECUBE;
-    if (nUsage & USAGE_DEPTH_STENCIL)
-    {
-        nBindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-    else if (nUsage & USAGE_RENDER_TARGET)
-    {
-        nBindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-    if (nUsage & USAGE_AUTOGENMIPS)
-    {
-        nMiscFlags |= D3D11_RESOURCE_MISC_GENERATE_MIPS;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D12_INL_SECTION_1
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D12)
-#endif
-
-    D3D11_TEXTURE2D_DESC Desc;
-    ZeroStruct(Desc);
-    Desc.Width = nSize;
-    Desc.Height = nSize;
-    Desc.MipLevels = nMips;
-    Desc.Format = Format;
-    Desc.ArraySize = nArraySize * 6;
-    Desc.BindFlags |= nBindFlags;
-    Desc.CPUAccessFlags = (nUsage & USAGE_DYNAMIC) ? D3D11_CPU_ACCESS_WRITE : 0;
-    Desc.Usage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
-    Desc.SampleDesc.Count = 1;
-    Desc.SampleDesc.Quality = 0;
-    Desc.MiscFlags = nMiscFlags;
-    // AntonK: supported only by DX11 feature set
-    // needs to be enabled for pure DX11 context
-    //if(nUsage & USAGE_STREAMING)
-    //Desc.MiscFlags |= D3D11_RESOURCE_MISC_RESOURCE_CLAMP;
-
-    D3D11_SUBRESOURCE_DATA* pSRD = NULL;
-    D3D11_SUBRESOURCE_DATA SRD[g_nD3D10MaxSupportedSubres];
-    if (pTI && pTI->m_pData)
-    {
-        pSRD = &SRD[0];
-        for (int j = 0; j < 6; j++)
-        {
-            for (int i = 0; i < nMips; i++)
-            {
-                int nSubresInd = j * nMips + i;
-                SRD[nSubresInd].pSysMem = pTI->m_pData[nSubresInd].pSysMem;
-                SRD[nSubresInd].SysMemPitch = pTI->m_pData[nSubresInd].SysMemPitch;
-                SRD[nSubresInd].SysMemSlicePitch = pTI->m_pData[nSubresInd].SysMemSlicePitch;
-            }
-        }
-    }
-
-    if (nUsage & (USAGE_DEPTH_STENCIL | USAGE_RENDER_TARGET | USAGE_UNORDERED_ACCESS))
-    {
-        hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, (const FLOAT*)&cClearValue, pSRD, &pD3DTex);
-    }
-    else
-    {
-        hr = gcpRendD3D->GetDevice().CreateTexture2D(&Desc, pSRD, &pD3DTex);
-    }
-
-    if (SUCCEEDED(hr) && pDeviceTexture == 0)
-    {
-        pDeviceTexture = new CDeviceTexture();
-    }
-
-    if (SUCCEEDED(hr) && pD3DTex)
-    {
-        pDeviceTexture->m_pD3DTexture = pD3DTex;
-        pDeviceTexture->m_bCube = true;
-        pDeviceTexture->m_numSubResources = nMips * nArraySize;
-
-        if (!pDeviceTexture->m_nBaseAllocatedSize)
-        {
-            pDeviceTexture->m_nBaseAllocatedSize = CDeviceTexture::TextureDataSize(nSize, nSize, 1, nMips, 1, CTexture::TexFormatFromDeviceFormat(Format)) * 6;
-            pDeviceTexture->TrackTextureMemory(nUsage, textureName.c_str());
-        }
-
-        if (nUsage & USAGE_STAGE_ACCESS)
-        {
-            if (nUsage & USAGE_CPU_READ)
-            {
-                // Resources on D3D12_HEAP_TYPE_READBACK heaps do not support persistent map.
-                pDeviceTexture->m_pStagingResourceDownload = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, FALSE);
-            }
-            if (nUsage & USAGE_CPU_WRITE)
-            {
-                // Applications cannot rely on the address being consistent, unless Map is persistently nested.
-                for (int i = 0; i < CDeviceTexture::NUM_UPLOAD_STAGING_RES; i++)
-                {
-                    uint32 rowPitch = 0;
-                    pDeviceTexture->m_pStagingResourceUpload[i] = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, TRUE);
-                    gcpRendD3D->GetDeviceContext().MapStagingResource(pD3DTex, pDeviceTexture->m_pStagingResourceUpload[i], 0, TRUE, &pDeviceTexture->m_pStagingMemoryUpload[i], &rowPitch);
-                }
-            }
-        }
-    }
-    else
-    {
-        SAFE_DELETE(pDeviceTexture);
-    }
-
-    *ppDevTexture = pDeviceTexture;
-    return hr;
-}
-
-HRESULT CDeviceManager::CreateVolumeTexture(const string& textureName, uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nUsage, const ColorF& cClearValue, D3DFormat Format, [[maybe_unused]] D3DPOOL Pool, LPDEVICETEXTURE* ppDevTexture, STextureInfo* pTI)
-{
-    HRESULT hr = S_OK;
-    CDeviceTexture* pDeviceTexture = new CDeviceTexture();
-    D3DVolumeTexture* pD3DTex = NULL;
-    uint32 nBindFlags = D3D11_BIND_SHADER_RESOURCE;
-    if (nUsage & USAGE_DEPTH_STENCIL)
-    {
-        nBindFlags |= D3D11_BIND_DEPTH_STENCIL;
-    }
-    else if (nUsage & USAGE_RENDER_TARGET)
-    {
-        nBindFlags |= D3D11_BIND_RENDER_TARGET;
-    }
-    if (nUsage & USAGE_UNORDERED_ACCESS)
-    {
-        nBindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-    }
-
-    uint32 nMiscFlags = 0;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DEVICEMANAGER_D3D12_INL_SECTION_1
-    #include AZ_RESTRICTED_FILE(DeviceManager_D3D12)
-#endif
-
-    D3D11_TEXTURE3D_DESC Desc;
-    ZeroStruct(Desc);
-    Desc.Width = nWidth;
-    Desc.Height = nHeight;
-    Desc.Depth = nDepth;
-    Desc.MipLevels = nMips;
-    Desc.Format = (nUsage & USAGE_UAV_RWTEXTURE) ? CTexture::ConvertToTypelessFmt(Format) : Format;
-    Desc.BindFlags = nBindFlags;
-    Desc.CPUAccessFlags = 0;
-    Desc.MiscFlags = nMiscFlags;
-
-    Desc.Usage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
-    Desc.Usage = (nUsage & USAGE_STAGING) ? D3D11_USAGE_STAGING : Desc.Usage;
-
-    Desc.MiscFlags = 0;
-    D3D11_SUBRESOURCE_DATA* pSRD = NULL;
-    D3D11_SUBRESOURCE_DATA SRD[20] = { D3D11_SUBRESOURCE_DATA() };
-    if (pTI && pTI->m_pData)
-    {
-        pSRD = &SRD[0];
-        for (int i = 0; i < nMips; i++)
-        {
-            SRD[i].pSysMem = pTI->m_pData[i].pSysMem;
-            SRD[i].SysMemPitch = pTI->m_pData[i].SysMemPitch;
-            SRD[i].SysMemSlicePitch = pTI->m_pData[i].SysMemSlicePitch;
-        }
-    }
-
-    if (nUsage & (USAGE_DEPTH_STENCIL | USAGE_RENDER_TARGET | USAGE_UNORDERED_ACCESS))
-    {
-        hr = gcpRendD3D->GetDevice().CreateTexture3D(&Desc, (const FLOAT*)&cClearValue, pSRD, &pD3DTex);
-    }
-    else
-    {
-        hr = gcpRendD3D->GetDevice().CreateTexture3D(&Desc, pSRD, &pD3DTex);
-    }
-
-    if (SUCCEEDED(hr) && pD3DTex)
-    {
-        pDeviceTexture->m_pD3DTexture = pD3DTex;
-        pDeviceTexture->m_numSubResources = nMips;
-
-        if (!pDeviceTexture->m_nBaseAllocatedSize)
-        {
-            pDeviceTexture->m_nBaseAllocatedSize = CDeviceTexture::TextureDataSize(nWidth, nHeight, nDepth, nMips, 1, CTexture::TexFormatFromDeviceFormat(Format));
-            pDeviceTexture->TrackTextureMemory(nUsage, textureName.c_str());
-        }
-
-        if (nUsage & USAGE_STAGE_ACCESS)
-        {
-            if (nUsage & USAGE_CPU_READ)
-            {
-                // Resources on D3D12_HEAP_TYPE_READBACK heaps do not support persistent map.
-                pDeviceTexture->m_pStagingResourceDownload = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, FALSE);
-            }
-            if (nUsage & USAGE_CPU_WRITE)
-            {
-                // Applications cannot rely on the address being consistent, unless Map is persistently nested.
-                for (int i = 0; i < CDeviceTexture::NUM_UPLOAD_STAGING_RES; i++)
-                {
-                    uint32 rowPitch = 0;
-                    pDeviceTexture->m_pStagingResourceUpload[i] = gcpRendD3D->m_DevMan.AllocateStagingResource(pDeviceTexture->m_pD3DTexture, TRUE);
-                    gcpRendD3D->GetDeviceContext().MapStagingResource(pD3DTex, pDeviceTexture->m_pStagingResourceUpload[i], 0, TRUE, &pDeviceTexture->m_pStagingMemoryUpload[i], &rowPitch);
-                }
-            }
-        }
-    }
-    else
-    {
-        SAFE_DELETE(pDeviceTexture);
-    }
-
-    *ppDevTexture = pDeviceTexture;
-    return hr;
-}
-
-HRESULT CDeviceManager::CreateBuffer(
-    uint32 nSize
-    , uint32 elemSize
-    , int32 nUsage
-    , int32 nBindFlags
-    , D3DBuffer** ppBuff)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    HRESULT hr = S_OK;
-
-# ifndef _RELEASE
-    // ToDo verify that the usage and bindflags are correctly set (e.g certain
-    // bit groups are mutually exclusive).
-# endif
-
-    D3D11_BUFFER_DESC BufDesc;
-    ZeroStruct(BufDesc);
-
-    BufDesc.ByteWidth = nSize * elemSize;
-    int nD3DUsage = D3D11_USAGE_DEFAULT;
-    nD3DUsage = (nUsage & USAGE_DYNAMIC) ? D3D11_USAGE_DYNAMIC : nD3DUsage;
-    nD3DUsage = (nUsage & USAGE_IMMUTABLE) ? D3D11_USAGE_IMMUTABLE : nD3DUsage;
-    nD3DUsage = (nUsage & USAGE_STAGING) ? D3D11_USAGE_STAGING : nD3DUsage;
-    BufDesc.Usage = (D3D11_USAGE)nD3DUsage;
-
-    if (BufDesc.Usage != D3D11_USAGE_STAGING)
-    {
-        switch (nBindFlags)
-        {
-        case BIND_VERTEX_BUFFER:
-            BufDesc.BindFlags |= D3D11_BIND_VERTEX_BUFFER;
-            break;
-        case BIND_INDEX_BUFFER:
-            BufDesc.BindFlags |= D3D11_BIND_INDEX_BUFFER;
-            break;
-        case BIND_CONSTANT_BUFFER:
-            BufDesc.BindFlags |= D3D11_BIND_CONSTANT_BUFFER;
-            break;
-
-        case BIND_SHADER_RESOURCE:
-        case BIND_UNORDERED_ACCESS:
-            if (nBindFlags & BIND_SHADER_RESOURCE)
-            {
-                BufDesc.BindFlags |= D3D11_BIND_SHADER_RESOURCE;
-            }
-            if (nBindFlags & BIND_UNORDERED_ACCESS)
-            {
-                BufDesc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-            }
-            break;
-
-        case BIND_STREAM_OUTPUT:
-        case BIND_RENDER_TARGET:
-        case BIND_DEPTH_STENCIL:
-            CryFatalError("trying to create (currently) unsupported buffer type");
-            break;
-
-        default:
-            CryFatalError("trying to create unknown buffer type");
-            break;
-        }
-    }
-    else
-    {
-        BufDesc.BindFlags = 0;
-    }
-
-    BufDesc.MiscFlags = 0;
-    BufDesc.CPUAccessFlags = 0;
-    if (BufDesc.Usage != D3D11_USAGE_DEFAULT && BufDesc.Usage != D3D11_USAGE_IMMUTABLE)
-    {
-        BufDesc.CPUAccessFlags = (nUsage & USAGE_CPU_WRITE) ? D3D11_CPU_ACCESS_WRITE : 0;
-        BufDesc.CPUAccessFlags |= (nUsage & USAGE_CPU_READ) ? D3D11_CPU_ACCESS_READ : 0;
-    }
-
-    if (nBindFlags & BIND_UNORDERED_ACCESS)
-    {
-        BufDesc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED;
-    }
-
-    hr = gcpRendD3D->GetDevice().CreateBuffer(&BufDesc, NULL, (ID3D11Buffer**)ppBuff);
-    static_cast<CCryDX12Buffer*>(*ppBuff)->GetD3D12Resource()->SetName(L"DevBuffer");
-    CHECK_HRESULT(hr);
-
-    Render::Debug::VRAMAllocationSubcategory subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_OTHER_BUFFER;
-    if (BufDesc.Usage & D3D11_BIND_VERTEX_BUFFER)
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_VERTEX_BUFFER;
-    }
-    else if (BufDesc.Usage & D3D11_BIND_INDEX_BUFFER)
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_INDEX_BUFFER;
-    }
-    else if (BufDesc.Usage & D3D11_BIND_CONSTANT_BUFFER)
-    {
-        subcategory = Render::Debug::VRAM_SUBCATEGORY_BUFFER_CONSTANT_BUFFER;
-    }
-
-    void* address = static_cast<void*>(*ppBuff);
-    size_t byteSize = BufDesc.ByteWidth;
-
-    EBUS_EVENT(Render::Debug::VRAMDrillerBus, RegisterAllocation, address, byteSize, "CDeviceManager::CreateBuffer", Render::Debug::VRAM_CATEGORY_BUFFER, subcategory);
-
-    return hr;
-}
-
-void CDeviceManager::ExtractBasePointer(D3DBuffer* buffer, uint8*& base_ptr)
-{
-    D3D11_MAPPED_SUBRESOURCE mappedResource;
-    HRESULT hr = gcpRendD3D->GetDeviceContext().Map(buffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mappedResource);
-    CHECK_HRESULT(hr);
-    base_ptr = (uint8*)mappedResource.pData;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12.cpp
deleted file mode 100644
index cc80bb7fad..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12.cpp
+++ /dev/null
@@ -1,975 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DeviceWrapper12.h"
-#include "DriverD3D.h"
-#include "../../Common/ReverseDepth.h"
-#include "../../Common/Textures/TextureHelpers.h"
-#include "../GraphicsPipeline/Common/GraphicsPipelineStateSet.h"
-#include <AzCore/std/hash.h>
-
-extern uint8 g_StencilFuncLookup[8];
-extern uint8 g_StencilOpLookup[8];
-
-volatile int CDeviceResourceSet::s_dirtyCount = 0;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- 
-bool SDeviceObjectHelpers::GetShaderInstanceInfo(std::array<SDeviceObjectHelpers::SShaderInstanceInfo, eHWSC_Num>& shaderInstanceInfos, CShader* pShader, const CCryNameTSCRC& technique, uint64 rtFlags, uint32 mdFlags, uint32 mdvFlags, UPipelineState pipelineState[eHWSC_Num], bool bAllowTesselation)
-{
-    bool shadersAvailable = true;
-    if (SShaderTechnique* pShaderTechnique = pShader->mfFindTechnique(technique))
-    {
-        SShaderPass& shaderPass = pShaderTechnique->m_Passes[0];
-
-        CHWShader* pHWShaders[] =
-        {
-            shaderPass.m_VShader,
-            shaderPass.m_PShader,
-            shaderPass.m_GShader,
-            shaderPass.m_CShader,
-            shaderPass.m_DShader,
-            shaderPass.m_HShader,
-        };
-
-        for (EHWShaderClass shaderStage = eHWSC_Vertex; shaderStage < eHWSC_Num; shaderStage = EHWShaderClass(shaderStage + 1))
-        {
-            if (!bAllowTesselation && (shaderStage == eHWSC_Hull || shaderStage == eHWSC_Domain))
-            {
-                continue;
-            }
-
-            CHWShader_D3D* pHWShaderD3D = reinterpret_cast<CHWShader_D3D*>(pHWShaders[shaderStage]);
-            shaderInstanceInfos[shaderStage].pHwShader = pHWShaderD3D;
-            shaderInstanceInfos[shaderStage].technique = technique;
-
-            if (pHWShaderD3D)
-            {
-                SShaderCombIdent Ident;
-                Ident.m_LightMask = 0;
-                Ident.m_RTMask = rtFlags & pHWShaderD3D->m_nMaskAnd_RT | pHWShaderD3D->m_nMaskOr_RT;
-                Ident.m_MDMask = mdFlags & (shaderStage != eHWSC_Pixel ? 0xFFFFFFFF : ~HWMD_TEXCOORD_FLAG_MASK);
-                Ident.m_MDVMask = ((shaderStage != eHWSC_Pixel) ? mdvFlags : 0) | CParserBin::m_nPlatform;
-                Ident.m_GLMask = pHWShaderD3D->m_nMaskGenShader;
-                Ident.m_STMask = pHWShaderD3D->m_maskGenStatic;
-                Ident.m_pipelineState = pipelineState ? pipelineState[shaderStage] : UPipelineState();
-
-                if (auto pInstance = pHWShaderD3D->mfGetInstance(pShader, Ident, 0))
-                {
-                    if (pHWShaderD3D->mfCheckActivation(pShader, pInstance, 0))
-                    {
-                        shaderInstanceInfos[shaderStage].pHwShaderInstance = pInstance;
-                        shaderInstanceInfos[shaderStage].pDeviceShader = pInstance->m_Handle.m_pShader->m_pHandle;
-                    }
-                    else
-                    {
-                        shadersAvailable = false;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return shadersAvailable;
-}
-
-bool SDeviceObjectHelpers::GetConstantBuffersFromShader(std::vector<SDeviceObjectHelpers::SConstantBufferBindInfo>& constantBufferInfos, CShader* pShader, const CCryNameTSCRC& technique, uint64 rtFlags, uint32 mdFlags, uint32 mdvFlags)
-{
-    constantBufferInfos.clear();
-
-    std::array<SDeviceObjectHelpers::SShaderInstanceInfo, eHWSC_Num> hwShaders;
-    bool shadersAvailable = GetShaderInstanceInfo(hwShaders, pShader, technique, rtFlags, mdFlags, mdvFlags, nullptr, true);
-    if (!shadersAvailable)
-        return false;
-
-    for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass < eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-    {
-        if (hwShaders[shaderClass].pHwShader && hwShaders[shaderClass].pHwShaderInstance)
-        {
-            VectorSet<EConstantBufferShaderSlot> usedBuffersSlots;
-            auto* pInstance = reinterpret_cast<CHWShader_D3D::SHWSInstance*>(hwShaders[shaderClass].pHwShaderInstance);
-
-            const int vectorCount[] =
-            {
-                pInstance->m_nMaxVecs[eConstantBufferShaderSlot_PerBatch],
-                pInstance->m_nMaxVecs[eConstantBufferShaderSlot_PerInstanceLegacy]
-            };
-
-            for (const auto& bind : pInstance->m_pBindVars)
-            {
-                if ((bind.m_RegisterOffset & (SHADER_BIND_TEXTURE | SHADER_BIND_SAMPLER)) == 0)
-                {
-                    usedBuffersSlots.insert(EConstantBufferShaderSlot(bind.m_BindingSlot));
-                }
-            }
-
-            for (auto bufferSlot : usedBuffersSlots)
-            {
-                SDeviceObjectHelpers::SConstantBufferBindInfo bindInfo;
-                bindInfo.shaderClass = shaderClass;
-                bindInfo.shaderSlot = bufferSlot;
-                bindInfo.vectorCount = vectorCount[bufferSlot];
-                bindInfo.pBuffer.attach(gcpRendD3D->m_DevBufMan.CreateConstantBuffer(
-                    "ReflectedConstantBuffer",
-                    bindInfo.vectorCount * sizeof(Vec4),
-                    AzRHI::ConstantBufferUsage::Dynamic,
-                    AzRHI::ConstantBufferFlags::None));
-                bindInfo.pPreviousBuffer = nullptr;
-
-                bindInfo.shaderInfo.pHwShader = hwShaders[shaderClass].pHwShader;
-                bindInfo.shaderInfo.pHwShaderInstance = hwShaders[shaderClass].pHwShaderInstance;
-                bindInfo.shaderInfo.pDeviceShader = hwShaders[shaderClass].pDeviceShader;
-
-                constantBufferInfos.push_back(bindInfo);
-            }
-        }
-    }
-    return true;
-}
-
-
-void SDeviceObjectHelpers::BeginUpdateConstantBuffers(std::vector<SDeviceObjectHelpers::SConstantBufferBindInfo>& constantBuffers)
-{
-    AzRHI::ConstantBufferCache& cache = AzRHI::ConstantBufferCache::GetInstance();
-    for (auto& cb : constantBuffers)
-    {
-        cache.BeginExternalConstantBuffer(
-            (EHWShaderClass)cb.shaderClass,
-            (EConstantBufferShaderSlot)cb.shaderSlot,
-            cb.pBuffer,
-            cb.vectorCount);
-    }
-}
-
-void SDeviceObjectHelpers::EndUpdateConstantBuffers(std::vector<SDeviceObjectHelpers::SConstantBufferBindInfo>& constantBuffers)
-{
-    // set per batch and per instance parameters
-    auto setParams = [&](EHWShaderClass shaderClass, bool bPerBatch, bool bPerInstance)
-        {
-            for (auto& cb : constantBuffers)
-            {
-                if (cb.shaderClass == shaderClass)
-                {
-                    auto pHwShader = cb.shaderInfo.pHwShader;
-                    auto pHwShaderInstance = reinterpret_cast<CHWShader_D3D::SHWSInstance*>(cb.shaderInfo.pHwShaderInstance);
-
-                    if (pHwShader && pHwShaderInstance)
-                    {
-                        pHwShader->m_pCurInst = pHwShaderInstance;
-
-                        if (bPerBatch)
-                        {
-                            pHwShader->UpdatePerBatchConstantBuffer();
-                        }
-                        if (bPerInstance)
-                        {
-                            pHwShader->UpdatePerInstanceConstantBuffer();
-                        }
-                    }
-
-                    break;
-                }
-            }
-        };
-
-    setParams(eHWSC_Pixel,    true, true);
-    setParams(eHWSC_Vertex,   true, true);
-    setParams(eHWSC_Geometry, true, false);
-    setParams(eHWSC_Compute,  true, false);
-
-    AzRHI::ConstantBufferCache& cache = AzRHI::ConstantBufferCache::GetInstance();
-    for (auto& cb : constantBuffers)
-    {
-        cache.EndExternalConstantBuffer(EHWShaderClass(cb.shaderClass), EConstantBufferShaderSlot(cb.shaderSlot));
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-CDeviceGraphicsPSODesc::CDeviceGraphicsPSODesc(CDeviceResourceLayout* pResourceLayout, const SGraphicsPipelineStateDescription& pipelineDesc)
-{
-    InitWithDefaults();
-
-    m_pResourceLayout = pResourceLayout;
-    m_pShader = reinterpret_cast<CShader*>(pipelineDesc.shaderItem.m_pShader);
-    if (auto pTech = m_pShader->GetTechnique(pipelineDesc.shaderItem.m_nTechnique, pipelineDesc.technique))
-    {
-        m_technique   = pTech->m_NameCRC;
-    }
-
-    m_ShaderFlags_RT   = pipelineDesc.objectRuntimeMask;
-    m_ShaderFlags_MDV  = pipelineDesc.objectFlags_MDV;
-    m_VertexFormat     = pipelineDesc.vertexFormat;
-    m_ObjectStreamMask = pipelineDesc.streamMask;
-    m_PrimitiveType    = (eRenderPrimitiveType)pipelineDesc.primitiveType;
-}
-
-
-CDeviceGraphicsPSODesc::CDeviceGraphicsPSODesc(CDeviceResourceLayout* pResourceLayout, CShader* pShader, const CCryNameTSCRC& technique, uint64 rtFlags, uint32 mdFlags, uint32 mdvFlags, bool bAllowTessellation)
-{
-    InitWithDefaults();
-
-    m_pResourceLayout   = pResourceLayout;
-    m_pShader           = pShader;
-    m_technique         = technique;
-    m_bAllowTesselation = bAllowTessellation;
-    m_ShaderFlags_RT    = rtFlags;
-    m_ShaderFlags_MD    = mdFlags;
-    m_ShaderFlags_MDV   = mdvFlags;
-}
-
-void CDeviceGraphicsPSODesc::InitWithDefaults()
-{
-    ZeroStruct(*this);
-
-    m_StencilState       = STENC_FUNC(FSS_STENCFUNC_ALWAYS) | STENCOP_FAIL(FSS_STENCOP_KEEP) | STENCOP_ZFAIL(FSS_STENCOP_KEEP) | STENCOP_PASS(FSS_STENCOP_KEEP);
-    m_StencilReadMask    = D3D11_DEFAULT_STENCIL_READ_MASK;
-    m_StencilWriteMask   = D3D11_DEFAULT_STENCIL_WRITE_MASK;
-    m_VertexFormat       = eVF_P3F_C4B_T2S;
-    m_CullMode           = eCULL_Back;
-    m_PrimitiveType      = eptTriangleList;
-    m_DepthStencilFormat = eTF_Unknown;
-    m_RenderTargetFormats.fill(eTF_Unknown);
-}
-
-CDeviceGraphicsPSODesc::CDeviceGraphicsPSODesc(const CDeviceGraphicsPSODesc& other)
-{
-    *this = other;
-}
-
-AZ::u32 CDeviceGraphicsPSODesc::GetHash() const
-{
-    return m_Hash;
-}
-
-void CDeviceGraphicsPSODesc::FillDescs(D3D11_RASTERIZER_DESC& rasterizerDesc, D3D11_BLEND_DESC& blendDesc, D3D11_DEPTH_STENCIL_DESC& depthStencilDesc) const
-{
-    const uint32 renderState = m_RenderState;
-
-    ZeroMemory(&rasterizerDesc, sizeof(D3D11_RASTERIZER_DESC));
-    ZeroMemory(&blendDesc, sizeof(D3D11_BLEND_DESC));
-    ZeroMemory(&depthStencilDesc, sizeof(D3D11_DEPTH_STENCIL_DESC));
-
-    // Fill mode
-    rasterizerDesc.DepthClipEnable = 1;
-    rasterizerDesc.FrontCounterClockwise = 1;
-    rasterizerDesc.FillMode = (renderState & GS_WIREFRAME) ? D3D11_FILL_WIREFRAME : D3D11_FILL_SOLID;
-    rasterizerDesc.CullMode =
-        (m_CullMode == eCULL_Back)
-        ? D3D11_CULL_BACK
-        : ((m_CullMode == eCULL_None) ? D3D11_CULL_NONE : D3D11_CULL_FRONT);
-
-    // Blend state
-    {
-        const bool bBlendEnable = (renderState & GS_BLEND_MASK) != 0;
-
-        for (size_t i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            blendDesc.RenderTarget[i].BlendEnable = bBlendEnable;
-        }
-
-        if (bBlendEnable)
-        {
-            const uint32 SrcFactorShift = 0;
-            const uint32 DstFactorShift = 4;
-            const uint32 BlendOpShift = 24;
-            const uint32 BlendAlphaOpShift = 26;
-
-            struct BlendFactors
-            {
-                D3D11_BLEND BlendColor;
-                D3D11_BLEND BlendAlpha;
-            };
-
-            BlendFactors SrcBlendFactors[GS_BLSRC_MASK >> SrcFactorShift] =
-            {
-                { (D3D11_BLEND)0,                 (D3D11_BLEND)0 },                 // UNINITIALIZED BLEND FACTOR
-                { D3D11_BLEND_ZERO,               D3D11_BLEND_ZERO },              // GS_BLSRC_ZERO
-                { D3D11_BLEND_ONE,                D3D11_BLEND_ONE },               // GS_BLSRC_ONE
-                { D3D11_BLEND_DEST_COLOR,         D3D11_BLEND_DEST_ALPHA },        // GS_BLSRC_DSTCOL
-                { D3D11_BLEND_INV_DEST_COLOR,     D3D11_BLEND_INV_DEST_ALPHA },    // GS_BLSRC_ONEMINUSDSTCOL
-                { D3D11_BLEND_SRC_ALPHA,          D3D11_BLEND_SRC_ALPHA },         // GS_BLSRC_SRCALPHA
-                { D3D11_BLEND_INV_SRC_ALPHA,      D3D11_BLEND_INV_SRC_ALPHA },     // GS_BLSRC_ONEMINUSSRCALPHA
-                { D3D11_BLEND_DEST_ALPHA,         D3D11_BLEND_DEST_ALPHA },        // GS_BLSRC_DSTALPHA
-                { D3D11_BLEND_INV_DEST_ALPHA,     D3D11_BLEND_INV_DEST_ALPHA },    // GS_BLSRC_ONEMINUSDSTALPHA
-                { D3D11_BLEND_SRC_ALPHA_SAT,      D3D11_BLEND_SRC_ALPHA_SAT },     // GS_BLSRC_ALPHASATURATE
-                { D3D11_BLEND_SRC_ALPHA,          D3D11_BLEND_ZERO },              // GS_BLSRC_SRCALPHA_A_ZERO
-                { D3D11_BLEND_SRC1_ALPHA,         D3D11_BLEND_SRC1_ALPHA },        // GS_BLSRC_SRC1ALPHA
-            };
-
-            BlendFactors DstBlendFactors[GS_BLDST_MASK >> DstFactorShift] =
-            {
-                { (D3D11_BLEND)0,                 (D3D11_BLEND)0 },                 // UNINITIALIZED BLEND FACTOR
-                { D3D11_BLEND_ZERO,               D3D11_BLEND_ZERO },              // GS_BLDST_ZERO
-                { D3D11_BLEND_ONE,                D3D11_BLEND_ONE },               // GS_BLDST_ONE
-                { D3D11_BLEND_SRC_COLOR,          D3D11_BLEND_SRC_ALPHA },         // GS_BLDST_SRCCOL
-                { D3D11_BLEND_INV_SRC_COLOR,      D3D11_BLEND_INV_SRC_ALPHA },     // GS_BLDST_ONEMINUSSRCCOL
-                { D3D11_BLEND_SRC_ALPHA,          D3D11_BLEND_SRC_ALPHA },         // GS_BLDST_SRCALPHA
-                { D3D11_BLEND_INV_SRC_ALPHA,      D3D11_BLEND_INV_SRC_ALPHA },     // GS_BLDST_ONEMINUSSRCALPHA
-                { D3D11_BLEND_DEST_ALPHA,         D3D11_BLEND_DEST_ALPHA },        // GS_BLDST_DSTALPHA
-                { D3D11_BLEND_INV_DEST_ALPHA,     D3D11_BLEND_INV_DEST_ALPHA },    // GS_BLDST_ONEMINUSDSTALPHA
-                { D3D11_BLEND_ONE,                D3D11_BLEND_ZERO },              // GS_BLDST_ONE_A_ZERO
-                { D3D11_BLEND_INV_SRC1_ALPHA,     D3D11_BLEND_INV_SRC1_ALPHA },    // GS_BLDST_ONEMINUSSRC1ALPHA
-            };
-
-            D3D11_BLEND_OP BlendOp[GS_BLEND_OP_MASK >> BlendOpShift] =
-            {
-                D3D11_BLEND_OP_ADD,     // 0 (unspecified): Default
-                D3D11_BLEND_OP_MAX,     // GS_BLOP_MAX / GS_BLALPHA_MAX
-                D3D11_BLEND_OP_MIN,     // GS_BLOP_MIN / GS_BLALPHA_MIN
-            };
-
-            blendDesc.RenderTarget[0].SrcBlend = SrcBlendFactors[(renderState & GS_BLSRC_MASK) >> SrcFactorShift].BlendColor;
-            blendDesc.RenderTarget[0].SrcBlendAlpha = SrcBlendFactors[(renderState & GS_BLSRC_MASK) >> SrcFactorShift].BlendAlpha;
-            blendDesc.RenderTarget[0].DestBlend = DstBlendFactors[(renderState & GS_BLDST_MASK) >> DstFactorShift].BlendColor;
-            blendDesc.RenderTarget[0].DestBlendAlpha = DstBlendFactors[(renderState & GS_BLDST_MASK) >> DstFactorShift].BlendAlpha;
-
-            for (size_t i = 0; i < RT_STACK_WIDTH; ++i)
-            {
-                blendDesc.RenderTarget[i].BlendOp = BlendOp[(renderState & GS_BLEND_OP_MASK) >> BlendOpShift];
-                blendDesc.RenderTarget[i].BlendOpAlpha = BlendOp[(renderState & GS_BLALPHA_MASK) >> BlendAlphaOpShift];
-            }
-
-            if (renderState & GS_BLALPHA_MASK)
-            {
-                blendDesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE;
-                blendDesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-            }
-        }
-    }
-
-    // Color mask
-    {
-        uint32 mask = 0xfffffff0 | ((renderState & GS_COLMASK_MASK) >> GS_COLMASK_SHIFT);
-        mask = (~mask) & 0xf;
-        for (uint32 i = 0; i < RT_STACK_WIDTH; ++i)
-        {
-            blendDesc.RenderTarget[i].RenderTargetWriteMask = mask;
-        }
-    }
-
-    // Depth-Stencil
-    {
-        depthStencilDesc.DepthWriteMask = (renderState & GS_DEPTHWRITE) ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO;
-        depthStencilDesc.DepthEnable = !(renderState & GS_NODEPTHTEST);
-
-        uint32 depthState = renderState;
-        if (gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-        {
-            depthState = ReverseDepthHelper::ConvertDepthFunc(renderState);
-        }
-
-        const uint32 DepthFuncShift = 20;
-        D3D11_COMPARISON_FUNC DepthFunc[GS_DEPTHFUNC_MASK >> DepthFuncShift] =
-        {
-            D3D11_COMPARISON_LESS_EQUAL,     // GS_DEPTHFUNC_LEQUAL
-            D3D11_COMPARISON_EQUAL,          // GS_DEPTHFUNC_EQUAL
-            D3D11_COMPARISON_GREATER,        // GS_DEPTHFUNC_GREAT
-            D3D11_COMPARISON_LESS,           // GS_DEPTHFUNC_LESS
-            D3D11_COMPARISON_GREATER_EQUAL,  // GS_DEPTHFUNC_GEQUAL
-            D3D11_COMPARISON_NOT_EQUAL,      // GS_DEPTHFUNC_NOTEQUAL
-            D3D11_COMPARISON_EQUAL,          // GS_DEPTHFUNC_HIZEQUAL
-        };
-
-        depthStencilDesc.DepthFunc = DepthFunc[(depthState & GS_DEPTHFUNC_MASK) >> DepthFuncShift];
-
-        depthStencilDesc.StencilEnable = (renderState & GS_STENCIL);
-        depthStencilDesc.StencilReadMask = m_StencilReadMask;
-        depthStencilDesc.StencilWriteMask = m_StencilWriteMask;
-
-        depthStencilDesc.FrontFace.StencilFunc        = (D3D11_COMPARISON_FUNC)g_StencilFuncLookup[m_StencilState & FSS_STENCFUNC_MASK];
-        depthStencilDesc.FrontFace.StencilFailOp      = (D3D11_STENCIL_OP)g_StencilOpLookup[(m_StencilState & FSS_STENCFAIL_MASK)  >> FSS_STENCFAIL_SHIFT];
-        depthStencilDesc.FrontFace.StencilDepthFailOp = (D3D11_STENCIL_OP)g_StencilOpLookup[(m_StencilState & FSS_STENCZFAIL_MASK) >> FSS_STENCZFAIL_SHIFT];
-        depthStencilDesc.FrontFace.StencilPassOp      = (D3D11_STENCIL_OP)g_StencilOpLookup[(m_StencilState & FSS_STENCPASS_MASK)  >> FSS_STENCPASS_SHIFT];
-        depthStencilDesc.BackFace = depthStencilDesc.FrontFace;
-
-        if (m_StencilState & FSS_STENCIL_TWOSIDED)
-        {
-            depthStencilDesc.BackFace.StencilFunc        = (D3D11_COMPARISON_FUNC)g_StencilFuncLookup[(m_StencilState & (FSS_STENCFUNC_MASK << FSS_CCW_SHIFT)) >>  FSS_CCW_SHIFT];
-            depthStencilDesc.BackFace.StencilFailOp      = (D3D11_STENCIL_OP)g_StencilOpLookup[(m_StencilState  & (FSS_STENCFAIL_MASK  << FSS_CCW_SHIFT)) >> (FSS_STENCFAIL_SHIFT + FSS_CCW_SHIFT)];
-            depthStencilDesc.BackFace.StencilDepthFailOp = (D3D11_STENCIL_OP)g_StencilOpLookup[(m_StencilState  & (FSS_STENCZFAIL_MASK << FSS_CCW_SHIFT)) >> (FSS_STENCZFAIL_SHIFT + FSS_CCW_SHIFT)];
-            depthStencilDesc.BackFace.StencilPassOp      = (D3D11_STENCIL_OP)g_StencilOpLookup[(m_StencilState  & (FSS_STENCPASS_MASK  << FSS_CCW_SHIFT)) >> (FSS_STENCPASS_SHIFT + FSS_CCW_SHIFT)];
-        }
-    }
-}
-
-uint8 CDeviceGraphicsPSODesc::CombineVertexStreamMasks(uint8 fromShader, uint8 fromObject) const
-{
-    uint8 result = fromShader;
-
-    if (fromObject & VSM_NORMALS)
-    {
-        result |= VSM_NORMALS;
-    }
-
-    if (fromObject & BIT(VSF_QTANGENTS))
-    {
-        result &= ~VSM_TANGENTS;
-        result |= BIT(VSF_QTANGENTS);
-    }
-
-    if (fromObject & VSM_INSTANCED)
-    {
-        result |= VSM_INSTANCED;
-    }
-
-    return result;
-}
-
-template <typename T>
-void HashSimpleType(AZ::Crc32& crc, const T& type)
-{
-    crc.Add(&type, sizeof(T), false);
-}
-
-void CDeviceGraphicsPSODesc::Build()
-{
-    AZ::Crc32 crc;
-    HashSimpleType(crc, m_pShader);
-    HashSimpleType(crc, m_technique);
-    HashSimpleType(crc, m_bAllowTesselation);
-    HashSimpleType(crc, m_ShaderFlags_RT);
-    HashSimpleType(crc, m_ShaderFlags_MD);
-    HashSimpleType(crc, m_ShaderFlags_MDV);
-    HashSimpleType(crc, m_RenderState);
-    HashSimpleType(crc, m_StencilState);
-    HashSimpleType(crc, m_StencilReadMask);
-    HashSimpleType(crc, m_StencilWriteMask);
-    HashSimpleType(crc, m_ObjectStreamMask);
-    HashSimpleType(crc, m_RenderTargetFormats);
-    HashSimpleType(crc, m_DepthStencilFormat);
-    HashSimpleType(crc, m_CullMode);
-    HashSimpleType(crc, m_DepthBias);
-    HashSimpleType(crc, m_DepthBiasClamp);
-    HashSimpleType(crc, m_SlopeScaledDepthBias);
-    HashSimpleType(crc, m_pResourceLayout);
-    HashSimpleType(crc, m_VertexFormat.GetEnum());
-    m_Hash = crc;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CDeviceComputePSO::CDeviceComputePSO()
-{
-    m_pHwShaders.fill(NULL);
-    m_pHwShaderInstances.fill(NULL);
-    m_pDeviceShaders.fill(NULL);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CDeviceResourceSet::CDeviceResourceSet(EFlags flags)
-{
-    Clear();
-    m_Flags = flags;
-}
-
-CDeviceResourceSet::~CDeviceResourceSet()
-{
-    Clear();
-}
-
-
-void CDeviceResourceSet::SetDirty([[maybe_unused]] bool bDirty)
-{
-    m_bDirty = true;
-    CryInterlockedIncrement(&s_dirtyCount);
-}
-
-void CDeviceResourceSet::Clear()
-{
-    for (size_t i = 0; i < m_Textures.size(); i++)
-    {
-        auto& rsTexBind = m_Textures[i];
-
-        CTexture* pTex = std::get<1>(rsTexBind.resource);
-        if (pTex != nullptr)
-        {
-            pTex->RemoveInvalidateCallbacks(this);
-        }
-    }
-
-    m_Textures.clear();
-    m_Samplers.clear();
-    m_ConstantBuffers.clear();
-    m_Buffers.clear();
-    m_bDirty = true;
-}
-
-void CDeviceResourceSet::SetTexture(ShaderSlot shaderSlot, _smart_ptr<CTexture> pTexture, SResourceView::KeyType resourceViewID, EShaderStage shaderStages)
-{
-    STextureData texData(std::tie(resourceViewID, pTexture), shaderStages);
-    if (m_Textures.find(shaderSlot) != m_Textures.end() && m_Textures[shaderSlot] == texData)
-    {
-        return;
-    }
-
-    if (CTexture* pPreviousTexture = std::get<1>(m_Textures[shaderSlot].resource))
-    {
-        pPreviousTexture->RemoveInvalidateCallbacks(this);
-    }
-
-    m_Textures[shaderSlot] = texData;
-    
-    if (pTexture)
-    {
-        pTexture->AddInvalidateCallback(this, AZStd::bind(&CDeviceResourceSet::OnTextureChanged, this, AZStd::placeholders::_1));
-    }
-
-    m_bDirty = true;
-}
-
-void CDeviceResourceSet::SetSampler(ShaderSlot shaderSlot, int sampler, EShaderStage shaderStages)
-{
-    SSamplerData samplerData(sampler, shaderStages);
-    if (m_Samplers.find(shaderSlot) != m_Samplers.end() && m_Samplers[shaderSlot] == samplerData)
-    {
-        return;
-    }
-
-    m_Samplers[shaderSlot] = samplerData;
-    m_bDirty = true;
-}
-
-void CDeviceResourceSet::SetConstantBuffer(ShaderSlot shaderSlot, _smart_ptr<AzRHI::ConstantBuffer> pBuffer, EShaderStage shaderStages)
-{
-    SConstantBufferData cbData(pBuffer, shaderStages);
-    if (m_ConstantBuffers.find(shaderSlot) != m_ConstantBuffers.end() && m_ConstantBuffers[shaderSlot] == cbData)
-    {
-        return;
-    }
-
-    m_ConstantBuffers[shaderSlot] = cbData;
-    m_bDirty = true;
-}
-
-void CDeviceResourceSet::SetBuffer(ShaderSlot shaderSlot, WrappedDX11Buffer buffer, EShaderStage shaderStages)
-{
-    SBufferData bufferData(buffer, shaderStages);
-    if (m_Buffers.find(shaderSlot) != m_Buffers.end() && m_Buffers[shaderSlot] == bufferData)
-    {
-        return;
-    }
-
-    m_Buffers[shaderSlot] = bufferData;
-    m_bDirty = true;
-}
-
-EShaderStage CDeviceResourceSet::GetShaderStages() const
-{
-    EShaderStage result = EShaderStage_None;
-
-    for (const auto& it : m_ConstantBuffers)
-    {
-        result |= it.second.shaderStages;
-    }
-
-    for (const auto& it : m_Textures)
-    {
-        result |= it.second.shaderStages;
-    }
-
-    for (const auto& it : m_Samplers)
-    {
-        result |=  it.second.shaderStages;
-    }
-
-    return result;
-}
-
-bool CDeviceResourceSet::Fill([[maybe_unused]] CShader* pShader, CShaderResources* pResources, EShaderStage shaderStages)
-{
-    Clear();
-
-    for (EEfResTextures texType = EFTT_DIFFUSE; texType < EFTT_MAX; texType = EEfResTextures(texType + 1))
-    {
-        CTexture*       pTex = TextureHelpers::LookupTexDefault(texType);
-        SEfResTexture*  pRTextureRes = pResources->GetTextureResource(texType);
-        if (pRTextureRes && pRTextureRes->m_Sampler.m_pTex)
-        {
-            pTex = pRTextureRes->m_Sampler.m_pTex;
-        }
-        else if (pRTextureRes)
-        {
-            AZ_Warning("Graphics", pRTextureRes->m_Sampler.m_pTex, "Texture at slot %d is Null", (uint16)texType );
-        }
-
-        auto bindSlot = IShader::GetTextureSlot(texType);
-        SetTexture(bindSlot, pTex, SResourceView::DefaultView, shaderStages);
-    }
-/*
-    [Shader System TO DO] - replace with the following optimized slots set code 
-    for (auto iter = pResources->m_TexturesResourcesMap.begin(); iter != pResources->m_TexturesResourcesMap.end(); ++iter)
-    {
-        SEfResTexture*          pTexture = &iter->second;
-        CTexture*               pTex = pTexture->m_Sampler.m_pTex;
-        uint16                  texSlot = iter->first;
-        const STexSamplerRT&    smp = pTexture->m_Sampler;
-
-        AZ_Warning("Graphics", pTex, "Texture is Null in CDeviceResourceSet.");
-
-        SetTexture(texSlot, pTex, SResourceView::DefaultView, shaderStages);
-    }
-*/
-    // Eventually we should only have one constant buffer for all shader stages. for now just pick the one from the pixel shader
-    m_ConstantBuffers[eConstantBufferShaderSlot_PerMaterial]  = SConstantBufferData(pResources->GetConstantBuffer(), shaderStages);
-    return true;
-}
-
-void CDeviceResourceSet::OnTextureChanged([[maybe_unused]] uint32 dirtyFlags)
-{
-    SetDirty(true);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeviceResourceLayout::SetInlineConstants(uint32 numConstants)
-{
-    m_InlineConstantCount += numConstants;
-}
-
-void CDeviceResourceLayout::SetResourceSet(uint32 bindSlot, CDeviceResourceSetPtr pResourceSet)
-{
-    m_ResourceSets[bindSlot] = pResourceSet;
-}
-
-void CDeviceResourceLayout::SetConstantBuffer(uint32 bindSlot, EConstantBufferShaderSlot shaderSlot, EShaderStage shaderStages)
-{
-    m_ConstantBuffers[bindSlot].shaderSlot = shaderSlot;
-    m_ConstantBuffers[bindSlot].shaderStages = shaderStages;
-}
-
-CDeviceResourceLayout::CDeviceResourceLayout()
-{
-    Clear();
-}
-
-void CDeviceResourceLayout::Clear()
-{
-    m_InlineConstantCount = 0;
-    m_ConstantBuffers.clear();
-    m_ResourceSets.clear();
-}
-
-bool CDeviceResourceLayout::IsValid()
-{
-    // TODO: validate buffers
-
-    // need to have at least one resource set or constant buffer/inline constants
-    if (m_ResourceSets.empty() && m_ConstantBuffers.empty() && m_InlineConstantCount == 0)
-    {
-        CRY_ASSERT_MESSAGE(false, "Invalid Resource Layout: no data");
-        return false;
-    }
-
-    // check for overlapping resource set and constant buffer bind slots
-    std::set<uint32> usedBindSlots;
-    std::map<ShaderSlot, CDeviceResourceSet::STextureData>        shaderTexBinds;
-    std::map<ShaderSlot, CDeviceResourceSet::SConstantBufferData> shaderCBufferBinds;
-
-    if (m_InlineConstantCount > 0)
-    {
-        usedBindSlots.insert(0);
-    }
-
-    auto validateTex = [&](int shaderSlot, const CDeviceResourceSet::STextureData& newTex)
-        {
-            auto it = shaderTexBinds.find(shaderSlot);
-            if (it != shaderTexBinds.end()) // existing texture found on this shader slot
-            {
-                const auto& existingTex = it->second;
-                if (!(newTex == existingTex))
-                {
-                    CRY_ASSERT_MESSAGE(false, "Invalid Resource Layout: Cannot bind multiple textures to same shader slot (even when shader stages differ) - DX12 limitation");
-                    return false; // DX12 does not allow binding different textures to same slot (even when shader stages differ) in one descriptor table
-                }
-            }
-
-            return true;
-        };
-
-    auto validateCB = [&](int shaderSlot, const CDeviceResourceSet::SConstantBufferData& newCB)
-        {
-            auto it = shaderCBufferBinds.find(shaderSlot);
-            bool existed = (it != shaderCBufferBinds.end() && it->second.shaderStages == newCB.shaderStages);
-            CRY_ASSERT_MESSAGE(!existed, "Invalid Resource Layout: Cannot bind multiple constant buffers to same shader slot (even when shader stages differ) - DX12 limitation");
-            return !existed;
-        };
-
-    auto validateResourceSetShaderStages = [](EShaderStage resourceSetShaderStages, EShaderStage currentItemShaderStages)
-        {
-            // DX12 limitation: all textures and constant buffers in a resource set must be bound the the same shader stages
-            return resourceSetShaderStages == EShaderStage_None || currentItemShaderStages == resourceSetShaderStages;
-        };
-
-    for (const auto& rs : m_ResourceSets)
-    {
-        if (usedBindSlots.insert(rs.first).second == false)
-        {
-            CRY_ASSERT_MESSAGE(false, "Invalid Resource Layout: Multiple resources on same bind slot");
-            return false;
-        }
-
-        EShaderStage currentShaderStages = EShaderStage_None;
-
-        for (const auto& rsTexBind : rs.second->m_Textures)
-        {
-            if (!validateTex(rsTexBind.first, rsTexBind.second))
-            {
-                return false;
-            }
-
-            if (!validateResourceSetShaderStages(currentShaderStages, rsTexBind.second.shaderStages))
-            {
-                return false;
-            }
-
-            shaderTexBinds[rsTexBind.first] = rsTexBind.second;
-            currentShaderStages = rsTexBind.second.shaderStages;
-        }
-
-        for (const auto& rsCbBind : rs.second->m_ConstantBuffers)
-        {
-            if (!validateCB(rsCbBind.first, rsCbBind.second))
-            {
-                return false;
-            }
-
-            // DX12 limitation: all textures and constant buffers in a resource set must be bound the the same shader stages
-            if (!validateResourceSetShaderStages(currentShaderStages, rsCbBind.second.shaderStages))
-            {
-                return false;
-            }
-
-            shaderCBufferBinds[rsCbBind.first] = rsCbBind.second;
-            currentShaderStages = rsCbBind.second.shaderStages;
-        }
-    }
-
-    for (const auto& cb : m_ConstantBuffers)
-    {
-        uint32 resourceLayoutBindSlot = cb.first;
-        if (usedBindSlots.insert(resourceLayoutBindSlot).second == false)
-        {
-            CRY_ASSERT_MESSAGE(false, "Invalid Resource Layout: Multiple resources on same bind slot");
-            return false;
-        }
-
-        CDeviceResourceSet::SConstantBufferData cbData(NULL, cb.second.shaderStages);
-        EConstantBufferShaderSlot shaderSlot = cb.second.shaderSlot;
-        if (!validateCB(shaderSlot, cbData))
-        {
-            return false;
-        }
-
-        shaderCBufferBinds[shaderSlot] = cbData;
-    }
-
-    // make sure there are no 'holes' in the used binding slots
-    {
-        int previousSlot = -1;
-        for (auto slot : usedBindSlots)
-        {
-            if (slot != previousSlot + 1)
-            {
-                CRY_ASSERT_MESSAGE(false, "Invalid Resource Layout: gap in bind slots");
-                return false;
-            }
-
-            previousSlot = slot;
-        }
-    }
-    return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeviceGraphicsCommandList::Reset()
-{
-    m_pCurrentPipelineState = nullptr;
-    m_pCurrentResources.fill(nullptr);
-    m_CurrentStencilRef = -1;
-    ResetImpl();
-}
-
-void CDeviceGraphicsCommandList::SetPipelineState(CDeviceGraphicsPSOPtr devicePSO)
-{
-    if (m_pCurrentPipelineState != devicePSO)
-    {
-        m_pCurrentPipelineState = devicePSO;
-        SetPipelineStateImpl(devicePSO);
-    }
-
-#ifndef _RELEASE
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    CryInterlockedIncrement(&rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumStateChanges);
-#endif
-}
-
-void CDeviceGraphicsCommandList::SetResources(uint32 bindSlot, CDeviceResourceSet* pResources)
-{
-    assert(bindSlot < m_pCurrentResources.size());
-    if (m_pCurrentResources[bindSlot] != pResources)
-    {
-        m_pCurrentResources[bindSlot] = pResources;
-        SetResourcesImpl(bindSlot, pResources);
-    }
-}
-
-void CDeviceGraphicsCommandList::SetStencilRef(uint8 stencilRefValue)
-{
-    if (m_CurrentStencilRef != int(stencilRefValue))
-    {
-        m_CurrentStencilRef = stencilRefValue;
-        SetStencilRefImpl(stencilRefValue);
-    }
-}
-
-void CDeviceGraphicsCommandList::Draw(uint32 VertexCountPerInstance, uint32 InstanceCount, uint32 StartVertexLocation, uint32 StartInstanceLocation)
-{
-    DrawImpl(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation);
-
-#if defined(ENABLE_PROFILING_CODE)
-    int nPrimitives;
-
-    switch (m_pCurrentPipelineState->m_PrimitiveTypeForProfiling)
-    {
-    case eptTriangleList:
-        nPrimitives = VertexCountPerInstance / 3;
-        assert(VertexCountPerInstance % 3 == 0);
-        break;
-    case eptTriangleStrip:
-        nPrimitives = VertexCountPerInstance - 2;
-        assert(VertexCountPerInstance > 2);
-        break;
-    case eptLineList:
-        nPrimitives = VertexCountPerInstance / 2;
-        assert(VertexCountPerInstance % 2 == 0);
-        break;
-    case eptLineStrip:
-        nPrimitives = VertexCountPerInstance - 1;
-        assert(VertexCountPerInstance > 1);
-        break;
-    case eptPointList:
-        nPrimitives = VertexCountPerInstance;
-        assert(VertexCountPerInstance > 0);
-        break;
-    case ept1ControlPointPatchList:
-        nPrimitives = VertexCountPerInstance;
-        assert(VertexCountPerInstance > 0);
-        break;
-
-#ifndef _RELEASE
-    default:
-        nPrimitives = 0;
-        assert(0);
-#endif
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    CryInterlockedAdd(&rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_nPolygons[rd->m_RP.m_nPassGroupDIP], nPrimitives * InstanceCount);
-    CryInterlockedIncrement(&rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_nDIPs[rd->m_RP.m_nPassGroupDIP]);
-#endif
-}
-
-void CDeviceGraphicsCommandList::DrawIndexed(uint32 IndexCountPerInstance, uint32 InstanceCount, uint32 StartIndexLocation, int BaseVertexLocation, uint32 StartInstanceLocation)
-{
-    DrawIndexedImpl(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation);
-
-#if defined(ENABLE_PROFILING_CODE)
-    int nPrimitives;
-
-    switch (m_pCurrentPipelineState->m_PrimitiveTypeForProfiling)
-    {
-    case eptTriangleList:
-        nPrimitives = IndexCountPerInstance / 3;
-        assert(IndexCountPerInstance % 3 == 0);
-        break;
-    case ept4ControlPointPatchList:
-        nPrimitives = IndexCountPerInstance >> 2;
-        assert(IndexCountPerInstance % 4 == 0);
-        break;
-    case ept3ControlPointPatchList:
-        nPrimitives = IndexCountPerInstance / 3;
-        assert(IndexCountPerInstance % 3 == 0);
-        break;
-    case eptTriangleStrip:
-        nPrimitives = IndexCountPerInstance - 2;
-        assert(IndexCountPerInstance > 2);
-        break;
-    case eptLineList:
-        nPrimitives = IndexCountPerInstance >> 1;
-        assert(IndexCountPerInstance % 2 == 0);
-        break;
-#ifdef _DEBUG
-    default:
-        nPrimitives = 0;
-        assert(0);
-#endif
-    }
-
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    CryInterlockedAdd(&rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_nPolygons[rd->m_RP.m_nPassGroupDIP], nPrimitives);
-    CryInterlockedIncrement(&rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_nDIPs[rd->m_RP.m_nPassGroupDIP]);
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeviceComputeCommandList::SetPipelineState(CDeviceComputePSOPtr devicePSO)
-{
-    m_pCurrentPipelineState = devicePSO;
-    SetPipelineStateImpl(devicePSO);
-
-#ifndef _RELEASE
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    CryInterlockedIncrement(&rd->m_RP.m_PS[rd->m_RP.m_nProcessThreadID].m_NumStateChanges);
-#endif
-}
-
-void CDeviceComputeCommandList::Dispatch(uint32 X, uint32 Y, uint32 Z)
-{
-    DispatchImpl(X, Y, Z);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-CDeviceGraphicsPSOPtr CDeviceObjectFactory::CreateGraphicsPSO(const CDeviceGraphicsPSODesc& psoDesc)
-{
-    auto it = m_PsoCache.find(psoDesc);
-    if (it != m_PsoCache.end())
-    {
-        return it->second.get();
-    }
-
-    if (auto pPSO = CreateGraphicsPSOImpl(psoDesc))
-    {
-        auto insertResult = m_PsoCache.emplace(psoDesc, std::move(pPSO));
-        return insertResult.first->second.get();
-    }
-
-    return nullptr;
-}
-
-#if !defined(NULL_RENDERER)
-CDeviceObjectFactory& CDeviceObjectFactory::GetInstance()
-{
-    static CDeviceObjectFactory ext12;
-    return ext12;
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12.h
deleted file mode 100644
index 7a70633a97..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <VertexFormats.h>
-#include <ITexture.h>
-#include <array>
-
-#include "Enums.h"
-
-class CHWShader_D3D;
-class CShader;
-class CTexture;
-class CCryNameTSCRC;
-namespace AzRHI { class ConstantBuffer; }
-class CShaderResources;
-struct SGraphicsPipelineStateDescription;
-
-#if !defined(NULL_RENDERER)
-
-/////////////////////////////////////////////////////////////////////////////////
-//// include concrete device/context implementations
-#if defined(CRY_USE_DX12)
-#define CRY_USE_DX12_NATIVE
-#include "XRenderD3D9/DX12/API/DX12CommandList.hpp"
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-
-class CDeviceResourceSet
-{
-    friend class CDeviceObjectFactory;
-    friend class CDeviceResourceLayout;
-    friend class CDeviceResourceLayout_DX12;
-
-public:
-    enum EFlags
-    {
-        EFlags_None = 0,
-        EFlags_ForceSetAllState,
-    };
-
-    CDeviceResourceSet(EFlags flags);
-    virtual ~CDeviceResourceSet();
-
-    bool IsDirty() const { return m_bDirty; }
-    void SetDirty(bool bDirty);
-
-    static int  GetGlobalDirtyCount() { return s_dirtyCount; }
-    static void ResetGlobalDirtyCount() { s_dirtyCount = 0; }
-
-    void Clear();
-
-    void SetTexture(ShaderSlot shaderSlot, _smart_ptr<CTexture> pTexture, SResourceView::KeyType resourceViewID = SResourceView::DefaultView, EShaderStage shaderStages = EShaderStage_Pixel);
-    void SetSampler(ShaderSlot shaderSlot, int sampler, EShaderStage shaderStages = EShaderStage_Pixel);
-    void SetConstantBuffer(ShaderSlot shaderSlot, _smart_ptr<AzRHI::ConstantBuffer> pBuffer, EShaderStage shaderStages = EShaderStage_Pixel);
-    void SetBuffer(ShaderSlot shaderSlot, WrappedDX11Buffer buffer, EShaderStage shaderStages = EShaderStage_Pixel);
-
-    EShaderStage GetShaderStages() const;
-    EFlags GetFlags() const { return m_Flags; }
-
-    bool Fill(CShader* pShader, CShaderResources* pResources, EShaderStage shaderStages = EShaderStage_Pixel);
-
-    virtual void Prepare() = 0;
-    virtual void Build() = 0;
-
-protected:
-    template<typename T>
-    struct SResourceData
-    {
-        SResourceData()
-            : resource()
-            , shaderStages(EShaderStage_None) {}
-        SResourceData(T _resource, ::EShaderStage _shaderStages)
-            : resource(_resource)
-            , shaderStages(_shaderStages) {}
-
-        bool operator==(const SResourceData<T>& other) const
-        {
-            return resource == other.resource && shaderStages == other.shaderStages;
-        }
-
-        T resource;
-        ::EShaderStage shaderStages;
-    };
-
-    typedef SResourceData< std::tuple<SResourceView::KeyType, _smart_ptr<CTexture> > > STextureData;
-    typedef SResourceData< int >                                                       SSamplerData;
-    typedef SResourceData< _smart_ptr<AzRHI::ConstantBuffer> >                               SConstantBufferData;
-    typedef SResourceData< WrappedDX11Buffer >                                         SBufferData;
-
-    CDeviceResourceSet(const CDeviceResourceSet&) {};
-    void OnTextureChanged(uint32 dirtyFlags);
-
-    VectorMap<ShaderSlot, STextureData> m_Textures;
-    VectorMap<ShaderSlot, SSamplerData> m_Samplers;
-    VectorMap<ShaderSlot, SBufferData>  m_Buffers;
-    VectorMap<ShaderSlot, SConstantBufferData> m_ConstantBuffers;
-
-    bool              m_bDirty : 1;
-    EFlags m_Flags  : 8;
-
-    static volatile int s_dirtyCount;
-};
-
-typedef AZStd::shared_ptr<CDeviceResourceSet> CDeviceResourceSetPtr;
-
-////////////////////////////////////////////////////////////////////////////
-
-class CDeviceResourceLayout
-{
-public:
-    void Clear();
-    void SetInlineConstants(uint32 numConstants);
-    void SetResourceSet(uint32 bindSlot, CDeviceResourceSetPtr pResourceSet);
-    void SetConstantBuffer(uint32 bindSlot, EConstantBufferShaderSlot shaderSlot, EShaderStage shaderStages);
-
-    virtual bool Build() = 0;
-
-protected:
-    struct SConstantBufferShaderBinding
-    {
-        EConstantBufferShaderSlot shaderSlot;
-        EShaderStage shaderStages;
-    };
-
-    CDeviceResourceLayout();
-    virtual ~CDeviceResourceLayout() = default;
-
-    bool IsValid();
-
-    uint32 m_InlineConstantCount;
-    VectorMap<uint32, SConstantBufferShaderBinding> m_ConstantBuffers;
-    VectorMap<uint32, CDeviceResourceSetPtr> m_ResourceSets;
-};
-
-typedef AZStd::shared_ptr<CDeviceResourceLayout> CDeviceResourceLayoutPtr;
-
-////////////////////////////////////////////////////////////////////////////
-class CDeviceGraphicsPSODesc
-{
-public:
-    CDeviceGraphicsPSODesc(const CDeviceGraphicsPSODesc& other);
-    CDeviceGraphicsPSODesc(CDeviceResourceLayout* pResourceLayout, const SGraphicsPipelineStateDescription& pipelineDesc);
-    CDeviceGraphicsPSODesc(CDeviceResourceLayout* pResourceLayout, CShader* pShader, const CCryNameTSCRC& technique, uint64 rtFlags, uint32 mdFlags, uint32 mdvFlags, bool bAllowTessellation);
-
-    AZ::u32 GetHash() const;
-
-public:
-    void InitWithDefaults();
-
-    void  FillDescs(D3D11_RASTERIZER_DESC& rasterizerDesc, D3D11_BLEND_DESC& blendDesc, D3D11_DEPTH_STENCIL_DESC& depthStencilDesc) const;
-    uint8 CombineVertexStreamMasks(uint8 fromShader, uint8 fromObject) const;
-
-    void Build();
-
-public:
-    CShader*                              m_pShader;
-    CCryNameTSCRC                         m_technique;
-    bool                                  m_bAllowTesselation;
-    uint64                                m_ShaderFlags_RT;
-    uint32                                m_ShaderFlags_MD;
-    uint32                                m_ShaderFlags_MDV;
-    uint32                                m_RenderState;
-    uint32                                m_StencilState;
-    uint8                                 m_StencilReadMask;
-    uint8                                 m_StencilWriteMask;
-    uint8                                 m_ObjectStreamMask;
-    std::array<ETEX_Format, 8>            m_RenderTargetFormats;
-    ETEX_Format                           m_DepthStencilFormat;
-    ECull                                 m_CullMode;
-    int32                                 m_DepthBias;
-    f32                                   m_DepthBiasClamp;
-    f32                                   m_SlopeScaledDepthBias;
-    eRenderPrimitiveType                  m_PrimitiveType;
-    CDeviceResourceLayout*                m_pResourceLayout;
-    AZ::Vertex::Format                    m_VertexFormat;
-
-private:
-    AZ::u32 m_Hash;
-};
-
-namespace std
-{
-    template<>
-    struct hash<CDeviceGraphicsPSODesc>
-    {
-        size_t operator()(const CDeviceGraphicsPSODesc& psoDesc) const
-        {
-            return psoDesc.GetHash();
-        }
-    };
-
-    template<>
-    struct equal_to<CDeviceGraphicsPSODesc>
-    {
-        bool operator()(const CDeviceGraphicsPSODesc& psoDesc1, const CDeviceGraphicsPSODesc& psoDesc2) const
-        {
-            return psoDesc1.GetHash() == psoDesc2.GetHash();
-        }
-    };
-}
-
-
-class CDeviceGraphicsPSO
-{
-public:
-    std::array<void*, eHWSC_Num>          m_pHwShaderInstances; // TODO: remove once we don't need shader reflection anymore
-    std::array<CHWShader_D3D*, eHWSC_Num> m_pHwShaders;         // TODO: remove once we don't need shader reflection anymore
-
-#if defined(ENABLE_PROFILING_CODE)
-    eRenderPrimitiveType m_PrimitiveTypeForProfiling;
-#endif
-};
-
-class CDeviceComputePSO
-{
-    friend class CDeviceComputeCommandList;
-    friend struct SDeviceObjectHelpers;
-
-public:
-    virtual ~CDeviceComputePSO() {};
-
-    void SetShader(CShader* pShader, const CCryNameTSCRC& technique, uint64 rtFlags, uint32 mdFlags, uint32 mdvFlags);
-
-    virtual bool Build() = 0;
-
-protected:
-    CDeviceComputePSO();
-    CDeviceComputePSO(const CDeviceComputePSO&) {}
-
-    std::array<CHWShader_D3D*, eHWSC_Num> m_pHwShaders;
-    std::array<void*, eHWSC_Num>          m_pHwShaderInstances;
-    std::array<void*, eHWSC_Num>          m_pDeviceShaders;
-};
-
-typedef CDeviceGraphicsPSO*                 CDeviceGraphicsPSOPtr;
-typedef AZStd::unique_ptr<CDeviceGraphicsPSO> CDeviceGraphicsPSOUPtr;
-typedef AZStd::shared_ptr<CDeviceComputePSO>  CDeviceComputePSOPtr;
-
-////////////////////////////////////////////////////////////////////////////
-
-class CDeviceCommandList
-{
-    friend class CDeviceObjectFactory;
-
-public:
-    CDeviceCommandList() {};
-    virtual ~CDeviceCommandList() = default;
-
-    void  SpecifyResourceUsage(/* resource, state */); // set => begin+end
-    void AnnounceResourceUsage(/* resource, state */); // begin
-    void  ApproveResourceUsage(/* resource, state */); // end
-
-    virtual void LockToThread() = 0;
-    virtual void Build() = 0;
-};
-
-class CDeviceCopyCommandList
-    : public CDeviceCommandList
-{
-    friend class CDeviceObjectFactory;
-
-public:
-    enum ECopyType
-    {
-        eCT_GraphicsResources, // RenderTarget && DepthStencil && SwapChain -> Direct
-        eCT_GenericResources,  // ShaderResource && UnorderedAccess -> Compute
-        eCT_OffCardResources   // everything crossing PCIe -> XDMA
-    };
-
-    static ECopyType DetermineCopyType(ECopyType eCurrent, D3DResource* pResource);
-
-public:
-    CDeviceCopyCommandList([[maybe_unused]] ECopyType eType = eCT_OffCardResources) {};
-    ~CDeviceCopyCommandList() override = default;
-
-    void CopySubresourceRegion(D3DResource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, D3DResource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox, UINT CopyFlags);
-    void CopyResource(D3DResource* pDstResource, ID3D11Resource* pSrcResource, UINT CopyFlags);
-    void UpdateSubresource(D3DResource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch, UINT CopyFlags);
-
-    virtual void LockToThread() override;
-    virtual void Build() override;
-};
-
-class CDeviceGraphicsCommandList
-    : public CDeviceCopyCommandList
-{
-    friend class CDeviceObjectFactory;
-
-public:
-    CDeviceGraphicsCommandList()
-        : CDeviceCopyCommandList(eCT_GraphicsResources) {}
-    ~CDeviceGraphicsCommandList() override = default;
-
-    void SetRenderTargets(uint32 targetCount, CTexture** pTargets, SDepthTexture* pDepthTarget);
-    void SetViewports(uint32 vpCount, const D3DViewPort* pViewports);
-    void SetScissorRects(uint32 rcCount, const D3DRectangle* pRects);
-    void SetPipelineState(CDeviceGraphicsPSOPtr devicePSO);
-    void SetResourceLayout(CDeviceResourceLayout* pResourceLayout);
-    void SetResources(uint32 bindSlot, CDeviceResourceSet* pResources);
-    void SetInlineConstantBuffer(uint32 bindSlot, AzRHI::ConstantBuffer* pBuffer, EConstantBufferShaderSlot shaderSlot, EHWShaderClass shaderClass);
-    void SetInlineConstantBuffer(uint32 bindSlot, AzRHI::ConstantBuffer* pBuffer, EConstantBufferShaderSlot shaderSlot, EShaderStage shaderStages);
-    void SetVertexBuffers(uint32 bufferCount, D3DBuffer** pBuffers, size_t* offsets, uint32* strides);
-    void SetVertexBuffers(uint32 streamCount, const SStreamInfo* streams);
-    void SetIndexBuffer(const SStreamInfo& indexStream); // TODO: IMPLEMENT. NOTE: take care with PSO strip cut value and 32/16 bit indices
-    void SetInlineConstants(uint32 bindSlot, uint32 constantCount, float* pConstants);
-    void SetStencilRef(uint8 stencilRefValue);
-
-    void Draw(uint32 VertexCountPerInstance, uint32 InstanceCount, uint32 StartVertexLocation, uint32 StartInstanceLocation);
-    void DrawIndexed(uint32 IndexCountPerInstance, uint32 InstanceCount, uint32 StartIndexLocation, int BaseVertexLocation, uint32 StartInstanceLocation);
-
-    void ClearSurface(D3DSurface* pView, const FLOAT Color[4], UINT NumRects, const D3D11_RECT* pRect);
-    void ClearDepthSurface(D3DDepthSurface* pView, UINT ClearFlags, FLOAT Depth, UINT8 Stencil, UINT NumRects, const D3D11_RECT* pRect);
-
-    virtual void LockToThread() final;
-    virtual void Build() final;
-
-    void Reset();
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(DeviceWrapper12_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    inline void SwitchToNewGraphicsPipeline() {}
-#endif
-
-protected:
-    void SetPipelineStateImpl(CDeviceGraphicsPSOPtr devicePSO);
-
-    void DrawImpl(uint32 VertexCountPerInstance, uint32 InstanceCount, uint32 StartVertexLocation, uint32 StartInstanceLocation);
-    void DrawIndexedImpl(uint32 IndexCountPerInstance, uint32 InstanceCount, uint32 StartIndexLocation, int BaseVertexLocation, uint32 StartInstanceLocation);
-    void SetResourcesImpl(uint32 bindSlot, CDeviceResourceSet* pResources);
-    void SetStencilRefImpl(uint8 stencilRefValue);
-
-    void ResetImpl();
-
-    CDeviceGraphicsPSOPtr                                      m_pCurrentPipelineState;
-    std::array<CDeviceResourceSet*, EResourceLayoutSlot_Count> m_pCurrentResources;
-    int32                                                      m_CurrentStencilRef;
-};
-
-class CDeviceComputeCommandList
-    : public CDeviceCopyCommandList
-{
-    friend class CDeviceObjectFactory;
-
-public:
-    CDeviceComputeCommandList()
-        : CDeviceCopyCommandList(eCT_GenericResources) {}
-    ~CDeviceComputeCommandList() override = default;
-
-    void SetPipelineState(CDeviceComputePSOPtr devicePSO);
-    void SetResourceLayout(CDeviceResourceLayout* pResourceLayout);
-    void SetResources(uint32 bindSlot, CDeviceResourceSet* pResources);
-    void SetConstantBuffer(uint32 bindSlot, AzRHI::ConstantBuffer* pBuffer, EConstantBufferShaderSlot shaderSlot, EHWShaderClass shaderStage);
-    void SetInlineConstants(uint32 bindSlot, uint32 constantCount, float* pConstants);
-
-    void Dispatch(uint32 X, uint32 Y, uint32 Z);
-
-    void ClearUAV(D3DUnorderedAccessView* pView, const FLOAT Values[4], UINT NumRects, const D3D11_RECT* pRect);
-    void ClearUAV(D3DUnorderedAccessView* pView, const UINT Values[4], UINT NumRects, const D3D11_RECT* pRect);
-
-    virtual void LockToThread() final;
-    virtual void Build() final;
-
-protected:
-    void SetPipelineStateImpl(CDeviceComputePSOPtr devicePSO);
-
-    void DispatchImpl(uint32 X, uint32 Y, uint32 Z);
-
-    CDeviceComputePSOPtr m_pCurrentPipelineState;
-};
-
-typedef AZStd::shared_ptr<CDeviceGraphicsCommandList> CDeviceGraphicsCommandListPtr;
-typedef AZStd::shared_ptr<CDeviceComputeCommandList> CDeviceComputeCommandListPtr;
-typedef AZStd::shared_ptr<CDeviceCopyCommandList> CDeviceCopyCommandListPtr;
-
-typedef CDeviceGraphicsCommandList& CDeviceGraphicsCommandListRef;
-typedef CDeviceComputeCommandList& CDeviceComputeCommandListRef;
-typedef CDeviceCopyCommandList& CDeviceCopyCommandListRef;
-
-typedef AZStd::unique_ptr<CDeviceGraphicsCommandList> CDeviceGraphicsCommandListUPtr;
-typedef AZStd::unique_ptr<CDeviceComputeCommandList> CDeviceComputeCommandListUPtr;
-typedef AZStd::unique_ptr<CDeviceCopyCommandList> CDeviceCopyCommandListUPtr;
-
-////////////////////////////////////////////////////////////////////////////
-// Device Object Factory
-
-class CDeviceObjectFactory
-{
-public:
-    CDeviceObjectFactory();
-
-    static CDeviceObjectFactory& GetInstance();
-
-    CDeviceResourceSetPtr CreateResourceSet(CDeviceResourceSet::EFlags flags = CDeviceResourceSet::EFlags_None) const;
-    CDeviceResourceLayoutPtr CreateResourceLayout() const;
-    CDeviceGraphicsPSOPtr CreateGraphicsPSO(const CDeviceGraphicsPSODesc& psoDesc);
-    CDeviceComputePSOPtr CreateComputePSO(CDeviceResourceLayoutPtr pResourceLayout) const;
-
-    /**
-    * Clears the PSO cache forcing all PSOs to be re-built
-    *
-    * Only call this when re-loading shaders
-    */
-    inline void InvalidatePSOCache() { m_PsoCache.clear(); }
-
-    // Get a pointer to the core graphics command-list, which runs on the command-queue assigned to Present().
-    // Only the allocating thread is allowed to call functions on this command-list (DX12 restriction).
-    CDeviceGraphicsCommandListPtr GetCoreGraphicsCommandList() const;
-
-    // Acquire one or more command-lists which are independent of the core command-list
-    // Only one thread is allowed to call functions on this command-list (DX12 restriction).
-    // The thread that gets the permition is the one calling Begin() on it AFAICS
-    CDeviceGraphicsCommandListUPtr AcquireGraphicsCommandList();
-    CDeviceComputeCommandListUPtr AcquireComputeCommandList();
-    CDeviceCopyCommandListUPtr AcquireCopyCommandList(CDeviceCopyCommandList::ECopyType eType);
-
-    std::vector<CDeviceGraphicsCommandListUPtr> AcquireGraphicsCommandLists(uint32 listCount);
-    std::vector<CDeviceComputeCommandListUPtr> AcquireComputeCommandLists(uint32 listCount);
-    std::vector<CDeviceCopyCommandListUPtr> AcquireCopyCommandLists(uint32 listCount, CDeviceCopyCommandList::ECopyType eType);
-
-    // Command-list sinks, will automatically submit command-lists in [global] allocation-order
-    void ForfeitGraphicsCommandList(CDeviceGraphicsCommandListUPtr pCommandList);
-    void ForfeitComputeCommandList(CDeviceComputeCommandListUPtr pCommandList);
-    void ForfeitCopyCommandList(CDeviceCopyCommandListUPtr pCommandList);
-
-    void ForfeitGraphicsCommandLists(std::vector<CDeviceGraphicsCommandListUPtr> pCommandLists);
-    void ForfeitComputeCommandLists(std::vector<CDeviceComputeCommandListUPtr> pCommandLists);
-    void ForfeitCopyCommandLists(std::vector<CDeviceCopyCommandListUPtr> pCommandLists);
-
-private:
-    CDeviceGraphicsPSOUPtr CreateGraphicsPSOImpl(const CDeviceGraphicsPSODesc& psoDesc) const;
-
-    CDeviceGraphicsCommandListPtr m_pCoreCommandList;
-
-    std::unordered_map<CDeviceGraphicsPSODesc, CDeviceGraphicsPSOUPtr> m_PsoCache;
-};
-
-struct SDeviceObjectHelpers
-{
-    struct SShaderInstanceInfo
-    {
-        SShaderInstanceInfo()
-            : pHwShader(NULL)
-            , pHwShaderInstance(NULL)
-            , pDeviceShader(NULL) {}
-
-        CHWShader_D3D* pHwShader;
-        CCryNameTSCRC technique; // temp
-        void* pHwShaderInstance;
-        void* pDeviceShader;
-    };
-
-    struct SConstantBufferBindInfo
-    {
-        EConstantBufferShaderSlot shaderSlot;
-        int vectorCount;
-        EHWShaderClass shaderClass;
-        _smart_ptr<AzRHI::ConstantBuffer> pBuffer;
-        _smart_ptr<AzRHI::ConstantBuffer> pPreviousBuffer;
-        SShaderInstanceInfo shaderInfo;
-    };
-
-    // Get shader instances for each shader stage
-    static bool GetShaderInstanceInfo(std::array<SShaderInstanceInfo, eHWSC_Num>& shaderInstanceInfos, CShader * pShader, const CCryNameTSCRC&technique, uint64 rtFlags, uint32 mdFlags, uint32 mdvFlags, UPipelineState pipelineState[eHWSC_Num], bool bAllowTesselation);
-
-    // get constant buffers required by shader. NOTE: only CB_PER_BATCH, CB_PER_INSTANCE and CB_PER_FRAME supported currently
-    static bool GetConstantBuffersFromShader(std::vector<SConstantBufferBindInfo>& constantBufferInfos, CShader* pShader, const CCryNameTSCRC& technique, uint64 rtFlags, uint32 mdFlags, uint32 mdvFlags);
-
-    // set up constant buffers and fill via reflection NOTE: only per batch, per instance, per frame and per camera supported
-    static void BeginUpdateConstantBuffers(std::vector<SConstantBufferBindInfo>& constantBuffers);
-    static void EndUpdateConstantBuffers(std::vector<SConstantBufferBindInfo>& constantBuffers);
-};
-#else
-typedef struct D3D11_VIEWPORT
-{
-    FLOAT TopLeftX;
-    FLOAT TopLeftY;
-    FLOAT Width;
-    FLOAT Height;
-    FLOAT MinDepth;
-    FLOAT MaxDepth;
-}   D3D11_VIEWPORT;
-typedef AZStd::shared_ptr<uint32> CDeviceResourceSetPtr;
-typedef void*                 CDeviceGraphicsPSOPtr;
-typedef AZStd::unique_ptr<uint32> CDeviceGraphicsPSOUPtr;
-typedef AZStd::shared_ptr<uint32>  CDeviceComputePSOPtr;
-typedef uint32& CDeviceGraphicsCommandListRef;
-typedef uint32& CDeviceComputeCommandListRef;
-typedef uint32& CDeviceCopyCommandListRef;
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12_D3D11.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12_D3D11.cpp
deleted file mode 100644
index 06f54c7128..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12_D3D11.cpp
+++ /dev/null
@@ -1,1049 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DeviceWrapper12.h"
-#include "DriverD3D.h"
-#include "../../Common/ReverseDepth.h"
-#include "CryUtils.h"
-
-#include <AzCore/std/smart_ptr/make_shared.h>
-
-#if !defined(CRY_USE_DX12_NATIVE)
-#define DEVICEWRAPPER12_D3D11_CPP_WRAP_DX11
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(DeviceWrapper12_D3D11_cpp)
-#endif
-#if defined(DEVICEWRAPPER12_D3D11_CPP_WRAP_DX11)
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define DX11_COMMANDLIST_REDUNDANT_STATE_FILTERING
-
-class CDeviceGraphicsPSO_DX11
-    : public CDeviceGraphicsPSO
-{
-public:
-    CDeviceGraphicsPSO_DX11();
-
-    bool Init(const CDeviceGraphicsPSODesc& psoDesc);
-
-    _smart_ptr<ID3D11RasterizerState>                 pRasterizerState;
-    _smart_ptr<ID3D11BlendState>                      pBlendState;
-    _smart_ptr<ID3D11DepthStencilState>               pDepthStencilState;
-    _smart_ptr<ID3D11InputLayout>                     pInputLayout;
-
-    std::array<void*, eHWSC_Num>                      m_pDeviceShaders;
-
-    std::array<std::array<uint8, MAX_TMU>, eHWSC_Num> m_Samplers;
-    std::array<std::array<uint8, MAX_TMU>, eHWSC_Num> m_SRVs;
-
-    std::array<uint8, eHWSC_Num>                      m_NumSamplers;
-    std::array<uint8, eHWSC_Num>                      m_NumSRVs;
-
-    // Do we still need these?
-    uint64                                            m_ShaderFlags_RT;
-    uint32                                            m_ShaderFlags_MD;
-    uint32                                            m_ShaderFlags_MDV;
-
-    D3DPrimitiveType                                  m_PrimitiveTopology;
-};
-
-CDeviceGraphicsPSO_DX11::CDeviceGraphicsPSO_DX11()
-{
-    m_PrimitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
-    m_ShaderFlags_RT = 0;
-    m_ShaderFlags_MD = 0;
-    m_ShaderFlags_MDV = 0;
-
-    m_NumSamplers.fill(0);
-    m_NumSRVs.fill(0);
-}
-
-bool CDeviceGraphicsPSO_DX11::Init(const CDeviceGraphicsPSODesc& psoDesc)
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    pRasterizerState = NULL;
-    pBlendState = NULL;
-    pDepthStencilState = NULL;
-    pInputLayout = NULL;
-
-    m_NumSamplers.fill(0);
-    m_NumSRVs.fill(0);
-
-    std::array<SDeviceObjectHelpers::SShaderInstanceInfo, eHWSC_Num> hwShaders;
-    bool shadersAvailable = SDeviceObjectHelpers::GetShaderInstanceInfo(hwShaders, psoDesc.m_pShader, psoDesc.m_technique, psoDesc.m_ShaderFlags_RT, psoDesc.m_ShaderFlags_MD, psoDesc.m_ShaderFlags_MDV, nullptr, psoDesc.m_bAllowTesselation);
-    if (!shadersAvailable)
-        return false;
-
-    // validate shaders first
-    for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass < eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-    {
-        if (hwShaders[shaderClass].pHwShader && (hwShaders[shaderClass].pHwShaderInstance == NULL || hwShaders[shaderClass].pDeviceShader == NULL))
-        {
-            return false;
-        }
-
-        m_pDeviceShaders[shaderClass] = hwShaders[shaderClass].pDeviceShader;
-
-        // TODO: remove
-        m_pHwShaders[shaderClass]         = hwShaders[shaderClass].pHwShader;
-        m_pHwShaderInstances[shaderClass] = hwShaders[shaderClass].pHwShaderInstance;
-    }
-
-    D3D11_RASTERIZER_DESC rasterizerDesc;
-    D3D11_BLEND_DESC blendDesc;
-    D3D11_DEPTH_STENCIL_DESC depthStencilDesc;
-
-    psoDesc.FillDescs(rasterizerDesc, blendDesc, depthStencilDesc);
-
-    uint32 rasterStateIndex = rd->GetOrCreateRasterState(rasterizerDesc);
-    uint32 blendStateIndex  = rd->GetOrCreateBlendState(blendDesc);
-    uint32 depthStateIndex  = rd->GetOrCreateDepthState(depthStencilDesc);
-
-    if (rasterStateIndex == uint32(-1) || blendStateIndex == uint32(-1) || depthStateIndex == uint32(-1))
-    {
-        return false;
-    }
-
-    pDepthStencilState = rd->m_StatesDP[depthStateIndex].pState;
-    pRasterizerState =   rd->m_StatesRS[rasterStateIndex].pState;
-    pBlendState =        rd->m_StatesBL[blendStateIndex].pState;
-
-    // input layout
-    {
-#if defined(FEATURE_PER_SHADER_INPUT_LAYOUT_CACHE)
-        CRY_ASSERT(false); // TODO: IMPLEMENT
-        return false;
-#endif
-
-        if (CHWShader_D3D::SHWSInstance* pVsInstance = reinterpret_cast<CHWShader_D3D::SHWSInstance*>(hwShaders[eHWSC_Vertex].pHwShaderInstance))
-        {
-            uint8 streamMask = psoDesc.CombineVertexStreamMasks(uint8(pVsInstance->m_VStreamMask_Decl), psoDesc.m_ObjectStreamMask);
-
-            const bool bMorph = false;
-            const bool bInstanced = (streamMask & VSM_INSTANCED) != 0;
-            AZ::u32 declCacheKey = pVsInstance->GenerateVertexDeclarationCacheKey(psoDesc.m_VertexFormat);
-            SOnDemandD3DVertexDeclarationCache& declCache = rd->m_RP.m_D3DVertexDeclarationCache[streamMask >> 1][bMorph || bInstanced][declCacheKey];
-
-            if (!declCache.m_pDeclaration)
-            {
-                SOnDemandD3DVertexDeclaration Decl;
-                rd->EF_OnDemandVertexDeclaration(Decl, streamMask >> 1, psoDesc.m_VertexFormat, bMorph, bInstanced);
-
-                if (!Decl.m_Declaration.empty())
-                {
-                    auto hr = rd->GetDevice().CreateInputLayout(&Decl.m_Declaration[0], Decl.m_Declaration.size(), pVsInstance->m_pShaderData, pVsInstance->m_nDataSize, &declCache.m_pDeclaration);
-                    if (!SUCCEEDED(hr))
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            pInputLayout = declCache.m_pDeclaration;
-        }
-
-        if (!pInputLayout)
-        {
-            return false;
-        }
-    }
-
-    for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass < eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-    {
-        if (auto pShaderInstance = reinterpret_cast<CHWShader_D3D::SHWSInstance*>(hwShaders[shaderClass].pHwShaderInstance))
-        {
-            for (const auto& smp : pShaderInstance->m_Samplers)
-            {
-                m_Samplers[shaderClass][m_NumSamplers[shaderClass]++] = uint8(smp.m_BindingSlot);
-            }
-
-            for (const auto& tex : pShaderInstance->m_Textures)
-            {
-                m_SRVs[shaderClass][m_NumSRVs[shaderClass]++] = uint8(tex.m_BindingSlot);
-            }
-        }
-    }
-
-    m_PrimitiveTopology = rd->FX_ConvertPrimitiveType(psoDesc.m_PrimitiveType);
-    m_ShaderFlags_RT = psoDesc.m_ShaderFlags_RT;
-    m_ShaderFlags_MD = psoDesc.m_ShaderFlags_MD;
-    m_ShaderFlags_MDV = psoDesc.m_ShaderFlags_MDV;
-
-#if defined(ENABLE_PROFILING_CODE)
-    m_PrimitiveTypeForProfiling = psoDesc.m_PrimitiveType;
-#endif
-
-    return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CDeviceComputePSO_DX11 final
-    : public CDeviceComputePSO
-{
-public:
-    CDeviceComputePSO_DX11() {}
-    virtual ~CDeviceComputePSO_DX11() {}
-    virtual bool Build() final { return false; }
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-struct CDeviceResourceSet_DX11
-    : CDeviceResourceSet
-{
-    static const void* const InvalidPointer;
-
-    struct SCompiledConstantBuffer
-    {
-        AzRHI::ConstantBuffer* m_constantBuffer;
-        uint32 offset;
-        uint32 size;
-        uint64 code;
-        int    m_shaderSlot;
-    };
-
-    CDeviceResourceSet_DX11(CDeviceResourceSet::EFlags flags)
-        : CDeviceResourceSet(flags)
-    {}
-
-    virtual void Prepare() final {}
-    virtual void Build() final;
-
-    // set via reflection from shader
-    std::array< std::array<ID3D11ShaderResourceView*, MAX_TMU>, eHWSC_Num>                        compiledSRVs;
-    std::array< std::array<ID3D11SamplerState*,       MAX_TMU>, eHWSC_Num>                        compiledSamplers;
-
-    // set directly
-    std::array< std::array<SCompiledConstantBuffer, eConstantBufferShaderSlot_Count>, eHWSC_Num>  compiledCBs;
-    std::array<uint8_t,                                                               eHWSC_Num>  numCompiledCBs;
-};
-
-const void* const CDeviceResourceSet_DX11::InvalidPointer = (const void* const)0xBADA55;
-
-void CDeviceResourceSet_DX11::Build()
-{
-    for (auto& stage : compiledSRVs)
-    {
-        stage.fill((ID3D11ShaderResourceView*)InvalidPointer);
-    }
-
-    for (auto& stage : compiledSamplers)
-    {
-        stage.fill((ID3D11SamplerState*)InvalidPointer);
-    }
-
-    SCompiledConstantBuffer nullBuffer;
-    ZeroStruct(nullBuffer);
-
-    for (auto& stage : compiledCBs)
-    {
-        stage.fill(nullBuffer);
-    }
-
-    numCompiledCBs.fill(0);
-
-    for (const auto& it : m_Textures)
-    {
-        ID3D11ShaderResourceView* pSrv = nullptr;
-
-        if (CTexture* pTex = std::get<1>(it.second.resource))
-        {
-            if (pTex->GetDevTexture())
-            {
-                SResourceView::KeyType srvKey = std::get<0>(it.second.resource);
-                pSrv = reinterpret_cast<ID3D11ShaderResourceView*>(pTex->GetShaderResourceView(srvKey));
-            }
-        }
-
-        for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass != eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-        {
-            if (it.second.shaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-            {
-                compiledSRVs[shaderClass][it.first] = pSrv;
-            }
-        }
-
-    }
-
-    for (const auto& it : m_Buffers)
-    {
-        ID3D11ShaderResourceView* pSrv = it.second.resource.GetShaderResourceView();
-
-        for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass != eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-        {
-            if (it.second.shaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-            {
-                compiledSRVs[shaderClass][it.first] = pSrv;
-            }
-        }
-        AZ_Assert(pSrv != nullptr, "null buffer");
-    }
-
-    for (const auto& it : m_Samplers)
-    {
-        ID3D11SamplerState* pSamplerState = nullptr;
-
-        if (it.second.resource >= 0 && it.second.resource < CTexture::s_TexStates.size())
-        {
-            const auto& ts = CTexture::s_TexStates[it.second.resource];
-            pSamplerState = reinterpret_cast<ID3D11SamplerState*>(ts.m_pDeviceState);
-        }
-
-        for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass != eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-        {
-            if (it.second.shaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-            {
-                compiledSamplers[shaderClass][it.first] = pSamplerState;
-            }
-        }
-        AZ_Assert(pSamplerState != nullptr, "null sampler");
-    }
-
-    for (const auto& it : m_ConstantBuffers)
-    {
-        SCompiledConstantBuffer compiledCB;
-        ZeroStruct(compiledCB);
-
-        if (it.second.resource)
-        {
-            AzRHI::ConstantBuffer* buffer = it.second.resource.get();
-            compiledCB.m_constantBuffer = buffer;
-            compiledCB.code = buffer->GetCode();
-            compiledCB.offset = buffer->GetByteOffset();
-            compiledCB.size = buffer->GetByteCount();
-            compiledCB.m_shaderSlot = it.first;
-        }
-
-        for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass != eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-        {
-            if (it.second.shaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-            {
-                compiledCBs[shaderClass][numCompiledCBs[shaderClass]++] = compiledCB;
-            }
-        }
-        AZ_Assert(compiledCB.m_constantBuffer != nullptr, "null constant buffer");
-    }
-
-    m_bDirty = false;
-}
-
-class CDeviceResourceLayout_DX11
-    : public CDeviceResourceLayout
-{
-public:
-    ~CDeviceResourceLayout_DX11() override = default;
-    virtual bool Build() final
-    {
-        return IsValid();
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-class CDeviceGraphicsCommandList_DX11
-    : public CDeviceGraphicsCommandList
-{
-public:
-    template<typename T>
-    struct SCachedValue
-    {
-        T cachedValue;
-        SCachedValue() {}
-        SCachedValue(const T& value)
-            : cachedValue(value) {}
-
-        template<typename U>
-        inline bool Set(U newValue)
-        {
-#if defined(DX11_COMMANDLIST_REDUNDANT_STATE_FILTERING)
-            if (cachedValue == newValue)
-            {
-                return false;
-            }
-
-            cachedValue = newValue;
-            return true;
-#else
-            return true;
-#endif
-        }
-    };
-
-    CDeviceGraphicsCommandList_DX11()
-    {
-        Reset();
-    }
-
-    void SetResources_RequestedByShaderOnly(CDeviceResourceSet_DX11* pResources);
-    void SetResources_All(CDeviceResourceSet_DX11* pResources);
-
-    SCachedValue<ID3D11DepthStencilState*>              m_CurrentDS;
-    SCachedValue<ID3D11RasterizerState*>                m_CurrentRS;
-    SCachedValue<ID3D11BlendState*>                     m_CurrentBS;
-    SCachedValue<ID3D11InputLayout*>                    m_CurrentInputLayout;
-    SCachedValue<D3D11_PRIMITIVE_TOPOLOGY>              m_CurrentTopology;
-    SCachedValue<SStreamInfo>                           m_CurrentVertexStream[MAX_STREAMS];
-    SCachedValue<SStreamInfo>                           m_CurrentIndexStream;
-    SCachedValue<void*>                                 m_CurrentShader[eHWSC_Num];
-    SCachedValue<ID3D11ShaderResourceView*>             m_CurrentSRV[eHWSC_Num][MAX_TMU];
-    SCachedValue<ID3D11SamplerState*>                   m_CurrentSamplerState[eHWSC_Num][MAX_TMU];
-    SCachedValue<uint64>                                m_CurrentCB[eHWSC_Num][eConstantBufferShaderSlot_Count];
-
-    std::array< std::array<uint8, MAX_TMU>, eHWSC_Num > m_SRVs;
-    std::array< std::array<uint8, MAX_TMU>, eHWSC_Num > m_Samplers;
-
-    std::array<uint8, eHWSC_Num>                        m_NumSRVs;
-    std::array<uint8, eHWSC_Num>                        m_NumSamplers;
-
-    EShaderStage                                        m_ValidShaderStages;
-};
-
-#define GET_DX11_COMMANDLIST(abstractCommandList) reinterpret_cast<CDeviceGraphicsCommandList_DX11*>(abstractCommandList)
-
-void CDeviceGraphicsCommandList::SetRenderTargets(uint32 targetCount, CTexture** pTargets, SDepthTexture* pDepthTarget)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    ID3D11RenderTargetView* pRTV[RT_STACK_WIDTH] = { NULL };
-
-    for (int i = 0; i < targetCount; ++i)
-    {
-        if (auto pView = pTargets[i]->GetSurface(0, 0))
-        {
-            pRTV[i] = pView;
-        }
-    }
-
-    rd->GetDeviceContext().OMSetRenderTargets(targetCount, pRTV, pDepthTarget ? static_cast<D3DDepthSurface*>(pDepthTarget->pSurf) : NULL);
-}
-
-void CDeviceGraphicsCommandList::SetViewports(uint32 vpCount, const D3DViewPort* pViewports)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    rd->GetDeviceContext().RSSetViewports(vpCount, pViewports);
-}
-
-void CDeviceGraphicsCommandList::SetScissorRects(uint32 rcCount, const D3DRectangle* pRects)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    rd->GetDeviceContext().RSSetScissorRects(rcCount, pRects);
-}
-
-void CDeviceGraphicsCommandList::SetPipelineStateImpl(CDeviceGraphicsPSOPtr devicePSO)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    CDeviceGraphicsPSO_DX11* pDevicePSO = reinterpret_cast<CDeviceGraphicsPSO_DX11*>(devicePSO);
-    CDeviceGraphicsCommandList_DX11* pCmdList = GET_DX11_COMMANDLIST(this);
-
-    // RasterState, DepthStencilState, BlendState
-    if (pCmdList->m_CurrentDS.Set(pDevicePSO->pDepthStencilState))
-    {
-        rd->m_DevMan.SetDepthStencilState(pDevicePSO->pDepthStencilState, 0);
-    }
-    if (pCmdList->m_CurrentBS.Set(pDevicePSO->pBlendState))
-    {
-        rd->m_DevMan.SetBlendState(pDevicePSO->pBlendState, NULL, 0xffffffff);
-    }
-    if (pCmdList->m_CurrentRS.Set(pDevicePSO->pRasterizerState))
-    {
-        rd->m_DevMan.SetRasterState(pDevicePSO->pRasterizerState);
-    }
-
-    // Shaders
-    const std::array<void*, eHWSC_Num>& shaders = pDevicePSO->m_pDeviceShaders;
-    if (pCmdList->m_CurrentShader[eHWSC_Vertex].Set(shaders[eHWSC_Vertex]))
-    {
-        rd->m_DevMan.BindShader(eHWSC_Vertex, (ID3D11Resource*)shaders[eHWSC_Vertex]);
-    }
-    if (pCmdList->m_CurrentShader[eHWSC_Pixel].Set(shaders[eHWSC_Pixel]))
-    {
-        rd->m_DevMan.BindShader(eHWSC_Pixel, (ID3D11Resource*)shaders[eHWSC_Pixel]);
-    }
-    if (pCmdList->m_CurrentShader[eHWSC_Geometry].Set(shaders[eHWSC_Geometry]))
-    {
-        rd->m_DevMan.BindShader(eHWSC_Geometry, (ID3D11Resource*)shaders[eHWSC_Geometry]);
-    }
-    if (pCmdList->m_CurrentShader[eHWSC_Domain].Set(shaders[eHWSC_Domain]))
-    {
-        rd->m_DevMan.BindShader(eHWSC_Domain, (ID3D11Resource*)shaders[eHWSC_Domain]);
-    }
-    if (pCmdList->m_CurrentShader[eHWSC_Hull].Set(shaders[eHWSC_Hull]))
-    {
-        rd->m_DevMan.BindShader(eHWSC_Hull, (ID3D11Resource*)shaders[eHWSC_Hull]);
-    }
-
-    // input layout and topology
-    if (pCmdList->m_CurrentInputLayout.Set(pDevicePSO->pInputLayout))
-    {
-        rd->m_DevMan.BindVtxDecl(pDevicePSO->pInputLayout);
-    }
-    if (pCmdList->m_CurrentTopology.Set(pDevicePSO->m_PrimitiveTopology))
-    {
-        rd->m_DevMan.BindTopology(pDevicePSO->m_PrimitiveTopology);
-    }
-
-    // update valid shader mask
-    pCmdList->m_ValidShaderStages = EShaderStage_None;
-    if (pDevicePSO->m_pDeviceShaders[eHWSC_Vertex])
-    {
-        pCmdList->m_ValidShaderStages |= EShaderStage_Vertex;
-    }
-    if (pDevicePSO->m_pDeviceShaders[eHWSC_Pixel])
-    {
-        pCmdList->m_ValidShaderStages |= EShaderStage_Pixel;
-    }
-    if (pDevicePSO->m_pDeviceShaders[eHWSC_Geometry])
-    {
-        pCmdList->m_ValidShaderStages |= EShaderStage_Geometry;
-    }
-    if (pDevicePSO->m_pDeviceShaders[eHWSC_Domain])
-    {
-        pCmdList->m_ValidShaderStages |= EShaderStage_Domain;
-    }
-    if (pDevicePSO->m_pDeviceShaders[eHWSC_Hull])
-    {
-        pCmdList->m_ValidShaderStages |= EShaderStage_Hull;
-    }
-
-    pCmdList->m_SRVs     = pDevicePSO->m_SRVs;
-    pCmdList->m_Samplers = pDevicePSO->m_Samplers;
-
-    pCmdList->m_NumSRVs     = pDevicePSO->m_NumSRVs;
-    pCmdList->m_NumSamplers = pDevicePSO->m_NumSamplers;
-
-    // TheoM TODO: REMOVE once shaders are set up completely via pso
-    rd->m_RP.m_FlagsShader_RT = pDevicePSO->m_ShaderFlags_RT;
-    rd->m_RP.m_FlagsShader_MD = pDevicePSO->m_ShaderFlags_MD;
-    rd->m_RP.m_FlagsShader_MDV = pDevicePSO->m_ShaderFlags_MDV;
-}
-
-void CDeviceGraphicsCommandList::SetResourceLayout([[maybe_unused]] CDeviceResourceLayout* pResourceLayout)
-{
-}
-
-void CDeviceGraphicsCommandList::SetResourcesImpl([[maybe_unused]] uint32 bindSlot, CDeviceResourceSet* pResources)
-{
-    auto pCmdList = GET_DX11_COMMANDLIST(this);
-    auto pResourcesDX11 = reinterpret_cast<CDeviceResourceSet_DX11*>(pResources);
-
-    if (pResources->GetFlags() & CDeviceResourceSet::EFlags_ForceSetAllState)
-    {
-        pCmdList->SetResources_All(pResourcesDX11);
-    }
-    else
-    {
-        pCmdList->SetResources_RequestedByShaderOnly(pResourcesDX11);
-    }
-}
-
-void CDeviceGraphicsCommandList_DX11::SetResources_RequestedByShaderOnly(CDeviceResourceSet_DX11* pResources)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass != eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-    {
-        if (m_ValidShaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-        {
-            // Bind SRVs
-            // if (!pResources->compiledSRVs.empty()) // currently this is always the case
-            {
-                for (int i = 0; i < m_NumSRVs[shaderClass]; ++i)
-                {
-                    uint8 srvSlot = m_SRVs[shaderClass][i];
-                    ID3D11ShaderResourceView* pSrv = pResources->compiledSRVs[shaderClass][srvSlot];
-
-                    if (pSrv != CDeviceResourceSet_DX11::InvalidPointer)
-                    {
-                        if (m_CurrentSRV[shaderClass][srvSlot].Set(pSrv))
-                        {
-                            switch (shaderClass)
-                            {
-                            case eHWSC_Vertex:
-                                rd->m_DevMan.BindSRV(eHWSC_Vertex, pSrv, srvSlot);
-                                break;
-                            case eHWSC_Pixel:
-                                rd->m_DevMan.BindSRV(eHWSC_Pixel, pSrv, srvSlot);
-                                break;
-                            case eHWSC_Geometry:
-                                rd->m_DevMan.BindSRV(eHWSC_Geometry, pSrv, srvSlot);
-                                break;
-                            case eHWSC_Domain:
-                                rd->m_DevMan.BindSRV(eHWSC_Domain, pSrv, srvSlot);
-                                break;
-                            case eHWSC_Hull:
-                                rd->m_DevMan.BindSRV(eHWSC_Hull, pSrv, srvSlot);
-                                break;
-                            default:
-                                CRY_ASSERT(false);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Bind Samplers
-            if (!pResources->compiledSamplers.empty())
-            {
-                for (int i = 0; i < m_NumSamplers[shaderClass]; ++i)
-                {
-                    uint8 samplerSlot = m_Samplers[shaderClass][i];
-                    ID3D11SamplerState* pSamplerState = pResources->compiledSamplers[shaderClass][samplerSlot];
-
-                    if (pSamplerState != CDeviceResourceSet_DX11::InvalidPointer)
-                    {
-                        if (m_CurrentSamplerState[shaderClass][samplerSlot].Set(pSamplerState))
-                        {
-                            switch (shaderClass)
-                            {
-                            case eHWSC_Vertex:
-                                rd->m_DevMan.BindSampler(eHWSC_Vertex, pSamplerState, samplerSlot);
-                                break;
-                            case eHWSC_Pixel:
-                                rd->m_DevMan.BindSampler(eHWSC_Pixel, pSamplerState, samplerSlot);
-                                break;
-                            case eHWSC_Geometry:
-                                rd->m_DevMan.BindSampler(eHWSC_Geometry, pSamplerState, samplerSlot);
-                                break;
-                            case eHWSC_Domain:
-                                rd->m_DevMan.BindSampler(eHWSC_Domain, pSamplerState, samplerSlot);
-                                break;
-                            case eHWSC_Hull:
-                                rd->m_DevMan.BindSampler(eHWSC_Hull, pSamplerState, samplerSlot);
-                                break;
-                            default:
-                                CRY_ASSERT(false);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Bind constant buffers
-            for (int i = 0; i < pResources->numCompiledCBs[shaderClass]; ++i)
-            {
-                const CDeviceResourceSet_DX11::SCompiledConstantBuffer& cb = pResources->compiledCBs[shaderClass][i];
-                if (m_CurrentCB[shaderClass][cb.m_shaderSlot].Set(cb.code))
-                {
-                    switch (shaderClass)
-                    {
-                    case eHWSC_Vertex:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Vertex, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Pixel:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Pixel, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Geometry:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Geometry, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Domain:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Domain, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Hull:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Hull, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    default:
-                        CRY_ASSERT(false);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void CDeviceGraphicsCommandList_DX11::SetResources_All(CDeviceResourceSet_DX11* pResources)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass != eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-    {
-        if (m_ValidShaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-        {
-            // Bind SRVs
-            for (int slot = 0; slot < pResources->compiledSRVs[shaderClass].size(); ++slot)
-            {
-                ID3D11ShaderResourceView* pSrv = pResources->compiledSRVs[shaderClass][slot];
-
-                if (pSrv != CDeviceResourceSet_DX11::InvalidPointer)
-                {
-                    if (m_CurrentSRV[shaderClass][slot].Set(pSrv))
-                    {
-                        switch (shaderClass)
-                        {
-                        case eHWSC_Vertex:
-                            rd->m_DevMan.BindSRV(eHWSC_Vertex, pSrv, slot);
-                            break;
-                        case eHWSC_Pixel:
-                            rd->m_DevMan.BindSRV(eHWSC_Pixel, pSrv, slot);
-                            break;
-                        case eHWSC_Geometry:
-                            rd->m_DevMan.BindSRV(eHWSC_Geometry, pSrv, slot);
-                            break;
-                        case eHWSC_Domain:
-                            rd->m_DevMan.BindSRV(eHWSC_Domain, pSrv, slot);
-                            break;
-                        case eHWSC_Hull:
-                            rd->m_DevMan.BindSRV(eHWSC_Hull, pSrv, slot);
-                            break;
-                        default:
-                            CRY_ASSERT(false);
-                        }
-                    }
-                }
-            }
-
-            // Bind Samplers
-            for (int slot = 0; slot < pResources->compiledSamplers[shaderClass].size(); ++slot)
-            {
-                ID3D11SamplerState* pSamplerState = pResources->compiledSamplers[shaderClass][slot];
-
-                if (pSamplerState != CDeviceResourceSet_DX11::InvalidPointer)
-                {
-                    if (m_CurrentSamplerState[shaderClass][slot].Set(pSamplerState))
-                    {
-                        switch (shaderClass)
-                        {
-                        case eHWSC_Vertex:
-                            rd->m_DevMan.BindSampler(eHWSC_Vertex, pSamplerState, slot);
-                            break;
-                        case eHWSC_Pixel:
-                            rd->m_DevMan.BindSampler(eHWSC_Pixel, pSamplerState, slot);
-                            break;
-                        case eHWSC_Geometry:
-                            rd->m_DevMan.BindSampler(eHWSC_Geometry, pSamplerState, slot);
-                            break;
-                        case eHWSC_Domain:
-                            rd->m_DevMan.BindSampler(eHWSC_Domain, pSamplerState, slot);
-                            break;
-                        case eHWSC_Hull:
-                            rd->m_DevMan.BindSampler(eHWSC_Hull, pSamplerState, slot);
-                            break;
-                        default:
-                            CRY_ASSERT(false);
-                        }
-                    }
-                }
-            }
-
-            // Bind constant buffers
-            for (int i = 0; i < pResources->numCompiledCBs[shaderClass]; ++i)
-            {
-                const CDeviceResourceSet_DX11::SCompiledConstantBuffer& cb = pResources->compiledCBs[shaderClass][i];
-                if (m_CurrentCB[shaderClass][cb.m_shaderSlot].Set(cb.code))
-                {
-                    switch (shaderClass)
-                    {
-                    case eHWSC_Vertex:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Vertex, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Pixel:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Pixel, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Geometry:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Geometry, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Domain:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Domain, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    case eHWSC_Hull:
-                        rd->m_DevMan.BindConstantBuffer(eHWSC_Hull, cb.m_constantBuffer, cb.m_shaderSlot);
-                        break;
-                    default:
-                        CRY_ASSERT(false);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void CDeviceGraphicsCommandList::SetInlineConstantBuffer(uint32 bindSlot, AzRHI::ConstantBuffer* pBuffer, EConstantBufferShaderSlot shaderSlot, EShaderStage shaderStages)
-{
-    for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass < eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-    {
-        if (shaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-        {
-            SetInlineConstantBuffer(bindSlot, pBuffer, shaderSlot, shaderClass);
-        }
-    }
-}
-
-void CDeviceGraphicsCommandList::SetInlineConstantBuffer([[maybe_unused]] uint32 bindSlot, AzRHI::ConstantBuffer* pBuffer, EConstantBufferShaderSlot shaderSlot, EHWShaderClass shaderClass)
-{
-    auto pCmdList = GET_DX11_COMMANDLIST(this);
-
-    if (pCmdList->m_CurrentCB[shaderClass][shaderSlot].Set(pBuffer->GetCode()))
-    {
-        switch (shaderClass)
-        {
-        case eHWSC_Vertex:
-            gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Vertex, pBuffer, shaderSlot);
-            break;
-        case eHWSC_Pixel:
-            gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Pixel, pBuffer, shaderSlot);
-            break;
-        case eHWSC_Geometry:
-            gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Geometry, pBuffer, shaderSlot);
-            break;
-        case eHWSC_Domain:
-            gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Domain, pBuffer, shaderSlot);
-            break;
-        case eHWSC_Hull:
-            gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Hull, pBuffer, shaderSlot);
-            break;
-        }
-    }
-}
-
-void CDeviceGraphicsCommandList::SetVertexBuffers(uint32 bufferCount, D3DBuffer** pBuffers, size_t* offsets, uint32* strides)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    auto pCmdList = GET_DX11_COMMANDLIST(this);
-
-    for (uint32 slot = 0; slot < bufferCount; ++slot)
-    {
-        if (pCmdList->m_CurrentVertexStream[slot].Set(SStreamInfo(pBuffers[slot], offsets[slot], strides[slot])))
-        {
-            rd->m_DevMan.BindVB(pBuffers[slot], slot, offsets[slot], strides[slot]);
-        }
-    }
-}
-
-void CDeviceGraphicsCommandList::SetVertexBuffers(uint32 streamCount, const SStreamInfo* streams)
-{
-    auto pCmdList = GET_DX11_COMMANDLIST(this);
-
-    for (uint32 slot = 0; slot < streamCount; ++slot)
-    {
-        if (streams[slot].pStream && pCmdList->m_CurrentVertexStream[slot].Set(streams[slot]))
-        {
-            D3DBuffer* pBuffer = const_cast<D3DBuffer*>(reinterpret_cast<const D3DBuffer*>(streams[slot].pStream));
-            gcpRendD3D->m_DevMan.BindVB(pBuffer, slot, streams[slot].nOffset, streams[slot].nStride);
-        }
-    }
-}
-
-void CDeviceGraphicsCommandList::SetIndexBuffer(const SStreamInfo& indexStream)
-{
-    auto pCmdList = GET_DX11_COMMANDLIST(this);
-
-    if (pCmdList->m_CurrentIndexStream.Set(indexStream))
-    {
-        D3DBuffer* pIB = const_cast<D3DBuffer*>(reinterpret_cast<const D3DBuffer*>(indexStream.pStream));
-
-#if !defined(SUPPORT_FLEXIBLE_INDEXBUFFER)
-        gcpRendD3D->m_DevMan.BindIB(pIB, indexStream.nOffset, DXGI_FORMAT_R16_UINT);
-#else
-        gcpRendD3D->m_DevMan.BindIB(pIB, indexStream.nOffset, (DXGI_FORMAT)indexStream.nStride);
-#endif
-    }
-}
-
-void CDeviceGraphicsCommandList::SetInlineConstants([[maybe_unused]] uint32 bindSlot, [[maybe_unused]] uint32 constantCount, [[maybe_unused]] float* pConstants)
-{
-}
-
-void CDeviceGraphicsCommandList::SetStencilRefImpl(uint8_t stencilRefValue)
-{
-    ID3D11DepthStencilState* pDS = NULL;
-
-    if (m_pCurrentPipelineState)
-    {
-        pDS = reinterpret_cast<CDeviceGraphicsPSO_DX11*>(m_pCurrentPipelineState)->pDepthStencilState;
-    }
-
-    gcpRendD3D->m_DevMan.SetDepthStencilState(pDS, stencilRefValue);
-}
-
-void CDeviceGraphicsCommandList::DrawImpl(uint32 VertexCountPerInstance, uint32 InstanceCount, uint32 StartVertexLocation, uint32 StartInstanceLocation)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (InstanceCount > 1)
-    {
-        rd->m_DevMan.DrawInstanced(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation);
-    }
-    else
-    {
-        rd->m_DevMan.Draw(VertexCountPerInstance, StartVertexLocation);
-    }
-}
-
-void CDeviceGraphicsCommandList::DrawIndexedImpl(uint32 IndexCountPerInstance, uint32 InstanceCount, uint32 StartIndexLocation, int BaseVertexLocation, uint32 StartInstanceLocation)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-#if !defined(SUPPORT_FLEXIBLE_INDEXBUFFER)
-    STATIC_CHECK(false, "NOT IMPLEMENTED");
-#endif
-
-    if (InstanceCount > 1)
-    {
-        rd->m_DevMan.DrawIndexedInstanced(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation);
-    }
-    else
-    {
-        rd->m_DevMan.DrawIndexed(IndexCountPerInstance, StartIndexLocation, BaseVertexLocation);
-    }
-}
-
-void CDeviceGraphicsCommandList::ClearSurface(D3DSurface* pView, const FLOAT Color[4], UINT NumRects, const D3D11_RECT* pRect)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    rd->FX_ClearTarget(pView, ColorF(Color[0], Color[1], Color[2], Color[3]), NumRects, pRect);
-}
-
-void CDeviceGraphicsCommandList::LockToThread()
-{
-    // ...
-}
-
-void CDeviceGraphicsCommandList::Build()
-{
-    // pContext->FinishCommandList(false, ID3D11CommandList)
-}
-
-void CDeviceGraphicsCommandList::ResetImpl()
-{
-    auto pCmdList = GET_DX11_COMMANDLIST(this);
-
-    pCmdList->m_CurrentDS = nullptr;
-    pCmdList->m_CurrentInputLayout = nullptr;
-    pCmdList->m_CurrentRS = nullptr;
-    pCmdList->m_CurrentTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
-    pCmdList->m_CurrentBS = nullptr;
-    pCmdList->m_ValidShaderStages = EShaderStage_All;
-
-    for (int i = 0; i < CRY_ARRAY_COUNT(pCmdList->m_CurrentVertexStream); ++i)
-    {
-        pCmdList->m_CurrentVertexStream[i] = SStreamInfo(nullptr, 0, 0);
-    }
-
-    pCmdList->m_CurrentIndexStream = SStreamInfo(nullptr, 0, 0);
-
-    memset(pCmdList->m_CurrentShader,       0x0, sizeof(pCmdList->m_CurrentShader));
-    memset(pCmdList->m_CurrentSRV,          0x0, sizeof(pCmdList->m_CurrentSRV));
-    memset(pCmdList->m_CurrentSamplerState, 0x0, sizeof(pCmdList->m_CurrentSamplerState));
-    memset(pCmdList->m_CurrentCB,           0x0, sizeof(pCmdList->m_CurrentCB));
-
-    pCmdList->m_NumSRVs.fill(0);
-    pCmdList->m_NumSamplers.fill(0);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeviceComputeCommandList::SetPipelineStateImpl(CDeviceComputePSOPtr devicePSO)
-{
-}
-
-void CDeviceComputeCommandList::DispatchImpl([[maybe_unused]] uint32 X, [[maybe_unused]] uint32 Y, [[maybe_unused]] uint32 Z)
-{
-}
-
-void CDeviceComputeCommandList::LockToThread()
-{
-    // ...
-}
-
-void CDeviceComputeCommandList::Build()
-{
-    // pContext->FinishCommandList(false, ID3D11CommandList)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CDeviceCopyCommandList::LockToThread()
-{
-    // ...
-}
-
-void CDeviceCopyCommandList::Build()
-{
-    // pContext->FinishCommandList(false, ID3D11CommandList)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-CDeviceObjectFactory::CDeviceObjectFactory()
-{
-    m_pCoreCommandList = AZStd::make_shared<CDeviceGraphicsCommandList_DX11>();
-}
-
-CDeviceGraphicsPSOUPtr CDeviceObjectFactory::CreateGraphicsPSOImpl(const CDeviceGraphicsPSODesc& psoDesc) const
-{
-    auto pResult = CryMakeUnique<CDeviceGraphicsPSO_DX11>();
-    if (pResult->Init(psoDesc))
-    {
-        return AZStd::move(pResult);
-    }
-
-    return nullptr;
-}
-
-CDeviceComputePSOPtr CDeviceObjectFactory::CreateComputePSO(CDeviceResourceLayoutPtr pResourceLayout) const
-{
-    return AZStd::make_shared<CDeviceComputePSO_DX11>();
-}
-
-CDeviceResourceSetPtr CDeviceObjectFactory::CreateResourceSet(CDeviceResourceSet::EFlags flags) const
-{
-    return AZStd::make_shared<CDeviceResourceSet_DX11>(flags);
-}
-
-CDeviceResourceLayoutPtr CDeviceObjectFactory::CreateResourceLayout() const
-{
-    return AZStd::make_shared<CDeviceResourceLayout_DX11>();
-}
-
-CDeviceGraphicsCommandListPtr CDeviceObjectFactory::GetCoreGraphicsCommandList() const
-{
-    return m_pCoreCommandList;
-}
-
-// Acquire one or more command-lists which are independent of the core command-list
-// Only one thread is allowed to call functions on this command-list (DX12 restriction).
-// The thread that gets the permition is the one calling Begin() on it AFAIS
-CDeviceGraphicsCommandListUPtr CDeviceObjectFactory::AcquireGraphicsCommandList()
-{
-    // TODO: implement deferred contexts
-    __debugbreak();
-
-    return CryMakeUnique<CDeviceGraphicsCommandList>();
-}
-
-std::vector<CDeviceGraphicsCommandListUPtr> CDeviceObjectFactory::AcquireGraphicsCommandLists(uint32 listCount)
-{
-    // TODO: implement deferred contexts
-    __debugbreak();
-
-    return (std::vector<CDeviceGraphicsCommandListUPtr>(size_t(listCount)));
-}
-
-void CDeviceObjectFactory::ForfeitGraphicsCommandList(CDeviceGraphicsCommandListUPtr pCommandList)
-{
-    // TODO: implement deferred contexts
-    __debugbreak();
-
-    // pContext->ExecuteCommandList(ID3D11CommandList)
-}
-
-void CDeviceObjectFactory::ForfeitGraphicsCommandLists(std::vector<CDeviceGraphicsCommandListUPtr> pCommandLists)
-{
-    // TODO: implement deferred contexts
-    __debugbreak();
-
-    // pContext->ExecuteCommandList(ID3D11CommandList)
-}
-
-#undef DEVICEWRAPPER12_D3D11_CPP_WRAP_DX11
-#endif
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12_D3D12.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12_D3D12.cpp
deleted file mode 100644
index e071ab952f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/DeviceWrapper12_D3D12.cpp
+++ /dev/null
@@ -1,1093 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "CryCustomTypes.h"
-#include "CryUtils.h"
-#include "../DeviceManager/DeviceWrapper12.h"
-#include "DriverD3D.h"
-#include <AzCore/std/smart_ptr/make_shared.h>
-
-#if defined(CRY_USE_DX12)
-#define CRY_USE_DX12_NATIVE
-#endif
-
-#if defined(CRY_USE_DX12_NATIVE)
-
-using namespace DX12;
-D3D12_SHADER_BYTECODE g_EmptyShader;
-
-static DX12::Device* GetDevice()
-{
-    return reinterpret_cast<CCryDX12Device&>(gcpRendD3D->GetDevice()).GetDX12Device();
-}
-
-D3D12_SHADER_RESOURCE_VIEW_DESC GetNullSrvDesc(const CTexture* pTexture)
-{
-    D3D12_SRV_DIMENSION viewDimension[eTT_MaxTexType] =
-    {
-        D3D12_SRV_DIMENSION_TEXTURE1D,                      // eTT_1D
-        D3D12_SRV_DIMENSION_TEXTURE2D,                      // eTT_2D
-        D3D12_SRV_DIMENSION_TEXTURE3D,                      // eTT_3D
-        D3D12_SRV_DIMENSION_TEXTURECUBE,                    // eTT_Cube
-        D3D12_SRV_DIMENSION_TEXTURECUBEARRAY,               // eTT_CubeArray
-        D3D12_SRV_DIMENSION_TEXTURE2D,                      // eTT_Dyn2D
-        D3D12_SRV_DIMENSION_TEXTURE2D,                      // eTT_User
-        D3D12_SRV_DIMENSION_TEXTURECUBE,                    // eTT_NearestCube
-        D3D12_SRV_DIMENSION_TEXTURE2DARRAY,                 // eTT_2DArray
-        D3D12_SRV_DIMENSION_TEXTURE2DMS,                    // eTT_2DMS
-        D3D12_SRV_DIMENSION_TEXTURE2D,                      // eTT_Auto2D
-    };
-
-    D3D12_SHADER_RESOURCE_VIEW_DESC srvDesc;
-    ZeroStruct(srvDesc);
-
-    srvDesc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
-    srvDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-    srvDesc.ViewDimension = pTexture ? viewDimension[pTexture->GetTexType()] : D3D12_SRV_DIMENSION_TEXTURE2D;
-
-    return srvDesc;
-}
-
-
-D3D12_SHADER_RESOURCE_VIEW_DESC GetNullSrvDesc([[maybe_unused]] const WrappedDX11Buffer& buffer)
-{
-    D3D12_SHADER_RESOURCE_VIEW_DESC srvDesc;
-    ZeroStruct(srvDesc);
-    srvDesc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
-    srvDesc.Format = DXGI_FORMAT_R32_UINT;
-    srvDesc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
-
-    return srvDesc;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CDeviceResourceSet_DX12
-    : public CDeviceResourceSet
-{
-public:
-    friend CDeviceGraphicsCommandList;
-    friend CDeviceComputeCommandList;
-
-    CDeviceResourceSet_DX12(Device* pDevice, CDeviceResourceSet::EFlags flags)
-        : CDeviceResourceSet(flags)
-        , m_pDevice(pDevice)
-        , m_DescriptorBlockHandle(NULL)
-    {}
-
-    virtual void Prepare() final;
-    virtual void Build() final;
-
-    const DescriptorBlock& GetDescriptorBlock() const { return m_DescriptorBlock; }
-
-protected:
-    DX12::SmartPtr<Device> m_pDevice;
-    SDescriptorBlock* m_DescriptorBlockHandle;
-    DescriptorBlock  m_DescriptorBlock;
-};
-
-// requires command-list
-void CDeviceResourceSet_DX12::Prepare()
-{
-    // Trigger initial buffer uploads asynchronously, before the resource is used
-    // TODO: should go through a CopyCommandList at the beginning of a frame
-
-    auto pContext = reinterpret_cast<CCryDX12DeviceContext*>(&gcpRendD3D->GetDeviceContext());
-    auto pCommandList = pContext->GetCoreGraphicsCommandList();
-
-    for (const auto& it : m_ConstantBuffers)
-    {
-        if (AzRHI::ConstantBuffer* pBuffer = it.second.resource)
-        {
-            if (auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(pBuffer->GetPlatformBuffer()))
-            {
-                if (pResource->GetDX12Resource().InitHasBeenDeferred())
-                {
-                    pResource->GetDX12Resource().TryStagingUpload(pCommandList);
-                }
-            }
-        }
-    }
-
-    for (const auto& it : m_Textures)
-    {
-        if (CTexture* pTexture = std::get<1>(it.second.resource))
-        {
-            if (auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(pTexture->GetDevTexture() ? pTexture->GetDevTexture()->GetBaseTexture() : nullptr))
-            {
-                if (pResource->GetDX12Resource().InitHasBeenDeferred())
-                {
-                    pResource->GetDX12Resource().TryStagingUpload(pCommandList);
-                }
-            }
-        }
-    }
-
-    for (const auto& it : m_Buffers)
-    {
-        if (auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(it.second.resource.m_pBuffer))
-        {
-            if (pResource->GetDX12Resource().InitHasBeenDeferred())
-            {
-                pResource->GetDX12Resource().TryStagingUpload(pCommandList);
-            }
-        }
-    }
-}
-
-// requires no command-list, just a device
-void CDeviceResourceSet_DX12::Build()
-{
-    // NOTE: will deadlock multi-threaded command-lists when uploads occur on the core command-list (which has a fence-value larger than the active command-list)
-    // TODO: call from somewhere safe
-    Prepare();
-
-    if (m_DescriptorBlockHandle != NULL)
-    {
-        gcpRendD3D->m_DevBufMan.ReleaseDescriptorBlock(m_DescriptorBlockHandle);
-    }
-
-    // CBV_SRV_UAV heap, SMP heap not yet supported
-    uint32 numberResources = m_ConstantBuffers.size() + m_Textures.size() + m_Buffers.size();
-    uint32 blockSize = std::max(numberResources, 1u);
-
-    m_DescriptorBlockHandle = gcpRendD3D->m_DevBufMan.CreateDescriptorBlock(blockSize);
-    m_DescriptorBlock = DescriptorBlock(*m_DescriptorBlockHandle);
-
-    for (const auto& it : m_ConstantBuffers)
-    {
-        auto cbData = it.second;
-        if (!cbData.resource || !cbData.resource->GetPlatformBuffer())
-        {
-            m_pDevice->GetD3D12Device()->CreateConstantBufferView(nullptr, m_DescriptorBlock.GetHandleOffsetCPU(0));
-            m_DescriptorBlock.IncrementCursor();
-            continue;
-        }
-
-        AzRHI::ConstantBuffer& constantBuffer = *cbData.resource.get();
-        AZ::u32 start = constantBuffer.GetByteOffset();
-        AZ::u32 length = constantBuffer.GetByteCount();
-        DX12::ResourceView& bufferView = reinterpret_cast<CCryDX12Buffer*>(constantBuffer.GetPlatformBuffer())->GetDX12View();
-        assert(bufferView.GetType() == EVT_ConstantBufferView);
-
-        {
-            D3D12_CONSTANT_BUFFER_VIEW_DESC cbvDesc;
-
-            cbvDesc = bufferView.GetCBVDesc();
-            cbvDesc.BufferLocation += start;
-            cbvDesc.SizeInBytes = length > 0 ? length : cbvDesc.SizeInBytes - start;
-            cbvDesc.SizeInBytes = min(cbvDesc.SizeInBytes, D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT * DX12::CONSTANT_BUFFER_ELEMENT_SIZE);
-
-            m_pDevice->GetD3D12Device()->CreateConstantBufferView(&cbvDesc, m_DescriptorBlock.GetHandleOffsetCPU(0));
-        }
-
-        m_DescriptorBlock.IncrementCursor();
-    }
-
-    for (const auto& it : m_Textures)
-    {
-        SResourceView::KeyType srvKey = std::get<0>(it.second.resource);
-        CTexture* pTexture            = std::get<1>(it.second.resource);
-
-        if (!pTexture || !pTexture->GetDevTexture())
-        {
-            auto srvDesc = GetNullSrvDesc(pTexture);
-            m_pDevice->GetD3D12Device()->CreateShaderResourceView(nullptr, &srvDesc, m_DescriptorBlock.GetHandleOffsetCPU(0));
-        }
-        else
-        {
-            DX12::ResourceView& srv = reinterpret_cast<CCryDX12ShaderResourceView*>(pTexture->GetShaderResourceView(srvKey))->GetDX12View();
-            m_pDevice->GetD3D12Device()->CopyDescriptorsSimple(1, m_DescriptorBlock.GetHandleOffsetCPU(0), srv.GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-        }
-
-        m_DescriptorBlock.IncrementCursor();
-    }
-
-    for (const auto& it : m_Buffers)
-    {
-        if (!it.second.resource.GetShaderResourceView())
-        {
-            auto srvDesc = GetNullSrvDesc(it.second.resource);
-            m_pDevice->GetD3D12Device()->CreateShaderResourceView(nullptr, &srvDesc, m_DescriptorBlock.GetHandleOffsetCPU(0));
-        }
-        else
-        {
-            DX12::ResourceView& srv = reinterpret_cast<CCryDX12ShaderResourceView*>(it.second.resource.GetShaderResourceView())->GetDX12View();
-            m_pDevice->GetD3D12Device()->CopyDescriptorsSimple(1, m_DescriptorBlock.GetHandleOffsetCPU(0), srv.GetDescriptorHandle(), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-        }
-
-        m_DescriptorBlock.IncrementCursor();
-    }
-
-    assert(m_DescriptorBlock.GetCursor() == m_DescriptorBlock.GetCapacity());
-
-    // set descriptor block cursor to block start again
-    m_DescriptorBlock.Reset();
-
-    m_bDirty = false;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CDeviceResourceLayout_DX12
-    : public CDeviceResourceLayout
-{
-public:
-    CDeviceResourceLayout_DX12(Device* pDevice)
-        : m_pDevice(pDevice)
-    {}
-
-    virtual bool Build() final;
-
-    RootSignature* GetRootSignature() const { return m_pRootSignature.get(); }
-
-protected:
-    DX12::SmartPtr<Device> m_pDevice;
-    DX12::SmartPtr<RootSignature> m_pRootSignature;
-};
-
-bool CDeviceResourceLayout_DX12::Build()
-{
-    if (!IsValid())
-    {
-        return false;
-    }
-
-    auto getShaderVisibility = [&](::EShaderStage shaderStages)
-        {
-            D3D12_SHADER_VISIBILITY shaderVisibility[eHWSC_Num + 1] =
-            {
-                D3D12_SHADER_VISIBILITY_VERTEX, // eHWSC_Vertex
-                D3D12_SHADER_VISIBILITY_PIXEL,  // eHWSC_Pixel
-                D3D12_SHADER_VISIBILITY_GEOMETRY, // eHWSC_Geometry
-                D3D12_SHADER_VISIBILITY_ALL,    // eHWSC_Compute
-                D3D12_SHADER_VISIBILITY_DOMAIN, // eHWSC_Domain
-                D3D12_SHADER_VISIBILITY_HULL,   // eHWSC_Hull
-                D3D12_SHADER_VISIBILITY_ALL,    // eHWSC_Num
-            };
-
-            EHWShaderClass shaderClass = eHWSC_Num;
-
-            if ((int(shaderStages) & (int(shaderStages) - 1)) == 0) // only bound to a single shader stage?
-            {
-                for (shaderClass = eHWSC_Vertex; shaderClass != eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-                {
-                    if (shaderStages & SHADERSTAGE_FROM_SHADERCLASS(shaderClass))
-                    {
-                        break;
-                    }
-                }
-            }
-
-            return shaderVisibility[shaderClass];
-        };
-
-    PipelineLayout pipelineLayout;
-
-    // inline constants
-    if (m_InlineConstantCount > 0)
-    {
-        AZ_Assert(0, "Inline constant is not supported yet");
-        pipelineLayout.m_RootParameters[0].InitAsConstants(m_InlineConstantCount, InlineConstantsShaderSlot);
-        pipelineLayout.m_NumRootParameters++;
-    }
-
-    // inline constant buffers
-    for (auto it : m_ConstantBuffers)
-    {
-        const int bindSlot = it.first;
-        const SConstantBufferShaderBinding& cb = it.second;
-
-        pipelineLayout.m_RootParameters[bindSlot].InitAsConstantBufferView(cb.shaderSlot, 0, getShaderVisibility(cb.shaderStages));
-        pipelineLayout.m_NumRootParameters++;
-    }
-
-    // descriptor table resource sets
-    for (auto it : m_ResourceSets)
-    {
-        const int bindSlot = it.first;
-        CDeviceResourceSet* pResourceSet = it.second.get();
-        auto shaderVisibility = getShaderVisibility(pResourceSet->GetShaderStages());
-
-        uint32 startDesc = pipelineLayout.m_DescRangeCursor;
-        uint32 tableOffset = 0;
-
-        for (auto it2 : pResourceSet->m_ConstantBuffers)
-        {
-            const int shaderSlot = it2.first;
-
-            CD3DX12_DESCRIPTOR_RANGE cbDescRange(D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, shaderSlot, 0, tableOffset);
-            pipelineLayout.m_DescRanges[pipelineLayout.m_DescRangeCursor] = cbDescRange;
-
-            ++pipelineLayout.m_DescRangeCursor;
-            ++tableOffset;
-        }
-
-        for (auto it2 : pResourceSet->m_Textures)
-        {
-            const int shaderSlot = it2.first;
-
-            CD3DX12_DESCRIPTOR_RANGE texDescRange(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, shaderSlot, 0, tableOffset);
-            pipelineLayout.m_DescRanges[pipelineLayout.m_DescRangeCursor] = texDescRange;
-
-            ++pipelineLayout.m_DescRangeCursor;
-            ++tableOffset;
-        }
-
-        for (auto it2 : pResourceSet->m_Buffers)
-        {
-            const int shaderSlot = it2.first;
-
-            CD3DX12_DESCRIPTOR_RANGE bufferDescRange(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, shaderSlot, 0, tableOffset);
-            pipelineLayout.m_DescRanges[pipelineLayout.m_DescRangeCursor] = bufferDescRange;
-
-            ++pipelineLayout.m_DescRangeCursor;
-            ++tableOffset;
-        }
-
-        if ((pipelineLayout.m_DescRangeCursor - startDesc) > 0)
-        {
-            pipelineLayout.m_RootParameters[bindSlot].InitAsDescriptorTable(
-                pipelineLayout.m_DescRangeCursor - startDesc, &pipelineLayout.m_DescRanges[startDesc], shaderVisibility);
-
-            pipelineLayout.m_NumRootParameters++;
-        }
-
-        for (auto itSampler : pResourceSet->m_Samplers)
-        {
-            int shaderSlot = itSampler.first;
-            const CDeviceResourceSet::SSamplerData& samplerData = itSampler.second;
-
-            auto pDeviceState = reinterpret_cast<CCryDX12SamplerState*>(CTexture::s_TexStates[samplerData.resource].m_pDeviceState);
-            auto samplerDesc = pDeviceState->GetDX12SamplerState().GetSamplerDesc();
-
-            // copy parameters from sampler desc first
-            memcpy(&pipelineLayout.m_StaticSamplers[pipelineLayout.m_NumStaticSamplers], &samplerDesc, sizeof(samplerDesc));
-
-            // fill in remaining parameters
-            auto& staticSamplerDesc = pipelineLayout.m_StaticSamplers[pipelineLayout.m_NumStaticSamplers];
-            staticSamplerDesc.BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
-            staticSamplerDesc.MinLOD = samplerDesc.MinLOD;
-            staticSamplerDesc.MaxLOD = samplerDesc.MaxLOD;
-            staticSamplerDesc.ShaderRegister = shaderSlot;
-            staticSamplerDesc.RegisterSpace = 0;
-            staticSamplerDesc.ShaderVisibility = shaderVisibility;
-
-            ++pipelineLayout.m_NumStaticSamplers;
-        }
-    }
-
-    m_pRootSignature = new RootSignature(m_pDevice);
-    return m_pRootSignature->Init(pipelineLayout, DX12::CommandModeGraphics);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CDeviceGraphicsPSO_DX12
-    : public CDeviceGraphicsPSO
-{
-public:
-
-    CDeviceGraphicsPSO_DX12(Device* pDevice)
-        : graphicsPSO(pDevice)
-    {}
-
-    bool Init(const CDeviceGraphicsPSODesc& desc);
-
-    const DX12::GraphicsPipelineState* GetGraphicsPSO() const { return &graphicsPSO; }
-    D3D12_PRIMITIVE_TOPOLOGY GetPrimitiveTopology() const { return m_PrimitiveTopology; }
-
-protected:
-    DX12::GraphicsPipelineState graphicsPSO;
-
-    SOnDemandD3DVertexDeclaration m_InputLayout;
-    D3D12_PRIMITIVE_TOPOLOGY m_PrimitiveTopology;
-};
-
-bool CDeviceGraphicsPSO_DX12::Init(const CDeviceGraphicsPSODesc& psoDesc)
-{
-    if (psoDesc.m_pResourceLayout == NULL)
-    {
-        return false;
-    }
-
-    std::array<SDeviceObjectHelpers::SShaderInstanceInfo, eHWSC_Num> hwShaders;
-    bool shadersAvailable = SDeviceObjectHelpers::GetShaderInstanceInfo(hwShaders, psoDesc.m_pShader, psoDesc.m_technique, psoDesc.m_ShaderFlags_RT, psoDesc.m_ShaderFlags_MD, psoDesc.m_ShaderFlags_MDV, nullptr, psoDesc.m_bAllowTesselation);
-    if (!shadersAvailable)
-        return false;
-
-    // validate shaders first
-    for (EHWShaderClass shaderClass = eHWSC_Vertex; shaderClass < eHWSC_Num; shaderClass = EHWShaderClass(shaderClass + 1))
-    {
-        if (hwShaders[shaderClass].pHwShader && hwShaders[shaderClass].pHwShaderInstance == NULL)
-        {
-            return false;
-        }
-
-        // TODO: remove
-        m_pHwShaders[shaderClass]         = hwShaders[shaderClass].pHwShader;
-        m_pHwShaderInstances[shaderClass] = hwShaders[shaderClass].pHwShaderInstance;
-    }
-
-    D3D11_RASTERIZER_DESC rasterizerDesc;
-    D3D11_BLEND_DESC blendDesc;
-    D3D11_DEPTH_STENCIL_DESC depthStencilDesc;
-    psoDesc.FillDescs(rasterizerDesc, blendDesc, depthStencilDesc);
-
-    // prepare pso init params
-    GraphicsPipelineState::InitParams psoInitParams;
-    ZeroStruct(psoInitParams);
-
-    // root signature
-    psoInitParams.rootSignature = reinterpret_cast<CDeviceResourceLayout_DX12*>(psoDesc.m_pResourceLayout)->GetRootSignature();
-
-    // blend state
-    {
-        psoInitParams.desc.BlendState.AlphaToCoverageEnable = blendDesc.AlphaToCoverageEnable;
-        psoInitParams.desc.BlendState.IndependentBlendEnable = blendDesc.IndependentBlendEnable;
-
-        for (int i = 0; i < CRY_ARRAY_COUNT(blendDesc.RenderTarget); ++i)
-        {
-            psoInitParams.desc.BlendState.RenderTarget[i].BlendEnable = blendDesc.RenderTarget[i].BlendEnable;
-            psoInitParams.desc.BlendState.RenderTarget[i].LogicOpEnable = false;
-            psoInitParams.desc.BlendState.RenderTarget[i].SrcBlend = (D3D12_BLEND)blendDesc.RenderTarget[i].SrcBlend;
-            psoInitParams.desc.BlendState.RenderTarget[i].DestBlend = (D3D12_BLEND)blendDesc.RenderTarget[i].DestBlend;
-            psoInitParams.desc.BlendState.RenderTarget[i].BlendOp = (D3D12_BLEND_OP)blendDesc.RenderTarget[i].BlendOp;
-            psoInitParams.desc.BlendState.RenderTarget[i].SrcBlendAlpha = (D3D12_BLEND)blendDesc.RenderTarget[i].SrcBlendAlpha;
-            psoInitParams.desc.BlendState.RenderTarget[i].DestBlendAlpha = (D3D12_BLEND)blendDesc.RenderTarget[i].DestBlendAlpha;
-            psoInitParams.desc.BlendState.RenderTarget[i].BlendOpAlpha = (D3D12_BLEND_OP)blendDesc.RenderTarget[i].BlendOpAlpha;
-            psoInitParams.desc.BlendState.RenderTarget[i].LogicOp = D3D12_LOGIC_OP_CLEAR;
-            psoInitParams.desc.BlendState.RenderTarget[i].RenderTargetWriteMask = blendDesc.RenderTarget[i].RenderTargetWriteMask;
-        }
-    }
-
-    // depth stencil and rasterizer state
-    memcpy(&psoInitParams.desc.DepthStencilState, &depthStencilDesc, sizeof(depthStencilDesc));
-    memcpy(&psoInitParams.desc.RasterizerState, &rasterizerDesc, sizeof(rasterizerDesc));
-
-    auto extractShaderBytecode = [&](EHWShaderClass shaderClass)
-        {
-            return hwShaders[shaderClass].pHwShader
-                   ? reinterpret_cast<CCryDX12Shader*>(hwShaders[shaderClass].pDeviceShader)->GetD3D12ShaderBytecode()
-                   : g_EmptyShader;
-        };
-
-    psoInitParams.desc.VS = extractShaderBytecode(eHWSC_Vertex);
-    psoInitParams.desc.DS = extractShaderBytecode(eHWSC_Domain);
-    psoInitParams.desc.HS = extractShaderBytecode(eHWSC_Hull);
-    psoInitParams.desc.GS = extractShaderBytecode(eHWSC_Geometry);
-    psoInitParams.desc.PS = extractShaderBytecode(eHWSC_Pixel);
-
-    psoInitParams.desc.SampleMask = UINT_MAX;
-    psoInitParams.desc.SampleDesc.Count = 1;
-
-    // primitive topology
-    {
-        m_PrimitiveTopology = gcpRendD3D->FX_ConvertPrimitiveType(psoDesc.m_PrimitiveType);
-
-        struct
-        {
-            eRenderPrimitiveType primitiveType;
-            D3D12_PRIMITIVE_TOPOLOGY_TYPE primitiveTopology;
-        }
-        topologyTypes[] =
-        {
-            { eptUnknown,                D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED },
-            { eptTriangleList,           D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE  },
-            { eptTriangleStrip,          D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE  },
-            { eptLineList,               D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE      },
-            { eptLineStrip,              D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE      },
-            { eptPointList,              D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT     },
-            { ept1ControlPointPatchList, D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH     },
-            { ept2ControlPointPatchList, D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH     },
-            { ept3ControlPointPatchList, D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH     },
-            { ept4ControlPointPatchList, D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH     },
-        };
-
-        psoInitParams.desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED;
-        for (int i = 0; i < CRY_ARRAY_COUNT(topologyTypes); ++i)
-        {
-            if (topologyTypes[i].primitiveType == psoDesc.m_PrimitiveType)
-            {
-                psoInitParams.desc.PrimitiveTopologyType = topologyTypes[i].primitiveTopology;
-                break;
-            }
-        }
-    }
-
-    // input layout
-    m_InputLayout.m_Declaration.resize(0);
-    if (CHWShader_D3D::SHWSInstance* pVsInstance = reinterpret_cast<CHWShader_D3D::SHWSInstance*>(hwShaders[eHWSC_Vertex].pHwShaderInstance))
-    {
-        uint8 streamMask = psoDesc.CombineVertexStreamMasks(uint8(pVsInstance->m_VStreamMask_Decl), psoDesc.m_ObjectStreamMask);
-
-        const bool bMorph = false;
-        const bool bInstanced = (streamMask & VSM_INSTANCED) != 0;
-
-        gcpRendD3D->EF_OnDemandVertexDeclaration(m_InputLayout, streamMask >> 1, psoDesc.m_VertexFormat, bMorph, bInstanced);
-
-        psoInitParams.desc.InputLayout.pInputElementDescs = reinterpret_cast<D3D12_INPUT_ELEMENT_DESC*>(&m_InputLayout.m_Declaration[0]);
-        psoInitParams.desc.InputLayout.NumElements = m_InputLayout.m_Declaration.size();
-    }
-
-    // render targets
-    for (int i = 0; i < psoDesc.m_RenderTargetFormats.size(); ++i)
-    {
-        psoInitParams.desc.RTVFormats[i] = DXGI_FORMAT_UNKNOWN;
-
-        if (psoDesc.m_RenderTargetFormats[i] != eTF_Unknown)
-        {
-            psoInitParams.desc.RTVFormats[i] = CTexture::DeviceFormatFromTexFormat(psoDesc.m_RenderTargetFormats[i]);
-            psoInitParams.desc.NumRenderTargets = i + 1;
-        }
-    }
-
-    psoInitParams.desc.DSVFormat = CTexture::DeviceFormatFromTexFormat(psoDesc.m_DepthStencilFormat);
-
-#if defined(ENABLE_PROFILING_CODE)
-    m_PrimitiveTypeForProfiling = psoDesc.m_PrimitiveType;
-#endif
-
-    bool bSuccess = graphicsPSO.Init(psoInitParams);
-    return bSuccess;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CDeviceComputePSO_DX12
-    : public CDeviceComputePSO
-{
-public:
-    friend CDeviceGraphicsCommandList;
-
-    CDeviceComputePSO_DX12(Device* pDevice, CDeviceResourceLayoutPtr pDeviceResourceLayout)
-        : computePSO(pDevice)
-        , pResourceLayout(pDeviceResourceLayout)
-    {}
-
-    virtual bool Build() final { return false; }
-
-    CDeviceResourceLayoutPtr pResourceLayout;
-    DX12::ComputePipelineState computePSO;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-class CDeviceGraphicsCommandList_DX12
-    : public CDeviceGraphicsCommandList
-{
-public:
-    CDeviceGraphicsCommandList_DX12(DX12::CommandList* pCommandList)
-        : m_pCommandList(pCommandList)
-    {
-        Reset();
-    }
-
-    DX12::SmartPtr<DX12::CommandList> m_pCommandList;
-};
-
-#define GET_DX12_GRAPHICS_COMMANDLIST(abstractCommandList) reinterpret_cast<CDeviceGraphicsCommandList_DX12*>(abstractCommandList)
-
-void CDeviceGraphicsCommandList::SetRenderTargets(uint32 targetCount, CTexture** pTargets, SDepthTexture* pDepthTarget)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-
-    const DX12::ResourceView* pDSV = nullptr;
-    const DX12::ResourceView* pRTV[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT] = { nullptr };
-
-    // Get current depth stencil views
-    if (pDepthTarget)
-    {
-        if (auto pView = reinterpret_cast<CCryDX12DepthStencilView*>(pDepthTarget->pSurf))
-        {
-            pDSV = &pView->GetDX12View();
-            pView->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get());
-        }
-    }
-
-    // Get current render target views
-    for (int i = 0; i < targetCount; ++i)
-    {
-        if (pTargets[i])
-        {
-            if (auto pView = reinterpret_cast<CCryDX12RenderTargetView*>(pTargets[i]->GetSurface(0, 0)))
-            {
-                pRTV[i] = &pView->GetDX12View();
-                pView->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get());
-            }
-        }
-    }
-
-    // TODO: if we know early that the resource(s) will be RENDER_TARGET/DEPTH_READ|WRITE we can begin the barrier early and end it here
-    pCommandListDX12->m_pCommandList->BindAndSetOutputViews(targetCount, pRTV, pDSV);
-}
-
-void CDeviceGraphicsCommandList::SetViewports(uint32 vpCount, const D3DViewPort* pViewports)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-
-    // D3D11_VIEWPORT := D3D12_VIEWPORT
-    pCommandListDX12->m_pCommandList->SetViewports(vpCount, (D3D12_VIEWPORT*)pViewports);
-}
-
-void CDeviceGraphicsCommandList::SetScissorRects(uint32 rcCount, const D3DRectangle* pRects)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-
-    // D3D11_RECT := D3D12_RECT
-    pCommandListDX12->m_pCommandList->SetScissorRects(rcCount, (D3D12_RECT*)pRects);
-}
-
-void CDeviceGraphicsCommandList::SetPipelineStateImpl(CDeviceGraphicsPSOPtr devicePSO)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    CDeviceGraphicsPSO_DX12* pDevicePSO = (CDeviceGraphicsPSO_DX12*)devicePSO;
-
-    pCommandListDX12->m_pCommandList->SetPipelineState(pDevicePSO->GetGraphicsPSO());
-    pCommandListDX12->m_pCommandList->SetPrimitiveTopology(pDevicePSO->GetPrimitiveTopology()); // TODO: de-duplicate this call?
-}
-
-void CDeviceGraphicsCommandList::SetResourceLayout(CDeviceResourceLayout* pResourceLayout)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    CDeviceResourceLayout_DX12* pResourceLayoutDX12 = reinterpret_cast<CDeviceResourceLayout_DX12*>(pResourceLayout);
-
-    pCommandListDX12->m_pCommandList->SetRootSignature(DX12::CommandModeGraphics, pResourceLayoutDX12->GetRootSignature());
-}
-
-void CDeviceGraphicsCommandList::SetVertexBuffers(uint32 bufferCount, D3DBuffer** pBuffers, size_t* offsets, uint32* strides)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-
-    pCommandListDX12->m_pCommandList->ClearVertexBufferHeap(bufferCount);
-
-    for (uint32 i = 0; i < bufferCount; ++i)
-    {
-        if (pBuffers[i])
-        {
-            auto pBuffer = reinterpret_cast<CCryDX12Buffer*>(pBuffers[i]);
-            pBuffer->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER);
-
-            pCommandListDX12->m_pCommandList->BindVertexBufferView(pBuffer->GetDX12View(), i, TRange<uint32>(offsets[i], offsets[i]), strides[i]);
-        }
-    }
-
-    // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-    pCommandListDX12->m_pCommandList->SetVertexBufferHeap(bufferCount);
-}
-
-void CDeviceGraphicsCommandList::SetVertexBuffers(uint32 streamCount, const SStreamInfo* streams)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-
-    pCommandListDX12->m_pCommandList->ClearVertexBufferHeap(streamCount);
-
-    for (uint32 i = 0; i < streamCount; ++i)
-    {
-        if (auto pBuffer = const_cast<CCryDX12Buffer*>(reinterpret_cast<const CCryDX12Buffer*>(streams[i].pStream)))
-        {
-            pCommandListDX12->m_pCommandList->BindVertexBufferView(pBuffer->GetDX12View(), i, TRange<uint32>(streams[i].nOffset, streams[i].nOffset), streams[i].nStride);
-        }
-    }
-
-    // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-    pCommandListDX12->m_pCommandList->SetVertexBufferHeap(streamCount);
-}
-
-void CDeviceGraphicsCommandList::SetIndexBuffer(const SStreamInfo& indexStream)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-
-    auto pBuffer = const_cast<CCryDX12Buffer*>(reinterpret_cast<const CCryDX12Buffer*>(indexStream.pStream));
-    pBuffer->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_INDEX_BUFFER);
-
-    // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-#if !defined(SUPPORT_FLEXIBLE_INDEXBUFFER)
-    pCommandListDX12->m_pCommandList->BindAndSetIndexBufferView(pBuffer->GetDX12View(), DXGI_FORMAT_R16_UINT, indexStream.nOffset);
-#else
-    pCommandListDX12->m_pCommandList->BindAndSetIndexBufferView(pBuffer->GetDX12View(), (DXGI_FORMAT)indexStream.nStride, indexStream.nOffset);
-#endif
-}
-
-void CDeviceGraphicsCommandList::SetResourcesImpl(uint32 bindSlot, CDeviceResourceSet* pResourceSet)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    CDeviceResourceSet_DX12* pResources = reinterpret_cast<CDeviceResourceSet_DX12*>(pResourceSet);
-
-    for (auto& it : pResources->m_ConstantBuffers)
-    {
-        if (AzRHI::ConstantBuffer* pBuffer = it.second.resource)
-        {
-            auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(pBuffer->GetPlatformBuffer());
-            pResource->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER);
-
-            // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-            pCommandListDX12->m_pCommandList->TrackResourceCBVUsage(pResource->GetDX12Resource());
-        }
-    }
-
-    for (auto& it : pResources->m_Textures)
-    {
-        if (CTexture* pTexture = std::get<1>(it.second.resource))
-        {
-            auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(pTexture->GetDevTexture()->GetBaseTexture());
-            pResource->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_GENERIC_READ);
-
-            // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-            pCommandListDX12->m_pCommandList->TrackResourceSRVUsage(pResource->GetDX12Resource());
-        }
-    }
-
-    for (auto& it : pResources->m_Buffers)
-    {
-        if (ID3D11Buffer* pBuffer = it.second.resource.m_pBuffer)
-        {
-            auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(pBuffer);
-            pResource->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_GENERIC_READ);
-
-            // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-            pCommandListDX12->m_pCommandList->TrackResourceSRVUsage(pResource->GetDX12Resource());
-        }
-    }
-
-    const DescriptorBlock& descriptorBlock = pResources->GetDescriptorBlock();
-    pCommandListDX12->m_pCommandList->SetDescriptorTable(DX12::CommandModeGraphics, bindSlot, descriptorBlock.GetHandleOffsetGPU(0));
-}
-
-void CDeviceGraphicsCommandList::SetInlineConstantBuffer(uint32 bindSlot, AzRHI::ConstantBuffer* pBuffer, EConstantBufferShaderSlot shaderSlot, [[maybe_unused]] ::EShaderStage shaderStages)
-{
-    SetInlineConstantBuffer(bindSlot, pBuffer, shaderSlot, eHWSC_Num);
-}
-
-void CDeviceGraphicsCommandList::SetInlineConstantBuffer(uint32 bindSlot, AzRHI::ConstantBuffer* pConstantBuffer, [[maybe_unused]] EConstantBufferShaderSlot shaderSlot, [[maybe_unused]] EHWShaderClass shaderClass)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-
-    auto pBuffer = reinterpret_cast<CCryDX12Buffer*>(pConstantBuffer->GetPlatformBuffer());
-    pBuffer->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER);
-
-    // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-    pCommandListDX12->m_pCommandList->TrackResourceCBVUsage(pBuffer->GetDX12Resource());
-
-    D3D12_GPU_VIRTUAL_ADDRESS gpuAddress = pBuffer->GetDX12View().GetCBVDesc().BufferLocation + pConstantBuffer->GetByteOffset();
-    pCommandListDX12->m_pCommandList->SetConstantBufferView(DX12::CommandModeGraphics, bindSlot, gpuAddress);
-}
-
-void CDeviceGraphicsCommandList::SetInlineConstants(uint32 bindSlot, uint32 constantCount, float* pConstants)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->Set32BitConstants(DX12::CommandModeGraphics, bindSlot, constantCount, pConstants, 0);
-}
-
-void CDeviceGraphicsCommandList::SetStencilRefImpl(uint8_t stencilRefValue)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->SetStencilRef(stencilRefValue);
-}
-
-void CDeviceGraphicsCommandList::DrawImpl(uint32 VertexCountPerInstance, uint32 InstanceCount, uint32 StartVertexLocation, uint32 StartInstanceLocation)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->DrawInstanced(VertexCountPerInstance, InstanceCount, StartVertexLocation, StartInstanceLocation);
-}
-
-void CDeviceGraphicsCommandList::DrawIndexedImpl(uint32 IndexCountPerInstance, uint32 InstanceCount, uint32 StartIndexLocation, int BaseVertexLocation, uint32 StartInstanceLocation)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->DrawIndexedInstanced(IndexCountPerInstance, InstanceCount, StartIndexLocation, BaseVertexLocation, StartInstanceLocation);
-}
-
-void CDeviceGraphicsCommandList::ClearSurface(D3DSurface* pView, const FLOAT Color[4], UINT NumRects, const D3D11_RECT* pRect)
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    auto pViewDX12 = reinterpret_cast<CCryDX12RenderTargetView*>(pView);
-    pCommandListDX12->m_pCommandList->ClearRenderTargetView(pViewDX12->GetDX12View(), Color, NumRects, pRect);
-}
-
-void CDeviceGraphicsCommandList::LockToThread()
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->Begin();
-    pCommandListDX12->m_pCommandList->SetResourceAndSamplerStateHeaps();
-}
-
-void CDeviceGraphicsCommandList::Build()
-{
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->End();
-}
-
-void CDeviceGraphicsCommandList::ResetImpl()
-{
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-class CDeviceComputeCommandList_DX12
-    : public CDeviceComputeCommandList
-{
-public:
-    DX12::SmartPtr<DX12::CommandList> m_pCommandList;
-};
-
-#define GET_DX12_COMPUTE_COMMANDLIST(abstractCommandList) reinterpret_cast<CDeviceComputeCommandList_DX12*>(abstractCommandList)
-
-void CDeviceComputeCommandList::SetResourceLayout(CDeviceResourceLayout* pResourceLayout)
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-    CDeviceResourceLayout_DX12* pResourceLayoutDX12 = reinterpret_cast<CDeviceResourceLayout_DX12*>(pResourceLayout);
-
-    pCommandListDX12->m_pCommandList->SetRootSignature(DX12::CommandModeCompute, pResourceLayoutDX12->GetRootSignature());
-}
-
-void CDeviceComputeCommandList::SetResources(uint32 bindSlot, CDeviceResourceSet* pResources)
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-    CDeviceResourceSet_DX12* pResourcesDX12 = reinterpret_cast<CDeviceResourceSet_DX12*>(pResources);
-
-    for (auto& it : pResourcesDX12->m_ConstantBuffers)
-    {
-        auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(it.second.resource->GetPlatformBuffer());
-        pResource->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER);
-
-        // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-        pCommandListDX12->m_pCommandList->TrackResourceCBVUsage(pResource->GetDX12Resource());
-    }
-
-    for (auto& it : pResourcesDX12->m_Textures)
-    {
-        auto pResource = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(std::get<1>(it.second.resource)->GetDevTexture()->GetBaseTexture());
-        pResource->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_GENERIC_READ);
-
-        // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-        pCommandListDX12->m_pCommandList->TrackResourceSRVUsage(pResource->GetDX12Resource());
-    }
-
-    const DescriptorBlock& descriptorBlock = pResourcesDX12->GetDescriptorBlock();
-    pCommandListDX12->m_pCommandList->SetDescriptorTable(DX12::CommandModeCompute, bindSlot, descriptorBlock.GetHandleOffsetGPU(0));
-}
-
-void CDeviceComputeCommandList::SetConstantBuffer(uint32 bindSlot, AzRHI::ConstantBuffer* pConstantBuffer, [[maybe_unused]] EConstantBufferShaderSlot shaderSlot, [[maybe_unused]] EHWShaderClass shaderClass)
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-
-    auto pBuffer = reinterpret_cast<CCryDX12Buffer*>(pConstantBuffer->GetPlatformBuffer());
-    pBuffer->BeginResourceStateTransition(pCommandListDX12->m_pCommandList.get(), D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER);
-
-    // TODO: if we know early that the resource(s) will be GENERIC_READ we can begin the barrier early and end it here
-    pCommandListDX12->m_pCommandList->TrackResourceCBVUsage(pBuffer->GetDX12Resource());
-
-    D3D12_GPU_VIRTUAL_ADDRESS gpuAddress = pBuffer->GetDX12View().GetCBVDesc().BufferLocation + pConstantBuffer->GetByteOffset();
-    pCommandListDX12->m_pCommandList->SetConstantBufferView(DX12::CommandModeCompute, bindSlot, gpuAddress);
-}
-
-void CDeviceComputeCommandList::SetInlineConstants(uint32 bindSlot, uint32 constantCount, float* pConstants)
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->Set32BitConstants(DX12::CommandModeCompute, bindSlot, constantCount, pConstants, 0);
-}
-
-void CDeviceComputeCommandList::SetPipelineStateImpl(CDeviceComputePSOPtr devicePSO)
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-    CDeviceComputePSO_DX12* pDevicePSO = (CDeviceComputePSO_DX12*)devicePSO.get();
-
-    pCommandListDX12->m_pCommandList->SetPipelineState(&pDevicePSO->computePSO);
-}
-
-void CDeviceComputeCommandList::DispatchImpl(uint32 X, uint32 Y, uint32 Z)
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->Dispatch(X, Y, Z);
-}
-
-void CDeviceComputeCommandList::LockToThread()
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->Begin();
-    pCommandListDX12->m_pCommandList->SetResourceAndSamplerStateHeaps();
-}
-
-void CDeviceComputeCommandList::Build()
-{
-    CDeviceComputeCommandList_DX12* pCommandListDX12 = GET_DX12_COMPUTE_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->End();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-class CDeviceCopyCommandList_DX12
-    : public CDeviceCopyCommandList
-{
-public:
-    DX12::SmartPtr<DX12::CommandList> m_pCommandList;
-};
-
-#define GET_DX12_COPY_COMMANDLIST(abstractCommandList) reinterpret_cast<CDeviceCopyCommandList_DX12*>(abstractCommandList)
-
-CDeviceCopyCommandList::ECopyType CDeviceCopyCommandList::DetermineCopyType(CDeviceCopyCommandList::ECopyType eCurrent, D3DResource* pResource)
-{
-    auto pRes = reinterpret_cast<CCryDX12Resource<ID3D11Resource>*>(pResource);
-    DX12::Resource& rResource = pRes->GetDX12Resource();
-
-    if (rResource.IsOffCard())
-    {
-        return eCT_OffCardResources;
-    }
-
-    if (rResource.IsTarget())
-    {
-        return eCT_GraphicsResources;
-    }
-    if (rResource.IsGeneric()) // could be non-compute shader too
-    {
-        return eCT_GenericResources;
-    }
-
-    if (eCurrent == eCT_OffCardResources)
-    {
-        return eCT_GraphicsResources;
-    }
-
-    return eCurrent;
-}
-
-void CDeviceCopyCommandList::LockToThread()
-{
-    CDeviceCopyCommandList_DX12* pCommandListDX12 = GET_DX12_COPY_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->Begin();
-    pCommandListDX12->m_pCommandList->SetResourceAndSamplerStateHeaps();
-}
-
-void CDeviceCopyCommandList::Build()
-{
-    CDeviceCopyCommandList_DX12* pCommandListDX12 = GET_DX12_COPY_COMMANDLIST(this);
-    pCommandListDX12->m_pCommandList->End();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-CDeviceObjectFactory::CDeviceObjectFactory()
-{
-    m_pCoreCommandList = AZStd::make_shared<CDeviceGraphicsCommandList_DX12>(nullptr);
-}
-
-CDeviceGraphicsPSOUPtr CDeviceObjectFactory::CreateGraphicsPSOImpl(const CDeviceGraphicsPSODesc& psoDesc) const
-{
-    auto pResult = CryMakeUnique<CDeviceGraphicsPSO_DX12>(GetDevice());
-    if (pResult->Init(psoDesc))
-    {
-        return std::move(pResult);
-    }
-
-    return nullptr;
-}
-
-CDeviceComputePSOPtr CDeviceObjectFactory::CreateComputePSO(CDeviceResourceLayoutPtr pResourceLayout) const
-{
-    return AZStd::make_shared<CDeviceComputePSO_DX12>(GetDevice(), pResourceLayout);
-}
-
-CDeviceResourceSetPtr CDeviceObjectFactory::CreateResourceSet(CDeviceResourceSet::EFlags flags) const
-{
-    return AZStd::make_shared<CDeviceResourceSet_DX12>(GetDevice(), flags);
-}
-
-CDeviceResourceLayoutPtr CDeviceObjectFactory::CreateResourceLayout() const
-{
-    return AZStd::make_shared<CDeviceResourceLayout_DX12>(GetDevice());
-}
-
-CDeviceGraphicsCommandListPtr CDeviceObjectFactory::GetCoreGraphicsCommandList() const
-{
-    auto pContext = reinterpret_cast<CCryDX12DeviceContext*>(&gcpRendD3D->GetDeviceContext());
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(m_pCoreCommandList.get());
-    pCommandListDX12->m_pCommandList = pContext->GetCoreGraphicsCommandList();
-
-    return m_pCoreCommandList;
-}
-
-// Acquire one or more command-lists which are independent of the core command-list
-// Only one thread is allowed to call functions on this command-list (DX12 restriction).
-// The thread that gets the permition is the one calling Begin() on it AFAIS
-CDeviceGraphicsCommandListUPtr CDeviceObjectFactory::AcquireGraphicsCommandList()
-{
-    // In theory this whole function need to be atomic, instead it voids the core command-list(s),
-    // Synchronization between different threads acquiring command-lists is deferred to the higher level.
-    auto pContext = reinterpret_cast<CCryDX12DeviceContext*>(&gcpRendD3D->GetDeviceContext());
-    DX12::CommandListPool& pQueue = pContext->GetCoreCommandListPool(CMDQUEUE_GRAPHICS);
-    pContext->CeaseAllCommandQueues(false);
-
-    DX12::SmartPtr<CommandList> pCL;
-    pQueue.AcquireCommandList(pCL);
-
-    pContext->ResumeAllCommandQueues();
-    return CryMakeUnique<CDeviceGraphicsCommandList_DX12>(pCL);
-}
-
-std::vector<CDeviceGraphicsCommandListUPtr> CDeviceObjectFactory::AcquireGraphicsCommandLists(uint32 listCount)
-{
-    // In theory this whole function need to be atomic, instead it voids the core command-list(s),
-    // Synchronization between different threads acquiring command-lists is deferred to the higher level.
-    auto pContext = reinterpret_cast<CCryDX12DeviceContext*>(&gcpRendD3D->GetDeviceContext());
-    DX12::CommandListPool& pQueue = pContext->GetCoreCommandListPool(CMDQUEUE_GRAPHICS);
-    pContext->CeaseAllCommandQueues(false);
-
-    std::vector<CDeviceGraphicsCommandListUPtr> pCommandLists;
-    DX12::SmartPtr<CommandList> pCLs[256];
-
-    // Allocate in chunks of 256
-    for (uint32 n = 0; n < listCount; n += 256U)
-    {
-        const uint32 chunkCount = std::min(listCount - n, 256U);
-        pQueue.AcquireCommandLists(chunkCount, pCLs);
-
-        for (uint32 b = 0; b < chunkCount; ++b)
-        {
-            pCommandLists.emplace_back(CryMakeUnique<CDeviceGraphicsCommandList_DX12>(pCLs[b]));
-        }
-    }
-
-    pContext->ResumeAllCommandQueues();
-    return pCommandLists;
-}
-
-// Command-list sinks, will automatically submit command-lists in allocation-order
-void CDeviceObjectFactory::ForfeitGraphicsCommandList(CDeviceGraphicsCommandListUPtr pCommandList)
-{
-    auto pContext = reinterpret_cast<CCryDX12DeviceContext*>(&gcpRendD3D->GetDeviceContext());
-    DX12::CommandListPool& pQueue = pContext->GetCoreCommandListPool(CMDQUEUE_GRAPHICS);
-
-    CDeviceGraphicsCommandList_DX12* pCommandListDX12 = GET_DX12_GRAPHICS_COMMANDLIST(pCommandList.get());
-    DX12::SmartPtr<CommandList> pCL = pCommandListDX12->m_pCommandList;
-    pQueue.ForfeitCommandList(pCL);
-}
-
-void CDeviceObjectFactory::ForfeitGraphicsCommandLists(std::vector<CDeviceGraphicsCommandListUPtr> pCommandLists)
-{
-    auto pContext = reinterpret_cast<CCryDX12DeviceContext*>(&gcpRendD3D->GetDeviceContext());
-    DX12::CommandListPool& pQueue = pContext->GetCoreCommandListPool(CMDQUEUE_GRAPHICS);
-
-    const uint32 listCount = pCommandLists.size();
-    DX12::SmartPtr<CommandList> pCLs[256];
-
-    // Deallocate in chunks of 256
-    for (uint32 n = 0; n < listCount; n += 256U)
-    {
-        const uint32 chunkCount = std::min(listCount - n, 256U);
-        for (uint32 b = 0; b < chunkCount; ++b)
-        {
-            pCLs[b] = GET_DX12_GRAPHICS_COMMANDLIST(pCommandLists[b].get())->m_pCommandList;
-        }
-        pQueue.ForfeitCommandLists(chunkCount, pCLs);
-    }
-}
-
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/Enums.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/Enums.h
deleted file mode 100644
index baae4fc03b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/Enums.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-enum EHWShaderClass : AZ::u8
-{
-    eHWSC_Vertex = 0,
-    eHWSC_Pixel = 1,
-    eHWSC_Geometry = 2,
-    eHWSC_Compute = 3,
-    eHWSC_Domain = 4,
-    eHWSC_Hull = 5,
-    eHWSC_Num = 6
-};
-
-enum EConstantBufferShaderSlot : AZ::u8
-{
-    // Reflected constant buffers:
-    //    These are built by the shader system using the parameter system at
-    //    shader compilation time and their format varies based on the permutation.
-    //
-    // These are deprecated and are being replaced by well-defined constant buffer definitions in HLSL.
-    eConstantBufferShaderSlot_PerBatch = 0,
-    eConstantBufferShaderSlot_PerInstanceLegacy = 1,
-    eConstantBufferShaderSlot_PerMaterial = 2,
-    eConstantBufferShaderSlot_ReflectedCount = eConstantBufferShaderSlot_PerMaterial + 1, // This slot is used only for counting. It's not a real binding value.
-    // !Reflected constant buffers
-
-    eConstantBufferShaderSlot_SPIIndex = 3,
-    eConstantBufferShaderSlot_PerInstance = 4,
-    eConstantBufferShaderSlot_SPI = 5,
-    eConstantBufferShaderSlot_SkinQuat = 6,
-    eConstantBufferShaderSlot_SkinQuatPrev = 7,
-    eConstantBufferShaderSlot_PerSubPass = 8,
-    eConstantBufferShaderSlot_PerPass = 9,
-    eConstantBufferShaderSlot_PerView = 10,
-    eConstantBufferShaderSlot_PerFrame = 11,
-    // OpenGLES 3.X guarantees only 12 uniform slots for VS and PS.
-    eConstantBufferShaderSlot_Count
-};
-
-enum EResourceLayoutSlot : AZ::u8
-{
-    EResourceLayoutSlot_PerInstanceCB = 0,
-    EResourceLayoutSlot_PerMaterialRS = 1,
-    EResourceLayoutSlot_PerInstanceExtraRS = 2,
-    EResourceLayoutSlot_PerPassRS = 3,
-
-    // TODO: remove once not needed anymore
-    EResourceLayoutSlot_PerBatchCB = 4,
-    EResourceLayoutSlot_PerInstanceLegacy = 5,
-
-    // Allocate some extra slots for post effects.
-    EResourceLayoutSlot_Count = 8
-};
-
-enum EReservedTextureSlot : AZ::u8
-{
-    EReservedTextureSlot_SkinExtraWeights = EFTT_MAX,
-    EReservedTextureSlot_AdjacencyInfo = EReservedTextureSlot_SkinExtraWeights,
-    EReservedTextureSlot_PatchID = EReservedTextureSlot_AdjacencyInfo,
-};
-
-enum EShaderStage : AZ::u8
-{
-    EShaderStage_Vertex = BIT(eHWSC_Vertex),
-    EShaderStage_Pixel = BIT(eHWSC_Pixel),
-    EShaderStage_Geometry = BIT(eHWSC_Geometry),
-    EShaderStage_Compute = BIT(eHWSC_Compute),
-    EShaderStage_Domain = BIT(eHWSC_Domain),
-    EShaderStage_Hull = BIT(eHWSC_Hull),
-
-    EShaderStage_Count = eHWSC_Num,
-    EShaderStage_None = 0,
-    EShaderStage_All = EShaderStage_Vertex | EShaderStage_Pixel | EShaderStage_Geometry | EShaderStage_Domain | EShaderStage_Hull | EShaderStage_Compute,
-    EShaderStage_AllWithoutCompute = EShaderStage_Vertex | EShaderStage_Pixel | EShaderStage_Geometry | EShaderStage_Domain | EShaderStage_Hull
-};
-AZ_DEFINE_ENUM_BITWISE_OPERATORS(EShaderStage)
-#define SHADERSTAGE_FROM_SHADERCLASS(SHADERCLASS) ::EShaderStage(BIT(SHADERCLASS))
-
-const int InlineConstantsShaderSlot = eConstantBufferShaderSlot_PerInstance;
-
-typedef int ShaderSlot;
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/PartitionAllocator.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/PartitionAllocator.h
deleted file mode 100644
index e450dad213..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/PartitionAllocator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-namespace AzRHI
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Partition based allocator for constant buffers of roughly the same size
-    struct PartitionAllocator
-    {
-        D3DBuffer* m_buffer;
-        void* m_base_ptr;
-        uint32 m_page_size;
-        uint32 m_bucket_size;
-        uint32 m_partition;
-        uint32 m_capacity;
-
-        std::vector<uint32> m_table;
-        std::vector<uint32> m_remap;
-
-        PartitionAllocator(
-            D3DBuffer* buffer, void* base_ptr, size_t page_size, size_t bucket_size)
-            : m_buffer(buffer)
-            , m_base_ptr(base_ptr)
-            , m_page_size((uint32)page_size)
-            , m_bucket_size((uint32)bucket_size)
-            , m_partition(0)
-            , m_capacity(page_size / bucket_size)
-            , m_table()
-            , m_remap()
-        {
-            m_table.resize(page_size / bucket_size);
-            m_remap.resize(page_size / bucket_size);
-            std::iota(m_table.begin(), m_table.end(), 0);
-        }
-        ~PartitionAllocator()
-        {
-            DEVBUFFERMAN_VERIFY(m_partition == 0);
-            UnsetStreamSources(m_buffer);
-            SAFE_RELEASE(m_buffer);
-        }
-
-        D3DBuffer* buffer() const { return m_buffer; }
-        void* base_ptr() const { return m_base_ptr; }
-        bool empty() const { return m_partition == 0; }
-
-        uint32 allocate()
-        {
-            size_t key = ~0u;
-            IF (m_partition + 1 >= m_capacity, 0)
-            {
-                return ~0u;
-            }
-            uint32 storage_index = m_table[key = m_partition++];
-            m_remap[storage_index] = key;
-            return storage_index;
-        }
-
-        void deallocate(size_t key)
-        {
-            DEVBUFFERMAN_ASSERT(m_partition && key < m_remap.size());
-            uint32 roster_index = m_remap[key];
-            std::swap(m_table[roster_index], m_table[--m_partition]);
-            std::swap(m_remap[key], m_remap[m_table[roster_index]]);
-        }
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/PartitionTable.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/PartitionTable.h
deleted file mode 100644
index 03d73eec6c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/PartitionTable.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "Base.h"
-#include <AzCore/std/containers/vector.h>
-
-namespace AzRHI
-{
-    template<typename T, size_t TableSize = 4u << 10>
-    class PartitionTable
-    {
-    private:
-        enum
-        {
-            TableShift = CompileTimeIntegerLog2<TableSize>::result,
-            TableMask = TableSize - 1,
-            TableCountMax = 0x2ff,
-        };
-
-        AZStd::allocator m_allocator;
-        AZStd::vector<T*> m_storage;
-        AZStd::vector<AZ::u32> m_table;
-        AZStd::vector<AZ::u32> m_tableRemap;
-
-        AZ::u32 m_size;
-        AZ::u32 m_capacity;
-
-        PartitionTable<T>& operator= (const PartitionTable<T>& rhs);
-        PartitionTable(const PartitionTable<T>& rhs);
-
-    public:
-        PartitionTable<T>& operator= (PartitionTable<T>&& rhs)
-        {
-            m_storage = std::move(rhs.m_storage);
-            m_table = std::move(rhs.m_table);
-            m_tableRemap = std::move(rhs.m_tableRemap);
-            m_size = std::move(rhs.m_size);
-            m_capacity = std::move(rhs.m_capacity);
-            rhs.m_capacity = 0;
-            rhs.m_size = 0;
-            return *this;
-        }
-
-        PartitionTable(PartitionTable<T>&& rhs)
-            : m_storage(std::move(rhs.m_storage))
-            , m_table(std::move(rhs.m_table))
-            , m_tableRemap(std::move(rhs.m_tableRemap))
-            , m_size(std::move(rhs.m_size))
-            , m_capacity(std::move(rhs.m_capacity))
-        {
-            rhs.m_size = 0;
-            rhs.m_capacity = 0;
-        }
-
-        PartitionTable()
-            : m_storage()
-            , m_table()
-            , m_tableRemap()
-            , m_size()
-            , m_capacity()
-        {
-            m_storage.resize(TableCountMax);
-        }
-
-        ~PartitionTable()
-        {
-            Clear();
-        }
-
-        void Clear()
-        {
-            for (AZ::u32 rosterIndex = 0; rosterIndex < m_size; ++rosterIndex)
-            {
-                AZ::u32 key = m_table[rosterIndex];
-                size_t table = key >> TableShift;
-                size_t index = key & TableMask;
-                (&(m_storage[table][index]))->~T();
-            }
-
-            for (T* partition : m_storage)
-            {
-                m_allocator.deallocate(partition, TableSize * sizeof(T), 16);
-            }
-
-            m_storage.clear();
-            m_table.clear();
-            m_tableRemap.clear();
-            m_size = 0;
-            m_capacity = 0;
-        }
-
-        inline AZ::u32 Capacity() const
-        {
-            return m_capacity;    
-        }
-
-        inline AZ::u32 Count() const
-        {
-            return m_size;
-        }
-
-        inline T& operator[] (size_t key)
-        {
-            size_t table = key >> TableShift;
-            size_t index = key & TableMask;
-            return m_storage[table][index];
-        }
-
-        inline const T& operator[] (size_t key) const
-        {
-            size_t table = key >> TableShift;
-            size_t index = key & TableMask;
-            return m_storage[table][index];
-        }
-
-        AZ::u32 Allocate()
-        {
-            if (m_size + 1 >= m_capacity)
-            {
-                size_t oldCapacity = m_capacity;
-                m_capacity += TableSize;
-
-                // Create a new table of TableSize elements
-                AZ_Assert((m_capacity >> TableShift) <= TableCountMax, "exceeded capacity, increase TableCountMax");
-
-                m_storage[oldCapacity >> TableShift] = (T*)m_allocator.allocate(TableSize * sizeof(T), 16);
-                m_table.resize(m_capacity, AZ::u32());
-
-                // Append new indices to the free list
-                std::iota(m_table.begin() + oldCapacity, m_table.end(), oldCapacity);
-                m_tableRemap.resize(m_capacity, AZ::u32());
-            }
-
-            size_t rosterIndex = m_size++;
-            AZ::u32 key = m_table[rosterIndex];
-            m_tableRemap[key] = rosterIndex;
-
-            new (&(this->operator[](key))) T(key);
-            return key;
-        }
-
-        inline void Free(AZ::u32 key)
-        {
-            AZRHI_ASSERT(m_size && key < m_tableRemap.size());
-
-            AZ::u32 rosterIndex = m_tableRemap[key];
-            (&(this->operator[](key)))->~T();
-
-            // Defragment the backing tables
-            std::swap(m_table[rosterIndex], m_table[--m_size]);
-            std::swap(m_tableRemap[key], m_tableRemap[m_table[rosterIndex]]);
-        }
-    };
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/TempDynBuffer.h b/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/TempDynBuffer.h
deleted file mode 100644
index 0913e03822..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DeviceManager/TempDynBuffer.h
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEMANAGER_TEMPDYNBUFFER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEMANAGER_TEMPDYNBUFFER_H
-#pragma once
-
-#include <RenderDll/Common/DevBuffer.h>
-
-namespace TempDynBuffer
-{
-    enum State
-    {
-        Default,
-        Allocated,
-        Locked,
-        Filled
-    };
-
-    struct ValidatorNull
-    {
-        void Check(State) {}
-        void Check2(State, State) {}
-        void Set(State) {}
-    };
-
-    struct ValidatorDbgBreak
-    {
-        ValidatorDbgBreak()
-            : m_state(Default) {}
-
-        void Check(State expectedState)
-        {
-            if (m_state != expectedState)
-            {
-                __debugbreak();
-            }
-        }
-
-        void Check2(State expectedState0, State expectedState1)
-        {
-            if (m_state != expectedState0 && m_state != expectedState1)
-            {
-                __debugbreak();
-            }
-        }
-
-        void Set(State newState)
-        {
-            m_state = newState;
-        }
-
-        State m_state;
-    };
-
-#if !defined(_RELEASE)
-    typedef ValidatorDbgBreak ValidatorDefault;
-#else
-    typedef ValidatorNull ValidatorDefault;
-#endif
-
-    //////////////////////////////////////////////////////////////////////////
-    template<typename T, BUFFER_BIND_TYPE bindType, class Validator>
-    class TempDynBufferBase
-    {
-    public:
-        static const buffer_handle_t invalidHandle = ~0u;
-
-    protected:
-        TempDynBufferBase(IRenderer* renderer)
-            : m_handle(invalidHandle)
-            , m_renderer(renderer)
-            , m_numElements(0)
-            , m_DevBufMan(renderer->GetDeviceBufferManager())
-            , m_validator() {}
-        ~TempDynBufferBase() { m_validator.Check(Default); }
-
-        void Allocate(size_t numElements) { AllocateInternal(numElements, sizeof(T)); }
-        bool IsAllocated() const { return m_handle != invalidHandle; }
-        void Release();
-
-        void Update(const T* pData) { UpdateInternal(pData, sizeof(T)); }
-        T* Lock();
-        void Unlock();
-
-    protected:
-        void AllocateInternal(size_t numElements, size_t elementSize);
-        void UpdateInternal(const void* pData, size_t elementSize);
-
-    protected:
-        IRenderer* m_renderer;
-        size_t m_handle;
-        size_t m_numElements;
-        CGuardedDeviceBufferManager m_DevBufMan;
-        Validator m_validator;
-    };
-
-    template<typename T, BUFFER_BIND_TYPE bindType, class Validator>
-    void TempDynBufferBase<T, bindType, Validator>::AllocateInternal(size_t numElements, size_t elementSize)
-    {
-        m_validator.Check(Default);
-        BUFFER_USAGE usageType = m_renderer->IsVideoThreadModeEnabled()
-            ? BU_WHEN_LOADINGTHREAD_ACTIVE // use a separate pool for everything in video rendering mode
-            : BU_TRANSIENT_RT; // default to transient_RT
-        m_handle = m_DevBufMan.Create(bindType, usageType, numElements * elementSize);
-        IF (m_handle != invalidHandle, 1)
-        {
-            m_numElements = numElements;
-            m_validator.Set(Allocated);
-        }
-    }
-
-    template<typename T, BUFFER_BIND_TYPE bindType, class Validator>
-    void TempDynBufferBase<T, bindType, Validator>::Release()
-    {
-        IF (m_handle != invalidHandle, 1)
-        {
-            m_validator.Check2(Allocated, Filled);
-            m_DevBufMan.Destroy(m_handle);
-            m_handle = invalidHandle;
-            m_numElements = 0;
-        }
-        m_validator.Set(Default);
-    }
-
-    template<typename T, BUFFER_BIND_TYPE bindType, class Validator>
-    void TempDynBufferBase<T, bindType, Validator>::UpdateInternal(const void* pData, size_t elementSize)
-    {
-        m_validator.Check(Allocated);
-        m_DevBufMan.UpdateBuffer(m_handle, pData, m_numElements * elementSize);
-        m_validator.Set(Filled);
-    }
-
-    template<typename T, BUFFER_BIND_TYPE bindType, class Validator>
-    T* TempDynBufferBase<T, bindType, Validator>::Lock()
-    {
-        m_validator.Check(Allocated);
-        T* p = (T*) m_DevBufMan.BeginWrite(m_handle);
-        m_validator.Set(Locked);
-        return p;
-    }
-
-    template<typename T, BUFFER_BIND_TYPE bindType, class Validator>
-    void TempDynBufferBase<T, bindType, Validator>::Unlock()
-    {
-        m_validator.Check(Locked);
-        m_DevBufMan.EndReadWrite(m_handle);
-        m_validator.Set(Filled);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template<typename T, class Validator = ValidatorDefault>
-    class TempDynVBBase
-        : public TempDynBufferBase<T, BBT_VERTEX_BUFFER, Validator>
-    {
-    public:
-        typedef TempDynBufferBase<T, BBT_VERTEX_BUFFER, Validator> Base;
-
-    public:
-        using Base::IsAllocated;
-        using Base::Release;
-
-        using Base::Update;
-        using Base::Lock;
-        using Base::Unlock;
-
-    protected:
-        TempDynVBBase(IRenderer* renderer)
-            : TempDynBufferBase<T, BBT_VERTEX_BUFFER, Validator>(renderer),
-            m_renderer(renderer){}
-        ~TempDynVBBase() {}
-
-        void BindInternal(uint32 streamID, size_t stride);
-
-    protected:
-        IRenderer* m_renderer = nullptr;
-        using Base::m_handle;
-        using Base::m_validator;
-    };
-
-    template<typename T, class Validator>
-    void TempDynVBBase<T, Validator>::BindInternal(uint32 streamID, size_t stride)
-    {
-        m_validator.Check(Filled);
-        size_t bufferOffset = ~0;
-        D3DBuffer* pVB = this->m_DevBufMan.GetD3D(m_handle, &bufferOffset);
-        m_renderer->FX_SetVStream(streamID, pVB, bufferOffset, stride);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template<typename T, class Validator = ValidatorDefault>
-    class TempDynVB
-        : public TempDynVBBase<T, Validator>
-    {
-        friend class TempDynVBAny;
-
-    public:
-        typedef TempDynVBBase<T, Validator> Base;
-
-    public:
-        static void CreateFillAndBind(const T* pData, size_t numElements, uint32 streamID) { CreateFillAndBindInternal(pData, numElements, streamID, sizeof(T)); }
-
-    public:
-        TempDynVB(IRenderer* renderer)
-            : TempDynVBBase<T, Validator>(renderer)
-            , m_renderer(renderer){}
-
-        using Base::Allocate;
-        void Bind(uint32 streamID) { BindInternal(streamID, sizeof(T)); }
-
-    protected:
-        static void CreateFillAndBindInternal(const void* pData, size_t numElements, uint32 streamID, size_t stride);
-
-    protected:
-        IRenderer* m_renderer = nullptr;
-        using Base::BindInternal;
-
-    protected:
-        TempDynVB(const TempDynVB&);
-        TempDynVB& operator=(const TempDynVB&);
-    };
-
-    template<typename T, class Validator>
-    void TempDynVB<T, Validator>::CreateFillAndBindInternal(const void* pData, size_t numElements, uint32 streamID, size_t stride)
-    {
-        TempDynVB<T, Validator> vb(gRenDev);
-        vb.AllocateInternal(numElements, stride);
-        vb.UpdateInternal(pData, stride);
-        vb.BindInternal(streamID, stride);
-        vb.Release();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template<class Validator = ValidatorDefault>
-    class TempDynInstVB
-        : public TempDynVBBase<void, Validator>
-    {
-    public:
-        typedef TempDynVBBase<void, Validator> Base;
-
-    public:
-        TempDynInstVB(IRenderer* renderer)
-            : TempDynVBBase<void, Validator>(renderer),
-            m_renderer(renderer)
-        {}
-
-        void Allocate(size_t numElements, size_t elementSize) { AllocateInternal(numElements, elementSize); }
-        void Bind(uint32 streamID, uint32 stride) { BindInternal(streamID, stride); }
-
-    protected:
-        using Base::AllocateInternal;
-        using Base::BindInternal;
-
-    protected:
-        IRenderer* m_renderer = nullptr;
-
-        TempDynInstVB(const TempDynInstVB&);
-        TempDynInstVB& operator=(const TempDynInstVB&);
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    class TempDynVBAny
-    {
-    public:
-        static void CreateFillAndBind(const void* pData, size_t numElements, uint32 streamID, size_t stride) { TempDynVB<void>::CreateFillAndBindInternal(pData, numElements, streamID, stride); }
-
-    private:
-        IRenderer* m_renderer = nullptr;
-        TempDynVBAny(IRenderer* renderer);
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    template <RenderIndexType idxType>
-    struct MapIndexType {};
-
-    template <>
-    struct MapIndexType<Index16>
-    {
-        typedef uint16 Type;
-        enum
-        {
-            Size = sizeof(Type)
-        };
-    };
-
-    template <>
-    struct MapIndexType<Index32>
-    {
-        typedef uint32 Type;
-        enum
-        {
-            Size = sizeof(Type)
-        };
-    };
-
-    template<RenderIndexType idxType, class Validator = ValidatorDefault>
-    class TempDynIB
-        : public TempDynBufferBase<typename MapIndexType<idxType>::Type, BBT_INDEX_BUFFER, Validator>
-    {
-    public:
-        typedef typename MapIndexType<idxType>::Type IndexDataType;
-        typedef TempDynBufferBase<IndexDataType, BBT_INDEX_BUFFER, Validator> Base;
-
-    public:
-        static void CreateFillAndBind(const IndexDataType* pData, size_t numElements);
-
-    public:
-        TempDynIB(IRenderer* renderer)
-            : TempDynBufferBase<IndexDataType, BBT_INDEX_BUFFER, Validator>(renderer),
-            m_renderer(renderer)
-        {}
-
-        void Allocate(size_t numElements);
-        using Base::IsAllocated;
-        using Base::Release;
-
-        using Base::Update;
-        using Base::Lock;
-        using Base::Unlock;
-
-        void Bind();
-
-    protected:
-        IRenderer* m_renderer = nullptr;
-
-        TempDynIB(const TempDynIB&);
-        TempDynIB& operator=(const TempDynIB&);
-
-    protected:
-        using Base::m_handle;
-        using Base::m_validator;
-    };
-
-    template<RenderIndexType idxType, class Validator>
-    void TempDynIB<idxType, Validator>::Allocate(size_t numElements)
-    {
-        Base::Allocate(numElements);
-    }
-
-    template<RenderIndexType idxType, class Validator>
-    void TempDynIB<idxType, Validator>::Bind()
-    {
-        m_validator.Check(Filled);
-        size_t bufferOffset = ~0;
-        D3DBuffer* pIB = this->m_DevBufMan.GetD3D(m_handle, &bufferOffset);
-        m_renderer->FX_SetIStream(pIB, bufferOffset, idxType);
-    }
-
-    template<RenderIndexType idxType, class Validator>
-    void TempDynIB<idxType, Validator>::CreateFillAndBind(const IndexDataType* pData, size_t numElements)
-    {
-        TempDynIB<idxType, Validator> ib(gcpRendD3D);
-        ib.Allocate(numElements);
-        ib.Update(pData);
-        ib.Bind();
-        ib.Release();
-    }
-} // namespace TempDynBuffer
-
-using TempDynBuffer::TempDynVB;
-using TempDynBuffer::TempDynVBAny;
-typedef TempDynBuffer::TempDynInstVB<> TempDynInstVB;
-
-typedef TempDynBuffer::TempDynIB<Index16> TempDynIB16;
-typedef TempDynBuffer::TempDynIB<Index32> TempDynIB32;
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_DEVICEMANAGER_TEMPDYNBUFFER_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DriverD3D.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DriverD3D.cpp
deleted file mode 100644
index e3675be4e1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DriverD3D.cpp
+++ /dev/null
@@ -1,8163 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "AnimKey.h"
-
-#include <AzCore/Math/MathUtils.h>
-#include <IEngineModule.h>
-#include <CryExtension/Impl/ClassWeaver.h>
-
-#include "../Common/Textures/TextureManager.h"
-#include "../Common/Textures/TextureStreamPool.h"
-#include "../Common/ReverseDepth.h"
-#include "D3DStereo.h"
-#include "D3DPostProcess.h"
-#include "MultiLayerAlphaBlendPass.h"
-
-#include "ScopeGuard.h"
-#include "IImageHandler.h"
-#include <CryPath.h>
-#include <Pak/CryPakUtils.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DRIVERD3D_CPP_SECTION_1 1
-#define DRIVERD3D_CPP_SECTION_3 3
-#define DRIVERD3D_CPP_SECTION_4 4
-#define DRIVERD3D_CPP_SECTION_5 5
-#define DRIVERD3D_CPP_SECTION_6 6
-#define DRIVERD3D_CPP_SECTION_7 7
-#define DRIVERD3D_CPP_SECTION_8 8
-#define DRIVERD3D_CPP_SECTION_9 9
-#define DRIVERD3D_CPP_SECTION_10 10
-#define DRIVERD3D_CPP_SECTION_11 11
-#define DRIVERD3D_CPP_SECTION_12 12
-#define DRIVERD3D_CPP_SECTION_13 13
-#define DRIVERD3D_CPP_SECTION_14 14
-#define DRIVERD3D_CPP_SECTION_15 15
-#define DRIVERD3D_CPP_SECTION_16 16
-#endif
-
-#if defined(FEATURE_SVO_GI)
-#include "D3D_SVO.h"
-#endif
-
-#if (defined (WIN32) || defined(WIN64)) && !defined(OPENGL)
-#   include <D3Dcompiler.h>
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-#if RENDERER_ENABLE_BREAK_ON_ERROR
-#include <d3d9.h>
-namespace detail
-{
-    const char* ToString(long const hr)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-# else
-        if (D3DOK_NOAUTOGEN == hr)
-            return "D3DOK_NOAUTOGEN This is a success code. However, the autogeneration of mipmaps is not supported for this format. This means that resource creation will succeed but the mipmap levels will not be automatically generated";
-        else if (D3DERR_CONFLICTINGRENDERSTATE == hr)
-            return "D3DERR_CONFLICTINGRENDERSTATE The currently set render states cannot be used together";
-        else if (D3DERR_CONFLICTINGTEXTUREFILTER == hr)
-            return "D3DERR_CONFLICTINGTEXTUREFILTER The current texture filters cannot be used together";
-        else if (D3DERR_CONFLICTINGTEXTUREPALETTE == hr)
-            return "D3DERR_CONFLICTINGTEXTUREPALETTE The current textures cannot be used simultaneously.";
-        else if (D3DERR_DEVICEHUNG == hr)
-            return "D3DERR_DEVICEHUNG The device that returned this code caused the hardware adapter to be reset by the OS. Most applications should destroy the device and quit. Applications that must continue should destroy all video memory objects (surfaces, textures, state blocks etc) and call Reset() to put the device in a default state. If the application then continues rendering in the same way, the device will return to this state";
-        else if (D3DERR_DEVICELOST == hr)
-            return "D3DERR_DEVICELOST The device has been lost but cannot be reset at this time. Therefore, rendering is not possible.A Direct 3D device object other than the one that returned this code caused the hardware adapter to be reset by the OS. Delete all video memory objects (surfaces, textures, state blocks) and call Reset() to return the device to a default state. If the application continues rendering without a reset, the rendering calls will succeed.";
-        else if (D3DERR_DEVICENOTRESET == hr)
-            return "D3DERR_DEVICENOTRESET The device has been lost but can be reset at this time.";
-        else if (D3DERR_DEVICEREMOVED == hr)
-            return "D3DERR_DEVICEREMOVED The hardware adapter has been removed. Application must destroy the device, do enumeration of adapters and create another Direct3D device. If application continues rendering without calling Reset, the rendering calls will succeed";
-        else if (D3DERR_DRIVERINTERNALERROR == hr)
-            return "D3DERR_DRIVERINTERNALERROR Internal driver error. Applications should destroy and recreate the device when receiving this error. For hints on debugging this error, see Driver Internal Errors (Direct3D 9).";
-        else if (D3DERR_DRIVERINVALIDCALL == hr)
-            return "D3DERR_DRIVERINVALIDCALL Not used.";
-        else if (D3DERR_INVALIDCALL == hr)
-            return "D3DERR_INVALIDCALL The method call is invalid. For example, a method's parameter may not be a valid pointer.";
-        else if (D3DERR_INVALIDDEVICE == hr)
-            return "D3DERR_INVALIDDEVICE The requested device type is not valid.";
-        else if (D3DERR_MOREDATA == hr)
-            return "D3DERR_MOREDATA There is more data available than the specified buffer size can hold.";
-        else if (D3DERR_NOTAVAILABLE == hr)
-            return "D3DERR_NOTAVAILABLE This device does not support the queried technique.";
-        else if (D3DERR_NOTFOUND == hr)
-            return "D3DERR_NOTFOUND The requested item was not found.";
-        else if (D3D_OK == hr)
-            return "D3D_OK No error occurred.";
-        else if (D3DERR_OUTOFVIDEOMEMORY == hr)
-            return "D3DERR_OUTOFVIDEOMEMORY Direct3D does not have enough display memory to perform the operation. The device is using more resources in a single scene than can fit simultaneously into video memory. Present, PresentEx, or CheckDeviceState can return this error. Recovery is similar to D3DERR_DEVICEHUNG, though the application may want to reduce its per-frame memory usage as well to avoid having the error recur.";
-        else if (D3DERR_TOOMANYOPERATIONS == hr)
-            return "D3DERR_TOOMANYOPERATIONS The application is requesting more texture-filtering operations than the device supports.";
-        else if (D3DERR_UNSUPPORTEDALPHAARG == hr)
-            return "D3DERR_UNSUPPORTEDALPHAARG The device does not support a specified texture-blending argument for the alpha channel.";
-        else if (D3DERR_UNSUPPORTEDALPHAOPERATION == hr)
-            return "D3DERR_UNSUPPORTEDALPHAOPERATION The device does not support a specified texture-blending operation for the alpha channel.";
-        else if (D3DERR_UNSUPPORTEDCOLORARG == hr)
-            return "D3DERR_UNSUPPORTEDCOLORARG The device does not support a specified texture-blending argument for color values.";
-        else if (D3DERR_UNSUPPORTEDCOLOROPERATION == hr)
-            return "D3DERR_UNSUPPORTEDCOLOROPERATION The device does not support a specified texture-blending operation for color values.";
-        else if (D3DERR_UNSUPPORTEDFACTORVALUE == hr)
-            return "D3DERR_UNSUPPORTEDFACTORVALUE The device does not support the specified texture factor value. Not used; provided only to support older drivers.";
-        else if (D3DERR_UNSUPPORTEDTEXTUREFILTER == hr)
-            return "D3DERR_UNSUPPORTEDTEXTUREFILTER The device does not support the specified texture filter.";
-        else if (D3DERR_WASSTILLDRAWING == hr)
-            return "D3DERR_WASSTILLDRAWING The previous blit operation that is transferring information to or from this surface is incomplete.";
-        else if (D3DERR_WRONGTEXTUREFORMAT == hr)
-            return "D3DERR_WRONGTEXTUREFORMAT The pixel format of the texture surface is not valid.";
-        else if (E_FAIL == hr)
-            return "E_FAIL An undetermined error occurred inside the Direct3D subsystem.";
-        else if (E_INVALIDARG == hr)
-            return "E_INVALIDARG An invalid parameter was passed to the returning function.";
-        else if (E_NOINTERFACE == hr)
-            return "E_NOINTERFACE No object interface is available.";
-        else if (E_NOTIMPL == hr)
-            return "E_NOTIMPL Not implemented.";
-        else if (E_OUTOFMEMORY == hr)
-            return "E_OUTOFMEMORY Direct3D could not allocate sufficient memory to complete the call.";
-        else if (D3DERR_UNSUPPORTEDOVERLAY == hr)
-            return "D3DERR_UNSUPPORTEDOVERLAY The device does not support overlay for the specified size or display mode.";
-        else if (D3DERR_UNSUPPORTEDOVERLAYFORMAT == hr)
-            return "D3DERR_UNSUPPORTEDOVERLAYFORMAT The device does not support overlay for the specified surface format.";
-        else if (D3DERR_CANNOTPROTECTCONTENT == hr)
-            return "D3DERR_CANNOTPROTECTCONTENT The specified content cannot be protected";
-        else if (D3DERR_UNSUPPORTEDCRYPTO == hr)
-            return "D3DERR_UNSUPPORTEDCRYPTO The specified cryptographic algorithm is not supported.";
-        else if (DXGI_ERROR_DEVICE_REMOVED == hr)
-        {
-            HRESULT subResult = gcpRendD3D->GetDevice().GetDeviceRemovedReason();
-            if (DXGI_ERROR_DEVICE_HUNG == subResult)
-            {
-                return "DXGI_ERROR_DEVICE_HUNG. The device was removed as it hung";
-            }
-            else if (DXGI_ERROR_DEVICE_REMOVED == subResult)
-            {
-                return "DXGI_ERROR_DEVICE_REMOVED. The device was removed";
-            }
-            else if (DXGI_ERROR_DEVICE_RESET == subResult)
-            {
-                return "DXGI_ERROR_DEVICE_RESET. The device was reset";
-            }
-            else if (DXGI_ERROR_DRIVER_INTERNAL_ERROR == subResult)
-            {
-                return "DXGI_ERROR_DRIVER_INTERNAL_ERROR. The device was removed due to an internal error";
-            }
-            else if (DXGI_ERROR_INVALID_CALL == subResult)
-            {
-                return "DXGI_ERROR_INVALID_CALL. The device was removed due to an invalid call";
-            }
-        }
-#endif
-        return "Unknown HRESULT CODE!";
-    }
-    bool CheckHResult(long const hr
-        , bool breakOnError
-        , const char* file
-        , const int line)
-    {
-        IF (hr == S_OK, 1)
-        {
-            return true;
-        }
-        CryLogAlways("%s(%d): d3d error: '%s'", file, line, ToString(hr));
-        IF (breakOnError, 0)
-        {
-            __debugbreak();
-        }
-        return false;
-    }
-}
-#endif
-
-void CD3D9Renderer::LimitFramerate(const int maxFPS, const bool bUseSleep)
-{
-    FRAME_PROFILER("RT_FRAME_CAP", gEnv->pSystem, PROFILE_RENDERER);
-
-    if (maxFPS > 0)
-    {
-        CTimeValue timeFrameMax;
-        const float safeMarginFPS = 0.5f;//save margin to not drop below 30 fps
-        static CTimeValue sTimeLast = gEnv->pTimer->GetAsyncTime();
-
-        timeFrameMax.SetMilliSeconds((int64)(1000.f / ((float)maxFPS + safeMarginFPS)));
-        const CTimeValue timeLast = timeFrameMax + sTimeLast;
-        while (timeLast.GetValue() > gEnv->pTimer->GetAsyncTime().GetValue())
-        {
-            if (bUseSleep)
-            {
-                CrySleep(1);
-            }
-            else
-            {
-                volatile int i = 0;
-                while (i++ < 1000)
-                {
-                    ;
-                }
-            }
-        }
-
-        sTimeLast = gEnv->pTimer->GetAsyncTime();
-    }
-}
-
-
-CCryNameTSCRC CTexture::s_sClassName = CCryNameTSCRC("CTexture");
-
-CCryNameTSCRC CHWShader::s_sClassNameVS = CCryNameTSCRC("CHWShader_VS");
-CCryNameTSCRC CHWShader::s_sClassNamePS = CCryNameTSCRC("CHWShader_PS");
-
-CCryNameTSCRC CShader::s_sClassName = CCryNameTSCRC("CShader");
-
-StaticInstance<CD3D9Renderer> gcpRendD3D;
-
-int CD3D9Renderer::CV_d3d11_CBUpdateStats;
-ICVar* CD3D9Renderer::CV_d3d11_forcedFeatureLevel;
-int CD3D9Renderer::CV_r_AlphaBlendLayerCount;
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-int CD3D9Renderer::CV_d3d11_debugruntime;
-ICVar* CD3D9Renderer::CV_d3d11_debugMuteSeverity;
-ICVar* CD3D9Renderer::CV_d3d11_debugMuteMsgID;
-ICVar* CD3D9Renderer::CV_d3d11_debugBreakOnMsgID;
-int CD3D9Renderer::CV_d3d11_debugBreakOnce;
-#endif
-
-const char* resourceName[] = {
-    "UNKNOWN",
-    "Surfaces",
-    "Volumes",
-    "Textures",
-    "Volume Textures",
-    "Cube Textures",
-    "Vertex Buffers",
-    "Index Buffers"
-};
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-static void OnChange_CV_d3d11_debugMuteMsgID(ICVar* /*pCVar*/)
-{
-    gcpRendD3D->m_bUpdateD3DDebug = true;
-}
-#endif
-
-
-
-bool QueryIsFullscreen()
-{
-    return gcpRendD3D->IsFullscreen();
-}
-
-unsigned int CD3D9Renderer::GetCurrentBackBufferIndex([[maybe_unused]] IDXGISwapChain* pSwapChain)
-{
-    unsigned index = 0;
-
-#ifdef CRY_USE_DX12
-    DXGISwapChain* dxgiSwapChain;
-    pSwapChain->QueryInterface(__uuidof(DXGISwapChain), reinterpret_cast<void**>(&dxgiSwapChain));
-    if (dxgiSwapChain)
-    {
-        index = dxgiSwapChain->GetCurrentBackBufferIndex();
-        dxgiSwapChain->Release();
-    }
-#endif
-
-    return index;
-}
-
-
-// Direct 3D console variables
-CD3D9Renderer::CD3D9Renderer()
-    : m_DeviceOwningthreadID(0)
-    , m_nMaxRT2Commit(-1)
-#if defined(WIN32)
-    , m_bDisplayChanged(false)
-    , m_nConnectedMonitors(1)
-#endif // defined(WIN32)
-{
-    m_screenshotFilepathCache[0] = '\0';
-
-    m_bDraw2dImageStretchMode = false;
-    m_techShadowGen = CCryNameTSCRC("ShadowGen");
-
-    CreateDeferredUnitBox(m_arrDeferredInds, m_arrDeferredVerts);
-}
-
-void CD3D9Renderer::InitRenderer()
-{
-    CRenderer::InitRenderer();
-
-    memset(m_arrWireFrameStack, 0, sizeof(m_arrWireFrameStack));
-    m_nWireFrameStack = 0;
-
-    m_uLastBlendFlagsPassGroup = 0xFFFFFFFF;
-    m_bInitialized = false;
-    gRenDev = this;
-
-    m_pSecondBackBuffer = NULL;
-    m_pStereoRenderer = new CD3DStereoRenderer(*this, (EStereoDevice)CRenderer::CV_r_StereoDevice);
-    m_bDualStereoSupport = CRenderer::CV_r_StereoDevice > 0;
-    m_GraphicsPipeline = new CStandardGraphicsPipeline();
-    m_pTiledShading = new CTiledShading();
-
-    m_pPipelineProfiler = NULL;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-
-#if defined(ENABLE_PROFILING_GPU_TIMERS)
-    m_pPipelineProfiler = new CRenderPipelineProfiler();
-#endif
-
-    m_logFileHandle = AZ::IO::InvalidHandle;
-
-#if defined(ENABLE_PROFILING_CODE)
-    for (unsigned int i = 0; i < MAXFRAMECAPTURECALLBACK; i++)
-    {
-        m_pCaptureCallBack[i] = NULL;
-    }
-    m_frameCaptureRegisterNum = 0;
-    m_captureFlipFlop = 0;
-    m_pSaveTexture[0] = NULL;
-    m_pSaveTexture[1] = NULL;
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-    {
-        m_nScreenCaptureRequestFrame[i] = 0;
-        m_screenCapTexHandle[i] = 0;
-    }
-#endif
-
-    m_nCurStateBL = (uint32) - 1;
-    m_nCurStateRS = (uint32) - 1;
-    m_nCurStateDP = (uint32) - 1;
-    m_CurTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
-    m_dwPresentStatus = 0;
-
-    m_hWnd = NULL;
-    m_hWnd2             = NULL;
-#ifdef WIN32
-    m_hIconBig          = NULL;
-    m_hIconSmall        = NULL;
-#endif
-
-    m_numOcclusionDownsampleStages = 1;
-    m_occlusionSourceSizeX = 0;
-    m_occlusionSourceSizeY = 0;
-
-    m_PerInstanceConstantBufferPool.Init();
-
-    m_lockCharCB = 0;
-    m_CharCBFrameRequired[0] = m_CharCBFrameRequired[1] = m_CharCBFrameRequired[2] = 0;
-    m_CharCBAllocated = 0;
-
-    for (int i = 0; i < SHAPE_MAX; i++)
-    {
-        m_pUnitFrustumVB[i] = NULL;
-        m_pUnitFrustumIB[i] = NULL;
-    }
-
-    m_pQuadVB = NULL;
-    m_nQuadVBSize = 0;
-
-    m_2dImages.reserve(32);
-
-    m_pZBufferReadOnlyDSV = NULL;
-    m_pZBufferDepthReadOnlySRV = NULL;
-    m_pZBufferStencilReadOnlySRV = NULL;
-
-    m_Features = RFT_SUPPORTZBIAS;
-
-    REGISTER_CVAR2("d3d11_CBUpdateStats", &CV_d3d11_CBUpdateStats, 0, 0, "Logs constant buffer updates statistics.");
-    CV_d3d11_forcedFeatureLevel = REGISTER_STRING("d3d11_forcedFeatureLevel", NULL, VF_DEV_ONLY | VF_REQUIRE_APP_RESTART,
-            "Forces the Direct3D device to target a specific feature level - supported values are:\n"
-            " 10.0\n"
-            " 10.1\n"
-            " 11.0");
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-    REGISTER_CVAR2("d3d11_debugruntime", &CV_d3d11_debugruntime, 0, 0, "Avoid D3D debug runtime errors for certain cases");
-    CV_d3d11_debugMuteSeverity = REGISTER_INT("d3d11_debugMuteSeverity", 2, VF_NULL,
-            "Mute whole group of messages of certain severity when D3D debug runtime enabled:\n"
-            " 0 - no severity based mute\n"
-            " 1 - mute INFO only\n"
-            " 2 - mute INFO and WARNING (default)\n"
-            " 3 - mute INFO, WARNING and ERROR\n"
-            " 4 - mute all (INFO, WARNING, ERROR, CORRUPTION)");
-    CV_d3d11_debugMuteMsgID = REGISTER_STRING("d3d11_debugMuteMsgID", "388", VF_NULL,
-            "List of D3D debug runtime messages to mute (see DirectX Control Panel for full message ID list)\n"
-            "Use space separated list of IDs, eg. '388 10 544'");
-    CV_d3d11_debugBreakOnMsgID = REGISTER_STRING("d3d11_debugBreakOnMsgID", "0", VF_NULL,
-            "List of D3D debug runtime messages to break on.\nUsage:\n"
-            " 0                    - no break (default)\n"
-            " msgID1 msgID2 msgID3 - break whenever a message with one of given IDs occurs\n"
-            " -1                   - break on any error or corruption message");
-    REGISTER_CVAR2("d3d11_debugBreakOnce", &CV_d3d11_debugBreakOnce, 1, VF_NULL,
-        "If enabled, D3D debug runtime break on message/error will be enabled only for 1 frame since last change.\n");
-
-    CV_d3d11_debugMuteSeverity->SetOnChangeCallback(OnChange_CV_d3d11_debugMuteMsgID);
-    CV_d3d11_debugMuteMsgID->SetOnChangeCallback(OnChange_CV_d3d11_debugMuteMsgID);
-    CV_d3d11_debugBreakOnMsgID->SetOnChangeCallback(OnChange_CV_d3d11_debugMuteMsgID);
-#endif
-
-    REGISTER_CVAR3("r_AlphaBlendLayerCount", CV_r_AlphaBlendLayerCount, 0, VF_RENDERER_CVAR,
-        "Set the number of layers to use for alpha blending to allow for order independent transparency.\n"
-        "0: disabled\n"
-        "1: Use an extra alpha depth check to over or under blend with existing alpha providing more accuracy.\n"
-        "2-4: Use additional layers to gaurantee correct alpha n layers deep."
-        );
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    m_pRenderAuxGeomD3D = 0;
-    if (CV_r_enableauxgeom)
-    {
-        m_pRenderAuxGeomD3D = CRenderAuxGeomD3D::Create(*this);
-    }
-#endif
-    m_pColorGradingControllerD3D = new CColorGradingControllerD3D(this);
-
-    CV_capture_frames = 0;
-    CV_capture_folder = 0;
-    CV_capture_buffer = 0;
-
-    m_NewViewport.fMinZ = 0;
-    m_NewViewport.fMaxZ = 1;
-
-    m_wireframe_mode = R_SOLID_MODE;
-
-#ifdef SHADER_ASYNC_COMPILATION
-    uint32 nThreads = CV_r_shadersasyncmaxthreads; //clamp_tpl(CV_r_shadersasyncmaxthreads, 1, 4);
-    uint32 nOldThreads = m_AsyncShaderTasks.size();
-    for (uint32 a = nThreads; a < nOldThreads; a++)
-    {
-        delete m_AsyncShaderTasks[a];
-    }
-    m_AsyncShaderTasks.resize(nThreads);
-    for (uint32 a = nOldThreads; a < nThreads; a++)
-    {
-        m_AsyncShaderTasks[a] = new CAsyncShaderTask();
-    }
-    for (int32 i = 0; i < m_AsyncShaderTasks.size(); i++)
-    {
-        m_AsyncShaderTasks[i]->SetThread(i);
-    }
-#endif
-
-#if !defined(NULL_RENDERER)
-    m_OcclQueriesUsed = 0;
-#endif
-
-    m_pPostProcessMgr = 0;
-    m_pWaterSimMgr = 0;
-
-    m_gmemDepthStencilMode = eGDSM_Invalid;
-    AZ::RenderNotificationsBus::Handler::BusConnect();
-    AZ::RenderScreenshotRequestBus::Handler::BusConnect();
-
-    // Ensure tiled shading is disabled on initialization for OpenGL as HLSLcc does not properly support our tiled lighting shaders
-    if (gRenDev->GetRenderType() == eRT_OpenGL)
-    {
-        gRenDev->CV_r_DeferredShadingTiled = 0;
-    }
-}
-
-CD3D9Renderer::~CD3D9Renderer()
-{
-    //Code moved to Release
-}
-
-void CD3D9Renderer::StaticCleanup()
-{
-    stl::free_container(s_tempRIs);
-    stl::free_container(s_tempObjects[0]);
-    stl::free_container(s_tempObjects[1]);
-}
-
-void CD3D9Renderer::Release()
-{
-
-    AZ::RenderNotificationsBus::Handler::BusDisconnect();
-    AZ::RenderScreenshotRequestBus::Handler::BusDisconnect();
-    //FreeResources(FRR_ALL);
-    ShutDown();
-
-#if defined(ENABLE_PROFILING_CODE)
-    SAFE_RELEASE(m_pSaveTexture[0]);
-    SAFE_RELEASE(m_pSaveTexture[1]);
-#endif
-
-#ifdef SHADER_ASYNC_COMPILATION
-    for (int32 a = 0; a < m_AsyncShaderTasks.size(); a++)
-    {
-        delete m_AsyncShaderTasks[a];
-    }
-#endif
-
-    m_2dImages.clear();
-
-    CRenderer::Release();
-
-    DestroyWindow();
-}
-
-void CD3D9Renderer::Reset(void)
-{
-    m_pRT->RC_ResetDevice();
-}
-void CD3D9Renderer::RT_Reset(void)
-{
-    if (CheckDeviceLost())
-    {
-        return;
-    }
-    m_bDeviceLost = 1;
-    //iLog->Log("...Reset");
-    RestoreGamma();
-    m_bDeviceLost = 0;
-    m_MSAA = 0;
-    if (m_bFullScreen)
-    {
-        SetGamma(CV_r_gamma + m_fDeltaGamma, CV_r_brightness, CV_r_contrast, false);
-    }
-}
-
-void CD3D9Renderer::ChangeViewport(unsigned int x, unsigned int y, unsigned int width, unsigned int height, bool bMainViewport, float scaleWidth, float scaleHeight)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-    assert(m_CurrContext);
-
-    m_CurrContext->m_nViewportWidth = width;
-    m_CurrContext->m_nViewportHeight = height;
-    m_CurrContext->m_bMainViewport = bMainViewport;
-
-    const int nMaxRes = GetMaxSquareRasterDimension();
-    const float fMaxRes = aznumeric_cast<float>(nMaxRes);
-    float fWidth = aznumeric_cast<float>(width);
-    float fHeight = aznumeric_cast<float>(height);
-
-    if (bMainViewport)
-    {
-        if (CV_r_CustomResWidth && CV_r_CustomResHeight)
-        {
-            width = clamp_tpl(CV_r_CustomResWidth, 32, nMaxRes);
-            height = clamp_tpl(CV_r_CustomResHeight, 32, nMaxRes);
-            fWidth = aznumeric_cast<float>(width);
-            fHeight = aznumeric_cast<float>(height);
-        }
-        m_CurrContext->m_fPixelScaleX = 1.0f;
-        m_CurrContext->m_fPixelScaleY = 1.0f;
-
-        if (CV_r_Supersampling > 1)
-        {
-            m_CurrContext->m_fPixelScaleX *= aznumeric_cast<float>(CV_r_Supersampling);
-            m_CurrContext->m_fPixelScaleY *= aznumeric_cast<float>(CV_r_Supersampling);
-        }
-        if ( scaleWidth > 1.0f || scaleHeight > 1.0f )
-        {
-            m_CurrContext->m_fPixelScaleX *= scaleWidth;
-            m_CurrContext->m_fPixelScaleY *= scaleHeight;
-        }
-
-        const float nMaxSSX = fMaxRes / fWidth;
-        const float nMaxSSY = fMaxRes / fHeight;
-        m_CurrContext->m_fPixelScaleX = clamp_tpl(m_CurrContext->m_fPixelScaleX, 1.0f, nMaxSSX);
-        m_CurrContext->m_fPixelScaleY = clamp_tpl(m_CurrContext->m_fPixelScaleY, 1.0f, nMaxSSY);
-
-    }
-
-    width  = aznumeric_cast<int>(fWidth * m_CurrContext->m_fPixelScaleX);
-    height = aznumeric_cast<int>(fHeight * m_CurrContext->m_fPixelScaleY);
-
-    DXGI_FORMAT fmt = DXGI_FORMAT_R8G8B8A8_UNORM;
-
-    if (!m_CurrContext->m_pSwapChain && !m_CurrContext->m_pBackBuffer)
-    {
-        DXGI_SWAP_CHAIN_DESC scDesc;
-        scDesc.BufferDesc.Width = width;
-        scDesc.BufferDesc.Height = height;
-        scDesc.BufferDesc.RefreshRate.Numerator = 0;
-        scDesc.BufferDesc.RefreshRate.Denominator = 1;
-        scDesc.BufferDesc.Format = fmt;
-        scDesc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
-        scDesc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
-
-        scDesc.SampleDesc.Count = 1;
-        scDesc.SampleDesc.Quality = 0;
-
-        scDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT;
-        scDesc.BufferCount = 1;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        scDesc.OutputWindow = m_CurrContext->m_hWnd;
-#endif
-        scDesc.Windowed = TRUE;
-        scDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
-        scDesc.Flags = 0;
-
-#if defined(SUPPORT_DEVICE_INFO)
-        HRESULT hr = m_devInfo.Factory()->CreateSwapChain(&GetDevice(), &scDesc, &m_CurrContext->m_pSwapChain);
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #error UNKNOWN PLATFORM TRYING TO CREATE SWAP CHAIN
-#endif
-        assert(SUCCEEDED(hr) && m_CurrContext->m_pSwapChain != 0);
-
-        assert(m_CurrContext->m_pSwapChain);
-        PREFAST_ASSUME(m_CurrContext->m_pSwapChain);
-
-        m_CurrContext->m_pSwapChain->GetDesc(&scDesc);
-
-        AZ::u32 bufferCount = scDesc.BufferCount;
-#if !defined(CRY_USE_DX12)
-        bufferCount = 1;
-#endif
-        m_CurrContext->m_pBackBuffers.resize(bufferCount);
-
-        for (unsigned int b = 0; b < bufferCount; ++b)
-        {
-            void* pBackBuf(0);
-            hr = m_CurrContext->m_pSwapChain->GetBuffer(b, __uuidof(ID3D11Texture2D), &pBackBuf);
-            ID3D11Texture2D* pBackBufferTex = (ID3D11Texture2D*)pBackBuf;
-            assert(SUCCEEDED(hr) && pBackBufferTex != 0);
-
-            D3D11_RENDER_TARGET_VIEW_DESC rtDesc;
-            rtDesc.Format = fmt;
-            rtDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
-            rtDesc.Texture2D.MipSlice = 0;
-            hr = GetDevice().CreateRenderTargetView(pBackBufferTex, &rtDesc, &m_CurrContext->m_pBackBuffers[b]);
-            assert(SUCCEEDED(hr) && m_CurrContext->m_pBackBuffers[b] != 0);
-
-            SAFE_RELEASE(pBackBufferTex);
-        }
-
-        m_CurrContext->m_pCurrentBackBufferIndex = GetCurrentBackBufferIndex(m_CurrContext->m_pSwapChain);
-        m_CurrContext->m_pBackBuffer = m_CurrContext->m_pBackBuffers[m_CurrContext->m_pCurrentBackBufferIndex];
-    }
-    else if (m_CurrContext->m_Width != width || m_CurrContext->m_Height != height)
-    {
-        assert(m_CurrContext->m_pSwapChain && m_CurrContext->m_pBackBuffer);
-
-        PREFAST_ASSUME(m_CurrContext->m_pSwapChain);
-        DXGI_SWAP_CHAIN_DESC scDesc;
-        m_CurrContext->m_pSwapChain->GetDesc(&scDesc);
-
-        AZ::u32 bufferCount = scDesc.BufferCount;
-#if !defined(CRY_USE_DX12)
-        bufferCount = 1;
-#endif
-
-        // remove dangling view-refcounts before resize!
-        for (unsigned int b = 0; b < m_CurrContext->m_pBackBuffers.size(); ++b)
-        {
-            SAFE_RELEASE(m_CurrContext->m_pBackBuffers[b]);
-        }
-
-        HRESULT hr = m_CurrContext->m_pSwapChain->ResizeBuffers(0, width, height, fmt, 0);
-        CRY_ASSERT(SUCCEEDED(hr));
-
-        m_CurrContext->m_pBackBuffers.resize(bufferCount);
-        for (unsigned int b = 0; b < bufferCount; ++b)
-        {
-            void* pBackBuf(0);
-            hr = m_CurrContext->m_pSwapChain->GetBuffer(b, __uuidof(ID3D11Texture2D), &pBackBuf);
-            ID3D11Texture2D* pBackBufferTex = (ID3D11Texture2D*)pBackBuf;
-            assert(SUCCEEDED(hr) && pBackBufferTex != 0);
-
-            D3D11_RENDER_TARGET_VIEW_DESC rtDesc;
-            rtDesc.Format = fmt;
-            rtDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
-            rtDesc.Texture2D.MipSlice = 0;
-            hr = GetDevice().CreateRenderTargetView(pBackBufferTex, &rtDesc, &m_CurrContext->m_pBackBuffers[b]);
-            assert(SUCCEEDED(hr) && m_CurrContext->m_pBackBuffers[b] != 0);
-
-            SAFE_RELEASE(pBackBufferTex);
-        }
-
-        m_CurrContext->m_pCurrentBackBufferIndex = GetCurrentBackBufferIndex(m_CurrContext->m_pSwapChain);
-        m_CurrContext->m_pBackBuffer = m_CurrContext->m_pBackBuffers[m_CurrContext->m_pCurrentBackBufferIndex];
-    }
-
-    if (m_CurrContext->m_pSwapChain && m_CurrContext->m_pBackBuffer)
-    {
-        assert(m_nRTStackLevel[0] == 0);
-        m_CurrContext->m_pCurrentBackBufferIndex = GetCurrentBackBufferIndex(m_CurrContext->m_pSwapChain);
-        m_CurrContext->m_pBackBuffer = m_CurrContext->m_pBackBuffers[m_CurrContext->m_pCurrentBackBufferIndex];
-        m_pBackBuffer = m_CurrContext->m_pBackBuffer;
-        m_pBackBuffers = decltype(m_pBackBuffers)(m_CurrContext->m_pBackBuffers.data(), m_CurrContext->m_pBackBuffers.data() + m_CurrContext->m_pBackBuffers.size());
-        m_pCurrentBackBufferIndex = m_CurrContext->m_pCurrentBackBufferIndex;
-        FX_SetRenderTarget(0, m_CurrContext->m_pBackBuffer, &m_DepthBufferOrig);
-    }
-
-    m_CurrContext->m_X = x;
-    m_CurrContext->m_Y = y;
-    m_CurrContext->m_Width = width;
-    m_CurrContext->m_Height = height;
-    m_width = m_nativeWidth = m_backbufferWidth = width;
-    m_height = m_nativeHeight = m_backbufferHeight = height;
-
-    SetCurDownscaleFactor(Vec2(1, 1));
-    RT_SetViewport(x, y, width, height);
-}
-
-void CD3D9Renderer::SetFullscreenViewport()
-{
-    m_NewViewport.nX = 0;
-    m_NewViewport.nY = 0;
-    m_NewViewport.nWidth = GetWidth();
-    m_NewViewport.nHeight = GetHeight();
-    m_RP.m_PersFlags2 |= RBPF2_COMMIT_PF;
-    m_RP.m_nCommitFlags |= FC_GLOBAL_PARAMS;
-    m_bViewportDirty = true;
-}
-
-void CD3D9Renderer::SetCurDownscaleFactor(Vec2 sf)
-{
-    m_RP.m_CurDownscaleFactor = sf;
-
-    m_FullResRect.left = m_FullResRect.top = 0;
-    m_FullResRect.right = LONG(GetWidth() * m_RP.m_CurDownscaleFactor.x);
-    m_FullResRect.bottom = LONG(GetHeight() * m_RP.m_CurDownscaleFactor.y);
-
-    m_HalfResRect.left = m_HalfResRect.top = 0;
-    m_HalfResRect.right = m_FullResRect.right >> 1;
-    m_HalfResRect.bottom = m_FullResRect.bottom >> 1;
-
-    // need to update shader parameters
-    m_RP.m_PersFlags2 |= RBPF2_COMMIT_PF;
-    m_RP.m_nCommitFlags |= FC_GLOBAL_PARAMS;
-}
-
-void CD3D9Renderer::ChangeLog()
-{
-#ifdef DO_RENDERLOG
-    static bool singleFrame = false;
-
-    if (CV_r_log && m_logFileHandle == AZ::IO::InvalidHandle)
-    {
-        if (CV_r_log < 0)
-        {
-            singleFrame = true;
-            CV_r_log = abs(CV_r_log);
-        }
-
-        m_logFileHandle = fxopen("Direct3DLog.txt", "w");
-
-        if (m_logFileHandle != AZ::IO::InvalidHandle)
-        {
-            iLog->Log("Direct3D log file '%s' opened\n", "Direct3DLog.txt");
-            char time[128];
-            char date[128];
-
-            azstrtime(time);
-            azstrdate(date);
-
-            AZ::IO::Print(m_logFileHandle, "\n==========================================\n");
-            AZ::IO::Print(m_logFileHandle, "Direct3D Log file opened: %s (%s)\n", date, time);
-            AZ::IO::Print(m_logFileHandle, "==========================================\n");
-        }
-    }
-    else if (m_logFileHandle != AZ::IO::InvalidHandle && singleFrame)
-    {
-        CV_r_log = 0;
-        singleFrame = false;
-    }
-
-    if (!CV_r_log && m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        char time[128];
-        char date[128];
-        azstrtime(time);
-        azstrdate(date);
-
-        AZ::IO::Print(m_logFileHandle, "\n==========================================\n");
-        AZ::IO::Print(m_logFileHandle, "Direct3D Log file closed: %s (%s)\n", date, time);
-        AZ::IO::Print(m_logFileHandle, "==========================================\n");
-
-        gEnv->pFileIO->Close(m_logFileHandle);
-        m_logFileHandle = AZ::IO::InvalidHandle;
-        iLog->Log("Direct3D log file '%s' closed\n", "Direct3DLog.txt");
-    }
-
-AZ_PUSH_DISABLE_WARNING(4127, "-Wunknown-warning-option")
-    if (CV_r_logTexStreaming && m_logFileStrHandle == AZ::IO::InvalidHandle)
-AZ_POP_DISABLE_WARNING
-    {
-        m_logFileStrHandle = fxopen("Direct3DLogStreaming.txt", "w");
-        if (m_logFileStrHandle != AZ::IO::InvalidHandle)
-        {
-            iLog->Log("Direct3D texture streaming log file '%s' opened\n", "Direct3DLogStreaming.txt");
-            char time[128];
-            char date[128];
-
-            azstrtime(time);
-            azstrdate(date);
-
-            AZ::IO::Print(m_logFileStrHandle, "\n==========================================\n");
-            AZ::IO::Print(m_logFileStrHandle, "Direct3D Textures streaming Log file opened: %s (%s)\n", date, time);
-            AZ::IO::Print(m_logFileStrHandle, "==========================================\n");
-        }
-    }
-    else
-    if (!CV_r_logTexStreaming && m_logFileStrHandle != AZ::IO::InvalidHandle)
-    {
-        char time[128];
-        char date[128];
-        azstrtime(time);
-        azstrdate(date);
-
-        AZ::IO::Print(m_logFileStrHandle, "\n==========================================\n");
-        AZ::IO::Print(m_logFileStrHandle, "Direct3D Textures streaming Log file closed: %s (%s)\n", date, time);
-        AZ::IO::Print(m_logFileStrHandle, "==========================================\n");
-
-        gEnv->pFileIO->Close(m_logFileStrHandle);
-        m_logFileStrHandle = AZ::IO::InvalidHandle;
-        iLog->Log("Direct3D texture streaming log file '%s' closed\n", "Direct3DLogStreaming.txt");
-    }
-
-AZ_PUSH_DISABLE_WARNING(4127, "-Wunknown-warning-option")
-    if (CV_r_logShaders && m_logFileShHandle == AZ::IO::InvalidHandle)
-AZ_POP_DISABLE_WARNING
-    {
-        m_logFileShHandle = fxopen("Direct3DLogShaders.txt", "w");
-        if (m_logFileShHandle != AZ::IO::InvalidHandle)
-        {
-            iLog->Log("Direct3D shaders log file '%s' opened\n", "Direct3DLogShaders.txt");
-            char time[128];
-            char date[128];
-
-            azstrtime(time);
-            azstrdate(date);
-
-            AZ::IO::Print(m_logFileShHandle, "\n==========================================\n");
-            AZ::IO::Print(m_logFileShHandle, "Direct3D Shaders Log file opened: %s (%s)\n", date, time);
-            AZ::IO::Print(m_logFileShHandle, "==========================================\n");
-        }
-    }
-    else
-    if (!CV_r_logShaders && m_logFileShHandle != AZ::IO::InvalidHandle)
-    {
-        char time[128];
-        char date[128];
-        azstrtime(time);
-        azstrdate(date);
-
-        AZ::IO::Print(m_logFileShHandle, "\n==========================================\n");
-        AZ::IO::Print(m_logFileShHandle, "Direct3D Textures streaming Log file closed: %s (%s)\n", date, time);
-        AZ::IO::Print(m_logFileShHandle, "==========================================\n");
-
-        gEnv->pFileIO->Close(m_logFileShHandle);
-        m_logFileShHandle = AZ::IO::InvalidHandle;
-        iLog->Log("Direct3D Shaders log file '%s' closed\n", "Direct3DLogShaders.txt");
-    }
-#endif
-}
-
-void CD3D9Renderer::PostMeasureOverdraw()
-{
-#if !defined(NULL_RENDERER) && !defined(_RELEASE)
-    if (CV_r_measureoverdraw)
-    {
-        gRenDev->m_cEF.mfRefreshSystemShader("Debug", CShaderMan::s_ShaderDebug);
-
-        int iTmpX, iTmpY, iTempWidth, iTempHeight;
-        GetViewport(&iTmpX, &iTmpY, &iTempWidth, &iTempHeight);
-        RT_SetViewport(0, 0, m_width, m_height);
-
-        TransformationMatrices backupSceneMatrices;
-
-        Set2DMode(1, 1, backupSceneMatrices);
-
-        {
-            TempDynVB<SVF_P3F_C4B_T2F> vb(gRenDev);
-            vb.Allocate(4);
-            SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-            vQuad[0].xyz.x = 0;
-            vQuad[0].xyz.y = 0;
-            vQuad[0].xyz.z = 1;
-            vQuad[0].color.dcolor = (uint32) - 1;
-            vQuad[0].st = Vec2(0.0f, 0.0f);
-
-            vQuad[1].xyz.x = 1;
-            vQuad[1].xyz.y = 0;
-            vQuad[1].xyz.z = 1;
-            vQuad[1].color.dcolor = (uint32) - 1;
-            vQuad[1].st = Vec2(1.0f, 0.0f);
-
-            vQuad[2].xyz.x = 0;
-            vQuad[2].xyz.y = 1;
-            vQuad[2].xyz.z = 1;
-            vQuad[2].color.dcolor = (uint32) - 1;
-            vQuad[2].st = Vec2(0.0f, 1.0f);
-
-            vQuad[3].xyz.x = 1;
-            vQuad[3].xyz.y = 1;
-            vQuad[3].xyz.z = 1;
-            vQuad[3].color.dcolor = (uint32) - 1;
-            vQuad[3].st = Vec2(1.0f, 1.0f);
-
-            vb.Unlock();
-            vb.Bind(0);
-            vb.Release();
-
-            SetCullMode(R_CULL_DISABLE);
-            FX_SetState(GS_NODEPTHTEST);
-            CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-        }
-
-        {
-            uint32 nPasses;
-            CShader* pSH = m_cEF.s_ShaderDebug;
-            pSH->FXSetTechnique("ShowInstructions");
-            pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-            pSH->FXBeginPass(0);
-            STexState TexStateLinear = STexState(FILTER_LINEAR, true);
-
-            if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-            {
-                STexState TexStatePoint = STexState(FILTER_POINT, true);
-                FX_Commit();
-                
-                CTexture::s_ptexSceneDiffuse->Apply(0, CTexture::GetTexState(TexStatePoint));
-                CTextureManager::Instance()->GetDefaultTexture("PaletteDebug")->Apply(1, CTexture::GetTexState(TexStateLinear));
-
-                FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-            }
-
-            Unset2DMode(backupSceneMatrices);
-
-            int nX = 800 - 100 + 2;
-            int nY = 600 - 100 + 2;
-            int nW = 96;
-            int nH = 96;
-
-            Draw2dImage(nX - 2, nY - 2, nW + 4, nH + 4, CTextureManager::Instance()->GetWhiteTexture()->GetTextureID());
-
-            Set2DMode(800, 600, backupSceneMatrices);
-
-            TempDynVB<SVF_P3F_C4B_T2F> vb(gRenDev);
-            vb.Allocate(4);
-            SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-            vQuad[0].xyz.x = nX;
-            vQuad[0].xyz.y = nY;
-            vQuad[0].xyz.z = 1;
-            vQuad[0].color.dcolor = (uint32) - 1;
-            vQuad[0].st = Vec2(0.0f, 0.0f);
-
-            vQuad[1].xyz.x = nX + nW;
-            vQuad[1].xyz.y = nY;
-            vQuad[1].xyz.z = 1;
-            vQuad[1].color.dcolor = (uint32) - 1;
-            vQuad[1].st = Vec2(1.0f, 0.0f);
-
-            vQuad[2].xyz.x = nX;
-            vQuad[2].xyz.y = nY + nH;
-            vQuad[2].xyz.z = 1;
-            vQuad[2].color.dcolor = (uint32) - 1;
-            vQuad[2].st = Vec2(0.0f, 1.0f);
-
-            vQuad[3].xyz.x = nX + nW;
-            vQuad[3].xyz.y = nY + nH;
-            vQuad[3].xyz.z = 1;
-            vQuad[3].color.dcolor = (uint32) - 1;
-            vQuad[3].st = Vec2(1.0f, 1.0f);
-
-            vb.Unlock();
-            vb.Bind(0);
-            vb.Release();
-
-            pSH->FXSetTechnique("InstructionsGrad");
-            pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-            pSH->FXBeginPass(0);
-            FX_Commit();
-
-            CTextureManager::Instance()->GetDefaultTexture("PaletteDebug")->Apply(0, CTexture::GetTexState(TexStateLinear));
-
-            FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-
-            nX = nX * m_width / 800;
-            nY = nY * m_height / 600;
-            nW = 10 * m_width / 800;
-            nH = 10 * m_height / 600;
-            float color[4] = {1, 1, 1, 1};
-            if (CV_r_measureoverdraw == 1 || CV_r_measureoverdraw == 3)
-            {
-                Draw2dLabel(nX + nW - 25, nY + nH - 30, 1.2f, color, false, CV_r_measureoverdraw == 1 ? "Pixel Shader:" : "Vertex Shader:");
-                int n = FtoI(32.0f * CV_r_measureoverdrawscale);
-                for (int i = 0; i < 8; i++)
-                {
-                    char str[256];
-                    azsprintf(str, "-- >%d instructions --", n);
-
-                    Draw2dLabel(nX + nW, nY + nH * (i + 1), 1.2f, color, false,  str);
-                    n += FtoI(32.0f * CV_r_measureoverdrawscale);
-                }
-            }
-            else
-            {
-                Draw2dLabel(nX + nW - 25, nY + nH - 30, 1.2f, color, false, CV_r_measureoverdraw == 2 ? "Pass Count:" : "Overdraw Estimation (360 Hi-Z):");
-                Draw2dLabel(nX + nW, nY + nH, 1.2f, color, false,  "-- 1 pass --");
-                Draw2dLabel(nX + nW, nY + nH * 2, 1.2f, color, false,  "-- 2 passes --");
-                Draw2dLabel(nX + nW, nY + nH * 3, 1.2f, color, false,  "-- 3 passes --");
-                Draw2dLabel(nX + nW, nY + nH * 4, 1.2f, color, false,  "-- 4 passes --");
-                Draw2dLabel(nX + nW, nY + nH * 5, 1.2f, color, false,  "-- 5 passes --");
-                Draw2dLabel(nX + nW, nY + nH * 6, 1.2f, color, false,  "-- 6 passes --");
-                Draw2dLabel(nX + nW, nY + nH * 7, 1.2f, color, false,  "-- 7 passes --");
-                Draw2dLabel(nX + nW, nY + nH * 8, 1.2f, color, false,  "-- >8 passes --");
-            }
-            //WriteXY(nX+10, nY+10, 1, 1,  1,1,1,1, "-- 10 instructions --");
-        }
-        Unset2DMode(backupSceneMatrices);
-        RT_RenderTextMessages();
-    }
-#endif
-}
-
-void CD3D9Renderer::DrawTexelsPerMeterInfo()
-{
-#ifndef _RELEASE
-    if (CV_r_TexelsPerMeter > 0)
-    {
-        FX_SetState(GS_NODEPTHTEST);
-
-        int x = 800 - 310 + 2;
-        int y = 600 - 20 + 2;
-        int w = 296;
-        int h = 6;
-
-        Draw2dImage(x - 2, y - 2, w + 4, h + 4, CTextureManager::Instance()->GetWhiteTexture()->GetTextureID(), 0, 0, 1, 1, 0, 1, 1, 1, 1, 0);
-        Draw2dImage(x, y, w, h, CTextureManager::Instance()->GetDefaultTexture("PaletteTexelsPerMeter")->GetTextureID(), 0, 0, 1, 1, 0, 1, 1, 1, 1, 0);
-
-        float color[4] = { 1, 1, 1, 1 };
-
-        x = x * m_width / 800;
-        y = y * m_height / 600;
-        w = w * m_width / 800;
-
-        Draw2dLabel(x - 100, y - 20, 1.2f, color, false, "r_TexelsPerMeter:");
-        Draw2dLabel(x - 2, y - 20, 1.2f, color, false, "0");
-        Draw2dLabel(x + w / 2 - 5, y - 20, 1.2f, color, false, "%.0f", CV_r_TexelsPerMeter);
-        Draw2dLabel(x + w - 25, y - 20, 1.2f, color, false, ">= %.0f", CV_r_TexelsPerMeter * 2.0f);
-
-        RT_RenderTextMessages();
-    }
-#endif
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-
-void CD3D9Renderer::RT_ForceSwapBuffers()
-{
-}
-
-void CD3D9Renderer::SwitchToNativeResolutionBackbuffer()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_7
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-
-    m_pRT->RC_SwitchToNativeResolutionBackbuffer();
-}
-
-void CD3D9Renderer::CalculateResolutions(int width, int height, [[maybe_unused]] bool bUseNativeRes, int* pRenderWidth, int* pRenderHeight, int* pNativeWidth, int* pNativeHeight, int* pBackbufferWidth, int* pBackbufferHeight)
-{
-    width  = max(width,  512);
-    height = max(height, 300);
-
-    *pRenderWidth = width * m_numSSAASamples;
-    *pRenderHeight = height * m_numSSAASamples;
-
-#if DRIVERD3D_CPP_TRAIT_CALCULATERESOLUTIONS_1080
-    *pNativeWidth = 1920;
-    *pNativeHeight = 1080;
-#elif defined(WIN32) || defined(WIN64)
-    *pNativeWidth  = bUseNativeRes ? m_prefMonWidth  : width;
-    *pNativeHeight = bUseNativeRes ? m_prefMonHeight : height;
-#else
-    *pNativeWidth  = width;
-    *pNativeHeight = height;
-#endif
-
-    if (m_pStereoRenderer && m_pStereoRenderer->IsStereoEnabled())
-    {
-        m_pStereoRenderer->CalculateBackbufferResolution(*pNativeWidth, *pNativeHeight, *pBackbufferWidth, *pBackbufferHeight);
-    }
-    else
-    {
-        *pBackbufferWidth  = *pNativeWidth;
-        *pBackbufferHeight = *pNativeHeight;
-    }
-}
-
-void CD3D9Renderer::RT_SwitchToNativeResolutionBackbuffer([[maybe_unused]] bool resolveBackBuffer)
-{
-    FX_FinalComposite();
-}
-
-void CD3D9Renderer::HandleDisplayPropertyChanges()
-{
-    const bool msaaChanged = CheckMSAAChange();
-    const bool ssaaChanged = CheckSSAAChange();
-
-    if (!IsEditorMode())
-    {
-        bool bChangeRes = ssaaChanged;
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-        bChangeRes |= m_overrideRefreshRate != CV_r_overrideRefreshRate || m_overrideScanlineOrder != CV_r_overrideScanlineOrder;
-#endif
-
-        bool bFullScreen;
-#if DRIVERD3D_CPP_TRAIT_HANDLEDISPLAYPROPERTYCHANGES_FULLSCREEN
-        bFullScreen = m_bFullScreen;
-#else
-        bFullScreen = m_CVFullScreen ? m_CVFullScreen->GetIVal() != 0 : m_bFullScreen;
-#endif
-
-        bool bForceReset = msaaChanged;
-        bool bNativeRes;
-#if DRIVERD3D_CPP_TRAIT_HANDLEDISPLAYPROPERTYCHANGES_NATIVERES
-        bNativeRes = true;
-#elif defined(WIN32) || defined(WIN64)
-        bForceReset |= m_bDisplayChanged && bFullScreen;
-        m_bDisplayChanged = false;
-
-        const bool fullscreenWindow = CV_r_FullscreenWindow && CV_r_FullscreenWindow->GetIVal() != 0;
-        bChangeRes |= m_fullscreenWindow != fullscreenWindow;
-        m_fullscreenWindow = fullscreenWindow;
-
-        const bool bFullScreenNativeRes = CV_r_FullscreenNativeRes && CV_r_FullscreenNativeRes->GetIVal() != 0;
-        bNativeRes = bFullScreenNativeRes && (bFullScreen || m_fullscreenWindow);
-#else
-        bNativeRes = false;
-#endif
-
-        const int colorBits = m_CVColorBits ? m_CVColorBits->GetIVal() : m_cbpp;
-
-        int width, height;
-#if defined(IOS)|| defined(ANDROID)
-        width  = m_width;
-        height = m_height;
-#else
-        width  = m_CVWidth  ? m_CVWidth->GetIVal()  : m_width;
-        height = m_CVHeight ? m_CVHeight->GetIVal() : m_height;
-
-        const float scale = CLAMP(gEnv->pConsole->GetCVar("r_ResolutionScale")->GetFVal(), MIN_RESOLUTION_SCALE, MAX_RESOLUTION_SCALE);
-        width  *= scale;
-        height *= scale;
-#endif
-
-#if DRIVERD3D_CPP_TRAIT_HANDLEDISPLAYPROPERTYCHANGES_CALCRESOLUTIONS
-        int renderWidth, renderHeight, nativeWidth, nativeHeight, backbufferWidth, backbufferHeight;
-        CalculateResolutions(width, height, bNativeRes, &renderWidth, &renderHeight, &nativeWidth, &nativeHeight, &backbufferWidth, &backbufferHeight);
-
-        if (m_width != renderWidth || m_height != renderHeight || m_nativeWidth != nativeWidth || m_nativeHeight != nativeHeight)
-        {
-            bChangeRes = true;
-            width  = renderWidth;
-            height = renderHeight;
-            m_nativeWidth  = nativeWidth;
-            m_nativeHeight = nativeHeight;
-        }
-
-        if (m_backbufferWidth != backbufferWidth || m_backbufferHeight != backbufferHeight)
-        {
-            bForceReset = true;
-            m_backbufferWidth  = backbufferWidth;
-            m_backbufferHeight = backbufferHeight;
-        }
-#endif
-
-        if (bForceReset || bChangeRes || bFullScreen != m_bFullScreen || colorBits != m_cbpp || CV_r_vsync != m_VSync)
-        {
-            ChangeResolution(width, height, colorBits, 75, bFullScreen, bForceReset);
-        }
-    }
-    else if (m_CurrContext && m_CurrContext->m_bMainViewport)
-    {
-        static bool bCustomRes = false;
-        static int nOrigWidth = m_d3dsdBackBuffer.Width;
-        static int nOrigHeight = m_d3dsdBackBuffer.Height;
-
-        if (!bCustomRes)
-        {
-            nOrigWidth = m_d3dsdBackBuffer.Width;
-            nOrigHeight = m_d3dsdBackBuffer.Height;
-        }
-
-        int nNewBBWidth = nOrigWidth;
-        int nNewBBHeight = nOrigHeight;
-
-        bCustomRes = (CV_r_CustomResWidth && CV_r_CustomResHeight) || CV_r_Supersampling > 1;
-        const int maxRes = GetMaxSquareRasterDimension();
-        if (bCustomRes)
-        {
-            const int nMaxBBSize = max(maxRes, max(nOrigWidth, nOrigHeight));
-            nNewBBWidth = clamp_tpl(m_width, nOrigWidth, nMaxBBSize);
-            nNewBBHeight = clamp_tpl(m_height, nOrigHeight, nMaxBBSize);
-        }
-
-        if (msaaChanged || m_d3dsdBackBuffer.Width != nNewBBWidth || m_d3dsdBackBuffer.Height != nNewBBHeight)
-        {
-            if (CV_r_CustomResWidth > maxRes || CV_r_CustomResHeight > maxRes)
-            {
-                iLog->LogWarning("Custom resolutions are limited to %d.", maxRes);
-                iLog->LogWarning("    The requested resolution (%dx%d) will be adjusted to (%dx%d).", CV_r_CustomResWidth, CV_r_CustomResHeight, nNewBBWidth, nNewBBHeight);
-                iLog->LogWarning("    Try increasing r_CustomResMaxSize to avoid this adjustment, or set it to -1 to use the maximum resources of the device.");
-            }
-            iLog->Log("Resizing back buffer to match custom resolution rendering:");
-            ChangeResolution(nNewBBWidth, nNewBBHeight, 32, 75, false, true);
-        }
-    }
-}
-
-void CD3D9Renderer::BeginFrame()
-{
-    //////////////////////////////////////////////////////////////////////
-    // Set up everything so we can start rendering
-    //////////////////////////////////////////////////////////////////////
-
-    assert(m_Device);
-
-    CheckDeviceLost();
-
-    FlushRTCommands(false, false, false);
-
-    CaptureFrameBufferPrepare();
-
-    // Switching of MT mode in run-time
-    //CV_r_multithreaded = 0;
-
-    GetS3DRend().Update();
-
-    m_cEF.mfBeginFrame();
-
-    CRendElement::Tick();
-
-    CREImposter::m_PrevMemPostponed = CREImposter::m_MemPostponed;
-    CREImposter::m_PrevMemUpdated = CREImposter::m_MemUpdated;
-    CREImposter::m_MemPostponed = 0;
-    CREImposter::m_MemUpdated = 0;
-
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_nFrameID++;
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_nFrameUpdateID++;
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_RealTime = iTimer->GetCurrTime();
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_PersFlags &= ~RBPF_HDR;
-
-    CREOcclusionQuery::m_nQueriesPerFrameCounter = 0;
-    CREOcclusionQuery::m_nReadResultNowCounter = 0;
-    CREOcclusionQuery::m_nReadResultTryCounter = 0;
-
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_matView.SetIdentity();
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_matProj.SetIdentity();
-
-    g_SelectedTechs.resize(0);
-    m_RP.m_SysVertexPool[m_RP.m_nFillThreadID].SetUse(0);
-    m_RP.m_SysIndexPool[m_RP.m_nFillThreadID].SetUse(0);
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log)
-    {
-        Logv(0, "******************************* BeginFrame %d ********************************\n", m_RP.m_TI[m_RP.m_nFillThreadID].m_nFrameUpdateID);
-    }
-#endif
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logTexStreaming)
-    {
-        LogStrv(0, "******************************* BeginFrame %d ********************************\n", m_RP.m_TI[m_RP.m_nFillThreadID].m_nFrameUpdateID);
-    }
-
-    PREFAST_SUPPRESS_WARNING(6326)
-    bool bUseWaterTessHW(CV_r_WaterTessellationHW != 0 && m_bDeviceSupportsTessellation);
-    if (bUseWaterTessHW != m_bUseWaterTessHW)
-    {
-        PREFAST_SUPPRESS_WARNING(6326)
-        m_bUseWaterTessHW = bUseWaterTessHW;
-        m_cEF.mfReloadAllShaders(1, SHGD_HW_WATER_TESSELLATION);
-    }
-
-    PREFAST_SUPPRESS_WARNING(6326)
-    if ((CV_r_SilhouettePOM != 0) != m_bUseSilhouettePOM)
-    {
-        PREFAST_SUPPRESS_WARNING(6326)
-        m_bUseSilhouettePOM = CV_r_SilhouettePOM != 0;
-        m_cEF.mfReloadAllShaders(1, SHGD_HW_SILHOUETTE_POM);
-    }
-
-    PREFAST_SUPPRESS_WARNING(6326)
-    if ((CV_r_SpecularAntialiasing != 0) != m_bUseSpecularAntialiasing)
-    {
-        PREFAST_SUPPRESS_WARNING(6326)
-        m_bUseSpecularAntialiasing = CV_r_SpecularAntialiasing != 0;
-        m_cEF.mfReloadAllShaders(1, SHGD_HW_SAA);
-    }
-
-    if IsCVarConstAccess(constexpr) (CV_r_reloadshaders)
-    {
-        //exit(0);
-        //ShutDown();
-        //iConsole->Exit("Test");
-
-        m_cEF.m_Bin.InvalidateCache();
-        m_cEF.mfReloadAllShaders(CV_r_reloadshaders, 0);
-#ifndef CONSOLE_CONST_CVAR_MODE
-        CV_r_reloadshaders = 0;
-#endif
-        // after reloading shaders, update all shader items
-        // and flush the RenderThread to make the changes visible
-        gEnv->p3DEngine->UpdateShaderItems();
-        gRenDev->FlushRTCommands(true, true, true);
-    }
-
-    m_pRT->RC_BeginFrame();
-}
-
-void CD3D9Renderer::RT_BeginFrame()
-{
-#ifdef CRY_USE_METAL
-    //  Create autorelease pool before doing anything with the render device.
-    //  This will be released in the Present method.
-    IDXGISwapChain* swapChain = m_pSwapChain;
-
-    if (m_bEditor && m_CurrContext->m_pSwapChain)
-    {
-        swapChain = m_CurrContext->m_pSwapChain;
-    }
-
-    CCryDXGLSwapChain::FromInterface(swapChain)->TryCreateAutoreleasePool();
-#endif
-
-    {
-        static const ICVar* pCVarShadows = NULL;
-        static const ICVar* pCVarShadowsClouds = NULL;
-        // assume these cvars will exist
-        if (!pCVarShadows)
-        {
-            pCVarShadows = iConsole->GetCVar("e_Shadows");
-        }
-        if (!pCVarShadowsClouds)
-        {
-            pCVarShadowsClouds = iConsole->GetCVar("e_ShadowsClouds");
-        }
-
-        m_bShadowsEnabled = pCVarShadows && pCVarShadows->GetIVal() != 0;
-        m_bCloudShadowsEnabled = pCVarShadowsClouds && pCVarShadowsClouds->GetIVal() != 0;
-
-#if defined(VOLUMETRIC_FOG_SHADOWS)
-        Vec3 volFogShadowEnable(0, 0, 0);
-        if (gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_VOLFOG_SHADOW_ENABLE, volFogShadowEnable);
-        }
-
-        m_bVolFogShadowsEnabled = m_bShadowsEnabled && CV_r_PostProcess != 0 && CV_r_FogShadows != 0 && volFogShadowEnable.x != 0;
-        m_bVolFogCloudShadowsEnabled = m_bVolFogShadowsEnabled && m_bCloudShadowsEnabled && m_cloudShadowTexId > 0 && volFogShadowEnable.y != 0;
-#endif
-
-        static ICVar* pCVarVolumetricFog = NULL;
-        if (!pCVarVolumetricFog)
-        {
-            pCVarVolumetricFog = iConsole->GetCVar("e_VolumetricFog");
-        }
-        bool bVolumetricFog = pCVarVolumetricFog && pCVarVolumetricFog->GetIVal();
-        CRenderer::CV_r_VolumetricFog = bVolumetricFog && GetVolumetricFog().IsEnableInFrame();
-    }
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-    if (m_bUpdateD3DDebug)
-    {
-        m_d3dDebug.Update(ESeverityCombination(CV_d3d11_debugMuteSeverity->GetIVal()), CV_d3d11_debugMuteMsgID->GetString(), CV_d3d11_debugBreakOnMsgID->GetString());
-        if (azstricmp(CV_d3d11_debugBreakOnMsgID->GetString(), "0") != 0 && CV_d3d11_debugBreakOnce)
-        {
-            CV_d3d11_debugBreakOnMsgID->Set("0");
-        }
-        else
-        {
-            m_bUpdateD3DDebug = false;
-        }
-    }
-#endif
-
-    {
-        if (CV_r_flush > 0 && CV_r_minimizeLatency == 0)
-        {
-            FlushHardware(false);
-        }
-    }
-
-    CResFile::Tick();
-    m_DevBufMan.Update(m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameUpdateID, false);
-
-    if (m_pPipelineProfiler)
-    {
-        m_pPipelineProfiler->BeginFrame();
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    // Build the matrices
-    //////////////////////////////////////////////////////////////////////
-
-    PROFILE_FRAME(Screen_Begin);
-    //PROFILE_LABEL_PUSH_SKIP_GPU("Frame");
-
-#ifndef CONSOLE_CONST_CVAR_MODE
-    ICVar* pCVDebugTexelDensity = gEnv->pConsole->GetCVar("e_texeldensity");
-    CV_e_DebugTexelDensity = pCVDebugTexelDensity ? pCVDebugTexelDensity->GetIVal() : 0;
-#endif
-
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_matView.SetIdentity();
-
-    CheckDeviceLost();
-
-    if (!m_bDeviceLost && (m_bIsWindowActive || m_bEditor))
-    {
-        SetGamma(CV_r_gamma + m_fDeltaGamma, CV_r_brightness, CV_r_contrast, false);
-    }
-
-
-    if (!m_bDeviceSupportsInstancing)
-    {
-        if IsCVarConstAccess(constexpr) (CV_r_geominstancing)
-        {
-            iLog->Log("Device doesn't support HW geometry instancing (or it's disabled)");
-            _SetVar("r_GeomInstancing", 0);
-        }
-    }
-
-    if (CV_r_usehwskinning != (int)m_bUseHWSkinning)
-    {
-        m_bUseHWSkinning = CV_r_usehwskinning != 0;
-        CRendElement* pRE = CRendElement::m_RootGlobal.m_NextGlobal;
-        for (pRE = CRendElement::m_RootGlobal.m_NextGlobal; pRE != &CRendElement::m_RootGlobal; pRE = pRE->m_NextGlobal)
-        {
-            CRendElementBase* pR = (CRendElementBase*)pRE;
-            if (pR->mfIsHWSkinned())
-            {
-                pR->mfReset();
-            }
-        }
-    }
-
-    const bool bUseGlobalMipBias = m_TemporalJitterMipBias != 0.0f;
-    if (CV_r_texminanisotropy != m_nCurMinAniso || CV_r_texmaxanisotropy != m_nCurMaxAniso || bUseGlobalMipBias != m_UseGlobalMipBias)
-    {
-        m_nCurMinAniso = CV_r_texminanisotropy;
-        m_nCurMaxAniso = CV_r_texmaxanisotropy;
-        m_UseGlobalMipBias = bUseGlobalMipBias;
-        for (uint32 i = 0; i < CShader::s_ShaderResources_known.Num(); i++)
-        {
-            CShaderResources* pSR = CShader::s_ShaderResources_known[i];
-            if (!pSR)
-            {
-                continue;
-            }
-            pSR->AdjustForSpec();
-        }
-
-        auto getAnisoFilter = [](int nLevel)
-            {
-                int8 nFilter =
-                    nLevel >= 16 ? FILTER_ANISO16X :
-                    (nLevel >=  8 ? FILTER_ANISO8X  :
-                     (nLevel >=  4 ? FILTER_ANISO4X  :
-                      (nLevel >=  2 ? FILTER_ANISO2X  :
-                       FILTER_TRILINEAR)));
-
-                return nFilter;
-            };
-
-        int8 nAniso = min(CRenderer::CV_r_texminanisotropy, CRenderer::CV_r_texmaxanisotropy); // for backwards compatibility. should really be CV_r_texmaxanisotropy
-        m_nMaterialAnisoHighSampler = CTexture::GetTexState(STexState(getAnisoFilter(nAniso), false));
-        m_nMaterialAnisoLowSampler  = CTexture::GetTexState(STexState(getAnisoFilter(CRenderer::CV_r_texminanisotropy), false));
-        m_nMaterialAnisoSamplerBorder = CTexture::GetTexState(STexState(getAnisoFilter(nAniso), TADDR_BORDER, TADDR_BORDER, TADDR_BORDER, 0x0));
-    }
-
-    m_drawNearFov = CV_r_drawnearfov;
-
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-    m_devInfo.ProcessSystemEventQueue();
-#endif
-
-    HandleDisplayPropertyChanges();
-
-    if (CV_r_wireframe != m_wireframe_mode)
-    {
-        //assert(CV_r_wireframe == R_WIREFRAME_MODE || CV_r_wireframe == R_SOLID_MODE);
-        FX_SetWireframeMode(CV_r_wireframe);
-    }
-
-#if !defined(_RELEASE)
-    m_RP.m_pRNDrawCallsInfoPerNode[m_RP.m_nProcessThreadID].swap(m_RP.m_pRNDrawCallsInfoPerNodePreviousFrame[m_RP.m_nProcessThreadID]);
-    m_RP.m_pRNDrawCallsInfoPerNode[m_RP.m_nProcessThreadID].clear();
-
-    m_RP.m_pRNDrawCallsInfoPerMesh[m_RP.m_nProcessThreadID].swap(m_RP.m_pRNDrawCallsInfoPerMeshPreviousFrame[m_RP.m_nProcessThreadID]);
-    m_RP.m_pRNDrawCallsInfoPerMesh[m_RP.m_nProcessThreadID].clear();
-#endif
-
-    //////////////////////////////////////////////////////////////////////
-    // Begin the scene
-    //////////////////////////////////////////////////////////////////////
-
-    SetMaterialColor(1, 1, 1, 1);
-
-    ChangeLog();
-
-    ResetToDefault();
-
-    if (!m_SceneRecurseCount)
-    {
-        m_SceneRecurseCount++;
-    }
-
-    if (CV_r_wireframe != 0 || !CV_r_usezpass)
-    {
-        EF_ClearTargetsLater(FRT_CLEAR);
-    }
-
-    m_nStencilMaskRef = 1;
-
-    if (SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID] == -1)
-    {
-        memset(&m_RP.m_PS[m_RP.m_nProcessThreadID], 0, sizeof(SPipeStat));
-        m_RP.m_RTStats.resize(0);
-        m_RP.m_Profile.Free();
-    }
-#if !defined(NULL_RENDERER)
-    m_OcclQueriesUsed = 0;
-#endif
-
-    {
-        static float fWaitForGPU;
-        float fSmooth = 5.0f;
-        fWaitForGPU = (m_fTimeWaitForGPU[m_RP.m_nFillThreadID] + fWaitForGPU * fSmooth) / (fSmooth + 1.0f);
-        if (fWaitForGPU >= 0.004f)
-        {
-            if (m_nGPULimited < 1000)
-            {
-                m_nGPULimited++;
-            }
-        }
-        else
-        {
-            m_nGPULimited = 0;
-        }
-
-        m_bUseGPUFriendlyBatching[m_RP.m_nProcessThreadID] = m_nGPULimited > 10; // On PC if we are GPU limited use z-pass distance sorting and disable instancing
-        if (CV_r_batchtype == 0)
-        {
-            m_bUseGPUFriendlyBatching[m_RP.m_nProcessThreadID] = false;
-        }
-        else
-        if (CV_r_batchtype == 1)
-        {
-            m_bUseGPUFriendlyBatching[m_RP.m_nProcessThreadID] = true;
-        }
-    }
-
-#if defined(SUPPORT_DEVICE_INFO)
-
-    if (m_bEditor)
-    {
-        const int width = GetWidth();
-        const int height = GetHeight();
-
-        if (m_DepthBufferOrigMSAA.nWidth < width || m_DepthBufferOrigMSAA.nHeight < height)
-        {
-            m_DepthBufferOrig.Release();
-            m_DepthBufferOrigMSAA.Release();
-            m_DepthBufferNative.Release();
-
-            GetS3DRend().ReleaseBuffers();
-
-            m_devInfo.SwapChainDesc().BufferDesc.Width = max(m_DepthBufferOrigMSAA.nWidth, width);
-            m_devInfo.SwapChainDesc().BufferDesc.Height = max(m_DepthBufferOrigMSAA.nHeight, height);
-            m_devInfo.ResizeDXGIBuffers();
-
-            OnD3D11PostCreateDevice(m_devInfo.Device());
-
-            ChangeViewport(0, 0, width, height, true);
-        }
-    }
-#endif
-
-#if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS
-    // Refraction Partial Resolves debug views
-    if (CRenderer::CV_r_RefractionPartialResolvesDebug == eRPR_DEBUG_VIEW_2D_AREA)
-    {
-        // Clear the screen for the partial resolve debug view 1
-        IRenderAuxGeom* pAuxRenderer = gEnv->pRenderer->GetIRenderAuxGeom();
-        if (pAuxRenderer)
-        {
-            SAuxGeomRenderFlags oldRenderFlags = pAuxRenderer->GetRenderFlags();
-
-            SAuxGeomRenderFlags newRenderFlags;
-            newRenderFlags.SetDepthTestFlag(e_DepthTestOff);
-            newRenderFlags.SetAlphaBlendMode(e_AlphaNone);
-            newRenderFlags.SetMode2D3DFlag(e_Mode2D);
-            pAuxRenderer->SetRenderFlags(newRenderFlags);
-
-            const bool bConsoleVisible = GetISystem()->GetIConsole()->GetStatus();
-            const float screenTop = (bConsoleVisible) ? 0.5f : 0.0f;
-
-            // Draw full screen black triangle
-            const uint vertexCount = 3;
-            Vec3 vert[vertexCount] = {
-                Vec3(0.0f, screenTop, 0.0f),
-                Vec3(0.0f, 2.0f, 0.0f),
-                Vec3(2.0f, screenTop, 0.0f)
-            };
-
-            pAuxRenderer->DrawTriangles(vert, vertexCount, Col_Black);
-            pAuxRenderer->SetRenderFlags(oldRenderFlags);
-        }
-    }
-#endif
-}
-
-bool CD3D9Renderer::CheckDeviceLost()
-{
-#if (defined(WIN32) || defined(WIN64))
-    if (m_pRT && CV_r_multithreaded == 1 && m_pRT->IsRenderThread())
-    {
-        return false;
-    }
-
-    // DX10/11 should still handle gamma changes on window focus loss
-    if (!m_bStartLevelLoading)
-    {
-        const bool bWindowActive = (GetForegroundWindow() == m_hWnd);
-
-        // Adjust gamma to match focused window
-        if (bWindowActive != m_bIsWindowActive)
-        {
-            if (bWindowActive)
-            {
-                SetGamma(CV_r_gamma + m_fDeltaGamma, CV_r_brightness, CV_r_contrast, true);
-            }
-            else
-            {
-                RestoreGamma();
-            }
-
-            m_bIsWindowActive = bWindowActive;
-        }
-    }
-#endif
-    return false;
-}
-
-void CD3D9Renderer::FlushHardware(bool bIssueBeforeSync)
-{
-    PROFILE_FRAME(FlushHardware);
-
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    int nFr = m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameUpdateID & (MAX_FRAME_QUERIES - 1);
-
-    HRESULT hr;
-    if (CV_r_flush)
-    {
-        if (m_pQuery[nFr])
-        {
-            if (bIssueBeforeSync)
-            {
-                GetDeviceContext().End(m_pQuery[nFr]);
-            }
-            BOOL bQuery = false;
-            CTimeValue Time = iTimer->GetAsyncTime();
-            bool bInfinite = false;
-            int nCounter = 0;
-
-            do
-            {
-                nCounter++;
-                // Check time-out once in 512 iterations
-                if (!(nCounter & 0x1ff))
-                {
-                    float fDif = iTimer->GetAsyncTime().GetDifferenceInSeconds(Time);
-                    if (fDif > 5.0f)
-                    {
-                        // 5 seconds in the loop
-                        bInfinite = true;
-                        break;
-                    }
-                }
-                hr = GetDeviceContext().GetData(m_pQuery[nFr], (void*)&bQuery, sizeof(BOOL), 0);
-            } while (hr == S_FALSE);
-
-            if (bInfinite)
-            {
-                iLog->Log("Error: Seems like infinite loop in GPU sync query");
-            }
-
-            m_fTimeWaitForGPU[m_RP.m_nProcessThreadID] += iTimer->GetAsyncTime().GetDifferenceInSeconds(Time);
-
-            if (!bIssueBeforeSync)
-            {
-                GetDeviceContext().End(m_pQuery[nFr]);
-            }
-        }
-    }
-}
-
-bool CD3D9Renderer::PrepFrameCapture(FrameBufferDescription& frameBufDesc, CTexture* pRenderTarget)
-{
-    assert(m_pBackBuffer);
-    assert(!IsEditorMode() || (m_CurrContext && m_CurrContext->m_pBackBuffer == m_pBackBuffer));
-
-    ID3D11Resource* pBackBufferRsrc(0);
-
-    if (!pRenderTarget)
-    {
-        m_pBackBuffer->GetResource(&pBackBufferRsrc);
-    }
-    else
-    {
-        D3DSurface* pSurface = pRenderTarget->GetSurface(0, 0);
-        assert(pSurface);
-        pSurface->GetResource(&pBackBufferRsrc);
-    }
-
-    frameBufDesc.pBackBufferTex = (ID3D11Texture2D*)pBackBufferRsrc;
-
-    if (!frameBufDesc.pBackBufferTex)
-    {
-        return false;
-    }
-        
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    //get size of image
-    frameBufDesc.pBackBufferTex->GetDesc(&frameBufDesc.backBufferDesc);
-    if (frameBufDesc.backBufferDesc.Format == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
-        || (m_CurrContext
-            && (m_CurrContext->m_fPixelScaleX > 1.0f
-                || m_CurrContext->m_fPixelScaleY > 1.0f)))
-    {
-        const int nResolvedWidth = aznumeric_cast<int>(aznumeric_cast<float>(m_width) / m_CurrContext->m_fPixelScaleX);
-        const int nResolvedHeight = aznumeric_cast<int>(aznumeric_cast<float>(m_height) / m_CurrContext->m_fPixelScaleY);
-        frameBufDesc.backBufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        frameBufDesc.backBufferDesc.Width = nResolvedWidth;
-        frameBufDesc.backBufferDesc.Height = nResolvedHeight;
-        CTexture* pTempCopyTex = CTexture::Create2DTexture("TempCopyTex", nResolvedWidth, nResolvedHeight, 1, FT_USAGE_RENDERTARGET, nullptr, eTF_Unknown, eTF_R8G8B8A8, false);
-        if (pTempCopyTex)
-        {
-            CTexture* pSrc = pRenderTarget;
-            RT_SetViewport(0, 0, nResolvedWidth, nResolvedHeight);
-            if (!pSrc)
-            {
-                PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexBackBuffer);
-                pSrc = CTexture::s_ptexBackBuffer;
-            }
-            assert(pSrc);
-            PostProcessUtils().StretchRect(pSrc, pTempCopyTex, false, false, false, false, SPostEffectsUtils::eDepthDownsample_None, false, nullptr);
-
-            frameBufDesc.pBackBufferTex->Release();
-            CDeviceTexture* pTempDeviceTex = pTempCopyTex->GetDevTexture();
-            frameBufDesc.pBackBufferTex = pTempDeviceTex->Get2DTexture();
-            // we're holding on to pTempCopyTex's d3dSurface. IncRef so releasing pTempCopyTex doesn't invalidate.
-            // pBackBufferTex will release in frameBufDesc destructor.
-            frameBufDesc.pBackBufferTex->AddRef();
-            pTempCopyTex->Release();
-        }
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // set up resources and textures for generating alpha channel from ZTarget texture, if needed
-    ID3D11RenderTargetView* rtv = CTexture::s_ptexZTarget->GetSurface(0, 0);
-    ID3D11Resource* zResource = nullptr;
-    rtv->GetResource(&zResource);
-    ID3D11Texture2D* zTargetTex = static_cast<ID3D11Texture2D*>(zResource);
-
-    D3D11_TEXTURE2D_DESC zDesc;
-    zTargetTex->GetDesc(&zDesc);
-
-    D3D11_TEXTURE2D_DESC tmpZdesc = zDesc;
-    tmpZdesc.Usage = D3D11_USAGE_STAGING;
-    tmpZdesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-    tmpZdesc.BindFlags = 0;
-
-
-    HRESULT hrZ = GetDevice().CreateTexture2D(&tmpZdesc, NULL, &frameBufDesc.tempZtex);
-    D3D11_MAPPED_SUBRESOURCE zMappedResource;
-
-    // default to includeAlpha 'on'
-    frameBufDesc.includeAlpha = frameBufDesc.tempZtex && tmpZdesc.Width == frameBufDesc.backBufferDesc.Width &&
-        tmpZdesc.Height == frameBufDesc.backBufferDesc.Height;
-
-    if (frameBufDesc.includeAlpha)
-    {
-        gcpRendD3D->GetDeviceContext().CopyResource(frameBufDesc.tempZtex, zTargetTex);
-        hrZ = gcpRendD3D->GetDeviceContext().Map(frameBufDesc.tempZtex, 0, D3D11_MAP_READ, 0, &zMappedResource);
-
-        frameBufDesc.depthData = reinterpret_cast<float*>(zMappedResource.pData);
-        if (!frameBufDesc.depthData)
-        {
-            SAFE_RELEASE(frameBufDesc.tempZtex);
-            frameBufDesc.includeAlpha = false;
-        }
-    }
-
-    SAFE_RELEASE(zResource);
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // set up resources and textures for backbuffer - uses passed in pointer
-    D3D11_TEXTURE2D_DESC tmpDesc = frameBufDesc.backBufferDesc;
-    tmpDesc.Usage = D3D11_USAGE_STAGING;
-    tmpDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-    tmpDesc.BindFlags = 0;
-
-    
-    HRESULT hr = GetDevice().CreateTexture2D(&tmpDesc, NULL, &frameBufDesc.pTmpTexture);
-    if (!frameBufDesc.pTmpTexture)
-    {
-        return false;
-    }
-
-    gcpRendD3D->GetDeviceContext().CopyResource(frameBufDesc.pTmpTexture, frameBufDesc.pBackBufferTex);
-
-    hr = gcpRendD3D->GetDeviceContext().Map(frameBufDesc.pTmpTexture, 0, D3D11_MAP_READ, 0, &frameBufDesc.resource);
-    
-    frameBufDesc.outputBytesPerPixel = frameBufDesc.includeAlpha ? 4 : 3;
-    frameBufDesc.texSize = frameBufDesc.backBufferDesc.Width * frameBufDesc.backBufferDesc.Height * frameBufDesc.outputBytesPerPixel;
-
-    
-    assert(frameBufDesc.pDest == nullptr);
-    frameBufDesc.pDest = new byte[frameBufDesc.texSize + sizeof(uint32)];  // Extra space required since we always copy 32 bits
-    assert(frameBufDesc.pDest);
-
-    return(SUCCEEDED(hr));
-}
-
-void CD3D9Renderer::FillFrameBuffer(FrameBufferDescription& frameBufDesc, bool redBlueSwap)
-{
-    // copy, flip red with blue if needed
-    byte* dst = frameBufDesc.pDest;
-    const byte* pSrc = reinterpret_cast<const byte*>(frameBufDesc.resource.pData);
-
-    for (int i = 0; i < frameBufDesc.backBufferDesc.Height; i++)
-    {
-        for (int j = 0; j < frameBufDesc.backBufferDesc.Width; j++)
-        {
-            *(uint32*)&dst[j * frameBufDesc.outputBytesPerPixel] = *(uint32*)&pSrc[j * frameBufDesc.inputBytesPerPixel];
-        }
-        if (redBlueSwap)
-        {
-            PREFAST_ASSUME(texsize == frameBufDesc.backBufferDesc.Width * 4);
-            for (int j = 0; j < frameBufDesc.backBufferDesc.Width; j++)
-            {
-                Exchange(dst[j * frameBufDesc.outputBytesPerPixel + 0], dst[j * frameBufDesc.outputBytesPerPixel + 2]);
-            }
-        }
-        pSrc += frameBufDesc.resource.RowPitch;
-        dst += frameBufDesc.backBufferDesc.Width * frameBufDesc.outputBytesPerPixel;
-    }
-
-    // re-loop over the image to process Alpha, if needed
-    if (frameBufDesc.includeAlpha)
-    {
-        dst = frameBufDesc.pDest;
-        const int numPx = frameBufDesc.backBufferDesc.Height * frameBufDesc.backBufferDesc.Width;
-
-        const int alphaIDX = 3;
-        const byte alphaOn = 255;
-        const byte alphaOff = 0;
-
-        for (int px = 0; px < numPx; px++)
-        {
-            // depthData is normalized - set alpha to 0 where depthData is 1.0f, 255 otherwise
-            dst[px *  frameBufDesc.outputBytesPerPixel + alphaIDX] = (AZ::IsClose(frameBufDesc.depthData[px], 1.0f, FLT_EPSILON) ? alphaOff : alphaOn);
-        }
-    }
-}
-
-
-
-bool CD3D9Renderer::CaptureFrameBufferToFile(const char* pFilePath, CTexture* pRenderTarget)
-{
-    //file prep
-    assert(pFilePath);
-    if (!pFilePath)
-    {
-        return false;
-    }
-
-    enum EFileFormat
-    {
-        EFF_FILE_TGA, EFF_FILE_JPG, EFF_FILE_TIF
-    };
-    struct SCaptureFormatInfo
-    {
-        const char* pExt;
-        EFileFormat fmt;
-    };
-    const SCaptureFormatInfo captureFormats[] =
-    {
-        {"tga", EFF_FILE_TGA}, {"jpg", EFF_FILE_JPG}, {"tif", EFF_FILE_TIF}
-    };
-
-    const char* pReqFileFormatExt(fpGetExtension(pFilePath));
-
-    // resolve file format from file path
-    int fmtIdx(-1);
-    if (pReqFileFormatExt)
-    {
-        ++pReqFileFormatExt; // skip '.'
-        for (int i(0); i < sizeof(captureFormats) / sizeof(captureFormats[0]); ++i)
-        {
-            PREFAST_SUPPRESS_WARNING(6387)
-            if (!azstricmp(pReqFileFormatExt, captureFormats[i].pExt))
-            {
-                fmtIdx = i;
-                break;
-            }
-        }
-    }
-
-    if (fmtIdx < 0)
-    {
-        if (iLog)
-        {
-            iLog->Log("Warning: Captured frame cannot be saved as \"%s\" format is not supported!\n", pReqFileFormatExt);
-        }
-        return false;
-    }
-
-    if (pRenderTarget && pRenderTarget->GetDstFormat() != eTF_R8G8B8A8)
-    {
-        if (iLog)
-        {
-            iLog->Log("Warning: Captured RenderTarget has unsupported format.\n");
-        }
-        return false;
-    }
-
-    //prep frame Buffer
-    FrameBufferDescription frameBufDesc;
-    bool framePrepSuccessful = PrepFrameCapture(frameBufDesc, pRenderTarget);
-    bool writeToDiskSuccessful = false;
-
-    if (!framePrepSuccessful)
-    {
-        return writeToDiskSuccessful;
-    }
-
-    //console code
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_8
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    bool formatBGRA = false;
-#endif
-
-    bool needRBSwap = captureFormats[fmtIdx].fmt == EFF_FILE_TGA ? !formatBGRA : formatBGRA;
-
-    //copy the frame buffer
-    FillFrameBuffer(frameBufDesc, needRBSwap);
-
-
-    //file capture
-    if (captureFormats[fmtIdx].fmt == EFF_FILE_TGA)
-    {
-        writeToDiskSuccessful = ::WriteTGA(frameBufDesc.pDest, frameBufDesc.backBufferDesc.Width, frameBufDesc.backBufferDesc.Height, pFilePath, 8 * frameBufDesc.outputBytesPerPixel, 8 * frameBufDesc.outputBytesPerPixel);
-    }
-    else if (captureFormats[fmtIdx].fmt == EFF_FILE_JPG)
-    {
-        writeToDiskSuccessful = ::WriteJPG(frameBufDesc.pDest, frameBufDesc.backBufferDesc.Width, frameBufDesc.backBufferDesc.Height, pFilePath, 8 * frameBufDesc.outputBytesPerPixel, 90);
-    }
-    else
-    {
-        //If saving as tiff use our built in tiff saver.
-        CRY_ASSERT_MESSAGE(captureFormats[fmtIdx].fmt == EFF_FILE_TIF, ("Error - unknown image extension"));
-        writeToDiskSuccessful = InternalSaveToTIFF(frameBufDesc.pBackBufferTex, pFilePath);
-    }
-
-    return writeToDiskSuccessful;
-}
-
-bool CD3D9Renderer::InternalSaveToTIFF(ID3D11Texture2D* backBuffer, const char* filePath)
-{
-    bool result = false;
-    //Have to copy from GPU to staging texture first.
-    const int nResolvedWidth = aznumeric_cast<int>(aznumeric_cast<float>(m_width) / m_CurrContext->m_fPixelScaleX);
-    const int nResolvedHeight = aznumeric_cast<int>(aznumeric_cast<float>(m_height) / m_CurrContext->m_fPixelScaleY);
-    D3D11_TEXTURE2D_DESC bbDesc;
-    backBuffer->GetDesc(&bbDesc);
-    bbDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-    bbDesc.Width = nResolvedWidth;
-    bbDesc.Height = nResolvedHeight;
-    bbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-    bbDesc.Usage = D3D11_USAGE_STAGING;
-    bbDesc.BindFlags = 0;
-
-    ID3D11Texture2D* pTempCopyTex = nullptr;
-    if (SUCCEEDED(GetDevice().CreateTexture2D(&bbDesc, 0, &pTempCopyTex)))
-    {
-        D3D11_BOX srcRegion;
-        srcRegion.left = 0;
-        srcRegion.right = nResolvedWidth;
-        srcRegion.top = 0;
-        srcRegion.bottom = nResolvedHeight;
-        srcRegion.front = 0;
-        srcRegion.back = 1;
-
-        GetDeviceContext().CopySubresourceRegion(pTempCopyTex, 0, 0, 0, 0, backBuffer, 0, &srcRegion);
-        backBuffer->Release();
-        backBuffer = pTempCopyTex;
-        {
-            D3D11_MAPPED_SUBRESOURCE mapped;
-            auto hr = GetDeviceContext().Map(backBuffer, 0, D3D11_MAP_READ, 0, &mapped);
-            if (SUCCEEDED(hr))
-            {
-                auto releaseTexture = std17::scope_guard([&]() { GetDeviceContext().Unmap(backBuffer, 0); });
-
-                std::vector<unsigned char> data;
-                data.resize(nResolvedWidth * nResolvedHeight * 3);
-                //strip alpha and padding, tiff util is rgb only currently. and we don't need alpha anyway.
-                for (int y = 0; y < nResolvedHeight; ++y)
-                {
-                    auto srcrow = &((unsigned char*)mapped.pData)[y * mapped.RowPitch];
-                    auto dstrow = &data[y * nResolvedWidth * 3];
-                    for (int x = 0; x < nResolvedWidth; ++x)
-                    {
-                        dstrow[3 * x] = srcrow[4 * x];
-                        dstrow[3 * x + 1] = srcrow[4 * x + 1];
-                        dstrow[3 * x + 2] = srcrow[4 * x + 2];
-                    }
-                }
-                auto shot = gEnv->pSystem->GetImageHandler()->CreateImage(std::move(data), nResolvedWidth, nResolvedHeight);
-                if (shot)
-                {
-                    result = gEnv->pSystem->GetImageHandler()->SaveImage(shot.get(), filePath);
-                }
-            }
-        }
-    }
-
-    SAFE_RELEASE(pTempCopyTex);
-
-    return result;
-}
-
-#define DEPTH_BUFFER_SCALE 1024.0f
-
-void CD3D9Renderer::CacheCaptureCVars()
-{
-    // cache console vars
-    if (!CV_capture_frames || !CV_capture_folder || !CV_capture_frame_once ||
-        !CV_capture_file_name || !CV_capture_file_prefix || !CV_capture_buffer)
-    {
-        ISystem* pSystem(GetISystem());
-        if (!pSystem)
-        {
-            return;
-        }
-
-        IConsole* pConsole(gEnv->pConsole);
-        if (!pConsole)
-        {
-            return;
-        }
-
-        CV_capture_frames = !CV_capture_frames ? pConsole->GetCVar("capture_frames") : CV_capture_frames;
-        CV_capture_folder = !CV_capture_folder ? pConsole->GetCVar("capture_folder") : CV_capture_folder;
-        CV_capture_frame_once = !CV_capture_frame_once ? pConsole->GetCVar("capture_frame_once") : CV_capture_frame_once;
-        CV_capture_file_name = !CV_capture_file_name ? pConsole->GetCVar("capture_file_name") : CV_capture_file_name;
-        CV_capture_file_prefix = !CV_capture_file_prefix ? pConsole->GetCVar("capture_file_prefix") : CV_capture_file_prefix;
-        CV_capture_buffer = !CV_capture_buffer ? pConsole->GetCVar("capture_buffer") : CV_capture_buffer;
-    }
-}
-
-void CD3D9Renderer::CaptureFrameBuffer()
-{
-    CDebugAllowFileAccess ignoreInvalidFileAccess;
-
-    CacheCaptureCVars();
-    if (!CV_capture_frames || !CV_capture_folder || !CV_capture_frame_once ||
-        !CV_capture_file_name || !CV_capture_file_prefix || !CV_capture_buffer)
-    {
-        return;
-    }
-
-    int frameNum(CV_capture_frames->GetIVal());
-    if (frameNum > 0)
-    {
-        char path[AZ::IO::IArchive::MaxPath];
-        path[0] = '\0';
-
-        const char* capture_file_name = CV_capture_file_name->GetString();
-        if (capture_file_name && capture_file_name[0])
-        {
-            gEnv->pCryPak->AdjustFileName(capture_file_name, path, AZ_ARRAY_SIZE(path), AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FLAGS_FOR_WRITING);
-        }
-
-        if (path[0] == '\0')
-        {
-            gEnv->pCryPak->AdjustFileName(CV_capture_folder->GetString(), path, AZ_ARRAY_SIZE(path), AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FLAGS_FOR_WRITING);
-            gEnv->pCryPak->MakeDir(path);
-
-            char prefix[64] = "Frame";
-            const char* capture_file_prefix = CV_capture_file_prefix->GetString();
-            if (capture_file_prefix != 0 && capture_file_prefix[0])
-            {
-                cry_strcpy(prefix, capture_file_prefix);
-            }
-
-            size_t pathLen = strlen(path);
-            snprintf(&path[pathLen], sizeof(path) - 1 - pathLen, "\\%s%06d.%s", prefix, frameNum - 1, "jpg");
-        }
-
-        if (CV_capture_frame_once->GetIVal())
-        {
-            CV_capture_frames->Set(0);
-            CV_capture_frame_once->Set(0);
-        }
-        else
-        {
-            CV_capture_frames->Set(frameNum + 1);
-        }
-
-        if (!CaptureFrameBufferToFile(path))
-        {
-            if (iLog)
-            {
-                iLog->Log("Warning: Frame capture failed!\n");
-            }
-            CV_capture_frames->Set(0); // disable capturing
-        }
-    }
-}
-
-void CD3D9Renderer::ResolveSupersampledBackbuffer()
-{
-    if (IsEditorMode() && CV_r_Supersampling <= 1 )
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("RESOLVE_SUPERSAMPLED");
-
-    SD3DPostEffectsUtils::EFilterType eFilter = SD3DPostEffectsUtils::FilterType_Box;
-    if (CV_r_SupersamplingFilter == 1)
-    {
-        eFilter = SD3DPostEffectsUtils::FilterType_Tent;
-    }
-    else if (CV_r_SupersamplingFilter == 2)
-    {
-        eFilter = SD3DPostEffectsUtils::FilterType_Gauss;
-    }
-    else if (CV_r_SupersamplingFilter == 3)
-    {
-        eFilter = SD3DPostEffectsUtils::FilterType_Lanczos;
-    }
-
-    if (IsEditorMode())
-    {
-        const int nResolvedWidth = aznumeric_cast<int>(aznumeric_cast<float>(m_width) / m_CurrContext->m_fPixelScaleX);
-        const int nResolvedHeight = aznumeric_cast<int>(aznumeric_cast<float>(m_height) / m_CurrContext->m_fPixelScaleY);
-        RT_SetViewport(0, 0, m_width, m_height);
-        PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexBackBuffer);
-        PostProcessUtils().Downsample(CTexture::s_ptexBackBuffer, NULL,
-            m_width, m_height,
-            nResolvedWidth, nResolvedHeight,
-            eFilter, false);
-    }
-    else
-    {
-        PostProcessUtils().Downsample(CTexture::s_ptexSceneSpecular, NULL,
-            m_width, m_height,
-            m_backbufferWidth, m_backbufferHeight,
-            eFilter, false);
-    }
-}
-
-void CD3D9Renderer::ScaleBackbufferToViewport()
-{
-    // fPixelScale comes from OS screen scale as well as super sampling, so check both are active before scaling backbuffer
-    if ( CV_r_Supersampling > 1 && (m_CurrContext->m_fPixelScaleX > 1.0f || m_CurrContext->m_fPixelScaleY > 1.0f))
-    {
-        PROFILE_LABEL_SCOPE("STRETCH_TO_VIEWPORT");
-
-        const int nResolvedWidth = aznumeric_cast<int>(aznumeric_cast<float>(m_width) / m_CurrContext->m_fPixelScaleX);
-        const int nResolvedHeight = aznumeric_cast<int>(aznumeric_cast<float>(m_height) / m_CurrContext->m_fPixelScaleY);
-
-        RECT srcRegion;
-        srcRegion.left = 0;
-        srcRegion.right = nResolvedWidth;
-        srcRegion.top = 0;
-        srcRegion.bottom = nResolvedHeight;
-        // copy resolved part of backbuffer to temporary target
-        PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexBackBufferScaled[0], &srcRegion);
-        // stretch back to backbuffer
-        PostProcessUtils().CopyTextureToScreen(CTexture::s_ptexBackBufferScaled[0], &srcRegion);
-    }
-}
-
-void CD3D9Renderer::DebugDrawRect([[maybe_unused]] float x1, [[maybe_unused]] float y1, [[maybe_unused]] float x2, [[maybe_unused]] float y2, [[maybe_unused]] float* fColor)
-{
-#ifndef _RELEASE
-    SetMaterialColor(fColor[0], fColor[1], fColor[2], fColor[3]);
-    int w = GetWidth();
-    int h = GetHeight();
-    float dx = 1.0f / w;
-    float dy = 1.0f / h;
-    x1 *= dx;
-    x2 *= dx;
-    y1 *= dy;
-    y2 *= dy;
-
-    ColorB col((uint8)(fColor[0] * 255.0f), (uint8)(fColor[1] * 255.0f), (uint8)(fColor[2] * 255.0f), (uint8)(fColor[3] * 255.0f));
-
-    IRenderAuxGeom* pAux = GetIRenderAuxGeom();
-    SAuxGeomRenderFlags flags = pAux->GetRenderFlags();
-    flags.SetMode2D3DFlag(e_Mode2D);
-    pAux->SetRenderFlags(flags);
-    pAux->DrawLine(Vec3(x1, y1, 0), col, Vec3(x2, y1, 0), col);
-    pAux->DrawLine(Vec3(x1, y2, 0), col, Vec3(x2, y2, 0), col);
-    pAux->DrawLine(Vec3(x1, y1, 0), col, Vec3(x1, y2, 0), col);
-    pAux->DrawLine(Vec3(x2, y1, 0), col, Vec3(x2, y2, 0), col);
-#endif
-}
-
-void CD3D9Renderer::PrintResourcesLeaks()
-{
-#ifndef _RELEASE
-    iLog->Log("\n \n");
-
-    AUTO_LOCK(CBaseResource::s_cResLock);
-
-    CCryNameTSCRC Name;
-    SResourceContainer* pRL;
-    uint32 n = 0;
-    uint32 i;
-    Name = CShader::mfGetClassName();
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CShader* sh = (CShader*)itor->second;
-            if (!sh)
-            {
-                continue;
-            }
-            Warning("--- CShader '%s' leak after level unload", sh->GetName());
-            n++;
-        }
-    }
-    iLog->Log("\n \n");
-
-    n = 0;
-    for (i = 0; i < CShader::s_ShaderResources_known.Num(); i++)
-    {
-        CShaderResources* pSR = CShader::s_ShaderResources_known[i];
-        if (!pSR)
-        {
-            continue;
-        }
-        n++;
-        if (pSR->m_szMaterialName)
-        {
-            Warning("--- Shader Resource '%s' leak after level unload", pSR->m_szMaterialName);
-        }
-    }
-    if (!n)
-    {
-        CShader::s_ShaderResources_known.Free();
-    }
-    iLog->Log("\n \n");
-
-    int nVS = 0;
-    Name = CHWShader::mfGetClassName(eHWSC_Vertex);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* vsh = (CHWShader*)itor->second;
-            if (!vsh)
-            {
-                continue;
-            }
-            nVS++;
-            Warning("--- Vertex Shader '%s' leak after level unload", vsh->GetName());
-        }
-    }
-    iLog->Log("\n \n");
-
-    int nPS = 0;
-    Name = CHWShader::mfGetClassName(eHWSC_Pixel);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* psh = (CHWShader*)itor->second;
-            if (!psh)
-            {
-                continue;
-            }
-            nPS++;
-            Warning("--- Pixel Shader '%s' leak after level unload", psh->GetName());
-        }
-    }
-    iLog->Log("\n \n");
-
-    n = 0;
-    Name = CTexture::mfGetClassName();
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CTexture* pTX = (CTexture*)itor->second;
-            if (!pTX)
-            {
-                continue;
-            }
-            if (!pTX->m_bCreatedInLevel)
-            {
-                continue;
-            }
-            Warning("--- CTexture '%s' leak after level unload", pTX->GetName());
-            n++;
-        }
-    }
-    iLog->Log("\n \n");
-
-    CRendElement* pRE;
-    for (pRE = CRendElement::m_RootGlobal.m_NextGlobal; pRE != &CRendElement::m_RootGlobal; pRE = pRE->m_NextGlobal)
-    {
-        Warning("--- CRenderElement %s leak after level unload", pRE->mfTypeString());
-    }
-    iLog->Log("\n \n");
-
-    CRenderMesh::PrintMeshLeaks();
-#endif
-}
-
-#define BYTES_TO_KB(bytes) ((bytes) / 1024.0)
-#define BYTES_TO_MB(bytes) ((bytes) / 1024.0 / 1024.0)
-
-void CD3D9Renderer::DebugDrawStats1()
-{
-#if !defined(EXCLUDE_RARELY_USED_R_STATS) && defined(ENABLE_PROFILING_CODE)
-    const int nYstep = 10;
-    uint32 i;
-    int nY = 30; // initial Y pos
-    int nX = 50; // initial X pos
-
-    ColorF col = Col_Yellow;
-    Draw2dLabel(nX, nY, 2.0f, &col.r, false, "Per-frame stats:");
-
-    col = Col_White;
-    nX += 10;
-    nY += 25;
-    //DebugDrawRect(nX-2, nY, nX+180, nY+150, &col.r);
-    Draw2dLabel(nX, nY, 1.4f, &col.r, false, "Draw-calls:");
-
-    float fFSize = 1.2f;
-
-    nX += 5;
-    nY += 10;
-    int nXBars = nX;
-
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "General: %d (%d polys, %.3fms)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[EFSLIST_GENERAL], m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[EFSLIST_GENERAL], (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_GENERAL] + m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPsZ) * 1000.0f);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Decals: %d (%d polys, %.3fms)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[EFSLIST_DECAL], m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[EFSLIST_DECAL], m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_DECAL] * 1000.0f);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Transparent: %d (%d polys, %.3fms)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[EFSLIST_TRANSP], m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[EFSLIST_TRANSP], m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_TRANSP] * 1000.0f);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Shadow-gen: %d (%d polys, %.3fms)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[EFSLIST_SHADOW_GEN], m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[EFSLIST_SHADOW_GEN], m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_SHADOW_GEN] * 1000.0f);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Shadow-pass: %d (%d polys)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[EFSLIST_SHADOW_PASS], m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[EFSLIST_SHADOW_PASS]);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Water: %d (%d polys, %.3fms)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[EFSLIST_WATER], m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[EFSLIST_WATER], m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_WATER_VOLUMES] * 1000.0f);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Refractive Surface: %d (%d polys, %.3fms)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[EFSLIST_REFRACTIVE_SURFACE], m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[EFSLIST_REFRACTIVE_SURFACE], m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_REFRACTIVE_SURFACE] * 1000.0f);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Imposters: %d (Updates: %d)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumCloudImpostersDraw, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumCloudImpostersUpdates);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Sprites: %d (%d dips, %d updates, %d altases, %d cells, %d polys)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumSprites, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumSpriteDIPS, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumSpriteUpdates, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumSpriteAltasesUsed, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumSpriteCellsUsed, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumSpritePolys /*, m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPsSprites*1000.0f*/);
-
-    Draw2dLabel(nX - 5, nY + 20, 1.4f, &col.r, false, "Total: %d (%d polys)", GetCurrentNumberOfDrawCalls(), GetPolyCount());
-
-    col = Col_Yellow;
-    nX -= 5;
-    nY += 45;
-    //DebugDrawRect(nX-2, nY, nX+180, nY+160, &col.r);
-    Draw2dLabel(nX, nY, 1.4f, &col.r, false, "Occlusions: Issued: %d, Occluded: %d, NotReady: %d", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumQIssued, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumQOccluded, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumQNotReady);
-
-    col = Col_Cyan;
-    nX -= 5;
-    nY += 45;
-    //DebugDrawRect(nX-2, nY, nX+180, nY+160, &col.r);
-    Draw2dLabel(nX, nY, 1.4f, &col.r, false, "Device resource switches:");
-
-    nX += 5;
-    nY += 10;
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "VShaders: %d (%d unique)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumVShadChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumVShaders);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "PShaders: %d (%d unique)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumPShadChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumPShaders);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Textures: %d (%d unique)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumTextChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumTextures);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "RT's: %d (%d unique), cleared: %d times, copied: %d times", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRTChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRTs, m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTCleared, m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTCopied);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "States: %d", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumStateChanges);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "MatBatches: %d, GeomBatches: %d, Instances: %d", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendMaterialBatches, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendGeomBatches, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendInstances);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "HW Instances: DIP's: %d, Instances: %d (polys: %d/%d)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_RendHWInstancesDIPs, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendHWInstances, m_RP.m_PS[m_RP.m_nProcessThreadID].m_RendHWInstancesPolysOne, m_RP.m_PS[m_RP.m_nProcessThreadID].m_RendHWInstancesPolysAll);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Skinned instances: %d", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendSkinnedObjects);
-
-    CHWShader_D3D* ps = (CHWShader_D3D*)m_RP.m_PS[m_RP.m_nProcessThreadID].m_pMaxPShader;
-    CHWShader_D3D::SHWSInstance* pInst = (CHWShader_D3D::SHWSInstance*)m_RP.m_PS[m_RP.m_nProcessThreadID].m_pMaxPSInstance;
-    if (ps)
-    {
-        Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "MAX PShader: %s (instructions: %d, lights: %d)", ps->GetName(), pInst->m_nInstructions, pInst->m_Ident.m_LightMask & 0xf);
-    }
-    CHWShader_D3D* vs = (CHWShader_D3D*)m_RP.m_PS[m_RP.m_nProcessThreadID].m_pMaxVShader;
-    pInst = (CHWShader_D3D::SHWSInstance*)m_RP.m_PS[m_RP.m_nProcessThreadID].m_pMaxVSInstance;
-    if (vs)
-    {
-        Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "MAX VShader: %s (instructions: %d, lights: %d)", vs->GetName(), pInst->m_nInstructions, pInst->m_Ident.m_LightMask & 0xf);
-    }
-
-    col = Col_Green;
-    nX -= 5;
-    nY += 35;
-    //DebugDrawRect(nX-2, nY, nX+180, nY+160, &col.r);
-    Draw2dLabel(nX, nY, 1.4f, &col.r, false, "Device resource sizes:");
-
-    nX += 5;
-    nY += 10;
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Managed non-streamed textures: Sys=%.3f Mb, Vid:=%.3f", BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesSysMemSize), BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesVidMemSize));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Managed streamed textures: Sys=%.3f Mb, Vid:=%.3f", BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesStreamSysSize), BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesStreamVidSize));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "RT textures: Used: %.3f Mb, Updated: %.3f Mb, Cleared: %.3f Mb, Copied: %.3f Mb", BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_DynTexturesSize), BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTSize), BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTClearedSize), BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_RTCopiedSize));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Meshes updated: Static: %.3f Mb, Dynamic: %.3f Mb", BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_MeshUpdateBytes), BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_DynMeshUpdateBytes));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Cloud textures updated: %.3f Mb", BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_CloudImpostersSizeUpdate));
-
-    int nYBars = nY;
-
-    nY = 30; // initial Y pos
-    nX = 430; // initial X pos
-    col = Col_Yellow;
-    Draw2dLabel(nX, nY, 2.0f, &col.r, false, "Global stats:");
-
-    col = Col_YellowGreen;
-    nX += 10;
-    nY += 55;
-    Draw2dLabel(nX, nY, 1.4f, &col.r, false, "Mesh size:");
-
-    size_t nMemApp = 0;
-    size_t nMemDevVB = 0;
-    size_t nMemDevIB = 0;
-    {
-        AUTO_LOCK(CRenderMesh::m_sLinkLock);
-        for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.prev; iter != &CRenderMesh::m_MeshList; iter = iter->prev)
-        {
-            CRenderMesh* pRM = iter->item<&CRenderMesh::m_Chain>();
-            nMemApp += pRM->Size(CRenderMesh::SIZE_ONLY_SYSTEM);
-            nMemDevVB += pRM->Size(CRenderMesh::SIZE_VB);
-            nMemDevIB += pRM->Size(CRenderMesh::SIZE_IB);
-        }
-    }
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Static: (app: %.3f Mb, dev VB: %.3f Mb, dev IB: %.3f Mb)",
-        nMemApp / 1024.0f / 1024.0f, nMemDevVB / 1024.0f / 1024.0f, nMemDevIB / 1024.0f / 1024.0f);
-
-    for (i = 0; i < BBT_MAX; i++)
-    {
-        for (int j = 0; j < BU_MAX; j++)
-        {
-            SDeviceBufferPoolStats stats;
-            if (m_DevBufMan.GetStats((BUFFER_BIND_TYPE)i, (BUFFER_USAGE)j, stats) == false)
-            {
-                continue;
-            }
-            Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Pool '%10s': size %5.3f banks %4" PRISIZE_T " allocs %6d frag %3.3f pinned %4d moving %4d",
-                stats.buffer_descr.c_str()
-                , (stats.num_banks * stats.bank_size) / (1024.f * 1024.f)
-                , stats.num_banks
-                , stats.allocator_stats.nInUseBlocks
-                , (stats.allocator_stats.nCapacity - stats.allocator_stats.nInUseSize - stats.allocator_stats.nLargestFreeBlockSize) / (float)max(stats.allocator_stats.nCapacity, (size_t)1)
-                , stats.allocator_stats.nPinnedBlocks
-                , stats.allocator_stats.nMovingBlocks);
-        }
-    }
-
-    nMemDevVB = 0;
-    nMemDevIB = 0;
-    nMemApp = m_RP.m_SizeSysArray;
-
-    uint32 j;
-    for (i = 0; i < SHAPE_MAX; i++)
-    {
-        nMemDevVB += _VertBufferSize(m_pUnitFrustumVB[i]);
-        nMemDevIB += _IndexBufferSize(m_pUnitFrustumIB[i]);
-    }
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (m_pRenderAuxGeomD3D)
-    {
-        nMemDevVB += m_pRenderAuxGeomD3D->GetDeviceDataSize();
-    }
-#endif
-
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Dynamic: %.3f (app: %.3f Mb, dev VB: %.3f Mb, dev IB: %.3f Mb)", BYTES_TO_MB(nMemDevVB + nMemDevIB), BYTES_TO_MB(nMemApp), BYTES_TO_MB(nMemDevVB), BYTES_TO_MB(nMemDevIB) /*, BYTES_TO_MB(nMemDevVBPool)*/);
-
-    CCryNameTSCRC Name;
-    SResourceContainer* pRL;
-    uint32 n = 0;
-    size_t nSize = 0;
-    Name = CShader::mfGetClassName();
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CShader* sh = (CShader*)itor->second;
-            if (!sh)
-            {
-                continue;
-            }
-            nSize += sh->Size(0);
-            n++;
-        }
-    }
-    nY += nYstep;
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "FX Shaders: %d (size: %.3f Mb)", n, BYTES_TO_MB(nSize));
-
-    n = 0;
-    nSize = m_cEF.m_Bin.mfSizeFXParams(n);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "FX Shader parameters for %d shaders (size: %.3f Mb)", n, BYTES_TO_MB(nSize));
-
-    nSize = 0;
-    n = 0;
-    for (i = 0; i < (int)CShader::s_ShaderResources_known.Num(); i++)
-    {
-        CShaderResources* pSR = CShader::s_ShaderResources_known[i];
-        if (!pSR)
-        {
-            continue;
-        }
-        nSize += pSR->Size();
-        n++;
-    }
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Shader resources: %d (size: %.3f Mb)", n, BYTES_TO_MB(nSize));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Shader manager (size: %.3f Mb)", BYTES_TO_MB(m_cEF.Size()));
-
-    n = 0;
-    for (i = 0; i < CGParamManager::s_Groups.size(); i++)
-    {
-        n += CGParamManager::s_Groups[i].nParams;
-    }
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Groups: %d, Shader parameters: %d (size: %.3f Mb), in pool: %d (size: %.3f Mb)", i, n, BYTES_TO_MB(n * sizeof(SCGParam)), CGParamManager::s_Pools.size(), BYTES_TO_MB(CGParamManager::s_Pools.size() * PARAMS_POOL_SIZE * sizeof(SCGParam)));
-
-    nY += nYstep;
-    nY += nYstep;
-    TArray<void*> ShadersVS;
-    TArray<void*> ShadersPS;
-
-    nSize = 0;
-    n = 0;
-    int nInsts = 0;
-    Name = CHWShader::mfGetClassName(eHWSC_Vertex);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* vsh = (CHWShader*)itor->second;
-            if (!vsh)
-            {
-                continue;
-            }
-            nSize += vsh->Size();
-            n++;
-
-            CHWShader_D3D* pD3D = (CHWShader_D3D*)vsh;
-            for (i = 0; i < pD3D->m_Insts.size(); i++)
-            {
-                CHWShader_D3D::SHWSInstance* pShInst = pD3D->m_Insts[i];
-                if (pShInst->m_bDeleted)
-                {
-                    continue;
-                }
-                nInsts++;
-                if (pShInst->m_Handle.m_pShader)
-                {
-                    for (j = 0; j < (int)ShadersVS.Num(); j++)
-                    {
-                        if (ShadersVS[j] == pShInst->m_Handle.m_pShader->m_pHandle)
-                        {
-                            break;
-                        }
-                    }
-                    if (j == ShadersVS.Num())
-                    {
-                        ShadersVS.AddElem(pShInst->m_Handle.m_pShader->m_pHandle);
-                    }
-                }
-            }
-        }
-    }
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "VShaders: %d (size: %.3f Mb), Instances: %d, Device VShaders: %d (Size: %.3f Mb)", n, BYTES_TO_MB(nSize), nInsts, ShadersVS.Num(), BYTES_TO_MB(CHWShader_D3D::s_nDeviceVSDataSize));
-
-    nInsts = 0;
-    Name = CHWShader::mfGetClassName(eHWSC_Pixel);
-    pRL = CBaseResource::GetResourcesForClass(Name);
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CHWShader* psh = (CHWShader*)itor->second;
-            if (!psh)
-            {
-                continue;
-            }
-            nSize += psh->Size();
-            n++;
-
-            CHWShader_D3D* pD3D = (CHWShader_D3D*)psh;
-            for (i = 0; i < pD3D->m_Insts.size(); i++)
-            {
-                CHWShader_D3D::SHWSInstance* pShInst = pD3D->m_Insts[i];
-                if (pShInst->m_bDeleted)
-                {
-                    continue;
-                }
-                nInsts++;
-                if (pShInst->m_Handle.m_pShader)
-                {
-                    for (j = 0; j < (int)ShadersPS.Num(); j++)
-                    {
-                        if (ShadersPS[j] == pShInst->m_Handle.m_pShader->m_pHandle)
-                        {
-                            break;
-                        }
-                    }
-                    if (j == ShadersPS.Num())
-                    {
-                        ShadersPS.AddElem(pShInst->m_Handle.m_pShader->m_pHandle);
-                    }
-                }
-            }
-        }
-    }
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "PShaders: %d (size: %.3f Mb), Instances: %d, Device PShaders: %d (Size: %.3f Mb)", n, BYTES_TO_MB(nSize), nInsts, ShadersPS.Num(), BYTES_TO_MB(CHWShader_D3D::s_nDevicePSDataSize));
-
-    n = 0;
-    nSize = 0;
-    size_t nSizeD = 0;
-    size_t nSizeAll = 0;
-    for (FXCompressedShadersItor it = CHWShader::m_CompressedShaders.begin(); it != CHWShader::m_CompressedShaders.end(); ++it)
-    {
-        SHWActivatedShader* pAS = it->second;
-        for (FXCompressedShaderItor itor = pAS->m_CompressedShaders.begin(); itor != pAS->m_CompressedShaders.end(); ++itor)
-        {
-            n++;
-            SCompressedData& Data = itor->second;
-            nSize += Data.m_nSizeCompressedShader;
-            nSizeD += Data.m_nSizeDecompressedShader;
-        }
-    }
-    nSizeAll = sizeOfMapP(CHWShader::m_CompressedShaders);
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Compressed Shaders in memory: %d (size: %.3f Mb), Decompressed size: %.3f Mb, Overall: %.3f", n, BYTES_TO_MB(nSize), BYTES_TO_MB(nSizeD), BYTES_TO_MB(nSizeAll));
-
-    FXShaderCacheItor FXitor;
-    size_t nCache = 0;
-    nSize = 0;
-    for (FXitor = CHWShader::m_ShaderCache.begin(); FXitor != CHWShader::m_ShaderCache.end(); FXitor++)
-    {
-        SShaderCache* sc = FXitor->second;
-        if (!sc)
-        {
-            continue;
-        }
-        nCache++;
-        nSize += sc->Size();
-    }
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Shader Cache: %" PRISIZE_T " (size: %.3f Mb)", nCache, BYTES_TO_MB(nSize));
-
-    nSize = 0;
-    n = 0;
-    CRendElement* pRE = CRendElement::m_RootGlobal.m_NextGlobal;
-    while (pRE != &CRendElement::m_RootGlobal)
-    {
-        n++;
-        nSize += pRE->Size();
-        pRE = pRE->m_NextGlobal;
-    }
-    nY += nYstep;
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Render elements: %d (size: %.3f Mb)", n, BYTES_TO_MB(nSize));
-
-    size_t nSAll = 0;
-    size_t nSOneMip = 0;
-    size_t nSNM = 0;
-    size_t nSysAll = 0;
-    size_t nSysOneMip = 0;
-    size_t nSysNM = 0;
-    size_t nSRT = 0;
-    size_t nObjSize = 0;
-    size_t nStreamed = 0;
-    size_t nStreamedSys = 0;
-    size_t nStreamedUnload = 0;
-    n = 0;
-    pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CTexture* tp = (CTexture*)itor->second;
-            if (!tp || tp->IsNoTexture())
-            {
-                continue;
-            }
-            n++;
-            nObjSize += tp->GetSize(true);
-            int nS = tp->GetDeviceDataSize();
-            int nSys = tp->GetDataSize();
-            if (tp->IsStreamed())
-            {
-                if (tp->IsUnloaded())
-                {
-                    assert(nS == 0);
-                    nStreamedUnload += nSys;
-                }
-                else
-                if (tp->GetDevTexture())
-                {
-                    nStreamedSys += nSys;
-                }
-                nStreamed += nS;
-            }
-            if (tp->GetDevTexture())
-            {
-                if (!(tp->GetFlags() & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET)))
-                {
-                    if (tp->GetName()[0] != '$' && tp->GetNumMips() <= 1)
-                    {
-                        nSysOneMip += nSys;
-                    }
-                    if (tp->GetFlags() & FT_TEX_NORMAL_MAP)
-                    {
-                        nSysNM += nSys;
-                    }
-                    else
-                    {
-                        nSysAll += nSys;
-                    }
-                }
-            }
-            if (!nS)
-            {
-                continue;
-            }
-            if (tp->GetFlags() & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET))
-            {
-                nSRT += nS;
-            }
-            else
-            {
-                if (tp->GetName()[0] != '$' && tp->GetNumMips() <= 1)
-                {
-                    nSOneMip += nS;
-                }
-                if (tp->GetFlags() & FT_TEX_NORMAL_MAP)
-                {
-                    nSNM += nS;
-                }
-                else
-                {
-                    nSAll += nS;
-                }
-            }
-        }
-    }
-
-    nY += nYstep;
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "CryName: %d, Size: %.3f Mb...", CCryNameR::GetNumberOfEntries(), BYTES_TO_MB(CCryNameR::GetMemoryUsage()));
-    nY += nYstep;
-
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, "Textures: %d, ObjSize: %.3f Mb...", n, BYTES_TO_MB(nObjSize));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, " All Managed Video Size: %.3f Mb (Normals: %.3f Mb + Other: %.3f Mb), One mip: %.3f", BYTES_TO_MB(nSNM + nSAll), BYTES_TO_MB(nSNM), BYTES_TO_MB(nSAll), BYTES_TO_MB(nSOneMip));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, " All Managed System Size: %.3f Mb (Normals: %.3f Mb + Other: %.3f Mb), One mip: %.3f", BYTES_TO_MB(nSysNM + nSysAll), BYTES_TO_MB(nSysNM), BYTES_TO_MB(nSysAll), BYTES_TO_MB(nSysOneMip));
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, " Streamed Size: Video: %.3f, System: %.3f, Unloaded: %.3f", BYTES_TO_MB(nStreamed), BYTES_TO_MB(nStreamedSys), BYTES_TO_MB(nStreamedUnload));
-
-    SDynTexture_Shadow* pTXSH = SDynTexture_Shadow::s_RootShadow.m_NextShadow;
-    size_t nSizeSH = 0;
-    while (pTXSH != &SDynTexture_Shadow::s_RootShadow)
-    {
-        if (pTXSH->m_pTexture)
-        {
-            nSizeSH += pTXSH->m_pTexture->GetDeviceDataSize();
-        }
-        pTXSH = pTXSH->m_NextShadow;
-    }
-
-    size_t nSizeAtlasClouds = SDynTexture2::s_nMemoryOccupied[eTP_Clouds];
-    size_t nSizeAtlasSprites = SDynTexture2::s_nMemoryOccupied[eTP_Sprites];
-    size_t nSizeAtlas = nSizeAtlasClouds + nSizeAtlasSprites;
-    size_t nSizeManagedDyn = SDynTexture::s_nMemoryOccupied;
-
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, " Dynamic DataSize: %.3f Mb (Atlases: %.3f Mb, Managed: %.3f Mb (Shadows: %.3f Mb), Other: %.3f Mb)", BYTES_TO_MB(nSRT), BYTES_TO_MB(nSizeAtlas), BYTES_TO_MB(nSizeManagedDyn), BYTES_TO_MB(nSizeSH), BYTES_TO_MB(nSRT - nSizeManagedDyn - nSizeAtlas));
-
-    size_t nSizeZRT = 0;
-    size_t nSizeCRT = 0;
-
-    if (m_DepthBufferOrig.pSurf)
-    {
-        nSizeZRT += m_DepthBufferOrig.nWidth * m_DepthBufferOrig.nHeight * 4;
-    }
-    if (m_DepthBufferOrigMSAA.pSurf && m_DepthBufferOrig.pSurf != m_DepthBufferOrigMSAA.pSurf)
-    {
-        nSizeZRT += m_DepthBufferOrig.nWidth * m_DepthBufferOrig.nHeight * 2 * 4;
-    }
-    for (i = 0; i < (int)m_TempDepths.Num(); i++)
-    {
-        SDepthTexture* pSrf = m_TempDepths[i];
-        if (pSrf->pSurf)
-        {
-            nSizeZRT += pSrf->nWidth * pSrf->nHeight * 4;
-        }
-    }
-
-    nSizeCRT += m_d3dsdBackBuffer.Width * m_d3dsdBackBuffer.Height * 4 * 2;
-
-    Draw2dLabel(nX, nY += nYstep, fFSize, &col.r, false, " Targets DataSize: %.3f Mb (Color Buffer RT's: %.3f Mb, Z-Buffers: %.3f Mb", BYTES_TO_MB(nSizeCRT + nSizeZRT), BYTES_TO_MB(nSizeCRT), BYTES_TO_MB(nSizeZRT));
-
-    DebugPerfBars(nXBars, nYBars + 30);
-#endif
-}
-
-void CD3D9Renderer::DebugVidResourcesBars([[maybe_unused]] int nX, [[maybe_unused]] int nY)
-{
-#if !defined(EXCLUDE_RARELY_USED_R_STATS)
-    int i;
-    int nYst = 15;
-    float fFSize = 1.4f;
-    ColorF col = Col_Yellow;
-
-    // Draw performance bars
-    EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    EF_SetSrgbWrite(false);
-    FX_SetState(GS_NODEPTHTEST);
-
-    float fMaxBar = 200;
-    float fOffs = 190.0f;
-
-    ColorF colT = Col_Gray;
-    Draw2dLabel(nX + 50, nY, 1.6f, &colT.r, false, "Video resources:");
-    nY += 20;
-
-    double fMaxTextureMemory = m_MaxTextureMemory * 1024.0 * 1024.0;
-
-    ColorF colF = Col_Orange;
-    Draw2dLabel(nX, nY, fFSize, &colF.r, false, "Total memory: %.1f Mb", BYTES_TO_MB(fMaxTextureMemory));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + fMaxBar, nY + 12, Col_Cyan, 1.0f);
-    nY += nYst;
-
-    SDynTexture_Shadow* pTXSH = SDynTexture_Shadow::s_RootShadow.m_NextShadow;
-    size_t nSizeSH = 0;
-    while (pTXSH != &SDynTexture_Shadow::s_RootShadow)
-    {
-        if (pTXSH->m_pTexture)
-        {
-            nSizeSH += pTXSH->m_pTexture->GetDeviceDataSize();
-        }
-        pTXSH = pTXSH->m_NextShadow;
-    }
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Shadow textures: %.1f Mb", BYTES_TO_MB(nSizeSH));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSizeSH / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    SDynTexture* pTX = SDynTexture::s_Root.m_Next;
-    size_t nSizeD = 0;
-    while (pTX != &SDynTexture::s_Root)
-    {
-        if (pTX->m_pTexture)
-        {
-            nSizeD += pTX->m_pTexture->GetDeviceDataSize();
-        }
-        pTX = pTX->m_Next;
-    }
-    nSizeD -= nSizeSH;
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Dyn. text.: %.1f Mb", BYTES_TO_MB(nSizeD));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSizeD / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    size_t nSizeD2 = 0;
-    for (i = 0; i < eTP_Max; i++)
-    {
-        nSizeD2 += SDynTexture2::s_nMemoryOccupied[i];
-    }
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Dyn. atlas text.: %.1f Mb", BYTES_TO_MB(nSizeD2));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSizeD2 / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    size_t nSizeZRT = 0;
-    size_t nSizeCRT = 0;
-    if (m_DepthBufferOrig.pSurf)
-    {
-        nSizeZRT += m_DepthBufferOrig.nWidth * m_DepthBufferOrig.nHeight * 4;
-    }
-    if (m_DepthBufferOrigMSAA.pSurf && m_DepthBufferOrig.pSurf != m_DepthBufferOrigMSAA.pSurf)
-    {
-        nSizeZRT += m_DepthBufferOrig.nWidth * m_DepthBufferOrig.nHeight * 2 * 4;
-    }
-    for (i = 0; i < (int)m_TempDepths.Num(); i++)
-    {
-        SDepthTexture* pSrf = m_TempDepths[i];
-        if (pSrf->pSurf)
-        {
-            nSizeZRT += pSrf->nWidth * pSrf->nHeight * 4;
-        }
-    }
-    nSizeCRT += m_d3dsdBackBuffer.Width * m_d3dsdBackBuffer.Height * 4 * 2;
-    nSizeCRT += nSizeZRT;
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Frame targets: %.1f Mb", BYTES_TO_MB(nSizeCRT));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSizeCRT / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    size_t nSAll = 0;
-    size_t nSOneMip = 0;
-    size_t nSNM = 0;
-    size_t nSRT = 0;
-    size_t nObjSize = 0;
-    size_t nStreamed = 0;
-    size_t nStreamedSys = 0;
-    size_t nStreamedUnload = 0;
-    i = 0;
-    SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-    if (pRL)
-    {
-        ResourcesMapItor itor;
-        for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-        {
-            CTexture* tp = (CTexture*)itor->second;
-            if (!tp || tp->IsNoTexture())
-            {
-                continue;
-            }
-            i++;
-            nObjSize += tp->GetSize(true);
-            int nS = tp->GetDeviceDataSize();
-            if (tp->IsStreamed())
-            {
-                int nSizeSys = tp->GetDataSize();
-                if (tp->IsUnloaded())
-                {
-                    assert(nS == 0);
-                    nStreamedUnload += nSizeSys;
-                }
-                else
-                {
-                    nStreamedSys += nSizeSys;
-                }
-                nStreamed += nS;
-            }
-            if (!nS)
-            {
-                continue;
-            }
-            if (tp->GetFlags() & (FT_USAGE_DYNAMIC | FT_USAGE_RENDERTARGET))
-            {
-                nSRT += nS;
-            }
-            else
-            {
-                if (!tp->IsStreamed())
-                {
-                }
-                if (tp->GetName()[0] != '$' && tp->GetNumMips() <= 1)
-                {
-                    nSOneMip += nS;
-                }
-                if (tp->GetFlags() & FT_TEX_NORMAL_MAP)
-                {
-                    nSNM += nS;
-                }
-                else
-                {
-                    nSAll += nS;
-                }
-            }
-        }
-    }
-    nSRT -= (nSizeD + nSizeD2 + nSizeSH);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Render targets: %.1f Mb", BYTES_TO_MB(nSRT));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSRT / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Textures: %.1f Mb", BYTES_TO_MB(nSAll));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSAll / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    size_t nSizeMeshes = 0;
-    {
-        AUTO_LOCK(CRenderMesh::m_sLinkLock);
-        for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-        {
-            nSizeMeshes += iter->item<&CRenderMesh::m_Chain>()->Size(CRenderMesh::SIZE_VB | CRenderMesh::SIZE_IB);
-        }
-    }
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Meshes: %.1f Mb", BYTES_TO_MB(nSizeMeshes));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSizeMeshes / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    size_t nSizeDynM = 0;
-    for (i = 0; i < SHAPE_MAX; i++)
-    {
-        nSizeDynM += _VertBufferSize(m_pUnitFrustumVB[i]);
-        nSizeDynM += _IndexBufferSize(m_pUnitFrustumIB[i]);
-    }
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (m_pRenderAuxGeomD3D)
-    {
-        m_pRenderAuxGeomD3D->GetDeviceDataSize();
-    }
-#endif
-
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Dyn. mesh: %.1f Mb", BYTES_TO_MB(nSizeDynM));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSizeDynM / fMaxTextureMemory * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst + 4;
-
-    size_t nSize = nSizeDynM + nSRT + nSizeCRT + nSizeSH + nSizeD + nSizeD2;
-    ColorF colO = Col_Blue;
-    Draw2dLabel(nX, nY, fFSize, &colO.r, false, "Overall (Pure): %.1f Mb", BYTES_TO_MB(nSize));
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 1, nX + fOffs + (float)nSize / fMaxTextureMemory * fMaxBar, nY + 12, Col_White, 1.0f);
-    nY += nYst;
-#endif
-}
-
-void CD3D9Renderer::DebugPerfBars([[maybe_unused]] int nX, [[maybe_unused]] int nY)
-{
-#if !defined(EXCLUDE_RARELY_USED_R_STATS) && defined(ENABLE_PROFILING_CODE)
-    int nYst = 15;
-    float fFSize = 1.4f;
-    ColorF col = Col_Yellow;
-    ColorF colP = Col_Cyan;
-
-    // Draw performance bars
-    TransformationMatrices backupSceneMatrices;
-    Set2DMode(m_width, m_height, backupSceneMatrices);
-
-    EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    EF_SetSrgbWrite(false);
-    FX_SetState(GS_NODEPTHTEST);
-    D3DSetCull(eCULL_None);
-    FX_SetFPMode();
-
-    static float fTimeDIP[EFSLIST_NUM];
-    static float fTimeDIPAO;
-    static float fTimeDIPZ;
-    static float fTimeDIPRAIN;
-    static float fTimeDIPLayers;
-    static float fTimeDIPSprites;
-    static float fWaitForGPU;
-    static float fFrameTime;
-    static float fRTTimeProcess;
-    static float fRTTimeEndFrame;
-    static float fRTTimeFlashRender;
-    static float fRTTimeSceneRender;
-    static float fRTTimeMiscRender;
-
-    float fMaxBar = 200;
-    float fOffs = 180.0f;
-
-    Draw2dLabel(nX + 30, nY, 1.6f, &colP.r, false, "Instances: %d, GeomBatches: %d, MatBatches: %d, DrawCalls: %d, Text: %d, Stat: %d, PShad: %d, VShad: %d", m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendInstances, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendGeomBatches, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumRendMaterialBatches, GetCurrentNumberOfDrawCalls(), m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumTextChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumStateChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumPShadChanges, m_RP.m_PS[m_RP.m_nProcessThreadID].m_NumVShadChanges);
-    nY += 30;
-
-    ColorF colT = Col_Gray;
-    Draw2dLabel(nX + 50, nY, 1.6f, &colT.r, false, "Performance:");
-    nY += 20;
-
-    float fSmooth = 5.0f;
-    fFrameTime = (iTimer->GetFrameTime() + fFrameTime * fSmooth) / (fSmooth + 1.0f);
-
-    ColorF colF = Col_Orange;
-    Draw2dLabel(nX, nY, fFSize, &colF.r, false, "Frame: %.3fms", fFrameTime * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fMaxBar, nY + 12, Col_Cyan, 1.0f);
-    nY += nYst + 5;
-
-    fTimeDIPZ = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPsZ + fTimeDIPZ * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "ZPass: %.3fms", fTimeDIPZ * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIPZ / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_DEFERRED_PREPROCESS] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_DEFERRED_PREPROCESS] + fTimeDIP[EFSLIST_DEFERRED_PREPROCESS] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Deferred Prepr.: %.3fms", fTimeDIP[EFSLIST_DEFERRED_PREPROCESS] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_DEFERRED_PREPROCESS] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_GENERAL] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_GENERAL] + fTimeDIP[EFSLIST_GENERAL] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "General: %.3fms", fTimeDIP[EFSLIST_GENERAL] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_GENERAL] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_SHADOW_GEN] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_SHADOW_GEN] + fTimeDIP[EFSLIST_SHADOW_GEN] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "ShadowGen: %.3fms", fTimeDIP[EFSLIST_SHADOW_GEN] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_SHADOW_GEN] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_DECAL] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_DECAL] + fTimeDIP[EFSLIST_DECAL] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Decals: %.3fms", fTimeDIP[EFSLIST_DECAL] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_DECAL] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIPRAIN = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPsRAIN + fTimeDIPRAIN * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Rain: %.3fms", fTimeDIPRAIN * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIPRAIN / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIPLayers = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPsDeferredLayers + fTimeDIPLayers * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Deferred Layers: %.3fms", fTimeDIPLayers * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIPLayers / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_WATER_VOLUMES] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_WATER_VOLUMES] + fTimeDIP[EFSLIST_WATER_VOLUMES] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Water volumes: %.3fms", fTimeDIP[EFSLIST_WATER_VOLUMES] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_WATER_VOLUMES] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_REFRACTIVE_SURFACE] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_REFRACTIVE_SURFACE] + fTimeDIP[EFSLIST_REFRACTIVE_SURFACE] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Refractive Surfaces: %.3fms", fTimeDIP[EFSLIST_REFRACTIVE_SURFACE] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_REFRACTIVE_SURFACE] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_TRANSP] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_TRANSP] + fTimeDIP[EFSLIST_TRANSP] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Transparent: %.3fms", fTimeDIP[EFSLIST_TRANSP] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_TRANSP] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIPAO = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPsAO + fTimeDIPAO * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "AO: %.3fms", fTimeDIPAO * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIPAO / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIP[EFSLIST_POSTPROCESS] = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPs[EFSLIST_POSTPROCESS] + fTimeDIP[EFSLIST_POSTPROCESS] * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Postprocessing: %.3fms", fTimeDIP[EFSLIST_POSTPROCESS] * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIP[EFSLIST_POSTPROCESS] / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    fTimeDIPSprites = (m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTimeDIPsSprites + fTimeDIPSprites * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &col.r, false, "Sprites: %.3fms", fTimeDIPSprites * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIPSprites / fFrameTime * fMaxBar, nY + 12, Col_Green, 1.0f);
-    nY += nYst;
-
-    float fTimeDIPSum = fTimeDIPZ + fTimeDIP[EFSLIST_DEFERRED_PREPROCESS] + fTimeDIP[EFSLIST_GENERAL] + fTimeDIP[EFSLIST_SHADOW_GEN] + fTimeDIP[EFSLIST_DECAL] + fTimeDIPAO + fTimeDIPRAIN + fTimeDIPLayers + fTimeDIP[EFSLIST_WATER_VOLUMES] + fTimeDIP[EFSLIST_TRANSP] + fTimeDIP[EFSLIST_POSTPROCESS] + fTimeDIPSprites;
-    Draw2dLabel(nX, nY, fFSize, &colF.r, false, "Sum all passes: %.3fms", fTimeDIPSum * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fTimeDIPSum / fFrameTime * fMaxBar, nY + 12, Col_Yellow, 1.0f);
-    nY += nYst + 5;
-
-
-    fRTTimeProcess = (m_fTimeProcessedRT[m_RP.m_nFillThreadID] + fRTTimeProcess * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &colT.r, false, "RT process time: %.3fms", fRTTimeProcess * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fRTTimeProcess / fFrameTime * fMaxBar, nY + 12, Col_Gray, 1.0f);
-    nY += nYst;
-    nX += 5;
-
-    fRTTimeEndFrame = (m_fRTTimeEndFrame + fRTTimeEndFrame * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &colT.r, false, "RT end frame: %.3fms", fRTTimeEndFrame * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fRTTimeEndFrame / fFrameTime * fMaxBar, nY + 12, Col_Gray, 1.0f);
-    nY += nYst;
-
-    fRTTimeMiscRender = (m_fRTTimeMiscRender + fRTTimeMiscRender * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &colT.r, false, "RT misc render: %.3fms", fRTTimeMiscRender * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fRTTimeMiscRender / fFrameTime * fMaxBar, nY + 12, Col_Gray, 1.0f);
-    nY += nYst;
-
-    fRTTimeSceneRender = (m_fRTTimeSceneRender + fRTTimeSceneRender * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &colT.r, false, "RT scene render: %.3fms", fRTTimeSceneRender * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fRTTimeSceneRender / fFrameTime * fMaxBar, nY + 12, Col_Gray, 1.0f);
-    nY += nYst;
-
-    float fRTTimeOverall = fRTTimeSceneRender + fRTTimeEndFrame + fRTTimeFlashRender + fRTTimeMiscRender;
-    Draw2dLabel(nX, nY, fFSize, &colT.r, false, "RT CPU overall: %.3fms", fRTTimeOverall * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fRTTimeOverall / fFrameTime * fMaxBar, nY + 12, Col_LightGray, 1.0f);
-    nY += nYst + 5;
-    nX -= 5;
-
-
-    fWaitForGPU = (m_fTimeWaitForGPU[m_RP.m_nFillThreadID] + fWaitForGPU * fSmooth) / (fSmooth + 1.0f);
-    Draw2dLabel(nX, nY, fFSize, &colF.r, false, "Wait for GPU: %.3fms", fWaitForGPU * 1000.0f);
-    CTextureManager::Instance()->GetWhiteTexture()->Apply(0);
-    DrawQuad(nX + fOffs, nY + 4, nX + fOffs + fWaitForGPU / fFrameTime * fMaxBar, nY + 12, Col_Blue, 1.0f);
-    nY += nYst;
-
-    Unset2DMode(backupSceneMatrices);
-#endif
-}
-
-_inline bool CompareTexturesSize(CTexture* a, CTexture* b)
-{
-    return (a->GetDeviceDataSize() > b->GetDeviceDataSize());
-}
-
-void CD3D9Renderer::VidMemLog()
-{
-#if !defined(_RELEASE) && !defined(CONSOLE_CONST_CVAR_MODE)
-    if (!CV_r_logVidMem)
-    {
-        return;
-    }
-
-    SResourceContainer* pRL = 0;
-
-    pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-
-    DynArray<CTexture*> pRenderTargets;
-    DynArray<CTexture*> pDynTextures;
-    DynArray<CTexture*> pTextures;
-
-    size_t nSizeTotalRT = 0;
-    size_t nSizeTotalDynTex = 0;
-    size_t nSizeTotalTex = 0;
-
-    for (uint32 i = 0; i < pRL->m_RList.size(); ++i)
-    {
-        CTexture* pTexResource = (CTexture*)pRL->m_RList[i];
-        if (!pTexResource)
-        {
-            continue;
-        }
-
-        if (!pTexResource->GetDeviceDataSize())
-        {
-            continue;
-        }
-
-        if (pTexResource->GetFlags() & FT_USAGE_RENDERTARGET)
-        {
-            pRenderTargets.push_back(pTexResource);
-            nSizeTotalRT += pTexResource->GetDeviceDataSize();
-        }
-        else
-        if (pTexResource->GetFlags() & FT_USAGE_DYNAMIC)
-        {
-            pDynTextures.push_back(pTexResource);
-            nSizeTotalDynTex += pTexResource->GetDeviceDataSize();
-        }
-        else
-        {
-            pTextures.push_back(pTexResource);
-            nSizeTotalTex += pTexResource->GetDeviceDataSize();
-        }
-    }
-
-    std::sort(pRenderTargets.begin(), pRenderTargets.end(), CompareTexturesSize);
-    std::sort(pDynTextures.begin(), pDynTextures.end(), CompareTexturesSize);
-    std::sort(pTextures.begin(), pTextures.end(), CompareTexturesSize);
-
-    AZ::IO::HandleType fileHandle = fxopen("VidMemLogTest.txt", "w");
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        char time[128];
-        char date[128];
-
-        azstrtime(time);
-        azstrdate(date);
-
-        AZ::IO::Print(fileHandle, "\n==========================================\n");
-        AZ::IO::Print(fileHandle, "VidMem Log file opened: %s (%s)\n", date, time);
-        AZ::IO::Print(fileHandle, "==========================================\n");
-
-        AZ::IO::Print(fileHandle, "\nTotal Vid mem used for textures: %.1f MB", BYTES_TO_MB(nSizeTotalRT + nSizeTotalDynTex + nSizeTotalTex));
-        AZ::IO::Print(fileHandle, "\nRender targets (%d): %.1f kb, Dynamic textures (%d): %.1f kb, Textures (%d): %.1f kb", pRenderTargets.size(), BYTES_TO_KB(nSizeTotalRT), pDynTextures.size(), BYTES_TO_KB(nSizeTotalDynTex), pTextures.size(), BYTES_TO_KB(nSizeTotalTex));
-
-        AZ::IO::Print(fileHandle, "\n\n*** Start render targets list *** \n");
-        int i = 0;
-        for (i = 0; i < pRenderTargets.size(); ++i)
-        {
-            AZ::IO::Print(fileHandle, "\nName: %s, Format: %s, Width: %d, Height: %d, Size: %.1f kb", pRenderTargets[i]->GetName(), pRenderTargets[i]->GetFormatName(), pRenderTargets[i]->GetWidth(),
-                pRenderTargets[i]->GetHeight(), BYTES_TO_KB(pRenderTargets[i]->GetDeviceDataSize()));
-        }
-
-        AZ::IO::Print(fileHandle, "\n\n*** Start dynamic textures list *** \n");
-        for (i = 0; i < pDynTextures.size(); ++i)
-        {
-            AZ::IO::Print(fileHandle, "\nName: %s, Format: %s, Width: %d, Height: %d, Size: %.1f kb", pDynTextures[i]->GetName(), pDynTextures[i]->GetFormatName(), pDynTextures[i]->GetWidth(),
-                pDynTextures[i]->GetHeight(), BYTES_TO_KB(pDynTextures[i]->GetDeviceDataSize()));
-        }
-
-        AZ::IO::Print(fileHandle, "\n\n*** Start textures list *** \n");
-        for (i = 0; i < pTextures.size(); ++i)
-        {
-            AZ::IO::Print(fileHandle, "\nName: %s, Format: %s, Width: %d, Height: %d, Size: %.1f kb", pTextures[i]->GetName(), pTextures[i]->GetFormatName(), pTextures[i]->GetWidth(),
-                pTextures[i]->GetHeight(), BYTES_TO_KB(pTextures[i]->GetDeviceDataSize()));
-        }
-
-        AZ::IO::Print(fileHandle, "\n\n==========================================\n");
-        AZ::IO::Print(fileHandle, "VidMem Log file closed\n");
-        AZ::IO::Print(fileHandle, "==========================================\n\n");
-
-        gEnv->pFileIO->Close(fileHandle);
-        fileHandle = AZ::IO::InvalidHandle;
-    }
-
-    CV_r_logVidMem = 0;
-#endif
-}
-
-
-void CD3D9Renderer::DebugPrintShader([[maybe_unused]] CHWShader_D3D* pSH, [[maybe_unused]] void* pI, [[maybe_unused]] int nX, [[maybe_unused]] int nY, [[maybe_unused]] ColorF colSH)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_9
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    if (!pSH)
-    {
-        return;
-    }
-    CHWShader_D3D::SHWSInstance* pInst = (CHWShader_D3D::SHWSInstance*)pI;
-    if (!pInst)
-    {
-        return;
-    }
-
-    char str[512];
-    pSH->m_pCurInst = pInst;
-    azstrcpy(str, AZ_ARRAY_SIZE(str), pSH->m_EntryFunc.c_str());
-    uint32 nSize = strlen(str);
-    pSH->mfGenName(pInst, &str[nSize], 512 - nSize, 1);
-
-    ColorF col = Col_Green;
-    Draw2dLabel(nX, nY, 1.6f, &col.r, false, "Shader: %s (%d instructions)", str, pInst->m_nInstructions);
-    nX += 10;
-    nY += 25;
-
-    SD3DShader* pHWS = pInst->m_Handle.m_pShader;
-    if (!pHWS || !pHWS->m_pHandle)
-    {
-        return;
-    }
-    if (!pInst->m_pShaderData)
-    {
-        return;
-    }
-    byte* pData = NULL;
-    ID3D10Blob* pAsm = NULL;
-    D3DDisassemble((UINT*)pInst->m_pShaderData, pInst->m_nDataSize, 0, NULL, &pAsm);
-    if (!pAsm)
-    {
-        return;
-    }
-    char* szAsm = (char*)pAsm->GetBufferPointer();
-    int nMaxY = m_height;
-    int nM = 0;
-    while (szAsm[0])
-    {
-        fxFillCR(&szAsm, str);
-        Draw2dLabel(nX, nY, 1.2f, &colSH.r, false, "%s", str);
-        nY += 11;
-        if (nY + 12 > nMaxY)
-        {
-            nX += 280;
-            nY = 120;
-            nM++;
-        }
-        if (nM == 2)
-        {
-            break;
-        }
-    }
-
-    SAFE_RELEASE(pAsm);
-    SAFE_DELETE_ARRAY(pData);
-#endif
-}
-
-void CD3D9Renderer::DebugDrawStats8()
-{
-#if !defined(_RELEASE) && defined(ENABLE_PROFILING_CODE)
-    ColorF col = Col_White;
-    Draw2dLabel(30, 50, 1.2f, &col.r, false, "%d total instanced DIPs in %d batches", m_RP.m_PS[m_RP.m_nProcessThreadID].m_nInsts, m_RP.m_PS[m_RP.m_nProcessThreadID].m_nInstCalls);
-#endif
-}
-
-void CD3D9Renderer::DebugDrawStats2()
-{
-#if !defined(EXCLUDE_RARELY_USED_R_STATS)
-    const int nYstep = 10;
-    int nY = 30; // initial Y pos
-    int nX = 20; // initial X pos
-    static int snTech = 0;
-
-    if (!g_SelectedTechs.size())
-    {
-        return;
-    }
-
-    if (CryGetAsyncKeyState('0') & 0x1)
-    {
-        snTech = 0;
-    }
-    if (CryGetAsyncKeyState('1') & 0x1)
-    {
-        snTech = 1;
-    }
-    if (CryGetAsyncKeyState('2') & 0x1)
-    {
-        snTech = 2;
-    }
-    if (CryGetAsyncKeyState('3') & 0x1)
-    {
-        snTech = 3;
-    }
-    if (CryGetAsyncKeyState('4') & 0x1)
-    {
-        snTech = 4;
-    }
-    if (CryGetAsyncKeyState('5') & 0x1)
-    {
-        snTech = 5;
-    }
-    if (CryGetAsyncKeyState('6') & 0x1)
-    {
-        snTech = 6;
-    }
-    if (CryGetAsyncKeyState('7') & 0x1)
-    {
-        snTech = 7;
-    }
-    if (CryGetAsyncKeyState('8') & 0x1)
-    {
-        snTech = 8;
-    }
-    if (CryGetAsyncKeyState('9') & 0x1)
-    {
-        snTech = 9;
-    }
-
-    TArray<SShaderTechniqueStat*> Techs;
-    uint32 i;
-    int j;
-    for (i = 0; i < g_SelectedTechs.size(); i++)
-    {
-        SShaderTechniqueStat* pTech = &g_SelectedTechs[i];
-        for (j = 0; j < (int)Techs.Num(); j++)
-        {
-            if (Techs[j]->pVSInst == pTech->pVSInst && Techs[j]->pPSInst == pTech->pPSInst)
-            {
-                break;
-            }
-        }
-        if (j == Techs.Num())
-        {
-            Techs.AddElem(pTech);
-        }
-    }
-
-    if (snTech >= (int)Techs.Num())
-    {
-        snTech = Techs.Num() - 1;
-    }
-
-    if (!(snTech >= 0 && snTech < (int)Techs.Num()))
-    {
-        return;
-    }
-
-    SShaderTechniqueStat* pTech = Techs[snTech];
-
-    ColorF col = Col_Yellow;
-    Draw2dLabel(nX, nY, 2.0f, &col.r, false, "FX Shader: %s, Technique: %s (%d out of %d), Pass: %d", pTech->pShader->GetName(), pTech->pTech->m_NameStr.c_str(), snTech, Techs.Num(), 0);
-    nY += 25;
-
-    CHWShader_D3D* pPS = pTech->pPS;
-    DebugPrintShader(pTech->pVS, pTech->pVSInst, nX - 10, nY, Col_White);
-    DebugPrintShader(pPS, pTech->pPSInst, nX + 450, nY, Col_Cyan);
-#endif
-}
-
-void CD3D9Renderer::DebugDrawStats()
-{
-#ifndef _RELEASE
-    if (CV_r_stats)
-    {
-        CRenderer* crend = gRenDev;
-
-        CCryNameTSCRC Name;
-        switch (CV_r_stats)
-        {
-        case 1:
-            DebugDrawStats1();
-            break;
-        case 2:
-            DebugDrawStats2();
-            break;
-        case 3:
-            DebugPerfBars(40, 50);
-            DebugVidResourcesBars(450, 80);
-            break;
-        case 4:
-            DebugPerfBars(40, 50);
-            break;
-        case 8:
-            DebugDrawStats8();
-            break;
-        case 13:
-            EF_PrintRTStats("Cleared Render Targets:");
-            break;
-        case 5:
-        {
-            const int nYstep = 30;
-            int nYpos = 270;     // initial Y pos
-            crend->WriteXY(10, nYpos += nYstep, 2, 2, 1, 1, 1, 1, "CREOcclusionQuery stats:%d",
-                CREOcclusionQuery::m_nQueriesPerFrameCounter);
-            crend->WriteXY(10, nYpos += nYstep, 2, 2, 1, 1, 1, 1, "CREOcclusionQuery::m_nQueriesPerFrameCounter=%d",
-                CREOcclusionQuery::m_nQueriesPerFrameCounter);
-            crend->WriteXY(10, nYpos += nYstep, 2, 2, 1, 1, 1, 1, "CREOcclusionQuery::m_nReadResultNowCounter=%d",
-                CREOcclusionQuery::m_nReadResultNowCounter);
-            crend->WriteXY(10, nYpos += nYstep, 2, 2, 1, 1, 1, 1, "CREOcclusionQuery::m_nReadResultTryCounter=%d",
-                CREOcclusionQuery::m_nReadResultTryCounter);
-        }
-        break;
-
-        case 6:
-        {
-            ColorF clrDPBlue = ColorF(0, 1, 1, 1);
-            ColorF clrDPRed = ColorF(1, 0, 0, 1);
-            ColorF clrDPInterp = ColorF(1, 0, 0, 1);
-            ;
-            ColorF clrInfo = ColorF(1, 1, 0, 1);
-
-            IRenderer::RNDrawcallsMapNodeItor pEnd = m_RP.m_pRNDrawCallsInfoPerNode[m_RP.m_nProcessThreadID].end();
-            IRenderer::RNDrawcallsMapNodeItor pItor = m_RP.m_pRNDrawCallsInfoPerNode[m_RP.m_nProcessThreadID].begin();
-            for (; pItor != pEnd; ++pItor)
-            {
-                SDrawCallCountInfo& pInfo = pItor->second;
-
-                uint32 nDrawcalls = pInfo.nShadows + pInfo.nZpass + pInfo.nGeneral + pInfo.nTransparent + pInfo.nMisc;
-
-                // Display drawcall count per render object
-                const float* pfColor;
-                int nMinDrawCalls = CV_r_statsMinDrawcalls;
-                if (nDrawcalls < nMinDrawCalls)
-                {
-                    continue;
-                }
-                else if (nDrawcalls <= 4)
-                {
-                    pfColor = &clrDPBlue.r;
-                }
-                else if (nDrawcalls > 20)
-                {
-                    pfColor = &clrDPRed.r;
-                }
-                else
-                {
-                    // interpolation from orange to red
-                    clrDPInterp.g = 0.5f - 0.5f * (nDrawcalls - 4) / (20 - 4);
-                    pfColor = &clrDPInterp.r;
-                }
-
-                DrawLabelEx(pInfo.pPos, 1.3f, pfColor, true, true, "DP: %d (%d/%d/%d/%d/%d)",
-                    nDrawcalls, pInfo.nZpass, pInfo.nGeneral, pInfo.nTransparent, pInfo.nShadows, pInfo.nMisc);
-            }
-
-            Draw2dLabel(40.f, 40.f, 1.3f, &clrInfo.r, false, "Instance drawcall count (zpass/general/transparent/shadows/misc)");
-        }
-        break;
-        }
-    }
-
-    if (m_pDebugRenderNode)
-    {
-#ifndef _RELEASE
-        static ICVar* debugDraw = gEnv->pConsole->GetCVar("e_DebugDraw");
-        if (debugDraw && debugDraw->GetIVal() == 16)
-        {
-            float yellow[4] = { 1.f, 1.f, 0.f, 1.f };
-
-            IRenderer::RNDrawcallsMapNodeItor pEnd = m_RP.m_pRNDrawCallsInfoPerNode[m_RP.m_nProcessThreadID].end();
-            IRenderer::RNDrawcallsMapNodeItor pItor = m_RP.m_pRNDrawCallsInfoPerNode[m_RP.m_nProcessThreadID].begin();
-            for (; pItor != pEnd; ++pItor)
-            {
-                IRenderNode* pRenderNode = pItor->first;
-
-                //display info for render node under debug gun
-                if (pRenderNode == m_pDebugRenderNode)
-                {
-                    SDrawCallCountInfo& pInfo = pItor->second;
-
-                    uint32 nDrawcalls = pInfo.nShadows + pInfo.nZpass + pInfo.nGeneral + pInfo.nTransparent + pInfo.nMisc;
-
-                    Draw2dLabel(970.f, 65.f, 1.5f, yellow, false, "Draw calls: %d \n  zpass: %d\n  general: %d\n  transparent: %d\n  shadows: %d\n  misc: %d\n",
-                        nDrawcalls, pInfo.nZpass, pInfo.nGeneral, pInfo.nTransparent, pInfo.nShadows, pInfo.nMisc);
-                }
-            }
-        }
-#endif
-    }
-#endif
-}
-
-void CD3D9Renderer::RenderDebug(bool bRenderStats)
-{
-    m_pRT->RC_RenderDebug(bRenderStats);
-}
-
-void CD3D9Renderer::RT_RenderDebug([[maybe_unused]] bool bRenderStats)
-{
-    if (gEnv->IsEditor() && !m_CurrContext->m_bMainViewport)
-    {
-        return;
-    }
-
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-#if !defined(_RELEASE)
-
-#if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS
-    if (CV_r_RefractionPartialResolvesDebug)
-    {
-        SPipeStat* pRP = &m_RP.m_PS[m_RP.m_nFillThreadID];
-        const float xPos = 0.0f;
-        float yPos = 90.0f;
-        const float textYSpacing = 18.0f;
-        const float size = 1.5f;
-        const ColorF titleColor = Col_SpringGreen;
-        const ColorF textColor = Col_Yellow;
-        const bool bCentre = false;
-
-        float fInvScreenArea = 1.0f / ((float)GetWidth() * (float)GetHeight());
-
-        Draw2dLabel(xPos, yPos, size, &titleColor.r, bCentre, "Partial Resolves");
-        yPos += textYSpacing;
-        Draw2dLabel(xPos, yPos, size, &textColor.r, bCentre, "Count: %d", pRP->m_refractionPartialResolveCount);
-        yPos += textYSpacing;
-        Draw2dLabel(xPos, yPos, size, &textColor.r, bCentre, "Pixels: %d", pRP->m_refractionPartialResolvePixelCount);
-        yPos += textYSpacing;
-        Draw2dLabel(xPos, yPos, size, &textColor.r, bCentre, "Percentage of Screen area: %d", (int)(pRP->m_refractionPartialResolvePixelCount * fInvScreenArea * 100.0f));
-        yPos += textYSpacing;
-        Draw2dLabel(xPos, yPos, size, &textColor.r, bCentre, "Estimated cost: %.2fms", pRP->m_fRefractionPartialResolveEstimatedCost);
-    }
-#endif
-
-#ifndef EXCLUDE_DOCUMENTATION_PURPOSE
-    if (CV_r_DebugFontRendering)
-    {
-        const float fPixelPerfectScale = 16.0f / UIDRAW_TEXTSIZEFACTOR * 2.0f;      // we have to compensate  vSize.x/16.0f; and pFont->SetCharWidthScale(0.5f);
-        const int line = 10;
-
-        float y = 0;
-        SDrawTextInfo ti;
-        ti.flags = eDrawText_2D | eDrawText_FixedSize | eDrawText_Monospace;
-
-        ti.color[2] = 0.0f;
-        DrawTextQueued(Vec3(0, y += line, 0), ti, "Colors (black,white,blue,..): { $00$11$22$33$44$55$66$77$88$99$$$o } ()_!+*/# ?");
-        ti.color[2] = 1.0f;
-        DrawTextQueued(Vec3(0, y += line, 0), ti, "Colors (black,white,blue,..): { $00$11$22$33$44$55$66$77$88$99$$$o } ()_!+*/# ?");
-
-        for (int iPass = 0; iPass < 3; ++iPass)         // left, center, right
-        {
-            ti.xscale = ti.yscale = fPixelPerfectScale * 0.5f;
-            float x = 0;
-
-            y = 3 * line;
-
-            int passflags = eDrawText_2D;
-
-            if (iPass == 1)
-            {
-                passflags |= eDrawText_Center;
-                x = (float)GetWidth() * 0.5f;
-            }
-            else if (iPass == 2)
-            {
-                x = (float)GetWidth();
-                passflags |= eDrawText_Right;
-            }
-
-            ti.color[3] = 0.5f;
-            ti.flags = passflags | eDrawText_FixedSize | eDrawText_Monospace;
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "0");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !.....!");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !MMMMM!");
-
-            ti.color[0] = 0.0f;
-            ti.color[3] = 1.0f;
-            ti.flags = passflags | eDrawText_FixedSize;
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "1");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !.....!");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !MMMMM!");
-            /*
-                        ti.flags = passflags | eDrawText_Monospace;
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"2");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"AbcW !.....!");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"AbcW !MMMMM!");
-
-                        ti.flags = passflags;
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"3");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"AbcW !.....!");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"AbcW !MMMMM!");
-                        */
-            ti.color[1] = 0.0f;
-            ti.flags = passflags | eDrawText_800x600 | eDrawText_FixedSize | eDrawText_Monospace;
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "4");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !.....!");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !MMMMM!");
-
-            ti.color[0] = 1.0f;
-            ti.color[1] = 1.0f;
-            ti.flags = passflags | eDrawText_800x600 | eDrawText_FixedSize;
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "5");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !.....!");
-            DrawTextQueued(Vec3(x, y += line, 0), ti, "AbcW !MMMMM!");
-
-            /*
-                        ti.flags = passflags | eDrawText_800x600 | eDrawText_Monospace;
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"6");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"Halfsize");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"AbcW !MMMMM!");
-
-                        ti.flags = passflags | eDrawText_800x600;
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"7");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"AbcW !.....!");
-                        DrawTextQueued(Vec3(x,y+=line,0),ti,"AbcW !MMMMM!");
-                        */
-            // Pixel Perfect (1:1 mapping of the texels to the pixels on the screeen)
-
-            ti.flags = passflags | eDrawText_FixedSize | eDrawText_Monospace;
-            ti.xscale = ti.yscale = fPixelPerfectScale;
-            DrawTextQueued(Vec3(x, y += line * 2, 0), ti, "8");
-            DrawTextQueued(Vec3(x, y += line * 2, 0), ti, "AbcW !.....!");
-            DrawTextQueued(Vec3(x, y += line * 2, 0), ti, "AbcW !MMMMM!");
-
-            ti.flags = passflags | eDrawText_FixedSize;
-            ti.xscale = ti.yscale = fPixelPerfectScale;
-            DrawTextQueued(Vec3(x, y += line * 2, 0), ti, "9");
-            DrawTextQueued(Vec3(x, y += line * 2, 0), ti, "AbcW !.....!");
-            DrawTextQueued(Vec3(x, y += line * 2, 0), ti, "AbcW !MMMMM!");
-        }
-    }
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-
-#ifdef DO_RENDERSTATS
-    static std::vector<SStreamEngineStatistics::SAsset> vecStreamingProblematicAssets;
-
-    if (CV_r_showtimegraph)
-    {
-        static byte* fg;
-        static float fPrevTime = iTimer->GetCurrTime();
-        static int sPrevWidth = 0;
-        static int sPrevHeight = 0;
-        static int nC;
-
-        float fCurTime = iTimer->GetCurrTime();
-        float frametime = fCurTime - fPrevTime;
-        fPrevTime = fCurTime;
-        int wdt = m_width;
-        int hgt = m_height;
-
-        if (sPrevHeight != hgt || sPrevWidth != wdt)
-        {
-            if (fg)
-            {
-                delete[] fg;
-                fg = NULL;
-            }
-            sPrevWidth = wdt;
-            sPrevHeight = hgt;
-        }
-
-        if (!fg)
-        {
-            fg = new byte[wdt];
-            memset(fg, -1, wdt);
-            nC = 0;
-        }
-
-        int type = CV_r_showtimegraph;
-        float f;
-        float fScale;
-        if (type > 1)
-        {
-            type = 1;
-            fScale = (float)CV_r_showtimegraph / 1000.0f;
-        }
-        else
-        {
-            fScale = 0.1f;
-        }
-        f = frametime / fScale;
-        f = 255.0f - CLAMP(f * 255.0f, 0, 255.0f);
-        if (fg)
-        {
-            fg[nC] = (byte)f;
-            ColorF c = Col_Green;
-            Graph(fg, 0, hgt - 280, wdt, 256, nC, type, "Frame Time", c, fScale);
-        }
-        nC++;
-        if (nC >= wdt)
-        {
-            nC = 0;
-        }
-    }
-    else
-    if (CV_profileStreaming)
-    {
-        static byte* fgUpl;
-        static byte* fgStreamSync;
-        static byte* fgTimeUpl;
-        static byte* fgDistFact;
-        static byte* fgTotalMem;
-        static byte* fgCurMem;
-        static byte* fgStreamSystem;
-
-        static float fScaleUpl = 10;      // in Mb
-        static float fScaleStreamSync = 10;      // in Mb
-        static float fScaleTimeUpl = 75;      // in Ms
-        static float fScaleDistFact = 4;      // Ratio
-        static FLOAT fScaleTotalMem = 0;      // in Mb
-        static float fScaleCurMem = 80;       // in Mb
-        static float fScaleStreaming = 4;       // in Mb
-
-        static ColorF ColUpl = Col_White;
-        static ColorF ColStreamSync = Col_Cyan;
-        static ColorF ColTimeUpl = Col_SeaGreen;
-        static ColorF ColDistFact = Col_Orchid;
-        static ColorF ColTotalMem = Col_Red;
-        static ColorF ColCurMem = Col_Yellow;
-        static ColorF ColCurStream = Col_BlueViolet;
-
-        static int sMask = -1;
-
-        fScaleTotalMem = (float)CRenderer::GetTexturesStreamPoolSize() - 1;
-
-        static float fPrevTime = iTimer->GetCurrTime();
-        static int sPrevWidth = 0;
-        static int sPrevHeight = 0;
-        static int nC;
-
-        int wdt = m_width;
-        int hgt = m_height;
-        int type = 2;
-
-        if (sPrevHeight != hgt || sPrevWidth != wdt)
-        {
-            SAFE_DELETE_ARRAY(fgUpl);
-            SAFE_DELETE_ARRAY(fgStreamSync);
-            SAFE_DELETE_ARRAY(fgTimeUpl);
-            SAFE_DELETE_ARRAY(fgDistFact);
-            SAFE_DELETE_ARRAY(fgTotalMem);
-            SAFE_DELETE_ARRAY(fgCurMem);
-            SAFE_DELETE_ARRAY(fgStreamSystem);
-            sPrevWidth = wdt;
-            sPrevHeight = hgt;
-        }
-
-        if (!fgUpl)
-        {
-            fgUpl = new byte[wdt];
-            memset(fgUpl, -1, wdt);
-            fgStreamSync = new byte[wdt];
-            memset(fgStreamSync, -1, wdt);
-            fgTimeUpl = new byte[wdt];
-            memset(fgTimeUpl, -1, wdt);
-            fgDistFact = new byte[wdt];
-            memset(fgDistFact, -1, wdt);
-            fgTotalMem = new byte[wdt];
-            memset(fgTotalMem, -1, wdt);
-            fgCurMem = new byte[wdt];
-            memset(fgCurMem, -1, wdt);
-            fgStreamSystem = new byte[wdt];
-            memset(fgStreamSystem, -1, wdt);
-        }
-
-        TransformationMatrices backupSceneMatrices;
-        Set2DMode(m_width, m_height, backupSceneMatrices);
-
-        ColorF col = Col_White;
-        int num = CTextureManager::Instance()->GetWhiteTexture()->GetID();
-        DrawImage((float)nC, (float)(hgt - 280), 1, 256, num, 0, 0, 1, 1, col.r, col.g, col.b, col.a);
-
-        Unset2DMode(backupSceneMatrices);
-
-        // disable some statistics
-        sMask &= ~(1 | 2 | 4 | 8 | 64);
-
-        float f;
-        if (sMask & 1)
-        {
-            f = (BYTES_TO_MB(CTexture::s_nTexturesDataBytesUploaded)) / fScaleUpl;
-            f = 255.0f - CLAMP(f * 255.0f, 0, 255.0f);
-            fgUpl[nC] = (byte)f;
-            Graph(fgUpl, 0, hgt - 280, wdt, 256, nC, type, NULL, ColUpl, fScaleUpl);
-            col = ColUpl;
-            WriteXY(4, hgt - 280, 1, 1, col.r, col.g, col.b, 1, "UploadMB (%d-%d)", (int)(BYTES_TO_MB(CTexture::s_nTexturesDataBytesUploaded)), (int)fScaleUpl);
-        }
-
-        if (sMask & 2)
-        {
-            f = m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTexUploadTime / fScaleTimeUpl;
-            f = 255.0f - CLAMP(f * 255.0f, 0, 255.0f);
-            fgTimeUpl[nC] = (byte)f;
-            Graph(fgTimeUpl, 0, hgt - 280, wdt, 256, nC, type, NULL, ColTimeUpl, fScaleTimeUpl);
-            col = ColTimeUpl;
-            WriteXY(4, hgt - 280 + 16, 1, 1, col.r, col.g, col.b, 1, "Upload Time (%.3fMs - %.3fMs)", m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTexUploadTime, fScaleTimeUpl);
-        }
-
-        if (sMask & 4)
-        {
-            f = BYTES_TO_MB(CTexture::s_nTexturesDataBytesLoaded) / fScaleStreamSync;
-            f = 255.0f - CLAMP(f * 255.0f, 0, 255.0f);
-            fgStreamSync[nC] = (byte)f;
-            Graph(fgStreamSync, 0, hgt - 280, wdt, 256, nC, type, NULL, ColStreamSync, fScaleStreamSync);
-            col = ColStreamSync;
-            WriteXY(4, hgt - 280 + 16 * 2, 1, 1, col.r, col.g, col.b, 1, "StreamMB (%d-%d)", (int)BYTES_TO_MB(CTexture::s_nTexturesDataBytesLoaded), (int)fScaleStreamSync);
-        }
-
-        if (sMask & 32)
-        {
-            size_t pool = CTexture::s_nStatsStreamPoolInUseMem;
-            f = BYTES_TO_MB(pool) / fScaleTotalMem;
-            f = 255.0f - CLAMP(f * 255.0f, 0, 255.0f);
-            fgTotalMem[nC] = (byte)f;
-            Graph(fgTotalMem, 0, hgt - 280, wdt, 256, nC, type, NULL, ColTotalMem, fScaleTotalMem);
-            col = ColTotalMem;
-            WriteXY(4, hgt - 280 + 16 * 5, 1, 1, col.r, col.g, col.b, 1, "Streaming textures pool used (Mb) (%d of %d)", (int)BYTES_TO_MB(pool), (int)fScaleTotalMem);
-        }
-        if (sMask & 64)
-        {
-            f = (BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesSysMemSize + m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesStreamSysSize + m_RP.m_PS[m_RP.m_nProcessThreadID].m_DynTexturesSize)) / fScaleCurMem;
-            f = 255.0f - CLAMP(f * 255.0f, 0, 255.0f);
-            fgCurMem[nC] = (byte)f;
-            Graph(fgCurMem, 0, hgt - 280, wdt, 256, nC, type, NULL, ColCurMem, fScaleCurMem);
-            col = ColCurMem;
-            WriteXY(4, hgt - 280 + 16 * 6, 1, 1, col.r, col.g, col.b, 1, "Cur Scene Size: Dyn. + Stat. (Mb) (%d-%d)", (int)(BYTES_TO_MB(m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesSysMemSize + m_RP.m_PS[m_RP.m_nProcessThreadID].m_ManagedTexturesStreamSysSize + m_RP.m_PS[m_RP.m_nProcessThreadID].m_DynTexturesSize)), (int)fScaleCurMem);
-        }
-        if (sMask & 128)            // streaming stat
-        {
-            int nLineStep = 12;
-            static float thp = 0.f;
-
-            SStreamEngineStatistics& stats = gEnv->pSystem->GetStreamEngine()->GetStreamingStatistics();
-
-            float dt = 1.0f;    //max(stats.m_fDeltaTime / 1000, .00001f);
-
-            float newThp = (float)stats.nTotalCurrentReadBandwidth / 1024 / dt;
-            thp = (thp + min(1.f, dt / 5) * (newThp - thp));        // lerp
-
-            f = thp / (fScaleStreaming * 1024);
-            if (f > 1.f && !stats.vecHeavyAssets.empty())
-            {
-                for (int i = stats.vecHeavyAssets.size() - 1; i >= 0; --i)
-                {
-                    SStreamEngineStatistics::SAsset asset = stats.vecHeavyAssets[i];
-
-                    bool bPart = false;
-                    // remove texture mips extensions
-                    if (asset.m_sName.size() > 2 && asset.m_sName[asset.m_sName.size() - 2] == '.' &&
-                        asset.m_sName[asset.m_sName.size() - 1] >= '0' && asset.m_sName[asset.m_sName.size() - 1] <= '9')
-                    {
-                        asset.m_sName = asset.m_sName.substr(0, asset.m_sName.size() - 2);
-                        bPart = true;
-                    }
-
-                    // check for unique name
-                    uint32 j = 0;
-                    for (; j < vecStreamingProblematicAssets.size(); ++j)
-                    {
-                        if (vecStreamingProblematicAssets[j].m_sName.compareNoCase(asset.m_sName) == 0)
-                        {
-                            break;
-                        }
-                    }
-                    if (j == vecStreamingProblematicAssets.size())
-                    {
-                        vecStreamingProblematicAssets.insert(vecStreamingProblematicAssets.begin(), asset);
-                    }
-                    else if (bPart)
-                    {
-                        vecStreamingProblematicAssets[j].m_nSize = max(vecStreamingProblematicAssets[j].m_nSize, asset.m_nSize);        // else adding size to existing asset
-                    }
-                }
-                if (vecStreamingProblematicAssets.size() > 20)
-                {
-                    vecStreamingProblematicAssets.resize(20);
-                }
-                std::sort(vecStreamingProblematicAssets.begin(), vecStreamingProblematicAssets.end());      // sort by descending
-            }
-            f = 255.0f - CLAMP(f * 255.0f, 0, 255.0f);
-            fgStreamSystem[nC] = (byte)f;
-            Graph(fgStreamSystem, 0, hgt - 280, wdt, 256, nC, type, NULL, ColCurStream, fScaleStreaming);
-            col = ColCurStream;
-            WriteXY(4, hgt - 280 + 14 * 7, 1, 1, col.r, col.g, col.b, 1, "Streaming throughput (Kb/s) (%d of %d)", (int)thp, (int)fScaleStreaming * 1024);
-
-            // output assets
-            if (!vecStreamingProblematicAssets.empty())
-            {
-                int top = vecStreamingProblematicAssets.size() * nLineStep + 320;
-                WriteXY(4, hgt - top - nLineStep, 1, 1, col.r, col.g, col.b, 1, "Problematic assets:");
-                for (int i = vecStreamingProblematicAssets.size() - 1; i >= 0; --i)
-                {
-                    WriteXY(4, hgt - top + nLineStep * i, 1, 1, col.r, col.g, col.b, 1, "[%.1fKB] '%s'", BYTES_TO_KB(vecStreamingProblematicAssets[i].m_nSize), vecStreamingProblematicAssets[i].m_sName.c_str());
-                }
-            }
-        }
-        nC++;
-        if (nC == wdt)
-        {
-            nC = 0;
-        }
-    }
-    else
-    {
-        vecStreamingProblematicAssets.clear();
-    }
-
-    PostMeasureOverdraw();
-
-    DrawTexelsPerMeterInfo();
-
-    if (m_pColorGradingControllerD3D)
-    {
-        m_pColorGradingControllerD3D->DrawDebugInfo();
-    }
-
-    double time = 0;
-    ticks(time);
-
-    if (bRenderStats)
-    {
-        DebugDrawStats();
-    }
-
-    VidMemLog();
-
-    if (CV_r_profileshaders)
-    {
-        EF_PrintProfileInfo();
-    }
-
-    { // print shadow maps on the screen
-        static ICVar* pVar = iConsole->GetCVar("e_ShadowsDebug");
-        if (pVar && pVar->GetIVal() >= 1 && pVar->GetIVal() <= 2)
-        {
-            DrawAllShadowsOnTheScreen();
-        }
-    }
-#endif
-
-    if (CV_r_DeferredShadingDebug == 1 || CV_r_DeferredShadingDebug >= 3)
-    {
-        // Draw a custom RT list for deferred rendering
-        m_showRenderTargetInfo.Reset();
-        m_showRenderTargetInfo.bShowList = false;
-
-        SShowRenderTargetInfo::RT rt;
-        rt.bFiltered = false;
-        rt.bRGBKEncoded = false;
-        rt.bAliased = false;
-        rt.channelWeight = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-        m_showRenderTargetInfo.col = (CV_r_DeferredShadingDebug == 1 ? 2 : 1);
-
-        if (CV_r_DeferredShadingDebug == 1 || CV_r_DeferredShadingDebug == 3)
-        {
-            AZ_Assert(CTexture::s_ptexZTarget, "Z (depth) render target is NULL");
-            rt.textureID = CTexture::s_ptexZTarget->GetID();
-            rt.channelWeight = Vec4(10.0f, 10.0f, 10.0f, 1.0f);
-            m_showRenderTargetInfo.rtList.push_back(rt);
-        }
-        if (CV_r_DeferredShadingDebug == 1 || CV_r_DeferredShadingDebug == 4)
-        {
-            rt.channelWeight = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-            AZ_Assert(CTexture::s_ptexSceneNormalsMap, "Scene normals render target is NULL");
-            rt.textureID = CTexture::s_ptexSceneNormalsMap->GetID();
-            m_showRenderTargetInfo.rtList.push_back(rt);
-        }
-        // DiffuseAccuMap and SpecularAccMap are only calculated when CV_r_DeferredShadingTiled == 0 or 1.
-        if (CV_r_DeferredShadingTiled < 2)
-        {
-            if (CV_r_DeferredShadingDebug == 1 || CV_r_DeferredShadingDebug == 5)
-            {
-                AZ_Assert(CTexture::s_ptexCurrentSceneDiffuseAccMap, "Current scene diffuse accumulator render target is NULL");
-                rt.textureID = CTexture::s_ptexCurrentSceneDiffuseAccMap->GetID();
-                m_showRenderTargetInfo.rtList.push_back(rt);
-            }
-            if (CV_r_DeferredShadingDebug == 1 || CV_r_DeferredShadingDebug == 6)
-            {
-                AZ_Assert(CTexture::s_ptexSceneSpecularAccMap, "Current scene specular accumulator render target is NULL");
-                rt.textureID = CTexture::s_ptexSceneSpecularAccMap->GetID();
-                m_showRenderTargetInfo.rtList.push_back(rt);
-            }
-        }
-        DebugShowRenderTarget();
-        m_showRenderTargetInfo.rtList.clear();
-    }
-
-    if (CV_r_DeferredShadingDebugGBuffer >= 1 && CV_r_DeferredShadingDebugGBuffer <= 9)
-    {
-        m_showRenderTargetInfo.rtList.clear();
-        m_showRenderTargetInfo.bShowList = false;
-        m_showRenderTargetInfo.bDisplayTransparent = true;
-        m_showRenderTargetInfo.col = 1;
-
-        SShowRenderTargetInfo::RT rt;
-        rt.bFiltered = false;
-        rt.bRGBKEncoded = false;
-        rt.bAliased = false;
-        rt.channelWeight = Vec4(1.0f, 1.0f, 1.0f, 1.0f);
-
-        AZ_Assert(CTexture::s_ptexStereoR, "Right stereo render target is NULL");
-        rt.textureID = CTexture::s_ptexStereoR->GetID();
-        m_showRenderTargetInfo.rtList.push_back(rt);
-
-        DebugShowRenderTarget();
-        m_showRenderTargetInfo.rtList.clear();
-
-        const char* nameList[9] = { "Normals", "Smoothness", "Reflectance", "Albedo", "Lighting model", "Translucency", "Sun self-shadowing", "Subsurface Scattering", "Specular Validation" };
-        const char* descList[9] = {
-            "", "", "", "", "gray: standard -- yellow: transmittance -- blue: pom self-shadowing", "", "", "",
-            "blue: too low -- orange: too high and not yet metal -- pink: just valid for oxidized metal/rust"
-        };
-        WriteXY(10, 10, 1.0f, 1.0f, 0, 1, 0, 1, nameList[clamp_tpl(CV_r_DeferredShadingDebugGBuffer - 1, 0, 8)]);
-        WriteXY(10, 30, 0.85f, 0.85f, 0, 1, 0, 1, descList[clamp_tpl(CV_r_DeferredShadingDebugGBuffer - 1, 0, 8)]);
-    }
-
-    if (m_showRenderTargetInfo.bShowList)
-    {
-        iLog->Log("RenderTargets:\n");
-        for (size_t i = 0; i < m_showRenderTargetInfo.rtList.size(); ++i)
-        {
-            CTexture* pTex = CTexture::GetByID(m_showRenderTargetInfo.rtList[i].textureID);
-            if (pTex && pTex != CTextureManager::Instance()->GetNoTexture())
-            {
-                iLog->Log("\t%" PRISIZE_T "  %s\t--------------%s  %d x %d\n",  i, pTex->GetName(), pTex->GetFormatName(), pTex->GetWidth(), pTex->GetHeight());
-            }
-            else
-            {
-                iLog->Log("\t%" PRISIZE_T "  %d\t--------------(NOT AVAILABLE)\n", i, m_showRenderTargetInfo.rtList[i].textureID);
-            }
-        }
-
-        m_showRenderTargetInfo.Reset();
-    }
-    else if (m_showRenderTargetInfo.rtList.empty() == false)
-    {
-        DebugShowRenderTarget();
-    }
-
-    static char r_showTexture_prevString[256] = "";  // a wrokaround to reset the "??" command
-    // show custom texture
-    if (CV_r_ShowTexture)
-    {
-        const char* arg = CV_r_ShowTexture->GetString();
-
-        SetState(GS_NODEPTHTEST);
-        int iTmpX, iTmpY, iTempWidth, iTempHeight;
-        GetViewport(&iTmpX, &iTmpY, &iTempWidth, &iTempHeight);
-
-        TransformationMatrices backupSceneMatrices;
-        Set2DMode(1, 1, backupSceneMatrices);
-
-        char* endp;
-        int texId = strtol(arg, &endp, 10);
-
-        if (endp != arg)
-        {
-            CTexture* pTexToShow = CTexture::GetByID(texId);
-
-            if (pTexToShow)
-            {
-                RT_SetViewport(m_width - m_width / 3 - 10, m_height - m_height / 3 - 10, m_width / 3, m_height / 3);
-                DrawImage(0, 0, 1, 1, pTexToShow->GetID(), 0, 1, 1, 0, 1, 1, 1, 1, true);
-                WriteXY(10, 10, 1, 1, 1, 1, 1, 1, "Name: %s", pTexToShow->GetSourceName());
-                WriteXY(10, 25, 1, 1, 1, 1, 1, 1, "Fmt: %s, Type: %s", pTexToShow->GetFormatName(), CTexture::NameForTextureType(pTexToShow->GetTextureType()));
-                WriteXY(10, 40, 1, 1, 1, 1, 1, 1, "Size: %dx%dx%d", pTexToShow->GetWidth(), pTexToShow->GetHeight(), pTexToShow->GetDepth());
-                WriteXY(10, 40, 1, 1, 1, 1, 1, 1, "Size: %dx%d", pTexToShow->GetWidth(), pTexToShow->GetHeight());
-                WriteXY(10, 55, 1, 1, 1, 1, 1, 1, "Mips: %d", pTexToShow->GetNumMips());
-            }
-        }
-        else if (strlen(arg) == 2)
-        {
-            // Special cmd
-            if (strcmp(arg, "??") == 0)
-            {
-                // print all entries in the index book
-                iLog->Log("All entries:\n");
-
-                AUTO_LOCK(CBaseResource::s_cResLock);
-
-                const CCryNameTSCRC& resClass = CTexture::mfGetClassName();
-                const SResourceContainer* pRes = CBaseResource::GetResourcesForClass(resClass);
-                if (pRes)
-                {
-                    const size_t size = pRes->m_RList.size();
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        CTexture* pTex = (CTexture*) pRes->m_RList[i];
-                        if (pTex)
-                        {
-                            const char* pName = pTex->GetName();
-                            if (pName && !strchr(pName, '/'))
-                            {
-                                iLog->Log("\t%" PRISIZE_T " %s -- fmt: %s, dim: %d x %d\n", i, pName, pTex->GetFormatName(), pTex->GetWidth(), pTex->GetHeight());
-                            }
-                        }
-                    }
-                }
-
-                // reset after done  (revert to previous argument set)
-                CV_r_ShowTexture->ForceSet(r_showTexture_prevString);
-            }
-        }
-        else if (strlen(arg) > 2)
-        {
-            cry_strcpy(r_showTexture_prevString, arg);    // save argument set (for "??" processing)
-
-            CTexture* pTexToShow = CTexture::GetByName(arg);
-
-            if (pTexToShow)
-            {
-                RT_SetViewport(m_width - m_width / 3 - 10, m_height - m_height / 3 - 10, m_width / 3, m_height / 3);
-                DrawImage(0, 0, 1, 1, pTexToShow->GetID(), 0, 1, 1, 0, 1, 1, 1, 1, true);
-                WriteXY(10, 10, 1, 1, 1, 1, 1, 1, "Name: %s", pTexToShow->GetSourceName());
-                WriteXY(10, 25, 1, 1, 1, 1, 1, 1, "Fmt: %s, Type: %s", pTexToShow->GetFormatName(), CTexture::NameForTextureType(pTexToShow->GetTextureType()));
-                WriteXY(10, 40, 1, 1, 1, 1, 1, 1, "Size: %dx%dx%d", pTexToShow->GetWidth(), pTexToShow->GetHeight(), pTexToShow->GetDepth());
-                WriteXY(10, 40, 1, 1, 1, 1, 1, 1, "Size: %dx%d", pTexToShow->GetWidth(), pTexToShow->GetHeight());
-                WriteXY(10, 55, 1, 1, 1, 1, 1, 1, "Mips: %d", pTexToShow->GetNumMips());
-            }
-            else
-            {
-                // parse the arguments (use space as delimiter)
-                string nameListStr = arg;
-                char* nameListCh = (char*)nameListStr.c_str();
-
-                std::vector<string> nameList;
-                char* nextToken = nullptr;
-                char* p = azstrtok(nameListCh, 0, " ", &nextToken);
-                while (p)
-                {
-                    string s(p);
-                    s.Trim();
-                    if (s.length() > 0)
-                    {
-                        nameList.push_back(s);
-                    }
-                    p = azstrtok(NULL, 0, " ", &nextToken);
-                }
-
-                // render them in a tiled fashion
-                RT_SetViewport(0, 0, m_width, m_height);
-                const float tileW = 0.24f;
-                const float tileH = 0.24f;
-                const float tileGapW = 5.f / m_width;
-                const float tileGapH = 25.f / m_height;
-
-                const int maxTilesInRow = (int) ((1 - tileGapW) / (tileW + tileGapW));
-                for (size_t i = 0; i < nameList.size(); i++)
-                {
-                    CTexture* tex = CTexture::GetByName(nameList[i].c_str());
-                    if (!tex)
-                    {
-                        continue;
-                    }
-
-                    int row = i / maxTilesInRow;
-                    int col = i - row * maxTilesInRow;
-                    float curX = tileGapW + col * (tileW + tileGapW);
-                    float curY = tileGapH + row * (tileH + tileGapH);
-                    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);  // fix the state change by using WriteXY
-                    DrawImage(curX, curY, tileW, tileH, tex->GetID(),   0, 1, 1, 0, 1, 1, 1, 1, true);
-                    WriteXY((int)(curX * 800 + 2), (int)((curY + tileH) * 600 - 15), 1, 1, 1, 1, 1, 1, "Fmt: %s, Type: %s", tex->GetFormatName(), CTexture::NameForTextureType(tex->GetTextureType()));
-                    WriteXY((int)(curX * 800 + 2), (int)((curY + tileH) * 600 + 1), 1, 1, 1, 1, 1, 1, "%s   %d x %d", nameList[i].c_str(), tex->GetWidth(), tex->GetHeight());
-                }
-            }
-        }
-
-        RT_SetViewport(iTmpX, iTmpY, iTempWidth, iTempHeight);
-        Unset2DMode(backupSceneMatrices);
-    }
-
-    // print dyn. textures
-    {
-        static bool bWasOn = false;
-
-        if (CV_r_showdyntextures)
-        {
-            DrawAllDynTextures(CV_r_ShowDynTexturesFilter->GetString(), !bWasOn, CV_r_showdyntextures == 2);
-            bWasOn = true;
-        }
-        else
-        {
-            bWasOn = false;
-        }
-    }
-    // debug render listeners
-    {
-        for (TListRenderDebugListeners::iterator itr = m_listRenderDebugListeners.begin();
-             itr != m_listRenderDebugListeners.end();
-             ++itr)
-        {
-            (*itr)->OnDebugDraw();
-        }
-    }
-#endif//_RELEASE
-}
-
-void CD3D9Renderer::TryFlush()
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    //////////////////////////////////////////////////////////////////////
-    // End the scene and update
-    //////////////////////////////////////////////////////////////////////
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    m_pRT->RC_TryFlush();
-}
-
-void CD3D9Renderer::EndFrame()
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    //////////////////////////////////////////////////////////////////////
-    // End the scene and update
-    //////////////////////////////////////////////////////////////////////
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    EF_RenderTextMessages();
-
-    m_pRT->RC_EndFrame(!m_bStartLevelLoading);
-}
-
-static uint32 ComputePresentInterval(bool vsync, uint32 refreshNumerator, uint32 refreshDenominator)
-{
-    uint32 presentInterval = vsync ? 1 : 0;
-    if (vsync && refreshNumerator != 0 && refreshDenominator != 0)
-    {
-        ICVar* pSysMaxFPS = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_MaxFPS") : 0;
-        if (pSysMaxFPS)
-        {
-            const int32 maxFPS = pSysMaxFPS->GetIVal();
-            if (maxFPS > 0)
-            {
-                const float refreshRate = (float)refreshNumerator / refreshDenominator;
-                const float lockedFPS = maxFPS;
-                // presentInterval: how many vsync blanks between each presentation
-                // 0.1f is a magic number to compensate refreshRate is not exact 60 on hardware queried by FindClosestMatchingMode (for example: 59.99x)
-                presentInterval = (uint32) clamp_tpl((int) floorf(refreshRate / lockedFPS + 0.1f), 1, 4);
-            }
-        }
-    }
-    return presentInterval;
-};
-
-void CD3D9Renderer::RT_EndFrame()
-{
-    RT_EndFrame(false);
-}
-
-void CD3D9Renderer::RT_EndFrame(bool isLoading)
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    if (!m_SceneRecurseCount)
-    {
-        iLog->Log("EndScene without BeginScene\n");
-        return;
-    }
-
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    HRESULT hReturn = E_FAIL;
-
-    CTimeValue TimeEndF = iTimer->GetAsyncTime();
-
-    if (isLoading)
-    {
-        // Call loading-safe texture update which only applies the schedule. The render loading thread will handle the update.
-        CTexture::RT_LoadingUpdate();
-    }
-    else
-    {
-        CTexture::Update();
-    }
-
-    if (CV_r_VRAMDebug == 1)
-    {
-        m_DevMan.DisplayMemoryUsage();
-    }
-
-    if (m_CVDisplayInfo && m_CVDisplayInfo->GetIVal() && iSystem && iSystem->IsDevMode())
-    {
-        static const int nIconSize = 32;
-        int nIconIndex = 0;
-
-        FX_SetState(GS_NODEPTHTEST);
-
-        const Vec2 overscanOffset = Vec2(s_overscanBorders.x * VIRTUAL_SCREEN_WIDTH, s_overscanBorders.y * VIRTUAL_SCREEN_HEIGHT);
-
-        CTexture*   pDefTexture = CTextureManager::Instance()->GetDefaultTexture("IconShaderCompiling");
-        if (SShaderAsyncInfo::s_nPendingAsyncShaders > 0 && CV_r_shadersasynccompiling > 0 && pDefTexture)
-        {
-            Push2dImage(nIconSize * nIconIndex + overscanOffset.x, overscanOffset.y, nIconSize, nIconSize, pDefTexture->GetID(), 0, 1, 1, 0);
-        }
-
-        ++nIconIndex;
-
-        pDefTexture = CTextureManager::Instance()->GetDefaultTexture("IconStreaming");
-        if (CTexture::IsStreamingInProgress() && pDefTexture)
-        {
-            Push2dImage(nIconSize * nIconIndex + overscanOffset.x, overscanOffset.y, nIconSize, nIconSize, pDefTexture->GetID(), 0, 1, 1, 0);
-        }
-
-        ++nIconIndex;
-
-        ++nIconIndex;
-
-        Draw2dImageList();
-    }
-
-    m_prevCamera = m_RP.m_TI[m_RP.m_nProcessThreadID].m_cam;
-
-    m_nDisableTemporalEffects = max(0, m_nDisableTemporalEffects - 1);
-
-    //////////////////////////////////////////////////////////////////////////
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (m_pRenderAuxGeomD3D)
-    {
-        assert(1 == m_SceneRecurseCount);
-        // in case of MT rendering flush render thread CB is flashed (main thread CB gets flushed in SRenderThread::FlushFrame()),
-        // otherwise unified "main-render" tread CB is flashed
-
-        if (CAuxGeomCB* pAuxGeomCB = m_pRenderAuxGeomD3D->GetRenderAuxGeom())
-        {
-            pAuxGeomCB->Commit();
-        }
-
-        m_pRenderAuxGeomD3D->Process();
-    }
-#endif
-
-    FX_SetState(GS_NODEPTHTEST);
-
-    if (m_pPipelineProfiler)
-    {
-        m_pPipelineProfiler->EndFrame();
-    }
-
-    GetS3DRend().DisplayStereo();
-
-#ifdef DO_RENDERLOG
-    if (CRenderer::CV_r_log)
-    {
-        Logv(0, "******************************* EndFrame ********************************\n");
-    }
-#endif
-
-    m_SceneRecurseCount--;
-
-#if !defined(RELEASE)
-    if (m_DevMan.GetNumInvalidDrawcalls() > 0)
-    {
-        // If drawcalls are skipped although there are no pending shaders, something is going wrong
-        iLog->LogError("Renderer: Skipped %i drawcalls", m_DevMan.GetNumInvalidDrawcalls());
-    }
-#endif
-
-    gRenDev->m_DevMan.RT_Tick();
-
-    gRenDev->m_fRTTimeEndFrame = iTimer->GetAsyncTime().GetDifferenceInSeconds(TimeEndF);
-
-    // Update downscaled viewport
-    m_PrevViewportScale = m_CurViewportScale;
-    m_CurViewportScale = m_ReqViewportScale;
-
-    // debug modes that disable viewport downscaling for ease of use
-    AZ_PUSH_DISABLE_WARNING(, "-Wconstant-logical-operand")
-    if IsCVarConstAccess(constexpr) (CV_r_wireframe || CV_r_shownormals || CV_r_showtangents || CV_r_measureoverdraw)
-    AZ_POP_DISABLE_WARNING
-    {
-        m_CurViewportScale = Vec2(1, 1);
-    }
-
-    // will be overridden in RT_RenderScene by m_CurViewportScale
-    SetCurDownscaleFactor(Vec2(1, 1));
-
-    //assert (m_nRTStackLevel[0] == 0 && m_nRTStackLevel[1] == 0 && m_nRTStackLevel[2] == 0 && m_nRTStackLevel[3] == 0);
-    if (!m_bDeviceLost)
-    {
-        FX_Commit();
-    }
-
-    CTimeValue Time = iTimer->GetAsyncTime();
-
-    // Flip the back buffer to the front
-    if (m_bSwapBuffers)
-    {
-        if (IsEditorMode())
-        {
-            ResolveSupersampledBackbuffer();
-        }
-
-        CaptureFrameBuffer();
-
-        CaptureFrameBufferCallBack();
-
-        if (!IsEditorMode())
-        {
-#if !defined(SUPPORT_DEVICE_INFO)
-            if (gEnv && gEnv->pConsole)
-            {
-                static ICVar* pSysMaxFPS = gEnv->pConsole->GetCVar("sys_MaxFPS");
-                static ICVar* pVSync = gEnv->pConsole->GetCVar("r_Vsync");
-                if (pSysMaxFPS && pVSync)
-                {
-                    int32 maxFPS = pSysMaxFPS->GetIVal();
-                    uint32 vSync = pVSync->GetIVal();
-                    if (vSync != 0)
-                    {
-                        LimitFramerate(maxFPS, false);
-                    }
-                }
-            }
-#endif
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_10
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(SUPPORT_DEVICE_INFO)
-#if defined(WIN32) || defined(WIN64)
-            m_devInfo.EnforceFullscreenPreemption();
-    #ifdef CRY_INTEGRATE_DX12
-            m_devInfo.WaitForGPUFrames();
-    #endif
-
-#endif
-            DWORD syncInterval = ComputePresentInterval(m_devInfo.SyncInterval() != 0, m_devInfo.RefreshRate().Numerator, m_devInfo.RefreshRate().Denominator);
-            DWORD presentFlags = m_devInfo.PresentFlags();
-            hReturn = m_pSwapChain->Present(syncInterval, presentFlags);
-
-            if (DXGI_ERROR_DEVICE_RESET == hReturn)
-            {
-                CryFatalError("DXGI_ERROR_DEVICE_RESET");
-            }
-            else if (DXGI_ERROR_DEVICE_REMOVED == hReturn)
-            {
-                //CryFatalError("DXGI_ERROR_DEVICE_REMOVED");
-                HRESULT result = m_Device->GetDeviceRemovedReason();
-                switch (result)
-                {
-                case DXGI_ERROR_DEVICE_HUNG:
-                    CryFatalError("DXGI_ERROR_DEVICE_HUNG");
-                    break;
-                case DXGI_ERROR_DEVICE_REMOVED:
-                    CryFatalError("DXGI_ERROR_DEVICE_REMOVED");
-                    break;
-                case DXGI_ERROR_DEVICE_RESET:
-                    CryFatalError("DXGI_ERROR_DEVICE_RESET");
-                    break;
-                case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
-                    CryFatalError("DXGI_ERROR_DRIVER_INTERNAL_ERROR");
-                    break;
-                case DXGI_ERROR_INVALID_CALL:
-                    CryFatalError("DXGI_ERROR_INVALID_CALL");
-                    break;
-
-                default:
-                    CryFatalError("DXGI_ERROR_DEVICE_REMOVED");
-                    break;
-                }
-            }
-            else if (SUCCEEDED(hReturn))
-            {
-                m_dwPresentStatus = 0;
-            }
-
-            assert(m_nRTStackLevel[0] == 0);
-
-            m_pCurrentBackBufferIndex = GetCurrentBackBufferIndex(m_pSwapChain);
-            m_pBackBuffer = m_pBackBuffers[m_pCurrentBackBufferIndex];
-            FX_SetRenderTarget(0, m_pBackBuffer, nullptr, 0);
-            FX_SetActiveRenderTargets(true);
-#endif
-        }
-        else
-        {
-            ScaleBackbufferToViewport();
-
-#if DRIVERD3D_CPP_TRAIT_RT_ENDFRAME_NOTIMPL
-            CRY_ASSERT_MESSAGE(0, "Case in EndFrame() not implemented yet");
-#elif defined(SUPPORT_DEVICE_INFO)
-            DWORD dwFlags = 0;
-            if (m_dwPresentStatus & (epsOccluded | epsNonExclusive))
-            {
-                dwFlags = DXGI_PRESENT_TEST;
-            }
-            else
-            {
-                dwFlags = m_devInfo.PresentFlags();
-            }
-
-            if (m_CurrContext->m_pSwapChain)
-            {
-                hReturn = m_CurrContext->m_pSwapChain->Present(0, dwFlags);
-                if (hReturn == DXGI_ERROR_INVALID_CALL)
-                {
-                    assert(0);
-                }
-                else
-                if (DXGI_STATUS_OCCLUDED == hReturn)
-                {
-                    m_dwPresentStatus |= epsOccluded;
-                }
-                else
-                if (DXGI_ERROR_DEVICE_RESET == hReturn)
-                {
-                    CryFatalError("DXGI_ERROR_DEVICE_RESET");
-                }
-                else
-                if (DXGI_ERROR_DEVICE_REMOVED == hReturn)
-                {
-                    CryFatalError("DXGI_ERROR_DEVICE_REMOVED");
-                }
-                else
-                if (SUCCEEDED(hReturn))
-                {
-                    // Now that we're no longer occluded and the other app has gone non-exclusive
-                    // allow us to render again
-                    m_dwPresentStatus = 0;
-                }
-
-                m_CurrContext->m_pCurrentBackBufferIndex = GetCurrentBackBufferIndex(m_CurrContext->m_pSwapChain);
-                m_CurrContext->m_pBackBuffer = m_CurrContext->m_pBackBuffers[m_CurrContext->m_pCurrentBackBufferIndex];
-
-                assert(m_nRTStackLevel[0] == 0);
-
-                FX_SetRenderTarget(0, m_CurrContext->m_pBackBuffer, nullptr, 0);
-                FX_SetActiveRenderTargets(true);
-            }
-#endif
-        }
-        m_nFrameSwapID++;
-
-        m_pCurrentBackBufferIndex = GetCurrentBackBufferIndex(m_pSwapChain);
-        m_pBackBuffer = m_pBackBuffers[m_pCurrentBackBufferIndex];
-        FX_SetRenderTarget(0, m_pBackBuffer, &m_DepthBufferNative);
-    }
-
-    {
-        if (CV_r_flush > 0 && CV_r_minimizeLatency > 0)
-        {
-            FlushHardware(false);
-        }
-    }
-
-    CheckDeviceLost();
-    //disable screenshot code path for pure release builds on consoles
-#if !defined(_RELEASE) || defined(WIN32) || defined(WIN64) || defined(ENABLE_LW_PROFILERS)
-    if (CV_r_GetScreenShot && m_CurrContext->m_bMainViewport)
-    {
-        if (CV_r_GetScreenShot == static_cast<int>(ScreenshotType::NormalToBuffer))
-        {
-            ScreenShot();
-        }
-        else if (CV_r_GetScreenShot == static_cast<int>(ScreenshotType::NormalWithFilepath))
-        {
-            ScreenShot(m_screenshotFilepathCache);
-        }
-        else
-        {
-            ScreenShot(nullptr);
-        }
-        CV_r_GetScreenShot = static_cast<int>(ScreenshotType::None);
-    }
-#endif
-#ifndef CONSOLE_CONST_CVAR_MODE
-    if (m_wireframe_mode != m_wireframe_mode_prev)
-    {
-        if (m_wireframe_mode > R_SOLID_MODE) // disable zpass in wireframe mode
-        {
-            if (m_wireframe_mode_prev == R_SOLID_MODE)
-            {
-                m_nUseZpass = CV_r_usezpass;
-                CV_r_usezpass = 0;
-            }
-        }
-        else
-        {
-            CV_r_usezpass = m_nUseZpass;
-        }
-    }
-#endif
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_logTexStreaming)
-    {
-        LogStrv(0, "******************************* EndFrame ********************************\n");
-        LogStrv(0, "Loaded: %.3f Kb, UpLoaded: %.3f Kb, UploadTime: %.3fMs\n\n", BYTES_TO_KB(CTexture::s_nTexturesDataBytesLoaded), BYTES_TO_KB(CTexture::s_nTexturesDataBytesUploaded), m_RP.m_PS[m_RP.m_nProcessThreadID].m_fTexUploadTime);
-    }
-
-    if (!m_2dImages.empty())
-    {
-        m_2dImages.resize(0);
-        assert(0);
-    }
-
-    /*if (CTexture::s_nTexturesDataBytesLoaded > 3.0f*1024.0f*1024.0f)
-      CTexture::m_fStreamDistFactor = min(2048.0f, CTexture::m_fStreamDistFactor*1.2f);
-    else
-      CTexture::m_fStreamDistFactor = max(1.0f, CTexture::m_fStreamDistFactor/1.2f);*/
-    CTexture::s_nTexturesDataBytesUploaded = 0;
-    CTexture::s_nTexturesDataBytesLoaded = 0;
-
-    m_wireframe_mode_prev = m_wireframe_mode;
-
-    m_SceneRecurseCount++;
-
-    // we render directly to a video memory buffer
-    // we need to unlock it here in case we renderered a frame without any particles
-    // lock the VMEM buffer for the next frame here (to prevent a lock in the mainthread)
-    // NOTE: main thread is already working on buffer+1 and we want to prepare the next one => hence buffer+2
-    gRenDev->LockParticleVideoMemory((gRenDev->m_nPoolIndexRT + (SRenderPipeline::nNumParticleVertexIndexBuffer - 1)) % SRenderPipeline::nNumParticleVertexIndexBuffer);
-
-    m_fTimeWaitForGPU[m_RP.m_nProcessThreadID] += iTimer->GetAsyncTime().GetDifferenceInSeconds(Time);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_11
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    m_fTimeGPUIdlePercent[m_RP.m_nProcessThreadID] = 0;
-
-  #if !defined(ENABLE_PROFILING_GPU_TIMERS)
-    // BK: We need a way of getting gpu frame time in release, without gpu timers
-    // for now we just use overall frame time
-    m_fTimeProcessedGPU[m_RP.m_nProcessThreadID] = m_fTimeProcessedRT[m_RP.m_nProcessThreadID];
-  #else
-    RPProfilerStats profileStats = m_pPipelineProfiler->GetBasicStats(eRPPSTATS_OverallFrame, m_RP.m_nProcessThreadID);
-    m_fTimeProcessedGPU[m_RP.m_nProcessThreadID] = profileStats.gpuTime / 1000.0f;
-  #endif
-#endif
-
-#if defined(USE_GEOM_CACHES)
-    if (m_SceneRecurseCount == 1)
-    {
-        CREGeomCache::UpdateModified();
-    }
-#endif
-
-#if defined(OPENGL) && !defined(CRY_USE_METAL)
-    DXGLIssueFrameFences(&GetDevice());
-#endif //defined(OPENGL)
-
-    // Note: Please be aware that the below has to be called AFTER the xenon texturemanager performs
-    // Note: Please be aware that the below has to be called AFTER the texturemanager performs
-    // it's garbage collection because a scheduled gpu copy might be pending
-    // touching the memory that will be reclaimed below.
-    m_DevBufMan.ReleaseEmptyBanks(m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameUpdateID);
-}
-
-void CD3D9Renderer::RT_PresentFast()
-{
-    HRESULT hReturn = S_OK;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_12
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(SUPPORT_DEVICE_INFO)
-
-    GetS3DRend().DisplayStereo();
-#if defined(WIN32) || defined(WIN64)
-    m_devInfo.EnforceFullscreenPreemption();
-#endif
-    DWORD syncInterval = m_devInfo.SyncInterval();
-    DWORD presentFlags = m_devInfo.PresentFlags();
-    hReturn = m_pSwapChain->Present(syncInterval, presentFlags);
-#endif
-    assert(hReturn == S_OK);
-
-    m_pCurrentBackBufferIndex = GetCurrentBackBufferIndex(m_pSwapChain);
-    m_pBackBuffer = m_pBackBuffers[m_pCurrentBackBufferIndex];
-
-    assert(m_nRTStackLevel[0] == 0);
-
-    FX_ClearTarget(m_pBackBuffer, Clr_Transparent, 0, nullptr);
-    FX_SetRenderTarget(0, m_pBackBuffer, nullptr, 0);
-    FX_SetActiveRenderTargets(true);
-
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_nFrameUpdateID++;
-}
-
-void CD3D9Renderer::WriteScreenshotToFile(const char* filepath)
-{
-    CV_r_GetScreenShot = static_cast<int>(ScreenshotType::NormalWithFilepath);
-    // If filepath is a nullptr, m_screenshotFilepathCache will be empty string.
-    cry_strcpy(m_screenshotFilepathCache, filepath);
-}
-
-void CD3D9Renderer::WriteScreenshotToBuffer()
-{
-    CV_r_GetScreenShot = static_cast<int>(ScreenshotType::NormalToBuffer);
-}
-
-bool CD3D9Renderer::CopyScreenshotToBuffer(unsigned char* imageBuffer, unsigned int width, unsigned int height)
-{
-    AZ_Assert(m_frameBufDesc, "Frame Buffer Description is nullptr");
-    AZ_Assert(imageBuffer, "Image Buffer is nullptr");
-
-    if (!(m_frameBufDesc->pDest))
-    {
-        return false;
-    }
-
-    if ((width != m_frameBufDesc->backBufferDesc.Width) || (height != m_frameBufDesc->backBufferDesc.Height))
-    {
-        return false;
-    }
-
-    memcpy(imageBuffer, m_frameBufDesc->pDest, m_frameBufDesc->texSize);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CD3D9Renderer::ScreenShotInternal([[maybe_unused]] const char* filename, [[maybe_unused]] int iPreWidth)
-{
-    // ignore invalid file access for screenshots
-    CDebugAllowFileAccess ignoreInvalidFileAccess;
-
-#if !defined(_RELEASE) || defined(WIN32) || defined(WIN64) || defined(ENABLE_LW_PROFILERS)
-    if (m_pRT && !m_pRT->IsRenderThread())
-    {
-        m_pRT->FlushAndWait();
-    }
-
-    if (!gEnv || !gEnv->pSystem || gEnv->pSystem->IsQuitting() || gEnv->bIsOutOfMemory)
-    {
-        return false;
-    }
-
-    char path[AZ::IO::IArchive::MaxPath];
-
-    path[sizeof(path) - 1] = 0;
-    gEnv->pCryPak->AdjustFileName(filename != 0 ? filename : "@user@/ScreenShots", path, AZ_ARRAY_SIZE(path), AZ::IO::IArchive::FLAGS_PATH_REAL | AZ::IO::IArchive::FLAGS_FOR_WRITING);
-
-    if (!filename)
-    {
-        size_t pathLen = strlen(path);
-        const char* pSlash = (!pathLen || path[pathLen - 1] == '/' || path[pathLen - 1] == '\\') ? "" : "/";
-
-        int i = 0;
-        for (; i < 10000; i++)
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_13
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            snprintf(&path[pathLen], sizeof(path) - 1 - pathLen, "%sScreenShot%04d.jpg", pSlash, i);
-#endif
-            // HACK
-            // CaptureFrameBufferToFile must be fixed for 64-bit stereo screenshots
-            if (GetS3DRend().IsStereoEnabled())
-            {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_14
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-                snprintf(&path[pathLen], sizeof(path) - 1 - pathLen, "%sScreenShot%04d_L.jpg", pSlash, i);
-#endif
-            }
-
-            AZ::IO::HandleType fileHandle = fxopen(path, "rb");
-            if (fileHandle == AZ::IO::InvalidHandle)
-            {
-                break; // file doesn't exist
-            }
-
-            gEnv->pFileIO->Close(fileHandle);
-        }
-
-        // HACK: DONT REMOVE Stereo3D will add _L and _R suffix later
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_15
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        snprintf(&path[pathLen], sizeof(path) - 1 - pathLen, "%sScreenShot%04d.jpg", pSlash, i);
-#endif
-
-        if (i == 10000)
-        {
-            iLog->Log("Cannot save screen shot! Too many files.");
-            return false;
-        }
-    }
-
-    if (!gEnv->pCryPak->MakeDir(PathUtil::GetParentDirectory(path).c_str()))
-    {
-        iLog->Log("Cannot save screen shot! Failed to create directory \"%s\".", path);
-        return false;
-    }
-
-    // Log some stats
-    // -----------------------------------
-    iLog->LogWithType(ILog::eInputResponse, " ");
-    iLog->LogWithType(ILog::eInputResponse, "Screenshot: %s", path);
-    gEnv->pConsole->ExecuteString("goto");  // output position and angle, can be used with "goto" command from console
-
-    iLog->LogWithType(ILog::eInputResponse, " ");
-    iLog->LogWithType(ILog::eInputResponse, "$5Drawcalls: %d", gEnv->pRenderer->GetCurrentNumberOfDrawCalls());
-    iLog->LogWithType(ILog::eInputResponse, "$5FPS: %.1f (%.1f ms)", gEnv->pTimer->GetFrameRate(), gEnv->pTimer->GetFrameTime() * 1000.0f);
-
-    int nPolygons, nShadowVolPolys;
-    GetPolyCount(nPolygons, nShadowVolPolys);
-    iLog->LogWithType(ILog::eInputResponse, "Tris: %2d,%03d", nPolygons / 1000, nPolygons % 1000);
-
-    int nStreamCgfPoolSize = -1;
-    ICVar* pVar = gEnv->pConsole->GetCVar("e_StreamCgfPoolSize");
-    if (pVar)
-    {
-        nStreamCgfPoolSize = pVar->GetIVal();
-    }
-
-    if (gEnv->p3DEngine)
-    {
-        I3DEngine::SObjectsStreamingStatus objectsStreamingStatus;
-        gEnv->p3DEngine->GetObjectsStreamingStatus(objectsStreamingStatus);
-        iLog->LogWithType(ILog::eInputResponse, "CGF streaming: Loaded:%d InProg:%d All:%d Act:%d MemUsed:%2.2f MemReq:%2.2f PoolSize:%d",
-            objectsStreamingStatus.nReady, objectsStreamingStatus.nInProgress, objectsStreamingStatus.nTotal, objectsStreamingStatus.nActive, BYTES_TO_MB(objectsStreamingStatus.nAllocatedBytes), BYTES_TO_MB(objectsStreamingStatus.nMemRequired), nStreamCgfPoolSize);
-    }
-
-    STextureStreamingStats stats(false);
-    EF_Query(EFQ_GetTexStreamingInfo, stats);
-    const int iPercentage = int((float)stats.nCurrentPoolSize / stats.nMaxPoolSize * 100.f);
-    iLog->LogWithType(ILog::eInputResponse, "TexStreaming: MemUsed:%.2fMB(%d%%%%) PoolSize:%2.2fMB Trghput:%2.2fKB/s", BYTES_TO_MB(stats.nCurrentPoolSize), iPercentage, BYTES_TO_MB(stats.nMaxPoolSize), BYTES_TO_KB(stats.nThroughput));
-
-    gEnv->pConsole->ExecuteString("sys_RestoreSpec test*");     // to get useful debugging information about current spec settings to the log file
-    iLog->LogWithType(ILog::eInputResponse, " ");
-
-    if (GetS3DRend().IsStereoEnabled())
-    {
-        GetS3DRend().TakeScreenshot(path);
-        return true;
-    }
-
-    return CaptureFrameBufferToFile(path);
-
-#else
-
-    return true;
-
-#endif//_RELEASE
-}
-
-bool CD3D9Renderer::ScreenShot(const char* filename, int iPreWidth)
-{
-#if defined(AZ_PLATFORM_LINUX)
-    // TODO Linux: Development hack for the time being.
-    // The screenshot system works with absolute paths, which crypak tries to lower case by default.
-    // This breaks any root paths that have upper case letters.
-    // There are many path casing issues though, so somewhere we are probably missing some code to handle this properly on linux.
-    // Ensure we preserve all file casing for the screenshot system to work properly.
-    ICVar* pCaseSensitivityCVar = gEnv->pConsole->GetCVar("sys_FilesystemCaseSensitivity");
-    int previousCasingValue = 0;
-    if (pCaseSensitivityCVar)
-    {
-        previousCasingValue = pCaseSensitivityCVar->GetIVal();
-        pCaseSensitivityCVar->Set(1);
-    }
-    bool res = ScreenShotInternal(filename, iPreWidth);
-
-    if (pCaseSensitivityCVar)
-    {
-        pCaseSensitivityCVar->Set(previousCasingValue);
-    }
-    return res;
-#else
-    return ScreenShotInternal(filename, iPreWidth);
-#endif
-}
-
-bool CD3D9Renderer::ScreenShot()
-{
-    FrameBufferDescription frameBufDesc;
-    m_frameBufDesc = &frameBufDesc;  //set the pointer so GetScreenshot has access later
-
-    bool framePrepSuccessful = PrepFrameCapture(frameBufDesc);
-
-    if (!framePrepSuccessful)
-    {
-        return false;
-    }
-
-    FillFrameBuffer(frameBufDesc, false);
-
-    AZ::RenderScreenshotNotificationBus::Broadcast(&AZ::RenderScreenshotNotifications::OnScreenshotReady);
-
-    m_frameBufDesc = nullptr;
-
-    return true;
-}
-
-int CD3D9Renderer::CreateRenderTarget(const char* name, int nWidth, int nHeight, const ColorF& clearColor, ETEX_Format eTF)
-{
-    // check if parameters are valid
-    if (!nWidth || !nHeight)
-    {
-        return -1;
-    }
-
-    const int maxTextureSize = GetMaxTextureSize();
-    if (maxTextureSize > 0 && (nWidth > maxTextureSize || nHeight > maxTextureSize))
-    {
-        return -1;
-    }
-
-    CTexture* pTex = CTexture::CreateRenderTarget(name, nWidth, nHeight, clearColor, eTT_2D, FT_NOMIPS, eTF);
-
-    return pTex->GetID();
-}
-
-bool CD3D9Renderer::DestroyRenderTarget(int nHandle)
-{
-    CTexture* pTex = CTexture::GetByID(nHandle);
-    SAFE_RELEASE(pTex);
-    return true;
-}
-
-bool CD3D9Renderer::ResizeRenderTarget(int nHandle, int nWidth, int nHeight)
-{
-    // check if parameters are valid
-    if (!nWidth || !nHeight)
-    {
-        return false;
-    }
-
-    const int maxTextureSize = GetMaxTextureSize();
-    if (maxTextureSize > 0 && (nWidth > maxTextureSize || nHeight > maxTextureSize))
-    {
-        return false;
-    }
-    
-    CTexture* pTex = CTexture::GetByID(nHandle);
-    if (!pTex || !(pTex->GetFlags() & FT_USAGE_RENDERTARGET))
-    {
-        return false;
-    }    
-    m_pRT->EnqueueRenderCommand(
-        [nHandle, nWidth, nHeight]() mutable 
-        {
-            CTexture* pTex = CTexture::GetByID(nHandle);
-            if (pTex && pTex->GetFlags() & FT_USAGE_RENDERTARGET)
-            {
-                pTex->SetWidth(nWidth);
-                pTex->SetHeight(nHeight);
-                pTex->CreateRenderTarget(pTex->GetDstFormat(), pTex->GetClearColor());
-            }
-        });
-
-    return true;
-}
-
-bool CD3D9Renderer::SetRenderTarget(int nHandle, SDepthTexture* pDepthSurf)
-{
-    if (nHandle == 0)
-    {
-        // Check: Restore not working
-        m_pRT->RC_PopRT(0);
-        return true;
-    }
-
-    CTexture* pTex = CTexture::GetByID(nHandle);
-    if (!pTex)
-    {
-        return false;
-    }
-
-    m_pRT->RC_PushRT(0, pTex, pDepthSurf, -1);
-
-    return true;
-}
-
-SDepthTexture* CD3D9Renderer::CreateDepthSurface(int nWidth, int nHeight, bool shaderResourceView)
-{
-    SDepthTexture* pDepthTexture = new SDepthTexture;
-    pDepthTexture->nWidth = nWidth;
-    pDepthTexture->nHeight = nHeight;
-
-    m_pRT->EnqueueRenderCommand([this, pDepthTexture, shaderResourceView]() 
-    {
-        AZ_TRACE_METHOD_NAME("CreateDepthSurface");
-
-        D3D11_TEXTURE2D_DESC descDepth;
-        ZeroStruct(descDepth);
-        descDepth.Width = pDepthTexture->nWidth;
-        descDepth.Height = pDepthTexture->nHeight;
-        descDepth.MipLevels = 1;
-        descDepth.ArraySize = 1;
-        descDepth.Format = shaderResourceView ? m_ZFormat : CTexture::ConvertToDepthStencilFmt(m_ZFormat);;
-        descDepth.SampleDesc.Count = 1;
-        descDepth.SampleDesc.Quality = 0;
-        descDepth.Usage = D3D11_USAGE_DEFAULT;
-        descDepth.BindFlags = shaderResourceView ? D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE : D3D11_BIND_DEPTH_STENCIL;
-        descDepth.CPUAccessFlags = 0;
-        descDepth.MiscFlags = 0;
-
-        const float clearDepth = (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 0.f : 1.f;
-        const uint clearStencil = 0;
-        const FLOAT clearValues[4] = { clearDepth, FLOAT(clearStencil) };
-
-        HRESULT hr = gcpRendD3D->m_DevMan.CreateD3D11Texture2D(&descDepth, clearValues, nullptr, &pDepthTexture->pTarget, "TempDepthBuffer");
-        if (hr == S_OK)
-        {
-            D3D11_DEPTH_STENCIL_VIEW_DESC descDSV;
-            ZeroStruct(descDSV);
-            descDSV.Format = CTexture::ConvertToDepthStencilFmt(m_ZFormat);
-            descDSV.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
-            descDSV.Texture2D.MipSlice = 0;
-
-            // Create the depth stencil view
-            hr = GetDevice().CreateDepthStencilView(pDepthTexture->pTarget, &descDSV, &pDepthTexture->pSurf);
-            if (hr == S_OK)
-            {
-#if !defined(RELEASE) && defined(WIN64)
-                pDepthTexture->pTarget->SetPrivateData(WKPDID_D3DDebugObjectName, strlen("Dynamically requested Depth-Buffer"), "Dynamically requested Depth-Buffer");
-#endif
-                const float clearValue = (gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 0.f : 1.f;
-                GetDeviceContext().ClearDepthStencilView(pDepthTexture->pSurf, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, clearValue, 0);
-            }
-        }
-        else
-        {
-            AZ_Assert(false, "Failed to create temporary 2D depth buffer during depth surface resource creation.");
-        }
-    });
-
-    return pDepthTexture;
-}
-
-void CD3D9Renderer::DestroyDepthSurface(SDepthTexture* pDepthTexture)
-{
-    if (pDepthTexture)
-    {
-        m_pRT->EnqueueRenderCommand([=]() mutable 
-        {
-            // passing in true indicates we want to release the associated texture resource as well 
-            pDepthTexture->Release(true);
-            SAFE_DELETE(pDepthTexture);
-        });
-    }
-}
-
-void CD3D9Renderer::ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX, int nScaledY)
-{
-    m_pRT->RC_ReadFrameBuffer(pRGB, nImageX, nSizeX, nSizeY, eRBType, bRGBA, nScaledX, nScaledY);
-}
-
-void CD3D9Renderer::RT_ReadFrameBuffer([[maybe_unused]] unsigned char* pRGB, [[maybe_unused]] int nImageX, [[maybe_unused]] int nSizeX, [[maybe_unused]] int nSizeY, [[maybe_unused]] ERB_Type eRBType, [[maybe_unused]] bool bRGBA, [[maybe_unused]] int nScaledX, [[maybe_unused]] int nScaledY)
-{
-    #if defined(USE_D3DX) && defined (WIN32) && !defined(OPENGL)
-    if (!pRGB || nImageX <= 0 || nSizeX <= 0 || nSizeY <= 0 || eRBType != eRB_BackBuffer)
-    {
-        return;
-    }
-
-    assert(m_pBackBuffer);
-    assert(!IsEditorMode() || m_CurrContext->m_pBackBuffer == m_pBackBuffer);
-
-    ID3D11Texture2D* pBackBufferTex(0);
-
-    D3D11_RENDER_TARGET_VIEW_DESC bbDesc;
-    m_pBackBuffer->GetDesc(&bbDesc);
-    if (bbDesc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DMS)
-    {
-        // TODO: resolve
-    }
-
-    m_pBackBuffer->GetResource((ID3D11Resource**) &pBackBufferTex);
-    if (pBackBufferTex)
-    {
-        D3D11_TEXTURE2D_DESC dstDesc;
-        dstDesc.Width = nScaledX <= 0 ? nSizeX : nScaledX;
-        dstDesc.Height = nScaledY <= 0 ? nSizeY : nScaledY;
-        dstDesc.MipLevels = 1;
-        dstDesc.ArraySize = 1;
-        dstDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        dstDesc.SampleDesc.Count = 1;
-        dstDesc.SampleDesc.Quality = 0;
-        dstDesc.Usage = D3D11_USAGE_STAGING;
-        dstDesc.BindFlags = 0;
-        dstDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ /* | D3D11_CPU_ACCESS_WRITE*/;
-        dstDesc.MiscFlags = 0;
-
-        ID3D11Texture2D* pDstTex(0);
-        if (SUCCEEDED(GetDevice().CreateTexture2D(&dstDesc, 0, &pDstTex)))
-        {
-            D3D11_BOX srcBox;
-            srcBox.left = 0;
-            srcBox.right = nSizeX;
-            srcBox.top = 0;
-            srcBox.bottom = nSizeY;
-            srcBox.front = 0;
-            srcBox.back = 1;
-
-            D3D11_BOX dstBox;
-            dstBox.left = 0;
-            dstBox.right = dstDesc.Width;
-            dstBox.top = 0;
-            dstBox.bottom = dstDesc.Height;
-            dstBox.front = 0;
-            dstBox.back = 1;
-
-            D3DX11_TEXTURE_LOAD_INFO loadInfo;
-            loadInfo.pSrcBox = &srcBox;
-            loadInfo.pDstBox = &dstBox;
-            loadInfo.SrcFirstMip = 0;
-            loadInfo.DstFirstMip = 0;
-            loadInfo.NumMips = 1;
-            loadInfo.SrcFirstElement = D3D11CalcSubresource(0, 0, 1);
-            loadInfo.DstFirstElement = D3D11CalcSubresource(0, 0, 1);
-            loadInfo.NumElements  = 0;
-            loadInfo.Filter = D3DX11_FILTER_LINEAR;
-            loadInfo.MipFilter = D3DX11_FILTER_LINEAR;
-
-            if (SUCCEEDED(D3DX11LoadTextureFromTexture(&GetDeviceContext(), pBackBufferTex, &loadInfo, pDstTex)))
-            {
-                D3D11_MAPPED_SUBRESOURCE mappedTex;
-                STALL_PROFILER("lock/read texture")
-                if (SUCCEEDED(GetDeviceContext().Map(pDstTex, 0, D3D11_MAP_READ, 0, &mappedTex)))
-                {
-                    if (bRGBA)
-                    {
-                        for (unsigned int i = 0; i < dstDesc.Height; ++i)
-                        {
-                            uint8* pSrc((uint8*)mappedTex.pData + i* mappedTex.RowPitch);
-                            uint8* pDst((uint8*)pRGB + (dstDesc.Height - 1 - i) * nImageX * 4);
-                            for (unsigned int j = 0; j < dstDesc.Width; ++j, pSrc += 4, pDst += 4)
-                            {
-                                pDst[0] = pSrc[2];
-                                pDst[1] = pSrc[1];
-                                pDst[2] = pSrc[0];
-                                pDst[3] = 255;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        for (unsigned int i = 0; i < dstDesc.Height; ++i)
-                        {
-                            uint8* pSrc((uint8*)mappedTex.pData + i* mappedTex.RowPitch);
-                            uint8* pDst((uint8*)pRGB + (dstDesc.Height - 1 - i) * nImageX * 3);
-                            for (unsigned int j = 0; j < dstDesc.Width; ++j, pSrc += 4, pDst += 3)
-                            {
-                                pDst[0] = pSrc[2];
-                                pDst[1] = pSrc[1];
-                                pDst[2] = pSrc[0];
-                            }
-                        }
-                    }
-                    GetDeviceContext().Unmap(pDstTex, 0);
-                }
-            }
-        }
-        SAFE_RELEASE(pDstTex);
-    }
-    SAFE_RELEASE(pBackBufferTex);
-#endif
-}
-
-void CD3D9Renderer::ReadFrameBufferFast(uint32* pDstARGBA8, int dstWidth, int dstHeight, [[maybe_unused]] bool BGRA)
-{
-    if (!pDstARGBA8 || dstWidth <= 0 || dstHeight <= 0)
-    {
-        return;
-    }
-
-#if defined (AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_MAC)
-    gRenDev->ForceFlushRTCommands();
-    assert(m_pBackBuffer);
-
-    D3D11_RENDER_TARGET_VIEW_DESC bbDesc;
-    m_pBackBuffer->GetDesc(&bbDesc);
-    if (bbDesc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DMS)
-    {
-        return;
-    }
-
-    ID3D11Texture2D* pBackBufferTex(0);
-    m_pBackBuffer->GetResource((ID3D11Resource**)&pBackBufferTex);
-    if (pBackBufferTex)
-    {
-        D3D11_TEXTURE2D_DESC dstDesc;
-        dstDesc.Width = dstWidth > GetWidth() ? GetWidth() : dstWidth;
-        dstDesc.Height = dstHeight > GetHeight() ? GetHeight() : dstHeight;
-        dstDesc.MipLevels = 1;
-        dstDesc.ArraySize = 1;
-        dstDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        dstDesc.SampleDesc.Count = 1;
-        dstDesc.SampleDesc.Quality = 0;
-        dstDesc.Usage = D3D11_USAGE_STAGING;
-        dstDesc.BindFlags = 0;
-        dstDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ /* | D3D11_CPU_ACCESS_WRITE*/;
-        dstDesc.MiscFlags = 0;
-
-        ID3D11Texture2D* pDstTex(0);
-        if (SUCCEEDED(GetDevice().CreateTexture2D(&dstDesc, 0, &pDstTex)))
-        {
-            D3D11_TEXTURE2D_DESC srcDesc;
-            pBackBufferTex->GetDesc(&srcDesc);
-
-            D3D11_BOX srcBox;
-            srcBox.left = 0;
-            srcBox.right = dstDesc.Width;
-            srcBox.top = 0;
-            srcBox.bottom = dstDesc.Height;
-            srcBox.front = 0;
-            srcBox.back = 1;
-
-            GetDeviceContext().CopySubresourceRegion(pDstTex, 0, 0, 0, 0, pBackBufferTex, 0, &srcBox);
-
-            D3D11_MAPPED_SUBRESOURCE mappedTex;
-            STALL_PROFILER("lock/read texture")
-            if (SUCCEEDED(GetDeviceContext().Map(pDstTex, 0, D3D11_MAP_READ, 0, &mappedTex)))
-            {
-                for (unsigned int i = 0; i < dstDesc.Height; ++i)
-                {
-                    uint8* pSrc((uint8*)mappedTex.pData + i* mappedTex.RowPitch);
-                    uint8* pDst((uint8*)pDstARGBA8 + i* dstWidth * 4);
-                    for (unsigned int j = 0; j < dstDesc.Width; ++j, pSrc += 4, pDst += 4)
-                    {
-                        //If BGRA was asked for swap Blue and Red components
-                        if (BGRA)
-                        {
-                            pDst[0] = pSrc[2];
-                            pDst[1] = pSrc[1];
-                            pDst[2] = pSrc[0];
-                        }
-                        else
-                        {
-                            pDst[0] = pSrc[0];
-                            pDst[1] = pSrc[1];
-                            pDst[2] = pSrc[2];
-                        }
-                        pDst[3] = 255;
-                    }
-                }
-                GetDeviceContext().Unmap(pDstTex, 0);
-            }
-        }
-        SAFE_RELEASE(pDstTex);
-    }
-    SAFE_RELEASE(pBackBufferTex);
-#endif
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// This routine initializes 2 destination surfaces for use by the CaptureFrameBufferFast routine
-// It also, captures the current backbuffer into one of the created surfaces
-//
-// Inputs :  none
-//
-// Outputs : returns true if surfaces were created otherwise returns false
-//
-bool CD3D9Renderer::InitCaptureFrameBufferFast([[maybe_unused]] uint32 bufferWidth, [[maybe_unused]] uint32 bufferHeight)
-{
-    bool status = false;
-
-#if defined(ENABLE_PROFILING_CODE)
-    if (!m_Device)
-    {
-        return(status);
-    }
-
-    // Free the existing textures if they exist
-    SAFE_RELEASE(m_pSaveTexture[0]);
-    SAFE_RELEASE(m_pSaveTexture[1]);
-
-    assert(m_pBackBuffer);
-    assert(!IsEditorMode() || m_CurrContext->m_pBackBuffer == m_pBackBuffer);
-
-    D3D11_RENDER_TARGET_VIEW_DESC bbDesc;
-    m_pBackBuffer->GetDesc(&bbDesc);
-    if (bbDesc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DMS)
-    {
-        return(false);
-    }
-
-    m_captureFlipFlop = 0;
-    ID3D11Texture2D* pSourceTexture(0);
-    m_pBackBuffer->GetResource((ID3D11Resource**) &pSourceTexture);
-    if (pSourceTexture)
-    {
-        D3D11_TEXTURE2D_DESC sourceDesc;
-        pSourceTexture->GetDesc(&sourceDesc);
-
-        if (bufferWidth == 0)
-        {
-            bufferWidth = sourceDesc.Width;
-        }
-        if (bufferHeight == 0)
-        {
-            bufferHeight = sourceDesc.Height;
-        }
-
-        D3D11_TEXTURE2D_DESC dstDesc;
-        dstDesc.Width = bufferWidth;
-        dstDesc.Height = bufferHeight;
-        dstDesc.MipLevels = 1;
-        dstDesc.ArraySize = 1;
-        dstDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        dstDesc.SampleDesc.Count = 1;
-        dstDesc.SampleDesc.Quality = 0;
-        dstDesc.Usage = D3D11_USAGE_STAGING;
-        dstDesc.BindFlags = 0;
-        dstDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ /* | D3D11_CPU_ACCESS_WRITE*/;
-        dstDesc.MiscFlags = 0;
-
-        HRESULT hr = GetDevice().CreateTexture2D(&dstDesc, 0, &m_pSaveTexture[0]);
-        if (hr != D3D_OK)
-        {
-            SAFE_RELEASE(pSourceTexture);
-            SAFE_RELEASE(m_pSaveTexture[0]);
-            return(false);
-        }
-
-        hr = GetDevice().CreateTexture2D(&dstDesc, 0, &m_pSaveTexture[1]);
-        if (hr != D3D_OK)
-        {
-            SAFE_RELEASE(pSourceTexture);
-            SAFE_RELEASE(m_pSaveTexture[0]);
-            SAFE_RELEASE(m_pSaveTexture[1]);
-            return(false);
-        }
-
-        // Initialize one of the buffers by capturing the current backbuffer
-        // If we allow this call on the MT we cannot interact with the device
-        // The first screen grab will perform the copy anyway
-        /*D3D11_BOX srcBox;
-        srcBox.left = 0; srcBox.right = dstDesc.Width;
-        srcBox.top = 0; srcBox.bottom = dstDesc.Height;
-        srcBox.front = 0; srcBox.back = 1;
-        GetDeviceContext().CopySubresourceRegion(m_pSaveTexture[0], 0, 0, 0, 0, pSourceTexture, 0, &srcBox);*/
-
-        status = true;
-        SAFE_RELEASE(pSourceTexture);
-    }
-#else
-    status = true;
-#endif
-
-    return(status);
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// This routine releases the 2 surfaces used for frame capture by the CaptureFrameBufferFast routine
-//
-// Inputs : None
-//
-// Returns : None
-//
-void CD3D9Renderer::CloseCaptureFrameBufferFast(void)
-{
-#if defined(ENABLE_PROFILING_CODE)
-    SAFE_RELEASE(m_pSaveTexture[0]);
-    SAFE_RELEASE(m_pSaveTexture[1]);
-#endif
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// This routines uses 2 destination surfaces.  It triggers a backbuffer copy to one of its surfaces,
-// and then copies the other surface to system memory.  This hopefully will remove any
-// CPU stalls due to the rect lock call since the buffer will already be in system
-// memory when it is called
-// Inputs :
-//          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
-//          destinationWidth    :   Width of the frame to copy
-//          destinationHeight   :   Height of the frame to copy
-//
-//          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
-//                  of the surface are used for the copy
-//
-bool CD3D9Renderer::CaptureFrameBufferFast([[maybe_unused]] unsigned char* pDstRGBA8, [[maybe_unused]] int destinationWidth, [[maybe_unused]] int destinationHeight)
-{
-    bool bStatus(false);
-
-#if defined(ENABLE_PROFILING_CODE)
-    ID3D11Texture2D* pSourceTexture(0);
-
-    //In case this routine is called without the init function being called
-    if (m_pSaveTexture[0] == NULL || m_pSaveTexture[1] == NULL  || !m_Device)
-    {
-        return bStatus;
-    }
-
-    assert(m_pBackBuffer);
-    assert(!IsEditorMode() || m_CurrContext->m_pBackBuffer == m_pBackBuffer);
-
-    D3D11_RENDER_TARGET_VIEW_DESC bbDesc;
-    m_pBackBuffer->GetDesc(&bbDesc);
-    if (bbDesc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DMS)
-    {
-        return bStatus;
-    }
-
-    m_pBackBuffer->GetResource((ID3D11Resource**) &pSourceTexture);
-    if (pSourceTexture)
-    {
-        D3D11_TEXTURE2D_DESC sourceDesc;
-        pSourceTexture->GetDesc(&sourceDesc);
-
-        if (sourceDesc.SampleDesc.Count == 1)
-        {
-            ID3D11Texture2D* pCopySourceTexture, * pTargetTexture, * pCopyTexture;
-            unsigned int width(destinationWidth > GetWidth() ? GetWidth() : destinationWidth);
-            unsigned int height(destinationHeight > GetHeight() ? GetHeight() : destinationHeight);
-
-            pTargetTexture =  m_captureFlipFlop ? m_pSaveTexture[1] : m_pSaveTexture[0];
-            pCopyTexture =  m_captureFlipFlop ? m_pSaveTexture[0] : m_pSaveTexture[1];
-            m_captureFlipFlop = (m_captureFlipFlop + 1) % 2;
-
-            if (width != GetWidth() || height != GetHeight())
-            {
-                // reuse stereo left and right RTs to downscale
-                GetDeviceContext().CopyResource(CTexture::s_ptexStereoL->GetDevTexture()->Get2DTexture(), pSourceTexture);
-                GetUtils().Downsample(CTexture::s_ptexStereoL, CTexture::s_ptexStereoR, GetWidth(), GetHeight(), width, height);
-                pCopySourceTexture = CTexture::s_ptexStereoR->GetDevTexture()->Get2DTexture();
-            }
-            else
-            {
-                pCopySourceTexture = pSourceTexture;
-            }
-
-            // Setup the copy of the captured frame to our local surface in the background
-            D3D11_BOX srcBox;
-            srcBox.left = 0;
-            srcBox.right = width;
-            srcBox.top = 0;
-            srcBox.bottom = height;
-            srcBox.front = 0;
-            srcBox.back = 1;
-            GetDeviceContext().CopySubresourceRegion(pTargetTexture, 0, 0, 0, 0, pCopySourceTexture, 0, &srcBox);
-
-            // Copy the previous frame from our local surface to the requested buffer location
-            D3D11_MAPPED_SUBRESOURCE mappedTex;
-            if (SUCCEEDED(GetDeviceContext().Map(pCopyTexture, 0, D3D11_MAP_READ, 0, &mappedTex)))
-            {
-                for (unsigned int i = 0; i < height; ++i)
-                {
-                    uint8* pSrc((uint8*)mappedTex.pData + i* mappedTex.RowPitch);
-                    uint8* pDst((uint8*)pDstRGBA8 + i* width * 4);
-                    for (unsigned int j = 0; j < width; ++j, pSrc += 4, pDst += 4)
-                    {
-                        pDst[0] = pSrc[2];
-                        pDst[1] = pSrc[1];
-                        pDst[2] = pSrc[0];
-                        pDst[3] = 255;
-                    }
-                }
-                GetDeviceContext().Unmap(pCopyTexture, 0);
-                bStatus = true;
-            }
-        }
-    }
-
-    SAFE_RELEASE(pSourceTexture);
-#endif
-
-    return bStatus;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// Copy a captured surface to a buffer
-//
-// Inputs :
-//          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
-//          destinationWidth    :   Width of the frame to copy
-//          destinationHeight   :   Height of the frame to copy
-//
-//          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
-//                  of the surface are used for the copy
-//
-bool CD3D9Renderer::CopyFrameBufferFast([[maybe_unused]] unsigned char* pDstRGBA8, [[maybe_unused]] int destinationWidth, [[maybe_unused]] int destinationHeight)
-{
-    bool bStatus(false);
-
-#if defined(ENABLE_PROFILING_CODE)
-    //In case this routine is called without the init function being called
-    if (m_pSaveTexture[0] == NULL || m_pSaveTexture[1] == NULL  || !m_Device)
-    {
-        return bStatus;
-    }
-
-    ID3D11Texture2D* pCopyTexture =  m_captureFlipFlop ? m_pSaveTexture[0] : m_pSaveTexture[1];
-
-    // Copy the previous frame from our local surface to the requested buffer location
-    D3D11_MAPPED_SUBRESOURCE mappedTex;
-    if (SUCCEEDED(GetDeviceContext().Map(pCopyTexture, 0, D3D11_MAP_READ, 0, &mappedTex)))
-    {
-        unsigned int width(destinationWidth > GetWidth() ? GetWidth() : destinationWidth);
-        unsigned int height(destinationHeight > GetHeight() ? GetHeight() : destinationHeight);
-
-        for (unsigned int i = 0; i < height; ++i)
-        {
-            uint8* pSrc((uint8*)mappedTex.pData + i* mappedTex.RowPitch);
-            uint8* pDst((uint8*)pDstRGBA8 + i* width * 4);
-            for (unsigned int j = 0; j < width; ++j, pSrc += 4, pDst += 4)
-            {
-                pDst[0] = pSrc[2];
-                pDst[1] = pSrc[1];
-                pDst[2] = pSrc[0];
-                pDst[3] = 255;
-            }
-        }
-        GetDeviceContext().Unmap(pCopyTexture, 0);
-        bStatus = true;
-    }
-#endif
-
-    return bStatus;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// This routine checks for any frame buffer callbacks that are needed and calls them
-//
-// Inputs : None
-//
-//  Outputs : None
-//
-void CD3D9Renderer::CaptureFrameBufferCallBack(void)
-{
-#if defined(ENABLE_PROFILING_CODE)
-    bool firstCopy = true;
-    for (unsigned int i = 0; i < MAXFRAMECAPTURECALLBACK; ++i)
-    {
-        if (m_pCaptureCallBack[i] != NULL)
-        {
-            {
-                unsigned char* pDestImage = NULL;
-                bool bRequiresScreenShot = m_pCaptureCallBack[i]->OnNeedFrameData(pDestImage);
-
-                if (bRequiresScreenShot)
-                {
-                    if (pDestImage != NULL)
-                    {
-                        const int widthNotAligned = m_pCaptureCallBack[i]->OnGetFrameWidth();
-                        const int width = widthNotAligned - widthNotAligned % 4;
-                        const int height = m_pCaptureCallBack[i]->OnGetFrameHeight();
-
-                        bool bCaptured;
-                        if (firstCopy)
-                        {
-                            bCaptured = CaptureFrameBufferFast(pDestImage, width, height);
-                        }
-                        else
-                        {
-                            bCaptured = CopyFrameBufferFast(pDestImage, width, height);
-                        }
-
-                        if (bCaptured == true)
-                        {
-                            m_pCaptureCallBack[i]->OnFrameCaptured();
-                        }
-
-                        firstCopy = false;
-                    }
-                    else
-                    {
-                        //Assuming this texture is just going to be read by GPU, no need to block on fence
-                        //if( !m_pd3dDevice->IsFencePending( m_FenceFrameCaptureReady ) )
-                        {
-                            m_pCaptureCallBack[i]->OnFrameCaptured();
-                        }
-                    }
-                }
-            }
-        }
-    }
-#endif
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// This routine checks for any frame buffer callbacks that are needed and checks their flags, calling preparation functions if required
-//
-// Inputs : None
-//
-//  Outputs : None
-//
-void CD3D9Renderer::CaptureFrameBufferPrepare(void)
-{
-#if defined(ENABLE_PROFILING_CODE)
-    for (unsigned int i = 0; i < MAXFRAMECAPTURECALLBACK; ++i)
-    {
-        if (m_pCaptureCallBack[i] != NULL)
-        {
-            //The consoles collect screenshots asynchronously
-            int texHandle = 0;
-            int flags = m_pCaptureCallBack[i]->OnCaptureFrameBegin(&texHandle);
-
-            //screen shot requested
-            if (flags & ICaptureFrameListener::eCFF_CaptureThisFrame)
-            {
-                int currentFrame = GetFrameID(false);
-
-                //Currently we only support one screen capture request per frame
-                if (m_nScreenCaptureRequestFrame[m_RP.m_nFillThreadID] != currentFrame)
-                {
-                    m_screenCapTexHandle[m_RP.m_nFillThreadID] = texHandle;
-                    m_nScreenCaptureRequestFrame[m_RP.m_nFillThreadID] = currentFrame;
-                }
-                else
-                {
-                    CryWarning(VALIDATOR_MODULE_RENDERER, VALIDATOR_ERROR, "Multiple screen caps in a single frame not supported.");
-                }
-            }
-        }
-    }
-#endif
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// This routine registers an ICaptureFrameListener object for callback when a frame is available
-//
-// Inputs :
-//          pCapture    :   address of the ICaptureFrameListener object
-//
-//  Outputs : true if successful, false if not successful
-//
-bool CD3D9Renderer::RegisterCaptureFrame([[maybe_unused]] ICaptureFrameListener* pCapture)
-{
-#if defined(ENABLE_PROFILING_CODE)
-    // Check to see if the address is already registered
-    for (unsigned int i = 0; i < MAXFRAMECAPTURECALLBACK; ++i)
-    {
-        if (m_pCaptureCallBack[i] == pCapture)
-        {
-            return(true);
-        }
-    }
-
-
-    // Try to find a space for the caller
-    for (unsigned int i = 0; i < MAXFRAMECAPTURECALLBACK; ++i)
-    {
-        if (m_pCaptureCallBack[i] == NULL)
-        {
-            // If no other callers are registered, init the capture routine
-            if (m_frameCaptureRegisterNum == 0)
-            {
-                uint32 bufferWidth = 0, bufferHeight = 0;
-                bool status = InitCaptureFrameBufferFast(bufferWidth, bufferHeight);
-                if (status == false)
-                {
-                    return(false);
-                }
-            }
-
-            m_pCaptureCallBack[i] = pCapture;
-            ++m_frameCaptureRegisterNum;
-            return(true);
-        }
-    }
-#endif
-    // Could not find space
-    return(false);
-}
-
-/////////////////////////////////////////////////////////////////////////
-// This routine unregisters an ICaptureFrameListener object for callback
-//
-// Inputs :
-//          pCapture    :   address of the ICaptureFrameListener object
-//
-//  Outputs : 1 if successful, 0 if not successful
-//
-bool CD3D9Renderer::UnRegisterCaptureFrame([[maybe_unused]] ICaptureFrameListener* pCapture)
-{
-#if defined(ENABLE_PROFILING_CODE)
-    // Check to see if the address is registered, and unregister if it is
-    for (unsigned int i = 0; i < MAXFRAMECAPTURECALLBACK; ++i)
-    {
-        if (m_pCaptureCallBack[i] == pCapture)
-        {
-            m_pCaptureCallBack[i] = NULL;
-            --m_frameCaptureRegisterNum;
-            if (m_frameCaptureRegisterNum == 0)
-            {
-                CloseCaptureFrameBufferFast();
-            }
-            return(true);
-        }
-    }
-#endif
-    return(false);
-}
-
-int CD3D9Renderer::ScreenToTexture(int nTexID)
-{
-    CTexture* pTex = CTexture::GetByID(nTexID);
-    if (!pTex)
-    {
-        return -1;
-    }
-
-    int iTempX, iTempY, iWidth, iHeight;
-    GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    return 0;
-}
-
-void CD3D9Renderer::Draw2dImage(float xpos, float ypos, float w, float h, int textureid, float s0, float t0, float s1, float t1, float angle, const ColorF& col, float z)
-{
-    Draw2dImage(xpos, ypos, w, h, textureid, s0, t0, s1, t1, angle, col.r, col.g, col.b, col.a, z);
-}
-
-void CD3D9Renderer::Draw2dImageStretchMode(bool bStretch)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    m_pRT->RC_Draw2dImageStretchMode(bStretch);
-}
-
-void CD3D9Renderer::Draw2dImage(float xpos, float ypos, float w, float h, int textureid, float s0, float t0, float s1, float t1, float angle, float r, float g, float b, float a, float z)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    // Draw a textured quad, texture is assumed to be in video memory
-    //////////////////////////////////////////////////////////////////////
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    PROFILE_FRAME(Draw_2DImage);
-
-    CTexture* pTexture = textureid >= 0 ? CTexture::GetByID(textureid) : NULL;
-
-    m_pRT->RC_Draw2dImage(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, r, g, b, a, z);
-}
-
-void    CD3D9Renderer::Push2dImage(float xpos, float ypos, float w, float h, int textureid, float s0, float t0, float s1, float t1, float angle, float r, float g, float b, float a, float z, float stereoDepth)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    // Draw a textured quad, texture is assumed to be in video memory
-    //////////////////////////////////////////////////////////////////////
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    PROFILE_FRAME(Push_2DImage);
-
-    CTexture* pTexture = textureid >= 0 ? CTexture::GetByID(textureid) : NULL;
-
-    m_pRT->RC_Push2dImage(xpos, ypos, w, h, pTexture, s0, t0, s1, t1, angle, r, g, b, a, z, stereoDepth);
-}
-
-void    CD3D9Renderer::Draw2dImageList()
-{
-    m_pRT->RC_Draw2dImageList();
-}
-
-void    CD3D9Renderer::DrawImage(float xpos, float ypos, float w, float h, int texture_id, float s0, float t0, float s1, float t1, float r, float g, float b, float a, bool filtered)
-{
-    float s[4], t[4];
-
-    s[0] = s0;
-    t[0] = 1.0f - t0;
-    s[1] = s1;
-    t[1] = 1.0f - t0;
-    s[2] = s1;
-    t[2] = 1.0f - t1;
-    s[3] = s0;
-    t[3] = 1.0f - t1;
-
-    DrawImageWithUV(xpos, ypos, 0, w, h, texture_id, s, t, r, g, b, a, filtered);
-}
-
-
-void    CD3D9Renderer::DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int texture_id, float* s, float* t, float r, float g, float b, float a, bool filtered)
-{
-    assert(s);
-    assert(t);
-
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    m_pRT->RC_DrawImageWithUV(xpos, ypos, z, w, h, texture_id, s, t, r, g, b, a, filtered);
-}
-
-void    CD3D9Renderer::RT_DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int texture_id, float s[4], float t[4], DWORD col, bool filtered)
-{
-    RT_DrawImageWithUVInternal(xpos, ypos, z, w, h, texture_id, s, t, col, filtered);
-}
-
-void CD3D9Renderer::RT_DrawImageWithUVInternal(float xpos, float ypos, float z, float w, float h, int texture_id, float s[4], float t[4], DWORD col, bool filtered)
-{
-    //////////////////////////////////////////////////////////////////////
-    // Draw a textured quad, texture is assumed to be in video memory
-    //////////////////////////////////////////////////////////////////////
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    PROFILE_FRAME(Draw_2DImage);
-
-
-
-    SetCullMode(R_CULL_DISABLE);
-    EF_SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    EF_SetSrgbWrite(false);
-
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gRenDev);
-    vb.Allocate(4);
-    SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-    vQuad[0].xyz.x = xpos;
-    vQuad[0].xyz.y = ypos;
-    vQuad[0].xyz.z = z;
-    vQuad[0].st = Vec2(s[0], t[0]);
-    vQuad[0].color.dcolor = col;
-
-    vQuad[1].xyz.x = xpos + w;
-    vQuad[1].xyz.y = ypos;
-    vQuad[1].xyz.z = z;
-    vQuad[1].st = Vec2(s[1], t[1]);
-    vQuad[1].color.dcolor = col;
-
-    vQuad[2].xyz.x = xpos;
-    vQuad[2].xyz.y = ypos + h;
-    vQuad[2].xyz.z = z;
-    vQuad[2].st = Vec2(s[3], t[3]);
-    vQuad[2].color.dcolor = col;
-
-    vQuad[3].xyz.x = xpos + w;
-    vQuad[3].xyz.y = ypos + h;
-    vQuad[3].xyz.z = z;
-    vQuad[3].st = Vec2(s[2], t[2]);
-    vQuad[3].color.dcolor = col;
-
-    vb.Unlock();
-
-    STexState TS;
-    TS.SetFilterMode(filtered ? FILTER_BILINEAR : FILTER_POINT);
-    TS.SetClampMode(1, 1, 1);
-    CTexture::ApplyForID(0, texture_id, CTexture::GetTexState(TS), -1);
-
-    FX_SetFPMode();
-
-    vb.Bind(0);
-    vb.Release();
-
-    if (FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        return;
-    }
-
-    FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-}
-
-void CD3D9Renderer::DrawLines(Vec3 v[], int nump, ColorF& col, int flags, float fGround)
-{
-    if (nump > 1)
-    {
-        m_pRT->RC_DrawLines(v, nump, col, flags, fGround);
-    }
-}
-
-void CD3D9Renderer::Graph(byte* g, int x, int y, int wdt, int hgt, int nC, int type, const char* text, ColorF& color, float fScale)
-{
-    ColorF col;
-    PREFAST_SUPPRESS_WARNING(6255)
-    Vec3 * vp = (Vec3*)alloca(wdt * sizeof(Vec3));
-    int i;
-
-    TransformationMatrices backupSceneMatrices;
-    Set2DMode(m_width, m_height, backupSceneMatrices);
-
-    SetState(GS_NODEPTHTEST);
-    col = Col_Blue;
-    int num = CTextureManager::Instance()->GetWhiteTexture()->GetTextureID();
-
-    float fy = (float)y;
-    float fx = (float)x;
-    float fwdt = (float)wdt;
-    float fhgt = (float)hgt;
-
-    DrawImage(fx, fy, fwdt, 2, num, 0, 0, 1, 1, col.r, col.g, col.b, col.a);
-    DrawImage(fx, fy + fhgt, fwdt, 2, num, 0, 0, 1, 1, col.r, col.g, col.b, col.a);
-    DrawImage(fx, fy, 2, fhgt, num, 0, 0, 1, 1, col.r, col.g, col.b, col.a);
-    DrawImage(fx + fwdt - 2, fy, 2, fhgt, num, 0, 0, 1, 1, col.r, col.g, col.b, col.a);
-
-    float fGround = CV_r_graphstyle ? fy + fhgt : -1;
-
-    for (i = 0; i < wdt; i++)
-    {
-        vp[i][0] = (float)i + fx;
-        vp[i][1] = fy + (float)(g[i]) * fhgt / 255.0f;
-        vp[i][2] = 0;
-    }
-    if (type == 1)
-    {
-        col = color;
-        DrawLines(&vp[0], nC, col, 3, fGround);
-        col = ColorF(1.0f) - col;
-        col[3] = 1;
-        DrawLines(&vp[nC], wdt - nC, col, 3, fGround);
-    }
-    else
-    if (type == 2)
-    {
-        col = color;
-        DrawLines(&vp[0], wdt, col, 3, fGround);
-    }
-
-    if (text)
-    {
-        WriteXY(4, y - 18, 0.5f, 1, 1, 1, 1, 1, text);
-        WriteXY(wdt - 260, y - 18, 0.5f, 1, 1, 1, 1, 1, "%d ms", (int)(1000.0f * fScale));
-    }
-
-    Unset2DMode(backupSceneMatrices);
-}
-
-void CD3D9Renderer::GetModelViewMatrix(float* mat)
-{
-    int nThreadID = m_pRT->GetThreadList();
-    *(Matrix44*)mat = m_RP.m_TI[nThreadID].m_matView;
-}
-
-void CD3D9Renderer::GetProjectionMatrix(float* mat)
-{
-    int nThreadID = m_pRT->GetThreadList();
-    *(Matrix44*)mat = m_RP.m_TI[nThreadID].m_matProj;
-}
-
-void CD3D9Renderer::SetMatrices(float* pProjMat, float* pViewMat)
-{
-    int nThreadID = m_pRT->GetThreadList();
-    m_RP.m_TI[nThreadID].m_matProj = *(Matrix44*)pProjMat;
-    m_RP.m_TI[nThreadID].m_matView = *(Matrix44*)pViewMat;
-}
-///////////////////////////////////////////
-void CD3D9Renderer::PushMatrix()
-{
-    CRY_ASSERT(static_cast<const CD3D9Renderer*> (this)->m_Device);
-}
-
-///////////////////////////////////////////
-void CD3D9Renderer::PopMatrix()
-{
-    CRY_ASSERT(static_cast<const CD3D9Renderer*> (this)->m_Device);
-}
-
-//-----------------------------------------------------------------------------
-// coded by ivo:
-// calculate parameter for an off-center projection matrix.
-// the projection matrix itself is calculated by D3D9.
-//-----------------------------------------------------------------------------
-Matrix44A OffCenterProjection(const CCamera& cam, const Vec3& nv, unsigned short max, unsigned short win_width, unsigned short win_height)
-{
-
-    //get the size of near plane
-    float l = +nv.x;
-    float r = -nv.x;
-    float b = -nv.z;
-    float t = +nv.z;
-
-    //---------------------------------------------------
-
-    float max_x = (float)max;
-    float max_z = (float)max;
-
-    float win_x = (float)win_width;
-    float win_z = (float)win_height;
-
-    if ((win_x < max_x) && (win_z < max_z))
-    {
-        //calculate parameters for off-center projection-matrix
-        float ext_x = -nv.x * 2;
-        float ext_z = +nv.z * 2;
-        l = +nv.x + (ext_x / max_x) * win_x;
-        r = +nv.x + (ext_x / max_x) * (win_x + 1);
-        t = +nv.z - (ext_z / max_z) * win_z;
-        b = +nv.z - (ext_z / max_z) * (win_z + 1);
-    }
-
-    Matrix44A m;
-    mathMatrixPerspectiveOffCenter(&m, l, r, b, t, cam.GetNearPlane(), cam.GetFarPlane());
-
-    return m;
-}
-
-void CD3D9Renderer::ApplyViewParameters(const CameraViewParameters& viewParameters)
-{
-    int nThreadID = m_pRT->GetThreadList();
-    m_RP.m_TI[nThreadID].m_cam.m_viewParameters = viewParameters;
-    Matrix44A* m = &m_RP.m_TI[nThreadID].m_matView;
-    viewParameters.GetModelviewMatrix((float*)m);
-    if (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_MIRRORCAMERA)
-    {
-        Matrix44A tmp;
-
-        tmp = Matrix44A(Matrix33::CreateScale(Vec3(1, -1, 1))).GetTransposed();
-        m_RP.m_TI[nThreadID].m_matView = tmp * m_RP.m_TI[nThreadID].m_matView;
-    }
-    m = &m_RP.m_TI[nThreadID].m_matProj;
-    //viewParameters.GetProjectionMatrix(*m);
-    mathMatrixPerspectiveOffCenter(m, viewParameters.fWL, viewParameters.fWR, viewParameters.fWB, viewParameters.fWT, viewParameters.fNear, viewParameters.fFar);
-
-    const bool bReverseDepth = (CV_r_ReverseDepth != 0 && (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_SHADOWGEN) == 0) ? 1 : 0;
-    const bool bWasReverseDepth = (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0 ? 1 : 0;
-
-    m_RP.m_TI[nThreadID].m_PersFlags &= ~RBPF_REVERSE_DEPTH;
-    if (bReverseDepth)
-    {
-        mathMatrixPerspectiveOffCenterReverseDepth((Matrix44A*)m, viewParameters.fWL, viewParameters.fWR, viewParameters.fWB, viewParameters.fWT, viewParameters.fNear, viewParameters.fFar);
-        m_RP.m_TI[nThreadID].m_PersFlags |= RBPF_REVERSE_DEPTH;
-    }
-
-    // directly reset affected states
-    if ((bReverseDepth ^ bWasReverseDepth) && m_pRT->IsRenderThread())
-    {
-        uint32 depthState = ReverseDepthHelper::ConvertDepthFunc(m_RP.m_CurState);
-        FX_SetState(m_RP.m_CurState, m_RP.m_CurAlphaRef, depthState);
-    }
-}
-
-void CD3D9Renderer::SetCamera(const CCamera& cam)
-{
-    int nThreadID = m_pRT->GetThreadList();
-
-    assert(m_Device);
-
-    // Ortho-normalize camera matrix in double precision to minimize numerical errors and improve precision when inverting matrix
-    Matrix34_tpl<f64> mCam34 = cam.GetMatrix();
-    mCam34.OrthonormalizeFast();
-
-    Matrix44_tpl<f64> mCam44T = mCam34.GetTransposed();
-    Matrix44_tpl<f64> mView64;
-    mathMatrixLookAtInverse(&mView64, &mCam44T);
-
-    Matrix44 mView = (Matrix44_tpl<f32>)mView64;
-
-    // Rotate around x-axis by -PI/2
-    Matrix44 mViewFinal = mView;
-    mViewFinal.m01 = mView.m02;
-    mViewFinal.m02 = -mView.m01;
-    mViewFinal.m11 = mView.m12;
-    mViewFinal.m12 = -mView.m11;
-    mViewFinal.m21 = mView.m22;
-    mViewFinal.m22 = -mView.m21;
-    mViewFinal.m31 = mView.m32;
-    mViewFinal.m32 = -mView.m31;
-
-    m_RP.m_TI[nThreadID].m_matView = mViewFinal;
-
-    mViewFinal.m30 = 0;
-    mViewFinal.m31 = 0;
-    mViewFinal.m32 = 0;
-    m_CameraZeroMatrix[nThreadID] = mViewFinal;
-
-    if (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_MIRRORCAMERA)
-    {
-        Matrix44A tmp;
-
-        tmp = Matrix44A(Matrix33::CreateScale(Vec3(1, -1, 1))).GetTransposed();
-        m_RP.m_TI[nThreadID].m_matView = tmp * m_RP.m_TI[nThreadID].m_matView;
-    }
-
-    m_RP.m_TI[nThreadID].m_cam = cam;
-
-    CameraViewParameters viewParameters;
-
-    // Asymmetric frustum
-    float Near = cam.GetNearPlane(), Far = cam.GetFarPlane();
-
-    float wT = tanf(cam.GetFov() * 0.5f) * Near, wB = -wT;
-    float wR = wT * cam.GetProjRatio(), wL = -wR;
-
-    if (SRendItem::m_RecurseLevel[nThreadID] <= 0 &&
-        (m_RenderTileInfo.nGridSizeX > 1.f || m_RenderTileInfo.nGridSizeY > 1.f))
-    {
-        //
-        // This math computes an off-axis projection for the screenshot system.
-        // see C3DEngine::ScreenShotHighRes. This takes the would-be projection matrix
-        // changes and maps them instead to frustum planes which plumb through the actual
-        // camera system.
-        //
-        float scaleX = m_RenderTileInfo.nGridSizeX;
-        float scaleY = m_RenderTileInfo.nGridSizeY;
-        float scaleXInv = 1.0f / scaleX;
-        float scaleYInv = 1.0f / scaleY;
-
-        float m20 =  (scaleX - 1) - m_RenderTileInfo.nPosX * 2.0f;
-        float m21 = -((scaleY - 1) - m_RenderTileInfo.nPosY * 2.0f);
-
-        float asymLR = (m20 * (wR - wL)) * 0.5f;
-        float asymTB = (m21 * (wT - wB)) * 0.5f;
-
-        wR = (wR + asymLR) * scaleXInv;
-        wL = (wL + asymLR) * scaleXInv;
-
-        wT = (wT + asymTB) * scaleYInv;
-        wB = (wB + asymTB) * scaleYInv;
-    }
-
-    viewParameters.Frustum(wL + cam.GetAsymL(), wR + cam.GetAsymR(), wB + cam.GetAsymB(), wT + cam.GetAsymT(), Near, Far);
-
-    Vec3 vEye = cam.GetPosition();
-    Vec3 vAt = vEye + Vec3((f32)mCam34(0, 1), (f32)mCam34(1, 1), (f32)mCam34(2, 1));
-    Vec3 vUp = Vec3((f32)mCam34(0, 2), (f32)mCam34(1, 2), (f32)mCam34(2, 2));
-    viewParameters.LookAt(vEye, vAt, vUp);
-    ApplyViewParameters(viewParameters);
-
-    EF_SetCameraInfo();
-}
-
-void CD3D9Renderer::SetRenderTile(f32 nTilesPosX, f32 nTilesPosY, f32 nTilesGridSizeX, f32 nTilesGridSizeY)
-{
-    m_RenderTileInfo.nPosX = nTilesPosX;
-    m_RenderTileInfo.nPosY = nTilesPosY;
-    m_RenderTileInfo.nGridSizeX = nTilesGridSizeX;
-    m_RenderTileInfo.nGridSizeY = nTilesGridSizeY;
-}
-
-void CD3D9Renderer::SetViewport(int x, int y, int width, int height, int id)
-{
-    if (m_pRT->IsRenderThread())
-    {
-        RT_SetViewport(x, y, width, height, id);
-    }
-    else
-    {
-        ASSERT_IS_MAIN_THREAD(m_pRT)
-        m_MainRTViewport.nX = x;
-        m_MainRTViewport.nY = y;
-        m_MainRTViewport.nWidth = width;
-        m_MainRTViewport.nHeight = height;
-        m_pRT->RC_SetViewport(x, y, width, height, id);
-    }
-}
-
-void CD3D9Renderer::RT_SetViewport(int x, int y, int width, int height, int id)
-{
-    assert(m_pRT->IsRenderThread());
-
-    if (x == 0 && y == 0 && width == GetWidth() && height == GetHeight())
-    {
-        width = m_FullResRect.right;
-        height = m_FullResRect.bottom;
-    }
-
-    m_NewViewport.nX = x;
-    m_NewViewport.nY = y;
-    m_NewViewport.nWidth = width;
-    m_NewViewport.nHeight = height;
-    m_RP.m_PersFlags2 |= RBPF2_COMMIT_PF;
-    m_RP.m_nCommitFlags |= FC_GLOBAL_PARAMS;
-    m_bViewportDirty = true;
-    if (-1 != id)
-    {
-        m_CurViewportID = clamp_tpl(id, 0, MAX_NUM_VIEWPORTS);
-    }
-}
-
-void CD3D9Renderer::GetViewport(int* x, int* y, int* width, int* height) const
-{
-    const SViewport& vp = m_pRT->IsRenderThread() ? m_NewViewport : m_MainRTViewport;
-    *x = vp.nX;
-    *y = vp.nY;
-    *width = vp.nWidth;
-    *height = vp.nHeight;
-}
-
-void CD3D9Renderer::SetScissor(int x, int y, int width, int height)
-{
-    if (!x && !y && !width && !height)
-    {
-        EF_Scissor(false, x, y, width, height);
-    }
-    else
-    {
-        EF_Scissor(true, x, y, width, height);
-    }
-}
-
-void CD3D9Renderer::SetCullMode(int mode)
-{
-    m_pRT->RC_SetCull(mode);
-}
-
-void CD3D9Renderer::RT_SetCull(int mode)
-{
-    //////////////////////////////////////////////////////////////////////
-    // Change the culling mode
-    //////////////////////////////////////////////////////////////////////
-
-    assert(m_Device);
-
-    switch (mode)
-    {
-    case R_CULL_DISABLE:
-        D3DSetCull(eCULL_None);
-        break;
-    case R_CULL_BACK:
-        D3DSetCull(eCULL_Back);
-        break;
-    case R_CULL_FRONT:
-        D3DSetCull(eCULL_Front);
-        break;
-    }
-}
-
-void CD3D9Renderer::PushProfileMarker(const char* label)
-{
-    m_pRT->RC_PushProfileMarker(label);
-}
-
-void CD3D9Renderer::PopProfileMarker(const char* label)
-{
-    m_pRT->RC_PopProfileMarker(label);
-}
-
-void CD3D9Renderer::SetFogColor(const ColorF& color)
-{
-    int nThreadID = m_pRT->GetThreadList();
-    m_RP.m_TI[nThreadID].m_FS.m_FogColor = color;
-
-    // Fog color
-    EF_SetFogColor(m_RP.m_TI[nThreadID].m_FS.m_FogColor);
-}
-
-bool CD3D9Renderer::EnableFog(bool enable)
-{
-    int nThreadID = m_pRT->GetThreadList();
-
-    bool bPrevFog = m_RP.m_TI[nThreadID].m_FS.m_bEnable; // remember fog value
-
-    m_RP.m_TI[nThreadID].m_FS.m_bEnable = enable;
-
-    return bPrevFog;
-}
-
-///////////////////////////////////////////
-void CD3D9Renderer::FX_PushWireframeMode(int mode)
-{
-    IF (m_nWireFrameStack >= MAX_WIREFRAME_STACK, 0)
-    {
-        CryFatalError("Pushing more than %d different WireFrame Modes onto stack", MAX_WIREFRAME_STACK);
-    }
-    assert(m_nWireFrameStack >= 0 && m_nWireFrameStack < MAX_WIREFRAME_STACK);
-    PREFAST_ASSUME(m_nWireFrameStack >= 0 && m_nWireFrameStack < MAX_WIREFRAME_STACK);
-    m_arrWireFrameStack[m_nWireFrameStack] = m_wireframe_mode;
-    m_nWireFrameStack += 1;
-    FX_SetWireframeMode(mode);
-}
-
-void CD3D9Renderer::FX_PopWireframeMode()
-{
-    IF (m_nWireFrameStack == 0, 0)
-    {
-        CryFatalError("WireFrame Mode more often popped than pushed");
-    }
-
-    m_nWireFrameStack -= 1;
-    assert(m_nWireFrameStack >= 0 && m_nWireFrameStack < MAX_WIREFRAME_STACK);
-    PREFAST_ASSUME(m_nWireFrameStack >= 0 && m_nWireFrameStack < MAX_WIREFRAME_STACK);
-    int nMode = m_arrWireFrameStack[m_nWireFrameStack];
-    FX_SetWireframeMode(nMode);
-}
-
-void CD3D9Renderer::FX_SetWireframeMode(int mode)
-{
-    assert(mode == R_WIREFRAME_MODE || mode == R_SOLID_MODE);
-
-    if (m_wireframe_mode == mode)
-    {
-        return;
-    }
-
-    m_wireframe_mode = mode;
-
-    int nState = m_RP.m_CurState;
-
-    m_RP.m_StateOr &= ~(GS_WIREFRAME);
-    if (m_wireframe_mode == R_WIREFRAME_MODE)
-    {
-        m_RP.m_StateOr |= GS_WIREFRAME;
-    }
-    else
-    {
-        nState &= ~(GS_WIREFRAME);
-    }
-
-    SetState(nState);
-}
-
-///////////////////////////////////////////
-void CD3D9Renderer::EnableVSync([[maybe_unused]] bool enable)
-{
-    // TODO: remove
-}
-
-void CD3D9Renderer::DrawQuad(float x0, float y0, float x1, float y1, const ColorF& color, float z, float s0, float t0, float s1, float t1)
-{
-    PROFILE_FRAME(Draw_2DImage);
-
-    ColorF c = color;
-    c.NormalizeCol(c);
-    DWORD col = c.pack_argb8888();
-
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gRenDev);
-    vb.Allocate(4);
-    SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-    float ftx0 = s0;
-    float fty0 = t0;
-    float ftx1 = s1;
-    float fty1 = t1;
-
-    // Define the quad
-    vQuad[0].xyz = Vec3(x0, y0, z);
-    vQuad[0].color.dcolor = col;
-    vQuad[0].st = Vec2(ftx0, fty0);
-
-    vQuad[1].xyz = Vec3(x1, y0, z);
-    vQuad[1].color.dcolor = col;
-    vQuad[1].st = Vec2(ftx1, fty0);
-
-    vQuad[3].xyz = Vec3(x1, y1, z);
-    vQuad[3].color.dcolor = col;
-    vQuad[3].st = Vec2(ftx1, fty1);
-
-    vQuad[2].xyz = Vec3(x0, y1, z);
-    vQuad[2].color.dcolor = col;
-    vQuad[2].st = Vec2(ftx0, fty1);
-
-    vb.Unlock();
-    vb.Bind(0);
-    vb.Release();
-
-    FX_Commit();
-
-    if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-    }
-}
-
-void CD3D9Renderer::DrawFullScreenQuad(CShader* pSH, const CCryNameTSCRC& TechName, float s0, float t0, float s1, float t1, uint32 nState)
-{
-    uint32 nPasses;
-    pSH->FXSetTechnique(TechName);
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-
-    float fWidth5 = (float)m_NewViewport.nWidth - 0.5f;
-    float fHeight5 = (float)m_NewViewport.nHeight - 0.5f;
-
-    TempDynVB<SVF_TP3F_C4B_T2F> vb(gRenDev);
-    vb.Allocate(4);
-    SVF_TP3F_C4B_T2F* Verts = vb.Lock();
-
-    std::swap(t0, t1);
-    Verts->pos = Vec4(-0.5f, -0.5f, 0.0f, 1.0f);
-    Verts->st = Vec2(s0, t0);
-    Verts->color.dcolor = (uint32) - 1;
-    Verts++;
-
-    Verts->pos = Vec4(fWidth5, -0.5f, 0.0f, 1.0f);
-    Verts->st = Vec2(s1, t0);
-    Verts->color.dcolor = (uint32) - 1;
-    Verts++;
-
-    Verts->pos = Vec4(-0.5f, fHeight5, 0.0f, 1.0f);
-    Verts->st = Vec2(s0, t1);
-    Verts->color.dcolor = (uint32) - 1;
-    Verts++;
-
-    Verts->pos = Vec4(fWidth5, fHeight5, 0.0f, 1.0f);
-    Verts->st = Vec2(s1, t1);
-    Verts->color.dcolor = (uint32) - 1;
-
-    vb.Unlock();
-    vb.Bind(0);
-    vb.Release();
-
-    FX_Commit();
-
-    // Draw a fullscreen quad to sample the RT
-    FX_SetState(nState);
-    if (!FAILED(FX_SetVertexDeclaration(0, eVF_TP3F_C4B_T2F)))
-    {
-        FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-    }
-
-    pSH->FXEndPass();
-}
-
-void CD3D9Renderer::DrawQuad3D(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3,
-    const ColorF& color, float ftx0, float fty0, float ftx1, float fty1)
-{
-    assert(color.r >= 0.0f && color.r <= 1.0f);
-    assert(color.g >= 0.0f && color.g <= 1.0f);
-    assert(color.b >= 0.0f && color.b <= 1.0f);
-    assert(color.a >= 0.0f && color.a <= 1.0f);
-
-    DWORD col = D3DRGBA(color.r, color.g, color.b, color.a);
-
-    TempDynVB<SVF_P3F_C4B_T2F> vb(gRenDev);
-    vb.Allocate(4);
-    SVF_P3F_C4B_T2F* vQuad = vb.Lock();
-
-    // Define the quad
-    vQuad[0].xyz = v0;
-    vQuad[0].color.dcolor = col;
-    vQuad[0].st = Vec2(ftx0, fty0);
-
-    vQuad[1].xyz = v1;
-    vQuad[1].color.dcolor = col;
-    vQuad[1].st = Vec2(ftx1, fty0);
-
-    vQuad[3].xyz = v2;
-    vQuad[3].color.dcolor = col;
-    vQuad[3].st = Vec2(ftx1, fty1);
-
-    vQuad[2].xyz = v3;
-    vQuad[2].color.dcolor = col;
-    vQuad[2].st = Vec2(ftx0, fty1);
-
-    vb.Unlock();
-    vb.Bind(0);
-    vb.Release();
-
-    FX_Commit();
-    if (!FAILED(FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-    {
-        FX_DrawPrimitive(eptTriangleStrip, 0, 4);
-    }
-}
-
-///////////////////////////////////////////
-
-void CD3D9Renderer::DrawPrimitivesInternal(CVertexBuffer* src, int vert_num, const eRenderPrimitiveType prim_type)
-{
-    size_t stride = src->m_vertexFormat.GetStride();
-    switch (src->m_vertexFormat.GetEnum())
-    {
-    case eVF_P3F_C4B_T2F:
-    case eVF_TP3F_C4B_T2F:
-    case eVF_P3F_T3F:
-    case eVF_P3F_T2F_T3F:
-        break;
-    default:
-        assert(0);
-        return;
-    }
-
-    FX_Commit();
-
-    if (FAILED(FX_SetVertexDeclaration(0, src->m_vertexFormat)))
-    {
-        return;
-    }
-
-    FX_SetVStream(3, NULL, 0, 0);
-
-    TempDynVBAny::CreateFillAndBind(src->m_VS.m_pLocalData, vert_num, 0, stride);
-
-    FX_DrawPrimitive(prim_type, 0, vert_num);
-}
-
-void CD3D9Renderer::SetProfileMarker([[maybe_unused]] const char* label, ESPM mode) const
-{
-    if (mode == ESPM_PUSH)
-    {
-        PROFILE_LABEL_PUSH(label);
-    }
-    else
-    {
-        PROFILE_LABEL_POP(label);
-    }
-};
-
-///////////////////////////////////////////
-void CD3D9Renderer::ResetToDefault()
-{
-    assert(m_pRT->IsRenderThread());
-
-    if (m_logFileHandle != AZ::IO::InvalidHandle)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], ".... ResetToDefault ....\n");
-    }
-
-    m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_FP_DIRTY;
-
-    EF_Scissor(false, 0, 0, 0, 0);
-
-    SetDefaultRenderStates();
-
-    GetDeviceContext().GSSetShader(NULL, NULL, 0);
-
-    m_RP.m_CurState = GS_DEPTHWRITE;
-    m_RP.m_previousPersFlags = 0;
-
-    FX_ResetPipe();
-
-    RT_UnbindTMUs();
-    RT_UnbindResources();
-
-    m_GraphicsPipeline->BindPerFrameConstantBuffer();
-    m_GraphicsPipeline->BindPerViewConstantBuffer();
-
-    FX_ResetVertexDeclaration();
-
-    m_RP.m_ForceStateOr &= ~GS_STENCIL;
-
-#ifdef DO_RENDERLOG
-    if (m_logFileHandle != AZ::IO::InvalidHandle && CV_r_log == 3)
-    {
-        Logv(SRendItem::m_RecurseLevel[m_RP.m_nProcessThreadID], ".... End ResetToDefault ....\n");
-    }
-#endif
-}
-
-///////////////////////////////////////////
-void CD3D9Renderer::SetDefaultRenderStates()
-{
-    const bool bReverseDepth = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-    SStateDepth DS;
-    SStateBlend BS;
-    SStateRaster RS;
-    DS.Desc.DepthEnable = TRUE;
-    DS.Desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-    DS.Desc.DepthFunc = bReverseDepth ? D3D11_COMPARISON_GREATER_EQUAL : D3D11_COMPARISON_LESS_EQUAL;
-    DS.Desc.StencilEnable = FALSE;
-    SetDepthState(&DS, 0);
-
-    RS.Desc.CullMode = (m_nCurStateRS != (uint32) - 1) ? m_StatesRS[m_nCurStateRS].Desc.CullMode : D3D11_CULL_BACK;
-    switch (RS.Desc.CullMode)
-    {
-    case D3D11_CULL_BACK:
-        m_RP.m_eCull = eCULL_Back;
-        break;
-    case D3D11_CULL_NONE:
-        m_RP.m_eCull = eCULL_None;
-        break;
-    case D3D11_CULL_FRONT:
-        m_RP.m_eCull = eCULL_Front;
-        break;
-    }
-    ;
-    RS.Desc.FillMode = D3D11_FILL_SOLID;
-    SetRasterState(&RS);
-
-    BS.Desc.RenderTarget[0].BlendEnable = FALSE;
-    BS.Desc.RenderTarget[1].BlendEnable = FALSE;
-    BS.Desc.RenderTarget[2].BlendEnable = FALSE;
-    BS.Desc.RenderTarget[3].BlendEnable = FALSE;
-    BS.Desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-    BS.Desc.RenderTarget[1].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-    BS.Desc.RenderTarget[2].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-    BS.Desc.RenderTarget[3].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-    SetBlendState(&BS);
-}
-
-///////////////////////////////////////////
-void CD3D9Renderer::SetMaterialColor(float r, float g, float b, float a)
-{
-    EF_SetGlobalColor(r, g, b, a);
-}
-
-///////////////////////////////////////////
-bool CD3D9Renderer::ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz)
-{
-    int nThreadID = m_pRT->GetThreadList();
-    SViewport& vp = m_pRT->IsRenderThread() ? m_NewViewport : m_MainRTViewport;
-
-    Vec3 vOut, vIn;
-    vIn.x = ptx;
-    vIn.y = pty;
-    vIn.z = ptz;
-
-    int32 v[4];
-    v[0] = vp.nX;
-    v[1] = vp.nY;
-    v[2] = vp.nWidth;
-    v[3] = vp.nHeight;
-
-    Matrix44A mIdent;
-    mIdent.SetIdentity();
-    if (mathVec3Project(
-            &vOut,
-            &vIn,
-            v,
-            &m_RP.m_TI[nThreadID].m_matProj,
-            &m_RP.m_TI[nThreadID].m_matView,
-            &mIdent))
-    {
-        *sx = vOut.x * 100 / vp.nWidth;
-        *sy = vOut.y * 100 / vp.nHeight;
-        *sz = (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) ? 1.0f - vOut.z : vOut.z;
-
-        return true;
-    }
-
-    return false;
-}
-
-
-static bool InvertMatrixPrecise(Matrix44& out, const float* m)
-{
-    // Inverts matrix using Gaussian Elimination which is slower but numerically more stable than Cramer's Rule
-
-    float expmat[4][8] = {
-        { m[0], m[4], m[8], m[12], 1.f, 0.f, 0.f, 0.f },
-        { m[1], m[5], m[9], m[13], 0.f, 1.f, 0.f, 0.f },
-        { m[2], m[6], m[10], m[14], 0.f, 0.f, 1.f, 0.f },
-        { m[3], m[7], m[11], m[15], 0.f, 0.f, 0.f, 1.f }
-    };
-
-    float t0, t1, t2, t3, t;
-    float* r0 = expmat[0], * r1 = expmat[1], * r2 = expmat[2], * r3 = expmat[3];
-
-    // Choose pivots and eliminate variables
-    if (fabs(r3[0]) > fabs(r2[0]))
-    {
-        std::swap(r3, r2);
-    }
-    if (fabs(r2[0]) > fabs(r1[0]))
-    {
-        std::swap(r2, r1);
-    }
-    if (fabs(r1[0]) > fabs(r0[0]))
-    {
-        std::swap(r1, r0);
-    }
-    if (r0[0] == 0)
-    {
-        return false;
-    }
-    t1 = r1[0] / r0[0];
-    t2 = r2[0] / r0[0];
-    t3 = r3[0] / r0[0];
-    t = r0[1];
-    r1[1] -= t1 * t;
-    r2[1] -= t2 * t;
-    r3[1] -= t3 * t;
-    t = r0[2];
-    r1[2] -= t1 * t;
-    r2[2] -= t2 * t;
-    r3[2] -= t3 * t;
-    t = r0[3];
-    r1[3] -= t1 * t;
-    r2[3] -= t2 * t;
-    r3[3] -= t3 * t;
-    t = r0[4];
-    if (t != 0.0)
-    {
-        r1[4] -= t1 * t;
-        r2[4] -= t2 * t;
-        r3[4] -= t3 * t;
-    }
-    t = r0[5];
-    if (t != 0.0)
-    {
-        r1[5] -= t1 * t;
-        r2[5] -= t2 * t;
-        r3[5] -= t3 * t;
-    }
-    t = r0[6];
-    if (t != 0.0)
-    {
-        r1[6] -= t1 * t;
-        r2[6] -= t2 * t;
-        r3[6] -= t3 * t;
-    }
-    t = r0[7];
-    if (t != 0.0)
-    {
-        r1[7] -= t1 * t;
-        r2[7] -= t2 * t;
-        r3[7] -= t3 * t;
-    }
-
-    if (fabs(r3[1]) > fabs(r2[1]))
-    {
-        std::swap(r3, r2);
-    }
-    if (fabs(r2[1]) > fabs(r1[1]))
-    {
-        std::swap(r2, r1);
-    }
-    if (r1[1] == 0)
-    {
-        return false;
-    }
-    t2 = r2[1] / r1[1];
-    t3 = r3[1] / r1[1];
-    r2[2] -= t2 * r1[2];
-    r3[2] -= t3 * r1[2];
-    r2[3] -= t2 * r1[3];
-    r3[3] -= t3 * r1[3];
-    t = r1[4];
-    if (0.0 != t)
-    {
-        r2[4] -= t2 * t;
-        r3[4] -= t3 * t;
-    }
-    t = r1[5];
-    if (0.0 != t)
-    {
-        r2[5] -= t2 * t;
-        r3[5] -= t3 * t;
-    }
-    t = r1[6];
-    if (0.0 != t)
-    {
-        r2[6] -= t2 * t;
-        r3[6] -= t3 * t;
-    }
-    t = r1[7];
-    if (0.0 != t)
-    {
-        r2[7] -= t2 * t;
-        r3[7] -= t3 * t;
-    }
-
-    if (fabs(r3[2]) > fabs(r2[2]))
-    {
-        std::swap(r3, r2);
-    }
-    if (r2[2] == 0)
-    {
-        return false;
-    }
-    t3 = r3[2] / r2[2];
-    r3[3] -= t3 * r2[3];
-    r3[4] -= t3 * r2[4];
-    r3[5] -= t3 * r2[5];
-    r3[6] -= t3 * r2[6];
-    r3[7] -= t3 * r2[7];
-
-    if (r3[3] == 0)
-    {
-        return false;
-    }
-
-    // Substitute back
-    t = 1.0f / r3[3];
-    r3[4] *= t;
-    r3[5] *= t;
-    r3[6] *= t;
-    r3[7] *= t;                                                        // Row 3
-
-    t2 = r2[3];
-    t = 1.0f / r2[2];              // Row 2
-    r2[4] = t * (r2[4] - r3[4] * t2);
-    r2[5] = t * (r2[5] - r3[5] * t2);
-    r2[6] = t * (r2[6] - r3[6] * t2);
-    r2[7] = t * (r2[7] - r3[7] * t2);
-    t1 = r1[3];
-    r1[4] -= r3[4] * t1;
-    r1[5] -= r3[5] * t1;
-    r1[6] -= r3[6] * t1;
-    r1[7] -= r3[7] * t1;
-    t0 = r0[3];
-    r0[4] -= r3[4] * t0;
-    r0[5] -= r3[5] * t0;
-    r0[6] -= r3[6] * t0;
-    r0[7] -= r3[7] * t0;
-
-    t1 = r1[2];
-    t = 1.0f / r1[1];              // Row 1
-    r1[4] = t * (r1[4] - r2[4] * t1);
-    r1[5] = t * (r1[5] - r2[5] * t1);
-    r1[6] = t * (r1[6] - r2[6] * t1);
-    r1[7] = t * (r1[7] - r2[7] * t1);
-    t0 = r0[2];
-    r0[4] -= r2[4] * t0;
-    r0[5] -= r2[5] * t0;
-    r0[6] -= r2[6] * t0, r0[7] -= r2[7] * t0;
-
-    t0 = r0[1];
-    t = 1.0f / r0[0];              // Row 0
-    r0[4] = t * (r0[4] - r1[4] * t0);
-    r0[5] = t * (r0[5] - r1[5] * t0);
-    r0[6] = t * (r0[6] - r1[6] * t0);
-    r0[7] = t * (r0[7] - r1[7] * t0);
-
-    out.m00 = r0[4];
-    out.m01 = r0[5];
-    out.m02 = r0[6];
-    out.m03 = r0[7];
-    out.m10 = r1[4];
-    out.m11 = r1[5];
-    out.m12 = r1[6];
-    out.m13 = r1[7];
-    out.m20 = r2[4];
-    out.m21 = r2[5];
-    out.m22 = r2[6];
-    out.m23 = r2[7];
-    out.m30 = r3[4];
-    out.m31 = r3[5];
-    out.m32 = r3[6];
-    out.m33 = r3[7];
-
-    return true;
-}
-
-static int sUnProject(float winx, float winy, float winz, const float model[16], const float proj[16], const int viewport[4], float* objx, float* objy, float* objz)
-{
-    Vec4 vIn;
-    vIn.x = (winx - viewport[0]) * 2 / viewport[2] - 1.0f;
-    vIn.y = (winy - viewport[1]) * 2 / viewport[3] - 1.0f;
-    vIn.z = winz;//2.0f * winz - 1.0f;
-    vIn.w = 1.0;
-
-    float m1[16];
-    for (int i = 0; i < 4; i++)
-    {
-        float ai0 = proj[i], ai1 = proj[4 + i], ai2 = proj[8 + i], ai3 = proj[12 + i];
-        m1[i] = ai0 * model[0] + ai1 * model[1] + ai2 * model[2] + ai3 * model[3];
-        m1[4 + i] = ai0 * model[4] + ai1 * model[5] + ai2 * model[6] + ai3 * model[7];
-        m1[8 + i] = ai0 * model[8] + ai1 * model[9] + ai2 * model[10] + ai3 * model[11];
-        m1[12 + i] = ai0 * model[12] + ai1 * model[13] + ai2 * model[14] + ai3 * model[15];
-    }
-
-    Matrix44 m;
-    InvertMatrixPrecise(m, m1);
-
-    Vec4 vOut = m * vIn;
-    if (vOut.w == 0.0)
-    {
-        return false;
-    }
-    *objx = vOut.x / vOut.w;
-    *objy = vOut.y / vOut.w;
-    *objz = vOut.z / vOut.w;
-    return true;
-}
-
-int CD3D9Renderer::UnProject(float sx, float sy, float sz, float* px, float* py, float* pz, const float modelMatrix[16], const float projMatrix[16], const int viewport[4])
-{
-    return sUnProject(sx, sy, sz, modelMatrix, projMatrix, viewport, px, py, pz);
-}
-
-int CD3D9Renderer::UnProjectFromScreen(float sx, float sy, float sz, float* px, float* py, float* pz)
-{
-    float modelMatrix[16];
-    float projMatrix[16];
-    int viewport[4];
-
-    const int nThreadID = m_pRT->GetThreadList();
-    if (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        sz = 1.0f - sz;
-    }
-
-    GetModelViewMatrix(modelMatrix);
-    GetProjectionMatrix(projMatrix);
-    GetViewport(&viewport[0], &viewport[1], &viewport[2], &viewport[3]);
-    return sUnProject(sx, sy, sz, modelMatrix, projMatrix, viewport, px, py, pz);
-}
-
-//////////////////////////////////////////////////////////////////////
-
-void CD3D9Renderer::ClearTargetsImmediately(uint32 nFlags)
-{
-    m_pRT->RC_ClearTargetsImmediately(0, nFlags, Clr_Transparent, Clr_FarPlane.r);
-}
-
-void CD3D9Renderer::ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth)
-{
-    m_pRT->RC_ClearTargetsImmediately(1, nFlags, Colors, fDepth);
-}
-
-void CD3D9Renderer::ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors)
-{
-    m_pRT->RC_ClearTargetsImmediately(2, nFlags, Colors, Clr_FarPlane.r);
-}
-
-void CD3D9Renderer::ClearTargetsImmediately(uint32 nFlags, float fDepth)
-{
-    m_pRT->RC_ClearTargetsImmediately(3, nFlags, Clr_Transparent, fDepth);
-}
-
-void CD3D9Renderer::ClearTargetsLater(uint32 nFlags)
-{
-    EF_ClearTargetsLater(nFlags);
-}
-
-void CD3D9Renderer::ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth)
-{
-    EF_ClearTargetsLater(nFlags, Colors, fDepth, 0);
-}
-
-void CD3D9Renderer::ClearTargetsLater(uint32 nFlags, const ColorF& Colors)
-{
-    EF_ClearTargetsLater(nFlags, Colors);
-}
-
-void CD3D9Renderer::ClearTargetsLater(uint32 nFlags, float fDepth)
-{
-    EF_ClearTargetsLater(nFlags, fDepth, 0);
-}
-#ifdef _DEBUG
-
-int s_In2DMode[RT_COMMAND_BUF_COUNT];
-
-#endif
-
-void CD3D9Renderer::Set2DMode(uint32 orthoX, uint32 orthoY, TransformationMatrices& backupMatrices, float znear, float zfar)
-{
-    Set2DModeNonZeroTopLeft(0.0f, 0.0f, orthoX, orthoY, backupMatrices, znear, zfar);
-}
-
-void CD3D9Renderer::Unset2DMode(const TransformationMatrices& restoringMatrices)
-{
-    int nThreadID = m_pRT->GetThreadList();
-
-#ifdef _DEBUG
-    assert(s_In2DMode[nThreadID]-- > 0);
-#endif
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (m_pRenderAuxGeomD3D)
-    {
-        m_pRenderAuxGeomD3D->SetOrthoMode(false);
-    }
-#endif
-
-    m_RP.m_TI[nThreadID].m_matView = restoringMatrices.m_viewMatrix;
-    m_RP.m_TI[nThreadID].m_matProj = restoringMatrices.m_projectMatrix;
-    EF_SetCameraInfo();
-}
-
-void CD3D9Renderer::Set2DModeNonZeroTopLeft(float orthoLeft, float orthoTop, float orthoWidth, float orthoHeight, TransformationMatrices& backupMatrices, float znear, float zfar)
-{
-    int nThreadID = m_pRT->GetThreadList();
-
-#ifdef _DEBUG
-    assert(s_In2DMode[nThreadID]++ >= 0);
-#endif
-
-    backupMatrices.m_projectMatrix = m_RP.m_TI[nThreadID].m_matProj;
-    Matrix44A* m = &m_RP.m_TI[nThreadID].m_matProj;
-
-    //Move the zfar a bit away from the znear if they're the same.
-    if (AZ::IsClose(znear, zfar, .001f))
-    {
-        zfar += .01f;
-    }
-
-    float left = orthoLeft;
-    float right = left + orthoWidth;
-    float top = orthoTop;
-    float bottom = top + orthoHeight;
-
-    // If we are doing tiled rendering (e.g. for a hi-res screenshot) then adjust the viewport
-    const SRenderTileInfo* rti = GetRenderTileInfo();
-    if (rti->nGridSizeX > 1.0f || rti->nGridSizeY > 1.0f)
-    {
-        // The tile size includes a transition border around it. This has all been pre-calculated by
-        // the code that sets up the tiling.
-        float halfTileWidth = (orthoWidth / rti->nGridSizeX) * 0.5f;
-        float halfTileHeight = (orthoHeight / rti->nGridSizeY) * 0.5f;
-
-        // This is the normalized offset from the center of the (non-tiled) viewport to the center of the tile.
-        // Again the numbers in the struct have been pre-calculated to make setting a 3D matrix easier.
-        float normalizedOffsetX = (rti->nGridSizeX - 1.f) - rti->nPosX * 2.0f;
-        float normalizedOffsetY = (rti->nGridSizeY - 1.f) - rti->nPosY * 2.0f;
-
-        // calculate the midpoint of this tile
-        float midX = (orthoWidth * 0.5f) + (halfTileWidth * normalizedOffsetX);
-        float midY = (orthoHeight * 0.5f) + (halfTileHeight * normalizedOffsetY);
-
-        left = midX - halfTileWidth;
-        right = midX + halfTileWidth;
-        top = midY - halfTileHeight;
-        bottom = midY + halfTileHeight;
-    }
-
-    mathMatrixOrthoOffCenterLH(m, left, right, bottom, top, znear, zfar);
-
-    if (m_RP.m_TI[nThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        (*m) = ReverseDepthHelper::Convert(*m);
-    }
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (m_pRenderAuxGeomD3D)
-    {
-        m_pRenderAuxGeomD3D->SetOrthoMode(true, m);
-    }
-#endif
-
-    backupMatrices.m_viewMatrix = m_RP.m_TI[nThreadID].m_matView;
-    m = &m_RP.m_TI[nThreadID].m_matView;
-    m_RP.m_TI[nThreadID].m_matView.SetIdentity();
-
-    EF_SetCameraInfo();
-}
-
-void CD3D9Renderer::RemoveTexture(unsigned int TextureId)
-{
-    if (!TextureId)
-    {
-        return;
-    }
-
-    CTexture* tp = CTexture::GetByID(TextureId);
-    if (!tp)
-    {
-        return;
-    }
-
-    bool bShadow = false;
-    if (!bShadow)
-    {
-        if (tp->IsAsyncDevTexCreation())
-        {
-            SResourceAsync* pInfo = new SResourceAsync();
-            pInfo->eClassName = eRCN_Texture;
-            pInfo->pResource = tp;
-            gRenDev->ReleaseResourceAsync(pInfo);
-        }
-        else
-        {
-            SAFE_RELEASE(tp);
-        }
-    }
-}
-
-void CD3D9Renderer::DeleteFont(IFFont* font)
-{
-    gRenDev->m_pRT->RC_ReleaseFont(font);
-}
-
-void CD3D9Renderer::UpdateTextureInVideoMemory(uint32 tnum, const byte* newdata, int posx, int posy, int w, int h, ETEX_Format eTFSrc, int posz, int sizez)
-{
-    if (m_bDeviceLost)
-    {
-        return;
-    }
-
-    CTexture* pTex = CTexture::GetByID(tnum);
-    pTex->UpdateTextureRegion(newdata, posx, posy, posz, w, h, sizez, eTFSrc);
-}
-
-// Passing the actual texture resource to the renderer and prepping correct Mip
-bool CD3D9Renderer::EF_PrecacheResource(SShaderItem* pSI, float fMipFactorSI, [[maybe_unused]] float fTimeToReady, int Flags, int nUpdateId, int nCounter)
-{
-    CShader*            pSH = (CShader*)pSI->m_pShader;
-    CShaderResources*   pSR = (CShaderResources*)pSI->m_pShaderResources;
-
-    if (pSH && !(pSH->m_Flags & EF_NODRAW) && pSR)
-    {
-        for (auto iter = pSR->m_TexturesResourcesMap.begin(); iter != pSR->m_TexturesResourcesMap.end(); ++iter)
-        {
-            SEfResTexture*  pResTex = &(iter->second);
-            ITexture*       pITex = pResTex->m_Sampler.m_pITex;
-            if (pITex)
-            {
-                float fMipFactor = fMipFactorSI * min(fabsf(pResTex->GetTiling(0)), fabsf(pResTex->GetTiling(1)));
-                CD3D9Renderer::EF_PrecacheResource(pITex, fMipFactor, 0.f, Flags, nUpdateId, nCounter);
-            }
-        }
-    }
-    return true;
-}
-
-bool CD3D9Renderer::EF_PrecacheResource(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter)
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    // Check for the presence of a D3D device
-    assert(m_Device);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_TexturesStreamingDebug)
-    {
-        const char* const sTexFilter = CRenderer::CV_r_TexturesStreamingDebugfilter->GetString();
-        if (sTexFilter != 0 && sTexFilter[0])
-        {
-            if (strstr(pTP->GetName(), sTexFilter))
-            {
-                CryLogAlways("CD3D9Renderer::EF_PrecacheResource: Mip=%5.2f nUpdateId=%4d (%s) Name=%s",
-                    fMipFactor, nUpdateId, (Flags & FPR_SINGLE_FRAME_PRIORITY_UPDATE) ? "NEAR" : "FAR", pTP->GetName());
-            }
-        }
-    }
-
-    m_pRT->RC_PrecacheResource(pTP, fMipFactor, fTimeToReady, Flags, nUpdateId, nCounter);
-
-    return true;
-}
-
-ITexture* CD3D9Renderer::EF_CreateCompositeTexture(int type, const char* szName, int nWidth, int nHeight, [[maybe_unused]] int nDepth, int nMips, int nFlags, ETEX_Format eTF, const STexComposition* pCompositions, size_t nCompositions, [[maybe_unused]] int8 nPriority)
-{
-    ITexture* pTex = NULL;
-
-    switch (type)
-    {
-    case eTT_2DArray:
-        pTex = CTexture::Create2DCompositeTexture(szName, nWidth, nHeight, nMips, nFlags, eTF, pCompositions, nCompositions);
-        break;
-
-    default:
-        CRY_ASSERT_MESSAGE(0, "Not implemented texture format");
-        pTex = CTextureManager::Instance()->GetNoTexture();
-    }
-
-    return pTex;
-}
-
-void CD3D9Renderer::CreateResourceAsync(SResourceAsync* pResource)
-{
-    m_pRT->RC_CreateResource(pResource);
-}
-void CD3D9Renderer::ReleaseResourceAsync(SResourceAsync* pResource)
-{
-    m_pRT->RC_ReleaseResource(pResource);
-}
-void CD3D9Renderer::ReleaseResourceAsync(AZStd::unique_ptr<SResourceAsync> pResource)
-{
-    m_pRT->RC_ReleaseResource(AZStd::move(pResource));
-}
-
-unsigned int CD3D9Renderer::DownLoadToVideoMemory(const byte* data, int w, int h, int d, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, ETEX_Type eTT, bool repeat, int filter, int Id, const char* szCacheName, int flags, [[maybe_unused]] EEndian eEndian, RectI* pRegion, bool bAsyncDevTexCreation)
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_RENDERER, g_bProfilerEnabled);
-
-    char name[128];
-    {
-        if (!szCacheName)
-        {
-            sprintf_s(name, "$AutoDownload_%d", m_TexGenID++);
-        }
-        else
-        {
-            azstrcpy(name, AZ_ARRAY_SIZE(name), szCacheName);
-        }
-    }
-
-    if (!nummipmap)
-    {
-        if (filter != FILTER_BILINEAR && filter != FILTER_TRILINEAR)
-        {
-            flags |= FT_NOMIPS;
-        }
-        nummipmap = 1;
-    }
-    else
-    {
-        // TODO (bethelz): Calc mips on magic number is confusing. Replace with explicit request.
-        if (nummipmap < 0)
-        {
-            nummipmap = CTexture::CalcNumMips(w, h);
-        }
-    }
-
-    if (!repeat)
-    {
-        flags |= FT_STATE_CLAMP;
-    }
-
-    if (!szCacheName)
-    {
-        flags |= FT_DONT_STREAM;
-    }
-
-    if (Id > 0)
-    {
-        //
-        // Texture ID exists, grab the texture by id and update the texture data
-        //
-
-        CTexture* texture = CTexture::GetByID(Id);
-        if (texture)
-        {
-            RectI rect(0, 0, w, h);
-            if (pRegion)
-            {
-                rect.x = pRegion->x;
-                rect.y = pRegion->y;
-                rect.w = pRegion->w;
-                rect.h = pRegion->h;
-            }
-
-            texture->UpdateTextureRegion(data, rect.x, rect.y, 0, rect.w, rect.h, 1, eTFSrc);
-            return Id;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-    else
-    {
-        CTexture* texture = nullptr;
-
-        bool bIsMultiThreadedRenderer = false;
-        gRenDev->EF_Query(EFQ_RenderMultithreaded, bIsMultiThreadedRenderer);
-
-        //
-        // Asynchronous creation path
-        //
-        if (bAsyncDevTexCreation && bIsMultiThreadedRenderer)
-        {
-            // make texture without device texture and request it async creation
-            SResourceAsync* asyncRequest = new SResourceAsync();
-            asyncRequest->pData = nullptr;
-            if (data)
-            {
-                int nImgSize = CTexture::TextureDataSize(w, h, 1, nummipmap, 1, eTFSrc);
-                asyncRequest->pData = new byte[nImgSize];
-                memcpy(asyncRequest->pData, data, nImgSize);
-            }
-            asyncRequest->eClassName = eRCN_Texture;
-            asyncRequest->nWidth = w;
-            asyncRequest->nHeight = h;
-            asyncRequest->nMips = nummipmap;
-            asyncRequest->nTexFlags = flags;
-            asyncRequest->nFormat = eTFDst;
-
-            texture = CTexture::CreateTextureObject(name, w, h, 1, eTT_2D, flags, eTFDst);
-            texture->m_bAsyncDevTexCreation = bAsyncDevTexCreation;
-            texture->m_eTFSrc = eTFSrc;
-            texture->m_nMips = nummipmap;
-
-            asyncRequest->nTexId = texture->GetID();
-            gRenDev->CreateResourceAsync(asyncRequest);
-        }
-
-        //
-        // Synchronous creation path
-        //
-        else
-        {
-            switch (eTT)
-            {
-            case eTT_3D:
-                texture = CTexture::Create3DTexture(name, w, h, d, nummipmap, flags, data, eTFSrc, eTFDst);
-                break;
-            case eTT_2D:
-                texture = CTexture::Create2DTexture(name, w, h, nummipmap, flags, data, eTFSrc, eTFDst);
-                break;
-            default:
-                assert(!"Not supported");
-                return 0;
-            }
-        }
-
-        return texture->GetID();
-    }
-}
-
-unsigned int CD3D9Renderer::DownLoadToVideoMemory(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat, int filter, int Id, const char* szCacheName, int flags, EEndian eEndian, RectI* pRegion, bool bAsyncDevTexCreation)
-{
-    return DownLoadToVideoMemory(data, w, h, 1, eTFSrc, eTFDst, nummipmap, eTT_2D, repeat, filter, Id, szCacheName, flags, eEndian, pRegion, bAsyncDevTexCreation);
-}
-
-unsigned int CD3D9Renderer::DownLoadToVideoMemoryCube(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat, int filter, int Id, const char* szCacheName, int flags, EEndian eEndian, RectI* pRegion, bool bAsyncDevTexCreation)
-{
-    return DownLoadToVideoMemory(data, w, h, 1, eTFSrc, eTFDst, nummipmap, eTT_Cube, repeat, filter, Id, szCacheName, flags, eEndian, pRegion, bAsyncDevTexCreation);
-}
-
-unsigned int CD3D9Renderer::DownLoadToVideoMemory3D(const byte* data, int w, int h, int d, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat, int filter, int Id, const char* szCacheName, int flags, EEndian eEndian, RectI* pRegion, bool bAsyncDevTexCreation)
-{
-    return DownLoadToVideoMemory(data, w, h, d, eTFSrc, eTFDst, nummipmap, eTT_3D, repeat, filter, Id, szCacheName, flags, eEndian, pRegion, bAsyncDevTexCreation);
-}
-
-float CD3D9Renderer::GetGPUFrameTime()
-{
-    return CRenderer::GetGPUFrameTime();
-}
-
-void CD3D9Renderer::GetRenderTimes(SRenderTimes& outTimes)
-{
-    CRenderer::GetRenderTimes(outTimes);
-}
-
-const char* sStreamNames[] = {
-    "VSF_GENERAL",
-    "VSF_TANGENTS",
-    "VSF_QTANGENTS",
-    "VSF_HWSKIN_INFO",
-    "VSF_VERTEX_VELOCITY",
-#if ENABLE_NORMALSTREAM_SUPPORT
-    "VSF_NORMALS"
-#endif
-};
-
-void CD3D9Renderer::GetLogVBuffers()
-{
-    CRenderMesh* pRM = NULL;
-    int nNums = 0;
-    AUTO_LOCK(CRenderMesh::m_sLinkLock);
-    for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-    {
-        int nTotal = 0;
-        string final;
-        char tmp[128];
-
-        COMPILE_TIME_ASSERT(sizeof(sStreamNames) / sizeof(sStreamNames[0]) == VSF_NUM);
-        for (int i = 0; i < VSF_NUM; i++)
-        {
-            int nSize = iter->item<&CRenderMesh::m_Chain>()->GetStreamStride(i);
-
-            sprintf_s(tmp, "| %s | %d ", sStreamNames[i], nSize);
-            final += tmp;
-            nTotal += nSize;
-        }
-        if (nTotal)
-        {
-            CryLog("%s | Total | %d %s", pRM->m_sSource.c_str(), nTotal, final.c_str());
-        }
-        nNums++;
-    }
-}
-
-void CD3D9Renderer::GetMemoryUsage(ICrySizer* Sizer)
-{
-    assert(Sizer);
-
-    {
-        SIZER_COMPONENT_NAME(Sizer, "CRenderer");
-        CRenderer::GetMemoryUsage(Sizer);
-    }
-
-    uint32 i, j;
-
-    //SIZER_COMPONENT_NAME(Sizer, "GLRenderer");
-    {
-        SIZER_COMPONENT_NAME(Sizer, "Renderer dynamic");
-
-        Sizer->AddObject(this, sizeof(CD3D9Renderer));
-
-        for (j = 0; j < RT_COMMAND_BUF_COUNT; j++)
-        {
-            for (i = 0; i < MAX_REND_RECURSION_LEVELS; i++)
-            {
-                Sizer->AddObject(CREClientPoly::m_PolysStorage[i][j]);
-            }
-        }
-    }
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    {
-        SIZER_COMPONENT_NAME(Sizer, "Renderer Aux Geometries");
-        Sizer->AddObject(m_pRenderAuxGeomD3D);
-    }
-#endif
-    {
-        SIZER_COMPONENT_NAME(Sizer, "Renderer CryName");
-        static CCryNameR sName;
-        Sizer->AddObject(&sName, CCryNameR::GetMemoryUsage());
-    }
-
-
-    {
-        SIZER_COMPONENT_NAME(Sizer, "Shaders");
-        CCryNameTSCRC Name = CShader::mfGetClassName();
-        SResourceContainer* pRL = NULL;
-        {
-            SIZER_COMPONENT_NAME(Sizer, "Shader manager");
-            Sizer->AddObject(m_cEF);
-        }
-        {
-            SIZER_COMPONENT_NAME(Sizer, "Shader resources");
-            Sizer->AddObject(CShader::s_ShaderResources_known);
-        }
-        {
-            SIZER_COMPONENT_NAME(Sizer, "ShaderCache");
-            Sizer->AddObject(CHWShader::m_ShaderCache);
-        }
-        {
-            SIZER_COMPONENT_NAME(Sizer, "HW Shaders");
-
-            Name = CHWShader::mfGetClassName(eHWSC_Vertex);
-            pRL = CBaseResource::GetResourcesForClass(Name);
-            Sizer->AddObject(pRL);
-
-            Name = CHWShader::mfGetClassName(eHWSC_Pixel);
-            pRL = CBaseResource::GetResourcesForClass(Name);
-            Sizer->AddObject(pRL);
-        }
-        {
-            SIZER_COMPONENT_NAME(Sizer, "Compressed Shaders");
-            Sizer->AddObject(CHWShader::m_CompressedShaders);
-        }
-
-        {
-            SIZER_COMPONENT_NAME(Sizer, "Shared Shader Parameters");
-            Sizer->AddObject(CGParamManager::s_Groups);
-            Sizer->AddObject(CGParamManager::s_Pools);
-        }
-        {
-            SIZER_COMPONENT_NAME(Sizer, "Light styles");
-            Sizer->AddObject(CLightStyle::s_LStyles);
-        }
-        {
-            SIZER_COMPONENT_NAME(Sizer, "SResourceContainer");
-            Name = CShader::mfGetClassName();
-            pRL = CBaseResource::GetResourcesForClass(Name);
-            Sizer->AddObject(pRL);
-        }
-    }
-    {
-        SIZER_COMPONENT_NAME(Sizer, "Mesh");
-        AUTO_LOCK(CRenderMesh::m_sLinkLock);
-        for (util::list<CRenderMesh>* iter = CRenderMesh::m_MeshList.next; iter != &CRenderMesh::m_MeshList; iter = iter->next)
-        {
-            CRenderMesh* pRM = iter->item<&CRenderMesh::m_Chain>();
-            pRM->m_sResLock.Lock();
-            pRM->GetMemoryUsage(Sizer);
-            if (pRM->_GetVertexContainer() != pRM)
-            {
-                pRM->_GetVertexContainer()->GetMemoryUsage(Sizer);
-            }
-            pRM->m_sResLock.Unlock();
-        }
-    }
-    {
-        SIZER_COMPONENT_NAME(Sizer, "Render elements");
-
-        AUTO_LOCK(m_sREResLock);
-        CRendElement* pRE = CRendElement::m_RootGlobal.m_NextGlobal;
-        while (pRE != &CRendElement::m_RootGlobal)
-        {
-            Sizer->AddObject(pRE);
-            pRE = pRE->m_NextGlobal;
-        }
-    }
-    {
-        SIZER_COMPONENT_NAME(Sizer, "Texture Objects");
-        SResourceContainer* pRL = CBaseResource::GetResourcesForClass(CTexture::mfGetClassName());
-        if (pRL)
-        {
-            ResourcesMapItor itor;
-            for (itor = pRL->m_RMap.begin(); itor != pRL->m_RMap.end(); itor++)
-            {
-                CTexture* tp = (CTexture*)itor->second;
-                if (!tp || tp->IsNoTexture())
-                {
-                    continue;
-                }
-                tp->GetMemoryUsage(Sizer);
-            }
-        }
-    }
-    CTexture::s_pPoolMgr->GetMemoryUsage(Sizer);
-}
-
-bool CD3D9Renderer::IsStereoEnabled() const
-{
-    return GetS3DRend().IsStereoEnabled();
-}
-
-
-void CD3D9Renderer::PostLevelLoading()
-{
-    CRenderer::PostLevelLoading();
-    if (gRenDev)
-    {
-        m_bStartLevelLoading = false;
-        if (m_pRT->IsMultithreaded())
-        {
-            iLog->Log("-- Render thread was idle during level loading: %.3f secs", gRenDev->m_pRT->m_fTimeIdleDuringLoading);
-            iLog->Log("-- Render thread was busy during level loading: %.3f secs", gRenDev->m_pRT->m_fTimeBusyDuringLoading);
-        }
-
-        //if (!IsEditorMode() && !CheckDeviceLost())
-        //  Reset();
-        //STLALLOCATOR_CLEANUP
-        m_pRT->RC_PostLoadLevel();
-        m_cEF.mfSortResources();
-    }
-
-    {
-        LOADING_TIME_PROFILE_SECTION(iSystem);
-        CTexture::Precache();
-    }
-}
-
-//====================================================================
-
-void CD3D9Renderer::PostLevelUnload()
-{
-    if (m_pRT)
-    {
-        m_pRT->RC_FlushTextureStreaming(true);
-
-        m_pRT->FlushAndWait();
-
-        //In the level unload event shaders may get deleted. If that's the case any PSOs
-        //that point to those deleted shaders will be invalid and will cause a crash if used.
-        //Most shaders will be unloaded so invalidate the entire PSO cache and reset the pipeline.
-        
-        CDeviceObjectFactory::GetInstance().InvalidatePSOCache();
-        //Tell the graphics pipeline to reset and throw out existing PSOs since they're now invalid
-        gcpRendD3D->GetGraphicsPipeline().Reset();
-
-        StaticCleanup();
-        if (m_pColorGradingControllerD3D)
-        {
-            m_pColorGradingControllerD3D->ReleaseTextures();
-        }
-        if (CTexture::IsTextureExist(CTexture::s_ptexWaterVolumeTemp))
-        {
-            CTexture::s_ptexWaterVolumeTemp->ReleaseDeviceTexture(false);
-        }
-        for (unsigned int i = 0; i < m_TempDepths.Num(); i++)
-        {
-            SDepthTexture* pS = m_TempDepths[i];
-            if (pS)
-            {
-                m_pRT->RC_ReleaseSurfaceResource(pS);
-            }
-        }
-
-        PostProcessUtils().m_pCurDepthSurface = NULL;
-        m_pRT->FlushAndWait();
-
-        for (unsigned int i = 0; i < m_TempDepths.Num(); i++)
-        {
-            SAFE_DELETE(m_TempDepths[i])
-            m_TempDepths.Free();
-        }
-
-        if (CDeferredShading::IsValid())
-        {
-            CDeferredShading::Instance().ResetAllLights();
-            CDeferredShading::Instance().ResetAllClipVolumes();
-        }
-        EF_ResetPostEffects(); // reset post effects
-    }
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    if (m_pRenderAuxGeomD3D)
-    {
-        m_pRenderAuxGeomD3D->FreeMemory();
-    }
-#endif
-
-    CPoissonDiskGen::FreeMemory();
-    if (m_pColorGradingControllerD3D)
-    {
-        m_pColorGradingControllerD3D->FreeMemory();
-    }
-
-    g_shaderBucketAllocator.cleanup();
-    g_shaderGeneralHeap->Cleanup();
-}
-
-void CD3D9Renderer::DebugShowRenderTarget()
-{
-    if (!m_showRenderTargetInfo.bDisplayTransparent)
-    {
-        SetState(GS_NODEPTHTEST);
-    }
-    else
-    {
-        SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-    }
-
-    int x0, y0, w0, h0;
-    GetViewport(&x0, &y0, &w0, &h0);
-    SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-    SetSrgbWrite(false);
-
-    TransformationMatrices backupSceneMatrices;
-    Set2DMode(1, 1, backupSceneMatrices);
-
-    m_cEF.mfRefreshSystemShader("Debug", CShaderMan::s_ShaderDebug);
-    CShader* pSH = CShaderMan::s_ShaderDebug;
-
-    RT_SetViewport(0, 0, m_width, m_height);
-    float tileW = 1.f / static_cast<float>(m_showRenderTargetInfo.col);
-    float tileH = 1.f / static_cast<float>(m_showRenderTargetInfo.col);
-
-    const float tileGapW = tileW * 0.01f;
-    const float tileGapH = tileH * 0.01f;
-
-    if (m_showRenderTargetInfo.col != 1) // If not a fullsceen(= 1x1 table),
-    {
-        tileW -= tileGapW;
-        tileH -= tileGapH;
-    }
-
-    // Draw render targets with a special debug shader.
-    uint32 nPasses = 0;
-    pSH->FXSetTechnique("Debug_RenderTarget");
-    pSH->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pSH->FXBeginPass(0);
-
-    static CCryNameR colorMultiplierName("colorMultiplier");
-    static CCryNameR showRTFlagsName("showRTFlags");
-    int nTexStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    int nTexStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-    size_t col2 = m_showRenderTargetInfo.col * m_showRenderTargetInfo.col;
-    for (size_t i = 0; i < min(m_showRenderTargetInfo.rtList.size(), col2); ++i)
-    {
-        CTexture* pTex = CTexture::GetByID(m_showRenderTargetInfo.rtList[i].textureID);
-        if (!pTex)
-        {
-            continue;
-        }
-
-        int row = i / m_showRenderTargetInfo.col;
-        int col = i - row * m_showRenderTargetInfo.col;
-        float curX = col * (tileW + tileGapW);
-        float curY = row * (tileH + tileGapH);
-        pTex->Apply(0, m_showRenderTargetInfo.rtList[i].bFiltered ? nTexStateLinear : nTexStatePoint);
-
-        Vec4 channelWeight = m_showRenderTargetInfo.rtList[i].channelWeight;
-        pSH->FXSetPSFloat(colorMultiplierName, &channelWeight, 1);
-
-        Vec4 showRTFlags(0, 0, 0, 0); // onlyAlpha, RGBKEncoded, aliased, 0
-        if (channelWeight.x == 0 && channelWeight.y == 0 && channelWeight.z == 0 && channelWeight.w > 0.5f)
-        {
-            showRTFlags.x = 1.0f;
-        }
-        showRTFlags.y = m_showRenderTargetInfo.rtList[i].bRGBKEncoded ? 1.0f : 0.0f;
-        showRTFlags.z = m_showRenderTargetInfo.rtList[i].bAliased ? 1.0f : 0.0f;
-        pSH->FXSetPSFloat(showRTFlagsName, &showRTFlags, 1);
-
-        PostProcessUtils().DrawScreenQuad(pTex->GetWidth(), pTex->GetHeight(), curX, curY, curX + tileW, curY + tileH);
-    }
-
-    pSH->FXEndPass();
-    pSH->FXEnd();
-
-    // Draw overlay texts.
-    for (size_t i = 0; i < min(m_showRenderTargetInfo.rtList.size(), col2); ++i)
-    {
-        CTexture* pTex = CTexture::GetByID(m_showRenderTargetInfo.rtList[i].textureID);
-        if (!pTex)
-        {
-            continue;
-        }
-
-        int row = i / m_showRenderTargetInfo.col;
-        int col = i - row * m_showRenderTargetInfo.col;
-        float curX = col * (tileW + tileGapW);
-        float curY = row * (tileH + tileGapH);
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);  // fix the state change by using WriteXY
-
-        WriteXY((int)(curX * 800 + 2), (int)((curY + tileH) * 600 - 30), 1, 1, 1, 1, 1, 1, "Fmt: %s, Type: %s", pTex->GetFormatName(), CTexture::NameForTextureType(pTex->GetTextureType()));
-        WriteXY((int)(curX * 800 + 2), (int)((curY + tileH) * 600 - 15), 1, 1, 1, 1, 1, 1, "%s   %d x %d", pTex->GetName(), pTex->GetWidth(), pTex->GetHeight());
-    }
-
-    RT_SetViewport(x0, y0, w0, h0);
-    Unset2DMode(backupSceneMatrices);
-}
-
-//====================================================================
-
-ILog* iLog;
-IConsole* iConsole;
-ITimer* iTimer;
-ISystem* iSystem;
-
-
-//////////////////////////////////////////////////////////////////////////
-struct CSystemEventListner_Render
-    : public ISystemEventListener
-{
-public:
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam)
-    {
-        static bool bInside = false;
-        if (bInside)
-        {
-            return;
-        }
-        bInside = true;
-        switch (event)
-        {
-        case ESYSTEM_EVENT_GAME_POST_INIT:
-        {
-        }
-        break;
-
-        case ESYSTEM_EVENT_LEVEL_LOAD_RESUME_GAME:
-        case ESYSTEM_EVENT_LEVEL_LOAD_PREPARE:
-        {
-        }
-        break;
-
-        case ESYSTEM_EVENT_LEVEL_LOAD_START:
-        {
-            if (gRenDev)
-            {
-                gRenDev->m_cEF.m_bActivated = false;
-                gRenDev->m_bEndLevelLoading = false;
-                gRenDev->m_bStartLevelLoading = true;
-                gRenDev->m_bInLevel = true;
-                if (gRenDev->m_pRT)
-                {
-                    gRenDev->m_pRT->m_fTimeIdleDuringLoading = 0;
-                    gRenDev->m_pRT->m_fTimeBusyDuringLoading = 0;
-                }
-            }
-            STLALLOCATOR_CLEANUP
-            if IsCVarConstAccess(constexpr) (CRenderer::CV_r_texpostponeloading)
-            {
-                CTexture::s_bPrecachePhase = true;
-            }
-
-            CTexture::s_bInLevelPhase = true;
-
-            CResFile::m_nMaxOpenResFiles = MAX_OPEN_RESFILES * 2;
-            SShaderBin::s_nMaxFXBinCache = MAX_FXBIN_CACHE * 2;
-        }
-        break;
-        case ESYSTEM_EVENT_LEVEL_LOAD_END:
-        {
-            gRenDev->m_bStartLevelLoading = false;
-            gRenDev->m_bEndLevelLoading = true;
-            gRenDev->m_nFrameLoad++;
-            //STLALLOCATOR_CLEANUP
-        }
-            {
-                gRenDev->RefreshSystemShaders();
-
-                // make sure all commands have been properly processes before leaving the level loading
-                if (gRenDev->m_pRT)
-                {
-                    gRenDev->m_pRT->FlushAndWait();
-                }
-
-                g_shaderBucketAllocator.cleanup();
-                g_shaderGeneralHeap->Cleanup();
-            }
-            break;
-
-        case ESYSTEM_EVENT_LEVEL_PRECACHE_START:
-        {
-            CTexture::s_bPrestreamPhase = true;
-        }
-        break;
-
-        case ESYSTEM_EVENT_LEVEL_PRECACHE_END:
-        {
-            CTexture::s_bPrestreamPhase = false;
-        }
-        break;
-
-        case ESYSTEM_EVENT_LEVEL_UNLOAD:
-        {
-            CTexture::s_bInLevelPhase = false;
-            gRenDev->m_bInLevel = false;
-        }
-        break;
-
-        case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
-        {
-            gRenDev->PostLevelUnload();
-            STLALLOCATOR_CLEANUP;
-            break;
-        }
-        case ESYSTEM_EVENT_RESIZE:
-            break;
-        case ESYSTEM_EVENT_ACTIVATE:
-#if defined(SUPPORT_DEVICE_INFO_MSG_PROCESSING)
-            gcpRendD3D->DevInfo().OnActivate(wparam, lparam);
-#endif
-            break;
-        case ESYSTEM_EVENT_CHANGE_FOCUS:
-            break;
-        case ESYSTEM_EVENT_GAME_POST_INIT_DONE:
-            if (gRenDev && !gRenDev->IsEditorMode())
-            {
-                EnableCloseButton(gRenDev->GetHWND(), true);
-            }
-            break;
-
-#if DRIVERD3D_CPP_TRAIT_ONSYSTEMEVENT_EVENTMOVE
-        case ESYSTEM_EVENT_MOVE:
-        {
-            // When moving the window, update the preferred monitor dimensions so full-screen will pick the closest monitor
-            HWND hWnd = (HWND)gcpRendD3D->GetHWND();
-            HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
-
-            MONITORINFO monitorInfo;
-            monitorInfo.cbSize = sizeof(MONITORINFO);
-            GetMonitorInfo(hMonitor, &monitorInfo);
-
-            gcpRendD3D->m_prefMonX = monitorInfo.rcMonitor.left;
-            gcpRendD3D->m_prefMonY = monitorInfo.rcMonitor.top;
-            gcpRendD3D->m_prefMonWidth = monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left;
-            gcpRendD3D->m_prefMonHeight = monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top;
-        }
-        break;
-#endif
-        }
-        bInside = false;
-    }
-};
-
-static CSystemEventListner_Render g_system_event_listener_render;
-
-extern "C" DLL_EXPORT IRenderer * CreateCryRenderInterface(ISystem * pSystem)
-{
-    ModuleInitISystem(pSystem, "CryRenderer");
-
-    gbRgb = false;
-
-    iConsole = gEnv->pConsole;
-    iLog = gEnv->pLog;
-    iTimer = gEnv->pTimer;
-    iSystem = gEnv->pSystem;
-
-    gcpRendD3D->InitRenderer();
-
-    LARGE_INTEGER li;
-    QueryPerformanceCounter(&li);
-    srand((uint32)li.QuadPart);
-
-    g_CpuFlags = iSystem->GetCPUFlags();
-
-    iSystem->GetISystemEventDispatcher()->RegisterListener(&g_system_event_listener_render);
-    return gRenDev;
-}
-
-class CEngineModule_CryRenderer
-    : public IEngineModule
-{
-    CRYINTERFACE_SIMPLE(IEngineModule)
-    CRYGENERATE_SINGLETONCLASS(CEngineModule_CryRenderer, "EngineModule_CryRenderer", 0x540c91a7338e41d3, 0xaceeac9d55614450)
-
-    virtual const char* GetName() const {
-        return "CryRenderer";
-    }
-    virtual const char* GetCategory() const { return "CryEngine"; }
-
-    virtual bool Initialize(SSystemGlobalEnvironment& env, [[maybe_unused]] const SSystemInitParams& initParams)
-    {
-        ISystem* pSystem = env.pSystem;
-        env.pRenderer = CreateCryRenderInterface(pSystem);
-        return env.pRenderer != 0;
-    }
-};
-
-CRYREGISTER_SINGLETON_CLASS(CEngineModule_CryRenderer)
-
-CEngineModule_CryRenderer::CEngineModule_CryRenderer()
-{
-};
-
-CEngineModule_CryRenderer::~CEngineModule_CryRenderer()
-{
-};
-
-//=========================================================================================
-void CD3D9Renderer::LockParticleVideoMemory(uint32 nThreadId)
-{
-    FRAME_PROFILER("LockParticleVideoMemory", gEnv->pSystem, PROFILE_RENDERER);
-    // unlock the particle VMEM buffer in case no particel were rendered(and thus no unlock was called)
-    UnLockParticleVideoMemory(nThreadId);
-
-    SRenderPipeline& rp = gRenDev->m_RP;
-
-    // lock video memory vertex/index buffer and expose base pointer and offset
-    if (rp.m_pParticleVertexBuffer[nThreadId])
-    {
-        rp.m_pParticleVertexVideoMemoryBase[nThreadId] = rp.m_pParticleVertexBuffer[nThreadId]->LockVB(CV_r_ParticleVerticePoolSize);
-    }
-    if (rp.m_pParticleIndexBuffer[nThreadId])
-    {
-        rp.m_pParticleindexVideoMemoryBase[nThreadId] = alias_cast<byte*>(rp.m_pParticleIndexBuffer[nThreadId]->LockIB(CV_r_ParticleVerticePoolSize * 3));
-    }
-
-    rp.m_nParticleVertexOffset[nThreadId] = 0;
-    rp.m_nParticleIndexOffset[nThreadId] = 0;
-}
-
-void CD3D9Renderer::UnLockParticleVideoMemory(uint32 nThreadId)
-{
-    SRenderPipeline& rp = gRenDev->m_RP;
-
-    // unlock particle vertex/index buffer
-    if (rp.m_pParticleVertexBuffer[nThreadId])
-    {
-        rp.m_pParticleVertexBuffer[nThreadId]->UnlockVB();
-    }
-    if (rp.m_pParticleIndexBuffer[nThreadId])
-    {
-        rp.m_pParticleIndexBuffer[nThreadId]->UnlockIB();
-    }
-}
-
-void CD3D9Renderer::InsertParticleVideoMemoryFence(int nThreadId)
-{
-    SRenderPipeline& rp = gRenDev->m_RP;
-
-    if (rp.m_pParticleVertexBuffer[nThreadId])
-    {
-        rp.m_pParticleVertexBuffer[nThreadId]->SetFence();
-    }
-    if (rp.m_pParticleIndexBuffer[nThreadId])
-    {
-        rp.m_pParticleIndexBuffer[nThreadId]->SetFence();
-    }
-}
-
-#ifdef SUPPORT_HW_MOUSE_CURSOR
-IHWMouseCursor* CD3D9Renderer::GetIHWMouseCursor()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_CPP_SECTION_16
-    #include AZ_RESTRICTED_FILE(DriverD3D_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #error Need implementation of IHWMouseCursor
-#endif
-}
-
-#endif
-
-CD3D9Renderer::FrameBufferDescription::~FrameBufferDescription()
-{
-    if (pDest)
-    {
-        delete[] pDest;
-    }
-
-    if (includeAlpha)
-    {
-        if (tempZtex)
-        {
-            gcpRendD3D->GetDeviceContext().Unmap(tempZtex, 0);
-        } 
-    }
-    SAFE_RELEASE(tempZtex);
-
-    if (pTmpTexture)
-    {
-        gcpRendD3D->GetDeviceContext().Unmap(pTmpTexture, 0);
-    }
-    
-    SAFE_RELEASE(pTmpTexture);
-
-    SAFE_RELEASE(pBackBufferTex);
-}
-
-void CD3D9Renderer::RT_DrawVideoRenderer([[maybe_unused]] AZ::VideoRenderer::IVideoRenderer* pVideoRenderer, const AZ::VideoRenderer::DrawArguments& drawArguments)
-{
-    AZ_Assert(pVideoRenderer != nullptr, "Expected video player to be passed in");
-    GetGraphicsPipeline().RenderVideo(drawArguments);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DriverD3D.h b/Code/CryEngine/RenderDll/XRenderD3D9/DriverD3D.h
deleted file mode 100644
index 266f1da3cb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/DriverD3D.h
+++ /dev/null
@@ -1,2397 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-
-#include "Cry_XOptimise.h"
-#include "IWindowMessageHandler.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DRIVERD3D_H_SECTION_2 2
-#define DRIVERD3D_H_SECTION_3 3
-#define DRIVERD3D_H_SECTION_4 4
-#define DRIVERD3D_H_SECTION_5 5
-#define DRIVERD3D_H_SECTION_6 6
-#define DRIVERD3D_H_SECTION_7 7
-#define DRIVERD3D_H_SECTION_8 8
-#define DRIVERD3D_H_SECTION_9 9
-#define DRIVERD3D_H_SECTION_10 10
-#define DRIVERD3D_H_SECTION_11 11
-#define DRIVERD3D_H_SECTION_12 12
-#endif
-
-# if !defined(_RELEASE)
-# define ENABLE_CONTEXT_THREAD_CHECKING 0
-# endif
-
-# if !defined(ENABLE_CONTEXT_THREAD_CHECKING)
-# define ENABLE_CONTEXT_THREAD_CHECKING 0
-# endif
-
-/*
-===========================================
-The DXRenderer interface Class
-===========================================
-*/
-
-_inline int _VertBufferSize(D3DBuffer* pVB)
-{
-    if (!pVB)
-    {
-        return 0;
-    }
-    D3D11_BUFFER_DESC Desc;
-    pVB->GetDesc(&Desc);
-    return Desc.ByteWidth;
-}
-_inline int _IndexBufferSize(D3DBuffer* pIB)
-{
-    if (!pIB)
-    {
-        return 0;
-    }
-    D3D11_BUFFER_DESC Desc;
-    pIB->GetDesc(&Desc);
-    return Desc.ByteWidth;
-}
-
-
-#define VERSION_D3D 2.0
-
-struct SPixFormat;
-struct SGraphicsPiplinePassContext;
-
-#include "D3DRenderAuxGeom.h"
-#include "D3DColorGradingController.h"
-#include "D3DStereo.h"
-#include "GraphicsPipeline/StandardGraphicsPipeline.h"
-#include <RenderDll/Common/PerInstanceConstantBufferPool.h>
-#include "D3DDeferredShading.h"
-#include "D3DTiledShading.h"
-#include "D3DVolumetricFog.h"
-#include "GPUTimer.h"
-#include "PipelineProfiler.h"
-#include "D3DDebug.h"
-#include "DeviceInfo.h"
-
-//=======================================================================
-
-#include <memory> // std::unique_ptr
-#include <utility> // std::forward
-
-template<typename T, typename ... TArgs>
-inline std::unique_ptr<T> CryMakeUnique(TArgs&& ... args)
-{
-    return std::make_unique<T>(std::forward<TArgs>(args) ...);
-}
-
-
-struct SD3DContext
-{
-    HWND m_hWnd;
-    int m_X;
-    int m_Y;
-    // Real offscreen target width for rendering
-    int m_Width;
-    // Real offscreen target height for rendering
-    int m_Height;
-    IDXGISwapChain* m_pSwapChain;
-    std::vector<D3DSurface*> m_pBackBuffers;
-    D3DSurface* m_pBackBuffer;
-    unsigned int m_pCurrentBackBufferIndex;
-    // Width of viewport on screen to display rendered content in
-    int m_nViewportWidth;
-    // Height of viewport on screen to display rendered content in
-    int m_nViewportHeight;
-    // Pixel resolution scale in X, includes scale from r_SuperSampling and any operating system screen or viewport scale
-    float m_fPixelScaleX;
-    // Pixel resolution scale in Y, includes scale from r_SuperSampling and any operating system screen or viewport scale
-    float m_fPixelScaleY;
-    // Denotes if context refers to main viewport
-    bool m_bMainViewport;
-};
-
-// Texture coordinate rectangle
-struct CoordRect
-{
-    float fLeftU, fTopV;
-    float fRightU, fBottomV;
-};
-
-bool DrawFullScreenQuad(float fLeftU, float fTopV, float fRightU, float fBottomV, bool bClampToScreenRes = true);
-bool DrawFullScreenQuad(CoordRect c, bool bClampToScreenRes = true);
-
-
-struct SStateBlend
-{
-    UnINT64 nHashVal;
-    D3D11_BLEND_DESC Desc;
-    ID3D11BlendState* pState;
-
-    SStateBlend() { memset(this, 0, sizeof(*this)); }
-
-    static uint64 GetHash(const D3D11_BLEND_DESC& InDesc)
-    {
-        UnINT64 nHash;
-        nHash.i.Low = InDesc.AlphaToCoverageEnable |
-            (InDesc.RenderTarget[0].BlendEnable << 1) | (InDesc.RenderTarget[1].BlendEnable << 2) | (InDesc.RenderTarget[2].BlendEnable << 3) | (InDesc.RenderTarget[3].BlendEnable << 4) |
-            (InDesc.RenderTarget[0].SrcBlend << 5) | (InDesc.RenderTarget[0].DestBlend << 10) |
-            (InDesc.RenderTarget[0].SrcBlendAlpha << 15) | (InDesc.RenderTarget[0].DestBlendAlpha << 20) |
-            (InDesc.RenderTarget[0].BlendOp << 25) | (InDesc.RenderTarget[0].BlendOpAlpha << 28);
-        nHash.i.High = InDesc.RenderTarget[0].RenderTargetWriteMask |
-            (InDesc.RenderTarget[1].RenderTargetWriteMask << 4) |
-            (InDesc.RenderTarget[2].RenderTargetWriteMask << 8) |
-            (InDesc.RenderTarget[3].RenderTargetWriteMask << 12) |
-            InDesc.IndependentBlendEnable << 16;
-
-        return nHash.SortVal;
-    }
-} _ALIGN(16);
-
-
-struct SStateRaster
-{
-    uint64 nValuesHash;
-    uint32 nHashVal;
-    ID3D11RasterizerState* pState;
-    D3D11_RASTERIZER_DESC Desc;
-
-    SStateRaster()
-    {
-        memset(this, 0, sizeof(*this));
-        Desc.DepthClipEnable = true;
-        Desc.FillMode = D3D11_FILL_SOLID;
-        Desc.FrontCounterClockwise = TRUE;
-    }
-
-    static uint32 GetHash(const D3D11_RASTERIZER_DESC& InDesc)
-    {
-        uint32 nHash;
-        nHash =      InDesc.FillMode | (InDesc.CullMode << 2) |
-            (InDesc.DepthClipEnable << 4) | (InDesc.FrontCounterClockwise << 5) |
-            (InDesc.ScissorEnable << 6) | (InDesc.MultisampleEnable << 7) | (InDesc.AntialiasedLineEnable << 8) |
-            (InDesc.DepthBias << 9);
-        return nHash;
-    }
-
-    static uint64 GetValuesHash(const D3D11_RASTERIZER_DESC& InDesc)
-    {
-        uint64 nHash;
-        //avoid breaking strict alising rules
-        union f32_u
-        {
-            float floatVal;
-            unsigned int uintVal;
-        };
-        f32_u uDepthBiasClamp;
-        uDepthBiasClamp.floatVal = InDesc.DepthBiasClamp;
-        f32_u uSlopeScaledDepthBias;
-        uSlopeScaledDepthBias.floatVal = InDesc.SlopeScaledDepthBias;
-        nHash = (((uint64)uDepthBiasClamp.uintVal) |
-                 ((uint64)uSlopeScaledDepthBias.uintVal) << 32);
-        return nHash;
-    }
-} _ALIGN(16);
-
-
-_inline uint32 sStencilState(const D3D11_DEPTH_STENCILOP_DESC& Desc)
-{
-    uint32 nST = (Desc.StencilFailOp << 0) |
-        (Desc.StencilDepthFailOp << 4) |
-        (Desc.StencilPassOp << 8) |
-        (Desc.StencilFunc << 12);
-    return nST;
-}
-struct SStateDepth
-{
-    uint64 nHashVal;
-    D3D11_DEPTH_STENCIL_DESC Desc;
-    ID3D11DepthStencilState* pState;
-    SStateDepth()
-        : nHashVal()
-        , pState()
-    {
-        Desc.DepthEnable      = TRUE;
-        Desc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ALL;
-        Desc.DepthFunc        = D3D11_COMPARISON_LESS;
-        Desc.StencilEnable    = FALSE;
-        Desc.StencilReadMask  = D3D11_DEFAULT_STENCIL_READ_MASK;
-        Desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
-
-        Desc.FrontFace.StencilFailOp      = D3D11_STENCIL_OP_KEEP;
-        Desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP;
-        Desc.FrontFace.StencilPassOp      = D3D11_STENCIL_OP_KEEP;
-        Desc.FrontFace.StencilFunc        = D3D11_COMPARISON_ALWAYS;
-
-        Desc.BackFace = Desc.FrontFace;
-    }
-
-    static uint64 GetHash(const D3D11_DEPTH_STENCIL_DESC& InDesc)
-    {
-        uint64 nHash;
-        nHash = (InDesc.DepthEnable << 0) |
-            (InDesc.DepthWriteMask << 1) |
-            (InDesc.DepthFunc << 2) |
-            (InDesc.StencilEnable << 6) |
-            (InDesc.StencilReadMask << 7) |
-            (InDesc.StencilWriteMask << 15) |
-            (((uint64)sStencilState(InDesc.FrontFace)) << 23) |
-            (((uint64)sStencilState(InDesc.BackFace)) << 39);
-        return nHash;
-    }
-} _ALIGN(16); \
-
-#if defined(AZ_PLATFORM_ANDROID)
-#define MAX_OCCL_QUERIES    256
-#else
-#define MAX_OCCL_QUERIES    4096
-#endif
-
-#define MAXFRAMECAPTURECALLBACK 1
-
-//======================================================================
-
-// Options for clearing
-#define CLEAR_ZBUFFER           0x00000001  /* Clear target z buffer, equals D3D11_CLEAR_DEPTH */
-#define CLEAR_STENCIL           0x00000002  /* Clear stencil planes, equals D3D11_CLEAR_STENCIL */
-#define CLEAR_RTARGET           0x00000004  /* Clear target surface */
-
-//======================================================================
-//======================================================================
-/// Forward declared classes
-
-class CHWShader_D3D;
-
-//======================================================================
-/// Direct3D Render driver class
-
-#ifdef SHADER_ASYNC_COMPILATION
-class CAsyncShaderTask;
-#endif
-
-AZStd::vector<D3D11_INPUT_ELEMENT_DESC> GetD3D11Declaration(const AZ::Vertex::Format& vertexFormat);
-
-class CD3D9Renderer
-    : public CRenderer
-    , public IWindowMessageHandler
-    , AZ::RenderNotificationsBus::Handler
-    , AZ::RenderScreenshotRequestBus::Handler
-{
-    friend struct SPixFormat;
-    friend class CD3DStereoRenderer;
-    friend class CTexture;
-    friend class CSceneGBufferPass;
-
-public:
-    CD3D9Renderer();
-    ~CD3D9Renderer();
-
-    virtual SRenderPipeline* GetRenderPipeline() override { return &m_RP; }
-
-    static void StaticCleanup();
-
-    // Remove pointer indirection.
-    ILINE CD3D9Renderer* operator->()
-    {
-        return this;
-    }
-
-    ILINE const bool operator !() const
-    {
-        return false;
-    }
-
-    ILINE operator bool() const
-    {
-        return true;
-    }
-
-    ILINE operator CD3D9Renderer*()
-    {
-        return this;
-    }
-
-    virtual void InitRenderer();
-    virtual void Release();
-
-    virtual const SRenderTileInfo* GetRenderTileInfo() const override { return &m_RenderTileInfo; }
-
-    // CRY DX12
-    static unsigned int GetCurrentBackBufferIndex(IDXGISwapChain* pSwapChain);
-
-    struct SCharInstCB
-    {
-        AzRHI::ConstantBuffer* m_buffer;
-        SSkinningData* m_pSD;
-        util::list<SCharInstCB> list;
-        bool updated;
-
-        SCharInstCB()
-            : m_buffer()
-            , m_pSD()
-            , list()
-            , updated()
-        {
-        }
-
-        ~SCharInstCB() { SAFE_RELEASE(m_buffer); list.erase(); }
-    };
-protected:
-
-    // Invalidates temporal data generated by the renderer that is used by the coverage buffer system.
-    // This should be called whenever a level load happens, a camera teleport occurs, etc.
-    void InvalidateCoverageBufferData();
-
-    // Windows context
-    char      m_WinTitle[80];
-    HINSTANCE m_hInst;
-    HWND      m_hWnd;            // The main app window
-    HWND      m_hWndDesktop;     // The desktop window
-#ifdef WIN32
-    HICON     m_hIconBig;        // Icon currently being used on the taskbar
-    HICON     m_hIconSmall;      // Icon currently being used on the window
-    string    m_iconPath;        // Path to the icon currently loaded
-#endif
-
-    //stereo mode
-    HWND      m_hWnd2;
-
-    int m_bDraw2dImageStretchMode;
-    uint32 m_uLastBlendFlagsPassGroup;
-
-    int m_numOcclusionDownsampleStages;
-
-    // Cached size of the depth target previously used for generating the depth downsample chain
-    uint16 m_occlusionSourceSizeX;
-    uint16 m_occlusionSourceSizeY; 
-        
-    // Data to be populated by the render thread and read by the coverage buffer occlusion thread
-    struct OcclusionReadbackData
-    {
-        ~OcclusionReadbackData();
-
-        void Destroy();
-        void Reset(bool reverseDepth);
-
-        // Matrix used to generate the data in the occlusion readback buffer
-        Matrix44A m_occlusionReadbackViewProj;
-
-        // Contains modified depth data from m_zTargetReadback.  Buffer to only be used by the Coverage Buffer system.
-        float* m_occlusionReadbackBuffer = nullptr;
-    };
-
-    // Packet of data used by the renderer in order to generate occlusion data for the Coverage Buffer system.
-    struct CPUOcclusionData
-    {
-        enum class OcclusionDataState : AZ::u8
-        {
-            OcclusionDataInvalid = 0,
-
-            // Occlusion data is ready for use on the GPU
-            OcclusionDataOnGPU,
-
-            // Occlusion data has been read back on the CPU and is ready for use
-            OcclusionDataOnCPU
-        };
-
-        void SetupOcclusionData(const char* textureName);
-        void Destroy();
-
-        // Matrix used to render the Z-buffer that is downsampled into m_zTargetReadback
-        Matrix44A m_occlusionViewProj;
-
-        // Buffer containing downsampled depth buffer information to be read back by the CPU
-        CTexture* m_zTargetReadback = nullptr;
-
-        // Data to be read by the occlusion thread
-        OcclusionReadbackData m_occlusionReadbackData;
-
-        // Contains whether or not the occlusion data is valid.  Occlusion data should be invalidated on level loads, camera teleports, etc.
-        OcclusionDataState m_occlusionDataState = OcclusionDataState::OcclusionDataInvalid;
-    };
-
-    // Triple buffer our downsampled texture that is used for CPU readbacks to prevent CPU/GPU resource contention
-    static const unsigned int s_numOcclusionReadbackTextures = 3;
-
-    // Set of data generated by FX_ZTargetReadBackOnCPU to be used by the Coverage Buffer system.
-    // Data is triple buffered by default to prevent CPU/GPU synchronization
-    CPUOcclusionData m_occlusionData[s_numOcclusionReadbackTextures];
-
-    // Index into m_occlusionData for which CPU data set PrepareOcclusion should read from.
-    // Will be set from the render thread and read from the occlusion thread
-    AZStd::atomic_uchar m_cpuOcclusionReadIndex;
-    
-    // Current GPU write index into the occlusion data array
-    AZ::u8 m_occlusionBufferIndex = 0;
-    
-    // The Coverage Buffer system in CCullRenderer is templated based on resolution, so this will not change at runtime
-    static const uint16 s_occlusionBufferWidth = CULL_SIZEX;
-    static const uint16 s_occlusionBufferHeight = CULL_SIZEY;
-    static const uint32 s_occlusionBufferNumElements = CULL_SIZEX * CULL_SIZEY;
-    
-    CStandardGraphicsPipeline* m_GraphicsPipeline;
-    CTiledShading* m_pTiledShading;
-    CD3DStereoRenderer* m_pStereoRenderer;
-    CVolumetricFog     m_volumetricFog;
-    std::vector<D3DSurface*> m_pBackBuffers;
-    D3DSurface* m_pBackBuffer;
-    unsigned int m_pCurrentBackBufferIndex;
-    ID3D11RenderTargetView* m_pSecondBackBuffer;
-    D3DDepthSurface* m_pZBuffer;
-    D3DDepthSurface* m_pNativeZBuffer;
-    D3DTexture* m_pZTexture;
-    D3DTexture* m_pNativeZTexture;
-
-    PerInstanceConstantBufferPool m_PerInstanceConstantBufferPool;
-
-    volatile int m_lockCharCB;
-
-    // CharCB can have different sizes depending on bone type.
-    // Therefore we need to keep a list per bone type for re-usability
-    util::list<SCharInstCB> m_CharCBFreeList[eBoneType_Count];
-    util::list<SCharInstCB> m_CharCBActiveList[eBoneType_Count][3];
-
-    volatile int m_CharCBFrameRequired[3];
-    volatile int m_CharCBAllocated;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    IDXGISwapChain*  m_pSwapChain;
-#endif
-    enum PresentStatus
-    {
-        epsOccluded         = 1 << 0,
-        epsNonExclusive = 1 << 1,
-    };
-    DWORD             m_dwPresentStatus;     // Indicate present status
-
-    DWORD             m_dwWindowStyle;   // Saved window style for mode switches
-
-    int               m_SceneRecurseCount;
-
-    SRenderTileInfo m_RenderTileInfo;
-
-    struct C2dImage
-    {
-        CTexture* pTex;
-        CTexture* pTarget;
-        float xpos, ypos, w, h, s0, t0, s1, t1, angle, z, stereoDepth;
-        DWORD col;
-
-        C2dImage(float _xpos, float _ypos, float _w, float _h, CTexture* _pTex, float _s0, float _t0, float _s1, float _t1, float _angle, DWORD _col, float _z, float _stereoDepth, CTexture* _pTarget = NULL)
-            : pTex(_pTex)
-            , xpos(_xpos)
-            , ypos(_ypos)
-            , w(_w)
-            , h(_h)
-            , s0(_s0)
-            , t0(_t0)
-            , s1(_s1)
-            , t1(_t1)
-            , angle(_angle)
-            , z(_z)
-            , col(_col)
-            , stereoDepth(_stereoDepth)
-            , pTarget(_pTarget) {}
-    };
-    TArray<C2dImage>   m_2dImages;
-    // CRY DX12
-    TArray<C2dImage>   m_uiImages;
-    //==================================================================
-
-public:
-    enum
-    {
-        MAX_FRAME_QUERIES = 2
-    };
-    D3DQuery* m_pQuery[MAX_FRAME_QUERIES];
-
-
-#if !defined(_RELEASE)
-    // sprite cells referenced this frame (particular sprite in particular atlas)
-    std::set<uint32> m_SpriteCellsUsed;
-    // sprite atlases referenced this frame
-    std::set<CTexture*> m_SpriteAtlasesUsed;
-#endif
-
-    TArray<COcclusionQuery> m_OcclQueries;
-    uint32 m_OcclQueriesUsed;
-
-    enum EDefShadows_Passes
-    {
-        DS_STENCIL_PASS = 0,
-        DS_HISTENCIL_REFRESH = 1,
-        DS_SHADOW_PASS = 2,
-        DS_SHADOW_CULL_PASS = 3,
-        DS_SHADOW_FRUSTUM_CULL_PASS = 4,
-        DS_STENCIL_VOLUME_CLIP = 5,
-        DS_CLOUDS_SEPARATE = 6,
-        DS_VOLUME_SHADOW_PASS = 7,
-
-        // DS_GMEM_STENCIL_CULL_NON_CONVEX used by CD3D9Renderer::FX_StencilCullNonConvex(...)
-        // in D3DDeferredShading.cpp when using GMEM render path.
-        DS_GMEM_STENCIL_CULL_NON_CONVEX = 8,
-
-        // DS_STENCIL_CULL_NON_CONVEX_RESOLVE used by CD3D9Renderer::FX_StencilCullNonConvex(...)
-        // in D3DDeferredShading.cpp when stencil texture is not supported.
-        DS_STENCIL_CULL_NON_CONVEX_RESOLVE = 9,
-
-        DS_SHADOW_CULL_PASS_FRONTFACING = 10,
-        DS_SHADOW_FRUSTUM_CULL_PASS_FRONTFACING = 11,
-        DS_STENCIL_VOLUME_CLIP_FRONTFACING = 12,
-
-        DS_PASS_MAX
-    };
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-    CD3DDebug m_d3dDebug;
-    bool m_bUpdateD3DDebug;
-#endif
-
-    DWORD m_DeviceOwningthreadID;                   // thread if of thread who is allows to access the D3D Context
-
-    ID3D11InputLayout* m_pLastVDeclaration;
-
-    DXGI_SURFACE_DESC  m_d3dsdBackBuffer; // Surface desc of the BackBuffer
-    DXGI_FORMAT        m_ZFormat;
-
-
-    D3D11_PRIMITIVE_TOPOLOGY m_CurTopology;
-
-    TArray<SStateBlend> m_StatesBL;
-    TArray<SStateRaster> m_StatesRS;
-    TArray<SStateDepth> m_StatesDP;
-    uint32 m_nCurStateBL;
-    uint32 m_nCurStateRS;
-    uint32 m_nCurStateDP;
-    uint8 m_nCurStencRef;
-
-    inline uint32 GetOrCreateBlendState(const D3D11_BLEND_DESC& desc)
-    {
-        uint32 i;
-        HRESULT hr = S_OK;
-        uint64 nHash = SStateBlend::GetHash(desc);
-        for (i = 0; i < m_StatesBL.Num(); i++)
-        {
-            if (m_StatesBL[i].nHashVal.SortVal == nHash)
-            {
-                break;
-            }
-        }
-        if (i == m_StatesBL.Num())
-        {
-            SStateBlend* pState = m_StatesBL.AddIndex(1);
-            pState->Desc = desc;
-            pState->nHashVal.SortVal = nHash;
-            hr = GetDevice().CreateBlendState(&pState->Desc, &pState->pState);
-            assert(SUCCEEDED(hr));
-        }
-        return SUCCEEDED(hr) ? i : uint32(-1);
-    }
-
-    bool SetBlendState(const SStateBlend* pNewState)
-    {
-        uint32 bsIndex = GetOrCreateBlendState(pNewState->Desc);
-        if (bsIndex == uint32(-1))
-        {
-            return false;
-        }
-
-        if (bsIndex != m_nCurStateBL)
-        {
-            m_nCurStateBL = bsIndex;
-            m_DevMan.SetBlendState(m_StatesBL[bsIndex].pState, 0, 0xffffffff);
-        }
-        return true;
-    }
-
-    inline uint32 GetOrCreateRasterState(const D3D11_RASTERIZER_DESC& rasterizerDec, const bool bAllowMSAA = true)
-    {
-        uint32 i;
-        HRESULT hr = S_OK;
-
-        D3D11_RASTERIZER_DESC desc = rasterizerDec;
-
-        BOOL bMSAA = bAllowMSAA && m_RP.m_MSAAData.Type > 1;
-        if (bMSAA != desc.MultisampleEnable)
-        {
-            desc.MultisampleEnable = bMSAA;
-        }
-
-        uint32 nHash = SStateRaster::GetHash(desc);
-        uint64 nValuesHash = SStateRaster::GetValuesHash(desc);
-        for (i = 0; i < m_StatesRS.Num(); i++)
-        {
-            if (m_StatesRS[i].nHashVal == nHash && m_StatesRS[i].nValuesHash == nValuesHash)
-            {
-                break;
-            }
-        }
-        if (i == m_StatesRS.Num())
-        {
-            SStateRaster* pState = m_StatesRS.AddIndex(1);
-            pState->Desc = desc;
-            pState->nHashVal = nHash;
-            pState->nValuesHash = nValuesHash;
-            hr = GetDevice().CreateRasterizerState(&pState->Desc, &pState->pState);
-            assert(SUCCEEDED(hr));
-        }
-        return SUCCEEDED(hr) ? i : uint32(-1);
-    }
-
-    bool SetRasterState(const SStateRaster* pNewState, const bool bAllowMSAA = true)
-    {
-        uint32 rsIndex = GetOrCreateRasterState(pNewState->Desc, bAllowMSAA);
-        if (rsIndex == uint32(-1))
-        {
-            return false;
-        }
-
-        if (rsIndex != m_nCurStateRS)
-        {
-            m_nCurStateRS = rsIndex;
-
-            m_DevMan.SetRasterState(m_StatesRS[rsIndex].pState);
-        }
-        return true;
-    }
-
-    inline uint32 GetOrCreateDepthState(const D3D11_DEPTH_STENCIL_DESC& desc)
-    {
-        uint32 i;
-        HRESULT hr = S_OK;
-        uint64 nHash = SStateDepth::GetHash(desc);
-        const int kNumStates = m_StatesDP.Num();
-        for (i = 0; i < kNumStates; i++)
-        {
-            if (m_StatesDP[i].nHashVal == nHash)
-            {
-                break;
-            }
-        }
-        if (i == kNumStates)
-        {
-            SStateDepth* pState = m_StatesDP.AddIndex(1);
-            pState->Desc = desc;
-            pState->nHashVal = nHash;
-            hr = GetDevice().CreateDepthStencilState(&pState->Desc, &pState->pState);
-            assert(SUCCEEDED(hr));
-        }
-        return SUCCEEDED(hr) ? i : uint32(-1);
-    }
-
-    bool SetDepthState(const SStateDepth* pNewState, uint8 newStencRef)
-    {
-        uint32 dsIndex = GetOrCreateDepthState(pNewState->Desc);
-        if (dsIndex == uint32(-1))
-        {
-            return false;
-        }
-
-        if (dsIndex != m_nCurStateDP || m_nCurStencRef != newStencRef)
-        {
-            m_nCurStateDP = dsIndex;
-            m_nCurStencRef = newStencRef;
-            m_DevMan.SetDepthStencilState(m_StatesDP[dsIndex].pState, newStencRef);
-        }
-
-        return true;
-    }
-
-    void SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY topType)
-    {
-        if (m_CurTopology != topType)
-        {
-            m_CurTopology = topType;
-            m_DevMan.BindTopology(m_CurTopology);
-        }
-    }
-
-    virtual void LockParticleVideoMemory(uint32 nId);
-    virtual void UnLockParticleVideoMemory(uint32 nId);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-
-
-    SDepthTexture m_DepthBufferOrig;
-    SDepthTexture m_DepthBufferOrigMSAA;
-    SDepthTexture m_DepthBufferNative;
-
-    // Bindable depthstencil buffer view and shader resource view. Ideally would be unified into regular texture creation - requires big refactoring
-    D3DDepthSurface* m_pZBufferReadOnlyDSV;
-    D3DShaderResourceView* m_pZBufferDepthReadOnlySRV;
-    D3DShaderResourceView* m_pZBufferStencilReadOnlySRV;
-
-    int m_MaxAnisotropyLevel;
-    int m_nMaterialAnisoHighSampler;
-    int m_nMaterialAnisoLowSampler;
-    int m_nMaterialAnisoSamplerBorder;
-    //===============================================================================
-    //////////////////////////////////////////////////////////////////////////
-    enum
-    {
-        kUnitObjectIndexSizeof = 2
-    };
-
-    D3DBuffer* m_pUnitFrustumVB[SHAPE_MAX];
-    D3DBuffer* m_pUnitFrustumIB[SHAPE_MAX];
-
-    int m_UnitFrustVBSize[SHAPE_MAX];
-    int m_UnitFrustIBSize[SHAPE_MAX];
-
-    D3DBuffer* m_pQuadVB;
-    int16 m_nQuadVBSize;
-
-    //////////////////////////////////////////////////////////////////////////
-#ifdef CRY_USE_METAL
-    SPixFormat        m_FormatPVRTC2;     //ETC2 compressed RGB for mobile
-    SPixFormat        m_FormatPVRTC4;    //ETC2a compressed RGBA for mobile
-#endif
-#if defined(ANDROID) || defined(CRY_USE_METAL)
-    SPixFormat        m_FormatASTC_4x4;
-    SPixFormat        m_FormatASTC_5x4;
-    SPixFormat        m_FormatASTC_5x5;
-    SPixFormat        m_FormatASTC_6x5;
-    SPixFormat        m_FormatASTC_6x6;
-    SPixFormat        m_FormatASTC_8x5;
-    SPixFormat        m_FormatASTC_8x6;
-    SPixFormat        m_FormatASTC_8x8;
-    SPixFormat        m_FormatASTC_10x5;
-    SPixFormat        m_FormatASTC_10x6;
-    SPixFormat        m_FormatASTC_10x8;
-    SPixFormat        m_FormatASTC_10x10;
-    SPixFormat        m_FormatASTC_12x10;
-    SPixFormat        m_FormatASTC_12x12;
-#endif
-    SPixFormatSupport m_hwTexFormatSupport;
-
-    int m_fontBlendMode;
-
-    CCryNameTSCRC m_LevelShaderCacheMissIcon;
-
-    CColorGradingControllerD3D* m_pColorGradingControllerD3D;
-
-    CRenderPipelineProfiler* m_pPipelineProfiler;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_4
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-
-private:
-    D3DDevice* m_Device;
-    D3DDeviceContext* m_DeviceContext;
-
-    // Used for shadow casting for transparents.
-    CCryNameTSCRC m_techShadowGen;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_5
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-
-    t_arrDeferredMeshIndBuff m_arrDeferredInds;
-    t_arrDeferredMeshVertBuff m_arrDeferredVerts;
-
-public:
-#ifdef SHADER_ASYNC_COMPILATION
-    DynArray<CAsyncShaderTask*> m_AsyncShaderTasks;
-public:
-#endif
-
-
-    void SetDefaultTexParams(bool bUseMips, bool bRepeat, bool bLoad);
-
-public:
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_6
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-
-    /////////////////////////////////////////////////////////////////////////////
-    // Functions to access the device and associated objects
-    const D3DDevice& GetDevice() const;
-    D3DDevice& GetDevice();
-    D3DDeviceContext& GetDeviceContext();
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_7
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-    bool IsDeviceContextValid() { return m_DeviceContext != nullptr; }
-
-    /////////////////////////////////////////////////////////////////////////////
-    // Debug Functions to check that the D3D DeviceContext is only accessed
-    // by its owning thread
-    void BindContextToThread(DWORD threadID);
-    DWORD GetBoundThreadID() const;
-    void CheckContextThreadAccess() const;
-
-    bool FX_PrepareDepthMapsForLight(const SRenderLight& rLight, int nLightID, bool bClearPool = false);
-    void EF_PrepareShadowGenRenderList();
-    bool EF_PrepareShadowGenForLight(SRenderLight* pLight, int nLightID);
-    bool PrepareShadowGenForFrustum(ShadowMapFrustum* pCurFrustum, SRenderLight* pLight, int nLightFrustumID = 0, int nLOD = 0);
-    void PrepareShadowGenForFrustumNonJobs(const int nFlags);
-    virtual void EF_InvokeShadowMapRenderJobs(int nFlags);
-    void InvokeShadowMapRenderJobs(ShadowMapFrustum* pCurFrustum, const SRenderingPassInfo& passInfo);
-    void StartInvokeShadowMapRenderJobs(ShadowMapFrustum* pCurFrustum, const SRenderingPassInfo& passInfo);
-
-    void UpdatePreviousFrameMatrices();
-
-    void GetReprojectionMatrix(Matrix44A& matReproj, const Matrix44A& matView, const Matrix44A& matProj, const Matrix44A& matPrevView, const Matrix44A& matPrevProj, float fFarPlane) const;
-
-    bool m_bDepthBoundsEnabled;
-    float m_fDepthBoundsMin, m_fDepthBoundsMax;
-    void SetDepthBoundTest(float fMin, float fMax, bool bEnable);
-
-    void CreateDeferredUnitBox(t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
-    const t_arrDeferredMeshIndBuff& GetDeferredUnitBoxIndexBuffer() const;
-    const t_arrDeferredMeshVertBuff& GetDeferredUnitBoxVertexBuffer() const;
-    bool PrepareDepthMap(ShadowMapFrustum* SMSource, int nLightFrustumID = 0, bool bClearPool = false);
-    void ConfigShadowTexgen(int Num, ShadowMapFrustum* pFr, int nFrustNum = -1, bool bScreenToLocalBasis = false, bool bUseComparisonSampling = true);
-    void DrawAllShadowsOnTheScreen();
-    void DrawAllDynTextures(const char* szFilter, const bool bLogNames, const bool bOnlyIfUsedThisFrame);
-    void OnEntityDeleted(IRenderNode* pRenderNode);
-
-    void RT_ResetGlass();
-
-    void RT_PostLevelLoading() override;
-
-    //=============================================================
-    void SetCull(ECull eCull, bool bSkipMirrorCull = false) override { D3DSetCull(eCull, bSkipMirrorCull); }
-
-    void D3DSetCull(ECull eCull, bool bSkipMirrorCull = false);
-
-    struct gammaramp_t;
-
-    void GetDeviceGamma();
-    void SetDeviceGamma(gammaramp_t*);
-
-    HRESULT AdjustWindowForChange();
-
-    bool IsFullscreen() { return m_bFullScreen; }
-    bool IsSuperSamplingEnabled() { return m_numSSAASamples > 1; }
-    bool IsNativeScalingEnabled() { return m_width != m_nativeWidth || m_height != m_nativeHeight; }
-    
-    int GetNativeWidth() const { return m_nativeWidth; }
-    int GetNativeHeight() const { return m_nativeHeight; }
-    D3DSurface* GetBackBuffer() { return m_pBackBuffer; }
-
-    static HWND CreateWindowCallback();
-#if defined(SUPPORT_DEVICE_INFO)
-    DeviceInfo& DevInfo() { return m_devInfo; }
-private:
-    DeviceInfo m_devInfo;
-#endif
-
-private:
-    void DebugShowRenderTarget();
-
-    bool SetWindow(int width, int height, bool fullscreen, WIN_HWND hWnd);
-    bool SetRes();
-    void UnSetRes();
-    void DisplaySplash(); //!< Load a bitmap from a file, blit it to the windowdc and free it
-
-    void DestroyWindow(void);
-    virtual void RestoreGamma(void);
-    void SetGamma(float fGamma, float fBrigtness, float fContrast, bool bForce);
-
-    int FindTextureInRegistry(const char* filename, int* tex_type);
-    int RegisterTextureInRegistry(const char* filename, int tex_type, int tid, int low_tid);
-    unsigned int MakeTextureREAL(const char* filename, int* tex_type, unsigned int load_low_res);
-    unsigned int CheckTexturePlus(const char* filename, const char* postfix);
-
-    static HRESULT CALLBACK OnD3D11CreateDevice(D3DDevice* pd3dDevice);
-
-    void PostDeviceReset();
-
-    void ForceUpdateGlobalShaderParameters() override;
-
-public:
-    static HRESULT CALLBACK OnD3D11PostCreateDevice(D3DDevice* pd3dDevice);
-
-    // CRY DX12
-    Matrix44 m_matPsmWarp;
-    Matrix44 m_matViewInv;
-    int m_MatDepth;
-
-
-    static int CV_d3d11_CBUpdateStats;
-    static ICVar* CV_d3d11_forcedFeatureLevel;
-    static int CV_r_AlphaBlendLayerCount;
-
-#if defined(SUPPORT_D3D_DEBUG_RUNTIME)
-    static int CV_d3d11_debugruntime;
-    static ICVar* CV_d3d11_debugMuteSeverity;
-    static ICVar* CV_d3d11_debugMuteMsgID;
-    static ICVar* CV_d3d11_debugBreakOnMsgID;
-    static int CV_d3d11_debugBreakOnce;
-#endif
-
-    //============================================================
-    // Renderer interface
-    bool m_bFullScreen;
-
-    TArray<SD3DContext*> m_RContexts;
-    SD3DContext* m_CurrContext;
-
-    TArray<CTexture*> m_RTargets;
-
-public:
-
-    void RT_PresentFast();
-
-    // Multithreading support
-    virtual void RT_BeginFrame();
-    virtual void RT_EndFrame();
-    virtual void RT_EndFrame(bool isLoading);
-    virtual void RT_ForceSwapBuffers();
-    virtual void RT_SwitchToNativeResolutionBackbuffer(bool resolveBackBuffer);
-    virtual void RT_Init();
-    virtual bool RT_CreateDevice();
-    virtual void RT_Reset();
-    virtual void RT_RenderScene(int nFlags, SThreadInfo& TI, RenderFunc pRenderFunc);
-    virtual void RT_SetCull(int nMode);
-    virtual void RT_SetScissor(bool bEnable, int x, int y, int width, int height);
-    virtual void RT_SetCameraInfo();
-    virtual void RT_SetStereoCamera();
-    virtual void RT_CreateResource(SResourceAsync* Res);
-    virtual void RT_ReleaseResource(SResourceAsync* pRes);
-    virtual void RT_ReleaseRenderResources();
-    virtual void RT_UnbindResources();
-    virtual void RT_UnbindTMUs();
-    virtual void RT_CreateRenderResources();
-    virtual void RT_PrecacheDefaultShaders();
-    virtual void RT_ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX, int nScaledY);
-    // CRY DX12
-    virtual void RT_ClearTarget(ITexture* pTex, const ColorF& color);
-    virtual void RT_ReleaseVBStream(void* pVB, int nStream);
-    virtual void RT_ReleaseCB(void* pCB);
-    virtual void RT_DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, uint32 nVerts, uint32 nInds, const PublicRenderPrimitiveType nPrimType);
-    virtual void RT_DrawDynVBUI(SVF_P2F_C4B_T2F_F4B* pBuf, uint16* pInds, uint32 nVerts, uint32 nInds, const PublicRenderPrimitiveType nPrimType);
-    virtual void RT_DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, bool asciiMultiLine, const STextDrawContext& ctx) const;
-    virtual void RT_DrawLines(Vec3 v[], int nump, ColorF& col, int flags, float fGround);
-    virtual void RT_Draw2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, DWORD col, float z);
-    virtual void RT_Draw2dImageStretchMode(bool bStretch);
-    virtual void RT_Push2dImage(float xpos, float ypos, float w, float h, CTexture* pTexture, float s0, float t0, float s1, float t1, float angle, DWORD col, float z, float stereoDepth);
-
-    virtual void RT_Draw2dImageList();
-    virtual void RT_DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int texture_id, float* s, float* t, DWORD col, bool filtered = true);
-    virtual void RT_PushRenderTarget(int nTarget, CTexture* pTex, SDepthTexture* pDepth, int nS);
-    virtual void RT_PopRenderTarget(int nTarget);
-    virtual void RT_SetViewport(int x, int y, int width, int height, int id = -1) override;
-    virtual void RT_RenderDebug(bool bRenderStats = true);
-    virtual void RT_SetRendererCVar(ICVar* pCVar, const char* pArgText, const bool bSilentMode = false);
-
-    //===============================================================================
-    void RT_DrawImageWithUVInternal(float xpos, float ypos, float z, float w, float h, int texture_id, float s[4], float t[4], DWORD col, bool filtered = true);
-    void RT_Draw2dImageInternal(C2dImage* images, uint32 numImages, bool stereoLeftEye = true);
-
-    //===============================================================================
-
-    virtual WIN_HWND Init(int x, int y, int width, int height, unsigned int cbpp, int zbpp, int sbits, bool fullscreen, bool isEditor, WIN_HINSTANCE hinst, WIN_HWND Glhwnd = 0, bool bReInit = false, const SCustomRenderInitArgs* pCustomArgs = 0, bool bShaderCacheGen = false);
-
-    virtual void GetVideoMemoryUsageStats(size_t& vidMemUsedThisFrame, size_t& vidMemUsedRecently, bool bGetPoolsSizes = false);
-
-    /////////////////////////////////////////////////////////////////////////////////
-    // Render-context management
-    /////////////////////////////////////////////////////////////////////////////////
-    virtual bool SetCurrentContext(WIN_HWND hWnd);
-    virtual bool CreateContext(WIN_HWND hWnd, bool bAllowMSAA = false, int SSX = 1, int SSY = 1);
-    virtual bool DeleteContext(WIN_HWND hWnd);
-    virtual void MakeMainContextActive();
-    virtual WIN_HWND GetCurrentContextHWND() { return m_CurrContext ? m_CurrContext->m_hWnd : m_hWnd; }
-    virtual bool IsCurrentContextMainVP() { return m_CurrContext ? m_CurrContext->m_bMainViewport : true; }
-
-    virtual int GetCurrentContextViewportWidth() const { return (m_bDeviceLost ? -1 : m_CurrContext->m_nViewportWidth); }
-    virtual int GetCurrentContextViewportHeight() const { return (m_bDeviceLost ? -1 : m_CurrContext->m_nViewportHeight); }
-    /////////////////////////////////////////////////////////////////////////////////
-
-    virtual int  CreateRenderTarget(const char* name, int nWidth, int nHeight, const ColorF& clearColor, ETEX_Format eTF = eTF_R8G8B8A8);
-    virtual bool DestroyRenderTarget(int nHandle);
-    virtual bool ResizeRenderTarget(int nHandle, int nWidth, int nHeight);
-    virtual bool SetRenderTarget(int nHandle, SDepthTexture* pDepthSurf = nullptr);
-    virtual SDepthTexture* CreateDepthSurface(int nWidth, int nHeight, bool shaderResourceView = false);
-    virtual void DestroyDepthSurface(SDepthTexture* pDepthSurf);
-
-    virtual bool ChangeDisplay(unsigned int width, unsigned int height, unsigned int cbpp);
-    virtual void ChangeViewport(unsigned int x, unsigned int y, unsigned int width, unsigned int height, bool bMainViewport = false, float scaleWidth = 1.0f, float scaleHeight = 1.0f);
-    virtual int  EnumDisplayFormats(SDispFormat* formats);
-    //! Return all supported by video card video AA formats
-    virtual int EnumAAFormats(SAAFormat* formats);
-
-    //! Changes resolution of the window/device (doen't require to reload the level
-    virtual bool  ChangeResolution(int nNewWidth, int nNewHeight, int nNewColDepth, int nNewRefreshHZ, bool bFullScreen, bool bForceReset);
-    virtual void  Reset(void);
-
-    virtual void  SwitchToNativeResolutionBackbuffer();
-    void CalculateResolutions(int width, int height, bool bUseNativeResolution, int* pRenderWidth, int* pRenderHeight, int* pNativeWidth, int* pNativeHeight, int* pBackbufferWidth, int* pBackbufferHeight);
-
-    virtual void BeginFrame();
-    virtual void ShutDown(bool bReInit = false);
-    virtual void ShutDownFast();
-    virtual void RenderDebug(bool bRenderStats = true);
-    virtual void RT_ShutDown(uint32 nFlags);
-
-    void DebugPrintShader(class CHWShader_D3D* pSH, void* pInst, int nX, int nY, ColorF colSH);
-    void DebugPerfBars(int nX, int nY);
-    void DebugVidResourcesBars(int nX, int nY);
-    void DebugDrawStats1();
-    void DebugDrawStats2();
-    void DebugDrawStats8();
-    void DebugDrawStats();
-    void DebugDrawRect(float x1, float y1, float x2, float y2, float* fColor);
-    void VidMemLog();
-
-    virtual void EndFrame();
-    virtual void LimitFramerate(const int maxFPS, const bool bUseSleep);
-    virtual void GetMemoryUsage(ICrySizer* Sizer);
-    void GetLogVBuffers();
-
-    virtual void TryFlush();
-    virtual void Draw2dImage(float xpos, float ypos, float w, float h, int textureid, float s0, float t0, float s1, float t1, float angle, const ColorF& col, float z = 1);
-    virtual void Draw2dImage(float xpos, float ypos, float w, float h, int textureid, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1);
-    virtual void Push2dImage(float xpos, float ypos, float w, float h, int textureid, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0,
-        float r = 1, float g = 1, float b = 1, float a = 1, float z = 1, float stereoDepth = 0);
-    virtual void Draw2dImageStretchMode(bool bStretch);
-    virtual void Draw2dImageList();
-    virtual void DrawImage(float xpos, float ypos, float w, float h, int texture_id, float s0, float t0, float s1, float t1, float r, float g, float b, float a, bool filtered = true);
-    virtual void DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int texture_id, float* s, float* t, float r, float g, float b, float a, bool filtered = true);
-    virtual void SetCullMode(int mode = R_CULL_BACK);
-
-    virtual void PushProfileMarker(const char* label);
-    virtual void PopProfileMarker(const char* label);
-
-    virtual bool EnableFog(bool enable);
-    virtual void SetFogColor(const ColorF& color);
-
-    virtual void CreateResourceAsync(SResourceAsync* pResource);
-    virtual void ReleaseResourceAsync(SResourceAsync* pResource);
-    virtual void ReleaseResourceAsync(AZStd::unique_ptr<SResourceAsync> pResource) override;
-    virtual unsigned int DownLoadToVideoMemory(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false);
-    virtual unsigned int DownLoadToVideoMemory(const byte* data, int w, int h, int d, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, ETEX_Type eTT, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false);
-    virtual unsigned int DownLoadToVideoMemoryCube(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false);
-    virtual unsigned int DownLoadToVideoMemory3D(const byte* data, int w, int h, int d, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false);
-    virtual void UpdateTextureInVideoMemory(uint32 tnum, const byte* newdata, int posx, int posy, int w, int h, ETEX_Format eTF = eTF_R8G8B8A8, int posz = 0, int sizez = 1);
-    virtual bool EF_PrecacheResource(SShaderItem* pSI, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter);
-    virtual bool EF_PrecacheResource(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter);
-    virtual void RemoveTexture(unsigned int TextureId);
-    virtual void DeleteFont(IFFont* font);
-    virtual ITexture* EF_CreateCompositeTexture(int type, const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, ETEX_Format eTF, const STexComposition* pCompositions, size_t nCompositions, int8 nPriority = -1);
-
-    virtual void PostLevelLoading();
-    virtual void PostLevelUnload();
-
-    virtual void ApplyViewParameters(const CameraViewParameters& viewParameters) override;
-    virtual void SetCamera(const CCamera& cam);
-    virtual void SetViewport(int x, int y, int width, int height, int id = 0);
-    virtual void GetViewport(int* x, int* y, int* width, int* height) const;
-    virtual void SetScissor(int x = 0, int y = 0, int width = 0, int height = 0);
-    virtual void SetRenderTile(f32 nTilesPosX, f32 nTilesPosY, f32 nTilesGridSizeX, f32 nTilesGridSizeY);
-
-    void DrawLines(Vec3 v[], int nump, ColorF& col, int flags, float fGround);
-    virtual void Graph(byte* g, int x, int y, int wdt, int hgt, int nC, int type, const char* text, ColorF& color, float fScale);
-
-    virtual void DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, int nVerts, int nInds, PublicRenderPrimitiveType nPrimType);
-    virtual void DrawDynUiPrimitiveList(DynUiPrimitiveList& primitives, int totalNumVertices, int totalNumIndices);
-
-    virtual void PrintResourcesLeaks();
-
-    virtual void FX_PushWireframeMode(int mode);
-    virtual void FX_PopWireframeMode();
-    void FX_SetWireframeMode(int nMode);
-
-    virtual void PushMatrix();
-    virtual void PopMatrix();
-
-    virtual void EnableVSync(bool enable);
-    virtual void DrawPrimitivesInternal(CVertexBuffer* src, int vert_num, const eRenderPrimitiveType prim_type);
-    virtual void ResetToDefault();
-
-    // Sets default Blend, DepthStencil and Raster states.
-    virtual void SetDefaultRenderStates();
-
-    virtual void SetMaterialColor(float r, float g, float b, float a);
-
-    virtual bool ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz);
-    virtual int UnProject(float sx, float sy, float sz, float* px, float* py, float* pz, const float modelMatrix[16], const float projMatrix[16], const int    viewport[4]);
-    virtual int UnProjectFromScreen(float  sx, float  sy, float  sz, float* px, float* py, float* pz);
-
-    virtual void GetModelViewMatrix(float* mat);
-    virtual void GetProjectionMatrix(float* mat);
-    virtual void SetMatrices(float* pProjMat, float* pViewMat);
-
-    void DrawQuad(float x0, float y0, float x1, float y1, const ColorF& color, float z = 1.0f, float s0 = 0.0f, float t0 = 0.0f, float s1 = 1.0f, float t1 = 1.0f) override;
-    void DrawQuad3D(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, const ColorF& color,
-        float ftx0 = 0,  float fty0 = 0,  float ftx1 = 1,  float fty1 = 1);
-    void DrawFullScreenQuad(CShader* pSH, const CCryNameTSCRC& TechName, float s0, float t0, float s1, float t1, uint32 nState = GS_NODEPTHTEST);
-
-    // NOTE: deprecated
-    virtual void ClearTargetsImmediately(uint32 nFlags);
-    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth);
-    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors);
-    virtual void ClearTargetsImmediately(uint32 nFlags, float fDepth);
-
-    virtual void ClearTargetsLater(uint32 nFlags);
-    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth);
-    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors);
-    virtual void ClearTargetsLater(uint32 nFlags, float fDepth);
-    virtual void ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX = -1, int nScaledY = -1);
-    virtual void ReadFrameBufferFast(uint32* pDstARGBA8, int dstWidth, int dstHeight, bool BGRA = true);
-
-    virtual void SetRendererCVar(ICVar* pCVar, const char* pArgText, bool bSilentMode = false);
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routines uses 2 destination surfaces.  It triggers a backbuffer copy to one of its surfaces,
-    // and then copies the other surface to system memory.  This hopefully will remove any
-    // CPU stalls due to the rect lock call since the buffer will already be in system
-    // memory when it is called
-    // Inputs :
-    //          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
-    //          destinationWidth    :   Width of the frame to copy
-    //          destinationHeight   :   Height of the frame to copy
-    //
-    //          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
-    //                  of the surface are used for the copy
-    //
-    bool CaptureFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight);
-
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Copy a captured surface to a buffer
-    //
-    // Inputs :
-    //          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
-    //          destinationWidth    :   Width of the frame to copy
-    //          destinationHeight   :   Height of the frame to copy
-    //
-    //          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
-    //                  of the surface are used for the copy
-    //
-    bool CopyFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight);
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine registers a callback address that is called when a new frame is available
-    // Inputs :
-    //          pCapture            :   Address of the ICaptureFrameListener object
-    //
-    // Outputs : returns true if successful, otherwise false
-    //
-    bool RegisterCaptureFrame(ICaptureFrameListener* pCapture);
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine unregisters a callback address that was previously registered
-    // Inputs :
-    //          pCapture            :   Address of the ICaptureFrameListener object to unregister
-    //
-    // Outputs : returns true if successful, otherwise false
-    //
-    bool UnRegisterCaptureFrame(ICaptureFrameListener* pCapture);
-
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine initializes 2 destination surfaces for use by the CaptureFrameBufferFast routine
-    // It also, captures the current backbuffer into one of the created surfaces
-    //
-    // Inputs :
-    //          bufferWidth : Width of capture buffer, on consoles the scaling is done on the GPU. Pass in 0 (the default) to use backbuffer dimensions
-    //          bufferHeight    : Height of capture buffer.
-    //
-    // Outputs : returns true if surfaces were created otherwise returns false
-    //
-    bool InitCaptureFrameBufferFast(uint32 bufferWidth, uint32 bufferHeight);
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine releases the 2 surfaces used for frame capture by the CaptureFrameBufferFast routine
-    //
-    // Inputs : None
-    //
-    // Returns : None
-    //
-    void CloseCaptureFrameBufferFast(void);
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine checks for any frame buffer callbacks that are needed and calls them
-    //
-    // Inputs : None
-    //
-    //  Outputs : None
-    //
-    void CaptureFrameBufferCallBack(void);
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine checks for any frame buffer callbacks that are needed and checks their flags, calling preparation functions if required
-    //
-    // Inputs : None
-    //
-    //  Outputs : None
-    //
-    void CaptureFrameBufferPrepare(void);
-
-    //////////////////////////////////////////////////////////////////////
-    // RenderScreenshot request bus
-    virtual void WriteScreenshotToFile(const char* filepath) override;
-    virtual void WriteScreenshotToBuffer() override;
-    virtual bool CopyScreenshotToBuffer(unsigned char* imageBuffer, unsigned int width, unsigned int height) override;
-
-    //misc
-    bool ScreenShotInternal(const char* filename = nullptr, int width = 0);
-    virtual bool ScreenShot(const char* filename, int width = 0);
-    virtual bool ScreenShot();
-
-    virtual void UnloadOldTextures(){};
-
-    virtual void Set2DMode(uint32 orthoX, uint32 orthoY, TransformationMatrices& backupMatrices, float znear = -1e10f, float zfar = 1e10f);
-    virtual void Unset2DMode(const TransformationMatrices& restoringMatrices);
-    virtual void Set2DModeNonZeroTopLeft(float orthoLeft, float orthoTop, float orthoWidth, float orthoHeight, TransformationMatrices& backupMatrices, float znear = -1e10f, float zfar = 1e10f);
-
-    virtual int ScreenToTexture(int nTexID);
-
-    virtual bool    SetGammaDelta(float fGamma);
-
-    //////////////////////////////////////////////////////////////////////
-    // Replacement functions for the Font engine
-    virtual   bool FontUploadTexture(class CFBitmap*, ETEX_Format eTF = eTF_R8G8B8A8);
-    virtual   int  FontCreateTexture(int Width, int Height, byte* pData, ETEX_Format eTF = eTF_R8G8B8A8, bool genMips = IRenderer::FontCreateTextureGenMipsDefaultValue, const char* textureName = nullptr);
-    virtual   bool FontUpdateTexture(int nTexId, int X, int Y, int USize, int VSize, byte* pData);
-    virtual   void FontReleaseTexture(class CFBitmap* pBmp);
-    virtual void FontSetTexture(class CFBitmap*, int nFilterMode);
-
-    virtual void FontSetTexture(int nTexId, int nFilterMode);
-    virtual void FontSetRenderingState(bool overrideViewProjMatrices, TransformationMatrices& backupMatrices);
-    virtual void FontSetBlending(int src, int dst, int baseState);
-    virtual void FontRestoreRenderingState(bool overrideViewProjMatrices, const TransformationMatrices& backupMatrices);
-
-    void FontSetState(bool bRestore, int baseState);
-    virtual void SetProfileMarker(const char* label, ESPM mode) const;
-
-    //////////////////////////////////////////////////////////////////////
-
-    void FX_ApplyThreadState(SThreadInfo& TI, SThreadInfo* OldTI);
-    void EF_RenderScene(int nFlags, SViewport& VP, const SRenderingPassInfo& passInfo);
-    void EF_Scene3D(SViewport& VP, int nFlags, const SRenderingPassInfo& passInfo);
-
-    bool CheckMSAAChange();
-    bool CheckSSAAChange();
-
-    // FX Shaders pipeline
-    void FX_DrawInstances(CShader* ef, SShaderPass* slw, int nRE, uint32 nCurInst, uint32 nLastInst, uint32 nUsedAttr, byte* nInstanceData, int nInstAttrMask, byte Attributes[], short dwCBufSlot);
-    void FX_DrawShader_InstancedHW(CShader* ef, SShaderPass* slw);
-    void FX_DrawShader_General(CShader* ef, SShaderTechnique* pTech);
-    void FX_SetupForwardShadows(bool bUseShaderPermutations = false);
-    void FX_SetupShadowsForTransp();
-    void FX_SetupShadowsForFog();
-    bool FX_DrawToRenderTarget(CShader* pShader, CShaderResources* pRes, CRenderObject* pObj, SShaderTechnique* pTech, SHRenderTarget* pTarg, int nPreprType, IRenderElement* pRE);
-
-    void FX_DrawShader_Fur(CShader* ef, SShaderTechnique* pTech);
-
-    // hdr src texture is optional, if not specified uses default hdr destination target
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_8
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    void CopyFramebufferDX11(CTexture* pDst, ID3D11Resource* pSrcResource, D3DFormat srcFormat);
-#endif
-    void FX_ScreenStretchRect(CTexture* pDst, CTexture* pHDRSrc = NULL);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_9
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    virtual bool BakeMesh(const SMeshBakingInputParams* pInputParams, SMeshBakingOutput* pReturnValues);
-#endif
-
-    virtual int GetOcclusionBuffer(uint16* pOutOcclBuffer, Matrix44* pmCamBuffer);
-
-    virtual void WaitForParticleBuffer(threadID nThreadId);
-    void InsertParticleVideoMemoryFence(int nThreadId);
-
-    void FX_StencilTestCurRef(bool bEnable, bool bNoStencilClear = true, bool bStFuncEqual = true);
-    void EF_PrepareCustomShadowMaps();
-    void EF_PrepareAllDepthMaps();
-
-    void SetFrontFacingStencillState(int nStencilID);
-    void SetBackFacingStencillState(int nStencilID);
-    
-    //These two overridden functions allow for control over which pass to use during the stencil pass.
-    void FX_StencilCullPass(int nStencilID, int nNumVers, int nNumInds, CShader*  pShader, int frontFacePass);
-    void FX_StencilCullPass(int nStencilID, int nNumVers, int nNumInds, CShader*  pShader, int frontFacePass, int backFacePass);
-
-    void FX_StencilFrustumCull(int nStencilID, const SRenderLight* pLight, ShadowMapFrustum* pFrustum, int nAxis);
-    void FX_StencilCullNonConvex(int nStencilID, IRenderMesh* pWaterTightMesh, const Matrix34& mWorldTM);
-    
-    // Prepare the GPU-targets for next frame's CPU depth readback
-    void FX_ZTargetReadBack();
-    void UpdateOcclusionDataForCPU();
-
-    // Perform the CPU-side readback of the GPU target prepared in FX_ZTargetReadBack
-    void FX_ZTargetReadBackOnCPU();
-    
-
-    void FX_UpdateCharCBs();
-    void* FX_AllocateCharInstCB(SSkinningData*, uint32);
-    void FX_ClearCharInstCB(uint32);
-
-    void UpdatePerFrameParameters();
-
-    bool CreateAuxiliaryMeshes();
-    bool ReleaseAuxiliaryMeshes();
-
-    bool CreateUnitVolumeMesh(t_arrDeferredMeshIndBuff& arrDeferredInds, t_arrDeferredMeshVertBuff& arrDeferredVerts, D3DBuffer*& pUnitFrustumIB, D3DBuffer*& pUnitFrustumVB);
-    void FX_DeferredShadowPass(const SRenderLight* pLight, ShadowMapFrustum* pShadowFrustum, bool bShadowPass, bool bCloudShadowPass, bool bStencilPrepass, int nLod);
-    bool FX_DeferredShadowPassSetup(const Matrix44& mShadowTexGen, ShadowMapFrustum* pShadowFrustum, float maskRTWidth, float maskRTHeight, Matrix44& mScreenToShadow, bool bNearest);
-    bool FX_DeferredShadowPassSetupBlend(const Matrix44& mShadowTexGen, int nFrustumNum, float maskRTWidth, float maskRTHeight);
-    bool FX_DeferredShadows(SRenderLight* pLight, int maskRTWidth, int maskRTHeight);
-    void FX_DeferredShadowMaskGen(const TArray<uint32>& shadowPoolLights);
-    void FX_MergeShadowMaps(ShadowMapFrustum* pDst, const ShadowMapFrustum* pSrc);
-    void FX_ClearShadowMaskTexture();
-
-    void FX_DrawDebugPasses();
-
-    void FX_DrawMultiLayers();
-
-    void FX_DrawTechnique(CShader* ef, SShaderTechnique* pTech);
-
-    void FX_RefractionPartialResolve();
-
-    bool FX_HDRScene(bool bEnable, bool bClear = true);
-
-    void FX_RenderForwardOpaque(void (* RenderFunc)(), const bool bLighting, const bool bAllowDeferred);
-    void FX_RenderWater(void (* RenderFunc)());
-    void FX_RenderFog();
-
-    bool FX_ZScene(bool bEnable, bool bClearZBuffer, bool bRenderNormalsOnly = false, bool bZPrePass = false);
-
-    // GMEM Related /////////////////////////////////////////////////////
-    enum EGmemTransitions
-    {
-        eGT_PRE_Z,
-        eGT_POST_GBUFFER,
-        eGT_POST_Z_PRE_DEFERRED,
-        eGT_POST_DEFERRED_PRE_FORWARD,
-        eGT_POST_AW_TRANS_PRE_POSTFX
-    };
-
-    enum EGmemDepthStencilMode
-    {
-        eGDSM_RenderTarget,         // Values are written/read to/from a RT during the ZPass. Values are linearized when written to the RT.
-        eGDSM_DepthStencilBuffer,   // Values are written to the depth/stencil buffer and read using an extension. Values are linearized in the shader when fetching them. 
-        eGDSM_Texture,              // Values are resolved (and linearized) from the depth/stencil buffer to a texture with an extra pass.
-        eGDSM_Invalid
-    };
-
-    // Binds appropriate GMEM RTs depending on which section of the rendering pipeline we're in
-    void FX_GmemTransition(const EGmemTransitions transition);
-
-    EGmemDepthStencilMode FX_GmemGetDepthStencilMode() const;
-
-    // Values of this enum must match the intended values for cvar r_EnableGMEMPath
-    enum EGmemPath
-    {
-        eGT_REGULAR_PATH = 0, // No GMEM path is enabled. Using regular render path.
-        eGT_256bpp_PATH,
-        eGT_128bpp_PATH,
-        eGT_PathCount // Must be last
-    };
-
-    enum EGmemPathState
-    {
-        eGT_OK,                     // Nothing to report
-        eGT_DEV_UNSUPPORTED,        // GMEM path not supported due to device limitations
-        eGT_FEATURES_UNSUPPORTED    // Some rendering features are no supported with the GMEM path defined in .cfg file (r_EnableGMEMPath)
-    };
-
-    enum EGmemRendertargetType
-    {
-        eGT_Diffuse,
-        eGT_Specular,
-        eGT_Normals,
-        eGT_DepthStencil,
-        eGT_DiffuseLight,
-        eGT_SpecularLight,
-        eGT_VelocityBuffer,
-        eGT_RenderTargetCount // Must be last
-    };
-
-    static const int s_gmemRendertargetSlots[eGT_PathCount][eGT_RenderTargetCount];
-
-    // Checks if GMEM path is enabled.
-    EGmemPath FX_GetEnabledGmemPath(EGmemPathState* const gmemPathStateOut) const;
-
-    static const int s_gmemLargeRTCount = 5;
-    /////////////////////////////////////////////////////////////////////
-
-    bool FX_FogScene();
-    bool FX_DeferredCaustics();
-    bool FX_DeferredWaterVolumeCaustics(const N3DEngineCommon::SCausticInfo& causticInfo);
-    bool FX_DeferredRainOcclusionMap(const N3DEngineCommon::ArrOccluders& arrOccluders, const SRainParams& rainVolParams);
-    bool FX_DeferredRainOcclusion();
-    bool FX_DeferredRainPreprocess();
-    bool FX_DeferredRainGBuffer();
-    bool FX_DeferredSnowLayer();
-    bool FX_DeferredSnowDisplacement();
-    bool FX_MotionVectorGeneration(bool bEnable);
-    bool FX_CustomRenderScene(bool bEnable);
-    bool FX_PostProcessScene(bool bEnable);
-    bool FX_DeferredRendering(bool bDebugPass = false, bool bUpdateRTOnly = false);
-    bool FX_DeferredDecals();
-    bool FX_DeferredDecalsEmissive();
-    bool FX_SkinRendering(bool bEnable);
-    void FX_DepthFixupPrepare();
-    void FX_DepthFixupMerge();
-    void FX_SRGBConversion();
-
-    // Linearize Depth
-    void SetupLinearizeDepthParams(CShader* shader);
-    void FX_LinearizeDepth(CTexture* ptexZ);
-
-    // Performance queries
-    //=======================================================================
-
-    virtual float GetGPUFrameTime();
-    virtual void GetRenderTimes(SRenderTimes& outTimes);
-
-    // Shaders pipeline
-    //=======================================================================
-    virtual void FX_PipelineShutdown(bool bFastShutdown = false);
-
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags);
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth, uint8 nStencil);
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors);
-    virtual void EF_ClearTargetsImmediately(uint32 nFlags, float fDepth, uint8 nStencil);
-
-    virtual void EF_ClearTargetsLater(uint32 nFlags);
-    virtual void EF_ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth, uint8 nStencil);
-    virtual void EF_ClearTargetsLater(uint32 nFlags, const ColorF& Colors);
-    virtual void EF_ClearTargetsLater(uint32 nFlags, float fDepth, uint8 nStencil);
-
-    void FX_Invalidate();
-    void EF_Restore();
-    virtual void FX_SetState(int st, int AlphaRef = -1, int RestoreState = 0) override;
-    void FX_StateRestore(int prevState);
-
-    void ChangeLog();
-
-    void SetCurDownscaleFactor(Vec2 sf);
-    // sets fullscreen viewport regardless of current scaling -
-    // should only be used for final upscale (in Post AA)
-    void SetFullscreenViewport();
-
-    bool CreateMSAADepthBuffer();
-    void FlushHardware(bool bIssueBeforeSync);
-    void PostMeasureOverdraw();
-    void DrawTexelsPerMeterInfo();
-    virtual bool CheckDeviceLost();
-
-    short m_nPrepareShadowFrame;
-
-    _inline void EF_DirtyMatrix()
-    {
-        int nThreadID = m_pRT->GetThreadList();
-        m_RP.m_TI[nThreadID].m_PersFlags |= RBPF_FP_MATRIXDIRTY | RBPF_FP_DIRTY;
-    }
-
-    void FX_ResetPipe() override;
-
-    _inline void EF_SetGlobalColor(float r, float g, float b, float a)
-    {
-        assert(m_pRT->IsRenderThread());
-
-        EF_SetColorOp(255, 255, eCA_Texture | (eCA_Constant << 3), eCA_Texture | (eCA_Constant << 3));
-        EF_SetSrgbWrite(false);
-
-        if (m_RP.m_CurGlobalColor[0] != r || m_RP.m_CurGlobalColor[1] != g || m_RP.m_CurGlobalColor[2] != b || m_RP.m_CurGlobalColor[3] != a)
-        {
-            m_RP.m_CurGlobalColor[0] = r;
-            m_RP.m_CurGlobalColor[1] = g;
-            m_RP.m_CurGlobalColor[2] = b;
-            m_RP.m_CurGlobalColor[3] = a;
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_FP_DIRTY;
-        }
-    }
-    _inline void EF_SetVertColor()
-    {
-        // Only used from FontSetState, we do not want to call SetSrgbWrite - use whatever is set
-        EF_SetColorOp(255, 255, eCA_Texture | (eCA_Diffuse << 3), eCA_Texture | (eCA_Diffuse << 3));
-    }
-    _inline void EF_DisableTextureAndColor()
-    {
-        assert(m_pRT->IsRenderThread());
-        if ((m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg & 7) == eCA_Texture || (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg & 7) == eCA_Diffuse)
-        {
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg & ~7) | eCA_Constant;
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_FP_DIRTY;
-        }
-        if (((m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg >> 3) & 7) == eCA_Texture || ((m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg >> 3) & 7) == eCA_Diffuse)
-        {
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurColorArg & ~0x38) | (eCA_Constant << 3);
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_FP_DIRTY;
-        }
-        if ((m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg & 7) == eCA_Texture || (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg & 7) == eCA_Diffuse)
-        {
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg & ~7) | eCA_Constant;
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_FP_DIRTY;
-        }
-        if (((m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg >> 3) & 7) == eCA_Texture || ((m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg >> 3) & 7) == eCA_Diffuse)
-        {
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg = (m_RP.m_TI[m_RP.m_nProcessThreadID].m_eCurAlphaArg & ~0x38) | (eCA_Constant << 3);
-            m_RP.m_TI[m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_FP_DIRTY;
-        }
-    }
-
-    //================================================================================
-
-    virtual long FX_SetVertexDeclaration(int StreamMask, const AZ::Vertex::Format& vertexFormat) override;
-    inline bool FX_SetStreamFlags([[maybe_unused]] SShaderPass* pPass)
-    {
-        if (CV_r_usehwskinning && m_RP.m_pRE && (m_RP.m_pRE->mfGetFlags() & FCEF_SKINNED))
-        {
-            m_RP.m_FlagsStreams_Decl |= VSM_HWSKIN;
-            m_RP.m_FlagsStreams_Stream |= VSM_HWSKIN;
-            return true;
-        }
-
-        return false;
-    }
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_10
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-    void FX_DrawBatches(CShader* pSh, SShaderPass* pPass);
-    void FX_DrawBatchesSkinned(CShader* pSh, SShaderPass* pPass, SSkinningData* pSkinningData);
-
-    //========================================================================================
-
-    void FX_SetActiveRenderTargets(bool bAllowDIP = false) override;
-
-    void FX_SetViewport();
-    void FX_ClearTargets();
-
-
-    /* NOTES:
-     *  - passing D3DSurface/D3DDepthSurface are the close-to-metal calls and might not be
-     *    implemented for a specific device
-     *  - using rectangles and passing optional=true will use the most close-to-metal call
-     *    possible, even if it clears more than the given rect - otherwise a
-     *    shader-implementation will do the exact rect clear
-     *
-     *  - if there is a fallback, then the RT-stack is utilized to clear, which comes with
-     *    moderate CPU-overhead (relative to the cost of the close-to-metal call)
-     */
-
-    void FX_ClearTarget(D3DSurface* pView, const ColorF& cClear, const uint numRects = 0, const RECT* pRects = nullptr);
-    void FX_ClearTarget(ITexture* pTex, const ColorF& cClear, const uint numRects, const RECT* pRects, const bool bOptional);
-    void FX_ClearTarget(ITexture* pTex, const ColorF& cClear);
-    void FX_ClearTarget(ITexture* pTex);
-
-    void FX_ClearTarget(D3DDepthSurface* pView, const int nFlags, const float cDepth, const uint8 cStencil, const uint numRects = 0, const RECT* pRects = nullptr);
-    void FX_ClearTarget(SDepthTexture* pTex, const int nFlags, const float cDepth, const uint8 cStencil, const uint numRects, const RECT* pRects, const bool bOptional);
-    void FX_ClearTarget(SDepthTexture* pTex, const int nFlags, const float cDepth, const uint8 cStencil);
-    void FX_ClearTarget(SDepthTexture* pTex, const int nFlags);
-    void FX_ClearTarget(SDepthTexture* pTex);
-
-    // shader-implementation of clear
-    void FX_ClearTargetRegion(const uint32 nAdditionalStates = 0);
-
-#define MAX_RT_STACK 8
-
-#if defined(WIN32) || defined(OPENGL)
-    #define RT_STACK_WIDTH  D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT
-#else
-    #define RT_STACK_WIDTH  4
-#endif
-
-    struct SRTStack
-    {
-        D3DSurface* m_pTarget;
-        D3DDepthSurface* m_pDepth;
-
-        CTexture* m_pTex;
-        SDepthTexture* m_pSurfDepth;
-        int m_Width;
-        int m_Height;
-        uint32 m_bNeedReleaseRT : 1;
-        uint32 m_bWasSetRT : 1;
-        uint32 m_bWasSetD : 1;
-
-        uint32 m_bScreenVP : 1;
-
-        uint32 m_ClearFlags;
-        ColorF m_ReqColor;
-        float m_fReqDepth;
-        uint8 m_nReqStencil;
-    };
-
-    int m_nRTStackLevel[RT_STACK_WIDTH];
-    SRTStack m_RTStack[RT_STACK_WIDTH][MAX_RT_STACK];
-
-    int m_nMaxRT2Commit;
-    SRTStack* m_pNewTarget[RT_STACK_WIDTH];
-    CTexture* m_pCurTarget[RT_STACK_WIDTH];
-
-    TArray<SDepthTexture*> m_TempDepths;
-
-    enum
-    {
-        MAX_WIREFRAME_STACK = 10
-    };
-    int m_arrWireFrameStack[MAX_WIREFRAME_STACK];
-    int m_nWireFrameStack;
-
-    bool FX_GetTargetSurfaces(CTexture* pTarget, D3DSurface*& pTargSurf, SRTStack* pCur, int nCMSide = -1, int nTarget = 0, uint32 nTileCount = 1);
-
-    virtual bool FX_SetRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) override;
-    virtual bool FX_PushRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) override;
-    virtual bool FX_SetRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, bool bPush = false, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) override;
-    virtual bool FX_PushRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) override;
-    virtual bool FX_RestoreRenderTarget(int nTarget) override;
-    virtual bool FX_PopRenderTarget(int nTarget) override;
-    virtual SDepthTexture* FX_GetDepthSurface(int nWidth, int nHeight, bool bAA, bool shaderResourceView = false) override;
-    virtual SDepthTexture* GetDepthBufferOrig() override { return &m_DepthBufferOrig; }
-    virtual uint32 GetBackBufferWidth() override { return m_backbufferWidth; }
-    virtual uint32 GetBackBufferHeight() override { return m_backbufferHeight; }
-
-    CTexture* FX_GetCurrentRenderTarget(int target);
-    D3DSurface* FX_GetCurrentRenderTargetSurface(int target) const;
-
-    // CONFETTI BEGIN: David Srour
-    // Following is used to assign load/store actions for the nTarget render target.
-    // This function should be used AFTER using FX_PushRenderTarget.
-    // Currently, these will only do something meaningful for devices running Metal & GL-ES.
-    void FX_SetColorDontCareActions(int const nTarget,
-        bool const loadDontCare  = false,
-        bool const storeDontCare = false);
-    void FX_SetDepthDontCareActions(int const nTarget,
-        bool const loadDontCare  = false,
-        bool const storeDontCare = false);
-    void FX_SetStencilDontCareActions(int const nTarget,
-        bool const loadDontCare  = false,
-        bool const storeDontCare = false);
-
-    // Following is used to toggle GL-ES "Pixel Local Storage" extension
-    // Will only do something meaningful for devices running GL-ES with the PLS extension enabled.
-    void FX_TogglePLS(bool const enable);
-    // CONFETTI END
-
-    //========================================================================================
-
-
-    virtual void FX_Commit(bool bAllowDIP = false) override;
-    void FX_ZState(uint32& nState);
-    void FX_HairState(uint32& nState, const SShaderPass* pPass);
-    bool FX_SetFPMode();
-    bool FX_SetUIMode();
-
-    ILINE uint32 PackBlendModeAndPassGroup()
-    {
-        return ((m_RP.m_nPassGroupID << 24) | (m_RP.m_CurState & GS_BLEND_MASK));
-    }
-    ILINE bool ShouldApplyFogCorrection()
-    {
-        return PackBlendModeAndPassGroup() != m_uLastBlendFlagsPassGroup;
-    }
-
-    void FX_CommitStates(const SShaderTechnique* pTech, const SShaderPass* pPass, bool bUseMaterialState);
-
-    _inline void FX_DrawRE(CShader* sh, SShaderPass* sl)
-    {
-        // Unlock all VB (if needed) and set current streams
-        FX_CommitStreams(sl);
-
-        if (ShouldApplyFogCorrection())
-        {
-            FX_FogCorrection();
-        }
-
-        if (m_RP.m_pRE)
-        {
-            m_RP.m_pRE->mfDraw(sh, sl);
-        }
-        else
-        {
-            FX_DrawIndexedMesh(eptTriangleList);
-        }
-    }
-
-    ILINE long FX_SetVStream(int nID, const void* pB, uint32 nOffs, uint32 nStride, [[maybe_unused]] uint32 nFreq = 1)
-    {
-        FUNCTION_PROFILER_RENDER_FLAT
-        D3DBuffer* pVB = (D3DBuffer*)pB;
-        HRESULT h = S_OK;
-        SStreamInfo& sinfo = m_RP.m_VertexStreams[nID];
-        if (sinfo.pStream != pVB || sinfo.nOffset != nOffs || sinfo.nStride != nStride)
-        {
-            sinfo.pStream = pVB;
-            sinfo.nOffset = nOffs;
-            sinfo.nStride = nStride;
-            m_DevMan.BindVB(nID, 1, &pVB, &nOffs, &nStride);
-        }
-
-        //assert(h == S_OK);
-        return h;
-    }
-
-
-    virtual long FX_SetIStream(const void* pB, uint32 nOffs, RenderIndexType idxType) override
-    {
-#if !defined(_RELEASE) && !defined(SUPPORT_FLEXIBLE_INDEXBUFFER)
-        IF (idxType == Index32 || idxType == Index16 && (nOffs & 1), 0)
-        {
-            __debugbreak();
-        }
-#endif
-
-        D3DBuffer* pIB = (D3DBuffer*)pB;
-        HRESULT h = S_OK;
-#if !defined(SUPPORT_FLEXIBLE_INDEXBUFFER)
-        if (m_RP.m_pIndexStream != pIB)
-        {
-            m_RP.m_pIndexStream = pIB;
-            m_DevMan.BindIB(pIB, 0, DXGI_FORMAT_R16_UINT);
-        }
-        m_RP.m_IndexStreamOffset = nOffs;
-        m_RP.m_IndexStreamType = idxType;
-#else
-        if (m_RP.m_pIndexStream != pIB || m_RP.m_IndexStreamOffset != nOffs || m_RP.m_IndexStreamType != idxType)
-        {
-            m_RP.m_pIndexStream = pIB;
-            m_RP.m_IndexStreamOffset = nOffs;
-            m_RP.m_IndexStreamType = idxType;
-            m_DevMan.BindIB(pIB, nOffs, (DXGI_FORMAT) idxType);
-        }
-#endif
-
-        assert(h == S_OK);
-        return h;
-    }
-
-    ILINE uint32 ApplyIndexBufferBindOffset(uint32 firstIndex)
-    {
-#if !defined(SUPPORT_FLEXIBLE_INDEXBUFFER)
-        return firstIndex + (m_RP.m_IndexStreamOffset >> 1);
-#else
-        return firstIndex;
-#endif
-    }
-
-    ILINE long FX_ResetVertexDeclaration()
-    {
-        GetDeviceContext().IASetInputLayout(NULL);
-        m_pLastVDeclaration = NULL;
-        return S_OK;
-    }
-
-    ILINE D3DPrimitiveType FX_ConvertPrimitiveType(const eRenderPrimitiveType eType) const
-    {
-        assert(eType != eptHWSkinGroups);
-        return (D3DPrimitiveType) eType;
-    }
-
-    virtual void FX_DrawIndexedPrimitive(const eRenderPrimitiveType eType, const int nVBOffset, [[maybe_unused]] const int nMinVertexIndex, const int nVerticesCount, const int nStartIndex, const int nNumIndices, bool bInstanced = false) override
-    {
-        int nPrimitives = 0;
-
-        if (eType == eptTriangleList)
-        {
-            nPrimitives = nNumIndices / 3;
-            assert(nNumIndices % 3 == 0);
-        }
-        else
-        {
-            switch (eType)
-            {
-            case ept4ControlPointPatchList:
-                nPrimitives = nNumIndices >> 2;
-                assert(nNumIndices % 4 == 0);
-                break;
-            case ept3ControlPointPatchList:
-                nPrimitives = nNumIndices / 3;
-                assert(nNumIndices % 3 == 0);
-                break;
-            case eptTriangleStrip:
-                nPrimitives = nNumIndices - 2;
-                assert(nNumIndices > 2);
-                break;
-            case eptLineList:
-                nPrimitives = nNumIndices >> 1;
-                assert(nNumIndices % 2 == 0);
-                break;
-        #ifdef _DEBUG
-            default:
-                assert(0);      // not supported
-                return;
-        #endif
-            }
-        }
-
-        const D3DPrimitiveType eNativePType = FX_ConvertPrimitiveType(eType);
-
-        SetPrimitiveTopology(eNativePType);
-        if (bInstanced)
-        {
-            m_DevMan.DrawIndexedInstanced(nNumIndices, nVerticesCount, ApplyIndexBufferBindOffset(nStartIndex), nVBOffset, nVBOffset);
-        }
-        else
-        {
-            m_DevMan.DrawIndexed(nNumIndices, ApplyIndexBufferBindOffset(nStartIndex), nVBOffset);
-        }
-
-    #if defined(ENABLE_PROFILING_CODE)
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[m_RP.m_nPassGroupDIP] += nPrimitives;
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[m_RP.m_nPassGroupDIP]++;
-    #endif
-    }
-
-    // This is a cross-platform low-level function for DIP call
-    ILINE void FX_DrawPrimitive(eRenderPrimitiveType eType, int nStartVertex, int nVerticesCount, int nInstanceVertices = 0)
-    {
-        int nPrimitives;
-        if (nInstanceVertices)
-        {
-            nPrimitives = nVerticesCount;
-        }
-        else
-        {
-            switch (eType)
-            {
-            case eptTriangleList:
-                nPrimitives = nVerticesCount / 3;
-                assert(nVerticesCount % 3 == 0);
-                break;
-            case eptTriangleStrip:
-                nPrimitives = nVerticesCount - 2;
-                assert(nVerticesCount > 2);
-                break;
-            case eptLineList:
-                nPrimitives = nVerticesCount / 2;
-                assert(nVerticesCount % 2 == 0);
-                break;
-            case eptLineStrip:
-                nPrimitives = nVerticesCount - 1;
-                assert(nVerticesCount > 1);
-                break;
-            case eptPointList:
-            case ept1ControlPointPatchList:
-                nPrimitives = nVerticesCount;
-                assert(nVerticesCount > 0);
-                break;
-#ifndef _RELEASE
-            default:
-                assert(0);  // not supported
-                return;
-#endif
-            }
-        }
-
-        const D3DPrimitiveType eNativePType = FX_ConvertPrimitiveType(eType);
-
-        SetPrimitiveTopology(eNativePType);
-        if (nInstanceVertices)
-        {
-            m_DevMan.DrawInstanced(nInstanceVertices, nVerticesCount, 0, nStartVertex);
-        }
-        else
-        {
-            m_DevMan.Draw(nVerticesCount, nStartVertex);
-        }
-
-#if defined(ENABLE_PROFILING_CODE)
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_nPolygons[m_RP.m_nPassGroupDIP] += nPrimitives;
-        m_RP.m_PS[m_RP.m_nProcessThreadID].m_nDIPs[m_RP.m_nPassGroupDIP]++;
-#endif
-    }
-
-    bool FX_CommitStreams(SShaderPass* sl, bool bSetVertexDecl = true);
-
-    // get the anti aliasing formats available for current width, height and BPP
-    int GetAAFormat(TArray<SAAFormat>& Formats);
-
-    virtual void EF_SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa);
-    virtual void EF_SetSrgbWrite(bool sRGBWrite);
-
-    void FX_HDRPostProcessing();
-    void FX_FinalComposite();
-
-    void FX_PreRender(int Stage);
-    void FX_PostRender();
-
-    void EF_Init();
-
-    void EF_InitWaveTables();
-
-    void EF_OnDemandVertexDeclaration(SOnDemandD3DVertexDeclaration& out, const int nStreamMask, const AZ::Vertex::Format& vertexformat, const bool bMorph, const bool bInstanced);
-
-    void EF_InitD3DVertexDeclarations();
-    void EF_SetCameraInfo();
-    void FX_SetObjectTransform(CRenderObject* obj, CShader* pSH, int nTransFlags);
-    bool FX_ObjectChange(CShader* Shader, CShaderResources* pRes, CRenderObject* pObject, IRenderElement* pRE);
-
-private:
-    void UpdateNearestChange(int flags);                            //Helper method for FX_ObjectChange to avoid I-cache misses
-    void HandleDefaultObject();                                     //Helper method for FX_ObjectChange to avoid I-cache misses
-    bool IsVelocityPassEnabled() const;                             //Helper method to detect if we should enable the velocity pass. Its needed to MB and TAA
-    
-    // Get pointers to current D3D11 shaders, set tessellation related RT flags and return true if tessellation is enabled for current object
-    inline bool FX_SetTessellationShaders(CHWShader_D3D*& pCurHS, CHWShader_D3D*& pCurDS, const SShaderPass* pPass);
-#ifdef TESSELLATION_RENDERER
-    inline void FX_SetAdjacencyOffsetBuffer();
-#endif
-
-    bool InternalSaveToTIFF(ID3D11Texture2D* backBuffer, const char* filePath);
-
-    // The cached screenshot path for screenshot request bus.
-    char m_screenshotFilepathCache[AZ_MAX_PATH_LEN];
-public:
-    void EF_DrawDebugTools(SViewport& VP, const SRenderingPassInfo& passInfo);
-
-    static void FX_DrawWire();
-    static void FX_DrawNormals();
-    static void FX_DrawTangents();
-    static void FX_DrawFurBending();
-
-    static void FX_FlushShader_ShadowGen();
-    static void FX_FlushShader_General();
-    static void FX_FlushShader_ZPass();
-
-    static void FX_SelectTechnique(CShader* pShader, SShaderTechnique* pTech);
-
-    // Unbind a buffer if it is bound to a Vertex or Index buffer slot
-    void FX_UnbindStreamSource(D3DBuffer* buffer);
-
-    int m_sPrevX, m_sPrevY, m_sPrevWdt, m_sPrevHgt;
-    bool m_bsPrev;
-    void EF_Scissor(bool bEnable, int sX, int sY, int sWdt, int sHgt);
-    bool EF_GetScissorState(int& sX, int& sY, int& sWdt, int& sHgt);
-
-    void EF_SetFogColor(const ColorF& Color);
-    void FX_FogCorrection();
-
-    byte FX_StartQuery(SRendItem* pRI);
-    void FX_EndQuery(SRendItem* pRI, byte bStartQ);
-
-#if defined(DO_RENDERSTATS)
-    ILINE bool FX_ShouldTrackStats()
-    {
-        bool bShouldTrackStats = (CV_r_stats == 6 || m_pDebugRenderNode || m_bCollectDrawCallsInfo || m_bCollectDrawCallsInfoPerNode);
-        return bShouldTrackStats;
-    }
-    void FX_TrackStats(CRenderObject* pObj, IRenderMesh* pRenderMesh);
-#endif
-
-    void FX_DrawIndexedMesh (const eRenderPrimitiveType nPrimType);
-    bool FX_SetResourcesState();
-
-    int  EF_Preprocess(SRendItem* ri, uint32 nums, uint32 nume, RenderFunc pRenderFunc, const SRenderingPassInfo& passInfo);
-    void EF_SortRenderLists(SRenderListDesc* pRLD, int nThreadID, bool bUseDist = false, bool bUseJobSystem = false);
-    void EF_SortRenderList(int nList, int nAW, SRenderListDesc* pRLD, int nThread, bool bUseDist = false);
-
-    void FX_StartBatching();
-    void FX_ProcessBatchesList(int nums, int nume, uint32 nBatchFilter, uint32 nBatchExcludeFilter = 0);
-
-    // Only do expensive DX12 resource set building for PC DX12
-#if defined(CRY_USE_DX12)
-    void PerFrameValidateResourceSets();
-#endif
-
-    void FX_ProcessZPassRenderLists();
-    void FX_ProcessZPassRender_List(ERenderListID list, uint32 filter);
-    void FX_ProcessThicknessRenderLists();
-    void FX_ProcessSoftAlphaTestRenderLists();
-    void FX_ProcessSkinRenderLists(int nList, void (* RenderFunc)(), bool bLighting);
-    void FX_ProcessEyeOverlayRenderLists(int nList, void (* RenderFunc)(), bool bLightin);
-    void FX_ProcessHalfResParticlesRenderList(int nList, void (* RenderFunc)(), bool bLighting);
-    void FX_WaterVolumesPreprocess();
-    void FX_ProcessPostRenderLists(uint32 nBatchFilter);
-    void FX_ProcessRenderList(int nList, uint32 nBatchFilter, bool bSetRenderFunc = true);
-    void FX_ProcessRenderList(int nums, int nume, int nList, int nAfterWater, void (* RenderFunc)(), bool bLighting, uint32 nBatchFilter = FB_GENERAL, uint32 nBatchExcludeFilter = 0);
-    _inline void FX_ProcessRenderList(int nList, int nAfterWater, void (* RenderFunc)(), bool bLighting, uint32 nBatchFilter = FB_GENERAL, uint32 nBatchExcludeFilter = 0)
-    {
-        FX_ProcessRenderList(m_RP.m_pRLD->m_nStartRI[nAfterWater][nList], m_RP.m_pRLD->m_nEndRI[nAfterWater][nList], nList, nAfterWater, RenderFunc, bLighting, nBatchFilter, nBatchExcludeFilter);
-    }
-
-    void FX_WaterVolumesCaustics();
-    void FX_WaterVolumesCausticsPreprocess(N3DEngineCommon::SCausticInfo& causticInfo);
-    bool FX_WaterVolumesCausticsUpdateGrid(N3DEngineCommon::SCausticInfo& causticInfo);
-
-    void EF_ProcessRenderLists(void (* RenderFunc)(), int nFlags, SViewport& VP, const SRenderingPassInfo& passInfo, bool bSync3DEngineJobs);
-    void FX_ProcessPostGroups(int nums, int nume);
-
-    void EF_PrintProfileInfo();
-
-    virtual void EF_EndEf3D (int nFlags, int nPrecacheUpdateId, int nNearPrecacheUpdateId, const SRenderingPassInfo& passInfo);
-    virtual void EF_EndEf2D(bool bSort); // 2d only
-
-    virtual WIN_HWND GetHWND() { return m_hWnd; }
-    virtual bool SetWindowIcon(const char* path);
-
-    virtual void SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa);
-    virtual void SetSrgbWrite(bool srgbWrite);
-
-    //////////////////////////////////////////////////////////////////////////
-public:
-    bool IsDeviceLost() { return(m_bDeviceLost != 0); }
-
-#if defined(FEATURE_SVO_GI)
-    virtual ISvoRenderer* GetISvoRenderer();
-#endif
-
-    virtual IRenderAuxGeom* GetIRenderAuxGeom([[maybe_unused]] void* jobID = 0)
-    {
-#if defined(ENABLE_RENDER_AUX_GEOM)
-        if (m_pRenderAuxGeomD3D)
-        {
-            return m_pRenderAuxGeomD3D->GetRenderAuxGeom(jobID);
-        }
-#endif
-        return &m_renderAuxGeomNull;
-    }
-
-    virtual IColorGradingController* GetIColorGradingController()
-    {
-        return m_pColorGradingControllerD3D;
-    }
-
-    virtual IStereoRenderer* GetIStereoRenderer()
-    {
-        return m_pStereoRenderer;
-    }
-
-    virtual ITexture* Create2DTexture(const char* name, int width, int height, int numMips, int flags, unsigned char* data, ETEX_Format format)
-    {
-        return CTexture::Create2DTexture(name, width, height, numMips, flags, data, format, format);
-    }
-
-    CTiledShading& GetTiledShading()
-    {
-        return *m_pTiledShading;
-    }
-
-    CStandardGraphicsPipeline& GetGraphicsPipeline()
-    {
-        return *m_GraphicsPipeline;
-    }
-
-    CVolumetricFog& GetVolumetricFog()
-    {
-        return m_volumetricFog;
-    }
-
-    PerInstanceConstantBufferPool& GetPerInstanceConstantBufferPool()
-    {
-        return m_PerInstanceConstantBufferPool;
-    }
-
-    PerInstanceConstantBufferPool* GetPerInstanceConstantBufferPoolPointer()
-    {
-        return &m_PerInstanceConstantBufferPool;
-    }
-
-    virtual void PushFogVolume(class CREFogVolume* pFogVolume, const SRenderingPassInfo& passInfo)
-    {
-        GetVolumetricFog().PushFogVolume(pFogVolume, passInfo);
-    }
-
-    CD3DStereoRenderer& GetS3DRend() const { return *m_pStereoRenderer; }
-    bool IsStereoEnabled() const;
-
-    void RT_PrepareStereo(int mode, int output);
-    void RT_CopyToStereoTex(int channel);
-    void RT_UpdateTrackingStates();
-    void RT_DisplayStereo();
-
-    void RT_DrawVideoRenderer(AZ::VideoRenderer::IVideoRenderer* pVideoRenderer, const AZ::VideoRenderer::DrawArguments& drawArguments) final;
-
-    virtual void EnableGPUTimers2(bool bEnabled)
-    {
-        if (bEnabled)
-        {
-            CD3DProfilingGPUTimer::EnableTiming();
-        }
-        else
-        {
-            CD3DProfilingGPUTimer::DisableTiming();
-        }
-    }
-
-    virtual void AllowGPUTimers2(bool bAllow)
-    {
-        if (bAllow)
-        {
-            CD3DProfilingGPUTimer::AllowTiming();
-        }
-        else
-        {
-            CD3DProfilingGPUTimer::DisallowTiming();
-        }
-    }
-
-    virtual const RPProfilerStats* GetRPPStats(ERenderPipelineProfilerStats eStat, bool bCalledFromMainThread = true) const { return m_pPipelineProfiler ? &m_pPipelineProfiler->GetBasicStats(eStat, bCalledFromMainThread ? m_RP.m_nFillThreadID : m_RP.m_nProcessThreadID) : nullptr; }
-    virtual const RPProfilerStats* GetRPPStatsArray(bool bCalledFromMainThread = true) const { return m_pPipelineProfiler ? m_pPipelineProfiler->GetBasicStatsArray(bCalledFromMainThread ? m_RP.m_nFillThreadID : m_RP.m_nProcessThreadID) : nullptr; }
-
-    virtual int GetPolygonCountByType([[maybe_unused]] uint32 EFSList, [[maybe_unused]] EVertexCostTypes vct, [[maybe_unused]] uint32 z, [[maybe_unused]] bool bCalledFromMainThread = true)
-    {
-#if defined(ENABLE_PROFILING_CODE)
-        return m_RP.m_PS[bCalledFromMainThread ? m_RP.m_nFillThreadID : m_RP.m_nProcessThreadID].m_nPolygonsByTypes[EFSList][vct][z];
-#else
-        return 0;
-#endif
-    }
-
-#ifdef SUPPORT_HW_MOUSE_CURSOR
-    virtual IHWMouseCursor* GetIHWMouseCursor();
-#endif
-
-    virtual void StartLoadtimePlayback(ILoadtimeCallback* pCallback);
-    virtual void StopLoadtimePlayback();
-
-    // macros to implement the platform differences for pushing GPU Markers
-
-#if defined(ENABLE_FRAME_PROFILER_LABELS)
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_11
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(OPENGL)
-    #define PROFILE_LABEL_GPU(_NAME) DXGLProfileLabel(_NAME);
-    #define PROFILE_LABEL_PUSH_GPU(_NAME) DXGLProfileLabelPush(_NAME);
-    #define PROFILE_LABEL_POP_GPU(_NAME) DXGLProfileLabelPop(_NAME);
-#elif defined(CRY_USE_DX12)
-    #define PROFILE_LABEL_GPU(_NAME) do { } while (0)
-    #define PROFILE_LABEL_PUSH_GPU(_NAME) do { GetDeviceContext().PushMarker(_NAME); } while (0)
-    #define PROFILE_LABEL_POP_GPU(_NAME) do { GetDeviceContext().PopMarker(); } while (0)
-#else
-
-    #define PROFILE_LABEL_GPU(X) do { wchar_t buf[256]; Unicode::Convert(buf, X); D3DPERF_SetMarker(0xffffffff, buf); } while (0)
-    #define PROFILE_LABEL_PUSH_GPU(X) do { wchar_t buf[128]; Unicode::Convert(buf, X); D3DPERF_BeginEvent(0xff00ff00, buf); } while (0)
-    #define PROFILE_LABEL_POP_GPU(X) do { D3DPERF_EndEvent(); } while (0)
-
-#endif
-#else
-    #define PROFILE_LABEL_GPU(_NAME)
-    #define PROFILE_LABEL_PUSH_GPU(_NAME)
-    #define PROFILE_LABEL_POP_GPU(_NAME)
-#endif
-
-    void AddProfilerLabel([[maybe_unused]] const char* name) override { PROFILE_LABEL_GPU(name); }
-    void BeginProfilerSection(const char* name, [[maybe_unused]] uint32 eProfileLabelFlags = 0) override { PROFILE_LABEL_PUSH_GPU(name); if (m_pPipelineProfiler) { m_pPipelineProfiler->BeginSection(name); } }
-    void EndProfilerSection(const char* name) override { PROFILE_LABEL_POP_GPU(name); if (m_pPipelineProfiler) { m_pPipelineProfiler->EndSection(name); } }
-
-private:
-    void OnRendererFreeResources(int flags) override;
-    void HandleDisplayPropertyChanges();
-
-    void FX_SetAlphaTestState(float alphaRef);
-
-#if defined(ENABLE_PROFILING_CODE)
-#if DRIVERD3D_H_TRAIT_DEFSAVETEXTURE || defined(OPENGL)
-    ID3D11Texture2D* m_pSaveTexture[2];
-#endif
-
-    // Surfaces used to capture the current screen
-    unsigned int m_captureFlipFlop;
-    // Variables used for frame buffer capture and callback
-    ICaptureFrameListener* m_pCaptureCallBack[MAXFRAMECAPTURECALLBACK];
-    unsigned int m_frameCaptureRegisterNum;
-    int m_nScreenCaptureRequestFrame[RT_COMMAND_BUF_COUNT];
-    int m_screenCapTexHandle[RT_COMMAND_BUF_COUNT];
-#endif
-
-    class FrameBufferDescription
-    {
-    public:
-
-        ~FrameBufferDescription();
-
-        byte* pDest = nullptr;
-        ID3D11Texture2D* pBackBufferTex = nullptr;
-        ID3D11Texture2D* pTmpTexture = nullptr;
-        ID3D11Texture2D* tempZtex = nullptr;
-        float* depthData = nullptr;
-
-        D3D11_TEXTURE2D_DESC backBufferDesc;
-        D3D11_MAPPED_SUBRESOURCE resource;
-
-        bool includeAlpha = false;
-
-        //size information
-        int outputBytesPerPixel;
-        int texSize;
-
-        const static int inputBytesPerPixel = 4;
-    };
-
-    FrameBufferDescription* m_frameBufDesc = nullptr;
-
-    bool PrepFrameCapture(FrameBufferDescription& frameBufDesc, CTexture* pRenderTarget = 0);
-    void FillFrameBuffer(FrameBufferDescription& frameBufDesc, bool redBlueSwap);
-
-    bool CaptureFrameBufferToFile(const char* pFilePath, CTexture* pRenderTarget = 0);
-    // Store local pointers to CVars used for capturing
-    void CacheCaptureCVars();
-    void CaptureFrameBuffer();
-    // Resolve supersampled back buffer
-    void ResolveSupersampledBackbuffer();
-    // Scale back buffer contents to match viewport
-    void ScaleBackbufferToViewport();
-    ICVar* CV_capture_frames;
-    ICVar* CV_capture_folder;
-    ICVar* CV_capture_buffer;
-    ICVar* CV_capture_frame_once;
-    ICVar* CV_capture_file_name;
-    ICVar* CV_capture_file_prefix;
-
-#if defined(WIN32) || defined(WIN64)
-    ICVar* CV_r_FullscreenWindow;
-    ICVar* CV_r_FullscreenNativeRes;
-    bool m_fullscreenWindow;
-#endif
-
-#if DRIVERD3D_H_TRAIT_DEFREGISTEREDWINDOWHANDLER
-    bool m_registeredWindoWHandler = false;
-#endif
-
-    virtual void EnablePipelineProfiler(bool bEnable);
-
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    CRenderAuxGeomD3D* m_pRenderAuxGeomD3D;
-#endif
-    CAuxGeomCB_Null m_renderAuxGeomNull;
-
-    static TArray<CRenderObject*> s_tempObjects[2];
-    static TArray<SRendItem*> s_tempRIs;
-
-    // For matching calls between EF_Init and FX_PipelineShutdown
-    bool m_shaderPipelineInitialized = false;
-
-    bool m_clearShadowMaskTexture = false;
-
-#if defined(WIN32)
-public:
-    // Called to inspect window messages sent to this renderer's windows
-    virtual bool HandleMessage(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-
-private:
-    uint m_nConnectedMonitors; // The number of monitors currently connected to the system
-    bool m_bDisplayChanged; // Dirty-flag set when the number of monitors in the system changes
-#endif
-
-    // Gmem variables
-private:
-    mutable EGmemDepthStencilMode m_gmemDepthStencilMode;
-};
-
-enum
-{
-    SPCBI_NUMBER_OF_BUFFERS = 64
-};
-
-struct SPersistentConstBufferInfo
-{
-    uint64                      m_crc[SPCBI_NUMBER_OF_BUFFERS];
-    AzRHI::ConstantBuffer*    m_pStaticInstCB[SPCBI_NUMBER_OF_BUFFERS];
-    int                             m_frameID;
-    int                             m_buffer;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-inline void CD3D9Renderer::BindContextToThread([[maybe_unused]] DWORD threadID)
-{
-#if ENABLE_CONTEXT_THREAD_CHECKING
-    m_DeviceOwningthreadID = threadID;
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
-inline void CD3D9Renderer::CheckContextThreadAccess() const
-{
-#if ENABLE_CONTEXT_THREAD_CHECKING
-    if (m_DeviceOwningthreadID != CryGetCurrentThreadId())
-    {
-        CryFatalError("accessing d3d11 immediate context from unbound thread!");
-    }
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
-inline DWORD CD3D9Renderer::GetBoundThreadID() const
-{
-    return m_DeviceOwningthreadID;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-inline D3DDevice& CD3D9Renderer::GetDevice()
-{
-    AZ_Assert(m_Device, "Device is null");
-    return *m_Device;
-}
-
-inline const D3DDevice& CD3D9Renderer::GetDevice() const
-{
-    AZ_Assert(m_Device, "Device is null");
-    return *m_Device;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-inline D3DDeviceContext& CD3D9Renderer::GetDeviceContext()
-{
-    CheckContextThreadAccess();
-    AZ_Assert(m_DeviceContext, "Device context is null");
-    return *m_DeviceContext;
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION DRIVERD3D_H_SECTION_12
-    #include AZ_RESTRICTED_FILE(DriverD3D_h)
-#endif
-
-#if defined(SUPPORT_DEVICE_INFO_USER_DISPLAY_OVERRIDES)
-void UserOverrideDisplayProperties(DXGI_MODE_DESC& desc);
-#endif
-
-extern StaticInstance<CD3D9Renderer> gcpRendD3D;
-
-//=========================================================================================
-
-#include "D3DHWShader.h"
-
-#include <RenderDll/Common/FencedIB.h>
-#include <RenderDll/Common/FencedVB.h>
-#include "DeviceManager/TempDynBuffer.h"
-
-//=========================================================================================
-
-#define STREAMED_TEXTURE_USAGE (CDeviceManager::USAGE_STREAMING)
-
-void EnableCloseButton(void* hWnd, bool enabled);
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimer.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimer.cpp
deleted file mode 100644
index 01c24631e0..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimer.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "GPUTimer.h"
-#include "DriverD3D.h"
-#include <AzCore/Debug/EventTraceDrillerBus.h>
-
-bool CD3DProfilingGPUTimer::s_bTimingEnabled = false;
-bool CD3DProfilingGPUTimer::s_bTimingAllowed = true;
-
-namespace EventTrace
-{
-    const AZStd::thread_id GpuThreadId{ (AZStd::native_thread_id_type)1 };
-    const char* GpuThreadName = "GPU";
-    const char* GpuCategory = "GPU";
-}
-
-void CD3DProfilingGPUTimer::EnableTiming()
-{
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define GPUTIMER_CPP_SECTION_1 1
-#define GPUTIMER_CPP_SECTION_2 2
-#define GPUTIMER_CPP_SECTION_3 3
-#define GPUTIMER_CPP_SECTION_4 4
-#define GPUTIMER_CPP_SECTION_5 5
-#endif
-
-#ifdef ENABLE_PROFILING_GPU_TIMERS
-    if (!s_bTimingEnabled && s_bTimingAllowed)
-    {
-        s_bTimingEnabled = true;
-    }
-#endif
-}
-
-void CD3DProfilingGPUTimer::DisableTiming()
-{
-#ifdef ENABLE_PROFILING_GPU_TIMERS
-    if (s_bTimingEnabled)
-    {
-        s_bTimingEnabled = false;
-    }
-#endif
-}
-
-void CD3DProfilingGPUTimer::AllowTiming()
-{
-    s_bTimingAllowed = true;
-}
-
-void CD3DProfilingGPUTimer::DisallowTiming()
-{
-    s_bTimingAllowed = false;
-    if (gcpRendD3D->m_pPipelineProfiler)
-    {
-        gcpRendD3D->m_pPipelineProfiler->ReleaseGPUTimers();
-    }
-    DisableTiming();
-}
-
-void CD3DProfilingGPUTimer::Start([[maybe_unused]] const char* name)
-{
-#ifdef ENABLE_PROFILING_GPU_TIMERS
-    if (s_bTimingEnabled)
-    {
-        CD3DGPUTimer::Start(name);
-    }
-#endif
-}
-
-void CD3DProfilingGPUTimer::Stop()
-{
-#ifdef ENABLE_PROFILING_GPU_TIMERS
-    if (s_bTimingEnabled)
-    {
-        CD3DGPUTimer::Stop();
-    }
-#endif
-}
-
-void CD3DProfilingGPUTimer::UpdateTime()
-{
-#ifdef ENABLE_PROFILING_GPU_TIMERS
-    if (s_bTimingEnabled)
-    {
-        CD3DGPUTimer::UpdateTime();
-    }
-#endif
-}
-
-bool CD3DProfilingGPUTimer::Init()
-{
-#ifdef ENABLE_PROFILING_GPU_TIMERS
-    return CD3DGPUTimer::Init();
-#else
-    return false;
-#endif
-}
-
-CD3DGPUTimer::CD3DGPUTimer()
-{
-    m_time = 0.f;
-    m_smoothedTime = 0.f;
-    m_bInitialized = false;
-    m_bWaiting = false;
-    m_bStarted = false;
-
-#if GPUTIMER_CPP_TRAIT_CSIMPLEGPUTIMER_SETQUERYSTART
-    m_pQueryStart = m_pQueryStop = m_pQueryFreq = NULL;
-#endif
-}
-
-CD3DGPUTimer::~CD3DGPUTimer()
-{
-    Release();
-}
-
-void CD3DGPUTimer::Start(const char* name)
-{
-#ifndef NULL_RENDERER
-    if (!m_bWaiting && Init())
-    {
-        m_Name = name;
-
-#if GPUTIMER_CPP_TRAIT_START_PRIMEQUERY
-        // TODO: The d3d docs suggest that the disjoint query should be done once per frame at most
-        gcpRendD3D->GetDeviceContext().Begin(m_pQueryFreq);
-        gcpRendD3D->GetDeviceContext().End(m_pQueryStart);
-        m_bStarted = true;
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GPUTIMER_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(GPUTimer_cpp)
-#endif
-    }
-#endif
-}
-
-void CD3DGPUTimer::Stop()
-{
-#ifndef NULL_RENDERER
-    if (m_bStarted && m_bInitialized)
-    {
-#if GPUTIMER_CPP_TRAIT_STOP_ENDQUERY
-        gcpRendD3D->GetDeviceContext().End(m_pQueryStop);
-        gcpRendD3D->GetDeviceContext().End(m_pQueryFreq);
-        m_bStarted = false;
-        m_bWaiting = true;
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GPUTIMER_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(GPUTimer_cpp)
-#endif
-    }
-#endif
-}
-
-void CD3DGPUTimer::UpdateTime()
-{
-#ifndef NULL_RENDERER
-    if (m_bWaiting && m_bInitialized)
-    {
-#if GPUTIMER_CPP_TRAIT_UPDATETIME_GETDATA
-        D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjointData;
-        UINT64 timeStart, timeStop;
-
-        ID3D11DeviceContext& context = gcpRendD3D->GetDeviceContext();
-        if (context.GetData(m_pQueryFreq, &disjointData, m_pQueryFreq->GetDataSize(), 0) == S_OK &&
-            context.GetData(m_pQueryStart, &timeStart, m_pQueryStart->GetDataSize(), 0) == S_OK &&
-            context.GetData(m_pQueryStop, &timeStop, m_pQueryStop->GetDataSize(), 0) == S_OK)
-        {
-            if (!disjointData.Disjoint)
-            {
-                float time = (timeStop - timeStart) / (float)(disjointData.Frequency / 1000);
-                if (time >= 0.f && time < 1000.f)
-                {
-                    m_time = time;                                 // Filter out wrong insane values that get reported sometimes
-
-                    RecordSlice(timeStart, timeStop, disjointData.Frequency);
-                }
-            }
-            m_bWaiting = false;
-        }
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GPUTIMER_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(GPUTimer_cpp)
-#endif
-
-        if (!m_bWaiting)
-        {
-            m_smoothedTime = m_smoothedTime * 0.7f + m_time * 0.3f;
-        }
-    }
-    else
-    {
-        // Reset timers when not used in frame
-        m_time = 0.0f;
-        m_smoothedTime = 0.0f;
-    }
-#endif
-}
-
-void CD3DGPUTimer::RecordSlice([[maybe_unused]] AZ::u64 timeStart, [[maybe_unused]] AZ::u64 timeStop, [[maybe_unused]] AZ::u64 frequency)
-{
-#if defined(CRY_USE_DX12)
-    {
-        AZ::u64 cpuTimeStart = gcpRendD3D->GetDeviceContext().MakeCpuTimestampMicroseconds(timeStart);
-        AZ::u32 durationInMicroseconds = (AZ::u32)((1000000 * (timeStop - timeStart)) / frequency);
-
-        // Cannot queue event because string is not deep copied (and lifetime is not guaranteed until next update).
-        EBUS_EVENT(AZ::Debug::EventTraceDrillerBus, RecordSlice, m_Name.c_str(), EventTrace::GpuCategory, EventTrace::GpuThreadId, cpuTimeStart, durationInMicroseconds);
-    }
-#endif
-}
-
-void CD3DGPUTimer::Release()
-{
-#if GPUTIMER_CPP_TRAIT_RELEASE_RELEASEQUERY
-    SAFE_RELEASE(m_pQueryStart);
-    SAFE_RELEASE(m_pQueryStop);
-    SAFE_RELEASE(m_pQueryFreq);
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GPUTIMER_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(GPUTimer_cpp)
-#endif
-    m_bInitialized = false;
-    m_bWaiting = false;
-    m_bStarted = false;
-    m_smoothedTime = 0.f;
-}
-
-bool CD3DGPUTimer::Init()
-{
-#ifndef NULL_RENDERER
-    if (!m_bInitialized)
-    {
-#if GPUTIMER_CPP_TRAIT_INIT_CREATEQUERY
-        D3D11_QUERY_DESC stampDisjointDesc = { D3D11_QUERY_TIMESTAMP_DISJOINT, 0 };
-        D3D11_QUERY_DESC stampDesc = { D3D11_QUERY_TIMESTAMP, 0 };
-
-        if (gcpRendD3D->GetDevice().CreateQuery(&stampDisjointDesc, &m_pQueryFreq) == S_OK &&
-            gcpRendD3D->GetDevice().CreateQuery(&stampDesc, &m_pQueryStart) == S_OK &&
-            gcpRendD3D->GetDevice().CreateQuery(&stampDesc, &m_pQueryStop) == S_OK)
-        {
-            m_bInitialized = true;
-        }
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION GPUTIMER_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(GPUTimer_cpp)
-#endif
-
-        EBUS_EVENT(AZ::Debug::EventTraceDrillerSetupBus, SetThreadName, EventTrace::GpuThreadId, EventTrace::GpuThreadName);
-    }
-#endif
-
-    return m_bInitialized;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimer.h b/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimer.h
deleted file mode 100644
index 409231540c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimer.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_GPUTIMER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_GPUTIMER_H
-#pragma once
-
-class IGPUTimer
-{
-public:
-    virtual ~IGPUTimer() = default;
-    virtual void Start(const char* name) = 0;
-    virtual void Stop() = 0;
-    virtual void UpdateTime() = 0;
-    virtual bool Init() = 0;
-    virtual float GetTime() const = 0;
-};
-
-class CNullGPUTimer : public IGPUTimer
-{
-public:
-    AZ_CLASS_ALLOCATOR(CNullGPUTimer, AZ::OSAllocator, 0)
-    void Start([[maybe_unused]] const char* name) {}
-    void Stop() {}
-    void UpdateTime() {}
-    bool Init() { return false; }
-    float GetTime() const { return 0; }
-};
-
-class CD3DGPUTimer : public IGPUTimer
-{
-public:
-    AZ_CLASS_ALLOCATOR(CD3DGPUTimer, AZ::OSAllocator, 0)
-    CD3DGPUTimer();
-    virtual ~CD3DGPUTimer();
-
-    virtual void Start(const char* name) override;
-    virtual void Stop() override;
-    virtual void UpdateTime() override;
-    float GetTime() const override { return m_time; }
-
-
-    float GetSmoothedTime() const { return m_smoothedTime; }
-    bool IsStarted() const { return m_bStarted; }
-    bool HasPendingQueries() const { return m_bWaiting; }
-
-    void Release();
-    virtual bool Init();
-
-private:
-    float  m_time;
-    float  m_smoothedTime;
-
-    bool   m_bInitialized;
-    bool   m_bStarted;
-    bool   m_bWaiting;
-
-    AZStd::string m_Name;
-
-#if GPUTIMER_H_TRAIT_DEFINEQUERIES
-    ID3D11Query* m_pQueryStart, *m_pQueryStop, *m_pQueryFreq;
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(GPUTimer_h)
-#endif
-
-    void RecordSlice(AZ::u64 timeStart, AZ::u64 timeStop, AZ::u64 frequency);
-};
-
-class CD3DProfilingGPUTimer : public CD3DGPUTimer
-{
-public:
-    static void EnableTiming();
-    static void DisableTiming();
-
-    static void AllowTiming();
-    static void DisallowTiming();
-
-    static bool IsTimingEnabled() { return s_bTimingEnabled; }
-    static bool IsTimingAllowed() { return s_bTimingAllowed; }
-
-    void Start(const char* name) override;
-    void Stop() override;
-    void UpdateTime() override;
-    bool Init() override;
-
-private:
-    static bool s_bTimingEnabled;
-    static bool s_bTimingAllowed;
-};
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimerFactory.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimerFactory.cpp
deleted file mode 100644
index 94574f1221..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimerFactory.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-#include "GPUTimer.h"
-#include "GPUTimerFactory.h"
-
-IGPUTimer* GPUTimerFactory::Create()
-{
-#ifdef AZ_PLATFORM_WINDOWS
-    return aznew CD3DGPUTimer();
-#else
-    return aznew CNullGPUTimer();
-#endif
-
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimerFactory.h b/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimerFactory.h
deleted file mode 100644
index 9cb9c9e097..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GPUTimerFactory.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once 
-
-class IGPUTimer;
-class GPUTimerFactory
-{
-public:
-    // Instantiates a GPUTimer corresponding to the current platform.
-    // Returns dynamic memory. Caller is resposible for de-allocating.
-    static IGPUTimer* Create();
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/AutoExposure.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/AutoExposure.cpp
deleted file mode 100644
index 9237c4936e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/AutoExposure.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "AutoExposure.h"
-
-#include "DriverD3D.h"
-
-
-void CAutoExposurePass::Init()
-{
-    m_samplerPoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    m_samplerLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-}
-
-void CAutoExposurePass::Shutdown()
-{
-}
-
-void CAutoExposurePass::Reset()
-{
-}
-
-void GetSampleOffsets_Downscale4x4Bilinear(uint32 nWidth, uint32 nHeight, Vec4 avSampleOffsets[])
-{
-    float tU = 1.0f / (float)nWidth;
-    float tV = 1.0f / (float)nHeight;
-
-    // Sample from the 16 surrounding points.  Since bilinear filtering is being used, specific the coordinate
-    // exactly halfway between the current texel center (k-1.5) and the neighboring texel center (k-0.5)
-
-    int index = 0;
-    for (int y = 0; y < 4; y += 2)
-    {
-        for (int x = 0; x < 4; x += 2, index++)
-        {
-            avSampleOffsets[index].x = (x - 1.f) * tU;
-            avSampleOffsets[index].y = (y - 1.f) * tV;
-            avSampleOffsets[index].z = 0;
-            avSampleOffsets[index].w = 1;
-        }
-    }
-}
-
-void CAutoExposurePass::MeasureLuminance()
-{
-    PROFILE_LABEL_SCOPE("MEASURE_LUMINANCE");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    uint64 nFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    int32 curTexture = NUM_HDR_TONEMAP_TEXTURES - 1;
-    static CCryNameR Param1Name("SampleOffsets");
-
-    float tU = 1.0f / (3.0f * CTexture::s_ptexHDRToneMaps[curTexture]->GetWidth());
-    float tV = 1.0f / (3.0f * CTexture::s_ptexHDRToneMaps[curTexture]->GetHeight());
-
-    Vec4 avSampleOffsets[16];
-    uint32 index = 0;
-    for (int x = -1; x <= 1; x++)
-    {
-        for (int y = -1; y <= 1; y++)
-        {
-            avSampleOffsets[index].x = x * tU;
-            avSampleOffsets[index].y = y * tV;
-            avSampleOffsets[index].z = 0;
-            avSampleOffsets[index].w = 1;
-            index++;
-        }
-    }
-
-    uint32 nPasses;
-
-    rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRToneMaps[curTexture], NULL);
-    rd->FX_SetActiveRenderTargets();
-    rd->RT_SetViewport(0, 0, CTexture::s_ptexHDRToneMaps[curTexture]->GetWidth(), CTexture::s_ptexHDRToneMaps[curTexture]->GetHeight());
-
-    CShader* pShader = CShaderMan::s_shHDRPostProcess;
-    static CCryNameTSCRC TechName("HDRSampleLumInitial");
-    pShader->FXSetTechnique(TechName);
-    pShader->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    pShader->FXBeginPass(0);
-
-    CTexture::s_ptexHDRTargetScaled[1]->Apply(0, m_samplerLinear);
-    CTexture::s_ptexSceneNormalsMap->Apply(1, m_samplerLinear);
-    CTexture::s_ptexSceneDiffuse->Apply(2, m_samplerLinear);
-    CTexture::s_ptexSceneSpecular->Apply(3, m_samplerLinear);
-
-    float s1 = 1.0f / (float) CTexture::s_ptexHDRTargetScaled[1]->GetWidth();
-    float t1 = 1.0f / (float) CTexture::s_ptexHDRTargetScaled[1]->GetHeight();
-
-    // Use rotated grid
-    Vec4 vSampleLumOffsets0 = Vec4(s1 * 0.95f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);
-    Vec4 vSampleLumOffsets1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);
-
-    static CCryNameR pSampleLumOffsetsName0("SampleLumOffsets0");
-    static CCryNameR pSampleLumOffsetsName1("SampleLumOffsets1");
-
-    pShader->FXSetPSFloat(pSampleLumOffsetsName0, &vSampleLumOffsets0, 1);
-    pShader->FXSetPSFloat(pSampleLumOffsetsName1, &vSampleLumOffsets1, 1);
-
-    bool ret = DrawFullScreenQuad(0.0f, 1.0f - 1.0f * gcpRendD3D->m_CurViewportScale.y, 1.0f * gcpRendD3D->m_CurViewportScale.x, 1.0f);
-
-    // important that we always write out valid luminance, even if quad draw fails
-    if (!ret)
-    {
-        rd->FX_ClearTarget(CTexture::s_ptexHDRToneMaps[curTexture], Clr_Dark);
-    }
-
-    pShader->FXEndPass();
-
-    rd->FX_PopRenderTarget(0);
-
-    curTexture--;
-
-    // Initialize the sample offsets for the iterative luminance passes
-    while (curTexture >= 0)
-    {
-        rd->FX_PushRenderTarget(0, CTexture::s_ptexHDRToneMaps[curTexture], NULL);
-        rd->RT_SetViewport(0, 0, CTexture::s_ptexHDRToneMaps[curTexture]->GetWidth(), CTexture::s_ptexHDRToneMaps[curTexture]->GetHeight());
-
-        if (!curTexture)
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-        }
-        if (curTexture == 1)
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-        }
-
-        static CCryNameTSCRC TechNameLI("HDRSampleLumIterative");
-        pShader->FXSetTechnique(TechNameLI);
-        pShader->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-        pShader->FXBeginPass(0);
-
-        GetSampleOffsets_Downscale4x4Bilinear(CTexture::s_ptexHDRToneMaps[curTexture + 1]->GetWidth(), CTexture::s_ptexHDRToneMaps[curTexture + 1]->GetHeight(), avSampleOffsets);
-        pShader->FXSetPSFloat(Param1Name, avSampleOffsets, 4);
-        CTexture::s_ptexHDRToneMaps[curTexture + 1]->Apply(0, m_samplerLinear);
-
-        // Draw a fullscreen quad to sample the RT
-        ret = DrawFullScreenQuad(0.0f, 0.0f, 1.0f, 1.0f);
-
-        // important that we always write out valid luminance, even if quad draw fails
-        if (!ret)
-        {
-            rd->FX_ClearTarget(CTexture::s_ptexHDRToneMaps[curTexture], Clr_Dark);
-        }
-
-        pShader->FXEndPass();
-
-        rd->FX_PopRenderTarget(0);
-
-        curTexture--;
-    }
-
-    gcpRendD3D->GetDeviceContext().CopyResource(
-        CTexture::s_ptexHDRMeasuredLuminance[gcpRendD3D->RT_GetCurrGpuID()]->GetDevTexture()->GetBaseTexture(),
-        CTexture::s_ptexHDRToneMaps[0]->GetDevTexture()->GetBaseTexture());
-
-    gRenDev->m_RP.m_FlagsShader_RT = nFlagsShader_RT;
-}
-
-void CAutoExposurePass::AdjustExposure()
-{
-    PROFILE_LABEL_SCOPE("EYEADAPTATION");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    // Swap current & last luminance
-    const int lumMask = (int32)(sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur) / sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur[0])) - 1;
-    const int32 numTextures = (int32)max(min(gRenDev->GetActiveGPUCount(), (uint32)(sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur) / sizeof(CTexture::s_ptexHDRAdaptedLuminanceCur[0]))), 1u);
-
-    CTexture::s_nCurLumTextureIndex++;
-    CTexture* pTexPrev = CTexture::s_ptexHDRAdaptedLuminanceCur[(CTexture::s_nCurLumTextureIndex - numTextures) & lumMask];
-    CTexture* pTexCur = CTexture::s_ptexHDRAdaptedLuminanceCur[CTexture::s_nCurLumTextureIndex & lumMask];
-    CTexture::s_ptexCurLumTexture = pTexCur;
-    assert(pTexCur);
-
-    CShader* pShader = CShaderMan::s_shHDRPostProcess;
-    uint32 nPasses;
-    static CCryNameTSCRC TechName("HDRCalculateAdaptedLum");
-    pShader->FXSetTechnique(TechName);
-    pShader->FXBegin(&nPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    rd->FX_PushRenderTarget(0, pTexCur, NULL);
-    rd->RT_SetViewport(0, 0, pTexCur->GetWidth(), pTexCur->GetHeight());
-
-    pShader->FXBeginPass(0);
-
-    {
-        Vec4 elapsedTime;
-        elapsedTime[0] = iTimer->GetFrameTime() * numTextures;
-        elapsedTime[1] = 1.0f - expf(-CRenderer::CV_r_HDREyeAdaptationSpeed * elapsedTime[0]);
-        elapsedTime[2] = 0;
-        elapsedTime[3] = 0;
-
-        if (rd->GetCamera().IsJustActivated() || rd->m_nDisableTemporalEffects > 0)
-        {
-            elapsedTime[1] = 1.0f;
-            elapsedTime[2] = 1.0f;
-        }
-
-        static CCryNameR Param1Name("ElapsedTime");
-        pShader->FXSetPSFloat(Param1Name, &elapsedTime, 1);
-    }
-
-    pTexPrev->Apply(0, m_samplerPoint);
-    CTexture::s_ptexHDRToneMaps[0]->Apply(1, m_samplerPoint);
-
-    // Draw a fullscreen quad to sample the RT
-    DrawFullScreenQuad(0.0f, 0.0f, 1.0f, 1.0f);
-
-    pShader->FXEndPass();
-
-    rd->FX_PopRenderTarget(0);
-}
-
-void CAutoExposurePass::Execute()
-{
-    MeasureLuminance();
-    AdjustExposure();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/AutoExposure.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/AutoExposure.h
deleted file mode 100644
index 6aba3a4fc1..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/AutoExposure.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-
-class CAutoExposurePass
-    : public GraphicsPipelinePass
-{
-public:
-    virtual ~CAutoExposurePass() {}
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute();
-
-private:
-    void MeasureLuminance();
-    void AdjustExposure();
-
-private:
-    int  m_samplerPoint;
-    int  m_samplerLinear;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Bloom.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Bloom.cpp
deleted file mode 100644
index 1077c40fc8..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Bloom.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "Bloom.h"
-#include "DriverD3D.h"
-
-void CBloomPass::Init()
-{
-}
-
-void CBloomPass::Shutdown()
-{
-    Reset();
-}
-
-void CBloomPass::Reset()
-{
-    m_pass1H.Reset();
-    m_pass1V.Reset();
-    m_pass2H.Reset();
-    m_pass2V.Reset();
-}
-
-void CBloomPass::Execute()
-{
-    // Approximate function (1 - r)^4 by a sum of Gaussians: 0.0174*G(0.008,r) + 0.192*G(0.0576,r)
-    const float sigma1 = sqrtf(0.008f);
-    const float sigma2 = sqrtf(0.0576f - 0.008f);
-
-    PROFILE_LABEL_SCOPE("BLOOM_GEN");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    static CCryNameTSCRC techName("HDRBloomGaussian");
-    static CCryNameR szHDRParam0("HDRParams0");
-
-    int width = CTexture::s_ptexHDRFinalBloom->GetWidth();
-    int height = CTexture::s_ptexHDRFinalBloom->GetHeight();
-
-    // Note: Just scaling the sampling offsets depending on the resolution is not very accurate but works acceptably
-    assert(CTexture::s_ptexHDRFinalBloom->GetWidth() == CTexture::s_ptexHDRTarget->GetWidth() / 4);
-    float scaleW = ((float)width / 400.0f) / (float)width;
-    float scaleH = ((float)height / 225.0f) / (float)height;
-
-    int texStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    int texFilter = (CTexture::s_ptexHDRFinalBloom->GetWidth() == 400 && CTexture::s_ptexHDRFinalBloom->GetHeight() == 225) ? texStatePoint : texStateLinear;
-
-    rd->RT_SetViewport(0, 0, width, height);
-
-    // Pass 1 Horizontal
-    m_pass1H.SetRenderTarget(0, CTexture::s_ptexHDRTempBloom[1]);
-    m_pass1H.SetTechnique(CShaderMan::s_shHDRPostProcess, techName, 0);
-    m_pass1H.SetState(GS_NODEPTHTEST);
-    m_pass1H.SetTextureSamplerPair(0, CTexture::s_ptexHDRTargetScaled[1], texFilter);
-    m_pass1H.SetTextureSamplerPair(2, CTexture::s_ptexHDRToneMaps[0], texStatePoint);
-
-    m_pass1H.BeginConstantUpdate();
-    Vec4 v = Vec4(scaleW, 0, 0, 0);
-    CShaderMan::s_shHDRPostProcess->FXSetPSFloat(szHDRParam0, &v, 1);
-    m_pass1H.Execute();
-
-    // Pass 1 Vertical
-    m_pass1V.SetRenderTarget(0, CTexture::s_ptexHDRTempBloom[0]);
-    m_pass1V.SetTechnique(CShaderMan::s_shHDRPostProcess, techName, 0);
-    m_pass1V.SetState(GS_NODEPTHTEST);
-    m_pass1V.SetTextureSamplerPair(0, CTexture::s_ptexHDRTempBloom[1], texFilter);
-    m_pass1V.SetTextureSamplerPair(2, CTexture::s_ptexHDRToneMaps[0], texStatePoint);
-
-    m_pass1V.BeginConstantUpdate();
-    v = Vec4(0, scaleH, 0, 0);
-    CShaderMan::s_shHDRPostProcess->FXSetPSFloat(szHDRParam0, &v, 1);
-    m_pass1V.Execute();
-
-    // Pass 2 Horizontal
-    m_pass2H.SetRenderTarget(0, CTexture::s_ptexHDRTempBloom[1]);
-    m_pass2H.SetTechnique(CShaderMan::s_shHDRPostProcess, techName, 0);
-    m_pass2H.SetState(GS_NODEPTHTEST);
-    m_pass2H.SetTextureSamplerPair(0, CTexture::s_ptexHDRTempBloom[0], texFilter);
-    m_pass2H.SetTextureSamplerPair(2, CTexture::s_ptexHDRToneMaps[0], texStatePoint);
-
-    m_pass2H.BeginConstantUpdate();
-    v = Vec4((sigma2 / sigma1) * scaleW, 0, 0, 0);
-    CShaderMan::s_shHDRPostProcess->FXSetPSFloat(szHDRParam0, &v, 1);
-    m_pass2H.Execute();
-
-    // Pass 2 Vertical
-    m_pass2V.SetRenderTarget(0, CTexture::s_ptexHDRFinalBloom);
-    m_pass2V.SetTechnique(CShaderMan::s_shHDRPostProcess, techName, g_HWSR_MaskBit[HWSR_SAMPLE0]);
-    m_pass2V.SetState(GS_NODEPTHTEST);
-    m_pass2V.SetTextureSamplerPair(0, CTexture::s_ptexHDRTempBloom[1], texFilter);
-    m_pass2V.SetTextureSamplerPair(1, CTexture::s_ptexHDRTempBloom[0], texFilter);
-    m_pass2V.SetTextureSamplerPair(2, CTexture::s_ptexHDRToneMaps[0], texStatePoint);
-
-    m_pass2V.BeginConstantUpdate();
-    v = Vec4(0, (sigma2 / sigma1) * scaleH, 0, 0);
-    CShaderMan::s_shHDRPostProcess->FXSetPSFloat(szHDRParam0, &v, 1);
-    m_pass2V.Execute();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Bloom.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Bloom.h
deleted file mode 100644
index a96ca48c8f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Bloom.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-
-class CBloomPass
-    : public GraphicsPipelinePass
-{
-public:
-    virtual ~CBloomPass() {}
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute();
-
-private:
-    CFullscreenPass m_pass1H;
-    CFullscreenPass m_pass1V;
-    CFullscreenPass m_pass2H;
-    CFullscreenPass m_pass2V;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/FullscreenPass.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/FullscreenPass.cpp
deleted file mode 100644
index e498bf2c56..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/FullscreenPass.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "FullscreenPass.h"
-
-#include "CryCustomTypes.h"
-#include "DriverD3D.h"
-#include "../Common/PostProcess/PostProcessUtils.h"
-
-uint64 CFullscreenPass::s_prevRTMask = 0;
-
-CFullscreenPass::CFullscreenPass()
-{
-    m_pShader = NULL;
-    m_renderState = 0;
-    m_rtMask = 0;
-    m_dirtyMask = ~0;
-    m_bRequireWPos = false;
-    m_pRenderTargets.fill(NULL);
-    m_vertexBuffer = ~0u;
-
-    auto& factory = CDeviceObjectFactory::GetInstance();
-    m_pResources = factory.CreateResourceSet(CDeviceResourceSet::EFlags_ForceSetAllState);
-    m_pResourceLayout = factory.CreateResourceLayout();
-}
-
-CFullscreenPass::~CFullscreenPass()
-{
-    Reset();
-}
-
-void CFullscreenPass::Reset()
-{
-    m_ReflectedConstantBuffers.clear();
-    m_dirtyMask = ~0;
-}
-
-void CFullscreenPass::BeginConstantUpdate()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    s_prevRTMask = rd->m_RP.m_FlagsShader_RT;
-    rd->m_RP.m_FlagsShader_RT = m_rtMask;
-
-    if (m_dirtyMask || m_pResources->IsDirty())
-    {
-        m_dirtyMask = CompileResources();
-    }
-
-    uint32 numPasses;
-    m_pShader->FXSetTechnique(m_techniqueName);
-    m_pShader->FXBegin(&numPasses, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    SDeviceObjectHelpers::BeginUpdateConstantBuffers(m_ReflectedConstantBuffers);
-}
-
-void CFullscreenPass::Execute()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    
-
-    // dummy PushRenderTarget here so we can directly set the target via the command list
-    rd->FX_PushRenderTarget(0, m_pRenderTargets[0], NULL);
-
-    // unmap constant buffers and mark as bound
-    SDeviceObjectHelpers::EndUpdateConstantBuffers(m_ReflectedConstantBuffers);
-
-    if (m_dirtyMask == 0)
-    {
-        // update vertex buffer if required
-        if (m_bRequireWPos)
-        {
-            UpdateVertexBuffer();
-        }
-
-        size_t bufferOffset;
-        uint32 stride = m_bRequireWPos ? sizeof(SVF_P3F_T2F_T3F) : sizeof(SVF_P3F_C4B_T2F);
-        D3DBuffer* pVB = rd->m_DevBufMan.GetD3D(m_vertexBuffer, &bufferOffset);
-
-        // fullscreen viewport
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(FullscreenPass_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-        #else
-        D3DViewPort viewPort = { 0.0f, 0.0f, static_cast<float>(m_pRenderTargets[0]->GetWidth()), static_cast<float>(m_pRenderTargets[0]->GetHeight()), 0.f, 1.f };
-        #endif
-        D3D11_RECT viewPortRect = { (LONG)viewPort.TopLeftX, (LONG)viewPort.TopLeftY, LONG(viewPort.TopLeftX + viewPort.Width), LONG(viewPort.TopLeftY + viewPort.Height) };
-
-        uint32 bindSlot = 0;
-        CDeviceGraphicsCommandListPtr pCommandList = CDeviceObjectFactory::GetInstance().GetCoreGraphicsCommandList();
-
-        pCommandList->SetRenderTargets(m_pRenderTargets.size(), &m_pRenderTargets[0], NULL);
-        pCommandList->SetViewports(1, &viewPort);
-        pCommandList->SetScissorRects(1, &viewPortRect);
-        pCommandList->SetPipelineState(m_pPipelineState);
-        pCommandList->SetResourceLayout(m_pResourceLayout.get());
-        for (int i = 0; i < m_ReflectedConstantBuffers.size(); ++i)
-        {
-            pCommandList->SetInlineConstantBuffer(bindSlot++, m_ReflectedConstantBuffers[i].pBuffer, m_ReflectedConstantBuffers[i].shaderSlot, m_ReflectedConstantBuffers[i].shaderClass);
-        }
-        pCommandList->SetInlineConstantBuffer(bindSlot++, rd->GetGraphicsPipeline().GetPerViewConstantBuffer(), eConstantBufferShaderSlot_PerView, EShaderStage_Vertex | EShaderStage_Pixel);
-        pCommandList->SetInlineConstantBuffer(bindSlot++, rd->GetGraphicsPipeline().GetPerFrameConstantBuffer(), eConstantBufferShaderSlot_PerFrame, EShaderStage_Vertex | EShaderStage_Pixel);
-        pCommandList->SetResources(bindSlot++, m_pResources.get());
-        pCommandList->SetVertexBuffers(1, &pVB, &bufferOffset, &stride);
-        pCommandList->Draw(3, 1, 0, 0);
-    }
-
-    m_pShader->FXEndPass();
-    m_pShader->FXEnd();
-
-    rd->FX_PopRenderTarget(0);
-    rd->m_RP.m_FlagsShader_RT = s_prevRTMask;
-}
-
-uint CFullscreenPass::CompileResources()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    // get required constant buffers
-    bool shadersAvailable = SDeviceObjectHelpers::GetConstantBuffersFromShader(m_ReflectedConstantBuffers, m_pShader, m_techniqueName, m_rtMask, 0, 0);
-    if (!shadersAvailable)
-        return 0xFFFFFFFF;
-
-    // textures
-    m_pResources->Build();
-
-    int bindSlot = 0;
-
-    // resource mapping
-    m_pResourceLayout->Clear();
-    for (int i = 0; i < m_ReflectedConstantBuffers.size(); ++i)
-    {
-        m_pResourceLayout->SetConstantBuffer(bindSlot++, m_ReflectedConstantBuffers[i].shaderSlot, SHADERSTAGE_FROM_SHADERCLASS(m_ReflectedConstantBuffers[i].shaderClass));
-    }
-    m_pResourceLayout->SetConstantBuffer(bindSlot++, eConstantBufferShaderSlot_PerView, EShaderStage_Vertex | EShaderStage_Pixel);
-    m_pResourceLayout->SetConstantBuffer(bindSlot++, eConstantBufferShaderSlot_PerFrame, EShaderStage_Vertex | EShaderStage_Pixel);
-    m_pResourceLayout->SetResourceSet(bindSlot++, m_pResources);
-
-    if (!m_pResourceLayout->Build())
-    {
-        return 0xFFFFFFFF;
-    }
-
-    // pipeline state
-    CDeviceGraphicsPSODesc psoDesc(m_pResourceLayout.get(), m_pShader, m_techniqueName, m_rtMask, 0, 0, false);
-    psoDesc.m_RenderState = m_renderState;
-    psoDesc.m_VertexFormat = m_bRequireWPos ? eVF_P3F_T2F_T3F : eVF_P3F_C4B_T2F;
-    psoDesc.m_PrimitiveType = eptTriangleStrip;
-    for (int i = 0; i < m_pRenderTargets.size(); ++i)
-    {
-        psoDesc.m_RenderTargetFormats[i] = m_pRenderTargets[i] ? m_pRenderTargets[i]->GetDstFormat() : eTF_Unknown;
-    }
-    psoDesc.Build();
-
-    m_pPipelineState = CDeviceObjectFactory::GetInstance().CreateGraphicsPSO(psoDesc);
-
-    if (!m_pPipelineState)
-    {
-        return 0xFFFFFFFF;
-    }
-
-    // vertex buffer
-    if (m_vertexBuffer != ~0u)
-    {
-        rd->m_DevBufMan.Destroy(m_vertexBuffer);
-    }
-
-    m_vertexBuffer = rd->m_DevBufMan.Create(BBT_VERTEX_BUFFER, m_bRequireWPos ? BU_DYNAMIC : BU_STATIC, 3 * (m_bRequireWPos ? sizeof(SVF_P3F_T2F_T3F) : sizeof(SVF_P3F_C4B_T2F)));
-    UpdateVertexBuffer();
-
-    return 0;
-}
-
-void CFullscreenPass::UpdateVertexBuffer()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    void* data = rd->m_DevBufMan.BeginWrite(m_vertexBuffer);
-
-    if (m_bRequireWPos)
-    {
-        SVF_P3F_T2F_T3F result[3];
-        SPostEffectsUtils::GetFullScreenTriWPOS(result, 0, 0);
-        memcpy(data, result, sizeof(result));
-    }
-    else
-    {
-        SVF_P3F_C4B_T2F result[3];
-        SPostEffectsUtils::GetFullScreenTri(result, 0, 0);
-        memcpy(data, result, sizeof(result));
-    }
-
-    rd->m_DevBufMan.EndReadWrite(m_vertexBuffer);
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/FullscreenPass.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/FullscreenPass.h
deleted file mode 100644
index 8b9f5da5dc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/FullscreenPass.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-#include <array>
-
-class CFullscreenPass
-{
-public:
-    CFullscreenPass();
-    ~CFullscreenPass();
-
-#define ASSIGN_VALUE(dst, src, dirtyFlag) \
-    if ((dst) != (src)) {                 \
-        m_dirtyMask |= (dirtyFlag); }     \
-    (dst) = (src);
-
-    void SetRenderTarget(uint32 slot, CTexture* pRenderTarget)
-    {
-        ASSIGN_VALUE(m_pRenderTargets[slot], pRenderTarget, 0xFFFFFFFF);
-    }
-
-    void SetTechnique(CShader* pShader, CCryNameTSCRC& techName, uint64 rtMask)
-    {
-        ASSIGN_VALUE(m_pShader, pShader, 0xFFFFFFFF);
-        ASSIGN_VALUE(m_techniqueName, techName, 0xFFFFFFFF);
-        ASSIGN_VALUE(m_rtMask, rtMask, 0xFFFFFFFF);
-    }
-
-    void SetTexture(uint32 slot, CTexture* pTexture, SResourceView::KeyType resourceViewID = SResourceView::DefaultView)
-    {
-        m_pResources->SetTexture(slot, pTexture, resourceViewID);
-    }
-
-    void SetSampler(uint32 slot, int32 sampler)
-    {
-        m_pResources->SetSampler(slot, sampler);
-    }
-
-    void SetTextureSamplerPair(uint32 slot, CTexture* pTex, int32 sampler, SResourceView::KeyType resourceViewID = SResourceView::DefaultView)
-    {
-        m_pResources->SetTexture(slot, pTex, resourceViewID);
-        m_pResources->SetSampler(slot, sampler);
-    }
-
-    void SetState(int state)
-    {
-        ASSIGN_VALUE(m_renderState, state, 0xFFFFFFFF);
-    }
-
-    void SetRequireWorldPos(bool bRequireWPos)
-    {
-        ASSIGN_VALUE(m_bRequireWPos, bRequireWPos, 0xFFFFFFFF);
-    }
-
-#undef ASSIGN_VALUE
-
-    void BeginConstantUpdate();
-    void Execute();
-    void Reset();
-
-private:
-    typedef SDeviceObjectHelpers::SConstantBufferBindInfo CBufferBindInfo;
-
-    uint CompileResources();
-    void UpdateVertexBuffer();
-
-    std::array<CTexture*, 1>     m_pRenderTargets;
-    CDeviceResourceSetPtr        m_pResources;
-    std::vector<CBufferBindInfo> m_ReflectedConstantBuffers;
-    CDeviceResourceLayoutPtr     m_pResourceLayout;
-    CDeviceGraphicsPSOPtr        m_pPipelineState;
-    CShader*                     m_pShader;
-    CCryNameTSCRC                m_techniqueName;
-    uint64                       m_rtMask;
-    int                          m_renderState;
-    uint                         m_dirtyMask;
-    bool                         m_bRequireWPos;
-    buffer_handle_t              m_vertexBuffer;
-
-    static uint64  s_prevRTMask;
-};
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsHelpers.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsHelpers.h
deleted file mode 100644
index d1c66000d4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsHelpers.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-
-template <typename T, int constantBufferSlot>
-class CTypedConstantBuffer
-{
-    T m_hostBuffer;
-
-    CConstantBuffer* m_constantBuffer;
-
-public:
-    CTypedConstantBuffer()
-        : m_constantBuffer(nullptr) {}
-
-    CConstantBuffer* GetDeviceConstantBuffer()
-    {
-        if (!m_constantBuffer)
-        {
-            CreateDeviceBuffer();
-        }
-        return m_constantBuffer;
-    }
-
-    void CreateDeviceBuffer()
-    {
-        int size = sizeof(T);
-        m_constantBuffer = gcpRendD3D->m_DevBufMan.CreateConstantBuffer(size);
-    }
-    void CopyToDevice()
-    {
-        D3D11_MAPPED_SUBRESOURCE mapped;
-        HRESULT hr =
-            gcpRendD3D.GetDeviceContext().Map(m_constantBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped);
-
-        if (hr != S_OK)
-        {
-            return;
-        }
-
-        memcpy(mapped.pData, &m_hostBuffer, sizeof(T));
-
-        gcpRendD3D.GetDeviceContext().Unmap(m_constantBuffer, 0);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(GraphicsHelpers_h)
-#endif
-    }
-    void Bind()
-    {
-        ID3D11Buffer* buf[] = { m_constantBuffer };
-        gcpRendD3D.GetDeviceContext().CSSetConstantBuffers(constantBufferSlot, 1u, buf);
-    }
-    void BindPixelShader()
-    {
-        ID3D11Buffer* buf[] = { m_constantBuffer };
-        gcpRendD3D.GetDeviceContext().PSSetConstantBuffers(constantBufferSlot, 1u, buf);
-    }
-    void BindGeometryShader()
-    {
-        ID3D11Buffer* buf[] = { m_constantBuffer };
-        gcpRendD3D.GetDeviceContext().GSSetConstantBuffers(constantBufferSlot, 1u, buf);
-    }
-    T* operator->() { return &m_hostBuffer; }
-    bool IsDeviceBufferAllocated() { return m_constantBuffer != nullptr; }
-    T& operator=(const T& hostData)
-    {
-        return m_hostBuffer = hostData;
-    }
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipeline.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipeline.cpp
deleted file mode 100644
index 0d2f4c7ad0..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipeline.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "GraphicsPipeline.h"
-
-CGraphicsPipeline::~CGraphicsPipeline()
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipeline.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipeline.h
deleted file mode 100644
index 79374bcac7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipeline.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "GraphicsPipelinePass.h"
-
-class CGraphicsPipeline
-{
-public:
-    virtual ~CGraphicsPipeline();
-
-    // Allocate resources needed by the pipeline & passes
-    virtual void Init() = 0;
-    // Free resources needed by the pipeline & passes
-    virtual void Shutdown() = 0;
-
-    // Prepare all passes before actual drawing starts
-    virtual void Prepare() = 0;
-    // Execute the pipeline and its passes
-    virtual void Execute() = 0;
-
-    // Reset all render passes and their PSOs
-    // Needed if shaders need to be reloaded
-    virtual void Reset() = 0;
-
-protected:
-    template<class T>
-    void RegisterPass(T*& pPass)
-    {
-        pPass = new T();
-        pPass->Init();
-        m_passes.emplace_back(pPass);
-    }
-
-protected:
-    std::vector<std::unique_ptr<GraphicsPipelinePass>>  m_passes;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelinePass.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelinePass.h
deleted file mode 100644
index 57e3505dab..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelinePass.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <Range.h>
-#include "GraphicsPipelineStateSet.h"
-// forward declarations
-typedef std::shared_ptr<CGraphicsPipelineStateLocalCache> CGraphicsPipelineStateLocalCachePtr;
-class GraphicsPipelinePass;
-
-struct SGraphicsPiplinePassContext
-{
-    SGraphicsPiplinePassContext(GraphicsPipelinePass* pass, EShaderTechniqueID technique, uint32 filter)
-        : pPass(pass)
-        , techniqueID(technique)
-        , batchFilter(filter)
-        , nFrameID(0)
-        , renderListId(EFSLIST_INVALID)
-        , sortGroupID(0)
-        , passId(0)
-        , passSubId(0)
-        , pPipelineStats(0)
-    {
-    }
-
-    GraphicsPipelinePass* pPass;
-    EShaderTechniqueID techniqueID;
-    uint32 batchFilter;
-
-    ERenderListID renderListId;
-    int           sortGroupID;
-    threadID      nProcessThreadID;
-
-    uint64        nFrameID;
-
-    // One of ERenderableTechnique
-    uint32        passId;
-    // When pass have multiple sub-passes, specified here, selects a different PSO from compiled render object.
-    uint32        passSubId;
-
-    // Current pipeline stats.
-    SPipeStat* pPipelineStats;
-
-    // rend items
-    TRange<int>    rendItems;
-};
-
-class GraphicsPipelinePass
-{
-public:
-    virtual ~GraphicsPipelinePass() {}
-
-    // Allocate resources needed by the pipeline pass
-    virtual void Init() = 0;
-    // Free resources used by the pipeline pass
-    virtual void Shutdown() = 0;
-    // Prepare pass before actual rendering starts (called every frame)
-    virtual void Prepare() {};
-    // Force pass to reset data
-    virtual void Reset()  = 0;
-
-    // initialize command list with pass specific data
-    virtual void PrepareCommandList([[maybe_unused]] CDeviceGraphicsCommandListRef RESTRICT_REFERENCE commandList) const {}
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelineStateSet.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelineStateSet.cpp
deleted file mode 100644
index 828a947eac..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelineStateSet.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "GraphicsPipelineStateSet.h"
-#include "GraphicsPipelinePass.h"
-#include "DriverD3D.h"
-#include <AzCore/std/hash.h>
-
-SGraphicsPipelineStateDescription::SGraphicsPipelineStateDescription(
-    CRenderObject* pObj,
-    const SShaderItem& _shaderItem,
-    EShaderTechniqueID _technique,
-    AZ::Vertex::Format _vertexFormat,
-    uint32 _streamMask,
-    int _primitiveType)
-{
-    shaderItem = _shaderItem;
-    technique = _technique;
-    objectFlags = pObj->m_ObjFlags;
-    objectFlags_MDV = pObj->m_nMDV;
-    objectRuntimeMask = pObj->m_nRTMask;
-    vertexFormat = _vertexFormat;
-    streamMask = _streamMask;
-    primitiveType = _primitiveType;
-
-    AZ_PUSH_DISABLE_WARNING(, "-Wconstant-logical-operand")
-    if ((pObj->m_ObjFlags & FOB_SKINNED) && CRenderer::CV_r_usehwskinning && !CRenderer::CV_r_character_nodeform)
-    AZ_POP_DISABLE_WARNING
-    {
-        SSkinningData* pSkinningData = NULL;
-        SRenderObjData* pOD = pObj->GetObjData();
-        if (pOD && pOD->m_pSkinningData)
-        {
-            pSkinningData = pOD->m_pSkinningData;
-            if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_Matrix)
-            {
-                objectRuntimeMask |= (g_HWSR_MaskBit[HWSR_SKINNING_MATRIX]);
-            }
-            else if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_DQ_Linear)
-            {
-                objectRuntimeMask |= (g_HWSR_MaskBit[HWSR_SKINNING_DQ_LINEAR]);
-            }
-            else
-            {
-                objectRuntimeMask |= (g_HWSR_MaskBit[HWSR_SKINNING_DUAL_QUAT]);
-            }
-        }
-    }
-}
-
-CDeviceGraphicsPSOPtr CGraphicsPipelineStateLocalCache::FindState(uint64 stateHashKey) const
-{
-    for (auto const& state : m_states)
-    {
-        if (state.stateHashKey == stateHashKey)
-        {
-            return state.m_pipelineState;
-        }
-    }
-    return nullptr;
-}
-
-uint64 CGraphicsPipelineStateLocalCache::GetHashKey(const SGraphicsPipelineStateDescription& desc) const
-{
-    AZStd::hash<const SGraphicsPipelineStateDescription*> hasher;
-    uint64 key = hasher(&desc);
-    return key;
-}
-
-const DevicePipelineStatesArray* CGraphicsPipelineStateLocalCache::Find(const SGraphicsPipelineStateDescription& desc) const
-{
-    uint64 key = GetHashKey(desc);
-    for (auto const& state : m_states)
-    {
-        if (state.stateHashKey == key && state.description == desc)
-        {
-            return &state.m_pipelineStates;
-        }
-    }
-    return nullptr;
-}
-
-void CGraphicsPipelineStateLocalCache::Put(const SGraphicsPipelineStateDescription& desc, const DevicePipelineStatesArray& states)
-{
-    // Cache this state locally.
-    CachedState cache;
-    cache.stateHashKey = GetHashKey(desc);
-    cache.description = desc;
-    cache.m_pipelineStates = states;
-    m_states.push_back(cache);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelineStateSet.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelineStateSet.h
deleted file mode 100644
index 86bcbcd1b4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/GraphicsPipelineStateSet.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#pragma once
-
-#include "DeviceManager/DeviceWrapper12.h"
-
-class GraphicsPipelinePass;
-
-struct SGraphicsPipelineStateDescription
-{
-    SShaderItem              shaderItem;
-    EShaderTechniqueID       technique;
-    uint64                   objectFlags;
-    uint64                   objectRuntimeMask;
-    uint32                   objectFlags_MDV;
-    AZ::Vertex::Format       vertexFormat;
-    uint32                   streamMask;
-    int                      primitiveType;
-
-    SGraphicsPipelineStateDescription()
-        : technique(TTYPE_Z)
-        , objectFlags(0)
-        , objectFlags_MDV(0)
-        , objectRuntimeMask(0)
-        , vertexFormat(eVF_Unknown)
-        , streamMask(0)
-        , primitiveType(0)
-    {};
-    SGraphicsPipelineStateDescription(CRenderObject* pObj, const SShaderItem& shaderItem, EShaderTechniqueID technique, AZ::Vertex::Format vertexFormat, uint32 streamMask, int primitiveType);
-
-    bool operator==(const SGraphicsPipelineStateDescription& other) const
-    {
-        return 0 == memcmp(this, &other, sizeof(*this));
-    }
-};
-
-// Array of pass id and PipelineState
-typedef std::array<CDeviceGraphicsPSOPtr, 4> DevicePipelineStatesArray;
-
-// Set of precomputed Pipeline States
-class CGraphicsPipelineStateLocalCache
-{
-public:
-    const DevicePipelineStatesArray* Find(const SGraphicsPipelineStateDescription& desc) const;
-    void Put(const SGraphicsPipelineStateDescription& desc, const DevicePipelineStatesArray& states);
-
-private:
-    CDeviceGraphicsPSOPtr FindState(uint64 stateHashKey) const;
-    void StoreState(uint64 stateHashKey, CDeviceGraphicsPSOPtr pso) const;
-    uint64 GetHashKey(const SGraphicsPipelineStateDescription& desc) const;
-
-private:
-    struct CachedState
-    {
-        uint64 stateHashKey;
-        SGraphicsPipelineStateDescription description;
-        CDeviceGraphicsPSOPtr m_pipelineState;
-        DevicePipelineStatesArray m_pipelineStates;
-    };
-    std::vector<CachedState> m_states;
-};
-typedef std::shared_ptr<CGraphicsPipelineStateLocalCache> CGraphicsPipelineStateLocalCachePtr;
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/UtilityPasses.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/UtilityPasses.cpp
deleted file mode 100644
index aa8c03e2a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/UtilityPasses.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "UtilityPasses.h"
-#include "FullscreenPass.h"
-#include "DriverD3D.h"
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// CStretchRectPass
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CStretchRectPass::Execute(CTexture* pSrcTex, CTexture* pDestTex)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (pSrcTex == NULL || pDestTex == NULL)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("STRETCHRECT");
-
-    bool bResample = pSrcTex->GetWidth() != pDestTex->GetWidth() || pSrcTex->GetHeight() != pDestTex->GetHeight();
-    const D3DFormat destFormat = CTexture::DeviceFormatFromTexFormat(pDestTex->GetDstFormat());
-    const D3DFormat srcFormat = CTexture::DeviceFormatFromTexFormat(pSrcTex->GetDstFormat());
-
-    if (!bResample && destFormat == srcFormat)
-    {
-        rd->GetDeviceContext().CopyResource(pDestTex->GetDevTexture()->GetBaseTexture(), pSrcTex->GetDevTexture()->GetBaseTexture());
-        return;
-    }
-
-    static CCryNameTSCRC techTexToTex("TextureToTexture");
-    static CCryNameTSCRC techTexToTexResampled("TextureToTextureResampled");
-
-    m_pass.SetRenderTarget(0, pDestTex);
-    m_pass.SetTechnique(CShaderMan::s_shPostEffects, bResample ? techTexToTexResampled : techTexToTex, 0);
-    m_pass.SetState(GS_NODEPTHTEST);
-    int texFilter = CTexture::GetTexState(STexState(bResample ? FILTER_LINEAR : FILTER_POINT, true));
-    m_pass.SetTextureSamplerPair(0, pSrcTex, texFilter);
-
-    static CCryNameR param0Name("texToTexParams0");
-    static CCryNameR param1Name("texToTexParams1");
-
-    const bool bBigDownsample = false;  // TODO
-    CTexture* pOffsetTex = bBigDownsample ? pDestTex : pSrcTex;
-
-    float s1 = 0.5f / (float) pOffsetTex->GetWidth();  // 2.0 better results on lower res images resizing
-    float t1 = 0.5f / (float) pOffsetTex->GetHeight();
-
-    Vec4 params0, params1;
-    if (bBigDownsample)
-    {
-        // Use rotated grid + middle sample (~Quincunx)
-        params0 = Vec4(s1 * 0.96f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);
-        params1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);
-    }
-    else
-    {
-        // Use box filtering (faster - can skip bilinear filtering, only 4 taps)
-        params0 = Vec4(-s1, -t1, s1, -t1);
-        params1 = Vec4(s1, t1, -s1, t1);
-    }
-
-    m_pass.BeginConstantUpdate();
-    CShaderMan::s_shPostEffects->FXSetPSFloat(param0Name, &params0, 1);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(param1Name, &params1, 1);
-    m_pass.Execute();
-}
-
-void CStretchRectPass::Reset()
-{
-    m_pass.Reset();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// CGaussianBlurPass
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-inline float CGaussianBlurPass::GaussianDistribution1D(float x, float rho)
-{
-    float g = 1.0f / (rho * sqrtf(2.0f * PI));
-    g *= expf(-(x * x) / (2.0f * rho * rho));
-    return g;
-}
-
-void CGaussianBlurPass::ComputeParams(int texWidth, int texHeight, int numSamples, float scale, float distribution)
-{
-    assert(numSamples <= 16);
-    const int halfNumSamples = (numSamples >> 1);
-
-    float s1 = 1.0f / (float)texWidth;
-    float t1 = 1.0f / (float)texHeight;
-
-    float weights[16];
-    float weightSum = 0.0f;
-
-    // Compute Gaussian weights
-    for (int s = 0; s < numSamples; ++s)
-    {
-        if (distribution != 0.0f)
-        {
-            weights[s] = GaussianDistribution1D((float)(s - halfNumSamples), distribution);
-        }
-        else
-        {
-            weights[s] = 0.0f;
-        }
-        weightSum += weights[s];
-    }
-
-    // Normalize weights
-    for (int s = 0; s < numSamples; ++s)
-    {
-        weights[s] /= weightSum;
-    }
-
-    // Compute bilinear offsets
-    for (int s = 0; s < halfNumSamples; ++s)
-    {
-        float off_a = weights[s * 2];
-        float off_b = ((s * 2 + 1) <= numSamples - 1) ? weights[s * 2 + 1] : 0;
-        float a_plus_b = (off_a + off_b);
-        if (a_plus_b == 0)
-        {
-            a_plus_b = 1.0f;
-        }
-        float offset = off_b / a_plus_b;
-
-        weights[s] = off_a + off_b;
-        weights[s] *= scale;
-        m_weights[s] = Vec4(1, 1, 1, 1) * weights[s];
-
-        float currOffset = (float)s * 2.0f + offset - (float)halfNumSamples;
-        m_paramsH[s] = Vec4(s1 * currOffset, 0, 0, 0);
-        m_paramsV[s] = Vec4(0, t1 * currOffset, 0, 0);
-    }
-}
-
-void CGaussianBlurPass::Execute(CTexture* pTex, CTexture* pTempTex, float scale, float distribution)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (pTex == NULL || pTempTex == NULL)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("TEXBLUR_GAUSSIAN");
-
-    CShader* pShader = CShaderMan::s_shPostEffects;
-    int texFilter = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-
-    static CCryNameTSCRC techDefault("GaussBlurBilinear");
-    static CCryNameR clampTCName("clampTC");
-    static CCryNameR param0Name("psWeights");
-    static CCryNameR param1Name("PI_psOffsets");
-
-    Vec4 clampTC(0.0f, 1.0f, 0.0f, 1.0f);
-    if (pTex->GetWidth() == rd->GetWidth() && pTex->GetHeight() == rd->GetHeight())
-    {
-        // Clamp manually in shader since texture clamp won't apply for smaller viewport
-        clampTC = Vec4(0.0f, rd->m_RP.m_CurDownscaleFactor.x, 0.0f, rd->m_RP.m_CurDownscaleFactor.y);
-    }
-
-    const int numSamples = 16;
-    if (m_scale != scale || m_distribution != distribution)
-    {
-        ComputeParams(pTex->GetWidth(), pTex->GetHeight(), numSamples, scale, distribution);
-        m_scale = scale;
-        m_distribution = distribution;
-    }
-
-    // Horizontal
-    m_passH.SetRenderTarget(0, pTempTex);
-    m_passH.SetTechnique(pShader, techDefault, 0);
-    m_passH.SetState(GS_NODEPTHTEST);
-    m_passH.SetTextureSamplerPair(0, pTex, texFilter);
-
-    m_passH.BeginConstantUpdate();
-    pShader->FXSetVSFloat(param1Name, m_paramsH, numSamples / 2);
-    pShader->FXSetPSFloat(param0Name, m_weights, numSamples / 2);
-    pShader->FXSetPSFloat(clampTCName, &clampTC, 1);
-    m_passH.Execute();
-
-    // Vertical
-    m_passV.SetRenderTarget(0, pTex);
-    m_passV.SetTechnique(pShader, techDefault, 0);
-    m_passV.SetState(GS_NODEPTHTEST);
-    m_passV.SetTextureSamplerPair(0, pTempTex, texFilter);
-
-    m_passV.BeginConstantUpdate();
-    pShader->FXSetVSFloat(param1Name, m_paramsV, numSamples / 2);
-    pShader->FXSetPSFloat(param0Name, m_weights, numSamples / 2);
-    pShader->FXSetPSFloat(clampTCName, &clampTC, 1);
-    m_passV.Execute();
-}
-
-void CGaussianBlurPass::Reset()
-{
-    m_passH.Reset();
-    m_passV.Reset();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/UtilityPasses.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/UtilityPasses.h
deleted file mode 100644
index cf555f98fc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/Common/UtilityPasses.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "FullscreenPass.h"
-
-
-class CStretchRectPass
-{
-public:
-    void Execute(CTexture* pSrcTex, CTexture* pDestTex);
-    void Reset();
-
-protected:
-    CFullscreenPass  m_pass;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CGaussianBlurPass
-{
-public:
-    CGaussianBlurPass()
-        : m_scale(FLT_MIN)
-        , m_distribution(FLT_MIN)
-    {
-    }
-    void Execute(CTexture* pTex, CTexture* pTempTex, float scale, float distribution);
-    void Reset();
-
-protected:
-    float GaussianDistribution1D(float x, float rho);
-    void ComputeParams(int texWidth, int texHeight, int numSamples, float scale, float distribution);
-
-protected:
-    float            m_scale;
-    float            m_distribution;
-    Vec4             m_paramsH[16];
-    Vec4             m_paramsV[16];
-    Vec4             m_weights[16];
-
-    CFullscreenPass  m_passH;
-    CFullscreenPass  m_passV;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/DepthOfField.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/DepthOfField.cpp
deleted file mode 100644
index 2a3fe030f5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/DepthOfField.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DepthOfField.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "../../Common/Textures/TextureManager.h"
-#include "Common/RenderCapabilities.h"
-
-namespace
-{
-    const float Pi = (float)M_PI;
-
-    float ngon_rad(float theta, float n)
-    {
-        return cosf(Pi / n) / cosf(theta - (2 * Pi / n) * floorf((n * theta + PI) / (2 * Pi)));
-    }
-
-    // Shirleys concentric mapping
-    static Vec2 ToUnitDisk(Vec2 O, float blades, [[maybe_unused]] float fstop)
-    {
-        float normalizedStops = 1.0f;
-
-        float phi, r;
-        const float a = 2 * O.x - 1;
-        const float b = 2 * O.y - 1;
-        if (fabs(a) > fabs(b)) // use squares instead of absolute values
-        {
-            r = a;
-            phi = (Pi / 4.0f) * (b / (a + 1e-6f));
-        }
-        else
-        {
-            r = b;
-            phi = (Pi / 2.0f) - (Pi / 4.0f) * (a / (b + 1e-6f));
-        }
-
-        float rr = r * powf(ngon_rad(phi, blades), normalizedStops);
-        rr = fabs(rr) * (rr > 0 ? 1.0f : -1.0f);
-
-        return Vec2(rr * cosf(phi + normalizedStops), rr * sinf(phi + normalizedStops));
-    }
-}
-
-void CDepthOfField::UpdateParameters()
-{
-    bool bOverrideActive = IsActive();
-    bool bUseGameSettings = (m_pUserActive->GetParam()) ? true : false;
-
-    float frameTime = clamp_tpl<float>(gEnv->pTimer->GetFrameTime() * 3.0f, 0.0f, 1.0f);
-
-    {
-        float fUserFocusRange = m_pUserFocusRange->GetParam();
-        float fUserFocusDistance = m_pUserFocusDistance->GetParam();
-        float fUserBlurAmount = m_pUserBlurAmount->GetParam();
-
-        if (bOverrideActive)
-        {
-            fUserFocusRange = fUserFocusDistance = fUserBlurAmount = 0.0f;
-        }
-
-        m_fUserFocusRangeCurr += (fUserFocusRange - m_fUserFocusRangeCurr) * frameTime;
-        m_fUserFocusDistanceCurr += (fUserFocusDistance - m_fUserFocusDistanceCurr) * frameTime;
-        m_fUserBlurAmountCurr += (fUserBlurAmount - m_fUserBlurAmountCurr) * frameTime;
-    }
-
-    float focalDistance = 0.0f;
-    float focalRange = 0.0f;
-    float blurAmount = 0.0f;
-
-    /// Override mode: full control over focal distance / range through parameters.
-    if (bOverrideActive)
-    {
-        focalDistance = m_pFocusDistance->GetParam();
-        focalRange = m_pFocusRange->GetParam();
-        blurAmount = m_pBlurAmount->GetParam();
-    }
-
-    /// Blend of TOD settings with "user adjustments". Used by flowgraph / trackview.
-    else if (bUseGameSettings)
-    {
-        m_todFocusRange += (m_fUserFocusRangeCurr - m_todFocusRange) * frameTime;
-        m_todBlurAmount += (m_fUserBlurAmountCurr - m_todBlurAmount) * frameTime;
-
-        focalDistance = m_fUserFocusDistanceCurr;
-        focalRange = m_fUserFocusRangeCurr;
-        blurAmount = m_fUserBlurAmountCurr;
-    }
-
-    /// Full TOD control.
-    else
-    {
-        float fTodFocusRange = (CRenderer::CV_r_dof == 2) ? m_pTimeOfDayFocusRange->GetParam() : 0;
-        float fTodBlurAmount = (CRenderer::CV_r_dof == 2) ? m_pTimeOfDayBlurAmount->GetParam() : 0;
-
-        m_todFocusRange += (fTodFocusRange * 2.0f - m_todFocusRange) * frameTime;
-        m_todBlurAmount += (fTodBlurAmount - m_todBlurAmount) * frameTime;
-
-        focalDistance = 0.0f;
-        focalRange = m_todFocusRange;
-        blurAmount = m_todBlurAmount;
-    }
-
-    float focalMinDistance = -focalRange * 0.5f;
-    float focalMaxDistance = focalRange * 0.5f;
-
-    Vec4 focusParams;
-    focusParams.x = 1.0f / (focalMaxDistance + 1e-6f);
-    focusParams.y = -focalDistance / (focalMaxDistance + 1e-6f);
-    focusParams.z = 1.0f / (focalMinDistance + 1e-6f);
-    focusParams.w = -focalDistance / (focalMinDistance + 1e-6f);
-
-    // Arbitrary scale added for compatibility with deprecated scatter depth of field. Should get removed
-    // but will break existing content.
-    blurAmount *= 2.0f;
-
-    m_Parameters.m_FocusParams0 = focusParams;
-    m_Parameters.m_FocusParams1 = Vec4(CRenderer::CV_r_dofMinZ + m_pFocusMinZ->GetParam(), CRenderer::CV_r_dofMinZScale + m_pFocusMinZScale->GetParam(), 0.0f, blurAmount);
-    m_Parameters.m_bEnabled = blurAmount > 0.001f;
-}
-
-void DepthOfFieldPass::UpdatePassConstants(const DepthOfFieldParameters& dofParams)
-{
-    m_PassConstantBuffer->m_focusParams0 = dofParams.m_FocusParams0;
-    m_PassConstantBuffer->m_focusParams1 = dofParams.m_FocusParams1;
-    m_PassConstantBuffer.CopyToDevice();
-
-    AzRHI::ConstantBuffer* constantBuffer = m_PassConstantBuffer.GetDeviceConstantBuffer().get();
-    gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Pixel, constantBuffer, eConstantBufferShaderSlot_PerPass);
-}
-
-void DepthOfFieldPass::UpdateGatherSubPassConstants(AZ::u32 targetWidth, AZ::u32 targetHeight, AZ::u32 squareTapCount)
-{
-    const float fFNumber = 8;
-    const float fNumApertureSides = 8;
-    const float recipTapCount = 1.0f / ((float)squareTapCount - 1.0f);
-
-    for (AZ::u32 y = 0; y < squareTapCount; ++y)
-    {
-        for (AZ::u32 x = 0; x < squareTapCount; ++x)
-        {
-            Vec2 t = Vec2(x * recipTapCount, y * recipTapCount);
-            Vec2 result = ToUnitDisk(t, fNumApertureSides, fFNumber);
-            m_GatherSubPassConstantBuffer->m_taps[x + y * squareTapCount] = Vec4(result.x, result.y, 0, 0);
-        }
-    }
-    m_GatherSubPassConstantBuffer->m_ScreenSize = Vec4(
-        (float)targetWidth,
-        (float)targetHeight,
-        1.0f / (float)targetWidth,
-        1.0f / (float)targetHeight);
-    m_GatherSubPassConstantBuffer->m_tapCount = Vec4((float)(squareTapCount * squareTapCount), 0, 0, 0);    
-    m_GatherSubPassConstantBuffer.CopyToDevice();
-
-    AzRHI::ConstantBuffer* constantBuffer = m_GatherSubPassConstantBuffer.GetDeviceConstantBuffer().get();
-    gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Pixel, constantBuffer, eConstantBufferShaderSlot_PerSubPass);
-}
-
-void DepthOfFieldPass::UpdateMinCoCSubPassConstants(AZ::u32 targetWidth, AZ::u32 targetHeight)
-{
-    m_MinCoCSubPassConstantBuffer->m_ScreenSize = Vec4(
-        (float)targetWidth,
-        (float)targetHeight,
-        1.0f / (float)targetWidth,
-        1.0f / (float)targetHeight);
-    m_MinCoCSubPassConstantBuffer.CopyToDevice();
-
-    AzRHI::ConstantBuffer* constantBuffer = m_MinCoCSubPassConstantBuffer.GetDeviceConstantBuffer().get();
-    gcpRendD3D->m_DevMan.BindConstantBuffer(eHWSC_Pixel, constantBuffer, eConstantBufferShaderSlot_PerSubPass);
-}
-
-void DepthOfFieldPass::Init()
-{
-    m_PassConstantBuffer.CreateDeviceBuffer();
-    m_GatherSubPassConstantBuffer.CreateDeviceBuffer();
-    m_MinCoCSubPassConstantBuffer.CreateDeviceBuffer();
-}
-
-void DepthOfFieldPass::Shutdown()
-{
-}
-
-void DepthOfFieldPass::Reset()
-{
-}
-
-void DepthOfFieldPass::Execute()
-{
-    PROFILE_SHADER_SCOPE;
-    PROFILE_LABEL_SCOPE("DOF");
-
-    CDepthOfField* depthOfField = (CDepthOfField*)PostEffectMgr()->GetEffect(ePFX_eDepthOfField);
-    const DepthOfFieldParameters& dofParams = depthOfField->GetParameters();
-    if (!dofParams.m_bEnabled)
-    {
-        return;
-    }
-
-    UpdatePassConstants(dofParams);
-
-    gRenDev->m_cEF.mfRefreshSystemShader("DepthOfField", CShaderMan::s_shPostDepthOfField);
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-
-    CTexture* cocCurrent = SPostEffectsUtils::GetCoCCurrentTarget();
-    if (CRenderer::CV_r_AntialiasingMode == eAT_TAA)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-    gcpRendD3D->SetCullMode(R_CULL_NONE);
-
-    // For better blending later.
-    // We skip this on mobile as to reduce memory bandwidth and fetch from the RT instead using GMEM
-    bool sampleSceneFromRenderTarget = gcpRendD3D->FX_GetEnabledGmemPath(nullptr) && RenderCapabilities::GetFrameBufferFetchCapabilities().test(RenderCapabilities::FBF_COLOR0);
-    if (!sampleSceneFromRenderTarget)
-    {
-        GetUtils().StretchRect(CTexture::s_ptexHDRTarget, CTexture::s_ptexSceneTarget);
-    }
-
-    CTexture* nearFarLayersTemp[2] = { CTexture::s_ptexHDRTargetScaledTmp[0], CTexture::s_ptexHDRTargetScaledTempRT[0] };
-
-    assert(nearFarLayersTemp[0]->GetWidth() == CTexture::s_ptexHDRDofLayers[0]->GetWidth() && nearFarLayersTemp[0]->GetHeight() == CTexture::s_ptexHDRDofLayers[0]->GetHeight());
-    assert(nearFarLayersTemp[1]->GetWidth() == CTexture::s_ptexHDRDofLayers[1]->GetWidth() && nearFarLayersTemp[1]->GetHeight() == CTexture::s_ptexHDRDofLayers[1]->GetHeight());
-    assert(nearFarLayersTemp[0]->GetPixelFormat() == CTexture::s_ptexHDRDofLayers[0]->GetPixelFormat() && nearFarLayersTemp[1]->GetPixelFormat() == CTexture::s_ptexHDRDofLayers[1]->GetPixelFormat());
-
-    {
-        // 1st downscale stage
-        {
-            PROFILE_LABEL_SCOPE("DOWNSCALE LAYERS");
-
-            gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexHDRDofLayers[0], NULL); // near
-            gcpRendD3D->FX_PushRenderTarget(1, CTexture::s_ptexHDRDofLayers[1], NULL); // far
-            gcpRendD3D->FX_PushRenderTarget(2, CTexture::s_ptexSceneCoC[0], NULL); // CoC near/far
-
-            gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-            gcpRendD3D->FX_SetColorDontCareActions(1, true, false);
-            gcpRendD3D->FX_SetColorDontCareActions(2, true, false);
-
-            static CCryNameTSCRC techNameDownscaleDof("DownscaleDof");
-            GetUtils().ShBeginPass(CShaderMan::s_shPostDepthOfField, techNameDownscaleDof, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            GetUtils().SetTexture(CTexture::s_ptexZTarget, 0, FILTER_POINT);
-            GetUtils().SetTexture(CTexture::s_ptexHDRTarget, 1, FILTER_LINEAR);
-            GetUtils().SetTexture(cocCurrent, 2, FILTER_POINT);
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexHDRDofLayers[0]->GetWidth(), CTexture::s_ptexHDRDofLayers[0]->GetHeight());
-
-            GetUtils().ShEndPass();
-            gcpRendD3D->FX_PopRenderTarget(0);
-            gcpRendD3D->FX_PopRenderTarget(1);
-            gcpRendD3D->FX_PopRenderTarget(2);
-
-            // Avoiding false d3d error (due to deferred rt setup, when ping-pong'ing between RTs we can bump into RTs still bound when binding it as a SRV)
-            gcpRendD3D->FX_SetActiveRenderTargets();
-        }
-
-        // 2nd downscale stage (tile min CoC)
-        {
-            PROFILE_LABEL_SCOPE("MIN COC DOWNSCALE");
-            uint startingDownscaleIter = 1;
-            for (uint32 i = startingDownscaleIter; i < MIN_DOF_COC_K; i++)
-            {
-                uint32 cocArrayLastElement = i - 1;
-                if (i == startingDownscaleIter)
-                {
-                    cocArrayLastElement = 0;
-                }
-
-                gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexSceneCoC[i], NULL); // near
-                gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-
-                static CCryNameTSCRC techNameTileMinCoC("TileMinCoC");
-                GetUtils().ShBeginPass(CShaderMan::s_shPostDepthOfField, techNameTileMinCoC, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-                UpdateMinCoCSubPassConstants(
-                    CTexture::s_ptexSceneCoC[cocArrayLastElement]->GetWidth(),
-                    CTexture::s_ptexSceneCoC[cocArrayLastElement]->GetHeight());
-
-                GetUtils().SetTexture(CTexture::s_ptexSceneCoC[cocArrayLastElement], 0, FILTER_LINEAR);
-                SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexSceneCoC[i]->GetWidth(), CTexture::s_ptexSceneCoC[i]->GetHeight());
-
-                GetUtils().ShEndPass();
-                gcpRendD3D->FX_PopRenderTarget(0);
-                gcpRendD3D->FX_SetActiveRenderTargets();
-            }
-        }
-    }
-
-    {
-        // 1st gather pass
-        {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(DepthOfField_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            AZ::u32 squareTapCount = 7;
-#endif
-            if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-            {
-                squareTapCount = CRenderer::CV_r_GMEM_DOF_Gather1_Quality;
-            }
-            UpdateGatherSubPassConstants(
-                nearFarLayersTemp[0]->GetWidth(),
-                nearFarLayersTemp[0]->GetHeight(),
-                squareTapCount);
-
-            PROFILE_LABEL_SCOPE("FAR/NEAR LAYER");
-            gcpRendD3D->FX_PushRenderTarget(0, nearFarLayersTemp[0], NULL);
-            gcpRendD3D->FX_PushRenderTarget(1, nearFarLayersTemp[1], NULL);
-            gcpRendD3D->FX_PushRenderTarget(2, CTexture::s_ptexSceneCoCTemp, NULL);
-
-            gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-            gcpRendD3D->FX_SetColorDontCareActions(1, true, false);
-            gcpRendD3D->FX_SetColorDontCareActions(2, true, false);
-
-            gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-            static CCryNameTSCRC techNameDOF("Dof");
-            GetUtils().ShBeginPass(CShaderMan::s_shPostDepthOfField, techNameDOF, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            GetUtils().SetTexture(CTexture::s_ptexZTargetScaled, 0, FILTER_POINT);
-            GetUtils().SetTexture(CTexture::s_ptexHDRDofLayers[0], 1, FILTER_LINEAR);
-            GetUtils().SetTexture(CTexture::s_ptexHDRDofLayers[1], 2, FILTER_LINEAR);
-            GetUtils().SetTexture(CTexture::s_ptexSceneCoC[0], 3, FILTER_LINEAR);
-            GetUtils().SetTexture(CTexture::s_ptexSceneCoC[MIN_DOF_COC_K - 1], 4, FILTER_POINT);
-
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(nearFarLayersTemp[0]->GetWidth(), nearFarLayersTemp[0]->GetHeight());
-
-            GetUtils().ShEndPass();
-            gcpRendD3D->FX_PopRenderTarget(2);
-            gcpRendD3D->FX_PopRenderTarget(1);
-            gcpRendD3D->FX_PopRenderTarget(0);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-        }
-
-        // 2nd gather iteration
-        {
-            AZ::u32 squareTapCount = 3;
-            if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-            {
-                squareTapCount = CRenderer::CV_r_GMEM_DOF_Gather2_Quality;
-            }
-            UpdateGatherSubPassConstants(
-                CTexture::s_ptexHDRDofLayers[0]->GetWidth(),
-                CTexture::s_ptexHDRDofLayers[0]->GetHeight(),
-                squareTapCount);
-
-            PROFILE_LABEL_SCOPE("FAR/NEAR LAYER ITERATION");
-            gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexHDRDofLayers[0], NULL);
-            gcpRendD3D->FX_PushRenderTarget(1, CTexture::s_ptexHDRDofLayers[1], NULL);
-
-            gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-            gcpRendD3D->FX_SetColorDontCareActions(1, true, false);
-
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-            static CCryNameTSCRC techNameDOF("Dof");
-            GetUtils().ShBeginPass(CShaderMan::s_shPostDepthOfField, techNameDOF, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            GetUtils().SetTexture(nearFarLayersTemp[0], 1, FILTER_LINEAR);
-            GetUtils().SetTexture(nearFarLayersTemp[1], 2, FILTER_LINEAR);
-            GetUtils().SetTexture(CTexture::s_ptexSceneCoCTemp, 3, FILTER_POINT);
-            GetUtils().SetTexture(CTexture::s_ptexSceneCoC[MIN_DOF_COC_K - 1], 4, FILTER_POINT);
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexHDRDofLayers[0]->GetWidth(), CTexture::s_ptexHDRDofLayers[0]->GetHeight());
-
-            GetUtils().ShEndPass();
-            gcpRendD3D->FX_PopRenderTarget(1);
-            gcpRendD3D->FX_PopRenderTarget(0);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-        }
-
-        // Final composition
-        {
-            PROFILE_LABEL_SCOPE("COMPOSITE");
-            gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, NULL);
-
-            static CCryNameTSCRC techNameCompositeDof("CompositeDof");
-            GetUtils().ShBeginPass(CShaderMan::s_shPostDepthOfField, techNameCompositeDof, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            GetUtils().SetTexture(CTexture::s_ptexZTarget, 0, FILTER_POINT);
-            GetUtils().SetTexture(CTexture::s_ptexHDRDofLayers[0], 1, FILTER_LINEAR);
-            GetUtils().SetTexture(CTexture::s_ptexHDRDofLayers[1], 2, FILTER_LINEAR);
-            GetUtils().SetTexture(CTextureManager::Instance()->GetNoTexture(), 3, FILTER_LINEAR);
-
-            if (!sampleSceneFromRenderTarget)
-            {
-                GetUtils().SetTexture(CTexture::s_ptexSceneTarget, 4, FILTER_POINT);
-            }
-
-            GetUtils().SetTexture(cocCurrent, 5, FILTER_POINT);
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight());
-
-            GetUtils().ShEndPass();
-
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        CTexture::s_ptexHDRTarget->SetResolved(true);
-        gcpRendD3D->FX_SetActiveRenderTargets();
-    }
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/DepthOfField.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/DepthOfField.h
deleted file mode 100644
index 2728f1ff07..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/DepthOfField.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-#include "Common/PostProcess/PostEffects.h"
-#include "Common/TypedConstantBuffer.h"
-
-class DepthOfFieldPass
-    : public GraphicsPipelinePass
-{
-public:
-    virtual ~DepthOfFieldPass() {}
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute();
-
-private:
-    void UpdatePassConstants(const DepthOfFieldParameters& dofParams);
-    void UpdateGatherSubPassConstants(AZ::u32 targetWidth, AZ::u32 targetHeight, AZ::u32 squareTapCount);
-    void UpdateMinCoCSubPassConstants(AZ::u32 targetWidth, AZ::u32 targetHeight);
-
-    struct PassConstants
-    {
-        Vec4 m_focusParams0;
-        Vec4 m_focusParams1;
-        Matrix44 m_reprojection;
-    };
-
-    static const AZ::u32 SquareTapSizeMax = 7;
-
-    struct GatherSubPassConstants
-    {
-        Vec4 m_ScreenSize;
-        Vec4 m_taps[SquareTapSizeMax * SquareTapSizeMax];
-        Vec4 m_tapCount; //x = tapCount y,z,w = unused        
-    };
-
-    struct MinCoCSubPassConstants
-    {
-        Vec4 m_ScreenSize;
-    };
-
-    CTypedConstantBuffer<PassConstants> m_PassConstantBuffer;
-    CTypedConstantBuffer<GatherSubPassConstants> m_GatherSubPassConstantBuffer;
-    CTypedConstantBuffer<MinCoCSubPassConstants> m_MinCoCSubPassConstantBuffer;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurBendData.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurBendData.cpp
deleted file mode 100644
index 50f2cc08b7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurBendData.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include "FurBendData.h"
-#include <AzCore/Math/Matrix4x4.h>
-
-/*static*/ FurBendData& FurBendData::Get()
-{
-    static FurBendData s_instance;
-    return s_instance;
-}
-
-void FurBendData::SetupObject(CRenderObject& renderObject, const SRenderingPassInfo& passInfo)
-{
-    if (passInfo.IsRecursivePass())
-    {
-        return;
-    }
-
-    renderObject.m_ObjFlags &= ~FOB_HAS_PREVMATRIX;
-
-    // Perhaps use a different distance for fur movement bending?
-    if (renderObject.m_fDistance < CRenderer::CV_r_MotionBlurMaxViewDist)
-    {
-        const AZ::u32 currentFrameId = passInfo.GetMainFrameID();
-        const uintptr_t objectId = reinterpret_cast<uintptr_t>(renderObject.m_pRenderNode);
-        auto iter = m_objects.find(objectId);
-        if (iter != m_objects.end())
-        {
-            ObjectParameters* pParams = &iter->second;
-
-            // Perhaps use a different threshold for fur movement bending?
-            const float fThreshold = CRenderer::CV_r_MotionBlurThreshold;
-            if (!Matrix34::IsEquivalent(pParams->m_worldMatrix, renderObject.m_II.m_Matrix, fThreshold))
-            {
-                renderObject.m_ObjFlags |= FOB_HAS_PREVMATRIX;
-
-                // Slerp rotation, and lerp translation
-                // FUTURE: THis will be way more efficient once RenderDll uses AZ Math fully
-                float fBendBias = CRenderer::CV_r_FurMovementBendingBias; // Could instead retrieve stiffness from material
-                fBendBias = AZ::GetClamp(fBendBias, 0.0f, 1.0f);
-
-                AZ::Vector4 rows[4];
-                rows[0] = AZ::Vector4::CreateFromFloat4(renderObject.m_II.m_Matrix.GetData());
-                rows[1] = AZ::Vector4::CreateFromFloat4(renderObject.m_II.m_Matrix.GetData() + 4);
-                rows[2] = AZ::Vector4::CreateFromFloat4(renderObject.m_II.m_Matrix.GetData() + 8);
-                rows[3] = AZ::Vector4::CreateAxisW();
-
-                AZ::Matrix4x4 currMatrix = AZ::Matrix4x4::CreateFromRows(rows[0], rows[1], rows[2], rows[3]);
-                rows[0] = AZ::Vector4::CreateFromFloat4(pParams->m_worldMatrix.GetData());
-                rows[1] = AZ::Vector4::CreateFromFloat4(pParams->m_worldMatrix.GetData() + 4);
-                rows[2] = AZ::Vector4::CreateFromFloat4(pParams->m_worldMatrix.GetData() + 8);
-                AZ::Matrix4x4 prevMatrix = AZ::Matrix4x4::CreateFromRows(rows[0], rows[1], rows[2], rows[3]);
-
-                // Lerp should really be time-based, not frame-based
-                currMatrix = AZ::Matrix4x4::CreateInterpolated(prevMatrix, currMatrix, fBendBias);
-
-                currMatrix.GetRows(&rows[0], &rows[1], &rows[2], &rows[3]);
-                float vals[12];
-                rows[0].StoreToFloat4(&vals[0]);
-                rows[1].StoreToFloat4(&vals[4]);
-                rows[2].StoreToFloat4(&vals[8]);
-                memcpy(pParams->m_worldMatrix.GetData(), vals, sizeof(float) * 12);
-
-                pParams->m_updateFrameId = currentFrameId;
-                pParams->m_pRenderObject = &renderObject;
-            }
-        }
-        else
-        {
-            uint32 fillThreadId = passInfo.ThreadID();
-            m_fillData[fillThreadId].push_back(ObjectMap::value_type(objectId, ObjectParameters(renderObject, renderObject.m_II.m_Matrix, currentFrameId)));
-        }
-    }
-}
-
-void FurBendData::GetPrevObjToWorldMat(CRenderObject& renderObject, Matrix44A& worldMatrix)
-{
-    if (renderObject.m_ObjFlags & FOB_HAS_PREVMATRIX)
-    {
-        const uintptr_t objectId = reinterpret_cast<uintptr_t>(renderObject.m_pRenderNode);
-
-        auto iter = m_objects.find(objectId);
-        if (iter != m_objects.end())
-        {
-            worldMatrix = iter->second.m_worldMatrix;
-            return;
-        }
-    }
-
-    worldMatrix = renderObject.m_II.m_Matrix;
-}
-
-void FurBendData::InsertNewElements()
-{
-    AZ::u32 nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-    if (!m_fillData[nThreadID].empty())
-    {
-        m_fillData[nThreadID].CoalesceMemory();
-        m_objects.insert(&m_fillData[nThreadID][0], &m_fillData[nThreadID][0] + m_fillData[nThreadID].size());
-        m_fillData[nThreadID].resize(0);
-    }
-}
-
-void FurBendData::FreeData()
-{
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_fillData[i].clear();
-    }
-
-    for (size_t i = 0; i < sizeof(m_objects) / sizeof(m_objects[0]); ++i)
-    {
-        stl::reconstruct(m_objects[i]);
-    }
-}
-
-void FurBendData::OnBeginFrame()
-{
-    AZ_Assert(!gRenDev->m_pRT || gRenDev->m_pRT->IsMainThread(), "");
-
-    const AZ::u32 frameId = gRenDev->GetFrameID(false);
-    m_objects.erase_if([frameId](const VectorMap<uintptr_t, ObjectParameters >::value_type& object)
-    {
-        const AZ::u32 discardThreshold = 60;
-        return (frameId - object.second.m_updateFrameId) > discardThreshold;
-    });
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurBendData.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurBendData.h
deleted file mode 100644
index 2ffc0fb814..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurBendData.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-//#include "Common/Renderer.h"
-
-class FurBendData
-{
-public:
-    static FurBendData& Get();
-
-    void SetupObject(CRenderObject& renderObject, const SRenderingPassInfo& passInfo);
-    void GetPrevObjToWorldMat(CRenderObject& renderObject, Matrix44A& res);
-    void InsertNewElements();
-    void FreeData();
-
-    void OnBeginFrame();
-
-private:
-    struct ObjectParameters
-    {
-        ObjectParameters()
-            : m_pRenderObject(nullptr)
-        {
-        }
-
-        ObjectParameters(CRenderObject& renderObject, const Matrix34A& worldMatrix, AZ::u32 updateFrameId)
-            : m_pRenderObject(&renderObject)
-            , m_updateFrameId(updateFrameId)
-            , m_worldMatrix(worldMatrix)
-        {
-        }
-
-        CRenderObject* m_pRenderObject;
-        AZ::u32 m_updateFrameId;
-        Matrix34 m_worldMatrix;
-        //uint32 m_numBones;
-        //DualQuat* m_pBoneQuatsS;
-    };
-
-    typedef VectorMap<uintptr_t, ObjectParameters > ObjectMap;
-    ObjectMap m_objects;
-    CThreadSafeRendererContainer<ObjectMap::value_type> m_fillData[RT_COMMAND_BUF_COUNT];
-
-    static FurBendData* s_pInstance;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurPasses.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurPasses.cpp
deleted file mode 100644
index 8ae72c0c82..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurPasses.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-
-#include "FurPasses.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-
-FurPasses* FurPasses::s_pInstance = nullptr;
-
-/*static*/ void FurPasses::InstallInstance()
-{
-    if (s_pInstance == nullptr)
-    {
-        s_pInstance = new FurPasses();
-    }
-}
-
-/*static*/ void FurPasses::ReleaseInstance()
-{
-    delete s_pInstance;
-    s_pInstance = nullptr;
-}
-
-/*static*/ FurPasses& FurPasses::GetInstance()
-{
-    AZ_Assert(s_pInstance != nullptr, "FurPasses instance being retrieved before install.");
-    return *s_pInstance;
-}
-
-FurPasses::FurPasses()
-    : m_furShellPassPercent(0.0f)
-{
-}
-
-FurPasses::~FurPasses()
-{
-}
-
-FurPasses::RenderMode FurPasses::GetFurRenderingMode()
-{
-    switch (CRenderer::CV_r_Fur)
-    {
-    case 1:
-        return RenderMode::AlphaBlended;
-    case 2:
-        return RenderMode::AlphaTested;
-    default:
-        return RenderMode::None;
-    }
-}
-
-bool FurPasses::IsRenderingFur()
-{
-    if (GetFurRenderingMode() == RenderMode::None)
-    {
-        return false;
-    }
-
-    uint32 flags = SRendItem::BatchFlags(GetFurRenderList(), gcpRendD3D->m_RP.m_pRLD);
-    return (flags & FB_FUR) != 0;
-}
-
-int FurPasses::GetFurRenderList()
-{
-    return (GetFurRenderingMode() == RenderMode::AlphaBlended) ? EFSLIST_TRANSP : EFSLIST_GENERAL;
-}
-
-void FurPasses::ExecuteZPostPass()
-{
-    // This pass renders the outermost fur shell in a 1-in-4 stipple pattern to gather lighting data for fur tips.
-    // It also performs an additional LinearizeDepth pass to provide the updated depths to the deferred pipeline.
-    if (IsRenderingFur())
-    {
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-        {
-            PROFILE_LABEL_SCOPE("FUR_ZPOST");
-
-            rd->FX_ZScene(true, false);
-            rd->m_RP.m_pRenderFunc = &ZPostRenderFunc;
-
-            rd->FX_ProcessRenderList(GetFurRenderList(), FB_FUR, false /*bSetRenderFunc*/);
-            rd->FX_ZScene(false, false, true);
-        }
-
-        rd->FX_LinearizeDepth(CTexture::s_ptexFurZTarget);
-    }
-}
-
-void FurPasses::ExecuteObliteratePass()
-{
-    // This pass captures the lighting data from HDRTarget to s_ptexFurLightAcc, and then removes the stipples from 
-    // the final target (via a horizontal blur only on the stippled pixels) and depth buffer (direct copy from Z target)
-    // before beginning the forward shading passes
-    if (IsRenderingFur())
-    {
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-        PROFILE_LABEL_SCOPE("FUR_OBLITERATE");
-
-        // Copy HDR target so we can use it as an input texture
-        PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexFurLightAcc);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexFurLightAcc, 0, FILTER_POINT);
-
-        // Use Z target rather than fur Z target so that the "true" depth can be retained for forward passes
-        // Without this, some passes may fail depth tests when they should pass (such as eye rendering)
-        PostProcessUtils().SetTexture(CTexture::s_ptexZTarget, 1, FILTER_POINT);
-        
-        rd->m_RP.m_pRenderFunc = &ObliterateRenderFunc;
-        rd->FX_ProcessRenderList(GetFurRenderList(), FB_FUR, false /*bSetRenderFunc*/);
-    }
-}
-
-void FurPasses::ExecuteFinPass()
-{
-    // This pass renders alpha-tested camera-facing silhouettes of the fur fins. It uses similar logic to the fur shadow pass.
-    if (IsRenderingFur())
-    {
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-        PROFILE_LABEL_SCOPE("FUR_FINS");
-
-        uint64  nSavedFlags = rd->m_RP.m_FlagsShader_RT;
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_GPU_PARTICLE_TURBULENCE]; // Indicates fin pass
-        FurPasses::GetInstance().ApplyFurDebugFlags();
-
-        rd->m_RP.m_pRenderFunc = &FinRenderFunc;
-        rd->FX_ProcessRenderList(GetFurRenderList(), FB_FUR, false /*bSetRenderFunc*/);
-
-        rd->m_RP.m_FlagsShader_RT = nSavedFlags;
-    }
-}
-
-void FurPasses::ExecuteShellPrepass()
-{
-    // This pass gathers and packs all data required by the shell passes into a single buffer. The RGB channels contain
-    // the accumulated diffuse and specular lighting (without albedo applied), with the diffuse stored in the upper half of
-    // the channels, and the specular stored in the lower half. The alpha channel contains the scene depth, to save a
-    // texture read of the linearized depth buffer.
-    if (IsRenderingFur())
-    {
-        // Skip shell prepass for aux viewports. Shader side, this is indicated by %_RT_HDR_MODE being unset, but since the
-        // render pass hasn't started yet, we have to instead mimic the check that FX_Start performs to set %_RT_HDR_MODE
-        CD3D9Renderer* const __restrict rd = gcpRendD3D;
-        bool hdrMode = (rd->m_RP.m_PersFlags2 & RBPF2_HDR_FP16) && !(rd->m_RP.m_nBatchFilter & (FB_Z));
-        if (hdrMode)
-        {
-            PROFILE_LABEL_SCOPE("FUR_SHELL_PREPASS");
-
-            uint64 savedFlags = rd->m_RP.m_FlagsShader_RT;
-
-            // Volumetric fog is applied in prepass only if fur is alpha blended; alpha tested fur is drawn before fog
-            bool useVolumetricFog = CD3D9Renderer::CV_r_VolumetricFog != 0 && GetFurRenderingMode() == RenderMode::AlphaBlended;
-            if (useVolumetricFog)
-            {
-                rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_VOLUMETRIC_FOG];
-            }
-
-            static CCryNameTSCRC techFurShellPrepass("FurShellPrepass");
-            rd->FX_PushRenderTarget(0, CTexture::s_ptexFurPrepass, nullptr);
-            PostProcessUtils().ShBeginPass(CShaderMan::s_ShaderFur, techFurShellPrepass, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexFurLightAcc, 0, FILTER_POINT, 0);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexSceneTargetR11G11B10F[0], 1, FILTER_POINT, 0);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexSceneDiffuse, 2, FILTER_POINT, 0);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexSceneNormalsMap, 3, FILTER_POINT, 0);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexSceneSpecular, 4, FILTER_POINT, 0);
-            SPostEffectsUtils::SetTexture(CTexture::s_ptexFurZTarget, 5, FILTER_POINT, 0);
-            if (useVolumetricFog)
-            {
-                SPostEffectsUtils::SetTexture(CTexture::s_ptexVolumetricFog, 6, FILTER_TRILINEAR, 1);
-            }
-
-            rd->FX_SetState(GS_NODEPTHTEST);
-            GetUtils().DrawQuadFS(CShaderMan::s_ShaderFur, true /*bOutputCamVec*/, CTexture::s_ptexFurPrepass->GetWidth(), CTexture::s_ptexFurPrepass->GetHeight());
-            GetUtils().ShEndPass();
-            rd->FX_PopRenderTarget(0);
-
-            rd->m_RP.m_FlagsShader_RT = savedFlags;
-        }
-    }
-}
-
-void FurPasses::ApplyFurDebugFlags()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-    if (rd->CV_r_FurDebug > 0 && (rd->m_RP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_HDR_MODE]) != 0) // Don't apply fur debug flags in aux views
-    {
-        if (rd->CV_r_FurDebug & 1)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG0];
-        }
-        if (rd->CV_r_FurDebug & 2)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG1];
-        }
-        if (rd->CV_r_FurDebug & 4)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG2];
-        }
-        if (rd->CV_r_FurDebug & 8)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_DEBUG3];
-        }
-    }
-}
-
-void FurPasses::SetFurShellPassPercent(float percent)
-{
-    m_furShellPassPercent = AZ::GetClamp(percent, 0.0f, 1.0f);
-}
-
-float FurPasses::GetFurShellPassPercent()
-{
-    return m_furShellPassPercent;
-}
-
-/*static*/ void FurPasses::ZPostRenderFunc()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    static CCryNameTSCRC techFurZPost("FurZPost");
-    rd->m_RP.m_pShader->FXSetTechnique(techFurZPost);
-
-    rd->FX_FlushShader_General();
-}
-
-/*static*/ void FurPasses::ObliterateRenderFunc()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    static CCryNameTSCRC techFurObliterate("FurObliterate");
-    rd->m_RP.m_pShader->FXSetTechnique(techFurObliterate);
-
-    rd->FX_FlushShader_General();
-}
-
-/*static*/ void FurPasses::FinRenderFunc()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    static CCryNameTSCRC techFurFins("FurFins");
-    rd->m_RP.m_pShader->FXSetTechnique(techFurFins);
-
-    rd->FX_FlushShader_General();
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurPasses.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurPasses.h
deleted file mode 100644
index 488a8504ed..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/FurPasses.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-class FurPasses
-{
-public:
-    static void InstallInstance();
-    static void ReleaseInstance();
-    static FurPasses& GetInstance();
-
-    enum class RenderMode
-    {
-        None,
-        AlphaBlended,
-        AlphaTested,
-    };
-
-    // Returns how fur is set up to render
-    RenderMode GetFurRenderingMode();
-
-    // Returns whether the current frame contains render items using fur
-    bool IsRenderingFur();
-
-    // Returns the render list that fur render objects should be placed in
-    int GetFurRenderList();
-
-    void ExecuteZPostPass();
-    void ExecuteObliteratePass();
-    void ExecuteFinPass();
-    void ExecuteShellPrepass();
-
-    void ApplyFurDebugFlags();
-
-    void SetFurShellPassPercent(float percent);
-    float GetFurShellPassPercent();
-
-protected:
-    FurPasses();
-    ~FurPasses();
-
-private:
-    static FurPasses* s_pInstance; // This (and related singleton functions) should be removed when there is a system in place for managing passes.
-
-    static void ZPostRenderFunc();
-    static void ObliterateRenderFunc();
-    static void FinRenderFunc();
-
-    float m_furShellPassPercent;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/MotionBlur.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/MotionBlur.cpp
deleted file mode 100644
index e4f115108d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/MotionBlur.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "MotionBlur.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Old Pipeline Pass
-
-AZStd::unique_ptr<CMotionBlur::ObjectMap> CMotionBlur::m_Objects[CMotionBlur::s_maxObjectBuffers];
-CThreadSafeRendererContainer<CMotionBlur::ObjectMap::value_type> CMotionBlur::m_FillData[RT_COMMAND_BUF_COUNT];
-
-void CMotionBlur::GetPrevObjToWorldMat(CRenderObject* renderObject, Matrix44A& worldMatrix)
-{
-    assert(renderObject);
-
-    if (renderObject->m_ObjFlags & FOB_HAS_PREVMATRIX)
-    {
-        const SRenderObjData* renderObjectData = renderObject->GetObjData();
-        const uintptr_t objectId = renderObjectData ? renderObjectData->m_uniqueObjectId : 0;
-        const AZ::u32 frameId = gRenDev->GetFrameID(false);
-        const AZ::u32 objectIndex = (frameId - 1) % CMotionBlur::s_maxObjectBuffers;
-
-        auto it = m_Objects[objectIndex]->find(objectId);
-        if (it != m_Objects[objectIndex]->end())
-        {
-            worldMatrix = it->second.m_worldMatrix;
-            return;
-        }
-    }
-
-    worldMatrix = renderObject->m_II.m_Matrix;
-}
-
-void CMotionBlur::OnBeginFrame()
-{
-    assert(!gRenDev->m_pRT || gRenDev->m_pRT->IsMainThread());
-    const AZ::u32 frameId = gRenDev->GetFrameID(false);
-    const AZ::u32 objectIndex = frameId % CMotionBlur::s_maxObjectBuffers;
-
-    m_Objects[objectIndex]->erase_if([frameId](const VectorMap<uintptr_t, MotionBlurObjectParameters >::value_type& object)
-    {
-        return (frameId - object.second.m_updateFrameId) > s_discardThreshold;
-    });
-}
-
-void CMotionBlur::InsertNewElements()
-{
-    AZ::u32 nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-    if (m_FillData[nThreadID].empty())
-    {
-        return;
-    }
-
-    const AZ::u32 nFrameID = gRenDev->GetFrameID(false);
-    const AZ::u32 nObjFrameWriteID = (nFrameID - 1) % CMotionBlur::s_maxObjectBuffers;
-
-    m_FillData[nThreadID].CoalesceMemory();
-    m_Objects[nObjFrameWriteID]->insert(&m_FillData[nThreadID][0], &m_FillData[nThreadID][0] + m_FillData[nThreadID].size());
-    m_FillData[nThreadID].resize(0);
-}
-
-void CMotionBlur::FreeData()
-{
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; ++i)
-    {
-        m_FillData[i].clear();
-    }
-
-    for (size_t i = 0; i < CMotionBlur::s_maxObjectBuffers; ++i)
-    {
-        // m_Objects is a static object that is initialized in CMotionBlur::CMotionBlur, which is not guaranteed to be called by an application.
-        // CMotionBlur::FreeData is a static cleanup function that is called regardless if CMotionBlur was created or not, so check to verify
-        // we have valid data in m_Objects before trying to destruct the containers.
-        if (m_Objects[i].get())
-        {
-            stl::reconstruct((*m_Objects[i]));
-        }
-    }
-}
-
-bool CD3D9Renderer::FX_MotionVectorGeneration(bool bEnable)
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CV_r_MotionVectors)
-    {
-        return false;
-    }
-
-    if (bEnable)
-    {
-        GetUtils().Log(" +++ Begin object motion vector generation +++ \n");
-
-        // Re-use scene target rendertarget for velocity buffer
-        RT_SetViewport(0, 0, CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-
-        m_RP.m_PersFlags2 |= RBPF2_MOTIONBLURPASS;
-    }
-    else
-    {
-        FX_ResetPipe();
-        gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-
-        m_RP.m_PersFlags2 &= ~RBPF2_MOTIONBLURPASS;
-
-        GetUtils().Log(" +++ End object motion vector generation +++ \n");
-    }
-
-    return true;
-}
-
-void CMotionBlur::RenderObjectsVelocity()
-{
-    PROFILE_LABEL_SCOPE("OBJECTS VELOCITY");
-
-    auto renderTarget = GetUtils().GetVelocityObjectRT();
-    auto depthTarget = &gcpRendD3D->m_DepthBufferOrig;
-
-    // Make sure the depth target is at least as large as the render target.
-    // Since the render target lags behind by a frame this might not be the case
-    // when resolution is changed from higher res to lower res.
-    if (renderTarget != nullptr && depthTarget != nullptr &&
-        renderTarget->GetWidth() <= depthTarget->nWidth &&
-        renderTarget->GetHeight() <= depthTarget->nHeight)
-    {
-         // Render object velocities
-        
-        
-        //The render targets are already in memory for gmem mode
-        if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            gcpRendD3D->FX_PushRenderTarget(0, renderTarget, depthTarget);
-        }
-        
-        uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-        int iTempX, iTempY, iWidth, iHeight;
-        gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-        const bool bAllowMotionVectors = CRenderer::CV_r_MotionVectors > 0;
-        if (bAllowMotionVectors)
-        {
-            uint32 nBatchMask = 0;
-            // Check for moving geometry
-            if (!CRenderer::CV_r_MotionBlurGBufferVelocity)
-            {
-                nBatchMask |= SRendItem::BatchFlags(EFSLIST_GENERAL, gRenDev->m_RP.m_pRLD);
-                nBatchMask |= SRendItem::BatchFlags(EFSLIST_SKIN, gRenDev->m_RP.m_pRLD);
-            }
-
-            nBatchMask |= SRendItem::BatchFlags(EFSLIST_TRANSP, gRenDev->m_RP.m_pRLD);
-            if (nBatchMask & FB_MOTIONBLUR)
-            {
-                IRenderElement* pPrevRE = gRenDev->m_RP.m_pRE;
-                gRenDev->m_RP.m_pRE = NULL;
-
-                if (!gcpRendD3D->FX_MotionVectorGeneration(true))
-                {
-                    return;
-                }
-
-                if (!CRenderer::CV_r_MotionBlurGBufferVelocity)
-                {
-                    gcpRendD3D->FX_ProcessRenderList(EFSLIST_GENERAL, FB_MOTIONBLUR);
-                    gcpRendD3D->FX_ProcessRenderList(EFSLIST_SKIN, FB_MOTIONBLUR);
-                }
-
-                gcpRendD3D->FX_ProcessRenderList(EFSLIST_TRANSP, FB_MOTIONBLUR);
-
-                gcpRendD3D->FX_MotionVectorGeneration(false);
-
-                gRenDev->m_RP.m_pRE = pPrevRE;
-            }
-        }
-
-        gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-        
-        if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// New Pipeline Pass
-
-void CMotionBlurPass::Init()
-{
-}
-
-void CMotionBlurPass::Shutdown()
-{
-    Reset();
-}
-
-void CMotionBlurPass::Reset()
-{
-    m_passMotionBlur.Reset();
-    m_passCopy.Reset();
-    m_passPacking.Reset();
-    m_passTileGen1.Reset();
-    m_passTileGen2.Reset();
-    m_passNeighborMax.Reset();
-}
-
-float CMotionBlurPass::ComputeMotionScale()
-{
-    static float storedMotionScale = 0.0f;
-    if (gEnv->pTimer->IsTimerPaused(ITimer::ETIMER_GAME))
-    {
-        return storedMotionScale;
-    }
-
-    // The length of the generated motion vectors is proportional to the current time step, so we need
-    // to rescale the motion vectors to simulate a constant camera exposure time
-
-    float exposureTime = 1.0f / std::max(CRenderer::CV_r_MotionBlurShutterSpeed, 1e-6f);
-    float timeStep = std::max(gEnv->pTimer->GetFrameTime(), 1e-6f);
-
-    exposureTime *= gEnv->pTimer->GetTimeScale();
-
-    storedMotionScale = exposureTime / timeStep;
-    return storedMotionScale;
-}
-
-void CMotionBlurPass::Execute()
-{
-    // Added a check to make sure we're only running the new pipeline motion blur while the new pipeline is enabled.
-    if (CRenderer::CV_r_GraphicsPipeline <= 0)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("MOTION_BLUR");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    CShader* pShader = CShaderMan::s_shPostMotionBlur;
-
-    int vpX, vpY, vpWidth, vpHeight;
-    rd->GetViewport(&vpX, &vpY, &vpWidth, &vpHeight);
-
-    // Check if DOF is enabled
-    CDepthOfField* pDofRenderTech = (CDepthOfField*)PostEffectMgr()->GetEffect(ePFX_eDepthOfField);
-    DepthOfFieldParameters dofParameters = pDofRenderTech->GetParameters();
-    const bool bGatherDofEnabled = CRenderer::CV_r_dof > 0 && dofParameters.m_bEnabled;
-
-    Matrix44A mViewProjPrev = CMotionBlur::GetPrevView();
-    Matrix44 mViewProj = GetUtils().m_pView;
-    mViewProjPrev = mViewProjPrev * GetUtils().m_pProj * GetUtils().m_pScaleBias;
-    mViewProjPrev.Transpose();
-
-    CTexture* pVelocityRT = CTexture::s_ptexVelocity;
-    float tileCountX = (float)CTexture::s_ptexVelocityTiles[1]->GetWidth();
-    float tileCountY = (float)CTexture::s_ptexVelocityTiles[1]->GetHeight();
-
-    static CCryNameR motionBlurParamName("vMotionBlurParams");
-
-    int texStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-    {
-        PROFILE_LABEL_SCOPE("PACK VELOCITY");
-
-        static CCryNameTSCRC techPackVelocities("PackVelocities");
-        static CCryNameR viewProjPrevName("mViewProjPrev");
-        static CCryNameR dirBlurName("vDirectionalBlur");
-        static CCryNameR radBlurName("vRadBlurParam");
-
-        CMotionBlur* pMB = (CMotionBlur*)PostEffectMgr()->GetEffect(ePFX_eMotionBlur);
-        const float maxRange = 32.0f;
-        const float amount = clamp_tpl<float>(pMB->m_pRadBlurAmount->GetParam() / maxRange, 0.0f, 1.0f);
-        const float radius = 1.0f / clamp_tpl<float>(pMB->m_pRadBlurRadius->GetParam(), 1e-6f, 2.0f);
-        const Vec4 blurDir = pMB->m_pDirectionalBlurVec->GetParamVec4();
-        const Vec4 dirBlurParam = Vec4(blurDir.x * (maxRange / (float)vpWidth), blurDir.y * (maxRange / (float)vpHeight), (float)vpWidth / (float)vpHeight, 1.0f);
-        const Vec4 radBlurParam = Vec4(pMB->m_pRadBlurScreenPosX->GetParam() * dirBlurParam.z, pMB->m_pRadBlurScreenPosY->GetParam(), radius * amount,  amount);
-
-        const bool bRadialBlur = amount + (blurDir.x * blurDir.x) + (blurDir.y * blurDir.y) > 1.0f / (float)vpWidth;
-
-        m_passPacking.SetRenderTarget(0, pVelocityRT);
-        m_passPacking.SetTechnique(pShader, techPackVelocities, bRadialBlur ? g_HWSR_MaskBit[HWSR_SAMPLE0] : 0);
-        m_passPacking.SetState(GS_NODEPTHTEST);
-        m_passPacking.SetTextureSamplerPair(0, CTexture::s_ptexZTarget, texStatePoint);
-        m_passPacking.SetTextureSamplerPair(1, CTexture::s_ptexHDRTarget, texStatePoint);
-        m_passPacking.SetTextureSamplerPair(2, GetUtils().GetVelocityObjectRT(), texStatePoint);
-        m_passPacking.SetRequireWorldPos(true);
-
-        m_passPacking.BeginConstantUpdate();
-        mViewProjPrev.Transpose();
-        pShader->FXSetPSFloat(viewProjPrevName, (Vec4*)mViewProjPrev.GetData(), 4);
-        pShader->FXSetPSFloat(dirBlurName, &dirBlurParam, 1);
-        pShader->FXSetPSFloat(radBlurName, &radBlurParam, 1);
-        const Vec4 motionBlurParams = Vec4(ComputeMotionScale(), 1.0f / tileCountX, 1.0f / tileCountX * CRenderer::CV_r_MotionBlurCameraMotionScale, 0);
-        pShader->FXSetPSFloat(motionBlurParamName, &motionBlurParams, 1);
-        m_passPacking.Execute();
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("VELOCITY TILES");
-
-        static CCryNameTSCRC techVelocityTileGen("VelocityTileGen");
-        static CCryNameTSCRC techTileNeighborhood("VelocityTileNeighborhood");
-
-        // Tile generation first pass
-        {
-            m_passTileGen1.SetRenderTarget(0, CTexture::s_ptexVelocityTiles[0]);
-            m_passTileGen1.SetTechnique(pShader, techVelocityTileGen, 0);
-            m_passTileGen1.SetState(GS_NODEPTHTEST);
-            m_passTileGen1.SetTextureSamplerPair(0, pVelocityRT, texStatePoint);
-
-            m_passTileGen1.BeginConstantUpdate();
-            Vec4 params = Vec4((float)pVelocityRT->GetWidth(), (float)pVelocityRT->GetHeight(), ceilf((float)gcpRendD3D->GetWidth() / tileCountX), 0);
-            pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-            m_passTileGen1.Execute();
-        }
-
-        // Tile generation second pass
-        {
-            m_passTileGen2.SetRenderTarget(0, CTexture::s_ptexVelocityTiles[1]);
-            m_passTileGen2.SetTechnique(pShader, techVelocityTileGen, 0);
-            m_passTileGen2.SetState(GS_NODEPTHTEST);
-            m_passTileGen2.SetTextureSamplerPair(0, CTexture::s_ptexVelocityTiles[0], texStatePoint);
-
-            m_passTileGen2.BeginConstantUpdate();
-            Vec4 params = Vec4((float)CTexture::s_ptexVelocityTiles[0]->GetWidth(), (float)CTexture::s_ptexVelocityTiles[0]->GetHeight(), ceilf((float)gcpRendD3D->GetHeight() / tileCountY), 1);
-            pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-            m_passTileGen2.Execute();
-        }
-
-        // Neighborhood max
-        {
-            m_passNeighborMax.SetRenderTarget(0, CTexture::s_ptexVelocityTiles[2]);
-            m_passNeighborMax.SetTechnique(pShader, techTileNeighborhood, 0);
-            m_passNeighborMax.SetState(GS_NODEPTHTEST);
-            m_passNeighborMax.SetTextureSamplerPair(0, CTexture::s_ptexVelocityTiles[1], texStatePoint);
-
-            m_passNeighborMax.BeginConstantUpdate();
-            Vec4 params = Vec4(1.0f / tileCountX, 1.0f / tileCountY, 0, 0);
-            pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-            m_passNeighborMax.Execute();
-        }
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("MOTION VECTOR APPLY");
-
-        static CCryNameTSCRC techMotionBlur("MotionBlur");
-
-        if (bGatherDofEnabled)
-        {
-            m_passCopy.Execute(CTexture::s_ptexHDRTarget, CTexture::s_ptexSceneTargetR11G11B10F[0]);
-        }
-
-        uint64 rtMask = 0;
-        rtMask |= (CRenderer::CV_r_MotionBlurQuality >= 2) ? g_HWSR_MaskBit[HWSR_SAMPLE2] : 0;
-        rtMask |= (CRenderer::CV_r_MotionBlurQuality == 1) ? g_HWSR_MaskBit[HWSR_SAMPLE1] : 0;
-
-        m_passMotionBlur.SetRenderTarget(0, CTexture::s_ptexHDRTarget);
-        m_passMotionBlur.SetTechnique(pShader, techMotionBlur, rtMask);
-        m_passMotionBlur.SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA);
-        m_passMotionBlur.SetTextureSamplerPair(0, bGatherDofEnabled ? CTexture::s_ptexSceneTargetR11G11B10F[0] : CTexture::s_ptexHDRTargetPrev, texStateLinear);
-        m_passMotionBlur.SetTextureSamplerPair(1, pVelocityRT, texStatePoint);
-        m_passMotionBlur.SetTextureSamplerPair(2, CTexture::s_ptexVelocityTiles[2], texStatePoint);
-
-        m_passMotionBlur.BeginConstantUpdate();
-        Vec4 params = Vec4(1.0f / tileCountX, 1.0f / tileCountY, 0, 0);
-        pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-        m_passMotionBlur.Execute();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/MotionBlur.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/MotionBlur.h
deleted file mode 100644
index 64d27edc5b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/MotionBlur.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-#include "Common/UtilityPasses.h"
-
-// This class is deprecated as it requires r_graphicsPipeline > 0 to function properly, which is not supported on all platforms.
-class CMotionBlurPass
-    : public GraphicsPipelinePass
-{
-public:
-    virtual ~CMotionBlurPass() {}
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute();
-
-private:
-    float ComputeMotionScale();
-
-private:
-    CFullscreenPass   m_passPacking;
-    CFullscreenPass   m_passTileGen1;
-    CFullscreenPass   m_passTileGen2;
-    CFullscreenPass   m_passNeighborMax;
-    CStretchRectPass  m_passCopy;
-    CFullscreenPass   m_passMotionBlur;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/PostAA.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/PostAA.cpp
deleted file mode 100644
index 634f36c6a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/PostAA.cpp
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "PostAA.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "DepthOfField.h"
-#include "../../Common/Textures/TextureManager.h"
-#include <Common/RenderCapabilities.h>
-
-struct TemporalAAParameters
-{
-    TemporalAAParameters() {}
-
-    Matrix44 m_reprojection;
-
-    // Index ordering
-    // 5  2  6
-    // 1  0  3
-    // 7  4  8
-    float m_beckmannHarrisFilter[9];
-    float m_useAntiFlickerFilter;
-    float m_clampingFactor;
-    float m_newFrameWeight;
-};
-
-bool CPostAA::Preprocess()
-{
-    // Disable PostAA for Dolby mode.
-    static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-    int DolbyCvarValue = DolbyCvar ? DolbyCvar->GetIVal() : eDVM_Disabled;
-    return DolbyCvarValue == eDVM_Disabled;
-}
-
-void CPostAA::Render()
-{
-    gcpRendD3D->GetGraphicsPipeline().RenderPostAA();
-}
-
-PostAAPass::PostAAPass()
-{
-    AZ::RenderNotificationsBus::Handler::BusConnect();
-}
-
-PostAAPass::~PostAAPass()
-{
-    AZ::RenderNotificationsBus::Handler::BusDisconnect();
-}
-
-void PostAAPass::Init()
-{
-    m_TextureAreaSMAA = CTexture::ForName("EngineAssets/ScreenSpace/AreaTex.dds", FT_DONT_STREAM, eTF_Unknown);
-    m_TextureSearchSMAA = CTexture::ForName("EngineAssets/ScreenSpace/SearchTex.dds", FT_DONT_STREAM, eTF_Unknown);
-}
-
-void PostAAPass::Shutdown()
-{
-    SAFE_RELEASE(m_TextureAreaSMAA);
-    SAFE_RELEASE(m_TextureSearchSMAA);
-}
-
-void PostAAPass::OnRendererFreeResources(int flags)
-{
-    // If texture resources are about to be freed by the renderer
-    if (flags & FRR_TEXTURES)
-    {
-        // Release the PostAA textures first so they do not leak
-        Shutdown();
-    }
-}
-
-void PostAAPass::Reset()
-{
-    
-}
-
-static bool IsTemporalRestartNeeded()
-{
-    // When we are activating a new viewport.
-    static AZ::s32 s_LastViewportId = -1;
-    if (gRenDev->m_CurViewportID != s_LastViewportId)
-    {
-        s_LastViewportId = gRenDev->m_CurViewportID;
-        return true;
-    }
-
-    const AZ::s32 StaleFrameThresholdCount = 10;
-
-    // When we exceed N frames without rendering TAA (e.g. we toggle it on and off).
-    static AZ::s32 s_LastFrameCounter = 0;
-    const bool bIsStale = (GetUtils().m_iFrameCounter - s_LastFrameCounter) > StaleFrameThresholdCount;
-    s_LastFrameCounter = GetUtils().m_iFrameCounter;
-
-    return bIsStale;
-}
-
-static float BlackmanHarris(Vec2 uv)
-{
-    return expf(-2.29f * (uv.x * uv.x + uv.y * uv.y));
-}
-
-static void BuildTemporalParameters(TemporalAAParameters& temporalAAParameters)
-{
-    Matrix44_tpl<f64> reprojection64;
-
-    {
-        Matrix44_tpl<f64> currViewProjMatrixInverse = Matrix44_tpl<f64>(gRenDev->m_ViewProjNoJitterMatrix).GetInverted();
-        Matrix44_tpl<f64> prevViewProjMatrix = gRenDev->GetPreviousFrameMatrixSet().m_ViewProjMatrix;
-
-        reprojection64 = currViewProjMatrixInverse * prevViewProjMatrix;
-
-        Matrix44_tpl<f64> scaleBias1 = Matrix44_tpl<f64>(
-            0.5, 0, 0, 0,
-            0, -0.5, 0, 0,
-            0, 0, 1, 0,
-            0.5, 0.5, 0, 1);
-
-        Matrix44_tpl<f64> scaleBias2 = Matrix44_tpl<f64>(
-            2.0, 0, 0, 0,
-            0, -2.0, 0, 0,
-            0, 0, 1, 0,
-            -1.0, 1.0, 0, 1);
-
-        reprojection64 = scaleBias2 * reprojection64 * scaleBias1;
-    }
-
-    const size_t FILTER_WEIGHT_COUNT = 9;
-    Vec2 filterWeights[FILTER_WEIGHT_COUNT] =
-    {
-        Vec2{  0.0f,  0.0f },
-        Vec2{ -1.0f,  0.0f },
-        Vec2{  0.0f, -1.0f },
-        Vec2{  1.0f,  0.0f },
-        Vec2{  0.0f,  1.0f },
-        Vec2{ -1.0f, -1.0f },
-        Vec2{  1.0f, -1.0f },
-        Vec2{ -1.0f,  1.0f },
-        Vec2{  1.0f,  1.0f }
-    };
-
-    const Vec2 temporalJitterOffset(gRenDev->m_TemporalJitterClipSpace.x * 0.5f, gRenDev->m_TemporalJitterClipSpace.y * 0.5f);
-    for (size_t i = 0; i < FILTER_WEIGHT_COUNT; ++i)
-    {
-        temporalAAParameters.m_beckmannHarrisFilter[i] = BlackmanHarris((filterWeights[i] - temporalJitterOffset));
-    }
-
-    temporalAAParameters.m_reprojection = reprojection64;
-    temporalAAParameters.m_useAntiFlickerFilter = (float)CRenderer::CV_r_AntialiasingTAAUseAntiFlickerFilter;
-    temporalAAParameters.m_clampingFactor = CRenderer::CV_r_AntialiasingTAAClampingFactor;
-    temporalAAParameters.m_newFrameWeight = AZStd::max(gRenDev->CV_r_AntialiasingTAANewFrameWeight, FLT_EPSILON);
-}
-
-void PostAAPass::RenderTemporalAA(
-    CTexture* sourceTexture,
-    CTexture* outputTarget,
-    const DepthOfFieldParameters& depthOfFieldParameters)
-{
-    CShader* pShader = CShaderMan::s_shPostAA;
-    PROFILE_LABEL_SCOPE("TAA");
-
-    uint64 saveFlags_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3]);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_AntialiasingTAAUseVarianceClamping)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (CRenderer::CV_r_HDREyeAdaptationMode == 2)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-
-    // Filter the CoC's when depth of field is enabled.
-    if (depthOfFieldParameters.m_bEnabled)
-    {
-        gcpRendD3D->FX_PushRenderTarget(2, GetUtils().GetCoCCurrentTarget(), nullptr);
-
-        GetUtils().SetTexture(GetUtils().GetCoCHistoryTarget(), 4, FILTER_LINEAR);
-
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-
-    if (IsTemporalRestartNeeded())
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE3];
-    }
-
-    CTexture* currentTarget = GetUtils().GetTemporalCurrentTarget();
-    CTexture* historyTarget = GetUtils().GetTemporalHistoryTarget();
-
-    gcpRendD3D->FX_PushRenderTarget(0, outputTarget, nullptr);
-    gcpRendD3D->FX_PushRenderTarget(1, currentTarget, nullptr);
-
-    static const CCryNameTSCRC TechNameTAA("TAA");
-    GetUtils().ShBeginPass(pShader, TechNameTAA, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    Vec4 vHDRSetupParams[5];
-    gEnv->p3DEngine->GetHDRSetupParams(vHDRSetupParams);
-
-    {
-        TemporalAAParameters temporalAAParameters;
-        BuildTemporalParameters(temporalAAParameters);
-
-        {
-            const float sharpening = max(0.5f + CRenderer::CV_r_AntialiasingTAASharpening, 0.5f); // Catmull-rom sharpening baseline is 0.5.
-
-            static CCryNameR paramName("TemporalParams");
-            Vec4 temporalParams[4];
-            temporalParams[0] = Vec4(
-                temporalAAParameters.m_useAntiFlickerFilter,
-                temporalAAParameters.m_clampingFactor,
-                temporalAAParameters.m_newFrameWeight,
-                sharpening);
-
-            temporalParams[1] = Vec4(
-                0.0f,
-                0.0f,
-                0.0f,
-                temporalAAParameters.m_beckmannHarrisFilter[0]);
-
-            temporalParams[2] = Vec4(
-                temporalAAParameters.m_beckmannHarrisFilter[1],
-                temporalAAParameters.m_beckmannHarrisFilter[2],
-                temporalAAParameters.m_beckmannHarrisFilter[3],
-                temporalAAParameters.m_beckmannHarrisFilter[4]);
-
-            temporalParams[3] = Vec4(
-                temporalAAParameters.m_beckmannHarrisFilter[5],
-                temporalAAParameters.m_beckmannHarrisFilter[6],
-                temporalAAParameters.m_beckmannHarrisFilter[7],
-                temporalAAParameters.m_beckmannHarrisFilter[8]);
-
-            pShader->FXSetPSFloat(paramName, (const Vec4*)temporalParams, 4);
-        }
-
-        static CCryNameR szReprojMatrix("ReprojectionMatrix");
-        pShader->FXSetPSFloat(szReprojMatrix, (Vec4*)temporalAAParameters.m_reprojection.GetData(), 4);
-
-        static CCryNameR HDREyeAdaptation("HDREyeAdaptation");
-        pShader->FXSetPSFloat(HDREyeAdaptation, CRenderer::CV_r_HDREyeAdaptationMode == 2 ? &vHDRSetupParams[4] : &vHDRSetupParams[3], 1);
-
-        static CCryNameR DOF_FocusParams0("DOF_FocusParams0");
-        pShader->FXSetPSFloat(DOF_FocusParams0, &depthOfFieldParameters.m_FocusParams0, 1);
-
-        static CCryNameR DOF_FocusParams1("DOF_FocusParams1");
-        pShader->FXSetPSFloat(DOF_FocusParams1, &depthOfFieldParameters.m_FocusParams1, 1);
-    }
-
-    GetUtils().SetTexture(sourceTexture, 0, FILTER_POINT);
-    GetUtils().SetTexture(historyTarget, 1, FILTER_LINEAR);
-
-    if (CTexture::s_ptexCurLumTexture)
-    {
-        if (!gRenDev->m_CurViewportID)
-        {
-            GetUtils().SetTexture(CTexture::s_ptexCurLumTexture, 2, FILTER_LINEAR);
-        }
-        else
-        {
-            GetUtils().SetTexture(CTexture::s_ptexHDRToneMaps[0], 2, FILTER_LINEAR);
-        }
-    }
-    else
-    {
-        GetUtils().SetTexture(CTextureManager::Instance()->GetWhiteTexture(), 2, FILTER_LINEAR);
-    }
-
-    GetUtils().SetTexture(GetUtils().GetVelocityObjectRT(), 3, FILTER_POINT);
-    GetUtils().SetTexture(CTexture::s_ptexZTarget, 5, FILTER_POINT);
-
-    D3DShaderResourceView* depthSRV[1] = { gcpRendD3D->m_pZBufferDepthReadOnlySRV };
-    gcpRendD3D->m_DevMan.BindSRV(eHWSC_Pixel, depthSRV, 14, 1);
-    gcpRendD3D->FX_Commit();
-
-    SD3DPostEffectsUtils::DrawFullScreenTri(outputTarget->GetWidth(), outputTarget->GetHeight());
-
-    depthSRV[0] = nullptr;
-    gcpRendD3D->m_DevMan.BindSRV(eHWSC_Pixel, depthSRV, 14, 1);
-    gcpRendD3D->FX_Commit();
-
-    GetUtils().ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->FX_PopRenderTarget(1);
-
-    if (depthOfFieldParameters.m_bEnabled)
-    {
-        gcpRendD3D->FX_PopRenderTarget(2);
-    }
-
-    gcpRendD3D->m_RP.m_PersFlags2 |= RBPF2_NOPOSTAA;
-    gRenDev->m_RP.m_FlagsShader_RT = saveFlags_RT;
-}
-
-void PostAAPass::Execute()
-{
-    PROFILE_LABEL_SCOPE("POST_AA");
-    PROFILE_SHADER_SCOPE;
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3]);
-    CTexture* inOutBuffer = CTexture::s_ptexSceneSpecular;
-
-    // Slimming GBuffer process is done by encoding normals into format that can fit in only two channels 
-    // and then uses the third extra channel to encode specular's Y channel (in YPbPbr format). The CbCr channels can be  
-    // compressed down to two channels due to requiring only 4 bit prcision for them. This means we can't use the specular
-    // texture for temporary copies. Thus requiring the need to pick other unused textures to be the replacement.
-    if (CRenderer::CV_r_SlimGBuffer == 1)
-    {
-        if (CRenderer::CV_r_AntialiasingMode == eAT_FXAA || CRenderer::CV_r_AntialiasingMode == eAT_SMAA1TX)
-        {
-            inOutBuffer = CTexture::s_ptexSceneDiffuse;
-        }
-        else
-        {
-            inOutBuffer = CTexture::s_ptexSceneNormalsMap;
-        }
-    }
-
-    static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
-    const int DolbyCvarValue = DolbyCvar ? DolbyCvar->GetIVal() : eDVM_Disabled;
-    const bool bDolbyHDRMode = DolbyCvarValue > eDVM_Disabled;
-    
-    CTexture* currentRT = gcpRendD3D->FX_GetCurrentRenderTarget(0);
-    if (currentRT == SPostEffectsUtils::AcquireFinalCompositeTarget(bDolbyHDRMode) && CRenderer::CV_r_SkipNativeUpscale)
-    {
-        gcpRendD3D->FX_PopRenderTarget(0);
-        gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetNativeWidth(), gcpRendD3D->GetNativeHeight());
-        gcpRendD3D->FX_SetRenderTarget(0, gcpRendD3D->GetBackBuffer(), nullptr);
-        gcpRendD3D->FX_SetActiveRenderTargets();
-    }
-
-    bool useCurrentRTForAAOutput = (CRenderer::CV_r_SkipRenderComposites == 1);
-    switch (CRenderer::CV_r_AntialiasingMode)
-    {
-    case eAT_SMAA1TX:
-        RenderSMAA(inOutBuffer, &inOutBuffer, useCurrentRTForAAOutput);
-        break;
-    case eAT_FXAA:
-        RenderFXAA(inOutBuffer, &inOutBuffer, useCurrentRTForAAOutput);
-        break;
-    case eAT_NOAA:
-        break;
-    }
-    
-    if (!CRenderer::CV_r_SkipRenderComposites)
-    {
-        RenderComposites(inOutBuffer);
-    }
-
-    gcpRendD3D->m_RP.m_PersFlags2 |= RBPF2_NOPOSTAA;
-    CTexture::s_ptexBackBuffer->SetResolved(true);
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-void PostAAPass::RenderSMAA(CTexture* sourceTexture, CTexture** outputTexture, bool useCurrentRT)
-{
-    CTexture* pEdgesTex = CTexture::s_ptexSceneNormalsMap; // Reusing esram resident target
-    
-    // Need to use a different temporary texture for edge detection since it is using the normal map
-    // as inout for slimming GBuffer 
-    if(CRenderer::CV_r_SlimGBuffer == 1)
-    {
-        pEdgesTex = CTexture::s_ptexSceneNormalsBent;
-    }
-    
-    CTexture* pBlendTex = CTexture::s_ptexSceneDiffuse;     // Reusing esram resident target (note that we access this FP16 RT using point filtering - full rate on GCN)
-    if(CRenderer::CV_r_SlimGBuffer == 1)
-    {
-        pBlendTex = CTexture::s_ptexSceneSpecularAccMap;
-    }
-
-    CShader* pShader = CShaderMan::s_shPostAA;
-
-    if (pEdgesTex && pBlendTex)
-    {
-        PROFILE_LABEL_SCOPE("SMAA1tx");
-        const int iWidth = gcpRendD3D->GetWidth();
-        const int iHeight = gcpRendD3D->GetHeight();
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        // 1st pass: generate edges texture
-        {
-            PROFILE_LABEL_SCOPE("Edge Generation");
-            gcpRendD3D->FX_ClearTarget(pEdgesTex, Clr_Transparent);
-            gcpRendD3D->FX_PushRenderTarget(0, pEdgesTex, &gcpRendD3D->m_DepthBufferOrig);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-
-            static CCryNameTSCRC pszLumaEdgeDetectTechName("LumaEdgeDetectionSMAA");
-            static const CCryNameR pPostAAParams("PostAAParams");
-
-            gcpRendD3D->RT_SetViewport(0, 0, iWidth, iHeight);
-
-            GetUtils().ShBeginPass(pShader, pszLumaEdgeDetectTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-            GetUtils().BeginStencilPrePass(false, true);
-
-            GetUtils().SetTexture(sourceTexture, 0, FILTER_POINT);
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(iWidth, iHeight);
-
-            GetUtils().ShEndPass();
-
-            GetUtils().EndStencilPrePass();
-
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        // 2nd pass: generate blend texture
-        {
-            PROFILE_LABEL_SCOPE("Blend Weight Generation");
-            gcpRendD3D->FX_ClearTarget(pBlendTex, Clr_Transparent);
-            gcpRendD3D->FX_PushRenderTarget(0, pBlendTex, &gcpRendD3D->m_DepthBufferOrig);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-
-            static CCryNameTSCRC pszBlendWeightTechName("BlendWeightSMAA");
-            GetUtils().ShBeginPass(pShader, pszBlendWeightTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-            gcpRendD3D->FX_StencilTestCurRef(true, false);
-
-            GetUtils().SetTexture(pEdgesTex, 0, FILTER_LINEAR);
-            GetUtils().SetTexture(m_TextureAreaSMAA, 1, FILTER_LINEAR);
-            GetUtils().SetTexture(m_TextureSearchSMAA, 2, FILTER_POINT);
-
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(iWidth, iHeight);
-
-            GetUtils().ShEndPass();
-
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        CTexture* pDstRT = CTexture::s_ptexSceneNormalsMap;
-
-        // Need to use a different temporary texture for edge detection since it is using the normal map
-        // as inout for slimming GBuffer 
-        if (CRenderer::CV_r_SlimGBuffer == 1)
-        {
-            pDstRT = pEdgesTex;
-        }
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        // Final pass - blend neighborhood pixels
-        {
-            PROFILE_LABEL_SCOPE("Composite");
-            gcpRendD3D->FX_PushRenderTarget(0, pDstRT, NULL);
-            gcpRendD3D->FX_SetActiveRenderTargets();
-
-            gcpRendD3D->FX_StencilTestCurRef(false);
-
-            static CCryNameTSCRC pszBlendNeighborhoodTechName("NeighborhoodBlendingSMAA");
-            GetUtils().ShBeginPass(pShader, pszBlendNeighborhoodTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-            GetUtils().SetTexture(pBlendTex, 0, FILTER_POINT);
-            GetUtils().SetTexture(sourceTexture, 1, FILTER_LINEAR);
-
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(iWidth, iHeight);
-
-            GetUtils().ShEndPass();
-
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // TEMPORAL SMAA 1TX
-        {
-            PROFILE_LABEL_SCOPE("TAA");
-            CTexture* currentTarget = GetUtils().GetTemporalCurrentTarget();
-            CTexture* historyTarget = GetUtils().GetTemporalHistoryTarget();
-
-            if (useCurrentRT)
-            {
-                currentTarget = gcpRendD3D->FX_GetCurrentRenderTarget(0);
-            }
-            else
-            {
-                gcpRendD3D->FX_PushRenderTarget(0, currentTarget, nullptr);
-            }
-
-            static CCryNameTSCRC TechNameTAA("SMAA_TAA");
-            GetUtils().ShBeginPass(pShader, TechNameTAA, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            {
-                TemporalAAParameters temporalAAParameters;
-                BuildTemporalParameters(temporalAAParameters);
-
-                const float sharpening = max(1.0f + CRenderer::CV_r_AntialiasingNonTAASharpening, 1.0f);
-
-                static CCryNameR szReprojMatrix("ReprojectionMatrix");
-                pShader->FXSetPSFloat(szReprojMatrix, (Vec4*)temporalAAParameters.m_reprojection.GetData(), 4);
-
-                Vec4 temporalParams(
-                    temporalAAParameters.m_useAntiFlickerFilter,
-                    temporalAAParameters.m_clampingFactor,
-                    temporalAAParameters.m_newFrameWeight,
-                    sharpening);
-
-                static CCryNameR paramName("TemporalParams");
-                pShader->FXSetPSFloat(paramName, &temporalParams, 1);
-            }
-
-            GetUtils().SetTexture(pDstRT, 0, FILTER_POINT);
-            GetUtils().SetTexture(historyTarget, 1, FILTER_LINEAR);
-            GetUtils().SetTexture(GetUtils().GetVelocityObjectRT(), 3, FILTER_POINT);
-            GetUtils().SetTexture(CTexture::s_ptexZTarget, 5, FILTER_POINT);
-
-            D3DShaderResourceView* depthSRV[1] = { gcpRendD3D->m_pZBufferDepthReadOnlySRV };
-            gcpRendD3D->m_DevMan.BindSRV(eHWSC_Pixel, depthSRV, 14, 1);
-            gcpRendD3D->FX_Commit();
-
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(currentTarget->GetWidth(), currentTarget->GetHeight());
-
-            depthSRV[0] = nullptr;
-            gcpRendD3D->m_DevMan.BindSRV(eHWSC_Pixel, depthSRV, 14, 1);
-            gcpRendD3D->FX_Commit();
-
-            GetUtils().ShEndPass();
-
-            if (!useCurrentRT)
-            {
-                gcpRendD3D->FX_PopRenderTarget(0);
-            }
-
-            *outputTexture = currentTarget;
-        }
-    }
-}
-
-void PostAAPass::RenderFXAA(CTexture* sourceTexture, CTexture** outputTexture, bool useCurrentRT)
-{
-    PROFILE_LABEL_SCOPE("FXAA");
-    CTexture* currentTarget = CTexture::s_ptexSceneNormalsMap;
-    if (useCurrentRT)
-    {
-        currentTarget = gcpRendD3D->FX_GetCurrentRenderTarget(0);
-    }
-    else
-    {
-        gcpRendD3D->FX_PushRenderTarget(0, currentTarget, nullptr);
-    }
-
-    CShader* pShader = CShaderMan::s_shPostAA;
-    const f32 fWidthRcp = 1.0f / (float)gcpRendD3D->GetWidth();
-    const f32 fHeightRcp = 1.0f / (float)gcpRendD3D->GetHeight();
-
-    static CCryNameTSCRC TechNameFXAA("FXAA");
-    GetUtils().ShBeginPass(pShader, TechNameFXAA, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    const Vec4 vRcpFrameOpt(-0.33f * fWidthRcp, -0.33f * fHeightRcp, 0.33f * fWidthRcp, 0.33f * fHeightRcp);// (1.0/sz.xy) * -0.33, (1.0/sz.xy) * 0.33. 0.5 -> softer
-    const Vec4 vRcpFrameOpt2(-2.0f * fWidthRcp, -2.0f * fHeightRcp, 2.0f * fWidthRcp, 2.0f  * fHeightRcp);// (1.0/sz.xy) * -2.0, (1.0/sz.xy) * 2.0
-    static CCryNameR pRcpFrameOptParam("RcpFrameOpt");
-    pShader->FXSetPSFloat(pRcpFrameOptParam, &vRcpFrameOpt, 1);
-    static CCryNameR pRcpFrameOpt2Param("RcpFrameOpt2");
-    pShader->FXSetPSFloat(pRcpFrameOpt2Param, &vRcpFrameOpt2, 1);
-
-    GetUtils().SetTexture(sourceTexture, 0, FILTER_LINEAR);
-
-    SD3DPostEffectsUtils::DrawFullScreenTriWPOS(sourceTexture->GetWidth(), sourceTexture->GetHeight());
-    gcpRendD3D->FX_Commit();
-
-    GetUtils().ShEndPass();
-    if (!useCurrentRT)
-    {
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-    *outputTexture = currentTarget;
-}
-
-void PostAAPass::RenderComposites(CTexture* sourceTexture)
-{
-    PROFILE_LABEL_SCOPE("FLARES, GRAIN");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    
-    rd->FX_SetStencilDontCareActions(0, true, true);
-    bool isAfterPostProcessBucketEmpty = SRendItem::IsListEmpty(EFSLIST_AFTER_POSTPROCESS, rd->m_RP.m_nProcessThreadID, rd->m_RP.m_pRLD);
-    
-    bool isAuxGeomEnabled = false;
-#if defined(ENABLE_RENDER_AUX_GEOM)
-    isAuxGeomEnabled = CRenderer::CV_r_enableauxgeom == 1;
-#endif
-    
-    //We may need to preserve the depth buffer in case there is something to render in the EFSLIST_AFTER_POSTPROCESS bucket.
-    //It could be UI in the 3d world. If the bucket is empty ignore the depth buffer as it is not needed.
-    //Also check if Auxgeom rendering is enabled in which case we preserve depth buffer.
-    if (isAfterPostProcessBucketEmpty && !isAuxGeomEnabled)
-    {
-        rd->FX_SetDepthDontCareActions(0, true, true);
-    }
-    else
-    {
-        rd->FX_SetDepthDontCareActions(0, false, false);
-    }
-    
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    // enable sharpening controlled by r_AntialiasingNonTAASharpening here 
-    // TAA applies sharpening in a different shader stage (TAAGatherHistory)
-    if (!(gcpRendD3D->FX_GetAntialiasingType() & eAT_TAA_MASK) &&
-        CRenderer::CV_r_AntialiasingNonTAASharpening > 0.f)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-
-    if (gcpRendD3D->m_RP.m_PersFlags2 & RBPF2_LENS_OPTICS_COMPOSITE)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-        if (CRenderer::CV_r_FlaresChromaShift > 0.5f / (float)gcpRendD3D->GetWidth())  // only relevant if bigger than half pixel
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE3];
-        }
-    }
-
-    if (CRenderer::CV_r_colorRangeCompression)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-    else
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE4];
-    }
-
-    if (!RenderCapabilities::SupportsTextureViews())
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-    
-    PostProcessUtils().SetSRGBShaderFlags();
-    
-    static const CCryNameTSCRC TechNameComposites("PostAAComposites");
-    static const CCryNameTSCRC TechNameDebugMotion("PostAADebugMotion");
-
-    CCryNameTSCRC techName = TechNameComposites;
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_MotionVectorsDebug)
-    {
-        techName = TechNameDebugMotion;
-    }
-
-    GetUtils().ShBeginPass(CShaderMan::s_shPostAA, techName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    {
-        STexState texStateLinerSRGB(FILTER_LINEAR, true);
-        texStateLinerSRGB.m_bSRGBLookup = true;
-
-        bool bResolutionScaling = false;
-
-#if defined(CRY_USE_METAL) || defined(ANDROID)
-        {
-            const Vec2& vDownscaleFactor = gcpRendD3D->m_RP.m_CurDownscaleFactor;
-            bResolutionScaling = (vDownscaleFactor.x < .999999f) || (vDownscaleFactor.y < .999999f) == false;
-            gcpRendD3D->SetCurDownscaleFactor(Vec2(1, 1));
-        }
-#endif
-        if (!bResolutionScaling)
-        {
-            texStateLinerSRGB.SetFilterMode(FILTER_POINT);
-        }
-
-        sourceTexture->Apply(0, CTexture::GetTexState(texStateLinerSRGB));
-    }
-
-    gcpRendD3D->FX_PushWireframeMode(R_SOLID_MODE);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_MotionVectorsDebug)
-    {
-        // This is necessary because the depth target is currently bound, and we are reading from it
-        // in this pass. Therefore, this pushes the same target without the depth buffer and then pops
-        // it at the end.
-        CTexture* texture = gcpRendD3D->FX_GetCurrentRenderTarget(0);
-        AZ_Assert(texture, "No render target is bound.");
-        gcpRendD3D->FX_PushRenderTarget(0, texture, nullptr);
-        gcpRendD3D->FX_SetActiveRenderTargets();
-
-        TemporalAAParameters temporalAAParameters;
-        BuildTemporalParameters(temporalAAParameters);
-
-        static CCryNameR szReprojMatrix("ReprojectionMatrix");
-        CShaderMan::s_shPostAA->FXSetPSFloat(szReprojMatrix, (Vec4*)temporalAAParameters.m_reprojection.GetData(), 4);
-
-        GetUtils().SetTexture(GetUtils().GetVelocityObjectRT(), 3, FILTER_POINT);
-        GetUtils().SetTexture(CTexture::s_ptexZTarget, 5, FILTER_POINT);
-
-        D3DShaderResourceView* depthSRV[1] = { gcpRendD3D->m_pZBufferDepthReadOnlySRV };
-        gcpRendD3D->m_DevMan.BindSRV(eHWSC_Pixel, depthSRV, 14, 1);
-        gcpRendD3D->FX_Commit();
-
-        SPostEffectsUtils::DrawFullScreenTri(gcpRendD3D->GetOverlayWidth(), gcpRendD3D->GetOverlayHeight());
-
-        depthSRV[0] = nullptr;
-        gcpRendD3D->m_DevMan.BindSRV(eHWSC_Pixel, depthSRV, 14, 1);
-        gcpRendD3D->FX_Commit();
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-        gcpRendD3D->FX_SetActiveRenderTargets();
-    }
-    else
-    {
-        const Vec4 temporalParams(0, 0, 0, max(1.0f + CRenderer::CV_r_AntialiasingNonTAASharpening, 1.0f));
-        static CCryNameR paramName("TemporalParams");
-        CShaderMan::s_shPostAA->FXSetPSFloat(paramName, &temporalParams, 1);
-
-        CTexture* pLensOpticsComposite = CTexture::s_ptexSceneTargetR11G11B10F[0];
-        GetUtils().SetTexture(pLensOpticsComposite, 5, FILTER_POINT);
-        if (gRenDev->m_RP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_SAMPLE3])
-        {
-            const Vec4 vLensOptics(1.0f, 1.0f, 1.0f, CRenderer::CV_r_FlaresChromaShift);
-            static CCryNameR pLensOpticsParam("vLensOpticsParams");
-            CShaderMan::s_shPostAA->FXSetPSFloat(pLensOpticsParam, &vLensOptics, 1);
-        }
-
-        // Apply grain (unfortunately final luminance texture doesn't get its final value baked, so have to replicate entire hdr eye adaption)
-        {
-            Vec4 vHDRSetupParams[5];
-            gEnv->p3DEngine->GetHDRSetupParams(vHDRSetupParams);
-
-            CEffectParam* m_pFilterGrainAmount = PostEffectMgr()->GetByName("FilterGrain_Amount");
-            CEffectParam* m_pFilterArtifactsGrain = PostEffectMgr()->GetByName("FilterArtifacts_Grain");
-            const float fFiltersGrainAmount = max(m_pFilterGrainAmount->GetParam(), m_pFilterArtifactsGrain->GetParam());
-            const Vec4 v = Vec4(0, 0, 0, max(fFiltersGrainAmount, max(vHDRSetupParams[1].w, CRenderer::CV_r_HDRGrainAmount)));
-            static CCryNameR szHDRParam("HDRParams");
-            CShaderMan::s_shPostAA->FXSetPSFloat(szHDRParam, &v, 1);
-            static CCryNameR szHDREyeAdaptationParam("HDREyeAdaptation");
-            CShaderMan::s_shPostAA->FXSetPSFloat(szHDREyeAdaptationParam, &vHDRSetupParams[3], 1);
-
-            GetUtils().SetTexture(CTextureManager::Instance()->GetDefaultTexture("FilmGrainMap"), 6, FILTER_POINT, 0);
-
-            if (CTexture::s_ptexCurLumTexture)
-            {
-                GetUtils().SetTexture(CTexture::s_ptexCurLumTexture, 7, FILTER_POINT);
-            }
-#ifdef CRY_USE_METAL // Metal still expects a bound texture here!
-            else
-            {
-                CTextureManager::Instance()->GetWhiteTexture()->Apply(7, FILTER_POINT);
-            }
-#endif
-        }
-
-        SPostEffectsUtils::DrawFullScreenTri(gcpRendD3D->GetOverlayWidth(), gcpRendD3D->GetOverlayHeight());
-    }
-
-    gcpRendD3D->FX_PopWireframeMode();
-
-    GetUtils().ShEndPass();
-    
-    //UI should be coming in next. Since its in a gem we cant set loadactions in lyshine.
-    //Hence we are setting it here. Stencil is setup as DoCare for load and store as it gets cleared at the start of UI rendering
-    rd->FX_SetDepthDontCareActions(0, true, true); //We set this again here as all the actions get reset to conservative settings (do care) after the draw call
-    rd->FX_SetStencilDontCareActions(0, false, false);
-}
-
-void PostAAPass::RenderFinalComposite(CTexture* sourceTexture)
-{
-    if (CShaderMan::s_shPostAA == NULL)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("NATIVE_UPSCALE");
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-    if (sourceTexture->GetWidth() != gRenDev->GetOverlayWidth() || sourceTexture->GetHeight() != gRenDev->GetOverlayHeight())
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (!RenderCapabilities::SupportsTextureViews())
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-    }
-    
-    
-    PostProcessUtils().SetSRGBShaderFlags();
-    
-    gcpRendD3D->FX_PushWireframeMode(R_SOLID_MODE);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    static CCryNameTSCRC pTechName("UpscaleImage");
-    SPostEffectsUtils::ShBeginPass(CShaderMan::s_shPostAA, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    STexState texStateLinerSRGB(FILTER_LINEAR, true);
-    texStateLinerSRGB.m_bSRGBLookup = true;
-    sourceTexture->Apply(0, CTexture::GetTexState(texStateLinerSRGB));
-
-    SPostEffectsUtils::DrawFullScreenTri(gcpRendD3D->GetOverlayWidth(), gcpRendD3D->GetOverlayHeight());
-    SPostEffectsUtils::ShEndPass();
-
-    gcpRendD3D->FX_PopWireframeMode();
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/PostAA.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/PostAA.h
deleted file mode 100644
index 887b0480b3..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/PostAA.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-#include "Common/PostProcess/PostEffects.h"
-#include <RenderBus.h>
-
-class PostAAPass
-    : public GraphicsPipelinePass
-    , AZ::RenderNotificationsBus::Handler
-{
-public:
-    PostAAPass();
-    virtual ~PostAAPass();
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute();
-
-    void RenderFinalComposite(CTexture* sourceTexture);
-    void RenderTemporalAA(CTexture* sourceTexture, CTexture* outputTarget, const DepthOfFieldParameters& depthOfFieldParameters);
-
-private:
-    void RenderSMAA(CTexture* sourceTexture, CTexture** outputTexture, bool useCurrentRT);
-    void RenderFXAA(CTexture* sourceTexture, CTexture** outputTexture, bool useCurrentRT);
-    void RenderComposites(CTexture* sourceTexture);
-    void OnRendererFreeResources(int flags) override;
-private:
-    CTexture*  m_TextureAreaSMAA;
-    CTexture*  m_TextureSearchSMAA;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceObscurance.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceObscurance.cpp
deleted file mode 100644
index a438077dcb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceObscurance.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ScreenSpaceObscurance.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "D3D_SVO.h"
-#include "../../Common/Textures/TextureManager.h"
-#include "FurPasses.h"
-
-
-void CScreenSpaceObscurancePass::Init()
-{
-}
-
-void CScreenSpaceObscurancePass::Shutdown()
-{
-    Reset();
-}
-
-void CScreenSpaceObscurancePass::Reset()
-{
-    m_passObscurance.Reset();
-    m_passFilter.Reset();
-    m_passAlbedoDownsample0.Reset();
-    m_passAlbedoDownsample1.Reset();
-    m_passAlbedoDownsample2.Reset();
-    m_passAlbedoBlur.Reset();
-}
-
-void CScreenSpaceObscurancePass::Execute()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (!CRenderer::CV_r_ssdo)
-    {
-        rd->FX_ClearTarget(CTexture::s_ptexSceneNormalsBent, Clr_Median);
-        return;
-    }
-
-    // Calculate height map AO first
-    ShadowMapFrustum* pHeightMapFrustum = NULL;
-    CTexture* pHeightMapAODepth = NULL;
-    CTexture* pHeightMapAO = NULL;
-    CDeferredShading::Instance().HeightMapOcclusionPass(pHeightMapFrustum, pHeightMapAODepth, pHeightMapAO);
-
-    PROFILE_LABEL_SCOPE("DIRECTIONAL_OCC");
-
-    int texStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    int texStatePointWrap = CTexture::GetTexState(STexState(FILTER_POINT, false));
-
-    CTexture* pDestRT = CTexture::s_ptexStereoR;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(ScreenSpaceObscurance_cpp)
-#endif
-
-    const bool bLowResOutput = (CRenderer::CV_r_ssdoHalfRes == 3);
-    if (bLowResOutput)
-    {
-        pDestRT = CTexture::s_ptexBackBufferScaled[0];
-    }
-
-    // Obscurance generation
-    {
-        CShader* pShader = CShaderMan::s_shDeferredShading;
-
-        bool isRenderingFur = FurPasses::GetInstance().IsRenderingFur();
-
-        uint64 rtMask = 0;
-        rtMask |= CRenderer::CV_r_ssdoHalfRes ? g_HWSR_MaskBit[HWSR_SAMPLE0] : 0;
-        rtMask |= pHeightMapFrustum ? g_HWSR_MaskBit[HWSR_SAMPLE1] : 0;
-        rtMask |= isRenderingFur ? g_HWSR_MaskBit[HWSR_SAMPLE2] : 0;
-
-        // Extreme magnification as happening with small FOVs will cause banding issues with half-res depth
-        if (CRenderer::CV_r_ssdoHalfRes == 2 && RAD2DEG(rd->GetCamera().GetFov()) < 30)
-        {
-            rtMask &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-        }
-
-        static CCryNameTSCRC tech("DirOccPass");
-
-        m_passObscurance.SetRenderTarget(0, pDestRT);
-        m_passObscurance.SetTechnique(pShader, tech, rtMask);
-        m_passObscurance.SetState(GS_NODEPTHTEST);
-
-        m_passObscurance.SetTextureSamplerPair(0, CTexture::s_ptexSceneNormalsMap, texStatePoint);
-        m_passObscurance.SetTextureSamplerPair(1, CTexture::s_ptexZTarget, texStatePoint);
-        m_passObscurance.SetTextureSamplerPair(3, CTextureManager::Instance()->GetDefaultTexture("AOVOJitter"), texStatePointWrap);
-        m_passObscurance.SetTextureSamplerPair(5, bLowResOutput ? CTexture::s_ptexZTargetScaled2 : CTexture::s_ptexZTargetScaled, texStatePoint);
-        m_passObscurance.SetTextureSamplerPair(11, pHeightMapAODepth, texStatePoint);
-
-        if (isRenderingFur)
-        {
-            m_passObscurance.SetTextureSamplerPair(2, CTexture::s_ptexFurZTarget, texStatePoint);
-        }
-
-        m_passObscurance.SetTexture(12, pHeightMapAO);
-        m_passObscurance.SetRequireWorldPos(true);  // TODO: Can be removed after shader changes
-
-        m_passObscurance.BeginConstantUpdate();
-
-        float radius = CRenderer::CV_r_ssdoRadius / rd->GetViewParameters().fFar;
-    #if defined(FEATURE_SVO_GI)
-        if (CSvoRenderer::GetInstance()->IsActive())
-        {
-            radius *= CSvoRenderer::GetInstance()->GetSsaoAmount();
-        }
-    #endif
-        static CCryNameR ssdoParamsName("SSDOParams");
-        Vec4 param1(radius * 0.5f * rd->m_ProjMatrix.m00, radius * 0.5f * rd->m_ProjMatrix.m11,
-            CRenderer::CV_r_ssdoRadiusMin, CRenderer::CV_r_ssdoRadiusMax);
-        pShader->FXSetPSFloat(ssdoParamsName, &param1, 1);
-
-        static CCryNameR viewspaceParamName("ViewSpaceParams");
-        Vec4 viewSpaceParam(2.0f / rd->m_ProjMatrix.m00, 2.0f / rd->m_ProjMatrix.m11, -1.0f / rd->m_ProjMatrix.m00, -1.0f / rd->m_ProjMatrix.m11);
-        pShader->FXSetPSFloat(viewspaceParamName, &viewSpaceParam, 1);
-
-        Matrix44A matView = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_cam.GetViewMatrix();
-        // Adjust the camera matrix so that the camera space will be: +y = down, +z - towards, +x - right
-        Vec3 zAxis = matView.GetRow(1);
-        matView.SetRow(1, -matView.GetRow(2));
-        matView.SetRow(2, zAxis);
-        float z = matView.m13;
-        matView.m13 = -matView.m23;
-        matView.m23 = z;
-
-        static CCryNameR camMatrixName("SSDO_CameraMatrix");
-        pShader->FXSetPSFloat(camMatrixName, (Vec4*)matView.GetData(), 3);
-
-        static CCryNameR camMatrixInvName("SSDO_CameraMatrixInv");
-        matView.Invert();
-        pShader->FXSetPSFloat(camMatrixInvName, (Vec4*)matView.GetData(), 3);
-
-        if (pHeightMapFrustum)  // Heightmap AO
-        {
-            static CCryNameR paramNameHMAO("HMAO_Params");
-            Vec4 paramHMAO(CRenderer::CV_r_HeightMapAOAmount, 1.0f / pHeightMapFrustum->nTexSize, 0, 0);
-            pShader->FXSetPSFloat(paramNameHMAO, &paramHMAO, 1);
-        }
-
-        m_passObscurance.Execute();
-    }
-
-    // Filtering pass
-    if (CRenderer::CV_r_ssdo != 99)
-    {
-        CShader* pShader = rd->m_cEF.s_ShaderShadowBlur;
-        const int32 sizeX = CTexture::s_ptexZTarget->GetWidth();
-        const int32 sizeY = CTexture::s_ptexZTarget->GetHeight();
-        const int32 srcSizeX = pDestRT->GetWidth();
-        const int32 srcSizeY = pDestRT->GetHeight();
-
-        static CCryNameTSCRC tech("SSDO_Blur");
-
-        m_passFilter.SetRenderTarget(0, CTexture::s_ptexSceneNormalsBent);
-        m_passFilter.SetTechnique(pShader, tech, 0);
-        m_passFilter.SetState(GS_NODEPTHTEST);
-        m_passFilter.SetTextureSamplerPair(0, pDestRT, texStateLinear);
-        m_passFilter.SetTextureSamplerPair(1, CTexture::s_ptexZTarget, texStatePoint);
-
-        static CCryNameR pixelOffsetName("PixelOffset");
-        static CCryNameR blurOffsetName("BlurOffset");
-        static CCryNameR blurKernelName("SSAO_BlurKernel");
-
-        m_passFilter.BeginConstantUpdate();
-
-        Vec4 v(0, 0, (float)srcSizeX, (float)srcSizeY);
-        pShader->FXSetVSFloat(pixelOffsetName, &v, 1);
-        v = Vec4(0.5f / (float)sizeX, 0.5f / (float)sizeY, 1.0f / (float)srcSizeX, 1.0f / (float)srcSizeY);
-        pShader->FXSetPSFloat(blurOffsetName, &v, 1);
-        v = Vec4(2.0f / srcSizeX, 0, 2.0f / srcSizeY, 10.0f); // w: weight coef
-        pShader->FXSetPSFloat(blurKernelName, &v, 1);
-
-        m_passFilter.Execute();
-    }
-    else  // For debugging
-    {
-        PostProcessUtils().StretchRect(pDestRT, CTexture::s_ptexSceneNormalsBent);
-    }
-
-    if (CRenderer::CV_r_ssdoColorBleeding)
-    {
-        // Generate low frequency scene albedo for color bleeding (convolution not gamma correct but acceptable)
-        m_passAlbedoDownsample0.Execute(CTexture::s_ptexSceneDiffuse, CTexture::s_ptexBackBufferScaled[0]);
-        m_passAlbedoDownsample1.Execute(CTexture::s_ptexBackBufferScaled[0], CTexture::s_ptexBackBufferScaled[1]);
-        m_passAlbedoDownsample2.Execute(CTexture::s_ptexBackBufferScaled[1], CTexture::s_ptexAOColorBleed);
-        m_passAlbedoBlur.Execute(CTexture::s_ptexAOColorBleed, CTexture::s_ptexBackBufferScaled[0], 1.0f, 4.0f);
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceObscurance.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceObscurance.h
deleted file mode 100644
index 1cf3521518..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceObscurance.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-#include "Common/UtilityPasses.h"
-
-
-class CScreenSpaceObscurancePass
-    : public GraphicsPipelinePass
-{
-public:
-    virtual ~CScreenSpaceObscurancePass() {}
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute();
-
-private:
-    CFullscreenPass    m_passObscurance;
-    CFullscreenPass    m_passFilter;
-    CStretchRectPass   m_passAlbedoDownsample0;
-    CStretchRectPass   m_passAlbedoDownsample1;
-    CStretchRectPass   m_passAlbedoDownsample2;
-    CGaussianBlurPass  m_passAlbedoBlur;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceReflections.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceReflections.cpp
deleted file mode 100644
index 4a09254355..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceReflections.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ScreenSpaceReflections.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-#include "../../Common/ReverseDepth.h"
-
-
-void CScreenSpaceReflectionsPass::Init()
-{
-}
-
-void CScreenSpaceReflectionsPass::Shutdown()
-{
-}
-
-void CScreenSpaceReflectionsPass::Reset()
-{
-    m_passRaytracing.Reset();
-    m_passComposition.Reset();
-    m_passCopy.Reset();
-    m_passDownsample0.Reset();
-    m_passDownsample1.Reset();
-    m_passDownsample2.Reset();
-    m_passBlur0.Reset();
-    m_passBlur1.Reset();
-    m_passBlur2.Reset();
-}
-
-void CScreenSpaceReflectionsPass::Execute()
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (!CRenderer::CV_r_SSReflections || !CTexture::s_ptexHDRTarget)  // Sketch mode disables HDR rendering
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("SS_REFLECTIONS");
-
-    if (CRenderer::CV_r_SlimGBuffer)
-    {
-        rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-    }
-
-    // Store current state
-    const uint32 prevPersFlags = rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags;
-
-    Matrix44 mViewProj = rd->m_ViewMatrix * rd->m_ProjMatrix;
-
-    if (rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        mViewProj = ReverseDepthHelper::Convert(mViewProj);
-        rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_REVERSE_DEPTH;
-        rd->GetGraphicsPipeline().UpdatePerViewConstantBuffer();
-    }
-
-    Matrix44 mViewport(0.5f, 0,    0,    0,
-        0,   -0.5f, 0,    0,
-        0,    0,    1.0f, 0,
-        0.5f, 0.5f, 0,    1.0f);
-    const uint32 numGPUs = rd->GetActiveGPUCount();
-
-    const int frameID = SPostEffectsUtils::m_iFrameCounter;
-    Matrix44 mViewProjPrev = m_prevViewProj[max((frameID - (int)numGPUs) % MAX_GPU_NUM, 0)] * mViewport;
-
-    int texStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-    int texStateLinearBorder  = CTexture::GetTexState(STexState(FILTER_LINEAR, TADDR_BORDER, TADDR_BORDER, TADDR_BORDER, 0));
-
-    CShader* pShader = CShaderMan::s_shDeferredShading;
-
-    {
-        PROFILE_LABEL_SCOPE("SSR_RAYTRACE");
-
-        if (CRenderer::CV_r_SlimGBuffer)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-        }
-
-        CCryNameTSCRC techRaytrace("SSR_Raytrace");
-        static CCryNameR viewProjName("g_mViewProj");
-        static CCryNameR viewProjprevName("g_mViewProjPrev");
-        CTexture* destRT = CRenderer::CV_r_SSReflHalfRes ? CTexture::s_ptexHDRTargetScaled[0] : CTexture::s_ptexHDRTarget;
-
-        m_passRaytracing.SetRenderTarget(0, destRT);
-        m_passRaytracing.SetTechnique(pShader, techRaytrace, rd->m_RP.m_FlagsShader_RT);
-        m_passRaytracing.SetState(GS_NODEPTHTEST);
-        m_passRaytracing.SetTextureSamplerPair(0, CTexture::s_ptexZTarget, texStatePoint);
-        m_passRaytracing.SetTextureSamplerPair(1, CTexture::s_ptexSceneNormalsMap, texStateLinear);
-        m_passRaytracing.SetTextureSamplerPair(2, CTexture::s_ptexSceneSpecular, texStateLinear);
-        m_passRaytracing.SetTextureSamplerPair(3, CTexture::s_ptexZTargetScaled, texStatePoint);
-        m_passRaytracing.SetTextureSamplerPair(4, CTexture::s_ptexHDRTargetPrev, texStateLinearBorder);
-        m_passRaytracing.SetTextureSamplerPair(5, CTexture::s_ptexHDRMeasuredLuminance[rd->RT_GetCurrGpuID()], texStatePoint);
-        m_passRaytracing.SetRequireWorldPos(true);
-
-        m_passRaytracing.BeginConstantUpdate();
-        pShader->FXSetPSFloat(viewProjName, (Vec4*)mViewProj.GetData(), 4);
-        pShader->FXSetPSFloat(viewProjprevName, (Vec4*)mViewProjPrev.GetData(), 4);
-        m_passRaytracing.Execute();
-    }
-
-    if (!CRenderer::CV_r_SSReflHalfRes)
-    {
-        m_passCopy.Execute(CTexture::s_ptexHDRTarget, CTexture::s_ptexHDRTargetScaled[0]);
-    }
-
-    // Convolve sharp reflections
-    m_passDownsample0.Execute(CTexture::s_ptexHDRTargetScaled[0], CTexture::s_ptexHDRTargetScaled[1]);
-    m_passBlur0.Execute(CTexture::s_ptexHDRTargetScaled[1], CTexture::s_ptexHDRTargetScaledTempRT[1], 1.0f, 3.0f);
-
-    m_passDownsample1.Execute(CTexture::s_ptexHDRTargetScaled[1], CTexture::s_ptexHDRTargetScaled[2]);
-    m_passBlur1.Execute(CTexture::s_ptexHDRTargetScaled[2], CTexture::s_ptexHDRTargetScaledTempRT[2], 1.0f, 3.0f);
-
-    m_passDownsample2.Execute(CTexture::s_ptexHDRTargetScaled[2], CTexture::s_ptexHDRTargetScaled[3]);
-    m_passBlur2.Execute(CTexture::s_ptexHDRTargetScaled[3], CTexture::s_ptexHDRTargetScaledTempRT[3], 1.0f, 3.0f);
-
-    {
-        PROFILE_LABEL_SCOPE("SSR_COMPOSE");
-
-        if (CRenderer::CV_r_SlimGBuffer)
-        {
-            rd->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SLIM_GBUFFER];
-        }
-
-        static CCryNameTSCRC techComposition("SSReflection_Comp");
-
-        CTexture* destTex = CTexture::s_ptexHDRTargetScaledTmp[0];
-        destTex->Unbind();
-
-        m_passComposition.SetRenderTarget(0, destTex);
-        m_passComposition.SetTechnique(pShader, techComposition, rd->m_RP.m_FlagsShader_RT);
-        m_passComposition.SetState(GS_NODEPTHTEST);
-        
-        CTexture* smoothnessTex = CTexture::s_ptexSceneSpecular;
-        
-        // smoothness is encoded in the normal texture for slim GBuffer optimization
-        if (CRenderer::CV_r_SlimGBuffer)
-        {
-            smoothnessTex = CTexture::s_ptexSceneNormalsMap;
-        }
-
-        m_passComposition.SetTextureSamplerPair(0, smoothnessTex, texStateLinear);
-        m_passComposition.SetTextureSamplerPair(1, CTexture::s_ptexHDRTargetScaled[0], texStateLinear);
-        m_passComposition.SetTextureSamplerPair(2, CTexture::s_ptexHDRTargetScaled[1], texStateLinear);
-        m_passComposition.SetTextureSamplerPair(3, CTexture::s_ptexHDRTargetScaled[2], texStateLinear);
-        m_passComposition.SetTextureSamplerPair(4, CTexture::s_ptexHDRTargetScaled[3], texStateLinear);
-
-        m_passComposition.BeginConstantUpdate();
-        m_passComposition.Execute();
-    }
-
-    // Update array used for MGPU support
-    m_prevViewProj[frameID % MAX_GPU_NUM] = mViewProj;
-
-    // Restore original state
-    rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags = prevPersFlags;
-    if (rd->m_RP.m_TI[rd->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        uint32 depthState = ReverseDepthHelper::ConvertDepthFunc(rd->m_RP.m_CurState);
-        rd->FX_SetState(rd->m_RP.m_CurState, rd->m_RP.m_CurAlphaRef, depthState);
-        rd->GetGraphicsPipeline().UpdatePerViewConstantBuffer();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceReflections.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceReflections.h
deleted file mode 100644
index 10f52d0d3f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceReflections.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-#include "Common/UtilityPasses.h"
-
-class CScreenSpaceReflectionsPass
-    : public GraphicsPipelinePass
-{
-public:
-    virtual ~CScreenSpaceReflectionsPass() {}
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute();
-
-private:
-    CFullscreenPass    m_passRaytracing;
-    CFullscreenPass    m_passComposition;
-    CStretchRectPass   m_passCopy;
-    CStretchRectPass   m_passDownsample0;
-    CStretchRectPass   m_passDownsample1;
-    CStretchRectPass   m_passDownsample2;
-    CGaussianBlurPass  m_passBlur0;
-    CGaussianBlurPass  m_passBlur1;
-    CGaussianBlurPass  m_passBlur2;
-
-    Matrix44           m_prevViewProj[MAX_GPU_NUM];
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceSSS.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceSSS.cpp
deleted file mode 100644
index 67164e6571..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceSSS.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "ScreenSpaceSSS.h"
-#include "DriverD3D.h"
-
-
-void CScreenSpaceSSSPass::Init()
-{
-}
-
-void CScreenSpaceSSSPass::Shutdown()
-{
-}
-
-void CScreenSpaceSSSPass::Reset()
-{
-    m_passH.Reset();
-    m_passV.Reset();
-}
-
-void CScreenSpaceSSSPass::Execute(CTexture* pIrradianceTex)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (!CTexture::s_ptexHDRTarget)  // Sketch mode disables HDR rendering
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("SSSSS");
-
-    static CCryNameTSCRC techBlur("SSSSS_Blur");
-    static CCryNameR paramBlur("SSSBlurDir");
-    static CCryNameR paramViewSpaceParams("ViewSpaceParams");
-
-    CShader* pShader = CShaderMan::s_shDeferredShading;
-    int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-    Vec4 viewSpaceParams(2.0f / rd->m_ProjMatrix.m00, 2.0f / rd->m_ProjMatrix.m11, -1.0f / rd->m_ProjMatrix.m00, -1.0f / rd->m_ProjMatrix.m11);
-    float fProjScaleX = 0.5f * rd->m_ProjMatrix.m00;
-    float fProjScaleY = 0.5f * rd->m_ProjMatrix.m11;
-
-    // Horizontal pass
-    {
-        m_passH.SetRenderTarget(0, CTexture::s_ptexSceneTargetR11G11B10F[1]);
-        m_passH.SetTechnique(pShader, techBlur, 0);
-        m_passH.SetState(GS_NODEPTHTEST);
-        m_passH.SetTextureSamplerPair(0, pIrradianceTex, texStatePoint);
-        m_passH.SetTextureSamplerPair(1, CTexture::s_ptexZTarget, texStatePoint);
-        m_passH.SetTextureSamplerPair(2, CTexture::s_ptexSceneNormalsMap, texStatePoint);
-        m_passH.SetTextureSamplerPair(3, CTexture::s_ptexSceneDiffuse, texStatePoint);
-        m_passH.SetTextureSamplerPair(4, CTexture::s_ptexSceneSpecular, texStatePoint);
-
-        m_passH.BeginConstantUpdate();
-        pShader->FXSetPSFloat(paramViewSpaceParams, &viewSpaceParams, 1);
-        Vec4 blurParam(fProjScaleX, 0, 0, 0);
-        pShader->FXSetPSFloat(paramBlur, &blurParam, 1);
-        m_passH.Execute();
-    }
-
-    // Vertical pass
-    {
-        m_passV.SetRenderTarget(0, CTexture::s_ptexHDRTarget);
-        m_passV.SetTechnique(pShader, techBlur, g_HWSR_MaskBit[HWSR_SAMPLE0]);
-        m_passV.SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE);
-        m_passV.SetTextureSamplerPair(0, CTexture::s_ptexSceneTargetR11G11B10F[1], texStatePoint);
-        m_passV.SetTextureSamplerPair(1, CTexture::s_ptexZTarget, texStatePoint);
-        m_passV.SetTextureSamplerPair(2, CTexture::s_ptexSceneNormalsMap, texStatePoint);
-        m_passV.SetTextureSamplerPair(3, CTexture::s_ptexSceneDiffuse, texStatePoint);
-        m_passV.SetTextureSamplerPair(4, CTexture::s_ptexSceneSpecular, texStatePoint);
-        m_passV.SetTextureSamplerPair(5, pIrradianceTex, texStatePoint);
-
-        m_passV.BeginConstantUpdate();
-        pShader->FXSetPSFloat(paramViewSpaceParams, &viewSpaceParams, 1);
-        Vec4 blurParam(0, fProjScaleY, 0, 0);
-        pShader->FXSetPSFloat(paramBlur, &blurParam, 1);
-        m_passV.Execute();
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceSSS.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceSSS.h
deleted file mode 100644
index bbe000fd04..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/ScreenSpaceSSS.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "Common/FullscreenPass.h"
-
-// Screen Space Subsurface Scattering
-class CScreenSpaceSSSPass
-    : public GraphicsPipelinePass
-{
-public:
-    virtual ~CScreenSpaceSSSPass() {}
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute(CTexture* pIrradianceTex);
-
-private:
-    CFullscreenPass  m_passH;
-    CFullscreenPass  m_passV;
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/StandardGraphicsPipeline.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/StandardGraphicsPipeline.cpp
deleted file mode 100644
index fbfd1585b6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/StandardGraphicsPipeline.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "StandardGraphicsPipeline.h"
-
-#include "AutoExposure.h"
-#include "Bloom.h"
-#include "ScreenSpaceObscurance.h"
-#include "ScreenSpaceReflections.h"
-#include "ScreenSpaceSSS.h"
-#include "MotionBlur.h"
-#include "DepthOfField.h"
-#include "PostAA.h"
-#include "VideoRenderPass.h"
-#include "Common/TypedConstantBuffer.h"
-#include "Common/Textures/TextureHelpers.h"
-#include "Common/Include_HLSL_CPP_Shared.h"
-#include "MultiLayerAlphaBlendPass.h"
-
-#if defined(FEATURE_SVO_GI)
-    #include "D3D_SVO.h"
-#endif
-
-#include "DriverD3D.h" //for gcpRendD3D
-
-CStandardGraphicsPipeline::CStandardGraphicsPipeline()
-{
-    AZ::RenderNotificationsBus::Handler::BusConnect();
-}
-
-CStandardGraphicsPipeline::~CStandardGraphicsPipeline()
-{
-    AZ::RenderNotificationsBus::Handler::BusDisconnect();
-}
-
-void CStandardGraphicsPipeline::Init()
-{
-    RegisterPass<CAutoExposurePass>(m_pAutoExposurePass);
-    RegisterPass<CBloomPass>(m_pBloomPass);
-    RegisterPass<CScreenSpaceObscurancePass>(m_pScreenSpaceObscurancePass);
-    RegisterPass<CScreenSpaceReflectionsPass>(m_pScreenSpaceReflectionsPass);
-    RegisterPass<CScreenSpaceSSSPass>(m_pScreenSpaceSSSPass);
-    RegisterPass<CMotionBlurPass>(m_pMotionBlurPass);
-    RegisterPass<DepthOfFieldPass>(m_pDepthOfFieldPass);
-    RegisterPass<PostAAPass>(m_pPostAAPass);
-    RegisterPass<VideoRenderPass>(m_pVideoRenderPass);
-
-    // default material resources
-    {
-        m_pDefaultMaterialResources = CDeviceObjectFactory::GetInstance().CreateResourceSet();
-        m_pDefaultMaterialResources->SetConstantBuffer(eConstantBufferShaderSlot_PerMaterial, NULL, EShaderStage_AllWithoutCompute);
-
-        for (EEfResTextures texType = EFTT_DIFFUSE; texType < EFTT_MAX; texType = EEfResTextures(texType + 1))
-        {
-            CTexture* pDefaultTexture = TextureHelpers::LookupTexDefault(texType);
-            m_pDefaultMaterialResources->SetTexture(texType, pDefaultTexture, SResourceView::DefaultView, EShaderStage_AllWithoutCompute);
-        }
-    }
-
-    // default extra per instance
-    {
-        EShaderStage shaderStages = EShaderStage_Vertex | EShaderStage_Hull | EShaderStage_Domain;
-        m_pDefaultInstanceExtraResources = CDeviceObjectFactory::GetInstance().CreateResourceSet();
-        m_pDefaultInstanceExtraResources->SetConstantBuffer(eConstantBufferShaderSlot_SkinQuat,     NULL, shaderStages);
-        m_pDefaultInstanceExtraResources->SetConstantBuffer(eConstantBufferShaderSlot_SkinQuatPrev, NULL, shaderStages);
-        m_pDefaultInstanceExtraResources->SetBuffer(EReservedTextureSlot_SkinExtraWeights, WrappedDX11Buffer(), shaderStages);
-        m_pDefaultInstanceExtraResources->SetBuffer(EReservedTextureSlot_AdjacencyInfo, WrappedDX11Buffer(), shaderStages); // shares shader slot with EReservedTextureSlot_PatchID
-    }
-}
-
-void CStandardGraphicsPipeline::OnRendererFreeResources(int flags)
-{
-    // If texture resources are about to be freed by the renderer
-    if (flags & FRR_TEXTURES)
-    {
-        // Release default resources before CTexture::Shutdown is called so they do not leak
-        m_pDefaultMaterialResources = nullptr;
-        m_pDefaultInstanceExtraResources = nullptr;
-    }
-}
-
-void CStandardGraphicsPipeline::Shutdown()
-{
-    for (auto& pass : m_passes)
-    {
-        pass->Shutdown();
-    }
-
-    m_passes.clear();
-    m_pDefaultMaterialResources = nullptr;
-}
-
-void CStandardGraphicsPipeline::Prepare()
-{
-    AZ_TRACE_METHOD();
-    for (auto& pass : m_passes)
-    {
-        pass->Prepare();
-    }
-}
-
-void CStandardGraphicsPipeline::Execute()
-{
-}
-
-void CStandardGraphicsPipeline::Reset()
-{
-    for (const auto& pass : m_passes)
-    {
-        pass->Reset();
-    }
-}
-
-static const SRenderLight* FindSunLight(SRenderPipeline& renderPipeline)
-{
-    // We explicitly search for the sun because the pipeline sunlight value
-    // gets reset several times a frame, so it's not guaranteed to exist.
-    const TArray<SRenderLight>& lights = renderPipeline.m_DLights[renderPipeline.m_nProcessThreadID][SRendItem::m_RecurseLevel[renderPipeline.m_nProcessThreadID]];
-
-    for (AZ::u32 i = 0; i < lights.Num(); ++i)
-    {
-        const SRenderLight* light = &lights[i];
-        if (light->m_Flags & DLF_SUN)
-        {
-            return light;
-        }
-    }
-    return nullptr;
-}
-
-void CStandardGraphicsPipeline::UpdatePerFrameConstantBuffer(const PerFrameParameters& perFrameParams)
-{
-    CD3D9Renderer* renderer = gcpRendD3D;
-
-    CTypedConstantBuffer<HLSL_PerFrameConstantBuffer> cb(m_PerFrameConstantBuffer);
-
-    cb->PerFrame_VolumetricFogParams = perFrameParams.m_VolumetricFogParams;
-    cb->PerFrame_VolumetricFogRampParams = perFrameParams.m_VolumetricFogRampParams;
-    cb->PerFrame_VolumetricFogColorGradientBase = perFrameParams.m_VolumetricFogColorGradientBase;
-    cb->PerFrame_VolumetricFogColorGradientDelta = perFrameParams.m_VolumetricFogColorGradientDelta;
-    cb->PerFrame_VolumetricFogColorGradientParams = perFrameParams.m_VolumetricFogColorGradientParams;
-    cb->PerFrame_VolumetricFogColorGradientRadial = perFrameParams.m_VolumetricFogColorGradientRadial;
-    cb->PerFrame_VolumetricFogSamplingParams = perFrameParams.m_VolumetricFogSamplingParams;
-    cb->PerFrame_VolumetricFogDistributionParams = perFrameParams.m_VolumetricFogDistributionParams;
-    cb->PerFrame_VolumetricFogScatteringParams = perFrameParams.m_VolumetricFogScatteringParams;
-    cb->PerFrame_VolumetricFogScatteringBlendParams = perFrameParams.m_VolumetricFogScatteringBlendParams;
-    cb->PerFrame_VolumetricFogScatteringColor = perFrameParams.m_VolumetricFogScatteringColor;
-    cb->PerFrame_VolumetricFogScatteringSecondaryColor = perFrameParams.m_VolumetricFogScatteringSecondaryColor;
-    cb->PerFrame_VolumetricFogHeightDensityParams = perFrameParams.m_VolumetricFogHeightDensityParams;
-    cb->PerFrame_VolumetricFogHeightDensityRampParams = perFrameParams.m_VolumetricFogHeightDensityRampParams;
-    cb->PerFrame_VolumetricFogDistanceParams = perFrameParams.m_VolumetricFogDistanceParams;
-    cb->PerFrame_VolumetricFogGlobalEnvProbe0 = renderer->GetVolumetricFog().GetGlobalEnvProbeShaderParam0();
-    cb->PerFrame_VolumetricFogGlobalEnvProbe1 = renderer->GetVolumetricFog().GetGlobalEnvProbeShaderParam1();
-
-#if defined (FEATURE_SVO_GI)
-    if (auto* svoRenderer = CSvoRenderer::GetInstance())
-    {
-        cb->PerFrame_SvoLightingParams = svoRenderer->GetPerFrameShaderParameters();
-    }
-    else
-    {
-        cb->PerFrame_SvoLightingParams = CSvoRenderer::GetDisabledPerFrameShaderParameters();
-    }
-#endif
-
-    const float time = CRenderer::GetRealTime();
-
-    cb->PerFrame_Time = Vec4(time, CRenderer::GetElapsedTime(), time - CRenderer::GetElapsedTime(), perFrameParams.m_MidDayIndicator );
-
-    const SRenderLight* sunLight = FindSunLight(renderer->m_RP);
-    if (sunLight)
-    {
-        Vec3 sunDirectionNormalized = sunLight->GetPosition().normalized();
-        cb->PerFrame_SunDirection = Vec4(sunDirectionNormalized, 1.0);
-        cb->PerFrame_SunColor = Vec4(sunLight->m_Color.r, sunLight->m_Color.g, sunLight->m_Color.b, perFrameParams.m_SunSpecularMultiplier);
-    }
-    else
-    {
-        cb->PerFrame_SunDirection = Vec4(0.0f);
-        cb->PerFrame_SunColor = Vec4(0.0f);
-    }
-
-    cb->PerFrame_CloudShadingColorSun = Vec4(perFrameParams.m_CloudShadingColorSun, 0.0f);
-    cb->PerFrame_CloudShadingColorSky = Vec4(perFrameParams.m_CloudShadingColorSky, 0.0f);
-    cb->PerFrame_CloudShadowParams = perFrameParams.m_CloudShadowParams;
-    cb->PerFrame_CloudShadowAnimParams = perFrameParams.m_CloudShadowAnimParams;
-
-    cb->PerFrame_CausticsSmoothSunDirection = Vec4(perFrameParams.m_CausticsSunDirection, 0.0f);
-
-    cb->PerFrame_DecalZFightingRemedy = Vec4(perFrameParams.m_DecalZFightingRemedy, CD3D9Renderer::CV_r_ssdoAmountDirect);
-    cb->PerFrame_WaterLevel = Vec4(perFrameParams.m_WaterLevel, 0.0f);
-
-    cb->PerFrame_HDRParams = perFrameParams.m_HDRParams;
-
-    {
-        auto& stereoRenderer = renderer->GetS3DRend();
-        cb->PerFrame_StereoParams = Vec4(
-            stereoRenderer.GetMaxSeparationScene() * (stereoRenderer.GetStatus() == IStereoRenderer::Status::kRenderingFirstEye ? 1 : -1),
-            stereoRenderer.GetZeroParallaxPlaneDist(),
-            stereoRenderer.GetNearGeoShift(),
-            stereoRenderer.GetNearGeoScale());
-    }
-
-    cb->PerFrame_RandomParams = Vec4(cry_random(0.0f, 1.0f), cry_random(0.0f, 1.0f), cry_random(0.0f, 1.0f), cry_random(0.0f, 1.0f));
-
-    cb->PerFrame_MultiLayerAlphaBlendLayerData.x = MultiLayerAlphaBlendPass::GetInstance().GetLayerCount();
-
-    m_PerFrameConstantBuffer = cb.GetDeviceConstantBuffer();
-    cb.CopyToDevice();
-}
-
-void CStandardGraphicsPipeline::BindPerFrameConstantBuffer()
-{
-    auto& deviceManager = gcpRendD3D->m_DevMan;
-
-    AzRHI::ConstantBuffer* perFrame = GetPerFrameConstantBuffer().get();
-    deviceManager.BindConstantBuffer(eHWSC_Vertex, perFrame, eConstantBufferShaderSlot_PerFrame);
-    deviceManager.BindConstantBuffer(eHWSC_Geometry, perFrame, eConstantBufferShaderSlot_PerFrame);
-    deviceManager.BindConstantBuffer(eHWSC_Hull, perFrame, eConstantBufferShaderSlot_PerFrame);
-    deviceManager.BindConstantBuffer(eHWSC_Domain, perFrame, eConstantBufferShaderSlot_PerFrame);
-    deviceManager.BindConstantBuffer(eHWSC_Pixel, perFrame, eConstantBufferShaderSlot_PerFrame);
-    deviceManager.BindConstantBuffer(eHWSC_Compute, perFrame, eConstantBufferShaderSlot_PerFrame);
-}
-
-void CStandardGraphicsPipeline::UpdatePerViewConstantBuffer()
-{
-    CD3D9Renderer* pRenderer = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rp = gRenDev->m_RP;
-
-    ViewParameters viewInfo(pRenderer->GetViewParameters(), pRenderer->GetCamera());
-    viewInfo.bReverseDepth = (rp.m_TI[rp.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-    viewInfo.bMirrorCull   = (rp.m_TI[rp.m_nProcessThreadID].m_PersFlags & RBPF_MIRRORCULL)    != 0;
-
-    int vpX, vpY, vpWidth, vpHeight;
-    pRenderer->GetViewport(&vpX, &vpY, &vpWidth, &vpHeight);
-    viewInfo.viewport.TopLeftX = float(vpX);
-    viewInfo.viewport.TopLeftY = float(vpY);
-    viewInfo.viewport.Width    = float(vpWidth);
-    viewInfo.viewport.Height   = float(vpHeight);
-    viewInfo.downscaleFactor = Vec4(rp.m_CurDownscaleFactor.x, rp.m_CurDownscaleFactor.y, pRenderer->m_PrevViewportScale.x, pRenderer->m_PrevViewportScale.y);
-
-    viewInfo.m_ViewMatrix = pRenderer->m_CameraMatrix;
-    viewInfo.m_ViewProjNoTranslateMatrix = pRenderer->m_ViewProjNoTranslateMatrix;
-    viewInfo.m_ViewProjNoTranslatePrevMatrix = pRenderer->GetPreviousFrameMatrixSet().m_ViewProjNoTranslateMatrix;
-    viewInfo.m_ViewProjNoTranslatePrevNearestMatrix = pRenderer->GetPreviousFrameMatrixSet().m_ViewNoTranslateMatrix * pRenderer->m_ProjMatrix;
-    viewInfo.m_ViewProjMatrix = pRenderer->m_ViewProjMatrix;
-    viewInfo.m_ViewProjPrevMatrix = pRenderer->GetPreviousFrameMatrixSet().m_ViewProjMatrix;
-    viewInfo.m_ProjMatrix = pRenderer->m_ProjMatrix;
-    viewInfo.m_WorldViewPreviousPosition = pRenderer->GetPreviousFrameMatrixSet().m_WorldViewPosition;
-
-    if (rp.m_ShadowInfo.m_pCurShadowFrustum && (rp.m_TI[rp.m_nProcessThreadID].m_PersFlags & RBPF_SHADOWGEN))
-    {
-        const SRenderPipeline::ShadowInfo& shadowInfo = rp.m_ShadowInfo;
-        assert(shadowInfo.m_nOmniLightSide >= 0 && shadowInfo.m_nOmniLightSide < OMNI_SIDES_NUM);
-
-        CCamera& cam = shadowInfo.m_pCurShadowFrustum->FrustumPlanes[shadowInfo.m_nOmniLightSide];
-        viewInfo.pFrustumPlanes = cam.GetFrustumPlane(0);
-    }
-    else
-    {
-        viewInfo.pFrustumPlanes = pRenderer->GetCamera().GetFrustumPlane(0);
-    }
-
-    UpdatePerViewConstantBuffer(viewInfo);
-}
-
-void CStandardGraphicsPipeline::UpdatePerViewConstantBuffer(const ViewParameters& viewInfo)
-{
-    if (!gEnv->p3DEngine)
-    {
-        return;
-    }
-
-    CD3D9Renderer* pRenderer = gcpRendD3D;
-    SRenderPipeline& RESTRICT_REFERENCE rp = gRenDev->m_RP;
-    SThreadInfo& threadInfo = rp.m_TI[rp.m_nProcessThreadID];
-    const PerFrameParameters& perFrameConstants = threadInfo.m_perFrameParameters;
-
-    CTypedConstantBuffer<HLSL_PerViewConstantBuffer> cb(m_PerViewConstantBuffer);
-
-    const float time = threadInfo.m_RealTime;
-
-    cb->PerView_WorldViewPos = Vec4(viewInfo.viewParameters.vOrigin, viewInfo.bMirrorCull ? -1.0f : 1.0f);
-    cb->PerView_WorldViewPosPrev = Vec4(viewInfo.m_WorldViewPreviousPosition, 0.0f);
-
-    cb->PerView_HPosScale = viewInfo.downscaleFactor;
-    cb->PerView_ScreenSize = Vec4(viewInfo.viewport.Width,
-        viewInfo.viewport.Height,
-        0.5f / (viewInfo.viewport.Width / viewInfo.downscaleFactor.x),
-        0.5f / (viewInfo.viewport.Height / viewInfo.downscaleFactor.y));
-
-    cb->PerView_ViewBasisX = Vec4(viewInfo.viewParameters.vX, 0.0f);
-    cb->PerView_ViewBasisY = Vec4(viewInfo.viewParameters.vY, 0.0f);
-    cb->PerView_ViewBasisZ = Vec4(viewInfo.viewParameters.vZ, 0.0f);
-
-    cb->PerView_ViewProjZeroMatr = viewInfo.m_ViewProjNoTranslateMatrix.GetTransposed();
-    cb->PerView_ViewProjZeroMatrPrev = viewInfo.m_ViewProjNoTranslatePrevMatrix.GetTransposed();
-    cb->PerView_ViewProjZeroMatrPrevNearest = viewInfo.m_ViewProjNoTranslatePrevNearestMatrix.GetTransposed();
-    cb->PerView_ViewProjMatr = viewInfo.m_ViewProjMatrix.GetTransposed();
-    cb->PerView_ViewProjMatrPrev = viewInfo.m_ViewProjPrevMatrix.GetTransposed();
-    cb->PerView_ViewMatr = viewInfo.m_ViewMatrix.GetTransposed();
-    cb->PerView_ProjMatr = viewInfo.m_ProjMatrix.GetTransposed();
-
-    cb->PerView_FogColor = Vec4(threadInfo.m_FS.m_CurColor.toVec3(), perFrameConstants.m_VolumetricFogParams.z);
-
-    cb->PerView_AnimGenParams = Vec4(time * 2.0f, time * 0.5f, time * 1.0f, time * 0.125f);
-
-    // CV_NearFarClipDist
-    {
-        // Note: CV_NearFarClipDist.z is used to put the weapon's depth range into correct relation to the whole scene
-        // when generating the depth texture in the z pass (_RT_NEAREST)
-        cb->PerView_NearFarClipDist = Vec4(viewInfo.viewParameters.fNear,
-            viewInfo.viewParameters.fFar,
-            viewInfo.viewParameters.fFar / gEnv->p3DEngine->GetMaxViewDistance(),
-            1.0f / viewInfo.viewParameters.fFar);
-    }
-
-    // PerView_ProjRatio
-    {
-        float zn = viewInfo.viewParameters.fNear;
-        float zf = viewInfo.viewParameters.fFar;
-        float hfov = viewInfo.camera.GetHorizontalFov();
-        cb->PerView_ProjRatio.x = viewInfo.bReverseDepth ? zn / (zn - zf) : zf / (zf - zn);
-        cb->PerView_ProjRatio.y = viewInfo.bReverseDepth ? zn / (zf - zn) : zn / (zn - zf);
-        cb->PerView_ProjRatio.z = 1.0f / hfov;
-        cb->PerView_ProjRatio.w = 1.0f;
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            //For gmem the depth values are not in linear space. 
-            cb->PerView_ProjRatio.w = 1.0f / zf;
-        }
-    }
-
-    // PerView_NearestScaled
-    {
-        float zn = DRAW_NEAREST_MIN;
-        float zf = CRenderer::CV_r_DrawNearFarPlane;
-        float nearZRange = CRenderer::CV_r_DrawNearZRange;
-        float camScale = pRenderer->CV_r_DrawNearFarPlane / gEnv->p3DEngine->GetMaxViewDistance();
-        cb->PerView_NearestScaled.x = viewInfo.bReverseDepth ? 1.0f - zf / (zf - zn) * nearZRange : zf / (zf - zn) * nearZRange;
-        cb->PerView_NearestScaled.y = viewInfo.bReverseDepth ? zn / (zf - zn) * nearZRange * camScale : zn / (zn - zf) * nearZRange * camScale;
-        cb->PerView_NearestScaled.z = viewInfo.bReverseDepth ? 1.0f - (nearZRange - 0.001f) : nearZRange - 0.001f;
-        cb->PerView_NearestScaled.w = 1.0f;
-
-        if (gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-        {
-            cb->PerView_NearestScaled.w = 1.0f / pRenderer->CV_r_DrawNearFarPlane;
-        }
-    }
-
-    // PerView_TessInfo
-    {
-        // We want to obtain the edge length in pixels specified by CV_r_tessellationtrianglesize
-        // Therefore the tess factor would depend on the viewport size and CV_r_tessellationtrianglesize
-        static const ICVar* pCV_e_TessellationMaxDistance(gEnv->pConsole->GetCVar("e_TessellationMaxDistance"));
-        assert(pCV_e_TessellationMaxDistance);
-
-        const float hfov = viewInfo.camera.GetHorizontalFov();
-        cb->PerView_TessellationParams.x = sqrtf(float(viewInfo.viewport.Width * viewInfo.viewport.Height)) / (hfov * pRenderer->CV_r_tessellationtrianglesize);
-        cb->PerView_TessellationParams.y = pRenderer->CV_r_displacementfactor;
-        cb->PerView_TessellationParams.z = pCV_e_TessellationMaxDistance->GetFVal();
-        cb->PerView_TessellationParams.w = (float)CRenderer::CV_r_ParticlesTessellationTriSize;
-    }
-
-    cb->PerView_FrustumPlaneEquation.SetRow4(0, (Vec4&)viewInfo.pFrustumPlanes[FR_PLANE_RIGHT]);
-    cb->PerView_FrustumPlaneEquation.SetRow4(1, (Vec4&)viewInfo.pFrustumPlanes[FR_PLANE_LEFT]);
-    cb->PerView_FrustumPlaneEquation.SetRow4(2, (Vec4&)viewInfo.pFrustumPlanes[FR_PLANE_TOP]);
-    cb->PerView_FrustumPlaneEquation.SetRow4(3, (Vec4&)viewInfo.pFrustumPlanes[FR_PLANE_BOTTOM]);
-
-    const bool bApplySubpixelShift = !(threadInfo.m_PersFlags & (RBPF_DRAWTOTEXTURE | RBPF_SHADOWGEN));
-    if (bApplySubpixelShift)
-    {
-        cb->PerView_JitterParams = gcpRendD3D->m_TemporalJitterClipSpace;
-    }
-    else
-    {
-        cb->PerView_JitterParams = Vec4(0.0);
-    }
-
-    m_PerViewConstantBuffer = cb.GetDeviceConstantBuffer();
-    cb.CopyToDevice();
-}
-
-void CStandardGraphicsPipeline::BindPerViewConstantBuffer()
-{
-    auto& deviceManager = gcpRendD3D->m_DevMan;
-
-    AzRHI::ConstantBuffer* perView = GetPerViewConstantBuffer().get();
-    deviceManager.BindConstantBuffer(eHWSC_Vertex, perView, eConstantBufferShaderSlot_PerView);
-    deviceManager.BindConstantBuffer(eHWSC_Geometry, perView, eConstantBufferShaderSlot_PerView);
-    deviceManager.BindConstantBuffer(eHWSC_Hull, perView, eConstantBufferShaderSlot_PerView);
-    deviceManager.BindConstantBuffer(eHWSC_Domain, perView, eConstantBufferShaderSlot_PerView);
-    deviceManager.BindConstantBuffer(eHWSC_Pixel, perView, eConstantBufferShaderSlot_PerView);
-    deviceManager.BindConstantBuffer(eHWSC_Compute, perView, eConstantBufferShaderSlot_PerView);
-}
-
-void CStandardGraphicsPipeline::UpdatePerShadowConstantBuffer(const ShadowParameters& params)
-{
-    const auto& shadowFrustum = *params.m_ShadowFrustum;
-
-    CTypedConstantBuffer<HLSL_PerSubPassConstantBuffer_ShadowGen> cb(m_PerShadowConstantBuffer);
-
-    cb->PerShadow_FrustumInfo = Vec4(
-        shadowFrustum.fNearDist,
-        shadowFrustum.m_eFrustumType != ShadowMapFrustum::e_HeightMapAO ? shadowFrustum.fFarDist : 1.f,
-        0.0f,
-        0.0f);
-    cb->PerShadow_LightPos = Vec4(params.m_ShadowFrustum->vLightSrcRelPos + params.m_ShadowFrustum->vProjTranslation, 0);
-    cb->PerShadow_ViewPos = Vec4(params.m_ViewerPos, 0);
-
-    const float UNUSED = 0.0f;
-    cb->PerShadow_BiasInfo = Vec4(shadowFrustum.fDepthSlopeBias, UNUSED, UNUSED, UNUSED);
-
-    m_PerShadowConstantBuffer = cb.GetDeviceConstantBuffer();
-    cb.CopyToDevice();
-}
-
-void CStandardGraphicsPipeline::ResetRenderState()
-{
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    rd->m_nCurStateRS = (uint32) - 1;
-    rd->m_nCurStateBL = (uint32) - 1;
-    rd->m_nCurStateDP = (uint32) - 1;
-    rd->ResetToDefault();
-    rd->FX_SetState(0, 0, 0xFFFFFFFF);
-    rd->D3DSetCull(eCULL_Back);
-
-    rd->m_bViewportDirty = true;
-    rd->m_CurViewport = SViewport();
-    rd->FX_SetViewport();
-
-    rd->m_CurTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
-    rd->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-
-#ifdef CRY_USE_DX12
-    rd->GetDeviceContext().ResetCachedState();
-#endif
-
-    CHWShader::s_pCurPS = nullptr;
-    CHWShader::s_pCurVS = nullptr;
-    CHWShader::s_pCurGS = nullptr;
-    CHWShader::s_pCurDS = nullptr;
-    CHWShader::s_pCurHS = nullptr;
-    CHWShader::s_pCurCS = nullptr;
-
-    CDeviceObjectFactory::GetInstance().GetCoreGraphicsCommandList()->Reset();
-}
-
-void CStandardGraphicsPipeline::RenderAutoExposure()
-{
-    m_pAutoExposurePass->Execute();
-    ResetRenderState();
-}
-
-void CStandardGraphicsPipeline::RenderBloom()
-{
-    CDeviceObjectFactory::GetInstance().GetCoreGraphicsCommandList()->SwitchToNewGraphicsPipeline();
-    m_pBloomPass->Execute();
-    ResetRenderState();
-}
-
-void CStandardGraphicsPipeline::RenderScreenSpaceObscurance()
-{
-    CDeviceObjectFactory::GetInstance().GetCoreGraphicsCommandList()->SwitchToNewGraphicsPipeline();
-    m_pScreenSpaceObscurancePass->Execute();
-    ResetRenderState();
-}
-
-void CStandardGraphicsPipeline::RenderScreenSpaceReflections()
-{
-    CDeviceObjectFactory::GetInstance().GetCoreGraphicsCommandList()->SwitchToNewGraphicsPipeline();
-    m_pScreenSpaceReflectionsPass->Execute();
-    ResetRenderState();
-}
-
-void CStandardGraphicsPipeline::RenderScreenSpaceSSS(CTexture* pIrradianceTex)
-{
-    CDeviceObjectFactory::GetInstance().GetCoreGraphicsCommandList()->SwitchToNewGraphicsPipeline();
-    m_pScreenSpaceSSSPass->Execute(pIrradianceTex);
-    ResetRenderState();
-}
-
-void CStandardGraphicsPipeline::RenderMotionBlur()
-{
-    CDeviceObjectFactory::GetInstance().GetCoreGraphicsCommandList()->SwitchToNewGraphicsPipeline();
-    m_pMotionBlurPass->Execute();
-    ResetRenderState();
-}
-
-void CStandardGraphicsPipeline::RenderDepthOfField()
-{
-    m_pDepthOfFieldPass->Execute();
-}
-
-void CStandardGraphicsPipeline::RenderTemporalAA(CTexture* sourceTexture, CTexture* outputTarget, const DepthOfFieldParameters& depthOfFieldParameters)
-{
-    m_pPostAAPass->RenderTemporalAA(sourceTexture, outputTarget, depthOfFieldParameters);
-}
-
-void CStandardGraphicsPipeline::RenderFinalComposite(CTexture* sourceTexture)
-{
-    m_pPostAAPass->RenderFinalComposite(sourceTexture);
-}
-
-void CStandardGraphicsPipeline::RenderPostAA()
-{
-    m_pPostAAPass->Execute();
-}
-
-SubpixelJitter::Sample SubpixelJitter::EvaluateSample(AZ::u32 counter, Pattern pattern)
-{
-    static const Vec2 vSSAA2x[2] =
-    {
-        Vec2(-0.25f, 0.25f),
-        Vec2(0.25f, -0.25f)
-    };
-
-    static const Vec2 vSSAA3x[3] =
-    {
-        Vec2(-1.0f / 3.0f, -1.0f / 3.0f),
-        Vec2(1.0f / 3.0f,  0.0f / 3.0f),
-        Vec2(0.0f / 3.0f,  1.0f / 3.0f)
-    };
-
-    static const Vec2 vSSAA4x[4] =
-    {
-        Vec2(-0.125, -0.375), Vec2(0.375, -0.125),
-        Vec2(-0.375,  0.125), Vec2(0.125,  0.375)
-    };
-
-    static const Vec2 vSSAA8x[8] =
-    {
-        Vec2(0.0625, -0.1875),  Vec2(-0.0625,  0.1875),
-        Vec2(0.3125,  0.0625),  Vec2(-0.1875, -0.3125),
-        Vec2(-0.3125,  0.3125), Vec2(-0.4375, -0.0625),
-        Vec2(0.1875,  0.4375),  Vec2(0.4375, -0.4375)
-    };
-
-    static const Vec2 vSGSSAA8x8[8] =
-    {
-        Vec2(6.0f / 7.0f, 0.0f / 7.0f) - Vec2(0.5f, 0.5f), Vec2(2.0f / 7.0f, 1.0f / 7.0f) - Vec2(0.5f, 0.5f),
-        Vec2(4.0f / 7.0f, 2.0f / 7.0f) - Vec2(0.5f, 0.5f), Vec2(0.0f / 7.0f, 3.0f / 7.0f) - Vec2(0.5f, 0.5f),
-        Vec2(7.0f / 7.0f, 4.0f / 7.0f) - Vec2(0.5f, 0.5f), Vec2(3.0f / 7.0f, 5.0f / 7.0f) - Vec2(0.5f, 0.5f),
-        Vec2(5.0f / 7.0f, 6.0f / 7.0f) - Vec2(0.5f, 0.5f), Vec2(1.0f / 7.0f, 7.0f / 7.0f) - Vec2(0.5f, 0.5f)
-    };
-
-    // Mip bias value, numbers are the new pixel gradient radius.
-    static float JitterMipBias[] =
-    {
-        0.0f,
-        log2(0.707f),   // 2x
-        log2(0.5f),     // 3x
-        log2(0.5f),     // 4x
-        log2(0.375f),   // 8x
-        log2(0.375f),    // 8x
-        log2(0.375f),    // random
-        log2(0.375f),    // 8x
-        log2(0.375f)     // 8x
-    };
-
-    static_assert(AZ_ARRAY_SIZE(JitterMipBias) == Pattern_Count, "JitterMipBias array does not match jitter pattern enum");
-
-    const AZ::u32 clampedJitternPattern = clamp_tpl(AZ::u32(pattern), AZ::u32(Pattern_None), AZ::u32(Pattern_Count) - 1);
-
-    Sample sample;
-    switch (clampedJitternPattern)
-    {
-    case Pattern_2x:
-        sample.m_subpixelOffset = vSSAA2x[counter % 2];
-        break;
-    case Pattern_3x:
-        sample.m_subpixelOffset = vSSAA3x[counter % 3];
-        break;
-    case Pattern_4x:
-        sample.m_subpixelOffset = vSSAA4x[counter % 4];
-        break;
-    case Pattern_8x:
-        sample.m_subpixelOffset = vSSAA8x[counter % 8];
-        break;
-    case Pattern_SparseGrid8x:
-        sample.m_subpixelOffset = vSGSSAA8x8[counter % 8];
-        break;
-    case Pattern_Random:
-        sample.m_subpixelOffset = Vec2(SPostEffectsUtils::srandf(), SPostEffectsUtils::srandf()) * 0.5f;
-        break;
-    case Pattern_Halton8x:
-        sample.m_subpixelOffset = Vec2(SPostEffectsUtils::HaltonSequence(counter % 8, 2) - 0.5f,
-            SPostEffectsUtils::HaltonSequence(counter % 8, 3) - 0.5f);
-        break;
-    case Pattern_HaltonRandom:
-        sample.m_subpixelOffset = Vec2(SPostEffectsUtils::HaltonSequence(counter % 1024, 2) - 0.5f,
-            SPostEffectsUtils::HaltonSequence(counter % 1024, 3) - 0.5f);
-        break;
-
-    default:
-        sample.m_subpixelOffset = Vec2(0, 0);
-    }
-
-    sample.m_mipBias = JitterMipBias[clampedJitternPattern];
-    return sample;
-}
-
-void CStandardGraphicsPipeline::RenderVideo(const AZ::VideoRenderer::DrawArguments& drawArguments)
-{
-    m_pVideoRenderPass->Execute(drawArguments);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/StandardGraphicsPipeline.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/StandardGraphicsPipeline.h
deleted file mode 100644
index 4a22150994..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/StandardGraphicsPipeline.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Common/GraphicsPipeline.h"
-#include "Common/GraphicsPipelineStateSet.h"
-#include <RenderBus.h>
-
-class CAutoExposurePass;
-class CBloomPass;
-class CScreenSpaceObscurancePass;
-class CScreenSpaceReflectionsPass;
-class CScreenSpaceSSSPass;
-class CMotionBlurPass;
-class DepthOfFieldPass;
-class PostAAPass;
-class VideoRenderPass;
-class CCamera;
-
-struct DepthOfFieldParameters;
-
-enum ERenderableTechnique
-{
-    RS_TECH_GBUFPASS,   
-    RS_TECH_ZPREPASS,   
-    RS_TECH_SHADOWPASS,
-    RS_TECH_NUM
-};
-
-class CStandardGraphicsPipeline
-    : public CGraphicsPipeline
-    , AZ::RenderNotificationsBus::Handler
-{
-public:
-    CStandardGraphicsPipeline();
-    virtual ~CStandardGraphicsPipeline();
-
-    struct ViewParameters
-    {
-        ViewParameters(const CameraViewParameters& params, const CCamera& ccamera)
-            : viewParameters(params)
-            , camera(ccamera)
-        {}
-
-        const CameraViewParameters& viewParameters;
-        const CCamera& camera;
-        const Plane* pFrustumPlanes;
-
-        Matrix44A m_ViewMatrix;
-        Matrix44A m_ViewProjNoTranslateMatrix;
-        Matrix44A m_ViewProjNoTranslatePrevMatrix;
-        Matrix44A m_ViewProjNoTranslatePrevNearestMatrix;
-        Matrix44A m_ViewProjMatrix;
-        Matrix44A m_ViewProjPrevMatrix;
-        Matrix44A m_ProjMatrix;
-
-        Vec3 m_WorldViewPreviousPosition;
-
-        D3D11_VIEWPORT viewport;
-        Vec4 downscaleFactor;
-
-        bool bReverseDepth : 1;
-        bool bMirrorCull   : 1;
-    };
-
-    struct ShadowParameters
-    {
-        const ShadowMapFrustum* m_ShadowFrustum;
-        AZ::u8 m_OmniLightSideIndex;
-        Vec3 m_ViewerPos;
-    };
-
-    void Init() override;
-    void Shutdown() override;
-
-    void Prepare() override;
-    void Execute() override;
-
-    void Reset() override;
-
-    void UpdatePerViewConstantBuffer();
-    void UpdatePerViewConstantBuffer(const ViewParameters& viewInfo);
-    void BindPerViewConstantBuffer();
-
-    void UpdatePerShadowConstantBuffer(const ShadowParameters& parameters);
-    AzRHI::ConstantBufferPtr GetPerShadowConstantBuffer() const
-    {
-        return m_PerShadowConstantBuffer;
-    }
-
-    void UpdatePerFrameConstantBuffer(const PerFrameParameters& perFrameParams);
-    void BindPerFrameConstantBuffer();
-    AzRHI::ConstantBufferPtr GetPerFrameConstantBuffer() const
-    {
-        return m_PerFrameConstantBuffer;
-    }
-
-    void ResetRenderState();
-
-    // Partial pipeline functions, will be removed once the entire pipeline is implemented in Execute()
-    void RenderAutoExposure();
-    void RenderBloom();
-    void RenderScreenSpaceObscurance();
-    void RenderScreenSpaceReflections();
-    void RenderScreenSpaceSSS(CTexture* pIrradianceTex);
-    void RenderMotionBlur();
-    void RenderDepthOfField();
-
-    void RenderFinalComposite(CTexture* sourceTexture);
-    void RenderPostAA();
-    void RenderTemporalAA(CTexture* sourceTexture, CTexture* outputTarget, const DepthOfFieldParameters& depthOfFieldParameters);
-
-    void RenderVideo(const AZ::VideoRenderer::DrawArguments& drawArguments);
-
-    AzRHI::ConstantBufferPtr GetPerViewConstantBuffer() const      { return m_PerViewConstantBuffer; }
-    CDeviceResourceSetPtr GetDefaultMaterialResources() const      { return m_pDefaultMaterialResources; }
-    CDeviceResourceSetPtr GetDefaultInstanceExtraResources() const { return m_pDefaultInstanceExtraResources; }
-
-private:
-    void OnRendererFreeResources(int flags) override;
-
-    CAutoExposurePass*            m_pAutoExposurePass;
-    CBloomPass*                   m_pBloomPass;
-    CScreenSpaceObscurancePass*   m_pScreenSpaceObscurancePass;
-    CScreenSpaceReflectionsPass*  m_pScreenSpaceReflectionsPass;
-    CScreenSpaceSSSPass*          m_pScreenSpaceSSSPass;
-    CMotionBlurPass*              m_pMotionBlurPass;
-    DepthOfFieldPass*            m_pDepthOfFieldPass;
-    PostAAPass*                  m_pPostAAPass;
-    VideoRenderPass*              m_pVideoRenderPass;
-
-    AzRHI::ConstantBufferPtr      m_PerFrameConstantBuffer;
-    AzRHI::ConstantBufferPtr      m_PerViewConstantBuffer;
-    AzRHI::ConstantBufferPtr      m_PerShadowConstantBuffer;
-    CDeviceResourceSetPtr         m_pDefaultMaterialResources;
-    CDeviceResourceSetPtr         m_pDefaultInstanceExtraResources;
-};
-
-class SubpixelJitter
-{
-public:
-    enum Pattern
-    {
-        Pattern_None = 0,
-        Pattern_2x,
-        Pattern_3x,
-        Pattern_4x,
-        Pattern_8x,
-        Pattern_SparseGrid8x,
-        Pattern_Random,
-        Pattern_Halton8x,
-        Pattern_HaltonRandom,
-        Pattern_Count
-    };
-
-    struct Sample
-    {
-        float m_mipBias;
-        Vec2 m_subpixelOffset;
-    };
-
-    static Sample EvaluateSample(AZ::u32 counter, Pattern pattern);
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/VideoRenderPass.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/VideoRenderPass.cpp
deleted file mode 100644
index c7c8e5d3de..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/VideoRenderPass.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-#include "VideoRenderPass.h"
-#include <IVideoRenderer.h>
-
-#include "D3DPostProcess.h"
-#include "../../Common/Textures/TextureManager.h"
-
-VideoRenderPass::VideoRenderPass()
-{
-}
-
-VideoRenderPass::~VideoRenderPass()
-{
-}
-
-void VideoRenderPass::Init()
-{
-    m_samplerState = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    m_passConstants.CreateDeviceBuffer();
-}
-
-void VideoRenderPass::Shutdown()
-{
-}
-
-void VideoRenderPass::Reset()
-{
-}
-
-void VideoRenderPass::Execute(const AZ::VideoRenderer::DrawArguments& drawArguments)
-{
-    CTexture* outputTexture{};
-    CTexture* inputTextures[AZ::VideoRenderer::MaxInputTextureCount]{};
-
-    // Gather textures and update them with any data passed in
-    {
-        auto FindTexture = [](uint32 textureId) -> CTexture*
-        {
-            return textureId != 0 ? CTexture::GetByID(textureId) : nullptr;
-        };
-
-        outputTexture = FindTexture(drawArguments.m_textures.m_outputTextureId);
-
-        for (uint32 textureIndex = 0; textureIndex < AZ::VideoRenderer::MaxInputTextureCount; textureIndex++)
-        {
-            const uint32 inputTextureId = drawArguments.m_textures.m_inputTextureIds[textureIndex];
-            const void*  updateData = drawArguments.m_updateData.m_inputTextureData[textureIndex].m_data;
-
-            CTexture* inputTexture = FindTexture(inputTextureId);
-
-            if (inputTexture != nullptr)
-            {
-                if (updateData != nullptr)
-                {
-                    const ETEX_Format updataDataFormat = drawArguments.m_updateData.m_inputTextureData[textureIndex].m_dataFormat;
-
-                    const uint32 textureWidth = inputTexture->GetWidthNonVirtual();
-                    const uint32 textureHeight = inputTexture->GetHeightNonVirtual();
-
-                    inputTexture->UpdateTextureRegion(reinterpret_cast<const uint8_t*>(updateData), 0, 0, 0, textureWidth, textureHeight, 1, updataDataFormat);
-                }
-
-                inputTextures[textureIndex] = inputTexture;
-            }
-        }
-    }
-
-    const bool drawingToBackbuffer = (drawArguments.m_drawingToBackbuffer != 0);
-
-    if (outputTexture == nullptr && !drawingToBackbuffer)
-    {
-        return;
-    }
-
-    // Update Constants
-    {
-        m_passConstants->VideoTexture0Scale = drawArguments.m_textureScales[0];
-        m_passConstants->VideoTexture1Scale = drawArguments.m_textureScales[1];
-        m_passConstants->VideoTexture2Scale = drawArguments.m_textureScales[2];
-        m_passConstants->VideoTexture3Scale = drawArguments.m_textureScales[3];
-        m_passConstants->VideoColorAdjustment = drawArguments.m_colorAdjustment;
-        m_passConstants.CopyToDevice();
-    }
-
-    CD3D9Renderer* pRend = gcpRendD3D;
-    SRenderPipeline& RP = pRend->m_RP;
-    CShader* pShader = CShaderMan::s_ShaderVideo;
-
-    CTexture* pBlackTexture = CTextureManager::Instance()->GetBlackTexture();
-
-    // Save the flags for restoring after we execute
-    const uint64 saveFlagsRT = RP.m_FlagsShader_RT;
-    RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3]);
-
-    // We're using each SAMPLE# runtime flag to signify if a texture input slot is being used.
-
-    if (drawArguments.m_textures.m_inputTextureIds[0])
-    {
-        RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-    if (drawArguments.m_textures.m_inputTextureIds[1])
-    {
-        RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    }
-    if (drawArguments.m_textures.m_inputTextureIds[2])
-    {
-        RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-    if (drawArguments.m_textures.m_inputTextureIds[3])
-    {
-        RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE3];
-    }
-
-    // Save the viewport for restoring later.
-    int origViewportX{}, origViewportY{}, origViewportWidth{}, origViewportHeight{};
-    pRend->GetViewport(&origViewportX, &origViewportY, &origViewportWidth, &origViewportHeight);
-
-    const int drawWidth = drawingToBackbuffer ? pRend->GetOverlayWidth() : outputTexture->GetWidthNonVirtual();
-    const int drawHeight = drawingToBackbuffer ? pRend->GetOverlayHeight() : outputTexture->GetHeightNonVirtual();
-
-    if (!drawingToBackbuffer)
-    {
-        pRend->FX_PushRenderTarget(0, outputTexture, nullptr);
-        pRend->FX_SetActiveRenderTargets();
-    }
-
-    pRend->RT_SetViewport(0, 0, drawWidth, drawHeight);
-
-    static CCryNameTSCRC techVideoRender("VideoRender");
-    GetUtils().ShBeginPass(pShader, techVideoRender, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    pRend->m_DevMan.BindConstantBuffer(eHWSC_Pixel, m_passConstants.GetDeviceConstantBuffer(), 0);
-
-    for (int index = 0; index < AZ::VideoRenderer::MaxInputTextureCount; index++)
-    {
-        CTexture* const inputTexture = inputTextures[index] ? inputTextures[index] : pBlackTexture;
-        if (inputTexture)
-        {
-            inputTexture->ApplyTexture(index, eHWSC_Pixel, SResourceView::DefaultView);
-        }
-    }
-
-    CTexture::SetSamplerState(m_samplerState, 0, eHWSC_Pixel);
-
-    SPostEffectsUtils::DrawFullScreenTriWPOS(drawWidth, drawHeight);
-
-    GetUtils().ShEndPass();
-
-    if (!drawingToBackbuffer)
-    {
-        pRend->FX_PopRenderTarget(0);
-        pRend->FX_SetActiveRenderTargets();
-    }
-
-    // Restore the viewport
-    pRend->RT_SetViewport(origViewportX, origViewportY, origViewportWidth, origViewportHeight);
-
-    // Restore the flags we saved earlier
-    RP.m_FlagsShader_RT = saveFlagsRT;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/VideoRenderPass.h b/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/VideoRenderPass.h
deleted file mode 100644
index 3d3b0e1b9f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/GraphicsPipeline/VideoRenderPass.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include "Common/GraphicsPipelinePass.h"
-#include "TypedConstantBuffer.h"
-
-// Renders video data to a texture. Video data can be provided as any number of texture planes,
-// the textures are composited together based on inputs passed in. See IVideoRenderer.h for more information.
-class VideoRenderPass
-    : public GraphicsPipelinePass
-{
-public:
-    VideoRenderPass();
-    ~VideoRenderPass();
-
-    void Init() override;
-    void Shutdown() override;
-    void Reset() override;
-    void Execute(const AZ::VideoRenderer::DrawArguments& drawArguments);
-
-protected:
-    struct VideoPassConstants
-    {
-        Vec4 VideoTexture0Scale;
-        Vec4 VideoTexture1Scale;
-        Vec4 VideoTexture2Scale;
-        Vec4 VideoTexture3Scale;
-        Vec4 VideoColorAdjustment;
-    };
-
-    CTypedConstantBuffer<VideoPassConstants> m_passConstants;
-    int m_samplerState;
-};
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/MultiLayerAlphaBlendPass.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/MultiLayerAlphaBlendPass.cpp
deleted file mode 100644
index 26bffca9c2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/MultiLayerAlphaBlendPass.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "RenderDll_precompiled.h"
-
-#include "MultiLayerAlphaBlendPass.h"
-#include "DriverD3D.h"
-#include "D3DPostProcess.h"
-
-const uint32 MultiLayerAlphaBlendPass::MAX_LAYERS = 8;  // definition
-static uint32_t s_UavBindLocation = 5; // @TODO: This should be moved to a system that manages UAV bind locations when such a system exists.
-MultiLayerAlphaBlendPass* MultiLayerAlphaBlendPass::s_pInstance = nullptr;
-
-/*static*/ void MultiLayerAlphaBlendPass::InstallInstance()
-{
-    if (s_pInstance == nullptr)
-    {
-        s_pInstance = new MultiLayerAlphaBlendPass();
-    }
-}
-
-/*static*/ void MultiLayerAlphaBlendPass::ReleaseInstance()
-{
-    delete s_pInstance;
-    s_pInstance = nullptr;
-}
-
-/*static*/ MultiLayerAlphaBlendPass& MultiLayerAlphaBlendPass::GetInstance()
-{
-    AZ_Assert(s_pInstance != nullptr, "MultiLayerAlphaBlendPass instance being retrieved before install.");
-    return *s_pInstance;
-}
-
-MultiLayerAlphaBlendPass::MultiLayerAlphaBlendPass()
-    : m_alphaLayersBuffer()
-    , m_layerCount(0)
-    , m_supported(SupportLevel::UNKNOWN)
-{
-}
-
-MultiLayerAlphaBlendPass::~MultiLayerAlphaBlendPass()
-{
-    if (m_alphaLayersBuffer.m_pBuffer != nullptr)
-    {
-        m_alphaLayersBuffer.Release();
-    }
-}
-
-bool MultiLayerAlphaBlendPass::IsSupported()
-{
-    if (m_supported == SupportLevel::UNKNOWN)
-    {
-        // Disabled on NVIDIA hardware with driver version < 398.82 to avoid a crash
-        const unsigned long NVIDIA_DRIVER_VERSION_THAT_FIXES_OIT_CRASH = 39882;
-        int gpuVendor = gRenDev->GetFeatures() & RFT_HW_MASK;
-        unsigned long driverVersion = gRenDev->GetNvidiaDriverVersion();
-        if (gpuVendor == RFT_HW_NVIDIA && driverVersion < NVIDIA_DRIVER_VERSION_THAT_FIXES_OIT_CRASH)
-        {
-            m_supported = SupportLevel::NOT_SUPPORTED;
-#if defined(AZ_ENABLE_TRACING)
-            unsigned long majorDriverVersion = (driverVersion - driverVersion % 100) / 100;
-            unsigned long minorDriverVersion = driverVersion % 100;
-#endif
-            AZ_Warning("Rendering", false, "Multi-layer alpha blend is currently disabled on NVIDIA hardware with driver version < 398.82 due to a bug in the NVIDIA driver that leads to a device timeout. The currently installed driver version is %lu.%lu. Update your driver version to 398.82 or later to use this feature.", majorDriverVersion, minorDriverVersion);
-            return false;
-        }
-
-        #if SUPPORTS_WINDOWS_10_SDK
-
-        D3D11_FEATURE_DATA_D3D11_OPTIONS2 featureData;
-        HRESULT result = gcpRendD3D->GetDevice().CheckFeatureSupport(D3D11_FEATURE_D3D11_OPTIONS2, &featureData, sizeof(featureData));
-
-        if (result == S_OK && featureData.ROVsSupported)
-        {
-            m_supported = SupportLevel::SUPPORTED;
-        }
-        else
-        {
-            m_supported = SupportLevel::NOT_SUPPORTED;
-            AZ_Warning("Rendering", false, "Multi-Layer Alpha Blending is not supported on this GPU.");
-        }
-        #else
-            m_supported = SupportLevel::NOT_SUPPORTED;
-            AZ_Warning("Rendering", false, "Multi-Layer Alpha Blending requires Open 3D Engine to have been built with the Windows 10 SDK or higher.");
-        #endif
-    }
-
-    return m_supported == SupportLevel::SUPPORTED;
-
-}
-
-bool MultiLayerAlphaBlendPass::SetLayerCount(uint32_t count)
-{
-    if (count > 0 && IsSupported())
-    {
-        AZ_Warning("Rendering", count <= MAX_LAYERS, "Too many layers - Setting number of alpha blend layers to the maximum of %u.", MAX_LAYERS);
-        m_layerCount = min<uint32_t>(count, MAX_LAYERS);
-        return true;
-    }
-    m_layerCount = 0;
-    return false;
-}
-
-uint32_t MultiLayerAlphaBlendPass::GetLayerCount()
-{
-    return m_layerCount;
-}
-
-void MultiLayerAlphaBlendPass::ConfigureShaderFlags(uint64& flags)
-{
-    if (m_layerCount == 0)
-    {
-        return;
-    }
-    flags |= g_HWSR_MaskBit[HWSR_MULTI_LAYER_ALPHA_BLEND];
-}
-
-void MultiLayerAlphaBlendPass::Resolve(CD3D9Renderer& renderer)
-{
-    if (m_layerCount == 0)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("MLAB_RESOLVE");
-
-    // @TODO: Only copy the regions where there are transparent draws
-    PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexCurrSceneTarget);
-
-    ConfigureShaderFlags(renderer->m_RP.m_FlagsShader_RT);
-    static const CCryNameTSCRC pTechName("MultiLayerAlphaBlendResolve");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    PostProcessUtils().SetTexture(CTexture::s_ptexCurrSceneTarget, 0, FILTER_NONE);
-
-    BindResources();
-    renderer.FX_SetState(GS_NODEPTHTEST);
-    PostProcessUtils().DrawFullScreenTri(renderer.GetWidth(), renderer.GetHeight());
-    PostProcessUtils().ShEndPass();
-    UnBindResources();
-}
-
-void MultiLayerAlphaBlendPass::BindResources()
-{
-    if (m_layerCount == 0)
-    {
-        return;
-    }
-
-    // Create / resize alpha layer buffer if necessary
-    uint32 width = gRenDev->GetWidth();
-    uint32 height = gRenDev->GetHeight();
-    uint32 numElements = width * height * m_layerCount;
-
-    // Release if the wrong size
-    if (m_alphaLayersBuffer.m_pBuffer != nullptr && m_alphaLayersBuffer.m_numElements != numElements)
-    {
-        m_alphaLayersBuffer.Release();
-    }
-
-    if (!m_alphaLayersBuffer.m_pBuffer)
-    {
-        DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN;
-        uint32 stride = 16; // float4 = (4 bytes per float) * 4;
-
-        m_alphaLayersBuffer.Create(numElements, stride, format, DX11BUF_BIND_UAV | DX11BUF_STRUCTURED, NULL);
-    }
-
-    uint32 count = 1;
-    gcpRendD3D->m_DevMan.BindUAV(eHWSC_Pixel, m_alphaLayersBuffer.m_pUAV, &count, s_UavBindLocation, count);
-
-}
-
-void MultiLayerAlphaBlendPass::UnBindResources()
-{
-    if (m_layerCount == 0)
-    {
-        return;
-    }
-    gcpRendD3D->m_DevMan.BindUAV(eHWSC_Pixel, nullptr, 1, s_UavBindLocation);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/MultiLayerAlphaBlendPass.h b/Code/CryEngine/RenderDll/XRenderD3D9/MultiLayerAlphaBlendPass.h
deleted file mode 100644
index c44e904877..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/MultiLayerAlphaBlendPass.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include "../Common/DevBuffer.h"
-
-class CD3D9Renderer;
-
-class MultiLayerAlphaBlendPass
-{
-
-public:
-
-    static void InstallInstance();
-    static void ReleaseInstance();
-    static MultiLayerAlphaBlendPass& GetInstance();
-
-    bool IsSupported();
-    bool SetLayerCount(uint32_t count);
-    uint32_t GetLayerCount();
-
-    void ConfigureShaderFlags(uint64& flags);
-
-    void BindResources();
-    void UnBindResources();
-    void Resolve(CD3D9Renderer& renderer);
-
-    static const uint32 MAX_LAYERS;
-
-protected:
-
-    MultiLayerAlphaBlendPass();
-    ~MultiLayerAlphaBlendPass();
-
-private:
-
-    static MultiLayerAlphaBlendPass* s_pInstance; // TODO: This (and related singleton functions) should be removed when there is a system in place for managing passes.
-
-    enum class SupportLevel
-    {
-        NOT_SUPPORTED,
-        SUPPORTED,
-        UNKNOWN
-    };
-
-    WrappedDX11Buffer  m_alphaLayersBuffer;
-    uint32_t m_layerCount;
-    SupportLevel m_supported;
-    
-};
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/NullD3D11Device.h b/Code/CryEngine/RenderDll/XRenderD3D9/NullD3D11Device.h
deleted file mode 100644
index 61e07f1b56..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/NullD3D11Device.h
+++ /dev/null
@@ -1,1189 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_NULLD3D11DEVICE_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_NULLD3D11DEVICE_H
-#pragma once
-
-
-#if defined(ENABLE_NULL_D3D11DEVICE)
-
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-class NullD3D11Device
-    : public D3DDevice
-#else
-class NullD3D11Device
-    : public ID3D11Device
-#endif
-{
-public:
-    // IUnknown
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] REFIID riid, void** ppvObj)
-    {
-        if (ppvObj)
-        {
-            *ppvObj = 0;
-        }
-        return E_NOINTERFACE;
-    }
-
-    virtual ULONG STDMETHODCALLTYPE AddRef()
-    {
-        return CryInterlockedIncrement(&m_refCount);
-    }
-
-    virtual ULONG STDMETHODCALLTYPE Release()
-    {
-        long refCount = CryInterlockedDecrement(&m_refCount);
-        if (refCount <= 0)
-        {
-            delete this;
-        }
-        return refCount;
-    };
-
-    // ID3D11Device
-    virtual HRESULT STDMETHODCALLTYPE CreateBuffer([[maybe_unused]] const D3D11_BUFFER_DESC* pDesc, [[maybe_unused]] const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Buffer** ppBuffer)
-    {
-        if (ppBuffer)
-        {
-            *ppBuffer = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture1D([[maybe_unused]] const D3D11_TEXTURE1D_DESC* pDesc, [[maybe_unused]] const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture1D** ppTexture1D)
-    {
-        if (ppTexture1D)
-        {
-            *ppTexture1D = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture2D([[maybe_unused]] const D3D11_TEXTURE2D_DESC* pDesc, [[maybe_unused]] const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture2D** ppTexture2D)
-    {
-        if (ppTexture2D)
-        {
-            *ppTexture2D = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateTexture3D([[maybe_unused]] const D3D11_TEXTURE3D_DESC* pDesc, [[maybe_unused]] const D3D11_SUBRESOURCE_DATA* pInitialData, ID3D11Texture3D** ppTexture3D)
-    {
-        if (ppTexture3D)
-        {
-            *ppTexture3D = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView([[maybe_unused]] ID3D11Resource* pResource, [[maybe_unused]] const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, ID3D11ShaderResourceView** ppSRView)
-    {
-        if (ppSRView)
-        {
-            *ppSRView = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView([[maybe_unused]] ID3D11Resource* pResource, [[maybe_unused]] const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, ID3D11UnorderedAccessView** ppUAView)
-    {
-        if (ppUAView)
-        {
-            *ppUAView = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView([[maybe_unused]] ID3D11Resource* pResource, [[maybe_unused]] const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, ID3D11RenderTargetView** ppRTView)
-    {
-        if (ppRTView)
-        {
-            *ppRTView = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView([[maybe_unused]] ID3D11Resource* pResource, [[maybe_unused]] const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, ID3D11DepthStencilView** ppDepthStencilView)
-    {
-        if (ppDepthStencilView)
-        {
-            *ppDepthStencilView = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateInputLayout([[maybe_unused]] const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [[maybe_unused]] UINT NumElements, [[maybe_unused]] const void* pShaderBytecodeWithInputSignature, [[maybe_unused]] SIZE_T BytecodeLength, ID3D11InputLayout** ppInputLayout)
-    {
-        if (ppInputLayout)
-        {
-            *ppInputLayout = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateVertexShader([[maybe_unused]] const void* pShaderBytecode, [[maybe_unused]] SIZE_T BytecodeLength, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage, ID3D11VertexShader** ppVertexShader)
-    {
-        if (ppVertexShader)
-        {
-            *ppVertexShader = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader([[maybe_unused]] const void* pShaderBytecode, [[maybe_unused]] SIZE_T BytecodeLength, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader)
-    {
-        if (ppGeometryShader)
-        {
-            *ppGeometryShader = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput([[maybe_unused]] const void* pShaderBytecode, [[maybe_unused]] SIZE_T BytecodeLength, [[maybe_unused]] const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [[maybe_unused]] UINT NumEntries, [[maybe_unused]] const UINT* pBufferStrides, [[maybe_unused]] UINT NumStrides, [[maybe_unused]] UINT RasterizedStream, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage, ID3D11GeometryShader** ppGeometryShader)
-    {
-        if (ppGeometryShader)
-        {
-            *ppGeometryShader = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreatePixelShader([[maybe_unused]] const void* pShaderBytecode, [[maybe_unused]] SIZE_T BytecodeLength, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage, ID3D11PixelShader** ppPixelShader)
-    {
-        if (ppPixelShader)
-        {
-            *ppPixelShader = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateHullShader([[maybe_unused]] const void* pShaderBytecode, [[maybe_unused]] SIZE_T BytecodeLength, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage, ID3D11HullShader** ppHullShader)
-    {
-        if (ppHullShader)
-        {
-            *ppHullShader = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDomainShader([[maybe_unused]] const void* pShaderBytecode, [[maybe_unused]] SIZE_T BytecodeLength, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage, ID3D11DomainShader** ppDomainShader)
-    {
-        if (ppDomainShader)
-        {
-            *ppDomainShader = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateComputeShader([[maybe_unused]] const void* pShaderBytecode, [[maybe_unused]] SIZE_T BytecodeLength, [[maybe_unused]] ID3D11ClassLinkage* pClassLinkage, ID3D11ComputeShader** ppComputeShader)
-    {
-        if (ppComputeShader)
-        {
-            *ppComputeShader = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateClassLinkage(ID3D11ClassLinkage** ppLinkage)
-    {
-        if (ppLinkage)
-        {
-            *ppLinkage = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateBlendState([[maybe_unused]] const D3D11_BLEND_DESC* pBlendStateDesc, ID3D11BlendState** ppBlendState)
-    {
-        if (ppBlendState)
-        {
-            *ppBlendState = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState([[maybe_unused]] const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, ID3D11DepthStencilState** ppDepthStencilState)
-    {
-        if (ppDepthStencilState)
-        {
-            *ppDepthStencilState = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState([[maybe_unused]] const D3D11_RASTERIZER_DESC* pRasterizerDesc, ID3D11RasterizerState** ppRasterizerState)
-    {
-        if (ppRasterizerState)
-        {
-            *ppRasterizerState = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateSamplerState([[maybe_unused]] const D3D11_SAMPLER_DESC* pSamplerDesc, ID3D11SamplerState** ppSamplerState)
-    {
-        if (ppSamplerState)
-        {
-            *ppSamplerState = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateQuery([[maybe_unused]] const D3D11_QUERY_DESC* pQueryDesc, ID3D11Query** ppQuery)
-    {
-        if (ppQuery)
-        {
-            *ppQuery = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreatePredicate([[maybe_unused]] const D3D11_QUERY_DESC* pPredicateDesc, ID3D11Predicate** ppPredicate)
-    {
-        if (ppPredicate)
-        {
-            *ppPredicate = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateCounter([[maybe_unused]] const D3D11_COUNTER_DESC* pCounterDesc, ID3D11Counter** ppCounter)
-    {
-        if (ppCounter)
-        {
-            *ppCounter = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext([[maybe_unused]] UINT ContextFlags, ID3D11DeviceContext** ppDeferredContext)
-    {
-        if (ppDeferredContext)
-        {
-            *ppDeferredContext = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResource([[maybe_unused]] HANDLE hResource, [[maybe_unused]] REFIID ReturnedInterface, void** ppResource)
-    {
-        if (ppResource)
-        {
-            *ppResource = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport([[maybe_unused]] DXGI_FORMAT Format, UINT* pFormatSupport)
-    {
-        if (pFormatSupport)
-        {
-            pFormatSupport = 0;
-        }
-        return E_FAIL;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels([[maybe_unused]] DXGI_FORMAT Format, [[maybe_unused]] UINT SampleCount, UINT* pNumQualityLevels)
-    {
-        if (pNumQualityLevels)
-        {
-            pNumQualityLevels = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual void STDMETHODCALLTYPE CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo)
-    {
-        if (pCounterInfo)
-        {
-            pCounterInfo->LastDeviceDependentCounter = D3D11_COUNTER_DEVICE_DEPENDENT_0;
-            pCounterInfo->NumDetectableParallelUnits = 0;
-            pCounterInfo->NumSimultaneousCounters = 0;
-        }
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CheckCounter([[maybe_unused]] const D3D11_COUNTER_DESC* pDesc, D3D11_COUNTER_TYPE* pType, UINT* pActiveCounters, LPSTR szName, UINT* pNameLength, LPSTR szUnits, UINT* pUnitsLength, LPSTR szDescription, UINT* pDescriptionLength)
-    {
-        if (pType)
-        {
-            *pType = D3D11_COUNTER_TYPE_UINT32;
-        }
-        if (pActiveCounters)
-        {
-            *pActiveCounters = 0;
-        }
-        if (szName)
-        {
-            *szName = 0;
-        }
-        if (pNameLength)
-        {
-            *pNameLength = 0;
-        }
-        if (szUnits)
-        {
-            *szUnits = 0;
-        }
-        if (pUnitsLength)
-        {
-            *pUnitsLength = 0;
-        }
-        if (szDescription)
-        {
-            *szDescription = 0;
-        }
-        if (pDescriptionLength)
-        {
-            *pDescriptionLength = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport([[maybe_unused]] D3D11_FEATURE Feature, [[maybe_unused]] void* pFeatureSupportData, [[maybe_unused]] UINT FeatureSupportDataSize)
-    {
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetPrivateData([[maybe_unused]] REFGUID guid, UINT* pDataSize, [[maybe_unused]] void* pData)
-    {
-        if (pDataSize)
-        {
-            *pDataSize = 0;
-        }
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateData([[maybe_unused]] REFGUID guid, [[maybe_unused]] UINT DataSize, [[maybe_unused]] const void* pData)
-    {
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface([[maybe_unused]] REFGUID guid, [[maybe_unused]] const IUnknown* pData)
-    {
-        return S_FALSE;
-    }
-
-    virtual D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel()
-    {
-        return D3D_FEATURE_LEVEL_11_0;
-    }
-
-    virtual UINT STDMETHODCALLTYPE GetCreationFlags()
-    {
-        return 0;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason()
-    {
-        return S_OK;
-    }
-
-    virtual void STDMETHODCALLTYPE GetImmediateContext(ID3D11DeviceContext** ppImmediateContext);
-
-    virtual HRESULT STDMETHODCALLTYPE SetExceptionMode([[maybe_unused]] UINT RaiseFlags)
-    {
-        return S_FALSE;
-    }
-
-    virtual UINT STDMETHODCALLTYPE GetExceptionMode()
-    {
-        return 0;
-    }
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-    virtual void STDMETHODCALLTYPE GetImmediateContext1(ID3D11DeviceContext1** ppImmediateContext);
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext1(UINT ContextFlags, ID3D11DeviceContext1** ppDeferredContext)
-    {
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateBlendState1(const D3D11_BLEND_DESC1* pBlendStateDesc, ID3D11BlendState1** ppBlendState)
-    {
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState1(const D3D11_RASTERIZER_DESC1* pRasterizerDesc, ID3D11RasterizerState1** ppRasterizerState)
-    {
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE CreateDeviceContextState(UINT Flags, const D3D_FEATURE_LEVEL* pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, REFIID EmulatedInterface, D3D_FEATURE_LEVEL* pChosenFeatureLevel, ID3DDeviceContextState** ppContextState)
-    {
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResource1(HANDLE hResource, REFIID returnedInterface, void** ppResource)
-    {
-        return S_FALSE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE OpenSharedResourceByName(LPCWSTR lpName, DWORD dwDesiredAccess, REFIID returnedInterface, void** ppResource)
-    {
-        return S_FALSE;
-    }
-#endif
-
-public:
-    NullD3D11Device()
-        : m_refCount(1)
-        , m_pImmediateCtx(0) {}
-
-protected:
-    virtual ~NullD3D11Device()
-    {
-        SAFE_RELEASE(m_pImmediateCtx);
-    }
-
-protected:
-    volatile int m_refCount;
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-    ID3D11DeviceContext1* m_pImmediateCtx;
-#else
-    ID3D11DeviceContext* m_pImmediateCtx;
-#endif
-};
-
-
-namespace NullD3D11DeviceInternal
-{
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-    class DeviceContext
-        : public ID3D11DeviceContext1
-#else
-    class DeviceContext
-        : public ID3D11DeviceContext
-#endif
-    {
-    public:
-        // IUnknown
-        virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] REFIID riid, void** ppvObj)
-        {
-            if (ppvObj)
-            {
-                *ppvObj = 0;
-            }
-            return E_NOINTERFACE;
-        }
-
-        virtual ULONG STDMETHODCALLTYPE AddRef()
-        {
-            return CryInterlockedIncrement(&m_refCount);
-        }
-
-        virtual ULONG STDMETHODCALLTYPE Release()
-        {
-            long refCount = CryInterlockedDecrement(&m_refCount);
-            if (refCount <= 0)
-            {
-                delete this;
-            }
-            return refCount;
-        };
-
-        // ID3D11DeviceChild
-        virtual void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice)
-        {
-            if (ppDevice)
-            {
-                if (m_pDevice)
-                {
-                    m_pDevice->AddRef();
-                }
-                *ppDevice = m_pDevice;
-            }
-        }
-
-        virtual HRESULT STDMETHODCALLTYPE GetPrivateData([[maybe_unused]] REFGUID guid, UINT* pDataSize, [[maybe_unused]] void* pData)
-        {
-            if (pDataSize)
-            {
-                *pDataSize = 0;
-            }
-            return S_FALSE;
-        }
-
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateData([[maybe_unused]] REFGUID guid, [[maybe_unused]] UINT DataSize, [[maybe_unused]] const void* pData)
-        {
-            return S_FALSE;
-        }
-
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface([[maybe_unused]] REFGUID guid, [[maybe_unused]] const IUnknown* pData)
-        {
-            return S_FALSE;
-        }
-
-        // ID3D11DeviceContext
-        virtual void STDMETHODCALLTYPE VSSetConstantBuffers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppConstantBuffers) {}
-        virtual void STDMETHODCALLTYPE PSSetShaderResources([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumViews, [[maybe_unused]] ID3D11ShaderResourceView* const* ppShaderResourceViews) {}
-        virtual void STDMETHODCALLTYPE PSSetShader([[maybe_unused]] ID3D11PixelShader* pPixelShader, [[maybe_unused]] ID3D11ClassInstance* const* ppClassInstances, [[maybe_unused]] UINT NumClassInstances) {}
-        virtual void STDMETHODCALLTYPE PSSetSamplers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumSamplers, [[maybe_unused]] ID3D11SamplerState* const* ppSamplers) {}
-        virtual void STDMETHODCALLTYPE VSSetShader([[maybe_unused]] ID3D11VertexShader* pVertexShader, [[maybe_unused]] ID3D11ClassInstance* const* ppClassInstances, [[maybe_unused]] UINT NumClassInstances) {}
-        virtual void STDMETHODCALLTYPE DrawIndexed([[maybe_unused]] UINT IndexCount, [[maybe_unused]] UINT StartIndexLocation, [[maybe_unused]] INT BaseVertexLocation) {}
-        virtual void STDMETHODCALLTYPE Draw([[maybe_unused]] UINT VertexCount, [[maybe_unused]] UINT StartVertexLocation) {}
-
-        virtual HRESULT STDMETHODCALLTYPE Map([[maybe_unused]] ID3D11Resource* pResource, [[maybe_unused]] UINT Subresource, [[maybe_unused]] D3D11_MAP MapType, [[maybe_unused]] UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource)
-        {
-            if (pMappedResource)
-            {
-                pMappedResource->RowPitch = 0;
-                pMappedResource->DepthPitch = 0;
-                pMappedResource->pData = 0;
-            }
-            return S_FALSE;
-        }
-
-        virtual void STDMETHODCALLTYPE Unmap([[maybe_unused]] ID3D11Resource* pResource, [[maybe_unused]] UINT Subresource) {}
-        virtual void STDMETHODCALLTYPE PSSetConstantBuffers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppConstantBuffers) {}
-        virtual void STDMETHODCALLTYPE IASetInputLayout([[maybe_unused]] ID3D11InputLayout* pInputLayout) {}
-        virtual void STDMETHODCALLTYPE IASetVertexBuffers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppVertexBuffers, [[maybe_unused]] const UINT* pStrides, [[maybe_unused]] const UINT* pOffsets) {}
-        virtual void STDMETHODCALLTYPE IASetIndexBuffer([[maybe_unused]] ID3D11Buffer* pIndexBuffer, [[maybe_unused]] DXGI_FORMAT Format, [[maybe_unused]] UINT Offset) {}
-        virtual void STDMETHODCALLTYPE DrawIndexedInstanced([[maybe_unused]] UINT IndexCountPerInstance, [[maybe_unused]] UINT InstanceCount, [[maybe_unused]] UINT StartIndexLocation, [[maybe_unused]] INT BaseVertexLocation, [[maybe_unused]] UINT StartInstanceLocation) {}
-        virtual void STDMETHODCALLTYPE DrawInstanced([[maybe_unused]] UINT VertexCountPerInstance, [[maybe_unused]] UINT InstanceCount, [[maybe_unused]] UINT StartVertexLocation, [[maybe_unused]] UINT StartInstanceLocation) {}
-        virtual void STDMETHODCALLTYPE GSSetConstantBuffers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppConstantBuffers) {}
-        virtual void STDMETHODCALLTYPE GSSetShader([[maybe_unused]] ID3D11GeometryShader* pShader, [[maybe_unused]] ID3D11ClassInstance* const* ppClassInstances, [[maybe_unused]] UINT NumClassInstances) {}
-        virtual void STDMETHODCALLTYPE IASetPrimitiveTopology([[maybe_unused]] D3D11_PRIMITIVE_TOPOLOGY Topology) {}
-        virtual void STDMETHODCALLTYPE VSSetShaderResources([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumViews, [[maybe_unused]] ID3D11ShaderResourceView* const* ppShaderResourceViews) {}
-        virtual void STDMETHODCALLTYPE VSSetSamplers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumSamplers, [[maybe_unused]] ID3D11SamplerState* const* ppSamplers) {}
-        virtual void STDMETHODCALLTYPE Begin([[maybe_unused]] ID3D11Asynchronous* pAsync) {}
-        virtual void STDMETHODCALLTYPE End([[maybe_unused]] ID3D11Asynchronous* pAsync) {}
-
-        virtual HRESULT STDMETHODCALLTYPE GetData([[maybe_unused]] ID3D11Asynchronous* pAsync, [[maybe_unused]] void* pData, [[maybe_unused]] UINT DataSize, [[maybe_unused]] UINT GetDataFlags)
-        {
-            return S_FALSE;
-        }
-
-        virtual void STDMETHODCALLTYPE SetPredication([[maybe_unused]] ID3D11Predicate* pPredicate, [[maybe_unused]] BOOL PredicateValue) {}
-        virtual void STDMETHODCALLTYPE GSSetShaderResources([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumViews, [[maybe_unused]] ID3D11ShaderResourceView* const* ppShaderResourceViews) {}
-        virtual void STDMETHODCALLTYPE GSSetSamplers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumSamplers, [[maybe_unused]] ID3D11SamplerState* const* ppSamplers) {}
-        virtual void STDMETHODCALLTYPE OMSetRenderTargets([[maybe_unused]] UINT NumViews, [[maybe_unused]] ID3D11RenderTargetView* const* ppRenderTargetViews, [[maybe_unused]] ID3D11DepthStencilView* pDepthStencilView) {}
-        virtual void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews([[maybe_unused]] UINT NumRTVs, [[maybe_unused]]  ID3D11RenderTargetView* const* ppRenderTargetViews, [[maybe_unused]] ID3D11DepthStencilView* pDepthStencilView, [[maybe_unused]] UINT UAVStartSlot, [[maybe_unused]] UINT NumUAVs, [[maybe_unused]] ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, [[maybe_unused]] const UINT* pUAVInitialCounts) {}
-        virtual void STDMETHODCALLTYPE OMSetBlendState([[maybe_unused]] ID3D11BlendState* pBlendState, [[maybe_unused]] const FLOAT BlendFactor[ 4 ], [[maybe_unused]] UINT SampleMask) {}
-        virtual void STDMETHODCALLTYPE OMSetDepthStencilState([[maybe_unused]] ID3D11DepthStencilState* pDepthStencilState, [[maybe_unused]] UINT StencilRef) {}
-        virtual void STDMETHODCALLTYPE SOSetTargets([[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppSOTargets, [[maybe_unused]] const UINT* pOffsets) {}
-        virtual void STDMETHODCALLTYPE DrawAuto(void) {}
-        virtual void STDMETHODCALLTYPE DrawIndexedInstancedIndirect([[maybe_unused]] ID3D11Buffer* pBufferForArgs, [[maybe_unused]] UINT AlignedByteOffsetForArgs) {}
-        virtual void STDMETHODCALLTYPE DrawInstancedIndirect([[maybe_unused]] ID3D11Buffer* pBufferForArgs, [[maybe_unused]] UINT AlignedByteOffsetForArgs) {}
-        virtual void STDMETHODCALLTYPE Dispatch([[maybe_unused]] UINT ThreadGroupCountX, [[maybe_unused]] UINT ThreadGroupCountY, [[maybe_unused]] UINT ThreadGroupCountZ) {}
-        virtual void STDMETHODCALLTYPE DispatchIndirect([[maybe_unused]] ID3D11Buffer* pBufferForArgs, [[maybe_unused]] UINT AlignedByteOffsetForArgs) {}
-        virtual void STDMETHODCALLTYPE RSSetState([[maybe_unused]] ID3D11RasterizerState* pRasterizerState) {}
-        virtual void STDMETHODCALLTYPE RSSetViewports([[maybe_unused]] UINT NumViewports, [[maybe_unused]] const D3D11_VIEWPORT* pViewports) {}
-        virtual void STDMETHODCALLTYPE RSSetScissorRects([[maybe_unused]] UINT NumRects, [[maybe_unused]] const D3D11_RECT* pRects) {}
-        virtual void STDMETHODCALLTYPE CopySubresourceRegion([[maybe_unused]] ID3D11Resource* pDstResource, [[maybe_unused]] UINT DstSubresource, [[maybe_unused]] UINT DstX, [[maybe_unused]] UINT DstY, [[maybe_unused]] UINT DstZ, [[maybe_unused]] ID3D11Resource* pSrcResource, [[maybe_unused]] UINT SrcSubresource, [[maybe_unused]] const D3D11_BOX* pSrcBox) {}
-        virtual void STDMETHODCALLTYPE CopyResource([[maybe_unused]] ID3D11Resource* pDstResource, [[maybe_unused]] ID3D11Resource* pSrcResource) {}
-        virtual void STDMETHODCALLTYPE UpdateSubresource([[maybe_unused]] ID3D11Resource* pDstResource, [[maybe_unused]] UINT DstSubresource, [[maybe_unused]] const D3D11_BOX* pDstBox, [[maybe_unused]] const void* pSrcData, [[maybe_unused]] UINT SrcRowPitch, [[maybe_unused]] UINT SrcDepthPitch) {}
-        virtual void STDMETHODCALLTYPE CopyStructureCount([[maybe_unused]] ID3D11Buffer* pDstBuffer, [[maybe_unused]] UINT DstAlignedByteOffset, [[maybe_unused]] ID3D11UnorderedAccessView* pSrcView) {}
-        virtual void STDMETHODCALLTYPE ClearRenderTargetView([[maybe_unused]] ID3D11RenderTargetView* pRenderTargetView, [[maybe_unused]] const FLOAT ColorRGBA[ 4 ]) {}
-        virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint([[maybe_unused]] ID3D11UnorderedAccessView* pUnorderedAccessView, [[maybe_unused]] const UINT Values[ 4 ]) {}
-        virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat([[maybe_unused]] ID3D11UnorderedAccessView* pUnorderedAccessView, [[maybe_unused]] const FLOAT Values[ 4 ]) {}
-        virtual void STDMETHODCALLTYPE ClearDepthStencilView([[maybe_unused]] ID3D11DepthStencilView* pDepthStencilView, [[maybe_unused]] UINT ClearFlags, [[maybe_unused]] FLOAT Depth, [[maybe_unused]] UINT8 Stencil) {}
-        virtual void STDMETHODCALLTYPE GenerateMips([[maybe_unused]] ID3D11ShaderResourceView* pShaderResourceView) {}
-        virtual void STDMETHODCALLTYPE SetResourceMinLOD([[maybe_unused]] ID3D11Resource* pResource, [[maybe_unused]] FLOAT MinLOD) {}
-
-        virtual FLOAT STDMETHODCALLTYPE GetResourceMinLOD([[maybe_unused]] ID3D11Resource* pResource)
-        {
-            return 0;
-        }
-
-        virtual void STDMETHODCALLTYPE ResolveSubresource([[maybe_unused]] ID3D11Resource* pDstResource, [[maybe_unused]] UINT DstSubresource, [[maybe_unused]] ID3D11Resource* pSrcResource, [[maybe_unused]] UINT SrcSubresource, [[maybe_unused]] DXGI_FORMAT Format) {}
-        virtual void STDMETHODCALLTYPE ExecuteCommandList([[maybe_unused]] ID3D11CommandList* pCommandList, [[maybe_unused]] BOOL RestoreContextState) {}
-        virtual void STDMETHODCALLTYPE HSSetShaderResources([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumViews, [[maybe_unused]] ID3D11ShaderResourceView* const* ppShaderResourceViews) {}
-        virtual void STDMETHODCALLTYPE HSSetShader([[maybe_unused]] ID3D11HullShader* pHullShader, [[maybe_unused]] ID3D11ClassInstance* const* ppClassInstances, [[maybe_unused]] UINT NumClassInstances) {}
-        virtual void STDMETHODCALLTYPE HSSetSamplers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumSamplers, [[maybe_unused]] ID3D11SamplerState* const* ppSamplers) {}
-        virtual void STDMETHODCALLTYPE HSSetConstantBuffers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppConstantBuffers) {}
-        virtual void STDMETHODCALLTYPE DSSetShaderResources([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumViews, [[maybe_unused]] ID3D11ShaderResourceView* const* ppShaderResourceViews) {}
-        virtual void STDMETHODCALLTYPE DSSetShader([[maybe_unused]] ID3D11DomainShader* pDomainShader, [[maybe_unused]] ID3D11ClassInstance* const* ppClassInstances, [[maybe_unused]] UINT NumClassInstances) {}
-        virtual void STDMETHODCALLTYPE DSSetSamplers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumSamplers, [[maybe_unused]] ID3D11SamplerState* const* ppSamplers) {}
-        virtual void STDMETHODCALLTYPE DSSetConstantBuffers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppConstantBuffers) {}
-        virtual void STDMETHODCALLTYPE CSSetShaderResources([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumViews, [[maybe_unused]] ID3D11ShaderResourceView* const* ppShaderResourceViews) {}
-        virtual void STDMETHODCALLTYPE CSSetUnorderedAccessViews([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumUAVs, [[maybe_unused]] ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, [[maybe_unused]] const UINT* pUAVInitialCounts) {}
-        virtual void STDMETHODCALLTYPE CSSetShader([[maybe_unused]] ID3D11ComputeShader* pComputeShader, [[maybe_unused]] ID3D11ClassInstance* const* ppClassInstances, [[maybe_unused]] UINT NumClassInstances) {}
-        virtual void STDMETHODCALLTYPE CSSetSamplers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumSamplers, [[maybe_unused]] ID3D11SamplerState* const* ppSamplers) {}
-        virtual void STDMETHODCALLTYPE CSSetConstantBuffers([[maybe_unused]] UINT StartSlot, [[maybe_unused]] UINT NumBuffers, [[maybe_unused]] ID3D11Buffer* const* ppConstantBuffers) {}
-
-        virtual void STDMETHODCALLTYPE VSGetConstantBuffers([[maybe_unused]] UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers)
-        {
-            if (ppConstantBuffers)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppConstantBuffers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE PSGetShaderResources([[maybe_unused]] UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-        {
-            if (ppShaderResourceViews)
-            {
-                for (UINT i = 0; i < NumViews; ++i)
-                {
-                    ppShaderResourceViews[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE PSGetShader(ID3D11PixelShader** ppPixelShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances)
-        {
-            if (ppPixelShader)
-            {
-                *ppPixelShader = 0;
-            }
-            if (ppClassInstances)
-            {
-                *ppClassInstances = 0;
-            }
-            if (pNumClassInstances)
-            {
-                pNumClassInstances = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE PSGetSamplers([[maybe_unused]] UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-        {
-            if (ppSamplers)
-            {
-                for (UINT i = 0; i < NumSamplers; ++i)
-                {
-                    ppSamplers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE VSGetShader(ID3D11VertexShader** ppVertexShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances)
-        {
-            if (ppVertexShader)
-            {
-                *ppVertexShader = 0;
-            }
-            if (ppClassInstances)
-            {
-                *ppClassInstances = 0;
-            }
-            if (pNumClassInstances)
-            {
-                pNumClassInstances = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE PSGetConstantBuffers([[maybe_unused]] UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers)
-        {
-            if (ppConstantBuffers)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppConstantBuffers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE IAGetInputLayout(ID3D11InputLayout** ppInputLayout)
-        {
-            if (ppInputLayout)
-            {
-                *ppInputLayout = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE IAGetVertexBuffers([[maybe_unused]] UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppVertexBuffers, UINT* pStrides, UINT* pOffsets)
-        {
-            if (ppVertexBuffers)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppVertexBuffers[i] = 0;
-                    pStrides[i] = 0;
-                    pOffsets[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE IAGetIndexBuffer(ID3D11Buffer** pIndexBuffer, DXGI_FORMAT* Format, UINT* Offset)
-        {
-            if (pIndexBuffer)
-            {
-                pIndexBuffer = 0;
-            }
-            if (Format)
-            {
-                *Format = DXGI_FORMAT_UNKNOWN;
-            }
-            if (Offset)
-            {
-                *Offset = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE GSGetConstantBuffers([[maybe_unused]] UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers)
-        {
-            if (ppConstantBuffers)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppConstantBuffers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE GSGetShader(ID3D11GeometryShader** ppGeometryShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances)
-        {
-            if (ppGeometryShader)
-            {
-                *ppGeometryShader = 0;
-            }
-            if (ppClassInstances)
-            {
-                *ppClassInstances = 0;
-            }
-            if (pNumClassInstances)
-            {
-                pNumClassInstances = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology)
-        {
-            if (pTopology)
-            {
-                *pTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE VSGetShaderResources([[maybe_unused]] UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-        {
-            if (ppShaderResourceViews)
-            {
-                for (UINT i = 0; i < NumViews; ++i)
-                {
-                    ppShaderResourceViews[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE VSGetSamplers([[maybe_unused]] UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-        {
-            if (ppSamplers)
-            {
-                for (UINT i = 0; i < NumSamplers; ++i)
-                {
-                    ppSamplers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE GetPredication(ID3D11Predicate** ppPredicate, BOOL* pPredicateValue)
-        {
-            if (ppPredicate)
-            {
-                *ppPredicate = 0;
-            }
-            if (pPredicateValue)
-            {
-                *pPredicateValue = FALSE;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE GSGetShaderResources([[maybe_unused]] UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-        {
-            if (ppShaderResourceViews)
-            {
-                for (UINT i = 0; i < NumViews; ++i)
-                {
-                    ppShaderResourceViews[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE GSGetSamplers([[maybe_unused]] UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-        {
-            if (ppSamplers)
-            {
-                for (UINT i = 0; i < NumSamplers; ++i)
-                {
-                    ppSamplers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE OMGetRenderTargets(UINT NumViews, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView)
-        {
-            if (ppRenderTargetViews)
-            {
-                for (UINT i = 0; i < NumViews; ++i)
-                {
-                    ppRenderTargetViews[i] = 0;
-                }
-            }
-
-            if (ppDepthStencilView)
-            {
-                *ppDepthStencilView = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(UINT NumRTVs, ID3D11RenderTargetView** ppRenderTargetViews, ID3D11DepthStencilView** ppDepthStencilView, [[maybe_unused]] UINT UAVStartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-        {
-            if (ppRenderTargetViews)
-            {
-                for (UINT i = 0; i < NumRTVs; ++i)
-                {
-                    ppRenderTargetViews[i] = 0;
-                }
-            }
-
-            if (ppDepthStencilView)
-            {
-                *ppDepthStencilView = 0;
-            }
-
-            if (ppUnorderedAccessViews)
-            {
-                for (UINT i = 0; i < NumUAVs; ++i)
-                {
-                    ppUnorderedAccessViews[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE OMGetBlendState(ID3D11BlendState** ppBlendState, FLOAT BlendFactor[ 4 ], UINT* pSampleMask)
-        {
-            if (ppBlendState)
-            {
-                *ppBlendState = 0;
-            }
-            BlendFactor[0] = BlendFactor[1] = BlendFactor[2] = BlendFactor[3] = 0;
-            if (pSampleMask)
-            {
-                *pSampleMask = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE OMGetDepthStencilState(ID3D11DepthStencilState** ppDepthStencilState, UINT* pStencilRef)
-        {
-            if (ppDepthStencilState)
-            {
-                *ppDepthStencilState = 0;
-            }
-            if (pStencilRef)
-            {
-                *pStencilRef = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE SOGetTargets(UINT NumBuffers, ID3D11Buffer** ppSOTargets)
-        {
-            if (ppSOTargets)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppSOTargets[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE RSGetState(ID3D11RasterizerState** ppRasterizerState)
-        {
-            if (ppRasterizerState)
-            {
-                *ppRasterizerState = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE RSGetViewports(UINT* pNumViewports, [[maybe_unused]] D3D11_VIEWPORT* pViewports)
-        {
-            if (pNumViewports)
-            {
-                *pNumViewports = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE RSGetScissorRects(UINT* pNumRects, [[maybe_unused]] D3D11_RECT* pRects)
-        {
-            if (pNumRects)
-            {
-                *pNumRects = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE HSGetShaderResources([[maybe_unused]] UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-        {
-            if (ppShaderResourceViews)
-            {
-                for (UINT i = 0; i < NumViews; ++i)
-                {
-                    ppShaderResourceViews[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE HSGetShader(ID3D11HullShader** ppHullShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances)
-        {
-            if (ppHullShader)
-            {
-                *ppHullShader = 0;
-            }
-            if (ppClassInstances)
-            {
-                *ppClassInstances = 0;
-            }
-            if (pNumClassInstances)
-            {
-                pNumClassInstances = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE HSGetSamplers([[maybe_unused]] UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-        {
-            if (ppSamplers)
-            {
-                for (UINT i = 0; i < NumSamplers; ++i)
-                {
-                    ppSamplers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE HSGetConstantBuffers([[maybe_unused]] UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers)
-        {
-            if (ppConstantBuffers)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppConstantBuffers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE DSGetShaderResources([[maybe_unused]] UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-        {
-            if (ppShaderResourceViews)
-            {
-                for (UINT i = 0; i < NumViews; ++i)
-                {
-                    ppShaderResourceViews[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE DSGetShader(ID3D11DomainShader** ppDomainShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances)
-        {
-            if (ppDomainShader)
-            {
-                *ppDomainShader = 0;
-            }
-            if (ppClassInstances)
-            {
-                *ppClassInstances = 0;
-            }
-            if (pNumClassInstances)
-            {
-                pNumClassInstances = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE DSGetSamplers([[maybe_unused]] UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-        {
-            if (ppSamplers)
-            {
-                for (UINT i = 0; i < NumSamplers; ++i)
-                {
-                    ppSamplers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE DSGetConstantBuffers([[maybe_unused]] UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers)
-        {
-            if (ppConstantBuffers)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppConstantBuffers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE CSGetShaderResources([[maybe_unused]] UINT StartSlot, UINT NumViews, ID3D11ShaderResourceView** ppShaderResourceViews)
-        {
-            if (ppShaderResourceViews)
-            {
-                for (UINT i = 0; i < NumViews; ++i)
-                {
-                    ppShaderResourceViews[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE CSGetUnorderedAccessViews([[maybe_unused]] UINT StartSlot, UINT NumUAVs, ID3D11UnorderedAccessView** ppUnorderedAccessViews)
-        {
-            if (ppUnorderedAccessViews)
-            {
-                for (UINT i = 0; i < NumUAVs; ++i)
-                {
-                    ppUnorderedAccessViews[i] = 0;
-                }
-            }
-        }
-        virtual void STDMETHODCALLTYPE CSGetShader(ID3D11ComputeShader** ppComputeShader, ID3D11ClassInstance** ppClassInstances, UINT* pNumClassInstances)
-        {
-            if (ppComputeShader)
-            {
-                *ppComputeShader = 0;
-            }
-            if (ppClassInstances)
-            {
-                *ppClassInstances = 0;
-            }
-            if (pNumClassInstances)
-            {
-                pNumClassInstances = 0;
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE CSGetSamplers([[maybe_unused]] UINT StartSlot, UINT NumSamplers, ID3D11SamplerState** ppSamplers)
-        {
-            if (ppSamplers)
-            {
-                for (UINT i = 0; i < NumSamplers; ++i)
-                {
-                    ppSamplers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE CSGetConstantBuffers([[maybe_unused]] UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers)
-        {
-            if (ppConstantBuffers)
-            {
-                for (UINT i = 0; i < NumBuffers; ++i)
-                {
-                    ppConstantBuffers[i] = 0;
-                }
-            }
-        }
-
-        virtual void STDMETHODCALLTYPE ClearState() {}
-        virtual void STDMETHODCALLTYPE Flush() {}
-
-        virtual D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType()
-        {
-            return D3D11_DEVICE_CONTEXT_IMMEDIATE;
-        }
-
-        virtual UINT STDMETHODCALLTYPE GetContextFlags()
-        {
-            return 0;
-        }
-
-        virtual HRESULT STDMETHODCALLTYPE FinishCommandList([[maybe_unused]] BOOL RestoreDeferredContextState, ID3D11CommandList** ppCommandList)
-        {
-            if (ppCommandList)
-            {
-                *ppCommandList = 0;
-            }
-            return DXGI_ERROR_INVALID_CALL;
-        }
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-        void STDMETHODCALLTYPE CopySubresourceRegion1(ID3D11Resource* pDstResource, UINT DstSubresource, UINT DstX, UINT DstY, UINT DstZ, ID3D11Resource* pSrcResource, UINT SrcSubresource, const D3D11_BOX* pSrcBox, UINT CopyFlags) {}
-        void STDMETHODCALLTYPE CopyResource1(ID3D11Resource* pDstResource, ID3D11Resource* pSrcResource, UINT CopyFlags) {}
-        void STDMETHODCALLTYPE UpdateSubresource1(ID3D11Resource* pDstResource, UINT DstSubresource, const D3D11_BOX* pDstBox, const void* pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch, UINT CopyFlags) {}
-        void STDMETHODCALLTYPE DiscardResource(ID3D11Resource* pResource) {}
-        void STDMETHODCALLTYPE DiscardView(ID3D11View* pResourceView) {}
-
-        void STDMETHODCALLTYPE VSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE HSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE DSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE GSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE PSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE CSSetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, const UINT* pFirstConstant, const UINT* pNumConstants) {}
-
-        void STDMETHODCALLTYPE VSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE HSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE DSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE GSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE PSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) {}
-        void STDMETHODCALLTYPE CSGetConstantBuffers1(UINT StartSlot, UINT NumBuffers, ID3D11Buffer** ppConstantBuffers, UINT* pFirstConstant, UINT* pNumConstants) {}
-
-        void STDMETHODCALLTYPE SwapDeviceContextState(ID3DDeviceContextState* pState, ID3DDeviceContextState** ppPreviousState) {}
-        void STDMETHODCALLTYPE ClearView(ID3D11View* pView, const FLOAT Color[4], const D3D11_RECT* pRect, UINT NumRects) {}
-        void STDMETHODCALLTYPE DiscardView1(ID3D11View* pResourceView, const D3D11_RECT* pRects, UINT NumRects) {}
-#endif
-
-    protected:
-        virtual ~DeviceContext()
-        {
-        }
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-    public:
-        DeviceContext(ID3D11Device1* pDevice)
-            : m_refCount(1)
-            , m_pDevice(pDevice) {}
-
-    protected:
-        volatile int m_refCount;
-        ID3D11Device1* m_pDevice;
-#else
-    public:
-        DeviceContext(ID3D11Device* pDevice)
-            : m_refCount(1)
-            , m_pDevice(pDevice) {}
-
-    protected:
-        volatile int m_refCount;
-        ID3D11Device* m_pDevice;
-#endif
-    };
-} // namespace NullD3D11DeviceInternal
-
-
-void NullD3D11Device::GetImmediateContext(ID3D11DeviceContext** ppImmediateContext)
-{
-    if (ppImmediateContext)
-    {
-        if (!m_pImmediateCtx)
-        {
-            m_pImmediateCtx = new NullD3D11DeviceInternal::DeviceContext(this);
-        }
-
-        m_pImmediateCtx->AddRef();
-        *ppImmediateContext = m_pImmediateCtx;
-    }
-}
-
-#if defined(DEVICE_SUPPORTS_D3D11_1)
-void NullD3D11Device::GetImmediateContext1(ID3D11DeviceContext1** ppImmediateContext)
-{
-    if (ppImmediateContext)
-    {
-        if (!m_pImmediateCtx)
-        {
-            m_pImmediateCtx = new NullD3D11DeviceInternal::DeviceContext(this);
-        }
-
-        m_pImmediateCtx->AddRef();
-        *ppImmediateContext = m_pImmediateCtx;
-    }
-}
-#endif
-
-
-#endif // #if defined(ENABLE_NULL_D3D11DEVICE)
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_NULLD3D11DEVICE_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PipelineProfiler.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PipelineProfiler.cpp
deleted file mode 100644
index c63b3578bb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PipelineProfiler.cpp
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "PipelineProfiler.h"
-#include "DriverD3D.h"
-#include "../Common/Textures/TextureManager.h"
-
-
-CRenderPipelineProfiler::CRenderPipelineProfiler()
-{
-    m_sectionsFrameIdx = 0;
-    m_gpuSyncTime = 0;
-    m_avgFrameTime = 0;
-    m_enabled = false;
-    m_recordData = false;
-    m_waitForGPUTimers = false;
-
-    m_stack.reserve(8);
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-    {
-        ResetBasicStats(m_basicStats[i], true);
-    }
-}
-
-
-void CRenderPipelineProfiler::BeginFrame()
-{
-    AZ_TRACE_METHOD();
-    m_recordData = IsEnabled();
-
-    if (gEnv->IsEditor() && !gcpRendD3D->m_CurrContext->m_bMainViewport)
-    {
-        m_recordData = false;
-    }
-
-    if (m_recordData)
-    {
-        CD3DProfilingGPUTimer::EnableTiming();
-    }
-
-    uint32 nextSectionsFrameIdx = (m_sectionsFrameIdx + 1) % NumSectionsFrames;
-    RPPSectionsFrame& nextSectionsFrame = m_sectionsFrames[nextSectionsFrameIdx];
-
-    if (nextSectionsFrame.m_numSections > 0)
-    {
-        RPProfilerSection& lastSection = nextSectionsFrame.m_sections[nextSectionsFrame.m_numSections - 1];
-
-        lastSection.gpuTimer.UpdateTime();
-        if (lastSection.gpuTimer.HasPendingQueries())
-        {
-            // Don't record new data if there are still pending GPU time queries, otherwise results may be wrong when labels change between frames
-            m_recordData = false;
-            return;
-        }
-    }
-
-    m_sectionsFrameIdx = nextSectionsFrameIdx;
-
-    if (!WaitForTimers())
-    {
-        UpdateBasicStats();
-    }
-
-    nextSectionsFrame.m_numSections = 0;
-
-    BeginSection("FRAME", 0);
-    if (m_recordData)
-    {
-        nextSectionsFrame.m_sections[0].numDIPs = 0;
-        nextSectionsFrame.m_sections[0].numPolys = 0;
-    }
-}
-
-
-void CRenderPipelineProfiler::EndFrame()
-{
-    EndSection("FRAME");
-
-    RPPSectionsFrame& sectionsFrame = m_sectionsFrames[m_sectionsFrameIdx];
-
-    if (!m_stack.empty())
-    {
-        sectionsFrame.m_sections[0].recLevel = -1;
-        m_stack.resize(0);
-    }
-
-    m_gpuSyncTime = 0;
-
-    if (sectionsFrame.m_numSections > 0 && WaitForTimers())
-    {
-        CTimeValue startTime = gEnv->pTimer->GetAsyncTime();
-        RPProfilerSection& lastSection = sectionsFrame.m_sections[sectionsFrame.m_numSections - 1];
-
-        // This will lower the overall framerate but gives accurate GPU times
-        do
-        {
-            lastSection.gpuTimer.UpdateTime();
-        } while (lastSection.gpuTimer.HasPendingQueries());
-
-        m_gpuSyncTime = gEnv->pTimer->GetAsyncTime().GetDifferenceInSeconds(startTime) * 1000.0f;
-
-        UpdateBasicStats();
-    }
-
-    UpdateThreadTimings();
-
-    m_recordData = false;
-
-    // Don't display stats on anything but the main editor viewport
-    // Also don't display stats if the renderer hasn't finished loading some default resources
-    // We can't display stats properly without loading the default White texture
-    if ((!gEnv->IsEditor() || (gEnv->IsEditor() && gcpRendD3D->m_CurrContext->m_bMainViewport))  && gEnv->pRenderer->HasLoadedDefaultResources())
-    {
-        if IsCVarConstAccess(constexpr) (CRenderer::CV_r_profiler == 1)
-        {
-            DisplayBasicStats();
-        }
-        else if IsCVarConstAccess(constexpr) (CRenderer::CV_r_profiler == 2)
-        {
-            DisplayAdvancedStats();
-        }
-    }
-}
-
-
-void CRenderPipelineProfiler::ReleaseGPUTimers()
-{
-    for (uint32 i = 0; i < NumSectionsFrames; ++i)
-    {
-        RPPSectionsFrame& sectionsFrame = m_sectionsFrames[i];
-        for (uint32 j = 0; j < sectionsFrame.m_numSections; ++j)
-        {
-            RPProfilerSection& section = sectionsFrame.m_sections[j];
-            section.gpuTimer.Stop();
-            section.gpuTimer.Release();
-        }
-    }
-}
-
-
-bool CRenderPipelineProfiler::FilterLabel(const char* name)
-{
-    return
-        (strcmp(name, "SCREEN_STRETCH_RECT") == 0) ||
-        (strcmp(name, "STRETCHRECT_EMU") == 0) ||
-        (strcmp(name, "STENCIL_VOLUME") == 0) ||
-        (strcmp(name, "DRAWSTRINGW") == 0);    // FIXME: Label stack error in DRAWSTRINGW
-}
-
-
-void CRenderPipelineProfiler::BeginSection(const char* name, [[maybe_unused]] uint32 eProfileLabelFlags)
-{
-    RPPSectionsFrame& sectionsFrame = m_sectionsFrames[m_sectionsFrameIdx];
-
-    if (sectionsFrame.m_numSections >= RPPSectionsFrame::MaxNumSections)
-    {
-        m_recordData = false;
-    }
-
-    if (!m_recordData || FilterLabel(name))
-    {
-        return;
-    }
-
-    RPProfilerSection& section = sectionsFrame.m_sections[sectionsFrame.m_numSections++];
-
-    cry_strcpy(section.name, name);
-
-    section.recLevel = m_stack.size() + 1;
-    section.numDIPs = gcpRendD3D->GetCurrentNumberOfDrawCalls();
-    section.numPolys = gcpRendD3D->GetPolyCount();
-    section.startTimeCPU = gEnv->pTimer->GetAsyncTime();
-    section.gpuTimer.Start(name);
-
-    m_stack.push_back(sectionsFrame.m_numSections - 1);
-
-    string path = "";
-    for (int i = 0; i < m_stack.size(); i++)
-    {
-        path += "\\";
-        path += sectionsFrame.m_sections[m_stack[i]].name;
-    }
-    section.path = CCryNameTSCRC(path);
-}
-
-
-void CRenderPipelineProfiler::EndSection(const char* name)
-{
-    if (!m_recordData || FilterLabel(name))
-    {
-        return;
-    }
-
-    if (!m_stack.empty())
-    {
-        RPPSectionsFrame& sectionsFrame = m_sectionsFrames[m_sectionsFrameIdx];
-        RPProfilerSection& section = sectionsFrame.m_sections[m_stack.back()];
-
-        section.numDIPs = gcpRendD3D->GetCurrentNumberOfDrawCalls() - section.numDIPs;
-        section.numPolys = gcpRendD3D->GetPolyCount() - section.numPolys;
-        section.endTimeCPU = gEnv->pTimer->GetAsyncTime();
-        section.gpuTimer.Stop();
-        if (strncmp(section.name, name, 30) != 0)
-        {
-            section.recLevel = -section.recLevel;
-        }
-
-        m_stack.pop_back();
-    }
-}
-
-
-void CRenderPipelineProfiler::UpdateThreadTimings()
-{
-    const float weight = 8.0f / 9.0f;
-    const uint32 fillThreadID = (uint32)gcpRendD3D->m_RP.m_nFillThreadID;
-
-    m_threadTimings.waitForMain = (gcpRendD3D->m_fTimeWaitForMain[fillThreadID] * (1.0f - weight) + m_threadTimings.waitForMain * weight);
-    m_threadTimings.waitForRender = (gcpRendD3D->m_fTimeWaitForRender[fillThreadID] * (1.0f - weight) + m_threadTimings.waitForRender * weight);
-    m_threadTimings.waitForGPU = (gcpRendD3D->m_fTimeWaitForGPU[fillThreadID] * (1.0f - weight) + m_threadTimings.waitForGPU * weight);
-    m_threadTimings.gpuIdlePerc = (gcpRendD3D->m_fTimeGPUIdlePercent[fillThreadID] * (1.0f - weight) + m_threadTimings.gpuIdlePerc * weight);
-    m_threadTimings.gpuFrameTime = (gcpRendD3D->m_fTimeProcessedGPU[fillThreadID] * (1.0f - weight) + m_threadTimings.gpuFrameTime * weight);
-    m_threadTimings.frameTime = (iTimer->GetRealFrameTime() * (1.0f - weight) + m_threadTimings.frameTime * weight);
-    m_threadTimings.renderTime = min((gcpRendD3D->m_fTimeProcessedRT[fillThreadID] * (1.0f - weight) + m_threadTimings.renderTime * weight), m_threadTimings.frameTime);
-}
-
-
-ILINE void AddToStats(RPProfilerStats& outStats, RPProfilerSection& section)
-{
-    outStats.gpuTime += section.gpuTimer.GetTime();
-    outStats.cpuTime += section.endTimeCPU.GetDifferenceInSeconds(section.startTimeCPU) * 1000.0f;
-    outStats.numDIPs += section.numDIPs;
-    outStats.numPolys += section.numPolys;
-}
-
-ILINE void SubtractFromStats(RPProfilerStats& outStats, RPProfilerSection& section)
-{
-    outStats.gpuTime -= section.gpuTimer.GetTime();
-    outStats.cpuTime -= section.endTimeCPU.GetDifferenceInSeconds(section.startTimeCPU) * 1000.0f;
-    outStats.numDIPs -= section.numDIPs;
-    outStats.numPolys -= section.numPolys;
-}
-
-
-
-void CRenderPipelineProfiler::ResetBasicStats(RPProfilerStats* pBasicStats, bool bResetAveragedStats)
-{
-    for (uint32 i = 0; i < RPPSTATS_NUM; ++i)
-    {
-        RPProfilerStats& basicStat = pBasicStats[i];
-        basicStat.gpuTime = 0.0f;
-        basicStat.cpuTime = 0.0f;
-        basicStat.numDIPs = 0;
-        basicStat.numPolys = 0;
-    }
-
-    if (bResetAveragedStats)
-    {
-        for (uint32 i = 0; i < RPPSTATS_NUM; ++i)
-        {
-            RPProfilerStats& basicStat = pBasicStats[i];
-            basicStat.gpuTimeSmoothed = 0.0f;
-            basicStat.gpuTimeMax = 0.0f;
-            basicStat._gpuTimeMaxNew = 0.0f;
-        }
-    }
-}
-
-void CRenderPipelineProfiler::ComputeAverageStats()
-{
-    static int s_frameCounter = 0;
-    const int kUpdateFrequency = 60;
-
-    const uint32 processThreadID = (uint32)gcpRendD3D->m_RP.m_nProcessThreadID;
-    const uint32 fillThreadID = (uint32)gcpRendD3D->m_RP.m_nFillThreadID;
-
-    // GPU times
-    for (uint32 i = 0; i < RPPSTATS_NUM; ++i)
-    {
-        RPProfilerStats& basicStat = m_basicStats[processThreadID][i];
-        basicStat.gpuTimeSmoothed = 0.9f * m_basicStats[fillThreadID][i].gpuTimeSmoothed + 0.1f * basicStat.gpuTime;
-        float gpuTimeMax = std::max(basicStat._gpuTimeMaxNew, m_basicStats[fillThreadID][i]._gpuTimeMaxNew);
-        basicStat._gpuTimeMaxNew = std::max(gpuTimeMax, basicStat.gpuTime);
-
-        if (s_frameCounter % kUpdateFrequency == 0)
-        {
-            basicStat.gpuTimeMax = basicStat._gpuTimeMaxNew;
-            basicStat._gpuTimeMaxNew = 0;
-        }
-    }
-
-    s_frameCounter += 1;
-}
-
-void CRenderPipelineProfiler::UpdateBasicStats()
-{
-    RPProfilerStats* pBasicStats = m_basicStats[gcpRendD3D->m_RP.m_nProcessThreadID];
-
-    ResetBasicStats(pBasicStats, false);
-
-    bool bRecursivePass = false;
-    RPPSectionsFrame& sectionsFrame = m_sectionsFrames[m_sectionsFrameIdx];
-
-    for (uint32 i = 0; i < sectionsFrame.m_numSections; ++i)
-    {
-        RPProfilerSection& section = sectionsFrame.m_sections[i];
-
-        section.gpuTimer.UpdateTime();
-
-        if (strcmp(section.name, "SCENE_REC") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_Recursion], section);
-            bRecursivePass = true;
-        }
-        else if (strcmp(section.name, "SCENE") == 0)
-        {
-            bRecursivePass = false;
-        }
-
-        if (bRecursivePass)
-        {
-            continue;
-        }
-
-        // Scene
-        if (strcmp(section.name, "GBUFFER") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_SceneOverall], section);
-        }
-        else if (strcmp(section.name, "DECALS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_SceneDecals], section);
-        }
-        else if (strcmp(section.name, "DEFERRED_DECALS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_SceneOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_SceneDecals], section);
-        }
-        else if (strcmp(section.name, "OPAQUE_PASSES") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_SceneOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_SceneForward], section);
-        }
-        else if (strcmp(section.name, "WATER") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_SceneOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_SceneWater], section);
-        }
-
-        // Shadows
-        else if (strcmp(section.name, "SHADOWMAPS SUN") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_ShadowsOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_ShadowsSun], section);
-        }
-        else if (strcmp(section.name, "CUSTOM MAPS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_ShadowsSunCustom], section);
-        }
-        else if (strcmp(section.name, "SHADOWMAP_POOL") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_ShadowsOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_ShadowsLocal], section);
-        }
-
-
-        // Lighting
-        else if (strcmp(section.name, "TILED_SHADING") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_LightingOverall], section);
-        }
-        else if (strcmp(section.name, "DEFERRED_SHADING") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_LightingOverall], section);
-        }
-        else if (strcmp(section.name, "DEFERRED_CUBEMAPS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_LightingOverall], section);
-        }
-        else if (strcmp(section.name, "DEFERRED_LIGHTS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_LightingOverall], section);
-        }
-        else if (strcmp(section.name, "AMBIENT_PASS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_LightingOverall], section);
-        }
-        else if (strcmp(section.name, "SVOGI") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_LightingOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_LightingGI], section);
-        }
-
-        // VFX
-        else if (strcmp(section.name, "TRANSPARENT_BW") == 0 || strcmp(section.name, "TRANSPARENT_AW") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_VfxOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_VfxTransparent], section);
-        }
-        else if (strcmp(section.name, "FOG_GLOBAL") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_VfxOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_VfxFog], section);
-        }
-        else if (strcmp(section.name, "VOLUMETRIC FOG") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_VfxOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_VfxFog], section);
-        }
-        else if (strcmp(section.name, "DEFERRED_RAIN") == 0 || strcmp(section.name, "RAIN") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_VfxOverall], section);
-        }
-        else if (strcmp(section.name, "LENS_OPTICS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_VfxOverall], section);
-            AddToStats(pBasicStats[eRPPSTATS_VfxFlares], section);
-        }
-        else if (strcmp(section.name, "OCEAN CAUSTICS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_VfxOverall], section);
-        }
-        else if (strcmp(section.name, "WATERVOLUME_CAUSTICS") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_VfxOverall], section);
-        }
-
-        // Extra TI states
-        else if (strcmp(section.name, "TI_INJECT_CLEAR") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_INJECT_CLEAR], section);
-        }
-        else if (strcmp(section.name, "TI_VOXELIZE") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_VOXELIZE], section);
-        }
-        else if (strcmp(section.name, "TI_INJECT_LIGHT") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_INJECT_LIGHT], section);
-        }
-        else if (strcmp(section.name, "TI_INJECT_AIR") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_INJECT_AIR], section);
-        }
-        else if (strcmp(section.name, "TI_INJECT_REFL0") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_INJECT_REFL0], section);
-        }
-        else if (strcmp(section.name, "TI_INJECT_REFL1") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_INJECT_REFL1], section);
-        }
-        else if (strcmp(section.name, "TI_INJECT_DYNL") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_INJECT_DYNL], section);
-        }
-        else if (strcmp(section.name, "TI_NID_DIFF") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_NID_DIFF], section);
-        }
-        else if (strcmp(section.name, "TI_GEN_DIFF") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_GEN_DIFF], section);
-        }
-        else if (strcmp(section.name, "TI_GEN_SPEC") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_GEN_SPEC], section);
-        }
-        else if (strcmp(section.name, "TI_GEN_AIR") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_GEN_AIR], section);
-        }
-        else if (strcmp(section.name, "TI_UPSCALE_DIFF") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_UPSCALE_DIFF], section);
-        }
-        else if (strcmp(section.name, "TI_UPSCALE_SPEC") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_UPSCALE_SPEC], section);
-        }
-        else if (strcmp(section.name, "TI_DEMOSAIC_DIFF") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_DEMOSAIC_DIFF], section);
-        }
-        else if (strcmp(section.name, "TI_DEMOSAIC_SPEC") == 0)
-        {
-            AddToStats(pBasicStats[eRPPSTATS_TI_DEMOSAIC_SPEC], section);
-        }
-    }
-
-    AddToStats(pBasicStats[eRPPSTATS_OverallFrame], sectionsFrame.m_sections[0]);
-
-    ComputeAverageStats();
-}
-
-void CRenderPipelineProfiler::DisplayAdvancedStats()
-{
-#ifndef _RELEASE
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    RPPSectionsFrame& sectionsFrame = m_sectionsFrames[m_sectionsFrameIdx];
-    uint32 elemsPerColumn = (gcpRendD3D->GetHeight() - 60) / 16;
-
-    ColorF color = sectionsFrame.m_numSections >= RPPSectionsFrame::MaxNumSections ? Col_Red : ColorF(1.0f, 1.0f, 0.2f, 1);
-    m_avgFrameTime = 0.8f * gEnv->pTimer->GetRealFrameTime() + 0.2f * m_avgFrameTime; // exponential moving average for frame time
-
-    rd->Draw2dLabel(20, 10, 1.7f, &color.r, false, "FPS %.1f  GPU Sync %.1fms", 1.0f / m_avgFrameTime, m_gpuSyncTime);
-    color.r = color.g = color.b = 0.35f;
-    rd->Draw2dLabel(320, 10, 1.5f, &color.r, false, "GPU");
-    rd->Draw2dLabel(400, 10, 1.5f, &color.r, false, "CPU");
-    rd->Draw2dLabel(470, 10, 1.5f, &color.r, false, "DIPs");
-    rd->Draw2dLabel(520, 10, 1.5f, &color.r, false, "Polys");
-
-    if (sectionsFrame.m_numSections > elemsPerColumn)
-    {
-        rd->Draw2dLabel(320 + 600, 10, 1.5f, &color.r, false, "GPU");
-        rd->Draw2dLabel(400 + 600, 10, 1.5f, &color.r, false, "CPU");
-        rd->Draw2dLabel(470 + 600, 10, 1.5f, &color.r, false, "DIPs");
-        rd->Draw2dLabel(520 + 600, 10, 1.5f, &color.r, false, "Polys");
-    }
-
-    // refresh the list every 3 seconds to clear out old data and reduce gaps
-    CTimeValue currentTime = gEnv->pTimer->GetAsyncTime();
-    static CTimeValue lastClearTime = currentTime;
-
-    if (currentTime.GetDifferenceInSeconds(lastClearTime) > 3.0f)
-    {
-        lastClearTime = currentTime;
-        m_staticNameList.clear();
-    }
-
-    // reset the used flag
-    for (std::multimap<CCryNameTSCRC, SStaticElementInfo>::iterator it = m_staticNameList.begin(); it != m_staticNameList.end(); ++it)
-    {
-        it->second.bUsed = false;
-    }
-
-    static float gpuTimeAverage[2] = { 10, 10 };
-    gpuTimeAverage[1] = gpuTimeAverage[0];
-
-    for (uint32 i = 0; i < sectionsFrame.m_numSections; ++i)
-    {
-        RPProfilerSection& section = sectionsFrame.m_sections[i];
-
-        // find the slot we should render to according to the static list - if not found, insert
-        std::multimap<CCryNameTSCRC, SStaticElementInfo>::iterator it = m_staticNameList.lower_bound(section.path);
-        while (it != m_staticNameList.end() && it->second.bUsed)
-        {
-            ++it;
-        }
-
-        // not found: either a new element or a duplicate - insert at correct position and render there
-        if (it == m_staticNameList.end() || it->first != section.path)
-        {
-            it = m_staticNameList.insert(std::make_pair(section.path, i));
-        }
-
-        it->second.bUsed = true;
-
-        float gpuTime = section.gpuTimer.GetTime();
-        float cpuTime = section.endTimeCPU.GetDifferenceInSeconds(section.startTimeCPU);
-        float ypos = 30.0f + (it->second.nPos % elemsPerColumn) * 16.0f;
-        float xpos = 20.0f + ((int)(it->second.nPos / elemsPerColumn)) * 600.0f;
-        color.r = color.g = color.b = min(0.4f + gpuTime * 0.4f, 0.9f);
-
-        if (section.recLevel < 0)   // Label stack error
-        {
-            color.r = 1;
-            color.g = color.b = 0;
-        }
-        else if (i == 0)   // Special case for FRAME section
-        {
-            color.r = 1;
-            color.g = 1;
-            color.b = 0.2f;
-        }
-        else if (max(gpuTime, cpuTime) > gpuTimeAverage[1] * 0.75f)
-        {
-            color.r = color.g = color.b = 1; // highlight heavy elements
-        }
-        rd->Draw2dLabel(xpos + max((int)(abs(section.recLevel) - 2), 0) * 15.0f, ypos, 1.5f, &color.r, false, section.name);
-        rd->Draw2dLabel(xpos + 300, ypos, 1.5f, &color.r, false, "%.2fms", gpuTime);
-        rd->Draw2dLabel(xpos + 380, ypos, 1.5f, &color.r, false, "%.2fms", cpuTime * 1000.0f);
-        rd->Draw2dLabel(xpos + 450, ypos, 1.5f, &color.r, false, "%i", section.numDIPs);
-        rd->Draw2dLabel(xpos + 500, ypos, 1.5f, &color.r, false, "%i", section.numPolys);
-
-        if (i != 0)
-        {
-            gpuTimeAverage[0] += (max(gpuTime, cpuTime) - gpuTimeAverage[0]) * 0.05f;
-        }
-    }
-
-    rd->RT_RenderTextMessages();
-#endif
-}
-
-
-namespace DebugUI
-{
-    const float columnHeight = 0.027f;
-
-    void DrawText(float x, float y, float size, ColorF color, const char* text)
-    {
-        CD3D9Renderer* rd = gcpRendD3D;
-        float aspect = (float)rd->GetOverlayWidth() / (float)rd->GetOverlayHeight();
-        float sx = VIRTUAL_SCREEN_WIDTH / aspect;
-        float sy = VIRTUAL_SCREEN_HEIGHT;
-
-        SDrawTextInfo ti;
-        ti.xscale = size * 1.55f / aspect;
-        ti.yscale = size * 1.1f;
-        ti.color[0] = color.r;
-        ti.color[1] = color.r;
-        ti.color[2] = color.b;
-        ti.color[3] = color.a;
-        ti.flags = eDrawText_800x600 | eDrawText_2D;
-        rd->Draw2dText(x * sx, y * sy, text, ti);
-    }
-
-    void DrawText(float x, float y, float size, ColorF color, const char* format, va_list args)
-    {
-        char buffer[512];
-        if (azvsnprintf(buffer, sizeof(buffer), format, args) == -1)
-        {
-            buffer[sizeof(buffer) - 1] = 0;
-        }
-
-        DrawText(x, y, size, color, buffer);
-    }
-
-    void DrawBox(float x, float y, float width, float height, ColorF color)
-    {
-        //s_ptexWhite is not supposed to be nullptr here
-        //This can happen if the profiler is asked to draw before the level loads
-        AZ_Assert(CTextureManager::Instance()->GetWhiteTexture() != nullptr, "Pipeline Profiler tried to draw a box but White textue was nullptr! Have the default texture resources been loaded yet?");
-
-        CD3D9Renderer* rd = gcpRendD3D;
-        float aspect = (float)rd->GetOverlayWidth() / (float)rd->GetOverlayHeight();
-        float sx = VIRTUAL_SCREEN_WIDTH / aspect;
-        float sy = VIRTUAL_SCREEN_HEIGHT;
-        const Vec2 overscanOffset = Vec2(rd->s_overscanBorders.x * VIRTUAL_SCREEN_WIDTH, rd->s_overscanBorders.y * VIRTUAL_SCREEN_HEIGHT);
-        rd->Draw2dImage(x * sx + overscanOffset.x, y * sy + overscanOffset.y, width * sx, height * sy, CTextureManager::Instance()->GetWhiteTexture()->GetID(), 0, 0, 1, 1, 0, color);
-    }
-
-
-    void DrawTable(float x, float y, float width, int numColumns, const char* title)
-    {
-        DrawBox(x, y, width, columnHeight, ColorF(0.45f, 0.45f, 0.55f, 0.6f));
-        DrawBox(x, y + columnHeight, width, columnHeight * (float)numColumns + 0.007f, ColorF(0.05f, 0.05f, 0.05f, 0.6f));
-        DrawText(x + 0.006f, y + 0.004f, 1, Col_Salmon, title);
-    }
-
-    void DrawTableColumn(float tableX, float tableY, int columnIndex, const char* columnText, ...)
-    {
-        va_list args;
-        va_start(args, columnText);
-        DrawText(tableX + 0.02f, tableY + (float)(columnIndex + 1) * columnHeight + 0.005f, 1, Col_White, columnText, args);
-        va_end(args);
-    }
-
-    void DrawTableBar(float x, float tableY, int columnIndex, float percentage, ColorF color)
-    {
-        const float barHeight = 0.02f;
-        const float barWidth = 0.15f;
-
-        DrawBox(x, tableY + (float)(columnIndex + 1) * columnHeight + (columnHeight - barHeight) * 0.5f + 0.005f,
-            barWidth, barHeight, ColorF(1, 1, 1, 0.2f));
-
-        DrawBox(x, tableY + (float)(columnIndex + 1) * columnHeight + (columnHeight - barHeight) * 0.5f + 0.005f,
-            percentage * barWidth, barHeight, ColorF(color.r, color.g, color.b, 0.7f));
-    }
-}
-
-
-void CRenderPipelineProfiler::DisplayBasicStats()
-{
-#ifndef _RELEASE
-    if (gEnv->pConsole->IsOpened())
-    {
-        return;
-    }
-
-    CD3D9Renderer* rd = gcpRendD3D;
-
-    struct StatsGroup
-    {
-        char                          name[32];
-        ERenderPipelineProfilerStats  statIndex;
-    };
-
-    StatsGroup statsGroups[] = {
-        { "Frame", eRPPSTATS_OverallFrame },
-        { "  Ocean Reflections", eRPPSTATS_Recursion },
-        { "  Scene", eRPPSTATS_SceneOverall },
-        { "    Decals", eRPPSTATS_SceneDecals },
-        { "    Forward", eRPPSTATS_SceneForward },
-        { "    Water", eRPPSTATS_SceneWater },
-        { "  Shadows", eRPPSTATS_ShadowsOverall },
-        { "    Sun", eRPPSTATS_ShadowsSun },
-        { "    Per-Object", eRPPSTATS_ShadowsSunCustom },
-        { "    Local", eRPPSTATS_ShadowsLocal },
-        { "  Lighting", eRPPSTATS_LightingOverall },
-        { "    Voxel GI", eRPPSTATS_LightingGI },
-        { "  VFX", eRPPSTATS_VfxOverall },
-        { "    Particles/Glass", eRPPSTATS_VfxTransparent },
-        { "    Fog", eRPPSTATS_VfxFog },
-        { "    Flares", eRPPSTATS_VfxFlares },
-    };
-
-    rd->SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-
-    // Threading info
-    {
-        DebugUI::DrawTable(0.05f, 0.1f, 0.45f, 4, "Overview");
-
-        float frameTime = m_threadTimings.frameTime;
-        float mainThreadTime = max(m_threadTimings.frameTime - m_threadTimings.waitForRender, 0.0f);
-        float renderThreadTime = max(m_threadTimings.renderTime - m_threadTimings.waitForGPU, 0.0f);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(PipelineProfiler_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        float gpuTime = max(m_threadTimings.gpuFrameTime, 0.0f);
-#endif
-        float waitForGPU = max(m_threadTimings.waitForGPU, 0.0f);
-
-        DebugUI::DrawTableBar(0.335f, 0.1f, 0, mainThreadTime / frameTime, Col_Yellow);
-        DebugUI::DrawTableBar(0.335f, 0.1f, 1, renderThreadTime / frameTime, Col_Green);
-        DebugUI::DrawTableBar(0.335f, 0.1f, 2, gpuTime / frameTime, Col_Cyan);
-        DebugUI::DrawTableBar(0.335f, 0.1f, 3, waitForGPU / frameTime, Col_Red);
-
-        DebugUI::DrawTableColumn(0.05f, 0.1f, 0, "Main Thread             %6.2f ms", mainThreadTime * 1000.0f);
-        DebugUI::DrawTableColumn(0.05f, 0.1f, 1, "Render Thread           %6.2f ms", renderThreadTime * 1000.0f);
-        DebugUI::DrawTableColumn(0.05f, 0.1f, 2, "GPU                     %6.2f ms", gpuTime * 1000.0f);
-        DebugUI::DrawTableColumn(0.05f, 0.1f, 3, "CPU waits for GPU       %6.2f ms", waitForGPU * 1000.0f);
-    }
-
-    // GPU times
-    {
-        const float targetFrameTime = 1000.0f / CRenderer::CV_r_profilerTargetFPS;
-
-        int numColumns = sizeof(statsGroups) / sizeof(StatsGroup);
-        DebugUI::DrawTable(0.05f, 0.27f, 0.45f, numColumns, "GPU Time");
-
-        RPProfilerStats* pBasicStats = m_basicStats[gcpRendD3D->m_RP.m_nProcessThreadID];
-        for (uint32 i = 0; i < numColumns; ++i)
-        {
-            const RPProfilerStats& stats = pBasicStats[statsGroups[i].statIndex];
-            DebugUI::DrawTableColumn(0.05f, 0.27f, i, "%-20s  %4.1f ms  %2.0f %%", statsGroups[i].name, stats.gpuTimeSmoothed, stats.gpuTimeSmoothed / targetFrameTime * 100.0f);
-        }
-    }
-
-    rd->RT_RenderTextMessages();
-#endif
-}
-
-bool CRenderPipelineProfiler::IsEnabled()
-{
-    return m_enabled || CRenderer::CV_r_profiler;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PipelineProfiler.h b/Code/CryEngine/RenderDll/XRenderD3D9/PipelineProfiler.h
deleted file mode 100644
index fdcb1780a7..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PipelineProfiler.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_PIPELINEPROFILER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_PIPELINEPROFILER_H
-#pragma once
-
-#include "GPUTimer.h"
-
-
-struct SStaticElementInfo
-{
-    SStaticElementInfo(uint _nPos)
-        : nPos(_nPos)
-        , bUsed(false) {}
-    uint nPos;
-    bool bUsed;
-};
-
-struct RPProfilerSection
-{
-    char             name[31];
-    CCryNameTSCRC    path;
-    int8             recLevel;  // Negative value means error in stack
-    uint32           numDIPs, numPolys;
-    CTimeValue       startTimeCPU, endTimeCPU;
-    CD3DProfilingGPUTimer  gpuTimer;
-};
-
-struct RPPSectionsFrame
-{
-    RPPSectionsFrame()
-        : m_numSections(0) {}
-
-    static const uint32 MaxNumSections = 256;
-    RPProfilerSection   m_sections[MaxNumSections];
-    uint32              m_numSections;
-};
-
-struct RPThreadTimings
-{
-    float waitForMain;
-    float waitForRender;
-    float waitForGPU;
-    float gpuIdlePerc;
-    float gpuFrameTime;
-    float frameTime;
-    float renderTime;
-
-    RPThreadTimings()
-        : waitForMain(0)
-        , waitForRender(0)
-        , waitForGPU(0)
-        , gpuIdlePerc(0)
-        , gpuFrameTime(33.0f)
-        , frameTime(33.0f)
-        , renderTime(0)
-    {
-    }
-};
-
-class CRenderPipelineProfiler
-{
-public:
-    CRenderPipelineProfiler();
-
-    void BeginFrame();
-    void EndFrame();
-    void BeginSection(const char* name, uint32 eProfileLabelFlags = 0);
-    void EndSection(const char* name);
-
-    bool IsEnabled();
-    void SetEnabled(bool enabled) { m_enabled = enabled; }
-    void SetWaitForGPUTimers(bool wait) { m_waitForGPUTimers = wait; }
-
-    const RPProfilerStats& GetBasicStats(ERenderPipelineProfilerStats stat, int nThreadID) { assert((uint32)stat < RPPSTATS_NUM); return m_basicStats[nThreadID][stat]; }
-    const RPProfilerStats* GetBasicStatsArray(int nThreadID) { return m_basicStats[nThreadID]; }
-
-    void ReleaseGPUTimers();
-
-protected:
-    bool FilterLabel(const char* name);
-    void UpdateThreadTimings();
-    void ResetBasicStats(RPProfilerStats* pBasicStats, bool bResetAveragedStats);
-    void ComputeAverageStats();
-    void UpdateBasicStats();
-
-    void DisplayAdvancedStats();
-    void DisplayBasicStats();
-
-    bool WaitForTimers() { return m_waitForGPUTimers; }
-
-protected:
-#if OPENGL
-    static const uint32 NumSectionsFrames = 4;
-#else
-    static const uint32 NumSectionsFrames = 2;
-#endif
-
-    std::vector< uint32 >    m_stack;
-    RPPSectionsFrame         m_sectionsFrames[NumSectionsFrames];
-    uint32                   m_sectionsFrameIdx;
-    float                    m_gpuSyncTime;
-    float                    m_avgFrameTime;
-    bool                     m_enabled;
-    bool                     m_recordData;
-    bool                     m_waitForGPUTimers;
-
-    RPProfilerStats          m_basicStats[RT_COMMAND_BUF_COUNT][RPPSTATS_NUM];
-    RPThreadTimings          m_threadTimings;
-
-    // we take a snapshot every now and then and store it in here to prevent the text from jumping too much
-    std::multimap<CCryNameTSCRC, SStaticElementInfo> m_staticNameList;
-};
-
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_PIPELINEPROFILER_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/CryRender_traits_android.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/CryRender_traits_android.cmake
deleted file mode 100644
index 781de4f5d5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/CryRender_traits_android.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_DX11_SUPPORTED FALSE)
-set(CRYRENDER_TRAIT_BUILD_DX12_SUPPORTED FALSE)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/core_renderer_android.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/core_renderer_android.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/core_renderer_android.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/core_renderer_headers_android.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/core_renderer_headers_android.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Android/core_renderer_headers_android.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/CryRender_traits_linux.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/CryRender_traits_linux.cmake
deleted file mode 100644
index 781de4f5d5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/CryRender_traits_linux.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_DX11_SUPPORTED FALSE)
-set(CRYRENDER_TRAIT_BUILD_DX12_SUPPORTED FALSE)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/core_renderer_headers_linux.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/core_renderer_headers_linux.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/core_renderer_headers_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/core_renderer_linux.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/core_renderer_linux.cmake
deleted file mode 100644
index 1682dfa3f9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Linux/core_renderer_linux.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PUBLIC
-        3rdParty::squish-ccr
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/CryRender_traits_mac.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/CryRender_traits_mac.cmake
deleted file mode 100644
index 781de4f5d5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/CryRender_traits_mac.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_DX11_SUPPORTED FALSE)
-set(CRYRENDER_TRAIT_BUILD_DX12_SUPPORTED FALSE)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/core_renderer_headers_mac.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/core_renderer_headers_mac.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/core_renderer_headers_mac.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/core_renderer_mac.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/core_renderer_mac.cmake
deleted file mode 100644
index 1682dfa3f9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Mac/core_renderer_mac.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PUBLIC
-        3rdParty::squish-ccr
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/CryRender_traits_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/CryRender_traits_windows.cmake
deleted file mode 100644
index d8ac9e52b9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/CryRender_traits_windows.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-find_file(d3d12_header
-    d3d12.h
-    PATHS
-        "$ENV{ProgramFiles\(x86\)}\\Windows Kits\\10\\Include\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\um"
-)
-mark_as_advanced(d3d12_header)
-if(NOT d3d12_header)
-    message(FATAL_ERROR "Direct3D 12 header was not found in $ENV{ProgramFiles\(x86\)}\\Windows Kits\\10\\Include\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\um")
-endif()
-
-set(CRYRENDER_TRAIT_BUILD_DX11_SUPPORTED TRUE)
-set(CRYRENDER_TRAIT_BUILD_DX12_SUPPORTED TRUE)
-
-# win2012 nodes can build DX11/DX12, but can't run. Disable runtime support if d3d12.dll/d3d11.dll is not available
-set(CRYRENDER_TRAIT_RUNTIME_DX12_SUPPORTED FALSE)
-find_file(d3d12_dll
-    d3d12.dll
-    PATHS
-        "$ENV{SystemRoot}\\System32"
-)
-mark_as_advanced(d3d12_dll)
-if(d3d12_dll)
-    set(CRYRENDER_TRAIT_RUNTIME_DX12_SUPPORTED TRUE)
-endif()
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_headers_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_headers_windows.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_headers_windows.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_windows.cmake
deleted file mode 100644
index 0b18297911..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_windows.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_DEFINITIONS
-    PUBLIC
-        DO_RENDERLOG
-)
-set(LY_BUILD_DEPENDENCIES
-    PUBLIC
-        d3dcompiler
-        dxguid
-        3rdParty::squish-ccr
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_windows_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_windows_files.cmake
deleted file mode 100644
index 2273548ad9..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/core_renderer_windows_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../../D3DMeshBaker.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d11_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d11_windows.cmake
deleted file mode 100644
index f751cd594b..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d11_windows.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        d3d11
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d11_windows_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d11_windows_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d11_windows_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d12_windows.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d12_windows.cmake
deleted file mode 100644
index bbe5978122..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d12_windows.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PUBLIC
-        d3d12
-        dxgi
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d12_windows_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d12_windows_files.cmake
deleted file mode 100644
index 5cfff9b3ae..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/Windows/d3d12_windows_files.cmake
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../../DX12/CCryDX12Object.cpp
-    ../../DX12/CCryDX12Object.hpp
-    ../../DX12/CryDX12.cpp
-    ../../DX12/CryDX12.hpp
-    ../../DX12/CryDX12Guid.hpp
-    ../../DX12/CryDX12Legacy.hpp
-    ../../DX12/API/DX12Base.cpp
-    ../../DX12/API/DX12CommandList.cpp
-    ../../DX12/API/DX12CommandListFence.cpp
-    ../../DX12/API/DX12DescriptorHeap.cpp
-    ../../DX12/API/DX12QueryHeap.cpp
-    ../../DX12/API/DX12Device.cpp
-    ../../DX12/API/DX12PSO.cpp
-    ../../DX12/API/DX12Resource.cpp
-    ../../DX12/API/DX12ResourceBarrierCache.cpp
-    ../../DX12/API/DX12RootSignature.cpp
-    ../../DX12/API/DX12Shader.cpp
-    ../../DX12/API/DX12View.cpp
-    ../../DX12/API/DX12SamplerState.cpp
-    ../../DX12/API/DX12TimerHeap.cpp
-    ../../DX12/API/DX12SwapChain.cpp
-    ../../DX12/API/DX12Base.hpp
-    ../../DX12/API/DX12CommandList.hpp
-    ../../DX12/API/DX12CommandListFence.hpp
-    ../../DX12/API/DX12DescriptorHeap.hpp
-    ../../DX12/API/DX12QueryHeap.hpp
-    ../../DX12/API/DX12Device.hpp
-    ../../DX12/API/DX12PSO.hpp
-    ../../DX12/API/DX12Resource.hpp
-    ../../DX12/API/DX12ResourceBarrierCache.h
-    ../../DX12/API/DX12RootSignature.hpp
-    ../../DX12/API/DX12Shader.hpp
-    ../../DX12/API/DX12View.hpp
-    ../../DX12/API/DX12SamplerState.hpp
-    ../../DX12/API/DX12SwapChain.hpp
-    ../../DX12/API/DX12TimerHeap.h
-    ../../DX12/API/DX12AsyncCommandQueue.hpp
-    ../../DX12/API/DX12AsyncCommandQueue.cpp
-    ../../DX12/Device/CCryDX12Device.cpp
-    ../../DX12/Device/CCryDX12DeviceChild.cpp
-    ../../DX12/Device/CCryDX12DeviceContext.cpp
-    ../../DX12/Device/CCryDX12Device.hpp
-    ../../DX12/Device/CCryDX12DeviceChild.hpp
-    ../../DX12/Device/CCryDX12DeviceContext.hpp
-    ../../DX12/GI/CCryDX12GIFactory.cpp
-    ../../DX12/GI/CCryDX12SwapChain.cpp
-    ../../DX12/GI/CCryDX12GIFactory.hpp
-    ../../DX12/GI/CCryDX12SwapChain.hpp
-    ../../DX12/Misc/SCryDX11PipelineState.cpp
-    ../../DX12/Misc/SCryDX11PipelineState.hpp
-    ../../DX12/Resource/CCryDX12Asynchronous.cpp
-    ../../DX12/Resource/CCryDX12Resource.cpp
-    ../../DX12/Resource/CCryDX12View.cpp
-    ../../DX12/Resource/CCryDX12Asynchronous.hpp
-    ../../DX12/Resource/CCryDX12Resource.hpp
-    ../../DX12/Resource/CCryDX12View.hpp
-    ../../DX12/Resource/Misc/CCryDX12Buffer.cpp
-    ../../DX12/Resource/Misc/CCryDX12InputLayout.cpp
-    ../../DX12/Resource/Misc/CCryDX12Query.cpp
-    ../../DX12/Resource/Misc/CCryDX12Shader.cpp
-    ../../DX12/Resource/Misc/CCryDX12Buffer.hpp
-    ../../DX12/Resource/Misc/CCryDX12InputLayout.hpp
-    ../../DX12/Resource/Misc/CCryDX12Query.hpp
-    ../../DX12/Resource/Misc/CCryDX12Shader.hpp
-    ../../DX12/Resource/State/CCryDX12BlendState.cpp
-    ../../DX12/Resource/State/CCryDX12DepthStencilState.cpp
-    ../../DX12/Resource/State/CCryDX12RasterizerState.cpp
-    ../../DX12/Resource/State/CCryDX12SamplerState.cpp
-    ../../DX12/Resource/State/CCryDX12BlendState.hpp
-    ../../DX12/Resource/State/CCryDX12DepthStencilState.hpp
-    ../../DX12/Resource/State/CCryDX12RasterizerState.hpp
-    ../../DX12/Resource/State/CCryDX12SamplerState.hpp
-    ../../DX12/Resource/Texture/CCryDX12Texture1D.cpp
-    ../../DX12/Resource/Texture/CCryDX12Texture2D.cpp
-    ../../DX12/Resource/Texture/CCryDX12Texture3D.cpp
-    ../../DX12/Resource/Texture/CCryDX12TextureBase.cpp
-    ../../DX12/Resource/Texture/CCryDX12Texture1D.hpp
-    ../../DX12/Resource/Texture/CCryDX12Texture2D.hpp
-    ../../DX12/Resource/Texture/CCryDX12Texture3D.hpp
-    ../../DX12/Resource/Texture/CCryDX12TextureBase.hpp
-    ../../DX12/Resource/View/CCryDX12DepthStencilView.cpp
-    ../../DX12/Resource/View/CCryDX12RenderTargetView.cpp
-    ../../DX12/Resource/View/CCryDX12ShaderResourceView.cpp
-    ../../DX12/Resource/View/CCryDX12UnorderedAccessView.cpp
-    ../../DX12/Resource/View/CCryDX12DepthStencilView.hpp
-    ../../DX12/Resource/View/CCryDX12RenderTargetView.hpp
-    ../../DX12/Resource/View/CCryDX12ShaderResourceView.hpp
-    ../../DX12/Resource/View/CCryDX12UnorderedAccessView.hpp
-    ../../DX12/Includes/d3d11tokenizedprogramformat.hpp
-    ../../DX12/Includes/d3dx12.h
-    ../../DX12/Includes/fasthash.inl
-    ../../DX12/Includes/fasthash.h
-    ../../DX12/Includes/concqueue.hpp
-    ../../DX12/Includes/concqueue-mpmc-bounded.hpp
-    ../../DX12/Includes/concqueue-mpsc.hpp
-    ../../DX12/Includes/concqueue-spsc-bounded.hpp
-    ../../DX12/Includes/concqueue-spsc.hpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/CryRender_traits_ios.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/CryRender_traits_ios.cmake
deleted file mode 100644
index 781de4f5d5..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/CryRender_traits_ios.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_DX11_SUPPORTED FALSE)
-set(CRYRENDER_TRAIT_BUILD_DX12_SUPPORTED FALSE)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/core_renderer_headers_ios.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/core_renderer_headers_ios.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/core_renderer_headers_ios.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/core_renderer_ios.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/core_renderer_ios.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/Platform/iOS/core_renderer_ios.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessDOF.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessDOF.cpp
deleted file mode 100644
index 9d7b468d22..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessDOF.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessFilters.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessFilters.cpp
deleted file mode 100644
index d0143361b2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessFilters.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "D3DStereo.h"
-#include "../Common/Textures/TextureManager.h"
-
-void CFilterSharpening::Render()
-{
-    PROFILE_LABEL_SCOPE("SHARPENING");
-
-    const f32 fSharpenAmount = max(m_pAmount->GetParam(), CRenderer::CV_r_Sharpening + 1.0f);
-    if (fSharpenAmount > 1e-6f)
-    {
-        GetUtils().StretchRect(CTexture::s_ptexBackBuffer, CTexture::s_ptexBackBufferScaled[0]);
-    }
-
-    static CCryNameTSCRC pTechName("CA_Sharpening");
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    Vec4 pParams = Vec4(CRenderer::CV_r_ChromaticAberration, 0, 0, fSharpenAmount);
-    static CCryNameR pParamName("psParams");
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParamName, &pParams, 1);
-
-    GetUtils().SetTexture(CTexture::s_ptexBackBuffer, 0, FILTER_POINT);
-    GetUtils().SetTexture(CTexture::s_ptexBackBufferScaled[0], 1);
-    GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-    GetUtils().ShEndPass();
-}
-
-void CFilterBlurring::Render()
-{
-    PROFILE_LABEL_SCOPE("BLURRING");
-
-    float fAmount = m_pAmount->GetParam();
-    fAmount = clamp_tpl<float>(fAmount, 0.0f, 1.0f);
-
-    // maximum blur amount to have nice results
-    const float fMaxBlurAmount = 5.0f;
-
-    GetUtils().StretchRect(CTexture::s_ptexBackBuffer, CTexture::s_ptexBackBufferScaled[0]);
-    GetUtils().TexBlurGaussian(CTexture::s_ptexBackBufferScaled[0], 1, 1.0f, LERP(0.0f, fMaxBlurAmount, fAmount), false, 0, false, CTexture::s_ptexBackBufferScaledTemp[0]);
-
-    static CCryNameTSCRC pTechName("BlurInterpolation");
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    // Set PS default params
-    Vec4 pParams = Vec4(0, 0, 0, fAmount * fAmount);
-    static CCryNameR pParamName("psParams");
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParamName, &pParams, 1);
-
-    GetUtils().SetTexture(CTexture::s_ptexBackBufferScaled[0], 0);
-    GetUtils().SetTexture(CTexture::s_ptexBackBuffer, 1, FILTER_POINT);
-    GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-    GetUtils().ShEndPass();
-}
-
-bool CColorGrading::UpdateParams(SColorGradingMergeParams& pMergeParams)
-{
-    float fSharpenAmount = max(m_pSharpenAmount->GetParam(), 0.0f);
-
-    // add cvar color_grading/color_grading_levels/color_grading_selectivecolor/color_grading_filters
-
-    // Clamp to same Photoshop min/max values
-    float fMinInput = clamp_tpl<float>(m_pMinInput->GetParam(), 0.0f, 255.0f);
-    float fGammaInput = clamp_tpl<float>(m_pGammaInput->GetParam(), 0.0f, 10.0f);
-    float fMaxInput = clamp_tpl<float>(m_pMaxInput->GetParam(), 0.0f, 255.0f);
-    float fMinOutput = clamp_tpl<float>(m_pMinOutput->GetParam(), 0.0f, 255.0f);
-
-    float fMaxOutput = clamp_tpl<float>(m_pMaxOutput->GetParam(), 0.0f, 255.0f);
-
-    float fBrightness = m_pBrightness->GetParam();
-    float fContrast = m_pContrast->GetParam();
-    float fSaturation = m_pSaturation->GetParam() + m_pSaturationOffset->GetParam();
-    Vec4  pFilterColor = m_pPhotoFilterColor->GetParamVec4() + m_pPhotoFilterColorOffset->GetParamVec4();
-    float fFilterColorDensity = clamp_tpl<float>(m_pPhotoFilterColorDensity->GetParam() + m_pPhotoFilterColorDensityOffset->GetParam(), 0.0f, 1.0f);
-    float fGrain = min(m_pGrainAmount->GetParam() + m_pGrainAmountOffset->GetParam(), 1.0f);
-
-    Vec4 pSelectiveColor = m_pSelectiveColor->GetParamVec4();
-    float fSelectiveColorCyans = clamp_tpl<float>(m_pSelectiveColorCyans->GetParam() * 0.01f, -1.0f, 1.0f);
-    float fSelectiveColorMagentas = clamp_tpl<float>(m_pSelectiveColorMagentas->GetParam() * 0.01f, -1.0f, 1.0f);
-    float fSelectiveColorYellows = clamp_tpl<float>(m_pSelectiveColorYellows->GetParam() * 0.01f, -1.0f, 1.0f);
-    float fSelectiveColorBlacks = clamp_tpl<float>(m_pSelectiveColorBlacks->GetParam() * 0.01f, -1.0f, 1.0f);
-
-    // Saturation matrix
-    Matrix44 pSaturationMat;
-    {
-        float y = 0.3086f, u = 0.6094f, v = 0.0820f, s = clamp_tpl<float>(fSaturation, -1.0f, 100.0f);
-
-        float a = (1.0f - s) * y + s;
-        float b = (1.0f - s) * y;
-        float c = (1.0f - s) * y;
-        float d = (1.0f - s) * u;
-        float e = (1.0f - s) * u + s;
-        float f = (1.0f - s) * u;
-        float g = (1.0f - s) * v;
-        float h = (1.0f - s) * v;
-        float i = (1.0f - s) * v + s;
-
-        pSaturationMat.SetIdentity();
-        pSaturationMat.SetRow(0, Vec3(a, d, g));
-        pSaturationMat.SetRow(1, Vec3(b, e, h));
-        pSaturationMat.SetRow(2, Vec3(c, f, i));
-    }
-
-    //  Brightness matrix
-    Matrix44 pBrightMat;
-    fBrightness = clamp_tpl<float>(fBrightness, 0.0f, 100.0f);
-    pBrightMat.SetIdentity();
-    pBrightMat.SetRow(0, Vec3(fBrightness, 0, 0));
-    pBrightMat.SetRow(1, Vec3(0, fBrightness, 0));
-    pBrightMat.SetRow(2, Vec3(0, 0, fBrightness));
-
-    // Create Contrast matrix
-    Matrix44 pContrastMat;
-    {
-        float c = clamp_tpl<float>(fContrast, -1.0f, 100.0f);
-        pContrastMat.SetIdentity();
-        pContrastMat.SetRow(0, Vec3(c, 0, 0));
-        pContrastMat.SetRow(1, Vec3(0, c, 0));
-        pContrastMat.SetRow(2, Vec3(0, 0, c));
-        pContrastMat.SetColumn(3, 0.5f * Vec3(1.0f - c, 1.0f - c, 1.0f - c));
-    }
-
-    // Compose final color matrix and set fragment program constants
-    Matrix44 pColorMat = pSaturationMat * (pBrightMat * pContrastMat);
-
-    Vec4 pParams0 = Vec4(fMinInput, fGammaInput, fMaxInput, fMinOutput);
-    Vec4 pParams1 = Vec4(fMaxOutput, fGrain, cry_random(0, 1023), cry_random(0, 1023));
-    Vec4 pParams2 = Vec4(pFilterColor.x, pFilterColor.y, pFilterColor.z, fFilterColorDensity);
-    Vec4 pParams3 = Vec4(pSelectiveColor.x, pSelectiveColor.y, pSelectiveColor.z, fSharpenAmount + 1.0f);
-    Vec4 pParams4 = Vec4(fSelectiveColorCyans, fSelectiveColorMagentas, fSelectiveColorYellows, fSelectiveColorBlacks);
-
-    // Enable corresponding shader variation
-    pMergeParams.nFlagsShaderRT = gRenDev->m_RP.m_FlagsShader_RT;
-    pMergeParams.nFlagsShaderRT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    if (CRenderer::CV_r_colorgrading_levels && (fMinInput || fGammaInput || fMaxInput || fMinOutput || fMaxOutput))
-    {
-        pMergeParams.nFlagsShaderRT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    if (CRenderer::CV_r_colorgrading_filters && (fFilterColorDensity || fGrain || fSharpenAmount))
-    {
-        if (fFilterColorDensity)
-        {
-            pMergeParams.nFlagsShaderRT |= g_HWSR_MaskBit[HWSR_SAMPLE4];
-        }
-        if (fGrain || fSharpenAmount)
-        {
-            pMergeParams.nFlagsShaderRT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-        }
-    }
-
-    if (CRenderer::CV_r_colorgrading_selectivecolor && (fSelectiveColorCyans || fSelectiveColorMagentas || fSelectiveColorYellows || fSelectiveColorBlacks))
-    {
-        pMergeParams.nFlagsShaderRT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-
-    Matrix44 pColorMatFromUserAndTOD = GetUtils().GetColorMatrix();
-    pColorMat = pColorMat  * pColorMatFromUserAndTOD;
-
-    Vec4 pColorMatrix[3] =
-    {
-        Vec4(pColorMat.m00, pColorMat.m01, pColorMat.m02, pColorMat.m03),
-        Vec4(pColorMat.m10, pColorMat.m11, pColorMat.m12, pColorMat.m13),
-        Vec4(pColorMat.m20, pColorMat.m21, pColorMat.m22, pColorMat.m23),
-    };
-
-    pMergeParams.pColorMatrix[0] = pColorMatrix[0];
-    pMergeParams.pColorMatrix[1] = pColorMatrix[1];
-    pMergeParams.pColorMatrix[2] = pColorMatrix[2];
-    pMergeParams.pLevels[0] = pParams0;
-    pMergeParams.pLevels[1] = pParams1;
-    pMergeParams.pFilterColor = pParams2;
-    pMergeParams.pSelectiveColor[0] = pParams3;
-    pMergeParams.pSelectiveColor[1] = pParams4;
-
-    // Always using color charts
-
-    if (gcpRendD3D->m_pColorGradingControllerD3D && (gEnv->IsCutscenePlaying() || (gRenDev->GetFrameID(false) % max(1, CRenderer::CV_r_ColorgradingChartsCache)) == 0))
-    {
-        if (!gcpRendD3D->m_pColorGradingControllerD3D->Update(&pMergeParams))
-        {
-            return false;
-        }
-    }
-
-    // If using merged color grading with color chart disable regular color transformations in display - only need to use color chart
-    pMergeParams.nFlagsShaderRT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE4]);
-
-    //// Always using color charts - %SAMPLE5 for defining volume lookup
-    //if( gcpRendD3D->m_pColorGradingControllerD3D && gcpRendD3D->m_pColorGradingControllerD3D->GetColorChart() && gcpRendD3D->m_pColorGradingControllerD3D->GetColorChart()->GetTexType() == eTT_3D)
-    //  pMergeParams.nFlagsShaderRT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-
-    return true;
-}
-
-void CColorGrading::Render()
-{
-    // Depreceated: to be removed / replaced by UberPostProcess shader
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CImageGhosting::Render()
-{
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    CTexture* pPrevFrame = CTexture::s_ptexPrevFrameScaled;
-    CTexture* pPrevFrameRead = CTexture::s_ptexPrevFrameScaled;
-
-    if (m_bInit)
-    {
-        m_bInit = false;
-        ColorF clearColor(0, 0, 0, 0);
-
-        gcpRendD3D->FX_ClearTarget(pPrevFrame, Clr_Transparent);
-    }
-
-    PROFILE_LABEL_SCOPE("IMAGE_GHOSTING");
-
-    // 0.25ms / 0.4ms
-    static CCryNameTSCRC TechName("ImageGhosting");
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffects, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    // Update ghosting
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-
-    static CCryNameR pParamNamePS("ImageGhostingParamsPS");
-    Vec4 vParamsPS = Vec4(1, 1, max(0.0f, 1 - m_pAmount->GetParam()), gEnv->pTimer->GetFrameTime());
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParamNamePS, &vParamsPS, 1);
-
-    GetUtils().SetTexture(pPrevFrameRead, 0, FILTER_LINEAR);
-
-    GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-    GetUtils().ShEndPass();
-
-    GetUtils().CopyScreenToTexture(CTexture::s_ptexBackBuffer);         // 0.25ms / 0.4 ms
-    GetUtils().StretchRect(CTexture::s_ptexBackBuffer, pPrevFrame); // 0.25ms
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CUberGamePostProcess::Render()
-{
-    PROFILE_LABEL_SCOPE("UBER_GAME_POSTPROCESS");
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    if (m_nCurrPostEffectsMask & ePE_ChromaShift)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-    //if( m_nCurrPostEffectsMask & ePE_RadialBlur )
-    //  gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE1];
-    if (m_nCurrPostEffectsMask & ePE_SyncArtifacts)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-    }
-
-    static CCryNameTSCRC TechName("UberGamePostProcess");
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, TechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    CTexture* pMaskTex = static_cast<CParamTexture*>(m_pMask)->GetParamTexture();
-
-    int32 nRenderState = GS_NODEPTHTEST;
-
-    // Blend with backbuffer when user sets a mask
-    if (pMaskTex)
-    {
-        nRenderState |= GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA;
-    }
-
-    gcpRendD3D->FX_SetState(nRenderState);
-
-    Vec4 cColor = m_pColorTint->GetParamVec4();
-    static CCryNameR pParamNamePS0("UberPostParams0");
-    static CCryNameR pParamNamePS1("UberPostParams1");
-    static CCryNameR pParamNamePS2("UberPostParams2");
-    static CCryNameR pParamNamePS3("UberPostParams3");
-    static CCryNameR pParamNamePS4("UberPostParams4");
-    static CCryNameR pParamNamePS5("UberPostParams5");
-
-    Vec4 vParamsPS[6] =
-    {
-        Vec4(m_pVSyncAmount->GetParam(), m_pInterlationAmount->GetParam(), m_pInterlationTiling->GetParam(), m_pInterlationRotation->GetParam()),
-        //Vec4(m_pVSyncFreq->GetParam(), 1.0f + max(0.0f, m_pPixelationScale->GetParam()*0.25f), m_pNoise->GetParam()*0.25f, m_pChromaShiftAmount->GetParam() + m_pFilterChromaShiftAmount->GetParam()),
-        Vec4(m_pVSyncFreq->GetParam(), 1.0f, m_pNoise->GetParam() * 0.25f, m_pChromaShiftAmount->GetParam() + m_pFilterChromaShiftAmount->GetParam()),
-        Vec4(min(1.0f, m_pGrainAmount->GetParam() * 0.1f * 0.25f), m_pGrainTile->GetParam(), m_pSyncWavePhase->GetParam(), m_pSyncWaveFreq->GetParam()),
-        Vec4(cColor.x, cColor.y, cColor.z, min(1.0f, m_pSyncWaveAmplitude->GetParam() * 0.01f)),
-        Vec4(cry_random(0.0f, 1.0f), cry_random(0.0f, 1.0f), cry_random(0.0f, 1.0f),  cry_random(0.0f, 1.0f)),
-        Vec4(0, 0, 0, 0)
-    };
-
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamNamePS0, &vParamsPS[0], 1);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamNamePS1, &vParamsPS[1], 1);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamNamePS2, &vParamsPS[2], 1);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamNamePS3, &vParamsPS[3], 1);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamNamePS4, &vParamsPS[4], 1);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamNamePS5, &vParamsPS[5], 1);
-
-
-    GetUtils().SetTexture(CTexture::s_ptexBackBuffer, 0, FILTER_LINEAR);
-    GetUtils().SetTexture(CTextureManager::Instance()->GetDefaultTexture("ScreenNoiseMap"), 1, FILTER_LINEAR, 0);
-
-    if (pMaskTex)
-    {
-        GetUtils().SetTexture(pMaskTex, 2, FILTER_LINEAR);
-    }
-    else
-    {
-        GetUtils().SetTexture(CTextureManager::Instance()->GetWhiteTexture(), 2, FILTER_LINEAR);
-    }
-
-    GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-    GetUtils().ShEndPass();
-
-    m_nCurrPostEffectsMask = 0;
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CSoftAlphaTest::Render()
-{
-    PROFILE_LABEL_SCOPE("SOFT ALPHA TEST");
-
-    IRenderElement* pPrevRE = gRenDev->m_RP.m_pRE;
-    gRenDev->m_RP.m_pRE = NULL;
-
-    PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexSceneNormalsMap);
-
-    gcpRendD3D->FX_ProcessSoftAlphaTestRenderLists();
-
-    gRenDev->m_RP.m_pRE = pPrevRE;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessGame.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessGame.cpp
deleted file mode 100644
index 133e4853ff..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessGame.cpp
+++ /dev/null
@@ -1,610 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "../Common/Textures/TextureManager.h"
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// Game/Hud specific post-processing
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CD3D9Renderer::FX_CustomRenderScene(bool bEnable)
-{
-    if (bEnable)
-    {
-        PostProcessUtils().Log(" +++ Begin custom render scene +++ \n");
-        if IsCVarConstAccess(constexpr) ((CRenderer::CV_r_customvisions == 1) || (CRenderer::CV_r_customvisions == 3))
-        {
-            FX_ClearTarget(CTexture::s_ptexSceneNormalsMap, Clr_Transparent);
-            FX_PushRenderTarget(0, CTexture::s_ptexSceneNormalsMap, &gcpRendD3D->m_DepthBufferOrig);
-            RT_SetViewport(0, 0, GetWidth(), GetHeight());
-        }
-
-        m_RP.m_PersFlags2 |= RBPF2_CUSTOM_RENDER_PASS;
-    }
-    else
-    {
-        if IsCVarConstAccess(constexpr) ((CRenderer::CV_r_customvisions == 1) || (CRenderer::CV_r_customvisions == 3))
-        {
-            FX_PopRenderTarget(0);
-        }
-
-        FX_ResetPipe();
-
-        PostProcessUtils().Log(" +++ End custom render scene +++ \n");
-
-        RT_SetViewport(0, 0, GetWidth(), GetHeight());
-
-        m_RP.m_PersFlags2 &= ~RBPF2_CUSTOM_RENDER_PASS;
-    }
-
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CHudSilhouettes::Render()
-{
-    PROFILE_LABEL_SCOPE("HUD_SILHOUETTES");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    float fBlendParam = clamp_tpl<float>(m_pAmount->GetParam(), 0.0f, 1.0f);
-    float fType = m_pType->GetParam();
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // Render highlighted geometry
-    {
-        PROFILE_LABEL_SCOPE("HUD_SILHOUETTES_ENTITIES_PASS");
-
-        uint32 nPrevPers2 = gRenDev->m_RP.m_PersFlags2;
-        gRenDev->m_RP.m_PersFlags2 &= ~RBPF2_NOPOSTAA;
-
-        // render to texture all masks
-        gcpRendD3D->FX_ProcessPostRenderLists(FB_CUSTOM_RENDER);
-
-        gRenDev->m_RP.m_PersFlags2 = nPrevPers2;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // Render silhouettes
-    switch (static_cast<int>(CRenderer::CV_r_customvisions))
-    {
-    case 1:
-    {
-        RenderDeferredSilhouettes(fBlendParam, fType);
-        break;
-    }
-    case 2:
-    {
-        // These are forward rendered so do nothing
-        break;
-    }
-    case 3:
-    {
-        RenderDeferredSilhouettesOptimised(fBlendParam, fType);
-    }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-void CHudSilhouettes::RenderDeferredSilhouettes(float fBlendParam, float fType)
-{
-    gcpRendD3D->RT_SetViewport(PostProcessUtils().m_pScreenRect.left, PostProcessUtils().m_pScreenRect.top, PostProcessUtils().m_pScreenRect.right, PostProcessUtils().m_pScreenRect.bottom);
-    PostProcessUtils().m_pCurDepthSurface = &gcpRendD3D->m_DepthBufferOrig;
-
-    CTexture* pMask = CTextureManager::Instance()->GetBlackTexture();
-    CTexture* pMaskBlurred = CTextureManager::Instance()->GetBlackTexture();
-
-    // skip processing, nothing was added to mask
-    if ((SRendItem::BatchFlags(EFSLIST_GENERAL, gRenDev->m_RP.m_pRLD) | SRendItem::BatchFlags(EFSLIST_TRANSP, gRenDev->m_RP.m_pRLD)) & FB_CUSTOM_RENDER)
-    {
-        // could render directly to frame buffer ? save 1 resolve - no glow though
-        {
-            // store silhouettes/signature temporary render target, so that we can post process this afterwards
-            gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexBackBufferScaled[0], NULL);
-            gcpRendD3D->RT_SetViewport(0, 0, CTexture::s_ptexBackBufferScaled[0]->GetWidth(), CTexture::s_ptexBackBufferScaled[0]->GetHeight());
-
-            static CCryNameTSCRC pTech1Name("BinocularView");
-            PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTech1Name, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-            // Set VS params
-            const float uvOffset = 2.0f;
-            Vec4 vsParams = Vec4(uvOffset, 0.0f, 0.0f, 0.0f);
-            CShaderMan::s_shPostEffectsGame->FXSetVSFloat(m_vsParamName, &vsParams, 1);
-
-            // Set PS default params
-            Vec4 pParams = Vec4(0, 0, 0, (!fType) ? 1.0f : 0.0f);
-            CShaderMan::s_shPostEffectsGame->FXSetPSFloat(m_psParamName, &pParams, 1);
-
-            PostProcessUtils().SetTexture(CTexture::s_ptexSceneNormalsMap, 0, FILTER_POINT);
-            PostProcessUtils().SetTexture(CTexture::s_ptexZTarget, 1, FILTER_POINT);
-            PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-
-            PostProcessUtils().ShEndPass();
-            gcpRendD3D->FX_PopRenderTarget(0);
-
-            pMask = CTexture::s_ptexBackBufferScaled[0];
-            pMaskBlurred = CTexture::s_ptexBackBufferScaled[1];
-        }
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        // compute glow
-
-        {
-            GetUtils().StretchRect(CTexture::s_ptexBackBufferScaled[0], CTexture::s_ptexBackBufferScaled[1]);
-
-            // blur - for glow
-            //          GetUtils().TexBlurGaussian(CTexture::s_ptexBackBufferScaled[0], 1, 1.5f, 2.0f, false);
-            GetUtils().TexBlurIterative(CTexture::s_ptexBackBufferScaled[1], 1, false);
-
-            gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-        }
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        // finally add silhouettes to screen
-
-        {
-            static CCryNameTSCRC pTechSilhouettesName("BinocularViewSilhouettes");
-
-            GetUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechSilhouettesName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            gRenDev->FX_SetState(GS_NODEPTHTEST  | GS_BLSRC_ONE | GS_BLDST_ONE);
-
-            GetUtils().SetTexture(pMask, 0);
-            GetUtils().SetTexture(pMaskBlurred, 1);
-
-            // Set PS default params
-            Vec4 pParams = Vec4(0, 0, 0, fBlendParam * 0.33f);
-            static CCryNameR pParamName("psParams");
-            CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamName, &pParams, 1);
-
-            GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0, &gcpRendD3D->m_FullResRect);
-
-            GetUtils().ShEndPass();
-        }
-    }
-
-    gcpRendD3D->RT_SetViewport(GetUtils().m_pScreenRect.left, GetUtils().m_pScreenRect.top, GetUtils().m_pScreenRect.right, GetUtils().m_pScreenRect.bottom);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-void CHudSilhouettes::RenderDeferredSilhouettesOptimised(float fBlendParam, float fType)
-{
-    const bool bHasSilhouettesToRender = ((SRendItem::BatchFlags(EFSLIST_GENERAL, gRenDev->m_RP.m_pRLD) |
-                                           SRendItem::BatchFlags(EFSLIST_TRANSP, gRenDev->m_RP.m_pRLD))
-                                          & FB_CUSTOM_RENDER) ? true : false;
-
-    if (bHasSilhouettesToRender)
-    {
-        // Down Sample
-        GetUtils().StretchRect(CTexture::s_ptexSceneNormalsMap, CTexture::s_ptexBackBufferScaled[0]);
-
-        PROFILE_LABEL_SCOPE("HUD_SILHOUETTES_DEFERRED_PASS");
-
-        // Draw silhouettes
-        GetUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, m_deferredSilhouettesOptimisedTech, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        gRenDev->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE | GS_NOCOLMASK_A);
-
-        GetUtils().SetTexture(CTexture::s_ptexBackBufferScaled[0], 0, FILTER_LINEAR);
-
-        // Set vs params
-        const float uvOffset = 1.5f;
-        Vec4 vsParams = Vec4(uvOffset, 0.0f, 0.0f, 0.0f);
-        CShaderMan::s_shPostEffectsGame->FXSetVSFloat(m_vsParamName, &vsParams, 1);
-
-        // Set ps params
-        const float fillStrength = m_pFillStr->GetParam();
-        const float silhouetteBoost = 1.7f;
-        const float silhouetteBrightness = 1.333f;
-        const float focusReduction = 0.33f;
-        const float silhouetteAlpha = 0.8f;
-        const bool bBinocularsActive = (!fType);
-        const float silhouetteStrength = (bBinocularsActive ? 1.0f : (fBlendParam * focusReduction)) * silhouetteAlpha;
-
-        Vec4 psParams;
-        psParams.x = silhouetteStrength;
-        psParams.y = silhouetteBoost;
-        psParams.z = silhouetteBrightness;
-        psParams.w = fillStrength;
-
-        CShaderMan::s_shPostEffectsGame->FXSetPSFloat(m_psParamName, &psParams, 1);
-
-        GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0, &gcpRendD3D->m_FullResRect);
-
-        GetUtils().ShEndPass();
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CAlienInterference::Render()
-{
-    PROFILE_LABEL_SCOPE("ALIEN_INTERFERENCE");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    float fAmount = m_pAmount->GetParam();
-
-    static CCryNameTSCRC pTechName("AlienInterference");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    Vec4 vParams = Vec4(1, 1, (float)PostProcessUtils().m_iFrameCounter, fAmount);
-    static CCryNameR pParamName("psParams");
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamName, &vParams, 1);
-
-    static CCryNameR pParamAlienInterferenceName("AlienInterferenceTint");
-    vParams = m_pTintColor->GetParamVec4();
-    vParams.x *= 2.0f;
-    vParams.y *= 2.0f;
-    vParams.z *= 2.0f;
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamAlienInterferenceName, &vParams, 1);
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-
-
-    PostProcessUtils().ShEndPass();
-}
-
-void CGhostVision::Render()
-{
-    PROFILE_LABEL_SCOPE("GHOST_VISION");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    float fUserValue1 = m_pUserValue1->GetParam();
-    float fUserValue2 = m_pUserValue2->GetParam();
-    float fUserValue3 = m_pUserValue3->GetParam();
-
-    static CCryNameTSCRC pTechName("GhostVision");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES);
-
-    //gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    Vec4 vParams = Vec4((float)PostProcessUtils().m_iFrameCounter, fUserValue1, fUserValue2, fUserValue3);
-    static CCryNameR pParamName("psParams");
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamName, &vParams, 1);
-
-    static CCryNameR pParamGhostVisionName("GhostVisionTint");
-    vParams = m_pTintColor->GetParamVec4();
-    vParams.x *= 2.0f;
-    vParams.y *= 2.0f;
-    vParams.z *= 2.0f;
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamGhostVisionName, &vParams, 1);
-
-    PostProcessUtils().SetTexture(m_pUserTex1, 0, FILTER_LINEAR, TADDR_CLAMP);
-    PostProcessUtils().SetTexture(m_pUserTex1, 1, FILTER_LINEAR, TADDR_CLAMP);
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-    PostProcessUtils().ShEndPass();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CScreenFrost::Render()
-{
-    float fAmount = m_pAmount->GetParam();
-
-    if (fAmount <= 0.02f)
-    {
-        m_fRandOffset = cry_random(0.0f, 1.0f);
-        return;
-    }
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    float fCenterAmount = m_pCenterAmount->GetParam();
-
-    PostProcessUtils().StretchRect(CTexture::s_ptexBackBuffer, CTexture::s_ptexBackBufferScaled[1]);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    // display frost
-    static CCryNameTSCRC pTechName("ScreenFrost");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    static CCryNameR pParam0Name("screenFrostParamsVS");
-    static CCryNameR pParam1Name("screenFrostParamsPS");
-
-    PostProcessUtils().ShSetParamVS(pParam0Name, Vec4(1, 1, 1, m_fRandOffset));
-    PostProcessUtils().ShSetParamPS(pParam1Name, Vec4(1, 1, fCenterAmount, fAmount));
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-
-    PostProcessUtils().ShEndPass();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CFlashBang::Preprocess()
-{
-    float fActive = m_pActive->GetParam();
-    if (fActive || m_fSpawnTime)
-    {
-        if (fActive)
-        {
-            m_fSpawnTime = 0.0f;
-        }
-
-        m_pActive->SetParam(0.0f);
-
-        return true;
-    }
-
-
-    return false;
-}
-
-void CFlashBang::Render()
-{
-    float fTimeDuration = m_pTime->GetParam();
-    float fDifractionAmount = m_pDifractionAmount->GetParam();
-    float fBlindTime = m_pBlindAmount->GetParam();
-
-    if (!m_fSpawnTime)
-    {
-        m_fSpawnTime = PostProcessUtils().m_pTimer->GetCurrTime();
-
-        // Create temporary ghost image and capture screen
-        SAFE_DELETE(m_pGhostImage);
-
-        m_pGhostImage = new SDynTexture(CTexture::s_ptexBackBuffer->GetWidth() >> 1, CTexture::s_ptexBackBuffer->GetHeight() >> 1, eTF_R8G8B8A8, eTT_2D,  FT_STATE_CLAMP, "GhostImageTempRT");
-        m_pGhostImage->Update(CTexture::s_ptexBackBuffer->GetWidth() >> 1, CTexture::s_ptexBackBuffer->GetHeight() >> 1);
-
-        if (m_pGhostImage && m_pGhostImage->m_pTexture)
-        {
-            PostProcessUtils().StretchRect(CTexture::s_ptexBackBuffer, m_pGhostImage->m_pTexture);
-        }
-    }
-
-    // Update current time
-    float fCurrTime = (PostProcessUtils().m_pTimer->GetCurrTime() - m_fSpawnTime) / fTimeDuration;
-
-    // Effect finished
-    if (fCurrTime > 1.0f)
-    {
-        m_fSpawnTime = 0.0f;
-        m_pActive->SetParam(0.0f);
-
-        SAFE_DELETE(m_pGhostImage);
-
-        return;
-    }
-
-    // make sure to update dynamic texture if required
-    if (m_pGhostImage && !m_pGhostImage->m_pTexture)
-    {
-        m_pGhostImage->Update(CTexture::s_ptexBackBuffer->GetWidth() >> 1, CTexture::s_ptexBackBuffer->GetHeight() >> 1);
-    }
-
-    if (!m_pGhostImage || !m_pGhostImage->m_pTexture)
-    {
-        return;
-    }
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    static CCryNameTSCRC pTechName("FlashBang");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    float fLuminance = 1.0f  - fCurrTime;//PostProcessUtils().InterpolateCubic(0.0f, 1.0f, 0.0f, 1.0f, fCurrTime);
-
-    // opt: some pre-computed constants
-    Vec4 vParams = Vec4(fLuminance, fLuminance * fDifractionAmount, 3.0f * fLuminance * fBlindTime, fLuminance);
-    static CCryNameR pParamName("vFlashBangParams");
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamName, &vParams, 1);
-
-    PostProcessUtils().SetTexture(CTexture::s_ptexBackBuffer, 0, FILTER_POINT);
-    PostProcessUtils().SetTexture(m_pGhostImage->m_pTexture, 1, FILTER_LINEAR);
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-
-    PostProcessUtils().ShEndPass();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CFilterKillCamera::Render()
-{
-    PROFILE_LABEL_SCOPE("KILL_CAMERA");
-    PROFILE_SHADER_SCOPE;
-
-    // Update time
-    float frameTime = PostProcessUtils().m_pTimer->GetFrameTime();
-    m_blindTimer += frameTime;
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    float grainStrength = m_pGrainStrength->GetParam();
-    Vec4 chromaShift = m_pChromaShift->GetParamVec4(); // xyz = offset, w = strength
-    Vec4 vignette = m_pVignette->GetParamVec4(); // xy = screen scale, z = radius, w = blind noise vignette scale
-    Vec4 colorScale = m_pColorScale->GetParamVec4();
-
-    // Scale vignette with overscan borders
-    Vec2 overscanBorders = Vec2(0.0f, 0.0f);
-    gRenDev->EF_Query(EFQ_OverscanBorders, overscanBorders);
-    const float vignetteOverscanMaxValue = 4.0f;
-    const Vec2 vignetteOverscanScalar = Vec2(1.0f, 1.0f) + (overscanBorders * vignetteOverscanMaxValue);
-    vignette.x *= vignetteOverscanScalar.x;
-    vignette.y *= vignetteOverscanScalar.y;
-
-    float inverseVignetteRadius = 1.0f / clamp_tpl<float>(vignette.z * 2.0f, 0.001f, 2.0f);
-    Vec2 vignetteScreenScale(max(vignette.x, 0.0f), max(vignette.y, 0.0f));
-
-    // Blindness
-    Vec4 blindness = m_pBlindness->GetParamVec4(); // x = blind duration, y = blind fade out duration, z = blindness grey scale, w = blind noise min scale
-    float blindDuration = max(blindness.x, 0.0f);
-    float blindFadeOutDuration = max(blindness.y, 0.0f);
-    float blindGreyScale = clamp_tpl<float>(blindness.z, 0.0f, 1.0f);
-    float blindNoiseMinScale = clamp_tpl<float>(blindness.w, 0.0f, 10.0f);
-    float blindNoiseVignetteScale = clamp_tpl<float>(vignette.w, 0.0f, 10.0f);
-
-    float blindAmount = 0.0f;
-    if (m_blindTimer < blindDuration)
-    {
-        blindAmount = 1.0f;
-    }
-    else
-    {
-        float blindFadeOutTimer = m_blindTimer - blindDuration;
-        if (blindFadeOutTimer < blindFadeOutDuration)
-        {
-            blindAmount = 1.0f - (blindFadeOutTimer / blindFadeOutDuration);
-        }
-    }
-
-    // Rendering
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, m_techName, FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-
-    int x = 0;
-    int y = 0;
-    int width = 0;
-    int height = 0;
-    gcpRendD3D->GetViewport(&x, &y, &width, &height);
-
-    // Set PS default params
-    const int PARAM_COUNT = 4;
-    Vec4 pParams[PARAM_COUNT];
-
-    // psParams[0] - xy = Rand lookup, zw = vignetteScreenScale * invRadius
-    pParams[0].x = cry_random(0, 1023) / (float)width;
-    pParams[0].y = cry_random(0, 1023) / (float)height;
-    pParams[0].z = vignetteScreenScale.x * inverseVignetteRadius;
-    pParams[0].w = vignetteScreenScale.y * inverseVignetteRadius;
-
-    // psParams[1] - xyz = color scale, w = grain strength
-    pParams[1].x = colorScale.x;
-    pParams[1].y = colorScale.y;
-    pParams[1].z = colorScale.z;
-    pParams[1].w = grainStrength;
-
-    // psParams[2] - xyz = chroma shift, w = chroma shift color strength
-    pParams[2] = chromaShift;
-
-    // psParams[3] - x = blindAmount, y = blind grey scale, z = blindNoiseVignetteScale, w = blindNoiseMinScale
-    pParams[3].x = blindAmount;
-    pParams[3].y = blindGreyScale;
-    pParams[3].z = blindNoiseVignetteScale;
-    pParams[3].w = blindNoiseMinScale;
-
-    CShaderMan::s_shPostEffects->FXSetPSFloat(m_paramName, pParams, PARAM_COUNT);
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-
-    PostProcessUtils().ShEndPass();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CScreenBlood::Render()
-{
-    PROFILE_LABEL_SCOPE("SCREEN BLOOD");
-
-    static CCryNameTSCRC pTechName("ScreenBlood");
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_DSTCOL | GS_BLDST_SRCALPHA);
-
-    // Border params
-    const Vec4 borderParams = m_pBorder->GetParamVec4();
-    const float borderRange = borderParams.z;
-    const Vec2 borderOffset = Vec2(borderParams.x, borderParams.y);
-    const float alpha = borderParams.w;
-
-    // Use overscan borders to scale blood thickness around screen
-    const float overscanScalar = 3.0f;
-    Vec2 overscanBorders = Vec2(0.0f, 0.0f);
-    gcpRendD3D->EF_Query(EFQ_OverscanBorders, overscanBorders);
-    overscanBorders =  Vec2(1.0f, 1.0f) + ((overscanBorders + borderOffset) * overscanScalar);
-
-    const float borderScale = max(0.2f, borderRange - (m_pAmount->GetParam() * borderRange));
-    Vec4 pParams = Vec4(overscanBorders.x, overscanBorders.y, alpha, borderScale);
-    static CCryNameR pParamName("psParams");
-    CShaderMan::s_shPostEffects->FXSetPSFloat(pParamName, &pParams, 1);
-    GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-
-    GetUtils().ShEndPass();
-
-    //m_nRenderFlags = PSP_UPDATE_BACKBUFFER;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void ScreenFader::Render()
-{
-    // CD3D9Renderer::Draw2dImage() is based off of the "virtual screen" dimensions, not the viewport, rendertarget or renderer dimensions.
-    const unsigned int renderWidth = static_cast<decltype(renderWidth)>(VIRTUAL_SCREEN_WIDTH);
-    const unsigned int renderHeight = static_cast<decltype(renderHeight)>(VIRTUAL_SCREEN_HEIGHT);
-
-    // Render all of our Screen Fader passes in order.
-    for ( auto passIter = m_screenPasses.begin(); passIter != m_screenPasses.end(); ++passIter )
-    {
-        ScreenFaderPass* pass = (*passIter);
-
-        // Fading in goes 0 -> Duration, fading out goes Duration (or current time) -> 0
-        if ( pass->m_fadingIn || pass->m_fadingOut )
-        {
-            pass->m_currentFadeTime += gEnv->pTimer->GetFrameTime() * pass->m_fadeDirection;
-        }
-
-        float currentAlpha = 1.0f;
-        if ( pass->m_fadeDuration > 0.0f )
-        {
-            currentAlpha = pass->m_currentFadeTime / pass->m_fadeDuration;
-            currentAlpha = CLAMP(currentAlpha, 0.0f, 1.0f) * pass->m_currentColor.a;
-        }
-
-        if ( currentAlpha > 0.001f )
-        { 
-            const unsigned int screenLeft = pass->m_screenCoordinates.x * renderWidth;
-            const unsigned int screenTop = pass->m_screenCoordinates.y * renderHeight;
-            const unsigned int screenWidth = (pass->m_screenCoordinates.z - pass->m_screenCoordinates.x) * renderWidth;
-            const unsigned int screenHeight = (pass->m_screenCoordinates.w - pass->m_screenCoordinates.y) * renderHeight;
-
-            int texId = (pass->m_fadeTexture == nullptr) ? -1 : pass->m_fadeTexture->GetTextureID();
-            gEnv->pRenderer->SetState(GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA | GS_NODEPTHTEST);
-            gEnv->pRenderer->Draw2dImage(screenLeft, screenTop, screenWidth, screenHeight,
-                                        texId,
-                                        0.0f, 1.0f, 1.0f, 0.0f, // tex coords
-                                        0.0f, // angle
-                                        pass->m_currentColor.r, pass->m_currentColor.g, pass->m_currentColor.b, currentAlpha,
-                                        0.0f);
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessMisc.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessMisc.cpp
deleted file mode 100644
index 37db4b91ea..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessMisc.cpp
+++ /dev/null
@@ -1,704 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "Common/RenderView.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CVolumetricScattering::Render()
-{
-    PROFILE_SHADER_SCOPE;
-
-    // quickie-prototype
-    //    - some ideas: add several types (cloudy/sparky/yadayada)
-    
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    // Render god-rays into low-res render target for less fillrate hit
-    
-    gcpRendD3D->FX_PushRenderTarget(0,  CTexture::s_ptexBackBufferScaled[1], NULL);
-    gcpRendD3D->FX_SetColorDontCareActions(0, false, false);
-    gcpRendD3D->FX_ClearTarget(CTexture::s_ptexBackBufferScaled[1], Clr_Transparent);
-    gcpRendD3D->RT_SetViewport(0, 0, CTexture::s_ptexBackBufferScaled[1]->GetWidth(), CTexture::s_ptexBackBufferScaled[1]->GetHeight());
-
-    float fAmount = m_pAmount->GetParam();
-    float fTiling = m_pTiling->GetParam();
-    float fSpeed = m_pSpeed->GetParam();
-    Vec4 pColor = m_pColor->GetParamVec4();
-
-    static CCryNameTSCRC pTechName("VolumetricScattering");
-    uint32 nPasses;
-    CShaderMan::s_shPostEffects->FXSetTechnique(pTechName);
-    
-    {                
-        PROFILE_LABEL_SCOPE("VOLUMETRICSCATTERING");
-        CShaderMan::s_shPostEffects->FXBegin(&nPasses, FEF_DONTSETSTATES);
-
-        gcpRendD3D->SetCullMode(R_CULL_NONE);
-        gcpRendD3D->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCCOL | GS_NODEPTHTEST);
-
-        int nSlicesCount = 10;
-
-        Vec4 pParams;
-        pParams = Vec4(fTiling, fSpeed, fTiling, fSpeed);
-
-        static CCryNameR pParam0Name("VolumetricScattering");
-        static CCryNameR pParam1Name("VolumetricScatteringColor");
-
-        static CCryNameR pParam2Name("PI_volScatterParamsVS");
-        static CCryNameR pParam3Name("PI_volScatterParamsPS");
-
-        for (int r(0); r < nSlicesCount; ++r)
-        {
-            // !force updating constants per-pass! (dx10..)
-            CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-            // Set PS default params
-            Vec4 pParamsPI = Vec4(1.0f, fAmount, r, 1.0f / (float) nSlicesCount);
-            CShaderMan::s_shPostEffects->FXSetVSFloat(pParam0Name, &pParams, 1);
-            CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pColor, 1);
-            CShaderMan::s_shPostEffects->FXSetVSFloat(pParam2Name, &pParamsPI, 1);
-            CShaderMan::s_shPostEffects->FXSetPSFloat(pParam3Name, &pParamsPI, 1);
-
-            GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBufferScaled[1]->GetWidth(), CTexture::s_ptexBackBufferScaled[1]->GetHeight());
-
-            CShaderMan::s_shPostEffects->FXEndPass();
-        }
-        CShaderMan::s_shPostEffects->FXEnd();
-    }
-
-    // Restore previous viewport
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    // Display volumetric scattering effect
-    {
-        PROFILE_LABEL_SCOPE("VOLUMETRICSCATTERINGFINAL");
-        CCryNameTSCRC pTechName0("VolumetricScatteringFinal");
-
-        GetUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName0, FEF_DONTSETSTATES);
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-        GetUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-        GetUtils().ShEndPass();
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void CPost3DRenderer::Render()
-{
-    PROFILE_LABEL_SCOPE("POST_3D_RENDERER");
-    PROFILE_SHADER_SCOPE;
-
-    // Must update the RT pointers here, otherwise they can get out-of-date
-    if (CRenderer::CV_r_UsePersistentRTForModelHUD > 0)
-    {
-        m_pFlashRT = CTexture::s_ptexModelHudBuffer;
-    }
-    else
-    {
-        m_pFlashRT = CTexture::s_ptexBackBuffer;
-    }
-
-    m_pTempRT = CTexture::s_ptexSceneDiffuse;
-#if defined(WIN32) || defined(APPLE) || defined(LINUX) || defined(SUPPORTS_DEFERRED_SHADING_L_BUFFERS_FORMAT)
-    m_pTempRT = CTexture::s_ptexSceneNormalsBent; // non-msaaed target
-#endif
-
-    if (HasModelsToRender() && IsActive())
-    {
-        // Render model groups
-        m_edgeFadeScale = (1.0f / clamp_tpl<float>(m_pEdgeFadeScale->GetParam(), 0.001f, 1.0f));
-        m_post3DRendererflags |= eP3DR_DirtyFlashRT;
-        m_groupCount = 1; // There must be at least 1 group, this will then get set the correct amount when processing the models
-        for (uint8 groupId = 0; groupId < m_groupCount; groupId++)
-        {
-            RenderGroup(groupId);
-        }
-    }
-    else
-    {
-        // Nothing to render, so clear Flash RT so that we don't render rubbish on the flash objects
-        ClearFlashRT();
-    }
-}
-
-void CPost3DRenderer::ClearFlashRT()
-{
-    PROFILE_LABEL_SCOPE("CLEAR_RT");
-    gcpRendD3D->FX_ClearTarget(m_pFlashRT);
-}
-
-void CPost3DRenderer::RenderGroup(uint8 groupId)
-{
-    PROFILE_LABEL_SCOPE("RENDER_GROUP");
-
-    SRenderPipeline& renderPipeline = gcpRendD3D->m_RP;
-
-    // Reset group vars
-    m_post3DRendererflags &= ~eP3DR_HasSilhouettes;
-    m_alpha = 1.0f;
-    float screenRect[4];
-    memset(screenRect, 0, sizeof(screenRect));
-
-    {
-        PROFILE_LABEL_SCOPE("RENDER_DEPTH");
-        // On PC we render depth separately
-        renderPipeline.m_pRenderFunc = gcpRendD3D->FX_FlushShader_ZPass;
-        RenderMeshes(groupId, screenRect, eRMM_DepthOnly);
-    }
-
-    renderPipeline.m_pRenderFunc = gcpRendD3D->FX_FlushShader_General;
-
-    RenderMeshes(groupId, screenRect);
-    AlphaCorrection();
-    GammaCorrection(screenRect);
-
-    if (m_post3DRendererflags & eP3DR_HasSilhouettes)
-    {
-        RenderSilhouettes(groupId, screenRect);
-    }
-}
-
-void CPost3DRenderer::RenderMeshes(uint8 groupId, float screenRect[4], ERenderMeshMode renderMeshMode)
-{
-    PROFILE_LABEL_SCOPE("RENDER_MESHES");
-
-    const bool bCustomRender = (renderMeshMode == eRMM_Custom) ? true : false;
-    const bool bDefaultRender = (renderMeshMode == eRMM_Default) ? true : false;
-    const bool bDepthOnlyRender = (renderMeshMode == eRMM_DepthOnly) ? true : false;
-    const bool bDoStencil = bDefaultRender;
-    const bool bReverseDepth = (gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH) != 0;
-
-    gcpRendD3D->FX_ClearTarget(&gcpRendD3D->m_DepthBufferOrig, (bDepthOnlyRender * CLEAR_ZBUFFER) | CLEAR_STENCIL, Clr_FarPlane_R.r, (bDepthOnlyRender * 1));
-
-    if (!bDepthOnlyRender)
-    {
-        gcpRendD3D->FX_ClearTarget(m_pTempRT, Clr_Transparent);
-        gcpRendD3D->FX_PushRenderTarget(0, m_pTempRT, &gcpRendD3D->m_DepthBufferOrig);
-        gcpRendD3D->RT_SetViewport(0, 0, m_pTempRT->GetWidth(), m_pTempRT->GetHeight());
-    }
-    else
-    {
-        // Setup depth render
-        const bool bClearOnResolve = false;
-        const int nCMSide = -1;
-        const bool bScreenVP = true;
-
-        gcpRendD3D->FX_ClearTarget(CTexture::s_ptexZTarget, Clr_Transparent);
-        gcpRendD3D->FX_ClearTarget(CTexture::s_ptexSceneNormalsMap, Clr_Transparent);
-
-        gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexZTarget, &gcpRendD3D->m_DepthBufferOrig, bClearOnResolve, nCMSide, bScreenVP);
-        gcpRendD3D->FX_PushRenderTarget(1, CTexture::s_ptexSceneNormalsMap, NULL);
-
-        gcpRendD3D->FX_SetState(GS_DEPTHWRITE);
-        gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->m_MainViewport.nWidth, gcpRendD3D->m_MainViewport.nHeight);
-
-        // Stencil initialized to 1 - 0 is reserved for MSAAed samples
-        gcpRendD3D->m_nStencilMaskRef = 1;
-
-        gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags |= RBPF_ZPASS;
-        if (CTexture::s_eTFZ == eTF_R32F || CTexture::s_eTFZ == eTF_R16G16F || CTexture::s_eTFZ == eTF_R16G16B16A16F || CTexture::s_eTFZ == eTF_D24S8 || CTexture::s_eTFZ == eTF_D32FS8)
-        {
-            gcpRendD3D->m_RP.m_PersFlags2 |= (RBPF2_NOALPHABLEND | RBPF2_NOALPHATEST);
-            gcpRendD3D->m_RP.m_StateAnd &= ~(GS_BLEND_MASK | GS_ALPHATEST_MASK);
-        }
-    }
-
-    // Set scissor
-    gcpRendD3D->EF_Scissor(true, 0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-
-    SRenderPipeline& RESTRICT_REFERENCE renderPipeline = gcpRendD3D->m_RP;
-
-    if (bDoStencil)
-    {
-        // Setup stencil for alpha correction pass
-        renderPipeline.m_ForceStateOr |=    GS_STENCIL;
-
-        const int32 nStencilState = STENC_FUNC(FSS_STENCFUNC_ALWAYS) | STENCOP_FAIL(FSS_STENCOP_KEEP) | STENCOP_ZFAIL(FSS_STENCOP_KEEP) | STENCOP_PASS(FSS_STENCOP_REPLACE);
-        gcpRendD3D->FX_SetStencilState(nStencilState, 1, 0xFF, 0xFF);
-
-        GetUtils().SetupStencilStates(FSS_STENCFUNC_EQUAL);
-
-        gcpRendD3D->m_nStencilMaskRef = 1;
-        GetUtils().BeginStencilPrePass(true);
-    }
-
-    // Create custom camera so FOV is the same when ever we render
-    CCamera prevCamera = gcpRendD3D->GetCamera();
-    CCamera postRenderCamera = prevCamera;
-
-    Matrix34 cameraMatrix;
-    cameraMatrix.SetIdentity(); // Camera is at origin
-    postRenderCamera.SetMatrix(cameraMatrix);
-
-    const float fov = DEFAULT_FOV * clamp_tpl<float>(m_pFOVScale->GetParam(), 0.05f, 1.0f);
-    const float pixelAspectRatio = m_pPixelAspectRatio->GetParam();
-    postRenderCamera.SetFrustum(prevCamera.GetViewSurfaceX(), prevCamera.GetViewSurfaceZ(), fov, DEFAULT_NEAR, DEFAULT_FAR, pixelAspectRatio);
-    gcpRendD3D->SetCamera(postRenderCamera);
-
-    // Set flags
-    const uint32 prevAnd = renderPipeline.m_ForceStateAnd;
-    const uint32 prevOr = renderPipeline.m_ForceStateOr;
-    if (!bDepthOnlyRender)
-    {
-        renderPipeline.m_ForceStateAnd |= GS_DEPTHFUNC_EQUAL;
-        renderPipeline.m_ForceStateOr |= GS_DEPTHWRITE;
-    }
-
-    renderPipeline.m_PersFlags2 |= RBPF2_POST_3D_RENDERER_PASS | RBPF2_CUSTOM_RENDER_PASS;
-    if (bCustomRender)
-    {
-        renderPipeline.m_PersFlags2 |= RBPF2_SINGLE_FORWARD_LIGHT_PASS;
-    }
-
-    // Set fog
-    I3DEngine* p3DEngine = gEnv->p3DEngine;
-    const ColorF fogColor(0.0f, 0.0f, 0.0f, 0.0f);
-    gcpRendD3D->SetFogColor(fogColor);
-
-    // Draw custom objects
-    {
-        PROFILE_LABEL_SCOPE("FB_POST_3D_RENDER");
-        ProcessRenderList(EFSLIST_GENERAL, FB_POST_3D_RENDER, groupId, screenRect, bCustomRender);
-        ProcessRenderList(EFSLIST_SKIN, FB_POST_3D_RENDER, groupId, screenRect, bCustomRender);
-        if (!bCustomRender)
-        {
-            ProcessRenderList(EFSLIST_DECAL, FB_POST_3D_RENDER, groupId, screenRect, bCustomRender);
-        }
-        if (!bDepthOnlyRender)
-        {
-            ProcessRenderList(EFSLIST_TRANSP, FB_POST_3D_RENDER, groupId, screenRect, bCustomRender);
-        }
-    }
-
-    // Pop render targets
-    if (!bDepthOnlyRender)
-    {
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-    else
-    {
-        gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags &= ~RBPF_ZPASS;
-        if (CTexture::s_eTFZ == eTF_R16G16F || CTexture::s_eTFZ == eTF_R32F || CTexture::s_eTFZ == eTF_R16G16B16A16F || CTexture::s_eTFZ == eTF_D24S8 || CTexture::s_eTFZ == eTF_D32FS8)
-        {
-            gcpRendD3D->m_RP.m_PersFlags2 &= ~(RBPF2_NOALPHABLEND | RBPF2_NOALPHATEST);
-            gcpRendD3D->m_RP.m_StateAnd |= (GS_BLEND_MASK | GS_ALPHATEST_MASK);
-        }
-
-        gcpRendD3D->FX_PopRenderTarget(0);
-        gcpRendD3D->FX_PopRenderTarget(1);
-    }
-
-    gcpRendD3D->FX_ResetPipe();
-    gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-
-    // Set everything back again
-    renderPipeline.m_ForceStateAnd = prevAnd;
-    renderPipeline.m_ForceStateOr = prevOr;
-    renderPipeline.m_PersFlags2 &= ~(RBPF2_POST_3D_RENDERER_PASS | RBPF2_CUSTOM_RENDER_PASS);
-    if (bCustomRender)
-    {
-        renderPipeline.m_PersFlags2 &= ~RBPF2_SINGLE_FORWARD_LIGHT_PASS;
-    }
-    gcpRendD3D->SetCamera(prevCamera);
-    p3DEngine->SetupDistanceFog();
-
-    if (bDoStencil)
-    {
-        GetUtils().EndStencilPrePass();
-        renderPipeline.m_ForceStateOr &= ~GS_STENCIL;
-    }
-}
-
-void CPost3DRenderer::AlphaCorrection()
-{
-    // Alpha correction - Override alpha using stencil, otherwise the alpha from the diffuse map will get copied
-    // into render target, which then will get used when drawing the 3D objects to screen
-    PROFILE_LABEL_SCOPE("ALPHA_CORRECTION");
-
-    const ColorF clearColor(0.0f, 0.0f, 0.0f, 0.0f);
-    gcpRendD3D->FX_PushRenderTarget(0, m_pTempRT, &gcpRendD3D->m_DepthBufferOrig);
-
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffects, m_alphaCorrectionTechName, FEF_DONTSETSTATES);
-
-    GetUtils().SetupStencilStates(FSS_STENCFUNC_EQUAL);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_STENCIL | GS_BLSRC_ONE | GS_BLDST_ONE_A_ZERO);
-
-    GetUtils().DrawFullScreenTri(m_pTempRT->GetWidth(), m_pTempRT->GetHeight());
-
-    GetUtils().ShEndPass();
-    GetUtils().SetupStencilStates(-1);
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-}
-
-void CPost3DRenderer::GammaCorrection(float screenRect[4])
-{
-    // Gamma correction and move to correct location on RT
-    PROFILE_LABEL_SCOPE("GAMMA_CORRECTION");
-
-    const int flashRTWidth = m_pFlashRT->GetWidth();
-    const int flashRTHeight = m_pFlashRT->GetHeight();
-
-    // Clear buffer for first group
-    if (m_post3DRendererflags & eP3DR_DirtyFlashRT)
-    {
-        m_post3DRendererflags &= ~eP3DR_DirtyFlashRT;
-
-        gcpRendD3D->FX_ClearTarget(m_pFlashRT, Clr_Transparent);
-    }
-
-    gcpRendD3D->FX_PushRenderTarget(0, m_pFlashRT, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, flashRTWidth, flashRTHeight);
-
-    const float rectWidth = max(screenRect[2] - screenRect[0], 0.0001f);
-    const float rectHeight = max(screenRect[3] - screenRect[1], 0.0001f);
-
-    // Super sample when we copy so double the size of the source texture uv's
-    float sourceRectWidth = rectWidth * 2.0f;
-    float sourceRectHeight = rectHeight * 2.0f;
-
-    // Clamp the size if larger than 1.0
-    if (sourceRectWidth >= sourceRectHeight)
-    {
-        if (sourceRectWidth > 1.0f)
-        {
-            sourceRectHeight *= (1.0f / sourceRectWidth);
-            sourceRectWidth = 1.0f;
-        }
-    }
-    else if (sourceRectHeight > 1.0f)
-    {
-        sourceRectWidth *= (1.0f / sourceRectHeight);
-        sourceRectHeight = 1.0f;
-    }
-
-    float halfSourceRectWidth = sourceRectWidth * 0.5f;
-    float halfSourceRectHeight = sourceRectHeight * 0.5f;
-
-    const float sourceLeft = max(0.5f - halfSourceRectWidth, 0.0f);
-    const float sourceRight = min(0.5f + halfSourceRectWidth, 1.0f);
-    const float sourceTop = max(0.5f - halfSourceRectHeight, 0.0f);
-    const float sourceBottom = min(0.5f + halfSourceRectHeight, 1.0f);
-    Vec2 pos[4];
-    Vec2 uv[4];
-
-    pos[0] = Vec2(screenRect[0], screenRect[1]);
-    pos[1] = Vec2(screenRect[0], screenRect[3]);
-    pos[2] = Vec2(screenRect[2], screenRect[3]);
-    pos[3] = Vec2(screenRect[2], screenRect[1]);
-
-    uv[0] = Vec2(sourceLeft, sourceTop);
-    uv[1] = Vec2(sourceLeft, sourceBottom);
-    uv[2] = Vec2(sourceRight, sourceBottom);
-    uv[3] = Vec2(sourceRight, sourceTop);
-
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffects, m_gammaCorrectionTechName, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-    GetUtils().SetTexture(m_pTempRT, 0, FILTER_LINEAR);
-
-    // VS params
-    Vec4 vsParam;
-    vsParam.x = sourceLeft; // Top
-    vsParam.y = sourceTop; // Left
-    vsParam.z = 1.0f / sourceRectWidth; // inv scale x
-    vsParam.w = 1.0f / sourceRectHeight; // inv scale y
-    CShaderMan::s_shPostEffects->FXSetVSFloat(m_vsParamName, &vsParam, 1);
-
-    // PS params
-    const Vec4 psParams(m_alpha, m_edgeFadeScale, 0.0f, 0.0f);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(m_psParamName, &psParams, 1);
-
-    const int blendState = GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE;
-    gcpRendD3D->FX_SetState(blendState);
-
-    GetUtils().DrawQuad(flashRTWidth, flashRTHeight,
-        pos[0], pos[1], pos[2], pos[3],
-        uv[0], uv[1], uv[2], uv[3]);
-
-    GetUtils().ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-}
-
-void CPost3DRenderer::ProcessRenderList(int list, uint32 batchFilter, uint8 groupId, float screenRect[4], bool bCustomRender)
-{
-    const int stage = 3;
-    gcpRendD3D->FX_PreRender(stage);
-
-    SRenderPipeline& renderPipeline = gcpRendD3D->m_RP;
-    renderPipeline.m_nPassGroupID = list;
-    renderPipeline.m_nPassGroupDIP = list;
-
-    SRenderListDesc* pRenderListDesc = gRenDev->m_RP.m_pRLD;
-
-    renderPipeline.m_nSortGroupID = 0;
-    int listStart = pRenderListDesc->m_nStartRI[renderPipeline.m_nSortGroupID][list];
-    int listEnd = pRenderListDesc->m_nEndRI[renderPipeline.m_nSortGroupID][list];
-    ProcessBatchesList(listStart, listEnd, batchFilter, groupId, screenRect, bCustomRender);
-
-    renderPipeline.m_nSortGroupID = 1;
-    listStart = pRenderListDesc->m_nStartRI[renderPipeline.m_nSortGroupID][list];
-    listEnd = pRenderListDesc->m_nEndRI[renderPipeline.m_nSortGroupID][list];
-    ProcessBatchesList(listStart, listEnd, batchFilter, groupId, screenRect, bCustomRender);
-
-    gcpRendD3D->FX_PostRender();
-}
-
-void CPost3DRenderer::ProcessBatchesList(int listStart, int listEnd, uint32 batchFilter, uint8 groupId, float screenRect[4], bool bCustomRender)
-{
-    // Basis for this function taken from FX_ProcessBatchesList
-
-    if ((listEnd - listStart) > 0)
-    {
-        gcpRendD3D->FX_StartBatching();
-
-        SRenderPipeline& renderPipeline = gcpRendD3D->m_RP;
-        const int threadID = renderPipeline.m_nProcessThreadID;
-        const int sortGroupID = renderPipeline.m_nSortGroupID;
-        const int passGroupID = renderPipeline.m_nPassGroupID;
-
-        auto& renderItems = CRenderView::CurrentRenderView()->GetRenderItems(sortGroupID, passGroupID);
-
-        renderPipeline.m_nBatchFilter = batchFilter;
-
-        CShader* pShader = NULL;
-        CShaderResources* pCurShaderResources = NULL;
-        CRenderObject* pCurObject = NULL;
-        CShader* pCurShader = NULL;
-        int tech = 0;
-
-        for (int i = listStart; i < listEnd; i++)
-        {
-            SRendItem& renderItem = renderItems[i];
-            if (!(renderItem.nBatchFlags & batchFilter))
-            {
-                continue;
-            }
-
-            assert(renderItem.pObj);
-            PREFAST_ASSUME(renderItem.pObj);
-            CRenderObject* pRenderObject = renderItem.pObj;
-
-            // Apply group filter and update group count
-            SRenderObjData* pRenderObjData = pRenderObject->GetObjData();
-            uint8 currentObjGroupId = pRenderObjData->m_nCustomData;
-            m_groupCount = max((uint8)(currentObjGroupId + 1), m_groupCount); // update group count
-            if (currentObjGroupId != groupId)
-            {
-                continue;
-            }
-
-            // Detect if shader has changed
-            IRenderElement* pRenderElement = renderItem.pElem;
-            bool bChangedShader = false;
-            CShaderResources* pShaderResources = NULL;
-            SRendItem::mfGet(renderItem.SortVal, tech, pShader, pShaderResources);
-
-            // Set custom shader
-            if (bCustomRender && pShader)
-            {
-                if (!pShader->FXSetTechnique(m_customRenderTechName))
-                {
-                    continue;
-                }
-                tech = renderPipeline.m_nShaderTechnique;
-            }
-
-            if ((pShader != pCurShader) ||
-                (!pShaderResources) ||
-                (!pCurShaderResources) ||
-                (pShaderResources->m_IdGroup != pCurShaderResources->m_IdGroup) ||
-                (pRenderObject->m_ObjFlags & (FOB_SKINNED | FOB_DECAL)))
-            {
-                bChangedShader = true;
-            }
-            pCurShaderResources = pShaderResources;
-
-            if (pRenderObject != pCurObject)
-            {
-                if (pCurShader)
-                {
-                    renderPipeline.m_pRenderFunc();
-                    pCurShader = NULL;
-                    bChangedShader = true;
-                }
-                if (!gcpRendD3D->FX_ObjectChange(pShader, pCurShaderResources, pRenderObject, pRenderElement))
-                {
-                    continue;
-                }
-                pCurObject = pRenderObject;
-            }
-
-            if (bChangedShader)
-            {
-                if (pCurShader)
-                {
-                    renderPipeline.m_pRenderFunc();
-                }
-                pCurShader = pShader;
-                gcpRendD3D->FX_Start(pShader, tech, pCurShaderResources, pRenderElement);
-            }
-
-            pRenderElement->mfPrepare(true);
-
-            if (renderPipeline.m_RIs[0].size() == 0)
-            {
-                // Add item to batch
-                renderPipeline.m_RIs[0].AddElem(&renderItem);
-
-                // Update screen rect
-                memcpy(screenRect, &pRenderObjData->m_fTempVars[5], sizeof(float) * 4);
-                if (pRenderObjData->m_nHUDSilhouetteParams)
-                {
-                    m_post3DRendererflags |= eP3DR_HasSilhouettes;
-                }
-
-                // Set current alpha to be the minimum object within group
-                const float objAlpha = pRenderObjData->m_fTempVars[9];
-                m_alpha = min(objAlpha, m_alpha);
-            }
-        }
-        if (pCurShader)
-        {
-            renderPipeline.m_pRenderFunc();
-        }
-    }
-}
-
-void CPost3DRenderer::RenderSilhouettes(uint8 groupId, float screenRect[4])
-{
-    PROFILE_LABEL_SCOPE("SILHOUTTES");
-
-    RenderMeshes(groupId, screenRect, eRMM_Custom);
-
-    CTexture* pOutlineTex = CTexture::s_ptexBackBufferScaled[0];
-    CTexture* pGlowTex = CTexture::s_ptexBackBufferScaled[1];
-
-    ApplyShaderQuality();
-    SilhouetteOutlines(pOutlineTex, pGlowTex);
-    SilhouetteGlow(pOutlineTex, pGlowTex);
-    SilhouetteCombineBlurAndOutline(pOutlineTex, pGlowTex);
-    GammaCorrection(screenRect);
-}
-
-void CPost3DRenderer::SilhouetteCombineBlurAndOutline(CTexture* pOutlineTex, CTexture* pGlowTex)
-{
-    PROFILE_LABEL_SCOPE("COMBINE_BLUR_AND_OUTLINE");
-
-    // Combine blur and outline
-    gcpRendD3D->FX_ClearTarget(m_pTempRT, Clr_Transparent);
-    gcpRendD3D->FX_PushRenderTarget(0, m_pTempRT, NULL);
-
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffects, m_combineSilhouettesTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gRenDev->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONE);
-
-    GetUtils().SetTexture(pOutlineTex, 0, FILTER_LINEAR);
-    GetUtils().SetTexture(pGlowTex, 1, FILTER_LINEAR);
-
-    // Set PS default params
-    const float silhouetteStrength = max(m_pSilhouetteStrength->GetParam(), 0.0f);
-    const float fillStrength = 0.02f;
-    const float glowStrength = 0.5f;
-
-    const Vec4 psParams(silhouetteStrength, fillStrength, glowStrength, 0.0f);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(m_psParamName, &psParams, 1);
-
-    GetUtils().DrawFullScreenTri(m_pTempRT->GetWidth(), m_pTempRT->GetHeight());
-    GetUtils().ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-}
-
-void CPost3DRenderer::SilhouetteGlow(CTexture* pOutlineTex, CTexture* pGlowTex)
-{
-    PROFILE_LABEL_SCOPE("GLOW");
-
-    GetUtils().StretchRect(pOutlineTex, pGlowTex);
-    GetUtils().TexBlurIterative(pGlowTex, 1, false);
-    gcpRendD3D->RT_SetViewport(0, 0, gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-}
-
-void CPost3DRenderer::SilhouetteOutlines(CTexture* pOutlineTex, [[maybe_unused]] CTexture* pGlowTex)
-{
-    PROFILE_LABEL_SCOPE("OUTLINES");
-
-    // Set improved (expensive) edge detection flag
-    CD3D9Renderer* const __restrict pRD = gcpRendD3D;
-    const uint64 prevRTFlags = pRD->m_RP.m_FlagsShader_RT;
-    pRD->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-    gcpRendD3D->FX_PushRenderTarget(0, pOutlineTex, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, pOutlineTex->GetWidth(), pOutlineTex->GetHeight());
-
-    GetUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, m_silhouetteTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-    // Set shader params
-    const float edgeScale = 1.0f;
-    const float fillSrength = 0.1f;
-
-    const Vec4 vsParams(edgeScale, 0.0f, 0.0f, 0.0f);
-    const Vec4 psParams(0.0f, 0.0f, 0.0f, fillSrength);
-    CShaderMan::s_shPostEffectsGame->FXSetVSFloat(m_vsParamName, &vsParams, 1);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(m_psParamName, &psParams, 1);
-
-    GetUtils().SetTexture(m_pTempRT, 0, FILTER_LINEAR);
-    GetUtils().SetTexture(CTexture::s_ptexZTarget, 1, FILTER_POINT);
-    GetUtils().DrawFullScreenTri(CTexture::s_ptexSceneTarget->GetWidth(), CTexture::s_ptexSceneTarget->GetHeight());
-
-    GetUtils().ShEndPass();
-    gcpRendD3D->FX_PopRenderTarget(0);
-
-    // Revert shader flags
-    pRD->m_RP.m_FlagsShader_RT = prevRTFlags;
-}
-
-void CPost3DRenderer::ApplyShaderQuality(EShaderType shaderType)
-{
-    CD3D9Renderer* const __restrict pRD = gcpRendD3D;
-
-    // Retrieve quality for shader type
-    SShaderProfile* pSP = &pRD->m_cEF.m_ShaderProfiles[shaderType];
-    int nQuality = (int)pSP->GetShaderQuality();
-
-    // Apply correct flag set
-    pRD->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_QUALITY] | g_HWSR_MaskBit[HWSR_QUALITY1]);
-    pRD->m_RP.m_nShaderQuality = nQuality;
-
-    switch (nQuality)
-    {
-    case eSQ_Medium:
-        pRD->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_QUALITY];
-        break;
-    case eSQ_High:
-        pRD->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_QUALITY1];
-        break;
-    case eSQ_VeryHigh:
-        pRD->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_QUALITY];
-        pRD->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_QUALITY1];
-        break;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessMotionBlur.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessMotionBlur.cpp
deleted file mode 100644
index 0b1eb7b1b4..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessMotionBlur.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-
-// All code here, besides CMotionBlur::Preprocess is a direct copy & modification of the CMotionBlurPass code found in GraphicsPipeline/MotionBlur.cpp.
-
-void CMotionBlur::CopyAndScaleDoFBuffer(CTexture* pSrcTex, CTexture* pDestTex)
-{
-    CD3D9Renderer* const __restrict rd = gcpRendD3D;
-
-    if (pSrcTex == NULL || pDestTex == NULL)
-    {
-        return;
-    }
-
-    PROFILE_LABEL_SCOPE("Motion Blur - Scale & Copy DoF");
-
-    bool bResample = pSrcTex->GetWidth() != pDestTex->GetWidth() || pSrcTex->GetHeight() != pDestTex->GetHeight();
-    const D3DFormat destFormat = CTexture::DeviceFormatFromTexFormat(pDestTex->GetDstFormat());
-    const D3DFormat srcFormat = CTexture::DeviceFormatFromTexFormat(pSrcTex->GetDstFormat());
-
-    if (!bResample && destFormat == srcFormat)
-    {
-        rd->GetDeviceContext().CopyResource(pDestTex->GetDevTexture()->GetBaseTexture(), pSrcTex->GetDevTexture()->GetBaseTexture());
-        return;
-    }
-
-    static CCryNameTSCRC techTexToTex("TextureToTexture");
-    static CCryNameTSCRC techTexToTexResampled("TextureToTextureResampled");
-
-    gcpRendD3D->FX_PushRenderTarget(0, pDestTex, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, pDestTex->GetWidth(), pDestTex->GetHeight());
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, bResample ? techTexToTexResampled : techTexToTex, 0);
-    gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-    int texFilter = CTexture::GetTexState(STexState(bResample ? FILTER_LINEAR : FILTER_POINT, true));
-    PostProcessUtils().SetTexture(pSrcTex, 0, texFilter);
-
-    static CCryNameR param0Name("texToTexParams0");
-    static CCryNameR param1Name("texToTexParams1");
-
-    const bool bBigDownsample = false;  // TODO
-    CTexture* pOffsetTex = bBigDownsample ? pDestTex : pSrcTex;
-
-    float s1 = 0.5f / (float)pOffsetTex->GetWidth();  // 2.0 better results on lower res images resizing
-    float t1 = 0.5f / (float)pOffsetTex->GetHeight();
-
-    Vec4 params0, params1;
-    if (bBigDownsample)
-    {
-        // Use rotated grid + middle sample (~Quincunx)
-        params0 = Vec4(s1 * 0.96f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);
-        params1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);
-    }
-    else
-    {
-        // Use box filtering (faster - can skip bilinear filtering, only 4 taps)
-        params0 = Vec4(-s1, -t1, s1, -t1);
-        params1 = Vec4(s1, t1, -s1, t1);
-    }
-
-    CShaderMan::s_shPostEffects->FXSetPSFloat(param0Name, &params0, 1);
-    CShaderMan::s_shPostEffects->FXSetPSFloat(param1Name, &params1, 1);
-
-    PostProcessUtils().DrawFullScreenTri(pDestTex->GetWidth(), pDestTex->GetHeight());
-    PostProcessUtils().ShEndPass();
-    gcpRendD3D->FX_PopRenderTarget(0);
-}
-
-float CMotionBlur::ComputeMotionScale()
-{
-    static float storedMotionScale = 0.0f;
-    if (gEnv->pTimer->IsTimerPaused(ITimer::ETIMER_GAME))
-    {
-        return storedMotionScale;
-    }
-
-    // The length of the generated motion vectors is proportional to the current time step, so we need
-    // to rescale the motion vectors to simulate a constant camera exposure time
-
-    float exposureTime = 1.0f / std::max(CRenderer::CV_r_MotionBlurShutterSpeed, 1e-6f);
-    float timeStep = std::max(gEnv->pTimer->GetFrameTime(), 1e-6f);
-
-    exposureTime *= gEnv->pTimer->GetTimeScale();
-
-    storedMotionScale = exposureTime / timeStep;
-    return storedMotionScale;
-}
-
-void CMotionBlur::Render()
-{
-    PROFILE_LABEL_SCOPE("MB");
-
-    CD3D9Renderer* rd = gcpRendD3D;
-    CShader* pShader = CShaderMan::s_shPostMotionBlur;
-
-    int vpX, vpY, vpWidth, vpHeight;
-    rd->GetViewport(&vpX, &vpY, &vpWidth, &vpHeight);
-
-    // Check if DOF is enabled
-    CDepthOfField* pDofRenderTech = (CDepthOfField*)PostEffectMgr()->GetEffect(ePFX_eDepthOfField);
-    DepthOfFieldParameters dofParameters = pDofRenderTech->GetParameters();
-    const bool bGatherDofEnabled = CRenderer::CV_r_dof > 0 && dofParameters.m_bEnabled;
-
-    Matrix44A mViewProjPrev = GetPrevView();
-    Matrix44 mViewProj = PostProcessUtils().m_pView;
-    mViewProjPrev = mViewProjPrev * PostProcessUtils().m_pProj * PostProcessUtils().m_pScaleBias;
-    mViewProjPrev.Transpose();
-
-    CTexture* pVelocityRT = CTexture::s_ptexVelocity;
-    float tileCountX = (float)CTexture::s_ptexVelocityTiles[1]->GetWidth();
-    float tileCountY = (float)CTexture::s_ptexVelocityTiles[1]->GetHeight();
-
-    static CCryNameR motionBlurParamName("vMotionBlurParams");
-
-    int texStateLinear = CTexture::GetTexState(STexState(FILTER_LINEAR, true));
-    int texStatePoint = CTexture::GetTexState(STexState(FILTER_POINT, true));
-
-    {
-        PROFILE_LABEL_SCOPE("PACK VELOCITY");
-
-        static CCryNameTSCRC techPackVelocities("PackVelocities");
-        static CCryNameR viewProjPrevName("mViewProjPrev");
-        static CCryNameR dirBlurName("vDirectionalBlur");
-        static CCryNameR radBlurName("vRadBlurParam");
-
-        const float maxRange = 32.0f;
-        const float amount = clamp_tpl<float>(m_pRadBlurAmount->GetParam() / maxRange, 0.0f, 1.0f);
-        const float radius = 1.0f / clamp_tpl<float>(m_pRadBlurRadius->GetParam(), 1e-6f, 2.0f);
-        const Vec4 blurDir = m_pDirectionalBlurVec->GetParamVec4();
-        const Vec4 dirBlurParam = Vec4(blurDir.x * (maxRange / (float)vpWidth), blurDir.y * (maxRange / (float)vpHeight), (float)vpWidth / (float)vpHeight, 1.0f);
-        const Vec4 radBlurParam = Vec4(m_pRadBlurScreenPosX->GetParam() * dirBlurParam.z, m_pRadBlurScreenPosY->GetParam(), radius * amount, amount);
-
-        const bool bRadialBlur = amount + (blurDir.x * blurDir.x) + (blurDir.y * blurDir.y) > 1.0f / (float)vpWidth;
-
-        uint64 mask = bRadialBlur ? g_HWSR_MaskBit[HWSR_SAMPLE0] : 0;
-        AZ_Assert(((mask >> 32) & 0xFFFFFFFF) == 0, "Make sure we aren't trying to use the top 32 bits, as they will be lost");
-
-
-        gcpRendD3D->FX_PushRenderTarget(0, pVelocityRT, NULL);
-        gcpRendD3D->RT_SetViewport(0, 0, pVelocityRT->GetWidth(), pVelocityRT->GetHeight());
-        PostProcessUtils().ShBeginPass(pShader, techPackVelocities, (uint32)mask);
-        gRenDev->FX_SetState(GS_NODEPTHTEST);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexZTarget, 0, texStatePoint);
-        PostProcessUtils().SetTexture(CTexture::s_ptexHDRTarget, 1, texStatePoint);
-        PostProcessUtils().SetTexture(PostProcessUtils().GetVelocityObjectRT(), 2, texStatePoint);
-
-        mViewProjPrev.Transpose();
-        pShader->FXSetPSFloat(viewProjPrevName, (Vec4*)mViewProjPrev.GetData(), 4);
-        pShader->FXSetPSFloat(dirBlurName, &dirBlurParam, 1);
-        pShader->FXSetPSFloat(radBlurName, &radBlurParam, 1);
-        const Vec4 motionBlurParams = Vec4(ComputeMotionScale(), 1.0f / tileCountX, 1.0f / tileCountX * CRenderer::CV_r_MotionBlurCameraMotionScale, 0);
-        pShader->FXSetPSFloat(motionBlurParamName, &motionBlurParams, 1);
-
-        PostProcessUtils().DrawFullScreenTriWPOS(pVelocityRT->GetWidth(), pVelocityRT->GetHeight());
-        PostProcessUtils().ShEndPass();
-        gcpRendD3D->FX_PopRenderTarget(0);
-
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("VELOCITY TILES");
-
-        static CCryNameTSCRC techVelocityTileGen("VelocityTileGen");
-        static CCryNameTSCRC techTileNeighborhood("VelocityTileNeighborhood");
-
-        // Tile generation first pass
-        {
-            CTexture* pVelocityTile = CTexture::s_ptexVelocityTiles[0];
-
-            gcpRendD3D->FX_PushRenderTarget(0, pVelocityTile, NULL);
-            gcpRendD3D->RT_SetViewport(0, 0, pVelocityTile->GetWidth(), pVelocityTile->GetHeight());
-            PostProcessUtils().ShBeginPass(pShader, techVelocityTileGen, 0);
-            gRenDev->FX_SetState(GS_NODEPTHTEST);
-            PostProcessUtils().SetTexture(pVelocityRT, 0, texStatePoint);
-
-            Vec4 params = Vec4((float)pVelocityRT->GetWidth(), (float)pVelocityRT->GetHeight(), ceilf((float)gcpRendD3D->GetWidth() / tileCountX), 0);
-            pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-
-            PostProcessUtils().DrawFullScreenTri(pVelocityTile->GetWidth(), pVelocityTile->GetHeight());
-            PostProcessUtils().ShEndPass();
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        // Tile generation second pass
-        {
-            CTexture* pVelocityTile = CTexture::s_ptexVelocityTiles[1];
-
-            gcpRendD3D->FX_PushRenderTarget(0, pVelocityTile, NULL);
-            gcpRendD3D->RT_SetViewport(0, 0, pVelocityTile->GetWidth(), pVelocityTile->GetHeight());
-            PostProcessUtils().ShBeginPass(pShader, techVelocityTileGen, 0);
-            gRenDev->FX_SetState(GS_NODEPTHTEST);
-            PostProcessUtils().SetTexture(CTexture::s_ptexVelocityTiles[0], 0, texStatePoint);
-
-            Vec4 params = Vec4((float)CTexture::s_ptexVelocityTiles[0]->GetWidth(), (float)CTexture::s_ptexVelocityTiles[0]->GetHeight(), ceilf((float)gcpRendD3D->GetHeight() / tileCountY), 1);
-            pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-
-            PostProcessUtils().DrawFullScreenTri(pVelocityTile->GetWidth(), pVelocityTile->GetHeight());
-            PostProcessUtils().ShEndPass();
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        // Neighborhood max
-        {
-            CTexture* pVelocityTile = CTexture::s_ptexVelocityTiles[2];
-
-            gcpRendD3D->FX_PushRenderTarget(0, pVelocityTile, NULL);
-            gcpRendD3D->RT_SetViewport(0, 0, pVelocityTile->GetWidth(), pVelocityTile->GetHeight());
-            PostProcessUtils().ShBeginPass(pShader, techTileNeighborhood, 0);
-            gRenDev->FX_SetState(GS_NODEPTHTEST);
-            PostProcessUtils().SetTexture(CTexture::s_ptexVelocityTiles[1], 0, texStatePoint);
-
-            Vec4 params = Vec4(1.0f / tileCountX, 1.0f / tileCountY, 0, 0);
-            pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-
-            PostProcessUtils().DrawFullScreenTri(pVelocityTile->GetWidth(), pVelocityTile->GetHeight());
-            PostProcessUtils().ShEndPass();
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-    }
-
-    {
-        PROFILE_LABEL_SCOPE("MOTION VECTOR APPLY");
-
-        static CCryNameTSCRC techMotionBlur("MotionBlur");
-
-        if (bGatherDofEnabled)
-        {
-            CopyAndScaleDoFBuffer(CTexture::s_ptexHDRTarget, CTexture::s_ptexSceneTargetR11G11B10F[0]);
-        }
-
-        uint64 rtMask = 0;
-        rtMask |= (CRenderer::CV_r_MotionBlurQuality >= 2) ? g_HWSR_MaskBit[HWSR_SAMPLE2] : 0;
-        rtMask |= (CRenderer::CV_r_MotionBlurQuality == 1) ? g_HWSR_MaskBit[HWSR_SAMPLE1] : 0;
-
-        CTexture* pHDRTarget = CTexture::s_ptexHDRTarget;
-        AZ_Assert(((rtMask >> 32) & 0xFFFFFFFF) == 0, "Make sure we aren't trying to use the top 32 bits, as they will be lost");
-
-        gcpRendD3D->FX_PushRenderTarget(0, pHDRTarget, NULL);
-        gcpRendD3D->RT_SetViewport(0, 0, pHDRTarget->GetWidth(), pHDRTarget->GetHeight());
-        PostProcessUtils().ShBeginPass(pShader, techMotionBlur, (uint32)rtMask);
-        gRenDev->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_ONE | GS_BLDST_ONEMINUSSRCALPHA);
-        PostProcessUtils().SetTexture(bGatherDofEnabled ? CTexture::s_ptexSceneTargetR11G11B10F[0] : CTexture::s_ptexHDRTargetPrev, 0, texStateLinear);
-        PostProcessUtils().SetTexture(pVelocityRT, 1, texStatePoint);
-        PostProcessUtils().SetTexture(CTexture::s_ptexVelocityTiles[2], 2, texStatePoint);
-
-        Vec4 params = Vec4(1.0f / tileCountX, 1.0f / tileCountY, 0, 0);
-        pShader->FXSetPSFloat(motionBlurParamName, &params, 1);
-
-
-        PostProcessUtils().DrawFullScreenTri(pHDRTarget->GetWidth(), pHDRTarget->GetHeight());
-        PostProcessUtils().ShEndPass();
-        gcpRendD3D->FX_PopRenderTarget(0);
-    }
-}
-
-bool CMotionBlur::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (!CRenderer::CV_r_PostProcessFilters)
-    {
-        return false;
-    }
-
-    if (!CRenderer::CV_r_MotionBlur)
-    {
-        return false;
-    }
-
-    if (!CRenderer::CV_r_RenderMotionBlurAfterHDR)
-    {
-        return false;
-    }
-
-    return true;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessRain.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessRain.cpp
deleted file mode 100644
index b7cbb42737..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessRain.cpp
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "../Common/Textures/TextureManager.h"
-
-#include <AzCore/std/algorithm.h>
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const char* CRainDrops::GetName() const
-{
-    return "RainDrops";
-}
-
-bool CRainDrops::Preprocess()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-    if (!bQualityCheck)
-    {
-        return false;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_RainDropsEffect == 0)
-    {
-        return false;
-    }
-
-    bool bRainActive = IsActiveRain();
-
-    if (m_bFirstFrame)
-    { //initialize with valid value on 1st frame
-        m_pPrevView = PostProcessUtils().m_pView;
-    }
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_RainDropsEffect > 2)
-    {
-        return true;
-    }
-
-    return bRainActive;
-}
-
-
-bool CRainDrops::IsActiveRain()
-{
-    static float s_fLastSpawnTime = -1.0f;
-
-    if (m_pAmount->GetParam() > 0.09f || m_nAliveDrops)
-    {
-        s_fLastSpawnTime = 0.0f;
-        return true;
-    }
-
-    if (s_fLastSpawnTime == 0.0f)
-    {
-        s_fLastSpawnTime = PostProcessUtils().m_pTimer->GetCurrTime();
-    }
-
-    if (fabs(PostProcessUtils().m_pTimer->GetCurrTime() - s_fLastSpawnTime) < 1.0f)
-    {
-        return true;
-    }
-    return false;
-}
-
-void CRainDrops::SpawnParticle(SRainDrop*& pParticle, int iRTWidth, int iRTHeight)
-{
-    static SRainDrop pNewDrop;
-
-    static float fLastSpawnTime = 0.0f;
-
-    float fUserSize = 5.0f;//m_pSize->GetParam();
-    float fUserSizeVar = 2.5f;//m_pSizeVar->GetParam();
-
-    if (cry_random(0.0f, 1.0f) > 0.5f && fabs(PostProcessUtils().m_pTimer->GetCurrTime() - fLastSpawnTime) > m_pSpawnTimeDistance->GetParam())
-    {
-        pParticle->m_pPos.x = cry_random(0.0f, 1.0f);
-        pParticle->m_pPos.y = cry_random(0.0f, 1.0f);
-
-        pParticle->m_fLifeTime = pNewDrop.m_fLifeTime + pNewDrop.m_fLifeTimeVar * cry_random(-1.0f, 1.0f);
-        //pParticle->m_fSize = (pNewDrop.m_fSize + pNewDrop.m_fSizeVar * cry_random(-1.0f, 1.0f)) * 2.5f;
-        //pNewDrop.m_fSize + pNewDrop.m_fSizeVar
-        pParticle->m_fSize = 1.0f / (10.0f * (fUserSize  + 0.5f * fUserSizeVar * cry_random(-1.0f, 1.0f)));
-
-        pParticle->m_pPos.x -= pParticle->m_fSize  / (float)iRTWidth;
-        pParticle->m_pPos.y -= pParticle->m_fSize  / (float)iRTHeight;
-
-        pParticle->m_fSpawnTime = PostProcessUtils().m_pTimer->GetCurrTime();
-        pParticle->m_fWeight = 0.0f; // default weight to force rain drop to be stopped for a while
-
-        fLastSpawnTime = PostProcessUtils().m_pTimer->GetCurrTime();
-    }
-    else
-    {
-        pParticle->m_fSize = 0.0f;
-    }
-}
-
-void CRainDrops::UpdateParticles(int iRTWidth, int iRTHeight)
-{
-    SRainDropsItor pItor, pItorEnd = m_pDropsLst.end();
-
-    // Store camera parameters
-    Vec3 vz = gcpRendD3D->GetViewParameters().vZ;  // front vec
-    float fDot = vz.Dot(Vec3(0, 0, -1.0f));
-    float fGravity = 1.0f - fabs(fDot);
-
-    float fCurrFrameTime = 10.0f * gEnv->pTimer->GetFrameTime();
-
-    bool bAllowSpawn(m_pAmount->GetParam() > 0.005f);
-
-    m_nAliveDrops = 0;
-    static int s_nPrevAliveDrops = 0;
-
-    for (pItor = m_pDropsLst.begin(); pItor != pItorEnd; ++pItor)
-    {
-        SRainDrop* pCurr = (*pItor);
-
-        float fCurrLifeTime = (PostProcessUtils().m_pTimer->GetCurrTime() - pCurr->m_fSpawnTime) / pCurr->m_fLifeTime;
-
-        // particle died, spawn new
-        if (fabs(fCurrLifeTime) > 1.0f || pCurr->m_fSize < 0.01f)
-        {
-            if (bAllowSpawn)
-            {
-                SpawnParticle(pCurr, iRTWidth, iRTHeight);
-            }
-            else
-            {
-                pCurr->m_fSize = 0.0f;
-                continue;
-            }
-        }
-
-        m_nAliveDrops++;
-
-        // update position, etc
-
-        // add gravity
-        pCurr->m_pPos.y += m_pVelocityProj.y * cry_random(-0.2f, 1.0f);
-        pCurr->m_pPos.y += fCurrFrameTime * fGravity * AZStd::GetMin(pCurr->m_fWeight, 0.5f * pCurr->m_fSize);
-        // random horizontal movement and size + camera horizontal velocity
-        pCurr->m_pPos.x += m_pVelocityProj.x * cry_random(-0.2f, 1.0f);
-        pCurr->m_pPos.x += fCurrFrameTime * AZStd::GetMin(pCurr->m_fWeight, 0.25f * pCurr->m_fSize) * fGravity * cry_random(-1.0f, 1.0f);
-
-        // Increase/decrease weight randomly
-        pCurr->m_fWeight = clamp_tpl<float>(pCurr->m_fWeight + fCurrFrameTime * pCurr->m_fWeightVar * cry_random(-4.0f, 4.0f), 0.0f, 1.0f);
-    }
-
-    if (s_nPrevAliveDrops == 0  &&  m_nAliveDrops > 0)
-    {
-        m_bFirstFrame = true;
-    }
-
-    s_nPrevAliveDrops = m_nAliveDrops;
-}
-
-Matrix44 CRainDrops::ComputeCurrentView(int iViewportWidth, int iViewportHeight)
-{
-    Matrix44 pCurrView(PostProcessUtils().m_pView);
-    Matrix44 pCurrProj(PostProcessUtils().m_pProj);
-
-    Matrix33 pLerpedView;
-    pLerpedView.SetIdentity();
-
-    float fCurrFrameTime = gEnv->pTimer->GetFrameTime();
-    // scale down speed a bit
-    float fAlpha = iszero (fCurrFrameTime) ? 0.0f : .0005f / (fCurrFrameTime);
-
-    // Interpolate matrixes and position
-    pLerpedView = Matrix33(pCurrView) * (1 - fAlpha) + Matrix33(m_pPrevView) * fAlpha;
-
-    Vec3 pLerpedPos = Vec3::CreateLerp(pCurrView.GetRow(3), m_pPrevView.GetRow(3), fAlpha);
-
-    // Compose final 'previous' viewProjection matrix
-    Matrix44 pLView = pLerpedView;
-    pLView.m30 = pLerpedPos.x;
-    pLView.m31 = pLerpedPos.y;
-    pLView.m32 = pLerpedPos.z;
-
-    m_pViewProjPrev = pLView * pCurrProj;
-    m_pViewProjPrev.Transpose();
-
-    // Compute camera velocity vector
-    Vec3 vz = gcpRendD3D->GetViewParameters().vZ;    // front vec
-    Vec3 vMoveDir = gcpRendD3D->GetViewParameters().vOrigin - vz;
-    Vec4 vCurrPos = Vec4(vMoveDir.x, vMoveDir.y, vMoveDir.z, 1.0f);
-
-    Matrix44 pViewProjCurr (PostProcessUtils().m_pViewProj);
-
-    Vec4 pProjCurrPos = pViewProjCurr * vCurrPos;
-
-    pProjCurrPos.x = ((pProjCurrPos.x + pProjCurrPos.w) * 0.5f + (1.0f / (float) iViewportWidth) * pProjCurrPos.w) / pProjCurrPos.w;
-    pProjCurrPos.y = ((pProjCurrPos.w - pProjCurrPos.y) * 0.5f + (1.0f / (float) iViewportHeight) * pProjCurrPos.w) / pProjCurrPos.w;
-
-    Vec4 pProjPrevPos = m_pViewProjPrev * vCurrPos;
-
-    pProjPrevPos.x = ((pProjPrevPos.x + pProjPrevPos.w) * 0.5f + (1.0f / (float) iViewportWidth) * pProjPrevPos.w) / pProjPrevPos.w;
-    pProjPrevPos.y = ((pProjPrevPos.w - pProjPrevPos.y) * 0.5f + (1.0f / (float) iViewportHeight) * pProjPrevPos.w) / pProjPrevPos.w;
-
-    m_pVelocityProj = Vec3(pProjCurrPos.x - pProjPrevPos.x, pProjCurrPos.y - pProjPrevPos.y, 0);
-
-    return pCurrView;
-}
-
-void CRainDrops::Render()
-{
-    PROFILE_LABEL_SCOPE("RAIN_DROPS");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    int iViewportX, iViewportY, iViewportWidth, iViewportHeight;
-    gcpRendD3D->GetViewport(&iViewportX, &iViewportY, &iViewportWidth, &iViewportHeight);
-
-    Matrix44 pCurrView = ComputeCurrentView(iViewportWidth, iViewportHeight);
-
-    uint16    uPrevDytex  = (m_uCurrentDytex + 1) % 2;
-    CTexture*&    rpPrevDytex = CTexture::s_ptexRainDropsRT[uPrevDytex];
-    assert(rpPrevDytex);
-    CTexture*&    rpCurrDytex = CTexture::s_ptexRainDropsRT[m_uCurrentDytex];
-    assert(rpCurrDytex);
-    int       iRTWidth    = rpCurrDytex->GetWidth();
-    int       iRTHeight   = rpCurrDytex->GetHeight();
-
-    UpdateParticles(iRTWidth, iRTHeight);
-
-    gcpRendD3D->FX_PushRenderTarget(0, rpCurrDytex, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, iRTWidth, iRTHeight);
-    {
-        ApplyExtinction(rpPrevDytex, iViewportWidth, iViewportHeight, iRTWidth, iRTHeight);
-        DrawRaindrops(iViewportWidth, iViewportHeight, iRTWidth, iRTHeight);
-    }
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-
-    gcpRendD3D->RT_SetViewport(iViewportX, iViewportY, iViewportWidth, iViewportHeight);
-
-    DrawFinal(rpCurrDytex);
-
-    m_uCurrentDytex = (m_uCurrentDytex + 1) % 2;
-
-    // store previous frame data
-    m_pPrevView =  pCurrView;
-    m_bFirstFrame = false;
-}
-
-void CRainDrops::DrawRaindrops([[maybe_unused]] int iViewportWidth, [[maybe_unused]] int iViewportHeight, int iRTWidth, int iRTHeight)
-{
-    PROFILE_LABEL_SCOPE("RAIN_DROPS_RAINDROPS");
-
-    float fScreenW = iRTWidth;
-    float fScreenH = iRTHeight;
-
-
-    TransformationMatrices backupSceneMatrices;
-
-    gcpRendD3D->Set2DMode(iRTWidth, iRTHeight, backupSceneMatrices);
-
-    //clear and set render flags
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-
-    //if( fDot >= - 0.25)
-    {
-        // render particles into effects rain map
-        static CCryNameTSCRC pTech0Name("RainDropsGen");
-
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTech0Name, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        gcpRendD3D->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ONE |  GS_NODEPTHTEST); //additive
-
-        // override blend operation from additive to max (max(src,dst) gets written)
-        SStateBlend bl = gcpRendD3D->m_StatesBL[gcpRendD3D->m_nCurStateBL];
-        bl.Desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_MAX;
-        bl.Desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_MAX;
-        gcpRendD3D->SetBlendState(&bl);
-
-        SRainDropsItor pItor, pItorEnd = m_pDropsLst.end();
-        for (pItor = m_pDropsLst.begin(); pItor != pItorEnd; ++pItor)
-        {
-            SRainDrop* pCurr = (*pItor);
-
-            if (pCurr->m_fSize < 0.01f)
-            {
-                continue;
-            }
-
-            // render a sprite
-            float x0 = pCurr->m_pPos.x * fScreenW;
-            float y0 = pCurr->m_pPos.y * fScreenH;
-
-            float x1 = (pCurr->m_pPos.x + pCurr->m_fSize * (fScreenH / fScreenW)) * fScreenW;
-            float y1 = (pCurr->m_pPos.y + pCurr->m_fSize) * fScreenH;
-
-            float fCurrLifeTime = (PostProcessUtils().m_pTimer->GetCurrTime() - pCurr->m_fSpawnTime) / pCurr->m_fLifeTime;
-            Vec4 vRainParams = Vec4(1.0f, 1.0f, 1.0f, 1.0f - fCurrLifeTime);
-
-            static CCryNameR pParam0Name("vRainParams");
-            CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParam0Name, &vRainParams, 1);
-            PostProcessUtils().DrawScreenQuad(256, 256, x0, y0, x1, y1);
-        }
-
-        // restore previous blend operation
-        bl.Desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-        bl.Desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-        gcpRendD3D->SetBlendState(&bl);
-
-        PostProcessUtils().ShEndPass();
-    }
-
-    gcpRendD3D->Unset2DMode(backupSceneMatrices);
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-void CRainDrops::ApplyExtinction(CTexture*& rptexPrevRT, int iViewportWidth, int iViewportHeight, int iRTWidth, int iRTHeight)
-{
-    //restore black texture to backbuffer for cleaning
-    CTexture*   pTex = CTextureManager::Instance()->GetBlackTexture();
-    PostProcessUtils().CopyTextureToScreen(pTex);
-
-    PROFILE_LABEL_SCOPE("RAIN_DROPS_EXTINCTION");
-    if (!m_bFirstFrame)
-    {
-        // Store camera parameters
-        Vec3 vx = gcpRendD3D->GetViewParameters().vX;    // up vec
-        Vec3 vy = gcpRendD3D->GetViewParameters().vY;    // right vec
-        Vec3 vz = gcpRendD3D->GetViewParameters().vZ;    // front vec
-        float fDot = vz.Dot(Vec3(0, 0, -1.0f));
-        float fGravity = (1.0f - fabs(fDot));
-        float fFrameScale = 4.0f * gEnv->pTimer->GetFrameTime();
-        Vec4 vRainNormalMapParams = Vec4(m_pVelocityProj.x * ((float) iViewportWidth), 0, fFrameScale * fGravity, fFrameScale * 1.0f + m_pVelocityProj.y * ((float) iViewportHeight)) * 0.25f;
-
-        //texture to restore
-        CTexture*   pPrevTexture = rptexPrevRT;
-
-        // apply extinction
-        static CCryNameTSCRC pTech1Name("RainDropsExtinction");
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTech1Name, FEF_DONTSETSTATES);   //FEF_DONTSETTEXTURES |
-
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-        static CCryNameR pParam1Name("vRainNormalMapParams");
-        PostProcessUtils().ShSetParamVS(pParam1Name, vRainNormalMapParams);
-
-        vRainNormalMapParams.w = fFrameScale;
-        static CCryNameR pParam0Name("vRainParams");
-        PostProcessUtils().ShSetParamPS(pParam0Name, vRainNormalMapParams);
-
-        PostProcessUtils().SetTexture(pPrevTexture, 0, FILTER_LINEAR);
-
-        PostProcessUtils().DrawFullScreenTri(iRTWidth, iRTHeight);
-
-        PostProcessUtils().ShEndPass();
-    }
-}
-
-
-void CRainDrops::DrawFinal(CTexture*& rptexCurrRT)
-{
-    PROFILE_LABEL_SCOPE("RAIN_DROPS_FINAL");
-
-    //clear and set render flags
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2]);
-
-    // display rain
-    static CCryNameTSCRC pTechName("RainDropsFinal");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    static CCryNameR pParam0Name("vRainNormalMapParams");
-    PostProcessUtils().ShSetParamVS(pParam0Name, Vec4(1.0f, 1.0f, 1.0f, -1.0f));
-    static CCryNameR pParam1Name("vRainParams");
-    PostProcessUtils().ShSetParamPS(pParam1Name, Vec4(1.0f, 1.0f, 1.0f, 1.0f));
-
-    PostProcessUtils().SetTexture(CTexture::s_ptexBackBuffer, 0, FILTER_LINEAR);
-    PostProcessUtils().SetTexture(rptexCurrRT, 1, FILTER_LINEAR, TADDR_MIRROR);
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-    PostProcessUtils().ShEndPass();
-
-    //reset render flags
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CSceneRain::CreateBuffers(uint16 nVerts, void*& pINVB, SVF_P3F_C4B_T2F* pVtxList)
-{
-    D3DBuffer* pVB = 0;
-
-    HRESULT hr = S_OK;
-
-    // Create VB/IB
-    D3D11_BUFFER_DESC BufDesc;
-    ZeroStruct(BufDesc);
-    BufDesc.ByteWidth = nVerts * sizeof(SVF_P3F_C4B_T2F);
-    BufDesc.Usage = D3D11_USAGE_IMMUTABLE;
-    BufDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-    BufDesc.CPUAccessFlags = 0;
-    BufDesc.MiscFlags = 0;
-
-    D3D11_SUBRESOURCE_DATA SubResData;
-    ZeroStruct(SubResData);
-    SubResData.pSysMem = pVtxList;
-    SubResData.SysMemPitch = 0;
-    SubResData.SysMemSlicePitch = 0;
-
-    hr = gcpRendD3D->GetDevice().CreateBuffer(&BufDesc, &SubResData, (ID3D11Buffer**)&pVB);
-    assert(SUCCEEDED(hr));
-
-    pINVB = pVB;
-}
-
-int CSceneRain::CreateResources()
-{
-    Release();
-
-    static const int nSlices = 12;
-    const float nSliceStep(DEG2RAD(360.0f / (float) nSlices));
-
-    std::vector<SVF_P3F_C4B_T2F> pVB;
-    SVF_P3F_C4B_T2F vVertex;
-    vVertex.color.dcolor = ~0;
-    vVertex.st = Vec2(0.0f, 0.0f);
-
-    // Generate top cone vertices
-    for (int h = 0; h < nSlices + 1; ++h)
-    {
-        float x = cosf(((float)h) * nSliceStep);
-        float y = sinf(((float)h) * nSliceStep);
-
-        vVertex.xyz = Vec3(x * 0.01f, y * 0.01f, 1);
-        pVB.push_back(vVertex);
-
-        vVertex.xyz = Vec3(x, y, 0.33f);
-        pVB.push_back(vVertex);
-    }
-
-    // Generate cylinder vertices
-    for (int h = 0; h < nSlices + 1; ++h)
-    {
-        float x = cosf(((float)h) * nSliceStep);
-        float y = sinf(((float)h) * nSliceStep);
-
-        vVertex.xyz = Vec3(x, y, 0.33f);
-        pVB.push_back(vVertex);
-
-        vVertex.xyz = Vec3(x, y, -0.33f);
-        pVB.push_back(vVertex);
-    }
-
-    // Generate bottom cone vertices
-    for (int h = 0; h < nSlices + 1; ++h)
-    {
-        float x = cosf(((float)h) * nSliceStep);
-        float y = sinf(((float)h) * nSliceStep);
-
-        vVertex.xyz = Vec3(x, y, -0.33f);
-        pVB.push_back(vVertex);
-
-        vVertex.xyz = Vec3(x * 0.01f, y * 0.01f, -1);
-        pVB.push_back(vVertex);
-    }
-
-    m_nConeVBSize = pVB.size();
-    CreateBuffers(m_nConeVBSize, m_pConeVB, &pVB[0]);
-
-    return 1;
-}
-
-void CSceneRain::Release()
-{
-    D3DBuffer* pVB = (D3DBuffer*)m_pConeVB;
-    SAFE_RELEASE(pVB);
-    m_pConeVB = 0;
-    m_bReinit = true;
-}
-
-void CSceneRain::Render()
-{
-    if (!m_pConeVB)
-    {
-        CreateResources();
-    }
-
-    PROFILE_LABEL_SCOPE("RAIN");
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    // Shader constants
-    CCryNameTSCRC pSceneRainTechName("SceneRain");
-    CCryNameTSCRC pSceneRainOccAccTechName("SceneRainOccAccumulate");
-    CCryNameTSCRC pSceneRainOccBlurTechName("SceneRainOccBlur");
-    static CCryNameR pRainParamName0("sceneRainParams0");
-    static CCryNameR pRainParamName1("sceneRainParams1");
-    static CCryNameR pUnscaledFactorName("unscaledFactor");
-    static CCryNameR pRainOccParamName("sceneRainOccMtx");
-    static CCryNameR pRainMtxParamName("sceneRainMtx");
-    static CCryNameR pRainOccBlurParamName("gRainOccBlurScale");
-    static CCryNameR pRainBloomParamName("gRainBloomParams");
-
-    // Generate screen-space rain occlusion
-    CTexture* pDistRainOccTex = NULL;
-
-    if (m_RainVolParams.bApplyOcclusion)
-    {
-        pDistRainOccTex = CTexture::s_ptexRainSSOcclusion[0];
-
-        if (!CTexture::IsTextureExist(pDistRainOccTex))
-        {
-            // Render targets not generated yet
-            // - Better to skip and have no rain than it render over everything
-            return;
-        }
-
-        PROFILE_LABEL_SCOPE("RAIN_DISTANT_OCCLUSION");
-        {
-            PROFILE_LABEL_SCOPE("ACCUMULATE");
-            gcpRendD3D->FX_PushRenderTarget(0, pDistRainOccTex, NULL);
-            gcpRendD3D->RT_SetViewport(0, 0, pDistRainOccTex->GetWidth(), pDistRainOccTex->GetHeight());
-
-            PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pSceneRainOccAccTechName, FEF_DONTSETSTATES);
-
-            CShaderMan::s_shPostEffects->FXSetVSFloat(pRainOccParamName, (Vec4*)m_RainVolParams.matOccTransRender.GetData(), 4);
-            CShaderMan::s_shPostEffects->FXSetPSFloat(pRainOccParamName, (Vec4*)m_RainVolParams.matOccTransRender.GetData(), 4);
-            gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-            PostProcessUtils().DrawFullScreenTriWPOS(pDistRainOccTex->GetWidth(), pDistRainOccTex->GetHeight());
-
-            PostProcessUtils().ShEndPass();
-
-            gcpRendD3D->FX_PopRenderTarget(0);
-        }
-
-        {
-            PROFILE_LABEL_SCOPE("BLUR");
-            pDistRainOccTex = CTexture::s_ptexRainSSOcclusion[0];
-
-            const float fDist = 8.0f;
-            PostProcessUtils().TexBlurGaussian(pDistRainOccTex, 0, 1.f, fDist, false, NULL, false, CTexture::s_ptexRainSSOcclusion[1]);
-        }
-    }
-
-    Vec2 unscaledFactor(1.0f, 1.0f);
-
-    D3DBuffer* pVB = (D3DBuffer*)m_pConeVB;
-    uint16 nVerts = m_nConeVBSize;
-
-    gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, CTexture::s_ptexHDRTarget->GetWidth(), CTexture::s_ptexHDRTarget->GetHeight());
-
-    const float fAmount = m_RainVolParams.fCurrentAmount * CRenderer::CV_r_rainamount;
-    const int nLayers = clamp_tpl(int(fAmount + 0.0001f), 1, 3);
-    const int nPasses = nLayers;
-
-    // Get lightning color - will just use for overbright rain
-    Vec3 v;
-    gEnv->p3DEngine->GetGlobalParameter(E3DPARAM_SKY_HIGHLIGHT_COLOR, v);
-    const float fHighlight = 2.f * v.len();
-    Vec4 pParams = Vec4(0.f, 0.f, 0.f, 0.f);
-    const float fSizeMult = max(CRenderer::CV_r_rainDistMultiplier, 1e-3f) * 0.5f;
-
-    if (m_RainVolParams.bApplyOcclusion)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-    else
-    {
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    for (int pass = 0; pass < nPasses; ++pass)
-    {
-        int nCurLayer = pass;
-
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pSceneRainTechName, FEF_DONTSETSTATES);
-
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-        gcpRendD3D->D3DSetCull(eCULL_None);
-
-        pParams.x = m_RainVolParams.fRainDropsSpeed;
-        pParams.z = float(nCurLayer) / max(nLayers - 1, 1);
-        pParams.y = fHighlight * (1.f - pParams.z);
-        pParams.w = (nCurLayer + 1) * fSizeMult;
-        pParams.w = powf(pParams.w, 1.5f);
-        CShaderMan::s_shPostEffects->FXSetVSFloat(pRainParamName0, &pParams, 1);
-
-        pParams = Vec4(unscaledFactor.x, unscaledFactor.y, 1.0f, 1.0f);
-        CShaderMan::s_shPostEffects->FXSetVSFloat(pUnscaledFactorName, &pParams, 1);
-
-        pParams.x = fAmount * m_RainVolParams.fRainDropsAmount;
-        pParams.w = 1.f;
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pRainParamName0, &pParams, 1);
-
-        pParams = Vec4(m_RainVolParams.fRainDropsLighting, 0.f, 0.f, 0.f);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pRainParamName1, &pParams, 1);
-
-        if (m_RainVolParams.bApplyOcclusion)
-        {
-            CShaderMan::s_shPostEffects->FXSetVSFloat(pRainOccParamName, (Vec4*)m_RainVolParams.matOccTransRender.GetData(), 4);
-
-            STexState sTexState = STexState(FILTER_LINEAR, true);
-            pDistRainOccTex->Apply(2, CTexture::GetTexState(sTexState));
-        }
-
-        Matrix44 rainRot = Matrix44(Matrix33(m_RainVolParams.qRainRotation));
-        CShaderMan::s_shPostEffects->FXSetVSFloat(pRainMtxParamName, (Vec4*)rainRot.GetData(), 4);
-
-        gcpRendD3D->FX_SetVStream(0, pVB, 0, sizeof(SVF_P3F_C4B_T2F));
-
-        // Bind average luminance
-        GetUtils().SetTexture(CTexture::s_ptexHDRToneMaps[0], 0, FILTER_LINEAR);
-
-        if (!FAILED(gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_C4B_T2F)))
-        {
-            gcpRendD3D->FX_Commit();
-            gcpRendD3D->FX_DrawPrimitive(eptTriangleStrip, 0, nVerts);
-        }
-
-        PostProcessUtils().ShEndPass();
-    }
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-
-    gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-    // (re-set back-buffer): if the platform does lazy RT updates/setting there's strong possibility we run into problems when we try to resolve with no RT set
-    gcpRendD3D->FX_SetActiveRenderTargets();
-}
-
-
-bool CSceneRain::Preprocess()
-{
-    bool bIsActive = IsActive()
-        && !(m_RainVolParams.bApplyOcclusion && m_RainVolParams.areaAABB.IsReset())
-        && m_RainVolParams.fRainDropsAmount > 0.01f;
-
-    if (!bIsActive)
-    {
-        Release();
-    }
-    else
-    {
-        ++m_updateFrameCount;
-    }
-
-    return false;  // Rain is rendered in HDR
-}
-
-
-void CSceneRain::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pActive->ResetParam(0);
-    m_RainVolParams.areaAABB.Reset();
-    m_updateFrameCount = 0;
-}
-
-void CSceneRain::OnLostDevice()
-{
-    Release();
-}
-
-const char* CSceneRain::GetName() const
-{
-    return "SceneRain";
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessSnow.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessSnow.cpp
deleted file mode 100644
index 79fd0a233d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessSnow.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "../../Cry3DEngine/Environment/OceanEnvironmentBus.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const char* CSceneSnow::GetName() const
-{
-    return "SceneSnow";
-}
-
-bool CSceneSnow::Preprocess()
-{
-    //bool bSnowActive = IsActiveSnow();
-
-    // HDR now.
-    return false;//bSnowActive;
-}
-
-int CSceneSnow::CreateResources()
-{
-    Release();
-
-    // Already generated ? No need to proceed
-    if (!m_pClusterList.empty())
-    {
-        return 1;
-    }
-
-    m_nNumClusters = max<int> (1, CRenderer::CV_r_snowFlakeClusters);
-    m_pClusterList.reserve(m_nNumClusters);
-    for (int p = 0; p < m_nNumClusters; p++)
-    {
-        SSnowCluster* pDrop = new SSnowCluster;
-        m_pClusterList.push_back(pDrop);
-    }
-
-    return 1;
-}
-
-void CSceneSnow::Release()
-{
-    if (m_pClusterList.empty())
-    {
-        return;
-    }
-
-    SSnowClusterItor pItor, pItorEnd = m_pClusterList.end();
-    for (pItor = m_pClusterList.begin(); pItor != pItorEnd; ++pItor)
-    {
-        SAFE_DELETE((*pItor));
-    }
-    m_pClusterList.clear();
-
-    m_pSnowFlakeMesh = NULL;
-}
-
-
-void CSceneSnow::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-    m_pActive->ResetParam(0.0f);
-    m_nAliveClusters = 0;
-
-    m_pSnowFlakeMesh = NULL;
-}
-
-
-bool CSceneSnow::IsActiveSnow()
-{
-    //static float s_fLastSpawnTime = -1.0f;
-
-    if ((m_pActive->GetParam() > 0.09f && CRenderer::CV_r_snow && m_SnowVolParams.m_fSnowFallBrightness > 0.005f && m_SnowVolParams.m_nSnowFlakeCount > 0) || m_nAliveClusters)
-    {
-        //s_fLastSpawnTime = 0.0f;
-        return true;
-    }
-
-    /*if( s_fLastSpawnTime == 0.0f)
-    {
-        s_fLastSpawnTime = PostProcessUtils().m_pTimer->GetCurrTime();
-    }
-
-    if( fabs(PostProcessUtils().m_pTimer->GetCurrTime() - s_fLastSpawnTime) < 1.0f )
-    {
-        return true;
-    }*/
-
-    return false;
-}
-
-bool CSceneSnow::GenerateClusterMesh()
-{
-    int iRTWidth  = gcpRendD3D->GetWidth();
-    int iRTHeight = gcpRendD3D->GetHeight();
-    float fAspect = float(iRTWidth) / iRTHeight;
-
-    // Vertex offsets for sprite expansion.
-    static const Vec2 vVertOffsets[6] =
-    {
-        Vec2(1,  1),
-        Vec2(-1,  1),
-        Vec2(1, -1),
-        Vec2(1, -1),
-        Vec2(-1,  1),
-        Vec2(-1, -1)
-    };
-
-    // Create mesh if there isn't one or if the count has changed.
-    if (!m_pSnowFlakeMesh || (m_nFlakesPerCluster != m_SnowVolParams.m_nSnowFlakeCount))
-    {
-        m_pSnowFlakeMesh = NULL;
-
-        m_nFlakesPerCluster = m_SnowVolParams.m_nSnowFlakeCount;
-        m_nSnowFlakeVertCount = m_nFlakesPerCluster * 6;
-
-        SVF_P3F_T2F_T3F* pSnowFlakes = new SVF_P3F_T2F_T3F[m_nSnowFlakeVertCount];
-
-        float fUserSize = 0.0075f;
-        float fUserSizeVar = 0.0025f;
-
-        // Loop through number of flake sprites (6 verts per sprite).
-        for (int p = 0; p < m_nSnowFlakeVertCount; p += 6)
-        {
-            Vec3 vPosition = Vec3(cry_random(-10.0f, 10.0f), cry_random(-10.0f, 10.0f), cry_random(-10.0f, 10.0f));
-            float fSize = fUserSize + fUserSizeVar * cry_random(-1.0f, 1.0f);
-            float fRandPhase = cry_random(0.0f, 10.0f);
-
-            // Triangle strip, each vertex gets it's own offset for sprite expansion.
-            for (int i = 0; i < 6; ++i)
-            {
-                int nIdx = p + i;
-                pSnowFlakes[nIdx].p = vPosition;
-                pSnowFlakes[nIdx].st0 = Vec2(vVertOffsets[i].x, vVertOffsets[i].y);
-                pSnowFlakes[nIdx].st1 = Vec3(fSize, fSize * fAspect, fRandPhase);
-            }
-        }
-
-        m_pSnowFlakeMesh = gRenDev->CreateRenderMeshInitialized(pSnowFlakes, m_nSnowFlakeVertCount, eVF_P3F_T2F_T3F, 0, 0, prtTriangleList, "SnowFlakeBuffer", "SnowFlakeBuffer");
-
-        delete [] pSnowFlakes;
-
-        // If the mesh wasn't initialized properly, return false.
-        if (!m_pSnowFlakeMesh)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void CSceneSnow::SpawnCluster(SSnowCluster*& pCluster)
-{
-    static SSnowCluster pNewDrop;
-
-    static float fLastSpawnTime = 0.0f;
-
-    pCluster->m_pPos = gcpRendD3D->GetViewParameters().vOrigin;
-
-    pCluster->m_pPos.x += cry_random(-1.0f, 1.0f) * 15;
-    pCluster->m_pPos.y += cry_random(-1.0f, 1.0f) * 15;
-    pCluster->m_pPos.z += cry_random(-1.0f, 1.0f) * 5 + 4;
-
-    pCluster->m_pPosPrev = pCluster->m_pPos;
-    pCluster->m_fLifeTime = (pNewDrop.m_fLifeTime / std::max(1.0f, m_SnowVolParams.m_fSnowFallGravityScale) + pNewDrop.m_fLifeTimeVar * cry_random(-1.0f, 1.0f));
-
-    // Increase/decrease weight randomly
-    pCluster->m_fWeight = clamp_tpl<float>(pNewDrop.m_fWeight + pNewDrop.m_fWeightVar * cry_random(-1.0f, 1.0f), 0.1f, 1.0f);
-
-    pCluster->m_fSpawnTime = PostProcessUtils().m_pTimer->GetCurrTime();
-    fLastSpawnTime = PostProcessUtils().m_pTimer->GetCurrTime();
-}
-
-void CSceneSnow::UpdateClusters()
-{
-    SSnowClusterItor pItor, pItorEnd = m_pClusterList.end();
-
-    bool bAllowSpawn(m_pActive->GetParam() > 0.005f && m_SnowVolParams.m_fSnowFallBrightness > 0.005f);
-
-    const float fCurrFrameTime = gEnv->pTimer->GetFrameTime();
-    const float fGravity = fCurrFrameTime * m_SnowVolParams.m_fSnowFallGravityScale;
-    const float fWind = m_SnowVolParams.m_fSnowFallWindScale;
-
-    m_nAliveClusters = 0;
-
-    Vec3 vCameraPos = gcpRendD3D->GetViewParameters().vOrigin;
-
-    for (pItor = m_pClusterList.begin(); pItor != pItorEnd; ++pItor)
-    {
-        SSnowCluster* pCurr = (*pItor);
-
-        float fCurrLifeTime = pCurr->m_fLifeTime > 0 ? (PostProcessUtils().m_pTimer->GetCurrTime() - pCurr->m_fSpawnTime) / pCurr->m_fLifeTime : 0;
-        float fClusterDist = pCurr->m_pPos.GetDistance(vCameraPos);
-
-        // Cluster is too small, died or is out of range, respawn.
-        if (fabs(fCurrLifeTime) > 1.0f || pCurr->m_fLifeTime < 0 || fClusterDist > 30.0f)
-        {
-            if (bAllowSpawn)
-            {
-                SpawnCluster(pCurr);
-            }
-            else
-            {
-                pCurr->m_fLifeTime = -1.0f;
-                continue;
-            }
-        }
-
-        // Previous position (for blur).
-        pCurr->m_pPosPrev = pCurr->m_pPos;
-
-        // Apply gravity force.
-        if (m_SnowVolParams.m_fSnowFallGravityScale)
-        {
-            Vec3 vGravity(0.0f, 0.0f, -9.8f);
-            pCurr->m_pPos += vGravity * fGravity * pCurr->m_fWeight;
-        }
-
-        // Apply wind force.
-        if (m_SnowVolParams.m_fSnowFallWindScale)
-        {
-            Vec3 vWindVec = gEnv->p3DEngine->GetWind(AABB(pCurr->m_pPos - Vec3(10, 10, 10), pCurr->m_pPos + Vec3(10, 10, 10)), false);
-            pCurr->m_pPos += vWindVec * pCurr->m_fWeight * fWind;
-        }
-
-        // Increment count.
-        m_nAliveClusters++;
-    }
-}
-
-void CSceneSnow::Render()
-{
-    // Number of clusters has changed, reallocate resources.
-    const int nNumClusters = max<int>(1, CRenderer::CV_r_snowFlakeClusters);
-    if (m_nNumClusters != nNumClusters)
-    {
-        CreateResources();
-    }
-
-    // Generate the cluster mesh.
-    if (!GenerateClusterMesh())
-    {
-        return;
-    }
-
-    // If not enough flakes, skip.
-    if (m_nFlakesPerCluster < 1)
-    {
-        return;
-    }
-
-    if (!PostProcessUtils().m_pTimer)
-    {
-        return;
-    }
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    PostProcessUtils().StretchRect(CTexture::s_ptexHDRTarget, CTexture::s_ptexSceneTarget);
-
-    UpdateClusters();
-
-    CTexture* pSceneSrc = CTexture::s_ptexHDRTarget;
-    CTexture* pVelocitySrc = CTexture::s_ptexVelocity;
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_snow_halfres)
-    {
-        pSceneSrc = CTexture::s_ptexHDRTargetScaledTmp[0];
-        pVelocitySrc = CTexture::s_ptexBackBufferScaled[0];
-
-        gcpRendD3D->FX_ClearTarget(pSceneSrc, Clr_Transparent);
-        gcpRendD3D->FX_ClearTarget(pVelocitySrc, Clr_Static);
-    }
-
-    PROFILE_LABEL_PUSH("SCENE_SNOW_FLAKES");
-
-    // Render to HDR and velocity.
-    gcpRendD3D->FX_PushRenderTarget(0, pSceneSrc, CRenderer::CV_r_snow_halfres ? NULL : &gcpRendD3D->m_DepthBufferOrig);
-    gcpRendD3D->FX_PushRenderTarget(1, pVelocitySrc, NULL);
-
-    gcpRendD3D->FX_SetColorDontCareActions(0, false, false);
-    gcpRendD3D->FX_SetColorDontCareActions(1, true, false);
-    gcpRendD3D->FX_SetStencilDontCareActions(0, true, true);
-    gcpRendD3D->FX_SetDepthDontCareActions(0, false, true);
-
-    DrawClusters();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->FX_PopRenderTarget(1);
-
-    PROFILE_LABEL_POP("SCENE_SNOW_FLAKES");
-
-    if IsCVarConstAccess(constexpr) (CRenderer::CV_r_snow_halfres)
-    {
-        HalfResComposite();
-    }
-
-    gcpRendD3D->FX_Commit();
-}
-
-void CSceneSnow::HalfResComposite()
-{
-    PROFILE_LABEL_PUSH("SCENE_SNOW_FLAKES_HALFRES_COMPOSITE");
-    gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexHDRTarget, NULL);
-    gcpRendD3D->FX_PushRenderTarget(1, CTexture::s_ptexVelocity, NULL);
-
-    static CCryNameTSCRC pTechNameComposite = "SnowHalfResComposite";
-    SD3DPostEffectsUtils::ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechNameComposite, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-    PostProcessUtils().SetTexture(CTexture::s_ptexHDRTargetScaledTmp[0], 0, FILTER_LINEAR);
-    PostProcessUtils().SetTexture(CTexture::s_ptexBackBufferScaled[0], 1, FILTER_POINT);
-    SD3DPostEffectsUtils::DrawFullScreenTri(gcpRendD3D->GetWidth(), gcpRendD3D->GetHeight());
-    SD3DPostEffectsUtils::ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->FX_PopRenderTarget(1);
-    PROFILE_LABEL_POP("SCENE_SNOW_FLAKES_HALFRES_COMPOSITE");
-}
-
-void CSceneSnow::DrawClusters()
-{
-    // Previous view projection matrix for motion blur.
-    Matrix44A mViewProjPrev = gRenDev->GetPreviousFrameMatrixSet().m_ViewMatrix;
-    mViewProjPrev = mViewProjPrev * GetUtils().m_pProj;
-    mViewProjPrev.Transpose();
-
-    //clear and set render flags
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0]);
-
-    if (m_RainVolParams.bApplyOcclusion)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    static CCryNameTSCRC pTech0Name("SceneSnow");
-
-    static CCryNameR pSnowFlakeParamName("vSnowFlakeParams");
-    Vec4 vSnowFlakeParams = Vec4(m_SnowVolParams.m_fSnowFallBrightness, min(10.0f, m_SnowVolParams.m_fSnowFlakeSize), m_SnowVolParams.m_fSnowFallTurbulence, m_SnowVolParams.m_fSnowFallTurbulenceFreq);
-
-    SSnowClusterItor pItor, pItorEnd = m_pClusterList.end();
-    for (pItor = m_pClusterList.begin(); pItor != pItorEnd; ++pItor)
-    {
-        SSnowCluster* pCurr = (*pItor);
-        if (pCurr->m_fLifeTime < 0)
-        {
-            continue;
-        }
-
-        // Don't render if indoors or under water.
-        const float oceanLevel = OceanToggle::IsActive() ? OceanRequest::GetWaterLevel(pCurr->m_pPos) : gEnv->p3DEngine->GetWaterLevel(&pCurr->m_pPos);
-        if (gEnv->p3DEngine->GetVisAreaFromPos(pCurr->m_pPos) || pCurr->m_pPos.z < oceanLevel)
-        {
-            continue;
-        }
-
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTech0Name, 0);
-
-        // Snowflake params.
-        CShaderMan::s_shPostEffectsGame->FXSetVSFloat(pSnowFlakeParamName, &vSnowFlakeParams, 1);
-        CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pSnowFlakeParamName, &vSnowFlakeParams, 1);
-
-        // Cluster params.
-        static CCryNameR vSnowClusterPosName("vSnowClusterPos");
-        Vec4 vSnowClusterPos = Vec4(pCurr->m_pPos, 1.0f);
-        CShaderMan::s_shPostEffectsGame->FXSetVSFloat(vSnowClusterPosName, &vSnowClusterPos, 1);
-
-        static CCryNameR vSnowClusterPosPrevName("vSnowClusterPosPrev");
-        Vec4 vSnowClusterPosPrev = Vec4(pCurr->m_pPosPrev, 1.0f);
-        CShaderMan::s_shPostEffectsGame->FXSetVSFloat(vSnowClusterPosPrevName, &vSnowClusterPosPrev, 1);
-
-        // Motion blur params.
-        static CCryNameR pViewProjPrevName("mViewProjPrev");
-        CShaderMan::s_shPostEffectsGame->FXSetVSFloat(pViewProjPrevName, (Vec4*)mViewProjPrev.GetData(), 4);
-
-        // Occlusion params.
-        if (m_RainVolParams.bApplyOcclusion)
-        {
-            static CCryNameR mSnowOccMatrName("mSnowOccMatr");
-            CShaderMan::s_shPostEffectsGame->FXSetVSFloat(mSnowOccMatrName, (Vec4*)m_RainVolParams.matOccTransRender.GetData(), 3);
-        }
-
-        gcpRendD3D->FX_Commit();
-        if (!FAILED(gcpRendD3D->FX_SetVertexDeclaration(0, eVF_P3F_T2F_T3F)))
-        {
-            size_t offset(0);
-            CRenderMesh* pSnowFlakeMesh = static_cast<CRenderMesh*>(m_pSnowFlakeMesh.get());
-            //CRenderMesh* pSnowFlakeMesh((CRenderMesh*) m_pSnowFlakeMesh);
-            pSnowFlakeMesh->CheckUpdate(0);
-            D3DBuffer* pVB = gcpRendD3D->m_DevBufMan.GetD3D(pSnowFlakeMesh->GetVBStream(VSF_GENERAL), &offset);
-            gcpRendD3D->FX_SetVStream(0, pVB, offset, pSnowFlakeMesh->GetStreamStride(VSF_GENERAL));
-            gcpRendD3D->FX_SetIStream(0, 0, Index16);
-            //STtryfix  D3DIndexBuffer *pIB = gcpRendD3D->m_DevBufMan.GetD3DIB(pSnowFlakeMesh->GetIBStream(), &offset);
-
-            gcpRendD3D->FX_DrawPrimitive(eptTriangleList, 0, m_nSnowFlakeVertCount);
-        }
-
-        PostProcessUtils().ShEndPass();
-    }
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessSunShafts.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessSunShafts.cpp
deleted file mode 100644
index 41edbecb07..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessSunShafts.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Todo:
-//  -   This is deprecated, will be refactored this into something like UberPostProcess
-//  - Will contain all constant enabled post processes (edgeAA / sunShafts / color charts)
-
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-
-bool CSunShafts::Preprocess()
-{
-    return false;
-}
-
-bool CSunShafts::IsVisible()
-{
-    bool bQualityCheck = CPostEffectsMgr::CheckPostProcessQuality(eRQ_Medium, eSQ_Medium);
-
-    // We need to check every case and compare against merged post effects case
-
-    m_bShaftsEnabled = true;
-
-    if (!bQualityCheck)
-    {
-        m_bShaftsEnabled &= false;
-    }
-
-    if (gEnv->p3DEngine->GetSunColor().len2() < 0.01f)
-    {
-        m_bShaftsEnabled &= false;
-    }
-
-    if (m_pShaftsAmount->GetParam() < 0.01f && m_pRaysAmount->GetParam() < 0.01f)
-    {
-        m_bShaftsEnabled &= false;
-    }
-
-    // sun behind camera, can skip post process
-    const float fSunVisThreshold = 0.45f;
-    float fLdotV = gEnv->p3DEngine->GetSunDirNormalized().dot(gRenDev->GetViewParameters().vZ);
-    if (fLdotV > fSunVisThreshold)
-    {
-        m_bShaftsEnabled &= false;
-    }
-
-    if (CRenderer::CV_r_sunshafts && IsActive())
-    {
-        // Disable for interiors
-        uint32 nCamVisAreaFlags = gRenDev->m_p3DEngineCommon.m_pCamVisAreaInfo.nFlags;
-        if ((nCamVisAreaFlags& S3DEngineCommon::VAF_EXISTS_FOR_POSITION) && !(nCamVisAreaFlags & (S3DEngineCommon::VAF_CONNECTED_TO_OUTDOOR | S3DEngineCommon::VAF_AFFECTED_BY_OUT_LIGHTS)))
-        {
-            m_bShaftsEnabled &= false;
-        }
-        else
-        {
-            m_bShaftsEnabled &= true;
-        }
-    }
-    else
-    {
-        m_bShaftsEnabled &= false;
-    }
-
-    // Check if shafts occluded - if so skip them - todo: fade in/out shafts amount
-    if (CRenderer::CV_r_sunshafts > 1 && m_bShaftsEnabled)
-    {
-        if (!m_pOcclQuery)
-        {
-            Initialize();
-        }
-
-        //bool bReady = m_pOcclQuery->IsReady();
-        bool bSunShaftsVisible =  ((int)m_nVisSampleCount > (CTexture::s_ptexBackBuffer->GetWidth() * CTexture::s_ptexBackBuffer->GetHeight()  / 100)); // || !bReady;
-        m_bShaftsEnabled &= bSunShaftsVisible;
-
-        m_nVisSampleCount = m_pOcclQuery->GetVisibleSamples(CRenderer::CV_r_sunshafts == 2);
-        if (!m_pOcclQuery->GetDrawFrame() || m_pOcclQuery->IsReady())
-        {
-            gRenDev->m_cEF.mfRefreshSystemShader("Sunshafts", CShaderMan::s_shPostSunShafts);
-
-            PROFILE_LABEL_SCOPE("SUNSHAFTS OCCLUSION");
-
-            static CCryNameTSCRC pTechName("OcclCheckTechnique");
-
-            PostProcessUtils().ShBeginPass(CShaderMan::s_shPostSunShafts, pTechName, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-            gcpRendD3D->SetCullMode(R_CULL_NONE);
-            gcpRendD3D->FX_SetState(GS_DEPTHFUNC_LEQUAL | GS_COLMASK_NONE);
-
-            m_pOcclQuery->BeginQuery();
-            SD3DPostEffectsUtils::DrawFullScreenTriWPOS(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 1.0f);
-            m_pOcclQuery->EndQuery();
-            PostProcessUtils().ShEndPass();
-        }
-    }
-
-    return m_bShaftsEnabled;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-bool CSunShafts::MergedSceneDownsampleAndSunShaftsMaskGen(CTexture* pSceneSrc, CTexture* pSceneDst, CTexture* pSunShaftsMaskDst)
-{
-    if (!pSceneSrc ||
-        !pSceneDst ||
-        !pSunShaftsMaskDst)
-    {
-        return false;
-    }
-
-    PROFILE_LABEL_SCOPE("SCENE_DOWNSAMPLE_SUNSHAFTS_MASK_GEN");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("Sunshafts", CShaderMan::s_shPostSunShafts);
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= (g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    gcpRendD3D->FX_PushRenderTarget(0, pSceneDst, NULL);
-    gcpRendD3D->FX_PushRenderTarget(1, pSunShaftsMaskDst, NULL);
-    gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-    gcpRendD3D->FX_SetColorDontCareActions(1, true, false);
-
-    gcpRendD3D->RT_SetViewport(0, 0, pSceneDst->GetWidth(), pSceneDst->GetHeight());
-
-    static CCryNameTSCRC pTech0Name("MergedTexToTexAndSunShaftsMaskGen");
-
-    gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostSunShafts, pTech0Name, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    PostProcessUtils().SetTexture(pSceneSrc, 0, FILTER_LINEAR);
-    PostProcessUtils().SetTexture(CTexture::s_ptexZTargetScaled, 1, FILTER_POINT);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-    PostProcessUtils().DrawFullScreenTri(pSceneDst->GetWidth(), pSceneDst->GetHeight());
-
-    PostProcessUtils().ShEndPass();
-
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-
-    // Restore previous viewport
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->FX_PopRenderTarget(1);
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CSunShafts::SunShaftsGen(CTexture* pSunShafts, CTexture* pPingPongRT)
-{
-    PROFILE_LABEL_SCOPE("SUNSHAFTS_GEN");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("Sunshafts", CShaderMan::s_shPostSunShafts);
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= (g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-
-    //moved here because used later on
-    static CCryNameR pParam1Name("SunShafts_SunPos");
-    Vec3 pSunPos = gEnv->p3DEngine->GetSunDir() * 1000.0f;
-    Vec4 pParamSunPos = Vec4(pSunPos, 1.0f);
-
-    // no need to waste gpu to compute sun screen pos
-    Vec4 pSunPosScreen = PostProcessUtils().m_pViewProj * pParamSunPos;
-    pSunPosScreen.x = ((pSunPosScreen.x + pSunPosScreen.w) * 0.5f) / (1e-6f + pSunPosScreen.w);
-    pSunPosScreen.y = ((-pSunPosScreen.y + pSunPosScreen.w) * 0.5f) / (1e-6f + pSunPosScreen.w);
-    pSunPosScreen.w = gEnv->p3DEngine->GetSunDirNormalized().dot(PostProcessUtils().m_pViewProj.GetRow(2));
-
-    Vec4 pShaftParams(0, 0, 0, 0);
-    static CCryNameR pParam2Name("PI_sunShaftsParams");
-
-    /////////////////////////////////////////////
-    // Create shafts mask texture. Gmem path has already this done since it merges scene downsample with SS mask gen.
-    if (!gcpRendD3D->FX_GetEnabledGmemPath(nullptr))
-    {
-        gcpRendD3D->FX_PushRenderTarget(0, pSunShafts, NULL);
-        gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-        gcpRendD3D->RT_SetViewport(0, 0, pSunShafts->GetWidth(), pSunShafts->GetHeight());
-
-        static CCryNameTSCRC pTech0Name("SunShaftsMaskGen");
-
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostSunShafts, pTech0Name, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-        // Get sample size ratio (based on empirical "best look" approach)
-        float fSampleSize = ((float)CTexture::s_ptexBackBuffer->GetWidth() / (float)pSunShafts->GetWidth()) * 0.5f;
-
-        // Set samples position
-        float s1 = fSampleSize / (float) CTexture::s_ptexBackBuffer->GetWidth();  // 2.0 better results on lower res images resizing
-        float t1 = fSampleSize / (float) CTexture::s_ptexBackBuffer->GetHeight();
-        // Use rotated grid
-        Vec4 pParams0 = Vec4(s1 * 0.95f, t1 * 0.25f, -s1 * 0.25f, t1 * 0.96f);
-        Vec4 pParams1 = Vec4(-s1 * 0.96f, -t1 * 0.25f, s1 * 0.25f, -t1 * 0.96f);
-
-        static CCryNameR pParam3Name("texToTexParams0");
-        static CCryNameR pParam4Name("texToTexParams1");
-
-        CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam3Name, &pParams0, 1);
-        CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam4Name, &pParams1, 1);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexZTargetScaled, 0, FILTER_POINT);
-        PostProcessUtils().SetTexture(CTexture::s_ptexHDRTargetScaled[0], 1, (gRenDev->m_RP.m_eQuality >= eRQ_High) ? FILTER_POINT : FILTER_LINEAR);
-
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-        PostProcessUtils().DrawFullScreenTri(pSunShafts->GetWidth(), pSunShafts->GetHeight());
-
-        PostProcessUtils().ShEndPass();
-
-        gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-
-        // Restore previous viewport
-        gcpRendD3D->FX_PopRenderTarget(0);
-        gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-    }
-    /////////////////////////////////////////////
-    // Apply local radial blur to shafts mask
-
-    gcpRendD3D->FX_SetActiveRenderTargets();
-    gcpRendD3D->FX_PushRenderTarget(0, pPingPongRT, NULL);
-    gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-    gcpRendD3D->RT_SetViewport(0, 0, pSunShafts->GetWidth(), pSunShafts->GetHeight());
-    //gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-    static CCryNameTSCRC pTech1Name("SunShaftsGen");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostSunShafts, pTech1Name, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    //moved to top from here
-    static CCryNameR pParam0Name("SunShafts_ViewProj");
-    CShaderMan::s_shPostSunShafts->FXSetVSFloat(pParam0Name, (Vec4*) PostProcessUtils().m_pViewProj.GetData(), 4);
-    CShaderMan::s_shPostSunShafts->FXSetVSFloat(pParam1Name, &pParamSunPos, 1);
-
-    // big radius, project until end of screen
-    pShaftParams.x = 0.1f;
-    pShaftParams.y = clamp_tpl<float>(m_pRaysAttenuation->GetParam(), 0.0f, 10.0f);
-
-    CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam2Name, &pShaftParams, 1);
-    CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam1Name, &pSunPosScreen, 1);
-    PostProcessUtils().SetTexture(pSunShafts, 0, FILTER_LINEAR);
-    PostProcessUtils().DrawFullScreenTri(pSunShafts->GetWidth(), pSunShafts->GetHeight());
-
-    PostProcessUtils().ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-
-    gcpRendD3D->FX_SetActiveRenderTargets();
-    gcpRendD3D->FX_PushRenderTarget(0, pSunShafts, NULL);
-    gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostSunShafts, pTech1Name, FEF_DONTSETTEXTURES | FEF_DONTSETSTATES);
-
-    // interpolate between projections
-    pShaftParams.x = 0.025f;
-    CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam2Name, &pShaftParams, 1);
-    CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam1Name, &pSunPosScreen, 1);
-    PostProcessUtils().SetTexture(pPingPongRT, 0, FILTER_LINEAR);
-    PostProcessUtils().DrawFullScreenTri(pSunShafts->GetWidth(), pSunShafts->GetHeight());
-
-    PostProcessUtils().ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-
-    gcpRendD3D->FX_SetActiveRenderTargets();
-
-    gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-    return true;
-}
-
-// DEPRECATED
-void CSunShafts::Render()
-{
-    PROFILE_SHADER_SCOPE;
-    PROFILE_LABEL_SCOPE("MERGED_SUNSHAFTS_COLORCORRECTION");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("Sunshafts", CShaderMan::s_shPostSunShafts);
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Update color grading
-
-    bool bColorGrading = false;
-
-    SColorGradingMergeParams pMergeParams;
-    if (CRenderer::CV_r_colorgrading && CRenderer::CV_r_colorgrading_charts)
-    {
-        CColorGrading* pColorGrad = 0;
-        if (!PostEffectMgr()->GetEffects().empty())
-        {
-            pColorGrad =  static_cast<CColorGrading*>(PostEffectMgr()->GetEffect(ePFX_ColorGrading));
-        }
-
-        if (pColorGrad && pColorGrad->UpdateParams(pMergeParams))
-        {
-            bColorGrading = true;
-        }
-    }
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= (g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1] | g_HWSR_MaskBit[HWSR_SAMPLE2] | g_HWSR_MaskBit[HWSR_SAMPLE3] | g_HWSR_MaskBit[HWSR_SAMPLE4] | g_HWSR_MaskBit[HWSR_SAMPLE5]);
-
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    CTexture* pBackBufferTex = CTexture::s_ptexBackBuffer;
-
-    static CCryNameR pParam1Name("SunShafts_SunPos");
-    Vec3 pSunPos = gEnv->p3DEngine->GetSunDir() * 1000.0f;
-    Vec4 pParamSunPos = Vec4(pSunPos, 1.0f);
-
-    // Compute sun screen pos on cpu side
-    Vec4 pSunPosScreen = PostProcessUtils().m_pViewProj * pParamSunPos;
-    pSunPosScreen.x = ((pSunPosScreen.x + pSunPosScreen.w) * 0.5f) / pSunPosScreen.w;
-    pSunPosScreen.y = ((-pSunPosScreen.y + pSunPosScreen.w) * 0.5f) / pSunPosScreen.w;
-    pSunPosScreen.w = gEnv->p3DEngine->GetSunDirNormalized().dot(PostProcessUtils().m_pViewProj.GetRow(2));
-
-    /////////////////////////////////////////////
-    // Create shafts mask texture
-
-    uint32 nWidth = CTexture::s_ptexBackBufferScaled[1]->GetWidth();
-    uint32 nHeight = CTexture::s_ptexBackBufferScaled[1]->GetHeight();
-    if (gRenDev->m_RP.m_eQuality >= eRQ_High)
-    {
-        nWidth = CTexture::s_ptexBackBufferScaled[0]->GetWidth();
-        nHeight = CTexture::s_ptexBackBufferScaled[0]->GetHeight();
-    }
-
-    SDynTexture* pSunShaftsRT = new SDynTexture(nWidth, nHeight, CTexture::s_ptexBackBufferScaled[1]->GetDstFormat(), eTT_2D, FT_STATE_CLAMP | FT_USAGE_RENDERTARGET, "TempBlurRT");
-    if (!pSunShaftsRT)
-    {
-        return;
-    }
-
-    pSunShaftsRT->Update(nWidth, nHeight);
-    if (!pSunShaftsRT->m_pTexture)
-    {
-        SAFE_DELETE(pSunShaftsRT);
-        return;
-    }
-
-    Vec4 pShaftParams(0, 0, 0, 0);
-    static CCryNameR pParam2Name("PI_sunShaftsParams");
-    if (m_bShaftsEnabled)
-    {
-        SunShaftsGen(pSunShaftsRT->m_pTexture);
-    }
-
-    CTexture* pSunShafts = pSunShaftsRT->m_pTexture;
-
-    /////////////////////////////////////////////
-    // Display sun shafts
-
-    gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-
-    CColorGradingControllerD3D* pCtrl = gcpRendD3D->m_pColorGradingControllerD3D;
-    CTexture* pTexColorChar = pCtrl ? pCtrl->GetColorChart() : 0;
-
-    // todo: should always use volume lookup (1 less shader combination)
-    if (bColorGrading && pTexColorChar)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE5];
-        if (pTexColorChar->GetTexType() == eTT_3D)
-        {
-            gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE2];
-        }
-    }
-
-    static CCryNameTSCRC pTech2Name("SunShaftsDisplay");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostSunShafts, pTech2Name, FEF_DONTSETSTATES);   //FEF_DONTSETTEXTURES |
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    const float fSunVisThreshold = 0.45f;
-    float fLdotV = clamp_tpl<float>(-(gEnv->p3DEngine->GetSunDirNormalized().dot(gRenDev->GetViewParameters().vZ) - fSunVisThreshold) * 4.0f, 0.0f, 1.0f);
-    pShaftParams.x = clamp_tpl<float>(m_pShaftsAmount->GetParam() * fLdotV, 0.0f, 1.0f);
-    pShaftParams.y = clamp_tpl<float>(m_pRaysAmount->GetParam(), 0.0f, 10.0f);
-    CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam2Name, &pShaftParams, 1);
-
-    static CCryNameR pParam5Name("SunShafts_SunCol");
-    Vec4 pRaysCustomCol = m_pRaysCustomCol->GetParamVec4();
-    Vec3 pSunColor = gEnv->p3DEngine->GetSunColor();
-    pSunColor.Normalize();
-    pSunColor.SetLerp(Vec3(pRaysCustomCol.x, pRaysCustomCol.y, pRaysCustomCol.z), pSunColor, m_pRaysSunColInfluence->GetParam());
-
-    Vec4 pShaftsSunCol(pSunColor, 1);
-    CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam5Name, &pShaftsSunCol, 1);
-
-    if (pTexColorChar)
-    {
-        PostProcessUtils().SetTexture(pTexColorChar, 0, FILTER_LINEAR);
-    }
-
-    PostProcessUtils().SetTexture(pBackBufferTex, 1, (gRenDev->m_RP.m_FlagsShader_RT & g_HWSR_MaskBit[HWSR_SAMPLE1]) ? FILTER_LINEAR : FILTER_POINT);
-    if (pSunShafts)
-    {
-        PostProcessUtils().SetTexture(pSunShafts, 2, FILTER_LINEAR);
-    }
-
-    PostProcessUtils().SetTexture(CTexture::s_ptexZTarget, 4, FILTER_POINT);
-
-    CShaderMan::s_shPostSunShafts->FXSetPSFloat(pParam1Name, &pParamSunPos, 1);
-
-    PostProcessUtils().DrawFullScreenTri(pBackBufferTex->GetWidth(), pBackBufferTex->GetHeight());
-
-
-    PostProcessUtils().ShEndPass();
-
-    SAFE_DELETE(pSunShaftsRT);
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessWater.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessWater.cpp
deleted file mode 100644
index 0a6c8ae5d2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/PostProcessWater.cpp
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "DriverD3D.h"
-#include "I3DEngine.h"
-#include "D3DPostProcess.h"
-#include "../Common/ReverseDepth.h"
-
-#include "../../Cry3DEngine/Environment/OceanEnvironmentBus.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CUnderwaterGodRays::Render()
-{
-    PROFILE_SHADER_SCOPE;
-    
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    float fAmount = m_pAmount->GetParam();
-    float fWatLevel = SPostEffectsUtils::m_fWaterLevel;
-
-    static CCryNameTSCRC pTechName("UnderwaterGodRays");
-    static CCryNameR pParam0Name("PI_GodRaysParamsVS");
-    static CCryNameR pParam1Name("PI_GodRaysParamsPS");
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= g_HWSR_MaskBit[HWSR_REVERSE_DEPTH];
-
-    if (gcpRendD3D->m_RP.m_TI[gcpRendD3D->m_RP.m_nProcessThreadID].m_PersFlags & RBPF_REVERSE_DEPTH)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_REVERSE_DEPTH];
-    }
-    
-    {
-        PROFILE_LABEL_SCOPE("UNDERWATERGODRAYS");
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Render god-rays into low-res render target for less fillrate hit
-
-        gcpRendD3D->FX_PushRenderTarget(0,  CTexture::s_ptexBackBufferScaled[1], 0);
-        gcpRendD3D->FX_SetColorDontCareActions(0, false, false);
-        gcpRendD3D->FX_ClearTarget(CTexture::s_ptexBackBufferScaled[1], Clr_Transparent);
-        gcpRendD3D->RT_SetViewport(0, 0, CTexture::s_ptexBackBufferScaled[1]->GetWidth(), CTexture::s_ptexBackBufferScaled[1]->GetHeight());
-        
-        //  PostProcessUtils().ShBeginPass(CShaderMan::m_shPostEffects, pTechName, FEF_DONTSETSTATES);
-        uint32 nPasses;
-        CShaderMan::s_shPostEffects->FXSetTechnique(pTechName);
-        CShaderMan::s_shPostEffects->FXBegin(&nPasses, FEF_DONTSETSTATES);
-
-        int nSlicesCount = 10;
-        bool bInVisarea = (gRenDev->m_p3DEngineCommon.m_pCamVisAreaInfo.nFlags & S3DEngineCommon::VAF_EXISTS_FOR_POSITION);
-        Vec3 vSunDir = bInVisarea ? Vec3(0.5f, 0.5f, 1.0f) :  -gEnv->p3DEngine->GetSunDirNormalized();
-
-        for (int r(0); r < nSlicesCount; ++r)
-        {
-            // !force updating constants per-pass!
-            CShaderMan::s_shPostEffects->FXBeginPass(0);
-
-            // Set per instance params
-            Vec4 pParams = Vec4(fWatLevel, fAmount, r, 1.0f / (float) nSlicesCount);
-            CShaderMan::s_shPostEffects->FXSetVSFloat(pParam0Name, &pParams, 1);
-
-            CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams, 1);
-
-            gcpRendD3D->SetCullMode(R_CULL_NONE);
-            gcpRendD3D->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ONE | GS_NODEPTHTEST);
-
-            PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0);
-
-            CShaderMan::s_shPostEffects->FXEndPass();
-        }
-        CShaderMan::s_shPostEffects->FXEnd();
-    
-        gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-
-        // Restore previous viewport
-        gcpRendD3D->FX_PopRenderTarget(0);
-        gcpRendD3D->RT_SetViewport(iTempX, iTempY, iWidth, iHeight);
-    }
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    // Display god-rays
-    {
-        PROFILE_LABEL_SCOPE("UNDERWATERGODRAYSFINAL");
-        CCryNameTSCRC pTechName0("UnderwaterGodRaysFinal");
-
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, pTechName0, FEF_DONTSETSTATES);
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-        float underwaterDistortion = OceanToggle::IsActive() ? OceanRequest::GetUnderwaterDistortion() : CRenderer::CV_r_water_godrays_distortion;
-        Vec4 pParams = Vec4(underwaterDistortion, 0, 0, 0);
-        CShaderMan::s_shPostEffects->FXSetPSFloat(pParam1Name, &pParams, 1);
-        PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-        PostProcessUtils().ShEndPass();
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterDroplets::Render()
-{
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    static CCryNameTSCRC pTechName("WaterDroplets");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    const float fUserAmount = m_pAmount->GetParam();
-
-    const float fAtten = 1.0f; //clamp_tpl<float>(fabs( gRenDev->GetViewParameters().vOrigin.z - SPostEffectsUtils::m_fWaterLevel ), 0.0f, 1.0f);
-    Vec4 vParams = Vec4(1, 1, 1, min(fUserAmount, 1.0f) * fAtten);
-    static CCryNameR pParamName("waterDropletsParams");
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamName, &vParams, 1);
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-    PostProcessUtils().ShEndPass();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterFlow::Render()
-{
-    PROFILE_LABEL_SCOPE("WATERFLOW");
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    float fAmount = m_pAmount->GetParam();
-
-    static CCryNameTSCRC pTechName("WaterFlow");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES);
-
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    Vec4 vParams = Vec4(1, 1, 1, fAmount);
-    static CCryNameR pParamName("waterFlowParams");
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamName, &vParams, 1);
-
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight(), 0.0f, &gcpRendD3D->m_FullResRect);
-
-    PostProcessUtils().ShEndPass();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Enabled/Disabled if no hits on list to process - call from render thread
-bool CWaterRipples::RT_SimulationStatus()
-{
-    return !s_pWaterHits[gcpRendD3D->m_RP.m_nProcessThreadID].empty();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CWaterRipples::Preprocess()
-{
-    const float fTimeOut = 10.0f; // 10 seconds
-    bool bSimTimeOut = (gEnv->pTimer->GetCurrTime() - m_fLastSpawnTime) > fTimeOut;
-    if (s_nUpdateMask || CRenderer::CV_r_PostProcessGameFx && m_pAmount->GetParam() > 0.005f && (RT_SimulationStatus() || !bSimTimeOut))
-    {
-        return true;
-    }
-
-    m_bInitializeSim = true;
-    m_pAmount->ResetParam(0.0f);
-
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterRipples::CreatePhysCallbacks()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterRipples::ReleasePhysCallbacks()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterRipples::AddHit(const Vec3& vPos, const float scale, const float strength)
-{
-    const uint32 nThreadID = gcpRendD3D->m_RP.m_nFillThreadID;
-    if (s_pWaterHits[nThreadID].size() < MAX_HITS)
-    {
-        s_pWaterHits[nThreadID].push_back(SWaterHit(vPos, scale, strength));
-
-#if !defined(_RELEASE)
-        const int nDisplayFrames = 60;
-
-        SWaterHitRecord hit;
-        hit.mHit = s_pWaterHits[nThreadID].back();
-        hit.fHeight = vPos.z;
-        hit.nCounter = nDisplayFrames;
-
-        auto itHits = m_DebugWaterHits.begin();
-        for (; itHits != m_DebugWaterHits.end(); ++itHits)
-        {
-            if (itHits->nCounter <= 0)
-            {
-                *itHits = hit;
-                break;
-            }
-        }
-
-        if (itHits == m_DebugWaterHits.end())
-        {
-            m_DebugWaterHits.push_back(hit);
-        }
-#endif
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterRipples::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-#ifndef _RELEASE
-    if (!gRenDev->m_pRT->IsRenderThread(true))
-    {
-        if (gEnv && gEnv->pSystem && (gEnv->pSystem->IsQuitting() == false))
-        {
-            __debugbreak();
-        }
-    }
-#endif
-
-    m_fLastSpawnTime = 0.0f;
-    m_fLastUpdateTime = 0.0f;
-    m_bInitializeSim = true;
-    s_SimOrigin = Vec2(ZERO);
-
-    for (int i = 0; i < RT_COMMAND_BUF_COUNT; i++)
-    {
-        stl::free_container(s_pWaterHits[i]);
-    }
-    stl::free_container(s_pWaterHitsMGPU);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-int CWaterRipples::OnEventPhysCollision(const EventPhys* pEvent)
-{
-    EventPhysCollision* pEventPhysArea = (EventPhysCollision*)pEvent;
-    if (!pEventPhysArea)
-    {
-        return 1;
-    }
-
-
-    return 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterRipples::RenderHits()
-{
-    const uint32 nThreadID = gcpRendD3D->m_RP.m_nProcessThreadID;
-
-    const uint32 nWidth = CTexture::s_ptexWaterRipplesDDN->GetWidth();
-    const uint32 nHeight = CTexture::s_ptexWaterRipplesDDN->GetHeight();
-    const float fWidth = (float)nWidth;
-    const float fHeight = (float)nHeight;
-    const float fWidthRcp = 1.0f / fWidth;
-    const float fHeightRcp = 1.0f / fHeight;
-    const float fRatio = fHeightRcp / fWidthRcp;
-
-    const float fWidthHit = 2.0f * fWidthRcp * fRatio;
-    const float fHeightHit = 2.0f * fHeightRcp;
-
-    TransformationMatrices backupSceneMatrices;
-
-    gcpRendD3D->Set2DMode(nWidth, nHeight, backupSceneMatrices);
-
-    // Add hits to simulation
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, m_pRipplesHitTechName, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-
-    // only update blue channel: current frame
-    gcpRendD3D->FX_SetState(GS_BLSRC_ONE | GS_BLDST_ONE | GS_NODEPTHTEST | GS_NOCOLMASK_R | GS_NOCOLMASK_G | GS_NOCOLMASK_A);
-
-    // Simulation origin point is snapped camera position to nearest m_fSimGridSnapRange
-    Vec2 vSimOrig = Vec2(s_CameraPos.x - fabs(fmodf(s_CameraPos.x, m_fSimGridSnapRange)),
-            s_CameraPos.y - fabs(fmodf(s_CameraPos.y, m_fSimGridSnapRange)));
-
-    uint32 nHitCount = s_pWaterHitsMGPU.size();
-    uint32 nCurrHit = 0;
-
-    for (; nCurrHit < nHitCount; ++nCurrHit)
-    {
-        SWaterHit& currentHit = s_pWaterHitsMGPU[nCurrHit];
-
-        // Map hit world space to simulation space
-        float xmapped = currentHit.worldPos.x * s_vLookupParams.x + s_vLookupParams.z;
-        float ymapped = currentHit.worldPos.y * s_vLookupParams.x + s_vLookupParams.w;
-
-        // Render a sprite at hit location
-        float x0 = (xmapped - 0.5f * (fWidthHit * currentHit.scale)) * fWidth;
-        float y0 = (ymapped - 0.5f * (fHeightHit * currentHit.scale)) * fHeight;
-
-        float x1 = (xmapped + 0.5f * (fWidthHit * currentHit.scale)) * fWidth;
-        float y1 = (ymapped + 0.5f * (fHeightHit * currentHit.scale)) * fHeight;
-
-        // Pass height scale to shader.
-        s_vParams.w = currentHit.strength;
-        CShaderMan::s_shPostEffects->FXSetPSFloat(m_pRipplesParamName, &s_vParams, 1);
-
-        PostProcessUtils().DrawScreenQuad(nWidth, nHeight, x0, y0, x1, y1);
-    }
-
-    PostProcessUtils().ShEndPass();
-
-    gcpRendD3D->Unset2DMode(backupSceneMatrices);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CWaterRipples::Render()
-{
-    if (!CTexture::s_ptexWaterRipplesDDN || !CTexture::IsTextureExist(CTexture::s_ptexBackBufferScaled[0]))
-    {
-        return;
-    }
-
-    const uint32 nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    // always snap by entire pixels to avoid errors when displacing the simulation
-    const float fPixelSizeWS = CTexture::s_ptexWaterRipplesDDN->GetWidth() > 0 ? 2.f * m_fSimGridSize / CTexture::s_ptexWaterRipplesDDN->GetWidth() : 1.0f;
-    m_fSimGridSnapRange = max(ceilf(m_fSimGridSnapRange / fPixelSizeWS), 1.f) * fPixelSizeWS;
-
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gRenDev->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    float fTime = gRenDev->m_RP.m_TI[nThreadID].m_RealTime;
-
-    // only allow updates every 25ms - for lower frames, would need to iterate multiple times
-    if (gRenDev->GetActiveGPUCount() == 1)
-    {
-        if (fTime - m_fLastUpdateTime < 0.025f)
-        {
-            return;
-        }
-        m_fLastUpdateTime = fTime - fmodf(fTime - m_fLastUpdateTime, 0.025f);
-    }
-    else
-    {
-        if (fTime - m_fLastUpdateTime <= 0.0f)
-        {
-            return;
-        }
-        m_fLastUpdateTime = gRenDev->m_RP.m_TI[nThreadID].m_RealTime;
-    }
-
-    Vec4 vParams = Vec4(0, 0, 0, 0);
-    if (!s_pWaterHits[nThreadID].empty())
-    {
-        vParams = Vec4(s_pWaterHits[nThreadID][0].worldPos.x, s_pWaterHits[nThreadID][0].worldPos.y, 0, 1.0f);
-        m_fLastSpawnTime = fTime;
-    }
-
-    if (!s_nUpdateMask)
-    {
-        s_CameraPos = gRenDev->GetViewParameters().vOrigin;
-        float xsnap = ceilf(s_CameraPos.x / m_fSimGridSnapRange) * m_fSimGridSnapRange;
-        float ysnap = ceilf(s_CameraPos.y / m_fSimGridSnapRange) * m_fSimGridSnapRange;
-
-        m_bSnapToCenter = false;
-        if (s_SimOrigin.x != xsnap || s_SimOrigin.y != ysnap)
-        {
-            m_bSnapToCenter = true;
-            vParams.x = (xsnap - s_SimOrigin.x) * s_vLookupParams.x;
-            vParams.y = (ysnap - s_SimOrigin.y) * s_vLookupParams.x;
-
-            s_SimOrigin = Vec2(xsnap, ysnap);
-        }
-
-        s_bInitializeSim = m_bInitializeSim;
-        s_vParams = vParams;
-        s_pWaterHitsMGPU = s_pWaterHits[nThreadID];
-
-        // update world space -> sim space transform
-        s_vLookupParams.x = 1.f / (2.f * m_fSimGridSize);
-        s_vLookupParams.y = m_fSimGridSize - m_fSimGridSnapRange;
-        s_vLookupParams.z = -s_SimOrigin.x * s_vLookupParams.x + 0.5f;
-        s_vLookupParams.w = -s_SimOrigin.y * s_vLookupParams.x + 0.5f;
-
-        if (gRenDev->GetActiveGPUCount() > 1)
-        {
-            s_nUpdateMask = (1 << gRenDev->GetActiveGPUCount()) - 1;
-        }
-    }
-
-    PROFILE_LABEL_SCOPE("WATER RIPPLES GEN");
-
-    uint64 nSaveFlagsShader_RT = gRenDev->m_RP.m_FlagsShader_RT;
-    gRenDev->m_RP.m_FlagsShader_RT &= ~(g_HWSR_MaskBit[HWSR_SAMPLE0] | g_HWSR_MaskBit[HWSR_SAMPLE1]);
-
-    // spawn particles into effects accumulation buffer
-    gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexBackBufferScaled[0], 0);
-
-    const int backBufferWidth = CTexture::s_ptexBackBufferScaled[0]->GetWidth();
-    const int backBufferHeight = CTexture::s_ptexBackBufferScaled[0]->GetHeight();
-
-    int viewportWidth = CTexture::s_ptexWaterRipplesDDN->GetWidth();
-    int viewportHeight = CTexture::s_ptexWaterRipplesDDN->GetHeight();
-
-    // Metal does not allow us to create a viewport/scissor rectangle that goes outside of the render target. So scale the viewport if necessary
-    if (viewportWidth > backBufferWidth || viewportHeight > backBufferHeight)
-    {
-        const float maxDifferenceRatio = max(float(viewportWidth - backBufferWidth)/viewportWidth, float(viewportHeight - backBufferHeight)/viewportHeight);
-        const float scaleFactor = 1.0f - maxDifferenceRatio;
-        viewportWidth *= scaleFactor;
-        viewportHeight *= scaleFactor;
-    }
-
-    gcpRendD3D->RT_SetViewport(0, 0, viewportWidth, viewportHeight);
-
-    if (s_bInitializeSim)
-    {
-        m_bInitializeSim = false;
-        gcpRendD3D->FX_SetColorDontCareActions(0, false, false);
-        RECT rect = { 0, 0, CTexture::s_ptexWaterRipplesDDN->GetWidth(), CTexture::s_ptexWaterRipplesDDN->GetHeight() };
-        gcpRendD3D->FX_ClearTarget(CTexture::s_ptexBackBufferScaled[0], Clr_Transparent, 1, &rect, true);
-    }
-
-    
-
-    // Snapping occurred - update simulation to new offset
-    if (m_bSnapToCenter)
-    {
-        gRenDev->m_RP.m_FlagsShader_RT |= g_HWSR_MaskBit[HWSR_SAMPLE0];
-
-        PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, m_pRipplesGenTechName, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-        gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-        CShaderMan::s_shPostEffects->FXSetPSFloat(m_pRipplesParamName, &s_vParams, 1);
-
-        PostProcessUtils().SetTexture(CTexture::s_ptexWaterRipplesDDN, 0, FILTER_LINEAR, 1);
-        PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexWaterRipplesDDN->GetWidth(), CTexture::s_ptexWaterRipplesDDN->GetHeight());
-
-        PostProcessUtils().ShEndPass();
-
-        PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexWaterRipplesDDN);
-
-        gRenDev->m_RP.m_FlagsShader_RT &= ~g_HWSR_MaskBit[HWSR_SAMPLE0];
-    }
-
-    // Compute wave propagation
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffects, m_pRipplesGenTechName, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    CShaderMan::s_shPostEffects->FXSetPSFloat(m_pRipplesParamName, &s_vParams, 1);
-
-    PostProcessUtils().SetTexture(CTexture::s_ptexWaterRipplesDDN, 0, FILTER_LINEAR, 1);
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexWaterRipplesDDN->GetWidth(), CTexture::s_ptexWaterRipplesDDN->GetHeight());
-    PostProcessUtils().ShEndPass();
-
-    // Add current frame hits
-    RenderHits();
-
-    PostProcessUtils().CopyScreenToTexture(CTexture::s_ptexWaterRipplesDDN);
-
-    CTexture::s_ptexBackBufferScaled[0]->SetResolved(true);
-    gcpRendD3D->FX_PopRenderTarget(0);
-
-    CTexture::s_ptexWaterRipplesDDN->GenerateMipMaps();
-
-    gcpRendD3D->RT_SetViewport(0, 0, iWidth, iHeight);
-
-    // disable processing
-    m_pAmount->SetParam(0.0f);
-    gRenDev->m_RP.m_FlagsShader_RT = nSaveFlagsShader_RT;
-
-    s_nUpdateMask &= ~(1 << gRenDev->RT_GetCurrGpuID());
-    s_pWaterHits[nThreadID].clear();
-}
-
-void CWaterRipples::DEBUG_DrawWaterHits()
-{
-    gRenDev->GetIRenderAuxGeom()->SetRenderFlags(SAuxGeomRenderFlags());
-    for (auto itHits = m_DebugWaterHits.begin();
-         itHits != m_DebugWaterHits.end(); ++itHits)
-    {
-        if (itHits->nCounter > 0)
-        {
-            --itHits->nCounter;
-
-            Vec3 vHitPos(itHits->mHit.worldPos.x, itHits->mHit.worldPos.y, itHits->fHeight);
-            gRenDev->GetIRenderAuxGeom()->DrawSphere(vHitPos, 0.15f, ColorB(255, 0, 0, 255));
-        }
-    }
-
-    Vec3 simCenter = Vec3(s_SimOrigin.x, s_SimOrigin.y, gRenDev->GetViewParameters().vOrigin.z - 1.5f);
-    gRenDev->GetIRenderAuxGeom()->DrawSphere(simCenter, 0.15f, ColorB(0, 255, 0, 255));
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace WaterVolumeStaticData
-{
-    CWater* pWaterSim = 0;
-    void GetMemoryUsage(ICrySizer* pSizer)
-    {
-        if (pWaterSim)
-        {
-            pWaterSim->GetMemoryUsage(pSizer);
-        }
-    }
-}
-
-void CWaterVolume::Render()
-{
-    PROFILE_LABEL_SCOPE("WATERVOLUME_TEXGEN");
-
-    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);
-
-    {
-        static int nFrameID = 0;
-
-        // remember ptr of WaterSim to access it with CrySizer
-        WaterVolumeStaticData::pWaterSim = WaterSimMgr();
-
-        const int nGridSize = 64;
-
-        int nCurFrameID = gRenDev->m_RP.m_TI[gRenDev->m_RP.m_nProcessThreadID].m_nFrameID;
-        if (nFrameID != nCurFrameID)
-        {
-            // Update sim settings
-            if (WaterSimMgr()->NeedInit())
-            {
-               WaterSimMgr()->Create(1.0, 1.0f, 1.0f);
-            }
-
-            // Create texture if required
-            if (!CTexture::IsTextureExist(CTexture::s_ptexWaterVolumeTemp))
-            {                
-                if (!CTexture::s_ptexWaterVolumeTemp->Create2DTexture(64, 64, 1,
-                        FT_DONT_RELEASE | FT_NOMIPS |  FT_USAGE_DYNAMIC,
-                        0, eTF_R32G32B32A32F, eTF_R32G32B32A32F))
-                {
-                    return;
-                }
-                CTexture::s_ptexWaterVolumeTemp->Clear(ColorF(0, 0, 0, 0));
-            }
-
-            CTexture* pTexture = CTexture::s_ptexWaterVolumeTemp;
-
-            // Copy data..
-            if (CTexture::IsTextureExist(pTexture))
-            {
-                const float fUpdateTime = 0.125 * gEnv->pTimer->GetCurrTime();// / clamp_tpl<float>(pParams1.x, 0.55f, 1.0f);
-
-                void* pRawPtr = NULL;
-                WaterSimMgr()->Update(nCurFrameID, fUpdateTime, true, pRawPtr);
-
-                Vec4* pDispGrid = WaterSimMgr()->GetDisplaceGrid();
-
-                uint32 width = nGridSize;
-                uint32 height = nGridSize;
-
-                STALL_PROFILER("update subresource")
-
-                CDeviceTexture * pDevTex = pTexture->GetDevTexture();
-                assert(pDevTex);
-                auto tranferFunc = [=](void* pData, [[maybe_unused]] uint32 rowPitch, [[maybe_unused]] uint32 slicePitch)
-                {
-                    cryMemcpy(pData, pDispGrid, 4 * width * height * sizeof(f32));
-                    return true;
-                };
-
-#if defined(AZ_PLATFORM_ANDROID)
-                // Due to unify memory on mobile it's jus faster to upload the data directly to the texture instead of using a staging resource.
-                D3DTexture* textureResouce = pDevTex->Get2DTexture();
-                D3D11_MAPPED_SUBRESOURCE mappedResource;
-                HRESULT hr = gcpRendD3D->GetDeviceContext().Map(textureResouce, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-
-                if (S_OK == hr)
-                {
-                    const bool update = tranferFunc(mappedResource.pData, mappedResource.RowPitch, mappedResource.DepthPitch);
-                    gcpRendD3D->GetDeviceContext().Unmap(textureResouce, 0);
-                }
-                else
-                {
-                    AZ_Assert(false, "Failed to map Water Voume");
-                    return;
-                }
-#else
-                pDevTex->UploadFromStagingResource(0, tranferFunc);
-#endif // defined(AZ_PLATFORM_ANDROID)
-
-            }
-            nFrameID = nCurFrameID;
-        }
-    }
-    // Get current viewport
-    int iTempX, iTempY, iWidth, iHeight;
-    gcpRendD3D->GetViewport(&iTempX, &iTempY, &iWidth, &iHeight);
-
-    // make final normal map
-    gcpRendD3D->FX_PushRenderTarget(0, CTexture::s_ptexWaterVolumeDDN, NULL);
-    gcpRendD3D->RT_SetViewport(0, 0, CTexture::s_ptexWaterVolumeDDN->GetWidth(), CTexture::s_ptexWaterVolumeDDN->GetHeight());
-
-    // CONFETTI BEGIN: David Srour
-    // Metal Load/Store Actions
-    gcpRendD3D->FX_SetColorDontCareActions(0, true, false);
-    gcpRendD3D->FX_SetDepthDontCareActions(0, true, true);
-    gcpRendD3D->FX_SetStencilDontCareActions(0, true, true);
-    // CONFETTI END
-
-    static CCryNameTSCRC pTechName("WaterVolumesNormalGen");
-    PostProcessUtils().ShBeginPass(CShaderMan::s_shPostEffectsGame, pTechName, FEF_DONTSETSTATES | FEF_DONTSETTEXTURES);
-    gcpRendD3D->FX_SetState(GS_NODEPTHTEST);
-
-    static CCryNameR pParamName("waterVolumesParams");
-    Vec4 vParams = Vec4(64.0f, 64.0f, 64.0f, 64.0f);
-    CShaderMan::s_shPostEffectsGame->FXSetPSFloat(pParamName, &vParams, 1);
-
-    int32 nFilter = FILTER_LINEAR;
-
-    PostProcessUtils().SetTexture(CTexture::s_ptexWaterVolumeTemp, 0, nFilter, 0);
-    PostProcessUtils().DrawFullScreenTri(CTexture::s_ptexBackBuffer->GetWidth(), CTexture::s_ptexBackBuffer->GetHeight());
-
-    PostProcessUtils().ShEndPass();
-
-    gcpRendD3D->FX_PopRenderTarget(0);
-    gcpRendD3D->RT_SetViewport(0, 0, iWidth, iHeight);
-
-    CTexture::s_ptexWaterVolumeDDN->GenerateMipMaps();
-
-    // (re-set back-buffer): if the platform does lazy RT updates/setting there's strong possibility we run into problems when we try to resolve with no RT set
-    gcpRendD3D->FX_SetActiveRenderTargets();
-    gcpRendD3D->FX_ResetPipe();
-
-    // disable processing
-    m_pAmount->SetParam(0.0f);
-}
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/ShadowTextureGroupManager.h b/Code/CryEngine/RenderDll/XRenderD3D9/ShadowTextureGroupManager.h
deleted file mode 100644
index f965dc8590..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/ShadowTextureGroupManager.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_SHADOWTEXTUREGROUPMANAGER_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERD3D9_SHADOWTEXTUREGROUPMANAGER_H
-#pragma once
-
-#include <vector>           // STL vector<>
-
-// to combine multiple shadowmaps into one texture (e.g. GSM levels or Cubemap sides)
-class CShadowTextureGroupManager
-{
-public:
-
-    // Arguments
-    //   pLightOwner - must not be 0
-    // Returns
-    //   pointer to the texture pointer, don't store this pointer
-    SDynTexture_Shadow** FindOrCreateShadowTextureGroup(const IRenderNode* pLightOwner)
-    {
-        std::vector<SShadowTextureGroup>::iterator it, end = m_GSMGroups.end();
-
-        for (it = m_GSMGroups.begin(); it != end; ++it)
-        {
-            SShadowTextureGroup& ref = *it;
-
-            if (ref.m_pLightOwner == pLightOwner)
-            {
-                return &(ref.m_pTextureGroupItem);
-            }
-        }
-
-        m_GSMGroups.push_back(SShadowTextureGroup(pLightOwner, 0));
-
-        return &(m_GSMGroups.back().m_pTextureGroupItem);
-    }
-
-    void RemoveTextureGroupEntry(const IRenderNode* pLightOwner)
-    {
-        std::vector<SShadowTextureGroup>::iterator it, end = m_GSMGroups.end();
-
-        for (it = m_GSMGroups.begin(); it != end; ++it)
-        {
-            SShadowTextureGroup& ref = *it;
-
-            if (ref.m_pLightOwner == pLightOwner)
-            {
-                m_GSMGroups.erase(it);
-                break;
-            }
-        }
-    }
-
-    //  TODO:  remove old entries !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-private: // ----------------------------------------------------------------------------------
-
-    struct SShadowTextureGroup
-    {
-        SShadowTextureGroup(const IRenderNode* pLightOwner, SDynTexture_Shadow* pTextureGroupItem)
-            : m_pLightOwner(pLightOwner)
-            , m_pTextureGroupItem(pTextureGroupItem)
-        {
-        }
-
-        const IRenderNode*                 m_pLightOwner;                                           // key
-        SDynTexture_Shadow*                m_pTextureGroupItem;                                 // can be extended to combine 6 cubemap sides
-    };
-
-    std::vector<SShadowTextureGroup>            m_GSMGroups;        // could be a map<emitterid,m_pTextureGroupItem[]> but vector is faster for small containers
-};
-
-
-
-#endif // SHADOW_TEXTURE_GROUP_MANAGER_H
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/core_renderer_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/core_renderer_files.cmake
deleted file mode 100644
index de5a4f2bc2..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/core_renderer_files.cmake
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    D3DAmbientOcclusion.cpp
-    D3DColorGradingController.cpp
-    D3DDebug.cpp
-    D3DDeferredPasses.cpp
-    D3DDeferredRender.cpp
-    D3DDeferredShading.cpp
-    D3DFont.cpp
-    D3DFXPipeline.cpp
-    D3DHDRRender.cpp
-    D3DHMDRenderer.cpp
-    D3DHWShader.cpp
-    D3DHWShaderCompiling.cpp
-    D3DOcclQuery.cpp
-    D3D_SVO.cpp
-    D3DRECloud.cpp
-    D3DREImposter.cpp
-    D3DRenderAuxGeom.cpp
-    D3DRenderRE.cpp
-    D3DRenderThread.cpp
-    D3DRendPipeline.cpp
-    D3DRendPipeline_Jobs.cpp
-    D3DShaders.cpp
-    D3DShadows.cpp
-    D3DStereo.cpp
-    D3DSystem.cpp
-    D3DTexture.cpp
-    D3DTexturesStreaming.cpp
-    D3DTextureStreamPool.cpp
-    D3DTiledShading.cpp
-    GPUTimer.cpp
-    GPUTimerFactory.cpp
-    PipelineProfiler.cpp
-    MultiLayerAlphaBlendPass.cpp
-    D3DPostProcess.cpp
-    PostProcessFilters.cpp
-    PostProcessGame.cpp
-    PostProcessMisc.cpp
-    PostProcessMotionBlur.cpp
-    PostProcessRain.cpp
-    PostProcessSunShafts.cpp
-    PostProcessWater.cpp
-    PostProcessSnow.cpp
-    D3D_SVO.h
-    D3DTiledShading.h
-    ../Common/Textures/ITextureStreamer.h
-    ../Common/Shaders/ShaderAllocator.h
-    ../Common/CryNameR.h
-    ../Common/FencedIB.h
-    ../Common/FencedVB.h
-    D3DColorGradingController.h
-    D3DDebug.h
-    D3DDeferredShading.h
-    D3DHMDRenderer.h
-    D3DHWShader.h
-    D3DPostProcess.h
-    D3DRenderAuxGeom.h
-    D3DStereo.h
-    ../Common/RendererDefs.h
-    ../Common/Defs.h
-    DeviceInfo.h
-    GPUTimer.h
-    GPUTimerFactory.h
-    NullD3D11Device.h
-    PipelineProfiler.h
-    resource.h
-    ../RenderDll_precompiled.h
-    DeviceInfo.inl
-    MultiLayerAlphaBlendPass.h
-    ../Common/Renderer_Jobs.cpp
-    ../Common/CommonRender.cpp
-    ../Common/DeferredRenderUtils.cpp
-    ../Common/RenderAuxGeom.cpp
-    ../Common/Renderer.cpp
-    ../Common/RenderPipeline.cpp
-    ../Common/RenderThread.cpp
-    ../Common/ResFile.cpp
-    ../Common/ResFileLookupDataMan.cpp
-    ../Common/ShadowUtils.cpp
-    ../Common/TextMessages.cpp
-    ../Common/WaterUtils.cpp
-    ../Common/ResFileLookupDataMan.h
-    ../Common/TextMessages.h
-    ../Common/PerInstanceConstantBufferPool.cpp
-    ../Common/RenderView.cpp
-    ../Common/CommonRender.h
-    ../Common/DeferredRenderUtils.h
-    ../Common/FrameProfiler.h
-    ../Common/IColorGradingControllerInt.h
-    ../Common/OcclQuery.h
-    ../Common/RenderAuxGeom.h
-    ../Common/Renderer.h
-    ../Common/RenderCapabilities.h
-    ../Common/RenderPipeline.h
-    ../Common/RenderThread.h
-    ../Common/ResFile.h
-    ../Common/ResFile_info.h
-    ../Common/Shadow_Renderer.h
-    ../Common/ShadowUtils.h
-    ../Common/WaterUtils.h
-    ../Common/ReverseDepth.h
-    ../Common/PerInstanceConstantBufferPool.h
-    ../Common/RenderView.h
-    ../Common/Include_HLSL_CPP_Shared.h
-    ../Common/TypedConstantBuffer.h
-    ../Common/RenderMesh_Render.cpp
-    ../Common/RenderMesh_SetMesh.cpp
-    ../Common/RenderMesh.cpp
-    ../Common/RenderMesh.h
-    ../Common/Shaders/Parser.cpp
-    ../Common/Shaders/ParserBin.cpp
-    ../Common/Shaders/PoundPoundParser.cpp
-    ../Common/Shaders/RemoteCompiler.cpp
-    ../Common/Shaders/ShaderCache.cpp
-    ../Common/Shaders/ShaderComponents.cpp
-    ../Common/Shaders/ShaderCore.cpp
-    ../Common/Shaders/ShaderFXParseBin.cpp
-    ../Common/Shaders/ShaderParse.cpp
-    ../Common/Shaders/ShaderScript.cpp
-    ../Common/Shaders/ShaderSerialize.cpp
-    ../Common/Shaders/ShaderTemplate.cpp
-    ../Common/Shaders/ShaderResources.cpp
-    ../Common/Shaders/CShader.h
-    ../Common/Shaders/CShaderBin.h
-    ../Common/Shaders/Parser.h
-    ../Common/Shaders/ParserBin.h
-    ../Common/Shaders/PoundPoundParser.h
-    ../Common/Shaders/RemoteCompiler.h
-    ../Common/Shaders/Shader.h
-    ../Common/Shaders/ShaderCache.h
-    ../Common/Shaders/ShaderComponents.h
-    ../Common/Shaders/ShaderSerialize.h
-    ../Common/Shaders/ShaderResources.h
-    ../Common/Shaders/Vertex.h
-    ../Common/Shaders/ShadersResourcesGroups/PerFrame.h
-    ../Common/PostProcess/PostEffects.cpp
-    ../Common/PostProcess/PostProcess.cpp
-    ../Common/PostProcess/PostProcessUtils.cpp
-    ../Common/PostProcess/PostEffects.h
-    ../Common/PostProcess/PostProcess.h
-    ../Common/PostProcess/PostProcessUtils.h
-    ../Common/Memory/VRAMDriller.cpp
-    ../Common/Memory/VRAMDriller.h
-    ../Common/Memory/VRAMDrillerBus.h
-    DevBuffer.cpp
-    DeviceManager/Base.h
-    DeviceManager/Enums.h
-    DeviceManager/PartitionTable.h
-    DeviceManager/ConstantBufferCache.h
-    DeviceManager/ConstantBufferCache.cpp
-    DeviceManager/DeviceManager.cpp
-    DeviceManager/DeviceManagerInline.h
-    ../Common/DevBuffer.h
-    DeviceManager/TempDynBuffer.h
-    DeviceManager/DeviceManager.h
-    DeviceManager/DeviceManager_D3D11.inl
-    DeviceManager/DeviceManager_D3D12.inl
-    DeviceManager/DeviceWrapper12.h
-    DeviceManager/DeviceWrapper12.cpp
-    DeviceManager/DeviceWrapper12_D3D11.cpp
-    DeviceManager/DeviceWrapper12_D3D12.cpp
-    CRELensOpticsD3D.cpp
-    ../Common/RendElements/CREBeam.cpp
-    ../Common/RendElements/CREClientPoly.cpp
-    ../Common/RendElements/CRECloud.cpp
-    ../Common/RendElements/CREDeferredShading.cpp
-    ../Common/RendElements/CREFogVolume.cpp
-    ../Common/RendElements/CREGameEffect.cpp
-    ../Common/RendElements/CREHDRProcess.cpp
-    ../Common/RendElements/CREImposter.cpp
-    ../Common/RendElements/CREMesh.cpp
-    ../Common/RendElements/CREOclusionQuery.cpp
-    ../Common/RendElements/CREGeomCache.cpp
-    ../Common/RendElements/CREPostProcess.cpp
-    ../Common/RendElements/CREPrismObject.cpp
-    ../Common/RendElements/CRESky.cpp
-    ../Common/RendElements/CREVolumeObject.cpp
-    ../Common/RendElements/CREWaterOcean.cpp
-    ../Common/RendElements/CREWaterVolume.cpp
-    ../Common/RendElements/RendElement.cpp
-    ../Common/RendElements/CRELensOptics.h
-    ../Common/RendElements/CREBeam.h
-    ../Common/RendElements/CREClientPoly.h
-    ../Common/RendElements/CRECloud.h
-    ../Common/RendElements/CREDeferredShading.h
-    ../Common/RendElements/CREHDRProcess.h
-    ../Common/RendElements/CREMeshImpl.h
-    ../Common/RendElements/Stars.h
-    ../Common/RendElements/Utils/PolygonMath2D.cpp
-    ../Common/RendElements/Utils/PolygonMath2D.h
-    ../Common/RendElements/Utils/SpatialHashGrid.h
-    ../Common/RendElements/CameraOrbs.cpp
-    ../Common/RendElements/AbstractMeshElement.cpp
-    ../Common/RendElements/ChromaticRing.cpp
-    ../Common/RendElements/Ghost.cpp
-    ../Common/RendElements/Glow.cpp
-    ../Common/RendElements/IrisShafts.cpp
-    ../Common/RendElements/MeshUtil.cpp
-    ../Common/RendElements/OpticsElement.cpp
-    ../Common/RendElements/OpticsFactory.cpp
-    ../Common/RendElements/RootOpticsElement.cpp
-    ../Common/RendElements/Streaks.cpp
-    ../Common/RendElements/FlareSoftOcclusionQuery.cpp
-    ../Common/RendElements/ImageSpaceShafts.cpp
-    ../Common/RendElements/AbstractMeshElement.h
-    ../Common/RendElements/MeshUtil.h
-    ../Common/RendElements/OpticsFactory.h
-    ../Common/RendElements/Streaks.h
-    ../Common/RendElements/Timeline.h
-    ../Common/RendElements/CameraOrbs.h
-    ../Common/RendElements/ChromaticRing.h
-    ../Common/RendElements/Ghost.h
-    ../Common/RendElements/Glow.h
-    ../Common/RendElements/Interpolator.h
-    ../Common/RendElements/IrisShafts.h
-    ../Common/RendElements/OpticsElement.h
-    ../Common/RendElements/OpticsPredef.hpp
-    ../Common/RendElements/RootOpticsElement.h
-    ../Common/RendElements/FlareSoftOcclusionQuery.h
-    ../Common/RendElements/ImageSpaceShafts.h
-    ../Common/RendElements/OpticsGroup.h
-    ../Common/RendElements/OpticsGroup.cpp
-    ../Common/RendElements/OpticsProxy.h
-    ../Common/RendElements/OpticsProxy.cpp
-    ../Common/RendElements/OpticsReference.h
-    ../Common/RendElements/OpticsReference.cpp
-    ../Common/Textures/ITextureStreamer.cpp
-    ../Common/Textures/PlanningTextureStreamer.cpp
-    ../Common/Textures/PlanningTextureStreamer_Jobs.cpp
-    ../Common/Textures/DynTexture.cpp
-    ../Common/Textures/PowerOf2BlockPacker.cpp
-    ../Common/Textures/StereoTexture.cpp
-    ../Common/Textures/StereoTexture.h
-    ../Common/Textures/Texture.cpp
-    ../Common/Textures/Texture.h
-    ../Common/Textures/TextureManager.h
-    ../Common/Textures/TextureManager.cpp
-    ../Common/Textures/TextureStreaming.cpp
-    ../Common/Textures/PlanningTextureStreamer.h
-    ../Common/Textures/TextureArrayAlloc.h
-    ../Common/Textures/TextureStreamPool.h
-    ../Common/Textures/PowerOf2BlockPacker.h
-    ../Common/Textures/TextureHelpers.cpp
-    ../Common/Textures/TextureHelpers.h
-    ../Common/Textures/Image/CImage.cpp
-    ../Common/Textures/Image/DDSImage.cpp
-    ../Common/Textures/Image/JpgImage.cpp
-    ../Common/Textures/Image/TgaImage.cpp
-    ../Common/Textures/Image/CImage.h
-    ../Common/Textures/Image/DDSImage.h
-    GraphicsPipeline/Common/FullscreenPass.h
-    GraphicsPipeline/Common/FullscreenPass.cpp
-    GraphicsPipeline/Common/GraphicsPipeline.h
-    GraphicsPipeline/Common/GraphicsPipeline.cpp
-    GraphicsPipeline/Common/GraphicsPipelinePass.h
-    GraphicsPipeline/Common/UtilityPasses.h
-    GraphicsPipeline/Common/UtilityPasses.cpp
-    GraphicsPipeline/Common/GraphicsPipelineStateSet.h
-    GraphicsPipeline/Common/GraphicsPipelineStateSet.cpp
-    GraphicsPipeline/AutoExposure.h
-    GraphicsPipeline/AutoExposure.cpp
-    GraphicsPipeline/Bloom.h
-    GraphicsPipeline/Bloom.cpp
-    GraphicsPipeline/DepthOfField.h
-    GraphicsPipeline/DepthOfField.cpp
-    GraphicsPipeline/FurBendData.h
-    GraphicsPipeline/FurBendData.cpp
-    GraphicsPipeline/FurPasses.h
-    GraphicsPipeline/FurPasses.cpp
-    GraphicsPipeline/MotionBlur.h
-    GraphicsPipeline/MotionBlur.cpp
-    GraphicsPipeline/PostAA.h
-    GraphicsPipeline/PostAA.cpp
-    GraphicsPipeline/ScreenSpaceObscurance.h
-    GraphicsPipeline/ScreenSpaceObscurance.cpp
-    GraphicsPipeline/ScreenSpaceReflections.h
-    GraphicsPipeline/ScreenSpaceReflections.cpp
-    GraphicsPipeline/ScreenSpaceSSS.h
-    GraphicsPipeline/ScreenSpaceSSS.cpp
-    GraphicsPipeline/StandardGraphicsPipeline.h
-    GraphicsPipeline/StandardGraphicsPipeline.cpp
-    GraphicsPipeline/VideoRenderPass.h
-    GraphicsPipeline/VideoRenderPass.cpp
-    ../RenderDll_precompiled.cpp
-    D3DVolumetricFog.cpp
-    D3DVolumetricFog.h
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/core_renderer_header_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/core_renderer_header_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/core_renderer_header_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_files.cmake
deleted file mode 100644
index b3bf7b3362..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DX/RenderCapabilities.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_shared_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_shared_files.cmake
deleted file mode 100644
index 976d22e037..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_shared_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DriverD3D.h
-    DriverD3D.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_test_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_test_files.cmake
deleted file mode 100644
index c3b02baa45..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/d3d11_test_files.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DX/Tests/test_Main.cpp
-    ../Common/tests/RenderDLLUnitTests.cpp
-    ../Common/Shaders/RemoteShaderCompilerUnitTests.cpp
-    ../Common/tests/Shaders/VertexTests.cpp
-    DriverD3D.h
-    DriverD3D.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_files.cmake
deleted file mode 100644
index 2cf8467f1e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DX12/RenderCapabilities.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_shared_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_shared_files.cmake
deleted file mode 100644
index 976d22e037..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_shared_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DriverD3D.h
-    DriverD3D.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_test_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_test_files.cmake
deleted file mode 100644
index e8d3f96604..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/d3d12_test_files.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DX/Tests/test_Main.cpp
-    ../Common/tests/RenderDLLUnitTests.cpp
-    ../Common/Shaders/RemoteShaderCompilerUnitTests.cpp
-    DriverD3D.h
-    DriverD3D.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/dx_renderer_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/dx_renderer_files.cmake
deleted file mode 100644
index b3bf7b3362..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/dx_renderer_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DX/RenderCapabilities.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/metal_renderer_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/metal_renderer_files.cmake
deleted file mode 100644
index f4bdbb4e5f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/metal_renderer_files.cmake
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DXMETAL/CryDXMETAL.cpp
-    DXMETAL/RenderCapabilities.cpp
-    DXMETAL/CryDXMETAL.hpp
-    DXMETAL/Definitions/DXMETAL_D3DX11.h
-    DXMETAL/Definitions/DXMETAL_D3D11Shader.h
-    DXMETAL/Definitions/DXMETAL_D3DCommon.h
-    DXMETAL/Definitions/DXMETAL_D3DCompiler.h
-    DXMETAL/Definitions/DXMETAL_D3D11.h
-    DXMETAL/Definitions/DXMETAL_D3DX11tex.h
-    DXMETAL/Definitions/DXMETAL_DXGIFormat.h
-    DXMETAL/Definitions/DXMETAL_ID3D11Device.h
-    DXMETAL/Definitions/DXMETAL_ID3D11DeviceContext.h
-    DXMETAL/Definitions/DXMETAL_IDXGIFactory1.h
-    DXMETAL/Definitions/DXMETAL_IDXGISwapChain.h
-    DXMETAL/Definitions/DXMETAL_dxgi.h
-    DXMETAL/Definitions/DXMETAL_dxgitype.h
-    DXMETAL/Definitions/CryDXMETALGuid.hpp
-    DXMETAL/Definitions/CryDXMETALLegacy.hpp
-    DXMETAL/Definitions/CryDXMETALMisc.hpp
-    DXMETAL/Definitions/ICryDXMETALUnknown.hpp
-    DXMETAL/Implementation/AppleGPUInfoUtils.h
-    DXMETAL/Implementation/GLFormat.cpp
-    DXMETAL/Implementation/GLResource.cpp
-    DXMETAL/Implementation/GLShader.cpp
-    DXMETAL/Implementation/GLState.cpp
-    DXMETAL/Implementation/METALCopyShaders.h
-    DXMETAL/Implementation/METALContext.cpp
-    DXMETAL/Implementation/METALDevice.cpp
-    DXMETAL/Implementation/GLCommon.hpp
-    DXMETAL/Implementation/GLCryPlatform.hpp
-    DXMETAL/Implementation/GLExtensions.hpp
-    DXMETAL/Implementation/GLFormat.hpp
-    DXMETAL/Implementation/GLPlatform.hpp
-    DXMETAL/Implementation/GLResource.hpp
-    DXMETAL/Implementation/GLShader.hpp
-    DXMETAL/Implementation/GLState.hpp
-    DXMETAL/Implementation/METALContext.hpp
-    DXMETAL/Implementation/MetalDevice.hpp
-    DXMETAL/Interfaces/CCryDXMETALBase.cpp
-    DXMETAL/Interfaces/CCryDXMETALBlendState.cpp
-    DXMETAL/Interfaces/CCryDXMETALBlob.cpp
-    DXMETAL/Interfaces/CCryDXMETALBuffer.cpp
-    DXMETAL/Interfaces/CCryDXMETALDepthStencilState.cpp
-    DXMETAL/Interfaces/CCryDXMETALDepthStencilView.cpp
-    DXMETAL/Interfaces/CCryDXMETALDevice.cpp
-    DXMETAL/Interfaces/CCryDXMETALDeviceChild.cpp
-    DXMETAL/Interfaces/CCryDXMETALDeviceContext.cpp
-    DXMETAL/Interfaces/CCryDXMETALGIAdapter.cpp
-    DXMETAL/Interfaces/CCryDXMETALGIFactory.cpp
-    DXMETAL/Interfaces/CCryDXMETALGIObject.cpp
-    DXMETAL/Interfaces/CCryDXMETALGIOutput.cpp
-    DXMETAL/Interfaces/CCryDXMETALInputLayout.cpp
-    DXMETAL/Interfaces/CCryDXMETALQuery.cpp
-    DXMETAL/Interfaces/CCryDXMETALRasterizerState.cpp
-    DXMETAL/Interfaces/CCryDXMETALRenderTargetView.cpp
-    DXMETAL/Interfaces/CCryDXMETALResource.cpp
-    DXMETAL/Interfaces/CCryDXMETALSamplerState.cpp
-    DXMETAL/Interfaces/CCryDXMETALShader.cpp
-    DXMETAL/Interfaces/CCryDXMETALShaderReflection.cpp
-    DXMETAL/Interfaces/CCryDXMETALShaderResourceView.cpp
-    DXMETAL/Interfaces/CCryDXMETALSwapChain.cpp
-    DXMETAL/Interfaces/CCryDXMETALSwitchToRef.cpp
-    DXMETAL/Interfaces/CCryDXMETALTexture1D.cpp
-    DXMETAL/Interfaces/CCryDXMETALTexture2D.cpp
-    DXMETAL/Interfaces/CCryDXMETALTexture3D.cpp
-    DXMETAL/Interfaces/CCryDXMETALTextureBase.cpp
-    DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.cpp
-    DXMETAL/Interfaces/CCryDXMETALView.cpp
-    DXMETAL/Interfaces/CCryDXMETALBase.hpp
-    DXMETAL/Interfaces/CCryDXMETALBlendState.hpp
-    DXMETAL/Interfaces/CCryDXMETALBlob.hpp
-    DXMETAL/Interfaces/CCryDXMETALBuffer.hpp
-    DXMETAL/Interfaces/CCryDXMETALDepthStencilState.hpp
-    DXMETAL/Interfaces/CCryDXMETALDepthStencilView.hpp
-    DXMETAL/Interfaces/CCryDXMETALDevice.hpp
-    DXMETAL/Interfaces/CCryDXMETALDeviceChild.hpp
-    DXMETAL/Interfaces/CCryDXMETALDeviceContext.hpp
-    DXMETAL/Interfaces/CCryDXMETALGIAdapter.hpp
-    DXMETAL/Interfaces/CCryDXMETALGIFactory.hpp
-    DXMETAL/Interfaces/CCryDXMETALGIObject.hpp
-    DXMETAL/Interfaces/CCryDXMETALGIOutput.hpp
-    DXMETAL/Interfaces/CCryDXMETALInputLayout.hpp
-    DXMETAL/Interfaces/CCryDXMETALQuery.hpp
-    DXMETAL/Interfaces/CCryDXMETALRasterizerState.hpp
-    DXMETAL/Interfaces/CCryDXMETALRenderTargetView.hpp
-    DXMETAL/Interfaces/CCryDXMETALResource.hpp
-    DXMETAL/Interfaces/CCryDXMETALSamplerState.hpp
-    DXMETAL/Interfaces/CCryDXMETALShader.hpp
-    DXMETAL/Interfaces/CCryDXMETALShaderReflection.hpp
-    DXMETAL/Interfaces/CCryDXMETALShaderResourceView.hpp
-    DXMETAL/Interfaces/CCryDXMETALSwapChain.hpp
-    DXMETAL/Interfaces/CCryDXMETALSwitchToRef.hpp
-    DXMETAL/Interfaces/CCryDXMETALTexture1D.hpp
-    DXMETAL/Interfaces/CCryDXMETALTexture2D.hpp
-    DXMETAL/Interfaces/CCryDXMETALTexture3D.hpp
-    DXMETAL/Interfaces/CCryDXMETALTextureBase.hpp
-    DXMETAL/Interfaces/CCryDXMETALUnorderedAccessView.hpp
-    DXMETAL/Interfaces/CCryDXMETALView.hpp
-    DXMETAL/Interfaces/DXEmulation.hpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_egl_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_egl_files.cmake
deleted file mode 100644
index d14b7923dd..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_egl_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DXGL/Specification/glad_egl.c
-    DXGL/Specification/glad_egl.h
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_gl_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_gl_files.cmake
deleted file mode 100644
index f6d5c3e346..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_gl_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DXGL/Specification/glad_gl.c
-    DXGL/Specification/glad_gl.h
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_gles2_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_gles2_files.cmake
deleted file mode 100644
index c3988d34ec..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_gles2_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DXGL/Specification/glad_gles2.c
-    DXGL/Specification/glad_gles2.h
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_glx_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_glx_files.cmake
deleted file mode 100644
index 4d19e6badf..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_glx_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DXGL/Specification/glad_glx.c
-    DXGL/Specification/glad_glx.h
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_wgl_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_wgl_files.cmake
deleted file mode 100644
index b67cb16f72..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_loader_wgl_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DXGL/Specification/glad_wgl.c
-    DXGL/Specification/glad_wgl.h
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_renderer_files.cmake b/Code/CryEngine/RenderDll/XRenderD3D9/opengl_renderer_files.cmake
deleted file mode 100644
index 22c9e6ab2c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/opengl_renderer_files.cmake
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    DXGL/CryDXGL.cpp
-    DXGL/CryDXGL.hpp
-    DXGL/RenderCapabilities.cpp
-    DXGL/Definitions/CryDXGLGuid.hpp
-    DXGL/Definitions/CryDXGLLegacy.hpp
-    DXGL/Definitions/CryDXGLMisc.hpp
-    DXGL/Definitions/DXGL_D3D11.h
-    DXGL/Definitions/DXGL_D3D11Shader.h
-    DXGL/Definitions/DXGL_D3DCommon.h
-    DXGL/Definitions/DXGL_D3DCompiler.h
-    DXGL/Definitions/DXGL_D3DX11.h
-    DXGL/Definitions/DXGL_D3DX11tex.h
-    DXGL/Definitions/DXGL_DXGIFormat.h
-    DXGL/Definitions/DXGL_ID3D11Device.h
-    DXGL/Definitions/DXGL_ID3D11DeviceContext.h
-    DXGL/Definitions/DXGL_IDXGIFactory1.h
-    DXGL/Definitions/DXGL_IDXGISwapChain.h
-    DXGL/Definitions/DXGL_dxgi.h
-    DXGL/Definitions/DXGL_dxgitype.h
-    DXGL/Definitions/ICryDXGLUnknown.hpp
-    DXGL/Implementation/AppleGPUInfoUtils.h
-    DXGL/Implementation/GLCommon.hpp
-    DXGL/Implementation/GLContext.cpp
-    DXGL/Implementation/GLContext.hpp
-    DXGL/Implementation/GLCryPlatform.hpp
-    DXGL/Implementation/GLDevice.cpp
-    DXGL/Implementation/GLDevice.hpp
-    DXGL/Implementation/GLFeatures.hpp
-    DXGL/Implementation/GLFormat.cpp
-    DXGL/Implementation/GLFormat.hpp
-    DXGL/Implementation/GLInstrument.hpp
-    DXGL/Implementation/GLPlatform.hpp
-    DXGL/Implementation/GLResource.cpp
-    DXGL/Implementation/GLResource.hpp
-    DXGL/Implementation/GLShader.cpp
-    DXGL/Implementation/GLShader.hpp
-    DXGL/Implementation/GLState.cpp
-    DXGL/Implementation/GLState.hpp
-    DXGL/Implementation/GLView.cpp
-    DXGL/Implementation/GLView.hpp
-    DXGL/Interfaces/CCryDXGLBase.cpp
-    DXGL/Interfaces/CCryDXGLBase.hpp
-    DXGL/Interfaces/CCryDXGLBlendState.cpp
-    DXGL/Interfaces/CCryDXGLBlendState.hpp
-    DXGL/Interfaces/CCryDXGLBlob.cpp
-    DXGL/Interfaces/CCryDXGLBlob.hpp
-    DXGL/Interfaces/CCryDXGLBuffer.cpp
-    DXGL/Interfaces/CCryDXGLBuffer.hpp
-    DXGL/Interfaces/CCryDXGLDepthStencilState.cpp
-    DXGL/Interfaces/CCryDXGLDepthStencilState.hpp
-    DXGL/Interfaces/CCryDXGLDepthStencilView.cpp
-    DXGL/Interfaces/CCryDXGLDepthStencilView.hpp
-    DXGL/Interfaces/CCryDXGLDevice.cpp
-    DXGL/Interfaces/CCryDXGLDevice.hpp
-    DXGL/Interfaces/CCryDXGLDeviceChild.cpp
-    DXGL/Interfaces/CCryDXGLDeviceChild.hpp
-    DXGL/Interfaces/CCryDXGLDeviceContext.cpp
-    DXGL/Interfaces/CCryDXGLDeviceContext.hpp
-    DXGL/Interfaces/CCryDXGLGIAdapter.cpp
-    DXGL/Interfaces/CCryDXGLGIAdapter.hpp
-    DXGL/Interfaces/CCryDXGLGIFactory.cpp
-    DXGL/Interfaces/CCryDXGLGIFactory.hpp
-    DXGL/Interfaces/CCryDXGLGIObject.cpp
-    DXGL/Interfaces/CCryDXGLGIObject.hpp
-    DXGL/Interfaces/CCryDXGLGIOutput.cpp
-    DXGL/Interfaces/CCryDXGLGIOutput.hpp
-    DXGL/Interfaces/CCryDXGLInputLayout.cpp
-    DXGL/Interfaces/CCryDXGLInputLayout.hpp
-    DXGL/Interfaces/CCryDXGLQuery.cpp
-    DXGL/Interfaces/CCryDXGLQuery.hpp
-    DXGL/Interfaces/CCryDXGLRasterizerState.cpp
-    DXGL/Interfaces/CCryDXGLRasterizerState.hpp
-    DXGL/Interfaces/CCryDXGLRenderTargetView.cpp
-    DXGL/Interfaces/CCryDXGLRenderTargetView.hpp
-    DXGL/Interfaces/CCryDXGLResource.cpp
-    DXGL/Interfaces/CCryDXGLResource.hpp
-    DXGL/Interfaces/CCryDXGLSamplerState.cpp
-    DXGL/Interfaces/CCryDXGLSamplerState.hpp
-    DXGL/Interfaces/CCryDXGLShader.cpp
-    DXGL/Interfaces/CCryDXGLShader.hpp
-    DXGL/Interfaces/CCryDXGLShaderReflection.cpp
-    DXGL/Interfaces/CCryDXGLShaderReflection.hpp
-    DXGL/Interfaces/CCryDXGLShaderResourceView.cpp
-    DXGL/Interfaces/CCryDXGLShaderResourceView.hpp
-    DXGL/Interfaces/CCryDXGLSwapChain.cpp
-    DXGL/Interfaces/CCryDXGLSwapChain.hpp
-    DXGL/Interfaces/CCryDXGLSwitchToRef.cpp
-    DXGL/Interfaces/CCryDXGLSwitchToRef.hpp
-    DXGL/Interfaces/CCryDXGLTexture1D.cpp
-    DXGL/Interfaces/CCryDXGLTexture1D.hpp
-    DXGL/Interfaces/CCryDXGLTexture2D.cpp
-    DXGL/Interfaces/CCryDXGLTexture2D.hpp
-    DXGL/Interfaces/CCryDXGLTexture3D.cpp
-    DXGL/Interfaces/CCryDXGLTexture3D.hpp
-    DXGL/Interfaces/CCryDXGLTextureBase.cpp
-    DXGL/Interfaces/CCryDXGLTextureBase.hpp
-    DXGL/Interfaces/CCryDXGLUnorderedAccessView.cpp
-    DXGL/Interfaces/CCryDXGLUnorderedAccessView.hpp
-    DXGL/Interfaces/CCryDXGLView.cpp
-    DXGL/Interfaces/CCryDXGLView.hpp
-    DXGL/Interfaces/DXEmulation.hpp
-    DXGL/Implementation/AppleGPUInfoUtils.mm
-)
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/resource.h b/Code/CryEngine/RenderDll/XRenderD3D9/resource.h
deleted file mode 100644
index ed88839421..0000000000
--- a/Code/CryEngine/RenderDll/XRenderD3D9/resource.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#define VS_VERSION_INFO                 1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/CMakeLists.txt b/Code/CryEngine/RenderDll/XRenderNULL/CMakeLists.txt
deleted file mode 100644
index 555012a54c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/CMakeLists.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-
-include(${pal_dir}/NULLRenderer_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-
-if(CRYRENDER_TRAIT_BUILD_NULL_RENDERER_SUPPORTED)
-
-    ly_add_target(
-        NAME CryRenderNULL.Static STATIC
-        NAMESPACE Legacy
-        FILES_CMAKE
-            core_null_renderer_files.cmake
-            ${pal_dir}/core_null_renderer_files_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        PLATFORM_INCLUDE_FILES
-            ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        COMPILE_DEFINITIONS
-            PUBLIC
-                NULL_RENDERER
-                _RENDERER
-        INCLUDE_DIRECTORIES
-            PUBLIC
-                .
-                ..
-                ../Common
-                ../XRenderD3D9
-                ${pal_dir}
-        BUILD_DEPENDENCIES
-            PUBLIC
-                Legacy::CryCommon
-                Legacy::CryCommon.EngineSettings.Static
-    )
-
-    if (NOT LY_MONOLITHIC_GAME) # Only Atom is supported in monolithic builds
-        ly_add_target(
-            NAME CryRenderNULL ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-            NAMESPACE Legacy
-            FILES_CMAKE
-                core_null_renderer_shared_files.cmake
-            INCLUDE_DIRECTORIES
-                PRIVATE
-                    .
-            BUILD_DEPENDENCIES
-                PRIVATE
-                    Legacy::CryRenderNULL.Static
-        )
-
-        if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-            ly_add_target(
-                NAME CryRenderNULL.Tests MODULE
-                NAMESPACE Legacy
-                FILES_CMAKE
-                    core_null_renderer_test_files.cmake
-                INCLUDE_DIRECTORIES
-                    PRIVATE
-                        .
-                BUILD_DEPENDENCIES
-                    PRIVATE
-                        AZ::AzTest
-                        Legacy::CryRenderNULL.Static
-            )
-            # SPEC-1548: disabling since it fails in mac with memory issues
-            #ly_add_googletest(
-            #    NAME Legacy::CryRenderNULL.Tests
-            #)
-        endif()
-    endif()
-
-endif()
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/CRELensOpticsNULL.cpp b/Code/CryEngine/RenderDll/XRenderNULL/CRELensOpticsNULL.cpp
deleted file mode 100644
index 497eec472a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/CRELensOpticsNULL.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "../Common/RendElements/CRELensOptics.h"
-
-
-CRELensOptics::CRELensOptics(void)
-{
-    mfSetType(eDATA_LensOptics);
-    mfUpdateFlags(FCEF_TRANSFORM);
-}
-CRELensOptics::~CRELensOptics(void) {}
-
-bool CRELensOptics::mfCompile([[maybe_unused]] CParserBin& Parser, [[maybe_unused]] SParserFrame& Frame){ return true; }
-
-void CRELensOptics::mfPrepare([[maybe_unused]] bool bCheckOverflow) {}
-
-bool CRELensOptics::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm) { return true; }
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/CryRenderNULL.rc b/Code/CryEngine/RenderDll/XRenderNULL/CryRenderNULL.rc
deleted file mode 100644
index 33e65697ad..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/CryRenderNULL.rc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000904b0"
-        BEGIN
-            VALUE "CompanyName", "Amazon.com, Inc."
-            VALUE "FileVersion", "1, 0, 0, 1"
-            VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
-            VALUE "ProductName", "Open 3D Engine"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x9, 1200
-    END
-END
-
-#endif    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULLRenderAuxGeom.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULLRenderAuxGeom.cpp
deleted file mode 100644
index 5066ba8e20..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULLRenderAuxGeom.cpp
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "NULLRenderAuxGeom.h"
-
-// CryTek undefs some defines from WinBase.h...so let's redefine them here
-#if defined(WIN32) || defined(WIN64)
-  #ifdef UNICODE
-    #define RegisterClass  RegisterClassW
-  #else
-    #define RegisterClass  RegisterClassA
-  #endif // !UNICODE
-#endif
-
-CNULLRenderAuxGeom* CNULLRenderAuxGeom::s_pThis = NULL;
-
-
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-
-static const float W = 800.0f;
-static const float H = 600.0f;
-static const float THETA = 5.0f;
-static const Vec3 VUP(0.0f, 0.0f, 1.0f);
-
-bool CNULLRenderAuxGeom::s_active = false;
-bool CNULLRenderAuxGeom::s_hidden = true;
-
-void CNULLRenderAuxGeom::EnableOpenGL()
-{
-    CCamera& camera = gEnv->pSystem->GetViewCamera();
-    camera.SetFrustum(W, H);
-
-    const float FOV = camera.GetFov() / PI * 180.0f;
-    const float PNR = camera.GetNearPlane();
-    const float PFR = camera.GetFarPlane();
-
-    PIXELFORMATDESCRIPTOR pfd;
-    int format;
-
-    // get the device context (DC)
-    m_hdc = GetDC(m_hwnd);
-
-    // set the pixel format for the DC
-    ZeroMemory(&pfd, sizeof(pfd));
-    pfd.nSize = sizeof(pfd);
-    pfd.nVersion = 1;
-    pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
-    pfd.iPixelType = PFD_TYPE_RGBA;
-    pfd.cColorBits = 24;
-    pfd.cDepthBits = 16;
-    pfd.iLayerType = PFD_MAIN_PLANE;
-    format = ChoosePixelFormat(m_hdc, &pfd);
-    SetPixelFormat(m_hdc, format, &pfd);
-
-    // create and enable the render context (RC)
-    m_glrc = wglCreateContext(m_hdc);
-    wglMakeCurrent(m_hdc, m_glrc);
-
-    m_qobj = gluNewQuadric();
-
-    glShadeModel(GL_FLAT);
-    glPolygonMode(GL_FRONT, GL_FILL);
-    glEnable(GL_DEPTH_TEST);
-
-    glViewport(0, 0, W, H);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    gluPerspective(FOV, W / H, PNR, PFR);
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-}
-
-void CNULLRenderAuxGeom::DisableOpenGL()
-{
-    gluDeleteQuadric(m_qobj);
-
-    wglMakeCurrent(NULL, NULL);
-    wglDeleteContext(m_glrc);
-    ReleaseDC(m_hwnd, m_hdc);
-}
-
-#endif
-
-CNULLRenderAuxGeom::CNULLRenderAuxGeom(CNULLRenderer& renderer)
-    : m_renderer(&renderer)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    const char* wndClassName = "DebugRenderer";
-
-    // register window class
-    WNDCLASS wc;
-    wc.style = CS_OWNDC;
-    wc.lpfnWndProc = WndProc;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = 0;
-    wc.hInstance = GetModuleHandle(NULL);
-    wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
-    wc.lpszMenuName = NULL;
-    wc.lpszClassName = wndClassName;
-    RegisterClass(&wc);
-
-    // create main window
-    m_hwnd = CreateWindow(
-            wndClassName, wndClassName,
-            WS_CAPTION | WS_POPUP,
-            0, 0, W, H,
-            NULL, NULL, wc.hInstance, NULL);
-
-    ShowWindow(m_hwnd, SW_HIDE);
-    UpdateWindow(m_hwnd);
-
-    EnableOpenGL();
-
-    m_eye.Set(0.0f, 0.0f, 0.0f);
-    m_dir.Set(0.0f, 1.0f, 0.0f);
-    m_up.Set(0.0f, 0.0f, 1.0f);
-    m_updateSystemView = true;
-
-    REGISTER_COMMAND("r_debug_renderer_show_window", DebugRendererShowWindow, VF_NULL, "");
-    REGISTER_COMMAND("r_debug_renderer_set_eye_pos", DebugRendererSetEyePos, VF_NULL, "");
-    REGISTER_COMMAND("r_debug_renderer_update_system_view", DebugRendererUpdateSystemView, VF_NULL, "");
-#endif
-}
-
-CNULLRenderAuxGeom::~CNULLRenderAuxGeom()
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    DisableOpenGL();
-    DestroyWindow(m_hwnd);
-#endif
-}
-
-void CNULLRenderAuxGeom::BeginFrame()
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-
-    {
-        m_dir.normalize();
-        m_up.normalize();
-
-        Vec3 right = m_dir ^ m_up;
-
-        if (s_active)
-        {
-            Matrix34 m;
-
-            m.SetIdentity();
-            if (GetAsyncKeyState('W') & 0x8000)
-            {
-                m.AddTranslation(m_dir);
-            }
-            if (GetAsyncKeyState('S') & 0x8000)
-            {
-                m.AddTranslation(-m_dir);
-            }
-            if (GetAsyncKeyState('A') & 0x8000)
-            {
-                m.AddTranslation(-right);
-            }
-            if (GetAsyncKeyState('D') & 0x8000)
-            {
-                m.AddTranslation(right);
-            }
-            m_eye = m * m_eye;
-
-            m.SetIdentity();
-            if (GetAsyncKeyState(VK_RIGHT) & 0x8000)
-            {
-                m.SetRotationAA(-PI / 180.0f * THETA, VUP); // !m_up
-            }
-            if (GetAsyncKeyState(VK_LEFT) & 0x8000)
-            {
-                m.SetRotationAA(PI / 180.0f * THETA, VUP); // !m_up
-            }
-            if (GetAsyncKeyState(VK_UP) & 0x8000)
-            {
-                m.SetRotationAA(PI / 180.0f * THETA, right);
-            }
-            if (GetAsyncKeyState(VK_DOWN) & 0x8000)
-            {
-                m.SetRotationAA(-PI / 180.0f * THETA, right);
-            }
-            m_up = m * m_up;
-            m_dir = m * m_dir;
-        }
-
-        if (m_updateSystemView)
-        {
-            Matrix34 m(Matrix33::CreateOrientation(m_dir, m_up, 0), m_eye);
-            gEnv->pSystem->GetViewCamera().SetMatrix(m);
-        }
-        else
-        {
-            const Matrix34& viewMatrix = gEnv->pSystem->GetViewCamera().GetMatrix();
-            m_eye = viewMatrix.GetTranslation();
-            m_dir = viewMatrix.GetColumn1();
-            m_up  = viewMatrix.GetColumn2();
-        }
-    }
-
-#endif
-}
-
-void CNULLRenderAuxGeom::EndFrame()
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-
-    if (!s_hidden)
-    {
-        glLoadIdentity();
-
-        Vec3 at = m_eye + m_dir;
-        gluLookAt(m_eye.x, m_eye.y, m_eye.z, at.x, at.y, at.z, m_up.x, m_up.y, m_up.z);
-
-        glClearColor(0.0f, 0.0f, 0.3f, 0.0f);
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        glColor3f(1.0f, 0.0f, 0.0f);
-        gluSphere(m_qobj, 1.0f, 32, 32);
-
-        glInterleavedArrays(GL_C3F_V3F, 0, &m_points[0]);
-        glDrawArrays(GL_POINTS, 0, m_points.size());
-
-        glInterleavedArrays(GL_C3F_V3F, 0, &m_lines[0]);
-        glDrawArrays(GL_LINES, 0, m_lines.size() * 2);
-
-        for (size_t i = 0; i < m_polyLines.size(); ++i)
-        {
-            const SPolyLine& polyline = m_polyLines[i];
-            glInterleavedArrays(GL_C3F_V3F, 0, &polyline.points[0]);
-            glDrawArrays(GL_LINE_STRIP, 0, polyline.points.size());
-        }
-
-        glInterleavedArrays(GL_C3F_V3F, 0, &m_triangles[0]);
-        glDrawArrays(GL_TRIANGLES, 0, m_triangles.size() * 3);
-
-        for (size_t i = 0; i < m_spheres.size(); ++i)
-        {
-            glColor3fv(m_spheres[i].p.color);
-            glPushMatrix();
-            glLoadIdentity();
-            glTranslatef(m_spheres[i].p.vertex[0], m_spheres[i].p.vertex[1], m_spheres[i].p.vertex[2]);
-            gluSphere(m_qobj, m_spheres[i].r, 32, 32);
-            glPopMatrix();
-        }
-
-        glFlush();
-
-        SwapBuffers(m_hdc);
-    }
-
-    m_points.resize(0);
-    m_lines.resize(0);
-    m_polyLines.resize(0);
-    m_triangles.resize(0);
-    m_spheres.resize(0);
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawPoint([[maybe_unused]] const Vec3& v, [[maybe_unused]] const ColorB& col, [[maybe_unused]] uint8 size /* = 1  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    m_points.push_back(SPoint(v, col));
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawPoints([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB* col, [[maybe_unused]] uint8 size /* = 1  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    for (uint32 i = 0; i < numPoints; ++i)
-    {
-        m_points.push_back(SPoint(v[i], *col));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawPoints([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB& col, [[maybe_unused]] uint8 size /* = 1  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    for (uint32 i = 0; i < numPoints; ++i)
-    {
-        m_points.push_back(SPoint(v[i], col));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawLine([[maybe_unused]] const Vec3& v0, [[maybe_unused]] const ColorB& colV0, [[maybe_unused]] const Vec3& v1, [[maybe_unused]] const ColorB& colV1, [[maybe_unused]] float thickness /* = 1::0f  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    m_lines.push_back(SLine(SPoint(v0, colV0), SPoint(v1, colV1)));
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB& col, [[maybe_unused]] float thickness /* = 1::0f  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert((numPoints >= 2) && (0 == (numPoints & 1)));
-    for (uint32 i = 0; i < numPoints; i += 2)
-    {
-        m_lines.push_back(SLine(SPoint(v[i], col), SPoint(v[i + 1], col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB* col, [[maybe_unused]] float thickness /* = 1::0f  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert((numPoints >= 2) && (0 == (numPoints & 1)));
-    for (uint32 i = 0; i < numPoints; i += 2)
-    {
-        m_lines.push_back(SLine(SPoint(v[i], *col), SPoint(v[i + 1], *col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB& col, [[maybe_unused]] float thickness /* = 1::0f  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert(numPoints >= 2);
-    assert((numIndices >= 2) && (0 == (numIndices & 1)));
-    for (uint32 i = 0; i < numIndices; i += 2)
-    {
-        vtx_idx i0 = ind[i], i1 = ind[i + 1];
-        assert(i0 < numPoints && i1 < numPoints);
-        m_lines.push_back(SLine(SPoint(v[i0], col), SPoint(v[i1], col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawLines([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB* col, [[maybe_unused]] float thickness /* = 1::0f  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert(numPoints >= 2);
-    assert((numIndices >= 2) && (0 == (numIndices & 1)));
-    for (uint32 i = 0; i < numIndices; i += 2)
-    {
-        vtx_idx i0 = ind[i], i1 = ind[i + 1];
-        assert(i0 < numPoints && i1 < numPoints);
-        m_lines.push_back(SLine(SPoint(v[i0], *col), SPoint(v[i1], *col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawPolyline([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] bool closed, [[maybe_unused]] const ColorB& col, [[maybe_unused]] float thickness /* = 1::0f  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert(numPoints >= 2);
-    assert(!closed || numPoints >= 3);   // if "closed" then we need at least three vertices
-    m_polyLines.resize(m_polyLines.size() + 1);
-    SPolyLine& polyline = m_polyLines[m_polyLines.size() - 1];
-    for (uint32 i = 0; i < numPoints; ++i)
-    {
-        polyline.points.push_back(SPoint(v[i], col));
-    }
-    if (closed)
-    {
-        polyline.points.push_back(SPoint(v[0], col));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawPolyline([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] bool closed, [[maybe_unused]] const ColorB* col, [[maybe_unused]] float thickness /* = 1::0f  */)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert(numPoints >= 2);
-    assert(!closed || numPoints >= 3);   // if "closed" then we need at least three vertices
-    m_polyLines.resize(m_polyLines.size() + 1);
-    SPolyLine& polyline = m_polyLines[m_polyLines.size() - 1];
-    for (uint32 i = 0; i < numPoints; ++i)
-    {
-        polyline.points.push_back(SPoint(v[i], *col));
-    }
-    if (closed)
-    {
-        polyline.points.push_back(SPoint(v[0], *col));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawTriangle([[maybe_unused]] const Vec3& v0, [[maybe_unused]] const ColorB& colV0, [[maybe_unused]] const Vec3& v1, [[maybe_unused]] const ColorB& colV1, [[maybe_unused]] const Vec3& v2, [[maybe_unused]] const ColorB& colV2)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    m_triangles.push_back(STriangle(SPoint(v0, colV0), SPoint(v1, colV1), SPoint(v2, colV2)));
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB& col)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert((numPoints >= 3) && (0 == (numPoints % 3)));
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    for (size_t i = 0; i < numPoints; i += 3)
-    {
-        m_triangles.push_back(STriangle(SPoint(v[i], col), SPoint(v[i + 1], col), SPoint(v[i + 2], col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const ColorB* col)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert((numPoints >= 3) && (0 == (numPoints % 3)));
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    for (size_t i = 0; i < numPoints; i += 3)
-    {
-        m_triangles.push_back(STriangle(SPoint(v[i], *col), SPoint(v[i + 1], *col), SPoint(v[i + 2], *col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB& col)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert(numPoints >= 3);
-    assert((numIndices >= 3) && (0 == (numIndices % 3)));
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    for (size_t i = 0; i < numIndices; i += 3)
-    {
-        vtx_idx i0 = ind[i], i1 = ind[i + 1], i2 = ind[i + 2];
-        assert(i0 < numPoints && i1 < numPoints && i2 < numPoints);
-        m_triangles.push_back(STriangle(SPoint(v[i0], col), SPoint(v[i1], col), SPoint(v[i2], col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawTriangles([[maybe_unused]] const Vec3* v, [[maybe_unused]] uint32 numPoints, [[maybe_unused]] const vtx_idx* ind, [[maybe_unused]] uint32 numIndices, [[maybe_unused]] const ColorB* col)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    assert(numPoints >= 3);
-    assert((numIndices >= 3) && (0 == (numIndices % 3)));
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_RENDERER);
-    for (size_t i = 0; i < numIndices; i += 3)
-    {
-        vtx_idx i0 = ind[i], i1 = ind[i + 1], i2 = ind[i + 2];
-        assert(i0 < numPoints && i1 < numPoints && i2 < numPoints);
-        m_triangles.push_back(STriangle(SPoint(v[i0], *col), SPoint(v[i1], *col), SPoint(v[i2], *col)));
-    }
-#endif
-}
-
-void CNULLRenderAuxGeom::DrawSphere([[maybe_unused]] const Vec3& pos, [[maybe_unused]] float radius, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded)
-{
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    m_spheres.push_back(SSphere(SPoint(pos, col), radius));
-#endif
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULLRenderAuxGeom.h b/Code/CryEngine/RenderDll/XRenderNULL/NULLRenderAuxGeom.h
deleted file mode 100644
index 35c4c6a252..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULLRenderAuxGeom.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERNULL_NULLRENDERAUXGEOM_H
-#define CRYINCLUDE_CRYENGINE_RENDERDLL_XRENDERNULL_NULLRENDERAUXGEOM_H
-#pragma once
-#include "../Common/RenderAuxGeom.h"
-
-class CNULLRenderer;
-class ICrySizer;
-
-#if (defined(WIN32) || defined(WIN64)) && !defined(_RELEASE)
-#define ENABLE_WGL_DEBUG_RENDERER
-#endif
-
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-#include <windows.h>
-#include <gl/GL.h>
-#include <gl/GLU.h>
-#endif
-
-class CNULLRenderAuxGeom
-    : public IRenderAuxGeom
-{
-public:
-    // interface
-    virtual void SetRenderFlags([[maybe_unused]] const SAuxGeomRenderFlags& renderFlags) {}
-    virtual SAuxGeomRenderFlags GetRenderFlags() { return SAuxGeomRenderFlags(); }
-
-    virtual void Flush() {}
-    virtual void Commit([[maybe_unused]] uint frames = 0) {}
-    virtual void Process() {}
-
-    virtual void DrawPoint(const Vec3& v, const ColorB& col, uint8 size = 1);
-    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB& col, uint8 size = 1);
-    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB* col, uint8 size = 1);
-
-    virtual void DrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB& col, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB* col, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col, float thickness = 1.0f);
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col, float thickness = 1.0f);
-    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB& col, float thickness = 1.0f);
-    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB* col, float thickness = 1.0f);
-
-    virtual void DrawTriangle(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, const Vec3& v2, const ColorB& colV2);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB& col);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB* col);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col);
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col);
-
-    virtual void DrawQuad([[maybe_unused]] float width, [[maybe_unused]] float height, [[maybe_unused]] const Matrix34& matWorld, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-
-    virtual void DrawAABB([[maybe_unused]] const AABB& aabb, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-    virtual void DrawAABBs([[maybe_unused]] const AABB* aabb, [[maybe_unused]] uint32 aabbCount, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-    virtual void DrawAABB([[maybe_unused]] const AABB& aabb, [[maybe_unused]] const Matrix34& matWorld, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-
-    virtual void DrawOBB([[maybe_unused]] const OBB& obb, [[maybe_unused]] const Vec3& pos, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-    virtual void DrawOBB([[maybe_unused]] const OBB& obb, [[maybe_unused]] const Matrix34& matWorld, [[maybe_unused]] bool bSolid, [[maybe_unused]] const ColorB& col, [[maybe_unused]] const EBoundingBoxDrawStyle& bbDrawStyle) {}
-
-    virtual void DrawSphere(const Vec3& pos, float radius, const ColorB& col, bool drawShaded = true);
-    virtual void DrawDisk([[maybe_unused]] const Vec3& pos, [[maybe_unused]] const Vec3& dir, [[maybe_unused]] float radius, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-    virtual void DrawCone([[maybe_unused]] const Vec3& pos, [[maybe_unused]] const Vec3& dir, [[maybe_unused]] float radius, [[maybe_unused]] float height, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-    virtual void DrawCylinder([[maybe_unused]] const Vec3& pos, [[maybe_unused]] const Vec3& dir, [[maybe_unused]] float radius, [[maybe_unused]] float height, [[maybe_unused]] const ColorB& col, [[maybe_unused]] bool drawShaded = true) {}
-
-    virtual void DrawBone([[maybe_unused]] const Vec3& rParent, [[maybe_unused]] const Vec3& rBone, [[maybe_unused]] ColorB col) {}
-
-    virtual void RenderText([[maybe_unused]] Vec3 pos, [[maybe_unused]] SDrawTextInfo& ti, [[maybe_unused]] const char* forma, [[maybe_unused]] va_list args) {}
-
-public:
-    static CNULLRenderAuxGeom* Create(CNULLRenderer& renderer)
-    {
-        if (s_pThis == NULL)
-        {
-            s_pThis = new CNULLRenderAuxGeom(renderer);
-        }
-        return s_pThis;
-    }
-
-public:
-    ~CNULLRenderAuxGeom();
-
-    void BeginFrame();
-    void EndFrame();
-
-private:
-    CNULLRenderAuxGeom(CNULLRenderer& renderer);
-
-    CNULLRenderer* m_renderer;
-
-    static CNULLRenderAuxGeom* s_pThis;
-
-#ifdef ENABLE_WGL_DEBUG_RENDERER
-    static void DebugRendererShowWindow([[maybe_unused]] IConsoleCmdArgs* args)
-    {
-        if (!s_pThis)
-        {
-            return;
-        }
-
-        ShowWindow(s_pThis->m_hwnd, s_hidden ? SW_SHOWNA : SW_HIDE);
-        s_hidden = !s_hidden;
-    }
-
-    static void DebugRendererSetEyePos(IConsoleCmdArgs* args)
-    {
-        if (!s_pThis)
-        {
-            return;
-        }
-
-        if (args->GetArgCount() != 4)
-        {
-            return;
-        }
-
-        Vec3 pos;
-        pos.x = (float)atof(args->GetArg(1));
-        pos.y = (float)atof(args->GetArg(2));
-        pos.z = (float)atof(args->GetArg(3));
-
-        s_pThis->m_eye = pos;
-    }
-
-    static void DebugRendererUpdateSystemView(IConsoleCmdArgs* args)
-    {
-        if (!s_pThis)
-        {
-            return;
-        }
-
-        if (args->GetArgCount() != 2)
-        {
-            return;
-        }
-
-        s_pThis->m_updateSystemView = ((int)atoi(args->GetArg(1)) != 0);
-    }
-
-    HWND m_hwnd;
-    HDC m_hdc;
-    HGLRC m_glrc;
-
-    GLUquadricObj* m_qobj;
-
-    // Window Procedure
-    static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-    {
-        switch (message)
-        {
-        case WM_CREATE:
-            return 0;
-
-        case WM_CLOSE:
-            PostQuitMessage(0);
-            return 0;
-
-        case WM_DESTROY:
-            return 0;
-
-        case WM_ACTIVATE:
-            if (LOWORD(wParam) != WA_INACTIVE)
-            {
-                s_active = true;
-            }
-            else
-            {
-                s_active = false;
-            }
-            return 0;
-
-        default:
-            return DefWindowProc(hWnd, message, wParam, lParam);
-        }
-    }
-
-    void EnableOpenGL();
-    void DisableOpenGL();
-
-    struct SPoint // GL_C3F_V3F
-    {
-        GLfloat color[3]; // rgb
-        GLfloat vertex[3]; // xyz
-
-        SPoint() {}
-
-        SPoint(const Vec3& v, const ColorB& c)
-        {
-            color[0] = c.r / 255.f;
-            color[1] = c.g / 255.f;
-            color[2] = c.b / 255.f;
-            vertex[0] = v.x;
-            vertex[1] = v.y;
-            vertex[2] = v.z;
-        }
-
-        const SPoint& operator=(const SPoint& rhs)
-        {
-            memcpy(color, rhs.color, sizeof(color));
-            memcpy(vertex, rhs.vertex, sizeof(vertex));
-            return *this;
-        }
-    };
-
-    std::vector<SPoint> m_points;
-
-    struct SLine
-    {
-        SPoint points[2];
-
-        SLine() {}
-        SLine(const SPoint& p0, const SPoint& p1)
-        {
-            points[0] = p0;
-            points[1] = p1;
-        }
-    };
-
-    std::vector<SLine> m_lines;
-
-    struct SPolyLine
-    {
-        std::vector<SPoint> points;
-    };
-
-    std::vector<SPolyLine> m_polyLines;
-
-    struct STriangle
-    {
-        SPoint points[3];
-
-        STriangle() {}
-        STriangle(const SPoint& p0, const SPoint& p1, const SPoint& p2)
-        {
-            points[0] = p0;
-            points[1] = p1;
-            points[2] = p2;
-        }
-    };
-
-    std::vector<STriangle> m_triangles;
-
-    struct SSphere
-    {
-        SPoint p;
-        float r;
-
-        SSphere() {}
-        SSphere(const SPoint& p_, float r_)
-            : p(p_)
-            , r(r_) {}
-    };
-
-    std::vector<SSphere> m_spheres;
-
-    Vec3 m_eye, m_dir, m_up;
-    bool m_updateSystemView;
-
-    static bool s_active;
-    static bool s_hidden;
-#endif
-};
-
-#endif // NULL_RENDER_AUX_GEOM_H
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_DevBuffer.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_DevBuffer.cpp
deleted file mode 100644
index 25948e1dff..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_DevBuffer.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-
-//////////////////////////////////////////////////////////////////////////////////////
-buffer_handle_t CDeviceBufferManager::Create_Locked(BUFFER_BIND_TYPE, BUFFER_USAGE, size_t)
-{
-    return buffer_handle_t();
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::Destroy_Locked(buffer_handle_t)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void* CDeviceBufferManager::BeginRead_Locked([[maybe_unused]] buffer_handle_t handle)
-{
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void* CDeviceBufferManager::BeginWrite_Locked([[maybe_unused]] buffer_handle_t handle)
-{
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::EndReadWrite_Locked([[maybe_unused]] buffer_handle_t handle)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-bool CDeviceBufferManager::UpdateBuffer_Locked([[maybe_unused]] buffer_handle_t handle, const void*, size_t)
-{
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-size_t CDeviceBufferManager::Size_Locked(buffer_handle_t)
-{
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-CDeviceBufferManager::CDeviceBufferManager()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-CDeviceBufferManager::~CDeviceBufferManager()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::LockDevMan()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::UnlockDevMan()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-bool CDeviceBufferManager::Init()
-{
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-bool CDeviceBufferManager::Shutdown()
-{
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::Sync([[maybe_unused]] uint32 framdid)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::Update(uint32, [[maybe_unused]] bool called_during_loading)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-buffer_handle_t CDeviceBufferManager::Create(
-    [[maybe_unused]] BUFFER_BIND_TYPE type
-    , [[maybe_unused]] BUFFER_USAGE usage
-    , [[maybe_unused]] size_t size)
-{
-    return ~0u;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::Destroy([[maybe_unused]] buffer_handle_t handle)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void* CDeviceBufferManager::BeginRead([[maybe_unused]] buffer_handle_t handle)
-{
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void* CDeviceBufferManager::BeginWrite([[maybe_unused]] buffer_handle_t handle)
-{
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::EndReadWrite([[maybe_unused]] buffer_handle_t handle)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-bool CDeviceBufferManager::UpdateBuffer([[maybe_unused]] buffer_handle_t handle, [[maybe_unused]] const void* src, [[maybe_unused]] size_t size)
-{
-    return true;
-}
-
-/////////////////////////////////////////////////////////////
-// Legacy interface
-//
-// Use with care, can be removed at any point!
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::ReleaseVBuffer(CVertexBuffer* pVB)
-{
-    SAFE_DELETE(pVB);
-}
-//////////////////////////////////////////////////////////////////////////////////////
-void CDeviceBufferManager::ReleaseIBuffer(CIndexBuffer* pIB)
-{
-    SAFE_DELETE(pIB);
-}
-//////////////////////////////////////////////////////////////////////////////////////
-CVertexBuffer* CDeviceBufferManager::CreateVBuffer([[maybe_unused]] size_t nVerts, const AZ::Vertex::Format& vertexFormat, [[maybe_unused]] const char* szName, [[maybe_unused]] BUFFER_USAGE usage)
-{
-    CVertexBuffer* pVB = new CVertexBuffer(NULL, vertexFormat);
-    return pVB;
-}
-//////////////////////////////////////////////////////////////////////////////////////
-CIndexBuffer* CDeviceBufferManager::CreateIBuffer([[maybe_unused]] size_t nInds, [[maybe_unused]] const char* szNam, [[maybe_unused]] BUFFER_USAGE usage)
-{
-    CIndexBuffer* pIB = new CIndexBuffer(NULL);
-    return pIB;
-}
-//////////////////////////////////////////////////////////////////////////////////////
-bool CDeviceBufferManager::UpdateVBuffer([[maybe_unused]] CVertexBuffer* pVB, [[maybe_unused]] void* pVerts, [[maybe_unused]] size_t nVerts)
-{
-    return true;
-}
-//////////////////////////////////////////////////////////////////////////////////////
-bool CDeviceBufferManager::UpdateIBuffer([[maybe_unused]] CIndexBuffer* pIB, [[maybe_unused]] void* pInds, [[maybe_unused]] size_t nInds)
-{
-    return true;
-}
-//////////////////////////////////////////////////////////////////////////////////////
-CVertexBuffer::~CVertexBuffer()
-{
-}
-//////////////////////////////////////////////////////////////////////////////////////
-CIndexBuffer::~CIndexBuffer()
-{
-}
-
-namespace AzRHI
-{
-    ConstantBuffer::~ConstantBuffer()
-    {}
-
-    void ConstantBuffer::AddRef()
-    {}
-
-    AZ::u32 ConstantBuffer::Release()
-    {
-        return 0;
-    }
-}
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Font.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_Font.cpp
deleted file mode 100644
index f20b12c559..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Font.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : NULL font functions.
-
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "Common/Textures/TextureManager.h"
-
-#include "../CryFont/FBitmap.h"
-
-bool CNULLRenderer::FontUpdateTexture([[maybe_unused]] int nTexId, [[maybe_unused]] int X, [[maybe_unused]] int Y, [[maybe_unused]] int USize, [[maybe_unused]] int VSize, [[maybe_unused]] byte* pData)
-{
-    return true;
-}
-
-bool CNULLRenderer::FontUploadTexture([[maybe_unused]] class CFBitmap* pBmp, [[maybe_unused]] ETEX_Format eTF)
-{
-    return true;
-}
-void CNULLRenderer::FontReleaseTexture([[maybe_unused]] class CFBitmap* pBmp)
-{
-}
-
-void CNULLRenderer::FontSetTexture([[maybe_unused]] class CFBitmap* pBmp, [[maybe_unused]] int nTexFiltMode)
-{
-}
-
-void CNULLRenderer::FontSetTexture([[maybe_unused]] int nTexId, [[maybe_unused]] int nFilterMode)
-{
-}
-
-int CNULLRenderer::FontCreateTexture([[maybe_unused]] int Width, [[maybe_unused]] int Height, [[maybe_unused]] byte* pData, [[maybe_unused]] ETEX_Format eTF, [[maybe_unused]] bool genMips, [[maybe_unused]] const char* textureName)
-{
-    return CTextureManager::Instance()->GetNoTexture()->GetTextureID();
-}
-
-void CNULLRenderer::DrawDynVB([[maybe_unused]] SVF_P3F_C4B_T2F* pBuf, [[maybe_unused]] uint16* pInds, [[maybe_unused]] int nVerts, [[maybe_unused]] int nInds, [[maybe_unused]] const PublicRenderPrimitiveType nPrimType)
-{
-}
-
-void CNULLRenderer::DrawDynUiPrimitiveList([[maybe_unused]] DynUiPrimitiveList& primitives, [[maybe_unused]] int totalNumVertices, [[maybe_unused]] int totalNumIndices)
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_PostProcess.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_PostProcess.cpp
deleted file mode 100644
index 5828787b5e..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_PostProcess.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-/*
-Todo:
-* Erradicate StretchRect usage
-* Cleanup code
-* When we have a proper static branching support use it instead of shader switches inside code
-*/
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "I3DEngine.h"
-#include "../Common/PostProcess/PostEffects.h"
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-AZStd::unique_ptr<CMotionBlur::ObjectMap> CMotionBlur::m_Objects[CMotionBlur::s_maxObjectBuffers];
-CThreadSafeRendererContainer<CMotionBlur::ObjectMap::value_type> CMotionBlur::m_FillData[RT_COMMAND_BUF_COUNT];
-
-bool CPostAA::Preprocess()
-{
-    return true;
-}
-
-void CPostAA::Render()
-{
-}
-
-void CMotionBlur::InsertNewElements()
-{
-}
-
-void CMotionBlur::FreeData()
-{
-}
-
-void CMotionBlur::GetPrevObjToWorldMat([[maybe_unused]] CRenderObject* pObj, Matrix44A& res)
-{
-    res = Matrix44(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-}
-
-void CMotionBlur::OnBeginFrame()
-{
-}
-
-bool CMotionBlur::Preprocess()
-{
-    return true;
-}
-
-void CMotionBlur::Render()
-{
-}
-
-bool CSunShafts::Preprocess()
-{
-    return true;
-}
-
-void CSunShafts::Render()
-{
-}
-
-
-void CFilterSharpening::Render()
-{
-}
-void CFilterBlurring::Render()
-{
-}
-
-
-void CUnderwaterGodRays::Render()
-{
-}
-
-void CVolumetricScattering::Render()
-{
-}
-
-void CWaterDroplets::Render()
-{
-}
-
-void CWaterFlow::Render()
-{
-}
-
-
-void CWaterRipples::AddHit([[maybe_unused]] const Vec3& vPos, [[maybe_unused]] const float scale, [[maybe_unused]] const float strength)
-{
-}
-
-void CWaterRipples::DEBUG_DrawWaterHits()
-{
-}
-
-bool CWaterRipples::Preprocess()
-{
-    return true;
-}
-
-void CWaterRipples::Reset([[maybe_unused]] bool bOnSpecChange)
-{
-}
-
-void CWaterRipples::Render()
-{
-}
-
-void CScreenFrost::Render()
-{
-}
-
-bool CRainDrops::Preprocess()
-{
-    return true;
-}
-void CRainDrops::Render()
-{
-}
-
-bool CFlashBang::Preprocess()
-{
-    return true;
-}
-
-void CFlashBang::Render()
-{
-}
-
-void CAlienInterference::Render()
-{
-}
-
-void CGhostVision::Render()
-{
-}
-
-void CHudSilhouettes::Render()
-{
-}
-
-void CColorGrading::Render()
-{
-}
-
-void CWaterVolume::Render()
-{
-}
-
-void CSceneRain::CreateBuffers([[maybe_unused]] uint16 nVerts, [[maybe_unused]] void*& pINpVB, [[maybe_unused]] SVF_P3F_C4B_T2F* pVtxList)
-{
-}
-
-int CSceneRain::CreateResources()
-{
-    return 1;
-}
-
-void CSceneRain::Release()
-{
-}
-
-void CSceneRain::Render()
-{
-}
-
-bool CSceneSnow::Preprocess()
-{
-    return true;
-}
-void CSceneSnow::Render()
-{
-}
-
-int CSceneSnow::CreateResources()
-{
-    return 1;
-}
-
-void CSceneSnow::Release()
-{
-}
-
-void CImageGhosting::Render()
-{
-}
-
-void CFilterKillCamera::Render()
-{
-}
-
-void CUberGamePostProcess::Render()
-{
-}
-
-void CSoftAlphaTest::Render()
-{
-}
-
-void CScreenBlood::Render() { }
-
-void CPost3DRenderer::Render()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-namespace WaterVolumeStaticData
-{
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer){}
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CSceneRain::Preprocess() { return true; }
-//void CSceneRain::Render() {}
-void CSceneRain::Reset([[maybe_unused]] bool bOnSpecChange) {}
-void CSceneRain::OnLostDevice() {}
-
-const char* CSceneRain::GetName() const {return 0; }
-const char* CRainDrops::GetName() const {return 0; }
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CSceneSnow::Reset([[maybe_unused]] bool bOnSpecChange) {}
-
-
-const char* CSceneSnow::GetName() const {return 0; }
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool CREPostProcess::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void ScreenFader::Render()
-{
-
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_RERender.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_RERender.cpp
deleted file mode 100644
index 32335e3c9a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_RERender.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "I3DEngine.h"
-
-//=======================================================================
-
-bool CRESky::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-bool CREHDRSky::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-bool CREFogVolume::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-bool CREWaterVolume::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-void CREWaterOcean::FrameUpdate()
-{
-}
-
-void CREWaterOcean::Create([[maybe_unused]] uint32 nVerticesCount, [[maybe_unused]] SVF_P3F_C4B_T2F* pVertices, [[maybe_unused]] uint32 nIndicesCount, [[maybe_unused]] const void* pIndices, [[maybe_unused]] uint32 nIndexSizeof)
-{
-}
-
-void CREWaterOcean::ReleaseOcean()
-{
-}
-
-bool CREWaterOcean::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-CREOcclusionQuery::~CREOcclusionQuery()
-{
-    mfReset();
-}
-
-void CREOcclusionQuery::mfReset()
-{
-    m_nOcclusionID = 0;
-}
-
-uint32 CREOcclusionQuery::m_nQueriesPerFrameCounter = 0;
-uint32 CREOcclusionQuery::m_nReadResultNowCounter = 0;
-uint32 CREOcclusionQuery::m_nReadResultTryCounter = 0;
-
-bool CREOcclusionQuery::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-bool CREOcclusionQuery::mfReadResult_Now(void)
-{
-    return true;
-}
-bool CREOcclusionQuery::mfReadResult_Try([[maybe_unused]] uint32 nDefaultNumSamples)
-{
-    return true;
-}
-bool CREOcclusionQuery::RT_ReadResult_Try([[maybe_unused]] uint32 nDefaultNumSamples)
-{
-    return true;
-}
-
-bool CREMeshImpl::mfPreDraw([[maybe_unused]] SShaderPass* sl)
-{
-    return true;
-}
-
-bool CREMeshImpl::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sl)
-{
-    return true;
-}
-
-bool CREHDRProcess::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-bool CREDeferredShading::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-bool CREBeam::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sl)
-{
-    return true;
-}
-
-bool CREImposter::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* pPass)
-{
-    return true;
-}
-
-bool CRECloud::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* pPass)
-{
-    return true;
-}
-
-bool CRECloud::UpdateImposter([[maybe_unused]] CRenderObject* pObj)
-{
-    return true;
-}
-
-bool CRECloud::GenerateCloudImposter([[maybe_unused]] CShader* pShader, [[maybe_unused]] CShaderResources* pRes, [[maybe_unused]] CRenderObject* pObject)
-{
-    return true;
-}
-
-bool CREImposter::UpdateImposter()
-{
-    return true;
-}
-
-bool CREVolumeObject::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-bool CREPrismObject::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-bool CREGameEffect::mfDraw([[maybe_unused]] CShader* ef, [[maybe_unused]] SShaderPass* sfm)
-{
-    return true;
-}
-
-
-void CRELensOptics::ClearResources()
-{
-}
-
-#if defined(USE_GEOM_CACHES)
-bool CREGeomCache::mfDraw([[maybe_unused]] CShader* pShader, [[maybe_unused]] SShaderPass* pShaderPass)
-{
-    return true;
-}
-#endif
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_RendPipeline.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_RendPipeline.cpp
deleted file mode 100644
index 343d3e261c..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_RendPipeline.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : NULL device specific implementation using shaders pipeline.
-
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "Common/RenderView.h"
-
-//============================================================================================
-// Init Shaders rendering
-
-void CNULLRenderer::EF_Init()
-{
-    m_RP.m_MaxVerts = 600;
-    m_RP.m_MaxTris = 300;
-
-    //==================================================
-    // Init RenderObjects
-    {
-        m_RP.m_nNumObjectsInPool = 384; // magic number set by Cry.  The regular pipe uses a constant set to 1024
-
-        if (m_RP.m_ObjectsPool != nullptr)
-        {
-            for (int j = 0; j < (int)(m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT); j++)
-            {
-                CRenderObject* pRendObj = &m_RP.m_ObjectsPool[j];
-                pRendObj->~CRenderObject();
-            }
-            CryModuleMemalignFree(m_RP.m_ObjectsPool);
-        }
-
-        // we use a plain allocation and placement new here to garantee the alignment, when using array new, the compiler can store it's size and break the alignment
-        m_RP.m_ObjectsPool = (CRenderObject*)CryModuleMemalign(sizeof(CRenderObject) * (m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT), 16);
-        for (int j = 0; j < (int)(m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT); j++)
-        {
-            new(&m_RP.m_ObjectsPool[j])CRenderObject();
-        }
-
-        CRenderObject** arrPrefill = (CRenderObject**)(alloca(m_RP.m_nNumObjectsInPool * sizeof(CRenderObject*)));
-        for (int j = 0; j < RT_COMMAND_BUF_COUNT; j++)
-        {
-            for (int k = 0; k < m_RP.m_nNumObjectsInPool; ++k)
-            {
-                arrPrefill[k] = &m_RP.m_ObjectsPool[j * m_RP.m_nNumObjectsInPool + k];
-            }
-
-            m_RP.m_TempObjects[j].PrefillContainer(arrPrefill, m_RP.m_nNumObjectsInPool);
-            m_RP.m_TempObjects[j].resize(0);
-        }
-    }
-    // Init identity RenderObject
-    SAFE_DELETE(m_RP.m_pIdendityRenderObject);
-    m_RP.m_pIdendityRenderObject = aznew CRenderObject();
-    m_RP.m_pIdendityRenderObject->Init();
-    m_RP.m_pIdendityRenderObject->m_II.m_AmbColor = Col_White;
-    m_RP.m_pIdendityRenderObject->m_II.m_Matrix.SetIdentity();
-    m_RP.m_pIdendityRenderObject->m_RState = 0;
-    m_RP.m_pIdendityRenderObject->m_ObjFlags |= FOB_RENDERER_IDENDITY_OBJECT;
-
-}
-
-void CNULLRenderer::FX_SetClipPlane ([[maybe_unused]] bool bEnable, [[maybe_unused]] float* pPlane, [[maybe_unused]] bool bRefract)
-{
-}
-
-void CNULLRenderer::FX_PipelineShutdown([[maybe_unused]] bool bFastShutdown)
-{
-    uint32 i, j;
-
-    for (int n = 0; n < 2; n++)
-    {
-        for (j = 0; j < 2; j++)
-        {
-            for (i = 0; i < CREClientPoly::m_PolysStorage[n][j].Num(); i++)
-            {
-                CREClientPoly::m_PolysStorage[n][j][i]->Release(false);
-            }
-            CREClientPoly::m_PolysStorage[n][j].Free();
-        }
-    }
-}
-
-void CNULLRenderer::EF_Release([[maybe_unused]] int nFlags)
-{
-}
-
-//==========================================================================
-
-void CNULLRenderer::FX_SetState(int st, int AlphaRef, [[maybe_unused]] int RestoreState)
-{
-    m_RP.m_CurState = st;
-    m_RP.m_CurAlphaRef = AlphaRef;
-}
-void CRenderer::FX_SetStencilState([[maybe_unused]] int st, [[maybe_unused]] uint32 nStencRef, [[maybe_unused]] uint32 nStencMask, [[maybe_unused]] uint32 nStencWriteMask, [[maybe_unused]] bool bForceFullReadMask)
-{
-}
-
-//=================================================================================
-
-// Initialize of the new shader pipeline (only 2d)
-void CRenderer::FX_Start([[maybe_unused]] CShader* ef, [[maybe_unused]] int nTech, [[maybe_unused]] CShaderResources* Res, [[maybe_unused]] IRenderElement* re)
-{
-    m_RP.m_Frame++;
-}
-
-void CRenderer::FX_CheckOverflow([[maybe_unused]] int nVerts, [[maybe_unused]] int nInds, [[maybe_unused]] IRenderElement* re, [[maybe_unused]] int* nNewVerts, [[maybe_unused]] int* nNewInds)
-{
-}
-
-uint32 CRenderer::EF_GetDeferredLightsNum([[maybe_unused]] const eDeferredLightType eLightType)
-{
-    return 0;
-}
-
-int CRenderer::EF_AddDeferredLight([[maybe_unused]] const CDLight& pLight, float, [[maybe_unused]] const SRenderingPassInfo& passInfo, [[maybe_unused]] const SRendItemSorter& rendItemSorter)
-{
-    return 0;
-}
-
-void CRenderer::EF_ClearDeferredLightsList()
-{
-}
-
-void CRenderer::EF_ReleaseDeferredData()
-{
-}
-
-uint8 CRenderer::EF_AddDeferredClipVolume([[maybe_unused]] const IClipVolume* pClipVolume)
-{
-    return 0;
-}
-
-
-bool CRenderer::EF_SetDeferredClipVolumeBlendData([[maybe_unused]] const IClipVolume* pClipVolume, [[maybe_unused]] const SClipVolumeBlendInfo& blendInfo)
-{
-    return false;
-}
-
-void CRenderer::EF_ClearDeferredClipVolumesList()
-{
-}
-
-//========================================================================================
-
-void CNULLRenderer::EF_EndEf3D([[maybe_unused]] const int nFlags, [[maybe_unused]] const int nPrecacheUpdateId, [[maybe_unused]] const int nNearPrecacheUpdateId, [[maybe_unused]] const SRenderingPassInfo& passInfo)
-{
-    //m_RP.m_TI[m_RP.m_nFillThreadID].m_RealTime = iTimer->GetCurrTime();
-    EF_RemovePolysFromScene();
-
-    int nThreadID = m_pRT->GetThreadList();
-    SRendItem::m_RecurseLevel[nThreadID]--;
-}
-
-//double timeFtoI, timeFtoL, timeQRound;
-//int sSome;
-void CNULLRenderer::EF_EndEf2D([[maybe_unused]] const bool bSort)
-{
-}
-
-void CRenderView::PrepareForRendering() {}
-
-void CRenderView::PrepareForWriting() {}
-
-void CRenderView::ClearRenderItems() {}
-
-void CRenderView::FreeRenderItems() {}
-
-CRenderView::CRenderView() {}
-
-CRenderView::~CRenderView() {}
-
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Renderer.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_Renderer.cpp
deleted file mode 100644
index adb5ddf079..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Renderer.cpp
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the NULL renderer API
-
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include <IColorGradingController.h>
-#include "IStereoRenderer.h"
-#include "../Common/Textures/TextureManager.h"
-
-#include <IEngineModule.h>
-#include <CryExtension/Impl/ClassWeaver.h>
-// init memory pool usage
-
-#include "GraphicsPipeline/FurBendData.h"
-
-#include <random>  //std::random_device
-
-CCryNameTSCRC CTexture::s_sClassName = CCryNameTSCRC("CTexture");
-CCryNameTSCRC CHWShader::s_sClassNameVS = CCryNameTSCRC("CHWShader_VS");
-CCryNameTSCRC CHWShader::s_sClassNamePS = CCryNameTSCRC("CHWShader_PS");
-CCryNameTSCRC CShader::s_sClassName = CCryNameTSCRC("CShader");
-
-CNULLRenderer* gcpNULL = NULL;
-
-//////////////////////////////////////////////////////////////////////
-
-class CNullColorGradingController
-    : public IColorGradingController
-{
-public:
-    virtual int LoadColorChart([[maybe_unused]] const char* pChartFilePath) const { return 0; }
-    virtual int LoadDefaultColorChart() const { return 0; }
-    virtual void UnloadColorChart([[maybe_unused]] int texID) const {}
-    virtual void SetLayers([[maybe_unused]] const SColorChartLayer* pLayers, [[maybe_unused]] uint32 numLayers) {}
-};
-
-//////////////////////////////////////////////////////////////////////
-
-class CNullStereoRenderer
-    : public IStereoRenderer
-{
-public:
-    virtual EStereoDevice GetDevice() { return STEREO_DEVICE_NONE; }
-    virtual EStereoDeviceState GetDeviceState() { return STEREO_DEVSTATE_UNSUPPORTED_DEVICE; }
-    virtual void GetInfo(EStereoDevice* device, EStereoMode* mode, EStereoOutput* output, EStereoDeviceState* state) const
-    {
-        if (device)
-        {
-            *device = STEREO_DEVICE_NONE;
-        }
-        if (mode)
-        {
-            *mode = STEREO_MODE_NO_STEREO;
-        }
-        if (output)
-        {
-            *output = STEREO_OUTPUT_STANDARD;
-        }
-        if (state)
-        {
-            *state = STEREO_DEVSTATE_OK;
-        }
-    }
-    virtual bool GetStereoEnabled() { return false; }
-    virtual float GetStereoStrength() { return 0; }
-    virtual float GetMaxSeparationScene([[maybe_unused]] bool half = true) { return 0; }
-    virtual float GetZeroParallaxPlaneDist() { return 0; }
-    virtual void GetNVControlValues([[maybe_unused]] bool& stereoEnabled, [[maybe_unused]] float& stereoStrength) {};
-    virtual void OnHmdDeviceChanged() {}
-    virtual bool IsRenderingToHMD() override { return false; }
-    Status GetStatus() const override { return IStereoRenderer::Status::kIdle; }
-};
-
-//////////////////////////////////////////////////////////////////////
-CNULLRenderer::CNULLRenderer()
-{
-    gcpNULL = this;
-    m_pNULLRenderAuxGeom = CNULLRenderAuxGeom::Create(*this);
-    m_pNULLColorGradingController = new CNullColorGradingController();
-    m_pNULLStereoRenderer = new CNullStereoRenderer();
-    m_pixelAspectRatio = 1.0f;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QueryIsFullscreen()
-{
-    return false;
-}
-
-
-#include <stdio.h>
-//////////////////////////////////////////////////////////////////////
-CNULLRenderer::~CNULLRenderer()
-{
-    ShutDown();
-    delete m_pNULLRenderAuxGeom;
-    delete m_pNULLColorGradingController;
-    delete m_pNULLStereoRenderer;
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::EnableTMU([[maybe_unused]] bool enable)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::CheckError([[maybe_unused]] const char* comment)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::BeginFrame()
-{
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_nFrameID++;
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_nFrameUpdateID++;
-    m_RP.m_TI[m_RP.m_nFillThreadID].m_RealTime = iTimer->GetCurrTime();
-
-    m_pNULLRenderAuxGeom->BeginFrame();
-}
-
-//////////////////////////////////////////////////////////////////////
-bool CNULLRenderer::ChangeDisplay([[maybe_unused]] unsigned int width, [[maybe_unused]] unsigned int height, [[maybe_unused]] unsigned int bpp)
-{
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::ChangeViewport([[maybe_unused]] unsigned int x, [[maybe_unused]] unsigned int y, [[maybe_unused]] unsigned int width, [[maybe_unused]] unsigned int height, [[maybe_unused]] bool bMainViewport, [[maybe_unused]] float scaleWidth, [[maybe_unused]] float scaleHeight)
-{
-}
-
-void CNULLRenderer::RenderDebug([[maybe_unused]] bool bRenderStats)
-{
-}
-
-void CNULLRenderer::EndFrame()
-{
-    //m_pNULLRenderAuxGeom->Flush(true);
-    m_pNULLRenderAuxGeom->EndFrame();
-    m_pRT->RC_EndFrame(!m_bStartLevelLoading);
-}
-
-void CNULLRenderer::TryFlush()
-{
-}
-
-void CNULLRenderer::GetMemoryUsage([[maybe_unused]] ICrySizer* Sizer)
-{
-}
-
-WIN_HWND CNULLRenderer::GetHWND()
-{
-#if defined(WIN32)
-    return GetDesktopWindow();
-#else
-    return NULL;
-#endif
-}
-
-bool CNULLRenderer::SetWindowIcon([[maybe_unused]] const char* path)
-{
-    return false;
-}
-
-void TexBlurAnisotropicVertical([[maybe_unused]] CTexture* pTex, [[maybe_unused]] int nAmount, [[maybe_unused]] float fScale, [[maybe_unused]] float fDistribution, [[maybe_unused]] bool bAlphaOnly)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-//IMAGES DRAWING
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::Draw2dImage([[maybe_unused]] float xpos, [[maybe_unused]] float ypos, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] int texture_id, [[maybe_unused]] float s0, [[maybe_unused]] float t0, [[maybe_unused]] float s1, [[maybe_unused]] float t1, [[maybe_unused]] float angle, [[maybe_unused]] float r, [[maybe_unused]] float g, [[maybe_unused]] float b, [[maybe_unused]] float a, [[maybe_unused]] float z)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::Push2dImage([[maybe_unused]] float xpos, [[maybe_unused]] float ypos, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] int texture_id, [[maybe_unused]] float s0, [[maybe_unused]] float t0, [[maybe_unused]] float s1, [[maybe_unused]] float t1, [[maybe_unused]] float angle, [[maybe_unused]] float r, [[maybe_unused]] float g, [[maybe_unused]] float b, [[maybe_unused]] float a, [[maybe_unused]] float z, [[maybe_unused]] float stereoDepth)
-{
-}
-
-void CNULLRenderer::Draw2dImageList()
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::DrawImage([[maybe_unused]] float xpos, [[maybe_unused]] float ypos, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] int texture_id, [[maybe_unused]] float s0, [[maybe_unused]] float t0, [[maybe_unused]] float s1, [[maybe_unused]] float t1, [[maybe_unused]] float r, [[maybe_unused]] float g, [[maybe_unused]] float b, [[maybe_unused]] float a, [[maybe_unused]] bool filtered)
-{
-}
-
-void CNULLRenderer::DrawImageWithUV([[maybe_unused]] float xpos, [[maybe_unused]] float ypos, [[maybe_unused]] float z, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] int texture_id, [[maybe_unused]] float s[4], [[maybe_unused]] float t[4], [[maybe_unused]] float r, [[maybe_unused]] float g, [[maybe_unused]] float b, [[maybe_unused]] float a, [[maybe_unused]] bool filtered)
-{
-}
-
-///////////////////////////////////////////
-void CNULLRenderer::DrawBuffer([[maybe_unused]] CVertexBuffer* pVBuf, [[maybe_unused]] CIndexBuffer* pIBuf, [[maybe_unused]] int nNumIndices, [[maybe_unused]] int nOffsIndex, [[maybe_unused]] const PublicRenderPrimitiveType nPrmode, [[maybe_unused]] int nVertStart, [[maybe_unused]] int nVertStop)
-{
-}
-
-void CNULLRenderer::DrawPrimitivesInternal([[maybe_unused]] CVertexBuffer* src, [[maybe_unused]] int vert_num, [[maybe_unused]] const eRenderPrimitiveType prim_type)
-{
-}
-
-void CRenderMesh::DrawImmediately()
-{
-}
-
-///////////////////////////////////////////
-void CNULLRenderer::SetCullMode([[maybe_unused]] int mode)
-{
-}
-
-///////////////////////////////////////////
-bool CNULLRenderer::EnableFog([[maybe_unused]] bool enable)
-{
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-//MISC EXTENSIONS
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////
-void CNULLRenderer::EnableVSync([[maybe_unused]] bool enable)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::SelectTMU([[maybe_unused]] int tnum)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-//MATRIX FUNCTIONS
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////
-void CNULLRenderer::PushMatrix()
-{
-}
-
-///////////////////////////////////////////
-void CNULLRenderer::RotateMatrix([[maybe_unused]] float a, [[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z)
-{
-}
-
-void CNULLRenderer::RotateMatrix([[maybe_unused]] const Vec3& angles)
-{
-}
-
-///////////////////////////////////////////
-void CNULLRenderer::TranslateMatrix([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z)
-{
-}
-
-void CNULLRenderer::MultMatrix([[maybe_unused]] const float* mat)
-{
-}
-
-void CNULLRenderer::TranslateMatrix([[maybe_unused]] const Vec3& pos)
-{
-}
-
-///////////////////////////////////////////
-void CNULLRenderer::ScaleMatrix([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z)
-{
-}
-
-///////////////////////////////////////////
-void CNULLRenderer::PopMatrix()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-void CNULLRenderer::LoadMatrix([[maybe_unused]] const Matrix34* src)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-//MISC
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////
-void CNULLRenderer::PushWireframeMode([[maybe_unused]] int mode){}
-void CNULLRenderer::PopWireframeMode(){}
-void CNULLRenderer::FX_PushWireframeMode([[maybe_unused]] int mode){}
-void CNULLRenderer::FX_PopWireframeMode(){}
-void CNULLRenderer::FX_SetWireframeMode([[maybe_unused]] int mode){}
-
-///////////////////////////////////////////
-void CNULLRenderer::SetCamera(const CCamera& cam)
-{
-    int nThreadID = m_pRT->GetThreadList();
-    m_RP.m_TI[nThreadID].m_cam = cam;
-}
-
-void CNULLRenderer::GetViewport(int* x, int* y, int* width, int* height) const
-{
-    *x = 0;
-    *y = 0;
-    *width = GetWidth();
-    *height = GetHeight();
-}
-
-void CNULLRenderer::SetViewport([[maybe_unused]] int x, [[maybe_unused]] int y, [[maybe_unused]] int width, [[maybe_unused]] int height, [[maybe_unused]] int id)
-{
-}
-
-void CNULLRenderer::SetScissor([[maybe_unused]] int x, [[maybe_unused]] int y, [[maybe_unused]] int width, [[maybe_unused]] int height)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::GetModelViewMatrix(float* mat)
-{
-    memcpy(mat, &m_IdentityMatrix, sizeof(m_IdentityMatrix));
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::GetProjectionMatrix(float* mat)
-{
-    memcpy(mat, &m_IdentityMatrix, sizeof(m_IdentityMatrix));
-}
-
-//////////////////////////////////////////////////////////////////////
-ITexture* CNULLRenderer::EF_LoadTexture([[maybe_unused]] const char * nameTex, [[maybe_unused]] const uint32 flags)
-{
-    return CTextureManager::Instance()->GetNoTexture();
-}
-
-//////////////////////////////////////////////////////////////////////
-ITexture* CNULLRenderer::EF_LoadDefaultTexture(const char * nameTex)
-{
-    return CTextureManager::Instance()->GetDefaultTexture(nameTex);
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::DrawQuad([[maybe_unused]] const Vec3& right, [[maybe_unused]] const Vec3& up, [[maybe_unused]] const Vec3& origin, [[maybe_unused]] int nFlipmode /*=0*/)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-bool CNULLRenderer::ProjectToScreen([[maybe_unused]] float ptx, [[maybe_unused]] float pty, [[maybe_unused]] float ptz, [[maybe_unused]] float* sx, [[maybe_unused]] float* sy, [[maybe_unused]] float* sz)
-{
-    return false;
-}
-
-int CNULLRenderer::UnProject([[maybe_unused]] float sx, [[maybe_unused]] float sy, [[maybe_unused]] float sz,
-    [[maybe_unused]] float* px, [[maybe_unused]] float* py, [[maybe_unused]] float* pz,
-    [[maybe_unused]] const float modelMatrix[16],
-    [[maybe_unused]] const float projMatrix[16],
-    [[maybe_unused]] const int    viewport[4])
-{
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////
-int CNULLRenderer::UnProjectFromScreen([[maybe_unused]] float  sx, [[maybe_unused]] float  sy, [[maybe_unused]] float  sz,
-    [[maybe_unused]] float* px, [[maybe_unused]] float* py, [[maybe_unused]] float* pz)
-{
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////
-bool CNULLRenderer::ScreenShot([[maybe_unused]] const char* filename, [[maybe_unused]] int width)
-{
-    return true;
-}
-
-int CNULLRenderer::ScreenToTexture([[maybe_unused]] int nTexID)
-{
-    return 0;
-}
-
-void CNULLRenderer::ResetToDefault()
-{
-}
-
-///////////////////////////////////////////
-void CNULLRenderer::SetMaterialColor([[maybe_unused]] float r, [[maybe_unused]] float g, [[maybe_unused]] float b, [[maybe_unused]] float a)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-void CNULLRenderer::ClearTargetsImmediately([[maybe_unused]] uint32 nFlags) {}
-void CNULLRenderer::ClearTargetsImmediately([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors, [[maybe_unused]] float fDepth) {}
-void CNULLRenderer::ClearTargetsImmediately([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors) {}
-void CNULLRenderer::ClearTargetsImmediately([[maybe_unused]] uint32 nFlags, [[maybe_unused]] float fDepth) {}
-
-void CNULLRenderer::ClearTargetsLater([[maybe_unused]] uint32 nFlags) {}
-void CNULLRenderer::ClearTargetsLater([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors, [[maybe_unused]] float fDepth) {}
-void CNULLRenderer::ClearTargetsLater([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors) {}
-void CNULLRenderer::ClearTargetsLater([[maybe_unused]] uint32 nFlags, [[maybe_unused]] float fDepth) {}
-
-void CNULLRenderer::ReadFrameBuffer([[maybe_unused]] unsigned char* pRGB, [[maybe_unused]] int nImageX, [[maybe_unused]] int nSizeX, [[maybe_unused]] int nSizeY, [[maybe_unused]] ERB_Type eRBType, [[maybe_unused]] bool bRGBA, [[maybe_unused]] int nScaledX, [[maybe_unused]] int nScaledY)
-{
-}
-
-void CNULLRenderer::ReadFrameBufferFast([[maybe_unused]] uint32* pDstARGBA8, [[maybe_unused]] int dstWidth, [[maybe_unused]] int dstHeight, [[maybe_unused]] bool BGRA)
-{
-}
-
-bool CNULLRenderer::CaptureFrameBufferFast([[maybe_unused]] unsigned char* pDstRGBA8, [[maybe_unused]] int destinationWidth, [[maybe_unused]] int destinationHeight)
-{
-    return false;
-}
-bool CNULLRenderer::CopyFrameBufferFast([[maybe_unused]] unsigned char* pDstRGBA8, [[maybe_unused]] int destinationWidth, [[maybe_unused]] int destinationHeight)
-{
-    return false;
-}
-
-bool CNULLRenderer::InitCaptureFrameBufferFast([[maybe_unused]] uint32 bufferWidth, [[maybe_unused]] uint32 bufferHeight)
-{
-    return(false);
-}
-
-void CNULLRenderer::CloseCaptureFrameBufferFast(void)
-{
-}
-
-bool CNULLRenderer::RegisterCaptureFrame([[maybe_unused]] ICaptureFrameListener* pCapture)
-{
-    return(false);
-}
-bool CNULLRenderer::UnRegisterCaptureFrame([[maybe_unused]] ICaptureFrameListener* pCapture)
-{
-    return(false);
-}
-
-void CNULLRenderer::CaptureFrameBufferCallBack(void)
-{
-}
-
-
-void CNULLRenderer::SetFogColor([[maybe_unused]] const ColorF& color)
-{
-}
-
-void CNULLRenderer::DrawQuad([[maybe_unused]] float dy, [[maybe_unused]] float dx, [[maybe_unused]] float dz, [[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z)
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-
-int CNULLRenderer::CreateRenderTarget([[maybe_unused]] const char* name, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] const ColorF& cClear, [[maybe_unused]] ETEX_Format eTF)
-{
-    return 0;
-}
-
-bool CNULLRenderer::DestroyRenderTarget([[maybe_unused]] int nHandle)
-{
-    return true;
-}
-
-bool CNULLRenderer::ResizeRenderTarget([[maybe_unused]] int nHandle, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight)
-{
-    return true;
-}
-
-bool CNULLRenderer::SetRenderTarget([[maybe_unused]] int nHandle, [[maybe_unused]] SDepthTexture* pDepthSurf)
-{
-    return true;
-}
-
-SDepthTexture* CNULLRenderer::CreateDepthSurface([[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] bool shaderResourceView)
-{
-    return nullptr;
-}
-
-void CNULLRenderer::DestroyDepthSurface([[maybe_unused]] SDepthTexture* pDepthSurf)
-{
-}
-
-void CNULLRenderer::WaitForParticleBuffer([[maybe_unused]] threadID nThreadId)
-{
-}
-
-int CNULLRenderer::GetOcclusionBuffer([[maybe_unused]] uint16* pOutOcclBuffer, [[maybe_unused]] Matrix44* pmCamBuffe)
-{
-    return 0;
-}
-
-IColorGradingController* CNULLRenderer::GetIColorGradingController()
-{
-    return m_pNULLColorGradingController;
-}
-
-IStereoRenderer* CNULLRenderer::GetIStereoRenderer()
-{
-    return m_pNULLStereoRenderer;
-}
-
-ITexture* CNULLRenderer::Create2DTexture([[maybe_unused]] const char* name, [[maybe_unused]] int width, [[maybe_unused]] int height, [[maybe_unused]] int numMips, [[maybe_unused]] int flags, [[maybe_unused]] unsigned char* data, [[maybe_unused]] ETEX_Format format)
-{
-    return nullptr;
-}
-
-//=========================================================================================
-
-
-ILog* iLog;
-IConsole* iConsole;
-ITimer* iTimer;
-ISystem* iSystem;
-
-StaticInstance<CNULLRenderer> g_nullRenderer;
-
-extern "C" DLL_EXPORT IRenderer * CreateCryRenderInterface(ISystem * pSystem)
-{
-    ModuleInitISystem(pSystem, "CryRenderer");
-
-    gbRgb = false;
-
-    iConsole    = gEnv->pConsole;
-    iLog            = gEnv->pLog;
-    iTimer      = gEnv->pTimer;
-    iSystem     = gEnv->pSystem;
-
-    CRenderer* rd = g_nullRenderer;
-    if (rd)
-    {
-        rd->InitRenderer();
-    }
-
-    std::random_device randDev;
-    srand(static_cast<int>(randDev()));
-
-    return rd;
-}
-
-class CEngineModule_CryRenderer
-    : public IEngineModule
-{
-    CRYINTERFACE_SIMPLE(IEngineModule)
-    CRYGENERATE_SINGLETONCLASS(CEngineModule_CryRenderer, "EngineModule_CryRenderer", 0x540c91a7338e41d3, 0xaceeac9d55614450)
-
-    virtual const char* GetName() const {
-        return "CryRenderer";
-    }
-    virtual const char* GetCategory() const {return "CryEngine"; }
-
-    virtual bool Initialize(SSystemGlobalEnvironment& env, [[maybe_unused]] const SSystemInitParams& initParams)
-    {
-        ISystem* pSystem = env.pSystem;
-        env.pRenderer = CreateCryRenderInterface(pSystem);
-        return env.pRenderer != 0;
-    }
-};
-
-CRYREGISTER_SINGLETON_CLASS(CEngineModule_CryRenderer)
-
-CEngineModule_CryRenderer::CEngineModule_CryRenderer()
-{
-};
-
-CEngineModule_CryRenderer::~CEngineModule_CryRenderer()
-{
-};
-
-void COcclusionQuery::Create()
-{
-}
-
-void COcclusionQuery::Release()
-{
-}
-
-void COcclusionQuery::BeginQuery()
-{
-}
-
-void COcclusionQuery::EndQuery()
-{
-}
-
-uint32 COcclusionQuery::GetVisibleSamples([[maybe_unused]] bool bAsynchronous)
-{
-    return 0;
-}
-
-/*static*/ FurBendData& FurBendData::Get()
-{
-    static FurBendData s_instance;
-    return s_instance;
-}
-
-void FurBendData::InsertNewElements()
-{
-}
-
-void FurBendData::FreeData()
-{
-}
-
-void FurBendData::OnBeginFrame()
-{
-}
-
-TArray<SRenderLight>* CRenderer::EF_GetDeferredLights([[maybe_unused]] const SRenderingPassInfo& passInfo, [[maybe_unused]] const eDeferredLightType eLightType)
-{
-    static TArray<SRenderLight> lights;
-    return &lights;
-}
-
-SRenderLight* CRenderer::EF_GetDeferredLightByID([[maybe_unused]] const uint16 nLightID, [[maybe_unused]] const eDeferredLightType eLightType)
-{
-    return nullptr;
-}
-
-
-void CRenderer::BeginSpawningGeneratingRendItemJobs([[maybe_unused]] int nThreadID)
-{
-}
-
-void CRenderer::BeginSpawningShadowGeneratingRendItemJobs([[maybe_unused]] int nThreadID)
-{
-}
-
-void CRenderer::EndSpawningGeneratingRendItemJobs()
-{
-}
-
-void CNULLRenderer::PrecacheResources()
-{
-}
-
-bool CNULLRenderer::EF_PrecacheResource([[maybe_unused]] SShaderItem* pSI, [[maybe_unused]] float fMipFactorSI, [[maybe_unused]] float fTimeToReady, [[maybe_unused]] int Flags, [[maybe_unused]] int nUpdateId, [[maybe_unused]] int nCounter)
-{
-    return true;
-}
-
-ITexture* CNULLRenderer::EF_CreateCompositeTexture([[maybe_unused]] int type, [[maybe_unused]] const char* szName, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] int nDepth, [[maybe_unused]] int nMips, [[maybe_unused]] int nFlags, [[maybe_unused]] ETEX_Format eTF, [[maybe_unused]] const STexComposition* pCompositions, [[maybe_unused]] size_t nCompositions, [[maybe_unused]] int8 nPriority)
-{
-    return CTextureManager::Instance()->GetNoTexture();
-}
-
-void CNULLRenderer::FX_ClearTarget([[maybe_unused]] ITexture* pTex)
-{
-}
-
-void CNULLRenderer::FX_ClearTarget([[maybe_unused]] SDepthTexture* pTex)
-{
-}
-
-bool CNULLRenderer::FX_SetRenderTarget([[maybe_unused]] int nTarget, [[maybe_unused]] void* pTargetSurf, [[maybe_unused]] SDepthTexture* pDepthTarget, [[maybe_unused]] uint32 nTileCount)
-{
-    return true;
-}
-
-bool CNULLRenderer::FX_PushRenderTarget([[maybe_unused]] int nTarget, [[maybe_unused]] void* pTargetSurf, [[maybe_unused]] SDepthTexture* pDepthTarget, [[maybe_unused]] uint32 nTileCount)
-{
-    return true;
-}
-
-bool CNULLRenderer::FX_SetRenderTarget([[maybe_unused]] int nTarget, [[maybe_unused]] CTexture* pTarget, [[maybe_unused]] SDepthTexture* pDepthTarget, [[maybe_unused]] bool bPush, [[maybe_unused]] int nCMSide, [[maybe_unused]] bool bScreenVP, [[maybe_unused]] uint32 nTileCount)
-{
-    return true;
-}
-
-bool CNULLRenderer::FX_PushRenderTarget([[maybe_unused]] int nTarget, [[maybe_unused]] CTexture* pTarget, [[maybe_unused]] SDepthTexture* pDepthTarget, [[maybe_unused]] int nCMSide, [[maybe_unused]] bool bScreenVP, [[maybe_unused]] uint32 nTileCount)
-{
-    return true;
-}
-bool CNULLRenderer::FX_RestoreRenderTarget([[maybe_unused]] int nTarget)
-{
-    return true;
-}
-bool CNULLRenderer::FX_PopRenderTarget([[maybe_unused]] int nTarget)
-{
-    return true;
-}
-
-void CNULLRenderer::FX_SetActiveRenderTargets([[maybe_unused]] bool bAllowDIP)
-{
-}
-
-IDynTexture* CNULLRenderer::CreateDynTexture2([[maybe_unused]] uint32 nWidth, [[maybe_unused]] uint32 nHeight, [[maybe_unused]] uint32 nTexFlags, [[maybe_unused]] const char* szSource, [[maybe_unused]] ETexPool eTexPool)
-{
-    return nullptr;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Renderer.h b/Code/CryEngine/RenderDll/XRenderNULL/NULL_Renderer.h
deleted file mode 100644
index dd7dd468cc..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Renderer.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-/*
-===========================================
-The NULLRenderer interface Class
-===========================================
-*/
-
-#define MAX_TEXTURE_STAGES 4
-
-#include "CryArray.h"
-#include "NULLRenderAuxGeom.h"
-
-//////////////////////////////////////////////////////////////////////
-class CNULLRenderer
-    : public CRenderer
-{
-public:
-
-    ////---------------------------------------------------------------------------------------------------------------------
-    virtual SRenderPipeline* GetRenderPipeline() override { return nullptr; }
-    virtual SRenderThread* GetRenderThread() override { return nullptr; }
-    virtual void FX_SetState(int st, int AlphaRef = -1, int RestoreState = 0) override;
-    void SetCull([[maybe_unused]] ECull eCull, [[maybe_unused]] bool bSkipMirrorCull = false) override {}
-    virtual SDepthTexture* GetDepthBufferOrig() override { return nullptr; }
-    virtual uint32 GetBackBufferWidth() override { return 0; }
-    virtual uint32 GetBackBufferHeight() override { return 0; };
-    virtual const SRenderTileInfo* GetRenderTileInfo() const override { return nullptr; }
-
-    virtual void FX_CommitStates([[maybe_unused]] const SShaderTechnique* pTech, [[maybe_unused]] const SShaderPass* pPass, [[maybe_unused]] bool bUseMaterialState) override {}
-    virtual void FX_Commit([[maybe_unused]] bool bAllowDIP = false) override {}
-    virtual long FX_SetVertexDeclaration([[maybe_unused]] int StreamMask, [[maybe_unused]] const AZ::Vertex::Format& vertexFormat) override { return 0; }
-    virtual void FX_DrawIndexedPrimitive([[maybe_unused]] const eRenderPrimitiveType eType, [[maybe_unused]] const int nVBOffset, [[maybe_unused]] const int nMinVertexIndex, [[maybe_unused]] const int nVerticesCount, [[maybe_unused]] const int nStartIndex, [[maybe_unused]] const int nNumIndices, [[maybe_unused]] bool bInstanced = false) override {}
-    virtual SDepthTexture* FX_GetDepthSurface([[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] bool bAA, [[maybe_unused]] bool shaderResourceView = false) override { return nullptr; }
-    virtual long FX_SetIStream([[maybe_unused]] const void* pB, [[maybe_unused]] uint32 nOffs, [[maybe_unused]] RenderIndexType idxType) override { return -1; }
-    virtual long FX_SetVStream([[maybe_unused]] int nID, [[maybe_unused]] const void* pB, [[maybe_unused]] uint32 nOffs, [[maybe_unused]] uint32 nStride, [[maybe_unused]] uint32 nFreq = 1) override { return -1; }
-    virtual void FX_DrawPrimitive([[maybe_unused]] eRenderPrimitiveType eType, [[maybe_unused]] int nStartVertex, [[maybe_unused]] int nVerticesCount, [[maybe_unused]] int nInstanceVertices = 0) {}
-    virtual void DrawQuad3D([[maybe_unused]] const Vec3& v0, [[maybe_unused]] const Vec3& v1, [[maybe_unused]] const Vec3& v2, [[maybe_unused]] const Vec3& v3, [[maybe_unused]] const ColorF& color, [[maybe_unused]] float ftx0, [[maybe_unused]] float fty0, [[maybe_unused]] float ftx1, [[maybe_unused]] float fty1) override {}
-    virtual void FX_ClearTarget(ITexture* pTex) override;
-    virtual void FX_ClearTarget(SDepthTexture* pTex) override;
-
-    virtual bool FX_SetRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) override;
-    virtual bool FX_PushRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) override;
-    virtual bool FX_SetRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, bool bPush = false, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) override;
-    virtual bool FX_PushRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) override;
-    virtual bool FX_RestoreRenderTarget(int nTarget) override;
-    virtual bool FX_PopRenderTarget(int nTarget) override;
-    void FX_SetActiveRenderTargets(bool bAllowDIP = false) override;
-    virtual void EF_Scissor([[maybe_unused]] bool bEnable, [[maybe_unused]] int sX, [[maybe_unused]] int sY, [[maybe_unused]] int sWdt, [[maybe_unused]] int sHgt) override {}
-    virtual void FX_ResetPipe() override {}
-
-    ////---------------------------------------------------------------------------------------------------------------------
-
-    CNULLRenderer();
-    virtual ~CNULLRenderer();
-
-    virtual WIN_HWND Init(int x, int y, int width, int height, unsigned int cbpp, int zbpp, int sbits, bool fullscreen, bool isEditor, WIN_HINSTANCE hinst, WIN_HWND Glhwnd = 0, bool bReInit = false, const SCustomRenderInitArgs* pCustomArgs = 0, bool bShaderCacheGen = false);
-    virtual WIN_HWND GetHWND();
-    virtual bool SetWindowIcon(const char* path);
-
-    /////////////////////////////////////////////////////////////////////////////////
-    // Render-context management
-    /////////////////////////////////////////////////////////////////////////////////
-    virtual bool SetCurrentContext(WIN_HWND hWnd);
-    virtual bool CreateContext(WIN_HWND hWnd, bool bAllowMSAA, int SSX, int SSY);
-    virtual bool DeleteContext(WIN_HWND hWnd);
-    virtual void MakeMainContextActive();
-
-    virtual int GetCurrentContextViewportWidth() const { return -1; }
-    virtual int GetCurrentContextViewportHeight() const { return -1; }
-    /////////////////////////////////////////////////////////////////////////////////
-
-    virtual int  CreateRenderTarget(const char* name, int nWidth, int nHeight, const ColorF& cClear, ETEX_Format eTF = eTF_R8G8B8A8);
-    virtual bool DestroyRenderTarget(int nHandle);
-    virtual bool ResizeRenderTarget(int nHandle, int nWidth, int nHeight);
-    virtual bool SetRenderTarget(int nHandle, SDepthTexture* pDepthSurf = nullptr);
-    virtual SDepthTexture* CreateDepthSurface(int nWidth, int nHeight, bool shaderResourceView = false);
-    virtual void DestroyDepthSurface(SDepthTexture* pDepthSurf);
-
-    virtual int GetOcclusionBuffer(uint16* pOutOcclBuffer, Matrix44* pmCamBuffe);
-    virtual void WaitForParticleBuffer(threadID nThreadId);
-
-    virtual void GetVideoMemoryUsageStats([[maybe_unused]] size_t& vidMemUsedThisFrame, [[maybe_unused]] size_t& vidMemUsedRecently, [[maybe_unused]] bool bGetPoolsSizes = false) {}
-
-    virtual   void SetRenderTile([[maybe_unused]] f32 nTilesPosX, [[maybe_unused]] f32 nTilesPosY, [[maybe_unused]] f32 nTilesGridSizeX, [[maybe_unused]] f32 nTilesGridSizeY) {}
-
-    virtual void EF_InvokeShadowMapRenderJobs([[maybe_unused]] int nFlags){}
-    //! Fills array of all supported video formats (except low resolution formats)
-    //! Returns number of formats, also when called with NULL
-    virtual int   EnumDisplayFormats(SDispFormat* Formats);
-
-    //! Return all supported by video card video AA formats
-    virtual int   EnumAAFormats([[maybe_unused]] SAAFormat* Formats) { return 0; }
-
-    //! Changes resolution of the window/device (doen't require to reload the level
-    virtual bool  ChangeResolution(int nNewWidth, int nNewHeight, int nNewColDepth, int nNewRefreshHZ, bool bFullScreen, bool bForce);
-
-    virtual Vec2 SetViewportDownscale([[maybe_unused]] float xscale, [[maybe_unused]] float yscale) { return Vec2(0, 0); }
-    virtual void SetCurDownscaleFactor([[maybe_unused]] Vec2 sf) {};
-
-    virtual EScreenAspectRatio GetScreenAspect([[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight) { return eAspect_4_3; }
-
-    virtual void SwitchToNativeResolutionBackbuffer() {}
-
-    virtual void  ShutDown(bool bReInit = false);
-    virtual void  ShutDownFast();
-
-    virtual void  BeginFrame();
-    virtual void  RenderDebug(bool bRernderStats = true);
-    virtual void    EndFrame();
-    virtual void    LimitFramerate([[maybe_unused]] const int maxFPS, [[maybe_unused]] const bool bUseSleep) {}
-
-    virtual void    TryFlush();
-
-    virtual void  Reset (void) {};
-    virtual void    RT_ReleaseCB(void*){}
-
-    virtual void DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, int nVerts, int nInds, PublicRenderPrimitiveType nPrimType);
-    virtual void DrawDynUiPrimitiveList(DynUiPrimitiveList& primitives, int totalNumVertices, int totalNumIndices);
-
-    virtual void  DrawBuffer(CVertexBuffer* pVBuf, CIndexBuffer* pIBuf, int nNumIndices, int nOffsIndex, const PublicRenderPrimitiveType nPrmode, int nVertStart = 0, int nVertStop = 0);
-
-    virtual   void    CheckError(const char* comment);
-
-    virtual void DrawLine([[maybe_unused]] const Vec3& vPos1, [[maybe_unused]] const Vec3& vPos2) {};
-    virtual void Graph([[maybe_unused]] byte* g, [[maybe_unused]] int x, [[maybe_unused]] int y, [[maybe_unused]] int wdt, [[maybe_unused]] int hgt, [[maybe_unused]] int nC, [[maybe_unused]] int type, [[maybe_unused]] const char* text, [[maybe_unused]] ColorF& color, [[maybe_unused]] float fScale) {};
-
-    virtual   void    SetCamera(const CCamera& cam);
-    virtual   void    SetViewport(int x, int y, int width, int height, int id = 0);
-    virtual   void    SetScissor(int x = 0, int y = 0, int width = 0, int height = 0);
-    virtual void  GetViewport(int* x, int* y, int* width, int* height) const;
-
-    virtual void  SetCullMode (int mode = R_CULL_BACK);
-    virtual bool  EnableFog   (bool enable);
-    virtual void  SetFogColor(const ColorF& color);
-    virtual   void    EnableVSync(bool enable);
-
-    virtual void  DrawPrimitivesInternal(CVertexBuffer* src, int vert_num, const eRenderPrimitiveType prim_type);
-
-    virtual void  PushMatrix();
-    virtual void  RotateMatrix(float a, float x, float y, float z);
-    virtual void  RotateMatrix(const Vec3& angels);
-    virtual void  TranslateMatrix(float x, float y, float z);
-    virtual void  ScaleMatrix(float x, float y, float z);
-    virtual void  TranslateMatrix(const Vec3& pos);
-    virtual void  MultMatrix(const float* mat);
-    virtual   void    LoadMatrix(const Matrix34* src = 0);
-    virtual void  PopMatrix();
-
-    virtual   void    EnableTMU(bool enable);
-    virtual void  SelectTMU(int tnum);
-
-    virtual bool ChangeDisplay(unsigned int width, unsigned int height, unsigned int cbpp);
-    virtual void ChangeViewport(unsigned int x, unsigned int y, unsigned int width, unsigned int height, bool bMainViewport = false, float scaleWidth = 1.0f, float scaleHeight = 1.0f);
-
-    virtual   bool SaveTga([[maybe_unused]] unsigned char* sourcedata, [[maybe_unused]] int sourceformat, [[maybe_unused]] int w, [[maybe_unused]] int h, [[maybe_unused]] const char* filename, [[maybe_unused]] bool flip) const { return false; }
-
-    //download an image to video memory. 0 in case of failure
-    virtual void CreateResourceAsync([[maybe_unused]] SResourceAsync* Resource) {};
-    virtual void ReleaseResourceAsync([[maybe_unused]] SResourceAsync* Resource) {};
-    void ReleaseResourceAsync(AZStd::unique_ptr<SResourceAsync> Resource) override {};
-    virtual   unsigned int DownLoadToVideoMemory([[maybe_unused]] const byte* data, [[maybe_unused]] int w, [[maybe_unused]] int h, [[maybe_unused]] ETEX_Format eTFSrc, [[maybe_unused]] ETEX_Format eTFDst, [[maybe_unused]] int nummipmap, [[maybe_unused]] bool repeat = true, [[maybe_unused]] int filter = FILTER_BILINEAR, [[maybe_unused]] int Id = 0, [[maybe_unused]] const char* szCacheName = NULL, [[maybe_unused]] int flags = 0, [[maybe_unused]] EEndian eEndian = eLittleEndian, [[maybe_unused]] RectI* pRegion = NULL, [[maybe_unused]] bool bAsynDevTexCreation = false) { return 0; }
-    virtual unsigned int DownLoadToVideoMemoryCube([[maybe_unused]] const byte* data, [[maybe_unused]] int w, [[maybe_unused]] int h, [[maybe_unused]] ETEX_Format eTFSrc, [[maybe_unused]] ETEX_Format eTFDst, [[maybe_unused]] int nummipmap, [[maybe_unused]] bool repeat = true, [[maybe_unused]] int filter = FILTER_BILINEAR, [[maybe_unused]] int Id = 0, [[maybe_unused]] const char* szCacheName = NULL, [[maybe_unused]] int flags = 0, [[maybe_unused]] EEndian eEndian = eLittleEndian, [[maybe_unused]] RectI* pRegion = NULL, [[maybe_unused]] bool bAsynDevTexCreation = false) { return 0; }
-    virtual unsigned int DownLoadToVideoMemory3D([[maybe_unused]] const byte* data, [[maybe_unused]] int w, [[maybe_unused]] int h, [[maybe_unused]] int d, [[maybe_unused]] ETEX_Format eTFSrc, [[maybe_unused]] ETEX_Format eTFDst, [[maybe_unused]] int nummipmap, [[maybe_unused]] bool repeat = true, [[maybe_unused]] int filter = FILTER_BILINEAR, [[maybe_unused]] int Id = 0, [[maybe_unused]] const char* szCacheName = NULL, [[maybe_unused]] int flags = 0, [[maybe_unused]] EEndian eEndian = eLittleEndian, [[maybe_unused]] RectI* pRegion = NULL, [[maybe_unused]] bool bAsynDevTexCreation = false) { return 0; }
-    virtual void UpdateTextureInVideoMemory([[maybe_unused]] uint32 tnum, [[maybe_unused]] const byte* newdata, [[maybe_unused]] int posx, [[maybe_unused]] int posy, [[maybe_unused]] int w, [[maybe_unused]] int h, [[maybe_unused]] ETEX_Format eTFSrc = eTF_R8G8B8A8, [[maybe_unused]] int posz = 0, [[maybe_unused]] int sizez = 1){}
-
-    virtual   bool SetGammaDelta(float fGamma);
-    virtual void RestoreGamma(void) {};
-
-    virtual   void RemoveTexture([[maybe_unused]] unsigned int TextureId) {}
-    virtual   void DeleteFont([[maybe_unused]] IFFont* font) {}
-
-    virtual void Draw2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1);
-    virtual void Push2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1, float stereoDepth = 0);
-    virtual void Draw2dImageList();
-    virtual void  Draw2dImageStretchMode([[maybe_unused]] bool stretch) {};
-    virtual void DrawImage(float xpos, float ypos, float w, float h, int texture_id, float s0, float t0, float s1, float t1, float r, float g, float b, float a, bool filtered = true);
-    virtual void DrawImageWithUV(float xpos, float ypos, float z, float w, float h, int texture_id, float s[4], float t[4], float r, float g, float b, float a, bool filtered = true);
-
-    virtual void PushWireframeMode(int mode);
-    virtual void PopWireframeMode();
-    virtual void FX_PushWireframeMode(int mode);
-    virtual void FX_PopWireframeMode();
-    virtual void FX_SetWireframeMode(int mode);
-
-    virtual void FX_PreRender([[maybe_unused]] int Stage) override {}
-    virtual void FX_PostRender() override {}
-
-    virtual void ResetToDefault();
-    virtual void SetDefaultRenderStates() {}
-
-    virtual int  GenerateAlphaGlowTexture(float k);
-
-    virtual void ApplyViewParameters(const CameraViewParameters&) override {}
-    virtual void SetMaterialColor(float r, float g, float b, float a);
-
-    virtual void GetMemoryUsage(ICrySizer* Sizer);
-
-    // Project/UnProject.  Returns true if successful.
-    virtual bool ProjectToScreen(float ptx, float pty, float ptz,
-        float* sx, float* sy, float* sz);
-    virtual int UnProject(float sx, float sy, float sz,
-        float* px, float* py, float* pz,
-        const float modelMatrix[16],
-        const float projMatrix[16],
-        const int    viewport[4]);
-    virtual int UnProjectFromScreen(float  sx, float  sy, float  sz,
-        float* px, float* py, float* pz);
-
-    // Shadow Mapping
-    virtual bool PrepareDepthMap(ShadowMapFrustum* SMSource, int nFrustumLOD = 0, bool bClearPool = false);
-    virtual void DrawAllShadowsOnTheScreen();
-    virtual void OnEntityDeleted([[maybe_unused]] IRenderNode* pRenderNode) {};
-
-    virtual void FX_SetClipPlane (bool bEnable, float* pPlane, bool bRefract);
-
-    virtual void SetColorOp([[maybe_unused]] byte eCo, [[maybe_unused]] byte eAo, [[maybe_unused]] byte eCa, [[maybe_unused]] byte eAa) {};
-    virtual void EF_SetColorOp([[maybe_unused]] byte eCo, [[maybe_unused]] byte eAo, [[maybe_unused]] byte eCa, [[maybe_unused]] byte eAa) {};
-
-    virtual void SetSrgbWrite([[maybe_unused]] bool srgbWrite) {};
-    virtual void EF_SetSrgbWrite([[maybe_unused]] bool sRGBWrite) {};
-
-    //for editor
-    virtual void  GetModelViewMatrix(float* mat);
-    virtual void  GetProjectionMatrix(float* mat);
-
-    //for texture
-    virtual ITexture* EF_LoadTexture(const char* nameTex, uint32 flags = 0);
-    virtual ITexture* EF_LoadDefaultTexture(const char* nameTex);
-
-    virtual void DrawQuad(const Vec3& right, const Vec3& up, const Vec3& origin, int nFlipMode = 0);
-    virtual void DrawQuad(float dy, float dx, float dz, float x, float y, float z);
-    void DrawQuad([[maybe_unused]] float x0, [[maybe_unused]] float y0, [[maybe_unused]] float x1, [[maybe_unused]] float y1, [[maybe_unused]] const ColorF& color, [[maybe_unused]] float z = 1.0f, [[maybe_unused]] float s0 = 0.0f, [[maybe_unused]] float t0 = 0.0f, [[maybe_unused]] float s1 = 1.0f, [[maybe_unused]] float t1 = 1.0f) override {}
-
-    // NOTE: deprecated
-    virtual void ClearTargetsImmediately(uint32 nFlags);
-    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth);
-    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors);
-    virtual void ClearTargetsImmediately(uint32 nFlags, float fDepth);
-
-    virtual void ClearTargetsLater(uint32 nFlags);
-    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth);
-    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors);
-    virtual void ClearTargetsLater(uint32 nFlags, float fDepth);
-
-    virtual void ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX = -1, int nScaledY = -1);
-    virtual void ReadFrameBufferFast(uint32* pDstARGBA8, int dstWidth, int dstHeight, bool BGRA = true);
-
-    virtual bool CaptureFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight);
-    virtual bool CopyFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight);
-    virtual bool RegisterCaptureFrame(ICaptureFrameListener* pCapture);
-    virtual bool UnRegisterCaptureFrame(ICaptureFrameListener* pCapture);
-    virtual bool InitCaptureFrameBufferFast(uint32 bufferWidth, uint32 bufferHeight);
-    virtual void CloseCaptureFrameBufferFast(void);
-    virtual void CaptureFrameBufferCallBack(void);
-
-
-    virtual void ReleaseHWShaders() {}
-    virtual void PrintResourcesLeaks() {}
-
-    //misc
-    virtual bool ScreenShot(const char* filename = NULL, int width = 0);
-
-    virtual void Set2DMode([[maybe_unused]] uint32 orthoX, [[maybe_unused]] uint32 orthoY, [[maybe_unused]] TransformationMatrices& backupMatrices, [[maybe_unused]] float znear = -1e10f, [[maybe_unused]] float zfar = 1e10f) {}
-    virtual void Unset2DMode([[maybe_unused]] const TransformationMatrices& restoringMatrices) {}
-    virtual void Set2DModeNonZeroTopLeft([[maybe_unused]] float orthoLeft, [[maybe_unused]] float orthoTop, [[maybe_unused]] float orthoWidth, [[maybe_unused]] float orthoHeight, [[maybe_unused]] TransformationMatrices& backupMatrices, [[maybe_unused]] float znear = -1e10f, [[maybe_unused]] float zfar = 1e10f) {}
-
-    virtual int ScreenToTexture(int nTexID);
-
-    virtual void DrawPoints([[maybe_unused]] Vec3 v[], [[maybe_unused]] int nump, [[maybe_unused]] ColorF& col, [[maybe_unused]] int flags) {};
-    virtual void DrawLines([[maybe_unused]] Vec3 v[], [[maybe_unused]] int nump, [[maybe_unused]] ColorF& col, [[maybe_unused]] int flags, [[maybe_unused]] float fGround) {};
-
-    virtual void    RefreshSystemShaders() {}
-
-    // Shaders/Shaders support
-    // RE - RenderElement
-
-    virtual void EF_Release(int nFlags);
-    virtual void FX_PipelineShutdown(bool bFastShutdown = false);
-
-    //==========================================================
-    // external interface for shaders
-    //==========================================================
-
-    virtual bool EF_SetLightHole(Vec3 vPos, Vec3 vNormal, int idTex, float fScale = 1.0f, bool bAdditive = true);
-
-    // Draw all shaded REs in the list
-    virtual void EF_EndEf3D (int nFlags, int nPrecacheUpdateId, int nNearPrecacheUpdateId, const SRenderingPassInfo& passInfo);
-
-    // 2d interface for shaders
-    virtual void EF_EndEf2D(bool bSort);
-    virtual bool EF_PrecacheResource(SShaderItem* pSI, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter);
-    virtual bool EF_PrecacheResource(ITexture* pTP, float fDist, float fTimeToReady, int Flags, int nUpdateId, int nCounter);
-    virtual void PrecacheResources();
-    virtual void PostLevelLoading() {}
-    virtual void PostLevelUnload() {}
-
-    virtual ITexture* EF_CreateCompositeTexture(int type, const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, ETEX_Format eTF, const STexComposition* pCompositions, size_t nCompositions, int8 nPriority = -1);
-
-    void EF_Init();
-
-    virtual IDynTexture* MakeDynTextureFromShadowBuffer(int nSize, IDynTexture* pDynTexture);
-    virtual void MakeSprite(IDynTexture*& rTexturePtr, float _fSpriteDistance, int nTexSize, float angle, float angle2, IStatObj* pStatObj, const float fBrightnessMultiplier, SRendParams& rParms);
-    virtual uint32 RenderOccludersIntoBuffer([[maybe_unused]] const CCamera& viewCam, [[maybe_unused]] int nTexSize, [[maybe_unused]] PodArray<IRenderNode*>& lstOccluders, [[maybe_unused]] float* pBuffer) { return 0; }
-
-    virtual IRenderAuxGeom* GetIRenderAuxGeom([[maybe_unused]] void* jobID = 0)
-    {
-        return m_pNULLRenderAuxGeom;
-    }
-
-    virtual IColorGradingController* GetIColorGradingController();
-    virtual IStereoRenderer* GetIStereoRenderer();
-
-    virtual ITexture* Create2DTexture(const char* name, int width, int height, int numMips, int flags, unsigned char* data, ETEX_Format format);
-
-    //////////////////////////////////////////////////////////////////////
-    // Replacement functions for the Font engine ( vlad: for font can be used old functions )
-    virtual bool FontUploadTexture(class CFBitmap*, ETEX_Format eTF = eTF_R8G8B8A8);
-    virtual   int  FontCreateTexture(int Width, int Height, byte* pData, ETEX_Format eTF = eTF_R8G8B8A8, bool genMips = FontCreateTextureGenMipsDefaultValue, const char* textureName = nullptr);
-    virtual   bool FontUpdateTexture(int nTexId, int X, int Y, int USize, int VSize, byte* pData);
-    virtual void FontReleaseTexture(class CFBitmap* pBmp);
-    virtual void FontSetTexture(class CFBitmap*, int nFilterMode);
-    virtual void FontSetTexture(int nTexId, int nFilterMode);
-    virtual void FontSetRenderingState([[maybe_unused]] bool overrideViewProjMatrices, [[maybe_unused]] TransformationMatrices& backupMatrices) {}
-    virtual void FontSetBlending([[maybe_unused]] int src, [[maybe_unused]] int dst, [[maybe_unused]] int baseState) {}
-    virtual void FontRestoreRenderingState([[maybe_unused]] bool overrideViewProjMatrices, [[maybe_unused]] const TransformationMatrices& restoringMatrices) {}
-
-    virtual void GetLogVBuffers(void) {}
-
-    virtual void RT_PresentFast() {}
-
-    virtual void RT_ForceSwapBuffers() {}
-    virtual void RT_SwitchToNativeResolutionBackbuffer([[maybe_unused]] bool resolveBackBuffer) {}
-
-    virtual void RT_BeginFrame() {}
-    virtual void RT_EndFrame() {}
-    virtual void RT_Init() {}
-    virtual void RT_ShutDown([[maybe_unused]] uint32 nFlags) {}
-    virtual bool RT_CreateDevice() { return true; }
-    virtual void RT_Reset() {}
-    virtual void RT_SetCull([[maybe_unused]] int nMode) {}
-    virtual void RT_SetScissor([[maybe_unused]] bool bEnable, [[maybe_unused]] int x, [[maybe_unused]] int y, [[maybe_unused]] int width, [[maybe_unused]] int height){}
-    virtual void RT_RenderScene([[maybe_unused]] int nFlags, [[maybe_unused]] SThreadInfo& TI, [[maybe_unused]] RenderFunc pRenderFunc) {}
-    virtual void RT_PrepareStereo([[maybe_unused]] int mode, [[maybe_unused]] int output) {}
-    virtual void RT_CopyToStereoTex([[maybe_unused]] int channel) {}
-    virtual void RT_UpdateTrackingStates() {}
-    virtual void RT_DisplayStereo() {}
-    virtual void RT_SetCameraInfo() {}
-    virtual void RT_SetStereoCamera() {}
-    virtual void RT_ReadFrameBuffer([[maybe_unused]] unsigned char* pRGB, [[maybe_unused]] int nImageX, [[maybe_unused]] int nSizeX, [[maybe_unused]] int nSizeY, [[maybe_unused]] ERB_Type eRBType, [[maybe_unused]] bool bRGBA, [[maybe_unused]] int nScaledX, [[maybe_unused]] int nScaledY) {}
-    virtual void RT_RenderScene([[maybe_unused]] int nFlags, [[maybe_unused]] SThreadInfo& TI, [[maybe_unused]] int nR, [[maybe_unused]] RenderFunc pRenderFunc) {};
-    virtual void RT_CreateResource([[maybe_unused]] SResourceAsync* Res) {};
-    virtual void RT_ReleaseResource([[maybe_unused]] SResourceAsync* Res) {};
-    virtual void RT_ReleaseRenderResources() {};
-    virtual void RT_UnbindResources() {};
-    virtual void RT_UnbindTMUs() {};
-    virtual void RT_PrecacheDefaultShaders() {};
-    virtual void RT_CreateRenderResources() {};
-    virtual void RT_ClearTarget([[maybe_unused]] ITexture* pTex, [[maybe_unused]] const ColorF& color) {};
-    virtual void RT_RenderDebug([[maybe_unused]] bool bRenderStats = true) {};
-
-    virtual HRESULT RT_CreateVertexBuffer([[maybe_unused]] UINT Length, [[maybe_unused]] DWORD Usage, [[maybe_unused]] DWORD FVF, [[maybe_unused]] UINT Pool, [[maybe_unused]] void** ppVertexBuffer, [[maybe_unused]] HANDLE* pSharedHandle) { return S_OK; }
-    virtual HRESULT RT_CreateIndexBuffer([[maybe_unused]] UINT Length, [[maybe_unused]] DWORD Usage, [[maybe_unused]] DWORD Format, [[maybe_unused]] UINT Pool, [[maybe_unused]] void** ppVertexBuffer, [[maybe_unused]] HANDLE* pSharedHandle) { return S_OK; };
-    virtual HRESULT RT_CreateVertexShader([[maybe_unused]] DWORD* pBuf, [[maybe_unused]] void** pShader, [[maybe_unused]] void* pInst) { return S_OK; };
-    virtual HRESULT RT_CreatePixelShader([[maybe_unused]] DWORD* pBuf, [[maybe_unused]] void** pShader) { return S_OK; };
-    virtual void RT_ReleaseVBStream([[maybe_unused]] void* pVB, [[maybe_unused]] int nStream) {};
-    virtual void RT_DrawDynVB([[maybe_unused]] int Pool, [[maybe_unused]] uint32 nVerts) {}
-    virtual void RT_DrawDynVB([[maybe_unused]] SVF_P3F_C4B_T2F* pBuf, [[maybe_unused]] uint16* pInds, [[maybe_unused]] uint32 nVerts, [[maybe_unused]] uint32 nInds, [[maybe_unused]] const PublicRenderPrimitiveType nPrimType) {}
-    virtual void RT_DrawDynVBUI([[maybe_unused]] SVF_P2F_C4B_T2F_F4B* pBuf, [[maybe_unused]] uint16* pInds, [[maybe_unused]] uint32 nVerts, [[maybe_unused]] uint32 nInds, [[maybe_unused]] const PublicRenderPrimitiveType nPrimType) {}
-    virtual void RT_DrawStringU([[maybe_unused]] IFFont_RenderProxy* pFont, [[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] float z, [[maybe_unused]] const char* pStr, [[maybe_unused]] bool asciiMultiLine, [[maybe_unused]] const STextDrawContext& ctx) const {}
-    virtual void RT_DrawLines([[maybe_unused]] Vec3 v[], [[maybe_unused]] int nump, [[maybe_unused]] ColorF& col, [[maybe_unused]] int flags, [[maybe_unused]] float fGround) {}
-    virtual void RT_Draw2dImage([[maybe_unused]] float xpos, [[maybe_unused]] float ypos, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] CTexture* pTexture, [[maybe_unused]] float s0, [[maybe_unused]] float t0, [[maybe_unused]] float s1, [[maybe_unused]] float t1, [[maybe_unused]] float angle, [[maybe_unused]] DWORD col, [[maybe_unused]] float z) {}
-    virtual void RT_Push2dImage([[maybe_unused]] float xpos, [[maybe_unused]] float ypos, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] CTexture* pTexture, [[maybe_unused]] float s0, [[maybe_unused]] float t0, [[maybe_unused]] float s1, [[maybe_unused]] float t1, [[maybe_unused]] float angle, [[maybe_unused]] DWORD col, [[maybe_unused]] float z, [[maybe_unused]] float stereoDepth) {}
-    virtual void RT_Draw2dImageList() {}
-    virtual void RT_Draw2dImageStretchMode([[maybe_unused]] bool bStretch) {}
-    virtual void RT_DrawImageWithUV([[maybe_unused]] float xpos, [[maybe_unused]] float ypos, [[maybe_unused]] float z, [[maybe_unused]] float w, [[maybe_unused]] float h, [[maybe_unused]] int texture_id, [[maybe_unused]] float* s, [[maybe_unused]] float* t, [[maybe_unused]] DWORD col, [[maybe_unused]] bool filtered = true) {}
-    virtual void EF_ClearTargetsImmediately([[maybe_unused]] uint32 nFlags) {}
-    virtual void EF_ClearTargetsImmediately([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors, [[maybe_unused]] float fDepth, [[maybe_unused]] uint8 nStencil) {}
-    virtual void EF_ClearTargetsImmediately([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors) {}
-    virtual void EF_ClearTargetsImmediately([[maybe_unused]] uint32 nFlags, [[maybe_unused]] float fDepth, [[maybe_unused]] uint8 nStencil) {}
-
-    virtual void EF_ClearTargetsLater([[maybe_unused]] uint32 nFlags) {}
-    virtual void EF_ClearTargetsLater([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors, [[maybe_unused]] float fDepth, [[maybe_unused]] uint8 nStencil) {}
-    virtual void EF_ClearTargetsLater([[maybe_unused]] uint32 nFlags, [[maybe_unused]] const ColorF& Colors) {}
-    virtual void EF_ClearTargetsLater([[maybe_unused]] uint32 nFlags, [[maybe_unused]] float fDepth, [[maybe_unused]] uint8 nStencil) {}
-
-    virtual void RT_PushRenderTarget([[maybe_unused]] int nTarget, [[maybe_unused]] CTexture* pTex, [[maybe_unused]] SDepthTexture* pDS, [[maybe_unused]] int nS)  {};
-    virtual void RT_PopRenderTarget([[maybe_unused]] int nTarget) {};
-    virtual void RT_SetViewport([[maybe_unused]] int x, [[maybe_unused]] int y, [[maybe_unused]] int width, [[maybe_unused]] int height, [[maybe_unused]] int id) {};
-
-    virtual void RT_SetRendererCVar([[maybe_unused]] ICVar* pCVar, [[maybe_unused]] const char* pArgText, [[maybe_unused]] const bool bSilentMode = false) {};
-    virtual void SetRendererCVar([[maybe_unused]] ICVar* pCVar, [[maybe_unused]] const char* pArgText, [[maybe_unused]] bool bSilentMode = false) {};
-
-    virtual void SetMatrices([[maybe_unused]] float* pProjMat, [[maybe_unused]] float* pViewMat) {}
-
-    virtual void PushProfileMarker([[maybe_unused]] const char* label) {}
-    virtual void PopProfileMarker([[maybe_unused]] const char* label) {}
-
-    virtual void RT_InsertGpuCallback([[maybe_unused]] uint32 context, [[maybe_unused]] GpuCallbackFunc callback) {}
-    virtual void EnablePipelineProfiler([[maybe_unused]] bool bEnable) {}
-
-    virtual IOpticsElementBase* CreateOptics([[maybe_unused]] EFlareType type) const { return NULL;        }
-
-    virtual bool BakeMesh([[maybe_unused]] const SMeshBakingInputParams* pInputParams, [[maybe_unused]] SMeshBakingOutput* pReturnValues) { return false; }
-    virtual PerInstanceConstantBufferPool* GetPerInstanceConstantBufferPoolPointer() override { return nullptr; }
-
-    IDynTexture* CreateDynTexture2(uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool) override;
-
-#ifdef SUPPORT_HW_MOUSE_CURSOR
-    virtual IHWMouseCursor* GetIHWMouseCursor() { return NULL; }
-#endif
-
-    virtual void StartLoadtimePlayback([[maybe_unused]] ILoadtimeCallback* pCallback) {}
-    virtual void StopLoadtimePlayback() {}
-
-    void BeginProfilerSection([[maybe_unused]] const char* name, [[maybe_unused]] uint32 eProfileLabelFlags = 0) override {}
-    void EndProfilerSection([[maybe_unused]] const char* name) override {}
-    void AddProfilerLabel([[maybe_unused]] const char* name) override {}
-
-    void RT_DrawVideoRenderer([[maybe_unused]] AZ::VideoRenderer::IVideoRenderer* pVideoRenderer, [[maybe_unused]] const AZ::VideoRenderer::DrawArguments& drawArguments) override {}
-
-private:
-    CNULLRenderAuxGeom* m_pNULLRenderAuxGeom;
-    IColorGradingController* m_pNULLColorGradingController;
-    IStereoRenderer* m_pNULLStereoRenderer;
-};
-
-//=============================================================================
-
-extern CNULLRenderer* gcpNULL;
-
-
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Shaders.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_Shaders.cpp
deleted file mode 100644
index fe7ee05ee6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Shaders.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "I3DEngine.h"
-
-//============================================================================
-
-bool CShader::FXSetTechnique([[maybe_unused]] const CCryNameTSCRC& szName)
-{
-    return true;
-}
-
-bool CShader::FXSetPSFloat([[maybe_unused]] const CCryNameR& NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-
-bool CShader::FXSetPSFloat([[maybe_unused]] const char* NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-
-bool CShader::FXSetVSFloat([[maybe_unused]] const CCryNameR& NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-
-bool CShader::FXSetVSFloat([[maybe_unused]] const char* NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-
-bool CShader::FXSetGSFloat([[maybe_unused]] const CCryNameR& NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-
-bool CShader::FXSetGSFloat([[maybe_unused]] const char* NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-
-bool CShader::FXSetCSFloat([[maybe_unused]] const CCryNameR& NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-
-bool CShader::FXSetCSFloat([[maybe_unused]] const char* NameParam, [[maybe_unused]] const Vec4* fParams, [[maybe_unused]] int nParams)
-{
-    return true;
-}
-bool CShader::FXBegin([[maybe_unused]] uint32* uiPassCount, [[maybe_unused]] uint32 nFlags)
-{
-    return true;
-}
-
-bool CShader::FXBeginPass([[maybe_unused]] uint32 uiPass)
-{
-    return true;
-}
-
-bool CShader::FXEndPass()
-{
-    return true;
-}
-
-bool CShader::FXEnd()
-{
-    return true;
-}
-
-bool CShader::FXCommit([[maybe_unused]] const uint32 nFlags)
-{
-    return true;
-}
-
-//===================================================================================
-
-FXShaderCache CHWShader::m_ShaderCache;
-FXShaderCacheNames CHWShader::m_ShaderCacheList;
-
-void CRenderer::RefreshSystemShaders()
-{
-}
-
-SShaderCache::~SShaderCache()
-{
-    CHWShader::m_ShaderCache.erase(m_Name);
-    SAFE_DELETE(m_pRes[CACHE_USER]);
-    SAFE_DELETE(m_pRes[CACHE_READONLY]);
-}
-
-SShaderCache* CHWShader::mfInitCache([[maybe_unused]] const char* name, [[maybe_unused]] CHWShader* pSH, [[maybe_unused]] bool bCheckValid, [[maybe_unused]] uint32 CRC32, [[maybe_unused]] bool bReadOnly, [[maybe_unused]] bool bAsync)
-{
-    return NULL;
-}
-
-#if !defined(CONSOLE)
-bool CHWShader::mfOptimiseCacheFile([[maybe_unused]] SShaderCache* pCache, [[maybe_unused]] bool bForce, [[maybe_unused]] SOptimiseStats* Stats)
-{
-    return true;
-}
-#endif
-
-bool CHWShader::PreactivateShaders()
-{
-    bool bRes = true;
-    return bRes;
-}
-void CHWShader::RT_PreactivateShaders()
-{
-}
-
-const char* CHWShader::GetCurrentShaderCombinations([[maybe_unused]] bool bLevel)
-{
-    return "";
-}
-
-void CHWShader::mfFlushPendedShadersWait([[maybe_unused]] int nMaxAllowed)
-{
-}
-
-void CShaderResources::Rebuild([[maybe_unused]] IShader* pSH, [[maybe_unused]] AzRHI::ConstantBufferUsage usage)
-{
-}
-
-void CShaderResources::CloneConstants([[maybe_unused]] const IRenderShaderResources* pSrc)
-{
-}
-
-void CShaderResources::ReleaseConstants()
-{
-}
-
-void CShaderResources::UpdateConstants([[maybe_unused]] IShader* pSH)
-{
-}
-
-void CShader::mfFlushPendedShaders()
-{
-}
-
-void SShaderCache::Cleanup(void)
-{
-}
-
-void CShaderResources::AdjustForSpec()
-{
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Shadows.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_Shadows.cpp
deleted file mode 100644
index 270c35534a..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Shadows.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the shadow maps using NULL device specific implementation
-//               shadow map calculations
-
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "../Common/Shadow_Renderer.h"
-
-#include "I3DEngine.h"
-
-IDynTexture* CNULLRenderer::MakeDynTextureFromShadowBuffer([[maybe_unused]] int nSize, [[maybe_unused]] IDynTexture* pDynTexture)
-{
-    return NULL;
-}
-
-bool CNULLRenderer::PrepareDepthMap([[maybe_unused]] ShadowMapFrustum* SMSource, [[maybe_unused]] int nFrustumLOD, [[maybe_unused]] bool bClearPool)
-{
-    return true;
-}
-
-void CNULLRenderer::DrawAllShadowsOnTheScreen()
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_System.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_System.cpp
deleted file mode 100644
index 0c9d43941f..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_System.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : NULL device specific implementation and extensions handling.
-
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-
-
-bool CNULLRenderer::SetGammaDelta(const float fGamma)
-{
-    m_fDeltaGamma = fGamma;
-    return true;
-}
-
-int CNULLRenderer::EnumDisplayFormats([[maybe_unused]] SDispFormat* Formats)
-{
-    return 0;
-}
-
-bool CNULLRenderer::ChangeResolution([[maybe_unused]] int nNewWidth, [[maybe_unused]] int nNewHeight, [[maybe_unused]] int nNewColDepth, [[maybe_unused]] int nNewRefreshHZ, [[maybe_unused]] bool bFullScreen, [[maybe_unused]] bool bForce)
-{
-    return false;
-}
-
-WIN_HWND CNULLRenderer::Init([[maybe_unused]] int x, [[maybe_unused]] int y, int width, int height, [[maybe_unused]] unsigned int cbpp, [[maybe_unused]] int zbpp, [[maybe_unused]] int sbits, [[maybe_unused]] bool fullscreen, [[maybe_unused]] bool isEditor, [[maybe_unused]] WIN_HINSTANCE hinst, [[maybe_unused]] WIN_HWND Glhwnd, [[maybe_unused]] bool bReInit, [[maybe_unused]] const SCustomRenderInitArgs* pCustomArgs, [[maybe_unused]] bool bShaderCacheGen)
-{
-    //=======================================
-    // Add init code here
-    //=======================================
-
-    FX_SetWireframeMode(R_SOLID_MODE);
-
-    SetWidth(width);
-    SetHeight(height);
-    m_backbufferWidth = width;
-    m_backbufferHeight = height;
-    m_Features |= RFT_HW_NVIDIA;
-
-    if (!g_shaderGeneralHeap)
-    {
-        g_shaderGeneralHeap = CryGetIMemoryManager()->CreateGeneralExpandingMemoryHeap(4 * 1024 * 1024, 0, "Shader General");
-    }
-
-    iLog->Log("Init Shaders\n");
-
-    gRenDev->m_cEF.mfInit();
-    EF_Init();
-
-#if NULL_SYSTEM_TRAIT_INIT_RETURNTHIS
-    return (WIN_HWND)this;//it just get checked against NULL anyway
-#else
-    return (WIN_HWND)GetDesktopWindow();
-#endif
-}
-
-
-bool CNULLRenderer::SetCurrentContext([[maybe_unused]] WIN_HWND hWnd)
-{
-    return true;
-}
-
-bool CNULLRenderer::CreateContext([[maybe_unused]] WIN_HWND hWnd, [[maybe_unused]] bool bAllowMSAA, [[maybe_unused]] int SSX, [[maybe_unused]] int SSY)
-{
-    return true;
-}
-
-bool CNULLRenderer::DeleteContext([[maybe_unused]] WIN_HWND hWnd)
-{
-    return true;
-}
-
-void CNULLRenderer::MakeMainContextActive()
-{
-}
-
-void CNULLRenderer::ShutDown([[maybe_unused]] bool bReInit)
-{
-    iLog = nullptr;
-    FreeResources(FRR_ALL);
-    FX_PipelineShutdown();
-}
-
-void CNULLRenderer::ShutDownFast()
-{
-    FX_PipelineShutdown();
-}
-
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Textures.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_Textures.cpp
deleted file mode 100644
index 36da308082..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_Textures.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : NULL device specific texture manager implementation.
-
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-
-//=================================================================================
-
-///////////////////////////////////////////////////////////////////////////////////
-
-
-void CNULLRenderer::MakeSprite(IDynTexture*& rTexturePtr, [[maybe_unused]] float _fSpriteDistance, [[maybe_unused]] int nTexSize, [[maybe_unused]] float angle, [[maybe_unused]] float angle2, [[maybe_unused]] IStatObj* pStatObj, [[maybe_unused]] const float fBrightnessMultiplier, [[maybe_unused]] SRendParams& rParms)
-{
-    rTexturePtr = NULL;
-}
-
-int CNULLRenderer::GenerateAlphaGlowTexture([[maybe_unused]] float k)
-{
-    return 0;
-}
-
-bool CNULLRenderer::EF_SetLightHole([[maybe_unused]] Vec3 vPos, [[maybe_unused]] Vec3 vNormal, [[maybe_unused]] int idTex, [[maybe_unused]] float fScale, [[maybe_unused]] bool bAdditive)
-{
-    return false;
-}
-
-bool CNULLRenderer::EF_PrecacheResource([[maybe_unused]] ITexture* pTP, [[maybe_unused]] float fDist, [[maybe_unused]] float fTimeToReady, [[maybe_unused]] int Flags, [[maybe_unused]] int nUpdateId, [[maybe_unused]] int nCounter)
-{
-    return false;
-}
-
-bool CTexture::RenderEnvironmentCMHDR([[maybe_unused]] int size, [[maybe_unused]] Vec3& Pos, [[maybe_unused]] TArray<unsigned short>& vecData)
-{
-    return true;
-}
-
-void CTexture::Apply([[maybe_unused]] int nTUnit, [[maybe_unused]] int nState, [[maybe_unused]] int nTMatSlot, [[maybe_unused]] int nSUnit, [[maybe_unused]] SResourceView::KeyType nResViewKey, [[maybe_unused]] EHWShaderClass eSHClass)
-{
-}
-
-#if defined(TEXTURE_GET_SYSTEM_COPY_SUPPORT)
-byte* CTexture::Convert([[maybe_unused]] const byte* pSrc, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] int nMips, [[maybe_unused]] ETEX_Format eTFSrc, [[maybe_unused]] ETEX_Format eTFDst, [[maybe_unused]] int& nOutSize, [[maybe_unused]] bool bLinear)
-{
-    return NULL;
-}
-#endif
-
-void CTexture::ReleaseDeviceTexture([[maybe_unused]] bool bKeepLastMips, [[maybe_unused]] bool bFromUnload)
-{
-}
-
-bool CTexture::Clear([[maybe_unused]] const ColorF& color)
-{
-    return true;
-}
-
-void CTexture::SetTexStates()
-{
-}
-
-bool CTexture::CreateDeviceTexture([[maybe_unused]] const byte* pData[6])
-{
-    return true;
-}
-
-void* CTexture::CreateDeviceResourceView([[maybe_unused]] const SResourceView& rv)
-{
-    return NULL;
-}
-
-ETEX_Format CTexture::ClosestFormatSupported(ETEX_Format eTFDst)
-{
-    return eTFDst;
-}
-
-bool CTexture::SetFilterMode(int nFilter)
-{
-    return s_sDefState.SetFilterMode(nFilter);
-}
-
-bool CTexture::CreateRenderTarget([[maybe_unused]] ETEX_Format eTF, [[maybe_unused]] const ColorF& cClear)
-{
-    return true;
-}
-
-bool CTexture::SetClampingMode(int nAddressU, int nAddressV, int nAddressW)
-{
-    return s_sDefState.SetClampMode(nAddressU, nAddressV, nAddressW);
-}
-
-void CTexture::UpdateTexStates()
-{
-}
-
-void CTexture::GenerateCachedShadowMaps()
-{
-}
-
-void CTexture::Readback([[maybe_unused]] AZ::u32 subresourceIndex, StagingHook callback)
-{
-}
-
-//======================================================================================
-
-void SEnvTexture::Release()
-{
-}
-
-void SEnvTexture::RT_SetMatrix(void)
-{
-}
-
-bool SDynTexture::RestoreRT([[maybe_unused]] int nRT, [[maybe_unused]] bool bPop)
-{
-    return true;
-}
-
-bool SDynTexture::ClearRT()
-{
-    return true;
-}
-
-bool SDynTexture2::ClearRT()
-{
-    return true;
-}
-
-bool SDynTexture::SetRT([[maybe_unused]] int nRT, [[maybe_unused]] bool bPush, [[maybe_unused]] SDepthTexture* pDepthSurf, [[maybe_unused]] bool bScreenVP)
-{
-    return true;
-}
-
-bool SDynTexture2::SetRT([[maybe_unused]] int nRT, [[maybe_unused]] bool bPush, [[maybe_unused]] SDepthTexture* pDepthSurf, [[maybe_unused]] bool bScreenVP)
-{
-    return true;
-}
-
-bool SDynTexture2::RestoreRT([[maybe_unused]] int nRT, [[maybe_unused]] bool bPop)
-{
-    return true;
-}
-
-bool SDynTexture2::SetRectStates()
-{
-    return true;
-}
-
-//===============================================================================
-
-void STexState::PostCreate()
-{
-}
-
-void STexState::Destroy()
-{
-}
-
-void STexState::Init(const STexState& src)
-{
-    memcpy(this, &src, sizeof(src));
-}
-
-void STexState::SetComparisonFilter([[maybe_unused]] bool bEnable)
-{
-}
-
-bool STexState::SetClampMode([[maybe_unused]] int nAddressU, [[maybe_unused]] int nAddressV, [[maybe_unused]] int nAddressW)
-{
-    m_nAddressU = 0;
-    m_nAddressV = 0;
-    m_nAddressW = 0;
-    return true;
-}
-
-bool STexState::SetFilterMode([[maybe_unused]] int nFilter)
-{
-    m_nMinFilter = 0;
-    m_nMagFilter = 0;
-    m_nMipFilter = 0;
-    return true;
-}
-
-void STexState::SetBorderColor(DWORD dwColor)
-{
-    m_dwBorderColor = dwColor;
-}
-
-
-SDepthTexture::~SDepthTexture()
-{
-}
-
-void SDepthTexture::Release([[maybe_unused]] bool bReleaseTex)
-{
-}
-
-ETEX_Format CTexture::TexFormatFromDeviceFormat([[maybe_unused]] int nFormat)
-{
-    return eTF_Unknown;
-}
-
-bool CTexture::RT_CreateDeviceTexture([[maybe_unused]] const byte* pData[6])
-{
-    return true;
-}
-
-void CTexture::UpdateTextureRegion([[maybe_unused]] const uint8_t* data, [[maybe_unused]] int X, [[maybe_unused]] int Y, [[maybe_unused]] int Z, [[maybe_unused]] int USize, [[maybe_unused]] int VSize, [[maybe_unused]] int ZSize, [[maybe_unused]] ETEX_Format eTFSrc)
-{
-}
-
-void CTexture::Unbind()
-{
-}
-
-void CTexture::RT_UpdateTextureRegion([[maybe_unused]] const uint8_t* data, [[maybe_unused]] int X, [[maybe_unused]] int Y, [[maybe_unused]] int Z, [[maybe_unused]] int USize, [[maybe_unused]] int VSize, [[maybe_unused]] int ZSize, [[maybe_unused]] ETEX_Format eTFSrc)
-{
-}
-
-bool SDynTexture::RT_SetRT([[maybe_unused]] int nRT, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] bool bPush, [[maybe_unused]] bool bScreenVP)
-{
-    return true;
-}
-
-bool SDynTexture::RT_Update([[maybe_unused]] int nNewWidth, [[maybe_unused]] int nNewHeight)
-{
-    return true;
-}
-
-void CTexture::ReleaseSystemTargets(void) {}
-void CTexture::ReleaseMiscTargets(void) {}
-void CTexture::CreateSystemTargets(void) {}
-
-//===============================================================================
-
-namespace  TextureHelpers
-{
-    bool VerifyTexSuffix([[maybe_unused]] EEfResTextures texSlot, [[maybe_unused]] const char* texPath)
-    {
-        return false;
-    }
-
-    bool VerifyTexSuffix([[maybe_unused]] EEfResTextures texSlot, [[maybe_unused]] const string& texPath)
-    {
-        return false;
-    }
-
-    const char* LookupTexSuffix([[maybe_unused]] EEfResTextures texSlot)
-    {
-        return nullptr;
-    }
-
-    int8 LookupTexPriority([[maybe_unused]] EEfResTextures texSlot)
-    {
-        return 0;
-    }
-
-    CTexture* LookupTexDefault([[maybe_unused]] EEfResTextures texSlot)
-    {
-        return nullptr;
-    }
-
-    CTexture* LookupTexBlank([[maybe_unused]] EEfResTextures texSlot)
-    {
-        return nullptr;
-    }
-}
-
-bool CTexture::Clear() { return true; }
-
-uint32 CDeviceTexture::TextureDataSize([[maybe_unused]] uint32 nWidth, [[maybe_unused]] uint32 nHeight, [[maybe_unused]] uint32 nDepth, [[maybe_unused]] uint32 nMips, [[maybe_unused]] uint32 nSlices, [[maybe_unused]] const ETEX_Format eTF)
-{
-    return 0;
-}
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/NULL_TexturesStreaming.cpp b/Code/CryEngine/RenderDll/XRenderNULL/NULL_TexturesStreaming.cpp
deleted file mode 100644
index a1e2f9bae6..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/NULL_TexturesStreaming.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "RenderDll_precompiled.h"
-#include "NULL_Renderer.h"
-#include "../Common/Textures/TextureStreamPool.h"
-
-//===============================================================================
-
-bool STexPoolItem::IsStillUsedByGPU([[maybe_unused]] uint32 nCurTick)
-{
-    return false;
-}
-
-STexPoolItem::~STexPoolItem()
-{
-}
-
-void CTexture::InitStreamingDev()
-{
-}
-
-void CTexture::StreamExpandMip([[maybe_unused]] const void* pRawData, [[maybe_unused]] int nMip, [[maybe_unused]] int nBaseMipOffset, [[maybe_unused]] int nSideDelta)
-{
-}
-
-void CTexture::StreamCopyMipsTexToTex([[maybe_unused]] STexPoolItem* pSrcItem, [[maybe_unused]] int nMipSrc, [[maybe_unused]] STexPoolItem* pDestItem, [[maybe_unused]] int nMipDest, [[maybe_unused]] int nNumMips)
-{
-}
-
-bool CTexture::StreamPrepare_Platform()
-{
-    return true;
-}
-
-int CTexture::StreamTrim([[maybe_unused]] int nToMip)
-{
-    return 0;
-}
-
-// Just remove item from the texture object and keep Item in Pool list for future use
-// This function doesn't release API texture
-void CTexture::StreamRemoveFromPool()
-{
-}
-
-void CTexture::StreamCopyMipsTexToMem([[maybe_unused]] int nStartMip, [[maybe_unused]] int nEndMip, [[maybe_unused]] bool bToDevice, [[maybe_unused]] STexPoolItem* pNewPoolItem)
-{
-}
-
-STexPoolItem* CTexture::StreamGetPoolItem([[maybe_unused]] int nStartMip, [[maybe_unused]] int nMips, [[maybe_unused]] bool bShouldBeCreated, [[maybe_unused]] bool bCreateFromMipData, [[maybe_unused]] bool bCanCreate, [[maybe_unused]] bool bForStreamOut)
-{
-    return NULL;
-}
-
-void CTexture::StreamAssignPoolItem([[maybe_unused]] STexPoolItem* pItem, [[maybe_unused]] int nMinMip)
-{
-}
-
-
-CTextureStreamPoolMgr::CTextureStreamPoolMgr()
-{
-}
-
-CTextureStreamPoolMgr::~CTextureStreamPoolMgr()
-{
-}
-
-void CTextureStreamPoolMgr::Flush()
-{
-}
-
-STexPoolItem* CTextureStreamPoolMgr::GetPoolItem([[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] int nArraySize, [[maybe_unused]] int nMips, [[maybe_unused]] ETEX_Format eTF, [[maybe_unused]] bool bIsSRGB, [[maybe_unused]] ETEX_Type eTT, [[maybe_unused]] bool bShouldBeCreated, [[maybe_unused]] const char* sName, [[maybe_unused]] STextureInfo* pTI, [[maybe_unused]] bool bCanCreate, [[maybe_unused]] bool bWaitForIdle)
-{
-    return NULL;
-}
-
-void CTextureStreamPoolMgr::ReleaseItem([[maybe_unused]] STexPoolItem* pItem)
-{
-}
-
-void CTextureStreamPoolMgr::GarbageCollect([[maybe_unused]] size_t* nCurTexPoolSize, [[maybe_unused]] size_t nLowerPoolLimit, [[maybe_unused]] int nMaxItemsToFree)
-{
-}
-
-void CTextureStreamPoolMgr::GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer)
-{
-}
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/NULLRenderer_traits_android.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/NULLRenderer_traits_android.cmake
deleted file mode 100644
index 0de05b6006..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/NULLRenderer_traits_android.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_NULL_RENDERER_SUPPORTED TRUE)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/core_null_renderer_files_android.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/core_null_renderer_files_android.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/core_null_renderer_files_android.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/platform_android.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/platform_android.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Android/platform_android.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/NULLRenderer_traits_linux.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/NULLRenderer_traits_linux.cmake
deleted file mode 100644
index 0de05b6006..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/NULLRenderer_traits_linux.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_NULL_RENDERER_SUPPORTED TRUE)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/core_null_renderer_files_linux.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/core_null_renderer_files_linux.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/core_null_renderer_files_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/platform_linux.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/platform_linux.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Linux/platform_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/NULLRenderer_traits_mac.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/NULLRenderer_traits_mac.cmake
deleted file mode 100644
index 0de05b6006..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/NULLRenderer_traits_mac.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_NULL_RENDERER_SUPPORTED TRUE)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/core_null_renderer_files_mac.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/core_null_renderer_files_mac.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/core_null_renderer_files_mac.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/platform_mac.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/platform_mac.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Mac/platform_mac.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/NULLRenderer_traits_windows.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/NULLRenderer_traits_windows.cmake
deleted file mode 100644
index 0de05b6006..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/NULLRenderer_traits_windows.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_NULL_RENDERER_SUPPORTED TRUE)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/core_null_renderer_files_windows.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/core_null_renderer_files_windows.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/core_null_renderer_files_windows.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/platform_windows.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/platform_windows.cmake
deleted file mode 100644
index 6f1124d28d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/Windows/platform_windows.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        opengl32
-        glu32
-)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/NULLRenderer_traits_ios.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/NULLRenderer_traits_ios.cmake
deleted file mode 100644
index 0de05b6006..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/NULLRenderer_traits_ios.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(CRYRENDER_TRAIT_BUILD_NULL_RENDERER_SUPPORTED TRUE)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/core_null_renderer_files_ios.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/core_null_renderer_files_ios.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/core_null_renderer_files_ios.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/platform_ios.cmake b/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/platform_ios.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Platform/iOS/platform_ios.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/Tests/test_Main.cpp b/Code/CryEngine/RenderDll/XRenderNULL/Tests/test_Main.cpp
deleted file mode 100644
index 339fe5866d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/Tests/test_Main.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "RenderDll_precompiled.h"
-#include <AzTest/AzTest.h>
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_files.cmake b/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_files.cmake
deleted file mode 100644
index 00b50d79eb..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_files.cmake
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ../RenderDll_precompiled.cpp
-    ../Common/Renderer_Jobs.cpp
-    resource.h
-    ../Common/CommonRender.cpp
-    ../Common/Renderer.cpp
-    ../Common/RenderPipeline.cpp
-    ../Common/RenderThread.cpp
-    ../Common/ResFile.cpp
-    ../Common/ResFileLookupDataMan.cpp
-    ../Common/ShadowUtils.cpp
-    ../Common/TextMessages.cpp
-    ../Common/WaterUtils.cpp
-    ../Common/ResFileLookupDataMan.h
-    ../Common/TextMessages.h
-    ../Common/CommonRender.h
-    ../Common/FrameProfiler.h
-    ../Common/IColorGradingControllerInt.h
-    ../Common/OcclQuery.h
-    ../Common/Renderer.h
-    ../Common/RenderPipeline.h
-    ../Common/RenderThread.h
-    ../Common/ResFile.h
-    ../Common/ResFile_info.h
-    ../Common/Shadow_Renderer.h
-    ../Common/ShadowUtils.h
-    ../Common/WaterUtils.h
-    ../XRenderD3D9/DeviceManager/Enums.h
-    ../Common/RendElements/CREBeam.cpp
-    ../Common/RendElements/CREClientPoly.cpp
-    ../Common/RendElements/CRECloud.cpp
-    ../Common/RendElements/CREDeferredShading.cpp
-    ../Common/RendElements/CREFogVolume.cpp
-    ../Common/RendElements/CREGameEffect.cpp
-    ../Common/RendElements/CREHDRProcess.cpp
-    ../Common/RendElements/CREImposter.cpp
-    ../Common/RendElements/CREMesh.cpp
-    ../Common/RendElements/CREOclusionQuery.cpp
-    ../Common/RendElements/CREPostProcess.cpp
-    ../Common/RendElements/CREPrismObject.cpp
-    ../Common/RendElements/CRESky.cpp
-    ../Common/RendElements/CREVolumeObject.cpp
-    ../Common/RendElements/CREWaterOcean.cpp
-    ../Common/RendElements/CREWaterVolume.cpp
-    ../Common/RendElements/RendElement.cpp
-    ../Common/RendElements/CREGeomCache.cpp
-    ../Common/RendElements/CRELensOptics.h
-    ../Common/RendElements/CREBeam.h
-    ../Common/RendElements/CREClientPoly.h
-    ../Common/RendElements/CRECloud.h
-    ../Common/RendElements/CREDeferredShading.h
-    ../Common/RendElements/CREHDRProcess.h
-    ../Common/RendElements/Stars.h
-    ../Common/RendElements/Utils/PolygonMath2D.cpp
-    ../Common/RendElements/Utils/PolygonMath2D.h
-    ../Common/RendElements/Utils/SpatialHashGrid.h
-    ../Common/PostProcess/PostEffects.cpp
-    ../Common/PostProcess/PostProcess.cpp
-    ../Common/PostProcess/PostProcessUtils.cpp
-    ../Common/PostProcess/PostEffects.h
-    ../Common/PostProcess/PostProcess.h
-    ../Common/PostProcess/PostProcessUtils.h
-    ../Common/Memory/VRAMDriller.cpp
-    ../Common/Memory/VRAMDriller.h
-    ../Common/Memory/VRAMDrillerBus.h
-    ../Common/RenderMesh_Render.cpp
-    ../Common/RenderMesh_SetMesh.cpp
-    ../Common/RenderMesh.cpp
-    ../Common/RenderMesh.h
-    ../Common/Textures/ITextureStreamer.cpp
-    ../Common/Textures/PlanningTextureStreamer.cpp
-    ../Common/Textures/PlanningTextureStreamer_Jobs.cpp
-    ../Common/Textures/DynTexture.cpp
-    ../Common/Textures/PowerOf2BlockPacker.cpp
-    ../Common/Textures/Texture.cpp
-    ../Common/Textures/TextureManager.cpp
-    ../Common/Textures/TextureStreaming.cpp
-    ../Common/Textures/PlanningTextureStreamer.h
-    ../Common/Textures/TextureStreamPool.h
-    ../Common/Textures/PowerOf2BlockPacker.h
-    ../Common/Textures/Texture.h
-    ../Common/Textures/StereoTexture.cpp
-    ../Common/Textures/StereoTexture.h
-    ../Common/Textures/TextureManager.h
-    ../Common/Textures/Image/CImage.cpp
-    ../Common/Textures/Image/DDSImage.cpp
-    ../Common/Textures/Image/JpgImage.cpp
-    ../Common/Textures/Image/TgaImage.cpp
-    ../Common/Textures/Image/CImage.h
-    ../Common/Textures/Image/DDSImage.h
-    ../Common/Shaders/Parser.cpp
-    ../Common/Shaders/ParserBin.cpp
-    ../Common/Shaders/PoundPoundParser.cpp
-    ../Common/Shaders/ShaderCache.cpp
-    ../Common/Shaders/ShaderComponents.cpp
-    ../Common/Shaders/ShaderCore.cpp
-    ../Common/Shaders/ShaderFXParseBin.cpp
-    ../Common/Shaders/ShaderParse.cpp
-    ../Common/Shaders/ShaderScript.cpp
-    ../Common/Shaders/ShaderTemplate.cpp
-    ../Common/Shaders/ShaderResources.cpp
-    ../Common/Shaders/CShader.h
-    ../Common/Shaders/CShaderBin.h
-    ../Common/Shaders/Parser.h
-    ../Common/Shaders/ParserBin.h
-    ../Common/Shaders/PoundPoundParser.h
-    ../Common/Shaders/Shader.h
-    ../Common/Shaders/ShaderCache.h
-    ../Common/Shaders/ShaderComponents.h
-    ../Common/Shaders/ShaderResources.h
-    ../Common/Shaders/Vertex.h
-)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_shared_files.cmake b/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_shared_files.cmake
deleted file mode 100644
index 2ea2e78c18..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_shared_files.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    NULL_Renderer.h
-    NULL_Renderer.cpp
-    NULL_DevBuffer.cpp
-    NULL_Font.cpp
-    NULL_PostProcess.cpp
-    NULL_RendPipeline.cpp
-    NULL_RERender.cpp
-    NULL_Shaders.cpp
-    NULL_Shadows.cpp
-    NULL_System.cpp
-    NULL_Textures.cpp
-    NULL_TexturesStreaming.cpp
-    NULLRenderAuxGeom.cpp
-    NULLRenderAuxGeom.h
-    CRELensOpticsNULL.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_test_files.cmake b/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_test_files.cmake
deleted file mode 100644
index e0f7c6f51d..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/core_null_renderer_test_files.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Tests/test_Main.cpp
-    ../Common/tests/RenderDLLUnitTests.cpp
-    NULL_Renderer.h
-    NULL_Renderer.cpp
-    NULL_DevBuffer.cpp
-    NULL_Font.cpp
-    NULL_PostProcess.cpp
-    NULL_RendPipeline.cpp
-    NULL_RERender.cpp
-    NULL_Shaders.cpp
-    NULL_Shadows.cpp
-    NULL_System.cpp
-    NULL_Textures.cpp
-    NULL_TexturesStreaming.cpp
-    NULLRenderAuxGeom.cpp
-    NULLRenderAuxGeom.h
-    CRELensOpticsNULL.cpp
-)
diff --git a/Code/CryEngine/RenderDll/XRenderNULL/resource.h b/Code/CryEngine/RenderDll/XRenderNULL/resource.h
deleted file mode 100644
index ed88839421..0000000000
--- a/Code/CryEngine/RenderDll/XRenderNULL/resource.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#define VS_VERSION_INFO                 1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
index db8736b4a8..b89a73b5e8 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
@@ -1454,32 +1454,48 @@ namespace AZ
         //=========================================================================
         void AssetManager::ReloadAssetFromData(const Asset<AssetData>& asset)
         {
-            AZ_Assert(asset.Get(), "Asset data for reload is missing.");
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-            AZ_Assert(m_assets.find(asset.GetId()) != m_assets.end(), "Unable to reload asset %s because its not in the AssetManager's asset list.", asset.ToString<AZStd::string>().c_str());
-            AZ_Assert(m_assets.find(asset.GetId()) == m_assets.end() || asset->RTTI_GetType() == m_assets.find(asset.GetId())->second->RTTI_GetType(),
-                "New and old data types are mismatched!");
+            bool shouldAssignAssetData = false;
 
-            auto found = m_assets.find(asset.GetId());
-            if ((found == m_assets.end()) || (asset->RTTI_GetType() != found->second->RTTI_GetType()))
             {
-                return; // this will just lead to crashes down the line and the above asserts cover this.
-            }
-
-            AssetData* newData = asset.Get();
+                AZ_Assert(asset.Get(), "Asset data for reload is missing.");
+                AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+                AZ_Assert(
+                    m_assets.find(asset.GetId()) != m_assets.end(),
+                    "Unable to reload asset %s because it's not in the AssetManager's asset list.", asset.ToString<AZStd::string>().c_str());
+                AZ_Assert(
+                    m_assets.find(asset.GetId()) == m_assets.end() ||
+                        asset->RTTI_GetType() == m_assets.find(asset.GetId())->second->RTTI_GetType(),
+                    "New and old data types are mismatched!");
+
+                auto found = m_assets.find(asset.GetId());
+                if ((found == m_assets.end()) || (asset->RTTI_GetType() != found->second->RTTI_GetType()))
+                {
+                    return; // this will just lead to crashes down the line and the above asserts cover this.
+                }
 
-            if (found->second != newData)
-            {
-                // Notify users that we are about to change asset
-                AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetPreReload, asset);
+                AssetData* newData = asset.Get();
 
-                // Resolve the asset handler and account for the new asset instance.
+                if (found->second != newData)
                 {
-                    AssetHandlerMap::iterator handlerIt = m_handlers.find(newData->GetType());
-                    AZ_Assert(handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
-                        newData->GetType().ToString<AZ::OSString>().c_str(), newData->GetId().ToString<AZ::OSString>().c_str());
+                    // Notify users that we are about to change asset
+                    AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetPreReload, asset);
+
+                    // Resolve the asset handler and account for the new asset instance.
+                    {
+                        AssetHandlerMap::iterator handlerIt = m_handlers.find(newData->GetType());
+                        AZ_Assert(
+                            handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
+                            newData->GetType().ToString<AZ::OSString>().c_str(), newData->GetId().ToString<AZ::OSString>().c_str());
+                    }
+
+                    shouldAssignAssetData = true;
                 }
+            }
 
+            // We specifically perform this outside of the m_assetMutex lock so that the lock isn't held at the point that
+            // OnAssetReload is triggered inside of AssignAssetData.  Otherwise, we open up a high potential for deadlocks.
+            if (shouldAssignAssetData)
+            {
                 AssignAssetData(asset);
             }
         }
diff --git a/Code/Framework/AzCore/AzCore/AzCoreModule.cpp b/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
index 3c93ae5561..3d074455cc 100644
--- a/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
+++ b/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
@@ -19,7 +19,6 @@
 #include <AzCore/Jobs/JobManagerComponent.h>
 #include <AzCore/Serialization/Json/JsonSystemComponent.h>
 #include <AzCore/Memory/MemoryComponent.h>
-#include <AzCore/NativeUI/NativeUISystemComponent.h>
 #include <AzCore/Script/ScriptSystemComponent.h>
 #include <AzCore/Slice/SliceComponent.h>
 #include <AzCore/Slice/SliceSystemComponent.h>
@@ -43,7 +42,6 @@ namespace AZ
             AssetManagerComponent::CreateDescriptor(),
             UserSettingsComponent::CreateDescriptor(),
             Debug::FrameProfilerComponent::CreateDescriptor(),
-            NativeUI::NativeUISystemComponent::CreateDescriptor(),
             SliceComponent::CreateDescriptor(),
             SliceSystemComponent::CreateDescriptor(),
             SliceMetadataInfoComponent::CreateDescriptor(),
diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
index d71358088e..def98ddb63 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
@@ -28,6 +28,8 @@
 #include <AzCore/Memory/AllocatorManager.h>
 #include <AzCore/Memory/MallocSchema.h>
 
+#include <AzCore/NativeUI/NativeUIRequests.h>
+
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/ObjectStream.h>
 #include <AzCore/Serialization/Utils.h>
@@ -424,7 +426,7 @@ namespace AZ
 
         // Now that the Allocators are initialized, the Command Line parameters can be parsed
         m_commandLine.Parse(m_argC, m_argV);
-        ParseCommandLine(m_commandLine);
+        SettingsRegistryMergeUtils::ParseCommandLine(m_commandLine);
 
         // Create the settings registry and register it with the AZ interface system
         // This is done after the AppRoot has been calculated so that the Bootstrap.cfg
@@ -527,10 +529,42 @@ namespace AZ
         DestroyAllocator();
     }
 
+
+    void ReportBadEngineRoot()
+    {
+        AZStd::string errorMessage = {"Unable to determine a valid path to the engine.\n"
+                                      "Check parameters such as --project-path and --engine-path and make sure they are valid.\n"};
+        if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr)
+        {
+            AZ::SettingsRegistryInterface::FixedValueString filePathErrorStr;
+            if (registry->Get(filePathErrorStr, AZ::SettingsRegistryMergeUtils::FilePathKey_ErrorText); !filePathErrorStr.empty())
+            {
+                errorMessage += "Additional Info:\n";
+                errorMessage += filePathErrorStr.c_str();
+            }
+        }
+
+        if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI != nullptr)
+        {
+            nativeUI->DisplayOkDialog("O3DE Fatal Error", errorMessage.c_str(), false);
+        }
+        else
+        {
+            AZ_Error("ComponentApplication", false, "O3DE Fatal Error: %s\n", errorMessage.c_str());
+        }
+    }
+
+
     Entity* ComponentApplication::Create(const Descriptor& descriptor, const StartupParameters& startupParameters)
     {
         AZ_Assert(!m_isStarted, "Component application already started!");
 
+        if (m_engineRoot.empty())
+        {
+            ReportBadEngineRoot();
+            return nullptr;
+        }
+
         m_startupParameters = startupParameters;
 
         m_descriptor = descriptor;
@@ -871,46 +905,6 @@ namespace AZ
         }
     }
 
-    void ComponentApplication::ParseCommandLine(const AZ::CommandLine& commandLine)
-    {
-        struct OptionKeyToRegsetKey
-        {
-            AZStd::string_view m_optionKey;
-            AZStd::string m_regsetKey;
-        };
-
-        // Provide overrides for the engine root, the project root and the project cache root
-        AZStd::array commandOptions = {
-            OptionKeyToRegsetKey{ "engine-path", AZStd::string::format("%s/engine_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) },
-            OptionKeyToRegsetKey{ "project-path", AZStd::string::format("%s/project_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) },
-            OptionKeyToRegsetKey{ "project-cache-path", AZStd::string::format("%s/project_cache_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) }
-        };
-
-        AZStd::fixed_vector<AZStd::string, commandOptions.size()> overrideArgs;
-
-        for (auto&& [optionKey, regsetKey] : commandOptions)
-        {
-            if (size_t optionCount = commandLine.GetNumSwitchValues(optionKey); optionCount > 0)
-            {
-                // Use the last supplied command option value to override previous values
-                auto overrideArg = AZStd::string::format(R"(--regset="%s=%s")", regsetKey.c_str(),
-                    commandLine.GetSwitchValue(optionKey, optionCount - 1).c_str());
-                overrideArgs.emplace_back(AZStd::move(overrideArg));
-            }
-        }
-
-        if (!overrideArgs.empty())
-        {
-            // Dump the input command line, add the additional option overrides
-            // and Parse the new command line into the Component Application command line
-            AZ::CommandLine::ParamContainer commandLineArgs;
-            commandLine.Dump(commandLineArgs);
-            commandLineArgs.insert(commandLineArgs.end(), AZStd::make_move_iterator(overrideArgs.begin()),
-                AZStd::make_move_iterator(overrideArgs.end()));
-            m_commandLine.Parse(commandLineArgs);
-        }
-    }
-
     void ComponentApplication::MergeSettingsToRegistry(SettingsRegistryInterface& registry)
     {
         SettingsRegistryInterface::Specializations specializations;
diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
index 0d9aad0f0f..3c5ff0eab8 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
@@ -332,9 +332,6 @@ namespace AZ
         /// Create the drillers
         void        CreateDrillers();
 
-        /// Parse ComponentApplication specific command line arguments
-        void ParseCommandLine(const AZ::CommandLine& commandLine);
-
         virtual void MergeSettingsToRegistry(SettingsRegistryInterface& registry);
 
         //! Sets the specializations that will be used when loading the Settings Registry. Extend this in derived
diff --git a/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h b/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h
index 5055540874..f45295d221 100644
--- a/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h
+++ b/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h
@@ -15,45 +15,49 @@
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/std/string/string.h>
 
-namespace AZ
+namespace AZ::NativeUI
 {
-    namespace NativeUI
+    enum AssertAction
     {
-        enum AssertAction
-        {
-            IGNORE_ASSERT = 0,
-            IGNORE_ALL_ASSERTS,
-            BREAK,
-            NONE,
-        };
-
-        class NativeUIRequests
-            : public AZ::EBusTraits
-        {
-        public:
-            //////////////////////////////////////////////////////////////////////////
-            // EBusTraits overrides
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-            static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-            using MutexType = AZStd::recursive_mutex;
-
-            // Waits for user to select an option before execution continues
-            // Returns the option string selected by the user
-            virtual AZStd::string DisplayBlockingDialog(const AZStd::string& /*title*/, const AZStd::string& /*message*/, const AZStd::vector<AZStd::string>& /*options*/) const { return ""; };
-
-            // Waits for user to select an option ('Ok' or optionally 'Cancel') before execution continues
-            // Returns the option string selected by the user
-            virtual AZStd::string DisplayOkDialog(const AZStd::string& /*title*/, const AZStd::string& /*message*/, bool /*showCancel*/) const { return ""; };
-
-            // Waits for user to select an option ('Yes', 'No' or optionally 'Cancel') before execution continues
-            // Returns the option string selected by the user
-            virtual AZStd::string DisplayYesNoDialog(const AZStd::string& /*title*/, const AZStd::string& /*message*/, bool /*showCancel*/) const { return ""; };
-
-            // Displays an assert dialog box
-            // Returns the action selected by the user
-            virtual AssertAction DisplayAssertDialog(const AZStd::string& /*message*/) const { return AssertAction::NONE; };
-        };
-
-        using NativeUIRequestBus = AZ::EBus<NativeUIRequests>;
-    }
-}
+        IGNORE_ASSERT = 0,
+        IGNORE_ALL_ASSERTS,
+        BREAK,
+        NONE,
+    };
+
+    class NativeUIRequests
+    {
+    public:
+        AZ_RTTI(NativeUIRequests, "{48361EE6-C1E7-4965-A13A-7425B2691817}");
+        virtual ~NativeUIRequests() = default;
+
+        // Waits for user to select an option before execution continues
+        // Returns the option string selected by the user
+        virtual AZStd::string DisplayBlockingDialog(const AZStd::string& /*title*/, const AZStd::string& /*message*/, const AZStd::vector<AZStd::string>& /*options*/) const { return ""; };
+
+        // Waits for user to select an option ('Ok' or optionally 'Cancel') before execution continues
+        // Returns the option string selected by the user
+        virtual AZStd::string DisplayOkDialog(const AZStd::string& /*title*/, const AZStd::string& /*message*/, bool /*showCancel*/) const { return ""; };
+
+        // Waits for user to select an option ('Yes', 'No' or optionally 'Cancel') before execution continues
+        // Returns the option string selected by the user
+        virtual AZStd::string DisplayYesNoDialog(const AZStd::string& /*title*/, const AZStd::string& /*message*/, bool /*showCancel*/) const { return ""; };
+
+        // Displays an assert dialog box
+        // Returns the action selected by the user
+        virtual AssertAction DisplayAssertDialog(const AZStd::string& /*message*/) const { return AssertAction::NONE; };
+    };
+
+    class NativeUIEBusTraits
+        : public AZ::EBusTraits
+    {
+    public:
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        using MutexType = AZStd::recursive_mutex;
+    };
+
+    using NativeUIRequestBus = AZ::EBus<NativeUIRequests, NativeUIEBusTraits>;
+} // namespace AZ::NativeUI
diff --git a/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp
index cf0c2872f1..bed066018a 100644
--- a/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp
@@ -15,50 +15,19 @@
 
 #include <AzCore/NativeUI/NativeUISystemComponent.h>
 
-namespace AZ
+namespace AZ::NativeUI
 {
-    using namespace AZ::NativeUI;
-
-    void NativeUISystemComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serialize->Class<NativeUISystemComponent, AZ::Component>()
-                ->Version(0)
-                ;
-
-            if (AZ::EditContext* ec = serialize->GetEditContext())
-            {
-                ec->Class<NativeUISystemComponent>("NativeUI", "Adds basic support for native (platform specific) UI dialog boxes")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ;
-            }
-        }
-    }
-
-    void NativeUISystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-    {
-        provided.push_back(AZ_CRC("NativeUIService", 0x8ec25f87));
-    }
-
-    void NativeUISystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-    {
-        incompatible.push_back(AZ_CRC("NativeUIService", 0x8ec25f87));
-    }
-
-    void NativeUISystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+    NativeUISystem::NativeUISystem()
     {
-        (void)required;
+        NativeUIRequestBus::Handler::BusConnect();
     }
 
-    void NativeUISystemComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
+    NativeUISystem::~NativeUISystem()
     {
-        (void)dependent;
+        NativeUIRequestBus::Handler::BusDisconnect();
     }
 
-    AssertAction NativeUISystemComponent::DisplayAssertDialog(const AZStd::string& message) const
+    AssertAction NativeUISystem::DisplayAssertDialog(const AZStd::string& message) const
     {
         static const char* buttonNames[3] = { "Ignore", "Ignore All", "Break" };
         AZStd::vector<AZStd::string> options;
@@ -80,7 +49,7 @@ namespace AZ
         return AssertAction::NONE;
     }
 
-    AZStd::string NativeUISystemComponent::DisplayOkDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const
+    AZStd::string NativeUISystem::DisplayOkDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const
     {
         AZStd::vector<AZStd::string> options;
 
@@ -93,7 +62,7 @@ namespace AZ
         return DisplayBlockingDialog(title, message, options);
     }
 
-    AZStd::string NativeUISystemComponent::DisplayYesNoDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const
+    AZStd::string NativeUISystem::DisplayYesNoDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const
     {
         AZStd::vector<AZStd::string> options;
 
@@ -106,18 +75,4 @@ namespace AZ
 
         return DisplayBlockingDialog(title, message, options);
     }
-
-    void NativeUISystemComponent::Init()
-    {
-    }
-
-    void NativeUISystemComponent::Activate()
-    {
-        NativeUIRequestBus::Handler::BusConnect();
-    }
-
-    void NativeUISystemComponent::Deactivate()
-    {
-        NativeUIRequestBus::Handler::BusDisconnect();
-    }
-}
+} // namespace AZ::NativeUI
diff --git a/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h
index 2d5cc36ffc..771b9a2af9 100644
--- a/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h
@@ -15,40 +15,24 @@
 #include <AzCore/Component/Component.h>
 #include <AzCore/NativeUI/NativeUIRequests.h>
 
-namespace AZ
+namespace AZ::NativeUI
 {
-    namespace NativeUI
+    class NativeUISystem
+        : public NativeUIRequestBus::Handler
     {
-        class NativeUISystemComponent
-            : public AZ::Component
-            , public NativeUIRequestBus::Handler
-        {
-        public:
-            AZ_COMPONENT(NativeUISystemComponent, "{E996C058-4AFE-4C8C-816F-98D864D8576D}");
-
-            static void Reflect(AZ::ReflectContext* context);
-
-            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
-            static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
-            static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
-            static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
-
-            ////////////////////////////////////////////////////////////////////////
-            // NativeUIRequestBus interface implementation
-            AZStd::string DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const override;
-            AZStd::string DisplayOkDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const override;
-            AZStd::string DisplayYesNoDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const override;
-            AssertAction DisplayAssertDialog(const AZStd::string& message) const override;
-            ////////////////////////////////////////////////////////////////////////
-
-        protected:
-
-            ////////////////////////////////////////////////////////////////////////
-            // AZ::Component interface implementation
-            void Init() override;
-            void Activate() override;
-            void Deactivate() override;
-            ////////////////////////////////////////////////////////////////////////
-        };
-    }
-}
+    public:
+        AZ_RTTI(NativeUISystem, "{FF534B2C-11BE-4DEA-A5B7-A4FA96FE1EDE}", NativeUIRequests);
+        AZ_CLASS_ALLOCATOR(NativeUISystem, AZ::OSAllocator, 0);
+
+        NativeUISystem();
+        ~NativeUISystem() override;
+
+        ////////////////////////////////////////////////////////////////////////
+        // NativeUIRequestBus interface implementation
+        AZStd::string DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const override;
+        AZStd::string DisplayOkDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const override;
+        AZStd::string DisplayYesNoDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const override;
+        AssertAction DisplayAssertDialog(const AZStd::string& message) const override;
+        ////////////////////////////////////////////////////////////////////////
+    };
+} // namespace AZ::NativeUI
diff --git a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
index 0a727c7c53..015554538f 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
@@ -699,6 +699,10 @@ Data::AssetHandler::LoadResult ScriptSystemComponent::LoadAssetData(
         script->m_scriptBuffer.resize(scriptDataLength);
         stream->Read(scriptDataLength, script->m_scriptBuffer.data());
 
+        // Clear cached references in the event of a successful load. This function has to be queued on
+        // AssetBus where NotifyAssetReloaded is also queued, to ensure its execution before NotifyAssetReloaded
+        Data::AssetBus::QueueFunction(&ScriptSystemComponent::ClearAssetReferences, this, asset.GetId());
+
         return Data::AssetHandler::LoadResult::LoadComplete;
     }
 
@@ -853,7 +857,7 @@ const char* ScriptSystemComponent::GetGroup() const
 
 const char* AZ::ScriptSystemComponent::GetBrowserIcon() const
 {
-    return "Editor/Icons/Components/LuaScript.svg";
+    return "Icons/Components/LuaScript.svg";
 }
 
 AZ::Uuid AZ::ScriptSystemComponent::GetComponentTypeId() const
diff --git a/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl b/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl
index eac6e5760e..90b9ba5afd 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl
@@ -118,6 +118,7 @@ namespace AZ
             const static AZ::Crc32 StringLineEditingCompleteNotify = AZ_CRC("StringLineEditingCompleteNotify", 0x139e5fa9);
 
             const static AZ::Crc32 NameLabelOverride = AZ_CRC("NameLabelOverride", 0x9ff79cab);
+            const static AZ::Crc32 AssetPickerTitle = AZ_CRC_CE("AssetPickerTitle");
             const static AZ::Crc32 ChildNameLabelOverride = AZ_CRC("ChildNameLabelOverride", 0x73dd2909);
             //! Container attribute that is used to override labels for its elements given the index of the element
             const static AZ::Crc32 IndexedChildNameLabelOverride = AZ_CRC("IndexedChildNameLabelOverride", 0x5f313ac2);
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
index 6077a66682..f15178dd00 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
@@ -10,91 +10,75 @@
  *
  */
 
-#include "ByteStreamSerializer.h"
-
 #include <AzCore/Casting/numeric_cast.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Serialization/Json/ByteStreamSerializer.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/StringFunc/StringFunc.h>
 
 namespace AZ
 {
-    namespace ByteSerializerInternal
-    {
-        static JsonSerializationResult::Result Load(void* outputValue, const rapidjson::Value& inputValue, JsonDeserializerContext& context)
-        {
-            using JsonSerializationResult::Outcomes;
-            using JsonSerializationResult::Tasks;
-
-            AZ_Assert(outputValue, "Expected a valid pointer to load from json value.");
-
-            switch (inputValue.GetType())
-            {
-            case rapidjson::kStringType: {
-                JsonByteStream buffer;
-                if (AZ::StringFunc::Base64::Decode(buffer, inputValue.GetString(), inputValue.GetStringLength()))
-                {
-                    JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
-                    *valAsByteStream = AZStd::move(buffer);
-                    return context.Report(Tasks::ReadField, Outcomes::Success, "Successfully read ByteStream.");
-                }
-                return context.Report(Tasks::ReadField, Outcomes::Invalid, "Decode of Base64 encoded ByteStream failed.");
-            }
-            case rapidjson::kArrayType:
-            case rapidjson::kObjectType:
-            case rapidjson::kNullType:
-            case rapidjson::kFalseType:
-            case rapidjson::kTrueType:
-            case rapidjson::kNumberType:
-                return context.Report(
-                    Tasks::ReadField, Outcomes::Unsupported,
-                    "Unsupported type. ByteStream values cannot be read from arrays, objects, nulls, booleans or numbers.");
-            default:
-                return context.Report(Tasks::ReadField, Outcomes::Unknown, "Unknown json type encountered for ByteStream value.");
-            }
-        }
-
-        static JsonSerializationResult::Result StoreWithDefault(
-            rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, JsonSerializerContext& context)
-        {
-            using JsonSerializationResult::Outcomes;
-            using JsonSerializationResult::Tasks;
-
-            const JsonByteStream& valAsByteStream = *static_cast<const JsonByteStream*>(inputValue);
-            if (context.ShouldKeepDefaults() || !defaultValue || (valAsByteStream != *static_cast<const JsonByteStream*>(defaultValue)))
-            {
-                const auto base64ByteStream = AZ::StringFunc::Base64::Encode(valAsByteStream.data(), valAsByteStream.size());
-                outputValue.SetString(base64ByteStream.c_str(), base64ByteStream.size(), context.GetJsonAllocator());
-                return context.Report(Tasks::WriteValue, Outcomes::Success, "ByteStream successfully stored.");
-            }
-
-            return context.Report(Tasks::WriteValue, Outcomes::DefaultsUsed, "Default ByteStream used.");
-        }
-    } // namespace ByteSerializerInternal
-
     AZ_CLASS_ALLOCATOR_IMPL(JsonByteStreamSerializer, SystemAllocator, 0);
 
     JsonSerializationResult::Result JsonByteStreamSerializer::Load(
         void* outputValue, [[maybe_unused]] const Uuid& outputValueTypeId, const rapidjson::Value& inputValue,
         JsonDeserializerContext& context)
     {
+        using JsonSerializationResult::Outcomes;
+        using JsonSerializationResult::Tasks;
+
         AZ_Assert(
             azrtti_typeid<JsonByteStream>() == outputValueTypeId,
             "Unable to deserialize AZStd::vector<AZ::u8>> to json because the provided type is %s",
             outputValueTypeId.ToString<AZStd::string>().c_str());
+        AZ_Assert(outputValue, "Expected a valid pointer to load from json value.");
 
-        return ByteSerializerInternal::Load(outputValue, inputValue, context);
+        switch (inputValue.GetType())
+        {
+        case rapidjson::kStringType: {
+            JsonByteStream buffer;
+            if (AZ::StringFunc::Base64::Decode(buffer, inputValue.GetString(), inputValue.GetStringLength()))
+            {
+                JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
+                *valAsByteStream = AZStd::move(buffer);
+                return context.Report(Tasks::ReadField, Outcomes::Success, "Successfully read ByteStream.");
+            }
+            return context.Report(Tasks::ReadField, Outcomes::Invalid, "Decode of Base64 encoded ByteStream failed.");
+        }
+        case rapidjson::kArrayType:
+        case rapidjson::kObjectType:
+        case rapidjson::kNullType:
+        case rapidjson::kFalseType:
+        case rapidjson::kTrueType:
+        case rapidjson::kNumberType:
+            return context.Report(
+                Tasks::ReadField, Outcomes::Unsupported,
+                "Unsupported type. ByteStream values cannot be read from arrays, objects, nulls, booleans or numbers.");
+        default:
+            return context.Report(Tasks::ReadField, Outcomes::Unknown, "Unknown json type encountered for ByteStream value.");
+        }
     }
 
     JsonSerializationResult::Result JsonByteStreamSerializer::Store(
         rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, [[maybe_unused]] const Uuid& valueTypeId,
         JsonSerializerContext& context)
     {
+        using JsonSerializationResult::Outcomes;
+        using JsonSerializationResult::Tasks;
+
         AZ_Assert(
             azrtti_typeid<JsonByteStream>() == valueTypeId,
             "Unable to serialize AZStd::vector<AZ::u8> to json because the provided type is %s",
             valueTypeId.ToString<AZStd::string>().c_str());
 
-        return ByteSerializerInternal::StoreWithDefault(outputValue, inputValue, defaultValue, context);
+        const JsonByteStream& valAsByteStream = *static_cast<const JsonByteStream*>(inputValue);
+        if (context.ShouldKeepDefaults() || !defaultValue || (valAsByteStream != *static_cast<const JsonByteStream*>(defaultValue)))
+        {
+            const auto base64ByteStream = AZ::StringFunc::Base64::Encode(valAsByteStream.data(), valAsByteStream.size());
+            outputValue.SetString(base64ByteStream.c_str(), base64ByteStream.size(), context.GetJsonAllocator());
+            return context.Report(Tasks::WriteValue, Outcomes::Success, "ByteStream successfully stored.");
+        }
+
+        return context.Report(Tasks::WriteValue, Outcomes::DefaultsUsed, "Default ByteStream used.");
     }
 } // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp
index c3ca2bf33f..7c52260691 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp
@@ -104,13 +104,12 @@ namespace AZ
         auto serializer = context.GetRegistrationContext()->GetSerializerForType(classData.m_typeId);
         if (serializer)
         {
-            if (storeTypeId == StoreTypeId::Yes)
+            ResultCode result = serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+            if (storeTypeId == StoreTypeId::Yes && result.GetProcessing() != Processing::Halted)
             {
-                return context.Report(Tasks::WriteValue, Outcomes::Catastrophic,
-                    "Unable to store type information in a JSON Serializer primitive.");
+                result.Combine(InsertTypeId(node, classData, context));
             }
-
-            return serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+            return result;
         }
 
         if (classData.m_azRtti && (classData.m_azRtti->GetTypeTraits() & AZ::TypeTraits::is_enum) == AZ::TypeTraits::is_enum)
@@ -128,13 +127,12 @@ namespace AZ
             serializer = context.GetRegistrationContext()->GetSerializerForType(classData.m_azRtti->GetGenericTypeId());
             if (serializer)
             {
-                if (storeTypeId == StoreTypeId::Yes)
+                ResultCode result = serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+                if (storeTypeId == StoreTypeId::Yes && result.GetProcessing() != Processing::Halted)
                 {
-                    return context.Report(Tasks::WriteValue, Outcomes::Catastrophic,
-                        "Unable to store type information in a JSON Serializer primitive.");
+                    result.Combine(InsertTypeId(node, classData, context));
                 }
-
-                return serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+                return result;
             }
         }
         
@@ -149,6 +147,7 @@ namespace AZ
             ResultCode result(Tasks::WriteValue);
             if (storeTypeId == StoreTypeId::Yes)
             {
+                // Not using InsertTypeId here to avoid needing to create the temporary value and swap it in that call.
                 node.AddMember(rapidjson::StringRef(JsonSerialization::TypeIdFieldIdentifier),
                     StoreTypeName(classData, context), context.GetJsonAllocator());
                 result = ResultCode(Tasks::WriteValue, Outcomes::Success);
@@ -569,6 +568,31 @@ namespace AZ
         }
     }
 
+    JsonSerializationResult::ResultCode JsonSerializer::InsertTypeId(
+        rapidjson::Value& output, const SerializeContext::ClassData& classData, JsonSerializerContext& context)
+    {
+        using namespace JsonSerializationResult;
+
+        if (output.IsObject())
+        {
+            rapidjson::Value insertedObject(rapidjson::kObjectType);
+            insertedObject.AddMember(
+                rapidjson::StringRef(JsonSerialization::TypeIdFieldIdentifier), StoreTypeName(classData, context),
+                context.GetJsonAllocator());
+
+            for (auto& element : output.GetObject())
+            {
+                insertedObject.AddMember(AZStd::move(element.name), AZStd::move(element.value), context.GetJsonAllocator());
+            }
+            output = AZStd::move(insertedObject);
+            return ResultCode(Tasks::WriteValue, Outcomes::Success);
+        }
+        else
+        {
+            return context.Report(Tasks::WriteValue, Outcomes::Catastrophic, "Only able to store type information in a JSON Object.");
+        }
+    }
+
     rapidjson::Value JsonSerializer::GetExplicitDefault()
     {
         return rapidjson::Value(rapidjson::kObjectType);
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h
index e7ce1e766f..24acd28e81 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h
@@ -80,6 +80,9 @@ namespace AZ
         static JsonSerializationResult::ResultCode StoreTypeName(rapidjson::Value& output,
             const Uuid& typeId, JsonSerializerContext& context);
 
+        static JsonSerializationResult::ResultCode InsertTypeId(
+            rapidjson::Value& output, const SerializeContext::ClassData& classData, JsonSerializerContext& context);
+
         static rapidjson::Value GetExplicitDefault();
     };
 } // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
index 58cfa0d049..768841cc09 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
@@ -256,7 +256,7 @@ namespace AZ
 
         //! Remove the value at the provided path 
         //! @param path The path to a value that should be removed
-        //! @return Whether or not the value was stored at the provided path. An invalid path will return false;
+        //! @return Whether or not the path was found and removed. An invalid path will return false;
         virtual bool Remove(AZStd::string_view path) = 0;
 
         //! Structure which contains configuration settings for how to parse a single command line argument
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
index 27f6f222dd..56dfbdcb71 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
@@ -32,17 +32,12 @@
 namespace AZ::Internal
 {
     AZ::SettingsRegistryInterface::FixedValueString GetEngineMonikerForProject(
-        SettingsRegistryInterface& settingsRegistry, const AZ::IO::FixedMaxPath& projectPath)
+        SettingsRegistryInterface& settingsRegistry, const AZ::IO::FixedMaxPath& projectJsonPath)
     {
         // projectPath needs to be an absolute path here.
         using namespace AZ::SettingsRegistryMergeUtils;
-        bool projectJsonMerged = false;
-        auto projectJsonPath = projectPath / "project.json";
-        if (AZ::IO::SystemFile::Exists(projectJsonPath.c_str()))
-        {
-            projectJsonMerged = settingsRegistry.MergeSettingsFile(
-                projectJsonPath.Native(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, ProjectSettingsRootKey);
-        }
+        bool projectJsonMerged = settingsRegistry.MergeSettingsFile(
+            projectJsonPath.Native(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, ProjectSettingsRootKey);
 
         AZ::SettingsRegistryInterface::FixedValueString engineMoniker;
         if (projectJsonMerged)
@@ -105,12 +100,12 @@ namespace AZ::Internal
 
             const auto engineMonikerKey = AZ::SettingsRegistryInterface::FixedValueString::format("%s/engine_name", EngineSettingsRootKey);
 
+            AZStd::set<AZ::IO::FixedMaxPath> projectPathsNotFound;
+
             for (EngineInfo& engineInfo : pathVisitor.m_enginePaths)
             {
-                AZ::IO::FixedMaxPath engineSettingsPath{engineInfo.m_path};
-                engineSettingsPath /= "engine.json";
-
-                if (AZ::IO::SystemFile::Exists(engineSettingsPath.c_str()))
+                if (auto engineSettingsPath = AZ::IO::FixedMaxPath{engineInfo.m_path} / "engine.json";
+                    AZ::IO::SystemFile::Exists(engineSettingsPath.c_str()))
                 {
                     if (settingsRegistry.MergeSettingsFile(
                             engineSettingsPath.Native(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, EngineSettingsRootKey))
@@ -119,12 +114,61 @@ namespace AZ::Internal
                     }
                 }
 
-                auto engineMoniker = Internal::GetEngineMonikerForProject(settingsRegistry, engineInfo.m_path / projectPath);
-                if (!engineMoniker.empty() && engineMoniker == engineInfo.m_moniker)
+                if (auto projectJsonPath = (engineInfo.m_path / projectPath / "project.json").LexicallyNormal();
+                    AZ::IO::SystemFile::Exists(projectJsonPath.c_str()))
                 {
-                    engineRoot = engineInfo.m_path;
-                    break;
+                    if (auto engineMoniker = Internal::GetEngineMonikerForProject(settingsRegistry, projectJsonPath);
+                        !engineMoniker.empty() && engineMoniker == engineInfo.m_moniker)
+                    {
+                        engineRoot = engineInfo.m_path;
+                        break;
+                    }
+                }
+                else
+                {
+                    projectPathsNotFound.insert(projectJsonPath);
                 }
+
+                // Continue looking for candidates, remove the previous engine and project settings that were merged above.
+                settingsRegistry.Remove(ProjectSettingsRootKey);
+                settingsRegistry.Remove(EngineSettingsRootKey);
+            }
+
+            if (engineRoot.empty())
+            {
+                AZStd::string errorStr;
+                if (!projectPathsNotFound.empty())
+                {
+                    // This case is usually encountered when a project path is given as a relative path,
+                    // which is assumed to be relative to an engine root.
+                    // When no project.json files are found this way, dump this error message about
+                    // which project paths were checked.
+                    AZStd::string projectPathsTested;
+                    for (const auto& path : projectPathsNotFound)
+                    {
+                        projectPathsTested.append(AZStd::string::format("  %s\n", path.c_str()));
+                    }
+                    errorStr = AZStd::string::format("No valid project was found at these locations:\n%s"
+                        "Please supply a valid --project-path to the application.",
+                        projectPathsTested.c_str());
+                }
+                else
+                {
+                    // The other case is that a project.json was found, but after checking all the registered engines
+                    // none of them matched the engine moniker.
+                    AZStd::string enginePathsChecked;
+                    for (const auto& engineInfo : pathVisitor.m_enginePaths)
+                    {
+                        enginePathsChecked.append(AZStd::string::format("  %s (%s)\n", engineInfo.m_path.c_str(), engineInfo.m_moniker.c_str()));
+                    }
+                    errorStr = AZStd::string::format(
+                        "No engine was found in o3de_manifest.json with a name that matches the one set in the project.json.\n"
+                        "Engines that were checked:\n%s"
+                        "Please check that your engine and project have both been registered with scripts/o3de.py.", enginePathsChecked.c_str()
+                    );
+                }
+
+                settingsRegistry.Set(FilePathKey_ErrorText, errorStr.c_str());
             }
         }
 
@@ -158,7 +202,7 @@ namespace AZ::Internal
         return {};
     }
 
-    void InjectSettingToCommandLineFront(AZ::SettingsRegistryInterface& settingsRegistry,
+    void InjectSettingToCommandLineBack(AZ::SettingsRegistryInterface& settingsRegistry,
         AZStd::string_view path, AZStd::string_view value)
     {
         AZ::CommandLine commandLine;
@@ -168,7 +212,7 @@ namespace AZ::Internal
 
         auto projectPathOverride = AZStd::string::format(R"(--regset="%.*s=%.*s")",
             aznumeric_cast<int>(path.size()), path.data(), aznumeric_cast<int>(value.size()), value.data());
-        paramContainer.emplace(paramContainer.begin(), AZStd::move(projectPathOverride));
+        paramContainer.emplace(paramContainer.end(), AZStd::move(projectPathOverride));
         commandLine.Parse(paramContainer);
         AZ::SettingsRegistryMergeUtils::StoreCommandLineToRegistry(settingsRegistry, commandLine);
     }
@@ -197,8 +241,8 @@ namespace AZ::SettingsRegistryMergeUtils
             if (!engineRoot.empty())
             {
                 settingsRegistry.Set(engineRootKey, engineRoot.Native());
-                // Inject the engine root into the front of the command line settings
-                Internal::InjectSettingToCommandLineFront(settingsRegistry, engineRootKey, engineRoot.Native());
+                // Inject the engine root at the end of the command line settings
+                Internal::InjectSettingToCommandLineBack(settingsRegistry, engineRootKey, engineRoot.Native());
                 return engineRoot;
             }
         }
@@ -244,8 +288,8 @@ namespace AZ::SettingsRegistryMergeUtils
             if (!projectRoot.empty())
             {
                 settingsRegistry.Set(projectRootKey, projectRoot.c_str());
-                // Inject the project root into the front of the command line settings
-                Internal::InjectSettingToCommandLineFront(settingsRegistry, projectRootKey, projectRoot.Native());
+                // Inject the project root at the end of the command line settings
+                Internal::InjectSettingToCommandLineBack(settingsRegistry, projectRootKey, projectRoot.Native());
                 return projectRoot;
             }
         }
@@ -654,7 +698,6 @@ namespace AZ::SettingsRegistryMergeUtils
         if (registry.Get(engineRootPath, FilePathKey_EngineRootFolder))
         {
             AZ::IO::FixedMaxPath mergePath{ AZStd::move(engineRootPath) };
-            mergePath /= "Engine";
             mergePath /= SettingsRegistryInterface::RegistryFolder;
             registry.MergeSettingsFolder(mergePath.Native(), specializations, platform, "", scratchBuffer);
         }
@@ -875,6 +918,49 @@ namespace AZ::SettingsRegistryMergeUtils
         return true;
     }
 
+    void ParseCommandLine(AZ::CommandLine& commandLine)
+    {
+        struct OptionKeyToRegsetKey
+        {
+            AZStd::string_view m_optionKey;
+            AZStd::string m_regsetKey;
+        };
+
+        // Provide overrides for the engine root, the project root and the project cache root
+        AZStd::array commandOptions = {
+            OptionKeyToRegsetKey{
+                "engine-path", AZStd::string::format("%s/engine_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)},
+            OptionKeyToRegsetKey{
+                "project-path", AZStd::string::format("%s/project_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)},
+            OptionKeyToRegsetKey{
+                "project-cache-path",
+                AZStd::string::format("%s/project_cache_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)}};
+
+        AZStd::fixed_vector<AZStd::string, commandOptions.size()> overrideArgs;
+
+        for (auto&& [optionKey, regsetKey] : commandOptions)
+        {
+            if (size_t optionCount = commandLine.GetNumSwitchValues(optionKey); optionCount > 0)
+            {
+                // Use the last supplied command option value to override previous values
+                auto overrideArg = AZStd::string::format(
+                    R"(--regset="%s=%s")", regsetKey.c_str(), commandLine.GetSwitchValue(optionKey, optionCount - 1).c_str());
+                overrideArgs.emplace_back(AZStd::move(overrideArg));
+            }
+        }
+
+        if (!overrideArgs.empty())
+        {
+            // Dump the input command line, add the additional option overrides
+            // and Parse the new command line args (write back) into the input command line.
+            AZ::CommandLine::ParamContainer commandLineArgs;
+            commandLine.Dump(commandLineArgs);
+            commandLineArgs.insert(
+                commandLineArgs.end(), AZStd::make_move_iterator(overrideArgs.begin()), AZStd::make_move_iterator(overrideArgs.end()));
+            commandLine.Parse(commandLineArgs);
+        }
+    }
+
     bool DumpSettingsRegistryToStream(SettingsRegistryInterface& registry, AZStd::string_view key,
         AZ::IO::GenericStream& stream, const DumperSettings& dumperSettings)
     {
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
index 10b3c2f18b..4e00c0e6ec 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
@@ -55,6 +55,9 @@ namespace AZ::SettingsRegistryMergeUtils
     //! Development write storage path may be considered temporary or cache storage on some platforms
     inline static constexpr char FilePathKey_DevWriteStorage[] = "/Amazon/AzCore/Runtime/FilePaths/DevWriteStorage";
 
+    //! Stores error text regarding engine boot sequence when engine and project roots cannot be determined
+    inline static constexpr char FilePathKey_ErrorText[] = "/Amazon/AzCore/Runtime/FilePaths/ErrorText";
+
     //! Root key for where command line are stored at within the settings registry
     inline static constexpr char CommandLineRootKey[] = "/Amazon/AzCore/Runtime/CommandLine";
     //! Key set to trigger a notification that the CommandLine has been stored within the settings registry
@@ -219,6 +222,9 @@ namespace AZ::SettingsRegistryMergeUtils
     //! into the AZ::CommandLine instance
     bool GetCommandLineFromRegistry(SettingsRegistryInterface& registry, AZ::CommandLine& commandLine);
 
+    //! Parse a CommandLine and transform certain options into formal "regset" options
+    void ParseCommandLine(AZ::CommandLine& commandLine);
+
     //! Structure for configuring how values should be dumped from the Settings Registry
     struct DumperSettings
     {
diff --git a/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp
index b9f7e87b4b..b43044f0b3 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp
@@ -22,7 +22,7 @@ namespace AZ
 {
     namespace NativeUI
     {
-        AZStd::string NativeUISystemComponent::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
+        AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
             AZ::Android::JNI::Object object("com/amazon/lumberyard/NativeUI/LumberyardNativeUI");
             object.RegisterStaticMethod("DisplayDialog", "(Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V");
diff --git a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp
index 6a24415ec5..ceba9d2701 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp
@@ -12,16 +12,11 @@
 
 #include <AzCore/NativeUI/NativeUISystemComponent.h>
 
-namespace AZ
+namespace AZ::NativeUI
 {
-    namespace NativeUI
+    AZStd::string NativeUISystem::DisplayBlockingDialog([[maybe_unused]] const AZStd::string& title, [[maybe_unused]] const AZStd::string& message,
+        [[maybe_unused]] const AZStd::vector<AZStd::string>& options) const
     {
-        AZStd::string NativeUISystemComponent::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
-        {
-            AZ_UNUSED(title);
-            AZ_UNUSED(message);
-            AZ_UNUSED(options);
-            return "";
-        }
+        return {};
     }
 }
diff --git a/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm b/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm
index 4af67a1d54..801adaf4ea 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm
@@ -26,7 +26,7 @@ namespace AZ
 {
     namespace NativeUI
     {
-        AZStd::string NativeUISystemComponent::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
+        AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
             __block NSModalResponse response = -1;
             
diff --git a/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp
index a5dd65512f..f88cea5313 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp
@@ -245,7 +245,7 @@ namespace AZ
 {
     namespace NativeUI
     {
-        AZStd::string NativeUISystemComponent::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
+        AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
             if (options.size() >= MAX_ITEMS)
             {
diff --git a/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm b/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm
index 835a7fb5e7..62f07f7483 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm
@@ -18,7 +18,7 @@ namespace AZ
 {
     namespace NativeUI
     {
-        AZStd::string NativeUISystemComponent::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
+        AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
             __block AZStd::string userSelection = "";
             
diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp
index 378e1f6953..2399bd0463 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp
@@ -449,6 +449,46 @@ namespace JsonSerializationTests
 
     }
 
+    TEST_F(JsonSerializationTests, Load_PrimitiveForInheritedClass_LoadsCorrectClass)
+    {
+        using namespace AZ::JsonSerializationResult;
+        using namespace ::testing;
+
+        AZStd::string json = AZStd::string::format(R"(
+            {
+                "%s": "SimpleInheritence",
+                "base_var": -88.0,
+                "var1": 88,
+                "var2": 42
+            })",
+            AZ::JsonSerialization::TypeIdFieldIdentifier);
+        m_jsonDocument->Parse(json.c_str());
+
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        JsonSerializerMock* mock =
+            reinterpret_cast<JsonSerializerMock*>(m_jsonRegistrationContext->GetSerializerForType(azrtti_typeid<SimpleInheritence>()));
+        EXPECT_CALL(*mock, Load(_, _, _, _))
+            .Times(Exactly(1))
+            .WillRepeatedly(Return(Result(m_deserializationSettings->m_reporting, "Test", Tasks::ReadField, Outcomes::Success, "")));
+
+        AZStd::unique_ptr<BaseClass> instance;
+        ResultCode result = AZ::JsonSerialization::Load(instance, *m_jsonDocument, *m_deserializationSettings);
+        EXPECT_NE(Processing::Halted, result.GetProcessing());
+
+        EXPECT_EQ(azrtti_typeid<SimpleInheritence>(), azrtti_typeid(*instance));
+
+        m_serializeContext->EnableRemoveReflection();
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->DisableRemoveReflection();
+
+        m_jsonRegistrationContext->EnableRemoveReflection();
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        m_jsonRegistrationContext->DisableRemoveReflection();
+    }
+
     TEST_F(JsonSerializationTests, Store_TemplatedClassWithRegisteredHandler_StoreOnHandlerCalled)
     {
         using namespace AZ::JsonSerializationResult;
@@ -474,6 +514,52 @@ namespace JsonSerializationTests
         m_jsonRegistrationContext->DisableRemoveReflection();
     }
 
+    TEST_F(JsonSerializationTests, Store_PrimitiveForInheritedClass_StoreSucceedsAndTypeIdIsAdded)
+    {
+        using namespace AZ::JsonSerializationResult;
+        using namespace ::testing;
+
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        JsonSerializerMock* mock =
+            reinterpret_cast<JsonSerializerMock*>(m_jsonRegistrationContext->GetSerializerForType(azrtti_typeid<SimpleInheritence>()));
+        EXPECT_CALL(*mock, Store(_, _, _, _, _))
+            .Times(Exactly(1))
+            .WillRepeatedly(Invoke([](rapidjson::Value& output, const void*, const void*, const AZ::Uuid&, AZ::JsonSerializerContext& context)
+                {
+                    // Insert some values to allow verification later on.
+                    output.SetObject();
+                    output.AddMember("base_var", -88.0, context.GetJsonAllocator());
+                    output.AddMember("var1", 88, context.GetJsonAllocator());
+                    output.AddMember("var2", 42, context.GetJsonAllocator());
+                    return context.Report(Tasks::WriteValue, Outcomes::Success, "");
+                }));
+
+        AZStd::unique_ptr<BaseClass> instance{ aznew SimpleInheritence() };
+        ResultCode result = AZ::JsonSerialization::Store(*m_jsonDocument, m_jsonDocument->GetAllocator(), instance, *m_serializationSettings);
+        EXPECT_NE(Processing::Halted, result.GetProcessing());
+
+        AZStd::string compare = AZStd::string::format(R"(
+            {
+                "%s": "SimpleInheritence",
+                "base_var": -88.0,
+                "var1": 88,
+                "var2": 42
+            })",
+            AZ::JsonSerialization::TypeIdFieldIdentifier);
+        Expect_DocStrEq(compare.c_str());
+
+        m_serializeContext->EnableRemoveReflection();
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->DisableRemoveReflection();
+
+        m_jsonRegistrationContext->EnableRemoveReflection();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        m_jsonRegistrationContext->DisableRemoveReflection();
+    }
+
     TEST_F(JsonSerializationTests, Store_StoreWithNullPtr_ReturnsCatastrophic)
     {
         using namespace AZ::JsonSerializationResult;
diff --git a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
index 4b75a3d1cf..ba313812ce 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
@@ -175,7 +175,7 @@ namespace AzFramework
         }
 
         // Initializes the IArchive for reading archive(.pak) files
-        if (auto archive = AZ::Interface<AZ::IO::IArchive>::Get(); !archive)
+        if (auto archive = AZ::Interface<AZ::IO::IArchive>::Get(); archive == nullptr)
         {
             m_archive = AZStd::make_unique<AZ::IO::Archive>();
             AZ::Interface<AZ::IO::IArchive>::Register(m_archive.get());
@@ -189,6 +189,12 @@ namespace AzFramework
             SetFileIOAliases();
         }
 
+        if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI == nullptr)
+        {
+            m_nativeUI = AZStd::make_unique<AZ::NativeUI::NativeUISystem>();
+            AZ::Interface<AZ::NativeUI::NativeUIRequests>::Register(m_nativeUI.get());
+        }
+
         ApplicationRequests::Bus::Handler::BusConnect();
         AZ::UserSettingsFileLocatorBus::Handler::BusConnect();
         NetSystemRequestBus::Handler::BusConnect();
@@ -205,12 +211,17 @@ namespace AzFramework
         AZ::UserSettingsFileLocatorBus::Handler::BusDisconnect();
         ApplicationRequests::Bus::Handler::BusDisconnect();
 
+        if (AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get() == m_nativeUI.get())
+        {
+            AZ::Interface<AZ::NativeUI::NativeUIRequests>::Unregister(m_nativeUI.get());
+        }
+        m_nativeUI.reset();
+
         // Unset the Archive file IO if it is set as the direct instance
         if (AZ::IO::FileIOBase::GetInstance() == m_archiveFileIO.get())
         {
             AZ::IO::FileIOBase::SetInstance(nullptr);
         }
-
         m_archiveFileIO.reset();
 
         // Destroy the IArchive instance
@@ -303,7 +314,6 @@ namespace AzFramework
             azrtti_typeid<AZ::AssetManagerComponent>(),
             azrtti_typeid<AZ::UserSettingsComponent>(),
             azrtti_typeid<AZ::Debug::FrameProfilerComponent>(),
-            azrtti_typeid<AZ::NativeUI::NativeUISystemComponent>(),
             azrtti_typeid<AZ::SliceComponent>(),
             azrtti_typeid<AZ::SliceSystemComponent>(),
 
@@ -372,7 +382,6 @@ namespace AzFramework
             azrtti_typeid<AZ::UserSettingsComponent>(),
             azrtti_typeid<AZ::ScriptSystemComponent>(),
             azrtti_typeid<AZ::JobManagerComponent>(),
-            azrtti_typeid<AZ::NativeUI::NativeUISystemComponent>(),
             azrtti_typeid<AZ::SliceSystemComponent>(),
 
             azrtti_typeid<AzFramework::AssetCatalogComponent>(),
diff --git a/Code/Framework/AzFramework/AzFramework/Application/Application.h b/Code/Framework/AzFramework/AzFramework/Application/Application.h
index fdc0ddcfb7..4d7e45a423 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.h
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.h
@@ -16,6 +16,7 @@
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/UserSettings/UserSettings.h>
 #include <AzCore/Math/Uuid.h>
+#include <AzCore/NativeUI/NativeUIRequests.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/std/string/fixed_string.h>
@@ -187,6 +188,7 @@ namespace AzFramework
         AZStd::unique_ptr<AZ::IO::FileIOBase> m_archiveFileIO; ///> The Default file IO instance is a ArchiveFileIO.
         AZStd::unique_ptr<AZ::IO::Archive> m_archive; ///> The AZ::IO::Instance
         AZStd::unique_ptr<Implementation> m_pimpl;
+        AZStd::unique_ptr<AZ::NativeUI::NativeUIRequests> m_nativeUI;
         bool m_ownsConsole = false;
 
         bool m_exitMainLoopRequested = false;
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
index e01b105d13..20fe13114e 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
@@ -809,7 +809,7 @@ namespace AzFramework
     #if defined(AZ_ENABLE_TRACING)
                 if (message.m_assetType == AZ::Data::s_invalidAssetType)
                 {
-                    AZ_TracePrintf("AssetCatalog", "Registering asset \"%s\" via AssetSystem message, but type is not set.", relativePath.c_str());
+                    AZ_TracePrintf("AssetCatalog", "Registering asset \"%s\" via AssetSystem message, but type is not set.\n", relativePath.c_str());
                 }
     #endif
 
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
index 618fd92ac1..727d5051fa 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
@@ -220,7 +220,7 @@ namespace AzFramework
             {
                 // Read the wait for connection boolean from the Settings Registry
                 AZ::s64 waitForConnect64{};
-                if (!AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, waitForConnect64, AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, AzFramework::AssetSystem::WaitForConnect))
+                if (AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, waitForConnect64, AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, AzFramework::AssetSystem::WaitForConnect))
                 {
                     outputConnectionSettings.m_waitForConnect = waitForConnect64 != 0;
                 }
diff --git a/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp
index 7ab61df70e..a221d126bd 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp
@@ -17,7 +17,7 @@
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Debug/Trace.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <AzFramework/Entity/GameEntityContextComponent.h>
 
 namespace AzFramework
@@ -50,36 +50,34 @@ namespace AzFramework
 
     void AzFrameworkConfigurationSystemComponent::Activate()
     {
-        // Create the defaults scene and associate the GameEntityContext with it.
-        AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("SceneSystemRequests bus not responding.");
-        SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequests::CreateScene, "default");
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome =
+            SceneSystemInterface::Get()->CreateScene(Scene::MainSceneName);
         if (createSceneOutcome)
         {
-            Scene* scene = createSceneOutcome.GetValue();
-            bool success = false;
-            EntityContextId gameEntityContextId = EntityContextId::CreateNull();
-            GameEntityContextRequestBus::BroadcastResult(gameEntityContextId, &GameEntityContextRequests::GetGameEntityContextId);
-
-            if (!gameEntityContextId.IsNull())
+            AZStd::shared_ptr<Scene> scene = createSceneOutcome.TakeValue();
+            EntityContext* gameEntityContext = nullptr;
+            GameEntityContextRequestBus::BroadcastResult(gameEntityContext, &GameEntityContextRequests::GetGameEntityContextInstance);
+            if (gameEntityContext != nullptr)
+            {
+                [[maybe_unused]] bool result = scene->SetSubsystem<EntityContext::SceneStorageType&>(gameEntityContext);
+                AZ_Assert(result, "Unable to register main entity context with the main scene.");
+            }
+            else
             {
-                SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequests::SetSceneForEntityContextId, gameEntityContextId, scene);
+                AZ_Assert(false, "Unable to retrieve the game entity context instance.");
             }
-            AZ_Assert(success, "The application was unable to setup a scene for the game entity context, this should always work");
         }
         else
         {
-            AZ_Assert(false, "%s", createSceneOutcome.GetError().data());
+            AZ_Assert(false, "Unable to create main scene due to: %s", createSceneOutcome.GetError().c_str());
         }
 
     }
 
     void AzFrameworkConfigurationSystemComponent::Deactivate()
     {
-        bool success = false;
-        SceneSystemRequestBus::BroadcastResult(
-            success, &AzFramework::SceneSystemRequestBus::Events::RemoveScene, "default");
-
-        AZ_Assert(success, "\"default\" scene was not removed");
+        [[maybe_unused]] bool success = SceneSystemInterface::Get()->RemoveScene(Scene::MainSceneName);
+        AZ_Assert(success, "Unable to remove the main scene.");
     }
 
     void AzFrameworkConfigurationSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp
index ad3173ed56..60c70a25bb 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp
@@ -18,6 +18,8 @@
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/Debug/Profiler.h>
 #include <AzCore/std/containers/stack.h>
+#include <AzFramework/Scene/Scene.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 #include "EntityContext.h"
 
@@ -37,6 +39,30 @@ namespace AzFramework
         }
     }
 
+    AZStd::shared_ptr<Scene> EntityContext::FindContainingScene(const EntityContextId& contextId)
+    {
+        auto sceneSystem = SceneSystemInterface::Get();
+        AZ_Assert(sceneSystem, "Attempting to retrieve the scene containing a entity context before the scene system is available.");
+
+        AZStd::shared_ptr<Scene> result;
+        sceneSystem->IterateActiveScenes([&result, &contextId](const AZStd::shared_ptr<Scene>& scene)
+            {
+                EntityContext** entityContext = scene->FindSubsystemInScene<EntityContext::SceneStorageType>();
+                if (entityContext && (*entityContext)->GetContextId() == contextId)
+                {
+                    result = scene;
+                    // Result found, returning.
+                    return false;
+                }
+                else
+                {
+                    // No match, continuing to search for containing scene.
+                    return true;
+                }
+            });
+        return result;
+    }
+
     //=========================================================================
     // EntityContext ctor
     //=========================================================================
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h
index f59a40f52b..c44429b6de 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h
@@ -17,6 +17,7 @@
 #include <AzCore/Component/EntityBus.h>
 #include <AzCore/Serialization/ObjectStream.h>
 #include <AzCore/Serialization/IdUtils.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/SliceEntityOwnershipService.h>
 
@@ -27,7 +28,7 @@ namespace AZ
 
 namespace AzFramework
 {
-    class EntityContext;
+    class Scene;
 
     /**
      * Provides services for a group of entities under the umbrella of a given context.
@@ -47,9 +48,11 @@ namespace AzFramework
         , public EntityOwnershipServiceNotificationBus::Handler
     {
     public:
-
         AZ_TYPE_INFO(EntityContext, "{4F98A6B9-C7B5-450E-8A8A-30EEFC411EF5}");
 
+        /// The type used to store entity in AzFramework::Scene.
+        using SceneStorageType = EntityContext*;
+
         EntityContext(AZ::SerializeContext* serializeContext = nullptr);
         EntityContext(const EntityContextId& contextId, AZ::SerializeContext* serializeContext = nullptr);
         EntityContext(const EntityContextId& contextId, AZStd::unique_ptr<EntityOwnershipService> entityOwnershipService,
@@ -75,6 +78,7 @@ namespace AzFramework
         //////////////////////////////////////////////////////////////////////////
 
         static void Reflect(AZ::ReflectContext* context);
+        static AZStd::shared_ptr<Scene> FindContainingScene(const EntityContextId& contextId);
 
     protected:
 
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h
index ac638127ff..eb3a03ab51 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h
@@ -66,6 +66,8 @@ namespace AzFramework
          */
         virtual EntityContextId GetGameEntityContextId() = 0;
 
+        virtual EntityContext* GetGameEntityContextInstance() = 0;
+
         /**
          * Creates an entity in the game context.
          * @param name A name for the new entity.
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h
index 7e75ffffa6..35424fd09c 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h
@@ -52,6 +52,7 @@ namespace AzFramework
         //////////////////////////////////////////////////////////////////////////
         // GameEntityContextRequestBus
         AZ::Uuid GetGameEntityContextId() override { return GetContextId(); }
+        EntityContext* GetGameEntityContextInstance() override { return this; }
         void ResetGameContext() override;
         AZ::Entity* CreateGameEntity(const char* name) override;
         BehaviorEntity CreateGameEntityForBehaviorContext(const char* name) override;
diff --git a/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp
index 6108d401aa..a91b5482b4 100644
--- a/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp
+++ b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp
@@ -12,11 +12,13 @@
 
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/IO/FileIO.h>
+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/string/wildcard.h>
 #include <AzCore/std/string/regex.h>
 #include <AzCore/std/string/conversions.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzCore/XML/rapidxml.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/Asset/FileTagAsset.h>
@@ -31,7 +33,7 @@ namespace AzFramework
         const char* ExcludeFileName = "exclude";
         const char* IncludeFileName = "include";
         const char* FileTags[] = { "ignore", "error", "productdependency", "editoronly", "shader" };
-        const char EngineName[] = "Engine";
+        constexpr AZ::IO::PathView EngineAssetSourceRelPath = "Assets/Engine";
 
         void LowerCaseFileTags(AZStd::vector<AZStd::string>& fileTags)
         {
@@ -107,7 +109,7 @@ namespace AzFramework
         }
 
         AZ::Outcome<AZStd::string, AZStd::string> FileTagManager::AddTagsInternal(AZStd::string filePath, FileTagType fileTagType, AZStd::vector<AZStd::string> fileTags, AzFramework::FileTag::FilePatternType filePatternType)
-        {   
+        {
             if (!NormalizeFileAndLowerCaseTags(filePath, filePatternType, fileTags))
             {
                 return AZ::Failure(AZStd::string::format("Unable to normalize file (%s). Unable to remove the file.\n", filePath.c_str()));
@@ -243,11 +245,10 @@ namespace AzFramework
 
         AZStd::string FileTagQueryManager::GetDefaultFileTagFilePath(FileTagType fileTagType)
         {
-            AZStd::string destinationFilePath;
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            AzFramework::StringFunc::Path::ConstructFull(engineRoot, EngineName, fileTagType == FileTagType::Exclude ? ExcludeFileName : IncludeFileName, AzFramework::FileTag::FileTagAsset::Extension(), destinationFilePath, true);
-            return destinationFilePath;
+            auto destinationFilePath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / EngineAssetSourceRelPath;
+            destinationFilePath /= fileTagType == FileTagType::Exclude ? ExcludeFileName : IncludeFileName;
+            destinationFilePath.ReplaceExtension(AzFramework::FileTag::FileTagAsset::Extension());
+            return destinationFilePath.String();
         }
 
         bool FileTagQueryManager::Load(const AZStd::string& filePath)
diff --git a/Code/Framework/AzFramework/AzFramework/Network/NetBindingComponent.cpp b/Code/Framework/AzFramework/AzFramework/Network/NetBindingComponent.cpp
index c28e020c52..90613daabe 100644
--- a/Code/Framework/AzFramework/AzFramework/Network/NetBindingComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Network/NetBindingComponent.cpp
@@ -44,8 +44,8 @@ namespace AzFramework
                     "Network Binding", "The Network Binding component marks an entity as able to be replicated across the network")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Networking")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/NetBinding.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/NetBinding.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NetBinding.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NetBinding.png")
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-network-binding.html")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
             }
diff --git a/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
index 7e968ffcd8..ea8fd75cfd 100644
--- a/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
+++ b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
@@ -41,9 +41,10 @@ namespace AzFramework::ProjectManager
             // at the end of the function
             AZ::CommandLine commandLine;
             commandLine.Parse(argc, argv);
-            AZ::SettingsRegistryImpl settingsRegistry;
-            // Store the Command line to the Setting Registry
+            AZ::SettingsRegistryMergeUtils::ParseCommandLine(commandLine);
 
+            // Store the Command line to the Setting Registry
+            AZ::SettingsRegistryImpl settingsRegistry;
             AZ::SettingsRegistryMergeUtils::StoreCommandLineToRegistry(settingsRegistry, commandLine);
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(settingsRegistry);
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
@@ -68,7 +69,14 @@ namespace AzFramework::ProjectManager
         // If we were able to locate a path to a project, we're done
         if (!projectRootPath.empty())
         {
-            return ProjectPathCheckResult::ProjectPathFound;
+            AZ::IO::FixedMaxPath projectJsonPath = engineRootPath / projectRootPath / "project.json";
+            if (AZ::IO::SystemFile::Exists(projectJsonPath.c_str()))
+            {
+                return ProjectPathCheckResult::ProjectPathFound;
+            }
+            AZ_TracePrintf(
+                "ProjectManager", "Did not find a project file at location '%s', launching the Project Manager...",
+                projectJsonPath.c_str());
         }
 
         if (LaunchProjectManager(engineRootPath))
diff --git a/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp b/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp
index c9d43b5446..143c1f7916 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp
@@ -14,9 +14,9 @@
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/sort.h>
 
+#include <AzFramework/Entity/EntityContext.h>
 #include <AzFramework/Render/Intersector.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
 #include <AzFramework/Visibility/BoundsBus.h>
 
 #include <algorithm>
@@ -30,11 +30,11 @@ namespace AzFramework
         {
             IntersectorBus::Handler::BusConnect(m_contextId);
             IntersectionNotificationBus::Handler::BusConnect(m_contextId);
-            Scene* scene = nullptr;
-            SceneSystemRequestBus::BroadcastResult(scene, &AzFramework::SceneSystemRequestBus::Events::GetSceneFromEntityContextId, m_contextId);
+
+            AZStd::shared_ptr<Scene> scene = EntityContext::FindContainingScene(m_contextId);
             if (scene)
             {
-                scene->SetSubsystem<IntersectorInterface>(this);
+                scene->SetSubsystem(this);
             }
         }
 
@@ -42,11 +42,12 @@ namespace AzFramework
         {
             IntersectorBus::Handler::BusDisconnect();
             IntersectionNotificationBus::Handler::BusDisconnect();
-            Scene* scene = nullptr;
-            SceneSystemRequestBus::BroadcastResult(scene, &AzFramework::SceneSystemRequestBus::Events::GetSceneFromEntityContextId, m_contextId);
+
+            AZStd::shared_ptr<Scene> scene = EntityContext::FindContainingScene(m_contextId);
             if (scene)
             {
-                scene->UnsetSubsystem<IntersectorInterface>();
+                [[maybe_unused]] bool result = scene->UnsetSubsystem(this);
+                AZ_Assert(result, "Failed to unregister Intersector with scene");
             }
         }
 
diff --git a/Code/Framework/AzFramework/AzFramework/Render/Intersector.h b/Code/Framework/AzFramework/AzFramework/Render/Intersector.h
index 5852310c21..65ba6b0ea9 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/Intersector.h
+++ b/Code/Framework/AzFramework/AzFramework/Render/Intersector.h
@@ -33,6 +33,8 @@ namespace AzFramework
             , protected IntersectionNotificationBus::Handler
         {
         public:
+            AZ_TYPE_INFO(AzFramework::RenderGeometry::Intersector, "{4CCA7971-CD83-4856-ADEA-89CEB41FB197}");
+
             Intersector(AzFramework::EntityContextId contextId);
             ~Intersector();
 
diff --git a/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp b/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp
index 98905b4574..5bdfb94fa1 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp
@@ -14,13 +14,102 @@
 
 namespace AzFramework
 {
-    Scene::Scene(AZStd::string_view name)
-        : m_name(name)
+    Scene::Scene(AZStd::string name)
+        : m_name(AZStd::move(name))
     {
     }
 
-    const AZStd::string& Scene::GetName()
+    Scene::Scene(AZStd::string name, AZStd::shared_ptr<Scene> parent)
+        : m_name(AZStd::move(name))
+        , m_parent(AZStd::move(parent))
+    {
+    }
+
+    Scene::~Scene()
+    {
+        m_removalEvent.Signal(*this, RemovalEventType::Destroyed);
+    }
+
+    const AZStd::string& Scene::GetName() const
     {
         return m_name;
     }
+
+    const AZStd::shared_ptr<Scene>& Scene::GetParent()
+    {
+        return m_parent;
+    }
+
+    AZStd::shared_ptr<const Scene> Scene::GetParent() const
+    {
+        return m_parent;
+    }
+
+    bool Scene::IsAlive() const
+    {
+        return m_isAlive;
+    }
+
+    void Scene::ConnectToEvents(RemovalEvent::Handler& handler)
+    {
+        handler.Connect(m_removalEvent);
+    }
+
+    void Scene::ConnectToEvents(SubsystemEvent::Handler& handler)
+    {
+        handler.Connect(m_subsystemEvent);
+    }
+
+    AZStd::any* Scene::FindSubsystem(const AZ::TypeId& typeId)
+    {
+        AZStd::any* result = FindSubsystemInScene(typeId);
+        return (!result && m_parent) ? m_parent->FindSubsystem(typeId) : result;
+    }
+
+    const AZStd::any* Scene::FindSubsystem(const AZ::TypeId& typeId) const
+    {
+        return const_cast<Scene*>(this)->FindSubsystem(typeId);
+    }
+
+    AZStd::any* Scene::FindSubsystemInScene(const AZ::TypeId& typeId)
+    {
+        // Spot check that the internal arrays remain consistent.
+        AZ_Assert(
+            m_systemKeys.size() == m_systemObjects.size(), "Key and object list in AzFramework::Scene '%s' have gone out of sync.",
+            m_name.c_str());
+
+        const size_t m_systemKeysCount = m_systemKeys.size();
+        for (size_t i = 0; i < m_systemKeysCount; ++i)
+        {
+            if (m_systemKeys[i] != typeId)
+            {
+                continue;
+            }
+            else
+            {
+                return &m_systemObjects[i];
+            }
+        }
+        return nullptr;
+    }
+
+    const AZStd::any* Scene::FindSubsystemInScene(const AZ::TypeId& typeId) const
+    {
+        return const_cast<Scene*>(this)->FindSubsystemInScene(typeId);
+    }
+
+    void Scene::MarkForDestruction()
+    {
+        m_isAlive = false;
+        m_removalEvent.Signal(*this, RemovalEventType::Zombified);
+    }
+
+    void Scene::RemoveSubsystem(size_t index, const AZ::TypeId& subsystemType)
+    {
+        m_systemKeys[index] = m_systemKeys.back();
+        m_systemObjects[index] = AZStd::move(m_systemObjects.back());
+        m_systemKeys.pop_back();
+        m_systemObjects.pop_back();
+        m_subsystemEvent.Signal(*this, SubsystemEventType::Removed, subsystemType);
+    }
 }
diff --git a/Code/Framework/AzFramework/AzFramework/Scene/Scene.h b/Code/Framework/AzFramework/AzFramework/Scene/Scene.h
index 6b365dae0f..78fea316eb 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/Scene.h
+++ b/Code/Framework/AzFramework/AzFramework/Scene/Scene.h
@@ -11,10 +11,14 @@
  */
 #pragma once
 
+#include <AzCore/EBus/Event.h>
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/std/any.h>
 #include <AzCore/std/containers/vector.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/string/string_view.h>
 
 namespace AzFramework
 {
@@ -24,71 +28,100 @@ namespace AzFramework
         AZ_TYPE_INFO(Scene, "{DB449BB3-7A95-434D-BC61-47ACBB1F3436}");
         AZ_CLASS_ALLOCATOR(Scene, AZ::SystemAllocator, 0);
 
-        explicit Scene(AZStd::string_view name);
+        friend class ISceneSystem;
 
-        const AZStd::string& GetName();
+        constexpr static AZStd::string_view MainSceneName = "Main";
+        constexpr static AZStd::string_view EditorMainSceneName = "Editor";
+
+        enum class RemovalEventType
+        {
+            Zombified, // The scene has be marked for destruction and is no longer visible in the scene system.
+            Destroyed, // The scene has been destroyed.
+        };
+        using RemovalEvent = AZ::Event<Scene&, RemovalEventType>;
+        enum class SubsystemEventType
+        {
+            Added,
+            Removed
+        };
+        using SubsystemEvent = AZ::Event<Scene&, SubsystemEventType, const AZ::TypeId&>;
+
+        explicit Scene(AZStd::string name);
+        Scene(AZStd::string name, AZStd::shared_ptr<Scene> parent);
+        ~Scene();
+
+        [[nodiscard]] const AZStd::string& GetName() const;
+
+        [[nodiscard]] const AZStd::shared_ptr<Scene>& GetParent();
+        [[nodiscard]] AZStd::shared_ptr<const Scene> GetParent() const;
+
+        [[nodiscard]] bool IsAlive() const;
+
+        void ConnectToEvents(RemovalEvent::Handler& handler);
+        void ConnectToEvents(SubsystemEvent::Handler& handler);
         
         // Set the instance of a subsystem associated with this scene.
         template <typename T>
-        bool SetSubsystem(T* system);
+        bool SetSubsystem(T&& system);
 
         // Unset the instance of a subsystem associated with this scene.
         template <typename T>
         bool UnsetSubsystem();
 
-        // Get the instance of a subsystem associated with this scene.
+        // Unset the instance of the exact system associated with this scene.
+        // Use this to make sure the expected instance is removed or to make sure type deduction is done in the same way as during setting.
+        template<typename T>
+        bool UnsetSubsystem(const T& system);
+
+        // Get the instance of a subsystem associated with this scene. This call will also look in parent scenes if not found on the target
+        // scene. Returns a pointer to the subsystem if found, otherwise returns a nullptr.
+        [[nodiscard]] AZStd::any* FindSubsystem(const AZ::TypeId& typeId);
+        // Get the instance of a subsystem associated with this scene. This call will also look in parent scenes if not found on the target
+        // scene. Returns a pointer to the subsystem if found, otherwise returns a nullptr.
+        [[nodiscard]] const AZStd::any* FindSubsystem(const AZ::TypeId& typeId) const;
+        // Get the instance of a subsystem associated with this scene. This call will also look in parent scenes if not found on the target
+        // scene. Returns a pointer to the subsystem if found, otherwise returns a nullptr.
         template <typename T>
-        T* GetSubsystem();
+        [[nodiscard]] T* FindSubsystem();
+        // Get the instance of a subsystem associated with this scene. This call will also look in parent scenes if not found on the target
+        // scene. Returns a pointer to the subsystem if found, otherwise returns a nullptr.
+        template<typename T>
+        [[nodiscard]] const T* FindSubsystem() const;
+
+        // Get the instance of a subsystem associated with this scene. This call will only look in the selected scene. Returns a pointer to
+        // the subsystem if found, otherwise returns a nullptr.
+        [[nodiscard]] AZStd::any* FindSubsystemInScene(const AZ::TypeId& typeId);
+        // Get the instance of a subsystem associated with this scene. This call will only look in the selected scene. Returns a pointer to
+        // the subsystem if found, otherwise returns a nullptr.
+        [[nodiscard]] const AZStd::any* FindSubsystemInScene(const AZ::TypeId& typeId) const;
+        // Get the instance of a subsystem associated with this scene. This call will only look in the selected scene. Returns a pointer to
+        // the subsystem if found, otherwise returns a nullptr.
+        template<typename T>
+        [[nodiscard]] T* FindSubsystemInScene();
+        // Get the instance of a subsystem associated with this scene. This call will only look in the selected scene. Returns a pointer to
+        // the subsystem if found, otherwise returns a nullptr.
+        template<typename T>
+        [[nodiscard]] const T* FindSubsystemInScene() const;
 
     private:
+        void MarkForDestruction();
+        void RemoveSubsystem(size_t index, const AZ::TypeId& subsystemType);
 
-        AZStd::string m_name;
+        RemovalEvent m_removalEvent;
+        SubsystemEvent m_subsystemEvent;
 
         // Storing keys separate from data to optimize for fast key search.
         AZStd::vector<AZ::TypeId> m_systemKeys;
-        AZStd::vector<void*> m_systemPointers;
-    };
-    
-    template <typename T>
-    bool Scene::SetSubsystem(T* system)
-    {
-        if (GetSubsystem<T>() != nullptr)
-        {
-            return false;
-        }
-        m_systemKeys.push_back(T::RTTI_Type());
-        m_systemPointers.push_back(system);
-        return true;
-    }
-
-    template <typename T>
-    bool Scene::UnsetSubsystem()
-    {
-        for (size_t i = 0; i < m_systemKeys.size(); ++i)
-        {
-            if (m_systemKeys.at(i) == T::RTTI_Type())
-            {
-                m_systemKeys.at(i) = m_systemKeys.back();
-                m_systemKeys.pop_back();
-                m_systemPointers.at(i) = m_systemPointers.back();
-                m_systemPointers.pop_back();
-                return true;
-            }
-        }
-        return false;
-    }
-
-    template <typename T>
-    T* Scene::GetSubsystem()
-    {
-        for (size_t i = 0; i < m_systemKeys.size(); ++i)
-        {
-            if (m_systemKeys.at(i) == T::RTTI_Type())
-            {
-                return reinterpret_cast<T*>(m_systemPointers.at(i));
-            }
-        }
-        return nullptr;
-    }
+        AZStd::vector<AZStd::any> m_systemObjects;
 
+        // Name that identifies the scene.
+        AZStd::string m_name;
+        // Parent to this scene. Any subsystems are inherited from the parent but can be overwritten locally.
+        AZStd::shared_ptr<Scene> m_parent;
+        // If false, the scene has been removed from scene system and can no longer be found. As soon as all handles to the scene are
+        // released it will be destroyed.
+        bool m_isAlive{ true };
+    };
 } // AzFramework
+
+#include <AzFramework/Scene/Scene.inl>
diff --git a/Code/Framework/AzFramework/AzFramework/Scene/Scene.inl b/Code/Framework/AzFramework/AzFramework/Scene/Scene.inl
new file mode 100644
index 0000000000..360ab93436
--- /dev/null
+++ b/Code/Framework/AzFramework/AzFramework/Scene/Scene.inl
@@ -0,0 +1,108 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+namespace AzFramework
+{
+    template<typename T>
+    bool Scene::SetSubsystem(T&& system)
+    {
+        const AZ::TypeId& targetType = azrtti_typeid<T>();
+        for (const AZ::TypeId& key : m_systemKeys)
+        {
+            if (key == targetType)
+            {
+                return false;
+            }
+        }
+
+        m_systemKeys.push_back(targetType);
+        m_systemObjects.emplace_back(AZStd::forward<T>(system));
+        m_subsystemEvent.Signal(*this, SubsystemEventType::Added, targetType);
+        return true;
+    }
+
+    template<typename T>
+    bool Scene::UnsetSubsystem()
+    {
+        const AZ::TypeId& targetType = azrtti_typeid<T>();
+        const size_t m_systemKeysCount = m_systemKeys.size();
+        for (size_t i = 0; i < m_systemKeysCount; ++i)
+        {
+            if (m_systemKeys[i] != targetType)
+            {
+                continue;
+            }
+            else
+            {
+                RemoveSubsystem(i, targetType);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    template<typename T>
+    bool Scene::UnsetSubsystem([[maybe_unused]] const T& system)
+    {
+        const AZ::TypeId& targetType = azrtti_typeid<T>();
+        const size_t systemKeysCount = m_systemKeys.size();
+        for (size_t i = 0; i < systemKeysCount; ++i)
+        {
+            if (m_systemKeys[i] != targetType)
+            {
+                continue;
+            }
+            else
+            {
+                [[maybe_unused]] T* instance = AZStd::any_cast<T>(&m_systemObjects[i]);
+                AZ_Assert(
+                    instance && *instance == system,
+                    "Subsystem being released matched type, but wasn't pointing to the same system that was stored.");
+                RemoveSubsystem(i, targetType);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    template<typename T>
+    T* Scene::FindSubsystem()
+    {
+        const AZ::TypeId& targetType = azrtti_typeid<T>();
+        AZStd::any* subSystem = FindSubsystem(targetType);
+        return subSystem ? AZStd::any_cast<T>(subSystem) : nullptr;
+    }
+
+    template<typename T>
+    const T* Scene::FindSubsystem() const
+    {
+        const AZ::TypeId& targetType = azrtti_typeid<T>();
+        const AZStd::any* subSystem = FindSubsystem(targetType);
+        return subSystem ? AZStd::any_cast<const T>(subSystem) : nullptr;
+    }
+
+    template<typename T>
+    T* Scene::FindSubsystemInScene()
+    {
+        const AZ::TypeId& targetType = azrtti_typeid<T>();
+        AZStd::any* subSystem = FindSubsystemInScene(targetType);
+        return subSystem ? AZStd::any_cast<T>(subSystem) : nullptr;
+    }
+
+    template<typename T>
+    const T* Scene::FindSubsystemInScene() const
+    {
+        const AZ::TypeId& targetType = azrtti_typeid<T>();
+        const AZStd::any* subSystem = FindSubsystemInScene(targetType);
+        return subSystem ? AZStd::any_cast<const T>(subSystem) : nullptr;
+    }
+} // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemBus.h b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemBus.h
deleted file mode 100644
index c75a8ceb9a..0000000000
--- a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemBus.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzFramework/Entity/EntityContext.h>
-
-namespace AzFramework
-{
-    // Forward declarations
-    class Scene;
-
-    //! Interface used to create, get, or destroy scenes.
-    class SceneSystemRequests
-        : public AZ::EBusTraits
-    {
-    public:
-
-        virtual ~SceneSystemRequests() = default;
-
-        //! Single handler policy since there should only be one instance of this system component.
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-        //! Creates a scene with a given name.
-        //!  - If there is already a scene with the provided name this will return AZ::Failure(). 
-        //!  - If isDefault is set to true and there is already a default scene, the default scene will be switched to this one. 
-        virtual AZ::Outcome<Scene*, AZStd::string> CreateScene(AZStd::string_view name) = 0;
-
-        //! Gets a scene with a given name
-        //!  - If a scene does not exist with the given name, nullptr is returned.
-        virtual Scene* GetScene(AZStd::string_view name) = 0;
-
-        //! Gets all the scenes that currently exist.
-        virtual AZStd::vector<Scene*> GetAllScenes() = 0;
-
-        //! Remove a scene with a given name and return if the operation was successful.
-        //!  - If the removed scene is the default scene, there will no longer be a default scene.
-        virtual bool RemoveScene(AZStd::string_view name) = 0;
-
-        //! Add a mapping from the provided EntityContextId to a Scene
-        //! - If a scene is already associated with this EntityContextId, nothing is changed and false is returned.
-        virtual bool SetSceneForEntityContextId(EntityContextId entityContextId, Scene* scene) = 0;
-
-        //! Remove a mapping from the provided EntityContextId to a Scene
-        //!  - If no scene is found from the provided EntityContextId, false is returned.
-        virtual bool RemoveSceneForEntityContextId(EntityContextId entityContextId, Scene* scene) = 0;
-
-        //! Get the scene associated with an EntityContextId
-        //!  - If no scene is found for the provided EntityContextId, nullptr is returned.
-        virtual Scene* GetSceneFromEntityContextId(EntityContextId entityContextId) = 0;
-    };
-
-    using SceneSystemRequestBus = AZ::EBus<SceneSystemRequests>;
-
-    //! Interface used for notifications from the scene system
-    class SceneSystemNotifications
-        : public AZ::EBusTraits
-    {
-    public:
-
-        virtual ~SceneSystemNotifications() = default;
-
-        //! There can be multiple listeners to changes in the scene system.
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-
-        //! Called when a scene has been created.
-        virtual void SceneCreated(Scene& /*scene*/) {};
-
-        //! Called just before a scene is removed.
-        virtual void SceneAboutToBeRemoved(Scene& /*scene*/) {};
-
-    };
-
-    using SceneSystemNotificationBus = AZ::EBus<SceneSystemNotifications>;
-
-    //! Interface used for notifications about individual scenes
-    class SceneNotifications
-        : public AZ::EBusTraits
-    {
-    public:
-
-        virtual ~SceneNotifications() = default;
-
-        //! There can be multiple listeners to changes in the scene system.
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-
-        //! Bus is listened to using the pointer of the scene
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-
-        //! Specifies that events are addressed by the pointer to the scene
-        using BusIdType = Scene*;
-
-        //! Called just before a scene is removed.
-        virtual void SceneAboutToBeRemoved() {};
-
-        //! Called when an entity context is mapped to this scene.
-        virtual void EntityContextMapped(EntityContextId /*entityContextId*/) {};
-
-        //! Called when an entity context is unmapped from this scene.
-        virtual void EntityContextUnmapped(EntityContextId /*entityContextId*/) {};
-    };
-
-    using SceneNotificationBus = AZ::EBus<SceneNotifications>;
-
-} // AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp
index 909880ff55..e677be4643 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp
@@ -14,7 +14,7 @@
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
-#include <AzFramework/Scene/Scene.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 
 namespace AzFramework
 {
@@ -41,14 +41,10 @@ namespace AzFramework
 
     void SceneSystemComponent::Activate()
     {
-        // Connect busses
-        SceneSystemRequestBus::Handler::BusConnect();
     }
 
     void SceneSystemComponent::Deactivate()
     {
-        // Disconnect Busses
-        SceneSystemRequestBus::Handler::BusDisconnect();
     }
 
     void SceneSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
@@ -61,140 +57,105 @@ namespace AzFramework
         incompatible.push_back(AZ_CRC("SceneSystemComponentService", 0xd8975435));
     }
 
-    AZ::Outcome<Scene*, AZStd::string> SceneSystemComponent::CreateScene(AZStd::string_view name)
+    AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> SceneSystemComponent::CreateScene(AZStd::string_view name)
     {
-        Scene* existingScene = GetScene(name);
+        return CreateSceneWithParent(name, nullptr);
+    }
 
+    AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> SceneSystemComponent::CreateSceneWithParent(
+        AZStd::string_view name, AZStd::shared_ptr<Scene> parent)
+    {
+        const AZStd::shared_ptr<Scene>& existingScene = GetScene(name);
         if (existingScene)
         {
             return AZ::Failure<AZStd::string>("A scene already exists with this name.");
         }
 
-        auto newScene = AZStd::make_unique<Scene>(name);
-        Scene* scenePointer = newScene.get();
-        m_scenes.push_back(AZStd::move(newScene));
-        SceneSystemNotificationBus::Broadcast(&SceneSystemNotificationBus::Events::SceneCreated, *scenePointer);
-        return AZ::Success(scenePointer);
+        auto newScene = AZStd::make_shared<Scene>(name, AZStd::move(parent));
+        m_activeScenes.push_back(newScene);
+        {
+            AZStd::lock_guard lock(m_eventMutex);
+            m_events.Signal(EventType::SceneCreated, newScene);
+        }
+        return AZ::Success(AZStd::move(newScene));
     }
 
-    Scene* SceneSystemComponent::GetScene(AZStd::string_view name)
+    AZStd::shared_ptr<Scene> SceneSystemComponent::GetScene(AZStd::string_view name)
     {
-        auto sceneIterator = AZStd::find_if(m_scenes.begin(), m_scenes.end(),
+        auto sceneIterator = AZStd::find_if(m_activeScenes.begin(), m_activeScenes.end(),
             [name](auto& scene) -> bool
             {
                 return scene->GetName() == name;
             }
         );
 
-        return sceneIterator == m_scenes.end() ? nullptr : sceneIterator->get();
+        return sceneIterator == m_activeScenes.end() ? nullptr : *sceneIterator;
     }
 
-    AZStd::vector<Scene*> SceneSystemComponent::GetAllScenes()
+    void SceneSystemComponent::IterateActiveScenes(const ActiveIterationCallback& callback)
     {
-        AZStd::vector<Scene*> scenes;
-        scenes.resize_no_construct(m_scenes.size());
-
-        for (size_t i = 0; i < m_scenes.size(); ++i)
+        bool keepGoing = true;
+        auto end = m_activeScenes.end();
+        for (auto it = m_activeScenes.begin(); it != end && keepGoing; ++it)
         {
-            scenes.at(i) = m_scenes.at(i).get();
+            keepGoing = callback(*it);
         }
-        return scenes;
     }
 
-    bool SceneSystemComponent::RemoveScene(AZStd::string_view name)
+    void SceneSystemComponent::IterateZombieScenes(const ZombieIterationCallback& callback)
     {
-        for (size_t i = 0; i < m_scenes.size(); ++i)
+        bool keepGoing = true;
+        auto end = m_zombieScenes.end();
+        for (auto it = m_zombieScenes.begin(); it != end && keepGoing;)
         {
-            auto& scenePtr = m_scenes.at(i);
-            if (scenePtr->GetName() == name)
+            if (!it->expired())
             {
-                // Remove any entityContext mappings.
-                Scene* scene = scenePtr.get();
-                for (auto entityContextScenePairIt = m_entityContextToScenes.begin(); entityContextScenePairIt != m_entityContextToScenes.end();)
-                {
-                    AZStd::pair<EntityContextId, Scene*>& pair = *entityContextScenePairIt;
-                    if (pair.second == scene)
-                    {
-                        // swap and pop back.
-                        *entityContextScenePairIt = m_entityContextToScenes.back();
-                        m_entityContextToScenes.pop_back();
-                    }
-                    else
-                    {
-                        ++entityContextScenePairIt;
-                    }
-                }
-
-                SceneSystemNotificationBus::Broadcast(&SceneSystemNotificationBus::Events::SceneAboutToBeRemoved, *scene);
-                SceneNotificationBus::Event(scene, &SceneNotificationBus::Events::SceneAboutToBeRemoved);
-
-                m_scenes.erase(&scenePtr);
-                return true;
+                keepGoing = callback(*(it->lock()));
+                ++it;
+            }
+            else
+            {
+                *it = m_zombieScenes.back();
+                m_zombieScenes.pop_back();
+                end = m_zombieScenes.end();
             }
         }
-
-        AZ_Warning("SceneSystemComponent", false, "Attempting to remove scene name \"%.*s\", but that scene was not found.", static_cast<int>(name.size()), name.data());
-        return false;
-    }
-
-    bool SceneSystemComponent::SetSceneForEntityContextId(EntityContextId entityContextId, Scene* scene)
-    {
-        Scene* existingSceneForEntityContext = GetSceneFromEntityContextId(entityContextId);
-        if (existingSceneForEntityContext)
-        {
-            // This entity context is already mapped and must be unmapped explictely before it can be changed.
-            char entityContextIdString[EntityContextId::MaxStringBuffer];
-            entityContextId.ToString(entityContextIdString, sizeof(entityContextIdString));
-            AZ_Warning("SceneSystemComponent", false, "Failed to set a scene for entity context %s, scene is already set for that entity context.", entityContextIdString);
-
-            return false;
-        }
-        m_entityContextToScenes.emplace_back(entityContextId, scene);
-        SceneNotificationBus::Event(scene, &SceneNotificationBus::Events::EntityContextMapped, entityContextId);
-        return true;
     }
 
-    bool SceneSystemComponent::RemoveSceneForEntityContextId(EntityContextId entityContextId, Scene* scene)
+    bool SceneSystemComponent::RemoveScene(AZStd::string_view name)
     {
-        if (!scene || entityContextId.IsNull())
-        {
-            return false;
-        }
-
-        for (auto entityContextScenePairIt = m_entityContextToScenes.begin(); entityContextScenePairIt != m_entityContextToScenes.end();)
+        for (AZStd::shared_ptr<Scene>& scene : m_activeScenes)
         {
-            AZStd::pair<EntityContextId, Scene*>& pair = *entityContextScenePairIt;
-            if (!(pair.first == entityContextId && pair.second == scene))
-            {
-                ++entityContextScenePairIt;
-            }
-            else
+            if (scene->GetName() == name)
             {
-                // swap and pop back.
-                *entityContextScenePairIt = m_entityContextToScenes.back();
-                m_entityContextToScenes.pop_back();
+                MarkSceneForDestruction(*scene);
+                {
+                    AZStd::lock_guard lock(m_eventMutex);
+                    m_events.Signal(EventType::ScenePendingRemoval, scene);
+                }
 
-                SceneNotificationBus::Event(scene, &SceneNotificationBus::Events::EntityContextUnmapped, entityContextId);
+                // Zombies are weak pointers that are kept around for situations where there's a delay in deleting the scene. This can happen
+                // if there are outstanding calls like in-progress async calls or resources locked by hardware. A weak_ptr of the original
+                // scene is kept so the zombie scene can still be found through iteration as it may require additional calls such as Tick calls.
+                m_zombieScenes.push_back(scene);
+                scene = AZStd::move(m_activeScenes.back());
+                m_activeScenes.pop_back();
+                // The scene may not be held onto anymore, so check here to see if the previously added zombie can be released.
+                if (m_zombieScenes.back().expired())
+                {
+                    m_zombieScenes.pop_back();
+                }
                 return true;
             }
         }
 
-        char entityContextIdString[EntityContextId::MaxStringBuffer];
-        entityContextId.ToString(entityContextIdString, sizeof(entityContextIdString));
-        AZ_Warning("SceneSystemComponent", false, "Failed to remove scene \"%.*s\" for entity context %s, entity context is not currently mapped to that scene.", static_cast<int>(scene->GetName().size()), scene->GetName().data(), entityContextIdString);
+        AZ_Warning("SceneSystemComponent", false, R"(Attempting to remove scene name "%.*s", but that scene was not found.)", AZ_STRING_ARG(name));
         return false;
     }
 
-    Scene* SceneSystemComponent::GetSceneFromEntityContextId(EntityContextId entityContextId)
+    void SceneSystemComponent::ConnectToEvents(SceneEvent::Handler& handler)
     {
-        for (AZStd::pair<EntityContextId, Scene*>& pair : m_entityContextToScenes)
-        {
-            if (pair.first == entityContextId)
-            {
-                return pair.second;
-            }
-        }
-        return nullptr;
+        AZStd::lock_guard lock(m_eventMutex);
+        handler.Connect(m_events);
     }
-
-} // AzFramework
+} // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h
index 085efcd898..a5497bdb87 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h
@@ -13,18 +13,18 @@
 
 #include <AzCore/Component/Component.h>
 #include <AzCore/std/containers/map.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzCore/std/parallel/mutex.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <AzFramework/Entity/EntityContext.h>
 
 namespace AzFramework
 {
     class SceneSystemComponent
         : public AZ::Component
-        , public SceneSystemRequestBus::Handler
+        , public SceneSystemInterface::Registrar
     {
     public:
-
-        AZ_COMPONENT(SceneSystemComponent, "{7AC53AF0-BE1A-437C-BE3E-4D6A998DA945}", AZ::Component);
+        AZ_COMPONENT(SceneSystemComponent, "{7AC53AF0-BE1A-437C-BE3E-4D6A998DA945}", AZ::Component, ISceneSystem);
 
         SceneSystemComponent();
         ~SceneSystemComponent() override;
@@ -41,24 +41,26 @@ namespace AzFramework
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         //////////////////////////////////////////////////////////////////////////
-        // SceneSystemRequestsBus::Handler
+        // SceneSystemInterface overrides
         //////////////////////////////////////////////////////////////////////////
-        AZ::Outcome<Scene*, AZStd::string> CreateScene(AZStd::string_view name) override;
-        Scene* GetScene(AZStd::string_view name) override;
-        AZStd::vector<Scene*> GetAllScenes() override;
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> CreateScene(AZStd::string_view name) override;
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> CreateSceneWithParent(
+            AZStd::string_view name, AZStd::shared_ptr<Scene> parent) override;
+        [[nodiscard]] AZStd::shared_ptr<Scene> GetScene(AZStd::string_view name) override;
+        void IterateActiveScenes(const ActiveIterationCallback& callback) override;
+        void IterateZombieScenes(const ZombieIterationCallback& callback) override;
         bool RemoveScene(AZStd::string_view name) override;
-        bool SetSceneForEntityContextId(EntityContextId entityContextId, Scene* scene) override;
-        bool RemoveSceneForEntityContextId(EntityContextId entityContextId, Scene* scene) override;
-        Scene* GetSceneFromEntityContextId(EntityContextId entityContextId) override;
+        void ConnectToEvents(SceneEvent::Handler& handler) override;
 
     private:
+        AZ_DISABLE_COPY_MOVE(SceneSystemComponent);
 
-        AZ_DISABLE_COPY(SceneSystemComponent);
-
-        // Container of scene in order of creation
-        AZStd::vector<AZStd::unique_ptr<Scene>> m_scenes;
-
-        // Map of entity context Ids to scenes. Using a vector because lookups will be common, but the size will be small.
-        AZStd::vector<AZStd::pair<EntityContextId, Scene*>> m_entityContextToScenes;
+        AZStd::vector<AZStd::shared_ptr<Scene>> m_activeScenes;
+        AZStd::vector<AZStd::weak_ptr<Scene>> m_zombieScenes;
+        // Using a mutex around the events as other threads may respond to a new/deleted scene by making
+        // local updates and unregistering themselves. Since Scene is single threaded, no updates (other
+        // then unregistering an event) should be done from other threads though.
+        AZStd::recursive_mutex m_eventMutex;
+        SceneEvent m_events;
     };
 }
diff --git a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemInterface.h b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemInterface.h
new file mode 100644
index 0000000000..48dca7ed29
--- /dev/null
+++ b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemInterface.h
@@ -0,0 +1,88 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/EBus/Event.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/functional.h>
+#include <AzFramework/Entity/EntityContext.h>
+#include <AzFramework/Scene/Scene.h>
+
+namespace AzFramework
+{
+    //! Interface used to create, get, or destroy scenes.
+    //! This interface is single thread and is intended to be called from a single thread, commonly the main thread. The exception
+    //! is connecting events, which is thread safe.
+    class ISceneSystem
+    {
+    public:
+        AZ_RTTI(AzFramework::ISceneSystem, "{DAE482A8-88AE-4BD3-8A5B-52D19A96E15F}");
+        AZ_DISABLE_COPY_MOVE(ISceneSystem);
+
+        enum class EventType
+        {
+            SceneCreated,
+            ScenePendingRemoval
+        };
+        using SceneEvent = AZ::Event<EventType, const AZStd::shared_ptr<Scene>&>;
+
+        ISceneSystem() = default;
+        virtual ~ISceneSystem() = default;
+
+        using ActiveIterationCallback = AZStd::function<bool(const AZStd::shared_ptr<Scene>& scene)>;
+        using ZombieIterationCallback = AZStd::function<bool(Scene& scene)>;
+
+        //! Creates a scene with a given name.
+        //!  - If there is already a scene with the provided name this will return AZ::Failure(). 
+        virtual AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> CreateScene(AZStd::string_view name) = 0;
+
+        //! Creates a scene with a given name and a parent.
+        //!  - If there is already a scene with the provided name this will return AZ::Failure().
+        virtual AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> CreateSceneWithParent(
+            AZStd::string_view name, AZStd::shared_ptr<Scene> parent) = 0;
+
+        //! Gets a scene with a given name
+        //!  - If a scene does not exist with the given name, nullptr is returned.
+        [[nodiscard]] virtual AZStd::shared_ptr<Scene> GetScene(AZStd::string_view name) = 0;
+
+        //! Iterates over all scenes that are in active use. Iteration stops if the callback returns false or all scenes have been listed.
+        virtual void IterateActiveScenes(const ActiveIterationCallback& callback) = 0;
+        //! Iterates over all zombie scenes. Zombie scenes are scenes that have been removed but still have references held on to. This can
+        //! happen because scenes hold on to subsystems that can't immediately be deleted. These subsystems may still require being called
+        //! such as a periodic tick. Iteration stops if the callback returns false or all scenes have been listed.
+        virtual void IterateZombieScenes(const ZombieIterationCallback& callback) = 0;
+
+        //! Remove a scene with a given name and return if the operation was successful.
+        virtual bool RemoveScene(AZStd::string_view name) = 0;
+
+        //! Connects the provided handler to the events that are called after scenes are created or before they get removed.
+        virtual void ConnectToEvents(SceneEvent::Handler& handler) = 0;
+
+    protected:
+        // Strictly a forwarding function to call private functions on the scene.
+        void MarkSceneForDestruction(Scene& scene) { scene.MarkForDestruction(); }
+    };
+
+    using SceneSystemInterface = AZ::Interface<ISceneSystem>;
+
+    // EBus wrapper for ScriptCanvas
+    class ISceneSystemRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+    };
+    using ILoggerRequestBus = AZ::EBus<ISceneSystem, ISceneSystemRequests>;
+} // AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
index 735757db7d..b3ba1568bd 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
@@ -81,7 +81,7 @@ namespace AzFramework
 
     const char* SpawnableAssetHandler::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/Viewport/EntityInSlice.png";
+        return "Icons/Components/Viewport/EntityInSlice.png";
     }
 
     void SpawnableAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
diff --git a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
index 312a3766ac..b126a192ac 100644
--- a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
+++ b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
@@ -194,10 +194,11 @@ set(FILES
     Logging/MissingAssetLogger.h
     Logging/MissingAssetNotificationBus.h
     Scene/Scene.h
+    Scene/Scene.inl
     Scene/Scene.cpp
-    Scene/SceneSystemBus.h
     Scene/SceneSystemComponent.h
     Scene/SceneSystemComponent.cpp
+    Scene/SceneSystemInterface.h
     Script/ScriptComponent.h
     Script/ScriptComponent.cpp
     Script/ScriptDebugAgentBus.h
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp
index 713c486ac4..8bba64c2d9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp
@@ -250,9 +250,9 @@ namespace AzQtComponents
             // STYLESHEETIMAGES:something.txt
             // UI:blah/blah.png
             // EDITOR:blah/something.txt
-            QDir::addSearchPath("STYLESHEETIMAGES", appPath.filePath("Editor/Styles/StyleSheetImages"));
-            QDir::addSearchPath("UI", appPath.filePath("Editor/UI"));
-            QDir::addSearchPath("EDITOR", appPath.filePath("Editor"));
+            QDir::addSearchPath("STYLESHEETIMAGES", appPath.filePath("Assets/Editor/Styles/StyleSheetImages"));
+            QDir::addSearchPath("UI", appPath.filePath("Assets/Editor/UI"));
+            QDir::addSearchPath("EDITOR", appPath.filePath("Assets/Editor"));
         }
     }
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss
index 3542aa4764..76f834bf70 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss
@@ -24,5 +24,5 @@ QProgressBar
 
 QProgressBar::chunk
 {
-    background: #54AFD0;
+    background: #1E70EB;
 }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini
index c88d0f61ee..34c084b0f2 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini
@@ -13,14 +13,14 @@ Width=24;
 ArrowWidth=10;
 
 [PrimaryColorSet]
-Disabled\Start=#7092A7
-Disabled\End=#7092A7
-Sunken\Start=#0073BB
-Sunken\End=#0073BB
-Hovered\Start=#44BAFF
-Hovered\End=#4AB2F8
+Disabled\Start=#2A4875
+Disabled\End=#2A4875
+Sunken\Start=#1E70EB
+Sunken\End=#1E70EB
+Hovered\Start=#4ABAFF
+Hovered\End=#94D2FF
 Normal\Start=#0095F2
-Normal\End=#0073BB
+Normal\End=#1E70EB
 
 [SecondaryColorSet]
 Disabled\Start=#666666
@@ -42,10 +42,10 @@ Color=#3D000000
 
 [FocusedBorder]
 Thickness=1
-Color=#00A1C9
+Color=#4B8CEF
 
 [IconButton]
-ActiveColor=#00A1C9
+ActiveColor=#1E70EB
 DisabledColor=#999999
 SelectedColor=#FFFFFF
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderConfig.ini b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderConfig.ini
index 44f4f6d093..018f29ed41 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderConfig.ini
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderConfig.ini
@@ -12,7 +12,7 @@ HandleBorder\Color=#FFFFFF
 HandleBorder\Radius=1.5
 
 [Slider]
-Handle\Color=#0185D7
+Handle\Color=#1E70EB
 Handle\ColorDisabled=#999999
 Handle\Size=12
 Handle\SizeMinusMargin=8
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp
index b88209a36b..377f5ecdcf 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp
@@ -46,7 +46,7 @@ namespace AzQtComponents
     Text::Config Text::defaultConfig()
     {
         Config config;
-        config.hyperlinkColor = QStringLiteral("#44B2F8");
+        config.hyperlinkColor = QStringLiteral("#94D2FF");
 
         return config;
     }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TextConfig.ini b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TextConfig.ini
index 450636e220..3755b61867 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TextConfig.ini
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TextConfig.ini
@@ -1,2 +1,2 @@
 [Hyperlink]
-Color=#44B2F8
+Color=#94D2FF
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/off-focus.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/off-focus.svg
index c7bf13420c..5e862d9604 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/off-focus.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/off-focus.svg
@@ -4,7 +4,7 @@
     <title>Selection Controls / Checkbox / Off</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Off" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="checkbox-(off)" stroke="#00A1C9">
+        <g id="checkbox-(off)" stroke="#4B8CEF">
             <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape"></path>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-disabled.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-disabled.svg
index 020514b9bf..64115f629b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-disabled.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-disabled.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#7092A7"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#2A4875"></path>
             <polygon id="Path" fill="#BBBBBB" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-focus.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-focus.svg
index 03971b4ea2..b3b05d969b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-focus.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-focus.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
             <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on.svg
index 8c2f963403..315d34f8cb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#0073BB"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#1E70EB"></path>
             <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-disabled.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-disabled.svg
index b0bca84b49..1d409abff8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-disabled.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-disabled.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <rect id="Rectangle-10" fill="#7092A7" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#2A4875" x="0" y="0" width="16" height="16" rx="2"></rect>
             <rect id="Rectangle-9" fill="#BBBBBB" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-focus.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-focus.svg
index dd789a8782..d5e4faaaf6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-focus.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-focus.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
             <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected.svg
index 643f35f357..58c853e9db 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <rect id="Rectangle-10" fill="#0073BB" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#1E70EB" x="0" y="0" width="16" height="16" rx="2"></rect>
             <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-disabled.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-disabled.svg
index 3c05726f2d..8f289a1830 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-disabled.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-disabled.svg
@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / On - Disabled</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" fill="#7092A7" cx="8" cy="8" r="8"></circle>
+        <circle id="Oval" fill="#2A4875" cx="8" cy="8" r="8"></circle>
         <circle id="Oval" fill="#BBBBBB" cx="8" cy="8" r="4"></circle>
     </g>
 </svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-focus.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-focus.svg
index a533b695b0..d50ffa172d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-focus.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-focus.svg
@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / On-focus</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" stroke="#00A1C9" fill="#0073BB" cx="9" cy="9" r="8.5"></circle>
+        <circle id="Oval" stroke="#4B8CEF" fill="#1E70EB" cx="9" cy="9" r="8.5"></circle>
         <circle id="Oval" fill="#FFFFFF" cx="9" cy="9" r="4"></circle>
     </g>
 </svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked.svg
index 40d64f6a8c..b151a8aae3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="radio-button-(on)">
-            <circle id="Oval" fill="#0073BB" cx="8" cy="8" r="8"></circle>
+            <circle id="Oval" fill="#1E70EB" cx="8" cy="8" r="8"></circle>
             <circle id="Oval" fill="#FFFFFF" cx="8" cy="8" r="4"></circle>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/unchecked-focus.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/unchecked-focus.svg
index e636dc38cd..818416abb7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/unchecked-focus.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/unchecked-focus.svg
@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / Off-focus</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#00A1C9">
+        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#4B8CEF">
             <circle id="Oval" cx="8" cy="8" r="8.5"></circle>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-disabled.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-disabled.svg
index c1582c8cdf..0c869ef0ce 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-disabled.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-disabled.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#7092A7"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#2A4875"></path>
             <circle id="knob" fill="#BBBBBB" cx="24" cy="8" r="6"></circle>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-focus.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-focus.svg
index c28ccf7b0c..9f4f07f804 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-focus.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-focus.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#4B8CEF" fill="#1E70EB"></path>
             <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked.svg
index 9a5b898e9c..11048a512a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#0073BB"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#1E70EB"></path>
             <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/unchecked-focus.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/unchecked-focus.svg
index 046789536b..981467aa3b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/unchecked-focus.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/unchecked-focus.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(off)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#00A1C9"></path>
+            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#4B8CEF"></path>
             <circle id="knob" fill="#FFFFFF" cx="8" cy="8" r="6"></circle>
         </g>
     </g>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/loading.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/loading.svg
index d24c0c2b12..7f6fcc2175 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/loading.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/loading.svg
@@ -1,6 +1,6 @@
  <svg version="1.1" class="loader" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
  width="40px" height="40px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-  <path fill="#54AFD0" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
+  <path fill="#1E70EB" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
     <animateTransform attributeType="xml"
       attributeName="transform"
       type="rotate"
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
index f9e601fb6d..1e8ddb43e0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
@@ -388,8 +388,8 @@
     <file>img/line.png</file>
 </qresource>
 <qresource>
-    <file alias="Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file>
-    <file alias="Editor/Style/NewEditorStylesheet.qss">../../../../Sandbox/Editor/Style/NewEditorStylesheet.qss</file>
+    <file alias="Assets/Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file>
+    <file alias="Assets/Editor/Style/NewEditorStylesheet.qss">../../../../Sandbox/Editor/Style/NewEditorStylesheet.qss</file>
 </qresource>
 <qresource prefix="/Cards">
     <file>img/UI20/Cards/point_hand.png</file>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
index 50315e9d7a..e77704c920 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
@@ -284,6 +284,10 @@ namespace AzToolsFramework
     void ToolsApplication::Start(const Descriptor& descriptor, const StartupParameters& startupParameters/* = StartupParameters()*/)
     {
         Application::Start(descriptor, startupParameters);
+        if (!m_isStarted)
+        {
+            return;
+        }
 
         m_editorEntityManager.Start();
 
@@ -671,20 +675,8 @@ namespace AzToolsFramework
         // if the new viewport interaction model is enabled we do not want to
         // filter out locked entities as this breaks with the logic of being
         // able to select locked entities in the entity outliner
-        if (IsNewViewportInteractionModelEnabled())
-        {
-            selectedEntitiesFiltered.insert(
-                selectedEntitiesFiltered.begin(), selectedEntities.begin(), selectedEntities.end());
-        }
-        else
-        {
-            for (AZ::EntityId nowSelectedId : selectedEntities)
-            {
-                AZ_Assert(nowSelectedId.IsValid(), "Invalid entity Id being marked as selected.");
-
-                selectedEntitiesFiltered.push_back(nowSelectedId);
-            }
-        }
+        selectedEntitiesFiltered.insert(
+            selectedEntitiesFiltered.begin(), selectedEntities.begin(), selectedEntities.end());
 
         EntityIdList newlySelectedIds;
         EntityIdList newlyDeselectedIds;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
index f02e87bb86..5cdd028bbb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
@@ -216,14 +216,9 @@ namespace AzToolsFramework::AssetUtils
         constexpr const char* AssetProcessorGamePlatformConfigFileName = "AssetProcessorGamePlatformConfig.ini";
         constexpr const char* AssetProcessorGamePlatformConfigSetreg = "AssetProcessorGamePlatformConfig.setreg";
         AZStd::vector<AZ::IO::Path> configFiles;
-        AZ::IO::Path configRoot(engineRoot);
 
-        AZ::IO::Path rootConfigFile = configRoot / AssetProcessorPlatformConfigFileName;
-        configFiles.push_back(rootConfigFile);
-
-        // Add a file entry for the Engine Root AssetProcessor setreg file
-        rootConfigFile = configRoot / AssetProcessorPlatformConfigSetreg;
-        configFiles.push_back(rootConfigFile);
+        // Add the AssetProcessorPlatformConfig setreg file at the engine root
+        configFiles.push_back(AZ::IO::Path(engineRoot) / AssetProcessorPlatformConfigSetreg);
 
         if (addPlatformConfigs)
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
index 1a55e162b9..8d3513cbcb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
@@ -200,67 +200,67 @@ namespace AzToolsFramework
             {
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".abc"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/ABC_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/ABC_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".bnk"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Audio_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Audio_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".cgf"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/LegacyMesh_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/LegacyMesh_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".font"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Font_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Font_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".fontfamily"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Font_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Font_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".i_caf"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/LegacyAnimation_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/LegacyAnimation_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".inputbindings"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/InputBindings_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/InputBindings_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".lua"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Lua_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Lua_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".mtl"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Material_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Material_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str()))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Slice_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Slice_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".skin"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/LegacySkin_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/LegacySkin_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".ttf"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Font_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Font_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".xml"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/XML_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/XML_16.svg");
                 }
 
 
@@ -272,7 +272,7 @@ namespace AzToolsFramework
                     const char* sourceFormatExtension = sourceFormats[sourceImageFormatIndex];
                     if (AzFramework::StringFunc::Equal(extension.c_str(), sourceFormatExtension))
                     {
-                        return SourceFileDetails("Editor/Icons/AssetBrowser/Image_16.svg");
+                        return SourceFileDetails("Icons/AssetBrowser/Image_16.svg");
                     }
                 }
             }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
index ada961711a..bd5ba48d8d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
@@ -52,17 +52,16 @@ namespace AzToolsFramework
             return AssetEntryType::Root;
         }
 
-        void RootAssetBrowserEntry::Update(const char* devPath)
+        void RootAssetBrowserEntry::Update(const char* enginePath)
         {
             RemoveChildren();
             EntryCache::GetInstance()->Clear();
-            m_scanFolderOutputPrefixMap.clear();
 
-            m_devPath = devPath;
+            m_enginePath = enginePath;
 
             // there is no "Gems" scan folder registered in db, create one manually
             auto gemFolder = aznew FolderAssetBrowserEntry();
-            gemFolder->m_name = m_devPath + AZ_CORRECT_DATABASE_SEPARATOR + GEMS_FOLDER_NAME;
+            gemFolder->m_name = m_enginePath + AZ_CORRECT_DATABASE_SEPARATOR + GEMS_FOLDER_NAME;
             gemFolder->m_displayName = GEMS_FOLDER_NAME;
             gemFolder->m_isGemsFolder = true;
             AddChild(gemFolder);
@@ -90,11 +89,6 @@ namespace AzToolsFramework
                 scanFolder->m_displayName = QString::fromUtf8(scanFolderDatabaseEntry.m_displayName.c_str());
                 EntryCache::GetInstance()->m_scanFolderIdMap[scanFolderDatabaseEntry.m_scanFolderID] = scanFolder;
             }
-
-            if (!scanFolderDatabaseEntry.m_outputPrefix.empty())
-            {
-                m_scanFolderOutputPrefixMap[scanFolderDatabaseEntry.m_scanFolderID] = scanFolderDatabaseEntry.m_outputPrefix;
-            }
         }
 
         void RootAssetBrowserEntry::AddFile(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry)
@@ -132,7 +126,7 @@ namespace AzToolsFramework
                 return;
             }
 
-            const char* filePath = GetScanFolderOutputAdjustedPath(fileDatabaseEntry, scanFolder);
+            const char* filePath = fileDatabaseEntry.m_fileName.c_str();
 
             AssetBrowserEntry* file;
             // file can be either folder or actual file
@@ -441,33 +435,5 @@ namespace AzToolsFramework
         {
             return MAKE_TKEY(ThumbnailKey);
         }
-
-        const char* RootAssetBrowserEntry::GetScanFolderOutputAdjustedPath(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry, const AssetBrowserEntry* scanFolder)
-        {
-            Q_UNUSED(scanFolder);
-
-            const char* filePath = fileDatabaseEntry.m_fileName.c_str();
-
-            // adjust for output prefixes on scan folders (i.e. "editor")
-            auto itScanFolderOutputPrefix = m_scanFolderOutputPrefixMap.find(fileDatabaseEntry.m_scanFolderPK);
-            if (itScanFolderOutputPrefix != m_scanFolderOutputPrefixMap.end())
-            {
-                const AZStd::string& outputPrefix = itScanFolderOutputPrefix->second;
-
-                // Check if the input path starts with the output prefix.
-                // If it doesn't, something probably went seriously wrong,
-                // or someone is calling this function with an absolute path.
-                bool pathStartsWithPrefix = ((strncmp(filePath, outputPrefix.c_str(), outputPrefix.length()) == 0) && (fileDatabaseEntry.m_fileName.length() > (outputPrefix.length() + 1)));
-                AZ_Warning("Asset Browser", pathStartsWithPrefix, "Entry %s reported as under a ScanFolder (%s) with an 'output=%s', but the new entry does not begin with the output prefix! RootAssetBrowserEntry::GetScanFolderOutputAdjustedPath expects relative paths, not absolute; treating the input path as if it does not contain the ScanFolder output prefix.", filePath, scanFolder->m_name.c_str(), outputPrefix.c_str());
-
-                if (pathStartsWithPrefix)
-                {
-                    // move the beginning ahead by the output prefix plus the separator
-                    filePath += (outputPrefix.length() + 1);
-                }
-            }
-
-            return filePath;
-        }
     } // namespace AssetBrowser
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h
index 44fe454e2d..14c66cb7dd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h
@@ -60,8 +60,8 @@ namespace AzToolsFramework
 
             AssetEntryType GetEntryType() const override;
 
-            //! Update root node to new dev location
-            void Update(const char* devPath);
+            //! Update root node to new engine location
+            void Update(const char* enginePath);
 
             void AddScanFolder(const AssetDatabase::ScanFolderDatabaseEntry& scanFolderDatabaseEntry);
             void AddFile(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry);
@@ -82,15 +82,12 @@ namespace AzToolsFramework
         private:
             AZ_DISABLE_COPY_MOVE(RootAssetBrowserEntry);
 
-            AZStd::string m_devPath;
-            AZStd::unordered_map<AZ::s64, AZStd::string> m_scanFolderOutputPrefixMap;
+            AZStd::string m_enginePath;
 
             //! Create folder entry child
             FolderAssetBrowserEntry* CreateFolder(const char* folderName, AssetBrowserEntry* parent);
             //! Recursively create folder structure leading to relative path from parent
             AssetBrowserEntry* CreateFolders(const char* relativePath, AssetBrowserEntry* parent);
-            //! Get the path for the fileDatabaseEntry, offset by the output prefix for the scan folder ancestor, if it's been specified and if it's appropriate
-            const char* GetScanFolderOutputAdjustedPath(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry, const AssetBrowserEntry* scanFolder);
 
             bool m_isInitialUpdate = false;
         };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp
index 47b15101ee..71bac86c0a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp
@@ -10,8 +10,8 @@
 *
 */
 
+#include <AzCore/Utils/Utils.h>
 #include <AzCore/Debug/Trace.h>
-#include <AzCore/StringFunc/StringFunc.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <QPixmap>
@@ -50,11 +50,11 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // FolderThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static constexpr const char* FolderIconPath = "Editor/Icons/AssetBrowser/Folder_16.svg";
-        static constexpr const char* GemIconPath = "Editor/Icons/AssetBrowser/GemFolder_16.svg";
+        static constexpr const char* FolderIconPath = "Assets/Editor/Icons/AssetBrowser/Folder_16.svg";
+        static constexpr const char* GemIconPath = "Assets/Editor/Icons/AssetBrowser/GemFolder_16.svg";
 
-        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {}
 
         void FolderThumbnail::LoadThread()
@@ -62,14 +62,10 @@ namespace AzToolsFramework
             auto folderKey = azrtti_cast<const FolderThumbnailKey*>(m_key.data());
             AZ_Assert(folderKey, "Incorrect key type, excpected FolderThumbnailKey");
 
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            AZ_Assert(engineRoot, "Engine Root not initialized");
             const char* folderIcon = folderKey->IsGem() ? GemIconPath : FolderIconPath;
-            AZStd::string absoluteIconPath;
-            AZ::StringFunc::Path::Join(engineRoot, folderIcon, absoluteIconPath);
-
-            m_icon = QIcon(absoluteIconPath.c_str());
+            auto absoluteIconPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / folderIcon;
+            m_pixmap.load(absoluteIconPath.c_str());
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h
index d1f0a3d7b3..2e984ff8dc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h
@@ -47,7 +47,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            FolderThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            FolderThumbnail(SharedThumbnailKey key);
             void LoadThread() override;
         };
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
index 9994b19bb1..236c66ef2e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
@@ -55,10 +55,10 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // ProductThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static const char* DEFAULT_PRODUCT_ICON_PATH = "Editor/Icons/AssetBrowser/DefaultProduct_16.svg";
+        static const char* DEFAULT_PRODUCT_ICON_PATH = "Icons/AssetBrowser/DefaultProduct_16.svg";
 
-        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
         {}
 
         void ProductThumbnail::LoadThread() 
@@ -96,12 +96,8 @@ namespace AzToolsFramework
                 iconPath = QString::fromUtf8(DEFAULT_PRODUCT_ICON_PATH);
             }
 
-            m_icon = QIcon(iconPath);
-
-            if (m_icon.isNull())
-            {
-                m_state = State::Failed;
-            }
+            m_pixmap.load(iconPath);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h
index 5eb16dd436..5aed8e0043 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h
@@ -44,7 +44,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            ProductThumbnail(Thumbnailer::SharedThumbnailKey key);
 
         protected:
             void LoadThread() override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
index 547c64a75d..57a6734d77 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
@@ -55,11 +55,11 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // SourceThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static constexpr const char* DefaultFileIconPath = "Editor/Icons/AssetBrowser/Default_16.svg";
+        static constexpr const char* DefaultFileIconPath = "Icons/AssetBrowser/Default_16.svg";
         QMutex SourceThumbnail::m_mutex;
 
-        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {
         }
 
@@ -124,7 +124,8 @@ namespace AzToolsFramework
                 iconPathToUse = iconPath.c_str();
             }
 
-            m_icon = QIcon(iconPathToUse);
+            m_pixmap.load(iconPathToUse);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h
index 41cbd4b254..81afd334c3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h
@@ -44,7 +44,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            SourceThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            SourceThumbnail(SharedThumbnailKey key);
 
         protected:
             void LoadThread() override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
index c1ba5ae9ce..e8abaebd6f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
@@ -140,7 +140,7 @@ namespace AzToolsFramework
             else
             {
                 // Scaling and centering pixmap within bounds to preserve aspect ratio
-                const QPixmap pixmap = thumbnail->GetPixmap(size).scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                const QPixmap pixmap = thumbnail->GetPixmap().scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
                 const QSize sizeDelta = size - pixmap.size();
                 const QPoint pointDelta = QPoint(sizeDelta.width() / 2, sizeDelta.height() / 2);
                 painter->drawPixmap(point + pointDelta, pixmap);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
index 61e144d338..95319d2e6b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
@@ -17,7 +17,7 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/std/parallel/thread.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzFramework/Asset/AssetBundleManifest.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzFramework/API/ApplicationAPI.h>
@@ -250,7 +250,7 @@ namespace AzToolsFramework
         AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
         AZ_Assert(fileIO != nullptr, "AZ::IO::FileIOBase must be ready for use.\n");
 
-        AZStd::string bundleFilePath = assetBundleSettings.m_bundleFilePath;
+        AZ::IO::Path bundleFilePath = AZ::IO::Path(AZStd::string_view{ AZ::Utils::GetEnginePath() }) / assetBundleSettings.m_bundleFilePath;
 
         AzFramework::PlatformId platformId = static_cast<AzFramework::PlatformId>(AzFramework::PlatformHelper::GetPlatformIndexFromName(assetBundleSettings.m_platform.c_str()));
 
@@ -259,22 +259,13 @@ namespace AzToolsFramework
             return false;
         }
 
-        const char* appRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(appRoot, &AzFramework::ApplicationRequests::GetAppRoot);
-
-        if (AzFramework::StringFunc::Path::IsRelative(bundleFilePath.c_str()))
-        {
-            AzFramework::StringFunc::Path::ConstructFull(appRoot, bundleFilePath.c_str(), bundleFilePath, true);
-        }
-
         AZ::u64 maxSizeInBytes = static_cast<AZ::u64>(assetBundleSettings.m_maxBundleSizeInMB * NumOfBytesInMB);
         AZ::u64 assetCatalogFileSizeBuffer = static_cast<AZ::u64>(AssetCatalogFileSizeBufferPercentage * assetBundleSettings.m_maxBundleSizeInMB * NumOfBytesInMB) / 100;
         AZ::u64 bundleSize = 0;
         AZ::u64 totalFileSize = 0;
         int bundleIndex = 0;
 
-        AZStd::string bundleFullPath = bundleFilePath;
-        AZStd::string tempBundleFilePath = bundleFullPath + "_temp";
+        AZStd::string tempBundleFilePath = bundleFilePath.Native() + "_temp";
 
         AZStd::vector<AZStd::string> dependentBundleNames;
         AZStd::vector<AZStd::string> levelDirs;
@@ -301,7 +292,7 @@ namespace AzToolsFramework
         if (fileIO->Exists(bundleFilePath.c_str()))
         {
             // This will delete both the parent bundle as well as all the dependent bundles mentioned in the manifest file of the parent bundle.
-            if (!DeleteBundleFiles(bundleFilePath))
+            if (!DeleteBundleFiles(bundleFilePath.Native()))
             {
                 return false;
             }
@@ -390,7 +381,7 @@ namespace AzToolsFramework
                     // we need to find a bundle which does not exist on disk;
                     bundleIndex++;
                     numOfTries--;
-                    dependentBundleFileName = CreateAssetBundleFileName(bundleFilePath, bundleIndex);
+                    dependentBundleFileName = CreateAssetBundleFileName(bundleFilePath.Native(), bundleIndex);
                     AzFramework::StringFunc::Path::ReplaceFullName(tempBundleFilePath, (dependentBundleFileName + tempBundleFileSuffix).c_str());
                 } while (numOfTries && fileIO->Exists(tempBundleFilePath.c_str()));
 
@@ -463,15 +454,7 @@ namespace AzToolsFramework
 
         AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
 
-        AZStd::string assetFileInfoListPath = assetBundleSettings.m_assetFileInfoListPath;
-
-        const char* appRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(appRoot, &AzFramework::ApplicationRequests::GetAppRoot);
-
-        if (AzFramework::StringFunc::Path::IsRelative(assetFileInfoListPath.c_str()))
-        {
-            AzFramework::StringFunc::Path::ConstructFull(appRoot, assetFileInfoListPath.c_str(), assetFileInfoListPath, true);
-        }
+        AZ::IO::Path assetFileInfoListPath = AZ::IO::Path{ AZStd::string_view{AZ::Utils::GetEnginePath()} } / assetBundleSettings.m_assetFileInfoListPath;
 
         if (!fileIO->Exists(assetFileInfoListPath.c_str()))
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp
index 5ac6d6a817..31fcb60d17 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp
@@ -943,10 +943,8 @@ namespace AzToolsFramework
             const char* scanFolder,
             const char* displayName,
             const char* portableKey,
-            const char* outputPrefix,
             int isRoot)
             : m_scanFolderID(scanFolderID)
-            , m_outputPrefix(outputPrefix)
             , m_isRoot(isRoot)
         {
             if (scanFolder)
@@ -967,10 +965,8 @@ namespace AzToolsFramework
             const char* scanFolder,
             const char* displayName,
             const char* portableKey,
-            const char* outputPrefix,
             int isRoot)
-            : m_outputPrefix(outputPrefix)
-            , m_isRoot(isRoot)
+            : m_isRoot(isRoot)
         {
             if (scanFolder)
             {
@@ -993,7 +989,6 @@ namespace AzToolsFramework
             , m_scanFolder(other.m_scanFolder)
             , m_displayName(other.m_displayName)
             , m_portableKey(other.m_portableKey)
-            , m_outputPrefix(other.m_outputPrefix)
             , m_isRoot(other.m_isRoot)
         {
         }
@@ -1011,7 +1006,6 @@ namespace AzToolsFramework
                 m_scanFolderID = other.m_scanFolderID;
                 m_displayName = AZStd::move(other.m_displayName);
                 m_portableKey = AZStd::move(other.m_portableKey);
-                m_outputPrefix = AZStd::move(other.m_outputPrefix);
                 m_isRoot = other.m_isRoot;
             }
             return *this;
@@ -1023,7 +1017,6 @@ namespace AzToolsFramework
             m_scanFolderID = other.m_scanFolderID;
             m_displayName = other.m_displayName;
             m_portableKey = other.m_portableKey;
-            m_outputPrefix = other.m_outputPrefix;
             m_isRoot = other.m_isRoot;
             return *this;
         }
@@ -1050,7 +1043,6 @@ namespace AzToolsFramework
                 MakeColumn("ScanFolder", m_scanFolder),
                 MakeColumn("DisplayName", m_displayName),
                 MakeColumn("PortableKey", m_portableKey),
-                MakeColumn("OutputPrefix", m_outputPrefix),
                 MakeColumn("IsRoot", m_isRoot)
             );
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h
index 423cbe595f..6fc7146107 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h
@@ -68,6 +68,7 @@ namespace AzToolsFramework
             AddedLastScanTimeField = 28,
             AddedScanTimeSecondsSinceEpochField = 29,
             ChangedSortFunctionFromQSortToStdStableSort = 30,
+            RemoveOutputPrefixFromScanFolders,
             //Add all new versions before this
             DatabaseVersionCount,
             LatestVersion = DatabaseVersionCount - 1
@@ -99,12 +100,10 @@ namespace AzToolsFramework
                 const char* scanFolder,
                 const char* displayName,
                 const char* portableKey,
-                const char* outputPrefix,
                 int isRoot = 0);
             ScanFolderDatabaseEntry(const char* scanFolder,
                 const char* displayName,
                 const char* portableKey,
-                const char* outputPrefix,
                 int isRoot = 0);
             ScanFolderDatabaseEntry(const ScanFolderDatabaseEntry& other);
             ScanFolderDatabaseEntry(ScanFolderDatabaseEntry&& other);
@@ -120,7 +119,6 @@ namespace AzToolsFramework
             AZStd::string m_scanFolder; // the actual local computer path to that scan folder.
             AZStd::string m_displayName; // a display name, blank means it should not show up in UIs
             AZStd::string m_portableKey; // a key that uniquely identifies a scan folder so that we can recognize the same one in other databases/computer
-            AZStd::string m_outputPrefix;
             int m_isRoot = 0;
         };
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
index e7037c8936..373787e7dd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
@@ -53,7 +53,6 @@
 #include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerComponent.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserComponent.h>
-#include <AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h>
 
 namespace AzToolsFramework
@@ -93,7 +92,6 @@ namespace AzToolsFramework
             AzToolsFramework::SliceDependencyBrowserComponent::CreateDescriptor(),
             AzToolsFramework::Thumbnailer::ThumbnailerComponent::CreateDescriptor(),
             AzToolsFramework::AssetBrowser::AssetBrowserComponent::CreateDescriptor(),
-            AzToolsFramework::MaterialBrowser::MaterialBrowserComponent::CreateDescriptor(),
             AzToolsFramework::EditorInteractionSystemComponent::CreateDescriptor(),
             AzToolsFramework::Components::EditorComponentAPIComponent::CreateDescriptor(),
             AzToolsFramework::Components::EditorLevelComponentAPIComponent::CreateDescriptor(),
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h
index cee47f55ef..7d08d87c3b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h
@@ -49,6 +49,8 @@ namespace AzToolsFramework
         /// Retrieve the Id of the editor entity context.
         virtual AzFramework::EntityContextId GetEditorEntityContextId() = 0;
 
+        virtual AzFramework::EntityContext* GetEditorEntityContextInstance() = 0;
+
         /// Creates an entity in the editor context.
         /// \return the EntityId for the created Entity
         virtual AZ::EntityId CreateNewEditorEntity(const char* name) = 0;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h
index fb3276b5ac..d59792752b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h
@@ -77,6 +77,7 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // EditorEntityContextRequestBus
         AzFramework::EntityContextId GetEditorEntityContextId() override { return GetContextId(); }
+        AzFramework::EntityContext* GetEditorEntityContextInstance() override { return this; }
         void ResetEditorContext() override;
 
         AZ::EntityId CreateNewEditorEntity(const char* name) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
index 9a191f93de..089037bbf3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
@@ -769,12 +769,12 @@ namespace AzToolsFramework
 
     template<typename Vertex>
     void EditorVertexSelectionBase<Vertex>::DisplayViewport2d(
-        const AzFramework::ViewportInfo& /*viewportInfo*/,
+        const AzFramework::ViewportInfo& viewportInfo,
         AzFramework::DebugDisplayRequests& debugDisplay)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        m_editorBoxSelect.Display2d(debugDisplay);
+        m_editorBoxSelect.Display2d(viewportInfo, debugDisplay);
     }
 
     template<typename Vertex>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserBus.h
deleted file mode 100644
index b0d625b6e4..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserBus.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-namespace AZ
-{
-    namespace Data
-    {
-        struct AssetId;
-    }
-}
-
-namespace AzToolsFramework
-{
-    namespace MaterialBrowser
-    {
-        class MaterialBrowserRequests
-            : public AZ::EBusTraits
-        {
-        public:
-
-            // Only a single handler is allowed
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-            virtual bool HasRecord(const AZ::Data::AssetId& assetId) = 0;
-            virtual bool IsMultiMaterial(const AZ::Data::AssetId& assetId) = 0;
-        };
-
-        using MaterialBrowserRequestBus = AZ::EBus<MaterialBrowserRequests>;
-    } // namespace MaterialBrowser
-} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.cpp
deleted file mode 100644
index 3a6ed1c241..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include <AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
-#include <AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h>
-#include <AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h>
-#include <AzToolsFramework/MaterialBrowser/MaterialThumbnail.h>
-#include <AzToolsFramework/Thumbnails/SourceControlThumbnail.h>
-
-#include <QApplication>
-AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QBrush::d': class 'QScopedPointer<QBrushData,QBrushDataPointerDeleter>' needs to have dll-interface to be used by clients of class 'QBrush'
-#include <QStyle>
-AZ_POP_DISABLE_WARNING
-
-namespace AzToolsFramework
-{
-    namespace MaterialBrowser
-    {
-        MaterialBrowserComponent::MaterialBrowserComponent()
-        {
-        }
-
-        void MaterialBrowserComponent::Activate()
-        {
-            using namespace Thumbnailer;
-            using namespace AssetBrowser;
-            const char* contextName = "MaterialBrowser";
-            int thumbnailSize = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterContext, contextName, thumbnailSize);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(FolderThumbnailCache), contextName);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SourceThumbnailCache), contextName);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(MaterialThumbnailCache), contextName);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SourceControlThumbnailCache), contextName);
-        }
-
-        void MaterialBrowserComponent::Deactivate()
-        {
-        }
-
-        void MaterialBrowserComponent::Reflect(AZ::ReflectContext* context)
-        {
-            AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-            if (serialize)
-            {
-                serialize->Class<MaterialBrowserComponent, AZ::Component>();
-            }
-        }
-
-        void MaterialBrowserComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
-        }
-    } // namespace MaterialBrowser
-} // namespace AzToolsFramework
-
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.h
deleted file mode 100644
index 93a48cf22c..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Component/Component.h>
-
-namespace AzToolsFramework
-{
-    namespace MaterialBrowser
-    {
-        //! MaterialBrowserComponent allows initialization of MaterialBrowser systems, such as thumbnails
-        class MaterialBrowserComponent
-            : public AZ::Component
-        {
-        public:
-            AZ_COMPONENT(MaterialBrowserComponent, "{121F3F3B-2412-490D-9E3E-C205C677F476}")
-
-            MaterialBrowserComponent();
-            virtual ~MaterialBrowserComponent() = default;
-
-            //////////////////////////////////////////////////////////////////////////
-            // AZ::Component
-            //////////////////////////////////////////////////////////////////////////
-            void Activate() override;
-            void Deactivate() override;
-            static void Reflect(AZ::ReflectContext* context);
-
-            static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
-        };
-    } // namespace MaterialBrowser
-} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.cpp
deleted file mode 100644
index 30e7f4d6cb..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzToolsFramework/MaterialBrowser/MaterialThumbnail.h>
-
-#include <QPixmap>
-
-namespace AzToolsFramework
-{
-    namespace MaterialBrowser
-    {
-        static constexpr const char* SimpleMaterialIconPath = ":/MaterialBrowser/images/material_04.png";
-        static constexpr const char* MultiMaterialIconPath = ":/MaterialBrowser/images/material_06.png";
-
-        //////////////////////////////////////////////////////////////////////////
-        // MaterialThumbnail
-        //////////////////////////////////////////////////////////////////////////
-        MaterialThumbnail::MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
-        {
-            auto productKey = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(m_key.data());
-            AZ_Assert(productKey, "Incorrect key type, excpected ProductThumbnailKey");
-
-            bool multiMat = false;
-            MaterialBrowserRequestBus::BroadcastResult(multiMat, &MaterialBrowserRequests::IsMultiMaterial, productKey->GetAssetId());
-
-            QString iconPath = multiMat ? MultiMaterialIconPath : SimpleMaterialIconPath;
-            m_pixmap = QPixmap(iconPath).scaled(m_thumbnailSize, m_thumbnailSize, Qt::KeepAspectRatio);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // MaterialThumbnailCache
-        //////////////////////////////////////////////////////////////////////////
-        MaterialThumbnailCache::MaterialThumbnailCache()
-            : ThumbnailCache<MaterialThumbnail, MaterialKeyHash, MaterialKeyEqual>() {}
-
-        MaterialThumbnailCache::~MaterialThumbnailCache() = default;
-
-        int MaterialThumbnailCache::GetPriority() const
-        {
-            return 1;
-        }
-
-        const char* MaterialThumbnailCache::GetProviderName() const
-        {
-            return ProviderName;
-        }
-
-        bool MaterialThumbnailCache::IsSupportedThumbnail(Thumbnailer::SharedThumbnailKey key) const
-        {
-            return azrtti_istypeof<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(key.data());
-        }
-
-    } // namespace MaterialBrowser
-} // namespace AzToolsFramework
-
-#include "MaterialBrowser/moc_MaterialThumbnail.cpp"
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.h
deleted file mode 100644
index f7873ef765..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzToolsFramework/Thumbnails/Thumbnail.h>
-#include <AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h>
-#include <AzToolsFramework/MaterialBrowser/MaterialBrowserBus.h>
-#endif
-
-namespace AzToolsFramework
-{
-    namespace MaterialBrowser
-    {
-        //! Material Browser uses only 2 thumbnails: simple and multimaterial
-        class MaterialThumbnail
-            : public Thumbnailer::Thumbnail
-        {
-            Q_OBJECT
-        public:
-            MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
-        };
-
-        namespace
-        {
-            class MaterialKeyHash
-            {
-            public:
-                size_t operator()(const Thumbnailer::SharedThumbnailKey& /*val*/) const
-                {
-                    return 0; // there is only 2 thumbnails in this cache
-                }
-            };
-
-            class MaterialKeyEqual
-            {
-            public:
-                bool operator()(const Thumbnailer::SharedThumbnailKey& val1, const Thumbnailer::SharedThumbnailKey& val2) const
-                {
-                    auto productThumbnailKey1 = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(val1.data());
-                    auto productThumbnailKey2 = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(val2.data());
-                    if (!productThumbnailKey1 || !productThumbnailKey2)
-                    {
-                        return false;
-                    }
-
-                    // check whether keys point to single or multimaterial asset type
-                    bool multiMat1 = false;
-                    bool multiMat2 = false;
-                    MaterialBrowserRequestBus::BroadcastResult(multiMat1, &MaterialBrowserRequests::IsMultiMaterial, productThumbnailKey1->GetAssetId());
-                    MaterialBrowserRequestBus::BroadcastResult(multiMat2, &MaterialBrowserRequests::IsMultiMaterial, productThumbnailKey2->GetAssetId());
-                    return multiMat1 == multiMat2;
-                }
-            };
-        }
-
-        //! MaterialBrowserEntry thumbnails
-        class MaterialThumbnailCache
-            : public Thumbnailer::ThumbnailCache<MaterialThumbnail, MaterialKeyHash, MaterialKeyEqual>
-        {
-        public:
-            MaterialThumbnailCache();
-            ~MaterialThumbnailCache() override;
-
-            int GetPriority() const override;
-            const char* GetProviderName() const override;
-
-            static constexpr const char* ProviderName = "CryMaterial Thumbnails";
-
-        protected:
-            bool IsSupportedThumbnail(Thumbnailer::SharedThumbnailKey key) const override;
-        };
-    } // namespace MaterialBrowser
-} // namespace AzToolsFramework
-
-
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp
index 12d676a0b4..8f14429cd0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp
@@ -16,7 +16,6 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 #include <AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h>
 
 namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
index 71b1e04ec8..80ac86c974 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
@@ -21,9 +21,9 @@
 #include <AzToolsFramework/Prefab/Instance/TemplateInstanceMapperInterface.h>
 #include <AzToolsFramework/Prefab/PrefabDomUtils.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
+#include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
 #include <AzToolsFramework/Prefab/Template/Template.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 
 namespace AzToolsFramework
 {
@@ -90,17 +90,13 @@ namespace AzToolsFramework
 
                 if (instanceCountToUpdateInBatch > 0)
                 {
+                    // Notify Propagation has begun
+                    PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationBegin);
+
                     EntityIdList selectedEntityIds;
                     ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &ToolsApplicationRequests::GetSelectedEntities);
                     ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, EntityIdList());
 
-                    // Disable the Outliner to avoid showing the propagation steps
-                    EntityOutlinerWidgetInterface* entityOutlinerWidgetInterface = AZ::Interface<EntityOutlinerWidgetInterface>::Get();
-                    if (entityOutlinerWidgetInterface)
-                    {
-                        entityOutlinerWidgetInterface->SetUpdatesEnabled(false);
-                    }
-
                     for (int i = 0; i < instanceCountToUpdateInBatch; ++i)
                     {
                         Instance* instanceToUpdate = m_instancesUpdateQueue.front();
@@ -168,18 +164,8 @@ namespace AzToolsFramework
                     }
                     ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
 
-                    // Enable the Outliner
-                    if (entityOutlinerWidgetInterface)
-                    {
-                        entityOutlinerWidgetInterface->SetUpdatesEnabled(true);
-
-                        auto prefabPublicInterface = AZ::Interface<PrefabPublicInterface>::Get();
-                        if (prefabPublicInterface)
-                        {
-                            AZ::EntityId rootEntityId = prefabPublicInterface->GetLevelInstanceContainerEntityId();
-                            entityOutlinerWidgetInterface->ExpandEntityChildren(rootEntityId);
-                        }
-                    }
+                    // Notify Propagation has ended
+                    PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationEnd);
                 }
 
                 m_updatingTemplateInstancesInQueue = false;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
index 4dd31814b7..e0834ed53b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
@@ -108,11 +108,9 @@ namespace AzToolsFramework
             m_targetTemplateId = id;
         }
 
-        void Link::SetTemplatePatches(const PrefabDomValue& patches)
+        void Link::SetLinkDom(const PrefabDomValue& linkDom)
         {
-            PrefabDom newPatches;
-            newPatches.CopyFrom(patches, newPatches.GetAllocator());
-            m_linkDom.Swap(newPatches);
+            m_linkDom.CopyFrom(linkDom, m_linkDom.GetAllocator());
         }
 
         void Link::SetInstanceName(const char* instanceName)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
index c36dd75b1b..073e619f20 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
@@ -47,7 +47,7 @@ namespace AzToolsFramework
 
             void SetSourceTemplateId(TemplateId id);
             void SetTargetTemplateId(TemplateId id);
-            void SetTemplatePatches(const PrefabDomValue& patches);
+            void SetLinkDom(const PrefabDomValue& linkDom);
             void SetInstanceName(const char* instanceName);
 
             bool IsValid() const;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h
new file mode 100644
index 0000000000..fc5879f776
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h
@@ -0,0 +1,34 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+namespace AzToolsFramework
+{
+    namespace Prefab
+    {
+        class PrefabPublicNotifications
+            : public AZ::EBusTraits
+        {
+        public:
+            virtual ~PrefabPublicNotifications() = default;
+
+            virtual void OnPrefabInstancePropagationBegin() {}
+            virtual void OnPrefabInstancePropagationEnd() {}
+        };
+
+        using PrefabPublicNotificationBus = AZ::EBus<PrefabPublicNotifications>;
+
+    } // namespace Prefab
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
index 40c8b3bc6a..2570367049 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
@@ -770,8 +770,8 @@ namespace AzToolsFramework
                 return false;
             }
 
-            Template& sourceTemplate = sourceTemplateReference->get();
 #if defined(AZ_ENABLE_TRACING)
+            Template& sourceTemplate = sourceTemplateReference->get();
             Template& targetTemplate = targetTemplateReference->get();
 #endif
 
@@ -782,22 +782,21 @@ namespace AzToolsFramework
             link.SetInstanceName(instanceName.data());
 
             PrefabDomValue& instance = instanceIterator->value;
+            AZ_Assert(instance.IsObject(), "Nested instance DOM provided is not a valid JSON object.");
+            PrefabDomValueReference sourceTemplateName = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::SourceName);
+            AZ_Assert(sourceTemplateName, "Couldn't find source template name in the DOM of the nested instance while creating a link.");
+            AZ_Assert(
+                sourceTemplateName->get() == sourceTemplate.GetFilePath().c_str(),
+                "The name of the source template in the nested instance DOM does not match the name of the source template already loaded");
 
             PrefabDomValueReference patchesReference = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::PatchesName);
-            if (!patchesReference.has_value())
-            {
-                PrefabDom& newLinkDom = link.GetLinkDom();
-
-                newLinkDom.SetObject();
-
-                newLinkDom.AddMember(rapidjson::StringRef(PrefabDomUtils::SourceName),
-                    rapidjson::StringRef(sourceTemplate.GetFilePath().c_str()), newLinkDom.GetAllocator());
-            }
-            else
+            if (patchesReference.has_value())
             {
-                link.SetTemplatePatches(patchesReference->get());
+                AZ_Assert(patchesReference->get().IsArray(), "Patches in the nested instance DOM are not represented as an array.");
             }
 
+            link.SetLinkDom(instance);
+
             if (!link.UpdateTarget())
             {
                 AZ_Error("Prefab", false,
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp
index 0664c63a5b..c29a9e4c6b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include <AzCore/StringFunc/StringFunc.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzToolsFramework/Thumbnails/LoadingThumbnail.h>
 #include <AzFramework/Application/Application.h>
 
@@ -18,23 +18,21 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
+        static constexpr const int LoadingThumbnailSize = 128;
+
         //////////////////////////////////////////////////////////////////////////
         // LoadingThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static const char* LoadingIconPath = "Editor/Icons/AssetBrowser/in_progress.gif";
+        static constexpr const char* LoadingIconPath = "Assets/Editor/Icons/AssetBrowser/in_progress.gif";
 
-        LoadingThumbnail::LoadingThumbnail(int thumbnailSize)
-            : Thumbnail(MAKE_TKEY(ThumbnailKey), thumbnailSize)
+        LoadingThumbnail::LoadingThumbnail()
+            : Thumbnail(MAKE_TKEY(ThumbnailKey))
             , m_angle(0)
         {
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            AZ_Assert(engineRoot, "Engine Root not initialized");
-            AZStd::string iconPath;
-            AZ::StringFunc::Path::Join(engineRoot, LoadingIconPath, iconPath);
-            m_loadingMovie.setFileName(iconPath.c_str());
+            auto absoluteIconPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / LoadingIconPath;
+            m_loadingMovie.setFileName(absoluteIconPath.c_str());
             m_loadingMovie.setCacheMode(QMovie::CacheMode::CacheAll);
-            m_loadingMovie.setScaledSize(QSize(m_thumbnailSize, m_thumbnailSize));
+            m_loadingMovie.setScaledSize(QSize(LoadingThumbnailSize, LoadingThumbnailSize));
             m_loadingMovie.start();
             m_pixmap = m_loadingMovie.currentPixmap();
             m_state = State::Ready;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h
index c9a2e88dfe..b8f50278b8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h
@@ -29,7 +29,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            explicit LoadingThumbnail(int thumbnailSize);
+            LoadingThumbnail();
             ~LoadingThumbnail() override;
 
             void UpdateTime(float /*deltaTime*/) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp
index 06921f2606..39af7d9293 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp
@@ -10,19 +10,22 @@
 *
 */
 
+#include <AzCore/Utils/Utils.h>
+#include <AzFramework/API/ApplicationAPI.h>
 #include <AzToolsFramework/Thumbnails/MissingThumbnail.h>
 
 namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        static const char* MISSING_ICON_PATH = "Editor/Icons/AssetBrowser/Default_16.svg";
+        static constexpr const char* MissingIconPath = "Assets/Editor/Icons/AssetBrowser/Default_16.svg";
 
-        MissingThumbnail::MissingThumbnail(int thumbnailSize)
-            : Thumbnail(MAKE_TKEY(ThumbnailKey), thumbnailSize)
+        MissingThumbnail::MissingThumbnail()
+            : Thumbnail(MAKE_TKEY(ThumbnailKey))
         {
-            m_icon = QIcon(MISSING_ICON_PATH);
-            m_state = State::Ready;
+            auto absoluteIconPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / MissingIconPath;
+            m_pixmap.load(absoluteIconPath.c_str());
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
     } // namespace Thumbnailer
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h
index 5858c759c9..e5712c514a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h
@@ -24,7 +24,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            explicit MissingThumbnail(int thumbnailSize);
+            MissingThumbnail();
         };
     } // namespace Thumbnailer
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
index 705ce5f71b..864484bf61 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
@@ -64,13 +64,13 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // SourceControlThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static const char* WRITABLE_ICON_PATH = "Editor/Icons/AssetBrowser/Writable_16.svg";
-        static const char* NONWRITABLE_ICON_PATH = "Editor/Icons/AssetBrowser/NonWritable_16.svg";
+        static const char* WRITABLE_ICON_PATH = "Icons/AssetBrowser/Writable_16.svg";
+        static const char* NONWRITABLE_ICON_PATH = "Icons/AssetBrowser/NonWritable_16.svg";
 
         bool SourceControlThumbnail::m_readyForUpdate = true;
 
-        SourceControlThumbnail::SourceControlThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        SourceControlThumbnail::SourceControlThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {
             const char* engineRoot = nullptr;
             AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
@@ -122,16 +122,16 @@ namespace AzToolsFramework
             {
                 if (fileInfo.HasFlag(AzToolsFramework::SCF_Writeable))
                 {
-                    m_icon = QIcon(m_writableIconPath.c_str());
+                    m_pixmap.load(m_writableIconPath.c_str());
                 }
                 else
                 {
-                    m_icon = QIcon(m_nonWritableIconPath.c_str());
+                    m_pixmap.load(m_nonWritableIconPath.c_str());
                 }
             }
             else
             {
-                m_icon = QIcon();
+                m_pixmap = QPixmap();
             }
             m_readyForUpdate = true;
             emit Updated();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h
index 03b04a3fd9..23fded57f4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h
@@ -55,7 +55,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            SourceControlThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            SourceControlThumbnail(SharedThumbnailKey key);
             ~SourceControlThumbnail() override;
 
             //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
index 2892e4efce..499f508dcd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
@@ -24,8 +24,6 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        static const int DefaultIconSize = 16;
-
         //////////////////////////////////////////////////////////////////////////
         // ThumbnailKey
         //////////////////////////////////////////////////////////////////////////
@@ -54,10 +52,9 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // Thumbnail
         //////////////////////////////////////////////////////////////////////////
-        Thumbnail::Thumbnail(SharedThumbnailKey key, int thumbnailSize)
+        Thumbnail::Thumbnail(SharedThumbnailKey key)
             : QObject()
             , m_state(State::Unloaded)
-            , m_thumbnailSize(thumbnailSize)
             , m_key(key)
         {
             connect(&m_watcher, &QFutureWatcher<void>::finished, this, [this]()
@@ -91,19 +88,9 @@ namespace AzToolsFramework
             }
         }
 
-        QPixmap Thumbnail::GetPixmap() const
-        {
-            return GetPixmap(QSize(DefaultIconSize, DefaultIconSize));
-        }
-
-        QPixmap Thumbnail::GetPixmap(const QSize& size) const
+        const QPixmap& Thumbnail::GetPixmap() const
         {
-            if (m_icon.isNull())
-            {
-                return m_pixmap;
-            }
-
-            return m_icon.pixmap(size);
+            return m_pixmap;
         }
 
         SharedThumbnailKey Thumbnail::GetKey() const
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
index 671960bea5..a517625e61 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
@@ -19,7 +19,6 @@ AZ_PUSH_DISABLE_WARNING(4127 4251 4800, "-Wunknown-warning-option") // 4127: con
                                                                     // 4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
 #include <QObject>
 #include <QPixmap>
-#include <QIcon>
 #include <QFutureWatcher>
 AZ_POP_DISABLE_WARNING
 #endif
@@ -86,12 +85,11 @@ namespace AzToolsFramework
                 Failed
             };
 
-            Thumbnail(SharedThumbnailKey key, int thumbnailSize);
+            Thumbnail(SharedThumbnailKey key);
             ~Thumbnail() override;
             bool operator == (const Thumbnail& other) const;
             void Load();
-            virtual QPixmap GetPixmap() const;
-            virtual QPixmap GetPixmap(const QSize& size) const;
+            const QPixmap& GetPixmap() const;
             virtual void UpdateTime(float /*deltaTime*/) {}
             SharedThumbnailKey GetKey() const;
             State GetState() const;
@@ -105,10 +103,8 @@ namespace AzToolsFramework
         protected:
             QFutureWatcher<void> m_watcher;
             State m_state;
-            int m_thumbnailSize;
             SharedThumbnailKey m_key;
             QPixmap m_pixmap;
-            QIcon m_icon;
 
             virtual void LoadThread() {}
         };
@@ -122,7 +118,6 @@ namespace AzToolsFramework
             ThumbnailProvider() = default;
             virtual ~ThumbnailProvider() = default;
             virtual bool GetThumbnail(SharedThumbnailKey key, SharedThumbnail& thumbnail) = 0;
-            virtual void SetThumbnailSize(int thumbnailSize) = 0;
             //! Priority identifies ThumbnailProvider order in ThumbnailContext
             //! Higher priority means this ThumbnailProvider will take precedence in generating a thumbnail when
             //! a supplied ThumbnailKey is supported by multiple providers.
@@ -185,10 +180,7 @@ namespace AzToolsFramework
 
             bool GetThumbnail(SharedThumbnailKey key, SharedThumbnail& thumbnail) override;
 
-            void SetThumbnailSize(int thumbnailSize) override;
-
         protected:
-            int m_thumbnailSize;
             AZStd::unordered_map<SharedThumbnailKey, SharedThumbnail, Hasher, EqualKey> m_cache;
 
             //! Check if thumbnail key is handled by this provider, overload in derived class
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl
index 3182248017..b121f56a75 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl
@@ -18,7 +18,6 @@ namespace AzToolsFramework
     {
         template <class ThumbnailType, class Hasher, class EqualKey>
         ThumbnailCache<ThumbnailType, Hasher, EqualKey>::ThumbnailCache()
-            : m_thumbnailSize(0)
         {
             BusConnect();
         }
@@ -49,17 +48,11 @@ namespace AzToolsFramework
             }
             if (IsSupportedThumbnail(key))
             {
-                thumbnail = QSharedPointer<ThumbnailType>(new ThumbnailType(key, m_thumbnailSize));
+                thumbnail = QSharedPointer<ThumbnailType>(new ThumbnailType(key));
                 m_cache[key] = thumbnail;
                 return true;
             }
             return false;
         }
-
-        template <class ThumbnailType, class Hasher, class EqualKey>
-        void ThumbnailCache<ThumbnailType, Hasher, EqualKey>::SetThumbnailSize(int thumbnailSize)
-        {
-            m_thumbnailSize = thumbnailSize;
-        }
     } // namespace Thumbnailer
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
index ae6d7c1178..1cee6946e7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
@@ -24,10 +24,9 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        ThumbnailContext::ThumbnailContext(int thumbnailSize)
-            : m_missingThumbnail(new MissingThumbnail(thumbnailSize))
-            , m_loadingThumbnail(new LoadingThumbnail(thumbnailSize))
-            , m_thumbnailSize(thumbnailSize)
+        ThumbnailContext::ThumbnailContext()
+            : m_missingThumbnail(new MissingThumbnail())
+            , m_loadingThumbnail(new LoadingThumbnail())
             , m_threadPool(this)
         {
             ThumbnailContextRequestBus::Handler::BusConnect();
@@ -120,7 +119,6 @@ namespace AzToolsFramework
                 return;
             }
 
-            providerToAdd->SetThumbnailSize(m_thumbnailSize);
             m_providers.insert(providerToAdd);
         }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
index 6ba3d637f6..0267d76365 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
@@ -45,9 +45,9 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            AZ_CLASS_ALLOCATOR(ThumbnailContext, AZ::SystemAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ThumbnailContext, AZ::SystemAllocator, 0);
 
-            explicit ThumbnailContext(int thumbnailSize);
+            ThumbnailContext();
             ~ThumbnailContext() override;
 
             //! Is the thumbnail currently loading or is about to load.
@@ -82,8 +82,6 @@ namespace AzToolsFramework
             SharedThumbnail m_missingThumbnail;
             //! Default loading thumbnail used when thumbnail is found by is not yet generated
             SharedThumbnail m_loadingThumbnail;
-            //! Thumbnail size (width and height in pixels)
-            int m_thumbnailSize;
             //! There is only a limited number of threads on global threadPool, because there can be many thumbnails rendering at once
             //! an individual threadPool is needed to avoid deadlocks
             QThreadPool m_threadPool;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
index 02264e61f8..d191d9c043 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
@@ -40,7 +40,7 @@ namespace AzToolsFramework
         {
         public:
             //! Add thumbnail context
-            virtual void RegisterContext(const char* contextName, int thumbnailSize) = 0;
+            virtual void RegisterContext(const char* contextName) = 0;
 
             //! Remove thumbnail context and all associated ThumbnailProviders
             virtual void UnregisterContext(const char* contextName) = 0;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
index 044f995a5a..36c9e35314 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
@@ -32,8 +32,7 @@ namespace AzToolsFramework
 
         void ThumbnailerComponent::Activate()
         {
-            int thumbnailSize = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
-            RegisterContext(ThumbnailContext::DefaultContext, thumbnailSize);
+            RegisterContext(ThumbnailContext::DefaultContext);
             BusConnect();
         }
 
@@ -62,10 +61,10 @@ namespace AzToolsFramework
             provided.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
         }
 
-        void ThumbnailerComponent::RegisterContext(const char* contextName, int thumbnailSize)
+        void ThumbnailerComponent::RegisterContext(const char* contextName)
         {
             AZ_Assert(m_thumbnails.find(contextName) == m_thumbnails.end(), "Context %s already registered", contextName);
-            m_thumbnails[contextName] = AZStd::make_shared<ThumbnailContext>(thumbnailSize);
+            m_thumbnails[contextName] = AZStd::make_shared<ThumbnailContext>();
         }
 
         void ThumbnailerComponent::UnregisterContext(const char* contextName)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
index 814781ea9a..6575f277e9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
@@ -43,7 +43,7 @@ namespace AzToolsFramework
             //////////////////////////////////////////////////////////////////////////
             // ThumbnailerRequests
             //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName, int thumbnailSize) override;
+            void RegisterContext(const char* contextName) override;
             void UnregisterContext(const char* contextName) override;
             bool HasContext(const char* contextName) const override;
             void RegisterThumbnailProvider(SharedThumbnailProvider provider, const char* contextName) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp
index 9fda3fa291..f3c6a014cd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp
@@ -16,7 +16,7 @@
 #include <AzCore/Serialization/EditContext.h>
 
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 #include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
 #include <AzToolsFramework/Entity/EditorEntityContextComponent.h>
@@ -56,22 +56,47 @@ namespace AzToolsFramework
 
     void AzToolsFrameworkConfigurationSystemComponent::Activate()
     {
-        // Associate the EditorEntityContext with the default scene.
+        // Create the editor specific child scene to the main scene and add the editor entity context to it.
         AzFramework::EntityContextId editorEntityContextId;
         EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
 
-        AzFramework::Scene* defaultScene = nullptr;
-        AzFramework::SceneSystemRequestBus::BroadcastResult(defaultScene, &AzFramework::SceneSystemRequests::GetScene, "default");
-
-        if (!editorEntityContextId.IsNull() && defaultScene)
+        if (!editorEntityContextId.IsNull())
         {
-            bool success = false;
-            AzFramework::SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequests::SetSceneForEntityContextId, editorEntityContextId, defaultScene);
+            auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+            AZ_Assert(sceneSystem, "Scene system not available to create the editor scene.");
+            AZStd::shared_ptr<AzFramework::Scene> mainScene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
+            if (mainScene)
+            {
+                AZ::Outcome<AZStd::shared_ptr<AzFramework::Scene>, AZStd::string> editorScene =
+                    sceneSystem->CreateSceneWithParent(AzFramework::Scene::EditorMainSceneName, mainScene);
+                if (editorScene.IsSuccess())
+                {
+                    AzFramework::EntityContext* editorEntityContext = nullptr;
+                    EditorEntityContextRequestBus::BroadcastResult(
+                        editorEntityContext, &EditorEntityContextRequests::GetEditorEntityContextInstance);
+                    if (editorEntityContext != nullptr)
+                    {
+                        [[maybe_unused]] bool contextAdded =
+                            editorScene.GetValue()->SetSubsystem<AzFramework::EntityContext::SceneStorageType&>(editorEntityContext);
+                        AZ_Assert(contextAdded, "Unable to add editor entity context to scene.");
+                    }
+                }
+                else
+                {
+                    AZ_Assert(false, "Failed to create editor scene because: %s", editorScene.GetError().c_str());
+                }
+            }
+            else
+            {
+                AZ_Assert(false, "No main scene to parent the editor scene under.");
+            }
         }
     }
 
     void AzToolsFrameworkConfigurationSystemComponent::Deactivate()
     {
+        [[maybe_unused]] bool success = AzFramework::SceneSystemInterface::Get()->RemoveScene(AzFramework::Scene::EditorMainSceneName);
+        AZ_Assert(success, "Unable to remove the main editor scene.");
     }
 
     void AzToolsFrameworkConfigurationSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp
index 6365334502..60f31fa004 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp
@@ -101,8 +101,8 @@ namespace AzToolsFramework
                 {
                     editContext->Class<EditorLayerComponent>("Layer", "The layer component allows entities to be saved to different files on disk.")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Layers.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Layers.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Layers.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Layers.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Layer", 0xe4db211a))
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
                         ->Attribute(AZ::Edit::Attributes::RemoveableByUser, false)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
index 0e96f77e76..6970d747c4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
@@ -1025,9 +1025,9 @@ namespace AzToolsFramework
                         ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &ScriptEditorComponent::m_customName)
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/LuaScript.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/LuaScript.svg")
                         ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid())
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Script.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Script.png")
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-lua-script.html")
                         ->DataElement("AssetRef", &ScriptEditorComponent::m_scriptAsset, "Script", "Which script to use")
                             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &ScriptEditorComponent::ScriptHasChanged)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
index 81c9ebaaec..5b2a363fa3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
@@ -1227,8 +1227,8 @@ namespace AzToolsFramework
                 {
                     ptrEdit->Class<TransformComponent>("Transform", "Controls the placement of the entity in the world in 3d")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                            Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Transform.svg")->
-                            Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Transform.png")->
+                            Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Transform.svg")->
+                            Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Transform.png")->
                             Attribute(AZ::Edit::Attributes::AutoExpand, true)->
                         DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_parentEntityId, "Parent entity", "")->
                             Attribute(AZ::Edit::Attributes::ChangeValidate, &TransformComponent::ValidatePotentialParent)->
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
index 3ee8a14285..cc65b61908 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
@@ -286,12 +286,12 @@ namespace AzToolsFramework
         ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
             GetEntityContextId());
         EditorEntityInfoNotificationBus::Handler::BusConnect();
-        AZ::Interface<EntityOutlinerWidgetInterface>::Register(this);
+        Prefab::PrefabPublicNotificationBus::Handler::BusConnect();
     }
 
     EntityOutlinerWidget::~EntityOutlinerWidget()
     {
-        AZ::Interface<EntityOutlinerWidgetInterface>::Unregister(this);
+        Prefab::PrefabPublicNotificationBus::Handler::BusDisconnect();
         ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
         EditorEntityInfoNotificationBus::Handler::BusDisconnect();
         EditorPickModeNotificationBus::Handler::BusDisconnect();
@@ -1109,25 +1109,18 @@ namespace AzToolsFramework
         setEnabled(true);
         SetEntityOutlinerState(m_gui, true);
     }
-    
-    void EntityOutlinerWidget::SetUpdatesEnabled(bool enable)
+
+    void EntityOutlinerWidget::OnPrefabInstancePropagationBegin()
     {
-        if (enable)
-        {
-            QTimer::singleShot(1, this, [this]() {
-                m_gui->m_objectTree->setUpdatesEnabled(true);
-            });
-        }
-        else
-        {
-            m_gui->m_objectTree->setUpdatesEnabled(false);
-        }
+        m_gui->m_objectTree->setUpdatesEnabled(false);
     }
 
-    void EntityOutlinerWidget::ExpandEntityChildren(AZ::EntityId entityId)
+    void EntityOutlinerWidget::OnPrefabInstancePropagationEnd()
     {
-        QModelIndex index = GetIndexFromEntityId(entityId);
-        m_gui->m_objectTree->expand(index);
+        QTimer::singleShot(1, this, [this]() {
+            m_gui->m_objectTree->setUpdatesEnabled(true);
+            m_gui->m_objectTree->expand(m_proxyModel->index(0,0));
+        });
     }
 
     void EntityOutlinerWidget::OnEntityInfoUpdatedAddChildEnd(AZ::EntityId /*parentId*/, AZ::EntityId childId)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
index f225bb49b8..9a02febab2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
@@ -20,10 +20,10 @@
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzToolsFramework/ToolsMessaging/EntityHighlightBus.h>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerCacheBus.h>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 #include <AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx>
 
 #include <QIcon>
@@ -62,7 +62,7 @@ namespace AzToolsFramework
         , private EditorEntityContextNotificationBus::Handler
         , private EditorEntityInfoNotificationBus::Handler
         , private ComponentModeFramework::EditorComponentModeNotificationBus::Handler
-        , private EntityOutlinerWidgetInterface
+        , private Prefab::PrefabPublicNotificationBus::Handler
     {
         Q_OBJECT;
     public:
@@ -106,9 +106,9 @@ namespace AzToolsFramework
         void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
         void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
 
-        // EntityOutlinerWidgetInterface
-        void SetUpdatesEnabled(bool enable) override;
-        void ExpandEntityChildren(AZ::EntityId entityId) override;
+        // PrefabPublicNotificationBus
+        void OnPrefabInstancePropagationBegin() override;
+        void OnPrefabInstancePropagationEnd() override;
 
         // Build a selection object from the given entities. Entities already in the Widget's selection buffers are ignored.
         template <class EntityIdCollection>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h
deleted file mode 100644
index afbb790c1a..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-namespace AzToolsFramework
-{
-    class EntityOutlinerWidgetInterface
-    {
-    public:
-        AZ_RTTI(EntityOutlinerWidgetInterface, "{30C0F252-EC84-4196-BF59-EB9E73B8ADCB}");
-
-        virtual void SetUpdatesEnabled(bool enable) = 0;
-        virtual void ExpandEntityChildren(AZ::EntityId entityId) = 0;
-    };
-
-} // namespace AzToolsFramework
-
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
index d2e34c662f..d69eb5559f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
@@ -544,7 +544,7 @@ namespace AzToolsFramework
             m_errorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
             m_errorButton->setFixedSize(QSize(16, 16));
             m_errorButton->setMouseTracking(true);
-            m_errorButton->setIcon(QIcon("Editor/Icons/PropertyEditor/error_icon.png"));
+            m_errorButton->setIcon(QIcon("Icons/PropertyEditor/error_icon.png"));
             m_errorButton->setToolTip("Show Errors");
 
             // Insert the error button after the asset label
@@ -680,6 +680,13 @@ namespace AzToolsFramework
         AzQtComponents::BrowseEdit::removeDropTargetStyle(m_browseEdit);
     }
 
+    AssetSelectionModel PropertyAssetCtrl::GetAssetSelectionModel()
+    {
+        auto selectionModel = AssetSelectionModel::AssetTypeSelection(GetCurrentAssetType());
+        selectionModel.SetTitle(m_title);
+        return selectionModel;
+    }
+
     void PropertyAssetCtrl::UpdateTabOrder()
     {
         setTabOrder(m_browseEdit, m_editButton);
@@ -1058,6 +1065,11 @@ namespace AzToolsFramework
         m_editButton->setIcon(icon);
     }
 
+    void PropertyAssetCtrl::SetTitle(const QString& title)
+    {
+        m_title = title;
+    }
+
     void PropertyAssetCtrl::SetEditNotifyTarget(void* editNotifyTarget)
     {
         m_editNotifyTarget = editNotifyTarget;
@@ -1193,7 +1205,16 @@ namespace AzToolsFramework
     {
         (void)debugName;
 
-        if (attrib == AZ_CRC("EditCallback", 0xb74f2ee1))
+        if (attrib == AZ_CRC_CE("AssetPickerTitle"))
+        {
+            AZStd::string title;
+            attrValue->Read<AZStd::string>(title);
+            if (!title.empty())
+            {
+                GUI->SetTitle(title.c_str());
+            }
+        }
+        else if (attrib == AZ_CRC("EditCallback", 0xb74f2ee1))
         {
             PropertyAssetCtrl::EditCallbackType* func = azdynamic_cast<PropertyAssetCtrl::EditCallbackType*>(attrValue->GetAttribute());
             if (func)
@@ -1283,7 +1304,11 @@ namespace AzToolsFramework
         }
         else if (attrib == AZ_CRC_CE("Thumbnail"))
         {
-            GUI->SetShowThumbnail(true);
+            bool showThumbnail = false;
+            if (attrValue->Read<bool>(showThumbnail))
+            {
+                GUI->SetShowThumbnail(showThumbnail);
+            }
         }
         else if (attrib == AZ_CRC_CE("ThumbnailCallback"))
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
index b28ce3247c..e845cdf4fb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
@@ -89,12 +89,13 @@ namespace AzToolsFramework
         void dragLeaveEvent(QDragLeaveEvent* event) override;
         void dropEvent(QDropEvent* event) override;
 
-        virtual AssetSelectionModel GetAssetSelectionModel() { return AssetSelectionModel::AssetTypeSelection(GetCurrentAssetType()); }
+        virtual AssetSelectionModel GetAssetSelectionModel();
 
     signals:
         void OnAssetIDChanged(AZ::Data::AssetId newAssetID);
 
     protected:
+        QString m_title;
         ThumbnailPropertyCtrl* m_thumbnail = nullptr;
         QPushButton* m_errorButton = nullptr;
         QToolButton* m_editButton = nullptr;
@@ -191,6 +192,7 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
 
     public slots:
+        void SetTitle(const QString& title);
         void SetEditNotifyTarget(void* editNotifyTarget);
         void SetEditNotifyCallback(EditCallbackType* editNotifyCallback); // This is meant to be used with the "EditCallback" Attribute
         void SetClearNotifyCallback(ClearCallbackType* clearNotifyCallback); // This is meant to be used with the "ClearNotify" Attribute
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
index 6f7ae362fd..922ff8ae8c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
@@ -121,17 +121,14 @@ namespace AzToolsFramework
             EditorPickModeRequestBus::Handler::BusConnect(pickModeEntityContextId);
             EditorEventsBus::Handler::BusConnect();
 
-            if (IsNewViewportInteractionModelEnabled())
+            // replace the default input handler with one specific for dealing with
+            // entity selection in the viewport
+            EditorInteractionSystemViewportSelectionRequestBus::Event(
+                GetEntityContextId(), &EditorInteractionSystemViewportSelection::SetHandler,
+                [](const EditorVisibleEntityDataCache* entityDataCache)
             {
-                // replace the default input handler with one specific for dealing with
-                // entity selection in the viewport
-                EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    GetEntityContextId(), &EditorInteractionSystemViewportSelection::SetHandler,
-                    [](const EditorVisibleEntityDataCache* entityDataCache)
-                {
-                    return AZStd::make_unique<EditorPickEntitySelection>(entityDataCache);
-                });
-            }
+                return AZStd::make_unique<EditorPickEntitySelection>(entityDataCache);
+            });
 
             if (!pickModeEntityContextId.IsNull())
             {
@@ -162,12 +159,9 @@ namespace AzToolsFramework
             EditorEventsBus::Handler::BusDisconnect();
             emit OnPickComplete();
 
-            if (IsNewViewportInteractionModelEnabled())
-            {
-                // return to the default viewport editor selection
-                EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    GetEntityContextId(), &EditorInteractionSystemViewportSelection::SetDefaultHandler);
-            }
+            // return to the default viewport editor selection
+            EditorInteractionSystemViewportSelectionRequestBus::Event(
+                GetEntityContextId(), &EditorInteractionSystemViewportSelection::SetDefaultHandler);
 
             EditorPickModeNotificationBus::Broadcast(&EditorPickModeNotifications::OnEntityPickModeStopped);
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
index bb9232435a..2247350f52 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
@@ -114,6 +114,7 @@ namespace AzToolsFramework
             m_thumbnailEnlarged->move(position);
             m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
             m_thumbnailEnlarged->SetThumbnailKey(m_key);
+            m_thumbnailEnlarged->raise();
             m_thumbnailEnlarged->show();
         }
         QWidget::enterEvent(e);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp
index 7d9cea4e68..3e6217281b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp
@@ -70,7 +70,7 @@ namespace AzToolsFramework
         m_tagLabel->setMinimumSize(24, 22);
         m_tagLabel->setAttribute(Qt::WA_TransparentForMouseEvents, true);
 
-        QIcon closeIcon("Editor/Icons/animation/close.png");
+        QIcon closeIcon("Icons/animation/close.png");
 
         QPushButton* button = new QPushButton(this);
         button->setStyleSheet(button->styleSheet() + "border: 0px;");
@@ -233,14 +233,14 @@ namespace AzToolsFramework
         QPushButton* loadButton = new QPushButton(this);
         loadButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         loadButton->setFixedSize(QSize(24, 24));
-        loadButton->setIcon(QIcon("Editor/UI/Icons/toolbar/libraryLoad.png"));
+        loadButton->setIcon(QIcon("UI/Icons/toolbar/libraryLoad.png"));
         loadButton->setToolTip(tr("Load a saved filter"));
         loadButton->setProperty("iconButton", "true");
 
         m_saveButton = new QPushButton(this);
         m_saveButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         m_saveButton->setFixedSize(QSize(24, 24));
-        m_saveButton->setIcon(QIcon("Editor/UI/Icons/toolbar/librarySave.png"));
+        m_saveButton->setIcon(QIcon("UI/Icons/toolbar/librarySave.png"));
         m_saveButton->setToolTip(tr("Save the current filter"));
         m_saveButton->setEnabled(false);
         m_saveButton->setProperty("iconButton", "true");
@@ -248,7 +248,7 @@ namespace AzToolsFramework
         m_toggleAllFiltersButton = new QPushButton(this);
         m_toggleAllFiltersButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         m_toggleAllFiltersButton->setFixedSize(QSize(24, 24));
-        m_toggleAllFiltersButton->setIcon(QIcon("Editor/Icons/animation/filter_16.png"));
+        m_toggleAllFiltersButton->setIcon(QIcon("Icons/animation/filter_16.png"));
         m_toggleAllFiltersButton->setVisible(false);
         m_toggleAllFiltersButton->setToolTip(tr("Toggle all filters on/off"));
         m_toggleAllFiltersButton->setProperty("iconButton", "true");
@@ -267,7 +267,7 @@ namespace AzToolsFramework
         m_clearAllButton = new QPushButton(this);
         m_clearAllButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         m_clearAllButton->setFixedSize(QSize(24, 24));
-        m_clearAllButton->setIcon(QIcon("Editor/Icons/animation/close.png"));
+        m_clearAllButton->setIcon(QIcon("Icons/animation/close.png"));
         m_clearAllButton->setVisible(false);
         m_clearAllButton->setToolTip(tr("Clear all filters"));
         m_clearAllButton->setProperty("iconButton", "true");
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
index 5f7fce3c84..53dab661ce 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
@@ -126,7 +126,6 @@ namespace UnitTest
     /// Base fixture for ToolsApplication editor tests.
     class ToolsApplicationFixture
         : public AllocatorsTestFixture
-        , private AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler
     {
     public:
         void SetUp() override final
@@ -148,8 +147,6 @@ namespace UnitTest
             // in the unit tests.
             AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
 
-            AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler::BusConnect();
-
             m_editorActions.Connect();
 
             const auto viewportHandlerBuilder =
@@ -184,7 +181,6 @@ namespace UnitTest
 
             TearDownEditorFixtureImpl();
             m_editorActions.Disconnect();
-            AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler::BusDisconnect();
 
             // Stop & delete the Application created by this fixture, hence not using GetApplication() here
             if (m_app)
@@ -222,14 +218,6 @@ namespace UnitTest
 
     private:
         AZStd::unique_ptr<ToolsTestApplication> m_app;
-
-        // NewViewportInteractionModelEnabledRequestBus ...
-        bool IsNewViewportInteractionModelEnabled() override
-        {
-            // default to the new viewport interaction model bus being enabled so the
-            // manipulator manager is correctly instantiated in EditorDefaultSelection
-            return true;
-        }
     };
 
     class EditorEntityComponentChangeDetector
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
index 7aaa26c01b..a9949d382e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
@@ -277,20 +277,6 @@ namespace AzToolsFramework
 
     } // namespace ViewportInteraction
 
-    /// Temporary bus to query if the new Viewport Interaction Model mode is enabled or not.
-    class NewViewportInteractionModelEnabledRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual bool IsNewViewportInteractionModelEnabled() = 0;
-
-    protected:
-        ~NewViewportInteractionModelEnabledRequests() = default;
-    };
-
-    /// Type to inherit to implement NewViewportInteractionModelEnabledRequests
-    using NewViewportInteractionModelEnabledRequestBus = AZ::EBus<NewViewportInteractionModelEnabledRequests>;
-
     /// Utility function to return EntityContextId.
     inline AzFramework::EntityContextId GetEntityContextId()
     {
@@ -300,16 +286,4 @@ namespace AzToolsFramework
 
         return entityContextId;
     }
-
-    /// Utility function to return if the new Viewport Interaction Model
-    /// is enabled (wraps NewViewportInteractionModelEnabledRequests).
-    inline bool IsNewViewportInteractionModelEnabled()
-    {
-        bool newViewportInteractionModelEnabled = false;
-        NewViewportInteractionModelEnabledRequestBus::BroadcastResult(
-            newViewportInteractionModelEnabled,
-            &NewViewportInteractionModelEnabledRequests::IsNewViewportInteractionModelEnabled);
-
-        return newViewportInteractionModelEnabled;
-    }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp
index d9cf4af944..2e467caa4c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp
@@ -13,6 +13,7 @@
 #include "EditorBoxSelect.h"
 
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 
 #include <QApplication>
 
@@ -72,7 +73,7 @@ namespace AzToolsFramework
         m_previousModifiers = mouseInteraction.m_mouseInteraction.m_keyboardModifiers;
     }
 
-    void EditorBoxSelect::Display2d(AzFramework::DebugDisplayRequests& debugDisplay)
+    void EditorBoxSelect::Display2d(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -82,12 +83,15 @@ namespace AzToolsFramework
             debugDisplay.SetLineWidth(s_boxSelectLineWidth);
             debugDisplay.SetColor(s_boxSelectColor);
 
-            debugDisplay.DrawWireBox(
-                AZ::Vector3(
-                    static_cast<float>(m_boxSelectRegion->x()), static_cast<float>(m_boxSelectRegion->y()), 0.0f),
-                AZ::Vector3(
-                    static_cast<float>(m_boxSelectRegion->x()) + static_cast<float>(m_boxSelectRegion->width()),
-                    static_cast<float>(m_boxSelectRegion->y()) + static_cast<float>(m_boxSelectRegion->height()), 0.0f));
+            AZ::Vector2 viewportSize = AzToolsFramework::GetCameraState(viewportInfo.m_viewportId).m_viewportSize;
+
+            debugDisplay.DrawWireQuad2d(
+                AZ::Vector2(
+                    aznumeric_cast<float>(m_boxSelectRegion->x()), aznumeric_cast<float>(m_boxSelectRegion->y())) / viewportSize,
+                AZ::Vector2(
+                    aznumeric_cast<float>(m_boxSelectRegion->x()) + aznumeric_cast<float>(m_boxSelectRegion->width()),
+                    aznumeric_cast<float>(m_boxSelectRegion->y()) + aznumeric_cast<float>(m_boxSelectRegion->height())) / viewportSize,
+                0.f);
 
             debugDisplay.DepthTestOn();
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h
index d9fca58168..7f50b16325 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h
@@ -42,7 +42,7 @@ namespace AzToolsFramework
             const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
 
         /// Responsible for drawing the 2d box representing the selection in screen space.
-        void Display2d(AzFramework::DebugDisplayRequests& debugDisplay);
+        void Display2d(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay);
 
         /// Custom drawing behavior to happen during a box select.
         void DisplayScene(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
index 1d32e5f6e6..a7f500cc5f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
@@ -30,15 +30,9 @@ namespace AzToolsFramework
         ActionOverrideRequestBus::Handler::BusConnect(GetEntityContextId());
         ComponentModeFramework::ComponentModeSystemRequestBus::Handler::BusConnect();
 
-        // only create EditorTransformComponentSelection if we are using the new viewport interaction model
-        // note: EditorDefaultSelection is still used when the new viewport interaction model is disabled to support
-        // Component Mode when using legacy viewport interaction model
-        if (IsNewViewportInteractionModelEnabled())
-        {
-            m_manipulatorManager =
-                AZStd::make_shared<AzToolsFramework::ManipulatorManager>(AzToolsFramework::g_mainManipulatorManagerId);
-            m_transformComponentSelection = AZStd::make_unique<EditorTransformComponentSelection>(entityDataCache);
-        }
+        m_manipulatorManager =
+            AZStd::make_shared<AzToolsFramework::ManipulatorManager>(AzToolsFramework::g_mainManipulatorManagerId);
+        m_transformComponentSelection = AZStd::make_unique<EditorTransformComponentSelection>(entityDataCache);
     }
 
     EditorDefaultSelection::~EditorDefaultSelection()
@@ -325,17 +319,14 @@ namespace AzToolsFramework
             m_transformComponentSelection->DisplayViewportSelection(viewportInfo, debugDisplay);
         }
 
-        if (IsNewViewportInteractionModelEnabled())
-        {
-            // poll and set the keyboard modifiers to ensure the mouse interaction is up to date
-            m_currentInteraction.m_keyboardModifiers =
-                AzToolsFramework::ViewportInteraction::BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers());
-            // draw the manipulators
-            const AzFramework::CameraState cameraState = GetCameraState(viewportInfo.m_viewportId);
-            debugDisplay.DepthTestOff();
-            m_manipulatorManager->DrawManipulators(debugDisplay, cameraState, m_currentInteraction);
-            debugDisplay.DepthTestOn();
-        }
+        // poll and set the keyboard modifiers to ensure the mouse interaction is up to date
+        m_currentInteraction.m_keyboardModifiers =
+            AzToolsFramework::ViewportInteraction::BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers());
+        // draw the manipulators
+        const AzFramework::CameraState cameraState = GetCameraState(viewportInfo.m_viewportId);
+        debugDisplay.DepthTestOff();
+        m_manipulatorManager->DrawManipulators(debugDisplay, cameraState, m_currentInteraction);
+        debugDisplay.DepthTestOn();
     }
 
     void EditorDefaultSelection::DisplayViewportSelection2d(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 433602e6d8..ec22a2f7c8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -441,7 +441,7 @@ namespace AzToolsFramework
             clusterId);
     }
 
-    static void SetViewportUiClusterVisible(ViewportUi::ClusterId clusterId, bool visible)
+    static void SetViewportUiClusterVisible(const ViewportUi::ClusterId clusterId, const bool visible)
     {
         ViewportUi::ViewportUiRequestBus::Event(
             ViewportUi::DefaultViewportId,
@@ -449,7 +449,7 @@ namespace AzToolsFramework
             clusterId, visible);
     }
 
-    static void SetViewportUiClusterActiveButton(ViewportUi::ClusterId clusterId, ViewportUi::ButtonId buttonId)
+    static void SetViewportUiClusterActiveButton(const ViewportUi::ClusterId clusterId, const ViewportUi::ButtonId buttonId)
     {
         ViewportUi::ViewportUiRequestBus::Event(
             ViewportUi::DefaultViewportId,
@@ -457,7 +457,7 @@ namespace AzToolsFramework
             clusterId, buttonId);
     }
 
-    static ViewportUi::ButtonId RegisterClusterButton(ViewportUi::ClusterId clusterId, const char* iconName)
+    static ViewportUi::ButtonId RegisterClusterButton(const ViewportUi::ClusterId clusterId, const char* iconName)
     {
         ViewportUi::ButtonId buttonId;
         ViewportUi::ViewportUiRequestBus::EventResult(
@@ -3494,7 +3494,7 @@ namespace AzToolsFramework
 
         DrawAxisGizmo(viewportInfo, debugDisplay);
 
-        m_boxSelect.Display2d(debugDisplay);
+        m_boxSelect.Display2d(viewportInfo, debugDisplay);
     }
 
     void EditorTransformComponentSelection::RefreshSelectedEntityIds()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
index 701344db18..7ef6d96223 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
@@ -13,7 +13,6 @@
 #include "AzToolsFramework_precompiled.h"
 
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
@@ -22,4 +21,11 @@ namespace AzToolsFramework::ViewportUi::Internal
         , m_buttonId(buttonId)
     {
     }
+
+    Button::Button(AZStd::string icon, AZStd::string name, ButtonId buttonId)
+        : m_icon(AZStd::move(icon))
+        , m_name(AZStd::move(name))
+        , m_buttonId(buttonId)
+    {
+    }
 } // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
index 8ff98abc5d..cd4d548510 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include <AzToolsFramework/ViewportUi/Cluster.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
@@ -27,10 +26,12 @@ namespace AzToolsFramework::ViewportUi::Internal
             Deselected
         };
 
-        explicit Button(AZStd::string icon, ButtonId buttonId);
+        Button(AZStd::string icon, ButtonId buttonId);
+        Button(AZStd::string icon, AZStd::string name, ButtonId buttonId);
         ~Button() = default;
 
         AZStd::string m_icon; //!< The icon for this button, string path to an image.
+        AZStd::string m_name; //!< The name displayed as a label next to the button's icon.
         State m_state = State::Deselected; 
         ButtonId m_buttonId; 
     };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
new file mode 100644
index 0000000000..3aeb14ed46
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
@@ -0,0 +1,88 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzToolsFramework/ViewportUi/Button.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
+
+namespace AzToolsFramework::ViewportUi::Internal
+{
+    ButtonGroup::ButtonGroup()
+        : m_buttons()
+        , m_buttonTriggeredEvent()
+    {
+    }
+
+    void ButtonGroup::SetViewportUiElementId(const ViewportUiElementId id)
+    {
+        m_viewportUiId = id;
+    }
+
+    ViewportUiElementId ButtonGroup::GetViewportUiElementId() const
+    {
+        return m_viewportUiId;
+    }
+
+    void ButtonGroup::SetHighlightedButton(ButtonId buttonId)
+    {
+        if (auto buttonEntry = m_buttons.find(buttonId); buttonEntry != m_buttons.end())
+        {
+            for (auto& button : m_buttons)
+            {
+                button.second->m_state = Button::State::Deselected;
+            }
+            buttonEntry->second->m_state = Button::State::Selected;
+        }
+    }
+
+    ButtonId ButtonGroup::AddButton(const AZStd::string& icon, const AZStd::string& name)
+    {
+        auto buttonId = ButtonId(m_buttons.size() + 1);
+
+        if (name.empty())
+        {
+            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, buttonId)});
+        }
+        else
+        {
+            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, name, buttonId)});
+        }
+        return buttonId;
+    }
+
+    Button* ButtonGroup::GetButton(ButtonId buttonId)
+    {
+        if (auto buttonEntry = m_buttons.find(buttonId); buttonEntry != m_buttons.end())
+        {
+            return buttonEntry->second.get();
+        }
+        return nullptr;
+    }
+
+    AZStd::vector<Button*> ButtonGroup::GetButtons()
+    {
+        auto buttons = AZStd::vector<Button*>();
+        for (const auto& button : m_buttons)
+        {
+            buttons.push_back(button.second.get());
+        }
+        return buttons;
+    }
+
+    void ButtonGroup::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler) {
+        handler.Connect(m_buttonTriggeredEvent);
+    }
+
+    void ButtonGroup::PressButton(ButtonId buttonId)
+    {
+        m_buttonTriggeredEvent.Signal(buttonId);
+    }
+} // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
new file mode 100644
index 0000000000..9b4977b58c
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
@@ -0,0 +1,47 @@
+#pragma once
+
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
+
+namespace AzToolsFramework::ViewportUi::Internal
+{
+    class Button;
+
+    //! Data class for a button group on the Viewport UI. A button group is defined as a group of buttons with icons
+    //! each of which can be clicked to trigger an event e.g. toggling between modes.
+    //! @note This can be used with either a Cluster or a Switcher with slightly different visuals for each.
+    class ButtonGroup
+    {
+    public:
+        ButtonGroup();
+        ~ButtonGroup() = default;
+
+        void SetHighlightedButton(ButtonId buttonId);
+
+        void SetViewportUiElementId(ViewportUiElementId id);
+        ViewportUiElementId GetViewportUiElementId() const;
+
+        ButtonId AddButton(const AZStd::string& icon, const AZStd::string& name = AZStd::string());
+        Button* GetButton(ButtonId buttonId);
+        AZStd::vector<Button*> GetButtons();
+
+        void ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler);
+        void PressButton(ButtonId buttonId);
+
+    private:
+        AZ::Event<ButtonId> m_buttonTriggeredEvent;
+        ViewportUiElementId m_viewportUiId;
+        AZStd::unordered_map<ButtonId, AZStd::unique_ptr<Button>> m_buttons;
+    };
+} // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Cluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Cluster.cpp
deleted file mode 100644
index 2de6836aa5..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Cluster.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
-
-namespace AzToolsFramework::ViewportUi::Internal
-{
-    Cluster::Cluster()
-        : m_buttons()
-        , m_buttonTriggeredEvent()
-    {
-    }
-
-    void Cluster::SetViewportUiElementId(const ViewportUiElementId id)
-    {
-        m_viewportUiId = id;
-    }
-
-    ViewportUiElementId Cluster::GetViewportUiElementId() const
-    {
-        return m_viewportUiId;
-    }
-
-    void Cluster::SetClusterId(const ClusterId clusterId)
-    {
-        m_clusterId = clusterId;
-    }
-
-    ClusterId Cluster::GetClusterId() const
-    {
-        return m_clusterId;
-    }
-
-    void Cluster::SetHighlightedButton(ButtonId buttonId)
-    {
-        if (auto buttonEntry = m_buttons.find(buttonId); buttonEntry != m_buttons.end())
-        {
-            for (auto& button : m_buttons)
-            {
-                button.second->m_state = Button::State::Deselected;
-            }
-            buttonEntry->second->m_state = Button::State::Selected;
-        }
-    }
-
-    ButtonId Cluster::AddButton(const AZStd::string& icon)
-    {
-        auto buttonId = ButtonId(m_buttons.size() + 1);
-
-        m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, buttonId)});
-        return buttonId;
-    }
-
-    Button* Cluster::GetButton(ButtonId buttonId)
-    {
-        if (auto buttonEntry = m_buttons.find(buttonId); buttonEntry != m_buttons.end())
-        {
-            return buttonEntry->second.get();
-        }
-        return nullptr;
-    }
-
-    AZStd::vector<Button*> Cluster::GetButtons()
-    {
-        auto buttons = AZStd::vector<Button*>();
-        for (const auto& button : m_buttons)
-        {
-            buttons.push_back(button.second.get());
-        }
-        return buttons;
-    }
-
-    void Cluster::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler) {
-        handler.Connect(m_buttonTriggeredEvent);
-    }
-
-    void Cluster::PressButton(ButtonId buttonId)
-    {
-        m_buttonTriggeredEvent.Signal(buttonId);
-    }
-} // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Cluster.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Cluster.h
deleted file mode 100644
index d0f47e77ae..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Cluster.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
-
-namespace AzToolsFramework::ViewportUi::Internal
-{
-    class Button;
-
-    //! Data class for a cluster on the Viewport UI. A cluster is defined as a group of buttons with icons
-    //! each of which can be clicked to trigger an event e.g. toggling between modes.
-    class Cluster
-    {
-    public:
-        Cluster();
-        ~Cluster() = default;
-
-        void SetHighlightedButton(ButtonId buttonId);
-
-        void SetViewportUiElementId(ViewportUiElementId id);
-        ViewportUiElementId GetViewportUiElementId() const;
-
-        void SetClusterId(ClusterId id);
-        ClusterId GetClusterId() const;
-
-        ButtonId AddButton(const AZStd::string& icon);
-        Button* GetButton(ButtonId buttonId);
-        AZStd::vector<Button*> GetButtons();
-
-        void ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler);
-        void PressButton(ButtonId buttonId);
-
-    private:
-        AZ::Event<ButtonId> m_buttonTriggeredEvent;
-        ViewportUiElementId m_viewportUiId;
-        ClusterId m_clusterId;
-        AZStd::unordered_map<ButtonId, AZStd::unique_ptr<Button>> m_buttons;
-    };
-} // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
index a5fc0e78c6..79744f1dbf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
@@ -9,21 +9,22 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
+
 #include "AzToolsFramework_precompiled.h"
 
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    ViewportUiCluster::ViewportUiCluster(AZStd::shared_ptr<Cluster> cluster)
+    ViewportUiCluster::ViewportUiCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup)
         : QToolBar(nullptr)
-        , m_cluster(cluster)
+        , m_buttonGroup(buttonGroup)
     {
         setOrientation(Qt::Orientation::Vertical);
         setStyleSheet("background: black;");
 
-        const AZStd::vector<Button*> buttons = cluster->GetButtons();
+        const AZStd::vector<Button*> buttons = buttonGroup->GetButtons();
         for (auto button : buttons)
         {
             RegisterButton(button);
@@ -39,7 +40,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         AddClusterAction(
             action,
             [this, button]() {
-                m_cluster->PressButton(button->m_buttonId);
+                m_buttonGroup->PressButton(button->m_buttonId);
             },
             [button](QAction* action) {
                 action->setChecked(button->m_state == Button::State::Selected);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
index 26ed45a0c6..4f738177ea 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
@@ -18,10 +18,10 @@
 #include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
 #include <QToolBar>
 
-class Cluster;
-
 namespace AzToolsFramework::ViewportUi::Internal
 {
+    class ButtonGroup;
+
     //! Helper class to make clusters (toolbars) for display in Viewport UI.
     class ViewportUiCluster
         : public QToolBar
@@ -29,7 +29,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         Q_OBJECT
 
     public:
-        ViewportUiCluster(AZStd::shared_ptr<Cluster> cluster);
+        ViewportUiCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup);
         ~ViewportUiCluster() = default;
 
         //! Adds a new button to the cluster.
@@ -49,7 +49,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         //! Removes an action from the Viewport UI Cluster.
         void RemoveClusterAction(QAction* action);
 
-        AZStd::shared_ptr<Cluster> m_cluster; //!< Data structure which the cluster will be displaying to the Viewport UI.
+        AZStd::shared_ptr<ButtonGroup> m_buttonGroup; //!< Data structure which the cluster will be displaying to the Viewport UI.
         AZStd::unordered_map<ButtonId, QPointer<QAction>> m_buttonActionMap; //!< Map for buttons to their corresponding actions.
         ViewportUiWidgetCallbacks m_widgetCallbacks; //!< Registers actions and manages updates.
     };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index abce581940..e67ac46f62 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -18,6 +18,7 @@
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiSwitcher.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiTextField.h>
 #include <QWidget>
 
@@ -55,16 +56,16 @@ namespace AzToolsFramework::ViewportUi::Internal
         UnparentWidgets(m_viewportUiElements);
     }
 
-    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<Cluster> cluster)
+    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup)
     {
-        if (!cluster.get())
+        if (!buttonGroup.get())
         {
             return;
         }
 
-        auto viewportUiCluster = AZStd::make_shared<ViewportUiCluster>(cluster);
+        auto viewportUiCluster = AZStd::make_shared<ViewportUiCluster>(buttonGroup);
         auto id = AddViewportUiElement(viewportUiCluster);
-        cluster->SetViewportUiElementId(id);
+        buttonGroup->SetViewportUiElementId(id);
         PositionViewportUiElementAnchored(id, Qt::AlignTop | Qt::AlignLeft);
     }
 
@@ -93,6 +94,51 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
+    void ViewportUiDisplay::AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup)
+    {
+        if (!buttonGroup.get())
+        {
+            return;
+        }
+
+        auto viewportUiSwitcher = AZStd::make_shared<ViewportUiSwitcher>(buttonGroup);
+        auto id = AddViewportUiElement(viewportUiSwitcher);
+        buttonGroup->SetViewportUiElementId(id);
+        PositionViewportUiElementAnchored(id, Qt::AlignTop | Qt::AlignLeft);
+    }
+
+    void ViewportUiDisplay::AddSwitcherButton(const ViewportUiElementId clusterId, Button* button)
+    {
+        if (auto viewportUiSwitcher = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            viewportUiSwitcher->AddButton(button);
+        }
+    }
+
+    void ViewportUiDisplay::RemoveSwitcherButton(ViewportUiElementId clusterId, ButtonId buttonId)
+    {
+        if (auto cluster = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            cluster->RemoveButton(buttonId);
+        }
+    }
+
+    void ViewportUiDisplay::UpdateSwitcher(ViewportUiElementId clusterId)
+    {
+        if (auto cluster = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            cluster->Update();
+        }
+    }
+
+    void ViewportUiDisplay::SetSwitcherActiveButton(ViewportUiElementId clusterId, ButtonId buttonId)
+    {
+        if (auto viewportUiSwitcher = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            viewportUiSwitcher->SetActiveButton(buttonId);
+        }
+    }
+
     void ViewportUiDisplay::AddTextField(AZStd::shared_ptr<TextField> textField)
     {
         if (!textField.get())
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
index c6c097c0db..7ef81986c0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
@@ -13,7 +13,7 @@
 #pragma once
 
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h>
@@ -56,11 +56,17 @@ namespace AzToolsFramework::ViewportUi::Internal
         ViewportUiDisplay(QWidget* parent, QWidget* renderOverlay);
         ~ViewportUiDisplay();
 
-        void AddCluster(AZStd::shared_ptr<Cluster> cluster);
+        void AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup);
         void AddClusterButton(ViewportUiElementId clusterId, Button* button);
         void RemoveClusterButton(ViewportUiElementId clusterId, ButtonId buttonId);
         void UpdateCluster(const ViewportUiElementId clusterId);
 
+        void AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup);
+        void AddSwitcherButton(ViewportUiElementId switcherId, Button* button);
+        void RemoveSwitcherButton(ViewportUiElementId switcherId, ButtonId buttonId);
+        void UpdateSwitcher(ViewportUiElementId switcherId);
+        void SetSwitcherActiveButton(ViewportUiElementId switcherId, ButtonId buttonId);
+
         void AddTextField(AZStd::shared_ptr<TextField> textField);
         void UpdateTextField(ViewportUiElementId textFieldId);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
index 0ae79a7e92..bab664d832 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
@@ -30,7 +30,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         // create a 3x2 map of sub layouts which will stack widgets according to their mapped alignment
         m_internalLayouts = AZStd::unordered_map<Qt::Alignment, QBoxLayout*> {
-            CreateSubLayout(new QHBoxLayout(), 0, 0, Qt::AlignTop | Qt::AlignLeft),
+            CreateSubLayout(new QVBoxLayout(), 0, 0, Qt::AlignTop | Qt::AlignLeft),
             CreateSubLayout(new QHBoxLayout(), 1, 0, Qt::AlignBottom | Qt::AlignLeft),
             CreateSubLayout(new QVBoxLayout(), 0, 1, Qt::AlignTop),
             CreateSubLayout(new QHBoxLayout(), 1, 1, Qt::AlignBottom),
@@ -60,7 +60,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     AZStd::pair<Qt::Alignment, QBoxLayout*> ViewportUiDisplayLayout::CreateSubLayout(
         QBoxLayout* layout, const int row, const int column, const Qt::Alignment alignment)
     {
-        layout->setAlignment(alignment); 
+        layout->setAlignment(alignment);
 
         // add an invisible spacer (stretch) to occupy empty space
         // without this, alignment and resizing within the sublayouts becomes difficult
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
index bf0e6a0c76..6eb97adb93 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
@@ -14,7 +14,7 @@
 
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 
@@ -32,36 +32,64 @@ namespace AzToolsFramework::ViewportUi
 
     const ClusterId ViewportUiManager::CreateCluster()
     {
-        auto cluster = AZStd::make_shared<Internal::Cluster>();
-        m_viewportUi->AddCluster(cluster);
+        auto buttonGroup = AZStd::make_shared<Internal::ButtonGroup>();
+        m_viewportUi->AddCluster(buttonGroup);
 
-        return RegisterNewCluster(cluster);
+        return RegisterNewCluster(buttonGroup);
+    }
+
+    const SwitcherId ViewportUiManager::CreateSwitcher()
+    {
+        auto buttonGroup = AZStd::make_shared<Internal::ButtonGroup>();
+        m_viewportUi->AddSwitcher(buttonGroup);
+
+        return RegisterNewSwitcher(buttonGroup);
     }
 
     void ViewportUiManager::SetClusterActiveButton(const ClusterId clusterId, const ButtonId buttonId)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             cluster->SetHighlightedButton(buttonId);
-            UpdateClusterUi(cluster.get());
+            UpdateButtonGroupUi(cluster.get());
+        }
+    }
+
+    void ViewportUiManager::SetSwitcherActiveButton(const SwitcherId switcherId, const ButtonId buttonId)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            switcher->SetHighlightedButton(buttonId);
+            m_viewportUi->SetSwitcherActiveButton(switcher->GetViewportUiElementId(), buttonId);
+            UpdateButtonGroupUi(switcher.get());
         }
     }
 
     void ViewportUiManager::RegisterClusterEventHandler(const ClusterId clusterId, AZ::Event<ButtonId>::Handler& handler)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             cluster->ConnectEventHandler(handler);
         }
     }
 
+    void ViewportUiManager::RegisterSwitcherEventHandler(const SwitcherId switcherId, AZ::Event<ButtonId>::Handler& handler)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            switcher->ConnectEventHandler(handler);
+        }
+    }
+
     const ButtonId ViewportUiManager::CreateClusterButton(const ClusterId clusterId, const AZStd::string& icon)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             auto newId = cluster->AddButton(icon);
             m_viewportUi->AddClusterButton(cluster->GetViewportUiElementId(), cluster->GetButton(newId));
 
@@ -71,12 +99,35 @@ namespace AzToolsFramework::ViewportUi
         return ButtonId(0);
     }
 
+    const ButtonId ViewportUiManager::CreateSwitcherButton(const SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            auto newId = switcher->AddButton(icon, name);
+            m_viewportUi->AddSwitcherButton(switcher->GetViewportUiElementId(), switcher->GetButton(newId));
+
+            return newId;
+        }
+
+        return ButtonId(0);
+    }
+
     void ViewportUiManager::RemoveCluster(const ClusterId clusterId)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            m_clusters.erase(clusterEntry);
-            m_viewportUi->RemoveViewportUiElement(clusterEntry->second->GetViewportUiElementId());
+            m_clusterButtonGroups.erase(clusterIt);
+            m_viewportUi->RemoveViewportUiElement(clusterIt->second->GetViewportUiElementId());
+        }
+    }
+
+    void ViewportUiManager::RemoveSwitcher(SwitcherId switcherId)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            m_switcherButtonGroups.erase(switcherIt);
+            m_viewportUi->RemoveViewportUiElement(switcherIt->second->GetViewportUiElementId());
         }
     }
 
@@ -93,15 +144,24 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-    void ViewportUiManager::SetClusterVisible(ClusterId clusterId, bool visible)
+    void ViewportUiManager::SetClusterVisible(const ClusterId clusterId, bool visible)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             SetViewportUiElementVisible(m_viewportUi.get(), cluster->GetViewportUiElementId(), visible);
         }
     }
 
+    void ViewportUiManager::SetSwitcherVisible(const SwitcherId switcherId, bool visible)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            SetViewportUiElementVisible(m_viewportUi.get(), switcher->GetViewportUiElementId(), visible);
+        }
+    }
+
     void ViewportUiManager::SetClusterGroupVisible(const AZStd::vector<ClusterId>& clusterGroup, bool visible)
     {
         for (auto clusterId : clusterGroup)
@@ -123,9 +183,9 @@ namespace AzToolsFramework::ViewportUi
 
     void ViewportUiManager::SetTextFieldText(TextFieldId textFieldId, const AZStd::string& text)
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            auto textField = textFieldEntry->second;
+            auto textField = textFieldIt->second;
             textField->m_fieldText = text;
             UpdateTextFieldUi(textField.get());
         }
@@ -134,27 +194,27 @@ namespace AzToolsFramework::ViewportUi
     void ViewportUiManager::RegisterTextFieldCallback(
         TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) 
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            auto textField = textFieldEntry->second;
+            auto textField = textFieldIt->second;
             textField->ConnectEventHandler(handler);
         }
     }
 
     void ViewportUiManager::RemoveTextField(TextFieldId textFieldId)
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            m_textFields.erase(textFieldEntry);
-            m_viewportUi->RemoveViewportUiElement(textFieldEntry->second->m_viewportId);
+            m_textFields.erase(textFieldIt);
+            m_viewportUi->RemoveViewportUiElement(textFieldIt->second->m_viewportId);
         }
     }
 
     void ViewportUiManager::SetTextFieldVisible(TextFieldId textFieldId, bool visible)
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            auto textField = textFieldEntry->second;
+            auto textField = textFieldIt->second;
             SetViewportUiElementVisible(m_viewportUi.get(), textField->m_viewportId, visible);
         }
     }
@@ -173,10 +233,19 @@ namespace AzToolsFramework::ViewportUi
     void ViewportUiManager::PressButton(ClusterId clusterId, ButtonId buttonId)
     {
         // Find cluster using ID and cluster map
-        if (auto clusterEntry = m_clusters.find(clusterId);
-            clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId);
+            clusterIt != m_clusterButtonGroups.end())
         {
-            clusterEntry->second->PressButton(buttonId);
+            clusterIt->second->PressButton(buttonId);
+        }
+    }
+
+    void ViewportUiManager::PressButton(SwitcherId switcherId, ButtonId buttonId)
+    {
+        // Find cluster using ID and cluster map
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            switcherIt->second->PressButton(buttonId);
         }
     }
 
@@ -196,21 +265,32 @@ namespace AzToolsFramework::ViewportUi
     {
         m_viewportUi->Update();
 
-        for (auto clusterEntry : m_clusters)
+        for (auto buttonGroup : m_clusterButtonGroups)
+        {
+            UpdateButtonGroupUi(buttonGroup.second.get());
+        }
+        for (auto buttonGroup : m_switcherButtonGroups)
         {
-            UpdateClusterUi(clusterEntry.second.get());
+            UpdateButtonGroupUi(buttonGroup.second.get());
         }
-        for (auto textFieldEntry : m_textFields)
+        for (auto textField : m_textFields)
         {
-            UpdateTextFieldUi(textFieldEntry.second.get());
+            UpdateTextFieldUi(textField.second.get());
         }
     }
 
-    ClusterId ViewportUiManager::RegisterNewCluster(AZStd::shared_ptr<Internal::Cluster>& cluster)
+    ClusterId ViewportUiManager::RegisterNewCluster(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup)
+    {
+        ClusterId newId = ClusterId(m_clusterButtonGroups.size() + 1);
+        m_clusterButtonGroups.insert({ newId, buttonGroup });
+
+        return newId;
+    }
+
+    SwitcherId ViewportUiManager::RegisterNewSwitcher(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup)
     {
-        ClusterId newId = ClusterId(m_clusters.size() + 1);
-        cluster->SetClusterId(newId);
-        m_clusters.insert({ newId, cluster });
+        SwitcherId newId = SwitcherId(m_switcherButtonGroups.size() + 1);
+        m_switcherButtonGroups.insert({newId, buttonGroup});
 
         return newId;
     }
@@ -224,9 +304,9 @@ namespace AzToolsFramework::ViewportUi
         return newId;
     }
 
-    void ViewportUiManager::UpdateClusterUi(Internal::Cluster* cluster)
+    void ViewportUiManager::UpdateButtonGroupUi(Internal::ButtonGroup* buttonGroup)
     {
-        m_viewportUi->UpdateCluster(cluster->GetViewportUiElementId());
+        m_viewportUi->UpdateCluster(buttonGroup->GetViewportUiElementId());
     }
 
     void ViewportUiManager::UpdateTextFieldUi(Internal::TextField* textField)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
index c30524ce55..1b350bbd64 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
@@ -1,19 +1,18 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 
@@ -21,6 +20,7 @@ namespace AzToolsFramework::ViewportUi
 {
     namespace Internal
     {
+        class ButtonGroup;
         class ViewportUiDisplay;
     }
 
@@ -29,26 +29,32 @@ namespace AzToolsFramework::ViewportUi
     public:
         ViewportUiManager() = default;
         ~ViewportUiManager() = default;
-        
+
         // ViewportUiRequestBus ...
         const ClusterId CreateCluster() override;
+        const SwitcherId CreateSwitcher() override;
         void SetClusterActiveButton(ClusterId clusterId, ButtonId buttonId) override;
+        void SetSwitcherActiveButton(SwitcherId switcherId, ButtonId buttonId) override;
         const ButtonId CreateClusterButton(ClusterId clusterId, const AZStd::string& icon) override;
+        const ButtonId CreateSwitcherButton(
+            SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name = AZStd::string()) override;
         void RegisterClusterEventHandler(ClusterId clusterId, AZ::Event<ButtonId>::Handler& handler) override;
+        void RegisterSwitcherEventHandler(SwitcherId switcherId, AZ::Event<ButtonId>::Handler& handler) override;
         void RemoveCluster(ClusterId clusterId) override;
+        void RemoveSwitcher(SwitcherId switcherId) override;
         void SetClusterVisible(ClusterId clusterId, bool visible);
+        void SetSwitcherVisible(SwitcherId switcherId, bool visible);
         void SetClusterGroupVisible(const AZStd::vector<ClusterId>& clusterGroup, bool visible) override;
         const TextFieldId CreateTextField(
-            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText,
-            TextFieldValidationType validationType) override;
+            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText, TextFieldValidationType validationType) override;
         void SetTextFieldText(TextFieldId textFieldId, const AZStd::string& text) override;
-        void RegisterTextFieldCallback(
-            TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) override;
+        void RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) override;
         void RemoveTextField(TextFieldId textFieldId) override;
         void SetTextFieldVisible(TextFieldId textFieldId, bool visible) override;
         void CreateComponentModeBorder(const AZStd::string& borderTitle) override;
         void RemoveComponentModeBorder() override;
         void PressButton(ClusterId clusterId, ButtonId buttonId) override;
+        void PressButton(SwitcherId switcherId, ButtonId buttonId) override;
 
         //! Connects to the correct viewportId bus address.
         void ConnectViewportUiBus(const int viewportId);
@@ -60,17 +66,23 @@ namespace AzToolsFramework::ViewportUi
         void Update();
 
     protected:
-        AZStd::unordered_map<ClusterId, AZStd::shared_ptr<Internal::Cluster>> m_clusters; //!< A map of all registered clusters.
-        AZStd::unordered_map<TextFieldId, AZStd::shared_ptr<Internal::TextField>> m_textFields; //!< A map of all registered textFields.
+        AZStd::unordered_map<ClusterId, AZStd::shared_ptr<Internal::ButtonGroup>>
+            m_clusterButtonGroups; //!< A map of all registered Clusters.
+        AZStd::unordered_map<SwitcherId, AZStd::shared_ptr<Internal::ButtonGroup>>
+            m_switcherButtonGroups; //!< A map of all registered Switchers.
+        AZStd::unordered_map<TextFieldId, AZStd::shared_ptr<Internal::TextField>> m_textFields; //!< A map of all registered TextFields.
+
         AZStd::unique_ptr<Internal::ViewportUiDisplay> m_viewportUi; //!< The lower level graphical API for Viewport UI.
 
     private:
-        //! Register a new cluster and return its id.
-        ClusterId RegisterNewCluster(AZStd::shared_ptr<Internal::Cluster>& cluster);
+        //! Register a new Cluster and return its id.
+        ClusterId RegisterNewCluster(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup);
+        //! Register a new Switcher and return its id.
+        SwitcherId RegisterNewSwitcher(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup);
         //! Register a new text field and return its id.
         TextFieldId RegisterNewTextField(AZStd::shared_ptr<Internal::TextField>& textField);
-        //! Update the corresponding ui element for the given cluster.
-        void UpdateClusterUi(Internal::Cluster* cluster);
+        //! Update the corresponding ui element for the given button group.
+        void UpdateButtonGroupUi(Internal::ButtonGroup* buttonGroup);
         //! Update the corresponding ui element for the given text field.
         void UpdateTextFieldUi(Internal::TextField* textField);
     };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
index a4ee22a9fa..5041f28656 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -23,11 +23,13 @@ namespace AzToolsFramework::ViewportUi
     using ViewportUiElementId = IdType<struct ViewportUiIdType>;
     using ButtonId = IdType<struct ButtonIdType>;
     using ClusterId = IdType<struct ClusterIdType>;
+    using SwitcherId = IdType<struct SwitcherIdType>;
     using TextFieldId = IdType<struct TextFieldIdType>;
 
     inline const ViewportUiElementId InvalidViewportUiElementId = ViewportUiElementId(0);
     inline const ButtonId InvalidButtonId = ButtonId(0);
     inline const ClusterId InvalidClusterId = ClusterId(0);
+    inline const SwitcherId InvalidSwitcherId = SwitcherId(0);
 
     inline const int DefaultViewportId = 0;
 
@@ -46,27 +48,36 @@ namespace AzToolsFramework::ViewportUi
     public:
         //! Creates and registers a cluster with the Viewport UI system.
         virtual const ClusterId CreateCluster() = 0;
+        //! Creates and registers a switcher with the Viewport UI system.
+        virtual const SwitcherId CreateSwitcher() = 0;
         //! Sets the active button of the cluster. This is the button which will display as highlighted.
         virtual void SetClusterActiveButton(ClusterId clusterId, ButtonId buttonId) = 0;
+        //! Sets the active button of the switcher. This is the button which has a text label.
+        virtual void SetSwitcherActiveButton(SwitcherId clusterId, ButtonId buttonId) = 0;
         //! Registers a new button onto a cluster.
         virtual const ButtonId CreateClusterButton(const ClusterId clusterId, const AZStd::string& icon) = 0;
+        //! Registers a new button onto a switcher.
+        virtual const ButtonId CreateSwitcherButton(
+            SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name = AZStd::string()) = 0;
         //! Registers an event handler to handle events from the cluster.
         virtual void RegisterClusterEventHandler(ClusterId clusterId, AZ::Event<ButtonId>::Handler& handler) = 0;
+        //! Registers an event handler to handle events from the cluster.
+        virtual void RegisterSwitcherEventHandler(SwitcherId switcherId, AZ::Event<ButtonId>::Handler& handler) = 0;
         //! Removes a cluster from the Viewport UI system.
         virtual void RemoveCluster(ClusterId clusterId) = 0;
+        //!
+        virtual void RemoveSwitcher(SwitcherId switcherId) = 0;
         //! Sets the visibility of the cluster.
         virtual void SetClusterVisible(ClusterId clusterId, bool visible) = 0;
         //! Sets the visibility of multiple clusters.
         virtual void SetClusterGroupVisible(const AZStd::vector<ClusterId>& clusterGroup, bool visible) = 0;
         //! Creates and registers a text field with the Viewport UI system.
         virtual const TextFieldId CreateTextField(
-            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText,
-            TextFieldValidationType validationType) = 0;
+            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText, TextFieldValidationType validationType) = 0;
         //! Set the text that will go inside the text field.
         virtual void SetTextFieldText(TextFieldId textFieldId, const AZStd::string& text) = 0;
         //! Register an event handler to handle when the text field text changes.
-        virtual void RegisterTextFieldCallback(
-            TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) = 0;
+        virtual void RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) = 0;
         //! Removes a text field from the Viewport UI system.
         virtual void RemoveTextField(TextFieldId textFieldId) = 0;
         //! Sets the visibility of the text field.
@@ -77,11 +88,12 @@ namespace AzToolsFramework::ViewportUi
         virtual void RemoveComponentModeBorder() = 0;
         //! Invoke a button press in a cluster.
         virtual void PressButton(ClusterId clusterId, ButtonId buttonId) = 0;
+        //!
+        virtual void PressButton(SwitcherId switcherId, ButtonId buttonId) = 0;
     };
 
     /// The EBusTraits for ViewportInteractionRequests.
-    class ViewportUiBusTraits
-        : public AZ::EBusTraits
+    class ViewportUiBusTraits : public AZ::EBusTraits
     {
     public:
         using BusIdType = int; ///< ViewportId - used to address requests to this EBus.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
new file mode 100644
index 0000000000..5dfc395aba
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
@@ -0,0 +1,158 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiSwitcher.h>
+
+namespace AzToolsFramework::ViewportUi::Internal
+{
+    ViewportUiSwitcher::ViewportUiSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup)
+        : m_buttonGroup(buttonGroup)
+    {
+        setOrientation(Qt::Orientation::Horizontal);
+        setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+        setStyleSheet(QString("QToolBar {background-color: none; border: none; spacing: 3px;}"
+                              "QToolButton {background-color: black; border: outset; border-color: white; border-radius: 7px; "
+                              "border-width: 2px; padding: 7px; color: white;}"));
+
+        // Add am empty active button (is set in the call to SetActiveMode)
+        m_activeButton = new QToolButton();
+        // No hover effect for the main button as it's not clickable
+        m_activeButton->setProperty("IconHasHoverEffect", false);
+        m_activeButton->setCheckable(false);
+        m_activeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        addWidget(m_activeButton);
+
+        const AZStd::vector<Button*> buttons = buttonGroup->GetButtons();
+
+        for (auto button : buttons)
+        {
+            // Add all the buttons as actions
+            if (button->m_buttonId)
+            {
+                AddButton(button);
+            }
+        }
+    }
+
+    ViewportUiSwitcher::~ViewportUiSwitcher()
+    {
+        delete m_activeButton;
+    }
+
+    void ViewportUiSwitcher::AddButton(Button* button)
+    {
+        QAction* action = new QAction();
+        action->setCheckable(true);
+        action->setIcon(QIcon(QString(button->m_icon.c_str())));
+
+        if (!action)
+        {
+            return;
+        }
+
+        // set hover to true by default
+        action->setProperty("IconHasHoverEffect", true);
+
+        // add the action
+        addAction(action);
+
+        // resize to fit new action with minimum extra space
+        resize(minimumSizeHint());
+
+        const AZStd::function<void()>& callback = [this, button]() { m_buttonGroup->PressButton(button->m_buttonId); };
+        const AZStd::function<void(QAction*)>& updateCallback = [button](QAction* action) {
+            action->setChecked(button->m_state == Button::State::Selected);
+        };
+
+        // connect the callback if provided
+        if (callback)
+        {
+            QObject::connect(action, &QAction::triggered, action, callback);
+        }
+
+        // register the action
+        m_widgetCallbacks.AddWidget(
+            action, [updateCallback](QPointer<QObject> object) { updateCallback(static_cast<QAction*>(object.data())); });
+
+        m_buttonActionMap.insert({button->m_buttonId, action});
+    }
+
+    void ViewportUiSwitcher::RemoveButton(ButtonId buttonId)
+    {
+        if (auto actionEntry = m_buttonActionMap.find(buttonId); actionEntry != m_buttonActionMap.end())
+        {
+            QAction* action = actionEntry->second;
+
+            // remove the action from the toolbar
+            removeAction(action);
+
+            // deregister from the widget manager
+            m_widgetCallbacks.RemoveWidget(action);
+
+            // resize to fit new area with minimum extra space
+            resize(minimumSizeHint());
+
+            m_buttonActionMap.erase(buttonId);
+
+            // reset current active mode if its the button being removed
+            if (buttonId == m_activeButtonId)
+            {
+                if (auto nextEntry = m_buttonActionMap.find(ButtonId(buttonId + 1)); nextEntry != m_buttonActionMap.end())
+                {
+                    SetActiveButton(nextEntry->first);
+                }
+            }
+        }
+    }
+
+    void ViewportUiSwitcher::Update()
+    {
+        m_widgetCallbacks.Update();
+    }
+
+    void ViewportUiSwitcher::SetActiveButton(ButtonId buttonId)
+    {
+        // Check if it is the first active mode to be set
+        bool initialActiveMode = (m_activeButtonId == ButtonId(0));
+
+        // Change the toolbutton's name and icon to that button
+        const AZStd::vector<Button*> buttons = m_buttonGroup->GetButtons();
+        auto found = [buttonId](Button* button) { return (button->m_buttonId == buttonId); };
+
+        if (auto buttonIt = AZStd::find_if(buttons.begin(), buttons.end(), found); buttonIt != buttons.end())
+        {
+            QString buttonName = ((*buttonIt)->m_name).c_str();
+            QIcon buttonIcon = QIcon(QString(((*buttonIt)->m_icon).c_str()));
+            m_activeButton->setIcon(buttonIcon);
+            m_activeButton->setText(buttonName);
+        }
+
+        // Look up button ID in map then remove it from its current position
+        auto itr = m_buttonActionMap.find(buttonId);
+        QAction* action = itr->second;
+        removeAction(action);
+
+        if (!initialActiveMode)
+        {
+            // Add the last action removed
+            if (m_activeButtonId != buttonId)
+            {
+                itr = m_buttonActionMap.find(m_activeButtonId);
+                action = itr->second;
+                addAction(action);
+            }
+        }
+
+        m_activeButtonId = buttonId;
+    }
+} // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
new file mode 100644
index 0000000000..92c5408f33
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
@@ -0,0 +1,51 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#include <AzToolsFramework/ViewportUi/Button.h>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
+#include <functional>
+#include <QPointer>
+#include <QToolBar>
+#include <QToolButton>
+
+namespace AzToolsFramework::ViewportUi::Internal
+{
+    class ButtonGroup;
+
+    //! Helper class to make switchers (toolbars) for display in Viewport UI.
+    class ViewportUiSwitcher : public QToolBar
+    {
+        Q_OBJECT
+
+    public:
+        ViewportUiSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup);
+        ~ViewportUiSwitcher();
+        //! Adds a new button to the switcher.
+        void AddButton(Button* button);
+        //! Removes a button from the switcher.
+        void RemoveButton(ButtonId buttonId);
+        void Update();
+        //! Changes the m_activeButton.
+        void SetActiveButton(ButtonId buttonId);
+
+    private:
+        QToolButton* m_activeButton; //!< The first button in the toolbar. Only button with a label/text.
+        ButtonId m_activeButtonId = ButtonId(0); //!< ButtonId corresponding to the active button in the buttonActionMap.
+        AZStd::shared_ptr<ButtonGroup> m_buttonGroup; //!< Data structure which the cluster will be displaying to the Viewport UI.
+        AZStd::unordered_map<ButtonId, QPointer<QAction>> m_buttonActionMap; //!< Map for buttons to their corresponding actions.
+        ViewportUiWidgetCallbacks m_widgetCallbacks; //!< Registers actions and manages updates.
+    };
+} // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
index 96eaab3009..a7fcf2e711 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
@@ -70,11 +70,6 @@ set(FILES
     AssetCatalog/PlatformAddressedAssetCatalog.cpp
     AssetCatalog/PlatformAddressedAssetCatalogManager.h
     AssetCatalog/PlatformAddressedAssetCatalogManager.cpp
-    MaterialBrowser/MaterialBrowserBus.h
-    MaterialBrowser/MaterialBrowserComponent.cpp
-    MaterialBrowser/MaterialBrowserComponent.h
-    MaterialBrowser/MaterialThumbnail.cpp
-    MaterialBrowser/MaterialThumbnail.h
     Thumbnails/ThumbnailerComponent.cpp
     Thumbnails/ThumbnailerComponent.h
     Thumbnails/LoadingThumbnail.cpp
@@ -487,8 +482,8 @@ set(FILES
     Viewport/ViewportTypes.cpp
     ViewportUi/Button.h
     ViewportUi/Button.cpp
-    ViewportUi/Cluster.h
-    ViewportUi/Cluster.cpp
+    ViewportUi/ButtonGroup.h
+    ViewportUi/ButtonGroup.cpp
     ViewportUi/TextField.h
     ViewportUi/TextField.cpp
     ViewportUi/ViewportUiDisplay.h
@@ -500,6 +495,8 @@ set(FILES
     ViewportUi/ViewportUiTextField.cpp
     ViewportUi/ViewportUiCluster.h
     ViewportUi/ViewportUiCluster.cpp
+    ViewportUi/ViewportUiSwitcher.h
+    ViewportUi/ViewportUiSwitcher.cpp
     ViewportUi/ViewportUiWidgetCallbacks.h
     ViewportUi/ViewportUiWidgetCallbacks.cpp
     ViewportUi/ViewportUiDisplayLayout.h
@@ -652,6 +649,7 @@ set(FILES
     Prefab/PrefabPublicHandler.h
     Prefab/PrefabPublicHandler.cpp
     Prefab/PrefabPublicInterface.h
+    Prefab/PrefabPublicNotificationBus.h
     Prefab/PrefabUndo.h
     Prefab/PrefabUndo.cpp
     Prefab/PrefabUndoCache.cpp
@@ -687,7 +685,6 @@ set(FILES
     UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp
     UI/Outliner/EntityOutlinerTreeView.hxx
     UI/Outliner/EntityOutlinerTreeView.cpp
-    UI/Outliner/EntityOutlinerWidgetInterface.h
     UI/Outliner/EntityOutlinerWidget.hxx
     UI/Outliner/EntityOutlinerWidget.cpp
     UI/Outliner/EntityOutlinerCacheBus.h
@@ -729,7 +726,7 @@ set(FILES
 # Prevent the following files from being grouped in UNITY builds
 set(SKIP_UNITY_BUILD_INCLUSION_FILES
     # The following files are skipped from unity to avoid duplicated symbols related to an ebus
-    AzToolsFrameworkModule.cpp 
+    AzToolsFrameworkModule.cpp
     Application/ToolsApplication.cpp
     UI/PropertyEditor/PropertyEntityIdCtrl.cpp
     UI/PropertyEditor/PropertyManagerComponent.cpp
diff --git a/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp
index 15a76c1dbb..1f17bd5e95 100644
--- a/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp
@@ -49,8 +49,8 @@ namespace AzToolsFramework
                             ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                             ->Attribute(AZ::Edit::Attributes::Category, "Entity Search Test Components")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &EntitySearch_TestComponent1::m_boolValue, "Bool", "")
@@ -108,8 +108,8 @@ namespace AzToolsFramework
                             ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                             ->Attribute(AZ::Edit::Attributes::Category, "Entity Search Test Components")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &EntitySearch_TestComponent2::m_floatValue, "Float", "")
diff --git a/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp
index 0c38960647..94df2770d1 100644
--- a/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp
@@ -125,8 +125,8 @@ namespace UnitTest
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                         ->Attribute(AZ::Edit::Attributes::Category, "Inspector Test Components")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &Inspector_TestComponent2::m_data, "Data", "The component's Data");
@@ -194,8 +194,8 @@ namespace UnitTest
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System"))
                         ->Attribute(AZ::Edit::Attributes::Category, "Inspector Test Components")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &Inspector_TestComponent3::m_data, "Data", "The component's Data");
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp
index d1bd2a488e..c81db58c95 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp
@@ -78,7 +78,7 @@ namespace Benchmark
     }
     BENCHMARK_REGISTER_F(BM_PrefabUpdateInstances, UpdateInstances_SingeEntityInstances)
         ->RangeMultiplier(10)
-        ->Range(100, 10000)
+        ->Range(100, 1000)
         ->Unit(benchmark::kMillisecond)
         ->Complexity();
 
diff --git a/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
index 2c17334043..195e9c54cc 100644
--- a/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
@@ -85,8 +85,6 @@ namespace UnitTest
     {
         constexpr const char* contextName1 = "Context1";
         constexpr const char* contextName2 = "Context2";
-        constexpr int thumbnailSize1 = 128;
-        constexpr int thumbnailSize2 = 256;
 
         auto checkHasContext = [](const char* contextName)
         {
@@ -98,12 +96,12 @@ namespace UnitTest
         EXPECT_FALSE(checkHasContext(contextName1));
         EXPECT_FALSE(checkHasContext(contextName2));
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
 
         EXPECT_TRUE(checkHasContext(contextName1));
         EXPECT_FALSE(checkHasContext(contextName2));
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2, thumbnailSize2);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);
 
         EXPECT_TRUE(checkHasContext(contextName1));
         EXPECT_TRUE(checkHasContext(contextName2));
@@ -123,8 +121,6 @@ namespace UnitTest
     {
         constexpr const char* contextName1 = "Context1";
         constexpr const char* contextName2 = "Context2";
-        constexpr int thumbnailSize1 = 128;
-        constexpr int thumbnailSize2 = 256;
 
         auto checkHasContext = [](const char* contextName)
         {
@@ -133,8 +129,8 @@ namespace UnitTest
             return hasContext;
         };
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2, thumbnailSize2);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);
 
         EXPECT_TRUE(checkHasContext(contextName1));
         EXPECT_TRUE(checkHasContext(contextName2));
@@ -149,12 +145,11 @@ namespace UnitTest
     TEST_F(ThumbnailerTests, ThumbnailerComponent_RegisterContextTwice_Assert)
     {
         constexpr const char* contextName1 = "Context1";
-        constexpr int thumbnailSize1 = 128;
 
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
 
         AZ_TEST_START_TRACE_SUPPRESSION;
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
         AZ_TEST_STOP_TRACE_SUPPRESSION(1);
     }
 
diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp
index e4f1573939..6b9a3b33f2 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp
@@ -20,35 +20,35 @@
 
 namespace UnitTest
 {
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
     using ButtonId = AzToolsFramework::ViewportUi::ButtonId;
 
     TEST(ClusterTest, AddButtonAddsButtonToClusterAndReturnsId)
     {
-        auto cluster = AZStd::make_unique<Cluster>();
-        auto buttonId = cluster->AddButton("");
+        auto buttonGroup = AZStd::make_unique<ButtonGroup>();
+        auto buttonId = buttonGroup->AddButton("");
 
-        auto button = cluster->GetButton(buttonId);
+        auto button = buttonGroup->GetButton(buttonId);
         EXPECT_TRUE(button != nullptr);
     }
 
     TEST(ClusterTest, SetHighlightedButtonChangesButtonStateToSelected)
     {
-        auto cluster = AZStd::make_unique<Cluster>();
-        auto buttonId = cluster->AddButton("");
+        auto buttonGroup = AZStd::make_unique<ButtonGroup>();
+        auto buttonId = buttonGroup->AddButton("");
 
         // check button is not highlighted by default
-        auto button = cluster->GetButton(buttonId);
+        auto button = buttonGroup->GetButton(buttonId);
         EXPECT_FALSE(button->m_state == AzToolsFramework::ViewportUi::Internal::Button::State::Selected);
 
-        cluster->SetHighlightedButton(buttonId);
+        buttonGroup->SetHighlightedButton(buttonId);
         EXPECT_TRUE(button->m_state == AzToolsFramework::ViewportUi::Internal::Button::State::Selected);
     }
 
     TEST(ClusterTest, ConnectEventHandlerConnectsHandlerToButtonTriggeredEvent)
     {
-        auto cluster = AZStd::make_unique<Cluster>();
-        auto buttonId = cluster->AddButton("");
+        auto buttonGroup = AZStd::make_unique<ButtonGroup>();
+        auto buttonId = buttonGroup->AddButton("");
 
         // create a handler which will be triggered by the cluster
         bool handlerTriggered = false;
@@ -62,8 +62,8 @@ namespace UnitTest
                 }
             });
 
-        cluster->ConnectEventHandler(handler);
-        cluster->PressButton(buttonId);
+        buttonGroup->ConnectEventHandler(handler);
+        buttonGroup->PressButton(buttonId);
 
         EXPECT_TRUE(handlerTriggered);
     }
diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp
index c91909e765..e2b1ac8c41 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp
@@ -13,7 +13,7 @@
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzTest/AzTest.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
 #include <QAction>
 #include <QApplication>
@@ -23,14 +23,14 @@
 namespace UnitTest
 {
     using ViewportUiCluster = AzToolsFramework::ViewportUi::Internal::ViewportUiCluster;
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
     using Button = AzToolsFramework::ViewportUi::Internal::Button;
     using ButtonId = AzToolsFramework::ViewportUi::ButtonId;
 
     TEST(ViewportUiCluster, RegisterButtonIncreasesClusterHeight)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
         viewportUiCluster.resize(viewportUiCluster.minimumSizeHint());
 
         // need to initialize cluster with a single button or size will be invalid
@@ -48,8 +48,8 @@ namespace UnitTest
 
     TEST(ViewportUiCluster, RemoveClusterButtonDecreasesClusterHeight)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
         viewportUiCluster.resize(viewportUiCluster.minimumSizeHint());
 
         // need to initialize cluster with a single button or size will be invalid
@@ -70,8 +70,8 @@ namespace UnitTest
 
     TEST(ViewportUiCluster, UpdateChangesActiveButton)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
 
         // register a button to the cluster
         auto button = AZStd::make_unique<Button>("", ButtonId(1));
@@ -93,8 +93,8 @@ namespace UnitTest
 
     TEST(ViewportUiCluster, TriggeringActionTriggersClusterEventForButton)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
 
         // create a handler which will be triggered by the button
         bool handlerTriggered = false;
@@ -107,7 +107,7 @@ namespace UnitTest
                     handlerTriggered = true;
                 }
             });
-        clusterInfo->ConnectEventHandler(handler);
+        buttonGroup->ConnectEventHandler(handler);
 
         // register the button
         auto button = AZStd::make_unique<Button>("", testButtonId);
diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp
index 4516bd8008..a1ce868569 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp
@@ -23,10 +23,10 @@ namespace UnitTest
 {
     using ViewportUiDisplay = AzToolsFramework::ViewportUi::Internal::ViewportUiDisplay;
     using ViewportUiElementId = AzToolsFramework::ViewportUi::ViewportUiElementId;
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
 
     // sets up a parent widget and render overlay to attach the Viewport UI to
-    // as well as a cluster with one button
+    // as well as a button group with one button
     class ViewportUiDisplayTestFixture : public ::testing::Test
     {
     public:
@@ -34,22 +34,22 @@ namespace UnitTest
 
         void SetUp()
         {
-            m_cluster = AZStd::make_shared<Cluster>();
-            m_cluster->AddButton("");
+            m_buttonGroup = AZStd::make_shared<ButtonGroup>();
+            m_buttonGroup->AddButton("");
             m_parentWidget = new QWidget();
             m_mockRenderOverlay = new QWidget();
         }
 
         void TearDown()
         {
-            m_cluster.reset();
+            m_buttonGroup.reset();
             delete m_parentWidget;
             delete m_mockRenderOverlay;
         }
 
         QWidget* m_parentWidget = nullptr;
         QWidget* m_mockRenderOverlay = nullptr;
-        AZStd::shared_ptr<Cluster> m_cluster = nullptr;
+        AZStd::shared_ptr<ButtonGroup> m_buttonGroup = nullptr;
     };
 
     TEST_F(ViewportUiDisplayTestFixture, ViewportUiInitializationReturnsProperlyParentedWidgets)
@@ -72,13 +72,13 @@ namespace UnitTest
     TEST_F(ViewportUiDisplayTestFixture, RemoveViewportUiElementRemovesElementFromViewportUi)
     {
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
-        viewportUi.AddCluster(m_cluster);
-        auto widget = viewportUi.GetViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.AddCluster(m_buttonGroup);
+        auto widget = viewportUi.GetViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
         EXPECT_TRUE(widget.get() != nullptr);
 
-        viewportUi.RemoveViewportUiElement(m_cluster->GetViewportUiElementId());
-        widget = viewportUi.GetViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.RemoveViewportUiElement(m_buttonGroup->GetViewportUiElementId());
+        widget = viewportUi.GetViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
         EXPECT_TRUE(widget.get() == nullptr);
     }
@@ -89,11 +89,11 @@ namespace UnitTest
 
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
-        viewportUi.AddCluster(m_cluster);
+        viewportUi.AddCluster(m_buttonGroup);
         viewportUi.Update();
-        viewportUi.ShowViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.ShowViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
-        EXPECT_TRUE(viewportUi.IsViewportUiElementVisible(m_cluster->GetViewportUiElementId()));
+        EXPECT_TRUE(viewportUi.IsViewportUiElementVisible(m_buttonGroup->GetViewportUiElementId()));
     }
 
     TEST_F(ViewportUiDisplayTestFixture, HideViewportUiElementSetsWidgetVisibilityToFalse)
@@ -102,20 +102,20 @@ namespace UnitTest
 
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
-        viewportUi.AddCluster(m_cluster);
-        viewportUi.HideViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.AddCluster(m_buttonGroup);
+        viewportUi.HideViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
-        EXPECT_FALSE(viewportUi.IsViewportUiElementVisible(m_cluster->GetViewportUiElementId()));
+        EXPECT_FALSE(viewportUi.IsViewportUiElementVisible(m_buttonGroup->GetViewportUiElementId()));
     }
 
     TEST_F(ViewportUiDisplayTestFixture, UpdateUiOverlayGeometryChangesGeometryToMatchViewportUiElements)
     {
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
-        viewportUi.AddCluster(m_cluster);
+        viewportUi.AddCluster(m_buttonGroup);
 
         viewportUi.Update();
-        auto widget = viewportUi.GetViewportUiElement(m_cluster->GetViewportUiElementId());
+        auto widget = viewportUi.GetViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
         EXPECT_EQ(viewportUi.GetUiMainWindow()->mask(), widget->geometry());
     }
@@ -127,14 +127,14 @@ namespace UnitTest
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
 
-        auto cluster = AZStd::make_shared<Cluster>();
-        cluster->AddButton("");
-        viewportUi.AddCluster(cluster);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        buttonGroup->AddButton("");
+        viewportUi.AddCluster(buttonGroup);
         viewportUi.Update();
 
         EXPECT_TRUE(viewportUi.GetUiMainWindow()->isVisible());
 
-        viewportUi.RemoveViewportUiElement(cluster->GetViewportUiElementId());
+        viewportUi.RemoveViewportUiElement(buttonGroup->GetViewportUiElementId());
         viewportUi.Update();
         EXPECT_FALSE(viewportUi.GetUiMainWindow()->isVisible());
     }
diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
index 22256a7bed..396bde3fdd 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
@@ -22,19 +22,19 @@ namespace UnitTest
 {
     using ViewportUiDisplay = AzToolsFramework::ViewportUi::Internal::ViewportUiDisplay;
     using ViewportUiElementId = AzToolsFramework::ViewportUi::ViewportUiElementId;
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
     using ButtonId = AzToolsFramework::ViewportUi::ButtonId;
 
-    // child class of ViewportUiManager which exposes the protected cluster and viewport display
+    // child class of ViewportUiManager which exposes the protected button group and viewport display
     class ViewportUiManagerTestable : public AzToolsFramework::ViewportUi::ViewportUiManager
     {
     public:
         ViewportUiManagerTestable() = default;
         ~ViewportUiManagerTestable() = default;
 
-        const AZStd::unordered_map<AzToolsFramework::ViewportUi::ClusterId, AZStd::shared_ptr<Cluster>>& GetClusterMap()
+        const AZStd::unordered_map<AzToolsFramework::ViewportUi::ClusterId, AZStd::shared_ptr<ButtonGroup>>& GetClusterMap()
         {
-            return m_clusters;
+            return m_clusterButtonGroups;
         }
 
         ViewportUiDisplay* GetViewportUiDisplay()
diff --git a/Code/Framework/Tests/NetBindingMocks.h b/Code/Framework/Tests/NetBindingMocks.h
index 2af748e29c..3973fe670d 100644
--- a/Code/Framework/Tests/NetBindingMocks.h
+++ b/Code/Framework/Tests/NetBindingMocks.h
@@ -42,6 +42,7 @@ namespace UnitTest
 
         MOCK_METHOD3(InstantiateDynamicSlice, AzFramework::SliceInstantiationTicket(const AZ::Data::Asset<AZ::Data::AssetData>&, const AZ::Transform&, const AZ::IdUtils::Remapper<AZ::EntityId>::IdMapper&));
         MOCK_METHOD0(GetGameEntityContextId, AzFramework::EntityContextId());
+        MOCK_METHOD0(GetGameEntityContextInstance, AzFramework::EntityContext*());
         MOCK_METHOD1(CreateGameEntity, AZ::Entity*(const char*));
         MOCK_METHOD1(AddGameEntity, void (AZ::Entity*));
         MOCK_METHOD1(DestroyGameEntity, void (const AZ::EntityId&));
diff --git a/Code/Framework/Tests/Scene.cpp b/Code/Framework/Tests/Scene.cpp
index a31dcc4c6e..a9affe3a01 100644
--- a/Code/Framework/Tests/Scene.cpp
+++ b/Code/Framework/Tests/Scene.cpp
@@ -130,6 +130,8 @@ namespace SceneUnitTest
             m_systemEntity->CreateComponent<AZ::JobManagerComponent>();
             m_systemEntity->CreateComponent<AZ::StreamerComponent>();
             m_systemEntity->Activate();
+
+            m_sceneSystem = AzFramework::SceneSystemInterface::Get();
         }
 
         void TearDown() override
@@ -146,167 +148,119 @@ namespace SceneUnitTest
         AZ::IO::FileIOBase* m_prevFileIO;
         AZ::ComponentApplication m_app;
         AZ::Entity* m_systemEntity = nullptr;
+        AzFramework::ISceneSystem* m_sceneSystem = nullptr;
 
     };
 
     TEST_F(SceneTest, CreateScene)
-    {
-        Scene* scene = nullptr;
-        AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("");
-
+    {   
         // A scene should be able to be created with a given name.
-        AzFramework::SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequestBus::Events::CreateScene, "TestScene");
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome = m_sceneSystem->CreateScene("TestScene");
         EXPECT_TRUE(createSceneOutcome.IsSuccess()) << "Unable to create a scene.";
     
         // The scene pointer returned should be valid
-        scene = createSceneOutcome.GetValue();
-        EXPECT_TRUE(scene != nullptr) << "Scene creation reported success, but no scene actually was actually returned.";
+        AZStd::shared_ptr<Scene> scene = createSceneOutcome.TakeValue();
+        EXPECT_NE(scene, nullptr) << "Scene creation reported success, but no scene actually was actually returned.";
 
         // Attempting to create another scene with the same name should fail.
-        createSceneOutcome = AZ::Failure<AZStd::string>("");
-        AzFramework::SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequestBus::Events::CreateScene, "TestScene");
+        createSceneOutcome = m_sceneSystem->CreateScene("TestScene");
         EXPECT_TRUE(!createSceneOutcome.IsSuccess()) << "Should not be able to create two scenes with the same name.";
 
     }
 
     TEST_F(SceneTest, GetScene)
     {
-        Scene* createdScene = nullptr;
-        Scene* retrievedScene = nullptr;
-        Scene* nullScene = nullptr;
-        const static AZStd::string_view s_sceneName = "TestScene";
+        constexpr AZStd::string_view sceneName = "TestScene";
 
-        AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("");
-        AzFramework::SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequestBus::Events::CreateScene, s_sceneName);
-        createdScene = createSceneOutcome.GetValue();
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome = m_sceneSystem->CreateScene(sceneName);
+        AZStd::shared_ptr<Scene> createdScene = createSceneOutcome.TakeValue();
 
         // Should be able to get a scene by name, and it should match the scene that was created.
-        AzFramework::SceneSystemRequestBus::BroadcastResult(retrievedScene, &AzFramework::SceneSystemRequestBus::Events::GetScene, s_sceneName);
-        EXPECT_TRUE(retrievedScene != nullptr) << "Attempting to get scene by name resulted in nullptr.";
-        EXPECT_TRUE(retrievedScene == createdScene) << "Retrieved scene does not match created scene.";
+        AZStd::shared_ptr<Scene> retrievedScene = m_sceneSystem->GetScene(sceneName);
+        EXPECT_NE(retrievedScene, nullptr) << "Attempting to get scene by name resulted in nullptr.";
+        EXPECT_EQ(retrievedScene, createdScene) << "Retrieved scene does not match created scene.";
 
         // An invalid name should return a null scene.
-        AzFramework::SceneSystemRequestBus::BroadcastResult(nullScene, &AzFramework::SceneSystemRequestBus::Events::GetScene, "non-existant scene");
-        EXPECT_TRUE(nullScene == nullptr) << "Should not be able to retrieve a scene that wasn't created.";
+        AZStd::shared_ptr<Scene> nullScene = m_sceneSystem->GetScene("non-existant scene");
+        EXPECT_EQ(nullScene, nullptr) << "Should not be able to retrieve a scene that wasn't created.";
     }
 
     TEST_F(SceneTest, RemoveScene)
     {
-        Scene* createdScene = nullptr;
-        const static AZStd::string_view s_sceneName = "TestScene";
+        constexpr AZStd::string_view sceneName = "TestScene";
 
-        AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("");
-        AzFramework::SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequestBus::Events::CreateScene, s_sceneName);
-        createdScene = createSceneOutcome.GetValue();
-
-        bool success = false;
-        AzFramework::SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequestBus::Events::RemoveScene, s_sceneName);
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome = m_sceneSystem->CreateScene(sceneName);
+        bool success = m_sceneSystem->RemoveScene(sceneName);
         EXPECT_TRUE(success) << "Failed to remove the scene that was just created.";
 
-        success = true;
-        AzFramework::SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequestBus::Events::RemoveScene, "non-existant scene");
+        success = m_sceneSystem->RemoveScene("non-existant scene");
         EXPECT_FALSE(success) << "Remove scene returned success for a non-existant scene.";
     }
 
-    TEST_F(SceneTest, GetAllScenes)
+    TEST_F(SceneTest, IterateActiveScenes)
     {
         constexpr size_t NumScenes = 5;
 
-        Scene* scenes[NumScenes] = { nullptr };
+        AZStd::shared_ptr<Scene> scenes[NumScenes] = {nullptr};
 
         for (size_t i = 0; i < NumScenes; ++i)
         {
-            AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("");
-
             AZStd::string sceneName = AZStd::string::format("scene %zu", i);
-            AzFramework::SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequestBus::Events::CreateScene, sceneName);
-            scenes[i] = createSceneOutcome.GetValue();
+            AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome = m_sceneSystem->CreateScene(sceneName);
+            scenes[i] = createSceneOutcome.TakeValue();
         }
 
-        AZStd::vector<Scene*> retrievedScenes;
-        AzFramework::SceneSystemRequestBus::BroadcastResult(retrievedScenes, &AzFramework::SceneSystemRequestBus::Events::GetAllScenes);
-
-        EXPECT_EQ(NumScenes, retrievedScenes.size()) << "GetAllScenes() returned a different number of scenes than those created.";
-
-        for (size_t i = 0; i < NumScenes; ++i)
-        {
-            EXPECT_EQ(scenes[i], retrievedScenes.at(i)) << "GetAllScenes() returned scenes in a different order than they were created.";
-        }
+        size_t index = 0;
+        m_sceneSystem->IterateActiveScenes([&index, &scenes](const AZStd::shared_ptr<Scene>& scene)
+            {
+                EXPECT_EQ(scenes[index++], scene);
+                return true;
+            });
     }
 
-    TEST_F(SceneTest, EntityContextSceneMapping)
+    TEST_F(SceneTest, IterateZombieScenes)
     {
-        AZStd::unique_ptr<SliceEntityOwnershipService> m_entityOwnershipService =
-            AZStd::make_unique<AzFramework::SliceEntityOwnershipService>(AZ::Uuid::CreateNull(), m_app.GetSerializeContext());
-        // Create the entity context, entity, and component
-        EntityContext* testEntityContext = new EntityContext(AZ::Uuid::CreateRandom(), AZStd::move(m_entityOwnershipService));
-        testEntityContext->InitContext();
-        EntityContextId testEntityContextId = testEntityContext->GetContextId();
-        AZ::Entity* testEntity = testEntityContext->CreateEntity("TestEntity");
-        TestComponent* testComponent = testEntity->CreateComponent<TestComponent>();
-
-        // Try to activate an entity and get the scene before a scene has been set. This should fail.
-        TestComponentConfig failConfig;
-        failConfig.m_activateFunction = [](TestComponent* component)
-        {
-            (void)component;
-            Scene* scene = nullptr;
-            EntityContextId entityContextId = EntityContextId::CreateNull();
-
-            AzFramework::EntityIdContextQueryBus::BroadcastResult(entityContextId, &AzFramework::EntityIdContextQueryBus::Events::GetOwningContextId);
+        constexpr size_t NumScenes = 5;
 
-            // A null scene should be returned since a scene has not been set for this entity context.
-            AzFramework::SceneSystemRequestBus::BroadcastResult(scene, &AzFramework::SceneSystemRequestBus::Events::GetSceneFromEntityContextId, entityContextId);
-            EXPECT_TRUE(scene == nullptr) << "Found a scene when one shouldn't exist.";
-        };
-    
-        testComponent->SetConfiguration(failConfig);
-        testComponent->Activate();
-        testComponent->Deactivate();
+        AZStd::shared_ptr<Scene> scenes[NumScenes] = {nullptr};
 
-        // Create the scene
-        AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("");
-        AzFramework::SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequestBus::Events::CreateScene, "TestScene");
-        Scene* scene = createSceneOutcome.GetValue();
-
-        // Map the Entity context to the scene
-        bool success = false;
-        AzFramework::SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequestBus::Events::SetSceneForEntityContextId, testEntityContextId, scene);
-        EXPECT_TRUE(success) << "Unable to associate an entity context with a scene.";
-        AzFramework::SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequestBus::Events::SetSceneForEntityContextId, testEntityContextId, scene);
-        EXPECT_FALSE(success) << "Attempting to map an entity context to a scene that's already mapped, this should not work.";
-
-        // Now it should be possible to get the scene from the entity context within an Entity's Activate()
-        TestComponentConfig successConfig;
-        successConfig.m_activateFunction = [](TestComponent* component)
+        // Create zombies.
+        for (size_t i = 0; i < NumScenes; ++i)
         {
-            (void)component;
-            Scene* scene = nullptr;
-            EntityContextId entityContextId = EntityContextId::CreateNull();
-
-            AzFramework::EntityIdContextQueryBus::BroadcastResult(entityContextId, &AzFramework::EntityIdContextQueryBus::Events::GetOwningContextId);
-
-            // A scene should be returned since a scene has been set for this entity context.
-            AzFramework::SceneSystemRequestBus::BroadcastResult(scene, &AzFramework::SceneSystemRequestBus::Events::GetSceneFromEntityContextId, entityContextId);
-            EXPECT_TRUE(scene != nullptr) << "Could not find a scene for the entity context.";
-        };
-
-        testComponent->SetConfiguration(successConfig);
-        testComponent->Activate();
-        testComponent->Deactivate();
+            AZStd::string sceneName = AZStd::string::format("scene %zu", i);
+            AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome = m_sceneSystem->CreateScene(sceneName);
+            scenes[i] = createSceneOutcome.TakeValue();
+            m_sceneSystem->RemoveScene(sceneName);
+        }
 
-        // Now remove the entity context / scene association and make sure things fail again.
-        success = false;
-        AzFramework::SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequestBus::Events::RemoveSceneForEntityContextId, testEntityContextId, nullptr);
-        EXPECT_FALSE(success) << "Should not be able to remove an entity context from a scene it's not associated with.";
-        AzFramework::SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequestBus::Events::RemoveSceneForEntityContextId, testEntityContextId, scene);
-        EXPECT_TRUE(success) << "Was not able to remove an entity context from a scene it's associated with.";
+        // Check to make sure there are no more active scenes.
+        size_t index = 0;
+        m_sceneSystem->IterateActiveScenes([&index, &scenes](const AZStd::shared_ptr<Scene>&)
+            {
+                index++;
+                return true;
+            });
+        EXPECT_EQ(0, index);
 
-        testComponent->SetConfiguration(failConfig);
-        testComponent->Activate();
-        testComponent->Deactivate();
+        // Check that the scenes are still returned as zombies.
+        index = 0;
+        m_sceneSystem->IterateZombieScenes([&index, &scenes](Scene& scene)
+            {
+                EXPECT_EQ(scenes[index++].get(), &scene);
+                return true;
+            });
 
-        delete testEntityContext; // This should also clean up owned entities / components.
+        // Check that all scenes are removed when there are no more handles.
+        for (size_t i = 0; i < NumScenes; ++i)
+        {
+            scenes[i].reset();
+        }
+        index = 0;
+        m_sceneSystem->IterateZombieScenes([&index, &scenes](Scene&) {
+            index++;
+            return true;
+        });
+        EXPECT_EQ(0, index);
     }
 
     // Test classes for use in the SceneSystem test. These can't be defined in the test itself due to some functions created by AZ_RTTI not having a body which breaks VS2015.
@@ -324,30 +278,48 @@ namespace SceneUnitTest
     TEST_F(SceneTest, SceneSystem)
     {
         // Create the scene
-        AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("");
-        AzFramework::SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequestBus::Events::CreateScene, "TestScene");
-        AzFramework::Scene* scene = createSceneOutcome.GetValue();
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome = m_sceneSystem->CreateScene("TestScene");
+        EXPECT_TRUE(createSceneOutcome.IsSuccess());
+        AZStd::shared_ptr<Scene> scene = createSceneOutcome.TakeValue();
 
         // Set a class on the Scene
         Foo1* foo1a = new Foo1();
         EXPECT_TRUE(scene->SetSubsystem(foo1a));
 
         // Get that class back from the Scene
-        EXPECT_EQ(foo1a, scene->GetSubsystem<Foo1>());
+        EXPECT_EQ(foo1a, *scene->FindSubsystem<Foo1*>());
 
         // Try to set the same class type twice, this should fail.
         Foo1* foo1b = new Foo1();
         EXPECT_FALSE(scene->SetSubsystem(foo1b));
         delete foo1b;
 
+        // Add a child scene
+        createSceneOutcome = m_sceneSystem->CreateSceneWithParent("ChildScene", scene);
+        EXPECT_TRUE(createSceneOutcome.IsSuccess());
+        AZStd::shared_ptr<Scene> childScene = createSceneOutcome.TakeValue();
+
+        // Get class back from parent scene.
+        EXPECT_EQ(foo1a, *childScene->FindSubsystem<Foo1*>());
+
+        // Find overloaded version of class on child scene.
+        Foo1* foo1c = new Foo1();
+        EXPECT_TRUE(childScene->SetSubsystem(foo1c));
+        EXPECT_EQ(foo1c, *childScene->FindSubsystem<Foo1*>());
+
+        // Unset system on child scene, using alternative unset function.
+        EXPECT_TRUE(childScene->UnsetSubsystem(foo1c));
+        delete foo1c;
+
         // Try to un-set a class that was never set, this should fail.
         EXPECT_FALSE(scene->UnsetSubsystem<Foo2>());
 
         // Unset the class that was previously set
         EXPECT_TRUE(scene->UnsetSubsystem<Foo1>());
+        delete foo1a;
 
-        // Make sure that the previsouly set class was really removed.
-        EXPECT_EQ(nullptr, scene->GetSubsystem<Foo1>());
+        // Make sure that the previously set class was really removed.
+        EXPECT_EQ(nullptr, scene->FindSubsystem<Foo1*>());
     }
 } // UnitTest
 
diff --git a/Code/LauncherUnified/Launcher.cpp b/Code/LauncherUnified/Launcher.cpp
index 36d6a432f5..033169ac6d 100644
--- a/Code/LauncherUnified/Launcher.cpp
+++ b/Code/LauncherUnified/Launcher.cpp
@@ -26,7 +26,6 @@
 #include <AzGameFramework/Application/GameApplication.h>
 
 #include <CryLibrary.h>
-#include <IConsole.h>
 #include <ISystem.h>
 #include <ITimer.h>
 #include <LegacyAllocator.h>
@@ -46,6 +45,23 @@ extern "C" void CreateStaticModules(AZStd::vector<AZ::Module*>& modulesOut);
 
 namespace
 {
+    void ExecuteConsoleCommandFile(AzFramework::Application& application)
+    {
+        const AZStd::string_view customConCmdKey = "console-command-file";
+        const AZ::CommandLine* commandLine = application.GetCommandLine();
+        AZStd::size_t numSwitchValues = commandLine->GetNumSwitchValues(customConCmdKey);
+        if (numSwitchValues > 0)
+        {
+            // The expectations for command line parameters is that the "last one wins"
+            // That way it allows users and test scripts to override previous command line options by just listing them later on the invocation line
+            const AZStd::string& consoleCmd = commandLine->GetSwitchValue(customConCmdKey, numSwitchValues - 1);
+            if (!consoleCmd.empty())
+            {
+                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile(consoleCmd.c_str());
+            }
+        }
+    }
+
 #if AZ_TRAIT_LAUNCHER_USE_CRY_DYNAMIC_MODULE_HANDLE
     // mimics AZ::DynamicModuleHandle but uses CryLibrary under the hood,
     // which is necessary to properly load legacy Cry libraries on some platforms
@@ -433,18 +449,14 @@ namespace O3DELauncher
 
         // Non-host platforms cannot use the project path that is #defined within the launcher.
         // In this case the the result of AZ::Utils::GetDefaultAppRoot is used instead
+#if !AZ_TRAIT_OS_IS_HOST_OS_PLATFORM
         AZStd::string_view projectPath;
-#if AZ_TRAIT_OS_IS_HOST_OS_PLATFORM
-        // Insert the project_path option to the front of the command line arguments
-        projectPath = GetProjectPath();
-#else
         // Make sure the defaultAppRootPath variable is in scope long enough until the projectPath string_view is used below
         AZStd::optional<AZ::IO::FixedMaxPathString> defaultAppRootPath = AZ::Utils::GetDefaultAppRootPath();
         if (defaultAppRootPath.has_value())
         {
             projectPath = *defaultAppRootPath;
         }
-#endif
         if (!projectPath.empty())
         {
             const auto projectPathKey = FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
@@ -455,15 +467,14 @@ namespace O3DELauncher
 
             // For non-host platforms set the engine root to be the project root
             // Since the directories available during execution are limited on those platforms
-#if !AZ_TRAIT_OS_IS_HOST_OS_PLATFORM
             AZStd::string_view enginePath = projectPath;
             const auto enginePathKey = FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
                 + "/engine_path";
             enginePathOptionOverride = FixedValueString ::format(R"(--regset="%s=%.*s")",
                 enginePathKey.c_str(), aznumeric_cast<int>(enginePath.size()), enginePath.data());
             argContainer.emplace_back(enginePathOptionOverride.data());
-#endif
         }
+#endif
 
         AzGameFramework::GameApplication gameApplication(aznumeric_cast<int>(argContainer.size()), argContainer.data());
         // The settings registry has been created by the AZ::ComponentApplication constructor at this point
@@ -637,7 +648,11 @@ namespace O3DELauncher
             if (gEnv && gEnv->pConsole)
             {
                 // Execute autoexec.cfg to load the initial level
-                gEnv->pConsole->ExecuteString("exec autoexec.cfg");
+                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile("autoexec.cfg");
+
+                // Find out if console command file was passed 
+                // via --console-command-file=%filename% and execute it
+                ExecuteConsoleCommandFile(gameApplication);
 
                 gEnv->pSystem->ExecuteCommandLine(false);
 
diff --git a/Code/LauncherUnified/LauncherProject.cpp b/Code/LauncherUnified/LauncherProject.cpp
index e7832cc99f..6fc1934d29 100644
--- a/Code/LauncherUnified/LauncherProject.cpp
+++ b/Code/LauncherUnified/LauncherProject.cpp
@@ -36,15 +36,4 @@ namespace O3DELauncher
 #endif
         return { LY_PROJECT_NAME };
     }
-
-    AZStd::string_view GetProjectPath()
-    {
-        // The Project CMake path optional and not required
-        // It is used as fall back project root path
-#if defined LY_PROJECT_CMAKE_PATH
-        return { LY_PROJECT_CMAKE_PATH };
-#else
-        return {};
-#endif
-    }
 }
diff --git a/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake b/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake
index 2865e9c43d..4d5680a30d 100644
--- a/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake
+++ b/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake
@@ -8,11 +8,3 @@
 # remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
-
-if(LY_MONOLITHIC_GAME)  # only Atom is supported in monolithic
-    list(APPEND LY_BUILD_DEPENDENCIES Legacy::CryRenderOther)
-else()
-    set(LY_RUNTIME_DEPENDENCIES
-        Legacy::CryRenderGL
-    )
-endif()
diff --git a/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake b/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake
index 28eb9595c2..4d5680a30d 100644
--- a/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake
+++ b/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake
@@ -8,15 +8,3 @@
 # remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
-
-if (LY_MONOLITHIC_GAME) # only Atom is supported in monolithic
-    set(LY_BUILD_DEPENDENCIES
-        PUBLIC
-            Legacy::CryRenderOther
-    )
-else()
-    set(LY_BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::CryRenderGL
-    )
-endif()
diff --git a/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake b/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake
index 8d55ae93b0..52513820de 100644
--- a/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake
+++ b/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake
@@ -13,12 +13,6 @@ set(LY_TARGET_PROPERTIES
     BUILD_RPATH @executable_path/
 )
 
-if(LY_MONOLITHIC_GAME) # only Atom is supported in monolithic builds
-    list(APPEND LY_BUILD_DEPENDENCIES Legacy::CryRenderOther)
-else()
-    set(LY_RUNTIME_DEPENDENCIES Legacy::CryRenderMetal)
-endif()
-
 # Add resources and app icons to launchers
 list(APPEND candidate_paths ${project_real_path}/Resources/Platform/Mac)
 list(APPEND candidate_paths ${project_real_path}/Gem/Resources/Platform/Mac) # Legacy projects
diff --git a/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake b/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake
index 4b5805908e..bcef59ec5a 100644
--- a/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake
+++ b/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake
@@ -9,11 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        Legacy::CryRenderD3D11
-)
-
 set(ICON_FILE ${project_real_path}/Gem/Resources/GameSDK.ico)
 if(NOT EXISTS ${ICON_FILE})
     # Try the common LauncherUnified icon instead
diff --git a/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake b/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake
index e846af494e..36fa19d0d1 100644
--- a/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake
+++ b/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake
@@ -14,13 +14,6 @@ set(LY_LINK_OPTIONS
         -ObjC
 )
 
-if(LY_MONOLITHIC_GAME) # only Atom is supported in monolithic
-    list(APPEND LY_BUILD_DEPENDENCIES Legacy::CryRenderOther)
-else()
-    list(APPEND LY_BUILD_DEPENDENCIES CrySystem.Static)
-    set(LY_RUNTIME_DEPENDENCIES Legacy::CryRenderMetal)
-endif()
-
 # Add resources and app icons to launchers
 list(APPEND candidate_paths ${project_real_path}/Resources/Platform/iOS)
 list(APPEND candidate_paths ${project_real_path}/Gem/Resources/Platform/iOS) # Legacy projects
diff --git a/Code/LauncherUnified/StaticModules.in b/Code/LauncherUnified/StaticModules.in
index 629973bdf4..03b22b076a 100644
--- a/Code/LauncherUnified/StaticModules.in
+++ b/Code/LauncherUnified/StaticModules.in
@@ -20,15 +20,6 @@
 
 #include <AzCore/std/containers/vector.h>
 
-#define DECLARE_CRYREGISTER_SINGLETON_CLASS(implclassname) \
-    void* Get##implclassname##Factory();
-
-DECLARE_CRYREGISTER_SINGLETON_CLASS(CEngineModule_Cry3DEngine)
-DECLARE_CRYREGISTER_SINGLETON_CLASS(CEngineModule_CryFont)
-DECLARE_CRYREGISTER_SINGLETON_CLASS(CEngineModule_CryRenderer)
-
-#undef DECLARE_CRYREGISTER_SINGLETON_CLASS
-
 namespace AZ
 {
     class Module;
@@ -39,14 +30,6 @@ ${extern_module_declarations}
 extern "C" void CreateStaticModules(AZStd::vector<AZ::Module*>& modulesOut)
 {
 ${module_invocations}
-    // Call methods to avoid symbol striping
-#define NON_STRIPPING_CALL(Module) \
-    AZ_UNUSED(Get##Module##Factory())
-
-    NON_STRIPPING_CALL(CEngineModule_Cry3DEngine);
-    NON_STRIPPING_CALL(CEngineModule_CryFont);
-    NON_STRIPPING_CALL(CEngineModule_CryRenderer);
-#undef NON_STRIPPING_CALL
 }
 
 #endif // AZ_MONOLITHIC_BUILD
diff --git a/Code/LauncherUnified/launcher_generator.cmake b/Code/LauncherUnified/launcher_generator.cmake
index b73d2c1fff..28429729e1 100644
--- a/Code/LauncherUnified/launcher_generator.cmake
+++ b/Code/LauncherUnified/launcher_generator.cmake
@@ -66,8 +66,6 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
         set(game_build_dependencies 
             ${game_gem_dependencies}
             Legacy::CrySystem
-            Legacy::CryFont
-            Legacy::Cry3DEngine
         )
 
         if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
@@ -96,8 +94,6 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
             set(server_build_dependencies 
                 ${game_gem_dependencies}
                 Legacy::CrySystem
-                Legacy::CryFont
-                Legacy::Cry3DEngine
             )
         endif()
 
@@ -105,14 +101,7 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
 
         set(game_runtime_dependencies
             Legacy::CrySystem
-            Legacy::CryFont
-            Legacy::Cry3DEngine
         )
-        if(PAL_TRAIT_BUILD_SERVER_SUPPORTED AND NOT LY_MONOLITHIC_GAME)  # Only Atom is supported in monolithic builds
-            set(server_runtime_dependencies
-                Legacy::CryRenderNULL
-            )
-        endif()
 
     endif()
 
@@ -130,9 +119,6 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
             PRIVATE
                 # Adds the name of the project/game
                 LY_PROJECT_NAME="${project_name}"
-                # Adds the project path supplied to CMake during configuration
-                # This is used as a fallback to launch the AssetProcessor
-                LY_PROJECT_CMAKE_PATH="${project_path}"
                 # Adds the ${project_name}_GameLauncher target as a define so for the Settings Registry to use
                 # when loading .setreg file specializations
                 # This is needed so that only gems for the project game launcher are loaded
@@ -174,9 +160,6 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
                     PRIVATE
                         # Adds the name of the project/game
                         LY_PROJECT_NAME="${project_name}"
-                        # Adds the project path supplied to CMake during configuration
-                        # This is used as a fallback to launch the AssetProcessor
-                        LY_PROJECT_CMAKE_PATH="${project_path}"
                         # Adds the ${project_name}_ServerLauncher target as a define so for the Settings Registry to use
                         # when loading .setreg file specializations
                         # This is needed so that only gems for the project server launcher are loaded
diff --git a/Code/Sandbox/Editor/Alembic/AlembicCompileDialog.cpp b/Code/Sandbox/Editor/Alembic/AlembicCompileDialog.cpp
index 14f3301626..b0df05190b 100644
--- a/Code/Sandbox/Editor/Alembic/AlembicCompileDialog.cpp
+++ b/Code/Sandbox/Editor/Alembic/AlembicCompileDialog.cpp
@@ -19,6 +19,8 @@
 #include <QPushButton>
 
 // AzCore
+#include <AzCore/Utils/Utils.h>
+
 #include <Pak/CryPakUtils.h>
 
 // Editor
@@ -70,12 +72,13 @@ void CAlembicCompileDialog::OnInitDialog()
 
     SDirectoryEnumeratorHelper dirHelper;
 
-    dirHelper.ScanDirectoryRecursive(gEnv->pCryPak, "@engroot@/", "Editor/Presets/GeomCache", filePattern, presetFiles);
+    auto engineAssetSourceRoot = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
+    dirHelper.ScanDirectoryRecursive(gEnv->pCryPak, engineAssetSourceRoot.c_str(), "Editor/Presets/GeomCache", filePattern, presetFiles);
 
     for (auto iter = presetFiles.begin(); iter != presetFiles.end(); ++iter)
     {
         const auto& file = *iter;
-        const AZStd::string filePath = "@engroot@/" + file;
+        const AZ::IO::FixedMaxPath filePath = engineAssetSourceRoot / file;
         m_presets.push_back(LoadConfig(Path::GetFileName(file.c_str()), XmlHelpers::LoadXmlFromFile(filePath.c_str())));
         m_ui->m_presetComboBox->addItem(m_presets.back().m_name);
     }
diff --git a/Code/Sandbox/Editor/Controls/PreviewModelCtrl.cpp b/Code/Sandbox/Editor/Controls/PreviewModelCtrl.cpp
index 5746e9db2f..9b07f59e6a 100644
--- a/Code/Sandbox/Editor/Controls/PreviewModelCtrl.cpp
+++ b/Code/Sandbox/Editor/Controls/PreviewModelCtrl.cpp
@@ -365,10 +365,6 @@ bool CPreviewModelCtrl::Render()
     }
 
     _smart_ptr<IMaterial> pMaterial;
-    if (m_pCurrentMaterial)
-    {
-        pMaterial = m_pCurrentMaterial->GetMatInfo();
-    }
 
     if (m_bPrecacheMaterial)
     {
@@ -430,11 +426,6 @@ bool CPreviewModelCtrl::Render()
             m_pRenderer->EF_ADDDlight(&m_lights[i], passInfo);
         }
 
-        if (m_pCurrentMaterial)
-        {
-            m_pCurrentMaterial->DisableHighlightForFrame();
-        }
-
         if (m_bShowObject)
         {
             RenderObject(pMaterial, passInfo);
@@ -778,32 +769,6 @@ void CPreviewModelCtrl::SetRotation(bool bEnable)
     m_bRotate = bEnable;
 }
 
-void CPreviewModelCtrl::SetMaterial(CMaterial* pMaterial)
-{
-    if (pMaterial)
-    {
-        if ((pMaterial->GetFlags() & MTL_FLAG_NOPREVIEW))
-        {
-            m_pCurrentMaterial = 0;
-            if (isVisible())
-            {
-                update();
-            }
-            return;
-        }
-    }
-    m_pCurrentMaterial = pMaterial;
-    if (isVisible())
-    {
-        update();
-    }
-}
-
-CMaterial* CPreviewModelCtrl::GetMaterial()
-{
-    return m_pCurrentMaterial;
-}
-
 void CPreviewModelCtrl::OnEditorNotifyEvent(EEditorNotifyEvent event)
 {
     switch (event)
diff --git a/Code/Sandbox/Editor/Controls/PreviewModelCtrl.h b/Code/Sandbox/Editor/Controls/PreviewModelCtrl.h
index 73839612af..6388be9fd5 100644
--- a/Code/Sandbox/Editor/Controls/PreviewModelCtrl.h
+++ b/Code/Sandbox/Editor/Controls/PreviewModelCtrl.h
@@ -22,8 +22,6 @@
 
 #include <IStatObj.h>
 
-#include <Editor/Material/Material.h>
-
 #endif
 
 struct IRenderNode;
@@ -71,9 +69,6 @@ public:
     int heightForWidth(int w) const override;
     bool hasHeightForWidth() const override;
 
-    void SetMaterial(CMaterial* pMaterial);
-    CMaterial*  GetMaterial();
-
     void GetImageOffscreen(CImageEx& image, const QSize& customSize = QSize(0, 0));
 
     void GetCameraTM(Matrix34& cameraTM);
@@ -192,7 +187,6 @@ protected:
     float m_tileY;
     float m_tileSizeX;
     float m_tileSizeY;
-    _smart_ptr<CMaterial> m_pCurrentMaterial;
     CameraChangeCallback m_cameraChangeCallback;
     void*   m_pCameraChangeUserData;
 
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
index b777bb6930..f0367ffdc1 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
@@ -29,14 +29,12 @@ void RegisterReflectedVarHandlers()
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew AnimationPropertyWidgetHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FileResourceSelectorWidgetHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ShaderPropertyHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew MaterialPropertyHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ReverbPresetPropertyHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequencePropertyHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequenceIdPropertyHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LocalStringPropertyHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LightAnimationPropertyHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew UserPopupWidgetHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LensFlareHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ColorCurveHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FloatCurveHandler());
         EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew MotionPropertyWidgetHandler());
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
index ce76137466..75344b2172 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
@@ -27,7 +27,6 @@
 
 // Editor
 #include "ShadersDialog.h"
-#include "Material/MaterialManager.h"
 #include "SelectLightAnimationDialog.h"
 #include "SelectSequenceDialog.h"
 #include "SelectEAXPresetDlg.h"
@@ -88,28 +87,6 @@ void ShaderPropertyEditor::onEditClicked()
     }
 
 }
-void MaterialPropertyEditor::onEditClicked()
-{
-    QString name = GetValue();
-    IDataBaseItem *pItem = GetIEditor()->GetMaterialManager()->FindItemByName(name);
-    GetIEditor()->OpenMaterialLibrary(pItem);
-}
-
-void MaterialPropertyEditor::onButton2Clicked()
-{
-    // Open material browser dialog.
-    IDataBaseItem *pItem = GetIEditor()->GetMaterialManager()->GetSelectedItem();
-    if (pItem)
-    {
-        QString value = pItem->GetName();
-        value.replace('\\', '/');
-        if (value.length() >= MAX_PATH)
-            value = value.left(MAX_PATH);
-        SetValue(value);
-    }
-    else
-        SetValue(QString());
-}
 
 void ReverbPresetPropertyEditor::onEditClicked()
 {
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
index d5ec0045c4..cdbb18ae12 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
@@ -109,16 +109,6 @@ public:
     void onEditClicked() override;
 };
 
-class MaterialPropertyEditor
-    : public GenericPopupPropertyEditor
-{
-public:
-    MaterialPropertyEditor(QWidget* pParent = nullptr)
-        : GenericPopupPropertyEditor(pParent, true){}
-    void onEditClicked() override;
-    void onButton2Clicked() override;
-};
-
 class ReverbPresetPropertyEditor
     : public GenericPopupPropertyEditor
 {
@@ -179,7 +169,6 @@ public:
 #define CONST_AZ_CRC(name, value) AZ::u32(value)
 
 using ShaderPropertyHandler = GenericPopupWidgetHandler<ShaderPropertyEditor, CONST_AZ_CRC("ePropertyShader", 0xc40932f1)>;
-using MaterialPropertyHandler = GenericPopupWidgetHandler<MaterialPropertyEditor, CONST_AZ_CRC("ePropertyMaterial", 0xf324dffa)>;
 using ReverbPresetPropertyHandler = GenericPopupWidgetHandler<ReverbPresetPropertyEditor, CONST_AZ_CRC("ePropertyReverbPreset", 0x51469f38)>;
 using MissionObjPropertyHandler = GenericPopupWidgetHandler<MissionObjPropertyEditor, CONST_AZ_CRC("ePropertyMissionObj", 0x4a2d0dc8)>;
 using SequencePropertyHandler = GenericPopupWidgetHandler<SequencePropertyEditor, CONST_AZ_CRC("ePropertySequence", 0xdd1c7d44)>;
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
index bce244e06b..89bb66b08a 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
@@ -25,7 +25,6 @@
 // Editor
 #include "GenericSelectItemDialog.h"
 #include "QtViewPaneManager.h"
-#include "LensFlareEditor/LensFlareEditor.h"
 
 
 UserPropertyEditor::UserPropertyEditor(QWidget *pParent /*= nullptr*/)
@@ -147,79 +146,6 @@ bool UserPopupWidgetHandler::ReadValuesIntoGUI(size_t index, UserPropertyEditor*
 
 #include <Controls/ReflectedPropertyControl/moc_PropertyMiscCtrl.cpp>
 
-LensFlarePropertyWidget::LensFlarePropertyWidget(QWidget *pParent /*= nullptr*/)
-    :QWidget(pParent)
-{
-    m_valueEdit = new QLineEdit;
-
-    QToolButton *mainButton = new QToolButton;
-    mainButton->setText("D");
-    connect(mainButton, &QToolButton::clicked, this, &LensFlarePropertyWidget::OnEditClicked);
-    connect(m_valueEdit, &QLineEdit::editingFinished, m_valueEdit, [this] () {emit ValueChanged(m_valueEdit->text());});
-
-    QHBoxLayout *mainLayout = new QHBoxLayout(this);
-    mainLayout->addWidget(m_valueEdit, 1);
-    mainLayout->addWidget(mainButton);
-    mainLayout->setContentsMargins(1, 1, 1, 1);
-}
-
-void LensFlarePropertyWidget::SetValue(const QString &value)
-{
-    m_valueEdit->setText(value);
-}
-
-QString LensFlarePropertyWidget::GetValue() const
-{
-    return m_valueEdit->text();
-}
-
-void LensFlarePropertyWidget::OnEditClicked()
-{
-    const QtViewPane *lensFlarePane = GetIEditor()->OpenView(CLensFlareEditor::s_pLensFlareEditorClassName);
-    if (!lensFlarePane)
-        return;
-
-    CLensFlareEditor *editor = FindViewPane<CLensFlareEditor>(QtUtil::ToQString(CLensFlareEditor::s_pLensFlareEditorClassName));
-    if (editor)
-        QTimer::singleShot(0, editor, SLOT(OnUpdateTreeCtrl()));
-}
-
-QWidget* LensFlareHandler::CreateGUI(QWidget *pParent)
-{
-    LensFlarePropertyWidget* newCtrl = aznew LensFlarePropertyWidget(pParent);
-    connect(newCtrl, &LensFlarePropertyWidget::ValueChanged, newCtrl, [newCtrl]()
-    {
-        EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-    });
-
-    return newCtrl;
-}
-
-void LensFlareHandler::ConsumeAttribute(LensFlarePropertyWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-{
-        Q_UNUSED(GUI); Q_UNUSED(attrib); Q_UNUSED(attrValue); Q_UNUSED(debugName);
-}
-
-void LensFlareHandler::WriteGUIValuesIntoProperty(size_t index, LensFlarePropertyWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-        Q_UNUSED(index);
-        Q_UNUSED(node);
-        CReflectedVarGenericProperty val = instance;
-        val.m_value = GUI->GetValue().toUtf8().data();
-        instance = static_cast<property_t>(val);
-}
-
-bool LensFlareHandler::ReadValuesIntoGUI(size_t index, LensFlarePropertyWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-    Q_UNUSED(index);
-    Q_UNUSED(node);
-    CReflectedVarGenericProperty val = instance;
-    GUI->SetValue(val.m_value.c_str());
-    return false;
-}
-
-
-
 QWidget* FloatCurveHandler::CreateGUI(QWidget *pParent)
 {
     CSplineCtrl *cSpline = new CSplineCtrl(pParent);
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
index 00fb8e5f98..7ddbf6a338 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
@@ -70,39 +70,6 @@ public:
 
 };
 
-
-class LensFlarePropertyWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(LensFlarePropertyWidget, AZ::SystemAllocator, 0);
-    LensFlarePropertyWidget(QWidget *pParent = nullptr);
-
-    void SetValue(const QString &value);
-    QString GetValue() const;
-
-    void OnEditClicked();
-
-signals:
-    void ValueChanged(const QString &value);
-
-private:
-    QLineEdit *m_valueEdit;
-};
-
-class LensFlareHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarGenericProperty, LensFlarePropertyWidget>
-{
-public:
-    AZ_CLASS_ALLOCATOR(LensFlareHandler, AZ::SystemAllocator, 0);
-    bool IsDefaultHandler() const override { return false; }
-    QWidget* CreateGUI(QWidget *pParent) override;
-
-    AZ::u32 GetHandlerName(void) const override  { return AZ_CRC("ePropertyFlare", 0x5ce803df); }
-    void ConsumeAttribute(LensFlarePropertyWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-    void WriteGUIValuesIntoProperty(size_t index, LensFlarePropertyWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-    bool ReadValuesIntoGUI(size_t index, LensFlarePropertyWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-};
-
 class FloatCurveHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarSpline, CSplineCtrl>
 {
 public:
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
index a66a73eaa4..e698b86341 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
@@ -111,14 +111,12 @@ private:
             {
             case ePropertyTexture:
             case ePropertyModel:
-            case ePropertyMaterial:
                 newPath.replace("\\\\", "/");
             }
             switch (m_propertyType)
             {
             case ePropertyTexture:
             case ePropertyModel:
-            case ePropertyMaterial:
             case ePropertyFile:
                 if (newPath.size() > MAX_PATH)
                 {
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
index 92610021b9..a188ee117b 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
@@ -361,16 +361,6 @@ void ReflectedPropertyControl::CreateItems(XmlNodeRef node, CVarBlockPtr& outBlo
                     textureVar->Set(textureName);
                 }
             }
-            else if (!azstricmp(type, "material"))
-            {
-                CSmartVariable<QString> materialVar;
-                AddVariable(group, materialVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData, IVariable::DT_MATERIAL);
-                const char* materialName;
-                if (child->getAttr("value", &materialName))
-                {
-                    materialVar->Set(materialName);
-                }
-            }
             else if (!azstricmp(type, "color"))
             {
                 CSmartVariable<Vec3> colorVar;
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
index b759b46ceb..13584d9b82 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
@@ -269,7 +269,6 @@ void ReflectedPropertyItem::SetVariable(IVariable *var)
         m_reflectedVarAdapter = new ReflectedVarUserAdapter;
         break;
     case ePropertyShader:
-    case ePropertyMaterial:
     case ePropertyEquip:
     case ePropertyReverbPreset:
     case ePropertyGameToken:
@@ -279,7 +278,6 @@ void ReflectedPropertyItem::SetVariable(IVariable *var)
     case ePropertyLocalString:
     case ePropertyLightAnimation:
     case ePropertyParticleName:
-    case ePropertyFlare:
         m_reflectedVarAdapter = new ReflectedVarGenericPropertyAdapter(desc.m_type);
         break;
     case ePropertyTexture:
@@ -577,7 +575,6 @@ void ReflectedPropertyItem::SetValue(const QString& sValue, bool bRecordUndo, bo
 
     case ePropertyTexture:
     case ePropertyModel:
-    case ePropertyMaterial:
         value.replace('\\', '/');
         break;
     }
@@ -587,7 +584,6 @@ void ReflectedPropertyItem::SetValue(const QString& sValue, bool bRecordUndo, bo
     {
     case ePropertyTexture:
     case ePropertyModel:
-    case ePropertyMaterial:
     case ePropertyFile:
         if (value.length() >= MAX_PATH)
         {
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
index e0f7f29524..12165d2be8 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
@@ -286,8 +286,6 @@ AZ::u32 CReflectedVarGenericProperty::handler()
     {
     case ePropertyShader:
         return AZ_CRC("ePropertyShader", 0xc40932f1);
-    case ePropertyMaterial:
-        return AZ_CRC("ePropertyMaterial", 0xf324dffa);
     case ePropertyEquip:
         return AZ_CRC("ePropertyEquip", 0x66ffd290);
     case ePropertyReverbPreset:
@@ -308,8 +306,6 @@ AZ::u32 CReflectedVarGenericProperty::handler()
         return AZ_CRC("ePropertyLightAnimation", 0x277097da);
     case ePropertyParticleName:
         return AZ_CRC("ePropertyParticleName", 0xf44c7133);
-    case ePropertyFlare:
-        return AZ_CRC("ePropertyFlare", 0x5ce803df);
     default:
         AZ_Assert(false, "No property handlers defined for the property type");
         return AZ_CRC("Default", 0xe35e00df);
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
index 84a7f8c26f..b2fc07073f 100644
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
+++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
@@ -455,8 +455,6 @@ void ReflectedVarGenericPropertyAdapter::SyncReflectedVarToIVar(IVariable *pVari
 {
     QString value;
     pVariable->Get(value);
-    if (m_reflectedVar->m_propertyType == ePropertyMaterial)
-        value.replace('\\', '/');
 
     m_reflectedVar->m_value = value.toUtf8().data();
 }
diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
index aed53d6e8b..3f396894ff 100644
--- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
+++ b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
@@ -458,8 +458,6 @@ QMenu* LevelEditorMenuHandler::CreateFileMenu()
 
 void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMenu)
 {
-    const bool newViewportInteractionModelEnabled = GetIEditor()->IsNewViewportInteractionModelEnabled();
-
     // Undo
     editMenu.AddAction(ID_UNDO);
 
@@ -496,40 +494,21 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe
     // Select All
     editMenu.AddAction(ID_EDIT_SELECTALL);
 
-    // Deselect All
-    if (!newViewportInteractionModelEnabled)
-    {
-        editMenu.AddAction(ID_EDIT_SELECTNONE);
-    }
-
     // Invert Selection
     editMenu.AddAction(ID_EDIT_INVERTSELECTION);
 
     editMenu.AddSeparator();
 
     // New Viewport Interaction Model actions/shortcuts
-    if (newViewportInteractionModelEnabled)
-    {
-        editMenu.AddAction(ID_EDIT_PIVOT);
-        editMenu.AddAction(ID_EDIT_RESET);
-        editMenu.AddAction(ID_EDIT_RESET_MANIPULATOR);
-        editMenu.AddAction(ID_EDIT_RESET_LOCAL);
-        editMenu.AddAction(ID_EDIT_RESET_WORLD);
-    }
+    editMenu.AddAction(ID_EDIT_PIVOT);
+    editMenu.AddAction(ID_EDIT_RESET);
+    editMenu.AddAction(ID_EDIT_RESET_MANIPULATOR);
+    editMenu.AddAction(ID_EDIT_RESET_LOCAL);
+    editMenu.AddAction(ID_EDIT_RESET_WORLD);
 
     // Hide Selection
     editMenu.AddAction(ID_EDIT_HIDE);
 
-    if (!newViewportInteractionModelEnabled)
-    {
-        // Show Selection
-        auto showSelectionMenu = editMenu.Get()->addAction(tr("Show Selection"));
-        connect(showSelectionMenu, &QAction::triggered, this, [this]() { ToggleSelection(false); });
-
-        // Show Last Hidden
-        editMenu.AddAction(ID_EDIT_SHOW_LAST_HIDDEN);
-    }
-
     // Unhide All
     editMenu.AddAction(ID_EDIT_UNHIDEALL);
 
@@ -572,31 +551,10 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe
     // Modify Menu
     auto modifyMenu = editMenu.AddMenu(tr("&Modify"));
 
-    if (!newViewportInteractionModelEnabled)
-    {
-        modifyMenu.AddAction(ID_MODIFY_LINK);
-        modifyMenu.AddAction(ID_MODIFY_UNLINK);
-        modifyMenu.AddSeparator();
-    }
-
     auto snapMenu = modifyMenu.AddMenu(tr("Snap"));
 
-    if (!newViewportInteractionModelEnabled)
-    {
-        snapMenu.AddAction(ID_SNAP_TO_GRID);
-    }
-
     snapMenu.AddAction(ID_SNAPANGLE);
 
-    if (!newViewportInteractionModelEnabled)
-    {
-        auto fastRotateMenu = modifyMenu.AddMenu(tr("Fast Rotate"));
-        fastRotateMenu.AddAction(ID_ROTATESELECTION_XAXIS);
-        fastRotateMenu.AddAction(ID_ROTATESELECTION_YAXIS);
-        fastRotateMenu.AddAction(ID_ROTATESELECTION_ZAXIS);
-        fastRotateMenu.AddAction(ID_ROTATESELECTION_ROTATEANGLE);
-    }
-
     auto transformModeMenu = modifyMenu.AddMenu(tr("Transform Mode"));
     transformModeMenu.AddAction(ID_EDITMODE_MOVE);
     transformModeMenu.AddAction(ID_EDITMODE_ROTATE);
@@ -604,21 +562,6 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe
 
     editMenu.AddSeparator();
 
-    // Lock Selection
-    editMenu.AddAction(ID_EDIT_FREEZE);
-
-    // NEWMENUS: NEEDS IMPLEMENTATION
-    //// Unlock Selection
-    //auto unlockSelectionMenu = editMenu.Get()->addAction(tr("Unlock Selection"));
-
-    //// Unlock Last Locked
-    //auto unlockLastLockedMenu = editMenu.Get()->addAction(tr("Unlock Last Locked"));
-
-    // Unlock All
-    editMenu.AddAction(ID_EDIT_UNFREEZEALL);
-
-    editMenu.AddSeparator();
-
     // Editor Settings
     auto editorSettingsMenu = editMenu.AddMenu(tr("Editor Settings"));
 
@@ -725,12 +668,6 @@ QMenu* LevelEditorMenuHandler::CreateGameMenu()
 
     gameMenu.AddSeparator();
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        gameMenu.AddAction(ID_TERRAIN_VEGETATION);
-        gameMenu.AddSeparator();
-    }
-
     CreateDebuggingSubMenu(gameMenu);
 
     return gameMenu;
@@ -793,12 +730,6 @@ QMenu* LevelEditorMenuHandler::CreateViewMenu()
     viewportViewsMenuWrapper.AddAction(ID_WIREFRAME);
     viewportViewsMenuWrapper.AddSeparator();
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        // Ruler
-        viewportViewsMenuWrapper.AddAction(ID_RULER);
-    }
-
     viewportViewsMenuWrapper.AddAction(ID_VIEW_GRIDSETTINGS);
     viewportViewsMenuWrapper.AddSeparator();
 
@@ -1234,22 +1165,6 @@ void LevelEditorMenuHandler::ClearAll()
     UpdateMRUFiles();
 }
 
-void LevelEditorMenuHandler::ToggleSelection(bool hide)
-{
-    CCryEditApp::instance()->OnToggleSelection(hide);
-}
-
-// Used for showing last hidden objects
-void LevelEditorMenuHandler::ShowLastHidden()
-{
-    CSelectionGroup* sel = GetIEditor()->GetSelection();
-    if (!sel->IsEmpty())
-    {
-        CUndo undo("Show Last Hidden");
-        GetIEditor()->GetObjectManager()->ShowLastHiddenObject();
-    }
-}
-
 // Used for disabling "Open Recent" menu option
 void LevelEditorMenuHandler::OnUpdateOpenRecent()
 {
diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h
index b9cc70436e..bad689ae67 100644
--- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h
+++ b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h
@@ -78,8 +78,6 @@ private:
     void UpdateMRUFiles();
 
     void ClearAll();
-    void ToggleSelection(bool hide);
-    void ShowLastHidden();
     void OnUpdateOpenRecent();
 
     void OnUpdateMacrosMenu();
diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp
index c6a2ece984..abffd1f995 100644
--- a/Code/Sandbox/Editor/CryEdit.cpp
+++ b/Code/Sandbox/Editor/CryEdit.cpp
@@ -102,7 +102,6 @@ AZ_POP_DISABLE_WARNING
 #include "ModelViewport.h"
 #include "FileTypeUtils.h"
 #include "PluginManager.h"
-#include "Material/MaterialManager.h"
 
 #include "IEditorImpl.h"
 #include "StartupLogoDialog.h"
@@ -149,7 +148,6 @@ AZ_POP_DISABLE_WARNING
 #include "LevelFileDialog.h"
 #include "LevelIndependentFileMan.h"
 #include "WelcomeScreen/WelcomeScreenDialog.h"
-#include "Dialogs/DuplicatedObjectsHandlerDlg.h"
 
 #include "Controls/ReflectedPropertyControl/PropertyCtrl.h"
 #include "Controls/ReflectedPropertyControl/ReflectedVar.h"
@@ -158,9 +156,6 @@ AZ_POP_DISABLE_WARNING
 
 #include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
 
-// LmbrCentral
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-
 // AWSNativeSDK
 #include <AzToolsFramework/Undo/UndoSystem.h>
 #include <AWSNativeSDKInit/AWSNativeSDKInit.h>
@@ -382,28 +377,16 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_FILE_EXPORT_SELECTEDOBJECTS, OnExportSelectedObjects)
     ON_COMMAND(ID_EDIT_HOLD, OnEditHold)
     ON_COMMAND(ID_EDIT_FETCH, OnEditFetch)
-    ON_COMMAND(ID_GENERATORS_STATICOBJECTS, OnGeneratorsStaticobjects)
     ON_COMMAND(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, OnFileExportToGameNoSurfaceTexture)
     ON_COMMAND(ID_VIEW_SWITCHTOGAME, OnViewSwitchToGame)
-    ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectAll)
-    ON_COMMAND(ID_EDIT_SELECTNONE, OnEditSelectNone)
-    ON_COMMAND(ID_EDIT_DELETE, OnEditDelete)
     ON_COMMAND(ID_MOVE_OBJECT, OnMoveObject)
     ON_COMMAND(ID_RENAME_OBJ, OnRenameObj)
-    ON_COMMAND(ID_SET_HEIGHT, OnSetHeight)
     ON_COMMAND(ID_EDITMODE_MOVE, OnEditmodeMove)
     ON_COMMAND(ID_EDITMODE_ROTATE, OnEditmodeRotate)
     ON_COMMAND(ID_EDITMODE_SCALE, OnEditmodeScale)
-    ON_COMMAND(ID_OBJECTMODIFY_SETAREA, OnObjectSetArea)
-    ON_COMMAND(ID_OBJECTMODIFY_SETHEIGHT, OnObjectSetHeight)
-    ON_COMMAND(ID_OBJECTMODIFY_FREEZE, OnObjectmodifyFreeze)
-    ON_COMMAND(ID_OBJECTMODIFY_UNFREEZE, OnObjectmodifyUnfreeze)
     ON_COMMAND(ID_UNDO, OnUndo)
     ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo)     // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one
-    ON_COMMAND(ID_SELECTION_SAVE, OnSelectionSave)
     ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter)
-    ON_COMMAND(ID_SELECTION_LOAD, OnSelectionLoad)
-    ON_COMMAND(ID_LOCK_SELECTION, OnLockSelection)
     ON_COMMAND(ID_EDIT_LEVELDATA, OnEditLevelData)
     ON_COMMAND(ID_FILE_EDITLOGFILE, OnFileEditLogFile)
     ON_COMMAND(ID_FILE_RESAVESLICES, OnFileResaveSlices)
@@ -423,13 +406,6 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_GAME_SYNCPLAYER, OnSyncPlayer)
     ON_COMMAND(ID_RESOURCES_REDUCEWORKINGSET, OnResourcesReduceworkingset)
 
-    // Standard file based document commands
-    ON_COMMAND(ID_EDIT_HIDE, OnEditHide)
-    ON_COMMAND(ID_EDIT_SHOW_LAST_HIDDEN, OnEditShowLastHidden)
-    ON_COMMAND(ID_EDIT_UNHIDEALL, OnEditUnhideall)
-    ON_COMMAND(ID_EDIT_FREEZE, OnEditFreeze)
-    ON_COMMAND(ID_EDIT_UNFREEZEALL, OnEditUnfreezeall)
-
     ON_COMMAND(ID_SNAP_TO_GRID, OnSnap)
 
     ON_COMMAND(ID_WIREFRAME, OnWireframe)
@@ -475,26 +451,16 @@ void CCryEditApp::RegisterActionHandlers()
 #endif
     ON_COMMAND(ID_DISPLAY_GOTOPOSITION, OnDisplayGotoPosition)
     ON_COMMAND(ID_SNAPANGLE, OnSnapangle)
-    ON_COMMAND(ID_RULER, OnRuler)
-    ON_COMMAND(ID_ROTATESELECTION_XAXIS, OnRotateselectionXaxis)
-    ON_COMMAND(ID_ROTATESELECTION_YAXIS, OnRotateselectionYaxis)
-    ON_COMMAND(ID_ROTATESELECTION_ZAXIS, OnRotateselectionZaxis)
-    ON_COMMAND(ID_ROTATESELECTION_ROTATEANGLE, OnRotateselectionRotateangle)
-    ON_COMMAND(ID_MODIFY_OBJECT_HEIGHT, OnObjectSetHeight)
     ON_COMMAND(ID_EDIT_RENAMEOBJECT, OnEditRenameobject)
     ON_COMMAND(ID_CHANGEMOVESPEED_INCREASE, OnChangemovespeedIncrease)
     ON_COMMAND(ID_CHANGEMOVESPEED_DECREASE, OnChangemovespeedDecrease)
     ON_COMMAND(ID_CHANGEMOVESPEED_CHANGESTEP, OnChangemovespeedChangestep)
-    ON_COMMAND(ID_MATERIAL_ASSIGNCURRENT, OnMaterialAssigncurrent)
-    ON_COMMAND(ID_MATERIAL_RESETTODEFAULT, OnMaterialResettodefault)
-    ON_COMMAND(ID_MATERIAL_GETMATERIAL, OnMaterialGetmaterial)
     ON_COMMAND(ID_FILE_SAVELEVELRESOURCES, OnFileSavelevelresources)
     ON_COMMAND(ID_CLEAR_REGISTRY, OnClearRegistryData)
     ON_COMMAND(ID_VALIDATELEVEL, OnValidatelevel)
     ON_COMMAND(ID_TOOLS_VALIDATEOBJECTPOSITIONS, OnValidateObjectPositions)
     ON_COMMAND(ID_TOOLS_PREFERENCES, OnToolsPreferences)
     ON_COMMAND(ID_GRAPHICS_SETTINGS, OnGraphicsSettings)
-    ON_COMMAND(ID_EDIT_INVERTSELECTION, OnEditInvertselection)
     ON_COMMAND(ID_SWITCHCAMERA_DEFAULTCAMERA, OnSwitchToDefaultCamera)
     ON_COMMAND(ID_SWITCHCAMERA_SEQUENCECAMERA, OnSwitchToSequenceCamera)
     ON_COMMAND(ID_SWITCHCAMERA_SELECTEDCAMERA, OnSwitchToSelectedcamera)
@@ -503,12 +469,9 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_OPEN_ASSET_BROWSER, OnOpenAssetBrowserView)
     ON_COMMAND(ID_OPEN_AUDIO_CONTROLS_BROWSER, OnOpenAudioControlsEditor)
 
-    ON_COMMAND(ID_OPEN_MATERIAL_EDITOR, OnOpenMaterialEditor)
-    ON_COMMAND(ID_GOTO_VIEWPORTSEARCH, OnGotoViewportSearch)
     ON_COMMAND(ID_DISPLAY_SHOWHELPERS, OnShowHelpers)
     ON_COMMAND(ID_OPEN_TRACKVIEW, OnOpenTrackView)
     ON_COMMAND(ID_OPEN_UICANVASEDITOR, OnOpenUICanvasEditor)
-    ON_COMMAND(ID_GOTO_VIEWPORTSEARCH, OnGotoViewportSearch)
     ON_COMMAND(ID_TERRAIN_TIMEOFDAY, OnTimeOfDay)
     ON_COMMAND(ID_TERRAIN_TIMEOFDAYBUTTON, OnTimeOfDay)
 
@@ -1157,9 +1120,9 @@ BOOL CCryEditApp::CheckIfAlreadyRunning()
         m_mutexApplication = new QSharedMemory(O3DEApplicationName);
         if (!m_mutexApplication->create(16))
         {
-            // Don't prompt the user in non-interactive export mode.  Instead, default to allowing multiple instances to 
-            // run simultaneously, so that multiple level exports can be run in parallel on the same machine.  
-            // NOTE:  If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs 
+            // Don't prompt the user in non-interactive export mode.  Instead, default to allowing multiple instances to
+            // run simultaneously, so that multiple level exports can be run in parallel on the same machine.
+            // NOTE:  If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs
             // from trying to write to the same level at the same time.
             // If we're running interactively, let's ask and make sure the user actually intended to do this.
             if (!m_bExportMode && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Too many apps"), QObject::tr("There is already an Open 3D Engine application running\nDo you want to start another one?")) != QMessageBox::Yes)
@@ -1720,7 +1683,7 @@ BOOL CCryEditApp::InitInstance()
     AzQtComponents::StyleManager::addSearchPaths(
         QStringLiteral("style"),
         engineRoot.filePath(QStringLiteral("Code/Sandbox/Editor/Style")),
-        QStringLiteral(":/Editor/Style"),
+        QStringLiteral(":/Assets/Editor/Style"),
         engineRootPath);
     AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss"));
 
@@ -2657,64 +2620,6 @@ void CCryEditApp::OnFileExportToGameNoSurfaceTexture()
     UserExportToGame(false);
 }
 
-void CCryEditApp::OnGeneratorsStaticobjects()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Show the static objects dialog
-    ////////////////////////////////////////////////////////////////////////
-    /*
-        CStaticObjects cDialog;
-
-        cDialog.DoModal();
-
-        BeginWaitCursor();
-        GetIEditor()->UpdateViews( eUpdateStatObj );
-        GetIEditor()->GetDocument()->GetStatObjMap()->PlaceObjectsOnTerrain();
-        EndWaitCursor();
-        */
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditSelectAll()
-{
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        ////////////////////////////////////////////////////////////////////////
-        // Select all map objects
-        ////////////////////////////////////////////////////////////////////////
-        AABB box(Vec3(-FLT_MAX, -FLT_MAX, -FLT_MAX), Vec3(FLT_MAX, FLT_MAX, FLT_MAX));
-        GetIEditor()->GetObjectManager()->SelectObjects(box);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditSelectNone()
-{
-    CUndo undo("Unselect All");
-    ////////////////////////////////////////////////////////////////////////
-    // Remove the selection from all map objects
-    ////////////////////////////////////////////////////////////////////////
-    GetIEditor()->ClearSelection();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditInvertselection()
-{
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        GetIEditor()->GetObjectManager()->InvertSelection();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditDelete()
-{
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        DeleteSelectedEntities(true);
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::DeleteSelectedEntities([[maybe_unused]] bool includeDescendants)
 {
@@ -2737,10 +2642,6 @@ void CCryEditApp::OnRenameObj()
 {
 }
 
-void CCryEditApp::OnSetHeight()
-{
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnEditmodeMove()
 {
@@ -2810,167 +2711,6 @@ void CCryEditApp::OnUpdateEditmodeScale(QAction* action)
     action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale);
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnObjectSetArea()
-{
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    if (!pSelection->IsEmpty())
-    {
-        bool ok = false;
-        int fractionalDigitCount = 2;
-        float area = aznumeric_caster(QInputDialog::getDouble(AzToolsFramework::GetActiveWindow(), QObject::tr("Insert Value"), QStringLiteral(""), 0, std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max(), fractionalDigitCount, &ok));
-        if (!ok)
-        {
-            return;
-        }
-
-        GetIEditor()->BeginUndo();
-        for (int i = 0; i < pSelection->GetCount(); i++)
-        {
-            CBaseObject* obj = pSelection->GetObject(i);
-            obj->SetArea(area);
-        }
-        GetIEditor()->AcceptUndo("Set Area");
-        GetIEditor()->SetModifiedFlag();
-        GetIEditor()->SetModifiedModule(eModifiedBrushes);
-    }
-    else
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("No objects selected"));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnObjectSetHeight()
-{
-    AzFramework::EntityContextId editorContextId;
-    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
-        editorContextId, &AzToolsFramework::EditorEntityContextRequests::GetEditorEntityContextId);
-
-    CSelectionGroup* sel = GetIEditor()->GetObjectManager()->GetSelection();
-
-    if (!sel->IsEmpty())
-    {
-        // Retrieve the Z origin from where height is messured from
-        auto getZOrigin = [&](const Vec3& pos, [[maybe_unused]] AZ::EntityId entityId)
-        {
-            float z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
-            if (z != pos.z)
-            {
-                float zdown = FLT_MAX;
-                float zup = FLT_MAX;
-                AzFramework::RenderGeometry::RayRequest ray;
-                ray.m_startWorldPosition = LYVec3ToAZVec3(pos);
-                ray.m_onlyVisible = true;
-                if (entityId.IsValid()) // Don't check height against self
-                {
-                    ray.m_entityFilter.m_ignoreEntities.insert(entityId);
-                }
-                // Down
-                ray.m_endWorldPosition = LYVec3ToAZVec3(pos - Vec3(0, 0, 4000));
-                {
-                    AzFramework::RenderGeometry::RayResult result;
-                    AzFramework::RenderGeometry::IntersectorBus::EventResult(result, editorContextId,
-                        &AzFramework::RenderGeometry::IntersectorInterface::RayIntersect, ray);
-                    if (result)
-                    {
-                        zdown = result.m_worldPosition.GetZ();
-                    }
-                }
-                // Up
-                ray.m_endWorldPosition = LYVec3ToAZVec3(pos + Vec3(0, 0, 4000));
-                {
-                    AzFramework::RenderGeometry::RayResult result;
-                    AzFramework::RenderGeometry::IntersectorBus::EventResult(result, editorContextId,
-                        &AzFramework::RenderGeometry::IntersectorInterface::RayIntersect, ray);
-                    if (result)
-                    {
-                        zup = result.m_worldPosition.GetZ();
-                    }
-                }
-                if (zdown != FLT_MAX && zup != FLT_MAX)
-                {
-                    if (fabs(zup - z) < fabs(zdown - z))
-                    {
-                        z = zup;
-                    }
-                    else
-                    {
-                        z = zdown;
-                    }
-                }
-                else if (zup != FLT_MAX)
-                {
-                    z = zup;
-                }
-                else if (zdown != FLT_MAX)
-                {
-                    z = zdown;
-                }
-            }
-            return z;
-        };
-
-
-        float height = 0;
-        if (sel->GetCount() == 1)
-        {
-            CBaseObject* obj = sel->GetObject(0);
-            Vec3 pos = obj->GetWorldPos();
-            AZ::EntityId entityId;
-            if (obj->GetType() == OBJTYPE_AZENTITY)
-            {
-                entityId = static_cast<CComponentEntityObject*>(obj)->GetAssociatedEntityId();
-            }
-            height = pos.z - getZOrigin(pos, entityId);
-        }
-
-        bool ok = false;
-        int fractionalDigitCount = 2;
-        height = aznumeric_caster(QInputDialog::getDouble(AzToolsFramework::GetActiveWindow(), QObject::tr("Enter Height"), QStringLiteral(""), height, -10000, 10000, fractionalDigitCount, &ok));
-        if (!ok)
-        {
-            return;
-        }
-
-        CUndo undo("Set Height");
-        for (int i = 0; i < sel->GetCount(); i++)
-        {
-            CBaseObject* obj = sel->GetObject(i);
-            Matrix34 wtm = obj->GetWorldTM();
-            Vec3 pos = wtm.GetTranslation();
-            AZ::EntityId entityId;
-            if (obj->GetType() == OBJTYPE_AZENTITY)
-            {
-                entityId = static_cast<CComponentEntityObject*>(obj)->GetAssociatedEntityId();
-            }
-            float z = getZOrigin(pos, entityId);
-            pos.z = z + height;
-            wtm.SetTranslation(pos);
-            obj->SetWorldTM(wtm, eObjectUpdateFlags_UserInput);
-        }
-
-        GetIEditor()->SetModifiedFlag();
-        GetIEditor()->SetModifiedModule(eModifiedBrushes);
-    }
-    else
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("No objects selected"));
-    }
-}
-
-void CCryEditApp::OnObjectmodifyFreeze()
-{
-    // Freeze selection.
-    OnEditFreeze();
-}
-
-void CCryEditApp::OnObjectmodifyUnfreeze()
-{
-    // Unfreeze all.
-    OnEditUnfreezeall();
-}
-
 void CCryEditApp::OnViewSwitchToGame()
 {
     if (IsInPreviewMode())
@@ -3019,149 +2759,12 @@ void CCryEditApp::OnFileExportOcclusionMesh()
     pExportManager->Export(levelName.toUtf8().data(), "ocm", levelPath.toUtf8().data(), false, false, true);
 }
 
-void CCryEditApp::OnSelectionSave()
-{
-    char szFilters[] = "Object Group Files (*.grp)";
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptSave, QFileDialog::AnyFile, "grp", {}, szFilters, {}, {}, cap);
-
-    if (dlg.exec())
-    {
-        QWaitCursor wait;
-        CSelectionGroup* sel = GetIEditor()->GetSelection();
-        //CXmlArchive xmlAr( "Objects" );
-
-
-        XmlNodeRef root = XmlHelpers::CreateXmlNode("Objects");
-        CObjectArchive ar(GetIEditor()->GetObjectManager(), root, false);
-        // Save all objects to XML.
-        for (int i = 0; i < sel->GetCount(); i++)
-        {
-            ar.SaveObject(sel->GetObject(i));
-        }
-        QString fileName = dlg.selectedFiles().first();
-        XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), root, fileName.toStdString().c_str());
-        //xmlAr.Save( dlg.GetPathName() );
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
-struct SDuplicatedObject
-{
-    SDuplicatedObject(const QString& name, const GUID& id)
-    {
-        m_name = name;
-        m_id = id;
-    }
-    QString m_name;
-    GUID m_id;
-};
-
-void GatherAllObjects(XmlNodeRef node, std::vector<SDuplicatedObject>& outDuplicatedObjects)
-{
-    if (!azstricmp(node->getTag(), "Object"))
-    {
-        GUID guid;
-        if (node->getAttr("Id", guid))
-        {
-            if (GetIEditor()->GetObjectManager()->FindObject(guid))
-            {
-                QString name;
-                node->getAttr("Name", name);
-                outDuplicatedObjects.push_back(SDuplicatedObject(name, guid));
-            }
-        }
-    }
-
-    for (int i = 0, nChildCount(node->getChildCount()); i < nChildCount; ++i)
-    {
-        XmlNodeRef childNode = node->getChild(i);
-        if (childNode == NULL)
-        {
-            continue;
-        }
-        GatherAllObjects(childNode, outDuplicatedObjects);
-    }
-}
-
 void CCryEditApp::OnOpenAssetImporter()
 {
     QtViewPaneManager::instance()->OpenPane(LyViewPane::SceneSettings);
 }
 
-void CCryEditApp::OnSelectionLoad()
-{
-    // Load objects from .grp file.
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, "grp", {}, "Object Group Files (*.grp)", {}, {}, cap);
-    if (dlg.exec() != QDialog::Accepted)
-    {
-        return;
-    }
-
-    QWaitCursor wait;
-
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(dlg.selectedFiles().first().toStdString().c_str());
-    if (!root)
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Error at loading group file."));
-        return;
-    }
-
-    std::vector<SDuplicatedObject> duplicatedObjects;
-    GatherAllObjects(root, duplicatedObjects);
-
-    CDuplicatedObjectsHandlerDlg::EResult result(CDuplicatedObjectsHandlerDlg::eResult_None);
-    int nDuplicatedObjectSize(duplicatedObjects.size());
-
-    if (!duplicatedObjects.empty())
-    {
-        QString msg = QObject::tr("The following object(s) already exist(s) in the level.\r\n\r\n");
-
-        for (int i = 0; i < nDuplicatedObjectSize; ++i)
-        {
-            msg += QStringLiteral("\t");
-            msg += duplicatedObjects[i].m_name;
-            if (i < nDuplicatedObjectSize - 1)
-            {
-                msg += QStringLiteral("\r\n");
-            }
-        }
-
-        CDuplicatedObjectsHandlerDlg confirmDlg(msg);
-        if (confirmDlg.exec() == QDialog::Rejected)
-        {
-            return;
-        }
-        result = confirmDlg.GetResult();
-    }
-
-    CUndo undo("Load Objects");
-    GetIEditor()->ClearSelection();
-
-    CObjectArchive ar(GetIEditor()->GetObjectManager(), root, true);
-
-    if (result == CDuplicatedObjectsHandlerDlg::eResult_Override)
-    {
-        for (int i = 0; i < nDuplicatedObjectSize; ++i)
-        {
-            CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(duplicatedObjects[i].m_id);
-            if (pObj)
-            {
-                GetIEditor()->GetObjectManager()->DeleteObject(pObj);
-            }
-        }
-    }
-    else if (result == CDuplicatedObjectsHandlerDlg::eResult_CreateCopies)
-    {
-        ar.MakeNewIds(true);
-    }
-
-    GetIEditor()->GetObjectManager()->LoadObjects(ar, true);
-    GetIEditor()->SetModifiedFlag();
-    GetIEditor()->SetModifiedModule(eModifiedBrushes);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnUpdateSelected(QAction* action)
 {
@@ -3174,13 +2777,6 @@ void CCryEditApp::OnShowHelpers()
     GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnLockSelection()
-{
-    // Invert selection lock.
-    GetIEditor()->LockSelection(!GetIEditor()->IsSelectionLocked());
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnEditLevelData()
 {
@@ -3942,7 +3538,6 @@ CCryEditDoc* CCryEditApp::OpenDocumentFile(LPCTSTR lpszFileName)
             GetIEditor()->GetUndoManager()->Suspend();
             actionManager->GetAction(ID_EDIT_SELECTALL)->trigger();
             actionManager->GetAction(ID_GOTO_SELECTED)->trigger();
-            actionManager->GetAction(ID_EDIT_SELECTNONE)->trigger();
             GetIEditor()->GetUndoManager()->Resume();
         }
     }
@@ -3960,117 +3555,6 @@ void CCryEditApp::OnResourcesReduceworkingset()
 #endif
 }
 
-//////////////////////////////////////////////////////////////////////////
-
-void CCryEditApp::OnToggleSelection(bool hide)
-{
-    CSelectionGroup* sel = GetIEditor()->GetSelection();
-    if (!sel->IsEmpty())
-    {
-        AzToolsFramework::ScopedUndoBatch undo(hide ? "Hide Entity" : "Show Entity");
-        for (int i = 0; i < sel->GetCount(); i++)
-        {
-            // Duplicated object names can exist in the case of prefab objects so passing a name as a script parameter and processing it couldn't be exact.
-            GetIEditor()->GetObjectManager()->HideObject(sel->GetObject(i), hide);
-        }
-    }
-
-}
-
-void CCryEditApp::OnEditHide()
-{
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        OnToggleSelection(true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditHide(QAction* action)
-{
-    CSelectionGroup* sel = GetIEditor()->GetSelection();
-    if (!sel->IsEmpty())
-    {
-        action->setEnabled(true);
-    }
-    else
-    {
-        action->setEnabled(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditShowLastHidden()
-{
-    AzToolsFramework::ScopedUndoBatch undo("Show Last Hidden Entity");
-    GetIEditor()->GetObjectManager()->ShowLastHiddenObject();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditUnhideall()
-{
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        if (QMessageBox::question(
-            AzToolsFramework::GetActiveWindow(), QObject::tr("Unhide All"),
-            QObject::tr("Are you sure you want to unhide all the objects?"),
-            QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes)
-        {
-            // Unhide all.
-            AzToolsFramework::ScopedUndoBatch undo("Unhide all Entities");
-            GetIEditor()->GetObjectManager()->UnhideAll();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditFreeze()
-{
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        // Freeze selection.
-        CSelectionGroup* sel = GetIEditor()->GetSelection();
-        if (!sel->IsEmpty())
-        {
-            AzToolsFramework::ScopedUndoBatch undo("Lock Selected Entities");
-
-            // We need to iterate over the list of selected objects in reverse order
-            // because when the objects are locked, they are removed from the
-            // selection so you would end up with the last selected object not
-            // being locked
-            int numSelected = sel->GetCount();
-            for (int i = numSelected - 1; i >= 0; --i)
-            {
-                // Duplicated object names can exist in the case of prefab objects so passing a name as a script parameter and processing it couldn't be exact.
-                sel->GetObject(i)->SetFrozen(true);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditFreeze(QAction* action)
-{
-    OnUpdateEditHide(action);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditUnfreezeall()
-{
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        if (QMessageBox::question(
-            AzToolsFramework::GetActiveWindow(), QObject::tr("Unlock All"),
-            QObject::tr("Are you sure you want to unlock all the objects?"),
-            QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes)
-        {
-            // Unfreeze all.
-            AzToolsFramework::ScopedUndoBatch undo("Unlock all Entities");
-            GetIEditor()->GetObjectManager()->UnfreezeAll();
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnSnap()
 {
@@ -4340,56 +3824,6 @@ void CCryEditApp::OnUpdateSnapangle(QAction* action)
     action->setChecked(gSettings.pGrid->IsAngleSnapEnabled());
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnRuler()
-{
-    CRuler* pRuler = GetIEditor()->GetRuler();
-    pRuler->SetActive(!pRuler->IsActive());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateRuler(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-    action->setChecked(GetIEditor()->GetRuler()->IsActive());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnRotateselectionXaxis()
-{
-    CUndo undo("Rotate X");
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    pSelection->Rotate(Ang3(m_fastRotateAngle, 0, 0), GetIEditor()->GetReferenceCoordSys());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnRotateselectionYaxis()
-{
-    CUndo undo("Rotate Y");
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    pSelection->Rotate(Ang3(0, m_fastRotateAngle, 0), GetIEditor()->GetReferenceCoordSys());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnRotateselectionZaxis()
-{
-    CUndo undo("Rotate Z");
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    pSelection->Rotate(Ang3(0, 0, m_fastRotateAngle), GetIEditor()->GetReferenceCoordSys());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnRotateselectionRotateangle()
-{
-    bool ok = false;
-    int fractionalDigitCount = 5;
-    float angle = aznumeric_caster(QInputDialog::getDouble(AzToolsFramework::GetActiveWindow(), QObject::tr("Rotate Angle"), QStringLiteral(""), m_fastRotateAngle, std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max(), fractionalDigitCount, &ok));
-    if (ok)
-    {
-        m_fastRotateAngle = angle;
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnEditRenameobject()
 {
@@ -4739,31 +4173,6 @@ void CCryEditApp::OnSwitchcameraNext()
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnMaterialAssigncurrent()
-{
-    CUndo undo("Assign Material To Selection");
-    GetIEditor()->GetMaterialManager()->Command_AssignToSelection();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnMaterialResettodefault()
-{
-    GetIEditor()->GetMaterialManager()->Command_ResetSelection();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnMaterialGetmaterial()
-{
-    GetIEditor()->GetMaterialManager()->Command_SelectFromObject();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenMaterialEditor()
-{
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::MaterialEditor);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnOpenAssetBrowserView()
 {
@@ -4880,18 +4289,6 @@ void CCryEditApp::OnUpdateGameSpec(QAction* action)
 }
 
 //////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnGotoViewportSearch()
-{
-    if (MainWindow::instance())
-    {
-        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-        if (viewPane)
-        {
-            viewPane->SetFocusToViewportSearch();
-        }
-    }
-}
-
 RecentFileList* CCryEditApp::GetRecentFileList()
 {
     static RecentFileList list;
@@ -5185,12 +4582,28 @@ extern "C"
 #pragma comment(lib, "Shell32.lib")
 #endif
 
+struct CryAllocatorsRAII
+{
+    CryAllocatorsRAII()
+    {
+        AZ_Assert(!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
+        AZ_Assert(!AZ::AllocatorInstance<CryStringAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
+
+        AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
+        AZ::AllocatorInstance<CryStringAllocator>::Create();
+    }
+
+    ~CryAllocatorsRAII()
+    {
+        AZ::AllocatorInstance<CryStringAllocator>::Destroy();
+        AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
+    }
+};
+
+
 extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
 {
-    AZ_Assert(!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
-    AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
-    AZ_Assert(!AZ::AllocatorInstance<CryStringAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
-    AZ::AllocatorInstance<CryStringAllocator>::Create();
+    CryAllocatorsRAII cryAllocatorsRAII;
 
     // ensure the EditorEventsBus context gets created inside EditorLib
     [[maybe_unused]] const auto& editorEventsContext = AzToolsFramework::EditorEvents::Bus::GetOrCreateContext();
@@ -5198,7 +4611,7 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
     // connect relevant buses to global settings
     gSettings.Connect();
 
-    CCryEditApp* theApp = new CCryEditApp();
+    auto theApp = AZStd::make_unique<CCryEditApp>();
     // this does some magic to set the current directory...
     {
         QCoreApplication app(argc, argv);
@@ -5285,8 +4698,6 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
 
     }
 
-    delete theApp;
-
     gSettings.Disconnect();
 
     return ret;
diff --git a/Code/Sandbox/Editor/CryEdit.h b/Code/Sandbox/Editor/CryEdit.h
index dc18dbcfda..bce7f0c90d 100644
--- a/Code/Sandbox/Editor/CryEdit.h
+++ b/Code/Sandbox/Editor/CryEdit.h
@@ -116,7 +116,6 @@ public:
     static CCryEditApp* instance();
 
     bool GetRootEnginePath(QDir& rootEnginePath) const;
-    void OnToggleSelection(bool hide);
     bool CreateLevel(bool& wasCreateLevelOperationCancelled);
     void LoadFile(QString fileName);
     void ForceNextIdleProcessing() { m_bForceProcessIdle = true; }
@@ -210,33 +209,21 @@ public:
     void OnExportSelectedObjects();
     void OnEditHold();
     void OnEditFetch();
-    void OnGeneratorsStaticobjects();
     void OnFileExportToGameNoSurfaceTexture();
     void OnViewSwitchToGame();
     void OnViewDeploy();
-    void OnEditSelectAll();
-    void OnEditSelectNone();
-    void OnEditDelete();
     void DeleteSelectedEntities(bool includeDescendants);
     void OnMoveObject();
     void OnRenameObj();
-    void OnSetHeight();
     void OnEditmodeMove();
     void OnEditmodeRotate();
     void OnEditmodeScale();
-    void OnObjectSetArea();
-    void OnObjectSetHeight();
     void OnUpdateEditmodeMove(QAction* action);
     void OnUpdateEditmodeRotate(QAction* action);
     void OnUpdateEditmodeScale(QAction* action);
-    void OnObjectmodifyFreeze();
-    void OnObjectmodifyUnfreeze();
     void OnUndo();
-    void OnSelectionSave();
     void OnOpenAssetImporter();
-    void OnSelectionLoad();
     void OnUpdateSelected(QAction* action);
-    void OnLockSelection();
     void OnEditLevelData();
     void OnFileEditLogFile();
     void OnFileResaveSlices();
@@ -386,13 +373,6 @@ private:
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
     friend struct PythonTestOutputHandler;
 
-    void OnEditHide();
-    void OnUpdateEditHide(QAction* action);
-    void OnEditShowLastHidden();
-    void OnEditUnhideall();
-    void OnEditFreeze();
-    void OnUpdateEditFreeze(QAction* action);
-    void OnEditUnfreezeall();
     void OnSnap();
     void OnWireframe();
     void OnUpdateWireframe(QAction* action);
@@ -433,26 +413,16 @@ private:
     void OnDisplayGotoPosition();
     void OnSnapangle();
     void OnUpdateSnapangle(QAction* action);
-    void OnRuler();
-    void OnUpdateRuler(QAction* action);
-    void OnRotateselectionXaxis();
-    void OnRotateselectionYaxis();
-    void OnRotateselectionZaxis();
-    void OnRotateselectionRotateangle();
     void OnEditRenameobject();
     void OnChangemovespeedIncrease();
     void OnChangemovespeedDecrease();
     void OnChangemovespeedChangestep();
-    void OnMaterialAssigncurrent();
-    void OnMaterialResettodefault();
-    void OnMaterialGetmaterial();
     void OnFileSavelevelresources();
     void OnClearRegistryData();
     void OnValidatelevel();
     void OnValidateObjectPositions();
     void OnToolsPreferences();
     void OnGraphicsSettings();
-    void OnEditInvertselection();
     void OnSwitchToDefaultCamera();
     void OnUpdateSwitchToDefaultCamera(QAction* action);
     void OnSwitchToSequenceCamera();
@@ -461,12 +431,10 @@ private:
     void OnUpdateSwitchToSelectedCamera(QAction* action);
     void OnSwitchcameraNext();
     void OnOpenProceduralMaterialEditor();
-    void OnOpenMaterialEditor();
     void OnOpenAssetBrowserView();
     void OnOpenTrackView();
     void OnOpenAudioControlsEditor();
     void OnOpenUICanvasEditor();
-    void OnGotoViewportSearch();
     void OnTimeOfDay();
     void OnChangeGameSpec(UINT nID);
     void SetGameSpecCheck(ESystemConfigSpec spec, ESystemConfigPlatform platform, int &nCheck, bool &enable);
diff --git a/Code/Sandbox/Editor/CryEditDoc.cpp b/Code/Sandbox/Editor/CryEditDoc.cpp
index 916317b6bb..c144d93c46 100644
--- a/Code/Sandbox/Editor/CryEditDoc.cpp
+++ b/Code/Sandbox/Editor/CryEditDoc.cpp
@@ -51,8 +51,6 @@
 #include "CryEdit.h"
 #include "ActionManager.h"
 #include "Include/IObjectManager.h"
-#include "Material/MaterialManager.h"
-#include "LensFlareEditor/LensFlareManager.h"
 #include "ErrorReportDialog.h"
 #include "SurfaceTypeValidator.h"
 #include "ShaderCache.h"
@@ -83,7 +81,7 @@ static const char* kHoldFolder = "$tmp_hold"; // conform to the ignored file typ
 static const char* kSaveBackupFolder = "_savebackup";
 static const char* kResizeTempFolder = "$tmp_resize"; // conform to the ignored file types $tmp[0-9]*_ regex
 
-static const char* kBackupOrTempFolders[] = 
+static const char* kBackupOrTempFolders[] =
 {
     kAutoBackupFolder,
     kHoldFolder,
@@ -358,10 +356,6 @@ void CCryEditDoc::Save(TDocMultiArchive& arrXmlAr)
             SerializeFogSettings((*arrXmlAr[DMAS_GENERAL]));
             // Serialize Missions //////////////////////////////////////////////////
             SerializeMissions(arrXmlAr, currentMissionName, false);
-            //! Serialize material manager.
-            GetIEditor()->GetMaterialManager()->Serialize((*arrXmlAr[DMAS_GENERAL]).root, (*arrXmlAr[DMAS_GENERAL]).bLoading);
-            //! Serialize LensFlare manager.
-            GetIEditor()->GetLensFlareManager()->Serialize((*arrXmlAr[DMAS_GENERAL]).root, (*arrXmlAr[DMAS_GENERAL]).bLoading);
 
             SerializeShaderCache((*arrXmlAr[DMAS_GENERAL_NAMED_DATA]));
             SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
@@ -516,22 +510,6 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
             //////////////////////////////////////////////////////////////////////////
                 (*arrXmlAr[DMAS_GENERAL]).root->getAttr("WaterColor", m_waterColor);
 
-            //////////////////////////////////////////////////////////////////////////
-            // Load materials.
-            //////////////////////////////////////////////////////////////////////////
-            {
-                CAutoLogTime logtime("Load MaterialManager");
-                GetIEditor()->GetMaterialManager()->Serialize((*arrXmlAr[DMAS_GENERAL]).root, (*arrXmlAr[DMAS_GENERAL]).bLoading);
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // Load LensFlares.
-            //////////////////////////////////////////////////////////////////////////
-            {
-                CAutoLogTime logtime("Load Flares");
-                GetIEditor()->GetLensFlareManager()->Serialize((*arrXmlAr[DMAS_GENERAL]).root, (*arrXmlAr[DMAS_GENERAL]).bLoading);
-            }
-
             //////////////////////////////////////////////////////////////////////////
             // Load View Settings
             //////////////////////////////////////////////////////////////////////////
@@ -1164,7 +1142,7 @@ bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
         {
             DoSaveDocument(lpszPathName, context);
             saveSuccess = AfterSaveDocument(lpszPathName, context);
-        }     
+        }
     }
 
     return saveSuccess;
@@ -1436,7 +1414,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
     // Save AZ entities to the editor level.
 
     bool contentsAllSaved = false; // abort level save if anything within it fails
-    
+
     auto tempFilenameStrData = tempSaveFile.toStdString();
     auto filenameStrData = fullPathName.toStdString();
 
@@ -1458,7 +1436,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
             }
         }
 
-        
+
         AZStd::vector<AZ::Entity*> editorEntities;
         AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
             &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
@@ -1815,7 +1793,7 @@ bool CCryEditDoc::LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteC
     AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
 
     auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-    
+
     QString folderPath = QFileInfo(absoluteCryFilePath).absolutePath();
 
     OnStartLevelResourceList();
@@ -2391,7 +2369,8 @@ void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bU
         GetIEditor()->GetGameEngine()->SetLevelCreated(false);
 
         // Default time of day.
-        XmlNodeRef root = GetISystem()->LoadXmlFromFile("@engroot@/Editor/default_time_of_day.xml");
+        auto defaultTimeOfDayPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "default_time_of_day.xml";
+        XmlNodeRef root = GetISystem()->LoadXmlFromFile(defaultTimeOfDayPath.c_str());
         if (root)
         {
             ITimeOfDay* pTimeOfDay = gEnv->p3DEngine ? gEnv->p3DEngine->GetTimeOfDay() : nullptr;
@@ -2454,7 +2433,7 @@ void CCryEditDoc::CreateDefaultLevelAssets(int resolution, int unitSize)
 
                     AZ::Transform worldTransform = AZ::Transform::CreateIdentity();
                     worldTransform = AZ::Transform::CreateTranslation(AZ::Vector3(halfTerrainSize, halfTerrainSize, m_envProbeHeight / 2));
-                
+
                     AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
                     GetIEditor()->SuspendUndo();
                     AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
@@ -2613,7 +2592,7 @@ void CCryEditDoc::OnSliceInstantiated(const AZ::Data::AssetId& sliceAssetId, AZ:
         sliceAddress.SetReference(nullptr);
         SetModifiedFlag(true);
         SetModifiedModules(eModifiedEntities);
-        
+
         AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
 
         //save after level default slice fully instantiated
diff --git a/Code/Sandbox/Editor/CustomResolutionDlg.cpp b/Code/Sandbox/Editor/CustomResolutionDlg.cpp
index 44513e68ce..895715ff46 100644
--- a/Code/Sandbox/Editor/CustomResolutionDlg.cpp
+++ b/Code/Sandbox/Editor/CustomResolutionDlg.cpp
@@ -27,6 +27,7 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 
 #define MIN_RES 64
+#define MAX_RES 8192
 
 CCustomResolutionDlg::CCustomResolutionDlg(int w, int h, QWidget* pParent /*=NULL*/)
     : QDialog(pParent)
@@ -46,18 +47,17 @@ CCustomResolutionDlg::~CCustomResolutionDlg()
 
 void CCustomResolutionDlg::OnInitDialog()
 {
-    int maxRes = GetIEditor()->GetRenderer()->GetMaxSquareRasterDimension();
-    m_ui->m_width->setRange(MIN_RES, maxRes);
+    m_ui->m_width->setRange(MIN_RES, MAX_RES);
     m_ui->m_width->setValue(m_wDefault);
 
-    m_ui->m_height->setRange(MIN_RES, maxRes);
+    m_ui->m_height->setRange(MIN_RES, MAX_RES);
     m_ui->m_height->setValue(m_hDefault);
 
     QString maxDimensionString;
     QTextStream(&maxDimensionString) 
-        << "Maximum Dimension: " << maxRes << Qt::endl 
+        << "Maximum Dimension: " << MAX_RES << Qt::endl 
         << Qt::endl
-        << "Note: Dimensions over 4K may be" << Qt::endl
+        << "Note: Dimensions over 8K may be" << Qt::endl
         << "unstable depending on hardware.";
     
     m_ui->m_maxDimension->setText(maxDimensionString);
diff --git a/Code/Sandbox/Editor/DatabaseFrameWnd.cpp b/Code/Sandbox/Editor/DatabaseFrameWnd.cpp
deleted file mode 100644
index 89843c8247..0000000000
--- a/Code/Sandbox/Editor/DatabaseFrameWnd.cpp
+++ /dev/null
@@ -1,1491 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "DatabaseFrameWnd.h"
-
-// Qt
-#include <QComboBox>
-#include <QMimeData>
-#include <QTreeView>
-#include <QItemSelectionModel>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-
-// Editor
-#include "BaseLibraryManager.h"
-#include "BaseLibraryItem.h"
-#include "StringDlg.h"
-#include "QtViewPaneManager.h"
-#include "Undo/Undo.h"
-
-#include "ui_DatabaseFrameWnd.h"
-
-
-class CUndoSelectLibraryUndo
-    : public IUndoObject
-{
-public:
-    CUndoSelectLibraryUndo(const QString& libraryName, const QString& wndClssName)
-    {
-        m_LibraryName = libraryName;
-        m_WndClassName = wndClssName;
-    }
-    ~CUndoSelectLibraryUndo(){}
-
-protected:
-    int GetSize()
-    {
-        return sizeof(*this);
-    }
-    QString GetDescription() { return "Select database library."; };
-    void Undo(bool bUndo)
-    {
-        SelectLibrary(bUndo);
-    }
-    void Redo()
-    {
-        SelectLibrary(true);
-    }
-
-private:
-
-    void SelectLibrary(bool bUndo)
-    {
-        CDatabaseFrameWnd* pDatabaseEditor = FindViewPane<CDatabaseFrameWnd>(m_WndClassName);
-        if (!pDatabaseEditor)
-        {
-            return;
-        }
-
-        QString libraryNameForUndo(m_LibraryName);
-        if (bUndo)
-        {
-            m_LibraryName = pDatabaseEditor->GetSelectedLibraryName();
-        }
-        pDatabaseEditor->SelectLibrary(libraryNameForUndo);
-    }
-
-    QString m_LibraryName;
-    QString m_WndClassName;
-};
-
-static const int LIBRARY_CB_WIDTH(150);
-
-CDatabaseFrameWnd::CDatabaseFrameWnd(CBaseLibraryManager* pItemManager, QWidget* pParent)
-    : AzQtComponents::DockMainWindow(pParent)
-    , m_pItemManager(pItemManager)
-    , ui(new Ui::DatabaseFrameWnd)
-    , m_initialized(false)
-    , m_pLibraryItemTreeModel(nullptr)
-{
-    ui->setupUi(this);
-    m_sortRecursionType = SORT_RECURSION_FULL;
-    m_pLibrary = NULL;
-    m_bLibsLoaded = false;
-    m_pCurrentItem = NULL;
-
-    GetIEditor()->RegisterNotifyListener(this);
-    GetIEditor()->GetUndoManager()->AddListener(this);
-
-    m_pLibraryListComboBox = new QComboBox;
-    m_pLibraryListComboBox->setFixedSize(LIBRARY_CB_WIDTH, 16);
-    ui->m_toolBar->insertWidget(ui->m_toolBar->actions()[4], m_pLibraryListComboBox);
-    connect(m_pLibraryListComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CDatabaseFrameWnd::OnChangedLibrary);
-
-    m_pLibraryListModel = new LibraryListModel(m_pItemManager, this);
-    m_pLibraryListComboBox->setModel(m_pLibraryListModel);
-
-    connect(ui->actionDBAddLib, &QAction::triggered, this, &CDatabaseFrameWnd::OnAddLibrary);
-    connect(ui->actionDBDelLib, &QAction::triggered, this, &CDatabaseFrameWnd::OnRemoveLibrary);
-    connect(ui->actionDBRemove, &QAction::triggered, this, &CDatabaseFrameWnd::OnRemoveItem);
-    connect(ui->actionDBSave, &QAction::triggered, this, &CDatabaseFrameWnd::OnSave);
-    connect(ui->actionDBLoadLib, &QAction::triggered, this, &CDatabaseFrameWnd::OnLoadLibrary);
-    connect(ui->actionDBReload, &QAction::triggered, this, &CDatabaseFrameWnd::OnReloadLib);
-    connect(ui->actionDBReloadLib, &QAction::triggered, this, &CDatabaseFrameWnd::OnReloadLib);
-    connect(ui->actionDBCopy, &QAction::triggered, this, &CDatabaseFrameWnd::OnCopy);
-    connect(ui->actionDBPaste, &QAction::triggered, this, &CDatabaseFrameWnd::OnPaste);
-    connect(ui->actionDBClone, &QAction::triggered, this, &CDatabaseFrameWnd::OnClone);
-    connect(ui->actionUndo, &QAction::triggered, this, &CDatabaseFrameWnd::OnUndo);
-    connect(ui->actionRedo, &QAction::triggered, this, &CDatabaseFrameWnd::OnRedo);
-}
-
-CDatabaseFrameWnd::~CDatabaseFrameWnd()
-{
-    // Block Signals to prevent changes in the m_pLibraryListComboBox
-    // from triggering OnChangedLibrary on teardown.
-    m_pLibraryListComboBox->blockSignals(true);
-
-    m_pLibraryListModel->clear();
-
-    GetIEditor()->UnregisterNotifyListener(this);
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-}
-
-void CDatabaseFrameWnd::InitTreeCtrl()
-{
-    QTreeView* treeView = GetTreeCtrl();
-
-    connect(treeView->selectionModel(), &QItemSelectionModel::currentChanged, this, &CDatabaseFrameWnd::OnSelChangedItemTree);
-    treeView->installEventFilter(this);
-}
-
-void CDatabaseFrameWnd::ReloadLibs()
-{
-    if (!m_pItemManager)
-    {
-        return;
-    }
-
-    SelectItem(0);
-
-    m_pLibraryListModel->Reload();
-
-    if (m_pLibraryListComboBox)
-    {
-        SelectLibrary(m_pLibraryListComboBox->itemData(0, Qt::UserRole).value<CBaseLibrary*>());
-    }
-
-    m_bLibsLoaded = true;
-}
-
-void CDatabaseFrameWnd::ReloadItems()
-{
-    SelectItem(0);
-    m_selectedGroup = "";
-    m_pCurrentItem = 0;
-    m_cpoSelectedLibraryItems.clear();
-    if (m_pItemManager)
-    {
-        m_pItemManager->SetSelectedItem(0);
-    }
-    ReleasePreviewControl();
-
-    if (m_pLibrary && m_pLibraryItemTreeModel)
-    {
-        m_pLibraryItemTreeModel->Reload(m_pLibrary);
-        GetTreeCtrl()->expandAll();
-    }
-}
-
-void CDatabaseFrameWnd::SelectLibrary(const QString& library, bool bForceSelect)
-{
-    QWaitCursor wait;
-    if (GetSelectedLibraryName() != library || bForceSelect)
-    {
-        if (CUndo::IsRecording())
-        {
-            CUndo::Record(new CUndoSelectLibraryUndo(GetSelectedLibraryName(), GetClassName()));
-        }
-
-        SelectItem(0);
-        m_pLibrary = FindLibrary(library);
-        ReloadItems();
-    }
-    if (m_pLibraryListComboBox)
-    {
-        m_pLibraryListComboBox->setCurrentIndex(GetComboBoxIndex(m_pLibrary));
-    }
-}
-
-void CDatabaseFrameWnd::SelectLibrary(CBaseLibrary* pItem, bool bForceSelect)
-{
-    QWaitCursor wait;
-    if (m_pLibrary != pItem || bForceSelect)
-    {
-        if (CUndo::IsRecording() && m_pLibrary)
-        {
-            CUndo::Record(new CUndoSelectLibraryUndo(GetSelectedLibraryName(), GetClassName()));
-        }
-
-        SelectItem(0);
-        m_pLibrary = pItem;
-        ReloadItems();
-    }
-    if (m_pLibraryListComboBox)
-    {
-        m_pLibraryListComboBox->setCurrentIndex(GetComboBoxIndex(pItem));
-    }
-}
-
-void CDatabaseFrameWnd::SelectItem(CBaseLibraryItem* item, bool bForceReload)
-{
-    if (item == m_pCurrentItem && !bForceReload)
-    {
-        return;
-    }
-
-    QModelIndex index = m_pLibraryItemTreeModel->index(item);
-    if (index.isValid())
-    {
-        GetTreeCtrl()->expand(index.parent());
-        GetTreeCtrl()->setCurrentIndex(index);
-    }
-    else
-    {
-        GetTreeCtrl()->selectionModel()->clearCurrentIndex();
-    }
-}
-
-CBaseLibrary* CDatabaseFrameWnd::FindLibrary(const QString& libraryName)
-{
-    return (CBaseLibrary*)m_pItemManager->FindLibrary(libraryName);
-}
-
-int CDatabaseFrameWnd::GetComboBoxIndex(CBaseLibrary* pLibrary)
-{
-    return m_pLibraryListComboBox->findData(QVariant::fromValue<CBaseLibrary*>(pLibrary));
-}
-
-CBaseLibrary* CDatabaseFrameWnd::NewLibrary(const QString& libraryName)
-{
-    return (CBaseLibrary*)m_pItemManager->AddLibrary(libraryName, false);
-}
-
-void CDatabaseFrameWnd::DeleteLibrary(CBaseLibrary* pLibrary)
-{
-    m_pItemManager->DeleteLibrary(pLibrary->GetName());
-}
-
-void CDatabaseFrameWnd::DeleteItem(CBaseLibraryItem* pItem)
-{
-    m_pItemManager->DeleteItem(pItem);
-}
-
-void CDatabaseFrameWnd::OnAddLibrary()
-{
-    StringDlg dlg(tr("New Library Name"), this);
-    CUndo undo(tr("Add Database Library").toUtf8());
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        if (!dlg.GetString().isEmpty())
-        {
-            SelectItem(0);
-            // Make new library.
-            QString library = dlg.GetString();
-            NewLibrary(library);
-            ReloadLibs();
-            SelectLibrary(library);
-            GetIEditor()->SetModifiedFlag();
-        }
-    }
-}
-
-void CDatabaseFrameWnd::OnRemoveLibrary()
-{
-    QString library = GetSelectedLibraryName();
-    if (library.isEmpty())
-    {
-        return;
-    }
-    if (m_pLibrary->IsModified())
-    {
-        QString ask = tr("Save changes to the library %1?").arg(library);
-        if (QMessageBox::question(this, tr("Editor"), ask) == QMessageBox::Yes)
-        {
-            OnSave();
-        }
-    }
-    QString ask = tr("When removing library All items contained in this library will be deleted.\r\nAre you sure you want to remove libarary %1?\r\n(Note: Library file will not be deleted from the disk)").arg(library);
-    if (QMessageBox::question(this, tr("Editor"), ask) == QMessageBox::Yes)
-    {
-        SelectItem(0);
-        DeleteLibrary(m_pLibrary);
-        m_pLibrary = 0;
-        ReleasePreviewControl();
-        ReloadLibs();
-        GetIEditor()->SetModifiedFlag();
-    }
-}
-
-void CDatabaseFrameWnd::OnAddItem()
-{
-}
-
-void CDatabaseFrameWnd::OnRemoveItem()
-{
-    // When we have no set of selected items, it may be the case that we are
-    // dealing with old fashioned selection. If such is the case, let's deal
-    // with it using the old code system, which should be deprecated.
-    if (m_cpoSelectedLibraryItems.empty())
-    {
-        if (m_pCurrentItem)
-        {
-            // Remove prototype from prototype manager and library.
-            QString str = tr("Delete %1?").arg(m_pCurrentItem->GetName());
-            if (QMessageBox::question(this, tr("Delete Confirmation"), str) == QMessageBox::Yes)
-            {
-                CUndo undo(tr("Remove library item").toUtf8());
-                TSmartPtr<CBaseLibraryItem> pCurrent = m_pCurrentItem;
-                DeleteItem(pCurrent);
-                m_pLibraryItemTreeModel->Remove(m_pCurrentItem);
-                GetIEditor()->SetModifiedFlag();
-                SelectItem(0);
-            }
-        }
-    }
-    else // This is to be used when deleting multiple items...
-    {
-        QString strMessageString = tr("Delete the following items:\n");
-        int nItemCount(0);
-        std::set<CBaseLibraryItem*>::iterator   itCurrentIterator;
-        std::set<CBaseLibraryItem*>::iterator   itEnd;
-
-        itEnd = m_cpoSelectedLibraryItems.end();
-        itCurrentIterator = m_cpoSelectedLibraryItems.begin();
-        // For now, we have a maximum limit of 7 items per messagebox...
-        for (nItemCount = 0; nItemCount < 7; ++nItemCount, itCurrentIterator++)
-        {
-            if (itCurrentIterator == itEnd)
-            {
-                // As there were less than 7 items selected, we got to put them all
-                // into the formated string for the messagebox.
-                break;
-            }
-            strMessageString += QStringLiteral("%1\n").arg((*itCurrentIterator)->GetName());
-        }
-        if (itCurrentIterator != itEnd)
-        {
-            strMessageString += QStringLiteral("...");
-        }
-
-        if (QMessageBox::question(this, tr("Delete Confirmation"), strMessageString) == QMessageBox::Yes)
-        {
-            for (itCurrentIterator = m_cpoSelectedLibraryItems.begin(); itCurrentIterator != itEnd; itCurrentIterator++)
-            {
-                CBaseLibraryItem* pCurrent = *itCurrentIterator;
-                DeleteItem(pCurrent);
-                m_pLibraryItemTreeModel->Remove(pCurrent);
-            }
-            m_cpoSelectedLibraryItems.clear();
-            GetIEditor()->SetModifiedFlag();
-            SelectItem(0);
-        }
-    }
-}
-
-void CDatabaseFrameWnd::OnRenameItem()
-{
-    if (m_pCurrentItem)
-    {
-        StringGroupDlg dlg;
-        dlg.SetGroup(m_pCurrentItem->GetGroupName());
-        dlg.SetString(m_pCurrentItem->GetShortName());
-        if (dlg.exec() == QDialog::Accepted)
-        {
-            static bool warn = true;
-            if (warn)
-            {
-                warn = false;
-                QMessageBox::warning(this, tr("Warning"), tr("Levels referencing this archetype will need to be exported."));
-            }
-
-            CUndo undo(tr("Rename library item").toUtf8());
-            TSmartPtr<CBaseLibraryItem> curItem = m_pCurrentItem;
-            SetItemName(curItem, dlg.GetGroup(), dlg.GetString());
-            ReloadItems();
-            SelectItem(curItem, true);
-            curItem->SetModified();
-            //m_pCurrentItem->Update();
-        }
-        GetIEditor()->SetModifiedFlag();
-    }
-}
-
-void CDatabaseFrameWnd::OnChangedLibrary()
-{
-    CBaseLibrary* pBaseLibrary = NULL;
-    if (m_pLibraryListComboBox)
-    {
-        pBaseLibrary = m_pLibraryListComboBox->currentData(Qt::UserRole).value<CBaseLibrary*>();
-    }
-
-    if (pBaseLibrary && pBaseLibrary != m_pLibrary)
-    {
-        CUndo undo("Change database library");
-        SelectLibrary(pBaseLibrary);
-    }
-}
-
-void CDatabaseFrameWnd::OnExportLibrary()
-{
-    if (!m_pLibrary)
-    {
-        return;
-    }
-
-    QString filename;
-    if (CFileUtil::SelectSaveFile("Library XML Files (*.xml)", "xml", (Path::GetEditingGameDataFolder() + "/Materials").c_str(), filename))
-    {
-        XmlNodeRef libNode = XmlHelpers::CreateXmlNode("MaterialLibrary");
-        m_pLibrary->Serialize(libNode, false);
-        XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), libNode, filename.toStdString().c_str());
-    }
-}
-
-void CDatabaseFrameWnd::OnSave()
-{
-    if (m_bLibsLoaded)
-    {
-        m_pLibrary->SetModified(true);
-        m_pItemManager->SaveAllLibs();
-        m_pLibrary->SetModified(false);
-    }
-}
-
-void CDatabaseFrameWnd::OnReloadLib()
-{
-    if (!m_pLibrary)
-    {
-        return;
-    }
-
-    QString libname = m_pLibrary->GetName();
-    QString file = m_pLibrary->GetFilename();
-
-    //If the file we want to reload does not exist (and isn't the level library), we can't reload it
-    //Just display a warning to the user and stop the reload process
-    if (!CFileUtil::Exists(file, false) && !m_pLibrary->IsLevelLibrary())
-    {
-        QString str = tr("Layer %1 does not exist on disk yet. Have you ever saved it?\nReloading layer is not possible!").
-            arg(libname);
-        if (QMessageBox::information(this, tr("Editor"), str))
-        {
-            return;
-        }
-    }
-
-    if (m_pLibrary->IsModified())
-    {
-        QString str = tr("Layer %1 was modified.\nReloading layer will discard all modifications to this library!").
-                arg(libname);
-        if (QMessageBox::question(this, tr("Editor"), str) != QMessageBox::Yes)
-        {
-            return;
-        }
-    }
-
-    //Don't try to delete/load level library from disk.
-    //It's managed by the level and there doesn't seem to be a way to "reload" it
-    if (!m_pLibrary->IsLevelLibrary())
-    {
-        m_pItemManager->DeleteLibrary(libname);
-        m_pItemManager->LoadLibrary(file, true);
-    }
-
-    ReloadLibs();
-    SelectLibrary(libname);
-}
-
-void CDatabaseFrameWnd::OnLoadLibrary()
-{
-    assert(m_pItemManager);
-    CUndo undo(tr("Load Database Library").toUtf8());
-    LoadLibrary();
-}
-
-void CDatabaseFrameWnd::LoadLibrary()
-{
-    AssetSelectionModel selection = GetAssetSelectionModel();
-
-    AzToolsFramework::EditorRequests::Bus::Broadcast(
-        &AzToolsFramework::EditorRequests::BrowseForAssets, 
-        selection);
-    if (selection.IsValid())
-    {
-        GetIEditor()->SuspendUndo();
-        IDataBaseLibrary* matLib = m_pItemManager->LoadLibrary(Path::FullPathToGamePath(
-            selection.GetResult()->GetFullPath().c_str()).c_str());
-        GetIEditor()->ResumeUndo();
-        ReloadLibs();
-        if (matLib)
-        {
-            SelectLibrary((CBaseLibrary*)matLib);
-        }
-    }
-}
-
-bool CDatabaseFrameWnd::SetItemName(CBaseLibraryItem* item, const QString& groupName, const QString& itemName)
-{
-    assert(item);
-    // Make prototype name.
-    QString name;
-    if (!groupName.isEmpty())
-    {
-        name = groupName + ".";
-    }
-    name += itemName;
-    QString fullName = name;
-    if (item->GetLibrary())
-    {
-        fullName = item->GetLibrary()->GetName() + "." + name;
-    }
-    IDataBaseItem* pOtherItem = m_pItemManager->FindItemByName(fullName);
-    if (pOtherItem && pOtherItem != item)
-    {
-        // Ensure uniqness of name.
-        Warning("Duplicate Item Name %s", name.toUtf8().data());
-        return false;
-    }
-    else
-    {
-        item->SetName(name);
-    }
-    return true;
-}
-
-void CDatabaseFrameWnd::OnSelChangedItemTree(const QModelIndex& index)
-{
-    CBaseLibraryItem* item = index.data(Qt::UserRole).value<CBaseLibraryItem*>();
-
-    if (item)
-    {
-        if (item->GetLibrary() != m_pLibrary && item->GetLibrary())
-        {
-            SelectLibrary((CBaseLibrary*)item->GetLibrary());
-        }
-    }
-
-    m_pCurrentItem = item;
-
-    if (item)
-    {
-        m_selectedGroup = item->GetGroupName();
-    }
-    else
-    {
-        m_selectedGroup = "";
-    }
-
-    m_pItemManager->SetSelectedItem(item);
-}
-
-bool CDatabaseFrameWnd::eventFilter(QObject* watched, QEvent* event)
-{
-    if (event->type() != QEvent::KeyPress || watched != GetTreeCtrl())
-    {
-        return QMainWindow::eventFilter(watched, event);
-    }
-
-    QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-
-    bool bCtrl = keyEvent->modifiers() == Qt::ControlModifier;
-
-    if (keyEvent->matches(QKeySequence::Copy))
-    {
-        OnCopy(); // Ctrl+C
-    }
-    else if (keyEvent->matches(QKeySequence::Paste))
-    {
-        OnPaste(); // Ctrl+V
-    }
-    else if (keyEvent->matches(QKeySequence::Cut))
-    {
-        OnCut(); // Ctrl+X
-    }
-    else if (bCtrl && keyEvent->key() == Qt::Key_D)
-    {
-        OnClone(); // Ctrl+D
-    }
-    else if (keyEvent->matches(QKeySequence::Delete))
-    {
-        OnRemoveItem();
-    }
-    else if (keyEvent->key() == Qt::Key_F2)
-    {
-        OnRenameItem();
-    }
-    else if (keyEvent->key() == Qt::Key_Insert)
-    {
-        OnAddItem();
-    }
-    else
-    {
-        return QMainWindow::eventFilter(watched, event);
-    }
-
-    return true;
-}
-
-void CDatabaseFrameWnd::OnUndo()
-{
-    GetIEditor()->Undo();
-}
-
-void CDatabaseFrameWnd::OnRedo()
-{
-    GetIEditor()->Redo();
-}
-
-void CDatabaseFrameWnd::OnCut()
-{
-    if (m_pCurrentItem)
-    {
-        OnCopy();
-        OnRemoveItem();
-    }
-}
-
-void CDatabaseFrameWnd::OnClone()
-{
-    OnCopy();
-    OnPaste();
-}
-
-void CDatabaseFrameWnd::DoesItemExist(const QString& itemName, bool& bOutExist) const
-{
-    for (int i = 0, iItemCount(m_pLibrary->GetItemCount()); i < iItemCount; ++i)
-    {
-        IDataBaseItem* pItem = m_pLibrary->GetItem(i);
-        if (pItem == NULL)
-        {
-            continue;
-        }
-        if (pItem->GetName() == itemName)
-        {
-            bOutExist = true;
-            return;
-        }
-    }
-    bOutExist = false;
-}
-
-QString CDatabaseFrameWnd::MakeValidName(const QString& candidateName, AZStd::function<void(const QString&, bool&)> FuncForCheck) const
-{
-    bool bCheck = false;
-    FuncForCheck(candidateName, bCheck);
-    if (!bCheck)
-    {
-        return candidateName;
-    }
-
-    int nCounter = 0;
-    const int nEnoughBigNumber = 1000000;
-    do
-    {
-        QString counterBuffer;
-        counterBuffer = QString::number(nCounter);
-        QString newName = candidateName + counterBuffer;
-        FuncForCheck(newName, bCheck);
-        if (!bCheck)
-        {
-            return newName;
-        }
-    } while (nCounter++ < nEnoughBigNumber);
-
-    assert(0 && "CDatabaseFrameWnd::MakeValidName()");
-    return candidateName;
-}
-
-void CDatabaseFrameWnd::DoesGroupExist(const QString& groupName, bool& bOutExist) const
-{
-    bOutExist = m_pLibraryItemTreeModel->DoesGroupExist(groupName);
-}
-
-QString CDatabaseFrameWnd::GetSelectedLibraryName() const
-{
-    return m_pLibrary ? m_pLibrary->GetName() : "";
-}
-
-void CDatabaseFrameWnd::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnBeginNewScene:
-        m_bLibsLoaded = false;
-        // Clear all prototypes and libraries.
-        SelectItem(0);
-        if (m_pLibraryListComboBox)
-        {
-            m_pLibraryListComboBox->clear();
-        }
-        m_pLibrary = nullptr;
-        break;
-
-    case eNotify_OnEndSceneOpen:
-        m_bLibsLoaded = false;
-        ReloadLibs();
-        break;
-
-    case eNotify_OnCloseScene:
-    {
-        m_bLibsLoaded = false;
-        CUndo undo(tr("Close Database Library").toUtf8());       
-        GetTreeCtrl()->selectionModel()->clear();
-        GetTreeCtrl()->clearSelection();
-        m_pLibraryItemTreeModel->Clear();
-        m_pCurrentItem = nullptr;
-        m_cpoSelectedLibraryItems.clear();
-    }
-    break;
-
-    case eNotify_OnDataBaseUpdate:
-        if (m_pLibrary && m_pLibrary->IsModified())
-        {
-            ReloadItems();
-        }
-        break;
-    }
-}
-
-void CDatabaseFrameWnd::SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo)
-{
-    ui->actionUndo->setEnabled(numUndo > 0);
-    ui->actionRedo->setEnabled(numRedo > 0);
-}
-
-void CDatabaseFrameWnd::showEvent(QShowEvent* event)
-{
-    if (!m_initialized)
-    {
-        OnInitDialog();
-        m_initialized = true;
-    }
-
-    QMainWindow::showEvent(event);
-}
-
-LibraryListModel::LibraryListModel(CBaseLibraryManager* itemManager, QObject* pParent)
-    : QAbstractListModel(pParent)
-    , m_pItemManager(itemManager)
-{
-}
-
-int LibraryListModel::rowCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : m_pItemManager->GetLibraryCount();
-}
-
-QVariant LibraryListModel::data(const QModelIndex& index, int role) const
-{
-    const int row = index.row();
-
-    if (row < 0 || row >= m_pItemManager->GetLibraryCount())
-    {
-        return {};
-    }
-
-    auto library = static_cast<CBaseLibrary*>(m_pItemManager->GetLibrary(row));
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    {
-        QString name = library->GetName();
-        if (library->IsModified())
-        {
-            name += "*";
-        }
-        return name;
-    }
-
-    case Qt::UserRole:
-        return QVariant::fromValue<CBaseLibrary*>(library);
-    }
-
-    return {};
-}
-
-void LibraryListModel::Reload()
-{
-    beginResetModel();
-
-    const int count = m_pItemManager->GetLibraryCount();
-
-    for (int i = 0; i < count; i++)
-    {
-        CBaseLibrary* pLibrary = static_cast<CBaseLibrary*>(m_pItemManager->GetLibrary(i));
-        connect(pLibrary, &CBaseLibrary::Modified, this, &LibraryListModel::LibraryModified);
-    }
-
-    endResetModel();
-}
-
-void LibraryListModel::clear()
-{
-    beginResetModel();
-    endResetModel();
-}
-
-void LibraryListModel::LibraryModified(bool)
-{
-    CBaseLibrary* library = qobject_cast<CBaseLibrary*>(sender());
-
-    const int count = m_pItemManager->GetLibraryCount();
-
-    for (int i = 0; i < count; i++)
-    {
-        CBaseLibrary* pLibrary = static_cast<CBaseLibrary*>(m_pItemManager->GetLibrary(i));
-        if (pLibrary == library)
-        {
-            emit dataChanged(index(i, 0), index(i, 0));
-        }
-    }
-}
-
-LibraryItemTreeModel::LibraryItemTreeModel(CDatabaseFrameWnd* pParent)
-    : QAbstractItemModel(pParent)
-    , m_dialog(pParent)
-{
-}
-
-Qt::ItemFlags LibraryItemTreeModel::flags(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return Qt::ItemFlags();
-    }
-
-    Qt::ItemFlags flags = QAbstractItemModel::flags(index);
-
-    flags |= Qt::ItemIsEditable;
-
-    if (!index.internalPointer())
-    {
-        flags |= Qt::ItemIsDropEnabled;
-    }
-    else
-    {
-        flags |= Qt::ItemIsDragEnabled;
-    }
-
-    return flags;
-}
-
-int LibraryItemTreeModel::columnCount(const QModelIndex&) const
-{
-    return 1;
-}
-
-int LibraryItemTreeModel::rowCount(const QModelIndex& parent) const
-{
-    if (!parent.isValid())
-    {
-        return m_groups.size();
-    }
-    else
-    {
-        if (!parent.internalPointer() && parent.row() >= 0 && parent.row() < m_groups.size())
-        {
-            auto entry = std::begin(m_groups);
-            std::advance(entry, parent.row());
-            return entry->second->second.size();
-        }
-    }
-
-    return 0;
-}
-
-QModelIndex LibraryItemTreeModel::parent(const QModelIndex& index) const
-{
-    if (index.isValid() && index.internalPointer())
-    {
-        auto group = static_cast<Group*>(index.internalPointer());
-        auto entry = m_groups.find(group->first);
-        return createIndex(std::distance(std::begin(m_groups), entry), 0, nullptr);
-    }
-
-    return {};
-}
-
-QModelIndex LibraryItemTreeModel::index(int row, int column, const QModelIndex& parent) const
-{
-    if (column > 0)
-    {
-        return {};
-    }
-
-    if (!parent.isValid())
-    {
-        if (row >= 0 && row < m_groups.size())
-        {
-            return createIndex(row, 0, nullptr);
-        }
-    }
-    else
-    {
-        if (!parent.internalPointer() && parent.row() >= 0 && parent.row() < m_groups.size())
-        {
-            auto entry = std::begin(m_groups);
-            std::advance(entry, parent.row());
-
-            if (row >= 0 && row < entry->second->second.size())
-            {
-                return createIndex(row, 0, const_cast<Group*>(entry->second.get()));
-            }
-        }
-    }
-
-    return {};
-}
-
-QVariant LibraryItemTreeModel::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid())
-    {
-        return {};
-    }
-
-    if (!index.internalPointer())
-    {
-        switch (role)
-        {
-        case Qt::DisplayRole:
-        {
-            auto entry = std::begin(m_groups);
-            std::advance(entry, index.row());
-            return entry->first;
-        }
-        case Qt::UserRole:
-            return QVariant::fromValue<CBaseLibraryItem*>(nullptr);
-        }
-    }
-    else
-    {
-        auto group = static_cast<Group*>(index.internalPointer());
-        auto item = group->second[index.row()];
-
-        switch (role)
-        {
-        case Qt::DisplayRole:
-            return item->GetShortName();
-        case Qt::UserRole:
-            return QVariant::fromValue<CBaseLibraryItem*>(item);
-        }
-    }
-
-    return {};
-}
-
-void LibraryItemTreeModel::RenameItem(CBaseLibraryItem* item, const QString& fullName)
-{
-    QString prevFullName = item->GetFullName();
-    item->SetName(fullName);
-    item->SetModified();
-    emit itemRenamed(item, prevFullName);
-}
-
-bool LibraryItemTreeModel::setData(const QModelIndex& index, const QVariant& value, int role)
-{
-    if (!index.isValid() || role != Qt::EditRole)
-    {
-        return false;
-    }
-
-    QString text = value.toString();
-
-    if (text.isEmpty())
-    {
-        return false;
-    }
-
-    if (text.contains(QLatin1Char('.')))
-    {
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), tr("Warning"), tr("The name must not contain \".\""));
-        return false;
-    }
-
-    if (!index.internalPointer())
-    {
-        // rename group
-
-        auto sourceEntry = std::begin(m_groups);
-        std::advance(sourceEntry, index.row());
-
-        if (text == sourceEntry->first)
-        {
-            return false;
-        }
-
-        if (m_groups.find(text) != std::end(m_groups))
-        {
-            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), tr("Warning"), tr("The identical name exists."));
-            return false;
-        }
-
-        int sourceRow = index.row();
-        int targetRow = std::distance(std::begin(m_groups), m_groups.lower_bound(text));
-
-        if (targetRow < sourceRow || targetRow > sourceRow + 1)
-        {
-            beginMoveRows({}, sourceRow, sourceRow, {}, targetRow);
-        }
-
-        auto targetEntry = m_groups.insert({ text, sourceEntry->second }).first;
-        targetEntry->second->first = text;
-        m_groups.erase(sourceEntry);
-
-        if (targetRow < sourceRow || targetRow > sourceRow + 1)
-        {
-            endMoveRows();
-        }
-        else
-        {
-            emit dataChanged(index, index);
-        }
-
-        CUndo undo(tr("Rename FlareGroupItem").toUtf8());
-
-        auto group = targetEntry->second.get();
-
-        for (int row = 0; row < group->second.size(); row++)
-        {
-            auto item = group->second[row];
-            QString name = QString("%1.%2").arg(text).arg(item->GetShortName());
-            RenameItem(item, name);
-        }
-    }
-    else
-    {
-        // rename single item
-
-        auto group = static_cast<Group*>(index.internalPointer());
-        auto& items = group->second;
-
-        auto item = items[index.row()];
-
-        if (text == item->GetShortName())
-        {
-            return false;
-        }
-
-        QString name = QString("%1.%2").arg(item->GetGroupName(), text);
-
-        if (std::find_if(std::begin(items), std::end(items),
-                [&](const CBaseLibraryItem* item)
-                {
-                    return item->GetName() == name;
-                }) != std::end(items))
-        {
-            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), tr("Warning"), tr("The identical name exists."));
-            return false;
-        }
-
-        CUndo undo(tr("Rename FlareGroupItem").toUtf8());
-        RenameItem(item, name);
-
-        emit dataChanged(index, index);
-    }
-
-    return true;
-}
-
-QModelIndex LibraryItemTreeModel::index(CBaseLibraryItem* item) const
-{
-    if (!item)
-    {
-        return {};
-    }
-
-    auto entry = m_groups.find(item->GetGroupName());
-    if (entry == std::end(m_groups))
-    {
-        return {};
-    }
-
-    auto& items = entry->second->second;
-
-    auto it = std::find(std::begin(items), std::end(items), item);
-    if (it == std::end(items))
-    {
-        return {};
-    }
-
-    return createIndex(std::distance(std::begin(items), it), 0, const_cast<Group*>(entry->second.get()));
-}
-
-bool LibraryItemTreeModel::removeRows(int row, int count, const QModelIndex& parent)
-{
-    if (!parent.isValid())
-    {
-        beginRemoveRows({}, row, row + count - 1);
-
-        auto first = std::begin(m_groups);
-        std::advance(first, row);
-
-        auto last = std::begin(m_groups);
-        std::advance(last, row + count);
-
-        m_groups.erase(first, last);
-
-        endRemoveRows();
-    }
-    else
-    {
-        beginRemoveRows(parent, row, row + count - 1);
-
-        auto entry = std::begin(m_groups);
-        std::advance(entry, parent.row());
-
-        auto& items = entry->second->second;
-        items.erase(std::begin(items) + row, std::begin(items) + row + count);
-
-        endRemoveRows();
-
-        if (items.empty())
-        {
-            beginRemoveRows({}, parent.row(), parent.row());
-            m_groups.erase(entry);
-            endRemoveRows();
-        }
-    }
-
-    return true;
-}
-
-static bool LibraryItemLess(const CBaseLibraryItem* left, const CBaseLibraryItem* right)
-{
-    QString leftName = left->GetName();
-    QString rightName = right->GetName();
-    return leftName.compare(rightName) < 0;
-}
-
-void LibraryItemTreeModel::Clear()
-{
-    beginResetModel();
-
-    m_groups.clear();
-
-    endResetModel();
-}
-
-void LibraryItemTreeModel::Reload(CBaseLibrary* pLibrary)
-{
-    beginResetModel();
-
-    m_groups.clear();
-
-    for (int i = 0; i < pLibrary->GetItemCount(); i++)
-    {
-        auto item = static_cast<CBaseLibraryItem*>(pLibrary->GetItem(i));
-
-        QString itemName = item->GetName();
-        QString groupName = item->GetGroupName();
-
-        auto entry = m_groups.find(groupName);
-
-        if (entry == std::end(m_groups))
-        {
-            entry = m_groups.insert({ groupName, std::make_shared<Group>(groupName, std::vector<CBaseLibraryItem*>()) }).first;
-        }
-
-        auto& items = entry->second->second;
-        items.insert(std::upper_bound(std::begin(items), std::end(items), item, LibraryItemLess), item);
-    }
-
-    endResetModel();
-}
-
-QString LibraryItemTreeModel::GetFullName(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return QString();
-    }
-
-    if (!index.internalPointer())
-    {
-        auto entry = std::begin(m_groups);
-        std::advance(entry, index.row());
-        return entry->first;
-    }
-    else
-    {
-        auto group = static_cast<Group*>(index.internalPointer());
-        auto item = group->second[index.row()];
-        return item->GetName();
-    }
-}
-
-void LibraryItemTreeModel::Add(CBaseLibraryItem* item)
-{
-    QString groupName = item->GetGroupName();
-
-    auto entry = m_groups.find(groupName);
-    if (entry == std::end(m_groups))
-    {
-        int row = std::distance(std::begin(m_groups), m_groups.lower_bound(groupName));
-
-        emit beginInsertRows({}, row, row);
-        entry = m_groups.insert({ groupName, std::make_shared<Group>(groupName, std::vector<CBaseLibraryItem*>()) }).first;
-        emit endInsertRows();
-    }
-
-    QModelIndex parentIndex = createIndex(std::distance(std::begin(m_groups), entry), 0, nullptr);
-    auto& items = entry->second->second;
-
-    if (std::find(std::begin(items), std::end(items), item) == std::end(items))
-    {
-        auto it = std::upper_bound(std::begin(items), std::end(items), item, LibraryItemLess);
-        int row = std::distance(std::begin(items), it);
-
-        emit beginInsertRows(parentIndex, row, row);
-        items.insert(it, item);
-        emit endInsertRows();
-    }
-}
-
-std::vector<CBaseLibraryItem*> LibraryItemTreeModel::ChildItems(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return {};
-    }
-
-    if (!index.internalPointer())
-    {
-        auto entry = std::begin(m_groups);
-        std::advance(entry, index.row());
-        return entry->second->second;
-    }
-    else
-    {
-        auto group = static_cast<Group*>(index.internalPointer());
-        return {
-                   group->second[index.row()]
-        };
-    }
-}
-
-bool LibraryItemTreeModel::Remove(CBaseLibraryItem* pItem)
-{
-    QModelIndex itemIndex = index(pItem);
-    if (!itemIndex.isValid())
-    {
-        return false;
-    }
-    return removeRow(itemIndex.row(), itemIndex.parent());
-}
-
-void LibraryItemTreeModel::Rename(CBaseLibraryItem* item, const QString& groupName, const QString& shortName)
-{
-    if (groupName != item->GetGroupName())
-    {
-        auto entry = m_groups.find(groupName);
-
-        if (entry == std::end(m_groups))
-        {
-            int row = std::distance(std::begin(m_groups), m_groups.lower_bound(groupName));
-
-            emit beginInsertRows({}, row, row);
-            entry = m_groups.insert({ groupName, std::make_shared<Group>(groupName, std::vector<CBaseLibraryItem*>()) }).first;
-            emit endInsertRows();
-        }
-
-        MoveItem(item, createIndex(std::distance(std::begin(m_groups), entry), 0, nullptr));
-    }
-
-    QString name = QString("%1.%2").arg(groupName).arg(shortName);
-    RenameItem(item, name);
-
-    QModelIndex itemIndex = index(item);
-    emit dataChanged(itemIndex, itemIndex);
-}
-
-QModelIndex LibraryItemTreeModel::FindLibraryItemByFullName(const QString& fullName) const
-{
-    for (auto& entry : m_groups)
-    {
-        auto& group = *entry.second;
-        auto& items = group.second;
-
-        auto it = std::find_if(std::begin(items), std::end(items),
-                [&](CBaseLibraryItem* item)
-                {
-                    return item->GetName() == fullName;
-                });
-
-        if (it != std::end(items))
-        {
-            return createIndex(std::distance(std::begin(items), it), 0, &group);
-        }
-    }
-
-    return {};
-}
-
-bool LibraryItemTreeModel::DoesGroupExist([[maybe_unused]] const QString& groupName) const
-{
-#if 0
-    auto it = std::find_if(
-            std::begin(m_root->m_children),
-            std::end(m_root->m_children),
-            [&](const TreeNode* node)
-            {
-                return node->m_text.compare(groupName, Qt::CaseInsensitive) == 0;
-            });
-
-    return it != std::end(m_root->m_children);
-#else
-    return false;
-#endif
-}
-
-QStringList LibraryItemTreeModel::mimeTypes() const
-{
-    QStringList mimeTypes;
-    mimeTypes << QStringLiteral("application/x-o3de-libraryitems");
-    return mimeTypes;
-}
-
-QString LibraryItemTreeModel::MakeValidName(const Group& group, const QString& baseName) const
-{
-    auto& items = group.second;
-
-    QString name = baseName;
-
-    int counter = 0;
-
-    while (std::find_if(std::begin(items), std::end(items),
-               [&](CBaseLibraryItem* item)
-               {
-                   return item->GetShortName() == name;
-               }) != std::end(items))
-    {
-        name = QString("%1%2").arg(baseName).arg(counter);
-        ++counter;
-    }
-
-    return name;
-}
-
-bool LibraryItemTreeModel::MoveItem(CBaseLibraryItem* item, const QModelIndex& targetParent)
-{
-    if (!targetParent.isValid() || targetParent.internalPointer())
-    {
-        return false;
-    }
-
-    auto sourceEntry = m_groups.find(item->GetGroupName());
-
-    auto targetEntry = std::begin(m_groups);
-    std::advance(targetEntry, targetParent.row());
-
-    if (sourceEntry == targetEntry)
-    {
-        return false;
-    }
-
-    auto& sourceItems = sourceEntry->second->second;
-    auto sourceIt = std::find(std::begin(sourceItems), std::end(sourceItems), item);
-    int sourceRow = std::distance(std::begin(sourceItems), sourceIt);
-
-    auto& targetItems = targetEntry->second->second;
-    auto targetIt = std::upper_bound(
-            std::begin(targetItems),
-            std::end(targetItems),
-            item,
-            [](CBaseLibraryItem* left, CBaseLibraryItem* right)
-            {
-                QString leftShortName = left->GetShortName();
-                QString rightShortName = right->GetShortName();
-                return leftShortName.compare(rightShortName) < 0;
-            });
-    int targetRow = std::distance(std::begin(targetItems), targetIt);
-
-    QModelIndex sourceParent = createIndex(std::distance(std::begin(m_groups), sourceEntry), 0, nullptr);
-
-    beginMoveRows(sourceParent, sourceRow, sourceRow, targetParent, targetRow);
-    targetItems.insert(targetIt, item);
-    sourceItems.erase(sourceIt);
-    endMoveRows();
-
-    if (sourceItems.empty())
-    {
-        removeRow(sourceParent.row(), {});
-    }
-
-    return true;
-}
-
-bool LibraryItemTreeModel::dropMimeData(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, const QModelIndex& index)
-{
-    if (data->hasFormat("application/x-o3de-libraryitems"))
-    {
-        QByteArray array = data->data("application/x-o3de-libraryitems");
-
-        QModelIndex targetParent = index;
-
-        if (!targetParent.isValid())
-        {
-            return false;
-        }
-
-        if (targetParent.internalPointer())
-        {
-            targetParent = parent(targetParent);
-        }
-
-        int count = array.size() / sizeof(CBaseLibraryItem*);
-        auto items = reinterpret_cast<CBaseLibraryItem**>(array.data());
-
-        auto entry = std::begin(m_groups);
-        std::advance(entry, targetParent.row());
-
-        CUndo undo(tr("Copy/Cut & Paste for Lens Flare").toUtf8());
-
-        for (int i = 0; i < count; i++)
-        {
-            auto item = items[i];
-
-            QString shortName = MakeValidName(*entry->second, item->GetShortName());
-
-            if (MoveItem(item, targetParent))
-            {
-                RenameItem(item, QString("%1.%2").arg(entry->first).arg(shortName));
-            }
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-QMimeData* LibraryItemTreeModel::mimeData(const QModelIndexList& indexes) const
-{
-    QByteArray array;
-
-    for (auto& index : indexes)
-    {
-        auto item = static_cast<CBaseLibraryItem*>(index.data(Qt::UserRole).value<CBaseLibraryItem*>());
-
-        if (item)
-        {
-            array.append(reinterpret_cast<const char*>(&item), sizeof(CBaseLibraryItem*));
-        }
-    }
-
-    if (array.isEmpty())
-    {
-        return nullptr;
-    }
-
-    QMimeData* data = new QMimeData;
-    data->setData(QStringLiteral("application/x-o3de-libraryitems"), array);
-    return data;
-}
-
-Qt::DropActions LibraryItemTreeModel::supportedDragActions() const
-{
-    return Qt::MoveAction;
-}
-
-Qt::DropActions LibraryItemTreeModel::supportedDropActions() const
-{
-    return Qt::MoveAction;
-}
-
-#include <moc_DatabaseFrameWnd.cpp>
diff --git a/Code/Sandbox/Editor/DatabaseFrameWnd.h b/Code/Sandbox/Editor/DatabaseFrameWnd.h
deleted file mode 100644
index 71ef50191c..0000000000
--- a/Code/Sandbox/Editor/DatabaseFrameWnd.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2011.
-// -------------------------------------------------------------------------
-//  File name:   DatabaseFrameWnd.h
-//  Created:     10/Dec/2012 by Jaesik.
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_DATABASEFRAMEWND_H
-#define CRYINCLUDE_EDITOR_DATABASEFRAMEWND_H
-
-#if !defined(Q_MOC_RUN)
-#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
-#include <AzQtComponents/Components/DockMainWindow.h>
-#include "Undo/IUndoManagerListener.h"
-#include "BaseLibrary.h"
-
-#include <QMainWindow>
-#include <QAbstractItemModel>
-#include <QAbstractListModel>
-#include <QScopedPointer>
-#endif
-
-class QComboBox;
-class QTreeView;
-class QMimeData;
-
-class CBaseLibraryItem;
-class CBaseLibraryManager;
-
-class LibraryListModel;
-class LibraryItemTreeModel;
-
-namespace Ui {
-    class DatabaseFrameWnd;
-}
-
-class CDatabaseFrameWnd
-    : public AzQtComponents::DockMainWindow
-    , public IEditorNotifyListener
-    , public IUndoManagerListener
-{
-    Q_OBJECT
-public:
-    CDatabaseFrameWnd(CBaseLibraryManager* pItemManager, QWidget* pParent = nullptr);
-    virtual ~CDatabaseFrameWnd();
-
-    enum SortRecursionType
-    {
-        SORT_RECURSION_NONE = 1,
-        SORT_RECURSION_ITEM = 2,
-        SORT_RECURSION_FULL = 9999
-    };
-
-    virtual void ReloadLibs();
-    virtual void ReloadItems();
-    virtual void SelectLibrary(const QString& library, bool bForceSelect = false);
-    virtual void SelectLibrary(CBaseLibrary* pItem, bool bForceSelect = false);
-    virtual void SelectItem(CBaseLibraryItem* item, bool bForceReload = false);
-
-    virtual CBaseLibrary* FindLibrary(const QString& libraryName);
-    virtual CBaseLibrary* NewLibrary(const QString& libraryName);
-    virtual void DeleteLibrary(CBaseLibrary* pLibrary);
-    virtual void DeleteItem(CBaseLibraryItem* pItem);
-
-    virtual void ReleasePreviewControl(){}
-
-    virtual bool SetItemName(CBaseLibraryItem* item, const QString& groupName, const QString& itemName);
-
-    void DoesItemExist(const QString& itemName, bool& bOutExist) const;
-    void DoesGroupExist(const QString& groupName, bool& bOutExist) const;
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-
-    void SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo) override;
-
-    QString GetSelectedLibraryName() const;
-
-    virtual const char* GetClassName() = 0;
-
-protected:
-    int GetComboBoxIndex(CBaseLibrary* pLibrary);
-
-    virtual void OnInitDialog() = 0;
-
-    void showEvent(QShowEvent* event) override;
-
-    void OnUndo();
-    void OnRedo();
-
-    virtual void OnAddLibrary();
-    virtual void OnRemoveLibrary();
-    virtual void OnAddItem();
-    virtual void OnRemoveItem();
-    virtual void OnRenameItem();
-    virtual void OnChangedLibrary();
-    virtual void OnExportLibrary();
-    virtual void OnSave();
-    virtual void OnReloadLib();
-    virtual void OnLoadLibrary();
-
-    void OnSelChangedItemTree(const QModelIndex& index);
-    bool eventFilter(QObject* watched, QEvent* event);
-
-    virtual void OnCopy() = 0;
-    virtual void OnPaste() = 0;
-    virtual void OnCut();
-    virtual void OnClone();
-
-    void InitTreeCtrl();
-
-    virtual AssetSelectionModel GetAssetSelectionModel() const = 0;
-
-    void LoadLibrary();
-
-    QString MakeValidName(const QString& candidateName, AZStd::function<void(const QString&, bool&)> cb) const;
-
-    virtual QTreeView* GetTreeCtrl() = 0;
-    virtual const QTreeView* GetTreeCtrl() const = 0;
-
-private:
-    LibraryListModel* m_pLibraryListModel;
-    QComboBox* m_pLibraryListComboBox;
-
-    bool m_bLibsLoaded;
-
-protected:
-    LibraryItemTreeModel* m_pLibraryItemTreeModel;
-
-    //! Selected library.
-    _smart_ptr<CBaseLibrary> m_pLibrary;
-
-    //! Last selected Item. (kept here for compatibility reasons)
-    // See comments on m_cpoSelectedLibraryItems for more details.
-    _smart_ptr<CBaseLibraryItem> m_pCurrentItem;
-
-    // A set containing all the currently selected items
-    // (it's disabled for MOST, but not ALL cases).
-    // This should be the new standard way of storing selections as
-    // opposed to the former mean, it allows us to store multiple selections.
-    // The migration to this new style should be done according to the needs
-    // for multiple selection.
-    std::set<CBaseLibraryItem*> m_cpoSelectedLibraryItems;
-
-    //! Pointer to item manager.
-    CBaseLibraryManager* m_pItemManager;
-    SortRecursionType m_sortRecursionType;
-    QString m_selectedGroup;
-
-    QScopedPointer<Ui::DatabaseFrameWnd> ui;
-
-    bool m_initialized;
-};
-
-class LibraryListModel
-    : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    LibraryListModel(CBaseLibraryManager* itemManager, QObject* pParent = nullptr);
-
-    int rowCount(const QModelIndex& parent = {}) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-
-    void Reload();
-
-    void clear();
-
-private:
-    void LibraryModified(bool bModified);
-
-    CBaseLibraryManager* m_pItemManager;
-};
-
-class LibraryItemTreeModel
-    : public QAbstractItemModel
-{
-    Q_OBJECT
-
-    using Group = std::pair<QString, std::vector<CBaseLibraryItem*> >;
-
-public:
-    LibraryItemTreeModel(CDatabaseFrameWnd* pParent);
-
-    QModelIndex parent(const QModelIndex& index) const override;
-    QModelIndex index(int row, int column, const QModelIndex& parent = {}) const override;
-    QModelIndex index(CBaseLibraryItem* pItem) const;
-
-    int rowCount(const QModelIndex& parent) const override;
-    int columnCount(const QModelIndex& parent) const override;
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
-
-    bool removeRows(int row, int count, const QModelIndex& parent = {}) override;
-
-    QStringList mimeTypes() const override;
-    bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
-    QMimeData* mimeData(const QModelIndexList& indexes) const override;
-
-    Qt::DropActions supportedDragActions() const override;
-    Qt::DropActions supportedDropActions() const override;
-
-    void Clear();
-
-    void Reload(CBaseLibrary* library);
-
-    void Add(CBaseLibraryItem* item);
-    bool Remove(CBaseLibraryItem* item);
-
-    void Rename(CBaseLibraryItem* item, const QString& groupName, const QString& shortName);
-
-    std::vector<CBaseLibraryItem*> ChildItems(const QModelIndex& index) const;
-
-    QString GetFullName(const QModelIndex& index) const;
-
-    QModelIndex FindLibraryItemByFullName(const QString& fullName) const;
-    bool DoesGroupExist(const QString& groupName) const;
-
-signals:
-    void itemRenamed(CBaseLibraryItem* item, const QString& prevFullName);
-
-protected:
-    void RenameItem(CBaseLibraryItem* item, const QString& fullName);
-    QString MakeValidName(const Group& group, const QString& baseName) const;
-    bool MoveItem(CBaseLibraryItem* item, const QModelIndex& parent);
-
-    CDatabaseFrameWnd* m_dialog;
-
-    std::map<QString, std::shared_ptr<Group> > m_groups;
-};
-
-Q_DECLARE_METATYPE(CBaseLibrary*)
-
-#endif // CRYINCLUDE_EDITOR_DATABASEFRAMEWND_H
diff --git a/Code/Sandbox/Editor/DatabaseFrameWnd.qrc b/Code/Sandbox/Editor/DatabaseFrameWnd.qrc
deleted file mode 100644
index 37d97f5c9f..0000000000
--- a/Code/Sandbox/Editor/DatabaseFrameWnd.qrc
+++ /dev/null
@@ -1,35 +0,0 @@
-<RCC>
-    <qresource prefix="/DatabaseFrameWnd">
-        <file alias="db_library_bar_00.png">res/db_library_bar_00.png</file>
-        <file alias="db_library_bar_01.png">res/db_library_bar_01.png</file>
-        <file alias="db_library_bar_02.png">res/db_library_bar_02.png</file>
-        <file alias="db_library_bar_03.png">res/db_library_bar_03.png</file>
-        <file alias="db_library_bar_04.png">res/db_library_bar_04.png</file>
-        <file alias="db_library_bar_05.png">res/db_library_bar_05.png</file>
-        <file alias="db_standart_00.png">res/db_standart_00.png</file>
-        <file alias="db_standart_01.png">res/db_standart_01.png</file>
-        <file alias="db_standart_02.png">res/db_standart_02.png</file>
-        <file alias="db_standart_03.png">res/db_standart_03.png</file>
-        <file alias="db_library_item_bar_00.png">res/db_library_item_bar_00.png</file>
-        <file alias="db_library_item_bar_01.png">res/db_library_item_bar_01.png</file>
-        <file alias="db_library_item_bar_02.png">res/db_library_item_bar_02.png</file>
-        <file alias="db_library_item_bar_03.png">res/db_library_item_bar_03.png</file>
-        <file alias="db_library_item_bar_04.png">res/db_library_item_bar_04.png</file>
-        <file alias="db_library_item_bar_05.png">res/db_library_item_bar_05.png</file>
-        <file alias="db_library_open.svg">res/db_library_open.svg</file>
-        <file alias="db_library_save.svg">res/db_library_save.svg</file>
-        <file alias="db_library_add.svg">res/db_library_add.svg</file>
-        <file alias="db_library_delete.svg">res/db_library_delete.svg</file>
-        <file alias="db_library_refresh.svg">res/db_library_refresh.svg</file>
-        <file alias="db_library_undo.svg">res/db_library_undo.svg</file>
-        <file alias="db_library_redo.svg">res/db_library_redo.svg</file>
-        <file alias="db_library_copy.svg">res/db_library_copy.svg</file>
-        <file alias="db_library_paste.svg">res/db_library_paste.svg</file>
-        <file alias="db_library_additem.svg">res/db_library_additem.svg</file>
-        <file alias="db_library_cloneitem.svg">res/db_library_cloneitem.svg</file>
-        <file alias="db_library_removeitem.svg">res/db_library_removeitem.svg</file>
-        <file alias="db_library_assignitem.svg">res/db_library_assignitem.svg</file>
-        <file alias="db_library_getproperties.svg">res/db_library_getproperties.svg</file>
-        <file alias="db_library_reload.svg">res/db_library_reload.svg</file>
-    </qresource>
-</RCC>
diff --git a/Code/Sandbox/Editor/DatabaseFrameWnd.ui b/Code/Sandbox/Editor/DatabaseFrameWnd.ui
deleted file mode 100644
index 655de74a6e..0000000000
--- a/Code/Sandbox/Editor/DatabaseFrameWnd.ui
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DatabaseFrameWnd</class>
- <widget class="QMainWindow" name="DatabaseFrameWnd">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>633</width>
-    <height>42</height>
-   </rect>
-  </property>
-  <widget class="QToolBar" name="m_toolBar">
-   <property name="windowTitle">
-    <string>Lens Flare Toolbar</string>
-   </property>
-   <property name="iconSize">
-    <size>
-     <width>32</width>
-     <height>32</height>
-    </size>
-   </property>
-   <property name="floatable">
-    <bool>false</bool>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="actionDBLoadLib"/>
-   <addaction name="actionDBSave"/>
-   <addaction name="actionDBAddLib"/>
-   <addaction name="actionDBDelLib"/>
-   <addaction name="actionDBReloadLib"/>
-  </widget>
-  <widget class="QToolBar" name="m_toolBar2">
-   <property name="windowTitle">
-    <string>StandartToolBar</string>
-   </property>
-   <property name="iconSize">
-    <size>
-     <width>32</width>
-     <height>32</height>
-    </size>
-   </property>
-   <property name="floatable">
-    <bool>false</bool>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="actionUndo"/>
-   <addaction name="actionRedo"/>
-   <addaction name="separator"/>
-   <addaction name="actionDBCopy"/>
-   <addaction name="actionDBPaste"/>
-  </widget>
-  <widget class="QToolBar" name="m_toolBar3">
-   <property name="windowTitle">
-    <string>ItemToolBar</string>
-   </property>
-   <property name="iconSize">
-    <size>
-     <width>32</width>
-     <height>32</height>
-    </size>
-   </property>
-   <property name="floatable">
-    <bool>false</bool>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="actionDBAdd"/>
-   <addaction name="actionDBClone"/>
-   <addaction name="actionDBRemove"/>
-   <addaction name="separator"/>
-   <addaction name="actionDBAssignToSelection"/>
-   <addaction name="actionDBGetFromSelection"/>
-   <addaction name="actionDBReload"/>
-  </widget>
-  <action name="actionDBLoadLib">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_open.svg</normaloff>:/DatabaseFrameWnd/db_library_open.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Load Library</string>
-   </property>
-   <property name="toolTip">
-    <string>Load Library</string>
-   </property>
-  </action>
-  <action name="actionDBSave">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_save.svg</normaloff>:/DatabaseFrameWnd/db_library_save.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Save Modified Libraries</string>
-   </property>
-   <property name="toolTip">
-    <string>Save Modified Libraries</string>
-   </property>
-  </action>
-  <action name="actionDBAddLib">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_add.svg</normaloff>:/DatabaseFrameWnd/db_library_add.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Add Library</string>
-   </property>
-   <property name="toolTip">
-    <string>Add Library</string>
-   </property>
-  </action>
-  <action name="actionDBDelLib">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_delete.svg</normaloff>:/DatabaseFrameWnd/db_library_delete.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Remove Library</string>
-   </property>
-   <property name="toolTip">
-    <string>Remove Library</string>
-   </property>
-  </action>
-  <action name="actionDBReloadLib">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_refresh.svg</normaloff>:/DatabaseFrameWnd/db_library_refresh.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Reload Library</string>
-   </property>
-   <property name="toolTip">
-    <string>Reload Library</string>
-   </property>
-  </action>
-  <action name="actionUndo">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_undo.svg</normaloff>:/DatabaseFrameWnd/db_library_undo.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Undo last operation</string>
-   </property>
-   <property name="toolTip">
-    <string>Undo</string>
-   </property>
-  </action>
-  <action name="actionRedo">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_redo.svg</normaloff>:/DatabaseFrameWnd/db_library_redo.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Redo last undo operation</string>
-   </property>
-   <property name="toolTip">
-    <string>Redo</string>
-   </property>
-  </action>
-  <action name="actionDBCopy">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_copy.svg</normaloff>:/DatabaseFrameWnd/db_library_copy.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Copy Item</string>
-   </property>
-   <property name="toolTip">
-    <string>Copy Item</string>
-   </property>
-  </action>
-  <action name="actionDBPaste">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_paste.svg</normaloff>:/DatabaseFrameWnd/db_library_paste.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Paste Item</string>
-   </property>
-   <property name="toolTip">
-    <string>Paste Item</string>
-   </property>
-  </action>
-  <action name="actionDBAdd">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_additem.svg</normaloff>:/DatabaseFrameWnd/db_library_additem.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Add New Item</string>
-   </property>
-   <property name="toolTip">
-    <string>Add New Item</string>
-   </property>
-  </action>
-  <action name="actionDBClone">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_cloneitem.svg</normaloff>:/DatabaseFrameWnd/db_library_cloneitem.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Clone Library Item</string>
-   </property>
-   <property name="toolTip">
-    <string>Clone Library Item</string>
-   </property>
-  </action>
-  <action name="actionDBRemove">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_removeitem.svg</normaloff>:/DatabaseFrameWnd/db_library_removeitem.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Remove Item</string>
-   </property>
-   <property name="toolTip">
-    <string>Remove Item</string>
-   </property>
-  </action>
-  <action name="actionDBAssignToSelection">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_assignitem.svg</normaloff>:/DatabaseFrameWnd/db_library_assignitem.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Assign Item to Selected Objects</string>
-   </property>
-   <property name="toolTip">
-    <string>Assign Item to Selected Objects</string>
-   </property>
-  </action>
-  <action name="actionDBGetFromSelection">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_getproperties.svg</normaloff>:/DatabaseFrameWnd/db_library_getproperties.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Get Properties From Selection</string>
-   </property>
-   <property name="toolTip">
-    <string>Get Properties From Selection</string>
-   </property>
-  </action>
-  <action name="actionDBReload">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/DatabaseFrameWnd/db_library_reload.svg</normaloff>:/DatabaseFrameWnd/db_library_reload.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Reload Item</string>
-   </property>
-   <property name="toolTip">
-    <string>Reload Item</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.cpp b/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.cpp
deleted file mode 100644
index 5a3a1e3036..0000000000
--- a/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "DuplicatedObjectsHandlerDlg.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <Dialogs/ui_DuplicatedObjectsHandlerDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-CDuplicatedObjectsHandlerDlg::CDuplicatedObjectsHandlerDlg(const QString& msg, QWidget* pParent)
-    : QDialog(pParent)
-    , m_ui(new Ui::DuplicatedObjectsHandlerDlg)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    m_ui->textBrowser->setPlainText(msg);
-
-    connect(m_ui->buttonOverride, &QPushButton::clicked, this, &CDuplicatedObjectsHandlerDlg::OnBnClickedOverrideBtn);
-    connect(m_ui->buttonCreateCopies, &QPushButton::clicked, this, &CDuplicatedObjectsHandlerDlg::OnBnClickedCreateCopiesBtn);
-}
-
-CDuplicatedObjectsHandlerDlg::~CDuplicatedObjectsHandlerDlg()
-{
-}
-
-void CDuplicatedObjectsHandlerDlg::OnBnClickedOverrideBtn()
-{
-    m_result = eResult_Override;
-    accept();
-}
-
-void CDuplicatedObjectsHandlerDlg::OnBnClickedCreateCopiesBtn()
-{
-    m_result = eResult_CreateCopies;
-    accept();
-}
-
-#include <Dialogs/moc_DuplicatedObjectsHandlerDlg.cpp>
diff --git a/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.h b/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.h
deleted file mode 100644
index 1610fd216f..0000000000
--- a/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H
-#define CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class DuplicatedObjectsHandlerDlg;
-}
-
-class CDuplicatedObjectsHandlerDlg
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CDuplicatedObjectsHandlerDlg(const QString& msg, QWidget* pParent = nullptr);
-    virtual ~CDuplicatedObjectsHandlerDlg();
-
-    enum EResult
-    {
-        eResult_None,
-        eResult_Override,
-        eResult_CreateCopies
-    };
-
-    EResult GetResult() const
-    {
-        return m_result;
-    }
-
-protected:
-
-    EResult m_result;
-
-    void OnBnClickedOverrideBtn();
-    void OnBnClickedCreateCopiesBtn();
-
-    QScopedPointer<Ui::DuplicatedObjectsHandlerDlg> m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H
diff --git a/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.ui b/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.ui
deleted file mode 100644
index 44578d6862..0000000000
--- a/Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.ui
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DuplicatedObjectsHandlerDlg</class>
- <widget class="QDialog" name="DuplicatedObjectsHandlerDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>474</width>
-    <height>204</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Duplicated Objects Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTextBrowser" name="textBrowser">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButton">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonOverride">
-       <property name="text">
-        <string>Override</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonCreateCopies">
-       <property name="text">
-        <string>Create Copies</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>DuplicatedObjectsHandlerDlg</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>258</x>
-     <y>183</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>190</x>
-     <y>184</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp b/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp
index c642671aba..7b1398b58f 100644
--- a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp
+++ b/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp
@@ -71,24 +71,8 @@ CPythonScriptsDialog::CPythonScriptsDialog(QWidget* parent)
     AzQtComponents::LineEdit::applySearchStyle(ui->searchField);
 
     QStringList scriptFolders;
-
-    const auto editorEnvStr = gSettings.strEditorEnv.toLocal8Bit();
-    AZStd::string editorScriptsPath = AZStd::string::format("@engroot@/%s", editorEnvStr.constData());
-    XmlNodeRef envNode = XmlHelpers::LoadXmlFromFile(editorScriptsPath.c_str());
-    if (envNode)
-    {
-        QString scriptPath;
-        int childrenCount = envNode->getChildCount();
-        for (int idx = 0; idx < childrenCount; ++idx)
-        {
-            XmlNodeRef child = envNode->getChild(idx);
-            if (child->haveAttr("scriptPath"))
-            {
-                scriptPath = child->getAttr("scriptPath");
-                scriptFolders.push_back(scriptPath);
-            }
-        }
-    }
+    auto engineScriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "Scripts";
+    scriptFolders.push_back(engineScriptPath.c_str());
 
     AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
     ScanFolderForScripts(QString("%1/Editor/Scripts").arg(projectPath.c_str()), scriptFolders);
diff --git a/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.cpp b/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.cpp
deleted file mode 100644
index 9384cd5051..0000000000
--- a/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "EditorDefs.h"
-
-#include "NewEntityDialog.h"
-
-// Qt
-#include <QPushButton>
-#include <QToolTip>
-#include <QMessageBox>
-
-// Editor
-#include "Dialogs/QT/ui_NewEntityDialog.h"
-
-
-NewEntityDialog::NewEntityDialog(QWidget* parent)
-    : QDialog(parent)
-    , ui(new Ui::NewEntityDialog)
-{
-    entityNameValidator = new EntityNameValidator(this);
-
-    ui->setupUi(this);
-
-    ui->entityName->setFocus();
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-    connect(ui->entityName, SIGNAL(textChanged(QString)), this, SLOT(ValidateInput()));
-    connect(ui->categoryName, SIGNAL(textChanged(QString)), this, SLOT(ValidateInput()));
-
-    SetCategoryCompleterPath((Path::GetEditingGameDataFolder() + "/Scripts/Entities").c_str());
-    SetNameValidatorPath((Path::GetEditingGameDataFolder() + "/Entities").c_str());
-}
-
-NewEntityDialog::~NewEntityDialog()
-{
-    SAFE_DELETE(entityNameValidator);
-    SAFE_DELETE(folderNameCompleter);
-    delete ui;
-}
-
-void NewEntityDialog::SetCategoryCompleterPath(CryStringT<char> path)
-{
-    SAFE_DELETE(folderNameCompleter);
-
-    QDirIterator directoryIt(QString::fromLocal8Bit(path.c_str(), path.length()), QDir::NoDotAndDotDot | QDir::AllDirs, QDirIterator::Subdirectories);
-    baseDir = directoryIt.path() + "/";
-
-    QStringList dirs;
-    while (directoryIt.hasNext())
-    {
-        QString dir = directoryIt.next().remove(baseDir);
-        dirs.append(dir);
-    }
-
-    folderNameCompleter = new QCompleter(dirs);
-    folderNameCompleter->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
-    folderNameCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-    ui->categoryName->setCompleter(folderNameCompleter);
-}
-
-void NewEntityDialog::SetNameValidatorPath(CryStringT<char> path)
-{
-    QDir dir(QString::fromLocal8Bit(path.c_str(), path.length()));
-    nameBaseDir = dir.path() + "/";
-}
-
-void NewEntityDialog::ValidateInput()
-{
-    int cursorPos = ui->entityName->cursorPosition();
-    QString text = ui->entityName->text();
-    bool validText = entityNameValidator->validate(text, cursorPos);
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(validText);
-}
-
-void NewEntityDialog::accept()
-{
-    if (ui->categoryName->text().isEmpty()
-        && QMessageBox::question(this, "Are you sure?", "Create entity without category?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
-    {
-        return;
-    }
-    const char* devRoot = gEnv->pFileIO->GetAlias("@engroot@");
-    QString devRootPath(devRoot);
-    QFile entTemplateFile(devRootPath + "/Editor/NewEntityTemplate.ent_template");
-    QFile luaTemplateFile(devRootPath + "/Editor/NewEntityTemplate.lua_template");
-    QFile entDestFile(nameBaseDir + ui->entityName->text() + ".ent");
-    QFile luaDestFile(baseDir + ui->categoryName->text() + "/" + ui->entityName->text() + ".lua");
-
-    if (!entTemplateFile.exists() || !luaTemplateFile.exists())
-    {
-        QMessageBox::critical(this, tr("Missing Template Files"), tr("In order to create default entities the NewEntityTemplate.lua and NewEntityTemplate.ent template files must exist in the Templates folder!"));
-        return;
-    }
-
-    //generate the .ent file
-    QDir pathMaker(nameBaseDir);
-    pathMaker.mkpath(pathMaker.path());
-    QString entFileString;
-    if (!entTemplateFile.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open template file for ent : %s", entTemplateFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        entFileString = entTemplateFile.readAll();
-        entTemplateFile.close();
-    }
-
-    entFileString.replace(QString("[CATEGORY_NAME]"), ui->categoryName->text());
-    entFileString.replace(QString("[ENTITY_NAME]"), ui->entityName->text());
-    if (!entDestFile.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open destination file for ent : %s", entDestFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        entDestFile.write(entFileString.toUtf8());
-        entDestFile.close();
-    }
-
-    //generate the .lua file
-    pathMaker.setPath(baseDir);
-    pathMaker.mkpath(ui->categoryName->text() + "/");
-
-    QString luaFileString;
-    if (!luaTemplateFile.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open template file for lua : %s", luaTemplateFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        luaFileString = luaTemplateFile.readAll();
-        luaTemplateFile.close();
-    }
-
-    luaFileString.replace(QString("[ENTITY_NAME]"), ui->entityName->text());
-    if (!luaDestFile.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open destination file for lua : %s", luaDestFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        luaDestFile.write(luaFileString.toUtf8());
-        luaDestFile.close();
-    }
-
-
-    if (ui->openLuaCB->isChecked())
-    {
-        CFileUtil::EditTextFile(luaDestFile.fileName().toLocal8Bit().data());
-    }
-
-    QDialog::accept();
-}
-
-QValidator::State NewEntityDialog::EntityNameValidator::validate(QString& input, [[maybe_unused]] int& pos) const
-{
-    if (!m_Parent)
-    {
-        return Invalid;
-    }
-
-    if (input.isEmpty())
-    {
-        return Invalid;
-    }
-
-    if (input.contains("/"))
-    {
-        return Invalid;
-    }
-
-    QString fileBaseName = m_Parent->ui->entityName->text();
-
-    // Characters
-    const char* notAllowedChars = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' ";
-    for (const char* c = notAllowedChars; *c; c++)
-    {
-        if (fileBaseName.contains(QLatin1Char(*c)))
-        {
-            const QChar qc = QLatin1Char(*c);
-            if (qc.isSpace())
-            {
-                QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Name may not contain white space."), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-            }
-            else
-            {
-                QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Invalid character \"%1\".").arg(qc), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-            }
-            return Invalid;
-        }
-    }
-
-    QString filename(m_Parent->nameBaseDir + m_Parent->ui->entityName->text() + ".ent");
-    QFile newFile(filename);
-
-    if (newFile.exists())
-    {
-        QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Filename already exists!"), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-        return Invalid;
-    }
-
-    return Acceptable;
-}
-
-#include <Dialogs/QT/moc_NewEntityDialog.cpp>
diff --git a/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.h b/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.h
deleted file mode 100644
index 9ed2bdb2bb..0000000000
--- a/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef NEWENTITYDIALOG_H
-#define NEWENTITYDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QCompleter>
-#include <QDirIterator>
-#include <QStringListModel>
-#include <QValidator>
-#include <QEvent>
-#include <QLineEdit>
-#endif
-
-namespace Ui {
-    class NewEntityDialog;
-}
-
-class NewEntityDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit NewEntityDialog(QWidget* parent = 0);
-    ~NewEntityDialog();
-
-private:
-    Ui::NewEntityDialog* ui;
-    QString baseDir = "";
-    QString nameBaseDir = "";
-    QCompleter* folderNameCompleter = NULL;
-
-    void SetCategoryCompleterPath(CryStringT<char> path);
-    void SetNameValidatorPath(CryStringT<char> path);
-
-    virtual void accept();
-
-    class EntityNameValidator
-        : public QValidator
-    {
-    public:
-        explicit EntityNameValidator(NewEntityDialog* parent = 0)
-            : QValidator(parent)
-            , m_Parent(parent)
-        {
-        }
-        virtual State validate(QString& input, int& pos) const;
-
-        NewEntityDialog* m_Parent;
-    };
-
-    EntityNameValidator* entityNameValidator;
-
-public slots:
-    void ValidateInput();
-};
-
-#endif // NEWENTITYDIALOG_H
diff --git a/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.ui b/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.ui
deleted file mode 100644
index 530bf9ac99..0000000000
--- a/Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.ui
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NewEntityDialog</class>
- <widget class="QDialog" name="NewEntityDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>111</height>
-   </rect>
-  </property>
-  <property name="contextMenuPolicy">
-   <enum>Qt::PreventContextMenu</enum>
-  </property>
-  <property name="windowTitle">
-   <string>New Entity</string>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>false</bool>
-  </property>
-  <property name="modal">
-   <bool>false</bool>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>70</y>
-     <width>341</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="entityName">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>10</y>
-     <width>281</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>71</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Entity Name:</string>
-   </property>
-   <property name="buddy">
-    <cstring>entityName</cstring>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>40</y>
-     <width>91</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Entity Category:</string>
-   </property>
-   <property name="buddy">
-    <cstring>categoryName</cstring>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="categoryName">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>40</y>
-     <width>281</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="openLuaCB">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>80</y>
-     <width>141</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Open Lua After Creating</string>
-   </property>
-  </widget>
- </widget>
- <tabstops>
-  <tabstop>entityName</tabstop>
-  <tabstop>categoryName</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>NewEntityDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>NewEntityDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/Code/Sandbox/Editor/DisplaySettings.cpp b/Code/Sandbox/Editor/DisplaySettings.cpp
index bd4372ae70..75e5c54ae9 100644
--- a/Code/Sandbox/Editor/DisplaySettings.cpp
+++ b/Code/Sandbox/Editor/DisplaySettings.cpp
@@ -22,7 +22,6 @@
 
 // Editor
 #include "Settings.h"
-#include "Material/MaterialManager.h"
 
 
 
@@ -112,30 +111,6 @@ void CDisplaySettings::SetDebugFlags(int flags)
     //SetCVarInt( "sys_enable_budgetmonitoring",(m_debugFlags&DBG_BUDGET_MONITORING) ? 4:0 );
 
     //SetCVarInt( "Profile",(m_debugFlags&DBG_FRAMEPROFILE) ? 1:0 );
-
-    if (CMaterialManager* pMaterialManager = GetIEditor()->GetMaterialManager())
-    {
-        int mask = pMaterialManager->GetHighlightMask();
-        if (m_debugFlags & DBG_HIGHLIGHT_BREAKABLE)
-        {
-            mask |= eHighlight_Breakable;
-        }
-        else
-        {
-            mask &= ~eHighlight_Breakable;
-        }
-
-        if (m_debugFlags & DBG_HIGHLIGHT_MISSING_SURFACE_TYPE)
-        {
-            mask |= eHighlight_NoSurfaceType;
-        }
-        else
-        {
-            mask &= ~eHighlight_NoSurfaceType;
-        }
-
-        pMaterialManager->SetHighlightMask(mask);
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/EditorPanelUtils.cpp b/Code/Sandbox/Editor/EditorPanelUtils.cpp
index 06c7056a47..72d67ffc09 100644
--- a/Code/Sandbox/Editor/EditorPanelUtils.cpp
+++ b/Code/Sandbox/Editor/EditorPanelUtils.cpp
@@ -16,6 +16,8 @@
 
 #include "EditorPanelUtils.h"
 
+#include <AzCore/Utils/Utils.h>
+
 // Qt
 #include <QInputDialog>
 #include <QFileDialog>
@@ -147,7 +149,8 @@ public:
 
     virtual void HotKey_Export() override
     {
-        QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", "Editor/Plugins/ParticleEditorPlugin/settings", "HotKey Config Files (*.hkxml)");
+        auto settingDir = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Editor" / "Plugins" / "ParticleEditorPlugin" / "settings";
+        QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", settingDir.c_str(), "HotKey Config Files (*.hkxml)");
         QFile file(filepath);
         if (!file.open(QIODevice::WriteOnly))
         {
diff --git a/Code/Sandbox/Editor/EditorToolsApplication.cpp b/Code/Sandbox/Editor/EditorToolsApplication.cpp
index 97caaf612a..2e3d70795a 100644
--- a/Code/Sandbox/Editor/EditorToolsApplication.cpp
+++ b/Code/Sandbox/Editor/EditorToolsApplication.cpp
@@ -21,14 +21,12 @@
 #include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerComponent.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserComponent.h>
-#include <AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.h>
 
 // Editor
 #include "MainWindow.h"
 #include "CryEdit.h"
 #include "DisplaySettingsPythonFuncs.h"
 #include "GameEngine.h"
-#include "Material/MaterialPythonFuncs.h"
 #include "PythonEditorFuncs.h"
 #include "TrackView/TrackViewPythonFuncs.h"
 #include "Include/IObjectManager.h"
@@ -65,7 +63,6 @@ namespace EditorInternal
         RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsPythonFuncsHandler::CreateDescriptor());
         RegisterComponentDescriptor(AzToolsFramework::MainWindowEditorFuncsHandler::CreateDescriptor());
         RegisterComponentDescriptor(AzToolsFramework::ObjectManagerFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::MaterialPythonFuncsHandler::CreateDescriptor());
         RegisterComponentDescriptor(AzToolsFramework::PythonEditorComponent::CreateDescriptor());
         RegisterComponentDescriptor(AzToolsFramework::PythonEditorFuncsHandler::CreateDescriptor());
         RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsComponent::CreateDescriptor());
@@ -81,7 +78,6 @@ namespace EditorInternal
 
         components.emplace_back(azrtti_typeid<AzToolsFramework::Thumbnailer::ThumbnailerComponent>());
         components.emplace_back(azrtti_typeid<AzToolsFramework::AssetBrowser::AssetBrowserComponent>());
-        components.emplace_back(azrtti_typeid<AzToolsFramework::MaterialBrowser::MaterialBrowserComponent>());
 
         // Add new Bus-based Python Bindings
         components.emplace_back(azrtti_typeid<AzToolsFramework::DisplaySettingsComponent>());
diff --git a/Code/Sandbox/Editor/EditorViewportWidget.cpp b/Code/Sandbox/Editor/EditorViewportWidget.cpp
index 9ce567c91e..9165809c7f 100644
--- a/Code/Sandbox/Editor/EditorViewportWidget.cpp
+++ b/Code/Sandbox/Editor/EditorViewportWidget.cpp
@@ -230,9 +230,6 @@ EditorViewportWidget::~EditorViewportWidget()
 //////////////////////////////////////////////////////////////////////////
 int EditorViewportWidget::OnCreate()
 {
-    m_renderer = GetIEditor()->GetRenderer();
-    m_engine = GetIEditor()->Get3DEngine();
-
     CreateRenderContext();
 
     return 0;
@@ -426,7 +423,7 @@ void EditorViewportWidget::Update()
         return;
     }
 
-    if (!m_engine || m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
+    if (m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
     {
         return;
     }
@@ -796,10 +793,6 @@ void EditorViewportWidget::OnRender()
         {
             GetIEditor()->GetRenderer()->SetCamera(gEnv->pSystem->GetViewCamera());
         }
-        if (m_engine)
-        {
-            m_engine->RenderWorld(0, SRenderingPassInfo::CreateGeneralPassRenderingInfo(m_Camera), __FUNCTION__);
-        }
         return;
     }
 
@@ -1509,10 +1502,10 @@ bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
     }
 
     action = customCameraMenu->addAction(tr("Look through entity"));
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-    action->setCheckable(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
-    action->setEnabled(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
+    bool areAnyEntitiesSelected = false;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
+    action->setCheckable(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
+    action->setEnabled(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
     action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
     connect(action, &QAction::triggered, this, [this](bool isChecked)
         {
@@ -1814,11 +1807,6 @@ void EditorViewportWidget::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
 //////////////////////////////////////////////////////////////////////////
 void EditorViewportWidget::RenderSelectedRegion()
 {
-    if (!m_engine)
-    {
-        return;
-    }
-
     AABB box;
     GetIEditor()->GetSelectedRegion(box);
     if (box.IsEmpty())
@@ -2826,14 +2814,16 @@ void EditorViewportWidget::RestoreViewportAfterGameMode()
 
 void EditorViewportWidget::UpdateScene()
 {
-    AZStd::vector<AzFramework::Scene*> scenes;
-    AzFramework::SceneSystemRequestBus::BroadcastResult(scenes, &AzFramework::SceneSystemRequests::GetAllScenes);
-    if (scenes.size() > 0)
+    auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+    if (sceneSystem)
     {
-        AZ::RPI::SceneNotificationBus::Handler::BusDisconnect();
-        auto scene = scenes[0];
-        m_renderViewport->SetScene(scene);
-        AZ::RPI::SceneNotificationBus::Handler::BusConnect(m_renderViewport->GetViewportContext()->GetRenderScene()->GetId());
+        AZStd::shared_ptr<AzFramework::Scene> mainScene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
+        if (mainScene)
+        {
+            AZ::RPI::SceneNotificationBus::Handler::BusDisconnect();
+            m_renderViewport->SetScene(mainScene);
+            AZ::RPI::SceneNotificationBus::Handler::BusConnect(m_renderViewport->GetViewportContext()->GetRenderScene()->GetId());
+        }
     }
 }
 
diff --git a/Code/Sandbox/Editor/EditorViewportWidget.h b/Code/Sandbox/Editor/EditorViewportWidget.h
index 1244e61242..472f7e3c62 100644
--- a/Code/Sandbox/Editor/EditorViewportWidget.h
+++ b/Code/Sandbox/Editor/EditorViewportWidget.h
@@ -28,7 +28,7 @@
 #include <AzCore/Component/EntityId.h>
 #include <AzCore/std/optional.h>
 #include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <AzFramework/Asset/AssetCatalogBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/API/EditorCameraBus.h>
@@ -234,11 +234,8 @@ public:
     QPoint ViewportToWidget(const QPoint& point) const;
     QSize WidgetToViewport(const QSize& size) const;
 
-    /// Take raw input and create a final mouse interaction.
-    /// @attention Do not map **point** from widget to viewport explicitly,
-    /// this is handled internally by BuildMouseInteraction - just pass directly.
     AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
 
     void SetPlayerPos()
     {
@@ -398,9 +395,6 @@ protected:
     };
     void ResetToViewSourceType(const ViewSourceType& viewSourType);
 
-    //! Assigned renderer.
-    IRenderer*  m_renderer = nullptr;
-    I3DEngine*  m_engine = nullptr;
     bool m_bRenderContextCreated = false;
     bool m_bInRotateMode = false;
     bool m_bInMoveMode = false;
diff --git a/Code/Sandbox/Editor/EnvironmentPanel.cpp b/Code/Sandbox/Editor/EnvironmentPanel.cpp
index 02b568f6d2..f71babbff6 100644
--- a/Code/Sandbox/Editor/EnvironmentPanel.cpp
+++ b/Code/Sandbox/Editor/EnvironmentPanel.cpp
@@ -19,10 +19,6 @@
 #include "GameEngine.h"
 #include "CryEditDoc.h"
 
-// Cry3DEngine
-#include <Cry3DEngine/Environment/OceanEnvironmentBus.h>
-
-
 AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 #include <ui_EnvironmentPanel.h>
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
@@ -36,15 +32,6 @@ CEnvironmentPanel::CEnvironmentPanel(QWidget* pParent /*=nullptr*/)
 {
     XmlNodeRef node = GetIEditor()->GetDocument()->GetEnvironmentTemplate();
 
-    // is the feature toggle enabled?
-    bool bHasOceanFeature = false;
-    AZ::OceanFeatureToggleBus::BroadcastResult(bHasOceanFeature, &AZ::OceanFeatureToggleBus::Events::OceanComponentEnabled);
-    if (bHasOceanFeature)
-    {
-        node->findChild("Ocean")->setAttr("hidden", true);
-        node->findChild("OceanAnimation")->setAttr("hidden", true);
-    }
-
     m_onSetCallback = AZStd::bind(&CCryEditDoc::OnEnvironmentPropertyChanged, GetIEditor()->GetDocument(), AZStd::placeholders::_1);
 
     ui->setupUi(this);
diff --git a/Code/Sandbox/Editor/ErrorReport.h b/Code/Sandbox/Editor/ErrorReport.h
index f78410be62..b13f8ae120 100644
--- a/Code/Sandbox/Editor/ErrorReport.h
+++ b/Code/Sandbox/Editor/ErrorReport.h
@@ -19,7 +19,6 @@
 #pragma once
 
 // forward declarations.
-class CMaterial;
 class CParticleItem;
 
 #include "BaseLibraryItem.h"
diff --git a/Code/Sandbox/Editor/ErrorReportDialog.cpp b/Code/Sandbox/Editor/ErrorReportDialog.cpp
index 8c29da91ce..83839f3e08 100644
--- a/Code/Sandbox/Editor/ErrorReportDialog.cpp
+++ b/Code/Sandbox/Editor/ErrorReportDialog.cpp
@@ -519,11 +519,6 @@ void CErrorReportDialog::OnReportItemDblClick(const QModelIndex& index)
         }
         bDone = true;
     }
-    if (pError && pError->pItem != NULL)
-    {
-        GetIEditor()->OpenMaterialLibrary(pError->pItem);
-        bDone = true;
-    }
 
     if (!bDone && pError && GetIEditor()->GetActiveView())
     {
@@ -581,11 +576,6 @@ void CErrorReportDialog::OnReportHyperlink(const QModelIndex& index)
         GetIEditor()->SelectObject(pError->pObject);
         bDone = true;
     }
-    if (pError && pError->pItem != NULL)
-    {
-        GetIEditor()->OpenMaterialLibrary(pError->pItem);
-        bDone = true;
-    }
 
     if (!bDone && pError && GetIEditor()->GetActiveView())
     {
diff --git a/Code/Sandbox/Editor/Export/ExportManager.cpp b/Code/Sandbox/Editor/Export/ExportManager.cpp
index b41872595a..638977b191 100644
--- a/Code/Sandbox/Editor/Export/ExportManager.cpp
+++ b/Code/Sandbox/Editor/Export/ExportManager.cpp
@@ -23,7 +23,6 @@
 
 // Editor
 #include "Geometry/EdGeometry.h"
-#include "Material/Material.h"
 #include "ViewManager.h"
 #include "OBJExporter.h"
 #include "OCMExporter.h"
@@ -79,47 +78,6 @@ Export::CMesh::CMesh()
 }
 
 
-void Export::CMesh::SetMaterial(CMaterial* pMtl, CBaseObject* pBaseObj)
-{
-    if (!pMtl)
-    {
-        cry_strcpy(material.name, pBaseObj->GetName().toUtf8().data());
-        return;
-    }
-
-    cry_strcpy(material.name, pMtl->GetFullName().toUtf8().data());
-
-    _smart_ptr<IMaterial> matInfo = pMtl->GetMatInfo();
-    IRenderShaderResources* pRes = matInfo->GetShaderItem().m_pShaderResources;
-    if (!pRes)
-    {
-        return;
-    }
-
-    ColorF difColor = pRes->GetColorValue(EFTT_DIFFUSE);
-    material.diffuse.r = difColor.r;
-    material.diffuse.g = difColor.g;
-    material.diffuse.b = difColor.b;
-    material.diffuse.a = difColor.a;
-
-    ColorF specColor = pRes->GetColorValue(EFTT_SPECULAR);
-    material.specular.r = specColor.r;
-    material.specular.g = specColor.g;
-    material.specular.b = specColor.b;
-    material.specular.a = specColor.a;
-
-    material.opacity = pRes->GetStrengthValue(EFTT_OPACITY);
-    material.smoothness = pRes->GetStrengthValue(EFTT_SMOOTHNESS);
-
-    SetTexture(material.mapDiffuse, pRes, EFTT_DIFFUSE);
-    SetTexture(material.mapSpecular, pRes, EFTT_SPECULAR);
-    SetTexture(material.mapOpacity, pRes, EFTT_OPACITY);
-    SetTexture(material.mapNormals, pRes, EFTT_NORMALS);
-    SetTexture(material.mapDecal, pRes, EFTT_DECAL_OVERLAY);
-    SetTexture(material.mapDisplacement, pRes, EFTT_HEIGHT);
-}
-
-
 //////////////////////////////////////////////////////////
 // CObject
 Export::CObject::CObject(const char* pName)
@@ -416,18 +374,6 @@ void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh
         pObj->m_texCoords.push_back(tc);
     }
 
-    CMaterial* pMtl = 0;
-
-    if (m_pBaseObj)
-    {
-        pMtl = m_pBaseObj->GetRenderMaterial();
-    }
-
-    if (pMtl)
-    {
-        pObj->SetMaterialName(pMtl->GetFullName().toUtf8().data());
-    }
-
     if (pIndMesh->GetSubSetCount() && !(pIndMesh->GetSubSetCount() == 1 && pIndMesh->GetSubSet(0).nNumIndices == 0))
     {
         for (int i = 0; i < pIndMesh->GetSubSetCount(); ++i)
@@ -447,23 +393,6 @@ void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh
                 pMesh->m_faces.push_back(face);
             }
 
-            if (pMtl)
-            {
-                if (pMtl->IsMultiSubMaterial())
-                {
-                    CMaterial* pSubMtl = 0;
-                    if (sms.nMatID < pMtl->GetSubMaterialCount())
-                    {
-                        pSubMtl = pMtl->GetSubMaterial(sms.nMatID);
-                    }
-                    pMesh->SetMaterial(pSubMtl, m_pBaseObj);
-                }
-                else
-                {
-                    pMesh->SetMaterial(pMtl, m_pBaseObj);
-                }
-            }
-
             pObj->m_meshes.push_back(pMesh);
         }
     }
@@ -497,10 +426,6 @@ void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh
             }
         }
 
-        if (m_pBaseObj && pMtl)
-        {
-            pMesh->SetMaterial(pMtl, m_pBaseObj);
-        }
         pObj->m_meshes.push_back(pMesh);
     }
 }
diff --git a/Code/Sandbox/Editor/Export/ExportManager.h b/Code/Sandbox/Editor/Export/ExportManager.h
index 8904ef08ed..a27e54b085 100644
--- a/Code/Sandbox/Editor/Export/ExportManager.h
+++ b/Code/Sandbox/Editor/Export/ExportManager.h
@@ -43,8 +43,6 @@ namespace Export
         virtual int GetFaceCount() const { return m_faces.size(); }
         virtual const Face* GetFaceBuffer() const { return m_faces.size() ? &m_faces[0] : 0; }
 
-        void SetMaterial(CMaterial* pMtl, CBaseObject* pBaseObj);
-
     private:
         std::vector<Face> m_faces;
 
diff --git a/Code/Sandbox/Editor/GameExporter.cpp b/Code/Sandbox/Editor/GameExporter.cpp
index 9039fca70d..64e1fc6514 100644
--- a/Code/Sandbox/Editor/GameExporter.cpp
+++ b/Code/Sandbox/Editor/GameExporter.cpp
@@ -27,17 +27,11 @@
 #include "Mission.h"
 #include "ShaderCache.h"
 #include "UsedResources.h"
-#include "Material/MaterialManager.h"
-#include "Material/MaterialLibrary.h"
 #include "WaitProgress.h"
 #include "Util/CryMemFile.h"
 #include "Objects/ObjectManager.h"
 
-#include "Objects/ObjectPhysicsManager.h"
 #include "Objects/EntityObject.h"
-#include "LensFlareEditor/LensFlareManager.h"
-#include "LensFlareEditor/LensFlareLibrary.h"
-#include "LensFlareEditor/LensFlareItem.h"
 
 #include <AzFramework/Terrain/TerrainDataRequestBus.h>
 
@@ -192,14 +186,6 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
             }
         }
 
-        ////////////////////////////////////////////////////////////////////////
-        // Inform all objects that an export is about to begin
-        ////////////////////////////////////////////////////////////////////////
-        if (exportSuccessful)
-        {
-            GetIEditor()->GetObjectManager()->GetPhysicsManager()->PrepareForExport();
-        }
-
         ////////////////////////////////////////////////////////////////////////
         // Export all data to the game
         ////////////////////////////////////////////////////////////////////////
@@ -219,7 +205,6 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
 
             ExportLevelInfo(sLevelPath);
 
-            ExportLevelLensFlares(sLevelPath);
             ExportLevelResourceList(sLevelPath);
             ExportLevelUsedResourceList(sLevelPath);
             ExportLevelShaderCache(sLevelPath);
@@ -349,11 +334,6 @@ void CGameExporter::ExportLevelData(const QString& path, bool bExportMission)
 
     ExportMapInfo(root);
 
-    //////////////////////////////////////////////////////////////////////////
-    // Export materials.
-    ExportMaterials(root, path);
-    //////////////////////////////////////////////////////////////////////////
-
     CCryEditDoc* pDocument = pEditor->GetDocument();
     CMission* pCurrentMission = 0;
 
@@ -519,111 +499,6 @@ void CGameExporter::ExportMapInfo(XmlNodeRef& node)
     CXmlArchive xmlAr;
     xmlAr.bLoading = false;
     xmlAr.root = node;
-
-    GetIEditor()->GetObjectManager()->GetPhysicsManager()->SerializeCollisionClasses(xmlAr);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportMaterials(XmlNodeRef& levelDataNode, const QString& path)
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Export materials manager.
-    CMaterialManager* pManager = GetIEditor()->GetMaterialManager();
-    pManager->Export(levelDataNode);
-
-    QString filename = Path::Make(path, MATERIAL_LEVEL_LIBRARY_FILE);
-
-    bool bHaveItems = true;
-
-    int numMtls = 0;
-
-    XmlNodeRef nodeMaterials = XmlHelpers::CreateXmlNode("MaterialsLibrary");
-    // Export Materials local level library.
-    for (int i = 0; i < pManager->GetLibraryCount(); i++)
-    {
-        XmlNodeRef nodeLib = nodeMaterials->newChild("Library");
-        CMaterialLibrary* pLib = (CMaterialLibrary*)pManager->GetLibrary(i);
-        if (pLib->GetItemCount() > 0)
-        {
-            bHaveItems = false;
-            // Export this library.
-            numMtls += pManager->ExportLib(pLib, nodeLib);
-        }
-    }
-    if (!bHaveItems)
-    {
-        XmlString xmlData = nodeMaterials->getXML();
-
-        CCryMemFile file;
-        file.Write(xmlData.c_str(), xmlData.length());
-        m_levelPak.m_pakFile.UpdateFile(filename.toUtf8().data(), file);
-    }
-    else
-    {
-        m_levelPak.m_pakFile.RemoveFile(filename.toUtf8().data());
-    }
-    m_numExportedMaterials = numMtls;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportLevelLensFlares(const QString& path)
-{
-    GetIEditor()->SetStatusText(QObject::tr("Exporting Lens Flares..."));
-    std::vector<CBaseObject*> objects;
-    GetIEditor()->GetObjectManager()->FindObjectsOfType(&CEntityObject::staticMetaObject, objects);
-    std::set<QString> flareNameSet;
-    for (int i = 0, iObjectSize(objects.size()); i < iObjectSize; ++i)
-    {
-        CEntityObject* pEntity = (CEntityObject*)objects[i];
-        if (!pEntity->IsLight())
-        {
-            continue;
-        }
-        QString flareName = pEntity->GetEntityPropertyString(CEntityObject::s_LensFlarePropertyName);
-        if (flareName.isEmpty() || flareName == "@root")
-        {
-            continue;
-        }
-        flareNameSet.insert(flareName);
-    }
-
-    XmlNodeRef pRootNode = GetIEditor()->GetSystem()->CreateXmlNode("LensFlareList");
-    pRootNode->setAttr("Version", FLARE_EXPORT_FILE_VERSION);
-
-    CLensFlareManager* pLensManager = GetIEditor()->GetLensFlareManager();
-
-    if (CLensFlareLibrary* pLevelLib = (CLensFlareLibrary*)pLensManager->GetLevelLibrary())
-    {
-        for (int i = 0; i < pLevelLib->GetItemCount(); i++)
-        {
-            CLensFlareItem* pItem = (CLensFlareItem*)pLevelLib->GetItem(i);
-
-            if (flareNameSet.find(pItem->GetFullName()) == flareNameSet.end())
-            {
-                continue;
-            }
-
-            CBaseLibraryItem::SerializeContext ctx(pItem->CreateXmlData(), false);
-            pRootNode->addChild(ctx.node);
-            pItem->Serialize(ctx);
-            flareNameSet.erase(pItem->GetFullName());
-        }
-    }
-
-    std::set<QString>::iterator iFlareNameSet = flareNameSet.begin();
-    for (; iFlareNameSet != flareNameSet.end(); ++iFlareNameSet)
-    {
-        QString flareName = *iFlareNameSet;
-        XmlNodeRef pFlareNode = GetIEditor()->GetSystem()->CreateXmlNode("LensFlare");
-        pFlareNode->setAttr("name", flareName.toUtf8().data());
-        pRootNode->addChild(pFlareNode);
-    }
-
-    CCryMemFile lensFlareNames;
-    lensFlareNames.Write(pRootNode->getXMLData()->GetString(), pRootNode->getXMLData()->GetStringLength());
-
-    QString exportPathName = path + FLARE_EXPORT_FILE;
-    m_levelPak.m_pakFile.UpdateFile(exportPathName.toUtf8().data(), lensFlareNames);
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/GameExporter.h b/Code/Sandbox/Editor/GameExporter.h
index 87e24ef844..a428046f0a 100644
--- a/Code/Sandbox/Editor/GameExporter.h
+++ b/Code/Sandbox/Editor/GameExporter.h
@@ -95,11 +95,9 @@ private:
     void ExportOcclusionMesh(const char* pszGamePath);
     void ExportMapInfo(XmlNodeRef& node);
 
-    void ExportLevelLensFlares(const QString& path);
     void ExportLevelResourceList(const QString& path);
     void ExportLevelUsedResourceList(const QString& path);
     void ExportLevelShaderCache(const QString& path);
-    void ExportMaterials(XmlNodeRef& levelDataNode, const QString& path);
     void ExportGameData(const QString& path);
     void ExportFileList(const QString& path, const QString& levelName);
 
diff --git a/Code/Sandbox/Editor/GameResourcesExporter.cpp b/Code/Sandbox/Editor/GameResourcesExporter.cpp
index 564396d090..8a6c547dca 100644
--- a/Code/Sandbox/Editor/GameResourcesExporter.cpp
+++ b/Code/Sandbox/Editor/GameResourcesExporter.cpp
@@ -21,7 +21,6 @@
 // Editor
 #include "UsedResources.h"
 #include "GameEngine.h"
-#include "Material/MaterialManager.h"
 #include "Include/IObjectManager.h"
 #include "WaitProgress.h"
 
@@ -51,7 +50,7 @@ void CGameResourcesExporter::ChooseDirectory()
 void CGameResourcesExporter::GatherAllLoadedResources()
 {
     m_files.clear();
-    m_files.reserve(100000);        // count from GetResourceList, GetFilesFromObjects, GetFilesFromMaterials ...  is unknown
+    m_files.reserve(100000);        // count from GetResourceList, GetFilesFromObjects ...  is unknown
 
     auto pResList = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level);
     {
@@ -62,7 +61,6 @@ void CGameResourcesExporter::GatherAllLoadedResources()
     }
 
     GetFilesFromObjects();
-    GetFilesFromMaterials();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -158,12 +156,3 @@ void CGameResourcesExporter::GetFilesFromObjects()
 
     Append(m_files, rs.files);
 }
-
-//////////////////////////////////////////////////////////////////////////
-void CGameResourcesExporter::GetFilesFromMaterials()
-{
-    CUsedResources rs;
-    GetIEditor()->GetMaterialManager()->GatherUsedResources(rs);
-    Append(m_files, rs.files);
-}
-
diff --git a/Code/Sandbox/Editor/GameResourcesExporter.h b/Code/Sandbox/Editor/GameResourcesExporter.h
index b408cbb42f..8236458cb3 100644
--- a/Code/Sandbox/Editor/GameResourcesExporter.h
+++ b/Code/Sandbox/Editor/GameResourcesExporter.h
@@ -44,7 +44,6 @@ private:
     void GetFilesFromObjects();
     void GetFilesFromVarBlock(CVarBlock* pVB);
     void GetFilesFromVariable(IVariable* pVar);
-    void GetFilesFromMaterials();
 };
 
 #endif // CRYINCLUDE_EDITOR_GAMERESOURCESEXPORTER_H
diff --git a/Code/Sandbox/Editor/IEditor.h b/Code/Sandbox/Editor/IEditor.h
index 90fb8823e7..c03b99e128 100644
--- a/Code/Sandbox/Editor/IEditor.h
+++ b/Code/Sandbox/Editor/IEditor.h
@@ -46,11 +46,8 @@ class CGameEngine;
 struct IIconManager;
 class CToolBoxManager;
 class CClassFactory;
-class CMaterialManager;
 class CMusicManager;
-class CMaterail;
 struct IEditorParticleManager;
-class CLensFlareManager;
 class CEAXPresetManager;
 class CErrorReport;
 class CBaseLibraryItem;
@@ -545,8 +542,6 @@ struct IEditor
     virtual CSettingsManager* GetSettingsManager() = 0;
     //! Get DB manager that own items of specified type.
     virtual IDataBaseManager* GetDBItemManager(EDataBaseItemType itemType) = 0;
-    //! Get Manager of Materials.
-    virtual CMaterialManager* GetMaterialManager() = 0;
     virtual IBaseLibraryManager* GetMaterialManagerLibrary() = 0; // Vladimir@conffx
     virtual IEditorMaterialManager* GetIEditorMaterialManager() = 0; // Vladimir@Conffx
     //! Returns IconManager.
@@ -555,8 +550,6 @@ struct IEditor
     virtual IEditorPanelUtils* GetEditorPanelUtils() = 0;
     //! Get Music Manager.
     virtual CMusicManager* GetMusicManager() = 0;
-    //! Get Lens Flare Manager.
-    virtual CLensFlareManager* GetLensFlareManager() = 0;
     virtual float GetTerrainElevation(float x, float y) = 0;
     virtual Editor::EditorQtApplication* GetEditorQtApplication() = 0;
     virtual const QColor& GetColorByName(const QString& name) = 0;
@@ -632,9 +625,6 @@ struct IEditor
     virtual RefCoordSys GetReferenceCoordSys() = 0;
     virtual XmlNodeRef FindTemplate(const QString& templateName) = 0;
     virtual void AddTemplate(const QString& templateName, XmlNodeRef& tmpl) = 0;
-    //! Open material library and select specified item.
-    //! If parameter is NULL current selection in material library does not change.
-    virtual void OpenMaterialLibrary(IDataBaseItem* pItem = NULL) = 0;
 
     virtual const QtViewPane* OpenView(QString sViewClassName, bool reuseOpen = true) = 0;
     virtual QWidget* FindView(QString viewClassName) = 0;
@@ -762,8 +752,6 @@ struct IEditor
 
     // reloads the plugins
     virtual void LoadPlugins() = 0;
-
-    virtual bool IsNewViewportInteractionModelEnabled() const = 0;
 };
 
 //! Callback used by editor when initializing for info in UI dialogs
diff --git a/Code/Sandbox/Editor/IEditorImpl.cpp b/Code/Sandbox/Editor/IEditorImpl.cpp
index 561953d729..61d24db90c 100644
--- a/Code/Sandbox/Editor/IEditorImpl.cpp
+++ b/Code/Sandbox/Editor/IEditorImpl.cpp
@@ -53,14 +53,12 @@ AZ_POP_DISABLE_WARNING
 #include "KeyboardCustomizationSettings.h"
 #include "Export/ExportManager.h"
 #include "LevelIndependentFileMan.h"
-#include "Material/MaterialManager.h"
 #include "TrackView/TrackViewSequenceManager.h"
 #include "AnimationContext.h"
 #include "GameEngine.h"
 #include "ToolBox.h"
 #include "MainWindow.h"
 #include "Alembic/AlembicCompiler.h"
-#include "LensFlareEditor/LensFlareManager.h"
 #include "UIEnumsDatabase.h"
 #include "Util/Ruler.h"
 #include "RenderHelpers/AxisHelper.h"
@@ -168,9 +166,7 @@ CEditorImpl::CEditorImpl()
     , m_pAnimationContext(nullptr)
     , m_pSequenceManager(nullptr)
     , m_pToolBoxManager(nullptr)
-    , m_pMaterialManager(nullptr)
     , m_pMusicManager(nullptr)
-    , m_pLensFlareManager(nullptr)
     , m_pErrorReport(nullptr)
     , m_pLasLoadedLevelErrorReport(nullptr)
     , m_pErrorsDlg(nullptr)
@@ -224,13 +220,11 @@ CEditorImpl::CEditorImpl()
     m_pIconManager = new CIconManager;
     m_pUndoManager = new CUndoManager;
     m_pToolBoxManager = new CToolBoxManager;
-    m_pMaterialManager = new CMaterialManager(regCtx);
     m_pAlembicCompiler = new CAlembicCompiler();
     m_pSequenceManager = new CTrackViewSequenceManager;
     m_pAnimationContext = new CAnimationContext;
 
     m_pImageUtil = new CImageUtil_impl();
-    m_pLensFlareManager = new CLensFlareManager;
     m_pResourceSelectorHost.reset(CreateResourceSelectorHost());
     m_pRuler = new CRuler;
     m_selectedRegion.min = Vec3(0, 0, 0);
@@ -345,7 +339,6 @@ CEditorImpl::~CEditorImpl()
     m_bExiting = true; // Can't save level after this point (while Crash)
     SAFE_RELEASE(m_pSourceControl);
 
-    SAFE_DELETE(m_pMaterialManager)
     SAFE_DELETE(m_pAlembicCompiler)
     SAFE_DELETE(m_pIconManager)
     SAFE_DELETE(m_pViewManager)
@@ -415,7 +408,6 @@ void CEditorImpl::SetGameEngine(CGameEngine* ge)
     m_pObjectManager->LoadClassTemplates("Editor");
     m_pObjectManager->RegisterCVars();
 
-    m_pMaterialManager->Set3DEngine();
     m_pAnimationContext->Init();
 }
 
@@ -1003,39 +995,11 @@ void CEditorImpl::CloseView(const GUID& classId)
     }
 }
 
-IDataBaseManager* CEditorImpl::GetDBItemManager(EDataBaseItemType itemType)
+IDataBaseManager* CEditorImpl::GetDBItemManager([[maybe_unused]] EDataBaseItemType itemType)
 {
-    switch (itemType)
-    {
-    case EDB_TYPE_MATERIAL:
-        return m_pMaterialManager;
-    }
     return 0;
 }
 
-void CEditorImpl::OpenMaterialLibrary(IDataBaseItem* item)
-{
-    EDataBaseItemType type = item ? item->GetType() : EDB_TYPE_MATERIAL;
-    AZ_Assert(type == EDB_TYPE_MATERIAL, "Call to OpenMaterialLibrary with non-material data base item");
-
-    if (type == EDB_TYPE_MATERIAL)
-    {
-        QtViewPaneManager::instance()->OpenPane(LyViewPane::MaterialEditor);
-
-        // This is a workaround for a timing issue where the material editor
-        // gets in a bad state while it is being polished for the first time
-        // while loading a material at the same time, so delay the setting
-        // of the material until the next event queue check
-        QTimer::singleShot(0, [this, item] {
-                IDataBaseManager* pManager = GetDBItemManager(EDB_TYPE_MATERIAL);
-                if (pManager)
-                {
-                    pManager->SetSelectedItem(item);
-                }
-            });
-    }
-}
-
 bool CEditorImpl::SelectColor(QColor& color, QWidget* parent)
 {
     const AZ::Color c = AzQtComponents::fromQColor(color);
@@ -1798,13 +1762,13 @@ SEditorSettings* CEditorImpl::GetEditorSettings()
 // Vladimir@Conffx
 IBaseLibraryManager* CEditorImpl::GetMaterialManagerLibrary()
 {
-    return m_pMaterialManager;
+    return nullptr;
 }
 
 // Vladimir@Conffx
 IEditorMaterialManager* CEditorImpl::GetIEditorMaterialManager()
 {
-    return m_pMaterialManager;
+    return nullptr;
 }
 
 IImageUtil* CEditorImpl::GetImageUtil()
@@ -1822,11 +1786,6 @@ void CEditorImpl::DestroyQMimeData(QMimeData* data) const
     delete data;
 }
 
-bool CEditorImpl::IsNewViewportInteractionModelEnabled() const
-{
-    return m_isNewViewportInteractionModelEnabled;
-}
-
 IEditorPanelUtils* CEditorImpl::GetEditorPanelUtils()
 {
     return m_panelEditorUtils;
diff --git a/Code/Sandbox/Editor/IEditorImpl.h b/Code/Sandbox/Editor/IEditorImpl.h
index a99fa234b9..d17a94807f 100644
--- a/Code/Sandbox/Editor/IEditorImpl.h
+++ b/Code/Sandbox/Editor/IEditorImpl.h
@@ -42,7 +42,6 @@ class CUndoManager;
 class CGameEngine;
 class CExportManager;
 class CErrorsDlg;
-class CLensFlareManager;
 class CIconManager;
 class CBackgroundTaskManager;
 class CTrackViewSequenceManager;
@@ -181,9 +180,7 @@ public:
     bool IsSelectionLocked();
 
     IDataBaseManager* GetDBItemManager(EDataBaseItemType itemType);
-    CMaterialManager* GetMaterialManager() { return m_pMaterialManager; }
     CMusicManager* GetMusicManager() { return m_pMusicManager; };
-    CLensFlareManager* GetLensFlareManager()    { return m_pLensFlareManager; };
 
     IBackgroundTaskManager* GetBackgroundTaskManager() override;
     IBackgroundScheduleManager* GetBackgroundScheduleManager() override;
@@ -237,7 +234,6 @@ public:
     RefCoordSys GetReferenceCoordSys();
     XmlNodeRef FindTemplate(const QString& templateName);
     void AddTemplate(const QString& templateName, XmlNodeRef& tmpl);
-    void OpenMaterialLibrary(IDataBaseItem* pItem = NULL);
    
     const QtViewPane* OpenView(QString sViewClassName, bool reuseOpened = true) override;
 
@@ -340,8 +336,6 @@ public:
     QMimeData* CreateQMimeData() const override;
     void DestroyQMimeData(QMimeData* data) const override;
 
-    bool IsNewViewportInteractionModelEnabled() const override;
-
 protected:
 
     AZStd::string LoadProjectIdFromProjectData();
@@ -384,10 +378,8 @@ protected:
     CAnimationContext* m_pAnimationContext;
     CTrackViewSequenceManager* m_pSequenceManager;
     CToolBoxManager* m_pToolBoxManager;
-    CMaterialManager* m_pMaterialManager;
     CAlembicCompiler* m_pAlembicCompiler;
     CMusicManager* m_pMusicManager;
-    CLensFlareManager* m_pLensFlareManager;
     CErrorReport* m_pErrorReport;
     //! Contains the error reports for the last loaded level.
     CErrorReport* m_pLasLoadedLevelErrorReport;
@@ -443,7 +435,5 @@ protected:
 
     CryMutex m_pluginMutex; // protect any pointers that come from plugins, such as the source control cached pointer.
     static const char* m_crashLogFileName;
-
-    bool m_isNewViewportInteractionModelEnabled = true;
 };
 
diff --git a/Code/Sandbox/Editor/IconManager.cpp b/Code/Sandbox/Editor/IconManager.cpp
index 98afb464d9..09c2d41035 100644
--- a/Code/Sandbox/Editor/IconManager.cpp
+++ b/Code/Sandbox/Editor/IconManager.cpp
@@ -27,27 +27,27 @@
 #include "Util/ImageUtil.h"
 
 
-#define HELPER_MATERIAL "Editor/Objects/Helper"
+#define HELPER_MATERIAL "Objects/Helper"
 
 namespace
 {
     // Object names in this array must correspond to EObject enumeration.
     const char* g_ObjectNames[eStatObject_COUNT] =
     {
-        "Editor/Objects/Arrow.cgf",
-        "Editor/Objects/Axis.cgf",
-        "Editor/Objects/Sphere.cgf",
-        "Editor/Objects/Anchor.cgf",
-        "Editor/Objects/entrypoint.cgf",
-        "Editor/Objects/hidepoint.cgf",
-        "Editor/Objects/hidepoint_sec.cgf",
-        "Editor/Objects/reinforcement_point.cgf",
+        "Objects/Arrow.cgf",
+        "Objects/Axis.cgf",
+        "Objects/Sphere.cgf",
+        "Objects/Anchor.cgf",
+        "Objects/entrypoint.cgf",
+        "Objects/hidepoint.cgf",
+        "Objects/hidepoint_sec.cgf",
+        "Objects/reinforcement_point.cgf",
     };
 
     const char* g_IconNames[eIcon_COUNT] =
     {
-        "Editor/Icons/ScaleWarning.png",
-        "Editor/Icons/RotationWarning.png",
+        "Icons/ScaleWarning.png",
+        "Icons/RotationWarning.png",
     };
 };
 
diff --git a/Code/Sandbox/Editor/Include/IErrorReport.h b/Code/Sandbox/Editor/Include/IErrorReport.h
index 8afe269324..f25a1163a3 100644
--- a/Code/Sandbox/Editor/Include/IErrorReport.h
+++ b/Code/Sandbox/Editor/Include/IErrorReport.h
@@ -21,7 +21,6 @@
 #include <IValidator.h>
 
 // forward declarations.
-class CMaterial;
 class CParticleItem;
 class CBaseObject;
 class CBaseLibraryItem;
diff --git a/Code/Sandbox/Editor/Include/IObjectManager.h b/Code/Sandbox/Editor/Include/IObjectManager.h
index bf1bb97db9..c1c09cf753 100644
--- a/Code/Sandbox/Editor/Include/IObjectManager.h
+++ b/Code/Sandbox/Editor/Include/IObjectManager.h
@@ -24,7 +24,6 @@ class CUsedResources;
 class CSelectionGroup;
 class CObjectClassDesc;
 class CObjectArchive;
-class CObjectPhysicsManager;
 class CViewport;
 struct HitContext;
 enum class ImageRotationDegrees;
@@ -247,10 +246,6 @@ public:
 
     virtual IGizmoManager* GetGizmoManager() = 0;
 
-    //////////////////////////////////////////////////////////////////////////
-    //! Get acess to object physics manager
-    virtual CObjectPhysicsManager* GetPhysicsManager() = 0;
-
     //////////////////////////////////////////////////////////////////////////
     //! Invalidate visibily settings of objects.
     virtual void InvalidateVisibleList() = 0;
diff --git a/Code/Sandbox/Editor/Include/IResourceSelectorHost.h b/Code/Sandbox/Editor/Include/IResourceSelectorHost.h
index 95e1190c0a..f9245f97a4 100644
--- a/Code/Sandbox/Editor/Include/IResourceSelectorHost.h
+++ b/Code/Sandbox/Editor/Include/IResourceSelectorHost.h
@@ -26,7 +26,7 @@
 //     ...
 //     return previousValue;
 //   }
-//   REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Editor/icons/sound_16x16.png")
+//   REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Icons/sound_16x16.png")
 //
 // To expose it to serialization:
 //
diff --git a/Code/Sandbox/Editor/LensFlareEditor/ILensFlareListener.h b/Code/Sandbox/Editor/LensFlareEditor/ILensFlareListener.h
deleted file mode 100644
index 913faf2bb3..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/ILensFlareListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_ILENSFLARELISTENER_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_ILENSFLARELISTENER_H
-#pragma once
-
-class CLensFlareItem;
-class CLensFlareElement;
-
-class ILensFlareChangeItemListener
-{
-public:
-    virtual void OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem) = 0;
-    virtual void OnLensFlareDeleteItem(CLensFlareItem* pLensFlareItem) = 0;
-};
-
-class ILensFlareChangeElementListener
-{
-public:
-    virtual void OnLensFlareChangeElement(CLensFlareElement* pLensFlareElement) = 0;
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_ILENSFLARELISTENER_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareAtomicList.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareAtomicList.cpp
deleted file mode 100644
index d30db3f5f3..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareAtomicList.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareAtomicList.h"
-
-// Qt
-#include <QScrollBar>
-#include <QMimeData>
-
-// Editor
-#include "LensFlareUtil.h"
-#include "Util/Image.h"
-#include "Util/ImageUtil.h"
-
-
-struct QLensFlareAtomicListModel::Item
-{
-    QString text;
-    QSize size;
-    QPixmap pixmap;
-    EFlareType flareType;
-};
-
-CLensFlareAtomicList::CLensFlareAtomicList(QWidget* parent)
-    : CImageListCtrl(parent)
-    , m_model(new QLensFlareAtomicListModel(this))
-{
-    setDragEnabled(true);
-    setDragDropMode(DragOnly);
-    setModel(m_model.data());
-}
-
-CLensFlareAtomicList::~CLensFlareAtomicList()
-{
-}
-
-QModelIndex QLensFlareAtomicListModel::InsertItem(const FlareInfo& flareInfo)
-{
-    Item* pPreviewItem = new Item;
-
-    if (flareInfo.imagename)
-    {
-        CImageEx* pImage = new CImageEx();
-        if (CImageUtil::LoadImage(flareInfo.imagename, *pImage))
-        {
-            pImage->SwapRedAndBlue();
-            pPreviewItem->size = QSize(pImage->GetWidth(), pImage->GetHeight());
-            QImage img(reinterpret_cast<const uchar*>(pImage->GetData()), pImage->GetWidth(), pImage->GetHeight(), QImage::Format_RGB32);
-            pPreviewItem->pixmap = QPixmap::fromImage(img.copy());
-        }
-
-        delete pImage;
-    }
-
-    if (pPreviewItem->pixmap.isNull())
-    {
-        pPreviewItem->pixmap = QPixmap(":/water.png");
-        pPreviewItem->size = QSize(64, 64);
-    }
-
-    pPreviewItem->text = flareInfo.name;
-    pPreviewItem->flareType = flareInfo.type;
-
-    const int row = m_items.count();
-    beginInsertRows(QModelIndex(), row, row);
-    m_items.append(pPreviewItem);
-    endInsertRows();
-
-    return index(row, 0);
-}
-
-void QLensFlareAtomicListModel::Populate()
-{
-    Clear();
-    const FlareInfoArray::Props array = FlareInfoArray::Get();
-    for (size_t i = 0; i < array.size; ++i)
-    {
-        const FlareInfo& flareInfo(array.p[i]);
-        if (LensFlareUtil::IsElement(flareInfo.type))
-        {
-            InsertItem(flareInfo);
-        }
-    }
-}
-
-void CLensFlareAtomicList::FillAtomicItems()
-{
-    if (m_model)
-    {
-        m_model->Populate();
-    }
-}
-
-void CLensFlareAtomicList::updateGeometries()
-{
-    ClearItemGeometries();
-
-    if (!model())
-    {
-        return;
-    }
-
-    const int rowCount = model()->rowCount();
-
-    const int nPageHorz = viewport()->width();
-    const int nPageVert = viewport()->height();
-
-    if (nPageHorz == 0 || nPageVert == 0 || rowCount <= 0)
-    {
-        return;
-    }
-
-    const QSize& borderSize = BorderSize();
-    int x = borderSize.width();
-    int y = borderSize.height();
-
-    QSize itemSize = ItemSize();
-    const int nTextHeight = fontMetrics().height();
-    const int xMax = nPageHorz - borderSize.width();
-    int itemHeightMax = 0;
-
-    for (int row = 0; row < rowCount; ++row)
-    {
-        QModelIndex index = m_model->index(row, 0);
-        itemSize = index.data(Qt::SizeHintRole).toSize();
-
-        if ((x + itemSize.width()) > xMax)
-        {
-            y += itemHeightMax + borderSize.height() + nTextHeight;
-            x = borderSize.width();
-            itemHeightMax = 0;
-        }
-
-        if (itemSize.height() > itemHeightMax)
-        {
-            itemHeightMax = itemSize.height();
-        }
-
-        SetItemGeometry(index, QRect(QPoint(x, y), itemSize));
-
-        x += itemSize.width() + borderSize.width();
-    }
-
-    verticalScrollBar()->setPageStep(viewport()->height());
-    verticalScrollBar()->setRange(0, (y + itemHeightMax - viewport()->height()));
-}
-
-QLensFlareAtomicListModel::QLensFlareAtomicListModel(QObject* parent)
-    : QAbstractListModel(parent)
-{
-}
-
-QLensFlareAtomicListModel::~QLensFlareAtomicListModel()
-{
-}
-
-void QLensFlareAtomicListModel::Clear()
-{
-    qDeleteAll(m_items);
-    m_items.clear();
-}
-
-int QLensFlareAtomicListModel::rowCount(const QModelIndex& parent) const
-{
-    if (parent.isValid())
-    {
-        return 0;
-    }
-
-    return m_items.count();
-}
-
-QVariant QLensFlareAtomicListModel::data(const QModelIndex& index, int role) const
-{
-    Item* item;
-    if (!index.isValid())
-    {
-        return QVariant();
-    }
-    else
-    {
-        item = ItemFromIndex(index);
-        if (!item)
-        {
-            return QVariant();
-        }
-    }
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    case Qt::EditRole:
-        return item->text;
-
-    case Qt::SizeHintRole:
-        return item->size;
-
-    case Qt::DecorationRole:
-        return item->pixmap;
-
-    case Qt::UserRole:
-        return item->flareType;
-    }
-
-    return QVariant();
-}
-
-bool QLensFlareAtomicListModel::setData(const QModelIndex& index, const QVariant& value, int role)
-{
-    Item* item;
-    if (index.isValid())
-    {
-        return false;
-    }
-    else
-    {
-        item = ItemFromIndex(index);
-        if (!item)
-        {
-            return false;
-        }
-    }
-
-    switch (role)
-    {
-    case Qt::EditRole:
-        item->text = value.toString();
-        break;
-
-    case Qt::DecorationRole:
-        item->pixmap = value.value<QPixmap>();
-        break;
-
-    case Qt::SizeHintRole:
-        item->size = value.toSize();
-        break;
-
-    default:
-        return false;
-    }
-
-    emit dataChanged(index, index, QVector<int>() << role);
-    return false;
-}
-
-Qt::ItemFlags QLensFlareAtomicListModel::flags(const QModelIndex& index) const
-{
-    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable | Qt::ItemIsDragEnabled;
-}
-
-EFlareType QLensFlareAtomicListModel::FlareTypeFromIndex(QModelIndex index) const
-{
-    Item* item;
-    if (!index.isValid())
-    {
-        return eFT_Max;
-    }
-    else
-    {
-        item = ItemFromIndex(index);
-        if (!item)
-        {
-            return eFT_Max;
-        }
-    }
-
-    return item->flareType;
-}
-
-QLensFlareAtomicListModel::Item* QLensFlareAtomicListModel::ItemFromIndex(QModelIndex index) const
-{
-    if (!index.isValid())
-    {
-        return nullptr;
-    }
-
-    return m_items.at(index.row());
-}
-
-QStringList QLensFlareAtomicListModel::mimeTypes() const
-{
-    return {
-               QStringLiteral("application/x-o3de-flaretypes")
-    };
-}
-
-QMimeData* QLensFlareAtomicListModel::mimeData(const QModelIndexList& indexes) const
-{
-    QMimeData* data = new QMimeData();
-
-    QByteArray encoded;
-    QDataStream stream(&encoded, QIODevice::WriteOnly);
-
-    for (const QModelIndex& index : indexes)
-    {
-        stream << static_cast<int>(FlareTypeFromIndex(index));
-    }
-
-    data->setData(QStringLiteral("application/x-o3de-flaretypes"), encoded);
-
-    return data;
-}
-
-bool QLensFlareAtomicListModel::dropMimeData([[maybe_unused]] const QMimeData* data, [[maybe_unused]] Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, [[maybe_unused]] const QModelIndex& parent)
-{
-    return false;
-}
-
-Qt::DropActions QLensFlareAtomicListModel::supportedDragActions() const
-{
-    return Qt::CopyAction;
-}
-
-#include <LensFlareEditor/moc_LensFlareAtomicList.cpp>
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareAtomicList.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareAtomicList.h
deleted file mode 100644
index 5748ff07f7..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareAtomicList.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREATOMICLIST_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREATOMICLIST_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Controls/ImageListCtrl.h"
-#endif
-
-#if !defined(Q_MOC_RUN)
-#include <QAbstractItemModel>
-#include <QScopedPointer>
-#endif
-
-class CLensFlareEditor;
-class QLensFlareAtomicListModel;
-
-class CLensFlareAtomicList
-    : public CImageListCtrl
-{
-    Q_OBJECT
-public:
-    CLensFlareAtomicList(QWidget* parent = nullptr);
-    virtual ~CLensFlareAtomicList();
-
-    void FillAtomicItems();
-
-protected:
-    void updateGeometries() override;
-
-private:
-    QScopedPointer<QLensFlareAtomicListModel> m_model;
-};
-
-class QLensFlareAtomicListModel
-    : public QAbstractListModel
-{
-    struct Item;
-    Q_OBJECT
-public:
-    QLensFlareAtomicListModel(QObject* parent = nullptr);
-    ~QLensFlareAtomicListModel();
-
-    void Clear();
-    void Populate();
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-
-    QStringList mimeTypes() const override;
-    QMimeData* mimeData(const QModelIndexList& indexes) const override;
-    bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
-    Qt::DropActions supportedDragActions() const override;
-
-    EFlareType FlareTypeFromIndex(QModelIndex index) const;
-
-protected:
-    QModelIndex InsertItem(const FlareInfo& flareInfo);
-    Item* ItemFromIndex(QModelIndex index) const;
-
-private:
-    QVector<Item*> m_items;
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREATOMICLIST_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareEditor.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareEditor.cpp
deleted file mode 100644
index 763b5bf19b..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareEditor.cpp
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareEditor.h"
-
-// Qt
-#include <QMenu>
-#include <QMimeData>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/FancyDocking.h>
-#include <AzQtComponents/Components/StyledDockWidget.h>
-#include <AzQtComponents/Components/StyleManager.h>
-
-// LmbrCentral
-#include <LmbrCentral/Rendering/LensFlareAsset.h>   // for LmbrCentral::LensFlareAsset
-
-// Editor
-#include "Clipboard.h"
-#include "StringDlg.h"
-#include "Settings.h"
-#include "Include/IObjectManager.h"
-#include "LensFlareView.h"
-#include "LensFlareAtomicList.h"
-#include "LensFlareElementTree.h"
-#include "LensFlareManager.h"
-#include "LensFlareItem.h"
-#include "LensFlareLibrary.h"
-#include "LensFlareUndo.h"
-#include "LensFlareLightEntityTree.h"
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
-#include "ui_DatabaseFrameWnd.h"
-#include "LyViewPaneNames.h"
-
-
-
-
-CLensFlareEditor* CLensFlareEditor::s_pLensFlareEditor = NULL;
-const char* CLensFlareEditor::s_pLensFlareEditorClassName = LyViewPane::LensFlareEditor;
-
-#define DISABLE_REFERENCETREE
-
-CLensFlareEditor::CLensFlareEditor(QWidget* pParent)
-    : CDatabaseFrameWnd(GetIEditor()->GetLensFlareManager(), pParent)
-    , m_pLensFlareView(NULL)
-    , m_pLensFlareAtomicList(NULL)
-    , m_pLensFlareElementTree(NULL)
-    , m_pWndProps(NULL)
-    , m_pLensFlareLightEntityTree(NULL)
-    , m_pLensFlareReferenceTree(NULL)
-    , m_LensFlareItemTree(NULL)
-{
-    assert(!s_pLensFlareEditor);
-    s_pLensFlareEditor = this;
-
-    m_pLensFlareView = new CLensFlareView(this);
-    m_pLensFlareAtomicList = new CLensFlareAtomicList(this);
-    m_pLensFlareElementTree = new CLensFlareElementTree(this);
-    m_pWndProps = new ReflectedPropertyControl(this);
-    m_pWndProps->Setup();
-    m_pLensFlareLightEntityTree = new CLensFlareLightEntityTree(this);
-#ifndef DISABLE_REFERENCETREE
-    m_pLensFlareReferenceTree = new CLensFlareReferenceTree;
-#endif
-    m_LensFlareItemTree = new CLensFlareItemTree(this);
-
-    m_pLibraryItemTreeModel = new LensFlareItemTreeModel(this);
-    m_LensFlareItemTree->setModel(m_pLibraryItemTreeModel);
-
-    setCentralWidget(m_pLensFlareView);
-
-    setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
-    setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
-    setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
-    setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
-
-    m_advancedDockManager = new AzQtComponents::FancyDocking(this, "lensFlareEditor");
-
-    addDockWidget(Qt::LeftDockWidgetArea, m_LensFlareItemTree, tr("Lens Flare Tree"), false);
-    addDockWidget(Qt::LeftDockWidgetArea, m_pLensFlareElementTree, tr("Element Tree"), false);
-
-    addDockWidget(Qt::BottomDockWidgetArea, m_pLensFlareAtomicList, tr("Basic Set"), false);
-#ifndef DISABLE_REFERENCETREE
-    addDockWidget(Qt::TopDockWidgetArea, m_pLensFlareReferenceTree, tr("Reference Tree"), false);
-#endif
-
-    addDockWidget(Qt::RightDockWidgetArea, m_pWndProps, tr("Properties"), false);
-    addDockWidget(Qt::RightDockWidgetArea, m_pLensFlareLightEntityTree, tr("Light Entities"), false);
-
-    m_pLensFlareElementTree->RegisterListener(this);
-    m_pLensFlareElementTree->RegisterListener(m_pLensFlareView);
-
-    m_pWndProps->ExpandAll();
-    m_pWndProps->SetUpdateCallback(AZStd::bind(&CLensFlareEditor::OnUpdateProperties, this, AZStd::placeholders::_1));
-    m_pWndProps->SetCallbackOnNonModified(false);
-
-    connect(ui->actionDBAdd, &QAction::triggered, this, &CLensFlareEditor::OnAddItem);
-    connect(ui->actionDBAssignToSelection, &QAction::triggered, this, &CLensFlareEditor::OnAssignFlareToLightEntities);
-    connect(ui->actionDBGetFromSelection, &QAction::triggered, this, &CLensFlareEditor::OnGetFlareFromSelection);
-
-    connect(m_pLibraryItemTreeModel, &LibraryItemTreeModel::itemRenamed, this, &CLensFlareEditor::OnItemTreeDataRenamed);
-
-    AzQtComponents::StyleManager::setStyleSheet(this, "style:LensFlareEditor.qss");
-}
-
-CLensFlareEditor::~CLensFlareEditor()
-{
-    if (m_pLensFlareElementTree)
-    {
-        m_pLensFlareElementTree->UnregisterListener(this);
-        m_pLensFlareElementTree->UnregisterListener(m_pLensFlareView);
-    }
-
-    ReleaseWindowsToBePutIntoPanels();
-    s_pLensFlareEditor = NULL;
-}
-
-QMenu* CLensFlareEditor::createPopupMenu()
-{
-    return QMainWindow::createPopupMenu();
-}
-
-void CLensFlareEditor::OnInitDialog()
-{
-    InitTreeCtrl();
-
-    connect(m_LensFlareItemTree->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CLensFlareEditor::OnTvnItemSelChanged);
-    connect(m_LensFlareItemTree, &QWidget::customContextMenuRequested, this, &CLensFlareEditor::OnNotifyTreeRClick);
-
-    m_pLensFlareAtomicList->FillAtomicItems();
-
-    ReloadLibs();
-}
-
-void CLensFlareEditor::addDockWidget(Qt::DockWidgetArea area, QWidget* widget, const QString& title, bool closable)
-{
-    QDockWidget* w = new AzQtComponents::StyledDockWidget(title);
-    w->setObjectName(widget->metaObject()->className());
-    widget->setParent(w);
-    w->setWidget(widget);
-    if (!closable)
-    {
-        w->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
-    }
-    QMainWindow::addDockWidget(area, w);
-}
-
-void CLensFlareEditor::ReleaseWindowsToBePutIntoPanels()
-{
-    SAFE_DELETE(m_pWndProps);
-    SAFE_DELETE(m_pLensFlareAtomicList);
-    SAFE_DELETE(m_pLensFlareView);
-    SAFE_DELETE(m_pLensFlareElementTree);
-    SAFE_DELETE(m_pLensFlareLightEntityTree);
-#ifndef DISABLE_REFERENCETREE
-    SAFE_DELETE(m_pLensFlareReferenceTree);
-#endif
-}
-
-const GUID& CLensFlareEditor::GetClassID()
-{
-    // {7e7a40e0-f0b8-4918-b94f-8cdd6c55f30b}
-    static const GUID guid = {
-        0x7e7a40e0, 0xf0b8, 0x4918, { 0xb9, 0x4f, 0x8c, 0xdd, 0x6c, 0x55, 0xf3, 0x0b }
-    };
-    return guid;
-}
-
-void CLensFlareEditor::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions options;
-    AzToolsFramework::RegisterViewPane<CLensFlareEditor>(s_pLensFlareEditorClassName, LyViewPane::CategoryOther, options);
-    GetIEditor()->GetSettingsManager()->AddToolName("LensFlareEditor", "Lens Flare");
-}
-
-CLensFlareItem* CLensFlareEditor::GetSelectedLensFlareItem() const
-{
-    QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return nullptr;
-    }
-    return static_cast<CLensFlareItem*>(selected.first().data(Qt::UserRole).value<CBaseLibraryItem*>());
-}
-
-void CLensFlareEditor::ResetElementTreeControl()
-{
-    m_pLensFlareElementTree->InvalidateLensFlareItem();
-}
-
-void CLensFlareEditor::SelectItem(CBaseLibraryItem* item, bool bForceReload)
-{
-    if (item != m_pCurrentItem || bForceReload)
-    {
-        //Ensure that the property window is emptied out whenever the selected library changes
-        m_pWndProps->RemoveAllItems();
-    }
-
-    CDatabaseFrameWnd::SelectItem(item, bForceReload);
-}
-
-void CLensFlareEditor::OnTvnItemSelChanged(const QItemSelection& selected, const QItemSelection& deselected)
-{
-    QModelIndex hItem;
-
-    QModelIndexList selectedIndexes = selected.indexes();
-    if (!selectedIndexes.isEmpty())
-    {
-        hItem = selectedIndexes.first();
-    }
-
-    QModelIndex hPrevItem;
-
-    QModelIndexList deselectedIndexes = deselected.indexes();
-    if (!deselectedIndexes.isEmpty())
-    {
-        hPrevItem = deselectedIndexes.first();
-    }
-
-    SelectLensFlareItem(hItem, hPrevItem);
-    UpdateLensFlareItem(GetSelectedLensFlareItem());
-}
-
-void CLensFlareEditor::SelectLensFlareItem(const QModelIndex& hItem, const QModelIndex& hPrevItem)
-{
-    if (hPrevItem.isValid() && CUndo::IsRecording())
-    {
-        QString fullItemName = m_pLibraryItemTreeModel->GetFullName(hPrevItem);
-        if (!fullItemName.isEmpty())
-        {
-            CUndo::Record(new CUndoLensFlareItemSelectionChange(fullItemName));
-        }
-    }
-    m_pWndProps->RemoveAllItems();
-    if (!hItem.isValid())
-    {
-        return;
-    }
-    CLensFlareItem* pSelectedLensFlareItem = static_cast<CLensFlareItem*>(hItem.data(Qt::UserRole).value<CBaseLibraryItem*>());
-    SelectItem(pSelectedLensFlareItem);
-}
-
-void CLensFlareEditor::SelectLensFlareItem(const QModelIndex& hItem)
-{
-    QModelIndex hPrevItem;
-
-    QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-    if (!selected.isEmpty())
-    {
-        hPrevItem = selected.first();
-    }
-
-    SelectLensFlareItem(hItem, hPrevItem);
-}
-
-void CLensFlareEditor::SelectLensFlareItem(const QString& fullItemName)
-{
-    QModelIndex hNewItem = m_pLibraryItemTreeModel->FindLibraryItemByFullName(fullItemName);
-    if (!hNewItem.isValid())
-    {
-        return;
-    }
-
-    SelectLensFlareItem(hNewItem);
-}
-
-void CLensFlareEditor::RemovePropertyItems()
-{
-    m_pWndProps->RemoveAllItems();
-}
-
-bool CLensFlareEditor::IsExistTreeItem(const QString& name, bool bExclusiveSelectedItem)
-{
-    CBaseLibraryItem* pSelectedItem = GetSelectedLensFlareItem();
-
-    for (int i = 0; i < m_pLibrary->GetItemCount(); i++)
-    {
-        CBaseLibraryItem* pItem = static_cast<CBaseLibraryItem*>(m_pLibrary->GetItem(i));
-
-        if (!bExclusiveSelectedItem || pItem != pSelectedItem)
-        {
-            if (pItem->GetName() == name)
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-void CLensFlareEditor::RenameLensFlareItem(CLensFlareItem* pLensFlareItem, const QString& newGroupName, const QString& newShortName)
-{
-    if (pLensFlareItem == NULL || newShortName.isEmpty() || newGroupName.isEmpty())
-    {
-        return;
-    }
-
-    m_pLibraryItemTreeModel->Rename(pLensFlareItem, newGroupName, newShortName);
-}
-
-IOpticsElementBasePtr CLensFlareEditor::FindOptics(const QString& itemPath, const QString& opticsPath)
-{
-    CLensFlareItem* pItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(itemPath);
-    if (pItem == NULL)
-    {
-        return NULL;
-    }
-
-    IOpticsElementBasePtr pOptics = pItem->GetOptics();
-    if (pOptics == NULL)
-    {
-        return NULL;
-    }
-
-    return LensFlareUtil::FindOptics(pOptics, opticsPath);
-}
-
-void CLensFlareEditor::UpdateLensOpticsNames(const QString& oldFullName, const QString& newFullName)
-{
-    std::vector<CBaseObject*> pEntityObjects;
-    GetIEditor()->GetObjectManager()->FindObjectsOfType(&CEntityObject::staticMetaObject, pEntityObjects);
-    for (int i = 0, iObjectSize(pEntityObjects.size()); i < iObjectSize; ++i)
-    {
-        CEntityObject* pEntity = (CEntityObject*)pEntityObjects[i];
-        if (pEntity == NULL)
-        {
-            continue;
-        }
-        if (pEntity->CheckFlags(OBJFLAG_DELETED))
-        {
-            continue;
-        }
-        if (!pEntity->IsLight())
-        {
-            continue;
-        }
-        if (oldFullName == pEntity->GetEntityPropertyString(CEntityObject::s_LensFlarePropertyName))
-        {
-            pEntity->SetOpticsName(newFullName);
-        }
-    }
-}
-
-void CLensFlareEditor::OnCopy()
-{
-    UpdateClipboard(FLARECLIPBOARDTYPE_COPY);
-}
-
-void CLensFlareEditor::OnPaste()
-{
-    if (!m_pLibrary)
-    {
-        return;
-    }
-
-    CClipboard clipboard(this);
-    if (clipboard.IsEmpty())
-    {
-        return;
-    }
-
-    XmlNodeRef clipboardXML = clipboard.Get();
-    if (clipboardXML == NULL)
-    {
-        return;
-    }
-
-    Paste(clipboardXML);
-}
-
-void CLensFlareEditor::Paste(XmlNodeRef node)
-{
-    QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-    Paste(selected.first(), node);
-}
-
-void CLensFlareEditor::Paste(const QModelIndex& hSelectedTreeItem, XmlNodeRef node)
-{
-    if (!m_pLibrary || node == NULL)
-    {
-        return;
-    }
-
-    QString type;
-    node->getAttr("Type", type);
-
-    QString sourceGroupName;
-    node->getAttr("GroupName", sourceGroupName);
-
-    if (m_pLibrary == NULL)
-    {
-        return;
-    }
-
-    bool bShouldCreateNewGroup(false);
-    if (!sourceGroupName.isEmpty())
-    {
-        unsigned int nAnswer = CryMessageBox("Do you want to create a new group(YES) or add to the selected group(NO)?", "Question", MB_YESNOCANCEL);
-        if (nAnswer == IDCANCEL)
-        {
-            return;
-        }
-        bShouldCreateNewGroup = nAnswer == IDYES;
-    }
-
-    QString targetGroupName;
-
-    if (bShouldCreateNewGroup)
-    {
-        using namespace AZStd::placeholders;
-        targetGroupName = MakeValidName("NewGroup", AZStd::bind(&CDatabaseFrameWnd::DoesGroupExist, this, _1, _2));
-    }
-    else
-    {
-        QModelIndex hTargetItem;
-        if (!m_pLibraryItemTreeModel->hasChildren(hSelectedTreeItem))
-        {
-            hTargetItem = m_pLibraryItemTreeModel->parent(hSelectedTreeItem);
-        }
-        else
-        {
-            hTargetItem = hSelectedTreeItem;
-        }
-
-        if (!hTargetItem.isValid())
-        {
-            return;
-        }
-
-        targetGroupName = m_pLibraryItemTreeModel->GetFullName(hTargetItem);
-    }
-
-    CUndo undo(tr("Copy/Cut & Paste for Lens Flare").toUtf8());
-    CLensFlareItem* pNewItem = NULL;
-
-    for (int i = 0, iChildCount(node->getChildCount()); i < iChildCount; ++i)
-    {
-        LensFlareUtil::SClipboardData clipboardData;
-        clipboardData.FillThisFromXmlNode(node->getChild(i));
-
-        _smart_ptr<CLensFlareItem> pSourceItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(clipboardData.m_LensFlareFullPath);
-        if (pSourceItem == NULL)
-        {
-            continue;
-        }
-
-        IOpticsElementBasePtr pSourceOptics = FindOptics(clipboardData.m_LensFlareFullPath, clipboardData.m_LensOpticsPath);
-        if (pSourceOptics == NULL)
-        {
-            continue;
-        }
-
-        if (type == FLARECLIPBOARDTYPE_CUT)
-        {
-            if (clipboardData.m_From == LENSFLARE_ELEMENT_TREE)
-            {
-                LensFlareUtil::RemoveOptics(pSourceOptics);
-            }
-            else
-            {
-                DeleteItem(pSourceItem);
-            }
-        }
-
-        QString sourceName;
-        if (clipboardData.m_From == LENSFLARE_ELEMENT_TREE)
-        {
-            sourceName = LensFlareUtil::GetShortName(pSourceOptics->GetName().c_str());
-        }
-        else
-        {
-            sourceName = pSourceItem->GetShortName();
-        }
-
-        QString candidateName = targetGroupName + QString(".") + sourceName;
-        QString validName = MakeValidName(candidateName,
-                                AZStd::bind(&CDatabaseFrameWnd::DoesItemExist, this, AZStd::placeholders::_1, AZStd::placeholders::_2));
-        QString validShortName = LensFlareUtil::GetShortName(validName);
-        pNewItem = AddNewLensFlareItem(targetGroupName, validShortName);
-        assert(pNewItem);
-        if (pNewItem == NULL)
-        {
-            continue;
-        }
-
-        if (LensFlareUtil::IsGroup(pSourceOptics->GetType()))
-        {
-            LensFlareUtil::CopyOptics(pSourceOptics, pNewItem->GetOptics(), true);
-        }
-        else
-        {
-            IOpticsElementBasePtr pNewOptics = LensFlareUtil::CreateOptics(pSourceOptics);
-            if (pNewOptics)
-            {
-                pNewItem->GetOptics()->AddElement(pNewOptics);
-            }
-        }
-
-        if (type == FLARECLIPBOARDTYPE_CUT)
-        {
-            if (clipboardData.m_From == LENSFLARE_ITEM_TREE)
-            {
-                UpdateLensOpticsNames(pSourceItem->GetFullName(), pNewItem->GetFullName());
-            }
-            if (pSourceItem != GetSelectedLensFlareItem())
-            {
-                pSourceItem->UpdateLights();
-            }
-        }
-
-        LensFlareUtil::UpdateOpticsName(pNewItem->GetOptics());
-        LensFlareUtil::ChangeOpticsRootName(pNewItem->GetOptics(), validShortName);
-
-        ReloadItems();
-        SelectLensFlareItem(m_pLibraryItemTreeModel->index(pNewItem), {});
-    }
-}
-
-void CLensFlareEditor::OnCut()
-{
-    UpdateClipboard(FLARECLIPBOARDTYPE_CUT);
-}
-
-XmlNodeRef CLensFlareEditor::CreateXML(const char* type) const
-{
-    std::vector<LensFlareUtil::SClipboardData> clipboardDataList;
-    QString groupName;
-    if (!GetClipboardDataList(clipboardDataList, groupName))
-    {
-        return NULL;
-    }
-    return LensFlareUtil::CreateXMLFromClipboardData(type, groupName, false, clipboardDataList);
-}
-
-void CLensFlareEditor::UpdateClipboard(const char* type) const
-{
-    std::vector<LensFlareUtil::SClipboardData> clipboardDataList;
-    QString groupName;
-    if (!GetClipboardDataList(clipboardDataList, groupName))
-    {
-        return;
-    }
-    LensFlareUtil::UpdateClipboard(type, groupName, false, clipboardDataList);
-}
-
-bool CLensFlareEditor::GetClipboardDataList(std::vector<LensFlareUtil::SClipboardData>& outList, QString& outGroupName) const
-{
-    CLensFlareLibrary* pLibrary = GetCurrentLibrary();
-    if (pLibrary == NULL)
-    {
-        return false;
-    }
-
-    std::vector<LensFlareUtil::SClipboardData> clipboardDataList;
-
-    CLensFlareItem* pLensFlareItem = GetSelectedLensFlareItem();
-    if (pLensFlareItem)
-    {
-        clipboardDataList.push_back(LensFlareUtil::SClipboardData(LENSFLARE_ITEM_TREE, pLensFlareItem->GetFullName(), pLensFlareItem->GetShortName()));
-    }
-    else if (GetSelectedItemStatus() == eSIS_Group)
-    {
-        QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-        if (selected.isEmpty())
-        {
-            return false;
-        }
-        outGroupName = selected.first().data(Qt::DisplayRole).toString();
-        for (CBaseLibraryItem* pItem : m_pLibraryItemTreeModel->ChildItems(selected.first()))
-        {
-            pLensFlareItem = static_cast<CLensFlareItem*>(pItem);
-            clipboardDataList.push_back(LensFlareUtil::SClipboardData(LENSFLARE_ITEM_TREE, pLensFlareItem->GetFullName(), pLensFlareItem->GetShortName()));
-        }
-    }
-    else
-    {
-        return false;
-    }
-
-    outList = clipboardDataList;
-
-    return true;
-}
-
-void CLensFlareEditor::OnAddItem()
-{
-    if (!m_pLibrary)
-    {
-        return;
-    }
-
-    StringGroupDlg dlg(tr("New Flare Name"), this);
-    dlg.SetGroup(m_selectedGroup);
-
-    if (dlg.exec() != QDialog::Accepted || dlg.GetString().isEmpty())
-    {
-        return;
-    }
-
-    QString fullName = m_pItemManager->MakeFullItemName(m_pLibrary, dlg.GetGroup(), dlg.GetString());
-    if (m_pItemManager->FindItemByName(fullName))
-    {
-        Warning("Item with name %s already exist", fullName.toUtf8().data());
-        return;
-    }
-
-    CUndo undo(tr("Add flare library item").toUtf8());
-
-    CLensFlareItem* pNewLensFlare = AddNewLensFlareItem(dlg.GetGroup(), dlg.GetString());
-    if (pNewLensFlare)
-    {
-        m_pLibraryItemTreeModel->Add(pNewLensFlare);
-        SelectItem(pNewLensFlare);
-    }
-}
-
-CLensFlareItem* CLensFlareEditor::AddNewLensFlareItem(const QString& groupName, const QString& shortName)
-{
-    CLensFlareItem* pNewFlare = (CLensFlareItem*)m_pItemManager->CreateItem(m_pLibrary);
-    if (pNewFlare == NULL)
-    {
-        return NULL;
-    }
-    if (!SetItemName(pNewFlare, groupName, shortName))
-    {
-        m_pItemManager->DeleteItem(pNewFlare);
-        return NULL;
-    }
-    pNewFlare->GetOptics()->SetName(pNewFlare->GetShortName().toUtf8().data());
-    return pNewFlare;
-}
-
-QModelIndex CLensFlareEditor::GetTreeLensFlareItem(CLensFlareItem* pItem) const
-{
-    return m_pLibraryItemTreeModel->index(pItem);
-}
-
-void CLensFlareEditor::OnCopyNameToClipboard()
-{
-    QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-    QString itemName = m_pLibraryItemTreeModel->GetFullName(selected.first());
-    CClipboard clipboard(this);
-    clipboard.PutString(itemName);
-}
-
-void CLensFlareEditor::OnAssignFlareToLightEntities()
-{
-    CLensFlareItem* pLensFlareItem = GetSelectedLensFlareItem();
-    if (pLensFlareItem == NULL)
-    {
-        return;
-    }
-    std::vector<CEntityObject*> entityList;
-    LensFlareUtil::GetSelectedLightEntities(entityList);
-
-    for (int i = 0, iEntityCount(entityList.size()); i < iEntityCount; ++i)
-    {
-        entityList[i]->ApplyOptics(pLensFlareItem->GetFullName(), pLensFlareItem->GetOptics());
-    }
-
-    m_pLensFlareLightEntityTree->OnLensFlareChangeItem(pLensFlareItem);
-}
-
-void CLensFlareEditor::OnSelectAssignedObjects()
-{
-    std::vector<CEntityObject*> lightEntities;
-    LensFlareUtil::GetLightEntityObjects(lightEntities);
-
-    CLensFlareItem* pLensFlareItem = GetSelectedLensFlareItem();
-    if (pLensFlareItem == NULL)
-    {
-        return;
-    }
-
-    int iLightSize(lightEntities.size());
-    std::vector<CBaseObject*> assignedObjects;
-    assignedObjects.reserve(iLightSize);
-
-    for (int i = 0; i < iLightSize; ++i)
-    {
-        CEntityObject* pLightEntity = lightEntities[i];
-        if (pLightEntity == NULL)
-        {
-            continue;
-        }
-
-        IOpticsElementBasePtr pTargetOptics = pLightEntity->GetOpticsElement();
-        if (pTargetOptics == NULL)
-        {
-            continue;
-        }
-
-        if (QString::compare(pLensFlareItem->GetFullName(), pTargetOptics->GetName().c_str(), Qt::CaseInsensitive))
-        {
-            continue;
-        }
-
-        assignedObjects.push_back(pLightEntity);
-    }
-
-    if (assignedObjects.empty())
-    {
-        return;
-    }
-
-    GetIEditor()->ClearSelection();
-    for (int i = 0, iAssignedObjectsSize(assignedObjects.size()); i < iAssignedObjectsSize; ++i)
-    {
-        GetIEditor()->SelectObject(assignedObjects[i]);
-    }
-}
-
-void CLensFlareEditor::OnGetFlareFromSelection()
-{
-    CEntityObject* pEntity = LensFlareUtil::GetSelectedLightEntity();
-    if (pEntity == NULL)
-    {
-        QMessageBox::warning(this, tr("Warning"), tr("Please select a light entity first."));
-        return;
-    }
-    if (m_pLibrary == NULL)
-    {
-        return;
-    }
-
-    QString fullFlareName = pEntity->GetEntityPropertyString(CEntityObject::s_LensFlarePropertyName);
-    int nDotPosition = fullFlareName.indexOf(".");
-    if (nDotPosition == -1)
-    {
-        return;
-    }
-
-    QString libraryName = fullFlareName.left(nDotPosition);
-    if (m_pLibrary->GetName() != libraryName)
-    {
-        GetIEditor()->GetLensFlareManager()->LoadItemByName(fullFlareName);
-        SelectLibrary(libraryName);
-    }
-
-    SelectItemByName(fullFlareName);
-}
-
-void CLensFlareEditor::OnUpdateTreeCtrl()
-{
-    OnGetFlareFromSelection();
-}
-
-void CLensFlareEditor::OnNotifyTreeRClick()
-{
-    CLensFlareItem* pLensFlareItem = 0;
-
-    QModelIndex hItem = LensFlareUtil::GetTreeItemByHitTest(*GetTreeCtrl());
-    if (hItem.isValid())
-    {
-        pLensFlareItem = static_cast<CLensFlareItem*>(hItem.data(Qt::UserRole).value<CBaseLibraryItem*>());
-    }
-
-    SelectItem(pLensFlareItem);
-
-    bool bGrayedFlag = false;
-    if (!pLensFlareItem)
-    {
-        bGrayedFlag = true;
-    }
-
-    CClipboard clipboard(this);
-    bool bPasteFlags = true;
-    if (clipboard.IsEmpty())
-    {
-        bPasteFlags = false;
-    }
-
-    bool bCopyPasteCloneFlag = true;
-    if (GetSelectedItemStatus() != eSIS_Flare && GetSelectedItemStatus() != eSIS_Group)
-    {
-        bCopyPasteCloneFlag = false;
-    }
-
-    QMenu menu;
-
-    QAction* actionDBCut = menu.addAction(tr("Cut"));
-    actionDBCut->setEnabled(bCopyPasteCloneFlag);
-    connect(actionDBCut, &QAction::triggered, this, &CLensFlareEditor::OnCut);
-
-    QAction* actionDBCopy = menu.addAction(tr("Copy"));
-    actionDBCopy->setEnabled(bCopyPasteCloneFlag);
-    connect(actionDBCopy, &QAction::triggered, this, &CLensFlareEditor::OnCopy);
-
-    QAction* actionDBPaste = menu.addAction(tr("Paste"));
-    actionDBPaste->setEnabled(bPasteFlags);
-    connect(actionDBPaste, &QAction::triggered, this, &CLensFlareEditor::OnPaste);
-
-    QAction* actionDBClone = menu.addAction(tr("Clone"));
-    actionDBClone->setEnabled(bCopyPasteCloneFlag);
-    connect(actionDBClone, &QAction::triggered, this, &CLensFlareEditor::OnClone);
-
-    menu.addSeparator();
-
-    QAction* actionDBRename = menu.addAction(tr("Rename\tF2"));
-    connect(actionDBRename, &QAction::triggered, this, &CLensFlareEditor::OnRenameItem);
-
-    QAction* actionDBRemove = menu.addAction(tr("Delete\tDel"));
-    connect(actionDBRemove, &QAction::triggered, this, &CLensFlareEditor::OnRemoveItem);
-
-    menu.addSeparator();
-
-    QAction* actionDBAssignToSelection = menu.addAction(tr("Assign to Selected Objects"));
-    actionDBAssignToSelection->setEnabled(!bGrayedFlag);
-    connect(actionDBAssignToSelection, &QAction::triggered, this, &CLensFlareEditor::OnAssignFlareToLightEntities);
-
-    QAction* actionDBSelectAssignedObjects = menu.addAction(tr("Select Assigned Objects"));
-    actionDBSelectAssignedObjects->setEnabled(!bGrayedFlag);
-    connect(actionDBSelectAssignedObjects, &QAction::triggered, this, &CLensFlareEditor::OnSelectAssignedObjects);
-
-    QAction* actionDBCopyNameToClipboard = menu.addAction(tr("Copy Name to ClipBoard"));
-    connect(actionDBCopyNameToClipboard, &QAction::triggered, this, &CLensFlareEditor::OnCopyNameToClipboard);
-
-    menu.exec(QCursor::pos());
-}
-
-bool CLensFlareEditor::SelectItemByName(const QString& itemName)
-{
-    CLensFlareItem* pLensFlareItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(itemName);
-    if (pLensFlareItem == NULL)
-    {
-        return false;
-    }
-
-    GetIEditor()->GetLensFlareManager()->SetSelectedItem(pLensFlareItem);
-
-    SelectLensFlareItem(m_pLibraryItemTreeModel->index(pLensFlareItem));
-
-    return true;
-}
-
-
-void CLensFlareEditor::StartEditItem(const QModelIndex& hItem)
-{
-    if (!hItem.isValid())
-    {
-        return;
-    }
-    GetTreeCtrl()->edit(hItem);
-}
-
-bool CLensFlareEditor::GetFullLensFlareItemName(const QModelIndex& hItem, QString& outFullName) const
-{
-    if (!hItem.isValid())
-    {
-        return false;
-    }
-
-    outFullName = m_pLibraryItemTreeModel->GetFullName(hItem);
-
-    return true;
-}
-
-CLensFlareEditor::ESelectedItemStatus CLensFlareEditor::GetSelectedItemStatus() const
-{
-    QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return eSIS_Unselected;
-    }
-    if (m_pLibraryItemTreeModel->hasChildren(selected.first()))
-    {
-        return eSIS_Group;
-    }
-    return eSIS_Flare;
-}
-
-void CLensFlareEditor::SelectItemInLensFlareElementTreeByName(const QString& name)
-{
-    m_pLensFlareElementTree->SelectTreeItemByName(name);
-}
-
-bool CLensFlareEditor::GetSelectedLensFlareName(QString& outName) const
-{
-    const CLensFlareElement* pElement = m_pLensFlareElementTree->GetCurrentLensFlareElement();
-    if (pElement == NULL)
-    {
-        return false;
-    }
-    return pElement->GetName(outName);
-}
-
-void CLensFlareEditor::ReloadItems()
-{
-    CDatabaseFrameWnd::ReloadItems();
-    ResetElementTreeControl();
-}
-
-void CLensFlareEditor::OnRemoveItem()
-{
-    CLensFlareItem* pSelectedLensFlareItem = GetSelectedLensFlareItem();
-    CUndo undo(tr("Remove Flare Group Item").toUtf8());
-
-    if (pSelectedLensFlareItem == NULL)
-    {
-        QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-        if (selected.isEmpty())
-        {
-            return;
-        }
-
-        QModelIndex hLensFlareItem = selected.first();
-
-        QString fullLensFlareItemName = m_pLibraryItemTreeModel->GetFullName(hLensFlareItem);
-
-        if (!fullLensFlareItemName.isEmpty())
-        {
-            QString deleteMsgStr = tr("Delete %1?").arg(fullLensFlareItemName);
-            if (QMessageBox::question(this, tr("Confirmation"), deleteMsgStr) == QMessageBox::Yes)
-            {
-                CLensFlareLibrary* pLensFlareLibrary = GetCurrentLibrary();
-                if (pLensFlareLibrary)
-                {
-                    std::vector< _smart_ptr<CLensFlareItem> > deletedItems;
-                    for (int i = 0, iItemCount(pLensFlareLibrary->GetItemCount()); i < iItemCount; ++i)
-                    {
-                        CLensFlareItem* pItem = (CLensFlareItem*)pLensFlareLibrary->GetItem(i);
-                        if (pItem == NULL)
-                        {
-                            continue;
-                        }
-                        if (pItem->GetName().indexOf(fullLensFlareItemName) == -1)
-                        {
-                            continue;
-                        }
-                        QModelIndex hFlareItem = m_pLibraryItemTreeModel->index(pItem);
-                        if (hFlareItem.isValid())
-                        {
-                            UpdateLensOpticsNames(pItem->GetFullName(), "");
-                            deletedItems.push_back(pItem);
-                        }
-                    }
-                    for (int i = 0, iDeleteItemSize(deletedItems.size()); i < iDeleteItemSize; ++i)
-                    {
-                        m_pLensFlareLightEntityTree->OnLensFlareDeleteItem(deletedItems[i]);
-                        DeleteItem(deletedItems[i]);
-                    }
-
-                    m_pLibraryItemTreeModel->removeRow(hLensFlareItem.row(), hLensFlareItem.parent());
-                }
-                GetIEditor()->SetModifiedFlag();
-            }
-        }
-    }
-    else
-    {
-        QString deleteMsgStr = tr("Delete %1?").arg(pSelectedLensFlareItem->GetName());
-        // Remove prototype from prototype manager and library.
-        if (QMessageBox::question(this, tr("Confirmation"), deleteMsgStr) == QMessageBox::Yes)
-        {
-            m_pLensFlareLightEntityTree->OnLensFlareDeleteItem(pSelectedLensFlareItem);
-
-            DeleteItem(pSelectedLensFlareItem);
-
-            UpdateLensOpticsNames(pSelectedLensFlareItem->GetFullName(), "");
-
-            QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-            if (!selected.isEmpty())
-            {
-                QModelIndex hLensFlareItem = selected.first();
-                m_pLibraryItemTreeModel->removeRow(hLensFlareItem.row(), hLensFlareItem.parent());
-            }
-
-            m_pCurrentItem = NULL;
-
-            GetIEditor()->SetModifiedFlag();
-            SelectItem(0);
-        }
-    }
-}
-
-void CLensFlareEditor::OnAddLibrary()
-{
-    StringDlg dlg(tr("Library Name"), this);
-
-    dlg.SetCheckCallback([this](QString library) -> bool
-    {
-        QString path = m_pItemManager->MakeFilename(library);
-        if (CFileUtil::FileExists(path))
-        {
-            QMessageBox::warning(this, tr("Library exists"), tr("Library '%1' already exists.").arg(library));
-            return false;
-        }
-        return true;
-    });
-
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        if (!dlg.GetString().isEmpty())
-        {
-            SelectItem(0);
-            // Make new library.
-            QString library = dlg.GetString();
-            NewLibrary(library);
-            ReloadLibs();
-            SelectLibrary(library);
-            GetIEditor()->SetModifiedFlag();
-        }
-    }
-}
-
-void CLensFlareEditor::OnRenameItem()
-{
-    QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-    StartEditItem(selected.first());
-}
-
-void CLensFlareEditor::OnReloadLib()
-{
-    CDatabaseFrameWnd::OnReloadLib();
-    CLensFlareLibrary* pLibrary = GetCurrentLibrary();
-    if (pLibrary == NULL)
-    {
-        return;
-    }
-    for (int i = 0, iItemCount(pLibrary->GetItemCount()); i < iItemCount; ++i)
-    {
-        CLensFlareItem* pItem = (CLensFlareItem*)pLibrary->GetItem(i);
-        if (pItem == NULL)
-        {
-            continue;
-        }
-        pItem->UpdateLights(NULL);
-    }
-}
-
-void CLensFlareEditor::RegisterLensFlareItemChangeListener(ILensFlareChangeItemListener* pListener)
-{
-    for (int i = 0, iSize(m_LensFlareChangeItemListenerList.size()); i < iSize; ++i)
-    {
-        if (m_LensFlareChangeItemListenerList[i] == pListener)
-        {
-            return;
-        }
-    }
-    m_LensFlareChangeItemListenerList.push_back(pListener);
-}
-
-void CLensFlareEditor::UnregisterLensFlareItemChangeListener(ILensFlareChangeItemListener* pListener)
-{
-    auto iter = m_LensFlareChangeItemListenerList.begin();
-    for (; iter != m_LensFlareChangeItemListenerList.end(); ++iter)
-    {
-        if (*iter == pListener)
-        {
-            m_LensFlareChangeItemListenerList.erase(iter);
-            return;
-        }
-    }
-}
-
-void CLensFlareEditor::OnItemTreeDataRenamed(CBaseLibraryItem* pItem, const QString& prevFullName)
-{
-    CLensFlareItem* pLensFlareItem = static_cast<CLensFlareItem*>(pItem);
-
-    UpdateLensOpticsNames(prevFullName, pLensFlareItem->GetFullName());
-    LensFlareUtil::ChangeOpticsRootName(pLensFlareItem->GetOptics(), pLensFlareItem->GetShortName());
-
-    if (pLensFlareItem == GetSelectedLensFlareItem())
-    {
-        UpdateLensFlareItem(pLensFlareItem);
-    }
-
-    GetIEditor()->GetLensFlareManager()->Modified();
-}
-
-void CLensFlareEditor::UpdateLensFlareItem(CLensFlareItem* pLensFlareItem)
-{
-    for (int i = 0, iSize(m_LensFlareChangeItemListenerList.size()); i < iSize; ++i)
-    {
-        m_LensFlareChangeItemListenerList[i]->OnLensFlareChangeItem(pLensFlareItem);
-    }
-}
-
-void CLensFlareEditor::OnLensFlareChangeElement(CLensFlareElement* pLensFlareElement)
-{
-    ReflectedPropertyControl* pPropertyCtrl = m_pWndProps;
-    pPropertyCtrl->RemoveAllItems();
-
-    if (pLensFlareElement == NULL)
-    {
-        return;
-    }
-
-    // Update properties in a property panel
-    if (pLensFlareElement && pLensFlareElement->GetProperties())
-    {
-        pPropertyCtrl->AddVarBlock(pLensFlareElement->GetProperties());
-        pPropertyCtrl->ExpandAllChildren(pPropertyCtrl->GetRootItem(), false);
-        pPropertyCtrl->setEnabled(true);
-    }
-}
-
-void CLensFlareEditor::AddNewItemByAtomicOptics(const QModelIndex& hSelectedItem, EFlareType flareType)
-{
-    if (!LensFlareUtil::IsValidFlare(flareType))
-    {
-        return;
-    }
-
-    QString groupName;
-    QModelIndex hParentItem = hSelectedItem.parent();
-    if (hParentItem.isValid())
-    {
-        groupName = hParentItem.data(Qt::DisplayRole).toString();
-    }
-    else
-    {
-        groupName = hSelectedItem.data(Qt::DisplayRole).toString();
-    }
-
-    FlareInfoArray::Props flareProps = FlareInfoArray::Get();
-    QString itemName = MakeValidName(groupName + QString(".") + flareProps.p[flareType].name,
-                            AZStd::bind(&CDatabaseFrameWnd::DoesItemExist, this, AZStd::placeholders::_1, AZStd::placeholders::_2));
-    CLensFlareItem* pNewItem = AddNewLensFlareItem(groupName, LensFlareUtil::GetShortName(itemName));
-
-    if (pNewItem)
-    {
-        pNewItem->GetOptics()->AddElement(gEnv->pOpticsManager->Create(flareType));
-        ReloadItems();
-        SelectLensFlareItem(GetTreeLensFlareItem(pNewItem), {});
-    }
-}
-
-void CLensFlareEditor::OnUpdateProperties([[maybe_unused]] IVariable* var)
-{
-    GetIEditor()->GetLensFlareManager()->Modified();
-}
-
-AssetSelectionModel CLensFlareEditor::GetAssetSelectionModel() const
-{
-    return AssetSelectionModel::AssetTypeSelection(AZ::AzTypeInfo<LmbrCentral::LensFlareAsset>::Uuid());
-}
-
-LensFlareItemTreeModel::LensFlareItemTreeModel(CDatabaseFrameWnd* pParent)
-    : LibraryItemTreeModel(pParent)
-{
-}
-
-QStringList LensFlareItemTreeModel::mimeTypes() const
-{
-    QStringList mimeTypes = LibraryItemTreeModel::mimeTypes();
-    mimeTypes << QStringLiteral("application/x-o3de-flaretypes");
-    return mimeTypes;
-}
-
-bool LensFlareItemTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
-{
-    if (LibraryItemTreeModel::dropMimeData(data, action, row, column, parent))
-    {
-        return true;
-    }
-
-    if (data->hasFormat(QStringLiteral("application/x-o3de-flaretypes")))
-    {
-        QByteArray encoded = data->data(QStringLiteral("application/x-o3de-flaretypes"));
-        QDataStream stream(&encoded, QIODevice::ReadOnly);
-
-        while (!stream.atEnd())
-        {
-            int flareType;
-            stream >> flareType;
-            static_cast<CLensFlareEditor*>(m_dialog)->AddNewItemByAtomicOptics(parent, static_cast<EFlareType>(flareType));
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-Qt::ItemFlags LensFlareItemTreeModel::flags(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return Qt::ItemFlags();
-    }
-
-    return LibraryItemTreeModel::flags(index) | Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled;
-}
-
-Qt::DropActions LensFlareItemTreeModel::supportedDragActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-Qt::DropActions LensFlareItemTreeModel::supportedDropActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-#include <LensFlareEditor/moc_LensFlareEditor.cpp>
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareEditor.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareEditor.h
deleted file mode 100644
index d5753fa332..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareEditor.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREEDITOR_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREEDITOR_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "DatabaseFrameWnd.h"
-#include "LensFlareUtil.h"
-#include "ILensFlareListener.h"
-#include "LensFlareItemTree.h"
-#include "UserMessageDefines.h"
-#endif
-
-#include <AzQtComponents/Components/DockMainWindow.h>
-
-namespace AzQtComponents
-{
-    class FancyDocking;
-}
-
-class CLensFlareView;
-class CLensFlareElementTree;
-class CLensFlareAtomicList;
-class CLensFlareElementPropertyView;
-class CLensFlareItem;
-class CLensFlareLibrary;
-class ReflectedPropertyControl;
-class CLensFlareLightEntityTree;
-class CLensFlareReferenceTree;
-
-class CLensFlareEditor
-    : public CDatabaseFrameWnd
-    , public ILensFlareChangeElementListener
-{
-    Q_OBJECT
-
-public:
-    static const GUID& GetClassID();
-    static void RegisterViewClass();
-
-    CLensFlareEditor(QWidget* pParent = nullptr);
-    ~CLensFlareEditor();
-
-    QMenu* createPopupMenu() override;
-
-    // CDatabaseFrameWnd overrides...
-    virtual void SelectItem(CBaseLibraryItem* item, bool bForceReload = false) override;
-
-    CLensFlareItem* GetSelectedLensFlareItem() const;
-    bool GetSelectedLensFlareName(QString& outName) const;
-    void UpdateLensFlareItem(CLensFlareItem* pLensFlareItem);
-    void ResetElementTreeControl();
-
-    CLensFlareLibrary* GetCurrentLibrary() const
-    {
-        if (m_pLibrary == NULL)
-        {
-            return NULL;
-        }
-        return (CLensFlareLibrary*)&(*m_pLibrary);
-    }
-
-    bool IsExistTreeItem(const QString& name, bool bExclusiveSelectedItem = false);
-    void RenameLensFlareItem(CLensFlareItem* pLensFlareItem, const QString& newGroupName, const QString& newShortName);
-
-    IOpticsElementBasePtr FindOptics(const QString& itemPath, const QString& opticsPath);
-
-    CLensFlareElementTree* GetLensFlareElementTree()
-    {
-        return m_pLensFlareElementTree;
-    }
-
-    CLensFlareView* GetLensFlareView() const
-    {
-        return m_pLensFlareView;
-    }
-
-    CLensFlareItemTree* GetLensFlareItemTree()
-    {
-        return m_LensFlareItemTree;
-    }
-
-    void RemovePropertyItems();
-
-    ReflectedPropertyControl* GetPropertyCtrl()
-    {
-        return m_pWndProps;
-    }
-
-    void UpdateLensOpticsNames(const QString& oldFullName, const QString& newFullName);
-    void SelectItemInLensFlareElementTreeByName(const QString& name);
-    void ReloadItems();
-
-    void RegisterLensFlareItemChangeListener(ILensFlareChangeItemListener* pListener);
-    void UnregisterLensFlareItemChangeListener(ILensFlareChangeItemListener* pListener);
-
-    bool SelectItemByName(const QString& itemName);
-
-    static CLensFlareEditor* GetLensFlareEditor()
-    {
-        return s_pLensFlareEditor;
-    }
-
-    bool GetFullSelectedFlareItemName(QString& outFullName) const
-    {
-        QModelIndexList selected = GetTreeCtrl()->selectionModel()->selectedIndexes();
-        if (selected.isEmpty())
-        {
-            return false;
-        }
-        return GetFullLensFlareItemName(selected.first(), outFullName);
-    }
-
-    void SelectLensFlareItem(const QString& fullItemName);
-
-    const char* GetClassName()
-    {
-        return s_pLensFlareEditorClassName;
-    }
-
-    void Paste(XmlNodeRef node);
-    void Paste(const QModelIndex& index, XmlNodeRef node);
-    XmlNodeRef CreateXML(const char* type) const;
-
-    static const char* s_pLensFlareEditorClassName;
-
-    QTreeView* GetTreeCtrl() override
-    {
-        return m_LensFlareItemTree;
-    }
-
-    const QTreeView* GetTreeCtrl() const override
-    {
-        return m_LensFlareItemTree;
-    }
-
-    void AddNewItemByAtomicOptics(const QModelIndex& hSelectedItem, EFlareType flareType);
-
-public slots:
-    void OnUpdateTreeCtrl();
-
-protected:
-    static CLensFlareEditor* s_pLensFlareEditor;
-
-    void OnInitDialog() override;
-
-    void OnCopy();
-    void OnPaste();
-    void OnCut();
-
-    void UpdateClipboard(const char* type) const;
-    bool GetClipboardDataList(std::vector<LensFlareUtil::SClipboardData>& outList, QString& outGroupName) const;
-    void OnLensFlareChangeElement(CLensFlareElement* pLensFlareElement);
-
-    void OnAddLibrary();
-    void OnAssignFlareToLightEntities();
-    void OnSelectAssignedObjects();
-    void OnGetFlareFromSelection();
-    void OnRenameItem();
-    void OnAddItem();
-    void OnRemoveItem();
-    void OnCopyNameToClipboard();
-    void OnNotifyTreeRClick();
-
-    void OnTvnItemSelChanged(const QItemSelection& selected, const QItemSelection& deselected);
-    void OnReloadLib();
-    void ReleaseWindowsToBePutIntoPanels();
-    void SelectLensFlareItem(const QModelIndex& hItem);
-    void SelectLensFlareItem(const QModelIndex& hItem, const QModelIndex& hPrevItem);
-
-    void StartEditItem(const QModelIndex& hItem);
-    bool GetFullLensFlareItemName(const QModelIndex& hItem, QString& outFullName) const;
-    AssetSelectionModel GetAssetSelectionModel() const override;
-
-    CLensFlareItem* AddNewLensFlareItem(const QString& groupName, const QString& shortName);
-    QModelIndex GetTreeLensFlareItem(CLensFlareItem* pItem) const;
-
-    void OnItemTreeDataRenamed(CBaseLibraryItem* pItem, const QString& prevFullName);
-
-    enum ESelectedItemStatus
-    {
-        eSIS_Unselected,
-        eSIS_Group,
-        eSIS_Flare
-    };
-    ESelectedItemStatus GetSelectedItemStatus() const;
-
-    void addDockWidget(Qt::DockWidgetArea area, QWidget* widget, const QString& title, bool closable = true);
-    void OnUpdateProperties(IVariable* var);
-
-private:
-
-    CLensFlareView* m_pLensFlareView;
-    CLensFlareAtomicList* m_pLensFlareAtomicList;
-    CLensFlareElementTree* m_pLensFlareElementTree;
-    ReflectedPropertyControl* m_pWndProps;
-    CLensFlareLightEntityTree* m_pLensFlareLightEntityTree;
-    CLensFlareReferenceTree* m_pLensFlareReferenceTree;
-    CLensFlareItemTree* m_LensFlareItemTree;
-
-    std::vector<ILensFlareChangeItemListener*> m_LensFlareChangeItemListenerList;
-    AzQtComponents::FancyDocking* m_advancedDockManager = nullptr;
-};
-
-class LensFlareItemTreeModel
-    : public LibraryItemTreeModel
-{
-    Q_OBJECT
-
-public:
-    LensFlareItemTreeModel(CDatabaseFrameWnd* pParent);
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-
-    QStringList mimeTypes() const override;
-    bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
-    Qt::DropActions supportedDragActions() const override;
-    Qt::DropActions supportedDropActions() const override;
-};
-
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREEDITOR_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElement.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareElement.cpp
deleted file mode 100644
index a51c788a8b..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElement.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareElement.h"
-
-// Editor
-#include "LensFlareElementTree.h"
-#include "LensFlareUtil.h"
-#include "LensFlareItem.h"
-#include "LensFlareEditor.h"
-#include "LensFlareView.h"
-#include "LensFlareLibrary.h"
-
-
-CLensFlareElement::CLensFlareElement()
-    : m_vars(NULL)
-    , m_pOpticsElement(NULL)
-    , m_pParent(NULL)
-{
-}
-
-CLensFlareElement::~CLensFlareElement()
-{
-}
-
-void CLensFlareElement::OnInternalVariableChange(IVariable* pVar)
-{
-    IOpticsElementBasePtr pOptics = GetOpticsElement();
-    if (pOptics == NULL)
-    {
-        return;
-    }
-
-    IFuncVariable* pFuncVar = LensFlareUtil::GetFuncVariable(pOptics, pVar->GetUserData().toInt());
-    if (pFuncVar == NULL)
-    {
-        return;
-    }
-
-    switch (pVar->GetType())
-    {
-    case IVariable::INT:
-    {
-        int var(0);
-        pVar->Get(var);
-        if (pFuncVar->paramType == e_COLOR)
-        {
-            ColorF color(pFuncVar->GetColorF());
-            color.a = (float)var / 255.0f;
-            pFuncVar->InvokeSetter((void*)&color);
-        }
-        else if (pFuncVar->paramType == e_INT)
-        {
-            if (LensFlareUtil::HaveParameterLowBoundary(pFuncVar->name.c_str()))
-            {
-                LensFlareUtil::BoundaryProcess(var);
-            }
-            pFuncVar->InvokeSetter((void*)&var);
-            if (pFuncVar->GetInt() != var)
-            {
-                pVar->Set(pFuncVar->GetInt());
-            }
-        }
-    }
-    break;
-    case IVariable::BOOL:
-    {
-        if (pFuncVar->paramType == e_BOOL)
-        {
-            bool var;
-            pVar->Get(var);
-            pFuncVar->InvokeSetter((void*)&var);
-        }
-    }
-    break;
-    case IVariable::FLOAT:
-    {
-        if (pFuncVar->paramType == e_FLOAT)
-        {
-            float var;
-            pVar->Get(var);
-            pFuncVar->InvokeSetter((void*)&var);
-        }
-    }
-    break;
-    case IVariable::VECTOR2:
-    {
-        if (pFuncVar->paramType == e_VEC2)
-        {
-            Vec2 var;
-            pVar->Get(var);
-            pFuncVar->InvokeSetter((void*)&var);
-        }
-    }
-    break;
-    case IVariable::VECTOR:
-    {
-        Vec3 var;
-        pVar->Get(var);
-        if (pFuncVar->paramType == e_COLOR)
-        {
-            ColorF color(pFuncVar->GetColorF());
-            color.r = var.x;
-            color.g = var.y;
-            color.b = var.z;
-            pFuncVar->InvokeSetter((void*)&color);
-        }
-        else if (pFuncVar->paramType == e_VEC3)
-        {
-            pFuncVar->InvokeSetter((void*)&var);
-        }
-    }
-    break;
-    case IVariable::VECTOR4:
-    {
-        if (pFuncVar->paramType == e_VEC4)
-        {
-            Vec4 var;
-            pVar->Get(var);
-            pFuncVar->InvokeSetter((void*)&var);
-        }
-    }
-    break;
-    case IVariable::STRING:
-    {
-        QString var;
-        pVar->Get(var);
-        if (pFuncVar->paramType == e_TEXTURE2D || pFuncVar->paramType == e_TEXTURE3D || pFuncVar->paramType == e_TEXTURE_CUBE)
-        {
-            var = var.trimmed();
-            ITexture* pTexture = NULL;
-            if (!var.isEmpty())
-            {
-                pTexture = GetIEditor()->GetRenderer()->EF_LoadTexture(var.toUtf8().data());
-            }
-            pFuncVar->InvokeSetter((void*)pTexture);
-            if (pTexture)
-            {
-                pTexture->Release();
-            }
-        }
-    }
-    break;
-    }
-
-    UpdateLights();
-}
-
-bool CLensFlareElement::IsEnable()
-{
-    IOpticsElementBasePtr pOptics = GetOpticsElement();
-    if (pOptics == NULL)
-    {
-        return false;
-    }
-    return pOptics->IsEnabled();
-}
-
-void CLensFlareElement::SetEnable(bool bEnable)
-{
-    IOpticsElementBasePtr pOptics = GetOpticsElement();
-    if (pOptics == NULL)
-    {
-        return;
-    }
-    pOptics->SetEnabled(bEnable);
-    UpdateLights();
-}
-
-EFlareType CLensFlareElement::GetOpticsType()
-{
-    IOpticsElementBasePtr pOptics = GetOpticsElement();
-    if (pOptics == NULL)
-    {
-        return eFT__Base__;
-    }
-    return pOptics->GetType();
-}
-
-bool CLensFlareElement::GetShortName(QString& outName) const
-{
-    QString fullName;
-    if (!GetName(fullName))
-    {
-        return false;
-    }
-    int nPos = fullName.lastIndexOf('.');
-    if (nPos == -1)
-    {
-        outName = fullName;
-        return true;
-    }
-    outName = fullName.right(fullName.length() - nPos - 1);
-    return true;
-}
-
-void CLensFlareElement::UpdateLights()
-{
-    IOpticsElementBasePtr pOptics = GetOpticsElement();
-    if (pOptics == NULL)
-    {
-        return;
-    }
-    if (GetLensFlareTree())
-    {
-        if (GetLensFlareTree()->GetLensFlareItem())
-        {
-            GetLensFlareTree()->GetLensFlareItem()->UpdateLights(pOptics);
-        }
-    }
-}
-
-void CLensFlareElement::UpdateProperty(IOpticsElementBasePtr pOptics)
-{
-    std::vector<IVariable::OnSetCallback*> funcs;
-
-    if (CLensFlareElementTree* lensFlareTree = GetLensFlareTree(); lensFlareTree)
-    {
-        auto callbackItr = m_callbackCache.find(lensFlareTree);
-        if (callbackItr == m_callbackCache.end())
-        {
-            IVariable::OnSetCallback callback =
-                AZStd::bind(&CLensFlareElementTree::OnInternalVariableChange, lensFlareTree, AZStd::placeholders::_1);
-
-            auto result = m_callbackCache.insert(AZStd::make_pair(lensFlareTree, callback));
-            callbackItr = result.first;
-        }
-
-        funcs.push_back(&(callbackItr->second));
-    }
-
-    if (CLensFlareView* lensFlareView = GetLensFlareView(); lensFlareView)
-    {
-        auto callbackItr = m_callbackCache.find(lensFlareView);
-        if (callbackItr == m_callbackCache.end())
-        {
-            IVariable::OnSetCallback callback =
-                AZStd::bind(&CLensFlareView::OnInternalVariableChange, lensFlareView, AZStd::placeholders::_1);
-
-            auto result = m_callbackCache.insert(AZStd::make_pair(lensFlareView, callback));
-            callbackItr = result.first;
-        }
-
-        funcs.push_back(&(callbackItr->second));
-    }
-
-    if (CLensFlareLibrary* lensFlareLibrary = GetLensFlareLibrary(); lensFlareLibrary)
-    {
-        auto callbackItr = m_callbackCache.find(lensFlareLibrary);
-        if (callbackItr == m_callbackCache.end())
-        {
-            IVariable::OnSetCallback callback =
-                AZStd::bind(&CLensFlareLibrary::OnInternalVariableChange, lensFlareLibrary, AZStd::placeholders::_1);
-
-            auto result = m_callbackCache.insert(AZStd::make_pair(lensFlareLibrary, callback));
-            callbackItr = result.first;
-        }
-
-        funcs.push_back(&(callbackItr->second));
-    }
-
-    LensFlareUtil::SetVariablesTemplateFromOptics(pOptics, m_vars, funcs);
-}
-
-CLensFlareElementTree* CLensFlareElement::GetLensFlareTree() const
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return NULL;
-    }
-    return pEditor->GetLensFlareElementTree();
-}
-
-CLensFlareView* CLensFlareElement::GetLensFlareView() const
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return NULL;
-    }
-    return pEditor->GetLensFlareView();
-}
-
-CLensFlareLibrary* CLensFlareElement::GetLensFlareLibrary() const
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return NULL;
-    }
-    return pEditor->GetCurrentLibrary();
-}
-
-CLensFlareElement* CLensFlareElement::GetParent() const
-{
-    return m_pParent;
-}
-
-void CLensFlareElement::SetParent(CLensFlareElement* pParent)
-{
-    m_pParent = pParent;
-}
-
-int CLensFlareElement::GetChildCount() const
-{
-    return m_children.size();
-}
-
-CLensFlareElement* CLensFlareElement::GetChildAt(int nPos) const
-{
-    if (nPos < 0 || nPos >= m_children.size())
-    {
-        return nullptr;
-    }
-    return m_children[nPos];
-}
-
-void CLensFlareElement::AddChild(CLensFlareElement* pElement)
-{
-    pElement->SetParent(this);
-    m_children.push_back(pElement);
-}
-
-void CLensFlareElement::InsertChild(int nPos, CLensFlareElement* pElement)
-{
-    pElement->SetParent(this);
-    m_children.insert(std::begin(m_children) + nPos, pElement);
-}
-
-void CLensFlareElement::RemoveChild(int nPos)
-{
-    m_children.erase(std::begin(m_children) + nPos);
-}
-
-void CLensFlareElement::SwapChildren(int nPos1, int nPos2)
-{
-    std::swap(m_children[nPos1], m_children[nPos2]);
-}
-
-void CLensFlareElement::RemoveAllChildren()
-{
-    m_children.clear();
-}
-
-int CLensFlareElement::GetChildIndex(const CLensFlareElement* pElement) const
-{
-    auto it = std::find_if(
-            std::begin(m_children),
-            std::end(m_children),
-            [=](const LensFlareElementPtr& pChild)
-            {
-                return pChild.get() == pElement;
-            });
-
-    if (it != std::end(m_children))
-    {
-        return std::distance(std::begin(m_children), it);
-    }
-    else
-    {
-        return -1;
-    }
-}
-
-int CLensFlareElement::GetRow() const
-{
-    return m_pParent ? m_pParent->GetChildIndex(this) : 0;
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElement.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareElement.h
deleted file mode 100644
index 9860fa597e..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElement.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREELEMENT_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREELEMENT_H
-#pragma once
-
-#include "IFlares.h"
-
-#include "Util/Variable.h"
-
-class CLensFlareElementTree;
-class CLensFlareView;
-class CLensFlareLibrary;
-
-class CLensFlareElement
-    : public CRefCountBase
-{
-public:
-
-    typedef _smart_ptr<CLensFlareElement> LensFlareElementPtr;
-    typedef std::vector<LensFlareElementPtr> LensFlareElementList;
-
-    CLensFlareElement();
-    virtual ~CLensFlareElement();
-
-    CVarBlock* GetProperties() const
-    {
-        return m_vars;
-    }
-
-    void OnInternalVariableChange(IVariable* pVar);
-
-    bool IsEnable();
-    void SetEnable(bool bEnable);
-    EFlareType GetOpticsType();
-
-    bool GetName(QString& outName) const
-    {
-        IOpticsElementBasePtr pOptics = GetOpticsElement();
-        if (pOptics == NULL)
-        {
-            return false;
-        }
-        outName = pOptics->GetName();
-        return true;
-    }
-
-    bool GetShortName(QString& outName) const;
-    IOpticsElementBasePtr GetOpticsElement() const
-    {
-        return m_pOpticsElement;
-    }
-    void SetOpticsElement(IOpticsElementBasePtr pOptics)
-    {
-        m_pOpticsElement = pOptics;
-        UpdateProperty(m_pOpticsElement);
-    }
-
-    CLensFlareElement* GetParent() const;
-    void SetParent(CLensFlareElement* pParent);
-
-    int GetChildCount() const;
-    CLensFlareElement* GetChildAt(int nPos) const;
-
-    void AddChild(CLensFlareElement* pElement);
-    void InsertChild(int nPos, CLensFlareElement* pElement);
-
-    void RemoveChild(int nPos);
-    void RemoveAllChildren();
-
-    void SwapChildren(int nPos1, int nPos2);
-
-    int GetChildIndex(const CLensFlareElement* pChild) const;
-    int GetRow() const;
-
-private:
-
-    void UpdateLights();
-    void UpdateProperty(IOpticsElementBasePtr pOptics);
-
-    CLensFlareElementTree* GetLensFlareTree() const;
-    CLensFlareView* GetLensFlareView() const;
-    CLensFlareLibrary* GetLensFlareLibrary() const;
-
-private:
-
-    IOpticsElementBasePtr m_pOpticsElement;
-    CVarBlockPtr m_vars;
-
-    CLensFlareElement* m_pParent;
-    LensFlareElementList m_children;
-
-    AZStd::map<void*, IVariable::OnSetCallback> m_callbackCache;
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREELEMENT_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.cpp
deleted file mode 100644
index be687a5469..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.cpp
+++ /dev/null
@@ -1,1393 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareElementTree.h"
-
-// Qt
-#include <QMimeData>
-#include <QMenu>
-#include <QMessageBox>
-
-// Editor
-#include "Clipboard.h"
-#include "LensFlareItem.h"
-#include "LensFlareManager.h"
-#include "LensFlareUndo.h"
-#include "LensFlareEditor.h"
-#include "LensFlareLibrary.h"
-
-
-template <typename Predicate>
-static CLensFlareElement* FindLensFlareElement(CLensFlareElement* pRoot, Predicate pred)
-{
-    if (pred(pRoot))
-    {
-        return pRoot;
-    }
-
-    for (int i = 0, childCount = pRoot->GetChildCount(); i < childCount; i++)
-    {
-        if (CLensFlareElement* pElement = FindLensFlareElement(pRoot->GetChildAt(i), pred))
-        {
-            return pElement;
-        }
-    }
-
-    return nullptr;
-}
-
-CLensFlareElementTree::CLensFlareElementTree(QWidget* pParent)
-    : QTreeView(pParent)
-    , m_model(new LensFlareElementTreeModel(this))
-{
-    setHeaderHidden(true);
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    setDragEnabled(true);
-    setAcceptDrops(true);
-    setDropIndicatorShown(true);
-    setDragDropMode(DragDrop);
-
-    setModel(m_model.data());
-
-    connect(this, &QWidget::customContextMenuRequested, this, &CLensFlareElementTree::OnNotifyTreeRClick);
-    connect(selectionModel(), &QItemSelectionModel::selectionChanged, this, &CLensFlareElementTree::OnTvnSelchangedTree);
-    connect(model(), &QAbstractItemModel::dataChanged, this, &CLensFlareElementTree::OnDataChanged);
-    connect(model(), &QAbstractItemModel::rowsInserted, this, &CLensFlareElementTree::OnRowsInserted);
-    connect(model(), &QAbstractItemModel::rowsRemoved, this, &CLensFlareElementTree::OnRowsRemoved);
-    connect(model(), &QAbstractItemModel::modelReset, this, &QTreeView::expandAll);
-}
-
-void CLensFlareElementTree::OnInternalVariableChange(IVariable* pVar)
-{
-    CLensFlareElement::LensFlareElementPtr pCurrentElement = GetCurrentLensFlareElement();
-    if (pCurrentElement == NULL)
-    {
-        return;
-    }
-    pCurrentElement->OnInternalVariableChange(pVar);
-}
-
-CLensFlareElement* CLensFlareElementTree::GetCurrentLensFlareElement() const
-{
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return nullptr;
-    }
-    return selected.first().data(Qt::UserRole).value<CLensFlareElement*>();
-}
-
-void CLensFlareElementTree::OnNotifyTreeRClick()
-{
-    CLensFlareElement* pElement = GetCurrentLensFlareElement();
-
-    // Copy, Cut and Clone can't be done about a Root item so those menus should be disable when the selected item is a root item.
-    bool bGrayed = false;
-    if (!pElement || pElement->GetOpticsType() == eFT_Root)
-    {
-        bGrayed = true;
-    }
-
-    QMenu menu;
-
-    QAction* actionDBFlareAddGroup = menu.addAction(tr("Add Group"));
-    connect(actionDBFlareAddGroup, &QAction::triggered, this, &CLensFlareElementTree::OnAddGroup);
-
-    menu.addSeparator();
-
-    QAction* actionDBFlareCopy = menu.addAction(tr("Copy"));
-    connect(actionDBFlareCopy, &QAction::triggered, this, &CLensFlareElementTree::OnCopy);
-
-    QAction* actionDBFlareCut = menu.addAction(tr("Cut"));
-    actionDBFlareCut->setEnabled(!bGrayed);
-    connect(actionDBFlareCut, &QAction::triggered, this, &CLensFlareElementTree::OnCut);
-
-    QAction* actionDBFlarePaste = menu.addAction(tr("Paste"));
-    connect(actionDBFlarePaste, &QAction::triggered, this, &CLensFlareElementTree::OnPaste);
-
-    QAction* actionDBFlareClone = menu.addAction(tr("Clone"));
-    connect(actionDBFlareClone, &QAction::triggered, this, &CLensFlareElementTree::OnClone);
-
-    menu.addSeparator();
-
-    QAction* actionDBFlareRename = menu.addAction(tr("Rename\tF2"));
-    connect(actionDBFlareRename, &QAction::triggered, this, &CLensFlareElementTree::OnRenameItem);
-
-    QAction* actionDBFlareRemove = menu.addAction(tr("Delete\tDel"));
-    connect(actionDBFlareRemove, &QAction::triggered, this, &CLensFlareElementTree::OnRemoveItem);
-
-    QAction* actionDBFlareRemoveAll = menu.addAction(tr("Delete All"));
-    connect(actionDBFlareRemoveAll, &QAction::triggered, this, &CLensFlareElementTree::OnRemoveAll);
-
-    menu.addSeparator();
-
-    QAction* actionDBFlareItemUp = menu.addAction(tr("Up"));
-    connect(actionDBFlareItemUp, &QAction::triggered, this, &CLensFlareElementTree::OnItemUp);
-
-    QAction* actionDBFlareItemDown = menu.addAction(tr("Down"));
-    connect(actionDBFlareItemDown, &QAction::triggered, this, &CLensFlareElementTree::OnItemDown);
-
-    menu.exec(QCursor::pos());
-}
-
-void CLensFlareElementTree::OnTvnSelchangedTree([[maybe_unused]] const QItemSelection& selected, const QItemSelection& deselected)
-{
-    QModelIndexList deselectedIndices = deselected.indexes();
-    if (!deselectedIndices.isEmpty())
-    {
-        CLensFlareElement* pPrevLensFlareElement = deselectedIndices.first().data(Qt::UserRole).value<CLensFlareElement*>();
-        ElementChanged(pPrevLensFlareElement);
-    }
-
-    CallChangeListeners();
-}
-
-void CLensFlareElementTree::ElementChanged(CLensFlareElement* pPrevLensFlareElement)
-{
-    if (!pPrevLensFlareElement)
-    {
-        return;
-    }
-    QString itemName;
-    if (pPrevLensFlareElement->GetName(itemName))
-    {
-        if (CUndo::IsRecording())
-        {
-            CUndo::Record(new CUndoLensFlareElementSelection(m_model->GetLensFlareItem(), itemName));
-        }
-    }
-}
-
-void CLensFlareElementTree::OnDataChanged([[maybe_unused]] const QModelIndex& index)
-{
-    CallChangeListeners();
-}
-
-void CLensFlareElementTree::OnRowsInserted(const QModelIndex& parent, int first, [[maybe_unused]] int last)
-{
-    if (parent.isValid())
-    {
-        expand(parent);
-        SelectItem(parent.model()->index(first, 0, parent));
-        CallChangeListeners();
-    }
-}
-
-void CLensFlareElementTree::OnRowsRemoved(const QModelIndex& parent, int first, [[maybe_unused]] int last)
-{
-    if (parent.isValid())
-    {
-        SelectItem(parent.model()->index(first, 0, parent));
-        CallChangeListeners();
-    }
-}
-
-void CLensFlareElementTree::keyPressEvent(QKeyEvent* event)
-{
-    if (event->key() == Qt::Key_F2)
-    {
-        OnRenameItem();
-        event->accept();
-        return;
-    }
-    else if (event->matches(QKeySequence::Delete))
-    {
-        OnRemoveItem();
-        event->accept();
-        return;
-    }
-
-    QTreeView::keyPressEvent(event);
-}
-
-XmlNodeRef CLensFlareElementTree::CreateXML(const char* type) const
-{
-    std::vector<LensFlareUtil::SClipboardData> clipboardData;
-    if (GetClipboardList(type, clipboardData))
-    {
-        return LensFlareUtil::CreateXMLFromClipboardData(type, "", false, clipboardData);
-    }
-    return NULL;
-}
-
-void CLensFlareElementTree::UpdateClipboard(const char* type, bool bPasteAtSameLevel)
-{
-    std::vector<LensFlareUtil::SClipboardData> clipboardData;
-    if (GetClipboardList(type, clipboardData))
-    {
-        LensFlareUtil::UpdateClipboard(type, "", bPasteAtSameLevel, clipboardData);
-    }
-}
-
-bool CLensFlareElementTree::GetClipboardList([[maybe_unused]] const char* type, std::vector<LensFlareUtil::SClipboardData>& outList) const
-{
-    CLensFlareElement::LensFlareElementPtr pElement = GetCurrentLensFlareElement();
-    if (pElement == NULL)
-    {
-        return false;
-    }
-    QString name;
-    if (!pElement->GetName(name))
-    {
-        return false;
-    }
-
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return false;
-    }
-
-    CLensFlareItem* pLensFlareItem = pEditor->GetSelectedLensFlareItem();
-    if (pLensFlareItem == NULL)
-    {
-        return false;
-    }
-
-    outList.push_back(LensFlareUtil::SClipboardData(LENSFLARE_ELEMENT_TREE, pLensFlareItem->GetFullName(), name));
-
-    return true;
-}
-
-void CLensFlareElementTree::OnAddGroup()
-{
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-
-    CUndo undo(tr("Add library item").toUtf8());
-    m_model->AddElement(selected.first(), 0, eFT_Group);
-    GetIEditor()->GetLensFlareManager()->Modified();
-}
-
-void CLensFlareElementTree::OnCopy()
-{
-    UpdateClipboard(FLARECLIPBOARDTYPE_COPY, false);
-}
-
-void CLensFlareElementTree::OnCut()
-{
-    Cut(false);
-}
-
-void CLensFlareElementTree::Cut(bool bPasteAtSameLevel)
-{
-    UpdateClipboard(FLARECLIPBOARDTYPE_CUT, bPasteAtSameLevel);
-}
-
-CLensFlareItem* CLensFlareElementTree::GetLensFlareItem() const
-{
-    return m_model->GetLensFlareItem();
-}
-
-void CLensFlareElementTree::OnPaste()
-{
-    CClipboard clipboard(this);
-    if (clipboard.IsEmpty())
-    {
-        return;
-    }
-
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-
-    XmlNodeRef xmlNode = clipboard.Get();
-    if (xmlNode == NULL)
-    {
-        return;
-    }
-
-    CUndo undo(tr("Copy/Cut & Paste library item").toUtf8());
-    m_model->Paste(selected.first(), xmlNode);
-}
-
-void CLensFlareElementTree::OnClone()
-{
-    OnCopy();
-    OnPaste();
-}
-
-void CLensFlareElementTree::OnRenameItem()
-{
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-    edit(selected.first());
-}
-
-void CLensFlareElementTree::OnRemoveItem()
-{
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-
-    QModelIndex index = selected.first();
-
-    // A root item must not be removed.
-    if (!index.parent().isValid())
-    {
-        return;
-    }
-
-    CLensFlareElement::LensFlareElementPtr pCurrentElement = m_model->GetLensFlareElement(index);
-    if (pCurrentElement == NULL)
-    {
-        return;
-    }
-
-    QString name;
-    pCurrentElement->GetName(name);
-
-    QString str = tr("Delete %1?").arg(name);
-    if (QMessageBox::question(this, tr("Delete Confirmation"), str) == QMessageBox::Yes)
-    {
-        CUndo undo(tr("Remove an optics element").toUtf8());
-        m_model->removeRow(index.row(), index.parent());
-    }
-}
-
-void CLensFlareElementTree::OnRemoveAll()
-{
-    CUndo undo(tr("Remove All in FlareTreeCtrl").toUtf8());
-
-    if (QMessageBox::question(this, tr("Delete Confirmation"), tr("Do you want delete all?")) == QMessageBox::Yes)
-    {
-        m_model->RemoveAllElements();
-        GetIEditor()->GetLensFlareManager()->Modified();
-    }
-}
-
-void CLensFlareElementTree::OnItemUp()
-{
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-
-    QModelIndex index = selected.first();
-    int row = index.row();
-    if (row == 0)
-    {
-        return;
-    }
-
-    CUndo undo(tr("Copy/Cut & Paste library item").toUtf8());
-
-    CLensFlareElement* pElement = index.data(Qt::UserRole).value<CLensFlareElement*>();
-    m_model->MoveElement(pElement, row - 1, index.parent());
-}
-
-void CLensFlareElementTree::OnItemDown()
-{
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-
-    QModelIndex index = selected.first();
-    int row = index.row();
-    if (row == m_model->rowCount(index.parent()) - 1)
-    {
-        return;
-    }
-
-    CUndo undo(tr("Copy/Cut & Paste library item").toUtf8());
-
-    CLensFlareElement* pElement = index.data(Qt::UserRole).value<CLensFlareElement*>();
-    m_model->MoveElement(pElement, row + 2, index.parent());
-}
-
-void CLensFlareElementTree::SelectItem(const QModelIndex& index)
-{
-    if (index.isValid())
-    {
-        expand(index.parent());
-        selectionModel()->select(index, QItemSelectionModel::ClearAndSelect);
-    }
-    else
-    {
-        selectionModel()->clear();
-    }
-}
-
-void CLensFlareElementTree::SelectTreeItemByName(const QString& name)
-{
-    SelectItem(m_model->GetTreeItemByName(name));
-}
-
-void CLensFlareElementTree::CallChangeListeners()
-{
-    CLensFlareElement* pElement = GetCurrentLensFlareElement();
-    for (int i = 0, iSize(m_LensFlaresElementListeners.size()); i < iSize; ++i)
-    {
-        m_LensFlaresElementListeners[i]->OnLensFlareChangeElement(pElement);
-    }
-}
-
-void CLensFlareElementTree::mousePressEvent(QMouseEvent* event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        CUndo undo(tr("Changed Lens flares element").toUtf8());
-        QTreeView::mousePressEvent(event);
-    }
-    else
-    {
-        QTreeView::mousePressEvent(event);
-    }
-}
-
-void CLensFlareElementTree::InvalidateLensFlareItem()
-{
-    m_model->InvalidateLensFlareItem();
-}
-
-LensFlareElementTreeModel::LensFlareElementTreeModel(QObject* pParent)
-    : QAbstractItemModel(pParent)
-    , m_pRootElement(new CLensFlareElement)
-{
-    CLensFlareEditor::GetLensFlareEditor()->RegisterLensFlareItemChangeListener(this);
-}
-
-LensFlareElementTreeModel::~LensFlareElementTreeModel()
-{
-    CLensFlareEditor::GetLensFlareEditor()->UnregisterLensFlareItemChangeListener(this);
-}
-
-int LensFlareElementTreeModel::columnCount(const QModelIndex&) const
-{
-    return 1;
-}
-
-QVariant LensFlareElementTreeModel::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid())
-    {
-        return {};
-    }
-
-    auto pElement = static_cast<CLensFlareElement*>(index.internalPointer());
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    case Qt::EditRole:
-    {
-        QString shortName;
-        pElement->GetShortName(shortName);
-        return shortName;
-    }
-
-    case Qt::CheckStateRole:
-        return pElement->IsEnable() ? Qt::Checked : Qt::Unchecked;
-
-    case Qt::UserRole:
-        return QVariant::fromValue<CLensFlareElement*>(pElement);
-    }
-
-    return {};
-}
-
-void LensFlareElementTreeModel::EnableElement(CLensFlareElement* pLensFlareElement, bool bEnable)
-{
-    StoreUndo();
-    pLensFlareElement->SetEnable(bEnable);
-}
-
-void LensFlareElementTreeModel::RenameElement(CLensFlareElement* pLensFlareElement, const QString& newName)
-{
-    StoreUndo();
-    IOpticsElementBasePtr pOptics = pLensFlareElement->GetOpticsElement();
-    if (pOptics)
-    {
-        pOptics->SetName(newName.toUtf8().data());
-        LensFlareUtil::UpdateOpticsName(pOptics);
-    }
-}
-
-QModelIndex LensFlareElementTreeModel::GetRootItem() const
-{
-    if (m_pRootElement->GetChildCount() == 0)
-    {
-        return {};
-    }
-
-    auto pRootElement = m_pRootElement->GetChildAt(0);
-    assert(pRootElement->GetOpticsType() == eFT_Root);
-
-    return createIndex(0, 0, pRootElement);
-}
-
-bool LensFlareElementTreeModel::setData(const QModelIndex& index, const QVariant& value, int role)
-{
-    if (!index.isValid())
-    {
-        return false;
-    }
-
-    auto pElement = static_cast<CLensFlareElement*>(index.internalPointer());
-
-    switch (role)
-    {
-    case Qt::CheckStateRole:
-    {
-        CUndo undo(tr("Update an enable checkbox for tree ctrl.").toUtf8());
-        EnableElement(pElement, value.toInt() == Qt::Checked);
-        emit dataChanged(index, index);
-        return true;
-    }
-
-    case Qt::EditRole:
-    {
-        QString text = value.toString();
-
-        CUndo undo(tr("Rename library item").toUtf8());
-
-        if (IsExistElement(text))
-        {
-            QMessageBox::warning(0, tr("Warning"), tr("The identical name exists in a database"));
-            return false;
-        }
-        else if (text.contains(QLatin1Char('.')))
-        {
-            QMessageBox::warning(0, tr("Warning"), tr("The name must not contain \".\""));
-            return false;
-        }
-        else
-        {
-            CLensFlareElement* pLensFlareElement = GetLensFlareElement(index);
-
-            QString prevName;
-            if (pLensFlareElement && pLensFlareElement->GetName(prevName))
-            {
-                QString parentName(prevName);
-                int offset = parentName.lastIndexOf('.');
-                if (offset == -1)
-                {
-                    parentName = "";
-                }
-                else
-                {
-                    parentName.remove(offset + 1, parentName.length() - offset);
-                }
-
-                if (index == GetRootItem())
-                {
-                    CLensFlareEditor* pLensFlareEditor = CLensFlareEditor::GetLensFlareEditor();
-                    if (pLensFlareEditor)
-                    {
-                        CLensFlareItem* pLensFlareItem = pLensFlareEditor->GetSelectedLensFlareItem();
-                        if (pLensFlareItem)
-                        {
-                            QString candidateName = LensFlareUtil::ReplaceLastName(pLensFlareItem->GetName(), text);
-                            if (pLensFlareEditor->IsExistTreeItem(candidateName, true))
-                            {
-                                QMessageBox::warning(0, tr("Warning"), tr("The identical name exists in a database"));
-                                return false;
-                            }
-                            pLensFlareEditor->RenameLensFlareItem(pLensFlareItem, pLensFlareItem->GetGroupName(), text);
-                        }
-                    }
-                    else
-                    {
-                        QMessageBox::warning(0, tr("Warning"), tr("Renaming is not possible."));
-                        return false;
-                    }
-                }
-
-                RenameElement(pLensFlareElement, parentName + text);
-                emit dataChanged(index, index);
-
-                GetIEditor()->GetLensFlareManager()->Modified();
-            }
-
-            return true;
-        }
-    }
-    }
-
-    return false;
-}
-
-Qt::ItemFlags LensFlareElementTreeModel::flags(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return Qt::ItemFlags();
-    }
-
-    auto pElement = index.data(Qt::UserRole).value<CLensFlareElement*>();
-
-    Qt::ItemFlags flags = QAbstractItemModel::flags(index) | Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsDropEnabled;
-
-    if (pElement->GetOpticsType() != eFT_Root)
-    {
-        flags |= Qt::ItemIsDragEnabled;
-    }
-
-    return flags;
-}
-
-QModelIndex LensFlareElementTreeModel::index(int row, int column, const QModelIndex& parent) const
-{
-    if (!hasIndex(row, column, parent))
-    {
-        return {};
-    }
-
-    auto parentNode = GetLensFlareElement(parent);
-    auto childNode = parentNode->GetChildAt(row);
-
-    if (childNode)
-    {
-        return createIndex(row, column, childNode);
-    }
-    else
-    {
-        return {};
-    }
-}
-
-QModelIndex LensFlareElementTreeModel::parent(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return {};
-    }
-
-    auto childNode = static_cast<CLensFlareElement*>(index.internalPointer());
-    auto parentNode = childNode->GetParent();
-
-    if (parentNode == m_pRootElement.get())
-    {
-        return {};
-    }
-
-    return createIndex(parentNode->GetRow(), 0, parentNode);
-}
-
-int LensFlareElementTreeModel::rowCount(const QModelIndex& parent) const
-{
-    if (parent.column() > 0)
-    {
-        return 0;
-    }
-    return GetLensFlareElement(parent)->GetChildCount();
-}
-
-bool LensFlareElementTreeModel::removeRows(int row, int count, const QModelIndex& parent)
-{
-    if (!parent.isValid())
-    {
-        return false;
-    }
-
-    auto pParent = static_cast<CLensFlareElement*>(parent.internalPointer());
-
-    beginRemoveRows(parent, row, row + count - 1);
-
-    for (int i = 0; i < count; i++)
-    {
-        CLensFlareElement* pChild = pParent->GetChildAt(row);
-
-        IOpticsElementBasePtr pOptics = pChild->GetOpticsElement();
-        if (pOptics)
-        {
-            LensFlareUtil::RemoveOptics(pOptics);
-        }
-
-        pParent->RemoveChild(row);
-    }
-
-    endRemoveRows();
-
-    GetIEditor()->GetLensFlareManager()->Modified(); // XXX
-
-    if (m_pLensFlareItem)
-    {
-        m_pLensFlareItem->UpdateLights();
-    }
-
-    return true;
-}
-
-QStringList LensFlareElementTreeModel::mimeTypes() const
-{
-    QStringList types;
-    types << QStringLiteral("application/x-o3de-flareelements");
-    types << QStringLiteral("application/x-o3de-flaretypes");
-    return types;
-}
-
-QMimeData* LensFlareElementTreeModel::mimeData(const QModelIndexList& indexes) const
-{
-    QMimeData* data = new QMimeData();
-
-    QByteArray array;
-
-    for (auto& index : indexes)
-    {
-        auto pElement = static_cast<CLensFlareElement*>(index.data(Qt::UserRole).value<CLensFlareElement*>());
-        array.append(reinterpret_cast<const char*>(&pElement), sizeof(CLensFlareElement*));
-    }
-
-    data->setData(QStringLiteral("application/x-o3de-flareelements"), array);
-
-    return data;
-}
-
-void LensFlareElementTreeModel::RemoveAllElements()
-{
-    QModelIndex index = GetRootItem();
-    if (!index.isValid())
-    {
-        return;
-    }
-
-    auto pElement = index.data(Qt::UserRole).value<CLensFlareElement*>();
-
-    beginResetModel();
-
-    pElement->RemoveAllChildren();
-    pElement->GetOpticsElement()->RemoveAll();
-
-    endResetModel();
-
-    if (m_pLensFlareItem)
-    {
-        m_pLensFlareItem->UpdateLights();
-    }
-}
-
-bool LensFlareElementTreeModel::AddElement(const QModelIndex& parentIndex, int row, EFlareType flareType)
-{
-    if (!parentIndex.isValid())
-    {
-        return false;
-    }
-
-    auto pElement = GetLensFlareElement(parentIndex);
-
-    int nIndex;
-
-    if (LensFlareUtil::IsGroup(pElement->GetOpticsType()))
-    {
-        if (row != -1)
-        {
-            nIndex = row;
-        }
-        else
-        {
-            nIndex = pElement->GetChildCount();
-        }
-    }
-    else
-    {
-        CLensFlareElement* pParentElement = GetLensFlareElement(parentIndex.parent());
-        if (!pParentElement)
-        {
-            return false;
-        }
-
-        if (!LensFlareUtil::IsGroup(pParentElement->GetOpticsType()))
-        {
-            return false;
-        }
-
-        nIndex = LensFlareUtil::FindOpticsIndexUnderParentOptics(pElement->GetOpticsElement(), pParentElement->GetOpticsElement());
-        if (nIndex == -1)
-        {
-            return false;
-        }
-
-        pElement = pParentElement;
-    }
-
-    CLensFlareElement::LensFlareElementPtr pNewElement = InsertAtomicElement(nIndex, flareType, pElement);
-    if (!pNewElement)
-    {
-        return false;
-    }
-
-    if (m_pLensFlareItem)
-    {
-        m_pLensFlareItem->UpdateLights();
-    }
-
-    return true;
-}
-
-CLensFlareElement::LensFlareElementPtr LensFlareElementTreeModel::InsertAtomicElement(int nIndex, EFlareType flareType, CLensFlareElement* pParentElement)
-{
-    IOpticsElementBasePtr pParent = pParentElement->GetOpticsElement();
-    if (pParent == NULL)
-    {
-        return NULL;
-    }
-
-    IOpticsElementBasePtr pNewOptics = gEnv->pOpticsManager->Create(flareType);
-    if (pNewOptics == NULL)
-    {
-        return NULL;
-    }
-
-    if (nIndex < 0)
-    {
-        return NULL;
-    }
-
-    CLensFlareElement::LensFlareElementPtr pElement = AddElement(pNewOptics, pParentElement);
-    if (pElement == NULL)
-    {
-        return NULL;
-    }
-
-    pParent->InsertElement(nIndex, pNewOptics);
-
-    emit beginInsertRows(createIndex(pParentElement->GetRow(), 0, pParentElement), nIndex, nIndex);
-    pParentElement->InsertChild(nIndex, pElement);
-    emit endInsertRows();
-
-    return pElement;
-}
-
-void LensFlareElementTreeModel::MakeValidElementName(const QString& seedName, QString& outValidName) const
-{
-    if (!IsExistElement(seedName))
-    {
-        outValidName = seedName;
-        return;
-    }
-
-    int counter = 0;
-    do
-    {
-        QString numberString;
-        numberString = QString::number(counter);
-        QString candidateName = seedName + numberString;
-        if (!IsExistElement(candidateName))
-        {
-            outValidName = candidateName;
-            return;
-        }
-    } while (++counter < 100000); // prevent from infinite loop
-}
-
-bool LensFlareElementTreeModel::IsExistElement(const QString& name) const
-{
-    const auto predicate = [&](CLensFlareElement* pElement)
-    {
-        QString flareName;
-        return pElement->GetName(flareName) && !QString::compare(flareName, name, Qt::CaseInsensitive);
-    };
-    auto pElement = ::FindLensFlareElement(m_pRootElement.get(), predicate);
-    return pElement != nullptr;
-}
-
-CLensFlareElement::LensFlareElementPtr LensFlareElementTreeModel::AddElement(IOpticsElementBasePtr pOptics, CLensFlareElement* pParentElement)
-{
-    if (pOptics == NULL)
-    {
-        return NULL;
-    }
-
-    IOpticsElementBasePtr pParent = pParentElement->GetOpticsElement();
-
-    CLensFlareElement* pLensFlareElement = NULL;
-
-    if (pParent == NULL)
-    {
-        if (pOptics->GetType() != eFT_Root)
-        {
-            assert(0 && "CFlareManager::AddItem() - pOptics must be a root optics if the parent doesn't exist.");
-            return NULL;
-        }
-    }
-    else
-    {
-        if (!LensFlareUtil::IsGroup(pParent->GetType()))
-        {
-            return NULL;
-        }
-
-        QString fullElementName;
-        if (!pParentElement->GetName(fullElementName))
-        {
-            return NULL;
-        }
-        if (!fullElementName.isEmpty())
-        {
-            fullElementName += ".";
-        }
-        fullElementName += LensFlareUtil::GetShortName(pOptics->GetName().c_str()).toLower();
-
-        QString validName;
-        MakeValidElementName(fullElementName, validName);
-        pOptics->SetName(validName.toUtf8().data());
-    }
-
-    pLensFlareElement = CreateElement(pOptics);
-
-    if (LensFlareUtil::IsGroup(pOptics->GetType()))
-    {
-        for (int i = 0, iElementCount(pOptics->GetElementCount()); i < iElementCount; ++i)
-        {
-            CLensFlareElement::LensFlareElementPtr pChild = AddElement(pOptics->GetElementAt(i), pLensFlareElement);
-            pLensFlareElement->AddChild(pChild);
-        }
-    }
-
-    GetIEditor()->GetLensFlareManager()->Modified();
-    if (m_pLensFlareItem)
-    {
-        m_pLensFlareItem->UpdateLights();
-    }
-
-    return pLensFlareElement;
-}
-
-bool LensFlareElementTreeModel::MoveElement(CLensFlareElement* pElement, int row, const QModelIndex& index)
-{
-    if (!index.isValid())
-    {
-        return false;
-    }
-
-    QModelIndex sourceParentIndex = parent(createIndex(0, 0, pElement));
-    if (!sourceParentIndex.isValid())
-    {
-        return false;
-    }
-
-    QModelIndex targetParentIndex = index;
-    CLensFlareElement* pTargetParent = targetParentIndex.data(Qt::UserRole).value<CLensFlareElement*>();
-
-    QString fullElementName;
-    if (!pTargetParent->GetName(fullElementName))
-    {
-        return false;
-    }
-    if (!fullElementName.isEmpty())
-    {
-        fullElementName += ".";
-    }
-    fullElementName += LensFlareUtil::GetShortName(pElement->GetOpticsElement()->GetName().c_str()).toLower();
-
-    QString validName;
-    MakeValidElementName(fullElementName, validName);
-
-    int targetRow;
-
-    if (!LensFlareUtil::IsGroup(pTargetParent->GetOpticsElement()->GetType()))
-    {
-        targetParentIndex = targetParentIndex.parent();
-        pTargetParent = targetParentIndex.data(Qt::UserRole).value<CLensFlareElement*>();
-        targetRow = index.row();
-    }
-    else
-    {
-        if (row != -1)
-        {
-            targetRow = row;
-        }
-        else
-        {
-            targetRow = pTargetParent->GetChildCount();
-        }
-    }
-
-    CLensFlareElement* pSourceParent = pElement->GetParent();
-    int sourceRow = pElement->GetRow();
-
-    if (!beginMoveRows(sourceParentIndex, sourceRow, sourceRow, targetParentIndex, targetRow))
-    {
-        return false;
-    }
-
-    StoreUndo();
-
-    // insert before removing to increase reference count
-
-    pTargetParent->InsertChild(targetRow, pElement);
-    pTargetParent->GetOpticsElement()->InsertElement(targetRow, pElement->GetOpticsElement());
-
-    if (pTargetParent == pSourceParent && targetRow < sourceRow)
-    {
-        ++sourceRow;
-    }
-
-    pSourceParent->RemoveChild(sourceRow);
-    pSourceParent->GetOpticsElement()->Remove(sourceRow);
-
-    pElement->GetOpticsElement()->SetName(validName.toUtf8().data());
-    LensFlareUtil::UpdateOpticsName(pElement->GetOpticsElement());
-
-    endMoveRows();
-
-    return true;
-}
-
-bool LensFlareElementTreeModel::dropMimeData(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, int row, [[maybe_unused]] int column, const QModelIndex& parent)
-{
-    if (data->hasFormat(QStringLiteral("application/x-o3de-flaretypes")))
-    {
-        // drop from atomic list
-
-        QByteArray encoded = data->data(QStringLiteral("application/x-o3de-flaretypes"));
-        QDataStream stream(&encoded, QIODevice::ReadOnly);
-
-        while (!stream.atEnd())
-        {
-            int flareType;
-            stream >> flareType;
-
-            CUndo undo(tr("Add Atomic Lens Flare Item").toUtf8());
-            AddElement(parent, row, static_cast<EFlareType>(flareType));
-        }
-
-        return true;
-    }
-    else if (data->hasFormat(QStringLiteral("application/x-o3de-flareelements")))
-    {
-        QByteArray array = data->data("application/x-o3de-flareelements");
-
-        int count = array.size() / sizeof(CLensFlareElement*);
-        auto ppElements = reinterpret_cast<CLensFlareElement**>(array.data());
-
-        CUndo undo(tr("Copy/Cut & Paste library item").toUtf8());
-
-        for (int i = 0; i < count; i++)
-        {
-            MoveElement(ppElements[i], row, parent);
-        }
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-CLensFlareElement* LensFlareElementTreeModel::FindLensFlareElement(IOpticsElementBasePtr pOptics) const
-{
-    return ::FindLensFlareElement(m_pRootElement.get(), [&](CLensFlareElement* pElement)
-        {
-            return pElement->GetOpticsElement() == pOptics;
-        });
-}
-
-Qt::DropActions LensFlareElementTreeModel::supportedDragActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-Qt::DropActions LensFlareElementTreeModel::supportedDropActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-void LensFlareElementTreeModel::UpdateLensFlareItem(CLensFlareItem* pLensFlareItem)
-{
-    m_pLensFlareItem = pLensFlareItem;
-
-    m_pRootElement.reset(new CLensFlareElement);
-
-    if (pLensFlareItem != NULL)
-    {
-        auto pChild = UpdateLensFlareElementsRecusively(m_pLensFlareItem->GetOptics());
-        if (pChild)
-        {
-            m_pRootElement->AddChild(pChild);
-        }
-    }
-}
-
-CLensFlareElement* LensFlareElementTreeModel::UpdateLensFlareElementsRecusively(IOpticsElementBasePtr pOptics)
-{
-    auto pElement = new CLensFlareElement;
-    pElement->SetOpticsElement(pOptics);
-
-    for (int i = 0, iCount(pOptics->GetElementCount()); i < iCount; i++)
-    {
-        auto pChild = UpdateLensFlareElementsRecusively(pOptics->GetElementAt(i));
-        if (pElement)
-        {
-            pElement->AddChild(pChild);
-        }
-    }
-
-    return pElement;
-}
-
-CLensFlareElement* LensFlareElementTreeModel::CreateElement(IOpticsElementBasePtr pOptics)
-{
-    StoreUndo();
-    CLensFlareElement* pElement = new CLensFlareElement;
-    pElement->SetOpticsElement(pOptics);
-    return pElement;
-}
-
-void LensFlareElementTreeModel::OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem)
-{
-    beginResetModel();
-    UpdateLensFlareItem(pLensFlareItem);
-    endResetModel();
-}
-
-void LensFlareElementTreeModel::OnLensFlareDeleteItem([[maybe_unused]] CLensFlareItem* pLensFlareItem)
-{
-}
-
-CLensFlareElement* LensFlareElementTreeModel::GetLensFlareElement(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return m_pRootElement.get();
-    }
-    else
-    {
-        return static_cast<CLensFlareElement*>(index.internalPointer());
-    }
-}
-
-void LensFlareElementTreeModel::Paste(const QModelIndex& hItem, XmlNodeRef xmlNode)
-{
-    if (!hItem.isValid())
-    {
-        return;
-    }
-
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return;
-    }
-
-    QString type;
-    xmlNode->getAttr("Type", type);
-
-    bool bPasteAtSameLevel = false;
-    xmlNode->getAttr("PasteAtSameLevel", bPasteAtSameLevel);
-
-    QModelIndex hParentItem;
-
-    IOpticsElementBasePtr pSelectedOptics = GetOpticsElementByTreeItem(hItem);
-    if (pSelectedOptics == NULL)
-    {
-        return;
-    }
-
-    if (!LensFlareUtil::IsGroup(pSelectedOptics->GetType()))
-    {
-        hParentItem = hItem.parent();
-    }
-    else
-    {
-        if (bPasteAtSameLevel)
-        {
-            hParentItem = hItem.parent();
-        }
-        else
-        {
-            hParentItem = hItem;
-        }
-    }
-
-    IOpticsElementBasePtr pParentOptics = GetOpticsElementByTreeItem(hParentItem);
-    if (pParentOptics == NULL)
-    {
-        return;
-    }
-
-    for (int i = 0, iChildCount(xmlNode->getChildCount()); i < iChildCount; ++i)
-    {
-        LensFlareUtil::SClipboardData clipboardData;
-        clipboardData.FillThisFromXmlNode(xmlNode->getChild(i));
-
-        if (clipboardData.m_LensFlareFullPath == m_pLensFlareItem->GetFullName() && clipboardData.m_From == LENSFLARE_ITEM_TREE)
-        {
-            QString msg;
-            msg = tr("[%1] lens item can be pasted into the same item").arg(clipboardData.m_LensFlareFullPath);
-            CryMessageBox(msg.toUtf8().data(), "Warning", MB_OK);
-            continue;
-        }
-
-        IOpticsElementBasePtr pSourceOptics = pEditor->FindOptics(clipboardData.m_LensFlareFullPath, clipboardData.m_LensOpticsPath);
-        if (pSourceOptics == NULL)
-        {
-            continue;
-        }
-
-        CLensFlareItem* pSourceLensFlareItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(clipboardData.m_LensFlareFullPath);
-        if (pSourceLensFlareItem == NULL)
-        {
-            continue;
-        }
-
-        if (type == FLARECLIPBOARDTYPE_CUT)
-        {
-            if (m_pLensFlareItem->GetFullName() == clipboardData.m_LensFlareFullPath && LensFlareUtil::FindOptics(pSourceOptics, pSelectedOptics->GetName().c_str()))
-            {
-                QMessageBox::warning(0, tr("Warning"), tr("You can't paste this item here."));
-                return;
-            }
-        }
-
-        // if the copied optics type is root, the type should be converted to group type.
-        bool bForceConvertType = false;
-        if (pSourceOptics->GetType() == eFT_Root)
-        {
-            bForceConvertType = true;
-        }
-
-        IOpticsElementBasePtr pNewOptics = LensFlareUtil::CreateOptics(pSourceOptics, bForceConvertType);
-        if (pNewOptics == NULL)
-        {
-            return;
-        }
-
-        if (type == FLARECLIPBOARDTYPE_CUT)
-        {
-            if (pSourceLensFlareItem == m_pLensFlareItem)
-            {
-                QModelIndex hSourceItem = GetTreeItemByOpticsElement(pSourceOptics);
-                if (hSourceItem.isValid())
-                {
-                    removeRow(hSourceItem.row(), hSourceItem.parent());
-                }
-            }
-            else if (clipboardData.m_From == LENSFLARE_ITEM_TREE)
-            {
-                CLensFlareLibrary* pLibrary = pEditor->GetCurrentLibrary();
-                if (pLibrary)
-                {
-                    QString lensFlareFullName = m_pLensFlareItem ? m_pLensFlareItem->GetFullName() : "";
-                    pLibrary->RemoveItem(pSourceLensFlareItem);
-                    pEditor->ReloadItems();
-                    pSourceLensFlareItem->UpdateLights();
-                    pEditor->UpdateLensOpticsNames(pSourceLensFlareItem->GetFullName(), "");
-                    if (!lensFlareFullName.isEmpty())
-                    {
-                        pEditor->SelectItemByName(lensFlareFullName);
-                    }
-                }
-
-                LensFlareUtil::RemoveOptics(pSourceOptics);
-            }
-        }
-
-        CLensFlareElement* pParentElement = FindLensFlareElement(pParentOptics);
-
-        // The children optics items were already added in a creation phase so we don't need to update the optics object.
-        CLensFlareElement::LensFlareElementPtr pNewElement = AddElement(pNewOptics, pParentElement);
-        assert(pNewElement);
-        if (!pNewElement)
-        {
-            return;
-        }
-
-        int nInsertedPos;
-        if (hParentItem == hItem)
-        {
-            nInsertedPos = 0;
-        }
-        else
-        {
-            nInsertedPos = LensFlareUtil::FindOpticsIndexUnderParentOptics(pSelectedOptics, pParentOptics);
-            if (nInsertedPos > pParentOptics->GetElementCount() || nInsertedPos == -1)
-            {
-                nInsertedPos = pParentOptics->GetElementCount();
-            }
-        }
-
-        pParentOptics->InsertElement(nInsertedPos, pNewOptics);
-        LensFlareUtil::UpdateOpticsName(pNewOptics);
-
-        emit beginInsertRows(createIndex(pParentElement->GetRow(), 0, pParentElement), nInsertedPos, nInsertedPos);
-        pParentElement->InsertChild(nInsertedPos, pNewElement);
-        emit endInsertRows();
-
-        // pSelectedLensFlareItem->UpdateLights();
-    }
-}
-
-IOpticsElementBasePtr LensFlareElementTreeModel::GetOpticsElementByTreeItem(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return nullptr;
-    }
-    return GetLensFlareElement(index)->GetOpticsElement();
-}
-
-QModelIndex LensFlareElementTreeModel::GetTreeItemByName(const QString& name) const
-{
-    auto pElement = ::FindLensFlareElement(m_pRootElement.get(), [&](CLensFlareElement* pElement)
-            {
-                QString flareName;
-                return pElement->GetName(flareName) && flareName == name;
-            });
-
-    if (!pElement)
-    {
-        return {};
-    }
-
-    return createIndex(pElement->GetRow(), 0, pElement);
-}
-
-QModelIndex LensFlareElementTreeModel::GetTreeItemByOpticsElement(const IOpticsElementBasePtr pOptics) const
-{
-    auto pElement = FindLensFlareElement(pOptics);
-    if (!pElement)
-    {
-        return {};
-    }
-    return createIndex(pElement->GetRow(), 0, pElement);
-}
-
-void LensFlareElementTreeModel::InvalidateLensFlareItem()
-{
-    OnLensFlareChangeItem(nullptr);
-}
-
-void LensFlareElementTreeModel::StoreUndo(const QString& undoDescription)
-{
-    if (CUndo::IsRecording())
-    {
-        if (undoDescription.isEmpty())
-        {
-            CUndo::Record(new CUndoLensFlareItem(GetLensFlareItem()));
-        }
-        else
-        {
-            CUndo::Record(new CUndoLensFlareItem(GetLensFlareItem(), undoDescription));
-        }
-    }
-}
-
-#include <LensFlareEditor/moc_LensFlareElementTree.cpp>
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.h
deleted file mode 100644
index d2b0051032..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREELEMENTTREE_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREELEMENTTREE_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "LensFlareElement.h"
-#include "LensFlareUtil.h"
-#include "ILensFlareListener.h"
-
-#include <QAbstractItemModel>
-#include <QTreeView>
-#endif
-
-class CLensFlareItem;
-class LensFlareElementTreeModel;
-class QMouseEvent;
-
-class CLensFlareElementTree
-    : public QTreeView
-{
-    Q_OBJECT
-
-public:
-
-    CLensFlareElementTree(QWidget* pParent = nullptr);
-
-    void RegisterListener(ILensFlareChangeElementListener* pListener)
-    {
-        if (pListener)
-        {
-            m_LensFlaresElementListeners.push_back(pListener);
-        }
-    }
-
-    void UnregisterListener(ILensFlareChangeElementListener* pListener)
-    {
-        if (pListener == NULL)
-        {
-            return;
-        }
-        std::vector<ILensFlareChangeElementListener*>::iterator ii  = m_LensFlaresElementListeners.begin();
-        for (; ii != m_LensFlaresElementListeners.end(); )
-        {
-            if (*ii == pListener)
-            {
-                ii = m_LensFlaresElementListeners.erase(ii);
-            }
-            else
-            {
-                ++ii;
-            }
-        }
-    }
-
-    CLensFlareElement::LensFlareElementPtr FindLensFlareElement(IOpticsElementBasePtr pElement) const;
-
-    void OnInternalVariableChange(IVariable* pVar);
-
-    CLensFlareElement* GetCurrentLensFlareElement() const;
-    void UpdateProperty();
-    void UpdateClipboard(const char* type, bool bPasteAtSameLevel);
-
-    void SelectTreeItemByName(const QString& name);
-
-    CLensFlareItem* GetLensFlareItem() const;
-    void InvalidateLensFlareItem();
-
-protected:
-    void CallChangeListeners();
-
-    void OnDataChanged(const QModelIndex& index);
-    void OnRowsInserted(const QModelIndex& index, int first, int last);
-    void OnRowsRemoved(const QModelIndex& index, int first, int last);
-
-    void OnNotifyTreeRClick();
-    void OnTvnSelchangedTree(const QItemSelection& selected, const QItemSelection& deselected);
-
-    XmlNodeRef CreateXML(const char* type) const;
-    bool GetClipboardList(const char* type, std::vector<LensFlareUtil::SClipboardData>& outList) const;
-
-    //! Only the basic operations like following methods must have routine for undoing.
-    void ElementChanged(CLensFlareElement* pPrevLensFlareElement);
-    /////////////////////////////////////////////////////////////////////////////////////////
-
-    void OnAddGroup();
-    void OnCopy();
-    void OnCut();
-    void OnPaste();
-    void OnClone();
-    void OnRenameItem();
-    void OnRemoveItem();
-    void OnRemoveAll();
-    void OnItemUp();
-    void OnItemDown();
-    void mousePressEvent(QMouseEvent* event);
-    void keyPressEvent(QKeyEvent* event);
-
-    void Cut(bool bPasteAtSameLevel);
-
-private:
-    void SelectItem(const QModelIndex& index);
-
-    std::vector<ILensFlareChangeElementListener*> m_LensFlaresElementListeners;
-
-    QScopedPointer<LensFlareElementTreeModel> m_model;
-};
-
-class LensFlareElementTreeModel
-    : public QAbstractItemModel
-    , public ILensFlareChangeItemListener
-{
-    Q_OBJECT
-
-public:
-    LensFlareElementTreeModel(QObject* pParent = nullptr);
-    ~LensFlareElementTreeModel();
-
-    int rowCount(const QModelIndex& parent = {}) const override;
-    int columnCount(const QModelIndex& parent = {}) const override;
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-    QVariant data(const QModelIndex& index, int role) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-
-    QModelIndex index(int row, int column, const QModelIndex& parent = {}) const override;
-    QModelIndex parent(const QModelIndex& index) const override;
-
-    bool removeRows(int row, int count, const QModelIndex& parent = {}) override;
-
-    QStringList mimeTypes() const override;
-    QMimeData* mimeData(const QModelIndexList& indexes) const override;
-    bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
-    Qt::DropActions supportedDragActions() const override;
-    Qt::DropActions supportedDropActions() const override;
-
-    CLensFlareElement* GetLensFlareElement(const QModelIndex& index) const;
-
-    QModelIndex GetTreeItemByName(const QString& name) const;
-
-    void Paste(const QModelIndex& index, XmlNodeRef xmlNode);
-    void Cut(const QModelIndex& index, bool bPasteAtSameLevel);
-
-    CLensFlareItem* GetLensFlareItem() const
-    {
-        return m_pLensFlareItem;
-    }
-
-    void InvalidateLensFlareItem();
-
-    void RemoveAllElements();
-    bool AddElement(const QModelIndex& index, int row, EFlareType flareType);
-
-    bool MoveElement(CLensFlareElement* pElement, int row, const QModelIndex& parentIndex);
-
-private:
-    QModelIndex GetRootItem() const;
-    IOpticsElementBasePtr GetOpticsElementByTreeItem(const QModelIndex& index) const;
-
-    void OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem);
-    void OnLensFlareDeleteItem(CLensFlareItem* pLensFlareItem);
-
-    void UpdateLensFlareItem(CLensFlareItem* pLensFlareItem);
-    CLensFlareElement* UpdateLensFlareElementsRecusively(IOpticsElementBasePtr pOptics);
-    CLensFlareElement* CreateElement(IOpticsElementBasePtr pOptics);
-    void Reload();
-
-    void MakeValidElementName(const QString& seedName, QString& outValidName) const;
-    bool IsExistElement(const QString& name) const;
-    CLensFlareElement::LensFlareElementPtr InsertAtomicElement(int nIndex, EFlareType flareType, CLensFlareElement* pParentElement);
-    CLensFlareElement::LensFlareElementPtr AddElement(IOpticsElementBasePtr pOptics, CLensFlareElement* pParentElement);
-    CLensFlareElement* FindLensFlareElement(IOpticsElementBasePtr pOptics) const;
-
-    QModelIndex GetTreeItemByOpticsElement(const IOpticsElementBasePtr pOptics) const;
-    void EnableElement(CLensFlareElement* pLensFlareElement, bool bEnable);
-    void RenameElement(CLensFlareElement* pLensFlareElement, const QString& newName);
-    void StoreUndo(const QString& undoDescription = "");
-
-    CLensFlareElement::LensFlareElementPtr m_pRootElement;
-    CLensFlareItem* m_pLensFlareItem;
-};
-
-Q_DECLARE_METATYPE(CLensFlareElement*)
-
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREELEMENTTREE_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItem.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareItem.cpp
deleted file mode 100644
index e20f1ac7cb..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItem.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareItem.h"
-
-// Editor
-#include "LensFlareUtil.h"
-#include "LensFlareEditor.h"
-#include "LensFlareUndo.h"
-#include "Objects/EntityObject.h"
-
-
-CLensFlareItem::CLensFlareItem()
-{
-    m_pOptics = NULL;
-    CreateOptics();
-}
-
-CLensFlareItem::~CLensFlareItem()
-{
-}
-
-void CLensFlareItem::Serialize(SerializeContext& ctx)
-{
-    if (ctx.bLoading)
-    {
-        CreateOptics();
-        LensFlareUtil::FillOpticsFromXML(m_pOptics, ctx.node);
-
-        for (int i = 0, iChildCount(ctx.node->getChildCount()); i < iChildCount; ++i)
-        {
-            AddChildOptics(m_pOptics, ctx.node->getChild(i));
-        }
-
-        CBaseLibraryItem::Serialize(ctx);
-    }
-    else
-    {
-        CBaseLibraryItem::Serialize(ctx);
-    }
-}
-
-void CLensFlareItem::AddChildOptics(IOpticsElementBasePtr pParentOptics, const XmlNodeRef& pNode)
-{
-    if (pNode == NULL)
-    {
-        return;
-    }
-
-    if (pNode->getTag() && strcmp(pNode->getTag(), "FlareItem"))
-    {
-        return;
-    }
-
-    IOpticsElementBasePtr pOptics = LensFlareUtil::CreateOptics(pNode);
-    if (pOptics == NULL)
-    {
-        return;
-    }
-
-    pParentOptics->AddElement(pOptics);
-
-    for (int i = 0, iChildCount(pNode->getChildCount()); i < iChildCount; ++i)
-    {
-        AddChildOptics(pOptics, pNode->getChild(i));
-    }
-}
-
-void CLensFlareItem::CreateOptics()
-{
-    m_pOptics = gEnv->pOpticsManager->Create(eFT_Root);
-}
-
-XmlNodeRef CLensFlareItem::CreateXmlData() const
-{
-    XmlNodeRef pRootNode = NULL;
-    if (LensFlareUtil::CreateXmlData(m_pOptics, pRootNode))
-    {
-        pRootNode->setAttr("Name", m_pOptics->GetName().c_str());
-        return pRootNode;
-    }
-    return NULL;
-}
-
-void CLensFlareItem::SetName(const QString& name)
-{
-    QString newNameWithGroup;
-    QString newFullName;
-    LensFlareUtil::GetExpandedItemNames(this, LensFlareUtil::GetGroupNameFromName(name), LensFlareUtil::GetShortName(name), newNameWithGroup, newFullName);
-
-    if (CUndo::IsRecording())
-    {
-        CUndo::Record(new CUndoRenameLensFlareItem(GetFullName(), newFullName));
-    }
-
-    CBaseLibraryItem::SetName(name);
-
-    if (m_pOptics)
-    {
-        m_pOptics->SetName(GetShortName().toUtf8().data());
-    }
-}
-
-void CLensFlareItem::UpdateLights(IOpticsElementBasePtr pSrcOptics)
-{
-    QString srcFullOpticsName = GetFullName();
-    bool bUpdateChildren = false;
-    if (pSrcOptics == NULL)
-    {
-        if (m_pOptics == NULL)
-        {
-            return;
-        }
-        pSrcOptics = m_pOptics;
-        bUpdateChildren = true;
-    }
-
-    std::vector<CEntityObject*> lightEntities;
-    LensFlareUtil::GetLightEntityObjects(lightEntities);
-
-    for (int i = 0, iLightSize(lightEntities.size()); i < iLightSize; ++i)
-    {
-        CEntityObject* pLightEntity = lightEntities[i];
-        if (pLightEntity == NULL)
-        {
-            continue;
-        }
-
-        IOpticsElementBasePtr pTargetOptics = pLightEntity->GetOpticsElement();
-        if (pTargetOptics == NULL)
-        {
-            continue;
-        }
-
-        QString targetFullOpticsName(pTargetOptics->GetName().c_str());
-        if (srcFullOpticsName != targetFullOpticsName)
-        {
-            continue;
-        }
-
-        QString srcOpticsName(pSrcOptics->GetName().c_str());
-        IOpticsElementBasePtr pFoundOptics = NULL;
-        if (LensFlareUtil::GetShortName(targetFullOpticsName) == srcOpticsName)
-        {
-            pFoundOptics = pTargetOptics;
-        }
-        else
-        {
-            pFoundOptics = LensFlareUtil::FindOptics(pTargetOptics, srcOpticsName);
-        }
-
-        if (pFoundOptics == NULL)
-        {
-            continue;
-        }
-        if (pFoundOptics->GetType() != pSrcOptics->GetType())
-        {
-            continue;
-        }
-
-        LensFlareUtil::CopyOptics(pSrcOptics, pFoundOptics, bUpdateChildren);
-    }
-}
-
-void CLensFlareItem::ReplaceOptics(IOpticsElementBasePtr pNewData)
-{
-    if (pNewData == NULL)
-    {
-        return;
-    }
-    if (pNewData->GetType() != eFT_Root)
-    {
-        return;
-    }
-    CreateOptics();
-    LensFlareUtil::CopyOptics(pNewData, m_pOptics);
-    m_pOptics->SetName(GetFullName().toUtf8().data());
-    UpdateLights();
-
-    CLensFlareEditor* pLensFlareEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pLensFlareEditor == NULL)
-    {
-        return;
-    }
-    if (this != pLensFlareEditor->GetSelectedLensFlareItem())
-    {
-        return;
-    }
-    pLensFlareEditor->UpdateLensFlareItem(this);
-    pLensFlareEditor->RemovePropertyItems();
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItem.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareItem.h
deleted file mode 100644
index 6d1eedb5f9..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItem.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREITEM_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREITEM_H
-#pragma once
-
-class IOpticsElementBase;
-class CEntityObject;
-
-#include "BaseLibraryItem.h"
-#include "Include/IDataBaseItem.h"
-
-class CLensFlareItem
-    : public CBaseLibraryItem
-{
-public:
-
-    CLensFlareItem();
-    ~CLensFlareItem();
-
-    EDataBaseItemType GetType() const
-    {
-        return EDB_TYPE_FLARE;
-    }
-
-    void SetName(const QString& name);
-    void Serialize(SerializeContext& ctx);
-
-    void CreateOptics();
-
-    IOpticsElementBasePtr GetOptics() const
-    {
-        return m_pOptics;
-    }
-
-    void ReplaceOptics(IOpticsElementBasePtr pNewData);
-
-    XmlNodeRef CreateXmlData() const;
-    void UpdateLights(IOpticsElementBasePtr pSrcOptics = NULL);
-
-private:
-
-    void GetLightEntityObjects(std::vector<CEntityObject*>& outEntityLights) const;
-    static void AddChildOptics(IOpticsElementBasePtr pParentOptics, const XmlNodeRef& pNode);
-
-    IOpticsElementBasePtr m_pOptics;
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREITEM_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItemTree.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareItemTree.cpp
deleted file mode 100644
index 34cb442a38..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItemTree.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareItemTree.h"
-
-// Editor
-#include "LensFlareItem.h"
-#include "ViewManager.h"
-#include "Objects/EntityObject.h"
-
-
-CLensFlareItemTree::CLensFlareItemTree(QWidget* pParent)
-    : QTreeView(pParent)
-{
-    setHeaderHidden(true);
-    setSelectionMode(QAbstractItemView::SingleSelection);
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    setDragEnabled(true);
-    setAcceptDrops(true);
-    setDropIndicatorShown(true);
-    setDragDropMode(DragDrop);
-}
-
-CLensFlareItemTree::~CLensFlareItemTree()
-{
-}
-
-void CLensFlareItemTree::startDrag(Qt::DropActions supportedDropActions)
-{
-    QTreeView::startDrag(supportedDropActions);
-}
-
-void CLensFlareItemTree::mousePressEvent(QMouseEvent* event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        CUndo undo(tr("Changed lens flare item").toUtf8());
-        QTreeView::mousePressEvent(event);
-    }
-    else
-    {
-        QTreeView::mousePressEvent(event);
-    }
-}
-
-void CLensFlareItemTree::AssignLensFlareToLightEntity(CViewport* pViewport) const
-{
-    QModelIndexList selected = selectionModel()->selectedIndexes();
-    if (selected.isEmpty())
-    {
-        return;
-    }
-
-    CLensFlareItem* pLensFlareItem = static_cast<CLensFlareItem*>(selected.first().data(Qt::UserRole).value<CBaseLibraryItem*>());
-
-    QPoint viewportPos = QCursor::pos();
-    pViewport->ScreenToClient(viewportPos);
-    HitContext hit;
-    if (!pViewport->HitTest(viewportPos, hit))
-    {
-        return;
-    }
-
-    if (hit.object && qobject_cast<CEntityObject*>(hit.object))
-    {
-        CEntityObject* pEntity = (CEntityObject*)hit.object;
-        if (pEntity->IsLight())
-        {
-            CUndo undo(tr("Assign a lens flare item to a light entity").toUtf8());
-            pEntity->ApplyOptics(pLensFlareItem->GetFullName(), pLensFlareItem->GetOptics());
-        }
-    }
-}
-
-#include <LensFlareEditor/moc_LensFlareItemTree.cpp>
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItemTree.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareItemTree.h
deleted file mode 100644
index 1139604163..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareItemTree.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREITEMTREE_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREITEMTREE_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "LensFlareElement.h"
-#include "ILensFlareListener.h"
-
-#include <QTreeView>
-#endif
-
-class QMouseEvent;
-class CLensFlareItem;
-
-class CLensFlareItemTree
-    : public QTreeView
-{
-    Q_OBJECT
-
-public:
-    CLensFlareItemTree(QWidget* pParent = nullptr);
-    ~CLensFlareItemTree();
-
-protected:
-    void startDrag(Qt::DropActions supportedDropActions) override;
-    void mousePressEvent(QMouseEvent* event) override;
-
-private:
-
-    void AssignLensFlareToLightEntity(CViewport* pViewport) const;
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREITEMTREE_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLibrary.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareLibrary.cpp
deleted file mode 100644
index b575b4595c..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLibrary.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareLibrary.h"
-
-// Editor
-#include "LensFlareItem.h"
-
-
-bool CLensFlareLibrary::Save()
-{
-    return SaveLibrary("LensFlareLibrary");
-}
-
-bool CLensFlareLibrary::Load(const QString& filename)
-{
-    if (filename.isEmpty())
-    {
-        return false;
-    }
-    SetFilename(filename);
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(filename.toUtf8().data());
-    if (!root)
-    {
-        return false;
-    }
-    Serialize(root, true);
-    return true;
-}
-
-void CLensFlareLibrary::Serialize(XmlNodeRef& root, bool bLoading)
-{
-    if (bLoading)
-    {
-        RemoveAllItems();
-        QString name = GetName();
-        root->getAttr("Name", name);
-        SetName(name);
-        for (int i = 0; i < root->getChildCount(); i++)
-        {
-            XmlNodeRef itemNode = root->getChild(i);
-            CLensFlareItem* pLensFlareItem = new CLensFlareItem;
-            AddItem(pLensFlareItem);
-            CBaseLibraryItem::SerializeContext ctx(itemNode, bLoading);
-            pLensFlareItem->Serialize(ctx);
-        }
-        SetModified(false);
-        m_bNewLibrary = false;
-    }
-    else
-    {
-        root->setAttr("Name", GetName().toUtf8().data());
-
-        for (int i = 0; i < GetItemCount(); i++)
-        {
-            CLensFlareItem* pItem = (CLensFlareItem*)GetItem(i);
-            if(pItem)
-            {
-                CBaseLibraryItem::SerializeContext ctx(pItem->CreateXmlData(), bLoading);
-                root->addChild(ctx.node);
-                pItem->Serialize(ctx);
-            }
-        }
-    }
-}
-
-IOpticsElementBasePtr CLensFlareLibrary::GetOpticsOfItem(const char* szflareName)
-{
-    IOpticsElementBasePtr pOptics = NULL;
-    for (int i = 0; i < GetItemCount(); i++)
-    {
-        CLensFlareItem* pItem = (CLensFlareItem*)GetItem(i);
-
-        if (pItem->GetFullName() == szflareName)
-        {
-            pOptics = pItem->GetOptics();
-            break;
-        }
-    }
-
-    return pOptics;
-}
-
-
-void CLensFlareLibrary::OnInternalVariableChange([[maybe_unused]] IVariable* pVar)
-{
-    SetModified(true);
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLibrary.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareLibrary.h
deleted file mode 100644
index 484ad3740a..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLibrary.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLARELIBRARY_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLARELIBRARY_H
-#pragma once
-#include "BaseLibrary.h"
-
-struct IVariable;
-
-class CRYEDIT_API CLensFlareLibrary
-    : public CBaseLibrary
-{
-public:
-    CLensFlareLibrary(IBaseLibraryManager* pManager)
-        : CBaseLibrary(pManager) {};
-    virtual bool Save();
-    virtual bool Load(const QString& filename);
-    virtual void Serialize(XmlNodeRef& node, bool bLoading);
-
-    IOpticsElementBasePtr GetOpticsOfItem(const char* szflareName);
-
-    void OnInternalVariableChange(IVariable* pVar);
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLARELIBRARY_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLightEntityTree.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareLightEntityTree.cpp
deleted file mode 100644
index 307364ea4f..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLightEntityTree.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareLightEntityTree.h"
-
-// Editor
-#include "Viewport.h"
-#include "Include/IObjectManager.h"
-#include "Objects/SelectionGroup.h"
-#include "LensFlareItem.h"
-#include "LensFlareEditor.h"
-
-
-CLensFlareLightEntityTree::CLensFlareLightEntityTree(QWidget* pParent)
-    : QTreeView(pParent)
-    , m_model(new LensFlareLightEntityModel)
-{
-    setHeaderHidden(true);
-
-    setModel(m_model.data());
-
-    connect(this, &QTreeView::doubleClicked, this, &CLensFlareLightEntityTree::OnTvnItemDoubleClicked);
-}
-
-CLensFlareLightEntityTree::~CLensFlareLightEntityTree()
-{
-}
-
-void CLensFlareLightEntityTree::OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem)
-{
-    m_model->OnLensFlareChangeItem(pLensFlareItem);
-}
-
-void CLensFlareLightEntityTree::OnLensFlareDeleteItem(CLensFlareItem* pLensFlareItem)
-{
-    m_model->OnLensFlareDeleteItem(pLensFlareItem);
-}
-
-void CLensFlareLightEntityTree::OnTvnItemDoubleClicked(const QModelIndex& index)
-{
-    CEntityObject* pObject = index.data(Qt::UserRole).value<CEntityObject*>();
-
-    if (!qobject_cast<CEntityObject*>(pObject))
-    {
-        return;
-    }
-
-    CSelectionGroup* pSelection = GetIEditor()->GetObjectManager()->GetSelection();
-    if (pSelection)
-    {
-        int iSelectionCount(pSelection->GetCount());
-        if (iSelectionCount == 1)
-        {
-            if (pSelection->GetObject(0) == pObject)
-            {
-                CViewport* vp = GetIEditor()->GetActiveView();
-                if (vp)
-                {
-                    vp->CenterOnSelection();
-                }
-                return;
-            }
-        }
-    }
-
-    GetIEditor()->GetObjectManager()->ClearSelection();
-    GetIEditor()->GetObjectManager()->SelectObject(pObject);
-}
-
-LensFlareLightEntityModel::LensFlareLightEntityModel(QObject* pParent)
-    : QAbstractListModel(pParent)
-{
-    CLensFlareEditor::GetLensFlareEditor()->RegisterLensFlareItemChangeListener(this);
-    GetIEditor()->GetObjectManager()->AddObjectEventListener(this);
-}
-
-LensFlareLightEntityModel::~LensFlareLightEntityModel()
-{
-    CLensFlareEditor::GetLensFlareEditor()->UnregisterLensFlareItemChangeListener(this);
-    GetIEditor()->GetObjectManager()->RemoveObjectEventListener(this);
-}
-
-void LensFlareLightEntityModel::OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem)
-{
-    beginResetModel();
-
-    m_pLensFlareItem = pLensFlareItem;
-    m_lightEntities.clear();
-
-    if (m_pLensFlareItem)
-    {
-        std::vector<CEntityObject*> lightEntities;
-        LensFlareUtil::GetLightEntityObjects(lightEntities);
-
-        for (int i = 0, iEntitySize(lightEntities.size()); i < iEntitySize; ++i)
-        {
-            AddLightEntity(lightEntities[i]);
-        }
-    }
-
-    endResetModel();
-}
-
-void LensFlareLightEntityModel::OnLensFlareDeleteItem([[maybe_unused]] CLensFlareItem* pLensFlareItem)
-{
-    beginResetModel();
-
-    m_lightEntities.clear();
-    m_pLensFlareItem = NULL;
-
-    endResetModel();
-}
-
-void LensFlareLightEntityModel::OnObjectEvent(CBaseObject* pObject, int nEvent)
-{
-    if (!qobject_cast<CEntityObject*>(pObject))
-    {
-        return;
-    }
-
-    switch (nEvent)
-    {
-    case CBaseObject::ON_RENAME:
-    case CBaseObject::ON_DELETE:
-    {
-        auto it = std::find(std::begin(m_lightEntities), std::end(m_lightEntities), pObject);
-        if (it == std::end(m_lightEntities))
-        {
-            return;
-        }
-        int row = std::distance(std::begin(m_lightEntities), it);
-        if (nEvent == CBaseObject::ON_RENAME)
-        {
-            emit dataChanged(index(row, 0), index(row, 0));
-        }
-        else
-        {
-            beginRemoveRows({}, row, row);
-            m_lightEntities.erase(it);
-            endRemoveRows();
-        }
-    }
-    break;
-
-    case CBaseObject::ON_ADD:
-        if (AddLightEntity((CEntityObject*)pObject))
-        {
-            int row = m_lightEntities.size() - 1;
-            beginInsertRows({}, row, row);
-            endInsertRows();
-        }
-        break;
-    }
-}
-
-bool LensFlareLightEntityModel::AddLightEntity(CEntityObject* pEntity)
-{
-    if (pEntity == NULL || m_pLensFlareItem == NULL)
-    {
-        return false;
-    }
-
-    QString lensFlareName = pEntity->GetEntityPropertyString(CEntityObject::s_LensFlarePropertyName);
-    if (lensFlareName.isEmpty())
-    {
-        return false;
-    }
-
-    QString fullName = m_pLensFlareItem->GetFullName();
-    if (fullName.isEmpty())
-    {
-        return false;
-    }
-
-    if (QString::compare(lensFlareName, fullName, Qt::CaseInsensitive))
-    {
-        return false;
-    }
-
-    m_lightEntities.push_back(pEntity);
-
-    return true;
-}
-
-int LensFlareLightEntityModel::rowCount(const QModelIndex&) const
-{
-    return m_lightEntities.size();
-}
-
-QVariant LensFlareLightEntityModel::data(const QModelIndex& index, int role) const
-{
-    const int row = index.row();
-
-    if (row < 0 || row >= m_lightEntities.size())
-    {
-        return {};
-    }
-
-    auto pEntity = m_lightEntities[row];
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-        return pEntity->GetName();
-
-    case Qt::UserRole:
-        return QVariant::fromValue<CEntityObject*>(pEntity);
-    }
-
-    return {};
-}
-
-#include <LensFlareEditor/moc_LensFlareLightEntityTree.cpp>
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLightEntityTree.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareLightEntityTree.h
deleted file mode 100644
index 21a271c08f..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareLightEntityTree.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLARELIGHTENTITYTREE_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLARELIGHTENTITYTREE_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "ILensFlareListener.h"
-
-#include <QScopedPointer>
-#include <QTreeWidget>
-#include "IObjectManager.h" // for IObjectManager::EventListener
-#include "Objects/EntityObject.h"
-#endif
-
-class LensFlareLightEntityModel;
-
-class CLensFlareLightEntityTree
-    : public QTreeView
-{
-    Q_OBJECT
-
-public:
-    CLensFlareLightEntityTree(QWidget* pParent = nullptr);
-    ~CLensFlareLightEntityTree();
-
-    void OnLensFlareDeleteItem(CLensFlareItem* pLensFlareItem);
-    void OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem);
-
-protected:
-    void OnTvnItemDoubleClicked(const QModelIndex& index);
-
-    QScopedPointer<LensFlareLightEntityModel> m_model;
-};
-
-class LensFlareLightEntityModel
-    : public QAbstractListModel
-    , public ILensFlareChangeItemListener
-    , public IObjectManager::EventListener
-{
-    Q_OBJECT
-
-public:
-    LensFlareLightEntityModel(QObject* pParent = nullptr);
-    ~LensFlareLightEntityModel();
-
-    int rowCount(const QModelIndex& parent = {}) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-
-    void OnLensFlareDeleteItem(CLensFlareItem* pLensFlareItem);
-    void OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem);
-
-protected:
-    void OnObjectEvent(CBaseObject* pObject, int nEvent) override;
-
-    bool AddLightEntity(CEntityObject* pEntity);
-
-    std::vector<CEntityObject*> m_lightEntities;
-    _smart_ptr<CLensFlareItem> m_pLensFlareItem;
-};
-
-Q_DECLARE_METATYPE(CEntityObject*)
-
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLARELIGHTENTITYTREE_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareManager.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareManager.cpp
deleted file mode 100644
index e18beeb6a4..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareManager.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareManager.h"
-
-// AzCore
-#include <AzCore/XML/rapidxml.h>
-#include <AzCore/std/string/wildcard.h>
-
-// Editor
-#include "LensFlareEditor.h"
-#include "LensFlareItem.h"
-#include "LensFlareLibrary.h"
-#include "LensFlareUtil.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// CLensFlareManager implementation.
-//////////////////////////////////////////////////////////////////////////
-CLensFlareManager::CLensFlareManager()
-    : CBaseLibraryManager()
-{
-    m_bUniqNameMap = true;
-    m_pLevelLibrary = (CBaseLibrary*)AddLibrary("Level", true);
-    AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CLensFlareManager::~CLensFlareManager()
-{
-    AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLensFlareManager::ClearAll()
-{
-    CBaseLibraryManager::ClearAll();
-
-    m_pLevelLibrary = (CBaseLibrary*)AddLibrary("Level", true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseLibraryItem* CLensFlareManager::MakeNewItem()
-{
-    return new CLensFlareItem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseLibrary* CLensFlareManager::MakeNewLibrary()
-{
-    return new CLensFlareLibrary(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CLensFlareManager::GetRootNodeName()
-{
-    return "FlareLibs";
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CLensFlareManager::GetLibsPath()
-{
-    if (m_libsPath.isEmpty())
-    {
-        m_libsPath += FLARE_LIBS_PATH;
-    }
-
-    return m_libsPath;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLensFlareManager::LoadFlareItemByName(const QString& fullItemName, IOpticsElementBasePtr pDestOptics)
-{
-    if (pDestOptics == NULL)
-    {
-        return false;
-    }
-
-    CLensFlareItem* pLensFlareItem = (CLensFlareItem*)LoadItemByName(fullItemName);
-    if (pLensFlareItem == NULL)
-    {
-        return false;
-    }
-
-    LensFlareUtil::CopyOptics(pLensFlareItem->GetOptics(), pDestOptics, true);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLensFlareManager::Modified()
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return;
-    }
-    if (pEditor->GetCurrentLibrary())
-    {
-        pEditor->GetCurrentLibrary()->SetModified(true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseLibrary* CLensFlareManager::LoadLibrary(const QString& filename, [[maybe_unused]] bool bReload)
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-
-    QString fileNameWithGameFolder(filename);
-
-    fileNameWithGameFolder.replace('\\', '/');
-
-    int nGamePathLength = static_cast<int>(Path::GetEditingGameDataFolder().size());
-    QString gamePathName;
-    if (nGamePathLength < filename.length())
-    {
-        gamePathName = filename.left(nGamePathLength);
-    }
-    if (gamePathName != Path::GetEditingGameDataFolder().c_str())
-    {
-        fileNameWithGameFolder.insert(0, "/");
-        fileNameWithGameFolder.insert(0, Path::GetEditingGameDataFolder().c_str());
-    }
-
-    int nLibraryIndex(-1);
-    bool bSameAsCurrentLibrary(false);
-
-    for (int i = 0; i < m_libs.size(); i++)
-    {
-        if (QString::compare(fileNameWithGameFolder, m_libs[i]->GetFilename(), Qt::CaseInsensitive) == 0)
-        {
-            IDataBaseLibrary* pExistingLib = m_libs[i];
-            for (int j = 0; j < pExistingLib->GetItemCount(); j++)
-            {
-                UnregisterItem((CBaseLibraryItem*)pExistingLib->GetItem(j));
-            }
-            pExistingLib->RemoveAllItems();
-            nLibraryIndex = i;
-            if (pEditor)
-            {
-                bSameAsCurrentLibrary = pEditor->GetCurrentLibrary() == pExistingLib;
-            }
-            break;
-        }
-    }
-
-    TSmartPtr<CBaseLibrary> pLib = MakeNewLibrary();
-    if (!pLib->Load(filename))
-    {
-        Error(QObject::tr("Failed to Load Item Library: %1").arg(filename).toUtf8().data());
-        return NULL;
-    }
-
-    if (nLibraryIndex != -1)
-    {
-        m_libs[nLibraryIndex] = pLib;
-        if (bSameAsCurrentLibrary && pEditor)
-        {
-            pEditor->ResetElementTreeControl();
-            pEditor->SelectLibrary(pLib, true);
-        }
-    }
-    else
-    {
-        m_libs.push_back(pLib);
-    }
-
-    pLib->SetFilename(filename);
-
-    return pLib;
-}
-
-
-bool CLensFlareManager::IsLensFlareLibraryXML(const char* fileSourceFilePath)
-{
-    if ((!fileSourceFilePath) || (!AZStd::wildcard_match("*.xml", fileSourceFilePath)))
-    {
-        return false;
-    }
-
-    using namespace AZ::IO;
-
-    bool isLensFlareLibrary = false;
-
-    // we are forced to read the asset to discover its type since "xml" was the chosen extension.
-    SystemFile::SizeType fileSize = SystemFile::Length(fileSourceFilePath);
-    if (fileSize > 0)
-    {
-        AZStd::vector<char> buffer(fileSize + 1);
-        buffer[fileSize] = 0;
-        if (!AZ::IO::SystemFile::Read(fileSourceFilePath, buffer.data(), fileSize))
-        {
-            return false;
-        }
-
-        AZ::rapidxml::xml_document<char>* xmlDoc = azcreate(AZ::rapidxml::xml_document<char>, (), AZ::SystemAllocator, "LensFlareLibrary Temp XML Reader");
-        if (xmlDoc->parse<AZ::rapidxml::parse_no_data_nodes>(buffer.data()))
-        {
-            AZ::rapidxml::xml_node<char>* xmlRootNode = xmlDoc->first_node();
-            if (xmlRootNode)
-            {
-                if (azstricmp(xmlRootNode->name(), "LensFlareLibrary") == 0)
-                {
-                    isLensFlareLibrary = true;
-                }
-            }
-        }
-
-        azdestroy(xmlDoc, AZ::SystemAllocator, AZ::rapidxml::xml_document<char>);
-    }
-
-    return isLensFlareLibrary;
-}
-
-
-AzToolsFramework::AssetBrowser::SourceFileDetails CLensFlareManager::GetSourceFileDetails(const char* fullSourceFileName)
-{
-    if (IsLensFlareLibraryXML(fullSourceFileName))
-    {
-        return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/LensFlare_16.png");
-    }
-    return AzToolsFramework::AssetBrowser::SourceFileDetails();
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareManager.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareManager.h
deleted file mode 100644
index 9cc7c6fad2..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareManager.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREMANAGER_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREMANAGER_H
-#pragma once
-
-#include "BaseLibraryManager.h"
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-
-class IOpticsElementBase;
-class CLensFlareEditor;
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-class CRYEDIT_API CLensFlareManager
-    : public CBaseLibraryManager
-    , private AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
-
-{
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CLensFlareManager();
-    virtual ~CLensFlareManager();
-
-    void ClearAll();
-
-    virtual bool LoadFlareItemByName(const QString& fullItemName, IOpticsElementBasePtr pDestOptics);
-    void Modified();
-    //! Path to libraries in this manager.
-    QString GetLibsPath();
-    IDataBaseLibrary* LoadLibrary(const QString& filename, bool bReload = false);
-
-    static bool IsLensFlareLibraryXML(const char* fullFilePath);
-
-private:
-    CBaseLibraryItem* MakeNewItem();
-    CBaseLibrary* MakeNewLibrary();
-
-    //! Root node where this library will be saved.
-    QString GetRootNodeName();
-    QString m_libsPath;
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
-    AzToolsFramework::AssetBrowser::SourceFileDetails GetSourceFileDetails(const char* fullSourceFileName) override;
-    virtual AZ::s32 GetPriority() const override { return 1; } // get our priority in before others.
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-};
-
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREMANAGER_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareReferenceTree.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareReferenceTree.cpp
deleted file mode 100644
index 3c628d1b34..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareReferenceTree.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-#include "LensFlareReferenceTree.h"
-
-BEGIN_MESSAGE_MAP (CLensFlareReferenceTree, CXTTreeCtrl)
-END_MESSAGE_MAP ()
-
-CLensFlareReferenceTree::CLensFlareReferenceTree()
-{
-}
-
-CLensFlareReferenceTree::~CLensFlareReferenceTree()
-{
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareReferenceTree.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareReferenceTree.h
deleted file mode 100644
index 77ca781a30..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareReferenceTree.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREREFERENCETREE_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREREFERENCETREE_H
-#pragma once
-
-class CLensFlareReferenceTree
-    : public CXTTreeCtrl
-{
-public:
-
-    CLensFlareReferenceTree();
-    ~CLensFlareReferenceTree();
-
-private:
-
-    DECLARE_MESSAGE_MAP()
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREREFERENCETREE_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUndo.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareUndo.cpp
deleted file mode 100644
index a6b35eba13..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUndo.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareUndo.h"
-
-// Editor
-#include "LensFlareEditor.h"
-#include "LensFlareItem.h"
-#include "LensFlareManager.h"
-#include "LensFlareElementTree.h"
-
-
-void RestoreLensFlareItem(CLensFlareItem* pLensFlareItem, IOpticsElementBasePtr pOptics, const QString& flarePathName)
-{
-    pLensFlareItem->ReplaceOptics(pOptics);
-
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor)
-    {
-        if (pOptics->GetType() == eFT_Root)
-        {
-            pEditor->RenameLensFlareItem(pLensFlareItem, pLensFlareItem->GetGroupName(), LensFlareUtil::GetShortName(flarePathName));
-            pEditor->UpdateLensFlareItem(pLensFlareItem);
-        }
-    }
-}
-
-void ActivateLensFlareItem(CLensFlareItem* pLensFlareItem, bool bRestoreSelectInfo, const QString& selectedFlareItemName)
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return;
-    }
-    if (pLensFlareItem == pEditor->GetLensFlareElementTree()->GetLensFlareItem())
-    {
-        pEditor->UpdateLensFlareItem(pLensFlareItem);
-        if (bRestoreSelectInfo)
-        {
-            pEditor->SelectItemInLensFlareElementTreeByName(selectedFlareItemName);
-        }
-    }
-}
-
-CUndoLensFlareItem::CUndoLensFlareItem(CLensFlareItem* pLensFlareItem, const QString& undoDescription)
-{
-    if (pLensFlareItem)
-    {
-        m_Undo.m_pOptics = LensFlareUtil::CreateOptics(pLensFlareItem->GetOptics());
-        m_flarePathName = pLensFlareItem->GetFullName();
-        m_Undo.m_bRestoreSelectInfo = false;
-        CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-        if (pEditor)
-        {
-            m_Undo.m_bRestoreSelectInfo = pEditor->GetSelectedLensFlareName(m_Undo.m_selectedFlareItemName);
-        }
-        m_undoDescription = undoDescription;
-    }
-}
-
-CUndoLensFlareItem::~CUndoLensFlareItem()
-{
-}
-
-void CUndoLensFlareItem::Undo(bool bUndo)
-{
-    if (bUndo)
-    {
-        CLensFlareItem* pLensFlareItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(m_flarePathName);
-        CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-        if (pEditor && pLensFlareItem)
-        {
-            m_Redo.m_bRestoreSelectInfo = false;
-            m_Redo.m_pOptics = LensFlareUtil::CreateOptics(pLensFlareItem->GetOptics());
-            m_Redo.m_bRestoreSelectInfo = pEditor->GetSelectedLensFlareName(m_Redo.m_selectedFlareItemName);
-        }
-    }
-    Restore(m_Undo);
-}
-
-void CUndoLensFlareItem::Redo()
-{
-    Restore(m_Redo);
-}
-
-void CUndoLensFlareItem::Restore(const SData& data)
-{
-    if (data.m_pOptics == NULL)
-    {
-        return;
-    }
-
-    CLensFlareItem* pLensFlareItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(m_flarePathName);
-    if (pLensFlareItem == NULL)
-    {
-        return;
-    }
-    RestoreLensFlareItem(pLensFlareItem, data.m_pOptics, m_flarePathName);
-    ActivateLensFlareItem(pLensFlareItem, data.m_bRestoreSelectInfo, data.m_selectedFlareItemName);
-}
-
-CUndoRenameLensFlareItem::CUndoRenameLensFlareItem(const QString& oldFullName, const QString& newFullName)
-{
-    m_undo.m_oldFullItemName = oldFullName;
-    m_undo.m_newFullItemName = newFullName;
-}
-
-void CUndoRenameLensFlareItem::Undo(bool bUndo)
-{
-    if (bUndo)
-    {
-        m_redo.m_oldFullItemName = m_undo.m_newFullItemName;
-        m_redo.m_newFullItemName = m_undo.m_oldFullItemName;
-    }
-
-    Rename(m_undo);
-}
-
-void CUndoRenameLensFlareItem::Redo()
-{
-    Rename(m_redo);
-}
-
-void CUndoRenameLensFlareItem::Rename(const SUndoDataStruct& data)
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return;
-    }
-
-    CLensFlareItem* pLensFlareItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(data.m_newFullItemName);
-    if (pLensFlareItem == NULL)
-    {
-        return;
-    }
-
-    int nDotPos = data.m_oldFullItemName.indexOf(".");
-    if (nDotPos == -1)
-    {
-        return;
-    }
-
-    QString shortName(LensFlareUtil::GetShortName(data.m_oldFullItemName));
-    QString groupName(LensFlareUtil::GetGroupNameFromFullName(data.m_oldFullItemName));
-    pEditor->RenameLensFlareItem(pLensFlareItem, groupName, shortName);
-    if (pLensFlareItem->GetOptics())
-    {
-        pLensFlareItem->GetOptics()->SetName(shortName.toUtf8().data());
-        LensFlareUtil::UpdateOpticsName(pLensFlareItem->GetOptics());
-    }
-    pEditor->UpdateLensFlareItem(pLensFlareItem);
-}
-
-CUndoLensFlareElementSelection::CUndoLensFlareElementSelection(CLensFlareItem* pLensFlareItem, const QString& flareTreeItemFullName, const QString& undoDescription)
-{
-    if (pLensFlareItem)
-    {
-        m_flarePathNameForUndo = pLensFlareItem->GetFullName();
-        m_flareTreeItemFullNameForUndo = flareTreeItemFullName;
-        m_undoDescription = undoDescription;
-    }
-}
-
-void CUndoLensFlareElementSelection::Undo(bool bUndo)
-{
-    if (bUndo)
-    {
-        m_flarePathNameForRedo = m_flarePathNameForUndo;
-        CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-        if (pEditor)
-        {
-            pEditor->GetSelectedLensFlareName(m_flareTreeItemFullNameForRedo);
-        }
-    }
-
-    CLensFlareItem* pLensFlareItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(m_flarePathNameForUndo);
-    if (pLensFlareItem == NULL)
-    {
-        return;
-    }
-    ActivateLensFlareItem(pLensFlareItem, true, m_flareTreeItemFullNameForUndo);
-}
-
-void CUndoLensFlareElementSelection::Redo()
-{
-    CLensFlareItem* pLensFlareItem = (CLensFlareItem*)GetIEditor()->GetLensFlareManager()->FindItemByName(m_flarePathNameForRedo);
-    if (pLensFlareItem == NULL)
-    {
-        return;
-    }
-    ActivateLensFlareItem(pLensFlareItem, true, m_flareTreeItemFullNameForRedo);
-}
-
-CUndoLensFlareItemSelectionChange::CUndoLensFlareItemSelectionChange(const QString& fullLensFlareItemName, const QString& undoDescription)
-{
-    m_FullLensFlareItemNameForUndo = fullLensFlareItemName;
-    m_undoDescription = undoDescription;
-}
-
-void CUndoLensFlareItemSelectionChange::Undo(bool bUndo)
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return;
-    }
-
-    if (bUndo)
-    {
-        QString currentFullName;
-        pEditor->GetFullSelectedFlareItemName(currentFullName);
-        m_FullLensFlareItemNameForRedo = currentFullName;
-    }
-
-    pEditor->SelectLensFlareItem(m_FullLensFlareItemNameForUndo);
-}
-
-void CUndoLensFlareItemSelectionChange::Redo()
-{
-    CLensFlareEditor* pEditor = CLensFlareEditor::GetLensFlareEditor();
-    if (pEditor == NULL)
-    {
-        return;
-    }
-    pEditor->SelectLensFlareItem(m_FullLensFlareItemNameForRedo);
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUndo.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareUndo.h
deleted file mode 100644
index cf8f76c321..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUndo.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREUNDO_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREUNDO_H
-#pragma once
-
-#include "Undo/IUndoObject.h"
-
-class CLensFlareItem;
-
-class CUndoLensFlareItem
-    : public IUndoObject
-{
-public:
-    CUndoLensFlareItem(CLensFlareItem* pGroupItem, const QString& undoDescription = "Undo Lens Flare Tree");
-    ~CUndoLensFlareItem();
-
-protected:
-    int GetSize()
-    {
-        return sizeof(*this);
-    }
-    QString GetDescription() { return m_undoDescription; };
-    void Undo(bool bUndo);
-    void Redo();
-
-private:
-
-    QString m_undoDescription;
-
-    struct SData
-    {
-        SData()
-        {
-            m_pOptics = NULL;
-        }
-
-        QString m_selectedFlareItemName;
-        bool m_bRestoreSelectInfo;
-        IOpticsElementBasePtr m_pOptics;
-    };
-
-    QString m_flarePathName;
-    SData m_Undo;
-    SData m_Redo;
-
-    void Restore(const SData& data);
-};
-
-class CUndoRenameLensFlareItem
-    : public IUndoObject
-{
-public:
-
-    CUndoRenameLensFlareItem(const QString& oldFullName, const QString& newFullName);
-
-protected:
-
-    int GetSize()
-    {
-        return sizeof(*this);
-    }
-    QString GetDescription() { return m_undoDescription; };
-    void Undo(bool bUndo);
-    void Redo();
-
-private:
-
-    QString m_undoDescription;
-
-    struct SUndoDataStruct
-    {
-        QString m_oldFullItemName;
-        QString m_newFullItemName;
-    };
-
-    void Rename(const SUndoDataStruct& data);
-
-    SUndoDataStruct m_undo;
-    SUndoDataStruct m_redo;
-};
-
-class CUndoLensFlareElementSelection
-    : public IUndoObject
-{
-public:
-    CUndoLensFlareElementSelection(CLensFlareItem* pLensFlareItem, const QString& flareTreeItemFullName, const QString& undoDescription = "Undo Lens Flare Element Tree");
-    ~CUndoLensFlareElementSelection(){}
-
-protected:
-    int GetSize()
-    {
-        return sizeof(*this);
-    }
-    QString GetDescription() { return m_undoDescription; };
-    void Undo(bool bUndo);
-    void Redo();
-
-private:
-
-    QString m_undoDescription;
-
-    QString m_flarePathNameForUndo;
-    QString m_flareTreeItemFullNameForUndo;
-
-    QString m_flarePathNameForRedo;
-    QString m_flareTreeItemFullNameForRedo;
-};
-
-class CUndoLensFlareItemSelectionChange
-    : public IUndoObject
-{
-public:
-    CUndoLensFlareItemSelectionChange(const QString& fullLensFlareItemName, const QString& undoDescription = "Undo Lens Flare element selection");
-    ~CUndoLensFlareItemSelectionChange(){}
-
-protected:
-    int GetSize()
-    {
-        return sizeof(*this);
-    }
-    QString GetDescription() { return m_undoDescription; };
-
-    void Undo(bool bUndo);
-    void Redo();
-
-private:
-    QString m_undoDescription;
-    QString m_FullLensFlareItemNameForUndo;
-    QString m_FullLensFlareItemNameForRedo;
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREUNDO_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUtil.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareUtil.cpp
deleted file mode 100644
index e8ff29f987..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUtil.cpp
+++ /dev/null
@@ -1,1012 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareUtil.h"
-
-// Editor
-#include "Clipboard.h"
-#include "Objects/EntityObject.h"
-#include "Objects/SelectionGroup.h"
-#include "Include/IObjectManager.h"
-
-
-namespace LensFlareUtil
-{
-    IOpticsElementBasePtr CreateOptics(const XmlNodeRef& xmlNode)
-    {
-        IOpticsElementBasePtr pOpticsElement = NULL;
-
-        const char* typeName;
-        if (!xmlNode->getAttr("Type", &typeName))
-        {
-            return NULL;
-        }
-
-        bool bEnable(true);
-        xmlNode->getAttr("Enable", bEnable);
-
-        EFlareType flareType;
-        if (!GetFlareType(typeName, flareType))
-        {
-            return NULL;
-        }
-
-        pOpticsElement = gEnv->pOpticsManager->Create(flareType);
-        if (pOpticsElement == NULL)
-        {
-            return NULL;
-        }
-
-        pOpticsElement->SetEnabled(bEnable);
-
-        if (!FillOpticsFromXML(pOpticsElement, xmlNode))
-        {
-            return NULL;
-        }
-
-        return pOpticsElement;
-    }
-
-    IOpticsElementBasePtr CreateOptics(IOpticsElementBasePtr pOptics, bool bForceTypeToGroup)
-    {
-        if (pOptics == NULL)
-        {
-            return NULL;
-        }
-        IOpticsElementBasePtr pNewOptics = NULL;
-        if (bForceTypeToGroup)
-        {
-            if (pOptics->GetType() == eFT_Root)
-            {
-                pNewOptics = gEnv->pOpticsManager->Create(eFT_Group);
-            }
-        }
-        if (pNewOptics == NULL)
-        {
-            pNewOptics = gEnv->pOpticsManager->Create(pOptics->GetType());
-            if (pNewOptics == NULL)
-            {
-                return NULL;
-            }
-        }
-        CopyOptics(pOptics, pNewOptics, true);
-        return pNewOptics;
-    }
-
-    bool FillOpticsFromXML(IOpticsElementBasePtr pOpticsElement, const XmlNodeRef& xmlNode)
-    {
-        if (!pOpticsElement)
-        {
-            return false;
-        }
-
-        const char* name;
-        if (!xmlNode->getAttr("Name", &name))
-        {
-            return false;
-        }
-
-        const char* typeName;
-        if (!xmlNode->getAttr("Type", &typeName))
-        {
-            return false;
-        }
-        EFlareType flareType;
-        if (!GetFlareType(typeName, flareType))
-        {
-            return false;
-        }
-        if (flareType != pOpticsElement->GetType())
-        {
-            return false;
-        }
-
-        pOpticsElement->SetName(name);
-
-        bool bEnable(true);
-        xmlNode->getAttr("Enable", bEnable);
-        pOpticsElement->SetEnabled(bEnable);
-
-        XmlNodeRef pParamNode = xmlNode->findChild("Params");
-        if (pParamNode == NULL)
-        {
-            return false;
-        }
-
-        LensFlareUtil::FillParams(pParamNode, pOpticsElement);
-        return true;
-    }
-
-    bool CreateXmlData(IOpticsElementBasePtr pOptics, XmlNodeRef& pOutNode)
-    {
-        pOutNode = gEnv->pSystem->CreateXmlNode("FlareItem");
-
-        if (pOptics == NULL || pOutNode == NULL)
-        {
-            return false;
-        }
-
-        QString typeName;
-        if (!GetFlareTypeName(typeName, pOptics))
-        {
-            return false;
-        }
-
-        pOutNode->setAttr("Name", pOptics->GetName().c_str());
-        pOutNode->setAttr("Type", typeName.toUtf8().data());
-        pOutNode->setAttr("Enable", pOptics->IsEnabled());
-
-        XmlNodeRef pParamNode = pOutNode->createNode("Params");
-
-        CVarBlockPtr pVar;
-        SetVariablesTemplateFromOptics(pOptics, pVar);
-
-        pVar->Serialize(pParamNode, false);
-        pOutNode->addChild(pParamNode);
-
-        for (int i = 0, iElementCount(pOptics->GetElementCount()); i < iElementCount; ++i)
-        {
-            XmlNodeRef pNode = NULL;
-            IOpticsElementBasePtr pChildOptics = pOptics->GetElementAt(i);
-            if (!CreateXmlData(pChildOptics, pNode))
-            {
-                continue;
-            }
-
-            pOutNode->addChild(pNode);
-        }
-
-        return true;
-    }
-
-    void SetVariablesTemplateFromOptics(IOpticsElementBasePtr pOptics, CVarBlockPtr& pRootVar, std::vector<IVariable::OnSetCallback*>& funcs)
-    {
-        if (pOptics == NULL)
-        {
-            return;
-        }
-
-        SetVariablesTemplateFromOptics(pOptics, pRootVar);
-
-        for (int i = 0, iNumVariables(pRootVar->GetNumVariables()); i < iNumVariables; ++i)
-        {
-            IVariable* pVariable = pRootVar->GetVariable(i);
-            if (pVariable == NULL)
-            {
-                continue;
-            }
-            for (int k = 0, iNumVariables2(pVariable->GetNumVariables()); k < iNumVariables2; ++k)
-            {
-                IVariable* pChildVariable(pVariable->GetVariable(k));
-                if (pChildVariable == NULL)
-                {
-                    continue;
-                }
-                for (int ii = 0, iSize(funcs.size()); ii < iSize; ++ii)
-                {
-                    pChildVariable->AddOnSetCallback(funcs[ii]);
-                }
-            }
-        }
-    }
-
-    extern void SetVariablesTemplateFromOptics(IOpticsElementBasePtr pOptics, CVarBlockPtr& pRootVar)
-    {
-        if (pOptics == NULL)
-        {
-            return;
-        }
-
-        AZStd::vector<FuncVariableGroup> paramGroups = pOptics->GetEditorParamGroups();
-        pRootVar = new CVarBlock;
-
-        for (int i = 0; i < paramGroups.size(); ++i)
-        {
-            CSmartVariableArray variableArray;
-            FuncVariableGroup* pGroup = &paramGroups[i];
-            if (pGroup == NULL)
-            {
-                continue;
-            }
-
-            QString displayGroupName(pGroup->GetHumanName());
-            if (displayGroupName == "Common")
-            {
-                FlareInfoArray::Props flareInfo = FlareInfoArray::Get();
-                int nTypeIndex = (int)pOptics->GetType();
-                if (nTypeIndex >= 0 && nTypeIndex < flareInfo.size)
-                {
-                    displayGroupName += " : ";
-                    displayGroupName += flareInfo.p[nTypeIndex].name;
-                }
-            }
-
-            AddVariable(pRootVar, variableArray, pGroup->GetName(), displayGroupName.toUtf8().data(), "");
-
-            for (int k = 0; k < pGroup->GetVariableCount(); ++k)
-            {
-                IFuncVariable* pFuncVar = pGroup->GetVariable(k);
-                bool bHardMinLimitation = false;
-
-                const std::pair<float, float> range(pFuncVar->GetMin(), pFuncVar->GetMax());
-
-                if (pFuncVar->paramType == e_FLOAT)
-                {
-                    CSmartVariable<float> floatVar;
-                    AddVariable(variableArray, floatVar, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str());
-                    floatVar->SetLimits(range.first, range.second, 0, bHardMinLimitation, false);
-                    floatVar->Set(pFuncVar->GetFloat());
-                    floatVar->SetUserData(MakeFuncKey(i, k));
-                }
-                else if (pFuncVar->paramType == e_INT)
-                {
-                    CSmartVariable<int> intVar;
-                    AddVariable(variableArray, intVar, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str());
-
-                    bHardMinLimitation = HaveParameterLowBoundary(pFuncVar->name.c_str());
-                    intVar->SetLimits(range.first, range.second, 0, bHardMinLimitation, false);
-
-                    intVar->Set(pFuncVar->GetInt());
-                    intVar->SetUserData(MakeFuncKey(i, k));
-                }
-                else if (pFuncVar->paramType == e_BOOL)
-                {
-                    CSmartVariable<bool> boolVar;
-                    AddVariable(variableArray, boolVar, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str());
-                    boolVar->Set(pFuncVar->GetBool());
-                    boolVar->SetUserData(MakeFuncKey(i, k));
-                }
-                else if (pFuncVar->paramType == e_VEC2)
-                {
-                    CSmartVariable<Vec2> vec2Var;
-                    AddVariable(variableArray, vec2Var, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str());
-                    vec2Var->SetLimits(range.first, range.second, 0, bHardMinLimitation, false);
-                    vec2Var->Set(pFuncVar->GetVec2());
-                    vec2Var->SetUserData(MakeFuncKey(i, k));
-                }
-                else if (pFuncVar->paramType == e_VEC3)
-                {
-                    CSmartVariable<Vec3> vec3Var;
-                    AddVariable(variableArray, vec3Var, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str());
-                    vec3Var->SetLimits(range.first, range.second, 0, bHardMinLimitation, false);
-                    vec3Var->Set(pFuncVar->GetVec3());
-                    vec3Var->SetUserData(MakeFuncKey(i, k));
-                }
-                else if (pFuncVar->paramType == e_VEC4)
-                {
-                    CSmartVariable<Vec4> vec4Var;
-                    AddVariable(variableArray, vec4Var, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str());
-                    vec4Var->SetLimits(range.first, range.second, 0, bHardMinLimitation, false);
-                    vec4Var->Set(pFuncVar->GetVec4());
-                    vec4Var->SetUserData(MakeFuncKey(i, k));
-                }
-                else if (pFuncVar->paramType == e_COLOR)
-                {
-                    CSmartVariable<Vec3> colorVar;
-                    AddVariable(variableArray, colorVar, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str(), IVariable::DT_COLOR);
-                    ColorF color(pFuncVar->GetColorF());
-                    Vec3 colorVec3(color.r, color.g, color.b);
-                    colorVar->Set(colorVec3);
-                    colorVar->SetUserData(MakeFuncKey(i, k));
-
-                    CSmartVariable<int> alphaVar;
-                    QString alphaName(pFuncVar->name.c_str());
-                    alphaName += ".alpha";
-                    QString alphaHumanName(pFuncVar->humanName.c_str());
-                    alphaHumanName += " [alpha]";
-                    AddVariable(variableArray, alphaVar, alphaName.toUtf8().data(), alphaHumanName.toUtf8().data(), pFuncVar->description.c_str());
-                    alphaVar->SetLimits(0, 255, 0, bHardMinLimitation, false);
-                    alphaVar->Set(color.a * 255.0f);
-                    alphaVar->SetUserData(MakeFuncKey(i, k));
-                }
-                else if (pFuncVar->paramType == e_MATRIX33)
-                {
-                    // Reserved part
-                    // This part is for future because Matrix33 type is suppose to be provided in a renderer side
-                }
-                else if (pFuncVar->paramType == e_TEXTURE2D || pFuncVar->paramType == e_TEXTURE3D || pFuncVar->paramType ==  e_TEXTURE_CUBE)
-                {
-                    CSmartVariable<QString> textureVar;
-                    ITexture* pTexture = pFuncVar->GetTexture();
-                    if (pTexture)
-                    {
-                        QString textureName = pTexture->GetName();
-                        textureVar->Set(textureName);
-                    }
-                    AddVariable(variableArray, textureVar, pFuncVar->name.c_str(), pFuncVar->humanName.c_str(), pFuncVar->description.c_str(), IVariable::DT_TEXTURE);
-                    textureVar->SetUserData(MakeFuncKey(i, k));
-                }
-            }
-        }
-    }
-
-    void AddOptics(IOpticsElementBasePtr pParentOptics, const XmlNodeRef& xmlNode)
-    {
-        if (xmlNode == NULL)
-        {
-            return;
-        }
-
-        if (strcmp(xmlNode->getTag(), "FlareItem"))
-        {
-            return;
-        }
-
-        IOpticsElementBasePtr pOptics = CreateOptics(xmlNode);
-        if (pOptics == NULL)
-        {
-            return;
-        }
-        pParentOptics->AddElement(pOptics);
-
-        for (int i = 0, iChildCount(xmlNode->getChildCount()); i < iChildCount; ++i)
-        {
-            AddOptics(pOptics, xmlNode->getChild(i));
-        }
-    }
-
-    void CopyVariable(IFuncVariable* pSrcVar, IFuncVariable* pDestVar)
-    {
-        if (!pSrcVar || !pDestVar)
-        {
-            return;
-        }
-
-        if (pSrcVar->paramType != pDestVar->paramType)
-        {
-            return;
-        }
-
-        if (pSrcVar->paramType == e_FLOAT)
-        {
-            float value = pSrcVar->GetFloat();
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_BOOL)
-        {
-            bool value = pSrcVar->GetBool();
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_INT)
-        {
-            int value = pSrcVar->GetInt();
-            if (HaveParameterLowBoundary(pSrcVar->name.c_str()))
-            {
-                BoundaryProcess(value);
-            }
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_VEC2)
-        {
-            Vec2 value = pSrcVar->GetVec2();
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_VEC3)
-        {
-            Vec3 value = pSrcVar->GetVec3();
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_VEC4)
-        {
-            Vec4 value = pSrcVar->GetVec4();
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_COLOR)
-        {
-            ColorF value = pSrcVar->GetColorF();
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_MATRIX33)
-        {
-            Matrix33 value = pSrcVar->GetMatrix33();
-            pDestVar->InvokeSetter((void*)&value);
-        }
-        else if (pSrcVar->paramType == e_TEXTURE2D || pSrcVar->paramType == e_TEXTURE3D || pSrcVar->paramType == e_TEXTURE_CUBE)
-        {
-            ITexture* value = pSrcVar->GetTexture();
-            pDestVar->InvokeSetter((void*)value);
-        }
-    }
-
-    void CopyOpticsAboutSameOpticsType(IOpticsElementBasePtr pSrcOptics, IOpticsElementBasePtr pDestOptics)
-    {
-        if (pSrcOptics->GetType() != pDestOptics->GetType())
-        {
-            return;
-        }
-
-        AZStd::vector<FuncVariableGroup> srcVarGroups = pSrcOptics->GetEditorParamGroups();
-        AZStd::vector<FuncVariableGroup> destVarGroups = pDestOptics->GetEditorParamGroups();
-
-        if (srcVarGroups.size() != destVarGroups.size())
-        {
-            return;
-        }
-
-        pDestOptics->SetEnabled(pSrcOptics->IsEnabled());
-
-        for (int i = 0, iVarGroupSize(srcVarGroups.size()); i < iVarGroupSize; ++i)
-        {
-            FuncVariableGroup srcVarGroup = srcVarGroups[i];
-            FuncVariableGroup destVarGroup = destVarGroups[i];
-
-            if (srcVarGroup.GetVariableCount() != destVarGroup.GetVariableCount())
-            {
-                continue;
-            }
-
-            for (int k = 0, iVarSize(srcVarGroup.GetVariableCount()); k < iVarSize; ++k)
-            {
-                IFuncVariable* pSrcVar = srcVarGroup.GetVariable(k);
-                IFuncVariable* pDestVar = destVarGroup.GetVariable(k);
-                CopyVariable(pSrcVar, pDestVar);
-            }
-        }
-    }
-
-    bool FindGroupByName(AZStd::vector<FuncVariableGroup>& groupList, const QString& name, int& outIndex)
-    {
-        for (int i = 0, iVarGroupSize(groupList.size()); i < iVarGroupSize; ++i)
-        {
-            if (name == groupList[i].GetName())
-            {
-                outIndex = i;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void CopyOpticsAboutDifferentOpticsType(IOpticsElementBasePtr pSrcOptics, IOpticsElementBasePtr pDestOptics)
-    {
-        if (pSrcOptics->GetType() == pDestOptics->GetType())
-        {
-            return;
-        }
-
-        AZStd::vector<FuncVariableGroup> srcVarGroups = pSrcOptics->GetEditorParamGroups();
-        AZStd::vector<FuncVariableGroup> destVarGroups = pDestOptics->GetEditorParamGroups();
-
-        pDestOptics->SetEnabled(pSrcOptics->IsEnabled());
-
-        for (int i = 0, iVarGroupSize(destVarGroups.size()); i < iVarGroupSize; ++i)
-        {
-            FuncVariableGroup destVarGroup = destVarGroups[i];
-            int nIndex = 0;
-            if (!FindGroupByName(srcVarGroups, destVarGroup.GetName(), nIndex))
-            {
-                continue;
-            }
-            FuncVariableGroup srcVarGroup = srcVarGroups[nIndex];
-
-            for (int k = 0, iVarSize(destVarGroup.GetVariableCount()); k < iVarSize; ++k)
-            {
-                IFuncVariable* pDestVar = destVarGroup.GetVariable(k);
-                IFuncVariable* pSrcVar = srcVarGroup.FindVariable(pDestVar->name.c_str());
-                CopyVariable(pSrcVar, pDestVar);
-            }
-        }
-    }
-
-    void CopyOptics(IOpticsElementBasePtr pSrcOptics, IOpticsElementBasePtr pDestOptics, bool bReculsiveCopy)
-    {
-        if (pSrcOptics->GetType() == pDestOptics->GetType())
-        {
-            CopyOpticsAboutSameOpticsType(pSrcOptics, pDestOptics);
-        }
-        else
-        {
-            CopyOpticsAboutDifferentOpticsType(pSrcOptics, pDestOptics);
-        }
-
-        if (bReculsiveCopy)
-        {
-            pDestOptics->RemoveAll();
-            for (int i = 0, iChildCount(pSrcOptics->GetElementCount()); i < iChildCount; ++i)
-            {
-                IOpticsElementBasePtr pSrcChildOptics = pSrcOptics->GetElementAt(i);
-                IOpticsElementBasePtr pNewOptics = gEnv->pOpticsManager->Create(pSrcChildOptics->GetType());
-                if (pNewOptics == NULL)
-                {
-                    continue;
-                }
-                pNewOptics->SetName(pSrcChildOptics->GetName().c_str());
-                CopyOptics(pSrcChildOptics, pNewOptics, bReculsiveCopy);
-                pDestOptics->AddElement(pNewOptics);
-            }
-        }
-    }
-
-    CEntityObject* GetSelectedLightEntity()
-    {
-        CBaseObject* pSelectedObj = GetIEditor()->GetSelectedObject();
-        if (pSelectedObj == NULL)
-        {
-            return NULL;
-        }
-        if (!qobject_cast<CEntityObject*>(pSelectedObj))
-        {
-            return NULL;
-        }
-        CEntityObject* pEntity = (CEntityObject*)pSelectedObj;
-        if (!pEntity->IsLight())
-        {
-            return NULL;
-        }
-        return pEntity;
-    }
-
-    void GetSelectedLightEntities(std::vector<CEntityObject*>& outLightEntities)
-    {
-        CSelectionGroup* pSelectionGroup = GetIEditor()->GetSelection();
-        if (pSelectionGroup == NULL)
-        {
-            return;
-        }
-        int nSelectionCount = pSelectionGroup->GetCount();
-        outLightEntities.reserve(nSelectionCount);
-        for (int i = 0; i < nSelectionCount; ++i)
-        {
-            CBaseObject* pSelectedObj = pSelectionGroup->GetObject(i);
-            if (!qobject_cast<CEntityObject*>(pSelectedObj))
-            {
-                continue;
-            }
-            CEntityObject* pEntity = (CEntityObject*)pSelectedObj;
-            if (!pEntity->IsLight())
-            {
-                continue;
-            }
-            outLightEntities.push_back(pEntity);
-        }
-    }
-
-    IOpticsElementBasePtr GetSelectedLightOptics()
-    {
-        CEntityObject* pEntity = GetSelectedLightEntity();
-        if (pEntity == NULL)
-        {
-            return NULL;
-        }
-        IOpticsElementBasePtr pEntityOptics = pEntity->GetOpticsElement();
-        if (pEntityOptics == NULL)
-        {
-            return NULL;
-        }
-        return pEntityOptics;
-    }
-
-    IOpticsElementBasePtr FindOptics(IOpticsElementBasePtr pStartOptics, const QString& name)
-    {
-        if (pStartOptics == NULL)
-        {
-            return NULL;
-        }
-
-        if (!QString::compare(pStartOptics->GetName().c_str(), name))
-        {
-            return pStartOptics;
-        }
-
-        for (int i = 0, iElementCount(pStartOptics->GetElementCount()); i < iElementCount; ++i)
-        {
-            IOpticsElementBasePtr pFoundOptics = FindOptics(pStartOptics->GetElementAt(i), name);
-            if (pFoundOptics)
-            {
-                return pFoundOptics;
-            }
-        }
-
-        return NULL;
-    }
-
-    void RemoveOptics(IOpticsElementBasePtr pOptics)
-    {
-        if (pOptics == NULL)
-        {
-            return;
-        }
-
-        IOpticsElementBasePtr pParent = pOptics->GetParent();
-        if (pParent == NULL)
-        {
-            return;
-        }
-
-        for (int i = 0, iElementCount(pParent->GetElementCount()); i < iElementCount; ++i)
-        {
-            if (pOptics == pParent->GetElementAt(i))
-            {
-                pParent->Remove(i);
-                break;
-            }
-        }
-    }
-
-    void ChangeOpticsRootName(IOpticsElementBasePtr pOptics, const QString& newRootName)
-    {
-        if (pOptics == NULL)
-        {
-            return;
-        }
-
-        QString opticsName = pOptics->GetName().c_str();
-        QString opticsRootName;
-
-        int nPos = opticsName.indexOf(".");
-        if (nPos == -1)
-        {
-            opticsRootName = opticsName;
-        }
-        else
-        {
-            opticsRootName = opticsName.left(nPos);
-        }
-
-        opticsName.replace(opticsRootName, newRootName);
-        pOptics->SetName(opticsName.toUtf8().data());
-
-        for (int i = 0, iElementSize(pOptics->GetElementCount()); i < iElementSize; ++i)
-        {
-            ChangeOpticsRootName(pOptics->GetElementAt(i), newRootName);
-        }
-    }
-
-    void UpdateClipboard(const QString& type, const QString& groupName, bool bPasteAtSameLevel, std::vector<SClipboardData>& dataList)
-    {
-        XmlNodeRef rootNode = CreateXMLFromClipboardData(type, groupName, bPasteAtSameLevel, dataList);
-        CClipboard clipboard(nullptr);
-        clipboard.Put(rootNode);
-    }
-
-    XmlNodeRef CreateXMLFromClipboardData(const QString& type, const QString& groupName, bool bPasteAtSameLevel, std::vector<SClipboardData>& dataList)
-    {
-        XmlNodeRef rootNode = gEnv->pSystem->CreateXmlNode();
-        rootNode->setTag("FlareDB");
-        rootNode->setAttr("Type", type.toUtf8().data());
-        rootNode->setAttr("GroupName", groupName.toUtf8().data());
-        rootNode->setAttr("PasteAtSameLevel", bPasteAtSameLevel);
-
-        for (int i = 0, iDataSize(dataList.size()); i < iDataSize; ++i)
-        {
-            XmlNodeRef xmlNode = gEnv->pSystem->CreateXmlNode();
-            xmlNode->setTag("Data");
-            dataList[i].FillXmlNode(xmlNode);
-            rootNode->addChild(xmlNode);
-        }
-
-        return rootNode;
-    }
-
-    void UpdateOpticsName(IOpticsElementBasePtr pOptics)
-    {
-        if (pOptics == NULL)
-        {
-            return;
-        }
-
-        IOpticsElementBasePtr pParent = pOptics->GetParent();
-        if (pParent)
-        {
-            QString oldName = pOptics->GetName().c_str();
-            QString parentName = pParent->GetName().c_str();
-            QString updatedName = parentName + QString(".") + GetShortName(oldName);
-            pOptics->SetName(updatedName.toUtf8().data());
-        }
-
-        for (int i = 0, iElementCount(pOptics->GetElementCount()); i < iElementCount; ++i)
-        {
-            UpdateOpticsName(pOptics->GetElementAt(i));
-        }
-    }
-
-    QString ReplaceLastName(const QString& fullName, const QString& shortName)
-    {
-        int nPos = fullName.lastIndexOf('.');
-        if (nPos == -1)
-        {
-            return shortName;
-        }
-        QString newName = fullName.left(nPos + 1);
-        newName += shortName;
-        return newName;
-    }
-
-    IFuncVariable* GetFuncVariable(IOpticsElementBasePtr pOptics, int nFuncKey)
-    {
-        if (pOptics == NULL)
-        {
-            return NULL;
-        }
-
-        int nGroupIndex = (nFuncKey & 0xFFFF0000) >> 16;
-        int nVarIndex = (nFuncKey & 0x0000FFFF);
-
-        AZStd::vector<FuncVariableGroup> paramGroups = pOptics->GetEditorParamGroups();
-
-        if (nGroupIndex >= paramGroups.size())
-        {
-            return NULL;
-        }
-
-        FuncVariableGroup* pGroup = &paramGroups[nGroupIndex];
-        if (pGroup == NULL)
-        {
-            return NULL;
-        }
-
-        if (nVarIndex >= pGroup->GetVariableCount())
-        {
-            return NULL;
-        }
-
-        return pGroup->GetVariable(nVarIndex);
-    }
-
-    void GetLightEntityObjects(std::vector<CEntityObject*>& outEntityLights)
-    {
-        std::vector<CBaseObject*> pEntityObjects;
-        GetIEditor()->GetObjectManager()->FindObjectsOfType(&CEntityObject::staticMetaObject, pEntityObjects);
-        for (int i = 0, iObjectSize(pEntityObjects.size()); i < iObjectSize; ++i)
-        {
-            CEntityObject* pEntity = (CEntityObject*)pEntityObjects[i];
-            if (pEntity == NULL)
-            {
-                continue;
-            }
-            if (pEntity->CheckFlags(OBJFLAG_DELETED))
-            {
-                continue;
-            }
-            if (!pEntity->IsLight())
-            {
-                continue;
-            }
-            outEntityLights.push_back(pEntity);
-        }
-    }
-
-    void OutputOpticsDebug(IOpticsElementBasePtr pOptics)
-    {
-        QString opticsName;
-        opticsName = QStringLiteral("Optics Name : %1\n").arg(pOptics->GetName().c_str());
-        OutputDebugString(opticsName.toUtf8().data());
-
-        AZStd::vector<FuncVariableGroup> groupArray(pOptics->GetEditorParamGroups());
-        for (int i = 0, iGroupCount(groupArray.size()); i < iGroupCount; ++i)
-        {
-            FuncVariableGroup* pGroup = &groupArray[i];
-
-            QString groupStr;
-            groupStr = QStringLiteral("\tGroup : %1\n").arg(pGroup->GetName());
-            OutputDebugString(groupStr.toUtf8().data());
-
-            for (int k = 0, iParamCount(pGroup->GetVariableCount()); k < iParamCount; ++k)
-            {
-                IFuncVariable* pVar = pGroup->GetVariable(k);
-                if (pVar == NULL)
-                {
-                    continue;
-                }
-                QString str;
-                if (pVar->paramType == e_FLOAT)
-                {
-                    str = QStringLiteral("\t\t%1 : %2\n").arg(pVar->name.c_str()).arg(pVar->GetFloat());
-                }
-                else if (pVar->paramType == e_INT)
-                {
-                    str = QStringLiteral("\t\t%1 : %2\n").arg(pVar->name.c_str()).arg(pVar->GetInt());
-                }
-                else if (pVar->paramType == e_BOOL)
-                {
-                    str = QStringLiteral("\t\t%1 : %2\n").arg(pVar->name.c_str(), pVar->GetBool() ? "TRUE" : "FALSE");
-                }
-                else if (pVar->paramType == e_VEC2)
-                {
-                    str = QStringLiteral("\t\t%1 : %2,%3\n").arg(pVar->name.c_str()).arg(pVar->GetVec2().x).arg(pVar->GetVec2().y);
-                }
-                else if (pVar->paramType == e_VEC3)
-                {
-                    str = QStringLiteral("\t\t%1 : %2,%3,%4\n").arg(pVar->name.c_str()).arg(pVar->GetVec3().x).arg(pVar->GetVec3().y).arg(pVar->GetVec3().z);
-                }
-                else if (pVar->paramType == e_VEC4)
-                {
-                    str = QStringLiteral("\t\t%1 : %2,%3,%4,%5\n").arg(pVar->name.c_str()).arg(pVar->GetVec4().x).arg(pVar->GetVec4().y).arg(pVar->GetVec4().z);
-                }
-                else if (pVar->paramType == e_COLOR)
-                {
-                    str = QStringLiteral("\t\t%1 : %2,%3,%4,%5\n").arg(pVar->name.c_str()).arg(pVar->GetColorF().r).arg(pVar->GetColorF().g).arg(pVar->GetColorF().b).arg(pVar->GetColorF().a);
-                }
-                else if (pVar->paramType == e_TEXTURE2D || pVar->paramType == e_TEXTURE3D || pVar->paramType == e_TEXTURE_CUBE)
-                {
-                    if (pVar->GetTexture())
-                    {
-                        str = QStringLiteral("\t\t%1 : %2\n").arg(pVar->name.c_str(), pVar->GetTexture()->GetName());
-                    }
-                    else
-                    {
-                        str = QStringLiteral("\t\t%1 : NULL\n").arg(pVar->name.c_str());
-                    }
-                }
-                OutputDebugString(str.toUtf8().data());
-            }
-        }
-
-        for (int i = 0, iChildCount(pOptics->GetElementCount()); i < iChildCount; ++i)
-        {
-            OutputOpticsDebug(pOptics->GetElementAt(i));
-        }
-    }
-
-    void FillParams(XmlNodeRef& paramNode, IOpticsElementBase* pOptics)
-    {
-        if (pOptics == NULL)
-        {
-            return;
-        }
-        AZStd::vector<FuncVariableGroup> groupArray(pOptics->GetEditorParamGroups());
-        for (int i = 0, iGroupCount(paramNode->getChildCount()); i < iGroupCount; ++i)
-        {
-            XmlNodeRef groupNode = paramNode->getChild(i);
-            if (groupNode == NULL)
-            {
-                continue;
-            }
-
-            int nGroupIndex(0);
-            if (!FindGroup(groupNode->getTag(), pOptics, nGroupIndex))
-            {
-                continue;
-            }
-
-            FuncVariableGroup* pGroup = &groupArray[nGroupIndex];
-            for (int k = 0, iParamCount(pGroup->GetVariableCount()); k < iParamCount; ++k)
-            {
-                IFuncVariable* pVar = pGroup->GetVariable(k);
-                if (pVar == NULL)
-                {
-                    continue;
-                }
-
-                if (pVar->paramType == e_FLOAT)
-                {
-                    float fValue(0);
-                    if (groupNode->getAttr(pVar->name.c_str(), fValue))
-                    {
-                        pVar->InvokeSetter((void*)&fValue);
-                    }
-                }
-                else if (pVar->paramType == e_INT)
-                {
-                    int nValue(0);
-                    if (groupNode->getAttr(pVar->name.c_str(), nValue))
-                    {
-                        pVar->InvokeSetter((void*)&nValue);
-                    }
-                }
-                else if (pVar->paramType == e_BOOL)
-                {
-                    bool bValue(false);
-                    if (groupNode->getAttr(pVar->name.c_str(), bValue))
-                    {
-                        pVar->InvokeSetter((void*)&bValue);
-                    }
-                }
-                else if (pVar->paramType == e_VEC2)
-                {
-                    Vec2 vec2Value;
-                    if (groupNode->getAttr(pVar->name.c_str(), vec2Value))
-                    {
-                        pVar->InvokeSetter((void*)&vec2Value);
-                    }
-                }
-                else if (pVar->paramType == e_VEC3)
-                {
-                    Vec3 vec3Value;
-                    if (groupNode->getAttr(pVar->name.c_str(), vec3Value))
-                    {
-                        pVar->InvokeSetter((void*)&vec3Value);
-                    }
-                }
-                else if (pVar->paramType == e_VEC4)
-                {
-                    const char* strVec4Value;
-                    if (groupNode->getAttr(pVar->name.c_str(), &strVec4Value))
-                    {
-                        Vec4 vec4Value;
-                        ExtractVec4FromString(strVec4Value, vec4Value);
-                        pVar->InvokeSetter((void*)&vec4Value);
-                    }
-                }
-                else if (pVar->paramType == e_COLOR)
-                {
-                    Vec3 vec3Value;
-                    if (!groupNode->getAttr(pVar->name.c_str(), vec3Value))
-                    {
-                        continue;
-                    }
-                    string alphaStr = string(pVar->name.c_str()) + ".alpha";
-                    int alpha;
-                    if (!groupNode->getAttr(alphaStr.c_str(), alpha))
-                    {
-                        continue;
-                    }
-                    ColorF color;
-                    color.r = vec3Value.x;
-                    color.g = vec3Value.y;
-                    color.b = vec3Value.z;
-                    color.a = (float)alpha / 255.0f;
-                    pVar->InvokeSetter((void*)&color);
-                }
-                else if (pVar->paramType == e_MATRIX33)
-                {
-                    //reserved
-                }
-                else if (pVar->paramType == e_TEXTURE2D || pVar->paramType == e_TEXTURE3D || pVar->paramType == e_TEXTURE_CUBE)
-                {
-                    const char* textureName;
-                    if (!groupNode->getAttr(pVar->name.c_str(), &textureName))
-                    {
-                        continue;
-                    }
-                    ITexture* pTexture = NULL;
-                    if (textureName && strlen(textureName) > 0)
-                    {
-                        pTexture = gEnv->pRenderer->EF_LoadTexture(textureName);
-                    }
-                    pVar->InvokeSetter((void*)pTexture);
-                    if (pTexture)
-                    {
-                        pTexture->Release();
-                    }
-                }
-            }
-        }
-    }
-
-    void GetExpandedItemNames(CBaseLibraryItem* item, const QString& groupName, const QString& itemName, QString& outNameWithGroup, QString& outFullName)
-    {
-        QString name;
-        if (!groupName.isEmpty())
-        {
-            name = groupName + ".";
-        }
-        name += itemName;
-        QString fullName = name;
-        if (item->GetLibrary())
-        {
-            fullName = item->GetLibrary()->GetName() + "." + name;
-        }
-        outNameWithGroup = name;
-        outFullName = fullName;
-    }
-
-    QModelIndex GetTreeItemByHitTest(QTreeView& treeCtrl)
-    {
-        return treeCtrl.indexAt(treeCtrl.mapFromGlobal(QCursor::pos()));
-    }
-
-    int FindOpticsIndexUnderParentOptics(IOpticsElementBasePtr pOptics, IOpticsElementBasePtr pParentOptics)
-    {
-        for (int i = 0, iElementSize(pParentOptics->GetElementCount()); i < iElementSize; ++i)
-        {
-            if (pParentOptics->GetElementAt(i) == pOptics)
-            {
-                return i + 1;
-            }
-        }
-        return -1;
-    }
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUtil.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareUtil.h
deleted file mode 100644
index d9fb3e380c..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareUtil.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREUTIL_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREUTIL_H
-#pragma once
-
-#include <QTreeView>
-#include <QModelIndex>
-
-#include "Util/Variable.h"
-
-#include "IFlares.h"
-class CEntityObject;
-
-class QTreeView;
-
-#define LENSFLARE_ELEMENT_TREE "LensFlareElementTree"
-#define LENSFLARE_ITEM_TREE "LensFlareItemTree"
-#define FLARECLIPBOARDTYPE_COPY "Copy"
-#define FLARECLIPBOARDTYPE_CUT "Cut"
-
-namespace LensFlareUtil
-{
-    inline bool IsElement(EFlareType type)
-    {
-        return type != eFT__Base__ && type != eFT_Root && type != eFT_Group;
-    }
-    inline bool IsGroup(EFlareType type)
-    {
-        return type == eFT_Root || type == eFT_Group;
-    }
-    inline bool IsValidFlare(EFlareType type)
-    {
-        return type >= eFT__Base__ && type < eFT_Max;
-    }
-
-    inline void AddVariable(CVariableBase& varArray, CVariableBase& var, const char* varName, const char* humanVarName, const char* description, char dataType = IVariable::DT_SIMPLE)
-    {
-        if (varName)
-        {
-            var.SetName(varName);
-        }
-        if (humanVarName)
-        {
-            var.SetHumanName(humanVarName);
-        }
-        if (description)
-        {
-            var.SetDescription(description);
-        }
-        var.SetDataType(dataType);
-        varArray.AddVariable(&var);
-    }
-
-    inline void AddVariable(CVarBlock* vars, CVariableBase& var, const char* varName, const char* humanVarName, const char* description, unsigned char dataType = IVariable::DT_SIMPLE)
-    {
-        if (varName)
-        {
-            var.SetName(varName);
-        }
-        if (humanVarName)
-        {
-            var.SetHumanName(humanVarName);
-        }
-        if (description)
-        {
-            var.SetDescription(description);
-        }
-        var.SetDataType(dataType);
-        vars->AddVariable(&var);
-    }
-
-    inline bool GetFlareType(const QString& typeName, EFlareType& outType)
-    {
-        FlareInfoArray::Props array = FlareInfoArray::Get();
-        for (size_t i = 0; i < array.size; ++i)
-        {
-            if (typeName == array.p[i].name)
-            {
-                outType = array.p[i].type;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    inline bool GetFlareTypeName(QString& outTypeName, IOpticsElementBasePtr pOptics)
-    {
-        if (pOptics == NULL)
-        {
-            return false;
-        }
-
-        const FlareInfoArray::Props array = FlareInfoArray::Get();
-        for (size_t i = 0; i < array.size; ++i)
-        {
-            if (array.p[i].type == pOptics->GetType())
-            {
-                outTypeName = array.p[i].name;
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    inline QString GetShortName(const QString& name)
-    {
-        int nPos = name.lastIndexOf('.');
-        if (nPos == -1)
-        {
-            return name;
-        }
-        return name.right(name.length() - nPos - 1);
-    }
-
-    inline QString GetGroupNameFromName(const QString& name)
-    {
-        int nPos = name.lastIndexOf('.');
-        if (nPos == -1)
-        {
-            return name;
-        }
-        return name.left(nPos);
-    }
-
-    inline QString GetGroupNameFromFullName(const QString& fullItemName)
-    {
-        int nLastDotPos = fullItemName.lastIndexOf('.');
-        if (nLastDotPos == -1)
-        {
-            return fullItemName;
-        }
-
-        QString name = GetGroupNameFromName(fullItemName);
-
-        int nFirstDotPos = name.indexOf('.');
-        if (nFirstDotPos == -1)
-        {
-            return name;
-        }
-
-        return name.right(name.length() - nFirstDotPos - 1);
-    }
-
-    inline bool HaveParameterLowBoundary(const QString& paramName)
-    {
-        if (!QString::compare(paramName, "Noiseseed", Qt::CaseInsensitive) || !QString::compare(paramName, "translation", Qt::CaseInsensitive) || !QString::compare(paramName, "position", Qt::CaseInsensitive) || !QString::compare(paramName, "rotation", Qt::CaseInsensitive))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    inline int MakeFuncKey(int nGroupIndex, int nVarIndex)
-    {
-        return (nGroupIndex << 16) | nVarIndex;
-    }
-
-    template<class T>
-    inline void BoundaryProcess(T& fValue)
-    {
-        if (fValue < 0)
-        {
-            fValue = 0;
-        }
-    }
-
-    inline void BoundaryProcess(Vec2& v)
-    {
-        if (v.x < 0)
-        {
-            v.x = 0;
-        }
-        if (v.y < 0)
-        {
-            v.y = 0;
-        }
-    }
-
-    inline void BoundaryProcess(Vec3& v)
-    {
-        if (v.x < 0)
-        {
-            v.x = 0;
-        }
-        if (v.y < 0)
-        {
-            v.y = 0;
-        }
-        if (v.z < 0)
-        {
-            v.z = 0;
-        }
-    }
-
-    inline void BoundaryProcess(Vec4& v)
-    {
-        if (v.x < 0)
-        {
-            v.x = 0;
-        }
-        if (v.y < 0)
-        {
-            v.y = 0;
-        }
-        if (v.z < 0)
-        {
-            v.z = 0;
-        }
-        if (v.w < 0)
-        {
-            v.w = 0;
-        }
-    }
-
-    inline bool ExtractVec4FromString(const string& buffer, Vec4& outVec4)
-    {
-        int nCount(0);
-        string copiedBuffer(buffer);
-        int commaPos(0);
-        while (nCount < 4 || commaPos != -1)
-        {
-            commaPos = copiedBuffer.find(",");
-            string strV;
-            if (commaPos == -1)
-            {
-                strV = copiedBuffer;
-            }
-            else
-            {
-                strV = copiedBuffer.Left(commaPos);
-                strV += ",";
-            }
-            copiedBuffer.replace(0, commaPos + 1, "");
-            outVec4[nCount++] = (float)atof(strV.c_str());
-        }
-        return nCount == 4;
-    }
-
-    void FillParams(XmlNodeRef& paramNode, IOpticsElementBase* pOptics);
-
-    inline bool FindGroup(const char* groupName, IOpticsElementBase* pOptics, int& nOutGroupIndex)
-    {
-        if (groupName == NULL)
-        {
-            return false;
-        }
-
-        AZStd::vector<FuncVariableGroup> groupArray = pOptics->GetEditorParamGroups();
-        for (int i = 0, iCount(groupArray.size()); i < iCount; ++i)
-        {
-            if (!_stricmp(groupArray[i].GetName(), groupName))
-            {
-                nOutGroupIndex = i;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    struct SClipboardData
-    {
-        SClipboardData(){}
-        ~SClipboardData(){}
-        SClipboardData(const QString& from, const QString& lensFlareFullPath, const QString& lensOpticsPath)
-            : m_From(from)
-            , m_LensFlareFullPath(lensFlareFullPath)
-            , m_LensOpticsPath(lensOpticsPath)
-        {
-        }
-
-        void FillXmlNode(XmlNodeRef node)
-        {
-            if (node == NULL)
-            {
-                return;
-            }
-            node->setAttr("From", m_From.toUtf8().data());
-            node->setAttr("FlareFullPath", m_LensFlareFullPath.toUtf8().data());
-            node->setAttr("OpticsPath", m_LensOpticsPath.toUtf8().data());
-        }
-
-        void FillThisFromXmlNode(XmlNodeRef node)
-        {
-            if (node == NULL)
-            {
-                return;
-            }
-            node->getAttr("From", m_From);
-            node->getAttr("FlareFullPath", m_LensFlareFullPath);
-            node->getAttr("OpticsPath", m_LensOpticsPath);
-        }
-
-        QString m_From;
-        QString m_LensFlareFullPath;
-        QString m_LensOpticsPath;
-    };
-
-    struct SDragAndDropInfo
-    {
-        SDragAndDropInfo()
-        {
-            m_XMLContents = NULL;
-            m_bDragging = false;
-        }
-        ~SDragAndDropInfo()
-        {
-            Reset();
-        }
-        void Reset()
-        {
-            m_XMLContents = NULL;
-            m_bDragging = false;
-        }
-        bool m_bDragging;
-        XmlNodeRef m_XMLContents;
-    };
-
-    inline SDragAndDropInfo& GetDragDropInfo()
-    {
-        static SDragAndDropInfo dragDropInfo;
-        return dragDropInfo;
-    }
-
-    int FindOpticsIndexUnderParentOptics(IOpticsElementBasePtr pOptics, IOpticsElementBasePtr pParentOptics);
-    bool IsPointInWindow(const QWidget* pWindow, const QPoint& screenPos);
-    QModelIndex GetTreeItemByHitTest(QTreeView& treeCtrl);
-    QPoint GetDragCursorPos(QWidget* pWnd, const QPoint& point);
-    void GetExpandedItemNames(CBaseLibraryItem* item, const QString& groupName, const QString& itemName, QString& outNameWithGroup, QString& outFullName);
-    void GetSelectedLightEntities(std::vector<CEntityObject*>& outLightEntities);
-    void GetLightEntityObjects(std::vector<CEntityObject*>& outEntityLights);
-    IFuncVariable* GetFuncVariable(IOpticsElementBasePtr pOptics, int nFuncKey);
-    QString ReplaceLastName(const QString& fullName, const QString& shortName);
-    void UpdateOpticsName(IOpticsElementBasePtr pOptics);
-    XmlNodeRef CreateXMLFromClipboardData(const QString& type, const QString& groupName, bool bPasteAtSameLevel, std::vector<SClipboardData>& dataList);
-    void UpdateClipboard(const QString& type, const QString& groupName, bool bPasteAtSameLevel, std::vector<SClipboardData>& dataList);
-    void ChangeOpticsRootName(IOpticsElementBasePtr pOptics, const QString& newRootName);
-    void RemoveOptics(IOpticsElementBasePtr pOptics);
-    IOpticsElementBasePtr FindOptics(IOpticsElementBasePtr pStartOptics, const QString& name);
-    CEntityObject* GetSelectedLightEntity();
-    IOpticsElementBasePtr GetSelectedLightOptics();
-    IOpticsElementBasePtr CreateOptics(const XmlNodeRef& xmlNode);
-    IOpticsElementBasePtr CreateOptics(IOpticsElementBasePtr pOptics, bool bForceTypeToGroup = false);
-    bool FillOpticsFromXML(IOpticsElementBasePtr pOptics, const XmlNodeRef& xmlNode);
-    bool CreateXmlData(IOpticsElementBasePtr pOptics, XmlNodeRef& pOutNode);
-    void SetVariablesTemplateFromOptics(IOpticsElementBasePtr pOptics, CVarBlockPtr& pRootVar, std::vector<IVariable::OnSetCallback*>& funcs);
-    void SetVariablesTemplateFromOptics(IOpticsElementBasePtr pOptics, CVarBlockPtr& pRootVar);
-    void CopyOptics(IOpticsElementBasePtr pSrcOptics, IOpticsElementBasePtr pDestOptics, bool bReculsiveCopy = true);
-    void OutputOpticsDebug(IOpticsElementBasePtr pOptics);
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREUTIL_H
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareView.cpp b/Code/Sandbox/Editor/LensFlareEditor/LensFlareView.cpp
deleted file mode 100644
index 05248b32f5..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareView.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "LensFlareView.h"
-
-// Editor
-#include "LensFlareItem.h"
-#include "LensFlareEditor.h"
-#include "Objects/EntityObject.h"
-#include "Material/MaterialManager.h"
-
-
-CLensFlareView::CLensFlareView(QWidget* parent, Qt::WindowFlags f)
-    : CPreviewModelCtrl(parent, f)
-{
-    InitDialog();
-}
-
-CLensFlareView::~CLensFlareView()
-{
-    CLensFlareEditor::GetLensFlareEditor()->UnregisterLensFlareItemChangeListener(this);
-}
-
-void CLensFlareView::InitDialog()
-{
-    CLensFlareEditor::GetLensFlareEditor()->RegisterLensFlareItemChangeListener(this);
-
-    SetClearColor(ColorF(0, 0, 0, 0));
-    SetGrid(true);
-    SetAxis(true);
-    EnableUpdate(true);
-    m_pLensFlareMaterial = GetIEditor()->GetMaterialManager()->LoadMaterial(CEntityObject::s_LensFlareMaterialName);
-    m_InitCameraPos = m_camera.GetPosition();
-}
-
-void CLensFlareView::RenderObject(_smart_ptr<IMaterial> pMaterial, [[maybe_unused]] SRenderingPassInfo& passInfo)
-{
-    if (m_pLensFlareItem)
-    {
-        IOpticsElementBasePtr pOptics = m_pLensFlareItem->GetOptics();
-        if (pOptics && m_pLensFlareMaterial)
-        {
-            _smart_ptr<IMaterial> pMaterial = m_pLensFlareMaterial->GetMatInfo();
-            if (pMaterial)
-            {
-                m_pRenderer->ForceUpdateGlobalShaderParameters();
-                m_pRenderer->SetViewport(1, 1, m_pRenderer->GetWidth(), m_pRenderer->GetHeight());
-                SShaderItem& shaderItem = pMaterial->GetShaderItem();
-                SLensFlareRenderParam param;
-                param.pCamera = &m_camera;
-                param.pShader = shaderItem.m_pShader;
-                pOptics->Render(&param, Vec3(0, 0, 0));
-            }
-        }
-    }
-}
-
-void CLensFlareView::OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem)
-{
-    if (m_pLensFlareItem != pLensFlareItem)
-    {
-        m_pLensFlareItem = pLensFlareItem;
-        Update(true);
-        m_bHaveAnythingToRender = m_pLensFlareItem != NULL;
-    }
-}
-
-void CLensFlareView::OnLensFlareDeleteItem(CLensFlareItem* pLensFlareItem)
-{
-    if (m_pLensFlareItem == pLensFlareItem)
-    {
-        m_pLensFlareItem = NULL;
-        Update();
-        m_bHaveAnythingToRender = false;
-    }
-}
-
-void CLensFlareView::OnInternalVariableChange([[maybe_unused]] IVariable* pVar)
-{
-    Update();
-}
-
-void CLensFlareView::OnLensFlareChangeElement([[maybe_unused]] CLensFlareElement* pLensFlareElement)
-{
-    Update();
-}
-
-void CLensFlareView::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnCloseScene:
-        ReleaseObject();
-        break;
-    }
-}
diff --git a/Code/Sandbox/Editor/LensFlareEditor/LensFlareView.h b/Code/Sandbox/Editor/LensFlareEditor/LensFlareView.h
deleted file mode 100644
index f514211046..0000000000
--- a/Code/Sandbox/Editor/LensFlareEditor/LensFlareView.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREVIEW_H
-#define CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREVIEW_H
-#pragma once
-
-#include "ILensFlareListener.h"
-#include "Controls/PreviewModelCtrl.h"
-
-class CLensFlareView
-    : public CPreviewModelCtrl
-    , public ILensFlareChangeItemListener
-    , public ILensFlareChangeElementListener
-{
-public:
-    explicit CLensFlareView(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
-    ~CLensFlareView();
-
-    void OnInternalVariableChange(IVariable* pVar);
-    void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-protected:
-
-    void InitDialog();
-    void ProcessKeys(){}
-    void RenderObject(_smart_ptr<IMaterial> pMaterial, SRenderingPassInfo& passInfo);
-
-    void OnLensFlareChangeItem(CLensFlareItem* pLensFlareItem);
-    void OnLensFlareDeleteItem(CLensFlareItem* pLensFlareItem);
-    void OnLensFlareChangeElement(CLensFlareElement* pLensFlareElement);
-
-private:
-
-    QPoint m_prevPoint;
-    Vec3 m_InitCameraPos;
-
-    _smart_ptr<CMaterial> m_pLensFlareMaterial;
-    _smart_ptr<CLensFlareItem> m_pLensFlareItem;
-};
-#endif // CRYINCLUDE_EDITOR_LENSFLAREEDITOR_LENSFLAREVIEW_H
diff --git a/Code/Sandbox/Editor/LevelInfo.cpp b/Code/Sandbox/Editor/LevelInfo.cpp
index 4b8a6d5cac..81441a3797 100644
--- a/Code/Sandbox/Editor/LevelInfo.cpp
+++ b/Code/Sandbox/Editor/LevelInfo.cpp
@@ -20,7 +20,6 @@
 
 // Editor
 #include "Util/fastlib.h"
-#include "Material/MaterialManager.h"   // for CMaterialManager
 
 #include <AzFramework/Terrain/TerrainDataRequestBus.h>
 
@@ -67,7 +66,6 @@ void CLevelInfo::Validate()
 
     // Validate level.
     ValidateObjects();
-    ValidateMaterials();
 
     if (m_pReport->GetErrorCount() == 0)
     {
@@ -186,11 +184,3 @@ void CLevelInfo::ValidateObjects()
         }
     }
 }
-
-//////////////////////////////////////////////////////////////////////////
-void CLevelInfo::ValidateMaterials()
-{
-    // Validate all objects
-    CBaseObjectsArray objects;
-    GetIEditor()->GetMaterialManager()->Validate();
-}
diff --git a/Code/Sandbox/Editor/LevelInfo.h b/Code/Sandbox/Editor/LevelInfo.h
index 0611ad652e..515a21886e 100644
--- a/Code/Sandbox/Editor/LevelInfo.h
+++ b/Code/Sandbox/Editor/LevelInfo.h
@@ -27,7 +27,6 @@ public:
 
 private:
     void ValidateObjects();
-    void ValidateMaterials();
 
     IErrorReport* m_pReport;
 };
diff --git a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h b/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h
index b28a80967a..6659e41122 100644
--- a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h
+++ b/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h
@@ -91,12 +91,10 @@ public:
     MOCK_METHOD0(GetObjectManager, struct IObjectManager* ());
     MOCK_METHOD0(GetSettingsManager, CSettingsManager* ());
     MOCK_METHOD1(GetDBItemManager, IDataBaseManager* (EDataBaseItemType));
-    MOCK_METHOD0(GetMaterialManager, CMaterialManager* ());
     MOCK_METHOD0(GetMaterialManagerLibrary, IBaseLibraryManager* ()); 
     MOCK_METHOD0(GetIEditorMaterialManager, IEditorMaterialManager* ()); 
     MOCK_METHOD0(GetIconManager, IIconManager* ());
     MOCK_METHOD0(GetMusicManager, CMusicManager* ());
-    MOCK_METHOD0(GetLensFlareManager, CLensFlareManager* ());
     MOCK_METHOD2(GetTerrainElevation, float(float , float ));
     MOCK_METHOD0(GetVegetationMap, class CVegetationMap* ());
     MOCK_METHOD0(GetEditorQtApplication, Editor::EditorQtApplication* ());
@@ -135,7 +133,6 @@ public:
     MOCK_METHOD0(GetReferenceCoordSys, RefCoordSys());
     MOCK_METHOD1(FindTemplate, XmlNodeRef(const QString& ));
     MOCK_METHOD2(AddTemplate, void(const QString& , XmlNodeRef& ));
-    MOCK_METHOD1(OpenMaterialLibrary, void (IDataBaseItem*));
     MOCK_METHOD2(OpenView, const QtViewPane* (QString , bool ));
     MOCK_METHOD1(FindView, QWidget* (QString ));
     MOCK_METHOD1(CloseView, bool(const char* ));
@@ -201,7 +198,6 @@ public:
     MOCK_METHOD0(GetLogFile, ILogFile* ());  
     MOCK_METHOD0(UnloadPlugins, void());
     MOCK_METHOD0(LoadPlugins, void());
-    MOCK_CONST_METHOD0(IsNewViewportInteractionModelEnabled, bool());
     MOCK_METHOD1(GetSearchPath, QString(EEditorPathName));
     MOCK_METHOD0(GetEditorPanelUtils, IEditorPanelUtils* ());
 
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_MaterialPythonFuncs.cpp b/Code/Sandbox/Editor/Lib/Tests/test_MaterialPythonFuncs.cpp
deleted file mode 100644
index c27608b695..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_MaterialPythonFuncs.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <Material/MaterialPythonFuncs.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace MaterialPythonFuncsUnitTests
-{
-
-    class MaterialPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
-            // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
-            // in the unit tests.
-            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
-            m_app.RegisterComponentDescriptor(AzToolsFramework::MaterialPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(MaterialPythonBindingsFixture, MaterialEditorCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("create") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("create_multi") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("convert_to_multi") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("duplicate_current") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("merge_selection") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("delete_current") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_submaterial") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_property") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_property") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/LyViewPaneNames.h b/Code/Sandbox/Editor/LyViewPaneNames.h
index c0c2dbdb45..fdbf8bf90c 100644
--- a/Code/Sandbox/Editor/LyViewPaneNames.h
+++ b/Code/Sandbox/Editor/LyViewPaneNames.h
@@ -43,9 +43,7 @@ namespace LyViewPane
     static const char* const TerrainEditor = "Terrain Editor";
     static const char* const TerrainTool = "Terrain Tool";
     static const char* const TerrainTextureLayers = "Terrain Texture Layers";
-    static const char* const MaterialEditor = "Material Editor";
     static const char* const ParticleEditor = "Particle Editor";
-    static const char* const LensFlareEditor = "Lens Flare Editor";
     static const char* const TimeOfDayEditor = "Time Of Day";
     static const char* const AudioControlsEditor = "Audio Controls Editor";
     static const char* const SubstanceEditor = "Substance Editor";
diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp
index 902b04f266..44d65af8cd 100644
--- a/Code/Sandbox/Editor/MainWindow.cpp
+++ b/Code/Sandbox/Editor/MainWindow.cpp
@@ -91,17 +91,14 @@ AZ_POP_DISABLE_WARNING
 
 #include "TrackView/TrackViewDialog.h"
 #include "ErrorReportDialog.h"
-#include "LensFlareEditor/LensFlareEditor.h"
 #include "TimeOfDayDialog.h"
 
 #include "Dialogs/PythonScriptsDialog.h"
-#include "Material/MaterialManager.h"
 #include "EngineSettingsManager.h"
 
 #include "AzAssetBrowser/AzAssetBrowserWindow.h"
 #include "AssetEditor/AssetEditorWindow.h"
 #include "GridSettingsDialog.h"
-#include "MaterialSender.h"
 #include "ActionManager.h"
 
 // uncomment this to show thumbnail demo widget
@@ -435,13 +432,6 @@ MainWindow::MainWindow(QWidget* parent)
 
     setAcceptDrops(true);
 
-#ifdef Q_OS_WIN
-    if (auto aed = QAbstractEventDispatcher::instance())
-    {
-        aed->installNativeEventFilter(this);
-    }
-#endif
-
     // special handling for escape key (outside ActionManager)
     auto* escapeAction = new QAction(this);
     escapeAction->setShortcut(QKeySequence(Qt::Key_Escape));
@@ -508,13 +498,6 @@ void MainWindow::SetActiveView(CLayoutViewPane* v)
 
 MainWindow::~MainWindow()
 {
-#ifdef Q_OS_WIN
-    if (auto aed = QAbstractEventDispatcher::instance())
-    {
-        aed->removeNativeEventFilter(this);
-    }
-#endif
-
     AzToolsFramework::SourceControlNotificationBus::Handler::BusDisconnect();
 
     delete m_toolbarManager;
@@ -756,6 +739,7 @@ void MainWindow::InitActions()
     am->AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, QString());
     am->AddAction(ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE, QString());
     am->AddAction(ID_TOOLBAR_WIDGET_DEBUG_MODE, QString());
+    am->AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, QString());
 
     // File actions
     am->AddAction(ID_FILE_NEW, tr("New Level"))
@@ -891,68 +875,6 @@ void MainWindow::InitActions()
         .SetStatusTip(tr("Redo last undo operation"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateRedo);
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_EDIT_SELECTALL, tr("Select &All"))
-            .SetShortcut(tr("Ctrl+A"))
-            .SetStatusTip(tr("Select all objects"))
-            ->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-        am->AddAction(ID_EDIT_SELECTNONE, tr("Deselect All"))
-            .SetShortcut(tr("Ctrl+Shift+D"))
-            .SetStatusTip(tr("Remove selection from all objects"));
-        am->AddAction(ID_EDIT_INVERTSELECTION, tr("&Invert Selection"))
-            .SetShortcut(tr("Ctrl+Shift+I"));
-    }
-
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_LOCK_SELECTION, tr("Lock Selection"))
-            .SetShortcut(tr("Ctrl+Shift+Space"))
-            .SetToolTip(tr("Lock Selection (Ctrl+Shift+Space)"))
-            .SetStatusTip(tr("Lock Current Selection."));
-    }
-
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        // implemented by EditorTransformComponentSelection when the new Viewport Interaction Model is enabled
-        am->AddAction(ID_EDIT_HIDE, tr("Hide Selection"))
-            .SetShortcut(tr("H"))
-            .SetToolTip(tr("Hide Selection (H)"))
-            .SetStatusTip(tr("Hide selected object(s)."))
-            .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditHide);
-        am->AddAction(ID_EDIT_UNHIDEALL, tr("Unhide All"))
-            .SetShortcut(tr("Ctrl+H"))
-            .SetToolTip(tr("Unhide All (Ctrl+H)"))
-            .SetStatusTip(tr("Unhide all hidden objects."));
-    }
-
-    am->AddAction(ID_EDIT_SHOW_LAST_HIDDEN, tr("Show Last Hidden"))
-        .SetShortcut(tr("Shift+H"))
-        .SetToolTip(tr("Show Last Hidden (Shift+H)"))
-        .SetStatusTip(tr("Show last hidden object."));
-
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_MODIFY_LINK, tr("Parent"));
-        am->AddAction(ID_MODIFY_UNLINK, tr("Un-Parent"));
-    }
-
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        // implemented by EditorTransformComponentSelection when the new Viewport Interaction Model is enabled
-        am->AddAction(ID_EDIT_FREEZE, tr("Lock selection"))
-            .SetShortcut(tr("L"))
-            .SetToolTip(tr("Lock selection (L)"))
-            .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditFreeze)
-            .SetIcon(Style::icon("Locked"))
-            .SetApplyHoverEffect();
-        am->AddAction(ID_EDIT_UNFREEZEALL, tr("Unlock all"))
-            .SetShortcut(tr("Ctrl+L"))
-            .SetToolTip(tr("Unlock All (Ctrl+L)"))
-            .SetIcon(Style::icon("Unlocked"))
-            .SetApplyHoverEffect();
-    }
-
     am->AddAction(ID_EDIT_HOLD, tr("&Hold"))
         .SetShortcut(tr("Ctrl+Alt+H"))
         .SetToolTip(tr("&Hold (Ctrl+Alt+H)"))
@@ -962,55 +884,31 @@ void MainWindow::InitActions()
         .SetToolTip(tr("&Fetch (Ctrl+Alt+F)"))
         .SetStatusTip(tr("Restore saved state (Fetch)"));
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        // implemented by EditorTransformComponentSelection when the new Viewport Interaction Model is enabled
-        am->AddAction(ID_EDIT_DELETE, tr("&Delete"))
-            .SetShortcut(QKeySequence::Delete)
-            .SetStatusTip(tr("Delete selected objects."))
-            ->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-
-        bool isPrefabSystemEnabled = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-        bool prefabWipFeaturesEnabled = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabWipFeaturesEnabled, &AzFramework::ApplicationRequests::ArePrefabWipFeaturesEnabled);
-
-        if (!isPrefabSystemEnabled || (isPrefabSystemEnabled && prefabWipFeaturesEnabled))
-        {
-            am->AddAction(ID_EDIT_CLONE, tr("Duplicate"))
-                .SetShortcut(tr("Ctrl+D"))
-                .SetToolTip(tr("Duplicate (Ctrl+D)"))
-                .SetStatusTip(tr("Duplicate selected objects."));
-        }
-    }
-
     // Modify actions
-    am->AddAction(ID_MODIFY_OBJECT_HEIGHT, tr("Set Object(s) Height..."));
     am->AddAction(ID_EDIT_RENAMEOBJECT, tr("Rename Object(s)..."))
         .SetStatusTip(tr("Rename Object"));
 
     am->AddAction(ID_EDITMODE_MOVE, tr("Move"))
         .SetIcon(Style::icon("Move"))
         .SetApplyHoverEffect()
-        .SetShortcut(GetIEditor()->IsNewViewportInteractionModelEnabled() ? tr("1") : tr("2"))
-        .SetToolTip(GetIEditor()->IsNewViewportInteractionModelEnabled() ? tr("Move (1)") : tr("Move (2)"))
+        .SetShortcut(tr("1"))
+        .SetToolTip(tr("Move (1)"))
         .SetCheckable(true)
         .SetStatusTip(tr("Select and move selected object(s)"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeMove);
     am->AddAction(ID_EDITMODE_ROTATE, tr("Rotate"))
         .SetIcon(Style::icon("Translate"))
         .SetApplyHoverEffect()
-        .SetShortcut(GetIEditor()->IsNewViewportInteractionModelEnabled() ? tr("2") : tr("3"))
-        .SetToolTip(GetIEditor()->IsNewViewportInteractionModelEnabled() ? tr("Rotate (2)") : tr("Rotate (3)"))
+        .SetShortcut(tr("2"))
+        .SetToolTip(tr("Rotate (2)"))
         .SetCheckable(true)
         .SetStatusTip(tr("Select and rotate selected object(s)"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeRotate);
     am->AddAction(ID_EDITMODE_SCALE, tr("Scale"))
         .SetIcon(Style::icon("Scale"))
         .SetApplyHoverEffect()
-        .SetShortcut(GetIEditor()->IsNewViewportInteractionModelEnabled() ? tr("3") : tr("4"))
-        .SetToolTip(GetIEditor()->IsNewViewportInteractionModelEnabled() ? tr("Scale (3)") : tr("Scale (4)"))
+        .SetShortcut(tr("3"))
+        .SetToolTip(tr("Scale (3)"))
         .SetCheckable(true)
         .SetStatusTip(tr("Select and scale selected object(s)"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeScale);
@@ -1030,14 +928,6 @@ void MainWindow::InitActions()
         .SetCheckable(true)
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSnapangle);
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_ROTATESELECTION_XAXIS, tr("Rotate X Axis"));
-        am->AddAction(ID_ROTATESELECTION_YAXIS, tr("Rotate Y Axis"));
-        am->AddAction(ID_ROTATESELECTION_ZAXIS, tr("Rotate Z Axis"));
-        am->AddAction(ID_ROTATESELECTION_ROTATEANGLE, tr("Rotate Angle..."));
-    }
-
     // Display actions
     am->AddAction(ID_WIREFRAME, tr("&Wireframe"))
         .SetShortcut(tr("F3"))
@@ -1046,16 +936,6 @@ void MainWindow::InitActions()
         .SetStatusTip(tr("Render in Wireframe Mode."))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateWireframe);
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_RULER, tr("Ruler"))
-            .SetCheckable(true)
-            .SetIcon(Style::icon("Measure"))
-            .SetApplyHoverEffect()
-            .SetStatusTip(tr("Create temporary ruler to measure distance"))
-            .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateRuler);
-    }
-
     am->AddAction(ID_VIEW_GRIDSETTINGS, tr("Grid Settings..."));
     am->AddAction(ID_SWITCHCAMERA_DEFAULTCAMERA, tr("Default Camera")).SetCheckable(true)
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSwitchToDefaultCamera);
@@ -1170,14 +1050,17 @@ void MainWindow::InitActions()
     am->AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM, tr("Refresh Audio"))
         .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem);
 
-    // Fame actions
+    // Game actions
     am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game"))
+        .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg"))
         .SetShortcut(tr("Ctrl+G"))
         .SetToolTip(tr("Play Game (Ctrl+G)"))
         .SetStatusTip(tr("Activate the game input mode"))
         .SetApplyHoverEffect()
         .SetCheckable(true)
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdatePlayGame);
+    am->AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, tr("Play Console"))
+        .SetText(tr("Play Console"));
     am->AddAction(ID_SWITCH_PHYSICS, tr("Simulate"))
         .SetShortcut(tr("Ctrl+P"))
         .SetToolTip(tr("Simulate (Ctrl+P)"))
@@ -1196,16 +1079,6 @@ void MainWindow::InitActions()
     am->AddAction(ID_PHYSICS_SIMULATEOBJECTS, tr("Simulate Objects"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_GENERATORS_LIGHTING, tr("&Sun Trajectory Tool"))
-            .SetIcon(Style::icon("Lighting"))
-            .SetApplyHoverEffect()
-            .SetStatusTip(tr("Bring up the terrain lighting dialog"));
-        am->AddAction(ID_TERRAIN_TIMEOFDAY, tr("Time Of Day"))
-            .SetStatusTip(tr("Open Time of Day Editor"));
-    }
-
     // Tools actions
     am->AddAction(ID_RELOAD_TEXTURES, tr("Reload Textures/Shaders"))
         .SetStatusTip(tr("Reload all textures."));
@@ -1296,14 +1169,6 @@ void MainWindow::InitActions()
         .SetToolTip(tr("Open Asset Browser"))
         .SetApplyHoverEffect();
 
-    if (!AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        am->AddAction(ID_OPEN_MATERIAL_EDITOR, tr(LyViewPane::MaterialEditor))
-            .SetToolTip(tr("Open Material Editor"))
-            .SetIcon(Style::icon("Material"))
-            .SetApplyHoverEffect();
-    }
-
     AZ::EBusReduceResult<bool, AZStd::logical_or<bool>> emfxEnabled(false);
     using AnimationRequestBus = AzToolsFramework::EditorAnimationSystemRequestsBus;
     using AnimationSystemType = AzToolsFramework::EditorAnimationSystemRequests::AnimationSystem;
@@ -1319,13 +1184,6 @@ void MainWindow::InitActions()
         });
     }
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_OPEN_TRACKVIEW, tr("TrackView"))
-            .SetToolTip(tr("Open Track View"))
-            .SetApplyHoverEffect();
-    }
-
     am->AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, tr("Audio Controls Editor"))
         .SetToolTip(tr("Open Audio Controls Editor"))
         .SetIcon(Style::icon("Audio"))
@@ -1356,14 +1214,6 @@ void MainWindow::InitActions()
         .SetApplyHoverEffect()
         .Connect(&QAction::triggered, this, &MainWindow::OnGotoSelected);
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        am->AddAction(ID_OBJECTMODIFY_SETHEIGHT, tr("Set object(s) height"))
-            .SetIcon(QIcon(":/MainWindow/toolbars/object_toolbar-03.svg"))
-            .SetApplyHoverEffect()
-            .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
-    }
-
     // Misc Toolbar Actions
     am->AddAction(ID_OPEN_SUBSTANCE_EDITOR, tr("Open Substance Editor"))
         .SetApplyHoverEffect();
@@ -1489,6 +1339,14 @@ QToolButton* MainWindow::CreateDebugModeButton()
     return debugModeButton;
 }
 
+QWidget* MainWindow::CreateSpacerRightWidget()
+{
+    QWidget* spacer = new QWidget();
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    spacer->setVisible(true);
+    return spacer;
+}
+
 void MainWindow::InitEnvironmentModeMenu(CVarMenu* environmentModeMenu)
 {
     environmentModeMenu->clear();
@@ -1796,7 +1654,6 @@ void MainWindow::RegisterStdViewClasses()
 
     if (!AZ::Interface<AzFramework::AtomActiveInterface>::Get())
     {
-        CLensFlareEditor::RegisterViewClass();
         CTimeOfDayDialog::RegisterViewClass();
     }
 #ifdef ThumbnailDemo
@@ -2203,35 +2060,6 @@ void MainWindow::RegisterOpenWndCommands()
     }
 }
 
-void MainWindow::MatEditSend(int param)
-{
-    if (param == eMSM_Init || GetIEditor()->IsInMatEditMode())
-    {
-        // In MatEditMode this message is handled by CMatEditMainDlg, which doesn't have
-        // any view panes and opens MaterialDialog directly.
-        return;
-    }
-
-    if (QtViewPaneManager::instance()->OpenPane(LyViewPane::MaterialEditor))
-    {
-        GetIEditor()->GetMaterialManager()->SyncMaterialEditor();
-    }
-}
-
-#ifdef Q_OS_WIN
-bool MainWindow::nativeEventFilter([[maybe_unused]] const QByteArray &eventType, void *message, long *)
-{
-    MSG* msg = static_cast<MSG*>(message);
-    if (msg->message == WM_MATEDITSEND) // For supporting 3ds Max Exporter, Windows Only
-    {
-        MatEditSend(msg->wParam);
-        return true;
-    }
-
-    return false;
-}
-#endif
-
 bool MainWindow::event(QEvent* event)
 {
 #ifdef Q_OS_MAC
@@ -2395,6 +2223,9 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId)
     case ID_TOOLBAR_WIDGET_DEBUG_MODE:
         w = CreateDebugModeButton();
         break;
+    case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
+        w = CreateSpacerRightWidget();
+        break; 
     default:
         qWarning() << Q_FUNC_INFO << "Unknown id " << actionId;
         return nullptr;
diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Sandbox/Editor/MainWindow.h
index 3e652888fe..adf271b383 100644
--- a/Code/Sandbox/Editor/MainWindow.h
+++ b/Code/Sandbox/Editor/MainWindow.h
@@ -24,13 +24,11 @@
 #include <QPointer>
 #include <QToolButton>
 #include <QTimer>
-#include <QAbstractNativeEventFilter>
 
 #include "Include/SandboxAPI.h"
 #include <AzQtComponents/Components/ToolButtonComboBox.h>
 #include <AzQtComponents/Components/Widgets/ToolBar.h>
 #include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-#include <QAbstractNativeEventFilter>
 
 #include "IEditor.h"
 #endif
@@ -93,9 +91,6 @@ class SANDBOX_API MainWindow
     : public QMainWindow
     , public IEditorNotifyListener
     , private AzToolsFramework::SourceControlNotificationBus::Handler
-#ifdef Q_OS_WIN
-    , public QAbstractNativeEventFilter
-#endif
 {
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
@@ -160,13 +155,9 @@ public:
     void UpdateToolsMenu();
 
     int ViewPaneVersion() const;
-    void MatEditSend(int param);
 
     LevelEditorMenuHandler* GetLevelEditorMenuHandler() { return m_levelEditorMenuHandler; }
 
-#ifdef Q_OS_WIN
-    bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override;
-#endif
     bool event(QEvent* event) override;
 
     void OnGotoSliceRoot();
@@ -215,6 +206,7 @@ private:
 
     QWidget* CreateSnapToGridWidget();
     QWidget* CreateSnapToAngleWidget();
+    QWidget* CreateSpacerRightWidget();
 
     QToolButton* CreateUndoRedoButton(int command);
 
diff --git a/Code/Sandbox/Editor/MatEditPreviewDlg.cpp b/Code/Sandbox/Editor/MatEditPreviewDlg.cpp
deleted file mode 100644
index bfabb271c2..0000000000
--- a/Code/Sandbox/Editor/MatEditPreviewDlg.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "MatEditPreviewDlg.h"
-
-// Qt
-#include <QFileDialog>
-#include <QMenuBar>
-#include <QVBoxLayout>
-
-// Editor
-#include "Material/MaterialManager.h"
-#include "Material/MaterialPreviewModelView.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CMatEditPreviewDlg dialog
-
-
-CMatEditPreviewDlg::CMatEditPreviewDlg(QWidget* parent)
-    : QDialog(parent)
-{
-    setAttribute(Qt::WA_DeleteOnClose);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-    setWindowTitle(tr("Material Preview"));
-
-    /* create sub controls */
-    m_previewCtrl.reset(new MaterialPreviewModelView(this));
-    m_menubar.reset(new QMenuBar);
-
-    /* configure layout */
-    QVBoxLayout* layout = new QVBoxLayout();
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(m_menubar.data());
-    layout->addWidget(m_previewCtrl.data());
-    layout->setStretchFactor(m_previewCtrl.data(), 1);
-    setLayout(layout);
-
-    GetIEditor()->GetMaterialManager()->AddListener(this);
-
-    SetupMenuBar();
-
-    OnPreviewPlane();
-    m_previewCtrl->SetMaterial(GetIEditor()->GetMaterialManager()->GetCurrentMaterial() ? GetIEditor()->GetMaterialManager()->GetCurrentMaterial()->GetMatInfo() : nullptr);
-    m_previewCtrl->Update();
-}
-
-CMatEditPreviewDlg::~CMatEditPreviewDlg()
-{
-    GetIEditor()->GetMaterialManager()->RemoveListener(this);
-}
-
-QSize CMatEditPreviewDlg::sizeHint() const
-{
-    return QSize(450, 400);
-}
-
-void CMatEditPreviewDlg::showEvent(QShowEvent* e)
-{
-    QDialog::showEvent(e);
-    resize(sizeHint()); // Because WindowDecorationWrapper resizes it to the minimum for some reason.
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatEditPreviewDlg::SetupMenuBar()
-{
-    QMenu* menu;
-    QAction* action;
-
-    menu = m_menubar->addMenu(tr("Preview"));
-    action = menu->addAction(tr("&Plane"));
-    connect(action, &QAction::triggered, this, &CMatEditPreviewDlg::OnPreviewPlane);
-    action = menu->addAction(tr("&Sphere"));
-    connect(action, &QAction::triggered, this, &CMatEditPreviewDlg::OnPreviewSphere);
-    action = menu->addAction(tr("&Box"));
-    connect(action, &QAction::triggered, this, &CMatEditPreviewDlg::OnPreviewBox);
-    action = menu->addAction(tr("&Teapot"));
-    connect(action, &QAction::triggered, this, &CMatEditPreviewDlg::OnPreviewTeapot);
-    action = menu->addAction(tr("&Custom"));
-    connect(action, &QAction::triggered, this, &CMatEditPreviewDlg::OnPreviewCustom);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatEditPreviewDlg::OnPreviewSphere()
-{
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlSphere.cgf");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatEditPreviewDlg::OnPreviewBox()
-{
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlBox.cgf");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatEditPreviewDlg::OnPreviewTeapot()
-{
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlTeapot.cgf");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatEditPreviewDlg::OnPreviewPlane()
-{
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlPlane.cgf");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMatEditPreviewDlg::OnPreviewCustom()
-{
-    const QString fullFileName =
-        QFileDialog::getOpenFileName(this, tr("Custom Model"), QString(), tr("Objects (*.cgf);;All files (*.*)"));
-    if (!fullFileName.isNull())
-    {
-        m_previewCtrl->LoadModelFile(fullFileName);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CMatEditPreviewDlg message handlers
-
-void CMatEditPreviewDlg::OnDataBaseItemEvent([[maybe_unused]] IDataBaseItem* pItem, EDataBaseItemEvent event)
-{
-    switch (event)
-    {
-    case EDB_ITEM_EVENT_SELECTED:
-    case EDB_ITEM_EVENT_ADD:
-    case EDB_ITEM_EVENT_CHANGED:
-        m_previewCtrl->SetMaterial(GetIEditor()->GetMaterialManager()->GetCurrentMaterial() ? GetIEditor()->GetMaterialManager()->GetCurrentMaterial()->GetMatInfo() : nullptr);
-        break;
-    case EDB_ITEM_EVENT_DELETE:
-        m_previewCtrl->SetMaterial(nullptr);
-        break;
-    }
-}
-
-#include <moc_MatEditPreviewDlg.cpp>
diff --git a/Code/Sandbox/Editor/MatEditPreviewDlg.h b/Code/Sandbox/Editor/MatEditPreviewDlg.h
deleted file mode 100644
index 870d1b901e..0000000000
--- a/Code/Sandbox/Editor/MatEditPreviewDlg.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_MATEDITPREVIEWDLG_H
-#define CRYINCLUDE_EDITOR_MATEDITPREVIEWDLG_H
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QScopedPointer>
-
-#include "IDataBaseManager.h"
-#endif
-
-class MaterialPreviewModelView;
-class QMenuBar;
-
-// MatEditPreviewDlg.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CMatEditPreviewDlg dialog
-class CMatEditPreviewDlg
-    : public QDialog
-    , public IDataBaseManagerListener
-{
-    Q_OBJECT
-    // Construction
-public:
-    CMatEditPreviewDlg(QWidget* parent);   // standard constructor
-    ~CMatEditPreviewDlg();
-
-    QSize sizeHint() const override;
-    void showEvent(QShowEvent*) override;
-
-    //Functions
-
-    virtual void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event);
-
-protected:
-    void SetupMenuBar();
-
-private slots:
-    void OnPreviewSphere();
-    void OnPreviewPlane();
-    void OnPreviewBox();
-    void OnPreviewTeapot();
-    void OnPreviewCustom();
-
-private:
-    QScopedPointer<MaterialPreviewModelView> m_previewCtrl;
-    QScopedPointer<QMenuBar> m_menubar;
-};
-
-#endif // CRYINCLUDE_EDITOR_MATEDITPREVIEWDLG_H
diff --git a/Code/Sandbox/Editor/Material/Material.cpp b/Code/Sandbox/Editor/Material/Material.cpp
deleted file mode 100644
index 3d642a53dd..0000000000
--- a/Code/Sandbox/Editor/Material/Material.cpp
+++ /dev/null
@@ -1,1982 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "Material.h"
-
-// Editor
-#include "MaterialHelpers.h"
-#include "MaterialManager.h"
-#include "UsedResources.h"
-#include "ErrorReport.h"
-#include "Include/ISourceControl.h"
-#include "Undo/IUndoObject.h"
-
-
-static SInputShaderResources defaultShaderResource;
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial::CMaterial(const QString& name, int nFlags)
-    : m_highlightFlags(0)
-    , m_dccMaterialHash(0)
-{
-    m_scFileAttributes = SCC_FILE_ATTRIBUTE_NORMAL;
-
-    m_pParent = 0;
-
-    m_shaderResources = defaultShaderResource;
-    m_shaderResources.m_LMaterial.m_Opacity = 1;
-    m_shaderResources.m_LMaterial.m_Diffuse.Set(1.0f, 1.0f, 1.0f, 1.0f);
-    m_shaderResources.m_LMaterial.m_Specular.Set(0.045f, 0.045f, 0.045f, 1.0f);    // default 59 spec + div by Gamma exponent -> lin
-    m_shaderResources.m_LMaterial.m_Smoothness = 10.0f;
-
-    m_mtlFlags = nFlags;
-    ZeroStruct(m_shaderItem);
-
-    // Default shader.
-    m_shaderName = "Illum";
-    m_nShaderGenMask = 0;
-
-    m_name = name;
-    m_bRegetPublicParams = true;
-    m_bKeepPublicParamsValues = false;
-    m_bIgnoreNotifyChange = false;
-    m_bDummyMaterial = false;
-
-    m_pMatInfo = NULL;
-    m_propagationFlags = 0;
-
-    m_allowLayerActivation = true;
-}
-
-CMaterial::CMaterial(const CMaterial& rhs)
-    : m_scFileAttributes{rhs.m_scFileAttributes}
-    , m_pParent{nullptr}
-    , m_shaderResources{rhs.m_shaderResources}
-    , m_mtlFlags{rhs.m_mtlFlags}
-    , m_shaderName{rhs.m_shaderName}
-    , m_nShaderGenMask{rhs.m_nShaderGenMask}
-    , m_bRegetPublicParams{rhs.m_bRegetPublicParams}
-    , m_bKeepPublicParamsValues{rhs.m_bKeepPublicParamsValues}
-    , m_bDummyMaterial{rhs.m_bDummyMaterial}
-    , m_pMatInfo{nullptr}
-    , m_propagationFlags{rhs.m_propagationFlags}
-    , m_allowLayerActivation{rhs.m_allowLayerActivation}
-    , m_dccMaterialHash(rhs.m_dccMaterialHash)
-{
-    ZeroStruct(m_shaderItem);
-    m_name = rhs.m_name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial::~CMaterial()
-{
-    if (IsModified())
-    {
-        Save(false);
-    }
-
-    // Release used shader.
-    SAFE_RELEASE(m_shaderItem.m_pShader);
-    SAFE_RELEASE(m_shaderItem.m_pShaderResources);
-
-    if (m_pMatInfo)
-    {
-        m_pMatInfo->SetUserData(0);
-        m_pMatInfo = 0;
-    }
-
-    if (!m_subMaterials.empty())
-    {
-        for (int i = 0; i < m_subMaterials.size(); i++)
-        {
-            if (m_subMaterials[i])
-            {
-                m_subMaterials[i]->m_pParent = NULL;
-            }
-        }
-
-        m_subMaterials.clear();
-    }
-
-    if (!IsPureChild() && !(GetFlags() & MTL_FLAG_UIMATERIAL))
-    {
-        // Unregister this material from manager.
-        // Don't use here local variable m_pManager. Manager can be destroyed.
-        if (GetIEditor()->GetMaterialManager())
-        {
-            GetIEditor()->GetMaterialManager()->DeleteItem(this);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetName(const QString& name)
-{
-    if (name != m_name)
-    {
-        QString oldName = GetFullName();
-        m_name = name;
-
-        if (!IsPureChild())
-        {
-            if (GetIEditor()->GetMaterialManager())
-            {
-                GetIEditor()->GetMaterialManager()->OnRenameItem(this, oldName);
-            }
-
-            if (m_pMatInfo)
-            {
-                GetIEditor()->Get3DEngine()->GetMaterialManager()->RenameMaterial(m_pMatInfo, GetName().toUtf8().data());
-            }
-        }
-        else
-        {
-            if (m_pMatInfo)
-            {
-                m_pMatInfo->SetName(m_name.toUtf8().data());
-            }
-        }
-
-        NotifyChanged();
-    }
-
-    if (m_shaderItem.m_pShaderResources)
-    {
-        // Only for correct warning message purposes.
-        m_shaderItem.m_pShaderResources->SetMaterialName(m_name.toUtf8().data());
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-QString CMaterial::GetFilename() const
-{
-    return GetIEditor()->GetMaterialManager()->MaterialToFilename(IsPureChild() && m_pParent ?  m_pParent->m_name : m_name);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMaterial::GetTextureFilenames(QStringList& outFilenames) const
-{
-    for (auto& iter : m_shaderResources.m_TexturesResourcesMap )
-    {
-        const SEfResTexture*    pTexture = (const SEfResTexture*) &(iter.second);
-        QString                 name = QtUtil::ToQString(pTexture->m_Name);
-        if (name.isEmpty())
-        {
-            AZ_Warning("Shaders System", false, "Error:  CMaterial::GetTextureFilenames - texture slot name does not exist for slot %d", iter.first );
-            continue;
-        }
-
-        // Collect image filenames
-        if (IResourceCompilerHelper::IsSourceImageFormatSupported(name.toUtf8().data()))
-        {
-            stl::push_back_unique(outFilenames, Path::GamePathToFullPath(name));
-        }
-
-        // collect source files used in DCC tools
-        QString dccFilename;
-        if (CFileUtil::CalculateDccFilename(name, dccFilename))
-        {
-            stl::push_back_unique(outFilenames, Path::GamePathToFullPath(dccFilename));
-        }
-    }
-
-    if (IsMultiSubMaterial())
-    {
-        for (int i = 0; i < GetSubMaterialCount(); ++i)
-        {
-            CMaterial* pSubMtl = GetSubMaterial(i);
-            if (pSubMtl)
-            {
-                pSubMtl->GetTextureFilenames(outFilenames);
-            }
-        }
-    }
-
-    return outFilenames.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMaterial::GetAnyTextureFilenames(QStringList& outFilenames) const
-{
-    for ( auto& iter : m_shaderResources.m_TexturesResourcesMap )
-    {
-        QString name = QtUtil::ToQString( iter.second.m_Name);
-        if (name.isEmpty())
-        {
-            continue;
-        }
-
-        // Collect any filenames
-        stl::push_back_unique(outFilenames, Path::GamePathToFullPath(name));
-    }
-
-    if (IsMultiSubMaterial())
-    {
-        for (int i = 0; i < GetSubMaterialCount(); ++i)
-        {
-            CMaterial* pSubMtl = GetSubMaterial(i);
-            if (pSubMtl)
-            {
-                pSubMtl->GetAnyTextureFilenames(outFilenames);
-            }
-        }
-    }
-
-    return outFilenames.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::UpdateFileAttributes(bool useSourceControl)
-{
-    QString filename = GetFilename();
-    if (filename.isEmpty())
-    {
-        return;
-    }
-
-    m_scFileAttributes = CFileUtil::GetAttributes(filename.toUtf8().data(), useSourceControl);
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 CMaterial::GetFileAttributes()
-{
-    if (IsDummy())
-    {
-        return m_scFileAttributes;
-    }
-
-    if (IsPureChild() && m_pParent)
-    {
-        return m_pParent->GetFileAttributes();
-    }
-
-    UpdateFileAttributes();
-    return m_scFileAttributes;
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetShaderName(const QString& shaderName)
-{
-    if (m_shaderName != shaderName)
-    {
-        m_bRegetPublicParams = true;
-        m_bKeepPublicParamsValues = false;
-
-        RecordUndo("Change Shader");
-    }
-
-    m_shaderName = shaderName;
-    if (QString::compare(m_shaderName, "nodraw", Qt::CaseInsensitive) == 0)
-    {
-        m_mtlFlags |= MTL_FLAG_NODRAW;
-    }
-    else
-    {
-        m_mtlFlags &= ~MTL_FLAG_NODRAW;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::CheckSpecialConditions()
-{
-    if (QString::compare(m_shaderName, "nodraw", Qt::CaseInsensitive) == 0)
-    {
-        m_mtlFlags |= MTL_FLAG_NODRAW;
-    }
-    else
-    {
-        m_mtlFlags &= ~MTL_FLAG_NODRAW;
-    }
-
-    // If environment texture name have auto/nearest cubemap in it, force material to use auto cube-map for it.
-    SEfResTexture*      pTextureRes = m_shaderResources.GetTextureResource(EFTT_ENV);
-    if (!pTextureRes)
-        return;
-
-    if (!pTextureRes->m_Name.empty())
-    {
-        const char*         sAtPos;
-        sAtPos = strstr(pTextureRes->m_Name.c_str(), "auto_2d");
-        if (sAtPos)
-        {
-            pTextureRes->m_Sampler.m_eTexType = eTT_Auto2D;   // Force Auto-2D
-        }
-        sAtPos = strstr(pTextureRes->m_Name.c_str(), "nearest_cubemap");
-        if (sAtPos)
-        {
-            pTextureRes->m_Sampler.m_eTexType = eTT_NearestCube;  // Force Nearest Cubemap
-        }
-    }
-
-    // Force auto 2D map if user sets texture type
-    if (pTextureRes->m_Sampler.m_eTexType == eTT_Auto2D)
-    {
-        pTextureRes->m_Name = "auto_2d";
-    }
-
-    // Force nearest cube map if user sets texture type
-    if (pTextureRes->m_Sampler.m_eTexType == eTT_NearestCube)
-    {
-        pTextureRes->m_Name = "nearest_cubemap";
-        m_mtlFlags |= MTL_FLAG_REQUIRE_NEAREST_CUBEMAP;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterial::LoadShader()
-{
-    if (m_bDummyMaterial)
-    {
-        return true;
-    }
-
-    CheckSpecialConditions();
-
-    GetIEditor()->GetErrorReport()->SetCurrentValidatorItem(this);
-
-    m_shaderResources.m_ResFlags = m_mtlFlags;
-
-    QString sShader = m_shaderName;
-    if (sShader.isEmpty())
-    {
-        sShader = "<Default>";
-    }
-
-    QByteArray n = m_name.toUtf8();
-    m_shaderResources.m_szMaterialName = n.data();
-    SShaderItem newShaderItem = GetIEditor()->GetRenderer()->EF_LoadShaderItem(sShader.toUtf8().data(), false, 0, &m_shaderResources, m_nShaderGenMask);
-
-    // Shader not found
-    if (newShaderItem.m_pShader && (newShaderItem.m_pShader->GetFlags() & EF_NOTFOUND) != 0)
-    {
-        CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "Failed to load shader \"%s\" in material \"%s\"", newShaderItem.m_pShader->GetName(), m_name.toUtf8().constData());
-    }
-
-    // Release previously used shader (Must be After new shader is loaded, for speed).
-    SAFE_RELEASE(m_shaderItem.m_pShader);
-    SAFE_RELEASE(m_shaderItem.m_pShaderResources);
-
-    m_shaderItem = newShaderItem;
-    if (!m_shaderItem.m_pShader)
-    {
-        CErrorRecord err;
-
-        err.error = QObject::tr("Failed to Load Shader %1").arg(m_shaderName);
-        err.pItem = this;
-
-        GetIEditor()->GetErrorReport()->ReportError(err);
-        GetIEditor()->GetErrorReport()->SetCurrentValidatorItem(NULL);
-        return false;
-    }
-
-    IShader* pShader = m_shaderItem.m_pShader;
-    m_nShaderGenMask = pShader->GetGenerationMask();
-    if (pShader->GetFlags() & EF_NOPREVIEW)
-    {
-        m_mtlFlags |= MTL_FLAG_NOPREVIEW;
-    }
-    else
-    {
-        m_mtlFlags &= ~MTL_FLAG_NOPREVIEW;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Reget shader parms.
-    //////////////////////////////////////////////////////////////////////////
-    if (m_bRegetPublicParams)
-    {
-        if (m_bKeepPublicParamsValues)
-        {
-            m_bKeepPublicParamsValues = false;
-            m_publicVarsCache = XmlHelpers::CreateXmlNode("PublicParams");
-
-            MaterialHelpers::SetXmlFromShaderParams(m_shaderResources, m_publicVarsCache);
-        }
-
-        m_shaderResources.m_ShaderParams = pShader->GetPublicParams();
-        m_bRegetPublicParams = false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // If we have XML node with public parameters loaded, apply it on shader parms.
-    //////////////////////////////////////////////////////////////////////////
-    if (m_publicVarsCache)
-    {
-        MaterialHelpers::SetShaderParamsFromXml(m_shaderResources, m_publicVarsCache);
-        GetIEditor()->GetMaterialManager()->OnUpdateProperties(this, false);
-        m_publicVarsCache = 0;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set shader parms.
-    if (m_shaderItem.m_pShaderResources)
-    {
-        m_shaderItem.m_pShaderResources->SetShaderParams(&m_shaderResources, m_shaderItem.m_pShader);
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    gEnv->pRenderer->UpdateShaderItem(&m_shaderItem, nullptr);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set Shader Params for material layers
-    //////////////////////////////////////////////////////////////////////////
-    if (m_pMatInfo)
-    {
-        UpdateMatInfo();
-    }
-
-    GetIEditor()->GetMaterialManager()->OnLoadShader(this);
-    GetIEditor()->GetErrorReport()->SetCurrentValidatorItem(NULL);
-
-    return true;
-}
-
-bool CMaterial::LoadMaterialLayers()
-{
-    if (!m_pMatInfo)
-    {
-        return false;
-    }
-
-    if (m_shaderItem.m_pShader && m_shaderItem.m_pShaderResources)
-    {
-        // mask generation for base material shader
-        uint32 nMaskGenBase = m_shaderItem.m_pShader->GetGenerationMask();
-        SShaderGen* pShaderGenBase = m_shaderItem.m_pShader->GetGenerationParams();
-
-        for (uint32 l(0); l < MTL_LAYER_MAX_SLOTS; ++l)
-        {
-            SMaterialLayerResources* pCurrLayer = &m_pMtlLayerResources[l];
-            pCurrLayer->m_nFlags |= MTL_FLAG_NODRAW;
-            if (!pCurrLayer->m_shaderName.isEmpty())
-            {
-                if (QString::compare(pCurrLayer->m_shaderName, "nodraw", Qt::CaseInsensitive) == 0)
-                {
-                    // no shader = skip layer
-                    pCurrLayer->m_shaderName.clear();
-                    continue;
-                }
-
-                IShader* pNewShader = GetIEditor()->GetRenderer()->EF_LoadShader(pCurrLayer->m_shaderName.toUtf8().data(), 0);
-
-                // Check if shader loaded
-                if (!pNewShader || (pNewShader->GetFlags() & EF_NOTFOUND) != 0)
-                {
-                    CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "Failed to load material layer shader \"%s\" in material \"%s\"", pCurrLayer->m_shaderName.toUtf8().constData(), m_pMatInfo->GetName());
-                    if (!pNewShader)
-                    {
-                        continue;
-                    }
-                }
-
-                if (!pCurrLayer->m_pMatLayer)
-                {
-                    pCurrLayer->m_pMatLayer = m_pMatInfo->CreateLayer();
-                }
-
-                // mask generation for base material shader
-                uint64 nMaskGenLayer = 0;
-                SShaderGen* pShaderGenLayer = pNewShader->GetGenerationParams();
-                if (pShaderGenBase && pShaderGenLayer)
-                {
-                    for (int nLayerBit(0); nLayerBit < pShaderGenLayer->m_BitMask.size(); ++nLayerBit)
-                    {
-                        SShaderGenBit* pLayerBit = pShaderGenLayer->m_BitMask[nLayerBit];
-
-                        for (int nBaseBit(0); nBaseBit < pShaderGenBase->m_BitMask.size(); ++nBaseBit)
-                        {
-                            SShaderGenBit* pBaseBit = pShaderGenBase->m_BitMask[nBaseBit];
-
-                            // Need to check if flag name is common to both shaders (since flags values can be different), if so activate it on this layer
-                            if (nMaskGenBase & pBaseBit->m_Mask)
-                            {
-                                if (!pLayerBit->m_ParamName.empty() && !pBaseBit->m_ParamName.empty())
-                                {
-                                    if (pLayerBit->m_ParamName ==  pBaseBit->m_ParamName)
-                                    {
-                                        nMaskGenLayer |= pLayerBit->m_Mask;
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // Reload with proper flags
-                SShaderItem newShaderItem = GetIEditor()->GetRenderer()->EF_LoadShaderItem(pCurrLayer->m_shaderName.toUtf8().data(), false, 0, &pCurrLayer->m_shaderResources, nMaskGenLayer);
-                if (!newShaderItem.m_pShader || (newShaderItem.m_pShader->GetFlags() & EF_NOTFOUND) != 0)
-                {
-                    CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "Failed to load material layer shader \"%s\" in material \"%s\"", pCurrLayer->m_shaderName.toUtf8().data(), m_pMatInfo->GetName());
-                    if (!newShaderItem.m_pShader)
-                    {
-                        continue;
-                    }
-                }
-
-                SShaderItem& pCurrShaderItem = pCurrLayer->m_pMatLayer->GetShaderItem();
-
-                if (newShaderItem.m_pShader)
-                {
-                    newShaderItem.m_pShader->AddRef();
-                }
-
-                // Release previously used shader (Must be After new shader is loaded, for speed).
-                SAFE_RELEASE(pCurrShaderItem.m_pShader);
-                SAFE_RELEASE(pCurrShaderItem.m_pShaderResources);
-                SAFE_RELEASE(newShaderItem.m_pShaderResources);
-
-                pCurrShaderItem.m_pShader = newShaderItem.m_pShader;
-                // Copy resources from base material
-                pCurrShaderItem.m_pShaderResources = m_shaderItem.m_pShaderResources->Clone();
-                pCurrShaderItem.m_nTechnique = newShaderItem.m_nTechnique;
-                pCurrShaderItem.m_nPreprocessFlags = newShaderItem.m_nPreprocessFlags;
-
-                // set default params
-                if (pCurrLayer->m_bRegetPublicParams)
-                {
-                    pCurrLayer->m_shaderResources.m_ShaderParams = pCurrShaderItem.m_pShader->GetPublicParams();
-                }
-
-                pCurrLayer->m_bRegetPublicParams = false;
-
-                if (pCurrLayer->m_publicVarsCache)
-                {
-                    MaterialHelpers::SetShaderParamsFromXml(pCurrLayer->m_shaderResources, pCurrLayer->m_publicVarsCache);
-                    pCurrLayer->m_publicVarsCache = 0;
-                }
-
-                if (pCurrShaderItem.m_pShaderResources)
-                {
-                    pCurrShaderItem.m_pShaderResources->SetShaderParams(&pCurrLayer->m_shaderResources, pCurrShaderItem.m_pShader);
-                }
-
-                // Activate layer
-                pCurrLayer->m_nFlags &= ~MTL_FLAG_NODRAW;
-            }
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CMaterial::UpdateMaterialLayers()
-{
-    if (m_pMatInfo && m_shaderItem.m_pShaderResources)
-    {
-        m_pMatInfo->SetLayerCount(MTL_LAYER_MAX_SLOTS);
-
-        uint8 nMaterialLayerFlags = 0;
-
-        for (int l(0); l < MTL_LAYER_MAX_SLOTS; ++l)
-        {
-            SMaterialLayerResources* pCurrLayer = &m_pMtlLayerResources[l];
-            if (pCurrLayer && !pCurrLayer->m_shaderName.isEmpty() && pCurrLayer->m_pMatLayer)
-            {
-                pCurrLayer->m_pMatLayer->SetFlags(pCurrLayer->m_nFlags);
-                m_pMatInfo->SetLayer(l, pCurrLayer->m_pMatLayer);
-
-                if ((pCurrLayer->m_nFlags & MTL_LAYER_USAGE_NODRAW))
-                {
-                    if (!QString::compare(pCurrLayer->m_shaderName, "frozenlayerwip", Qt::CaseInsensitive))
-                    {
-                        nMaterialLayerFlags |= MTL_LAYER_FROZEN;
-                    }
-                }
-            }
-        }
-
-        if (m_shaderItem.m_pShaderResources)
-        {
-            m_shaderItem.m_pShaderResources->SetMtlLayerNoDrawFlags(nMaterialLayerFlags);
-        }
-    }
-}
-
-void CMaterial::UpdateMatInfo()
-{
-    if (m_pMatInfo)
-    {
-        // Mark material invalid.
-        m_pMatInfo->SetFlags(m_mtlFlags);
-        m_pMatInfo->SetShaderItem(m_shaderItem);
-        m_pMatInfo->SetShaderName(m_shaderName.toUtf8().constData());
-        m_pMatInfo->SetSurfaceType(m_surfaceType.toUtf8().constData());
-
-        LoadMaterialLayers();
-        UpdateMaterialLayers();
-
-        m_pMatInfo->SetMaterialLinkName(m_linkedMaterial.toUtf8().data());
-
-        if (IsMultiSubMaterial())
-        {
-            m_pMatInfo->SetSubMtlCount(m_subMaterials.size());
-            for (unsigned int i = 0; i < m_subMaterials.size(); i++)
-            {
-                if (m_subMaterials[i])
-                {
-                    m_pMatInfo->SetSubMtl(i, m_subMaterials[i]->GetMatInfo());
-                }
-                else
-                {
-                    m_pMatInfo->SetSubMtl(i, NULL);
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CVarBlock* CMaterial::GetPublicVars(SInputShaderResources& pShaderResources)
-{
-    return MaterialHelpers::GetPublicVars(pShaderResources);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetShaderParamPublicScript()
-{
-    IShader* pShader = m_shaderItem.m_pShader;
-
-    if (!pShader)
-    {
-        return;
-    }
-
-    if (m_shaderResources.m_ShaderParams.size() == 0 || pShader->GetPublicParams().size() == 0)
-    {
-        return;
-    }
-
-    // We want to inspect public shader param and paste the m_script into our shader resource param script
-    for (int i = 0; i < m_shaderResources.m_ShaderParams.size(); ++i)
-    {
-        SShaderParam &currentShaderParam = m_shaderResources.m_ShaderParams.at(i);
-        for (int j = 0; j < pShader->GetPublicParams().size(); ++j)
-        {
-            const SShaderParam &publicShaderParam = pShader->GetPublicParams().at(j);
-            if ((currentShaderParam.m_Name == publicShaderParam.m_Name) && (currentShaderParam.m_Type == publicShaderParam.m_Type))
-            {
-                currentShaderParam.m_Script = publicShaderParam.m_Script;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetPublicVars(CVarBlock* pPublicVars, CMaterial* pMtl)
-{
-    if (!pMtl->GetShaderResources().m_ShaderParams.empty())
-    {
-        RecordUndo("Set Public Vars");
-    }
-
-    MaterialHelpers::SetPublicVars(pPublicVars, pMtl->GetShaderResources(), pMtl->GetShaderItem().m_pShaderResources, pMtl->GetShaderItem().m_pShader);
-
-    GetIEditor()->GetMaterialManager()->OnUpdateProperties(this, false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CVarBlock* CMaterial::GetShaderGenParamsVars()
-{
-    return MaterialHelpers::GetShaderGenParamsVars(GetShaderItem().m_pShader, m_nShaderGenMask);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetShaderGenParamsVars(CVarBlock* pBlock)
-{
-    RecordUndo("Change Shader GenMask");
-
-    uint64 nGenMask = MaterialHelpers::SetShaderGenParamsVars(GetShaderItem().m_pShader, pBlock);
-    if (m_nShaderGenMask != nGenMask)
-    {
-        m_bRegetPublicParams = true;
-        m_bKeepPublicParamsValues = true;
-        m_nShaderGenMask = nGenMask;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-unsigned int CMaterial::GetTexmapUsageMask() const
-{
-    int mask = 0;
-    if (m_shaderItem.m_pShader)
-    {
-        IShader* pTempl = m_shaderItem.m_pShader;
-        if (pTempl)
-        {
-            mask = pTempl->GetUsedTextureTypes();
-        }
-    }
-    return mask;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::Update()
-{
-    // Reload shader item with new resources and shader.
-    LoadShader();
-
-    // Mark library as modified.
-    SetModified();
-
-    GetIEditor()->SetModifiedFlag();
-
-    // When modifying pure child, mark his parent as modified.
-    if (IsPureChild() && m_pParent)
-    {
-        m_pParent->SetModified();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::Serialize(SerializeContext& ctx)
-{
-    //CBaseLibraryItem::Serialize( ctx );
-
-    XmlNodeRef node = ctx.node;
-    if (ctx.bLoading)
-    {
-        m_bIgnoreNotifyChange = true;
-        m_bRegetPublicParams = true;
-
-        SInputShaderResources& sr = m_shaderResources;
-        m_shaderResources = defaultShaderResource;
-
-        // Loading
-        int flags = m_mtlFlags;
-        if (node->getAttr("MtlFlags", flags))
-        {
-            m_mtlFlags &= ~(MTL_FLAGS_SAVE_MASK);
-            m_mtlFlags |= (flags & (MTL_FLAGS_SAVE_MASK));
-        }
-
-        uint32 dccMaterialHash = 0;
-        node->getAttr("DccMaterialHash", dccMaterialHash);
-        SetDccMaterialHash(dccMaterialHash);
-
-        if (!IsMultiSubMaterial())
-        {
-            node->getAttr("Shader", m_shaderName);
-            node->getAttr("GenMask", m_nShaderGenMask);
-
-            if (!(m_mtlFlags & MTL_64BIT_SHADERGENMASK))
-            {
-                uint32 nShaderGenMask = 0;
-                node->getAttr("GenMask", nShaderGenMask);
-                m_nShaderGenMask = nShaderGenMask;
-            }
-            else
-            {
-                node->getAttr("GenMask", m_nShaderGenMask);
-            }
-
-            // Remap flags if needed
-            if (!(m_mtlFlags & MTL_64BIT_SHADERGENMASK))
-            {
-                m_nShaderGenMask = GetIEditor()->GetRenderer()->EF_GetRemapedShaderMaskGen(m_shaderName.toUtf8().data(), m_nShaderGenMask);
-                m_mtlFlags |= MTL_64BIT_SHADERGENMASK;
-            }
-
-            if (node->getAttr("StringGenMask", m_pszShaderGenMask))
-            {
-                m_nShaderGenMask = GetIEditor()->GetRenderer()->EF_GetShaderGlobalMaskGenFromString(m_shaderName.toUtf8().data(), m_pszShaderGenMask.toUtf8().data(), m_nShaderGenMask);           // get common mask gen
-            }
-            else
-            {
-                // version doens't has string gen mask yet ? Remap flags if needed
-                m_nShaderGenMask = GetIEditor()->GetRenderer()->EF_GetRemapedShaderMaskGen(m_shaderName.toUtf8().data(), m_nShaderGenMask, ((m_mtlFlags & MTL_64BIT_SHADERGENMASK) != 0));
-            }
-            m_mtlFlags |= MTL_64BIT_SHADERGENMASK;
-
-            node->getAttr("SurfaceType", m_surfaceType);
-            node->getAttr("LayerAct", m_allowLayerActivation);
-
-            MaterialHelpers::SetLightingFromXml(sr, node);
-
-            MaterialHelpers::SetTexturesFromXml(sr, node);
-            MaterialHelpers::MigrateXmlLegacyData(sr, node);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Check if we have a link name and if any propagation settings were
-        // present
-        //////////////////////////////////////////////////////////////////////////
-        XmlNodeRef pLinkName = node->findChild("MaterialLinkName");
-        if (pLinkName)
-        {
-            m_linkedMaterial = pLinkName->getAttr("name");
-        }
-        else
-        {
-            m_linkedMaterial = QString();
-        }
-
-        XmlNodeRef pPropagationFlags = node->findChild("MaterialPropagationFlags");
-        if (pPropagationFlags)
-        {
-            pPropagationFlags->getAttr("flags", m_propagationFlags);
-        }
-        else
-        {
-            m_propagationFlags = 0;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Check if we have vertex deform.
-        //////////////////////////////////////////////////////////////////////////
-        MaterialHelpers::SetVertexDeformFromXml(m_shaderResources, node);
-
-        // Serialize sub materials.
-
-        const auto ResizeSubMaterials = [this](size_t count)
-        {
-            for (size_t i = count; i < m_subMaterials.size(); ++i)
-            {
-                if (auto& pSubMtl = m_subMaterials[i])
-                {
-                    pSubMtl->m_pParent = nullptr;
-                }
-            }
-            m_subMaterials.resize(count);
-        };
-
-        XmlNodeRef childsNode = node->findChild("SubMaterials");
-        if (childsNode && !ctx.bIgnoreChilds)
-        {
-            QString name;
-            int nSubMtls = childsNode->getChildCount();
-            ResizeSubMaterials(nSubMtls);
-            for (int i = 0; i < nSubMtls; i++)
-            {
-                auto& pSubMtl = m_subMaterials[i];
-                XmlNodeRef mtlNode = childsNode->getChild(i);
-                if (mtlNode->isTag("Material"))
-                {
-                    mtlNode->getAttr("Name", name);
-                    if (pSubMtl && pSubMtl->IsPureChild())
-                    {
-                        pSubMtl->SetName(name);
-                    }
-                    else
-                    {
-                        if (pSubMtl)
-                        {
-                            pSubMtl->m_pParent = nullptr;
-                        }
-
-                        pSubMtl = new CMaterial(name, MTL_FLAG_PURE_CHILD);
-                        pSubMtl->m_pParent = this;
-                    }
-
-                    SerializeContext childCtx(ctx);
-                    childCtx.node = mtlNode;
-                    pSubMtl->Serialize(childCtx);
-
-                    pSubMtl->m_shaderResources.m_SortPrio = nSubMtls - i - 1;
-                }
-                else
-                {
-                    if (pSubMtl)
-                    {
-                        pSubMtl->m_pParent = nullptr;
-                        pSubMtl = nullptr;
-                    }
-
-                    if (mtlNode->getAttr("Name", name))
-                    {
-                        CMaterial* pMtl = GetIEditor()->GetMaterialManager()->LoadMaterial(name);
-                        if (pMtl && !pMtl->IsMultiSubMaterial())
-                        {
-                            pSubMtl = pMtl;
-                        }
-                    }
-                }
-            }
-
-            m_subMaterials.erase(std::remove(m_subMaterials.begin(), m_subMaterials.end(), nullptr), m_subMaterials.end());
-        }
-        else
-        {
-            ResizeSubMaterials(0);
-        }
-
-        UpdateMatInfo();
-
-        //////////////////////////////////////////////////////////////////////////
-        // Load public parameters.
-        //////////////////////////////////////////////////////////////////////////
-        m_publicVarsCache = node->findChild("PublicParams");
-
-        //////////////////////////////////////////////////////////////////////////
-        // Load material layers data
-        //////////////////////////////////////////////////////////////////////////
-        XmlNodeRef mtlLayersNode = node->findChild("MaterialLayers");
-        if (mtlLayersNode)
-        {
-            int nChildCount = min((int) MTL_LAYER_MAX_SLOTS, (int)  mtlLayersNode->getChildCount());
-            for (int l = 0; l < nChildCount; ++l)
-            {
-                XmlNodeRef layerNode = mtlLayersNode->getChild(l);
-                if (layerNode)
-                {
-                    if (layerNode->getAttr("Name", m_pMtlLayerResources[l].m_shaderName))
-                    {
-                        m_pMtlLayerResources[l].m_bRegetPublicParams = true;
-
-                        bool bNoDraw = false;
-                        layerNode->getAttr("NoDraw", bNoDraw);
-
-                        m_pMtlLayerResources[l].m_publicVarsCache = layerNode->findChild("PublicParams");
-
-                        if (bNoDraw)
-                        {
-                            m_pMtlLayerResources[l].m_nFlags |= MTL_LAYER_USAGE_NODRAW;
-                        }
-                        else
-                        {
-                            m_pMtlLayerResources[l].m_nFlags &= ~MTL_LAYER_USAGE_NODRAW;
-                        }
-
-
-                        bool bFadeOut = false;
-                        layerNode->getAttr("FadeOut", bFadeOut);
-                        if (bFadeOut)
-                        {
-                            m_pMtlLayerResources[l].m_nFlags |= MTL_LAYER_USAGE_FADEOUT;
-                        }
-                        else
-                        {
-                            m_pMtlLayerResources[l].m_nFlags &= ~MTL_LAYER_USAGE_FADEOUT;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (ctx.bUndo)
-        {
-            LoadShader();
-            UpdateMatInfo();
-        }
-
-        m_bIgnoreNotifyChange = false;
-
-        // If copy pasting or undo send update event.
-        if (ctx.bCopyPaste || ctx.bUndo)
-        {
-            NotifyChanged();
-        }
-
-        // NotifyChanged calls SetModified but since we just loaded it, its not actually changed.
-        SetModified(false);
-    }
-    else // If !ctx.bLoading
-    {
-        int extFlags = MTL_64BIT_SHADERGENMASK;
-        {
-            const QString& name = GetName();
-            const size_t len = name.length();
-            if (len > 4 && strstri(name.toUtf8().data() + (len - 4), "_con"))
-            {
-                extFlags |= MTL_FLAG_CONSOLE_MAT;
-            }
-        }
-
-        // Saving.
-        node->setAttr("MtlFlags", m_mtlFlags | extFlags);
-        node->setAttr("DccMaterialHash", GetDccMaterialHash());
-
-        if (!IsMultiSubMaterial())
-        {
-            // store shader gen bit mask string
-            m_pszShaderGenMask = GetIEditor()->GetRenderer()->EF_GetStringFromShaderGlobalMaskGen(m_shaderName.toUtf8().data(), m_nShaderGenMask).c_str();
-
-            node->setAttr("Shader", m_shaderName.toUtf8().data());
-            node->setAttr("GenMask", m_nShaderGenMask);
-            node->setAttr("StringGenMask", m_pszShaderGenMask.toUtf8().data());
-            node->setAttr("SurfaceType", m_surfaceType.toUtf8().data());
-
-            //if (!m_shaderName.IsEmpty() && (stricmp(m_shaderName,"nodraw") != 0))
-            {
-                MaterialHelpers::SetXmlFromLighting(m_shaderResources, node);
-                MaterialHelpers::SetXmlFromTextures(m_shaderResources, node);
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Save out the link name if present and the propagation flags
-        //////////////////////////////////////////////////////////////////////////
-        if (!m_linkedMaterial.isEmpty())
-        {
-            XmlNodeRef pLinkName = node->newChild("MaterialLinkName");
-            pLinkName->setAttr("name", m_linkedMaterial.toUtf8().data());
-        }
-
-        if (m_propagationFlags)
-        {
-            XmlNodeRef pPropagationFlags = node->newChild("MaterialPropagationFlags");
-            pPropagationFlags->setAttr("flags", m_propagationFlags);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Check if we have vertex deform.
-        //////////////////////////////////////////////////////////////////////////
-        MaterialHelpers::SetXmlFromVertexDeform(m_shaderResources, node);
-
-        if (GetSubMaterialCount() > 0)
-        {
-            // Serialize sub materials.
-
-            // Let's not serialize empty submaterials at the end of the list.
-            // Note that IDs of the remaining submaterials stay intact.
-            int count = GetSubMaterialCount();
-            while (count > 0 && !GetSubMaterial(count - 1))
-            {
-                --count;
-            }
-
-            XmlNodeRef childsNode = node->newChild("SubMaterials");
-
-            for (int i = 0; i < count; ++i)
-            {
-                CMaterial* const pSubMtl = GetSubMaterial(i);
-                if (pSubMtl && pSubMtl->IsPureChild())
-                {
-                    XmlNodeRef mtlNode = childsNode->newChild("Material");
-                    mtlNode->setAttr("Name", pSubMtl->GetName().toUtf8().data());
-                    SerializeContext childCtx(ctx);
-                    childCtx.node = mtlNode;
-                    pSubMtl->Serialize(childCtx);
-                }
-                else
-                {
-                    XmlNodeRef mtlNode = childsNode->newChild("MaterialRef");
-                    if (pSubMtl)
-                    {
-                        mtlNode->setAttr("Name", pSubMtl->GetName().toUtf8().data());
-                    }
-                }
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Save public parameters.
-        //////////////////////////////////////////////////////////////////////////
-        if (m_publicVarsCache)
-        {
-            node->addChild(m_publicVarsCache);
-        }
-        else if (!m_shaderResources.m_ShaderParams.empty())
-        {
-            XmlNodeRef publicsNode = node->newChild("PublicParams");
-            MaterialHelpers::SetXmlFromShaderParams(m_shaderResources, publicsNode);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Save material layers data
-        //////////////////////////////////////////////////////////////////////////
-
-        bool bMaterialLayers = false;
-        for (int l(0); l < MTL_LAYER_MAX_SLOTS; ++l)
-        {
-            if (!m_pMtlLayerResources[l].m_shaderName.isEmpty())
-            {
-                bMaterialLayers = true;
-                break;
-            }
-        }
-
-        if (bMaterialLayers)
-        {
-            XmlNodeRef mtlLayersNode = node->newChild("MaterialLayers");
-            for (int l(0); l < MTL_LAYER_MAX_SLOTS; ++l)
-            {
-                XmlNodeRef layerNode = mtlLayersNode->newChild("Layer");
-                if (!m_pMtlLayerResources[l].m_shaderName.isEmpty())
-                {
-                    layerNode->setAttr("Name", m_pMtlLayerResources[l].m_shaderName.toUtf8().data());
-                    layerNode->setAttr("NoDraw", m_pMtlLayerResources[l].m_nFlags & MTL_LAYER_USAGE_NODRAW);
-                    layerNode->setAttr("FadeOut", m_pMtlLayerResources[l].m_nFlags & MTL_LAYER_USAGE_FADEOUT);
-
-                    if (m_pMtlLayerResources[l].m_publicVarsCache)
-                    {
-                        layerNode->addChild(m_pMtlLayerResources[l].m_publicVarsCache);
-                    }
-                    else if (!m_pMtlLayerResources[l].m_shaderResources.m_ShaderParams.empty())
-                    {
-                        XmlNodeRef publicsNode = layerNode->newChild("PublicParams");
-                        MaterialHelpers::SetXmlFromShaderParams(m_pMtlLayerResources[l].m_shaderResources, publicsNode);
-                    }
-                }
-            }
-        }
-
-        if (GetSubMaterialCount() == 0 || GetParent())
-        {
-            node->setAttr("LayerAct", m_allowLayerActivation);
-        }
-    }
-}
-
-/*
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SerializePublics( XmlNodeRef &node,bool bLoading )
-{
-if (bLoading)
-{
-}
-else
-{
-if (m_shaderParams.empty())
-return;
-XmlNodeRef publicsNode = node->newChild( "PublicParams" );
-
-for (int i = 0; i < m_shaderParams.size(); i++)
-{
-XmlNodeRef paramNode = node->newChild( "Param" );
-SShaderParam *pParam = &m_shaderParams[i];
-paramNode->setAttr( "Name",pParam->m_Name );
-switch (pParam->m_Type)
-{
-case eType_BYTE:
-paramNode->setAttr( "Value",(int)pParam->m_Value.m_Byte );
-paramNode->setAttr( "Type",(int)pParam->m_Value.m_Byte );
-break;
-case eType_SHORT:
-paramNode->setAttr( "Value",(int)pParam->m_Value.m_Short );
-break;
-case eType_INT:
-paramNode->setAttr( "Value",(int)pParam->m_Value.m_Int );
-break;
-case eType_FLOAT:
-paramNode->setAttr( "Value",pParam->m_Value.m_Float );
-break;
-case eType_STRING:
-paramNode->setAttr( "Value",pParam->m_Value.m_String );
-break;
-case eType_FCOLOR:
-paramNode->setAttr( "Value",Vec3(pParam->m_Value.m_Color[0],pParam->m_Value.m_Color[1],pParam->m_Value.m_Color[2]) );
-break;
-case eType_VECTOR:
-paramNode->setAttr( "Value",Vec3(pParam->m_Value.m_Vector[0],pParam->m_Value.m_Vector[1],pParam->m_Value.m_Vector[2]) );
-break;
-}
-}
-}
-}
-*/
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::AssignToEntity(IRenderNode* pEntity)
-{
-    assert(pEntity);
-    pEntity->SetMaterial(GetMatInfo());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterial::IsBreakable2D() const
-{
-    if ((GetFlags() & MTL_FLAG_NODRAW) != 0)
-    {
-        return false;
-    }
-
-    const QString& surfaceTypeName = GetSurfaceTypeName();
-    if (ISurfaceTypeManager* pSurfaceManager = GetIEditor()->Get3DEngine()->GetMaterialManager()->GetSurfaceTypeManager())
-    {
-        ISurfaceType* pSurfaceType = pSurfaceManager->GetSurfaceTypeByName(surfaceTypeName.toUtf8().data());
-        if (pSurfaceType && pSurfaceType->GetBreakable2DParams() != 0)
-        {
-            return true;
-        }
-    }
-
-    int count = GetSubMaterialCount();
-    for (int i = 0; i < count; ++i)
-    {
-        const CMaterial* pSub = GetSubMaterial(i);
-        if (!pSub)
-        {
-            continue;
-        }
-        if (pSub->IsBreakable2D())
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetFromMatInfo(_smart_ptr<IMaterial> pMatInfo)
-{
-    assert(pMatInfo);
-
-    m_shaderName = "";
-
-    ClearMatInfo();
-    SetModified(true);
-
-    m_mtlFlags = pMatInfo->GetFlags();
-    if (m_mtlFlags & MTL_FLAG_MULTI_SUBMTL)
-    {
-        // Create sub materials.
-        SetSubMaterialCount(pMatInfo->GetSubMtlCount());
-        for (int i = 0; i < GetSubMaterialCount(); i++)
-        {
-            _smart_ptr<IMaterial> pChildMatInfo = pMatInfo->GetSubMtl(i);
-            if (!pChildMatInfo)
-            {
-                continue;
-            }
-
-            if (pChildMatInfo->GetFlags() & MTL_FLAG_PURE_CHILD)
-            {
-                CMaterial* existingChild = GetSubMaterial(i);
-                if (existingChild)
-                {
-                    existingChild->SetFromMatInfo(pChildMatInfo);
-                }
-                else
-                {
-                    CMaterial* pChild = new CMaterial(pChildMatInfo->GetName(), pChildMatInfo->GetFlags());
-                    pChild->SetFromMatInfo(pChildMatInfo);
-                    SetSubMaterial(i, pChild);
-                }
-            }
-            else
-            {
-                CMaterial* pChild = GetIEditor()->GetMaterialManager()->LoadMaterial(pChildMatInfo->GetName());
-                pChild->SetFromMatInfo(pChildMatInfo);
-                SetSubMaterial(i, pChild);
-            }
-        }
-    }
-    else
-    {
-        SetShaderItem(pMatInfo->GetShaderItem());
-
-        if (m_shaderItem.m_pShaderResources)
-        {
-            m_shaderResources = SInputShaderResources(m_shaderItem.m_pShaderResources);
-        }
-        if (m_shaderItem.m_pShader)
-        {
-            // Get name of template.
-            IShader* pTemplShader = m_shaderItem.m_pShader;
-            if (pTemplShader)
-            {
-                m_nShaderGenMask = pTemplShader->GetGenerationMask();
-            }
-        }
-        m_shaderName = pMatInfo->GetShaderName();
-        ISurfaceType* pSurfaceType = pMatInfo->GetSurfaceType();
-        if (pSurfaceType)
-        {
-            m_surfaceType = pSurfaceType->GetName();
-        }
-        else
-        {
-            m_surfaceType = "";
-        }
-    }
-
-    // Mark as not modified.
-    SetModified(false);
-
-    // Material link names
-    if (const char* szLinkName = pMatInfo->GetMaterialLinkName())
-    {
-        m_linkedMaterial = szLinkName;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Assign mat info.
-    m_pMatInfo = pMatInfo;
-    m_pMatInfo->SetUserData(this);
-    AddRef(); // Let IMaterial keep a reference to us.
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMaterial::GetSubMaterialCount() const
-{
-    return m_subMaterials.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetSubMaterialCount(int nSubMtlsCount)
-{
-    RecordUndo("Multi Material Change");
-    m_subMaterials.resize(nSubMtlsCount);
-    UpdateMatInfo();
-    NotifyChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterial::GetSubMaterial(int index) const
-{
-    const int nSubMats = m_subMaterials.size();
-    assert(index >= 0 && index < nSubMats);
-
-    if (index < 0 || index >= nSubMats)
-    {
-        return NULL;
-    }
-
-    return m_subMaterials[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMaterial::FindMaterialIndex(const QString& name)
-{
-    for (int i = 0; i < m_subMaterials.size(); ++i)
-    {
-        if (m_subMaterials[i]->GetName().compare(name) == 0)
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetSubMaterial(int nSlot, CMaterial* mtl)
-{
-    RecordUndo("Multi Material Change");
-    assert(nSlot >= 0 && nSlot < m_subMaterials.size());
-    if (mtl)
-    {
-        if (mtl->IsMultiSubMaterial())
-        {
-            return;
-        }
-        if (mtl->IsPureChild())
-        {
-            mtl->m_pParent = this;
-        }
-    }
-
-    if (m_subMaterials[nSlot])
-    {
-        m_subMaterials[nSlot]->m_pParent = NULL;
-    }
-    m_subMaterials[nSlot] = mtl;
-
-    if (!m_subMaterials[nSlot])
-    {
-        m_subMaterials.erase(m_subMaterials.begin() + nSlot);
-    }
-
-    UpdateMatInfo();
-    NotifyChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// This method will populate for the material editor the name and tool tip of the 
-// different textures of the current material 
-//CVarBlock* CMaterial::UpdateTextureNames(AZStd::unordered_map<ResourceSlotIndex, CSmartVariableArray>& textureVarsMap)
-CVarBlock* CMaterial::UpdateTextureNames(CSmartVariableArray textureVars[EFTT_MAX])
-{
-    CVarBlock*          pTextureSlots = new CVarBlock;
-    IShader*            pTemplShader = m_shaderItem.m_pShader;
-    int                 nTech = max(0, m_shaderItem.m_nTechnique);
-    SShaderTexSlots*    pShaderSlots = pTemplShader ? pTemplShader->GetUsedTextureSlots(nTech) : nullptr;
-
-    for (EEfResTextures nTexSlot = EEfResTextures(0); nTexSlot < EFTT_MAX; nTexSlot = EEfResTextures(nTexSlot + 1))
-    {
-        if (!MaterialHelpers::IsAdjustableTexSlot((EEfResTextures)nTexSlot))
-        {   // do not take into account virtual slots (such as smoothness - normal's alpha)
-            // in theory this case should not happen as it is filtered from the source list.
-            continue;
-        }
-
-        IVariable*          pVar = textureVars[nTexSlot].GetVar();
-        SShaderTextureSlot* pSlot = pShaderSlots ? pShaderSlots->m_UsedTextureSlots[nTexSlot] : nullptr;
-
-        // If slot is NULL, fall back to default name - name here is the context name (i.e. diffuse, normal..) 
-        // and not the actual texture file name
-        pVar->SetName(pSlot && pSlot->m_Name.length() ? pSlot->m_Name.c_str() : MaterialHelpers::LookupTexName((EEfResTextures) nTexSlot));
-        pVar->SetDescription(pSlot && pSlot->m_Description.length() ? pSlot->m_Description.c_str() : MaterialHelpers::LookupTexDesc((EEfResTextures)nTexSlot));
-
-        int flags = pVar->GetFlags();
-
-        // TODO: slot->m_TexType gives expected sampler type (2D vs Cube etc). Could check/extract this here.
-
-        // Not sure why this needs COLLAPSED added again, but without this all the slots expand
-        flags |= IVariable::UI_COLLAPSED;
-
-        //clear the auto-expand flag if there is no texture assigned.
-        SEfResTexture*  pTextureRes = m_shaderResources.GetTextureResource(nTexSlot);
-        bool            noTextureName = (!pTextureRes ? true : pTextureRes->m_Name.empty());
-
-        if (noTextureName)
-        {
-            flags &= ~IVariable::UI_AUTO_EXPAND;
-        }
-
-        // if slot is NULL, but we have reflection information, this slot isn't used - make the variable invisible
-        // unless there's a texture in the slot
-        if (pShaderSlots && !pSlot && noTextureName)
-        {
-            flags |= IVariable::UI_INVISIBLE;
-        }
-        else
-        {
-            flags &= ~IVariable::UI_INVISIBLE;
-        }
-
-        pVar->SetFlags(flags);
-
-        pTextureSlots->AddVariable(pVar);
-    }
-
-    return pTextureSlots;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::ClearAllSubMaterials()
-{
-    RecordUndo("Multi Material Change");
-    for (int i = 0; i < m_subMaterials.size(); i++)
-    {
-        if (m_subMaterials[i])
-        {
-            m_subMaterials[i]->m_pParent = NULL;
-            m_subMaterials[i] = NULL;
-        }
-    }
-    UpdateMatInfo();
-    NotifyChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::Validate()
-{
-    if (IsDummy())
-    {
-        CErrorRecord err;
-        err.error = QObject::tr("Material %1 file not found").arg(GetName());
-        err.pItem = this;
-        GetIEditor()->GetErrorReport()->ReportError(err);
-    }
-    // Reload shader.
-    LoadShader();
-
-    // Validate sub materials.
-    for (int i = 0; i < m_subMaterials.size(); i++)
-    {
-        if (m_subMaterials[i])
-        {
-            m_subMaterials[i]->Validate();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::GatherUsedResources(CUsedResources& resources)
-{
-    if (!IsUsed())
-    {
-        return;
-    }
-
-    SInputShaderResources&  sr = GetShaderResources();
-    for (auto iter = sr.m_TexturesResourcesMap.begin(); iter != sr.m_TexturesResourcesMap.end(); ++iter)
-    {
-        SEfResTexture* pTexture = &iter->second;
-        if (!pTexture->m_Name.empty())
-        {
-            resources.Add(pTexture->m_Name.c_str());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterial::CanModify(bool bSkipReadOnly)
-{
-    if (m_bDummyMaterial)
-    {
-        return false;
-    }
-
-    if (IsPureChild() && GetParent())
-    {
-        return GetParent()->CanModify(bSkipReadOnly);
-    }
-
-    if (bSkipReadOnly)
-    {
-        // If read only or in pack, do not save.
-        if (m_scFileAttributes & (SCC_FILE_ATTRIBUTE_READONLY | SCC_FILE_ATTRIBUTE_INPAK))
-        {
-            return false;
-        }
-
-        // Managed file must be checked out.
-        if ((m_scFileAttributes & SCC_FILE_ATTRIBUTE_MANAGED) && !(m_scFileAttributes & SCC_FILE_ATTRIBUTE_CHECKEDOUT))
-        {
-            return false;
-        }
-    }
-    else
-    {
-        // Only if in pack.
-        if (m_scFileAttributes & (SCC_FILE_ATTRIBUTE_INPAK))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterial::Save(bool bSkipReadOnly, const QString& fullPath)
-{
-    // Save our parent
-    if (IsPureChild())
-    {
-        if (m_pParent)
-        {
-            return m_pParent->Save(bSkipReadOnly);
-        }
-        return false;
-    }
-
-    if (m_mtlFlags & MTL_FLAG_UIMATERIAL)
-    {
-        return false;
-    }
-
-    GetFileAttributes();
-
-    if (bSkipReadOnly && IsModified())
-    {
-        // If read only or in pack, do not save.
-        if (m_scFileAttributes & (SCC_FILE_ATTRIBUTE_READONLY | SCC_FILE_ATTRIBUTE_INPAK))
-        {
-            gEnv->pLog->LogError("Can't save material %s (read-only)", GetName().toUtf8().constData());
-        }
-
-        // Managed file must be checked out.
-        if ((m_scFileAttributes & SCC_FILE_ATTRIBUTE_MANAGED) && !(m_scFileAttributes & SCC_FILE_ATTRIBUTE_CHECKEDOUT))
-        {
-            gEnv->pLog->LogError("Can't save material %s (need to check out)", GetName().toUtf8().constData());
-        }
-    }
-
-    if (!CanModify(bSkipReadOnly))
-    {
-        return false;
-    }
-
-
-    // If filename is empty do not not save.
-    if (GetFilename().isEmpty())
-    {
-        return false;
-    }
-
-    // Save material XML to a file that corresponds to the material name with extension .mtl.
-    XmlNodeRef mtlNode = XmlHelpers::CreateXmlNode("Material");
-    CBaseLibraryItem::SerializeContext ctx(mtlNode, false);
-    Serialize(ctx);
-
-    bool saveSucceeded = false;
-    if (fullPath.isEmpty())
-    {
-        // If no filepath was specified, get the filename using the relative path/unique identifier of this material
-        saveSucceeded = XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), mtlNode, GetFilename().toUtf8().data());
-    }
-    else
-    {
-        // If a filepath was specified, save to the specified location
-        saveSucceeded = XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), mtlNode, fullPath.toUtf8().data());
-    }
-
-    if (saveSucceeded)
-    {
-        // If material successfully saved, clear modified flag.
-        SetModified(false);
-        for (int i = 0; i < GetSubMaterialCount(); ++i)
-        {
-            CMaterial* pSubMaterial = GetSubMaterial(i);
-            if (pSubMaterial)
-            {
-                pSubMaterial->SetModified(false);
-            }
-        }
-    }
-    else
-    {
-        AZ_Warning("Material Editor", false, "Material '%s' failed to save successfully. Check that the file is writable and has been successfully checked out in source control.", m_name.toUtf8().data());
-    }
-
-    return saveSucceeded;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::ClearMatInfo()
-{
-    m_pMatInfo = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<IMaterial> CMaterial::GetMatInfo(bool bUseExistingEngineMaterial)
-{
-    if (!m_pMatInfo)
-    {
-        if (m_bDummyMaterial)
-        {
-            m_pMatInfo = GetIEditor()->Get3DEngine()->GetMaterialManager()->GetDefaultMaterial();
-            AddRef(); // Always keep dummy materials.
-            return m_pMatInfo;
-        }
-
-        if (!IsMultiSubMaterial() && !m_shaderItem.m_pShader)
-        {
-            LoadShader();
-        }
-
-        if (!IsPureChild())
-        {
-            if (bUseExistingEngineMaterial)
-            {
-                m_pMatInfo = GetIEditor()->Get3DEngine()->GetMaterialManager()->FindMaterial(GetName().toUtf8().data());
-            }
-
-            if (!m_pMatInfo)
-            {
-                m_pMatInfo = GetIEditor()->Get3DEngine()->GetMaterialManager()->CreateMaterial(GetName().toUtf8().data(), m_mtlFlags);
-            }
-        }
-        else
-        {
-            // Pure child should not be registered with the name.
-            m_pMatInfo = GetIEditor()->Get3DEngine()->GetMaterialManager()->CreateMaterial("", m_mtlFlags);
-            m_pMatInfo->SetName(GetName().toUtf8().data());
-        }
-        m_mtlFlags = m_pMatInfo->GetFlags();
-        UpdateMatInfo();
-
-        if (m_pMatInfo->GetUserData() != this)
-        {
-            m_pMatInfo->SetUserData(this);
-            AddRef(); // Let IMaterial keep a reference to us.
-        }
-    }
-
-    return m_pMatInfo;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::NotifyChanged()
-{
-    if (m_bIgnoreNotifyChange)
-    {
-        return;
-    }
-
-    if (!CanModify() && !IsModified() && CUndo::IsRecording())
-    {
-        // Display Warning message.
-        Warning("Modifying read only material %s\r\nChanges will not be saved!", GetName().toUtf8().data());
-    }
-
-    SetModified();
-
-    GetIEditor()->GetMaterialManager()->OnItemChanged(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CUndoMaterial
-    : public IUndoObject
-{
-public:
-    CUndoMaterial(CMaterial* pMaterial, const char* undoDescription, bool bForceUpdate)
-    {
-        assert(pMaterial);
-
-        // Stores the current state of this object.
-        m_undoDescription = undoDescription;
-
-        m_bIsSubMaterial = pMaterial->IsPureChild();
-
-        if (m_bIsSubMaterial)
-        {
-            CMaterial* pParentMaterial = pMaterial->GetParent();
-            assert(pParentMaterial && !pParentMaterial->IsPureChild());
-            if (pParentMaterial && !pParentMaterial->IsPureChild())
-            {
-                bool bFound = false;
-                const int subMaterialCount = pParentMaterial->GetSubMaterialCount();
-                for (int i = 0; i < subMaterialCount; ++i)
-                {
-                    CMaterial* pSubMaterial = pParentMaterial->GetSubMaterial(i);
-                    if (pSubMaterial == pMaterial)
-                    {
-                        bFound = true;
-                        m_subMaterialName = pSubMaterial->GetName();
-                        break;
-                    }
-                }
-                assert(bFound);
-                m_mtlName = pParentMaterial->GetName();
-            }
-        }
-        else
-        {
-            m_mtlName = pMaterial->GetName();
-        }
-
-        // Save material XML to a file that corresponds to the material name with extension .mtl.
-        m_undo = XmlHelpers::CreateXmlNode("Material");
-        CBaseLibraryItem::SerializeContext ctx(m_undo, false);
-        pMaterial->Serialize(ctx);
-        m_bForceUpdate = bForceUpdate;
-    }
-
-protected:
-    virtual void Release() { delete this; };
-
-    virtual int GetSize()
-    {
-        return sizeof(*this) + m_undoDescription.length() + m_mtlName.length();
-    }
-
-    virtual QString GetDescription() { return m_undoDescription; };
-
-    virtual void Undo(bool bUndo)
-    {
-        CMaterial* pMaterial = GetMaterial();
-
-        assert(pMaterial);
-        if (!pMaterial)
-        {
-            return;
-        }
-
-        if (bUndo)
-        {
-            // Save current object state.
-            m_redo = XmlHelpers::CreateXmlNode("Material");
-            CBaseLibraryItem::SerializeContext ctx(m_redo, false);
-            pMaterial->Serialize(ctx);
-        }
-
-        CBaseLibraryItem::SerializeContext ctx(m_undo, true);
-        ctx.bUndo = bUndo;
-        pMaterial->Serialize(ctx);
-
-        if (m_bForceUpdate && bUndo)
-        {
-            GetIEditor()->GetMaterialManager()->OnUpdateProperties(pMaterial, true);
-        }
-    }
-
-    virtual void Redo()
-    {
-        CMaterial* pMaterial = GetMaterial();
-
-        if (!pMaterial)
-        {
-            return;
-        }
-
-        CBaseLibraryItem::SerializeContext ctx(m_redo, true);
-        ctx.bUndo = true;
-        pMaterial->Serialize(ctx);
-
-        if (m_bForceUpdate)
-        {
-            GetIEditor()->GetMaterialManager()->OnUpdateProperties(pMaterial, true);
-        }
-    }
-
-private:
-    CMaterial* GetMaterial()
-    {
-        CMaterial* pMaterial = (CMaterial*)GetIEditor()->GetMaterialManager()->FindItemByName(m_mtlName);
-        assert(pMaterial);
-
-        if (pMaterial && m_bIsSubMaterial)
-        {
-            bool bFound = false;
-            const int subMaterialCount = pMaterial->GetSubMaterialCount();
-            for (int i = 0; i < subMaterialCount; ++i)
-            {
-                CMaterial* pSubMaterial = pMaterial->GetSubMaterial(i);
-                if (pSubMaterial && (pSubMaterial->GetName() == m_subMaterialName))
-                {
-                    bFound = true;
-                    pMaterial = pSubMaterial;
-                    break;
-                }
-            }
-            assert(bFound && pMaterial);
-        }
-
-        return pMaterial;
-    }
-
-    QString m_undoDescription;
-    QString m_mtlName;
-    bool m_bIsSubMaterial;
-    QString m_subMaterialName;
-    XmlNodeRef m_undo;
-    XmlNodeRef m_redo;
-    bool m_bForceUpdate;
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::RecordUndo(const char* sText, bool bForceUpdate)
-{
-    if (CUndo::IsRecording())
-    {
-        CUndo::Record(new CUndoMaterial(this, sText, bForceUpdate));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::OnMakeCurrent()
-{
-    UpdateFileAttributes(false);
-
-    // If Shader not yet loaded, load it now.
-    if (!m_shaderItem.m_pShader)
-    {
-        LoadShader();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetSurfaceTypeName(const QString& surfaceType)
-{
-    m_surfaceType = surfaceType;
-    UpdateMatInfo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::Reload()
-{
-    if (IsPureChild())
-    {
-        if (m_pParent)
-        {
-            m_pParent->Reload();
-        }
-        return;
-    }
-    if (IsDummy())
-    {
-        return;
-    }
-
-    XmlNodeRef mtlNode = GetISystem()->LoadXmlFromFile(GetFilename().toUtf8().data());
-    if (!mtlNode)
-    {
-        return;
-    }
-    CBaseLibraryItem::SerializeContext serCtx(mtlNode, true);
-    serCtx.bUndo = true; // Simulate undo.
-    Serialize(serCtx);
-
-    // was called by Simulate undo.
-    //UpdateMatInfo();
-    //NotifyChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::LinkToMaterial(const QString& name)
-{
-    m_linkedMaterial = name;
-    UpdateMatInfo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::DisableHighlightForFrame()
-{
-    SetHighlightFlags(0);
-}
-
-static ColorF Interpolate(const ColorF& a, const ColorF& b, float phase)
-{
-    const float oneMinusPhase = 1.0f - phase;
-    return ColorF(b.r * phase + a.r * oneMinusPhase,
-        b.g * phase + a.g * oneMinusPhase,
-        b.b * phase + a.b * oneMinusPhase,
-        b.a * phase + a.a * oneMinusPhase);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::UpdateHighlighting()
-{
-    if (!(GetFlags() & MTL_FLAG_NODRAW))
-    {
-        const CInputLightMaterial& original = m_shaderResources.m_LMaterial;
-        CInputLightMaterial lm = original;
-
-        ColorF highlightColor(0.0f, 0.0f, 0.0f, 1.0f);
-        float highlightIntensity = 0.0f;
-
-        MAKE_SURE(GetIEditor()->GetMaterialManager(), return );
-        GetIEditor()->GetMaterialManager()->GetHighlightColor(&highlightColor, &highlightIntensity, m_highlightFlags);
-
-        if (m_shaderItem.m_pShaderResources)
-        {
-            ColorF diffuseColor = Interpolate(original.m_Diffuse, highlightColor, highlightIntensity);
-            ColorF emissiveColor = Interpolate(original.m_Emittance, highlightColor, highlightIntensity);
-            ColorF specularColor = Interpolate(original.m_Specular, highlightColor, highlightIntensity);
-
-            // [Shader System TO DO] remove this hard coded association!
-            m_shaderItem.m_pShaderResources->SetColorValue(EFTT_DIFFUSE, diffuseColor);
-            m_shaderItem.m_pShaderResources->SetColorValue(EFTT_SPECULAR, specularColor);
-            m_shaderItem.m_pShaderResources->SetColorValue(EFTT_EMITTANCE, emissiveColor);
-
-            m_shaderItem.m_pShaderResources->UpdateConstants(m_shaderItem.m_pShader);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterial::SetHighlightFlags(int highlightFlags)
-{
-    m_highlightFlags = highlightFlags;
-
-    UpdateHighlighting();
-}
-
-
-void CMaterial::SetShaderItem(const SShaderItem& shaderItem)
-{
-    SAFE_RELEASE(m_shaderItem.m_pShader);
-    SAFE_RELEASE(m_shaderItem.m_pShaderResources);
-
-    m_shaderItem = shaderItem;
-    if (m_shaderItem.m_pShader)
-    {
-        m_shaderItem.m_pShader->AddRef();
-    }
-    if (m_shaderItem.m_pShaderResources)
-    {
-        m_shaderItem.m_pShaderResources->AddRef();
-    }
-}
diff --git a/Code/Sandbox/Editor/Material/Material.h b/Code/Sandbox/Editor/Material/Material.h
deleted file mode 100644
index b311744e14..0000000000
--- a/Code/Sandbox/Editor/Material/Material.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_MATERIAL_MATERIAL_H
-#define CRYINCLUDE_EDITOR_MATERIAL_MATERIAL_H
-#pragma once
-
-#include <IMaterial.h>
-#include <IRenderer.h>
-#include "BaseLibraryItem.h"
-#include "Include/IEditorMaterial.h"
-#include "Util/Variable.h"
-#include <vector>
-
-// forward declarations,
-class CMaterialManager;
-class CVarBlock;
-
-enum eMTL_PROPAGATION
-{
-    MTL_PROPAGATE_OPACITY = 1 << 0,
-    MTL_PROPAGATE_LIGHTING = 1 << 1,
-    MTL_PROPAGATE_ADVANCED = 1 << 2,
-    MTL_PROPAGATE_TEXTURES = 1 << 3,
-    MTL_PROPAGATE_SHADER_PARAMS = 1 << 4,
-    MTL_PROPAGATE_SHADER_GEN = 1 << 5,
-    MTL_PROPAGATE_VERTEX_DEF = 1 << 6,
-    MTL_PROPAGATE_LAYER_PRESETS = 1 << 7,
-    MTL_PROPAGATE_MATERIAL_SETTINGS = 1 << 8,
-    MTL_PROPAGATE_ALL = (
-            MTL_PROPAGATE_OPACITY |
-            MTL_PROPAGATE_LIGHTING |
-            MTL_PROPAGATE_ADVANCED |
-            MTL_PROPAGATE_TEXTURES |
-            MTL_PROPAGATE_SHADER_PARAMS |
-            MTL_PROPAGATE_SHADER_GEN |
-            MTL_PROPAGATE_VERTEX_DEF |
-            MTL_PROPAGATE_LAYER_PRESETS |
-            MTL_PROPAGATE_MATERIAL_SETTINGS),
-    MTL_PROPAGATE_RESERVED = 1 << 9
-};
-
-/** CMaterial class
-        Every Material is a member of material library.
-        Materials can have child sub materials,
-        Sub materials are applied to the same geometry of the parent material in the other material slots.
-*/
-
-struct SMaterialLayerResources
-{
-    SMaterialLayerResources()
-        : m_nFlags(MTL_LAYER_USAGE_REPLACEBASE)
-        , m_bRegetPublicParams(true)
-        , m_pMatLayer(0)
-    {
-    }
-
-    uint8 m_nFlags;
-    bool m_bRegetPublicParams;
-    QString m_shaderName;
-
-    _smart_ptr< IMaterialLayer > m_pMatLayer;
-    SInputShaderResources m_shaderResources;
-    XmlNodeRef m_publicVarsCache;
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class CRYEDIT_API CMaterial
-    : public IEditorMaterial
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    //////////////////////////////////////////////////////////////////////////
-    CMaterial(const QString& name, int nFlags = 0);
-    CMaterial(const CMaterial& rhs);
-    ~CMaterial();
-
-    virtual EDataBaseItemType GetType() const { return EDB_TYPE_MATERIAL; };
-
-    void SetName(const QString& name);
-
-    //////////////////////////////////////////////////////////////////////////
-    QString GetFullName() const { return m_name; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // File properties of the material.
-    //////////////////////////////////////////////////////////////////////////
-    QString GetFilename() const;
-
-    //! Collect filenames of texture sources used in material
-    //! Return number of filenames
-    int GetTextureFilenames(QStringList& outFilenames) const;
-    int GetAnyTextureFilenames(QStringList& outFilenames) const;
-
-    void UpdateFileAttributes(bool useSourceControl = true);
-    uint32 GetFileAttributes();
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Sets one or more material flags from EMaterialFlags enum.
-    void SetFlags(int flags) { m_mtlFlags = flags; };
-    //! Query this material flags.
-    virtual int GetFlags() const { return m_mtlFlags; }
-    bool IsMultiSubMaterial() const { return (m_mtlFlags & MTL_FLAG_MULTI_SUBMTL) != 0; };
-    bool IsPureChild() const { return (m_mtlFlags & MTL_FLAG_PURE_CHILD) != 0; }
-
-    // Check if material is used.
-    bool IsUsed() const { /*return m_nUseCount > 0 || (m_mtlFlags & MTL_FLAG_ALWAYS_USED);*/ return true; };
-
-    virtual void GatherUsedResources(CUsedResources& resources);
-
-    //! Set name of shader used by this material.
-    void SetShaderName(const QString& shaderName);
-    //! Get name of shader used by this material.
-    QString GetShaderName() const { return m_shaderName; };
-
-    virtual SInputShaderResources& GetShaderResources() { return m_shaderResources; };
-
-    //! Get public parameters of material in variable block.
-    CVarBlock* GetPublicVars(SInputShaderResources& pShaderResources);
-
-    //! Set the shader public param m_script variable into our own m_script, script contains min/max for a given shader param value
-    void SetShaderParamPublicScript();
-
-    //! Sets variable block of public shader parameters.
-    //! VarBlock must be in same format as returned by GetPublicVars().
-    void SetPublicVars(CVarBlock* pPublicVars, CMaterial* pMtl);
-
-    //! Update names/descriptions in this variable array, return a variable block for replacing
-    CVarBlock* UpdateTextureNames(CSmartVariableArray textureVars[EFTT_MAX]);
-// [Shader System] - Do To: add back with map usage:   CVarBlock* UpdateTextureNames(AZStd::unordered_map<ResourceSlotIndex, CSmartVariableArray>& textureVarsMap);
-
-    //////////////////////////////////////////////////////////////////////////
-    CVarBlock* GetShaderGenParamsVars();
-    void SetShaderGenParamsVars(CVarBlock* pBlock);
-    uint64 GetShaderGenMask() { return m_nShaderGenMask; }
-    void SetShaderGenMask(uint64 mask) { m_nShaderGenMask = mask; }
-
-    //! Return variable block of shader params.
-    SShaderItem& GetShaderItem() { return m_shaderItem; };
-
-    //! Return material layers resources
-    SMaterialLayerResources* GetMtlLayerResources() { return m_pMtlLayerResources; };
-
-    //! Get texture map usage mask for shader in this material.
-    unsigned int GetTexmapUsageMask() const;
-
-    //! Load new shader.
-    bool LoadShader();
-
-    //! Reload shader, update all shader parameters.
-    virtual void Update();
-
-    // Reload material settings from file.
-    // NOTICE: The function will remove all the sub-materials and recreate them!
-    void Reload();
-
-    //! Serialize material settings to xml.
-    virtual void Serialize(SerializeContext& ctx);
-
-    //! Assign this material to static geometry.
-    void AssignToEntity(IRenderNode* pEntity);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Surface types.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetSurfaceTypeName(const QString& surfaceType);
-    virtual const QString& GetSurfaceTypeName() const { return m_surfaceType; };
-    bool IsBreakable2D() const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Child Sub materials.
-    //////////////////////////////////////////////////////////////////////////
-    //! Get number of sub materials childs.
-    int GetSubMaterialCount() const;
-    //! Set number of sub materials childs.
-    void SetSubMaterialCount(int nSubMtlsCount);
-    //! Get sub material child by index.
-    CMaterial* GetSubMaterial(int index) const;
-    //! Find sub material index by name
-    int FindMaterialIndex(const QString& name);
-    // Set a material to the sub materials slot.
-    // Use NULL material pointer to clear slot.
-    void SetSubMaterial(int nSlot, CMaterial* mtl);
-    //! Remove all sub materials, does not change number of sub material slots.
-    void ClearAllSubMaterials();
-
-    //! Return pointer to engine material.
-    virtual _smart_ptr<IMaterial> GetMatInfo(bool bUseExistingEngineMaterial = true);
-    // Clear stored pointer to engine material.
-    void ClearMatInfo();
-
-    //! Validate materials for errors.
-    void Validate();
-
-    // Check if material file can be modified.
-    // Will check file attributes if it is not read only.
-    bool CanModify(bool bSkipReadOnly = true);
-
-    // Save material to file.
-    virtual bool Save(bool bSkipReadOnly = true, const QString& fullPath = "");
-
-    // Dummy material is just a placeholder item for materials that have not been found on disk.
-    void SetDummy(bool bDummy) { m_bDummyMaterial = bDummy; }
-    bool IsDummy() const { return m_bDummyMaterial != 0; }
-    
-    // Called by material manager when material selected as a current material.
-    void OnMakeCurrent();
-
-    void SetFromMatInfo(_smart_ptr<IMaterial> pMatInfo);
-
-    // Link a submaterial by name (used for value propagation in CMaterialUI)
-    void LinkToMaterial(const QString& name);
-    const QString& GetLinkedMaterialName() { return m_linkedMaterial; }
-
-    // Return parent material for submaterial
-    CMaterial* GetParent() const {return m_pParent; }
-
-    //! Loads material layers
-    bool LoadMaterialLayers();
-    //! Updates material layers
-    void UpdateMaterialLayers();
-
-    void SetHighlightFlags(int highlightFlags);
-    void UpdateHighlighting();
-    virtual void DisableHighlightForFrame();
-    void RecordUndo(const char* sText, bool bForceUpdate = false);
-
-    int GetPropagationFlags() const { return m_propagationFlags; }
-    void SetPropagationFlags(const int flags) { m_propagationFlags = flags; }
-
-    bool LayerActivationAllowed() const { return m_allowLayerActivation; }
-    void SetLayerActivation(bool allowed) { m_allowLayerActivation = allowed; }
-
-    uint32 GetDccMaterialHash() const { return m_dccMaterialHash; }
-    void SetDccMaterialHash(AZ::u32 hash) { m_dccMaterialHash = hash; }
-    void SetShaderItem(const SShaderItem& shaderItem);
-
-private:
-    void UpdateMatInfo();
-    void CheckSpecialConditions();
-
-    void NotifyChanged();
-
-private:
-    //////////////////////////////////////////////////////////////////////////
-    // Variables.
-    //////////////////////////////////////////////////////////////////////////
-    QString m_shaderName;
-    QString m_surfaceType;
-    QString m_linkedMaterial;
-
-    //! Material flags.
-    int m_mtlFlags;
-
-    // Hash for DCC material attributes, used to check if .dccmtl has changed
-    // If so, the source .mtl file will need to be rebuilt
-    uint32 m_dccMaterialHash;
-
-    // Parent material, Only valid for Pure Childs.
-    CMaterial* m_pParent;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Shader resources.
-    //////////////////////////////////////////////////////////////////////////
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    SShaderItem m_shaderItem;
-    SInputShaderResources m_shaderResources;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    //CVarBlockPtr m_shaderParamsVar;
-    //! Common shader flags.
-    uint64 m_nShaderGenMask;
-    QString m_pszShaderGenMask;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    SMaterialLayerResources m_pMtlLayerResources[MTL_LAYER_MAX_SLOTS];
-
-    _smart_ptr<IMaterial> m_pMatInfo;
-
-    XmlNodeRef m_publicVarsCache;
-
-    //! Array of sub materials.
-    std::vector<_smart_ptr<CMaterial> > m_subMaterials;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    int m_nUseCount;
-    uint32 m_scFileAttributes;
-
-    unsigned char m_highlightFlags;
-
-    // The propagation flags are a bit combination of the MTL_PROPAGATION enum above
-    // and determine which properties get propagated to an optional linked material
-    // during ui editing
-    int m_propagationFlags;
-
-    //! Material Used in level.
-    unsigned int m_bDummyMaterial       : 1; // Dummy material, name specified but material file not found.
-    unsigned int m_bIgnoreNotifyChange  : 1; // Do not send notifications about changes.
-    unsigned int m_bRegetPublicParams   : 1;
-    unsigned int m_bKeepPublicParamsValues : 1;
-
-    bool m_allowLayerActivation;
-};
-
-#endif // CRYINCLUDE_EDITOR_MATERIAL_MATERIAL_H
diff --git a/Code/Sandbox/Editor/Material/MaterialBrowser.cpp b/Code/Sandbox/Editor/Material/MaterialBrowser.cpp
deleted file mode 100644
index e39a29a47d..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialBrowser.cpp
+++ /dev/null
@@ -1,1792 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "MaterialBrowser.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzQtComponents
-#include <AzQtComponents/Utilities/DesktopUtilities.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
-
-// Editor
-#include "MaterialManager.h"
-#include "Clipboard.h"
-#include "MaterialImageListCtrl.h"
-#include "StringDlg.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <Material/ui_MaterialBrowser.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-enum
-{
-    MENU_UNDEFINED = CMaterialImageListCtrl::MaterialBrowserWidgetActionsStart,
-    MENU_CUT,
-    MENU_COPY,
-    MENU_COPY_NAME,
-    MENU_PASTE,
-    MENU_EXPLORE,
-    MENU_DUPLICATE,
-    MENU_EXTRACT,
-    MENU_RENAME,
-    MENU_DELETE,
-    MENU_RESET,
-    MENU_ASSIGNTOSELECTION,
-    MENU_SELECTASSIGNEDOBJECTS,
-    MENU_NUM_SUBMTL,
-    MENU_ADDNEW,
-    MENU_ADDNEW_MULTI,
-    MENU_CONVERT_TO_MULTI,
-    MENU_SUBMTL_MAKE,
-    MENU_SUBMTL_CLEAR,
-    MENU_SAVE_TO_FILE,
-    MENU_SAVE_TO_FILE_MULTI,
-    MENU_MERGE,
-
-    MENU_SCM_ADD,
-    MENU_SCM_CHECK_OUT,
-    MENU_SCM_UNDO_CHECK_OUT,
-    MENU_SCM_GET_LATEST,
-    MENU_SCM_GET_LATEST_TEXTURES,
-};
-
-static QAction* CreateTreeViewAction(const char* text, const QKeySequence& shortcut, QWidget* shortcutContext, MaterialBrowserWidget* widget, void (MaterialBrowserWidget::*slot)())
-{
-    QAction* action = new QAction(text, shortcutContext);
-    action->setShortcut(shortcut);
-    QObject::connect(action, &QAction::triggered, widget, slot);
-    widget->addAction(action);
-    return action;
-}
-
-//////////////////////////////////////////////////////////////////////////
-MaterialBrowserWidget::MaterialBrowserWidget(QWidget* parent)
-    : QWidget(parent)
-    , m_ui(new Ui::MaterialBrowser)
-    , m_filterModel(new MaterialBrowserFilterModel(this))
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    m_ui->setupUi(this);
-
-    // create some permanent (for the life of this widget) actions for shortcut handling
-    m_cutAction = CreateTreeViewAction("Cut", QKeySequence::Cut, m_ui->treeView, this, &MaterialBrowserWidget::OnCut);
-    m_copyAction = CreateTreeViewAction("Copy", QKeySequence::Copy, m_ui->treeView, this, &MaterialBrowserWidget::OnCopy);
-    m_pasteAction = CreateTreeViewAction("Paste", QKeySequence::Paste, m_ui->treeView, this, &MaterialBrowserWidget::OnPaste);
-    m_duplicateAction = CreateTreeViewAction("Duplicate", QKeySequence(Qt::CTRL + Qt::Key_D), m_ui->treeView, this, &MaterialBrowserWidget::OnDuplicate);
-    m_deleteAction = CreateTreeViewAction("Delete", QKeySequence::Delete, m_ui->treeView, this, &MaterialBrowserWidget::DeleteItem);
-    m_renameItemAction = CreateTreeViewAction("Rename", Qt::Key_F2, m_ui->treeView, this, &MaterialBrowserWidget::OnRenameItem);
-    m_addNewMaterialAction = CreateTreeViewAction("Add New Material", Qt::Key_Insert, m_ui->treeView, this, &MaterialBrowserWidget::OnAddNewMaterial);
-
-    MaterialBrowserWidgetBus::Handler::BusConnect();
-
-    // Get the asset browser model
-    AssetBrowserComponentRequestBus::BroadcastResult(m_assetBrowserModel, &AssetBrowserComponentRequests::GetAssetBrowserModel);
-    AZ_Assert(m_assetBrowserModel, "Failed to get filebrowser model");
-
-    // Set up the filter model
-    m_filterModel->setSourceModel(m_assetBrowserModel);
-    m_ui->treeView->setModel(m_filterModel.data());
-    m_ui->treeView->SetThumbnailContext("MaterialBrowser");
-    m_ui->treeView->SetShowSourceControlIcons(true);
-
-    m_ui->m_searchWidget->Setup(true, false);
-    m_filterModel->SetSearchFilter(m_ui->m_searchWidget);
-    connect(m_ui->m_searchWidget->GetFilter().data(), &AssetBrowserEntryFilter::updatedSignal, m_filterModel.data(), &MaterialBrowserFilterModel::SearchFilterUpdated);
-
-    // Call LoadState to initialize the AssetBrowserTreeView's QTreeViewStateSaver
-    // This must be done BEFORE StartRecordUpdateJobs(). A race condition from the update jobs was causing a 5-10% crash/hang when opening the Material Editor.
-    m_ui->treeView->SetName("MaterialBrowserTreeView"); 
-    
-    // Override the AssetBrowserTreeView's custom context menu
-    disconnect(m_ui->treeView, &QWidget::customContextMenuRequested, 0, 0);
-    connect(m_ui->treeView, &QWidget::customContextMenuRequested, this, [=](const QPoint& point)
-        {
-            CMaterialBrowserRecord record;
-            TryGetSelectedRecord(record);
-            ShowContextMenu(record, point);
-        });
-
-    connect(m_ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &MaterialBrowserWidget::OnSelectionChanged);
-    //Wait for the signal emitted on record update jobs finished, then we can restore the selection for the previous selected item
-    connect(this, SIGNAL(refreshSelection()), this, SLOT(OnRefreshSelection()));
-
-    connect(this, SIGNAL(materialAdded()), this, SLOT(OnMaterialAdded()));
-
-    m_bIgnoreSelectionChange = false;
-    m_bItemsValid = true;
-
-    m_pMatMan = GetIEditor()->GetMaterialManager();
-    m_pMatMan->AddListener(this);
-    m_pListener = NULL;
-
-    m_viewType = VIEW_LEVEL;
-    m_pMaterialImageListCtrl = NULL;
-    m_pLastActiveMultiMaterial = 0;
-
-    m_bNeedReload = false;
-
-    m_bHighlightMaterial = false;
-    m_timeOfHighlight = 0;
-
-    m_bShowOnlyCheckedOut = false;
-
-    GetIEditor()->RegisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-MaterialBrowserWidget::~MaterialBrowserWidget()
-{
-    m_filterModel->CancelRecordUpdateJobs();
-    m_filterModel->deleteLater();
-    m_ui->treeView->SaveState();
-    GetIEditor()->UnregisterNotifyListener(this);
-
-    m_pMaterialImageListCtrl = NULL;
-    m_pMatMan->RemoveListener(this);
-    ClearItems();
-
-    if (m_bHighlightMaterial)
-    {
-        m_pMatMan->SetHighlightedMaterial(0);
-    }
-
-    MaterialBrowserWidgetBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::ClearItems()
-{
-    m_bIgnoreSelectionChange = true;
-
-    if (m_pMaterialImageListCtrl)
-    {
-        QMaterialImageListModel* materialModel =
-            qobject_cast<QMaterialImageListModel*>(m_pMaterialImageListCtrl->model());
-        Q_ASSERT(materialModel);
-        materialModel->DeleteAllItems();
-    }
-
-    m_pLastActiveMultiMaterial = nullptr;
-    m_delayedSelection = nullptr;
-
-    m_bIgnoreSelectionChange = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::TryLoadRecordMaterial(CMaterialBrowserRecord& record)
-{
-    // If material already loaded ignore.
-    if (record.m_material)
-    {
-        return;
-    }
-
-    m_bIgnoreSelectionChange = true;
-    // Try to load material for it.
-    record.m_material = m_pMatMan->LoadMaterial(record.GetRelativeFilePath().c_str(), false);
-
-    m_filterModel->SetRecord(record);
-    m_bIgnoreSelectionChange = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::TickRefreshMaterials()
-{
-    if (m_bHighlightMaterial)
-    {
-        uint32 t = GetTickCount();
-        if ((t - m_timeOfHighlight) > 300)
-        {
-            m_bHighlightMaterial = false;
-            m_pMatMan->SetHighlightedMaterial(0);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnIdleUpdate:
-    {
-        TickRefreshMaterials();
-    }
-    break;
-    case eNotify_OnBeginLoad:
-    {
-        //Need to make sure the selection is cleared before clearing the record map
-        SetSelectedItem(nullptr, nullptr, true);
-        m_filterModel->ClearRecordMap();
-    }
-    break;
-    case eNotify_OnCloseScene:
-    {
-        m_filterModel->ShowOnlyLevelMaterials(false, true);
-        ClearItems();
-        m_ui->treeView->SaveState();
-        //Need to make sure the selection is cleared before clearing the record map
-        SetSelectedItem(nullptr, nullptr, true);
-        m_filterModel->ClearRecordMap();
-    }
-    break;
-    case eNotify_OnEndNewScene:
-    case eNotify_OnEndSceneOpen:
-    {
-        m_filterModel->ShowOnlyLevelMaterials(false, true);
-        m_filterModel->StartRecordUpdateJobs();
-        if (m_ui->treeView->IsTreeViewSavingReady())
-        {
-            m_ui->treeView->ApplyTreeViewSnapshot();
-        }
-    }
-    break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::SetSelectedItem(_smart_ptr<CMaterial> material, const TMaterialBrowserRecords* pMarkedRecords, bool selectInTreeView)
-{
-    if (m_bIgnoreSelectionChange)
-    {
-        return;
-    }
-
-    m_bIgnoreSelectionChange = true;
-    if (pMarkedRecords)
-    {
-        m_markedRecords = *pMarkedRecords;
-    }
-    else
-    {
-        m_markedRecords.clear();
-    }
-
-    m_pMatMan->SetCurrentFolder("");
-
-    _smart_ptr<CMaterial> selectedMaterial = material;
-    if (material && material->IsPureChild())
-    {
-        selectedMaterial = material->GetParent();
-    }
-
-    // Clear the delayed selection whenever a new material is selected
-    m_delayedSelection = nullptr;
-
-    // In some cases, such as when SetSelectedItem is called from the material picker or the rollup bar,
-    // the material has not yet been selected in the tree-view, so that item must be selected here
-    bool validSelection = false;
-    if (selectInTreeView)
-    {
-        if (!selectedMaterial)
-        {
-            // Clear the current selection so that the upcoming call to RefreshSelected()
-            // doesn't try to refresh the previously selected material which may be invalid
-            m_ui->treeView->clearSelection();
-            m_ui->treeView->setCurrentIndex(QModelIndex());
-        }
-        else if (m_markedRecords.size() > 0)
-        {
-            QItemSelection selection;
-            for (CMaterialBrowserRecord record : m_markedRecords)
-            {
-                QModelIndex currentIndex = m_filterModel->GetIndexFromMaterial(record.m_material);
-                if (currentIndex.isValid())
-                {
-                    selection.push_back(QItemSelectionRange(currentIndex));
-                    validSelection = true;
-                }
-            }
-            m_ui->treeView->selectionModel()->select(selection, QItemSelectionModel::ClearAndSelect);
-        }
-        else
-        {
-            QModelIndex currentIndex = m_filterModel->GetIndexFromMaterial(selectedMaterial);
-            if (currentIndex.isValid())
-            {
-                m_ui->treeView->selectionModel()->setCurrentIndex(currentIndex, QItemSelectionModel::ClearAndSelect);
-                validSelection = true;
-
-                // Now that the parent material is selected in the browser,
-                // select the appropriate sub-material in the material preview window
-                if (selectedMaterial == material->GetParent())
-                {
-                    for (int i = 0; i < selectedMaterial->GetSubMaterialCount(); ++i)
-                    {
-                        if (material == selectedMaterial->GetSubMaterial(i))
-                        {
-                            m_selectedSubMaterialIndex = i;
-                            break;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                // Hold on to a pointer to this material, listen for the MaterialFinishedProcessing event,
-                // and attempt to re-select this material if it finishes processing in the background
-                m_delayedSelection = selectedMaterial;
-            }
-        }
-    }
-
-    RefreshSelected();
-
-    if (!selectedMaterial)
-    {
-        QModelIndex current = m_ui->treeView->currentIndex();
-        QString path;
-        while (current.isValid())
-        {
-            path = '/' + current.data().toString() + path;
-            current = current.parent();
-        }
-        m_pMatMan->SetCurrentFolder((Path::GetEditingGameDataFolder() + path.toUtf8().data()).c_str());
-    }
-    else
-    {
-        if (selectedMaterial->IsMultiSubMaterial() && m_selectedSubMaterialIndex >= 0)
-        {
-            selectedMaterial = selectedMaterial->GetSubMaterial(m_selectedSubMaterialIndex);
-        }
-    }
-
-    if (m_pListener)
-    {
-        // Don't call the listener event if we attempted to select an item in the tree view and failed
-        // to prevent the material parameter editor from switching to a new material if it wasn't actually selected
-        if (!selectInTreeView || validSelection)
-        {
-            m_pListener->OnBrowserSelectItem(selectedMaterial, false);
-        }
-        //Update the selected item if no material is selected in tree view
-        else if (!selectedMaterial && selectInTreeView)
-        {
-            m_pListener->OnBrowserSelectItem(nullptr, false);
-        }
-    }
-
-    m_timeOfHighlight = GetTickCount();
-    m_pMatMan->SetHighlightedMaterial(selectedMaterial);
-    if (selectedMaterial)
-    {
-        m_bHighlightMaterial = true;
-    }
-
-    std::vector<_smart_ptr<CMaterial> > markedMaterials;
-    if (pMarkedRecords)
-    {
-        for (size_t i = 0; i < pMarkedRecords->size(); ++i)
-        {
-            markedMaterials.push_back((*pMarkedRecords)[i].m_material);
-        }
-    }
-    m_pMatMan->SetMarkedMaterials(markedMaterials);
-
-    m_bIgnoreSelectionChange = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::SelectItem(IDataBaseItem* pItem, [[maybe_unused]] IDataBaseItem* pParentItem)
-{
-    if (m_bIgnoreSelectionChange)
-    {
-        return;
-    }
-
-    if (!pItem)
-    {
-        return;
-    }
-
-    _smart_ptr<CMaterial> material = static_cast<CMaterial*>(pItem);
-    SetSelectedItem(material, 0, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnDuplicate()
-{
-    GetIEditor()->GetMaterialManager()->Command_Merge();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnCut()
-{
-    CMaterialBrowserRecord record;
-    bool found = TryGetSelectedRecord(record);
-    if (found)
-    {
-        OnCopy();
-        DeleteItem(record);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnCopyName()
-{
-    _smart_ptr<CMaterial> pMtl = GetCurrentMaterial();
-    if (pMtl)
-    {
-        CClipboard clipboard(this);
-        clipboard.PutString(pMtl->GetName(), "Material Name");
-    }
-}
-
-void MaterialBrowserWidget::ShowOnlyLevelMaterials(bool levelOnly)
-{
-    m_filterModel->ShowOnlyLevelMaterials(levelOnly);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnCopy()
-{
-    _smart_ptr<CMaterial> pMtl = GetCurrentMaterial();
-    if (pMtl)
-    {
-        CClipboard clipboard(this);
-        XmlNodeRef node = XmlHelpers::CreateXmlNode("Material");
-        node->setAttr("Name", pMtl->GetName().toUtf8().data());
-        CBaseLibraryItem::SerializeContext ctx(node, false);
-        ctx.bCopyPaste = true;
-        pMtl->Serialize(ctx);
-        clipboard.Put(node);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool MaterialBrowserWidget::CanPaste() const
-{
-    CClipboard clipboard(nullptr);
-    if (clipboard.IsEmpty())
-    {
-        return false;
-    }
-    XmlNodeRef node = clipboard.Get();
-    if (!node)
-    {
-        return false;
-    }
-
-    if (strcmp(node->getTag(), "Material") == 0)
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnPaste()
-{
-    CClipboard clipboard(this);
-    if (clipboard.IsEmpty())
-    {
-        return;
-    }
-    XmlNodeRef node = clipboard.Get();
-    if (!node)
-    {
-        return;
-    }
-
-    if (strcmp(node->getTag(), "Material") == 0)
-    {
-        if (!m_pMatMan->GetCurrentMaterial())
-        {
-            GetIEditor()->GetMaterialManager()->Command_Create();
-        }
-
-        _smart_ptr<CMaterial> pMtl = m_pMatMan->GetCurrentMaterial();
-        if (pMtl)
-        {
-            // This is material node.
-            CBaseLibraryItem::SerializeContext serCtx(node, true);
-            serCtx.bCopyPaste = true;
-            serCtx.bUniqName = true;
-            pMtl->Serialize(serCtx);
-
-            SelectItem(pMtl, NULL);
-            pMtl->Save();
-            pMtl->Reload();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnAddNewMaterial()
-{
-    GetIEditor()->GetMaterialManager()->Command_Create();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnAddNewMultiMaterial()
-{
-    GetIEditor()->GetMaterialManager()->Command_CreateMulti();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnMergeMaterials()
-{
-    GetIEditor()->GetMaterialManager()->Command_Merge();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnConvertToMulti()
-{
-    GetIEditor()->GetMaterialManager()->Command_ConvertToMulti();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::DeleteItem()
-{
-    CMaterialBrowserRecord record;
-    bool found = TryGetSelectedRecord(record);
-    if (found)
-    {
-        DeleteItem(record);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnResetItem()
-{
-    if (QMessageBox::question(this, tr("Reset Material"), tr("Reset Material to default?")) == QMessageBox::Yes)
-    {
-        _smart_ptr<CMaterial> pMtl = GetCurrentMaterial();
-        int index;
-
-        pMtl->GetSubMaterialCount() > 0 ? index = pMtl->GetSubMaterialCount() : index = 1;
-
-        if (pMtl)
-        {
-            for (int i = 0; i < index; i++)
-            {
-                pMtl->GetSubMaterialCount() > 0 ? pMtl->GetSubMaterial(i)->Reload() : pMtl->Reload();
-                TickRefreshMaterials();
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::DeleteItem(const CMaterialBrowserRecord& record)
-{
-    _smart_ptr<CMaterial> pMtl = record.m_material;
-    if (pMtl)
-    {
-        if (m_selectedSubMaterialIndex >= 0)
-        {
-            pMtl = pMtl->GetSubMaterial(m_selectedSubMaterialIndex);
-            OnClearSubMtlSlot(pMtl);
-        }
-        else
-        {
-            GetIEditor()->GetMaterialManager()->Command_Delete();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnRenameItem()
-{
-    _smart_ptr<CMaterial> pMtl = GetCurrentMaterial();
-    if (!pMtl)
-    {
-        return;
-    }
-
-    if (pMtl->IsPureChild())
-    {
-        StringDlg dlg(tr("Enter New Sub-Material Name"), this);
-        dlg.SetString(pMtl->GetName());
-        dlg.SetCheckCallback([this](QString name) -> bool
-        {
-            static const int MAX_REASONABLE_MATERIAL_NAME = 128;
-            if (name.length() >= MAX_REASONABLE_MATERIAL_NAME)
-            {
-                QMessageBox::warning(this, tr("Name too long"), tr("Please enter a name less than %1 characters").arg(MAX_REASONABLE_MATERIAL_NAME));
-                return false;
-            }
-            return true;
-        });
-
-        if (dlg.exec() == QDialog::Accepted)
-        {
-            pMtl->SetName(dlg.GetString());
-            pMtl->Save();
-            pMtl->Reload();
-        }
-    }
-    else
-    {
-        if ((pMtl->GetFileAttributes() & SCC_FILE_ATTRIBUTE_MANAGED) &&
-            !(pMtl->GetFileAttributes() & SCC_FILE_ATTRIBUTE_CHECKEDOUT))
-        {
-            if (QMessageBox::Cancel == QMessageBox::information(this, tr("Confirm"), tr("Only checked-out files can be renamed. Check out and mark for delete before rename it?"), QMessageBox::Ok | QMessageBox::Cancel))
-            {
-                return;
-            }
-        }
-
-        QFileInfo info(pMtl->GetFilename());
-        QString filename = info.fileName();
-        if (!CFileUtil::SelectSaveFile("Material Files (*.mtl)", "mtl", info.path(), filename))
-        {
-            return;
-        }
-
-        QString itemName = m_pMatMan->FilenameToMaterial(Path::GetRelativePath(filename));
-        if (itemName.isEmpty())
-        {
-            return;
-        }
-
-        if (m_pMatMan->FindItemByName(itemName))
-        {
-            Warning("Material with name %s already exist", itemName.toUtf8().data());
-            return;
-        }
-
-        if (pMtl->GetFileAttributes() & SCC_FILE_ATTRIBUTE_MANAGED)
-        {
-            if (pMtl->GetFileAttributes() & SCC_FILE_ATTRIBUTE_CHECKEDOUT)
-            {
-                if (QMessageBox::Cancel == QMessageBox::information(this, tr("Confirm"), tr("The original file will be marked for delete and the new named file will be marked for integration."), QMessageBox::Ok | QMessageBox::Cancel))
-                {
-                    return;
-                }
-            }
-            else
-            {
-                CFileUtil::CheckoutFile(pMtl->GetFilename().toUtf8().data(), this);
-            }
-
-            if (!CFileUtil::RenameFile(pMtl->GetFilename().toUtf8().data(), filename.toUtf8().data()))
-            {
-                QMessageBox::critical(this, tr("Error"), tr("Could not rename file in Source Control."));
-            }
-        }
-
-
-        // Delete file on disk.
-        if (!pMtl->GetFilename().isEmpty())
-        {
-            QFile::remove(pMtl->GetFilename());
-        }
-        pMtl->SetName(itemName);
-        pMtl->Save();
-        SetSelectedItem(pMtl, 0, true);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnSetSubMtlCount(const CMaterialBrowserRecord& record)
-{
-    _smart_ptr<CMaterial> pMtl = record.m_material;
-    if (!pMtl)
-    {
-        return;
-    }
-
-    if (!pMtl->IsMultiSubMaterial())
-    {
-        return;
-    }
-
-    int num = pMtl->GetSubMaterialCount();
-    bool ok = false;
-    num = QInputDialog::getInt(this, tr("Number of Sub Materials"), QStringLiteral(""), num, 0, MAX_SUB_MATERIALS, 1, &ok);
-    if (ok)
-    {
-        if (num != pMtl->GetSubMaterialCount())
-        {
-            if (m_selectedSubMaterialIndex >= num)
-            {
-                m_selectedSubMaterialIndex = num - 1;
-            }
-
-            CUndo undo("Set SubMtl Count");
-            pMtl->SetSubMaterialCount(num);
-
-            for (int i = 0; i < num; i++)
-            {
-                if (pMtl->GetSubMaterial(i) == 0)
-                {
-                    // Allocate pure childs for all empty slots.
-                    QString name;
-                    name = QStringLiteral("SubMtl%1").arg(i + 1);
-                    _smart_ptr<CMaterial> pChild = new CMaterial(name, MTL_FLAG_PURE_CHILD);
-                    pMtl->SetSubMaterial(i, pChild);
-                }
-            }
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::DoSourceControlOp(CMaterialBrowserRecord& record, ESourceControlOp scmOp)
-{
-    if (!GetIEditor()->IsSourceControlAvailable())
-    {
-        return;
-    }
-
-    _smart_ptr<CMaterial> pMtl = record.m_material;
-
-    if (pMtl && pMtl->IsPureChild())
-    {
-        pMtl = pMtl->GetParent();
-    }
-
-    if (scmOp == ESCM_IMPORT) // don't save unless you're doing an operation which writes.
-    {
-        if (pMtl && pMtl->IsModified())
-        {
-            pMtl->Save();
-        }
-    }
-
-    QString path = pMtl ? pMtl->GetFilename() : QString();
-
-    if (path.isEmpty())
-    {
-        return;
-    }
-
-    bool bRes = true;
-    switch (scmOp)
-    {
-    case ESCM_IMPORT:
-        if (pMtl)
-        {
-            QStringList filenames;
-            int nTextures = pMtl->GetTextureFilenames(filenames);
-            for (int i = 0; i < nTextures; ++i)
-            {
-                CFileUtil::CheckoutFile(filenames[i].toUtf8().data(), this);
-            }
-
-            bRes = CFileUtil::CheckoutFile(path.toUtf8().data(), this);
-        }
-        break;
-    case ESCM_CHECKOUT:
-    {
-        if (pMtl && (pMtl->GetFileAttributes() & SCC_FILE_ATTRIBUTE_BYANOTHER))
-        {
-            AZStd::string otherUser("another user");
-            AzToolsFramework::SourceControlFileInfo fileInfo;
-            if (CFileUtil::GetFileInfoFromSourceControl(pMtl->GetFilename().toUtf8().data(), fileInfo, this))
-            {
-                // Sanity check the source control api reports the file is checked out by another
-                AZ_Assert(fileInfo.HasFlag(AzToolsFramework::SCF_OtherOpen), "File attributes reporting incorrectly");
-                otherUser = fileInfo.m_StatusUser;
-            }
-
-            if (QMessageBox::question(this, QString(), tr("This file is checked out by %1. Try to continue?").arg(otherUser.c_str())) != QMessageBox::Yes)
-            {
-                return;
-            }
-        }
-        bRes = CFileUtil::GetLatestFromSourceControl(path.toUtf8().data(), this);
-        if (bRes)
-        {
-            bRes = CFileUtil::CheckoutFile(path.toUtf8().data(), this);
-        }
-    }
-    break;
-    case ESCM_UNDO_CHECKOUT:
-        bRes = CFileUtil::RevertFile(path.toUtf8().data(), this);
-        break;
-    case ESCM_GETLATEST:
-        bRes = CFileUtil::GetLatestFromSourceControl(path.toUtf8().data(), this);
-        break;
-    case ESCM_GETLATESTTEXTURES:
-        if (pMtl)
-        {
-            QString message;
-            QStringList filenames;
-            int nTextures = pMtl->GetTextureFilenames(filenames);
-            for (int i = 0; i < nTextures; ++i)
-            {
-                bRes = CFileUtil::GetLatestFromSourceControl(filenames[i].toUtf8().data(), this);
-                message += Path::GetRelativePath(filenames[i], true) + (bRes ? " [OK]" : " [Fail]") + "\n";
-            }
-            QMessageBox::information(this, QString(), message.isEmpty() ? tr("No files are affected") : message);
-        }
-        return;
-    }
-
-    if (!bRes)
-    {
-        QMessageBox::critical(this, tr("Error"), tr("Source Control Operation Failed.\r\nCheck if Source Control Provider correctly setup and working directory is correct."));
-        return;
-    }
-
-    // force the cache to be rebuilt next time we repaint
-    record.InitializeSourceControlAttributes();
-    m_filterModel->SetRecord(record);
-
-    if (pMtl)
-    {
-        pMtl->Reload();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnMakeSubMtlSlot(const CMaterialBrowserRecord& record)
-{
-    if (m_selectedSubMaterialIndex >= 0)
-    {
-        _smart_ptr<CMaterial> parentMaterial = record.m_material;
-        if (parentMaterial && parentMaterial->IsMultiSubMaterial())
-        {
-            const QString str = tr("Making new material will override material currently assigned to the slot %1 of %2\r\nMake new sub material?")
-                    .arg(m_selectedSubMaterialIndex).arg(parentMaterial->GetName());
-            if (QMessageBox::question(this, tr("Confirm Override"), str) == QMessageBox::Yes)
-            {
-                QString name = tr("SubMtl%1")
-                        .arg(m_selectedSubMaterialIndex + 1);
-                _smart_ptr<CMaterial> pMtl = new CMaterial(name, MTL_FLAG_PURE_CHILD);
-                parentMaterial->SetSubMaterial(m_selectedSubMaterialIndex, pMtl);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnClearSubMtlSlot(_smart_ptr<CMaterial> subMaterial)
-{
-    if (subMaterial && m_selectedSubMaterialIndex >= 0)
-    {
-        _smart_ptr<CMaterial> parentMaterial = subMaterial->GetParent();
-        if (parentMaterial && parentMaterial->IsMultiSubMaterial())
-        {
-            const QString str = tr("Clear Sub-Material Slot %1 of %2?").arg(m_selectedSubMaterialIndex).arg(parentMaterial->GetName());
-            if (QMessageBox::question(this, tr("Clear Sub-Material"), str) == QMessageBox::Yes)
-            {
-                CUndo undo("Material Change");
-                SetSubMaterial(parentMaterial, m_selectedSubMaterialIndex, 0);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::SetSubMaterial(_smart_ptr<CMaterial> parentMaterial, int slot, _smart_ptr<CMaterial> subMaterial)
-{
-    if (parentMaterial && parentMaterial->IsMultiSubMaterial())
-    {
-        // If the last sub-material is being removed, select the 2nd to last sub-material
-        if (!subMaterial && slot == parentMaterial->GetSubMaterialCount() - 1)
-        {
-            m_selectedSubMaterialIndex = slot - 1;
-        }
-        parentMaterial->SetSubMaterial(slot, subMaterial);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event)
-{
-    if (m_bIgnoreSelectionChange)
-    {
-        return;
-    }
-
-    if (!pItem)
-    {
-        return;
-    }
-
-
-    switch (event)
-    {
-    case EDB_ITEM_EVENT_ADD:
-        break;
-    case EDB_ITEM_EVENT_DELETE:
-        {
-            if (pItem)
-            {
-                //If the deleted item is selected, remove selection
-                CMaterial* pMtl = static_cast<CMaterial*>(pItem);
-                CMaterial* selectedMaterial = GetCurrentMaterial();
-                if (selectedMaterial && selectedMaterial->IsPureChild())
-                {
-                    selectedMaterial = selectedMaterial->GetParent();
-                }
-                if (pMtl == selectedMaterial)
-                {
-                    SetSelectedItem(nullptr, nullptr, true);
-                }
-            }
-        }
-        break;
-    case EDB_ITEM_EVENT_CHANGED:
-        {
-            CMaterial* pMtl = static_cast<CMaterial*>(pItem);
-            CMaterial* selectedMaterial = GetCurrentMaterial();
-            if (selectedMaterial && selectedMaterial->IsPureChild())
-            {
-                selectedMaterial = selectedMaterial->GetParent();
-            }
-            // If this is a sub material, refresh parent
-            if (pMtl->IsPureChild())
-            {
-                pMtl = pMtl->GetParent();
-            }
-
-            if (pMtl == selectedMaterial)
-            {
-                if (pMtl->IsMultiSubMaterial())
-                {
-                    m_pLastActiveMultiMaterial = NULL;
-                }
-                RefreshSelected();
-            }
-            m_bItemsValid = false;
-        }
-        break;
-    case EDB_ITEM_EVENT_SELECTED:
-        {
-            SelectItem(pItem, NULL);
-        }
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::SetImageListCtrl(CMaterialImageListCtrl* pCtrl)
-{
-    m_pMaterialImageListCtrl = pCtrl;
-    if (m_pMaterialImageListCtrl)
-    {
-        connect(m_pMaterialImageListCtrl->selectionModel(), &QItemSelectionModel::currentChanged,
-            this, &MaterialBrowserWidget::OnSubMaterialSelectedInPreviewPane);
-
-        connect(m_pMaterialImageListCtrl, &QAbstractItemView::clicked,
-            this, &MaterialBrowserWidget::OnSubMaterialSelectedInPreviewPane);
-
-        m_pMaterialImageListCtrl->SetMaterialBrowserWidget(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnSaveToFile(bool bMulti)
-{
-    _smart_ptr<CMaterial> pCurrentMaterial = GetCurrentMaterial();
-    if (pCurrentMaterial)
-    {
-        QString startPath = GetIEditor()->GetSearchPath(EDITOR_PATH_MATERIALS);
-        QString filename;
-        if (!CFileUtil::SelectSaveFile("Material Files (*.mtl)", "mtl", startPath, filename))
-        {
-            return;
-        }
-        QFileInfo info(filename);
-        QString itemName = info.baseName();
-        itemName = Path::MakeGamePath(itemName);
-
-        if (m_pMatMan->FindItemByName(itemName))
-        {
-            Warning("Material with name %s already exist", itemName.toUtf8().data());
-            return;
-        }
-        int flags = pCurrentMaterial->GetFlags();
-        if (bMulti)
-        {
-            flags |= MTL_FLAG_MULTI_SUBMTL;
-        }
-
-        pCurrentMaterial->SetFlags(flags);
-
-        if (pCurrentMaterial->IsDummy())
-        {
-            pCurrentMaterial->ClearMatInfo();
-            pCurrentMaterial->SetDummy(false);
-        }
-        pCurrentMaterial->SetModified(true);
-        pCurrentMaterial->Save();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::RefreshSelected()
-{
-    CMaterialBrowserRecord record;
-    bool found = TryGetSelectedRecord(record);
-    _smart_ptr<CMaterial> pMtl = nullptr;
-    if (!found)
-    {
-        ClearImageListControlSelection();
-        return;
-    }
-    else
-    {
-        pMtl = record.m_material;
-    }
-
-    if (m_pMaterialImageListCtrl)
-    {
-        QMaterialImageListModel* materialModel =
-            qobject_cast<QMaterialImageListModel*>(m_pMaterialImageListCtrl->model());
-        Q_ASSERT(materialModel);
-
-        materialModel->InvalidateMaterial(pMtl);
-        if (pMtl)
-        {
-            _smart_ptr<CMaterial> pMultiMtl = nullptr;
-            if (pMtl->IsMultiSubMaterial())
-            {
-                // It's possible that the currently selected sub-material index is beyond the range of the current multi-material if, for example,
-                // the last sub-material was selected but then the source .mtl file was changed to have fewer total sub-materials
-                if (m_selectedSubMaterialIndex >= pMtl->GetSubMaterialCount())
-                {
-                    // If that's the case, select the last sub-material
-                    // If the sub-material count has dropped to 0, setting m_selectedSubMaterialIndex to -1 will cause the parent material to be selected
-                    m_selectedSubMaterialIndex = pMtl->GetSubMaterialCount() - 1;
-                }
-
-                pMultiMtl = pMtl;
-                if (m_selectedSubMaterialIndex >= 0)
-                {
-                    pMtl = pMtl->GetSubMaterial(m_selectedSubMaterialIndex);
-                }
-            }
-
-            if (m_pLastActiveMultiMaterial != pMultiMtl || pMultiMtl == nullptr)
-            {
-                // A new material was selected, so the previewer needs to be cleared
-                materialModel->DeleteAllItems();
-                // If the new material was not a multi-material, add it to the previewer
-                if (pMultiMtl == nullptr)
-                {
-                    materialModel->AddMaterial(pMtl);
-                }
-            }
-
-            // If a new multi-material was selected
-            if (m_pLastActiveMultiMaterial != pMultiMtl && pMultiMtl != nullptr)
-            {
-                // Add all of its submaterials to the previewer
-                for (size_t i = 0; i < pMultiMtl->GetSubMaterialCount(); i++)
-                {
-                    if (pMultiMtl->GetSubMaterial(i))
-                    {
-                        materialModel->AddMaterial(pMultiMtl->GetSubMaterial(i), reinterpret_cast<void*>(i));
-                    }
-                }
-                m_pMaterialImageListCtrl->selectionModel()->clear();
-
-                // If a sub-material was selected in the material browser, select it in the previewer
-                QModelIndex modelIndex;
-                if (m_selectedSubMaterialIndex >= 0)
-                {
-                    modelIndex = materialModel->index(m_selectedSubMaterialIndex, 0);
-                }
-                m_pMaterialImageListCtrl->selectionModel()->select(modelIndex, QItemSelectionModel::SelectCurrent);
-            }
-
-            m_pMaterialImageListCtrl->SelectMaterial(pMtl);
-            m_pLastActiveMultiMaterial = pMultiMtl;
-        }
-        else
-        {
-            ClearSelection(materialModel);
-        }
-    }
-}
-
-void MaterialBrowserWidget::ClearImageListControlSelection()
-{
-    QMaterialImageListModel* materialModel =
-        qobject_cast<QMaterialImageListModel*>(m_pMaterialImageListCtrl->model());
-    Q_ASSERT(materialModel);
-
-    ClearSelection(materialModel);
-}
-
-void MaterialBrowserWidget::ClearSelection(QMaterialImageListModel* materialModel)
-{
-    materialModel->DeleteAllItems();
-    m_pLastActiveMultiMaterial = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void MaterialBrowserWidget::AddContextMenuActionsMultiSelect(QMenu& menu) const
-{
-    int numMaterialsSelected = 0;
-    for (int i = 0; i < m_markedRecords.size(); ++i)
-    {
-        if (m_markedRecords[i].m_material)
-        {
-            ++numMaterialsSelected;
-        }
-    }
-    const QString itemsSelected = tr("  (%1 Materials Selected)").arg(numMaterialsSelected);
-    menu.addAction(itemsSelected)->setEnabled(false);
-    menu.addSeparator();
-
-    if (numMaterialsSelected >= 2) // ... and at least two materials
-    {
-        menu.addAction(tr("Merge"))->setData(MENU_MERGE);
-    }
-    else
-    {
-        menu.addAction(tr("Merge (Select two or more)"))->setEnabled(false);
-    }
-}
-
-void MaterialBrowserWidget::AddContextMenuActionsNoSelection(QMenu& menu) const
-{
-    QAction* action = menu.addAction(tr("Paste"));
-    action->setShortcut(QKeySequence::Paste);
-    action->setData(MENU_PASTE);
-    action->setEnabled(CanPaste());
-
-    menu.addSeparator();
-    menu.addAction(tr("Add New Material"))->setData(MENU_ADDNEW);
-    menu.addAction(tr("Add New Multi Material"))->setData(MENU_ADDNEW_MULTI);
-    if (GetIEditor()->IsSourceControlAvailable())
-    {
-        menu.addSeparator();
-        menu.addAction(tr("Source Control"))->setEnabled(false);
-        menu.addAction(tr("Check Out"))->setData(MENU_SCM_CHECK_OUT);
-        menu.addAction(tr("Undo Check Out"))->setData(MENU_SCM_UNDO_CHECK_OUT);
-        menu.addAction(tr("Get Latest Version"))->setData(MENU_SCM_GET_LATEST);
-    }
-}
-
-void MaterialBrowserWidget::AddContextMenuActionsSingleSelection(QMenu& menu, _smart_ptr<CMaterial> material) const
-{
-    if (material)
-    {
-        if (material->IsMultiSubMaterial())
-        {
-            if (m_selectedSubMaterialIndex >= 0)
-            {
-                AddContextMenuActionsSubMaterial(menu, material, material->GetSubMaterial(m_selectedSubMaterialIndex));
-            }
-            else
-            {
-                AddContextMenuActionsMultiMaterial(menu);
-                AddContextMenuActionsCommon(menu, material);
-            }
-        }
-        else if (material->IsPureChild())
-        {
-            AddContextMenuActionsSubMaterial(menu, material->GetParent(), material);
-        }
-        else
-        {
-            AddContextMenuActionsSingleMaterial(menu);
-            AddContextMenuActionsCommon(menu, material);
-        }
-    }
-}
-
-void MaterialBrowserWidget::AddContextMenuActionsSubMaterial(QMenu& menu, _smart_ptr<CMaterial> parentMaterial, _smart_ptr<CMaterial> subMaterial) const
-{
-    bool enabled = true;
-
-    if (parentMaterial)
-    {
-        uint32 nFileAttr = parentMaterial->GetFileAttributes();
-        if (nFileAttr & SCC_FILE_ATTRIBUTE_READONLY)
-        {
-            enabled = false;
-        }
-    }
-
-    QAction* action = menu.addAction(tr("Reset sub-material to default"));
-    action->setData(MENU_SUBMTL_MAKE);
-    action->setEnabled(enabled);
-
-    menu.addSeparator();
-
-    action = menu.addAction(tr("Cut"));
-    action->setShortcut(QKeySequence::Cut);
-    action->setData(MENU_CUT);
-    action->setEnabled(enabled);
-
-    action = menu.addAction(tr("Copy"));
-    action->setShortcut(QKeySequence::Copy);
-    action->setData(MENU_COPY);
-
-    action = menu.addAction(tr("Paste"));
-    action->setShortcut(QKeySequence::Paste);
-    action->setData(MENU_PASTE);
-    action->setEnabled(CanPaste() && enabled);
-
-    action = menu.addAction(tr("Rename\tF2"));
-    action->setData(MENU_RENAME);
-    action->setEnabled(enabled);
-
-    action = menu.addAction(tr("Delete"));
-    action->setData(MENU_SUBMTL_CLEAR);
-    action->setEnabled(enabled);
-}
-
-void MaterialBrowserWidget::AddContextMenuActionsMultiMaterial(QMenu& menu) const
-{
-    menu.addAction(tr("Set Number of Sub-Materials"))->setData(MENU_NUM_SUBMTL);
-    menu.addSeparator();
-}
-
-void MaterialBrowserWidget::AddContextMenuActionsSingleMaterial(QMenu& menu) const
-{
-    menu.addAction(tr("Convert To Multi Material"))->setData(MENU_CONVERT_TO_MULTI);
-    menu.addSeparator();
-}
-
-void MaterialBrowserWidget::AddContextMenuActionsCommon(QMenu& menu, _smart_ptr<CMaterial> material) const
-{
-    uint32 fileAttributes = material->GetFileAttributes();
-
-    bool modificationsEnabled = true;
-    if (fileAttributes & SCC_FILE_ATTRIBUTE_READONLY)
-    {
-        modificationsEnabled = false;
-    }
-
-    QAction* action = menu.addAction(tr("Cut"));
-    action->setShortcut(QKeySequence::Cut);
-    action->setData(MENU_CUT);
-    action = menu.addAction(tr("Copy"));
-    action->setShortcut(QKeySequence::Copy);
-    action->setData(MENU_COPY);
-    action = menu.addAction(tr("Paste"));
-    action->setShortcut(QKeySequence::Paste);
-    action->setData(MENU_PASTE);
-    action->setEnabled(CanPaste() && modificationsEnabled);
-    menu.addAction(tr("Copy Path to Clipboard"))->setData(MENU_COPY_NAME);
-    if (fileAttributes & SCC_FILE_ATTRIBUTE_INPAK)
-    {
-        menu.addAction(tr("Extract"))->setData(MENU_EXTRACT);
-    }
-    else
-    {
-        menu.addAction(tr("Explore"))->setData(MENU_EXPLORE);
-    }
-    menu.addSeparator();
-    action = menu.addAction(tr("Duplicate"));
-    action->setShortcut(tr("Ctrl+D"));
-    action->setData(MENU_DUPLICATE);
-    menu.addAction(tr("Rename\tF2"))->setData(MENU_RENAME);
-    action = menu.addAction(tr("Delete"));
-    action->setShortcut(QKeySequence::Delete);
-    action->setData(MENU_DELETE);
-    menu.addSeparator();
-    menu.addAction(tr("Assign to Selected Objects"))->setData(MENU_ASSIGNTOSELECTION);
-    menu.addAction(tr("Select Assigned Objects"))->setData(MENU_SELECTASSIGNEDOBJECTS);
-    menu.addSeparator();
-
-    menu.addAction(tr("Add New Material"))->setData(MENU_ADDNEW);
-    menu.addAction(tr("Add New Multi Material"))->setData(MENU_ADDNEW_MULTI);
-    menu.addAction(tr("Merge (Select two or more)"))->setEnabled(false);
-
-    AddContextMenuActionsSourceControl(menu, material, fileAttributes);
-}
-
-void MaterialBrowserWidget::AddContextMenuActionsSourceControl(QMenu& menu, _smart_ptr<CMaterial> material, uint32 fileAttributes) const
-{
-    if (GetIEditor()->IsSourceControlAvailable())
-    {
-        menu.addSeparator();
-
-        if (fileAttributes & SCC_FILE_ATTRIBUTE_INPAK)
-        {
-            menu.addAction(tr("  Material In Pak (Read Only)"))->setEnabled(false);
-        }
-        else
-        {
-            menu.addAction(tr("  Source Control"))->setEnabled(false);
-            if (!(fileAttributes & SCC_FILE_ATTRIBUTE_MANAGED))
-            {
-                menu.addAction(tr("Add To Source Control"))->setData(MENU_SCM_ADD);
-            }
-        }
-        QAction* action = nullptr;
-        if (fileAttributes & SCC_FILE_ATTRIBUTE_MANAGED)
-        {
-            action = menu.addAction(tr("Check Out"));
-            action->setData(MENU_SCM_CHECK_OUT);
-            action->setEnabled(fileAttributes & SCC_FILE_ATTRIBUTE_READONLY || fileAttributes & SCC_FILE_ATTRIBUTE_INPAK);
-            action = menu.addAction(tr("Undo Check Out"));
-            action->setData(MENU_SCM_UNDO_CHECK_OUT);
-            action->setEnabled(fileAttributes & SCC_FILE_ATTRIBUTE_CHECKEDOUT);
-            menu.addAction(tr("Get Latest Version"))->setData(MENU_SCM_GET_LATEST);
-        }
-
-        if (material)
-        {
-            QStringList filenames;
-            int nTextures = material->GetTextureFilenames(filenames);
-            action = menu.addAction(tr("Get Textures"));
-            action->setData(MENU_SCM_GET_LATEST_TEXTURES);
-            action->setEnabled(nTextures > 0);
-        }
-    }
-}
-
-void MaterialBrowserWidget::ShowContextMenu(const CMaterialBrowserRecord& record, const QPoint& point)
-{
-    _smart_ptr<CMaterial> material = record.m_material;
-
-    // Create pop up menu.
-    QMenu menu;
-    if (m_markedRecords.size() >= 2) // it makes sense when we have at least two items selected
-    {
-        AddContextMenuActionsMultiSelect(menu);
-    }
-    else if (!material) // click on root, background or folder
-    {
-        AddContextMenuActionsNoSelection(menu);
-    }
-    else
-    {
-        // When right-clicking a single item in the material browser, select the parent material that was clicked, rather than the currently selected sub-material
-        // The context menu for sub-materials will be handled by the image list control rather than the material browser widget
-        m_selectedSubMaterialIndex = -1;
-        SetSelectedItem(material, nullptr, true);
-        AddContextMenuActionsSingleSelection(menu, material);
-    }
-    QAction* action = menu.exec(m_ui->treeView->mapToGlobal(point));
-    const int cmd = action ? action->data().toInt() : 0;
-
-    OnContextMenuAction(cmd, material);
-}
-
-void MaterialBrowserWidget::OnContextMenuAction(int command, _smart_ptr<CMaterial> material)
-{
-    CMaterialBrowserRecord record;
-    TryGetSelectedRecord(record);
-    switch (command)
-    {
-    case MENU_UNDEFINED:
-        return;                  // do nothing
-    case MENU_CUT:
-        OnCut();
-        break;
-    case MENU_COPY:
-        OnCopy();
-        break;
-    case MENU_COPY_NAME:
-        OnCopyName();
-        break;
-    case MENU_PASTE:
-        OnPaste();
-        break;
-    case MENU_EXPLORE:
-    {
-        if (material && material->IsPureChild())
-        {
-            material = material->GetParent();
-        }
-
-        if (material)
-        {
-            QString fullPath = material->GetFilename();
-            AzQtComponents::ShowFileOnDesktop(fullPath);
-        }
-    }
-    break;
-    case MENU_EXTRACT:
-    {
-        if (material && material->IsPureChild())
-        {
-            material = material->GetParent();
-        }
-
-        if (material)
-        {
-            QString fullPath = material->GetFilename();
-            if (CFileUtil::ExtractFile(fullPath, true, fullPath.toUtf8().data()))
-            {
-                AzQtComponents::ShowFileOnDesktop(fullPath);
-            }
-        }
-    }
-    break;
-    case MENU_DUPLICATE:
-        OnDuplicate();
-        break;
-    case MENU_RENAME:
-        OnRenameItem();
-        break;
-    case MENU_DELETE:
-        DeleteItem(record);
-        break;
-    case MENU_RESET:
-        OnResetItem();
-        break;
-    case MENU_ASSIGNTOSELECTION:
-    {
-        CUndo undo("Assign Material To Selection");
-        GetIEditor()->GetMaterialManager()->Command_AssignToSelection();
-        break;
-    }
-    case MENU_SELECTASSIGNEDOBJECTS:
-    {
-        CUndo undo("Select Objects With Current Material");
-        GetIEditor()->GetMaterialManager()->Command_SelectAssignedObjects();
-        break;
-    }
-    case MENU_NUM_SUBMTL:
-        OnSetSubMtlCount(record);
-        break;
-    case MENU_ADDNEW:
-        OnAddNewMaterial();
-        break;
-    case MENU_ADDNEW_MULTI:
-        OnAddNewMultiMaterial();
-        break;
-    case MENU_CONVERT_TO_MULTI:
-        OnConvertToMulti();
-        break;
-    case MENU_MERGE:
-        OnMergeMaterials();
-        break;
-
-    case MENU_SUBMTL_MAKE:
-        OnMakeSubMtlSlot(record);
-        break;
-    case MENU_SUBMTL_CLEAR:
-        OnClearSubMtlSlot(material);
-        break;
-
-    case MENU_SCM_ADD:
-        DoSourceControlOp(record, ESCM_IMPORT);
-        break;
-    case MENU_SCM_CHECK_OUT:
-        DoSourceControlOp(record, ESCM_CHECKOUT);
-        break;
-    case MENU_SCM_UNDO_CHECK_OUT:
-        DoSourceControlOp(record, ESCM_UNDO_CHECKOUT);
-        break;
-    case MENU_SCM_GET_LATEST:
-        DoSourceControlOp(record, ESCM_GETLATEST);
-        break;
-    case MENU_SCM_GET_LATEST_TEXTURES:
-        DoSourceControlOp(record, ESCM_GETLATESTTEXTURES);
-        break;
-
-    case MENU_SAVE_TO_FILE:
-        OnSaveToFile(false);
-        break;
-    case MENU_SAVE_TO_FILE_MULTI:
-        OnSaveToFile(true);
-        break;
-        //case MENU_MAKE_SUBMTL: OnAddNewMultiMaterial(); break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::PopulateItems()
-{
-    if (m_bIgnoreSelectionChange)
-    {
-        return;
-    }
-
-    if (m_bItemsValid)
-    {
-        return;
-    }
-
-    m_bItemsValid = true;
-    m_bIgnoreSelectionChange = true;
-
-    IDataBaseItem* pSelection = m_pMatMan->GetSelectedItem();
-    IDataBaseItem* pSelectionParent = m_pMatMan->GetSelectedParentItem();
-
-    m_bIgnoreSelectionChange = false;
-
-    if (pSelection)
-    {
-        SelectItem(pSelection, pSelectionParent);
-        if (m_bHighlightMaterial)
-        {
-            m_bHighlightMaterial = false;
-            m_pMatMan->SetHighlightedMaterial(0);
-        }
-    }
-}
-
-void MaterialBrowserWidget::StartRecordUpdateJobs()
-{
-    m_filterModel->StartRecordUpdateJobs();
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 MaterialBrowserWidget::MaterialNameToCrc32(const QString& str)
-{
-    return CCrc32::ComputeLowercase(str.toUtf8());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool MaterialBrowserWidget::TryGetSelectedRecord(CMaterialBrowserRecord& record)
-{
-    QVariant variant = m_filterModel->data(m_ui->treeView->currentIndex(), Qt::UserRole);
-    if (variant.isValid())
-    {
-        record = variant.value<CMaterialBrowserRecord>();
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-_smart_ptr<CMaterial> MaterialBrowserWidget::GetCurrentMaterial()
-{
-    CMaterialBrowserRecord record;
-    bool found = TryGetSelectedRecord(record);
-    if (found && record.m_material)
-    {
-        if (record.m_material->IsMultiSubMaterial() && m_selectedSubMaterialIndex >= 0)
-        {
-            return record.m_material->GetSubMaterial(m_selectedSubMaterialIndex);
-        }
-        else
-        {
-            return record.m_material;
-        }
-    }
-
-    return m_pMatMan->GetCurrentMaterial();
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZStd::string MaterialBrowserWidget::GetSelectedMaterialID()
-{
-    CMaterialBrowserRecord record;
-    bool found = TryGetSelectedRecord(record);
-    if (found)
-    {
-        return record.GetRelativeFilePath();
-    }
-    return AZStd::string();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void MaterialBrowserWidget::OnSelectionChanged()
-{
-    m_selectedSubMaterialIndex = -1;
-    TMaterialBrowserRecords markedRecords;
-
-    CMaterialBrowserRecord record;
-    bool found = TryGetSelectedRecord(record);
-    for (const QModelIndex& row : m_ui->treeView->selectionModel()->selectedRows())
-    {
-        QVariant userRole = row.data(Qt::UserRole);
-        if (userRole.isValid())
-        {
-            CMaterialBrowserRecord currentRecord = userRole.value<CMaterialBrowserRecord>();
-            markedRecords.push_back(currentRecord);
-        }
-    }
-
-    if (!found && !markedRecords.empty())
-    {
-        record = markedRecords.front();
-        found = true;
-    }
-    if (found)
-    {
-        // Since the call to SetSelectedItem is coming from an OnSelectionChanged event, the appropriate
-        // element of the tree view has already been selected. Pass in false for the selectInTreeView argument
-        // to prevent SetSelectedItem from trying to re-select the material in the browser
-        SetSelectedItem(record.m_material, &markedRecords, false);
-    }
-}
-
-void MaterialBrowserWidget::OnRefreshSelection()
-{
-    // force RefreshSelected to repopulate by setting m_pLastActiveMultiMaterial to null
-    // so it thinks we selected a new material.
-    m_pLastActiveMultiMaterial = nullptr;
-
-    //If no material is selected, clear preview.
-    if (!GetCurrentMaterial())
-    {
-        if (m_pMaterialImageListCtrl)
-        {
-            QMaterialImageListModel* materialModel =
-                qobject_cast<QMaterialImageListModel*>(m_pMaterialImageListCtrl->model());
-            Q_ASSERT(materialModel);
-            materialModel->DeleteAllItems();
-        }
-    }
-
-    RefreshSelected();
-
-    // Force update the material dialog
-    if (m_pListener)
-    {
-        m_pListener->OnBrowserSelectItem(GetCurrentMaterial(), true);
-    }
-}
-
-void MaterialBrowserWidget::OnMaterialAdded()
-{
-    if (m_delayedSelection)
-    {
-        SetSelectedItem(m_delayedSelection, nullptr, true);
-
-        // Force update the material dialog
-        if (m_pListener)
-        {
-            m_pListener->OnBrowserSelectItem(GetCurrentMaterial(), true);
-        }
-    }
-}
-
-void MaterialBrowserWidget::OnSubMaterialSelectedInPreviewPane(const QModelIndex& current)
-{
-    if (!m_pMaterialImageListCtrl)
-    {
-        return;
-    }
-
-    QMaterialImageListModel* materialModel =
-        qobject_cast<QMaterialImageListModel*>(m_pMaterialImageListCtrl->model());
-    Q_ASSERT(materialModel);
-
-    int nSlot = (INT_PTR)materialModel->UserDataFromIndex(current);
-    if (nSlot < 0)
-    {
-        return;
-    }
-
-    CMaterialBrowserRecord record;
-    bool found = TryGetSelectedRecord(record);
-    if (!found || !record.m_material)
-    {
-        return;
-    }
-
-    if (!record.m_material->IsMultiSubMaterial())
-    {
-        return; // must be multi sub material.
-    }
-    if (nSlot >= record.m_material->GetSubMaterialCount())
-    {
-        return;
-    }
-
-    if (nSlot == m_selectedSubMaterialIndex)
-    {
-        return;
-    }
-
-    m_selectedSubMaterialIndex = nSlot;
-
-    SetSelectedItem(record.m_material, nullptr, false);
-}
-
-void MaterialBrowserWidget::SaveCurrentMaterial()
-{
-    // Saving might open a modal dialog asking to overwrite, therefore don't run this from DTOR, might crash
-
-    _smart_ptr<CMaterial> pCurrentMtl = GetCurrentMaterial();
-    if (pCurrentMtl && pCurrentMtl->IsModified())
-    {
-        pCurrentMtl->Save();
-    }
-}
-
-void MaterialBrowserWidget::expandAllNotMatchingIndexes(const QModelIndex& parent)
-{
-    if (!parent.isValid())
-    {
-        m_ui->treeView->collapseAll();
-    }
-
-    const int rowCount = m_ui->treeView->model()->rowCount(parent);
-    for (int row = 0; row < rowCount; ++row)
-    {
-        const QModelIndex index = m_ui->treeView->model()->index(row, 0, parent);
-        const QString text = index.data().toString();
-        bool contains = true;
-        m_ui->treeView->setExpanded(index, !contains);
-        if (!contains)
-        {
-            expandAllNotMatchingIndexes(index);
-        }
-    }
-}
-
-void MaterialBrowserWidget::MaterialAddFinished()
-{
-    emit materialAdded();
-}
-
-void MaterialBrowserWidget::MaterialFinishedProcessing(_smart_ptr<CMaterial> material, const QPersistentModelIndex& filterModelIndex)
-{
-    // If the currently selected material finished processing
-    if (filterModelIndex.isValid() && filterModelIndex == m_ui->treeView->currentIndex())
-    {
-        // Stash the delayed selection so that it is not cleared just because the currently selected material finished processing
-        _smart_ptr<CMaterial> tempDelayedSelection = m_delayedSelection;
-
-        // Re-select the material to update the material dialogue
-        // but ignore the tree-view selection since the current index is already the correct one for this material
-        SetSelectedItem(material, nullptr, false);
-
-        // Force update the material dialog
-        if (m_pListener)
-        {
-            m_pListener->OnBrowserSelectItem(GetCurrentMaterial(), true);
-        }
-
-        if (material != m_delayedSelection)
-        {
-            // If the current selection that just finished processing was not the delayed selection, restore the delayed selection
-            m_delayedSelection = tempDelayedSelection;
-        }
-    }
-    // If there was a failed attempt to select the material before it finished processing
-    else if (m_delayedSelection && m_delayedSelection == material)
-    {
-        // Re-select the material to update the material dialogue
-        // and also select the material in the tree-view
-        SetSelectedItem(material, nullptr, true);
-
-        // Force update the material dialog
-        if (m_pListener)
-        {
-            m_pListener->OnBrowserSelectItem(GetCurrentMaterial(), true);
-        }
-    }
-}
-
-void MaterialBrowserWidget::MaterialRecordUpdateFinished()
-{
-    //The event is sent by a AZJob working thread, need to emit a signal here for qt to catch later.
-    //It can make sure all the qt functions need to be called at this point are only executed in the qt thread. 
-    emit refreshSelection();
-}
-
-
-#include <Material/moc_MaterialBrowser.cpp>
diff --git a/Code/Sandbox/Editor/Material/MaterialBrowser.h b/Code/Sandbox/Editor/Material/MaterialBrowser.h
deleted file mode 100644
index d02045bacd..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialBrowser.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_MATERIAL_MATERIALBROWSER_H
-#define CRYINCLUDE_EDITOR_MATERIAL_MATERIALBROWSER_H
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include "Include/IDataBaseManager.h"
-#include "Material/Material.h"
-#include "Material/MaterialBrowserFilterModel.h"
-
-#include <QMenu>
-#include <QDateTime>
-#include <QModelIndex>
-#include <ISourceControl.h>
-
-#include <AzToolsFramework/AssetBrowser/Search/Filter.h>
-#endif
-
-class CMaterial;
-
-class MaterialBrowserWidget;
-class CMaterialImageListCtrl;
-class QMaterialImageListModel;
-
-class QTreeView;
-class QAction;
-
-struct IDataBaseItem;
-class CMaterialBrowserRecord;
-typedef std::vector<CMaterialBrowserRecord> TMaterialBrowserRecords;
-
-namespace AzToolsFramework
-{
-    namespace AssetBrowser
-    {
-        class AssetBrowserModel;
-        class AssetBrowserFilterModel;
-        class AssetTypeFilter;
-    }
-}
-
-enum ESccFileAttributes;
-
-namespace Ui
-{
-    class MaterialBrowser;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-struct IMaterialBrowserListener
-{
-    virtual void OnBrowserSelectItem(IDataBaseItem* pItem, bool bForce) = 0;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// MaterialBrowserWidget
-//////////////////////////////////////////////////////////////////////////
-class MaterialBrowserFilterModel;
-
-class MaterialBrowserWidget
-    : public QWidget
-    , public IDataBaseManagerListener
-    , public IEditorNotifyListener
-    , public MaterialBrowserWidgetBus::Handler
-{
-    Q_OBJECT
-
-public:
-    enum EViewType
-    {
-        VIEW_LEVEL = 0,
-        VIEW_ALL = 1,
-    };
-
-    enum EFilter
-    {
-        eFilter_Materials = 0x01,
-        eFilter_Textures = 0x02,
-        eFilter_Materials_And_Textures = 0x03,
-        eFilter_Submaterials = 0x04
-    };
-
-    MaterialBrowserWidget(QWidget* parent);
-    ~MaterialBrowserWidget();
-
-    void SetListener(IMaterialBrowserListener* pListener) { m_pListener = pListener; }
-
-    EViewType GetViewType() const { return m_viewType; };
-
-    void ClearItems();
-
-    void SelectItem(IDataBaseItem* pItem, IDataBaseItem* pParentItem);
-    void DeleteItem();
-
-    void PopulateItems();
-    void StartRecordUpdateJobs();
-
-    bool ShowCheckedOutRecursive(TMaterialBrowserRecords* pRecords);
-
-    void ShowOnlyLevelMaterials(bool levelOnly);
-    
-    void OnCopy();
-    void OnCopyName();
-    void OnPaste();
-    void OnCut();
-    void OnDuplicate();
-    void OnAddNewMaterial();
-    void OnAddNewMultiMaterial();
-    void OnConvertToMulti();
-    void OnMergeMaterials();
-
-public slots:
-    void OnSelectionChanged();
-    void OnSubMaterialSelectedInPreviewPane(const QModelIndex& current);
-    void SaveCurrentMaterial();
-    void OnRefreshSelection();
-    void OnMaterialAdded();
-
-signals:
-    void refreshSelection();
-    void materialAdded();
-    
-public:
-    void OnUpdateShowCheckedOut();
-    bool CanPaste() const;
-
-    void SetImageListCtrl(CMaterialImageListCtrl* pCtrl);
-
-    //////////////////////////////////////////////////////////////////////////
-    // IDataBaseManagerListener implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event);
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-    void AddContextMenuActionsSingleSelection(QMenu &menu, _smart_ptr<CMaterial> material) const;
-    void OnContextMenuAction(int command, _smart_ptr<CMaterial> material);
-
-    // MaterialBrowserWidgetBus event handlers
-    void MaterialAddFinished() override;
-    void MaterialFinishedProcessing(_smart_ptr<CMaterial> material, const QPersistentModelIndex &filterModelIndex) override;
-    void MaterialRecordUpdateFinished() override;
-
-protected:
-    // Item definition.
-    enum ESourceControlOp
-    {
-        ESCM_IMPORT,
-        ESCM_CHECKOUT,
-        ESCM_UNDO_CHECKOUT,
-        ESCM_GETLATEST,
-        ESCM_GETLATESTTEXTURES,
-    };
-
-    void DeleteItem(const CMaterialBrowserRecord &record);
-    void SetSelectedItem(_smart_ptr<CMaterial> material, const TMaterialBrowserRecords* pMarkedRecords, bool selectInTreeView);
-    void OnAddSubMtl();
-    void OnSelectAssignedObjects();
-    void OnAssignMaterialToSelection();
-    void OnRenameItem();
-    void OnResetItem();
-    void OnSetSubMtlCount(const CMaterialBrowserRecord &record);
-    
-    void DoSourceControlOp(CMaterialBrowserRecord &record, ESourceControlOp);
-
-    void OnMakeSubMtlSlot(const CMaterialBrowserRecord &record);
-    void OnClearSubMtlSlot(_smart_ptr<CMaterial> subMaterial);
-    void SetSubMaterial(_smart_ptr<CMaterial> parentMaterial, int slot, _smart_ptr<CMaterial> subMaterial);
-
-    void OnSaveToFile(bool bMulti);
-
-    void RefreshSelected();
-
-    void TickRefreshMaterials();
-    void TryLoadRecordMaterial(CMaterialBrowserRecord &record);
-
-    void ShowContextMenu(const CMaterialBrowserRecord &record, const QPoint& point);
-    _smart_ptr<CMaterial> GetCurrentMaterial();
-
-    uint32 MaterialNameToCrc32(const QString& str);
-
-    bool TryGetSelectedRecord(CMaterialBrowserRecord &record);
-    AZStd::string GetSelectedMaterialID();
-
-private:
-    void expandAllNotMatchingIndexes(const QModelIndex& parent = QModelIndex());
-    void ClearImageListControlSelection();
-    void ClearSelection(QMaterialImageListModel* materialModel);
-    QMenu *InitializeSearchMenu();
-
-    void AddContextMenuActionsMultiSelect(QMenu &menu) const;
-    void AddContextMenuActionsNoSelection(QMenu &menu) const;
-    void AddContextMenuActionsSubMaterial(QMenu &menu, _smart_ptr<CMaterial> parentMaterial, _smart_ptr<CMaterial> subMaterial) const;
-    void AddContextMenuActionsMultiMaterial(QMenu &menu) const;
-    void AddContextMenuActionsSingleMaterial(QMenu &menu) const;
-    void AddContextMenuActionsCommon(QMenu &menu, _smart_ptr<CMaterial> material) const;
-    void AddContextMenuActionsSourceControl(QMenu &menu, _smart_ptr<CMaterial> material, uint32 fileAttributes) const;
-
-    QScopedPointer<Ui::MaterialBrowser> m_ui;
-
-    AzToolsFramework::AssetBrowser::AssetBrowserModel* m_assetBrowserModel;
-    QSharedPointer<MaterialBrowserFilterModel> m_filterModel;
-    int m_selectedSubMaterialIndex = -1;
-    
-    bool m_bIgnoreSelectionChange;
-    bool m_bItemsValid;
-
-    CMaterialManager* m_pMatMan;
-    IMaterialBrowserListener* m_pListener;
-    CMaterialImageListCtrl* m_pMaterialImageListCtrl;
-
-    EViewType m_viewType;
-    bool m_bNeedReload;
-
-    bool m_bHighlightMaterial;
-    uint32 m_timeOfHighlight;
-    
-    TMaterialBrowserRecords m_markedRecords;
-
-    _smart_ptr<CMaterial> m_pLastActiveMultiMaterial;
-    _smart_ptr<CMaterial> m_delayedSelection;
-
-    bool m_bShowOnlyCheckedOut;
-
-    QAction* m_cutAction;
-    QAction* m_copyAction;
-    QAction* m_pasteAction;
-    QAction* m_duplicateAction;
-    QAction* m_deleteAction;
-    QAction* m_renameItemAction;
-    QAction* m_addNewMaterialAction;
-};
-
-#endif // CRYINCLUDE_EDITOR_MATERIAL_MATERIALBROWSER_H
diff --git a/Code/Sandbox/Editor/Material/MaterialBrowser.ui b/Code/Sandbox/Editor/Material/MaterialBrowser.ui
deleted file mode 100644
index 44e4e135ef..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialBrowser.ui
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MaterialBrowser</class>
- <widget class="QWidget" name="MaterialBrowser">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>250</width>
-    <height>400</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="AzToolsFramework::AssetBrowser::SearchWidget" name="m_searchWidget" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>147</width>
-         <height>22</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="AzToolsFramework::AssetBrowser::AssetBrowserTreeView" name="treeView">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <attribute name="headerVisible">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzToolsFramework::AssetBrowser::SearchWidget</class>
-   <extends>QWidget</extends>
-   <header>AzToolsFramework/AssetBrowser/Search/SearchWidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzToolsFramework::AssetBrowser::AssetBrowserTreeView</class>
-   <extends>QTreeView</extends>
-   <header>AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="MaterialDialog.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/Code/Sandbox/Editor/Material/MaterialBrowserFilterModel.cpp b/Code/Sandbox/Editor/Material/MaterialBrowserFilterModel.cpp
deleted file mode 100644
index 9f145c4daf..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialBrowserFilterModel.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "EditorDefs.h"
-
-#include "MaterialBrowserFilterModel.h"
-
-// AzFramework
-#include <AzCore/Jobs/JobFunction.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzToolsFramework/AssetBrowser/EBusFindAssetTypeByName.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-
-// Editor
-#include "MaterialBrowserSearchFilters.h"
-#include "MaterialManager.h"
-
-
-namespace
-{
-    // how often to re-query source control status of an item after querying it, in seconds.
-    // note that using a source control operation on an item invalidates the cache and will immediately
-    // refresh its status regardless of this value, so it can be pretty high.
-    qint64 g_timeRefreshSCCStatus = 60;
-}
-
-#define IDC_MATERIAL_TREECTRL 3
-
-//////////////////////////////////////////////////////////////////////////
-#define ITEM_IMAGE_SHARED_MATERIAL   0
-#define ITEM_IMAGE_SHARED_MATERIAL_SELECTED 1
-#define ITEM_IMAGE_FOLDER            2
-#define ITEM_IMAGE_FOLDER_OPEN       3
-#define ITEM_IMAGE_MATERIAL          4
-#define ITEM_IMAGE_MATERIAL_SELECTED 5
-#define ITEM_IMAGE_MULTI_MATERIAL    6
-#define ITEM_IMAGE_MULTI_MATERIAL_SELECTED 7
-
-
-#define ITEM_IMAGE_OVERLAY_CGF          8
-#define ITEM_IMAGE_OVERLAY_INPAK        9
-#define ITEM_IMAGE_OVERLAY_READONLY     10
-#define ITEM_IMAGE_OVERLAY_ONDISK       11
-#define ITEM_IMAGE_OVERLAY_LOCKED       12
-#define ITEM_IMAGE_OVERLAY_CHECKEDOUT   13
-#define ITEM_IMAGE_OVERLAY_NO_CHECKOUT  14
-//////////////////////////////////////////////////////////////////////////
-
-AZ::Data::AssetId GetMaterialProductAssetIdFromAssetBrowserEntry(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* assetEntry)
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    if (assetEntry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Source ||
-        assetEntry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Product)
-    {
-        AZStd::vector<const ProductAssetBrowserEntry*> products;
-        assetEntry->GetChildrenRecursively<ProductAssetBrowserEntry>(products);
-
-        // Cache the material asset type because this function is called for every submaterial when searching.
-        // AssetType is a POD struct so it should be fine to leave it as a static that gets destroyed during library unload/program termination.
-        static AZ::Data::AssetType materialAssetType = AZ::Data::AssetType::CreateNull();
-        if (materialAssetType.IsNull())
-        {
-            EBusFindAssetTypeByName materialAssetTypeResult("Material");
-            AZ::AssetTypeInfoBus::BroadcastResult(materialAssetTypeResult, &AZ::AssetTypeInfo::GetAssetType);
-            AZ_Assert(materialAssetTypeResult.Found(), "Could not find asset type for material asset");
-            materialAssetType = materialAssetTypeResult.GetAssetType();
-        }
-
-        for (const auto* product : products)
-        {
-            if (product->GetAssetType() == materialAssetType)
-            {
-                return product->GetAssetId();
-            }
-        }
-    }
-    return AZ::Data::AssetId();
-}
-
-MaterialBrowserFilterModel::MaterialBrowserFilterModel(QObject* parent)
-    : AzToolsFramework::AssetBrowser::AssetBrowserFilterModel(parent)
-{
-    using namespace AzToolsFramework::AssetBrowser;
-    using namespace AzToolsFramework::MaterialBrowser;
-
-    MaterialBrowserSourceControlBus::Handler::BusConnect();
-    AssetBrowserModelNotificationBus::Handler::BusConnect();
-    MaterialBrowserRequestBus::Handler::BusConnect();
-    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_00.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_01.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_02.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_03.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_04.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_05.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_06.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/material_07.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/filestatus_00.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/filestatus_01.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/filestatus_02.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/filestatus_03.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/filestatus_04.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/filestatus_05.png"));
-    m_imageList.push_back(QPixmap(":/MaterialBrowser/images/filestatus_06.png"));
-
-
-    // Create an asset type filter for materials
-    AssetTypeFilter* assetTypeFilter = new AssetTypeFilter();
-    assetTypeFilter->SetAssetType("Material");
-    assetTypeFilter->SetFilterPropagation(AssetBrowserEntryFilter::PropagateDirection::Down); //this will make sure folders that contain materials are displayed
-    m_assetTypeFilter = FilterConstType(assetTypeFilter);
-
-    // Create search filters. SetSearchFilter stores these filters so that they are deleted when this object is deleted.
-    m_subMaterialSearchFilter = new SubMaterialSearchFilter(this);
-    m_levelMaterialSearchFilter = new LevelMaterialSearchFilter(this);
-
-    InitializeRecordUpdateJob();
-}
-
-MaterialBrowserFilterModel::~MaterialBrowserFilterModel()
-{
-    SAFE_DELETE(m_jobCancelGroup);
-    SAFE_DELETE(m_jobContext);
-    SAFE_DELETE(m_jobManager);
-
-    AzToolsFramework::AssetBrowser::AssetBrowserModelNotificationBus::Handler::BusDisconnect();
-    MaterialBrowserSourceControlBus::Handler::BusDisconnect();
-    AzToolsFramework::MaterialBrowser::MaterialBrowserRequestBus::Handler::BusDisconnect();
-    AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
-}
-
-void MaterialBrowserFilterModel::UpdateRecord(const QModelIndex& filterModelIndex)
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    if (filterModelIndex.isValid())
-    {
-        QModelIndex modelIndex = mapToSource(filterModelIndex);
-
-        AssetBrowserEntry* assetEntry = static_cast<AssetBrowserEntry*>(modelIndex.internalPointer());
-
-        if (assetEntry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Source ||
-            assetEntry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Product)
-        {
-            AZStd::vector<const ProductAssetBrowserEntry*> products;
-            assetEntry->GetChildrenRecursively<ProductAssetBrowserEntry>(products);
-
-            for (const auto* product : products)
-            {
-                if (!m_assetTypeFilter->Match(product))
-                {
-                    continue;
-                }
-                MaterialBrowserRecordAssetBrowserData assetBrowserData;
-                assetBrowserData.assetId = product->GetAssetId();
-                assetBrowserData.relativeFilePath = product->GetRelativePath();
-                assetBrowserData.fullSourcePath = product->GetFullPath();
-                assetBrowserData.modelIndex = modelIndex;
-                assetBrowserData.filterModelIndex = filterModelIndex;
-                UpdateRecord(assetBrowserData);
-            }
-        }
-    }
-}
-
-void MaterialBrowserFilterModel::UpdateRecord(const MaterialBrowserRecordAssetBrowserData& assetBrowserData)
-{
-    CMaterialBrowserRecord record;
-    record.SetAssetBrowserData(assetBrowserData);
-    record.m_material = GetIEditor()->GetMaterialManager()->LoadMaterial(record.GetRelativeFilePath().c_str());
-    SetRecord(record);
-}
-
-void MaterialBrowserFilterModel::UpdateSourceControlFileInfoCallback(const AZ::Data::AssetId& assetId, const AzToolsFramework::SourceControlFileInfo& info)
-{
-    CMaterialBrowserRecord record;
-    bool found = m_materialRecordMap.find(assetId, &record);
-    if (found)
-    {
-        // Update the cached source control attributes for the record
-        record.m_lastCachedSCCAttributes = info;
-        record.m_lastCachedFileAttributes = static_cast<ESccFileAttributes>(CFileUtil::GetAttributes(record.GetFullSourcePath().c_str(), false));
-        record.m_lastCheckedSCCAttributes = QDateTime::currentDateTime();
-
-        // Update the record
-        m_materialRecordMap.erase(assetId);
-        m_materialRecordMap.insert(AZStd::pair<AZ::Data::AssetId, CMaterialBrowserRecord>(record.GetAssetId(), record));
-
-        QueueDataChangedEvent(record.GetFilterModelIndex());
-    }
-}
-
-void MaterialBrowserFilterModel::UpdateSourceControlLastCheckedTime(const AZ::Data::AssetId& assetId, const QDateTime& dateTime)
-{
-    CMaterialBrowserRecord record;
-    bool found = m_materialRecordMap.find(assetId, &record);
-    if (found)
-    {
-        // Update the record
-        record.m_lastCheckedSCCAttributes = dateTime;
-        m_materialRecordMap.erase(assetId);
-        m_materialRecordMap.insert(AZStd::pair<AZ::Data::AssetId, CMaterialBrowserRecord>(record.GetAssetId(), record));
-    }
-}
-
-QVariant MaterialBrowserFilterModel::data(const QModelIndex& index, int role /* = Qt::DisplayRole*/) const
-{
-    // Should return data from an AssetBrowserEntry, or get material specific info from that data
-    if (index.isValid())
-    {
-        // Use the base AssetBrowserFilterModel::data function for display role
-        if (role != AzToolsFramework::AssetBrowser::AssetBrowserModel::Roles::EntryRole)
-        {
-            QModelIndex modelIndex = mapToSource(index);
-            AzToolsFramework::AssetBrowser::AssetBrowserEntry* assetEntry = static_cast<AzToolsFramework::AssetBrowser::AssetBrowserEntry*>(modelIndex.internalPointer());
-
-            AZ::Data::AssetId assetId = GetMaterialProductAssetIdFromAssetBrowserEntry(assetEntry);
-            if (assetId.IsValid())
-            {
-                CMaterialBrowserRecord record;
-                bool found = m_materialRecordMap.find(assetId, &record);
-
-                if (role == Qt::UserRole)
-                {
-                    if (found)
-                    {
-                        return QVariant::fromValue(record);
-                    }
-                    else
-                    {
-                        return QVariant();
-                    }
-                }
-            }
-        }
-    }
-    // If the role is Qt::DisplayRole, the item a folder, or the material has not been parsed yet, fall back on the default data result from the underlying AssetBrowserModel
-    return AzToolsFramework::AssetBrowser::AssetBrowserFilterModel::data(index, role);
-}
-
-void MaterialBrowserFilterModel::GetRelativeFilePaths(AZStd::vector<MaterialBrowserRecordAssetBrowserData>& files) const
-{
-    GetRelativeFilePathsRecursive(files, this);
-}
-
-void MaterialBrowserFilterModel::GetRelativeFilePathsRecursive(AZStd::vector<MaterialBrowserRecordAssetBrowserData>& files,
-    const MaterialBrowserFilterModel* model, const QModelIndex& parent) const
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    for (int r = 0; r < model->rowCount(parent); ++r)
-    {
-        QModelIndex index = model->index(r, 0, parent);
-        QModelIndex modelIndex = model->mapToSource(index);
-
-        if (model->hasChildren(index))
-        {
-            GetRelativeFilePathsRecursive(files, model, index);
-        }
-        else
-        {
-            AssetBrowserEntry* assetEntry = static_cast<AssetBrowserEntry*>(modelIndex.internalPointer());
-
-            AZStd::vector<const ProductAssetBrowserEntry*> products;
-            assetEntry->GetChildrenRecursively<ProductAssetBrowserEntry>(products);
-
-            for (const auto* product : products)
-            {
-                if (!m_assetTypeFilter->Match(product))
-                {
-                    continue;
-                }
-                MaterialBrowserRecordAssetBrowserData item;
-                item.assetId = product->GetAssetId();
-                item.fullSourcePath = product->GetFullPath();
-                item.relativeFilePath = product->GetRelativePath();
-                item.modelIndex = modelIndex;
-                item.filterModelIndex = index;
-                files.push_back(item);
-            }
-        }
-    }
-}
-
-QModelIndex MaterialBrowserFilterModel::GetIndexFromMaterial(_smart_ptr<CMaterial> material) const
-{
-    CMaterialBrowserRecord record;
-    bool found = TryGetRecordFromMaterial(material, record);
-    if (found)
-    {
-        return record.GetFilterModelIndex();
-    }
-    return QModelIndex();
-}
-
-QModelIndex MaterialBrowserFilterModel::GetFilterModelIndex(const AZ::Data::AssetId& assetId) const
-{
-    QModelIndex filterModelIndex;
-    if (TryGetFilterModelIndexRecursive(filterModelIndex, assetId, this))
-    {
-        return filterModelIndex;
-    }
-
-    return QModelIndex();
-}
-
-bool MaterialBrowserFilterModel::TryGetFilterModelIndexRecursive(QModelIndex& filterModelIndex,
-    const AZ::Data::AssetId& assetId, const MaterialBrowserFilterModel* model, const QModelIndex& parent) const
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    // Walk through the filter model to find the product entry with the corresponding assetId
-    for (int r = 0; r < model->rowCount(parent); ++r)
-    {
-        QModelIndex index = model->index(r, 0, parent);
-        QModelIndex modelIndex = model->mapToSource(index);
-
-        if (model->hasChildren(index))
-        {
-            if (TryGetFilterModelIndexRecursive(filterModelIndex, assetId, model, index))
-            {
-                return true;
-            }
-        }
-        else
-        {
-            // Check to see if the current entry is the one we're looking for
-            AssetBrowserEntry* assetEntry = static_cast<AssetBrowserEntry*>(modelIndex.internalPointer());
-
-            AZStd::vector<const ProductAssetBrowserEntry*> products;
-            assetEntry->GetChildrenRecursively<ProductAssetBrowserEntry>(products);
-
-            for (const auto* product : products)
-            {
-                if (assetId == product->GetAssetId())
-                {
-                    filterModelIndex = index;
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-void MaterialBrowserFilterModel::EntryAdded(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry)
-{
-    // If the entry is a product material
-    if (entry->GetEntryType() == AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Product && m_assetTypeFilter->Match(entry))
-    {
-        // capture the data here, so that entry cannot disappear before we actually get to the job.
-        MaterialBrowserRecordAssetBrowserData assetBrowserData;
-        assetBrowserData.assetId = GetMaterialProductAssetIdFromAssetBrowserEntry(entry);
-        assetBrowserData.relativeFilePath = entry->GetRelativePath();
-        assetBrowserData.fullSourcePath = entry->GetFullPath();
-        assetBrowserData.filterModelIndex = GetFilterModelIndex(assetBrowserData.assetId);
-
-        // Create a job to add/update the entry in the underlying map
-        AZ::Job* updateEntryJob = AZ::CreateJobFunction([this, assetBrowserData]()
-                {
-                    CMaterialBrowserRecord record;
-                    record.SetAssetBrowserData(assetBrowserData);
-                    record.m_material = GetIEditor()->GetMaterialManager()->LoadMaterialWithFullSourcePath(record.GetRelativeFilePath().c_str(), record.GetFullSourcePath().c_str());
-                    SetRecord(record);
-                    MaterialBrowserWidgetBus::Broadcast(&MaterialBrowserWidgetEvents::MaterialAddFinished);
-                }, true, m_jobContext);
-
-        // Start the job immediately
-        AZ::Job* currentJob = m_jobContext->GetJobManager().GetCurrentJob();
-        if (currentJob)
-        {
-            // Suspend the current job until the new job completes so that
-            // if a new material is created by the user it's ready to use sooner
-            currentJob->StartAsChild(updateEntryJob);
-            currentJob->WaitForChildren();
-        }
-        else
-        {
-            updateEntryJob->Start();
-        }
-    }
-}
-
-
-void MaterialBrowserFilterModel::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
-{
-    CMaterialBrowserRecord record;
-    bool found = m_materialRecordMap.find(assetId, &record);
-    if (found)
-    {
-        record.m_material->Reload();
-        //Send out event to notify UI update if it's currently selected
-        MaterialBrowserWidgetBus::Broadcast(&MaterialBrowserWidgetEvents::MaterialFinishedProcessing, record.m_material, record.GetFilterModelIndex());
-    }
-}
-
-bool MaterialBrowserFilterModel::HasRecord(const AZ::Data::AssetId& assetId) 
-{
-    return m_materialRecordMap.find(assetId);
-}
-
-bool MaterialBrowserFilterModel::IsMultiMaterial(const AZ::Data::AssetId& assetId) 
-{
-    CMaterialBrowserRecord record;
-    bool found = m_materialRecordMap.find(assetId, &record);
-    if (found)
-    {
-        if (record.m_material && record.m_material->IsMultiSubMaterial())
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool MaterialBrowserFilterModel::TryGetRecordFromMaterial(_smart_ptr<CMaterial> material, CMaterialBrowserRecord& record) const
-{
-    if (material)
-    {
-        // Get the relative path for the material
-        bool pathFound = false;
-        AZStd::string relativePath;
-        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(pathFound, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetRelativeProductPathFromFullSourceOrProductPath, material->GetFilename().toUtf8().data(), relativePath);
-        AZ_Assert(pathFound, "Failed to get engine relative path from %s", material->GetFilename().toUtf8().data());
-
-        // Get the assetId from the relative path
-        AZ::Data::AssetId assetId;
-
-        AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetId, &AZ::Data::AssetCatalogRequests::GetAssetIdByPath, relativePath.c_str(), GetIEditor()->GetMaterialManager()->GetMaterialAssetType(), false);
-
-        return TryGetRecordFromAssetId(assetId, record);
-    }
-
-    return false;
-}
-
-bool MaterialBrowserFilterModel::TryGetRecordFromAssetId(const AZ::Data::AssetId& assetId, CMaterialBrowserRecord& record) const
-{
-    bool recordFound = m_materialRecordMap.find(assetId, &record);
-    return recordFound;
-}
-
-void MaterialBrowserFilterModel::SetRecord(const CMaterialBrowserRecord& record)
-{
-    m_materialRecordMap.erase(record.GetAssetId());
-    m_materialRecordMap.insert({ record.GetAssetId(), record });
-
-    QueueDataChangedEvent(record.GetFilterModelIndex());
-}
-
-void MaterialBrowserFilterModel::SetSearchFilter(const AzToolsFramework::AssetBrowser::SearchWidget* searchWidget)
-{
-    /*
-     *   The filter matches the following rule:
-     *   A. If the entry is a material
-     *       1. The material's name matches the search text
-     *       2. The sub material's name matches the search text
-     *   B. If the entry is a folder:
-     *       1. The folder's name matches the search text
-     *       2. The folder contains a material matching A
-     *       3. The folder contains a folder matching B.1 & B.2
-     */
-
-    using namespace AzToolsFramework::AssetBrowser;
-
-    m_searchWidget = searchWidget;
-
-    // Create a search filter where a search text either matches entry/entry parent's name or sub material name
-    CompositeFilter* nameFilter = new CompositeFilter(CompositeFilter::LogicOperatorType::OR);
-    QSharedPointer<CompositeFilter> searchWidgetFilter = m_searchWidget->GetFilter();
-    // The default setting for search widget filter is Down
-    // Since now we only need to match for the entry itself in this filter, set back to None
-    searchWidgetFilter->SetFilterPropagation(AssetBrowserEntryFilter::PropagateDirection::None);
-    nameFilter->AddFilter(FilterConstType(m_subMaterialSearchFilter));
-    nameFilter->AddFilter(FilterConstType(searchWidgetFilter));
-
-    EntryTypeFilter* productsFilter = new EntryTypeFilter();
-    productsFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Product);
-    InverseFilter* noProductsFilter = new InverseFilter();
-    noProductsFilter->SetFilter(FilterConstType(productsFilter));
-
-    // Create a filter where the entry needs to match the previous name filter and it needs to be material itself or it contains material.
-    CompositeFilter* isMaterialAndMatchesSearchFilter = new CompositeFilter(CompositeFilter::LogicOperatorType::AND);
-    isMaterialAndMatchesSearchFilter->AddFilter(FilterConstType(nameFilter));
-    isMaterialAndMatchesSearchFilter->AddFilter(FilterConstType(m_assetTypeFilter));
-    isMaterialAndMatchesSearchFilter->AddFilter(FilterConstType(noProductsFilter));
-    isMaterialAndMatchesSearchFilter->AddFilter(FilterConstType(m_levelMaterialSearchFilter));
-    // Make sure any folder contains the matching result is included
-    isMaterialAndMatchesSearchFilter->SetFilterPropagation(AssetBrowserEntryFilter::PropagateDirection::Down);
-
-    // Set the filter for the MaterialBrowserFilterModel
-    SetFilter(FilterConstType(isMaterialAndMatchesSearchFilter));
-}
-
-void MaterialBrowserFilterModel::ShowOnlyLevelMaterials(bool levelOnly, bool invalidateFilterNow)
-{
-    m_levelMaterialSearchFilter->ShowOnlyLevelMaterials(levelOnly);
-    if (levelOnly)
-    {
-        m_levelMaterialSearchFilter->CacheLoadedMaterials();
-    }
-
-    if (invalidateFilterNow)
-    {
-        // we need to invalid the filter immediately, for example this is used when we are changing level, otherwise
-        // the current filter is used when getting file paths for all of the materials as part of StartRecordUpdateJobs.
-        invalidateFilter();
-    }
-    else
-    {
-        filterUpdatedSlot();
-    }
-}
-
-void MaterialBrowserFilterModel::SearchFilterUpdated()
-{
-    m_subMaterialSearchFilter->SetFilterString(m_searchWidget->textFilter());
-    filterUpdatedSlot();
-}
-
-void MaterialBrowserFilterModel::QueueDataChangedEvent(const QPersistentModelIndex& filterModelIndex)
-{
-    // Queue a data changed event to be executed on the main thread
-    AZStd::function<void()> emitDataChanged =
-        [this, filterModelIndex]()
-        {
-            if (filterModelIndex.isValid())
-            {
-                Q_EMIT dataChanged(filterModelIndex, filterModelIndex);
-            }
-        };
-
-    AZ::TickBus::QueueFunction(emitDataChanged);
-}
-
-void MaterialBrowserFilterModel::InitializeRecordUpdateJob()
-{
-    AZ::JobManagerDesc desc;
-    AZ::JobManagerThreadDesc threadDesc;
-    for (size_t i = 0; i < AZStd::thread::hardware_concurrency(); ++i)
-    {
-        desc.m_workerThreads.push_back(threadDesc);
-    }
-
-    // Check to ensure these have not already been initialized.
-    AZ_Error("Material Browser", !m_jobManager && !m_jobCancelGroup && !m_jobContext, "MaterialBrowserFilterModel::InitializeRecordUpdateJob is being called again after it has already been initialized");
-    m_jobManager = aznew AZ::JobManager(desc);
-    m_jobCancelGroup = aznew AZ::JobCancelGroup();
-    m_jobContext = aznew AZ::JobContext(*m_jobManager, *m_jobCancelGroup);
-}
-
-void MaterialBrowserFilterModel::StartRecordUpdateJobs()
-{
-    // Generate a list of file paths, assetId's, and asset browser model indices
-    // This must be done on the main thread, otherwise it can lead to a crash when the tree view UI is being initialized
-    AZStd::vector<MaterialBrowserRecordAssetBrowserData> files;
-    GetRelativeFilePaths(files);
-    
-    // Kick off the background process that will iterate over the list of file paths and update the material record map
-    m_mainUpdateRecordJob = aznew MaterialBrowserUpdateJobCreator(this, files, m_jobContext);
-    m_mainUpdateRecordJob->Start();
-}
-
-void MaterialBrowserFilterModel::CancelRecordUpdateJobs()
-{
-    m_jobContext->GetCancelGroup()->Cancel();
-    m_jobContext->GetCancelGroup()->Reset();
-}
-
-void MaterialBrowserFilterModel::ClearRecordMap()
-{
-    CancelRecordUpdateJobs();
-    m_materialRecordMap.clear();
-}
-
-MaterialBrowserUpdateJobCreator::MaterialBrowserUpdateJobCreator(MaterialBrowserFilterModel* model, AZStd::vector<MaterialBrowserRecordAssetBrowserData>& files, AZ::JobContext* context /*= NULL*/)
-    : Job(true, context)
-    , m_files(files)
-    , m_filterModel(model)
-{
-}
-
-void MaterialBrowserUpdateJobCreator::Process()
-{
-    // Split the files to be processed evenly among threads
-    int numJobs = GetContext()->GetJobManager().GetNumWorkerThreads();
-    int materialsPerJob = (m_files.size() / numJobs) + 1;
-
-    for (auto it = m_files.begin(); it <= m_files.end(); it += materialsPerJob)
-    {
-        // Create a subset of the list of material files to be processed by another job
-        auto start = it;
-        auto end = it + materialsPerJob;
-        if (end > m_files.end())
-        {
-            end = m_files.end();
-        }
-        AZStd::vector<MaterialBrowserRecordAssetBrowserData> subset(start, end);
-
-        if (subset.size() > 0)
-        {
-            AZ::Job* materialBrowserUpdateJob = aznew MaterialBrowserUpdateJob(m_filterModel, subset, GetContext());
-            StartAsChild(materialBrowserUpdateJob);
-        }
-    }
-
-    WaitForChildren();
-
-    MaterialBrowserWidgetBus::Broadcast(&MaterialBrowserWidgetEvents::MaterialRecordUpdateFinished);
-}
-
-MaterialBrowserUpdateJob::MaterialBrowserUpdateJob(MaterialBrowserFilterModel* model, AZStd::vector<MaterialBrowserRecordAssetBrowserData>& files, AZ::JobContext* context /*= NULL*/)
-    : Job(true, context)
-    , m_filterModel(model)
-    , m_files(files)
-{
-}
-
-void MaterialBrowserUpdateJob::Process()
-{
-    for (size_t i = 0; i < m_files.size(); ++i)
-    {
-        // Early out when the job is cancelled
-        if (IsCancelled())
-        {
-            return;
-        }
-        CMaterialBrowserRecord record;
-        record.SetAssetBrowserData(m_files[i]);
-
-        // Get the writable status of the file, but don't update source control status until it is actually needed
-        record.m_lastCachedFileAttributes = static_cast<ESccFileAttributes>(CFileUtil::GetAttributes(record.GetFullSourcePath().c_str(), false));
-
-        record.m_material = GetIEditor()->GetMaterialManager()->LoadMaterialWithFullSourcePath(record.GetRelativeFilePath().c_str(), record.GetFullSourcePath().c_str());
-        m_filterModel->SetRecord(record);
-    }
-}
diff --git a/Code/Sandbox/Editor/Material/MaterialBrowserFilterModel.h b/Code/Sandbox/Editor/Material/MaterialBrowserFilterModel.h
deleted file mode 100644
index afb7f8a7ce..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialBrowserFilterModel.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/parallel/containers/concurrent_unordered_map.h>
-#include <AzCore/std/parallel/atomic.h>
-#include <AzCore/Jobs/Job.h>
-
-#include <AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-#include <AzToolsFramework/AssetBrowser/Search/SearchWidget.h>
-#include <AzToolsFramework/MaterialBrowser/MaterialBrowserBus.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-
-#include <ISourceControl.h>
-#include <QDateTime>
-
-namespace AZ
-{
-    class Job;
-    class JobManager;
-    class JobCancelGroup;
-    class JobContext;
-}
-
-class SubMaterialSearchFilter;
-class LevelMaterialSearchFilter;
-
-//////////////////////////////////////////////////////////////////////////
-// Item class for browser.
-//////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////// 
-struct MaterialBrowserRecordAssetBrowserData
-{
-    AZ::Data::AssetId assetId;
-    AZStd::string relativeFilePath;
-    AZStd::string fullSourcePath;
-    QPersistentModelIndex modelIndex;
-    QPersistentModelIndex filterModelIndex;
-};
-
-class CMaterialBrowserRecord
-{
-public:
-    CMaterialBrowserRecord()
-    {
-        InitializeSourceControlAttributes();
-    }
-
-    CMaterialBrowserRecord(const CMaterialBrowserRecord &rhs)
-        : m_material(rhs.m_material)
-        , m_lastCachedSCCAttributes(rhs.m_lastCachedSCCAttributes)
-        , m_lastCachedFileAttributes(rhs.m_lastCachedFileAttributes)
-        , m_lastCheckedSCCAttributes(rhs.m_lastCheckedSCCAttributes)
-        , m_assetBrowserData(rhs.m_assetBrowserData)
-    {
-    }
-
-    AZ::Data::AssetId GetAssetId() const { return m_assetBrowserData.assetId; }
-    AZStd::string GetRelativeFilePath() const { return m_assetBrowserData.relativeFilePath; }
-    AZStd::string GetFullSourcePath() const { return m_assetBrowserData.fullSourcePath; }
-    QPersistentModelIndex GetModelIndex() const { return m_assetBrowserData.modelIndex; }
-    QPersistentModelIndex GetFilterModelIndex() const { return m_assetBrowserData.filterModelIndex; }
-    void SetAssetBrowserData(const MaterialBrowserRecordAssetBrowserData &assetBrowserData) { m_assetBrowserData = assetBrowserData; }
-    void InitializeSourceControlAttributes()
-    {
-        // Force an update by setting the last update time to 1 / 1 / 1
-        m_lastCachedSCCAttributes = AzToolsFramework::SourceControlFileInfo();
-        m_lastCachedFileAttributes = SCC_FILE_ATTRIBUTE_INVALID;
-        m_lastCheckedSCCAttributes = QDate(1, 1, 1).startOfDay();
-    }
-public:
-    _smart_ptr<CMaterial> m_material = nullptr;
-    AzToolsFramework::SourceControlFileInfo m_lastCachedSCCAttributes;
-    ESccFileAttributes m_lastCachedFileAttributes;
-    QDateTime m_lastCheckedSCCAttributes;
-
-private:
-    MaterialBrowserRecordAssetBrowserData m_assetBrowserData;
-};
-Q_DECLARE_METATYPE(CMaterialBrowserRecord)
-
-
-//! MaterialBrowserSourceControlEvents
-//! This bus informs the material browser filter model
-//! when an ASYNC source control command has completed
-class MaterialBrowserSourceControlEvents
-    : public AZ::EBusTraits
-{
-public:
-    typedef AZStd::recursive_mutex MutexType;
-
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single; // there's only one listener
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;  // theres only one listener
-    virtual ~MaterialBrowserSourceControlEvents() {}
-
-    //! Signals the callback for the GetFileInfo source control op
-    virtual void UpdateSourceControlFileInfoCallback(const AZ::Data::AssetId &assetId, const AzToolsFramework::SourceControlFileInfo& fileInfo) = 0;
-    //! Updates the timestamp for when the source control status was last checked
-    virtual void UpdateSourceControlLastCheckedTime(const AZ::Data::AssetId &assetId, const QDateTime &dateTime) = 0;
-};
-
-using MaterialBrowserSourceControlBus = AZ::EBus<MaterialBrowserSourceControlEvents>;
-
-//! MaterialBrowserWidgetEvents
-//! This bus is used to send events to the material browser widget
-class MaterialBrowserWidgetEvents
-    : public AZ::EBusTraits
-{
-public:
-    typedef AZStd::recursive_mutex MutexType;
-
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single; // there's only one listener
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single; // theres only one listener
-    virtual ~MaterialBrowserWidgetEvents() {}
-
-    //! Indicates that a material has finished being processed by the asset processor
-    virtual void MaterialFinishedProcessing(_smart_ptr<CMaterial> material, const QPersistentModelIndex &filterModelIndex) = 0;
-
-    //! Indicates that a material has finished being added to the material browser
-    virtual void MaterialAddFinished() = 0;
-
-    //! Indicates that the material record update for initially populating the material browser has finished
-    virtual void MaterialRecordUpdateFinished() = 0;
-};
-
-using MaterialBrowserWidgetBus = AZ::EBus<MaterialBrowserWidgetEvents>;
-
-/**
-* Get the product material assetId for a given AssetBrowserEntry
-* If there is no valid product material, the material has not been processed, or there are multiple product materials
-* and thus there is not an individual material that can be assumed based on the source, an invalid assetId is returned
-* @param assetEntry An asset entry that may be a source or a product
-* @return The assetId of the product material.
-*/
-AZ::Data::AssetId GetMaterialProductAssetIdFromAssetBrowserEntry(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* assetEntry);
-
-class MaterialBrowserFilterModel
-    : public AzToolsFramework::AssetBrowser::AssetBrowserFilterModel
-    , public MaterialBrowserSourceControlBus::Handler
-    , public AzToolsFramework::AssetBrowser::AssetBrowserModelNotificationBus::Handler
-    , public AzToolsFramework::MaterialBrowser::MaterialBrowserRequestBus::Handler
-    , private AzFramework::AssetCatalogEventBus::Handler
-{
-public:
-    AZ_CLASS_ALLOCATOR(MaterialBrowserFilterModel, AZ::SystemAllocator, 0);
-    MaterialBrowserFilterModel(QObject* parent);
-    ~MaterialBrowserFilterModel();
-    void UpdateRecord(const QModelIndex& filterModelIndex);
-    void UpdateRecord(const MaterialBrowserRecordAssetBrowserData &assetBrowserData);
-    void UpdateSourceControlFileInfoCallback(const AZ::Data::AssetId &assetId, const AzToolsFramework::SourceControlFileInfo& info) override;
-    void UpdateSourceControlLastCheckedTime(const AZ::Data::AssetId &assetId, const QDateTime &dateTime) override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    bool TryGetRecordFromMaterial(_smart_ptr<CMaterial> material, CMaterialBrowserRecord& record) const;
-    bool TryGetRecordFromAssetId(const AZ::Data::AssetId &assetId, CMaterialBrowserRecord& record) const;
-    void SetRecord(const CMaterialBrowserRecord& record);
-    void SetSearchFilter(const AzToolsFramework::AssetBrowser::SearchWidget* searchWidget);
-    void StartRecordUpdateJobs();
-    void CancelRecordUpdateJobs();
-    void ClearRecordMap();
-    void GetRelativeFilePaths(AZStd::vector<MaterialBrowserRecordAssetBrowserData> &files) const;
-    QModelIndex GetIndexFromMaterial(_smart_ptr<CMaterial> material) const;
-    QModelIndex GetFilterModelIndex(const AZ::Data::AssetId &assetId) const;
-
-    // AssetBrowserModelNotificationBus event handlers
-    void EntryAdded(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry) override;
-    
-    void OnCatalogAssetChanged(const AZ::Data::AssetId& assetId) override;
-    // MaterialBrowserRequestBus
-    bool HasRecord(const AZ::Data::AssetId& assetId) override;
-    bool IsMultiMaterial(const AZ::Data::AssetId& assetId) override;
-
-    void ShowOnlyLevelMaterials(bool levelOnly, bool invalidateFilterNow = false);
-
-    public Q_SLOTS:
-    void SearchFilterUpdated();
-
-private:
-    void GetRelativeFilePathsRecursive(AZStd::vector<MaterialBrowserRecordAssetBrowserData> &files, const MaterialBrowserFilterModel* model, const QModelIndex &parent = QModelIndex()) const;
-    bool TryGetFilterModelIndexRecursive(QModelIndex &filterModelIndex, const AZ::Data::AssetId &assetId, const MaterialBrowserFilterModel* model, const QModelIndex &parent = QModelIndex()) const;
-    void QueueDataChangedEvent(const QPersistentModelIndex &filterModelIndex);
-    AZStd::concurrent_unordered_map<AZ::Data::AssetId, CMaterialBrowserRecord> m_materialRecordMap;
-    QVector<QPixmap> m_imageList;
-    AzToolsFramework::AssetBrowser::FilterConstType m_assetTypeFilter;
-    SubMaterialSearchFilter* m_subMaterialSearchFilter;
-    LevelMaterialSearchFilter* m_levelMaterialSearchFilter;
-    const AzToolsFramework::AssetBrowser::SearchWidget* m_searchWidget;
-
-    void InitializeRecordUpdateJob();
-    AZ::JobManager* m_jobManager = nullptr;
-    AZ::JobCancelGroup* m_jobCancelGroup = nullptr;
-    AZ::JobContext* m_jobContext = nullptr;
-    AZ::Job* m_mainUpdateRecordJob = nullptr;
-};
-
-/**
-* Job that walks through a MaterialBrowserFilterModel to generate a list of files,
-* then divides the list amongst child jobs for processing
-*/
-class MaterialBrowserUpdateJobCreator
-    : public AZ::Job
-{
-public:
-    AZ_CLASS_ALLOCATOR(MaterialBrowserUpdateJobCreator, AZ::ThreadPoolAllocator, 0);
-
-    MaterialBrowserUpdateJobCreator(MaterialBrowserFilterModel* model, AZStd::vector<MaterialBrowserRecordAssetBrowserData>& files, AZ::JobContext* context = nullptr);
-    void Process() override;
-private:
-    MaterialBrowserFilterModel* m_filterModel; 
-    AZStd::vector<MaterialBrowserRecordAssetBrowserData> m_files;
-};
-
-/**
-* Job that walks through a list of material files, loads them, and then populates
-* the MaterialBrowserFilterModel's map of material data
-*/
-class MaterialBrowserUpdateJob
-    : public AZ::Job
-{
-public:
-    AZ_CLASS_ALLOCATOR(MaterialBrowserUpdateJob, AZ::ThreadPoolAllocator, 0);
-
-    MaterialBrowserUpdateJob(MaterialBrowserFilterModel* model, AZStd::vector<MaterialBrowserRecordAssetBrowserData> &files, AZ::JobContext* context = nullptr);
-    void Process() override;
-private:
-    MaterialBrowserFilterModel* m_filterModel;
-    AZStd::vector<MaterialBrowserRecordAssetBrowserData> m_files;
-};
-
diff --git a/Code/Sandbox/Editor/Material/MaterialBrowserSearchFilters.cpp b/Code/Sandbox/Editor/Material/MaterialBrowserSearchFilters.cpp
deleted file mode 100644
index cf2d3449d1..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialBrowserSearchFilters.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "EditorDefs.h"
-
-#include "MaterialBrowserSearchFilters.h"
-
-// Editor
-#include "MaterialBrowserFilterModel.h"
-#include "Material.h"
-
-
-SubMaterialSearchFilter::SubMaterialSearchFilter(const MaterialBrowserFilterModel* filterModel)
-    : m_filterModel(filterModel)
-{
-    AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter::SetFilterPropagation(AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter::PropagateDirection::Down);
-}
-
-void SubMaterialSearchFilter::SetFilterString(const QString& filterString)
-{
-    m_filterString = filterString;
-}
-
-QString SubMaterialSearchFilter::GetNameInternal() const
-{
-    return "SubMaterialSearchFilter";
-}
-
-bool SubMaterialSearchFilter::MatchInternal(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry) const
-{
-    // All entries match if there is no search string
-    if (m_filterString.isEmpty())
-    {
-        return true;
-    }
-
-    if (m_filterModel)
-    {
-        // Get the product material for the given asset browser entry
-        AZ::Data::AssetId assetId = GetMaterialProductAssetIdFromAssetBrowserEntry(entry);
-        if (assetId.IsValid())
-        {
-            CMaterialBrowserRecord record;
-            bool found = m_filterModel->TryGetRecordFromAssetId(assetId, record);
-            if (found)
-            {
-                // If there is a valid product material, check to see if any of its sub-materials match the search string
-                if (record.m_material)
-                {
-                    for (int i = 0; i < record.m_material->GetSubMaterialCount(); ++i)
-                    {
-                        CMaterial* subMaterial = record.m_material->GetSubMaterial(i);
-                        if (subMaterial)
-                        {
-                            // If any of the product sub-materials matches the string, return true for this entry
-                            if (subMaterial->GetName().contains(m_filterString, Qt::CaseInsensitive))
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return false;
-}
-
-LevelMaterialSearchFilter::LevelMaterialSearchFilter(const MaterialBrowserFilterModel* filterModel)
-    : m_filterModel(filterModel)
-{
-    AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter::SetFilterPropagation(AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter::PropagateDirection::Down);
-}
-
-QString LevelMaterialSearchFilter::GetNameInternal() const
-{
-    return "LoadedMaterialSearchFilter";
-}
-
-void LevelMaterialSearchFilter::CacheLoadedMaterials()
-{
-    m_localMap.clear();
-
-    AZStd::vector<IRenderNode*> foundRenderNodes;
-    unsigned int numFoundObjects = 0;
-
-    numFoundObjects = GetIEditor()->Get3DEngine()->GetObjectsByFlags(0);
-    foundRenderNodes.resize(numFoundObjects, nullptr);
-    GetIEditor()->Get3DEngine()->GetObjectsByFlags(0, foundRenderNodes.data());
-
-    AZStd::vector<_smart_ptr<IMaterial>> materials;
-    materials.reserve(foundRenderNodes.size());
-    for (IRenderNode* renderNode : foundRenderNodes)
-    {
-        renderNode->GetMaterials(materials);
-    }
-    
-    for (size_t i = 0; i < materials.size(); ++i)
-    {
-        if (materials[i])
-        {
-            m_localMap[materials[i]->GetName()] = materials[i];
-        }
-    }
-}
-
-bool LevelMaterialSearchFilter::MatchInternal(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry) const
-{
-    // All entries match if show level materials isn't selected
-    if (!m_onlyShowLevelMaterials)
-    {
-        return true;
-    }
-
-    // Get the product material for the given asset browser entry
-    AZ::Data::AssetId assetId = GetMaterialProductAssetIdFromAssetBrowserEntry(entry);
-    if (assetId.IsValid() && m_filterModel)
-    {
-        CMaterialBrowserRecord record;
-        bool found = m_filterModel->TryGetRecordFromAssetId(assetId, record);
-        if (found && record.m_material)
-        {
-            // If there is a valid product material, check to see if it is used by the level
-            return m_localMap.find(record.m_material->GetName()) != m_localMap.end();
-        }
-    }
-
-    return false;
-}
-
-#include <Material/moc_MaterialBrowserSearchFilters.cpp>
diff --git a/Code/Sandbox/Editor/Material/MaterialBrowserSearchFilters.h b/Code/Sandbox/Editor/Material/MaterialBrowserSearchFilters.h
deleted file mode 100644
index 4326e66218..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialBrowserSearchFilters.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzToolsFramework/AssetBrowser/Search/Filter.h>
-#include <QHash>
-#endif
-
-class MaterialBrowserFilterModel;
-
-//! Filter that checks the name of each sub-material in a material to see if it contains the filter string
-class SubMaterialSearchFilter
-    : public AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter
-{
-    Q_OBJECT
-public:
-    SubMaterialSearchFilter(const MaterialBrowserFilterModel* filterModel);
-    ~SubMaterialSearchFilter() override = default;
-
-    void SetFilterString(const QString& filterString);
-
-protected:
-    QString GetNameInternal() const override;
-    bool MatchInternal(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry) const override;
-
-private:
-    bool TextMatchesFilter(const QString &text) const;
-    QString m_filterString = "";
-    const MaterialBrowserFilterModel* m_filterModel = nullptr;
-};
-
-class LevelMaterialSearchFilter
-    : public AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter
-{
-    Q_OBJECT
-public:
-    LevelMaterialSearchFilter(const MaterialBrowserFilterModel* filterModel);
-    ~LevelMaterialSearchFilter() override = default;
-
-    void ShowOnlyLevelMaterials(bool onlyLevel) { m_onlyShowLevelMaterials = onlyLevel; }
-
-    void CacheLoadedMaterials();
-
-protected:
-    QString GetNameInternal() const override;
-    bool MatchInternal(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry) const override;
-
-private:
-    bool m_onlyShowLevelMaterials = false;
-    const MaterialBrowserFilterModel* m_filterModel = nullptr;
-    using MaterialMap = QHash<QString, _smart_ptr<IMaterial> >;
-    MaterialMap m_localMap;
-};
diff --git a/Code/Sandbox/Editor/Material/MaterialDialog.qrc b/Code/Sandbox/Editor/Material/MaterialDialog.qrc
deleted file mode 100644
index c99e5b052a..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialDialog.qrc
+++ /dev/null
@@ -1,23 +0,0 @@
-<RCC>
-    <qresource prefix="/MaterialBrowser">
-        <file>images/material_browser_00.png</file>
-        <file>images/material_browser_01.png</file>
-        <file>images/material_browser_02.png</file>
-        <file>images/material_browser_03.png</file>
-        <file>images/material_00.png</file>
-        <file>images/material_01.png</file>
-        <file>images/material_02.png</file>
-        <file>images/material_03.png</file>
-        <file>images/material_04.png</file>
-        <file>images/material_05.png</file>
-        <file>images/material_06.png</file>
-        <file>images/material_07.png</file>
-        <file>images/filestatus_00.png</file>
-        <file>images/filestatus_01.png</file>
-        <file>images/filestatus_02.png</file>
-        <file>images/filestatus_03.png</file>
-        <file>images/filestatus_04.png</file>
-        <file>images/filestatus_05.png</file>
-        <file>images/filestatus_06.png</file>
-    </qresource>
-</RCC>
diff --git a/Code/Sandbox/Editor/Material/MaterialHelpers.cpp b/Code/Sandbox/Editor/Material/MaterialHelpers.cpp
deleted file mode 100644
index 8f9311a27a..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialHelpers.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "MaterialHelpers.h"
-
-namespace MaterialHelpers
-{
-    //////////////////////////////////////////////////////////////////////////
-    static void ParsePublicParamsScript(const char* sUIScript, IVariable* pVar)
-    {
-        string uiscript = sUIScript;
-        string element[3];
-        int p1 = 0;
-        string itemToken = uiscript.Tokenize(";", p1);
-        while (!itemToken.empty())
-        {
-            int nElements = 0;
-            int p2 = 0;
-            string token = itemToken.Tokenize(" \t\r\n=", p2);
-            while (!token.empty())
-            {
-                element[nElements++] = token;
-                if (nElements == 2)
-                {
-                    element[nElements] = itemToken.substr(p2);
-                    element[nElements].Trim(" =\t\"");
-                    break;
-                }
-                token = itemToken.Tokenize(" \t\r\n=", p2);
-            }
-
-            float minLimit, maxLimit;
-            pVar->GetLimits(minLimit, maxLimit);
-
-            if (azstricmp(element[1], "UIWidget") == 0)
-            {
-                if (azstricmp(element[2], "Color") == 0)
-                {
-                    pVar->SetDataType(IVariable::DT_COLOR);
-                }
-            }
-            else if (azstricmp(element[1], "UIHelp") == 0)
-            {
-                string help = element[2];
-                help.replace("\\n", "\n");
-                pVar->SetDescription(help);
-            }
-            else if (azstricmp(element[1], "UIName") == 0)
-            {
-                pVar->SetHumanName(element[2].c_str());
-            }
-            else if (azstricmp(element[1], "UIMin") == 0)
-            {
-                pVar->SetLimits(atof(element[2]), maxLimit);
-            }
-            else if (azstricmp(element[1], "UIMax") == 0)
-            {
-                pVar->SetLimits(minLimit, atof(element[2]));
-            }
-            else if (azstricmp(element[1], "UIStep") == 0)
-            {
-            }
-
-            itemToken = uiscript.Tokenize(";", p1);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    static void AddRealNameToDescription(IVariable* pIVar, const SShaderParam* pParam)
-    {
-        // In order to help the user discover the true names of parameters, info they need using certain script functions,
-        // we embed the real parameter name in the description.
-        QString description = pIVar->GetDescription();
-        if (!description.isEmpty())
-        {
-            description += "\n";
-        }
-        description += "(Script Param Name = ";
-        description += pParam->m_Name.c_str();
-        description += ")";
-        pIVar->SetDescription(description);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    CVarBlock* GetPublicVars(SInputShaderResources& pShaderResources)
-    {
-        if (pShaderResources.m_ShaderParams.empty())
-        {
-            return 0;
-        }
-
-        CVarBlock* pPublicVars = new CVarBlock;
-        for (int i = 0; i < pShaderResources.m_ShaderParams.size(); i++)
-        {
-            IVariable* pIVar = NULL;
-            SShaderParam* pParam = &pShaderResources.m_ShaderParams[i];
-
-            switch (pParam->m_Type)
-            {
-            case eType_BYTE:
-                pIVar = new CVariable<int>(pParam->m_Value.m_Byte);
-                break;
-            case eType_SHORT:
-                pIVar = new CVariable<int>(pParam->m_Value.m_Short);
-                break;
-            case eType_INT:
-                pIVar = new CVariable<int>(pParam->m_Value.m_Int);
-                break;
-            case eType_FLOAT:
-                pIVar = new CVariable<float>(pParam->m_Value.m_Float);
-                break;
-            /*  case eType_STRING:
-                    pIVar = new CVariable<string>(pParam->m_Value.m_String);
-                    break;  */
-            case eType_FCOLOR:
-                pIVar = new CVariable<Vec3>(Vec3(pParam->m_Value.m_Color[0], pParam->m_Value.m_Color[1], pParam->m_Value.m_Color[2]));
-                pIVar->SetDataType(IVariable::DT_COLOR);
-                break;
-            case eType_FCOLORA:
-                pIVar = new CVariable<Vec4>(Vec4(pParam->m_Value.m_Color[0], pParam->m_Value.m_Color[1], pParam->m_Value.m_Color[2], pParam->m_Value.m_Color[3]));
-                pIVar->SetDataType(IVariable::DT_COLORA);
-                break;
-            case eType_VECTOR:
-                pIVar = new CVariable<Vec3>(Vec3(pParam->m_Value.m_Vector[0], pParam->m_Value.m_Vector[1], pParam->m_Value.m_Vector[2]));
-                break;
-            default:
-                break;
-            }
-
-            if (pIVar)
-            {
-                pIVar->SetName(pParam->m_Name.c_str());
-                pPublicVars->AddVariable(pIVar);
-
-                if (pParam->m_Script.size())
-                {
-                    ParsePublicParamsScript(pParam->m_Script.c_str(), pIVar);
-                }
-
-                AddRealNameToDescription(pIVar, pParam);
-            }
-        }
-
-        return pPublicVars;
-    }
-
-    void SetPublicVars(CVarBlock* pPublicVars, SInputShaderResources& pInputShaderResources)
-    {
-        assert(pPublicVars);
-
-        if (pInputShaderResources.m_ShaderParams.empty())
-        {
-            return;
-        }
-
-        int numVars = pPublicVars->GetNumVariables();
-
-        for (int i = 0; i < numVars; i++)
-        {
-            if (i >= numVars)
-            {
-                break;
-            }
-
-            IVariable* pVar = pPublicVars->GetVariable(i);
-            SShaderParam* pParam = NULL;
-            for (int j = 0; j < pInputShaderResources.m_ShaderParams.size(); j++)
-            {
-                if (QString::compare(pVar->GetName(), pInputShaderResources.m_ShaderParams[j].m_Name.c_str()) == 0)
-                {
-                    pParam = &pInputShaderResources.m_ShaderParams[j];
-                    break;
-                }
-            }
-            if (!pParam)
-            {
-                continue;
-            }
-
-            switch (pParam->m_Type)
-            {
-            case eType_BYTE:
-                if (pVar->GetType() == IVariable::INT)
-                {
-                    int val = 0;
-                    pVar->Get(val);
-                    pParam->m_Value.m_Byte = val;
-                }
-                break;
-            case eType_SHORT:
-                if (pVar->GetType() == IVariable::INT)
-                {
-                    int val = 0;
-                    pVar->Get(val);
-                    pParam->m_Value.m_Short = val;
-                }
-                break;
-            case eType_INT:
-                if (pVar->GetType() == IVariable::INT)
-                {
-                    int val = 0;
-                    pVar->Get(val);
-                    pParam->m_Value.m_Int = val;
-                }
-                break;
-            case eType_FLOAT:
-                if (pVar->GetType() == IVariable::FLOAT)
-                {
-                    float val = 0;
-                    pVar->Get(val);
-                    pParam->m_Value.m_Float = val;
-                }
-                break;
-            /*
-        case eType_STRING:
-            if (pVar->GetType() == IVariable::STRING)
-            {
-                CString str;
-                int val = 0;
-                pVar->Get(val);
-                pParam->m_Value.m_Byte = val;
-            }
-            break;
-            */
-            case eType_FCOLOR:
-            case eType_FCOLORA:
-                if (pVar->GetType() == IVariable::VECTOR4 && (pVar->GetDataType() == IVariable::DT_COLOR || pVar->GetDataType() == IVariable::DT_COLORA))
-                {
-                    Vec4 val(0, 0, 0, 0);
-                    pVar->Get(val);
-                    pParam->m_Value.m_Color[0] = val.x;
-                    pParam->m_Value.m_Color[1] = val.y;
-                    pParam->m_Value.m_Color[2] = val.z;
-                    pParam->m_Value.m_Color[3] = val.w;
-                }
-                else if (pVar->GetType() == IVariable::VECTOR && (pVar->GetDataType() == IVariable::DT_COLOR || pVar->GetDataType() == IVariable::DT_COLORA))
-                {
-                    Vec3 val(0, 0, 0);
-                    pVar->Get(val);
-                    pParam->m_Value.m_Color[0] = val.x;
-                    pParam->m_Value.m_Color[1] = val.y;
-                    pParam->m_Value.m_Color[2] = val.z;
-                }
-                break;
-            case eType_VECTOR:
-                if (pVar->GetType() == IVariable::VECTOR)
-                {
-                    Vec3 val(0, 0, 0);
-                    pVar->Get(val);
-                    pParam->m_Value.m_Vector[0] = val.x;
-                    pParam->m_Value.m_Vector[1] = val.y;
-                    pParam->m_Value.m_Vector[2] = val.z;
-                }
-                break;
-            default:
-                break;
-            }
-        }
-    }
-
-    void SetPublicVars(CVarBlock* pPublicVars, SInputShaderResources& pInputShaderResources, IRenderShaderResources* pRenderShaderResources, IShader* pShader)
-    {
-        SetPublicVars(pPublicVars, pInputShaderResources);
-
-        // Set shader params.
-        if (pRenderShaderResources)
-        {
-            pRenderShaderResources->SetShaderParams(&pInputShaderResources, pShader);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    CVarBlock* GetShaderGenParamsVars(IShader* pShader, uint64 nShaderGenMask)
-    {
-        IShader* pTemplShader = pShader;
-        if (!pTemplShader)
-        {
-            return 0;
-        }
-
-        SShaderGen* pShaderGen = pTemplShader->GetGenerationParams();
-        if (!pShaderGen)
-        {
-            return 0;
-        }
-
-        CVarBlock* pBlock = new CVarBlock;
-        for (int i = 0; i < pShaderGen->m_BitMask.size(); i++)
-        {
-            SShaderGenBit* pGenBit = pShaderGen->m_BitMask[i];
-            if (pGenBit->m_Flags & SHGF_HIDDEN)
-            {
-                continue;
-            }
-            if (!pGenBit->m_ParamProp.empty())
-            {
-                CVariable<bool>* pVar = new CVariable<bool>;
-                pBlock->AddVariable(pVar);
-                pVar->SetName(pGenBit->m_ParamProp.c_str());
-                *pVar = (pGenBit->m_Mask & nShaderGenMask) != 0;
-                pVar->SetDescription(pGenBit->m_ParamDesc.c_str());
-            }
-        }
-
-        /*
-            // make sure if no valid generation parameters to not create new tab
-            if (!pBlock->GetVarsCount())
-            {
-                SAFE_DELETE(pBlock);
-                return 0;
-            }
-        */
-
-        return pBlock;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    uint64 SetShaderGenParamsVars(IShader* pShader, CVarBlock* pBlock)
-    {
-        IShader* pTemplShader = pShader;
-        if (!pTemplShader)
-        {
-            return 0;
-        }
-
-        SShaderGen* pShaderGen = pTemplShader->GetGenerationParams();
-        if (!pShaderGen)
-        {
-            return 0;
-        }
-
-        uint64 nGenMask = 0;
-
-        for (int i = 0; i < pShaderGen->m_BitMask.size(); i++)
-        {
-            SShaderGenBit* pGenBit = pShaderGen->m_BitMask[i];
-            if (pGenBit->m_Flags & SHGF_HIDDEN)
-            {
-                continue;
-            }
-
-            if (!pGenBit->m_ParamProp.empty())
-            {
-                IVariable* pVar = pBlock->FindVariable(pGenBit->m_ParamProp.c_str());
-                if (!pVar)
-                {
-                    continue;
-                }
-                bool bFlagOn = false;
-                pVar->Get(bFlagOn);
-                if (bFlagOn)
-                {
-                    nGenMask |= pGenBit->m_Mask;
-                }
-            }
-        }
-
-        return nGenMask;
-    }
-}
diff --git a/Code/Sandbox/Editor/Material/MaterialHelpers.h b/Code/Sandbox/Editor/Material/MaterialHelpers.h
deleted file mode 100644
index 0f0228db7a..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialHelpers.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "Material.h"
-
-namespace MaterialHelpers
-{
-    //////////////////////////////////////////////////////////////////////////
-    //! Get public parameters of material in variable block.
-    CVarBlock* GetPublicVars(SInputShaderResources& pShaderResources);
-
-    //! Sets variable block of public shader parameters.
-    //! VarBlock must be in same format as returned by GetPublicVars().
-    void SetPublicVars(CVarBlock* pPublicVars, SInputShaderResources& pInputShaderResources);
-    void SetPublicVars(CVarBlock* pPublicVars, SInputShaderResources& pInputShaderResources, IRenderShaderResources* pRenderShaderResources, IShader* pShader);
-
-    //////////////////////////////////////////////////////////////////////////
-    CVarBlock* GetShaderGenParamsVars(IShader* pShader, uint64 nShaderGenMask);
-    uint64 SetShaderGenParamsVars(IShader* pShader, CVarBlock* pBlock);
-
-    //////////////////////////////////////////////////////////////////////////
-    // [Shader System TO DO] change the usage of these functions to retrieve by slot name
-    inline EEfResTextures FindTexSlot(const char* texName) { return GetIEditor()->Get3DEngine()->GetMaterialHelpers().FindTexSlot(texName); }
-    inline const char* FindTexName(EEfResTextures texSlot) { return GetIEditor()->Get3DEngine()->GetMaterialHelpers().FindTexName(texSlot); }
-    inline const char* LookupTexName(EEfResTextures texSlot) { return GetIEditor()->Get3DEngine()->GetMaterialHelpers().LookupTexName(texSlot); }
-    inline const char* LookupTexDesc(EEfResTextures texSlot) { return GetIEditor()->Get3DEngine()->GetMaterialHelpers().LookupTexDesc(texSlot); }
-
-    //--------------------------------------------------------------------------
-    // Adjustable means that the slot is not virtual, i.e. using a sub-channel from another 
-    // slot (for example - smoothness that uses the normal's alpha)
-    inline bool IsAdjustableTexSlot(EEfResTextures texSlot) { return GetIEditor()->Get3DEngine()->GetMaterialHelpers().IsAdjustableTexSlot(texSlot); }
-
-    //////////////////////////////////////////////////////////////////////////
-    inline void SetTexModFromXml(SEfTexModificator& pShaderResources, const XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetTexModFromXml(pShaderResources, node); }
-    inline void SetXmlFromTexMod(const SEfTexModificator& pShaderResources, XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetXmlFromTexMod(pShaderResources, node); }
-
-    //////////////////////////////////////////////////////////////////////////
-    inline void SetTexturesFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetTexturesFromXml(pShaderResources, node); }
-    inline void SetXmlFromTextures( SInputShaderResources& pShaderResources, XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetXmlFromTextures(pShaderResources, node); }
-
-    //////////////////////////////////////////////////////////////////////////
-    inline void SetVertexDeformFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetVertexDeformFromXml(pShaderResources, node); }
-    inline void SetXmlFromVertexDeform(const SInputShaderResources& pShaderResources, XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetXmlFromVertexDeform(pShaderResources, node); }
-
-    //////////////////////////////////////////////////////////////////////////
-    inline void SetLightingFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetLightingFromXml(pShaderResources, node); }
-    inline void SetXmlFromLighting(const SInputShaderResources& pShaderResources, XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetXmlFromLighting(pShaderResources, node); }
-
-    //////////////////////////////////////////////////////////////////////////
-    inline void SetShaderParamsFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetShaderParamsFromXml(pShaderResources, node); }
-    inline void SetXmlFromShaderParams(const SInputShaderResources& pShaderResources, XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().SetXmlFromShaderParams(pShaderResources, node); }
-
-    //////////////////////////////////////////////////////////////////////////
-    inline void MigrateXmlLegacyData(SInputShaderResources& pShaderResources, const XmlNodeRef& node) { GetIEditor()->Get3DEngine()->GetMaterialHelpers().MigrateXmlLegacyData(pShaderResources, node); }
-}
diff --git a/Code/Sandbox/Editor/Material/MaterialImageListCtrl.cpp b/Code/Sandbox/Editor/Material/MaterialImageListCtrl.cpp
deleted file mode 100644
index 364c6f7dd6..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialImageListCtrl.cpp
+++ /dev/null
@@ -1,834 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "MaterialImageListCtrl.h"
-
-// Qt
-#include <QMenu>
-
-// Editor
-#include "Material.h"
-#include "MaterialManager.h"
-#include "MaterialPreviewModelView.h"
-#include "MaterialBrowser.h"
-#include "Util/Image.h"
-
-#define ME_BG_TEXTURE "Editor/Materials/Stripes.dds"
-
-
-#define MATERIAL_EDITOR_SPHERE_MODEL_FILE "Editor/Objects/MtlSphere.cgf"
-#define MATERIAL_EDITOR_SPHERE_CAMERA_RADIUS 1.6f
-#define MATERIAL_EDITOR_SPHERE_CAMERA_FROM_DIRECTION Vec3(0.1f, -1.0f, -0.1f)
-
-#define MATERIAL_EDITOR_BOX_MODEL_FILE "Editor/Objects/MtlBox.cgf"
-#define MATERIAL_EDITOR_BOX_CAMERA_RADIUS 2.0f
-#define MATERIAL_EDITOR_BOX_CAMERA_FROM_DIRECTION Vec3(0.75f, -0.75f, -0.5f)
-
-#define MATERIAL_EDITOR_TEAPOT_MODEL_FILE "Editor/Objects/MtlTeapot.cgf"
-#define MATERIAL_EDITOR_TEAPOT_CAMERA_RADIUS 1.6f
-#define MATERIAL_EDITOR_TEAPOT_CAMERA_FROM_DIRECTION Vec3(0.1f, -0.75f, -0.25f)
-
-#define MATERIAL_EDITOR_PLANE_MODEL_FILE "Editor/Objects/MtlPlane.cgf"
-#define MATERIAL_EDITOR_PLANE_CAMERA_RADIUS 1.6f
-#define MATERIAL_EDITOR_PLANE_CAMERA_FROM_DIRECTION Vec3(-0.5f, 0.5f, -0.5f)
-
-#define MATERIAL_EDITOR_SWATCH_MODEL_FILE "Editor/Objects/MtlSwatch.cgf"
-#define MATERIAL_EDITOR_SWATCH_CAMERA_RADIUS 1.0f
-#define MATERIAL_EDITOR_SWATCH_CAMERA_FROM_DIRECTION Vec3(0.0f, 0.0f, -1.0f)
-
-
-_smart_ptr<CMaterial> ResolveTerrainLayerPreviewMaterial(_smart_ptr<CMaterial> material, _smart_ptr<CMaterial> pMatPreview)
-{
-    if (!QString::compare(material->GetShaderName(), "Terrain.Layer"))
-    {
-        XmlNodeRef node = XmlHelpers::CreateXmlNode("Material");
-        CBaseLibraryItem::SerializeContext ctx(node, false);
-        material->Serialize(ctx);
-
-        if (!pMatPreview)
-        {
-            int flags = 0;
-            if (node->getAttr("MtlFlags", flags))
-            {
-                flags |= MTL_FLAG_UIMATERIAL;
-                node->setAttr("MtlFlags", flags);
-            }
-            pMatPreview = GetIEditor()->GetMaterialManager()->CreateMaterial("_NewPreview_", node);
-        }
-        else
-        {
-            CBaseLibraryItem::SerializeContext ctx2(node, true);
-            pMatPreview->Serialize(ctx2);
-        }
-        pMatPreview->SetShaderName("Illum");
-        pMatPreview->Update();
-        return pMatPreview;
-    }
-    else
-    {
-        return material;
-    }
-}
-
-struct QMaterialImageListModel::Item
-{
-    QImage image;
-    void* pUserData;
-    QPoint position;
-    QSize size;
-    _smart_ptr<CMaterial> pMaterial;
-    QStringList vVisibleTextures;
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::OnCreate()
-{
-    // m_largePreviewCtrl is used to draw the 3D preview for the selected material
-    m_largePreviewCtrl.reset(new MaterialPreviewModelView(this));
-    m_largePreviewCtrl->hide();
-    // m_renderCtrl is used to draw all the sub-materials
-    m_renderCtrl.reset(new MaterialPreviewModelView(this, false /* disable idle updates since this is only used to create the preview list images */));
-    m_renderCtrl->UnSetFlag(CPreviewModelView::PreviewModelViewFlag::SHOW_GRID);
-    m_renderCtrl->UnSetFlag(CPreviewModelView::PreviewModelViewFlag::SHOW_GRID_AXIS);
-
-    if (gEnv->pSystem)
-    {
-        gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
-    }
-
-    // m_resizeTimer is used to stall updateGeometries being called via resizeEvents until RESIZE_TIMEOUT ms after resizing
-    // This prevents an Editor freeze caused by constant resizing of the Material Editor when viewing
-    // a high sub-material count material (LY-58389)
-    m_resizeTimer = new QTimer(this);
-    connect(m_resizeTimer, &QTimer::timeout, this, &CMaterialImageListCtrl::ResizeTimeout);
-}
-
-void CMaterialImageListCtrl::resizeEvent([[maybe_unused]] QResizeEvent* event)
-{
-    m_resizeTimer->stop();
-    m_resizeTimer->start(RESIZE_TIMEOUT);
-}
-
-void CMaterialImageListCtrl::ResizeTimeout()
-{
-    m_resizeTimer->stop();
-    updateGeometries();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::OnDestroy()
-{
-    if (gEnv->pSystem)
-    {
-        gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterialImageListCtrl::CMaterialImageListCtrl(QWidget* parent)
-    : CImageListCtrl(parent)
-{
-    OnCreate();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterialImageListCtrl::~CMaterialImageListCtrl()
-{
-    OnDestroy();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QModelIndex QMaterialImageListModel::AddMaterial(CMaterial* pMaterial, void* pUserData)
-{
-    Item* pItem = new Item;
-    pItem->pMaterial = pMaterial;
-    pItem->pUserData = pUserData;
-    pMaterial->GetAnyTextureFilenames(pItem->vVisibleTextures);
-
-    const int row = m_items.count();
-    beginInsertRows(QModelIndex(), row, row);
-    m_items.insert(row, pItem);
-    endInsertRows();
-
-    return index(row, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::SetMaterial(int nItemIndex, CMaterial* pMaterial, void* pUserData)
-{
-    assert(nItemIndex <= (int)m_items.size());
-    Item* pItem = m_items.at(nItemIndex);
-
-    pItem->vVisibleTextures.clear();
-    pItem->pMaterial = pMaterial;
-    pItem->pUserData = pUserData;
-    pMaterial->GetAnyTextureFilenames(pItem->vVisibleTextures);
-    pItem->image = QImage();
-
-    QModelIndex idx = index(nItemIndex, 0);
-    emit dataChanged(idx, idx, QVector<int>() << Qt::DisplayRole << Qt::DecorationRole);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QModelIndex QMaterialImageListModel::FindMaterial(CMaterial* const pMaterial)
-{
-    for (int i = 0; i < m_items.count(); i++)
-    {
-        Item* item = m_items[i];
-        if (pMaterial == item->pMaterial)
-        {
-            return index(i, 0);
-        }
-    }
-    return QModelIndex();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::SelectMaterial(CMaterial* pMaterial)
-{
-    // Force the material to load the highest resolution textures
-    pMaterial->GetMatInfo()->DisableTextureStreaming();
-
-    selectionModel()->clearSelection();
-
-    QMaterialImageListModel* materialModel = qobject_cast<QMaterialImageListModel*>(model());
-    Q_ASSERT(materialModel);
-
-    QModelIndex index = materialModel->FindMaterial(pMaterial);
-    if (index.isValid())
-    {
-        selectionModel()->select(index, QItemSelectionModel::SelectCurrent);
-        m_largePreviewMaterial = pMaterial;
-    }
-    else
-    {
-        // If the parent material was selected, set the first sub-material as the large preview's material so it has something to render
-        if (pMaterial->GetSubMaterialCount() > 0)
-        {
-            m_largePreviewMaterial = pMaterial->GetSubMaterial(0);
-        }
-    }
-
-    GenerateAllImages();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::InvalidateMaterial(CMaterial* pMaterial)
-{
-    QModelIndex idx = FindMaterial(pMaterial);
-    Item* pItem = ItemFromIndex(idx);
-    if ((pItem) && (m_renderCtrl))
-    {
-        if (pMaterial)
-        {
-            // Ensure the full resolution textures are loaded for the material editor
-            pMaterial->GetMatInfo()->DisableTextureStreaming();
-        }
-
-        pItem->vVisibleTextures.clear();
-        pMaterial->GetAnyTextureFilenames(pItem->vVisibleTextures);
-        pItem->image = QImage();
-        GenerateImage(pItem);
-
-        emit dataChanged(idx, idx, QVector<int>() << Qt::DecorationRole);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::DeleteAllItems()
-{
-    if (m_renderCtrl)
-    {
-        m_renderCtrl->SetMaterial(nullptr);
-    }
-    beginResetModel();
-    qDeleteAll(m_items);
-    m_items.clear();
-    endResetModel();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::GenerateImage(Item* pItem)
-{
-    // Make a bitmap from image.
-    Q_ASSERT(pItem);
-    if (!m_renderCtrl || !pItem->size.isValid())
-    {
-        return;
-    }
-    if (pItem->image.size() == pItem->size)
-    {
-        return;
-    }
-
-    Item* pMtlItem = pItem;
-
-    CImageEx image;
-
-    bool bPreview = false;
-    if (pMtlItem->pMaterial)
-    {
-        if (!(pMtlItem->pMaterial->GetFlags() & MTL_FLAG_NOPREVIEW))
-        {
-            if (!m_renderCtrl->GetStaticModel())
-            {
-                AZ_Warning("Material Editor", false, "Preview renderer has no object loaded!");
-                return;
-            }
-
-            // keep m_renderCtrl off screen, but visible
-            m_renderCtrl->setGeometry(QRect(-QPoint(pItem->size.width(), pItem->size.height()), pItem->size));
-
-            _smart_ptr<CMaterial> matPreview = ResolveTerrainLayerPreviewMaterial(pItem->pMaterial, m_pMatPreview);
-
-            m_renderCtrl->SetMaterial(matPreview->GetMatInfo());
-            m_renderCtrl->GetImageOffscreen(image, pMtlItem->size);
-        }
-        bPreview = true;
-    }
-
-    if (!bPreview)
-    {
-        image.Allocate(pItem->size.width(), pItem->size.height());
-        image.Clear();
-    }
-
-    pItem->image = QImage(image.GetWidth(), image.GetHeight(), QImage::Format_RGB32);
-    memcpy(pItem->image.bits(), image.GetData(), image.GetSize());
-}
-
-
-#define MENU_USE_DEFAULT 1
-#define MENU_USE_BOX 2
-#define MENU_USE_PLANE 3
-#define MENU_USE_SPHERE 4
-#define MENU_USE_TEAPOT 5
-#define MENU_BG_BLACK 6
-#define MENU_BG_GRAY  7
-#define MENU_BG_WHITE 8
-#define MENU_BG_TEXTURE 9
-#define MENU_USE_BACKLIGHT 10
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::contextMenuEvent(QContextMenuEvent* event)
-{
-    QAction* action;
-    QMenu menu;
-
-    action = menu.addAction(tr("Use Default Object"));
-    action->setData(ModelDefault);
-    action->setCheckable(true);
-    action->setChecked(m_modelType == ModelType::Default);
-
-    action = menu.addAction(tr("Use Plane"));
-    action->setData(ModelPlane);
-    action->setCheckable(true);
-    action->setChecked(m_modelType == ModelType::Plane);
-
-    action = menu.addAction(tr("Use Box"));
-    action->setData(ModelBox);
-    action->setCheckable(true);
-    action->setChecked(m_modelType == ModelType::Box);
-
-    action = menu.addAction(tr("Use Sphere"));
-    action->setData(ModelSphere);
-    action->setCheckable(true);
-    action->setChecked(m_modelType == ModelType::Sphere);
-
-    action = menu.addAction(tr("Use Teapot"));
-    action->setData(ModelTeapot);
-    action->setCheckable(true);
-    action->setChecked(m_modelType == ModelType::Teapot);
-
-    menu.addSeparator();
-
-    // If there is a currently selected material
-    if (m_materialBrowserWidget && m_largePreviewMaterial)
-    {
-        // Add context menu actions that are common to both the material browser and the preview swatches
-        m_materialBrowserWidget->AddContextMenuActionsSingleSelection(menu, m_largePreviewMaterial);
-    }
-
-    action = menu.exec(mapToGlobal(event->pos()));
-    if (!action)
-    {
-        return;
-    }
-
-    int cmd = action->data().toInt();
-    switch (cmd)
-    {
-    case ModelDefault:
-        m_modelType = ModelType::Default;
-        LoadModel();
-        break;
-    case ModelPlane:
-        m_modelType = ModelType::Plane;
-        LoadModel();
-        break;
-    case ModelBox:
-        m_modelType = ModelType::Box;
-        LoadModel();
-        break;
-    case ModelSphere:
-        m_modelType = ModelType::Sphere;
-        LoadModel();
-        break;
-    case ModelTeapot:
-        m_modelType = ModelType::Teapot;
-        LoadModel();
-        break;
-    default:
-        // If there is a currently selected material
-        if (m_materialBrowserWidget && m_largePreviewMaterial)
-        {
-            // Handle context menu actions that are common to both the material browser and the preview swatches
-            m_materialBrowserWidget->OnContextMenuAction(cmd, m_largePreviewMaterial);
-        }
-        break;
-    }
-
-    QMaterialImageListModel* materialModel =
-        qobject_cast<QMaterialImageListModel*>(model());
-    Q_ASSERT(materialModel);
-
-    materialModel->GenerateImages();
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::LoadModel()
-{
-    switch (m_modelType)
-    {
-    case ModelType::Default:
-    case ModelType::Sphere:
-        m_largePreviewCtrl->LoadModelFile(MATERIAL_EDITOR_SPHERE_MODEL_FILE);
-        m_largePreviewCtrl->SetCameraLookAt(MATERIAL_EDITOR_SPHERE_CAMERA_RADIUS, MATERIAL_EDITOR_SPHERE_CAMERA_FROM_DIRECTION);
-        break;
-    case ModelType::Box:
-        m_largePreviewCtrl->LoadModelFile(MATERIAL_EDITOR_BOX_MODEL_FILE);
-        m_largePreviewCtrl->SetCameraLookAt(MATERIAL_EDITOR_BOX_CAMERA_RADIUS, MATERIAL_EDITOR_BOX_CAMERA_FROM_DIRECTION);
-        break;
-    case ModelType::Teapot:
-        m_largePreviewCtrl->LoadModelFile(MATERIAL_EDITOR_TEAPOT_MODEL_FILE);
-        m_largePreviewCtrl->SetCameraLookAt(MATERIAL_EDITOR_TEAPOT_CAMERA_RADIUS, MATERIAL_EDITOR_TEAPOT_CAMERA_FROM_DIRECTION);
-        break;
-    case ModelType::Plane:
-        m_largePreviewCtrl->LoadModelFile(MATERIAL_EDITOR_PLANE_MODEL_FILE);
-        m_largePreviewCtrl->SetCameraLookAt(MATERIAL_EDITOR_PLANE_CAMERA_RADIUS, MATERIAL_EDITOR_PLANE_CAMERA_FROM_DIRECTION);
-        break;
-    }
-
-    GenerateAllImages();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::updateGeometries()
-{
-    ClearItemGeometries();
-    m_updatingGeometries = true;
-
-    if (!model())
-    {
-        return;
-    }
-
-    const int rowCount = model()->rowCount();
-    if (!rowCount)
-    {
-        m_largePreviewCtrl->hide();
-        m_largePreviewMaterial = nullptr;
-        return;
-    }
-    m_largePreviewCtrl->setParent(nullptr);
-    m_largePreviewCtrl->setParent(this);
-    m_largePreviewCtrl->show();
-
-    const int bwidth = BorderSize().width();
-    const int bheight = BorderSize().height();
-    m_largePreviewCtrl->move(bwidth, bheight);
-
-    QRect rc = viewport()->contentsRect()
-            .adjusted(bwidth, bheight, -bwidth, -bheight);
-
-    int cy = rc.height();
-
-    // Preview item is big.
-    if (model()->rowCount() > 0)
-    {
-        QSize size(cy, rc.height());
-        m_largePreviewCtrl->SetSize(size);
-        m_largePreviewCtrl->resize(size);
-        rc.setLeft(rc.left() + cy + bwidth * 2);
-        m_largePreviewCtrl->show();
-    }
-
-    int cx = rc.width() - bwidth;
-
-    int itemSize = cy;
-
-    // Adjust all other bitmaps as tight as possible.
-    int numItems = model()->rowCount();
-    int div = 0;
-    for (div = 1; div < 1000 && itemSize > 0; div++)
-    {
-        int nX = cx / (itemSize + 2);
-        if (nX >= numItems)
-        {
-            break;
-        }
-        if (nX > 0)
-        {
-            int nY = numItems / nX + 1;
-            if (nY * (itemSize + 2) < cy)
-            {
-                //itemSize = itemSize -= 2;
-                break;
-            }
-        }
-        itemSize = itemSize -= 2;
-    }
-    if (itemSize < 0)
-    {
-        itemSize = 0;
-    }
-
-    QPoint pos(rc.topLeft());
-    const QSize size(itemSize, itemSize);
-    m_renderCtrl->SetSize(size);
-    for (int row = 0; row < numItems; ++row)
-    {
-        QModelIndex index = model()->index(row, 0);
-        SetItemGeometry(index, QRect(pos, size));
-        model()->setData(index, pos, QMaterialImageListModel::PositionRole);
-        model()->setData(index, size, Qt::SizeHintRole);
-        pos.rx() += itemSize + 2;
-        if (pos.rx() + itemSize >= rc.right())
-        {
-            pos.rx() = rc.left();
-            pos.ry() += itemSize + 2;
-        }
-    }
-
-    m_updatingGeometries = false;
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::setModel(QAbstractItemModel* model)
-{
-    QMaterialImageListModel* materialModel = qobject_cast<QMaterialImageListModel*>(model);
-    if (materialModel)
-    {
-        materialModel->SetPreviewModelCtrl(m_renderCtrl.data());
-    }
-
-    CImageListCtrl::setModel(model);
-
-    auto delegate = qobject_cast<QImageListDelegate*>(itemDelegate());
-    // in case the delegate misses a pixmap we can generate it (done only once not at every painting)
-    connect(delegate, SIGNAL(invalidPixmapGenerated(const QModelIndex&)), materialModel, SLOT(GenerateImage(const QModelIndex&)));
-    connect(model, &QAbstractItemModel::dataChanged, this, &CMaterialImageListCtrl::ModelDataChanged);
-}
-
-void CMaterialImageListCtrl::ModelDataChanged(const QModelIndex& index)
-{
-    // Prevent the hundreads of resize calls done in a row
-    // to trigger a new image computation that we already have
-    if (m_updatingGeometries)
-    {
-        return;
-    }
-
-    GenerateImage(index);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::showEvent(QShowEvent* event)
-{
-    CImageListCtrl::showEvent(event);
-
-    if (!m_largePreviewCtrl->GetStaticModel())
-    {
-        LoadModel();
-    }
-    if (!m_renderCtrl->GetStaticModel())
-    {
-        m_renderCtrl->LoadModelFile(MATERIAL_EDITOR_SWATCH_MODEL_FILE);
-        m_renderCtrl->SetCameraLookAt(MATERIAL_EDITOR_SWATCH_CAMERA_RADIUS, MATERIAL_EDITOR_SWATCH_CAMERA_FROM_DIRECTION);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialImageListCtrl::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-    switch (event)
-    {
-    // Toggle visibility of this control whenever the main editor window has a change of focus.
-    case ESYSTEM_EVENT_CHANGE_FOCUS:
-    {
-        setAttribute(Qt::WA_WState_Visible, (wparam != 0));
-        break;
-    }
-    }
-    ;
-}
-
-void CMaterialImageListCtrl::UpdateLargePreview()
-{
-    if (m_largePreviewMaterial)
-    {
-        m_largePreviewCtrl->SetMaterial(ResolveTerrainLayerPreviewMaterial(m_largePreviewMaterial, m_tempTerrainMaterial)->GetMatInfo());
-        m_largePreviewCtrl->show();
-        m_largePreviewCtrl->update();
-    }
-}
-
-void CMaterialImageListCtrl::GenerateImage(const QModelIndex& index)
-{
-    QMaterialImageListModel* materialModel =
-        qobject_cast<QMaterialImageListModel*>(model());
-    Q_ASSERT(materialModel);
-    if (m_largePreviewMaterial == materialModel->MaterialFromIndex(index))
-    {
-        UpdateLargePreview();
-    }
-
-    materialModel->SetPreviewModelCtrl(m_renderCtrl.data());
-    materialModel->GenerateImage(index);
-    update();
-}
-
-void CMaterialImageListCtrl::GenerateAllImages()
-{
-    QMaterialImageListModel* materialModel =
-        qobject_cast<QMaterialImageListModel*>(model());
-    Q_ASSERT(materialModel);
-
-    UpdateLargePreview();
-
-    materialModel->SetPreviewModelCtrl(m_renderCtrl.data());
-    materialModel->GenerateImages();
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QMaterialImageListModel::QMaterialImageListModel(QObject* parent)
-    : QAbstractListModel(parent)
-    , m_renderCtrl(nullptr)
-{
-    BusConnect(AZ_CRC("dds", 0x780234cb));
-}
-
-//////////////////////////////////////////////////////////////////////////
-QMaterialImageListModel::~QMaterialImageListModel()
-{
-    BusDisconnect();
-
-    qDeleteAll(m_items);
-}
-
-//////////////////////////////////////////////////////////////////////////
-MaterialPreviewModelView* QMaterialImageListModel::PreviewModelCtrl() const
-{
-    return m_renderCtrl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::SetPreviewModelCtrl(MaterialPreviewModelView* ctrl)
-{
-    if (m_renderCtrl)
-    {
-        disconnect(m_renderCtrl, &MaterialPreviewModelView::destroyed,
-            this, &QMaterialImageListModel::ClearPreviewModelCtrl);
-    }
-
-    m_renderCtrl = ctrl;
-
-    if (m_renderCtrl)
-    {
-        connect(m_renderCtrl, &MaterialPreviewModelView::destroyed,
-            this, &QMaterialImageListModel::ClearPreviewModelCtrl);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::ClearPreviewModelCtrl()
-{
-    m_renderCtrl = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int QMaterialImageListModel::rowCount(const QModelIndex& parent) const
-{
-    if (parent.isValid())
-    {
-        return 0;
-    }
-
-    return m_items.count();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QVariant QMaterialImageListModel::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid())
-    {
-        return QVariant();
-    }
-
-    Item* pItem = m_items.at(index.row());
-    Q_ASSERT(pItem);
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-        return pItem->pMaterial->GetShortName();
-
-    case Qt::DecorationRole:
-        return QPixmap::fromImage(pItem->image);
-
-    case PositionRole:
-        return pItem->position;
-
-    case Qt::SizeHintRole:
-        return pItem->size;
-
-    default:
-        break;
-    }
-
-    return QVariant();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QMaterialImageListModel::setData(const QModelIndex& index, const QVariant& value, int role)
-{
-    if (!index.isValid())
-    {
-        return false;
-    }
-
-    Item* pItem = ItemFromIndex(index);
-    if (!pItem)
-    {
-        return false;
-    }
-
-    if (Qt::SizeHintRole == role)
-    {
-        pItem->size = value.toSize();
-        emit dataChanged(index, index, QVector<int>() << Qt::DecorationRole << Qt::SizeHintRole);
-        return true;
-    }
-
-    if (PositionRole == role)
-    {
-        pItem->position = value.toPoint();
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Qt::ItemFlags QMaterialImageListModel::flags(const QModelIndex& index) const
-{
-    return QAbstractListModel::flags(index);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* QMaterialImageListModel::MaterialFromIndex(QModelIndex index) const
-{
-    Item* pItem = ItemFromIndex(index);
-    if (!pItem)
-    {
-        return nullptr;
-    }
-
-    return pItem->pMaterial;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* QMaterialImageListModel::UserDataFromIndex(QModelIndex index) const
-{
-    Item* pItem = ItemFromIndex(index);
-    if (!pItem)
-    {
-        return nullptr;
-    }
-
-    return pItem->pUserData;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::GenerateImages()
-{
-    if ((!m_renderCtrl) || (m_items.isEmpty()))
-    {
-        return;
-    }
-
-    for (Item* materialImageListItem : m_items)
-    {
-        GenerateImage(materialImageListItem);
-    }
-}
-
-void QMaterialImageListModel::GenerateImage(const QModelIndex& index)
-{
-    if ((!m_renderCtrl) || (m_items.isEmpty()))
-    {
-        return;
-    }
-
-    GenerateImage(ItemFromIndex(index));
-}
-
-//////////////////////////////////////////////////////////////////////////
-QMaterialImageListModel::Item* QMaterialImageListModel::ItemFromIndex(QModelIndex index) const
-{
-    if (!index.isValid())
-    {
-        return nullptr;
-    }
-
-    return m_items.at(index.row());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QMaterialImageListModel::OnFileChanged(AZStd::string assetPath)
-{
-    const int rowCount = m_items.count();
-
-    // update all previews who's texture(s) changed
-    for (int row = 0; row < rowCount; ++row)
-    {
-        Item* pItem = m_items.at(row);
-
-        QStringList::const_iterator textureIt = std::find(pItem->vVisibleTextures.begin(), pItem->vVisibleTextures.end(), assetPath.c_str());
-        if (textureIt != pItem->vVisibleTextures.end())
-        {
-            pItem->image = QImage();
-            QModelIndex idx = index(row, 0);
-            emit dataChanged(idx, idx, QVector<int>() << Qt::DecorationRole);
-        }
-    }
-}
-
-#include <Material/moc_MaterialImageListCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Material/MaterialImageListCtrl.h b/Code/Sandbox/Editor/Material/MaterialImageListCtrl.h
deleted file mode 100644
index fe9742fb53..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialImageListCtrl.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_MATERIAL_MATERIALIMAGELISTCTRL_H
-#define CRYINCLUDE_EDITOR_MATERIAL_MATERIALIMAGELISTCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Controls/ImageListCtrl.h"
-#include <QAbstractListModel>
-#include "Material.h"
-#include "IRenderer.h" // IAsyncTextureCompileListener
-#include "IResourceCompilerHelper.h"
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-#include <QScopedPointer>
-#include <QPointer>
-#endif
-
-class MaterialPreviewModelView;
-class MaterialBrowserWidget;
-
-//////////////////////////////////////////////////////////////////////////
-class CMaterialImageListCtrl
-    : public CImageListCtrl
-    , public ISystemEventListener
-{
-    Q_OBJECT
-public:
-
-    enum class ModelType
-    {
-        Default,
-        Box,
-        Sphere,
-        Teapot,
-        Plane
-    };
-
-    enum MenuAction
-    {
-        ModelDefault = 0,
-        ModelPlane,
-        ModelBox,
-        ModelSphere,
-        ModelTeapot,
-        // Context menu actions that are common to both the material browser and the preview swatches
-        // are handled by the same switch statement, so they need to be unique. This sets the starting point for the common actions
-        MaterialBrowserWidgetActionsStart
-    };
-
-    CMaterialImageListCtrl(QWidget* parent = nullptr);
-    ~CMaterialImageListCtrl();
-
-    void setModel(QAbstractItemModel* model) override;
-
-    void EnableAutoRefresh(bool autoRefreshState, unsigned int refreshInterval);
-    void SelectMaterial(CMaterial* pMaterial);
-    void LoadModel();
-    void SetMaterialBrowserWidget(MaterialBrowserWidget* materialBrowserWidget){ m_materialBrowserWidget = materialBrowserWidget; }
-    // ISystemEventListener
-    // Due to the material editor working on a ProcessEvents -> Timer based system, rather than the OnIdle update event loops
-    // that the other editor windows use, make sure that when the editor loses focus that the Material Editor itself loses focus.
-    // This will pause updates/renderings in the material editor when it does not have focus.
-    // This prevents certain materials from re-creating themselves and eventually overflowing a few resource buffers.
-    // The main window cleans up those resources during its main update, which is bypassed when the window does not have focus.
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-    // ~ISystemEventListener
-
-    // Override resizeEvent and use this const to rate limit it such that it only fires RESIZE_TIMEOUT ms after resizing stops
-    static const int RESIZE_TIMEOUT = 100;
-    void resizeEvent(QResizeEvent* event) override;
-
-public slots:
-    void ModelDataChanged(const QModelIndex& index);
-    void ResizeTimeout();
-protected:
-    void OnCreate();
-    void OnDestroy();
-
-    void contextMenuEvent(QContextMenuEvent* event) override;
-    void showEvent(QShowEvent* event) override;
-    void updateGeometries() override;
-
-private:
-    void GenerateImage(const QModelIndex& index);
-    void GenerateAllImages();
-    void UpdateLargePreview();
-
-    QScopedPointer<MaterialPreviewModelView> m_largePreviewCtrl; // Used to draw the main 3D preview viewport for the selected sub-material
-    _smart_ptr<CMaterial> m_largePreviewMaterial;
-    _smart_ptr<CMaterial> m_tempTerrainMaterial;
-    QScopedPointer<MaterialPreviewModelView> m_renderCtrl; // Used to draw the swatches for all the sub-materials
-    int m_nColor;
-    bool m_updatingGeometries = false;
-    ModelType m_modelType = ModelType::Default;
-    MaterialBrowserWidget* m_materialBrowserWidget;
-    QTimer* m_resizeTimer; // Used to stall a resizeEvent from firing until RESIZE_TIMEOUT ms have passed since resizing stopped
-};
-
-class QMaterialImageListModel
-    : public QAbstractListModel
-    , public AzFramework::LegacyAssetEventBus::Handler
-{
-    struct Item;
-    Q_OBJECT
-
-public:
-    enum CustomRoles
-    {
-        PositionRole = Qt::UserRole
-    };
-
-    QMaterialImageListModel(QObject* parent = nullptr);
-    ~QMaterialImageListModel();
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-
-    QModelIndex AddMaterial(CMaterial* pMaterial, void* pUserData = nullptr);
-    void SetMaterial(int nItemIndex, CMaterial* pMaterial, void* pUserData = nullptr);
-    QModelIndex FindMaterial(CMaterial* pMaterial);
-    void InvalidateMaterial(CMaterial* pMaterial);
-    void DeleteAllItems();
-
-    MaterialPreviewModelView* PreviewModelCtrl() const;
-    void SetPreviewModelCtrl(MaterialPreviewModelView* ctrl);
-
-    CMaterial* MaterialFromIndex(QModelIndex index) const;
-    void* UserDataFromIndex(QModelIndex index) const;
-
-public slots:
-    void GenerateImages();
-    void GenerateImage(const QModelIndex& index);
-
-protected:
-    void GenerateImage(Item* pItem);
-    Item* ItemFromIndex(QModelIndex index) const;
-
-private slots:
-    void ClearPreviewModelCtrl();
-
-private:
-    void OnFileChanged(AZStd::string assetPath) override;
-
-private:
-    _smart_ptr<CMaterial> m_pMatPreview;
-    QPointer<MaterialPreviewModelView> m_renderCtrl;
-    QVector<Item*> m_items;
-};
-
-#endif // CRYINCLUDE_EDITOR_MATERIAL_MATERIALIMAGELISTCTRL_H
diff --git a/Code/Sandbox/Editor/Material/MaterialLibrary.cpp b/Code/Sandbox/Editor/Material/MaterialLibrary.cpp
deleted file mode 100644
index 351eee5c63..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialLibrary.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "MaterialLibrary.h"
-
-// Editor
-#include "BaseLibraryItem.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// CMaterialLibrary implementation.
-//////////////////////////////////////////////////////////////////////////
-bool CMaterialLibrary::Save()
-{
-    return SaveLibrary("MaterialLibrary");
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterialLibrary::Load(const QString& filename)
-{
-    if (filename.isEmpty())
-    {
-        return false;
-    }
-    SetFilename(filename);
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(filename.toUtf8().data());
-    if (!root)
-    {
-        return false;
-    }
-
-    Serialize(root, true);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialLibrary::Serialize([[maybe_unused]] XmlNodeRef& root, [[maybe_unused]] bool bLoading)
-{
-    /*
-    if (bLoading)
-    {
-        // Loading.
-        CString name = GetName();
-        root->getAttr( "Name",name );
-        SetName( name );
-        for (int i = 0; i < root->getChildCount(); i++)
-        {
-            XmlNodeRef itemNode = root->getChild(i);
-            CMaterial *material = new CMaterial(itemNode->getAttr("Name"));
-            AddItem( material );
-            CBaseLibraryItem::SerializeContext ctx( itemNode,bLoading );
-            material->Serialize( ctx );
-        }
-        SetModified(false);
-    }
-    else
-    {
-        // Saving.
-        root->setAttr( "Name",GetName() );
-        root->setAttr( "SandboxVersion",(const char*)GetIEditor()->GetFileVersion().ToFullString() );
-        // Serialize prototypes.
-        for (int i = 0; i < GetItemCount(); i++)
-        {
-            CMaterial *pMtl = (CMaterial*)GetItem(i);
-            // Save materials with parents under thier parent xml node.
-            if (pMtl->GetParent())
-                continue;
-
-            XmlNodeRef itemNode = root->newChild( "Material" );
-            CBaseLibraryItem::SerializeContext ctx( itemNode,bLoading );
-            GetItem(i)->Serialize( ctx );
-        }
-    }
-    */
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CMaterialLibrary::AddItem(IDataBaseItem* item, bool bRegister)
-{
-    CBaseLibraryItem* pLibItem = (CBaseLibraryItem*)item;
-    // Check if item is already assigned to this library.
-    if (pLibItem->GetLibrary() != this)
-    {
-        pLibItem->SetLibrary(this);
-        if (bRegister)
-        {
-            m_pManager->RegisterItem(pLibItem);
-        }
-        m_items.push_back(pLibItem);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CMaterialLibrary::GetItem(int index)
-{
-    assert(index >= 0 && index < m_items.size());
-    return m_items[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialLibrary::RemoveItem(IDataBaseItem* item)
-{
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        if (m_items[i] == item)
-        {
-            m_items.erase(m_items.begin() + i);
-            SetModified();
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CMaterialLibrary::FindItem(const QString& name)
-{
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        if (QString::compare(m_items[i]->GetName(), name, Qt::CaseInsensitive) == 0)
-        {
-            return m_items[i];
-        }
-    }
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialLibrary::RemoveAllItems()
-{
-    AddRef();
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        // Clear library item.
-        m_items[i]->SetLibrary(NULL);
-    }
-    m_items.clear();
-    Release();
-}
diff --git a/Code/Sandbox/Editor/Material/MaterialLibrary.h b/Code/Sandbox/Editor/Material/MaterialLibrary.h
deleted file mode 100644
index 5a80500e94..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialLibrary.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_MATERIAL_MATERIALLIBRARY_H
-#define CRYINCLUDE_EDITOR_MATERIAL_MATERIALLIBRARY_H
-#pragma once
-
-#include "BaseLibrary.h"
-
-/** Library of prototypes.
-*/
-class CRYEDIT_API CMaterialLibrary
-    : public CBaseLibrary
-{
-public:
-    CMaterialLibrary(IBaseLibraryManager* pManager)
-        : CBaseLibrary(pManager) {};
-    virtual bool Save();
-    virtual bool Load(const QString& filename);
-    virtual void Serialize(XmlNodeRef& node, bool bLoading);
-
-    //////////////////////////////////////////////////////////////////////////
-    // CBaseLibrary override.
-    //////////////////////////////////////////////////////////////////////////
-    void AddItem(IDataBaseItem* item, bool bRegister = true);
-    int GetItemCount() const { return m_items.size(); }
-    IDataBaseItem* GetItem(int index);
-    void RemoveItem(IDataBaseItem* item);
-    void RemoveAllItems();
-    IDataBaseItem* FindItem(const QString& name);
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    std::vector<CBaseLibraryItem*> m_items;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_MATERIAL_MATERIALLIBRARY_H
diff --git a/Code/Sandbox/Editor/Material/MaterialManager.cpp b/Code/Sandbox/Editor/Material/MaterialManager.cpp
deleted file mode 100644
index 3c21a74d97..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialManager.cpp
+++ /dev/null
@@ -1,2107 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "MaterialManager.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzCore
-#include <AzCore/IO/Path/Path.h>
-
-// AzFramework
-#include <AzFramework/Render/RenderSystemBus.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzToolsFramework/AssetBrowser/EBusFindAssetTypeByName.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-
-// Editor
-#include "MainWindow.h"
-#include "MaterialLibrary.h"
-#include "MaterialSender.h"
-#include "MaterialUtils.h"
-#include "ModelViewport.h"
-#include "ISourceControl.h"
-#include "UsedResources.h"
-#include "Viewport.h"
-#include "Commands/CommandManager.h"
-#include "Include/IObjectManager.h"
-#include "Objects/BaseObject.h"
-#include "Objects/SelectionGroup.h"
-
-
-static const char* MATERIALS_LIBS_PATH = "Materials/";
-static unsigned int s_highlightUpdateCounter = 0;
-
-// Convert a material name into a material identifier (no extension, no gamename, etc) so that it can be compared
-// in the hash.
-static QString UnifyMaterialName(const QString& source)
-{
-    char tempBuffer[AZ_MAX_PATH_LEN];
-    azstrncpy(tempBuffer, AZ_ARRAY_SIZE(tempBuffer), source.toUtf8().data(), AZ_ARRAY_SIZE(tempBuffer) - 1);
-    MaterialUtils::UnifyMaterialName(tempBuffer);
-    return QString(tempBuffer);
-}
-
-struct SHighlightMode
-{
-    float m_colorHue;
-    float m_period;
-    bool m_continuous;
-};
-
-static SHighlightMode g_highlightModes[] = {
-    { 0.70f, 0.8f, true }, // purple
-    { 0.25f, 0.75f, false }, // green
-    { 0.0, 0.75f, true } // red
-};
-
-class CMaterialHighlighter
-{
-public:
-    void Start(CMaterial* pMaterial, int modeFlag);
-    void Stop(CMaterial* pMaterial, int modeFlag);
-    void GetHighlightColor(ColorF* color, float* intensity, int flags);
-
-    void ClearMaterials() { m_materials.clear(); };
-    void RestoreMaterials();
-    void Update();
-private:
-    struct SHighlightOptions
-    {
-        int m_modeFlags;
-    };
-
-    typedef std::map<CMaterial*, SHighlightOptions> Materials;
-    Materials m_materials;
-};
-
-AZStd::string DccMaterialToSourcePath(const AZStd::string& relativeDccMaterialPath)
-{
-    AZStd::string fullSourcePath;
-    bool sourcePathFound = false;
-
-    // Get source path using relative .dccmtl path
-    AzToolsFramework::AssetSystemRequestBus::BroadcastResult(sourcePathFound, &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath, relativeDccMaterialPath, fullSourcePath);
-
-    if (sourcePathFound)
-    {
-        // Set source path extension to ".mtl"
-        AzFramework::StringFunc::Path::ReplaceExtension(fullSourcePath, MATERIAL_FILE_EXT);
-    }
-    return fullSourcePath;
-}
-
-
-void CMaterialHighlighter::Start(CMaterial* pMaterial, int modeFlag)
-{
-    Materials::iterator it = m_materials.find(pMaterial);
-    if (it == m_materials.end())
-    {
-        SHighlightOptions& options = m_materials[pMaterial];
-        options.m_modeFlags = modeFlag;
-    }
-    else
-    {
-        SHighlightOptions& options = it->second;
-        options.m_modeFlags |= modeFlag;
-    }
-}
-
-void CMaterialHighlighter::Stop(CMaterial* pMaterial, int modeFlag)
-{
-    if (pMaterial)
-    {
-        pMaterial->SetHighlightFlags(0);
-    }
-
-    Materials::iterator it = m_materials.find(pMaterial);
-    if (it == m_materials.end())
-    {
-        return;
-    }
-
-    SHighlightOptions& options = it->second;
-    MAKE_SURE((options.m_modeFlags & modeFlag) != 0, return );
-
-    options.m_modeFlags &= ~modeFlag;
-    if (options.m_modeFlags == 0)
-    {
-        m_materials.erase(it);
-    }
-}
-
-void CMaterialHighlighter::RestoreMaterials()
-{
-    for (Materials::iterator it = m_materials.begin(); it != m_materials.end(); ++it)
-    {
-        if (it->first)
-        {
-            it->first->SetHighlightFlags(0);
-        }
-    }
-}
-
-void CMaterialHighlighter::Update()
-{
-    unsigned int counter = s_highlightUpdateCounter;
-
-    Materials::iterator it;
-    for (it = m_materials.begin(); it != m_materials.end(); ++it)
-    {
-        // Only update each material every 4 frames
-        if (counter++ % 4 == 0)
-        {
-            it->first->SetHighlightFlags(it->second.m_modeFlags);
-        }
-    }
-
-    s_highlightUpdateCounter = (s_highlightUpdateCounter + 1) % 4;
-}
-
-void CMaterialHighlighter::GetHighlightColor(ColorF* color, float* intensity, int flags)
-{
-    MAKE_SURE(color != 0, return );
-    MAKE_SURE(intensity != 0, return );
-
-    *intensity = 0.0f;
-
-    if (flags == 0)
-    {
-        return;
-    }
-
-    int flagIndex = 0;
-    while (flags)
-    {
-        if ((flags & 1) != 0)
-        {
-            break;
-        }
-        flags = flags >> 1;
-        ++flagIndex;
-    }
-
-    MAKE_SURE(flagIndex < sizeof(g_highlightModes) / sizeof(g_highlightModes[0]), return );
-
-    const SHighlightMode& mode = g_highlightModes[flagIndex];
-    float t = GetTickCount() / 1000.0f;
-    float h = mode.m_colorHue;
-    float s = 1.0f;
-    float v = 1.0f;
-
-    color->fromHSV(h + sinf(t * g_PI2 * 5.0f) * 0.025f, s, v);
-    color->a = 1.0f;
-
-    if (mode.m_continuous)
-    {
-        *intensity = fabsf(sinf(t * g_PI2 / mode.m_period));
-    }
-    else
-    {
-        *intensity = max(0.0f, sinf(t * g_PI2 / mode.m_period));
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// CMaterialManager implementation.
-//////////////////////////////////////////////////////////////////////////
-CMaterialManager::CMaterialManager(CRegistrationContext& regCtx)
-    : m_pHighlighter(new CMaterialHighlighter)
-    , m_highlightMask(eHighlight_All)
-    , m_currentFolder("")
-    , m_joinThreads(false)
-{
-    m_bUniqGuidMap = false;
-    m_bUniqNameMap = true;
-
-    m_bEditorUiReady = false;
-    m_bSourceControlErrorReported = false;
-    m_sourceControlFunctionQueued = false;
-    m_pLevelLibrary = (CBaseLibrary*)AddLibrary("Level", true);
-
-    m_MatSender = new CMaterialSender(true);
-
-    EBusFindAssetTypeByName materialResult("Material"); //from MaterialAssetTypeInfo.cpp, case insensitive
-    AZ::AssetTypeInfoBus::BroadcastResult(materialResult, &AZ::AssetTypeInfo::GetAssetType);
-    m_materialAssetType = materialResult.GetAssetType();
-
-    EBusFindAssetTypeByName dccMaterialResult("DccMaterial"); //from MaterialAssetTypeInfo.cpp, case insensitive
-    AZ::AssetTypeInfoBus::BroadcastResult(dccMaterialResult, &AZ::AssetTypeInfo::GetAssetType);
-    m_dccMaterialAssetType = dccMaterialResult.GetAssetType();
-
-    RegisterCommands(regCtx);
-    AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
-    AzToolsFramework::AssetBrowser::AssetBrowserModelNotificationBus::Handler::BusConnect();
-    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-    AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterialManager::~CMaterialManager()
-{
-    AzToolsFramework::AssetBrowser::AssetBrowserModelNotificationBus::Handler::BusDisconnect();
-    AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-
-    delete m_pHighlighter;
-    m_pHighlighter = 0;
-
-    if (gEnv->p3DEngine)
-    {
-        gEnv->p3DEngine->GetMaterialManager()->SetListener(NULL);
-    }
-
-    if (m_MatSender)
-    {
-        delete m_MatSender;
-        m_MatSender = 0;
-    }
-
-    // Terminate thread that saves dcc materials.
-    m_joinThreads = true;
-    if (m_bEditorUiReady)
-    {
-        m_dccMaterialSaveSemaphore.release();
-        m_dccMaterialSaveThread.join();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Set3DEngine()
-{
-    if (gEnv->p3DEngine)
-    {
-        gEnv->p3DEngine->GetMaterialManager()->SetListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::ClearAll()
-{
-    SetCurrentMaterial(NULL);
-    CBaseLibraryManager::ClearAll();
-
-    m_pLevelLibrary = (CBaseLibrary*)AddLibrary("Level", true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::CreateMaterial(const QString& sMaterialName,const XmlNodeRef& node, int nMtlFlags, [[maybe_unused]] unsigned long nLoadingFlags)
-{
-    CMaterial* pMaterial = new CMaterial(sMaterialName, nMtlFlags);
-
-    if (node)
-    {
-        CBaseLibraryItem::SerializeContext serCtx(node, true);
-        serCtx.bUniqName = true;
-        pMaterial->Serialize(serCtx);
-    }
-    if (!pMaterial->IsPureChild() && !(pMaterial->GetFlags() & MTL_FLAG_UIMATERIAL))
-    {
-        RegisterItem(pMaterial);
-    }
-
-    return pMaterial;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::CreateMaterial(const char* sMaterialName,const XmlNodeRef& node, int nMtlFlags, unsigned long nLoadingFlags)
-{
-    return CreateMaterial(QString(sMaterialName), node, nMtlFlags, nLoadingFlags);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Export(XmlNodeRef& node)
-{
-    XmlNodeRef libs = node->newChild("MaterialsLibrary");
-    for (int i = 0; i < GetLibraryCount(); i++)
-    {
-        IDataBaseLibrary* pLib = GetLibrary(i);
-        // Level libraries are saved in in level.
-        XmlNodeRef libNode = libs->newChild("Library");
-
-        // Export library.
-        libNode->setAttr("Name", pLib->GetName().toUtf8().data());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMaterialManager::ExportLib(CMaterialLibrary* pLib, XmlNodeRef& libNode)
-{
-    int num = 0;
-    // Export library.
-    libNode->setAttr("Name", pLib->GetName().toUtf8().data());
-    libNode->setAttr("File", pLib->GetFilename().toUtf8().data());
-    char version[50];
-    GetIEditor()->GetFileVersion().ToString(version, AZ_ARRAY_SIZE(version));
-    libNode->setAttr("SandboxVersion", version);
-
-    // Serialize prototypes.
-    for (int j = 0; j < pLib->GetItemCount(); j++)
-    {
-        CMaterial* pMtl = (CMaterial*)pLib->GetItem(j);
-
-        // Only export real used materials.
-        if (pMtl->IsDummy() || !pMtl->IsUsed() || pMtl->IsPureChild())
-        {
-            continue;
-        }
-
-        XmlNodeRef itemNode = libNode->newChild("Material");
-        itemNode->setAttr("Name", pMtl->GetName().toUtf8().data());
-        num++;
-    }
-    return num;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SetSelectedItem(IDataBaseItem* pItem)
-{
-    m_pSelectedItem = (CBaseLibraryItem*)pItem;
-    SetCurrentMaterial((CMaterial*)pItem);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SetCurrentMaterial(CMaterial* pMtl)
-{
-    if (m_pCurrentMaterial)
-    {
-        // Changing current material. save old one.
-        if (m_pCurrentMaterial->IsModified())
-        {
-            m_pCurrentMaterial->Save();
-        }
-    }
-
-    m_pCurrentMaterial = pMtl;
-    if (m_pCurrentMaterial)
-    {
-        m_pCurrentMaterial->OnMakeCurrent();
-        m_pCurrentEngineMaterial = m_pCurrentMaterial->GetMatInfo();
-    }
-    else
-    {
-        m_pCurrentEngineMaterial = 0;
-    }
-
-    m_pSelectedItem = pMtl;
-    m_pSelectedParent = pMtl ? pMtl->GetParent() : NULL;
-
-    NotifyItemEvent(m_pCurrentMaterial, EDB_ITEM_EVENT_SELECTED);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SetCurrentFolder(const QString& folder)
-{
-    m_currentFolder = folder;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SetMarkedMaterials(const std::vector<_smart_ptr<CMaterial> >& markedMaterials)
-{
-    m_markedMaterials = markedMaterials;
-}
-
-void CMaterialManager::OnLoadShader(CMaterial* pMaterial)
-{
-    RemoveFromHighlighting(pMaterial, eHighlight_All);
-    AddForHighlighting(pMaterial);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::GetCurrentMaterial() const
-{
-    return m_pCurrentMaterial;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseLibraryItem* CMaterialManager::MakeNewItem()
-{
-    CMaterial* pMaterial = new CMaterial("", 0);
-    return pMaterial;
-}
-//////////////////////////////////////////////////////////////////////////
-CBaseLibrary* CMaterialManager::MakeNewLibrary()
-{
-    return new CMaterialLibrary(this);
-}
-//////////////////////////////////////////////////////////////////////////
-QString CMaterialManager::GetRootNodeName()
-{
-    return "MaterialsLibs";
-}
-//////////////////////////////////////////////////////////////////////////
-QString CMaterialManager::GetLibsPath()
-{
-    if (m_libsPath.isEmpty())
-    {
-        m_libsPath = MATERIALS_LIBS_PATH;
-    }
-    return m_libsPath;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::ReportDuplicateItem(CBaseLibraryItem* pItem, CBaseLibraryItem* pOldItem)
-{
-    QString sLibName;
-    if (pOldItem->GetLibrary())
-    {
-        sLibName = pOldItem->GetLibrary()->GetName();
-    }
-    CErrorRecord err;
-    err.pItem = (CMaterial*)pOldItem;
-    err.error = QObject::tr("Material %1 with the duplicate name to the loaded material %2 ignored").arg(pItem->GetName(), pOldItem->GetName());
-    GetIEditor()->GetErrorReport()->ReportError(err);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Serialize([[maybe_unused]] XmlNodeRef& node, bool bLoading)
-{
-    //CBaseLibraryManager::Serialize( node,bLoading );
-    if (bLoading)
-    {
-    }
-    else
-    {
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    CBaseLibraryManager::OnEditorNotifyEvent(event);
-    switch (event)
-    {
-    case eNotify_OnInit:
-        InitMatSender();
-        break;
-    case eNotify_OnIdleUpdate:
-        m_pHighlighter->Update();
-        break;
-    case eNotify_OnBeginGameMode:
-        m_pHighlighter->RestoreMaterials();
-        break;
-    case eNotify_OnEndGameMode:
-        ReloadDirtyMaterials();
-        break;
-    case eNotify_OnBeginNewScene:
-        SetCurrentMaterial(0);
-        break;
-    case eNotify_OnBeginSceneOpen:
-        SetCurrentMaterial(0);
-        break;
-    case eNotify_OnMissionChange:
-        SetCurrentMaterial(0);
-        break;
-    case eNotify_OnCloseScene:
-        SetCurrentMaterial(0);
-        m_pHighlighter->ClearMaterials();
-        break;
-    case eNotify_OnQuit:
-        SetCurrentMaterial(0);
-        if (gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->GetMaterialManager()->SetListener(NULL);
-        }
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::ReloadDirtyMaterials()
-{
-    if (!GetIEditor()->Get3DEngine())
-    {
-        return;
-    }
-
-    IMaterialManager* runtimeMaterialManager = GetIEditor()->Get3DEngine()->GetMaterialManager();
-
-    uint32 mtlCount = 0;
-
-    runtimeMaterialManager->GetLoadedMaterials(NULL, mtlCount);
-
-    if (mtlCount > 0)
-    {
-        AZStd::vector<_smart_ptr<IMaterial>> allMaterials;
-
-        allMaterials.reserve(mtlCount);
-
-        [[maybe_unused]] uint32 mtlCountPrev = mtlCount;
-        runtimeMaterialManager->GetLoadedMaterials(&allMaterials, mtlCount);
-        AZ_Assert(mtlCountPrev == mtlCount && mtlCount == allMaterials.size(), "It appears GetLoadedMaterials was not used correctly.");
-
-        for (size_t i = 0; i < mtlCount; ++i)
-        {
-            _smart_ptr<IMaterial> pMtl = allMaterials[i];
-            if (pMtl && pMtl->IsDirty())
-            {
-                runtimeMaterialManager->ReloadMaterial(pMtl);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::LoadMaterial(const QString& sMaterialName, bool bMakeIfNotFound)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    QString sMaterialNameClear = UnifyMaterialName(sMaterialName);
-    QString fullSourcePath = MaterialToFilename(sMaterialNameClear);
-    QString relativePath = PathUtil::ReplaceExtension(sMaterialNameClear.toUtf8().data(), MATERIAL_FILE_EXT).c_str();
-
-    return LoadMaterialInternal(sMaterialNameClear, fullSourcePath, relativePath, bMakeIfNotFound);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CMaterialManager::LoadXmlNode(const QString &fullSourcePath, const QString &relativeFilePath)
-{
-    XmlNodeRef materialNode = GetISystem()->LoadXmlFromFile(fullSourcePath.toUtf8().data());
-    if (!materialNode)
-    {
-        // try again with the product file in case its present
-        materialNode = GetISystem()->LoadXmlFromFile(relativeFilePath.toUtf8().data());
-    }
-    return materialNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::LoadMaterialWithFullSourcePath(const QString& relativeFilePath, const QString& fullSourcePath, bool makeIfNotFound /*= true*/)
-{
-    QString materialNameClear = UnifyMaterialName(relativeFilePath);
-    return LoadMaterialInternal(materialNameClear, fullSourcePath, relativeFilePath, makeIfNotFound);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::LoadMaterialInternal(const QString &materialNameClear, const QString &fullSourcePath, const QString &relativeFilePath, bool makeIfNotFound)
-{
-    // Note:  We are loading from source files here, not from compiled assets, so there is no need to query the asset system for compilation status, etc.
-
-    // Load material with this name if not yet loaded.
-    CMaterial* pMaterial = (CMaterial*)FindItemByName(materialNameClear);
-    if (pMaterial)
-    {
-        // If this is a dummy material that was created before for not found mtl file
-        // try reload the mtl file again to get valid material data.
-        if (pMaterial->IsDummy())
-        {
-            XmlNodeRef mtlNode = GetISystem()->LoadXmlFromFile(fullSourcePath.toUtf8().data());
-            if (mtlNode)
-            {
-                DeleteMaterial(pMaterial);
-                pMaterial = CreateMaterial(materialNameClear, mtlNode);
-            }
-        }
-        return pMaterial;
-    }
-
-    XmlNodeRef mtlNode = LoadXmlNode(fullSourcePath, relativeFilePath);
-
-    if (mtlNode)
-    {
-        pMaterial = CreateMaterial(materialNameClear, mtlNode);
-    }
-    else
-    {
-        if (makeIfNotFound)
-        {
-            pMaterial = new CMaterial(materialNameClear);
-            pMaterial->SetDummy(true);
-            RegisterItem(pMaterial);
-
-            CErrorRecord err;
-            err.error = QObject::tr("Material %1 not found").arg(materialNameClear);
-            GetIEditor()->GetErrorReport()->ReportError(err);
-        }
-    }
-
-    return pMaterial;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::LoadMaterial(const char* sMaterialName, bool bMakeIfNotFound)
-{
-    return LoadMaterial(QString(sMaterialName), bMakeIfNotFound);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::AddSourceFileOpeners(const char* fullSourceFileName, [[maybe_unused]] const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers)
-{
-    using namespace AzToolsFramework;
-    using namespace AzToolsFramework::AssetBrowser;
-
-    // disable if other project is active
-    if (AzFramework::Render::RenderSystemRequestBus::HasHandlers())
-    {
-        return;
-    }
-
-    if (AZStd::wildcard_match("*.mtl", fullSourceFileName))
-    {
-        // we can handle these!
-        auto materialCallback = [this](const char* fullSourceFileNameInCall, const AZ::Uuid& sourceUUIDInCall)
-        {
-            const SourceAssetBrowserEntry* fullDetails = SourceAssetBrowserEntry::GetSourceByUuid(sourceUUIDInCall);
-            if (fullDetails)
-            {
-                CMaterial* materialFile = LoadMaterialWithFullSourcePath(QString::fromUtf8(fullDetails->GetRelativePath().c_str()), QString::fromUtf8(fullSourceFileNameInCall), false);
-                if (materialFile)
-                {
-                    OpenViewPane("Material Editor");
-                    SetCurrentMaterial(materialFile); // the material browser pane should be able to deal with this.
-                }
-            }
-        };
-
-        openers.push_back({ "O3DE_MaterialEditor", "Open In Material Editor...", QIcon(), materialCallback });
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static bool MaterialRequiresSurfaceType(CMaterial* pMaterial)
-{
-    // Do not enforce Surface Type...
-
-    // ...over editor UI materials
-    if ((pMaterial->GetFlags() & MTL_FLAG_UIMATERIAL) != 0)
-    {
-        return false;
-    }
-
-    // ...over SKY
-    if (pMaterial->GetShaderName() == "DistanceCloud" ||
-        pMaterial->GetShaderName() == "Sky" ||
-        pMaterial->GetShaderName() == "SkyHDR")
-    {
-        return false;
-    }
-    // ...over terrain materials
-    if (pMaterial->GetShaderName() == "Terrain.Layer")
-    {
-        return false;
-    }
-    // ...over vegetation
-    if (pMaterial->GetShaderName() == "Vegetation")
-    {
-        return false;
-    }
-
-    // ...over decals
-    bool requiresSurfaceType = true;
-    CVarBlock* pShaderGenParams = pMaterial->GetShaderGenParamsVars();
-    if (pShaderGenParams)
-    {
-        if (IVariable* pVar = pShaderGenParams->FindVariable("Decal"))
-        {
-            int value = 0;
-            pVar->Get(value);
-            if (value)
-            {
-                requiresSurfaceType = false;
-            }
-        }
-        // The function GetShaderGenParamsVars allocates a new CVarBlock object, so let's clean it up here
-        delete pShaderGenParams;
-    }
-    return requiresSurfaceType;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CMaterialManager::GetHighlightFlags(CMaterial* pMaterial) const
-{
-    if (pMaterial == NULL)
-    {
-        return 0;
-    }
-
-    if ((pMaterial->GetFlags() & MTL_FLAG_NODRAW) != 0)
-    {
-        return 0;
-    }
-
-    int result = 0;
-
-    if (pMaterial == m_pHighlightMaterial)
-    {
-        result |= eHighlight_Pick;
-    }
-
-    const QString& surfaceTypeName = pMaterial->GetSurfaceTypeName();
-    if (surfaceTypeName.isEmpty() && MaterialRequiresSurfaceType(pMaterial))
-    {
-        result |= eHighlight_NoSurfaceType;
-    }
-
-    if (GetIEditor()->Get3DEngine())
-    {
-        if (ISurfaceTypeManager* pSurfaceManager = GetIEditor()->Get3DEngine()->GetMaterialManager()->GetSurfaceTypeManager())
-        {
-            const ISurfaceType* pSurfaceType = pSurfaceManager->GetSurfaceTypeByName(surfaceTypeName.toUtf8().data());
-            if (pSurfaceType && pSurfaceType->GetBreakability() != 0)
-            {
-                result |= eHighlight_Breakable;
-            }
-        }
-    }
-
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::AddForHighlighting(CMaterial* pMaterial)
-{
-    if (pMaterial == NULL)
-    {
-        return;
-    }
-
-    int highlightFlags = (GetHighlightFlags(pMaterial) & m_highlightMask);
-    if (highlightFlags != 0)
-    {
-        m_pHighlighter->Start(pMaterial, highlightFlags);
-    }
-
-    int count = pMaterial->GetSubMaterialCount();
-    for (int i = 0; i < count; ++i)
-    {
-        CMaterial* pChild = pMaterial->GetSubMaterial(i);
-        if (!pChild)
-        {
-            continue;
-        }
-
-        AddForHighlighting(pChild);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::RemoveFromHighlighting(CMaterial* pMaterial, int mask)
-{
-    if (pMaterial == NULL)
-    {
-        return;
-    }
-
-    m_pHighlighter->Stop(pMaterial, mask);
-
-    int count = pMaterial->GetSubMaterialCount();
-    for (int i = 0; i < count; ++i)
-    {
-        CMaterial* pChild = pMaterial->GetSubMaterial(i);
-        if (!pChild)
-        {
-            continue;
-        }
-
-        RemoveFromHighlighting(pChild, mask);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::UpdateHighlightedMaterials()
-{
-    IDataBaseItemEnumerator* pEnum = CBaseLibraryManager::GetItemEnumerator();
-    if (!pEnum)
-    {
-        return;
-    }
-
-    CMaterial* pMaterial = (CMaterial*)pEnum->GetFirst();
-    while (pMaterial)
-    {
-        RemoveFromHighlighting(pMaterial, eHighlight_All);
-        AddForHighlighting(pMaterial);
-        pMaterial =  (CMaterial*)pEnum->GetNext();
-    }
-
-    pEnum->Release();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::OnRequestMaterial(_smart_ptr<IMaterial> pMatInfo)
-{
-    const char* pcName = pMatInfo->GetName();
-    CMaterial* pMaterial = (CMaterial*) pMatInfo->GetUserData();
-
-    if (!pMaterial && pcName && *pcName)
-    {
-        pMaterial = LoadMaterial(pcName, false);
-    }
-
-    if (pMaterial)
-    {
-        _smart_ptr<IMaterial> pNewMatInfo = pMaterial->GetMatInfo(true);
-        assert(pNewMatInfo == pMatInfo);
-        //Only register if the material is not registered
-        if (!pMaterial->IsRegistered())
-        {
-            RegisterItem(pMaterial);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::OnCreateMaterial(_smart_ptr<IMaterial> pMatInfo)
-{
-    CMaterial* existingMaterial = static_cast<CMaterial*>(FindItemByName(UnifyMaterialName(pMatInfo->GetName())));
-    bool materialAlreadyExists = existingMaterial != nullptr;
-
-    // If its not a sub-material or a UI material
-    if (!(pMatInfo->GetFlags() & MTL_FLAG_PURE_CHILD) && !(pMatInfo->GetFlags() & MTL_FLAG_UIMATERIAL))
-    {
-        // Create a new editor material if it doesn't exist
-        if (!materialAlreadyExists)
-        {
-            CMaterial* pMaterial = new CMaterial(pMatInfo->GetName());
-            pMaterial->SetFromMatInfo(pMatInfo);
-            RegisterItem(pMaterial);
-
-            AddForHighlighting(pMaterial);
-        }
-        else
-        {
-            // If the material already exists, re-set its values from the engine material that was just re-loaded
-            existingMaterial->SetFromMatInfo(pMatInfo);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::OnDeleteMaterial(_smart_ptr<IMaterial> pMaterial)
-{
-    CMaterial* pMtl = (CMaterial*)pMaterial->GetUserData();
-    if (pMtl)
-    {
-        RemoveFromHighlighting(pMtl, eHighlight_All);
-        DeleteMaterial(pMtl);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterialManager::IsCurrentMaterial(_smart_ptr<IMaterial> pMaterial) const
-{
-    if (!pMaterial)
-    {
-        return false;
-    }
-
-    CMaterial* pMtl = static_cast<CMaterial*>(pMaterial->GetUserData());
-    bool currentMaterial = (pMtl == m_pCurrentMaterial);
-
-    if (pMtl->GetParent())
-    {
-        currentMaterial |= (pMtl->GetParent() == m_pCurrentMaterial);
-    }
-
-    for (size_t subMatIdx = 0; subMatIdx < pMtl->GetMatInfo()->GetSubMtlCount(); ++subMatIdx)
-    {
-        if (static_cast<CMaterial*>(pMtl->GetMatInfo()->GetSubMtl(subMatIdx)->GetUserData()) == m_pCurrentMaterial)
-        {
-            currentMaterial = true;
-            break;
-        }
-    }
-
-    return currentMaterial;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::FromIMaterial(_smart_ptr<IMaterial> engineMaterial)
-{
-    if (!engineMaterial)
-    {
-        return nullptr;
-    }
-    CMaterial* editorMaterial = (CMaterial*)engineMaterial->GetUserData();
-    if (!editorMaterial)
-    {
-        // If the user data isn't set, check for an existing material with the same name
-        editorMaterial = static_cast<CMaterial*>(FindItemByName(UnifyMaterialName(engineMaterial->GetName())));
-    }
-    return editorMaterial;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SaveAllLibs()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CMaterialManager::FilenameToMaterial(const QString& filename)
-{
-    // Convert a full or relative path to a normalized name that can be used in a hash (so lowercase, relative path, correct slashes, remove extension)
-    // note that it may already be an asset path, if so, don't add the overhead of calling into the AP and convert it.
-    // if it starts with an alias (@) or if its an absolute file path, we need to convert it.  Otherwise we really don't...
-    QString name = filename;
-    if (name.startsWith(QChar('@')) || AZ::IO::PathView(name.toUtf8().data()).IsAbsolute())
-    {
-        name = Path::FullPathToGamePath(filename); // convert any full path to a relative path instead.
-    }
-    QByteArray n = name.toUtf8();
-    MaterialUtils::UnifyMaterialName(n.data());  // Utility function used by all other parts of the code to unify slashes, lowercase, and remove extension
-
-    return QString::fromUtf8(n);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CMaterialManager::MaterialToFilename(const QString& sMaterialName)
-{
-    QString materialWithExtension = Path::ReplaceExtension(sMaterialName, MATERIAL_FILE_EXT);
-    QString fileName = Path::GamePathToFullPath(materialWithExtension);
-    const int mtlExtensionLength = strlen(MATERIAL_FILE_EXT);
-    if (fileName.right(mtlExtensionLength).toLower() != MATERIAL_FILE_EXT)
-    {
-        // we got something back which is not a mtl, fall back heuristic:
-        AZStd::string pathName(fileName.toUtf8().data());
-        AZStd::string fileNameOfMaterial;
-        AzFramework::StringFunc::Path::StripFullName(pathName); // remove the filename of the path to the FBX file so now it just contains the folder of the fbx file.
-        AzFramework::StringFunc::Path::GetFullFileName(materialWithExtension.toUtf8().data(), fileNameOfMaterial); // remove the path part of the material so it only contains the file name
-        AZStd::string finalName;
-        AzFramework::StringFunc::Path::Join(pathName.c_str(), fileNameOfMaterial.c_str(), finalName);
-        fileName = finalName.c_str();
-    }
-    return fileName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const AZ::Data::AssetType& CMaterialManager::GetMaterialAssetType()
-{
-    return m_materialAssetType;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::DeleteMaterial(CMaterial* pMtl)
-{
-    assert(pMtl);
-    _smart_ptr<CMaterial> _ref(pMtl);
-    if (pMtl == GetCurrentMaterial())
-    {
-        SetCurrentMaterial(NULL);
-    }
-
-    DeleteItem(pMtl);
-
-    // Delete it from all sub materials.
-    for (int i = 0; i < m_pLevelLibrary->GetItemCount(); i++)
-    {
-        CMaterial* pMultiMtl = (CMaterial*)m_pLevelLibrary->GetItem(i);
-        if (pMultiMtl->IsMultiSubMaterial())
-        {
-            for (int slot = 0; slot < pMultiMtl->GetSubMaterialCount(); slot++)
-            {
-                if (pMultiMtl->GetSubMaterial(slot) == pMultiMtl)
-                {
-                    // Clear this sub material slot.
-                    pMultiMtl->SetSubMaterial(slot, 0);
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::RemoveMaterialFromDisk(const char * fileName)
-{
-    using namespace AzToolsFramework;
-    if (fileName)
-    {
-        SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestDelete, fileName,
-            [](bool success, const SourceControlFileInfo& info)
-        {
-            //If the file is not managed by source control, delete it locally
-            if (!success && !info.IsManaged())
-            {
-                QFile::remove(info.m_filePath.c_str());
-            }
-        }
-        );
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::RegisterCommands(CRegistrationContext& regCtx)
-{
-    CommandManagerHelper::RegisterCommand(regCtx.pCommandManager, "material", "duplicate", "", "", AZStd::bind(&CMaterialManager::Command_Duplicate, this));
-    CommandManagerHelper::RegisterCommand(regCtx.pCommandManager, "material", "merge", "", "", AZStd::bind(&CMaterialManager::Command_Merge, this));
-    CommandManagerHelper::RegisterCommand(regCtx.pCommandManager, "material", "delete", "", "", AZStd::bind(&CMaterialManager::Command_Delete, this));
-    CommandManagerHelper::RegisterCommand(regCtx.pCommandManager, "material", "assign_to_selection", "", "", AZStd::bind(&CMaterialManager::Command_AssignToSelection, this));
-    CommandManagerHelper::RegisterCommand(regCtx.pCommandManager, "material", "select_assigned_objects", "", "", AZStd::bind(&CMaterialManager::Command_SelectAssignedObjects, this));
-    CommandManagerHelper::RegisterCommand(regCtx.pCommandManager, "material", "select_from_object", "", "", AZStd::bind(&CMaterialManager::Command_SelectFromObject, this));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterialManager::SelectSaveMaterial(QString& itemName, QString& fullSourcePath, const char* defaultStartPath)
-{
-    QString startPath;
-    if (defaultStartPath && defaultStartPath[0] != '\0')
-    {
-        startPath = defaultStartPath;
-    }
-    else
-    {
-        startPath = GetIEditor()->GetSearchPath(EDITOR_PATH_MATERIALS);
-    }
-
-    if (!CFileUtil::SelectSaveFile("Material Files (*.mtl)", "mtl", startPath, fullSourcePath))
-    {
-        return false;
-    }
-
-    itemName = FilenameToMaterial(fullSourcePath);
-    if (itemName.isEmpty())
-    {
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::SelectNewMaterial(int nMtlFlags, [[maybe_unused]] const char* sStartPath)
-{
-    QString path = m_pCurrentMaterial ? Path::GetPath(m_pCurrentMaterial->GetFilename()) : m_currentFolder;
-    QString itemName;
-    QString fullPath;
-    if (!SelectSaveMaterial(itemName, fullPath, path.toUtf8().data()))
-    {
-        return 0;
-    }
-
-    if (FindItemByName(itemName))
-    {
-        Warning("Material with name %s already exist", itemName.toUtf8().data());
-        return 0;
-    }
-
-    _smart_ptr<CMaterial> mtl = CreateMaterial(itemName, XmlNodeRef(), nMtlFlags);
-    mtl->Update();
-    bool skipReadOnly = true;
-    mtl->Save(skipReadOnly, fullPath);
-    SetCurrentMaterial(mtl);
-    return mtl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_Create()
-{
-    SelectNewMaterial(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_CreateMulti()
-{
-    SelectNewMaterial(MTL_FLAG_MULTI_SUBMTL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_ConvertToMulti()
-{
-    CMaterial* pMaterial = GetCurrentMaterial();
-
-    if (pMaterial && pMaterial->GetSubMaterialCount() == 0)
-    {
-        CMaterial* pSubMat = new CMaterial(*pMaterial);
-        pSubMat->SetName(pSubMat->GetShortName());
-        pSubMat->SetFlags(pSubMat->GetFlags() | MTL_FLAG_PURE_CHILD);
-
-        pMaterial->SetFlags(MTL_FLAG_MULTI_SUBMTL);
-        pMaterial->SetSubMaterialCount(1);
-        pMaterial->SetSubMaterial(0, pSubMat);
-
-        pMaterial->Save();
-        pMaterial->Reload();
-        SetSelectedItem(pSubMat);
-    }
-    else
-    {
-        Warning(pMaterial ? "azlmbr.legacy.material.convert_to_multi called on invalid material setup" : "azlmbr.legacy.material.convert_to_multi called while no material selected");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_Duplicate()
-{
-    CMaterial* pSrcMtl = GetCurrentMaterial();
-
-    if (!pSrcMtl)
-    {
-        CErrorRecord err;
-        err.error = "azlmbr.legacy.material.duplicate called while no materials selected";
-        GetIEditor()->GetErrorReport()->ReportError(err);
-        return;
-    }
-
-    if (GetIEditor()->IsSourceControlAvailable())
-    {
-        uint32 attrib = pSrcMtl->GetFileAttributes();
-
-        if ((attrib & SCC_FILE_ATTRIBUTE_INPAK) &&  (attrib & SCC_FILE_ATTRIBUTE_MANAGED) && !(attrib & SCC_FILE_ATTRIBUTE_NORMAL))
-        {
-            // Get latest for making folders with right case
-            CFileUtil::GetLatestFromSourceControl(pSrcMtl->GetFilename().toUtf8().data());
-        }
-    }
-
-    if (pSrcMtl != 0 && !pSrcMtl->IsPureChild())
-    {
-        QString newUniqueRelativePath = MakeUniqueItemName(pSrcMtl->GetName());
-
-        // Create a new material.
-        _smart_ptr<CMaterial> pMtl = DuplicateMaterial(newUniqueRelativePath.toUtf8().data(), pSrcMtl);
-        if (pMtl)
-        {
-            // Get the new filename from the relative path
-            AZStd::string newFileName;
-            AzFramework::StringFunc::Path::GetFileName(newUniqueRelativePath.toUtf8().data(), newFileName);
-
-            // Get the full path to the original material, so we know which folder to put the new material in
-            AZStd::string newFullFilePath = pSrcMtl->GetFilename().toUtf8().data();
-
-            // Replace the original material filename with the filename from the new relative path + the material file extension to get the new full file path
-            AzFramework::StringFunc::Path::ReplaceFullName(newFullFilePath, newFileName.c_str(), MATERIAL_FILE_EXT);
-
-            AzFramework::StringFunc::Path::Normalize(newFullFilePath);
-
-            const bool skipReadOnly = true;
-            pMtl->Save(skipReadOnly, newFullFilePath.c_str());
-            SetSelectedItem(pMtl);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CMaterialManager::DuplicateMaterial(const char* newName, CMaterial* pOriginal)
-{
-    if (!newName)
-    {
-        assert(0 && "NULL newName passed into CMaterialManager::DuplicateMaterial");
-        return 0;
-    }
-    if (!pOriginal)
-    {
-        assert(0 && "NULL pOriginal passed into CMaterialManager::DuplicateMaterial");
-        return 0;
-    }
-
-
-    XmlNodeRef node = GetISystem()->CreateXmlNode("Material");
-    CBaseLibraryItem::SerializeContext ctx(node, false);
-    ctx.bCopyPaste = true;
-    pOriginal->Serialize(ctx);
-
-    return CreateMaterial(newName, node, pOriginal->GetFlags());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::GenerateUniqueSubmaterialName(const CMaterial* pSourceMaterial, const CMaterial* pTargetMaterial, QString& uniqueSubmaterialName) const
-{
-    QString sourceMaterialName = pSourceMaterial->GetName();
-
-    // We don't need the whole path to the material, just the base name
-    QFileInfo filename(sourceMaterialName);
-    sourceMaterialName = filename.baseName();
-
-    uniqueSubmaterialName = sourceMaterialName;
-    size_t nameIndex = 0;
-
-    bool nameUpdated = true;
-    while (nameUpdated)
-    {
-        nameUpdated = false;
-        for (size_t k = 0; k < pTargetMaterial->GetSubMaterialCount(); ++k)
-        {
-            CMaterial* pSubMaterial = pTargetMaterial->GetSubMaterial(k);
-            if (pSubMaterial && pSubMaterial->GetName() == uniqueSubmaterialName)
-            {
-                ++nameIndex;
-                uniqueSubmaterialName = QStringLiteral("%1%2").arg(sourceMaterialName).arg(nameIndex, 2, 10, QLatin1Char('0'));
-                nameUpdated = true;
-                break;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMaterialManager::DuplicateAsSubMaterialAtIndex(CMaterial* pSourceMaterial, CMaterial* pTargetMaterial, int subMaterialIndex)
-{
-    if (pSourceMaterial && pTargetMaterial && pTargetMaterial->GetSubMaterialCount() > subMaterialIndex)
-    {
-        // Resolve name collisions between the source material and the submaterials in the target material
-        QString newSubMaterialName;
-        GenerateUniqueSubmaterialName(pSourceMaterial, pTargetMaterial, newSubMaterialName);
-
-        // Mark the material to be duplicated as a PURE_CHILD since it is being duplicated as a submaterial
-        int sourceMaterialFlags = pSourceMaterial->GetFlags();
-        pSourceMaterial->SetFlags(sourceMaterialFlags | MTL_FLAG_PURE_CHILD);
-
-        CMaterial* pNewSubMaterial = DuplicateMaterial(newSubMaterialName.toUtf8().data(), pSourceMaterial);
-        pTargetMaterial->SetSubMaterial(subMaterialIndex, pNewSubMaterial);
-
-        // Reset the flags of the source material to their original values
-        pSourceMaterial->SetFlags(sourceMaterialFlags);
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_Merge()
-{
-    QString itemName;
-    QString fullPath;
-    QString defaultMaterialPath;
-    if (m_pCurrentMaterial)
-    {
-        defaultMaterialPath = Path::GetPath(m_pCurrentMaterial->GetFilename());
-    }
-    if (!SelectSaveMaterial(itemName, fullPath, defaultMaterialPath.toUtf8().data()))
-    {
-        return;
-    }
-
-    _smart_ptr<CMaterial> pNewMaterial = CreateMaterial(itemName, XmlNodeRef(), MTL_FLAG_MULTI_SUBMTL);
-
-    size_t totalSubMaterialCount = 0;
-    for (_smart_ptr<CMaterial> pMaterial : m_markedMaterials)
-    {
-        if (pMaterial->IsMultiSubMaterial())
-        {
-            totalSubMaterialCount += pMaterial->GetSubMaterialCount();
-        }
-        else
-        {
-            totalSubMaterialCount++;
-        }
-    }
-    pNewMaterial->SetSubMaterialCount(totalSubMaterialCount);
-
-    size_t subMaterialIndex = 0;
-    for (_smart_ptr<CMaterial> pMaterial : m_markedMaterials)
-    {
-        if (pMaterial->IsMultiSubMaterial())
-        {
-            // Loop through each submaterial and duplicate it as a submaterial in the new material
-            for (size_t j = 0; j < pMaterial->GetSubMaterialCount(); ++j)
-            {
-                CMaterial* pSubMaterial = pMaterial->GetSubMaterial(j);
-                if (DuplicateAsSubMaterialAtIndex(pSubMaterial, pNewMaterial, subMaterialIndex))
-                {
-                    ++subMaterialIndex;
-                }
-            }
-        }
-        else
-        {
-            // Duplicate the material as a submaterial in the new material
-            if (DuplicateAsSubMaterialAtIndex(pMaterial, pNewMaterial, subMaterialIndex))
-            {
-                ++subMaterialIndex;
-            }
-        }
-    }
-
-    pNewMaterial->Update();
-    const bool skipReadOnly = true;
-    pNewMaterial->Save(skipReadOnly, fullPath);
-    SetCurrentMaterial(pNewMaterial);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_Delete()
-{
-    CMaterial* pMtl = GetCurrentMaterial();
-    if (pMtl)
-    {
-        CUndo undo("Delete Material");
-        QString str = QObject::tr("Delete Material %1?\r\nNote: Material file %2 will also be deleted.")
-            .arg(pMtl->GetName(), pMtl->GetFilename());
-        if (QMessageBox::question(QApplication::activeWindow(), QObject::tr("Delete Confirmation"), str) == QMessageBox::Yes)
-        {
-            AZStd::string matName = pMtl->GetFilename().toUtf8().data();
-            DeleteMaterial(pMtl);
-            RemoveMaterialFromDisk(matName.c_str());
-            SetCurrentMaterial(0);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_AssignToSelection()
-{
-    CMaterial* pMtl = GetCurrentMaterial();
-    if (pMtl)
-    {
-        CUndo undo("Assign Material");
-        CSelectionGroup* pSel = GetIEditor()->GetSelection();
-        if (pMtl->IsPureChild())
-        {
-            const QString title = QObject::tr("Assign Submaterial");
-            const QString message = QObject::tr("You can assign submaterials to objects only for preview purpose. This assignment will not be saved with the level and will not be exported to the game.");
-            if (QMessageBox::information(QApplication::activeWindow(), title, message, QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel)
-            {
-                return;
-            }
-        }
-        if (!pSel->IsEmpty())
-        {
-            for (int i = 0; i < pSel->GetCount(); i++)
-            {
-                pSel->GetObject(i)->SetMaterial(pMtl);
-            }
-        }
-    }
-    CViewport* pViewport = GetIEditor()->GetActiveView();
-    if (pViewport)
-    {
-        pViewport->Drop(QPoint(-1, -1), pMtl);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_ResetSelection()
-{
-    CSelectionGroup* pSel = GetIEditor()->GetSelection();
-    if (!pSel->IsEmpty())
-    {
-        CUndo undo("Reset Material");
-        for (int i = 0; i < pSel->GetCount(); i++)
-        {
-            pSel->GetObject(i)->SetMaterial(0);
-        }
-    }
-    CViewport* pViewport = GetIEditor()->GetActiveView();
-    if (pViewport)
-    {
-        pViewport->Drop(QPoint(-1, -1), 0);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_SelectAssignedObjects()
-{
-    CMaterial* pMtl = GetCurrentMaterial();
-    if (pMtl)
-    {
-        CUndo undo("Select Object(s)");
-        CBaseObjectsArray objects;
-        GetIEditor()->GetObjectManager()->GetObjects(objects);
-        for (int i = 0; i < objects.size(); i++)
-        {
-            CBaseObject* pObject = objects[i];
-            if (pObject->GetMaterial() == pMtl || pObject->GetRenderMaterial() == pMtl)
-            {
-                if (pObject->IsHidden() || pObject->IsFrozen())
-                {
-                    continue;
-                }
-                GetIEditor()->GetObjectManager()->SelectObject(pObject);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::Command_SelectFromObject()
-{
-    if (GetIEditor()->IsInPreviewMode())
-    {
-        CViewport* pViewport = GetIEditor()->GetActiveView();
-        if (CModelViewport* p = viewport_cast<CModelViewport*>(pViewport))
-        {
-            CMaterial* pMtl = p->GetMaterial();
-            SetCurrentMaterial(pMtl);
-        }
-        return;
-    }
-
-    CSelectionGroup* pSel = GetIEditor()->GetSelection();
-    if (pSel->IsEmpty())
-    {
-        return;
-    }
-
-    for (int i = 0; i < pSel->GetCount(); i++)
-    {
-        CMaterial* pMtl = pSel->GetObject(i)->GetRenderMaterial();
-        if (pMtl)
-        {
-            SetCurrentMaterial(pMtl);
-            return;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::PickPreviewMaterial()
-{
-    XmlNodeRef data = XmlHelpers::CreateXmlNode("ExportMaterial");
-    CMaterial* pMtl = GetCurrentMaterial();
-    if (!pMtl)
-    {
-        return;
-    }
-
-    if (pMtl->IsPureChild() && pMtl->GetParent())
-    {
-        pMtl = pMtl->GetParent();
-    }
-
-    if (pMtl->GetFlags() & MTL_FLAG_WIRE)
-    {
-        data->setAttr("Flag_Wire", 1);
-    }
-    if (pMtl->GetFlags() & MTL_FLAG_2SIDED)
-    {
-        data->setAttr("Flag_2Sided", 1);
-    }
-
-    data->setAttr("Name", pMtl->GetName().toUtf8().data());
-    data->setAttr("FileName", pMtl->GetFilename().toUtf8().data());
-
-    XmlNodeRef node = data->newChild("Material");
-
-    CBaseLibraryItem::SerializeContext serCtx(node, false);
-    pMtl->Serialize(serCtx);
-
-
-    if (!pMtl->IsMultiSubMaterial())
-    {
-        XmlNodeRef texturesNode = node->findChild("Textures");
-        if (texturesNode)
-        {
-            for (int i = 0; i < texturesNode->getChildCount(); i++)
-            {
-                XmlNodeRef texNode = texturesNode->getChild(i);
-                QString file;
-                if (texNode->getAttr("File", file))
-                {
-                    texNode->setAttr("File", Path::GamePathToFullPath(file).toUtf8().data());
-                }
-            }
-        }
-    }
-    else
-    {
-        XmlNodeRef childsNode = node->findChild("SubMaterials");
-        if (childsNode)
-        {
-            int nSubMtls = childsNode->getChildCount();
-            for (int i = 0; i < nSubMtls; i++)
-            {
-                XmlNodeRef node2 = childsNode->getChild(i);
-                XmlNodeRef texturesNode = node2->findChild("Textures");
-                if (texturesNode)
-                {
-                    for (int ii = 0; ii < texturesNode->getChildCount(); ii++)
-                    {
-                        XmlNodeRef texNode = texturesNode->getChild(ii);
-                        QString file;
-                        if (texNode->getAttr("File", file))
-                        {
-                            texNode->setAttr("File", Path::GamePathToFullPath(file).toUtf8().data());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    m_MatSender->SendMessage(eMSM_GetSelectedMaterial, data);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SyncMaterialEditor()
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    if (!m_MatSender)
-    {
-        return;
-    }
-
-    if (!m_MatSender->GetMessage())
-    {
-        return;
-    }
-
-    if (m_MatSender->m_h.msg == eMSM_Create)
-    {
-        XmlNodeRef node = m_MatSender->m_node->findChild("Material");
-        if (!node)
-        {
-            return;
-        }
-
-        QString sMtlName;
-        QString sMaxFile;
-
-        XmlNodeRef root = m_MatSender->m_node;
-        root->getAttr("Name", sMtlName);
-        root->getAttr("MaxFile", sMaxFile);
-
-        int IsMulti = 0;
-        root->getAttr("IsMulti", IsMulti);
-
-        int nMtlFlags = 0;
-        if (IsMulti)
-        {
-            nMtlFlags |= MTL_FLAG_MULTI_SUBMTL;
-        }
-
-        if (root->haveAttr("Flag_Wire"))
-        {
-            nMtlFlags |= MTL_FLAG_WIRE;
-        }
-        if (root->haveAttr("Flag_2Sided"))
-        {
-            nMtlFlags |= MTL_FLAG_2SIDED;
-        }
-
-        _smart_ptr<CMaterial> pMtl = SelectNewMaterial(nMtlFlags, Path::GetPath(sMaxFile).toUtf8().data());
-
-        if (!pMtl)
-        {
-            return;
-        }
-
-        if (!IsMulti)
-        {
-            node->delAttr("Shader");   // Remove shader attribute.
-            XmlNodeRef texturesNode = node->findChild("Textures");
-            if (texturesNode)
-            {
-                for (int i = 0; i < texturesNode->getChildCount(); i++)
-                {
-                    XmlNodeRef texNode = texturesNode->getChild(i);
-                    QString file;
-                    if (texNode->getAttr("File", file))
-                    {
-                        //make path relative to the project specific game folder
-                        QString newfile = Path::MakeGamePath(file);
-                        if (!newfile.isEmpty())
-                        {
-                            file = newfile;
-                        }
-                        texNode->setAttr("File", file.toUtf8().data());
-                    }
-                }
-            }
-        }
-        else
-        {
-            XmlNodeRef childsNode = node->findChild("SubMaterials");
-            if (childsNode)
-            {
-                int nSubMtls = childsNode->getChildCount();
-                for (int i = 0; i < nSubMtls; i++)
-                {
-                    XmlNodeRef node2 = childsNode->getChild(i);
-                    node2->delAttr("Shader");   // Remove shader attribute.
-                    XmlNodeRef texturesNode = node2->findChild("Textures");
-                    if (texturesNode)
-                    {
-                        for (int ii = 0; ii < texturesNode->getChildCount(); ii++)
-                        {
-                            XmlNodeRef texNode = texturesNode->getChild(ii);
-                            QString file;
-                            if (texNode->getAttr("File", file))
-                            {
-                                //make path relative to the project specific game folder
-                                QString newfile = Path::MakeGamePath(file);
-                                if (!newfile.isEmpty())
-                                {
-                                    file = newfile;
-                                }
-                                texNode->setAttr("File", file.toUtf8().data());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        CBaseLibraryItem::SerializeContext ctx(node, true);
-        ctx.bUndo = true;
-        pMtl->Serialize(ctx);
-
-        pMtl->Update();
-
-        SetCurrentMaterial(0);
-        SetCurrentMaterial(pMtl);
-    }
-
-    if (m_MatSender->m_h.msg == eMSM_GetSelectedMaterial)
-    {
-        PickPreviewMaterial();
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::InitMatSender()
-{
-    //MatSend(true);
-    m_MatSender->Create();
-    QWidget* mainWindow = MainWindow::instance();
-    m_MatSender->SetupWindows(mainWindow, mainWindow);
-    XmlNodeRef node = XmlHelpers::CreateXmlNode("Temp");
-    m_MatSender->SendMessage(eMSM_Init, node);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::GotoMaterial(CMaterial* pMaterial)
-{
-    if (pMaterial)
-    {
-        GetIEditor()->OpenMaterialLibrary(pMaterial);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::GotoMaterial(_smart_ptr<IMaterial> pMtl)
-{
-    if (pMtl)
-    {
-        CMaterial* pEdMaterial = FromIMaterial(pMtl);
-        if (pEdMaterial)
-        {
-            GetIEditor()->OpenMaterialLibrary(pEdMaterial);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SetHighlightedMaterial(CMaterial* pMtl)
-{
-    if (m_pHighlightMaterial)
-    {
-        RemoveFromHighlighting(m_pHighlightMaterial, eHighlight_Pick);
-    }
-
-    m_pHighlightMaterial = pMtl;
-    if (m_pHighlightMaterial)
-    {
-        AddForHighlighting(m_pHighlightMaterial);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::HighlightedMaterialChanged(CMaterial* pMtl)
-{
-    if (!pMtl)
-    {
-        return;
-    }
-
-    RemoveFromHighlighting(pMtl, eHighlight_All);
-    AddForHighlighting(pMtl);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::SetHighlightMask(int highlightMask)
-{
-    if (m_highlightMask != highlightMask)
-    {
-        m_highlightMask = highlightMask;
-
-        UpdateHighlightedMaterials();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMaterialManager::GatherResources(_smart_ptr<IMaterial> pMaterial, CUsedResources& resources)
-{
-    if (!pMaterial)
-    {
-        return;
-    }
-
-    int nSubMtlCount = pMaterial->GetSubMtlCount();
-    if (nSubMtlCount > 0)
-    {
-        for (int i = 0; i < nSubMtlCount; i++)
-        {
-            GatherResources(pMaterial->GetSubMtl(i), resources);
-        }
-    }
-    else
-    {
-        SShaderItem& shItem = pMaterial->GetShaderItem();
-        if (shItem.m_pShaderResources)
-        {
-            SInputShaderResources   res;
-            shItem.m_pShaderResources->ConvertToInputResource(&res);
-
-            for (auto& iter : res.m_TexturesResourcesMap )
-            {
-                SEfResTexture* pTexture = &(iter.second);
-                if (!pTexture->m_Name.empty())
-                {
-                    resources.Add(pTexture->m_Name.c_str());
-                }
-            }
-            gEnv->pRenderer->EF_ReleaseInputShaderResource(&res);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-void CMaterialManager::GetHighlightColor(ColorF* color, float* intensity, int flags)
-{
-    MAKE_SURE(m_pHighlighter, return );
-    m_pHighlighter->GetHighlightColor(color, intensity, flags);
-}
-
-///////////////////////////////////////////////////////////////////////////
-// This will be called when the editor welcome screen is displayed.
-// At this point the editor is ready for UI events, which means we can
-// process .dccmtl paths and display error to the user if necessary
-bool CMaterialManager::SkipEditorStartupUI()
-{
-    // Editor started
-    m_bEditorUiReady = true;
-
-    // If we have any file paths buffered
-    if (m_sourceControlBuffer.size() > 0)
-    {
-        // Start queuing
-        QueueSourceControlTick();
-    }
-
-    // Launch thread responsible for saving cached
-    // .dccmtl files as source .mtl files
-    StartDccMaterialSaveThread();
-
-    // Never want to skip Startup UI
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Queues the function TickSourceControl() to be exectued next frame
-void CMaterialManager::QueueSourceControlTick()
-{
-    // If TickSourceControl is not currently queued
-    if (!m_sourceControlFunctionQueued)
-    {
-        // Queue it
-        AZStd::function<void()> tickFunction = [this]()
-        {
-            TickSourceControl();
-        };
-        AZ::SystemTickBus::QueueFunction(tickFunction);
-
-        // Stop further queues as TickSourceControl will queue itself
-        // until there are no more paths in the buffer to process
-        m_sourceControlFunctionQueued = true;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Takes a single path from m_sourceControlBuffer and passes it to
-// DccMaterialSourceControlCheck(). Then if there are more paths
-// remaining in the buffer, it will queue itself for execution next
-// frame. The reason for doing only one material every tick is to avoid
-// flooding source control with too many requests and stalling the editor
-void CMaterialManager::TickSourceControl()
-{
-    m_sourceControlFunctionQueued = false;
-    AZStd::string filePath;
-    bool moreRemaining = false;
-
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_sourceControlBufferMutex);
-
-        if (m_sourceControlBuffer.size() < 1)
-        {
-            return;
-        }
-
-        filePath = m_sourceControlBuffer.back();
-        m_sourceControlBuffer.pop_back();
-        moreRemaining = !m_sourceControlBuffer.empty();
-    }
-
-    // Process it
-    DccMaterialSourceControlCheck(filePath);
-
-    // If there are more paths to check
-    if (moreRemaining)
-    {
-        // Queue again
-        QueueSourceControlTick();
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Launches new thread running the DccMaterialSaveThreadFunc() function
-void CMaterialManager::StartDccMaterialSaveThread()
-{
-    AZStd::thread_desc threadDesc;
-    threadDesc.m_name = "Dcc Material Save Thread";
-
-    m_dccMaterialSaveThread = AZStd::thread(
-        [this]()
-        {
-            DccMaterialSaveThreadFunc();
-        },
-        &threadDesc);
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Will save all the .dccmtl file paths in the buffer to source .mtl
-// Runs on a separate thread so as not to stall the main thread
-void CMaterialManager::DccMaterialSaveThreadFunc()
-{
-    while (true)
-    {
-        m_dccMaterialSaveSemaphore.acquire();
-
-        // Exit condition, set to true in destructor
-        if (m_joinThreads)
-        {
-            return;
-        }
-
-        AZStd::vector<AZStd::string> dccMaterialPaths;
-
-        // Lock the buffer and copy file paths locally
-        {
-            AZStd::lock_guard<AZStd::mutex> lock(m_dccMaterialSaveMutex);
-            dccMaterialPaths.reserve(m_dccMaterialSaveBuffer.size());
-            for (AZStd::string& fileName : m_dccMaterialSaveBuffer)
-            {
-                dccMaterialPaths.push_back(fileName);
-            }
-            m_dccMaterialSaveBuffer.clear();
-        }
-
-        // Save all the buffered .dccmtl files
-        for (AZStd::string& fileName : dccMaterialPaths)
-        {
-            SaveDccMaterial(fileName);
-        }
-
-        // Clear local strings
-        dccMaterialPaths.clear();
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Async source control request. If successful, the callback will add the
-// file name to the buffer for processing by the Dcc Material Save Thread
-void CMaterialManager::DccMaterialSourceControlCheck(const AZStd::string& relativeDccMaterialPath)
-{
-    AZStd::string fullSourcePath = DccMaterialToSourcePath(relativeDccMaterialPath);
-
-    if (!DccMaterialRequiresSave(relativeDccMaterialPath, fullSourcePath))
-    {
-        // Source .mtl update not required, early out
-        return;
-    }
-
-    // Create callback for source control operation (see SCCommandBus::Broadcast below)
-    AzToolsFramework::SourceControlResponseCallback callback =
-        [this, relativeDccMaterialPath, fullSourcePath](bool success, const AzToolsFramework::SourceControlFileInfo& info)
-    {
-        if (success || !info.IsReadOnly())
-        {
-            // File needs saving, add it to the buffer for processing by the dcc material thread
-
-            // Lock access to the buffer
-            AZStd::lock_guard<AZStd::mutex> lock(m_dccMaterialSaveMutex);
-
-            // Add file path
-            m_dccMaterialSaveBuffer.push_back(relativeDccMaterialPath);
-
-            // Notify thread there's work to do
-            m_dccMaterialSaveSemaphore.release();
-        }
-        else
-        {
-            QString errorMessage = QObject::tr("Could not check out read-only file %1 in source control. Either check your source control configuration or disable source control.").arg(QString::fromUtf8(fullSourcePath.c_str()));
-
-            // Alter error message slightly if source control is disabled
-            bool isSourceControlActive = false;
-            AzToolsFramework::SourceControlConnectionRequestBus::BroadcastResult(isSourceControlActive, &AzToolsFramework::SourceControlConnectionRequestBus::Events::IsActive);
-
-            if (!isSourceControlActive)
-            {
-                errorMessage = QObject::tr("Could not check out read-only file %1 because source control is disabled. Either enable source control or check out the file manually to make it writable.").arg(QString::fromUtf8(fullSourcePath.c_str()));
-            }
-
-            // Pop open an error message box if this is the first error we encounter
-            if (!m_bSourceControlErrorReported)
-            {
-                // Report warning in message box
-                QString errorTitle = QStringLiteral("Dcc Material Error");
-                QMessageBox::warning(QApplication::activeWindow(), errorTitle, errorMessage, QMessageBox::Cancel);
-
-                // Only report source control error box to the user once,
-                // no need to spam them for every material
-                m_bSourceControlErrorReported = true;
-            }
-
-            AZ_Error("Rendering", false, errorMessage.toUtf8().data());
-        }
-    };
-
-    // Request edit from source control (happens asynchronously)
-    using SCCommandBus = AzToolsFramework::SourceControlCommandBus;
-    SCCommandBus::Broadcast(&SCCommandBus::Events::RequestEdit, fullSourcePath.c_str(), true, callback);
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Handles when .dccmtl is created
-void CMaterialManager::EntryAdded(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* assetEntry)
-{
-    if (assetEntry->GetEntryType() != AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Product)
-    {
-        // Ignore non-product entries
-        return;
-    }
-    const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* productAssetEntry = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>(assetEntry);
-    if (productAssetEntry && productAssetEntry->GetAssetType() != m_dccMaterialAssetType)
-    {
-        // Ignore types that aren't .dccmtl
-        return;
-    }
-
-    AddDccMaterialPath(productAssetEntry->GetRelativePath());
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Handles when .dccmtl is edited
-void CMaterialManager::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
-{
-    AZ::Data::AssetInfo assetInfo;
-    EBUS_EVENT_RESULT(assetInfo, AZ::Data::AssetCatalogRequestBus, GetAssetInfoById, assetId);
-
-    if (assetInfo.m_assetType != m_dccMaterialAssetType)
-    {
-        // Ignore types that aren't .dccmtl
-        return;
-    }
-
-    AddDccMaterialPath(assetInfo.m_relativePath);
-}
-
-///////////////////////////////////////////////////////////////////////////
-void CMaterialManager::AddDccMaterialPath(const AZStd::string relativeDccMaterialPath)
-{
-    if (relativeDccMaterialPath.empty())
-    {
-        return;
-    }
-
-    // Lock access to the buffer
-    AZStd::lock_guard<AZStd::mutex> lock(m_sourceControlBufferMutex);
-
-    // Add file path
-    m_sourceControlBuffer.push_back(relativeDccMaterialPath);
-
-    if (m_bEditorUiReady)
-    {
-        QueueSourceControlTick();
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Given the path of a .dccmtl in cache, save it as a source .mtl
-void CMaterialManager::SaveDccMaterial(const AZStd::string& relativeDccMaterialPath)
-{
-    // __________________________________________________
-    // Load .dccmtl
-
-    XmlNodeRef dccNode = GetISystem()->LoadXmlFromFile(relativeDccMaterialPath.c_str());
-
-    if (!dccNode)
-    {
-        AZ_Error("MaterialManager", false, "CMaterialManager::SaveDccMaterial: Failed to load XML node from .dccmtl file: %s", relativeDccMaterialPath.c_str());
-        return;
-    }
-
-    // __________________________________________________
-    // Save as source .mtl file
-
-    AZStd::string fullSourcePath = DccMaterialToSourcePath(relativeDccMaterialPath);
-    bool saveSuccessful = dccNode->saveToFile(fullSourcePath.c_str());
-
-    if (!saveSuccessful)
-    {
-        AZ_Error("MaterialManager", false, "CMaterialManager::SaveDccMaterial: Failed to save source .mtl from .dccmtl file: %s", relativeDccMaterialPath.c_str());
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Compares the hash values from .dccmtl and source .mtl to determine if
-// .dccmtl has changed and needs to be saved.
-bool CMaterialManager::DccMaterialRequiresSave(const AZStd::string& relativeDccMaterialPath, const AZStd::string& fullSourcePath)
-{
-    // __________________________________________________
-    // Get Source Hash
-
-    AZ::u32 sourceHash = 0;
-
-    // Check if material is already loaded
-    QString unifiedName = UnifyMaterialName(QString(relativeDccMaterialPath.c_str()));
-    CMaterial* sourceMaterial = (CMaterial*)FindItemByName(unifiedName);
-
-    if (sourceMaterial && !sourceMaterial->IsDummy())
-    {
-        sourceHash = sourceMaterial->GetDccMaterialHash();
-    }
-    else
-    {
-        XmlNodeRef sourceNode = GetISystem()->LoadXmlFromFile(fullSourcePath.c_str());
-        if (sourceNode)
-        {
-            sourceNode->getAttr("DccMaterialHash", sourceHash);
-        }
-        else
-        {
-            // Couldn't find source node or material, so we need to save the dcc material as a source material
-            // No need to check the dcc material hash, just return true
-            return true;
-        }
-    }
-
-    // __________________________________________________
-    // Get DCC material Hash
-
-    AZ::u32 dccHash = 0;
-    XmlNodeRef dccNode = GetISystem()->LoadXmlFromFile(relativeDccMaterialPath.c_str());
-
-    if (!dccNode)
-    {
-        AZ_Error("MaterialManager", false, "CMaterialManager::DccMaterialRequiresSave: Failed to load XML node from .dccmtl file: %s", relativeDccMaterialPath.c_str());
-        return false;
-    }
-
-    dccNode->getAttr("DccMaterialHash", dccHash);
-
-    // __________________________________________________
-    // Compare hash values
-
-    // Only update if .dccmtl hash is different from the source hash
-    return (dccHash != sourceHash);
-}
-
diff --git a/Code/Sandbox/Editor/Material/MaterialManager.h b/Code/Sandbox/Editor/Material/MaterialManager.h
deleted file mode 100644
index a9dcabfa40..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialManager.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_MATERIAL_MATERIALMANAGER_H
-#define CRYINCLUDE_EDITOR_MATERIAL_MATERIALMANAGER_H
-#pragma once
-
-#include "BaseLibraryManager.h"
-#include "Material.h"
-
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-#include <Include/IEditorMaterialManager.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/std/string/wildcard.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/std/parallel/mutex.h>
-#include <AzCore/std/parallel/binary_semaphore.h>
-#include <AzCore/std/parallel/thread.h>
-
-
-class CMaterial;
-class CMaterialLibrary;
-class CMaterialHighlighter;
-
-namespace AZ
-{
-    struct Uuid;
-}
-
-namespace AzToolsFramework
-{
-    namespace AssetBrowser
-    {
-        struct SourceFileOpenerDetails;
-        typedef AZStd::vector<SourceFileOpenerDetails> SourceFileOpenerList;
-    }
-}
-
-enum EHighlightMode
-{
-    eHighlight_Pick = BIT(0),
-    eHighlight_Breakable = BIT(1),
-    eHighlight_NoSurfaceType = BIT(2),
-    eHighlight_All = 0xFFFFFFFF
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-/** Manages all entity prototypes and material libraries.
-*/
-class CRYEDIT_API CMaterialManager
-    : public IEditorMaterialManager
-    , public CBaseLibraryManager
-    , public IMaterialManagerListener
-    , protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
-    , public AzToolsFramework::AssetBrowser::AssetBrowserModelNotificationBus::Handler
-    , public AzFramework::AssetCatalogEventBus::Handler
-    , public AzToolsFramework::EditorEvents::Bus::Handler
-{
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-
-    //! Notification callback.
-    typedef AZStd::function<void()> NotifyCallback;
-
-    CMaterialManager(CRegistrationContext& regCtx);
-    ~CMaterialManager();
-
-    void Set3DEngine();
-
-    // Clear all prototypes and material libraries.
-    void ClearAll();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Materials.
-    //////////////////////////////////////////////////////////////////////////
-
-    // Loads material.
-    CMaterial* LoadMaterial(const QString& sMaterialName, bool bMakeIfNotFound = true);
-    XmlNodeRef LoadXmlNode(const QString &fullSourcePath, const QString &relativeFilePath);
-    //! Loads a material, avoiding a call to CMaterialManager::MaterialToFilename if the full path is already known
-    CMaterial* LoadMaterialWithFullSourcePath(const QString& relativeFilePath, const QString& fullSourcePath, bool makeIfNotFound = true);
-    virtual CMaterial* LoadMaterial(const char* sMaterialName, bool bMakeIfNotFound = true);
-    virtual void OnRequestMaterial(_smart_ptr<IMaterial> pMaterial);
-    // Creates a new material from a xml node.
-    CMaterial* CreateMaterial(const QString& sMaterialName, const XmlNodeRef& node = XmlNodeRef(), int nMtlFlags = 0, unsigned long nLoadingFlags = 0);
-    virtual CMaterial* CreateMaterial(const char* sMaterialName, const XmlNodeRef& node = XmlNodeRef(), int nMtlFlags = 0, unsigned long nLoadingFlags = 0);
-
-    // Duplicate material and do nothing more.
-    CMaterial* DuplicateMaterial(const char* newName, CMaterial* pOriginal);
-
-    // Delete specified material, erases material file, and unassigns from all objects.
-    virtual void DeleteMaterial(CMaterial* pMtl);
-    virtual void RemoveMaterialFromDisk(const char* fileName);
-
-
-    //! Export property manager to game.
-    void Export(XmlNodeRef& node);
-    int ExportLib(CMaterialLibrary* pLib, XmlNodeRef& libNode);
-
-    virtual void SetSelectedItem(IDataBaseItem* pItem);
-    void SetCurrentMaterial(CMaterial* pMtl);
-    //! Get currently active material.
-    CMaterial* GetCurrentMaterial() const;
-
-    void SetCurrentFolder(const QString& folder);
-
-    // This material will be highlighted
-    void SetHighlightedMaterial(CMaterial* pMtl);
-    void GetHighlightColor(ColorF* color, float* intensity, int flags);
-    void HighlightedMaterialChanged(CMaterial* pMtl);
-    // highlightMask is a combination of EHighlightMode flags
-    void SetHighlightMask(int highlightMask);
-    int GetHighlightMask() const{ return m_highlightMask; }
-    void SetMarkedMaterials(const std::vector<_smart_ptr<CMaterial> >& markedMaterials);
-    void OnLoadShader(CMaterial* pMaterial);
-
-    //! Serialize property manager.
-    virtual void Serialize(XmlNodeRef& node, bool bLoading);
-
-    virtual void SaveAllLibs();
-
-    //////////////////////////////////////////////////////////////////////////
-    // IMaterialManagerListener implementation
-    //////////////////////////////////////////////////////////////////////////
-    // Called when material manager tries to load a material.
-    virtual void OnCreateMaterial(_smart_ptr<IMaterial> pMaterial);
-    virtual void OnDeleteMaterial(_smart_ptr<IMaterial> pMaterial);
-    virtual bool IsCurrentMaterial(_smart_ptr<IMaterial> pMaterial) const;
-    //////////////////////////////////////////////////////////////////////////
-
-    // Convert filename of material file into the name of the material.
-    QString FilenameToMaterial(const QString& filename);
-
-    // Convert name of the material to the filename.
-    QString MaterialToFilename(const QString& sMaterialName);
-
-    //! Get the full file path of the source material
-    const AZ::Data::AssetType& GetMaterialAssetType();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Convert 3DEngine IMaterial to Editor's CMaterial pointer.
-    CMaterial* FromIMaterial(_smart_ptr<IMaterial> pMaterial);
-
-    // Open File selection dialog to create a new material.
-    CMaterial* SelectNewMaterial(int nMtlFlags, const char* sStartPath = NULL);
-
-    // Synchronize material between 3dsMax and editor.
-    void SyncMaterialEditor();
-
-    //////////////////////////////////////////////////////////////////////////
-    void GotoMaterial(CMaterial* pMaterial);
-    void GotoMaterial(_smart_ptr<IMaterial> pMaterial);
-
-    // Gather resources from the game material.
-    static void GatherResources(_smart_ptr<IMaterial> pMaterial, CUsedResources& resources);
-
-    void Command_Create();
-    void Command_CreateMulti();
-    void Command_ConvertToMulti();
-    void Command_Duplicate();
-    void Command_Merge();
-    void Command_Delete();
-    void Command_AssignToSelection();
-    void Command_ResetSelection();
-    void Command_SelectAssignedObjects();
-    void Command_SelectFromObject();
-
-protected:
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-    // protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
-    void AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers) override;
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-    // public AzToolsFramework::AssetBrowser::AssetBrowserModelNotificationsBus::Handler
-    void EntryAdded(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry);
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-    // AssetCatalogEventBus Functions
-    void OnCatalogAssetChanged(const AZ::Data::AssetId& assetId) override;
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-    // EditorEventsBus Functions
-    bool SkipEditorStartupUI() override;
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    void SaveDccMaterial(const AZStd::string& relativeDccMaterialPath);
-    bool DccMaterialRequiresSave(const AZStd::string& relativeDccMaterialPath, const AZStd::string& fullSourcePath);
-    void DccMaterialSourceControlCheck(const AZStd::string& relativeDccMaterialPath);
-    void AddDccMaterialPath(const AZStd::string relativeDccMaterialPath);
-    void TickSourceControl();
-    void QueueSourceControlTick();
-
-    // Duplicate the source material and set it as a submaterial of the target material at subMaterialIndex. Returns true if successful.
-    bool DuplicateAsSubMaterialAtIndex(CMaterial* pSourceMaterial, CMaterial* pTargetMaterial, int subMaterialIndex);
-    // Generates a unique variant of the name of the source material to resolve name collisions with the names of the submaterials in the target material.
-    void GenerateUniqueSubmaterialName(const CMaterial* pSourceMaterial, const CMaterial* pTargetMaterial, QString& uniqueSubmaterialName) const;
-
-    // Open save as dialog for saving materials.
-    bool SelectSaveMaterial(QString& itemName, QString& fullPath, const char* defaultStartPath);
-
-    void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-    virtual CBaseLibraryItem* MakeNewItem();
-    virtual CBaseLibrary* MakeNewLibrary();
-    //! Root node where this library will be saved.
-    virtual QString GetRootNodeName();
-    //! Path to libraries in this manager.
-    virtual QString GetLibsPath();
-    virtual void ReportDuplicateItem(CBaseLibraryItem* pItem, CBaseLibraryItem* pOldItem);
-
-    void RegisterCommands(CRegistrationContext& regCtx);
-
-    void UpdateHighlightedMaterials();
-    void AddForHighlighting(CMaterial* pMaterial);
-    void RemoveFromHighlighting(CMaterial* pMaterial, int mask);
-    int GetHighlightFlags(CMaterial* pMaterial) const;
-
-    // For material syncing with 3dsMax.
-    void PickPreviewMaterial();
-    void InitMatSender();
-
-    //! Reloads any registered materials that have been modified by the runtime.
-    void ReloadDirtyMaterials();
-
-protected:
-    QString m_libsPath;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    // Currently selected (focused) material, in material browser.
-    _smart_ptr<CMaterial> m_pCurrentMaterial;
-    // current selected folder
-    QString m_currentFolder;
-    // List of materials selected in material browser tree.
-    std::vector<_smart_ptr<CMaterial> > m_markedMaterials;
-    // IMaterial is needed to not let 3Dengine release selected IMaterial
-    _smart_ptr<IMaterial> m_pCurrentEngineMaterial;
-
-    // Paths of .dccmtl that might require saving. They will be fed to
-    // DccMaterialSourceControlCheck() and if saving is required, they
-    // will be added to m_dccMaterialSaveBuffer
-    AZStd::vector<AZStd::string> m_sourceControlBuffer;
-    AZStd::mutex m_sourceControlBufferMutex;
-    AZStd::atomic_bool m_sourceControlFunctionQueued;
-
-    // Paths of .dccmtl that require saving. These paths have
-    // gone through DccMaterialSourceControlCheck() and will
-    // be saved by the dcc material save thread
-    AZStd::vector<AZStd::string> m_dccMaterialSaveBuffer;
-    AZStd::mutex m_dccMaterialSaveMutex;
-
-    // Material highlighting
-    _smart_ptr<CMaterial> m_pHighlightMaterial;
-    CMaterialHighlighter* m_pHighlighter;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    int m_highlightMask;
-
-    bool m_bHighlightingMaterial;
-
-    // Only begin processing .dccmtl filepaths once editor is ready
-    // and we can display appropriate error messages
-    bool m_bEditorUiReady;
-
-    // Only report source control error to the user once,
-    // no need to spam them for every material
-    bool m_bSourceControlErrorReported;
-
-    class CMaterialSender* m_MatSender;
-
-private:
-    CMaterial* LoadMaterialInternal(const QString &materialNameClear, const QString &fullSourcePath, const QString &relativeFilePath, bool bMakeIfNotFound);
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AZ::Data::AssetType m_materialAssetType;
-    AZ::Data::AssetType m_dccMaterialAssetType;
-
-    void StartDccMaterialSaveThread();
-    void DccMaterialSaveThreadFunc();
-    AZStd::thread m_dccMaterialSaveThread;
-    AZStd::atomic_bool m_joinThreads;
-    AZStd::binary_semaphore m_dccMaterialSaveSemaphore;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_MATERIAL_MATERIALMANAGER_H
diff --git a/Code/Sandbox/Editor/Material/MaterialPreviewModelView.cpp b/Code/Sandbox/Editor/Material/MaterialPreviewModelView.cpp
deleted file mode 100644
index 3e1bc37c6a..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialPreviewModelView.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "EditorDefs.h"
-
-#include "MaterialPreviewModelView.h"
-
-
-
-MaterialPreviewModelView::MaterialPreviewModelView(QWidget* parent, bool enableIdleUpdate)
-    : CPreviewModelView(parent)
-    , m_enableIdleUpdate(enableIdleUpdate)
-{}
-
-MaterialPreviewModelView::~MaterialPreviewModelView()
-{}
-
-void MaterialPreviewModelView::SetCameraLookAt(float fRadiusScale, const Vec3& fromDir)
-{
-    IStatObj* target = GetStaticModel();
-    if (target)
-    {
-        Vec3 dir = fromDir.GetNormalized();
-
-        // Calculate the camera matrix
-        Matrix34 tm = Matrix33::CreateRotationVDir(dir, 0);
-        Vec3 translation = target->GetAABB().GetCenter() - dir * target->GetAABB().GetRadius() * fRadiusScale;
-        tm.SetTranslation(translation);
-
-        // Convert it to a quaternion and move the viewport's camera
-        QuatT quat(tm);
-        CameraMoved(quat, true);
-    }
-}
-
-void MaterialPreviewModelView::SetMaterial(_smart_ptr<IMaterial> material)
-{
-    IStatObj* staticModel = GetStaticModel();
-    if (staticModel)
-    {
-        staticModel->SetMaterial(material);
-    }
-}
-
-void MaterialPreviewModelView::resizeEvent(QResizeEvent* event)
-{
-    if (m_enableIdleUpdate)
-    {
-        CPreviewModelView::resizeEvent(event);
-    }
-}
-
-void MaterialPreviewModelView::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnIdleUpdate:
-    {
-        if (m_enableIdleUpdate)
-        {
-            Update();
-        }
-        break;
-    }
-    default:
-        break;
-    }
-}
diff --git a/Code/Sandbox/Editor/Material/MaterialPreviewModelView.h b/Code/Sandbox/Editor/Material/MaterialPreviewModelView.h
deleted file mode 100644
index 0df7c1767f..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialPreviewModelView.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include "PreviewModelView.h"
-
-class MaterialPreviewModelView
-    : public CPreviewModelView
-{
-public:
-    // set enableIdleUpdate to false if you don't want the view to update itself during
-    // application idle notification (and resize events). That makes sense when this view
-    // is only used to render into memory bitmaps. Note that the view has to been visible
-    // for that, but can be somewhere of-screen.
-    MaterialPreviewModelView(QWidget* parent, bool enableIdleUpdate = true);
-    virtual ~MaterialPreviewModelView();
-    void SetCameraLookAt(float fRadiusScale, const Vec3& fromDir);
-    void SetMaterial(_smart_ptr<IMaterial> material);
-    void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-
-protected:
-    void resizeEvent(QResizeEvent* event) override;
-
-private:
-    bool m_enableIdleUpdate;
-};
diff --git a/Code/Sandbox/Editor/Material/MaterialPythonFuncs.cpp b/Code/Sandbox/Editor/Material/MaterialPythonFuncs.cpp
deleted file mode 100644
index 5de75a7c39..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialPythonFuncs.cpp
+++ /dev/null
@@ -1,2208 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Material support for Python
-
-#include "EditorDefs.h"
-
-#include "MaterialPythonFuncs.h"
-
-// Editor
-#include "MaterialManager.h"
-#include "ShaderEnum.h"
-
-
-namespace
-{
-    void PyMaterialCreate()
-    {
-        GetIEditor()->GetMaterialManager()->Command_Create();
-    }
-
-    void PyMaterialCreateMulti()
-    {
-        GetIEditor()->GetMaterialManager()->Command_CreateMulti();
-    }
-
-    void PyMaterialConvertToMulti()
-    {
-        GetIEditor()->GetMaterialManager()->Command_ConvertToMulti();
-    }
-
-    void PyMaterialDuplicateCurrent()
-    {
-        GetIEditor()->GetMaterialManager()->Command_Duplicate();
-    }
-
-    void PyMaterialMergeSelection()
-    {
-        GetIEditor()->GetMaterialManager()->Command_Merge();
-    }
-
-    void PyMaterialDeleteCurrent()
-    {
-        GetIEditor()->GetMaterialManager()->Command_Delete();
-    }
-
-    void PyMaterialAssignCurrentToSelection()
-    {
-        CUndo undo("Assign Material To Selection");
-        GetIEditor()->GetMaterialManager()->Command_AssignToSelection();
-    }
-
-    void PyMaterialResetSelection()
-    {
-        GetIEditor()->GetMaterialManager()->Command_ResetSelection();
-    }
-
-    void PyMaterialSelectObjectsWithCurrent()
-    {
-        CUndo undo("Select Objects With Current Material");
-        GetIEditor()->GetMaterialManager()->Command_SelectAssignedObjects();
-    }
-
-    void PyMaterialSetCurrentFromObject()
-    {
-        GetIEditor()->GetMaterialManager()->Command_SelectFromObject();
-    }
-
-    AZStd::vector<AZStd::string> PyGetSubMaterial(const char* pMaterialPath)
-    {
-        QString materialPath = pMaterialPath;
-        CMaterial* pMaterial = GetIEditor()->GetMaterialManager()->LoadMaterial(pMaterialPath, false);
-        if (!pMaterial)
-        {
-            throw std::runtime_error("Invalid multi material.");
-        }
-
-        AZStd::vector<AZStd::string> result;
-        for (int i = 0; i < pMaterial->GetSubMaterialCount(); i++)
-        {
-            if (pMaterial->GetSubMaterial(i))
-            {
-                result.push_back((materialPath + "\\" + pMaterial->GetSubMaterial(i)->GetName()).toUtf8().data());
-            }
-        }
-        return result;
-    }
-
-    CMaterial* TryLoadingMaterial(const char* pPathAndMaterialName)
-    {
-        QString varMaterialPath = pPathAndMaterialName;
-        std::deque<QString> splittedMaterialPath;
-        for (auto token : varMaterialPath.split(QRegularExpression(R"([\\/])"), Qt::SkipEmptyParts))
-        {
-            splittedMaterialPath.push_back(token);
-        }
-
-        CMaterial* pMaterial  = GetIEditor()->GetMaterialManager()->LoadMaterial(varMaterialPath, false);
-        if (!pMaterial)
-        {
-            QString subMaterialName = splittedMaterialPath.back();
-            bool isSubMaterialExist(false);
-
-            varMaterialPath.remove((varMaterialPath.length() - subMaterialName.length() - 1), varMaterialPath.length());
-            QString test = varMaterialPath;
-            pMaterial  = GetIEditor()->GetMaterialManager()->LoadMaterial(varMaterialPath, false);
-
-            if (!pMaterial)
-            {
-                throw std::runtime_error("Invalid multi material.");
-            }
-
-            for (int i = 0; i < pMaterial->GetSubMaterialCount(); i++)
-            {
-                if (pMaterial->GetSubMaterial(i)->GetName() == subMaterialName)
-                {
-                    pMaterial = pMaterial->GetSubMaterial(i);
-                    isSubMaterialExist = true;
-                }
-            }
-
-            if (!pMaterial || !isSubMaterialExist)
-            {
-                throw std::runtime_error((QString("\"") + subMaterialName + "\" is an invalid sub material.").toUtf8().data());
-            }
-        }
-        GetIEditor()->GetMaterialManager()->SetCurrentMaterial(pMaterial);
-        return pMaterial;
-    }
-
-    std::deque<QString> PreparePropertyPath(const char* pPathAndPropertyName)
-    {
-        QString varPathProperty = pPathAndPropertyName;
-        std::deque<QString> splittedPropertyPath;
-        for (auto token : varPathProperty.split(QRegularExpression(R"([\\/])"), Qt::SkipEmptyParts))
-        {
-            splittedPropertyPath.push_back(token);
-        }
-
-        return splittedPropertyPath;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Converter: Enum -> CString (human readable)
-    //////////////////////////////////////////////////////////////////////////
-
-    QString TryConvertingSEFResTextureToCString(SEfResTexture* pResTexture)
-    {
-        if (pResTexture)
-        {
-            return pResTexture->m_Name.c_str();
-        }
-        return "";
-    }
-
-    QString TryConvertingETEX_TypeToCString(const uint8& texTypeName)
-    {
-        switch (texTypeName)
-        {
-        case eTT_2D:
-            return "2D";
-        case eTT_Cube:
-            return "Cube-Map";
-        case eTT_NearestCube:
-            return "Nearest Cube-Map probe for alpha blended";
-        case eTT_Auto2D:
-            return "Auto 2D-Map";
-        case eTT_Dyn2D:
-            return "Dynamic 2D-Map";
-        case eTT_User:
-            return "From User Params";
-        default:
-            throw std::runtime_error("Invalid tex type.");
-        }
-    }
-
-    QString TryConvertingTexFilterToCString(const int& iFilterName)
-    {
-        switch (iFilterName)
-        {
-        case FILTER_NONE:
-            return "Default";
-        case FILTER_POINT:
-            return "Point";
-        case FILTER_LINEAR:
-            return "Linear";
-        case FILTER_BILINEAR:
-            return "Bilinear";
-        case FILTER_TRILINEAR:
-            return "Trilinear";
-        case FILTER_ANISO2X:
-            return "Anisotropic 2x";
-        case FILTER_ANISO4X:
-            return "Anisotropic 4x";
-        case FILTER_ANISO8X:
-            return "Anisotropic 8x";
-        case FILTER_ANISO16X:
-            return "Anisotropic 16x";
-        default:
-            throw std::runtime_error("Invalid tex filter.");
-        }
-    }
-
-    QString TryConvertingETexGenTypeToCString(const uint8& texGenType)
-    {
-        switch (texGenType)
-        {
-        case ETG_Stream:
-            return "Stream";
-        case ETG_World:
-            return "World";
-        case ETG_Camera:
-            return "Camera";
-        default:
-            throw std::runtime_error("Invalid tex gen type.");
-        }
-    }
-
-    QString TryConvertingETexModRotateTypeToCString(const uint8& rotateType)
-    {
-        switch (rotateType)
-        {
-        case ETMR_NoChange:
-            return "No Change";
-        case ETMR_Fixed:
-            return "Fixed Rotation";
-        case ETMR_Constant:
-            return "Constant Rotation";
-        case ETMR_Oscillated:
-            return "Oscillated Rotation";
-        default:
-            throw std::runtime_error("Invalid rotate type.");
-        }
-    }
-
-    QString TryConvertingETexModMoveTypeToCString(const uint8& oscillatorType)
-    {
-        switch (oscillatorType)
-        {
-        case ETMM_NoChange:
-            return "No Change";
-        case ETMM_Fixed:
-            return "Fixed Moving";
-        case ETMM_Constant:
-            return "Constant Moving";
-        case ETMM_Jitter:
-            return "Jitter Moving";
-        case ETMM_Pan:
-            return "Pan Moving";
-        case ETMM_Stretch:
-            return "Stretch Moving";
-        case ETMM_StretchRepeat:
-            return "Stretch-Repeat Moving";
-        default:
-            throw std::runtime_error("Invalid oscillator type.");
-        }
-    }
-
-    QString TryConvertingEDeformTypeToCString(const EDeformType& deformType)
-    {
-        switch (deformType)
-        {
-        case eDT_Unknown:
-            return "None";
-        case eDT_SinWave:
-            return "Sin Wave";
-        case eDT_SinWaveUsingVtxColor:
-            return "Sin Wave using vertex color";
-        case eDT_Bulge:
-            return "Bulge";
-        case eDT_Squeeze:
-            return "Squeeze";
-        case eDT_Perlin2D:
-            return "Perlin 2D";
-        case eDT_Perlin3D:
-            return "Perlin 3D";
-        case eDT_FromCenter:
-            return "From Center";
-        case eDT_Bending:
-            return "Bending";
-        case eDT_ProcFlare:
-            return "Proc. Flare";
-        case eDT_AutoSprite:
-            return "Auto sprite";
-        case eDT_Beam:
-            return "Beam";
-        case eDT_FixedOffset:
-            return "FixedOffset";
-        default:
-            throw std::runtime_error("Invalid deform type.");
-        }
-    }
-
-    QString TryConvertingEWaveFormToCString(const EWaveForm& waveForm)
-    {
-        switch (waveForm)
-        {
-        case eWF_None:
-            return "None";
-        case eWF_Sin:
-            return "Sin";
-        case eWF_HalfSin:
-            return "Half Sin";
-        case eWF_Square:
-            return "Square";
-        case eWF_Triangle:
-            return "Triangle";
-        case eWF_SawTooth:
-            return "Saw Tooth";
-        case eWF_InvSawTooth:
-            return "Inverse Saw Tooth";
-        case eWF_Hill:
-            return "Hill";
-        case eWF_InvHill:
-            return "Inverse Hill";
-        default:
-            throw std::runtime_error("Invalid wave form.");
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Converter: CString -> Enum
-    //////////////////////////////////////////////////////////////////////////
-
-    template<typename STRING>
-    // [Shader System TO DO] remove once dynamic slots assingment is in place
-    EEfResTextures TryConvertingCStringToEEfResTextures(const STRING& resTextureName)
-    {
-        if (resTextureName == "Diffuse")
-        {
-            return EFTT_DIFFUSE;
-        }
-        else if (resTextureName == "Specular")
-        {
-            return EFTT_SPECULAR;
-        }
-        else if (resTextureName == "Bumpmap")
-        {
-            return EFTT_NORMALS;
-        }
-        else if (resTextureName == "Heightmap")
-        {
-            return EFTT_HEIGHT;
-        }
-        else if (resTextureName == "Environment")
-        {
-            return EFTT_ENV;
-        }
-        else if (resTextureName == "Detail")
-        {
-            return EFTT_DETAIL_OVERLAY;
-        }
-        else if (resTextureName == "Opacity")
-        {
-            return EFTT_OPACITY;
-        }
-        else if (resTextureName == "Decal")
-        {
-            return EFTT_DECAL_OVERLAY;
-        }
-        else if (resTextureName == "SubSurface")
-        {
-            return EFTT_SUBSURFACE;
-        }
-        else if (resTextureName == "Custom")
-        {
-            return EFTT_CUSTOM;
-        }
-        else if (resTextureName == "[1] Custom")
-        {
-            return EFTT_DIFFUSE;
-        }
-        else if (resTextureName == "Emittance")
-        {
-            return EFTT_EMITTANCE;
-        }
-        else if (resTextureName == "Occlusion")
-        {
-            return EFTT_OCCLUSION;
-        }
-        else if (resTextureName == "Specular2")
-        {
-            return EFTT_SPECULAR_2;
-        }
-        throw std::runtime_error("Invalid texture name.");
-    }
-
-    template<typename STRING>
-    ETEX_Type TryConvertingCStringToETEX_Type(const STRING& texTypeName)
-    {
-        if (texTypeName == "2D")
-        {
-            return eTT_2D;
-        }
-        else if (texTypeName == "Cube-Map")
-        {
-            return eTT_Cube;
-        }
-        else if (texTypeName == "Nearest Cube-Map probe for alpha blended")
-        {
-            return eTT_NearestCube;
-        }
-        else if (texTypeName == "Auto 2D-Map")
-        {
-            return eTT_Auto2D;
-        }
-        else if (texTypeName == "Dynamic 2D-Map")
-        {
-            return eTT_Dyn2D;
-        }
-        else if (texTypeName == "From User Params")
-        {
-            return eTT_User;
-        }
-        throw std::runtime_error("Invalid tex type name.");
-    }
-
-    template<typename STRING>
-    signed char TryConvertingCStringToTexFilter(const STRING& filterName)
-    {
-        if (filterName == "Default")
-        {
-            return FILTER_NONE;
-        }
-        else if (filterName == "Point")
-        {
-            return FILTER_POINT;
-        }
-        else if (filterName == "Linear")
-        {
-            return FILTER_LINEAR;
-        }
-        else if (filterName == "Bilinear")
-        {
-            return FILTER_BILINEAR;
-        }
-        else if (filterName == "Trilinear")
-        {
-            return FILTER_TRILINEAR;
-        }
-        else if (filterName == "Anisotropic 2x")
-        {
-            return FILTER_ANISO2X;
-        }
-        else if (filterName == "Anisotropic 4x")
-        {
-            return FILTER_ANISO4X;
-        }
-        else if (filterName == "Anisotropic 8x")
-        {
-            return FILTER_ANISO8X;
-        }
-        else if (filterName == "Anisotropic 16x")
-        {
-            return FILTER_ANISO16X;
-        }
-        throw std::runtime_error("Invalid filter name.");
-    }
-
-    template<typename STRING>
-    ETexGenType TryConvertingCStringToETexGenType(const STRING& texGenType)
-    {
-        if (texGenType == "Stream")
-        {
-            return ETG_Stream;
-        }
-        else if (texGenType == "World")
-        {
-            return ETG_World;
-        }
-        else if (texGenType == "Camera")
-        {
-            return ETG_Camera;
-        }
-        throw std::runtime_error("Invalid tex gen type name.");
-    }
-
-    template<typename STRING>
-    ETexModRotateType TryConvertingCStringToETexModRotateType(const STRING& rotateType)
-    {
-        if (rotateType == "No Change")
-        {
-            return ETMR_NoChange;
-        }
-        else if (rotateType == "Fixed Rotation")
-        {
-            return ETMR_Fixed;
-        }
-        else if (rotateType == "Constant Rotation")
-        {
-            return ETMR_Constant;
-        }
-        else if (rotateType == "Oscillated Rotation")
-        {
-            return ETMR_Oscillated;
-        }
-        throw std::runtime_error("Invalid rotate type name.");
-    }
-
-    template<typename STRING>
-    ETexModMoveType TryConvertingCStringToETexModMoveType(const STRING& oscillatorType)
-    {
-        if (oscillatorType == "No Change")
-        {
-            return ETMM_NoChange;
-        }
-        else if (oscillatorType == "Fixed Moving")
-        {
-            return ETMM_Fixed;
-        }
-        else if (oscillatorType == "Constant Moving")
-        {
-            return ETMM_Constant;
-        }
-        else if (oscillatorType == "Jitter Moving")
-        {
-            return ETMM_Jitter;
-        }
-        else if (oscillatorType == "Pan Moving")
-        {
-            return ETMM_Pan;
-        }
-        else if (oscillatorType == "Stretch Moving")
-        {
-            return ETMM_Stretch;
-        }
-        else if (oscillatorType == "Stretch-Repeat Moving")
-        {
-            return ETMM_StretchRepeat;
-        }
-        throw std::runtime_error("Invalid oscillator type.");
-    }
-
-    template<typename STRING>
-    EDeformType TryConvertingCStringToEDeformType(const STRING& deformType)
-    {
-        if (deformType == "None")
-        {
-            return eDT_Unknown;
-        }
-        else if (deformType == "Sin Wave")
-        {
-            return eDT_SinWave;
-        }
-        else if (deformType == "Sin Wave using vertex color")
-        {
-            return eDT_SinWaveUsingVtxColor;
-        }
-        else if (deformType == "Bulge")
-        {
-            return eDT_Bulge;
-        }
-        else if (deformType == "Squeeze")
-        {
-            return eDT_Squeeze;
-        }
-        else if (deformType == "Perlin 2D")
-        {
-            return eDT_Perlin2D;
-        }
-        else if (deformType == "Perlin 3D")
-        {
-            return eDT_Perlin3D;
-        }
-        else if (deformType == "From Center")
-        {
-            return eDT_FromCenter;
-        }
-        else if (deformType == "Bending")
-        {
-            return eDT_Bending;
-        }
-        else if (deformType == "Proc. Flare")
-        {
-            return eDT_ProcFlare;
-        }
-        else if (deformType == "Auto sprite")
-        {
-            return eDT_AutoSprite;
-        }
-        else if (deformType == "Beam")
-        {
-            return eDT_Beam;
-        }
-        else if (deformType == "FixedOffset")
-        {
-            return eDT_FixedOffset;
-        }
-        throw std::runtime_error("Invalid deform type.");
-    }
-
-    template <typename STRING>
-    EWaveForm TryConvertingCStringToEWaveForm(const STRING& waveForm)
-    {
-        if (waveForm == "None")
-        {
-            return eWF_None;
-        }
-        else if (waveForm == "Sin")
-        {
-            return eWF_Sin;
-        }
-        else if (waveForm == "Half Sin")
-        {
-            return eWF_HalfSin;
-        }
-        else if (waveForm == "Square")
-        {
-            return eWF_Square;
-        }
-        else if (waveForm == "Triangle")
-        {
-            return eWF_Triangle;
-        }
-        else if (waveForm == "Saw Tooth")
-        {
-            return eWF_SawTooth;
-        }
-        else if (waveForm == "Inverse Saw Tooth")
-        {
-            return eWF_InvSawTooth;
-        }
-        else if (waveForm == "Hill")
-        {
-            return eWF_Hill;
-        }
-        else if (waveForm == "Inverse Hill")
-        {
-            return eWF_InvHill;
-        }
-        throw std::runtime_error("Invalid wave form.");
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Script parser
-    //////////////////////////////////////////////////////////////////////////
-
-    QString ParseUINameFromPublicParamsScript(const char* sUIScript)
-    {
-        string uiscript = sUIScript;
-        string element[3];
-        int p1 = 0;
-        string itemToken = uiscript.Tokenize(";", p1);
-        while (!itemToken.empty())
-        {
-            int nElements = 0;
-            int p2 = 0;
-            string token = itemToken.Tokenize(" \t\r\n=", p2);
-            while (!token.empty())
-            {
-                element[nElements++] = token;
-                if (nElements == 2)
-                {
-                    element[nElements] = itemToken.substr(p2);
-                    element[nElements].Trim(" =\t\"");
-                    break;
-                }
-                token = itemToken.Tokenize(" \t\r\n=", p2);
-            }
-
-            if (_stricmp(element[1], "UIName") == 0)
-            {
-                return element[2].c_str();
-            }
-            itemToken = uiscript.Tokenize(";", p1);
-        }
-        return "";
-    }
-
-    std::map<QString, float> ParseValidRangeFromPublicParamsScript(const char* sUIScript)
-    {
-        string uiscript = sUIScript;
-        std::map<QString, float> result;
-        bool isUIMinExist(false);
-        bool isUIMaxExist(false);
-        string element[3];
-        int p1 = 0;
-        string itemToken = uiscript.Tokenize(";", p1);
-        while (!itemToken.empty())
-        {
-            int nElements = 0;
-            int p2 = 0;
-            string token = itemToken.Tokenize(" \t\r\n=", p2);
-            while (!token.empty())
-            {
-                element[nElements++] = token;
-                if (nElements == 2)
-                {
-                    element[nElements] = itemToken.substr(p2);
-                    element[nElements].Trim(" =\t\"");
-                    break;
-                }
-                token = itemToken.Tokenize(" \t\r\n=", p2);
-            }
-
-            if (_stricmp(element[1], "UIMin") == 0)
-            {
-                result["UIMin"] = atof(element[2]);
-                isUIMinExist = true;
-            }
-            if (_stricmp(element[1], "UIMax") == 0)
-            {
-                result["UIMax"] = atof(element[2]);
-                isUIMaxExist = true;
-            }
-            itemToken = uiscript.Tokenize(";", p1);
-        }
-        if (!isUIMinExist || !isUIMaxExist)
-        {
-            throw std::runtime_error("Invalid range for shader param.");
-        }
-        return result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set Flags
-    //////////////////////////////////////////////////////////////////////////
-
-    void SetMaterialFlag(CMaterial* pMaterial, const EMaterialFlags& eFlag, const bool& bFlag)
-    {
-        if (pMaterial->GetFlags() & eFlag && bFlag == false)
-        {
-            pMaterial->SetFlags(pMaterial->GetFlags() - eFlag);
-        }
-        else if (!(pMaterial->GetFlags() & eFlag) && bFlag == true)
-        {
-            pMaterial->SetFlags(pMaterial->GetFlags() | eFlag);
-        }
-    }
-
-    void SetPropagationFlag(CMaterial* pMaterial, const eMTL_PROPAGATION& eFlag, const bool& bFlag)
-    {
-        if (pMaterial->GetPropagationFlags() & eFlag && bFlag == false)
-        {
-            pMaterial->SetPropagationFlags(pMaterial->GetPropagationFlags() - eFlag);
-        }
-        else if (!(pMaterial->GetPropagationFlags() & eFlag) && bFlag == true)
-        {
-            pMaterial->SetPropagationFlags(pMaterial->GetPropagationFlags() | eFlag);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template <typename T>
-    bool IsAnyValidRange(const AZStd::any& value, const T& low, const T& high, const QString& invalidTypeMessage, const QString& invalidValueMessage)
-    {
-        static_assert(AZStd::is_arithmetic<T>::value, "This function only works with numbers.");
-
-        if (!value.is<T>())
-        {
-            throw std::runtime_error(invalidTypeMessage.toUtf8().data());
-        }
-
-        T valueData;
-        AZStd::any_numeric_cast(&value, valueData);
-        if (valueData < low || valueData > high)
-        {
-            throw std::runtime_error(invalidValueMessage.toUtf8().data());
-        }
-        return true;
-    }
-
-    template <>
-    bool IsAnyValidRange(const AZStd::any& value, const AZ::Color& low, const AZ::Color& high, const QString& invalidTypeMessage, const QString& invalidValueMessage)
-    {
-        if (!value.is<AZ::Color>())
-        {
-            throw std::runtime_error(invalidTypeMessage.toUtf8().data());
-        }
-
-        const AZ::Color* valueData = AZStd::any_cast<const AZ::Color>(&value);
-        if (!valueData)
-        {
-            throw std::runtime_error(invalidValueMessage.toUtf8().data());
-        }
-
-        if (valueData->IsLessThan(low) || valueData->IsGreaterThan(high))
-        {
-            throw std::runtime_error(invalidValueMessage.toUtf8().data());
-        }
-        return true;
-    }
-
-    bool ValidateProperty(CMaterial* pMaterial, const std::deque<QString>& splittedPropertyPathParam, const AZStd::any& value)
-    {
-        std::deque<QString> splittedPropertyPath = splittedPropertyPathParam;
-        std::deque<QString> splittedPropertyPathSubCategory = splittedPropertyPathParam;
-        QString categoryName = splittedPropertyPath.front();
-        QString subCategoryName = "";
-        QString subSubCategoryName = "";
-        QString currentPath = "";
-        QString propertyName = splittedPropertyPath.back();
-
-        QString errorMsgInvalidValue = QString("Invalid value for property \"") + propertyName + "\"";
-        QString errorMsgInvalidDataType = QString("Invalid data type for property \"") + propertyName + "\"";
-        QString errorMsgInvalidPropertyPath = QString("Invalid property path");
-
-        const int iMinColorValue = 0;
-        const int iMaxColorValue = 255;
-
-        if (splittedPropertyPathSubCategory.size() == 3)
-        {
-            splittedPropertyPathSubCategory.pop_back();
-            subCategoryName = splittedPropertyPathSubCategory.back();
-            currentPath = QString("") + categoryName + "/" + subCategoryName;
-
-            if (
-                subCategoryName != "TexType" &&
-                subCategoryName != "Filter" &&
-                subCategoryName != "IsProjectedTexGen" &&
-                subCategoryName != "TexGenType" &&
-                subCategoryName != "Wave X" &&
-                subCategoryName != "Wave Y" &&
-                subCategoryName != "Wave Z" &&
-                subCategoryName != "Wave W" &&
-                subCategoryName != "Shader1" &&
-                subCategoryName != "Shader2" &&
-                subCategoryName != "Shader3" &&
-                subCategoryName != "Tiling" &&
-                subCategoryName != "Rotator" &&
-                subCategoryName != "Oscillator" &&
-                subCategoryName != "Diffuse" &&
-                subCategoryName != "Specular" &&
-                subCategoryName != "Bumpmap" &&
-                subCategoryName != "Heightmap" &&
-                subCategoryName != "Environment" &&
-                subCategoryName != "Detail" &&
-                subCategoryName != "Opacity" &&
-                subCategoryName != "Decal" &&
-                subCategoryName != "SubSurface" &&
-                subCategoryName != "Custom" &&
-                subCategoryName != "[1] Custom"
-                )
-            {
-                throw std::runtime_error((errorMsgInvalidPropertyPath + " (" + currentPath + ")").toUtf8().data());
-            }
-        }
-        else if (splittedPropertyPathSubCategory.size() == 4)
-        {
-            splittedPropertyPathSubCategory.pop_back();
-            subCategoryName = splittedPropertyPathSubCategory.back();
-            splittedPropertyPathSubCategory.pop_back();
-            subSubCategoryName = splittedPropertyPathSubCategory.back();
-            currentPath = categoryName + "/" + subSubCategoryName + "/" + subCategoryName;
-
-            if (
-                subSubCategoryName != "Diffuse" &&
-                subSubCategoryName != "Specular" &&
-                subSubCategoryName != "Bumpmap" &&
-                subSubCategoryName != "Heightmap" &&
-                subSubCategoryName != "Environment" &&
-                subSubCategoryName != "Detail" &&
-                subSubCategoryName != "Opacity" &&
-                subSubCategoryName != "Decal" &&
-                subSubCategoryName != "SubSurface" &&
-                subSubCategoryName != "Custom" &&
-                subSubCategoryName != "[1] Custom"
-                )
-            {
-                throw std::runtime_error((errorMsgInvalidPropertyPath + " (" + currentPath + ")").toUtf8().data());
-            }
-            else if (subCategoryName != "Tiling" && subCategoryName != "Rotator" && subCategoryName != "Oscillator")
-            {
-                throw std::runtime_error((errorMsgInvalidPropertyPath + " (" + currentPath + ")").toUtf8().data());
-            }
-        }
-        else
-        {
-            currentPath = categoryName;
-        }
-
-        if (
-            categoryName == "Material Settings" ||
-            categoryName == "Opacity Settings" ||
-            categoryName == "Lighting Settings" ||
-            categoryName == "Advanced" ||
-            categoryName == "Texture Maps" ||
-            categoryName == "Vertex Deformation" ||
-            categoryName == "Layer Presets")
-        {
-            if (propertyName == "Opacity" || propertyName == "AlphaTest" || propertyName == "Glow Amount")
-            {
-                // int: 0 < x < 100
-                if (!value.is<AZ::s64>())
-                {
-                    throw std::runtime_error(errorMsgInvalidDataType.toUtf8().data());
-                }
-
-                AZ::s64 valueData;
-                AZStd::any_numeric_cast(&value, valueData);
-                if (valueData < 0 || valueData > 100)
-                {
-                    throw std::runtime_error(errorMsgInvalidValue.toUtf8().data());
-                }
-                return true;
-            }
-            else if (propertyName == "Smoothness" || propertyName == "Glossiness")
-            {
-                // int: 0 < x < 255
-                return IsAnyValidRange<AZ::s64>(value, 0, 255, errorMsgInvalidDataType, errorMsgInvalidValue);
-            }
-            else if (propertyName == "Specular Level")
-            {
-                // float: 0.0 < x < 4.0
-                return IsAnyValidRange<double>(value, 0.0, 4.0, errorMsgInvalidDataType, errorMsgInvalidValue);
-            }
-            else if (
-                propertyName == "TileU" ||
-                propertyName == "TileV" ||
-                propertyName == "OffsetU" ||
-                propertyName == "OffsetV" ||
-                propertyName == "RotateU" ||
-                propertyName == "RotateV" ||
-                propertyName == "RotateW" ||
-                propertyName == "Rate" ||
-                propertyName == "Phase" ||
-                propertyName == "Amplitude" ||
-                propertyName == "CenterU" ||
-                propertyName == "CenterV" ||
-                propertyName == "RateU" ||
-                propertyName == "RateV" ||
-                propertyName == "PhaseU" ||
-                propertyName == "PhaseV" ||
-                propertyName == "AmplitudeU" ||
-                propertyName == "AmplitudeV" ||
-                propertyName == "Wave Length X" ||
-                propertyName == "Wave Length Y" ||
-                propertyName == "Wave Length Z" ||
-                propertyName == "Wave Length W" ||
-                propertyName == "Level" ||
-                propertyName == "Amplitude" ||
-                propertyName == "Phase" ||
-                propertyName == "Frequency")
-            {
-                // float: 0.0 < x < 100.0
-                return IsAnyValidRange<double>(value, 0.0, 100.0, errorMsgInvalidDataType, errorMsgInvalidValue);
-            }
-            else if (propertyName == "Voxel Coverage")
-            {
-                // float: 0.0 < x < 1.0
-                return IsAnyValidRange<double>(value, 0.0, 1.0, errorMsgInvalidDataType, errorMsgInvalidValue);
-            }
-            else if (propertyName == "Emissive Intensity")
-            {
-                // float: 0.0 < x < 200.0
-                return IsAnyValidRange<double>(value, 0.0, 200.0, errorMsgInvalidDataType, errorMsgInvalidValue);
-            }
-            else if (propertyName == "Diffuse Color" || propertyName == "Specular Color" || propertyName == "Emissive Color")
-            {
-                // intVector(RGB): 0 < x < 255
-                return IsAnyValidRange<AZ::Color>(value, AZ::Color::CreateZero(), AZ::Color::CreateOne(), errorMsgInvalidDataType, errorMsgInvalidValue);
-            }
-            else if (
-                propertyName == "Link to Material" ||
-                propertyName == "Surface Type" ||
-                propertyName == "Diffuse" ||
-                propertyName == "Specular" ||
-                propertyName == "Bumpmap" ||
-                propertyName == "Heightmap" ||
-                propertyName == "Environment" ||
-                propertyName == "Detail" ||
-                propertyName == "Opacity" ||
-                propertyName == "Decal" ||
-                propertyName == "SubSurface" ||
-                propertyName == "Custom" ||
-                propertyName == "[1] Custom" ||
-                propertyName == "TexType" ||
-                propertyName == "Filter" ||
-                propertyName == "TexGenType" ||
-                propertyName == "Type" ||
-                propertyName == "TypeU" ||
-                propertyName == "TypeV")
-            {
-                // string
-                if (!value.is<AZStd::string_view>())
-                {
-                    throw std::runtime_error(errorMsgInvalidDataType.toUtf8().data());
-                }
-                return true;
-            }
-            else if (
-                propertyName == "Additive" ||
-                propertyName == "Allow layer activation" ||
-                propertyName == "2 Sided" ||
-                propertyName == "No Shadow" ||
-                propertyName == "Use Scattering" ||
-                propertyName == "Hide After Breaking" ||
-                propertyName == "Fog Volume Shading Quality High" ||
-                propertyName == "Blend Terrain Color" ||
-                propertyName == "Propagate Material Settings" ||
-                propertyName == "Propagate Opacity Settings" ||
-                propertyName == "Propagate Lighting Settings" ||
-                propertyName == "Propagate Advanced Settings" ||
-                propertyName == "Propagate Texture Maps" ||
-                propertyName == "Propagate Shader Params" ||
-                propertyName == "Propagate Shader Generation" ||
-                propertyName == "Propagate Vertex Deformation" ||
-                propertyName == "Propagate Layer Presets" ||
-                propertyName == "IsProjectedTexGen" ||
-                propertyName == "IsTileU" ||
-                propertyName == "IsTileV" ||
-                propertyName == "No Draw")
-            {
-                // bool
-                if (!value.is<bool>())
-                {
-                    throw std::runtime_error(errorMsgInvalidDataType.toUtf8().data());
-                }
-                return true;
-            }
-            else if (propertyName == "Shader" || propertyName == "Shader1" || propertyName == "Shader2" || propertyName == "Shader3")
-            {
-                // string && valid shader
-                if (!value.is<AZStd::string_view>())
-                {
-                    throw std::runtime_error(errorMsgInvalidDataType.toUtf8().data());
-                }
-
-                CShaderEnum* pShaderEnum = GetIEditor()->GetShaderEnum();
-                if (!pShaderEnum)
-                {
-                    throw std::runtime_error("Shader enumerator corrupted.");
-                }
-                pShaderEnum->EnumShaders();
-                for (int i = 0; i < pShaderEnum->GetShaderCount(); i++)
-                {
-                    if (pShaderEnum->GetShader(i) == AZStd::any_cast<AZStd::string_view>(value).data())
-                    {
-                        return true;
-                    }
-                }
-            }
-            else if (propertyName == "Noise Scale")
-            {
-                // FloatVec: undefined < x < undefined
-                if (!value.is<AZ::Vector3>())
-                {
-                    throw std::runtime_error(errorMsgInvalidDataType.toUtf8().data());
-                }
-                return true;
-            }
-        }
-        else if (categoryName == "Shader Params")
-        {
-            auto& shaderParams = pMaterial->GetShaderResources().m_ShaderParams;
-            for (int i = 0; i < shaderParams.size(); i++)
-            {
-                if (propertyName == ParseUINameFromPublicParamsScript(shaderParams[i].m_Script.c_str()))
-                {
-                    if (shaderParams[i].m_Type == eType_FLOAT)
-                    {
-                        // float: valid range (from script)
-                        float floatValue;
-                        if (!AZStd::any_numeric_cast<float>(&value, floatValue))
-                        {
-                            throw std::runtime_error(errorMsgInvalidDataType.toUtf8().data());
-                        }
-                        std::map<QString, float> range = ParseValidRangeFromPublicParamsScript(shaderParams[i].m_Script.c_str());
-                        if (floatValue < range["UIMin"] || floatValue > range["UIMax"])
-                        {
-                            QString errorMsg;
-                            errorMsg = QStringLiteral("Invalid value for shader param \"%1\" (min: %2, max: %3)").arg(propertyName).arg(range["UIMin"]).arg(range["UIMax"]);
-                            throw std::runtime_error(errorMsg.toUtf8().data());
-                        }
-                        return true;
-                    }
-                    else if (shaderParams[i].m_Type == eType_FCOLOR)
-                    {
-                        return IsAnyValidRange<AZ::Color>(value, AZ::Color::CreateZero(), AZ::Color::CreateOne(), errorMsgInvalidDataType, errorMsgInvalidValue);
-                    }
-                }
-            }
-        }
-        else if (categoryName == "Shader Generation Params")
-        {
-            for (int i = 0; i < pMaterial->GetShaderGenParamsVars()->GetNumVariables(); i++)
-            {
-                if (propertyName == pMaterial->GetShaderGenParamsVars()->GetVariable(i)->GetHumanName())
-                {
-                    if (!value.is<bool>())
-                    {
-                        throw std::runtime_error(errorMsgInvalidDataType.toUtf8().data());
-                    }
-                    return true;
-                }
-            }
-        }
-        else
-        {
-            throw std::runtime_error((errorMsgInvalidPropertyPath + " (" + currentPath + ")").toUtf8().data());
-        }
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template <typename T>
-    T PyFetchNumericType(const AZStd::any& value)
-    {
-        T numericValue;
-        AZStd::any_numeric_cast(&value, numericValue);
-        return numericValue;
-    }
-
-    AZStd::any PyGetProperty(const char* pPathAndMaterialName, const char* pPathAndPropertyName)
-    {
-        CMaterial* pMaterial = TryLoadingMaterial(pPathAndMaterialName);
-        std::deque<QString> splittedPropertyPath = PreparePropertyPath(pPathAndPropertyName);
-        std::deque<QString> splittedPropertyPathCategory = splittedPropertyPath;
-        QString categoryName = splittedPropertyPath.front();
-        QString subCategoryName = "None";
-        QString subSubCategoryName = "None";
-        QString propertyName = splittedPropertyPath.back();
-        QString errorMsgInvalidPropertyPath = "Invalid property path.";
-        
-        if (splittedPropertyPathCategory.size() == 3)
-        {
-            splittedPropertyPathCategory.pop_back();
-            subCategoryName = splittedPropertyPathCategory.back();
-        }
-        else if (splittedPropertyPathCategory.size() == 4)
-        {
-            splittedPropertyPathCategory.pop_back();
-            subCategoryName = splittedPropertyPathCategory.back();
-            splittedPropertyPathCategory.pop_back();
-            subSubCategoryName = splittedPropertyPathCategory.back();
-        }
-
-        // ########## Material Settings ##########
-        if (categoryName == "Material Settings")
-        {
-            if (propertyName == "Shader")
-            {
-                return AZStd::make_any<AZStd::string>(pMaterial->GetShaderName().toUtf8().data());
-            }
-            else if (propertyName == "Surface Type")
-            {
-                QString stringValue = pMaterial->GetSurfaceTypeName();
-                if (stringValue.startsWith("mat_"))
-                {
-                    stringValue.remove(0, 4);
-                }
-                return AZStd::make_any<AZStd::string>(stringValue.toLatin1().data());
-            }
-            else
-            {
-                throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid material setting.").toUtf8().data());
-            }
-        }
-        // ########## Opacity Settings ##########
-        else if (categoryName == "Opacity Settings")
-        {
-            if (propertyName == "Opacity")
-            {
-                AZ::s64 intValue = aznumeric_cast<AZ::s64>(pMaterial->GetShaderResources().m_LMaterial.m_Opacity * 100.0f);
-                return AZStd::make_any<AZ::s64>(intValue);
-            }
-            else if (propertyName == "AlphaTest")
-            {
-                AZ::s64 intValue = aznumeric_cast<AZ::s64>(pMaterial->GetShaderResources().m_AlphaRef * 100.0f);
-                return AZStd::make_any<AZ::s64>(intValue);
-            }
-            else if (propertyName == "Additive")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetFlags() & MTL_FLAG_ADDITIVE);
-            }
-            else
-            {
-                throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid opacity setting.").toUtf8().data());
-            }
-        }
-        // ########## Lighting Settings ##########
-        else if (categoryName == "Lighting Settings")
-        {
-            if (propertyName == "Diffuse Color")
-            {
-                QColor col = ColorLinearToGamma(ColorF(
-                    pMaterial->GetShaderResources().m_LMaterial.m_Diffuse.r,
-                    pMaterial->GetShaderResources().m_LMaterial.m_Diffuse.g,
-                    pMaterial->GetShaderResources().m_LMaterial.m_Diffuse.b));
-                return AZStd::make_any<AZ::Color>(col.red(), col.green(), col.blue(), 1.0f);
-            }
-            else if (propertyName == "Specular Color")
-            {
-                QColor col = ColorLinearToGamma(ColorF(
-                    pMaterial->GetShaderResources().m_LMaterial.m_Specular.r / pMaterial->GetShaderResources().m_LMaterial.m_Specular.a,
-                    pMaterial->GetShaderResources().m_LMaterial.m_Specular.g / pMaterial->GetShaderResources().m_LMaterial.m_Specular.a,
-                    pMaterial->GetShaderResources().m_LMaterial.m_Specular.b / pMaterial->GetShaderResources().m_LMaterial.m_Specular.a));
-                return AZStd::make_any<AZ::Color>(col.red(), col.green(), col.blue(), 1.0f);
-            }
-            else if (propertyName == "Glossiness")
-            {
-                return AZStd::make_any<float>(pMaterial->GetShaderResources().m_LMaterial.m_Smoothness);
-            }
-            else if (propertyName == "Specular Level")
-            {
-                return AZStd::make_any<float>(pMaterial->GetShaderResources().m_LMaterial.m_Specular.a);
-            }
-            else if (propertyName == "Emissive Color")
-            {
-                QColor col = ColorLinearToGamma(ColorF(
-                    pMaterial->GetShaderResources().m_LMaterial.m_Emittance.r,
-                    pMaterial->GetShaderResources().m_LMaterial.m_Emittance.g,
-                    pMaterial->GetShaderResources().m_LMaterial.m_Emittance.b));
-                return AZStd::make_any<AZ::Color>(col.red(), col.green(), col.blue(), 1.0f);
-            }
-            else if (propertyName == "Emissive Intensity")
-            {
-                return AZStd::make_any<float>(pMaterial->GetShaderResources().m_LMaterial.m_Emittance.a);
-            }
-            else
-            {
-                throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid lighting setting.").toUtf8().data());
-            }
-        }
-        // ########## Advanced ##########
-        else if (categoryName == "Advanced")
-        {
-            if (propertyName == "Allow layer activation")
-            {
-                return AZStd::make_any<bool>(pMaterial->LayerActivationAllowed());
-            }
-            else if (propertyName == "2 Sided")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetFlags() & MTL_FLAG_2SIDED);
-            }
-            else if (propertyName == "No Shadow")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetFlags() & MTL_FLAG_NOSHADOW);
-            }
-            else if (propertyName == "Use Scattering")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetFlags() & MTL_FLAG_SCATTER);
-            }
-            else if (propertyName == "Hide After Breaking")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetFlags() & MTL_FLAG_HIDEONBREAK);
-            }
-            else if (propertyName == "Fog Volume Shading Quality High")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetFlags() & MTL_FLAG_FOG_VOLUME_SHADING_QUALITY_HIGH);
-            }
-            else if (propertyName == "Blend Terrain Color")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetFlags() & MTL_FLAG_BLEND_TERRAIN);
-            }
-            else if (propertyName == "Voxel Coverage")
-            {
-                return AZStd::make_any<float>(aznumeric_cast<float>(pMaterial->GetShaderResources().m_VoxelCoverage) / 255.0f);
-            }
-            else if (propertyName == "Link to Material")
-            {
-                return AZStd::make_any<AZStd::string>(pMaterial->GetMatInfo()->GetMaterialLinkName());
-            }
-            else if (propertyName == "Propagate Material Settings")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_MATERIAL_SETTINGS);
-            }
-            else if (propertyName == "Propagate Opacity Settings")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_OPACITY);
-            }
-            else if (propertyName == "Propagate Lighting Settings")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_LIGHTING);
-            }
-            else if (propertyName == "Propagate Advanced Settings")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_ADVANCED);
-            }
-            else if (propertyName == "Propagate Texture Maps")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_TEXTURES);
-            }
-            else if (propertyName == "Propagate Shader Params")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_SHADER_PARAMS);
-            }
-            else if (propertyName == "Propagate Shader Generation")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_SHADER_GEN);
-            }
-            else if (propertyName == "Propagate Vertex Deformation")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_VERTEX_DEF);
-            }
-            else if (propertyName == "Propagate Layer Presets")
-            {
-                return AZStd::make_any<bool>(pMaterial->GetPropagationFlags() & MTL_PROPAGATE_LAYER_PRESETS);
-            }
-            else
-            {
-                throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid advanced setting.").toUtf8().data());
-            }
-        }
-        // ########## Texture Maps ##########
-        else if (categoryName == "Texture Maps")
-        {
-            SInputShaderResources& shaderResources = pMaterial->GetShaderResources();
-            // ########## Texture Maps / [name] ##########
-            if (splittedPropertyPath.size() == 2)
-            {
-                uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(propertyName));
-                SEfResTexture*  pTextureRes = shaderResources.GetTextureResource(nSlot);
-                if (!pTextureRes || pTextureRes->m_Name.empty())
-                {
-                    AZ_Warning("ShadersSystem", false, "PyGetProperty - Error: empty texture slot [%d] (or missing name) for material %s",
-                        nSlot, pMaterial->GetName().toStdString().c_str());
-                    return AZStd::any();
-                }
-                else
-                {
-                    return AZStd::make_any<AZStd::string>(pTextureRes->m_Name);
-                }
-            }
-            // ########## Texture Maps / [TexType | Filter | IsProjectedTexGen | TexGenType ] ##########
-            else if (splittedPropertyPath.size() == 3)
-            {
-                SEfResTexture* pTextureRes = shaderResources.GetTextureResource(TryConvertingCStringToEEfResTextures(subCategoryName));
-                if (pTextureRes)
-                {
-                    if (propertyName == "TexType")
-                    {
-                        return AZStd::make_any<AZStd::string>(TryConvertingETEX_TypeToCString(pTextureRes->m_Sampler.m_eTexType).toLatin1().data());
-                    }
-                    else if (propertyName == "Filter")
-                    {
-                        return AZStd::make_any<AZStd::string>(TryConvertingTexFilterToCString(pTextureRes->m_Filter).toLatin1().data());
-                    }
-                    else if (propertyName == "IsProjectedTexGen")
-                    {
-                        return AZStd::make_any<bool>(pTextureRes->AddModificator()->m_bTexGenProjected);
-                    }
-                    else if (propertyName == "TexGenType")
-                    {
-                        return AZStd::make_any<AZStd::string>(TryConvertingETexGenTypeToCString(pTextureRes->AddModificator()->m_eTGType).toLatin1().data());
-                    }
-                    else
-                    {
-                        throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid property.").toUtf8().data());
-                    }
-                }
-                else
-                {
-                    AZ_Warning("ShadersSystem", false, "PyGetProperty - Error: empty 'subCategoryName' texture slot [%d] for material %s",
-                        aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subCategoryName)),
-                        pMaterial->GetName().toStdString().c_str());
-                }
-            }
-            // ########## Texture Maps / [Tiling | Rotator | Oscillator] ##########
-            else if (splittedPropertyPath.size() == 4)
-            {
-                SEfResTexture*  pTextureRes = shaderResources.GetTextureResource(TryConvertingCStringToEEfResTextures(subSubCategoryName));
-                if (pTextureRes)
-                {
-                    if (subCategoryName == "Tiling")
-                    {
-                        if (propertyName == "IsTileU")
-                        {
-                            return AZStd::make_any<bool>(pTextureRes->m_bUTile);
-                        }
-                        else if (propertyName == "IsTileV")
-                        {
-                            return AZStd::make_any<bool>(pTextureRes->m_bVTile);
-                        }
-                        else if (propertyName == "TileU")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_Tiling[0]);
-                        }
-                        else if (propertyName == "TileV")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_Tiling[1]);
-                        }
-                        else if (propertyName == "OffsetU")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_Offs[0]);
-                        }
-                        else if (propertyName == "OffsetV")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_Offs[1]);
-                        }
-                        else if (propertyName == "RotateU")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_Rot[0]);
-                        }
-                        else if (propertyName == "RotateV")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_Rot[1]);
-                        }
-                        else if (propertyName == "RotateW")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_Rot[2]);
-                        }
-                        else
-                        {
-                            throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid property.").toUtf8().data());
-                        }
-                    }
-                    else if (subCategoryName == "Rotator")
-                    {
-                        if (propertyName == "Type")
-                        {
-                            return AZStd::make_any<AZStd::string>(TryConvertingETexModRotateTypeToCString(pTextureRes->AddModificator()->m_eRotType).toLatin1().data());
-                        }
-                        else if (propertyName == "Rate")
-                        {
-                            return AZStd::make_any<float>(Word2Degr(pTextureRes->AddModificator()->m_RotOscRate[2]));
-                        }
-                        else if (propertyName == "Phase")
-                        {
-                            return AZStd::make_any<float>(Word2Degr(pTextureRes->AddModificator()->m_RotOscPhase[2]));
-                        }
-                        else if (propertyName == "Amplitude")
-                        {
-                            return AZStd::make_any<float>(Word2Degr(pTextureRes->AddModificator()->m_RotOscAmplitude[2]));
-                        }
-                        else if (propertyName == "CenterU")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_RotOscCenter[0]);
-                        }
-                        else if (propertyName == "CenterV")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_RotOscCenter[1]);
-                        }
-                        else
-                        {
-                            throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid property.").toUtf8().data());
-                        }
-                    }
-                    else if (subCategoryName == "Oscillator")
-                    {
-                        if (propertyName == "TypeU")
-                        {
-                            return AZStd::make_any<AZStd::string>(TryConvertingETexModMoveTypeToCString(pTextureRes->AddModificator()->m_eMoveType[0]).toLatin1().data());
-                        }
-                        else if (propertyName == "TypeV")
-                        {
-                            return AZStd::make_any<AZStd::string>(TryConvertingETexModMoveTypeToCString(pTextureRes->AddModificator()->m_eMoveType[1]).toLatin1().data());
-                        }
-                        else if (propertyName == "RateU")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_OscRate[0]);
-
-                        }
-                        else if (propertyName == "RateV")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_OscRate[1]);
-                        }
-                        else if (propertyName == "PhaseU")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_OscPhase[0]);
-                        }
-                        else if (propertyName == "PhaseV")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_OscPhase[1]);
-                        }
-                        else if (propertyName == "AmplitudeU")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_OscAmplitude[0]);
-                        }
-                        else if (propertyName == "AmplitudeV")
-                        {
-                            return AZStd::make_any<float>(pTextureRes->AddModificator()->m_OscAmplitude[1]);
-                        }
-                        else
-                        {
-                            throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid property.").toUtf8().data());
-                        }
-                    }
-                    else
-                    {
-                        throw std::runtime_error((QString("\"") + subCategoryName + "\" is an invalid sub category.").toUtf8().data());
-                    }
-                }
-                else
-                {
-                    AZ_Warning("ShadersSystem", false, "PyGetProperty - Error: empty 'subSubCategoryName' texture slot [%d] for material %s",
-                        aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subSubCategoryName)),
-                        pMaterial->GetName().toStdString().c_str());
-                }
-            }
-            else
-            {
-                throw std::runtime_error(errorMsgInvalidPropertyPath.toUtf8().data());
-            }
-        }
-        // ########## Shader Params ##########
-        else if (categoryName == "Shader Params")
-        {
-            auto& shaderParams = pMaterial->GetShaderResources().m_ShaderParams;
-
-            for (int i = 0; i < shaderParams.size(); i++)
-            {
-                if (propertyName == ParseUINameFromPublicParamsScript(shaderParams[i].m_Script.c_str()))
-                {
-                    if (shaderParams[i].m_Type == eType_FLOAT)
-                    {
-                        return AZStd::make_any<float>(shaderParams[i].m_Value.m_Float);
-                    }
-                    else if (shaderParams[i].m_Type == eType_FCOLOR)
-                    {
-                        QColor col = ColorLinearToGamma(ColorF(
-                            shaderParams[i].m_Value.m_Vector[0],
-                            shaderParams[i].m_Value.m_Vector[1],
-                            shaderParams[i].m_Value.m_Vector[2]));
-                        return AZStd::make_any<AZ::Color>(col.red(), col.green(), col.blue(), 1.0f);
-                    }
-                }
-            }
-
-            throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid shader param.").toUtf8().data());
-        }
-        // ########## Shader Generation Params ##########
-        else if (categoryName == "Shader Generation Params")
-        {
-            for (int i = 0; i < pMaterial->GetShaderGenParamsVars()->GetNumVariables(); i++)
-            {
-                if (propertyName == pMaterial->GetShaderGenParamsVars()->GetVariable(i)->GetHumanName())
-                {
-                    // get the current Boolean value for this shader variable and return so that the std::runtime_error() will not throw to indicate failure
-                    bool boolValue = false;
-                    pMaterial->GetShaderGenParamsVars()->GetVariable(i)->Get(boolValue);
-                    return AZStd::make_any<bool>(boolValue);
-                }
-            }
-
-            // not matching property was found, so throw a std::runtime_error() to indcate an error
-            throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid shader generation param.").toUtf8().data());
-        }
-        // ########## Vertex Deformation ##########
-        else if (categoryName == "Vertex Deformation")
-        {
-            // ########## Vertex Deformation / [ Type | Wave Length X | Wave Length Y | Wave Length Z | Wave Length W | Noise Scale ] ##########
-            if (splittedPropertyPath.size() == 2)
-            {
-                if (propertyName == "Type")
-                {
-                    return AZStd::make_any<AZStd::string>(TryConvertingEDeformTypeToCString(pMaterial->GetShaderResources().m_DeformInfo.m_eType).toLatin1().data());
-                }
-                else if (propertyName == "Wave Length X")
-                {
-                    return AZStd::make_any<float>(pMaterial->GetShaderResources().m_DeformInfo.m_fDividerX);
-                }
-                else if (propertyName == "Noise Scale")
-                {
-                    return AZStd::make_any<AZ::Vector3>(
-                        pMaterial->GetShaderResources().m_DeformInfo.m_vNoiseScale[0],
-                        pMaterial->GetShaderResources().m_DeformInfo.m_vNoiseScale[1],
-                        pMaterial->GetShaderResources().m_DeformInfo.m_vNoiseScale[2]);
-                }
-                else
-                {
-                    throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid property.").toUtf8().data());
-                }
-            }
-            // ########## Vertex Deformation / [ Wave X ] ##########
-            else if (splittedPropertyPath.size() == 3)
-            {
-                if (subCategoryName == "Wave X")
-                {
-                    SWaveForm2 currentWaveForm;
-                    if (subCategoryName == "Wave X")
-                    {
-                        currentWaveForm = pMaterial->GetShaderResources().m_DeformInfo.m_WaveX;
-                    }
-
-                    if (propertyName == "Type")
-                    {
-                        return AZStd::make_any<AZStd::string>(TryConvertingEWaveFormToCString(currentWaveForm.m_eWFType).toLatin1().data());
-                    }
-                    else if (propertyName == "Level")
-                    {
-                        return AZStd::make_any<float>(currentWaveForm.m_Level);
-                    }
-                    else if (propertyName == "Amplitude")
-                    {
-                        return AZStd::make_any<float>(currentWaveForm.m_Amp);
-                    }
-                    else if (propertyName == "Phase")
-                    {
-                        return AZStd::make_any<float>(currentWaveForm.m_Phase);
-                    }
-                    else if (propertyName == "Frequency")
-                    {
-                        return AZStd::make_any<float>(currentWaveForm.m_Freq);
-                    }
-                    else
-                    {
-                        throw std::runtime_error((QString("\"") + propertyName + "\" is an invalid property.").toUtf8().data());
-                    }
-                }
-                else
-                {
-                    throw std::runtime_error((QString("\"") + categoryName + "\" is an invalid category.").toUtf8().data());
-                }
-            }
-            else
-            {
-                throw std::runtime_error(errorMsgInvalidPropertyPath.toUtf8().data());
-            }
-        }
-        // ########## Layer Presets ##########
-        else if (categoryName == "Layer Presets")
-        {
-            // names are "Shader1", "Shader2" and "Shader3", because all have the name "Shader" in material editor
-            if (splittedPropertyPath.size() == 2)
-            {
-                int shaderNumber = -1;
-                if (propertyName == "Shader1")
-                {
-                    shaderNumber = 0;
-                }
-                else if (propertyName == "Shader2")
-                {
-                    shaderNumber = 1;
-                }
-                else if (propertyName == "Shader3")
-                {
-                    shaderNumber = 2;
-                }
-                else
-                {
-                    throw std::runtime_error("Invalid shader.");
-                }
-
-                return AZStd::make_any<AZStd::string>(pMaterial->GetMtlLayerResources()[shaderNumber].m_shaderName.toLatin1().data());
-            }
-            else if (splittedPropertyPath.size() == 3)
-            {
-                if (propertyName == "No Draw")
-                {
-                    int shaderNumber = -1;
-                    if (subCategoryName == "Shader1")
-                    {
-                        shaderNumber = 0;
-                    }
-                    else if (subCategoryName == "Shader2")
-                    {
-                        shaderNumber = 1;
-                    }
-                    else if (subCategoryName == "Shader3")
-                    {
-                        shaderNumber = 2;
-                    }
-                    else
-                    {
-                        throw std::runtime_error("Invalid shader.");
-                    }
-                    return AZStd::make_any<bool>(pMaterial->GetMtlLayerResources()[shaderNumber].m_nFlags & MTL_LAYER_USAGE_NODRAW);
-                }
-            }
-        }
-
-        throw std::runtime_error(errorMsgInvalidPropertyPath.toUtf8().data());
-        return AZStd::any();
-    }
-
-    void PySetProperty(const char* pPathAndMaterialName, const char* pPathAndPropertyName, const AZStd::any& value)
-    {
-        CMaterial* pMaterial = TryLoadingMaterial(pPathAndMaterialName);
-        std::deque<QString> splittedPropertyPath = PreparePropertyPath(pPathAndPropertyName);
-        std::deque<QString> splittedPropertyPathCategory = splittedPropertyPath;
-        QString categoryName = splittedPropertyPath.front();
-        QString subCategoryName = "None";
-        QString subSubCategoryName = "None";
-        QString propertyName = splittedPropertyPath.back();
-        QString errorMsgInvalidPropertyPath = "Invalid property path.";
-
-        if (!ValidateProperty(pMaterial, splittedPropertyPath, value))
-        {
-            throw std::runtime_error("Invalid property.");
-        }
-
-        QString undoMsg = "Set Material Property";
-        CUndo undo(undoMsg.toUtf8().data());
-        pMaterial->RecordUndo(undoMsg.toUtf8().data(), true);
-
-        if (splittedPropertyPathCategory.size() == 3)
-        {
-            splittedPropertyPathCategory.pop_back();
-            subCategoryName = splittedPropertyPathCategory.back();
-        }
-        else if (splittedPropertyPathCategory.size() == 4)
-        {
-            splittedPropertyPathCategory.pop_back();
-            subCategoryName = splittedPropertyPathCategory.back();
-            splittedPropertyPathCategory.pop_back();
-            subSubCategoryName = splittedPropertyPathCategory.back();
-        }
-
-        // ########## Material Settings ##########
-        if (categoryName == "Material Settings")
-        {
-            if (propertyName == "Shader")
-            {
-                pMaterial->SetShaderName(AZStd::any_cast<AZStd::string_view>(value).data());
-            }
-            else if (propertyName == "Surface Type")
-            {
-                bool isSurfaceExist(false);
-                QString realSurfacename = "";
-                ISurfaceTypeEnumerator* pSurfaceTypeEnum = gEnv->p3DEngine->GetMaterialManager()->GetSurfaceTypeManager()->GetEnumerator();
-                if (pSurfaceTypeEnum)
-                {
-                    for (ISurfaceType* pSurfaceType = pSurfaceTypeEnum->GetFirst(); pSurfaceType; pSurfaceType = pSurfaceTypeEnum->GetNext())
-                    {
-                        QString surfaceName = pSurfaceType->GetName();
-                        realSurfacename = surfaceName;
-                        if (surfaceName.left(4) == "mat_")
-                        {
-                            surfaceName.remove(0, 4);
-                        }
-                        if (surfaceName == AZStd::any_cast<AZStd::string_view>(value).data())
-                        {
-                            isSurfaceExist = true;
-                            pMaterial->SetSurfaceTypeName(realSurfacename);
-                        }
-                    }
-
-                    if (!isSurfaceExist)
-                    {
-                        throw std::runtime_error("Invalid surface type name.");
-                    }
-                }
-                else
-                {
-                    throw std::runtime_error("Surface Type Enumerator corrupted.");
-                }
-            }
-        }
-        // ########## Opacity Settings ##########
-        else if (categoryName == "Opacity Settings")
-        {
-            if (propertyName == "Opacity")
-            {
-                pMaterial->GetShaderResources().m_LMaterial.m_Opacity = PyFetchNumericType<float>(value) / 100.0f;
-            }
-            else if (propertyName == "AlphaTest")
-            {
-                pMaterial->GetShaderResources().m_AlphaRef = PyFetchNumericType<float>(value) / 100.0f;
-            }
-            else if (propertyName == "Additive")
-            {
-                SetMaterialFlag(pMaterial, MTL_FLAG_ADDITIVE, PyFetchNumericType<bool>(value));
-            }
-        }
-        // ########## Lighting Settings ##########
-        else if (categoryName == "Lighting Settings")
-        {
-            if (propertyName == "Diffuse Color")
-            {
-                const AZ::Color* color = AZStd::any_cast<AZ::Color>(&value);
-                pMaterial->GetShaderResources().m_LMaterial.m_Diffuse = ColorGammaToLinear(QColor(color->GetR8(), color->GetG8(), color->GetB8()));
-            }
-            else if (propertyName == "Specular Color")
-            {
-                const AZ::Color* color = AZStd::any_cast<AZ::Color>(&value);
-                ColorF colorFloat = ColorGammaToLinear(QColor(color->GetR8(), color->GetG8(), color->GetB8()));
-                colorFloat.a = pMaterial->GetShaderResources().m_LMaterial.m_Specular.a;
-                colorFloat.r *= colorFloat.a;
-                colorFloat.g *= colorFloat.a;
-                colorFloat.b *= colorFloat.a;
-                pMaterial->GetShaderResources().m_LMaterial.m_Specular = colorFloat;
-            }
-            else if (propertyName == "Glossiness" || propertyName == "Smoothness")
-            {
-                pMaterial->GetShaderResources().m_LMaterial.m_Smoothness = PyFetchNumericType<float>(value);
-            }
-            else if (propertyName == "Specular Level")
-            {
-                const float localVariableAlpha = PyFetchNumericType<float>(value);
-                ColorF colorFloat = pMaterial->GetShaderResources().m_LMaterial.m_Specular;
-                colorFloat.r *= localVariableAlpha;
-                colorFloat.g *= localVariableAlpha;
-                colorFloat.b *= localVariableAlpha;
-                colorFloat.a = 1.0f;
-                pMaterial->GetShaderResources().m_LMaterial.m_Specular = colorFloat;
-            }
-            else if (propertyName == "Emissive Color")
-            {
-                const AZ::Color* color = AZStd::any_cast<AZ::Color>(&value);
-                float emissiveIntensity = pMaterial->GetShaderResources().m_LMaterial.m_Emittance.a;
-                pMaterial->GetShaderResources().m_LMaterial.m_Emittance = ColorGammaToLinear(QColor(color->GetR8(), color->GetG8(), color->GetB8()));
-                pMaterial->GetShaderResources().m_LMaterial.m_Emittance.a = emissiveIntensity;
-            }
-            else if (propertyName == "Emissive Intensity")
-            {
-                pMaterial->GetShaderResources().m_LMaterial.m_Emittance.a = PyFetchNumericType<float>(value);
-            }
-        }
-        // ########## Advanced ##########
-        else if (categoryName == "Advanced")
-        {
-            if (propertyName == "Allow layer activation")
-            {
-                pMaterial->SetLayerActivation(PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "2 Sided")
-            {
-                SetMaterialFlag(pMaterial, MTL_FLAG_2SIDED, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "No Shadow")
-            {
-                SetMaterialFlag(pMaterial, MTL_FLAG_NOSHADOW, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Use Scattering")
-            {
-                SetMaterialFlag(pMaterial, MTL_FLAG_SCATTER, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Hide After Breaking")
-            {
-                SetMaterialFlag(pMaterial, MTL_FLAG_HIDEONBREAK, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Fog Volume Shading Quality High")
-            {
-                SetMaterialFlag(pMaterial, MTL_FLAG_FOG_VOLUME_SHADING_QUALITY_HIGH, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Blend Terrain Color")
-            {
-                SetMaterialFlag(pMaterial, MTL_FLAG_BLEND_TERRAIN, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Voxel Coverage")
-            {
-                pMaterial->GetShaderResources().m_VoxelCoverage = aznumeric_cast<uint8>(PyFetchNumericType<float>(value) * 255.0f);
-            }
-            else if (propertyName == "Link to Material")
-            {
-                pMaterial->GetMatInfo()->SetMaterialLinkName(AZStd::any_cast<AZStd::string_view>(value).data());
-            }
-            else if (propertyName == "Propagate Material Settings")
-            {
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_MATERIAL_SETTINGS, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Opacity Settings")
-            {
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_OPACITY, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Lighting Settings")
-            {
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_LIGHTING, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Advanced Settings")
-            {
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_ADVANCED, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Texture Maps")
-            {
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_TEXTURES, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Shader Params")
-            {
-                if (PyFetchNumericType<bool>(value))
-                {
-                    SetPropagationFlag(pMaterial, MTL_PROPAGATE_MATERIAL_SETTINGS, true);
-                }
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_SHADER_PARAMS, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Shader Generation")
-            {
-                if (PyFetchNumericType<bool>(value))
-                {
-                    SetPropagationFlag(pMaterial, MTL_PROPAGATE_MATERIAL_SETTINGS, true);
-                }
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_SHADER_GEN, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Vertex Deformation")
-            {
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_VERTEX_DEF, PyFetchNumericType<bool>(value));
-            }
-            else if (propertyName == "Propagate Layer Presets")
-            {
-                SetPropagationFlag(pMaterial, MTL_PROPAGATE_LAYER_PRESETS, PyFetchNumericType<bool>(value));
-            }
-        }
-        // ########## Texture Maps ##########
-        else if (categoryName == "Texture Maps")
-        {
-            // ########## Texture Maps / [name] ##########
-            SInputShaderResources& shaderResources = pMaterial->GetShaderResources();
-            if (splittedPropertyPath.size() == 2)
-            {
-                uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(propertyName));
-                auto stringValue = AZStd::any_cast<AZStd::string_view>(value);
-                if (stringValue.empty())
-                {
-                    AZ_Warning("ShadersSystem", false, "PySetProperty - Error: empty texture [%d] name for material %s",
-                        nSlot, pMaterial->GetName().toStdString().c_str());
-                }
-                // notice that the following is an insertion operation if the index did not exist in the map
-                shaderResources.m_TexturesResourcesMap[nSlot].m_Name = stringValue.data();
-            }
-            // ########## Texture Maps / [TexType | Filter | IsProjectedTexGen | TexGenType ] ##########
-            else if (splittedPropertyPath.size() == 3)
-            {
-                uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subCategoryName));
-                // notice that each of the following will add the texture slot if did not exist yet
-                if (propertyName == "TexType")
-                {
-                    shaderResources.m_TexturesResourcesMap[nSlot].m_Sampler.m_eTexType = TryConvertingCStringToETEX_Type(AZStd::any_cast<AZStd::string_view>(value));
-                }
-                else if (propertyName == "Filter")
-                {
-                    shaderResources.m_TexturesResourcesMap[nSlot].m_Filter = TryConvertingCStringToTexFilter(AZStd::any_cast<AZStd::string_view>(value));
-                }
-                else if (propertyName == "IsProjectedTexGen")
-                {
-                    shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_bTexGenProjected = PyFetchNumericType<bool>(value);
-                }
-                else if (propertyName == "TexGenType")
-                {
-                    shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_eTGType = TryConvertingCStringToETexGenType(AZStd::any_cast<AZStd::string_view>(value));
-                }
-            }
-            // ########## Texture Maps / [Tiling | Rotator | Oscillator] ##########
-            else if (splittedPropertyPath.size() == 4)
-            {
-                uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subSubCategoryName));
-                if (subCategoryName == "Tiling")
-                {
-                    if (propertyName == "IsTileU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].m_bUTile = PyFetchNumericType<bool>(value);
-                    }
-                    else if (propertyName == "IsTileV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].m_bVTile = PyFetchNumericType<bool>(value);
-                    }
-                    else if (propertyName == "TileU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_Tiling[0] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "TileV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_Tiling[1] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "OffsetU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_Offs[0] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "OffsetV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_Offs[1] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "RotateU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_Rot[0] = Degr2Word(PyFetchNumericType<float>(value));
-                    }
-                    else if (propertyName == "RotateV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_Rot[1] = Degr2Word(PyFetchNumericType<float>(value));
-                    }
-                    else if (propertyName == "RotateW")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_Rot[2] = Degr2Word(PyFetchNumericType<float>(value));
-                    }
-                }
-                else if (subCategoryName == "Rotator")
-                {
-                    if (propertyName == "Type")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_eRotType = TryConvertingCStringToETexModRotateType(AZStd::any_cast<AZStd::string_view>(value));
-                    }
-                    else if (propertyName == "Rate")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_RotOscRate[2] = Degr2Word(PyFetchNumericType<float>(value));
-                    }
-                    else if (propertyName == "Phase")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_RotOscPhase[2] = Degr2Word(PyFetchNumericType<float>(value));
-                    }
-                    else if (propertyName == "Amplitude")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_RotOscAmplitude[2] = Degr2Word(PyFetchNumericType<float>(value));
-                    }
-                    else if (propertyName == "CenterU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_RotOscCenter[0] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "CenterV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_RotOscCenter[1] = PyFetchNumericType<float>(value);
-                    }
-                }
-                else if (subCategoryName == "Oscillator")
-                {
-                    if (propertyName == "TypeU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_eMoveType[0] = TryConvertingCStringToETexModMoveType(AZStd::any_cast<AZStd::string_view>(value));
-                    }
-                    else if (propertyName == "TypeV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_eMoveType[1] = TryConvertingCStringToETexModMoveType(AZStd::any_cast<AZStd::string_view>(value));
-                    }
-                    else if (propertyName == "RateU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_OscRate[0] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "RateV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_OscRate[1] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "PhaseU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_OscPhase[0] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "PhaseV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_OscPhase[1] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "AmplitudeU")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_OscAmplitude[0] = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "AmplitudeV")
-                    {
-                        shaderResources.m_TexturesResourcesMap[nSlot].AddModificator()->m_OscAmplitude[1] = PyFetchNumericType<float>(value);
-                    }
-                }
-            }
-        }
-        // ########## Shader Params ##########
-        else if (categoryName == "Shader Params")
-        {
-            auto& shaderParams = pMaterial->GetShaderResources().m_ShaderParams;
-
-            for (int i = 0; i < shaderParams.size(); i++)
-            {
-                if (propertyName == ParseUINameFromPublicParamsScript(shaderParams[i].m_Script.c_str()))
-                {
-                    if (shaderParams[i].m_Type == eType_FLOAT)
-                    {
-                        shaderParams[i].m_Value.m_Float = PyFetchNumericType<float>(value);
-                        break;
-                    }
-                    else if (shaderParams[i].m_Type == eType_FCOLOR)
-                    {
-                        const AZ::Color* color = AZStd::any_cast<AZ::Color>(&value);
-                        ColorF colorLinear = ColorGammaToLinear(QColor(color->GetR8(), color->GetG8(), color->GetB8()));
-                        shaderParams[i].m_Value.m_Vector[0] = colorLinear.r;
-                        shaderParams[i].m_Value.m_Vector[1] = colorLinear.g;
-                        shaderParams[i].m_Value.m_Vector[2] = colorLinear.b;
-                        break;
-                    }
-                    else
-                    {
-                        throw std::runtime_error("Invalid data type (Shader Params)");
-                    }
-                }
-            }
-        }
-        // ########## Shader Generation Params ##########
-        else if (categoryName == "Shader Generation Params")
-        {
-            for (int i = 0; i < pMaterial->GetShaderGenParamsVars()->GetNumVariables(); i++)
-            {
-                if (propertyName == pMaterial->GetShaderGenParamsVars()->GetVariable(i)->GetHumanName())
-                {
-                    CVarBlock* shaderGenBlock = pMaterial->GetShaderGenParamsVars();
-                    shaderGenBlock->GetVariable(i)->Set(PyFetchNumericType<bool>(value));
-                    pMaterial->SetShaderGenParamsVars(shaderGenBlock);
-                    break;
-                }
-            }
-        }
-        // ########## Vertex Deformation ##########
-        else if (categoryName == "Vertex Deformation")
-        {
-            // ########## Vertex Deformation / [ Type | Wave Length X | Noise Scale ] ##########
-            if (splittedPropertyPath.size() == 2)
-            {
-                if (propertyName == "Type")
-                {
-                    pMaterial->GetShaderResources().m_DeformInfo.m_eType = TryConvertingCStringToEDeformType(AZStd::any_cast<AZStd::string_view>(value));
-                }
-                else if (propertyName == "Wave Length X")
-                {
-                    pMaterial->GetShaderResources().m_DeformInfo.m_fDividerX = PyFetchNumericType<float>(value);
-                }
-                else if (propertyName == "Noise Scale")
-                {
-                    const AZ::Vector3* vecValue = AZStd::any_cast<AZ::Vector3>(&value);
-                    pMaterial->GetShaderResources().m_DeformInfo.m_vNoiseScale[0] = vecValue->GetX();
-                    pMaterial->GetShaderResources().m_DeformInfo.m_vNoiseScale[1] = vecValue->GetY();
-                    pMaterial->GetShaderResources().m_DeformInfo.m_vNoiseScale[2] = vecValue->GetZ();
-                }
-            }
-            // ########## Vertex Deformation / [ Wave X ] ##########
-            else if (splittedPropertyPath.size() == 3)
-            {
-                if (subCategoryName == "Wave X")
-                {
-                    SWaveForm2& currentWaveForm = pMaterial->GetShaderResources().m_DeformInfo.m_WaveX;
-
-                    if (propertyName == "Type")
-                    {
-                        currentWaveForm.m_eWFType = TryConvertingCStringToEWaveForm(AZStd::any_cast<AZStd::string_view>(value));
-                    }
-                    else if (propertyName == "Level")
-                    {
-                        currentWaveForm.m_Level = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "Amplitude")
-                    {
-                        currentWaveForm.m_Amp = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "Phase")
-                    {
-                        currentWaveForm.m_Phase = PyFetchNumericType<float>(value);
-                    }
-                    else if (propertyName == "Frequency")
-                    {
-                        currentWaveForm.m_Freq = PyFetchNumericType<float>(value);
-                    }
-                }
-            }
-        }
-        // ########## Layer Presets ##########
-        else if (categoryName == "Layer Presets")
-        {
-            // names are "Shader1", "Shader2" and "Shader3", because all have the name "Shader" in material editor
-            if (splittedPropertyPath.size() == 2)
-            {
-                int shaderNumber = -1;
-                if (propertyName == "Shader1")
-                {
-                    shaderNumber = 0;
-                }
-                else if (propertyName == "Shader2")
-                {
-                    shaderNumber = 1;
-                }
-                else if (propertyName == "Shader3")
-                {
-                    shaderNumber = 2;
-                }
-
-                pMaterial->GetMtlLayerResources()[shaderNumber].m_shaderName = AZStd::any_cast<AZStd::string_view>(value).data();
-            }
-            else if (splittedPropertyPath.size() == 3)
-            {
-                if (propertyName == "No Draw")
-                {
-                    int shaderNumber = -1;
-                    if (subCategoryName == "Shader1")
-                    {
-                        shaderNumber = 0;
-                    }
-                    else if (subCategoryName == "Shader2")
-                    {
-                        shaderNumber = 1;
-                    }
-                    else if (subCategoryName == "Shader3")
-                    {
-                        shaderNumber = 2;
-                    }
-
-                    if (pMaterial->GetMtlLayerResources()[shaderNumber].m_nFlags & MTL_LAYER_USAGE_NODRAW && PyFetchNumericType<bool>(value) == false)
-                    {
-                        pMaterial->GetMtlLayerResources()[shaderNumber].m_nFlags = pMaterial->GetMtlLayerResources()[shaderNumber].m_nFlags - MTL_LAYER_USAGE_NODRAW;
-                    }
-                    else if (!(pMaterial->GetMtlLayerResources()[shaderNumber].m_nFlags & MTL_LAYER_USAGE_NODRAW) && PyFetchNumericType<bool>(value) == true)
-                    {
-                        pMaterial->GetMtlLayerResources()[shaderNumber].m_nFlags = pMaterial->GetMtlLayerResources()[shaderNumber].m_nFlags | MTL_LAYER_USAGE_NODRAW;
-                    }
-                }
-            }
-        }
-
-        pMaterial->Update();
-        pMaterial->Save();
-        GetIEditor()->GetMaterialManager()->OnUpdateProperties(pMaterial, true);
-    }
-}
-
-namespace AzToolsFramework
-{
-    void MaterialPythonFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.material' module
-            auto addLegacyMaterial = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Material")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.material");
-            };
-            addLegacyMaterial(behaviorContext->Method("create", PyMaterialCreate, nullptr, "Creates a material."));
-            addLegacyMaterial(behaviorContext->Method("create_multi", PyMaterialCreateMulti, nullptr, "Creates a multi-material."));
-            addLegacyMaterial(behaviorContext->Method("convert_to_multi", PyMaterialConvertToMulti, nullptr, "Converts the selected material to a multi-material."));
-            addLegacyMaterial(behaviorContext->Method("duplicate_current", PyMaterialDuplicateCurrent, nullptr, "Duplicates the current material."));
-            addLegacyMaterial(behaviorContext->Method("merge_selection", PyMaterialMergeSelection, nullptr, "Merges the selected materials."));
-            addLegacyMaterial(behaviorContext->Method("delete_current", PyMaterialDeleteCurrent, nullptr, "Deletes the current material."));
-            addLegacyMaterial(behaviorContext->Method("get_submaterial", PyGetSubMaterial, nullptr, "Gets sub materials of a material."));
-            addLegacyMaterial(behaviorContext->Method("get_property", PyGetProperty, nullptr, "Gets a property of a material."));
-            addLegacyMaterial(behaviorContext->Method("set_property", PySetProperty, nullptr, "Sets a property of a material."));
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Material/MaterialPythonFuncs.h b/Code/Sandbox/Editor/Material/MaterialPythonFuncs.h
deleted file mode 100644
index f04542f466..0000000000
--- a/Code/Sandbox/Editor/Material/MaterialPythonFuncs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <Include/SandboxAPI.h>
-#include <AzCore/Component/Component.h>
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for materials in the Editor
-    class MaterialPythonFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(MaterialPythonFuncsHandler, "{E437BCF2-DE71-43E1-A7EC-DD243EB41F0B}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-} // namespace AzToolsFramework
diff --git a/Code/Sandbox/Editor/Material/PreviewModelView.cpp b/Code/Sandbox/Editor/Material/PreviewModelView.cpp
deleted file mode 100644
index 41a50436d1..0000000000
--- a/Code/Sandbox/Editor/Material/PreviewModelView.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "EditorDefs.h"
-
-//AZCore
-#include <AzCore/Math/MathUtils.h>
-
-//CRY
-#include <ILogFile.h>
-#include <IMaterial.h>
-
-//Editor
-#include <Settings.h>
-#include <IEditor.h>
-#include <IResourceSelectorHost.h>
-#include <Util/Variable.h>
-#include <Util/VariablePropertyType.h>
-#include <QViewport.h>
-#include <QViewportSettings.h>
-#include <DisplaySettings.h>
-
-//EditorCommon
-#include <RenderHelpers/AxisHelper.h>
-
-//Local
-#include "PreviewModelView.h"
-
-//QT
-#include <qapplication.h>
-
-
-
-CPreviewModelView::CPreviewModelView(QWidget* parent)
-    : QViewport(parent, QViewport::StartupMode_Manual) // Manual since we need to set WA_DontCreateNativeAncestors before QViewport::Startup() creates the internal native window and propagates
-    , m_Flags(0)
-    , m_GridColor(150, 150, 150, 40)
-    , m_BackgroundColor(0.5f, 0.5f, 0.5f)
-    , m_TimeScale(1.0f)
-    , m_PlayState(PlayState::NONE)
-    , m_pStaticModel(nullptr)
-    , m_PostUpdateCallback(nullptr)
-    , m_ContextMenuCallback(nullptr)
-{
-#ifdef Q_OS_MACOS
-    // Don't propagate the nativeness up, as dockwidgets on macOS don't like it
-    setAttribute(Qt::WA_DontCreateNativeAncestors);
-#endif
-    Startup();
-
-    //////////////////////////////////////////////////////////
-    //QViewport
-    AddConsumer(this);
-    //////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////
-    //IEditorNotifyListener
-    GetIEditor()->RegisterNotifyListener(this);
-    //////////////////////////////////////////////////////////
-
-    FocusOnScreen();//update the camera ...
-    SetDefaultFlags();
-    UpdateSettings();
-}
-
-CPreviewModelView::~CPreviewModelView()
-{
-    CRY_ASSERT(GetIEditor());
-
-    //////////////////////////////////////////////////////////
-    //IEditorNotifyListener
-    GetIEditor()->UnregisterNotifyListener(this);
-    //////////////////////////////////////////////////////////
-
-    ReleaseModel();
-}
-
-
-bool CPreviewModelView::IsFlagSet(PreviewModelViewFlag flag) const
-{
-    CRY_ASSERT(flag < PreviewModelViewFlag::END_POSSIBLE_ITEMS);
-    return (m_Flags & (1 << static_cast<unsigned int>(flag)));
-}
-
-void CPreviewModelView::ToggleFlag(PreviewModelViewFlag flag)
-{
-    CRY_ASSERT(flag < PreviewModelViewFlag::END_POSSIBLE_ITEMS);
-    if (IsFlagSet(flag))
-    {
-        UnSetFlag(flag);
-    }
-    else
-    {
-        SetFlag(flag);
-    }
-}
-
-void CPreviewModelView::SetFlag(PreviewModelViewFlag flag)
-{
-    CRY_ASSERT(flag < PreviewModelViewFlag::END_POSSIBLE_ITEMS);
-    m_Flags |= (1 << static_cast<unsigned int>(flag));
-}
-
-void CPreviewModelView::UnSetFlag(PreviewModelViewFlag flag)
-{
-    CRY_ASSERT(flag < PreviewModelViewFlag::END_POSSIBLE_ITEMS);
-    m_Flags &= ~(1 << static_cast<unsigned int>(flag));
-}
-
-void CPreviewModelView::ResetPlaybackControls()
-{
-    UnSetFlag(CPreviewModelView::PreviewModelViewFlag::LOOPING_PLAY);
-    m_TimeScale = 1.0f;
-}
-
-void CPreviewModelView::ResetBackgroundColor()
-{
-    SetBackgroundColor(ColorF(0.5f, 0.5f, 0.5f));
-}
-
-void CPreviewModelView::ResetGridColor()
-{
-    SetGridColor(ColorF(150, 150, 150, 40));
-}
-
-void CPreviewModelView::ResetCamera()
-{
-    FocusOnScreen();
-}
-
-void CPreviewModelView::ResetAll()
-{
-    ResetPlaybackControls();
-    ResetGridColor();
-    ResetBackgroundColor();
-    ReleaseModel();
-    SetDefaultFlags();
-}
-
-void CPreviewModelView::SetGridColor(ColorF color)
-{
-    m_GridColor = color;
-}
-
-void CPreviewModelView::SetBackgroundColor(ColorF color)
-{
-    m_BackgroundColor = color;
-}
-
-void CPreviewModelView::SetPlayState(PlayState state)
-{
-    m_PlayState = state;
-}
-
-void CPreviewModelView::SetTimeScale(float scale)
-{
-    m_TimeScale = scale;
-}
-
-CPreviewModelView::PlayState CPreviewModelView::GetPlayState() const
-{
-    return m_PlayState;
-}
-
-float CPreviewModelView::GetTimeScale() const
-{
-    return m_TimeScale;
-}
-
-
-ColorF CPreviewModelView::GetGridColor() const
-{
-    return m_GridColor;
-}
-
-ColorF CPreviewModelView::GetBackgroundColor() const
-{
-    return m_BackgroundColor;
-}
-
-void CPreviewModelView::ImportModel()
-{
-    SResourceSelectorContext x;
-    x.typeName = Prop::GetPropertyTypeToResourceType(ePropertyModel);
-
-    QString currPath = m_ModelFilename.toLower();
-    QString selected = GetIEditor()->GetResourceSelectorHost()->SelectResource(x, currPath);
-    LoadModelFile(selected);
-}
-
-void CPreviewModelView::SetPostUpdateCallback(PostUpdateCallback callback)
-{
-    m_PostUpdateCallback = callback;
-}
-
-void CPreviewModelView::SetContextMenuCallback(ContextMenuCallback callback)
-{
-    m_ContextMenuCallback = callback;
-}
-
-////////////////////////////////////////////////////////
-//QViewportConsumer
-void CPreviewModelView::OnViewportRender(const SRenderContext& rc)
-{
-    ///UPDATE
-    UpdateSettings();//Some changes may take effect next frame ...
-
-    //External updating ...
-    if (m_PostUpdateCallback)
-    {
-        m_PostUpdateCallback();
-    }
-
-    //RENDER
-    CRY_ASSERT(rc.renderParams);
-    CRY_ASSERT(rc.passInfo);
-    RenderModels(*rc.renderParams, *rc.passInfo);
-}
-
-void CPreviewModelView::OnViewportKey([[maybe_unused]] const SKeyEvent& ev)
-{
-}
-
-void CPreviewModelView::OnViewportMouse([[maybe_unused]] const SMouseEvent& ev)
-{
-}
-////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////
-//IEditorNotifyListener
-void CPreviewModelView::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnCloseScene:
-    {
-        ResetAll();
-        break;
-    }
-    case eNotify_OnIdleUpdate:
-    {
-        Update();
-    }
-    break;
-    default:
-        break;
-    }
-}
-///////////////////////////////////////////////////////
-
-
-void CPreviewModelView::UpdateSettings()
-{
-    //Update the settings
-    SViewportSettings allsettings;
-
-    allsettings.background.topColor = m_BackgroundColor;
-    allsettings.background.useGradient = false;
-
-    allsettings.grid.showGrid = IsFlagSet(PreviewModelViewFlag::SHOW_GRID);
-    allsettings.grid.middleColor = m_BackgroundColor;
-    allsettings.grid.mainColor = m_GridColor;
-
-    allsettings.rendering.wireframe = IsFlagSet(PreviewModelViewFlag::DRAW_WIREFRAME);
-    allsettings.rendering.sunlight = IsFlagSet(PreviewModelViewFlag::ENABLE_TIME_OF_DAY);
-    allsettings.rendering.fps = false;
-
-
-    // Set zoom speed to 1.0f for better UI workflow, instead of the default 0.1f
-    allsettings.camera.zoomSpeed = 1.0f;
-    allsettings.camera.moveSpeed = GetIEditor()->GetEditorSettings()->cameraMoveSpeed;
-    allsettings.camera.fastMoveMultiplier = GetIEditor()->GetEditorSettings()->cameraFastMoveSpeed;
-    allsettings.camera.rotationSpeed = GetIEditor()->GetEditorSettings()->cameraRotateSpeed;
-    allsettings.camera.showViewportOrientation = IsFlagSet(PreviewModelViewFlag::SHOW_GRID_AXIS);
-
-    //Set them ...
-    SetSettings(allsettings);
-}
-
-
-
-void CPreviewModelView::RenderModels(SRendParams& rendParams, SRenderingPassInfo& passInfo)
-{
-    if (m_pStaticModel)
-    {
-        if (IsFlagSet(PreviewModelViewFlag::PRECACHE_MATERIAL))
-        {
-            _smart_ptr<IMaterial>  pCurMat = m_pStaticModel->GetMaterial();
-            if (pCurMat)
-            {
-                pCurMat->PrecacheMaterial(0.0f, nullptr, true, true);
-            }
-        }
-        m_pStaticModel->Render(rendParams, passInfo);
-    }
-}
-
-void CPreviewModelView::ReleaseModel()
-{
-    m_ModelFilename = "";
-    SAFE_RELEASE(m_pStaticModel);
-}
-
-void CPreviewModelView::SetDefaultFlags()
-{
-    UnSetFlag(PreviewModelViewFlag::SHOW_OVERDRAW);
-
-    m_Flags = 0;
-
-    SetFlag(PreviewModelViewFlag::SHOW_GRID);
-    SetFlag(PreviewModelViewFlag::SHOW_GRID_AXIS);
-}
-
-void CPreviewModelView::LoadModelFile(const QString& modelFile)
-{
-    //Something to load
-    if (!modelFile.isEmpty())
-    {
-        //Make sure we are not loading the same thing ...
-        if (m_ModelFilename != modelFile)
-        {
-            ReleaseModel();//release any old mesh
-
-            QString strFileExt = Path::GetExt(modelFile);
-            bool isCGF = (QString::compare(strFileExt, CRY_GEOMETRY_FILE_EXT, Qt::CaseInsensitive) == 0);
-
-            // NOTE: have to create a local buffer and evaluate the full message here due to calling into another address space to evaluate va_args
-            // this prevents passing of random data to the log system ... any plugin that does not do it this way is rolling the dice each time.
-            char buffer[2046];
-            CRY_ASSERT(GetIEditor());
-            if (isCGF)
-            {
-                CRY_ASSERT(GetIEditor()->Get3DEngine());
-                // Load object.
-                m_pStaticModel = GetIEditor()->Get3DEngine()->LoadStatObjUnsafeManualRef(modelFile.toUtf8().data(), nullptr, nullptr, false);
-                if (m_pStaticModel)
-                {
-                    m_pStaticModel->AddRef();
-                }
-                else
-                {
-                    CRY_ASSERT(GetIEditor()->GetLogFile());
-                    azsprintf(buffer, "Loading of geometry object %s failed.", modelFile.toUtf8().data());
-                    GetIEditor()->GetLogFile()->Warning(buffer);
-                }
-            }
-            else
-            {
-                CRY_ASSERT(GetIEditor()->GetLogFile());
-                azsprintf(buffer, "Unknown model file (%s) attempting to be loaded.", modelFile.toUtf8().data());
-                GetIEditor()->GetLogFile()->Warning(buffer);
-            }
-
-            //if something was loaded then we store off the model path for the future
-            if (m_pStaticModel)
-            {
-                m_ModelFilename = modelFile;
-            }
-        }
-    }
-}
-
-IStatObj* CPreviewModelView::GetStaticModel()
-{
-    return m_pStaticModel;
-}
-
-void CPreviewModelView::FocusOnScreen()
-{
-    CCamera* camera = Camera();
-    if (camera)
-    {
-        AABB accumulated(2);
-
-        if (m_pStaticModel)
-        {
-            AABB temp;
-            temp.min = m_pStaticModel->GetBoxMin();
-            temp.max = m_pStaticModel->GetBoxMax();
-            accumulated.Add(temp);
-        }
-
-        Vec3 fromDir(1.0f, 1.0f, -0.5f);
-        Vec3 target = accumulated.GetCenter();
-        float bbRadius = accumulated.GetRadius();
-
-        Vec3 dir = fromDir.GetNormalized();
-        Matrix34 tm = Matrix33::CreateRotationVDir(dir, 0);
-        tm.SetTranslation(target - dir * bbRadius);
-        CameraMoved(QuatT(tm), true);
-    }
-}
-
-float CPreviewModelView::GetSpeedScale() const
-{
-    CRY_ASSERT(GetIEditor());
-    CRY_ASSERT(GetIEditor()->GetSystem());
-    CRY_ASSERT(GetIEditor()->GetSystem()->GetITimer());
-    //Taken from CRenderViewport to mirror controls from there ...
-    float speedScale = 60.0f * GetIEditor()->GetSystem()->GetITimer()->GetFrameTime();
-    if (speedScale > 20.0f)
-    {
-        speedScale = 20.0f;
-    }
-    return speedScale;
-}
-
diff --git a/Code/Sandbox/Editor/Material/PreviewModelView.h b/Code/Sandbox/Editor/Material/PreviewModelView.h
deleted file mode 100644
index 3d27983be1..0000000000
--- a/Code/Sandbox/Editor/Material/PreviewModelView.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-//Editor
-#if !defined(Q_MOC_RUN)
-#include "IEditor.h"
-#include "../EditorCommon/QViewport.h"
-#include "../EditorCommon/QViewportConsumer.h"
-
-#endif
-
-struct IStatObj;
-struct SRenderingPassInfo;
-struct SRendParams;
-class CParticleItem;
-class CAxisHelper;
-struct HitContext;
-struct IGizmoMouseDragHandler;
-struct SLodInfo;
-
-namespace RotationDrawHelper
-{
-    class Axis;
-}
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class CPreviewModelView
-    : public QViewport
-    , public QViewportConsumer
-    , public IEditorNotifyListener
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    enum class PlayState
-    {
-        NONE,
-        PLAY,
-        PAUSE,
-        STEP,
-        RESET
-    };
-    enum class SplineMode
-    {
-        NONE,
-        LINE,
-        SINEWAVE,
-        COIL
-    };
-
-    //NOTE: these need to be limited to 32 as these are being used for bit wise operations.
-    enum class PreviewModelViewFlag
-    {
-        DRAW_WIREFRAME = 0,
-
-        SHOW_BOUNDINGBOX,
-        SHOW_GIZMO,
-        SHOW_GRID,
-        SHOW_GRID_AXIS,
-        SHOW_EMITTER_SHAPE,
-        SHOW_OVERDRAW,
-        SHOW_FIRST_CONTAINER,
-
-        LOOPING_PLAY,
-
-        //Spline
-        SPLINE_LOOPING,
-        SPLINE_PINGPONG,
-
-        PRECACHE_MATERIAL,
-
-        ENABLE_TIME_OF_DAY,
-
-        END_POSSIBLE_ITEMS = 32,
-    };
-
-    explicit CPreviewModelView(QWidget* parent);
-    virtual ~CPreviewModelView();
-
-    //Flags
-    bool IsFlagSet(PreviewModelViewFlag flag) const;
-    void ToggleFlag(PreviewModelViewFlag flag);
-    virtual void SetFlag(PreviewModelViewFlag flag);
-    virtual void UnSetFlag(PreviewModelViewFlag flag);
-
-    //Resets
-    void ResetPlaybackControls();
-    void ResetBackgroundColor();
-    void ResetGridColor();
-    virtual void ResetCamera();
-    virtual void ResetAll();
-
-    void SetGridColor(ColorF color);
-    void SetBackgroundColor(ColorF color);
-    void SetPlayState(PlayState state);
-    void SetTimeScale(float scale);
-
-    PlayState GetPlayState() const;
-    float GetTimeScale() const;
-    ColorF GetGridColor() const;
-    ColorF GetBackgroundColor() const;
-
-    void ImportModel();
-
-    void LoadModelFile(const QString& modelFile);
-    IStatObj* GetStaticModel();
-
-    typedef std::function<void()> PostUpdateCallback;
-    void SetPostUpdateCallback(PostUpdateCallback callback);
-
-    typedef std::function<void(Vec2i mousePos)> ContextMenuCallback;
-    void SetContextMenuCallback(ContextMenuCallback callback);
-
-    ////////////////////////////////////////////////////////
-    //QViewportConsumer
-    virtual void OnViewportRender(const SRenderContext& rc) override;
-    virtual void OnViewportKey(const SKeyEvent& ev) override;
-    virtual void OnViewportMouse(const SMouseEvent& ev) override;
-    ////////////////////////////////////////////////////////
-
-    ////////////////////////////////////////////////////////
-    //IEditorNotifyListener
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-    ////////////////////////////////////////////////////////
-
-private:
-
-    //Update
-    void UpdateSettings();
-protected:
-private:
-    //Render
-    void RenderModels(SRendParams& rendParams, SRenderingPassInfo& passInfo);
-
-    //Misc
-    void ReleaseModel();
-    void SetDefaultFlags();
-protected:
-    void FocusOnScreen();
-private:
-    float GetSpeedScale() const;
-
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    ColorF m_GridColor;
-    ColorF m_BackgroundColor;
-
-    QString m_ModelFilename;
-
-
-    IStatObj* m_pStaticModel;
-
-protected:
-    PostUpdateCallback m_PostUpdateCallback;
-    ContextMenuCallback m_ContextMenuCallback;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-protected:
-    PlayState m_PlayState;
-    float m_TimeScale;
-private:
-    unsigned int m_Flags;
-};
diff --git a/Code/Sandbox/Editor/Material/images/filestatus_00.png b/Code/Sandbox/Editor/Material/images/filestatus_00.png
deleted file mode 100644
index 414609f486..0000000000
--- a/Code/Sandbox/Editor/Material/images/filestatus_00.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e5d226d043630028a1fe88af240b627a08966066b605294cc79ff8273588166
-size 194
diff --git a/Code/Sandbox/Editor/Material/images/filestatus_01.png b/Code/Sandbox/Editor/Material/images/filestatus_01.png
deleted file mode 100644
index d644fcfe12..0000000000
--- a/Code/Sandbox/Editor/Material/images/filestatus_01.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f80544a0537398979dd423ffdc8e99c08e47dbe814cd4225646761cbe281eecc
-size 206
diff --git a/Code/Sandbox/Editor/Material/images/filestatus_02.png b/Code/Sandbox/Editor/Material/images/filestatus_02.png
deleted file mode 100644
index da155a1d2a..0000000000
--- a/Code/Sandbox/Editor/Material/images/filestatus_02.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bee8a3d1d5571e5afe0bd02edf0fc58d8297f96494a7c074fd2a37ecda7ae4dc
-size 208
diff --git a/Code/Sandbox/Editor/Material/images/filestatus_03.png b/Code/Sandbox/Editor/Material/images/filestatus_03.png
deleted file mode 100644
index a047cb4599..0000000000
--- a/Code/Sandbox/Editor/Material/images/filestatus_03.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3d0fc234e3154c06abd4e3b8d3d7e52a75f80d527b1d05541f55221cba199d7
-size 183
diff --git a/Code/Sandbox/Editor/Material/images/filestatus_04.png b/Code/Sandbox/Editor/Material/images/filestatus_04.png
deleted file mode 100644
index 519b68d500..0000000000
--- a/Code/Sandbox/Editor/Material/images/filestatus_04.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ffb3586ef4309d8bfa93a581c38fe970e8b0411f170955921054522b0bf52bd3
-size 182
diff --git a/Code/Sandbox/Editor/Material/images/filestatus_05.png b/Code/Sandbox/Editor/Material/images/filestatus_05.png
deleted file mode 100644
index f4f548cdc9..0000000000
--- a/Code/Sandbox/Editor/Material/images/filestatus_05.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f258e9617a1d4c7be16fcab12533a4f0bfe4072151f2140ca41364ef1a3cea62
-size 196
diff --git a/Code/Sandbox/Editor/Material/images/filestatus_06.png b/Code/Sandbox/Editor/Material/images/filestatus_06.png
deleted file mode 100644
index 7b7412b19d..0000000000
--- a/Code/Sandbox/Editor/Material/images/filestatus_06.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68c609d7bde1796f281690148c19694afddcc2cf4ea306116b546327cb50aad2
-size 249
diff --git a/Code/Sandbox/Editor/Material/images/material_00.png b/Code/Sandbox/Editor/Material/images/material_00.png
deleted file mode 100644
index a7f48148f1..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_00.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd5106eebb6cf264fdac5f3568977fc8f944df4a4d4de6b0e9f35b3a001a3001
-size 206
diff --git a/Code/Sandbox/Editor/Material/images/material_01.png b/Code/Sandbox/Editor/Material/images/material_01.png
deleted file mode 100644
index e6c26f748a..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_01.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b08a8d94c64aed944901b76afcb921c3df2c122c9eac6d52140552c2eb4e5cc
-size 227
diff --git a/Code/Sandbox/Editor/Material/images/material_02.png b/Code/Sandbox/Editor/Material/images/material_02.png
deleted file mode 100644
index a116e84295..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_02.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:623a937f09f1de3ebb889d7ac9e042f91bf67bef34695801b3603f4517166c8e
-size 223
diff --git a/Code/Sandbox/Editor/Material/images/material_03.png b/Code/Sandbox/Editor/Material/images/material_03.png
deleted file mode 100644
index a116e84295..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_03.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:623a937f09f1de3ebb889d7ac9e042f91bf67bef34695801b3603f4517166c8e
-size 223
diff --git a/Code/Sandbox/Editor/Material/images/material_04.png b/Code/Sandbox/Editor/Material/images/material_04.png
deleted file mode 100644
index 1d83e3526a..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_04.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ad56ab7be0a5a40b644045ac01c90fed6e70433a693e80c5b4b88d63801d75f
-size 14604
diff --git a/Code/Sandbox/Editor/Material/images/material_05.png b/Code/Sandbox/Editor/Material/images/material_05.png
deleted file mode 100644
index 8d953a6ae4..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_05.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9cc845c4eb0ed6fb772064d73f1c679e3b28288411a02f0cafaf248b83b44ca2
-size 221
diff --git a/Code/Sandbox/Editor/Material/images/material_06.png b/Code/Sandbox/Editor/Material/images/material_06.png
deleted file mode 100644
index 7e5159a2fc..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_06.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:966fd5ef5c1e0fe6e920511952d7aea98ad0f165f9ce0197f000f9f48ccd338b
-size 14628
diff --git a/Code/Sandbox/Editor/Material/images/material_07.png b/Code/Sandbox/Editor/Material/images/material_07.png
deleted file mode 100644
index 7e5159a2fc..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_07.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:966fd5ef5c1e0fe6e920511952d7aea98ad0f165f9ce0197f000f9f48ccd338b
-size 14628
diff --git a/Code/Sandbox/Editor/Material/images/material_browser_00.png b/Code/Sandbox/Editor/Material/images/material_browser_00.png
deleted file mode 100644
index f1e7a2ffce..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_browser_00.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4a8dc85c9928faacd184148aaf0f17ef7b68c185b04b0b5f16e942fb11c528e
-size 209
diff --git a/Code/Sandbox/Editor/Material/images/material_browser_01.png b/Code/Sandbox/Editor/Material/images/material_browser_01.png
deleted file mode 100644
index 1ff2ea213f..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_browser_01.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9047378404e0893b79bafaad9e6b312d467033daab2191a8c8839e4ff494bd8
-size 321
diff --git a/Code/Sandbox/Editor/Material/images/material_browser_02.png b/Code/Sandbox/Editor/Material/images/material_browser_02.png
deleted file mode 100644
index edd5148133..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_browser_02.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e79122edef52c3f9a31fd662f9f5cfd08b06e44e861c7379d8869635fd1d245
-size 168
diff --git a/Code/Sandbox/Editor/Material/images/material_browser_03.png b/Code/Sandbox/Editor/Material/images/material_browser_03.png
deleted file mode 100644
index bfbcc6ce98..0000000000
--- a/Code/Sandbox/Editor/Material/images/material_browser_03.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cc16bbb4c4c0c1bea14c94d0609f4b11a7cd0ead4af3d236d329a404e8223a8
-size 200
diff --git a/Code/Sandbox/Editor/MaterialSender.cpp b/Code/Sandbox/Editor/MaterialSender.cpp
deleted file mode 100644
index 2123eadb31..0000000000
--- a/Code/Sandbox/Editor/MaterialSender.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "EditorDefs.h"
-
-#include "MaterialSender.h"
-
-bool CMaterialSender::SendMessage(int msg, const XmlNodeRef& node)
-{
-    bool bRet = false;
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    if (!CheckWindows())
-    {
-        return false;
-    }
-
-    m_h.msg = msg;
-
-    int nDataSize = sizeof(SMaterialMapFileHeader) + strlen(node->getXML().c_str()) + 1;
-
-    //hMapFile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, nDataSize, "EditMatMappingObject");
-
-    HANDLE mapFileHandle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, "EditMatMappingObject");
-    if (mapFileHandle)
-    {
-        void* pMes = MapViewOfFile(mapFileHandle, FILE_MAP_ALL_ACCESS, 0, 0, nDataSize);
-        if (pMes)
-        {
-            memcpy(pMes, &m_h, sizeof(SMaterialMapFileHeader));
-            azstrcpy(((char*)pMes) + sizeof(SMaterialMapFileHeader), nDataSize - sizeof(SMaterialMapFileHeader), node->getXML().c_str());
-            UnmapViewOfFile(pMes);
-            if (m_bIsMatEditor)
-            {
-                ::SendMessage(m_h.GetMaxHWND(), WM_MATEDITSEND, msg, 0);
-            }
-            else
-            {
-                ::SendMessage(m_h.GetEditorHWND(), WM_MATEDITSEND, msg, 0);
-            }
-            bRet = true;
-        }
-        CloseHandle(mapFileHandle);
-    }
-    else
-    {
-        CryLog("No File Map");
-    }
-#endif
-
-    return bRet;
-}
diff --git a/Code/Sandbox/Editor/MaterialSender.h b/Code/Sandbox/Editor/MaterialSender.h
deleted file mode 100644
index 0123223821..0000000000
--- a/Code/Sandbox/Editor/MaterialSender.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_MATERIALSENDER_H
-#define CRYINCLUDE_EDITOR_MATERIALSENDER_H
-#pragma once
-
-#ifndef WM_MATEDITSEND
-// Value copied from Code/Tools/MaxCryExport/CryShader/MaterialSender.h
-# define WM_MATEDITSEND (WM_USER + 315)
-#endif
-
-enum EMaterialSenderMessage
-{
-    eMSM_Create = 1,
-    eMSM_GetSelectedMaterial = 2,
-    eMSM_Init = 3,
-};
-
-#if defined(AZ_PLATFORM_WINDOWS)
-struct SMaterialMapFileHeader
-{
-    // max
-    void SetMaxHWND(HWND hWnd)
-    {
-        hwndMax = (int64)hWnd;
-    }
-    HWND GetMaxHWND() const
-    {
-        return (HWND)hwndMax;
-    }
-    // editor
-    void SetEditorHWND(HWND hWnd)
-    {
-        hwndMatEdit = (int64)hWnd;
-    }
-    HWND GetEditorHWND() const
-    {
-        return (HWND)hwndMatEdit;
-    }
-    int64 msg;// 64bits for both 32 and 64
-    int64 Reserved;// 64bits for both 32 and 64
-protected:
-    uint64 hwndMax;// HWND for 32 and 64 is different
-    uint64 hwndMatEdit;// HWND for 32 and 64 is different
-};
-#endif // AZ_PLATFORM_WINDOWS
-
-
-class CMaterialSender
-{
-public:
-
-    CMaterialSender(bool bIsMatEditor)
-        : m_bIsMatEditor(bIsMatEditor)
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        m_h.SetEditorHWND(0);
-        m_h.SetMaxHWND(0);
-        m_h.msg = 0;
-        hMapFile = 0;
-#endif
-    }
-
-    ~CMaterialSender()
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        if (hMapFile)
-        {
-            CloseHandle(hMapFile);
-        }
-        hMapFile = 0;
-#endif
-    }
-
-    bool GetMessage()
-    {
-        LoadMapFile();
-        return true;
-    }
-
-    bool CheckWindows()
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        if (!m_h.GetMaxHWND() || !m_h.GetEditorHWND() || !::IsWindow(m_h.GetMaxHWND()) || !::IsWindow(m_h.GetEditorHWND()))
-        {
-            LoadMapFile();
-        }
-        if (!m_h.GetMaxHWND() || !m_h.GetEditorHWND() || !::IsWindow(m_h.GetMaxHWND()) || !::IsWindow(m_h.GetEditorHWND()))
-        {
-            return false;
-        }
-#endif
-        return true;
-    }
-
-    bool Create()
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        hMapFile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 1024 * 1024, "EditMatMappingObject");
-        if (hMapFile)
-        {
-            return true;
-        }
-        CryLog("Can't create File Map");
-
-        return false;
-#else
-        return true;
-#endif
-    }
-
-    bool SendMessage(int msg, const XmlNodeRef& node);
-
-    void SetupWindows(QWidget* hwndMax, QWidget* hwndMatEdit)
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        m_h.SetMaxHWND(reinterpret_cast<HWND>(hwndMax->winId()));
-        m_h.SetEditorHWND(reinterpret_cast<HWND>(hwndMatEdit->winId()));
-#endif
-    }
-
-private:
-
-    bool LoadMapFile()
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        bool bRet = false;
-        const HANDLE mapFileHandle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, "EditMatMappingObject");
-        if (mapFileHandle)
-        {
-            void* const pMes = MapViewOfFile(mapFileHandle, FILE_MAP_ALL_ACCESS, 0, 0, 0);
-
-            if (pMes)
-            {
-                memcpy(&m_h, pMes, sizeof(SMaterialMapFileHeader));
-                const char* const pXml = ((const char*)pMes) + sizeof(SMaterialMapFileHeader);
-                m_node = XmlHelpers::LoadXmlFromBuffer(pXml, strlen(pXml));
-                UnmapViewOfFile(pMes);
-                bRet = true;
-            }
-
-            CloseHandle(mapFileHandle);
-        }
-
-        return bRet;
-#else
-        return false;
-#endif
-    }
-
-public:
-#if defined(AZ_PLATFORM_WINDOWS)
-    SMaterialMapFileHeader m_h;
-#endif
-    XmlNodeRef m_node;
-private:
-    bool m_bIsMatEditor;
-#if defined(AZ_PLATFORM_WINDOWS)
-    HANDLE hMapFile;
-#endif
-};
-
-
-#endif // CRYINCLUDE_EDITOR_MATERIALSENDER_H
diff --git a/Code/Sandbox/Editor/ModelViewport.cpp b/Code/Sandbox/Editor/ModelViewport.cpp
index bf15f2fbaf..2e00adb4fc 100644
--- a/Code/Sandbox/Editor/ModelViewport.cpp
+++ b/Code/Sandbox/Editor/ModelViewport.cpp
@@ -29,7 +29,6 @@
 // Editor
 #include "ThumbnailGenerator.h"         // for CThumbnailGenerator
 #include "FileTypeUtils.h"              // for IsPreviewableFileType
-#include "Material/MaterialManager.h"   // for CMaterialManager
 #include "ErrorRecorder.h"
 
 
@@ -652,32 +651,6 @@ void CModelViewport::DrawInfo() const
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CModelViewport::SetCustomMaterial(CMaterial* pMaterial)
-{
-    m_pCurrentMaterial = pMaterial;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CModelViewport::GetMaterial()
-{
-    if (m_pCurrentMaterial)
-    {
-        return m_pCurrentMaterial;
-    }
-    else
-    {
-        _smart_ptr<IMaterial> pMtl = 0;
-        if (m_object)
-        {
-            pMtl = m_object->GetMaterial();
-        }
-
-        CMaterial* pCMaterial = GetIEditor()->GetMaterialManager()->FromIMaterial(pMtl);
-        return pCMaterial;
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 bool CModelViewport::CanDrop([[maybe_unused]] const QPoint& point, IDataBaseItem* pItem)
 {
@@ -686,26 +659,12 @@ bool CModelViewport::CanDrop([[maybe_unused]] const QPoint& point, IDataBaseItem
         return false;
     }
 
-    if (pItem->GetType() == EDB_TYPE_MATERIAL)
-    {
-        SetCustomMaterial((CMaterial*)pItem);
-    }
     return true;
 }
 
 //////////////////////////////////////////////////////////////////////////
-void CModelViewport::Drop([[maybe_unused]] const QPoint& point, IDataBaseItem* pItem)
+void CModelViewport::Drop([[maybe_unused]] const QPoint& point, [[maybe_unused]] IDataBaseItem* pItem)
 {
-    if (!pItem)
-    {
-        SetCustomMaterial(NULL);
-        return;
-    }
-
-    if (pItem->GetType() == EDB_TYPE_MATERIAL)
-    {
-        SetCustomMaterial((CMaterial*)pItem);
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -788,10 +747,6 @@ void CModelViewport::DrawModel(const SRenderingPassInfo& passInfo)
     }
 
     rp.dwFObjFlags  = 0;
-    if (m_pCurrentMaterial)
-    {
-        rp.pMaterial = m_pCurrentMaterial->GetMatInfo();
-    }
 
     //-----------------------------------------------------------------------------
     //-----            Render Static Object (handled by 3DEngine)              ----
diff --git a/Code/Sandbox/Editor/ModelViewport.h b/Code/Sandbox/Editor/ModelViewport.h
index d9b119c5d5..a5d1ac2a26 100644
--- a/Code/Sandbox/Editor/ModelViewport.h
+++ b/Code/Sandbox/Editor/ModelViewport.h
@@ -31,7 +31,6 @@
 
 #if !defined(Q_MOC_RUN)
 #include "RenderViewport.h"
-#include "Material/Material.h"
 #include "Util/Variable.h"
 #endif
 
@@ -90,14 +89,6 @@ public:
 
     void UseWeaponIK([[maybe_unused]] bool val) { m_weaponIK = true; }
 
-    // Set current material to render object.
-    void SetCustomMaterial(CMaterial* pMaterial);
-    // Get custom material that object is rendered with.
-    CMaterial* GetCustomMaterial() { return m_pCurrentMaterial; };
-
-    // Get material the object is actually rendered with.
-    CMaterial* GetMaterial();
-
     void ReleaseObject();
     void RePhysicalize();
 
@@ -182,7 +173,6 @@ protected:
     class CRESky* m_pRESky;
     struct ICVar* m_pSkyboxName;
     IShader* m_pSkyBoxShader;
-    _smart_ptr<CMaterial> m_pCurrentMaterial;
 
     //---------------------------------------------------
     //---    debug options                            ---
diff --git a/Code/Sandbox/Editor/Objects/AxisGizmo.cpp b/Code/Sandbox/Editor/Objects/AxisGizmo.cpp
index 40970838c1..ef2b91685a 100644
--- a/Code/Sandbox/Editor/Objects/AxisGizmo.cpp
+++ b/Code/Sandbox/Editor/Objects/AxisGizmo.cpp
@@ -22,7 +22,6 @@
 #include "ViewManager.h"
 #include "Settings.h"
 #include "RenderHelpers/AxisHelper.h"
-#include "RenderHelpers/AxisHelperExtended.h"
 #include "IObjectManager.h"
 
 //////////////////////////////////////////////////////////////////////////
@@ -36,7 +35,6 @@ CAxisGizmo::CAxisGizmo(CBaseObject* object)
     assert(object != 0);
     m_object = object;
     m_pAxisHelper.reset(new CAxisHelper);
-    m_pAxisHelperExtended.reset(new CAxisHelperExtended);
 
     // Set selectable flag.
     SetFlags(EGIZMO_SELECTABLE | EGIZMO_TRANSFORM_MANIPULATOR);
@@ -60,7 +58,6 @@ CAxisGizmo::CAxisGizmo()
     SetFlags(EGIZMO_SELECTABLE);
     m_axisGizmoCount++;
     m_pAxisHelper.reset(new CAxisHelper);
-    m_pAxisHelperExtended.reset(new CAxisHelperExtended);
     m_bDragging = false;
     m_bAlwaysUseLocal = false;
     m_coordSysBackUp = COORDS_VIEW;
diff --git a/Code/Sandbox/Editor/Objects/AxisGizmo.h b/Code/Sandbox/Editor/Objects/AxisGizmo.h
index 55506ed6b5..689b011972 100644
--- a/Code/Sandbox/Editor/Objects/AxisGizmo.h
+++ b/Code/Sandbox/Editor/Objects/AxisGizmo.h
@@ -22,7 +22,6 @@
 // forward declarations.
 struct DisplayContext;
 class CAxisHelper;
-class CAxisHelperExtended;
 
 /** Gizmo of Objects animation track.
 */
@@ -75,7 +74,6 @@ private:
     CBaseObjectPtr m_object;
     AABB m_bbox;
     std::unique_ptr<CAxisHelper> m_pAxisHelper;
-    std::unique_ptr<CAxisHelperExtended> m_pAxisHelperExtended;
 
     bool m_bDragging;
     QPoint m_cMouseDownPos;
diff --git a/Code/Sandbox/Editor/Objects/BaseObject.cpp b/Code/Sandbox/Editor/Objects/BaseObject.cpp
index a579f303a9..109b28798f 100644
--- a/Code/Sandbox/Editor/Objects/BaseObject.cpp
+++ b/Code/Sandbox/Editor/Objects/BaseObject.cpp
@@ -30,8 +30,6 @@
 #include "DisplaySettings.h"
 #include "Undo/Undo.h"
 #include "UsedResources.h"
-#include "Material/Material.h"
-#include "Material/MaterialManager.h"
 #include "GizmoManager.h"
 #include "Include/IIconManager.h"
 #include "Objects/SelectionGroup.h"
@@ -398,7 +396,6 @@ CBaseObject::CBaseObject()
     , m_classDesc(nullptr)
     , m_numRefs(0)
     , m_parent(nullptr)
-    , m_pMaterial(nullptr)
     , m_bInSelectionBox(false)
     , m_pTransformDelegate(nullptr)
     , m_bMatrixInWorldSpace(false)
@@ -438,7 +435,6 @@ bool CBaseObject::Init([[maybe_unused]] IEditor* ie, CBaseObject* prev, [[maybe_
         SetArea(prev->GetArea());
         SetColor(prev->GetColor());
         m_nMaterialLayersMask = prev->m_nMaterialLayersMask;
-        SetMaterial(prev->GetMaterial());
         SetMinSpec(prev->GetMinSpec(), false);
 
         // Copy all basic variables.
@@ -485,12 +481,6 @@ void CBaseObject::Done()
 
     NotifyListeners(CBaseObject::ON_DELETE);
     m_eventListeners.clear();
-
-    if (m_pMaterial)
-    {
-        m_pMaterial->Release();
-        m_pMaterial = NULL;
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1838,11 +1828,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
         SetFrozen(bFrozen);
         SetHidden(bHidden);
 
-        //////////////////////////////////////////////////////////////////////////
-        // Load material.
-        //////////////////////////////////////////////////////////////////////////
-        SetMaterial(mtlName);
-
         ar.SetResolveCallback(this, parentId, AZStd::bind(&CBaseObject::ResolveParent, this, AZStd::placeholders::_1 ));
         ar.SetResolveCallback(this, lookatId, AZStd::bind(&CBaseObject::SetLookAt, this, AZStd::placeholders::_1));
 
@@ -1912,11 +1897,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
             xmlNode->setAttr("Flags", flags);
         }
 
-        if (m_pMaterial)
-        {
-            xmlNode->setAttr("Material", GetMaterialName().toUtf8().data());
-        }
-
         if (m_nMinSpec != 0)
         {
             xmlNode->setAttr("MinSpec", (uint32)m_nMinSpec);
@@ -1937,11 +1917,6 @@ XmlNodeRef CBaseObject::Export([[maybe_unused]] const QString& levelPath, XmlNod
     objNode->setAttr("Type", GetTypeName().toUtf8().data());
     objNode->setAttr("Name", GetName().toUtf8().data());
 
-    if (m_pMaterial)
-    {
-        objNode->setAttr("Material", m_pMaterial->GetName().toUtf8().data());
-    }
-
     Vec3 pos, scale;
     Quat rotate;
     if (m_parent)
@@ -2926,7 +2901,6 @@ bool CBaseObject::ConvertFromObject(CBaseObject* object)
     {
         object->GetParent()->AttachChild(this);
     }
-    SetMaterial(object->GetMaterial());
     return true;
 }
 
@@ -2981,14 +2955,6 @@ void CBaseObject::Validate(IErrorReport* report)
         report->ReportError(err);
     }
     //////////////////////////////////////////////////////////////////////////
-
-    if (GetMaterial() != NULL && GetMaterial()->IsDummy())
-    {
-        CErrorRecord err;
-        err.error = QStringLiteral("Material: %1 for object: %2 not found,").arg(GetMaterial()->GetName(), GetName());
-        err.pObject = this;
-        report->ReportError(err);
-    }
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -3055,10 +3021,6 @@ void CBaseObject::GatherUsedResources(CUsedResources& resources)
     {
         GetVarBlock()->GatherUsedResources(resources);
     }
-    if (m_pMaterial)
-    {
-        m_pMaterial->GatherUsedResources(resources);
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -3071,50 +3033,6 @@ bool CBaseObject::IsSimilarObject(CBaseObject* pObject)
     return false;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetMaterial(CMaterial* mtl)
-{
-    if (m_pMaterial == mtl)
-    {
-        return;
-    }
-
-    StoreUndo("Assign Material");
-    if (m_pMaterial)
-    {
-        m_pMaterial->Release();
-    }
-    m_pMaterial = mtl;
-    if (m_pMaterial)
-    {
-        m_pMaterial->AddRef();
-    }
-
-    OnMaterialChanged(MATERIALCHANGE_ALL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CBaseObject::GetMaterialName() const
-{
-    if (m_pMaterial)
-    {
-        return m_pMaterial->GetName();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetMaterial(const QString& materialName)
-{
-    CMaterial* pMaterial = NULL;
-    CMaterialManager* pManager = GetIEditor()->GetMaterialManager();
-    if (!materialName.isEmpty() && pManager != NULL)
-    {
-        pMaterial = pManager->LoadMaterial(materialName);
-    }
-    SetMaterial(pMaterial);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CBaseObject::SetMinSpec(uint32 nSpec, bool bSetChildren)
 {
diff --git a/Code/Sandbox/Editor/Objects/BaseObject.h b/Code/Sandbox/Editor/Objects/BaseObject.h
index d62e0bed5f..44df1e5757 100644
--- a/Code/Sandbox/Editor/Objects/BaseObject.h
+++ b/Code/Sandbox/Editor/Objects/BaseObject.h
@@ -35,7 +35,6 @@ class CUndoBaseObject;
 class CObjectManager;
 class CGizmo;
 class CObjectArchive;
-class CMaterial;
 class CEdGeometry;
 struct SSubObjSelectionModifyContext;
 struct SRayHitInfo;
@@ -135,13 +134,6 @@ enum ObjectEditFlags
     OBJECT_COLLAPSE_OBJECTPANEL = 0x004
 };
 
-///////////////////////////////////////////////////////////////////////////
-enum MaterialChangeFlags
-{
-    MATERIALCHANGE_SURFACETYPE = 0x001,
-    MATERIALCHANGE_ALL = 0xFFFFFFFF,
-};
-
 //////////////////////////////////////////////////////////////////////////
 //! Return values from CBaseObject::MouseCreateCallback method.
 enum MouseCreateResult
@@ -554,22 +546,6 @@ public:
     //! Remove event listener callback.
     void RemoveEventListener(EventListener* listener);
 
-    //////////////////////////////////////////////////////////////////////////
-    //! Material handling for this base object.
-    //! Override in derived classes.
-    //////////////////////////////////////////////////////////////////////////
-    //! Assign new material to this object.
-    virtual void SetMaterial(CMaterial* mtl);
-    //! Assign new material to this object as a material name.
-    virtual void SetMaterial(const QString& materialName);
-    //! Get assigned material for this object.
-    virtual CMaterial* GetMaterial() const { return m_pMaterial; };
-    // Get actual rendering material for this object.
-    virtual CMaterial* GetRenderMaterial() const { return m_pMaterial; };
-    // Get the material name. Even though the material pointer is null, the material name can exist separately.
-    virtual QString GetMaterialName() const;
-    virtual void OnMaterialChanged([[maybe_unused]] MaterialChangeFlags change) {}
-
     //////////////////////////////////////////////////////////////////////////
     //! Analyze errors for this object.
     virtual void Validate(IErrorReport* report);
@@ -861,9 +837,6 @@ private:
     //! Pointer to parent node.
     mutable CBaseObject* m_parent;
 
-    //! Material of this object.
-    CMaterial* m_pMaterial;
-
     AABB m_worldBounds;
 
     // The transform delegate
diff --git a/Code/Sandbox/Editor/Objects/EntityObject.cpp b/Code/Sandbox/Editor/Objects/EntityObject.cpp
index 8beda36013..0b2627091c 100644
--- a/Code/Sandbox/Editor/Objects/EntityObject.cpp
+++ b/Code/Sandbox/Editor/Objects/EntityObject.cpp
@@ -25,22 +25,14 @@
 #include "Settings.h"
 #include "Viewport.h"
 #include "LineGizmo.h"
-#include "Material/MaterialManager.h"
 #include "Include/IObjectManager.h"
 #include "Objects/ObjectManager.h"
 #include "ViewManager.h"
-#include "LensFlareEditor/LensFlareManager.h"
-#include "LensFlareEditor/LensFlareUtil.h"
-#include "LensFlareEditor/LensFlareLibrary.h"
 #include "AnimationContext.h"
 #include "HitContext.h"
 #include "Objects/SelectionGroup.h"
 
 
-const char* CEntityObject::s_LensFlarePropertyName("flare_Flare");
-const char* CEntityObject::s_LensFlareMaterialName("EngineAssets/Materials/lens_optics");
-
-
 //////////////////////////////////////////////////////////////////////////
 //! Undo Entity Link
 class CUndoEntityLink
@@ -1084,11 +1076,6 @@ XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlN
 
     objNode->setAttr("Name", GetName().toUtf8().data());
 
-    if (GetMaterial())
-    {
-        objNode->setAttr("Material", GetMaterial()->GetName().toUtf8().data());
-    }
-
     Vec3 pos = GetPos(), scale = GetScale();
     Quat rotate = GetRotation();
 
@@ -1867,17 +1854,6 @@ void CEntityObject::OnLoadFailed()
     GetIEditor()->GetErrorReport()->ReportError(err);
 }
 
-//////////////////////////////////////////////////////////////////////////
-CMaterial* CEntityObject::GetRenderMaterial() const
-{
-    if (GetMaterial())
-    {
-        return GetMaterial();
-    }
-
-    return NULL;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CEntityObject::SetHelperScale(float scale)
 {
@@ -1950,21 +1926,6 @@ void CEntityObject::OnContextMenu(QMenu* pMenu)
     CBaseObject::OnContextMenu(pMenu);
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnMaterialChanged(MaterialChangeFlags change)
-{
-    if (change & MATERIALCHANGE_SURFACETYPE)
-    {
-        m_statObjValidator.Validate(0, GetRenderMaterial());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CEntityObject::GetTooltip() const
-{
-    return m_statObjValidator.GetDescription();
-}
-
 //////////////////////////////////////////////////////////////////////////
 IOpticsElementBasePtr CEntityObject::GetOpticsElement()
 {
@@ -1976,60 +1937,6 @@ IOpticsElementBasePtr CEntityObject::GetOpticsElement()
     return pLight->GetLensOpticsElement();
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SetOpticsElement(IOpticsElementBase* pOptics)
-{
-    CDLight* pLight = GetLightProperty();
-    if (pLight == NULL)
-    {
-        return;
-    }
-    pLight->SetLensOpticsElement(pOptics);
-    if (GetEntityPropertyBool("bFlareEnable") && pOptics)
-    {
-        CBaseObject::SetMaterial(s_LensFlareMaterialName);
-    }
-    else
-    {
-        SetMaterial(NULL);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::ApplyOptics(const QString& opticsFullName, IOpticsElementBasePtr pOptics)
-{
-    if (pOptics == NULL)
-    {
-        CDLight* pLight = GetLightProperty();
-        if (pLight)
-        {
-            pLight->SetLensOpticsElement(NULL);
-        }
-        SetFlareName("");
-        SetMaterial(NULL);
-    }
-    else
-    {
-        int nOpticsIndex(0);
-        if (!gEnv->pOpticsManager->Load(opticsFullName.toUtf8().data(), nOpticsIndex))
-        {
-            IOpticsElementBasePtr pNewOptics = gEnv->pOpticsManager->Create(eFT_Root);
-            if (!gEnv->pOpticsManager->AddOptics(pNewOptics, opticsFullName.toUtf8().data(), nOpticsIndex))
-            {
-                CDLight* pLight = GetLightProperty();
-                if (pLight)
-                {
-                    pLight->SetLensOpticsElement(NULL);
-                    SetMaterial(NULL);
-                }
-                return;
-            }
-            LensFlareUtil::CopyOptics(pOptics, pNewOptics);
-        }
-        SetFlareName(opticsFullName);
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CEntityObject::SetOpticsName(const QString& opticsFullName)
 {
@@ -2040,18 +1947,6 @@ void CEntityObject::SetOpticsName(const QString& opticsFullName)
         {
             pLight->SetLensOpticsElement(NULL);
         }
-        SetFlareName("");
-        SetMaterial(NULL);
-    }
-    else
-    {
-        if (GetOpticsElement())
-        {
-            if (gEnv->pOpticsManager->Rename(GetOpticsElement()->GetName(), opticsFullName.toUtf8().data()))
-            {
-                SetFlareName(opticsFullName);
-            }
-        }
     }
 }
 
@@ -2080,27 +1975,6 @@ CDLight* CEntityObject::GetLightProperty() const
     return NULL;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::GetValidFlareName(QString& outFlareName) const
-{
-    IVariable* pFlareVar(m_pProperties->FindVariable(s_LensFlarePropertyName));
-    if (!pFlareVar)
-    {
-        return false;
-    }
-
-    QString flareName;
-    pFlareVar->Get(flareName);
-    if (flareName.isEmpty() || flareName == "@root")
-    {
-        return false;
-    }
-
-    outFlareName = flareName;
-
-    return true;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CEntityObject::PreInitLightProperty()
 {
@@ -2108,42 +1982,6 @@ void CEntityObject::PreInitLightProperty()
     {
         return;
     }
-
-    QString flareFullName;
-    if (GetValidFlareName(flareFullName))
-    {
-        bool bEnableOptics = GetEntityPropertyBool("bFlareEnable");
-        if (bEnableOptics)
-        {
-            CLensFlareManager* pLensManager = GetIEditor()->GetLensFlareManager();
-            CLensFlareLibrary* pLevelLib = (CLensFlareLibrary*)pLensManager->GetLevelLibrary();
-            IOpticsElementBasePtr pLevelOptics = pLevelLib->GetOpticsOfItem(flareFullName.toUtf8().data());
-            if (pLevelLib && pLevelOptics)
-            {
-                int nOpticsIndex(0);
-                IOpticsElementBasePtr pNewOptics = GetOpticsElement();
-                if (pNewOptics == NULL)
-                {
-                    pNewOptics = gEnv->pOpticsManager->Create(eFT_Root);
-                }
-
-                if (gEnv->pOpticsManager->AddOptics(pNewOptics, flareFullName.toUtf8().data(), nOpticsIndex))
-                {
-                    LensFlareUtil::CopyOptics(pLevelOptics, pNewOptics);
-                    SetOpticsElement(pNewOptics);
-                }
-                else
-                {
-                    CDLight* pLight = GetLightProperty();
-                    if (pLight)
-                    {
-                        pLight->SetLensOpticsElement(NULL);
-                        SetMaterial(NULL);
-                    }
-                }
-            }
-        }
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -2153,26 +1991,6 @@ void CEntityObject::UpdateLightProperty()
     {
         return;
     }
-
-    QString flareName;
-    if (GetValidFlareName(flareName))
-    {
-        IOpticsElementBasePtr pOptics = GetOpticsElement();
-        if (pOptics == NULL)
-        {
-            pOptics = gEnv->pOpticsManager->Create(eFT_Root);
-        }
-        bool bEnableOptics = GetEntityPropertyBool("bFlareEnable");
-        if (bEnableOptics && GetIEditor()->GetLensFlareManager()->LoadFlareItemByName(flareName, pOptics))
-        {
-            pOptics->SetName(flareName.toUtf8().data());
-            SetOpticsElement(pOptics);
-        }
-        else
-        {
-            SetOpticsElement(NULL);
-        }
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/Objects/EntityObject.h b/Code/Sandbox/Editor/Objects/EntityObject.h
index 9964cbd72f..a287cd8828 100644
--- a/Code/Sandbox/Editor/Objects/EntityObject.h
+++ b/Code/Sandbox/Editor/Objects/EntityObject.h
@@ -21,7 +21,6 @@
 
 #include "IMovieSystem.h"
 #include "IEntityObjectListener.h"
-#include "StatObjValidator.h"
 #include "Gizmo.h"
 #include "CryListenerSet.h"
 #include "StatObjBus.h"
@@ -108,8 +107,6 @@ public:
     void SetEntityPropertyFloat(const char* name, float value);
     void SetEntityPropertyString(const char* name, const QString& value);
 
-    virtual QString GetTooltip() const;
-
     virtual int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags);
     virtual void OnContextMenu(QMenu* menu);
 
@@ -134,9 +131,6 @@ public:
 
     virtual void SetTransformDelegate(ITransformDelegate* pTransformDelegate) override;
 
-    virtual CMaterial* GetRenderMaterial() const;
-    virtual void OnMaterialChanged(MaterialChangeFlags change);
-
     // Set attach flags and target
     enum EAttachmentType
     {
@@ -221,10 +215,7 @@ public:
 
     IVariable* GetLightVariable(const char* name) const;
     IOpticsElementBasePtr GetOpticsElement();
-    void SetOpticsElement(IOpticsElementBase* pOptics);
-    void ApplyOptics(const QString& opticsFullName, IOpticsElementBasePtr pOptics);
     void SetOpticsName(const QString& opticsFullName);
-    bool GetValidFlareName(QString& outFlareName) const;
 
     void PreInitLightProperty();
     void UpdateLightProperty();
@@ -236,9 +227,6 @@ public:
 
     static void StoreUndoEntityLink(CSelectionGroup* pGroup);
 
-    static const char* s_LensFlarePropertyName;
-    static const char* s_LensFlareMaterialName;
-
     void RegisterListener(IEntityObjectListener* pListener);
     void UnregisterListener(IEntityObjectListener* pListener);
 
@@ -322,11 +310,6 @@ protected:
     void AdjustLightProperties(CVarBlockPtr& properties, const char* pSubBlock);
     IVariable* FindVariableInSubBlock(CVarBlockPtr& properties, IVariable* pSubBlockVar, const char* pVarName);
 
-    void SetFlareName(const QString& name)
-    {
-        SetEntityPropertyString(s_LensFlarePropertyName, name);
-    }
-
     unsigned int m_bLoadFailed : 1;
     unsigned int m_bCalcPhysics : 1;
     unsigned int m_bDisplayBBox : 1;
@@ -416,8 +399,6 @@ protected:
 
     static float m_helperScale;
 
-    CStatObjValidator m_statObjValidator;
-
     EAttachmentType m_attachmentType;
 
     bool m_bEnableReload;
diff --git a/Code/Sandbox/Editor/Objects/ObjectLoader.cpp b/Code/Sandbox/Editor/Objects/ObjectLoader.cpp
index 746b9e8c73..41f543a5a3 100644
--- a/Code/Sandbox/Editor/Objects/ObjectLoader.cpp
+++ b/Code/Sandbox/Editor/Objects/ObjectLoader.cpp
@@ -17,7 +17,6 @@
 
 // Editor
 #include "Util/PakFile.h"
-#include "Material/MaterialManager.h"
 #include "WaitProgress.h"
 #include "Include/IObjectManager.h"
 
@@ -239,14 +238,6 @@ void CObjectArchive::ResolveObjects()
 
             obj.pObject->CreateGameObject();
 
-            CMaterial* pMaterial = obj.pObject->GetRenderMaterial();
-            CMaterialManager* pManager = GetIEditor()->GetMaterialManager();
-
-            if (pMaterial && pMaterial->GetMatInfo() && pManager)
-            {
-                pManager->OnRequestMaterial(pMaterial->GetMatInfo());
-            }
-
             // unset the current validator object because the wait Step 
             // might generate unrelated errors
             m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr);
diff --git a/Code/Sandbox/Editor/Objects/ObjectManager.cpp b/Code/Sandbox/Editor/Objects/ObjectManager.cpp
index 96d015e2c1..39174774be 100644
--- a/Code/Sandbox/Editor/Objects/ObjectManager.cpp
+++ b/Code/Sandbox/Editor/Objects/ObjectManager.cpp
@@ -25,7 +25,6 @@
 #include "Viewport.h"
 #include "GizmoManager.h"
 #include "AxisGizmo.h"
-#include "ObjectPhysicsManager.h"
 #include "GameEngine.h"
 #include "WaitProgress.h"
 #include "Util/Image.h"
@@ -109,7 +108,6 @@ CObjectManager::CObjectManager()
     , m_pLoadProgress(nullptr)
     , m_loadedObjects(0)
     , m_totalObjectsToLoad(0)
-    , m_pPhysicsManager(new CObjectPhysicsManager())
     , m_bExiting(false)
     , m_isUpdateVisibilityList(false)
     , m_currentHideCount(CBaseObject::s_invalidHiddenID)
@@ -138,7 +136,6 @@ CObjectManager::~CObjectManager()
     DeleteAllObjects();
 
     delete m_gizmoManager;
-    delete m_pPhysicsManager;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -841,8 +838,6 @@ void CObjectManager::Update()
     {
         prevActiveWindow->setFocus();
     }
-
-    m_pPhysicsManager->Update();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1319,7 +1314,7 @@ void CObjectManager::ForceUpdateVisibleObjectCache(DisplayContext& dc)
     FindDisplayableObjects(dc, false);
 }
 
-void CObjectManager::FindDisplayableObjects(DisplayContext& dc, bool bDisplay)
+void CObjectManager::FindDisplayableObjects(DisplayContext& dc, [[maybe_unused]] bool bDisplay)
 {
     // if the new IVisibilitySystem is being used, do not run this logic
     if (ed_visibility_use)
@@ -1346,8 +1341,6 @@ void CObjectManager::FindDisplayableObjects(DisplayContext& dc, bool bDisplay)
     pDispayedViewObjects->ClearObjects();
     pDispayedViewObjects->Reserve(m_visibleObjects.size());
 
-    const bool newViewportInteractionModelEnabled = GetIEditor()->IsNewViewportInteractionModelEnabled();
-
     if (dc.flags & DISPLAY_2D)
     {
         int numVis = m_visibleObjects.size();
@@ -1359,14 +1352,6 @@ void CObjectManager::FindDisplayableObjects(DisplayContext& dc, bool bDisplay)
             if (dc.box.IsIntersectBox(bbox))
             {
                 pDispayedViewObjects->AddObject(obj);
-
-                if (bDisplay && dc.settings->IsDisplayHelpers() && (gSettings.viewports.nShowFrozenHelpers || !obj->IsFrozen()))
-                {
-                    if (!newViewportInteractionModelEnabled)
-                    {
-                        obj->Display(dc);
-                    }
-                }
             }
         }
     }
@@ -1404,14 +1389,6 @@ void CObjectManager::FindDisplayableObjects(DisplayContext& dc, bool bDisplay)
                 if (visRatio > m_maxObjectViewDistRatio || (dc.flags & DISPLAY_SELECTION_HELPERS) || obj->IsSelected())
                 {
                     pDispayedViewObjects->AddObject(obj);
-
-                    if (bDisplay && dc.settings->IsDisplayHelpers() && (gSettings.viewports.nShowFrozenHelpers || !obj->IsFrozen()) && !obj->CheckFlags(OBJFLAG_HIDE_HELPERS))
-                    {
-                        if (!newViewportInteractionModelEnabled)
-                        {
-                            obj->Display(dc);
-                        }
-                    }
                 }
             }
         }
@@ -2361,10 +2338,7 @@ void CObjectManager::UpdateVisibilityList()
         // in the view (frustum) to the visible objects list so we can draw feedback for
         // entities being hidden in the viewport when selected in the  entity outliner
         // (EditorVisibleEntityDataCache must be populated even if entities are 'hidden')
-        if (visible || GetIEditor()->IsNewViewportInteractionModelEnabled())
-        {
-            m_visibleObjects.push_back(obj);
-        }
+        m_visibleObjects.push_back(obj);
     }
 
     m_isUpdateVisibilityList = false;
diff --git a/Code/Sandbox/Editor/Objects/ObjectManager.h b/Code/Sandbox/Editor/Objects/ObjectManager.h
index f13616451e..26905c47cd 100644
--- a/Code/Sandbox/Editor/Objects/ObjectManager.h
+++ b/Code/Sandbox/Editor/Objects/ObjectManager.h
@@ -334,9 +334,6 @@ public:
     virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue);
     virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue);
 
-    class CObjectPhysicsManager* GetPhysicsManager()
-    { return m_pPhysicsManager; }
-
     bool IsReloading() const { return m_bInReloading; }
     void SetSkipUpdate(bool bSkipUpdate) override { m_bSkipObjectUpdate = bSkipUpdate; }
 
@@ -433,8 +430,6 @@ private:
     int m_totalObjectsToLoad;
     //////////////////////////////////////////////////////////////////////////
 
-    class CObjectPhysicsManager* m_pPhysicsManager;
-
     //////////////////////////////////////////////////////////////////////////
     // Numbering for names.
     //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/Objects/ObjectPhysicsManager.cpp b/Code/Sandbox/Editor/Objects/ObjectPhysicsManager.cpp
deleted file mode 100644
index c3886ad7e8..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectPhysicsManager.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "ObjectPhysicsManager.h"
-
-// Editor
-#include "GameEngine.h"
-#include "Commands/CommandManager.h"
-#include "Objects/SelectionGroup.h"
-#include "Include/IObjectManager.h"
-
-#include "CryPhysicsDeprecation.h"
-
-#define MAX_OBJECTS_PHYS_SIMULATION_TIME (5)
-
-//////////////////////////////////////////////////////////////////////////
-CObjectPhysicsManager::CObjectPhysicsManager()
-{
-    CommandManagerHelper::RegisterCommand(GetIEditor()->GetCommandManager(),
-        "physics", "simulate_objects", "", "",
-        AZStd::bind(&CObjectPhysicsManager::Command_SimulateObjects, this));
-    CommandManagerHelper::RegisterCommand(GetIEditor()->GetCommandManager(),
-        "physics", "reset_objects_state", "", "",
-        AZStd::bind(&CObjectPhysicsManager::Command_ResetPhysicsState, this));
-    CommandManagerHelper::RegisterCommand(GetIEditor()->GetCommandManager(),
-        "physics", "get_objects_state", "", "",
-        AZStd::bind(&CObjectPhysicsManager::Command_GetPhysicsState, this));
-
-    m_fStartObjectSimulationTime = 0;
-    m_bSimulatingObjects = false;
-    m_wasSimObjects = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CObjectPhysicsManager::~CObjectPhysicsManager()
-{
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Command_SimulateObjects()
-{
-    SimulateSelectedObjectsPositions();
-}
-
-/////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Command_ResetPhysicsState()
-{
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    for (int i = 0; i < pSelection->GetCount(); i++)
-    {
-        pSelection->GetObject(i)->OnEvent(EVENT_PHYSICS_RESETSTATE);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Command_GetPhysicsState()
-{
-    CSelectionGroup* pSelection = GetIEditor()->GetSelection();
-    for (int i = 0; i < pSelection->GetCount(); i++)
-    {
-        pSelection->GetObject(i)->OnEvent(EVENT_PHYSICS_GETSTATE);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::Update()
-{
-    if (m_bSimulatingObjects)
-    {
-        UpdateSimulatingObjects();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::SimulateSelectedObjectsPositions()
-{
-    CSelectionGroup* pSel = GetIEditor()->GetObjectManager()->GetSelection();
-    if (pSel->IsEmpty())
-    {
-        return;
-    }
-
-    if (GetIEditor()->GetGameEngine()->GetSimulationMode())
-    {
-        return;
-    }
-
-    GetIEditor()->GetGameEngine()->SetSimulationMode(true, true);
-
-    m_simObjects.clear();
-    CRY_PHYSICS_REPLACEMENT_ASSERT();
-    m_wasSimObjects = m_simObjects.size();
-
-    m_fStartObjectSimulationTime = GetISystem()->GetITimer()->GetAsyncCurTime();
-    m_bSimulatingObjects = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::UpdateSimulatingObjects()
-{
-    {
-        CUndo undo("Simulate");
-        CRY_PHYSICS_REPLACEMENT_ASSERT();
-    }
-
-    float curTime = GetISystem()->GetITimer()->GetAsyncCurTime();
-    float runningTime = (curTime - m_fStartObjectSimulationTime);
-
-    if (m_simObjects.empty() || (runningTime > MAX_OBJECTS_PHYS_SIMULATION_TIME))
-    {
-        m_fStartObjectSimulationTime = 0;
-        m_bSimulatingObjects = false;
-        GetIEditor()->GetGameEngine()->SetSimulationMode(false, true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::PrepareForExport()
-{
-    // Clear the collision class set, ready for objects to register
-    // their collision classes
-    m_collisionClasses.clear();
-    m_collisionClassExportId = 0;
-    // First collision-class IS always the default one
-    RegisterCollisionClass(SCollisionClass(0, 0));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool operator == (const SCollisionClass& lhs, const SCollisionClass& rhs)
-{
-    return lhs.type == rhs.type && lhs.ignore == rhs.ignore;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CObjectPhysicsManager::RegisterCollisionClass(const SCollisionClass& collclass)
-{
-    TCollisionClassVector::iterator it = std::find(m_collisionClasses.begin(), m_collisionClasses.end(), collclass);
-    if (it == m_collisionClasses.end())
-    {
-        m_collisionClasses.push_back(collclass);
-        return m_collisionClasses.size() - 1;
-    }
-    return it - m_collisionClasses.begin();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CObjectPhysicsManager::GetCollisionClassId(const SCollisionClass& collclass)
-{
-    TCollisionClassVector::iterator it = std::find(m_collisionClasses.begin(), m_collisionClasses.end(), collclass);
-    if (it == m_collisionClasses.end())
-    {
-        return 0;
-    }
-    return it - m_collisionClasses.begin();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectPhysicsManager::SerializeCollisionClasses(CXmlArchive& xmlAr)
-{
-    if (!xmlAr.bLoading)
-    {
-        // Storing
-        CLogFile::WriteLine("Storing Collision Classes ...");
-
-        XmlNodeRef root = xmlAr.root->newChild("CollisionClasses");
-        int count = m_collisionClasses.size();
-        for (int i = 0; i < count; i++)
-        {
-            SCollisionClass& cc = m_collisionClasses[i];
-            XmlNodeRef xmlCC = root->newChild("CollisionClass");
-            xmlCC->setAttr("type", cc.type);
-            xmlCC->setAttr("ignore", cc.ignore);
-        }
-    }
-}
-
-
-
diff --git a/Code/Sandbox/Editor/Objects/ObjectPhysicsManager.h b/Code/Sandbox/Editor/Objects/ObjectPhysicsManager.h
deleted file mode 100644
index 7711d93208..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectPhysicsManager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTPHYSICSMANAGER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTPHYSICSMANAGER_H
-#pragma once
-
-
-//////////////////////////////////////////////////////////////////////////
-class CObjectPhysicsManager
-{
-public:
-    CObjectPhysicsManager();
-    ~CObjectPhysicsManager();
-
-    void SimulateSelectedObjectsPositions();
-    void Update();
-
-    //////////////////////////////////////////////////////////////////////////
-    /// Collision Classes
-    //////////////////////////////////////////////////////////////////////////
-    int RegisterCollisionClass(const SCollisionClass& collclass);
-    int GetCollisionClassId(const SCollisionClass& collclass);
-    void SerializeCollisionClasses(CXmlArchive& xmlAr);
-
-    void PrepareForExport();
-
-private:
-    void Command_SimulateObjects();
-    void Command_GetPhysicsState();
-    void Command_ResetPhysicsState();
-
-    void UpdateSimulatingObjects();
-
-    bool m_bSimulatingObjects;
-    float m_fStartObjectSimulationTime;
-    int m_wasSimObjects;
-    std::vector<_smart_ptr<CBaseObject> > m_simObjects;
-
-    typedef std::vector<SCollisionClass> TCollisionClassVector;
-    int m_collisionClassExportId;
-    TCollisionClassVector m_collisionClasses;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTPHYSICSMANAGER_H
diff --git a/Code/Sandbox/Editor/Objects/SelectionGroup.cpp b/Code/Sandbox/Editor/Objects/SelectionGroup.cpp
index b883b78e49..08abf8f763 100644
--- a/Code/Sandbox/Editor/Objects/SelectionGroup.cpp
+++ b/Code/Sandbox/Editor/Objects/SelectionGroup.cpp
@@ -20,7 +20,7 @@
 
 // Editor
 #include "ViewManager.h"
-#include "SurfaceInfoPicker.h"
+#include "Include/IObjectManager.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -238,16 +238,6 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
     }
 
     SRayHitInfo pickedInfo;
-    if (moveFlag == eMS_FollowGeometryPosNorm && bValidFollowGeometryMode)
-    {
-        CSurfaceInfoPicker::CExcludedObjects excludeObjects;
-        for (int i = 0; i < GetFilteredCount(); ++i)
-        {
-            excludeObjects.Add(GetFilteredObject(i));
-        }
-        CSurfaceInfoPicker surfacePicker;
-        bValidFollowGeometryMode = surfacePicker.Pick(point, pickedInfo, &excludeObjects);
-    }
 
     if (moveFlag == eMS_FollowGeometryPosNorm)
     {
diff --git a/Code/Sandbox/Editor/Objects/StatObjValidator.cpp b/Code/Sandbox/Editor/Objects/StatObjValidator.cpp
deleted file mode 100644
index 85226fb236..0000000000
--- a/Code/Sandbox/Editor/Objects/StatObjValidator.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "StatObjValidator.h"
-
-// Editor
-#include "Material/Material.h"
-
-
-CStatObjValidator::CStatObjValidator()
-    : m_isValid(true)
-{
-}
-
-template<size_t size>
-bool HasPrefix(const char* name, const char (&prefix)[size])
-{
-    return _strnicmp(name, prefix, size - 1) == 0;
-}
-
-struct SMeshMaterialIssue
-{
-    AZStd::string nodeName;
-    AZStd::string description;
-    int subMaterialIndex;
-
-    SMeshMaterialIssue()
-        : subMaterialIndex(-1)
-    {
-    }
-
-    SMeshMaterialIssue(const AZStd::string& name, const AZStd::string& description)
-        : nodeName(name)
-        , description(description)
-        , subMaterialIndex(-1)
-    {
-    }
-};
-
-static void ValidateMeshMaterials(std::vector<SMeshMaterialIssue>* issues, IStatObj* pStatObj, CMaterial* pMaterial)
-{
-    _smart_ptr<IMaterial> pIMaterial = 0;
-    if (pMaterial)
-    {
-        if (pMaterial->GetParent())
-        {
-            pIMaterial = pMaterial->GetParent()->GetMatInfo();
-        }
-        else
-        {
-            pIMaterial = pMaterial->GetMatInfo();
-        }
-    }
-
-    IIndexedMesh* pIndexedMesh = pStatObj->GetIndexedMesh(true);
-    if (pIndexedMesh)
-    {
-        int breakableSubmeshes = 0;
-        int nonbreakableSubmeshes = 0;
-
-        int subsetCount = pIndexedMesh->GetSubSetCount();
-        for (int i = 0; i < subsetCount; ++i)
-        {
-            const SMeshSubset& subset = pIndexedMesh->GetSubSet(i);
-            if (subset.nNumVerts == 0)
-            {
-                continue;
-            }
-
-            // Check to see if the material uses multiple uv sets and if the vertex format has the same number of texCoord attributes
-            SShaderItem shaderItem = pIMaterial->GetShaderItem(i);
-            if (shaderItem.m_pShader)
-            {
-                size_t materialUVs = shaderItem.m_pShader->GetNumberOfUVSets();
-                size_t meshUVs = subset.vertexFormat.GetAttributeUsageCount(AZ::Vertex::AttributeUsage::TexCoord);
-                if (materialUVs != meshUVs)
-                {
-                    const char* meshName = pStatObj->GetRenderMesh() ? pStatObj->GetRenderMesh()->GetSourceName() : "unknown";
-                    AZStd::string errorMessage;
-                    errorMessage = AZStd::string::format("Material '%s' sub-material %d with %zu uv set(s) was assigned to mesh '%s' with %zu uv set(s). ", pIMaterial->GetName(), i + 1, materialUVs, meshName, meshUVs);
-
-                    AZStd::string recommendedAction;
-                    if (materialUVs < meshUVs)
-                    {
-                        recommendedAction = AZStd::string::format("If you do not intend to use %zu uv sets, remove the extra uv set(s) from the source mesh during the import process. Otherwise, consider checking the desired 'Use uv set 2 for...' shader gen params in the material editor.", meshUVs);
-                    }
-                    else
-                    {
-                        recommendedAction = AZStd::string::format("If you intend to use %zu uv sets, include the additional uv set(s) in the source mesh during the import process. Otherwise, consider unchecking the 'Use uv set 2 for...' shader gen params in the material editor.", materialUVs);
-                    }
-                    errorMessage += recommendedAction;
-                    AZ_Warning("Material Editor", false, errorMessage.c_str());
-                    SMeshMaterialIssue issue(meshName, errorMessage);
-                    issues->push_back(issue);
-                }
-            }
-
-            _smart_ptr<IMaterial> pSubMaterial = pIMaterial->GetSubMtl(subset.nMatID);
-            if (!pSubMaterial)
-            {
-                continue;
-            }
-
-            if (size_t(subset.nMatID) > size_t(pMaterial->GetSubMaterialCount()))
-            {
-                continue;
-            }
-
-            if (pSubMaterial->GetSurfaceType()->GetBreakable2DParams())
-            {
-                ++breakableSubmeshes;
-            }
-            else
-            {
-                ++nonbreakableSubmeshes;
-            }
-        }
-    }
-
-
-    int subobjectCount = pStatObj->GetSubObjectCount();
-    for (int i = 0; i < subobjectCount; ++i)
-    {
-        const IStatObj::SSubObject* subobject = pStatObj->GetSubObject(i);
-        if (subobject->pStatObj)
-        {
-            ValidateMeshMaterials(issues, subobject->pStatObj, pMaterial);
-        }
-    }
-}
-
-void CStatObjValidator::Validate(IStatObj* statObj, CMaterial* editorMaterial)
-{
-    m_description = QString();
-    m_isValid = true;
-
-    _smart_ptr<IMaterial> pIMaterial = 0;
-    if (editorMaterial)
-    {
-        if (editorMaterial->GetParent())
-        {
-            pIMaterial = editorMaterial->GetParent()->GetMatInfo();
-        }
-        else
-        {
-            pIMaterial = editorMaterial->GetMatInfo();
-        }
-    }
-
-    if (statObj && editorMaterial)
-    {
-        std::vector<SMeshMaterialIssue> issues;
-        ValidateMeshMaterials(&issues, statObj, editorMaterial);
-
-        if (!issues.empty())
-        {
-            m_isValid = false;
-        }
-
-        for (size_t i = 0; i < issues.size(); ++i)
-        {
-            const SMeshMaterialIssue& issue = issues[i];
-            if (!m_description.isEmpty())
-            {
-                m_description += "\n";
-            }
-            if (!issue.nodeName.empty())
-            {
-                m_description += "Node ";
-                m_description += issue.nodeName.c_str();
-                m_description += ":";
-            }
-            if (issue.subMaterialIndex >= 0)
-            {
-                m_description += QStringLiteral("SubMaterial %1:").arg(issue.subMaterialIndex + 1);
-            }
-            if (!issue.nodeName.empty() || issue.subMaterialIndex >= 0)
-            {
-                m_description += "\n  ";
-            }
-            if (!issue.description.empty())
-            {
-                m_description += issue.description.c_str();
-            }
-        }
-    }
-}
-
diff --git a/Code/Sandbox/Editor/Objects/StatObjValidator.h b/Code/Sandbox/Editor/Objects/StatObjValidator.h
deleted file mode 100644
index 40145e90c5..0000000000
--- a/Code/Sandbox/Editor/Objects/StatObjValidator.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// This class is supposed to validate CGF with assigned material.
-// Some of the asset issues may be diagnosed only when SurfaceType is known.
-
-#pragma once
-
-class CRYEDIT_API CStatObjValidator
-{
-public:
-    CStatObjValidator();
-
-    void Validate(IStatObj* statObj, CMaterial* editorMaterial);
-    bool IsValid() const { return m_isValid; }
-
-    QString GetDescription() const { return m_description; }
-private:
-    bool m_isValid;
-    QString m_description;
-};
-
diff --git a/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake b/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake
index 484974745d..62523369e7 100644
--- a/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake
+++ b/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake
@@ -9,13 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-ly_add_bundle_resources(
-    TARGET Editor
-    FILES
-        ${CMAKE_SOURCE_DIR}/Code/Tools/RC/Config/rc/xmlfilter.txt
-        ${CMAKE_SOURCE_DIR}/Code/Tools/RC/Config/rc/rc.ini
-)
-
 # Set resources directory for app icons
 target_sources(Editor PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets)
 set_target_properties(Editor PROPERTIES
diff --git a/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake b/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake
index 4058c1d466..4d5680a30d 100644
--- a/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake
+++ b/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake
@@ -8,8 +8,3 @@
 # remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        Legacy::CryRenderNULL
-)
\ No newline at end of file
diff --git a/Code/Sandbox/Editor/PythonEditorFuncs.cpp b/Code/Sandbox/Editor/PythonEditorFuncs.cpp
index 8f735706fd..29cb8eb478 100644
--- a/Code/Sandbox/Editor/PythonEditorFuncs.cpp
+++ b/Code/Sandbox/Editor/PythonEditorFuncs.cpp
@@ -298,7 +298,7 @@ namespace
                 AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
                 QDir engineDir = !engineRoot.empty() ? QDir(QString(engineRoot.c_str())) : QDir::current();
 
-                QString scriptFolder = engineDir.absoluteFilePath("Editor/Scripts/");
+                QString scriptFolder = engineDir.absoluteFilePath("Assets/Editor/Scripts/");
                 Path::ConvertBackSlashToSlash(scriptFolder);
                 path = scriptFolder + pFile;
 
@@ -524,7 +524,7 @@ namespace
                         // for example: Hello
                         return AZStd::make_any<AZStd::string>(stringValue.toUtf8().data());
                     }
-                    else // then it looks like an integer 
+                    else // then it looks like an integer
                     {
                         // for example: 456
                         return AZStd::make_any<AZ::s64>(stringValue.toInt());
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelperExtended.cpp b/Code/Sandbox/Editor/RenderHelpers/AxisHelperExtended.cpp
deleted file mode 100644
index cee7f0f716..0000000000
--- a/Code/Sandbox/Editor/RenderHelpers/AxisHelperExtended.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "AxisHelperExtended.h"
-
-#include "CryPhysicsDeprecation.h"
-
-// Editor
-#include "Include/IDisplayViewport.h"
-#include "SurfaceInfoPicker.h"
-#include "Objects/DisplayContext.h"
-#include "Objects/SelectionGroup.h"
-#include "Util/fastlib.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// Helper Extended Axis object.
-//////////////////////////////////////////////////////////////////////////
-CAxisHelperExtended::CAxisHelperExtended()
-    : m_matrix(IDENTITY)
-    , m_vPos(ZERO)
-    , m_pCurObject(0)
-    , m_dwLastUpdateTime(0)
-    , m_fMaxDist(100.0f)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisHelperExtended::DrawAxes(DisplayContext& dc, const Matrix34& matrix, bool bUsePhysicalProxy)
-{
-    const DWORD dwUpdateTime = 2000; // 2 sec
-    CSelectionGroup* pSel = GetIEditor()->GetSelection();
-    int numSels = pSel->GetCount();
-
-    if (numSels == 0)
-    {
-        return;
-    }
-
-    CBaseObject* pCurObject = pSel->GetObject(numSels - 1); // get just last object for simple check
-
-    // Add current selection to the elements to be skipped
-    CRY_PHYSICS_REPLACEMENT_ASSERT();
-
-    Vec3 x = Vec3(1, 0, 0);
-    Vec3 y = Vec3(0, 1, 0);
-    Vec3 z = Vec3(0, 0, 1);
-
-    Vec3 colR = Vec3(1, 0, 0);
-    Vec3 colG = Vec3(0, 1, 0);
-    Vec3 colB = Vec3(0, 0.8f, 1);
-
-    m_vPos = matrix.GetTranslation();
-
-    Vec3 vDirX = (matrix * x - m_vPos);
-    Vec3 vDirY = (matrix * y - m_vPos);
-    Vec3 vDirZ = (matrix * z - m_vPos);
-    vDirX.Normalize();
-    vDirY.Normalize();
-    vDirZ.Normalize();
-
-    if (
-        m_pCurObject != pCurObject ||
-        GetTickCount() - m_dwLastUpdateTime > dwUpdateTime ||
-        !Matrix34::IsEquivalent(m_matrix, matrix)
-        )
-    {
-        Vec3 outTmp;
-        AABB aabb(m_vPos, m_fMaxDist);
-        m_objects.clear();
-        CBaseObjectsArray allObjects;
-        GetIEditor()->GetObjectManager()->GetObjects(allObjects);
-
-        for (size_t i = 0, n = allObjects.size(); i < n; ++i)
-        {
-            CBaseObject* pObject = allObjects[i];
-            if (pObject->IsSelected() || !pObject->GetEngineNode())
-            {
-                continue;
-            }
-
-            AABB aabbObj;
-            pObject->GetBoundBox(aabbObj);
-
-            if (!Intersect::Ray_AABB(m_vPos, vDirX, aabbObj, outTmp)
-                && !Intersect::Ray_AABB(m_vPos, vDirY, aabbObj, outTmp)
-                && !Intersect::Ray_AABB(m_vPos, vDirZ, aabbObj, outTmp)
-                && !Intersect::Ray_AABB(m_vPos, -vDirX, aabbObj, outTmp)
-                && !Intersect::Ray_AABB(m_vPos, -vDirY, aabbObj, outTmp)
-                && !Intersect::Ray_AABB(m_vPos, -vDirZ, aabbObj, outTmp))
-            {
-                continue;
-            }
-
-            if (aabb.IsIntersectBox(aabbObj))
-            {
-                m_objects.push_back(pObject);
-            }
-        }
-        m_dwLastUpdateTime = GetTickCount();
-    }
-    m_pCurObject = pCurObject;
-    m_matrix = matrix;
-
-    DrawAxis(dc, vDirX, z, colR, bUsePhysicalProxy);
-    DrawAxis(dc, vDirY, z, colG, bUsePhysicalProxy);
-    DrawAxis(dc, vDirZ, x, colB, bUsePhysicalProxy);
-    DrawAxis(dc, -vDirX, z, colR, bUsePhysicalProxy);
-    DrawAxis(dc, -vDirY, z, colG, bUsePhysicalProxy);
-    DrawAxis(dc, -vDirZ, x, colB, bUsePhysicalProxy);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisHelperExtended::DrawAxis(DisplayContext& dc, const Vec3& vDir, const Vec3& vUpAxis, const Vec3& col, bool bUsePhysicalProxy)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    const float fBallSize = 0.005f;
-    const float fTextSize = 1.4f;
-
-    float fDist = m_fMaxDist + 1.0f;
-    size_t objectsSize = m_objects.size();
-    for (size_t i = 0; i < objectsSize; ++i)
-    {
-        CBaseObject* pObject = m_objects[i];
-        if (pObject->CheckFlags(OBJFLAG_DELETED))
-        {
-            continue;
-        }
-
-        SRayHitInfo hitInfo;
-        if (pObject->IntersectRayMesh(m_vPos, vDir, hitInfo))
-        {
-            Vec3 newP = pObject->GetWorldTM().TransformPoint(hitInfo.vHitPos);
-            float fNewDist = (newP - m_vPos).GetLength();
-            if (fDist > fNewDist)
-            {
-                fDist = fNewDist;
-            }
-        }
-    }
-
-    if (bUsePhysicalProxy)
-    {
-        CRY_PHYSICS_REPLACEMENT_ASSERT();
-    }
-    else
-    {
-        CSurfaceInfoPicker picker;
-        m_objectsForPicker.assign(m_objects.begin(), m_objects.end());
-        picker.SetObjects(&m_objectsForPicker);
-        SRayHitInfo hitInfo;
-        if (picker.Pick(m_vPos, fDist * vDir, hitInfo, NULL, CSurfaceInfoPicker::ePOG_All))
-        {
-            fDist = hitInfo.fDistance;
-        }
-        picker.SetObjects(0);
-    }
-
-    if (fDist < m_fMaxDist)
-    {
-        Vec3 p = m_vPos + vDir * fDist;
-
-        dc.SetColor(col);
-        dc.DrawLine(m_vPos, p);
-        float fScreenScale = dc.view->GetScreenScaleFactor(p);
-        dc.DrawBall(p, fBallSize * fScreenScale);
-        QString label;
-        label = QString::number(fDist, 'f', 2);
-        dc.DrawTextOn2DBox((p + m_vPos) * 0.5f, label.toUtf8().data(), fTextSize, col, ColorF(0.0f, 0.0f, 0.0f, 0.7f));
-
-        Vec3 vUp = (m_matrix * vUpAxis - m_vPos);
-        vUp.Normalize();
-
-        Vec3 u = vUp;
-        Vec3 v = vDir ^ vUp;
-        float fPlaneSize = fDist / 4.0f;
-        float alphaMax = 1.0f, alphaMin = 0.0f;
-        ColorF colAlphaMin = ColorF(col.x, col.y, col.z, alphaMin);
-
-        float fStepSize = dc.view->GetGridStep();
-        const int MIN_STEP_COUNT = 5;
-        const int MAX_STEP_COUNT = 20;
-        int nSteps = std::min(std::max(FloatToIntRet(fPlaneSize / fStepSize), MIN_STEP_COUNT), MAX_STEP_COUNT);
-        float fGridSize = nSteps * fStepSize;
-
-        for (int i = -nSteps; i <= nSteps; ++i)
-        {
-            Vec3 stepV = v * (fStepSize * i);
-            Vec3 stepU = u * (fStepSize * i);
-            ColorF colCurAlpha = ColorF(col.x, col.y, col.z, alphaMax - fabsf(float(i) / float(nSteps)) * (alphaMax - alphaMin));
-            // Draw u lines.
-            dc.DrawLine(p + stepV, p + u * fGridSize + stepV, colCurAlpha, colAlphaMin);
-            dc.DrawLine(p + stepV, p - u * fGridSize + stepV, colCurAlpha, colAlphaMin);
-            // Draw v lines.
-            dc.DrawLine(p + stepU, p + v * fGridSize + stepU, colCurAlpha, colAlphaMin);
-            dc.DrawLine(p + stepU, p - v * fGridSize + stepU, colCurAlpha, colAlphaMin);
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelperExtended.h b/Code/Sandbox/Editor/RenderHelpers/AxisHelperExtended.h
deleted file mode 100644
index 42a1c66b9c..0000000000
--- a/Code/Sandbox/Editor/RenderHelpers/AxisHelperExtended.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPEREXTENDED_H
-#define CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPEREXTENDED_H
-#pragma once
-
-#include "Objects/BaseObject.h"
-#include "Include/IObjectManager.h"
-
-struct DisplayContext;
-struct HitContext;
-
-class CAxisHelperExtended
-{
-public:
-    CAxisHelperExtended();
-    void DrawAxes(DisplayContext& dc, const Matrix34& matrix, bool bUsePhysicalProxy);
-
-private:
-    void DrawAxis(DisplayContext& dc, const Vec3& vDirAxis, const Vec3& vUpAxis, const Vec3& col, bool bUsePhysicalProxy);
-
-private:
-    Matrix34 m_matrix;
-    Vec3 m_vPos;
-    std::vector<CBaseObjectPtr> m_objects;
-    CBaseObjectsArray m_objectsForPicker;
-    CBaseObject* m_pCurObject;
-    DWORD m_dwLastUpdateTime;
-
-    float m_fMaxDist;
-};
-
-#endif // CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPEREXTENDED_H
diff --git a/Code/Sandbox/Editor/RenderViewport.cpp b/Code/Sandbox/Editor/RenderViewport.cpp
index af4cbd46bc..cac1840b75 100644
--- a/Code/Sandbox/Editor/RenderViewport.cpp
+++ b/Code/Sandbox/Editor/RenderViewport.cpp
@@ -275,8 +275,6 @@ void CRenderViewport::resizeEvent(QResizeEvent* event)
 
     gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, width(), height());
 
-    gEnv->pRenderer->EF_DisableTemporalEffects();
-
     if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
     {
         // We queue the window resize event because the render overlay may be hidden.
@@ -472,61 +470,40 @@ void CRenderViewport::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoin
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        bool manipulatorInteraction = false;
-        EditorInteractionSystemViewportSelectionRequestBus::EventResult(
-            manipulatorInteraction, AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseManipulatorInteraction,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
+    bool manipulatorInteraction = false;
+    EditorInteractionSystemViewportSelectionRequestBus::EventResult(
+        manipulatorInteraction, AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseManipulatorInteraction,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
 
-        if (!manipulatorInteraction)
+    if (!manipulatorInteraction)
+    {
+        if (RenderViewportUtil::AllowOrbit(modifiers))
         {
-            if (RenderViewportUtil::AllowOrbit(modifiers))
-            {
-                m_bInOrbitMode = true;
-                m_orbitTarget =
-                    GetViewTM().GetTranslation() + GetViewTM().TransformVector(FORWARD_DIRECTION) * m_orbitDistance;
+            m_bInOrbitMode = true;
+            m_orbitTarget =
+                GetViewTM().GetTranslation() + GetViewTM().TransformVector(FORWARD_DIRECTION) * m_orbitDistance;
 
-                // mouse buttons are treated as keys as well
-                if (m_pressedKeyState == KeyPressedState::AllUp)
-                {
-                    m_pressedKeyState = KeyPressedState::PressedThisFrame;
-                }
-
-                m_mousePos = scaledPoint;
-                m_prevMousePos = scaledPoint;
+            // mouse buttons are treated as keys as well
+            if (m_pressedKeyState == KeyPressedState::AllUp)
+            {
+                m_pressedKeyState = KeyPressedState::PressedThisFrame;
+            }
 
-                HideCursor();
-                CaptureMouse();
+            m_mousePos = scaledPoint;
+            m_prevMousePos = scaledPoint;
 
-                // no further handling of left mouse button down
-                return;
-            }
+            HideCursor();
+            CaptureMouse();
 
-            EditorInteractionSystemViewportSelectionRequestBus::Event(
-                AzToolsFramework::GetEntityContextId(),
-                &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-        }
-    }
-    else
-    {
-        // first try interaction with manipulator
-        if (m_manipulatorManager == nullptr || !m_manipulatorManager->ConsumeViewportMousePress(mouseInteraction))
-        {
-            if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-            {
-                EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    AzToolsFramework::GetEntityContextId(),
-                    &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                    MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-            }
-            else
-            {
-                QtViewport::OnLButtonDown(modifiers, scaledPoint);
-            }
+            // no further handling of left mouse button down
+            return;
         }
+
+        EditorInteractionSystemViewportSelectionRequestBus::Event(
+            AzToolsFramework::GetEntityContextId(),
+            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
+            MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
     }
 }
 
@@ -557,39 +534,18 @@ void CRenderViewport::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint&
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
+    if (m_bInOrbitMode)
     {
-        if (m_bInOrbitMode)
-        {
-            m_bInOrbitMode = false;
-
-            ReleaseMouse();
-            ShowCursor();
-        }
+        m_bInOrbitMode = false;
 
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-    }
-    else
-    {
-        if (m_manipulatorManager == nullptr
-            || !m_manipulatorManager->ConsumeViewportMouseRelease(mouseInteraction))
-        {
-            if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-            {
-                AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    AzToolsFramework::GetEntityContextId(),
-                    &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                    MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-            }
-            else
-            {
-                QtViewport::OnLButtonUp(modifiers, scaledPoint);
-            }
-        }
+        ReleaseMouse();
+        ShowCursor();
     }
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -609,27 +565,10 @@ void CRenderViewport::OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPo
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::DoubleClick));
-    }
-    else
-    {
-        if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-        {
-            AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-                AzToolsFramework::GetEntityContextId(),
-                &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                MouseInteractionEvent(mouseInteraction, MouseEvent::DoubleClick));
-        }
-        else
-        {
-            QtViewport::OnLButtonDblClk(modifiers, scaledPoint);
-        }
-    }
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::DoubleClick));
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -651,48 +590,18 @@ void CRenderViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoin
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
 
-        if (RenderViewportUtil::AllowDolly(modifiers))
-        {
-            m_bInZoomMode = true;
-        }
-        else
-        {
-            m_bInRotateMode = true;
-        }
+    if (RenderViewportUtil::AllowDolly(modifiers))
+    {
+        m_bInZoomMode = true;
     }
     else
     {
-        if (m_manipulatorManager == nullptr
-            || !m_manipulatorManager->ConsumeViewportMousePress(mouseInteraction))
-        {
-            if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-            {
-                AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    AzToolsFramework::GetEntityContextId(),
-                    &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                    MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-            }
-            else
-            {
-                QtViewport::OnRButtonDown(modifiers, scaledPoint);
-            }
-        }
-
-        if (Qt::AltModifier & QApplication::queryKeyboardModifiers())
-        {
-            m_bInZoomMode = true;
-        }
-        else
-        {
-            m_bInRotateMode = true;
-        }
+        m_bInRotateMode = true;
     }
 
     // mouse buttons are treated as keys as well
@@ -727,31 +636,10 @@ void CRenderViewport::OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint&
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-    }
-    else
-    {
-        if (m_manipulatorManager == nullptr
-            || !m_manipulatorManager->ConsumeViewportMouseRelease(mouseInteraction))
-        {
-            if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-            {
-                AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    AzToolsFramework::GetEntityContextId(),
-                    &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                    MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-            }
-            else
-            {
-                QtViewport::OnRButtonUp(modifiers, scaledPoint);
-            }
-        }
-    }
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
 
     m_bInRotateMode = false;
     m_bInZoomMode = false;
@@ -781,73 +669,27 @@ void CRenderViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoin
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
+    if (RenderViewportUtil::AllowPan(modifiers))
     {
-        if (RenderViewportUtil::AllowPan(modifiers))
-        {
-            m_bInMoveMode = true;
-
-            // mouse buttons are treated as keys as well
-            if (m_pressedKeyState == KeyPressedState::AllUp)
-            {
-                m_pressedKeyState = KeyPressedState::PressedThisFrame;
-            }
+        m_bInMoveMode = true;
 
-            m_mousePos = scaledPoint;
-            m_prevMousePos = scaledPoint;
-
-            HideCursor();
-            CaptureMouse();
-        }
-
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-    }
-    else
-    {
-        if (!(modifiers & Qt::ControlModifier) && !(modifiers & Qt::ShiftModifier))
+        // mouse buttons are treated as keys as well
+        if (m_pressedKeyState == KeyPressedState::AllUp)
         {
-            if (modifiers & Qt::AltModifier)
-            {
-                m_bInOrbitMode = true;
-                m_orbitTarget = GetViewTM().GetTranslation() + GetViewTM().TransformVector(FORWARD_DIRECTION) * m_orbitDistance;
-            }
-            else
-            {
-                m_bInMoveMode = true;
-            }
-
-            // mouse buttons are treated as keys as well
-            if (m_pressedKeyState == KeyPressedState::AllUp)
-            {
-                m_pressedKeyState = KeyPressedState::PressedThisFrame;
-            }
-
-            m_mousePos = scaledPoint;
-            m_prevMousePos = scaledPoint;
-
-            HideCursor();
-            CaptureMouse();
+            m_pressedKeyState = KeyPressedState::PressedThisFrame;
         }
 
-        if (m_manipulatorManager == nullptr
-            || !m_manipulatorManager->ConsumeViewportMousePress(mouseInteraction))
-        {
-            if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-            {
-                AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    AzToolsFramework::GetEntityContextId(),
-                    &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-                    MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-            }
-            else
-            {
-                QtViewport::OnMButtonDown(modifiers, scaledPoint);
-            }
-        }
+        m_mousePos = scaledPoint;
+        m_prevMousePos = scaledPoint;
+
+        HideCursor();
+        CaptureMouse();
     }
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -875,18 +717,9 @@ void CRenderViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint&
         }
     };
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        if (m_bInMoveMode)
-        {
-            m_bInMoveMode = false;
-            tryRestoreMouse();
-        }
-    }
-    else
+    if (m_bInMoveMode)
     {
         m_bInMoveMode = false;
-        m_bInOrbitMode = false;
         tryRestoreMouse();
     }
 
@@ -895,31 +728,10 @@ void CRenderViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint&
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-    }
-    else
-    {
-        if (m_manipulatorManager == nullptr
-            || !m_manipulatorManager->ConsumeViewportMouseRelease(mouseInteraction))
-        {
-            if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-            {
-                AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    AzToolsFramework::GetEntityContextId(),
-                    &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                    MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-            }
-            else
-            {
-                QtViewport::OnMButtonUp(modifiers, scaledPoint);
-            }
-        }
-    }
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
 }
 
 void CRenderViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point)
@@ -934,43 +746,15 @@ void CRenderViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButt
 
     const auto scaledPoint = WidgetToViewport(point);
 
-    AzToolsFramework::ManipulatorManager::ConsumeMouseMoveResult mouseMoveResult =
-        AzToolsFramework::ManipulatorManager::ConsumeMouseMoveResult::None;
-
     const auto mouseInteraction = BuildMouseInteractionInternal(
         BuildMouseButtons(buttons),
         BuildKeyboardModifiers(modifiers),
         BuildMousePick(scaledPoint));
 
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Move));
-    }
-    else
-    {
-        if (m_manipulatorManager)
-        {
-            mouseMoveResult = m_manipulatorManager->ConsumeViewportMouseMove(mouseInteraction);
-        }
-
-        if (mouseMoveResult != AzToolsFramework::ManipulatorManager::ConsumeMouseMoveResult::Interacting)
-        {
-            if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-            {
-                AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-                    AzToolsFramework::GetEntityContextId(),
-                    &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-                    MouseInteractionEvent(mouseInteraction, MouseEvent::Move));
-            }
-            else
-            {
-                QtViewport::OnMouseMove(modifiers, buttons, scaledPoint);
-            }
-        }
-    }
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Move));
 }
 
 void CRenderViewport::InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons)
@@ -1083,22 +867,11 @@ void CRenderViewport::ProcessMouse()
         Vec3 xdir = m.GetColumn0().GetNormalized();
         Vec3 zdir = m.GetColumn2().GetNormalized();
 
-        if (GetIEditor()->IsNewViewportInteractionModelEnabled())
+        const auto modifiers = QGuiApplication::queryKeyboardModifiers();
+        if (RenderViewportUtil::InvertPan(modifiers))
         {
-            const auto modifiers = QGuiApplication::queryKeyboardModifiers();
-            if (RenderViewportUtil::InvertPan(modifiers))
-            {
-                xdir = -xdir;
-                zdir = -zdir;
-            }
-        }
-        else
-        {
-            if (GetCameraInvertPan())
-            {
-                xdir = -xdir;
-                zdir = -zdir;
-            }
+            xdir = -xdir;
+            zdir = -zdir;
         }
 
         Vec3 pos = m.GetTranslation();
@@ -1177,20 +950,10 @@ bool  CRenderViewport::event(QEvent* event)
 
         auto keyEvent = static_cast<QKeyEvent*>(event);
         bool manipulatorInteracting = false;
-        if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-        {
-            AzToolsFramework::ManipulatorManagerRequestBus::EventResult(
-                manipulatorInteracting,
-                AzToolsFramework::g_mainManipulatorManagerId,
-                &AzToolsFramework::ManipulatorManagerRequestBus::Events::Interacting);
-        }
-        else
-        {
-            if (m_manipulatorManager != nullptr)
-            {
-                manipulatorInteracting = m_manipulatorManager->Interacting();
-            }
-        }
+        AzToolsFramework::ManipulatorManagerRequestBus::EventResult(
+            manipulatorInteracting,
+            AzToolsFramework::g_mainManipulatorManagerId,
+            &AzToolsFramework::ManipulatorManagerRequestBus::Events::Interacting);
 
         // If a manipulator is active, stop all shortcuts from working, except for the escape key, which cancels in some cases
         if ((keyEvent->key() != Qt::Key_Escape) &&  manipulatorInteracting)
@@ -1754,12 +1517,6 @@ void CRenderViewport::OnRender()
 
         RenderAll();
 
-        // Draw Axis arrow in lower left corner.
-        if (levelIsDisplayable && !GetIEditor()->IsNewViewportInteractionModelEnabled())
-        {
-            DrawAxis();
-        }
-
         // Draw 2D helpers.
         TransformationMatrices backupSceneMatrices;
         m_renderer->Set2DMode(m_rcClient.right(), m_rcClient.bottom(), backupSceneMatrices);
@@ -1788,11 +1545,6 @@ void CRenderViewport::OnRender()
             AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport2d,
             AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
 
-        if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-        {
-            RenderSelectionRectangle();
-        }
-
         m_renderer->Unset2DMode(backupSceneMatrices);
 
         PostWidgetRendering();
@@ -1882,11 +1634,6 @@ void CRenderViewport::InitDisplayContext()
         displayContext.flags |= DISPLAY_TRACKTICKS;
     }
 
-    if (m_bAdvancedSelectMode && !GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        displayContext.flags |= DISPLAY_SELECTION_HELPERS;
-    }
-
     if (GetIEditor()->GetReferenceCoordSys() == COORDS_WORLD)
     {
         displayContext.flags |= DISPLAY_WORLDSPACEAXIS;
@@ -2759,16 +2506,13 @@ void CRenderViewport::OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta
         BuildMousePick(scaledPoint));
 
     bool handled = false;
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        MouseInteractionResult result = MouseInteractionResult::None;
-        AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::EventResult(
-            result, AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            MouseInteractionEvent(mouseInteraction, zDelta));
+    MouseInteractionResult result = MouseInteractionResult::None;
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::EventResult(
+        result, AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, zDelta));
 
-        handled = result != MouseInteractionResult::None;
-    }
+    handled = result != MouseInteractionResult::None;
 
     if (!handled)
     {
diff --git a/Code/Sandbox/Editor/RenderViewport.h b/Code/Sandbox/Editor/RenderViewport.h
index 664ed73abc..2edbd86770 100644
--- a/Code/Sandbox/Editor/RenderViewport.h
+++ b/Code/Sandbox/Editor/RenderViewport.h
@@ -238,11 +238,8 @@ public:
     QPoint ViewportToWidget(const QPoint& point) const;
     QSize WidgetToViewport(const QSize& size) const;
 
-    /// Take raw input and create a final mouse interaction.
-    /// @attention Do not map **point** from widget to viewport explicitly,
-    /// this is handled internally by BuildMouseInteraction - just pass directly.
     AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
 
     void SetPlayerPos()
     {
diff --git a/Code/Sandbox/Editor/Resource.h b/Code/Sandbox/Editor/Resource.h
index 8c4b09ae67..51f9b1f3e9 100644
--- a/Code/Sandbox/Editor/Resource.h
+++ b/Code/Sandbox/Editor/Resource.h
@@ -75,13 +75,10 @@
 #define IDC_PLATFORM_SALEM                         2759
 #define IDC_GROUPBOX_GLOBALTAGS                    2916
 #define IDC_GROUPBOX_FRAGMENTTAGS                  2917
-#define ID_PARTICLE_EDITOR                         2922
 #define ID_RESOURCES_GENERATECGFTHUMBNAILS         32894
 #define ID_RESOURCES_REDUCEWORKINGSET              32896
 #define ID_EDIT_HIDE                               32898
 #define ID_EDIT_UNHIDEALL                          32899
-#define ID_EDIT_FREEZE                             32900
-#define ID_EDIT_UNFREEZEALL                        32901
 #define ID_RELOAD_TERRAIN                          32902
 #define ID_VIEW_GRIDSETTINGS                       32904
 #define ID_VIEW_CONFIGURELAYOUT                    32906
@@ -94,26 +91,17 @@
 #define ID_EXPORT_INDOORS                          32915
 #define ID_VIEW_CYCLE2DVIEWPORT                    32916
 #define ID_SNAPANGLE                               32917
-#define ID_ROTATESELECTION_XAXIS                   32918
-#define ID_ROTATESELECTION_YAXIS                   32919
-#define ID_ROTATESELECTION_ZAXIS                   32920
-#define ID_ROTATESELECTION_ROTATEANGLE             32921
 #define ID_EDIT_RENAMEOBJECT                       32925
 #define ID_CHANGEMOVESPEED_INCREASE                32928
 #define ID_CHANGEMOVESPEED_DECREASE                32929
 #define ID_CHANGEMOVESPEED_CHANGESTEP              32930
-#define ID_MATERIAL_ASSIGNCURRENT                  32933
-#define ID_MATERIAL_RESETTODEFAULT                 32934
-#define ID_MATERIAL_GETMATERIAL                    32935
 #define ID_PHYSICS_GETPHYSICSSTATE                 32937
 #define ID_PHYSICS_RESETPHYSICSSTATE               32938
 #define ID_GAME_SYNCPLAYER                         32941
 #define ID_FILE_SAVELEVELRESOURCES                 32942
 #define ID_VALIDATELEVEL                           32943
 #define ID_TERRAIN_RESIZE                          32944
-#define ID_RULER                                   32945
 #define ID_RELOAD_TEXTURES                         32952
-#define ID_LOCK_SELECTION                          32956
 #define ID_TERRAIN_COLLISION                       32960
 #define ID_TOOL_FIRST                              32972
 #define ID_EDIT_UNFREEZE                           32973
@@ -122,11 +110,8 @@
 #define ID_TOOL_SHELVE_FIRST                       33174
 #define ID_TOOL_SHELVE_LAST                        33375
 #define ID_EDIT_SELECTALL                          33376
-#define ID_EDIT_SELECTNONE                         33377
 #define ID_WIREFRAME                               33410
 #define ID_FILE_GENERATETERRAINTEXTURE             33445
-#define ID_GENERATORS_LIGHTING                     33446
-#define ID_GENERATORS_STATICOBJECTS                33447
 #define ID_GENERATORS_TEXTURE                      33448
 #define ID_FILE_IMPORT                             33457
 #define ID_EDIT_HOLD                               33464
@@ -136,21 +121,14 @@
 #define ID_EDIT_DELETE                             33480
 #define ID_MOVE_OBJECT                             33481
 #define ID_RENAME_OBJ                              33483
-#define ID_SET_HEIGHT                              33484
 #define ID_FETCH                                   33496
 #define ID_EDITMODE_ROTATE                         33506
 #define ID_EDITMODE_SCALE                          33507
 #define ID_EDITMODE_MOVE                           33508
 #define ID_SELECTION_DELETE                        33512
 #define ID_EDIT_ESCAPE                             33513
-#define ID_OBJECTMODIFY_SETAREA                    33514
-#define ID_OBJECTMODIFY_SETHEIGHT                  33515
-#define ID_OBJECTMODIFY_FREEZE                     33517
-#define ID_OBJECTMODIFY_UNFREEZE                   33518
 #define ID_UNDO                                    33524
 #define ID_EDIT_CLONE                              33525
-#define ID_SELECTION_SAVE                          33527
-#define ID_SELECTION_LOAD                          33529
 #define ID_GOTO_SELECTED                           33535
 #define ID_EDIT_LEVELDATA                          33542
 #define ID_FILE_EDITEDITORINI                      33543
@@ -222,7 +200,6 @@
 #define ID_EDIT_INVERTSELECTION                    33692
 #define ID_TOOLTERRAINMODIFY_SMOOTH                33695
 #define ID_TERRAINMODIFY_SMOOTH                    33696
-#define ID_TERRAIN_VEGETATION                      33697
 #define ID_TERRAIN_PAINTLAYERS                     33698
 #define ID_SWITCHCAMERA_DEFAULTCAMERA              33700
 #define ID_SWITCHCAMERA_SEQUENCECAMERA             33701
@@ -232,7 +209,6 @@
 #define ID_VIEW_OPENVIEWPANE                       33709
 #define ID_VIEW_OPENPANE_FIRST          33712
 #define ID_VIEW_OPENPANE_LAST           33811
-#define ID_OPEN_MATERIAL_EDITOR                    33822
 #define ID_OPEN_EMOTIONFX_EDITOR                   39742
 #define ID_BRUSH_CSGSUBSTRUCT                      33837
 #define ID_MATERIAL_PICKTOOL                       33842
@@ -286,7 +262,6 @@
 #define ID_OPEN_ASSET_BROWSER                      34077
 #define ID_SNAP_TO_GRID_RANGE_BEGIN     34087
 #define ID_SNAP_TO_GRID_RANGE_END       34106
-#define ID_GOTO_VIEWPORTSEARCH          34137
 #define ID_TOOLS_EXPORT_SHORTCUTS       34138
 #define ID_TOOLS_IMPORT_SHORTCUTS       34139
 #define ID_TOOLS_VALIDATEOBJECTPOSITIONS 34143
@@ -320,9 +295,6 @@
 #define ID_FILE_ANIMDBEDITOR                       34211
 #define ID_SNAP_TO_ANGLE_RANGE_BEGIN    34323
 #define ID_SNAP_TO_ANGLE_RANGE_END      34330
-#define ID_MODIFY_LINK                  34355
-#define ID_MODIFY_UNLINK                34356
-#define ID_MODIFY_OBJECT_HEIGHT         34357
 #define ID_MODIFY_GOTO_SELECTION        34358
 #define ID_VIEW_LAYOUT_FIRST            34363
 #define ID_VIEW_LAYOUT_LAST             34377
@@ -333,7 +305,6 @@
 #define ID_CLEAR_REGISTRY                          34470
 #define ID_SOUND_STOPALLSOUNDS                     34476
 #define ID_AUDIO_REFRESH_AUDIO_SYSTEM              34477
-#define ID_EDIT_SHOW_LAST_HIDDEN                   34489
 #define ID_GAME_ANDROID_ENABLELOWSPEC              34490
 #define ID_GAME_ANDROID_ENABLEMEDIUMSPEC           34491
 #define ID_GAME_ANDROID_ENABLEHIGHSPEC             34492
@@ -397,4 +368,6 @@
 #define ID_TOOLBAR_WIDGET_SNAP_GRID          50008
 #define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE   50011
 #define ID_TOOLBAR_WIDGET_DEBUG_MODE         50012
+#define ID_TOOLBAR_WIDGET_SPACER_RIGHT       50013
+#define ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL  50014
 #define ID_TOOLBAR_WIDGET_LAST               50020
diff --git a/Code/Sandbox/Editor/Settings.cpp b/Code/Sandbox/Editor/Settings.cpp
index 038af33129..99a801eedc 100644
--- a/Code/Sandbox/Editor/Settings.cpp
+++ b/Code/Sandbox/Editor/Settings.cpp
@@ -196,7 +196,6 @@ SEditorSettings::SEditorSettings()
     enableSceneInspector = false;
 
     strStandardTempDirectory = "Temp";
-    strEditorEnv = "Editor/Editor.env";
 
     // Init source safe params.
     enableSourceControl = true;
@@ -255,8 +254,6 @@ SEditorSettings::SEditorSettings()
 
     bForceSkyUpdate = true;
 
-    bIsSearchFilterActive = false;
-
     backgroundUpdatePeriod = 0;
     g_TemporaryLevelName = nullptr;
 
@@ -532,7 +529,6 @@ void SEditorSettings::Save()
     SaveValue("Settings", "editorConfigSpec", editorConfigSpec);
 
     SaveValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
-    SaveValue("Settings", "EditorEnv", strEditorEnv);
 
     SaveValue("Settings", "ConsoleBackgroundColorThemeV2", (int)consoleBackgroundColorTheme);
 
@@ -747,7 +743,6 @@ void SEditorSettings::Load()
 
 
     LoadValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
-    LoadValue("Settings", "EditorEnv", strEditorEnv);
 
     int consoleBackgroundColorThemeInt = (int)consoleBackgroundColorTheme;
     LoadValue("Settings", "ConsoleBackgroundColorThemeV2", consoleBackgroundColorThemeInt);
@@ -760,7 +755,7 @@ void SEditorSettings::Load()
     LoadValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
 
     LoadValue("Settings", "EnableSceneInspector", enableSceneInspector);
-    
+
     //////////////////////////////////////////////////////////////////////////
     // Viewport Settings.
     //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/Settings.h b/Code/Sandbox/Editor/Settings.h
index 512c6e3942..511bbb9bbe 100644
--- a/Code/Sandbox/Editor/Settings.h
+++ b/Code/Sandbox/Editor/Settings.h
@@ -419,7 +419,6 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
 
     // This directory is related to the editor root.
     QString strStandardTempDirectory;
-    QString strEditorEnv;
 
     SGUI_Settings gui;
 
@@ -478,7 +477,6 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     bool bVisualizeNavigationAccessibility;
     int  navigationDebugAgentType;
 
-    bool bIsSearchFilterActive;
     int backgroundUpdatePeriod;
     const char* g_TemporaryLevelName;
 
diff --git a/Code/Sandbox/Editor/SettingsManager.cpp b/Code/Sandbox/Editor/SettingsManager.cpp
index 6e1b835fbf..2ec84507d9 100644
--- a/Code/Sandbox/Editor/SettingsManager.cpp
+++ b/Code/Sandbox/Editor/SettingsManager.cpp
@@ -25,7 +25,7 @@
 #include "QtViewPaneManager.h"
 
 
-#define TOOLBOX_FILE "Editor/ToolBox.xml"
+#define TOOLBOX_FILE "ToolBox.xml"
 #define TOOLBOX_NODE "ToolBox"
 
 CSettingsManager::CSettingsManager(EditorSettingsManagerType managerType)
diff --git a/Code/Sandbox/Editor/SettingsManager.h b/Code/Sandbox/Editor/SettingsManager.h
index 9160e96cca..d496ae7714 100644
--- a/Code/Sandbox/Editor/SettingsManager.h
+++ b/Code/Sandbox/Editor/SettingsManager.h
@@ -19,8 +19,8 @@
 
 class QByteArray;
 
-#define EDITOR_LAYOUT_FILE_PATH "@engroot@/Editor/EditorLayout.xml"
-#define EDITOR_SETTINGS_FILE_PATH "@engroot@/Editor/EditorSettings.xml"
+#define EDITOR_LAYOUT_FILE_PATH "@user@/Editor/EditorLayout.xml"
+#define EDITOR_SETTINGS_FILE_PATH "@user@/Editor/EditorSettings.xml"
 #define EDITOR_LAYOUT_ROOT_NODE "EditorLayout"
 #define EDITOR_SETTINGS_ROOT_NODE "EditorSettings"
 #define EDITOR_SETTINGS_CONTENT_NODE "EditorSettingsContent"
@@ -30,7 +30,7 @@ class QByteArray;
 #define CVARS_NODE "CVars"
 #define CVAR_NODE "CVar"
 
-#define EDITOR_EVENT_LOG_FILE_PATH "@engroot@/Editor/EditorEventLog.xml"
+#define EDITOR_EVENT_LOG_FILE_PATH "@user@/Editor/EditorEventLog.xml"
 #define EDITOR_EVENT_LOG_ROOT_NODE "EventRecorder"
 #define EVENT_LOG_EVENT_NAME "eventName"
 #define EDITOR_EVENT_LOG_ATTRIB_NAME "value"
diff --git a/Code/Sandbox/Editor/ShaderEnum.cpp b/Code/Sandbox/Editor/ShaderEnum.cpp
index ebae2ceba2..65518303ce 100644
--- a/Code/Sandbox/Editor/ShaderEnum.cpp
+++ b/Code/Sandbox/Editor/ShaderEnum.cpp
@@ -71,7 +71,7 @@ int CShaderEnum::EnumShaders()
         m_shaders.push_back(sd);
     }
 
-    XmlNodeRef root = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Editor/Materials/ShaderList.xml");
+    XmlNodeRef root = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Materials/ShaderList.xml");
     if (root)
     {
         for (int i = 0; i < root->getChildCount(); ++i)
diff --git a/Code/Sandbox/Editor/Style/CloudCanvas.qss b/Code/Sandbox/Editor/Style/CloudCanvas.qss
deleted file mode 100644
index 730c494fdf..0000000000
--- a/Code/Sandbox/Editor/Style/CloudCanvas.qss
+++ /dev/null
@@ -1,488 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#ResourceManagement QLabel
-{
-    /* 
-        This sets the indent Q_PROPERTY on QLabel to 0. The default value is -1,
-        which triggers some computation based on the font size. But that only 
-        happens under some cicumstances, such as when using a stylesheet to set
-        margins or padding on the QLabel. Adding such styling suddenly causes
-        the indent to be applied, causing the left alignment of the text to break.
-    */
-    qproperty-indent: 0
-}
-
-#ResourceManagement #TreeTitle
-{
-    font-size: 12px; 
-    font-weight: bold;
-}
-
-#ResourceManagement #ButtonBar {
-    margin-top: 6px;
-}
-
-#ResourceManagement #ButtonBar QPushButton {
-    padding: 6px 9px 6px 9px;
-    margin-right: 6px;
-}
-
-#ResourceManagement #Message, #ResourceManagement *[class='Message'] {
-    font-size: 12px;
-    margin-top: 6;
-}
-
-#ResourceManagement #Title {
-    font-size: 14px;
-    font-weight: bold;
-}
-
-#ResourceManagement #Refreshing {
-    color: #F0C32D;
-}
-
-#ResourceManagement #LinkButton, #ResourceManagement *[class='Link'] {
-    border: none;
-    color: #00A1C9;
-    margin-top: 6px;
-    font-weight: bold;
-}
-
-#ResourceManagement QHeaderView::section {
-    color: #999999;
-    font-weight: bold;
-    border: none;
-    padding-top: 0px;
-    padding-bottom: 3px;
-    padding-right: 3px;
-    padding-left: 3px;
-}
-
-#ResourceManagement #Table {
-    qproperty-showGrid: false;
-    border: none;
-}
-
-#ResourceManagement #Table::item {
-    padding-right: 12px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-}
-
-#ResourceManagement #TextContentHelp
-{
-    margin: 0px;
-    padding: 12px;
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #TextContentEdit
-{
-}
-
-#ResourceManagement #TextContentFooter
-{
-    padding: 6px 12px 6px 12px;
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #TextContentFooter QLabel
-{
-    min-width: 48px;
-    max-width: 48px;
-    margin-right: 12px;
-    color: #999999;
-}
-
-#ResourceManagement #TextContentFooter QPushButton
-{
-    padding: 6px 9px 6px 9px;
-    margin-left: 6px;
-}
-
-
-#ResourceManagement #Action {
-    padding: 12px;
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #ButtonBar {
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #Heading {
-    background-color: #404040;
-}
-
-#ResourceManagement #Heading #RefreshButton {
-    margin-left: 12px;
-    padding: 3px;
-}
-
-#ResourceManagement #Action #Heading #Title {
-    border: 0px solid #404040;
-}
-
-#ResourceManagement #Action #Heading #Message {
-    border: 0px solid #404040;
-}
-
-#ResourceManagement #Action #LearnMore {
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #LearnMore #Title {
-    font-size: 12px;
-    margin-top: 24px;
-    font-weight:bold;
-}
-
-#ResourceManagement #Action #LearnMore #LinkButton {
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #Title, #ResourceManagement #Action #Message {
-    background-color: #404040;
-}
-
-#ResourceManagement #Top {
-    padding: 12px; 
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #Bottom {
-    background-color: #404040;
-    padding: 12px; 
-}
-
-#ResourceManagement #Bottom #Title {
-    background-color: #404040;
-    font-size: 12px;
-    font-weight: bold;
-}
-
-#ResourceManagement #Bottom #Message {
-    background-color: #404040;
-    margin-bottom: 6px;
-}
-
-#ResourceManagement #Bottom #Table {
-    background-color: #404040;
-    qproperty-alternatingRowColors: true;
-}
-
-#ResourceManagement #Bottom #Table QHeaderView {
-    background-color: #404040;
-}
-
-#ResourceManagement #Bottom #Table QHeaderView::section {
-    background-color: #404040;
-}
-
-#ResourceManagement #Bottom #Table::item {
-    background-color: #393a3c;
-}
-
-#ResourceManagement #Bottom #Table::item:alternate {
-    background-color: #303030;
-}
-
-#ResourceManagement #Bottom #Resources {
-    background-color: #404040;
-}
-
-#ResourceManagement #Bottom #Refreshing {
-    background-color: #404040;
-}
-
-#ResourceManagement #Stack #Heading #Message
-{
-    margin-top: 0;
-}
-
-#ResourceManagement #Stack #Status #Title
-{
-    font-size: 12px;
-    font-weight: bold;
-    margin-top: 6px;
-    margin-bottom: 6px;
-}
-
-#ResourceManagement #StackEvents #TitleBar {	
-    color: #CCCCCC;
-	background-color: #393a3c;
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #StackEvents #TitleBar * {
-    font-size:12px; 
-} 
-
-#ResourceManagement #StackEvents #TitleBar #Title {
-    font-weight:bold;
-    margin-right: 12px;
-} 
-
-#ResourceManagement #StackEvents #TitleBar #InProgress #Text {
-    color: #F0C32D;
-}
-
-#ResourceManagement #StackEvents #TitleBar #Succeeded {
-    color: #43d96a;
-}
-
-#ResourceManagement #StackEvents #TitleBar #Failed {
-    color: #f44642;
-}
-
-#ResourceManagement #StackEvents #Content {	
-    border-style: inset;
-    border-width: 1px;
-    border-color: #303030;
-    padding: 12px;
-}
-
-#ResourceManagement #StackEvents #Table {
-    qproperty-alternatingRowColors: true;
-    qproperty-showGrid: false;
-}
-
-#ResourceManagement #StackEvents QTableView::item {
-    background-color: #303030;
-}
-
-#ResourceManagement #StackEvents QTableView::item:focus {
-    selection-color: #FFFFFF;
-    selection-background-color: rgba(255, 153, 0, 128);
-}
-
-#ResourceManagement #StackEvents QTableView::item:alternate {
-    background-color: #393a3c;
-}
-
-#ResourceManagement #CreateDeployment #LearnMore
-{
-    margin-bottom: 12px;
-}
-
-#ResourceManagement #CreateDeployment #WarningMessage
-{
-    margin-top: 12px;
-    margin-bottom: 12px;
-}
-
-#ResourceManagement #LoadingError, #ResourceManagement #LoadingError #Title, #ResourceManagement #LoadingError #Message, #ResourceManagement #LoadingError #ErrorText
-{
-    background: #404040;
-}
-
-#ResourceManagement #LoadingError #ErrorText
-{
-    padding: 12px;
-    color: #f44642;
-}
-
-#ResourceManagement #Loading, #ResourceManagement #Loading #Title, #ResourceManagement #Loading #Message
-{
-    background: #404040;
-}
-
-#ResourceManagement #Loading, #ResourceManagement #LoadingError
-{
-    padding: 12px;
-}
-
-#ResourceManagement #MainToolbar
-{
-    padding: 6px;
-    border-style: inset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #MainToolbar QPushButton
-{
-    border: none;
-    padding: 0px;
-}
-
-#ResourceManagement #MainToolbar #AddNewButton
-{
-    margin-left: 12px;
-    margin-right: 12px;
-}
-
-#ResourceManagement #ResourceImporter #RegionBox:disabled
-{
-    color: #555555;
-}
-
-#ResourceManagement #ResourceImporter #ListTable
-{
-    qproperty-alternatingRowColors: true;
-    qproperty-showGrid: false;
-    border: none;
-}
-
-#ResourceManagement #ResourceImporter #ListTable::item
-{
-    padding-right: 12px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    background-color: #333436;
-}
-
-#ResourceManagement #ResourceImporter #ListTable::item:alternate
-{
-    background-color: #303030;
-}
-
-#ResourceManagement #ResourceImporter #SelectionTable
-{
-    qproperty-showGrid: false;
-    border: none;
-    gridline-color: #393a3c;
-}
-
-#ResourceManagement #ResourceImporter #SelectionTable::item
-{
-    padding: 1px 1px 1px 1px;
-
-}
-
-#ResourceManagement #ResourceImporter #LoadingLabel
-{
-    color : #F0C32D;
-}
-
-#ResourceManagement #MainToolbar #SaveButton,
-#ResourceManagement #MainToolbar #DeleteButton,
-#ResourceManagement #MainToolbar #SourceControlButton,
-#ResourceManagement #MainToolbar #AddNewButton
-{
-    qproperty-flat: true;
-}
-
-#ResourceManagement #MainToolbar #CurrentProfile
-{
-    margin-right: 12px;
-}
-
-#ResourceManagement #MainToolbar #CurrentDeployment
-{
-    margin-right: 12px;
-    margin-left: 12px;
-}
-
-#ResourceManagement #UpdateStack #Refreshing
-{
-    margin-top: 12px;
-    margin-left: 12px;
-}
-
-#ResourceManagement #UpdateStack #Message
-{
-    margin-bottom: 6px;
-}
-
-#ResourceManagement #UpdateStack #Table {
-    qproperty-alternatingRowColors: true;
-    qproperty-showGrid: false;
-}
-
-#ResourceManagement #UpdateStack #Table::item {
-    background-color: #303030;
-}
-
-#ResourceManagement #UpdateStack #Table::item:alternate {
-    background-color: #393a3c;
-}
-
-#ResourceManagement #UpdateStack #Status {
-    color: #F0C32D;
-}
-
-#ProfileSelector #DeleteProfile {
-    width: 38px;
-    height: 11px;
-    border: none;
-}
-
-#ProfileSelector #EditSelectedProfile {
-    color: #00A1C9;
-}
-
-#InitializeCloudCanvasProject #Profiles QRadioButton {
-    margin-left: 5px;
-}
-
-#InitializeCloudCanvasProject #ProfileEditButtons  {
-}
-
-#InitializeCloudCanvasProject #ProfileEditButtons QPushButton {
-}
-
-#InitializeCloudCanvasProject #ContentFrame {
-    x-margin: 6px;
-    x-padding: 6px;
-    border: 1px solid rgb(34, 35, 38);
-    x-background-color: purple;
-}
-
-#LoginDialog
-{
-    background-color: #F8F8F8;
-}
-
-#LoginDialog Amazon--LoginWelcomeTitle
-{
-    color: #444444;
-    background-color: #F8F8F8;
-    font-size: 21px;
-    qproperty-alignment: AlignCenter;
-    font-family: "Open Sans Semibold";
-}
-
-#LoginDialog Amazon--LoginWelcomeText
-{
-    color: #444444;
-    background-color: #F8F8F8;
-    font-size: 13px;
-    qproperty-alignment: AlignLeft;
-}
-
-#LoginDialog Amazon--LoginFooterText
-{
-    color: #999999;
-    background-color: #F8F8F8;
-    font-size: 13px;
-    qproperty-alignment: AlignCenter;
-}
-
-#LoginDialog Amazon--LoginWebViewFrame
-{
-    border: 2px solid #EEEEEE;
-}
-
-#LoginDialog Amazon--LoginWebView
-{
-    background-color: #F8F8F8;
-}
diff --git a/Code/Sandbox/Editor/Style/LensFlareEditor.qss b/Code/Sandbox/Editor/Style/LensFlareEditor.qss
deleted file mode 100644
index 58d99c9f92..0000000000
--- a/Code/Sandbox/Editor/Style/LensFlareEditor.qss
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#DatabaseFrameWnd QToolBar
-{
-    border-bottom: 2px solid #111111;
-}
-
diff --git a/Code/Sandbox/Editor/Style/resources.qrc b/Code/Sandbox/Editor/Style/resources.qrc
index 54c2c4754a..aec7e2cf68 100644
--- a/Code/Sandbox/Editor/Style/resources.qrc
+++ b/Code/Sandbox/Editor/Style/resources.qrc
@@ -1,10 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file alias="Editor/Style/Editor.qss">Editor.qss</file>
-    <file alias="Editor/Style/EditorPreferencesDialog.qss">EditorPreferencesDialog.qss</file>
-    <file alias="Editor/Style/CloudCanvas.qss">CloudCanvas.qss</file>
-    <file alias="Editor/Style/LayoutConfigDialog.qss">LayoutConfigDialog.qss</file>
-    <file alias="Editor/Style/GraphicsSettingsDialog.qss">GraphicsSettingsDialog.qss</file>
-    <file alias="Editor/Style/LensFlareEditor.qss">LensFlareEditor.qss</file>
+    <file alias="Assets/Editor/Style/Editor.qss">Editor.qss</file>
+    <file alias="Assets/Editor/Style/EditorPreferencesDialog.qss">EditorPreferencesDialog.qss</file>
+    <file alias="Assets/Editor/Style/LayoutConfigDialog.qss">LayoutConfigDialog.qss</file>
+    <file alias="Assets/Editor/Style/GraphicsSettingsDialog.qss">GraphicsSettingsDialog.qss</file>
 </qresource>
 </RCC>
diff --git a/Code/Sandbox/Editor/SurfaceInfoPicker.cpp b/Code/Sandbox/Editor/SurfaceInfoPicker.cpp
deleted file mode 100644
index f3d06e0017..0000000000
--- a/Code/Sandbox/Editor/SurfaceInfoPicker.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "SurfaceInfoPicker.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-
-// Editor
-#include "Material/MaterialManager.h"
-#include "Objects/EntityObject.h"
-#include "Viewport.h"
-#include "QtViewPane.h"
-
-// ComponentEntityEditorPlugin
-#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
-
-// LmbrCentral
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-#include <LmbrCentral/Rendering/GeomCacheComponentBus.h>
-
-
-static const float kEnoughFarDistance(5000.0f);
-
-CSurfaceInfoPicker::CSurfaceInfoPicker()
-    : m_pObjects(NULL)
-    , m_pSetObjects(NULL)
-    , m_PickOption(0)
-{
-    m_pActiveView = GetIEditor()->GetActiveView();
-}
-
-bool CSurfaceInfoPicker::PickByAABB(const QPoint& point, [[maybe_unused]] int nFlag, IDisplayViewport* pView, CExcludedObjects* pExcludedObjects, std::vector<CBaseObjectPtr>* pOutObjects)
-{
-    GetIEditor()->GetObjectManager()->GetObjects(m_objects);
-
-    Vec3 vWorldRaySrc, vWorldRayDir;
-    m_pActiveView->ViewToWorldRay(point, vWorldRaySrc, vWorldRayDir);
-    vWorldRaySrc = vWorldRaySrc + vWorldRayDir * 0.1f;
-    vWorldRayDir = vWorldRayDir * kEnoughFarDistance;
-
-    bool bPicked = false;
-
-    for (int i = 0, iCount(m_objects.size()); i < iCount; ++i)
-    {
-        if (pExcludedObjects && pExcludedObjects->Contains(m_objects[i]))
-        {
-            continue;
-        }
-
-        AABB worldObjAABB;
-        m_objects[i]->GetBoundBox(worldObjAABB);
-
-        if (pView)
-        {
-            float fScreenFactor = pView->GetScreenScaleFactor(m_objects[i]->GetPos());
-            worldObjAABB.Expand(0.01f * Vec3(fScreenFactor, fScreenFactor, fScreenFactor));
-        }
-
-        Vec3 vHitPos;
-        if (Intersect::Ray_AABB(vWorldRaySrc, vWorldRayDir, worldObjAABB, vHitPos))
-        {
-            if ((vHitPos - vWorldRaySrc).GetNormalized().Dot(vWorldRayDir) > 0 || worldObjAABB.IsContainPoint(vHitPos))
-            {
-                if (pOutObjects)
-                {
-                    pOutObjects->push_back(m_objects[i]);
-                }
-                bPicked = true;
-            }
-        }
-    }
-
-    return bPicked;
-}
-
-bool CSurfaceInfoPicker::PickImpl(const QPoint& point,
-    _smart_ptr<IMaterial>* ppOutLastMaterial,
-    SRayHitInfo& outHitInfo,
-    CExcludedObjects* pExcludedObjects,
-    int nFlag)
-{
-    Vec3 vWorldRaySrc;
-    Vec3 vWorldRayDir;
-    if (!m_pActiveView)
-    {
-        m_pActiveView = GetIEditor()->GetActiveView();
-    }
-    m_pActiveView->ViewToWorldRay(point, vWorldRaySrc, vWorldRayDir);
-    vWorldRaySrc = vWorldRaySrc + vWorldRayDir * 0.1f;
-    vWorldRayDir = vWorldRayDir * kEnoughFarDistance;
-
-    return PickImpl(vWorldRaySrc, vWorldRayDir, ppOutLastMaterial, outHitInfo, pExcludedObjects, nFlag);
-}
-
-bool CSurfaceInfoPicker::PickImpl(const Vec3& vWorldRaySrc, const Vec3& vWorldRayDir,
-    _smart_ptr<IMaterial>* ppOutLastMaterial,
-    SRayHitInfo& outHitInfo,
-    CExcludedObjects* pExcludedObjects,
-    int nFlag)
-{
-    memset(&outHitInfo, 0, sizeof(outHitInfo));
-    outHitInfo.fDistance = kEnoughFarDistance;
-
-    if (m_pSetObjects)
-    {
-        m_pObjects = m_pSetObjects;
-    }
-    else
-    {
-        GetIEditor()->GetObjectManager()->GetObjects(m_objects);
-        m_pObjects = &m_objects;
-    }
-
-    if (pExcludedObjects)
-    {
-        m_ExcludedObjects = *pExcludedObjects;
-    }
-    else
-    {
-        m_ExcludedObjects.Clear();
-    }
-
-    m_pPickedObject = NULL;
-
-    if (nFlag & ePOG_Entity)
-    {
-        FindNearestInfoFromEntities(vWorldRaySrc, vWorldRayDir, ppOutLastMaterial, outHitInfo);
-    }
-
-    if (!m_pSetObjects)
-    {
-        m_objects.clear();
-    }
-
-    m_ExcludedObjects.Clear();
-
-    return outHitInfo.fDistance < kEnoughFarDistance;
-}
-
-void CSurfaceInfoPicker::FindNearestInfoFromEntities(
-    const Vec3& vWorldRaySrc,
-    const Vec3& vWorldRayDir,
-    _smart_ptr<IMaterial>* pOutLastMaterial,
-    SRayHitInfo& outHitInfo) const
-{
-    for (size_t i = 0; i < m_pObjects->size(); ++i)
-    {
-        CBaseObject* object((*m_pObjects)[i]);
-
-        if (object == nullptr
-            || !qobject_cast<CEntityObject*>(object)
-            || object->IsHidden()
-            || IsFrozen(object)
-            || m_ExcludedObjects.Contains(object)
-            )
-        {
-            continue;
-        }
-
-        CEntityObject* entityObject = static_cast<CEntityObject*>(object);
-
-        // If a legacy entity doesn't have a material override, we'll get the default material for that statObj
-        _smart_ptr<IMaterial> statObjDefaultMaterial = nullptr;
-        // And in some cases the material we want does comes from RayIntersection(), and we will skip AssignObjectMaterial().
-        _smart_ptr<IMaterial> pickedMaterial = nullptr;
-
-        bool hit = false;
-
-        // entityObject is a component entity...
-        if (entityObject->GetType() == OBJTYPE_AZENTITY)
-        {
-            AZ::EntityId id;
-            AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(id, entityObject, &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
-
-            AZ::EBusAggregateResults<IStatObj*> statObjs;
-            LmbrCentral::LegacyMeshComponentRequestBus::EventResult(statObjs, id, &LmbrCentral::LegacyMeshComponentRequestBus::Events::GetStatObj);
-            
-            // If the entity has a MeshComponent, it will hit here
-            for (IStatObj* statObj : statObjs.values)
-            {
-                hit = RayIntersection(vWorldRaySrc, vWorldRayDir, nullptr, statObj, object->GetWorldTM(), outHitInfo, &statObjDefaultMaterial);
-                if (hit)
-                {
-                    break;
-                }
-            }
-
-            // If the entity has an ActorComponent or another component that overrides RenderNodeRequestBus, it will hit here
-            if (!hit)
-            {
-                // There might be multiple components with render nodes on the same entity
-                // This will get the highest priority one, as determined by RenderNodeRequests::GetRenderNodeRequestBusOrder
-                IRenderNode* renderNode = entityObject->GetEngineNode();
-
-                // If the renderNode exists and is physicalized, it will hit here
-                hit = RayIntersection_IRenderNode(vWorldRaySrc, vWorldRayDir, renderNode, &pickedMaterial, object->GetWorldTM(), outHitInfo);
-                if (!hit)
-                {
-                    // If the renderNode is not physicalized, such as an actor component, but still exists and has a valid material we might want to pick
-                    if (renderNode && renderNode->GetMaterial())
-                    {
-                        // Do a hit test with anything in this entity that has overridden EditorComponentSelectionRequestsBus          
-                        CComponentEntityObject* componentEntityObject = static_cast<CComponentEntityObject*>(entityObject);
-                        HitContext hc;
-                        hc.raySrc = vWorldRaySrc;
-                        hc.rayDir = vWorldRayDir;                       
-                        bool intersects = componentEntityObject->HitTest(hc);
-                        
-                        if (intersects)
-                        {
-                            // If the distance is closer than the nearest distance so far
-                            if (hc.dist < outHitInfo.fDistance)
-                            {
-                                hit = true;
-                                outHitInfo.vHitPos = hc.raySrc + hc.rayDir * hc.dist;
-                                outHitInfo.fDistance = hc.dist;
-                                // We don't get material/sub-material information back from HitTest, so just use the material from the render node
-                                pickedMaterial = renderNode->GetMaterial(); 
-                                outHitInfo.nHitMatID = 0;
-                                // We don't get normal information back from HitTest, so just orient the selection disk towards the camera
-                                outHitInfo.vHitNormal = vWorldRayDir.normalized();
-                            }
-                        }
-                    }
-                }
-            }
-
-            // If the entity has a GeometryCacheComponent it will hit here
-            if (!hit)
-            {
-                IGeomCacheRenderNode* geomCacheRenderNode = nullptr;
-                LmbrCentral::GeometryCacheComponentRequestBus::EventResult(geomCacheRenderNode, id, &LmbrCentral::GeometryCacheComponentRequestBus::Events::GetGeomCacheRenderNode);
-                hit = RayIntersection_IGeomCacheRenderNode(vWorldRaySrc, vWorldRayDir, geomCacheRenderNode, &pickedMaterial, object->GetWorldTM(), outHitInfo);
-            }
-        }
-
-        if (hit)
-        {
-            if(pickedMaterial)
-            {
-                AssignMaterial(pickedMaterial, outHitInfo, pOutLastMaterial);
-            }
-            else
-            {
-                if (object->GetMaterial())
-                {
-                    // If the entity has a material override, assign the object material
-                    AssignObjectMaterial(object, outHitInfo, pOutLastMaterial);
-                }
-                else
-                {
-                    // Otherwise assign the default material for that object
-                    AssignMaterial(statObjDefaultMaterial, outHitInfo, pOutLastMaterial);
-                }
-            }
-
-            m_pPickedObject = object;
-        }
-    }
-}
-
-bool CSurfaceInfoPicker::RayIntersection_CBaseObject(
-    const Vec3& vWorldRaySrc,
-    const Vec3& vWorldRayDir,
-    CBaseObject* pBaseObject,
-    _smart_ptr<IMaterial>* pOutLastMaterial,
-    SRayHitInfo& outHitInfo)
-{
-    if (pBaseObject == NULL)
-    {
-        return false;
-    }
-    IRenderNode* pRenderNode(pBaseObject->GetEngineNode());
-    if (pRenderNode == NULL)
-    {
-        return false;
-    }
-    IStatObj* pStatObj(pRenderNode->GetEntityStatObj());
-    if (pStatObj == NULL)
-    {
-        return false;
-    }
-    return RayIntersection(vWorldRaySrc, vWorldRayDir, pRenderNode, pStatObj, pBaseObject->GetWorldTM(), outHitInfo, pOutLastMaterial);
-}
-
-bool CSurfaceInfoPicker::RayIntersection(
-    const Vec3& vWorldRaySrc,
-    const Vec3& vWorldRayDir,
-    IRenderNode* pRenderNode,
-    IStatObj* pStatObj,
-    const Matrix34A& WorldTM,
-    SRayHitInfo& outHitInfo,
-    _smart_ptr<IMaterial>* ppOutLastMaterial)
-{
-    SRayHitInfo hitInfo;
-    bool bRayIntersection = false;
-    _smart_ptr<IMaterial> pMaterial(NULL);
-
-    bRayIntersection = RayIntersection_IStatObj(vWorldRaySrc, vWorldRayDir, pStatObj, &pMaterial, WorldTM, hitInfo);
-    if (!bRayIntersection)
-    {
-        bRayIntersection = RayIntersection_IRenderNode(vWorldRaySrc, vWorldRayDir, pRenderNode, &pMaterial, WorldTM, hitInfo);
-    }
-
-    if (bRayIntersection)
-    {
-        hitInfo.fDistance = vWorldRaySrc.GetDistance(hitInfo.vHitPos);
-        if (hitInfo.fDistance < outHitInfo.fDistance)
-        {
-            if (ppOutLastMaterial)
-            {
-                *ppOutLastMaterial = pMaterial;
-            }
-            memcpy(&outHitInfo, &hitInfo, sizeof(SRayHitInfo));
-            outHitInfo.vHitNormal.Normalize();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool CSurfaceInfoPicker::RayIntersection_IStatObj(
-    const Vec3& vWorldRaySrc,
-    const Vec3& vWorldRayDir,
-    IStatObj* pStatObj,
-    _smart_ptr<IMaterial>* ppOutLastMaterial,
-    const Matrix34A& worldTM,
-    SRayHitInfo& outHitInfo)
-{
-    if (pStatObj == NULL)
-    {
-        return false;
-    }
-
-    Vec3 localRaySrc;
-    Vec3 localRayDir;
-    if (!RayWorldToLocal(worldTM, vWorldRaySrc, vWorldRayDir, localRaySrc, localRayDir))
-    {
-        return false;
-    }
-
-    // the outHitInfo contains information about the previous closest hit and should not be cleared / replaced unless you have a better hit!
-    // all of the intersection functions called (such as statobj's RayIntersection) only modify the hit info if it actually hits it closer than the current distance of the last hit.
-
-    outHitInfo.inReferencePoint = localRaySrc;
-    outHitInfo.inRay                = Ray(localRaySrc, localRayDir);
-    outHitInfo.bInFirstHit  = false;
-    outHitInfo.bUseCache        = false;
-
-    _smart_ptr<IMaterial> hitMaterial = nullptr;
-
-    Vec3 hitPosOnAABB;
-    if (Intersect::Ray_AABB(outHitInfo.inRay, pStatObj->GetAABB(), hitPosOnAABB) == 0x00)
-    {
-        return false;
-    }
-
-    if (pStatObj->RayIntersection(outHitInfo))
-    {
-        if (outHitInfo.fDistance < 0)
-        {
-            return false;
-        }
-        outHitInfo.vHitPos = worldTM.TransformPoint(outHitInfo.vHitPos);
-        outHitInfo.vHitNormal = worldTM.GetTransposed().GetInverted().TransformVector(outHitInfo.vHitNormal);
-
-        // we need to set nHitSurfaceID anyway - so we need to do this regardless of whether the caller
-        // has asked for detailed material info by passing in a non-null ppOutLastMaterial
-        hitMaterial = pStatObj->GetMaterial();
-
-        if (hitMaterial)
-        {
-            if (outHitInfo.nHitMatID >= 0)
-            {
-                if (hitMaterial->GetSubMtlCount() > 0 && outHitInfo.nHitMatID < hitMaterial->GetSubMtlCount())
-                {
-                    _smart_ptr<IMaterial> subMaterial = hitMaterial->GetSubMtl(outHitInfo.nHitMatID);
-                    if (subMaterial)
-                    {
-                        hitMaterial = subMaterial;
-                    }
-                }
-            }
-            outHitInfo.nHitSurfaceID = hitMaterial->GetSurfaceTypeId();
-        }
-
-        if ((ppOutLastMaterial) && (hitMaterial))
-        {
-            *ppOutLastMaterial = hitMaterial;
-        }
-
-        return true;
-    }
-
-    return outHitInfo.fDistance < kEnoughFarDistance;
-}
-
-#if defined(USE_GEOM_CACHES)
-bool CSurfaceInfoPicker::RayIntersection_IGeomCacheRenderNode(
-    const Vec3& vWorldRaySrc,
-    const Vec3& vWorldRayDir,
-    IGeomCacheRenderNode* pGeomCacheRenderNode,
-    _smart_ptr<IMaterial>* ppOutLastMaterial,
-    [[maybe_unused]] const Matrix34A& worldTM,
-    SRayHitInfo& outHitInfo)
-{
-    if (!pGeomCacheRenderNode)
-    {
-        return false;
-    }
-
-    SRayHitInfo newHitInfo = outHitInfo;
-    newHitInfo.inReferencePoint = vWorldRaySrc;
-    newHitInfo.inRay                = Ray(vWorldRaySrc, vWorldRayDir);
-    newHitInfo.bInFirstHit  = false;
-    newHitInfo.bUseCache        = false;
-
-    if (pGeomCacheRenderNode->RayIntersection(newHitInfo))
-    {
-        if (newHitInfo.fDistance < 0 || newHitInfo.fDistance > kEnoughFarDistance || (outHitInfo.fDistance != 0 && newHitInfo.fDistance > outHitInfo.fDistance))
-        {
-            return false;
-        }
-
-        // Only override outHitInfo if the new hit is closer than the original hit
-        outHitInfo = newHitInfo;
-        if (ppOutLastMaterial)
-        {
-            _smart_ptr<IMaterial> pMaterial = pGeomCacheRenderNode->GetMaterial();
-            if (pMaterial)
-            {
-                *ppOutLastMaterial = pMaterial;
-                if (outHitInfo.nHitMatID >= 0)
-                {
-                    if (pMaterial->GetSubMtlCount() > 0 && outHitInfo.nHitMatID < pMaterial->GetSubMtlCount())
-                    {
-                        *ppOutLastMaterial = pMaterial->GetSubMtl(outHitInfo.nHitMatID);
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    return false;
-}
-#endif
-
-bool CSurfaceInfoPicker::RayIntersection_IRenderNode(
-    const Vec3& vWorldRaySrc,
-    const Vec3& vWorldRayDir,
-    IRenderNode* pRenderNode,
-    _smart_ptr<IMaterial>* pOutLastMaterial,
-    [[maybe_unused]] const Matrix34A& WorldTM,
-    SRayHitInfo& outHitInfo)
-{
-    if (pRenderNode == NULL)
-    {
-        return false;
-    }
-
-    AZ_UNUSED(vWorldRaySrc)
-    AZ_UNUSED(vWorldRayDir)
-    AZ_UNUSED(pRenderNode)
-    AZ_UNUSED(pOutLastMaterial)
-    AZ_UNUSED(WorldTM)
-    AZ_UNUSED(outHitInfo)
-    return false;
-}
-
-bool CSurfaceInfoPicker::RayWorldToLocal(
-    const Matrix34A& WorldTM,
-    const Vec3& vWorldRaySrc,
-    const Vec3& vWorldRayDir,
-    Vec3& outRaySrc,
-    Vec3& outRayDir)
-{
-    if (!WorldTM.IsValid())
-    {
-        return false;
-    }
-    Matrix34A invertedM(WorldTM.GetInverted());
-    if (!invertedM.IsValid())
-    {
-        return false;
-    }
-    outRaySrc = invertedM.TransformPoint(vWorldRaySrc);
-    outRayDir = invertedM.TransformVector(vWorldRayDir).GetNormalized();
-    return true;
-}
-
-bool CSurfaceInfoPicker::IsMaterialValid(CMaterial* pMaterial)
-{
-    if (pMaterial == NULL)
-    {
-        return false;
-    }
-    return !(pMaterial->GetMatInfo()->GetFlags() & MTL_FLAG_NODRAW);
-}
-
-void CSurfaceInfoPicker::AssignObjectMaterial(CBaseObject* pObject, const SRayHitInfo& outHitInfo, _smart_ptr<IMaterial>* pOutMaterial)
-{
-    CMaterial* material = pObject->GetMaterial();
-    if (material)
-    {
-        if (material->GetMatInfo())
-        {
-            if (pOutMaterial)
-            {
-                *pOutMaterial = material->GetMatInfo();
-                if (*pOutMaterial)
-                {
-                    if (outHitInfo.nHitMatID >= 0 && (*pOutMaterial)->GetSubMtlCount() > 0 && outHitInfo.nHitMatID < (*pOutMaterial)->GetSubMtlCount())
-                    {
-                        *pOutMaterial = (*pOutMaterial)->GetSubMtl(outHitInfo.nHitMatID);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void CSurfaceInfoPicker::AssignMaterial(_smart_ptr<IMaterial> pMaterial, const SRayHitInfo& outHitInfo, _smart_ptr<IMaterial>* pOutMaterial)
-{
-    if (pOutMaterial)
-    {
-        *pOutMaterial = pMaterial;
-        if (*pOutMaterial)
-        {
-            if (outHitInfo.nHitMatID >= 0 && (*pOutMaterial)->GetSubMtlCount() > 0 && outHitInfo.nHitMatID < (*pOutMaterial)->GetSubMtlCount())
-            {
-                *pOutMaterial = (*pOutMaterial)->GetSubMtl(outHitInfo.nHitMatID);
-            }
-        }
-    }
-}
-
-void CSurfaceInfoPicker::SetActiveView(IDisplayViewport* view)
-{
-    if (view)
-    {
-        m_pActiveView = view;
-    }
-    else
-    {
-        m_pActiveView = GetIEditor()->GetActiveView();
-    }
-}
diff --git a/Code/Sandbox/Editor/SurfaceInfoPicker.h b/Code/Sandbox/Editor/SurfaceInfoPicker.h
deleted file mode 100644
index 110408d558..0000000000
--- a/Code/Sandbox/Editor/SurfaceInfoPicker.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_SURFACEINFOPICKER_H
-#define CRYINCLUDE_EDITOR_SURFACEINFOPICKER_H
-
-#pragma once
-
-#include "Include/IObjectManager.h"
-#include "Objects/BaseObject.h"
-
-class CKDTree;
-struct IDisplayViewport;
-
-//////////////////////////////////////////////////////////////////////////
-class SANDBOX_API CSurfaceInfoPicker
-{
-public:
-
-    CSurfaceInfoPicker();
-
-    class CExcludedObjects
-    {
-    public:
-
-        CExcludedObjects(){}
-        ~CExcludedObjects(){}
-        CExcludedObjects(const CExcludedObjects& excluded)
-        {
-            objects = excluded.objects;
-        }
-
-        void Add(CBaseObject* pObject)
-        {
-            objects.insert(pObject);
-        }
-
-        void Clear()
-        {
-            objects.clear();
-        }
-
-        bool Contains(CBaseObject* pObject) const
-        {
-            return objects.find(pObject) != objects.end();
-        }
-
-    private:
-        std::set<CBaseObject*> objects;
-    };
-
-    enum EPickedObjectGroup
-    {
-        ePOG_Entity = BIT(1),
-        ePOG_All = ePOG_Entity,
-    };
-
-    enum EPickOption
-    {
-        ePickOption_IncludeFrozenObject = BIT(0),
-    };
-
-    void SetPickOptionFlag(int nFlag) { m_PickOption = nFlag; }
-
-public:
-
-    bool Pick(const Vec3& vWorldRaySrc, const Vec3& vWorldRayDir,
-        _smart_ptr<IMaterial>& ppOutLastMaterial,
-        SRayHitInfo& outHitInfo,
-        CExcludedObjects* pExcludedObjects = NULL,
-        int nFlag = ePOG_All)
-    {
-        return PickImpl(vWorldRaySrc, vWorldRayDir, &ppOutLastMaterial, outHitInfo, pExcludedObjects, nFlag);
-    }
-
-    bool Pick(const Vec3& vWorldRaySrc, const Vec3& vWorldRayDir,
-        SRayHitInfo& outHitInfo,
-        CExcludedObjects* pExcludedObjects = NULL,
-        int nFlag = ePOG_All)
-    {
-        return PickImpl(vWorldRaySrc, vWorldRayDir, NULL, outHitInfo, pExcludedObjects, nFlag);
-    }
-
-    bool Pick(const QPoint& point,
-        SRayHitInfo& outHitInfo,
-        CExcludedObjects* pExcludedObjects = NULL,
-        int nFlag = ePOG_All)
-    {
-        return PickImpl(point, NULL, outHitInfo, pExcludedObjects, nFlag);
-    }
-
-    bool Pick(const QPoint& point,
-        _smart_ptr<IMaterial>& ppOutLastMaterial,
-        SRayHitInfo& outHitInfo,
-        CExcludedObjects* pExcludedObjects = NULL,
-        int nFlag = ePOG_All)
-    {
-        return PickImpl(point, &ppOutLastMaterial, outHitInfo, pExcludedObjects, nFlag);
-    }
-
-    bool PickByAABB(const QPoint& point, int nFlag = ePOG_All, IDisplayViewport* pView = NULL, CExcludedObjects* pExcludedObjects = NULL, std::vector<CBaseObjectPtr>* pOutObjects = NULL);
-
-    void SetObjects(CBaseObjectsArray* pSetObjects) {   m_pSetObjects = pSetObjects; }
-
-    CBaseObjectPtr GetPickedObject()
-    {
-        return m_pPickedObject;
-    }
-
-    void SetActiveView(IDisplayViewport* view);
-
-public:
-
-    static bool RayWorldToLocal(
-        const Matrix34A& WorldTM,
-        const Vec3& vWorldRaySrc,
-        const Vec3& vWorldRayDir,
-        Vec3& outRaySrc,
-        Vec3& outRayDir);
-
-private:
-
-    bool IsFrozen(CBaseObject* pBaseObject) const
-    {
-        return !(m_PickOption & ePickOption_IncludeFrozenObject) && pBaseObject->IsFrozen();
-    }
-
-    bool PickImpl(const QPoint& point,
-        _smart_ptr<IMaterial>* ppOutLastMaterial,
-        SRayHitInfo& outHitInfo,
-        CExcludedObjects* pExcludedObjects = NULL,
-        int nFlag = ePOG_All);
-
-    bool PickImpl(const Vec3& vWorldRaySrc, const Vec3& vWorldRayDir,
-        _smart_ptr<IMaterial>* ppOutLastMaterial,
-        SRayHitInfo& outHitInfo,
-        CExcludedObjects* pExcludedObjects = NULL,
-        int nFlag = ePOG_All);
-
-    void FindNearestInfoFromEntities(
-        const Vec3& vWorldRaySrc,
-        const Vec3& vWorldRayDir,
-        _smart_ptr<IMaterial>* ppOutLastMaterial,
-        SRayHitInfo& outHitInfo) const;
-
-    /// Detect ray intersection with a IRenderNode or IStatObj.
-    /// But only if the intersection is closer than the one already in outHitInfo.
-    static bool RayIntersection(
-        const Vec3& vWorldRaySrc,
-        const Vec3& vWorldRayDir,
-        IRenderNode* pRenderNode,
-        IStatObj* pStatObj,
-        const Matrix34A& WorldTM,
-        SRayHitInfo& outHitInfo,
-        _smart_ptr<IMaterial>* ppOutLastMaterial);
-
-    /// Detect ray intersection with a IStatObj
-    static bool RayIntersection_IStatObj(
-        const Vec3& vWorldRaySrc,
-        const Vec3& vWorldRayDir,
-        IStatObj* pStatObj,
-        _smart_ptr<IMaterial>* ppOutLastMaterial,
-        const Matrix34A& WorldTM,
-        SRayHitInfo& outHitInfo);
-
-    /// Detect ray intersection with a IGeomCacheRenderNode
-    static bool RayIntersection_IGeomCacheRenderNode(
-        const Vec3& vWorldRaySrc,
-        const Vec3& vWorldRayDir,
-        IGeomCacheRenderNode* pGeomCacheRenderNode,
-        _smart_ptr<IMaterial>* ppOutLastMaterial,
-        const Matrix34A& worldTM,
-        SRayHitInfo& outHitInfo);
-
-    /// Detect ray intersection with a IRenderNode
-    static bool RayIntersection_IRenderNode(
-        const Vec3& vWorldRaySrc,
-        const Vec3& vWorldRayDir,
-        IRenderNode* pRenderNode,
-        _smart_ptr<IMaterial>* ppOutLastMaterial,
-        const Matrix34A& WorldTM,
-        SRayHitInfo& outHitInfo);
-
-    /// Detect ray intersection with a CBaseObject
-    static bool RayIntersection_CBaseObject(
-        const Vec3& vWorldRaySrc,
-        const Vec3& vWorldRayDir,
-        CBaseObject* pBaseObject,
-        _smart_ptr<IMaterial>* ppOutLastMaterial,
-        SRayHitInfo& outHitInfo);
-
-    static void AssignObjectMaterial(CBaseObject* pObject, const SRayHitInfo& outHitInfo, _smart_ptr<IMaterial>* pOutMaterial);
-    static void AssignMaterial(_smart_ptr<IMaterial> pObject, const SRayHitInfo& outHitInfo, _smart_ptr<IMaterial>* pOutMaterial);
-    static bool IsMaterialValid(CMaterial* pMaterial);
-
-private:
-
-    int m_PickOption;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    CBaseObjectsArray* m_pObjects;
-    CBaseObjectsArray* m_pSetObjects;
-    CBaseObjectsArray m_objects;
-    IDisplayViewport* m_pActiveView;
-    CExcludedObjects m_ExcludedObjects;
-    mutable CBaseObjectPtr m_pPickedObject;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_SURFACEINFOPICKER_H
diff --git a/Code/Sandbox/Editor/SurfaceTypeValidator.cpp b/Code/Sandbox/Editor/SurfaceTypeValidator.cpp
index 68bbdcf3bb..9aec070912 100644
--- a/Code/Sandbox/Editor/SurfaceTypeValidator.cpp
+++ b/Code/Sandbox/Editor/SurfaceTypeValidator.cpp
@@ -16,7 +16,6 @@
 #include "SurfaceTypeValidator.h"
 
 // Editor
-#include "Material/Material.h"
 #include "Include/IObjectManager.h"
 #include "Objects/BaseObject.h"
 #include "ErrorReport.h"
diff --git a/Code/Sandbox/Editor/TimeOfDayDialog.cpp b/Code/Sandbox/Editor/TimeOfDayDialog.cpp
index 9c3b77f17d..80aa4d5172 100644
--- a/Code/Sandbox/Editor/TimeOfDayDialog.cpp
+++ b/Code/Sandbox/Editor/TimeOfDayDialog.cpp
@@ -34,9 +34,6 @@
 #include "Undo/Undo.h"
 #include "LyViewPaneNames.h"
 
-// Cry3DEngine
-#include <Cry3DEngine/Environment/OceanEnvironmentBus.h>
-
 AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 #include <ui_TimeOfDayDialog.h>
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
@@ -69,14 +66,6 @@ namespace TimeOfDayDetails
         return static_cast<float>(time.msecsSinceStartOfDay() / 60000) / 60.0;
     }
 
-    // Is the ocean component feature toggle enabled?
-    AZ_INLINE static bool HasOceanFeatureToggle()
-    {
-        bool bHasOceanFeature = false;
-        AZ::OceanFeatureToggleBus::BroadcastResult(bHasOceanFeature, &AZ::OceanFeatureToggleBus::Events::OceanComponentEnabled);
-        return bHasOceanFeature;
-    }
-
     AZ_INLINE static bool SkipUserInterface(int value)
     {
         // Check for obsolete parameters that we still want to keep around to migrate legacy data to new data
@@ -89,13 +78,6 @@ namespace TimeOfDayDetails
             (enumValue == ITimeOfDay::PARAM_TERRAIN_OCCL_MULTIPLIER) ||
             (enumValue == ITimeOfDay::PARAM_SUN_COLOR_MULTIPLIER);
 
-        // Only check the ocean parameters if the ocean feature (aka the Infinite Ocean Component)
-        // has been enabled
-        skipParameter |= HasOceanFeatureToggle() &&
-               ((enumValue == ITimeOfDay::PARAM_OCEANFOG_COLOR) ||
-               (enumValue == ITimeOfDay::PARAM_OCEANFOG_COLOR_MULTIPLIER) ||
-               (enumValue == ITimeOfDay::PARAM_OCEANFOG_DENSITY));
-
         return skipParameter;
     }
 }
@@ -1088,7 +1070,7 @@ void CTimeOfDayDialog::OnResetToDefaultValues()
         ITimeOfDay* pTimeOfDay = gEnv->p3DEngine->GetTimeOfDay();
 
         // Load the default time of day settings and use those to reset the time of day.
-        XmlNodeRef root = GetISystem()->LoadXmlFromFile("Editor/default_time_of_day.xml");
+        XmlNodeRef root = GetISystem()->LoadXmlFromFile("default_time_of_day.xml");
         if (root)
         {
             pTimeOfDay->Serialize(root, true);
diff --git a/Code/Sandbox/Editor/ToolBox.cpp b/Code/Sandbox/Editor/ToolBox.cpp
index 46c01ce864..2711797168 100644
--- a/Code/Sandbox/Editor/ToolBox.cpp
+++ b/Code/Sandbox/Editor/ToolBox.cpp
@@ -335,21 +335,9 @@ void CToolBoxManager::Load(ActionManager* actionManager)
 
     if (actionManager)
     {
-        QByteArray array = gSettings.strEditorEnv.toUtf8();
-        AZStd::string actualPath = AZStd::string::format("@engroot@/%s", array.constData());
-        XmlNodeRef envNode = XmlHelpers::LoadXmlFromFile(actualPath.c_str());
-        if (envNode)
-        {
-            int childrenCount = envNode->getChildCount();
-            for (int idx = 0; idx < childrenCount; ++idx)
-            {
-                XmlNodeRef child = envNode->getChild(idx);
-                if (child->haveAttr("scriptPath") && child->haveAttr("shelvesPath"))
-                {
-                    LoadShelves(child->getAttr("scriptPath"), child->getAttr("shelvesPath"), actionManager);
-                }
-            }
-        }
+        auto engineSourceAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
+        LoadShelves((engineSourceAssetPath / "Editor" / "Scripts").c_str(),
+            (engineSourceAssetPath / "Editor" / "Scripts" / "Shelves").c_str(), actionManager);
     }
 }
 
diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp
index 6977121933..01bd7be82b 100644
--- a/Code/Sandbox/Editor/ToolbarManager.cpp
+++ b/Code/Sandbox/Editor/ToolbarManager.cpp
@@ -511,6 +511,7 @@ void ToolbarManager::InitializeStandardToolbars()
         m_standardToolbars.reserve(5 + macroToolbars.size());
         m_standardToolbars.push_back(GetEditModeToolbar());
         m_standardToolbars.push_back(GetObjectToolbar());
+        m_standardToolbars.push_back(GetPlayConsoleToolbar());
 
         IPlugin* pGamePlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{71CED8AB-54E2-4739-AA78-7590A5DC5AEB}");
         IPlugin* pDescriptionEditorPlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{4B9B7074-2D58-4AFD-BBE1-BE469D48456A}");
@@ -591,12 +592,9 @@ AmazonToolbar ToolbarManager::GetEditModeToolbar() const
     t.AddAction(ID_EDITMODE_ROTATE, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_EDITMODE_SCALE, ORIGINAL_TOOLBAR_VERSION);
 
-    t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
-
     t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_RULER, ORIGINAL_TOOLBAR_VERSION);
 
     t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE, ORIGINAL_TOOLBAR_VERSION);
@@ -610,34 +608,28 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const
     AmazonToolbar t = AmazonToolbar("Object", QObject::tr("Object Toolbar"));
     t.SetMainToolbar(true);
     t.AddAction(ID_GOTO_SELECTED, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_OBJECTMODIFY_SETHEIGHT, ORIGINAL_TOOLBAR_VERSION);
 
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
-        t.AddAction(ID_EDIT_FREEZE, ORIGINAL_TOOLBAR_VERSION);
-        t.AddAction(ID_EDIT_UNFREEZEALL, ORIGINAL_TOOLBAR_VERSION);
-    }
+    return t;
+}
+
+AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Console"));
+    t.SetMainToolbar(true);
 
+    t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); 
+    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
+    t.AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, ORIGINAL_TOOLBAR_VERSION);
+    t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
     return t;
 }
 
 AmazonToolbar ToolbarManager::GetEditorsToolbar() const
 {
     AmazonToolbar t = AmazonToolbar("Editors", QObject::tr("Editors Toolbar"));
-    if( !AZ::Interface<AzFramework::AtomActiveInterface>::Get() && !GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        t.AddAction(ID_OPEN_MATERIAL_EDITOR, ORIGINAL_TOOLBAR_VERSION);
-    }
 
     t.AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, ORIGINAL_TOOLBAR_VERSION);
 
-    if (!AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        t.AddAction(ID_PARTICLE_EDITOR, ORIGINAL_TOOLBAR_VERSION);
-        t.AddAction(ID_GENERATORS_LIGHTING, ORIGINAL_TOOLBAR_VERSION);
-    }
-
     return t;
 }
 
@@ -753,7 +745,7 @@ void ToolbarManager::InstantiateToolbars()
     for (int i = 0; i < numToolbars; ++i)
     {
         InstantiateToolbar(i);
-        if (i == 1)
+        if (i == 2)
         {
             // Hack. Just copying how it was
             m_mainWindow->addToolBarBreak();
diff --git a/Code/Sandbox/Editor/ToolbarManager.h b/Code/Sandbox/Editor/ToolbarManager.h
index a0a9c83029..70228636f5 100644
--- a/Code/Sandbox/Editor/ToolbarManager.h
+++ b/Code/Sandbox/Editor/ToolbarManager.h
@@ -167,6 +167,7 @@ public:
     AmazonToolbar GetObjectToolbar() const;
     AmazonToolbar GetEditorsToolbar() const;
     AmazonToolbar GetMiscToolbar() const;
+    AmazonToolbar GetPlayConsoleToolbar() const;
 
 private:
     Q_DISABLE_COPY(ToolbarManager);
diff --git a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp b/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp
index 86410a0211..9508c4e265 100644
--- a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp
+++ b/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp
@@ -22,7 +22,7 @@
 #include <AzCore/Name/Name.h>
 #include <AzFramework/Entity/GameEntityContextBus.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 namespace TrackView
 {
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp b/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
index a7a801e35a..06184c0fc3 100644
--- a/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
+++ b/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
@@ -807,18 +807,11 @@ void CTrackViewDialog::UpdateActions()
         m_actions[ID_TRACKVIEW_MUTE_ALL]->setEnabled(true);
         m_actions[ID_ADDSCENETRACK]->setEnabled(true);
 
-        AzToolsFramework::EntityIdList entityIds;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-            entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        bool areAnyEntitiesSelected = false;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
 
-        if (entityIds.empty())
-        {
-            m_actions[ID_ADDNODE]->setEnabled(false);
-        }
-        else
-        {
-            m_actions[ID_ADDNODE]->setEnabled(true);
-        }
+        m_actions[ID_ADDNODE]->setEnabled(areAnyEntitiesSelected);
     }
     else
     {
@@ -1569,12 +1562,12 @@ void CTrackViewDialog::OnAddSelectedNode()
             sequence->MarkAsModified();
         }
 
-        AzToolsFramework::EntityIdList entityIds;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-            entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        int selectedEntitiesCount = 0;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
 
         // check to make sure all nodes were added and notify user if they weren't
-        if (addedNodes.GetCount() != entityIds.size())
+        if (addedNodes.GetCount() != selectedEntitiesCount)
         {
             IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
 
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp b/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp
index 268ae229b5..3979bf3cca 100644
--- a/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp
+++ b/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp
@@ -1137,12 +1137,12 @@ void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
                 CTrackViewAnimNodeBundle addedNodes = groupNode->AddSelectedEntities(m_pTrackViewDialog->GetDefaultTracksForEntityNode());
                 undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
 
-                AzToolsFramework::EntityIdList entityIds;
-                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-                    entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+                int selectedEntitiesCount = 0;
+                AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+                    selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
 
                 // check to make sure all nodes were added and notify user if they weren't
-                if (addedNodes.GetCount() != entityIds.size())
+                if (addedNodes.GetCount() != selectedEntitiesCount)
                 {
                     IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
 
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp b/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp
index 12f38c920a..0ba7c5b325 100644
--- a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp
+++ b/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp
@@ -27,7 +27,6 @@
 #include "AnimationContext.h"
 #include "GameEngine.h"
 #include "Include/IObjectManager.h"
-#include "Material/MaterialManager.h"
 #include "Objects/ObjectManager.h"
 
 
@@ -35,7 +34,6 @@
 CTrackViewSequenceManager::CTrackViewSequenceManager()
 {
     GetIEditor()->RegisterNotifyListener(this);
-    GetIEditor()->GetMaterialManager()->AddListener(this);
 
     AZ::EntitySystemBus::Handler::BusConnect();
 }
@@ -45,7 +43,6 @@ CTrackViewSequenceManager::~CTrackViewSequenceManager()
 {
     AZ::EntitySystemBus::Handler::BusDisconnect();
 
-    GetIEditor()->GetMaterialManager()->RemoveListener(this);
     GetIEditor()->UnregisterNotifyListener(this);
 }
 
diff --git a/Code/Sandbox/Editor/Util/Variable.h b/Code/Sandbox/Editor/Util/Variable.h
index ab43d24e94..d00ef6103a 100644
--- a/Code/Sandbox/Editor/Util/Variable.h
+++ b/Code/Sandbox/Editor/Util/Variable.h
@@ -152,7 +152,7 @@ struct IVariable
         DT_LOCAL_STRING,
         DT_EQUIP,
         DT_REVERBPRESET,
-        DT_MATERIAL,
+        DT_DEPRECATED0, // formerly DT_MATERIAL
         DT_MATERIALLOOKUP,
         DT_EXTARRAY,    // Extendable Array
         DT_SEQUENCE,    // Movie Sequence (DEPRECATED, use DT_SEQUENCE_ID, instead.)
@@ -163,7 +163,7 @@ struct IVariable
         DT_LIGHT_ANIMATION, // Light Animation Node in the global Light Animation Set
         DT_PARTICLE_EFFECT,
         DT_GEOM_CACHE, // Geometry cache
-        DT_FLARE,
+        DT_DEPRECATED, // formerly DT_FLARE
         DT_AUDIO_TRIGGER,
         DT_AUDIO_SWITCH,
         DT_AUDIO_SWITCH_STATE,
diff --git a/Code/Sandbox/Editor/Util/VariablePropertyType.cpp b/Code/Sandbox/Editor/Util/VariablePropertyType.cpp
index 5a3029807b..c7fd3d9de2 100644
--- a/Code/Sandbox/Editor/Util/VariablePropertyType.cpp
+++ b/Code/Sandbox/Editor/Util/VariablePropertyType.cpp
@@ -49,7 +49,7 @@ namespace Prop
         { IVariable::DT_SIMPLE, "Selection", ePropertySelection, -1 },
         { IVariable::DT_SIMPLE, "List", ePropertyList, -1 },
         { IVariable::DT_SHADER, "Shader", ePropertyShader, 9 },
-        { IVariable::DT_MATERIAL, "Material", ePropertyMaterial, 14 },
+        { IVariable::DT_DEPRECATED0, "DEPRECATED", ePropertyDeprecated2, -1 },
         { IVariable::DT_EQUIP, "Equip", ePropertyEquip, 11 },
         { IVariable::DT_REVERBPRESET, "ReverbPreset", ePropertyReverbPreset, 11 },
         { IVariable::DT_LOCAL_STRING, "LocalString", ePropertyLocalString, 3 },
@@ -58,7 +58,6 @@ namespace Prop
         { IVariable::DT_USERITEMCB, "User", ePropertyUser, -1 },
         { IVariable::DT_SEQUENCE_ID, "SequenceId", ePropertySequenceId, -1 },
         { IVariable::DT_LIGHT_ANIMATION, "LightAnimation", ePropertyLightAnimation, -1 },
-        { IVariable::DT_FLARE, "Flare", ePropertyFlare, 7 },
         { IVariable::DT_PARTICLE_EFFECT, "ParticleEffect", ePropertyParticleName, 3 },
         { IVariable::DT_GEOM_CACHE, "Geometry Cache", ePropertyGeomCache, 5 },
         { IVariable::DT_AUDIO_TRIGGER, "Audio Trigger", ePropertyAudioTrigger, 6 },
diff --git a/Code/Sandbox/Editor/Util/VariablePropertyType.h b/Code/Sandbox/Editor/Util/VariablePropertyType.h
index 86fc8e9c0f..130148c903 100644
--- a/Code/Sandbox/Editor/Util/VariablePropertyType.h
+++ b/Code/Sandbox/Editor/Util/VariablePropertyType.h
@@ -39,7 +39,7 @@ enum PropertyType
     ePropertySelection,
     ePropertyList,
     ePropertyShader,
-    ePropertyMaterial,
+    ePropertyDeprecated2, // formerly ePropertyMaterial
     ePropertyEquip,
     ePropertyReverbPreset,
     ePropertyLocalString,
@@ -50,7 +50,7 @@ enum PropertyType
     ePropertyUser,
     ePropertySequenceId,
     ePropertyLightAnimation,
-    ePropertyFlare,
+    ePropertyDeprecated1, // formerly ePropertyFlare
     ePropertyParticleName,
     ePropertyGeomCache,
     ePropertyAudioTrigger,
diff --git a/Code/Sandbox/Editor/Util/VariableTypeInfo.cpp b/Code/Sandbox/Editor/Util/VariableTypeInfo.cpp
index 61cdac53c6..206131e5a9 100644
--- a/Code/Sandbox/Editor/Util/VariableTypeInfo.cpp
+++ b/Code/Sandbox/Editor/Util/VariableTypeInfo.cpp
@@ -112,10 +112,6 @@ void CVariableTypeInfo::SetTypes(CTypeInfo const& TypeInfo, EType eType)
         {
             SetDataType(DT_TEXTURE);
         }
-        else if (m_name == "Material")
-        {
-            SetDataType(DT_MATERIAL);
-        }
         else if (m_name == "Geometry")
         {
             SetDataType(DT_OBJECT);
diff --git a/Code/Sandbox/Editor/ViewManager.cpp b/Code/Sandbox/Editor/ViewManager.cpp
index 268bc19963..7dd0f3e033 100644
--- a/Code/Sandbox/Editor/ViewManager.cpp
+++ b/Code/Sandbox/Editor/ViewManager.cpp
@@ -94,13 +94,6 @@ CViewManager::CViewManager()
     RegisterQtViewPane<QTopRendererWnd>(GetIEditor(), "Map", LyViewPane::CategoryViewport, viewportOptions);
 
     GetIEditor()->RegisterNotifyListener(this);
-
-    if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        // if the legacy interaction model is used, this manager will be the main manager
-        m_manipulatorManager =
-            AZStd::make_shared<AzToolsFramework::ManipulatorManager>(AzToolsFramework::g_mainManipulatorManagerId);
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/ViewPane.cpp b/Code/Sandbox/Editor/ViewPane.cpp
index 52146bdf09..43e4330113 100644
--- a/Code/Sandbox/Editor/ViewPane.cpp
+++ b/Code/Sandbox/Editor/ViewPane.cpp
@@ -589,7 +589,7 @@ void CLayoutViewPane::ShowTitleMenu()
     action->setChecked(IsFullscreen());
 
     action = root.addAction(tr("Configure Layout..."));
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
+    if (!CViewManager::IsMultiViewportEnabled())
     {
         action->setDisabled(true);
     }
@@ -665,12 +665,6 @@ void CLayoutViewPane::SetFullscreenViewport(bool b)
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::SetFocusToViewportSearch()
-{
-    m_viewportTitleDlg.SetFocusToSearchField();
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CLayoutViewPane::SetFocusToViewport()
 {
diff --git a/Code/Sandbox/Editor/ViewPane.h b/Code/Sandbox/Editor/ViewPane.h
index 684eece8df..53d13c105d 100644
--- a/Code/Sandbox/Editor/ViewPane.h
+++ b/Code/Sandbox/Editor/ViewPane.h
@@ -73,7 +73,6 @@ public:
     void ShowTitleMenu();
     void ToggleMaximize();
 
-    void SetFocusToViewportSearch();
     void SetFocusToViewport();
 
     void ResizeViewport(int width, int height);
diff --git a/Code/Sandbox/Editor/Viewport.cpp b/Code/Sandbox/Editor/Viewport.cpp
index 1041a4f086..37a9ee5f29 100644
--- a/Code/Sandbox/Editor/Viewport.cpp
+++ b/Code/Sandbox/Editor/Viewport.cpp
@@ -21,6 +21,9 @@
 // AzQtComponents
 #include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
 
+#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+
 // Editor
 #include "ViewManager.h"
 #include "Include/ITransformManipulator.h"
@@ -1091,6 +1094,13 @@ void QtViewport::SetAxisConstrain(int axis)
     m_activeAxis = axis;
 };
 
+AzToolsFramework::ViewportInteraction::MouseInteraction QtViewport::BuildMouseInteraction(
+    [[maybe_unused]] Qt::MouseButtons buttons, [[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
+{
+    // Implemented by sub-class
+    return AzToolsFramework::ViewportInteraction::MouseInteraction();
+}
+
 //////////////////////////////////////////////////////////////////////////
 bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
 {
@@ -1103,7 +1113,51 @@ bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
         hitInfo.bUseSelectionHelpers = true;
     }
 
-    return GetIEditor()->GetObjectManager()->HitTest(hitInfo);
+    const int viewportId = GetViewportId();
+
+    AzToolsFramework::EntityIdList visibleEntityIds;
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Event(
+        viewportId,
+        &AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequests::FindVisibleEntities,
+        visibleEntityIds);
+
+    // Look through all visible entities to find the closest one to the specified mouse point
+    using namespace AzToolsFramework::ViewportInteraction;
+    AZ::EntityId entityIdUnderCursor;
+    float closestDistance = std::numeric_limits<float>::max();
+    MouseInteraction mouseInteraction = BuildMouseInteraction(QGuiApplication::mouseButtons(),
+        QGuiApplication::queryKeyboardModifiers(),
+        point);
+    for (auto entityId : visibleEntityIds)
+    {
+        using AzFramework::ViewportInfo;
+        // Check if components provide an aabb
+        if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, ViewportInfo{ viewportId });
+            aabb.IsValid())
+        {
+            // Coarse grain check
+            if (AzToolsFramework::AabbIntersectMouseRay(mouseInteraction, aabb))
+            {
+                // If success, pick against specific component
+                if (AzToolsFramework::PickEntity(
+                    entityId, mouseInteraction,
+                    closestDistance, viewportId))
+                {
+                    entityIdUnderCursor = entityId;
+                }
+            }
+        }
+    }
+
+    // If we hit a valid Entity, then store the distance in the HitContext
+    // so that the caller can use this for calculations
+    if (entityIdUnderCursor.IsValid())
+    {
+        hitInfo.dist = closestDistance;
+        return true;
+    }
+
+    return false;
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/Viewport.h b/Code/Sandbox/Editor/Viewport.h
index 9979a3bb0a..bd7c749573 100644
--- a/Code/Sandbox/Editor/Viewport.h
+++ b/Code/Sandbox/Editor/Viewport.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <AzToolsFramework/Viewport/ViewportTypes.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <Cry_Color.h>
 #include "IPostRenderer.h"
@@ -405,6 +406,12 @@ public:
 
     void SetAxisConstrain(int axis);
 
+    /// Take raw input and create a final mouse interaction.
+    /// @attention Do not map **point** from widget to viewport explicitly,
+    /// this is handled internally by BuildMouseInteraction - just pass directly.
+    virtual AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+
     //////////////////////////////////////////////////////////////////////////
     // Selection.
     //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.cpp b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
index 5d558eba98..427a5c32e8 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.cpp
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
@@ -63,33 +63,9 @@ inline namespace Helpers
     }
 }
 
-const int SEARCH_BY_NAME = 1;
-const int SEARCH_BY_TYPE = 2;
-const int SEARCH_BY_ASSET = 3;
-const int HIDE_OTHERS = 4;
-const int FREEZE_OTHERS = 5;
-const int JUST_SELLECT = 6;
-const int LOGICAL_AND = 7;
-const int LOGICAL_OR = 8;
-const int INPUT_NAMES_FROM_SELECTION = 9;
-
 CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
     : QWidget(pParent)
-    , m_searchMode(ESM_BY_NAME)
-    , m_searchResultHandling(ESRH_HIDE_OTHERS)
-    , m_bOR(false)
     , m_ui(new Ui::ViewportTitleDlg)
-    , m_searchModeActionGroup(nullptr)
-    , m_searchByNameAction(nullptr)
-    , m_searchByTypeAction(nullptr)
-    , m_searchByAssetAction(nullptr)
-    , m_searchResultHandlingActionGroup(nullptr)
-    , m_searchHideOthersAction(nullptr)
-    , m_searchFreezeOthersAction(nullptr)
-    , m_searchJustSelectAction(nullptr)
-    , m_searchMatchTypeActionGroup(nullptr)
-    , m_searchAndAction(nullptr)
-    , m_searchOrAction(nullptr)
 {
     auto container = new QWidget(this);
     m_ui->setupUi(container);
@@ -106,29 +82,8 @@ CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
     LoadCustomPresets("AspectRatioPresets", "AspectRatioPreset", m_customAspectRatioPresets);
     LoadCustomPresets("ResPresets", "ResPreset", m_customResPresets);
 
-    const bool newViewportInteractionModelEnabled =
-        GetIEditor()->IsNewViewportInteractionModelEnabled();
-
-    m_ui->m_viewportSearch->setEnabled(!newViewportInteractionModelEnabled);
-    m_ui->m_viewportSearch->setVisible(!newViewportInteractionModelEnabled);
-
     OnInitDialog();
 
-    if (!newViewportInteractionModelEnabled)
-    {
-        m_ui->m_viewportSearch->setClearButtonEnabled(true);
-        connect(m_ui->m_viewportSearch, &AzQtComponents::SearchLineEdit::menuEntryClicked, this, &CViewportTitleDlg::OnViewportSearchButtonClicked);
-        connect(m_ui->m_viewportSearch, &AzQtComponents::SearchLineEdit::returnPressed, this, &CViewportTitleDlg::OnSearchTermChange);
-        connect(m_ui->m_viewportSearch, &QLineEdit::textChanged, this, [this] (const QString& text){
-            if(text.isEmpty())
-            {
-                this->OnViewportSearchClear();
-            }
-        });
-
-        m_ui->m_viewportSearch->setFixedWidth(190);
-    }
-
     connect(m_ui->m_fovLabel, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpFOVMenu);
     connect(m_ui->m_fovStaticCtrl, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpFOVMenu);
     connect(m_ui->m_ratioStaticCtrl, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpAspectMenu);
@@ -160,8 +115,6 @@ void CViewportTitleDlg::OnInitDialog()
     m_ui->m_titleBtn->setText(m_title);
     m_ui->m_sizeStaticCtrl->setText(QString());
 
-    UpdateSearchOptionsText();
-
     m_ui->m_toggleHelpersBtn->setChecked(GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
 
     ICVar*  pDisplayInfo(gEnv->pConsole->GetCVar("r_displayInfo"));
@@ -178,77 +131,6 @@ void CViewportTitleDlg::OnInitDialog()
 
     m_ui->m_toggleHelpersBtn->setProperty("class", "big");
     m_ui->m_toggleDisplayInfoBtn->setProperty("class", "big");
-
-    //  ON_EN_CHANGE(IDC_VIEWPORT_SEARCH, OnSearchTermChange)
-}
-
-//////////////////////////////////////////////////////////////////////////
-QMenu * CViewportTitleDlg::InitializeViewportSearchMenu()
-{
-    QMenu* menu = new QMenu(this);
-
-    m_searchByNameAction = menu->addAction(tr("By Name"));
-    m_searchByNameAction->setData(SEARCH_BY_NAME);
-    m_searchByNameAction->setCheckable(true);
-    m_searchByNameAction->setChecked(m_searchMode == ESM_BY_NAME);
-    m_searchByTypeAction = menu->addAction(tr("By Type"));
-    m_searchByTypeAction->setData(SEARCH_BY_TYPE);
-    m_searchByTypeAction->setCheckable(true);
-    m_searchByTypeAction->setChecked(m_searchMode == ESM_BY_TYPE);
-    m_searchByAssetAction = menu->addAction(tr("By Asset"));
-    m_searchByAssetAction->setData(SEARCH_BY_ASSET);
-    m_searchByAssetAction->setCheckable(true);
-    m_searchByAssetAction->setChecked(m_searchMode == ESM_BY_ASSET);
-
-    menu->addSeparator();
-
-    m_searchHideOthersAction = menu->addAction(tr("Hide others"));
-    m_searchHideOthersAction->setData(HIDE_OTHERS);
-    m_searchHideOthersAction->setCheckable(true);
-    m_searchHideOthersAction->setChecked(m_searchResultHandling == ESRH_HIDE_OTHERS);
-    m_searchFreezeOthersAction = menu->addAction(tr("Freeze others"));
-    m_searchFreezeOthersAction->setData(FREEZE_OTHERS);
-    m_searchFreezeOthersAction->setCheckable(true);
-    m_searchFreezeOthersAction->setChecked(m_searchResultHandling == ESRH_FREEZE_OTHERS);
-    m_searchJustSelectAction = menu->addAction(tr("Just Select"));
-    m_searchJustSelectAction->setData(JUST_SELLECT);
-    m_searchJustSelectAction->setCheckable(true);
-    m_searchJustSelectAction->setChecked(m_searchResultHandling == ESRH_JUST_SELECT);
-
-    menu->addSeparator();
-
-    m_searchAndAction = menu->addAction(tr("AND"));
-    m_searchAndAction->setData(LOGICAL_AND);
-    m_searchAndAction->setCheckable(true);
-    m_searchAndAction->setChecked(!m_bOR);
-    m_searchOrAction = menu->addAction(tr("OR"));
-    m_searchOrAction->setData(LOGICAL_OR);
-    m_searchOrAction->setCheckable(true);
-    m_searchOrAction->setChecked(m_bOR);
-
-    menu->addSeparator();
-
-    menu->addAction(tr("Input names from selection"))->setData(INPUT_NAMES_FROM_SELECTION);
-
-    // Add the search mode, search result handling, and match type actions to
-    // exclusive action groups so that only one can be checked at a time, and
-    // you can't un-check the active action
-    m_searchModeActionGroup = new QActionGroup(this);
-    m_searchModeActionGroup->setExclusive(true);
-    m_searchModeActionGroup->addAction(m_searchByNameAction);
-    m_searchModeActionGroup->addAction(m_searchByTypeAction);
-    m_searchModeActionGroup->addAction(m_searchByAssetAction);
-    m_searchResultHandlingActionGroup = new QActionGroup(this);
-    m_searchResultHandlingActionGroup->setExclusive(true);
-    m_searchResultHandlingActionGroup->addAction(m_searchHideOthersAction);
-    m_searchResultHandlingActionGroup->addAction(m_searchFreezeOthersAction);
-    m_searchResultHandlingActionGroup->addAction(m_searchJustSelectAction);
-    m_searchMatchTypeActionGroup = new QActionGroup(this);
-    m_searchMatchTypeActionGroup->setExclusive(true);
-    m_searchMatchTypeActionGroup->addAction(m_searchAndAction);
-    m_searchMatchTypeActionGroup->addAction(m_searchOrAction);
-
-    return menu;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -256,11 +138,6 @@ void CViewportTitleDlg::SetTitle(const QString& title)
 {
     m_title = title;
     m_ui->m_titleBtn->setText(m_title);
-
-    const bool searchVisible =
-        title == QLatin1String("Perspective") && !GetIEditor()->IsNewViewportInteractionModelEnabled();
-
-    m_ui->m_viewportSearch->setVisible(searchVisible);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -645,339 +522,6 @@ void CViewportTitleDlg::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::InputNamesToSearchFromSelection()
-{
-    IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-    CSelectionGroup* pSelected = pObjMgr->GetSelection();
-    QString names;
-    for (int i = 0; i < pSelected->GetCount(); ++i)
-    {
-        names += pSelected->GetObject(i)->GetName();
-        names += QStringLiteral(" ");
-    }
-    m_ui->m_viewportSearch->setText(names);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnViewportSearchButtonClicked(const QAction* clickedAction)
-{
-    int cmd = clickedAction ? clickedAction->data().toInt() : 0;
-
-    #define ASSIGN(dst, src) do { if ((dst) != (src)) { (dst) = (src); OnSearchTermChange(); } \
-    }                                                                                          \
-    while (0)
-
-    if (cmd == SEARCH_BY_NAME)
-    {
-        ASSIGN(m_searchMode, ESM_BY_NAME);
-    }
-    else if (cmd == SEARCH_BY_TYPE)
-    {
-        ASSIGN(m_searchMode, ESM_BY_TYPE);
-    }
-    else if (cmd == SEARCH_BY_ASSET)
-    {
-        ASSIGN(m_searchMode, ESM_BY_ASSET);
-    }
-    else if (cmd == HIDE_OTHERS)
-    {
-        ASSIGN(m_searchResultHandling, ESRH_HIDE_OTHERS);
-    }
-    else if (cmd == FREEZE_OTHERS)
-    {
-        ASSIGN(m_searchResultHandling, ESRH_FREEZE_OTHERS);
-    }
-    else if (cmd == JUST_SELLECT)
-    {
-        ASSIGN(m_searchResultHandling, ESRH_JUST_SELECT);
-    }
-    else if (cmd == LOGICAL_AND)
-    {
-        ASSIGN(m_bOR, false);
-    }
-    else if (cmd == LOGICAL_OR)
-    {
-        ASSIGN(m_bOR, true);
-    }
-    else if (cmd == INPUT_NAMES_FROM_SELECTION)
-    {
-        InputNamesToSearchFromSelection();
-        m_bOR = true;
-        m_searchOrAction->setChecked(true);
-        OnSearchTermChange();
-    }
-
-    UpdateSearchOptionsText();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnViewportSearchClear()
-{
-    UnhideUnfreezeAll();
-    //clear edit control
-    gSettings.bIsSearchFilterActive = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::SetFocusToSearchField()
-{
-    if (m_ui->m_viewportSearch->isVisible())
-    {
-        m_ui->m_viewportSearch->setFocus();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnSearchTermChange()
-{
-    // Get individual search terms.
-    const QString searchTerm = m_ui->m_viewportSearch->text();
-
-    if (!searchTerm.isEmpty())
-    {
-        gSettings.bIsSearchFilterActive = true;
-    }
-    else
-    {
-        gSettings.bIsSearchFilterActive = false;
-    }
-
-    const int MIN_CHARS_AS_A_SEARCH_TERM = 3;
-    QStringList terms;
-
-    QStringList splitTerms = searchTerm.split(QStringLiteral(" "));
-    for (const QString& term : splitTerms)
-    {
-        if (term.length() >= MIN_CHARS_AS_A_SEARCH_TERM)
-        {
-            terms.append(term);
-        }
-    }
-
-    if (terms.isEmpty())
-    {
-        UnhideUnfreezeAll();
-        return;
-    }
-
-    // Make sure to lower case all terms because later we lower case all inputs to compare against
-    for (QString& term : terms)
-    {
-        term = term.toLower();
-    }
-
-    // Perform a search.
-    if (m_searchMode == ESM_BY_NAME)
-    {
-        SearchByName(terms);
-    }
-    else if (m_searchMode == ESM_BY_TYPE)
-    {
-        SearchByType(terms);
-    }
-    else if (m_searchMode == ESM_BY_ASSET)
-    {
-        SearchByAsset(terms);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::UnhideUnfreezeAll()
-{
-    IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-    int objCount = pObjMgr->GetObjectCount();
-    CBaseObjectsArray objects;
-    pObjMgr->GetObjects(objects);
-    for (int i = 0; i < objCount; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        pObjMgr->FreezeObject(pObject, false);
-        pObjMgr->HideObject(pObject, false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static bool DoesTextSatisfyTerms(const QString& text, const QStringList& terms, bool bOR)
-{
-    if (bOR) // OR
-    {
-        for (const QString& term : terms)
-        {
-            if (text.contains(term))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-    else // AND
-    {
-        for (const QString& term : terms)
-        {
-            if (!text.contains(term))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void HandleMatched(CBaseObject* pObject)
-{
-    IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-
-    pObjMgr->FreezeObject(pObject, false);
-    pObjMgr->HideObject(pObject, false);
-    pObjMgr->SelectObject(pObject);
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void HandleFiltered(CBaseObject* pObject, CViewportTitleDlg::ESearchResultHandling searchResultHandling)
-{
-    IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-    pObjMgr->UnselectObject(pObject);
-    if (searchResultHandling == CViewportTitleDlg::ESRH_HIDE_OTHERS)
-    {
-        pObjMgr->FreezeObject(pObject, false);
-        pObjMgr->HideObject(pObject, true);
-    }
-    else if (searchResultHandling == CViewportTitleDlg::ESRH_FREEZE_OTHERS)
-    {
-        pObjMgr->HideObject(pObject, false);
-        pObjMgr->FreezeObject(pObject, true);
-    }
-    else if (searchResultHandling == CViewportTitleDlg::ESRH_JUST_SELECT)
-    {
-        pObjMgr->FreezeObject(pObject, false);
-        pObjMgr->HideObject(pObject, false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::SearchByType(const QStringList& terms)
-{
-    IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-    int objCount = pObjMgr->GetObjectCount();
-    CBaseObjectsArray objects;
-    pObjMgr->GetObjects(objects);
-    for (int i = 0; i < objCount; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        QString type = pObject->GetTypeDescription();
-        if (DoesTextSatisfyTerms(type.toLower(), terms, m_bOR))
-        {
-            HandleMatched(pObject);
-        }
-        else
-        {
-            HandleFiltered(pObject, m_searchResultHandling);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::SearchByName(const QStringList& terms)
-{
-    IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-    int objCount = pObjMgr->GetObjectCount();
-    CBaseObjectsArray objects;
-    pObjMgr->GetObjects(objects);
-    for (int i = 0; i < objCount; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        QString name = pObject->GetName();
-        if (DoesTextSatisfyTerms(name.toLower(), terms, m_bOR))
-        {
-            HandleMatched(pObject);
-        }
-        else
-        {
-            HandleFiltered(pObject, m_searchResultHandling);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::SearchByAsset(const QStringList& terms)
-{
-    IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-    int objCount = pObjMgr->GetObjectCount();
-    CBaseObjectsArray objects;
-    pObjMgr->GetObjects(objects);
-    for (int i = 0; i < objCount; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        CUsedResources usedAssets;
-        pObject->GatherUsedResources(usedAssets);
-        CUsedResources::TResourceFiles::const_iterator itr = usedAssets.files.begin(),
-                                                       end = usedAssets.files.end();
-        bool bMatch = false;
-        for (; itr != end; ++itr)
-        {
-            QString filename = *itr;
-            if (DoesTextSatisfyTerms(filename.toLower(), terms, m_bOR))
-            {
-                bMatch = true;
-                break;
-            }
-        }
-        if (bMatch)
-        {
-            HandleMatched(pObject);
-        }
-        else
-        {
-            HandleFiltered(pObject, m_searchResultHandling);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::UpdateSearchOptionsText()
-{
-    QString str = "";
-
-    if (m_searchMode == ESM_BY_NAME)
-    {
-        str += tr("By Name");
-    }
-    else if (m_searchMode == ESM_BY_TYPE)
-    {
-        str += tr("By Type");
-    }
-    else //if(m_searchMode == ESM_BY_ASSET)
-    {
-        str += tr("By Asset");
-    }
-
-    if (m_searchResultHandling == ESRH_HIDE_OTHERS)
-    {
-        str += tr(", Hide filtered");
-    }
-    else if (m_searchResultHandling == ESRH_FREEZE_OTHERS)
-    {
-        str += tr(", Freeze filtered");
-    }
-    else if (m_searchResultHandling == ESRH_JUST_SELECT)
-    {
-        str += tr(", Just Select");
-    }
-
-    if (m_bOR)
-    {
-        str += tr(", OR");
-    }
-    else
-    {
-        str += tr(", AND");
-    }
-
-    m_ui->m_viewportSearch->setPlaceholderText(str);
-}
-
 void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets)
 {
     QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.h b/Code/Sandbox/Editor/ViewportTitleDlg.h
index 79f96573af..55741636b3 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.h
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.h
@@ -28,7 +28,6 @@ class CLayoutViewPane;
 class CPopupMenuItem;
 
 class QAbstractButton;
-class QActionGroup;
 class QMenu;
 
 struct ICVar;
@@ -53,22 +52,6 @@ public:
     void SetTitle(const QString& title);
     void OnViewportSizeChanged(int width, int height);
     void OnViewportFOVChanged(float fov);
-    void SetFocusToSearchField();
-
-    // Dialog Data
-    enum ESearchResultHandling
-    {
-        ESRH_HIDE_OTHERS = 0,
-        ESRH_FREEZE_OTHERS,
-        ESRH_JUST_SELECT,
-    };
-
-    enum ESearchMode
-    {
-        ESM_BY_NAME = 0,
-        ESM_BY_TYPE,
-        ESM_BY_ASSET,
-    };
 
     static void AddFOVMenus(QMenu* menu, std::function<void(float)> callback, const QStringList& customPresets);
     static void AddAspectRatioMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets);
@@ -87,7 +70,6 @@ public:
 
 protected:
     virtual void OnInitDialog();
-    QMenu *InitializeViewportSearchMenu();
 
     virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
     void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
@@ -95,18 +77,11 @@ protected:
     void OnMaximize();
     void OnToggleHelpers();
     void OnToggleDisplayInfo();
-    void OnSearchTermChange();
-    void OnViewportSearchButtonClicked(const QAction* clickedAction);
-    void OnViewportSearchClear();
 
     QString m_title;
 
     CLayoutViewPane* m_pViewPane;
 
-    ESearchMode m_searchMode;
-    ESearchResultHandling m_searchResultHandling;
-    bool m_bOR;
-
     static const int MAX_NUM_CUSTOM_PRESETS = 10;
     QStringList m_customResPresets;
     QStringList m_customFOVPresets;
@@ -114,13 +89,6 @@ protected:
 
     uint64 m_displayInfoCallbackIndex;
 
-    void UnhideUnfreezeAll();
-    void SearchByType(const QStringList& terms);
-    void SearchByName(const QStringList& terms);
-    void SearchByAsset(const QStringList& terms);
-    void UpdateSearchOptionsText();
-    void InputNamesToSearchFromSelection();
-
     void OnMenuFOVCustom();
 
     void CreateFOVMenu();
@@ -139,18 +107,6 @@ protected:
     QMenu* m_resolutionMenu = nullptr;
 
     QScopedPointer<Ui::ViewportTitleDlg> m_ui;
-
-    QActionGroup* m_searchModeActionGroup;
-    QAction* m_searchByNameAction;
-    QAction* m_searchByTypeAction;
-    QAction* m_searchByAssetAction;
-    QActionGroup* m_searchResultHandlingActionGroup;
-    QAction* m_searchHideOthersAction;
-    QAction* m_searchFreezeOthersAction;
-    QAction* m_searchJustSelectAction;
-    QActionGroup* m_searchMatchTypeActionGroup;
-    QAction* m_searchAndAction;
-    QAction* m_searchOrAction;
 };
 
 namespace AzToolsFramework
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.ui b/Code/Sandbox/Editor/ViewportTitleDlg.ui
index 48fa86c853..e7b5cce1ec 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.ui
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.ui
@@ -28,7 +28,7 @@
     <height>29</height>
    </size>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2,0,0,0,0,0,0,0,0">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0,0,0,0,0,0,0">
    <property name="leftMargin">
     <number>10</number>
    </property>
@@ -60,28 +60,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="AzQtComponents::SearchLineEdit" name="m_viewportSearch">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>147</width>
-       <height>22</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>147</width>
-       <height>22</height>
-      </size>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QLabel" name="m_fovLabel">
      <property name="contextMenuPolicy">
@@ -208,11 +186,6 @@
    <header>AzQtComponents/Components/ButtonDivider.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>AzQtComponents::SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>AzQtComponents/Components/SearchLineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/Code/Sandbox/Editor/editor_files.cmake b/Code/Sandbox/Editor/editor_files.cmake
index 50521d23aa..9acfb2aaf8 100644
--- a/Code/Sandbox/Editor/editor_files.cmake
+++ b/Code/Sandbox/Editor/editor_files.cmake
@@ -13,6 +13,5 @@ set(FILES
     main.cpp
     Style/Editor.qss
     Style/resources.qrc
-    Style/LensFlareEditor.qss
     EditorCryEdit.rc
 )
diff --git a/Code/Sandbox/Editor/editor_lib_files.cmake b/Code/Sandbox/Editor/editor_lib_files.cmake
index 4adf501d45..a0c22c9a14 100644
--- a/Code/Sandbox/Editor/editor_lib_files.cmake
+++ b/Code/Sandbox/Editor/editor_lib_files.cmake
@@ -309,15 +309,6 @@ set(FILES
     Util/AffineParts.cpp
     Objects/BaseObject.cpp
     Objects/BaseObject.h
-    Material/Material.cpp
-    Material/Material.h
-    Material/MaterialHelpers.cpp
-    Material/MaterialHelpers.h
-    Material/MaterialDialog.qrc
-    Material/MaterialPreviewModelView.cpp
-    Material/MaterialPreviewModelView.h
-    Material/PreviewModelView.cpp
-    Material/PreviewModelView.h
     Alembic/AlembicCompileDialog.cpp
     Alembic/AlembicCompileDialog.h
     Alembic/AlembicCompileDialog.ui
@@ -511,9 +502,6 @@ set(FILES
     DimensionsDialog.cpp
     DimensionsDialog.h
     DimensionsDialog.ui
-    Dialogs/QT/NewEntityDialog.cpp
-    Dialogs/QT/NewEntityDialog.h
-    Dialogs/QT/NewEntityDialog.ui
     NewLevelDialog.cpp
     NewLevelDialog.h
     NewLevelDialog.ui
@@ -548,10 +536,6 @@ set(FILES
     Geometry/TriMesh.h
     AboutDialog.h
     AboutDialog.ui
-    DatabaseFrameWnd.h
-    DatabaseFrameWnd.ui
-    DatabaseFrameWnd.qrc
-    Dialogs/DuplicatedObjectsHandlerDlg.h
     DocMultiArchive.h
     EditMode/DeepSelection.h
     FBXExporterDialog.h
@@ -560,7 +544,6 @@ set(FILES
     IObservable.h
     IPostRenderer.h
     LightmapCompiler/SimpleTriangleRasterizer.h
-    SurfaceInfoPicker.h
     ToolBox.h
     TrackViewNewSequenceDialog.h
     UndoConfigSpec.h
@@ -575,52 +558,8 @@ set(FILES
     WipFeaturesDlg.qrc
     LevelIndependentFileMan.cpp
     LevelIndependentFileMan.h
-    LensFlareEditor/ILensFlareListener.h
-    LensFlareEditor/LensFlareAtomicList.cpp
-    LensFlareEditor/LensFlareAtomicList.h
-    LensFlareEditor/LensFlareEditor.cpp
-    LensFlareEditor/LensFlareEditor.h
-    LensFlareEditor/LensFlareElement.cpp
-    LensFlareEditor/LensFlareElement.h
-    LensFlareEditor/LensFlareElementTree.cpp
-    LensFlareEditor/LensFlareElementTree.h
-    LensFlareEditor/LensFlareItem.cpp
-    LensFlareEditor/LensFlareItem.h
-    LensFlareEditor/LensFlareItemTree.cpp
-    LensFlareEditor/LensFlareItemTree.h
-    LensFlareEditor/LensFlareLibrary.cpp
-    LensFlareEditor/LensFlareLibrary.h
-    LensFlareEditor/LensFlareLightEntityTree.cpp
-    LensFlareEditor/LensFlareLightEntityTree.h
-    LensFlareEditor/LensFlareManager.cpp
-    LensFlareEditor/LensFlareManager.h
-    LensFlareEditor/LensFlareUndo.cpp
-    LensFlareEditor/LensFlareUndo.h
-    LensFlareEditor/LensFlareUtil.cpp
-    LensFlareEditor/LensFlareUtil.h
-    LensFlareEditor/LensFlareView.cpp
-    LensFlareEditor/LensFlareView.h
     LogFileImpl.cpp
     LogFileImpl.h
-    MatEditPreviewDlg.cpp
-    MatEditPreviewDlg.h
-    Material/MaterialBrowser.cpp
-    Material/MaterialBrowser.h
-    Material/MaterialBrowser.ui
-    Material/MaterialBrowserSearchFilters.cpp
-    Material/MaterialBrowserSearchFilters.h
-    Material/MaterialBrowserFilterModel.cpp
-    Material/MaterialBrowserFilterModel.h
-    Material/MaterialImageListCtrl.cpp
-    Material/MaterialImageListCtrl.h
-    Material/MaterialLibrary.cpp
-    Material/MaterialLibrary.h
-    Material/MaterialManager.cpp
-    Material/MaterialManager.h
-    MaterialSender.h
-    MaterialSender.cpp
-    Material/MaterialPythonFuncs.h
-    Material/MaterialPythonFuncs.cpp
     Mission.cpp
     Mission.h
     Objects/ClassDesc.cpp
@@ -628,8 +567,6 @@ set(FILES
     Objects/IEntityObjectListener.h
     Objects/SelectionGroup.cpp
     Objects/SelectionGroup.h
-    Objects/StatObjValidator.cpp
-    Objects/StatObjValidator.h
     Objects/SubObjSelection.cpp
     Objects/SubObjSelection.h
     Objects/ObjectLoader.cpp
@@ -638,8 +575,6 @@ set(FILES
     Objects/ObjectManager.h
     Objects/ObjectManagerLegacyUndo.cpp
     Objects/ObjectManagerLegacyUndo.h
-    Objects/ObjectPhysicsManager.cpp
-    Objects/ObjectPhysicsManager.h
     Objects/DisplayContext.cpp
     Objects/DisplayContext.h
     Objects/EntityObject.cpp
@@ -665,9 +600,7 @@ set(FILES
     QtUI/WaitCursor.h
     QtUI/WaitCursor.cpp
     RenderHelpers/AxisHelper.cpp
-    RenderHelpers/AxisHelperExtended.cpp
     RenderHelpers/AxisHelper.h
-    RenderHelpers/AxisHelperExtended.h
     Serialization.h
     Serialization/VariableOArchive.cpp
     Serialization/VariableOArchive.h
@@ -712,9 +645,6 @@ set(FILES
     GraphicsSettingsDialog.cpp
     graphicssettingsdialog.ui
     AboutDialog.cpp
-    DatabaseFrameWnd.cpp
-    Dialogs/DuplicatedObjectsHandlerDlg.cpp
-    Dialogs/DuplicatedObjectsHandlerDlg.ui
     ErrorReportTableModel.h
     ErrorReportTableModel.cpp
     EditMode/DeepSelection.cpp
@@ -724,7 +654,6 @@ set(FILES
     LightmapCompiler/SimpleTriangleRasterizer.cpp
     ResourceSelectorHost.cpp
     ResourceSelectorHost.h
-    SurfaceInfoPicker.cpp
     ThumbnailGenerator.cpp
     ThumbnailGenerator.h
     ToolBox.cpp
diff --git a/Code/Sandbox/Editor/editor_lib_test_files.cmake b/Code/Sandbox/Editor/editor_lib_test_files.cmake
index f537169136..9eca3c56ae 100644
--- a/Code/Sandbox/Editor/editor_lib_test_files.cmake
+++ b/Code/Sandbox/Editor/editor_lib_test_files.cmake
@@ -18,7 +18,6 @@ set(FILES
     Lib/Tests/test_EditorUtils.cpp
     Lib/Tests/test_Main.cpp
     Lib/Tests/test_MainWindowPythonBindings.cpp
-    Lib/Tests/test_MaterialPythonFuncs.cpp
     Lib/Tests/test_ObjectManagerPythonBindings.cpp
     Lib/Tests/test_TrackViewPythonBindings.cpp
     Lib/Tests/test_ViewPanePythonBindings.cpp
diff --git a/Code/Sandbox/Editor/main.cpp b/Code/Sandbox/Editor/main.cpp
index 013dc4ff69..17c177e9d3 100644
--- a/Code/Sandbox/Editor/main.cpp
+++ b/Code/Sandbox/Editor/main.cpp
@@ -30,17 +30,14 @@ int main(int argc, char* argv[])
     [[maybe_unused]] const bool loaded = handle->Load(true);
     AZ_Assert(loaded, "EditorLib could not be loaded");
 
+    int ret = 1;
     if (auto fn = handle->GetFunction<CryEditMain>(CryEditMainName); fn != nullptr)
     {
-        const int ret = AZStd::invoke(fn, argc, argv);
-
-        AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();
-        AZ::Environment::Detach();
-
-        return ret;
+        ret = AZStd::invoke(fn, argc, argv);
     }
 
+    handle = {};
     AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();
     AZ::Environment::Detach();
-    return 1;
+    return ret;
 }
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
index a97bdbf2ab..692bb92bf7 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
@@ -43,13 +43,10 @@
 #include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
 #include <AzToolsFramework/Undo/UndoCacheInterface.h>
 #include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
 #include <LmbrCentral/Rendering/MaterialOwnerBus.h>
 
 #include <IDisplayViewport.h>
-#include <Material/MaterialManager.h>
 #include <MathConversion.h>
-#include <Objects/StatObjValidator.h>
 #include <TrackView/TrackViewAnimNode.h>
 #include <ViewManager.h>
 #include <Viewport.h>
@@ -110,10 +107,8 @@ void CComponentEntityObject::AssignEntity(AZ::Entity* entity, bool destroyOld)
 
     if (m_entityId.IsValid())
     {
-        AzToolsFramework::EntitySelectionEvents::Bus::Handler::BusDisconnect();
         AZ::TransformNotificationBus::Handler::BusDisconnect();
         LmbrCentral::RenderBoundsNotificationBus::Handler::BusDisconnect();
-        LmbrCentral::MeshComponentNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::ComponentEntityEditorRequestBus::Handler::BusDisconnect();
         AZ::EntityBus::Handler::BusDisconnect();
         AzToolsFramework::ComponentEntityObjectRequestBus::Handler::BusDisconnect();
@@ -157,10 +152,8 @@ void CComponentEntityObject::AssignEntity(AZ::Entity* entity, bool destroyOld)
 
         EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, AddRequiredComponents, *entity);
 
-        AzToolsFramework::EntitySelectionEvents::Bus::Handler::BusConnect(m_entityId);
         AZ::TransformNotificationBus::Handler::BusConnect(m_entityId);
         LmbrCentral::RenderBoundsNotificationBus::Handler::BusConnect(m_entityId);
-        LmbrCentral::MeshComponentNotificationBus::Handler::BusConnect(m_entityId);
         AzToolsFramework::ComponentEntityEditorRequestBus::Handler::BusConnect(m_entityId);
         AZ::EntityBus::Handler::BusConnect(m_entityId);
         AzToolsFramework::ComponentEntityObjectRequestBus::Handler::BusConnect(this);
@@ -306,39 +299,6 @@ void CComponentEntityObject::OnEntityNameChanged(const AZStd::string& name)
     }
 }
 
-void CComponentEntityObject::OnSelected()
-{
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        return;
-    }
-
-    if (m_selectionReentryGuard)
-    {
-        EditorActionScope selectionChange(m_selectionReentryGuard);
-
-        // Invoked when selected via tools application, so we notify sandbox.
-        const bool wasSelected = IsSelected();
-        GetIEditor()->GetObjectManager()->SelectObject(this);
-    }
-}
-
-void CComponentEntityObject::OnDeselected()
-{
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        return;
-    }
-
-    if (m_selectionReentryGuard)
-    {
-        EditorActionScope selectionChange(m_selectionReentryGuard);
-
-        // Invoked when selected via tools application, so we notify sandbox.
-        GetIEditor()->GetObjectManager()->UnselectObject(this);
-    }
-}
-
 void CComponentEntityObject::AttachChild(CBaseObject* child, bool /*bKeepPos*/)
 {
     if (child->GetType() == OBJTYPE_AZENTITY)
@@ -434,15 +394,6 @@ void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldPa
 {
 }
 
-void CComponentEntityObject::OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-{
-    (void)asset;
-
-    // Need to recalculate bounds when the mesh changes.
-    OnRenderBoundsReset();
-    ValidateMeshStatObject();
-}
-
 void CComponentEntityObject::OnRenderBoundsReset()
 {
     CEntityObject::InvalidateTM(0);
@@ -985,9 +936,7 @@ void CComponentEntityObject::DrawDefault(DisplayContext& dc, const QColor& label
 
 IStatObj* CComponentEntityObject::GetIStatObj()
 {
-    IStatObj* statObj = nullptr;
-    LmbrCentral::LegacyMeshComponentRequestBus::EventResult(statObj, m_entityId, &LmbrCentral::LegacyMeshComponentRequests::GetStatObj);
-    return statObj;
+    return nullptr;
 }
 
 bool CComponentEntityObject::IsIsolated() const
@@ -997,24 +946,12 @@ bool CComponentEntityObject::IsIsolated() const
 
 bool CComponentEntityObject::IsSelected() const
 {
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        return AzToolsFramework::IsSelected(m_entityId);
-    }
-
-    // legacy is selected call
-    return CBaseObject::IsSelected();
+    return AzToolsFramework::IsSelected(m_entityId);
 }
 
 bool CComponentEntityObject::IsSelectable() const
 {
-    if (GetIEditor()->IsNewViewportInteractionModelEnabled())
-    {
-        return AzToolsFramework::IsSelectableInViewport(m_entityId);
-    }
-
-    // legacy is selectable call
-    return CBaseObject::IsSelectable();
+    return AzToolsFramework::IsSelectableInViewport(m_entityId);
 }
 
 void CComponentEntityObject::SetWorldPos(const Vec3& pos, int flags)
@@ -1157,56 +1094,3 @@ void CComponentEntityObject::DrawAccent(DisplayContext& dc)
         dc.DrawWireBox(box.min, box.max);
     }
 }
-
-void CComponentEntityObject::SetMaterial(CMaterial* material)
-{
-    AZ::Entity* entity = nullptr;
-    EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
-    if (entity)
-    {
-        if (material)
-        {
-            EBUS_EVENT_ID(m_entityId, LmbrCentral::MaterialOwnerRequestBus, SetMaterial, material->GetMatInfo());
-        }
-        else
-        {
-            EBUS_EVENT_ID(m_entityId, LmbrCentral::MaterialOwnerRequestBus, SetMaterial, nullptr);
-        }
-    }
-
-    ValidateMeshStatObject();
-}
-
-CMaterial* CComponentEntityObject::GetMaterial() const
-{
-    _smart_ptr<IMaterial> material = nullptr;
-    EBUS_EVENT_ID_RESULT(material, m_entityId, LmbrCentral::MaterialOwnerRequestBus, GetMaterial);
-    return GetIEditor()->GetMaterialManager()->FromIMaterial(material);
-}
-
-CMaterial* CComponentEntityObject::GetRenderMaterial() const
-{
-    AZ::Entity* entity = nullptr;
-    EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
-    if (entity)
-    {
-        _smart_ptr<IMaterial> material = nullptr;
-        EBUS_EVENT_ID_RESULT(material, m_entityId, LmbrCentral::MaterialOwnerRequestBus, GetMaterial);
-
-        if (material)
-        {
-            return GetIEditor()->GetMaterialManager()->LoadMaterial(material->GetName(), false);
-        }
-    }
-
-    return nullptr;
-}
-
-void CComponentEntityObject::ValidateMeshStatObject()
-{
-    IStatObj* statObj = GetIStatObj();
-    CMaterial* editorMaterial = GetMaterial();
-    CStatObjValidator statValidator;
-    statValidator.Validate(statObj, editorMaterial);
-}
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
index fa59ec8507..b64bd6b3e1 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
@@ -27,7 +27,6 @@
 #include <QtViewPane.h>
 
 #include "../Editor/Objects/EntityObject.h"
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
 #include <LmbrCentral/Rendering/RenderBoundsBus.h>
 #endif
 
@@ -38,13 +37,11 @@ class QMenu;
 */
 class CComponentEntityObject
     : public CEntityObject
-    , private AzToolsFramework::EntitySelectionEvents::Bus::Handler
     , private AzToolsFramework::EditorLockComponentNotificationBus::Handler
     , private AzToolsFramework::EditorVisibilityNotificationBus::Handler
     , private AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler
     , private AZ::TransformNotificationBus::Handler
     , private LmbrCentral::RenderBoundsNotificationBus::Handler
-    , private LmbrCentral::MeshComponentNotificationBus::Handler
     , private AzToolsFramework::ComponentEntityEditorRequestBus::Handler
     , private AzToolsFramework::ComponentEntityObjectRequestBus::Handler
     , private AZ::EntityBus::Handler
@@ -82,9 +79,6 @@ public:
     CBaseObject* GetLinkParent() const override;
     XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode) override;
     void DeleteEntity() override;
-    void SetMaterial(CMaterial* mtl) override;
-    CMaterial* GetMaterial() const override;
-    CMaterial* GetRenderMaterial() const override;
     void DrawDefault(DisplayContext& dc, const QColor& labelColor = QColor(255, 255, 255)) override;
     IStatObj* GetIStatObj() override;
     bool IsIsolated() const override;
@@ -111,12 +105,6 @@ public:
     void OnEntityNameChanged(const AZStd::string& name) override;
     //////////////////////////////////////////////////////////////////////////
 
-    //////////////////////////////////////////////////////////////////////////
-    //! AzToolsFramework::EntitySelectionEvents::Bus::Handler
-    void OnSelected() override;
-    void OnDeselected() override;
-    //////////////////////////////////////////////////////////////////////////
-
     //////////////////////////////////////////////////////////////////////////
     // AzToolsFramework::EditorLockComponentNotificationBus::Handler
     void OnEntityLockChanged(bool locked) override;
@@ -138,11 +126,6 @@ public:
     void OnParentChanged(AZ::EntityId oldParent, AZ::EntityId newParent) override;
     //////////////////////////////////////////////////////////////////////////
 
-    //////////////////////////////////////////////////////////////////////////
-    //! MeshComponentNotificationBus
-    void OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-    //////////////////////////////////////////////////////////////////////////
-
     //////////////////////////////////////////////////////////////////////////
     //! RenderBoundsNotificationBus
     void OnRenderBoundsReset() override;
@@ -198,8 +181,6 @@ protected:
 
     void DrawAccent(DisplayContext& dc);
 
-    void ValidateMeshStatObject();
-
     class EditorActionGuard
     {
     public:
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
index 89ef4ead7f..ecfb155d79 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -159,18 +159,6 @@ void SandboxIntegrationManager::Setup()
     AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusConnect();
     AzToolsFramework::EditorRequests::Bus::Handler::BusConnect();
     AzToolsFramework::EditorWindowRequests::Bus::Handler::BusConnect();
-
-    // if the new viewport interaction model is enabled, then object picking is handled via
-    // EditorPickEntitySelection and SandboxIntegrationManager is not required
-    if (!IsNewViewportInteractionModelEnabled())
-    {
-        AzFramework::EntityContextId pickModeEntityContextId = GetEntityContextId();
-        if (!pickModeEntityContextId.IsNull())
-        {
-            AzToolsFramework::EditorPickModeNotificationBus::Handler::BusConnect(pickModeEntityContextId);
-        }
-    }
-
     AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
     AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
     AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
@@ -184,7 +172,6 @@ void SandboxIntegrationManager::Setup()
 
     AzFramework::DisplayContextRequestBus::Handler::BusConnect();
     SetupFileExtensionMap();
-    AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler::BusConnect();
 
     MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_SLICE_TO_ROOT, [this]() {
         SaveSlice(false);
@@ -388,7 +375,6 @@ void SandboxIntegrationManager::GetEntitiesInSlices(
 void SandboxIntegrationManager::Teardown()
 {
     AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler::BusDisconnect();
     AzFramework::DisplayContextRequestBus::Handler::BusDisconnect();
     if( m_debugDisplayBusImplementationActive)
     {
@@ -398,12 +384,6 @@ void SandboxIntegrationManager::Teardown()
     AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-
-    if (!IsNewViewportInteractionModelEnabled())
-    {
-        AzToolsFramework::EditorPickModeNotificationBus::Handler::BusDisconnect();
-    }
-
     AzToolsFramework::EditorWindowRequests::Bus::Handler::BusDisconnect();
     AzToolsFramework::EditorRequests::Bus::Handler::BusDisconnect();
     AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusDisconnect();
@@ -1243,21 +1223,14 @@ void SandboxIntegrationManager::CloneSelection(bool& handled)
     }
 }
 
-void SandboxIntegrationManager::DeleteSelectedEntities(const bool includeDescendants)
+void SandboxIntegrationManager::DeleteSelectedEntities([[maybe_unused]] const bool includeDescendants)
 {
-    if (IsNewViewportInteractionModelEnabled())
-    {
-        AzToolsFramework::EntityIdList selectedEntityIds;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+    AzToolsFramework::EntityIdList selectedEntityIds;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+        selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
 
-        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-            &AzToolsFramework::ToolsApplicationRequests::DeleteEntitiesAndAllDescendants, selectedEntityIds);
-    }
-    else
-    {
-        CCryEditApp::instance()->DeleteSelectedEntities(includeDescendants);
-    }
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::DeleteEntitiesAndAllDescendants, selectedEntityIds);
 }
 
 AZ::EntityId SandboxIntegrationManager::CreateNewEntity(AZ::EntityId parentId)
@@ -2797,11 +2770,6 @@ void SandboxIntegrationManager::PopMatrix()
     }
 }
 
-bool SandboxIntegrationManager::IsNewViewportInteractionModelEnabled()
-{
-    return GetIEditor()->IsNewViewportInteractionModelEnabled();
-}
-
 bool SandboxIntegrationManager::DisplayHelpersVisible()
 {
     return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
index ea4d2fe32b..0cbfe1df93 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
@@ -104,7 +104,6 @@ class SandboxIntegrationManager
     , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
     , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
     , private IUndoManagerListener
-    , private AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler
     , private AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler
 {
 public:
@@ -275,9 +274,6 @@ private:
     void SetDC(DisplayContext* dc) override;
     DisplayContext* GetDC() override;
 
-    // NewViewportInteractionModelEnabledRequestBus
-    bool IsNewViewportInteractionModelEnabled() override;
-
     // Context menu handlers.
     void ContextMenu_NewEntity();
     AZ::EntityId ContextMenu_NewLayer();
@@ -376,9 +372,9 @@ private:
     // Tracks new entities that have not yet been saved.
     AZStd::unordered_set<AZ::EntityId> m_unsavedEntities;
 
-    const AZStd::string m_defaultComponentIconLocation = "Editor/Icons/Components/Component_Placeholder.svg";
-    const AZStd::string m_defaultComponentViewportIconLocation = "Editor/Icons/Components/Viewport/Component_Placeholder.png";
-    const AZStd::string m_defaultEntityIconLocation = "Editor/Icons/Components/Viewport/Transform.png";
+    const AZStd::string m_defaultComponentIconLocation = "Icons/Components/Component_Placeholder.svg";
+    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.png";
+    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.png";
 
     bool m_debugDisplayBusImplementationActive = false;
 
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp
index 5f3c49426d..5e71d31752 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp
@@ -33,8 +33,8 @@ void ComponentCategoryList::Init()
     headers << tr("Categories");
     setHeaderLabels(headers);
 
-    const QString parentCategoryIconPath = QString("Editor/Icons/PropertyEditor/Browse_on.png");
-    const QString categoryIconPath = QString("Editor/Icons/PropertyEditor/Browse.png");
+    const QString parentCategoryIconPath = QString("Icons/PropertyEditor/Browse_on.png");
+    const QString categoryIconPath = QString("Icons/PropertyEditor/Browse.png");
 
     QTreeWidgetItem* allCategory = new QTreeWidgetItem(this);
     allCategory->setText(0, "All");
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp
index 0e94ff80cf..14a3d6fa1e 100644
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp
+++ b/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp
@@ -94,7 +94,7 @@ namespace AZ
             {
                 if (AzFramework::StringFunc::Equal(extensionString.c_str(), potentialExtension.c_str()))
                 {
-                    return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/FBX_16.png");
+                    return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/FBX_16.png");
                 }
             }
         }
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporter.qrc b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporter.qrc
index 5140ed81ab..35b7557a9b 100644
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporter.qrc
+++ b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporter.qrc
@@ -1,17 +1,17 @@
 <RCC>
     <qresource prefix="/Icons">
-        <file alias="Browse.png">../../../../Editor/Icons/PropertyEditor/Browse.png</file>
-        <file alias="Browse_On.png">../../../../Editor/Icons/PropertyEditor/Browse_on.png</file>
-        <file alias="DeleteRule.png">../../../../Editor/Icons/PropertyEditor/remove.png</file>
-        <file alias="DeleteGroup.png">../../../../Editor/Icons/PropertyEditor/remove.png</file>
-        <file alias="Error.png">../../../../Editor/Icons/PropertyEditor/error_icon.png</file>
-        <file alias="RefreshGroup.png">../../../../Editor/Icons/PropertyEditor/reset_icon.png</file>
-        <file alias="MeshSelectorBrowse.png">../../../../Editor/Icons/AssetImporter/mesh.png</file>
-        <file alias="MeshSelectorBrowse_On.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
-        <file alias="MeshTreeIcon.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
-        <file alias="GroupTreeIcon.png">../../../../Editor/Icons/AssetImporter/group_icon.png</file>
-        <file alias="CheckMark_Checked.png">../../../../Editor/Icons/checkmark_checked.png</file>
-        <file alias="CheckMark_Hover.png">../../../../Editor/Icons/checkmark_checked_hover.png</file>
-        <file alias="CheckMark_Unchecked_Hover.png">../../../../Editor/Icons/checkmark_unchecked_hover.png</file>
+        <file alias="Browse.png">../../../../Assets/Editor/Icons/PropertyEditor/Browse.png</file>
+        <file alias="Browse_On.png">../../../../Assets/Editor/Icons/PropertyEditor/Browse_on.png</file>
+        <file alias="DeleteRule.png">../../../../Assets/Editor/Icons/PropertyEditor/remove.png</file>
+        <file alias="DeleteGroup.png">../../../../Assets/Editor/Icons/PropertyEditor/remove.png</file>
+        <file alias="Error.png">../../../../Assets/Editor/Icons/PropertyEditor/error_icon.png</file>
+        <file alias="RefreshGroup.png">../../../../Assets/Editor/Icons/PropertyEditor/reset_icon.png</file>
+        <file alias="MeshSelectorBrowse.png">../../../../Assets/Editor/Icons/AssetImporter/mesh.png</file>
+        <file alias="MeshSelectorBrowse_On.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
+        <file alias="MeshTreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
+        <file alias="GroupTreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/group_icon.png</file>
+        <file alias="CheckMark_Checked.png">../../../../Assets/Editor/Icons/checkmark_checked.png</file>
+        <file alias="CheckMark_Hover.png">../../../../Assets/Editor/Icons/checkmark_checked_hover.png</file>
+        <file alias="CheckMark_Unchecked_Hover.png">../../../../Assets/Editor/Icons/checkmark_unchecked_hover.png</file>
     </qresource>
 </RCC>
diff --git a/Code/Sandbox/Plugins/EditorCommon/Cry_LegacyPhysUtils.h b/Code/Sandbox/Plugins/EditorCommon/Cry_LegacyPhysUtils.h
new file mode 100644
index 0000000000..cb7b971267
--- /dev/null
+++ b/Code/Sandbox/Plugins/EditorCommon/Cry_LegacyPhysUtils.h
@@ -0,0 +1,704 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+// Copied utils functions from CryPhysics that are used by non-physics systems
+// This functions will be eventually removed, DO *NOT* use these functions
+// TO-DO: Re-implement users using new code
+// LY-109806
+
+#pragma once
+
+#include "Cry_Math.h"
+
+namespace LegacyCryPhysicsUtils
+{
+    namespace polynomial_tpl_IMPL
+    {
+        template<class ftype, int degree>
+        class polynomial_tpl
+        {
+        public:
+            explicit polynomial_tpl() { denom = (ftype)1; };
+            explicit polynomial_tpl(ftype op) { zero(); data[degree] = op; }
+            AZ_FORCE_INLINE polynomial_tpl& zero()
+            {
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] = 0;
+                }
+                denom = (ftype)1;
+                return *this;
+            }
+            polynomial_tpl(const polynomial_tpl<ftype, degree>& src) { *this = src; }
+            polynomial_tpl& operator=(const polynomial_tpl<ftype, degree>& src)
+            {
+                denom = src.denom;
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] = src.data[i];
+                }
+                return *this;
+            }
+            template<int degree1>
+            AZ_FORCE_INLINE polynomial_tpl& operator=(const polynomial_tpl<ftype, degree1>& src)
+            {
+                int i;
+                denom = src.denom;
+                for (i = 0; i <= min(degree, degree1); i++)
+                {
+                    data[i] = src.data[i];
+                }
+                for (; i < degree; i++)
+                {
+                    data[i] = 0;
+                }
+                return *this;
+            }
+            AZ_FORCE_INLINE polynomial_tpl& set(ftype* pdata)
+            {
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[degree - i] = pdata[i];
+                }
+                return *this;
+            }
+
+            AZ_FORCE_INLINE ftype& operator[](int idx) { return data[idx]; }
+
+            void calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree = degree) const;
+
+            AZ_FORCE_INLINE polynomial_tpl& fixsign()
+            {
+                ftype sg = sgnnz(denom);
+                denom *= sg;
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] *= sg;
+                }
+                return *this;
+            }
+
+            int findroots(ftype start, ftype end, ftype* proots, int nIters = 20, int curdegree = degree, bool noDegreeCheck = false) const;
+            int nroots(ftype start, ftype end) const;
+
+            AZ_FORCE_INLINE ftype eval(ftype x) const
+            {
+                ftype res = 0;
+                for (int i = degree; i >= 0; i--)
+                {
+                    res = res * x + data[i];
+                }
+                return res;
+            }
+            AZ_FORCE_INLINE ftype eval(ftype x, int subdegree) const
+            {
+                ftype res = data[subdegree];
+                for (int i = subdegree - 1; i >= 0; i--)
+                {
+                    res = res * x + data[i];
+                }
+                return res;
+            }
+
+            AZ_FORCE_INLINE polynomial_tpl& operator+=(ftype op) { data[0] += op * denom; return *this; }
+            AZ_FORCE_INLINE polynomial_tpl& operator-=(ftype op) { data[0] -= op * denom; return *this; }
+            AZ_FORCE_INLINE polynomial_tpl operator*(ftype op) const
+            {
+                polynomial_tpl<ftype, degree> res;
+                res.denom = denom;
+                for (int i = 0; i <= degree; i++)
+                {
+                    res.data[i] = data[i] * op;
+                }
+                return res;
+            }
+            AZ_FORCE_INLINE polynomial_tpl& operator*=(ftype op)
+            {
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] *= op;
+                }
+                return *this;
+            }
+            AZ_FORCE_INLINE polynomial_tpl operator/(ftype op) const
+            {
+                polynomial_tpl<ftype, degree> res = *this;
+                res.denom = denom * op;
+                return res;
+            }
+            AZ_FORCE_INLINE polynomial_tpl& operator/=(ftype op) { denom *= op;   return *this; }
+
+            AZ_FORCE_INLINE polynomial_tpl<ftype, degree * 2> sqr() const { return *this * *this; }
+
+            ftype denom;
+            ftype data[degree + 1];
+        };
+
+        template <class ftype>
+        struct tagPolyE
+        {
+            inline static ftype polye() { return (ftype)1E-10; }
+        };
+
+        template<>
+        inline float tagPolyE<float>::polye() { return 1e-6f; }
+
+        template <class ftype>
+        inline ftype polye() { return tagPolyE<ftype>::polye(); }
+
+        // Don't use this macro; use AZStd::max instead. This is only here to make the template const arguments below readable
+        // and because Visual Studio 2013 doesn't have a const_expr version of std::max
+        #define deprecated_degmax(degree1, degree2) (((degree1) > (degree2)) ? (degree1) : (degree2))
+
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(const polynomial_tpl<ftype, degree>& pn, ftype op)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] += op * res.denom;
+            return res;
+        }
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(const polynomial_tpl<ftype, degree>& pn, ftype op)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] -= op * res.denom;
+            return res;
+        }
+
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(ftype op, const polynomial_tpl<ftype, degree>& pn)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] += op * res.denom;
+            return res;
+        }
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(ftype op, const polynomial_tpl<ftype, degree>& pn)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] -= op * res.denom;
+            for (int i = 0; i <= degree; i++)
+            {
+                res.data[i] = -res.data[i];
+            }
+            return res;
+        }
+        template<class ftype, int degree>
+        polynomial_tpl<ftype, degree * 2> AZ_FORCE_INLINE psqr(const polynomial_tpl<ftype, degree>& op) { return op * op; }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator+(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
+            int i;
+            for (i = 0; i <= min(degree1, degree2); i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
+            }
+            for (; i <= degree1; i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom;
+            }
+            for (; i <= degree2; i++)
+            {
+                res.data[i] = op2.data[i] * op1.denom;
+            }
+            res.denom = op1.denom * op2.denom;
+            return res;
+        }
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator-(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
+            int i;
+            for (i = 0; i <= min(degree1, degree2); i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
+            }
+            for (; i <= degree1; i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom;
+            }
+            for (; i <= degree2; i++)
+            {
+                res.data[i] = op2.data[i] * op1.denom;
+            }
+            res.denom = op1.denom * op2.denom;
+            return res;
+        }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator+=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            for (int i = 0; i < min(degree1, degree2); i++)
+            {
+                op1.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
+            }
+            op1.denom *= op2.denom;
+            return op1;
+        }
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator-=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            for (int i = 0; i < min(degree1, degree2); i++)
+            {
+                op1.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
+            }
+            op1.denom *= op2.denom;
+            return op1;
+        }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 + degree2> operator*(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            polynomial_tpl<ftype, degree1 + degree2> res;
+            res.zero();
+            int j;
+            switch (degree1)
+            {
+            case 8:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[8 + j] += op1.data[8] * op2.data[j];
+                }
+            case 7:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[7 + j] += op1.data[7] * op2.data[j];
+                }
+            case 6:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[6 + j] += op1.data[6] * op2.data[j];
+                }
+            case 5:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[5 + j] += op1.data[5] * op2.data[j];
+                }
+            case 4:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[4 + j] += op1.data[4] * op2.data[j];
+                }
+            case 3:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[3 + j] += op1.data[3] * op2.data[j];
+                }
+            case 2:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[2 + j] += op1.data[2] * op2.data[j];
+                }
+            case 1:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[1 + j] += op1.data[1] * op2.data[j];
+                }
+            case 0:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[0 + j] += op1.data[0] * op2.data[j];
+                }
+            }
+            res.denom = op1.denom * op2.denom;
+            return res;
+        }
+
+
+        template <class ftype>
+        AZ_FORCE_INLINE void polynomial_divide(const polynomial_tpl<ftype, 8>& num, const polynomial_tpl<ftype, 8>& den, polynomial_tpl<ftype, 8>& quot,
+            polynomial_tpl<ftype, 8>& rem, int degree1, int degree2)
+        {
+            int i, j, k, l;
+            ftype maxel;
+            for (i = 0; i <= degree1; i++)
+            {
+                rem.data[i] = num.data[i];
+            }
+            for (i = 0; i <= degree1 - degree2; i++)
+            {
+                quot.data[i] = 0;
+            }
+            for (i = 1, maxel = fabs_tpl(num.data[0]); i <= degree1; i++)
+            {
+                maxel = max(maxel, num.data[i]);
+            }
+            for (maxel *= polye<ftype>(); degree1 >= 0 && fabs_tpl(num.data[degree1]) < maxel; degree1--)
+            {
+                ;
+            }
+            for (i = 1, maxel = fabs_tpl(den.data[0]); i <= degree2; i++)
+            {
+                maxel = max(maxel, den.data[i]);
+            }
+            for (maxel *= polye<ftype>(); degree2 >= 0 && fabs_tpl(den.data[degree2]) < maxel; degree2--)
+            {
+                ;
+            }
+            rem.denom = num.denom;
+            quot.denom = (ftype)1;
+            if (degree1 < 0 || degree2 < 0)
+            {
+                return;
+            }
+
+            for (k = degree1 - degree2, l = degree1; l >= degree2; l--, k--)
+            {
+                quot.data[k] = rem.data[l] * den.denom;
+                quot.denom *= den.data[degree2];
+                for (i = degree1 - degree2; i > k; i--)
+                {
+                    quot.data[i] *= den.data[degree2];
+                }
+                for (i = degree2 - 1, j = l - 1; i >= 0; i--, j--)
+                {
+                    rem.data[j] = rem.data[j] * den.data[degree2] - den.data[i] * rem.data[l];
+                }
+                for (; j >= 0; j--)
+                {
+                    rem.data[j] *= den.data[degree2];
+                }
+                rem.denom *= den.data[degree2];
+            }
+        }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 - degree2> operator/(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
+        {
+            polynomial_tpl<ftype, degree1 - degree2> quot;
+            polynomial_tpl<ftype, degree1> rem;
+            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
+                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
+            return quot;
+        }
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree2 - 1> operator%(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
+        {
+            polynomial_tpl<ftype, degree1 - degree2> quot;
+            polynomial_tpl<ftype, degree1> rem;
+            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
+                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
+            return (polynomial_tpl<ftype, degree2 - 1>&)rem;
+        }
+
+        template <class ftype, int degree>
+        AZ_FORCE_INLINE void polynomial_tpl<ftype, degree>::calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree) const
+        {
+            for (int i = 0; i < curdegree; i++)
+            {
+                deriv.data[i] = data[i + 1] * (i + 1);
+            }
+            deriv.denom = denom;
+        }
+
+        template<typename to_t, typename from_t>
+        to_t* convert_type(from_t* input)
+        {
+            typedef union
+            {
+                to_t* to;
+                from_t* from;
+            } convert_union;
+            convert_union u;
+            u.from = input;
+            return u.to;
+        }
+
+        template <class ftype, int degree>
+        AZ_FORCE_INLINE int polynomial_tpl<ftype, degree>::nroots(ftype start, ftype end) const
+        {
+            polynomial_tpl<ftype, degree> f[degree + 1];
+            int i, j, sg_a, sg_b;
+            ftype val, prevval;
+
+            calc_deriviative(f[0]);
+            polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(this), *convert_type< polynomial_tpl<ftype, 8> >(&f[0]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
+                *convert_type<polynomial_tpl<ftype, 8> >(&f[1]), degree, degree - 1);
+            f[1].denom = -f[1].denom;
+            for (i = 2; i < degree; i++)
+            {
+                polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(&f[i - 2]), *convert_type<polynomial_tpl<ftype, 8> >(&f[i - 1]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
+                    *convert_type<polynomial_tpl<ftype, 8> >(&f[i]), degree + 1 - i, degree - i);
+                f[i].denom = -f[i].denom;
+                if (fabs_tpl(f[i].denom) > (ftype)1E10)
+                {
+                    for (j = 0; j <= degree - 1 - i; j++)
+                    {
+                        f[i].data[j] *= (ftype)1E-10;
+                    }
+                    f[i].denom *= (ftype)1E-10;
+                }
+            }
+
+            prevval = eval(start) * denom;
+            for (i = sg_a = 0; i < degree; i++, prevval = val)
+            {
+                val = f[i].eval(start, degree - 1 - i) * f[i].denom;
+                sg_a += isneg(val * prevval);
+            }
+
+            prevval = eval(end) * denom;
+            for (i = sg_b = 0; i < degree; i++, prevval = val)
+            {
+                val = f[i].eval(end, degree - 1 - i) * f[i].denom;
+                sg_b += isneg(val * prevval);
+            }
+
+            return fabs_tpl(sg_a - sg_b);
+        }
+
+        template<class ftype>
+        AZ_FORCE_INLINE ftype cubert_tpl(ftype x) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * (ftype)(1.0 / 3)) * sgnnz(x) : x; }
+        template<class ftype>
+        AZ_FORCE_INLINE ftype pow_tpl(ftype x, ftype pow) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * pow) * sgnnz(x) : x; }
+        template<class ftype>
+        AZ_FORCE_INLINE void swap(ftype* ptr, int i, int j) { ftype t = ptr[i]; ptr[i] = ptr[j]; ptr[j] = t; }
+
+        template <class ftype, int maxdegree>
+        int polynomial_tpl<ftype, maxdegree>::findroots(ftype start, ftype end, ftype* proots, [[maybe_unused]] int nIters, int degree, bool noDegreeCheck) const
+        {
+            AZ_UNUSED(nIters);
+            int i, j, nRoots = 0;
+            ftype maxel;
+            if (!noDegreeCheck)
+            {
+                for (i = 1, maxel = fabs_tpl(data[0]); i <= degree; i++)
+                {
+                    maxel = max(maxel, data[i]);
+                }
+                for (maxel *= polye<ftype>(); degree > 0 && fabs_tpl(data[degree]) <= maxel; degree--)
+                {
+                    ;
+                }
+            }
+
+            if constexpr (maxdegree >= 1)
+            {
+                if (degree == 1)
+                {
+                    proots[0] = data[0] / data[1];
+                    nRoots = 1;
+                }
+            }
+
+            if constexpr (maxdegree >= 2)
+            {
+                if (degree == 2)
+                {
+                    ftype a, b, c, d, bound[2], sg;
+
+                    a = data[2];
+                    b = data[1];
+                    c = data[0];
+                    d = aznumeric_cast<ftype>(sgnnz(a));
+                    a *= d;
+                    b *= d;
+                    c *= d;
+                    d = b * b - a * c * 4;
+                    bound[0] = start * a * 2 + b;
+                    bound[1] = end * a * 2 + b;
+                    sg = aznumeric_cast<ftype>((sgnnz(bound[0] * bound[1]) + 1) >> 1);
+                    bound[0] *= bound[0];
+                    bound[1] *= bound[1];
+                    bound[isneg(fabs_tpl(bound[1]) - fabs_tpl(bound[0]))] *= sg;
+
+                    if (isnonneg(d) & inrange(d, bound[0], bound[1]))
+                    {
+                        d = sqrt_tpl(d);
+                        a = (ftype)0.5 / a;
+                        proots[nRoots] = (-b - d) * a;
+                        nRoots += inrange(proots[nRoots], start, end);
+                        proots[nRoots] = (-b + d) * a;
+                        nRoots += inrange(proots[nRoots], start, end);
+                    }
+                }
+            }
+
+            if constexpr (maxdegree >= 3)
+            {
+                if (degree == 3)
+                {
+                    ftype t, a, b, c, a3, p, q, Q, Qr, Ar, Ai, phi;
+
+                    t = (ftype)1.0 / data[3];
+                    a = data[2] * t;
+                    b = data[1] * t;
+                    c = data[0] * t;
+                    a3 = a * (ftype)(1.0 / 3);
+                    p = b - a * a3;
+                    q = (a3 * b - c) * (ftype)0.5 - cube(a3);
+                    Q = cube(p * (ftype)(1.0 / 3)) + q * q;
+                    Qr = sqrt_tpl(fabs_tpl(Q));
+
+                    if (Q > 0)
+                    {
+                        proots[0] = cubert_tpl(q + Qr) + cubert_tpl(q - Qr) - a3;
+                        nRoots = 1;
+                    }
+                    else
+                    {
+                        phi = atan2_tpl(Qr, q) * (ftype)(1.0 / 3);
+                        t = pow_tpl(Qr * Qr + q * q, (ftype)(1.0 / 6));
+                        Ar = t * cos_tpl(phi);
+                        Ai = t * sin_tpl(phi);
+                        proots[0] = 2 * Ar - a3;
+                        proots[1] = aznumeric_cast<ftype>(-Ar + Ai * sqrt3 - a3);
+                        proots[2] = aznumeric_cast<ftype>(-Ar - Ai * sqrt3 - a3);
+                        i = idxmax3(proots);
+                        swap(proots, i, 2);
+                        i = isneg(proots[0] - proots[1]);
+                        swap(proots, i, 1);
+                        nRoots = 3;
+                    }
+                }
+            }
+
+            if constexpr (maxdegree >= 4)
+            {
+                if (degree == 4)
+                {
+                    ftype t, a3, a2, a1, a0, y, R, D, E, subroots[3];
+                    const ftype e = (ftype)1E-9;
+
+                    t = (ftype)1.0 / data[4];
+                    a3 = data[3] * t;
+                    a2 = data[2] * t;
+                    a1 = data[1] * t;
+                    a0 = data[0] * t;
+                    polynomial_tpl<ftype, 3> p3aux;
+                    ftype kp3aux[] = { 1, -a2, a1 * a3 - 4 * a0, 4 * a2 * a0 - a1 * a1 - a3 * a3 * a0 };
+                    p3aux.set(kp3aux);
+                    if (!p3aux.findroots((ftype)-1E20, (ftype)1E20, subroots))
+                    {
+                        return 0;
+                    }
+                    R = a3 * a3 * (ftype)0.25 - a2 + (y = subroots[0]);
+
+                    if (R > -e)
+                    {
+                        if (R < e)
+                        {
+                            D = E = a3 * a3 * (ftype)(3.0 / 4) - 2 * a2;
+                            t = y * y - 4 * a0;
+                            if (t < -e)
+                            {
+                                return 0;
+                            }
+                            t = 2 * sqrt_tpl(max((ftype)0, t));
+                        }
+                        else
+                        {
+                            R = sqrt_tpl(max((ftype)0, R));
+                            D = E = a3 * a3 * (ftype)(3.0 / 4) - R * R - 2 * a2;
+                            t = (4 * a3 * a2 - 8 * a1 - a3 * a3 * a3) / R * (ftype)0.25;
+                        }
+                        if (D + t > -e)
+                        {
+                            D = sqrt_tpl(max((ftype)0, D + t));
+                            proots[nRoots++] = a3 * (ftype)-0.25 + (R - D) * (ftype)0.5;
+                            proots[nRoots++] = a3 * (ftype)-0.25 + (R + D) * (ftype)0.5;
+                        }
+                        if (E - t > -e)
+                        {
+                            E = sqrt_tpl(max((ftype)0, E - t));
+                            proots[nRoots++] = a3 * (ftype)-0.25 - (R + E) * (ftype)0.5;
+                            proots[nRoots++] = a3 * (ftype)-0.25 - (R - E) * (ftype)0.5;
+                        }
+                        if (nRoots == 4)
+                        {
+                            i = idxmax3(proots);
+                            if (proots[3] < proots[i])
+                            {
+                                swap(proots, i, 3);
+                            }
+                            i = idxmax3(proots);
+                            swap(proots, i, 2);
+                            i = isneg(proots[0] - proots[1]);
+                            swap(proots, i, 1);
+                        }
+                    }
+                }
+            }
+
+            if constexpr (maxdegree > 4)
+            {
+                if (degree > 4)
+                {
+                    ftype roots[maxdegree + 1], prevroot, val, prevval[2], curval, bound[2], middle;
+                    polynomial_tpl<ftype, maxdegree> deriv;
+                    int nExtremes, iter, iBound;
+                    calc_deriviative(deriv);
+
+                    // find a subset of deriviative extremes between start and end
+                    for (nExtremes = deriv.findroots(start, end, roots + 1, nIters, degree - 1) + 1; nExtremes > 1 && roots[nExtremes - 1] > end; nExtremes--)
+                    {
+                        ;
+                    }
+                    for (i = 1; i < nExtremes && roots[i] < start; i++)
+                    {
+                        ;
+                    }
+                    roots[i - 1] = start;
+                    PREFAST_ASSUME(nExtremes < maxdegree + 1);
+                    roots[nExtremes++] = end;
+
+                    for (prevroot = start, prevval[0] = eval(start, degree), nRoots = 0; i < nExtremes; prevval[0] = val, prevroot = roots[i++])
+                    {
+                        val = eval(roots[i], degree);
+                        if (val * prevval[0] < 0)
+                        {
+                            // we have exactly one root between prevroot and roots[i]
+                            bound[0] = prevroot;
+                            bound[1] = roots[i];
+                            iter = 0;
+                            do
+                            {
+                                middle = (bound[0] + bound[1]) * (ftype)0.5;
+                                curval = eval(middle, degree);
+                                iBound = isneg(prevval[0] * curval);
+                                bound[iBound] = middle;
+                                prevval[iBound] = curval;
+                            } while (++iter < nIters);
+                            proots[nRoots++] = middle;
+                        }
+                    }
+                }
+            }
+
+            for (i = 0; i < nRoots && proots[i] < start; i++)
+            {
+                ;
+            }
+            for (; nRoots > i&& proots[nRoots - 1] > end; nRoots--)
+            {
+                ;
+            }
+            for (j = i; j < nRoots; j++)
+            {
+                proots[j - i] = proots[j];
+            }
+
+            return nRoots - i;
+        }
+    } // namespace polynomial_tpl_IMPL
+    template<class ftype, int degree>
+    using polynomial_tpl = polynomial_tpl_IMPL::polynomial_tpl<ftype, degree>;
+
+    typedef polynomial_tpl<real, 3> P3;
+    typedef polynomial_tpl<real, 2> P2;
+    typedef polynomial_tpl<real, 1> P1;
+    typedef polynomial_tpl<float, 3> P3f;
+    typedef polynomial_tpl<float, 2> P2f;
+    typedef polynomial_tpl<float, 1> P1f;
+} // namespace LegacyCryPhysicsUtils
diff --git a/Code/Sandbox/Plugins/EditorCommon/CurveEditor.cpp b/Code/Sandbox/Plugins/EditorCommon/CurveEditor.cpp
index cd6c556ace..e5426b78e4 100644
--- a/Code/Sandbox/Plugins/EditorCommon/CurveEditor.cpp
+++ b/Code/Sandbox/Plugins/EditorCommon/CurveEditor.cpp
@@ -38,7 +38,7 @@ AZ_POP_DISABLE_WARNING
 
 #define NO_BUFFER_OVERRUN PREFAST_SUPPRESS_WARNING(6385 6386)
 #include <ISplines.h>
-#include "../Cry3DEngine/Cry_LegacyPhysUtils.h"
+#include "Cry_LegacyPhysUtils.h"
 
 namespace CurveEditorHelpers
 {
diff --git a/Code/Sandbox/Plugins/EditorCommon/CurveEditor_38.cpp b/Code/Sandbox/Plugins/EditorCommon/CurveEditor_38.cpp
index 3e44f20367..60a61b930f 100644
--- a/Code/Sandbox/Plugins/EditorCommon/CurveEditor_38.cpp
+++ b/Code/Sandbox/Plugins/EditorCommon/CurveEditor_38.cpp
@@ -25,7 +25,7 @@
 
 #define INDEX_NOT_OUT_OF_RANGE PREFAST_SUPPRESS_WARNING(6201)
 #define NO_BUFFER_OVERRUN PREFAST_SUPPRESS_WARNING(6385 6386)
-#include "../Cry3DEngine/Cry_LegacyPhysUtils.h"
+#include "Cry_LegacyPhysUtils.h"
 
 #pragma warning (pop)
 
diff --git a/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp b/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp
index 183674505a..e7de4904d1 100644
--- a/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp
+++ b/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp
@@ -175,7 +175,7 @@ CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
     m_layout->addLayout(m_buttonLayout, 0);
 
     m_floatButton = new CDockWidgetTitleButton(dockWidget);
-    m_floatButton->setIcon(QIcon("Editor/Icons/float.png"));
+    m_floatButton->setIcon(QIcon("Icons/float.png"));
     m_floatButton->setVisible(opt.floatable);
     m_floatButton->setToolTip("Toggle Floating");
     connect(m_floatButton, SIGNAL(clicked()), SLOT(OnFloatButtonPressed()));
@@ -185,7 +185,7 @@ CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
     // close.png is a standard icon that looks similar to one in Fusion theme but
     // uses alpha so it can be used on dark theme as well.
     // style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, dockWidget)
-    QIcon closeIcon("Editor/Icons/close.png");
+    QIcon closeIcon("Icons/close.png");
     m_closeButton->setIcon(closeIcon);
     m_closeButton->setVisible(opt.closable);
     m_closeButton->setToolTip("Close");
diff --git a/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowLocalFrame.cpp b/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowLocalFrame.cpp
index f04a38dbdb..6d318aecde 100644
--- a/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowLocalFrame.cpp
+++ b/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowLocalFrame.cpp
@@ -80,7 +80,7 @@ void PropertyRowLocalFrameBase::reset(QPropertyTree* tree)
 
 void PropertyRowLocalFrameBase::redraw(const PropertyDrawContext& context)
 {
-    static QIcon gizmo("Editor/Icons/animation/gizmo_location.png");
+    static QIcon gizmo("Icons/animation/gizmo_location.png");
     gizmo.paint(context.painter, context.widgetRect.adjusted(1, 1, 1, 1), Qt::AlignRight);
 }
 
diff --git a/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowResourceSelector.cpp b/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowResourceSelector.cpp
index 76295ec1f0..942691df04 100644
--- a/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowResourceSelector.cpp
+++ b/Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowResourceSelector.cpp
@@ -292,7 +292,7 @@ const QIcon& PropertyRowResourceSelector::buttonIcon(const QPropertyTree* tree,
     }
     case BUTTON_CREATE:
     {
-        static QIcon addIcon("Editor/Icons/animation/add.png");
+        static QIcon addIcon("Icons/animation/add.png");
         ;
         return addIcon;
     }
diff --git a/Code/Tools/AssetBundler/CMakeLists.txt b/Code/Tools/AssetBundler/CMakeLists.txt
index 41b95fd2ae..c99ffaef6b 100644
--- a/Code/Tools/AssetBundler/CMakeLists.txt
+++ b/Code/Tools/AssetBundler/CMakeLists.txt
@@ -13,9 +13,13 @@ if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
     return()
 endif()
 
+include(${CMAKE_CURRENT_SOURCE_DIR}/Platform/${PAL_PLATFORM_NAME}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
+
+# AssetBundlerBatch - CLI Application
 ly_add_target(
-    NAME AssetBundler.Static STATIC
+    NAME AssetBundlerBatch.Static STATIC
     NAMESPACE AZ
+    AUTOMOC
     FILES_CMAKE
         assetbundlerbatch_files.cmake
     INCLUDE_DIRECTORIES
@@ -23,6 +27,9 @@ ly_add_target(
             .
     BUILD_DEPENDENCIES
         PUBLIC
+            3rdParty::Qt::Core
+            3rdParty::Qt::Gui
+            3rdParty::Qt::Widgets
             AZ::AzToolsFramework
             ${additional_dependencies}
 )
@@ -32,12 +39,41 @@ ly_add_target(
     NAMESPACE AZ
     FILES_CMAKE
         assetbundlerbatch_exe_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            AB_BATCH_MODE
     INCLUDE_DIRECTORIES
         PRIVATE
             .
     BUILD_DEPENDENCIES
         PRIVATE
-            AZ::AssetBundler.Static
+            AZ::AssetBundlerBatch.Static
+)
+
+# AssetBundler - Qt GUI Application
+ly_add_target(
+    NAME AssetBundler ${PAL_TRAIT_BUILD_ASSETBUNDLER_APPLICATION_TYPE}
+    NAMESPACE AZ
+    AUTOMOC
+    AUTOUIC
+    AUTORCC
+    FILES_CMAKE 
+        assetbundlergui_files.cmake
+        assetbundler_exe_files.cmake
+        Platform/${PAL_PLATFORM_NAME}/assetbundlergui_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            Platform/${PAL_PLATFORM_NAME}
+        PRIVATE
+            .
+    BUILD_DEPENDENCIES
+        PUBLIC
+            3rdParty::Qt::Core
+            3rdParty::Qt::Gui
+            3rdParty::Qt::Widgets
+            AZ::AzToolsFramework
+            AZ::AssetBundlerBatch.Static
+            ${additional_dependencies}
 )
 
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
@@ -53,7 +89,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         BUILD_DEPENDENCIES
             PRIVATE
                 AZ::AzTest
-                AZ::AssetBundler.Static
+                AZ::AssetBundlerBatch.Static
                 AZ::AzFrameworkTestShared
     )
 
diff --git a/Code/Tools/AssetBundler/Platform/Linux/PAL_linux.cmake b/Code/Tools/AssetBundler/Platform/Linux/PAL_linux.cmake
new file mode 100644
index 0000000000..d0d27a99ac
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Linux/PAL_linux.cmake
@@ -0,0 +1,13 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set (PAL_TRAIT_BUILD_ASSETBUNDLER_APPLICATION_TYPE APPLICATION)
+
diff --git a/Code/Tools/AssetBundler/Platform/Linux/assetbundlergui_linux_files.cmake b/Code/Tools/AssetBundler/Platform/Linux/assetbundlergui_linux_files.cmake
new file mode 100644
index 0000000000..23bbefccdc
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Linux/assetbundlergui_linux_files.cmake
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    source/utils/GUIApplicationManager_Linux.cpp
+)
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp b/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp
new file mode 100644
index 0000000000..7af09214cb
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp
@@ -0,0 +1,21 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+namespace Platform
+{
+    AzQtComponents::WindowDecorationWrapper::Option GetWindowDecorationWrapperOption()
+    {
+        return AzQtComponents::WindowDecorationWrapper::OptionDisabled;
+    }
+}
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/Platform/Mac/PAL_mac.cmake b/Code/Tools/AssetBundler/Platform/Mac/PAL_mac.cmake
new file mode 100644
index 0000000000..d0d27a99ac
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Mac/PAL_mac.cmake
@@ -0,0 +1,13 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set (PAL_TRAIT_BUILD_ASSETBUNDLER_APPLICATION_TYPE APPLICATION)
+
diff --git a/Code/Tools/AssetBundler/Platform/Mac/assetbundlergui_mac_files.cmake b/Code/Tools/AssetBundler/Platform/Mac/assetbundlergui_mac_files.cmake
new file mode 100644
index 0000000000..a8a116ac79
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Mac/assetbundlergui_mac_files.cmake
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    source/utils/GUIApplicationManager_OSX.cpp
+)
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/Platform/Mac/source/utils/GUIApplicationManager_OSX.cpp b/Code/Tools/AssetBundler/Platform/Mac/source/utils/GUIApplicationManager_OSX.cpp
new file mode 100644
index 0000000000..7af09214cb
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Mac/source/utils/GUIApplicationManager_OSX.cpp
@@ -0,0 +1,21 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+namespace Platform
+{
+    AzQtComponents::WindowDecorationWrapper::Option GetWindowDecorationWrapperOption()
+    {
+        return AzQtComponents::WindowDecorationWrapper::OptionDisabled;
+    }
+}
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/Platform/Windows/PAL_windows.cmake b/Code/Tools/AssetBundler/Platform/Windows/PAL_windows.cmake
new file mode 100644
index 0000000000..d0d27a99ac
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Windows/PAL_windows.cmake
@@ -0,0 +1,13 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set (PAL_TRAIT_BUILD_ASSETBUNDLER_APPLICATION_TYPE APPLICATION)
+
diff --git a/Code/Tools/AssetBundler/Platform/Windows/assetbundlergui_windows_files.cmake b/Code/Tools/AssetBundler/Platform/Windows/assetbundlergui_windows_files.cmake
new file mode 100644
index 0000000000..f9e1ffda8d
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Windows/assetbundlergui_windows_files.cmake
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    source/utils/GUIApplicationManager_Win.cpp
+)
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/Platform/Windows/source/utils/GUIApplicationManager_Win.cpp b/Code/Tools/AssetBundler/Platform/Windows/source/utils/GUIApplicationManager_Win.cpp
new file mode 100644
index 0000000000..99e254a774
--- /dev/null
+++ b/Code/Tools/AssetBundler/Platform/Windows/source/utils/GUIApplicationManager_Win.cpp
@@ -0,0 +1,21 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+namespace Platform
+{
+    AzQtComponents::WindowDecorationWrapper::Option GetWindowDecorationWrapperOption()
+    {
+        return AzQtComponents::WindowDecorationWrapper::OptionAutoAttach;
+    }
+}
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/assetbundler_exe_files.cmake b/Code/Tools/AssetBundler/assetbundler_exe_files.cmake
new file mode 100644
index 0000000000..976405c4f7
--- /dev/null
+++ b/Code/Tools/AssetBundler/assetbundler_exe_files.cmake
@@ -0,0 +1,15 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    source/main.cpp
+    source/AssetBundler.rc
+)
diff --git a/Code/Tools/AssetBundler/assetbundlergui_files.cmake b/Code/Tools/AssetBundler/assetbundlergui_files.cmake
new file mode 100644
index 0000000000..7ac5d34eb3
--- /dev/null
+++ b/Code/Tools/AssetBundler/assetbundlergui_files.cmake
@@ -0,0 +1,70 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    source/models/AssetBundlerAbstractFileTableModel.h
+    source/models/AssetBundlerAbstractFileTableModel.cpp
+    source/models/AssetBundlerFileTableFilterModel.h
+    source/models/AssetBundlerFileTableFilterModel.cpp
+    source/models/AssetListFileTableModel.h
+    source/models/AssetListFileTableModel.cpp
+    source/models/AssetListTableModel.cpp
+    source/models/AssetListTableModel.h
+    source/models/BundleFileListModel.h
+    source/models/BundleFileListModel.cpp
+    source/models/RulesFileTableModel.h
+    source/models/RulesFileTableModel.cpp
+    source/models/SeedListFileTableModel.h
+    source/models/SeedListFileTableModel.cpp
+    source/models/SeedListTableModel.h
+    source/models/SeedListTableModel.cpp
+    source/ui/style/AssetBundler.qrc
+    source/ui/style/AssetBundler.qss
+    source/ui/style/AssetBundlerConfig.ini
+    source/ui/style/AssetBundler-Icon-256x256@x2.ico
+    source/ui/AddSeedDialog.h
+    source/ui/AddSeedDialog.cpp
+    source/ui/AddSeedDialog.ui
+    source/ui/AssetBundlerTabWidget.h
+    source/ui/AssetBundlerTabWidget.cpp
+    source/ui/AssetListTabWidget.h
+    source/ui/AssetListTabWidget.cpp
+    source/ui/AssetListTabWidget.ui
+    source/ui/BundleListTabWidget.h
+    source/ui/BundleListTabWidget.cpp
+    source/ui/BundleListTabWidget.ui
+    source/ui/ComparisonDataWidget.h
+    source/ui/ComparisonDataWidget.cpp
+    source/ui/ComparisonDataWidget.ui
+    source/ui/EditSeedDialog.h
+    source/ui/EditSeedDialog.cpp
+    source/ui/EditSeedDialog.ui
+    source/ui/GenerateBundlesModal.h
+    source/ui/GenerateBundlesModal.cpp
+    source/ui/GenerateBundlesModal.ui
+    source/ui/MainWindow.h
+    source/ui/MainWindow.cpp
+    source/ui/MainWindow.ui
+    source/ui/NewFileDialog.h
+    source/ui/NewFileDialog.cpp
+    source/ui/NewFileDialog.ui
+    source/ui/PlatformSelectionWidget.h
+    source/ui/PlatformSelectionWidget.cpp
+    source/ui/PlatformSelectionWidget.ui
+    source/ui/RulesTabWidget.h
+    source/ui/RulesTabWidget.cpp
+    source/ui/RulesTabWidget.ui
+    source/ui/SeedTabWidget.h
+    source/ui/SeedTabWidget.cpp
+    source/ui/SeedTabWidget.ui
+    source/utils/GUIApplicationManager.h
+    source/utils/GUIApplicationManager.cpp
+)
diff --git a/Code/Tools/AssetBundler/source/AssetBundler.rc b/Code/Tools/AssetBundler/source/AssetBundler.rc
new file mode 100644
index 0000000000..a3116a384f
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/AssetBundler.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "ui\\style\\AssetBundler-Icon-256x256@x2.ico"
diff --git a/Code/Tools/AssetBundler/source/main.cpp b/Code/Tools/AssetBundler/source/main.cpp
index f1b782ff44..be152d6bf3 100644
--- a/Code/Tools/AssetBundler/source/main.cpp
+++ b/Code/Tools/AssetBundler/source/main.cpp
@@ -10,17 +10,48 @@
  *
  */
 
+#if defined(AB_BATCH_MODE)
 #include <source/utils/applicationManager.h>
+#else
+#include <source/utils/GUIApplicationManager.h>
+#include <AzQtComponents/Utilities/QtPluginPaths.h>
+#endif
+
+#if defined(AZ_TESTS_ENABLED)
+#include <AzTest/AzTest.h>
+DECLARE_AZ_UNIT_TEST_MAIN();
+#endif
 
 int main(int argc, char* argv[])
 {
+#if defined(AZ_TESTS_ENABLED)
+    INVOKE_AZ_UNIT_TEST_MAIN();
+#endif
+
     AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
     int runSuccess = 0;
+
     {
-        AssetBundler::ApplicationManager applicationManger(&argc, &argv);
-        applicationManger.Init();
-        runSuccess = applicationManger.Run() ? 0 : 1;
+        //This nested scope is necessary as the applicationManager needs to have its destructor called BEFORE you destroy the allocators
+
+#if defined(AB_BATCH_MODE)
+        AssetBundler::ApplicationManager applicationManager(&argc, &argv);
+#else 
+        // Must be called before using any Qt, or the app won't be able to locate Qt libs
+        AzQtComponents::PrepareQtPaths();
+        AssetBundler::GUIApplicationManager applicationManager(&argc, &argv);
+#endif
+        if (!applicationManager.Init())
+        {
+            AZ_Error("AssetBundler", false, "AssetBundler initialization failed");
+            runSuccess = 1;
+        }
+        else
+        {
+            runSuccess = applicationManager.Run() ? 0 : 1;
+        }
     }
+
     AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
     return runSuccess;
 }
diff --git a/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.cpp
new file mode 100644
index 0000000000..c2aac4e943
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.cpp
@@ -0,0 +1,233 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+#include <source/utils/utils.h>
+
+#include <AzFramework/IO/LocalFileIO.h>
+
+#include <QSetIterator>
+
+namespace AssetBundler
+{
+    const char* DateTimeFormat = "hh:mm:ss MMM dd, yyyy";
+
+    AssetBundlerAbstractFileTableModel::AssetBundlerAbstractFileTableModel(QObject* parent)
+        : QAbstractTableModel(parent)
+    {
+    }
+
+    void AssetBundlerAbstractFileTableModel::Reload(const char* fileExtension, const QSet<QString>& watchedFolders, const QSet<QString>& watchedFiles, const AZStd::unordered_map<AZStd::string, AZStd::string>& pathToProjectNameMap)
+    {
+        AZStd::vector<AZStd::string> keysToRemove = m_fileListKeys;
+
+        // Reload all the files in the watched folders
+        QString filter = QString("*.%1").arg(fileExtension);
+
+        QSetIterator<QString> itr(watchedFolders);
+        while (itr.hasNext())
+        {
+            QDir filesDir(itr.next());
+            filesDir.setNameFilters({ filter });
+            for (const QString& fileNameAndExtension : filesDir.entryList(QDir::Files))
+            {
+                AZStd::string absolutePath = filesDir.absoluteFilePath(fileNameAndExtension).toUtf8().data();
+                AZStd::string projectName;
+                if (pathToProjectNameMap.contains(absolutePath))
+                {
+                    projectName = pathToProjectNameMap.at(absolutePath);
+                }
+
+                // If a project name is already specified, then the associated file is a default file
+                LoadFile(absolutePath, projectName, !projectName.empty());
+                keysToRemove.erase(AZStd::remove(keysToRemove.begin(), keysToRemove.end(), AssetBundler::GenerateKeyFromAbsolutePath(absolutePath)), keysToRemove.end());
+            }
+        }
+
+        // Reload all the watched files
+        for (const QString& filePath : watchedFiles)
+        {
+            AZStd::string absolutePath = filePath.toUtf8().data();
+            if (AZ::IO::FileIOBase::GetInstance()->Exists(absolutePath.c_str()))
+            { 
+                AZStd::string projectName = pathToProjectNameMap.at(absolutePath);
+
+                // If a project name is already specified, then the associated file is a default file
+                LoadFile(absolutePath, projectName, !projectName.empty());
+                keysToRemove.erase(AZStd::remove(keysToRemove.begin(), keysToRemove.end(), AssetBundler::GenerateKeyFromAbsolutePath(absolutePath)), keysToRemove.end());
+            }
+        }
+
+        //Remove nonexistant files from the model
+        for (const AZStd::string& key : keysToRemove)
+        {
+            DeleteFileByKey(key);
+        }
+    }
+
+    void AssetBundlerAbstractFileTableModel::ReloadFiles(const AZStd::vector<AZStd::string>& absoluteFilePathList, AZStd::unordered_map<AZStd::string, AZStd::string> pathToProjectNameMap)
+    {
+        for (const AZStd::string& absoluteFilePath : absoluteFilePathList)
+        {
+            if (!AZ::IO::FileIOBase::GetInstance()->Exists(absoluteFilePath.c_str()))
+            {
+                // File is not present on-disk, make sure to remove it from the model
+                DeleteFileByKey(AssetBundler::GenerateKeyFromAbsolutePath(absoluteFilePath));
+                continue;
+            }
+
+            // If a project name is already specified, then the associated file is a default file
+            AZStd::string projectName = pathToProjectNameMap[absoluteFilePath];
+            LoadFile(absoluteFilePath, projectName, !projectName.empty());
+        }
+    }
+
+    bool AssetBundlerAbstractFileTableModel::Save(const QModelIndex& selectedIndex)
+    {
+        if (!selectedIndex.isValid() || m_keysWithUnsavedChanges.empty())
+        {
+            // There is nothing to save
+            return true;
+        }
+
+        AZStd::string key = GetFileKey(selectedIndex);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        // Save the file
+        if (!WriteToDisk(key))
+        {
+            return false;
+        }
+
+        // Update the display 
+        m_keysWithUnsavedChanges.erase(key);
+        QModelIndex topLeftIndex = index(selectedIndex.row(), 0);
+        QModelIndex bottomRightIndex = index(selectedIndex.row(), columnCount() - 1);
+        emit dataChanged(topLeftIndex, bottomRightIndex, { Qt::DisplayRole, Qt::FontRole });
+
+        return true;
+    }
+
+    bool AssetBundlerAbstractFileTableModel::SaveAll()
+    {
+        if (!HasUnsavedChanges())
+        {
+            // No need to update all of the elements if we are not changing anything
+            return true;
+        }
+
+        bool hasSaveErrors = false;
+
+        // Save every file with unsaved changes
+        AZStd::unordered_set<AZStd::string> keysWithErrors;
+        for (const AZStd::string& key : m_keysWithUnsavedChanges)
+        {
+            if (!WriteToDisk(key))
+            {
+                // Error has already been thrown
+                hasSaveErrors = true;
+                keysWithErrors.emplace(key);
+            }
+        }
+
+        m_keysWithUnsavedChanges = keysWithErrors;
+
+        // Update the display of all elements
+        QModelIndex firstIndex = index(0, 0);
+        QModelIndex lastIndex = index(rowCount() - 1, columnCount() - 1);
+        emit dataChanged(firstIndex, lastIndex, { Qt::DisplayRole, Qt::FontRole });
+
+        return !hasSaveErrors;
+    }
+
+    bool AssetBundlerAbstractFileTableModel::HasUnsavedChanges() const
+    {
+        return !m_keysWithUnsavedChanges.empty();
+    }
+
+    int AssetBundlerAbstractFileTableModel::rowCount(const QModelIndex& /*parent*/) const
+    {
+        return static_cast<int>(m_fileListKeys.size());
+    }
+
+    AZStd::string AssetBundlerAbstractFileTableModel::GetFileKey(const QModelIndex& index) const
+    {
+        int row = index.row();
+        int col = index.column();
+        if (row >= rowCount() || row < 0 || col >= columnCount() || col < 0)
+        {
+            AZ_Error("AssetBundler", false, "Selected index (%i, %i) is out of range.", row, col);
+            return {};
+        }
+
+        return m_fileListKeys.at(row);
+    }
+
+    const AZStd::vector<AZStd::string>& AssetBundlerAbstractFileTableModel::GetAllFileKeys() const
+    {
+        return m_fileListKeys;
+    }
+
+    int AssetBundlerAbstractFileTableModel::GetIndexRowByKey(const AZStd::string& key) const
+    {
+        auto it = AZStd::find(m_fileListKeys.begin(), m_fileListKeys.end(), key);
+        return it == m_fileListKeys.end() ? -1 : static_cast<int>(AZStd::distance(m_fileListKeys.begin(), it));
+    }
+
+    void AssetBundlerAbstractFileTableModel::AddFileKey(const AZStd::string& key)
+    {
+        if (AZStd::find(m_fileListKeys.begin(), m_fileListKeys.end(), key) != m_fileListKeys.end())
+        {
+            // Key already exists. This could happen when we update existing entires.
+            return;
+        }
+
+        beginInsertRows(QModelIndex(), rowCount(), rowCount());
+        m_fileListKeys.push_back(key);
+        endInsertRows();
+    }
+
+    bool AssetBundlerAbstractFileTableModel::RemoveFileKey(const QModelIndex& index)
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        int row = index.row();
+        beginRemoveRows(QModelIndex(), row, row);
+
+        m_fileListKeys.erase(m_fileListKeys.begin() + row);
+        m_keysWithUnsavedChanges.erase(key);
+
+        endRemoveRows();
+
+        return true;
+    }
+
+    bool AssetBundlerAbstractFileTableModel::DeleteFileByKey(const AZStd::string& key)
+    {
+        int indexRow = GetIndexRowByKey(key);
+        if (indexRow >= 0)
+        {
+            return DeleteFile(index(indexRow, 0));
+        }
+
+        return false;     
+    }
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.h b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.h
new file mode 100644
index 0000000000..cfe3e3f241
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.h
@@ -0,0 +1,111 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <AzCore/std/containers/unordered_set.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzCore/std/string/string.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QAbstractTableModel>
+#include <QModelIndex>
+#include <QSet>
+#include <QString>
+
+
+namespace AssetBundler
+{
+
+    extern const char* DateTimeFormat;
+
+    //! Provides an abstract model that can be subclassed to create table models used to store information about files found on-disk.
+    class AssetBundlerAbstractFileTableModel
+        : public QAbstractTableModel
+    {
+    public:
+
+        enum DataRoles
+        {
+            SortRole = Qt::UserRole + 1,
+        };
+
+        explicit AssetBundlerAbstractFileTableModel(QObject* parent = nullptr);
+        virtual ~AssetBundlerAbstractFileTableModel() {}
+
+        //////////////////////////////////////////////////////////////////////////
+        // Pure virtual functions
+        virtual AZStd::vector<AZStd::string> CreateNewFiles(const AZStd::string& absoluteFilePath, const AzFramework::PlatformFlags& platforms, const QString& project = QString()) = 0;
+        virtual bool DeleteFile(const QModelIndex& index) = 0;
+        virtual void LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& projectName = "", bool isDefaultFile = false) = 0;
+        virtual bool WriteToDisk(const AZStd::string& key) = 0;
+
+        //! Returns the absolute path of the file at the given index on success, returns an empty string on failure.
+        virtual AZStd::string GetFileAbsolutePath(const QModelIndex& index) const = 0;
+
+        virtual int GetFileNameColumnIndex() const = 0;
+        virtual int GetTimeStampColumnIndex() const = 0;
+        //////////////////////////////////////////////////////////////////////////
+
+        //! Reload all the data based on the watched folders and files
+        virtual void Reload(const char* fileExtension, const QSet<QString>& watchedFolders, const QSet<QString>& watchedFiles = QSet<QString>(), const AZStd::unordered_map<AZStd::string, AZStd::string>& pathToProjectNameMap = AZStd::unordered_map<AZStd::string, AZStd::string>());
+
+        virtual void ReloadFiles(const AZStd::vector<AZStd::string>& absoluteFilePathList, AZStd::unordered_map<AZStd::string, AZStd::string> pathToProjectNameMap = AZStd::unordered_map<AZStd::string, AZStd::string>());
+
+        bool Save(const QModelIndex& selectedIndex);
+
+        bool SaveAll();
+
+        bool HasUnsavedChanges() const;
+
+        //////////////////////////////////////////////////////////////////////////
+        // QAbstractTableModel overrides
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+    protected:
+        //! Verifies input index is in range and returns the associated key.
+        //! Throws an error and returns an empty string if the input index is out of range.
+        AZStd::string GetFileKey(const QModelIndex& index) const;
+
+        //! Returns an ordered list of every file key in the model.
+        //! If a proxy model is not used, the order of this list will also be the display order.
+        const AZStd::vector<AZStd::string>& GetAllFileKeys() const;
+
+        //! Get the index row if the file info is stored in the model
+        //! Returns -1 if the file key doesn't exist.
+        int GetIndexRowByKey(const AZStd::string& key) const;
+
+        //! Adds input key to the end of the list of all keys and notifies the view that a row has been added.
+        //! When subclassing, instantiate all data associated with this key so the view can update properly.
+        void AddFileKey(const AZStd::string& key);
+
+        //! Verifies input index, signals to the view that rows will be removed, and removes the key found at the input index.
+        //! When subclassing, be sure to remove all data associated with the key at this index before calling this function.
+        //! Returns true if the index is successfully removed, and false on failure
+        bool RemoveFileKey(const QModelIndex& index);
+
+        //! Delete a file from the disk and remove it from the model by its key
+        bool DeleteFileByKey(const AZStd::string& key);
+
+        AZStd::unordered_set<AZStd::string> m_keysWithUnsavedChanges;
+
+    private:
+        //! When subclassing: store file information in a map, and add the keys to this vector.
+        //! Provides a 1:1 mapping between a QModelIndex::row value and a key.
+        AZStd::vector<AZStd::string> m_fileListKeys;
+    };
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.cpp b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.cpp
new file mode 100644
index 0000000000..f9a24392a2
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.cpp
@@ -0,0 +1,62 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include "AssetBundlerFileTableFilterModel.h"
+
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+
+#include <QDateTime>
+
+namespace AssetBundler
+{
+    AssetBundlerFileTableFilterModel::AssetBundlerFileTableFilterModel(QObject* parent, int displayNameCol, int dateTimeCol)
+        : QSortFilterProxyModel(parent)
+        , m_displayNameCol(displayNameCol)
+        , m_dateTimeCol(dateTimeCol)
+    {
+    }
+
+    void AssetBundlerFileTableFilterModel::FilterChanged(const QString& newFilter)
+    {
+        setFilterRegExp(newFilter.toLower());
+        invalidateFilter();
+    }
+
+    bool AssetBundlerFileTableFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
+    {
+        // Override the default implemention since we want to define custom rules here 
+        QModelIndex index = sourceModel()->index(sourceRow, m_displayNameCol, sourceParent);
+        QRegExp filter(filterRegExp());
+
+        return sourceModel()->data(index).toString().toLower().contains(filter);
+    }
+
+    bool AssetBundlerFileTableFilterModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
+    {
+        // Any column displaying a DateTime string needs to be compared as a DateTime object to ensure
+        // proper sorting
+        if (left.column() != m_dateTimeCol || right.column() != m_dateTimeCol)
+        {
+            return QSortFilterProxyModel::lessThan(left, right);
+        }
+
+        QVariant leftTime = sourceModel()->data(left, AssetBundlerAbstractFileTableModel::SortRole);
+        QVariant rightTime = sourceModel()->data(right, AssetBundlerAbstractFileTableModel::SortRole);
+
+        if (leftTime.type() != QVariant::DateTime || rightTime.type() != QVariant::DateTime)
+        {
+            return QSortFilterProxyModel::lessThan(left, right);
+        }
+
+        return leftTime.toDateTime() < rightTime.toDateTime();
+    }
+}
diff --git a/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.h b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.h
new file mode 100644
index 0000000000..89f33c065a
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.h
@@ -0,0 +1,34 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <QSortFilterProxyModel>
+
+namespace AssetBundler
+{
+    class AssetBundlerFileTableFilterModel
+        : public QSortFilterProxyModel
+    {
+    public:
+        AssetBundlerFileTableFilterModel(QObject* parent, int displayNameCol, int dateTimeCol = -1);
+
+        void FilterChanged(const QString& newFilter);
+
+    protected:
+        bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
+        bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
+
+        int m_displayNameCol = 0;
+        int m_dateTimeCol = -1;
+    };
+}
diff --git a/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.cpp
new file mode 100644
index 0000000000..e4bb7b6ca2
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.cpp
@@ -0,0 +1,251 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/models/AssetListFileTableModel.h>
+#include <source/models/AssetListTableModel.h>
+
+#include <source/utils/utils.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/Asset/AssetBundler.h>
+
+#include <QFileInfo>
+#include <QFont>
+
+namespace AssetBundler
+{
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // AssetListFileInfo
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    AssetListFileInfo::AssetListFileInfo(const AZStd::string& absolutePath, const QString& fileName, const AZStd::string& platform)
+        : m_absolutePath(absolutePath)
+        , m_fileName(fileName)
+        , m_platform(QString(platform.c_str()))
+    {
+        AzFramework::StringFunc::Path::Normalize(m_absolutePath);
+
+        // Modification time will either give us the time the file was last overwritten
+        // (or the time it was created if it has never been overwritten)
+        QFileInfo fileInfo(m_absolutePath.c_str());
+        m_fileCreationTime = fileInfo.fileTime(QFileDevice::FileModificationTime);
+
+        // Load the contents of the asset list file into memory
+        m_assetListModel.reset(new AssetListTableModel(nullptr, absolutePath, platform));
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // AssetListFileTableModel
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    AssetListFileTableModel::AssetListFileTableModel()
+        : AssetBundlerAbstractFileTableModel()
+    {
+    }
+
+    QSharedPointer<AssetListTableModel> AssetListFileTableModel::GetAssetListFileContents(const QModelIndex& index)
+    {
+        auto assetListFileInfoOutcome = GetAssetFileInfo(index);
+        if (!assetListFileInfoOutcome.IsSuccess())
+        {
+            return QSharedPointer<AssetListTableModel>();
+        }
+
+        return assetListFileInfoOutcome.GetValue()->m_assetListModel;
+    }
+
+    bool AssetListFileTableModel::DeleteFile(const QModelIndex& index)
+    {
+        auto assetFileInfoOutcome = GetAssetFileInfo(index);
+        if (!assetFileInfoOutcome.IsSuccess())
+        {
+            return false;
+        }
+
+        AZStd::string key = AssetBundler::GenerateKeyFromAbsolutePath(assetFileInfoOutcome.GetValue()->m_absolutePath);
+        if (m_assetListFileInfoMap.find(key) == m_assetListFileInfoMap.end())
+        {
+            return false;
+        }
+
+        AssetListFileInfoPtr assetFileInfo = m_assetListFileInfoMap[key];
+
+        // Remove file from disk
+        const char* absolutePath = assetFileInfo->m_absolutePath.c_str();
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(absolutePath))
+        {
+            if (AZ::IO::FileIOBase::GetInstance()->IsReadOnly(absolutePath))
+            {
+                return false;
+            }
+
+            auto deleteResult = AZ::IO::FileIOBase::GetInstance()->Remove(absolutePath);
+            if (!deleteResult)
+            {
+                return false;
+            }
+        }
+
+        // Remove file from model
+        m_assetListFileInfoMap.erase(key);
+        RemoveFileKey(index);
+
+        return true;
+    }
+
+    void AssetListFileTableModel::LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& /*projectName*/, bool /*isDefaultFile*/)
+    {
+        AZStd::string fullFileName;
+        AzFramework::StringFunc::Path::GetFullFileName(absoluteFilePath.c_str(), fullFileName);
+
+        // Get the file name without the platform for display purposes
+        AZStd::string baseFileName;
+        AZStd::string platformIdentifier;
+        AzToolsFramework::SplitFilename(fullFileName, baseFileName, platformIdentifier);
+
+        // Read the AssetListFile into memory and store it
+        AZStd::string key = AssetBundler::GenerateKeyFromAbsolutePath(absoluteFilePath);
+        m_assetListFileInfoMap[key].reset(new AssetListFileInfo(absoluteFilePath, QString(baseFileName.c_str()), platformIdentifier));
+        AddFileKey(key);
+    }
+
+    bool AssetListFileTableModel::WriteToDisk(const AZStd::string& /*key*/)
+    {
+        return true;
+    }
+
+    AZStd::string AssetListFileTableModel::GetFileAbsolutePath(const QModelIndex& index) const
+    {
+        auto assetFileInfoOutcome = GetAssetFileInfo(index);
+        if (!assetFileInfoOutcome.IsSuccess())
+        {
+            // Error has already been thrown
+            return AZStd::string();
+        }
+        return assetFileInfoOutcome.GetValue()->m_absolutePath;
+    }
+
+    int AssetListFileTableModel::GetFileNameColumnIndex() const
+    {
+        return Column::ColumnFileName;
+    }
+
+    int AssetListFileTableModel::GetTimeStampColumnIndex() const
+    {
+        return Column::ColumnFileCreationTime;
+    }
+
+    int AssetListFileTableModel::columnCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : Column::Max;
+    }
+
+    QVariant AssetListFileTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
+        {
+            switch (section)
+            {
+            case Column::ColumnFileName:
+                return QString(tr("Asset List File"));
+            case Column::ColumnPlatform:
+                return QString(tr("Platform"));
+            case Column::ColumnFileCreationTime:
+                return QString(tr("Creation Time"));
+            default:
+                break;
+            }
+        }
+
+        return QVariant();
+    }
+
+    QVariant AssetListFileTableModel::data(const QModelIndex& index, int role) const
+    {
+        auto assetListFileInfoOutcome = GetAssetFileInfo(index);
+        if (!assetListFileInfoOutcome.IsSuccess())
+        {
+            return QVariant();
+        }
+
+        int col = index.column();
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+            [[fallthrough]];
+        case SortRole:
+        {
+            if (col == Column::ColumnFileName)
+            {
+                return assetListFileInfoOutcome.GetValue()->m_fileName;
+            }
+            else if (col == Column::ColumnPlatform)
+            {
+                return assetListFileInfoOutcome.GetValue()->m_platform;
+            }
+            else if (col == Column::ColumnFileCreationTime)
+            {
+                if (role == SortRole)
+                {
+                    return assetListFileInfoOutcome.GetValue()->m_fileCreationTime;
+                }
+                else
+                {
+                    return assetListFileInfoOutcome.GetValue()->m_fileCreationTime.toString(DateTimeFormat);
+                }
+            }
+            else
+            {
+                // Returning an empty QString will ensure the checkboxes do not have any text displayed next to them
+                return QString();
+            }
+        }
+        case Qt::FontRole:
+        {
+            if (col == Column::ColumnFileName)
+            {
+                QFont boldFont;
+                boldFont.setBold(true);
+                return boldFont;
+            }
+        }
+        default:
+            break;
+        }
+
+        return QVariant();
+    }
+
+    AZ::Outcome<AssetListFileInfoPtr, void> AssetListFileTableModel::GetAssetFileInfo(const QModelIndex& index) const
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return AZ::Failure();
+        }
+
+        if (m_assetListFileInfoMap.find(key) != m_assetListFileInfoMap.end())
+        {
+            return AZ::Success(m_assetListFileInfoMap.at(key));
+        }
+        else
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot find Asset List File Info");
+            return AZ::Failure();
+        }
+    }
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.h b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.h
new file mode 100644
index 0000000000..61f1455130
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.h
@@ -0,0 +1,88 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+
+#include <QDateTime>
+#include <QSharedPointer>
+
+namespace AssetBundler
+{
+    class AssetListTableModel;
+
+    struct AssetListFileInfo
+    {
+        /**
+        * Stores information about an Asset List File on disk.
+        *
+        * @param absolutePath The absolute path of the Asset List File
+        * @param fileName The name of the Asset List File. This does not include the platform ID
+        * @param platform The platform for the Asset List File
+        */
+        AssetListFileInfo(const AZStd::string& absolutePath, const QString& fileName, const AZStd::string& platform);
+
+        AZStd::string m_absolutePath;
+        QDateTime m_fileCreationTime;
+        /// Use QString for display purpose. This can help to avoid losts of string conversion
+        QString m_fileName;
+        QString m_platform;
+
+        QSharedPointer<AssetListTableModel> m_assetListModel;
+    };
+
+    using AssetListFileInfoPtr = AZStd::shared_ptr<AssetListFileInfo>;
+    /// Stores AssetListFileInfo, using the absolute path (without the drive letter) of the Asset List file as the key
+    using AssetListFileInfoMap = AZStd::unordered_map<AZStd::string, AssetListFileInfoPtr>;
+
+    class AssetListFileTableModel
+        : public AssetBundlerAbstractFileTableModel
+    {
+    public:
+        explicit AssetListFileTableModel();
+        virtual ~AssetListFileTableModel() {}
+
+        QSharedPointer<AssetListTableModel> GetAssetListFileContents(const QModelIndex& index);
+
+        //////////////////////////////////////////////////////////////////////////
+        // AssetBundlerAbstractFileTableModel overrides
+        AZStd::vector<AZStd::string> CreateNewFiles(const AZStd::string& /*absoluteFilePath*/, const AzFramework::PlatformFlags& /*platforms*/, const QString& /*project*/) override { return {}; }
+        bool DeleteFile(const QModelIndex& index) override;
+        void LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& projectName = "", bool isDefaultFile = false) override;
+        bool WriteToDisk(const AZStd::string& key) override;
+        AZStd::string GetFileAbsolutePath(const QModelIndex& index) const override;
+        int GetFileNameColumnIndex() const override;
+        int GetTimeStampColumnIndex() const override;
+
+        //////////////////////////////////////////////////////////////////////////
+        // QAbstractListModel overrides
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+        enum Column
+        {
+            ColumnFileName,
+            ColumnPlatform,
+            ColumnFileCreationTime,
+            Max
+        };
+
+    private:
+        AZ::Outcome<AssetListFileInfoPtr, void> GetAssetFileInfo(const QModelIndex& index) const;
+
+        AssetListFileInfoMap m_assetListFileInfoMap;
+    };
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/AssetListTableModel.cpp b/Code/Tools/AssetBundler/source/models/AssetListTableModel.cpp
new file mode 100644
index 0000000000..cec057d38b
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetListTableModel.cpp
@@ -0,0 +1,129 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/models/AssetListTableModel.h>
+
+#include <source/utils/utils.h>
+
+#include <AzFramework/StringFunc/StringFunc.h>
+
+namespace AssetBundler
+{
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // AssetListTableModel
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    AssetListTableModel::AssetListTableModel(QObject* parent, const AZStd::string& absolutePath, const AZStd::string& platform)
+        : QAbstractTableModel(parent)
+    {
+        m_seedListManager.reset(new AzToolsFramework::AssetSeedManager());
+
+        if (absolutePath.empty() || platform.empty())
+        {
+            return;
+        }
+
+        AZ::Outcome<AzToolsFramework::AssetFileInfoList, AZStd::string> outcome = m_seedListManager->LoadAssetFileInfo(absolutePath);
+        if (!outcome.IsSuccess())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Failed to load the asset file info for %s", absolutePath.c_str());
+            return;
+        }
+
+        m_assetFileInfoList = outcome.TakeValue();
+        m_platformId = static_cast<AzFramework::PlatformId>(AzFramework::PlatformHelper::GetPlatformIndexFromName(platform.c_str()));
+    }
+
+    int AssetListTableModel::rowCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : static_cast<int>(m_assetFileInfoList.m_fileInfoList.size());
+    }
+
+    int AssetListTableModel::columnCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : Column::Max;
+    }
+
+    QVariant AssetListTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
+        {
+            switch (section)
+            {
+            case Column::ColumnAssetName:
+                return QString("Asset Name");
+            case Column::ColumnRelativePath:
+                return QString("Relative Path");
+            case Column::ColumnAssetId:
+                return QString("Asset ID");
+            default:
+                break;
+            }
+        }
+
+        return QVariant();
+    }
+
+    QVariant AssetListTableModel::data(const QModelIndex& index, int role) const
+    {
+        auto assetFileInfoOutcome = GetAssetFileInfo(index);
+        if (!assetFileInfoOutcome.IsSuccess())
+        {
+            return QVariant();
+        }
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+        {
+            switch (index.column())
+            {
+            case Column::ColumnAssetName:
+            {
+                AZStd::string fileName = assetFileInfoOutcome.GetValue().m_assetRelativePath;
+                AzFramework::StringFunc::Path::GetFullFileName(fileName.c_str(), fileName);
+
+                return fileName.c_str();
+            }
+            case Column::ColumnRelativePath:
+            {
+                return assetFileInfoOutcome.GetValue().m_assetRelativePath.c_str();
+            }
+            case Column::ColumnAssetId:
+            {
+                AZStd::string assetIdStr;
+                assetFileInfoOutcome.GetValue().m_assetId.ToString(assetIdStr);
+
+                return assetIdStr.c_str();
+            }
+            default:
+                break;
+            }
+        }
+        default:
+            break;
+        }
+
+        return QVariant();
+    }
+
+    AZ::Outcome<AzToolsFramework::AssetFileInfo&, AZStd::string> AssetListTableModel::GetAssetFileInfo(const QModelIndex& index) const
+    {
+        int row = index.row();
+        int col = index.column();
+        if (row >= rowCount() || row < 0 || col >= columnCount() || col < 0)
+        {
+            return AZ::Failure(AZStd::string::format("Selected index (%i, %i) is out of range", row, col));
+        }
+        
+        return AZ::Success(m_assetFileInfoList.m_fileInfoList.at(row));
+    }
+}
diff --git a/Code/Tools/AssetBundler/source/models/AssetListTableModel.h b/Code/Tools/AssetBundler/source/models/AssetListTableModel.h
new file mode 100644
index 0000000000..94500f520f
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/AssetListTableModel.h
@@ -0,0 +1,54 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <AzToolsFramework/Asset/AssetSeedManager.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QAbstractTableModel>
+
+namespace AssetBundler
+{
+    class AssetListTableModel
+        : public QAbstractTableModel
+    {
+    public:
+        explicit AssetListTableModel(QObject* parent = nullptr, const AZStd::string& absolutePath = AZStd::string(), const AZStd::string& platform = "");
+        virtual ~AssetListTableModel() {}
+
+        AZStd::shared_ptr<AzToolsFramework::AssetSeedManager> GetSeedListManager() { return m_seedListManager; }
+
+        //////////////////////////////////////////////////////////////////////////
+        // QAbstractListModel overrides
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+        enum Column
+        {
+            ColumnAssetName,
+            ColumnRelativePath,
+            ColumnAssetId,
+            Max
+        };
+
+    private:
+        AZ::Outcome<AzToolsFramework::AssetFileInfo&, AZStd::string> GetAssetFileInfo(const QModelIndex& index) const;
+
+        AZStd::shared_ptr<AzToolsFramework::AssetSeedManager> m_seedListManager;
+        AzToolsFramework::AssetFileInfoList m_assetFileInfoList;
+        AzFramework::PlatformId m_platformId;
+    };
+}
diff --git a/Code/Tools/AssetBundler/source/models/BundleFileListModel.cpp b/Code/Tools/AssetBundler/source/models/BundleFileListModel.cpp
new file mode 100644
index 0000000000..d7c0e93279
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/BundleFileListModel.cpp
@@ -0,0 +1,236 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/models/BundleFileListModel.h>
+
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzToolsFramework/AssetBundle/AssetBundleComponent.h>
+
+#include <source/utils/utils.h>
+
+#include <QFileInfo>
+
+
+namespace AssetBundler
+{
+    BundleFileInfo::BundleFileInfo(const AZStd::string& absolutePath)
+        : m_absolutePath(absolutePath)
+        , m_compressedSize(0u)
+    {
+        AzFramework::StringFunc::Path::Normalize(m_absolutePath);
+
+        AZStd::string fileNameStr;
+        if (AzFramework::StringFunc::Path::GetFileName(m_absolutePath.c_str(), fileNameStr))
+        {
+            m_fileName = QString(fileNameStr.c_str());
+        }
+        else
+        {
+            AZ_Error("AssetBundler", false, "Failed to get file name from %s", m_absolutePath.c_str());
+        }
+
+        // Modification time will either give us the time the file was last overwritten
+        // (or the time it was created if it has never been overwritten)
+        QFileInfo fileInfo(m_absolutePath.c_str());
+        m_fileCreationTime = fileInfo.fileTime(QFileDevice::FileModificationTime);
+    }
+
+    BundleFileListModel::BundleFileListModel()
+        : AssetBundlerAbstractFileTableModel()
+    {
+    }
+
+    bool BundleFileListModel::DeleteFile(const QModelIndex& index)
+    {
+        AZStd::string fileKey = GetFileKey(index);
+        if (fileKey.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        auto bundleFileInfoIt = m_bundleFileInfoMap.find(fileKey);
+        if (bundleFileInfoIt == m_bundleFileInfoMap.end())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to find Bundle Info with key ( %s )", fileKey.c_str());
+            return false;
+        }
+
+        BundleFileInfoPtr bundleFileInfo = bundleFileInfoIt->second;
+
+        // Remove file from disk
+        const char* absolutePath = bundleFileInfo->m_absolutePath.c_str();
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(absolutePath))
+        {
+            if (AZ::IO::FileIOBase::GetInstance()->IsReadOnly(absolutePath))
+            {
+                AZ_Error(AssetBundler::AppWindowName, false, "File (%s) is Read-Only. Please check your version control and try again.", absolutePath);
+                return false;
+            }
+
+            auto deleteResult = AZ::IO::FileIOBase::GetInstance()->Remove(absolutePath);
+            if (!deleteResult)
+            {
+                AZ_Error(AssetBundler::AppWindowName, false, "Unable to delete: %s", absolutePath);
+                return false;
+            }
+        }
+
+        // Remove file from Model
+        m_bundleFileInfoMap.erase(fileKey);
+        RemoveFileKey(index);
+
+        return true;
+    }
+
+    int BundleFileListModel::columnCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : Column::Max;
+    }
+
+    QVariant BundleFileListModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
+        {
+            switch (section)
+            {
+            case Column::ColumnFileName:
+                return QString(tr("Name"));
+            case Column::ColumnFileCreationTime:
+                return QString(tr("Creation Time"));
+            default:
+                break;
+            }
+        }
+        return QVariant();
+    }
+
+    QVariant BundleFileListModel::data(const QModelIndex& index, int role) const
+    {
+        auto bundleInfoOutcome = GetBundleInfo(index);
+        if (!bundleInfoOutcome.IsSuccess())
+        {
+            return QVariant();
+        }
+
+        int col = index.column();
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+            [[fallthrough]];
+        case SortRole:
+        {
+            if (col == Column::ColumnFileName)
+            {
+                return bundleInfoOutcome.GetValue()->m_fileName;
+            }
+            else if (col == Column::ColumnFileCreationTime)
+            {
+                if (role == SortRole)
+                {
+                    return bundleInfoOutcome.GetValue()->m_fileCreationTime;
+                }
+                else
+                {
+                    return bundleInfoOutcome.GetValue()->m_fileCreationTime.toString(DateTimeFormat);
+                }
+            }
+        }
+        default:
+            break;
+        }
+
+        return QVariant();
+    }
+
+    AZStd::string BundleFileListModel::GetFileAbsolutePath(const QModelIndex& index) const
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return key;
+        }
+
+        return m_bundleFileInfoMap.at(key)->m_absolutePath;
+    }
+
+    int BundleFileListModel::GetFileNameColumnIndex() const
+    {
+        return Column::ColumnFileName;
+    }
+
+    int BundleFileListModel::GetTimeStampColumnIndex() const
+    {
+        return Column::ColumnFileCreationTime;
+    }
+
+    void BundleFileListModel::LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& /*projectName*/, bool /*isDefaultFile*/)
+    {
+        AZStd::string key = AssetBundler::GenerateKeyFromAbsolutePath(absoluteFilePath);
+
+        BundleFileInfo* newInfo = new BundleFileInfo(absoluteFilePath);
+        
+        QFile bundleFile(absoluteFilePath.c_str());
+        if (bundleFile.open(QIODevice::ReadOnly))
+        {
+            newInfo->m_compressedSize = bundleFile.size();
+            bundleFile.close();
+        }
+        else
+        {
+            AZ_Error("AssetBundler", false, "Failed to open file at %s", absoluteFilePath.c_str());
+        }
+
+        auto manifest = AzToolsFramework::AssetBundleComponent::GetManifestFromBundle(absoluteFilePath);
+        if (manifest != nullptr)
+        {
+            for (auto& bundleName : manifest->GetDependentBundleNames())
+            {
+                newInfo->m_relatedBundles.push_back(bundleName.c_str());
+            }
+        }
+        else
+        {
+            AZ_Error("AssetBundler", false, "Failed to get manifest from bundle at %s", absoluteFilePath.c_str());
+        }
+
+        m_bundleFileInfoMap[key].reset(newInfo);
+        // Add it to the list that gets displayed by AssetBundlerAbstractFileTableModel. Make sure that
+        // AddFileKey is called after m_bundleFileInfoMap is reset since the filterAcceptsRow funtion
+        // of the filter model will be called when a new row is inserted and it could cause a crash
+        // without valid data being set
+        AddFileKey(key);
+    }
+
+    AZ::Outcome<BundleFileInfoPtr, void> BundleFileListModel::GetBundleInfo(const QModelIndex& index) const
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return AZ::Failure();
+        }
+
+        if (m_bundleFileInfoMap.find(key) != m_bundleFileInfoMap.end())
+        {
+            return AZ::Success(m_bundleFileInfoMap.at(key));
+        }
+        else
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot find Bundle File Info");
+            return AZ::Failure();
+        }
+    }
+
+}
diff --git a/Code/Tools/AssetBundler/source/models/BundleFileListModel.h b/Code/Tools/AssetBundler/source/models/BundleFileListModel.h
new file mode 100644
index 0000000000..13e5838c57
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/BundleFileListModel.h
@@ -0,0 +1,74 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#include <AzToolsFramework/Asset/AssetBundler.h>
+
+#include <QDateTime>
+
+namespace AssetBundler
+{
+
+    struct BundleFileInfo
+    {
+        AZStd::string m_absolutePath;
+        QString m_fileName;
+        QDateTime m_fileCreationTime;
+        AZ::u64 m_compressedSize;
+        QStringList m_relatedBundles;
+
+        BundleFileInfo(const AZStd::string& absolutePath);
+    };
+    
+    using BundleFileInfoPtr = AZStd::shared_ptr<BundleFileInfo>;
+    using BundleFileInfoMap = AZStd::unordered_map<AZStd::string, BundleFileInfoPtr>;
+
+    class BundleFileListModel
+        : public AssetBundlerAbstractFileTableModel
+    {
+    public:
+        explicit BundleFileListModel();
+        virtual ~BundleFileListModel() {}
+
+        AZStd::vector<AZStd::string> CreateNewFiles(const AZStd::string& /*absoluteFilePath*/, const AzFramework::PlatformFlags& /*platforms*/, const QString& /*project*/) override { return {}; }
+        bool DeleteFile(const QModelIndex& index) override;
+        void LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& projectName = "", bool isDefaultFile = false) override;
+        bool WriteToDisk(const AZStd::string& /*key*/) override { return true; }
+
+        AZStd::string GetFileAbsolutePath(const QModelIndex& index) const override;
+        int GetFileNameColumnIndex() const override;
+        int GetTimeStampColumnIndex() const override;
+
+        AZ::Outcome<BundleFileInfoPtr, void> GetBundleInfo(const QModelIndex& index) const;
+
+        //////////////////////////////////////////////////////////////////////////
+        // QAbstractTableModel overrides
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+        enum Column
+        {
+            ColumnFileName,
+            ColumnFileCreationTime,
+            Max
+        };
+
+    private:
+        BundleFileInfoMap m_bundleFileInfoMap;
+    };
+}
diff --git a/Code/Tools/AssetBundler/source/models/RulesFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.cpp
new file mode 100644
index 0000000000..c7ae384d6e
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.cpp
@@ -0,0 +1,305 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/models/RulesFileTableModel.h>
+
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#include <QFileInfo>
+#include <QFont>
+
+namespace AssetBundler
+{
+    RulesFileInfo::RulesFileInfo(const AZStd::string& absolutePath, const QString& fileName, bool loadFromFile)
+        : m_absolutePath(absolutePath)
+        , m_fileName(fileName)
+    {
+        AzFramework::StringFunc::Path::Normalize(m_absolutePath);
+        m_comparisonSteps = AZStd::make_shared<AzToolsFramework::AssetFileInfoListComparison>();
+
+        if (loadFromFile)
+        {
+            auto outcome = AzToolsFramework::AssetFileInfoListComparison::Load(m_absolutePath);
+            if (!outcome.IsSuccess())
+            {
+                AZ_Error("AssetBundler", false, outcome.GetError().c_str());
+                return;
+            }
+            m_comparisonSteps = AZStd::make_unique<AzToolsFramework::AssetFileInfoListComparison>(outcome.TakeValue());
+
+            QFileInfo fileInfo(m_absolutePath.c_str());
+            m_fileModificationTime = fileInfo.fileTime(QFileDevice::FileModificationTime);
+        }
+        else
+        {
+            m_fileModificationTime = QDateTime::currentDateTime();
+        }
+    }
+
+    bool RulesFileInfo::SaveRulesFile()
+    {
+        if (!m_comparisonSteps->Save(m_absolutePath))
+        {
+            return false;
+        }
+
+        m_hasUnsavedChanges = false;
+        m_fileModificationTime = QDateTime::currentDateTime();
+        return true;
+    }
+
+
+
+    RulesFileTableModel::RulesFileTableModel()
+        : AssetBundlerAbstractFileTableModel()
+    {
+    }
+
+    AZStd::vector<AZStd::string> RulesFileTableModel::CreateNewFiles(const AZStd::string& absoluteFilePath, const AzFramework::PlatformFlags& /*platforms*/, const QString& /*project*/)
+    {
+        if (absoluteFilePath.empty())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Input file path is empty");
+            return {};
+        }
+
+        // Create a platform-specific file path
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(absoluteFilePath.c_str()))
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot Create New File: (%s) already exists", absoluteFilePath.c_str());
+            return {};
+        }
+
+        // Get the file name without the extension for display purposes
+        AZStd::string fileName = absoluteFilePath;
+        AzToolsFramework::RemovePlatformIdentifier(fileName);
+        AzFramework::StringFunc::Path::GetFileName(fileName.c_str(), fileName);
+
+        // Create a Rules File and save it to disk
+        AZStd::string key = AssetBundler::GenerateKeyFromAbsolutePath(absoluteFilePath);
+        RulesFileInfoPtr newRulesFile = AZStd::make_shared<RulesFileInfo>(absoluteFilePath, QString(fileName.c_str()), false);
+
+        if (!newRulesFile->SaveRulesFile())
+        {
+            return {};
+        }
+
+        // Add the new file to the model
+        m_rulesFileInfoMap[key] = newRulesFile;
+        AddFileKey(key);
+        return { absoluteFilePath };
+    }
+
+    bool RulesFileTableModel::DeleteFile(const QModelIndex& index)
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        RulesFileInfoPtr rulesFileInfo = m_rulesFileInfoMap[key];
+
+        // Remove file from disk
+        if (AZ::IO::FileIOBase::GetInstance()->IsReadOnly(rulesFileInfo->m_absolutePath.c_str()))
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "File (%s) is Read-Only. Please check your version control and try again.", rulesFileInfo->m_absolutePath.c_str());
+            return false;
+        }
+
+        auto deleteResult = AZ::IO::FileIOBase::GetInstance()->Remove(rulesFileInfo->m_absolutePath.c_str());
+        if (!deleteResult)
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to delete: %s", rulesFileInfo->m_absolutePath.c_str());
+            return false;
+        }
+
+        // Remove file from model
+        m_rulesFileInfoMap.erase(key);
+        RemoveFileKey(index);
+
+        return true;
+    }
+
+    void RulesFileTableModel::LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& /*projectName*/, bool /*isDefaultFile*/)
+    {
+        // Get the file name without the extension for display purposes
+        AZStd::string fileName(absoluteFilePath);
+        AzFramework::StringFunc::Path::GetFileName(fileName.c_str(), fileName);
+
+        // Read the Rules file into memory and store it 
+        AZStd::string key = AssetBundler::GenerateKeyFromAbsolutePath(absoluteFilePath);
+        auto fileInfoIt = m_rulesFileInfoMap.find(key);
+        if (fileInfoIt != m_rulesFileInfoMap.end() && fileInfoIt->second->m_hasUnsavedChanges)
+        {
+            AZ_Warning(AssetBundler::AppWindowName, false, "Rules File %s has unsaved changes and couldn't be reloaded", absoluteFilePath.c_str());
+            return;
+        }
+
+        m_rulesFileInfoMap[key] = AZStd::make_shared<RulesFileInfo>(absoluteFilePath, QString(fileName.c_str()), true);
+        AddFileKey(key);
+    }
+
+    bool RulesFileTableModel::WriteToDisk(const AZStd::string& key)
+    {
+        auto rulesFileIt = m_rulesFileInfoMap.find(key);
+        return rulesFileIt != m_rulesFileInfoMap.end() && rulesFileIt->second->SaveRulesFile();
+    }
+
+    AZStd::string RulesFileTableModel::GetFileAbsolutePath(const QModelIndex& index) const
+    {
+        RulesFileInfoPtr rulesFileInfo = GetRulesFileInfoPtr(index);
+        if (!rulesFileInfo)
+        {
+            return AZStd::string();
+        }
+
+        return rulesFileInfo->m_absolutePath;
+    }
+
+    int RulesFileTableModel::GetFileNameColumnIndex() const
+    {
+        return Column::ColumnFileName;
+    }
+
+    int RulesFileTableModel::GetTimeStampColumnIndex() const
+    {
+        return Column::ColumnFileModificationTime;
+    }
+
+    AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> RulesFileTableModel::GetComparisonSteps(const QModelIndex& index) const
+    {
+        RulesFileInfoPtr rulesFileInfo = GetRulesFileInfoPtr(index);
+        if (!rulesFileInfo)
+        {
+            return nullptr;
+        }
+
+        return rulesFileInfo->m_comparisonSteps;
+    }
+
+    bool RulesFileTableModel::MarkFileChanged(const QModelIndex& index)
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        m_rulesFileInfoMap[key]->m_hasUnsavedChanges = true;
+
+        // Update display so the user knows there are unsaved changes
+        m_keysWithUnsavedChanges.emplace(key);
+        QModelIndex changedIndex = QAbstractTableModel::index(index.row(), Column::ColumnFileName);
+        emit dataChanged(changedIndex, changedIndex, { Qt::DisplayRole, Qt::FontRole });
+
+        return true;
+    }
+
+    int RulesFileTableModel::columnCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : Column::Max;
+    }
+
+    QVariant RulesFileTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
+        {
+            switch (section)
+            {
+            case Column::ColumnFileName:
+                return QString(tr("Name"));
+            case Column::ColumnFileModificationTime:
+                return QString(tr("Modification Time"));
+            default:
+                break;
+            }
+        }
+
+        return QVariant();
+    }
+
+    QVariant RulesFileTableModel::data(const QModelIndex& index, int role) const
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            return QVariant();
+        }
+
+        RulesFileInfoPtr rulesFileInfo = m_rulesFileInfoMap.at(key);
+
+        int col = index.column();
+        bool hasUnsavedChanges = rulesFileInfo->m_hasUnsavedChanges;
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+            [[fallthrough]];
+        case SortRole:
+        {
+            if (col == Column::ColumnFileName)
+            {
+                QString displayName = rulesFileInfo->m_fileName;
+                if (hasUnsavedChanges)
+                {
+                    displayName.append("*");
+                }
+                return displayName;
+            }
+            else if (col == Column::ColumnFileModificationTime)
+            {
+                if (role == SortRole)
+                {
+                    return rulesFileInfo->m_fileModificationTime;
+                }
+                else
+                {
+                    return rulesFileInfo->m_fileModificationTime.toString(DateTimeFormat);
+                }
+            }
+            break;
+        }
+        case Qt::FontRole:
+        {
+            if (col == Column::ColumnFileName && hasUnsavedChanges)
+            {
+                QFont boldFont;
+                boldFont.setBold(true);
+                return boldFont;
+            }
+            break;
+        }
+        default:
+            break;
+        }
+
+        return QVariant();
+    }
+
+    RulesFileInfoPtr RulesFileTableModel::GetRulesFileInfoPtr(const QModelIndex& index) const
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            return nullptr;
+        }
+
+        return m_rulesFileInfoMap.at(key);
+    }
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/RulesFileTableModel.h b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.h
new file mode 100644
index 0000000000..a9931a9819
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.h
@@ -0,0 +1,88 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+#include <source/utils/utils.h>
+
+#include <AzToolsFramework/Asset/AssetBundler.h>
+
+#include <QDateTime>
+
+namespace AssetBundler
+{
+
+    //! Stores information about a Rules file on disk. 
+    struct RulesFileInfo
+    {
+        RulesFileInfo(const AZStd::string& absolutePath, const QString& fileName, bool loadFromFile);
+
+        bool SaveRulesFile();
+
+        AZStd::string m_absolutePath;
+        QString m_fileName;
+        QDateTime m_fileModificationTime;
+        bool m_hasUnsavedChanges = false;
+
+        AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> m_comparisonSteps;
+    };
+
+    using RulesFileInfoPtr = AZStd::shared_ptr<RulesFileInfo>;
+    using RulesFileInfoMap = AZStd::unordered_map<AZStd::string, RulesFileInfoPtr>;
+
+
+    class RulesFileTableModel
+        : public AssetBundlerAbstractFileTableModel
+    {
+    public:
+        RulesFileTableModel();
+        virtual ~RulesFileTableModel() {}
+
+        AZStd::vector<AZStd::string> CreateNewFiles(const AZStd::string& absoluteFilePath, const AzFramework::PlatformFlags& platforms = AzFramework::PlatformFlags::Platform_NONE, const QString& project = QString()) override;
+
+        bool DeleteFile(const QModelIndex& index) override;
+
+        void LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& projectName = "", bool isDefaultFile = false) override;
+
+        bool WriteToDisk(const AZStd::string& key) override;
+
+        AZStd::string GetFileAbsolutePath(const QModelIndex& index) const override;
+
+        int GetFileNameColumnIndex() const override;
+
+        int GetTimeStampColumnIndex() const override;
+
+        AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> GetComparisonSteps(const QModelIndex& index) const;
+
+        bool MarkFileChanged(const QModelIndex& index);
+
+        //////////////////////////////////////////////////////////////////////////
+        // QAbstractTableModel overrides
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+        enum Column
+        {
+            ColumnFileName,
+            ColumnFileModificationTime,
+            Max
+        };
+
+    private:
+        RulesFileInfoMap m_rulesFileInfoMap;
+
+        RulesFileInfoPtr GetRulesFileInfoPtr(const QModelIndex& index) const;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.cpp
new file mode 100644
index 0000000000..1e7ec36bac
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.cpp
@@ -0,0 +1,601 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/models/SeedListFileTableModel.h>
+#include <source/models/SeedListTableModel.h>
+
+#include <source/ui/SeedTabWidget.h>
+#include <source/utils/utils.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h>
+
+#include <QFileInfo>
+#include <QFont>
+
+namespace AssetBundler
+{
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // SeedListFileInfo
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    SeedListFileInfo::SeedListFileInfo(
+        const AZStd::string& absolutePath,
+        const QString& fileName,
+        const QString& project,
+        bool loadFromFile,
+        bool isDefaultSeedList,
+        const AZStd::vector<AZStd::string>& defaultSeeds,
+        const AzFramework::PlatformFlags& platforms)
+        : m_absolutePath(absolutePath)
+        , m_fileName(fileName)
+        , m_project(project)
+        , m_isDefaultSeedList(isDefaultSeedList)
+    {
+        AzFramework::StringFunc::Path::Normalize(m_absolutePath);
+
+        // Load the contents of the seed file into memory
+        if (loadFromFile)
+        {
+            m_seedListModel.reset(new SeedListTableModel(nullptr, absolutePath));
+            QFileInfo fileInfo(m_absolutePath.c_str());
+            m_fileModificationTime = fileInfo.fileTime(QFileDevice::FileModificationTime);
+        }
+        else
+        {
+            m_seedListModel.reset(new SeedListTableModel(nullptr, "", defaultSeeds, platforms));
+            m_fileModificationTime = QDateTime::currentDateTime();
+        }
+    }
+
+    bool SeedListFileInfo::SaveSeedFile()
+    {
+        if (m_seedListModel->Save(m_absolutePath))
+        {
+            m_fileModificationTime = QDateTime::currentDateTime();
+            return true;
+        }
+        return false;
+    }
+
+    bool SeedListFileInfo::HasUnsavedChanges()
+    {
+        return m_seedListModel->HasUnsavedChanges();
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // SeedListFileTableModel
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    SeedListFileTableModel::SeedListFileTableModel(SeedTabWidget* parentSeedTabWidget)
+        : AssetBundlerAbstractFileTableModel()
+        , m_seedTabWidget(parentSeedTabWidget)
+    {
+        m_inMemoryDefaultSeedList.reset(new SeedListFileInfo("", "", "", false));
+    }
+
+    SeedListFileTableModel::~SeedListFileTableModel()
+    {
+        m_seedTabWidget = nullptr;
+    }
+
+    void SeedListFileTableModel::AddDefaultSeedsToInMemoryList(const AZStd::vector<AZStd::string>& defaultSeeds, const char* projectName, const AzFramework::PlatformFlags& platforms)
+    {
+        m_inMemoryDefaultSeedList.reset(new SeedListFileInfo(m_inMemoryDefaultSeedListKey, tr("DefaultSeeds"), QString(projectName), false, true, defaultSeeds, platforms));
+    }
+
+    AZStd::vector<AZStd::string> SeedListFileTableModel::CreateNewFiles(const AZStd::string& absoluteFilePath, const AzFramework::PlatformFlags& /*platforms*/, const QString& project)
+    {
+        if (absoluteFilePath.empty())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Input file path is empty.");
+            return {};
+        }
+
+        // Get the file name without the extension for display purposes
+        AZStd::string fileName;
+        AzFramework::StringFunc::Path::GetFileName(absoluteFilePath.c_str(), fileName);
+
+        // Create a Seed List File and save it to disk
+        AZStd::string key = AssetBundler::GenerateKeyFromAbsolutePath(absoluteFilePath);
+
+        AZStd::shared_ptr<SeedListFileInfo> newSeedListFile = AZStd::make_shared<SeedListFileInfo>(absoluteFilePath, QString(fileName.c_str()), project, false);
+        newSeedListFile->m_seedListModel->SetHasUnsavedChanges(true);
+        bool saveResult = newSeedListFile->SaveSeedFile();
+        if (!saveResult)
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to create Seed List File: %s", absoluteFilePath.c_str());
+            return {};
+        }
+
+        // Add new file to the model
+        m_seedListFileInfoMap[key] = newSeedListFile;
+        AddFileKey(key);
+
+        AZStd::vector<AZStd::string> createdFiles = { absoluteFilePath };
+        return createdFiles;
+    }
+
+    bool SeedListFileTableModel::DeleteFile(const QModelIndex& index)
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        if (m_seedListFileInfoMap.find(key) == m_seedListFileInfoMap.end())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to find Seed File Info with key ( %s )", key.c_str());
+            return false;
+        }
+
+        SeedListFileInfoPtr seedFileInfo = m_seedListFileInfoMap[key];
+
+        // Remove file from disk
+        const char* absolutePath = seedFileInfo->m_absolutePath.c_str();
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(absolutePath))
+        {
+            if (AZ::IO::FileIOBase::GetInstance()->IsReadOnly(absolutePath))
+            {
+                AZ_Error(AssetBundler::AppWindowName, false, "File (%s) is Read-Only. Please check your version control and try again.", absolutePath);
+                return false;
+            }
+
+            auto deleteResult = AZ::IO::FileIOBase::GetInstance()->Remove(absolutePath);
+            if (!deleteResult)
+            {
+                AZ_Error(AssetBundler::AppWindowName, false, "Unable to delete: %s", absolutePath);
+                return false;
+            }
+        }
+
+        // Remove file from model
+        m_seedListFileInfoMap.erase(key);
+        RemoveFileKey(index);
+
+        return true;
+    }
+
+    void SeedListFileTableModel::Reload(const char* fileExtension, const QSet<QString>& watchedFolders, const QSet<QString>& watchedFiles, const AZStd::unordered_map<AZStd::string, AZStd::string>& pathToProjectNameMap)
+    {
+        // Load in the Seed List files from disk
+        AssetBundlerAbstractFileTableModel::Reload(fileExtension, watchedFolders, watchedFiles, pathToProjectNameMap);
+
+        // Add the in-memory Default Seed List to the model
+        m_seedListFileInfoMap[m_inMemoryDefaultSeedListKey] = m_inMemoryDefaultSeedList;
+        AddFileKey(m_inMemoryDefaultSeedListKey);
+    }
+
+    void SeedListFileTableModel::LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& projectName, bool isDefaultFile)
+    {
+        // Get the file name without the extension for display purposes
+        AZStd::string fileName;
+        AzFramework::StringFunc::Path::GetFileName(absoluteFilePath.c_str(), fileName);
+
+        // Read the SeedListFile into memory and store it
+        AZStd::string key = AssetBundler::GenerateKeyFromAbsolutePath(absoluteFilePath);
+        auto fileInfoIt = m_seedListFileInfoMap.find(key);
+        if (fileInfoIt != m_seedListFileInfoMap.end() && fileInfoIt->second->HasUnsavedChanges())
+        {
+            AZ_Warning(AssetBundler::AppWindowName, false, "Seed List File %s has unsaved changes and couldn't be reloaded", absoluteFilePath.c_str());
+            return;
+        }
+
+        AZStd::string projectNameOnDisplay = projectName;
+        if (projectName.empty())
+        {
+            auto outcome = AssetBundler::GetCurrentProjectName();
+            if (!outcome.IsSuccess())
+            {
+                AZ_Error(AssetBundler::AppWindowName, false, outcome.TakeError().c_str());
+                return;
+            }
+
+            projectNameOnDisplay = outcome.TakeValue();
+        }
+
+        m_seedListFileInfoMap[key].reset(new SeedListFileInfo(absoluteFilePath, QString(fileName.c_str()), QString(projectNameOnDisplay.c_str()), true, isDefaultFile));
+        AddFileKey(key);
+    }
+
+    void SeedListFileTableModel::SelectDefaultSeedLists(bool setSelected)
+    {
+        for (const AZStd::string& key : GetAllFileKeys())
+        {
+            auto seedFileInfo = m_seedListFileInfoMap[key];
+            if (!seedFileInfo->m_isDefaultSeedList)
+            {
+                continue;
+            }
+
+            seedFileInfo->m_isChecked = setSelected;
+            if(setSelected)
+            {
+                m_checkedSeedListFiles.insert(key);
+            }
+            else
+            {
+                m_checkedSeedListFiles.erase(key);
+            }
+        }
+
+        m_seedTabWidget->SetGenerateAssetListsButtonEnabled(!m_checkedSeedListFiles.empty());
+
+        // Update the Check State display of all elements
+        QModelIndex firstIndex = index(0, 0);
+        QModelIndex lastIndex = index(rowCount() - 1, columnCount() - 1);
+        emit dataChanged(firstIndex, lastIndex, { Qt::CheckStateRole });
+    }
+
+    AZStd::vector<AZStd::string> SeedListFileTableModel::GenerateAssetLists(const AZStd::string& absoluteFilePath, const AzFramework::PlatformFlags& platforms)
+    {
+        if (!m_checkedSeedListFiles.size())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot Generate Asset List File(s): No Seed List Files are selected");
+            return {};
+        }
+
+        if (absoluteFilePath.empty())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "File path cannot be empty");
+            return {};
+        }
+        
+        if(platforms == AzFramework::PlatformFlags::Platform_NONE)
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Input platform cannot be empty");
+            return {};
+        }
+
+        // Get all of the Seeds into one AssetSeedManager
+        AzToolsFramework::AssetSeedManager assetSeedManager;
+
+        if (m_checkedSeedListFiles.find(m_inMemoryDefaultSeedListKey) != m_checkedSeedListFiles.end())
+        {
+            // The In-Memory Default Seed List can't be loaded from a file on disk, it is a special case
+            assetSeedManager = *m_inMemoryDefaultSeedList->m_seedListModel->GetSeedListManager().get();
+            m_checkedSeedListFiles.erase(m_inMemoryDefaultSeedListKey);
+        }
+
+        for (const auto& checkedSeedFileKey : m_checkedSeedListFiles)
+        {
+            assetSeedManager.Load(m_seedListFileInfoMap[checkedSeedFileKey]->m_absolutePath);
+        }
+
+        // Generate an AssetList for every input platform
+        AZStd::vector<AZStd::string> createdFiles;
+        for (const auto& platformIndex : AzFramework::PlatformHelper::GetPlatformIndicesInterpreted(platforms))
+        {
+            AZStd::string platformSpecificCachePath = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(platformIndex);
+            AzFramework::StringFunc::Path::StripFullName(platformSpecificCachePath);
+
+            FilePath platformSpecificPath(absoluteFilePath, AZStd::string(AzFramework::PlatformHelper::GetPlatformName(platformIndex)));
+            if (assetSeedManager.SaveAssetFileInfo(platformSpecificPath.AbsolutePath(), AzFramework::PlatformHelper::GetPlatformFlagFromPlatformIndex(platformIndex)))
+            {
+                createdFiles.emplace_back(platformSpecificPath.AbsolutePath());
+            }
+        }
+
+        return createdFiles;
+    }
+
+    QSharedPointer<SeedListTableModel> SeedListFileTableModel::GetSeedListFileContents(const QModelIndex& index)
+    {
+        auto seedFileInfoOutcome = GetSeedFileInfo(index);
+        if (!seedFileInfoOutcome.IsSuccess())
+        {
+            return QSharedPointer<SeedListTableModel>();
+        }
+
+        return seedFileInfoOutcome.GetValue()->m_seedListModel;
+    }
+
+    bool SeedListFileTableModel::SetSeedPlatforms(const QModelIndex& seedFileIndex, const QModelIndex& seedIndex, const AzFramework::PlatformFlags& platforms)
+    {
+        AZStd::string key = GetFileKey(seedFileIndex);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        if (m_seedListFileInfoMap.find(key) == m_seedListFileInfoMap.end())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to find Seed File Info with key ( %s )", key.c_str());
+            return false;
+        }
+
+        SeedListFileInfoPtr seedFileInfo = m_seedListFileInfoMap[key];
+        if (!seedFileInfo->m_seedListModel->SetSeedPlatforms(seedIndex, platforms))
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        // Update display so the user knows there are unsaved changes
+        m_keysWithUnsavedChanges.insert(key);
+        QModelIndex changedIndex = QAbstractTableModel::index(seedFileIndex.row(), Column::ColumnFileName);
+        emit dataChanged(changedIndex, changedIndex, { Qt::DisplayRole, Qt::FontRole });
+
+        return true;
+    }
+
+    bool SeedListFileTableModel::AddSeed(const QModelIndex& seedFileIndex, const AZStd::string& seedRelativePath, const AzFramework::PlatformFlags& platforms)
+    {
+        AZStd::string key = GetFileKey(seedFileIndex);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        if (m_seedListFileInfoMap.find(key) == m_seedListFileInfoMap.end())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to find Seed File Info with key ( %s )", key.c_str());
+            return false;
+        }
+
+        SeedListFileInfoPtr seedFileInfo = m_seedListFileInfoMap[key];
+        if (!seedFileInfo->m_seedListModel->AddSeed(seedRelativePath, platforms))
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        // Update display so the user knows there are unsaved changes
+        m_keysWithUnsavedChanges.insert(key);
+        QModelIndex changedIndex = QAbstractTableModel::index(seedFileIndex.row(), Column::ColumnFileName);
+        emit dataChanged(changedIndex, changedIndex, { Qt::DisplayRole, Qt::FontRole });
+
+        return true;
+    }
+
+    bool SeedListFileTableModel::RemoveSeed(const QModelIndex& seedFileIndex, const QModelIndex& seedIndex)
+    {
+        AZStd::string key = GetFileKey(seedFileIndex);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        if (m_seedListFileInfoMap.find(key) == m_seedListFileInfoMap.end())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to find Seed File Info with key ( %s )", key.c_str());
+            return false;
+        }
+
+        SeedListFileInfoPtr seedFileInfo = m_seedListFileInfoMap[key];
+        if (!seedFileInfo->m_seedListModel->RemoveSeed(seedIndex))
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        // Update display so the user knows there are unsaved changes
+        m_keysWithUnsavedChanges.insert(key);
+        QModelIndex changedIndex = QAbstractTableModel::index(seedFileIndex.row(), Column::ColumnFileName);
+        emit dataChanged(changedIndex, changedIndex, { Qt::DisplayRole, Qt::FontRole });
+
+        return true;
+    }
+
+    bool SeedListFileTableModel::WriteToDisk(const AZStd::string& key)
+    {
+        if (key == m_inMemoryDefaultSeedListKey)
+        {
+            return true;
+        }
+
+        auto seedListFileIt = m_seedListFileInfoMap.find(key);
+        return seedListFileIt != m_seedListFileInfoMap.end() && seedListFileIt->second->SaveSeedFile();
+    }
+
+    AZStd::string SeedListFileTableModel::GetFileAbsolutePath(const QModelIndex& index) const
+    {
+        auto seedFileInfoOutcome = GetSeedFileInfo(index);
+        if (!seedFileInfoOutcome.IsSuccess() || seedFileInfoOutcome.GetValue()->m_absolutePath == m_inMemoryDefaultSeedListKey)
+        {
+            // Error has already been thrown
+            return AZStd::string();
+        }
+        return seedFileInfoOutcome.GetValue()->m_absolutePath;
+    }
+
+    int SeedListFileTableModel::GetFileNameColumnIndex() const
+    {
+        return Column::ColumnFileName;
+    }
+
+    int SeedListFileTableModel::GetTimeStampColumnIndex() const
+    {
+        return Column::ColumnFileModificationTime;
+    }
+
+    int SeedListFileTableModel::columnCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : Column::Max;
+    }
+
+    QVariant SeedListFileTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
+        {
+            switch (section)
+            {
+            case Column::ColumnFileName:
+                return QString(tr("Seed List File"));
+            case Column::ColumnProject:
+                return QString(tr("Project Source"));
+            case Column::ColumnFileModificationTime:
+                return QString(tr("Modification Time"));
+            default:
+                break;
+            }
+        }
+
+        return QVariant();
+    }
+
+    QVariant SeedListFileTableModel::data(const QModelIndex& index, int role) const
+    {
+        auto seedFileInfoOutcome = GetSeedFileInfo(index);
+        if (!seedFileInfoOutcome.IsSuccess())
+        {
+            return QVariant();
+        }
+
+        int col = index.column();
+        bool hasUnsavedChanges = seedFileInfoOutcome.GetValue()->m_seedListModel->HasUnsavedChanges();
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+            [[fallthrough]];
+        case SortRole:
+        {
+            if (col == Column::ColumnFileName)
+            {
+                QString displayName = seedFileInfoOutcome.GetValue()->m_fileName;
+                if (hasUnsavedChanges)
+                {
+                    displayName.append("*");
+                }
+                return displayName;
+            }
+            else if (col == Column::ColumnProject)
+            {
+                return seedFileInfoOutcome.GetValue()->m_project;
+            }
+            else if (col == Column::ColumnFileModificationTime)
+            {
+                if (role == SortRole)
+                {
+                    return seedFileInfoOutcome.GetValue()->m_fileModificationTime;
+                }
+                else
+                {
+                    return seedFileInfoOutcome.GetValue()->m_fileModificationTime.toString(DateTimeFormat);
+                }
+            }
+            else
+            {
+                // Returning an empty QString will ensure the checkboxes do not have any text displayed next to them
+                return QString();
+            }
+        }
+        case Qt::FontRole:
+        {
+            if (col == Column::ColumnFileName && hasUnsavedChanges)
+            {
+                QFont boldFont;
+                boldFont.setBold(true);
+                return boldFont;
+            }
+        }
+        case Qt::CheckStateRole:
+        {
+            if (col == Column::ColumnCheckBox)
+            {
+                if (seedFileInfoOutcome.GetValue()->m_isChecked)
+                {
+                    return Qt::Checked;
+                }
+                else
+                {
+                    return Qt::Unchecked;
+                }
+            }
+        }
+        default:
+            break;
+        }
+
+        return QVariant();
+    }
+
+    bool SeedListFileTableModel::setData(const QModelIndex& index, const QVariant& value, int role)
+    {
+        if (role != Qt::CheckStateRole || index.column() != Column::ColumnCheckBox)
+        {
+            return false;
+        }
+
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            return false;
+        }
+
+        auto seedFileInfo = m_seedListFileInfoMap.find(key);
+        if (seedFileInfo == m_seedListFileInfoMap.end())
+        {
+            return false;
+        }
+
+        if (value == Qt::CheckState::Unchecked)
+        {
+            seedFileInfo->second->m_isChecked = false;
+            m_checkedSeedListFiles.erase(key);
+
+            if (seedFileInfo->second->m_isDefaultSeedList)
+            {
+                m_seedTabWidget->UncheckSelectDefaultSeedListsCheckBox();
+            }
+        }
+        else
+        {
+            seedFileInfo->second->m_isChecked = true;
+            m_checkedSeedListFiles.insert(key);
+        }
+
+        m_seedTabWidget->SetGenerateAssetListsButtonEnabled(!m_checkedSeedListFiles.empty());
+
+        return true;
+    }
+
+    Qt::ItemFlags SeedListFileTableModel::flags(const QModelIndex& index) const
+    {
+        if (index.column() == Column::ColumnCheckBox)
+        {
+            return Qt::ItemIsUserCheckable | QAbstractTableModel::flags(index);
+        }
+
+        return QAbstractTableModel::flags(index);
+    }
+
+    AZ::Outcome<SeedListFileInfoPtr, void> SeedListFileTableModel::GetSeedFileInfo(const QModelIndex& index) const
+    {
+        AZStd::string key = GetFileKey(index);
+        if (key.empty())
+        {
+            // Error has already been thrown
+            return AZ::Failure();
+        }
+
+        if (m_seedListFileInfoMap.find(key) != m_seedListFileInfoMap.end())
+        {
+            return AZ::Success(m_seedListFileInfoMap.at(key));
+        }
+        else
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot find Seed File Info");
+            return AZ::Failure();
+        }
+    }
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.h b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.h
new file mode 100644
index 0000000000..3bd8fbd600
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.h
@@ -0,0 +1,134 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+
+#include <AzToolsFramework/Asset/AssetSeedManager.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QDateTime>
+#include <QSharedPointer>
+
+namespace AssetBundler
+{
+    class SeedListTableModel;
+
+    class SeedTabWidget;
+
+    struct SeedListFileInfo
+    {
+        /**
+        * Stores information about a Seed List File on disk.
+        *
+        * @param absolutePath The absolute path of the Seed List File
+        * @param fileName The name of the Seed List File. This does not include the ".seed" file extension
+        * @param project The area of the codebase the Seed List File is from (ex: ProjectName, Engine, Gem)
+        * @param loadFromFile Set to True if you wish to load an existing Seed List File into memory. Set to False if you are creating a new Seed List File.
+        */
+        SeedListFileInfo(
+            const AZStd::string& absolutePath,
+            const QString& fileName,
+            const QString& project,
+            bool loadFromFile,
+            bool isDefaultSeedList = false,
+            const AZStd::vector<AZStd::string>& defaultSeeds = AZStd::vector<AZStd::string>(),
+            const AzFramework::PlatformFlags& platforms = AzFramework::PlatformFlags::Platform_NONE);
+
+        bool SaveSeedFile();
+
+        bool HasUnsavedChanges();
+
+        AZStd::string m_absolutePath;
+        bool m_isChecked = false;
+        bool m_isDefaultSeedList = false;
+        QString m_fileName;
+        QString m_project;
+        QDateTime m_fileModificationTime;
+
+        QSharedPointer<SeedListTableModel> m_seedListModel;
+    };
+
+    using SeedListFileInfoPtr = AZStd::shared_ptr<SeedListFileInfo>;
+    /// Stores SeedListFileInfo, using the absolute path (without the drive letter) of the Seed List file as the key
+    using SeedListFileInfoMap = AZStd::unordered_map<AZStd::string, SeedListFileInfoPtr>;
+
+    class SeedListFileTableModel
+        : public AssetBundlerAbstractFileTableModel
+    {
+
+    public:
+        explicit SeedListFileTableModel(SeedTabWidget* parentSeedTabWidget);
+        virtual ~SeedListFileTableModel();
+
+        void AddDefaultSeedsToInMemoryList(const AZStd::vector<AZStd::string>& defaultSeeds, const char* projectName, const AzFramework::PlatformFlags& platforms);
+
+        AZStd::vector<AZStd::string> CreateNewFiles(const AZStd::string& absoluteFilePath, const AzFramework::PlatformFlags& platforms, const QString& project) override;
+
+        bool DeleteFile(const QModelIndex& index) override;
+
+        void Reload(const char* fileExtension, const QSet<QString>& watchedFolders, const QSet<QString>& watchedFiles = QSet<QString>(), const AZStd::unordered_map<AZStd::string, AZStd::string>& pathToProjectNameMap = AZStd::unordered_map<AZStd::string, AZStd::string>()) override;
+
+        void LoadFile(const AZStd::string& absoluteFilePath, const AZStd::string& projectName = "", bool isDefaultFile = false) override;
+
+        void SelectDefaultSeedLists(bool setSelected);
+
+        AZStd::vector<AZStd::string> GenerateAssetLists(const AZStd::string& absoluteFilePath, const AzFramework::PlatformFlags& platforms);
+
+        QSharedPointer<SeedListTableModel> GetSeedListFileContents(const QModelIndex& index);
+
+        bool SetSeedPlatforms(const QModelIndex& seedFileIndex, const QModelIndex& seedIndex, const AzFramework::PlatformFlags& platforms);
+
+        bool AddSeed(const QModelIndex& seedFileIndex, const AZStd::string& seedRelativePath, const AzFramework::PlatformFlags& platforms);
+
+        bool RemoveSeed(const QModelIndex& seedFileIndex, const QModelIndex& seedIndex);
+
+        bool WriteToDisk(const AZStd::string& key) override;
+
+        AZStd::string GetFileAbsolutePath(const QModelIndex& index) const override;
+
+        int GetFileNameColumnIndex() const override;
+
+        int GetTimeStampColumnIndex() const override;
+
+        //////////////////////////////////////////////////////////////////////////
+        // QAbstractListModel overrides
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::CheckStateRole) override;
+        Qt::ItemFlags flags(const QModelIndex& index) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+        enum Column
+        {
+            ColumnCheckBox,
+            ColumnFileName,
+            ColumnProject,
+            ColumnFileModificationTime,
+            Max
+        };
+
+    private:
+        AZ::Outcome<SeedListFileInfoPtr, void> GetSeedFileInfo(const QModelIndex& index) const;
+
+        SeedListFileInfoMap m_seedListFileInfoMap;
+        AZStd::unordered_set<AZStd::string> m_checkedSeedListFiles;
+
+        AZStd::string m_inMemoryDefaultSeedListKey = "InMemoryDefaultKey";
+        SeedListFileInfoPtr m_inMemoryDefaultSeedList;
+
+        SeedTabWidget* m_seedTabWidget = nullptr;
+    };
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/SeedListTableModel.cpp b/Code/Tools/AssetBundler/source/models/SeedListTableModel.cpp
new file mode 100644
index 0000000000..fc04686436
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/SeedListTableModel.cpp
@@ -0,0 +1,270 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/models/SeedListTableModel.h>
+
+#include <source/utils/utils.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h>
+
+#include <QFont>
+
+namespace AssetBundler
+{
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // AdditionalSeedInfo
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    AdditionalSeedInfo::AdditionalSeedInfo(const QString& relativePath, const QString& platformList)
+        : m_relativePath(relativePath)
+        , m_platformList(platformList)
+    {
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // SeedListTableModel
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    SeedListTableModel::SeedListTableModel(QObject* parent, const AZStd::string& absolutePath, const AZStd::vector<AZStd::string>& defaultSeeds, const AzFramework::PlatformFlags& platforms)
+        : QAbstractTableModel(parent)
+    {
+        m_seedListManager.reset(new AzToolsFramework::AssetSeedManager());
+
+        if (absolutePath.empty() && defaultSeeds.empty())
+        {
+            return;
+        }
+
+        if (!defaultSeeds.empty())
+        {
+            for (const AZStd::string& seed : defaultSeeds)
+            {
+                m_seedListManager->AddSeedAssetForValidPlatforms(seed, platforms);
+            }
+
+            m_isFileOnDisk = false;
+        }
+        else
+        {
+            m_seedListManager->Load(absolutePath);
+        }
+
+        AZ::Data::AssetInfo assetInfo;
+        QString platformList;
+        for (const auto& seed : m_seedListManager->GetAssetSeedList())
+        {
+            assetInfo = AzToolsFramework::AssetSeedManager::GetAssetInfoById(seed.m_assetId, AzFramework::PlatformHelper::GetPlatformIndicesInterpreted(seed.m_platformFlags)[0], absolutePath);
+            platformList = QString(m_seedListManager->GetReadablePlatformList(seed).c_str());
+
+            m_additionalSeedInfoMap[seed.m_assetId].reset(new AdditionalSeedInfo(assetInfo.m_relativePath.c_str(), platformList));
+        }
+    }
+
+    AZ::Outcome<AzFramework::PlatformFlags, void> SeedListTableModel::GetSeedPlatforms(const QModelIndex& index) const
+    {
+        auto seedOutcome = GetSeedInfo(index);
+        if (!seedOutcome.IsSuccess())
+        {
+            // Error has already been thrown
+            return AZ::Failure();
+        }
+
+        return AZ::Success(seedOutcome.GetValue().m_platformFlags);
+    }
+
+    bool SeedListTableModel::Save(const AZStd::string& absolutePath)
+    {
+        if (!HasUnsavedChanges())
+        {
+            // There are no changes, so there is nothing to save
+            return true;
+        }
+
+        SetHasUnsavedChanges(!m_seedListManager->Save(absolutePath));
+        return !HasUnsavedChanges();
+    }
+
+    bool SeedListTableModel::SetSeedPlatforms(const QModelIndex& index, const AzFramework::PlatformFlags& platforms)
+    {
+        auto seedOutcome = GetSeedInfo(index);
+        if (!seedOutcome.IsSuccess())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        if (platforms == AzFramework::PlatformFlags::Platform_NONE)
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot Edit Platforms: No platforms were selected");
+            return false;
+        }
+
+        auto setPlatformOutcome = m_seedListManager->SetSeedPlatformFlags(index.row(), platforms);
+        if (!setPlatformOutcome.IsSuccess())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, setPlatformOutcome.GetError().c_str());
+            return false;
+        }
+
+        // Update the cached display info
+        auto additionalSeedInfo = m_additionalSeedInfoMap.find(seedOutcome.GetValue().m_assetId);
+        if (additionalSeedInfo == m_additionalSeedInfoMap.end())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Unable to find additional Seed info");
+            return false;
+        }
+        additionalSeedInfo->second->m_platformList = QString(AzFramework::PlatformHelper::GetCommaSeparatedPlatformList(platforms).c_str());
+
+        SetHasUnsavedChanges(true);
+
+        // Update the display
+        QModelIndex firstChangedIndex = QAbstractTableModel::index(index.row(), Column::ColumnRelativePath);
+        QModelIndex lastChangedIndex = QAbstractTableModel::index(index.row(), Column::Max - 1);
+        emit dataChanged(firstChangedIndex, lastChangedIndex, { Qt::DisplayRole });
+
+        return true;
+    }
+
+    bool SeedListTableModel::AddSeed(const AZStd::string& seedRelativePath, const AzFramework::PlatformFlags& platforms)
+    {
+        AZStd::pair<AZ::Data::AssetId, AzFramework::PlatformFlags> addSeedsResult = m_seedListManager->AddSeedAssetForValidPlatforms(seedRelativePath, platforms);
+
+        if (!addSeedsResult.first.IsValid() || addSeedsResult.second == AzFramework::PlatformFlags::Platform_NONE)
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        QString platformList = QString(AzFramework::PlatformHelper::GetCommaSeparatedPlatformList(addSeedsResult.second).c_str());
+
+        int lastRowIndex = AZStd::max(rowCount() - 1, 0);
+        beginInsertRows(QModelIndex(), lastRowIndex, lastRowIndex);
+
+        m_additionalSeedInfoMap[addSeedsResult.first].reset(new AdditionalSeedInfo(QString(seedRelativePath.c_str()), platformList));
+
+        endInsertRows();
+
+        SetHasUnsavedChanges(true);
+        return true;
+    }
+
+    bool SeedListTableModel::RemoveSeed(const QModelIndex& seedIndex)
+    {
+        auto seedOutcome = GetSeedInfo(seedIndex);
+        if (!seedOutcome.IsSuccess())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        int row = seedIndex.row();
+        beginRemoveRows(QModelIndex(), row, row);
+        m_seedListManager->RemoveSeedAsset(seedOutcome.GetValue().m_assetId, seedOutcome.GetValue().m_platformFlags);
+        m_additionalSeedInfoMap.erase(seedOutcome.GetValue().m_assetId);
+        endRemoveRows();
+
+        SetHasUnsavedChanges(true);
+        return true;
+    }
+
+    int SeedListTableModel::rowCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : static_cast<int>(m_additionalSeedInfoMap.size());
+    }
+
+    int SeedListTableModel::columnCount(const QModelIndex& parent) const
+    {
+        return parent.isValid() ? 0 : Column::Max;
+    }
+
+    QVariant SeedListTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+    {
+        if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
+        {
+            switch (section)
+            {
+            case Column::ColumnRelativePath:
+                return QString("Seed");
+            case Column::ColumnPlatformList:
+                return QString("Platforms");
+            default:
+                break;
+            }
+        }
+
+        return QVariant();
+    }
+
+    QVariant SeedListTableModel::data(const QModelIndex& index, int role) const
+    {
+        auto additionalSeedInfoOutcome = GetAdditionalSeedInfo(index);
+        if (!additionalSeedInfoOutcome.IsSuccess())
+        {
+            return QVariant();
+        }
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+        {
+            if (index.column() == Column::ColumnRelativePath)
+            {
+                return additionalSeedInfoOutcome.GetValue()->m_relativePath;
+            }
+            else if (index.column() == Column::ColumnPlatformList)
+            {
+                return additionalSeedInfoOutcome.GetValue()->m_platformList;
+            }
+        }
+        default:
+            break;
+        }
+
+        return QVariant();
+    }
+
+    AZ::Outcome<AzFramework::SeedInfo&, void> SeedListTableModel::GetSeedInfo(const QModelIndex& index) const
+    {
+        int row = index.row();
+        int col = index.column();
+        if (row >= rowCount() || row < 0 || col >= columnCount() || col < 0)
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Selected index (%i, %i) is out of range", row, col);
+            return AZ::Failure();
+        }
+
+        return AZ::Success(m_seedListManager->GetAssetSeedList().at(row));
+    }
+
+    AZ::Outcome<AdditionalSeedInfoPtr, void> SeedListTableModel::GetAdditionalSeedInfo(const QModelIndex& index) const
+    {
+        auto seedInfoOutcome = GetSeedInfo(index);
+        if (!seedInfoOutcome.IsSuccess())
+        {
+            // Error has already been thrown
+            return AZ::Failure();
+        }
+
+        auto additionalSeedInfoIt = m_additionalSeedInfoMap.find(seedInfoOutcome.GetValue().m_assetId);
+        if (additionalSeedInfoIt == m_additionalSeedInfoMap.end())
+        {
+            return AZ::Failure();
+        }
+
+        return AZ::Success(additionalSeedInfoIt->second);
+    }
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/models/SeedListTableModel.h b/Code/Tools/AssetBundler/source/models/SeedListTableModel.h
new file mode 100644
index 0000000000..b8cbe95201
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/models/SeedListTableModel.h
@@ -0,0 +1,84 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+
+#include <AzToolsFramework/Asset/AssetSeedManager.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QSharedPointer>
+
+namespace AssetBundler
+{
+    struct AdditionalSeedInfo
+    {
+        AdditionalSeedInfo(const QString& relativePath, const QString& platformList);
+
+        QString m_relativePath;
+        QString m_platformList;
+    };
+
+    using AdditionalSeedInfoPtr = AZStd::shared_ptr<AdditionalSeedInfo>;
+    using AdditionalSeedInfoMap = AZStd::unordered_map<AZ::Data::AssetId, AdditionalSeedInfoPtr>;
+
+    class SeedListTableModel
+        : public QAbstractTableModel
+    {
+    public:
+        explicit SeedListTableModel(QObject* parent = nullptr, const AZStd::string& absolutePath = AZStd::string(), const AZStd::vector<AZStd::string>& defaultSeeds = AZStd::vector<AZStd::string>(), const AzFramework::PlatformFlags& platforms = AzFramework::PlatformFlags::Platform_NONE);
+        virtual ~SeedListTableModel() {}
+
+        AZStd::shared_ptr<AzToolsFramework::AssetSeedManager> GetSeedListManager() { return m_seedListManager; }
+
+        bool HasUnsavedChanges() { return m_hasUnsavedChanges && m_isFileOnDisk; }
+
+        void SetHasUnsavedChanges(bool hasUnsavedChanges) { m_hasUnsavedChanges = hasUnsavedChanges; }
+
+        bool Save(const AZStd::string& absolutePath);
+
+        AZ::Outcome<AzFramework::PlatformFlags, void> GetSeedPlatforms(const QModelIndex& index) const;
+
+        bool SetSeedPlatforms(const QModelIndex& index, const AzFramework::PlatformFlags& platforms);
+
+        bool AddSeed(const AZStd::string& seedRelativePath, const AzFramework::PlatformFlags& platforms);
+
+        bool RemoveSeed(const QModelIndex& seedIndex);
+
+        //////////////////////////////////////////////////////////////////////////
+        // QAbstractListModel overrides
+        int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+        int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+        QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+        enum Column
+        {
+            ColumnRelativePath,
+            ColumnPlatformList,
+            Max
+        };
+
+    private:
+        AZ::Outcome<AzFramework::SeedInfo&, void> GetSeedInfo(const QModelIndex& index) const;
+
+        AZ::Outcome<AdditionalSeedInfoPtr, void> GetAdditionalSeedInfo(const QModelIndex& index) const;
+
+        AZStd::shared_ptr<AzToolsFramework::AssetSeedManager> m_seedListManager;
+        AdditionalSeedInfoMap m_additionalSeedInfoMap;
+
+        bool m_hasUnsavedChanges = false;
+        bool m_isFileOnDisk = true;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/AddSeedDialog.cpp b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.cpp
new file mode 100644
index 0000000000..be156efde2
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.cpp
@@ -0,0 +1,96 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/AddSeedDialog.h>
+#include <source/ui/ui_AddSeedDialog.h>
+
+#include <source/ui/PlatformSelectionWidget.h>
+
+#include <QFileDialog>
+#include <QPushButton>
+
+const char QtRelativePathPrefix[] = "../";
+
+namespace AssetBundler
+{
+    AddSeedDialog::AddSeedDialog(QWidget* parent, const AzFramework::PlatformFlags& enabledPlatforms, const AZStd::string& platformSpecificCachePath)
+        : QDialog(parent)
+        , m_platformSpecificCachePath(platformSpecificCachePath.c_str())
+    {
+        m_ui.reset(new Ui::AddSeedDialog);
+        m_ui->setupUi(this);
+
+        // Set up Browse File button
+        m_ui->fileNameLineEdit->setReadOnly(true);
+        connect(m_ui->browseFileButton, &QPushButton::clicked, this, &AddSeedDialog::OnBrowseFileButtonPressed);
+
+        // Set up Platform selection
+        m_ui->platformSelectionWidget->Init(enabledPlatforms);
+        connect(m_ui->platformSelectionWidget, &PlatformSelectionWidget::PlatformsSelected, this, &AddSeedDialog::OnPlatformSelectionChanged);
+
+        // Set up Cancel and Create New File buttons
+        m_ui->addSeedButton->setEnabled(false);
+        connect(m_ui->cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+        connect(m_ui->addSeedButton, &QPushButton::clicked, this, &QDialog::accept);
+    }
+
+    AZStd::string AddSeedDialog::GetFileName()
+    {
+        return m_fileName;
+    }
+
+    AzFramework::PlatformFlags AddSeedDialog::GetPlatformFlags()
+    {
+        return m_ui->platformSelectionWidget->GetSelectedPlatforms();
+    }
+
+    void AddSeedDialog::OnBrowseFileButtonPressed()
+    {
+        QString seedAbsolutePath = QFileDialog::getOpenFileName(this, tr("Add New Seed"), m_platformSpecificCachePath);
+        m_fileNameIsValid = !seedAbsolutePath.isEmpty();
+        if (!m_fileNameIsValid)
+        {
+            // The user canceled out of the window, do not update anything
+            return;
+        }
+
+        // Make sure the path is relative to the platform-specific cache
+        QDir platformSpecificCacheDir(m_platformSpecificCachePath);
+        QString seedRelativePath = platformSpecificCacheDir.relativeFilePath(seedAbsolutePath);
+
+        // trim off the "../" from the relative path
+        FormatRelativePathString(seedRelativePath);
+        m_fileName = seedRelativePath.toUtf8().data();
+
+        // Update the ui
+        m_ui->fileNameLineEdit->setText(seedRelativePath);
+        m_ui->addSeedButton->setEnabled(m_platformIsValid && m_fileNameIsValid);
+    }
+
+    void AddSeedDialog::OnPlatformSelectionChanged(const AzFramework::PlatformFlags& selectedPlatforms)
+    {
+        // Hide the "Create File" button if no platforms are selected
+        m_platformIsValid = selectedPlatforms != AzFramework::PlatformFlags::Platform_NONE;
+        m_ui->addSeedButton->setEnabled(m_platformIsValid && m_fileNameIsValid);
+    }
+
+    void AddSeedDialog::FormatRelativePathString(QString& relativePath)
+    {
+        if (relativePath.startsWith(QtRelativePathPrefix))
+        {
+            relativePath.remove(0, static_cast<int>(strlen(QtRelativePathPrefix)));
+        }
+    }
+
+} //namespace AssetBundler
+
+#include <source/ui/moc_AddSeedDialog.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/AddSeedDialog.h b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.h
new file mode 100644
index 0000000000..fed6b031d1
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.h
@@ -0,0 +1,58 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/string/string.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QDialog>
+#include <QSharedPointer>
+#endif
+
+namespace Ui
+{
+    class AddSeedDialog;
+}
+
+namespace AssetBundler
+{
+    class GUIApplicationManager;
+
+    class AddSeedDialog
+        : public QDialog
+    {
+        Q_OBJECT
+
+    public:
+        explicit AddSeedDialog(QWidget* parent, const AzFramework::PlatformFlags& enabledPlatforms, const AZStd::string& platformSpecificCachePath);
+        virtual ~AddSeedDialog() {}
+
+        AZStd::string GetFileName();
+        AzFramework::PlatformFlags GetPlatformFlags();
+
+    private:
+        void OnBrowseFileButtonPressed();
+        void OnPlatformSelectionChanged(const AzFramework::PlatformFlags& selectedPlatforms);
+
+        void FormatRelativePathString(QString& relativePath);
+
+        QSharedPointer<Ui::AddSeedDialog> m_ui;
+        QString m_platformSpecificCachePath;
+        bool m_isAddSeedDialog = false;
+
+        AZStd::string m_fileName;
+
+        bool m_fileNameIsValid = false;
+        bool m_platformIsValid = false;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/AddSeedDialog.ui b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.ui
new file mode 100644
index 0000000000..e3c0f471aa
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.ui
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AddSeedDialog</class>
+ <widget class="QDialog" name="AddSeedDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>450</width>
+    <height>108</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>450</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Add Seed Asset</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_5">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="inputValuesFrame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="fileNameLabel">
+        <property name="text">
+         <string>Select Seed Asset:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLineEdit" name="fileNameLineEdit">
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="browseFileButton">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QFrame" name="lineFrame">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="Line" name="line">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="AssetBundler::PlatformSelectionWidget" name="platformSelectionWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="rightMargin">
+      <number>10</number>
+     </property>
+     <property name="bottomMargin">
+      <number>10</number>
+     </property>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+       <property name="default">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="addSeedButton">
+       <property name="text">
+        <string>Add Seed</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AssetBundler::PlatformSelectionWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">source/ui/PlatformSelectionWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.cpp
new file mode 100644
index 0000000000..9dcfd34c35
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.cpp
@@ -0,0 +1,366 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/AssetBundlerTabWidget.h>
+
+#include <source/utils/GUIApplicationManager.h>
+#include <source/utils/utils.h>
+
+#include <AzCore/Utils/Utils.h>
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzQtComponents/Utilities/DesktopUtilities.h>
+
+#include <QApplication>
+#include <QClipboard>
+#include <QHeaderView>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QMenu>
+#include <QMessageBox>
+
+namespace AssetBundler
+{
+    const char AssetBundlerCommonSettingsFile[] = "AssetBundlerCommonSettings.json";
+    const char AssetBundlerUserSettingsFile[] = "AssetBundlerUserSettings.json";
+
+    const char ScanPathsKey[] = "ScanPaths";
+
+    const QString AssetBundlingFileTypes[] =
+    {
+        "SeedLists",
+        "AssetLists",
+        "BundleSettings",
+        "Bundles",
+        "Rules"
+    };
+
+    const int MarginSize = 10;
+
+    AssetBundlerTabWidget::AssetBundlerTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager)
+        : QWidget(parent)
+        , m_guiApplicationManager(guiApplicationManager)
+    {
+        connect(m_guiApplicationManager, &GUIApplicationManager::UpdateTab, this, &AssetBundlerTabWidget::OnUpdateTab);
+        connect(m_guiApplicationManager, &GUIApplicationManager::UpdateFiles, this, &AssetBundlerTabWidget::OnUpdateFiles);
+
+        QAction* deleteFileAction = new QAction(tr("Delete"), this);
+        addAction(deleteFileAction);
+        deleteFileAction->setShortcut(QKeySequence::Delete);
+        connect(deleteFileAction, &QAction::triggered, this, &AssetBundlerTabWidget::OnDeleteSelectedFileRequested);
+    }
+
+    AssetBundlerTabWidget::~AssetBundlerTabWidget()
+    {
+        m_guiApplicationManager = nullptr;
+    }
+
+    void AssetBundlerTabWidget::Activate()
+    {
+        SetActiveProjectLabel(tr("Active Project: %1").arg(m_guiApplicationManager->GetCurrentProjectName().c_str()));
+
+        SetupContextMenu();
+        Reload();
+
+        connect(GetFileTableView()->header(), &QHeaderView::sortIndicatorChanged, m_fileTableFilterModel.get(), &AssetBundlerFileTableFilterModel::sort);
+        GetFileTableView()->header()->setSortIndicatorShown(true);
+        // Setting this in descending order will ensure the most recent files are at the top
+        GetFileTableView()->header()->setSortIndicator(GetFileTableModel()->GetTimeStampColumnIndex(), Qt::DescendingOrder);
+        GetFileTableView()->setSortingEnabled(true);
+    }
+
+    void AssetBundlerTabWidget::InitAssetBundlerSettings(const char* currentProjectFolderPath)
+    {
+        AZStd::string commonSettingsPath = GetAssetBundlerCommonSettingsFile(currentProjectFolderPath);
+        if (!AZ::IO::FileIOBase::GetInstance()->Exists(commonSettingsPath.c_str()))
+        {
+            CreateEmptyAssetBundlerSettings(commonSettingsPath);
+        }
+
+        AZStd::string userSettingsPath = GetAssetBundlerUserSettingsFile(currentProjectFolderPath);
+        if (!AZ::IO::FileIOBase::GetInstance()->Exists(userSettingsPath.c_str()))
+        {
+            CreateEmptyAssetBundlerSettings(userSettingsPath);
+        }
+    }
+
+    void AssetBundlerTabWidget::OnFileTableContextMenuRequested(const QPoint& pos)
+    {
+        AZStd::string selectedFileAbsolutePath(GetFileTableModel()->GetFileAbsolutePath(GetSelectedFileTableIndex()));
+
+        QMenu* contextMenu = new QMenu(this);
+        contextMenu->setToolTipsVisible(true);
+
+        bool arePathOperationsEnabled = !selectedFileAbsolutePath.empty();
+        QString emptyPathToolTip(tr("This file is not present on-disk."));
+
+        QAction* action = contextMenu->addAction(AzQtComponents::fileBrowserActionName(), [=]()
+            {
+                AzQtComponents::ShowFileOnDesktop(selectedFileAbsolutePath.c_str());
+            });
+        if (arePathOperationsEnabled)
+        {
+            action->setToolTip(tr("Shows the location of this file on your computer"));
+        }
+        else
+        {
+            action->setToolTip(emptyPathToolTip);
+            action->setEnabled(false);
+        }
+
+        action = contextMenu->addAction(tr("Copy Path to Clipboard"), [=]()
+            {
+                QApplication::clipboard()->setText(QString(selectedFileAbsolutePath.c_str()));
+            });
+        if (arePathOperationsEnabled)
+        {
+            action->setToolTip(tr("Copies the absolute path of this file to your Clipboard"));
+        }
+        else
+        {
+            action->setToolTip(emptyPathToolTip);
+            action->setEnabled(false);
+        }
+
+        contextMenu->addSeparator();
+
+        // We can't use the same Delete action as the constructor because we need to modify a lot of values
+        action = new QAction(tr("Delete"), this);
+        action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        action->setShortcut(QKeySequence::Delete);
+        connect(action, &QAction::triggered, this, &AssetBundlerTabWidget::OnDeleteSelectedFileRequested);
+        if (arePathOperationsEnabled)
+        {
+            action->setToolTip(tr("Deletes the selected file from disk."));
+        }
+        else
+        {
+            action->setToolTip(emptyPathToolTip);
+            action->setEnabled(false);
+        }
+        contextMenu->addAction(action);
+
+        contextMenu->exec(GetFileTableView()->mapToGlobal(pos));
+        delete contextMenu;
+    }
+
+    void AssetBundlerTabWidget::OnDeleteSelectedFileRequested()
+    {
+        AZStd::string selectedFileAbsolutePath(GetFileTableModel()->GetFileAbsolutePath(GetSelectedFileTableIndex()));
+        if (selectedFileAbsolutePath.empty())
+        {
+            return;
+        }
+
+        QString messageBoxText = QString(tr("Are you sure you would like to delete %1? \n\nThis will permanently delete the file.")).arg(QString(selectedFileAbsolutePath.c_str()));
+
+        QMessageBox::StandardButton confirmDeleteFileResult = QMessageBox::question(this, QString(tr("Delete %1")).arg(GetFileTypeDisplayName()), messageBoxText);
+        if (confirmDeleteFileResult != QMessageBox::StandardButton::Yes)
+        {
+            // User canceled out of the confirmation dialog
+            return;
+        }
+
+        if (GetFileTableModel()->DeleteFile(GetSelectedFileTableIndex()))
+        {
+            RemoveScanPathFromAssetBundlerSettings(GetFileType(), selectedFileAbsolutePath.c_str());
+        }
+    }
+
+    void AssetBundlerTabWidget::ReadScanPathsFromAssetBundlerSettings(AssetBundlingFileType fileType)
+    {
+        AZStd::string currentProjectFolderPath = m_guiApplicationManager->GetCurrentProjectFolder();
+        ReadAssetBundlerSettings(GetAssetBundlerUserSettingsFile(currentProjectFolderPath.c_str()), fileType);
+        ReadAssetBundlerSettings(GetAssetBundlerCommonSettingsFile(currentProjectFolderPath.c_str()), fileType);
+    }
+
+    void AssetBundlerTabWidget::AddScanPathToAssetBundlerSettings(AssetBundlingFileType fileType, AZStd::string filePath)
+    {
+        AZStd::string defaultFolderPath;
+        switch (fileType)
+        {
+        case AssetBundlingFileType::SeedListFileType:
+            defaultFolderPath = m_guiApplicationManager->GetSeedListsFolder();
+            break;
+        case AssetBundlingFileType::AssetListFileType:
+            defaultFolderPath = m_guiApplicationManager->GetAssetListsFolder();
+            break;
+        case AssetBundlingFileType::RulesFileType:
+            defaultFolderPath = m_guiApplicationManager->GetRulesFolder();
+            break;
+        case AssetBundlingFileType::BundleSettingsFileType:
+            defaultFolderPath = m_guiApplicationManager->GetBundleSettingsFolder();
+            break;
+        case AssetBundlingFileType::BundleFileType:
+            defaultFolderPath = m_guiApplicationManager->GetBundlesFolder();
+            break;
+        default:
+            AZ_Warning(AssetBundler::AppWindowName, false, "No default folder is defined for AssetBundlingFileType ( %i ).", static_cast<int>(fileType));
+            break;
+        }
+
+        AzFramework::StringFunc::Path::Normalize(filePath);
+        AzFramework::StringFunc::Path::Normalize(defaultFolderPath);
+
+        if (AzFramework::StringFunc::StartsWith(filePath, defaultFolderPath))
+        {
+            // file is already in a watched folder, no need to add it to the settings file
+            return;
+        }
+
+        AddScanPathToAssetBundlerSettings(fileType, QString(filePath.c_str()));
+    }
+
+    void AssetBundlerTabWidget::AddScanPathToAssetBundlerSettings(AssetBundlingFileType fileType, const QString& filePath)
+    {
+        AZStd::string assetBundlerSettingsFileAbsolutePath = GetAssetBundlerUserSettingsFile(m_guiApplicationManager->GetCurrentProjectFolder().c_str());
+        QJsonObject assetBundlerSettings = AssetBundler::ReadJson(assetBundlerSettingsFileAbsolutePath);
+        QJsonObject scanPathsSettings = assetBundlerSettings[ScanPathsKey].toObject();
+        QJsonArray scanPaths = scanPathsSettings[AssetBundlingFileTypes[fileType]].toArray();
+
+        QFileInfo inputFileInfo(filePath);
+
+        for (const QJsonValue scanPath : m_watchedFiles + m_watchedFolders)
+        {
+            auto scanFilePathStr = (AZ::IO::Path(AZStd::string_view{ AZ::Utils::GetEnginePath() })
+                / scanPath.toString().toUtf8().data()).LexicallyNormal();
+
+            // Check whether the file has already been watched
+            // Get absolute file paths via QFileInfo to keep consistency in the letter case
+            if (inputFileInfo.absoluteFilePath().startsWith(
+                QFileInfo(scanFilePathStr.c_str()).absoluteFilePath()))
+            {
+                return;
+            }
+        }
+
+        scanPaths.push_back(filePath);
+        scanPathsSettings[AssetBundlingFileTypes[fileType]] = scanPaths;
+        assetBundlerSettings[ScanPathsKey] = scanPathsSettings;
+        AssetBundler::SaveJson(assetBundlerSettingsFileAbsolutePath, assetBundlerSettings);
+
+        m_watchedFiles.insert(filePath);
+        m_guiApplicationManager->AddWatchedPath(filePath);
+    }
+
+    void AssetBundlerTabWidget::RemoveScanPathFromAssetBundlerSettings(AssetBundlingFileType fileType, const QString& filePath)
+    {
+        AZStd::string assetBundlerSettingsFileAbsolutePath = GetAssetBundlerUserSettingsFile(m_guiApplicationManager->GetCurrentProjectFolder().c_str());
+        QJsonObject assetBundlerSettings = AssetBundler::ReadJson(assetBundlerSettingsFileAbsolutePath);
+        QJsonObject scanPathsSettings = assetBundlerSettings[ScanPathsKey].toObject();
+        QJsonArray scanPaths = scanPathsSettings[AssetBundlingFileTypes[fileType]].toArray();
+
+        for (auto itr = scanPaths.begin(); itr != scanPaths.end(); ++itr)
+        {
+            QJsonValueRef scanPathValueRef = *itr;
+            auto scanPath = (AZ::IO::Path(AZStd::string_view{ AZ::Utils::GetEnginePath() })
+                / scanPathValueRef.toString().toUtf8().data()).LexicallyNormal();
+
+            // Check whether the file is being watched
+            // Get absolute file paths via QFileInfo to keep consistency in the letter case
+            if (QFileInfo(filePath).absoluteFilePath() == QFileInfo(scanPath.c_str()).absoluteFilePath())
+            {
+                itr = scanPaths.erase(itr);
+                break;
+            }
+        }
+
+        scanPathsSettings[AssetBundlingFileTypes[fileType]] = scanPaths;
+        assetBundlerSettings[ScanPathsKey] = scanPathsSettings;
+        AssetBundler::SaveJson(assetBundlerSettingsFileAbsolutePath, assetBundlerSettings);
+
+        m_guiApplicationManager->RemoveWatchedPath(filePath);
+    }
+
+    void AssetBundlerTabWidget::OnUpdateTab(const AZStd::string& path)
+    {
+        if (m_watchedFolders.contains(path.c_str()) ||
+            m_watchedFiles.contains(path.c_str()))
+        {
+            Reload();
+        }
+    }
+
+    void AssetBundlerTabWidget::OnUpdateFiles(AssetBundlingFileType fileType, const AZStd::vector<AZStd::string>& absoluteFilePaths)
+    {
+        if (fileType == GetFileType())
+        {
+            GetFileTableModel()->ReloadFiles(absoluteFilePaths, m_filePathToGemNameMap);
+            m_fileTableFilterModel->sort(m_fileTableFilterModel->sortColumn(), m_fileTableFilterModel->sortOrder());
+            FileSelectionChanged();
+        }
+    }
+
+    void AssetBundlerTabWidget::SetupContextMenu()
+    {
+        GetFileTableView()->setContextMenuPolicy(Qt::CustomContextMenu);
+        connect(GetFileTableView(), &QTreeView::customContextMenuRequested, this, &AssetBundlerTabWidget::OnFileTableContextMenuRequested);
+    }
+
+    void AssetBundlerTabWidget::ReadAssetBundlerSettings(const AZStd::string& filePath, AssetBundlingFileType fileType)
+    {
+        // Read the config file which contains the customized scan paths information
+        AZStd::vector<AZStd::string> assetBundlerSettingsFileList;
+        QJsonObject assetBundlerSettings = AssetBundler::ReadJson(filePath);
+        QJsonObject scanPaths = assetBundlerSettings.find(ScanPathsKey).value().toObject();
+
+        for (const QJsonValue scanPath : scanPaths[AssetBundlingFileTypes[fileType]].toArray())
+        {
+            auto absoluteScanPath = (AZ::IO::Path(AZStd::string_view{ AZ::Utils::GetEnginePath() })
+                / scanPath.toString().toUtf8().data()).LexicallyNormal();
+
+            if (AZ::IO::FileIOBase::GetInstance()->IsDirectory(absoluteScanPath.c_str()))
+            {
+                // The path specified in the config file is a directory
+                m_watchedFolders.insert(absoluteScanPath.c_str());
+            }
+            else if (AZ::IO::FileIOBase::GetInstance()->Exists(absoluteScanPath.c_str()))
+            {
+                // The path specified in the config file is a file
+                m_watchedFiles.insert(absoluteScanPath.c_str());
+            }
+        }
+    }
+
+    AZStd::string AssetBundlerTabWidget::GetAssetBundlerUserSettingsFile(const char* currentProjectFolderPath)
+    {
+        AZStd::string absoluteFilePath;
+        AzFramework::StringFunc::Path::ConstructFull(currentProjectFolderPath, AssetBundlerUserSettingsFile, absoluteFilePath);
+        return absoluteFilePath;
+    }
+
+    AZStd::string AssetBundlerTabWidget::GetAssetBundlerCommonSettingsFile(const char* currentProjectFolderPath)
+    {
+        AZStd::string absoluteFilePath;
+        AzFramework::StringFunc::Path::ConstructFull(currentProjectFolderPath, AssetBundlerCommonSettingsFile, absoluteFilePath);
+        return absoluteFilePath;
+    }
+
+    void AssetBundlerTabWidget::CreateEmptyAssetBundlerSettings(const AZStd::string& filePath)
+    {
+        QJsonObject assetBundlerSettings;
+        QJsonObject scanPathSettings;
+
+        for (const auto& fileType : AssetBundlingFileTypes)
+        {
+            scanPathSettings.insert(fileType, QJsonArray());
+        }
+
+        assetBundlerSettings.insert(ScanPathsKey, scanPathSettings);
+
+        AssetBundler::SaveJson(filePath, assetBundlerSettings);
+    }
+
+} // namespace AssetBundler
+#include <source/ui/moc_AssetBundlerTabWidget.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.h b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.h
new file mode 100644
index 0000000000..edef5c0437
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.h
@@ -0,0 +1,118 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <source/models/AssetBundlerAbstractFileTableModel.h>
+#include <source/models/AssetBundlerFileTableFilterModel.h>
+
+#include <source/utils/GUIApplicationManager.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/string/string.h>
+#include <AzQtComponents/Components/Widgets/TableView.h>
+
+#include <QLabel>
+#include <QWidget>
+#include <QItemSelection>
+#endif
+
+namespace AssetBundler
+{
+    // Keys for the corresponding scan path lists in the asset bundling settings file
+    extern const QString AssetBundlingFileTypes[];
+
+    extern const int MarginSize;
+
+    class AssetBundlerTabWidget
+        : public QWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit AssetBundlerTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager);
+        virtual ~AssetBundlerTabWidget();
+
+        void Activate();
+
+        virtual QString GetTabTitle() = 0;
+
+        virtual QString GetFileTypeDisplayName() = 0;
+
+        virtual AssetBundlingFileType GetFileType() = 0;
+
+        virtual bool HasUnsavedChanges() = 0;
+
+        //! Reload all the files on display.
+        virtual void Reload() = 0;
+
+        //! Saves the selected file to disk.
+        //! @return true on successful save, or throws an error message and returns false on a failed save.
+        virtual bool SaveCurrentSelection() = 0;
+
+        //! Saves all modified files to disk.
+        //! @return true on successful save, or throws an error message and returns false on a failed save.
+        virtual bool SaveAll() = 0;
+
+        //! Set watched folders and files for the model
+        virtual void SetModelDataSource() = 0;
+
+        virtual AzQtComponents::TableView* GetFileTableView() = 0;
+
+        virtual QModelIndex GetSelectedFileTableIndex() = 0;
+
+        virtual AssetBundlerAbstractFileTableModel* GetFileTableModel() = 0;
+
+        virtual void SetActiveProjectLabel(const QString& labelText) = 0;
+
+        virtual void ApplyConfig() = 0;
+
+        virtual void FileSelectionChanged(const QItemSelection& /*selected*/ = QItemSelection(), const QItemSelection& /*deselected*/ = QItemSelection()) = 0;
+
+        static void InitAssetBundlerSettings(const char* currentProjectFolderPath);
+
+        void AddScanPathToAssetBundlerSettings(AssetBundlingFileType fileType, AZStd::string filePath);
+
+        GUIApplicationManager* GetGUIApplicationManager() { return m_guiApplicationManager; }
+
+    protected:
+        void OnFileTableContextMenuRequested(const QPoint& pos);
+        //! Asks the user to confirm they wish to permanently delete the selected file, then removes it from disk and memory.
+        void OnDeleteSelectedFileRequested();
+        bool ConfirmFileDeleteDialog(const QString& absoluteFilePath);
+        void ReadScanPathsFromAssetBundlerSettings(AssetBundlingFileType fileType);
+        void RemoveScanPathFromAssetBundlerSettings(AssetBundlingFileType fileType, const QString& filePath);
+
+        GUIApplicationManager* m_guiApplicationManager = nullptr;
+        QScopedPointer<AssetBundler::AssetBundlerFileTableFilterModel> m_fileTableFilterModel;
+
+        QSet<QString> m_watchedFolders;
+        QSet<QString> m_watchedFiles;
+        AZStd::unordered_map<AZStd::string, AZStd::string> m_filePathToGemNameMap;
+
+    private slots:
+        void OnUpdateTab(const AZStd::string& path);
+        void OnUpdateFiles(AssetBundlingFileType fileType, const AZStd::vector<AZStd::string>& absoluteFilePaths);
+
+    private:
+        void SetupContextMenu();
+        void AddScanPathToAssetBundlerSettings(AssetBundlingFileType fileType, const QString& filePath);
+        void ReadAssetBundlerSettings(const AZStd::string& filePath, AssetBundlingFileType fileType);
+
+        static AZStd::string GetAssetBundlerUserSettingsFile(const char* currentProjectFolderPath);
+        static AZStd::string GetAssetBundlerCommonSettingsFile(const char* currentProjectFolderPath);
+        static void CreateEmptyAssetBundlerSettings(const AZStd::string& filePath);
+    };
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.cpp
new file mode 100644
index 0000000000..339dc080fa
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.cpp
@@ -0,0 +1,182 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/AssetListTabWidget.h>
+#include <source/ui/ui_AssetListTabWidget.h>
+
+#include <source/utils/GUIApplicationManager.h>
+#include <source/ui/GenerateBundlesModal.h>
+#include <source/ui/NewFileDialog.h>
+#include <source/models/AssetListFileTableModel.h>
+#include <source/models/AssetListTableModel.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzQtComponents/Components/FilteredSearchWidget.h>
+#include <AzQtComponents/Components/Widgets/TableView.h>
+#include <AzToolsFramework/Asset/AssetSeedManager.h>
+#include <AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h>
+
+#include <QItemSelection>
+#include <QItemSelectionRange>
+#include <QMessageBox>
+#include <QPushButton>
+
+namespace AssetBundler
+{
+    AssetListTabWidget::AssetListTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager)
+        : AssetBundlerTabWidget(parent, guiApplicationManager)
+        , m_fileTableModel(new AssetListFileTableModel())
+        , m_assetListContentsModel(new AssetListTableModel())
+    {
+        m_ui.reset(new Ui::AssetListTabWidget);
+        m_ui->setupUi(this);
+
+        m_ui->mainVerticalLayout->setContentsMargins(10, 10, 10, 10);
+
+        // File view of all Asset List Files
+        m_fileTableFilterModel.reset(new AssetBundlerFileTableFilterModel(this, m_fileTableModel->GetFileNameColumnIndex(), m_fileTableModel->GetTimeStampColumnIndex()));
+
+        m_fileTableFilterModel->setSourceModel(m_fileTableModel.data());
+        m_ui->assetListsTable->setModel(m_fileTableFilterModel.data());
+        connect(m_ui->fileFilteredSearchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged,
+            m_fileTableFilterModel.data(), static_cast<void (QSortFilterProxyModel::*)(const QString&)>(&AssetBundlerFileTableFilterModel::FilterChanged));
+
+        connect(m_ui->assetListsTable->selectionModel(), &QItemSelectionModel::selectionChanged, this, &AssetListTabWidget::FileSelectionChanged);
+
+        m_ui->fileTableHeaderLayout->setContentsMargins(0, 0, 0, 0);
+        m_ui->fileTableVerticalLayout->setContentsMargins(0, 0, 0, 0);
+        m_ui->assetListsTable->setIndentation(0);
+
+        // Generate Bundle Button
+        m_ui->generateBundleButton->setDefault(true);
+        m_ui->generateBundleButton->setEnabled(false);
+        connect(m_ui->generateBundleButton, &QPushButton::clicked, this, &AssetListTabWidget::OnGenerateBundleButtonPressed);
+
+        // Absolute path of selected Asset List file
+        m_ui->assetListFileAbsolutePathLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+        // Table that displays the contents of an Asset List File
+        m_assetListContentsFilterModel.reset(new AssetBundlerFileTableFilterModel(this, AssetListTableModel::Column::ColumnAssetName));
+
+        m_assetListContentsFilterModel->setSourceModel(m_assetListContentsModel.data());
+        m_ui->assetListContentsTable->setModel(m_assetListContentsFilterModel.data());
+        connect(m_ui->assetListContentsFilteredSearchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged,
+            m_assetListContentsFilterModel.data(), static_cast<void (QSortFilterProxyModel::*)(const QString&)>(&AssetBundlerFileTableFilterModel::FilterChanged));
+
+
+        m_ui->fileContentsHeaderLayout->setContentsMargins(0, 0, 0, 0);
+        m_ui->fileContentsVerticalLayout->setContentsMargins(0, 0, 0, 0);
+        m_ui->assetListContentsTable->setIndentation(0);
+
+        SetModelDataSource();
+    }
+
+    void AssetListTabWidget::SetModelDataSource()
+    {
+        // Remove the current watched folders and files
+        m_guiApplicationManager->RemoveWatchedPaths(m_watchedFolders + m_watchedFiles);
+
+        // Set the new watched folder for the model
+        m_watchedFolders.clear();
+        m_watchedFiles.clear();
+        m_watchedFolders.insert(m_guiApplicationManager->GetAssetListsFolder().c_str());
+        ReadScanPathsFromAssetBundlerSettings(AssetBundlingFileType::AssetListFileType);
+
+        m_guiApplicationManager->AddWatchedPaths(m_watchedFolders + m_watchedFiles);
+    }
+
+    AzQtComponents::TableView* AssetListTabWidget::GetFileTableView()
+    {
+        return m_ui->assetListsTable;
+    }
+
+    QModelIndex AssetListTabWidget::GetSelectedFileTableIndex()
+    {
+        return m_selectedFileTableIndex;
+    }
+
+    AssetBundlerAbstractFileTableModel* AssetListTabWidget::GetFileTableModel()
+    {
+        return m_fileTableModel.get();
+    }
+
+    void AssetListTabWidget::SetActiveProjectLabel(const QString& labelText)
+    {
+        m_ui->activeProjectLabel->setText(labelText);
+    }
+
+    void AssetListTabWidget::ApplyConfig()
+    {
+        const GUIApplicationManager::Config& config = m_guiApplicationManager->GetConfig();
+
+        m_ui->fileTableFrame->setFixedWidth(config.fileTableWidth);
+
+        m_ui->assetListsTable->header()->resizeSection(AssetListFileTableModel::Column::ColumnFileName, config.assetListFileNameColumnWidth);
+        m_ui->assetListsTable->header()->resizeSection(AssetListFileTableModel::Column::ColumnPlatform, config.assetListPlatformColumnWidth);
+
+        m_ui->assetListContentsFilteredSearchWidget->setFixedWidth(config.fileTableWidth);
+
+        m_ui->assetListContentsTable->header()->resizeSection(AssetListTableModel::Column::ColumnAssetName, config.productAssetNameColumnWidth);
+        m_ui->assetListContentsTable->header()->resizeSection(AssetListTableModel::Column::ColumnRelativePath, config.productAssetRelativePathColumnWidth);
+    }
+
+
+    void AssetListTabWidget::Reload()
+    {
+        // Reload all the asset list files
+        m_fileTableModel->Reload(AzToolsFramework::AssetSeedManager::GetAssetListFileExtension(), m_watchedFolders, m_watchedFiles);
+
+        // Update the selected row
+        FileSelectionChanged();
+    }
+
+    void AssetListTabWidget::FileSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
+    {
+        AZ_UNUSED(selected);
+        AZ_UNUSED(deselected);
+
+        if (m_ui->assetListsTable->selectionModel()->selectedRows().size() == 0)
+        {
+            // Set selected index to an invalid value
+            m_selectedFileTableIndex = QModelIndex();
+            m_ui->assetListFileAbsolutePathLabel->setText("");
+            m_assetListContentsModel.reset(new AssetListTableModel());
+            m_assetListContentsFilterModel->setSourceModel(m_assetListContentsModel.data());
+            m_ui->generateBundleButton->setEnabled(false);
+
+            return;
+        }
+
+        m_selectedFileTableIndex = m_fileTableFilterModel->mapToSource(m_ui->assetListsTable->selectionModel()->currentIndex());
+
+        m_ui->assetListFileAbsolutePathLabel->setText(QString(m_fileTableModel->GetFileAbsolutePath(m_selectedFileTableIndex).c_str()));
+
+        m_assetListContentsModel = m_fileTableModel->GetAssetListFileContents(m_selectedFileTableIndex);
+        m_assetListContentsFilterModel->setSourceModel(m_assetListContentsModel.data());
+
+        m_ui->generateBundleButton->setEnabled(true);
+    }
+
+    void AssetListTabWidget::OnGenerateBundleButtonPressed()
+    {
+        GenerateBundlesModal generateBundlesModal(
+            this,
+            m_fileTableModel->GetFileAbsolutePath(m_selectedFileTableIndex),
+            m_guiApplicationManager->GetBundlesFolder(),
+            m_guiApplicationManager->GetBundleSettingsFolder(),
+            this);
+        generateBundlesModal.exec();
+    }
+} //namespace AssetBundler
+
+#include <source/ui/moc_AssetListTabWidget.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.h b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.h
new file mode 100644
index 0000000000..890f45a0c9
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.h
@@ -0,0 +1,82 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <source/ui/AssetBundlerTabWidget.h>
+
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QDir>
+#include <QItemSelectionModel>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class AssetListTabWidget;
+}
+
+class QFileSystemModel;
+class QStringListModel;
+
+namespace AssetBundler
+{
+    class GUIApplicationManager;
+
+    class AssetListFileTableModel;
+    class AssetListTableModel;
+
+    class AssetListTabWidget
+        : public AssetBundlerTabWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit AssetListTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager);
+        virtual ~AssetListTabWidget() {}
+
+        //////////////////////////////////////////////////////////////////////////
+        // AssetBundlerTabWidget overrides
+        QString GetTabTitle() override { return tr("Asset Lists"); }
+        QString GetFileTypeDisplayName() override { return tr("Asset List file"); }
+        AssetBundlingFileType GetFileType() override { return AssetBundlingFileType::AssetListFileType; }
+        bool HasUnsavedChanges() override { return false; };
+        void Reload() override;
+        bool SaveCurrentSelection() override { return true; };
+        bool SaveAll() override { return true; };
+        void SetModelDataSource() override;
+        AzQtComponents::TableView* GetFileTableView() override;
+        QModelIndex GetSelectedFileTableIndex() override;
+        AssetBundlerAbstractFileTableModel* GetFileTableModel() override;
+        void SetActiveProjectLabel(const QString& labelText) override;
+        void ApplyConfig() override;
+        void FileSelectionChanged(const QItemSelection& /*selected*/ = QItemSelection(), const QItemSelection& /*deselected*/ = QItemSelection()) override;
+        //////////////////////////////////////////////////////////////////////////
+
+    private:
+        void OnGenerateBundleButtonPressed();
+
+        QSharedPointer<Ui::AssetListTabWidget> m_ui;
+
+        QSharedPointer<AssetListFileTableModel> m_fileTableModel;
+        QModelIndex m_selectedFileTableIndex;
+
+        QSharedPointer<AssetBundler::AssetBundlerFileTableFilterModel> m_assetListContentsFilterModel;
+        QSharedPointer<AssetListTableModel> m_assetListContentsModel;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.ui b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.ui
new file mode 100644
index 0000000000..a5bdea227b
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.ui
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AssetListTabWidget</class>
+ <widget class="QWidget" name="AssetListTabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>813</width>
+    <height>673</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Asset List Tab Widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="mainVerticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="projectLabelHorizontalLayout">
+     <item>
+      <widget class="QLabel" name="activeProjectLabel"/>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="generateBundleButton">
+       <property name="text">
+        <string>Generate Bundle</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0">
+     <item>
+      <widget class="QFrame" name="fileTableFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="fileTableVerticalLayout">
+        <item>
+         <widget class="QFrame" name="fileTableHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QVBoxLayout" name="fileTableHeaderLayout">
+           <item>
+            <widget class="QLabel" name="assetListFilesLabel">
+             <property name="text">
+              <string>Asset List Files</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::FilteredSearchWidget" name="fileFilteredSearchWidget">
+          <property name="placeholderText" stdset="0">
+           <string>Filter by file name</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::TableView" name="assetListsTable"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="fileContentsFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="fileContentsVerticalLayout">
+        <item>
+         <widget class="QFrame" name="fileContentsHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QHBoxLayout" name="fileContentsHeaderLayout">
+           <item>
+            <widget class="QLabel" name="assetListContentsLabel">
+             <property name="text">
+              <string>Asset List</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="assetListFileAbsolutePathLabel">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::FilteredSearchWidget" name="assetListContentsFilteredSearchWidget">
+          <property name="placeholderText" stdset="0">
+           <string>Filter by file name</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::TableView" name="assetListContentsTable"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AzQtComponents::TableView</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/Widgets/TableView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>AzQtComponents::FilteredSearchWidget</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/FilteredSearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.cpp
new file mode 100644
index 0000000000..b670fd0ebd
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.cpp
@@ -0,0 +1,159 @@
+/*
+* All or portions of this file Copyright(c) Amazon.com, Inc. or its affiliates or
+*its licensors.
+*
+* For complete copyrightand license terms please see the LICENSE at the root of this
+* distribution(the "License").All use of this software is governed by the License,
+* or , if provided, by the license below or the license accompanying this file.Do not
+*remove or modify any license notices.This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#include <source/ui/BundleListTabWidget.h>
+#include <source/ui/ui_BundleListTabWidget.h>
+
+#include <source/models/BundleFileListModel.h>
+#include <source/utils/GUIApplicationManager.h>
+
+#include <AzQtComponents/Components/FilteredSearchWidget.h>
+
+#include <QFileDialog>
+#include <QItemSelectionModel>
+
+const double BytesToMegabytes = 1024.0 * 1024.0;
+
+namespace AssetBundler
+{
+
+    BundleListTabWidget::BundleListTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager)
+        : AssetBundlerTabWidget(parent, guiApplicationManager)
+    {
+        m_ui.reset(new Ui::BundleListTabWidget);
+        m_ui->setupUi(this);
+
+        m_ui->mainVerticalLayout->setContentsMargins(MarginSize, MarginSize, MarginSize, MarginSize);
+
+        m_fileTableModel.reset(new BundleFileListModel);
+        m_fileTableFilterModel.reset(new AssetBundlerFileTableFilterModel(this, m_fileTableModel->GetFileNameColumnIndex(), m_fileTableModel->GetTimeStampColumnIndex()));
+
+        m_fileTableFilterModel->setSourceModel(m_fileTableModel.data());
+        m_ui->fileTableView->setModel(m_fileTableFilterModel.data());
+        connect(m_ui->fileFilteredSearchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged,
+            m_fileTableFilterModel.data(), static_cast<void (QSortFilterProxyModel::*)(const QString&)>(&AssetBundlerFileTableFilterModel::FilterChanged));
+
+        connect(m_ui->fileTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &BundleListTabWidget::FileSelectionChanged);
+
+        m_ui->fileTableView->setIndentation(0);
+
+        m_relatedBundlesListModel.reset(new QStringListModel);
+        m_ui->relatedBundlesListView->setModel(m_relatedBundlesListModel.data());
+
+        m_ui->bundleFileContentsVerticalLayout->setContentsMargins(MarginSize, MarginSize, MarginSize, MarginSize);
+
+        SetModelDataSource();
+    }
+
+    void BundleListTabWidget::Reload()
+    {
+        // The act of cracking open paks kicks off a DirectoryChanged event. We need to temporarily remove the Bundles
+        // directory from our watched paths to prevent an infinite loop of events. 
+        m_guiApplicationManager->RemoveWatchedPaths(m_watchedFolders);
+
+        // Reload all the bundle files
+        m_fileTableModel->Reload(AzToolsFramework::AssetBundleSettings::GetBundleFileExtension(), m_watchedFolders, m_watchedFiles);
+
+        // Update the selected row
+        FileSelectionChanged();
+
+        // Start recieving DirectoryChanged events for these folders again
+        m_guiApplicationManager->AddWatchedPaths(m_watchedFolders);
+    }
+
+    void BundleListTabWidget::SetModelDataSource()
+    {
+        // Remove the current watched folders and files
+        m_guiApplicationManager->RemoveWatchedPaths(m_watchedFolders + m_watchedFiles);
+
+        // Set the new watched folder for the model
+        m_watchedFolders.clear();
+        m_watchedFiles.clear();
+        m_watchedFolders.insert(m_guiApplicationManager->GetBundlesFolder().c_str());
+        ReadScanPathsFromAssetBundlerSettings(AssetBundlingFileType::BundleFileType);
+
+        m_guiApplicationManager->AddWatchedPaths(m_watchedFolders + m_watchedFiles);
+    }
+
+    AzQtComponents::TableView* BundleListTabWidget::GetFileTableView()
+    {
+        return m_ui->fileTableView;
+    }
+
+    QModelIndex BundleListTabWidget::GetSelectedFileTableIndex()
+    {
+        return m_selectedFileTableIndex;
+    }
+
+    AssetBundlerAbstractFileTableModel* BundleListTabWidget::GetFileTableModel()
+    {
+        return m_fileTableModel.get();
+    }
+
+    void BundleListTabWidget::SetActiveProjectLabel(const QString& labelText)
+    {
+        m_ui->activeProjectLabel->setText(labelText);
+    }
+
+    void BundleListTabWidget::ApplyConfig()
+    {
+        const GUIApplicationManager::Config& config = m_guiApplicationManager->GetConfig();
+        m_ui->fileTableFrame->setFixedWidth(config.fileTableWidth);
+        m_ui->fileTableView->header()->resizeSection(BundleFileListModel::Column::ColumnFileName, config.fileNameColumnWidth);
+    }
+
+
+    void BundleListTabWidget::FileSelectionChanged(const QItemSelection& /*selected*/, const QItemSelection& /*deselected*/)
+    {
+        if (m_ui->fileTableView->selectionModel()->selectedRows().size() == 0)
+        {
+            m_selectedFileTableIndex = QModelIndex();
+            ClearDisplayedBundleValues();
+            return;
+        }
+
+        m_selectedFileTableIndex = m_fileTableFilterModel->mapToSource(m_ui->fileTableView->selectionModel()->selectedRows()[0]);
+        AZ::Outcome< BundleFileInfoPtr, void> fileInfoOutcome = m_fileTableModel->GetBundleInfo(m_selectedFileTableIndex);
+
+        if (!fileInfoOutcome.IsSuccess())
+        {
+            ClearDisplayedBundleValues();
+            return;
+        }
+
+        BundleFileInfoPtr fileInfoPtr = fileInfoOutcome.GetValue();
+
+        m_ui->absolutePathLabel->setText(fileInfoPtr->m_absolutePath.c_str());
+
+        QString sizeFormat("%1 MB");
+        double compressedSize = (double)fileInfoPtr->m_compressedSize / BytesToMegabytes;
+        m_ui->compressedSizeValueLabel->setText(sizeFormat.arg(compressedSize, 6, 'f', 3));
+
+        bool hasRelatedBundles = !fileInfoPtr->m_relatedBundles.isEmpty();
+        if (hasRelatedBundles)
+        {
+            m_relatedBundlesListModel->setStringList(fileInfoPtr->m_relatedBundles);
+        }
+        m_ui->relatedBundlesLabel->setVisible(hasRelatedBundles);
+        m_ui->relatedBundlesListView->setVisible(hasRelatedBundles);
+    }
+
+    void BundleListTabWidget::ClearDisplayedBundleValues()
+    {
+        m_ui->absolutePathLabel->clear();
+        m_ui->compressedSizeValueLabel->clear();
+        m_ui->relatedBundlesLabel->setVisible(false);
+        m_ui->relatedBundlesListView->setVisible(false);
+        m_relatedBundlesListModel->setStringList({});
+    }
+}
+
+#include <source/ui/moc_BundleListTabWidget.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.h b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.h
new file mode 100644
index 0000000000..c05e1078fa
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.h
@@ -0,0 +1,67 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <source/ui/AssetBundlerTabWidget.h>
+
+#include <QItemSelection>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringListModel>
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class BundleListTabWidget;
+}
+
+namespace AssetBundler
+{
+    class BundleFileListModel;
+
+    class BundleListTabWidget
+        : public AssetBundlerTabWidget
+    {
+        Q_OBJECT
+    public:
+        explicit BundleListTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager);
+        virtual ~BundleListTabWidget() {}
+
+        QString GetTabTitle() override { return tr("Completed Bundles"); }
+        QString GetFileTypeDisplayName() override { return tr("Bundle"); }
+        AssetBundlingFileType GetFileType() override { return AssetBundlingFileType::BundleFileType; }
+        bool HasUnsavedChanges() override { return false; }
+        void Reload() override;
+        bool SaveCurrentSelection() override { return true; }
+        bool SaveAll() override { return true; }
+        void SetModelDataSource() override;
+        AzQtComponents::TableView* GetFileTableView() override;
+        QModelIndex GetSelectedFileTableIndex() override;
+        AssetBundlerAbstractFileTableModel* GetFileTableModel() override;
+        void SetActiveProjectLabel(const QString& labelText) override;
+        void ApplyConfig() override;
+        void FileSelectionChanged(const QItemSelection& /*selected*/ = QItemSelection(), const QItemSelection& /*deselected*/ = QItemSelection()) override;
+
+    private:
+        void ClearDisplayedBundleValues();
+
+        QSharedPointer<Ui::BundleListTabWidget> m_ui;
+        QSharedPointer<BundleFileListModel> m_fileTableModel;
+        QModelIndex m_selectedFileTableIndex;
+        QSharedPointer<QStringListModel> m_relatedBundlesListModel;
+    };
+
+}
diff --git a/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.ui b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.ui
new file mode 100644
index 0000000000..9880640f09
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.ui
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BundleListTabWidget</class>
+ <widget class="QWidget" name="BundleListTabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>888</width>
+    <height>562</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Bundle List Tab Widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="mainVerticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="activeProjectLabel"/>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0">
+     <item>
+      <widget class="QFrame" name="fileTableFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QFrame" name="fileTableHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="bundleFilesLabel">
+             <property name="text">
+              <string>Bundles</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::FilteredSearchWidget" name="fileFilteredSearchWidget">
+          <property name="placeholderText" stdset="0">
+           <string>Filter by file name</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::TableView" name="fileTableView"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="fileContentsFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QFrame" name="fileContentsHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="bundleInfoLabel">
+             <property name="text">
+              <string>Bundle Info</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="absolutePathLabel">
+             <property name="text">
+              <string>TextLabel</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QWidget" name="bundleFileContentsWidget" native="true">
+          <layout class="QVBoxLayout" name="bundleFileContentsVerticalLayout">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <layout class="QFormLayout" name="bundleInfoLayout">
+             <item row="0" column="0">
+              <widget class="QLabel" name="compressedSizeLabel">
+               <property name="text">
+                <string>Compressed Size</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="compressedSizeValueLabel">
+               <property name="text">
+                <string>TextLabel</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="relatedBundlesLabel">
+               <property name="text">
+                <string>Related Bundles</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QListView" name="relatedBundlesListView"/>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AzQtComponents::TableView</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/Widgets/TableView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>AzQtComponents::FilteredSearchWidget</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/FilteredSearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.cpp b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.cpp
new file mode 100644
index 0000000000..b5c2d78030
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.cpp
@@ -0,0 +1,451 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/ComparisonDataWidget.h>
+#include <source/ui/ui_ComparisonDataWidget.h>
+
+#include <source/ui/NewFileDialog.h>
+
+#include <QComboBox>
+#include <QStringList>
+
+namespace AssetBundler
+{
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // ComparisonDataWidget
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    const QStringList ComparisonTypeStringList = { "Default", "Delta", "Union", "Intersection", "Complement", "Wildcard", "Regex" };
+
+    ComparisonDataWidget::ComparisonDataWidget(
+        AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> comparisonList,
+        size_t comparisonDataIndex,
+        const AZStd::string& defaultAssetListFileDirectory,
+        QWidget* parent)
+        : QWidget(parent)
+        , m_comparisonDataIndex(comparisonDataIndex)
+        , m_defaultAssetListFileDirectory(defaultAssetListFileDirectory)
+    {
+        m_ui.reset(new Ui::ComparisonDataWidget);
+        m_ui->setupUi(this);
+
+        m_comparisonList = comparisonList;
+
+        if (!IsComparisonDataIndexValid())
+        {
+            AZ_Error("AssetBundler", false, "ComparisonData index ( %u ) is out of bounds. ComparisonData cannot be displayed.", m_comparisonDataIndex);
+            return;
+        }
+
+        // Due to initialization order, we need to hard-code this or else the value will be overwritten once this
+        // ComparisonDataWidget is added to the ComparisonDataCard, and the Card.qss file is applied
+        QString lineEditStyle("background-color: #CCCCCC;");
+        m_ui->nameLineEdit->setStyleSheet(lineEditStyle);
+        m_ui->firstInputLineEdit->setStyleSheet(lineEditStyle);
+        m_ui->secondInputLineEdit->setStyleSheet(lineEditStyle);
+        m_ui->filePatternLineEdit->setStyleSheet(lineEditStyle);
+
+        m_ui->firstInputLineEdit->setReadOnly(true);
+        m_ui->secondInputLineEdit->setReadOnly(true);
+
+        SetAllDisplayValues(m_comparisonList->GetComparisonList()[m_comparisonDataIndex]);
+
+        MouseWheelEventFilter* mouseWheelEventFilter = new MouseWheelEventFilter(this);
+
+        connect(m_ui->nameLineEdit, &QLineEdit::textEdited, this, &ComparisonDataWidget::OnNameLineEditChanged);
+
+        m_ui->comparisonTypeComboBox->installEventFilter(mouseWheelEventFilter);
+        connect(m_ui->comparisonTypeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ComparisonDataWidget::OnComparisonTypeComboBoxChanged);
+
+        m_ui->firstInputComboBox->installEventFilter(mouseWheelEventFilter);
+        connect(m_ui->firstInputComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ComparisonDataWidget::OnFirstInputComboBoxChanged);
+        connect(m_ui->firstInputBrowseButton, &QPushButton::pressed, this, &ComparisonDataWidget::OnFirstInputBrowseButtonPressed);
+
+        m_ui->secondInputComboBox->installEventFilter(mouseWheelEventFilter);
+        connect(m_ui->secondInputComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ComparisonDataWidget::OnSecondInputComboBoxChanged);
+        connect(m_ui->secondInputBrowseButton, &QPushButton::pressed, this, &ComparisonDataWidget::OnSecondInputBrowseButtonPressed);
+
+        connect(m_ui->filePatternLineEdit, &QLineEdit::textEdited, this, &ComparisonDataWidget::OnFilePatternLineEditChanged);
+    }
+
+    void ComparisonDataWidget::UpdateListOfTokenNames()
+    {
+        using namespace AzToolsFramework;
+
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        m_inputTokenNameList.clear();
+        m_ui->firstInputComboBox->clear();
+        m_ui->secondInputComboBox->clear();
+
+        // Store info about the current FirstInput and SecondInput values so we may auto-select them later
+        auto allComparisonDataSteps = m_comparisonList->GetComparisonList();
+        AZStd::string selectedFirstInput = allComparisonDataSteps.at(m_comparisonDataIndex).m_firstInput;
+        int selectedFirstInputIndex = 0;
+        AZStd::string selectedSecondInput = allComparisonDataSteps.at(m_comparisonDataIndex).m_secondInput;
+        int selectedSecondInputIndex = 0;
+
+        // Build list of all Token Names that have come before the current Comparison Step
+        m_inputTokenNameList.append(tr("Choose Asset List..."));
+        int currentComboBoxIndex = 1;
+
+        AZStd::string tokenName;
+        for (size_t i = 0; i < m_comparisonDataIndex; ++i)
+        {
+            tokenName = allComparisonDataSteps.at(i).m_output;
+            if (!AssetFileInfoListComparison::IsTokenFile(tokenName))
+            {
+                continue;
+            }
+
+            if (tokenName == selectedFirstInput)
+            {
+                selectedFirstInputIndex = currentComboBoxIndex;
+            }
+            if (tokenName == selectedSecondInput)
+            {
+                selectedSecondInputIndex = currentComboBoxIndex;
+            }
+
+            m_inputTokenNameList.append(RemoveTokenCharFromString(tokenName));
+            ++currentComboBoxIndex;
+        }
+
+        // Update display with list of Token Names, and select current Token Name in both input combo boxes
+        m_ui->firstInputComboBox->insertItems(0, m_inputTokenNameList);
+        m_ui->firstInputComboBox->setCurrentIndex(selectedFirstInputIndex);
+        m_isFirstInputFileNameVisible = selectedFirstInputIndex == 0;
+        SetFirstInputFileVisibility(m_isFirstInputFileNameVisible);
+
+        m_ui->secondInputComboBox->insertItems(0, m_inputTokenNameList);
+        m_ui->secondInputComboBox->setCurrentIndex(selectedSecondInputIndex);
+        m_isSecondInputFileNameVisible = selectedSecondInputIndex == 0;
+        SetSecondInputFileVisibility(m_isSecondInputFileNameVisible);
+    }
+
+    void ComparisonDataWidget::SetAllDisplayValues(const AzToolsFramework::AssetFileInfoListComparison::ComparisonData& comparisonData)
+    {
+        using namespace AzToolsFramework;
+
+        // Name (Token value)
+        m_ui->nameLineEdit->setText(RemoveTokenCharFromString(comparisonData.m_output));
+
+        // Comparison Type
+        InitComparisonTypeComboBox(comparisonData);
+
+        // Inputs
+        UpdateListOfTokenNames();
+        m_ui->firstInputLineEdit->setText(QString(comparisonData.m_cachedFirstInputPath.c_str()));
+        m_ui->secondInputLineEdit->setText(QString(comparisonData.m_cachedSecondInputPath.c_str()));
+
+        // Update fields that are not always visible
+        UpdateOnComparisonTypeChanged(comparisonData.m_filePatternType != AssetFileInfoListComparison::FilePatternType::Default);
+    }
+
+    void ComparisonDataWidget::OnNameLineEditChanged()
+    {
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        AZStd::string tokenName = m_ui->nameLineEdit->text().toUtf8().data();
+        AzToolsFramework::AssetFileInfoListComparison::FormatOutputToken(tokenName);
+        m_comparisonList->SetOutput(m_comparisonDataIndex, tokenName);
+        emit comparisonDataChanged();
+        emit comparisonDataTokenNameChanged(m_comparisonDataIndex);
+    }
+
+    void ComparisonDataWidget::UpdateOnComparisonTypeChanged(bool isFilePatternOperation)
+    {
+        using namespace AzToolsFramework;
+
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        AssetFileInfoListComparison::ComparisonData comparisonData = m_comparisonList->GetComparisonList()[m_comparisonDataIndex];
+        m_ui->inputBLabel->setVisible(!isFilePatternOperation);
+        m_ui->secondInputComboBox->setVisible(!isFilePatternOperation);
+        SetSecondInputFileVisibility(!isFilePatternOperation && m_isSecondInputFileNameVisible); 
+
+        m_ui->filePatternLabel->setVisible(isFilePatternOperation);
+        m_ui->filePatternLineEdit->setVisible(isFilePatternOperation);
+        m_ui->filePatternLineEdit->setText(comparisonData.m_filePattern.c_str());
+    }
+
+    void ComparisonDataWidget::InitComparisonTypeComboBox(const AzToolsFramework::AssetFileInfoListComparison::ComparisonData& comparisonData)
+    {
+        using namespace AzToolsFramework;
+
+        m_ui->comparisonTypeComboBox->insertItems(0, ComparisonTypeStringList);
+        int initialSelectionIndex = ComparisonTypeIndex::Default;
+
+        if (comparisonData.m_filePatternType != AssetFileInfoListComparison::FilePatternType::Default
+            && comparisonData.m_comparisonType == AssetFileInfoListComparison::ComparisonType::FilePattern)
+        {
+            if (comparisonData.m_filePatternType == AssetFileInfoListComparison::FilePatternType::Wildcard)
+            {
+                initialSelectionIndex = ComparisonTypeIndex::Wildcard;
+            }
+            else
+            {
+                initialSelectionIndex = ComparisonTypeIndex::Regex;
+            }
+        }
+        else
+        {
+            switch (comparisonData.m_comparisonType)
+            {
+            case AssetFileInfoListComparison::ComparisonType::Default:
+                break;
+            case AssetFileInfoListComparison::ComparisonType::Delta:
+                initialSelectionIndex = ComparisonTypeIndex::Delta;
+                break;
+            case AssetFileInfoListComparison::ComparisonType::Union:
+                initialSelectionIndex = ComparisonTypeIndex::Union;
+                break;
+            case AssetFileInfoListComparison::ComparisonType::Intersection:
+                initialSelectionIndex = ComparisonTypeIndex::Intersection;
+                break;
+            case AssetFileInfoListComparison::ComparisonType::Complement:
+                initialSelectionIndex = ComparisonTypeIndex::Complement;
+                break;
+            default:
+                AZ_Warning("AssetBundler", false, "ComparisonType ( %u ) is not supported in the Asset Bundler", comparisonData.m_comparisonType);
+            }
+        }
+
+        m_ui->comparisonTypeComboBox->setCurrentIndex(initialSelectionIndex);
+    }
+
+    void ComparisonDataWidget::OnComparisonTypeComboBoxChanged(int index)
+    {
+        using namespace AzToolsFramework;
+
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        bool isFilePattern = false;
+
+        switch (index)
+        {
+        case ComparisonTypeIndex::Default:
+            m_comparisonList->SetComparisonType(m_comparisonDataIndex, AssetFileInfoListComparison::ComparisonType::Default);
+            break;
+        case ComparisonTypeIndex::Delta:
+            m_comparisonList->SetComparisonType(m_comparisonDataIndex, AssetFileInfoListComparison::ComparisonType::Delta);
+            break;
+        case ComparisonTypeIndex::Union:
+            m_comparisonList->SetComparisonType(m_comparisonDataIndex, AssetFileInfoListComparison::ComparisonType::Union);
+            break;
+        case ComparisonTypeIndex::Intersection:
+            m_comparisonList->SetComparisonType(m_comparisonDataIndex, AssetFileInfoListComparison::ComparisonType::Intersection);
+            break;
+        case ComparisonTypeIndex::Complement:
+            m_comparisonList->SetComparisonType(m_comparisonDataIndex, AssetFileInfoListComparison::ComparisonType::Complement);
+            break;
+        case ComparisonTypeIndex::Wildcard:
+            m_comparisonList->SetComparisonType(m_comparisonDataIndex, AssetFileInfoListComparison::ComparisonType::FilePattern);
+            m_comparisonList->SetFilePatternType(m_comparisonDataIndex, AssetFileInfoListComparison::FilePatternType::Wildcard);
+            isFilePattern = true;
+            break;
+        case ComparisonTypeIndex::Regex:
+            m_comparisonList->SetComparisonType(m_comparisonDataIndex, AssetFileInfoListComparison::ComparisonType::FilePattern);
+            m_comparisonList->SetFilePatternType(m_comparisonDataIndex, AssetFileInfoListComparison::FilePatternType::Regex);
+            isFilePattern = true;
+            break;
+        }
+
+        UpdateOnComparisonTypeChanged(isFilePattern);
+        emit comparisonDataChanged();
+    }
+
+    void ComparisonDataWidget::OnFilePatternLineEditChanged()
+    {
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        m_comparisonList->SetFilePattern(m_comparisonDataIndex, m_ui->filePatternLineEdit->text().toUtf8().data());
+        emit comparisonDataChanged();
+    }
+
+    void ComparisonDataWidget::OnFirstInputComboBoxChanged(int index)
+    {
+        AZStd::string firstInputValue;
+
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        m_isFirstInputFileNameVisible = index == 0;
+
+        if (!m_isFirstInputFileNameVisible)
+        {
+            // The 0th index is the default value, which translates to an empty token string.
+            firstInputValue = m_ui->firstInputComboBox->currentText().toUtf8().data();
+            AzToolsFramework::AssetFileInfoListComparison::FormatOutputToken(firstInputValue);
+        }
+
+        SetFirstInputFileVisibility(m_isFirstInputFileNameVisible);
+
+        m_comparisonList->SetFirstInput(m_comparisonDataIndex, firstInputValue);
+        emit comparisonDataChanged();
+    }
+
+    void ComparisonDataWidget::SetFirstInputFileVisibility(bool isVisible)
+    {
+        m_ui->firstInputLineEdit->setVisible(isVisible);
+        m_ui->firstInputBrowseButton->setVisible(isVisible);
+    }
+
+    void ComparisonDataWidget::OnFirstInputBrowseButtonPressed()
+    {
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        QString absoluteFilePath = BrowseButtonPressed();
+        if (absoluteFilePath.isEmpty())
+        {
+            // User canceled out of the dialog
+            return;
+        }
+
+        m_ui->firstInputLineEdit->setText(absoluteFilePath);
+        m_comparisonList->SetCachedFirstInputPath(m_comparisonDataIndex, absoluteFilePath.toUtf8().data());
+    }
+
+    void ComparisonDataWidget::OnSecondInputComboBoxChanged(int index)
+    {
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        AZStd::string secondInputValue;
+
+        m_isSecondInputFileNameVisible = index == 0;
+
+        if (!m_isSecondInputFileNameVisible)
+        {
+            // The 0th index is the default value, which translates to an empty token string.
+            secondInputValue = m_ui->secondInputComboBox->currentText().toUtf8().data();
+            AzToolsFramework::AssetFileInfoListComparison::FormatOutputToken(secondInputValue);
+        }
+
+        SetSecondInputFileVisibility(m_isSecondInputFileNameVisible);
+
+        m_comparisonList->SetSecondInput(m_comparisonDataIndex, secondInputValue);
+        emit comparisonDataChanged();
+    }
+
+    void ComparisonDataWidget::SetSecondInputFileVisibility(bool isVisible)
+    {
+        m_ui->secondInputLineEdit->setVisible(isVisible);
+        m_ui->secondInputBrowseButton->setVisible(isVisible);
+    }
+
+    void ComparisonDataWidget::OnSecondInputBrowseButtonPressed()
+    {
+        if (!IsComparisonDataIndexValid())
+        {
+            return;
+        }
+
+        QString absoluteFilePath = BrowseButtonPressed();
+        if (absoluteFilePath.isEmpty())
+        {
+            // User canceled out of the dialog
+            return;
+        }
+
+        m_ui->secondInputLineEdit->setText(absoluteFilePath);
+        m_comparisonList->SetCachedSecondInputPath(m_comparisonDataIndex, absoluteFilePath.toUtf8().data());
+    }
+
+    QString ComparisonDataWidget::BrowseButtonPressed()
+    {
+        AZStd::string selectedPath = NewFileDialog::OSNewFileDialog(
+            this,
+            AzToolsFramework::AssetSeedManager::GetAssetListFileExtension(),
+            "Asset List",
+            m_defaultAssetListFileDirectory);
+        AzToolsFramework::RemovePlatformIdentifier(selectedPath);
+        return selectedPath.c_str();
+    }
+
+    bool ComparisonDataWidget::IsComparisonDataIndexValid()
+    {
+        return m_comparisonList->GetComparisonList().size() > m_comparisonDataIndex;
+    }
+
+    QString ComparisonDataWidget::RemoveTokenCharFromString(const AZStd::string& tokenName)
+    {
+        QString displayName = tokenName.c_str();
+        if (displayName.startsWith(AzToolsFramework::AssetFileInfoListComparison::GetTokenIdentifier()))
+        {
+            displayName.remove(0, 1);
+        }
+
+        return displayName;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // MouseWheelEventFilter
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    bool MouseWheelEventFilter::eventFilter(QObject* obj, QEvent* ev)
+    {
+        if (ev->type() == QEvent::Wheel)
+        {
+            return true;
+        }
+
+        return QObject::eventFilter(obj, ev);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    // ComparisonDataCard
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    ComparisonDataCard::ComparisonDataCard(
+        AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> comparisonList,
+        size_t comparisonDataIndex,
+        const AZStd::string& defaultAssetListFileDirectory,
+        QWidget* parent)
+        : AzQtComponents::Card(parent)
+    {
+        m_comparisonDataWidget = new ComparisonDataWidget(comparisonList, comparisonDataIndex, defaultAssetListFileDirectory, this);
+        setContentWidget(m_comparisonDataWidget);
+
+        connect(this, &AzQtComponents::Card::contextMenuRequested, this, &ComparisonDataCard::OnContextMenuRequested);
+    }
+
+    void ComparisonDataCard::OnContextMenuRequested(const QPoint& position)
+    {
+        emit comparisonDataCardContextMenuRequested(m_comparisonDataWidget->GetComparisonDataIndex(), position);
+    }
+
+} // namespace AssetBundler
+
+#include <source/ui/moc_ComparisonDataWidget.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.h b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.h
new file mode 100644
index 0000000000..9728d281a7
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.h
@@ -0,0 +1,151 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzQtComponents/Components/Widgets/Card.h>
+#include <AzToolsFramework/Asset/AssetBundler.h>
+
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class ComparisonDataWidget;
+}
+
+namespace AssetBundler
+{
+    //! Widget for displaying and editing a single Comparison Step inside a Comparison Rules file.
+    class ComparisonDataWidget
+        : public QWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit ComparisonDataWidget(
+            AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> comparisonList,
+            size_t comparisonDataIndex,
+            const AZStd::string& defaultAssetListFileDirectory,
+            QWidget* parent = nullptr);
+        virtual ~ComparisonDataWidget() {}
+
+        enum ComparisonTypeIndex : int
+        {
+            Default = 0,
+            Delta,
+            Union,
+            Intersection,
+            Complement,
+            Wildcard,
+            Regex,
+            MAX
+        };
+
+        size_t GetComparisonDataIndex() { return m_comparisonDataIndex; }
+
+        void UpdateListOfTokenNames();
+
+    Q_SIGNALS:
+        void comparisonDataChanged();
+
+        void comparisonDataTokenNameChanged(size_t comparisonDataIndex);
+
+    private:
+        void SetAllDisplayValues(const AzToolsFramework::AssetFileInfoListComparison::ComparisonData& comparisonData);
+
+        void OnNameLineEditChanged();
+
+        void UpdateOnComparisonTypeChanged(bool isFilePatternOperation);
+
+        void InitComparisonTypeComboBox(const AzToolsFramework::AssetFileInfoListComparison::ComparisonData& comparisonData);
+
+        void OnComparisonTypeComboBoxChanged(int index);
+
+        void OnFilePatternLineEditChanged();
+
+        void OnFirstInputComboBoxChanged(int index);
+
+        void SetFirstInputFileVisibility(bool isVisible);
+
+        void OnFirstInputBrowseButtonPressed();
+
+        void OnSecondInputComboBoxChanged(int index);
+
+        void SetSecondInputFileVisibility(bool isVisible);
+
+        void OnSecondInputBrowseButtonPressed();
+
+        QString BrowseButtonPressed();
+
+        bool IsComparisonDataIndexValid();
+
+        QString RemoveTokenCharFromString(const AZStd::string& tokenName);
+
+        QSharedPointer<Ui::ComparisonDataWidget> m_ui;
+
+        AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> m_comparisonList;
+        size_t m_comparisonDataIndex;
+
+        AZStd::string m_defaultAssetListFileDirectory;
+
+        QStringList m_inputTokenNameList;
+        QString m_outputAssetListFileAbsolutePath;
+
+        bool m_isFirstInputFileNameVisible = false;
+        bool m_isSecondInputFileNameVisible = false;
+    };
+
+    class MouseWheelEventFilter
+        : public QObject
+    {
+        Q_OBJECT
+
+    public:
+        explicit MouseWheelEventFilter(QObject* parent) : QObject(parent) {}
+
+    protected:
+        bool eventFilter(QObject* obj, QEvent* ev) override;
+    };
+
+
+    //! Wrapper widget that controls the expansion state and signals that trigger a context menu of a ComparisonDataWidget.
+    class ComparisonDataCard
+        : public AzQtComponents::Card
+    {
+        Q_OBJECT
+
+    public:
+        explicit ComparisonDataCard(
+            AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> comparisonList,
+            size_t comparisonDataIndex,
+            const AZStd::string& defaultAssetListFileDirectory,
+            QWidget* parent = nullptr);
+        virtual ~ComparisonDataCard() {}
+
+        ComparisonDataWidget* GetComparisonDataWidget() { return m_comparisonDataWidget; }
+
+    Q_SIGNALS:
+        void comparisonDataCardContextMenuRequested(size_t comparisonDataIndex, const QPoint& position);
+
+    private:
+        ComparisonDataWidget* m_comparisonDataWidget = nullptr;
+
+    private slots:
+        void OnContextMenuRequested(const QPoint& position);
+    };
+
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.ui b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.ui
new file mode 100644
index 0000000000..4e148e21bb
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.ui
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ComparisonDataWidget</class>
+ <widget class="QWidget" name="ComparisonDataWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="comparisonDataFrame">
+     <layout class="QFormLayout" name="formLayout">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetDefaultConstraint</enum>
+      </property>
+      <property name="labelAlignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="verticalSpacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="nameLabel">
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="nameLineEdit"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="comparisonTypeLabel">
+        <property name="text">
+         <string>Comparison Type</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comparisonTypeComboBox"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="inputALabel">
+        <property name="text">
+         <string>Input A</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="firstInputComboBox"/>
+      </item>
+      <item row="3" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="spacing">
+         <number>10</number>
+        </property>
+        <item>
+         <widget class="QLineEdit" name="firstInputLineEdit"/>
+        </item>
+        <item>
+         <widget class="QPushButton" name="firstInputBrowseButton">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="inputBLabel">
+        <property name="text">
+         <string>Input B</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QComboBox" name="secondInputComboBox"/>
+      </item>
+      <item row="5" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <property name="spacing">
+         <number>10</number>
+        </property>
+        <item>
+         <widget class="QLineEdit" name="secondInputLineEdit"/>
+        </item>
+        <item>
+         <widget class="QPushButton" name="secondInputBrowseButton">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="filePatternLabel">
+        <property name="text">
+         <string>File Pattern</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QLineEdit" name="filePatternLineEdit"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/EditSeedDialog.cpp b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.cpp
new file mode 100644
index 0000000000..a42e0cd0f0
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.cpp
@@ -0,0 +1,62 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/EditSeedDialog.h>
+#include <source/ui/ui_EditSeedDialog.h>
+
+#include <source/ui/PlatformSelectionWidget.h>
+
+#include <QPushButton>
+
+namespace AssetBundler
+{
+
+    EditSeedDialog::EditSeedDialog(
+        QWidget* parent,
+        const AzFramework::PlatformFlags& enabledPlatforms,
+        const AzFramework::PlatformFlags& selectedPlatforms,
+        const AzFramework::PlatformFlags& partiallySelectedPlatforms)
+        : QDialog(parent)
+    {
+        m_ui.reset(new Ui::EditSeedDialog);
+        m_ui->setupUi(this);
+
+        m_ui->platformSelectionWidget->Init(enabledPlatforms);
+        m_ui->platformSelectionWidget->SetSelectedPlatforms(selectedPlatforms, partiallySelectedPlatforms);
+        connect(m_ui->platformSelectionWidget, &PlatformSelectionWidget::PlatformsSelected, this, &EditSeedDialog::OnPlatformSelectionChanged);
+
+        // Set up confirm and cancel buttons
+        connect(m_ui->applyChangesButton, &QPushButton::clicked, this, &QDialog::accept);
+        connect(m_ui->cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+    }
+
+    AzFramework::PlatformFlags EditSeedDialog::GetPlatformFlags()
+    {
+        return m_ui->platformSelectionWidget->GetSelectedPlatforms();
+    }
+
+    AzFramework::PlatformFlags EditSeedDialog::GetPartiallySelectedPlatformFlags()
+    {
+        return m_ui->platformSelectionWidget->GetPartiallySelectedPlatforms();
+    }
+    
+    void EditSeedDialog::OnPlatformSelectionChanged(const AzFramework::PlatformFlags& selectedPlatforms, const AzFramework::PlatformFlags& partiallySelectedPlatforms)
+    {
+        // Disable the "Apply Changes" button if no platforms are selected
+        bool areAnyPlatformsSelected = selectedPlatforms != AzFramework::PlatformFlags::Platform_NONE ||
+            partiallySelectedPlatforms != AzFramework::PlatformFlags::Platform_NONE;
+        m_ui->applyChangesButton->setEnabled(areAnyPlatformsSelected);
+    }
+
+} // namespace AssetBundler
+
+#include <source/ui/moc_EditSeedDialog.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/EditSeedDialog.h b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.h
new file mode 100644
index 0000000000..751c1eae3d
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.h
@@ -0,0 +1,52 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzFramework/Platform/PlatformDefaults.h>
+#include <AzToolsFramework/Asset/AssetSeedManager.h>
+
+#include <QDialog>
+#include <QSharedPointer>
+#endif
+
+namespace Ui
+{
+    class EditSeedDialog;
+}
+
+namespace AssetBundler
+{
+    class EditSeedDialog
+        : public QDialog
+    {
+        Q_OBJECT
+
+    public:
+        explicit EditSeedDialog(
+            QWidget* parent,
+            const AzFramework::PlatformFlags& enabledPlatforms,
+            const AzFramework::PlatformFlags& selectedPlatforms,
+            const AzFramework::PlatformFlags& partiallySelectedPlatforms = AzFramework::PlatformFlags::Platform_NONE);
+        virtual ~EditSeedDialog() {}
+
+        AzFramework::PlatformFlags GetPlatformFlags();
+        AzFramework::PlatformFlags GetPartiallySelectedPlatformFlags();
+
+    private:
+        void OnPlatformSelectionChanged(const AzFramework::PlatformFlags& selectedPlatforms, const AzFramework::PlatformFlags& partiallySelectedPlatforms);
+
+        QSharedPointer<Ui::EditSeedDialog> m_ui;
+    };
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/EditSeedDialog.ui b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.ui
new file mode 100644
index 0000000000..7d42d2d252
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.ui
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EditSeedDialog</class>
+ <widget class="QDialog" name="EditSeedDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>92</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>300</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Edit Selected Platforms</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="inputValuesFrame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="AssetBundler::PlatformSelectionWidget" name="platformSelectionWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="rightMargin">
+      <number>10</number>
+     </property>
+     <property name="bottomMargin">
+      <number>10</number>
+     </property>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyChangesButton">
+       <property name="text">
+        <string>Apply Changes</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AssetBundler::PlatformSelectionWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">source/ui/PlatformSelectionWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.cpp b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.cpp
new file mode 100644
index 0000000000..3724bc8753
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.cpp
@@ -0,0 +1,276 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/GenerateBundlesModal.h>
+#include <source/ui/ui_GenerateBundlesModal.h>
+
+#include <source/ui/AssetListTabWidget.h>
+#include <source/ui/NewFileDialog.h>
+#include <source/utils/utils.h>
+
+#include <AzCore/IO/FileIO.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/AssetBundle/AssetBundleAPI.h>
+
+#include <QMessageBox>
+
+const char CustomBundleSettingsText[] = "Custom";
+
+namespace AssetBundler
+{
+    GenerateBundlesModal::GenerateBundlesModal(
+        QWidget* parent,
+        const AZStd::string& assetListFileAbsolutePath,
+        const AZStd::string& defaultBundleDirectory,
+        const AZStd::string& defaultBundleSettingsDirectory,
+        AssetListTabWidget* assetListTabWidget)
+        : QDialog(parent)
+        , m_assetListFileAbsolutePath(assetListFileAbsolutePath)
+        , m_defaultBundleDirectory(defaultBundleDirectory)
+        , m_defaultBundleSettingsDirectory(defaultBundleSettingsDirectory)
+        , m_assetListTabWidget(assetListTabWidget)
+    {
+        m_ui.reset(new Ui::GenerateBundlesModal);
+        m_ui->setupUi(this);
+
+        m_platformName = AzToolsFramework::GetPlatformIdentifier(m_assetListFileAbsolutePath);
+
+        // Selected Asset List
+        m_ui->selectedAssetListPathLabel->setText(QString(m_assetListFileAbsolutePath.c_str()));
+
+        // Platform
+        m_ui->platformNameLabel->setText(QString(m_platformName.c_str()));
+
+        // Bundle Output
+        m_ui->outputBundlePathLineEdit->setReadOnly(true);
+        connect(m_ui->outputBundlePathBrowseButton, &QPushButton::clicked, this, &GenerateBundlesModal::OnOutputBundleLocationBrowseButtonPressed);
+
+        // Bundle Settings files
+        m_ui->bundleSettingsFileLineEdit->setReadOnly(true);
+        m_ui->bundleSettingsFileLineEdit->setText(tr(CustomBundleSettingsText));
+        connect(m_ui->bundleSettingsFileBrowseButton, &QPushButton::clicked, this, &GenerateBundlesModal::OnBundleSettingsBrowseButtonPressed);
+        connect(m_ui->bundleSettingsFileSaveButton, &QPushButton::clicked, this, &GenerateBundlesModal::OnBundleSettingsSaveButtonPressed);
+
+        // Max Bundle Size
+        m_ui->maxBundleSizeSpinBox->setRange(1, AzToolsFramework::MaxBundleSizeInMB);
+        m_ui->maxBundleSizeSpinBox->setValue(AzToolsFramework::MaxBundleSizeInMB);
+        m_ui->maxBundleSizeSpinBox->setButtonSymbols(QAbstractSpinBox::ButtonSymbols::NoButtons);
+        m_ui->maxBundleSizeSpinBox->setSuffix(" MB");
+        connect(m_ui->maxBundleSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &GenerateBundlesModal::OnMaxBundleSizeChanged);
+
+        // Bundle Version
+        m_ui->bundleVersionSpinBox->setRange(1, AzFramework::AssetBundleManifest::CurrentBundleVersion);
+        m_ui->bundleVersionSpinBox->setValue(AzFramework::AssetBundleManifest::CurrentBundleVersion);
+        m_ui->bundleVersionSpinBox->setButtonSymbols(QAbstractSpinBox::ButtonSymbols::NoButtons);
+        connect(m_ui->bundleVersionSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &GenerateBundlesModal::OnBundleVersionChanged);
+
+        // Cancel and Generate Bundles buttons
+        m_ui->generateBundlesButton->setEnabled(false);
+        connect(m_ui->cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+        connect(m_ui->generateBundlesButton, &QPushButton::clicked, this, &GenerateBundlesModal::OnGenerateBundlesButtonPressed);
+
+        // In-memory Bundle Settings
+        m_bundleSettings.m_assetFileInfoListPath = m_assetListFileAbsolutePath;
+        m_bundleSettings.m_platform = m_platformName;
+        m_bundleSettings.m_maxBundleSizeInMB = static_cast<AZ::u64>(m_ui->maxBundleSizeSpinBox->value());
+        m_bundleSettings.m_bundleVersion = m_ui->bundleVersionSpinBox->value();
+    }
+
+    GenerateBundlesModal::~GenerateBundlesModal()
+    {
+        m_assetListTabWidget = nullptr;
+    }
+
+    void GenerateBundlesModal::OnOutputBundleLocationBrowseButtonPressed()
+    {
+        AZStd::string outputBundleAbsolutePath = NewFileDialog::OSNewFileDialog(
+            this,
+            AzToolsFramework::AssetBundleSettings::GetBundleFileExtension(),
+            "Bundle",
+            m_defaultBundleDirectory);
+
+        if (outputBundleAbsolutePath.empty())
+        {
+            // User canceled out of the dialog
+            return;
+        }
+
+        AzToolsFramework::RemovePlatformIdentifier(outputBundleAbsolutePath);
+        AddPlatformIdentifier(outputBundleAbsolutePath, m_platformName);
+
+        m_bundleSettings.m_bundleFilePath = outputBundleAbsolutePath;
+
+        m_ui->outputBundlePathLineEdit->setText(outputBundleAbsolutePath.c_str());
+        m_ui->generateBundlesButton->setEnabled(true);
+    }
+
+    void GenerateBundlesModal::OnBundleSettingsBrowseButtonPressed()
+    {
+        AZStd::string bundleSettingsAbsolutePath = NewFileDialog::OSNewFileDialog(
+            this,
+            AzToolsFramework::AssetBundleSettings::GetBundleSettingsFileExtension(),
+            "Bundle Settings",
+            m_defaultBundleSettingsDirectory);
+
+        if (bundleSettingsAbsolutePath.empty())
+        {
+            // User canceled out of the dialog
+            return;
+        }
+
+        // Read in the values from the Bundle Settings file
+        bool loadResult = LoadBundleSettingsValues(bundleSettingsAbsolutePath);
+        if (!loadResult)
+        {
+            return;
+        }
+
+        // Update the display name for our settings
+        UpdateBundleSettingsDisplayName(bundleSettingsAbsolutePath);
+    }
+
+    bool GenerateBundlesModal::LoadBundleSettingsValues(const AZStd::string& absoluteBundleSettingsFilePath)
+    {
+        using namespace AzToolsFramework;
+
+        auto outcome = AssetBundleSettings::Load(absoluteBundleSettingsFilePath);
+        if (!outcome.IsSuccess())
+        {
+            AZ_Error("AssetBundler", false, outcome.GetError().c_str());
+            return false;
+        }
+
+        // We don't want to overwrite all of the in-memory bundle settings, so we will just update a few
+        AssetBundleSettings loadedSettings = outcome.TakeValue();
+
+        m_bundleSettings.m_maxBundleSizeInMB = loadedSettings.m_maxBundleSizeInMB;
+        m_ui->maxBundleSizeSpinBox->setValue(static_cast<int>(m_bundleSettings.m_maxBundleSizeInMB));
+
+        m_bundleSettings.m_bundleVersion = loadedSettings.m_bundleVersion;
+        m_ui->bundleVersionSpinBox->setValue(m_bundleSettings.m_bundleVersion);
+
+        return true;
+    }
+
+    void GenerateBundlesModal::UpdateBundleSettingsDisplayName(const AZStd::string& absoluteBundleSettingsFilePath)
+    {
+        if (absoluteBundleSettingsFilePath.empty())
+        {
+            m_ui->bundleSettingsFileLineEdit->setText(tr(CustomBundleSettingsText));
+            return;
+        }
+
+        AZStd::string bundleSettingsFileName = absoluteBundleSettingsFilePath;
+        AzToolsFramework::RemovePlatformIdentifier(bundleSettingsFileName);
+        AzFramework::StringFunc::Path::GetFileName(bundleSettingsFileName.c_str(), bundleSettingsFileName);
+        m_ui->bundleSettingsFileLineEdit->setText(bundleSettingsFileName.c_str());
+    }
+
+    void GenerateBundlesModal::OnBundleSettingsSaveButtonPressed()
+    {
+        using namespace AzToolsFramework;
+
+        // Ask the user where they want to save the Bundle Settings file
+        AZStd::string bundleSettingsAbsolutePath = NewFileDialog::OSNewFileDialog(
+            this,
+            AssetBundleSettings::GetBundleSettingsFileExtension(),
+            "Bundle Settings",
+            m_defaultBundleSettingsDirectory);
+
+        if (bundleSettingsAbsolutePath.empty())
+        {
+            // User canceled out of the operation
+            return;
+        }
+
+        AzToolsFramework::RemovePlatformIdentifier(bundleSettingsAbsolutePath);
+        AddPlatformIdentifier(bundleSettingsAbsolutePath, m_platformName);
+
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(bundleSettingsAbsolutePath.c_str()))
+        {
+            QString messageBoxText = QString(tr("Bundle Settings ( %1 ) already exists on-disk. Saving the current settings will override the existing settings. \n\nDo you wish to continue?")).arg(bundleSettingsAbsolutePath.c_str());
+
+            QMessageBox::StandardButton confirmDeleteFileResult = QMessageBox::question(this, QString(tr("Replace Existing Settings")), messageBoxText);
+            if (confirmDeleteFileResult != QMessageBox::StandardButton::Yes)
+            {
+                // User canceled out of the operation
+                return;
+            }
+        }
+
+        bool saveResult = AssetBundleSettings::Save(m_bundleSettings, bundleSettingsAbsolutePath);
+        if (!saveResult)
+        {
+            // Error has already been thrown
+            return;
+        }
+
+        m_assetListTabWidget->AddScanPathToAssetBundlerSettings(AssetBundlingFileType::BundleSettingsFileType, bundleSettingsAbsolutePath);
+
+        UpdateBundleSettingsDisplayName(bundleSettingsAbsolutePath);
+    }
+
+    void GenerateBundlesModal::OnMaxBundleSizeChanged()
+    {
+        m_bundleSettings.m_maxBundleSizeInMB = static_cast<AZ::u64>(m_ui->maxBundleSizeSpinBox->value());
+        UpdateBundleSettingsDisplayName("");
+    }
+
+    void GenerateBundlesModal::OnBundleVersionChanged()
+    {
+        m_bundleSettings.m_bundleVersion = m_ui->bundleVersionSpinBox->value();
+        UpdateBundleSettingsDisplayName("");
+    }
+
+    void GenerateBundlesModal::OnGenerateBundlesButtonPressed()
+    {
+        using namespace AzToolsFramework;
+
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(m_bundleSettings.m_bundleFilePath.c_str()))
+        {
+            QString messageBoxText = QString(tr("Asset Bundle ( %1 ) already exists on-disk. Generating a new Bundle will override the existing Bundle. \n\nDo you wish to permanently delete the existing Bundle?")).arg(m_bundleSettings.m_bundleFilePath.c_str());
+
+            QMessageBox::StandardButton confirmDeleteFileResult = QMessageBox::question(this, QString(tr("Replace Existing Bundle")), messageBoxText);
+            if (confirmDeleteFileResult != QMessageBox::StandardButton::Yes)
+            {
+                // User canceled out of the operation
+                return;
+            }
+        }
+
+        bool result = false;
+        AssetBundleCommandsBus::BroadcastResult(result, &AssetBundleCommandsBus::Events::CreateAssetBundle, m_bundleSettings);
+
+        // This operation will take long enough that the OS will throw up its own wait cursor,
+        // but there is a slight delay where the UI is unresponsive but the cursor hasn't changed.
+        // We are changing the cursor manually to avoid that. 
+        setCursor(Qt::WaitCursor);
+
+        emit QDialog::accept();
+
+        if (result)
+        {
+            m_assetListTabWidget->AddScanPathToAssetBundlerSettings(AssetBundlingFileType::BundleFileType, m_bundleSettings.m_bundleFilePath);
+
+            // The watched files list was updated after the files were created, so we need to force-reload them
+            m_assetListTabWidget->GetGUIApplicationManager()->UpdateFiles(AssetBundlingFileType::BundleFileType, { m_bundleSettings.m_bundleFilePath });
+        }
+
+        AZStd::vector<AZStd::string> generatedFilePaths = { m_bundleSettings.m_bundleFilePath };
+        NewFileDialog::FileGenerationResultMessageBox(this, generatedFilePaths, !result);
+
+        unsetCursor();
+    }
+
+} // namespace AssetBundler
+
+#include <source/ui/moc_GenerateBundlesModal.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.h b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.h
new file mode 100644
index 0000000000..b4edaedb9b
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.h
@@ -0,0 +1,75 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/string/string.h>
+#include <AzToolsFramework/Asset/AssetBundler.h>
+
+#include <QDialog>
+#include <QSharedPointer>
+#endif
+
+namespace Ui
+{
+    class GenerateBundlesModal;
+}
+
+namespace AssetBundler
+{
+    class AssetListTabWidget;
+
+    class GenerateBundlesModal
+        : public QDialog
+    {
+        Q_OBJECT
+
+    public:
+        explicit GenerateBundlesModal(
+            QWidget* parent,
+            const AZStd::string& assetListFileAbsolutePath,
+            const AZStd::string& defaultBundleDirectory,
+            const AZStd::string& defaultBundleSettingsDirectory,
+            AssetListTabWidget* assetListTabWidget);
+        virtual ~GenerateBundlesModal();
+
+    private:
+        void OnOutputBundleLocationBrowseButtonPressed();
+
+        void OnBundleSettingsBrowseButtonPressed();
+
+        bool LoadBundleSettingsValues(const AZStd::string& absoluteBundleSettingsFilePath);
+
+        void UpdateBundleSettingsDisplayName(const AZStd::string& absoluteBundleSettingsFilePath);
+
+        void OnBundleSettingsSaveButtonPressed();
+
+        void OnMaxBundleSizeChanged();
+
+        void OnBundleVersionChanged();
+
+        void OnGenerateBundlesButtonPressed();
+
+        QSharedPointer<Ui::GenerateBundlesModal> m_ui;
+
+        AssetListTabWidget* m_assetListTabWidget = nullptr;
+
+        AZStd::string m_assetListFileAbsolutePath;
+        AZStd::string m_defaultBundleDirectory;
+        AZStd::string m_defaultBundleSettingsDirectory;
+        AZStd::string m_platformName;
+
+        AzToolsFramework::AssetBundleSettings m_bundleSettings;
+    };
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.ui b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.ui
new file mode 100644
index 0000000000..df7ac0f0be
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.ui
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GenerateBundlesModal</class>
+ <widget class="QDialog" name="GenerateBundlesModal">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>750</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Generate Bundles</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>10</number>
+   </property>
+   <property name="topMargin">
+    <number>10</number>
+   </property>
+   <property name="rightMargin">
+    <number>10</number>
+   </property>
+   <property name="bottomMargin">
+    <number>10</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="bundleSettingsFrame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="bundleSettingsFrameLayout">
+      <property name="leftMargin">
+       <number>5</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>5</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QFrame" name="outputBundleLocationFrame">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QFormLayout" name="formLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="selectedAssetListLabel">
+           <property name="text">
+            <string>Asset List</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLabel" name="selectedAssetListPathLabel">
+           <property name="text">
+            <string>TextLabel</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="platformLabel">
+           <property name="text">
+            <string>Platform</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLabel" name="platformNameLabel">
+           <property name="text">
+            <string>TextLabel</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="outputBundleNameLabel">
+           <property name="text">
+            <string>Output Bundle Name</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QLineEdit" name="outputBundlePathLineEdit"/>
+           </item>
+           <item>
+            <widget class="QPushButton" name="outputBundlePathBrowseButton">
+             <property name="text">
+              <string>Browse...</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QFrame" name="bundleSettingsFileFrame">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QFormLayout" name="formLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Settings</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <item>
+            <widget class="QLineEdit" name="bundleSettingsFileLineEdit"/>
+           </item>
+           <item>
+            <widget class="QPushButton" name="bundleSettingsFileBrowseButton">
+             <property name="text">
+              <string>Browse...</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="bundleSettingsFileSaveButton">
+             <property name="text">
+              <string>Save</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Max Bundle Size</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <item>
+            <widget class="QSpinBox" name="maxBundleSizeSpinBox"/>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Bundle Version</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <item>
+            <widget class="QSpinBox" name="bundleVersionSpinBox"/>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="generateBundlesButton">
+       <property name="text">
+        <string>Generate Bundles</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/MainWindow.cpp b/Code/Tools/AssetBundler/source/ui/MainWindow.cpp
new file mode 100644
index 0000000000..c0e30c01f2
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/MainWindow.cpp
@@ -0,0 +1,249 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/MainWindow.h>
+#include <source/ui/ui_MainWindow.h>
+#include <source/utils/GUIApplicationManager.h>
+
+#include <AzCore/std/utils.h>
+#include <AzToolsFramework/UI/Logging/LogTableItemDelegate.h>
+#include <AzQtComponents/Utilities/QtWindowUtilities.h>
+
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QCloseEvent>
+#include <QDateTime>
+#include <QDesktopServices>
+
+namespace AssetBundler
+{
+
+    MainWindow::MainWindow(AssetBundler::GUIApplicationManager* guiApplicationManager, QWidget* parent)
+        : QMainWindow(parent)
+        , m_guiApplicationManager(guiApplicationManager)
+    {
+        m_ui.reset(new Ui::MainWindow);
+        m_ui->setupUi(this);
+
+        m_ui->verticalLayout->setContentsMargins(0, 0, 0, 0);
+
+        // Set up Log
+        m_logModel.reset(new AzToolsFramework::Logging::LogTableModel(this));
+        m_ui->logTableView->setModel(m_logModel.data());
+        m_ui->logTableView->setIndentation(0);
+
+        m_ui->logTableView->setContextMenuPolicy(Qt::CustomContextMenu);
+        connect(m_ui->logTableView, &QWidget::customContextMenuRequested, this, &MainWindow::ShowLogContextMenu);
+
+        AZ::Debug::TraceMessageBus::Handler::BusConnect();
+
+        // Create the Unsaved Changes Popup
+        m_unsavedChangesMsgBox.reset(new QMessageBox(this));
+        m_unsavedChangesMsgBox->setText(tr("There are unsaved changes."));
+        m_unsavedChangesMsgBox->setInformativeText(tr("Would you like to save all changes before quitting?"));
+        m_unsavedChangesMsgBox->setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+        m_unsavedChangesMsgBox->setDefaultButton(QMessageBox::Save);
+
+        // Set up Quit functionality
+        m_ui->actionClose->setShortcut(Qt::Key_Q | Qt::CTRL);
+        m_ui->actionClose->setMenuRole(QAction::QuitRole);
+        connect(m_ui->actionClose, SIGNAL(triggered()), this, SLOT(close()));
+        this->addAction(m_ui->actionClose);
+
+        // Set up Tabs
+        AssetBundlerTabWidget::InitAssetBundlerSettings(m_guiApplicationManager->GetCurrentProjectFolder().c_str());
+
+        m_seedListTab.reset(new SeedTabWidget(this, m_guiApplicationManager, QString(m_guiApplicationManager->GetAssetBundlingFolder().c_str())));
+        m_ui->tabWidget->addTab(m_seedListTab.data(), m_seedListTab->GetTabTitle());
+
+        m_assetListTab.reset(new AssetListTabWidget(this, m_guiApplicationManager));
+        m_ui->tabWidget->addTab(m_assetListTab.data(), m_assetListTab->GetTabTitle());
+
+        m_rulesTab.reset(new RulesTabWidget(this, m_guiApplicationManager));
+        m_ui->tabWidget->addTab(m_rulesTab.data(), m_rulesTab->GetTabTitle());
+
+        m_bundleListTab.reset(new BundleListTabWidget(this, m_guiApplicationManager));
+        m_ui->tabWidget->addTab(m_bundleListTab.data(), m_bundleListTab->GetTabTitle());
+
+        // Set up link to documentation
+        QAction* supportAction = new QAction(QIcon(":/stylesheet/img/help.svg"), "", this);
+        connect(supportAction, &QAction::triggered, this, &MainWindow::OnSupportClicked);
+        connect(m_ui->actionDocumentation, &QAction::triggered, this, &MainWindow::OnSupportClicked);
+        m_ui->tabWidget->setActionToolBarVisible();
+        m_ui->tabWidget->addAction(supportAction);
+
+        // Set up Save functionality
+        m_ui->actionSave->setShortcut(Qt::Key_S | Qt::CTRL);
+        connect(m_ui->actionSave, &QAction::triggered, this, &MainWindow::SaveCurrentSelection);
+
+        m_ui->actionSaveAll->setShortcut(Qt::Key_S | Qt::CTRL | Qt::SHIFT);
+        connect(m_ui->actionSaveAll, &QAction::triggered, this, &MainWindow::SaveAll);
+    }
+
+    MainWindow::~MainWindow()
+    {
+        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+        m_guiApplicationManager = nullptr;
+    }
+
+    void MainWindow::Activate()
+    {
+        m_seedListTab->Activate();
+        m_rulesTab->Activate();
+        m_assetListTab->Activate();
+        m_bundleListTab->Activate();
+    }
+
+    void MainWindow::ApplyConfig()
+    {
+        const GUIApplicationManager::Config& config = m_guiApplicationManager->GetConfig();
+        // Event Log Details
+        m_ui->logTableView->header()->resizeSection(AzToolsFramework::Logging::LogTableModel::ColumnType, config.logTypeColumnWidth);
+        m_ui->logTableView->header()->resizeSection(AzToolsFramework::Logging::LogTableModel::ColumnWindow, config.logSourceColumnWidth);
+
+        m_seedListTab->ApplyConfig();
+        m_assetListTab->ApplyConfig();
+        m_rulesTab->ApplyConfig();
+        m_bundleListTab->ApplyConfig();
+    }
+
+    void MainWindow::WriteToLog(const AZStd::string& message, AzToolsFramework::Logging::LogLine::LogType logType)
+    {
+        WriteToLog(message.c_str(), logType);
+    }
+
+    void MainWindow::WriteToLog(const QString& message, AzToolsFramework::Logging::LogLine::LogType logType)
+    {
+        WriteToLog(message.toUtf8().data(), logType);
+    }
+
+    void MainWindow::WriteToLog(const char* message, AzToolsFramework::Logging::LogLine::LogType logType)
+    {
+        WriteToLog(message, "AssetBundler", logType);
+    }
+
+    void MainWindow::WriteToLog(const char* message, const char* window, AzToolsFramework::Logging::LogLine::LogType logType)
+    {
+        m_logModel->AppendLine(
+            AzToolsFramework::Logging::LogLine(
+                message,
+                window,
+                logType,
+                QDateTime::currentMSecsSinceEpoch()));
+        m_ui->logTableView->scrollToBottom();
+    }
+
+    bool MainWindow::OnPreError(const char* window, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message)
+    {
+        WriteToLog(message, window, AzToolsFramework::Logging::LogLine::LogType::TYPE_ERROR);
+        return true;
+    }
+
+    bool MainWindow::OnPreWarning(const char* window, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message)
+    {
+        WriteToLog(message, window, AzToolsFramework::Logging::LogLine::LogType::TYPE_WARNING);
+        return true;
+    }
+
+    bool MainWindow::OnPrintf(const char* /*window*/, const char* /*message*/)
+    {
+        return true;
+    }
+
+    void MainWindow::ShowWindow()
+    {
+        AzQtComponents::bringWindowToTop(this);
+    }
+
+    void MainWindow::closeEvent(QCloseEvent* event)
+    {
+        if (!HasUnsavedChanges())
+        {
+            // No need to ask the user if they want to quit when there are no unsaved changes
+            event->accept();
+            return;
+        }
+
+        int unsavedChangesResult = m_unsavedChangesMsgBox->exec();
+
+        switch (unsavedChangesResult)
+        {
+        case QMessageBox::Save:
+            // Save All was clicked
+            SaveAll();
+            event->accept();
+            break;
+        case QMessageBox::Discard:
+            // Don't Save was clicked
+            event->accept();
+            break;
+        case QMessageBox::Cancel:
+            // Cancel was clicked
+            event->ignore();
+            break;
+        default:
+            // should never be reached
+            AZ_Assert(false, "No result was returned by the Unsaved Changes Message Box!");
+            break;
+        }
+    }
+
+    void MainWindow::OnSupportClicked()
+    {
+        QDesktopServices::openUrl(
+            QStringLiteral("https://docs.aws.amazon.com/lumberyard/latest/userguide/asset-bundler-overview.html"));
+    }
+
+    void MainWindow::ShowLogContextMenu(const QPoint& pos)
+    {
+        QModelIndex index = m_ui->logTableView->indexAt(pos);
+
+        QMenu menu;
+
+        QAction* action = menu.addAction(tr("Copy line"), this, [&]()
+            {
+                QApplication::clipboard()->setText(index.data(AzToolsFramework::Logging::LogTableModel::LogLineTextRole).toString());
+            });
+        action->setEnabled(index.isValid());
+
+        menu.exec(m_ui->logTableView->mapToGlobal(pos));
+    }
+
+    bool MainWindow::HasUnsavedChanges()
+    {
+        return m_seedListTab->HasUnsavedChanges() || m_rulesTab->HasUnsavedChanges();
+    }
+
+    void MainWindow::SaveCurrentSelection()
+    {
+        switch (m_ui->tabWidget->currentIndex())
+        {
+        case TabIndex::Seeds:
+            m_seedListTab->SaveCurrentSelection();
+            break;
+        case TabIndex::Rules:
+            m_rulesTab->SaveCurrentSelection();
+            break;
+        default:
+            break;
+        }
+    }
+
+    void MainWindow::SaveAll()
+    {
+        m_seedListTab->SaveAll();
+        m_rulesTab->SaveAll();
+    }
+} // namespace AssetBundler
+
+#include <source/ui/moc_MainWindow.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/MainWindow.h b/Code/Tools/AssetBundler/source/ui/MainWindow.h
new file mode 100644
index 0000000000..e8c5570649
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/MainWindow.h
@@ -0,0 +1,105 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <source/ui/AssetListTabWidget.h>
+#include <source/ui/SeedTabWidget.h>
+#include <source/ui/BundleListTabWidget.h>
+#include <source/ui/RulesTabWidget.h>
+
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/UI/Logging/LogLine.h>
+#include <AzToolsFramework/UI/Logging/LogTableModel.h>
+
+#include <QMainWindow>
+#include <QMessageBox>
+#include <QSharedPointer>
+#endif
+
+namespace Ui
+{
+    class MainWindow;
+}
+
+namespace AssetBundler
+{
+    class GUIApplicationManager;
+
+    class MainWindow
+        : public QMainWindow
+        , public AZ::Debug::TraceMessageBus::Handler
+    {
+        Q_OBJECT
+
+    public:
+
+        explicit MainWindow(AssetBundler::GUIApplicationManager* guiApplicationManager, QWidget* parent = 0);
+        virtual ~MainWindow();
+
+        void Activate();
+
+        void ApplyConfig();
+
+        void WriteToLog(const AZStd::string& message, AzToolsFramework::Logging::LogLine::LogType logType);
+        void WriteToLog(const QString& message, AzToolsFramework::Logging::LogLine::LogType logType);
+        void WriteToLog(const char* message, AzToolsFramework::Logging::LogLine::LogType logType);
+        void WriteToLog(const char* message, const char* window, AzToolsFramework::Logging::LogLine::LogType logType);
+
+        /////////////////////////////////////////////////////////
+        // TraceMessageBus overrides
+        bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override;
+        bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
+        bool OnPrintf(const char* window, const char* message) override;
+        /////////////////////////////////////////////////////////
+
+    public Q_SLOTS:
+        void ShowWindow();
+
+    protected:
+        void closeEvent(QCloseEvent* event) override;
+
+    private:
+        QSharedPointer<Ui::MainWindow> m_ui;
+
+        // Tabs
+        QSharedPointer<AssetListTabWidget> m_assetListTab;
+        QSharedPointer<SeedTabWidget> m_seedListTab;
+        QSharedPointer<RulesTabWidget> m_rulesTab;
+        QSharedPointer<BundleListTabWidget> m_bundleListTab;
+
+        enum TabIndex
+        {
+            Seeds,
+            AssetLists,
+            Rules,
+            Bundles,
+            MAX
+        };
+
+        void OnSupportClicked();
+
+        // Log
+        QSharedPointer<AzToolsFramework::Logging::LogTableModel> m_logModel;
+
+        void ShowLogContextMenu(const QPoint& pos);
+
+        // Detecting Unsaved Changes
+        QSharedPointer<QMessageBox> m_unsavedChangesMsgBox;
+
+        bool HasUnsavedChanges();
+        void SaveCurrentSelection();
+        void SaveAll();
+
+        AssetBundler::GUIApplicationManager* m_guiApplicationManager = nullptr;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/MainWindow.ui b/Code/Tools/AssetBundler/source/ui/MainWindow.ui
new file mode 100644
index 0000000000..902652459f
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/MainWindow.ui
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1200</width>
+    <height>1000</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>200</width>
+    <height>200</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Asset Bundler</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="AzQtComponents::TabWidget" name="tabWidget">
+      <property name="currentIndex">
+       <number>-1</number>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="AzQtComponents::TableView" name="logTableView">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1200</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <addaction name="actionSave"/>
+    <addaction name="actionSaveAll"/>
+    <addaction name="separator"/>
+    <addaction name="actionClose"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionDocumentation"/>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <action name="actionSave">
+   <property name="text">
+    <string>Save</string>
+   </property>
+  </action>
+  <action name="actionClose">
+   <property name="text">
+    <string>Close</string>
+   </property>
+  </action>
+  <action name="actionDocumentation">
+   <property name="text">
+    <string>Documentation</string>
+   </property>
+  </action>
+  <action name="actionAbout_Asset_Bundler">
+   <property name="text">
+    <string>About Asset Bundler</string>
+   </property>
+  </action>
+  <action name="actionSaveAll">
+   <property name="text">
+    <string>Save All</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AzQtComponents::TableView</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/Widgets/TableView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>AzQtComponents::TabWidget</class>
+   <extends>QTabWidget</extends>
+   <header location="global">AzQtComponents/Components/Widgets/TabWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/NewFileDialog.cpp b/Code/Tools/AssetBundler/source/ui/NewFileDialog.cpp
new file mode 100644
index 0000000000..170da4a659
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/NewFileDialog.cpp
@@ -0,0 +1,224 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/NewFileDialog.h>
+#include <source/ui/ui_NewFileDialog.h>
+
+#include <source/ui/PlatformSelectionWidget.h>
+#include <source/utils/utils.h>
+
+#include <AzCore/IO/FileIO.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/Asset/AssetBundler.h>
+
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QPushButton>
+
+namespace AssetBundler
+{
+    NewFileDialog::NewFileDialog(
+        QWidget* parent,
+        const QString& dialogTitle,
+        const QString& startingPath,
+        const char* fileExtension,
+        const QString& fileNameFilter,
+        const AzFramework::PlatformFlags& enabledPlatforms,
+        bool isRunningRule)
+        : QDialog(parent)
+        , m_startingPath(startingPath)
+        , m_fileExtension(fileExtension)
+    {
+        m_ui.reset(new Ui::NewFileDialog);
+        m_ui->setupUi(this);
+
+        setWindowTitle(dialogTitle);
+
+        // Set up File Name section
+        m_ui->fileNameLineEdit->setEnabled(false);
+        connect(m_ui->browseButton, &QPushButton::clicked, this, &NewFileDialog::OnBrowseButtonPressed);
+
+        m_newFileDialog.setFileMode(QFileDialog::AnyFile);
+        m_newFileDialog.setNameFilter(fileNameFilter);
+        m_newFileDialog.setViewMode(QFileDialog::Detail);
+        m_newFileDialog.setDirectory(m_startingPath);
+        // We are not creating a new file when Qt thinks we are, so we need to block signals or else the file watcher will be triggered too soon
+        m_newFileDialog.blockSignals(true);
+
+        // Set up Platform selection
+        QString disabledPatformMessageOverride;
+        if (isRunningRule)
+        {
+            disabledPatformMessageOverride = tr("This platform is not valid for all input Asset Lists.");
+        }
+        m_ui->platformSelectionWidget->Init(enabledPlatforms, disabledPatformMessageOverride);
+        connect(m_ui->platformSelectionWidget, &PlatformSelectionWidget::PlatformsSelected, this, &NewFileDialog::OnPlatformSelectionChanged);
+
+        // Set up Cancel and Create New File buttons
+        m_ui->createFileButton->setEnabled(false);
+        connect(m_ui->cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+        connect(m_ui->createFileButton, &QPushButton::clicked, this, &NewFileDialog::OnCreateFileButtonPressed);
+    }
+
+    AZStd::string NewFileDialog::GetAbsoluteFilePath()
+    {
+        return m_absoluteFilePath;
+    }
+
+    AzFramework::PlatformFlags NewFileDialog::GetPlatformFlags()
+    {
+        return m_ui->platformSelectionWidget->GetSelectedPlatforms();
+    }
+
+    void NewFileDialog::OnBrowseButtonPressed()
+    {
+        int result = m_newFileDialog.exec();
+        if (result == QDialog::DialogCode::Accepted)
+        {
+            m_absoluteFilePath = m_newFileDialog.selectedFiles()[0].toUtf8().data();
+            AzToolsFramework::RemovePlatformIdentifier(m_absoluteFilePath);
+
+            if (m_fileExtension && !AzFramework::StringFunc::Path::HasExtension(m_absoluteFilePath.c_str()))
+            {
+                m_absoluteFilePath.append(".");
+                m_absoluteFilePath.append(m_fileExtension);
+            }
+
+            m_ui->fileNameLineEdit->setEnabled(true);
+            m_ui->fileNameLineEdit->setText(m_absoluteFilePath.c_str());
+        }
+
+        m_fileNameIsValid = !m_absoluteFilePath.empty();
+        m_ui->createFileButton->setEnabled(m_platformIsValid && m_fileNameIsValid);
+    }
+
+    void NewFileDialog::OnPlatformSelectionChanged(const AzFramework::PlatformFlags& selectedPlatforms)
+    {
+        // Hide the "Create File" button if no platforms are selected
+        m_platformIsValid = selectedPlatforms != AzFramework::PlatformFlags::Platform_NONE;
+        m_ui->createFileButton->setEnabled(m_platformIsValid && m_fileNameIsValid);
+    }
+
+    void NewFileDialog::OnCreateFileButtonPressed()
+    {
+        // Check to see if any of the selected platform-specific files already exist on-disk
+        QString overwriteExistingFilesList;
+        AZStd::fixed_vector<AZStd::string, AzFramework::NumPlatforms> selectedPlatformNames = AzFramework::PlatformHelper::GetPlatforms(GetPlatformFlags());
+        for (const AZStd::string& platformName : selectedPlatformNames)
+        {
+            FilePath platformSpecificFilePath(GetAbsoluteFilePath(), platformName);
+            const char* platformSpecificFileAbsolutePath = platformSpecificFilePath.AbsolutePath().c_str();
+            if (AZ::IO::FileIOBase::GetInstance()->Exists(platformSpecificFileAbsolutePath))
+            {
+                overwriteExistingFilesList.append(QString("%1\n").arg(platformSpecificFileAbsolutePath));
+            }
+        }
+
+        // Ask the user if they are sure they want to overwrite existing files
+        if (!overwriteExistingFilesList.isEmpty())
+        {
+            QString messageBoxText = QString(tr("The following files already exist on-disk. Generating new files will overwrite the existing ones.\n\n%1\n\nDo you wish to permanently delete the existing files?")).arg(overwriteExistingFilesList);
+
+            QMessageBox::StandardButton confirmDeleteFileResult = QMessageBox::question(this, QString(tr("Replace Existing Files")), messageBoxText);
+            if (confirmDeleteFileResult != QMessageBox::StandardButton::Yes)
+            {
+                // User canceled out of the operation
+                return;
+            }
+        }
+
+        emit QDialog::accept();
+    }
+
+    AZStd::string NewFileDialog::OSNewFileDialog(QWidget* parent, const char* fileExtension, const char* fileTypeDisplayName, const AZStd::string& startingDirectory)
+    {
+        QFileDialog filePathDialog(parent);
+        filePathDialog.setFileMode(QFileDialog::AnyFile);
+        filePathDialog.setNameFilter(QString(tr("%1 (*.%2)")).arg(fileTypeDisplayName).arg(fileExtension));
+        filePathDialog.setViewMode(QFileDialog::Detail);
+        filePathDialog.setDirectory(startingDirectory.c_str());
+
+        // Since we handle file creation instead of the OS, we have to block signals or else the model will be reloaded,
+        //    and our in-memory changes will be lost.
+        filePathDialog.blockSignals(true);
+        int result = filePathDialog.exec();
+        if (result == QDialog::DialogCode::Rejected || filePathDialog.selectedFiles().empty())
+        {
+            // User canceled out of the file dialog, cancel operation
+            return "";
+        }
+
+        AZStd::string absoluteFilePath(filePathDialog.selectedFiles()[0].toUtf8().data());
+        if (!AzFramework::StringFunc::Path::HasExtension(absoluteFilePath.c_str()))
+        {
+            absoluteFilePath = AZStd::string::format("%s%c%s", absoluteFilePath.c_str(), AZ_FILESYSTEM_EXTENSION_SEPARATOR, fileExtension);
+        }
+
+        return absoluteFilePath;
+    }
+
+    int NewFileDialog::FileGenerationResultMessageBox(QWidget* parent, const AZStd::vector<AZStd::string>& generatedFiles, bool generatedWithErrors)
+    {
+        QMessageBox messageBox(parent);
+        messageBox.setStandardButtons(QMessageBox::Ok);
+        messageBox.setDefaultButton(QMessageBox::Ok);
+
+        if (generatedFiles.empty())
+        {
+            messageBox.setText(QString("No files were generated. Please refer to the console for more information."));
+            messageBox.setIcon(QMessageBox::Critical);
+            return messageBox.exec();
+        }
+
+        QString messageText;
+        if (generatedWithErrors)
+        {
+            messageText = QString("The following files were generated with errors. Please refer to the console for more information.\n\n");
+            messageBox.setIcon(QMessageBox::Warning);
+        }
+        else
+        {
+            messageText = QString("You have successfully generated:\n\n");
+            messageBox.setIcon(QMessageBox::NoIcon);
+        }
+
+        AZStd::string fileName;
+        for (const AZStd::string& filePath : generatedFiles)
+        {
+            AzFramework::StringFunc::Path::GetFullFileName(filePath.c_str(), fileName);
+            messageText.append(QString("%1\n").arg(fileName.c_str()));
+        }
+
+        AZStd::string extension;
+        AzFramework::StringFunc::Path::GetExtension(fileName.c_str(), extension, false);
+        if (extension == AzToolsFramework::AssetSeedManager::GetAssetListFileExtension())
+        {
+            messageText.append("\nVisit the Asset Lists tab to see the lists.");
+        }
+        else if (extension == AzToolsFramework::AssetBundleSettings::GetBundleFileExtension())
+        {
+            messageText.append("\nVisit the Completed Bundles tab to see the bundles.");
+        }
+
+        messageBox.setText(messageText);
+
+        // QMessageBoxes try to shrink to the smallest size possible, so we need to make a spacer
+        QSpacerItem* horizontalSpacer = new QSpacerItem(550, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        QGridLayout* layout = static_cast<QGridLayout*>(messageBox.layout());
+        layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
+
+        return messageBox.exec();
+    }
+
+} //namespace AssetBundler
+
+#include <source/ui/moc_NewFileDialog.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/NewFileDialog.h b/Code/Tools/AssetBundler/source/ui/NewFileDialog.h
new file mode 100644
index 0000000000..5974d3da6a
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/NewFileDialog.h
@@ -0,0 +1,73 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/string/string.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QDialog>
+#include <QFileDialog>
+#include <QSharedPointer>
+#endif
+
+namespace Ui
+{
+    class NewFileDialog;
+}
+
+namespace AssetBundler
+{
+    class GUIApplicationManager;
+
+    class NewFileDialog
+        : public QDialog
+    {
+        Q_OBJECT
+
+    public:
+        explicit NewFileDialog(
+            QWidget* parent,
+            const QString& dialogTitle,
+            const QString& startingPath,
+            const char* fileExtension,
+            const QString& fileNameFilter,
+            const AzFramework::PlatformFlags& enabledPlatforms,
+            bool isRunningRule = false);
+        virtual ~NewFileDialog() {}
+
+        AZStd::string GetAbsoluteFilePath();
+        AzFramework::PlatformFlags GetPlatformFlags();
+
+        //! A standard OS-specific New File Dialog, but blocks all Qt signals from the dialog and does NOT create a new file.
+        //! Use in place of the static QFileDialog functions to avoid unexpected file watcher updates.
+        //! Returns the absolute path of the file the user either selected or attempted to create, or an empty string if the user canceled out of the dialog. 
+        static AZStd::string OSNewFileDialog(QWidget* parent, const char* fileExtension, const char* fileTypeDisplayName, const AZStd::string& startingDirectory);
+
+        static int FileGenerationResultMessageBox(QWidget* parent, const AZStd::vector<AZStd::string>& generatedFiles, bool generatedWithErrors);
+
+    private:
+        void OnBrowseButtonPressed();
+        void OnPlatformSelectionChanged(const AzFramework::PlatformFlags& selectedPlatforms);
+        void OnCreateFileButtonPressed();
+
+        QSharedPointer<Ui::NewFileDialog> m_ui;
+        QString m_startingPath;
+        const char* m_fileExtension;
+        QFileDialog m_newFileDialog;
+
+        AZStd::string m_absoluteFilePath;
+
+        bool m_fileNameIsValid = false;
+        bool m_platformIsValid = false;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/NewFileDialog.ui b/Code/Tools/AssetBundler/source/ui/NewFileDialog.ui
new file mode 100644
index 0000000000..17d439549c
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/NewFileDialog.ui
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewFileDialog</class>
+ <widget class="QDialog" name="NewFileDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>450</width>
+    <height>90</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>450</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_5">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="inputValuesFrame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <item>
+         <widget class="QLabel" name="fileNameLabel">
+          <property name="text">
+           <string>Save As:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="fileNameLineEdit">
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="browseButton">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="AssetBundler::PlatformSelectionWidget" name="platformSelectionWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="rightMargin">
+      <number>10</number>
+     </property>
+     <property name="bottomMargin">
+      <number>10</number>
+     </property>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+       <property name="default">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="createFileButton">
+       <property name="text">
+        <string>Create New File</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AssetBundler::PlatformSelectionWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">source/ui/PlatformSelectionWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
new file mode 100644
index 0000000000..80b4590c3c
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
@@ -0,0 +1,126 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/PlatformSelectionWidget.h>
+#include <source/ui/ui_PlatformSelectionWidget.h>
+
+#include <AzCore/std/string/string.h>
+
+namespace AssetBundler
+{
+
+    PlatformSelectionWidget::PlatformSelectionWidget(QWidget* parent)
+        : QWidget(parent)
+    {
+        m_ui.reset(new Ui::PlatformSelectionWidget);
+        m_ui->setupUi(this);
+
+        m_platformHelper.reset(new AzFramework::PlatformHelper);
+
+        m_selectedPlatforms = AzFramework::PlatformFlags::Platform_NONE;
+        m_partiallySelectedPlatforms = AzFramework::PlatformFlags::Platform_NONE;
+    }
+
+    void PlatformSelectionWidget::Init(const AzFramework::PlatformFlags& enabledPlatforms, const QString& disabledPatformMessageOverride)
+    {
+        using namespace AzFramework;
+
+        // Set up Platform Checkboxes
+        for (const AZStd::string_view& platformString : m_platformHelper->GetPlatforms(PlatformFlags::AllNamedPlatforms))
+        {
+            // Create the CheckBox and store what platform it maps to
+            QSharedPointer<QCheckBox> platformCheckBox(new QCheckBox(QString::fromUtf8(platformString.data(), platformString.size())));
+            m_platformCheckBoxes.push_back(platformCheckBox);
+            PlatformFlags currentPlatformFlag = m_platformHelper->GetPlatformFlag(platformString);
+            m_platformList.push_back(currentPlatformFlag);
+
+            // Add the CheckBox to the view
+            m_ui->platformCheckBoxLayout->addWidget(platformCheckBox.data());
+
+            // If the platform is not enabled for the current project, disable it and tell the user
+            if ((enabledPlatforms & currentPlatformFlag) == PlatformFlags::Platform_NONE)
+            {
+                platformCheckBox->setEnabled(false);
+                if (disabledPatformMessageOverride.isEmpty())
+                {
+                    platformCheckBox->setToolTip(tr("This platform is not enabled for the current project."));
+                }
+                else
+                {
+                    platformCheckBox->setToolTip(disabledPatformMessageOverride);
+                }
+            }
+            else
+            {
+                connect(platformCheckBox.data(), &QCheckBox::stateChanged, this, &PlatformSelectionWidget::OnPlatformSelectionChanged);
+            }
+        }
+    }
+
+    void PlatformSelectionWidget::SetSelectedPlatforms(const AzFramework::PlatformFlags& selectedPlatforms, const AzFramework::PlatformFlags& partiallySelectedPlatforms)
+    {
+        m_selectedPlatforms = AzFramework::PlatformFlags::Platform_NONE;
+        m_partiallySelectedPlatforms = AzFramework::PlatformFlags::Platform_NONE;
+        for (int checkBoxIndex = 0; checkBoxIndex < m_platformCheckBoxes.size(); ++checkBoxIndex)
+        {
+            AzFramework::PlatformFlags checkBoxPlatform = m_platformList[checkBoxIndex];
+            bool isSelected = (checkBoxPlatform & selectedPlatforms) != AzFramework::PlatformFlags::Platform_NONE;
+            m_platformCheckBoxes[checkBoxIndex]->setChecked(isSelected);
+            if (isSelected)
+            {
+                m_selectedPlatforms |= checkBoxPlatform;
+            }
+
+            // Set the check status to Qt::PartiallyChecked when some of the selected items support the current platform
+            bool isPartiallySelected = (checkBoxPlatform & partiallySelectedPlatforms) != AzFramework::PlatformFlags::Platform_NONE;
+            if (isPartiallySelected)
+            {
+                m_platformCheckBoxes[checkBoxIndex]->setCheckState(Qt::PartiallyChecked);
+                m_partiallySelectedPlatforms |= checkBoxPlatform;
+            }
+        }
+
+        emit PlatformsSelected(m_selectedPlatforms, m_partiallySelectedPlatforms);
+    }
+
+    AzFramework::PlatformFlags PlatformSelectionWidget::GetSelectedPlatforms()
+    {
+        return m_selectedPlatforms;
+    }
+
+    AzFramework::PlatformFlags PlatformSelectionWidget::GetPartiallySelectedPlatforms()
+    {
+        return m_partiallySelectedPlatforms;
+    }
+
+    void PlatformSelectionWidget::OnPlatformSelectionChanged()
+    {
+        m_selectedPlatforms = AzFramework::PlatformFlags::Platform_NONE;
+        m_partiallySelectedPlatforms = AzFramework::PlatformFlags::Platform_NONE;
+        for (int checkBoxIndex = 0; checkBoxIndex < m_platformCheckBoxes.size(); ++checkBoxIndex)
+        {
+            if (m_platformCheckBoxes[checkBoxIndex]->checkState() == Qt::Checked)
+            {
+                m_selectedPlatforms |= m_platformList[checkBoxIndex];
+            }
+            else if (m_platformCheckBoxes[checkBoxIndex]->checkState() == Qt::PartiallyChecked)
+            {
+                m_partiallySelectedPlatforms |= m_platformList[checkBoxIndex];
+            }
+        }
+
+        emit PlatformsSelected(m_selectedPlatforms, m_partiallySelectedPlatforms);
+    }
+
+} // namespace AssetBundler
+
+#include <source/ui/moc_PlatformSelectionWidget.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.h b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.h
new file mode 100644
index 0000000000..223044478f
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.h
@@ -0,0 +1,62 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QCheckBox>
+#include <QSharedPointer>
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class PlatformSelectionWidget;
+}
+
+namespace AssetBundler
+{
+    class PlatformSelectionWidget
+        : public QWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit PlatformSelectionWidget(QWidget* parent);
+        virtual ~PlatformSelectionWidget() {}
+
+        void Init(const AzFramework::PlatformFlags& enabledPlatforms, const QString& disabledPatformMessageOverride = "");
+
+        void SetSelectedPlatforms(const AzFramework::PlatformFlags& selectedPlatforms, const AzFramework::PlatformFlags& partiallySelectedPlatforms);
+
+        AzFramework::PlatformFlags GetSelectedPlatforms();
+        AzFramework::PlatformFlags GetPartiallySelectedPlatforms();
+
+    Q_SIGNALS:
+        void PlatformsSelected(AzFramework::PlatformFlags selectedPlatforms, AzFramework::PlatformFlags partiallySelectedPlatforms);
+
+    private:
+        void OnPlatformSelectionChanged();
+
+        QSharedPointer<Ui::PlatformSelectionWidget> m_ui;
+        AZStd::unique_ptr<AzFramework::PlatformHelper> m_platformHelper;
+
+        QVector<QSharedPointer<QCheckBox>> m_platformCheckBoxes;
+        AZStd::vector<AzFramework::PlatformFlags> m_platformList;
+
+        AzFramework::PlatformFlags m_selectedPlatforms;
+        AzFramework::PlatformFlags m_partiallySelectedPlatforms;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.ui b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.ui
new file mode 100644
index 0000000000..d2ecb61e64
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.ui
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PlatformSelectionWidget</class>
+ <widget class="QWidget" name="PlatformSelectionWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="labelAlignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="platformsLabel">
+     <property name="text">
+      <string>Platforms:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <layout class="QVBoxLayout" name="platformCheckBoxLayout"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/RulesTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.cpp
new file mode 100644
index 0000000000..56447f4a57
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.cpp
@@ -0,0 +1,432 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/RulesTabWidget.h>
+#include <source/ui/ui_RulesTabWidget.h>
+
+#include <source/models/RulesFileTableModel.h>
+#include <source/ui/ComparisonDataWidget.h>
+#include <source/ui/NewFileDialog.h>
+#include <source/utils/GUIApplicationManager.h>
+#include <source/utils/utils.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/Asset/AssetBundler.h>
+#include <AzToolsFramework/AssetBundle/AssetBundleAPI.h>
+#include <AzQtComponents/Components/FilteredSearchWidget.h>
+
+#include <QAbstractTableModel>
+#include <QItemSelectionModel>
+#include <QMenu>
+#include <QPushButton>
+
+
+namespace AssetBundler
+{
+    RulesTabWidget::RulesTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager)
+        : AssetBundlerTabWidget(parent, guiApplicationManager)
+    {
+        m_ui.reset(new Ui::RulesTabWidget);
+        m_ui->setupUi(this);
+
+        m_ui->mainVerticalLayout->setContentsMargins(MarginSize, MarginSize, MarginSize, MarginSize);
+
+        m_fileTableModel.reset(new RulesFileTableModel);
+        m_ui->fileTableView->setModel(m_fileTableModel.data());
+
+        // Table View of all Rules files
+        m_fileTableFilterModel.reset(new AssetBundlerFileTableFilterModel(this, m_fileTableModel->GetFileNameColumnIndex(), m_fileTableModel->GetTimeStampColumnIndex()));
+
+        m_fileTableFilterModel->setSourceModel(m_fileTableModel.data());
+        m_ui->fileTableView->setModel(m_fileTableFilterModel.data());
+        connect(m_ui->fileFilteredSearchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged,
+            m_fileTableFilterModel.data(), static_cast<void (QSortFilterProxyModel::*)(const QString&)>(&AssetBundlerFileTableFilterModel::FilterChanged));
+
+        connect(m_ui->fileTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &RulesTabWidget::FileSelectionChanged);
+
+        m_ui->fileTableView->setIndentation(0);
+
+        // New File Button
+        connect(m_ui->createNewFileButton, &QPushButton::clicked, this, &RulesTabWidget::OnNewFileButtonPressed);
+
+        // Run Rule Button
+        m_ui->runRuleButton->setEnabled(false);
+        connect(m_ui->runRuleButton, &QPushButton::clicked, this, &RulesTabWidget::OnRunRuleButtonPressed);
+
+        // Add Comparison Step button
+        connect(m_ui->addComparisonStepButton, &QPushButton::clicked, this, &RulesTabWidget::AddNewComparisonStep);
+
+        SetModelDataSource();
+    }
+
+    bool RulesTabWidget::HasUnsavedChanges()
+    {
+        return m_fileTableModel->HasUnsavedChanges();
+    }
+
+    void RulesTabWidget::Reload()
+    {
+        m_fileTableModel->Reload(AzToolsFramework::AssetFileInfoListComparison::GetComparisonRulesFileExtension(), m_watchedFolders, m_watchedFiles);
+        FileSelectionChanged();
+    }
+
+    bool RulesTabWidget::SaveCurrentSelection()
+    {
+        return m_fileTableModel->Save(m_selectedFileTableIndex);
+    }
+
+    bool RulesTabWidget::SaveAll()
+    {
+         return m_fileTableModel->SaveAll();
+    }
+
+    void RulesTabWidget::SetModelDataSource()
+    {
+        // Remove the current watched folders and files
+        m_guiApplicationManager->RemoveWatchedPaths(m_watchedFolders + m_watchedFiles);
+
+        // Set the new watched folder for the model
+        m_watchedFolders.clear();
+        m_watchedFiles.clear();
+        m_watchedFolders.insert(m_guiApplicationManager->GetRulesFolder().c_str());
+        ReadScanPathsFromAssetBundlerSettings(AssetBundlingFileType::RulesFileType);
+
+        m_guiApplicationManager->AddWatchedPaths(m_watchedFolders + m_watchedFiles);
+    }
+
+    AzQtComponents::TableView* RulesTabWidget::GetFileTableView()
+    {
+        return m_ui->fileTableView;
+    }
+
+    QModelIndex RulesTabWidget::GetSelectedFileTableIndex()
+    {
+        return m_selectedFileTableIndex;
+    }
+
+    AssetBundlerAbstractFileTableModel* RulesTabWidget::GetFileTableModel()
+    {
+        return m_fileTableModel.get();
+    }
+
+    void RulesTabWidget::SetActiveProjectLabel(const QString& labelText)
+    {
+        m_ui->activeProjectLabel->setText(labelText);
+    }
+
+    void RulesTabWidget::ApplyConfig()
+    {
+        const GUIApplicationManager::Config& config = m_guiApplicationManager->GetConfig();
+        m_ui->fileTableFrame->setFixedWidth(config.fileTableWidth);
+        m_ui->fileTableView->header()->resizeSection(RulesFileTableModel::Column::ColumnFileName, config.fileNameColumnWidth);
+    }
+
+
+    void RulesTabWidget::FileSelectionChanged(const QItemSelection& /*selected*/, const QItemSelection& /*deselected*/)
+    {
+        if (m_ui->fileTableView->selectionModel()->selectedRows().size() == 0)
+        {
+            m_selectedFileTableIndex = QModelIndex();
+            m_selectedComparisonRules = nullptr;
+            m_ui->runRuleButton->setEnabled(false);
+            m_ui->addComparisonStepButton->setEnabled(false);
+            m_ui->rulesFileAbsolutePathLabel->clear();
+            RemoveAllComparisonDataCards();
+
+            return;
+        }
+
+        m_ui->runRuleButton->setEnabled(true);
+        m_ui->addComparisonStepButton->setEnabled(true);
+
+        m_selectedFileTableIndex = m_fileTableFilterModel->mapToSource(m_ui->fileTableView->selectionModel()->selectedRows()[0]);
+        m_selectedComparisonRules = m_fileTableModel->GetComparisonSteps(m_selectedFileTableIndex);
+
+        m_ui->rulesFileAbsolutePathLabel->setText(m_fileTableModel->GetFileAbsolutePath(m_selectedFileTableIndex).c_str());
+
+        RebuildComparisonDataCardList();
+    }
+
+    void RulesTabWidget::OnNewFileButtonPressed()
+    {
+        AZStd::string absoluteFilePath = NewFileDialog::OSNewFileDialog(
+            this,
+            AzToolsFramework::AssetFileInfoListComparison::GetComparisonRulesFileExtension(),
+            "Comparison Rules",
+            m_guiApplicationManager->GetRulesFolder());
+
+        if (absoluteFilePath.empty())
+        {
+            // User canceled out of the dialog
+            return;
+        }
+
+        AZStd::vector<AZStd::string> createdFile = m_fileTableModel->CreateNewFiles(absoluteFilePath);
+        if (!createdFile.empty())
+        {
+            AddScanPathToAssetBundlerSettings(AssetBundlingFileType::RulesFileType, createdFile.at(0));
+        }
+    }
+
+    void RulesTabWidget::OnRunRuleButtonPressed()
+    {
+        using namespace AzToolsFramework;
+
+        // Determine which platforms all of the input Asset List files have in common
+        AzFramework::PlatformFlags commonPlatforms = AzFramework::PlatformFlags::AllNamedPlatforms;
+        for (const AssetFileInfoListComparison::ComparisonData& comparisonStep : m_selectedComparisonRules->GetComparisonList())
+        {
+            if (!comparisonStep.m_cachedFirstInputPath.empty())
+            {
+                commonPlatforms = commonPlatforms & GetPlatformsOnDiskForPlatformSpecificFile(comparisonStep.m_cachedFirstInputPath);
+            }
+
+            if (!comparisonStep.m_cachedSecondInputPath.empty())
+            {
+                commonPlatforms = commonPlatforms & GetPlatformsOnDiskForPlatformSpecificFile(comparisonStep.m_cachedSecondInputPath);
+            }
+        }
+
+        if (commonPlatforms == AzFramework::PlatformFlags::Platform_NONE)
+        {
+            AZ_Error("AssetBundler", false, "Unable to run Rule: Input Asset List files have no platforms in common.");
+            return;
+        }
+
+        // Prompt the user to select an output path and the platforms to run the rule on
+        NewFileDialog runRuleDialog = NewFileDialog(
+            this,
+            "Run Rule",
+            QString(m_guiApplicationManager->GetAssetListsFolder().c_str()),
+            AzToolsFramework::AssetSeedManager::GetAssetListFileExtension(),
+            QString(tr("Asset List (*.%1)")).arg(AzToolsFramework::AssetSeedManager::GetAssetListFileExtension()),
+            commonPlatforms,
+            true);
+
+        auto dialogResponse = runRuleDialog.exec();
+        if (dialogResponse == QDialog::DialogCode::Rejected)
+        {
+            // User canceled the operation
+            return;
+        }
+
+        AZStd::vector<AZStd::string> outputFilePaths;
+        bool hasFileGenerationErrors = false;
+
+        AZStd::fixed_vector<AZStd::string, AzFramework::NumPlatforms> selectedPlatformNames = AzFramework::PlatformHelper::GetPlatforms(runRuleDialog.GetPlatformFlags());
+        for (const AZStd::string& platformName : selectedPlatformNames)
+        {
+            // We do not want to modify the original Rules file, as we do not save Asset List file paths to disk
+            AssetFileInfoListComparison currentFileCopy = *m_selectedComparisonRules.get();
+
+            //Update the first and second input values with any non-token Asset List file paths that have been set, 
+            size_t numComparisonSteps = currentFileCopy.GetNumComparisonSteps();
+            for (size_t comparisonStepIndex = 0; comparisonStepIndex < numComparisonSteps; ++comparisonStepIndex)
+            {
+                AssetFileInfoListComparison::ComparisonData comparisonStep = currentFileCopy.GetComparisonList()[comparisonStepIndex];
+                if (comparisonStep.m_firstInput.empty())
+                {
+                    if (comparisonStep.m_cachedFirstInputPath.empty())
+                    {
+                        AZ_Error("AssetBundler", false, "Unable to run Rule: Comparison Step #%u has no specified first input.", comparisonStepIndex);
+                        return;
+                    }
+
+                    FilePath firstInput = FilePath(comparisonStep.m_cachedFirstInputPath, platformName);
+                    currentFileCopy.SetFirstInput(comparisonStepIndex, firstInput.AbsolutePath());
+                }
+
+                if (comparisonStep.m_comparisonType != AssetFileInfoListComparison::ComparisonType::FilePattern
+                    && comparisonStep.m_secondInput.empty())
+                {
+                    if (comparisonStep.m_cachedSecondInputPath.empty())
+                    {
+                        AZ_Error("AssetBundler", false, "Unable to run Rule: Comparison Step #%u has no specified second input.", comparisonStepIndex);
+                        return;
+                    }
+
+                    FilePath secondInput = FilePath(comparisonStep.m_cachedSecondInputPath, platformName);
+                    currentFileCopy.SetSecondInput(comparisonStepIndex, secondInput.AbsolutePath());
+                }
+            }
+
+            // Set the output location of the Asset List file that will be generated
+            FilePath finalOutputPath = FilePath(runRuleDialog.GetAbsoluteFilePath(), platformName);
+            currentFileCopy.SetOutput(numComparisonSteps - 1, finalOutputPath.AbsolutePath());
+
+            //Run the Rule
+            auto compareOutcome = currentFileCopy.CompareAndSaveResults();
+            if (compareOutcome.IsSuccess())
+            {
+                outputFilePaths.emplace_back(finalOutputPath.AbsolutePath());
+            }
+            else
+            {
+                hasFileGenerationErrors = true;
+                AZ_Error("AssetBundler", false, compareOutcome.GetError().c_str());
+            }
+        }
+
+        // Add created files to the file watcher
+        for (const AZStd::string& absolutePath : outputFilePaths)
+        {
+            AddScanPathToAssetBundlerSettings(AssetBundlingFileType::AssetListFileType, absolutePath);
+        }
+
+        // The watched files list was updated after the files were created, so we need to force-reload them
+        m_guiApplicationManager->UpdateFiles(AssetBundlingFileType::AssetListFileType, outputFilePaths);
+
+        NewFileDialog::FileGenerationResultMessageBox(this, outputFilePaths, hasFileGenerationErrors);
+    }
+
+    void RulesTabWidget::MarkFileChanged()
+    {
+        m_fileTableModel->MarkFileChanged(m_selectedFileTableIndex);
+    }
+
+    void RulesTabWidget::RebuildComparisonDataCardList()
+    {
+        RemoveAllComparisonDataCards();
+        PopulateComparisonDataCardList();
+    }
+
+    void RulesTabWidget::PopulateComparisonDataCardList()
+    {
+        if (!m_selectedComparisonRules)
+        {
+            return;
+        }
+
+        for (int index = 0; index < m_selectedComparisonRules->GetComparisonList().size(); ++index)
+        {
+            CreateComparisonDataCard(m_selectedComparisonRules, static_cast<size_t>(index));
+        }
+    }
+
+    void RulesTabWidget::CreateComparisonDataCard(AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> comparisonList, size_t comparisonDataIndex)
+    {
+        ComparisonDataCard* comparisonDataCard = new ComparisonDataCard(comparisonList, comparisonDataIndex, m_guiApplicationManager->GetAssetListsFolder());
+        comparisonDataCard->setTitle(tr("Step %1").arg(static_cast<int>(comparisonDataIndex) + 1));
+        m_ui->comparisonDataListLayout->addWidget(comparisonDataCard);
+        m_comparisonDataCardList.push_back(comparisonDataCard);
+
+        ComparisonDataWidget* comparisonDataWidget = comparisonDataCard->GetComparisonDataWidget();
+        connect(comparisonDataCard, &ComparisonDataCard::comparisonDataCardContextMenuRequested, this, &RulesTabWidget::OnComparisonDataCardContextMenuRequested);
+        connect(comparisonDataWidget, &ComparisonDataWidget::comparisonDataChanged, this, &RulesTabWidget::MarkFileChanged);
+        connect(comparisonDataWidget, &ComparisonDataWidget::comparisonDataTokenNameChanged, this, &RulesTabWidget::OnAnyTokenNameChanged);
+
+        comparisonDataCard->show();
+    }
+
+    void RulesTabWidget::RemoveAllComparisonDataCards()
+    {
+        m_comparisonDataCardList.clear();
+
+        while (!m_ui->comparisonDataListLayout->isEmpty())
+        {
+            QLayoutItem* item = m_ui->comparisonDataListLayout->takeAt(0);
+            item->widget()->hide();
+            delete item;
+        }
+    }
+
+    void RulesTabWidget::AddNewComparisonStep()
+    {
+        if (!m_selectedComparisonRules)
+        {
+            return;
+        }
+
+        if (!m_selectedComparisonRules->AddComparisonStep(AzToolsFramework::AssetFileInfoListComparison::ComparisonData()))
+        {
+            return;
+        }
+
+        CreateComparisonDataCard(m_selectedComparisonRules, m_selectedComparisonRules->GetComparisonList().size() - 1);
+        MarkFileChanged();
+    }
+
+    void RulesTabWidget::RemoveComparisonStep(size_t comparisonDataIndex)
+    {
+        if (!m_selectedComparisonRules)
+        {
+            return;
+        }
+
+        if (m_selectedComparisonRules->RemoveComparisonStep(comparisonDataIndex))
+        {
+            MarkFileChanged();
+            RebuildComparisonDataCardList();
+        }
+    }
+
+    void RulesTabWidget::MoveComparisonStep(size_t startingIndex, size_t destinationIndex)
+    {
+        if (!m_selectedComparisonRules)
+        {
+            return;
+        }
+
+        if (m_selectedComparisonRules->MoveComparisonStep(startingIndex, destinationIndex))
+        {
+            MarkFileChanged();
+            RebuildComparisonDataCardList();
+        }
+    }
+
+    void RulesTabWidget::OnAnyTokenNameChanged(size_t comparisonDataIndex)
+    {
+        if (comparisonDataIndex >= m_comparisonDataCardList.size() - 1)
+        {
+            return;
+        }
+
+        for (size_t i = comparisonDataIndex + 1; i < m_comparisonDataCardList.size(); ++i)
+        {
+            m_comparisonDataCardList[i]->GetComparisonDataWidget()->UpdateListOfTokenNames();
+        }
+    }
+
+    void RulesTabWidget::OnComparisonDataCardContextMenuRequested(size_t comparisonDataIndex, const QPoint& position)
+    {
+        if (!m_selectedComparisonRules)
+        {
+            return;
+        }
+
+        QMenu menu;
+
+        QAction* moveUpAction = new QAction(tr("Move Up"), this);
+        moveUpAction->setEnabled(comparisonDataIndex > 0);
+        connect(moveUpAction, &QAction::triggered, this, [=]() { MoveComparisonStep(comparisonDataIndex, comparisonDataIndex - 1); });
+        menu.addAction(moveUpAction);
+
+        QAction* moveDownAction = new QAction(tr("Move Down"), this);
+        moveDownAction->setEnabled(comparisonDataIndex < m_selectedComparisonRules->GetNumComparisonSteps() - 1);
+        connect(moveDownAction, &QAction::triggered, this, [=]() { MoveComparisonStep(comparisonDataIndex, comparisonDataIndex + 2); });
+        menu.addAction(moveDownAction);
+
+        QAction* separator = new QAction(this);
+        separator->setSeparator(true);
+        menu.addAction(separator);
+
+        QAction* deleteAction = new QAction(tr("Remove Comparison Step"), this);
+        connect(deleteAction, &QAction::triggered, this, [=]() { RemoveComparisonStep(comparisonDataIndex); });
+        menu.addAction(deleteAction);
+
+        menu.exec(position);
+    }
+
+} // namespace AssetBundler
+
+#include <source/ui/moc_RulesTabWidget.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/RulesTabWidget.h b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.h
new file mode 100644
index 0000000000..7dedce3efe
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.h
@@ -0,0 +1,120 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <source/ui/AssetBundlerTabWidget.h>
+
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+
+#include <QAction>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class RulesTabWidget;
+}
+
+class QItemSelection;
+
+namespace AzToolsFramework
+{
+    class AssetFileInfoListComparison;
+}
+
+namespace AssetBundler
+{
+    class GUIApplicationManager;
+
+    class RulesFileTableModel;
+
+    class ComparisonDataCard;
+
+    class ComparisonDataWidget;
+
+    class RulesTabWidget
+        : public AssetBundlerTabWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit RulesTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager);
+        virtual ~RulesTabWidget() {}
+
+        QString GetTabTitle() override { return tr("Rules"); }
+
+        QString GetFileTypeDisplayName() override { return tr("Rules file"); }
+
+        AssetBundlingFileType GetFileType() override { return AssetBundlingFileType::RulesFileType; }
+
+        bool HasUnsavedChanges() override;
+
+        void Reload() override;
+
+        bool SaveCurrentSelection() override;
+
+        bool SaveAll() override;
+
+        void SetModelDataSource() override;
+
+        AzQtComponents::TableView* GetFileTableView() override;
+
+        QModelIndex GetSelectedFileTableIndex() override;
+
+        AssetBundlerAbstractFileTableModel* GetFileTableModel() override;
+
+        void SetActiveProjectLabel(const QString& labelText) override;
+
+        void ApplyConfig() override;
+
+        void FileSelectionChanged(const QItemSelection& /*selected*/ = QItemSelection(), const QItemSelection& /*deselected*/ = QItemSelection()) override;
+
+    private:
+        void OnNewFileButtonPressed();
+
+        void OnRunRuleButtonPressed();
+
+        void MarkFileChanged();
+
+        void RebuildComparisonDataCardList();
+
+        void PopulateComparisonDataCardList();
+
+        void CreateComparisonDataCard(AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> comparisonList, size_t comparisonDataIndex);
+
+        void RemoveAllComparisonDataCards();
+
+        void AddNewComparisonStep();
+
+        void RemoveComparisonStep(size_t comparisonDataIndex);
+
+        void MoveComparisonStep(size_t startingIndex, size_t destinationIndex);
+
+        void OnAnyTokenNameChanged(size_t comparisonDataIndex);
+
+        QSharedPointer<Ui::RulesTabWidget> m_ui;
+
+        QSharedPointer<RulesFileTableModel> m_fileTableModel;
+        QModelIndex m_selectedFileTableIndex;
+        AZStd::shared_ptr<AzToolsFramework::AssetFileInfoListComparison> m_selectedComparisonRules;
+
+        AZStd::vector<ComparisonDataCard*> m_comparisonDataCardList;
+
+    private slots:
+        void OnComparisonDataCardContextMenuRequested(size_t comparisonDataIndex, const QPoint& position);
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/RulesTabWidget.ui b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.ui
new file mode 100644
index 0000000000..f7eec0a796
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.ui
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RulesTabWidget</class>
+ <widget class="QWidget" name="RulesTabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1180</width>
+    <height>728</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Rules Tab Widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="mainVerticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="projectLabelHorizontalLayout">
+     <item>
+      <widget class="QLabel" name="activeProjectLabel"/>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="runRuleButton">
+       <property name="text">
+        <string>Run Selected Rule</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0">
+     <item>
+      <widget class="QFrame" name="fileTableFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_5">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QFrame" name="fileTableHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="rulesFilesLabel">
+             <property name="text">
+              <string>Rules</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::FilteredSearchWidget" name="fileFilteredSearchWidget">
+          <property name="placeholderText" stdset="0">
+           <string>Filter by file name</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <property name="leftMargin">
+           <number>5</number>
+          </property>
+          <property name="rightMargin">
+           <number>5</number>
+          </property>
+          <item>
+           <widget class="QPushButton" name="createNewFileButton">
+            <property name="text">
+             <string>+ Create new Rules file</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="AzQtComponents::TableView" name="fileTableView"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="fileContentsFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QFrame" name="fileContentsHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="comparisonRulesFileNameLabel">
+             <property name="text">
+              <string>Comparison Steps</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="rulesFileAbsolutePathLabel">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <property name="rightMargin">
+           <number>5</number>
+          </property>
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="addComparisonStepButton">
+            <property name="text">
+             <string>+ Add Step</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QScrollArea" name="comparisonDataList">
+          <property name="widgetResizable">
+           <bool>true</bool>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <widget class="QWidget" name="comparisonDataListContents">
+           <property name="geometry">
+            <rect>
+             <x>0</x>
+             <y>0</y>
+             <width>573</width>
+             <height>614</height>
+            </rect>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <property name="spacing">
+             <number>12</number>
+            </property>
+            <property name="leftMargin">
+             <number>10</number>
+            </property>
+            <property name="topMargin">
+             <number>10</number>
+            </property>
+            <property name="rightMargin">
+             <number>10</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <layout class="QVBoxLayout" name="comparisonDataListLayout"/>
+            </item>
+            <item>
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AzQtComponents::TableView</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/Widgets/TableView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>AzQtComponents::FilteredSearchWidget</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/FilteredSearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/SeedTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.cpp
new file mode 100644
index 0000000000..60b4104c5a
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.cpp
@@ -0,0 +1,453 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/ui/SeedTabWidget.h>
+#include <source/ui/ui_SeedTabWidget.h>
+
+#include <source/utils/GUIApplicationManager.h>
+#include <source/ui/AddSeedDialog.h>
+#include <source/ui/EditSeedDialog.h>
+#include <source/ui/NewFileDialog.h>
+#include <source/models/SeedListFileTableModel.h>
+#include <source/models/SeedListTableModel.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzCore/Utils/Utils.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzQtComponents/Components/FilteredSearchWidget.h>
+#include <AzToolsFramework/Asset/AssetSeedManager.h>
+#include <AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h>
+
+#include <QCheckBox>
+#include <QFileDialog>
+#include <QItemSelection>
+#include <QItemSelectionRange>
+#include <QMessageBox>
+#include <QPushButton>
+
+
+const char GenerateAssetListFilesDialogName[] = "Generate Asset List Files";
+
+const int CheckBoxTableIndentationSize = 2; // when the indentation is 0, the checkboxes are too close to the edge
+
+namespace AssetBundler
+{
+    SeedTabWidget::SeedTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager, const QString& assetBundlingDirectory)
+        : AssetBundlerTabWidget(parent, guiApplicationManager)
+        , m_fileTableModel(new SeedListFileTableModel(this))
+        , m_seedListContentsModel(new SeedListTableModel())
+    {
+        AZ_UNUSED(assetBundlingDirectory);
+
+        m_ui.reset(new Ui::SeedTabWidget);
+        m_ui->setupUi(this);
+
+        m_ui->mainVerticalLayout->setContentsMargins(MarginSize, MarginSize, MarginSize, MarginSize);
+
+        AZ::Debug::TraceMessageBus::Handler::BusConnect();
+
+        // File view of all Seed List Files
+        m_fileTableFilterModel.reset(new AssetBundlerFileTableFilterModel(this, m_fileTableModel->GetFileNameColumnIndex(), m_fileTableModel->GetTimeStampColumnIndex()));
+
+        m_fileTableFilterModel->setSourceModel(m_fileTableModel.data());
+        m_ui->fileTableView->setModel(m_fileTableFilterModel.data());
+        connect(m_ui->fileFilteredSearchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged,
+            m_fileTableFilterModel.data(), static_cast<void (QSortFilterProxyModel::*)(const QString&)>(&AssetBundlerFileTableFilterModel::FilterChanged));
+
+        connect(m_ui->fileTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &SeedTabWidget::FileSelectionChanged);
+
+        m_ui->fileTableView->setIndentation(CheckBoxTableIndentationSize); 
+
+        // New File Button
+        connect(m_ui->createNewSeedListButton, &QPushButton::clicked, this, &SeedTabWidget::OnNewFileButtonPressed);
+
+        // Select Default Seed Lists
+        connect(m_ui->selectDefaultSeedListsCheckBox, &QCheckBox::clicked, this, &SeedTabWidget::OnSelectDefaultSeedListsCheckBoxChanged);
+
+        // Generate Asset Lists Button
+        SetGenerateAssetListsButtonEnabled(false);
+        connect(m_ui->generateAssetListsButton, &QPushButton::clicked, this, &SeedTabWidget::OnGenerateAssetListsButtonPressed);
+
+        // Table that displays the contents of a Seed List File
+        m_seedListContentsFilterModel.reset(new AssetBundlerFileTableFilterModel(this, SeedListTableModel::Column::ColumnRelativePath));
+
+        m_seedListContentsFilterModel->setSourceModel(m_seedListContentsModel.data());
+        m_ui->seedFileContentsTable->setModel(m_seedListContentsFilterModel.data());
+        connect(m_ui->seedListContentsFilteredSearchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged,
+            m_seedListContentsFilterModel.data(), static_cast<void (QSortFilterProxyModel::*)(const QString&)>(&AssetBundlerFileTableFilterModel::FilterChanged));
+
+        m_ui->seedFileContentsTable->setContextMenuPolicy(Qt::CustomContextMenu);
+        connect(m_ui->seedFileContentsTable, &QTreeView::customContextMenuRequested, this, &SeedTabWidget::OnSeedListContentsTableContextMenuRequested);
+
+        m_ui->seedFileContentsTable->setIndentation(0);
+
+        // Edit All Platforms 
+        connect(m_ui->editAllSeedsButton, &QPushButton::clicked, this, &SeedTabWidget::OnEditAllButtonPressed);
+
+        // Add Seed
+        connect(m_ui->addSeedButton, &QPushButton::clicked, this, &SeedTabWidget::OnAddSeedButtonPressed);
+
+        SetModelDataSource();
+    }
+
+    SeedTabWidget::~SeedTabWidget()
+    {
+        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+    }
+
+    bool SeedTabWidget::HasUnsavedChanges()
+    {
+        return m_fileTableModel->HasUnsavedChanges();
+    }
+
+    void SeedTabWidget::Reload()
+    {
+        // Reload all the seed list files
+        m_fileTableModel->Reload(AzToolsFramework::AssetSeedManager::GetSeedFileExtension(), m_watchedFolders, m_watchedFiles, m_filePathToGemNameMap);
+
+        // Update the selected row
+        FileSelectionChanged();
+    }
+
+    bool SeedTabWidget::SaveCurrentSelection()
+    {
+        return m_fileTableModel->Save(m_selectedFileTableIndex);
+    }
+
+    bool SeedTabWidget::SaveAll()
+    {
+        return m_fileTableModel->SaveAll();
+    }
+
+    void SeedTabWidget::SetModelDataSource()
+    {
+        // Remove the current watched folders and files
+        m_guiApplicationManager->RemoveWatchedPaths(m_watchedFolders + m_watchedFiles);
+
+        // Set the new watched folders for the model
+        m_watchedFolders.clear();
+        m_watchedFolders.insert(m_guiApplicationManager->GetSeedListsFolder().c_str());
+
+        // Get the list of default Seed List files
+        m_filePathToGemNameMap = AssetBundler::GetDefaultSeedListFiles(AZStd::string_view{ AZ::Utils::GetEnginePath() }, m_guiApplicationManager->GetCurrentProjectName(),
+            m_guiApplicationManager->GetGemInfoList(), m_guiApplicationManager->GetEnabledPlatforms());
+
+        // Get the list of default Seeds that are not stored in a Seed List file on-disk
+        AZStd::vector<AZStd::string> defaultSeeds = GetDefaultSeeds(AZ::Utils::GetProjectPath(), m_guiApplicationManager->GetCurrentProjectName());
+        m_fileTableModel->AddDefaultSeedsToInMemoryList(defaultSeeds, m_guiApplicationManager->GetCurrentProjectName().c_str(), m_guiApplicationManager->GetEnabledPlatforms());
+
+        // Set the new watched filess for the model
+        m_watchedFiles.clear();
+        for (const auto& it : m_filePathToGemNameMap)
+        {
+            m_watchedFiles.insert(it.first.c_str());
+        }
+
+        ReadScanPathsFromAssetBundlerSettings(AssetBundlingFileType::SeedListFileType);
+        m_guiApplicationManager->AddWatchedPaths(m_watchedFolders + m_watchedFiles);
+    }
+
+    AzQtComponents::TableView* SeedTabWidget::GetFileTableView()
+    {
+        return m_ui->fileTableView;
+    }
+
+    QModelIndex SeedTabWidget::GetSelectedFileTableIndex()
+    {
+        return m_selectedFileTableIndex;
+    }
+
+    AssetBundlerAbstractFileTableModel* SeedTabWidget::GetFileTableModel()
+    {
+        return m_fileTableModel.get();
+    }
+
+    void SeedTabWidget::SetActiveProjectLabel(const QString& labelText)
+    {
+        m_ui->activeProjectLabel->setText(labelText);
+    }
+
+    void SeedTabWidget::ApplyConfig()
+    {
+        const GUIApplicationManager::Config& config = m_guiApplicationManager->GetConfig();
+
+        m_ui->fileTableFrame->setFixedWidth(config.fileTableWidth);
+        m_ui->fileTableView->header()->resizeSection(SeedListFileTableModel::Column::ColumnFileName, config.seedListFileNameColumnWidth);
+        m_ui->fileTableView->header()->resizeSection(SeedListFileTableModel::Column::ColumnCheckBox, config.checkBoxColumnWidth);
+        m_ui->fileTableView->header()->resizeSection(SeedListFileTableModel::Column::ColumnProject, config.projectNameColumnWidth);
+
+        m_ui->seedFileContentsTable->header()->resizeSection(SeedListTableModel::Column::ColumnRelativePath, config.seedListContentsNameColumnWidth);
+    }
+
+    void SeedTabWidget::UncheckSelectDefaultSeedListsCheckBox()
+    {
+        m_ui->selectDefaultSeedListsCheckBox->setChecked(false);
+    }
+
+    void SeedTabWidget::SetGenerateAssetListsButtonEnabled(bool isEnabled)
+    {
+        m_ui->generateAssetListsButton->setEnabled(isEnabled);
+    }
+
+    bool SeedTabWidget::OnPreError(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/)
+    {
+        m_hasWarnings = true;
+        return false;
+    }
+
+    bool SeedTabWidget::OnPreWarning(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/)
+    {
+        m_hasWarnings = true;
+        return false;
+    }
+
+    void SeedTabWidget::FileSelectionChanged(const QItemSelection& /*selected*/, const QItemSelection& /*deselected*/)
+    {
+        if (m_ui->fileTableView->selectionModel()->selectedRows().size() == 0)
+        {
+            // Set selected index to an invalid value
+            m_selectedFileTableIndex = QModelIndex();
+            m_ui->seedListFileAbsolutePathLabel->clear();
+            return;
+        }
+
+        m_selectedFileTableIndex = m_fileTableFilterModel->mapToSource(m_ui->fileTableView->selectionModel()->currentIndex());
+
+        m_seedListContentsModel = m_fileTableModel->GetSeedListFileContents(m_selectedFileTableIndex);
+        m_seedListContentsFilterModel->setSourceModel(m_seedListContentsModel.data());
+
+        m_ui->seedListFileAbsolutePathLabel->setText(m_fileTableModel->GetFileAbsolutePath(m_selectedFileTableIndex).c_str());
+    }
+
+    void SeedTabWidget::OnNewFileButtonPressed()
+    {
+        AZStd::string absoluteFilePath = NewFileDialog::OSNewFileDialog(
+            this,
+            AzToolsFramework::AssetSeedManager::GetSeedFileExtension(),
+            "Seed List",
+            m_guiApplicationManager->GetSeedListsFolder());
+
+        if (absoluteFilePath.empty())
+        {
+            // User canceled out of the file dialog
+            return;
+        }
+
+        AZStd::vector<AZStd::string> createdFiles = m_fileTableModel->CreateNewFiles(
+            absoluteFilePath,
+            AzFramework::PlatformFlags::Platform_NONE,
+            QString(m_guiApplicationManager->GetCurrentProjectName().c_str()));
+
+        if (!createdFiles.empty())
+        {
+            AddScanPathToAssetBundlerSettings(AssetBundlingFileType::SeedListFileType, createdFiles.at(0));
+        }
+    }
+
+    void SeedTabWidget::OnSelectDefaultSeedListsCheckBoxChanged()
+    {
+        m_fileTableModel->SelectDefaultSeedLists(m_ui->selectDefaultSeedListsCheckBox->isChecked());
+    }
+
+    void SeedTabWidget::OnGenerateAssetListsButtonPressed()
+    {
+        m_generateAssetListsDialog.reset(
+            new NewFileDialog(
+                this,
+                GenerateAssetListFilesDialogName,
+                QString(m_guiApplicationManager->GetAssetListsFolder().c_str()),
+                AzToolsFramework::AssetSeedManager::GetAssetListFileExtension(),
+                QString(tr("Asset List (*.%1)")).arg(AzToolsFramework::AssetSeedManager::GetAssetListFileExtension()),
+                m_guiApplicationManager->GetEnabledPlatforms()));
+        auto dialogResponse = m_generateAssetListsDialog->exec();
+        if (dialogResponse == QDialog::DialogCode::Rejected)
+        {
+            // User canceled the operation
+            return;
+        }
+
+        m_hasWarnings = false;
+        auto createdFiles = m_fileTableModel->GenerateAssetLists(m_generateAssetListsDialog->GetAbsoluteFilePath(), m_generateAssetListsDialog->GetPlatformFlags());
+
+        // Warnings will not prevent the generation of Asset List files, we must track them separately
+        NewFileDialog::FileGenerationResultMessageBox(this, createdFiles, m_hasWarnings);
+
+        if (createdFiles.empty())
+        {
+            // Error has already been thrown
+            return;
+        }
+
+        // Add created files to the file watcher
+        for (const AZStd::string& absolutePath : createdFiles)
+        {
+            AddScanPathToAssetBundlerSettings(AssetBundlingFileType::AssetListFileType, absolutePath);
+        }
+
+        // The watched files list was updated after the files were created, so we need to force-reload them
+        m_guiApplicationManager->UpdateFiles(AssetBundlingFileType::AssetListFileType, createdFiles);
+    }
+
+    void SeedTabWidget::OnEditSeedButtonPressed()
+    {
+        if (!m_selectedFileTableIndex.isValid())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot perform Edit Seed operation: No Seed List File is selected");
+            return;
+        }
+
+        // Get the current platforms of the selected Seed so we can display them as already checked
+        QModelIndex currentSeedIndex = m_seedListContentsFilterModel->mapToSource(m_ui->seedFileContentsTable->selectionModel()->currentIndex());
+        auto getPlatformOutcome = m_seedListContentsModel->GetSeedPlatforms(currentSeedIndex);
+        if (!getPlatformOutcome.IsSuccess())
+        {
+            // Error has already been thrown
+            return;
+        }
+
+        // Create and display the Edit Seed dialog
+        m_editSeedDialog.reset(new EditSeedDialog(this, m_guiApplicationManager->GetEnabledPlatforms(), getPlatformOutcome.GetValue()));
+        auto dialogResponse = m_editSeedDialog->exec();
+        if (dialogResponse == QDialog::DialogCode::Rejected)
+        {
+            // User canceled the operation
+            return;
+        }
+
+        // Set the data in the model
+        m_fileTableModel->SetSeedPlatforms(m_selectedFileTableIndex, currentSeedIndex, m_editSeedDialog->GetPlatformFlags());
+    }
+
+    void SeedTabWidget::OnEditAllButtonPressed()
+    {
+        if (!m_selectedFileTableIndex.isValid())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot perform Edit All operation: No Seed List File is selected");
+            return;
+        }
+
+        // Get the platforms of all the seeds so we can display them as already checked or partially checked
+        AzFramework::PlatformFlags selectedPlatformFlags = AzFramework::PlatformFlags::AllNamedPlatforms;
+        AzFramework::PlatformFlags partiallySelectedPlatformFlags = AzFramework::PlatformFlags::Platform_NONE;
+        QMap<QModelIndex, AzFramework::PlatformFlags> indexToPlatformFlagsMap;
+        for (int row = 0; row < m_seedListContentsModel->rowCount(); ++row)
+        {
+            QModelIndex currentSeedIndex = m_seedListContentsModel->index(row, 0);
+            auto getPlatformOutcome = m_seedListContentsModel->GetSeedPlatforms(currentSeedIndex);
+            if (!getPlatformOutcome.IsSuccess())
+            {
+                // Error has already been thrown
+                return;
+            }
+
+            indexToPlatformFlagsMap[currentSeedIndex] = getPlatformOutcome.TakeValue();
+            selectedPlatformFlags &= indexToPlatformFlagsMap[currentSeedIndex];
+            partiallySelectedPlatformFlags |= selectedPlatformFlags ^ indexToPlatformFlagsMap[currentSeedIndex];
+        }
+
+        // Create and display the Edit Seed dialog
+        m_editSeedDialog.reset(new EditSeedDialog(
+            this,
+            m_guiApplicationManager->GetEnabledPlatforms(),
+            selectedPlatformFlags,
+            partiallySelectedPlatformFlags));
+
+        auto dialogResponse = m_editSeedDialog->exec();
+        if (dialogResponse == QDialog::DialogCode::Rejected)
+        {
+            // User canceled the operation
+            return;
+        }
+
+        // Set the data in the model
+        for (int row = 0; row < m_seedListContentsModel->rowCount(); ++row)
+        {
+            QModelIndex currentSeedIndex = m_seedListContentsModel->index(row, 0);
+            AzFramework::PlatformFlags checkedPlatforms = m_editSeedDialog->GetPlatformFlags();
+            AzFramework::PlatformFlags partiallyCheckedPlatforms = m_editSeedDialog->GetPartiallySelectedPlatformFlags();
+            // If the platform is partially checked, we want to keep its original status when saving the changes
+            AzFramework::PlatformFlags platformFlags = indexToPlatformFlagsMap[currentSeedIndex] & partiallyCheckedPlatforms | checkedPlatforms;
+
+            m_fileTableModel->SetSeedPlatforms(m_selectedFileTableIndex, currentSeedIndex, platformFlags);
+        }
+    }
+
+    void SeedTabWidget::OnAddSeedButtonPressed()
+    {
+        if (!m_selectedFileTableIndex.isValid())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot perform Add Seed operation: No Seed List File is selected");
+            return;
+        }
+
+        // Get path to the platform-specific cache folder of one of the enabled platforms
+        AzFramework::PlatformFlags enabledPlatforms = m_guiApplicationManager->GetEnabledPlatforms();
+        AZStd::fixed_vector<AzFramework::PlatformId, AzFramework::PlatformId::NumPlatformIds> enabledPlatformIndices = AzFramework::PlatformHelper::GetPlatformIndicesInterpreted(enabledPlatforms);
+        AZStd::string platformSpecificCachePath = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(enabledPlatformIndices[0]);
+
+        // Create and display the Add Seed Dialog
+        m_addSeedDialog.reset(new AddSeedDialog(this, enabledPlatforms, platformSpecificCachePath));
+        auto dialogResponse = m_addSeedDialog->exec();
+        if (dialogResponse == QDialog::DialogCode::Rejected)
+        {
+            // User canceled the operation
+            return;
+        }
+
+        // Set the data in the model
+        m_fileTableModel->AddSeed(m_selectedFileTableIndex, m_addSeedDialog->GetFileName(), m_addSeedDialog->GetPlatformFlags());
+    }
+
+    void SeedTabWidget::OnRemoveSeedButtonPressed()
+    {
+        if (!m_selectedFileTableIndex.isValid())
+        {
+            AZ_Error(AssetBundler::AppWindowName, false, "Cannot perform Remove Seed operation: No Seed List File is selected");
+            return;
+        }
+
+        // Set the data in the model
+        QModelIndex currentSeedIndex = m_seedListContentsFilterModel->mapToSource(m_ui->seedFileContentsTable->selectionModel()->currentIndex());
+        m_fileTableModel->RemoveSeed(m_selectedFileTableIndex, currentSeedIndex);
+    }
+
+    void SeedTabWidget::OnSeedListContentsTableContextMenuRequested(const QPoint& pos)
+    {
+        if (!m_selectedFileTableIndex.isValid())
+        {
+            return;
+        }
+
+        QMenu* contextMenu = new QMenu(this);
+        contextMenu->setToolTipsVisible(true);
+
+        QAction* action = contextMenu->addAction(tr("Edit Platforms"));
+        connect(action, &QAction::triggered, this, &SeedTabWidget::OnEditSeedButtonPressed);
+        action->setToolTip(tr("Change what platforms are referenced when generating an Asset List file."));
+
+        contextMenu->addSeparator();
+
+        action = contextMenu->addAction(tr("Add Seed"));
+        connect(action, &QAction::triggered, this, &SeedTabWidget::OnAddSeedButtonPressed);
+        action->setToolTip(tr("Add a new Seed to the Seed List file."));
+
+        action = contextMenu->addAction(tr("Remove Seed"));
+        connect(action, &QAction::triggered, this, &SeedTabWidget::OnRemoveSeedButtonPressed);
+        action->setToolTip(tr("Removes the Seed from the Seed List file."));
+
+        contextMenu->exec(m_ui->seedFileContentsTable->mapToGlobal(pos));
+        delete contextMenu;
+    }
+
+} //namespace AssetBundler
+
+#include <source/ui/moc_SeedTabWidget.cpp>
diff --git a/Code/Tools/AssetBundler/source/ui/SeedTabWidget.h b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.h
new file mode 100644
index 0000000000..c1383cdd08
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.h
@@ -0,0 +1,129 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <source/ui/AssetBundlerTabWidget.h>
+
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QDir>
+#include <QItemSelectionModel>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class SeedTabWidget;
+}
+
+class QFileSystemModel;
+class QStringListModel;
+
+namespace AssetBundler
+{
+    class GUIApplicationManager;
+
+    class SeedListFileTableModel;
+    class SeedListTableModel;
+
+    class NewFileDialog;
+    class EditSeedDialog;
+    class AddSeedDialog;
+
+    class SeedTabWidget
+        : public AssetBundlerTabWidget
+        , public AZ::Debug::TraceMessageBus::Handler
+    {
+        Q_OBJECT
+
+    public:
+        explicit SeedTabWidget(QWidget* parent, GUIApplicationManager* guiApplicationManager, const QString& assetBundlingDirectory);
+        virtual ~SeedTabWidget();
+
+        QString GetTabTitle() override { return tr("Seeds"); }
+
+        QString GetFileTypeDisplayName() override { return tr("Seed List file"); }
+
+        AssetBundlingFileType GetFileType() override { return AssetBundlingFileType::SeedListFileType; }
+
+        bool HasUnsavedChanges() override;
+
+        void Reload() override;
+
+        bool SaveCurrentSelection() override;
+
+        bool SaveAll() override;
+
+        void SetModelDataSource() override;
+
+        AzQtComponents::TableView* GetFileTableView() override;
+
+        QModelIndex GetSelectedFileTableIndex() override;
+
+        AssetBundlerAbstractFileTableModel* GetFileTableModel() override;
+
+        void SetActiveProjectLabel(const QString& labelText) override;
+
+        void ApplyConfig() override;
+
+        void FileSelectionChanged(const QItemSelection& /*selected*/ = QItemSelection(), const QItemSelection& /*deselected*/ = QItemSelection()) override;
+
+        void UncheckSelectDefaultSeedListsCheckBox();
+
+        void SetGenerateAssetListsButtonEnabled(bool isEnabled);
+
+        /////////////////////////////////////////////////////////
+        // TraceMessageBus overrides
+        bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override;
+        bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
+        /////////////////////////////////////////////////////////
+
+    private:
+
+        void OnNewFileButtonPressed();
+
+        void OnSelectDefaultSeedListsCheckBoxChanged();
+
+        void OnGenerateAssetListsButtonPressed();
+
+        void OnEditSeedButtonPressed();
+        void OnEditAllButtonPressed();
+
+        void OnAddSeedButtonPressed();
+        void OnRemoveSeedButtonPressed();
+
+        void OnSeedListContentsTableContextMenuRequested(const QPoint& pos);
+
+        QSharedPointer<Ui::SeedTabWidget> m_ui;
+        QDir m_assetBundlingFolder;
+
+        QSharedPointer<SeedListFileTableModel> m_fileTableModel;
+        QModelIndex m_selectedFileTableIndex;
+
+        QSharedPointer<NewFileDialog> m_generateAssetListsDialog;
+
+        QSharedPointer<AssetBundler::AssetBundlerFileTableFilterModel> m_seedListContentsFilterModel;
+        QSharedPointer<SeedListTableModel> m_seedListContentsModel;
+
+        QSharedPointer<EditSeedDialog> m_editSeedDialog;
+        QSharedPointer<AddSeedDialog> m_addSeedDialog;
+
+        bool m_hasWarnings = false;
+    };
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/ui/SeedTabWidget.ui b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.ui
new file mode 100644
index 0000000000..b32072696f
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.ui
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SeedTabWidget</class>
+ <widget class="QWidget" name="SeedTabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>813</width>
+    <height>673</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Seed Tab Widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="mainVerticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="projectLabelHorizontalLayout">
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="activeProjectLabel"/>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="generateAssetListsButton">
+       <property name="text">
+        <string>Generate Asset Lists</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0">
+     <item>
+      <widget class="QFrame" name="fileTableFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_4">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QFrame" name="fileTableHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="seedListsLabel">
+             <property name="text">
+              <string>Seed List files</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="AzQtComponents::FilteredSearchWidget" name="fileFilteredSearchWidget">
+          <property name="placeholderText" stdset="0">
+           <string>Filter by file name</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <property name="leftMargin">
+           <number>5</number>
+          </property>
+          <property name="rightMargin">
+           <number>5</number>
+          </property>
+          <item>
+           <widget class="QPushButton" name="createNewSeedListButton">
+            <property name="text">
+             <string>+ Create new Seed List file</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="AzQtComponents::TableView" name="fileTableView"/>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="selectDefaultSeedListsCheckBox">
+            <property name="text">
+             <string>Default Seed Lists</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="fileContentsFrame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QFrame" name="fileContentsHeaderFrame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="seedListContentsLabel">
+             <property name="text">
+              <string>Product Assets</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="seedListFileAbsolutePathLabel">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="rightMargin">
+           <number>5</number>
+          </property>
+           <item>
+             <widget class="AzQtComponents::FilteredSearchWidget" name="seedListContentsFilteredSearchWidget">
+               <property name="placeholderText" stdset="0">
+                 <string>Filter by file name</string>
+               </property>
+             </widget>
+           </item>
+          <item>
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="editAllSeedsButton">
+            <property name="text">
+             <string>Edit All</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="addSeedButton">
+            <property name="text">
+             <string>+ Add Asset</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="AzQtComponents::TableView" name="seedFileContentsTable"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AzQtComponents::TableView</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/Widgets/TableView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>AzQtComponents::FilteredSearchWidget</class>
+   <extends>QTreeView</extends>
+   <header location="global">AzQtComponents/Components/FilteredSearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Tools/AssetBundler/source/ui/style/AssetBundler-Icon-256x256@x2.ico b/Code/Tools/AssetBundler/source/ui/style/AssetBundler-Icon-256x256@x2.ico
new file mode 100644
index 0000000000..ffbf974130
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/style/AssetBundler-Icon-256x256@x2.ico
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:690a47a0e2ff4c41ce23ad0bc5dd5bd525e03676a26d3367726beaa96babf207
+size 138199
diff --git a/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qrc b/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qrc
new file mode 100644
index 0000000000..65ad7f11cd
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/AssetBundler/style">
+        <file>AssetBundler.qss</file>
+        <file>AssetBundlerConfig.ini</file>
+        <file>AssetBundler-Icon-256x256@x2.ico</file>
+    </qresource>
+</RCC>
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qss b/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qss
new file mode 100644
index 0000000000..8603bbbb1b
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qss
@@ -0,0 +1,173 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+/************** General (MainWindow) **************/
+
+QTabWidget:pane {
+    border: none;
+}
+
+QLabel#activeProjectLabel {
+    font-size: 18px;
+    font-family: "Amazon Ember Light";
+    margin-bottom: 5px;
+}
+
+QTreeView#logTableView {
+    border: 1px solid #1B1B1B;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+}
+
+QTreeView#logTableView QHeaderView::section {
+    background-color: #1B1B1B;
+}
+
+/************** General (Tabs) **************/
+
+QFrame#fileTableFrame,
+QFrame#fileContentsFrame {
+    border: 1px solid #1B1B1B;
+}
+
+QFrame#fileTableFrame {
+    margin-right: 10px;
+}
+
+QFrame#fileTableHeaderFrame,
+QFrame#fileContentsHeaderFrame,
+QFrame#fileTableHeaderFrame QLabel,
+QFrame#fileContentsHeaderFrame QLabel{
+    background-color: #1B1B1B;
+}
+
+QFrame#fileTableHeaderFrame QLabel,
+QFrame#fileContentsHeaderFrame QLabel{
+    background-color: #1B1B1B;
+    margin-left: 5px;
+}
+
+QTabWidget QTreeView QHeaderView::section {
+    background-color: rgb(77, 77, 77);
+}
+
+QWidget#PlatformSelectionWidget QLabel#platformSelectionLabel {
+    margin-right: 10px;
+}
+
+QDialog#NewFileDialog QPushButton#browseFileButton,
+QDialog#NewFileDialog QPushButton#createFileButton,
+QDialog#NewFileDialog QPushButton#cancelButton {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+/************** Seeds Tab **************/
+
+QWidget#SeedTabWidget QPushButton#generateAssetListsButton,
+QWidget#SeedTabWidget QPushButton#browseFileButton,
+QWidget#SeedTabWidget QPushButton#cancelButton,
+QWidget#SeedTabWidget QPushButton#addSeedButton,
+QWidget#SeedTabWidget QPushButton#applyChangesButton {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+QCheckBox#selectDefaultSeedListsCheckBox {
+    margin: 5px;
+}
+
+QWidget#seedListContentsFilteredSearchWidget {
+    margin-left: 5px;
+}
+
+QDialog QFrame#inputValuesFrame {
+    border: none;
+    margin: 10px;
+    padding: 10px;
+}
+
+QDialog QFrame#lineFrame {
+    border: none;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+QDialog QFrame#inputValuesFrame,
+QDialog QFrame#lineFrame,
+QDialog#AddSeedDialog QLabel,
+QDialog#AddSeedDialog QCheckBox,
+QDialog#EditSeedDialog QLabel,
+QDialog#EditSeedDialog QCheckBox,
+QDialog#NewFileDialog QLabel,
+QDialog#NewFileDialog QCheckBox {
+    background-color: #555555;
+}
+
+/************** Asset List Tab **************/
+
+QLabel#assetListContentsLabel {
+    margin-right: 10px;
+}
+
+QWidget#fileFilteredSearchWidget,
+QWidget#assetListContentsFilteredSearchWidget {
+    margin-left: 5px;
+    margin-right: 5px;
+}
+
+QPushButton#generateBundleButton {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+/************** Generate Bundles Modal **************/
+
+QFrame#bundleSettingsFrame {
+    border: none;
+    margin-bottom: 10px;
+}
+
+QFrame#outputBundleLocationFrame,
+QFrame#bundleSettingsFileFrame {
+    border: none;
+    margin: 10px;
+}
+
+QFrame#bundleSettingsFrame,
+QFrame#outputBundleLocationFrame,
+QFrame#bundleSettingsFileFrame,
+QFrame#bundleSettingsFrame QLabel {
+    background-color: #555555;
+}
+
+QWidget#GenerateBundlesModal QPushButton {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+/************** Rules Tab **************/
+
+QPushButton#runRuleButton,
+QPushButton#addComparisonStepButton {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+QScrollArea#comparisonDataList {
+    border: none;
+}
+
+QFrame#comparisonDataFrame {
+    padding: 10px;
+}
diff --git a/Code/Tools/AssetBundler/source/ui/style/AssetBundlerConfig.ini b/Code/Tools/AssetBundler/source/ui/style/AssetBundlerConfig.ini
new file mode 100644
index 0000000000..876ceea40e
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/ui/style/AssetBundlerConfig.ini
@@ -0,0 +1,19 @@
+[ErrorLogDetails]
+LogTypeColumnWidth=180
+LogSourceColumnWidth=130
+
+[GeneralFileTableDetails]
+FileTableWidth=450
+FileNameColumnWidth=250
+
+[SeedsTabDetails]
+CheckBoxColumnWidth=22
+SeedListFileNameColumnWidth=150
+ProjectNameColumnWidth=120
+SeedListContentsNameColumnWidth=400
+
+[AssetListsTabDetails]
+AssetListFileNameColumnWidth=210
+AssetListPlatformColumnWidth=70
+ProductAssetNameColumnWidth=220
+ProductAssetRelativePathColumnWidth=300
\ No newline at end of file
diff --git a/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
new file mode 100644
index 0000000000..d278b9bd2c
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
@@ -0,0 +1,386 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <source/utils/GUIApplicationManager.h>
+
+#include <source/ui/MainWindow.h>
+#include <source/utils/utils.h>
+
+#include <AzCore/IO/FileIO.h>
+#include <AzCore/Utils/Utils.h>
+#include <AzFramework/Asset/AssetCatalog.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogBus.h>
+
+#include <AzQtComponents/Components/ConfigHelpers.h>
+#include <AzQtComponents/Components/StyleManager.h>
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+#include <QApplication>
+#include <QLocale>
+#include <QStringList>
+
+// Forward declare platform-specific functions
+namespace Platform
+{
+    /// On Windows this will return the setting for our custom title bar
+    /// On other platforms this will return the setting for using platform default
+    /// This ensures that functions like Exit, Maximize, and Minimize appear in the right platform-specific style
+    AzQtComponents::WindowDecorationWrapper::Option GetWindowDecorationWrapperOption();
+} // namespace Platform
+
+const char AssetBundlingFolderName [] = "AssetBundling";
+const char SeedListsFolderName [] = "SeedLists";
+const char AssetListsFolderName [] = "AssetLists";
+const char RulesFolderName[] = "Rules";
+const char BundleSettingsFolderName [] = "BundleSettings";
+const char BundlesFolderName [] = "Bundles";
+
+namespace AssetBundler
+{
+
+    GUIApplicationManager::Config GUIApplicationManager::loadConfig(QSettings& settings)
+    {
+        using namespace AzQtComponents;
+
+        Config config = defaultConfig();
+
+        // Error Log
+        {
+            ConfigHelpers::GroupGuard details(&settings, QStringLiteral("ErrorLogDetails"));
+            ConfigHelpers::read<int>(settings, QStringLiteral("LogTypeColumnWidth"), config.logTypeColumnWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("LogSourceColumnWidth"), config.logSourceColumnWidth);
+        }
+
+        // General File Tables
+        {
+            ConfigHelpers::GroupGuard details(&settings, QStringLiteral("GeneralFileTableDetails"));
+            ConfigHelpers::read<int>(settings, QStringLiteral("FileTableWidth"), config.fileTableWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("FileNameColumnWidth"), config.fileNameColumnWidth);
+        }
+
+        // Seeds Tab
+        {
+            ConfigHelpers::GroupGuard details(&settings, QStringLiteral("SeedsTabDetails"));
+            ConfigHelpers::read<int>(settings, QStringLiteral("CheckBoxColumnWidth"), config.checkBoxColumnWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("SeedListFileNameColumnWidth"), config.seedListFileNameColumnWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("ProjectNameColumnWidth"), config.projectNameColumnWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("SeedListContentsNameColumnWidth"), config.seedListContentsNameColumnWidth);
+        }
+
+        // Asset Lists Tab
+        {
+            ConfigHelpers::GroupGuard details(&settings, QStringLiteral("AssetListsTabDetails"));
+            ConfigHelpers::read<int>(settings, QStringLiteral("AssetListFileNameColumnWidth"), config.assetListFileNameColumnWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("AssetListPlatformColumnWidth"), config.assetListPlatformColumnWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("ProductAssetNameColumnWidth"), config.productAssetNameColumnWidth);
+            ConfigHelpers::read<int>(settings, QStringLiteral("ProductAssetRelativePathColumnWidth"), config.productAssetRelativePathColumnWidth);
+        }
+
+        return config;
+    }
+
+    GUIApplicationManager::Config GUIApplicationManager::defaultConfig()
+    {
+        // These are used if the values can't be read from AssetBundlerConfig.ini.
+        Config config;
+
+        config.logTypeColumnWidth = 150;
+        config.logSourceColumnWidth = 150;
+
+        config.fileTableWidth = 250;
+        config.fileNameColumnWidth = 150;
+
+        config.checkBoxColumnWidth = 150;
+        config.seedListFileNameColumnWidth = 150;
+        config.projectNameColumnWidth = 150;
+        config.seedListContentsNameColumnWidth = 150;
+
+        config.assetListFileNameColumnWidth = 150;
+        config.assetListPlatformColumnWidth = 150;
+        config.productAssetNameColumnWidth = 150;
+        config.productAssetRelativePathColumnWidth = 150;
+
+        return config;
+    }
+
+    GUIApplicationManager::GUIApplicationManager(int* argc, char*** argv, QObject* parent)
+        : ApplicationManager(argc, argv, parent)
+    {
+    }
+
+    GUIApplicationManager::~GUIApplicationManager()
+    {
+        // Reset this before DestroyApplication, BusDisconnect needs to happen before Application::Stop() destroys the allocators.
+        m_platformCatalogManager.reset();
+    }
+
+    bool GUIApplicationManager::Init()
+    {
+        m_isInitializing = true;
+        // Initialize Asset Bundler Batch 
+        ApplicationManager::Init();
+
+        AZ::IO::FixedMaxPath engineRoot = GetEngineRoot();
+
+        if (engineRoot.empty())
+        {
+            // Error has already been thrown
+            return false;
+        }
+
+        // Determine the name of the current project
+        auto projectOutcome = AssetBundler::GetCurrentProjectName();
+        if (!projectOutcome.IsSuccess())
+        {
+            AZ_Error("AssetBundler", false, projectOutcome.GetError().c_str());
+            return false;
+        }
+        m_currentProjectName = projectOutcome.GetValue();
+
+        // Set up paths to the Project folder, Project Cache folder, and determine enabled platforms
+        auto pathOutcome = InitializePaths();
+        if (!pathOutcome.IsSuccess())
+        {
+            AZ_Error("AssetBundler", false, pathOutcome.GetError().c_str());
+            return false;
+        }
+
+        // Set up platform-specific Asset Catalogs
+        m_platformCatalogManager = AZStd::make_unique<AzToolsFramework::PlatformAddressedAssetCatalogManager>();
+
+        // Define some application-level settings
+        QApplication::setOrganizationName("Amazon");
+        QApplication::setOrganizationDomain("amazon.com");
+        QApplication::setApplicationName("Asset Bundler");
+
+        QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
+
+        QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+        QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+
+        m_isInitializing = false;
+
+        // Create the actual Qt Application
+        m_qApp.reset(new QApplication(*GetArgC(), *GetArgV()));
+
+        // Create the Main Window
+        m_mainWindow.reset(new MainWindow(this));
+
+        return true;
+    }
+
+    bool GUIApplicationManager::Run() 
+    {
+        // Set up the Style Manager
+        AzQtComponents::StyleManager styleManager(qApp);
+        styleManager.initialize(qApp, GetEngineRoot());
+
+        AZ::IO::FixedMaxPath engineRoot(GetEngineRoot());
+        QDir engineRootDir(engineRoot.c_str());
+        AzQtComponents::StyleManager::addSearchPaths(
+            QStringLiteral("style"),
+            engineRootDir.filePath(QStringLiteral("Code/Tools/AssetBundler/source/ui/style")),
+            QStringLiteral(":/AssetBundler/style"),
+            engineRoot);
+        AzQtComponents::StyleManager::setStyleSheet(m_mainWindow.data(), QStringLiteral("style:AssetBundler.qss"));
+
+        AzQtComponents::ConfigHelpers::loadConfig<Config, GUIApplicationManager>(&m_fileWatcher, &m_config, QStringLiteral("style:AssetBundlerConfig.ini"), this, std::bind(&GUIApplicationManager::ApplyConfig, this));
+        ApplyConfig();
+
+        qApp->setWindowIcon(QIcon("style:AssetBundler-Icon-256x256@x2.ico"));
+
+        // Set up the Main Window
+        auto wrapper = new AzQtComponents::WindowDecorationWrapper(Platform::GetWindowDecorationWrapperOption());
+        wrapper->setGuest(m_mainWindow.data());
+        m_mainWindow->Activate();
+        wrapper->show();
+        m_mainWindow->show();
+
+        qApp->setQuitOnLastWindowClosed(true);
+
+        // Run the application
+        return qApp->exec();
+    }
+
+    void GUIApplicationManager::AddWatchedPath(const QString& folderPath)
+    {
+        m_fileWatcher.addPath(folderPath);
+    }
+
+    void GUIApplicationManager::AddWatchedPaths(const QSet<QString>& folderPaths)
+    {
+        m_fileWatcher.addPaths(folderPaths.values());
+    }
+
+    void GUIApplicationManager::RemoveWatchedPath(const QString& path)
+    {
+        m_fileWatcher.removePath(path);
+    }
+
+    void GUIApplicationManager::RemoveWatchedPaths(const QSet<QString>& paths)
+    {
+        // Check whether the list is empty to get rid of the warning from Qt
+        if (paths.isEmpty())
+        {
+            return;
+        }
+
+        m_fileWatcher.removePaths(paths.values());
+    }
+
+    bool GUIApplicationManager::OnPreError(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message)
+    {
+        // We want to display errors during initialization, then let the MainWindow handle errors during runtime
+        if (m_isInitializing)
+        {
+            // These are fatal initialization errors, and the application will shut down after the user closes the message box
+            m_qApp.reset(new QApplication(*GetArgC(), *GetArgV()));
+            QMessageBox errorMessageBox;
+            errorMessageBox.setWindowTitle("Asset Bundler");
+            errorMessageBox.setText(message);
+            errorMessageBox.setStandardButtons(QMessageBox::Ok);
+            errorMessageBox.setDefaultButton(QMessageBox::Ok);
+            errorMessageBox.exec();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    bool GUIApplicationManager::OnPreWarning(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/)
+    {
+        // Don't handle warnings, let the MainWindow print them
+        return false;
+    }
+
+
+    bool GUIApplicationManager::OnPrintf(const char* /*window*/, const char* /*message*/)
+    {
+        // This is disabled during initialization to prevent a lot of message spam printed to the CLI that gets generated on setup
+        return m_isInitializing;
+    }
+
+    AZ::Outcome<void, AZStd::string> GUIApplicationManager::InitializePaths()
+    {
+        // Calculate the path to the Cache for the current project
+        auto pathOutcome = AssetBundler::GetProjectCacheFolderPath();
+        if (!pathOutcome.IsSuccess())
+        {
+            return AZ::Failure(pathOutcome.GetError());
+        }
+
+        m_currentProjectCacheFolder = pathOutcome.GetValue().String();
+
+        // Calculate the path to the current project folder
+        pathOutcome = AssetBundler::GetProjectFolderPath();
+        if (!pathOutcome.IsSuccess())
+        {
+            return AZ::Failure(pathOutcome.GetError());
+        }
+
+        m_currentProjectFolder = pathOutcome.GetValue().String();
+
+        // Generate the AssetBundling folder inside the current project
+        AzFramework::StringFunc::Path::ConstructFull(m_currentProjectFolder.c_str(), AssetBundlingFolderName, m_assetBundlingFolder);
+
+        // Seed Lists folder
+        AzFramework::StringFunc::Path::ConstructFull(m_assetBundlingFolder.c_str(), SeedListsFolderName, m_seedListsFolder);
+        AZ::Outcome<void, AZStd::string> createPathOutcome = AssetBundler::MakePath(m_seedListsFolder);
+        if (!createPathOutcome.IsSuccess())
+        {
+            return createPathOutcome;
+        }
+
+        // Asset Lists folder
+        AzFramework::StringFunc::Path::ConstructFull(m_assetBundlingFolder.c_str(), AssetListsFolderName, m_assetListsFolder);
+        createPathOutcome = AssetBundler::MakePath(m_assetListsFolder);
+        if (!createPathOutcome.IsSuccess())
+        {
+            return createPathOutcome;
+        }
+
+        // Rules folder
+        AzFramework::StringFunc::Path::ConstructFull(m_assetBundlingFolder.c_str(), RulesFolderName, m_rulesFolder);
+        createPathOutcome = AssetBundler::MakePath(m_rulesFolder);
+        if (!createPathOutcome.IsSuccess())
+        {
+            return createPathOutcome;
+        }
+
+        // Bundle Settings Folder
+        AzFramework::StringFunc::Path::ConstructFull(m_assetBundlingFolder.c_str(), BundleSettingsFolderName, m_bundleSettingsFolder);
+        createPathOutcome = AssetBundler::MakePath(m_bundleSettingsFolder);
+        if (!createPathOutcome.IsSuccess())
+        {
+            return createPathOutcome;
+        }
+
+        // Bundles Folder
+        AzFramework::StringFunc::Path::ConstructFull(m_assetBundlingFolder.c_str(), BundlesFolderName, m_bundlesFolder);
+        createPathOutcome = AssetBundler::MakePath(m_bundlesFolder);
+        if (!createPathOutcome.IsSuccess())
+        {
+            return createPathOutcome;
+        }
+
+        // Determine the enabled platforms
+        const char* appRoot = nullptr;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(appRoot, &AzFramework::ApplicationRequests::GetAppRoot);
+        m_enabledPlatforms = GetEnabledPlatformFlags(GetEngineRoot(), appRoot, AZ::Utils::GetProjectPath().c_str());
+
+        // Determine which Gems are enabled for the current project
+        if (!AzFramework::GetGemsInfo(m_gemInfoList, *m_settingsRegistry))
+        {
+            return AZ::Failure(AZStd::string::format("Failed to read Gems for project: %s\n", m_currentProjectName.c_str()));
+        }
+
+        QObject::connect(&m_fileWatcher, &QFileSystemWatcher::directoryChanged, this, &GUIApplicationManager::DirectoryChanged);
+        QObject::connect(&m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &GUIApplicationManager::FileChanged);
+
+        return AZ::Success();
+    }
+
+    void GUIApplicationManager::DirectoryChanged(const QString& directory)
+    {
+        UpdateTab(directory.toUtf8().data());
+    }
+
+    void GUIApplicationManager::FileChanged(const QString& path)
+    {
+        // FileChanged will only be called when engine or gem seed files are updated
+        // Otherwilse DirectoryChanged should be triggered
+        AZStd::string extension;
+        AzFramework::StringFunc::Path::GetExtension(path.toUtf8().data(), extension);
+        extension = extension.starts_with(".") ? extension.substr(1) : extension;
+        if (extension == AzToolsFramework::AssetSeedManager::GetSeedFileExtension())
+        {
+            UpdateTab(GetSeedListsFolder());
+        }
+
+        // Many applications save an open file by writing a new file and then deleting the old one
+        // Add the file path back if it has been removed from the watcher file list
+        if (!m_fileWatcher.files().contains(path))
+        {
+            m_fileWatcher.addPath(path);
+        }
+    }
+
+    void GUIApplicationManager::ApplyConfig()
+    {
+        m_mainWindow->ApplyConfig();
+    }
+
+} // namespace AssetBundler
+
+#include <source/utils/moc_GUIApplicationManager.cpp>
diff --git a/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.h b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.h
new file mode 100644
index 0000000000..e81607d4a8
--- /dev/null
+++ b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.h
@@ -0,0 +1,164 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <source/utils/applicationManager.h>
+
+#include <AzCore/Outcome/Outcome.h>
+#include <AzCore/std/containers/vector.h>
+
+#include <AzFramework/Asset/AssetCatalog.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QMap>
+#include <QSettings>
+#include <QSharedPointer>
+#include <QString>
+#include <QFileSystemWatcher>
+#endif
+
+namespace AssetBundler
+{
+    enum AssetBundlingFileType : int
+    {
+        SeedListFileType = 0,
+        AssetListFileType,
+        BundleSettingsFileType,
+        BundleFileType,
+        RulesFileType,
+        NumBundlingFileTypes
+    };
+
+    class MainWindow;
+
+    class GUIApplicationManager
+        : public ApplicationManager
+    {
+        Q_OBJECT
+
+    public:
+
+        struct Config
+        {
+            // These default values are used if the values can't be read from AssetBundlerConfig.ini,
+            // and the call to defaultConfig fails.
+
+            // Error Log
+            int logTypeColumnWidth = -1;
+            int logSourceColumnWidth = -1;
+
+            // General File Tables
+            int fileTableWidth = -1;
+            int fileNameColumnWidth = -1;
+
+            // Seeds Tab
+            int checkBoxColumnWidth = -1;
+            int seedListFileNameColumnWidth = -1;
+            int projectNameColumnWidth = -1;
+            int seedListContentsNameColumnWidth = -1;
+
+            // Asset Lists Tab
+            int assetListFileNameColumnWidth = -1;
+            int assetListPlatformColumnWidth = -1;
+            int productAssetNameColumnWidth = -1;
+            int productAssetRelativePathColumnWidth = -1;
+        };
+
+        /*!
+         * Loads the button config data from a settings object.
+         */
+        static Config loadConfig(QSettings& settings);
+
+        /*!
+         * Returns default button config data.
+         */
+        static Config defaultConfig();
+
+        explicit GUIApplicationManager(int* argc, char*** argv, QObject* parent = 0);
+        virtual ~GUIApplicationManager();
+
+        bool Init() override;
+
+        bool Run() override;
+
+        AZStd::string GetCurrentProjectFolder() { return m_currentProjectFolder; }
+        AZStd::string GetAssetBundlingFolder() { return m_assetBundlingFolder; }
+        AZStd::string GetSeedListsFolder() { return m_seedListsFolder; }
+        AZStd::string GetAssetListsFolder() { return m_assetListsFolder; }
+        AZStd::string GetRulesFolder() { return m_rulesFolder; }
+        AZStd::string GetBundleSettingsFolder() { return m_bundleSettingsFolder; }
+        AZStd::string GetBundlesFolder() { return m_bundlesFolder; }
+        AZStd::string GetCurrentProjectCacheFolder() { return m_currentProjectCacheFolder; }
+
+        AzFramework::PlatformFlags GetEnabledPlatforms() { return m_enabledPlatforms; }
+
+        void AddWatchedPath(const QString& path);
+        void AddWatchedPaths(const QSet<QString>& paths);
+        void RemoveWatchedPath(const QString& path);
+        void RemoveWatchedPaths(const QSet<QString>& paths);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        // Override the ApplicationManager TraceMessageBus methods so that messages go through MainWindow and not the CLI
+
+        bool OnPreError(const char* window, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message) override;
+        bool OnPreWarning(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/) override;
+        bool OnPrintf(const char* /*window*/, const char* /*message*/) override;
+        ////////////////////////////////////////////////////////////////////////////////////////////
+
+        const Config& GetConfig() { return m_config; }
+
+    Q_SIGNALS:
+        void ShowWindow();
+        void UpdateTab(const AZStd::string& directory);
+        void UpdateFiles(AssetBundlingFileType fileType, const AZStd::vector<AZStd::string>& absoluteFilePaths);
+
+    protected Q_SLOTS:
+        void DirectoryChanged(const QString& directory);
+        void FileChanged(const QString& path);
+        void ApplyConfig();
+
+    private:
+        /**
+        * Generates directory information for all paths used in this tool
+        * @return void on success, error message on failure
+        */
+        AZ::Outcome<void, AZStd::string> InitializePaths();
+
+        QSharedPointer<QCoreApplication> m_qApp;
+
+        Config m_config;
+
+        QSharedPointer<MainWindow> m_mainWindow;
+
+        AZStd::string m_currentProjectFolder;
+        AZStd::string m_assetBundlingFolder;
+        AZStd::string m_seedListsFolder;
+        AZStd::string m_assetListsFolder;
+        AZStd::string m_rulesFolder;
+        AZStd::string m_bundleSettingsFolder;
+        AZStd::string m_bundlesFolder;
+        AZStd::string m_currentProjectCacheFolder;
+
+        AzFramework::PlatformFlags m_enabledPlatforms = AzFramework::PlatformFlags::Platform_NONE;
+
+        AZStd::unique_ptr<AzToolsFramework::PlatformAddressedAssetCatalogManager> m_platformCatalogManager;
+
+        bool m_isInitializing = false;
+
+        QFileSystemWatcher m_fileWatcher;
+    };
+
+} // namespace AssetBundler
diff --git a/Code/Tools/AssetBundler/source/utils/applicationManager.cpp b/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
index bb4fee2ceb..ccf5427771 100644
--- a/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
+++ b/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
@@ -45,8 +45,9 @@ namespace AssetBundler
 {
     const char compareVariablePrefix = '$';
 
-    ApplicationManager::ApplicationManager(int* argc, char*** argv)
-        : AzToolsFramework::ToolsApplication(argc, argv)
+    ApplicationManager::ApplicationManager(int* argc, char*** argv, QObject* parent)
+        : QObject(parent)
+        , AzToolsFramework::ToolsApplication(argc, argv)
     {
     }
 
@@ -55,7 +56,7 @@ namespace AssetBundler
         DestroyApplication();
     }
 
-    void ApplicationManager::Init()
+    bool ApplicationManager::Init()
     {
         AZ::Debug::TraceMessageBus::Handler::BusConnect();
         Start(AzFramework::Application::Descriptor());
@@ -74,6 +75,7 @@ namespace AssetBundler
 
         // There is no need to update the UserSettings file, so we can avoid a race condition by disabling save on shutdown
         AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
+        return true;
     }
 
     void ApplicationManager::DestroyApplication()
@@ -372,6 +374,13 @@ namespace AssetBundler
     {
         using namespace AzToolsFramework;
 
+        auto validateArgsOutcome = ValidateInputArgs(parser, m_allSeedsArgs);
+        if (!validateArgsOutcome.IsSuccess())
+        {
+            OutputHelpSeeds();
+            return AZ::Failure(validateArgsOutcome.TakeError());
+        }
+
         SeedsParams params;
 
         params.m_ignoreFileCase = parser->HasSwitch(IgnoreFileCaseFlag);
@@ -462,6 +471,13 @@ namespace AssetBundler
 
     AZ::Outcome<AssetListsParams, AZStd::string> ApplicationManager::ParseAssetListsCommandData(const AZ::CommandLine* parser)
     {
+        auto validateArgsOutcome = ValidateInputArgs(parser, m_allAssetListsArgs);
+        if (!validateArgsOutcome.IsSuccess())
+        {
+            OutputHelpAssetLists();
+            return AZ::Failure(validateArgsOutcome.TakeError());
+        }
+
         AssetListsParams params;
 
         // Read in Platform arg
@@ -525,6 +541,13 @@ namespace AssetBundler
 
     AZ::Outcome<ComparisonRulesParams, AZStd::string> ApplicationManager::ParseComparisonRulesCommandData(const AZ::CommandLine* parser)
     {
+        auto validateArgsOutcome = ValidateInputArgs(parser, m_allComparisonRulesArgs);
+        if (!validateArgsOutcome.IsSuccess())
+        {
+            OutputHelpComparisonRules();
+            return AZ::Failure(validateArgsOutcome.TakeError());
+        }
+
         ScopedTraceHandler traceHandler;
         ComparisonRulesParams params;
 
@@ -907,6 +930,13 @@ namespace AssetBundler
 
     AZ::Outcome<ComparisonParams, AZStd::string> ApplicationManager::ParseCompareCommandData(const AZ::CommandLine* parser)
     {
+        auto validateArgsOutcome = ValidateInputArgs(parser, m_allCompareArgs);
+        if (!validateArgsOutcome.IsSuccess())
+        {
+            OutputHelpCompare();
+            return AZ::Failure(validateArgsOutcome.TakeError());
+        }
+
         ComparisonParams params;
 
         // Read in Platform arg
@@ -998,6 +1028,13 @@ namespace AssetBundler
 
     AZ::Outcome<BundleSettingsParams, AZStd::string> ApplicationManager::ParseBundleSettingsCommandData(const AZ::CommandLine* parser)
     {
+        auto validateArgsOutcome = ValidateInputArgs(parser, m_allBundleSettingsArgs);
+        if (!validateArgsOutcome.IsSuccess())
+        {
+            OutputHelpBundleSettings();
+            return AZ::Failure(validateArgsOutcome.TakeError());
+        }
+
         BundleSettingsParams params;
 
         // Read in Platform arg
@@ -1202,6 +1239,13 @@ namespace AssetBundler
 
     AZ::Outcome<BundlesParamsList, AZStd::string> ApplicationManager::ParseBundlesCommandData(const AZ::CommandLine* parser)
     {
+        auto validateArgsOutcome = ValidateInputArgs(parser, m_allBundlesArgs);
+        if (!validateArgsOutcome.IsSuccess())
+        {
+            OutputHelpBundles();
+            return AZ::Failure(validateArgsOutcome.TakeError());
+        }
+
         auto parseSettingsOutcome = ParseBundleSettingsAndOverrides(parser, BundlesCommand);
         if (!parseSettingsOutcome.IsSuccess())
         {
@@ -1213,6 +1257,14 @@ namespace AssetBundler
 
     AZ::Outcome<BundleSeedParams, AZStd::string> ApplicationManager::ParseBundleSeedCommandData(const AZ::CommandLine* parser)
     {
+
+        auto validateArgsOutcome = ValidateInputArgs(parser, m_allBundleSeedArgs);
+        if (!validateArgsOutcome.IsSuccess())
+        {
+            OutputHelpBundleSeed();
+            return AZ::Failure(validateArgsOutcome.TakeError());
+        }
+
         BundleSeedParams params;
 
         params.m_addSeedList = GetAddSeedArgList(parser);
@@ -1230,6 +1282,12 @@ namespace AssetBundler
 
     AZ::Outcome<void, AZStd::string> ApplicationManager::ValidateInputArgs(const AZ::CommandLine* parser, const AZStd::vector<const char*>& validArgList)
     {
+        constexpr AZStd::string_view ApplicationArgList = "/O3DE/AzCore/Application/ValidCommandOptions";
+        AZStd::vector<AZStd::string> validApplicationArgs;
+        if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+        {
+            settingsRegistry->GetObject(validApplicationArgs, ApplicationArgList);
+        }
         for (const auto& paramInfo : *parser)
         {
             // Skip positional arguments
@@ -1247,10 +1305,18 @@ namespace AssetBundler
                     break;
                 }
             }
+            for (const auto& validArg : validApplicationArgs)
+            {
+                if (AZ::StringFunc::Equal(paramInfo.m_option, validArg))
+                {
+                    isValidArg = true;
+                    break;
+                }
+            }
 
             if (!isValidArg)
             {
-                return AZ::Failure(AZStd::string::format("Unknown argument: \"--%s\" is not an unknown argument for this sub-command.", paramInfo.m_option.c_str()));
+                return AZ::Failure(AZStd::string::format(R"(Invalid argument: "--%s" is not a valid argument for this sub-command.)", paramInfo.m_option.c_str()));
             }
         }
 
@@ -1335,10 +1401,10 @@ namespace AssetBundler
         }
 
         // If no platform was specified, defaulting to platforms specified in the asset processor config files
-        const char* appRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(appRoot, &AzFramework::ApplicationRequests::GetAppRoot);
-
-        AzFramework::PlatformFlags platformFlags = GetEnabledPlatformFlags(GetEngineRoot(), appRoot, AZ::Utils::GetProjectPath().c_str());
+        AzFramework::PlatformFlags platformFlags = GetEnabledPlatformFlags(
+            AZStd::string_view{ AZ::Utils::GetEnginePath() },
+            AZStd::string_view{ AZ::Utils::GetEnginePath() },
+            AZStd::string_view{ AZ::Utils::GetProjectPath() });
         auto platformsString = AzFramework::PlatformHelper::GetCommaSeparatedPlatformList(platformFlags);
 
         AZ_TracePrintf(AppWindowName, "No platform specified, defaulting to platforms ( %s ).\n", platformsString.c_str());
@@ -1522,7 +1588,7 @@ namespace AssetBundler
                 }
             }
 
-            AZStd::vector<AZStd::string> defaultSeeds = GetDefaultSeeds(GetEngineRoot(), AZ::Utils::GetProjectPath(), m_currentProjectName);
+            AZStd::vector<AZStd::string> defaultSeeds = GetDefaultSeeds(AZ::Utils::GetProjectPath(), m_currentProjectName);
             if (defaultSeeds.empty())
             {
                 // Error has already been thrown
@@ -2847,3 +2913,4 @@ namespace AssetBundler
         return !m_showVerboseOutput;
     }
 } // namespace AssetBundler
+#include <source/utils/moc_applicationManager.cpp>
diff --git a/Code/Tools/AssetBundler/source/utils/applicationManager.h b/Code/Tools/AssetBundler/source/utils/applicationManager.h
index 01f180a77a..d49707f489 100644
--- a/Code/Tools/AssetBundler/source/utils/applicationManager.h
+++ b/Code/Tools/AssetBundler/source/utils/applicationManager.h
@@ -11,6 +11,7 @@
  */
 #pragma once
 
+#if !defined(Q_MOC_RUN)
 #include <AzToolsFramework/Application/ToolsApplication.h>
 #include <AzToolsFramework/Asset/AssetSeedManager.h>
 #include <AzToolsFramework/Asset/AssetBundler.h>
@@ -22,7 +23,7 @@
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <source/utils/utils.h>
 #include <AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.h>
-
+#endif
 namespace AssetBundler
 {
     struct SeedsParams
@@ -161,16 +162,18 @@ namespace AssetBundler
     };
 
     class ApplicationManager
-        : public AZ::Debug::TraceMessageBus::Handler
+        : public QObject
+        , public AZ::Debug::TraceMessageBus::Handler
         , public AzToolsFramework::ToolsApplication
     {
+        Q_OBJECT
     public:
-        explicit ApplicationManager(int* argc, char*** argv);
-        ~ApplicationManager();
+        explicit ApplicationManager(int* argc, char*** argv, QObject* parent = 0);
+        virtual ~ApplicationManager();
 
-        void Init();
+        virtual bool Init();
         void DestroyApplication();
-        bool Run();
+        virtual bool Run();
 
         ////////////////////////////////////////////////////////////////////////////////////////////
         // AzFramework::Application overrides
diff --git a/Code/Tools/AssetBundler/source/utils/utils.cpp b/Code/Tools/AssetBundler/source/utils/utils.cpp
index b1595f7dd8..39bc1a7e13 100644
--- a/Code/Tools/AssetBundler/source/utils/utils.cpp
+++ b/Code/Tools/AssetBundler/source/utils/utils.cpp
@@ -31,6 +31,7 @@ AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
 #include <QDir>
 #include <QString>
 #include <QStringList>
+#include <QJsonDocument>
 AZ_POP_DISABLE_WARNING
 
 namespace AssetBundler
@@ -108,15 +109,15 @@ namespace AssetBundler
 
     const char* AssetCatalogFilename = "assetcatalog.xml";
 
-    
-    const char EngineDirectoryName[] = "Engine";
+
+    constexpr auto EngineDirectoryName = AZ::IO::FixedMaxPath("Assets") / "Engine";
     const char RestrictedDirectoryName[] = "restricted";
     const char PlatformsDirectoryName[] = "Platforms";
     const char GemsDirectoryName[] = "Gems";
     const char GemsAssetsDirectoryName[] = "Assets";
     const char GemsSeedFileName[] = "seedList";
     const char EngineSeedFileName[] = "SeedAssetList";
-    
+
 
     namespace Internal
     {
@@ -128,7 +129,7 @@ namespace AssetBundler
             AZStd::unordered_map<AZStd::string, AZStd::string>& defaultSeedLists,
             AzFramework::PlatformFlags platformFlags)
         {
-            AZ::IO::FixedMaxPath engineRoot(GetEngineRoot());
+            AZ::IO::FixedMaxPath engineRoot(AZ::Utils::GetEnginePath());
             AZ::IO::FixedMaxPath engineRestrictedRoot = engineRoot / RestrictedDirectoryName;
 
             AZ::IO::FixedMaxPath engineLocalPath = AZ::IO::PathView(engineDirectory.LexicallyRelative(engineRoot));
@@ -201,17 +202,6 @@ namespace AssetBundler
         }
     }
 
-    AZ::IO::FixedMaxPath GetEngineRoot()
-    {
-        AZ::IO::FixedMaxPath engineRootPath;
-        if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-        {
-            settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
-        }
-
-        return engineRootPath;
-    }
-
     void AddPlatformIdentifier(AZStd::string& filePath, const AZStd::string& platformIdentifier)
     {
         AZStd::string fileName;
@@ -259,11 +249,11 @@ namespace AssetBundler
         absoluteEngineSeedFilePath.ReplaceExtension(AzToolsFramework::AssetSeedManager::GetSeedFileExtension());
         if (fileIO->Exists(absoluteEngineSeedFilePath.c_str()))
         {
-            defaultSeedLists[absoluteEngineSeedFilePath.Native()] = EngineDirectoryName;
+            defaultSeedLists[absoluteEngineSeedFilePath.Native()] = EngineDirectoryName.String();
         }
 
         // Add Seed Lists from the Platforms directory
-        Internal::AddPlatformsDirectorySeeds(engineDirectory, EngineDirectoryName, defaultSeedLists, platformFlag);
+        Internal::AddPlatformsDirectorySeeds(engineDirectory, EngineDirectoryName.String(), defaultSeedLists, platformFlag);
 
         auto absoluteProjectDefaultSeedFilePath = AZ::IO::Path(projectPath) / EngineSeedFileName;
         absoluteProjectDefaultSeedFilePath.ReplaceExtension(AzToolsFramework::AssetSeedManager::GetSeedFileExtension());
@@ -276,11 +266,11 @@ namespace AssetBundler
         return defaultSeedLists;
     }
 
-    AZStd::vector<AZStd::string> GetDefaultSeeds(AZStd::string_view enginePath, AZStd::string_view projectPath, AZStd::string_view projectName)
+    AZStd::vector<AZStd::string> GetDefaultSeeds(AZStd::string_view projectPath, AZStd::string_view projectName)
     {
         AZStd::vector<AZStd::string> defaultSeeds;
 
-        defaultSeeds.emplace_back(GetProjectDependenciesAssetPath(enginePath, projectPath, projectName));
+        defaultSeeds.emplace_back(GetProjectDependenciesAssetPath(projectPath, projectName));
 
         return defaultSeeds;
     }
@@ -294,34 +284,12 @@ namespace AssetBundler
         return projectDependenciesFilePath.LexicallyNormal();
     }
 
-    AZ::IO::Path GetProjectDependenciesFileTemplate(AZStd::string_view engineRoot)
-    {
-        AZ::IO::Path projectDependenciesFileTemplate = engineRoot;
-        projectDependenciesFileTemplate /= DefaultProjectTemplatePath;
-        projectDependenciesFileTemplate /= AZStd::string::format("%s%s", ProjectName, DependenciesFileSuffix);
-        projectDependenciesFileTemplate.ReplaceExtension(DependenciesFileExtension);
-        return projectDependenciesFileTemplate.LexicallyNormal();
-    }
-
-    AZ::IO::Path GetProjectDependenciesAssetPath(AZStd::string_view enginePath, AZStd::string_view projectPath, AZStd::string_view projectName)
+    AZ::IO::Path GetProjectDependenciesAssetPath(AZStd::string_view projectPath, AZStd::string_view projectName)
     {
         AZ::IO::Path projectDependenciesFile = GetProjectDependenciesFile(projectPath, projectName);
         if (!AZ::IO::FileIOBase::GetInstance()->Exists(projectDependenciesFile.c_str()))
         {
-            AZ_TracePrintf(AssetBundler::AppWindowName, "Project dependencies file %s doesn't exist.\n", projectDependenciesFile.c_str());
-
-            AZ::IO::Path projectDependenciesFileTemplate = GetProjectDependenciesFileTemplate(enginePath);
-            if (AZ::IO::FileIOBase::GetInstance()->Copy(projectDependenciesFileTemplate.c_str(), projectDependenciesFile.c_str()))
-            {
-                AZ_TracePrintf(AssetBundler::AppWindowName, "Copied project dependencies file template %s to the current project.\n",
-                    projectDependenciesFile.c_str());
-            }
-            else
-            {
-                AZ_Error(AppWindowName, false, "Failed to copy project dependencies file template %s from default project"
-                    " template to the current project.\n", projectDependenciesFileTemplate.c_str());
-                return {};
-            }
+            AZ_Error(AssetBundler::AppWindowName, false, "Project dependencies file %s doesn't exist.\n", projectDependenciesFile.c_str());
         }
 
         // Turn the absolute path into a cache-relative path
@@ -538,6 +506,14 @@ namespace AssetBundler
         return platformSpecificCacheFolderPath;
     }
 
+    AZStd::string GenerateKeyFromAbsolutePath(const AZStd::string& absoluteFilePath)
+    {
+        AZStd::string key(absoluteFilePath);
+        AzFramework::StringFunc::Path::Normalize(key);
+        AzFramework::StringFunc::Path::StripDrive(key);
+        return key;
+    }
+
     void ConvertToRelativePath(AZStd::string_view parentFolderPath, AZStd::string& absoluteFilePath)
     {
         absoluteFilePath = AZ::IO::PathView(absoluteFilePath).LexicallyRelative(parentFolderPath).String();
@@ -822,4 +798,26 @@ namespace AssetBundler
         }
         return false;
     }
+
+    QJsonObject ReadJson(const AZStd::string& filePath)
+    {
+        QByteArray byteArray;
+        QFile jsonFile;
+        jsonFile.setFileName(filePath.c_str());
+        jsonFile.open(QIODevice::ReadOnly | QIODevice::Text);
+        byteArray = jsonFile.readAll();
+        jsonFile.close();
+
+        return QJsonDocument::fromJson(byteArray).object();
+    }
+
+    void SaveJson(const AZStd::string& filePath, const QJsonObject& jsonObject)
+    {
+        QFile jsonFile(filePath.c_str());
+        QJsonDocument JsonDocument;
+        JsonDocument.setObject(jsonObject);
+        jsonFile.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
+        jsonFile.write(JsonDocument.toJson());
+        jsonFile.close();
+    }
 }
diff --git a/Code/Tools/AssetBundler/source/utils/utils.h b/Code/Tools/AssetBundler/source/utils/utils.h
index db6729098a..454a279878 100644
--- a/Code/Tools/AssetBundler/source/utils/utils.h
+++ b/Code/Tools/AssetBundler/source/utils/utils.h
@@ -19,7 +19,9 @@
 #include <AzFramework/Platform/PlatformDefaults.h>
 #include <AzToolsFramework/Asset/AssetBundler.h>
 #include <AzToolsFramework/Asset/AssetUtils.h>
-
+#include <QDir>
+#include <QStringList>
+#include <QJsonObject>
 
 namespace AssetBundler
 {
@@ -137,9 +139,6 @@ namespace AssetBundler
         bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
     };
 
-    // Returns the engine root
-    AZ::IO::FixedMaxPath GetEngineRoot();
-
     /** 
     * Determines the name of the currently enabled game project
     * @return Current Project name on success, error message on failure
@@ -192,6 +191,8 @@ namespace AssetBundler
     */
     AZ::IO::Path GetPlatformSpecificCacheFolderPath();
 
+    AZStd::string GenerateKeyFromAbsolutePath(const AZStd::string& absoluteFilePath);
+
     void ConvertToRelativePath(AZStd::string_view parentFolderPath, AZStd::string& absoluteFilePath);
 
     AZ::Outcome<void, AZStd::string> MakePath(const AZStd::string& path);
@@ -207,16 +208,13 @@ namespace AssetBundler
         const AZStd::vector<AzFramework::GemInfo>& gemInfoList, AzFramework::PlatformFlags platformFlags);
 
     //! Returns a vector of relative paths to Assets that should be included as default Seeds, but are not already in a Seed List file.
-    AZStd::vector<AZStd::string> GetDefaultSeeds(AZStd::string_view enginePath, AZStd::string_view projectPath, AZStd::string_view projectName);
+    AZStd::vector<AZStd::string> GetDefaultSeeds(AZStd::string_view projectPath, AZStd::string_view projectName);
 
     //! Returns the absolute path of {ProjectName}_Dependencies.xml
     AZ::IO::Path GetProjectDependenciesFile(AZStd::string_view productPath, AZStd::string_view projectName);
 
-    //! Returns the absolute path of the project dependencies file in the default project template
-    AZ::IO::Path GetProjectDependenciesFileTemplate(AZStd::string_view enginePath);
-
     //! Creates the ProjectName_Dependencies.xml file if it does not exist, and adds returns the relative path to the asset in the Cache.
-    AZ::IO::Path GetProjectDependenciesAssetPath(AZStd::string_view enginePath, AZStd::string_view projectPath, AZStd::string_view projectName);
+    AZ::IO::Path GetProjectDependenciesAssetPath(AZStd::string_view projectPath, AZStd::string_view projectName);
 
     //! Returns the map from gem seed list file path to gem name
     AZStd::unordered_map<AZStd::string, AZStd::string> GetGemSeedListFilePathToGemNameMap(const AZStd::vector<AzFramework::GemInfo>& gemInfoList, AzFramework::PlatformFlags platformFlags);
@@ -229,6 +227,9 @@ namespace AssetBundler
     //! Please note that the game project could be in a different location to the engine therefore we need the assetRoot param.
     AzFramework::PlatformFlags GetEnabledPlatformFlags(AZStd::string_view enginePath, AZStd::string_view assetRoot, AZStd::string_view projectPath);
 
+    QJsonObject ReadJson(const AZStd::string& filePath);
+    void SaveJson(const AZStd::string& filePath, const QJsonObject& jsonObject);
+
     //! Filepath is a helper class that is used to find the absolute path of a file
     //! if the inputted file path is an absolute path than it does nothing
     //! if the inputted file path is a relative path than based on whether the user
diff --git a/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.ini b/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.ini
deleted file mode 100644
index 1acb3b90e6..0000000000
--- a/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Platforms]
-;pc=enabled
-es3=enabled
-;ios=enabled
-;osx_gl=enabled
-;provo=enabled
-;server=enabled
-
-
diff --git a/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..81fcdbcf12
--- /dev/null
+++ b/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,11 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platforms": {
+                    "es3": "enabled"
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetBundler/tests/Engine/SeedAssetList.seed b/Code/Tools/AssetBundler/tests/Assets/Engine/SeedAssetList.seed
similarity index 100%
rename from Code/Tools/AssetBundler/tests/Engine/SeedAssetList.seed
rename to Code/Tools/AssetBundler/tests/Assets/Engine/SeedAssetList.seed
diff --git a/Code/Tools/AssetBundler/tests/DummyProject/AssetProcessorGamePlatformConfig.ini b/Code/Tools/AssetBundler/tests/DummyProject/AssetProcessorGamePlatformConfig.ini
deleted file mode 100644
index 702a486603..0000000000
--- a/Code/Tools/AssetBundler/tests/DummyProject/AssetProcessorGamePlatformConfig.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[Platforms]
-;pc=enabled
-;es3=enabled
-ios=enabled
-;osx_gl=enabled
-;provo=enabled
-;server=enabled
diff --git a/Code/Tools/AssetBundler/tests/DummyProject/AssetProcessorGamePlatformConfig.setreg b/Code/Tools/AssetBundler/tests/DummyProject/AssetProcessorGamePlatformConfig.setreg
new file mode 100644
index 0000000000..490d4a8571
--- /dev/null
+++ b/Code/Tools/AssetBundler/tests/DummyProject/AssetProcessorGamePlatformConfig.setreg
@@ -0,0 +1,11 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platforms": {
+                    "ios": "enabled"
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetBundler/tests/Gems/GemA/AssetProcessorGemConfig.ini b/Code/Tools/AssetBundler/tests/Gems/GemA/AssetProcessorGemConfig.ini
deleted file mode 100644
index 125b5dc32a..0000000000
--- a/Code/Tools/AssetBundler/tests/Gems/GemA/AssetProcessorGemConfig.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Platforms]
-;pc=enabled
-;es3=enabled
-;ios=enabled
-;osx_gl=enabled
-provo=enabled
-;server=enabled
-
-
diff --git a/Code/Tools/AssetBundler/tests/Gems/GemA/AssetProcessorGemConfig.setreg b/Code/Tools/AssetBundler/tests/Gems/GemA/AssetProcessorGemConfig.setreg
new file mode 100644
index 0000000000..6616f886b1
--- /dev/null
+++ b/Code/Tools/AssetBundler/tests/Gems/GemA/AssetProcessorGemConfig.setreg
@@ -0,0 +1,11 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platforms": {
+                    "provo": "enabled"
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetBundler/tests/tests_main.cpp b/Code/Tools/AssetBundler/tests/tests_main.cpp
index e1535bf0f5..9e12623b0d 100644
--- a/Code/Tools/AssetBundler/tests/tests_main.cpp
+++ b/Code/Tools/AssetBundler/tests/tests_main.cpp
@@ -88,7 +88,7 @@ namespace AssetBundler
 
     const char RelativeTestFolder[] = "Code/Tools/AssetBundler/tests";
     const char GemsFolder[] = "Gems";
-    const char EngineFolder[] = "Engine";
+    constexpr auto EngineFolder = AZ::IO::FixedMaxPath("Assets") / "Engine";
     const char PlatformsFolder[] = "Platforms";
     const char DummyProjectFolder[] = "DummyProject";
 
@@ -113,14 +113,14 @@ namespace AssetBundler
                 AZ::SettingsRegistry::Register(&m_registry);
             }
 
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            if (!engineRoot)
+            AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
+            if (engineRoot.empty())
             {
                 GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to locate engine root.\n").c_str());
             }
 
-            AzFramework::StringFunc::Path::Join(engineRoot, RelativeTestFolder, m_data->m_testEngineRoot);
+
+            m_data->m_testEngineRoot = (engineRoot / RelativeTestFolder).LexicallyNormal().String();
 
             m_data->m_localFileIO = aznew AZ::IO::LocalFileIO();
             m_data->m_priorFileIO = AZ::IO::FileIOBase::GetInstance();
@@ -132,8 +132,8 @@ namespace AssetBundler
             AddGemData(m_data->m_testEngineRoot.c_str(), "GemA");
             AddGemData(m_data->m_testEngineRoot.c_str(), "GemB");
 
-            AZStd::string absoluteEngineSeedFilePath;
-            AzFramework::StringFunc::Path::ConstructFull(m_data->m_testEngineRoot.c_str(), EngineFolder, "SeedAssetList", AzToolsFramework::AssetSeedManager::GetSeedFileExtension(), absoluteEngineSeedFilePath, true);
+            auto absoluteEngineSeedFilePath = m_data->m_testEngineRoot / EngineFolder / "SeedAssetList";
+            absoluteEngineSeedFilePath.ReplaceExtension(AzToolsFramework::AssetSeedManager::GetSeedFileExtension());
             m_data->m_gemSeedFilePairList.emplace_back(AZStd::make_pair(absoluteEngineSeedFilePath, true));
 
             AddGemData(m_data->m_testEngineRoot.c_str(), "GemC", false);
@@ -213,7 +213,7 @@ namespace AssetBundler
             AZStd::unique_ptr<AzToolsFramework::ToolsApplication> m_application = {};
             AZ::IO::FileIOBase* m_priorFileIO = nullptr;
             AZ::IO::FileIOBase* m_localFileIO = nullptr;
-            AZStd::string m_testEngineRoot;
+            AZ::IO::Path m_testEngineRoot;
         };
 
         const int GemAIndex = 0;
diff --git a/Code/Tools/AssetProcessor/CMakeLists.txt b/Code/Tools/AssetProcessor/CMakeLists.txt
index 9eea81b415..5d4980eed4 100644
--- a/Code/Tools/AssetProcessor/CMakeLists.txt
+++ b/Code/Tools/AssetProcessor/CMakeLists.txt
@@ -48,7 +48,6 @@ ly_add_target(
             ${additional_dependencies}
     RUNTIME_DEPENDENCIES
         AZ::AssetBuilder
-        Legacy::RC
 )
 
 # Aggregates all combined AssetBuilders into a single LY_ASSET_BUILDERS #define
@@ -178,7 +177,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/config_broken_badplatform
         )
@@ -186,7 +185,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_noscans/AssetProcessorPlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/config_broken_noscans
     )
@@ -194,7 +193,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/config_broken_recognizers
     )
@@ -202,7 +201,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/config_broken_noplatform
     )
@@ -210,7 +209,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_regular/AssetProcessorPlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_regular/AssetProcessorPlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/config_regular
     )
@@ -218,7 +217,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/config_regular_platform_scanfolder
     )
@@ -226,7 +225,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/EmptyDummyProject
     )
@@ -234,7 +233,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TARGETS
             AssetProcessor.Tests
         FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/DummyProject/AssetProcessorGamePlatformConfig.ini
+            ${CMAKE_CURRENT_SOURCE_DIR}/testdata/DummyProject/AssetProcessorGamePlatformConfig.setreg
         OUTPUT_SUBDIRECTORY
             testdata/DummyProject
     )
diff --git a/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake
index e065f9a1a2..be1e85d370 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake
@@ -9,13 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-ly_add_bundle_resources(
-    TARGET AssetProcessor
-    FILES
-        ${CMAKE_SOURCE_DIR}/Code/Tools/RC/Config/rc/xmlfilter.txt
-        ${CMAKE_SOURCE_DIR}/Code/Tools/RC/Config/rc/rc.ini
-)
-
 # Set resources directory for app icons
 target_sources(AssetProcessor PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Platform/Mac/Images.xcassets)
 set_target_properties(AssetProcessor PROPERTIES
diff --git a/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake
index 79771a9d37..ab7a1e4a9f 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake
@@ -31,7 +31,9 @@ set(FILES
     native/ui/GoToButton.h
     native/ui/GoToButton.cpp
     native/ui/GoToButton.ui
-    native/ui/MainWindow.h
+    native/ui/JobTreeViewItemDelegate.h
+    native/ui/JobTreeViewItemDelegate.cpp
+    native/ui/MainWindow.ui
     native/ui/MainWindow.cpp
     native/ui/MainWindow.ui
     native/ui/ProductAssetDetailsPanel.h
diff --git a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
index 257f044ffd..cff5f4ef39 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
@@ -10,14 +10,14 @@
 #
 
 set(FILES
-    testdata/config_broken_badplatform/AssetProcessorPlatformConfig.ini
-    testdata/config_broken_noplatform/AssetProcessorPlatformConfig.ini
-    testdata/config_broken_noscans/AssetProcessorPlatformConfig.ini
-    testdata/config_broken_recognizers/AssetProcessorPlatformConfig.ini
-    testdata/config_regular/AssetProcessorPlatformConfig.ini
-    testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.ini
-    testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.ini
-    testdata/DummyProject/AssetProcessorGamePlatformConfig.ini
+    testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg
+    testdata/config_broken_noplatform/AssetProcessorPlatformConfig.setreg
+    testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg
+    testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg
+    testdata/config_regular/AssetProcessorPlatformConfig.setreg
+    testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
+    testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.setreg
+    testdata/DummyProject/AssetProcessorGamePlatformConfig.setreg
     native/tests/AssetProcessorTest.h
     native/tests/AssetProcessorTest.cpp
     native/tests/BaseAssetProcessorTest.h
diff --git a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
index fa6adcf0fe..5430f0807e 100644
--- a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
@@ -45,7 +45,6 @@ namespace AssetProcessor
             "   ScanFolder      TEXT NOT NULL collate nocase, "
             "   DisplayName     TEXT NOT NULL collate nocase, "
             "   PortableKey     TEXT NOT NULL collate nocase, "
-            "   OutputPrefix    TEXT NOT NULL collate nocase, "
             "   IsRoot          INTEGER NOT NULL);";
 
         static const char* CREATE_SOURCES_TABLE = "AssetProcessor::CreateSourceTable";
@@ -254,14 +253,13 @@ namespace AssetProcessor
 
         static const char* INSERT_SCANFOLDER = "AssetProcessor::InsertScanFolder";
         static const char* INSERT_SCANFOLDER_STATEMENT =
-            "INSERT INTO ScanFolders (ScanFolder, DisplayName, PortableKey, OutputPrefix, IsRoot) "
-            "VALUES (:scanfolder, :displayname, :portablekey, :outputprefix, :isroot);";
+            "INSERT INTO ScanFolders (ScanFolder, DisplayName, PortableKey, IsRoot) "
+            "VALUES (:scanfolder, :displayname, :portablekey, :isroot);";
 
         static const auto s_InsertScanfolderQuery = MakeSqlQuery(INSERT_SCANFOLDER, INSERT_SCANFOLDER_STATEMENT, LOG_NAME,
             SqlParam<const char*>(":scanfolder"),
             SqlParam<const char*>(":displayname"),
             SqlParam<const char*>(":portablekey"),
-            SqlParam<const char*>(":outputprefix"),
             SqlParam<AZ::s32>(":isroot"));
 
         static const char* UPDATE_SCANFOLDER = "AssetProcessor::UpdateScanFolder";
@@ -270,7 +268,6 @@ namespace AssetProcessor
             "ScanFolder =   :scanfolder, "
             "DisplayName =  :displayname, "
             "PortableKey =  :portablekey, "
-            "OutputPrefix = :outputprefix, "
             "IsRoot = :isroot "
             "WHERE "
             "ScanFolderID = :scanfolderid;";
@@ -279,7 +276,6 @@ namespace AssetProcessor
             SqlParam<const char*>(":scanfolder"),
             SqlParam<const char*>(":displayname"),
             SqlParam<const char*>(":portablekey"),
-            SqlParam<const char*>(":outputprefix"),
             SqlParam<AZ::s32>(":isroot"),
             SqlParam<AZ::s64>(":scanfolderid"));
 
@@ -1051,6 +1047,10 @@ namespace AssetProcessor
             }
         }
 
+        // Nothing to do for version `AssetDatabase::DatabaseVersion::RemoveOutputPrefixFromScanFolders`
+        // sqlite doesn't not support altering a table to remove a column
+        // This is fine as the extra OutputPrefix column will not be queried
+
         if (foundVersion == CurrentDatabaseVersion())
         {
             dropAllTables = false;
@@ -1433,7 +1433,7 @@ namespace AssetProcessor
 
             //its not in the database, add it
             // it is a single statement, do not wrap it in a transaction, this wastes a lot of time.
-            if (!s_InsertScanfolderQuery.BindAndStep(*m_databaseConnection, entry.m_scanFolder.c_str(), entry.m_displayName.c_str(), entry.m_portableKey.c_str(), entry.m_outputPrefix.c_str(), entry.m_isRoot))
+            if (!s_InsertScanfolderQuery.BindAndStep(*m_databaseConnection, entry.m_scanFolder.c_str(), entry.m_displayName.c_str(), entry.m_portableKey.c_str(), entry.m_isRoot))
             {
                 return false;
             }
@@ -1457,7 +1457,7 @@ namespace AssetProcessor
                 return false;
             }
 
-            return s_UpdateScanfolderQuery.BindAndStep(*m_databaseConnection, entry.m_scanFolder.c_str(), entry.m_displayName.c_str(), entry.m_portableKey.c_str(), entry.m_outputPrefix.c_str(), entry.m_isRoot, entry.m_scanFolderID);
+            return s_UpdateScanfolderQuery.BindAndStep(*m_databaseConnection, entry.m_scanFolder.c_str(), entry.m_displayName.c_str(), entry.m_portableKey.c_str(), entry.m_isRoot, entry.m_scanFolderID);
         }
     }
 
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
index 0991ef72de..196f6b0543 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
@@ -951,17 +951,7 @@ namespace AssetProcessor
                         // the subId part of the assetId will always be set to zero.
                         assetInfo.m_assetId = AZ::Data::AssetId(entry.m_sourceGuid, 0);
 
-                        // the Scan Folder may have an output prefix, so we must remove it from the relpath.
-                        // this involves deleting the output prefix and the first slash ('editor/') which is why
-                        // we remove the length of outputPrefix and one extra character.
-                        if (!scanEntry.m_outputPrefix.empty())
-                        {
-                            assetInfo.m_relativePath = entry.m_sourceName.substr(static_cast<int>(scanEntry.m_outputPrefix.size()) + 1);
-                        }
-                        else
-                        {
-                            assetInfo.m_relativePath = entry.m_sourceName;
-                        }
+                        assetInfo.m_relativePath = entry.m_sourceName;
                         AZStd::string absolutePath;
                         AzFramework::StringFunc::Path::Join(scanEntry.m_scanFolder.c_str(), assetInfo.m_relativePath.c_str(), absolutePath);
                         assetInfo.m_sizeBytes = AZ::IO::SystemFile::Length(absolutePath.c_str());
@@ -1375,17 +1365,7 @@ namespace AssetProcessor
                 AzToolsFramework::AssetDatabase::ScanFolderDatabaseEntry scanEntry;
                 if (m_db->GetScanFolderByScanFolderID(entry.m_scanFolderPK, scanEntry))
                 {
-                    // the Scan Folder may have an output prefix, so we must remove it from the relpath.
-                    // this involves deleting the output prefix and the first slash ('editor/') which is why
-                    // we remove the length of outputPrefix and one extra character.
-                    if (!scanEntry.m_outputPrefix.empty())
-                    {
-                        relativePath = entry.m_sourceName.substr(static_cast<int>(scanEntry.m_outputPrefix.size()) + 1);
-                    }
-                    else
-                    {
-                        relativePath = entry.m_sourceName;
-                    }
+                    relativePath = entry.m_sourceName;
 
                     watchFolder = scanEntry.m_scanFolder;
                     
@@ -1530,28 +1510,7 @@ namespace AssetProcessor
                     watchFolder = sourceInfo.m_watchFolder.toStdString().c_str();
 
                     AZStd::string sourceNameStr(sourceInfo.m_sourceName.toStdString().c_str());
-                    
-                    // the Scan Folder may have an output prefix, so we must remove it from the relpath.
-                    // this involves deleting the output prefix and the first slash ('editor/') which is why
-                    // we remove the length of outputPrefix and one extra character.
-                    const AssetProcessor::ScanFolderInfo* info = m_platformConfig->GetScanFolderByPath(watchFolder.c_str());
-                    if ((info)&&(!info->GetOutputPrefix().isEmpty()))
-                    {
-                        const int prefixLength = static_cast<int>(info->GetOutputPrefix().length()) + 1;
-                        AZ_Assert(sourceNameStr.length() > prefixLength, "Source name [%s] was invalid compared to the output prefix.", sourceNameStr.c_str() != nullptr ? sourceNameStr.c_str() : "");
-                        if (sourceNameStr.length() > prefixLength)
-                        {
-                            assetInfo.m_relativePath = sourceNameStr.substr(prefixLength);
-                        }
-                        else
-                        {
-                            assetInfo.m_relativePath.swap(sourceNameStr);
-                        }
-                    }
-                    else
-                    {
-                        assetInfo.m_relativePath.swap(sourceNameStr);
-                    }
+                    assetInfo.m_relativePath.swap(sourceNameStr);
 
                     assetInfo.m_assetId = foundSource->first;
 
@@ -1598,15 +1557,7 @@ namespace AssetProcessor
             return false;
         }
         QString databasePath = QString::fromUtf8(sourceDatabaseName);
-        if (!scanFolderInfo->GetOutputPrefix().isEmpty() && databasePath.startsWith(scanFolderInfo->GetOutputPrefix(), Qt::CaseInsensitive))
-        {
-            QString relativePath = databasePath.right(databasePath.length() - scanFolderInfo->GetOutputPrefix().length() - 1); // also eat the slash, hence -1
-            assetInfo.m_relativePath = relativePath.toUtf8().data();
-        }
-        else
-        {
-            assetInfo.m_relativePath = sourceDatabaseName;
-        }
+        assetInfo.m_relativePath = sourceDatabaseName;
 
         AZStd::string absolutePath;
         AzFramework::StringFunc::Path::Join(watchFolder, assetInfo.m_relativePath.c_str(), absolutePath);
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp b/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp
index 78c49b1940..de8bde9b05 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp
@@ -65,7 +65,7 @@ namespace AssetProcessor
 
                 if (!AzFramework::StringFunc::Path::IsRelative(path.c_str()))
                 {
-                    if (m_platformConfig->ConvertToRelativePath(QString::fromUtf8(path.c_str()), relativePath, scanFolder, true))
+                    if (m_platformConfig->ConvertToRelativePath(QString::fromUtf8(path.c_str()), relativePath, scanFolder))
                     {
                         auto* scanFolderInfo = m_platformConfig->GetScanFolderByPath(scanFolder);
 
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
index f565309bce..a242c6377c 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
@@ -156,7 +156,7 @@ Please note that only those seed files will get updated that are active for your
         else
         {
             QString relativePathQString;
-            if (!PlatformConfiguration::ConvertToRelativePath(normalizedSource.c_str(), scanFolderInfo, relativePathQString, false))
+            if (!PlatformConfiguration::ConvertToRelativePath(normalizedSource.c_str(), scanFolderInfo, relativePathQString))
             {
                 return AZ::Failure(AZStd::string::format("Failed to convert path to relative path. %s\n", normalizedSource.c_str()));
             }
@@ -167,16 +167,6 @@ Please note that only those seed files will get updated that are active for your
         return AZ::Success();
     }
 
-    AZStd::string SourceFileRelocator::RemoveDatabasePrefix(const ScanFolderInfo* scanFolder, AZStd::string sourceName)
-    {
-        if (!scanFolder->GetOutputPrefix().isEmpty())
-        {
-            return sourceName.substr(scanFolder->GetOutputPrefix().size() + 1); //+1 to remove the slash after the prefix
-        }
-
-        return sourceName;
-    }
-
     QHash<QString, int> SourceFileRelocator::GetSources(QStringList pathMatches, const ScanFolderInfo* scanFolderInfo,
         SourceFileRelocationContainer& sources) const
     {
@@ -188,7 +178,7 @@ Please note that only those seed files will get updated that are active for your
             PlatformConfiguration::ConvertToRelativePath(file, scanFolderInfo, databaseSourceName);
             m_stateData->QuerySourceBySourceNameScanFolderID(databaseSourceName.toUtf8().constData(), scanFolderInfo->ScanFolderID(), [this, &sources, &scanFolderInfo, &sourceIndexMap, &databaseSourceName](const AzToolsFramework::AssetDatabase::SourceDatabaseEntry& entry)
                 {
-                    sources.emplace_back(entry, GetProductMapForSource(entry.m_sourceID), RemoveDatabasePrefix(scanFolderInfo, entry.m_sourceName), scanFolderInfo);
+                    sources.emplace_back(entry, GetProductMapForSource(entry.m_sourceID), entry.m_sourceName, scanFolderInfo);
                     sourceIndexMap[databaseSourceName] = aznumeric_cast<int> (sources.size() - 1);
                     return true;
                 });
@@ -357,12 +347,6 @@ Please note that only those seed files will get updated that are active for your
 
                     QString relativeFileName(normalizedSource.c_str());
 
-                    //if relative path starts with the output prefix than remove it first
-                    if (!scanFolderInfo->GetOutputPrefix().isEmpty() && relativeFileName.startsWith(scanFolderInfo->GetOutputPrefix(), Qt::CaseInsensitive))
-                    {
-                        relativeFileName = relativeFileName.right(relativeFileName.length() - (scanFolderInfo->GetOutputPrefix().length() + 1)); // adding 1 for slash
-                    }
-
                     QDir rooted(scanFolderInfo->ScanPath());
                     QString absolutePath = rooted.absoluteFilePath(relativeFileName);
 
@@ -620,7 +604,7 @@ Please note that only those seed files will get updated that are active for your
             {
                 QString relativePath;
                 QString scanFolderName;
-                m_platformConfig->ConvertToRelativePath(newDestinationPath.c_str(), relativePath, scanFolderName, false);
+                m_platformConfig->ConvertToRelativePath(newDestinationPath.c_str(), relativePath, scanFolderName);
 
                 relocationInfo.m_newAbsolutePath = newDestinationPath;
                 relocationInfo.m_newRelativePath = relativePath.toUtf8().constData();
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h
index 1fcda59b71..35c0216d4a 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h
@@ -96,7 +96,7 @@ namespace AssetProcessor
         SourceFileRelocationInfo(const AZStd::string& filePath, const ScanFolderInfo* scanFolder)
         {
             QString relFilePath;
-            PlatformConfiguration::ConvertToRelativePath(filePath.c_str(), scanFolder, relFilePath, true);
+            PlatformConfiguration::ConvertToRelativePath(filePath.c_str(), scanFolder, relFilePath);
             m_oldRelativePath = relFilePath.toUtf8().data();
             AzFramework::StringFunc::Path::ConstructFull(scanFolder->ScanPath().toUtf8().constData(), m_oldRelativePath.c_str(), m_oldAbsolutePath, false);
             m_oldAbsolutePath = AssetUtilities::NormalizeFilePath(m_oldAbsolutePath.c_str()).toUtf8().constData();
@@ -191,7 +191,6 @@ namespace AssetProcessor
         SourceFileRelocator(AZStd::shared_ptr<AzToolsFramework::AssetDatabase::AssetDatabaseConnection> stateData, PlatformConfiguration* platformConfiguration);
         ~SourceFileRelocator();
 
-        static AZStd::string RemoveDatabasePrefix(const ScanFolderInfo* scanFolder, AZStd::string sourceName);
         static void MakePathRelative(const AZStd::string& parentPath, const AZStd::string& childPath, AZStd::string& parentRelative, AZStd::string& childRelative);
 
         static AZ::Outcome<AZStd::string, AZStd::string> HandleWildcard(AZStd::string_view absFile, AZStd::string_view absSearch, AZStd::string destination);
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
index d403b97359..47f79d9709 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
@@ -142,11 +142,6 @@ namespace AssetProcessor
                 QString databaseSourceName = QString::fromUtf8(entry.m_sourceName.c_str());
                 QString scanFolderPath = QString::fromUtf8(entry.m_scanFolder.c_str());
                 QString relativeToScanFolderPath = databaseSourceName;
-                if (!entry.m_outputPrefix.empty())
-                {
-                    relativeToScanFolderPath = relativeToScanFolderPath.remove(0, static_cast<int>(entry.m_outputPrefix.size()) + 1);
-                }
-
                 QString finalAbsolute = (QString("%1/%2").arg(scanFolderPath).arg(relativeToScanFolderPath));
                 m_sourceFilesInDatabase[finalAbsolute] = { scanFolderPath, relativeToScanFolderPath, databaseSourceName, entry.m_analysisFingerprint.c_str() };
 
@@ -173,12 +168,6 @@ namespace AssetProcessor
                     if (scanFolderInfo.ScanFolderID() == entry.m_scanFolderPK)
                     {
                         scanFolderPath = scanFolderInfo.ScanPath();
-
-                        if (!scanFolderInfo.GetOutputPrefix().isEmpty())
-                        {
-                            relativeToScanFolderPath = relativeToScanFolderPath.remove(0, static_cast<int>(scanFolderInfo.GetOutputPrefix().size()) + 1);
-                        }
-
                         break;
                     }
                 }
@@ -470,12 +459,12 @@ namespace AssetProcessor
             return;
         }
 
-        // note that m_SourceFilesInDatabase is a map from (full absolute path) --> (database name for file, which includes outputprefix)
+        // note that m_SourceFilesInDatabase is a map from (full absolute path) --> (database name for file)
         for (auto iter = m_sourceFilesInDatabase.begin(); iter != m_sourceFilesInDatabase.end(); iter++)
         {
             // CheckDeletedSourceFile actually expects the database name as the second value
             // iter.key is the full path normalized.  iter.value is the database path.
-            // we need the relative path too, which involves removing the scan folder outputprefix it present:
+            // we need the relative path too:
             CheckDeletedSourceFile(
                 iter.key(), iter.value().m_sourceRelativeToWatchFolder, iter.value().m_sourceDatabaseName,
                 AZStd::chrono::system_clock::now());
@@ -1633,27 +1622,7 @@ namespace AssetProcessor
             AzToolsFramework::AssetDatabase::ScanFolderDatabaseEntry scanfolder;
             if (m_stateData->GetScanFolderByScanFolderID(source.m_scanFolderPK, scanfolder))
             {
-                // there's one more thing to account for here, and thats the fact that the sourceName may have an outputPrefix appended on to it
-                // so for example, the scan folder might be c:/ly/dev/Gems/Clouds/Assets
-                // but the outputPrefix might be Clouds/Assets, meaning "put it in that folder in the cache instead of just at the root"
-                // When we have an outputprefix, we prepend it to SourceName so that its a unique source
-                // so for example, the sourceName might be Clouds/Assets/blah.tif
-                // if you were to blindly concatenate them you'd end up with c:/ly/dev/Gems/Clouds/Assets/Clouds/Assets/blah.tif
-                //                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-                //                                                              The watch folder is here
-                //                                                                                       ^^^^^^^^^^^^^^
-                //                                                                                        Prefix prepended
-                //                                                                                                      ^^^^^^^^
-                //                                                                                                      actual name
-                // so remove the output prefix from sourcename if present before doing any source ops on it.
-
-                AZStd::string sourceName(source.m_sourceName);
-
-                if (!scanfolder.m_outputPrefix.empty())
-                {
-                    sourceName = sourceName.substr(scanfolder.m_outputPrefix.size() + 1);
-                }
-                AZStd::string fullSourcePath = AZStd::string::format("%s/%s", scanfolder.m_scanFolder.c_str(), sourceName.c_str());
+                AZStd::string fullSourcePath = AZStd::string::format("%s/%s", scanfolder.m_scanFolder.c_str(), source.m_sourceName.c_str());
 
                 AssessFileInternal(fullSourcePath.c_str(), false);
             }
@@ -2001,18 +1970,7 @@ namespace AssetProcessor
             //remove the jobs associated with these products
             m_stateData->RemoveJob(oldJobInfo.m_jobID);
 
-            // note that JobRemoved is supposed to emit a jobinfo that is not output-prefixed
-            if (!scanFolder->GetOutputPrefix().isEmpty())
-            {
-                JobInfo newJobInfo(oldJobInfo);
-                QString sourcePathWithPrefix = QString::fromUtf8(oldJobInfo.m_sourceFile.c_str());
-                newJobInfo.m_sourceFile = (sourcePathWithPrefix.right(sourcePathWithPrefix.length() - (scanFolder->GetOutputPrefix().length() + 1))).toUtf8().constData();
-                Q_EMIT JobRemoved(newJobInfo);
-            }
-            else
-            {
-                Q_EMIT JobRemoved(oldJobInfo);
-            }
+            Q_EMIT JobRemoved(oldJobInfo);
         }
     }
 
@@ -2239,7 +2197,7 @@ namespace AssetProcessor
         }
 
         AzToolsFramework::AssetDatabase::SourceDatabaseEntryContainer sources;
-        QString sourceName = scanFolderInfo->GetOutputPrefix().isEmpty() ? relativePath : QDir::cleanPath(scanFolderInfo->GetOutputPrefix() + QDir::separator() + relativePath);
+        QString sourceName = relativePath;
         m_stateData->GetSourcesLikeSourceName(sourceName, AzToolsFramework::AssetDatabase::AssetDatabaseConnection::StartsWith, sources);
 
         AZ_TracePrintf(AssetProcessor::DebugChannel, "CheckDeletedSourceFolder: %i matching files.\n", sources.size());
@@ -2250,11 +2208,6 @@ namespace AssetProcessor
             // reconstruct full path:
             QString actualRelativePath = source.m_sourceName.c_str();
 
-            if (!scanFolderInfo->GetOutputPrefix().isEmpty())
-            {
-                actualRelativePath = actualRelativePath.right(actualRelativePath.length() - (scanFolderInfo->GetOutputPrefix().length() + 1)); // adding one for separator
-            }
-
             QString finalPath = scanFolder.absoluteFilePath(actualRelativePath);
 
             if (!QFile::exists(finalPath))
@@ -2513,11 +2466,6 @@ namespace AssetProcessor
                 const ScanFolderInfo* scanFolderInfo = m_platformConfig->GetScanFolderForFile(normalizedPath);
 
                 relativePathToFile = databasePathToFile;
-                // remove output prefix if present to generate relative path
-                if ((scanFolderInfo)&&(!scanFolderInfo->GetOutputPrefix().isEmpty()))
-                {
-                    relativePathToFile = relativePathToFile.remove(0, static_cast<int>(scanFolderInfo->GetOutputPrefix().length()) + 1);
-                }
 
                 if (normalizedPath.length() >= AP_MAX_PATH_LEN)
                 {
@@ -2537,7 +2485,7 @@ namespace AssetProcessor
                             job.m_jobEntry = JobEntry(
                                 QString::fromUtf8(jobInfo.m_watchFolder.c_str()),
                                 relativePathToFile,
-                                databasePathToFile, // with outputprefix 
+                                databasePathToFile,
                                 jobInfo.m_builderGuid, 
                                 *platformFromInfo, 
                                 jobInfo.m_jobKey.c_str(), 0, GenerateNewJobRunKey(), 
@@ -2646,7 +2594,7 @@ namespace AssetProcessor
                             // to call the expensive function to discover correct case.
                             QString pathRelativeToScanFolder;
                             QString scanFolderPath;
-                            m_platformConfig->ConvertToRelativePath(overrider, pathRelativeToScanFolder, scanFolderPath, false /*include output prefix*/);
+                            m_platformConfig->ConvertToRelativePath(overrider, pathRelativeToScanFolder, scanFolderPath);
                             AssetUtilities::UpdateToCorrectCase(scanFolderPath, pathRelativeToScanFolder);
                             overrider = QDir(scanFolderPath).absoluteFilePath(pathRelativeToScanFolder);
                         }
@@ -3367,10 +3315,6 @@ namespace AssetProcessor
         newSourceInfo.m_watchFolder = scanFolder->ScanPath();
         newSourceInfo.m_sourceDatabaseName = databasePathToFile;
         newSourceInfo.m_sourceRelativeToWatchFolder = databasePathToFile;
-        if (!scanFolder->GetOutputPrefix().isEmpty())
-        {
-            newSourceInfo.m_sourceRelativeToWatchFolder = newSourceInfo.m_sourceRelativeToWatchFolder.remove(0, static_cast<int>(scanFolder->GetOutputPrefix().length()) + 1);
-        }
 
         {
             // this scope exists only to narrow the range of m_sourceUUIDToSourceNameMapMutex
@@ -3644,12 +3588,6 @@ namespace AssetProcessor
                             continue;
                         }
 
-                        //if relative path starts with the output prefix then remove it first
-                        if (!scanFolderInfo->GetOutputPrefix().isEmpty() && knownPathBeforeWildcard.startsWith(scanFolderInfo->GetOutputPrefix(), Qt::CaseInsensitive))
-                        {
-                            knownPathBeforeWildcard = knownPathBeforeWildcard.right(knownPathBeforeWildcard.length() - (scanFolderInfo->GetOutputPrefix().length() + 1)); // adding 1 for slash
-                        }
-
                         QDir rooted(scanFolderInfo->ScanPath());
                         QString absolutePath = rooted.absoluteFilePath(knownPathBeforeWildcard);
 
@@ -3950,7 +3888,6 @@ namespace AssetProcessor
                         scanFolderFromConfigFile.ScanPath().toUtf8().constData(),
                         scanFolderFromConfigFile.GetDisplayName().toUtf8().constData(),
                         scanFolderFromConfigFile.GetPortableKey().toUtf8().constData(),
-                        scanFolderFromConfigFile.GetOutputPrefix().toUtf8().constData(),
                         scanFolderFromConfigFile.IsRoot());
                 //remove this scan path from the scan folders so what is left can deleted
                 m_scanFoldersInDatabase.erase(found);
@@ -3962,7 +3899,6 @@ namespace AssetProcessor
                         scanFolderFromConfigFile.ScanPath().toUtf8().constData(),
                         scanFolderFromConfigFile.GetDisplayName().toUtf8().constData(),
                         scanFolderFromConfigFile.GetPortableKey().toUtf8().constData(),
-                        scanFolderFromConfigFile.GetOutputPrefix().toUtf8().constData(),
                         scanFolderFromConfigFile.IsRoot());
             }
 
@@ -4006,11 +3942,7 @@ namespace AssetProcessor
                 result.m_sourceDatabaseName = QString::fromUtf8(sourceDatabaseEntry.m_sourceName.c_str());
                 result.m_watchFolder = QString::fromUtf8(scanFolder.m_scanFolder.c_str());
                 result.m_sourceRelativeToWatchFolder = result.m_sourceDatabaseName;
-                if (!scanFolder.m_outputPrefix.empty())
-                {
-                    result.m_sourceRelativeToWatchFolder = result.m_sourceRelativeToWatchFolder.remove(0, static_cast<int>(scanFolder.m_outputPrefix.size()) + 1);
-                }
-                
+
                 {   
                     // this scope exists to restrict the duration of the below lock.
                     AZStd::lock_guard<AZStd::mutex> lock(m_sourceUUIDToSourceInfoMapMutex);
@@ -4088,16 +4020,7 @@ namespace AssetProcessor
     {
         sourceDatabaseEntry.m_scanFolderPK = scanFolder->ScanFolderID();
 
-        if (!scanFolder->GetOutputPrefix().isEmpty())
-        {
-            // replace the "output prefix" part of the file name with the one from the ini file to sort out case sensitivity problems.
-            QString withoutOutputPrefix = relativeSourceFilePath.remove(0, scanFolder->GetOutputPrefix().length() + 1);
-            sourceDatabaseEntry.m_sourceName = AZStd::string::format("%s/%s", scanFolder->GetOutputPrefix().toUtf8().constData(), withoutOutputPrefix.toUtf8().data());
-        }
-        else
-        {
-            sourceDatabaseEntry.m_sourceName = relativeSourceFilePath.toUtf8().constData();
-        }
+        sourceDatabaseEntry.m_sourceName = relativeSourceFilePath.toUtf8().constData();
 
         sourceDatabaseEntry.m_sourceGuid = AssetUtilities::CreateSafeSourceUUIDFromName(sourceDatabaseEntry.m_sourceName.c_str());
         
@@ -4709,7 +4632,7 @@ namespace AssetProcessor
 
             QString databasePath;
             QString scanFolderPath;
-            m_platformConfig->ConvertToRelativePath(metaDataFileName, databasePath, scanFolderPath, true);
+            m_platformConfig->ConvertToRelativePath(metaDataFileName, databasePath, scanFolderPath);
             outFilesToFingerprint.insert(AZStd::make_pair(metaDataFileName.toUtf8().constData(), databasePath.toUtf8().constData()));
         }
     }
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
index 4c203567e9..88f74c886b 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
@@ -163,7 +163,7 @@ namespace AssetProcessor
         //! Internal structure that will hold all the necessary source info
         struct SourceFileInfo
         {
-            QString m_databasePath; // clarification: this is the database path (ie, includes outputprefix)
+            QString m_databasePath; // clarification: this is the database path
             QString m_pathRelativeToScanFolder;
             AZ::Uuid m_uuid;
             const ScanFolderInfo* m_scanFolder{ nullptr };
@@ -222,7 +222,7 @@ namespace AssetProcessor
         //! Emit whenever a new asset is found or an existing asset is updated
         void AssetMessage(AzFramework::AssetSystem::AssetNotificationMessage message);
         
-        // InputAssetProcessed - uses absolute asset path of input file - no outputprefix
+        // InputAssetProcessed - uses absolute asset path of input file
         void InputAssetProcessed(QString fullAssetPath, QString platform);
 
         void RequestInputAssetStatus(QString inputAssetPath, QString platform, QString jobDescription);
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
index 13c1a8671a..5767822451 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
@@ -28,7 +28,6 @@ namespace AssetProcessor
             QString path,
             QString displayName,
             QString portableKey,
-            QString prefix,
             bool isRoot,
             bool recurseSubFolders,
             AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms = AZStd::vector<AssetBuilderSDK::PlatformInfo>{},
@@ -38,7 +37,6 @@ namespace AssetProcessor
             : m_scanPath(path)
             , m_displayName(displayName)
             , m_portableKey (portableKey)
-            , m_outputPrefix(prefix)
             , m_isRoot(isRoot)
             , m_recurseSubFolders(recurseSubFolders)
             , m_order(order)
@@ -62,11 +60,6 @@ namespace AssetProcessor
             return m_displayName;
         }
 
-        QString GetOutputPrefix() const
-        {
-            return m_outputPrefix;
-        }
-
         bool IsRoot() const
         {
             return m_isRoot;
@@ -110,7 +103,6 @@ namespace AssetProcessor
     private:
         QString m_scanPath; // the local path to scan ("C:\\whatever")
         QString m_displayName; // the display name to show in GUIs that show it.
-        QString m_outputPrefix; // the output prefix to target results into (eg, put things in a certain subfolder of @assets@ rather than the relative to assets itself)
         QString m_portableKey; // a key that remains the same even if the asset database is moved from computer to computer.
         bool m_isRoot = false; // is it 'the' root folder?
         bool m_recurseSubFolders = true;
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp
index a54e9b3c38..c869e40236 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp
@@ -126,7 +126,7 @@ void AssetScannerWorker::ScanForSourceFiles(const ScanFolderInfo& scanFolderInfo
         {
             //Entry is a directory
             m_folderList.insert(AZStd::move(assetFileInfo));
-            ScanFolderInfo tempScanFolderInfo(absPath, "", "", "", false, true);
+            ScanFolderInfo tempScanFolderInfo(absPath, "", "", false, true);
             ScanForSourceFiles(tempScanFolderInfo, rootScanFolder);
         }
         else
diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h b/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h
index 4143019627..c3dd994ef5 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h
@@ -41,7 +41,7 @@ namespace AssetProcessor
     public:
         QueueElementID() = default;
         
-        ///! note that inputAssetName is a database name (so includes outputprefix), not a relative path.
+        ///! note that inputAssetName is a database name, not a relative path.
         QueueElementID(QString inputAssetName, QString platform, QString jobDescriptor);
 
         
diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h
index e364a503b9..9701f4cd9a 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h
@@ -96,7 +96,7 @@ namespace AssetProcessor
         RCJob* getItem(int index) const;
         int GetIndexOfProcessingJob(const QueueElementID& elementId);
 
-        ///! EraseJobs expects the database name of the source file.  (So with outputprefix)
+        ///! EraseJobs expects the database name of the source file.
         void EraseJobs(QString sourceFileDatabaseName, AZStd::vector<RCJob*>& pendingJobs);
 
     private:
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp b/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
index 281d5a24fa..e92e9afba5 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
@@ -217,7 +217,6 @@ namespace AssetProcessor
                 scanFolderInfo.ScanPath().toStdString().c_str(),
                 scanFolderInfo.GetDisplayName().toStdString().c_str(),
                 scanFolderInfo.GetPortableKey().toStdString().c_str(),
-                scanFolderInfo.GetOutputPrefix().toStdString().c_str(),
                 scanFolderInfo.IsRoot());
             dbConn->SetScanFolder(newScanFolder);
         }
@@ -230,12 +229,12 @@ namespace AssetProcessor
             config.EnablePlatform({ "fandango" ,{ "console", "renderer" } }, false);
             AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
             config.PopulatePlatformsForScanFolder(platforms);
-            //                                               PATH         DisplayName    PortKey      outputfolder root    recurse  platforms     order
-            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", "", false, false, platforms, -6), config, dbConn); // subfolder 4 overrides subfolder3
-            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", "", false, false, platforms, -5), config, dbConn); // subfolder 3 overrides subfolder2
-            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", "", false, true, platforms, -2), config, dbConn); // subfolder 2 overrides subfolder1
-            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "", false, true, platforms, -1), config, dbConn); // subfolder1 overrides root
-            AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", "", true, false, platforms, 0), config, dbConn); // add the root
+            //                                               PATH         DisplayName    PortKey      root    recurse  platforms     order
+            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", false, false, platforms, -6), config, dbConn); // subfolder 4 overrides subfolder3
+            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", false, false, platforms, -5), config, dbConn); // subfolder 3 overrides subfolder2
+            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", false, true, platforms, -2), config, dbConn); // subfolder 2 overrides subfolder1
+            AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true, platforms, -1), config, dbConn); // subfolder1 overrides root
+            AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", true, false, platforms, 0), config, dbConn); // add the root
 
             config.AddMetaDataType("exportsettings", QString());
 
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
index 1b3bac2897..c33943f9a7 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
@@ -317,7 +317,7 @@ namespace AssetProcessorMessagesTests
         using namespace AzToolsFramework::AssetDatabase;
 
         // Setup the database with all needed info
-        ScanFolderDatabaseEntry scanfolder1("scanfolder1", "scanfolder1", "scanfolder1", "");
+        ScanFolderDatabaseEntry scanfolder1("scanfolder1", "scanfolder1", "scanfolder1");
         ASSERT_TRUE(m_dbConn.SetScanFolder(scanfolder1));
 
         SourceDatabaseEntry source1(scanfolder1.m_scanFolderID, "source1.png", AZ::Uuid::CreateRandom(), "Fingerprint");
diff --git a/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp b/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp
index cb5dd8e532..141a5a9b67 100644
--- a/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp
@@ -46,10 +46,10 @@ namespace UnitTests
         
         m_data->m_fileProcessor = AZStd::make_unique<FileProcessor>(m_data->m_config.get());
 
-        m_data->m_scanFolder = { m_data->m_temporarySourceDir.absolutePath().toUtf8().constData(), "dev", "rootportkey", "" };
+        m_data->m_scanFolder = { m_data->m_temporarySourceDir.absolutePath().toUtf8().constData(), "dev", "rootportkey" };
         ASSERT_TRUE(m_data->m_connection.SetScanFolder(m_data->m_scanFolder));
 
-        m_data->m_config->AddScanFolder(ScanFolderInfo(m_data->m_temporarySourceDir.absolutePath(), "dev", "rootportkey", "", false, true, m_data->m_config->GetEnabledPlatforms(), 0, m_data->m_scanFolder.m_scanFolderID));
+        m_data->m_config->AddScanFolder(ScanFolderInfo(m_data->m_temporarySourceDir.absolutePath(), "dev", "rootportkey", false, true, m_data->m_config->GetEnabledPlatforms(), 0, m_data->m_scanFolder.m_scanFolderID));
 
         for (int index = 0; index < 10; ++index)
         {
diff --git a/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp b/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
index 852d68cba2..2731aa6c5a 100644
--- a/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
@@ -84,8 +84,8 @@ namespace UnitTests
             AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
             m_data->m_platformConfig.PopulatePlatformsForScanFolder(platforms);
 
-            m_data->m_scanFolder1 = { tempPath.absoluteFilePath("dev").toUtf8().constData(), "dev", "devKey", ""};
-            m_data->m_scanFolder2 = { tempPath.absoluteFilePath("folder").toUtf8().constData(), "folder", "folderKey", "prefix" };
+            m_data->m_scanFolder1 = { tempPath.absoluteFilePath("dev").toUtf8().constData(), "dev", "devKey"};
+            m_data->m_scanFolder2 = { tempPath.absoluteFilePath("folder").toUtf8().constData(), "folder", "folderKey"};
 
             ASSERT_TRUE(m_data->m_connection->SetScanFolder(m_data->m_scanFolder1));
             ASSERT_TRUE(m_data->m_connection->SetScanFolder(m_data->m_scanFolder2));
@@ -93,21 +93,19 @@ namespace UnitTests
             ScanFolderInfo scanFolder1(m_data->m_scanFolder1.m_scanFolder.c_str(),
                 m_data->m_scanFolder1.m_displayName.c_str(),
                 m_data->m_scanFolder1.m_portableKey.c_str(),
-                m_data->m_scanFolder1.m_outputPrefix.c_str(),
                 false, true, platforms, 0, m_data->m_scanFolder1.m_scanFolderID);
             m_data->m_platformConfig.AddScanFolder(scanFolder1);
 
             ScanFolderInfo scanFolder2(m_data->m_scanFolder2.m_scanFolder.c_str(),
                 m_data->m_scanFolder2.m_displayName.c_str(),
                 m_data->m_scanFolder2.m_portableKey.c_str(),
-                m_data->m_scanFolder2.m_outputPrefix.c_str(),
                 false, true, platforms, 0, m_data->m_scanFolder2.m_scanFolderID);
             m_data->m_platformConfig.AddScanFolder(scanFolder2);
 
             SourceDatabaseEntry sourceFile1 = { m_data->m_scanFolder1.m_scanFolderID, "subfolder1/somefile.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
             SourceDatabaseEntry sourceFile2 = { m_data->m_scanFolder1.m_scanFolderID, "subfolder1/otherfile.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
-            SourceDatabaseEntry sourceFile3 = { m_data->m_scanFolder2.m_scanFolderID, "prefix/otherfile.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
-            SourceDatabaseEntry sourceFile4 = { m_data->m_scanFolder2.m_scanFolderID, "prefix/a/b/c/d/otherfile.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
+            SourceDatabaseEntry sourceFile3 = { m_data->m_scanFolder2.m_scanFolderID, "otherfile.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
+            SourceDatabaseEntry sourceFile4 = { m_data->m_scanFolder2.m_scanFolderID, "a/b/c/d/otherfile.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
             SourceDatabaseEntry sourceFile5 = { m_data->m_scanFolder1.m_scanFolderID, "duplicate/file1.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
             SourceDatabaseEntry sourceFile6 = { m_data->m_scanFolder2.m_scanFolderID, "duplicate/file1.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
             SourceDatabaseEntry sourceFile7 = { m_data->m_scanFolder1.m_scanFolderID, "subfolder2/file.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint" };
@@ -128,7 +126,7 @@ namespace UnitTests
             ASSERT_TRUE(m_data->m_connection->SetSource(sourceFile11));
 
             SourceFileDependencyEntry dependency1 = { AZ::Uuid::CreateRandom(), "subfolder1/somefile.tif", "subfolder1/otherfile.tif", SourceFileDependencyEntry::TypeOfDependency::DEP_SourceToSource, false };
-            SourceFileDependencyEntry dependency2 = { AZ::Uuid::CreateRandom(), "subfolder1/otherfile.tif", "prefix/otherfile.tif", SourceFileDependencyEntry::TypeOfDependency::DEP_JobToJob, false };
+            SourceFileDependencyEntry dependency2 = { AZ::Uuid::CreateRandom(), "subfolder1/otherfile.tif", "otherfile.tif", SourceFileDependencyEntry::TypeOfDependency::DEP_JobToJob, false };
             ASSERT_TRUE(m_data->m_connection->SetSourceFileDependency(dependency1));
             ASSERT_TRUE(m_data->m_connection->SetSourceFileDependency(dependency2));
 
@@ -252,7 +250,7 @@ namespace UnitTests
 
             const ScanFolderInfo* info;
             auto result = m_data->m_reporter->GetSourcesByPath(source, relocationContainer, info, excludeMetaDataFiles);
-            ASSERT_EQ(result.IsSuccess(), expectSuccess) << result.GetError().c_str();
+            ASSERT_EQ(result.IsSuccess(), expectSuccess) << (!result.IsSuccess() ? result.GetError().c_str() : "");
 
             if (expectSuccess)
             {
@@ -423,13 +421,13 @@ namespace UnitTests
 
     TEST_F(SourceFileRelocatorTest, GetSources_PrefixedFile_Succeeds)
     {
-        TestGetSourcesByPath("otherfile.tif", { "prefix/otherfile.tif" });
+        TestGetSourcesByPath("otherfile.tif", { "otherfile.tif" });
     }
 
     TEST_F(SourceFileRelocatorTest, GetSources_PrefixedAbsFile_Succeeds)
     {
         QDir tempDir(m_tempDir.path());
-        TestGetSourcesByPath(  tempDir.absoluteFilePath("folder/otherfile.tif").toUtf8().constData(), { "prefix/otherfile.tif" });
+        TestGetSourcesByPath(tempDir.absoluteFilePath("folder/otherfile.tif").toUtf8().constData(), { "otherfile.tif" });
     }
 
     TEST_F(SourceFileRelocatorTest, GetSources_Folder_Fails)
@@ -664,7 +662,7 @@ namespace UnitTests
 
         ASSERT_TRUE(m_data->m_reporter->GetSourcesByPath(tempPath.absoluteFilePath(AZStd::string("folder/o*").c_str()).toUtf8().constData(), entryContainer, info));
         ASSERT_EQ(entryContainer.size(), 1);
-        ASSERT_STREQ(entryContainer[0].m_sourceEntry.m_sourceName.c_str(), "prefix/otherfile.tif");
+        ASSERT_STREQ(entryContainer[0].m_sourceEntry.m_sourceName.c_str(), "otherfile.tif");
 
         m_data->m_reporter->PopulateDependencies(entryContainer);
 
@@ -803,7 +801,7 @@ namespace UnitTests
         FileUpdateTasks updateTasks;
 
         ASSERT_TRUE(m_data->m_reporter->GetSourcesByPath(tempPath.absoluteFilePath("folder/*").toUtf8().constData(), entryContainer, info));
-        ASSERT_EQ(entryContainer.size(), 2);
+        ASSERT_EQ(entryContainer.size(), 3);
 
         m_data->m_reporter->ComputeDestination(entryContainer, info, "*", "someOtherPlace/*", destInfo);
         m_data->m_reporter->PopulateDependencies(entryContainer);
diff --git a/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp
index 12b202e804..8c3fdb3fbe 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp
@@ -81,7 +81,7 @@ namespace UnitTests
         //                 Product:         "someproduct4.dds"  subid: 4
         void CreateCoverageTestData()
         {
-            m_data->m_scanFolder = { "c:/O3DE/dev", "dev", "rootportkey", "" };
+            m_data->m_scanFolder = { "c:/O3DE/dev", "dev", "rootportkey" };
             ASSERT_TRUE(m_data->m_connection.SetScanFolder(m_data->m_scanFolder));
             
             m_data->m_sourceFile1 = { m_data->m_scanFolder.m_scanFolderID, "somefile.tif", AZ::Uuid::CreateRandom(), "AnalysisFingerprint1"};
@@ -239,7 +239,7 @@ namespace UnitTests
         // we'll create all of those first (except product) before starting the product test.
 
         //add a scanfolder.  None of this has to exist in real disk, this is a db test only.
-        ScanFolderDatabaseEntry scanFolder {"c:/O3DE/dev", "dev", "rootportkey", ""};
+        ScanFolderDatabaseEntry scanFolder{ "c:/O3DE/dev", "dev", "rootportkey" };
         EXPECT_TRUE(m_data->m_connection.SetScanFolder(scanFolder));
         ASSERT_NE(scanFolder.m_scanFolderID, AzToolsFramework::AssetDatabase::InvalidEntryId); 
 
@@ -278,7 +278,7 @@ namespace UnitTests
         // to add a product legitimately you have to have a full chain of primary keys, chain is:
         // ScanFolder --> Source --> job --> product.
         // we'll create all of those first (except product) before starting the product test.
-        ScanFolderDatabaseEntry scanFolder{ "c:/O3DE/dev", "dev", "rootportkey", "" };
+        ScanFolderDatabaseEntry scanFolder{ "c:/O3DE/dev", "dev", "rootportkey" };
         ASSERT_TRUE(m_data->m_connection.SetScanFolder(scanFolder));
         
         SourceDatabaseEntry sourceEntry{ scanFolder.m_scanFolderID, "somefile.tif", AZ::Uuid::CreateRandom(), "fingerprint1" };
@@ -323,7 +323,7 @@ namespace UnitTests
     // this is actually a very common case (same job id, same subID)
     TEST_F(AssetDatabaseTest, SetProduct_SpecificPK_Succeeds_SameSubID_SameJobID)
     {
-        ScanFolderDatabaseEntry scanFolder{ "c:/O3DE/dev", "dev", "rootportkey", "" };
+        ScanFolderDatabaseEntry scanFolder{ "c:/O3DE/dev", "dev", "rootportkey"};
         ASSERT_TRUE(m_data->m_connection.SetScanFolder(scanFolder));
         SourceDatabaseEntry sourceEntry{ scanFolder.m_scanFolderID, "somefile.tif", AZ::Uuid::CreateRandom(), "fingerprint1" };
         ASSERT_TRUE(m_data->m_connection.SetSource(sourceEntry));
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
index d8afda1b2c..07d1e48229 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
@@ -63,13 +63,6 @@ public:
     friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WildcardMissingFiles_ByName_UpdatesWhenTheyAppear);
     friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, JobDependencyOrderOnce_MultipleJobs_EmitOK);
 
-    friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_BasicTest);
-    friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_UpdateTest);
-    friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByUuid);
-    friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByName);
-    friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByUuid_UpdatesWhenTheyAppear);
-    friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByName_UpdatesWhenTheyAppear);
-
     friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, SourceFileProcessFailure_ClearsFingerprint);
 
     friend class GTEST_TEST_CLASS_NAME_(AbsolutePathProductDependencyTest, UnresolvedProductPathDependency_AssetProcessedTwice_DoesNotDuplicateDependency);
@@ -243,15 +236,10 @@ void AssetProcessorManagerTest::SetUp()
 
     m_config->EnablePlatform({ "pc", { "host", "renderer", "desktop" } }, true);
 
-    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "", false, true, m_config->GetEnabledPlatforms() ));
-
-    // add a scan folder that has an output prefix:
-    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", "redirected", false, true, m_config->GetEnabledPlatforms()));
-
-    //adding another scan folder with an output prefix
-    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", "dummy", false, true, m_config->GetEnabledPlatforms()));
-
-    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", "", false, true, m_config->GetEnabledPlatforms()));
+    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true, m_config->GetEnabledPlatforms(), 1));
+    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2/redirected"), "subfolder2", "subfolder2", false, true, m_config->GetEnabledPlatforms()));
+    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", false, true, m_config->GetEnabledPlatforms(), 1));
+    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", false, true, m_config->GetEnabledPlatforms(), 1));
     m_config->AddMetaDataType("assetinfo", "");
     AssetRecognizer rec;
     AssetPlatformSpec specpc;
@@ -459,72 +447,6 @@ TEST_F(AssetProcessorManagerTest, DeleteFolder_SignalsDeleteOfContainedFiles)
     EXPECT_EQ(1, count);
 }
 
-TEST_F(AssetProcessorManagerTest, UnitTestForOutPutPrefix)
-{
-    using namespace AssetProcessor;
-    QDir tempPath(m_tempDir.path());
-
-    UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder2/test.txt"));
-    UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder3/test.txt"));
-
-    int count = 0;
-    auto connection = QObject::connect(m_assetProcessorManager.get(), &AssetProcessorManager::AssetToProcess, [&count](JobDetails jobDetails)
-    {
-        if (jobDetails.m_jobEntry.m_databaseSourceName.compare("redirected/test.txt", Qt::CaseInsensitive) == 0 ||
-            jobDetails.m_jobEntry.m_databaseSourceName.compare("dummy/test.txt", Qt::CaseInsensitive) == 0 )
-        {
-            count++;
-        }
-    });
-
-
-    m_isIdling = false;
-    // tell the APM about the files:
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder2/test.txt")));
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder3/test.txt")));
-    ASSERT_TRUE(BlockUntilIdle(5000));
-
-    EXPECT_EQ(2, count);
-
-    EXPECT_TRUE(QFile::remove(tempPath.absoluteFilePath("subfolder2/test.txt")));
-    EXPECT_TRUE(QFile::remove(tempPath.absoluteFilePath("subfolder3/test.txt")));
-
-}
-
-TEST_F(AssetProcessorManagerTest, UnitTestForOutPutPrefixWithMultipleNotification)
-{
-    using namespace AssetProcessor;
-    QDir tempPath(m_tempDir.path());
-
-    UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder2/test.txt"));
-    UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder3/test.txt"));
-
-    int count = 0;
-    auto connection = QObject::connect(m_assetProcessorManager.get(), &AssetProcessorManager::AssetToProcess, [&count](JobDetails jobDetails)
-    {
-        if (jobDetails.m_jobEntry.m_databaseSourceName.compare("redirected/test.txt", Qt::CaseInsensitive) == 0 ||
-            jobDetails.m_jobEntry.m_databaseSourceName.compare("dummy/test.txt", Qt::CaseInsensitive) == 0)
-        {
-            count++;
-        }
-    });
-
-
-    m_isIdling = false;
-    // we are putting multiple entries in the pipeline here and testing that we still receive only unique notifications for processing those assets
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder2/test.txt")));
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder2/test.txt")));
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder2/test.txt")));
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder3/test.txt")));
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder3/test.txt")));
-    QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, tempPath.absoluteFilePath("subfolder3/test.txt")));
-    ASSERT_TRUE(BlockUntilIdle(5000));
-
-    EXPECT_EQ(2, count);
-    EXPECT_TRUE(QFile::remove(tempPath.absoluteFilePath("subfolder2/test.txt")));
-    EXPECT_TRUE(QFile::remove(tempPath.absoluteFilePath("subfolder3/test.txt")));
-}
-
 TEST_F(AssetProcessorManagerTest, UnitTestForGettingJobInfoBySourceUUIDFailure)
 {
     using namespace AzToolsFramework::AssetSystem;
@@ -1191,7 +1113,7 @@ TEST_F(AssetProcessorManagerTest, BuilderSDK_API_CreateJobs_HasValidParameters_W
 {
     QDir tempPath(m_tempDir.path());
     // here we push a file change through APM and make sure that "CreateJobs" has correct parameters, with no output redirection
-    QString absPath(tempPath.absoluteFilePath("subfolder2/test_text.txt"));
+    QString absPath(tempPath.absoluteFilePath("subfolder2/redirected/test_text.txt"));
     UnitTestUtils::CreateDummyFile(absPath);
 
     m_mockApplicationManager->ResetMockBuilderCreateJobCalls();
@@ -1212,7 +1134,7 @@ TEST_F(AssetProcessorManagerTest, BuilderSDK_API_CreateJobs_HasValidParameters_W
     // subfolder2 has its output redirected in the cache
     // this test makes sure that the CreateJobs API is completely unaffected by that and none of the internal database stuff
     // is reflected by the API.
-    EXPECT_STREQ(req.m_watchFolder.c_str(), tempPath.absoluteFilePath("subfolder2").toUtf8().constData());
+    EXPECT_STREQ(req.m_watchFolder.c_str(), tempPath.absoluteFilePath("subfolder2/redirected").toUtf8().constData());
     EXPECT_STREQ(req.m_sourceFile.c_str(), "test_text.txt"); // only the name should be there, no output prefix.
 
     EXPECT_NE(req.m_sourceFileUUID, AZ::Uuid::CreateNull());
@@ -2354,7 +2276,7 @@ TEST_F(PathDependencyTest, AbsoluteDependencies_Deferred_ResolveCorrectly)
     // When an absolute path matches a scan folder, the portion of the path matching that scan folder
     // is replaced with the scan folder's ID.
     AZStd::string absPathDep1WithScanfolder(AZStd::string::format("$4$%s", relativePathDep1.c_str()));
-    QString absPathDep2(tempPath.absoluteFilePath("subfolder2/dep2.txt"));
+    QString absPathDep2(tempPath.absoluteFilePath("subfolder2/redirected/dep2.txt"));
     QString absPathDep3(tempPath.absoluteFilePath("subfolder1/dep3.txt"));
 
     // -------- Make main test asset, with dependencies on products that don't exist yet -----
@@ -2375,7 +2297,7 @@ TEST_F(PathDependencyTest, AbsoluteDependencies_Deferred_ResolveCorrectly)
     // Different scanfolder, same relative file name.  This should *not* trigger the dependency.  We can't test with another asset in the proper scanfolder because AssetIds are based on relative file name,
     // which means both assets have the same AssetId and there would be no way to tell which one matched
     ASSERT_TRUE(ProcessAsset(dep1, { {".asset1"}, {".asset2"} }, {}, "subfolder1/"));
-    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/")); // subfolder2 has a prefix of "redirected"
+    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/redirected/"));
     ASSERT_TRUE(ProcessAsset(dep3, { {".asset1"}, {".asset2"} }, {}, "subfolder1/")); // test a normal dependency with no prefix
 
     // ---------- Verify that the dependency was recorded, and did not keep the path after resolution ----------
@@ -2550,14 +2472,14 @@ TEST_F(PathDependencyTest, AssetProcessed_Impl_DeferredPathResolution_CorrectlyM
 
     // -------- Make main test asset, with dependencies on products that don't exist yet -----
     TestAsset primaryFile("test_text");
-    ASSERT_TRUE(ProcessAsset(primaryFile, { { ".asset" }, {} }, { {"test.asset1", ProductPathDependencyType::ProductFile}, {"redirected/test.asset2", ProductPathDependencyType::ProductFile} }));
+    ASSERT_TRUE(ProcessAsset(primaryFile, { { ".asset" }, {} }, { {"test.asset1", ProductPathDependencyType::ProductFile}, {"test.asset2", ProductPathDependencyType::ProductFile} }));
 
     // create dependees
     TestAsset dep1("test");
     TestAsset dep2("test");
 
     ASSERT_TRUE(ProcessAsset(dep1, { {".asset1"}, {".asset2"} }, {}, "subfolder1/"));
-    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/")); // subfolder2 has a prefix of "redirected"
+    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/redirected/"));
 
     // ---------- Verify that the dependency was recorded, and did not keep the path after resolution ----------
     AzToolsFramework::AssetDatabase::ProductDependencyDatabaseEntryContainer dependencyContainer;
@@ -2575,14 +2497,14 @@ TEST_F(PathDependencyTest, SourceFileDependencyWithPrefix_Deferred_ResolvesCorre
     // -------- Make main test asset, with dependencies on products that don't exist yet -----
     TestAsset primaryFile("test_text");
 
-    ASSERT_TRUE(ProcessAsset(primaryFile, { { ".asset" }, {} }, { {"redirected/test.txt", ProductPathDependencyType::SourceFile} }));
+    ASSERT_TRUE(ProcessAsset(primaryFile, { { ".asset" }, {} }, { {"test.txt", ProductPathDependencyType::SourceFile} }));
 
     // create dependees
     TestAsset dep1("test");
     TestAsset dep2("test");
 
     ASSERT_TRUE(ProcessAsset(dep1, { {".asset1"}, {".asset2"} }, {}, "subfolder1/"));
-    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/")); // subfolder2 has a prefix of "redirected"
+    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/redirected/"));
 
     // ---------- Verify that the dependency was recorded, and did not keep the path after resolution ----------
     AzToolsFramework::AssetDatabase::ProductDependencyDatabaseEntryContainer dependencyContainer;
@@ -2606,12 +2528,12 @@ TEST_F(PathDependencyTest, SourceFileDependencyWithPrefix_Existing_ResolvesCorre
     TestAsset dep2("test");
 
     ASSERT_TRUE(ProcessAsset(dep1, { {".asset1"}, {".asset2"} }, {}, "subfolder1/"));
-    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/")); // subfolder2 has a prefix of "redirected"
+    ASSERT_TRUE(ProcessAsset(dep2, { {".asset1"}, {".asset2"} }, {}, "subfolder2/redirected/"));
 
     // -------- Make main test asset, with dependencies on products we just created -----
     TestAsset primaryFile("test_text");
 
-    ASSERT_TRUE(ProcessAsset(primaryFile, { { ".asset" }, {} }, { {"redirected/test.txt", ProductPathDependencyType::SourceFile} }));
+    ASSERT_TRUE(ProcessAsset(primaryFile, { { ".asset" }, {} }, { {"test.txt", ProductPathDependencyType::SourceFile} }));
 
     // ---------- Verify that the dependency was recorded, and did not keep the path after resolution ----------
     AzToolsFramework::AssetDatabase::ProductDependencyDatabaseEntryContainer dependencyContainer;
@@ -2633,13 +2555,9 @@ void MultiplatformPathDependencyTest::SetUp()
     m_config->EnablePlatform({ "provo",{ "console" } }, true);
     QDir tempPath(m_tempDir.path());
 
-    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "", false, true, m_config->GetEnabledPlatforms() ));
-
-    // add a scan folder that has an output prefix:
-    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", "redirected", false, true, m_config->GetEnabledPlatforms()));
-
-    //adding another scan folder with an output prefix
-    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", "dummy", false, true, m_config->GetEnabledPlatforms()));
+    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true, m_config->GetEnabledPlatforms() ));
+    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", false, true, m_config->GetEnabledPlatforms()));
+    m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", false, true, m_config->GetEnabledPlatforms()));
 
     m_assetProcessorManager = nullptr; // we need to destroy the previous instance before creating a new one
     m_assetProcessorManager = AZStd::make_unique<AssetProcessorManager_Test>(m_config.get());
@@ -3741,577 +3659,6 @@ TEST_F(AssetProcessorManagerTest, JobDependencyOrderOnce_MultipleJobs_EmitOK)
     EXPECT_EQ(jobDetails[1].m_jobDependencyList[0].m_jobDependency.m_sourceFile.m_sourceFileDependencyPath, secondRelSourceFile); // there should only be one job dependency
 }
 
-
-
-
-// ------------------------------------------------------------------------------------------------------------
-//   The same suite of tests as above, but using a folder with an output prefix instead
-// ------------------------------------------------------------------------------------------------------------
-
-TEST_F(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_BasicTest)
-{
-    // make sure that if we publish some dependencies, they appear:
-    AZ::Uuid dummyBuilderUUID = AZ::Uuid::CreateRandom();
-    QDir tempPath(m_tempDir.path());
-    QString inputDatabasePath = "redirected/outputprefixtest.txt";
-    UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder2/outputprefixtest.txt"));
-    QString absPath(tempPath.absoluteFilePath("subfolder2/outputprefixtest.txt"));
-    QString watchFolderPath = tempPath.absoluteFilePath("subfolder2");
-    const ScanFolderInfo* scanFolder = m_config->GetScanFolderByPath(watchFolderPath);
-    ASSERT_NE(scanFolder, nullptr);
-    ASSERT_STREQ(scanFolder->GetOutputPrefix().toUtf8().constData(), "redirected");
-
-    // the above file (assetProcessorManagerTest.txt) will depend on these four files
-    QString dependsOnFile1_Source = tempPath.absoluteFilePath("subfolder2/a.txt");
-    QString dependsOnFile2_Source = tempPath.absoluteFilePath("subfolder2/b.txt");
-    QString dependsOnFile1_Job = tempPath.absoluteFilePath("subfolder2/c.txt");
-    QString dependsOnFile2_Job = tempPath.absoluteFilePath("subfolder2/d.txt");
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Job, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Job, QString("tempdata\n")));
-
-    // construct the dummy job to feed to the database updater function:
-    AssetProcessorManager::JobToProcessEntry job;
-    job.m_sourceFileInfo.m_databasePath = inputDatabasePath;
-    job.m_sourceFileInfo.m_pathRelativeToScanFolder = "outputprefixtest.txt";
-    job.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job.m_sourceFileInfo.m_uuid = AssetUtilities::CreateSafeSourceUUIDFromName(job.m_sourceFileInfo.m_databasePath.toUtf8().data());
-
-    // note that we have to "prime" the map with the UUIDs to the source info for this to work:
-    AZ::Uuid uuidOfB = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/b.txt");
-    AZ::Uuid uuidOfD = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/d.txt");
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfB] = { watchFolderPath, "b.txt", "redirected/b.txt" };
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfD] = { watchFolderPath, "d.txt", "redirected/d.txt" };
-
-    // each file we will take a different approach to publishing:  rel path, and UUID:
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "a.txt", AZ::Uuid::CreateNull() }));
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "", uuidOfB }));
-
-    // it is currently assumed that the only fields that we care about in JobDetails is the builder busId and the job dependencies themselves:
-    JobDetails newDetails;
-    newDetails.m_assetBuilderDesc.m_busId = dummyBuilderUUID;
-
-    AssetBuilderSDK::SourceFileDependency dep1 = { "c.txt", AZ::Uuid::CreateNull() };
-    AssetBuilderSDK::JobDependency jobDep1("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep1);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep1));
-
-    AssetBuilderSDK::SourceFileDependency dep2 = { "",uuidOfD };
-    AssetBuilderSDK::JobDependency jobDep2("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep2);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep2));
-
-    job.m_jobsToAnalyze.push_back(newDetails);
-
-    // this is the one line that this unit test is really testing:
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job);
-
-    // the rest of this test now performs a series of queries to verify the database was correctly set.
-    // this indirectly verifies the QueryAbsolutePathDependenciesRecursive function also but it has its own dedicated tests, above.
-    AssetProcessor::SourceFilesForFingerprintingContainer deps;
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_SourceToSource, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 3);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end());
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_JobToJob, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 3);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Job.toUtf8().constData()), deps.end());
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 5);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Job.toUtf8().constData()), deps.end());
-
-    // make sure the corresponding values in the map are also correct (ie, database path only)
-    EXPECT_STREQ(deps[absPath.toUtf8().constData()].c_str(), "redirected/outputprefixtest.txt");
-    EXPECT_STREQ(deps[dependsOnFile1_Source.toUtf8().constData()].c_str(), "redirected/a.txt");
-    EXPECT_STREQ(deps[dependsOnFile2_Source.toUtf8().constData()].c_str(), "redirected/b.txt");
-    EXPECT_STREQ(deps[dependsOnFile1_Job.toUtf8().constData()].c_str(), "redirected/c.txt");
-    EXPECT_STREQ(deps[dependsOnFile2_Job.toUtf8().constData()].c_str(), "redirected/d.txt");
-}
-
-TEST_F(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_UpdateTest)
-{
-    // make sure that if we remove dependencies that are published, they disappear.
-    // so the first part of this test is to put some data in there, the same as before:
-
-    AZ::Uuid dummyBuilderUUID = AZ::Uuid::CreateRandom();
-    QDir tempPath(m_tempDir.path());
-    QString absPath(tempPath.absoluteFilePath("subfolder2/outputprefixtest.txt"));
-    UnitTestUtils::CreateDummyFile(absPath);
-    QString inputDatabasePath = "redirected/outputprefixtest.txt";
-    QString watchFolderPath = tempPath.absoluteFilePath("subfolder2");
-    const ScanFolderInfo* scanFolder = m_config->GetScanFolderByPath(watchFolderPath);
-    ASSERT_NE(scanFolder, nullptr);
-
-    // the above file (assetProcessorManagerTest.txt) will depend on these four files:
-    QString dependsOnFile1_Source = tempPath.absoluteFilePath("subfolder2/a.txt");
-    QString dependsOnFile2_Source = tempPath.absoluteFilePath("subfolder2/b.txt");
-    QString dependsOnFile1_Job = tempPath.absoluteFilePath("subfolder2/c.txt");
-    QString dependsOnFile2_Job = tempPath.absoluteFilePath("subfolder2/d.txt");
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Job, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Job, QString("tempdata\n")));
-
-    // construct the dummy job to feed to the database updater function:
-    AssetProcessorManager::JobToProcessEntry job;
-    job.m_sourceFileInfo.m_databasePath = inputDatabasePath;
-    job.m_sourceFileInfo.m_pathRelativeToScanFolder = "outputprefixtest.txt";
-    job.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job.m_sourceFileInfo.m_uuid = AssetUtilities::CreateSafeSourceUUIDFromName(job.m_sourceFileInfo.m_databasePath.toUtf8().data());
-
-    // note that we have to "prime" the map with the UUIDs to the source info for this to work:
-    AZ::Uuid uuidOfB = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/b.txt");
-    AZ::Uuid uuidOfD = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/d.txt");
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfB] = { watchFolderPath, "b.txt", "redirected/b.txt" };
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfD] = { watchFolderPath, "d.txt", "redirected/d.txt" };
-
-    // each file we will take a different approach to publishing:  rel path, and UUID:
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "a.txt", AZ::Uuid::CreateNull() }));
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "", uuidOfB }));
-
-    // it is currently assumed that the only fields that we care about in JobDetails is the builder busId and the job dependencies themselves:
-    JobDetails newDetails;
-    newDetails.m_assetBuilderDesc.m_busId = dummyBuilderUUID;
-
-    AssetBuilderSDK::SourceFileDependency dep1 = { "c.txt", AZ::Uuid::CreateNull() };
-    AssetBuilderSDK::JobDependency jobDep1("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep1);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep1));
-
-    AssetBuilderSDK::SourceFileDependency dep2 = { "",uuidOfD };
-    AssetBuilderSDK::JobDependency jobDep2("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep2);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep2));
-    job.m_jobsToAnalyze.push_back(newDetails);
-
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job);
-
-    // in this test, though, we delete some after pushing them in there, and update it again:
-    job.m_sourceFileDependencies.pop_back(); // erase the 'b' dependency.
-    job.m_jobsToAnalyze[0].m_jobDependencyList.pop_back(); // erase the 'd' dependency, which is by guid.
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job);
-
-    // now make sure that the same queries omit b and d:
-    AssetProcessor::SourceFilesForFingerprintingContainer deps;
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_SourceToSource, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_JobToJob, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 3);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());
-}
-
-TEST_F(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByUuid)
-{
-    // make sure that if we publish some dependencies, they do not appear if missing.
-    AZ::Uuid dummyBuilderUUID = AZ::Uuid::CreateRandom();
-    QDir tempPath(m_tempDir.path());
-    QString absPath(tempPath.absoluteFilePath("subfolder2/outputprefixtest.txt"));
-    UnitTestUtils::CreateDummyFile(absPath);
-    QString inputDatabasePath = "redirected/outputprefixtest.txt";
-    QString watchFolderPath = tempPath.absoluteFilePath("subfolder2");
-    const ScanFolderInfo* scanFolder = m_config->GetScanFolderByPath(watchFolderPath);
-    ASSERT_NE(scanFolder, nullptr);
-
-    // the above file (assetProcessorManagerTest.txt) will depend on these four files:
-    QString dependsOnFile1_Source = tempPath.absoluteFilePath("subfolder2/a.txt");
-    QString dependsOnFile2_Source = tempPath.absoluteFilePath("subfolder2/b.txt");
-    QString dependsOnFile1_Job = tempPath.absoluteFilePath("subfolder2/c.txt");
-    QString dependsOnFile2_Job = tempPath.absoluteFilePath("subfolder2/d.txt");
-
-    // in this case, we are only creating file b, and d (which are input by UUID)
-    // and we will be missing a and c, which are input by name.
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Job, QString("tempdata\n")));
-
-    // construct the dummy job to feed to the database updater function:
-    AssetProcessorManager::JobToProcessEntry job;
-    job.m_sourceFileInfo.m_databasePath = inputDatabasePath;
-    job.m_sourceFileInfo.m_pathRelativeToScanFolder = "outputprefixtest.txt";
-    job.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job.m_sourceFileInfo.m_uuid = AssetUtilities::CreateSafeSourceUUIDFromName(job.m_sourceFileInfo.m_databasePath.toUtf8().data());
-
-    // note that we have to "prime" the map with the UUIDs to the source info for this to work:
-    AZ::Uuid uuidOfB = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/b.txt");
-    AZ::Uuid uuidOfD = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/d.txt");
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfB] = { watchFolderPath, "b.txt", "redirected/b.txt" };
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfD] = { watchFolderPath, "d.txt", "redirected/d.txt" };
-
-    // each file we will take a different approach to publishing:  rel path, and UUID:
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "a.txt", AZ::Uuid::CreateNull() }));
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "", uuidOfB }));
-
-    // it is currently assumed that the only fields that we care about in JobDetails is the builder busId and the job dependencies themselves:
-    JobDetails newDetails;
-    newDetails.m_assetBuilderDesc.m_busId = dummyBuilderUUID;
-
-    AssetBuilderSDK::SourceFileDependency dep1 = { "c.txt", AZ::Uuid::CreateNull() };
-    AssetBuilderSDK::JobDependency jobDep1("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep1);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep1));
-
-    AssetBuilderSDK::SourceFileDependency dep2 = { "",uuidOfD };
-    AssetBuilderSDK::JobDependency jobDep2("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep2);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep2));
-
-    job.m_jobsToAnalyze.push_back(newDetails);
-
-    // this is the one line that this unit test is really testing:
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job);
-
-    // the rest of this test now performs a series of queries to verify the database was correctly set.
-    // this indirectly verifies the QueryAbsolutePathDependenciesRecursive function also but it has its own dedicated tests, above.
-    AssetProcessor::SourceFilesForFingerprintingContainer deps;
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_SourceToSource, false);
-
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end()); // b
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_JobToJob, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Job.toUtf8().constData()), deps.end()); // d
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any, false);
-    // the above function includes the actual source, as an absolute path.
-    EXPECT_EQ(deps.size(), 3);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end()); // b
-    EXPECT_NE(deps.find(dependsOnFile2_Job.toUtf8().constData()), deps.end()); // d
-}
-
-TEST_F(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByName)
-{
-    AZ::Uuid dummyBuilderUUID = AZ::Uuid::CreateRandom();
-    QDir tempPath(m_tempDir.path());
-    QString absPath(tempPath.absoluteFilePath("subfolder2/outputprefixtest.txt"));
-    UnitTestUtils::CreateDummyFile(absPath);
-    QString inputDatabasePath = "redirected/outputprefixtest.txt";
-    QString watchFolderPath = tempPath.absoluteFilePath("subfolder2");
-    const ScanFolderInfo* scanFolder = m_config->GetScanFolderByPath(watchFolderPath);
-    ASSERT_NE(scanFolder, nullptr);
-
-    // the above file (assetProcessorManagerTest.txt) will depend on these four files:
-    QString dependsOnFile1_Source = tempPath.absoluteFilePath("subfolder2/a.txt");
-    QString dependsOnFile2_Source = tempPath.absoluteFilePath("subfolder2/b.txt");
-    QString dependsOnFile1_Job = tempPath.absoluteFilePath("subfolder2/c.txt");
-    QString dependsOnFile2_Job = tempPath.absoluteFilePath("subfolder2/d.txt");
-
-    // in this case, we are only creating file a, and c, which are input by name
-    // and we we will be making b and d missing, which are input by UUID.
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Job, QString("tempdata\n")));
-
-    // construct the dummy job to feed to the database updater function:
-    AssetProcessorManager::JobToProcessEntry job;
-    job.m_sourceFileInfo.m_databasePath = inputDatabasePath;
-    job.m_sourceFileInfo.m_pathRelativeToScanFolder = "outputprefixtest.txt";
-    job.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job.m_sourceFileInfo.m_uuid = AssetUtilities::CreateSafeSourceUUIDFromName(job.m_sourceFileInfo.m_databasePath.toUtf8().data());
-
-    // note that we have to "prime" the map with the UUIDs to the source info for this to work:
-    AZ::Uuid uuidOfB = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/b.txt");
-    AZ::Uuid uuidOfD = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/d.txt");
-
-    // each file we will take a different approach to publishing:  rel path, and UUID:
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "a.txt", AZ::Uuid::CreateNull() }));
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "", uuidOfB }));
-
-    // it is currently assumed that the only fields that we care about in JobDetails is the builder busId and the job dependencies themselves:
-    JobDetails newDetails;
-    newDetails.m_assetBuilderDesc.m_busId = dummyBuilderUUID;
-
-    AssetBuilderSDK::SourceFileDependency dep1 = { "c.txt", AZ::Uuid::CreateNull() };
-    AssetBuilderSDK::JobDependency jobDep1("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep1);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep1));
-
-    AssetBuilderSDK::SourceFileDependency dep2 = { "",uuidOfD };
-    AssetBuilderSDK::JobDependency jobDep2("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep2);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep2));
-
-    job.m_jobsToAnalyze.push_back(newDetails);
-
-    // this is the one line that this unit test is really testing:
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job);
-
-    // the rest of this test now performs a series of queries to verify the database was correctly set.
-    // this indirectly verifies the QueryAbsolutePathDependenciesRecursive function also but it has its own dedicated tests, above.
-    AssetProcessor::SourceFilesForFingerprintingContainer deps;
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_SourceToSource, false);
-
-    // we should find all of the deps, but none of the placeholder
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());   // a
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_JobToJob, false);
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());  // c
-
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any, false);
-    EXPECT_EQ(deps.size(), 3);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());  // a
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());     // c
-}
-
-
-TEST_F(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByUuid_UpdatesWhenTheyAppear)
-{
-    // this test makes sure that when files DO appear that were previously placeholders, the database is updated
-    // so the strategy here is to  have files b, and d missing, which are declared as dependencies by UUID.
-    // then, we make them re-appear later, and check that the database has updated them appropriately.
-
-    AZ::Uuid dummyBuilderUUID = AZ::Uuid::CreateRandom();
-    QDir tempPath(m_tempDir.path());
-    QString absPath(tempPath.absoluteFilePath("subfolder2/outputprefixtest.txt"));
-    UnitTestUtils::CreateDummyFile(absPath);
-    QString inputDatabasePath = "redirected/outputprefixtest.txt";
-    QString watchFolderPath = tempPath.absoluteFilePath("subfolder2");
-    const ScanFolderInfo* scanFolder = m_config->GetScanFolderByPath(watchFolderPath);
-    ASSERT_NE(scanFolder, nullptr);
-
-    // the above file (assetProcessorManagerTest.txt) will depend on these four files:
-    QString dependsOnFile1_Source = tempPath.absoluteFilePath("subfolder2/a.txt");
-    QString dependsOnFile2_Source = tempPath.absoluteFilePath("subfolder2/b.txt");
-    QString dependsOnFile1_Job = tempPath.absoluteFilePath("subfolder2/c.txt");
-    QString dependsOnFile2_Job = tempPath.absoluteFilePath("subfolder2/d.txt");
-
-    // in this case, we are only creating file b, and d, which are addressed by UUID.
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Job, QString("tempdata\n")));
-
-    // construct the dummy job to feed to the database updater function:
-    AssetProcessorManager::JobToProcessEntry job;
-    job.m_sourceFileInfo.m_databasePath = inputDatabasePath;
-    job.m_sourceFileInfo.m_pathRelativeToScanFolder = "outputprefixtest.txt";
-    job.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job.m_sourceFileInfo.m_uuid = AssetUtilities::CreateSafeSourceUUIDFromName(job.m_sourceFileInfo.m_databasePath.toUtf8().data());
-
-    AZ::Uuid uuidOfD = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/d.txt");
-    AZ::Uuid uuidOfB = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/b.txt");
-
-    // each file we will take a different approach to publishing:  rel path, and UUID:
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "a.txt", AZ::Uuid::CreateNull() }));
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "", uuidOfB }));
-
-    // it is currently assumed that the only fields that we care about in JobDetails is the builder busId and the job dependencies themselves:
-    JobDetails newDetails;
-    newDetails.m_assetBuilderDesc.m_busId = dummyBuilderUUID;
-
-    AssetBuilderSDK::SourceFileDependency dep1 = { "c.txt", AZ::Uuid::CreateNull() };
-    AssetBuilderSDK::JobDependency jobDep1("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep1);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep1));
-
-    AssetBuilderSDK::SourceFileDependency dep2 = { "",uuidOfD };
-    AssetBuilderSDK::JobDependency jobDep2("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep2);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep2));
-
-    job.m_jobsToAnalyze.push_back(newDetails);
-
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job);
-    // so at this point, the database should be in the same state as after the UpdateSourceFileDependenciesDatabase_MissingFiles_ByUuid test
-    // which was already verified, by that test.
-
-    // now that the database has placeholders, we expect them to resolve themselves when we provide the actual files:
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Source, QString("tempdata\n")));
-    // now that B exists, we pretend a job came in to process B. (it doesn't require dependencies to be declared)
-    // note that we have to "prime" the map with the UUIDs to the source info for this to work:
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfB] = { watchFolderPath, "b.txt", "redirected/b.txt" };
-
-    AssetProcessorManager::JobToProcessEntry job2;
-    job2.m_sourceFileInfo.m_databasePath = "redirected/b.txt";
-    job2.m_sourceFileInfo.m_pathRelativeToScanFolder = "b.txt";
-    job2.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job2.m_sourceFileInfo.m_uuid = uuidOfB;
-
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job2);
-
-    // b should no longer be a placeholder, so both A and B should be present as their actual path.
-    AssetProcessor::SourceFilesForFingerprintingContainer deps;
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_SourceToSource, false);
-    EXPECT_EQ(deps.size(), 3);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());   // a
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end());   // b
-
-    // but d should still be a placeholder, since we have not declared it yet.
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_JobToJob, false);
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());  // c
-
-    // in addition, we expect to have the original file that depends on B appear in the analysis queue, since something it depends on appeared:
-    QString normalizedSourcePath = AssetUtilities::NormalizeFilePath(absPath);
-    EXPECT_TRUE(m_assetProcessorManager->m_alreadyActiveFiles.contains(normalizedSourcePath));
-
-    // now make d exist too and pretend a job came in to process it:
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Job, QString("tempdata\n"))); // create file D
-    AssetProcessorManager::JobToProcessEntry job3;
-    job3.m_sourceFileInfo.m_databasePath = "redirected/d.txt";
-    job3.m_sourceFileInfo.m_pathRelativeToScanFolder = "d.txt";
-    job3.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job3.m_sourceFileInfo.m_uuid = uuidOfD;
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfD] = { watchFolderPath, "d.txt", "redirected/d.txt" };
-
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job3);
-
-    // all files should now be present:
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any, false);
-    EXPECT_EQ(deps.size(), 5);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Job.toUtf8().constData()), deps.end());
-}
-
-
-TEST_F(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WithOutputPrefix_MissingFiles_ByName_UpdatesWhenTheyAppear)
-{
-    // this test makes sure that when files DO appear that were previously placeholders, the database is updated
-    // so the strategy here is to  have files a, and c missing, which are declared as dependencies by name.
-    // then, we make them re-appear later, and check that the database has updated them appropriately.
-
-    AZ::Uuid dummyBuilderUUID = AZ::Uuid::CreateRandom();
-    QDir tempPath(m_tempDir.path());
-    QString absPath(tempPath.absoluteFilePath("subfolder2/outputprefixtest.txt"));
-    UnitTestUtils::CreateDummyFile(absPath);
-    QString inputDatabasePath = "redirected/outputprefixtest.txt";
-    QString watchFolderPath = tempPath.absoluteFilePath("subfolder2");
-    const ScanFolderInfo* scanFolder = m_config->GetScanFolderByPath(watchFolderPath);
-    ASSERT_NE(scanFolder, nullptr);
-
-    // the above file (assetProcessorManagerTest.txt) will depend on these four files:
-    QString dependsOnFile1_Source = tempPath.absoluteFilePath("subfolder2/a.txt");
-    QString dependsOnFile2_Source = tempPath.absoluteFilePath("subfolder2/b.txt");
-    QString dependsOnFile1_Job = tempPath.absoluteFilePath("subfolder2/c.txt");
-    QString dependsOnFile2_Job = tempPath.absoluteFilePath("subfolder2/d.txt");
-
-    // in this case, we are only creating file b, and d, which are addressed by UUID.
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Source, QString("tempdata\n")));
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile2_Job, QString("tempdata\n")));
-
-    // construct the dummy job to feed to the database updater function:
-    AssetProcessorManager::JobToProcessEntry job;
-    job.m_sourceFileInfo.m_databasePath = inputDatabasePath;
-    job.m_sourceFileInfo.m_pathRelativeToScanFolder = "outputprefixtest.txt";
-    job.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job.m_sourceFileInfo.m_uuid = AssetUtilities::CreateSafeSourceUUIDFromName(job.m_sourceFileInfo.m_databasePath.toUtf8().data());
-
-    // note that we have to "prime" the map with the UUIDs to the source info for this to work:
-    AZ::Uuid uuidOfB = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/b.txt");
-    AZ::Uuid uuidOfD = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/d.txt");
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfB] = { watchFolderPath, "b.txt", "redirected/b.txt" };
-    m_assetProcessorManager->m_sourceUUIDToSourceInfoMap[uuidOfD] = { watchFolderPath, "d.txt", "redirected/d.txt" };
-
-    // each file we will take a different approach to publishing:  rel path, and UUID:
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "a.txt", AZ::Uuid::CreateNull() }));
-    job.m_sourceFileDependencies.push_back(AZStd::make_pair<AZ::Uuid, AssetBuilderSDK::SourceFileDependency>(dummyBuilderUUID, { "", uuidOfB }));
-
-    // it is currently assumed that the only fields that we care about in JobDetails is the builder busId and the job dependencies themselves:
-    JobDetails newDetails;
-    newDetails.m_assetBuilderDesc.m_busId = dummyBuilderUUID;
-
-    AssetBuilderSDK::SourceFileDependency dep1 = { "c.txt", AZ::Uuid::CreateNull() };
-    AssetBuilderSDK::JobDependency jobDep1("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep1);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep1));
-
-    AssetBuilderSDK::SourceFileDependency dep2 = { "",uuidOfD };
-    AssetBuilderSDK::JobDependency jobDep2("pc build", "pc", AssetBuilderSDK::JobDependencyType::Order, dep2);
-    newDetails.m_jobDependencyList.push_back(JobDependencyInternal(jobDep2));
-
-    job.m_jobsToAnalyze.push_back(newDetails);
-
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job);
-    // so at this point, the database should be in the same state as after the UpdateSourceFileDependenciesDatabase_MissingFiles_ByUuid test
-    // which was already verified, by that test.
-
-    // now that the database has placeholders, we expect them to resolve themselves when we provide the actual files:
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Source, QString("tempdata\n")));
-    // now that A exists, we pretend a job came in to process a. (it doesn't require dependencies to be declared)
-    AZ::Uuid uuidOfA = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/a.txt");
-    AssetProcessorManager::JobToProcessEntry job2;
-    job2.m_sourceFileInfo.m_databasePath = "redirected/a.txt";
-    job2.m_sourceFileInfo.m_pathRelativeToScanFolder = "a.txt";
-    job2.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job2.m_sourceFileInfo.m_uuid = uuidOfA;
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job2);
-
-    // a should no longer be a placeholder
-    AssetProcessor::SourceFilesForFingerprintingContainer deps;
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_SourceToSource, false);
-    EXPECT_EQ(deps.size(), 3);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());   // a
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end());   // b
-    deps.clear();
-
-    // c should still be a placeholder and thus should not appear in the results.
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_JobToJob, false);
-    EXPECT_EQ(deps.size(), 2);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Job.toUtf8().constData()), deps.end());  // d
-
-    // in addition, we expect to have the original file that depends on A appear in the analysis queue, since something it depends on appeared:
-    QString normalizedSourcePath = AssetUtilities::NormalizeFilePath(absPath);
-    EXPECT_TRUE(m_assetProcessorManager->m_alreadyActiveFiles.contains(normalizedSourcePath));
-
-    // now make c exist too and pretend a job came in to process it:
-    ASSERT_TRUE(UnitTestUtils::CreateDummyFile(dependsOnFile1_Job, QString("tempdata\n")));
-    AZ::Uuid uuidOfC = AssetUtilities::CreateSafeSourceUUIDFromName("redirected/c.txt");
-    AssetProcessorManager::JobToProcessEntry job3;
-    job3.m_sourceFileInfo.m_databasePath = "redirected/c.txt";
-    job3.m_sourceFileInfo.m_pathRelativeToScanFolder = "c.txt";
-    job3.m_sourceFileInfo.m_scanFolder = scanFolder;
-    job3.m_sourceFileInfo.m_uuid = uuidOfC;
-
-    m_assetProcessorManager.get()->UpdateSourceFileDependenciesDatabase(job3);
-
-    // all files should now be present:
-    deps.clear();
-    m_assetProcessorManager.get()->QueryAbsolutePathDependenciesRecursive(inputDatabasePath, deps, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any, false);
-    EXPECT_EQ(deps.size(), 5);
-    EXPECT_NE(deps.find(absPath.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Source.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile1_Job.toUtf8().constData()), deps.end());
-    EXPECT_NE(deps.find(dependsOnFile2_Job.toUtf8().constData()), deps.end());
-}
-
 TEST_F(AssetProcessorManagerTest, SourceFile_With_NonASCII_Characters_Fail_Job_OK)
 {
     // This test ensures that asset processor manager detects a source file that has non-ASCII characters
diff --git a/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp b/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp
index f1e125e0d8..1ad868421b 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp
@@ -74,10 +74,10 @@ namespace AssetProcessor
         m_platformConfig.reset(new AssetProcessor::PlatformConfiguration());
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         m_platformConfig.get()->PopulatePlatformsForScanFolder(platforms);
-        //                                                      PATH                     DisplayName  PortKey outputfolder  root recurse  platforms
-        m_platformConfig.get()->AddScanFolder(ScanFolderInfo(tempPath.absolutePath(),         "",        "ap1",    "",      true, false, platforms));
-        m_platformConfig.get()->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "",        "ap2",    "",      false, true,  platforms));
-        m_platformConfig.get()->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "",        "ap3",    "",      false, true,  platforms));
+        //                                                      PATH                     DisplayName  PortKey root recurse  platforms
+        m_platformConfig.get()->AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "", "ap1", true, false, platforms));
+        m_platformConfig.get()->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "", "ap2", false, true, platforms));
+        m_platformConfig.get()->AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "", "ap3", false, true, platforms));
 
         m_assetScanner.reset(new AssetScanner_Test(m_platformConfig.get()));
 
diff --git a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
index 076a1c2448..31e4996b1e 100644
--- a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
@@ -170,7 +170,7 @@ TEST_F(PlatformConfigurationUnitTests, TestReadScanFolderRoot_FromSettingsRegist
     EXPECT_TRUE(settingsRegistry->Get(scanOrder, AZ::SettingsRegistryInterface::FixedValueString(AssetProcessor::AssetProcessorSettingsKey)
         + "/ScanFolder SettingsRegistryTest/order"));
 
-    // These test values come from the <dev_root>/Engine/Registry/AssetProcessorPlatformConfig.setreg file
+    // These test values come from the <dev_root>/Registry/AssetProcessorPlatformConfig.setreg file
     EXPECT_STREQ("_TestPath", watchPath.c_str());
     EXPECT_FALSE(recurseScanFolder);
     EXPECT_EQ(20000, scanOrder);
@@ -200,7 +200,7 @@ public:
         m_config.reset();
         PlatformConfigurationUnitTests::TearDown();
     }
-    
+
     AZStd::vector<AssetBuilderSDK::PlatformInfo> m_platforms;
     AZStd::unique_ptr<UnitTestPlatformConfiguration> m_config;
     AZStd::unique_ptr<QTemporaryDir> m_tempEngineRoot = nullptr; // this actually creates the folder in its constructor, so hold off until setup..
@@ -213,8 +213,8 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, GetScanFolderForFile_Roo
     using namespace AzToolsFramework::AssetSystem;
     using namespace AssetProcessor;
 
-    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1"), "ScanFolder1", "sf1", "", true, false, m_platforms), true); // a root folder that has watched subfolders, not recursive
-    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1/Editor"), "Editor", "sf2", "", false, true, m_platforms), true); // a child folder that exists within that scan folder.
+    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1"), "ScanFolder1", "sf1", true, false, m_platforms), true); // a root folder that has watched subfolders, not recursive
+    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1/Editor"), "Editor", "sf2", false, true, m_platforms), true); // a child folder that exists within that scan folder.
 
     const ScanFolderInfo* info = m_config->GetScanFolderForFile(m_tempPath.filePath("scanfolder1/something.txt"));
 
@@ -229,8 +229,8 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, GetScanFolderForFile_Sub
     using namespace AzToolsFramework::AssetSystem;
     using namespace AssetProcessor;
 
-    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1"), "ScanFolder1", "sf1", "", true, false, m_platforms), true); // a root folder that has watched subfolders, not recursive
-    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1/Editor"), "Editor ScanFolder", "sf2", "", false, true, m_platforms), true); // a child folder that exists within that scan folder.
+    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1"), "ScanFolder1", "sf1", true, false, m_platforms), true); // a root folder that has watched subfolders, not recursive
+    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1/Editor"), "Editor ScanFolder", "sf2", false, true, m_platforms), true); // a child folder that exists within that scan folder.
 
     const ScanFolderInfo* info = m_config->GetScanFolderForFile(m_tempPath.filePath("scanfolder1/Editor/something.txt"));
 
@@ -254,8 +254,8 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, GetOverridingFile_Exists
     QString differentCaseDummyFileName = m_tempPath.absoluteFilePath("scanfolder2/testcase.txt");
     UnitTestUtils::CreateDummyFile(caseSensitiveDummyFileName, QString("testcase1\n"));
     UnitTestUtils::CreateDummyFile(differentCaseDummyFileName, QString("testcase2\n"));
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", "", false, true, m_platforms), true);
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", "", false, true, m_platforms), true);
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", false, true, m_platforms), true);
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", false, true, m_platforms), true);
 
     // Perform the test by asking it whether anyone overrides "testcase" (lowercase) in scanfolder 2.
     QString overrider = m_config->GetOverridingFile("testcase.txt", scanfolder2Path);
@@ -278,9 +278,9 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, GetOverridingFile_Exists
     QString differentCaseDummyFileName = m_tempPath.absoluteFilePath("scanfolder2/testcase.txt");
     UnitTestUtils::CreateDummyFile(caseSensitiveDummyFileName, QString("testcase1\n"));
     UnitTestUtils::CreateDummyFile(differentCaseDummyFileName, QString("testcase2\n"));
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", "", false, true, m_platforms), true);
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", "", false, true, m_platforms), true);
-    
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", false, true, m_platforms), true);
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", false, true, m_platforms), true);
+
     // Perform the test by asking it whether the existing real winning file is being overridden by anyone.
     QString overrider = m_config->GetOverridingFile("TestCase.tXt", scanfolder1Path);
 
@@ -297,8 +297,8 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, GetOverridingFile_DoesNo
     QString scanfolder1Path = m_tempPath.filePath("scanfolder1");
     QString scanfolder2Path = m_tempPath.filePath("scanfolder2");
 
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", "", false, true, m_platforms), true);
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", "", false, true, m_platforms), true);
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", false, true, m_platforms), true);
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", false, true, m_platforms), true);
 
     // Perform the test by asking it whether anyone overrides "testcase" (lowercase) in scanfolder 2.
     QString overrider = m_config->GetOverridingFile("doesntExist.txt", scanfolder2Path);
@@ -314,8 +314,8 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, FindFirstMatchingFile_Do
     // create two scan folders, since its order dependent, the ScanFolder1 is the "winner" in tie breakers.
     QString scanfolder1Path = m_tempPath.filePath("scanfolder1");
     QString scanfolder2Path = m_tempPath.filePath("scanfolder2");
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", "", false, true, m_platforms), true);
-    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", "", false, true, m_platforms), true);
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder1Path, "ScanFolder1", "sf1", false, true, m_platforms), true);
+    m_config->AddScanFolder(ScanFolderInfo(scanfolder2Path, "ScanFolder2", "sf2", false, true, m_platforms), true);
 
     // Perform the test by asking it whether anyone overrides "testcase" (lowercase) in scanfolder 2.
     QString foundFile = m_config->FindFirstMatchingFile("doesntExist.txt");
@@ -325,7 +325,7 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, FindFirstMatchingFile_Do
 
 // note that we do not guarantee that FindFirstMatchingFile always returns the correct case, as it is a super hot path
 // function, and the only time case could be incorrect is in the situation where a file with different case overrides
-// an underlying file, ie, 
+// an underlying file, ie,
 // Engine/EngineAssets/Textures/StartScreen.tif
 // MyGame/EngineAssets/textures/startscreen.tif <-- would override the above because game has higher / more important priority.
 
@@ -335,8 +335,8 @@ TEST_F(PlatformConfigurationUnitTests_OnePCHostFixture, GetScanFolderForFile_Sub
     using namespace AzToolsFramework::AssetSystem;
     using namespace AssetProcessor;
 
-    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1"), "ScanFolder1", "sf1", "", true, false, m_platforms), true); // a root folder that has watched subfolders, not recursive
-    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1/Editor"), "Editor ScanFolder", "sf2", "", false, true, m_platforms), true); // a child folder that exists within that scan folder.
+    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1"), "ScanFolder1", "sf1", true, false, m_platforms), true); // a root folder that has watched subfolders, not recursive
+    m_config->AddScanFolder(ScanFolderInfo(m_tempPath.filePath("scanfolder1/Editor"), "Editor ScanFolder", "sf2", false, true, m_platforms), true); // a child folder that exists within that scan folder.
 
     const ScanFolderInfo* info = m_config->GetScanFolderForFile(m_tempPath.filePath("scanfolder1/Editor"));
     ASSERT_TRUE(info);
@@ -363,20 +363,17 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularScanfolder)
     ASSERT_EQ(config.GetScanFolderCount(), 3); // the two, and then the one that has the same data as prior but different identifier.
     QString scanName = AssetUtilities::ComputeProjectPath() + " Scan Folder";
     ASSERT_EQ(config.GetScanFolderAt(0).GetDisplayName(), scanName);
-    ASSERT_EQ(config.GetScanFolderAt(0).GetOutputPrefix(), QString());
     ASSERT_EQ(config.GetScanFolderAt(0).RecurseSubFolders(), true);
     ASSERT_EQ(config.GetScanFolderAt(0).GetOrder(), 0);
     ASSERT_EQ(config.GetScanFolderAt(0).GetPortableKey(), QString("Game"));
 
     ASSERT_EQ(config.GetScanFolderAt(1).GetDisplayName(), QString("FeatureTests"));
-    ASSERT_EQ(config.GetScanFolderAt(1).GetOutputPrefix(), QString("featuretestsoutputfolder")); // to prove its not related to display name
     ASSERT_EQ(config.GetScanFolderAt(1).RecurseSubFolders(), false);
     ASSERT_EQ(config.GetScanFolderAt(1).GetOrder(), 5000);
     // this proves that the featuretests name is used instead of the output prefix
     ASSERT_EQ(config.GetScanFolderAt(1).GetPortableKey(), QString("FeatureTests"));
 
     ASSERT_EQ(config.GetScanFolderAt(2).GetDisplayName(), QString("FeatureTests2"));
-    ASSERT_EQ(config.GetScanFolderAt(2).GetOutputPrefix(), QString("featuretestsoutputfolder")); // to prove its not related to display name
     ASSERT_EQ(config.GetScanFolderAt(2).RecurseSubFolders(), false);
     ASSERT_EQ(config.GetScanFolderAt(2).GetOrder(), 6000);
     // this proves that the featuretests name is used instead of the output prefix
@@ -613,7 +610,6 @@ TEST_F(PlatformConfigurationUnitTests, Test_GemHandling)
 
     ASSERT_EQ(2, config.GetScanFolderCount());
     EXPECT_FALSE(config.GetScanFolderAt(0).IsRoot());
-    EXPECT_TRUE(config.GetScanFolderAt(0).GetOutputPrefix().isEmpty());
     EXPECT_TRUE(config.GetScanFolderAt(0).RecurseSubFolders());
     // the first one is a game gem, so its order should be above 1 but below 100.
     EXPECT_GE(config.GetScanFolderAt(0).GetOrder(), 100);
@@ -623,7 +619,6 @@ TEST_F(PlatformConfigurationUnitTests, Test_GemHandling)
 
     expectedScanFolder = tempPath.absoluteFilePath("Gems/LmbrCentral/v2/Assets");
     EXPECT_FALSE(config.GetScanFolderAt(1).IsRoot() );
-    EXPECT_TRUE(config.GetScanFolderAt(1).GetOutputPrefix().isEmpty());
     EXPECT_TRUE(config.GetScanFolderAt(1).RecurseSubFolders());
     EXPECT_GT(config.GetScanFolderAt(1).GetOrder(), config.GetScanFolderAt(0).GetOrder());
     EXPECT_EQ(0, config.GetScanFolderAt(1).ScanPath().compare(expectedScanFolder, Qt::CaseInsensitive));
diff --git a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp
index ac78db6c3d..b08fbc28d5 100644
--- a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp
@@ -247,54 +247,3 @@ TEST_F(RCcontrollerTest_Simple, SameJobIsCompletedMultipleTimes_CompletesWithout
     ASSERT_EQ(m_errorAbsorber->m_numAssertsAbsorbed, 4); // Expected that there are 4 errors related to the files not existing on disk.  Error message: GenerateFingerprint was called but no input files were requested for fingerprinting.
     ASSERT_EQ(m_errorAbsorber->m_numErrorsAbsorbed, 0);
 }
-
-// makes sure to expose parts of RCJob to the unit test
-class TestRCJob : public AssetProcessor::RCJob
-{
-    friend class GTEST_TEST_CLASS_NAME_(RCcontrollerTest, BuilderSDK_API_ProcessJob_HasValidParameters_WithOutputFolder);
-public:
-    explicit TestRCJob(QObject* parent = 0) : AssetProcessor::RCJob(parent) {};
-};
-
-TEST_F(RCcontrollerTest, BuilderSDK_API_ProcessJob_HasValidParameters_WithOutputFolder)
-{
-    // this test makes sure that the BuilderSDK API is not exposed to any database internals.
-
-    AZ::Uuid sourceUUID = AZ::Uuid::CreateRandom();
-    AZ::Uuid builderGuid = AZ::Uuid::CreateRandom();
-    
-    AssetBuilderSDK::ProcessJobRequest req;
-    {
-        // note that this scope is intentional.  job.Init(jobDetails) below is actually a by-ref operation that destroys JobDetails in the process.
-        AssetProcessor::JobDetails jobDetails;
-
-        // the crux of this test: the database source name differs from the relative path to watch folder:
-        jobDetails.m_jobEntry.m_pathRelativeToWatchFolder = "SomeThing.tif"; // case sensitive
-
-        // Note that while this is an OS-SPECIFIC path, this unit test does not actually invoke the file system at all
-        // and only operates on in-memory structures, so it should work on every platform.
-        jobDetails.m_jobEntry.m_watchFolderPath = "c:/test/a/B/c"; // just to make sure case is preserved
-        jobDetails.m_jobEntry.m_databaseSourceName = "somepath/SomeThing.tif"; // case sensitive but outputprefixes are generally lowcase
-
-        jobDetails.m_jobEntry.m_sourceFileUUID = sourceUUID;
-        jobDetails.m_jobEntry.m_platformInfo = { "ios",{ "mobile", "renderer" } };
-        jobDetails.m_jobEntry.m_jobRunKey = 1;
-        jobDetails.m_jobEntry.m_jobKey = "tiff";
-        jobDetails.m_jobEntry.m_builderGuid = builderGuid;
-
-        TestRCJob job;
-        job.Init(jobDetails);
-        job.PopulateProcessJobRequest(req);
-    }
-
-    EXPECT_STREQ(req.m_sourceFile.c_str(), "SomeThing.tif");
-    EXPECT_STREQ(req.m_watchFolder.c_str(), "c:/test/a/B/c");
-
-    // the crux of the test, tested:  make sure that it does not contain 'somepath' in there just becuase its part of the Database Source Name.
-    EXPECT_STREQ(req.m_fullPath.c_str(), "c:/test/a/B/c/SomeThing.tif");
-    EXPECT_EQ(req.m_builderGuid, builderGuid);
-    EXPECT_TRUE(req.m_platformInfo.HasTag("renderer"));
-    EXPECT_TRUE(req.m_platformInfo.HasTag("mobile"));
-    EXPECT_STREQ(req.m_platformInfo.m_identifier.c_str(), "ios");
-    EXPECT_EQ(req.m_sourceFileUUID, sourceUUID);
-}
diff --git a/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.cpp b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.cpp
new file mode 100644
index 0000000000..e0da06ad79
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.cpp
@@ -0,0 +1,25 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include "JobTreeViewItemDelegate.h"
+
+namespace AssetProcessor
+{
+    void JobTreeViewItemDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const
+    {
+        AzQtComponents::TableViewItemDelegate::initStyleOption(option, index);
+
+        option->features &= ~(QStyleOptionViewItem::WrapText);
+    }
+}
+
+#include <native/ui/moc_JobTreeViewItemDelegate.cpp>
diff --git a/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.h b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.h
new file mode 100644
index 0000000000..fbe45a3f75
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.h
@@ -0,0 +1,32 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzQtComponents/Components/Widgets/TableView.h>
+#endif
+
+namespace AssetProcessor
+{
+    class JobTreeViewItemDelegate
+        : public AzQtComponents::TableViewItemDelegate
+    {
+        Q_OBJECT
+
+    public:
+        using AzQtComponents::TableViewItemDelegate::TableViewItemDelegate;
+
+    protected:
+        void initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const override;
+    };
+} // namespace AssetProcessor
diff --git a/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp b/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp
index 3a874a464c..79019ab8fc 100644
--- a/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp
@@ -32,6 +32,7 @@
 
 #include <native/resourcecompiler/JobsModel.h>
 #include "native/ui/ui_MainWindow.h"
+#include "native/ui/JobTreeViewItemDelegate.h"
 
 
 #include "../utilities/GUIApplicationManager.h"
@@ -221,6 +222,7 @@ void MainWindow::Activate()
     ui->jobTreeView->setModel(m_jobSortFilterProxy);
     ui->jobTreeView->setSortingEnabled(true);
     ui->jobTreeView->header()->setDefaultAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+    ui->jobTreeView->setItemDelegate(new AssetProcessor::JobTreeViewItemDelegate(ui->jobTreeView));
 
     ui->jobTreeView->setToolTip(tr("Click to view Job Log"));
 
diff --git a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp
index 2cf0aa8ffc..f8c58b7866 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp
@@ -54,13 +54,6 @@ namespace AssetProcessor
         QDir scanFolder(file->m_scanFolderInfo.m_scanFolder.c_str());
         QString sourceName = file->m_sourceInfo.m_sourceName.c_str();
 
-        // If a scan folder has a prefix, then source files in those scan folders will have that
-        // prefix prepended in the asset database. Strip that prefix off for building the actual absolute path to the file.
-        if (!file->m_scanFolderInfo.m_outputPrefix.empty())
-        {
-            QRegExp prefixRemovalRegex(QString("^%1/").arg(file->m_scanFolderInfo.m_outputPrefix.c_str()));
-            sourceName.remove(prefixRemovalRegex);
-        }
         return scanFolder.filePath(sourceName);
     }
 
diff --git a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp
index 4d7711acad..dda0a58837 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp
@@ -14,6 +14,7 @@
 #include "SourceAssetTreeItemData.h"
 
 #include <AzCore/Component/TickBus.h>
+#include <AzCore/IO/Path/Path.h>
 #include <native/utilities/assetUtils.h>
 
 
@@ -62,19 +63,8 @@ namespace AssetProcessor
         }
 
 
-        AZStd::string fullPath = source.m_sourceName;
+        auto fullPath = AZ::IO::Path(scanFolder.m_scanFolder) / source.m_sourceName;
 
-        // The source assets should look like they do on disk.
-        // If the scan folder has an output prefix, strip it from the source file's path in the database, before
-        // the scan folder path is prepended to the source file.
-        if (!scanFolder.m_outputPrefix.empty())
-        {
-            AZStd::string prefixPath = scanFolder.m_outputPrefix;
-            AzFramework::StringFunc::Append(prefixPath, AZ_CORRECT_DATABASE_SEPARATOR);
-            AzFramework::StringFunc::Replace(fullPath, prefixPath.c_str(), "", false, true);
-        }
-
-        AzFramework::StringFunc::AssetDatabasePath::Join(scanFolder.m_scanFolder.c_str(), fullPath.c_str(), fullPath, true, false);
 
         // It's common for Open 3D Engine game projects and scan folders to be in a subfolder
         // of the engine install. To improve readability of the source files, strip out
@@ -85,7 +75,7 @@ namespace AssetProcessor
         }
         if (m_assetRootSet)
         {
-            AzFramework::StringFunc::Replace(fullPath, m_assetRoot.absolutePath().toUtf8(), "");
+            AzFramework::StringFunc::Replace(fullPath.Native(), m_assetRoot.absolutePath().toUtf8(), "");
         }
 
 
diff --git a/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp
index 1ece24210a..da4ddd6761 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp
@@ -148,7 +148,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
     scanFolders.clear();
 
     //add a scanfolder
-    scanFolder = ScanFolderDatabaseEntry("c:/O3DE/dev", "dev", "rootportkey", "");
+    scanFolder = ScanFolderDatabaseEntry("c:/O3DE/dev", "dev", "rootportkey");
     UNIT_TEST_EXPECT_TRUE(stateData->SetScanFolder(scanFolder));
     if (scanFolder.m_scanFolderID == AzToolsFramework::AssetDatabase::InvalidEntryId)
     {
@@ -158,7 +158,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
 
     //add the same folder again, should not add another because it already exists, so we should get the same id
     // not only that, but the path should update.
-    ScanFolderDatabaseEntry dupeScanFolder = ScanFolderDatabaseEntry("c:/O3DE/dev2", "dev", "rootportkey", "");
+    ScanFolderDatabaseEntry dupeScanFolder("c:/O3DE/dev2", "dev", "rootportkey");
     dupeScanFolder.m_scanFolderID = AzToolsFramework::AssetDatabase::InvalidEntryId;
     UNIT_TEST_EXPECT_TRUE(stateData->SetScanFolder(dupeScanFolder));
     if (!(dupeScanFolder == scanFolder))
@@ -200,7 +200,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
     }
 
     //add another folder
-    ScanFolderDatabaseEntry gameScanFolderEntry("c:/O3DE/game", "game", "gameportkey", "");
+    ScanFolderDatabaseEntry gameScanFolderEntry("c:/O3DE/game", "game", "gameportkey");
     UNIT_TEST_EXPECT_TRUE(stateData->SetScanFolder(gameScanFolderEntry));
     if (gameScanFolderEntry.m_scanFolderID == AzToolsFramework::AssetDatabase::InvalidEntryId ||
         gameScanFolderEntry.m_scanFolderID == scanFolder.m_scanFolderID)
@@ -230,7 +230,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
     UNIT_TEST_EXPECT_TRUE(ScanFoldersContainScanFolderID(scanFolders, scanFolder.m_scanFolderID));
 
     //add another folder again
-    gameScanFolderEntry = ScanFolderDatabaseEntry("c:/O3DE/game", "game", "gameportkey2", "");
+    gameScanFolderEntry = ScanFolderDatabaseEntry("c:/O3DE/game", "game", "gameportkey2");
     UNIT_TEST_EXPECT_TRUE(stateData->SetScanFolder(gameScanFolderEntry));
     if (gameScanFolderEntry.m_scanFolderID == AzToolsFramework::AssetDatabase::InvalidEntryId ||
         gameScanFolderEntry.m_scanFolderID == scanFolder.m_scanFolderID)
@@ -258,7 +258,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
     ///////////////////////////////////////////////////////////
     //setup for sources tests
     //for the rest of the test lets add the original scan folder
-    scanFolder = ScanFolderDatabaseEntry("c:/O3DE/dev", "dev", "devkey2", "");
+    scanFolder = ScanFolderDatabaseEntry("c:/O3DE/dev", "dev", "devkey2");
     UNIT_TEST_EXPECT_TRUE(stateData->SetScanFolder(scanFolder));
     ///////////////////////////////////////////////////////////
 
@@ -370,7 +370,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
     UNIT_TEST_EXPECT_TRUE(SourcesContainSourceGuid(sources, source.m_sourceGuid));
 
     //add the same source again, but change the scan folder.  This should NOT add a new source - even if we don't know what the sourceID is:
-    ScanFolderDatabaseEntry scanfolder2 = ScanFolderDatabaseEntry("c:/O3DE/dev2", "dev2", "devkey3", "");
+    ScanFolderDatabaseEntry scanfolder2 = ScanFolderDatabaseEntry("c:/O3DE/dev2", "dev2", "devkey3");
     UNIT_TEST_EXPECT_TRUE(stateData->SetScanFolder(scanfolder2));
 
     SourceDatabaseEntry dupeSource2(source);
@@ -554,7 +554,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
     ////////////////////////////////////////////////////////////////
     //Setup for jobs tests by having a scan folder and some sources
     //Add a scan folder
-    scanFolder = ScanFolderDatabaseEntry("c:/O3DE/dev", "dev", "devkey3", "");
+    scanFolder = ScanFolderDatabaseEntry("c:/O3DE/dev", "dev", "devkey3");
     UNIT_TEST_EXPECT_TRUE(stateData->SetScanFolder(scanFolder));
 
     //Add some sources
diff --git a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
index a336997068..5940caadb7 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
@@ -46,7 +46,6 @@ namespace AssetProcessor
         friend class AssetProcessorManagerUnitTests;
         friend class AssetProcessorManagerUnitTests_JobKeys;
         friend class AssetProcessorManagerUnitTests_JobDependencies_Fingerprint;
-        friend class AssetProcessorManagerUnitTests_CheckOutputFolders;
 #endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
 
     public:
@@ -64,7 +63,6 @@ namespace AssetProcessor
     REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests)
     REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests_JobKeys)
     REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests_JobDependencies_Fingerprint)
-    REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests_CheckOutputFolders)
 #endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
 
 
@@ -247,11 +245,11 @@ namespace AssetProcessor
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
         //                                               PATH                 DisplayName  PortKey       outputfolder  root recurse  platforms   order
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", "",          false, false, platforms, -6)); // subfolder 4 overrides subfolder3
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", "",          false, false, platforms,-5)); // subfolder 3 overrides subfolder2
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", "",          false, true,  platforms, -2)); // subfolder 2 overrides subfolder1
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "",          false, true,  platforms, -1)); // subfolder1 overrides root
-        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(),         "temp",       "tempfolder", "",          true, false,  platforms, 0)); // add the root
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", false, false, platforms, -6)); // subfolder 4 overrides subfolder3
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", false, false, platforms,-5)); // subfolder 3 overrides subfolder2
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", false, true,  platforms, -2)); // subfolder 2 overrides subfolder1
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true,  platforms, -1)); // subfolder1 overrides root
+        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(),         "temp",       "tempfolder", true, false,  platforms, 0)); // add the root
 
 
         config.AddMetaDataType("exportsettings", QString());
@@ -2325,8 +2323,8 @@ namespace AssetProcessor
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
         //                                               PATH                 DisplayName  PortKey       outputfolder  root recurse order
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "", false, true, platforms,-1)); // subfolder1 overrides root
-        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", "", true, false, platforms, 0)); // add the root
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true, platforms,-1)); // subfolder1 overrides root
+        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", true, false, platforms, 0)); // add the root
 
         AssetProcessorManager_Test apm(&config);
 
@@ -2534,11 +2532,11 @@ namespace AssetProcessor
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
         //                                               PATH                 DisplayName  PortKey       outputfolder  root recurse platforms order
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", "", false, false, platforms, -6)); // subfolder 4 overrides subfolder3
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", "", false, false, platforms, -5)); // subfolder 3 overrides subfolder2
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", "", false, true, platforms, -2)); // subfolder 2 overrides subfolder1
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "", false, true, platforms, -1)); // subfolder1 overrides root
-        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", "", true, false, platforms, 0)); // add the root
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", false, false, platforms, -6)); // subfolder 4 overrides subfolder3
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", false, false, platforms, -5)); // subfolder 3 overrides subfolder2
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", false, true, platforms, -2)); // subfolder 2 overrides subfolder1
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true, platforms, -1)); // subfolder1 overrides root
+        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", true, false, platforms, 0)); // add the root
 
         {
             // create this, which will write those scan folders into the db as-is
@@ -2584,13 +2582,13 @@ namespace AssetProcessor
         config2.PopulatePlatformsForScanFolder(platforms2);
         //                                               PATH                 DisplayName  PortKey       outputfolder  root recurse platforms order
         // case 1:  same absolute path, but the same portable key - should use same ID as before.
-        config2.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", "", false, false, platforms2, -6)); // subfolder 4 overrides subfolder3
+        config2.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", false, false, platforms2, -6)); // subfolder 4 overrides subfolder3
 
         // case 2:  A new absolute path, but same portable key - should use same id as before
-        config2.AddScanFolder(ScanFolderInfo(tempPath.filePath("newfolder3"), "subfolder3", "subfolder3", "", false, false, platforms2, -5)); // subfolder 3 overrides subfolder2
+        config2.AddScanFolder(ScanFolderInfo(tempPath.filePath("newfolder3"), "subfolder3", "subfolder3", false, false, platforms2, -5)); // subfolder 3 overrides subfolder2
 
         // case 3:  same absolute path, new portable key - should use a new ID
-        config2.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder3", "newfolder3", "", false, false, platforms2, -5)); // subfolder 3 overrides subfolder2
+        config2.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder3", "newfolder3", false, false, platforms2, -5)); // subfolder 3 overrides subfolder2
 
         // case 4:  subfolder2 is missing - it should be gone.
 
@@ -2775,8 +2773,8 @@ namespace AssetProcessor
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
         //                                               PATH                 DisplayName  PortKey       outputfolder  root recurse order
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "", false, true, platforms, -1)); // subfolder1 overrides root
-        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", "", true, false, platforms, 0)); // add the root
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true, platforms, -1)); // subfolder1 overrides root
+        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", true, false, platforms, 0)); // add the root
 
         AssetProcessorManager_Test apm(&config);
 
@@ -3083,255 +3081,6 @@ namespace AssetProcessor
         Q_EMIT UnitTestPassed();
     }
 
-    void AssetProcessorManagerUnitTests_CheckOutputFolders::StartTest()
-    {
-        MockAssetBuilderInfoHandler mockAssetBuilderInfoHandler;
-
-        QDir oldRoot;
-        AssetUtilities::ComputeAssetRoot(oldRoot);
-        AssetUtilities::ResetAssetRoot();
-
-        // the canonicalization of the path here is to get around the fact that on some platforms
-        // the "temporary" folder location could be junctioned into some other folder and getting "QDir::current()"
-        // and other similar functions may actually return a different string but still be referring to the same folder
-        QTemporaryDir dir;
-        QDir tempPath(dir.path());
-        QString canonicalTempDirPath = AssetUtilities::NormalizeDirectoryPath(tempPath.canonicalPath());
-        UnitTestUtils::ScopedDir changeDir(canonicalTempDirPath);
-        tempPath = QDir(canonicalTempDirPath);
-
-        QString gameName = AssetUtilities::ComputeProjectName(AssetProcessorManagerTestGameProject);
-
-        // update the engine root
-        AssetUtilities::ResetAssetRoot();
-        QDir newRoot;
-        AssetUtilities::ComputeAssetRoot(newRoot, &tempPath);
-
-        UNIT_TEST_EXPECT_FALSE(gameName.isEmpty());
-
-        PlatformConfiguration config;
-        config.EnablePlatform({ "pc",{ "desktop", "renderer" } }, true);
-        AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
-        config.PopulatePlatformsForScanFolder(platforms);
-        //                                               PATH                 DisplayName  PortKey       outputfolder  root recurse  platforms order
-
-        // note: the crux of this test is that we ar redirecting output into the cache at a different location instead of default.
-        // so our scan folder has a "redirected" folder.
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", "redirected", false, true, platforms, -1));
-
-        AssetProcessorManager_Test apm(&config);
-
-        QDir cacheRoot;
-        UNIT_TEST_EXPECT_TRUE(AssetUtilities::ComputeProjectCacheRoot(cacheRoot));
-
-        QList<JobDetails> processResults;
-        QList<QPair<QString, QString> > changedInputResults;
-        QList< AzFramework::AssetSystem::AssetNotificationMessage > assetMessages;
-
-        bool idling = false;
-
-        connect(&apm, &AssetProcessorManager::AssetToProcess,
-            this, [&processResults](JobDetails details)
-        {
-            processResults.push_back(AZStd::move(details));
-        });
-
-        connect(&apm, &AssetProcessorManager::AssetMessage,
-            this, [&assetMessages](AzFramework::AssetSystem::AssetNotificationMessage message)
-        {
-            assetMessages.push_back( message);
-        });
-
-        connect(&apm, &AssetProcessorManager::InputAssetProcessed,
-            this, [&changedInputResults](QString relativePath, QString platform)
-        {
-            changedInputResults.push_back(QPair<QString, QString>(relativePath, platform));
-        });
-
-        connect(&apm, &AssetProcessorManager::AssetProcessorManagerIdleState,
-            this, [&idling](bool state)
-        {
-            idling = state;
-        }
-        );
-
-        QString sourceFile = tempPath.absoluteFilePath("subfolder1/basefile.foo");
-        CreateDummyFile(sourceFile);
-
-        mockAssetBuilderInfoHandler.m_numberOfJobsToCreate = 1; //Create two jobs for this file
-
-        QMetaObject::invokeMethod(&apm, "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, sourceFile));
-
-        UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-
-        // block until no more events trickle in:
-        QCoreApplication::processEvents(QEventLoop::AllEvents);
-
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 1);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc"));
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_databaseSourceName == "redirected/basefile.foo");
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_pathRelativeToWatchFolder == "basefile.foo");
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_watchFolderPath == tempPath.filePath("subfolder1"));
-
-        QStringList pcouts;
-        pcouts.push_back(cacheRoot.filePath(QString("pc/redirected/basefile.arc1")));
-
-        // Create the product files for the first job
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts[0], "product1"));
-
-        // Invoke Asset Processed for pc platform for the first job
-        AssetBuilderSDK::ProcessJobResponse response;
-        response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(pcouts[0].toUtf8().constData()));
-
-        QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
-
-        // let events bubble through:
-        UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-
-        UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 1);
-        UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 1);
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "pc");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "redirected/basefile.arc1");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetChanged);
-
-        UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(changedInputResults[0].first) == AssetUtilities::NormalizeFilePath(sourceFile));
-
-        // ------------- TEST 1:   Modified source file
-
-        processResults.clear();
-        pcouts.clear();
-        assetMessages.clear();
-        changedInputResults.clear();
-
-        // now, the test is set up.  we can now start poking that file and make sure we emit the appropriate messages.
-        // first, lets modify the file and make sure we get the build request.
-
-#if defined(AZ_PLATFORM_WINDOWS)
-        QThread::msleep(30); // give at least some milliseconds so that the files never share the same timestamp exactly
-#else
-        // on some file systems such as HFS (commonly used on Apple devices, the file time resolution is only a second.
-        // We are forcing a wait here of at least a second to make sure that the file modtime
-        // actually changes.
-        QThread::msleep(1001);
-#endif // defined (AZ_PLATFORM_WINDOWS)
-
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(sourceFile, "new data!"));
-
-        QMetaObject::invokeMethod(&apm, "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, sourceFile));
-
-        UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-
-        // block until no more events trickle in:
-        QCoreApplication::processEvents(QEventLoop::AllEvents);
-
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 1);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc"));
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_pathRelativeToWatchFolder == "basefile.foo");
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_databaseSourceName == "redirected/basefile.foo");
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_watchFolderPath == tempPath.absoluteFilePath("subfolder1"));
-
-        pcouts.push_back(cacheRoot.filePath(QString("pc/redirected/basefile.arc1")));
-
-        // Create the product files for the first job
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts[0], "product1"));
-
-        // Invoke Asset Processed for pc platform for the first job
-        response.m_outputProducts.clear();
-        response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(pcouts[0].toUtf8().constData()));
-
-        QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
-
-        // let events bubble through:
-        UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-
-        UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 1);
-        UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 1);
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "pc");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "redirected/basefile.arc1");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetChanged);
-
-        UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(changedInputResults[0].first) == AssetUtilities::NormalizeFilePath(sourceFile));
-
-        // ------------- TEST 2:   Deleted product
-
-        processResults.clear();
-        pcouts.clear();
-        assetMessages.clear();
-        changedInputResults.clear();
-
-        QString deletedProductPath = cacheRoot.filePath(QString("pc/redirected/basefile.arc1"));
-
-        QFile::remove(deletedProductPath);
-
-        QMetaObject::invokeMethod(&apm, "AssessDeletedFile", Qt::QueuedConnection, Q_ARG(QString, deletedProductPath));
-
-        UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-
-        // block until no more events trickle in:
-        QCoreApplication::processEvents(QEventLoop::AllEvents);
-
-        UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 0); // asset removed is delayed until actual processing occurs.
-
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 1);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc"));
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_pathRelativeToWatchFolder == "basefile.foo");
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_databaseSourceName == "redirected/basefile.foo");
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_watchFolderPath == tempPath.absoluteFilePath("subfolder1"));
-
-        pcouts.push_back(cacheRoot.filePath(QString("pc/redirected/basefile.arc1")));
-
-        // Create the product files for the first job
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts[0], "product1"));
-
-        // Invoke Asset Processed for pc platform for the first job
-        response.m_outputProducts.clear();
-        response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(pcouts[0].toUtf8().constData()));
-
-        changedInputResults.clear();
-        assetMessages.clear();
-
-        QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
-
-        // let events bubble through:
-        UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-
-        UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 1);
-        UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 1);
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "pc");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "redirected/basefile.arc1");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetChanged);
-
-        UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(changedInputResults[0].first) == AssetUtilities::NormalizeFilePath(sourceFile));
-
-        // ------------- TEST 3:   Deleted source - the products should end up deleted!
-
-        processResults.clear();
-        pcouts.clear();
-        assetMessages.clear();
-        changedInputResults.clear();
-
-        QString deletedSourcePath = sourceFile;
-        QFile::remove(deletedSourcePath);
-        QMetaObject::invokeMethod(&apm, "AssessDeletedFile", Qt::QueuedConnection, Q_ARG(QString, deletedSourcePath));
-
-        UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-
-        // block until no more events trickle in:
-        QCoreApplication::processEvents(QEventLoop::AllEvents);
-
-        UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 1);
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "pc");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "redirected/basefile.arc1");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetRemoved);
-
-        // also ensure file is actually gone!
-        UNIT_TEST_EXPECT_TRUE(!QFile::exists(deletedProductPath));
-
-        Q_EMIT UnitTestPassed();
-    }
     void AssetProcessorManagerUnitTests_JobDependencies_Fingerprint::GetMatchingBuildersInfo(const AZStd::string& assetPath, AssetProcessor::BuilderInfoList& builderInfoList)
     {
         AZ_UNUSED(assetPath);
diff --git a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h
index 295e2331bd..1608c133a3 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h
@@ -45,14 +45,6 @@ Q_SIGNALS:
         virtual void StartTest() override;
     };
 
-class AssetProcessorManagerUnitTests_CheckOutputFolders
-        : public UnitTestRun
-    {
-        Q_OBJECT
-    public:
-        virtual void StartTest() override;
-
-    };
     class AssetProcessorManagerUnitTests_JobDependencies_Fingerprint
         : public UnitTestRun
         , public AssetProcessor::AssetBuilderInfoBus::Handler
diff --git a/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp
index d4bf49773e..d42be02d06 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp
@@ -65,10 +65,10 @@ void AssetScannerUnitTest::StartTest()
     AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
     config.PopulatePlatformsForScanFolder(platforms);
     //                                               PATH               DisplayName  PortKey outputfolder  root recurse  platforms
-    config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(),         "temp",       "ap1",   "",        true,  false, platforms));  // note:  "Recurse" set to false.
-    config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "",           "ap2",   "",       false,  true,  platforms));
-    config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "",           "ap3",   "",       false,  true,  platforms));
-    config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "",           "ap4",   "",       false,  false, platforms)); // note:  "Recurse" set to false.
+    config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(),         "temp",       "ap1",    true,  false, platforms));  // note:  "Recurse" set to false.
+    config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "",           "ap2",   false,  true,  platforms));
+    config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "",           "ap3",   false,  true,  platforms));
+    config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "",           "ap4",   false,  false, platforms)); // note:  "Recurse" set to false.
     AssetScanner scanner(&config);
 
     QList<AssetFileInfo> filesFound;
diff --git a/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
index e270a9133b..29a0570d39 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
@@ -44,7 +44,4 @@ ConnectionUnitTest::~ConnectionUnitTest()
 
 }
 
-
-
-REGISTER_UNIT_TEST(ConnectionUnitTest)
-
+// REGISTER_UNIT_TEST(ConnectionUnitTest) // disabling due to intermittent test failure - LYN-3368
diff --git a/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
index 5a697c103f..e09a6366a1 100644
--- a/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
@@ -69,20 +69,20 @@ void PlatformConfigurationTests::StartTest()
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
 
-        //                                         PATH               DisplayName  PortKey outputfolder  root   recurse  platforms,      isunittesting
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"),   "", "sf3",  "",           false, false,   platforms), true); // subfolder 3 overrides subfolder2
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"),   "", "sf4",  "",           false, true,    platforms), true); // subfolder 2 overrides subfolder1
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"),   "", "sf1",  "subfolder1", false, true,    platforms), true); // subfolder1 overrides root
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"),   "", "sf4",  "",           false, true,    platforms), true); // subfolder4 overrides subfolder5
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder5"),   "", "sf5",  "b/c",        false, true,    platforms), true); // subfolder5 overrides subfolder6
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder6"), "", "sf6", "b/c",           false, true,    platforms), true); // subfolder6 overrides subfolder7
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder7"), "", "sf7", "",              false, true,    platforms), true); // subfolder7 overrides subfolder8
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder8/x"), "", "sf8", "",            false, true,    platforms), true); // subfolder8 overrides root
-        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(),       "temp", "temp", "",           true, false,    platforms), true); // add the root
+        //                                         PATH               DisplayName  PortKey root   recurse  platforms,      isunittesting
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"),   "", "sf3",  false, false,   platforms), true); // subfolder 3 overrides subfolder2
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"),   "", "sf4",  false, true,    platforms), true); // subfolder 2 overrides subfolder1
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"),   "", "sf1",  false, true,    platforms), true); // subfolder1 overrides root
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"),   "", "sf4",  false, true,    platforms), true); // subfolder4 overrides subfolder5
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder5"),   "", "sf5",  false, true,    platforms), true); // subfolder5 overrides subfolder6
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder6"), "", "sf6", false, true,    platforms), true); // subfolder6 overrides subfolder7
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder7"), "", "sf7", false, true,    platforms), true); // subfolder7 overrides subfolder8
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder8/x"), "", "sf8", false, true,    platforms), true); // subfolder8 overrides root
+        config.AddScanFolder(ScanFolderInfo(tempPath.absolutePath(),       "temp", "temp", true, false,    platforms), true); // add the root
 
         // these are checked for later.
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("GameName"),             "gn",    "",          "", false, true, platforms), true);
-        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("GameNameButWithExtra"), "gnbwe", "", "WithExtra", false, true, platforms), true);
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("GameName"),             "gn",    "", false, true, platforms), true);
+        config.AddScanFolder(ScanFolderInfo(tempPath.filePath("GameNameButWithExtra"), "gnbwe", "", false, true, platforms), true);
 
 
 
@@ -151,7 +151,7 @@ void PlatformConfigurationTests::StartTest()
         UNIT_TEST_EXPECT_TRUE(config.GetOverridingFile("rootfile3.txt", tempPath.absolutePath()) == tempPath.absoluteFilePath("subfolder3/rootfile3.txt"));
         UNIT_TEST_EXPECT_TRUE(config.GetOverridingFile("subfolder1/whatever.txt", tempPath.filePath("subfolder1")) == QString());
         UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(config.GetOverridingFile("subfolder1/override.txt", tempPath.filePath("subfolder1"))) == AssetUtilities::NormalizeFilePath(tempPath.absoluteFilePath("subfolder2/subfolder1/override.txt")));
-        UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(config.GetOverridingFile("b/c/a/testfile.txt", tempPath.filePath("subfolder6"))) == AssetUtilities::NormalizeFilePath(tempPath.absoluteFilePath("subfolder5/a/testfile.txt")));
+        UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(config.GetOverridingFile("a/testfile.txt", tempPath.filePath("subfolder6"))) == AssetUtilities::NormalizeFilePath(tempPath.absoluteFilePath("subfolder4/a/testfile.txt")));
         UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(config.GetOverridingFile("a/testfile.txt", tempPath.filePath("subfolder7"))) == AssetUtilities::NormalizeFilePath(tempPath.absoluteFilePath("subfolder4/a/testfile.txt")));
         UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(config.GetOverridingFile("a/testfile.txt", tempPath.filePath("subfolder8/x"))) == AssetUtilities::NormalizeFilePath(tempPath.absoluteFilePath("subfolder4/a/testfile.txt")));
 
@@ -183,7 +183,6 @@ void PlatformConfigurationTests::StartTest()
         // different regex rule should not interfere
         UNIT_TEST_EXPECT_TRUE(config.FindFirstMatchingFile("test/test.format") == tempPath.filePath("subfolder1/test/test.format"));
 
-        UNIT_TEST_EXPECT_TRUE(config.FindFirstMatchingFile("b/c/a/testfile.txt") == tempPath.filePath("subfolder5/a/testfile.txt"));
         UNIT_TEST_EXPECT_TRUE(config.FindFirstMatchingFile("a/testfile.txt") == tempPath.filePath("subfolder4/a/testfile.txt"));
 
         // ---------------------------- GetScanFolderForFile -----------------
@@ -198,15 +197,6 @@ void PlatformConfigurationTests::StartTest()
         UNIT_TEST_EXPECT_TRUE(config.GetScanFolderForFile(tempPath.filePath("rootfile2.txt")));
         UNIT_TEST_EXPECT_TRUE(config.GetScanFolderForFile(tempPath.filePath("rootfile2.txt"))->ScanPath() == tempPath.absolutePath());
 
-        // test of output prefix lookup
-        UNIT_TEST_EXPECT_TRUE(config.GetScanFolderForFile(tempPath.filePath("subfolder1/whatever.txt"))->GetOutputPrefix() == "subfolder1");
-
-        // make sure that it does not mistake the GameName folder and the GameNameWithExtra folder for each other.
-
-        UNIT_TEST_EXPECT_TRUE(config.GetScanFolderForFile(tempPath.filePath("GameNameButWithExtra/somefile.meo"))->GetOutputPrefix() == "WithExtra");
-        UNIT_TEST_EXPECT_TRUE(config.GetScanFolderForFile(tempPath.filePath("GameName/otherfile.meo"))->GetOutputPrefix() == "");
-
-
         // -------------------------- ConvertToRelativePath  ------------------------------
 
         QString fileName;
@@ -238,9 +228,9 @@ void PlatformConfigurationTests::StartTest()
         UNIT_TEST_EXPECT_TRUE(fileName == "aaa/bbb/ccc/ddd/basefile.txt");
         UNIT_TEST_EXPECT_TRUE(scanFolderPath == tempPath.filePath("subfolder2"));
 
-        // verify that output relative paths include output prefix
+        // verify that output relative paths
         UNIT_TEST_EXPECT_TRUE(config.ConvertToRelativePath(tempPath.absoluteFilePath("subfolder1/whatever.txt"), fileName, scanFolderPath));
-        UNIT_TEST_EXPECT_TRUE(fileName == "subfolder1/whatever.txt");
+        UNIT_TEST_EXPECT_TRUE(fileName == "whatever.txt");
         UNIT_TEST_EXPECT_TRUE(scanFolderPath == tempPath.filePath("subfolder1"));
     }
 
diff --git a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
index 8d423a68cd..0e771f7fd1 100644
--- a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
@@ -520,7 +520,7 @@ void RCcontrollerUnitTests::RunRCControllerTests()
 
     AZ::Uuid uuidOfSource = AZ::Uuid("{D013122E-CF2C-4534-A87D-F82570FBC2CD}");
     MockRCJob rcJob;
-    ScanFolderInfo scanFolderInfo("samplepath", "sampledisplayname", "samplekey", "", false, false);
+    ScanFolderInfo scanFolderInfo("samplepath", "sampledisplayname", "samplekey", false, false);
     AssetProcessor::JobDetails jobDetailsToInitWith;
     jobDetailsToInitWith.m_jobEntry.m_watchFolderPath = tempPath.absoluteFilePath("subfolder4");
     jobDetailsToInitWith.m_jobEntry.m_databaseSourceName = jobDetailsToInitWith.m_jobEntry.m_pathRelativeToWatchFolder = "needsLock.tiff";
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
index 2c3d0739c6..c85801a074 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
@@ -470,7 +470,7 @@ void ApplicationManager::PopulateApplicationDependencies()
     QDir assetRoot;
     AssetUtilities::ComputeAssetRoot(assetRoot);
 
-    QString globalConfigPath = assetRoot.filePath("AssetProcessorPlatformConfig.setreg");
+    QString globalConfigPath = assetRoot.filePath("Registry/AssetProcessorPlatformConfig.setreg");
     m_filesOfInterest.push_back(globalConfigPath);
 
     QString gamePlatformConfigPath = QDir(AssetUtilities::ComputeProjectPath()).filePath("AssetProcessorGamePlatformConfig.setreg");
diff --git a/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp b/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp
index 73125fd58a..9daf97cf79 100644
--- a/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp
@@ -20,30 +20,32 @@ AZ_POP_DISABLE_WARNING
 #include "native/AssetDatabase/AssetDatabase.h"
 #include "native/assetprocessor.h"
 #include <AzCore/Component/TickBus.h>
+#include <AzCore/IO/FileIO.h>
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/string/wildcard.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzCore/XML/rapidxml.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/FileTag/FileTag.h>
 #include <AzFramework/FileTag/FileTagBus.h>
-#include <AzFramework/IO/LocalFileIO.h>
 
 namespace AssetProcessor
 {
-    const char* EngineFolder = "Engine";
+    constexpr auto EngineFolder = AZ::IO::FixedMaxPath("Assets") / "Engine";
 
     AZStd::string GetXMLDependenciesFile(const AZStd::string& fullPath, const AZStd::vector<AzFramework::GemInfo>& gemInfoList, AZStd::string& tokenName)
     {
         AZ::IO::Path xmlDependenciesFileFullPath;
-        tokenName = EngineFolder;
+        tokenName = EngineFolder.String();
         for (const AzFramework::GemInfo& gemElement : gemInfoList)
         {
             for (const AZ::IO::Path& absoluteSourcePath : gemElement.m_absoluteSourcePaths)
             {
-                if (AZ::StringFunc::StartsWith(fullPath, absoluteSourcePath.Native()) || AZ::StringFunc::Equal(absoluteSourcePath.Native(), fullPath))
+                if (AZ::IO::PathView(fullPath).IsRelativeTo(absoluteSourcePath))
                 {
+                    xmlDependenciesFileFullPath = absoluteSourcePath;
                     xmlDependenciesFileFullPath /= AzFramework::GemInfo::GetGemAssetFolder();
                     xmlDependenciesFileFullPath /= AZStd::string::format("%s_Dependencies.xml", gemElement.m_gemName.c_str());;
                     if (AZ::IO::FileIOBase::GetInstance()->Exists(xmlDependenciesFileFullPath.c_str()))
@@ -57,7 +59,7 @@ namespace AssetProcessor
 
         // if we are here than either the %gemName%_Dependencies.xml file does not exists or the user inputted path is not inside a gems folder,
         // in both the cases we will return the engine dependencies file
-        xmlDependenciesFileFullPath = AZ::IO::FileIOBase::GetInstance()->GetAlias("@devroot@");
+        xmlDependenciesFileFullPath = AZ::Utils::GetEnginePath();
         xmlDependenciesFileFullPath /= EngineFolder;
         xmlDependenciesFileFullPath /= "Engine_Dependencies.xml";
 
diff --git a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
index 615e465b21..7db5804b14 100644
--- a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
@@ -216,10 +216,6 @@ namespace AssetProcessor
         {
             scanFolderEntry.m_watchPath = value;
         }
-        else if (valueName == "output")
-        {
-            scanFolderEntry.m_outputPrefix = value;
-        }
         else if (valueName == "display" && !value.empty())
         {
             scanFolderEntry.m_scanFolderDisplayName = value;
@@ -784,7 +780,6 @@ namespace AssetProcessor
                     scanFolder,
                     AZStd::string::format("ScanFolderParam %zu", idx).c_str(),
                     AZStd::string::format("SF%zu", idx).c_str(),
-                    "",
                     false,
                     true,
                     platforms,
@@ -1079,10 +1074,6 @@ namespace AssetProcessor
                 AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
                 PopulatePlatformsForScanFolder(platforms, includeIdentifiers, excludeIdentifiers);
 
-
-                // Normalize the OutputPrefix to use PosixPathSeparators
-                scanFolderEntry.m_outputPrefix = AZ::IO::PathView(scanFolderEntry.m_outputPrefix, AZ::IO::PosixPathSeparator).LexicallyNormal().String();
-
                 const bool isEngineRoot = scanFolderEntry.m_watchPath == engineRoot;
                 // If the scan folder happens to be the engine root, it is not recursive
                 scanFolderEntry.m_isRecursive = scanFolderEntry.m_isRecursive && !isEngineRoot;
@@ -1093,7 +1084,6 @@ namespace AssetProcessor
                     QString::fromUtf8(scanFolderEntry.m_watchPath.c_str(), aznumeric_cast<int>(scanFolderEntry.m_watchPath.Native().size())),
                     QString::fromUtf8(scanFolderEntry.m_scanFolderDisplayName.c_str(), aznumeric_cast<int>(scanFolderEntry.m_scanFolderDisplayName.size())),
                     QString::fromUtf8(scanFolderEntry.m_scanFolderIdentifier.c_str(), aznumeric_cast<int>(scanFolderEntry.m_scanFolderIdentifier.size())),
-                    QString::fromUtf8(scanFolderEntry.m_outputPrefix.c_str(), aznumeric_cast<int>(scanFolderEntry.m_outputPrefix.size())),
                     isEngineRoot,
                     scanFolderEntry.m_isRecursive,
                     platforms,
@@ -1318,7 +1308,7 @@ namespace AssetProcessor
         }
     }
 
-    bool PlatformConfiguration::ConvertToRelativePath(QString fullFileName, QString& databaseSourceName, QString& scanFolderName, bool includeOutputPrefix) const
+    bool PlatformConfiguration::ConvertToRelativePath(QString fullFileName, QString& databaseSourceName, QString& scanFolderName) const
     {
         const ScanFolderInfo* info = GetScanFolderForFile(fullFileName);
 
@@ -1327,13 +1317,13 @@ namespace AssetProcessor
             scanFolderName = info->ScanPath();
             scanFolderName.replace(AZ_WRONG_DATABASE_SEPARATOR, AZ_CORRECT_DATABASE_SEPARATOR);
 
-            return ConvertToRelativePath(fullFileName, info, databaseSourceName, includeOutputPrefix);
+            return ConvertToRelativePath(fullFileName, info, databaseSourceName);
         }
         // did not find it.
         return false;
     }
 
-    bool PlatformConfiguration::ConvertToRelativePath(const QString& fullFileName, const ScanFolderInfo* scanFolderInfo, QString& databaseSourceName, bool includeOutputPrefix)
+    bool PlatformConfiguration::ConvertToRelativePath(const QString& fullFileName, const ScanFolderInfo* scanFolderInfo, QString& databaseSourceName)
     {
         if(!scanFolderInfo)
         {
@@ -1346,20 +1336,7 @@ namespace AssetProcessor
             relPath = fullFileName.right(fullFileName.length() - scanFolderInfo->ScanPath().length() - 1); // also eat the slash, hence -1
         }
 
-        if ((scanFolderInfo->GetOutputPrefix().isEmpty()) || (!includeOutputPrefix))
-        {
-            databaseSourceName = relPath;
-        }
-        else
-        {
-            databaseSourceName = scanFolderInfo->GetOutputPrefix();
-
-            if (!relPath.isEmpty())
-            {
-                databaseSourceName += '/';
-                databaseSourceName += relPath;
-            }
-        }
+        databaseSourceName = relPath;
 
         databaseSourceName.replace(AZ_WRONG_DATABASE_SEPARATOR, AZ_CORRECT_DATABASE_SEPARATOR);
 
@@ -1380,11 +1357,6 @@ namespace AssetProcessor
                 return QString();
             }
             QString tempRelativeName(relativeName);
-            //if relative path starts with the output prefix than remove it first
-            if (!scanFolderInfo.GetOutputPrefix().isEmpty() && tempRelativeName.startsWith(scanFolderInfo.GetOutputPrefix(), Qt::CaseInsensitive))
-            {
-                tempRelativeName = tempRelativeName.right(tempRelativeName.length() - scanFolderInfo.GetOutputPrefix().length() - 1); // also eat the slash, hence -1
-            }
 
             if ((!scanFolderInfo.RecurseSubFolders()) && (tempRelativeName.contains('/')))
             {
@@ -1418,11 +1390,6 @@ namespace AssetProcessor
 
             QString tempRelativeName(relativeName);
 
-            //if relative path starts with the output prefix than remove it first
-            if (!scanFolderInfo.GetOutputPrefix().isEmpty() && tempRelativeName.startsWith(scanFolderInfo.GetOutputPrefix(), Qt::CaseInsensitive))
-            {
-                tempRelativeName = tempRelativeName.right(tempRelativeName.length() - scanFolderInfo.GetOutputPrefix().length() - 1); // also eat the slash, hence -1
-            }
             if ((!scanFolderInfo.RecurseSubFolders()) && (tempRelativeName.contains('/')))
             {
                 // the name is a deeper relative path, but we don't recurse this scan folder, so it can't win
@@ -1566,7 +1533,6 @@ namespace AssetProcessor
                 //      Watched folder: (absolute path to the gem /Assets/ folder) MUST BE CORRECT CASE
                 //      Display name:   "Gems/GemName/Assets" // uppercase, for human eyes
                 //      portable Key:   "gemassets-(UUID Of Gem)"
-                //      Output Prefix:  "" // empty string - this means put it in @assets@ as per default
                 //      Is Root:        False
                 //      Recursive:      True
                 QString gemFolder = gemDir.absoluteFilePath(AzFramework::GemInfo::GetGemAssetFolder());
@@ -1576,7 +1542,6 @@ namespace AssetProcessor
 
                 QString assetBrowserDisplayName = AzFramework::GemInfo::GetGemAssetFolder(); // Gems always use assets folder as their displayname...
                 QString portableKey = QString("gemassets-%1").arg(gemNameAsUuid);
-                QString outputPrefix; // empty intentionally here
                 bool isRoot = false;
                 bool isRecursive = true;
                 gemOrder++;
@@ -1586,7 +1551,6 @@ namespace AssetProcessor
                     gemFolder,
                     assetBrowserDisplayName,
                     portableKey,
-                    outputPrefix,
                     isRoot,
                     isRecursive,
                     platforms,
diff --git a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
index f10493ea42..bae8e4b716 100644
--- a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
+++ b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
@@ -128,7 +128,6 @@ namespace AssetProcessor
             AZ::IO::Path m_watchPath{ AZ::IO::PosixPathSeparator };
             AZStd::vector<AZStd::string> m_includeIdentifiers;
             AZStd::vector<AZStd::string> m_excludeIdentifiers;
-            AZStd::string m_outputPrefix;
             int m_scanOrder{};
             bool m_isRecursive{};
         };
@@ -290,10 +289,9 @@ namespace AssetProcessor
         //! ----> [textures/texture1.tga] found under [c:/dev/mygame]
         //! c:/dev/engine/models/box01.mdl
         //! ----> [models/box01.mdl] found under[c:/dev/engine]
-        //! note that this does return a database source path by default, which includes the output prefix of the scan folder if present
-        //! You can override this by setting includeOutputPrefix = false;
-        bool ConvertToRelativePath(QString fullFileName, QString& databaseSourceName, QString& scanFolderName, bool includeOutputPrefix = true) const;
-        static bool ConvertToRelativePath(const QString& fullFileName, const ScanFolderInfo* scanFolderInfo, QString& databaseSourceName, bool includeOutputPrefix = true);
+        //! note that this does return a database source path by default
+        bool ConvertToRelativePath(QString fullFileName, QString& databaseSourceName, QString& scanFolderName) const;
+        static bool ConvertToRelativePath(const QString& fullFileName, const ScanFolderInfo* scanFolderInfo, QString& databaseSourceName);
 
         //! given a full file name (assumed already fed through the normalization funciton), return the first matching scan folder
         const AssetProcessor::ScanFolderInfo* GetScanFolderForFile(const QString& fullFileName) const;
diff --git a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
index b615e8854a..b152e5ed4f 100644
--- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
@@ -562,8 +562,8 @@ namespace AssetUtilities
                 }
                 else
                 {
-                    AZ_Warning(AssetProcessor::ConsoleChannel, false, "Invalid server address, please check the AssetProcessorPlatformConfig.setreg file \
-to ensure that the address is correct. Asset Processor won't be running in server mode.");
+                    AZ_Warning(AssetProcessor::ConsoleChannel, false, "Invalid server address, please check the AssetProcessorPlatformConfig.setreg file"
+                        " to ensure that the address is correct. Asset Processor won't be running in server mode.");
                 }
 
                 break;
@@ -713,7 +713,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
         }
 
         // Update Settings Registry with new token
-        AZStd::string azNewAllowedList{ newAllowedList.join(', ').toUtf8().constData() };
+        AZStd::string azNewAllowedList{ newAllowedList.join(',').toUtf8().constData() };
         settingsRegistry->Set(allowedListKey, azNewAllowedList);
 
         return AssetUtilsInternal::DumpAssetProcessorUserSettingsToFile(*settingsRegistry, assetProcessorUserSetregPath);
@@ -804,7 +804,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
             {
                 QThread::msleep(AssetUtilsInternal::g_RetryWaitInterval);
             }
-            
+
         } while (!timer.hasExpired(waitTimeinSeconds * 1000));
 
         AZ_TracePrintf(AssetProcessor::ConsoleChannel, "Failed to create output directory: %s after %d retries.\n", dir.absolutePath().toUtf8().data(), retries);
@@ -1075,7 +1075,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
     {
         // it is assumed that m_fingerprintFilesList contains the original file and all dependencies, and is in a stable order without duplicates
         // CRC32 is not an effective hash for this purpose, so we will build a string and then use SHA1 on it.
-        
+
         // to avoid resizing and copying repeatedly we will keep track of the largest reserved capacity ever needed for this function, and reserve that much data
         static size_t s_largestFingerprintCapacitySoFar = 1;
         AZStd::string fingerprintString;
@@ -1207,7 +1207,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
                 // the navigation system can still be writing to this file when hashing begins, causing the EoF marker to change.
                 AZ::IO::SizeType remainingToRead = AZStd::min(readStream.GetLength() - readStream.GetCurPos(), aznumeric_cast<AZ::IO::SizeType>(AZ_ARRAY_SIZE(buffer)));
                 bytesRead = readStream.Read(remainingToRead, buffer);
-                
+
                 if(bytesReadOut)
                 {
                     *bytesReadOut += bytesRead;
@@ -1234,7 +1234,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
     }
 
     std::uint64_t AdjustTimestamp(QDateTime timestamp)
-    {       
+    {
         timestamp = timestamp.toUTC();
 
         auto timeMilliseconds = timestamp.toMSecsSinceEpoch();
@@ -1250,7 +1250,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
     {
         bool fileFound = false;
         AssetProcessor::FileStateInfo fileStateInfo;
-        
+
         auto* fileStateInterface = AZ::Interface<AssetProcessor::IFileStateRequests>::Get();
         if (fileStateInterface)
         {
@@ -1277,7 +1277,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
             {
                 fileIdentifier = AdjustTimestamp(lastModifiedTime);
             }
-            
+
             // its possible that the dependency has moved to a different file with the same modtime/hash
             // so we add the size of it too.
             // its also possible that it moved to a different file with the same modtime/hash AND size,
@@ -1324,7 +1324,7 @@ to ensure that the address is correct. Asset Processor won't be running in serve
         }
 
         QDir tempRoot;
-        
+
         if (!CreateTempRootFolder(startFolder, tempRoot))
         {
             result.clear();
diff --git a/Code/Tools/AssetProcessor/testdata/DummyProject/AssetProcessorGamePlatformConfig.ini b/Code/Tools/AssetProcessor/testdata/DummyProject/AssetProcessorGamePlatformConfig.ini
deleted file mode 100644
index 0416ea7f85..0000000000
--- a/Code/Tools/AssetProcessor/testdata/DummyProject/AssetProcessorGamePlatformConfig.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-; this is an override config that should "add" the provo platform
-; and "remove" the server platform.
-
-[Platform provo]
-tags=console, renderer
-
-[Platforms]
-server=disabled
-provo=enabled
-
-; this ONLY overrides the "provo" value
-; becuase this is being loaded on top of the defaults, this should LEAVE the others
-; as they are.
-[RC i_caf]
-provo=copy
-
-; this will remove "mov" from the default configuration
-[RC mov]
-ignore=true
diff --git a/Code/Tools/AssetProcessor/testdata/DummyProject/AssetProcessorGamePlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/DummyProject/AssetProcessorGamePlatformConfig.setreg
new file mode 100644
index 0000000000..c9556f0494
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/DummyProject/AssetProcessorGamePlatformConfig.setreg
@@ -0,0 +1,21 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platform provo": {
+                    "tags": "console, renderer"
+                },
+                "Platforms": {
+                    "server": "disabled",
+                    "provo": "enabled"
+                },
+                "RC i_caf": {
+                    "provo": "copy"
+                },
+                "RC mov": {
+                    "ignore": true
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.setreg
new file mode 100644
index 0000000000..17d9887fe8
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.setreg
@@ -0,0 +1,7 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {}
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.ini b/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.ini
deleted file mode 100644
index 874625bf1b..0000000000
--- a/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-; Used by unit tests.  This is a broken configuration file.
-
-[Platform pc]
-tags=tools,renderer
-
-[Platform osx_gl]
-tags=tools,renderer
-
-[Platforms]
-es3=enabled ; note - bad platform - its not one of the above ones!
-
-; without a scan folder, it is an invalid file.
-[ScanFolder Game]
-watch=@PROJECTROOT@
-recursive=1
-order=0
-
-; without at least one recognizer, its not an invalid file.  (this is not what this unit test is checking)
-[RC i_caf]
-glob=*.i_caf
-params=copy
-priority=5 
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..468ab68f5d
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,27 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platform pc": {
+                    "tags": "tools,renderer"
+                },
+                "Platform osx_gl": {
+                    "tags": "tools,renderer"
+                },
+                "Platforms": {
+                    "es3": "enabled"
+                },
+                "ScanFolder Game": {
+                    "watch": "@PROJECTROOT@",
+                    "recursive": 1,
+                    "order": 0
+                },
+                "RC i_caf": {
+                    "glob": "*.i_caf",
+                    "params": "copy",
+                    "priority": 5
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.ini b/Code/Tools/AssetProcessor/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.ini
deleted file mode 100644
index 5b776865a6..0000000000
--- a/Code/Tools/AssetProcessor/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-; Used by unit tests.  This is a broken configuration file.
-
-; without a scan folder, it is an invalid file.
-[ScanFolder Game]
-watch=@PROJECTROOT@
-recursive=1
-order=0
-
-; without at least one recognizer, its an invalid file.
-[RC i_caf]
-glob=*.i_caf
-params=copy
-priority=5 
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..581cef06e9
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/config_broken_noplatform/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,18 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "ScanFolder Game": {
+                    "watch": "@PROJECTROOT@",
+                    "recursive": 1,
+                    "order": 0
+                },
+                "RC i_caf": {
+                    "glob": "*.i_caf",
+                    "params": "copy",
+                    "priority": 5
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.ini b/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.ini
deleted file mode 100644
index 21f722adcd..0000000000
--- a/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-; Used by unit tests.  This is a broken configuration file.
-
-[Platform pc]
-tags=tools,renderer
-
-[Platform osx_gl]
-tags=tools,renderer
-
-; without a scan folder, it is an invalid file.
-
-; without at least one recognizer, its not an invalid file.  (this is not what this unit test is checking)
-[RC i_caf]
-glob=*.i_caf
-params=copy
-priority=5 
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..507fe4afb1
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,19 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platform pc": {
+                    "tags": "tools,renderer"
+                },
+                "Platform osx_gl": {
+                    "tags": "tools,renderer"
+                },
+                "RC i_caf": {
+                    "glob": "*.i_caf",
+                    "params": "copy",
+                    "priority": 5
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.ini b/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.ini
deleted file mode 100644
index 14d95cff5f..0000000000
--- a/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-; Used by unit tests.  This is a broken configuration file.
-
-[Platform pc]
-tags=tools,renderer
-
-[Platform osx_gl]
-tags=tools,renderer
-
-; without a scan folder, it is an invalid file.
-[ScanFolder Game]
-watch=@PROJECTROOT@
-recursive=1
-order=0
-
-; without at least one recognizer, its an invalid file. 
-
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..0e687062b2
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,19 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platform pc": {
+                    "tags": "tools,renderer"
+                },
+                "Platform osx_gl": {
+                    "tags": "tools,renderer"
+                },
+                "ScanFolder Game": {
+                    "watch": "@PROJECTROOT@",
+                    "recursive": 1,
+                    "order": 0
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.ini b/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.ini
deleted file mode 100644
index 77750779cb..0000000000
--- a/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.ini
+++ /dev/null
@@ -1,109 +0,0 @@
-; this is a regular config file that ought to load successfully.
-
-[Platform pc]
-tags=tools,renderer
-
-[Platform es3]
-tags=android,mobile,renderer
-
-[Platform osx_gl]
-tags=tools,renderer
-
-[Platform server]
-tags=server
-
-; for the purposes of this test, we enable only server and es3, but we make sure the CURRENT_PLATFORM is auto enabled.
-
-[Platforms]
-;pc=enabled
-es3=enabled
-;ios=enabled
-;osx_gl=enabled
-;provo=enabled
-server=enabled
-
-; ---- The number of worker jobs, 0 means use the number of Logical Cores
-[Jobs]
-minJobs=1
-maxJobs=0
-
-[MetaDataTypes]
-exportsettings=
-animsettings=i_caf
-Animations/SkeletonList.xml=i_caf
-cbc=abc
-fbx.assetinfo=fbx
-
-[ScanFolder Game]
-watch=@PROJECTROOT@
-; use a special display name here to make sure macros work
-display=@PROJECTROOT@ Scan Folder
-recursive=1
-order=0
-
-; this test makes sure that those macros make sense and are present as well as that order is preserved.
-; it also makes sure that the friendly name ("FeatureTests") is used, if no display is present and does not lose its case.
-[ScanFolder FeatureTests]
-watch=@PROJECTROOT@FeatureTests
-output=featuretestsoutputfolder
-recursive=0
-order=5000
-
-; this test makes sure that the scan folders system uses the portable key of the scan Folder to find duplicates.
-; (which is constructed from its name in the square brackets)
-; instead of other attributes such as the watch folder, or output prefix.
-[ScanFolder FeatureTests2]
-watch=@PROJECTROOT@FeatureTests
-output=featuretestsoutputfolder
-recursive=0
-order=6000
-
-[Exclude HoldFiles]
-pattern=.*\\/Levels\\/.*_hold\\/.*
-
-[Exclude TempFiles]
-pattern=.*\\/\\$tmp[0-9]*_.*
-
-[RC i_caf]
-glob=*.i_caf
-params=defaultparams
-; server should not appear
-server=skip 
-; es3 should have this overridden
-es3=mobile 
-; host should have defaultparams
-; make sure priority is used.
-priority=5
-checkServer=true
-
-[RC caf]
-glob=*.caf
-params=copy
-; all platforms with 'renderer' tag should have these params applied. (so host platform and es3 but not server)
-renderer=rendererparams 
-
-[RC mov]
-glob=*.mov
-params=copy
-; this one proves that platforms override more broader tags (es3 has both the es3 platform and the renderer tag)
-es3=platformspecificoverride
-; hosts should use this
-renderer=rendererparams 
-
-; this tests to make sure that even if "params" is missing, it is assumed to be default operation
-; this is because if you wanted to skip a platform, we have a specific verb for that ('skip') and simply omitting the defaults means
-; that you just want the default behavior. only the platforms indicated have a role
-[RC rend]
-glob=*.rend
-renderer=rendererparams 
-
-; this tests to make sure that even if you have no params at all, it is assumed to be default operation
-[RC alldefault]
-glob=*.alldefault
-
-; this tests to make sure if you set default to skip you can still specify one platform to compile on
-[RC skipallbutone]
-glob=*.files
-params=skip
-server=copy
-
diff --git a/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..1c5c487a46
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,89 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platform pc": {
+                    "tags": "tools,renderer"
+                },
+                "Platform es3": {
+                    "tags": "android,mobile,renderer"
+                },
+                "Platform osx_gl": {
+                    "tags": "tools,renderer"
+                },
+                "Platform server": {
+                    "tags": "server"
+                },
+                "Platforms": {
+                    "es3": "enabled",
+                    "server": "enabled"
+                },
+                "Jobs": {
+                    "minJobs": 1,
+                    "maxJobs": 0
+                },
+                "MetaDataTypes": {
+                    "animsettings": "i_caf",
+                    "Animations/SkeletonList.xml": "i_caf",
+                    "cbc": "abc",
+                    "fbx.assetinfo": "fbx"
+                },
+                "ScanFolder Game": {
+                    "watch": "@PROJECTROOT@",
+                    "display": "@PROJECTROOT@ Scan Folder",
+                    "recursive": 1,
+                    "order": 0
+                },
+                "ScanFolder FeatureTests": {
+                    "watch": "@PROJECTROOT@FeatureTests",
+                    "output": "featuretestsoutputfolder",
+                    "recursive": 0,
+                    "order": 5000
+                },
+                "ScanFolder FeatureTests2": {
+                    "watch": "@PROJECTROOT@FeatureTests",
+                    "output": "featuretestsoutputfolder",
+                    "recursive": 0,
+                    "order": 6000
+                },
+                "Exclude HoldFiles": {
+                    "pattern": ".*\\\\/Levels\\\\/.*_hold\\\\/.*"
+                },
+                "Exclude TempFiles": {
+                    "pattern": ".*\\\\/\\\\$tmp[0-9]*_.*"
+                },
+                "RC i_caf": {
+                    "glob": "*.i_caf",
+                    "params": "defaultparams",
+                    "server": "skip",
+                    "es3": "mobile",
+                    "priority": 5,
+                    "checkServer": true
+                },
+                "RC caf": {
+                    "glob": "*.caf",
+                    "params": "copy",
+                    "renderer": "rendererparams"
+                },
+                "RC mov": {
+                    "glob": "*.mov",
+                    "params": "copy",
+                    "es3": "platformspecificoverride",
+                    "renderer": "rendererparams"
+                },
+                "RC rend": {
+                    "glob": "*.rend",
+                    "renderer": "rendererparams"
+                },
+                "RC alldefault": {
+                    "glob": "*.alldefault"
+                },
+                "RC skipallbutone": {
+                    "glob": "*.files",
+                    "params": "skip",
+                    "server": "copy"
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.ini b/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.ini
deleted file mode 100644
index c210c23d0d..0000000000
--- a/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.ini
+++ /dev/null
@@ -1,129 +0,0 @@
-; this is a regular config file that ought to load successfully.
-
-[Platform pc]
-tags=tools,renderer
-
-[Platform es3]
-tags=android,mobile,renderer
-
-[Platform ios]
-tags=mobile,renderer
-
-[Platform osx_gl]
-tags=tools,renderer
-
-[Platform server]
-tags=server
-
-; we define an test platform in order to make sure that it does NOT show up anywhere
-[Platform test]
-tags=console,renderer
-
-; for the purposes of this test, we enable only server and es3, but we make sure the CURRENT_PLATFORM is auto enabled.
-
-[Platforms]
-;pc=enabled
-es3=enabled
-ios=enabled
-;osx_gl=enabled
-;test=enabled
-server=enabled
-
-; ---- The number of worker jobs, 0 means use the number of Logical Cores
-[Jobs]
-minJobs=1
-maxJobs=0
-
-[MetaDataTypes]
-exportsettings=
-animsettings=i_caf
-Animations/SkeletonList.xml=i_caf
-cbc=abc
-fbx.assetinfo=fbx
-
-[ScanFolder Game]
-watch=@PROJECTROOT@
-display=gameoutput
-recursive=1
-order=0
-
-[ScanFolder Editor]
-watch=@ENGINEROOT@/Editor
-display=editoroutput
-recursive=1
-order=30000
-include=tools,renderer
-exclude=ios
-
-[ScanFolder Folder1]
-watch=@ENGINEROOT@/Folder1
-display=folder1output
-recursive=1
-order=50000
-include=es3
-
-[ScanFolder Folder2]
-watch=@ENGINEROOT@/Folder2
-display=folder2output
-recursive=1
-order=60000
-exclude=es3
-
-[ScanFolder Folder3]
-watch=@ENGINEROOT@/Folder3
-display=folder3output
-recursive=1
-order=70000
-include=test
-
-
-
-[Exclude HoldFiles]
-pattern=.*\\/Levels\\/.*_hold\\/.*
-
-[Exclude TempFiles]
-pattern=.*\\/\\$tmp[0-9]*_.*
-
-[RC i_caf]
-glob=*.i_caf
-params=defaultparams
-; server should not appear
-server=skip 
-; es3 should have this overridden
-es3=mobile 
-test=copy
-; host should have defaultparams
-; make sure priority is used.
-priority=5  
-
-[RC caf]
-glob=*.caf
-params=copy
-; all platforms with 'renderer' tag should have these params applied. (so host platform and es3 but not server)
-renderer=rendererparams 
-
-[RC mov]
-glob=*.mov
-params=copy
-; this one proves that platforms override more broader tags (es3 has both the es3 platform and the renderer tag)
-es3=platformspecificoverride
-; hosts should use this
-renderer=rendererparams 
-
-; this tests to make sure that even if "params" is missing, it is assumed to be default operation
-; this is because if you wanted to skip a platform, we have a specific verb for that ('skip') and simply omitting the defaults means
-; that you just want the default behavior. only the platforms indicated have a role
-[RC rend]
-glob=*.rend
-renderer=rendererparams 
-
-; this tests to make sure that even if you have no params at all, it is assumed to be default operation
-[RC alldefault]
-glob=*.alldefault
-
-; this tests to make sure if you set default to skip you can still specify one platform to compile on
-[RC skipallbutone]
-glob=*.files
-params=skip
-server=copy
-
diff --git a/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..e1c2d6e8cc
--- /dev/null
+++ b/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,113 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platform pc": {
+                    "tags": "tools,renderer"
+                },
+                "Platform es3": {
+                    "tags": "android,mobile,renderer"
+                },
+                "Platform ios": {
+                    "tags": "mobile,renderer"
+                },
+                "Platform osx_gl": {
+                    "tags": "tools,renderer"
+                },
+                "Platform server": {
+                    "tags": "server"
+                },
+                "Platform test": {
+                    "tags": "console,renderer"
+                },
+                "Platforms": {
+                    "es3": "enabled",
+                    "ios": "enabled",
+                    "server": "enabled"
+                },
+                "Jobs": {
+                    "minJobs": 1,
+                    "maxJobs": 0
+                },
+                "MetaDataTypes": {
+                    "animsettings": "i_caf",
+                    "Animations/SkeletonList.xml": "i_caf",
+                    "cbc": "abc",
+                    "fbx.assetinfo": "fbx"
+                },
+                "ScanFolder Game": {
+                    "watch": "@PROJECTROOT@",
+                    "display": "gameoutput",
+                    "recursive": 1,
+                    "order": 0
+                },
+                "ScanFolder Editor": {
+                    "watch": "@ENGINEROOT@/Editor",
+                    "display": "editoroutput",
+                    "recursive": 1,
+                    "order": 30000,
+                    "include": "tools,renderer",
+                    "exclude": "ios"
+                },
+                "ScanFolder Folder1": {
+                    "watch": "@ENGINEROOT@/Folder1",
+                    "display": "folder1output",
+                    "recursive": 1,
+                    "order": 50000,
+                    "include": "es3"
+                },
+                "ScanFolder Folder2": {
+                    "watch": "@ENGINEROOT@/Folder2",
+                    "display": "folder2output",
+                    "recursive": 1,
+                    "order": 60000,
+                    "exclude": "es3"
+                },
+                "ScanFolder Folder3": {
+                    "watch": "@ENGINEROOT@/Folder3",
+                    "display": "folder3output",
+                    "recursive": 1,
+                    "order": 70000,
+                    "include": "test"
+                },
+                "Exclude HoldFiles": {
+                    "pattern": ".*\\\\/Levels\\\\/.*_hold\\\\/.*"
+                },
+                "Exclude TempFiles": {
+                    "pattern": ".*\\\\/\\\\$tmp[0-9]*_.*"
+                },
+                "RC i_caf": {
+                    "glob": "*.i_caf",
+                    "params": "defaultparams",
+                    "server": "skip",
+                    "es3": "mobile",
+                    "test": "copy",
+                    "priority": 5
+                },
+                "RC caf": {
+                    "glob": "*.caf",
+                    "params": "copy",
+                    "renderer": "rendererparams"
+                },
+                "RC mov": {
+                    "glob": "*.mov",
+                    "params": "copy",
+                    "es3": "platformspecificoverride",
+                    "renderer": "rendererparams"
+                },
+                "RC rend": {
+                    "glob": "*.rend",
+                    "renderer": "rendererparams"
+                },
+                "RC alldefault": {
+                    "glob": "*.alldefault"
+                },
+                "RC skipallbutone": {
+                    "glob": "*.files",
+                    "params": "skip",
+                    "server": "copy"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Code/Tools/CMakeLists.txt b/Code/Tools/CMakeLists.txt
index 8fa7d3868a..db5476756b 100644
--- a/Code/Tools/CMakeLists.txt
+++ b/Code/Tools/CMakeLists.txt
@@ -13,19 +13,16 @@ add_subdirectory(SceneAPI) # Needs to go before AssetProcessor since it provides
 add_subdirectory(AssetProcessor)
 add_subdirectory(AWSNativeSDKInit)
 add_subdirectory(AzTestRunner)
+add_subdirectory(CrashHandler)
 add_subdirectory(CryCommonTools)
 add_subdirectory(CryXML)
-add_subdirectory(HLSLCrossCompiler)
-add_subdirectory(HLSLCrossCompilerMETAL)
 add_subdirectory(News)
 add_subdirectory(PythonBindingsExample)
-add_subdirectory(RC)
 add_subdirectory(RemoteConsole)
-add_subdirectory(CrashHandler)
-add_subdirectory(ShaderCacheGen)
 add_subdirectory(DeltaCataloger)
 add_subdirectory(SerializeContextTools)
 add_subdirectory(AssetBundler)
 add_subdirectory(GridHub)
 add_subdirectory(Standalone)
 add_subdirectory(TestImpactFramework)
+add_subdirectory(ProjectManager)
diff --git a/Code/Tools/CrashHandler/CMakeLists.txt b/Code/Tools/CrashHandler/CMakeLists.txt
index 7c8229b8a4..ec41ef7c9e 100644
--- a/Code/Tools/CrashHandler/CMakeLists.txt
+++ b/Code/Tools/CrashHandler/CMakeLists.txt
@@ -32,11 +32,11 @@ ly_add_target(
         PRIVATE
             ${pal_dir}
     BUILD_DEPENDENCIES
+        PUBLIC
+            AZ::CrashSupport
         PRIVATE
             3rdParty::Crashpad
-            AZ::AzCore
             AZ::AzFramework
-            AZ::CrashSupport
 )
 
 string(REPLACE "." ";" version_list "${LY_VERSION_STRING}")
@@ -67,11 +67,9 @@ ly_add_target(
         PRIVATE
             Uploader/include/Uploader
     BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-            AZ::CrashSupport
         PUBLIC
             3rdParty::Crashpad::Handler
+            AZ::CrashSupport
 )
 
 add_subdirectory(Tools)
diff --git a/Code/Tools/CrashHandler/Support/CMakeLists.txt b/Code/Tools/CrashHandler/Support/CMakeLists.txt
index 2445b50db5..c67be28949 100644
--- a/Code/Tools/CrashHandler/Support/CMakeLists.txt
+++ b/Code/Tools/CrashHandler/Support/CMakeLists.txt
@@ -19,6 +19,6 @@ ly_add_target(
         PUBLIC
             include
     BUILD_DEPENDENCIES
-        PRIVATE
+        PUBLIC
             AZ::AzCore
 )
diff --git a/Code/Tools/CrashHandler/Tools/CMakeLists.txt b/Code/Tools/CrashHandler/Tools/CMakeLists.txt
index 390ff7b07d..d8e29ccbed 100644
--- a/Code/Tools/CrashHandler/Tools/CMakeLists.txt
+++ b/Code/Tools/CrashHandler/Tools/CMakeLists.txt
@@ -21,13 +21,13 @@ ly_add_target(
         tools_crash_handler_files.cmake
         Platform/${PAL_PLATFORM_NAME}/tools_crash_handler_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
-        PRIVATE
+        PUBLIC
             .
     BUILD_DEPENDENCIES
+        PUBLIC
+            AZ::CrashHandler
         PRIVATE
             3rdParty::Qt::Core
-            AZ::CrashHandler
-            AZ::CrashSupport
             AZ::AzToolsFramework
 )
 
@@ -41,18 +41,14 @@ ly_add_target(
         Platform/${PAL_PLATFORM_NAME}/tools_crash_uploader_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
         PRIVATE
-            .
             Uploader
     BUILD_DEPENDENCIES
         PRIVATE
             3rdParty::Qt::Core
             3rdParty::Qt::Gui
             3rdParty::Qt::Widgets
-            3rdParty::Crashpad
-            3rdParty::Crashpad::Handler
             AZ::CrashUploaderSupport
             AZ::AzQtComponents
-            AZ::CrashSupport
     TARGET_PROPERTIES
         Qt5_NO_LINK_QTMAIN TRUE
 )
diff --git a/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp b/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp
index 77c49ad910..57cbfa3369 100644
--- a/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp
+++ b/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp
@@ -138,7 +138,7 @@ namespace O3de
             if (!logFileReader->Open(thisFile))
             {
 #if defined(AZ_PLATFORM_WINDOWS)
-                LOG(ERROR) << "Failed to open " << base::UTF16ToUTF8(thisFile.BaseName().value());
+                LOG(ERROR) << "Failed to open " << base::WideToUTF8(thisFile.BaseName().value());
 #else
                 LOG(ERROR) << "Failed to open " << thisFile.BaseName().value();
 #endif
@@ -149,7 +149,7 @@ namespace O3de
             if (start_offset < 0)
             {
 #if defined(AZ_PLATFORM_WINDOWS)
-                LOG(ERROR) << "Failed to get offset for " << base::UTF16ToUTF8(thisFile.BaseName().value());
+                LOG(ERROR) << "Failed to get offset for " << base::WideToUTF8(thisFile.BaseName().value());
 #else
                 LOG(ERROR) << "Failed to get offset for " << thisFile.BaseName().value();
 #endif
@@ -162,7 +162,7 @@ namespace O3de
 
             std::string fileNameKey{ "attachment_" };
 #if defined(AZ_PLATFORM_WINDOWS)
-            fileNameKey += base::UTF16ToUTF8(thisFile.BaseName().value());
+            fileNameKey += base::WideToUTF8(thisFile.BaseName().value());
 #else
             fileNameKey += thisFile.BaseName().value();
 #endif
diff --git a/Code/Tools/CryFXC/cryfxc.sln b/Code/Tools/CryFXC/cryfxc.sln
deleted file mode 100644
index 26c5dc4e6d..0000000000
--- a/Code/Tools/CryFXC/cryfxc.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryfxc", "cryfxc\cryfxc.vcxproj", "{A505D345-D712-4C80-8BDE-6FBC08A390D8}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Debug|Win32.Build.0 = Debug|Win32
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Debug|x64.ActiveCfg = Debug|x64
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Debug|x64.Build.0 = Debug|x64
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Release|Win32.ActiveCfg = Release|Win32
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Release|Win32.Build.0 = Release|Win32
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Release|x64.ActiveCfg = Release|x64
-		{A505D345-D712-4C80-8BDE-6FBC08A390D8}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Code/Tools/CryFXC/cryfxc/cryfxc.cpp b/Code/Tools/CryFXC/cryfxc/cryfxc.cpp
deleted file mode 100644
index 0d7e3435dd..0000000000
--- a/Code/Tools/CryFXC/cryfxc/cryfxc.cpp
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "stdafx.h"
-
-#pragma comment(lib, "D3Dcompiler.lib")
-
-#define CRYFXC_VER "1.01"
-
-
-enum SwitchType
-{
-    FXC_E, FXC_T, FXC_Help, FXC_CmdOptFile, FXC_Cc, FXC_Compress, FXC_D, FXC_Decompress, FXC_Fc,
-    FXC_Fh, FXC_Fo, FXC_Fx, FXC_P, FXC_Gch, FXC_Gdp, FXC_Gec, FXC_Ges, FXC_Gfa, FXC_Gfp, FXC_Gis,
-    FXC_Gpp, FXC_I, FXC_LD, FXC_Ni, FXC_NoLogo, FXC_Od, FXC_Op, FXC_O0, FXC_O1, FXC_O2, FXC_O3,
-    FXC_Vd, FXC_Vi, FXC_Vn, FXC_Zi, FXC_Zpc, FXC_Zpr,
-
-    FXC_NumArgs
-};
-
-
-struct SwitchEntry
-{
-    SwitchType type;
-    const char* text;
-    bool hasValue;
-    bool supported;
-};
-
-
-const static SwitchEntry s_switchEntries[] =
-{
-    {FXC_E, "/E", 1, true},
-    {FXC_T, "/T", 1, true},
-    {FXC_Fh, "/Fh", 1, true},
-    {FXC_Fo, "/Fo", 1, true},
-
-    {FXC_Gec, "/Gec", 0, true},
-    {FXC_Ges, "/Ges", 0, true},
-    {FXC_Gfa, "/Gfa", 0, true},
-    {FXC_Gfp, "/Gfp", 0, true},
-    {FXC_Gis, "/Gis", 0, true},
-    {FXC_Gpp, "/Gpp", 0, true},
-    {FXC_Od, "/Od", 0, true},
-    {FXC_O0, "/O0", 0, true},
-    {FXC_O1, "/O1", 0, true},
-    {FXC_O2, "/O2", 0, true},
-    {FXC_O3, "/O3", 0, true},
-    {FXC_Op, "/Op", 0, true},
-    {FXC_Vd, "/Vd", 0, true},
-    {FXC_Vn, "/Vn", 1, true},
-    {FXC_Zi, "/Zi", 0, true},
-    {FXC_Zpc, "/Zpc", 0, true},
-    {FXC_Zpr, "/Zpr", 0, true},
-    {FXC_NoLogo, "/nologo", 0, true},
-
-    {FXC_Help, "/?", 0, false},
-    {FXC_Help, "/help", 0, false},
-    {FXC_Cc, "/Cc", 0, false},
-    {FXC_Compress, "/compress", 0, false},
-    {FXC_D, "/D", 1, false},
-    {FXC_Decompress, "/decompress", 0, false},
-    {FXC_Fc, "/Fc", 1, false},
-    {FXC_Fx, "/Fx", 1, false},
-    {FXC_P, "/P", 1, false},
-    {FXC_Gch, "/Gch", 0, false},
-    {FXC_Gdp, "/Gdp", 0, false},
-    {FXC_I, "/I", 1, false},
-    {FXC_LD, "/LD", 0, false},
-    {FXC_Ni, "/Ni", 0, false},
-    {FXC_Vi, "/Vi", 0, false}
-};
-
-
-bool IsSwitch(const char* p)
-{
-    assert(p);
-    return *p == '/' || *p == '@';
-}
-
-
-const SwitchEntry* GetSwitch(const char* p)
-{
-    assert(p);
-    for (size_t i = 0; i < sizeof(s_switchEntries) / sizeof(s_switchEntries[0]); ++i)
-    {
-        if (_stricmp(s_switchEntries[i].text, p) == 0)
-        {
-            return &s_switchEntries[i];
-        }
-    }
-
-    if (*p == '@')
-    {
-        const static SwitchEntry sw = {FXC_CmdOptFile, "@", 0, false};
-        return &sw;
-    }
-
-    return 0;
-}
-
-
-struct ParserResults
-{
-    const char* pProfile;
-    const char* pEntry;
-    const char* pOutFile;
-    const char* pInFile;
-    const char* pHeaderVariableName;
-    unsigned int compilerFlags;
-    bool disassemble;
-
-    void Init()
-    {
-        pProfile = 0;
-        pEntry = 0;
-        pOutFile = 0;
-        pInFile = 0;
-        pHeaderVariableName = 0;
-        compilerFlags = 0;
-        disassemble = false;
-    }
-};
-
-
-bool ParseCommandLine(const char* const* args, size_t numargs, ParserResults& parserRes)
-{
-    parserRes.Init();
-
-    if (numargs < 4)
-    {
-        fprintf(stderr, "Failed to specify all required arguments: infile, outfile, profile and entry point\n");
-        return false;
-    }
-
-    for (size_t i = 1; i < numargs; ++i)
-    {
-        if (IsSwitch(args[i]))
-        {
-            const SwitchEntry* sw = GetSwitch(args[i]);
-            if (!sw)
-            {
-                fprintf(stderr, "Unknown switch: %s\n", args[i]);
-                return false;
-            }
-
-            if (!sw->supported)
-            {
-                fprintf(stderr, "Unsupported switch: %s\n", sw->text);
-                return false;
-            }
-
-            if (sw->hasValue)
-            {
-                if (i + 1 == numargs || IsSwitch(args[i + 1]))
-                {
-                    fprintf(stderr, "Missing value for switch: %s\n", sw->text);
-                    return false;
-                }
-
-                const char* pValue = args[i + 1];
-                switch (sw->type)
-                {
-                case FXC_E:
-                    parserRes.pEntry = pValue;
-                    break;
-                case FXC_T:
-                    parserRes.pProfile = pValue;
-                    break;
-                case FXC_Fh:
-                    parserRes.pOutFile = pValue;
-                    parserRes.disassemble = true;
-                    break;
-                case FXC_Fo:
-                    parserRes.pOutFile = pValue;
-                    break;
-                case FXC_Vn:
-                    parserRes.pHeaderVariableName = pValue;
-                    break;
-                default:
-                    fprintf(stderr, "Failed assigning switch: %s | value: %s\n", sw->text, pValue);
-                    return false;
-                }
-
-                ++i;
-            }
-            else
-            {
-                switch (sw->type)
-                {
-                case FXC_Gec:
-                    parserRes.compilerFlags |= D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY;
-                    break;
-                case FXC_Od:
-                    parserRes.compilerFlags |= D3D10_SHADER_SKIP_OPTIMIZATION;
-                    break;
-                case FXC_O0:
-                    parserRes.compilerFlags |= D3D10_SHADER_OPTIMIZATION_LEVEL0;
-                    break;
-                case FXC_O1:
-                    parserRes.compilerFlags |= D3D10_SHADER_OPTIMIZATION_LEVEL1;
-                    break;
-                case FXC_O2:
-                    parserRes.compilerFlags |= D3D10_SHADER_OPTIMIZATION_LEVEL2;
-                    break;
-                case FXC_O3:
-                    parserRes.compilerFlags |= D3D10_SHADER_OPTIMIZATION_LEVEL3;
-                    break;
-                case FXC_Zi:
-                    parserRes.compilerFlags |= D3D10_SHADER_DEBUG;
-                    break;
-                case FXC_Zpc:
-                    parserRes.compilerFlags |= D3D10_SHADER_PACK_MATRIX_COLUMN_MAJOR;
-                    break;
-                case FXC_Zpr:
-                    parserRes.compilerFlags |= D3D10_SHADER_PACK_MATRIX_ROW_MAJOR;
-                    break;
-                case FXC_Ges:
-                    parserRes.compilerFlags |= D3D10_SHADER_ENABLE_STRICTNESS;
-                    break;
-                case FXC_Gfa:
-                    parserRes.compilerFlags |= D3D10_SHADER_AVOID_FLOW_CONTROL;
-                    break;
-                case FXC_Gfp:
-                    parserRes.compilerFlags |= D3D10_SHADER_PREFER_FLOW_CONTROL;
-                    break;
-                case FXC_Gis:
-                    parserRes.compilerFlags |= D3D10_SHADER_IEEE_STRICTNESS;
-                    break;
-                case FXC_Gpp:
-                    parserRes.compilerFlags |= D3D10_SHADER_PARTIAL_PRECISION;
-                    break;
-                case FXC_Op:
-                    parserRes.compilerFlags |= D3D10_SHADER_NO_PRESHADER;
-                    break;
-                case FXC_Vd:
-                    parserRes.compilerFlags |= D3D10_SHADER_SKIP_VALIDATION;
-                    break;
-                case FXC_NoLogo:
-                    break;
-                default:
-                    fprintf(stderr, "Failed assigning switch: %s\n", sw->text);
-                    return false;
-                }
-            }
-        }
-        else if (i == numargs - 1)
-        {
-            parserRes.pInFile = args[i];
-        }
-        else
-        {
-            fprintf(stderr, "Error in command line at token: %s\n", args[i]);
-            return false;
-        }
-    }
-
-    const bool successful = parserRes.pProfile && parserRes.pEntry && parserRes.pInFile && parserRes.pOutFile;
-    if (!successful)
-    {
-        fprintf(stderr, "Failed to specify all required arguments: infile, outfile, profile and entry point\n");
-    }
-
-    return successful;
-}
-
-
-bool ReadInFile(const char* pInFile, std::vector<char>& data)
-{
-    if (!pInFile)
-    {
-        return false;
-    }
-
-    bool read = false;
-
-    FILE* fin = 0;
-    fopen_s(&fin, pInFile, "rb");
-    if (fin)
-    {
-        fseek(fin, 0, SEEK_END);
-        const long l = ftell(fin);
-        if (l >= 0)
-        {
-            fseek(fin, 0, SEEK_SET);
-            const size_t len = l > 0 ? (size_t) l : 0;
-            data.resize(len);
-            fread(&data[0], 1, len, fin);
-            read = true;
-        }
-
-        fclose(fin);
-    }
-
-    return read;
-}
-
-
-bool WriteByteCode(const char* pFileName, const void* pCode, size_t codeSize)
-{
-    if (!pFileName || !pCode && codeSize)
-    {
-        return false;
-    }
-
-    bool written = false;
-
-    FILE* fout = 0;
-    fopen_s(&fout, pFileName, "wb");
-    if (fout)
-    {
-        fwrite(pCode, 1, codeSize, fout);
-        fclose(fout);
-        written = true;
-    }
-
-    return written;
-}
-
-
-bool WriteHexListing(const char* pFileName, const char* pHdrVarName, const char* pDisassembly, const void* pCode, size_t codeSize)
-{
-    if (!pFileName || !pHdrVarName || !pDisassembly || !pCode && codeSize)
-    {
-        return false;
-    }
-
-    bool written = false;
-
-    FILE* fout = 0;
-    fopen_s(&fout, pFileName, "w");
-    if (fout)
-    {
-        fprintf(fout, "#if 0\n%s#endif\n\n", pDisassembly);
-        fprintf(fout, "const BYTE g_%s[] = \n{", pHdrVarName);
-
-        const size_t blockSize = 6;
-        const size_t numBlocks = codeSize / blockSize;
-
-        const unsigned char* p = (const unsigned char*) pCode;
-
-        size_t i = 0;
-        for (; i < numBlocks * blockSize; i += blockSize)
-        {
-            fprintf(fout, "\n    %3d, %3d, %3d, %3d, %3d, %3d", p[i], p[i + 1], p[i + 2], p[i + 3], p[i + 4], p[i + 5]);
-            if (i + blockSize < codeSize)
-            {
-                fprintf(fout, ",");
-            }
-        }
-
-        if (i < codeSize)
-        {
-            fprintf(fout, "\n    ");
-
-            for (; i < codeSize; ++i)
-            {
-                fprintf(fout, "%3d", p[i]);
-                if (i < codeSize - 1)
-                {
-                    fprintf(fout, ", ");
-                }
-            }
-        }
-
-        fprintf(fout, "\n};\n");
-
-        fclose(fout);
-        written = true;
-    }
-
-    return written;
-}
-
-
-void DisplayInfo()
-{
-    fprintf(stdout, "FXC stub for remote shader compile server\n(C) 2012 Crytek. All rights reserved.\n\nVersion "CRYFXC_VER " for %d bit, linked against D3DCompiler_%d.dll\n\n", sizeof(void*) * 8, D3DX11_SDK_VERSION);
-    fprintf(stdout, "Syntax: fxc SwitchOptions Filename\n\n");
-    fprintf(stdout, "Supported switches: ");
-
-    bool firstSw = true;
-    for (size_t i = 0; i < sizeof(s_switchEntries) / sizeof(s_switchEntries[0]); ++i)
-    {
-        if (s_switchEntries[i].supported)
-        {
-            fprintf(stdout, "%s%s", firstSw ? "" : ", ", s_switchEntries[i].text);
-            firstSw = false;
-        }
-    }
-
-    fprintf(stdout, "\n");
-}
-
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-    if (argc == 1)
-    {
-        DisplayInfo();
-        return 0;
-    }
-
-    ParserResults parserRes;
-    if (!ParseCommandLine(argv, argc, parserRes))
-    {
-        return 1;
-    }
-
-    std::vector<char> program;
-    if (!ReadInFile(parserRes.pInFile, program))
-    {
-        fprintf(stderr, "Failed to read input file: %s\n", parserRes.pInFile);
-        return 1;
-    }
-
-    ID3D10Blob* pShader = 0;
-    ID3D10Blob* pErr = 0;
-
-    bool successful = SUCCEEDED(D3DCompile(&program[0], program.size(), parserRes.pInFile, 0, 0, parserRes.pEntry, parserRes.pProfile, parserRes.compilerFlags, 0, &pShader, &pErr)) && pShader;
-
-    if (successful)
-    {
-        const unsigned char* pCode = (unsigned char*) pShader->GetBufferPointer();
-        const size_t codeSize = pShader->GetBufferSize();
-
-        if (!parserRes.disassemble)
-        {
-            successful = WriteByteCode(parserRes.pOutFile, pCode, codeSize);
-            if (!successful)
-            {
-                fprintf(stderr, "Failed to write output file: %s\n", parserRes.pOutFile);
-            }
-        }
-        else
-        {
-            ID3D10Blob* pDisassembled = 0;
-            successful = SUCCEEDED(D3DDisassemble(pCode, codeSize, 0, 0, &pDisassembled)) && pDisassembled;
-
-            if (successful)
-            {
-                const char* pDisassembly = (char*) pDisassembled->GetBufferPointer();
-                const char* pHdrVarName = parserRes.pHeaderVariableName ? parserRes.pHeaderVariableName : parserRes.pEntry;
-                successful = WriteHexListing(parserRes.pOutFile, pHdrVarName, pDisassembly, pCode, codeSize);
-                if (!successful)
-                {
-                    fprintf(stderr, "Failed to write output file: %s\n", parserRes.pOutFile);
-                }
-            }
-            else
-            {
-                fprintf(stderr, "Failed to disassemble shader code\n", parserRes.pOutFile);
-            }
-
-            if (pDisassembled)
-            {
-                pDisassembled->Release();
-                pDisassembled = 0;
-            }
-        }
-    }
-    else
-    {
-        if (pErr)
-        {
-            const char* pMsg = (const char*) pErr->GetBufferPointer();
-            fprintf(stderr, "%s\n", pMsg);
-        }
-    }
-
-    if (pShader)
-    {
-        pShader->Release();
-        pShader = 0;
-    }
-
-    if (pErr)
-    {
-        pErr->Release();
-        pErr = 0;
-    }
-
-    return successful ? 0 : 1;
-}
diff --git a/Code/Tools/CryFXC/cryfxc/cryfxc.vcxproj b/Code/Tools/CryFXC/cryfxc/cryfxc.vcxproj
deleted file mode 100644
index f995e69e2e..0000000000
--- a/Code/Tools/CryFXC/cryfxc/cryfxc.vcxproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A505D345-D712-4C80-8BDE-6FBC08A390D8}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>cryfxc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cryfxc.cpp" />
-    <ClCompile Include="StdAfx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/Code/Tools/CryFXC/cryfxc/stdafx.cpp b/Code/Tools/CryFXC/cryfxc/stdafx.cpp
deleted file mode 100644
index 209929990b..0000000000
--- a/Code/Tools/CryFXC/cryfxc/stdafx.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "stdafx.h"
diff --git a/Code/Tools/CryFXC/cryfxc/stdafx.h b/Code/Tools/CryFXC/cryfxc/stdafx.h
deleted file mode 100644
index 698d14574b..0000000000
--- a/Code/Tools/CryFXC/cryfxc/stdafx.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "targetver.h"
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include <stdio.h>
-#include <tchar.h>
-#include <string.h>
-#include <assert.h>
-
-#include <vector>
-
-#include <D3DX11.h>
-#include <D3Dcompiler.h>
diff --git a/Code/Tools/CryFXC/cryfxc/targetver.h b/Code/Tools/CryFXC/cryfxc/targetver.h
deleted file mode 100644
index d139ba1901..0000000000
--- a/Code/Tools/CryFXC/cryfxc/targetver.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <SDKDDKVer.h>
diff --git a/Code/Tools/HLSLCrossCompiler/CMakeLists.txt b/Code/Tools/HLSLCrossCompiler/CMakeLists.txt
deleted file mode 100644
index 3b60e715a8..0000000000
--- a/Code/Tools/HLSLCrossCompiler/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_target(
-    NAME HLSLcc.Headers HEADERONLY
-    NAMESPACE AZ
-    FILES_CMAKE
-        hlslcc_header_files.cmake
-    INCLUDE_DIRECTORIES
-        INTERFACE
-            include
-)
-
-if (NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME HLSLcc EXECUTABLE
-    NAMESPACE AZ
-    OUTPUT_SUBDIRECTORY Compiler/PCGL/V006
-    FILES_CMAKE
-        hlslcc_files.cmake
-    PLATFORM_INCLUDE_FILES
-        Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            src
-            src/cbstring
-            offline/cjson
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-        PUBLIC
-            AZ::HLSLcc.Headers
-)
-ly_add_source_properties(
-    SOURCES
-        offline/compilerStandalone.cpp
-        offline/cjson/cJSON.c
-        src/toGLSL.c
-        src/toGLSLDeclaration.c
-        src/cbstring/bstrlib.c
-        src/cbstring/bstraux.c
-        src/reflect.c
-        src/amazon_changes.c
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES _CRT_SECURE_NO_WARNINGS
-)
diff --git a/Code/Tools/HLSLCrossCompiler/Platform/Linux/platform_linux.cmake b/Code/Tools/HLSLCrossCompiler/Platform/Linux/platform_linux.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/Tools/HLSLCrossCompiler/Platform/Linux/platform_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/Tools/HLSLCrossCompiler/Platform/Mac/platform_mac.cmake b/Code/Tools/HLSLCrossCompiler/Platform/Mac/platform_mac.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/Tools/HLSLCrossCompiler/Platform/Mac/platform_mac.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/Tools/HLSLCrossCompiler/Platform/Windows/platform_windows.cmake b/Code/Tools/HLSLCrossCompiler/Platform/Windows/platform_windows.cmake
deleted file mode 100644
index 926c831fb9..0000000000
--- a/Code/Tools/HLSLCrossCompiler/Platform/Windows/platform_windows.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-file(TO_CMAKE_PATH "$ENV{ProgramFiles\(x86\)}" program_files_path)
-
-ly_add_target_files(
-    TARGETS HLSLcc
-    FILES
-        "${program_files_path}/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64/d3dcompiler_47.dll"
-)
diff --git a/Code/Tools/HLSLCrossCompiler/README b/Code/Tools/HLSLCrossCompiler/README
deleted file mode 100644
index 2f1dd1f966..0000000000
--- a/Code/Tools/HLSLCrossCompiler/README
+++ /dev/null
@@ -1,71 +0,0 @@
-Overview:
-  This is a modified version of https://github.com/James-Jones/HLSLCrossCompiler
-  
-  It can be used either:
-  1. As an executable.
-     This is the default use case for release builds
-     This is run by the RemoteShaderCompiler when compiling the shaders for the GL4 and GLES3 platforms.
-  2. As a static library.
-     This is used by the DXGL translation layer if compiled with DXGL_USE_GLSL set to 0.
-     In this case DXGL translation layer to translate DirectX shader model 5 bytecode coming from the renderer front end (runtime translation).
-
-Editing:
-  When modifying the source code, in order to use the updated version in the engine, you will have to recompile the library.
-  To do this, please follow these steps:
-  
-  A. Edit /Code/Tools/HLSLCrossCompiler/bin/mk/rsc_version.txt and bump the version string.
-     Please use the format for released branches and main:
-       V[3_decimal_digits_version_number]
-     and optionally for development branches:
-       V[3_decimal_digits_version_number]_[custom_version_label]
-
-  B. From a Windows machine:
-       Verify that the following folders and the contained files are writeable (checkout if needed):
-         - /Code/Tools/HLSLCrossCompiler/bin
-         - /Code/Tools/HLSLCrossCompiler/lib
-         - /Tools/RemoteShaderCompiler/Compiler/PCGL
-       Run:
-         /Code/Tools/HLSLCrossCompiler/mk/build_win_all.py
-       Note:
-         This will compile:
-           - The static library (2) for win32 and win64 in release
-           - The executable (1) with the PORTABLE define enabled (required to run from machines without Direct3D runtime, such ass the RSC servers)
-             for win64 release in and place it in /Tools/RemoteShaderCompiler/Compiler/PCGL/[rsc_version]/
-
-  C. From a Linux machine:
-       Verify that the following folder and the contained files are writeable (checkout if needed):
-         - /Code/Tools/HLSLCrossCompiler/lib
-       Run:
-         /Code/Tools/HLSLCrossCompiler/mk/build_linux_all.py
-       Note:
-         This will compile:
-           - The static library (2) for linux (64 bit) in release
-           - The static library (2) for android (android-armeabi-v7a) in release
-
-  D. Edit:
-      /Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.cpp
-     and update the two command lines in CShaderMan::mfGetShaderCompileFlags:
-      const char* pCompilerGL4="PCGL/[rsc_version]/HLSLcc.exe [generic_gl4_flags ...]";
-      const char* pCompilerGLES3="PCGL/[rsc_version]/HLSLcc.exe [generic_gles3_flags ...]";
-     with the rsc_version string chosen.
-
-  E. Edit:
-      /Code/CryEngine/RenderDll/Common/Shaders/Shader.h
-     and bump by one minor decimal unit:
-      #define FX_CACHE_VER       [major_decimal_digit_0].[minor_decimal_digit_0]
-     Note:
-       This is required to flush cached shaders generated with the previous versions that might be stored
-       in ShaderCache.pak or in a user cache folder.
-
-Submitting:
-  Before submitting any change to HLSLCrossCompiler source code, please 
-  make sure to do so together with the updated:
-    /Code/Tools/HLSLCrossCompiler/bin/mk/rsc_version.txt
-    /Code/Tools/HLSLCrossCompiler/lib/win64/libHLSLcc.lib
-    /Code/Tools/HLSLCrossCompiler/lib/win32/libHLSLcc.lib
-    /Code/Tools/HLSLCrossCompiler/lib/linux/libHLSLcc.a
-    /Code/Tools/HLSLCrossCompiler/lib/android-armeabi-v7a/libHLSLcc.a
-    /Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.cpp
-    /Code/CryEngine/RenderDll/Common/Shaders/Shader.h
-    /Tools/RemoteShaderCompiler/Compiler/PCGL/[rsc_version]/HLSLcc.exe
-  This will make sure there is no mismatch between any cached shaders, and remotely or locally compiled shaders.
diff --git a/Code/Tools/HLSLCrossCompiler/hlslcc_files.cmake b/Code/Tools/HLSLCrossCompiler/hlslcc_files.cmake
deleted file mode 100644
index 554d960278..0000000000
--- a/Code/Tools/HLSLCrossCompiler/hlslcc_files.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    offline/hash.h
-    offline/serializeReflection.h
-    offline/timer.h
-    offline/compilerStandalone.cpp
-    offline/serializeReflection.cpp
-    offline/timer.cpp
-    offline/cjson/cJSON.h
-    offline/cjson/cJSON.c
-    src/amazon_changes.c
-    src/decode.c
-    src/decodeDX9.c
-    src/reflect.c
-    src/toGLSL.c
-    src/toGLSLDeclaration.c
-    src/toGLSLInstruction.c
-    src/toGLSLOperand.c
-    src/hlslccToolkit.c
-    src/internal_includes/debug.h
-    src/internal_includes/decode.h
-    src/internal_includes/hlslcc_malloc.h
-    src/internal_includes/hlslcc_malloc.c
-    src/internal_includes/languages.h
-    src/internal_includes/reflect.h
-    src/internal_includes/shaderLimits.h
-    src/internal_includes/structs.h
-    src/internal_includes/toGLSLDeclaration.h
-    src/internal_includes/toGLSLInstruction.h
-    src/internal_includes/toGLSLOperand.h
-    src/internal_includes/tokens.h
-    src/internal_includes/tokensDX9.h
-    src/internal_includes/hlslccToolkit.h
-    src/cbstring/bsafe.h
-    src/cbstring/bstraux.h
-    src/cbstring/bstrlib.h
-    src/cbstring/bsafe.c
-    src/cbstring/bstraux.c
-    src/cbstring/bstrlib.c
-    include/amazon_changes.h
-    include/hlslcc.h
-    include/hlslcc.hpp
-    include/hlslcc_bin.hpp
-    include/pstdint.h
-)
-
-set(SKIP_UNITY_BUILD_INCLUSION_FILES
-    # 'bsafe.c' tries to forward declar 'strncpy', 'strncat', etc, but they are already declared in other modules. Remove from unity builds conideration
-    src/cbstring/bsafe.c
-)
diff --git a/Code/Tools/HLSLCrossCompiler/hlslcc_header_files.cmake b/Code/Tools/HLSLCrossCompiler/hlslcc_header_files.cmake
deleted file mode 100644
index f242cc95e6..0000000000
--- a/Code/Tools/HLSLCrossCompiler/hlslcc_header_files.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES hlslcc_files.cmake
-    include/amazon_changes.h
-    include/hlslcc.h
-    include/hlslcc.hpp
-    include/pstdint.h
-    include/hlslcc_bin.hpp
-)
diff --git a/Code/Tools/HLSLCrossCompiler/include/amazon_changes.h b/Code/Tools/HLSLCrossCompiler/include/amazon_changes.h
deleted file mode 100644
index bbc2b22625..0000000000
--- a/Code/Tools/HLSLCrossCompiler/include/amazon_changes.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef AMAZON_CHANGES_H
-#define AMAZON_CHANGES_H
-
-// There is a bug on the Adreno 420 driver where reinterpret casts can destroy a variable.  We need to replace all instances that look like this:
-//      floatBitsToInt(Temp2);
-// We do not need to change cases that evaluate an expression within the cast operation, like so:
-//      floatBitsToInt(Temp2 + 1.0f);
-void ModifyLineForQualcommReinterpretCastBug( HLSLCrossCompilerContext* psContext, bstring* originalString, bstring* overloadString );
-
-#endif // AMAZON_CHANGES_H
diff --git a/Code/Tools/HLSLCrossCompiler/include/hlslcc.h b/Code/Tools/HLSLCrossCompiler/include/hlslcc.h
deleted file mode 100644
index efa43d8f4f..0000000000
--- a/Code/Tools/HLSLCrossCompiler/include/hlslcc.h
+++ /dev/null
@@ -1,580 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef HLSLCC_H_
-#define HLSLCC_H_
-
-#if defined (_WIN32) && defined(HLSLCC_DYNLIB)
-    #define HLSLCC_APIENTRY __stdcall
-    #if defined(libHLSLcc_EXPORTS)
-        #define HLSLCC_API __declspec(dllexport)
-    #else
-        #define HLSLCC_API __declspec(dllimport)
-    #endif
-#else
-    #define HLSLCC_APIENTRY
-    #define HLSLCC_API
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-
-typedef enum
-{
-    LANG_DEFAULT,// Depends on the HLSL shader model.
-    LANG_ES_100,
-    LANG_ES_300,
-    LANG_ES_310,
-    LANG_120,
-    LANG_130,
-    LANG_140,
-    LANG_150,
-    LANG_330,
-    LANG_400,
-    LANG_410,
-    LANG_420,
-    LANG_430,
-    LANG_440,
-} GLLang;
-
-typedef struct {
-    uint32_t ARB_explicit_attrib_location : 1;
-    uint32_t ARB_explicit_uniform_location : 1;
-    uint32_t ARB_shading_language_420pack : 1;
-}GlExtensions;
-
-enum {MAX_SHADER_VEC4_OUTPUT = 512};
-enum {MAX_SHADER_VEC4_INPUT = 512};
-enum {MAX_TEXTURES = 128};
-enum {MAX_FORK_PHASES = 2};
-enum {MAX_FUNCTION_BODIES = 1024};
-enum {MAX_CLASS_TYPES = 1024};
-enum {MAX_FUNCTION_POINTERS = 128};
-
-//Reflection
-#define MAX_REFLECT_STRING_LENGTH 512
-#define MAX_SHADER_VARS 256
-#define MAX_CBUFFERS 256
-#define MAX_UAV 256
-#define MAX_FUNCTION_TABLES 256
-#define MAX_RESOURCE_BINDINGS 256
-
-//Operands flags
-#define TO_FLAG_NONE              0x0
-#define TO_FLAG_INTEGER           0x1
-#define TO_FLAG_NAME_ONLY         0x2
-#define TO_FLAG_DECLARATION_NAME  0x4
-#define TO_FLAG_DESTINATION       0x8 //Operand is being written to by assignment.
-#define TO_FLAG_UNSIGNED_INTEGER  0x10
-#define TO_FLAG_DOUBLE            0x20
-#define TO_FLAG_FLOAT             0x40
-#define TO_FLAG_COPY              0x80
-
-typedef enum SPECIAL_NAME
-{
-    NAME_UNDEFINED = 0,
-    NAME_POSITION = 1,
-    NAME_CLIP_DISTANCE = 2,
-    NAME_CULL_DISTANCE = 3,
-    NAME_RENDER_TARGET_ARRAY_INDEX = 4,
-    NAME_VIEWPORT_ARRAY_INDEX = 5,
-    NAME_VERTEX_ID = 6,
-    NAME_PRIMITIVE_ID = 7,
-    NAME_INSTANCE_ID = 8,
-    NAME_IS_FRONT_FACE = 9,
-    NAME_SAMPLE_INDEX = 10,
-    // The following are added for D3D11
-    NAME_FINAL_QUAD_U_EQ_0_EDGE_TESSFACTOR = 11, 
-    NAME_FINAL_QUAD_V_EQ_0_EDGE_TESSFACTOR = 12, 
-    NAME_FINAL_QUAD_U_EQ_1_EDGE_TESSFACTOR = 13, 
-    NAME_FINAL_QUAD_V_EQ_1_EDGE_TESSFACTOR = 14, 
-    NAME_FINAL_QUAD_U_INSIDE_TESSFACTOR = 15, 
-    NAME_FINAL_QUAD_V_INSIDE_TESSFACTOR = 16, 
-    NAME_FINAL_TRI_U_EQ_0_EDGE_TESSFACTOR = 17, 
-    NAME_FINAL_TRI_V_EQ_0_EDGE_TESSFACTOR = 18, 
-    NAME_FINAL_TRI_W_EQ_0_EDGE_TESSFACTOR = 19, 
-    NAME_FINAL_TRI_INSIDE_TESSFACTOR = 20, 
-    NAME_FINAL_LINE_DETAIL_TESSFACTOR = 21,
-    NAME_FINAL_LINE_DENSITY_TESSFACTOR = 22,
-} SPECIAL_NAME;
-
-
-typedef enum { 
-    INOUT_COMPONENT_UNKNOWN  = 0,
-    INOUT_COMPONENT_UINT32   = 1,
-    INOUT_COMPONENT_SINT32   = 2,
-    INOUT_COMPONENT_FLOAT32  = 3
-} INOUT_COMPONENT_TYPE;
-
-typedef enum MIN_PRECISION { 
-    MIN_PRECISION_DEFAULT    = 0,
-    MIN_PRECISION_FLOAT_16   = 1,
-    MIN_PRECISION_FLOAT_2_8  = 2,
-    MIN_PRECISION_RESERVED   = 3,
-    MIN_PRECISION_SINT_16    = 4,
-    MIN_PRECISION_UINT_16    = 5,
-    MIN_PRECISION_ANY_16     = 0xf0,
-    MIN_PRECISION_ANY_10     = 0xf1
-} MIN_PRECISION;
-
-typedef struct InOutSignature_TAG
-{
-    char SemanticName[MAX_REFLECT_STRING_LENGTH];
-    uint32_t ui32SemanticIndex;
-    SPECIAL_NAME eSystemValueType;
-    INOUT_COMPONENT_TYPE eComponentType;
-    uint32_t ui32Register;
-    uint32_t ui32Mask;
-    uint32_t ui32ReadWriteMask;
-
-    uint32_t ui32Stream;
-    MIN_PRECISION eMinPrec;
-
-} InOutSignature;
-
-typedef enum ResourceType_TAG
-{
-    RTYPE_CBUFFER,//0
-    RTYPE_TBUFFER,//1
-    RTYPE_TEXTURE,//2
-    RTYPE_SAMPLER,//3
-    RTYPE_UAV_RWTYPED,//4
-    RTYPE_STRUCTURED,//5
-    RTYPE_UAV_RWSTRUCTURED,//6
-    RTYPE_BYTEADDRESS,//7
-    RTYPE_UAV_RWBYTEADDRESS,//8
-    RTYPE_UAV_APPEND_STRUCTURED,//9
-    RTYPE_UAV_CONSUME_STRUCTURED,//10
-    RTYPE_UAV_RWSTRUCTURED_WITH_COUNTER,//11
-    RTYPE_COUNT,
-} ResourceType;
-
-typedef enum ResourceGroup_TAG {
-    RGROUP_CBUFFER,
-    RGROUP_TEXTURE,
-    RGROUP_SAMPLER,
-    RGROUP_UAV,
-    RGROUP_COUNT,
-} ResourceGroup;
-
-typedef enum REFLECT_RESOURCE_DIMENSION
-{
-    REFLECT_RESOURCE_DIMENSION_UNKNOWN = 0,
-    REFLECT_RESOURCE_DIMENSION_BUFFER = 1,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE1D = 2,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY = 3,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2D = 4,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY = 5,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS = 6,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY = 7,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE3D = 8,
-    REFLECT_RESOURCE_DIMENSION_TEXTURECUBE = 9,
-    REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY = 10,
-    REFLECT_RESOURCE_DIMENSION_BUFFEREX = 11,
-} REFLECT_RESOURCE_DIMENSION;
-
-typedef struct ResourceBinding_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    ResourceType eType;
-    uint32_t ui32BindPoint;
-    uint32_t ui32BindCount;
-    uint32_t ui32Flags;
-    REFLECT_RESOURCE_DIMENSION eDimension;
-    uint32_t ui32ReturnType;
-    uint32_t ui32NumSamples;
-} ResourceBinding;
-
-// Do not change the value of these enums or they will not match what we find in the DXBC file
-typedef enum _SHADER_VARIABLE_TYPE { 
-    SVT_VOID                         = 0,
-    SVT_BOOL                         = 1,
-    SVT_INT                          = 2,
-    SVT_FLOAT                        = 3,
-    SVT_STRING                       = 4,
-    SVT_TEXTURE                      = 5,
-    SVT_TEXTURE1D                    = 6,
-    SVT_TEXTURE2D                    = 7,
-    SVT_TEXTURE3D                    = 8,
-    SVT_TEXTURECUBE                  = 9,
-    SVT_SAMPLER                      = 10,
-    SVT_PIXELSHADER                  = 15,
-    SVT_VERTEXSHADER                 = 16,
-    SVT_UINT                         = 19,
-    SVT_UINT8                        = 20,
-    SVT_GEOMETRYSHADER               = 21,
-    SVT_RASTERIZER                   = 22,
-    SVT_DEPTHSTENCIL                 = 23,
-    SVT_BLEND                        = 24,
-    SVT_BUFFER                       = 25,
-    SVT_CBUFFER                      = 26,
-    SVT_TBUFFER                      = 27,
-    SVT_TEXTURE1DARRAY               = 28,
-    SVT_TEXTURE2DARRAY               = 29,
-    SVT_RENDERTARGETVIEW             = 30,
-    SVT_DEPTHSTENCILVIEW             = 31,
-    SVT_TEXTURE2DMS                  = 32,
-    SVT_TEXTURE2DMSARRAY             = 33,
-    SVT_TEXTURECUBEARRAY             = 34,
-    SVT_HULLSHADER                   = 35,
-    SVT_DOMAINSHADER                 = 36,
-    SVT_INTERFACE_POINTER            = 37,
-    SVT_COMPUTESHADER                = 38,
-    SVT_DOUBLE                       = 39,
-    SVT_RWTEXTURE1D                  = 40,
-    SVT_RWTEXTURE1DARRAY             = 41,
-    SVT_RWTEXTURE2D                  = 42,
-    SVT_RWTEXTURE2DARRAY             = 43,
-    SVT_RWTEXTURE3D                  = 44,
-    SVT_RWBUFFER                     = 45,
-    SVT_BYTEADDRESS_BUFFER           = 46,
-    SVT_RWBYTEADDRESS_BUFFER         = 47,
-    SVT_STRUCTURED_BUFFER            = 48,
-    SVT_RWSTRUCTURED_BUFFER          = 49,
-    SVT_APPEND_STRUCTURED_BUFFER     = 50,
-    SVT_CONSUME_STRUCTURED_BUFFER    = 51,
-
-    // Partial precision types
-    SVT_FLOAT10                      = 53,
-    SVT_FLOAT16                      = 54,
-    SVT_INT16                        = 156,
-    SVT_INT12                        = 157,
-    SVT_UINT16                       = 158,
-
-    SVT_FORCE_DWORD                  = 0x7fffffff
-} SHADER_VARIABLE_TYPE;
-
-typedef enum _SHADER_VARIABLE_CLASS { 
-    SVC_SCALAR               = 0,
-    SVC_VECTOR               = ( SVC_SCALAR + 1 ),
-    SVC_MATRIX_ROWS          = ( SVC_VECTOR + 1 ),
-    SVC_MATRIX_COLUMNS       = ( SVC_MATRIX_ROWS + 1 ),
-    SVC_OBJECT               = ( SVC_MATRIX_COLUMNS + 1 ),
-    SVC_STRUCT               = ( SVC_OBJECT + 1 ),
-    SVC_INTERFACE_CLASS      = ( SVC_STRUCT + 1 ),
-    SVC_INTERFACE_POINTER    = ( SVC_INTERFACE_CLASS + 1 ),
-    SVC_FORCE_DWORD          = 0x7fffffff
-} SHADER_VARIABLE_CLASS;
-
-typedef struct ShaderVarType_TAG {
-    SHADER_VARIABLE_CLASS Class;
-    SHADER_VARIABLE_TYPE  Type;
-    uint32_t              Rows;
-    uint32_t              Columns;
-    uint32_t              Elements;
-    uint32_t              MemberCount;
-    uint32_t              Offset;
-    char                  Name[MAX_REFLECT_STRING_LENGTH];
-
-    uint32_t ParentCount;
-    struct ShaderVarType_TAG * Parent;
-
-    struct ShaderVarType_TAG * Members;
-} ShaderVarType;
-
-typedef struct ShaderVar_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    int haveDefaultValue;
-    uint32_t* pui32DefaultValues;
-    //Offset/Size in bytes.
-    uint32_t ui32StartOffset;
-    uint32_t ui32Size;
-    uint32_t ui32Flags;
-
-    ShaderVarType sType;
-} ShaderVar;
-
-typedef struct ConstantBuffer_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-
-    uint32_t ui32NumVars;
-    ShaderVar asVars[MAX_SHADER_VARS];
-
-    uint32_t ui32TotalSizeInBytes;
-    int blob;
-} ConstantBuffer;
-
-typedef struct ClassType_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    uint16_t ui16ID;
-    uint16_t ui16ConstBufStride;
-    uint16_t ui16Texture;
-    uint16_t ui16Sampler;
-} ClassType;
-
-typedef struct ClassInstance_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    uint16_t ui16ID;
-    uint16_t ui16ConstBuf;
-    uint16_t ui16ConstBufOffset;
-    uint16_t ui16Texture;
-    uint16_t ui16Sampler;
-} ClassInstance;
-
-typedef enum TESSELLATOR_PARTITIONING
-{
-    TESSELLATOR_PARTITIONING_UNDEFINED       = 0,
-    TESSELLATOR_PARTITIONING_INTEGER         = 1,
-    TESSELLATOR_PARTITIONING_POW2            = 2,
-    TESSELLATOR_PARTITIONING_FRACTIONAL_ODD  = 3,
-    TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4
-} TESSELLATOR_PARTITIONING;
-
-typedef enum TESSELLATOR_OUTPUT_PRIMITIVE
-{
-    TESSELLATOR_OUTPUT_UNDEFINED     = 0,
-    TESSELLATOR_OUTPUT_POINT         = 1,
-    TESSELLATOR_OUTPUT_LINE          = 2,
-    TESSELLATOR_OUTPUT_TRIANGLE_CW   = 3,
-    TESSELLATOR_OUTPUT_TRIANGLE_CCW  = 4
-} TESSELLATOR_OUTPUT_PRIMITIVE;
-
-typedef enum INTERPOLATION_MODE
-{
-    INTERPOLATION_UNDEFINED = 0,
-    INTERPOLATION_CONSTANT = 1,
-    INTERPOLATION_LINEAR = 2,
-    INTERPOLATION_LINEAR_CENTROID = 3,
-    INTERPOLATION_LINEAR_NOPERSPECTIVE = 4,
-    INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID = 5,
-    INTERPOLATION_LINEAR_SAMPLE = 6,
-    INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE = 7,
-} INTERPOLATION_MODE;
-
-typedef enum TRACE_VARIABLE_GROUP
-{
-    TRACE_VARIABLE_INPUT  = 0,
-    TRACE_VARIABLE_TEMP   = 1,
-    TRACE_VARIABLE_OUTPUT = 2
-} TRACE_VARIABLE_GROUP;
-
-typedef enum TRACE_VARIABLE_TYPE
-{
-    TRACE_VARIABLE_FLOAT   = 0,
-    TRACE_VARIABLE_SINT    = 1,
-    TRACE_VARIABLE_UINT    = 2,
-    TRACE_VARIABLE_DOUBLE  = 3,
-    TRACE_VARIABLE_UNKNOWN = 4
-} TRACE_VARIABLE_TYPE;
-
-typedef struct VariableTraceInfo_TAG
-{
-    TRACE_VARIABLE_GROUP eGroup;
-    TRACE_VARIABLE_TYPE eType;
-    uint8_t ui8Index;
-    uint8_t ui8Component;
-} VariableTraceInfo;
-
-typedef struct StepTraceInfo_TAG
-{
-    uint32_t ui32NumVariables;
-    VariableTraceInfo* psVariables;
-} StepTraceInfo;
-
-typedef enum SYMBOL_TYPE
-{
-    SYMBOL_TESSELLATOR_PARTITIONING = 0,
-    SYMBOL_TESSELLATOR_OUTPUT_PRIMITIVE = 1,
-    SYMBOL_INPUT_INTERPOLATION_MODE = 2,
-    SYMBOL_EMULATE_DEPTH_CLAMP = 3
-} SYMBOL_TYPE;
-
-typedef struct Symbol_TAG
-{
-    SYMBOL_TYPE eType;
-    uint32_t ui32ID;
-    uint32_t ui32Value;
-} Symbol;
-
-typedef struct EmbeddedResourceName_TAG
-{
-    uint32_t ui20Offset           : 20;
-    uint32_t ui12Size             : 12;
-} EmbeddedResourceName;
-
-typedef struct SamplerMask_TAG
-{
-    uint32_t ui10TextureBindPoint : 10;
-    uint32_t ui10SamplerBindPoint : 10;
-    uint32_t ui10TextureUnit      : 10;
-    uint32_t bNormalSample        :  1;
-    uint32_t bCompareSample       :  1;
-} SamplerMask;
-
-typedef struct Sampler_TAG
-{
-    SamplerMask sMask;
-    EmbeddedResourceName sNormalName;
-    EmbeddedResourceName sCompareName;
-} Sampler;
-
-typedef struct Resource_TAG
-{
-    uint32_t ui32BindPoint;
-    ResourceGroup eGroup;
-    EmbeddedResourceName sName;
-} Resource;
-
-typedef struct ShaderInfo_TAG
-{
-    uint32_t ui32MajorVersion;
-    uint32_t ui32MinorVersion;
-
-    uint32_t ui32NumInputSignatures;
-    InOutSignature* psInputSignatures;
-
-    uint32_t ui32NumOutputSignatures;
-    InOutSignature* psOutputSignatures;
-
-    uint32_t ui32NumResourceBindings;
-    ResourceBinding* psResourceBindings;
-
-    uint32_t ui32NumConstantBuffers;
-    ConstantBuffer* psConstantBuffers;
-    ConstantBuffer* psThisPointerConstBuffer;
-
-    uint32_t ui32NumClassTypes;
-    ClassType* psClassTypes;
-
-    uint32_t ui32NumClassInstances;
-    ClassInstance* psClassInstances;
-
-    //Func table ID to class name ID.
-    uint32_t aui32TableIDToTypeID[MAX_FUNCTION_TABLES];
-
-    uint32_t aui32ResourceMap[RGROUP_COUNT][MAX_RESOURCE_BINDINGS];
-
-    // GLSL resources
-    Sampler asSamplers[MAX_RESOURCE_BINDINGS];
-    Resource asImages[MAX_RESOURCE_BINDINGS];
-    Resource asUniformBuffers[MAX_RESOURCE_BINDINGS];
-    Resource asStorageBuffers[MAX_RESOURCE_BINDINGS];
-    uint32_t ui32NumSamplers;
-    uint32_t ui32NumImages;
-    uint32_t ui32NumUniformBuffers;
-    uint32_t ui32NumStorageBuffers;
-
-    // Trace info if tracing is enabled
-    uint32_t ui32NumTraceSteps;
-    StepTraceInfo* psTraceSteps;
-
-    // Symbols imported
-    uint32_t ui32NumImports;
-    Symbol* psImports;
-
-    // Symbols exported
-    uint32_t ui32NumExports;
-    Symbol* psExports;
-
-    // Hash of the input shader for debugging purposes
-    uint32_t ui32InputHash;
-
-    // Offset in the GLSL string where symbol definitions can be inserted
-    uint32_t ui32SymbolsOffset;
-
-    TESSELLATOR_PARTITIONING eTessPartitioning;
-    TESSELLATOR_OUTPUT_PRIMITIVE eTessOutPrim;
-
-    //Required if PixelInterpDependency is true
-    INTERPOLATION_MODE aePixelInputInterpolation[MAX_SHADER_VEC4_INPUT];
-} ShaderInfo;
-
-typedef struct
-{
-    int shaderType; //One of the GL enums.
-    char* sourceCode;
-    ShaderInfo reflection;
-    GLLang GLSLLanguage;
-} GLSLShader;
-
-typedef enum _FRAMEBUFFER_FETCH_TYPE
-{
-    FBF_NONE = 0,
-    FBF_EXT_COLOR = 1 << 0,
-    FBF_ARM_COLOR = 1 << 1,
-    FBF_ARM_DEPTH = 1 << 2,
-    FBF_ARM_STENCIL = 1 << 3,
-    FBF_ANY = FBF_EXT_COLOR | FBF_ARM_COLOR | FBF_ARM_DEPTH | FBF_ARM_STENCIL
-} FRAMEBUFFER_FETCH_TYPE;
-
-// NOTE: HLSLCC flags are specified by command line when executing this cross compiler.
-//       If these flags change, the command line switch '-flags=XXX' must change as well.
-//       Open 3D Engine composes the command line in file 'dev\Code\CryEngine\RenderDll\Common\Shaders\RemoteCompiler.cpp'
-
-/*HLSL constant buffers are treated as default-block unform arrays by default. This is done
-  to support versions of GLSL which lack ARB_uniform_buffer_object functionality.
-  Setting this flag causes each one to have its own uniform block.
-  Note: Currently the nth const buffer will be named UnformBufferN. This is likey to change to the original HLSL name in the future.*/
-static const unsigned int HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT = 0x1;
-
-static const unsigned int HLSLCC_FLAG_ORIGIN_UPPER_LEFT = 0x2;
-
-static const unsigned int HLSLCC_FLAG_PIXEL_CENTER_INTEGER = 0x4;
-
-static const unsigned int HLSLCC_FLAG_GLOBAL_CONSTS_NEVER_IN_UBO = 0x8;
-
-//GS enabled?
-//Affects vertex shader (i.e. need to compile vertex shader again to use with/without GS).
-//This flag is needed in order for the interfaces between stages to match when GS is in use.
-//PS inputs VtxGeoOutput
-//GS outputs VtxGeoOutput
-//Vs outputs VtxOutput if GS enabled. VtxGeoOutput otherwise.
-static const unsigned int HLSLCC_FLAG_GS_ENABLED = 0x10;
-
-static const unsigned int HLSLCC_FLAG_TESS_ENABLED = 0x20;
-
-//Either use this flag or glBindFragDataLocationIndexed.
-//When set the first pixel shader output is the first input to blend
-//equation, the others go to the second input.
-static const unsigned int HLSLCC_FLAG_DUAL_SOURCE_BLENDING = 0x40;
-
-//If set, shader inputs and outputs are declared with their semantic name.
-static const unsigned int HLSLCC_FLAG_INOUT_SEMANTIC_NAMES = 0x80;
-
-static const unsigned int HLSLCC_FLAG_INVERT_CLIP_SPACE_Y = 0x100;
-static const unsigned int HLSLCC_FLAG_CONVERT_CLIP_SPACE_Z = 0x200;
-static const unsigned int HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS = 0x400;
-static const unsigned int HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING = 0x800;
-static const unsigned int HLSLCC_FLAG_TRACING_INSTRUMENTATION = 0x1000;
-static const unsigned int HLSLCC_FLAG_HASH_INPUT = 0x2000;
-static const unsigned int HLSLCC_FLAG_ADD_DEBUG_HEADER = 0x4000;
-static const unsigned int HLSLCC_FLAG_NO_VERSION_STRING = 0x8000;
-
-static const unsigned int HLSLCC_FLAG_AVOID_SHADER_LOAD_STORE_EXTENSION = 0x10000;
-
-// If set, HLSLcc will generate GLSL code which contains syntactic workarounds for
-// driver bugs found in Qualcomm devices running OpenGL ES 3.0
-static const unsigned int HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND = 0x20000;
-
-// If set, HLSL DX9 lower precision qualifiers (e.g half) will be transformed to DX11 style (e.g min16float)
-// before compiling. Necessary to preserve precision information. If not, FXC just silently transform
-// everything to full precision (e.g float32).
-static const unsigned int HLSLCC_FLAG_HALF_FLOAT_TRANSFORM = 0x40000;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-HLSLCC_API void HLSLCC_APIENTRY HLSLcc_SetMemoryFunctions(void* (*malloc_override)(size_t),
-                                                          void* (*calloc_override)(size_t,size_t),
-                                                          void (*free_override)(void *),
-                                                          void* (*realloc_override)(void*,size_t));
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromFile(const char* filename, unsigned int flags, GLLang language, const GlExtensions *extensions, GLSLShader* result);
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromMem(const char* shader, size_t size, unsigned int flags, GLLang language, const GlExtensions *extensions, GLSLShader* result);
-
-HLSLCC_API const char* HLSLCC_APIENTRY GetVersionString(GLLang language);
-
-HLSLCC_API void HLSLCC_APIENTRY FreeGLSLShader(GLSLShader*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/Code/Tools/HLSLCrossCompiler/include/hlslcc.hpp b/Code/Tools/HLSLCrossCompiler/include/hlslcc.hpp
deleted file mode 100644
index 193415f277..0000000000
--- a/Code/Tools/HLSLCrossCompiler/include/hlslcc.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-extern "C" {
-#include "hlslcc.h"
-}
-
diff --git a/Code/Tools/HLSLCrossCompiler/include/hlslcc_bin.hpp b/Code/Tools/HLSLCrossCompiler/include/hlslcc_bin.hpp
deleted file mode 100644
index f2062e58ac..0000000000
--- a/Code/Tools/HLSLCrossCompiler/include/hlslcc_bin.hpp
+++ /dev/null
@@ -1,419 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include <algorithm>
-
-#define FOURCC(a, b, c, d) ((uint32_t)(uint8_t)(a) | ((uint32_t)(uint8_t)(b) << 8) | ((uint32_t)(uint8_t)(c) << 16) | ((uint32_t)(uint8_t)(d) << 24 ))
-
-enum
-{
-    DXBC_BASE_ALIGNMENT = 4,
-    FOURCC_DXBC = FOURCC('D', 'X', 'B', 'C'),
-    FOURCC_RDEF = FOURCC('R', 'D', 'E', 'F'),
-    FOURCC_ISGN = FOURCC('I', 'S', 'G', 'N'),
-    FOURCC_OSGN = FOURCC('O', 'S', 'G', 'N'),
-    FOURCC_PCSG = FOURCC('P', 'C', 'S', 'G'),
-    FOURCC_SHDR = FOURCC('S', 'H', 'D', 'R'),
-    FOURCC_SHEX = FOURCC('S', 'H', 'E', 'X'),
-    FOURCC_GLSL = FOURCC('G', 'L', 'S', 'L'),
-    FOURCC_ISG1 = FOURCC('I', 'S', 'G', '1'), // When lower precision float/int/uint is used
-    FOURCC_OSG1 = FOURCC('O', 'S', 'G', '1'), // When lower precision float/int/uint is used
-};
-
-#undef FOURCC
-
-template <typename T>
-inline T DXBCSwapBytes(const T& kValue)
-{
-    return kValue;
-}
-
-#if defined(__BIG_ENDIAN__) || SYSTEM_IS_BIG_ENDIAN
-
-inline uint16_t DXBCSwapBytes(const uint16_t& uValue)
-{
-    return 
-        (((uValue) >> 8) & 0xFF) |
-        (((uValue) << 8) & 0xFF);
-}
-
-inline uint32_t DXBCSwapBytes(const uint32_t& uValue)
-{
-    return
-        (((uValue) >> 24) & 0x000000FF) |
-        (((uValue) >> 8)  & 0x0000FF00) |
-        (((uValue) << 8)  & 0x00FF0000) |
-        (((uValue) << 24) & 0xFF000000);
-}
-
-#endif //defined(__BIG_ENDIAN__) || SYSTEM_IS_BIG_ENDIAN
-
-template <typename Element>
-struct SDXBCBufferBase
-{
-    Element* m_pBegin;
-    Element* m_pEnd;
-    Element* m_pIter;
-
-    SDXBCBufferBase(Element* pBegin, Element* pEnd)
-        : m_pBegin(pBegin)
-        , m_pEnd(pEnd)
-        , m_pIter(pBegin)
-    {
-    }
-
-    bool SeekRel(int32_t iOffset)
-    {
-        Element* pIterAfter(m_pIter + iOffset);
-        if (pIterAfter > m_pEnd)
-            return false;
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-
-    bool SeekAbs(uint32_t uPosition)
-    {
-        Element* pIterAfter(m_pBegin + uPosition);
-        if (pIterAfter > m_pEnd)
-            return false;
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-};
-
-struct SDXBCInputBuffer : SDXBCBufferBase<const uint8_t>
-{
-    SDXBCInputBuffer(const uint8_t* pBegin, const uint8_t* pEnd)
-        : SDXBCBufferBase(pBegin, pEnd)
-    {
-    }
-
-    bool Read(void* pElements, size_t uSize)
-    {
-        const uint8_t* pIterAfter(m_pIter + uSize);
-        if (pIterAfter > m_pEnd)
-            return false;
-
-        memcpy(pElements, m_pIter, uSize);
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-};
-
-struct SDXBCOutputBuffer : SDXBCBufferBase<uint8_t>
-{
-    SDXBCOutputBuffer(uint8_t* pBegin,  uint8_t* pEnd)
-        : SDXBCBufferBase(pBegin, pEnd)
-    {
-    }
-
-    bool Write(const void* pElements, size_t uSize)
-    {
-        uint8_t* pIterAfter(m_pIter + uSize);
-        if (pIterAfter > m_pEnd)
-            return false;
-
-        memcpy(m_pIter, pElements, uSize);
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-};
-
-template <typename S, typename External, typename Internal>
-inline bool DXBCReadAs(S& kStream, External& kValue)
-{
-    Internal kInternal;
-    bool bResult(kStream.Read(&kInternal, sizeof(Internal)));
-    kValue = static_cast<External>(DXBCSwapBytes(kInternal));
-    return bResult;
-}
-
-template <typename S, typename Internal>
-inline bool DXBCWriteAs(S& kStream, Internal kValue)
-{
-    Internal kInternal(DXBCSwapBytes(kValue));
-    return kStream.Write(&kInternal, sizeof(Internal));
-}
- 
-template <typename S, typename T> bool DXBCReadUint8 (S& kStream, T& kValue) { return DXBCReadAs<S, T, uint8_t >(kStream, kValue); }
-template <typename S, typename T> bool DXBCReadUint16(S& kStream, T& kValue) { return DXBCReadAs<S, T, uint16_t>(kStream, kValue); }
-template <typename S, typename T> bool DXBCReadUint32(S& kStream, T& kValue) { return DXBCReadAs<S, T, uint32_t>(kStream, kValue); }
-
-template <typename S> bool DXBCWriteUint8 (S& kStream, uint8_t kValue)  { return DXBCWriteAs<S, uint8_t >(kStream, kValue); }
-template <typename S> bool DXBCWriteUint16(S& kStream, uint16_t kValue) { return DXBCWriteAs<S, uint16_t>(kStream, kValue); }
-template <typename S> bool DXBCWriteUint32(S& kStream, uint32_t kValue) { return DXBCWriteAs<S, uint32_t>(kStream, kValue); }
-
-template <typename O, typename I>
-bool DXBCCopy(O& kOutput, I& kInput, size_t uSize)
-{
-    char acBuffer[1024];
-    while (uSize > 0)
-    {
-        size_t uToCopy(std::min<size_t>(uSize, sizeof(acBuffer)));
-        if (!kInput.Read(acBuffer, uToCopy) ||
-            !kOutput.Write(acBuffer, uToCopy))
-            return false;
-        uSize -= uToCopy;
-    }
-    return true;
-}
-
-enum
-{
-    DXBC_SIZE_POSITION = 6 * 4,
-    DXBC_HEADER_SIZE = 7 * 4,
-    DXBC_CHUNK_HEADER_SIZE = 2 * 4,
-    DXBC_MAX_NUM_CHUNKS_IN = 128,
-    DXBC_MAX_NUM_CHUNKS_OUT = 8,
-    DXBC_OUT_CHUNKS_INDEX_SIZE = (1 + 1 + DXBC_MAX_NUM_CHUNKS_OUT) * 4,
-    DXBC_OUT_FIXED_SIZE = DXBC_HEADER_SIZE + DXBC_OUT_CHUNKS_INDEX_SIZE,
-};
-
-enum
-{
-    GLSL_HEADER_SIZE   = 4 * 8, // uNumSamplers, uNumImages, uNumStorageBuffers, uNumUniformBuffers, uNumImports, uNumExports, uInputHash, uSymbolsOffset
-    GLSL_SAMPLER_SIZE  = 4 * 3, // uSamplerField, uEmbeddedNormalName, uEmbeddedCompareName
-    GLSL_RESOURCE_SIZE = 4 * 2, // uBindPoint, uName
-    GLSL_SYMBOL_SIZE   = 4 * 3, // uType, uID, uValue
-};
-
-inline void DXBCSizeGLSLChunk(uint32_t& uGLSLChunkSize, uint32_t& uGLSLSourceSize, const GLSLShader* pShader)
-{
-    uint32_t uNumSymbols(
-        pShader->reflection.ui32NumImports +
-        pShader->reflection.ui32NumExports);
-    uint32_t uGLSLInfoSize(
-        DXBC_CHUNK_HEADER_SIZE +
-        GLSL_HEADER_SIZE +
-        pShader->reflection.ui32NumSamplers        * GLSL_SAMPLER_SIZE +
-        pShader->reflection.ui32NumImages          * GLSL_RESOURCE_SIZE +
-        pShader->reflection.ui32NumStorageBuffers  * GLSL_RESOURCE_SIZE +
-        pShader->reflection.ui32NumUniformBuffers  * GLSL_RESOURCE_SIZE +
-        uNumSymbols  * GLSL_SYMBOL_SIZE);
-    uGLSLSourceSize = (uint32_t)strlen(pShader->sourceCode) + 1;
-    uGLSLChunkSize = uGLSLInfoSize + uGLSLSourceSize;
-    uGLSLChunkSize += DXBC_BASE_ALIGNMENT - 1 - (uGLSLChunkSize - 1) % DXBC_BASE_ALIGNMENT;
-}
-
-inline uint32_t DXBCSizeOutputChunk(uint32_t uCode, uint32_t uSizeIn)
-{
-    uint32_t uSizeOut;
-    switch (uCode)
-    {
-        case FOURCC_RDEF:
-        case FOURCC_ISGN:
-        case FOURCC_OSGN:
-        case FOURCC_PCSG:
-        case FOURCC_OSG1:
-        case FOURCC_ISG1:
-            // Preserve entire chunk
-            uSizeOut = uSizeIn;
-            break;
-        case FOURCC_SHDR:
-        case FOURCC_SHEX:
-            // Only keep the shader version
-            uSizeOut = uSizeIn <  4u ? uSizeIn : 4u;
-            break;
-        default:
-            // Discard the chunk
-            uSizeOut = 0;
-            break;
-    }
-    
-    return uSizeOut + DXBC_BASE_ALIGNMENT - 1 - (uSizeOut - 1) % DXBC_BASE_ALIGNMENT;
-}
-
-template <typename I>
-size_t DXBCGetCombinedSize(I& kDXBCInput, const GLSLShader* pShader)
-{
-    uint32_t uNumChunksIn;
-    if (!kDXBCInput.SeekAbs(DXBC_HEADER_SIZE) ||
-        !DXBCReadUint32(kDXBCInput, uNumChunksIn))
-        return 0;
-
-    uint32_t auChunkOffsetsIn[DXBC_MAX_NUM_CHUNKS_IN];
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn; ++uChunk)
-    {
-        if (!DXBCReadUint32(kDXBCInput, auChunkOffsetsIn[uChunk]))
-            return 0;
-    }
-
-    uint32_t uNumChunksOut(0);
-    uint32_t uOutSize(DXBC_OUT_FIXED_SIZE);
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn && uNumChunksOut < DXBC_MAX_NUM_CHUNKS_OUT; ++uChunk)
-    {
-        uint32_t uChunkCode, uChunkSizeIn;
-        if (!kDXBCInput.SeekAbs(auChunkOffsetsIn[uChunk]) ||
-            !DXBCReadUint32(kDXBCInput, uChunkCode) ||
-            !DXBCReadUint32(kDXBCInput, uChunkSizeIn))
-            return 0;
-
-        uint32_t uChunkSizeOut(DXBCSizeOutputChunk(uChunkCode, uChunkSizeIn));
-        if (uChunkSizeOut > 0)
-        {
-            uOutSize += DXBC_CHUNK_HEADER_SIZE + uChunkSizeOut;
-        }
-    }
-
-    uint32_t uGLSLSourceSize, uGLSLChunkSize;
-    DXBCSizeGLSLChunk(uGLSLChunkSize, uGLSLSourceSize, pShader);
-    uOutSize += uGLSLChunkSize;
-
-    return uOutSize;
-}
-
-template <typename I, typename O>
-bool DXBCCombineWithGLSL(I& kInput, O& kOutput, const GLSLShader* pShader)
-{
-    uint32_t uNumChunksIn;
-    if (!DXBCCopy(kOutput, kInput, DXBC_HEADER_SIZE) ||
-        !DXBCReadUint32(kInput, uNumChunksIn)  ||
-        uNumChunksIn > DXBC_MAX_NUM_CHUNKS_IN)
-        return false;
-
-    uint32_t auChunkOffsetsIn[DXBC_MAX_NUM_CHUNKS_IN];
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn; ++uChunk)
-    {
-        if (!DXBCReadUint32(kInput, auChunkOffsetsIn[uChunk]))
-            return false;
-    }
-
-    uint32_t auZeroChunkIndex[DXBC_OUT_CHUNKS_INDEX_SIZE] = {0};
-    if (!kOutput.Write(auZeroChunkIndex, DXBC_OUT_CHUNKS_INDEX_SIZE))
-        return false;
-
-    // Copy required input chunks just after the chunk index
-    uint32_t uOutSize(DXBC_OUT_FIXED_SIZE);
-    uint32_t uNumChunksOut(0);
-    uint32_t auChunkOffsetsOut[DXBC_MAX_NUM_CHUNKS_OUT];
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn; ++uChunk)
-    {
-        uint32_t uChunkCode, uChunkSizeIn;
-        if (!kInput.SeekAbs(auChunkOffsetsIn[uChunk]) ||
-            !DXBCReadUint32(kInput, uChunkCode) ||
-            !DXBCReadUint32(kInput, uChunkSizeIn))
-            return false;
-
-        // Filter only input chunks of the specified types
-        uint32_t uChunkSizeOut(DXBCSizeOutputChunk(uChunkCode, uChunkSizeIn));
-        if (uChunkSizeOut > 0)
-        {
-            if (uNumChunksOut >= DXBC_MAX_NUM_CHUNKS_OUT)
-                return false;
-
-            if (!DXBCWriteUint32(kOutput, uChunkCode) ||
-                !DXBCWriteUint32(kOutput, uChunkSizeOut) ||
-                !DXBCCopy(kOutput, kInput, uChunkSizeOut))
-                return false;
-
-            auChunkOffsetsOut[uNumChunksOut] = uOutSize;
-            ++uNumChunksOut;
-            uOutSize += DXBC_CHUNK_HEADER_SIZE + uChunkSizeOut;
-        }
-    }
-
-    // Write GLSL chunk
-    uint32_t uGLSLChunkOffset(uOutSize);
-    uint32_t uGLSLChunkSize, uGLSLSourceSize;
-    DXBCSizeGLSLChunk(uGLSLChunkSize, uGLSLSourceSize, pShader);
-    if (!DXBCWriteUint32(kOutput, (uint32_t)FOURCC_GLSL) ||
-        !DXBCWriteUint32(kOutput, uGLSLChunkSize) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumSamplers) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumImages) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumStorageBuffers) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumUniformBuffers) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumImports) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumExports) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32InputHash) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32SymbolsOffset))
-        return false;
-    for (uint32_t uSampler = 0; uSampler < pShader->reflection.ui32NumSamplers; ++uSampler)
-    {
-        uint32_t uSamplerField = 
-            (pShader->reflection.asSamplers[uSampler].sMask.ui10TextureBindPoint << 22) |
-            (pShader->reflection.asSamplers[uSampler].sMask.ui10SamplerBindPoint << 12) |
-            (pShader->reflection.asSamplers[uSampler].sMask.ui10TextureUnit      <<  2) |
-            (pShader->reflection.asSamplers[uSampler].sMask.bNormalSample        <<  1) |
-            (pShader->reflection.asSamplers[uSampler].sMask.bCompareSample       <<  0);
-        if (!DXBCWriteUint32(kOutput, uSamplerField))
-            return false;
-
-        uint32_t uEmbeddedNormalName = 
-            (pShader->reflection.asSamplers[uSampler].sNormalName.ui20Offset << 12) |
-            (pShader->reflection.asSamplers[uSampler].sNormalName.ui12Size   <<  0);
-        if (!DXBCWriteUint32(kOutput, uEmbeddedNormalName))
-            return false;
-
-        uint32_t uEmbeddedCompareName = 
-            (pShader->reflection.asSamplers[uSampler].sCompareName.ui20Offset << 12) |
-            (pShader->reflection.asSamplers[uSampler].sCompareName.ui12Size   <<  0);
-        if (!DXBCWriteUint32(kOutput, uEmbeddedCompareName))
-            return false;
-    }
-    for (uint32_t uImage = 0; uImage < pShader->reflection.ui32NumImages; ++uImage)
-    {
-        const Resource* psResource = pShader->reflection.asImages + uImage;
-        uint32_t uEmbeddedName = 
-            (psResource->sName.ui20Offset << 12) |
-            (psResource->sName.ui12Size   <<  0);
-        if (!DXBCWriteUint32(kOutput, psResource->ui32BindPoint) ||
-              !DXBCWriteUint32(kOutput, uEmbeddedName))
-            return false;
-    }
-    for (uint32_t uStorageBuffer = 0; uStorageBuffer < pShader->reflection.ui32NumStorageBuffers; ++uStorageBuffer)
-    {
-        const Resource* psResource = pShader->reflection.asStorageBuffers + uStorageBuffer;
-        uint32_t uEmbeddedName = 
-            (psResource->sName.ui20Offset << 12) |
-            (psResource->sName.ui12Size   <<  0);
-        if (!DXBCWriteUint32(kOutput, psResource->ui32BindPoint) ||
-              !DXBCWriteUint32(kOutput, uEmbeddedName))
-            return false;
-    }
-    for (uint32_t uUniformBuffer = 0; uUniformBuffer < pShader->reflection.ui32NumUniformBuffers; ++uUniformBuffer)
-    {
-        const Resource* psResource = pShader->reflection.asUniformBuffers + uUniformBuffer;
-        uint32_t uEmbeddedName = 
-            (psResource->sName.ui20Offset << 12) |
-            (psResource->sName.ui12Size   <<  0);
-        if (!DXBCWriteUint32(kOutput, psResource->ui32BindPoint) ||
-              !DXBCWriteUint32(kOutput, uEmbeddedName))
-            return false;
-    }
-    for (uint32_t uSymbol = 0; uSymbol < pShader->reflection.ui32NumImports; ++uSymbol)
-    {
-        if (!DXBCWriteUint32(kOutput, pShader->reflection.psImports[uSymbol].eType) ||
-            !DXBCWriteUint32(kOutput, pShader->reflection.psImports[uSymbol].ui32ID) ||
-            !DXBCWriteUint32(kOutput, pShader->reflection.psImports[uSymbol].ui32Value))
-            return false;
-    }
-    for (uint32_t uSymbol = 0; uSymbol < pShader->reflection.ui32NumExports; ++uSymbol)
-    {
-        if (!DXBCWriteUint32(kOutput, pShader->reflection.psExports[uSymbol].eType) ||
-            !DXBCWriteUint32(kOutput, pShader->reflection.psExports[uSymbol].ui32ID) ||
-            !DXBCWriteUint32(kOutput, pShader->reflection.psExports[uSymbol].ui32Value))
-            return false;
-    }
-    if (!kOutput.Write(pShader->sourceCode, uGLSLSourceSize))
-        return false;
-    uOutSize += uGLSLChunkSize;
-
-    // Write total size and chunk index
-    if (!kOutput.SeekAbs(DXBC_SIZE_POSITION) ||
-        !DXBCWriteUint32(kOutput, uOutSize) ||
-        !kOutput.SeekAbs(DXBC_HEADER_SIZE) ||
-        !DXBCWriteUint32(kOutput, uNumChunksOut + 1))
-        return false;
-    for (uint32_t uChunk = 0; uChunk < uNumChunksOut; ++uChunk)
-    {
-        if (!DXBCWriteUint32(kOutput, auChunkOffsetsOut[uChunk]))
-            return false;
-    }
-    DXBCWriteUint32(kOutput, uGLSLChunkOffset);
-
-    return true;
-}
diff --git a/Code/Tools/HLSLCrossCompiler/include/pstdint.h b/Code/Tools/HLSLCrossCompiler/include/pstdint.h
deleted file mode 100644
index 6998242aa1..0000000000
--- a/Code/Tools/HLSLCrossCompiler/include/pstdint.h
+++ /dev/null
@@ -1,801 +0,0 @@
-/*  A portable stdint.h
- ****************************************************************************
- *  BSD License:
- ****************************************************************************
- *
- *  Copyright (c) 2005-2011 Paul Hsieh
- *  All rights reserved.
- *  
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *  
- *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************
- *
- *  Version 0.1.12
- *
- *  The ANSI C standard committee, for the C99 standard, specified the
- *  inclusion of a new standard include file called stdint.h.  This is
- *  a very useful and long desired include file which contains several
- *  very precise definitions for integer scalar types that is
- *  critically important for making portable several classes of
- *  applications including cryptography, hashing, variable length
- *  integer libraries and so on.  But for most developers its likely
- *  useful just for programming sanity.
- *
- *  The problem is that most compiler vendors have decided not to
- *  implement the C99 standard, and the next C++ language standard
- *  (which has a lot more mindshare these days) will be a long time in
- *  coming and its unknown whether or not it will include stdint.h or
- *  how much adoption it will have.  Either way, it will be a long time
- *  before all compilers come with a stdint.h and it also does nothing
- *  for the extremely large number of compilers available today which
- *  do not include this file, or anything comparable to it.
- *
- *  So that's what this file is all about.  Its an attempt to build a
- *  single universal include file that works on as many platforms as
- *  possible to deliver what stdint.h is supposed to.  A few things
- *  that should be noted about this file:
- *
- *    1) It is not guaranteed to be portable and/or present an identical
- *       interface on all platforms.  The extreme variability of the
- *       ANSI C standard makes this an impossibility right from the
- *       very get go. Its really only meant to be useful for the vast
- *       majority of platforms that possess the capability of
- *       implementing usefully and precisely defined, standard sized
- *       integer scalars.  Systems which are not intrinsically 2s
- *       complement may produce invalid constants.
- *
- *    2) There is an unavoidable use of non-reserved symbols.
- *
- *    3) Other standard include files are invoked.
- *
- *    4) This file may come in conflict with future platforms that do
- *       include stdint.h.  The hope is that one or the other can be
- *       used with no real difference.
- *
- *    5) In the current verison, if your platform can't represent
- *       int32_t, int16_t and int8_t, it just dumps out with a compiler
- *       error.
- *
- *    6) 64 bit integers may or may not be defined.  Test for their
- *       presence with the test: #ifdef INT64_MAX or #ifdef UINT64_MAX.
- *       Note that this is different from the C99 specification which
- *       requires the existence of 64 bit support in the compiler.  If
- *       this is not defined for your platform, yet it is capable of
- *       dealing with 64 bits then it is because this file has not yet
- *       been extended to cover all of your system's capabilities.
- *
- *    7) (u)intptr_t may or may not be defined.  Test for its presence
- *       with the test: #ifdef PTRDIFF_MAX.  If this is not defined
- *       for your platform, then it is because this file has not yet
- *       been extended to cover all of your system's capabilities, not
- *       because its optional.
- *
- *    8) The following might not been defined even if your platform is
- *       capable of defining it:
- *
- *       WCHAR_MIN
- *       WCHAR_MAX
- *       (u)int64_t
- *       PTRDIFF_MIN
- *       PTRDIFF_MAX
- *       (u)intptr_t
- *
- *    9) The following have not been defined:
- *
- *       WINT_MIN
- *       WINT_MAX
- *
- *   10) The criteria for defining (u)int_least(*)_t isn't clear,
- *       except for systems which don't have a type that precisely
- *       defined 8, 16, or 32 bit types (which this include file does
- *       not support anyways). Default definitions have been given.
- *
- *   11) The criteria for defining (u)int_fast(*)_t isn't something I
- *       would trust to any particular compiler vendor or the ANSI C
- *       committee.  It is well known that "compatible systems" are
- *       commonly created that have very different performance
- *       characteristics from the systems they are compatible with,
- *       especially those whose vendors make both the compiler and the
- *       system.  Default definitions have been given, but its strongly
- *       recommended that users never use these definitions for any
- *       reason (they do *NOT* deliver any serious guarantee of
- *       improved performance -- not in this file, nor any vendor's
- *       stdint.h).
- *
- *   12) The following macros:
- *
- *       PRINTF_INTMAX_MODIFIER
- *       PRINTF_INT64_MODIFIER
- *       PRINTF_INT32_MODIFIER
- *       PRINTF_INT16_MODIFIER
- *       PRINTF_LEAST64_MODIFIER
- *       PRINTF_LEAST32_MODIFIER
- *       PRINTF_LEAST16_MODIFIER
- *       PRINTF_INTPTR_MODIFIER
- *
- *       are strings which have been defined as the modifiers required
- *       for the "d", "u" and "x" printf formats to correctly output
- *       (u)intmax_t, (u)int64_t, (u)int32_t, (u)int16_t, (u)least64_t,
- *       (u)least32_t, (u)least16_t and (u)intptr_t types respectively.
- *       PRINTF_INTPTR_MODIFIER is not defined for some systems which
- *       provide their own stdint.h.  PRINTF_INT64_MODIFIER is not
- *       defined if INT64_MAX is not defined.  These are an extension
- *       beyond what C99 specifies must be in stdint.h.
- *
- *       In addition, the following macros are defined:
- *
- *       PRINTF_INTMAX_HEX_WIDTH
- *       PRINTF_INT64_HEX_WIDTH
- *       PRINTF_INT32_HEX_WIDTH
- *       PRINTF_INT16_HEX_WIDTH
- *       PRINTF_INT8_HEX_WIDTH
- *       PRINTF_INTMAX_DEC_WIDTH
- *       PRINTF_INT64_DEC_WIDTH
- *       PRINTF_INT32_DEC_WIDTH
- *       PRINTF_INT16_DEC_WIDTH
- *       PRINTF_INT8_DEC_WIDTH
- *
- *       Which specifies the maximum number of characters required to
- *       print the number of that type in either hexadecimal or decimal.
- *       These are an extension beyond what C99 specifies must be in
- *       stdint.h.
- *
- *  Compilers tested (all with 0 warnings at their highest respective
- *  settings): Borland Turbo C 2.0, WATCOM C/C++ 11.0 (16 bits and 32
- *  bits), Microsoft Visual C++ 6.0 (32 bit), Microsoft Visual Studio
- *  .net (VC7), Intel C++ 4.0, GNU gcc v3.3.3
- *
- *  This file should be considered a work in progress.  Suggestions for
- *  improvements, especially those which increase coverage are strongly
- *  encouraged.
- *
- *  Acknowledgements
- *
- *  The following people have made significant contributions to the
- *  development and testing of this file:
- *
- *  Chris Howie
- *  John Steele Scott
- *  Dave Thorup
- *  John Dill
- *
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-#include <stddef.h>
-#include <limits.h>
-#include <signal.h>
-
-/*
- *  For gcc with _STDINT_H, fill in the PRINTF_INT*_MODIFIER macros, and
- *  do nothing else.  On the Mac OS X version of gcc this is _STDINT_H_.
- */
-
-#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined (__UINT_FAST64_TYPE__)) )) && !defined (_PSTDINT_H_INCLUDED)
-#include <stdint.h>
-#define _PSTDINT_H_INCLUDED
-# ifndef PRINTF_INT64_MODIFIER
-#  define PRINTF_INT64_MODIFIER "ll"
-# endif
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-# ifndef PRINTF_INTMAX_MODIFIER
-#  define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
-# endif
-# ifndef PRINTF_INT64_HEX_WIDTH
-#  define PRINTF_INT64_HEX_WIDTH "16"
-# endif
-# ifndef PRINTF_INT32_HEX_WIDTH
-#  define PRINTF_INT32_HEX_WIDTH "8"
-# endif
-# ifndef PRINTF_INT16_HEX_WIDTH
-#  define PRINTF_INT16_HEX_WIDTH "4"
-# endif
-# ifndef PRINTF_INT8_HEX_WIDTH
-#  define PRINTF_INT8_HEX_WIDTH "2"
-# endif
-# ifndef PRINTF_INT64_DEC_WIDTH
-#  define PRINTF_INT64_DEC_WIDTH "20"
-# endif
-# ifndef PRINTF_INT32_DEC_WIDTH
-#  define PRINTF_INT32_DEC_WIDTH "10"
-# endif
-# ifndef PRINTF_INT16_DEC_WIDTH
-#  define PRINTF_INT16_DEC_WIDTH "5"
-# endif
-# ifndef PRINTF_INT8_DEC_WIDTH
-#  define PRINTF_INT8_DEC_WIDTH "3"
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
-# endif
-
-/*
- *  Something really weird is going on with Open Watcom.  Just pull some of
- *  these duplicated definitions from Open Watcom's stdint.h file for now.
- */
-
-# if defined (__WATCOMC__) && __WATCOMC__ >= 1250
-#  if !defined (INT64_C)
-#   define INT64_C(x)   (x + (INT64_MAX - INT64_MAX))
-#  endif
-#  if !defined (UINT64_C)
-#   define UINT64_C(x)  (x + (UINT64_MAX - UINT64_MAX))
-#  endif
-#  if !defined (INT32_C)
-#   define INT32_C(x)   (x + (INT32_MAX - INT32_MAX))
-#  endif
-#  if !defined (UINT32_C)
-#   define UINT32_C(x)  (x + (UINT32_MAX - UINT32_MAX))
-#  endif
-#  if !defined (INT16_C)
-#   define INT16_C(x)   (x)
-#  endif
-#  if !defined (UINT16_C)
-#   define UINT16_C(x)  (x)
-#  endif
-#  if !defined (INT8_C)
-#   define INT8_C(x)   (x)
-#  endif
-#  if !defined (UINT8_C)
-#   define UINT8_C(x)  (x)
-#  endif
-#  if !defined (UINT64_MAX)
-#   define UINT64_MAX  18446744073709551615ULL
-#  endif
-#  if !defined (INT64_MAX)
-#   define INT64_MAX  9223372036854775807LL
-#  endif
-#  if !defined (UINT32_MAX)
-#   define UINT32_MAX  4294967295UL
-#  endif
-#  if !defined (INT32_MAX)
-#   define INT32_MAX  2147483647L
-#  endif
-#  if !defined (INTMAX_MAX)
-#   define INTMAX_MAX INT64_MAX
-#  endif
-#  if !defined (INTMAX_MIN)
-#   define INTMAX_MIN INT64_MIN
-#  endif
-# endif
-#endif
-
-#ifndef _PSTDINT_H_INCLUDED
-#define _PSTDINT_H_INCLUDED
-
-#ifndef SIZE_MAX
-# define SIZE_MAX (~(size_t)0)
-#endif
-
-/*
- *  Deduce the type assignments from limits.h under the assumption that
- *  integer sizes in bits are powers of 2, and follow the ANSI
- *  definitions.
- */
-
-#ifndef UINT8_MAX
-# define UINT8_MAX 0xff
-#endif
-#ifndef uint8_t
-# if (UCHAR_MAX == UINT8_MAX) || defined (S_SPLINT_S)
-    typedef unsigned char uint8_t;
-#   define UINT8_C(v) ((uint8_t) v)
-# else
-#   error "Platform not supported"
-# endif
-#endif
-
-#ifndef INT8_MAX
-# define INT8_MAX 0x7f
-#endif
-#ifndef INT8_MIN
-# define INT8_MIN INT8_C(0x80)
-#endif
-#ifndef int8_t
-# if (SCHAR_MAX == INT8_MAX) || defined (S_SPLINT_S)
-    typedef signed char int8_t;
-#   define INT8_C(v) ((int8_t) v)
-# else
-#   error "Platform not supported"
-# endif
-#endif
-
-#ifndef UINT16_MAX
-# define UINT16_MAX 0xffff
-#endif
-#ifndef uint16_t
-#if (UINT_MAX == UINT16_MAX) || defined (S_SPLINT_S)
-  typedef unsigned int uint16_t;
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER ""
-# endif
-# define UINT16_C(v) ((uint16_t) (v))
-#elif (USHRT_MAX == UINT16_MAX)
-  typedef unsigned short uint16_t;
-# define UINT16_C(v) ((uint16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef INT16_MAX
-# define INT16_MAX 0x7fff
-#endif
-#ifndef INT16_MIN
-# define INT16_MIN INT16_C(0x8000)
-#endif
-#ifndef int16_t
-#if (INT_MAX == INT16_MAX) || defined (S_SPLINT_S)
-  typedef signed int int16_t;
-# define INT16_C(v) ((int16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER ""
-# endif
-#elif (SHRT_MAX == INT16_MAX)
-  typedef signed short int16_t;
-# define INT16_C(v) ((int16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef UINT32_MAX
-# define UINT32_MAX (0xffffffffUL)
-#endif
-#ifndef uint32_t
-#if (ULONG_MAX == UINT32_MAX) || defined (S_SPLINT_S)
-  typedef unsigned long uint32_t;
-# define UINT32_C(v) v ## UL
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-#elif (UINT_MAX == UINT32_MAX)
-  typedef unsigned int uint32_t;
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-# define UINT32_C(v) v ## U
-#elif (USHRT_MAX == UINT32_MAX)
-  typedef unsigned short uint32_t;
-# define UINT32_C(v) ((unsigned short) (v))
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef INT32_MAX
-# define INT32_MAX (0x7fffffffL)
-#endif
-#ifndef INT32_MIN
-# define INT32_MIN INT32_C(0x80000000)
-#endif
-#ifndef int32_t
-#if (LONG_MAX == INT32_MAX) || defined (S_SPLINT_S)
-  typedef signed long int32_t;
-# define INT32_C(v) v ## L
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-#elif (INT_MAX == INT32_MAX)
-  typedef signed int int32_t;
-# define INT32_C(v) v
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#elif (SHRT_MAX == INT32_MAX)
-  typedef signed short int32_t;
-# define INT32_C(v) ((short) (v))
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-/*
- *  The macro stdint_int64_defined is temporarily used to record
- *  whether or not 64 integer support is available.  It must be
- *  defined for any 64 integer extensions for new platforms that are
- *  added.
- */
-
-#undef stdint_int64_defined
-#if (defined(__STDC__) && defined(__STDC_VERSION__)) || defined (S_SPLINT_S)
-# if (__STDC__ && __STDC_VERSION__ >= 199901L) || defined (S_SPLINT_S)
-#  define stdint_int64_defined
-   typedef long long int64_t;
-   typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# endif
-#endif
-
-#if !defined (stdint_int64_defined)
-# if defined(__GNUC__)
-#  define stdint_int64_defined
-   __extension__ typedef long long int64_t;
-   __extension__ typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# elif defined(__MWERKS__) || defined (__SUNPRO_C) || defined (__SUNPRO_CC) || defined (__APPLE_CC__) || defined (_LONG_LONG) || defined (_CRAYC) || defined (S_SPLINT_S)
-#  define stdint_int64_defined
-   typedef long long int64_t;
-   typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined (__BORLANDC__) && __BORLANDC__ > 0x460) || defined (__alpha) || defined (__DECC)
-#  define stdint_int64_defined
-   typedef __int64 int64_t;
-   typedef unsigned __int64 uint64_t;
-#  define UINT64_C(v) v ## UI64
-#  define  INT64_C(v) v ## I64
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "I64"
-#  endif
-# endif
-#endif
-
-#if !defined (LONG_LONG_MAX) && defined (INT64_C)
-# define LONG_LONG_MAX INT64_C (9223372036854775807)
-#endif
-#ifndef ULONG_LONG_MAX
-# define ULONG_LONG_MAX UINT64_C (18446744073709551615)
-#endif
-
-#if !defined (INT64_MAX) && defined (INT64_C)
-# define INT64_MAX INT64_C (9223372036854775807)
-#endif
-#if !defined (INT64_MIN) && defined (INT64_C)
-# define INT64_MIN INT64_C (-9223372036854775808)
-#endif
-#if !defined (UINT64_MAX) && defined (INT64_C)
-# define UINT64_MAX UINT64_C (18446744073709551615)
-#endif
-
-/*
- *  Width of hexadecimal for number field.
- */
-
-#ifndef PRINTF_INT64_HEX_WIDTH
-# define PRINTF_INT64_HEX_WIDTH "16"
-#endif
-#ifndef PRINTF_INT32_HEX_WIDTH
-# define PRINTF_INT32_HEX_WIDTH "8"
-#endif
-#ifndef PRINTF_INT16_HEX_WIDTH
-# define PRINTF_INT16_HEX_WIDTH "4"
-#endif
-#ifndef PRINTF_INT8_HEX_WIDTH
-# define PRINTF_INT8_HEX_WIDTH "2"
-#endif
-
-#ifndef PRINTF_INT64_DEC_WIDTH
-# define PRINTF_INT64_DEC_WIDTH "20"
-#endif
-#ifndef PRINTF_INT32_DEC_WIDTH
-# define PRINTF_INT32_DEC_WIDTH "10"
-#endif
-#ifndef PRINTF_INT16_DEC_WIDTH
-# define PRINTF_INT16_DEC_WIDTH "5"
-#endif
-#ifndef PRINTF_INT8_DEC_WIDTH
-# define PRINTF_INT8_DEC_WIDTH "3"
-#endif
-
-/*
- *  Ok, lets not worry about 128 bit integers for now.  Moore's law says
- *  we don't need to worry about that until about 2040 at which point
- *  we'll have bigger things to worry about.
- */
-
-#ifdef stdint_int64_defined
-  typedef int64_t intmax_t;
-  typedef uint64_t uintmax_t;
-# define  INTMAX_MAX   INT64_MAX
-# define  INTMAX_MIN   INT64_MIN
-# define UINTMAX_MAX  UINT64_MAX
-# define UINTMAX_C(v) UINT64_C(v)
-# define  INTMAX_C(v)  INT64_C(v)
-# ifndef PRINTF_INTMAX_MODIFIER
-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
-# endif
-#else
-  typedef int32_t intmax_t;
-  typedef uint32_t uintmax_t;
-# define  INTMAX_MAX   INT32_MAX
-# define UINTMAX_MAX  UINT32_MAX
-# define UINTMAX_C(v) UINT32_C(v)
-# define  INTMAX_C(v)  INT32_C(v)
-# ifndef PRINTF_INTMAX_MODIFIER
-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT32_MODIFIER
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT32_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT32_DEC_WIDTH
-# endif
-#endif
-
-/*
- *  Because this file currently only supports platforms which have
- *  precise powers of 2 as bit sizes for the default integers, the
- *  least definitions are all trivial.  Its possible that a future
- *  version of this file could have different definitions.
- */
-
-#ifndef stdint_least_defined
-  typedef   int8_t   int_least8_t;
-  typedef  uint8_t  uint_least8_t;
-  typedef  int16_t  int_least16_t;
-  typedef uint16_t uint_least16_t;
-  typedef  int32_t  int_least32_t;
-  typedef uint32_t uint_least32_t;
-# define PRINTF_LEAST32_MODIFIER PRINTF_INT32_MODIFIER
-# define PRINTF_LEAST16_MODIFIER PRINTF_INT16_MODIFIER
-# define  UINT_LEAST8_MAX  UINT8_MAX
-# define   INT_LEAST8_MAX   INT8_MAX
-# define UINT_LEAST16_MAX UINT16_MAX
-# define  INT_LEAST16_MAX  INT16_MAX
-# define UINT_LEAST32_MAX UINT32_MAX
-# define  INT_LEAST32_MAX  INT32_MAX
-# define   INT_LEAST8_MIN   INT8_MIN
-# define  INT_LEAST16_MIN  INT16_MIN
-# define  INT_LEAST32_MIN  INT32_MIN
-# ifdef stdint_int64_defined
-    typedef  int64_t  int_least64_t;
-    typedef uint64_t uint_least64_t;
-#   define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER
-#   define UINT_LEAST64_MAX UINT64_MAX
-#   define  INT_LEAST64_MAX  INT64_MAX
-#   define  INT_LEAST64_MIN  INT64_MIN
-# endif
-#endif
-#undef stdint_least_defined
-
-/*
- *  The ANSI C committee pretending to know or specify anything about
- *  performance is the epitome of misguided arrogance.  The mandate of
- *  this file is to *ONLY* ever support that absolute minimum
- *  definition of the fast integer types, for compatibility purposes.
- *  No extensions, and no attempt to suggest what may or may not be a
- *  faster integer type will ever be made in this file.  Developers are
- *  warned to stay away from these types when using this or any other
- *  stdint.h.
- */
-
-typedef   int_least8_t   int_fast8_t;
-typedef  uint_least8_t  uint_fast8_t;
-typedef  int_least16_t  int_fast16_t;
-typedef uint_least16_t uint_fast16_t;
-typedef  int_least32_t  int_fast32_t;
-typedef uint_least32_t uint_fast32_t;
-#define  UINT_FAST8_MAX  UINT_LEAST8_MAX
-#define   INT_FAST8_MAX   INT_LEAST8_MAX
-#define UINT_FAST16_MAX UINT_LEAST16_MAX
-#define  INT_FAST16_MAX  INT_LEAST16_MAX
-#define UINT_FAST32_MAX UINT_LEAST32_MAX
-#define  INT_FAST32_MAX  INT_LEAST32_MAX
-#define   INT_FAST8_MIN   INT_LEAST8_MIN
-#define  INT_FAST16_MIN  INT_LEAST16_MIN
-#define  INT_FAST32_MIN  INT_LEAST32_MIN
-#ifdef stdint_int64_defined
-  typedef  int_least64_t  int_fast64_t;
-  typedef uint_least64_t uint_fast64_t;
-# define UINT_FAST64_MAX UINT_LEAST64_MAX
-# define  INT_FAST64_MAX  INT_LEAST64_MAX
-# define  INT_FAST64_MIN  INT_LEAST64_MIN
-#endif
-
-#undef stdint_int64_defined
-
-/*
- *  Whatever piecemeal, per compiler thing we can do about the wchar_t
- *  type limits.
- */
-
-#if defined(__WATCOMC__) || defined(_MSC_VER) || defined (__GNUC__)
-# include <wchar.h>
-# ifndef WCHAR_MIN
-#  define WCHAR_MIN 0
-# endif
-# ifndef WCHAR_MAX
-#  define WCHAR_MAX ((wchar_t)-1)
-# endif
-#endif
-
-/*
- *  Whatever piecemeal, per compiler/platform thing we can do about the
- *  (u)intptr_t types and limits.
- */
-
-#if defined (_MSC_VER) && defined (_UINTPTR_T_DEFINED)
-# define STDINT_H_UINTPTR_T_DEFINED
-#endif
-
-#ifndef STDINT_H_UINTPTR_T_DEFINED
-# if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (_WIN64)
-#  define stdint_intptr_bits 64
-# elif defined (__WATCOMC__) || defined (__TURBOC__)
-#  if defined(__TINY__) || defined(__SMALL__) || defined(__MEDIUM__)
-#    define stdint_intptr_bits 16
-#  else
-#    define stdint_intptr_bits 32
-#  endif
-# elif defined (__i386__) || defined (_WIN32) || defined (WIN32)
-#  define stdint_intptr_bits 32
-# elif defined (__INTEL_COMPILER)
-/* TODO -- what did Intel do about x86-64? */
-# endif
-
-# ifdef stdint_intptr_bits
-#  define stdint_intptr_glue3_i(a,b,c)  a##b##c
-#  define stdint_intptr_glue3(a,b,c)    stdint_intptr_glue3_i(a,b,c)
-#  ifndef PRINTF_INTPTR_MODIFIER
-#    define PRINTF_INTPTR_MODIFIER      stdint_intptr_glue3(PRINTF_INT,stdint_intptr_bits,_MODIFIER)
-#  endif
-#  ifndef PTRDIFF_MAX
-#    define PTRDIFF_MAX                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef PTRDIFF_MIN
-#    define PTRDIFF_MIN                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
-#  endif
-#  ifndef UINTPTR_MAX
-#    define UINTPTR_MAX                 stdint_intptr_glue3(UINT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef INTPTR_MAX
-#    define INTPTR_MAX                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef INTPTR_MIN
-#    define INTPTR_MIN                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
-#  endif
-#  ifndef INTPTR_C
-#    define INTPTR_C(x)                 stdint_intptr_glue3(INT,stdint_intptr_bits,_C)(x)
-#  endif
-#  ifndef UINTPTR_C
-#    define UINTPTR_C(x)                stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x)
-#  endif
-  typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;
-  typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;
-# else
-/* TODO -- This following is likely wrong for some platforms, and does
-   nothing for the definition of uintptr_t. */
-  typedef ptrdiff_t intptr_t;
-# endif
-# define STDINT_H_UINTPTR_T_DEFINED
-#endif
-
-/*
- *  Assumes sig_atomic_t is signed and we have a 2s complement machine.
- */
-
-#ifndef SIG_ATOMIC_MAX
-# define SIG_ATOMIC_MAX ((((sig_atomic_t) 1) << (sizeof (sig_atomic_t)*CHAR_BIT-1)) - 1)
-#endif
-
-#endif
-
-#if defined (__TEST_PSTDINT_FOR_CORRECTNESS)
-
-/* 
- *  Please compile with the maximum warning settings to make sure macros are not
- *  defined more than once.
- */
- 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
- 
-#define glue3_aux(x,y,z) x ## y ## z
-#define glue3(x,y,z) glue3_aux(x,y,z)
-
-#define DECLU(bits) glue3(uint,bits,_t) glue3(u,bits,=) glue3(UINT,bits,_C) (0);
-#define DECLI(bits) glue3(int,bits,_t) glue3(i,bits,=) glue3(INT,bits,_C) (0);
-
-#define DECL(us,bits) glue3(DECL,us,) (bits)
-
-#define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits)
- 
-int main () {
-    DECL(I,8)
-    DECL(U,8)
-    DECL(I,16)
-    DECL(U,16)
-    DECL(I,32)
-    DECL(U,32)
-#ifdef INT64_MAX
-    DECL(I,64)
-    DECL(U,64)
-#endif
-    intmax_t imax = INTMAX_C(0);
-    uintmax_t umax = UINTMAX_C(0);
-    char str0[256], str1[256];
-
-    sprintf (str0, "%d %x\n", 0, ~0);
-    
-    sprintf (str1, "%d %x\n",  i8, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1);
-    sprintf (str1, "%u %x\n",  u8, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with u8 : %s\n", str1);
-    sprintf (str1, "%d %x\n",  i16, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1);
-    sprintf (str1, "%u %x\n",  u16, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1);    
-    sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n",  i32, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1);
-    sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n",  u32, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1);
-#ifdef INT64_MAX    
-    sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n",  i64, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1);
-#endif
-    sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n",  imax, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1);
-    sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n",  umax, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1);    
-    
-    TESTUMAX(8);
-    TESTUMAX(16);
-    TESTUMAX(32);
-#ifdef INT64_MAX
-    TESTUMAX(64);
-#endif
-
-    return EXIT_SUCCESS;
-}
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/jni/Android.mk b/Code/Tools/HLSLCrossCompiler/jni/Android.mk
deleted file mode 100644
index 66e2bb4ecf..0000000000
--- a/Code/Tools/HLSLCrossCompiler/jni/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Android Makefile conversion
-# 
-# Leander Beernaert
-#
-# How to build: $ANDROID_NDK/ndk-build 
-#
-VERSION=1.17
-
-LOCAL_PATH := $(call my-dir)/../
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_ARM_NEON := true
-
-LOCAL_MODULE    := HLSLcc
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/include \
-	$(LOCAL_PATH)/src \
-	$(LOCAL_PATH)/src/cbstring
-LOCAL_CFLAGS += -Wall -W
-# For dynamic library
-#LOCAL_CFLAGS += -DHLSLCC_DYNLIB
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/src/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/cbstring/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/internal_includes/*.c)
-#LOCAL_LDLIBS += -lGLESv3
-
-include $(BUILD_STATIC_LIBRARY)
-
diff --git a/Code/Tools/HLSLCrossCompiler/jni/Application.mk b/Code/Tools/HLSLCrossCompiler/jni/Application.mk
deleted file mode 100644
index a8ae0839b1..0000000000
--- a/Code/Tools/HLSLCrossCompiler/jni/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-APP_PLATFORM := android-18
-APP_ABI := armeabi-v7a
-APP_OPTIM := release
diff --git a/Code/Tools/HLSLCrossCompiler/lib/android-armeabi-v7a/libHLSLcc.a b/Code/Tools/HLSLCrossCompiler/lib/android-armeabi-v7a/libHLSLcc.a
deleted file mode 100644
index 6bab978a58..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/android-armeabi-v7a/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35c73c9602dbd539ddd4874c4231fe21d40e0db813394f89e1c837a59d4be755
-size 1092754
diff --git a/Code/Tools/HLSLCrossCompiler/lib/ios-arm64/libHLSLcc.a b/Code/Tools/HLSLCrossCompiler/lib/ios-arm64/libHLSLcc.a
deleted file mode 100644
index 4e5a152c7c..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/ios-arm64/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51ed960398777ebee83d838e344e4a1dd331acb4ae0e77cbf8a64f2c1146b2ce
-size 184304
diff --git a/Code/Tools/HLSLCrossCompiler/lib/ios-simx86_64/libHLSLcc.a b/Code/Tools/HLSLCrossCompiler/lib/ios-simx86_64/libHLSLcc.a
deleted file mode 100644
index cb80d6e7ee..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/ios-simx86_64/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26083d66db7a82295514575af1160ab7aec52aa32f8431edbd1a09011154901b
-size 190552
diff --git a/Code/Tools/HLSLCrossCompiler/lib/ios/libHLSLcc.a b/Code/Tools/HLSLCrossCompiler/lib/ios/libHLSLcc.a
deleted file mode 100644
index c9ef9a0047..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/ios/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b322870fdff43b12034b4d9bcf72b59a5ef2f0cdd1f3042369c9f1a6911931b
-size 374904
diff --git a/Code/Tools/HLSLCrossCompiler/lib/linux/libHLSLcc.a b/Code/Tools/HLSLCrossCompiler/lib/linux/libHLSLcc.a
deleted file mode 100644
index 2adc6a7397..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/linux/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ea9be963e0674546c2e8af2fd9a34e95100d9a1806399457b1e06d033149456
-size 375378
diff --git a/Code/Tools/HLSLCrossCompiler/lib/linux/libHLSLcc_d.a b/Code/Tools/HLSLCrossCompiler/lib/linux/libHLSLcc_d.a
deleted file mode 100644
index b1318b6000..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/linux/libHLSLcc_d.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:544de0a5688c776e28b42bb189a738bc87743828b737d4bf653e46cd2e05938b
-size 1171448
diff --git a/Code/Tools/HLSLCrossCompiler/lib/mac/libHLSLcc.a b/Code/Tools/HLSLCrossCompiler/lib/mac/libHLSLcc.a
deleted file mode 100644
index 85bf31eed4..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/mac/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af9216c54d23dd3754f7ae18d56b97ae256eb29a0046d8e0d2a0716054d8c230
-size 218888
diff --git a/Code/Tools/HLSLCrossCompiler/lib/mac/libHLSLcc_d.a b/Code/Tools/HLSLCrossCompiler/lib/mac/libHLSLcc_d.a
deleted file mode 100644
index 00095a3615..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/mac/libHLSLcc_d.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a07bec349614cdd3e40c3577bddace1203148016f9276c7ef807bdbc37dcabf
-size 671232
diff --git a/Code/Tools/HLSLCrossCompiler/lib/steamos/libHLSLcc.a b/Code/Tools/HLSLCrossCompiler/lib/steamos/libHLSLcc.a
deleted file mode 100644
index c7b92fcc1e..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/steamos/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88acec4cedad5699900ec2d1a3ce83ab5e9365ebea4b4af0ababba562382f399
-size 296852
diff --git a/Code/Tools/HLSLCrossCompiler/lib/steamos/libHLSLcc_d.a b/Code/Tools/HLSLCrossCompiler/lib/steamos/libHLSLcc_d.a
deleted file mode 100644
index 29dd7fbf7a..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/steamos/libHLSLcc_d.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c0625b7f534df5817646dd1335f9d7916389f27a83b7d118fadab504064d910
-size 1144250
diff --git a/Code/Tools/HLSLCrossCompiler/lib/win32/libHLSLcc.lib b/Code/Tools/HLSLCrossCompiler/lib/win32/libHLSLcc.lib
deleted file mode 100644
index 8ed661eb15..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/win32/libHLSLcc.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d49f4f011fe2835d5aafa7ac77fb660cf12078763ddef25e935da919bc65e6b
-size 440242
diff --git a/Code/Tools/HLSLCrossCompiler/lib/win64/libHLSLcc.lib b/Code/Tools/HLSLCrossCompiler/lib/win64/libHLSLcc.lib
deleted file mode 100644
index 452aa95688..0000000000
--- a/Code/Tools/HLSLCrossCompiler/lib/win64/libHLSLcc.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a4a291f8b3d00e1865a98ad3c740d28ff10d43ca87b718403cfc920df2be9ab
-size 618776
diff --git a/Code/Tools/HLSLCrossCompiler/license.txt b/Code/Tools/HLSLCrossCompiler/license.txt
deleted file mode 100644
index 29f302da75..0000000000
--- a/Code/Tools/HLSLCrossCompiler/license.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Copyright (c) 2012 James Jones
-Further improvements Copyright (c) 2014-2016 Unity Technologies
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-This software makes use of the bstring library which is provided under the following license:
-
-Copyright (c) 2002-2008 Paul Hsieh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, 
-    this list of conditions and the following disclaimer. 
-
-    Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution. 
-
-    Neither the name of bstrlib nor the names of its contributors may be used 
-    to endorse or promote products derived from this software without 
-    specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Code/Tools/HLSLCrossCompiler/offline/cjson/README b/Code/Tools/HLSLCrossCompiler/offline/cjson/README
deleted file mode 100644
index 7531c049a6..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/cjson/README
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-  Copyright (c) 2009 Dave Gamble
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-Welcome to cJSON.
-
-cJSON aims to be the dumbest possible parser that you can get your job done with.
-It's a single file of C, and a single header file.
-
-JSON is described best here: http://www.json.org/
-It's like XML, but fat-free. You use it to move data around, store things, or just
-generally represent your program's state.
-
-
-First up, how do I build?
-Add cJSON.c to your project, and put cJSON.h somewhere in the header search path.
-For example, to build the test app:
-
-gcc cJSON.c test.c -o test -lm
-./test
-
-
-As a library, cJSON exists to take away as much legwork as it can, but not get in your way.
-As a point of pragmatism (i.e. ignoring the truth), I'm going to say that you can use it
-in one of two modes: Auto and Manual. Let's have a quick run-through.
-
-
-I lifted some JSON from this page: http://www.json.org/fatfree.html
-That page inspired me to write cJSON, which is a parser that tries to share the same
-philosophy as JSON itself. Simple, dumb, out of the way.
-
-Some JSON:
-{
-    "name": "Jack (\"Bee\") Nimble", 
-    "format": {
-        "type":       "rect", 
-        "width":      1920, 
-        "height":     1080, 
-        "interlace":  false, 
-        "frame rate": 24
-    }
-}
-
-Assume that you got this from a file, a webserver, or magic JSON elves, whatever,
-you have a char * to it. Everything is a cJSON struct.
-Get it parsed:
-	cJSON *root = cJSON_Parse(my_json_string);
-
-This is an object. We're in C. We don't have objects. But we do have structs.
-What's the framerate?
-
-	cJSON *format = cJSON_GetObjectItem(root,"format");
-	int framerate = cJSON_GetObjectItem(format,"frame rate")->valueint;
-
-
-Want to change the framerate?
-	cJSON_GetObjectItem(format,"frame rate")->valueint=25;
-	
-Back to disk?
-	char *rendered=cJSON_Print(root);
-
-Finished? Delete the root (this takes care of everything else).
-	cJSON_Delete(root);
-
-That's AUTO mode. If you're going to use Auto mode, you really ought to check pointers
-before you dereference them. If you want to see how you'd build this struct in code?
-	cJSON *root,*fmt;
-	root=cJSON_CreateObject();	
-	cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
-	cJSON_AddItemToObject(root, "format", fmt=cJSON_CreateObject());
-	cJSON_AddStringToObject(fmt,"type",		"rect");
-	cJSON_AddNumberToObject(fmt,"width",		1920);
-	cJSON_AddNumberToObject(fmt,"height",		1080);
-	cJSON_AddFalseToObject (fmt,"interlace");
-	cJSON_AddNumberToObject(fmt,"frame rate",	24);
-
-Hopefully we can agree that's not a lot of code? There's no overhead, no unnecessary setup.
-Look at test.c for a bunch of nice examples, mostly all ripped off the json.org site, and
-a few from elsewhere.
-
-What about manual mode? First up you need some detail.
-Let's cover how the cJSON objects represent the JSON data.
-cJSON doesn't distinguish arrays from objects in handling; just type.
-Each cJSON has, potentially, a child, siblings, value, a name.
-
-The root object has: Object Type and a Child
-The Child has name "name", with value "Jack ("Bee") Nimble", and a sibling:
-Sibling has type Object, name "format", and a child.
-That child has type String, name "type", value "rect", and a sibling:
-Sibling has type Number, name "width", value 1920, and a sibling:
-Sibling has type Number, name "height", value 1080, and a sibling:
-Sibling hs type False, name "interlace", and a sibling:
-Sibling has type Number, name "frame rate", value 24
-
-Here's the structure:
-typedef struct cJSON {
-	struct cJSON *next,*prev;
-	struct cJSON *child;
-
-	int type;
-
-	char *valuestring;
-	int valueint;
-	double valuedouble;
-
-	char *string;
-} cJSON;
-
-By default all values are 0 unless set by virtue of being meaningful.
-
-next/prev is a doubly linked list of siblings. next takes you to your sibling,
-prev takes you back from your sibling to you.
-Only objects and arrays have a "child", and it's the head of the doubly linked list.
-A "child" entry will have prev==0, but next potentially points on. The last sibling has next=0.
-The type expresses Null/True/False/Number/String/Array/Object, all of which are #defined in
-cJSON.h
-
-A Number has valueint and valuedouble. If you're expecting an int, read valueint, if not read
-valuedouble.
-
-Any entry which is in the linked list which is the child of an object will have a "string"
-which is the "name" of the entry. When I said "name" in the above example, that's "string".
-"string" is the JSON name for the 'variable name' if you will.
-
-Now you can trivially walk the lists, recursively, and parse as you please.
-You can invoke cJSON_Parse to get cJSON to parse for you, and then you can take
-the root object, and traverse the structure (which is, formally, an N-tree),
-and tokenise as you please. If you wanted to build a callback style parser, this is how
-you'd do it (just an example, since these things are very specific):
-
-void parse_and_callback(cJSON *item,const char *prefix)
-{
-	while (item)
-	{
-		char *newprefix=malloc(strlen(prefix)+strlen(item->name)+2);
-		sprintf(newprefix,"%s/%s",prefix,item->name);
-		int dorecurse=callback(newprefix, item->type, item);
-		if (item->child && dorecurse) parse_and_callback(item->child,newprefix);
-		item=item->next;
-		free(newprefix);
-	}
-}
-
-The prefix process will build you a separated list, to simplify your callback handling.
-The 'dorecurse' flag would let the callback decide to handle sub-arrays on it's own, or
-let you invoke it per-item. For the item above, your callback might look like this:
-
-int callback(const char *name,int type,cJSON *item)
-{
-	if (!strcmp(name,"name"))	{ /* populate name */ }
-	else if (!strcmp(name,"format/type")	{ /* handle "rect" */ }
-	else if (!strcmp(name,"format/width")	{ /* 800 */ }
-	else if (!strcmp(name,"format/height")	{ /* 600 */ }
-	else if (!strcmp(name,"format/interlace")	{ /* false */ }
-	else if (!strcmp(name,"format/frame rate")	{ /* 24 */ }
-	return 1;
-}
-
-Alternatively, you might like to parse iteratively.
-You'd use:
-
-void parse_object(cJSON *item)
-{
-	int i; for (i=0;i<cJSON_GetArraySize(item);i++)
-	{
-		cJSON *subitem=cJSON_GetArrayItem(item,i);
-		// handle subitem.	
-	}
-}
-
-Or, for PROPER manual mode:
-
-void parse_object(cJSON *item)
-{
-	cJSON *subitem=item->child;
-	while (subitem)
-	{
-		// handle subitem
-		if (subitem->child) parse_object(subitem->child);
-		
-		subitem=subitem->next;
-	}
-}
-
-Of course, this should look familiar, since this is just a stripped-down version
-of the callback-parser.
-
-This should cover most uses you'll find for parsing. The rest should be possible
-to infer.. and if in doubt, read the source! There's not a lot of it! ;)
-
-
-In terms of constructing JSON data, the example code above is the right way to do it.
-You can, of course, hand your sub-objects to other functions to populate.
-Also, if you find a use for it, you can manually build the objects.
-For instance, suppose you wanted to build an array of objects?
-
-cJSON *objects[24];
-
-cJSON *Create_array_of_anything(cJSON **items,int num)
-{
-	int i;cJSON *prev, *root=cJSON_CreateArray();
-	for (i=0;i<24;i++)
-	{
-		if (!i)	root->child=objects[i];
-		else	prev->next=objects[i], objects[i]->prev=prev;
-		prev=objects[i];
-	}
-	return root;
-}
-	
-and simply: Create_array_of_anything(objects,24);
-
-cJSON doesn't make any assumptions about what order you create things in.
-You can attach the objects, as above, and later add children to each
-of those objects.
-
-As soon as you call cJSON_Print, it renders the structure to text.
-
-
-
-The test.c code shows how to handle a bunch of typical cases. If you uncomment
-the code, it'll load, parse and print a bunch of test files, also from json.org,
-which are more complex than I'd care to try and stash into a const char array[].
-
-
-Enjoy cJSON!
-
-
-- Dave Gamble, Aug 2009
diff --git a/Code/Tools/HLSLCrossCompiler/offline/cjson/cJSON.c b/Code/Tools/HLSLCrossCompiler/offline/cjson/cJSON.c
deleted file mode 100644
index 78b1634fbf..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/cjson/cJSON.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-  Copyright (c) 2009 Dave Gamble
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-// Modifications copyright Amazon.com, Inc. or its affiliates.
-
-/* cJSON */
-/* JSON parser in C. */
-
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include <float.h>
-#include <limits.h>
-#include <ctype.h>
-#include "cJSON.h"
-#include <AzCore/PlatformDef.h>
-
-static const char *ep;
-
-const char *cJSON_GetErrorPtr(void) {return ep;}
-
-static int cJSON_strcasecmp(const char *s1,const char *s2)
-{
-    if (!s1) return (s1==s2)?0:1;if (!s2) return 1;
-    for(; tolower(*s1) == tolower(*s2); ++s1, ++s2)    if(*s1 == 0)    return 0;
-    return tolower(*(const unsigned char *)s1) - tolower(*(const unsigned char *)s2);
-}
-
-AZ_PUSH_DISABLE_WARNING(4232, "-Wunknown-warning-option") // address of malloc/free are not static
-static void *(*cJSON_malloc)(size_t sz) = malloc;
-static void (*cJSON_free)(void *ptr) = free;
-AZ_POP_DISABLE_WARNING
-
-static char* cJSON_strdup(const char* str)
-{
-    size_t len = strlen(str) + 1;
-    char* copy = (char*)cJSON_malloc(len);
-
-    if (!copy) return 0;
-    memcpy(copy,str,len);
-    return copy;
-}
-
-void cJSON_InitHooks(cJSON_Hooks* hooks)
-{
-    if (!hooks) { /* Reset hooks */
-        cJSON_malloc = malloc;
-        cJSON_free = free;
-        return;
-    }
-
-    cJSON_malloc = (hooks->malloc_fn)?hooks->malloc_fn:malloc;
-    cJSON_free     = (hooks->free_fn)?hooks->free_fn:free;
-}
-
-/* Internal constructor. */
-static cJSON *cJSON_New_Item(void)
-{
-    cJSON* node = (cJSON*)cJSON_malloc(sizeof(cJSON));
-    if (node) memset(node,0,sizeof(cJSON));
-    return node;
-}
-
-/* Delete a cJSON structure. */
-void cJSON_Delete(cJSON *c)
-{
-    cJSON *next;
-    while (c)
-    {
-        next=c->next;
-        if (!(c->type&cJSON_IsReference) && c->child) cJSON_Delete(c->child);
-        if (!(c->type&cJSON_IsReference) && c->valuestring) cJSON_free(c->valuestring);
-        if (c->string) cJSON_free(c->string);
-        cJSON_free(c);
-        c=next;
-    }
-}
-
-/* Parse the input text to generate a number, and populate the result into item. */
-static const char *parse_number(cJSON *item,const char *num)
-{
-    double n=0,sign=1,scale=0;int subscale=0,signsubscale=1;
-
-    /* Could use sscanf for this? */
-    if (*num=='-') sign=-1,num++;    /* Has sign? */
-    if (*num=='0') num++;            /* is zero */
-    if (*num>='1' && *num<='9')    do    n=(n*10.0)+(*num++ -'0');    while (*num>='0' && *num<='9');    /* Number? */
-    if (*num=='.' && num[1]>='0' && num[1]<='9') {num++;        do    n=(n*10.0)+(*num++ -'0'),scale--; while (*num>='0' && *num<='9');}    /* Fractional part? */
-    if (*num=='e' || *num=='E')        /* Exponent? */
-    {    num++;if (*num=='+') num++;    else if (*num=='-') signsubscale=-1,num++;        /* With sign? */
-        while (*num>='0' && *num<='9') subscale=(subscale*10)+(*num++ - '0');    /* Number? */
-    }
-
-    n=sign*n*pow(10.0,(scale+subscale*signsubscale));    /* number = +/- number.fraction * 10^+/- exponent */
-    
-    item->valuedouble=n;
-    item->valueint=(int)n;
-    item->type=cJSON_Number;
-    return num;
-}
-
-/* Render the number nicely from the given item into a string. */
-static char *print_number(cJSON *item)
-{
-    char *str;
-    double d=item->valuedouble;
-    if (fabs(((double)item->valueint)-d)<=DBL_EPSILON && d<=INT_MAX && d>=INT_MIN)
-    {
-        str=(char*)cJSON_malloc(21);    /* 2^64+1 can be represented in 21 chars. */
-        if (str) sprintf(str,"%d",item->valueint);
-    }
-    else
-    {
-        str=(char*)cJSON_malloc(64);    /* This is a nice tradeoff. */
-        if (str)
-        {
-            if (fabs(floor(d)-d)<=DBL_EPSILON && fabs(d)<1.0e60)sprintf(str,"%.0f",d);
-            else if (fabs(d)<1.0e-6 || fabs(d)>1.0e9)            sprintf(str,"%e",d);
-            else                                                sprintf(str,"%f",d);
-        }
-    }
-    return str;
-}
-
-/* Parse the input text into an unescaped cstring, and populate item. */
-static const unsigned char firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-static const char *parse_string(cJSON *item,const char *str)
-{
-    const char *ptr=str+1;char *ptr2;char *out;int len=0;unsigned uc,uc2;
-    if (*str!='\"') {ep=str;return 0;}    /* not a string! */
-    
-    while (*ptr!='\"' && *ptr && ++len) if (*ptr++ == '\\') ptr++;    /* Skip escaped quotes. */
-    
-    out=(char*)cJSON_malloc(len+1);    /* This is how long we need for the string, roughly. */
-    if (!out) return 0;
-    
-    ptr=str+1;ptr2=out;
-    while (*ptr!='\"' && *ptr)
-    {
-        if (*ptr!='\\') *ptr2++=*ptr++;
-        else
-        {
-            ptr++;
-            switch (*ptr)
-            {
-                case 'b': *ptr2++='\b';    break;
-                case 'f': *ptr2++='\f';    break;
-                case 'n': *ptr2++='\n';    break;
-                case 'r': *ptr2++='\r';    break;
-                case 't': *ptr2++='\t';    break;
-                case 'u':     /* transcode utf16 to utf8. */
-                    sscanf(ptr+1,"%4x",&uc);ptr+=4;    /* get the unicode char. */
-
-                    if ((uc>=0xDC00 && uc<=0xDFFF) || uc==0)    break;    /* check for invalid.    */
-
-                    if (uc>=0xD800 && uc<=0xDBFF)    /* UTF16 surrogate pairs.    */
-                    {
-                        if (ptr[1]!='\\' || ptr[2]!='u')    break;    /* missing second-half of surrogate.    */
-                        sscanf(ptr+3,"%4x",&uc2);ptr+=6;
-                        if (uc2<0xDC00 || uc2>0xDFFF)        break;    /* invalid second-half of surrogate.    */
-                        uc=0x10000 + (((uc&0x3FF)<<10) | (uc2&0x3FF));
-                    }
-
-                    len=4;if (uc<0x80) len=1;else if (uc<0x800) len=2;else if (uc<0x10000) len=3; ptr2+=len;
-                    
-                    switch (len) {
-                        case 4: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                        case 3: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                        case 2: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                        case 1: *--ptr2 =(uc | firstByteMark[len]);
-                    }
-                    ptr2+=len;
-                    break;
-                default:  *ptr2++=*ptr; break;
-            }
-            ptr++;
-        }
-    }
-    *ptr2=0;
-    if (*ptr=='\"') ptr++;
-    item->valuestring=out;
-    item->type=cJSON_String;
-    return ptr;
-}
-
-/* Render the cstring provided to an escaped version that can be printed. */
-static char *print_string_ptr(const char *str)
-{
-    const char *ptr;char *ptr2,*out;int len=0;unsigned char token;
-    
-    if (!str) return cJSON_strdup("");
-    ptr=str;
-    token = *ptr;
-    while (token && ++len)
-    {
-        if (strchr("\"\\\b\f\n\r\t",token)) len++;
-        else if (token<32) len+=5;
-        ptr++;
-        token = *ptr;
-    }
-    
-    out=(char*)cJSON_malloc(len+3);
-    if (!out) return 0;
-
-    ptr2=out;ptr=str;
-    *ptr2++='\"';
-    while (*ptr)
-    {
-        if ((unsigned char)*ptr>31 && *ptr!='\"' && *ptr!='\\') *ptr2++=*ptr++;
-        else
-        {
-            *ptr2++='\\';
-            switch (token=*ptr++)
-            {
-                case '\\':    *ptr2++='\\';    break;
-                case '\"':    *ptr2++='\"';    break;
-                case '\b':    *ptr2++='b';    break;
-                case '\f':    *ptr2++='f';    break;
-                case '\n':    *ptr2++='n';    break;
-                case '\r':    *ptr2++='r';    break;
-                case '\t':    *ptr2++='t';    break;
-                default: sprintf(ptr2,"u%04x",token);ptr2+=5;    break;    /* escape and print */
-            }
-        }
-    }
-    *ptr2++='\"';*ptr2++=0;
-    return out;
-}
-/* Invote print_string_ptr (which is useful) on an item. */
-static char *print_string(cJSON *item)    {return print_string_ptr(item->valuestring);}
-
-/* Predeclare these prototypes. */
-static const char *parse_value(cJSON *item,const char *value);
-static char *print_value(cJSON *item,int depth,int fmt);
-static const char *parse_array(cJSON *item,const char *value);
-static char *print_array(cJSON *item,int depth,int fmt);
-static const char *parse_object(cJSON *item,const char *value);
-static char *print_object(cJSON *item,int depth,int fmt);
-
-/* Utility to jump whitespace and cr/lf */
-static const char *skip(const char *in) {while (in && *in && (unsigned char)*in<=32) in++; return in;}
-
-/* Parse an object - create a new root, and populate. */
-cJSON *cJSON_ParseWithOpts(const char *value,const char **return_parse_end,int require_null_terminated)
-{
-    const char *end=0;
-    cJSON *c=cJSON_New_Item();
-    ep=0;
-    if (!c) return 0;       /* memory fail */
-
-    end=parse_value(c,skip(value));
-    if (!end)    {cJSON_Delete(c);return 0;}    /* parse failure. ep is set. */
-
-    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
-    if (require_null_terminated) {end=skip(end);if (*end) {cJSON_Delete(c);ep=end;return 0;}}
-    if (return_parse_end) *return_parse_end=end;
-    return c;
-}
-/* Default options for cJSON_Parse */
-cJSON *cJSON_Parse(const char *value) {return cJSON_ParseWithOpts(value,0,0);}
-
-/* Render a cJSON item/entity/structure to text. */
-char *cJSON_Print(cJSON *item)                {return print_value(item,0,1);}
-char *cJSON_PrintUnformatted(cJSON *item)    {return print_value(item,0,0);}
-
-/* Parser core - when encountering text, process appropriately. */
-static const char *parse_value(cJSON *item,const char *value)
-{
-    if (!value)                        return 0;    /* Fail on null. */
-    if (!strncmp(value,"null",4))    { item->type=cJSON_NULL;  return value+4; }
-    if (!strncmp(value,"false",5))    { item->type=cJSON_False; return value+5; }
-    if (!strncmp(value,"true",4))    { item->type=cJSON_True; item->valueint=1;    return value+4; }
-    if (*value=='\"')                { return parse_string(item,value); }
-    if (*value=='-' || (*value>='0' && *value<='9'))    { return parse_number(item,value); }
-    if (*value=='[')                { return parse_array(item,value); }
-    if (*value=='{')                { return parse_object(item,value); }
-
-    ep=value;return 0;    /* failure. */
-}
-
-/* Render a value to text. */
-static char *print_value(cJSON *item,int depth,int fmt)
-{
-    char *out=0;
-    if (!item) return 0;
-    switch ((item->type)&255)
-    {
-        case cJSON_NULL:    out=cJSON_strdup("null");    break;
-        case cJSON_False:    out=cJSON_strdup("false");break;
-        case cJSON_True:    out=cJSON_strdup("true"); break;
-        case cJSON_Number:    out=print_number(item);break;
-        case cJSON_String:    out=print_string(item);break;
-        case cJSON_Array:    out=print_array(item,depth,fmt);break;
-        case cJSON_Object:    out=print_object(item,depth,fmt);break;
-    }
-    return out;
-}
-
-/* Build an array from input text. */
-static const char *parse_array(cJSON *item,const char *value)
-{
-    cJSON *child;
-    if (*value!='[')    {ep=value;return 0;}    /* not an array! */
-
-    item->type=cJSON_Array;
-    value=skip(value+1);
-    if (*value==']') return value+1;    /* empty array. */
-
-    item->child=child=cJSON_New_Item();
-    if (!item->child) return 0;         /* memory fail */
-    value=skip(parse_value(child,skip(value)));    /* skip any spacing, get the value. */
-    if (!value) return 0;
-
-    while (*value==',')
-    {
-        cJSON *new_item = cJSON_New_Item();
-        if (!new_item) return 0;     /* memory fail */
-        child->next=new_item;new_item->prev=child;child=new_item;
-        value=skip(parse_value(child,skip(value+1)));
-        if (!value) return 0;    /* memory fail */
-    }
-
-    if (*value==']') return value+1;    /* end of array */
-    ep=value;return 0;    /* malformed. */
-}
-
-/* Render an array to text */
-static char *print_array(cJSON *item,int depth,int fmt)
-{
-    char **entries;
-    char *out=0,*ptr,*ret;int len=5;
-    cJSON *child=item->child;
-    int numentries=0,i=0,fail=0;
-    
-    /* How many entries in the array? */
-    while (child) numentries++,child=child->next;
-    /* Explicitly handle numentries==0 */
-    if (!numentries)
-    {
-        out=(char*)cJSON_malloc(3);
-        if (out) strcpy(out,"[]");
-        return out;
-    }
-    /* Allocate an array to hold the values for each */
-    entries=(char**)cJSON_malloc(numentries*sizeof(char*));
-    if (!entries) return 0;
-    memset(entries,0,numentries*sizeof(char*));
-    /* Retrieve all the results: */
-    child=item->child;
-    while (child && !fail)
-    {
-        ret=print_value(child,depth+1,fmt);
-        entries[i++]=ret;
-        if (ret) len+=(int)strlen(ret)+2+(fmt?1:0); else fail=1;
-        child=child->next;
-    }
-    
-    /* If we didn't fail, try to malloc the output string */
-    if (!fail) out=(char*)cJSON_malloc(len);
-    /* If that fails, we fail. */
-    if (!out) fail=1;
-
-    /* Handle failure. */
-    if (fail)
-    {
-        for (i=0;i<numentries;i++) if (entries[i]) cJSON_free(entries[i]);
-        cJSON_free(entries);
-        return 0;
-    }
-    
-    /* Compose the output array. */
-    *out='[';
-    ptr=out+1;*ptr=0;
-    for (i=0;i<numentries;i++)
-    {
-        strcpy(ptr,entries[i]);ptr+=strlen(entries[i]);
-        if (i!=numentries-1) {*ptr++=',';if(fmt)*ptr++=' ';*ptr=0;}
-        cJSON_free(entries[i]);
-    }
-    cJSON_free(entries);
-    *ptr++=']';*ptr++=0;
-    return out;    
-}
-
-/* Build an object from the text. */
-static const char *parse_object(cJSON *item,const char *value)
-{
-    cJSON *child;
-    if (*value!='{')    {ep=value;return 0;}    /* not an object! */
-    
-    item->type=cJSON_Object;
-    value=skip(value+1);
-    if (*value=='}') return value+1;    /* empty array. */
-    
-    item->child=child=cJSON_New_Item();
-    if (!item->child) return 0;
-    value=skip(parse_string(child,skip(value)));
-    if (!value) return 0;
-    child->string=child->valuestring;child->valuestring=0;
-    if (*value!=':') {ep=value;return 0;}    /* fail! */
-    value=skip(parse_value(child,skip(value+1)));    /* skip any spacing, get the value. */
-    if (!value) return 0;
-    
-    while (*value==',')
-    {
-        cJSON* new_item = cJSON_New_Item();
-        if (!new_item)    return 0; /* memory fail */
-        child->next=new_item;new_item->prev=child;child=new_item;
-        value=skip(parse_string(child,skip(value+1)));
-        if (!value) return 0;
-        child->string=child->valuestring;child->valuestring=0;
-        if (*value!=':') {ep=value;return 0;}    /* fail! */
-        value=skip(parse_value(child,skip(value+1)));    /* skip any spacing, get the value. */
-        if (!value) return 0;
-    }
-    
-    if (*value=='}') return value+1;    /* end of array */
-    ep=value;return 0;    /* malformed. */
-}
-
-/* Render an object to text. */
-static char *print_object(cJSON *item,int depth,int fmt)
-{
-    char **entries=0,**names=0;
-    char *out=0,*ptr,*ret,*str;int len=7,i=0,j;
-    cJSON *child=item->child;
-    int numentries=0,fail=0;
-    /* Count the number of entries. */
-    while (child) numentries++,child=child->next;
-    /* Explicitly handle empty object case */
-    if (!numentries)
-    {
-        out=(char*)cJSON_malloc(fmt?depth+3:3);
-        if (!out)    return 0;
-        ptr=out;*ptr++='{';
-        if (fmt) {*ptr++='\n';for (i=0;i<depth-1;i++) *ptr++='\t';}
-        *ptr++='}';*ptr++=0;
-        return out;
-    }
-    /* Allocate space for the names and the objects */
-    entries=(char**)cJSON_malloc(numentries*sizeof(char*));
-    if (!entries) return 0;
-    names=(char**)cJSON_malloc(numentries*sizeof(char*));
-    if (!names) {cJSON_free(entries);return 0;}
-    memset(entries,0,sizeof(char*)*numentries);
-    memset(names,0,sizeof(char*)*numentries);
-
-    /* Collect all the results into our arrays: */
-    child=item->child;depth++;if (fmt) len+=depth;
-    while (child)
-    {
-        names[i]=str=print_string_ptr(child->string);
-        entries[i++]=ret=print_value(child,depth,fmt);
-        if (str && ret) len+=(int)(strlen(ret)+strlen(str))+2+(fmt?2+depth:0); else fail=1;
-        child=child->next;
-    }
-    
-    /* Try to allocate the output string */
-    if (!fail) out=(char*)cJSON_malloc(len);
-    if (!out) fail=1;
-
-    /* Handle failure */
-    if (fail)
-    {
-        for (i=0;i<numentries;i++) {if (names[i]) cJSON_free(names[i]);if (entries[i]) cJSON_free(entries[i]);}
-        cJSON_free(names);cJSON_free(entries);
-        return 0;
-    }
-    
-    /* Compose the output: */
-    *out='{';ptr=out+1;if (fmt)*ptr++='\n';*ptr=0;
-    for (i=0;i<numentries;i++)
-    {
-        if (fmt) for (j=0;j<depth;j++) *ptr++='\t';
-        strcpy(ptr,names[i]);ptr+=strlen(names[i]);
-        *ptr++=':';if (fmt) *ptr++='\t';
-        strcpy(ptr,entries[i]);ptr+=strlen(entries[i]);
-        if (i!=numentries-1) *ptr++=',';
-        if (fmt) *ptr++='\n';*ptr=0;
-        cJSON_free(names[i]);cJSON_free(entries[i]);
-    }
-    
-    cJSON_free(names);cJSON_free(entries);
-    if (fmt) for (i=0;i<depth-1;i++) *ptr++='\t';
-    *ptr++='}';*ptr++=0;
-    return out;    
-}
-
-/* Get Array size/item / object item. */
-int    cJSON_GetArraySize(cJSON *array)                            {cJSON *c=array->child;int i=0;while(c)i++,c=c->next;return i;}
-cJSON *cJSON_GetArrayItem(cJSON *array,int item)                {cJSON *c=array->child;  while (c && item>0) item--,c=c->next; return c;}
-cJSON *cJSON_GetObjectItem(cJSON *object,const char *string)    {cJSON *c=object->child; while (c && cJSON_strcasecmp(c->string,string)) c=c->next; return c;}
-
-/* Utility for array list handling. */
-static void suffix_object(cJSON *prev,cJSON *item) {prev->next=item;item->prev=prev;}
-/* Utility for handling references. */
-static cJSON *create_reference(cJSON *item) {cJSON *ref=cJSON_New_Item();if (!ref) return 0;memcpy(ref,item,sizeof(cJSON));ref->string=0;ref->type|=cJSON_IsReference;ref->next=ref->prev=0;return ref;}
-
-/* Add item to array/object. */
-void   cJSON_AddItemToArray(cJSON *array, cJSON *item)                        {cJSON *c=array->child;if (!item) return; if (!c) {array->child=item;} else {while (c && c->next) c=c->next; suffix_object(c,item);}}
-void   cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item)    {if (!item) return; if (item->string) cJSON_free(item->string);item->string=cJSON_strdup(string);cJSON_AddItemToArray(object,item);}
-void    cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)                        {cJSON_AddItemToArray(array,create_reference(item));}
-void    cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item)    {cJSON_AddItemToObject(object,string,create_reference(item));}
-
-cJSON *cJSON_DetachItemFromArray(cJSON *array,int which)            {cJSON *c=array->child;while (c && which>0) c=c->next,which--;if (!c) return 0;
-    if (c->prev) c->prev->next=c->next;if (c->next) c->next->prev=c->prev;if (c==array->child) array->child=c->next;c->prev=c->next=0;return c;}
-void   cJSON_DeleteItemFromArray(cJSON *array,int which)            {cJSON_Delete(cJSON_DetachItemFromArray(array,which));}
-cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string) {int i=0;cJSON *c=object->child;while (c && cJSON_strcasecmp(c->string,string)) i++,c=c->next;if (c) return cJSON_DetachItemFromArray(object,i);return 0;}
-void   cJSON_DeleteItemFromObject(cJSON *object,const char *string) {cJSON_Delete(cJSON_DetachItemFromObject(object,string));}
-
-/* Replace array/object items with new ones. */
-void   cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem)        {cJSON *c=array->child;while (c && which>0) c=c->next,which--;if (!c) return;
-    newitem->next=c->next;newitem->prev=c->prev;if (newitem->next) newitem->next->prev=newitem;
-    if (c==array->child) array->child=newitem; else newitem->prev->next=newitem;c->next=c->prev=0;cJSON_Delete(c);}
-void   cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem){int i=0;cJSON *c=object->child;while(c && cJSON_strcasecmp(c->string,string))i++,c=c->next;if(c){newitem->string=cJSON_strdup(string);cJSON_ReplaceItemInArray(object,i,newitem);}}
-
-/* Create basic types: */
-cJSON *cJSON_CreateNull(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_NULL;return item;}
-cJSON *cJSON_CreateTrue(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_True;return item;}
-cJSON *cJSON_CreateFalse(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_False;return item;}
-cJSON *cJSON_CreateBool(int b)                    {cJSON *item=cJSON_New_Item();if(item)item->type=b?cJSON_True:cJSON_False;return item;}
-cJSON *cJSON_CreateNumber(double num)            {cJSON *item=cJSON_New_Item();if(item){item->type=cJSON_Number;item->valuedouble=num;item->valueint=(int)num;}return item;}
-cJSON *cJSON_CreateString(const char *string)    {cJSON *item=cJSON_New_Item();if(item){item->type=cJSON_String;item->valuestring=cJSON_strdup(string);}return item;}
-cJSON *cJSON_CreateArray(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_Array;return item;}
-cJSON *cJSON_CreateObject(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_Object;return item;}
-
-/* Create Arrays: */
-cJSON *cJSON_CreateIntArray(int *numbers,int count)                {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateNumber(numbers[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-cJSON *cJSON_CreateFloatArray(float *numbers,int count)            {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateNumber(numbers[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-cJSON *cJSON_CreateDoubleArray(double *numbers,int count)        {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateNumber(numbers[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-cJSON *cJSON_CreateStringArray(const char **strings,int count)    {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateString(strings[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-
-/* Duplication */
-cJSON *cJSON_Duplicate(cJSON *item,int recurse)
-{
-    cJSON *newitem,*cptr,*nptr=0,*newchild;
-    /* Bail on bad ptr */
-    if (!item) return 0;
-    /* Create new item */
-    newitem=cJSON_New_Item();
-    if (!newitem) return 0;
-    /* Copy over all vars */
-    newitem->type=item->type&(~cJSON_IsReference),newitem->valueint=item->valueint,newitem->valuedouble=item->valuedouble;
-    if (item->valuestring)    {newitem->valuestring=cJSON_strdup(item->valuestring);    if (!newitem->valuestring)    {cJSON_Delete(newitem);return 0;}}
-    if (item->string)        {newitem->string=cJSON_strdup(item->string);            if (!newitem->string)        {cJSON_Delete(newitem);return 0;}}
-    /* If non-recursive, then we're done! */
-    if (!recurse) return newitem;
-    /* Walk the ->next chain for the child. */
-    cptr=item->child;
-    while (cptr)
-    {
-        newchild=cJSON_Duplicate(cptr,1);        /* Duplicate (with recurse) each item in the ->next chain */
-        if (!newchild) {cJSON_Delete(newitem);return 0;}
-        if (nptr)    {nptr->next=newchild,newchild->prev=nptr;nptr=newchild;}    /* If newitem->child already set, then crosswire ->prev and ->next and move on */
-        else        {newitem->child=newchild;nptr=newchild;}                    /* Set newitem->child and move to it */
-        cptr=cptr->next;
-    }
-    return newitem;
-}
diff --git a/Code/Tools/HLSLCrossCompiler/offline/cjson/cJSON.h b/Code/Tools/HLSLCrossCompiler/offline/cjson/cJSON.h
deleted file mode 100644
index 50ae02b6f9..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/cjson/cJSON.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-  Copyright (c) 2009 Dave Gamble
- 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
- 
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
- 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-#ifndef cJSON__h
-#define cJSON__h
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* cJSON Types: */
-#define cJSON_False 0
-#define cJSON_True 1
-#define cJSON_NULL 2
-#define cJSON_Number 3
-#define cJSON_String 4
-#define cJSON_Array 5
-#define cJSON_Object 6
-    
-#define cJSON_IsReference 256
-
-/* The cJSON structure: */
-typedef struct cJSON {
-    struct cJSON *next,*prev;    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
-    struct cJSON *child;        /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
-
-    int type;                    /* The type of the item, as above. */
-
-    char *valuestring;            /* The item's string, if type==cJSON_String */
-    int valueint;                /* The item's number, if type==cJSON_Number */
-    double valuedouble;            /* The item's number, if type==cJSON_Number */
-
-    char *string;                /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
-} cJSON;
-
-typedef struct cJSON_Hooks {
-      void *(*malloc_fn)(size_t sz);
-      void (*free_fn)(void *ptr);
-} cJSON_Hooks;
-
-/* Supply malloc, realloc and free functions to cJSON */
-extern void cJSON_InitHooks(cJSON_Hooks* hooks);
-
-
-/* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */
-extern cJSON *cJSON_Parse(const char *value);
-/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */
-extern char  *cJSON_Print(cJSON *item);
-/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */
-extern char  *cJSON_PrintUnformatted(cJSON *item);
-/* Delete a cJSON entity and all subentities. */
-extern void   cJSON_Delete(cJSON *c);
-
-/* Returns the number of items in an array (or object). */
-extern int      cJSON_GetArraySize(cJSON *array);
-/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */
-extern cJSON *cJSON_GetArrayItem(cJSON *array,int item);
-/* Get item "string" from object. Case insensitive. */
-extern cJSON *cJSON_GetObjectItem(cJSON *object,const char *string);
-
-/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
-extern const char *cJSON_GetErrorPtr(void);
-    
-/* These calls create a cJSON item of the appropriate type. */
-extern cJSON *cJSON_CreateNull(void);
-extern cJSON *cJSON_CreateTrue(void);
-extern cJSON *cJSON_CreateFalse(void);
-extern cJSON *cJSON_CreateBool(int b);
-extern cJSON *cJSON_CreateNumber(double num);
-extern cJSON *cJSON_CreateString(const char *string);
-extern cJSON *cJSON_CreateArray(void);
-extern cJSON *cJSON_CreateObject(void);
-
-/* These utilities create an Array of count items. */
-extern cJSON *cJSON_CreateIntArray(int *numbers,int count);
-extern cJSON *cJSON_CreateFloatArray(float *numbers,int count);
-extern cJSON *cJSON_CreateDoubleArray(double *numbers,int count);
-extern cJSON *cJSON_CreateStringArray(const char **strings,int count);
-
-/* Append item to the specified array/object. */
-extern void cJSON_AddItemToArray(cJSON *array, cJSON *item);
-extern void    cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item);
-/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
-extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-extern void    cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item);
-
-/* Remove/Detatch items from Arrays/Objects. */
-extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which);
-extern void   cJSON_DeleteItemFromArray(cJSON *array,int which);
-extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string);
-extern void   cJSON_DeleteItemFromObject(cJSON *object,const char *string);
-    
-/* Update array items. */
-extern void cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem);
-extern void cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
-
-/* Duplicate a cJSON item */
-extern cJSON *cJSON_Duplicate(cJSON *item,int recurse);
-/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
-need to be released. With recurse!=0, it will duplicate any children connected to the item.
-The item->next and ->prev pointers are always zero on return from Duplicate. */
-
-/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
-extern cJSON *cJSON_ParseWithOpts(const char *value,const char **return_parse_end,int require_null_terminated);
-
-/* Macros for creating things quickly. */
-#define cJSON_AddNullToObject(object,name)        cJSON_AddItemToObject(object, name, cJSON_CreateNull())
-#define cJSON_AddTrueToObject(object,name)        cJSON_AddItemToObject(object, name, cJSON_CreateTrue())
-#define cJSON_AddFalseToObject(object,name)        cJSON_AddItemToObject(object, name, cJSON_CreateFalse())
-#define cJSON_AddBoolToObject(object,name,b)    cJSON_AddItemToObject(object, name, cJSON_CreateBool(b))
-#define cJSON_AddNumberToObject(object,name,n)    cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n))
-#define cJSON_AddStringToObject(object,name,s)    cJSON_AddItemToObject(object, name, cJSON_CreateString(s))
-
-/* When assigning an integer value, it needs to be propagated to valuedouble too. */
-#define cJSON_SetIntValue(object,val)            ((object)?(object)->valueint=(object)->valuedouble=(val):(val))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/offline/compilerStandalone.cpp b/Code/Tools/HLSLCrossCompiler/offline/compilerStandalone.cpp
deleted file mode 100644
index 5a22aa553f..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/compilerStandalone.cpp
+++ /dev/null
@@ -1,803 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include <inttypes.h>
-#include "hlslcc.hpp"
-#include "stdlib.h"
-#include "stdio.h"
-#include <string>
-#include <string.h>
-#include "hash.h"
-#include "serializeReflection.h"
-#include "hlslcc_bin.hpp"
-
-#include <algorithm>
-#include <cctype>
-
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <sys/stat.h>
-#endif
-
-#include "timer.h"
-
-#if defined(_WIN32) && !defined(PORTABLE)
-//#define VALIDATE_OUTPUT  // NOTE: THIS IS OK DURING HLSLcc DEV BUT SHOULD NOT BE USED IN PRODUCTION. SOME EXT USED ARE NO SUPPORTED ON WINDOWS.
-#endif
-
-#if defined(VALIDATE_OUTPUT)
-#if defined(_WIN32)
-#include <windows.h>
-#include <gl/GL.h>
-
- #pragma comment(lib, "opengl32.lib")
-
-typedef char GLcharARB;         /* native character */
-typedef unsigned int GLhandleARB;       /* shader object handle */
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB        0x8B84
-typedef void (WINAPI * PFNGLDELETEOBJECTARBPROC)(GLhandleARB obj);
-typedef GLhandleARB (WINAPI * PFNGLCREATESHADEROBJECTARBPROC)(GLenum shaderType);
-typedef void (WINAPI * PFNGLSHADERSOURCEARBPROC)(GLhandleARB shaderObj, GLsizei count, const GLcharARB** string, const GLint* length);
-typedef void (WINAPI * PFNGLCOMPILESHADERARBPROC)(GLhandleARB shaderObj);
-typedef void (WINAPI * PFNGLGETINFOLOGARBPROC)(GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB* infoLog);
-typedef void (WINAPI * PFNGLGETOBJECTPARAMETERIVARBPROC)(GLhandleARB obj, GLenum pname, GLint* params);
-typedef GLhandleARB (WINAPI * PFNGLCREATEPROGRAMOBJECTARBPROC)(void);
-typedef void (WINAPI * PFNGLATTACHOBJECTARBPROC)(GLhandleARB containerObj, GLhandleARB obj);
-typedef void (WINAPI * PFNGLLINKPROGRAMARBPROC)(GLhandleARB programObj);
-typedef void (WINAPI * PFNGLUSEPROGRAMOBJECTARBPROC)(GLhandleARB programObj);
-typedef void (WINAPI * PFNGLGETSHADERINFOLOGPROC)(GLuint shader, GLsizei bufSize, GLsizei* length, GLcharARB* infoLog);
-
-static PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
-static PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
-static PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
-static PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
-static PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
-static PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
-static PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
-static PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
-static PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
-static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
-static PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-
-#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
-#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
-#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
-#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
-#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
-#define WGL_CONTEXT_FLAGS_ARB 0x2094
-#define ERROR_INVALID_VERSION_ARB 0x2095
-#define ERROR_INVALID_PROFILE_ARB 0x2096
-
-#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
-#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
-#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
-
-typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC hDC, HGLRC hShareContext, const int* attribList);
-static PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
-
-void InitOpenGL()
-{
-    HGLRC rc;
-
-    // setup minimal required GL
-    HWND wnd = CreateWindowA(
-            "STATIC",
-            "GL",
-            WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS |    WS_CLIPCHILDREN,
-            0, 0, 16, 16,
-            NULL, NULL,
-            GetModuleHandle(NULL), NULL);
-    HDC dc = GetDC(wnd);
-
-    PIXELFORMATDESCRIPTOR pfd = {
-        sizeof(PIXELFORMATDESCRIPTOR), 1,
-        PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL,
-        PFD_TYPE_RGBA, 32,
-        0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0,
-        16, 0,
-        0, PFD_MAIN_PLANE, 0, 0, 0, 0
-    };
-
-    int fmt = ChoosePixelFormat(dc, &pfd);
-    SetPixelFormat(dc, fmt, &pfd);
-
-    rc = wglCreateContext(dc);
-    wglMakeCurrent(dc, rc);
-
-    wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)wglGetProcAddress("wglCreateContextAttribsARB");
-
-    if (wglCreateContextAttribsARB)
-    {
-        const int OpenGLContextAttribs [] = {
-            WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-            WGL_CONTEXT_MINOR_VERSION_ARB, 3,
-    #if defined(_DEBUG)
-            //WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB | WGL_CONTEXT_DEBUG_BIT_ARB,
-    #else
-            //WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
-    #endif
-            //WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-            0, 0
-        };
-
-        const HGLRC OpenGLContext = wglCreateContextAttribsARB(dc, 0, OpenGLContextAttribs);
-
-        wglMakeCurrent(dc, OpenGLContext);
-
-        wglDeleteContext(rc);
-
-        rc = OpenGLContext;
-    }
-
-    glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)wglGetProcAddress("glDeleteObjectARB");
-    glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)wglGetProcAddress("glCreateShaderObjectARB");
-    glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)wglGetProcAddress("glShaderSourceARB");
-    glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)wglGetProcAddress("glCompileShaderARB");
-    glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)wglGetProcAddress("glGetInfoLogARB");
-    glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)wglGetProcAddress("glGetObjectParameterivARB");
-    glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)wglGetProcAddress("glCreateProgramObjectARB");
-    glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)wglGetProcAddress("glAttachObjectARB");
-    glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)wglGetProcAddress("glLinkProgramARB");
-    glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)wglGetProcAddress("glUseProgramObjectARB");
-    glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)wglGetProcAddress("glGetShaderInfoLog");
-}
-#endif
-
-void PrintSingleLineError(FILE* pFile, const char* error)
-{
-    while (*error != '\0')
-    {
-        const char* pLineEnd = strchr(error, '\n');
-        if (pLineEnd == 0)
-        {
-            pLineEnd = error + strlen(error) - 1;
-        }
-        fwrite(error, 1, pLineEnd - error, pFile);
-        fwrite("\r", 1, 1, pFile);
-        error = pLineEnd + 1;
-    }
-}
-
-int TryCompileShader(GLenum eShaderType, const char* inFilename, const char* shader, double* pCompileTime, int useStdErr)
-{
-    GLint iCompileStatus;
-    GLuint hShader;
-    Timer_t timer;
-
-    InitTimer(&timer);
-
-    InitOpenGL();
-
-    hShader = glCreateShaderObjectARB(eShaderType);
-    glShaderSourceARB(hShader, 1, (const char**)&shader, NULL);
-
-    ResetTimer(&timer);
-    glCompileShaderARB(hShader);
-    *pCompileTime = ReadTimer(&timer);
-
-    /* Check it compiled OK */
-    glGetObjectParameterivARB (hShader, GL_OBJECT_COMPILE_STATUS_ARB, &iCompileStatus);
-
-    if (iCompileStatus != GL_TRUE)
-    {
-        FILE* errorFile = NULL;
-        GLint iInfoLogLength = 0;
-        char* pszInfoLog;
-
-        glGetObjectParameterivARB (hShader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &iInfoLogLength);
-
-        pszInfoLog = new char[iInfoLogLength];
-
-        printf("Error: Failed to compile GLSL shader\n");
-
-        glGetInfoLogARB (hShader, iInfoLogLength, NULL, pszInfoLog);
-
-        printf(pszInfoLog);
-
-        if (!useStdErr)
-        {
-            std::string filename;
-            filename += inFilename;
-            filename += "_compileErrors.txt";
-
-            //Dump to file
-            fopen_s(&errorFile, filename.c_str(), "w");
-
-            fclose(errorFile);
-        }
-        else
-        {
-            // Present error to stderror with no "new lines" as required by remote shader compiler
-            fprintf(stderr, "%s(-) error: ", inFilename);
-            PrintSingleLineError(stderr, pszInfoLog);
-            fprintf(stderr, "\rshader: ");
-            PrintSingleLineError(stderr, shader);
-        }
-
-        delete [] pszInfoLog;
-
-        return 0;
-    }
-
-    return 1;
-}
-#endif
-
-int fileExists(const char* path)
-{
-    FILE* shaderFile;
-    shaderFile = fopen(path, "rb");
-
-    if (shaderFile)
-    {
-        fclose(shaderFile);
-        return 1;
-    }
-    return 0;
-}
-
-GLLang LanguageFromString(const char* str)
-{
-    if (strcmp(str, "es100") == 0)
-    {
-        return LANG_ES_100;
-    }
-    if (strcmp(str, "es300") == 0)
-    {
-        return LANG_ES_300;
-    }
-    if (strcmp(str, "es310") == 0)
-    {
-        return LANG_ES_310;
-    }
-    if (strcmp(str, "120") == 0)
-    {
-        return LANG_120;
-    }
-    if (strcmp(str, "130") == 0)
-    {
-        return LANG_130;
-    }
-    if (strcmp(str, "140") == 0)
-    {
-        return LANG_140;
-    }
-    if (strcmp(str, "150") == 0)
-    {
-        return LANG_150;
-    }
-    if (strcmp(str, "330") == 0)
-    {
-        return LANG_330;
-    }
-    if (strcmp(str, "400") == 0)
-    {
-        return LANG_400;
-    }
-    if (strcmp(str, "410") == 0)
-    {
-        return LANG_410;
-    }
-    if (strcmp(str, "420") == 0)
-    {
-        return LANG_420;
-    }
-    if (strcmp(str, "430") == 0)
-    {
-        return LANG_430;
-    }
-    if (strcmp(str, "440") == 0)
-    {
-        return LANG_440;
-    }
-    return LANG_DEFAULT;
-}
-
-#define MAX_PATH_CHARS 256
-#define MAX_FXC_CMD_CHARS 1024
-
-typedef struct
-{
-    GLLang language;
-
-    int flags;
-
-    const char* shaderFile;
-    char* outputShaderFile;
-
-    char* reflectPath;
-
-    char cacheKey[MAX_PATH_CHARS];
-
-    int bUseFxc;
-    std::string fxcCmdLine;
-} Options;
-
-void InitOptions(Options* psOptions)
-{
-    psOptions->language = LANG_DEFAULT;
-    psOptions->flags = 0;
-    psOptions->reflectPath = NULL;
-
-    psOptions->shaderFile = NULL;
-
-    psOptions->bUseFxc = 0;
-}
-
-void PrintHelp()
-{
-    printf("Command line options:\n");
-
-    printf("\t-lang=X \t GLSL language to use. e.g. es100 or 140 or metal.\n");
-    printf("\t-flags=X \t The integer value of the HLSLCC_FLAGS to used.\n");
-    printf("\t-reflect=X \t File to write reflection JSON to.\n");
-    printf("\t-in=X \t Shader file to compile.\n");
-    printf("\t-out=X \t File to write the compiled shader from -in to.\n");
-
-    printf("\t-hashout=[dir/]out-file-name \t Output file name is a hash of 'out-file-name', put in the directory 'dir'.\n");
-
-    printf("\t-fxc=\"CMD\" HLSL compiler command line. If specified the input shader will be first compiled through this command first and then the resulting bytecode translated.\n");
-
-    printf("\n");
-}
-
-int GetOptions(int argc, char** argv, Options* psOptions)
-{
-    int i;
-    int fullShaderChain = -1;
-
-    InitOptions(psOptions);
-
-    for (i = 1; i < argc; i++)
-    {
-        char* option;
-
-        option = strstr(argv[i], "-help");
-        if (option != NULL)
-        {
-            PrintHelp();
-            return 0;
-        }
-
-        option = strstr(argv[i], "-reflect=");
-        if (option != NULL)
-        {
-            psOptions->reflectPath = option + strlen("-reflect=");
-        }
-
-        option = strstr(argv[i], "-lang=");
-        if (option != NULL)
-        {
-            psOptions->language = LanguageFromString((&option[strlen("-lang=")]));
-        }
-
-        option = strstr(argv[i], "-flags=");
-        if (option != NULL)
-        {
-            psOptions->flags = atol(&option[strlen("-flags=")]);
-        }
-
-        option = strstr(argv[i], "-in=");
-        if (option != NULL)
-        {
-            fullShaderChain = 0;
-            psOptions->shaderFile = option + strlen("-in=");
-            if (!fileExists(psOptions->shaderFile))
-            {
-                printf("Invalid path: %s\n", psOptions->shaderFile);
-                return 0;
-            }
-        }
-
-        option = strstr(argv[i], "-out=");
-        if (option != NULL)
-        {
-            fullShaderChain = 0;
-            psOptions->outputShaderFile = option + strlen("-out=");
-        }
-
-        option = strstr(argv[i], "-hashout");
-        if (option != NULL)
-        {
-            fullShaderChain = 0;
-            psOptions->outputShaderFile = option + strlen("-hashout=");
-
-            char* dir;
-            int64_t length;
-
-            uint64_t hash = hash64((const uint8_t*)psOptions->outputShaderFile, (uint32_t)strlen(psOptions->outputShaderFile), 0);
-
-
-            dir = strrchr(psOptions->outputShaderFile, '\\');
-
-            if (!dir)
-            {
-                dir = strrchr(psOptions->outputShaderFile, '//');
-            }
-
-            if (!dir)
-            {
-                length = 0;
-            }
-            else
-            {
-                length = (int)(dir - psOptions->outputShaderFile) + 1;
-            }
-
-            for (i = 0; i < length; ++i)
-            {
-                psOptions->cacheKey[i] = psOptions->outputShaderFile[i];
-            }
-
-            //sprintf(psOptions->cacheKey, "%x%x", high, low);
-            sprintf(&psOptions->cacheKey[i], "%010" PRIX64, hash);
-
-            psOptions->outputShaderFile = psOptions->cacheKey;
-        }
-
-        option = strstr(argv[i], "-fxc=");
-        if (option != NULL)
-        {
-            char* cmdLine = option + strlen("-fxc=");
-            size_t cmdLineLen = strlen(cmdLine);
-            if (cmdLineLen == 0 || cmdLineLen + 1 >= MAX_FXC_CMD_CHARS)
-            {
-                return 0;
-            }
-            psOptions->fxcCmdLine = std::string(cmdLine, cmdLineLen);
-            psOptions->bUseFxc = 1;
-        }
-    }
-
-    return 1;
-}
-
-void* malloc_hook(size_t size)
-{
-    return malloc(size);
-}
-void* calloc_hook(size_t num, size_t size)
-{
-    return calloc(num, size);
-}
-void* realloc_hook(void* p, size_t size)
-{
-    return realloc(p, size);
-}
-void free_hook(void* p)
-{
-    free(p);
-}
-
-int Run(const char* srcPath, const char* destPath, GLLang language, int flags, const char* reflectPath, GLSLShader* shader, int useStdErr)
-{
-    FILE* outputFile;
-    GLSLShader tempShader;
-    GLSLShader* result = shader ? shader : &tempShader;
-    Timer_t timer;
-    int compiledOK = 0;
-    double crossCompileTime = 0;
-
-    HLSLcc_SetMemoryFunctions(malloc_hook, calloc_hook, free_hook, realloc_hook);
-
-    InitTimer(&timer);
-
-    ResetTimer(&timer);
-    GlExtensions ext;
-    ext.ARB_explicit_attrib_location = 0;
-    ext.ARB_explicit_uniform_location = 0;
-    ext.ARB_shading_language_420pack = 0;
-    compiledOK = TranslateHLSLFromFile(srcPath, flags, language, &ext, result);
-
-    crossCompileTime = ReadTimer(&timer);
-
-    if (compiledOK)
-    {
-        printf("cc time: %.2f us\n", crossCompileTime);
-
-        if (destPath)
-        {
-            //Dump to file
-            outputFile = fopen(destPath, "w");
-            fprintf(outputFile, result->sourceCode);
-            fclose(outputFile);
-        }
-
-        if (reflectPath)
-        {
-            const char* jsonString = SerializeReflection(&result->reflection);
-            outputFile = fopen(reflectPath, "w");
-            fprintf(outputFile, jsonString);
-            fclose(outputFile);
-        }
-
-#if defined(VALIDATE_OUTPUT)
-        std::string shaderSource;
-        if (flags & HLSLCC_FLAG_NO_VERSION_STRING)
-        {
-            // Need to add the version string so that the shader will compile
-            shaderSource = GetVersionString(language);
-            shaderSource += result->sourceCode;
-        }
-        else
-        {
-            shaderSource = result->sourceCode;
-        }
-        compiledOK = TryCompileShader(result->shaderType, destPath ? destPath : "", shaderSource.c_str(), &glslCompileTime, useStdErr);
-
-        if (compiledOK)
-        {
-            printf("glsl time: %.2f us\n", glslCompileTime);
-        }
-#endif
-
-        if (!shader)
-        {
-            FreeGLSLShader(result);
-        }
-    }
-    else if (useStdErr)
-    {
-        fprintf(stderr, "TranslateHLSLFromFile failed");
-    }
-
-    return compiledOK;
-}
-
-struct SDXBCFile
-{
-    FILE* m_pFile;
-
-    bool Read(void* pElements, size_t uSize)
-    {
-        return fread(pElements, 1, uSize, m_pFile) == uSize;
-    }
-
-    bool Write(const void* pElements, size_t uSize)
-    {
-        return fwrite(pElements, 1, uSize, m_pFile) == uSize;
-    }
-
-    bool SeekRel(int32_t iOffset)
-    {
-        return fseek(m_pFile, iOffset, SEEK_CUR) == 0;
-    }
-
-    bool SeekAbs(uint32_t uPosition)
-    {
-        return fseek(m_pFile, uPosition, SEEK_SET) == 0;
-    }
-};
-
-int CombineDXBCWithGLSL(char* dxbcFileName, char* outputFileName, GLSLShader* shader)
-{
-    SDXBCFile dxbcFile = { fopen(dxbcFileName, "rb") };
-    SDXBCFile outputFile = { fopen(outputFileName, "wb") };
-
-    bool result =
-        dxbcFile.m_pFile != NULL && outputFile.m_pFile != NULL &&
-        DXBCCombineWithGLSL(dxbcFile, outputFile, shader);
-
-    if (dxbcFile.m_pFile != NULL)
-    {
-        fclose(dxbcFile.m_pFile);
-    }
-    if (outputFile.m_pFile != NULL)
-    {
-        fclose(outputFile.m_pFile);
-    }
-
-    return result;
-}
-
-#if !defined(_MSC_VER)
-#define sprintf_s(dest, size, ...) sprintf(dest, __VA_ARGS__)
-#endif
-
-#if defined(_WIN32) && defined(PORTABLE)
-
-DWORD FilterException(DWORD uExceptionCode)
-{
-    const char* szExceptionName;
-    char acTemp[10];
-    switch (uExceptionCode)
-    {
-#define _CASE(_Name)          \
-case _Name:                   \
-    szExceptionName = #_Name; \
-    break;
-        _CASE(EXCEPTION_ACCESS_VIOLATION)
-        _CASE(EXCEPTION_DATATYPE_MISALIGNMENT)
-        _CASE(EXCEPTION_BREAKPOINT)
-        _CASE(EXCEPTION_SINGLE_STEP)
-        _CASE(EXCEPTION_ARRAY_BOUNDS_EXCEEDED)
-        _CASE(EXCEPTION_FLT_DENORMAL_OPERAND)
-        _CASE(EXCEPTION_FLT_DIVIDE_BY_ZERO)
-        _CASE(EXCEPTION_FLT_INEXACT_RESULT)
-        _CASE(EXCEPTION_FLT_INVALID_OPERATION)
-        _CASE(EXCEPTION_FLT_OVERFLOW)
-        _CASE(EXCEPTION_FLT_STACK_CHECK)
-        _CASE(EXCEPTION_FLT_UNDERFLOW)
-        _CASE(EXCEPTION_INT_DIVIDE_BY_ZERO)
-        _CASE(EXCEPTION_INT_OVERFLOW)
-        _CASE(EXCEPTION_PRIV_INSTRUCTION)
-        _CASE(EXCEPTION_IN_PAGE_ERROR)
-        _CASE(EXCEPTION_ILLEGAL_INSTRUCTION)
-        _CASE(EXCEPTION_NONCONTINUABLE_EXCEPTION)
-        _CASE(EXCEPTION_STACK_OVERFLOW)
-        _CASE(EXCEPTION_INVALID_DISPOSITION)
-        _CASE(EXCEPTION_GUARD_PAGE)
-        _CASE(EXCEPTION_INVALID_HANDLE)
-        //_CASE(EXCEPTION_POSSIBLE_DEADLOCK)
-#undef _CASE
-    default:
-        sprintf_s(acTemp, "0x%08X", uExceptionCode);
-        szExceptionName = acTemp;
-    }
-
-    fprintf(stderr, "Hardware exception thrown (%s)\n", szExceptionName);
-    return 1;
-}
-
-#endif
-
-const char* PatchHLSLShaderFile(const char* path)
-{
-    // Need to transform "half" into "min16float" so FXC preserve min precision to the operands.
-    static char patchedFileName[MAX_PATH_CHARS];
-    const char* defines =   "#define half min16float\n"
-                            "#define half2 min16float2\n"
-                            "#define half3 min16float3\n"
-                            "#define half4 min16float4\n";
-
-    sprintf_s(patchedFileName, sizeof(patchedFileName), "%s.hlslPatched", path);
-    FILE* shaderFile = fopen(path, "rb");
-    if (!shaderFile)
-    {
-        return NULL;
-    }
-
-    FILE* patchedFile = fopen(patchedFileName, "wb");
-    if (!patchedFile)
-    {
-        return NULL;
-    }
-
-    // Get size of file
-    bool result = false;
-    fseek(shaderFile, 0, SEEK_END);
-    long size = ftell(shaderFile);
-    fseek(shaderFile, 0, SEEK_SET);
-    unsigned char* data = new unsigned char[size + 1]; // Extra byte for the '/0' character.
-    if (fread(data, 1, size, shaderFile) == size)
-    {
-        data[size] = '\0';
-        fprintf(patchedFile, "%s%s", defines, data);
-        result = true;
-    }
-
-    if (shaderFile)
-    {
-        fclose(shaderFile);
-    }
-
-    if (patchedFile)
-    {
-        fclose(patchedFile);
-    }
-
-    delete[] data;
-    return result ? patchedFileName : NULL;
-}
-
-int main(int argc, char** argv)
-{
-    Options options;
-
-#if defined(_WIN32) && defined(PORTABLE)
-    __try
-    {
-#endif
-
-    if (!GetOptions(argc, argv, &options))
-    {
-        return 1;
-    }
-
-    if (options.bUseFxc)
-    {
-        char dxbcFileName[MAX_PATH_CHARS];
-        char glslFileName[MAX_PATH_CHARS];
-        char fullFxcCmdLine[MAX_FXC_CMD_CHARS];
-        int retValue;
-
-        if (options.flags & HLSLCC_FLAG_HALF_FLOAT_TRANSFORM)
-        {
-            options.shaderFile = PatchHLSLShaderFile(options.shaderFile);
-            if (!options.shaderFile)
-            {
-                return 1;
-            }
-        }
-
-        sprintf_s(dxbcFileName, sizeof(dxbcFileName), "%s.dxbc", options.shaderFile);
-        sprintf_s(glslFileName, sizeof(glslFileName), "%s.patched", options.shaderFile);
-
-        // Need to extract the path to the executable so we can enclose it in quotes
-        // in case it contains spaces.
-        const std::string fxcExeName = "fxc.exe";
-
-        // Case insensitive search
-        std::string::iterator fxcPos = std::search(
-            options.fxcCmdLine.begin(), options.fxcCmdLine.end(),
-            fxcExeName.begin(), fxcExeName.end(),
-            [](char ch1, char ch2) { return std::tolower(ch1) == std::tolower(ch2); }
-        );
-
-        if (fxcPos == options.fxcCmdLine.end())
-        {
-            fprintf(stderr, "Could not find fxc.exe in command line");
-            return 1;
-        }
-
-        // Add the fxcExeName so it gets copied to the fxcExe path.
-        fxcPos += fxcExeName.length();
-        std::string fxcExe(options.fxcCmdLine.begin(), fxcPos);
-        std::string fxcArguments(fxcPos, options.fxcCmdLine.end());
-
-#if defined(APPLE)
-        fprintf(stderr, "fxc.exe cannot be executed on Mac");
-        return 1;
-#else
-        // Need an extra set of quotes around the full command line because the way "system" executes it using cmd.
-        sprintf_s(fullFxcCmdLine, sizeof(fullFxcCmdLine), "\"\"%s\" %s \"%s\" \"%s\"\"", fxcExe.c_str(), fxcArguments.c_str(), dxbcFileName, options.shaderFile);
-#endif
-
-        retValue = system(fullFxcCmdLine);
-
-        if (retValue == 0)
-        {
-            GLSLShader shader;
-            retValue = !Run(dxbcFileName, glslFileName, options.language, options.flags, options.reflectPath, &shader, 1);
-
-            if (retValue == 0)
-            {
-                retValue = !CombineDXBCWithGLSL(dxbcFileName, options.outputShaderFile, &shader);
-                FreeGLSLShader(&shader);
-            }
-        }
-
-        remove(dxbcFileName);
-        remove(glslFileName);
-        if (options.flags & HLSLCC_FLAG_HALF_FLOAT_TRANSFORM)
-        {
-            // Removed the hlsl patched file that was created.
-            remove(options.shaderFile);
-        }
-
-        return retValue;
-    }
-
-    if (options.shaderFile)
-    {
-        if (!Run(options.shaderFile, options.outputShaderFile, options.language, options.flags, options.reflectPath, NULL, 0))
-        {
-            return 1;
-        }
-    }
-
-#if defined(_WIN32) && defined(PORTABLE)
-}
-__except (FilterException(GetExceptionCode()))
-{
-    return 1;
-}
-#endif
-
-
-    return 0;
-}
diff --git a/Code/Tools/HLSLCrossCompiler/offline/hash.h b/Code/Tools/HLSLCrossCompiler/offline/hash.h
deleted file mode 100644
index f93f3b65d3..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/hash.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef HASH_H_
-#define HASH_H_
-
-/*
---------------------------------------------------------------------
-mix -- mix 3 64-bit values reversibly.
-mix() takes 48 machine instructions, but only 24 cycles on a superscalar
-  machine (like Intel's new MMX architecture).  It requires 4 64-bit
-  registers for 4::2 parallelism.
-All 1-bit deltas, all 2-bit deltas, all deltas composed of top bits of
-  (a,b,c), and all deltas of bottom bits were tested.  All deltas were
-  tested both on random keys and on keys that were nearly all zero.
-  These deltas all cause every bit of c to change between 1/3 and 2/3
-  of the time (well, only 113/400 to 287/400 of the time for some
-  2-bit delta).  These deltas all cause at least 80 bits to change
-  among (a,b,c) when the mix is run either forward or backward (yes it
-  is reversible).
-This implies that a hash using mix64 has no funnels.  There may be
-  characteristics with 3-bit deltas or bigger, I didn't test for
-  those.
---------------------------------------------------------------------
-*/
-#define mix64(a, b, c)                  \
-    {                                   \
-        a -= b; a -= c; a ^= (c >> 43); \
-        b -= c; b -= a; b ^= (a << 9);  \
-        c -= a; c -= b; c ^= (b >> 8);  \
-        a -= b; a -= c; a ^= (c >> 38); \
-        b -= c; b -= a; b ^= (a << 23); \
-        c -= a; c -= b; c ^= (b >> 5);  \
-        a -= b; a -= c; a ^= (c >> 35); \
-        b -= c; b -= a; b ^= (a << 49); \
-        c -= a; c -= b; c ^= (b >> 11); \
-        a -= b; a -= c; a ^= (c >> 12); \
-        b -= c; b -= a; b ^= (a << 18); \
-        c -= a; c -= b; c ^= (b >> 22); \
-    }
-
-/*
---------------------------------------------------------------------
-hash64() -- hash a variable-length key into a 64-bit value
-  k     : the key (the unaligned variable-length array of bytes)
-  len   : the length of the key, counting by bytes
-  level : can be any 8-byte value
-Returns a 64-bit value.  Every bit of the key affects every bit of
-the return value.  No funnels.  Every 1-bit and 2-bit delta achieves
-avalanche.  About 41+5len instructions.
-
-The best hash table sizes are powers of 2.  There is no need to do
-mod a prime (mod is sooo slow!).  If you need less than 64 bits,
-use a bitmask.  For example, if you need only 10 bits, do
-  h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (ub1 **)k, do it like this:
-  for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
-
-By Bob Jenkins, Jan 4 1997.  bob_jenkins@burtleburtle.net.  You may
-use this code any way you wish, private, educational, or commercial,
-but I would appreciate if you give me credit.
-
-See http://burtleburtle.net/bob/hash/evahash.html
-Use for hash table lookup, or anything where one collision in 2^^64
-is acceptable.  Do NOT use for cryptographic purposes.
---------------------------------------------------------------------
-*/
-
-static uint64_t hash64(const uint8_t* k, uint32_t length, uint64_t initval)
-{
-    uint64_t a, b, c, len;
-
-    /* Set up the internal state */
-    len = length;
-    a = b = initval;                       /* the previous hash value */
-    c = 0x9e3779b97f4a7c13LL; /* the golden ratio; an arbitrary value */
-
-    /*---------------------------------------- handle most of the key */
-    while (len >= 24)
-    {
-        a += (k[0]        + ((uint64_t)k[ 1] << 8) + ((uint64_t)k[ 2] << 16) + ((uint64_t)k[ 3] << 24)
-              + ((uint64_t)k[4 ] << 32) + ((uint64_t)k[ 5] << 40) + ((uint64_t)k[ 6] << 48) + ((uint64_t)k[ 7] << 56));
-        b += (k[8]        + ((uint64_t)k[ 9] << 8) + ((uint64_t)k[10] << 16) + ((uint64_t)k[11] << 24)
-              + ((uint64_t)k[12] << 32) + ((uint64_t)k[13] << 40) + ((uint64_t)k[14] << 48) + ((uint64_t)k[15] << 56));
-        c += (k[16]       + ((uint64_t)k[17] << 8) + ((uint64_t)k[18] << 16) + ((uint64_t)k[19] << 24)
-              + ((uint64_t)k[20] << 32) + ((uint64_t)k[21] << 40) + ((uint64_t)k[22] << 48) + ((uint64_t)k[23] << 56));
-        mix64(a, b, c);
-        k += 24;
-        len -= 24;
-    }
-
-    /*------------------------------------- handle the last 23 bytes */
-    c += length;
-    switch (len)           /* all the case statements fall through */
-    {
-    case 23:
-        c += ((uint64_t)k[22] << 56);
-    case 22:
-        c += ((uint64_t)k[21] << 48);
-    case 21:
-        c += ((uint64_t)k[20] << 40);
-    case 20:
-        c += ((uint64_t)k[19] << 32);
-    case 19:
-        c += ((uint64_t)k[18] << 24);
-    case 18:
-        c += ((uint64_t)k[17] << 16);
-    case 17:
-        c += ((uint64_t)k[16] << 8);
-    /* the first byte of c is reserved for the length */
-    case 16:
-        b += ((uint64_t)k[15] << 56);
-    case 15:
-        b += ((uint64_t)k[14] << 48);
-    case 14:
-        b += ((uint64_t)k[13] << 40);
-    case 13:
-        b += ((uint64_t)k[12] << 32);
-    case 12:
-        b += ((uint64_t)k[11] << 24);
-    case 11:
-        b += ((uint64_t)k[10] << 16);
-    case 10:
-        b += ((uint64_t)k[ 9] << 8);
-    case  9:
-        b += ((uint64_t)k[ 8]);
-    case  8:
-        a += ((uint64_t)k[ 7] << 56);
-    case  7:
-        a += ((uint64_t)k[ 6] << 48);
-    case  6:
-        a += ((uint64_t)k[ 5] << 40);
-    case  5:
-        a += ((uint64_t)k[ 4] << 32);
-    case  4:
-        a += ((uint64_t)k[ 3] << 24);
-    case  3:
-        a += ((uint64_t)k[ 2] << 16);
-    case  2:
-        a += ((uint64_t)k[ 1] << 8);
-    case  1:
-        a += ((uint64_t)k[ 0]);
-        /* case 0: nothing left to add */
-    }
-    mix64(a, b, c);
-    /*-------------------------------------------- report the result */
-    return c;
-}
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/offline/serializeReflection.cpp b/Code/Tools/HLSLCrossCompiler/offline/serializeReflection.cpp
deleted file mode 100644
index 15fe8d5b96..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/serializeReflection.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "serializeReflection.h"
-#include "cJSON.h"
-#include <string>
-#include <sstream>
-
-void* jsonMalloc(size_t sz)
-{
-    return new char[sz];
-}
-void jsonFree(void* ptr)
-{
-    char* charPtr = static_cast<char*>(ptr);
-    delete [] charPtr;
-}
-
-static void AppendIntToString(std::string& str, uint32_t num)
-{
-    std::stringstream ss;
-    ss << num;
-    str += ss.str();
-}
-
-static void WriteInOutSignature(InOutSignature* psSignature, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "SemanticName", cJSON_CreateString(psSignature->SemanticName));
-    cJSON_AddItemToObject(obj, "ui32SemanticIndex", cJSON_CreateNumber(psSignature->ui32SemanticIndex));
-    cJSON_AddItemToObject(obj, "eSystemValueType", cJSON_CreateNumber(psSignature->eSystemValueType));
-    cJSON_AddItemToObject(obj, "eComponentType", cJSON_CreateNumber(psSignature->eComponentType));
-    cJSON_AddItemToObject(obj, "ui32Register", cJSON_CreateNumber(psSignature->ui32Register));
-    cJSON_AddItemToObject(obj, "ui32Mask", cJSON_CreateNumber(psSignature->ui32Mask));
-    cJSON_AddItemToObject(obj, "ui32ReadWriteMask", cJSON_CreateNumber(psSignature->ui32ReadWriteMask));
-}
-
-static void WriteResourceBinding(ResourceBinding* psBinding, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psBinding->Name));
-    cJSON_AddItemToObject(obj, "eType", cJSON_CreateNumber(psBinding->eType));
-    cJSON_AddItemToObject(obj, "ui32BindPoint", cJSON_CreateNumber(psBinding->ui32BindPoint));
-    cJSON_AddItemToObject(obj, "ui32BindCount", cJSON_CreateNumber(psBinding->ui32BindCount));
-    cJSON_AddItemToObject(obj, "ui32Flags", cJSON_CreateNumber(psBinding->ui32Flags));
-    cJSON_AddItemToObject(obj, "eDimension", cJSON_CreateNumber(psBinding->eDimension));
-    cJSON_AddItemToObject(obj, "ui32ReturnType", cJSON_CreateNumber(psBinding->ui32ReturnType));
-    cJSON_AddItemToObject(obj, "ui32NumSamples", cJSON_CreateNumber(psBinding->ui32NumSamples));
-}
-
-static void WriteShaderVar(ShaderVar* psVar, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psVar->Name));
-    if(psVar->haveDefaultValue)
-    {
-        cJSON_AddItemToObject(obj, "aui32DefaultValues", cJSON_CreateIntArray((int*)psVar->pui32DefaultValues, psVar->ui32Size/4));
-    }
-    cJSON_AddItemToObject(obj, "ui32StartOffset", cJSON_CreateNumber(psVar->ui32StartOffset));
-    cJSON_AddItemToObject(obj, "ui32Size", cJSON_CreateNumber(psVar->ui32Size));
-}
-
-static void WriteConstantBuffer(ConstantBuffer* psCBuf, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psCBuf->Name));
-    cJSON_AddItemToObject(obj, "ui32NumVars", cJSON_CreateNumber(psCBuf->ui32NumVars));
-
-    for(uint32_t i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        std::string name;
-        name += "var";
-        AppendIntToString(name, i);
-
-        cJSON* varObj = cJSON_CreateObject();
-        cJSON_AddItemToObject(obj, name.c_str(), varObj);
-
-        WriteShaderVar(&psCBuf->asVars[i], varObj);
-    }
-
-    cJSON_AddItemToObject(obj, "ui32TotalSizeInBytes", cJSON_CreateNumber(psCBuf->ui32TotalSizeInBytes));
-}
-
-static void WriteClassType(ClassType* psClassType, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psClassType->Name));
-    cJSON_AddItemToObject(obj, "ui16ID", cJSON_CreateNumber(psClassType->ui16ID));
-    cJSON_AddItemToObject(obj, "ui16ConstBufStride", cJSON_CreateNumber(psClassType->ui16ConstBufStride));
-    cJSON_AddItemToObject(obj, "ui16Texture", cJSON_CreateNumber(psClassType->ui16Texture));
-    cJSON_AddItemToObject(obj, "ui16Sampler", cJSON_CreateNumber(psClassType->ui16Sampler));
-}
-
-static void WriteClassInstance(ClassInstance* psClassInst, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psClassInst->Name));
-    cJSON_AddItemToObject(obj, "ui16ID", cJSON_CreateNumber(psClassInst->ui16ID));
-    cJSON_AddItemToObject(obj, "ui16ConstBuf", cJSON_CreateNumber(psClassInst->ui16ConstBuf));
-    cJSON_AddItemToObject(obj, "ui16ConstBufOffset", cJSON_CreateNumber(psClassInst->ui16ConstBufOffset));
-    cJSON_AddItemToObject(obj, "ui16Texture", cJSON_CreateNumber(psClassInst->ui16Texture));
-    cJSON_AddItemToObject(obj, "ui16Sampler", cJSON_CreateNumber(psClassInst->ui16Sampler));
-}
-
-const char* SerializeReflection(ShaderInfo* psReflection)
-{
-    cJSON* root;
-
-    cJSON_Hooks hooks;
-    hooks.malloc_fn = jsonMalloc;
-    hooks.free_fn = jsonFree;
-    cJSON_InitHooks(&hooks);
-
-    root=cJSON_CreateObject();
-    cJSON_AddItemToObject(root, "ui32MajorVersion", cJSON_CreateNumber(psReflection->ui32MajorVersion));
-    cJSON_AddItemToObject(root, "ui32MinorVersion", cJSON_CreateNumber(psReflection->ui32MinorVersion));
-
-    cJSON_AddItemToObject(root, "ui32NumInputSignatures", cJSON_CreateNumber(psReflection->ui32NumInputSignatures));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumInputSignatures; ++i)
-    {
-        std::string name;
-        name += "input";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteInOutSignature(psReflection->psInputSignatures+i, obj);
-    }
-
-    cJSON_AddItemToObject(root, "ui32NumOutputSignatures", cJSON_CreateNumber(psReflection->ui32NumOutputSignatures));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumOutputSignatures; ++i)
-    {
-        std::string name;
-        name += "output";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteInOutSignature(psReflection->psOutputSignatures+i, obj);
-    }
-
-    cJSON_AddItemToObject(root, "ui32NumResourceBindings", cJSON_CreateNumber(psReflection->ui32NumResourceBindings));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumResourceBindings; ++i)
-    {
-        std::string name;
-        name += "resource";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteResourceBinding(psReflection->psResourceBindings+i, obj);
-    }
-
-    cJSON_AddItemToObject(root, "ui32NumConstantBuffers", cJSON_CreateNumber(psReflection->ui32NumConstantBuffers));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumConstantBuffers; ++i)
-    {
-        std::string name;
-        name += "cbuf";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteConstantBuffer(psReflection->psConstantBuffers+i, obj);
-    }
-
-    //psThisPointerConstBuffer is a cache. Don't need to write this out.
-    //It just points to the $ThisPointer cbuffer within the psConstantBuffers array.
-
-    for(uint32_t i = 0; i < psReflection->ui32NumClassTypes; ++i)
-    {
-        std::string name;
-        name += "classType";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteClassType(psReflection->psClassTypes+i, obj);
-    }
-
-    for(uint32_t i = 0; i < psReflection->ui32NumClassInstances; ++i)
-    {
-        std::string name;
-        name += "classInst";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteClassInstance(psReflection->psClassInstances+i, obj);
-    }
-
-    //psReflection->aui32TableIDToTypeID
-    //psReflection->aui32ConstBufferBindpointRemap
-
-    cJSON_AddItemToObject(root, "eTessPartitioning", cJSON_CreateNumber(psReflection->eTessPartitioning));
-    cJSON_AddItemToObject(root, "eTessOutPrim", cJSON_CreateNumber(psReflection->eTessOutPrim));
-
-
-    const char* jsonString = cJSON_Print(root);
-
-    cJSON_Delete(root);
-
-    return jsonString;
-}
diff --git a/Code/Tools/HLSLCrossCompiler/offline/serializeReflection.h b/Code/Tools/HLSLCrossCompiler/offline/serializeReflection.h
deleted file mode 100644
index c8c4175a6a..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/serializeReflection.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef SERIALIZE_REFLECTION_H_
-#define SERIALIZE_REFLECTION_H_
-
-#include "hlslcc.h"
-
-const char* SerializeReflection(ShaderInfo* psReflection);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/offline/timer.cpp b/Code/Tools/HLSLCrossCompiler/offline/timer.cpp
deleted file mode 100644
index c707e1bfa8..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/timer.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "timer.h"
-
-void InitTimer(Timer_t* psTimer)
-{
-#if defined(_WIN32)
-    QueryPerformanceFrequency(&psTimer->frequency);
-#endif
-}
-
-void ResetTimer(Timer_t* psTimer)
-{
-#if defined(_WIN32)
-    QueryPerformanceCounter(&psTimer->startCount);
-#else
-    gettimeofday(&psTimer->startCount, 0);
-#endif
-}
-
-/* Returns time in micro seconds */
-double ReadTimer(Timer_t* psTimer)
-{
-    double startTimeInMicroSec, endTimeInMicroSec;
-
-#if defined(_WIN32)
-    const double freq = (1000000.0 / psTimer->frequency.QuadPart);
-    QueryPerformanceCounter(&psTimer->endCount);
-    startTimeInMicroSec = psTimer->startCount.QuadPart * freq;
-    endTimeInMicroSec = psTimer->endCount.QuadPart * freq;
-#else
-    gettimeofday(&psTimer->endCount, 0);
-    startTimeInMicroSec = (psTimer->startCount.tv_sec * 1000000.0) + psTimer->startCount.tv_usec;
-    endTimeInMicroSec = (psTimer->endCount.tv_sec * 1000000.0) + psTimer->endCount.tv_usec;
-#endif
-
-    return endTimeInMicroSec - startTimeInMicroSec;
-}
-
diff --git a/Code/Tools/HLSLCrossCompiler/offline/timer.h b/Code/Tools/HLSLCrossCompiler/offline/timer.h
deleted file mode 100644
index 3f4ea333fd..0000000000
--- a/Code/Tools/HLSLCrossCompiler/offline/timer.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TIMER_H
-#define TIMER_H
-
-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <sys/time.h>
-#endif
-
-typedef struct
-{
-#ifdef _WIN32
-    LARGE_INTEGER frequency;
-    LARGE_INTEGER startCount;
-    LARGE_INTEGER endCount;
-#else
-    struct timeval startCount;
-    struct timeval endCount;
-#endif
-} Timer_t;
-
-void InitTimer(Timer_t* psTimer);
-void ResetTimer(Timer_t* psTimer);
-double ReadTimer(Timer_t* psTimer);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/amazon_changes.c b/Code/Tools/HLSLCrossCompiler/src/amazon_changes.c
deleted file mode 100644
index 7b339ba93e..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/amazon_changes.c
+++ /dev/null
@@ -1,219 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/toGLSLInstruction.h"
-#include "internal_includes/toGLSLOperand.h"
-#include "internal_includes/languages.h"
-#include "bstrlib.h"
-#include "stdio.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "amazon_changes.h"
-
-#if defined(__clang__)
-#pragma clang diagnostic ignored "-Wpointer-sign"
-#endif
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-
-// These are .c files, so no C++ or C++11 for us :(
-#define MAX_VARIABLE_LENGTH 16
-
-// This struct is used to keep track of each valid occurance of xxxBitsToxxx(variable) and store all relevant information for fixing that instance
-typedef struct ShaderCastLocation
-{
-    char tempVariableName[MAX_VARIABLE_LENGTH];
-    char replacementVariableName[MAX_VARIABLE_LENGTH];
-    unsigned int castType;
-
-    // Since we have no stl, here's our list
-    struct ShaderCastLocation* next;
-} ShaderCastLocation;
-
-// Structure used to prebuild the list of all functions that need to be replaced.
-typedef struct ShaderCastType
-{
-    const char* functionName;
-    unsigned int castType;
-    const char* variableTypeName; // String for the variable type used when declaring a temporary variable to replace the source temp vector
-} ShaderCastType;
-
-enum ShaderCasts
-{
-    CAST_UINTBITSTOFLOAT,
-    CAST_INTBITSTOFLOAT,
-    CAST_FLOATBITSTOUINT,
-    CAST_FLOATBITSTOINT,
-    CAST_NUMCASTS
-};
-
-// NOTICE: Order is important here because intBitsToFloat is a substring of uintBitsToFloat, so do not change the ordering here!
-static const ShaderCastType s_castFunctions[CAST_NUMCASTS] =
-{
-    { "uintBitsToFloat",    CAST_UINTBITSTOFLOAT,   "uvec4" },
-    { "intBitsToFloat",     CAST_INTBITSTOFLOAT,    "ivec4" },
-    { "floatBitsToUint",    CAST_FLOATBITSTOUINT,   "vec4" },
-    { "floatBitsToInt",     CAST_FLOATBITSTOINT,    "vec4" }
-};
-
-int IsValidUseCase( char* variableStart, char* outVariableName, ShaderCastLocation* foundShaderCastsHead, int currentType )
-{
-    // Cases we have to replace (this is very strict in definition):
-    // 1) floatBitsToInt(Temp2)
-    // 2) floatBitsToInt(Temp2.x)
-    // 3) floatBitsToInt(Temp[0])
-    // 4) floatBitsToInt(Temp[0].x)
-    // Cases we do not have to replace:
-    // 1) floatBitsToInt(vec4(Temp2))
-    // 2) floatBitsToInt(Output0.x != 0.0f ? 1.0f : 0.0f)
-    // 3) Any other version that evaluates an expression within the ()
-    if ( strncmp(variableStart, "Temp", 4) != 0 )
-        return 0;
-
-    unsigned int lengthOfVariable = 4; // Start at 4 for temp
-
-    while ( 1 )
-    {
-        char val = *(variableStart + lengthOfVariable);
-
-        // If alphanumeric or [] (array), we have a valid variable name
-        if ( isalnum( val ) || (val == '[') || (val == ']') )
-        {
-            lengthOfVariable++;
-        }
-        else if ( (val == ')') || (val == '.') )
-        {
-            // Found end of variable
-            break;
-        }
-        else
-        {
-            // Found something unexpected, so abort
-            return 0;
-        }
-    }
-
-    ASSERT( lengthOfVariable < MAX_VARIABLE_LENGTH );
-
-    // Now ensure that no duplicates of this declaration already exist
-    ShaderCastLocation* currentLink = foundShaderCastsHead;
-    while ( currentLink )
-    {
-        // If we have the same type and the same name
-        if ( (currentType == currentLink->castType) && (strncmp(variableStart, currentLink->tempVariableName, lengthOfVariable) == 0) )
-            return 0; // Do not add because an entry already exists for this variable and this cast function
-
-        // Hmm...I guess this scenario is possible, but it has not shown up in any shaders.
-        // The only time we could ever hit this is if the same line casts a float to both an int and uint in separate calls
-        // Seems highly unlikely, so let's just assert for now and fix it if we have to.
-        if ( strncmp(variableStart, currentLink->tempVariableName, lengthOfVariable) == 0 )
-        {
-            // TODO: Implement this case where we cast the same variable to multiple types on the same line of GLSL
-            ASSERT(0);
-        }
-
-        currentLink = currentLink->next;
-    }
-
-    // We found a unique instance, so store it
-    strncpy( outVariableName, variableStart, lengthOfVariable );
-    return 1;
-}
-
-void ModifyLineForQualcommReinterpretCastBug( HLSLCrossCompilerContext* psContext, bstring* originalString, bstring* overloadString )
-{
-    unsigned int numFoundCasts = 0;
-
-    ShaderCastLocation* foundShaderCastsHead = NULL;
-    ShaderCastLocation* currentShaderCasts = NULL;
-
-    // Find all occurances of the *BitsTo* functions
-    // Note that this would be cleaner, but 'intBitsToFloat' is a substring of 'uintBitsToFloat' so parsing order is important here.
-    char* parsingString = bdataofs(*overloadString, 0);
-    while ( parsingString )
-    {
-        char* result = NULL;
-
-        for ( int index=0; index<CAST_NUMCASTS; ++index )
-        {
-            result = strstr( parsingString, s_castFunctions[index].functionName );
-            if ( result != NULL )
-            {
-                // Now determine if this is a case that requires a workaround
-                char* variableStart = result + strlen( s_castFunctions[index].functionName ) + 1; // Add the function name + first parenthesis
-                char tempVariableName[MAX_VARIABLE_LENGTH];
-                memset( tempVariableName, 0, MAX_VARIABLE_LENGTH );
-
-                // Now the next word must be Temp, or this is not a valid case
-                if ( IsValidUseCase( variableStart, tempVariableName, foundShaderCastsHead, index ) )
-                {
-                    // Now store the information about this cast.  Allocate a new link in the list.
-                    if ( !foundShaderCastsHead )
-                    {
-                        foundShaderCastsHead = (ShaderCastLocation*)hlslcc_malloc( sizeof(ShaderCastLocation) );
-                        memset( foundShaderCastsHead, 0x0, sizeof(ShaderCastLocation) );
-                        currentShaderCasts = foundShaderCastsHead;
-                    }
-                    else
-                    {
-                        ASSERT( !currentShaderCasts->next );
-                        currentShaderCasts->next = (ShaderCastLocation*)hlslcc_malloc( sizeof(ShaderCastLocation) );
-                        memset( currentShaderCasts->next, 0x0, sizeof(ShaderCastLocation) );
-                        currentShaderCasts = currentShaderCasts->next;
-                    }
-
-                    currentShaderCasts->castType = index;
-                    strcpy( currentShaderCasts->tempVariableName, tempVariableName );
-
-                    numFoundCasts++;
-                }
-                result += strlen( s_castFunctions[index].functionName );
-
-                // Break out of the loop because we have to advance the search string and start over with uintBitsToFloat again due to the problem with intBitsToFloat being a substring
-                break;
-            }
-        }
-
-        parsingString = result;
-    }
-
-    // If we have found no casts, then append the line to the primary string
-    if ( numFoundCasts == 0 )
-    {
-        bconcat( *originalString, *overloadString );
-        return;
-    }
-
-    // Now we start creating our temporary variables to workaround the crash
-    currentShaderCasts = foundShaderCastsHead;
-
-    // NOTE: We want a count of all variables processed for this entire shader.  This could be fancier...
-    static unsigned int currentVariableIndex = 0;
-
-    while ( currentShaderCasts )
-    {
-        // Generate new variable name
-        sprintf( currentShaderCasts->replacementVariableName, "LYTemp%i", currentVariableIndex );
-
-        // Write out the new variable name declaration and initialize it
-        AddIndentation( psContext );
-        bformata( *originalString, "%s %s=%s;\n", s_castFunctions[currentShaderCasts->castType].variableTypeName, currentShaderCasts->replacementVariableName, currentShaderCasts->tempVariableName );
-
-        // Now replace all instances of the variable in question with the new variable name.
-        // Note: We can't do a breplace on the temp variable name because the variable can still be legally used without a reinterpret cast in that line.
-        // Do a full replace on the xxBitsToxx(TempVar) here
-        bstring tempVarName = bformat( "%s(%s)", s_castFunctions[currentShaderCasts->castType].functionName, currentShaderCasts->tempVariableName );
-        bstring replacementVarName = bformat( "%s(%s)", s_castFunctions[currentShaderCasts->castType].functionName, currentShaderCasts->replacementVariableName );
-        bfindreplace( *overloadString, tempVarName, replacementVarName, 0 );
-
-        // Cleanup bstrings allocated from bformat
-        bdestroy( tempVarName );
-        bdestroy( replacementVarName );
-
-        currentVariableIndex++;
-        currentShaderCasts = currentShaderCasts->next;
-    }
-
-    // Now append our modified string to the full shader file
-    bconcat( *originalString, *overloadString );
-}
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/bsafe.c b/Code/Tools/HLSLCrossCompiler/src/cbstring/bsafe.c
deleted file mode 100644
index 3f24fa3341..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/bsafe.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bsafe.c
- *
- * This is an optional module that can be used to help enforce a safety
- * standard based on pervasive usage of bstrlib.  This file is not necessarily
- * portable, however, it has been tested to work correctly with Intel's C/C++
- * compiler, WATCOM C/C++ v11.x and Microsoft Visual C++.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "bsafe.h"
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/bsafe.h b/Code/Tools/HLSLCrossCompiler/src/cbstring/bsafe.h
deleted file mode 100644
index 3a647a6ac8..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/bsafe.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bsafe.h
- *
- * This is an optional module that can be used to help enforce a safety
- * standard based on pervasive usage of bstrlib.  This file is not necessarily
- * portable, however, it has been tested to work correctly with Intel's C/C++
- * compiler, WATCOM C/C++ v11.x and Microsoft Visual C++.
- */
-
-#ifndef BSTRLIB_BSAFE_INCLUDE
-#define BSTRLIB_BSAFE_INCLUDE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(__GNUC__) && !defined(__clang__)
-#if !defined (__GNUC__) && (!defined(_MSC_VER) || (_MSC_VER <= 1310))
-/* This is caught in the linker, so its not necessary for gcc. */
-extern char * (gets) (char * buf);
-#endif
-
-extern char * (strncpy) (char *dst, const char *src, size_t n);
-extern char * (strncat) (char *dst, const char *src, size_t n);
-extern char * (strtok) (char *s1, const char *s2);
-extern char * (strdup) (const char *s);
-
-#undef strcpy
-#undef strcat
-#define strcpy(a,b) bsafe_strcpy(a,b) 
-#define strcat(a,b) bsafe_strcat(a,b) 
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstraux.c b/Code/Tools/HLSLCrossCompiler/src/cbstring/bstraux.c
deleted file mode 100644
index 2dc7b04840..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstraux.c
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstraux.c
- *
- * This file is not necessarily part of the core bstring library itself, but
- * is just an auxilliary module which includes miscellaneous or trivial 
- * functions.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include "bstrlib.h"
-#include "bstraux.h"
-
-/*  bstring bTail (bstring b, int n)
- *
- *  Return with a string of the last n characters of b.
- */
-bstring bTail (bstring b, int n) {
-    if (b == NULL || n < 0 || (b->mlen < b->slen && b->mlen > 0)) return NULL;
-    if (n >= b->slen) return bstrcpy (b);
-    return bmidstr (b, b->slen - n, n);
-}
-
-/*  bstring bHead (bstring b, int n)
- *
- *  Return with a string of the first n characters of b.
- */
-bstring bHead (bstring b, int n) {
-    if (b == NULL || n < 0 || (b->mlen < b->slen && b->mlen > 0)) return NULL;
-    if (n >= b->slen) return bstrcpy (b);
-    return bmidstr (b, 0, n);
-}
-
-/*  int bFill (bstring a, char c, int len)
- *
- *  Fill a given bstring with the character in parameter c, for a length n.
- */
-int bFill (bstring b, char c, int len) {
-    if (b == NULL || len < 0 || (b->mlen < b->slen && b->mlen > 0)) return -__LINE__;
-    b->slen = 0;
-    return bsetstr (b, len, NULL, c);
-}
-
-/*  int bReplicate (bstring b, int n)
- *
- *  Replicate the contents of b end to end n times and replace it in b.
- */
-int bReplicate (bstring b, int n) {
-    return bpattern (b, n * b->slen);
-}
-
-/*  int bReverse (bstring b)
- *
- *  Reverse the contents of b in place.
- */
-int bReverse (bstring b) {
-int i, n, m;
-unsigned char t;
-
-    if (b == NULL || b->slen < 0 || b->mlen < b->slen) return -__LINE__;
-    n = b->slen;
-    if (2 <= n) {
-        m = ((unsigned)n) >> 1;
-        n--;
-        for (i=0; i < m; i++) {
-            t = b->data[n - i];
-            b->data[n - i] = b->data[i];
-            b->data[i] = t;
-        }
-    }
-    return 0;
-}
-
-/*  int bInsertChrs (bstring b, int pos, int len, unsigned char c, unsigned char fill)
- *
- *  Insert a repeated sequence of a given character into the string at 
- *  position pos for a length len.
- */
-int bInsertChrs (bstring b, int pos, int len, unsigned char c, unsigned char fill) {
-    if (b == NULL || b->slen < 0 || b->mlen < b->slen || pos < 0 || len <= 0) return -__LINE__;
-
-    if (pos > b->slen 
-     && 0 > bsetstr (b, pos, NULL, fill)) return -__LINE__;
-
-    if (0 > balloc (b, b->slen + len)) return -__LINE__;
-    if (pos < b->slen) memmove (b->data + pos + len, b->data + pos, b->slen - pos);
-    memset (b->data + pos, c, len);
-    b->slen += len;
-    b->data[b->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bJustifyLeft (bstring b, int space)
- *
- *  Left justify a string.
- */
-int bJustifyLeft (bstring b, int space) {
-int j, i, s, t;
-unsigned char c = (unsigned char) space;
-
-    if (b == NULL || b->slen < 0 || b->mlen < b->slen) return -__LINE__;
-    if (space != (int) c) return BSTR_OK;
-
-    for (s=j=i=0; i < b->slen; i++) {
-        t = s;
-        s = c != (b->data[j] = b->data[i]);
-        j += (t|s);
-    }
-    if (j > 0 && b->data[j-1] == c) j--;
-
-    b->data[j] = (unsigned char) '\0';
-    b->slen = j;
-    return BSTR_OK;
-}
-
-/*  int bJustifyRight (bstring b, int width, int space)
- *
- *  Right justify a string to within a given width.
- */
-int bJustifyRight (bstring b, int width, int space) {
-int ret;
-    if (width <= 0) return -__LINE__;
-    if (0 > (ret = bJustifyLeft (b, space))) return ret;
-    if (b->slen <= width)
-        return bInsertChrs (b, 0, width - b->slen, (unsigned char) space, (unsigned char) space);
-    return BSTR_OK;
-}
-
-/*  int bJustifyCenter (bstring b, int width, int space)
- *
- *  Center a string's non-white space characters to within a given width by
- *  inserting whitespaces at the beginning.
- */
-int bJustifyCenter (bstring b, int width, int space) {
-int ret;
-    if (width <= 0) return -__LINE__;
-    if (0 > (ret = bJustifyLeft (b, space))) return ret;
-    if (b->slen <= width)
-        return bInsertChrs (b, 0, (width - b->slen + 1) >> 1, (unsigned char) space, (unsigned char) space);
-    return BSTR_OK;
-}
-
-/*  int bJustifyMargin (bstring b, int width, int space)
- *
- *  Stretch a string to flush against left and right margins by evenly
- *  distributing additional white space between words.  If the line is too
- *  long to be margin justified, it is left justified.
- */
-int bJustifyMargin (bstring b, int width, int space) {
-struct bstrList * sl;
-int i, l, c;
-
-    if (b == NULL || b->slen < 0 || b->mlen == 0 || b->mlen < b->slen) return -__LINE__;
-    if (NULL == (sl = bsplit (b, (unsigned char) space))) return -__LINE__;
-    for (l=c=i=0; i < sl->qty; i++) {
-        if (sl->entry[i]->slen > 0) {
-            c ++;
-            l += sl->entry[i]->slen;
-        }
-    }
-
-    if (l + c >= width || c < 2) {
-        bstrListDestroy (sl);
-        return bJustifyLeft (b, space);
-    }
-
-    b->slen = 0;
-    for (i=0; i < sl->qty; i++) {
-        if (sl->entry[i]->slen > 0) {
-            if (b->slen > 0) {
-                int s = (width - l + (c / 2)) / c;
-                bInsertChrs (b, b->slen, s, (unsigned char) space, (unsigned char) space);
-                l += s;
-            }
-            bconcat (b, sl->entry[i]);
-            c--;
-            if (c <= 0) break;
-        }
-    }
-
-    bstrListDestroy (sl);
-    return BSTR_OK;
-}
-
-static size_t readNothing (void *buff, size_t elsize, size_t nelem, void *parm) {
-    buff = buff;
-    elsize = elsize;
-    nelem = nelem;
-    parm = parm;
-    return 0; /* Immediately indicate EOF. */
-}
-
-/*  struct bStream * bsFromBstr (const_bstring b);
- *
- *  Create a bStream whose contents are a copy of the bstring passed in.
- *  This allows the use of all the bStream APIs with bstrings.
- */
-struct bStream * bsFromBstr (const_bstring b) {
-struct bStream * s = bsopen ((bNread) readNothing, NULL);
-    bsunread (s, b); /* Push the bstring data into the empty bStream. */
-    return s;
-}
-
-static size_t readRef (void *buff, size_t elsize, size_t nelem, void *parm) {
-struct tagbstring * t = (struct tagbstring *) parm;
-size_t tsz = elsize * nelem;
-
-    if (tsz > (size_t) t->slen) tsz = (size_t) t->slen;
-    if (tsz > 0) {
-        memcpy (buff, t->data, tsz);
-        t->slen -= (int) tsz;
-        t->data += tsz;
-        return tsz / elsize;
-    }
-    return 0;
-}
-
-/*  The "by reference" version of the above function.  This function puts
- *  a number of restrictions on the call site (the passed in struct 
- *  tagbstring *will* be modified by this function, and the source data
- *  must remain alive and constant for the lifetime of the bStream).  
- *  Hence it is not presented as an extern.
- */
-static struct bStream * bsFromBstrRef (struct tagbstring * t) {
-    if (!t) return NULL;
-    return bsopen ((bNread) readRef, t);
-}
-
-/*  char * bStr2NetStr (const_bstring b)
- *
- *  Convert a bstring to a netstring.  See 
- *  http://cr.yp.to/proto/netstrings.txt for a description of netstrings.
- *  Note: 1) The value returned should be freed with a call to bcstrfree() at 
- *           the point when it will no longer be referenced to avoid a memory 
- *           leak.
- *        2) If the returned value is non-NULL, then it also '\0' terminated
- *           in the character position one past the "," terminator.
- */
-char * bStr2NetStr (const_bstring b) {
-char strnum[sizeof (b->slen) * 3 + 1];
-bstring s;
-unsigned char * buff;
-
-    if (b == NULL || b->data == NULL || b->slen < 0) return NULL;
-    sprintf (strnum, "%d:", b->slen);
-    if (NULL == (s = bfromcstr (strnum))
-     || bconcat (s, b) == BSTR_ERR || bconchar (s, (char) ',') == BSTR_ERR) {
-        bdestroy (s);
-        return NULL;
-    }
-    buff = s->data;
-    bcstrfree ((char *) s);
-    return (char *) buff;
-}
-
-/*  bstring bNetStr2Bstr (const char * buf)
- *
- *  Convert a netstring to a bstring.  See 
- *  http://cr.yp.to/proto/netstrings.txt for a description of netstrings.
- *  Note that the terminating "," *must* be present, however a following '\0'
- *  is *not* required.
- */
-bstring bNetStr2Bstr (const char * buff) {
-int i, x;
-bstring b;
-    if (buff == NULL) return NULL;
-    x = 0;
-    for (i=0; buff[i] != ':'; i++) {
-        unsigned int v = buff[i] - '0';
-        if (v > 9 || x > ((INT_MAX - (signed int)v) / 10)) return NULL;
-        x = (x * 10) + v;
-    }
-
-    /* This thing has to be properly terminated */
-    if (buff[i + 1 + x] != ',') return NULL;
-
-    if (NULL == (b = bfromcstr (""))) return NULL;
-    if (balloc (b, x + 1) != BSTR_OK)  {
-        bdestroy (b);
-        return NULL;
-    }
-    memcpy (b->data, buff + i + 1, x);
-    b->data[x] = (unsigned char) '\0';
-    b->slen = x;
-    return b;
-}
-
-static char b64ETable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/*  bstring bBase64Encode (const_bstring b)
- *
- *  Generate a base64 encoding.  See: RFC1341
- */
-bstring bBase64Encode (const_bstring b) {
-int i, c0, c1, c2, c3;
-bstring out;
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-
-    out = bfromcstr ("");
-    for (i=0; i + 2 < b->slen; i += 3) {
-        if (i && ((i % 57) == 0)) {
-            if (bconchar (out, (char) '\015') < 0 || bconchar (out, (char) '\012') < 0) {
-                bdestroy (out);
-                return NULL;
-            }
-        }
-        c0 = b->data[i] >> 2;
-        c1 = ((b->data[i] << 4) |
-              (b->data[i+1] >> 4)) & 0x3F;
-        c2 = ((b->data[i+1] << 2) |
-              (b->data[i+2] >> 6)) & 0x3F;
-        c3 = b->data[i+2] & 0x3F;
-        if (bconchar (out, b64ETable[c0]) < 0 ||
-            bconchar (out, b64ETable[c1]) < 0 ||
-            bconchar (out, b64ETable[c2]) < 0 ||
-            bconchar (out, b64ETable[c3]) < 0) {
-            bdestroy (out);
-            return NULL;
-        }
-    }
-
-    if (i && ((i % 57) == 0)) {
-        if (bconchar (out, (char) '\015') < 0 || bconchar (out, (char) '\012') < 0) {
-            bdestroy (out);
-            return NULL;
-        }
-    }
-
-    switch (i + 2 - b->slen) {
-        case 0:    c0 = b->data[i] >> 2;
-                c1 = ((b->data[i] << 4) |
-                      (b->data[i+1] >> 4)) & 0x3F;
-                c2 = (b->data[i+1] << 2) & 0x3F;
-            if (bconchar (out, b64ETable[c0]) < 0 ||
-                bconchar (out, b64ETable[c1]) < 0 ||
-                bconchar (out, b64ETable[c2]) < 0 ||
-                bconchar (out, (char) '=') < 0) {
-                bdestroy (out);
-                return NULL;
-            }
-            break;
-        case 1:    c0 =  b->data[i] >> 2;
-                c1 = (b->data[i] << 4) & 0x3F;
-            if (bconchar (out, b64ETable[c0]) < 0 ||
-                bconchar (out, b64ETable[c1]) < 0 ||
-                bconchar (out, (char) '=') < 0 ||
-                bconchar (out, (char) '=') < 0) {
-                bdestroy (out);
-                return NULL;
-            }
-            break;
-        case 2: break;
-    }
-
-    return out;
-}
-
-#define B64_PAD (-2)
-#define B64_ERR (-1)
-
-static int base64DecodeSymbol (unsigned char alpha) {
-   if      ((alpha >= 'A') && (alpha <= 'Z')) return (int)(alpha - 'A');
-   else if ((alpha >= 'a') && (alpha <= 'z'))
-        return 26 + (int)(alpha - 'a');
-   else if ((alpha >= '0') && (alpha <= '9'))
-        return 52 + (int)(alpha - '0');
-   else if (alpha == '+') return 62;
-   else if (alpha == '/') return 63;
-   else if (alpha == '=') return B64_PAD;
-   else                   return B64_ERR;
-}
-
-/*  bstring bBase64DecodeEx (const_bstring b, int * boolTruncError)
- *
- *  Decode a base64 block of data.  All MIME headers are assumed to have been
- *  removed.  See: RFC1341
- */
-bstring bBase64DecodeEx (const_bstring b, int * boolTruncError) {
-int i, v;
-unsigned char c0, c1, c2;
-bstring out;
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-    if (boolTruncError) *boolTruncError = 0;
-    out = bfromcstr ("");
-    i = 0;
-    for (;;) {
-        do {
-            if (i >= b->slen) return out;
-            if (b->data[i] == '=') {    /* Bad "too early" truncation */
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c0 = (unsigned char) (v << 2);
-        do {
-            if (i >= b->slen || b->data[i] == '=') {    /* Bad "too early" truncation */
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c0 |= (unsigned char) (v >> 4);
-        c1  = (unsigned char) (v << 4);
-        do {
-            if (i >= b->slen) {
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            if (b->data[i] == '=') {
-                i++;
-                if (i >= b->slen || b->data[i] != '=' || bconchar (out, c0) < 0) {
-                    if (boolTruncError) {
-                        *boolTruncError = 1;
-                        return out;
-                    }
-                    bdestroy (out); /* Missing "=" at the end. */
-                    return NULL;
-                }
-                return out;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c1 |= (unsigned char) (v >> 2);
-        c2  = (unsigned char) (v << 6);
-        do {
-            if (i >= b->slen) {
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            if (b->data[i] == '=') {
-                if (bconchar (out, c0) < 0 || bconchar (out, c1) < 0) {
-                    if (boolTruncError) {
-                        *boolTruncError = 1;
-                        return out;
-                    }
-                    bdestroy (out);
-                    return NULL;
-                }
-                if (boolTruncError) *boolTruncError = 0;
-                return out;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c2 |= (unsigned char) (v);
-        if (bconchar (out, c0) < 0 ||
-            bconchar (out, c1) < 0 ||
-            bconchar (out, c2) < 0) {
-            if (boolTruncError) {
-                *boolTruncError = -1;
-                return out;
-            }
-            bdestroy (out);
-            return NULL;
-        }
-    }
-}
-
-#define UU_DECODE_BYTE(b) (((b) == (signed int)'`') ? 0 : (b) - (signed int)' ')
-
-struct bUuInOut {
-    bstring src, dst;
-    int * badlines;
-};
-
-#define UU_MAX_LINELEN 45
-
-static int bUuDecLine (void * parm, int ofs, int len) {
-struct bUuInOut * io = (struct bUuInOut *) parm;
-bstring s = io->src;
-bstring t = io->dst;
-int i, llen, otlen, ret, c0, c1, c2, c3, d0, d1, d2, d3;
-
-    if (len == 0) return 0;
-    llen = UU_DECODE_BYTE (s->data[ofs]);
-    ret = 0;
-
-    otlen = t->slen;
-
-    if (((unsigned) llen) > UU_MAX_LINELEN) { ret = -__LINE__; 
-        goto bl;
-    }
-
-    llen += t->slen;
-
-    for (i=1; i < s->slen && t->slen < llen;i += 4) {
-        unsigned char outoctet[3];
-        c0 = UU_DECODE_BYTE (d0 = (int) bchare (s, i+ofs+0, ' ' - 1));
-        c1 = UU_DECODE_BYTE (d1 = (int) bchare (s, i+ofs+1, ' ' - 1));
-        c2 = UU_DECODE_BYTE (d2 = (int) bchare (s, i+ofs+2, ' ' - 1));
-        c3 = UU_DECODE_BYTE (d3 = (int) bchare (s, i+ofs+3, ' ' - 1));
-
-        if (((unsigned) (c0|c1) >= 0x40)) { if (!ret) ret = -__LINE__;
-            if (d0 > 0x60 || (d0 < (' ' - 1) && !isspace (d0)) ||
-                d1 > 0x60 || (d1 < (' ' - 1) && !isspace (d1))) {
-                t->slen = otlen;
-                goto bl;
-            }
-            c0 = c1 = 0;
-        }
-        outoctet[0] = (unsigned char) ((c0 << 2) | ((unsigned) c1 >> 4));
-        if (t->slen+1 >= llen) {
-            if (0 > bconchar (t, (char) outoctet[0])) return -__LINE__;
-            break;
-        }
-        if ((unsigned) c2 >= 0x40) { if (!ret) ret = -__LINE__;
-            if (d2 > 0x60 || (d2 < (' ' - 1) && !isspace (d2))) {
-                t->slen = otlen;
-                goto bl;
-            }
-            c2 = 0;
-        }
-        outoctet[1] = (unsigned char) ((c1 << 4) | ((unsigned) c2 >> 2));
-        if (t->slen+2 >= llen) {
-            if (0 > bcatblk (t, outoctet, 2)) return -__LINE__;
-            break;
-        }
-        if ((unsigned) c3 >= 0x40) { if (!ret) ret = -__LINE__;
-            if (d3 > 0x60 || (d3 < (' ' - 1) && !isspace (d3))) {
-                t->slen = otlen;
-                goto bl;
-            }
-            c3 = 0;
-        }
-        outoctet[2] = (unsigned char) ((c2 << 6) | ((unsigned) c3));
-        if (0 > bcatblk (t, outoctet, 3)) return -__LINE__;
-    }
-    if (t->slen < llen) { if (0 == ret) ret = -__LINE__;
-        t->slen = otlen;
-    }
-    bl:;
-    if (ret && io->badlines) {
-        (*io->badlines)++;
-        return 0;
-    }
-    return ret;
-}
-
-/*  bstring bUuDecodeEx (const_bstring src, int * badlines)
- *
- *  Performs a UUDecode of a block of data.  If there are errors in the
- *  decoding, they are counted up and returned in "badlines", if badlines is
- *  not NULL. It is assumed that the "begin" and "end" lines have already 
- *  been stripped off.  The potential security problem of writing the 
- *  filename in the begin line is something that is beyond the scope of a 
- *  portable library.
- */
-
-#ifdef _MSC_VER
-#pragma warning(disable:4204)
-#endif
-
-bstring bUuDecodeEx (const_bstring src, int * badlines) {
-struct tagbstring t;
-struct bStream * s;
-struct bStream * d;
-bstring b;
-
-    if (!src) return NULL;
-    t = *src; /* Short lifetime alias to header of src */
-    s = bsFromBstrRef (&t); /* t is undefined after this */
-    if (!s) return NULL;
-    d = bsUuDecode (s, badlines);
-    b = bfromcstralloc (256, "");
-    if (NULL == b || 0 > bsread (b, d, INT_MAX)) {
-        bdestroy (b);
-        bsclose (d);
-        bsclose (s);
-        return NULL;
-    }
-    return b;
-}
-
-struct bsUuCtx {
-    struct bUuInOut io;
-    struct bStream * sInp;
-};
-
-static size_t bsUuDecodePart (void *buff, size_t elsize, size_t nelem, void *parm) {
-static struct tagbstring eol = bsStatic ("\r\n");
-struct bsUuCtx * luuCtx = (struct bsUuCtx *) parm;
-size_t tsz;
-int l, lret;
-
-    if (NULL == buff || NULL == parm) return 0;
-    tsz = elsize * nelem;
-
-    CheckInternalBuffer:;
-    /* If internal buffer has sufficient data, just output it */
-    if (((size_t) luuCtx->io.dst->slen) > tsz) {
-        memcpy (buff, luuCtx->io.dst->data, tsz);
-        bdelete (luuCtx->io.dst, 0, (int) tsz);
-        return nelem;
-    }
-
-    DecodeMore:;
-    if (0 <= (l = binchr (luuCtx->io.src, 0, &eol))) {
-        int ol = 0;
-        struct tagbstring t;
-        bstring s = luuCtx->io.src;
-        luuCtx->io.src = &t;
-
-        do {
-            if (l > ol) {
-                bmid2tbstr (t, s, ol, l - ol);
-                lret = bUuDecLine (&luuCtx->io, 0, t.slen);
-                if (0 > lret) {
-                    luuCtx->io.src = s;
-                    goto Done;
-                }
-            }
-            ol = l + 1;
-            if (((size_t) luuCtx->io.dst->slen) > tsz) break;
-            l = binchr (s, ol, &eol);
-        } while (BSTR_ERR != l);
-        bdelete (s, 0, ol);
-        luuCtx->io.src = s;
-        goto CheckInternalBuffer;
-    }
-
-    if (BSTR_ERR != bsreada (luuCtx->io.src, luuCtx->sInp, bsbufflength (luuCtx->sInp, BSTR_BS_BUFF_LENGTH_GET))) {
-        goto DecodeMore;
-    }
-
-    bUuDecLine (&luuCtx->io, 0, luuCtx->io.src->slen);
-
-    Done:;
-    /* Output any lingering data that has been translated */
-    if (((size_t) luuCtx->io.dst->slen) > 0) {
-        if (((size_t) luuCtx->io.dst->slen) > tsz) goto CheckInternalBuffer;
-        memcpy (buff, luuCtx->io.dst->data, luuCtx->io.dst->slen);
-        tsz = luuCtx->io.dst->slen / elsize;
-        luuCtx->io.dst->slen = 0;
-        if (tsz > 0) return tsz;
-    }
-
-    /* Deallocate once EOF becomes triggered */
-    bdestroy (luuCtx->io.dst);
-    bdestroy (luuCtx->io.src);
-    free (luuCtx);
-    return 0;
-}
-
-/*  bStream * bsUuDecode (struct bStream * sInp, int * badlines)
- *
- *  Creates a bStream which performs the UUDecode of an an input stream.  If
- *  there are errors in the decoding, they are counted up and returned in 
- *  "badlines", if badlines is not NULL. It is assumed that the "begin" and 
- *  "end" lines have already been stripped off.  The potential security 
- *  problem of writing the filename in the begin line is something that is 
- *  beyond the scope of a portable library.
- */
-
-struct bStream * bsUuDecode (struct bStream * sInp, int * badlines) {
-struct bsUuCtx * luuCtx = (struct bsUuCtx *) malloc (sizeof (struct bsUuCtx));
-struct bStream * sOut;
-
-    if (NULL == luuCtx) return NULL;
-
-    luuCtx->io.src = bfromcstr ("");
-    luuCtx->io.dst = bfromcstr ("");
-    if (NULL == luuCtx->io.dst || NULL == luuCtx->io.src) {
-        CleanUpFailureToAllocate:;
-        bdestroy (luuCtx->io.dst);
-        bdestroy (luuCtx->io.src);
-        free (luuCtx);
-        return NULL;
-    }
-    luuCtx->io.badlines = badlines;
-    if (badlines) *badlines = 0;
-
-    luuCtx->sInp = sInp;
-
-    sOut = bsopen ((bNread) bsUuDecodePart, luuCtx);
-    if (NULL == sOut) goto CleanUpFailureToAllocate;
-    return sOut;
-}
-
-#define UU_ENCODE_BYTE(b) (char) (((b) == 0) ? '`' : ((b) + ' '))
-
-/*  bstring bUuEncode (const_bstring src)
- *
- *  Performs a UUEncode of a block of data.  The "begin" and "end" lines are 
- *  not appended.
- */
-bstring bUuEncode (const_bstring src) {
-bstring out;
-int i, j, jm;
-unsigned int c0, c1, c2;
-    if (src == NULL || src->slen < 0 || src->data == NULL) return NULL;
-    if ((out = bfromcstr ("")) == NULL) return NULL;
-    for (i=0; i < src->slen; i += UU_MAX_LINELEN) {
-        if ((jm = i + UU_MAX_LINELEN) > src->slen) jm = src->slen;
-        if (bconchar (out, UU_ENCODE_BYTE (jm - i)) < 0) {
-            bstrFree (out);
-            break;
-        }
-        for (j = i; j < jm; j += 3) {
-            c0 = (unsigned int) bchar (src, j    );
-            c1 = (unsigned int) bchar (src, j + 1);
-            c2 = (unsigned int) bchar (src, j + 2);
-            if (bconchar (out, UU_ENCODE_BYTE ( (c0 & 0xFC) >> 2)) < 0 ||
-                bconchar (out, UU_ENCODE_BYTE (((c0 & 0x03) << 4) | ((c1 & 0xF0) >> 4))) < 0 ||
-                bconchar (out, UU_ENCODE_BYTE (((c1 & 0x0F) << 2) | ((c2 & 0xC0) >> 6))) < 0 ||
-                bconchar (out, UU_ENCODE_BYTE ( (c2 & 0x3F))) < 0) {
-                bstrFree (out);
-                goto End;
-            }
-        }
-        if (bconchar (out, (char) '\r') < 0 || bconchar (out, (char) '\n') < 0) {
-            bstrFree (out);
-            break;
-        }
-    }
-    End:;
-    return out;
-}
-
-/*  bstring bYEncode (const_bstring src)
- *
- *  Performs a YEncode of a block of data.  No header or tail info is 
- *  appended.  See: http://www.yenc.org/whatis.htm and 
- *  http://www.yenc.org/yenc-draft.1.3.txt
- */
-bstring bYEncode (const_bstring src) {
-int i;
-bstring out;
-unsigned char c;
-
-    if (src == NULL || src->slen < 0 || src->data == NULL) return NULL;
-    if ((out = bfromcstr ("")) == NULL) return NULL;
-    for (i=0; i < src->slen; i++) {
-        c = (unsigned char)(src->data[i] + 42);
-        if (c == '=' || c == '\0' || c == '\r' || c == '\n') {
-            if (0 > bconchar (out, (char) '=')) {
-                bdestroy (out);
-                return NULL;
-            }
-            c += (unsigned char) 64;
-        }
-        if (0 > bconchar (out, c)) {
-            bdestroy (out);
-            return NULL;
-        }
-    }
-    return out;
-}
-
-/*  bstring bYDecode (const_bstring src)
- *
- *  Performs a YDecode of a block of data.  See: 
- *  http://www.yenc.org/whatis.htm and http://www.yenc.org/yenc-draft.1.3.txt
- */
-#define MAX_OB_LEN (64)
-
-bstring bYDecode (const_bstring src) {
-int i;
-bstring out;
-unsigned char c;
-unsigned char octetbuff[MAX_OB_LEN];
-int obl;
-
-    if (src == NULL || src->slen < 0 || src->data == NULL) return NULL;
-    if ((out = bfromcstr ("")) == NULL) return NULL;
-
-    obl = 0;
-
-    for (i=0; i < src->slen; i++) {
-        if ('=' == (c = src->data[i])) { /* The = escape mode */
-            i++;
-            if (i >= src->slen) {
-                bdestroy (out);
-                return NULL;
-            }
-            c = (unsigned char) (src->data[i] - 64);
-        } else {
-            if ('\0' == c) {
-                bdestroy (out);
-                return NULL;
-            }
-
-            /* Extraneous CR/LFs are to be ignored. */
-            if (c == '\r' || c == '\n') continue;
-        }
-
-        octetbuff[obl] = (unsigned char) ((int) c - 42);
-        obl++;
-
-        if (obl >= MAX_OB_LEN) {
-            if (0 > bcatblk (out, octetbuff, obl)) {
-                bdestroy (out);
-                return NULL;
-            }
-            obl = 0;
-        }
-    }
-
-    if (0 > bcatblk (out, octetbuff, obl)) {
-        bdestroy (out);
-        out = NULL;
-    }
-    return out;
-}
-
-/*  bstring bStrfTime (const char * fmt, const struct tm * timeptr)
- *
- *  Takes a format string that is compatible with strftime and a struct tm
- *  pointer, formats the time according to the format string and outputs
- *  the bstring as a result. Note that if there is an early generation of a 
- *  '\0' character, the bstring will be truncated to this end point.
- */
-bstring bStrfTime (const char * fmt, const struct tm * timeptr) {
-#if defined (__TURBOC__) && !defined (__BORLANDC__)
-static struct tagbstring ns = bsStatic ("bStrfTime Not supported");
-    fmt = fmt;
-    timeptr = timeptr;
-    return &ns;
-#else
-bstring buff;
-int n;
-size_t r;
-
-    if (fmt == NULL) return NULL;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "strftime" call on increasing 
-       potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < 16) n = 16;
-    buff = bfromcstralloc (n+2, "");
-
-    for (;;) {
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return NULL;
-        }
-
-        r = strftime ((char *) buff->data, n + 1, fmt, timeptr);
-
-        if (r > 0) {
-            buff->slen = (int) r;
-            break;
-        }
-
-        n += n;
-    }
-
-    return buff;
-#endif
-}
-
-/*  int bSetCstrChar (bstring a, int pos, char c)
- *
- *  Sets the character at position pos to the character c in the bstring a.
- *  If the character c is NUL ('\0') then the string is truncated at this
- *  point.  Note: this does not enable any other '\0' character in the bstring
- *  as terminator indicator for the string.  pos must be in the position 
- *  between 0 and b->slen inclusive, otherwise BSTR_ERR will be returned.
- */
-int bSetCstrChar (bstring b, int pos, char c) {
-    if (NULL == b || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen)
-        return BSTR_ERR;
-    if (pos < 0 || pos > b->slen) return BSTR_ERR;
-
-    if (pos == b->slen) {
-        if ('\0' != c) return bconchar (b, c);
-        return 0;
-    }
-
-    b->data[pos] = (unsigned char) c;
-    if ('\0' == c) b->slen = pos;
-
-    return 0;
-}
-
-/*  int bSetChar (bstring b, int pos, char c)
- *
- *  Sets the character at position pos to the character c in the bstring a.
- *  The string is not truncated if the character c is NUL ('\0').  pos must
- *  be in the position between 0 and b->slen inclusive, otherwise BSTR_ERR
- *  will be returned.
- */
-int bSetChar (bstring b, int pos, char c) {
-    if (NULL == b || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen)
-        return BSTR_ERR;
-    if (pos < 0 || pos > b->slen) return BSTR_ERR;
-
-    if (pos == b->slen) {
-        return bconchar (b, c);
-    }
-
-    b->data[pos] = (unsigned char) c;
-    return 0;
-}
-
-#define INIT_SECURE_INPUT_LENGTH (256)
-
-/*  bstring bSecureInput (int maxlen, int termchar, 
- *                        bNgetc vgetchar, void * vgcCtx)
- *
- *  Read input from an abstracted input interface, for a length of at most
- *  maxlen characters.  If maxlen <= 0, then there is no length limit put
- *  on the input.  The result is terminated early if vgetchar() return EOF
- *  or the user specified value termchar.
- *
- */
-bstring bSecureInput (int maxlen, int termchar, bNgetc vgetchar, void * vgcCtx) {
-int i, m, c;
-bstring b, t;
-
-    if (!vgetchar) return NULL;
-
-    b = bfromcstralloc (INIT_SECURE_INPUT_LENGTH, "");
-    if ((c = UCHAR_MAX + 1) == termchar) c++;
-
-    for (i=0; ; i++) {
-        if (termchar == c || (maxlen > 0 && i >= maxlen)) c = EOF;
-        else c = vgetchar (vgcCtx);
-
-        if (EOF == c) break;
-
-        if (i+1 >= b->mlen) {
-
-            /* Double size, but deal with unusual case of numeric
-               overflows */
-
-            if ((m = b->mlen << 1)   <= b->mlen &&
-                (m = b->mlen + 1024) <= b->mlen &&
-                (m = b->mlen + 16)   <= b->mlen &&
-                (m = b->mlen + 1)    <= b->mlen) t = NULL;
-            else t = bfromcstralloc (m, "");
-
-            if (t) memcpy (t->data, b->data, i);
-            bSecureDestroy (b); /* Cleanse previous buffer */
-            b = t;
-            if (!b) return b;
-        }
-
-        b->data[i] = (unsigned char) c;
-    }
-
-    b->slen = i;
-    b->data[i] = (unsigned char) '\0';
-    return b;
-}
-
-#define BWS_BUFF_SZ (1024)
-
-struct bwriteStream {
-    bstring buff;    /* Buffer for underwrites                   */
-    void * parm;     /* The stream handle for core stream        */
-    bNwrite writeFn; /* fwrite work-a-like fnptr for core stream */
-    int isEOF;       /* track stream's EOF state                 */
-    int minBuffSz;
-};
-
-/*  struct bwriteStream * bwsOpen (bNwrite writeFn, void * parm)
- *
- *  Wrap a given open stream (described by a fwrite work-a-like function 
- *  pointer and stream handle) into an open bwriteStream suitable for write
- *  streaming functions.
- */
-struct bwriteStream * bwsOpen (bNwrite writeFn, void * parm) {
-struct bwriteStream * ws;
-
-    if (NULL == writeFn) return NULL;
-    ws = (struct bwriteStream *) malloc (sizeof (struct bwriteStream));
-    if (ws) {
-        if (NULL == (ws->buff = bfromcstr (""))) {
-            free (ws);
-            ws = NULL;
-        } else {
-            ws->parm = parm;
-            ws->writeFn = writeFn;
-            ws->isEOF = 0;
-            ws->minBuffSz = BWS_BUFF_SZ;
-        }
-    }
-    return ws;
-}
-
-#define internal_bwswriteout(ws,b) { \
-    if ((b)->slen > 0) { \
-        if (1 != (ws->writeFn ((b)->data, (b)->slen, 1, ws->parm))) { \
-            ws->isEOF = 1; \
-            return BSTR_ERR; \
-        } \
-    } \
-}
-
-/*  int bwsWriteFlush (struct bwriteStream * ws)
- *
- *  Force any pending data to be written to the core stream.
- */
-int bwsWriteFlush (struct bwriteStream * ws) {
-    if (NULL == ws || ws->isEOF || 0 >= ws->minBuffSz || 
-        NULL == ws->writeFn || NULL == ws->buff) return BSTR_ERR;
-    internal_bwswriteout (ws, ws->buff);
-    ws->buff->slen = 0;
-    return 0;
-}
-
-/*  int bwsWriteBstr (struct bwriteStream * ws, const_bstring b)
- *
- *  Send a bstring to a bwriteStream.  If the stream is at EOF BSTR_ERR is
- *  returned.  Note that there is no deterministic way to determine the exact
- *  cut off point where the core stream stopped accepting data.
- */
-int bwsWriteBstr (struct bwriteStream * ws, const_bstring b) {
-struct tagbstring t;
-int l;
-
-    if (NULL == ws || NULL == b || NULL == ws->buff ||
-        ws->isEOF || 0 >= ws->minBuffSz || NULL == ws->writeFn)
-        return BSTR_ERR;
-
-    /* Buffer prepacking optimization */
-    if (b->slen > 0 && ws->buff->mlen - ws->buff->slen > b->slen) {
-        static struct tagbstring empty = bsStatic ("");
-        if (0 > bconcat (ws->buff, b)) return BSTR_ERR;
-        return bwsWriteBstr (ws, &empty);
-    }
-
-    if (0 > (l = ws->minBuffSz - ws->buff->slen)) {
-        internal_bwswriteout (ws, ws->buff);
-        ws->buff->slen = 0;
-        l = ws->minBuffSz;
-    }
-
-    if (b->slen < l) return bconcat (ws->buff, b);
-
-    if (0 > bcatblk (ws->buff, b->data, l)) return BSTR_ERR;
-    internal_bwswriteout (ws, ws->buff);
-    ws->buff->slen = 0;
-
-    bmid2tbstr (t, (bstring) b, l, b->slen);
-
-    if (t.slen >= ws->minBuffSz) {
-        internal_bwswriteout (ws, &t);
-        return 0;
-    }
-
-    return bassign (ws->buff, &t);
-}
-
-/*  int bwsWriteBlk (struct bwriteStream * ws, void * blk, int len)
- *
- *  Send a block of data a bwriteStream.  If the stream is at EOF BSTR_ERR is 
- *  returned.
- */
-int bwsWriteBlk (struct bwriteStream * ws, void * blk, int len) {
-struct tagbstring t;
-    if (NULL == blk || len < 0) return BSTR_ERR;
-    blk2tbstr (t, blk, len);
-    return bwsWriteBstr (ws, &t);
-}
-
-/*  int bwsIsEOF (const struct bwriteStream * ws)
- *
- *  Returns 0 if the stream is currently writable, 1 if the core stream has 
- *  responded by not accepting the previous attempted write.
- */
-int bwsIsEOF (const struct bwriteStream * ws) {
-    if (NULL == ws || NULL == ws->buff || 0 > ws->minBuffSz || 
-        NULL == ws->writeFn) return BSTR_ERR;
-    return ws->isEOF;
-}
-
-/*  int bwsBuffLength (struct bwriteStream * ws, int sz)
- *
- *  Set the length of the buffer used by the bwsStream.  If sz is zero, the 
- *  length is not set.  This function returns with the previous length.
- */
-int bwsBuffLength (struct bwriteStream * ws, int sz) {
-int oldSz;
-    if (ws == NULL || sz < 0) return BSTR_ERR;
-    oldSz = ws->minBuffSz;
-    if (sz > 0) ws->minBuffSz = sz;
-    return oldSz;
-}
-
-/*  void * bwsClose (struct bwriteStream * s)
- *
- *  Close the bwriteStream, and return the handle to the stream that was 
- *  originally used to open the given stream.  Note that even if the stream
- *  is at EOF it still needs to be closed with a call to bwsClose.
- */
-void * bwsClose (struct bwriteStream * ws) {
-void * parm;
-    if (NULL == ws || NULL == ws->buff || 0 >= ws->minBuffSz || 
-        NULL == ws->writeFn) return NULL;
-    bwsWriteFlush (ws);
-    parm = ws->parm;
-    ws->parm = NULL;
-    ws->minBuffSz = -1;
-    ws->writeFn = NULL;
-    bstrFree (ws->buff);
-    free (ws);
-    return parm;
-}
-
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstraux.h b/Code/Tools/HLSLCrossCompiler/src/cbstring/bstraux.h
deleted file mode 100644
index e10c6e1a68..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstraux.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstraux.h
- *
- * This file is not a necessary part of the core bstring library itself, but
- * is just an auxilliary module which includes miscellaneous or trivial 
- * functions.
- */
-
-#ifndef BSTRAUX_INCLUDE
-#define BSTRAUX_INCLUDE
-
-#include <time.h>
-#include "bstrlib.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Safety mechanisms */
-#define bstrDeclare(b)               bstring (b) = NULL; 
-#define bstrFree(b)                  {if ((b) != NULL && (b)->slen >= 0 && (b)->mlen >= (b)->slen) { bdestroy (b); (b) = NULL; }}
-
-/* Backward compatibilty with previous versions of Bstrlib */
-#define bAssign(a,b)                 ((bassign)((a), (b)))
-#define bSubs(b,pos,len,a,c)         ((breplace)((b),(pos),(len),(a),(unsigned char)(c)))
-#define bStrchr(b,c)                 ((bstrchr)((b), (c)))
-#define bStrchrFast(b,c)             ((bstrchr)((b), (c)))
-#define bCatCstr(b,s)                ((bcatcstr)((b), (s)))
-#define bCatBlk(b,s,len)             ((bcatblk)((b),(s),(len)))
-#define bCatStatic(b,s)              bCatBlk ((b), ("" s ""), sizeof (s) - 1)
-#define bTrunc(b,n)                  ((btrunc)((b), (n)))
-#define bReplaceAll(b,find,repl,pos) ((bfindreplace)((b),(find),(repl),(pos)))
-#define bUppercase(b)                ((btoupper)(b))
-#define bLowercase(b)                ((btolower)(b))
-#define bCaselessCmp(a,b)            ((bstricmp)((a), (b)))
-#define bCaselessNCmp(a,b,n)         ((bstrnicmp)((a), (b), (n)))
-#define bBase64Decode(b)             (bBase64DecodeEx ((b), NULL))
-#define bUuDecode(b)                 (bUuDecodeEx ((b), NULL))
-
-/* Unusual functions */
-extern struct bStream * bsFromBstr (const_bstring b);
-extern bstring bTail (bstring b, int n);
-extern bstring bHead (bstring b, int n);
-extern int bSetCstrChar (bstring a, int pos, char c);
-extern int bSetChar (bstring b, int pos, char c);
-extern int bFill (bstring a, char c, int len);
-extern int bReplicate (bstring b, int n);
-extern int bReverse (bstring b);
-extern int bInsertChrs (bstring b, int pos, int len, unsigned char c, unsigned char fill);
-extern bstring bStrfTime (const char * fmt, const struct tm * timeptr);
-#define bAscTime(t) (bStrfTime ("%c\n", (t)))
-#define bCTime(t)   ((t) ? bAscTime (localtime (t)) : NULL)
-
-/* Spacing formatting */
-extern int bJustifyLeft (bstring b, int space);
-extern int bJustifyRight (bstring b, int width, int space);
-extern int bJustifyMargin (bstring b, int width, int space);
-extern int bJustifyCenter (bstring b, int width, int space);
-
-/* Esoteric standards specific functions */
-extern char * bStr2NetStr (const_bstring b);
-extern bstring bNetStr2Bstr (const char * buf);
-extern bstring bBase64Encode (const_bstring b);
-extern bstring bBase64DecodeEx (const_bstring b, int * boolTruncError);
-extern struct bStream * bsUuDecode (struct bStream * sInp, int * badlines);
-extern bstring bUuDecodeEx (const_bstring src, int * badlines);
-extern bstring bUuEncode (const_bstring src);
-extern bstring bYEncode (const_bstring src);
-extern bstring bYDecode (const_bstring src);
-
-/* Writable stream */
-typedef int (* bNwrite) (const void * buf, size_t elsize, size_t nelem, void * parm);
-
-struct bwriteStream * bwsOpen (bNwrite writeFn, void * parm);
-int bwsWriteBstr (struct bwriteStream * stream, const_bstring b);
-int bwsWriteBlk (struct bwriteStream * stream, void * blk, int len);
-int bwsWriteFlush (struct bwriteStream * stream);
-int bwsIsEOF (const struct bwriteStream * stream);
-int bwsBuffLength (struct bwriteStream * stream, int sz);
-void * bwsClose (struct bwriteStream * stream);
-
-/* Security functions */
-#define bSecureDestroy(b) {                                                \
-bstring bstr__tmp = (b);                                                \
-    if (bstr__tmp && bstr__tmp->mlen > 0 && bstr__tmp->data) {          \
-        (void) memset (bstr__tmp->data, 0, (size_t) bstr__tmp->mlen);   \
-        bdestroy (bstr__tmp);                                           \
-    }                                                                   \
-}
-#define bSecureWriteProtect(t) {                                                  \
-    if ((t).mlen >= 0) {                                                          \
-        if ((t).mlen > (t).slen)) {                                               \
-            (void) memset ((t).data + (t).slen, 0, (size_t) (t).mlen - (t).slen); \
-        }                                                                         \
-        (t).mlen = -1;                                                            \
-    }                                                                             \
-}
-extern bstring bSecureInput (int maxlen, int termchar, 
-                             bNgetc vgetchar, void * vgcCtx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.c b/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.c
deleted file mode 100644
index 7c233454ba..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.c
+++ /dev/null
@@ -1,2976 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstrlib.c
- *
- * This file is the core module for implementing the bstring functions.
- */
-
-#include <stdio.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "bstrlib.h"
-#include "../internal_includes/hlslcc_malloc.h"
-
-/* Optionally include a mechanism for debugging memory */
-
-#if defined(MEMORY_DEBUG) || defined(BSTRLIB_MEMORY_DEBUG)
-#include "memdbg.h"
-#endif
-
-#ifndef bstr__alloc
-#define bstr__alloc(x) malloc (x)
-#endif
-
-#ifndef bstr__free
-#define bstr__free(p) free (p)
-#endif
-
-#ifndef bstr__realloc
-#define bstr__realloc(p,x) realloc ((p), (x))
-#endif
-
-#ifndef bstr__memcpy
-#define bstr__memcpy(d,s,l) memcpy ((d), (s), (l))
-#endif
-
-#ifndef bstr__memmove
-#define bstr__memmove(d,s,l) memmove ((d), (s), (l))
-#endif
-
-#ifndef bstr__memset
-#define bstr__memset(d,c,l) memset ((d), (c), (l))
-#endif
-
-#ifndef bstr__memcmp
-#define bstr__memcmp(d,c,l) memcmp ((d), (c), (l))
-#endif
-
-#ifndef bstr__memchr
-#define bstr__memchr(s,c,l) memchr ((s), (c), (l))
-#endif
-
-/* Just a length safe wrapper for memmove. */
-
-#define bBlockCopy(D,S,L) { if ((L) > 0) bstr__memmove ((D),(S),(L)); }
-
-/* Compute the snapped size for a given requested size.  By snapping to powers
-   of 2 like this, repeated reallocations are avoided. */
-static int snapUpSize (int i) {
-    if (i < 8) {
-        i = 8;
-    } else {
-        unsigned int j;
-        j = (unsigned int) i;
-
-        j |= (j >>  1);
-        j |= (j >>  2);
-        j |= (j >>  4);
-        j |= (j >>  8);        /* Ok, since int >= 16 bits */
-#if (UINT_MAX != 0xffff)
-        j |= (j >> 16);        /* For 32 bit int systems */
-#if (UINT_MAX > 0xffffffffUL)
-        j |= (j >> 32);        /* For 64 bit int systems */
-#endif
-#endif
-        /* Least power of two greater than i */
-        j++;
-        if ((int) j >= i) i = (int) j;
-    }
-    return i;
-}
-
-/*  int balloc (bstring b, int len)
- *
- *  Increase the size of the memory backing the bstring b to at least len.
- */
-int balloc (bstring b, int olen) {
-    int len;
-    if (b == NULL || b->data == NULL || b->slen < 0 || b->mlen <= 0 || 
-        b->mlen < b->slen || olen <= 0) {
-        return BSTR_ERR;
-    }
-
-    if (olen >= b->mlen) {
-        unsigned char * x;
-
-        if ((len = snapUpSize (olen)) <= b->mlen) return BSTR_OK;
-
-        /* Assume probability of a non-moving realloc is 0.125 */
-        if (7 * b->mlen < 8 * b->slen) {
-
-            /* If slen is close to mlen in size then use realloc to reduce
-               the memory defragmentation */
-
-            reallocStrategy:;
-
-            x = (unsigned char *) bstr__realloc (b->data, (size_t) len);
-            if (x == NULL) {
-
-                /* Since we failed, try allocating the tighest possible 
-                   allocation */
-
-                if (NULL == (x = (unsigned char *) bstr__realloc (b->data, (size_t) (len = olen)))) {
-                    return BSTR_ERR;
-                }
-            }
-        } else {
-
-            /* If slen is not close to mlen then avoid the penalty of copying
-               the extra bytes that are allocated, but not considered part of
-               the string */
-
-            if (NULL == (x = (unsigned char *) bstr__alloc ((size_t) len))) {
-
-                /* Perhaps there is no available memory for the two 
-                   allocations to be in memory at once */
-
-                goto reallocStrategy;
-
-            } else {
-                if (b->slen) bstr__memcpy ((char *) x, (char *) b->data, (size_t) b->slen);
-                bstr__free (b->data);
-            }
-        }
-        b->data = x;
-        b->mlen = len;
-        b->data[b->slen] = (unsigned char) '\0';
-    }
-
-    return BSTR_OK;
-}
-
-/*  int ballocmin (bstring b, int len)
- *
- *  Set the size of the memory backing the bstring b to len or b->slen+1,
- *  whichever is larger.  Note that repeated use of this function can degrade
- *  performance.
- */
-int ballocmin (bstring b, int len) {
-    unsigned char * s;
-
-    if (b == NULL || b->data == NULL || (b->slen+1) < 0 || b->mlen <= 0 || 
-        b->mlen < b->slen || len <= 0) {
-        return BSTR_ERR;
-    }
-
-    if (len < b->slen + 1) len = b->slen + 1;
-
-    if (len != b->mlen) {
-        s = (unsigned char *) bstr__realloc (b->data, (size_t) len);
-        if (NULL == s) return BSTR_ERR;
-        s[b->slen] = (unsigned char) '\0';
-        b->data = s;
-        b->mlen = len;
-    }
-
-    return BSTR_OK;
-}
-
-/*  bstring bfromcstr (const char * str)
- *
- *  Create a bstring which contains the contents of the '\0' terminated char *
- *  buffer str.
- */
-bstring bfromcstr (const char * str) {
-bstring b;
-int i;
-size_t j;
-
-    if (str == NULL) return NULL;
-    j = (strlen) (str);
-    i = snapUpSize ((int) (j + (2 - (j != 0))));
-    if (i <= (int) j) return NULL;
-
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (NULL == b) return NULL;
-    b->slen = (int) j;
-    if (NULL == (b->data = (unsigned char *) bstr__alloc (b->mlen = i))) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    bstr__memcpy (b->data, str, j+1);
-    return b;
-}
-
-/*  bstring bfromcstralloc (int mlen, const char * str)
- *
- *  Create a bstring which contains the contents of the '\0' terminated char *
- *  buffer str.  The memory buffer backing the string is at least len 
- *  characters in length.
- */
-bstring bfromcstralloc (int mlen, const char * str) {
-bstring b;
-int i;
-size_t j;
-
-    if (str == NULL) return NULL;
-    j = (strlen) (str);
-    i = snapUpSize ((int) (j + (2 - (j != 0))));
-    if (i <= (int) j) return NULL;
-
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (b == NULL) return NULL;
-    b->slen = (int) j;
-    if (i < mlen) i = mlen;
-
-    if (NULL == (b->data = (unsigned char *) bstr__alloc (b->mlen = i))) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    bstr__memcpy (b->data, str, j+1);
-    return b;
-}
-
-/*  bstring blk2bstr (const void * blk, int len)
- *
- *  Create a bstring which contains the content of the block blk of length 
- *  len.
- */
-bstring blk2bstr (const void * blk, int len) {
-bstring b;
-int i;
-
-    if (blk == NULL || len < 0) return NULL;
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (b == NULL) return NULL;
-    b->slen = len;
-
-    i = len + (2 - (len != 0));
-    i = snapUpSize (i);
-
-    b->mlen = i;
-
-    b->data = (unsigned char *) bstr__alloc ((size_t) b->mlen);
-    if (b->data == NULL) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    if (len > 0) bstr__memcpy (b->data, blk, (size_t) len);
-    b->data[len] = (unsigned char) '\0';
-
-    return b;
-}
-
-/*  char * bstr2cstr (const_bstring s, char z)
- *
- *  Create a '\0' terminated char * buffer which is equal to the contents of 
- *  the bstring s, except that any contained '\0' characters are converted 
- *  to the character in z. This returned value should be freed with a 
- *  bcstrfree () call, by the calling application.
- */
-char * bstr2cstr (const_bstring b, char z) {
-int i, l;
-char * r;
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-    l = b->slen;
-    r = (char *) bstr__alloc ((size_t) (l + 1));
-    if (r == NULL) return r;
-
-    for (i=0; i < l; i ++) {
-        r[i] = (char) ((b->data[i] == '\0') ? z : (char) (b->data[i]));
-    }
-
-    r[l] = (unsigned char) '\0';
-
-    return r;
-}
-
-/*  int bcstrfree (char * s)
- *
- *  Frees a C-string generated by bstr2cstr ().  This is normally unnecessary
- *  since it just wraps a call to bstr__free (), however, if bstr__alloc () 
- *  and bstr__free () have been redefined as a macros within the bstrlib 
- *  module (via defining them in memdbg.h after defining 
- *  BSTRLIB_MEMORY_DEBUG) with some difference in behaviour from the std 
- *  library functions, then this allows a correct way of freeing the memory 
- *  that allows higher level code to be independent from these macro 
- *  redefinitions.
- */
-int bcstrfree (char * s) {
-    if (s) {
-        bstr__free (s);
-        return BSTR_OK;
-    }
-    return BSTR_ERR;
-}
-
-/*  int bconcat (bstring b0, const_bstring b1)
- *
- *  Concatenate the bstring b1 to the bstring b0.
- */
-int bconcat (bstring b0, const_bstring b1) {
-int len, d;
-bstring aux = (bstring) b1;
-
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL) return BSTR_ERR;
-
-    d = b0->slen;
-    len = b1->slen;
-    if ((d | (b0->mlen - d) | len | (d + len)) < 0) return BSTR_ERR;
-
-    if (b0->mlen <= d + len + 1) {
-        ptrdiff_t pd = b1->data - b0->data;
-        if (0 <= pd && pd < b0->mlen) {
-            if (NULL == (aux = bstrcpy (b1))) return BSTR_ERR;
-        }
-        if (balloc (b0, d + len + 1) != BSTR_OK) {
-            if (aux != b1) bdestroy (aux);
-            return BSTR_ERR;
-        }
-    }
-
-    bBlockCopy (&b0->data[d], &aux->data[0], (size_t) len);
-    b0->data[d + len] = (unsigned char) '\0';
-    b0->slen = d + len;
-    if (aux != b1) bdestroy (aux);
-    return BSTR_OK;
-}
-
-/*  int bconchar (bstring b, char c)
-/ *
- *  Concatenate the single character c to the bstring b.
- */
-int bconchar (bstring b, char c) {
-int d;
-
-    if (b == NULL) return BSTR_ERR;
-    d = b->slen;
-    if ((d | (b->mlen - d)) < 0 || balloc (b, d + 2) != BSTR_OK) return BSTR_ERR;
-    b->data[d] = (unsigned char) c;
-    b->data[d + 1] = (unsigned char) '\0';
-    b->slen++;
-    return BSTR_OK;
-}
-
-/*  int bcatcstr (bstring b, const char * s)
- *
- *  Concatenate a char * string to a bstring.
- */
-int bcatcstr (bstring b, const char * s) {
-char * d;
-int i, l;
-
-    if (b == NULL || b->data == NULL || b->slen < 0 || b->mlen < b->slen
-     || b->mlen <= 0 || s == NULL) return BSTR_ERR;
-
-    /* Optimistically concatenate directly */
-    l = b->mlen - b->slen;
-    d = (char *) &b->data[b->slen];
-    for (i=0; i < l; i++) {
-        if ((*d++ = *s++) == '\0') {
-            b->slen += i;
-            return BSTR_OK;
-        }
-    }
-    b->slen += i;
-
-    /* Need to explicitely resize and concatenate tail */
-    return bcatblk (b, (const void *) s, (int) strlen (s));
-}
-
-/*  int bcatblk (bstring b, const void * s, int len)
- *
- *  Concatenate a fixed length buffer to a bstring.
- */
-int bcatblk (bstring b, const void * s, int len) {
-int nl;
-
-    if (b == NULL || b->data == NULL || b->slen < 0 || b->mlen < b->slen
-     || b->mlen <= 0 || s == NULL || len < 0) return BSTR_ERR;
-
-    if (0 > (nl = b->slen + len)) return BSTR_ERR; /* Overflow? */
-    if (b->mlen <= nl && 0 > balloc (b, nl + 1)) return BSTR_ERR;
-
-    bBlockCopy (&b->data[b->slen], s, (size_t) len);
-    b->slen = nl;
-    b->data[nl] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  bstring bstrcpy (const_bstring b)
- *
- *  Create a copy of the bstring b.
- */
-bstring bstrcpy (const_bstring b) {
-bstring b0;
-int i,j;
-
-    /* Attempted to copy an invalid string? */
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-
-    b0 = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (b0 == NULL) {
-        /* Unable to allocate memory for string header */
-        return NULL;
-    }
-
-    i = b->slen;
-    j = snapUpSize (i + 1);
-
-    b0->data = (unsigned char *) bstr__alloc (j);
-    if (b0->data == NULL) {
-        j = i + 1;
-        b0->data = (unsigned char *) bstr__alloc (j);
-        if (b0->data == NULL) {
-            /* Unable to allocate memory for string data */
-            bstr__free (b0);
-            return NULL;
-        }
-    }
-
-    b0->mlen = j;
-    b0->slen = i;
-
-    if (i) bstr__memcpy ((char *) b0->data, (char *) b->data, i);
-    b0->data[b0->slen] = (unsigned char) '\0';
-
-    return b0;
-}
-
-/*  int bassign (bstring a, const_bstring b)
- *
- *  Overwrite the string a with the contents of string b.
- */
-int bassign (bstring a, const_bstring b) {
-    if (b == NULL || b->data == NULL || b->slen < 0)
-        return BSTR_ERR;
-    if (b->slen != 0) {
-        if (balloc (a, b->slen) != BSTR_OK) return BSTR_ERR;
-        bstr__memmove (a->data, b->data, b->slen);
-    } else {
-        if (a == NULL || a->data == NULL || a->mlen < a->slen || 
-            a->slen < 0 || a->mlen == 0) 
-            return BSTR_ERR;
-    }
-    a->data[b->slen] = (unsigned char) '\0';
-    a->slen = b->slen;
-    return BSTR_OK;
-}
-
-/*  int bassignmidstr (bstring a, const_bstring b, int left, int len)
- *
- *  Overwrite the string a with the middle of contents of string b 
- *  starting from position left and running for a length len.  left and 
- *  len are clamped to the ends of b as with the function bmidstr.
- */
-int bassignmidstr (bstring a, const_bstring b, int left, int len) {
-    if (b == NULL || b->data == NULL || b->slen < 0)
-        return BSTR_ERR;
-
-    if (left < 0) {
-        len += left;
-        left = 0;
-    }
-
-    if (len > b->slen - left) len = b->slen - left;
-
-    if (a == NULL || a->data == NULL || a->mlen < a->slen ||
-        a->slen < 0 || a->mlen == 0)
-        return BSTR_ERR;
-
-    if (len > 0) {
-        if (balloc (a, len) != BSTR_OK) return BSTR_ERR;
-        bstr__memmove (a->data, b->data + left, len);
-        a->slen = len;
-    } else {
-        a->slen = 0;
-    }
-    a->data[a->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bassigncstr (bstring a, const char * str)
- *
- *  Overwrite the string a with the contents of char * string str.  Note that 
- *  the bstring a must be a well defined and writable bstring.  If an error 
- *  occurs BSTR_ERR is returned however a may be partially overwritten.
- */
-int bassigncstr (bstring a, const char * str) {
-int i;
-size_t len;
-    if (a == NULL || a->data == NULL || a->mlen < a->slen ||
-        a->slen < 0 || a->mlen == 0 || NULL == str) 
-        return BSTR_ERR;
-
-    for (i=0; i < a->mlen; i++) {
-        if ('\0' == (a->data[i] = str[i])) {
-            a->slen = i;
-            return BSTR_OK;
-        }
-    }
-
-    a->slen = i;
-    len = strlen (str + i);
-    if (len > INT_MAX || i + len + 1 > INT_MAX ||
-        0 > balloc (a, (int) (i + len + 1))) return BSTR_ERR;
-    bBlockCopy (a->data + i, str + i, (size_t) len + 1);
-    a->slen += (int) len;
-    return BSTR_OK;
-}
-
-/*  int bassignblk (bstring a, const void * s, int len)
- *
- *  Overwrite the string a with the contents of the block (s, len).  Note that 
- *  the bstring a must be a well defined and writable bstring.  If an error 
- *  occurs BSTR_ERR is returned and a is not overwritten.
- */
-int bassignblk (bstring a, const void * s, int len) {
-    if (a == NULL || a->data == NULL || a->mlen < a->slen ||
-        a->slen < 0 || a->mlen == 0 || NULL == s || len + 1 < 1) 
-        return BSTR_ERR;
-    if (len + 1 > a->mlen && 0 > balloc (a, len + 1)) return BSTR_ERR;
-    bBlockCopy (a->data, s, (size_t) len);
-    a->data[len] = (unsigned char) '\0';
-    a->slen = len;
-    return BSTR_OK;
-}
-
-/*  int btrunc (bstring b, int n)
- *
- *  Truncate the bstring to at most n characters.
- */
-int btrunc (bstring b, int n) {
-    if (n < 0 || b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-    if (b->slen > n) {
-        b->slen = n;
-        b->data[n] = (unsigned char) '\0';
-    }
-    return BSTR_OK;
-}
-
-#define   upcase(c) (toupper ((unsigned char) c))
-#define downcase(c) (tolower ((unsigned char) c))
-#define   wspace(c) (isspace ((unsigned char) c))
-
-/*  int btoupper (bstring b)
- *
- *  Convert contents of bstring to upper case.
- */
-int btoupper (bstring b) {
-int i, len;
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-    for (i=0, len = b->slen; i < len; i++) {
-        b->data[i] = (unsigned char) upcase (b->data[i]);
-    }
-    return BSTR_OK;
-}
-
-/*  int btolower (bstring b)
- *
- *  Convert contents of bstring to lower case.
- */
-int btolower (bstring b) {
-int i, len;
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-    for (i=0, len = b->slen; i < len; i++) {
-        b->data[i] = (unsigned char) downcase (b->data[i]);
-    }
-    return BSTR_OK;
-}
-
-/*  int bstricmp (const_bstring b0, const_bstring b1)
- *
- *  Compare two strings without differentiating between case.  The return 
- *  value is the difference of the values of the characters where the two 
- *  strings first differ after lower case transformation, otherwise 0 is 
- *  returned indicating that the strings are equal.  If the lengths are 
- *  different, then a difference from 0 is given, but if the first extra 
- *  character is '\0', then it is taken to be the value UCHAR_MAX+1.
- */
-int bstricmp (const_bstring b0, const_bstring b1) {
-int i, v, n;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || 
-        bdata (b1) == NULL || b1->slen < 0) return SHRT_MIN;
-    if ((n = b0->slen) > b1->slen) n = b1->slen;
-    else if (b0->slen == b1->slen && b0->data == b1->data) return BSTR_OK;
-
-    for (i = 0; i < n; i ++) {
-        v  = (char) downcase (b0->data[i])
-           - (char) downcase (b1->data[i]);
-        if (0 != v) return v;
-    }
-
-    if (b0->slen > n) {
-        v = (char) downcase (b0->data[n]);
-        if (v) return v;
-        return UCHAR_MAX + 1;
-    }
-    if (b1->slen > n) {
-        v = - (char) downcase (b1->data[n]);
-        if (v) return v;
-        return - (int) (UCHAR_MAX + 1);
-    }
-    return BSTR_OK;
-}
-
-/*  int bstrnicmp (const_bstring b0, const_bstring b1, int n)
- *
- *  Compare two strings without differentiating between case for at most n
- *  characters.  If the position where the two strings first differ is
- *  before the nth position, the return value is the difference of the values
- *  of the characters, otherwise 0 is returned.  If the lengths are different
- *  and less than n characters, then a difference from 0 is given, but if the 
- *  first extra character is '\0', then it is taken to be the value 
- *  UCHAR_MAX+1.
- */
-int bstrnicmp (const_bstring b0, const_bstring b1, int n) {
-int i, v, m;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || 
-        bdata (b1) == NULL || b1->slen < 0 || n < 0) return SHRT_MIN;
-    m = n;
-    if (m > b0->slen) m = b0->slen;
-    if (m > b1->slen) m = b1->slen;
-
-    if (b0->data != b1->data) {
-        for (i = 0; i < m; i ++) {
-            v  = (char) downcase (b0->data[i]);
-            v -= (char) downcase (b1->data[i]);
-            if (v != 0) return b0->data[i] - b1->data[i];
-        }
-    }
-
-    if (n == m || b0->slen == b1->slen) return BSTR_OK;
-
-    if (b0->slen > m) {
-        v = (char) downcase (b0->data[m]);
-        if (v) return v;
-        return UCHAR_MAX + 1;
-    }
-
-    v = - (char) downcase (b1->data[m]);
-    if (v) return v;
-    return - (int) (UCHAR_MAX + 1);
-}
-
-/*  int biseqcaseless (const_bstring b0, const_bstring b1)
- *
- *  Compare two strings for equality without differentiating between case.  
- *  If the strings differ other than in case, 0 is returned, if the strings 
- *  are the same, 1 is returned, if there is an error, -1 is returned.  If 
- *  the length of the strings are different, this function is O(1).  '\0' 
- *  termination characters are not treated in any special way.
- */
-int biseqcaseless (const_bstring b0, const_bstring b1) {
-int i, n;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || 
-        bdata (b1) == NULL || b1->slen < 0) return BSTR_ERR;
-    if (b0->slen != b1->slen) return BSTR_OK;
-    if (b0->data == b1->data || b0->slen == 0) return 1;
-    for (i=0, n=b0->slen; i < n; i++) {
-        if (b0->data[i] != b1->data[i]) {
-            unsigned char c = (unsigned char) downcase (b0->data[i]);
-            if (c != (unsigned char) downcase (b1->data[i])) return 0;
-        }
-    }
-    return 1;
-}
-
-/*  int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len)
- *
- *  Compare beginning of string b0 with a block of memory of length len 
- *  without differentiating between case for equality.  If the beginning of b0
- *  differs from the memory block other than in case (or if b0 is too short), 
- *  0 is returned, if the strings are the same, 1 is returned, if there is an 
- *  error, -1 is returned.  '\0' characters are not treated in any special 
- *  way.
- */
-int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len) {
-int i;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || NULL == blk || len < 0)
-        return BSTR_ERR;
-    if (b0->slen < len) return BSTR_OK;
-    if (b0->data == (const unsigned char *) blk || len == 0) return 1;
-
-    for (i = 0; i < len; i ++) {
-        if (b0->data[i] != ((const unsigned char *) blk)[i]) {
-            if (downcase (b0->data[i]) != 
-                downcase (((const unsigned char *) blk)[i])) return 0;
-        }
-    }
-    return 1;
-}
-
-/*
- * int bltrimws (bstring b)
- *
- * Delete whitespace contiguous from the left end of the string.
- */
-int bltrimws (bstring b) {
-int i, len;
-
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-
-    for (len = b->slen, i = 0; i < len; i++) {
-        if (!wspace (b->data[i])) {
-            return bdelete (b, 0, i);
-        }
-    }
-
-    b->data[0] = (unsigned char) '\0';
-    b->slen = 0;
-    return BSTR_OK;
-}
-
-/*
- * int brtrimws (bstring b)
- *
- * Delete whitespace contiguous from the right end of the string.
- */
-int brtrimws (bstring b) {
-int i;
-
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-
-    for (i = b->slen - 1; i >= 0; i--) {
-        if (!wspace (b->data[i])) {
-            if (b->mlen > i) b->data[i+1] = (unsigned char) '\0';
-            b->slen = i + 1;
-            return BSTR_OK;
-        }
-    }
-
-    b->data[0] = (unsigned char) '\0';
-    b->slen = 0;
-    return BSTR_OK;
-}
-
-/*
- * int btrimws (bstring b)
- *
- * Delete whitespace contiguous from both ends of the string.
- */
-int btrimws (bstring b) {
-int i, j;
-
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-
-    for (i = b->slen - 1; i >= 0; i--) {
-        if (!wspace (b->data[i])) {
-            if (b->mlen > i) b->data[i+1] = (unsigned char) '\0';
-            b->slen = i + 1;
-            for (j = 0; wspace (b->data[j]); j++) {}
-            return bdelete (b, 0, j);
-        }
-    }
-
-    b->data[0] = (unsigned char) '\0';
-    b->slen = 0;
-    return BSTR_OK;
-}
-
-/*  int biseq (const_bstring b0, const_bstring b1)
- *
- *  Compare the string b0 and b1.  If the strings differ, 0 is returned, if 
- *  the strings are the same, 1 is returned, if there is an error, -1 is 
- *  returned.  If the length of the strings are different, this function is
- *  O(1).  '\0' termination characters are not treated in any special way.
- */
-int biseq (const_bstring b0, const_bstring b1) {
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL ||
-        b0->slen < 0 || b1->slen < 0) return BSTR_ERR;
-    if (b0->slen != b1->slen) return BSTR_OK;
-    if (b0->data == b1->data || b0->slen == 0) return 1;
-    return !bstr__memcmp (b0->data, b1->data, b0->slen);
-}
-
-/*  int bisstemeqblk (const_bstring b0, const void * blk, int len)
- *
- *  Compare beginning of string b0 with a block of memory of length len for 
- *  equality.  If the beginning of b0 differs from the memory block (or if b0 
- *  is too short), 0 is returned, if the strings are the same, 1 is returned, 
- *  if there is an error, -1 is returned.  '\0' characters are not treated in 
- *  any special way.
- */
-int bisstemeqblk (const_bstring b0, const void * blk, int len) {
-int i;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || NULL == blk || len < 0)
-        return BSTR_ERR;
-    if (b0->slen < len) return BSTR_OK;
-    if (b0->data == (const unsigned char *) blk || len == 0) return 1;
-
-    for (i = 0; i < len; i ++) {
-        if (b0->data[i] != ((const unsigned char *) blk)[i]) return BSTR_OK;
-    }
-    return 1;
-}
-
-/*  int biseqcstr (const_bstring b, const char *s)
- *
- *  Compare the bstring b and char * string s.  The C string s must be '\0' 
- *  terminated at exactly the length of the bstring b, and the contents 
- *  between the two must be identical with the bstring b with no '\0' 
- *  characters for the two contents to be considered equal.  This is 
- *  equivalent to the condition that their current contents will be always be 
- *  equal when comparing them in the same format after converting one or the 
- *  other.  If the strings are equal 1 is returned, if they are unequal 0 is 
- *  returned and if there is a detectable error BSTR_ERR is returned.
- */
-int biseqcstr (const_bstring b, const char * s) {
-int i;
-    if (b == NULL || s == NULL || b->data == NULL || b->slen < 0) return BSTR_ERR;
-    for (i=0; i < b->slen; i++) {
-        if (s[i] == '\0' || b->data[i] != (unsigned char) s[i]) return BSTR_OK;
-    }
-    return s[i] == '\0';
-}
-
-/*  int biseqcstrcaseless (const_bstring b, const char *s)
- *
- *  Compare the bstring b and char * string s.  The C string s must be '\0' 
- *  terminated at exactly the length of the bstring b, and the contents 
- *  between the two must be identical except for case with the bstring b with 
- *  no '\0' characters for the two contents to be considered equal.  This is 
- *  equivalent to the condition that their current contents will be always be 
- *  equal ignoring case when comparing them in the same format after 
- *  converting one or the other.  If the strings are equal, except for case, 
- *  1 is returned, if they are unequal regardless of case 0 is returned and 
- *  if there is a detectable error BSTR_ERR is returned.
- */
-int biseqcstrcaseless (const_bstring b, const char * s) {
-int i;
-    if (b == NULL || s == NULL || b->data == NULL || b->slen < 0) return BSTR_ERR;
-    for (i=0; i < b->slen; i++) {
-        if (s[i] == '\0' || 
-            (b->data[i] != (unsigned char) s[i] && 
-             downcase (b->data[i]) != (unsigned char) downcase (s[i])))
-            return BSTR_OK;
-    }
-    return s[i] == '\0';
-}
-
-/*  int bstrcmp (const_bstring b0, const_bstring b1)
- *
- *  Compare the string b0 and b1.  If there is an error, SHRT_MIN is returned, 
- *  otherwise a value less than or greater than zero, indicating that the 
- *  string pointed to by b0 is lexicographically less than or greater than 
- *  the string pointed to by b1 is returned.  If the the string lengths are 
- *  unequal but the characters up until the length of the shorter are equal 
- *  then a value less than, or greater than zero, indicating that the string 
- *  pointed to by b0 is shorter or longer than the string pointed to by b1 is 
- *  returned.  0 is returned if and only if the two strings are the same.  If 
- *  the length of the strings are different, this function is O(n).  Like its
- *  standard C library counter part strcmp, the comparison does not proceed 
- *  past any '\0' termination characters encountered.
- */
-int bstrcmp (const_bstring b0, const_bstring b1) {
-int i, v, n;
-
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL ||
-        b0->slen < 0 || b1->slen < 0) return SHRT_MIN;
-    n = b0->slen; if (n > b1->slen) n = b1->slen;
-    if (b0->slen == b1->slen && (b0->data == b1->data || b0->slen == 0))
-        return BSTR_OK;
-
-    for (i = 0; i < n; i ++) {
-        v = ((char) b0->data[i]) - ((char) b1->data[i]);
-        if (v != 0) return v;
-        if (b0->data[i] == (unsigned char) '\0') return BSTR_OK;
-    }
-
-    if (b0->slen > n) return 1;
-    if (b1->slen > n) return -1;
-    return BSTR_OK;
-}
-
-/*  int bstrncmp (const_bstring b0, const_bstring b1, int n)
- *
- *  Compare the string b0 and b1 for at most n characters.  If there is an 
- *  error, SHRT_MIN is returned, otherwise a value is returned as if b0 and 
- *  b1 were first truncated to at most n characters then bstrcmp was called
- *  with these new strings are paremeters.  If the length of the strings are 
- *  different, this function is O(n).  Like its standard C library counter 
- *  part strcmp, the comparison does not proceed past any '\0' termination 
- *  characters encountered.
- */
-int bstrncmp (const_bstring b0, const_bstring b1, int n) {
-int i, v, m;
-
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL ||
-        b0->slen < 0 || b1->slen < 0) return SHRT_MIN;
-    m = n;
-    if (m > b0->slen) m = b0->slen;
-    if (m > b1->slen) m = b1->slen;
-
-    if (b0->data != b1->data) {
-        for (i = 0; i < m; i ++) {
-            v = ((char) b0->data[i]) - ((char) b1->data[i]);
-            if (v != 0) return v;
-            if (b0->data[i] == (unsigned char) '\0') return BSTR_OK;
-        }
-    }
-
-    if (n == m || b0->slen == b1->slen) return BSTR_OK;
-
-    if (b0->slen > m) return 1;
-    return -1;
-}
-
-/*  bstring bmidstr (const_bstring b, int left, int len)
- *
- *  Create a bstring which is the substring of b starting from position left
- *  and running for a length len (clamped by the end of the bstring b.)  If
- *  b is detectably invalid, then NULL is returned.  The section described 
- *  by (left, len) is clamped to the boundaries of b.
- */
-bstring bmidstr (const_bstring b, int left, int len) {
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-
-    if (left < 0) {
-        len += left;
-        left = 0;
-    }
-
-    if (len > b->slen - left) len = b->slen - left;
-
-    if (len <= 0) return bfromcstr ("");
-    return blk2bstr (b->data + left, len);
-}
-
-/*  int bdelete (bstring b, int pos, int len)
- *
- *  Removes characters from pos to pos+len-1 inclusive and shifts the tail of 
- *  the bstring starting from pos+len to pos.  len must be positive for this 
- *  call to have any effect.  The section of the string described by (pos, 
- *  len) is clamped to boundaries of the bstring b.
- */
-int bdelete (bstring b, int pos, int len) {
-    /* Clamp to left side of bstring */
-    if (pos < 0) {
-        len += pos;
-        pos = 0;
-    }
-
-    if (len < 0 || b == NULL || b->data == NULL || b->slen < 0 || 
-        b->mlen < b->slen || b->mlen <= 0) 
-        return BSTR_ERR;
-    if (len > 0 && pos < b->slen) {
-        if (pos + len >= b->slen) {
-            b->slen = pos;
-        } else {
-            bBlockCopy ((char *) (b->data + pos),
-                        (char *) (b->data + pos + len), 
-                        b->slen - (pos+len));
-            b->slen -= len;
-        }
-        b->data[b->slen] = (unsigned char) '\0';
-    }
-    return BSTR_OK;
-}
-
-/*  int bdestroy (bstring b)
- *
- *  Free up the bstring.  Note that if b is detectably invalid or not writable
- *  then no action is performed and BSTR_ERR is returned.  Like a freed memory
- *  allocation, dereferences, writes or any other action on b after it has 
- *  been bdestroyed is undefined.
- */
-int bdestroy (bstring b) {
-    if (b == NULL || b->slen < 0 || b->mlen <= 0 || b->mlen < b->slen ||
-        b->data == NULL)
-        return BSTR_ERR;
-
-    bstr__free (b->data);
-
-    /* In case there is any stale usage, there is one more chance to 
-       notice this error. */
-
-    b->slen = -1;
-    b->mlen = -__LINE__;
-    b->data = NULL;
-
-    bstr__free (b);
-    return BSTR_OK;
-}
-
-/*  int binstr (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  forward.  If it is found then return with the first position where it is 
- *  found, otherwise return BSTR_ERR.  Note that this is just a brute force 
- *  string searcher that does not attempt clever things like the Boyer-Moore 
- *  search algorithm.  Because of this there are many degenerate cases where 
- *  this can take much longer than it needs to.
- */
-int binstr (const_bstring b1, int pos, const_bstring b2) {
-int j, ii, ll, lf;
-unsigned char * d0;
-unsigned char c0;
-register unsigned char * d1;
-register unsigned char c1;
-register int i;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos) return (b2->slen == 0)?pos:BSTR_ERR;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    /* No space to find such a string? */
-    if ((lf = b1->slen - b2->slen + 1) <= pos) return BSTR_ERR;
-
-    /* An obvious alias case */
-    if (b1->data == b2->data && pos == 0) return 0;
-
-    i = pos;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    ll = b2->slen;
-
-    /* Peel off the b2->slen == 1 case */
-    c0 = d0[0];
-    if (1 == ll) {
-        for (;i < lf; i++) if (c0 == d1[i]) return i;
-        return BSTR_ERR;
-    }
-
-    c1 = c0;
-    j = 0;
-    lf = b1->slen - 1;
-
-    ii = -1;
-    if (i < lf) do {
-        /* Unrolled current character test */
-        if (c1 != d1[i]) {
-            if (c1 != d1[1+i]) {
-                i += 2;
-                continue;
-            }
-            i++;
-        }
-
-        /* Take note if this is the start of a potential match */
-        if (0 == j) ii = i;
-
-        /* Shift the test character down by one */
-        j++;
-        i++;
-
-        /* If this isn't past the last character continue */
-        if (j < ll) {
-            c1 = d0[j];
-            continue;
-        }
-
-        N0:;
-
-        /* If no characters mismatched, then we matched */
-        if (i == ii+j) return ii;
-
-        /* Shift back to the beginning */
-        i -= j;
-        j  = 0;
-        c1 = c0;
-    } while (i < lf);
-
-    /* Deal with last case if unrolling caused a misalignment */
-    if (i == lf && ll == j+1 && c1 == d1[i]) goto N0;
-
-    return BSTR_ERR;
-}
-
-/*  int binstrr (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  backward.  If it is found then return with the first position where it is 
- *  found, otherwise return BSTR_ERR.  Note that this is just a brute force 
- *  string searcher that does not attempt clever things like the Boyer-Moore 
- *  search algorithm.  Because of this there are many degenerate cases where 
- *  this can take much longer than it needs to.
- */
-int binstrr (const_bstring b1, int pos, const_bstring b2) {
-int j, i, l;
-unsigned char * d0, * d1;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos && b2->slen == 0) return pos;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    /* Obvious alias case */
-    if (b1->data == b2->data && pos == 0 && b2->slen <= b1->slen) return 0;
-
-    i = pos;
-    if ((l = b1->slen - b2->slen) < 0) return BSTR_ERR;
-
-    /* If no space to find such a string then snap back */
-    if (l + 1 <= i) i = l;
-    j = 0;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    l  = b2->slen;
-
-    for (;;) {
-        if (d0[j] == d1[i + j]) {
-            j ++;
-            if (j >= l) return i;
-        } else {
-            i --;
-            if (i < 0) break;
-            j=0;
-        }
-    }
-
-    return BSTR_ERR;
-}
-
-/*  int binstrcaseless (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  forward but without regard to case.  If it is found then return with the 
- *  first position where it is found, otherwise return BSTR_ERR.  Note that 
- *  this is just a brute force string searcher that does not attempt clever 
- *  things like the Boyer-Moore search algorithm.  Because of this there are 
- *  many degenerate cases where this can take much longer than it needs to.
- */
-int binstrcaseless (const_bstring b1, int pos, const_bstring b2) {
-int j, i, l, ll;
-unsigned char * d0, * d1;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos) return (b2->slen == 0)?pos:BSTR_ERR;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    l = b1->slen - b2->slen + 1;
-
-    /* No space to find such a string? */
-    if (l <= pos) return BSTR_ERR;
-
-    /* An obvious alias case */
-    if (b1->data == b2->data && pos == 0) return BSTR_OK;
-
-    i = pos;
-    j = 0;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    ll = b2->slen;
-
-    for (;;) {
-        if (d0[j] == d1[i + j] || downcase (d0[j]) == downcase (d1[i + j])) {
-            j ++;
-            if (j >= ll) return i;
-        } else {
-            i ++;
-            if (i >= l) break;
-            j=0;
-        }
-    }
-
-    return BSTR_ERR;
-}
-
-/*  int binstrrcaseless (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  backward but without regard to case.  If it is found then return with the 
- *  first position where it is found, otherwise return BSTR_ERR.  Note that 
- *  this is just a brute force string searcher that does not attempt clever 
- *  things like the Boyer-Moore search algorithm.  Because of this there are 
- *  many degenerate cases where this can take much longer than it needs to.
- */
-int binstrrcaseless (const_bstring b1, int pos, const_bstring b2) {
-int j, i, l;
-unsigned char * d0, * d1;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos && b2->slen == 0) return pos;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    /* Obvious alias case */
-    if (b1->data == b2->data && pos == 0 && b2->slen <= b1->slen) return BSTR_OK;
-
-    i = pos;
-    if ((l = b1->slen - b2->slen) < 0) return BSTR_ERR;
-
-    /* If no space to find such a string then snap back */
-    if (l + 1 <= i) i = l;
-    j = 0;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    l  = b2->slen;
-
-    for (;;) {
-        if (d0[j] == d1[i + j] || downcase (d0[j]) == downcase (d1[i + j])) {
-            j ++;
-            if (j >= l) return i;
-        } else {
-            i --;
-            if (i < 0) break;
-            j=0;
-        }
-    }
-
-    return BSTR_ERR;
-}
-
-
-/*  int bstrchrp (const_bstring b, int c, int pos)
- *
- *  Search for the character c in b forwards from the position pos 
- *  (inclusive).
- */
-int bstrchrp (const_bstring b, int c, int pos) {
-unsigned char * p;
-
-    if (b == NULL || b->data == NULL || b->slen <= pos || pos < 0) return BSTR_ERR;
-    p = (unsigned char *) bstr__memchr ((b->data + pos), (unsigned char) c, (b->slen - pos));
-    if (p) return (int) (p - b->data);
-    return BSTR_ERR;
-}
-
-/*  int bstrrchrp (const_bstring b, int c, int pos)
- *
- *  Search for the character c in b backwards from the position pos in string 
- *  (inclusive).
- */
-int bstrrchrp (const_bstring b, int c, int pos) {
-int i;
- 
-    if (b == NULL || b->data == NULL || b->slen <= pos || pos < 0) return BSTR_ERR;
-    for (i=pos; i >= 0; i--) {
-        if (b->data[i] == (unsigned char) c) return i;
-    }
-    return BSTR_ERR;
-}
-
-#if !defined (BSTRLIB_AGGRESSIVE_MEMORY_FOR_SPEED_TRADEOFF)
-#define LONG_LOG_BITS_QTY (3)
-#define LONG_BITS_QTY (1 << LONG_LOG_BITS_QTY)
-#define LONG_TYPE unsigned char
-
-#define CFCLEN ((1 << CHAR_BIT) / LONG_BITS_QTY)
-struct charField { LONG_TYPE content[CFCLEN]; };
-#define testInCharField(cf,c) ((cf)->content[(c) >> LONG_LOG_BITS_QTY] & (((long)1) << ((c) & (LONG_BITS_QTY-1))))
-#define setInCharField(cf,idx) { \
-    unsigned int c = (unsigned int) (idx); \
-    (cf)->content[c >> LONG_LOG_BITS_QTY] |= (LONG_TYPE) (1ul << (c & (LONG_BITS_QTY-1))); \
-}
-
-#else
-
-#define CFCLEN (1 << CHAR_BIT)
-struct charField { unsigned char content[CFCLEN]; };
-#define testInCharField(cf,c) ((cf)->content[(unsigned char) (c)])
-#define setInCharField(cf,idx) (cf)->content[(unsigned int) (idx)] = ~0
-
-#endif
-
-/* Convert a bstring to charField */
-static int buildCharField (struct charField * cf, const_bstring b) {
-int i;
-    if (b == NULL || b->data == NULL || b->slen <= 0) return BSTR_ERR;
-    memset ((void *) cf->content, 0, sizeof (struct charField));
-    for (i=0; i < b->slen; i++) {
-        setInCharField (cf, b->data[i]);
-    }
-    return BSTR_OK;
-}
-
-static void invertCharField (struct charField * cf) {
-int i;
-    for (i=0; i < CFCLEN; i++) cf->content[i] = ~cf->content[i];
-}
-
-/* Inner engine for binchr */
-static int binchrCF (const unsigned char * data, int len, int pos, const struct charField * cf) {
-int i;
-    for (i=pos; i < len; i++) {
-        unsigned char c = (unsigned char) data[i];
-        if (testInCharField (cf, c)) return i;
-    }
-    return BSTR_ERR;
-}
-
-/*  int binchr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the first position in b0 starting from pos or after, in which 
- *  one of the characters in b1 is found and return it.  If such a position 
- *  does not exist in b0, then BSTR_ERR is returned.
- */
-int binchr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL ||
-        b0->slen <= pos) return BSTR_ERR;
-    if (1 == b1->slen) return bstrchrp (b0, b1->data[0], pos);
-    if (0 > buildCharField (&chrs, b1)) return BSTR_ERR;
-    return binchrCF (b0->data, b0->slen, pos, &chrs);
-}
-
-/* Inner engine for binchrr */
-static int binchrrCF (const unsigned char * data, int pos, const struct charField * cf) {
-int i;
-    for (i=pos; i >= 0; i--) {
-        unsigned int c = (unsigned int) data[i];
-        if (testInCharField (cf, c)) return i;
-    }
-    return BSTR_ERR;
-}
-
-/*  int binchrr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the last position in b0 no greater than pos, in which one of 
- *  the characters in b1 is found and return it.  If such a position does not 
- *  exist in b0, then BSTR_ERR is returned.
- */
-int binchrr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL || b1 == NULL ||
-        b0->slen < pos) return BSTR_ERR;
-    if (pos == b0->slen) pos--;
-    if (1 == b1->slen) return bstrrchrp (b0, b1->data[0], pos);
-    if (0 > buildCharField (&chrs, b1)) return BSTR_ERR;
-    return binchrrCF (b0->data, pos, &chrs);
-}
-
-/*  int bninchr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the first position in b0 starting from pos or after, in which 
- *  none of the characters in b1 is found and return it.  If such a position 
- *  does not exist in b0, then BSTR_ERR is returned.
- */
-int bninchr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL || 
-        b0->slen <= pos) return BSTR_ERR;
-    if (buildCharField (&chrs, b1) < 0) return BSTR_ERR;
-    invertCharField (&chrs);
-    return binchrCF (b0->data, b0->slen, pos, &chrs);
-}
-
-/*  int bninchrr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the last position in b0 no greater than pos, in which none of 
- *  the characters in b1 is found and return it.  If such a position does not 
- *  exist in b0, then BSTR_ERR is returned.
- */
-int bninchrr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL || 
-        b0->slen < pos) return BSTR_ERR;
-    if (pos == b0->slen) pos--;
-    if (buildCharField (&chrs, b1) < 0) return BSTR_ERR;
-    invertCharField (&chrs);
-    return binchrrCF (b0->data, pos, &chrs);
-}
-
-/*  int bsetstr (bstring b0, int pos, bstring b1, unsigned char fill)
- *
- *  Overwrite the string b0 starting at position pos with the string b1. If 
- *  the position pos is past the end of b0, then the character "fill" is 
- *  appended as necessary to make up the gap between the end of b0 and pos.
- *  If b1 is NULL, it behaves as if it were a 0-length string.
- */
-int bsetstr (bstring b0, int pos, const_bstring b1, unsigned char fill) {
-int d, newlen;
-ptrdiff_t pd;
-bstring aux = (bstring) b1;
-
-    if (pos < 0 || b0 == NULL || b0->slen < 0 || NULL == b0->data || 
-        b0->mlen < b0->slen || b0->mlen <= 0) return BSTR_ERR;
-    if (b1 != NULL && (b1->slen < 0 || b1->data == NULL)) return BSTR_ERR;
-
-    d = pos;
-
-    /* Aliasing case */
-    if (NULL != aux) {
-        if ((pd = (ptrdiff_t) (b1->data - b0->data)) >= 0 && pd < (ptrdiff_t) b0->mlen) {
-            if (NULL == (aux = bstrcpy (b1))) return BSTR_ERR;
-        }
-        d += aux->slen;
-    }
-
-    /* Increase memory size if necessary */
-    if (balloc (b0, d + 1) != BSTR_OK) {
-        if (aux != b1) bdestroy (aux);
-        return BSTR_ERR;
-    }
-
-    newlen = b0->slen;
-
-    /* Fill in "fill" character as necessary */
-    if (pos > newlen) {
-        bstr__memset (b0->data + b0->slen, (int) fill, (size_t) (pos - b0->slen));
-        newlen = pos;
-    }
-
-    /* Copy b1 to position pos in b0. */
-    if (aux != NULL) {
-        bBlockCopy ((char *) (b0->data + pos), (char *) aux->data, aux->slen);
-        if (aux != b1) bdestroy (aux);
-    }
-
-    /* Indicate the potentially increased size of b0 */
-    if (d > newlen) newlen = d;
-
-    b0->slen = newlen;
-    b0->data[newlen] = (unsigned char) '\0';
-
-    return BSTR_OK;
-}
-
-/*  int binsert (bstring b1, int pos, bstring b2, unsigned char fill)
- *
- *  Inserts the string b2 into b1 at position pos.  If the position pos is 
- *  past the end of b1, then the character "fill" is appended as necessary to 
- *  make up the gap between the end of b1 and pos.  Unlike bsetstr, binsert
- *  does not allow b2 to be NULL.
- */
-int binsert (bstring b1, int pos, const_bstring b2, unsigned char fill) {
-int d, l;
-ptrdiff_t pd;
-bstring aux = (bstring) b2;
-
-    if (pos < 0 || b1 == NULL || b2 == NULL || b1->slen < 0 || 
-        b2->slen < 0 || b1->mlen < b1->slen || b1->mlen <= 0) return BSTR_ERR;
-
-    /* Aliasing case */
-    if ((pd = (ptrdiff_t) (b2->data - b1->data)) >= 0 && pd < (ptrdiff_t) b1->mlen) {
-        if (NULL == (aux = bstrcpy (b2))) return BSTR_ERR;
-    }
-
-    /* Compute the two possible end pointers */
-    d = b1->slen + aux->slen;
-    l = pos + aux->slen;
-    if ((d|l) < 0) return BSTR_ERR;
-
-    if (l > d) {
-        /* Inserting past the end of the string */
-        if (balloc (b1, l + 1) != BSTR_OK) {
-            if (aux != b2) bdestroy (aux);
-            return BSTR_ERR;
-        }
-        bstr__memset (b1->data + b1->slen, (int) fill, (size_t) (pos - b1->slen));
-        b1->slen = l;
-    } else {
-        /* Inserting in the middle of the string */
-        if (balloc (b1, d + 1) != BSTR_OK) {
-            if (aux != b2) bdestroy (aux);
-            return BSTR_ERR;
-        }
-        bBlockCopy (b1->data + l, b1->data + pos, d - l);
-        b1->slen = d;
-    }
-    bBlockCopy (b1->data + pos, aux->data, aux->slen);
-    b1->data[b1->slen] = (unsigned char) '\0';
-    if (aux != b2) bdestroy (aux);
-    return BSTR_OK;
-}
-
-/*  int breplace (bstring b1, int pos, int len, bstring b2, 
- *                unsigned char fill)
- *
- *  Replace a section of a string from pos for a length len with the string b2.
- *  fill is used is pos > b1->slen.
- */
-int breplace (bstring b1, int pos, int len, const_bstring b2, 
-              unsigned char fill) {
-int pl, ret;
-ptrdiff_t pd;
-bstring aux = (bstring) b2;
-
-    if (pos < 0 || len < 0 || (pl = pos + len) < 0 || b1 == NULL || 
-        b2 == NULL || b1->data == NULL || b2->data == NULL || 
-        b1->slen < 0 || b2->slen < 0 || b1->mlen < b1->slen ||
-        b1->mlen <= 0) return BSTR_ERR;
-
-    /* Straddles the end? */
-    if (pl >= b1->slen) {
-        if ((ret = bsetstr (b1, pos, b2, fill)) < 0) return ret;
-        if (pos + b2->slen < b1->slen) {
-            b1->slen = pos + b2->slen;
-            b1->data[b1->slen] = (unsigned char) '\0';
-        }
-        return ret;
-    }
-
-    /* Aliasing case */
-    if ((pd = (ptrdiff_t) (b2->data - b1->data)) >= 0 && pd < (ptrdiff_t) b1->slen) {
-        if (NULL == (aux = bstrcpy (b2))) return BSTR_ERR;
-    }
-
-    if (aux->slen > len) {
-        if (balloc (b1, b1->slen + aux->slen - len) != BSTR_OK) {
-            if (aux != b2) bdestroy (aux);
-            return BSTR_ERR;
-        }
-    }
-
-    if (aux->slen != len) bstr__memmove (b1->data + pos + aux->slen, b1->data + pos + len, b1->slen - (pos + len));
-    bstr__memcpy (b1->data + pos, aux->data, aux->slen);
-    b1->slen += aux->slen - len;
-    b1->data[b1->slen] = (unsigned char) '\0';
-    if (aux != b2) bdestroy (aux);
-    return BSTR_OK;
-}
-
-/*  
- *  findreplaceengine is used to implement bfindreplace and 
- *  bfindreplacecaseless. It works by breaking the three cases of
- *  expansion, reduction and replacement, and solving each of these
- *  in the most efficient way possible.
- */
-
-typedef int (*instr_fnptr) (const_bstring s1, int pos, const_bstring s2);
-
-#define INITIAL_STATIC_FIND_INDEX_COUNT 32
-
-static int findreplaceengine (bstring b, const_bstring find, const_bstring repl, int pos, instr_fnptr instr) {
-int i, ret, slen, mlen, delta, acc;
-int * d;
-int static_d[INITIAL_STATIC_FIND_INDEX_COUNT+1]; /* This +1 is unnecessary, but it shuts up LINT. */
-ptrdiff_t pd;
-bstring auxf = (bstring) find;
-bstring auxr = (bstring) repl;
-
-    if (b == NULL || b->data == NULL || find == NULL ||
-        find->data == NULL || repl == NULL || repl->data == NULL || 
-        pos < 0 || find->slen <= 0 || b->mlen < 0 || b->slen > b->mlen || 
-        b->mlen <= 0 || b->slen < 0 || repl->slen < 0) return BSTR_ERR;
-    if (pos > b->slen - find->slen) return BSTR_OK;
-
-    /* Alias with find string */
-    pd = (ptrdiff_t) (find->data - b->data);
-    if ((ptrdiff_t) (pos - find->slen) < pd && pd < (ptrdiff_t) b->slen) {
-        if (NULL == (auxf = bstrcpy (find))) return BSTR_ERR;
-    }
-
-    /* Alias with repl string */
-    pd = (ptrdiff_t) (repl->data - b->data);
-    if ((ptrdiff_t) (pos - repl->slen) < pd && pd < (ptrdiff_t) b->slen) {
-        if (NULL == (auxr = bstrcpy (repl))) {
-            if (auxf != find) bdestroy (auxf);
-            return BSTR_ERR;
-        }
-    }
-
-    delta = auxf->slen - auxr->slen;
-
-    /* in-place replacement since find and replace strings are of equal 
-       length */
-    if (delta == 0) {
-        while ((pos = instr (b, pos, auxf)) >= 0) {
-            bstr__memcpy (b->data + pos, auxr->data, auxr->slen);
-            pos += auxf->slen;
-        }
-        if (auxf != find) bdestroy (auxf);
-        if (auxr != repl) bdestroy (auxr);
-        return BSTR_OK;
-    }
-
-    /* shrinking replacement since auxf->slen > auxr->slen */
-    if (delta > 0) {
-        acc = 0;
-
-        while ((i = instr (b, pos, auxf)) >= 0) {
-            if (acc && i > pos)
-                bstr__memmove (b->data + pos - acc, b->data + pos, i - pos);
-            if (auxr->slen)
-                bstr__memcpy (b->data + i - acc, auxr->data, auxr->slen);
-            acc += delta;
-            pos = i + auxf->slen;
-        }
-
-        if (acc) {
-            i = b->slen;
-            if (i > pos)
-                bstr__memmove (b->data + pos - acc, b->data + pos, i - pos);
-            b->slen -= acc;
-            b->data[b->slen] = (unsigned char) '\0';
-        }
-
-        if (auxf != find) bdestroy (auxf);
-        if (auxr != repl) bdestroy (auxr);
-        return BSTR_OK;
-    }
-
-    /* expanding replacement since find->slen < repl->slen.  Its a lot 
-       more complicated.  This works by first finding all the matches and 
-       storing them to a growable array, then doing at most one resize of
-       the destination bstring and then performing the direct memory transfers
-       of the string segment pieces to form the final result. The growable 
-       array of matches uses a deferred doubling reallocing strategy.  What 
-       this means is that it starts as a reasonably fixed sized auto array in 
-       the hopes that many if not most cases will never need to grow this 
-       array.  But it switches as soon as the bounds of the array will be 
-       exceeded.  An extra find result is always appended to this array that
-       corresponds to the end of the destination string, so slen is checked
-       against mlen - 1 rather than mlen before resizing.
-    */
-
-    mlen = INITIAL_STATIC_FIND_INDEX_COUNT;
-    d = (int *) static_d; /* Avoid malloc for trivial/initial cases */
-    acc = slen = 0;
-
-    while ((pos = instr (b, pos, auxf)) >= 0) {
-        if (slen >= mlen - 1) {
-            int sl, *t;
-
-            mlen += mlen;
-            sl = sizeof (int *) * mlen;
-            if (static_d == d) d = NULL; /* static_d cannot be realloced */
-            if (mlen <= 0 || sl < mlen || NULL == (t = (int *) bstr__realloc (d, sl))) {
-                ret = BSTR_ERR;
-                goto done;
-            }
-            if (NULL == d) bstr__memcpy (t, static_d, sizeof (static_d));
-            d = t;
-        }
-        d[slen] = pos;
-        slen++;
-        acc -= delta;
-        pos += auxf->slen;
-        if (pos < 0 || acc < 0) {
-            ret = BSTR_ERR;
-            goto done;
-        }
-    }
-    
-    /* slen <= INITIAL_STATIC_INDEX_COUNT-1 or mlen-1 here. */
-    d[slen] = b->slen;
-
-    if (BSTR_OK == (ret = balloc (b, b->slen + acc + 1))) {
-        b->slen += acc;
-        for (i = slen-1; i >= 0; i--) {
-            int s, l;
-            s = d[i] + auxf->slen;
-            l = d[i+1] - s; /* d[slen] may be accessed here. */
-            if (l) {
-                bstr__memmove (b->data + s + acc, b->data + s, l);
-            }
-            if (auxr->slen) {
-                bstr__memmove (b->data + s + acc - auxr->slen, 
-                               auxr->data, auxr->slen);
-            }
-            acc += delta;        
-        }
-        b->data[b->slen] = (unsigned char) '\0';
-    }
-
-    done:;
-    if (static_d == d) d = NULL;
-    bstr__free (d);
-    if (auxf != find) bdestroy (auxf);
-    if (auxr != repl) bdestroy (auxr);
-    return ret;
-}
-
-/*  int bfindreplace (bstring b, const_bstring find, const_bstring repl, 
- *                    int pos)
- *
- *  Replace all occurrences of a find string with a replace string after a
- *  given point in a bstring.
- */
-int bfindreplace (bstring b, const_bstring find, const_bstring repl, int pos) {
-    return findreplaceengine (b, find, repl, pos, binstr);
-}
-
-/*  int bfindreplacecaseless (bstring b, const_bstring find, const_bstring repl, 
- *                    int pos)
- *
- *  Replace all occurrences of a find string, ignoring case, with a replace 
- *  string after a given point in a bstring.
- */
-int bfindreplacecaseless (bstring b, const_bstring find, const_bstring repl, int pos) {
-    return findreplaceengine (b, find, repl, pos, binstrcaseless);
-}
-
-/*  int binsertch (bstring b, int pos, int len, unsigned char fill)
- *
- *  Inserts the character fill repeatedly into b at position pos for a 
- *  length len.  If the position pos is past the end of b, then the 
- *  character "fill" is appended as necessary to make up the gap between the 
- *  end of b and the position pos + len.
- */
-int binsertch (bstring b, int pos, int len, unsigned char fill) {
-int d, l, i;
-
-    if (pos < 0 || b == NULL || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || len < 0) return BSTR_ERR;
-
-    /* Compute the two possible end pointers */
-    d = b->slen + len;
-    l = pos + len;
-    if ((d|l) < 0) return BSTR_ERR;
-
-    if (l > d) {
-        /* Inserting past the end of the string */
-        if (balloc (b, l + 1) != BSTR_OK) return BSTR_ERR;
-        pos = b->slen;
-        b->slen = l;
-    } else {
-        /* Inserting in the middle of the string */
-        if (balloc (b, d + 1) != BSTR_OK) return BSTR_ERR;
-        for (i = d - 1; i >= l; i--) {
-            b->data[i] = b->data[i - len];
-        }
-        b->slen = d;
-    }
-
-    for (i=pos; i < l; i++) b->data[i] = fill;
-    b->data[b->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bpattern (bstring b, int len)
- *
- *  Replicate the bstring, b in place, end to end repeatedly until it 
- *  surpasses len characters, then chop the result to exactly len characters. 
- *  This function operates in-place.  The function will return with BSTR_ERR 
- *  if b is NULL or of length 0, otherwise BSTR_OK is returned.
- */
-int bpattern (bstring b, int len) {
-int i, d;
-
-    d = blength (b);
-    if (d <= 0 || len < 0 || balloc (b, len + 1) != BSTR_OK) return BSTR_ERR;
-    if (len > 0) {
-        if (d == 1) return bsetstr (b, len, NULL, b->data[0]);
-        for (i = d; i < len; i++) b->data[i] = b->data[i - d];
-    }
-    b->data[len] = (unsigned char) '\0';
-    b->slen = len;
-    return BSTR_OK;
-}
-
-#define BS_BUFF_SZ (1024)
-
-/*  int breada (bstring b, bNread readPtr, void * parm)
- *
- *  Use a finite buffer fread-like function readPtr to concatenate to the 
- *  bstring b the entire contents of file-like source data in a roughly 
- *  efficient way.
- */
-int breada (bstring b, bNread readPtr, void * parm) {
-int i, l, n;
-
-    if (b == NULL || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || readPtr == NULL) return BSTR_ERR;
-
-    i = b->slen;
-    for (n=i+16; ; n += ((n < BS_BUFF_SZ) ? n : BS_BUFF_SZ)) {
-        if (BSTR_OK != balloc (b, n + 1)) return BSTR_ERR;
-        l = (int) readPtr ((void *) (b->data + i), 1, n - i, parm);
-        i += l;
-        b->slen = i;
-        if (i < n) break;
-    }
-
-    b->data[i] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  bstring bread (bNread readPtr, void * parm)
- *
- *  Use a finite buffer fread-like function readPtr to create a bstring 
- *  filled with the entire contents of file-like source data in a roughly 
- *  efficient way.
- */
-bstring bread (bNread readPtr, void * parm) {
-bstring buff;
-
-    if (0 > breada (buff = bfromcstr (""), readPtr, parm)) {
-        bdestroy (buff);
-        return NULL;
-    }
-    return buff;
-}
-
-/*  int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator)
- *
- *  Use an fgetc-like single character stream reading function (getcPtr) to 
- *  obtain a sequence of characters which are concatenated to the end of the
- *  bstring b.  The stream read is terminated by the passed in terminator 
- *  parameter.
- *
- *  If getcPtr returns with a negative number, or the terminator character 
- *  (which is appended) is read, then the stream reading is halted and the 
- *  function returns with a partial result in b.  If there is an empty partial
- *  result, 1 is returned.  If no characters are read, or there is some other 
- *  detectable error, BSTR_ERR is returned.
- */
-int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator) {
-int c, d, e;
-
-    if (b == NULL || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || getcPtr == NULL) return BSTR_ERR;
-    d = 0;
-    e = b->mlen - 2;
-
-    while ((c = getcPtr (parm)) >= 0) {
-        if (d > e) {
-            b->slen = d;
-            if (balloc (b, d + 2) != BSTR_OK) return BSTR_ERR;
-            e = b->mlen - 2;
-        }
-        b->data[d] = (unsigned char) c;
-        d++;
-        if (c == terminator) break;
-    }
-
-    b->data[d] = (unsigned char) '\0';
-    b->slen = d;
-
-    return d == 0 && c < 0;
-}
-
-/*  int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator)
- *
- *  Use an fgetc-like single character stream reading function (getcPtr) to 
- *  obtain a sequence of characters which are concatenated to the end of the
- *  bstring b.  The stream read is terminated by the passed in terminator 
- *  parameter.
- *
- *  If getcPtr returns with a negative number, or the terminator character 
- *  (which is appended) is read, then the stream reading is halted and the 
- *  function returns with a partial result concatentated to b.  If there is 
- *  an empty partial result, 1 is returned.  If no characters are read, or 
- *  there is some other detectable error, BSTR_ERR is returned.
- */
-int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator) {
-int c, d, e;
-
-    if (b == NULL || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || getcPtr == NULL) return BSTR_ERR;
-    d = b->slen;
-    e = b->mlen - 2;
-
-    while ((c = getcPtr (parm)) >= 0) {
-        if (d > e) {
-            b->slen = d;
-            if (balloc (b, d + 2) != BSTR_OK) return BSTR_ERR;
-            e = b->mlen - 2;
-        }
-        b->data[d] = (unsigned char) c;
-        d++;
-        if (c == terminator) break;
-    }
-
-    b->data[d] = (unsigned char) '\0';
-    b->slen = d;
-
-    return d == 0 && c < 0;
-}
-
-/*  bstring bgets (bNgetc getcPtr, void * parm, char terminator)
- *
- *  Use an fgetc-like single character stream reading function (getcPtr) to 
- *  obtain a sequence of characters which are concatenated into a bstring.  
- *  The stream read is terminated by the passed in terminator function.
- *
- *  If getcPtr returns with a negative number, or the terminator character 
- *  (which is appended) is read, then the stream reading is halted and the 
- *  result obtained thus far is returned.  If no characters are read, or 
- *  there is some other detectable error, NULL is returned.
- */
-bstring bgets (bNgetc getcPtr, void * parm, char terminator) {
-bstring buff;
-
-    if (0 > bgetsa (buff = bfromcstr (""), getcPtr, parm, terminator) || 0 >= buff->slen) {
-        bdestroy (buff);
-        buff = NULL;
-    }
-    return buff;
-}
-
-struct bStream {
-    bstring buff;        /* Buffer for over-reads */
-    void * parm;        /* The stream handle for core stream */
-    bNread readFnPtr;    /* fread compatible fnptr for core stream */
-    int isEOF;        /* track file's EOF state */
-    int maxBuffSz;
-};
-
-/*  struct bStream * bsopen (bNread readPtr, void * parm)
- *
- *  Wrap a given open stream (described by a fread compatible function 
- *  pointer and stream handle) into an open bStream suitable for the bstring 
- *  library streaming functions.
- */
-struct bStream * bsopen (bNread readPtr, void * parm) {
-struct bStream * s;
-
-    if (readPtr == NULL) return NULL;
-    s = (struct bStream *) bstr__alloc (sizeof (struct bStream));
-    if (s == NULL) return NULL;
-    s->parm = parm;
-    s->buff = bfromcstr ("");
-    s->readFnPtr = readPtr;
-    s->maxBuffSz = BS_BUFF_SZ;
-    s->isEOF = 0;
-    return s;
-}
-
-/*  int bsbufflength (struct bStream * s, int sz)
- *
- *  Set the length of the buffer used by the bStream.  If sz is zero, the 
- *  length is not set.  This function returns with the previous length.
- */
-int bsbufflength (struct bStream * s, int sz) {
-int oldSz;
-    if (s == NULL || sz < 0) return BSTR_ERR;
-    oldSz = s->maxBuffSz;
-    if (sz > 0) s->maxBuffSz = sz;
-    return oldSz;
-}
-
-int bseof (const struct bStream * s) {
-    if (s == NULL || s->readFnPtr == NULL) return BSTR_ERR;
-    return s->isEOF && (s->buff->slen == 0);
-}
-
-/*  void * bsclose (struct bStream * s)
- *
- *  Close the bStream, and return the handle to the stream that was originally
- *  used to open the given stream.
- */
-void * bsclose (struct bStream * s) {
-void * parm;
-    if (s == NULL) return NULL;
-    s->readFnPtr = NULL;
-    if (s->buff) bdestroy (s->buff);
-    s->buff = NULL;
-    parm = s->parm;
-    s->parm = NULL;
-    s->isEOF = 1;
-    bstr__free (s);
-    return parm;
-}
-
-/*  int bsreadlna (bstring r, struct bStream * s, char terminator)
- *
- *  Read a bstring terminated by the terminator character or the end of the
- *  stream from the bStream (s) and return it into the parameter r.  This 
- *  function may read additional characters from the core stream that are not 
- *  returned, but will be retained for subsequent read operations.
- */
-int bsreadlna (bstring r, struct bStream * s, char terminator) {
-int i, l, ret, rlo;
-char * b;
-struct tagbstring x;
-
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0 ||
-        r->slen < 0 || r->mlen < r->slen) return BSTR_ERR;
-    l = s->buff->slen;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    b = (char *) s->buff->data;
-    x.data = (unsigned char *) b;
-
-    /* First check if the current buffer holds the terminator */
-    b[l] = terminator; /* Set sentinel */
-    for (i=0; b[i] != terminator; i++) ;
-    if (i < l) {
-        x.slen = i + 1;
-        ret = bconcat (r, &x);
-        s->buff->slen = l;
-        if (BSTR_OK == ret) bdelete (s->buff, 0, i + 1);
-        return BSTR_OK;
-    }
-
-    rlo = r->slen;
-
-    /* If not then just concatenate the entire buffer to the output */
-    x.slen = l;
-    if (BSTR_OK != bconcat (r, &x)) return BSTR_ERR;
-
-    /* Perform direct in-place reads into the destination to allow for
-       the minimum of data-copies */
-    for (;;) {
-        if (BSTR_OK != balloc (r, r->slen + s->maxBuffSz + 1)) return BSTR_ERR;
-        b = (char *) (r->data + r->slen);
-        l = (int) s->readFnPtr (b, 1, s->maxBuffSz, s->parm);
-        if (l <= 0) {
-            r->data[r->slen] = (unsigned char) '\0';
-            s->buff->slen = 0;
-            s->isEOF = 1;
-            /* If nothing was read return with an error message */
-            return BSTR_ERR & -(r->slen == rlo);
-        }
-        b[l] = terminator; /* Set sentinel */
-        for (i=0; b[i] != terminator; i++) ;
-        if (i < l) break;
-        r->slen += l;
-    }
-
-    /* Terminator found, push over-read back to buffer */
-    i++;
-    r->slen += i;
-    s->buff->slen = l - i;
-    bstr__memcpy (s->buff->data, b + i, l - i);
-    r->data[r->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bsreadlnsa (bstring r, struct bStream * s, bstring term)
- *
- *  Read a bstring terminated by any character in the term string or the end 
- *  of the stream from the bStream (s) and return it into the parameter r.  
- *  This function may read additional characters from the core stream that 
- *  are not returned, but will be retained for subsequent read operations.
- */
-int bsreadlnsa (bstring r, struct bStream * s, const_bstring term) {
-int i, l, ret, rlo;
-unsigned char * b;
-struct tagbstring x;
-struct charField cf;
-
-    if (s == NULL || s->buff == NULL || r == NULL || term == NULL ||
-        term->data == NULL || r->mlen <= 0 || r->slen < 0 ||
-        r->mlen < r->slen) return BSTR_ERR;
-    if (term->slen == 1) return bsreadlna (r, s, term->data[0]);
-    if (term->slen < 1 || buildCharField (&cf, term)) return BSTR_ERR;
-
-    l = s->buff->slen;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    b = (unsigned char *) s->buff->data;
-    x.data = b;
-
-    /* First check if the current buffer holds the terminator */
-    b[l] = term->data[0]; /* Set sentinel */
-    for (i=0; !testInCharField (&cf, b[i]); i++) ;
-    if (i < l) {
-        x.slen = i + 1;
-        ret = bconcat (r, &x);
-        s->buff->slen = l;
-        if (BSTR_OK == ret) bdelete (s->buff, 0, i + 1);
-        return BSTR_OK;
-    }
-
-    rlo = r->slen;
-
-    /* If not then just concatenate the entire buffer to the output */
-    x.slen = l;
-    if (BSTR_OK != bconcat (r, &x)) return BSTR_ERR;
-
-    /* Perform direct in-place reads into the destination to allow for
-       the minimum of data-copies */
-    for (;;) {
-        if (BSTR_OK != balloc (r, r->slen + s->maxBuffSz + 1)) return BSTR_ERR;
-        b = (unsigned char *) (r->data + r->slen);
-        l = (int) s->readFnPtr (b, 1, s->maxBuffSz, s->parm);
-        if (l <= 0) {
-            r->data[r->slen] = (unsigned char) '\0';
-            s->buff->slen = 0;
-            s->isEOF = 1;
-            /* If nothing was read return with an error message */
-            return BSTR_ERR & -(r->slen == rlo);
-        }
-
-        b[l] = term->data[0]; /* Set sentinel */
-        for (i=0; !testInCharField (&cf, b[i]); i++) ;
-        if (i < l) break;
-        r->slen += l;
-    }
-
-    /* Terminator found, push over-read back to buffer */
-    i++;
-    r->slen += i;
-    s->buff->slen = l - i;
-    bstr__memcpy (s->buff->data, b + i, l - i);
-    r->data[r->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bsreada (bstring r, struct bStream * s, int n)
- *
- *  Read a bstring of length n (or, if it is fewer, as many bytes as is 
- *  remaining) from the bStream.  This function may read additional 
- *  characters from the core stream that are not returned, but will be 
- *  retained for subsequent read operations.  This function will not read
- *  additional characters from the core stream beyond virtual stream pointer.
- */
-int bsreada (bstring r, struct bStream * s, int n) {
-int l, ret, orslen;
-char * b;
-struct tagbstring x;
-
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0
-     || r->slen < 0 || r->mlen < r->slen || n <= 0) return BSTR_ERR;
-
-    n += r->slen;
-    if (n <= 0) return BSTR_ERR;
-
-    l = s->buff->slen;
-
-    orslen = r->slen;
-
-    if (0 == l) {
-        if (s->isEOF) return BSTR_ERR;
-        if (r->mlen > n) {
-            l = (int) s->readFnPtr (r->data + r->slen, 1, n - r->slen, s->parm);
-            if (0 >= l || l > n - r->slen) {
-                s->isEOF = 1;
-                return BSTR_ERR;
-            }
-            r->slen += l;
-            r->data[r->slen] = (unsigned char) '\0';
-            return 0;
-        }
-    }
-
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    b = (char *) s->buff->data;
-    x.data = (unsigned char *) b;
-
-    do {
-        if (l + r->slen >= n) {
-            x.slen = n - r->slen;
-            ret = bconcat (r, &x);
-            s->buff->slen = l;
-            if (BSTR_OK == ret) bdelete (s->buff, 0, x.slen);
-            return BSTR_ERR & -(r->slen == orslen);
-        }
-
-        x.slen = l;
-        if (BSTR_OK != bconcat (r, &x)) break;
-
-        l = n - r->slen;
-        if (l > s->maxBuffSz) l = s->maxBuffSz;
-
-        l = (int) s->readFnPtr (b, 1, l, s->parm);
-
-    } while (l > 0);
-    if (l < 0) l = 0;
-    if (l == 0) s->isEOF = 1;
-    s->buff->slen = l;
-    return BSTR_ERR & -(r->slen == orslen);
-}
-
-/*  int bsreadln (bstring r, struct bStream * s, char terminator)
- *
- *  Read a bstring terminated by the terminator character or the end of the
- *  stream from the bStream (s) and return it into the parameter r.  This 
- *  function may read additional characters from the core stream that are not 
- *  returned, but will be retained for subsequent read operations.
- */
-int bsreadln (bstring r, struct bStream * s, char terminator) {
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0)
-        return BSTR_ERR;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    r->slen = 0;
-    return bsreadlna (r, s, terminator);
-}
-
-/*  int bsreadlns (bstring r, struct bStream * s, bstring term)
- *
- *  Read a bstring terminated by any character in the term string or the end 
- *  of the stream from the bStream (s) and return it into the parameter r.  
- *  This function may read additional characters from the core stream that 
- *  are not returned, but will be retained for subsequent read operations.
- */
-int bsreadlns (bstring r, struct bStream * s, const_bstring term) {
-    if (s == NULL || s->buff == NULL || r == NULL || term == NULL 
-     || term->data == NULL || r->mlen <= 0) return BSTR_ERR;
-    if (term->slen == 1) return bsreadln (r, s, term->data[0]);
-    if (term->slen < 1) return BSTR_ERR;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    r->slen = 0;
-    return bsreadlnsa (r, s, term);
-}
-
-/*  int bsread (bstring r, struct bStream * s, int n)
- *
- *  Read a bstring of length n (or, if it is fewer, as many bytes as is 
- *  remaining) from the bStream.  This function may read additional 
- *  characters from the core stream that are not returned, but will be 
- *  retained for subsequent read operations.  This function will not read
- *  additional characters from the core stream beyond virtual stream pointer.
- */
-int bsread (bstring r, struct bStream * s, int n) {
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0
-     || n <= 0) return BSTR_ERR;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    r->slen = 0;
-    return bsreada (r, s, n);
-}
-
-/*  int bsunread (struct bStream * s, const_bstring b)
- *
- *  Insert a bstring into the bStream at the current position.  These 
- *  characters will be read prior to those that actually come from the core 
- *  stream.
- */
-int bsunread (struct bStream * s, const_bstring b) {
-    if (s == NULL || s->buff == NULL) return BSTR_ERR;
-    return binsert (s->buff, 0, b, (unsigned char) '?');
-}
-
-/*  int bspeek (bstring r, const struct bStream * s)
- *
- *  Return the currently buffered characters from the bStream that will be 
- *  read prior to reads from the core stream.
- */
-int bspeek (bstring r, const struct bStream * s) {
-    if (s == NULL || s->buff == NULL) return BSTR_ERR;
-    return bassign (r, s->buff);
-}
-
-/*  bstring bjoin (const struct bstrList * bl, const_bstring sep);
- *
- *  Join the entries of a bstrList into one bstring by sequentially 
- *  concatenating them with the sep string in between.  If there is an error 
- *  NULL is returned, otherwise a bstring with the correct result is returned.
- */
-bstring bjoin (const struct bstrList * bl, const_bstring sep) {
-bstring b;
-int i, c, v;
-
-    if (bl == NULL || bl->qty < 0) return NULL;
-    if (sep != NULL && (sep->slen < 0 || sep->data == NULL)) return NULL;
-
-    for (i = 0, c = 1; i < bl->qty; i++) {
-        v = bl->entry[i]->slen;
-        if (v < 0) return NULL;    /* Invalid input */
-        c += v;
-        if (c < 0) return NULL;    /* Wrap around ?? */
-    }
-
-    if (sep != NULL) c += (bl->qty - 1) * sep->slen;
-
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (NULL == b) return NULL; /* Out of memory */
-    b->data = (unsigned char *) bstr__alloc (c);
-    if (b->data == NULL) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    b->mlen = c;
-    b->slen = c-1;
-
-    for (i = 0, c = 0; i < bl->qty; i++) {
-        if (i > 0 && sep != NULL) {
-            bstr__memcpy (b->data + c, sep->data, sep->slen);
-            c += sep->slen;
-        }
-        v = bl->entry[i]->slen;
-        bstr__memcpy (b->data + c, bl->entry[i]->data, v);
-        c += v;
-    }
-    b->data[c] = (unsigned char) '\0';
-    return b;
-}
-
-#define BSSSC_BUFF_LEN (256)
-
-/*  int bssplitscb (struct bStream * s, const_bstring splitStr, 
- *    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings read from a stream 
- *  divided by any of the characters in splitStr.  An empty splitStr causes 
- *  the whole stream to be iterated once.
- *
- *  Note: At the point of calling the cb function, the bStream pointer is 
- *  pointed exactly at the position right after having read the split 
- *  character.  The cb function can act on the stream by causing the bStream
- *  pointer to move, and bssplitscb will continue by starting the next split
- *  at the position of the pointer after the return from cb.
- *
- *  However, if the cb causes the bStream s to be destroyed then the cb must
- *  return with a negative value, otherwise bssplitscb will continue in an 
- *  undefined manner.
- */
-int bssplitscb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm) {
-struct charField chrs;
-bstring buff;
-int i, p, ret;
-
-    if (cb == NULL || s == NULL || s->readFnPtr == NULL 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-
-    if (NULL == (buff = bfromcstr (""))) return BSTR_ERR;
-
-    if (splitStr->slen == 0) {
-        while (bsreada (buff, s, BSSSC_BUFF_LEN) >= 0) ;
-        if ((ret = cb (parm, 0, buff)) > 0) 
-            ret = 0;
-    } else {
-        buildCharField (&chrs, splitStr);
-        ret = p = i = 0;
-        for (;;) {
-            if (i >= buff->slen) {
-                bsreada (buff, s, BSSSC_BUFF_LEN);
-                if (i >= buff->slen) {
-                    if (0 < (ret = cb (parm, p, buff))) ret = 0;
-                    break;
-                }
-            }
-            if (testInCharField (&chrs, buff->data[i])) {
-                struct tagbstring t;
-                unsigned char c;
-
-                blk2tbstr (t, buff->data + i + 1, buff->slen - (i + 1));
-                if ((ret = bsunread (s, &t)) < 0) break;
-                buff->slen = i;
-                c = buff->data[i];
-                buff->data[i] = (unsigned char) '\0';
-                if ((ret = cb (parm, p, buff)) < 0) break;
-                buff->data[i] = c;
-                buff->slen = 0;
-                p += i + 1;
-                i = -1;
-            }
-            i++;
-        }
-    }
-
-    bdestroy (buff);
-    return ret;
-}
-
-/*  int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
- *    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings read from a stream 
- *  divided by the entire substring splitStr.  An empty splitStr causes 
- *  each character of the stream to be iterated.
- *
- *  Note: At the point of calling the cb function, the bStream pointer is 
- *  pointed exactly at the position right after having read the split 
- *  character.  The cb function can act on the stream by causing the bStream
- *  pointer to move, and bssplitscb will continue by starting the next split
- *  at the position of the pointer after the return from cb.
- *
- *  However, if the cb causes the bStream s to be destroyed then the cb must
- *  return with a negative value, otherwise bssplitscb will continue in an 
- *  undefined manner.
- */
-int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm) {
-bstring buff;
-int i, p, ret;
-
-    if (cb == NULL || s == NULL || s->readFnPtr == NULL 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-
-    if (splitStr->slen == 1) return bssplitscb (s, splitStr, cb, parm);
-
-    if (NULL == (buff = bfromcstr (""))) return BSTR_ERR;
-
-    if (splitStr->slen == 0) {
-        for (i=0; bsreada (buff, s, BSSSC_BUFF_LEN) >= 0; i++) {
-            if ((ret = cb (parm, 0, buff)) < 0) {
-                bdestroy (buff);
-                return ret;
-            }
-            buff->slen = 0;
-        }
-        return BSTR_OK;
-    } else {
-        ret = p = i = 0;
-        for (i=p=0;;) {
-            if ((ret = binstr (buff, 0, splitStr)) >= 0) {
-                struct tagbstring t;
-                blk2tbstr (t, buff->data, ret);
-                i = ret + splitStr->slen;
-                if ((ret = cb (parm, p, &t)) < 0) break;
-                p += i;
-                bdelete (buff, 0, i);
-            } else {
-                bsreada (buff, s, BSSSC_BUFF_LEN);
-                if (bseof (s)) {
-                    if ((ret = cb (parm, p, buff)) > 0) ret = 0;
-                    break;
-                }
-            }
-        }
-    }
-
-    bdestroy (buff);
-    return ret;
-}
-
-/*  int bstrListCreate (void)
- *
- *  Create a bstrList.
- */
-struct bstrList * bstrListCreate (void) {
-struct bstrList * sl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (sl) {
-        sl->entry = (bstring *) bstr__alloc (1*sizeof (bstring));
-        if (!sl->entry) {
-            bstr__free (sl);
-            sl = NULL;
-        } else {
-            sl->qty = 0;
-            sl->mlen = 1;
-        }
-    }
-    return sl;
-}
-
-/*  int bstrListDestroy (struct bstrList * sl)
- *
- *  Destroy a bstrList that has been created by bsplit, bsplits or bstrListCreate.
- */
-int bstrListDestroy (struct bstrList * sl) {
-int i;
-    if (sl == NULL || sl->qty < 0) return BSTR_ERR;
-    for (i=0; i < sl->qty; i++) {
-        if (sl->entry[i]) {
-            bdestroy (sl->entry[i]);
-            sl->entry[i] = NULL;
-        }
-    }
-    sl->qty  = -1;
-    sl->mlen = -1;
-    bstr__free (sl->entry);
-    sl->entry = NULL;
-    bstr__free (sl);
-    return BSTR_OK;
-}
-
-/*  int bstrListAlloc (struct bstrList * sl, int msz)
- *
- *  Ensure that there is memory for at least msz number of entries for the
- *  list.
- */
-int bstrListAlloc (struct bstrList * sl, int msz) {
-bstring * l;
-int smsz;
-size_t nsz;
-    if (!sl || msz <= 0 || !sl->entry || sl->qty < 0 || sl->mlen <= 0 || sl->qty > sl->mlen) return BSTR_ERR;
-    if (sl->mlen >= msz) return BSTR_OK;
-    smsz = snapUpSize (msz);
-    nsz = ((size_t) smsz) * sizeof (bstring);
-    if (nsz < (size_t) smsz) return BSTR_ERR;
-    l = (bstring *) bstr__realloc (sl->entry, nsz);
-    if (!l) {
-        smsz = msz;
-        nsz = ((size_t) smsz) * sizeof (bstring);
-        l = (bstring *) bstr__realloc (sl->entry, nsz);
-        if (!l) return BSTR_ERR;
-    }
-    sl->mlen = smsz;
-    sl->entry = l;
-    return BSTR_OK;
-}
-
-/*  int bstrListAllocMin (struct bstrList * sl, int msz)
- *
- *  Try to allocate the minimum amount of memory for the list to include at
- *  least msz entries or sl->qty whichever is greater.
- */
-int bstrListAllocMin (struct bstrList * sl, int msz) {
-bstring * l;
-size_t nsz;
-    if (!sl || msz <= 0 || !sl->entry || sl->qty < 0 || sl->mlen <= 0 || sl->qty > sl->mlen) return BSTR_ERR;
-    if (msz < sl->qty) msz = sl->qty;
-    if (sl->mlen == msz) return BSTR_OK;
-    nsz = ((size_t) msz) * sizeof (bstring);
-    if (nsz < (size_t) msz) return BSTR_ERR;
-    l = (bstring *) bstr__realloc (sl->entry, nsz);
-    if (!l) return BSTR_ERR;
-    sl->mlen = msz;
-    sl->entry = l;
-    return BSTR_OK;
-}
-
-/*  int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
- *    int (* cb) (void * parm, int ofs, int len), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings over str divided by the
- *  character in splitChar.
- *
- *  Note: Non-destructive modification of str from within the cb function 
- *  while performing this split is not undefined.  bsplitcb behaves in 
- *  sequential lock step with calls to cb.  I.e., after returning from a cb 
- *  that return a non-negative integer, bsplitcb continues from the position 
- *  1 character after the last detected split character and it will halt 
- *  immediately if the length of str falls below this point.  However, if the 
- *  cb function destroys str, then it *must* return with a negative value, 
- *  otherwise bsplitcb will continue in an undefined manner.
- */
-int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm) {
-int i, p, ret;
-
-    if (cb == NULL || str == NULL || pos < 0 || pos > str->slen) 
-        return BSTR_ERR;
-
-    p = pos;
-    do {
-        for (i=p; i < str->slen; i++) {
-            if (str->data[i] == splitChar) break;
-        }
-        if ((ret = cb (parm, p, i - p)) < 0) return ret;
-        p = i + 1;
-    } while (p <= str->slen);
-    return BSTR_OK;
-}
-
-/*  int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
- *    int (* cb) (void * parm, int ofs, int len), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings over str divided by any 
- *  of the characters in splitStr.  An empty splitStr causes the whole str to
- *  be iterated once.
- *
- *  Note: Non-destructive modification of str from within the cb function 
- *  while performing this split is not undefined.  bsplitscb behaves in 
- *  sequential lock step with calls to cb.  I.e., after returning from a cb 
- *  that return a non-negative integer, bsplitscb continues from the position 
- *  1 character after the last detected split character and it will halt 
- *  immediately if the length of str falls below this point.  However, if the 
- *  cb function destroys str, then it *must* return with a negative value, 
- *  otherwise bsplitscb will continue in an undefined manner.
- */
-int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm) {
-struct charField chrs;
-int i, p, ret;
-
-    if (cb == NULL || str == NULL || pos < 0 || pos > str->slen 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-    if (splitStr->slen == 0) {
-        if ((ret = cb (parm, 0, str->slen)) > 0) ret = 0;
-        return ret;
-    }
-
-    if (splitStr->slen == 1) 
-        return bsplitcb (str, splitStr->data[0], pos, cb, parm);
-
-    buildCharField (&chrs, splitStr);
-
-    p = pos;
-    do {
-        for (i=p; i < str->slen; i++) {
-            if (testInCharField (&chrs, str->data[i])) break;
-        }
-        if ((ret = cb (parm, p, i - p)) < 0) return ret;
-        p = i + 1;
-    } while (p <= str->slen);
-    return BSTR_OK;
-}
-
-/*  int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
- *    int (* cb) (void * parm, int ofs, int len), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings over str divided by the 
- *  substring splitStr.  An empty splitStr causes the whole str to be 
- *  iterated once.
- *
- *  Note: Non-destructive modification of str from within the cb function 
- *  while performing this split is not undefined.  bsplitstrcb behaves in 
- *  sequential lock step with calls to cb.  I.e., after returning from a cb 
- *  that return a non-negative integer, bsplitscb continues from the position 
- *  1 character after the last detected split character and it will halt 
- *  immediately if the length of str falls below this point.  However, if the 
- *  cb function destroys str, then it *must* return with a negative value, 
- *  otherwise bsplitscb will continue in an undefined manner.
- */
-int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm) {
-int i, p, ret;
-
-    if (cb == NULL || str == NULL || pos < 0 || pos > str->slen 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-
-    if (0 == splitStr->slen) {
-        for (i=pos; i < str->slen; i++) {
-            if ((ret = cb (parm, i, 1)) < 0) return ret;
-        }
-        return BSTR_OK;
-    }
-
-    if (splitStr->slen == 1) 
-        return bsplitcb (str, splitStr->data[0], pos, cb, parm);
-
-    for (i=p=pos; i <= str->slen - splitStr->slen; i++) {
-        if (0 == bstr__memcmp (splitStr->data, str->data + i, splitStr->slen)) {
-            if ((ret = cb (parm, p, i - p)) < 0) return ret;
-            i += splitStr->slen;
-            p = i;
-        }
-    }
-    if ((ret = cb (parm, p, str->slen - p)) < 0) return ret;
-    return BSTR_OK;
-}
-
-struct genBstrList {
-    bstring b;
-    struct bstrList * bl;
-};
-
-static int bscb (void * parm, int ofs, int len) {
-struct genBstrList * g = (struct genBstrList *) parm;
-    if (g->bl->qty >= g->bl->mlen) {
-        int mlen = g->bl->mlen * 2;
-        bstring * tbl;
-
-        while (g->bl->qty >= mlen) {
-            if (mlen < g->bl->mlen) return BSTR_ERR;
-            mlen += mlen;
-        }
-
-        tbl = (bstring *) bstr__realloc (g->bl->entry, sizeof (bstring) * mlen);
-        if (tbl == NULL) return BSTR_ERR;
-
-        g->bl->entry = tbl;
-        g->bl->mlen = mlen;
-    }
-
-    g->bl->entry[g->bl->qty] = bmidstr (g->b, ofs, len);
-    g->bl->qty++;
-    return BSTR_OK;
-}
-
-/*  struct bstrList * bsplit (const_bstring str, unsigned char splitChar)
- *
- *  Create an array of sequential substrings from str divided by the character
- *  splitChar.  
- */
-struct bstrList * bsplit (const_bstring str, unsigned char splitChar) {
-struct genBstrList g;
-
-    if (str == NULL || str->data == NULL || str->slen < 0) return NULL;
-
-    g.bl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (g.bl == NULL) return NULL;
-    g.bl->mlen = 4;
-    g.bl->entry = (bstring *) bstr__alloc (g.bl->mlen * sizeof (bstring));
-    if (NULL == g.bl->entry) {
-        bstr__free (g.bl);
-        return NULL;
-    }
-
-    g.b = (bstring) str;
-    g.bl->qty = 0;
-    if (bsplitcb (str, splitChar, 0, bscb, &g) < 0) {
-        bstrListDestroy (g.bl);
-        return NULL;
-    }
-    return g.bl;
-}
-
-/*  struct bstrList * bsplitstr (const_bstring str, const_bstring splitStr)
- *
- *  Create an array of sequential substrings from str divided by the entire
- *  substring splitStr.
- */
-struct bstrList * bsplitstr (const_bstring str, const_bstring splitStr) {
-struct genBstrList g;
-
-    if (str == NULL || str->data == NULL || str->slen < 0) return NULL;
-
-    g.bl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (g.bl == NULL) return NULL;
-    g.bl->mlen = 4;
-    g.bl->entry = (bstring *) bstr__alloc (g.bl->mlen * sizeof (bstring));
-    if (NULL == g.bl->entry) {
-        bstr__free (g.bl);
-        return NULL;
-    }
-
-    g.b = (bstring) str;
-    g.bl->qty = 0;
-    if (bsplitstrcb (str, splitStr, 0, bscb, &g) < 0) {
-        bstrListDestroy (g.bl);
-        return NULL;
-    }
-    return g.bl;
-}
-
-/*  struct bstrList * bsplits (const_bstring str, bstring splitStr)
- *
- *  Create an array of sequential substrings from str divided by any of the 
- *  characters in splitStr.  An empty splitStr causes a single entry bstrList
- *  containing a copy of str to be returned.
- */
-struct bstrList * bsplits (const_bstring str, const_bstring splitStr) {
-struct genBstrList g;
-
-    if (     str == NULL ||      str->slen < 0 ||      str->data == NULL ||
-        splitStr == NULL || splitStr->slen < 0 || splitStr->data == NULL)
-        return NULL;
-
-    g.bl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (g.bl == NULL) return NULL;
-    g.bl->mlen = 4;
-    g.bl->entry = (bstring *) bstr__alloc (g.bl->mlen * sizeof (bstring));
-    if (NULL == g.bl->entry) {
-        bstr__free (g.bl);
-        return NULL;
-    }
-    g.b = (bstring) str;
-    g.bl->qty = 0;
-
-    if (bsplitscb (str, splitStr, 0, bscb, &g) < 0) {
-        bstrListDestroy (g.bl);
-        return NULL;
-    }
-    return g.bl;
-}
-
-#if defined (__TURBOC__) && !defined (__BORLANDC__)
-# ifndef BSTRLIB_NOVSNP
-#  define BSTRLIB_NOVSNP
-# endif
-#endif
-
-/* Give WATCOM C/C++, MSVC some latitude for their non-support of vsnprintf */
-#if defined(__WATCOMC__) || defined(_MSC_VER)
-#define exvsnprintf(r,b,n,f,a) {r = _vsnprintf (b,n,f,a);}
-#else
-#ifdef BSTRLIB_NOVSNP
-/* This is just a hack.  If you are using a system without a vsnprintf, it is 
-   not recommended that bformat be used at all. */
-#define exvsnprintf(r,b,n,f,a) {vsprintf (b,f,a); r = -1;}
-#define START_VSNBUFF (256)
-#else
-
-#if defined(__GNUC__) && !defined(__clang__)
-/* Something is making gcc complain about this prototype not being here, so 
-   I've just gone ahead and put it in. */
-extern int vsnprintf (char *buf, size_t count, const char *format, va_list arg);
-#endif
-
-#define exvsnprintf(r,b,n,f,a) {r = vsnprintf (b,n,f,a);}
-#endif
-#endif
-
-#if !defined (BSTRLIB_NOVSNP)
-
-#ifndef START_VSNBUFF
-#define START_VSNBUFF (16)
-#endif
-
-/* On IRIX vsnprintf returns n-1 when the operation would overflow the target 
-   buffer, WATCOM and MSVC both return -1, while C99 requires that the 
-   returned value be exactly what the length would be if the buffer would be
-   large enough.  This leads to the idea that if the return value is larger 
-   than n, then changing n to the return value will reduce the number of
-   iterations required. */
-
-/*  int bformata (bstring b, const char * fmt, ...)
- *
- *  After the first parameter, it takes the same parameters as printf (), but 
- *  rather than outputting results to stdio, it appends the results to 
- *  a bstring which contains what would have been output. Note that if there 
- *  is an early generation of a '\0' character, the bstring will be truncated 
- *  to this end point.
- */
-int bformata (bstring b, const char * fmt, ...) {
-va_list arglist;
-bstring buff;
-int n, r;
-
-    if (b == NULL || fmt == NULL || b->data == NULL || b->mlen <= 0 
-     || b->slen < 0 || b->slen > b->mlen) return BSTR_ERR;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "vsnprintf" call (to avoid buffer
-       overflows) on increasing potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < START_VSNBUFF) n = START_VSNBUFF;
-    if (NULL == (buff = bfromcstralloc (n + 2, ""))) {
-        n = 1;
-        if (NULL == (buff = bfromcstralloc (n + 2, ""))) return BSTR_ERR;
-    }
-
-    for (;;) {
-        va_start (arglist, fmt);
-        exvsnprintf (r, (char *) buff->data, n + 1, fmt, arglist);
-        va_end (arglist);
-
-        buff->data[n] = (unsigned char) '\0';
-        buff->slen = (int) (strlen) ((char *) buff->data);
-
-        if (buff->slen < n) break;
-
-        if (r > n) n = r; else n += n;
-
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return BSTR_ERR;
-        }
-    }
-
-    r = bconcat (b, buff);
-    bdestroy (buff);
-    return r;
-}
-
-/*  int bassignformat (bstring b, const char * fmt, ...)
- *
- *  After the first parameter, it takes the same parameters as printf (), but 
- *  rather than outputting results to stdio, it outputs the results to 
- *  the bstring parameter b. Note that if there is an early generation of a 
- *  '\0' character, the bstring will be truncated to this end point.
- */
-int bassignformat (bstring b, const char * fmt, ...) {
-va_list arglist;
-bstring buff;
-int n, r;
-
-    if (b == NULL || fmt == NULL || b->data == NULL || b->mlen <= 0 
-     || b->slen < 0 || b->slen > b->mlen) return BSTR_ERR;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "vsnprintf" call (to avoid buffer
-       overflows) on increasing potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < START_VSNBUFF) n = START_VSNBUFF;
-    if (NULL == (buff = bfromcstralloc (n + 2, ""))) {
-        n = 1;
-        if (NULL == (buff = bfromcstralloc (n + 2, ""))) return BSTR_ERR;
-    }
-
-    for (;;) {
-        va_start (arglist, fmt);
-        exvsnprintf (r, (char *) buff->data, n + 1, fmt, arglist);
-        va_end (arglist);
-
-        buff->data[n] = (unsigned char) '\0';
-        buff->slen = (int) (strlen) ((char *) buff->data);
-
-        if (buff->slen < n) break;
-
-        if (r > n) n = r; else n += n;
-
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return BSTR_ERR;
-        }
-    }
-
-    r = bassign (b, buff);
-    bdestroy (buff);
-    return r;
-}
-
-/*  bstring bformat (const char * fmt, ...)
- *
- *  Takes the same parameters as printf (), but rather than outputting results
- *  to stdio, it forms a bstring which contains what would have been output.
- *  Note that if there is an early generation of a '\0' character, the 
- *  bstring will be truncated to this end point.
- */
-bstring bformat (const char * fmt, ...) {
-va_list arglist;
-bstring buff;
-int n, r;
-
-    if (fmt == NULL) return NULL;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "vsnprintf" call (to avoid buffer
-       overflows) on increasing potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < START_VSNBUFF) n = START_VSNBUFF;
-    if (NULL == (buff = bfromcstralloc (n + 2, ""))) {
-        n = 1;
-        if (NULL == (buff = bfromcstralloc (n + 2, ""))) return NULL;
-    }
-
-    for (;;) {
-        va_start (arglist, fmt);
-        exvsnprintf (r, (char *) buff->data, n + 1, fmt, arglist);
-        va_end (arglist);
-
-        buff->data[n] = (unsigned char) '\0';
-        buff->slen = (int) (strlen) ((char *) buff->data);
-
-        if (buff->slen < n) break;
-
-        if (r > n) n = r; else n += n;
-
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return NULL;
-        }
-    }
-
-    return buff;
-}
-
-/*  int bvcformata (bstring b, int count, const char * fmt, va_list arglist)
- *
- *  The bvcformata function formats data under control of the format control 
- *  string fmt and attempts to append the result to b.  The fmt parameter is 
- *  the same as that of the printf function.  The variable argument list is 
- *  replaced with arglist, which has been initialized by the va_start macro.
- *  The size of the appended output is upper bounded by count.  If the 
- *  required output exceeds count, the string b is not augmented with any 
- *  contents and a value below BSTR_ERR is returned.  If a value below -count 
- *  is returned then it is recommended that the negative of this value be 
- *  used as an update to the count in a subsequent pass.  On other errors, 
- *  such as running out of memory, parameter errors or numeric wrap around 
- *  BSTR_ERR is returned.  BSTR_OK is returned when the output is successfully 
- *  generated and appended to b.
- *
- *  Note: There is no sanity checking of arglist, and this function is
- *  destructive of the contents of b from the b->slen point onward.  If there 
- *  is an early generation of a '\0' character, the bstring will be truncated 
- *  to this end point.
- */
-int bvcformata (bstring b, int count, const char * fmt, va_list arg) {
-int n, r, l;
-
-    if (b == NULL || fmt == NULL || count <= 0 || b->data == NULL
-     || b->mlen <= 0 || b->slen < 0 || b->slen > b->mlen) return BSTR_ERR;
-
-    if (count > (n = b->slen + count) + 2) return BSTR_ERR;
-    if (BSTR_OK != balloc (b, n + 2)) return BSTR_ERR;
-
-    exvsnprintf (r, (char *) b->data + b->slen, count + 2, fmt, arg);
-
-    /* Did the operation complete successfully within bounds? */
-    for (l = b->slen; l <= n; l++) {
-        if ('\0' == b->data[l]) {
-            b->slen = l;
-            return BSTR_OK;
-        }
-    }
-
-    /* Abort, since the buffer was not large enough.  The return value 
-       tries to help set what the retry length should be. */
-
-    b->data[b->slen] = '\0';
-    if (r > count + 1) {    /* Does r specify a particular target length? */
-        n = r;
-    } else {
-        n = count + count;    /* If not, just double the size of count */
-        if (count > n) n = INT_MAX;
-    }
-    n = -n;
-
-    if (n > BSTR_ERR-1) n = BSTR_ERR-1;
-    return n;
-}
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.h b/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.h
deleted file mode 100644
index edf8c00fc6..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstrlib.h
- *
- * This file is the header file for the core module for implementing the 
- * bstring functions.
- */
-
-#ifndef BSTRLIB_INCLUDE
-#define BSTRLIB_INCLUDE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-
-#if !defined (BSTRLIB_VSNP_OK) && !defined (BSTRLIB_NOVSNP)
-# if defined (__TURBOC__) && !defined (__BORLANDC__)
-#  define BSTRLIB_NOVSNP
-# endif
-#endif
-
-#define BSTR_ERR (-1)
-#define BSTR_OK (0)
-#define BSTR_BS_BUFF_LENGTH_GET (0)
-
-typedef struct tagbstring * bstring;
-typedef const struct tagbstring * const_bstring;
-
-/* Copy functions */
-#define cstr2bstr bfromcstr
-extern bstring bfromcstr (const char * str);
-extern bstring bfromcstralloc (int mlen, const char * str);
-extern bstring blk2bstr (const void * blk, int len);
-extern char * bstr2cstr (const_bstring s, char z);
-extern int bcstrfree (char * s);
-extern bstring bstrcpy (const_bstring b1);
-extern int bassign (bstring a, const_bstring b);
-extern int bassignmidstr (bstring a, const_bstring b, int left, int len);
-extern int bassigncstr (bstring a, const char * str);
-extern int bassignblk (bstring a, const void * s, int len);
-
-/* Destroy function */
-extern int bdestroy (bstring b);
-
-/* Space allocation hinting functions */
-extern int balloc (bstring s, int len);
-extern int ballocmin (bstring b, int len);
-
-/* Substring extraction */
-extern bstring bmidstr (const_bstring b, int left, int len);
-
-/* Various standard manipulations */
-extern int bconcat (bstring b0, const_bstring b1);
-extern int bconchar (bstring b0, char c);
-extern int bcatcstr (bstring b, const char * s);
-extern int bcatblk (bstring b, const void * s, int len);
-extern int binsert (bstring s1, int pos, const_bstring s2, unsigned char fill);
-extern int binsertch (bstring s1, int pos, int len, unsigned char fill);
-extern int breplace (bstring b1, int pos, int len, const_bstring b2, unsigned char fill);
-extern int bdelete (bstring s1, int pos, int len);
-extern int bsetstr (bstring b0, int pos, const_bstring b1, unsigned char fill);
-extern int btrunc (bstring b, int n);
-
-/* Scan/search functions */
-extern int bstricmp (const_bstring b0, const_bstring b1);
-extern int bstrnicmp (const_bstring b0, const_bstring b1, int n);
-extern int biseqcaseless (const_bstring b0, const_bstring b1);
-extern int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len);
-extern int biseq (const_bstring b0, const_bstring b1);
-extern int bisstemeqblk (const_bstring b0, const void * blk, int len);
-extern int biseqcstr (const_bstring b, const char * s);
-extern int biseqcstrcaseless (const_bstring b, const char * s);
-extern int bstrcmp (const_bstring b0, const_bstring b1);
-extern int bstrncmp (const_bstring b0, const_bstring b1, int n);
-extern int binstr (const_bstring s1, int pos, const_bstring s2);
-extern int binstrr (const_bstring s1, int pos, const_bstring s2);
-extern int binstrcaseless (const_bstring s1, int pos, const_bstring s2);
-extern int binstrrcaseless (const_bstring s1, int pos, const_bstring s2);
-extern int bstrchrp (const_bstring b, int c, int pos);
-extern int bstrrchrp (const_bstring b, int c, int pos);
-#define bstrchr(b,c) bstrchrp ((b), (c), 0)
-#define bstrrchr(b,c) bstrrchrp ((b), (c), blength(b)-1)
-extern int binchr (const_bstring b0, int pos, const_bstring b1);
-extern int binchrr (const_bstring b0, int pos, const_bstring b1);
-extern int bninchr (const_bstring b0, int pos, const_bstring b1);
-extern int bninchrr (const_bstring b0, int pos, const_bstring b1);
-extern int bfindreplace (bstring b, const_bstring find, const_bstring repl, int pos);
-extern int bfindreplacecaseless (bstring b, const_bstring find, const_bstring repl, int pos);
-
-/* List of string container functions */
-struct bstrList {
-    int qty, mlen;
-    bstring * entry;
-};
-extern struct bstrList * bstrListCreate (void);
-extern int bstrListDestroy (struct bstrList * sl);
-extern int bstrListAlloc (struct bstrList * sl, int msz);
-extern int bstrListAllocMin (struct bstrList * sl, int msz);
-
-/* String split and join functions */
-extern struct bstrList * bsplit (const_bstring str, unsigned char splitChar);
-extern struct bstrList * bsplits (const_bstring str, const_bstring splitStr);
-extern struct bstrList * bsplitstr (const_bstring str, const_bstring splitStr);
-extern bstring bjoin (const struct bstrList * bl, const_bstring sep);
-extern int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm);
-extern int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm);
-extern int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm);
-
-/* Miscellaneous functions */
-extern int bpattern (bstring b, int len);
-extern int btoupper (bstring b);
-extern int btolower (bstring b);
-extern int bltrimws (bstring b);
-extern int brtrimws (bstring b);
-extern int btrimws (bstring b);
-
-/* <*>printf format functions */
-#if !defined (BSTRLIB_NOVSNP)
-extern bstring bformat (const char * fmt, ...);
-extern int bformata (bstring b, const char * fmt, ...);
-extern int bassignformat (bstring b, const char * fmt, ...);
-extern int bvcformata (bstring b, int count, const char * fmt, va_list arglist);
-
-#define bvformata(ret, b, fmt, lastarg) { \
-bstring bstrtmp_b = (b); \
-const char * bstrtmp_fmt = (fmt); \
-int bstrtmp_r = BSTR_ERR, bstrtmp_sz = 16; \
-    for (;;) { \
-        va_list bstrtmp_arglist; \
-        va_start (bstrtmp_arglist, lastarg); \
-        bstrtmp_r = bvcformata (bstrtmp_b, bstrtmp_sz, bstrtmp_fmt, bstrtmp_arglist); \
-        va_end (bstrtmp_arglist); \
-        if (bstrtmp_r >= 0) { /* Everything went ok */ \
-            bstrtmp_r = BSTR_OK; \
-            break; \
-        } else if (-bstrtmp_r <= bstrtmp_sz) { /* A real error? */ \
-            bstrtmp_r = BSTR_ERR; \
-            break; \
-        } \
-        bstrtmp_sz = -bstrtmp_r; /* Doubled or target size */ \
-    } \
-    ret = bstrtmp_r; \
-}
-
-#endif
-
-typedef int (*bNgetc) (void *parm);
-typedef size_t (* bNread) (void *buff, size_t elsize, size_t nelem, void *parm);
-
-/* Input functions */
-extern bstring bgets (bNgetc getcPtr, void * parm, char terminator);
-extern bstring bread (bNread readPtr, void * parm);
-extern int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator);
-extern int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator);
-extern int breada (bstring b, bNread readPtr, void * parm);
-
-/* Stream functions */
-extern struct bStream * bsopen (bNread readPtr, void * parm);
-extern void * bsclose (struct bStream * s);
-extern int bsbufflength (struct bStream * s, int sz);
-extern int bsreadln (bstring b, struct bStream * s, char terminator);
-extern int bsreadlns (bstring r, struct bStream * s, const_bstring term);
-extern int bsread (bstring b, struct bStream * s, int n);
-extern int bsreadlna (bstring b, struct bStream * s, char terminator);
-extern int bsreadlnsa (bstring r, struct bStream * s, const_bstring term);
-extern int bsreada (bstring b, struct bStream * s, int n);
-extern int bsunread (struct bStream * s, const_bstring b);
-extern int bspeek (bstring r, const struct bStream * s);
-extern int bssplitscb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-extern int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-extern int bseof (const struct bStream * s);
-
-struct tagbstring {
-    int mlen;
-    int slen;
-    unsigned char * data;
-};
-
-/* Accessor macros */
-#define blengthe(b, e)      (((b) == (void *)0 || (b)->slen < 0) ? (int)(e) : ((b)->slen))
-#define blength(b)          (blengthe ((b), 0))
-#define bdataofse(b, o, e)  (((b) == (void *)0 || (b)->data == (void*)0) ? (char *)(e) : ((char *)(b)->data) + (o))
-#define bdataofs(b, o)      (bdataofse ((b), (o), (void *)0))
-#define bdatae(b, e)        (bdataofse (b, 0, e))
-#define bdata(b)            (bdataofs (b, 0))
-#define bchare(b, p, e)     ((((unsigned)(p)) < (unsigned)blength(b)) ? ((b)->data[(p)]) : (e))
-#define bchar(b, p)         bchare ((b), (p), '\0')
-
-/* Static constant string initialization macro */
-#define bsStaticMlen(q,m)   {(m), (int) sizeof(q)-1, (unsigned char *) ("" q "")}
-#if defined(_MSC_VER)
-/* There are many versions of MSVC which emit __LINE__ as a non-constant. */
-# define bsStatic(q)        bsStaticMlen(q,-32)
-#endif
-#ifndef bsStatic
-# define bsStatic(q)        bsStaticMlen(q,-__LINE__)
-#endif
-
-/* Static constant block parameter pair */
-#define bsStaticBlkParms(q) ((void *)("" q "")), ((int) sizeof(q)-1)
-
-/* Reference building macros */
-#define cstr2tbstr btfromcstr
-#define btfromcstr(t,s) {                                            \
-    (t).data = (unsigned char *) (s);                                \
-    (t).slen = ((t).data) ? ((int) (strlen) ((char *)(t).data)) : 0; \
-    (t).mlen = -1;                                                   \
-}
-#define blk2tbstr(t,s,l) {            \
-    (t).data = (unsigned char *) (s); \
-    (t).slen = l;                     \
-    (t).mlen = -1;                    \
-}
-#define btfromblk(t,s,l) blk2tbstr(t,s,l)
-#define bmid2tbstr(t,b,p,l) {                                                \
-    const_bstring bstrtmp_s = (b);                                           \
-    if (bstrtmp_s && bstrtmp_s->data && bstrtmp_s->slen >= 0) {              \
-        int bstrtmp_left = (p);                                              \
-        int bstrtmp_len  = (l);                                              \
-        if (bstrtmp_left < 0) {                                              \
-            bstrtmp_len += bstrtmp_left;                                     \
-            bstrtmp_left = 0;                                                \
-        }                                                                    \
-        if (bstrtmp_len > bstrtmp_s->slen - bstrtmp_left)                    \
-            bstrtmp_len = bstrtmp_s->slen - bstrtmp_left;                    \
-        if (bstrtmp_len <= 0) {                                              \
-            (t).data = (unsigned char *)"";                                  \
-            (t).slen = 0;                                                    \
-        } else {                                                             \
-            (t).data = bstrtmp_s->data + bstrtmp_left;                       \
-            (t).slen = bstrtmp_len;                                          \
-        }                                                                    \
-    } else {                                                                 \
-        (t).data = (unsigned char *)"";                                      \
-        (t).slen = 0;                                                        \
-    }                                                                        \
-    (t).mlen = -__LINE__;                                                    \
-}
-#define btfromblkltrimws(t,s,l) {                                            \
-    int bstrtmp_idx = 0, bstrtmp_len = (l);                                  \
-    unsigned char * bstrtmp_s = (s);                                         \
-    if (bstrtmp_s && bstrtmp_len >= 0) {                                     \
-        for (; bstrtmp_idx < bstrtmp_len; bstrtmp_idx++) {                   \
-            if (!isspace (bstrtmp_s[bstrtmp_idx])) break;                    \
-        }                                                                    \
-    }                                                                        \
-    (t).data = bstrtmp_s + bstrtmp_idx;                                      \
-    (t).slen = bstrtmp_len - bstrtmp_idx;                                    \
-    (t).mlen = -__LINE__;                                                    \
-}
-#define btfromblkrtrimws(t,s,l) {                                            \
-    int bstrtmp_len = (l) - 1;                                               \
-    unsigned char * bstrtmp_s = (s);                                         \
-    if (bstrtmp_s && bstrtmp_len >= 0) {                                     \
-        for (; bstrtmp_len >= 0; bstrtmp_len--) {                            \
-            if (!isspace (bstrtmp_s[bstrtmp_len])) break;                    \
-        }                                                                    \
-    }                                                                        \
-    (t).data = bstrtmp_s;                                                    \
-    (t).slen = bstrtmp_len + 1;                                              \
-    (t).mlen = -__LINE__;                                                    \
-}
-#define btfromblktrimws(t,s,l) {                                             \
-    int bstrtmp_idx = 0, bstrtmp_len = (l) - 1;                              \
-    unsigned char * bstrtmp_s = (s);                                         \
-    if (bstrtmp_s && bstrtmp_len >= 0) {                                     \
-        for (; bstrtmp_idx <= bstrtmp_len; bstrtmp_idx++) {                  \
-            if (!isspace (bstrtmp_s[bstrtmp_idx])) break;                    \
-        }                                                                    \
-        for (; bstrtmp_len >= bstrtmp_idx; bstrtmp_len--) {                  \
-            if (!isspace (bstrtmp_s[bstrtmp_len])) break;                    \
-        }                                                                    \
-    }                                                                        \
-    (t).data = bstrtmp_s + bstrtmp_idx;                                      \
-    (t).slen = bstrtmp_len + 1 - bstrtmp_idx;                                \
-    (t).mlen = -__LINE__;                                                    \
-}
-
-/* Write protection macros */
-#define bwriteprotect(t)     { if ((t).mlen >=  0) (t).mlen = -1; }
-#define bwriteallow(t)       { if ((t).mlen == -1) (t).mlen = (t).slen + ((t).slen == 0); }
-#define biswriteprotected(t) ((t).mlen <= 0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.txt b/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.txt
deleted file mode 100644
index 8ebb188853..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/bstrlib.txt
+++ /dev/null
@@ -1,3201 +0,0 @@
-Better String library
----------------------
-
-by Paul Hsieh
-
-The bstring library is an attempt to provide improved string processing 
-functionality to the C and C++ language.  At the heart of the bstring library 
-(Bstrlib for short) is the management of "bstring"s which are a significant 
-improvement over '\0' terminated char buffers.
-
-===============================================================================
-
-Motivation
-----------
-
-The standard C string library has serious problems:
-
-    1) Its use of '\0' to denote the end of the string means knowing a 
-       string's length is O(n) when it could be O(1).
-    2) It imposes an interpretation for the character value '\0'.
-    3) gets() always exposes the application to a buffer overflow.
-    4) strtok() modifies the string its parsing and thus may not be usable in
-       programs which are re-entrant or multithreaded.
-    5) fgets has the unusual semantic of ignoring '\0's that occur before
-       '\n's are consumed.
-    6) There is no memory management, and actions performed such as strcpy,
-       strcat and sprintf are common places for buffer overflows.
-    7) strncpy() doesn't '\0' terminate the destination in some cases.
-    8) Passing NULL to C library string functions causes an undefined NULL 
-       pointer access.
-    9) Parameter aliasing (overlapping, or self-referencing parameters) 
-       within most C library functions has undefined behavior.
-   10) Many C library string function calls take integer parameters with 
-       restricted legal ranges.  Parameters passed outside these ranges are
-       not typically detected and cause undefined behavior.
-
-So the desire is to create an alternative string library that does not suffer
-from the above problems and adds in the following functionality:
-
-    1) Incorporate string functionality seen from other languages.
-        a) MID$() - from BASIC
-        b) split()/join() - from Python
-        c) string/char x n - from Perl
-    2) Implement analogs to functions that combine stream IO and char buffers
-       without creating a dependency on stream IO functionality.
-    3) Implement the basic text editor-style functions insert, delete, find,
-       and replace.
-    4) Implement reference based sub-string access (as a generalization of 
-       pointer arithmetic.)
-    5) Implement runtime write protection for strings.
-
-There is also a desire to avoid "API-bloat".  So functionality that can be
-implemented trivially in other functionality is omitted.  So there is no
-left$() or right$() or reverse() or anything like that as part of the core 
-functionality.
-
-Explaining Bstrings
--------------------
-
-A bstring is basically a header which wraps a pointer to a char buffer.  Lets
-start with the declaration of a struct tagbstring:
-
-    struct tagbstring {
-        int mlen;
-        int slen;
-        unsigned char * data;
-    };
-
-This definition is considered exposed, not opaque (though it is neither 
-necessary nor recommended that low level maintenance of bstrings be performed 
-whenever the abstract interfaces are sufficient).  The mlen field (usually)
-describes a lower bound for the memory allocated for the data field.  The 
-slen field describes the exact length for the bstring.  The data field is a 
-single contiguous buffer of unsigned chars.  Note that the existence of a '\0' 
-character in the unsigned char buffer pointed to by the data field does not 
-necessarily denote the end of the bstring.
-
-To be a well formed modifiable bstring the mlen field must be at least the 
-length of the slen field, and slen must be non-negative.  Furthermore, the 
-data field must point to a valid buffer in which access to the first mlen 
-characters has been acquired.  So the minimal check for correctness is:
-
-    (slen >= 0 && mlen >= slen && data != NULL)
-
-bstrings returned by bstring functions can be assumed to be either NULL or
-satisfy the above property.  (When bstrings are only readable, the mlen >= 
-slen restriction is not required; this is discussed later in this section.)  
-A bstring itself is just a pointer to a struct tagbstring:
-
-    typedef struct tagbstring * bstring;
-
-Note that use of the prefix "tag" in struct tagbstring is required to work
-around the inconsistency between C and C++'s struct namespace usage.  This
-definition is also considered exposed.
-
-Bstrlib basically manages bstrings allocated as a header and an associated 
-data-buffer.  Since the implementation is exposed, they can also be 
-constructed manually.  Functions which mutate bstrings assume that the header 
-and data buffer have been malloced; the bstring library may perform free() or 
-realloc() on both the header and data buffer of any bstring parameter. 
-Functions which return bstring's create new bstrings.  The string memory is 
-freed by a bdestroy() call (or using the bstrFree macro).
-
-The following related typedef is also provided:
-
-    typedef const struct tagbstring * const_bstring;
-
-which is also considered exposed.  These are directly bstring compatible (no
-casting required) but are just used for parameters which are meant to be 
-non-mutable.  So in general, bstring parameters which are read as input but 
-not meant to be modified will be declared as const_bstring, and bstring
-parameters which may be modified will be declared as bstring.  This convention
-is recommended for user written functions as well.
-
-Since bstrings maintain interoperability with C library char-buffer style 
-strings, all functions which modify, update or create bstrings also append a 
-'\0' character into the position slen + 1.  This trailing '\0' character is 
-not required for bstrings input to the bstring functions; this is provided 
-solely as a convenience for interoperability with standard C char-buffer 
-functionality.
-
-Analogs for the ANSI C string library functions have been created when they
-are necessary, but have also been left out when they are not.  In particular
-there are no functions analogous to fwrite, or puts just for the purposes of
-bstring.  The ->data member of any string is exposed, and therefore can be
-used just as easily as char buffers for C functions which read strings.
-
-For those that wish to hand construct bstrings, the following should be kept 
-in mind:
-
-    1) While bstrlib can accept constructed bstrings without terminating
-       '\0' characters, the rest of the C language string library will not
-       function properly on such non-terminated strings.  This is obvious
-       but must be kept in mind.
-    2) If it is intended that a constructed bstring be written to by the
-       bstring library functions then the data portion should be allocated
-       by the malloc function and the slen and mlen fields should be entered
-       properly.  The struct tagbstring header is not reallocated, and only
-       freed by bdestroy.
-    3) Writing arbitrary '\0' characters at various places in the string
-       will not modify its length as perceived by the bstring library 
-       functions.  In fact, '\0' is a legitimate non-terminating character
-       for a bstring to contain.
-    4) For read only parameters, bstring functions do not check the mlen.  
-       I.e., the minimal correctness requirements are reduced to:
-
-            (slen >= 0 && data != NULL)
-
-Better pointer arithmetic
--------------------------
-
-One built-in feature of '\0' terminated char * strings, is that its very easy
-and fast to obtain a reference to the tail of any string using pointer 
-arithmetic.  Bstrlib does one better by providing a way to get a reference to
-any substring of a bstring (or any other length delimited block of memory.)
-So rather than just having pointer arithmetic, with bstrlib one essentially 
-has segment arithmetic.  This is achieved using the macro blk2tbstr() which 
-builds a reference to a block of memory and the macro bmid2tbstr() which 
-builds a reference to a segment of a bstring.  Bstrlib also includes 
-functions for direct consumption of memory blocks into bstrings, namely 
-bcatblk () and blk2bstr ().
-
-One scenario where this can be extremely useful is when string contains many 
-substrings which one would like to pass as read-only reference parameters to 
-some string consuming function without the need to allocate entire new 
-containers for the string data.  More concretely, imagine parsing a command 
-line string whose parameters are space delimited.  This can only be done for 
-tails of the string with '\0' terminated char * strings.
-
-Improved NULL semantics and error handling
-------------------------------------------
-
-Unless otherwise noted, if a NULL pointer is passed as a bstring or any other 
-detectably illegal parameter, the called function will return with an error 
-indicator (either NULL or BSTR_ERR) rather than simply performing a NULL 
-pointer access, or having undefined behavior.
-
-To illustrate the value of this, consider the following example:
-
-        strcpy (p = malloc (13 * sizeof (char)), "Hello,");
-        strcat (p, " World");
-
-This is not correct because malloc may return NULL (due to an out of memory 
-condition), and the behaviour of strcpy is undefined if either of its 
-parameters are NULL.  However:
-
-        bstrcat (p = bfromcstr ("Hello,"), q = bfromcstr (" World"));
-        bdestroy (q);
-
-is well defined, because if either p or q are assigned NULL (indicating a 
-failure to allocate memory) both bstrcat and bdestroy will recognize it and 
-perform no detrimental action.
-
-Note that it is not necessary to check any of the members of a returned 
-bstring for internal correctness (in particular the data member does not need 
-to be checked against NULL when the header is non-NULL), since this is 
-assured by the bstring library itself.
-
-bStreams
---------
-
-In addition to the bgets and bread functions, bstrlib can abstract streams 
-with a high performance read only stream called a bStream.  In general, the 
-idea is to open a core stream (with something like fopen) then pass its
-handle as well as a bNread function pointer (like fread) to the bsopen 
-function which will return a handle to an open bStream.  Then the functions 
-bsread, bsreadln or bsreadlns can be called to read portions of the stream.  
-Finally, the bsclose function is called to close the bStream -- it will 
-return a handle to the original (core) stream.  So bStreams, essentially, 
-wrap other streams.
-
-The bStreams have two main advantages over the bgets and bread (as well as
-fgets/ungetc) paradigms:
-
-1) Improved functionality via the bunread function which allows a stream to 
-   unread characters, giving the bStream stack-like functionality if so 
-   desired.
-2) A very high performance bsreadln function.  The C library function fgets()
-   (and the bgets function) can typically be written as a loop on top of 
-   fgetc(), thus paying all of the overhead costs of calling fgetc on a per 
-   character basis.  bsreadln will read blocks at a time, thus amortizing the 
-   overhead of fread calls over many characters at once.
-
-However, clearly bStreams are suboptimal or unusable for certain kinds of 
-streams (stdin) or certain usage patterns (a few spotty, or non-sequential
-reads from a slow stream.)  For those situations, using bgets will be more 
-appropriate.
-
-The semantics of bStreams allows practical construction of layerable data 
-streams.  What this means is that by writing a bNread compatible function on
-top of a bStream, one can construct a new bStream on top of it.  This can be
-useful for writing multi-pass parsers that don't actually read the entire
-input more than once and don't require the use of intermediate storage.
-
-Aliasing
---------
-
-Aliasing occurs when a function is given two parameters which point to data
-structures which overlap in the memory they occupy.  While this does not
-disturb read only functions, for many libraries this can make functions that 
-write to these memory locations malfunction.  This is a common problem of the 
-C standard library and especially the string functions in the C standard 
-library.
-
-The C standard string library is entirely char by char oriented (as is 
-bstring) which makes conforming implementations alias safe for some 
-scenarios.  However no actual detection of aliasing is typically performed, 
-so it is easy to find cases where the aliasing will cause anomolous or 
-undesirable behaviour (consider: strcat (p, p).)  The C99 standard includes 
-the "restrict" pointer modifier which allows the compiler to document and 
-assume a no-alias condition on usage.  However, only the most trivial cases 
-can be caught (if at all) by the compiler at compile time, and thus there is 
-no actual enforcement of non-aliasing.
-
-Bstrlib, by contrast, permits aliasing and is completely aliasing safe, in 
-the C99 sense of aliasing.  That is to say, under the assumption that 
-pointers of incompatible types from distinct objects can never alias, bstrlib 
-is completely aliasing safe.  (In practice this means that the data buffer 
-portion of any bstring and header of any bstring are assumed to never alias.) 
-With the exception of the reference building macros, the library behaves as 
-if all read-only parameters are first copied and replaced by temporary 
-non-aliased parameters before any writing to any output bstring is performed 
-(though actual copying is extremely rarely ever done.)
-
-Besides being a useful safety feature, bstring searching/comparison 
-functions can improve to O(1) execution when aliasing is detected.
-
-Note that aliasing detection and handling code in Bstrlib is generally 
-extremely cheap.  There is almost never any appreciable performance penalty
-for using aliased parameters.
-
-Reenterancy
------------
-
-Nearly every function in Bstrlib is a leaf function, and is completely 
-reenterable with the exception of writing to common bstrings.  The split 
-functions which use a callback mechanism requires only that the source string 
-not be destroyed by the callback function unless the callback function returns
-with an error status (note that Bstrlib functions which return an error do 
-not modify the string in any way.)  The string can in fact be modified by the
-callback and the behaviour is deterministic.  See the documentation of the 
-various split functions for more details.
-
-Undefined scenarios
--------------------
-
-One of the basic important premises for Bstrlib is to not to increase the
-propogation of undefined situations from parameters that are otherwise legal
-in of themselves.  In particular, except for extremely marginal cases, usages 
-of bstrings that use the bstring library functions alone cannot lead to any 
-undefined action.  But due to C/C++ language and library limitations, there 
-is no way to define a non-trivial library that is completely without 
-undefined operations.  All such possible undefined operations are described 
-below:
-
-1) bstrings or struct tagbstrings that are not explicitely initialized cannot
-   be passed as a parameter to any bstring function.
-2) The members of the NULL bstring cannot be accessed directly.  (Though all
-   APIs and macros detect the NULL bstring.)
-3) A bstring whose data member has not been obtained from a malloc or 
-   compatible call and which is write accessible passed as a writable 
-   parameter will lead to undefined results.  (i.e., do not writeAllow any 
-   constructed bstrings unless the data portion has been obtained from the 
-   heap.)
-4) If the headers of two strings alias but are not identical (which can only 
-   happen via a defective manual construction), then passing them to a 
-   bstring function in which one is writable is not defined.
-5) If the mlen member is larger than the actual accessible length of the data 
-   member for a writable bstring, or if the slen member is larger than the 
-   readable length of the data member for a readable bstring, then the 
-   corresponding bstring operations are undefined.
-6) Any bstring definition whose header or accessible data portion has been
-   assigned to inaccessible or otherwise illegal memory clearly cannot be
-   acted upon by the bstring library in any way.
-7) Destroying the source of an incremental split from within the callback
-   and not returning with a negative value (indicating that it should abort)
-   will lead to undefined behaviour.  (Though *modifying* or adjusting the 
-   state of the source data, even if those modification fail within the 
-   bstrlib API, has well defined behavior.)
-8) Modifying a bstring which is write protected by direct access has 
-   undefined behavior.
-
-While this may seem like a long list, with the exception of invalid uses of 
-the writeAllow macro, and source destruction during an iterative split 
-without an accompanying abort, no usage of the bstring API alone can cause 
-any undefined scenario to occurr.  I.e., the policy of restricting usage of 
-bstrings to the bstring API can significantly reduce the risk of runtime 
-errors (in practice it should eliminate them) related to string manipulation 
-due to undefined action.
-
-C++ wrapper
------------
-
-A C++ wrapper has been created to enable bstring functionality for C++ in the
-most natural (for C++ programers) way possible.  The mandate for the C++ 
-wrapper is different from the base C bstring library.  Since the C++ language 
-has far more abstracting capabilities, the CBString structure is considered 
-fully abstracted -- i.e., hand generated CBStrings are not supported (though 
-conversion from a struct tagbstring is allowed) and all detectable errors are
-manifest as thrown exceptions.
-
-- The C++ class definitions are all under the namespace Bstrlib.  bstrwrap.h 
-  enables this namespace (with a using namespace Bstrlib; directive at the 
-  end) unless the macro BSTRLIB_DONT_ASSUME_NAMESPACE has been defined before 
-  it is included.
-
-- Erroneous accesses results in an exception being thrown.  The exception 
-  parameter is of type "struct CBStringException" which is derived from
-  std::exception if STL is used.  A verbose description of the error message 
-  can be obtained from the what() method.
-
-- CBString is a C++ structure derived from a struct tagbstring.  An address 
-  of a CBString cast to a bstring must not be passed to bdestroy.  The bstring 
-  C API has been made C++ safe and can be used directly in a C++ project.
-
-- It includes constructors which can take a char, '\0' terminated char 
-  buffer, tagbstring, (char, repeat-value), a length delimited buffer or a 
-  CBStringList to initialize it.
-
-- Concatenation is performed with the + and += operators.  Comparisons are 
-  done with the ==, !=, <, >, <= and >= operators.  Note that == and != use
-  the biseq call, while <, >, <= and >= use bstrcmp.
-
-- CBString's can be directly cast to const character buffers.
-
-- CBString's can be directly cast to double, float, int or unsigned int so
-  long as the CBString are decimal representations of those types (otherwise
-  an exception will be thrown).  Converting the other way should be done with
-  the format(a) method(s).
-
-- CBString contains the length, character and [] accessor methods.  The
-  character and [] accessors are aliases of each other.  If the bounds for 
-  the string are exceeded, an exception is thrown.  To avoid the overhead for
-  this check, first cast the CBString to a (const char *) and use [] to 
-  dereference the array as normal.  Note that the character and [] accessor 
-  methods allows both reading and writing of individual characters.
-
-- The methods: format, formata, find, reversefind, findcaseless, 
-  reversefindcaseless, midstr, insert, insertchrs, replace, findreplace, 
-  findreplacecaseless, remove, findchr, nfindchr, alloc, toupper, tolower, 
-  gets, read are analogous to the functions that can be found in the C API.
-
-- The caselessEqual and caselessCmp methods are analogous to biseqcaseless
-  and bstricmp functions respectively.
-
-- Note that just like the bformat function, the format and formata methods do 
-  not automatically cast CBStrings into char * strings for "%s"-type 
-  substitutions:
-
-	CBString w("world");
-	CBString h("Hello");
-	CBString hw;
-
-	/* The casts are necessary */
-	hw.format ("%s, %s", (const char *)h, (const char *)w);
-
-- The methods trunc and repeat have been added instead of using pattern.
-
-- ltrim, rtrim and trim methods have been added.  These remove characters 
-  from a given character string set (defaulting to the whitespace characters) 
-  from either the left, right or both ends of the CBString, respectively.
-
-- The method setsubstr is also analogous in functionality to bsetstr, except 
-  that it cannot be passed NULL.  Instead the method fill and the fill-style 
-  constructor have been supplied to enable this functionality.
-
-- The writeprotect(), writeallow() and iswriteprotected() methods are 
-  analogous to the bwriteprotect(), bwriteallow() and biswriteprotected() 
-  macros in the C API.  Write protection semantics in CBString are stronger 
-  than with the C API in that indexed character assignment is checked for 
-  write protection.  However, unlike with the C API, a write protected 
-  CBString can be destroyed by the destructor.
-
-- CBStream is a C++ structure which wraps a struct bStream (its not derived
-  from it, since destruction is slightly different).  It is constructed by
-  passing in a bNread function pointer and a stream parameter cast to void *. 
-  This structure includes methods for detecting eof, setting the buffer 
-  length, reading the whole stream or reading entries line by line or block 
-  by block, an unread function, and a peek function.
-
-- If STL is available, the CBStringList structure is derived from a vector of 
-  CBString with various split methods.  The split method has been overloaded 
-  to accept either a character or CBString as the second parameter (when the 
-  split parameter is a CBString any character in that CBString is used as a
-  seperator).  The splitstr method takes a CBString as a substring seperator. 
-  Joins can be performed via a CBString constructor which takes a 
-  CBStringList as a parameter, or just using the CBString::join() method.
-
-- If there is proper support for std::iostreams, then the >> and << operators 
-  and the getline() function have been added (with semantics the same as 
-  those for std::string).
-
-Multithreading
---------------
-
-A mutable bstring is kind of analogous to a small (two entry) linked list 
-allocated by malloc, with all aliasing completely under programmer control. 
-I.e., manipulation of one bstring will never affect any other distinct 
-bstring unless explicitely constructed to do so by the programmer via hand 
-construction or via building a reference.  Bstrlib also does not use any 
-static or global storage, so there are no hidden unremovable race conditions. 
-Bstrings are also clearly not inherently thread local.  So just like 
-char *'s, bstrings can be passed around from thread to thread and shared and 
-so on, so long as modifications to a bstring correspond to some kind of 
-exclusive access lock as should be expected (or if the bstring is read-only, 
-which can be enforced by bstring write protection) for any sort of shared 
-object in a multithreaded environment.
-
-Bsafe module
-------------
-
-For convenience, a bsafe module has been included.  The idea is that if this
-module is included, inadvertant usage of the most dangerous C functions will 
-be overridden and lead to an immediate run time abort.  Of course, it should 
-be emphasized that usage of this module is completely optional.  The 
-intention is essentially to provide an option for creating project safety 
-rules which can be enforced mechanically rather than socially.  This is 
-useful for larger, or open development projects where its more difficult to 
-enforce social rules or "coding conventions".
-
-Problems not solved
--------------------
-
-Bstrlib is written for the C and C++ languages, which have inherent weaknesses
-that cannot be easily solved:
-
-1. Memory leaks:  Forgetting to call bdestroy on a bstring that is about to be
-   unreferenced, just as forgetting to call free on a heap buffer that is 
-   about to be dereferenced.  Though bstrlib itself is leak free.
-2. Read before write usage:  In C, declaring an auto bstring does not 
-   automatically fill it with legal/valid contents.  This problem has been 
-   somewhat mitigated in C++.  (The bstrDeclare and bstrFree macros from 
-   bstraux can be used to help mitigate this problem.)
-
-Other problems not addressed:
-
-3. Built-in mutex usage to automatically avoid all bstring internal race 
-   conditions in multitasking environments: The problem with trying to 
-   implement such things at this low a level is that it is typically more 
-   efficient to use locks in higher level primitives. There is also no 
-   platform independent way to implement locks or mutexes.
-4. Unicode/widecharacter support.
-
-Note that except for spotty support of wide characters, the default C 
-standard library does not address any of these problems either.
-
-Configurable compilation options
---------------------------------
-
-All configuration options are meant solely for the purpose of compiler 
-compatibility.  Configuration options are not meant to change the semantics
-or capabilities of the library, except where it is unavoidable.
-
-Since some C++ compilers don't include the Standard Template Library and some 
-have the options of disabling exception handling, a number of macros can be 
-used to conditionally compile support for each of this:
-
-BSTRLIB_CAN_USE_STL
-
-  - defining this will enable the used of the Standard Template Library.  
-    Defining BSTRLIB_CAN_USE_STL overrides the BSTRLIB_CANNOT_USE_STL macro.
-
-BSTRLIB_CANNOT_USE_STL
-
-  - defining this will disable the use of the Standard Template Library.  
-    Defining BSTRLIB_CAN_USE_STL overrides the BSTRLIB_CANNOT_USE_STL macro.
-
-BSTRLIB_CAN_USE_IOSTREAM
-
-  - defining this will enable the used of streams from class std.  Defining 
-    BSTRLIB_CAN_USE_IOSTREAM overrides the BSTRLIB_CANNOT_USE_IOSTREAM macro.
-
-BSTRLIB_CANNOT_USE_IOSTREAM
-
-  - defining this will disable the use of streams from class std.  Defining 
-    BSTRLIB_CAN_USE_IOSTREAM overrides the BSTRLIB_CANNOT_USE_IOSTREAM macro.
-
-BSTRLIB_THROWS_EXCEPTIONS
-
-  - defining this will enable the exception handling within bstring.
-    Defining BSTRLIB_THROWS_EXCEPTIONS overrides the 
-    BSTRLIB_DOESNT_THROWS_EXCEPTIONS macro.
-
-BSTRLIB_DOESNT_THROW_EXCEPTIONS
-
-  - defining this will disable the exception handling within bstring.
-    Defining BSTRLIB_THROWS_EXCEPTIONS overrides the 
-    BSTRLIB_DOESNT_THROW_EXCEPTIONS macro.
-
-Note that these macros must be defined consistently throughout all modules 
-that use CBStrings including bstrwrap.cpp.
-
-Some older C compilers do not support functions such as vsnprintf.  This is 
-handled by the following macro variables:
-
-BSTRLIB_NOVSNP
-
-  - defining this indicates that the compiler does not support vsnprintf.
-    This will cause bformat and bformata to not be declared.  Note that
-    for some compilers, such as Turbo C, this is set automatically.
-    Defining BSTRLIB_NOVSNP overrides the BSTRLIB_VSNP_OK macro.
-
-BSTRLIB_VSNP_OK
-
-  - defining this will disable the autodetection of compilers the do not
-    support of compilers that do not support vsnprintf.
-    Defining BSTRLIB_NOVSNP overrides the BSTRLIB_VSNP_OK macro.
-
-Semantic compilation options
-----------------------------
-
-Bstrlib comes with very few compilation options for changing the semantics of
-of the library.  These are described below.
-
-BSTRLIB_DONT_ASSUME_NAMESPACE
-
-  - Defining this before including bstrwrap.h will disable the automatic 
-    enabling of the Bstrlib namespace for the C++ declarations.
-
-BSTRLIB_DONT_USE_VIRTUAL_DESTRUCTOR
-
-  - Defining this will make the CBString destructor non-virtual.
-
-BSTRLIB_MEMORY_DEBUG
-
-  - Defining this will cause the bstrlib modules bstrlib.c and bstrwrap.cpp
-    to invoke a #include "memdbg.h".  memdbg.h has to be supplied by the user.
-
-Note that these macros must be defined consistently throughout all modules 
-that use bstrings or CBStrings including bstrlib.c, bstraux.c and 
-bstrwrap.cpp.
-
-===============================================================================
-
-Files
------
-
-bstrlib.c       - C implementaion of bstring functions.
-bstrlib.h       - C header file for bstring functions.
-bstraux.c       - C example that implements trivial additional functions.
-bstraux.h       - C header for bstraux.c
-bstest.c        - C unit/regression test for bstrlib.c
-
-bstrwrap.cpp    - C++ implementation of CBString.
-bstrwrap.h      - C++ header file for CBString.
-test.cpp        - C++ unit/regression test for bstrwrap.cpp
-
-bsafe.c         - C runtime stubs to abort usage of unsafe C functions.
-bsafe.h         - C header file for bsafe.c functions.
-
-C projects need only include bstrlib.h and compile/link bstrlib.c to use the
-bstring library.  C++ projects need to additionally include bstrwrap.h and
-compile/link bstrwrap.cpp.  For both, there may be a need to make choices 
-about feature configuration as described in the "Configurable compilation 
-options" in the section above.
-
-Other files that are included in this archive are:
-
-license.txt     - The 3 clause BSD license for Bstrlib
-gpl.txt         - The GPL version 2
-security.txt    - A security statement useful for auditting Bstrlib
-porting.txt     - A guide to porting Bstrlib
-bstrlib.txt     - This file
-
-===============================================================================
-
-The functions
--------------
-
-    extern bstring bfromcstr (const char * str);
-
-    Take a standard C library style '\0' terminated char buffer and generate
-    a bstring with the same contents as the char buffer.  If an error occurs 
-    NULL is returned.
-
-    So for example:
-
-	bstring b = bfromcstr ("Hello");
-	if (!b) {
-		fprintf (stderr, "Out of memory");
-	} else {
-		puts ((char *) b->data);
-	}
-
-    ..........................................................................
-
-    extern bstring bfromcstralloc (int mlen, const char * str);
-
-    Create a bstring which contains the contents of the '\0' terminated 
-    char * buffer str.  The memory buffer backing the bstring is at least 
-    mlen characters in length.  If an error occurs NULL is returned.
-
-    So for example:
-
-	bstring b = bfromcstralloc (64, someCstr);
-	if (b) b->data[63] = 'x';
-
-    The idea is that this will set the 64th character of b to 'x' if it is at 
-    least 64 characters long otherwise do nothing.  And we know this is well 
-    defined so long as b was successfully created, since it will have been 
-    allocated with at least 64 characters.
-
-    ..........................................................................
-
-    extern bstring blk2bstr (const void * blk, int len);
-
-    Create a bstring whose contents are described by the contiguous buffer 
-    pointing to by blk with a length of len bytes.  Note that this function
-    creates a copy of the data in blk, rather than simply referencing it.  
-    Compare with the blk2tbstr macro.  If an error occurs NULL is returned.
-
-    ..........................................................................
-
-    extern char * bstr2cstr (const_bstring s, char z);
-
-    Create a '\0' terminated char buffer which contains the contents of the 
-    bstring s, except that any contained '\0' characters are converted to the 
-    character in z.  This returned value should be freed with bcstrfree(), by 
-    the caller.  If an error occurs NULL is returned.
-
-    ..........................................................................
-
-    extern int bcstrfree (char * s);
-
-    Frees a C-string generated by bstr2cstr ().  This is normally unnecessary
-    since it just wraps a call to free (), however, if malloc () and free () 
-    have been redefined as a macros within the bstrlib module (via macros in 
-    the memdbg.h backdoor) with some difference in behaviour from the std 
-    library functions, then this allows a correct way of freeing the memory 
-    that allows higher level code to be independent from these macro 
-    redefinitions.
-
-    ..........................................................................
-
-    extern bstring bstrcpy (const_bstring b1);
-
-    Make a copy of the passed in bstring.  The copied bstring is returned if 
-    there is no error, otherwise NULL is returned.
-
-    ..........................................................................
-
-    extern int bassign (bstring a, const_bstring b);
-
-    Overwrite the bstring a with the contents of bstring b.  Note that the 
-    bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a is not overwritten.
-
-    ..........................................................................
-
-    int bassigncstr (bstring a, const char * str);
-
-    Overwrite the string a with the contents of char * string str.  Note that 
-    the bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a may be partially overwritten.
-
-    ..........................................................................
-
-    int bassignblk (bstring a, const void * s, int len);
-
-    Overwrite the string a with the contents of the block (s, len).  Note that 
-    the bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a is not overwritten.
-
-    ..........................................................................
-
-    extern int bassignmidstr (bstring a, const_bstring b, int left, int len);
-
-    Overwrite the bstring a with the middle of contents of bstring b 
-    starting from position left and running for a length len.  left and 
-    len are clamped to the ends of b as with the function bmidstr.  Note that 
-    the bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a is not overwritten.
-
-    ..........................................................................
-
-    extern bstring bmidstr (const_bstring b, int left, int len);
-
-    Create a bstring which is the substring of b starting from position left 
-    and running for a length len (clamped by the end of the bstring b.)  If 
-    there was no error, the value of this constructed bstring is returned 
-    otherwise NULL is returned.
-
-    ..........................................................................
-
-    extern int bdelete (bstring s1, int pos, int len);
-
-    Removes characters from pos to pos+len-1 and shifts the tail of the 
-    bstring starting from pos+len to pos.  len must be positive for this call 
-    to have any effect.  The section of the bstring described by (pos, len) 
-    is clamped to boundaries of the bstring b.  The value BSTR_OK is returned 
-    if the operation is successful, otherwise BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bconcat (bstring b0, const_bstring b1);
-
-    Concatenate the bstring b1 to the end of bstring b0.  The value BSTR_OK 
-    is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int bconchar (bstring b, char c);
-
-    Concatenate the character c to the end of bstring b.  The value BSTR_OK 
-    is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int bcatcstr (bstring b, const char * s);
-
-    Concatenate the char * string s to the end of bstring b.  The value 
-    BSTR_OK is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int bcatblk (bstring b, const void * s, int len);
-
-    Concatenate a fixed length buffer (s, len) to the end of bstring b.  The 
-    value BSTR_OK is returned if the operation is successful, otherwise 
-    BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int biseq (const_bstring b0, const_bstring b1);
-
-    Compare the bstring b0 and b1 for equality.  If the bstrings differ, 0 
-    is returned, if the bstrings are the same, 1 is returned, if there is an 
-    error, -1 is returned.  If the length of the bstrings are different, this 
-    function has O(1) complexity.  Contained '\0' characters are not treated 
-    as a termination character.
-
-    Note that the semantics of biseq are not completely compatible with 
-    bstrcmp because of its different treatment of the '\0' character.
-
-    ..........................................................................
-
-    extern int bisstemeqblk (const_bstring b, const void * blk, int len);
-
-    Compare beginning of bstring b0 with a block of memory of length len for 
-    equality.  If the beginning of b0 differs from the memory block (or if b0 
-    is too short), 0 is returned, if the bstrings are the same, 1 is returned, 
-    if there is an error, -1 is returned.
-
-    ..........................................................................
-
-    extern int biseqcaseless (const_bstring b0, const_bstring b1);
-
-    Compare two bstrings for equality without differentiating between case.  
-    If the bstrings differ other than in case, 0 is returned, if the bstrings 
-    are the same, 1 is returned, if there is an error, -1 is returned.  If 
-    the length of the bstrings are different, this function is O(1).  '\0' 
-    termination characters are not treated in any special way.
-
-    ..........................................................................
-
-    extern int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len);
-
-    Compare beginning of bstring b0 with a block of memory of length len 
-    without differentiating between case for equality.  If the beginning of b0
-    differs from the memory block other than in case (or if b0 is too short), 
-    0 is returned, if the bstrings are the same, 1 is returned, if there is an 
-    error, -1 is returned.
-
-    ..........................................................................
-
-    extern int biseqcstr (const_bstring b, const char *s);
-
-    Compare the bstring b and char * bstring s.  The C string s must be '\0' 
-    terminated at exactly the length of the bstring b, and the contents 
-    between the two must be identical with the bstring b with no '\0' 
-    characters for the two contents to be considered equal.  This is 
-    equivalent to the condition that their current contents will be always be 
-    equal when comparing them in the same format after converting one or the 
-    other.  If they are equal 1 is returned, if they are unequal 0 is 
-    returned and if there is a detectable error BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int biseqcstrcaseless (const_bstring b, const char *s);
-
-    Compare the bstring b and char * string s.  The C string s must be '\0'
-    terminated at exactly the length of the bstring b, and the contents
-    between the two must be identical except for case with the bstring b with
-    no '\0' characters for the two contents to be considered equal.  This is
-    equivalent to the condition that their current contents will be always be
-    equal ignoring case when comparing them in the same format after
-    converting one or the other.  If they are equal, except for case, 1 is 
-    returned, if they are unequal regardless of case 0 is returned and if 
-    there is a detectable error BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bstrcmp (const_bstring b0, const_bstring b1);
-
-    Compare the bstrings b0 and b1 for ordering.  If there is an error, 
-    SHRT_MIN is returned, otherwise a value less than or greater than zero, 
-    indicating that the bstring pointed to by b0 is lexicographically less 
-    than or greater than the bstring pointed to by b1 is returned.  If the
-    bstring lengths are unequal but the characters up until the length of the 
-    shorter are equal then a value less than, or greater than zero, 
-    indicating that the bstring pointed to by b0 is shorter or longer than the 
-    bstring pointed to by b1 is returned.  0 is returned if and only if the 
-    two bstrings are the same.  If the length of the bstrings are different, 
-    this function is O(n).  Like its standard C library counter part, the 
-    comparison does not proceed past any '\0' termination characters 
-    encountered.
-
-    The seemingly odd error return value, merely provides slightly more 
-    granularity than the undefined situation given in the C library function 
-    strcmp.  The function otherwise behaves very much like strcmp().
-
-    Note that the semantics of bstrcmp are not completely compatible with 
-    biseq because of its different treatment of the '\0' termination 
-    character.
-
-    ..........................................................................
-
-    extern int bstrncmp (const_bstring b0, const_bstring b1, int n);
-
-    Compare the bstrings b0 and b1 for ordering for at most n characters.  If 
-    there is an error, SHRT_MIN is returned, otherwise a value is returned as 
-    if b0 and b1 were first truncated to at most n characters then bstrcmp 
-    was called with these new bstrings are paremeters.  If the length of the 
-    bstrings are different, this function is O(n).  Like its standard C 
-    library counter part, the comparison does not proceed past any '\0' 
-    termination characters encountered.
-
-    The seemingly odd error return value, merely provides slightly more 
-    granularity than the undefined situation given in the C library function 
-    strncmp.  The function otherwise behaves very much like strncmp().
-
-    ..........................................................................
-
-    extern int bstricmp (const_bstring b0, const_bstring b1);
-
-    Compare two bstrings without differentiating between case.  The return 
-    value is the difference of the values of the characters where the two 
-    bstrings first differ, otherwise 0 is returned indicating that the 
-    bstrings are equal.  If the lengths are different, then a difference from 
-    0 is given, but if the first extra character is '\0', then it is taken to 
-    be the value UCHAR_MAX+1.
-
-    ..........................................................................
-
-    extern int bstrnicmp (const_bstring b0, const_bstring b1, int n);
-
-    Compare two bstrings without differentiating between case for at most n
-    characters.  If the position where the two bstrings first differ is
-    before the nth position, the return value is the difference of the values
-    of the characters, otherwise 0 is returned.  If the lengths are different
-    and less than n characters, then a difference from 0 is given, but if the 
-    first extra character is '\0', then it is taken to be the value 
-    UCHAR_MAX+1.
-
-    ..........................................................................
-
-    extern int bdestroy (bstring b);
-
-    Deallocate the bstring passed.  Passing NULL in as a parameter will have 
-    no effect.  Note that both the header and the data portion of the bstring 
-    will be freed.  No other bstring function which modifies one of its 
-    parameters will free or reallocate the header.  Because of this, in 
-    general, bdestroy cannot be called on any declared struct tagbstring even 
-    if it is not write protected.  A bstring which is write protected cannot 
-    be destroyed via the bdestroy call.  Any attempt to do so will result in 
-    no action taken, and BSTR_ERR will be returned.
-
-    Note to C++ users: Passing in a CBString cast to a bstring will lead to
-    undefined behavior (free will be called on the header, rather than the
-    CBString destructor.)  Instead just use the ordinary C++ language 
-    facilities to dealloc a CBString.
-
-    ..........................................................................
-
-    extern int binstr (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    forward (increasing) direction.  If it is found then it returns with the 
-    first position after pos where it is found, otherwise it returns BSTR_ERR.  
-    The algorithm used is brute force; O(m*n).
-
-    ..........................................................................
-
-    extern int binstrr (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    backward (decreasing) direction.  If it is found then it returns with the 
-    first position after pos where it is found, otherwise return BSTR_ERR.  
-    Note that the current position at pos is tested as well -- so to be 
-    disjoint from a previous forward search it is recommended that the 
-    position be backed up (decremented) by one position.  The algorithm used 
-    is brute force; O(m*n).
-
-    ..........................................................................
-
-    extern int binstrcaseless (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    forward (increasing) direction but without regard to case.  If it is 
-    found then it returns with the first position after pos where it is 
-    found, otherwise it returns BSTR_ERR. The algorithm used is brute force; 
-    O(m*n).
-
-    ..........................................................................
-
-    extern int binstrrcaseless (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    backward (decreasing) direction but without regard to case.  If it is 
-    found then it returns with the first position after pos where it is 
-    found, otherwise return BSTR_ERR. Note that the current position at pos 
-    is tested as well -- so to be disjoint from a previous forward search it 
-    is recommended that the position be backed up (decremented) by one 
-    position.  The algorithm used is brute force; O(m*n).
-
-    ..........................................................................
-
-    extern int binchr (const_bstring b0, int pos, const_bstring b1);
-
-    Search for the first position in b0 starting from pos or after, in which 
-    one of the characters in b1 is found.  This function has an execution 
-    time of O(b0->slen + b1->slen).  If such a position does not exist in b0, 
-    then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int binchrr (const_bstring b0, int pos, const_bstring b1);
-
-    Search for the last position in b0 no greater than pos, in which one of 
-    the characters in b1 is found.  This function has an execution time
-    of O(b0->slen + b1->slen).  If such a position does not exist in b0, 
-    then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bninchr (const_bstring b0, int pos, const_bstring b1);
-
-    Search for the first position in b0 starting from pos or after, in which 
-    none of the characters in b1 is found and return it.  This function has 
-    an execution time of O(b0->slen + b1->slen).  If such a position does 
-    not exist in b0, then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bninchrr (const_bstring b0, int pos, const_bstring b1);
-  
-    Search for the last position in b0 no greater than pos, in which none of 
-    the characters in b1 is found and return it.  This function has an 
-    execution time of O(b0->slen + b1->slen).  If such a position does not 
-    exist in b0, then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bstrchr (const_bstring b, int c);
-
-    Search for the character c in the bstring b forwards from the start of 
-    the bstring.  Returns the position of the found character or BSTR_ERR if 
-    it is not found.
-
-    NOTE: This has been implemented as a macro on top of bstrchrp ().
-
-    ..........................................................................
-
-    extern int bstrrchr (const_bstring b, int c);
-
-    Search for the character c in the bstring b backwards from the end of the 
-    bstring.  Returns the position of the found character or BSTR_ERR if it is 
-    not found.
-
-    NOTE: This has been implemented as a macro on top of bstrrchrp ().
-
-    ..........................................................................
-
-    extern int bstrchrp (const_bstring b, int c, int pos);
-  
-    Search for the character c in b forwards from the position pos 
-    (inclusive).  Returns the position of the found character or BSTR_ERR if 
-    it is not found.
-
-    ..........................................................................
-
-    extern int bstrrchrp (const_bstring b, int c, int pos);
-
-    Search for the character c in b backwards from the position pos in bstring 
-    (inclusive).  Returns the position of the found character or BSTR_ERR if 
-    it is not found.
-
-    ..........................................................................
-
-    extern int bsetstr (bstring b0, int pos, const_bstring b1, unsigned char fill);
-
-    Overwrite the bstring b0 starting at position pos with the bstring b1. If 
-    the position pos is past the end of b0, then the character "fill" is 
-    appended as necessary to make up the gap between the end of b0 and pos.
-    If b1 is NULL, it behaves as if it were a 0-length bstring. The value 
-    BSTR_OK is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int binsert (bstring s1, int pos, const_bstring s2, unsigned char fill);
-
-    Inserts the bstring s2 into s1 at position pos.  If the position pos is 
-    past the end of s1, then the character "fill" is appended as necessary to 
-    make up the gap between the end of s1 and pos.  The value BSTR_OK is 
-    returned if the operation is successful, otherwise BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int binsertch (bstring s1, int pos, int len, unsigned char fill);
-
-    Inserts the character fill repeatedly into s1 at position pos for a 
-    length len.  If the position pos is past the end of s1, then the 
-    character "fill" is appended as necessary to make up the gap between the 
-    end of s1 and the position pos + len (exclusive).  The value BSTR_OK is 
-    returned if the operation is successful, otherwise BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int breplace (bstring b1, int pos, int len, const_bstring b2, 
-                         unsigned char fill);
-
-    Replace a section of a bstring from pos for a length len with the bstring 
-    b2. If the position pos is past the end of b1 then the character "fill"
-    is appended as necessary to make up the gap between the end of b1 and 
-    pos.
-
-    ..........................................................................
-
-    extern int bfindreplace (bstring b, const_bstring find,
-                             const_bstring replace, int position);
-
-    Replace all occurrences of the find substring with a replace bstring 
-    after a given position in the bstring b.  The find bstring must have a 
-    length > 0 otherwise BSTR_ERR is returned.  This function does not 
-    perform recursive per character replacement; that is to say successive
-    searches resume at the position after the last replace.
-
-    So for example:
-
-        bfindreplace (a0 = bfromcstr("aabaAb"), a1 = bfromcstr("a"),
-                      a2 = bfromcstr("aa"), 0);
-
-    Should result in changing a0 to "aaaabaaAb".
-
-    This function performs exactly (b->slen - position) bstring comparisons, 
-    and data movement is bounded above by character volume equivalent to size 
-    of the output bstring.
-
-    ..........................................................................
-
-    extern int bfindreplacecaseless (bstring b, const_bstring find,
-                             const_bstring replace, int position);
-
-    Replace all occurrences of the find substring, ignoring case, with a 
-    replace bstring after a given position in the bstring b.  The find bstring 
-    must have a length > 0 otherwise BSTR_ERR is returned.  This function 
-    does not perform recursive per character replacement; that is to say 
-    successive searches resume at the position after the last replace.
-
-    So for example:
-
-        bfindreplacecaseless (a0 = bfromcstr("AAbaAb"), a1 = bfromcstr("a"),
-                              a2 = bfromcstr("aa"), 0);
-
-    Should result in changing a0 to "aaaabaaaab".
-
-    This function performs exactly (b->slen - position) bstring comparisons, 
-    and data movement is bounded above by character volume equivalent to size 
-    of the output bstring.
-
-    ..........................................................................
-
-    extern int balloc (bstring b, int length);
-
-    Increase the allocated memory backing the data buffer for the bstring b
-    to a length of at least length.  If the memory backing the bstring b is
-    already large enough, not action is performed.  This has no effect on the 
-    bstring b that is visible to the bstring API.  Usually this function will 
-    only be used when a minimum buffer size is required coupled with a direct 
-    access to the ->data member of the bstring structure.
-
-    Be warned that like any other bstring function, the bstring must be well
-    defined upon entry to this function.  I.e., doing something like:
-
-        b->slen *= 2; /* ?? Most likely incorrect */
-        balloc (b, b->slen);
-
-    is invalid, and should be implemented as:
-
-        int t;
-        if (BSTR_OK == balloc (b, t = (b->slen * 2))) b->slen = t;
-
-    This function will return with BSTR_ERR if b is not detected as a valid 
-    bstring or length is not greater than 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int ballocmin (bstring b, int length);
-
-    Change the amount of memory backing the bstring b to at least length.  
-    This operation will never truncate the bstring data including the 
-    extra terminating '\0' and thus will not decrease the length to less than
-    b->slen + 1.  Note that repeated use of this function may cause 
-    performance problems (realloc may be called on the bstring more than
-    the O(log(INT_MAX)) times).  This function will return with BSTR_ERR if b 
-    is not detected as a valid bstring or length is not greater than 0, 
-    otherwise BSTR_OK is returned.
-
-    So for example:
-
-	if (BSTR_OK == ballocmin (b, 64)) b->data[63] = 'x';
-
-    The idea is that this will set the 64th character of b to 'x' if it is at 
-    least 64 characters long otherwise do nothing.  And we know this is well 
-    defined so long as the ballocmin call was successfully, since it will 
-    ensure that b has been allocated with at least 64 characters.
-
-    ..........................................................................
-
-    int btrunc (bstring b, int n);
-
-    Truncate the bstring to at most n characters.  This function will return 
-    with BSTR_ERR if b is not detected as a valid bstring or n is less than 
-    0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int bpattern (bstring b, int len);
-
-    Replicate the starting bstring, b, end to end repeatedly until it 
-    surpasses len characters, then chop the result to exactly len characters. 
-    This function operates in-place.  This function will return with BSTR_ERR 
-    if b is NULL or of length 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int btoupper (bstring b);
-
-    Convert contents of bstring to upper case.  This function will return with 
-    BSTR_ERR if b is NULL or of length 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int btolower (bstring b);
-
-    Convert contents of bstring to lower case.  This function will return with 
-    BSTR_ERR if b is NULL or of length 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int bltrimws (bstring b);
-
-    Delete whitespace contiguous from the left end of the bstring.  This 
-    function will return with BSTR_ERR if b is NULL or of length 0, otherwise 
-    BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int brtrimws (bstring b);
-
-    Delete whitespace contiguous from the right end of the bstring.  This 
-    function will return with BSTR_ERR if b is NULL or of length 0, otherwise 
-    BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int btrimws (bstring b);
-
-    Delete whitespace contiguous from both ends of the bstring.  This function 
-    will return with BSTR_ERR if b is NULL or of length 0, otherwise BSTR_OK 
-    is returned.
-
-    ..........................................................................
-
-    extern int bstrListCreate (void);
-
-    Create an empty struct bstrList. The struct bstrList output structure is 
-    declared as follows:
-
-    struct bstrList {
-        int qty, mlen;
-        bstring * entry;
-    };
-
-    The entry field actually is an array with qty number entries.  The mlen
-    record counts the maximum number of bstring's for which there is memory
-    in the entry record.
-
-    The Bstrlib API does *NOT* include a comprehensive set of functions for 
-    full management of struct bstrList in an abstracted way.  The reason for 
-    this is because aliasing semantics of the list are best left to the user 
-    of this function, and performance varies wildly depending on the 
-    assumptions made.  For a complete list of bstring data type it is 
-    recommended that the C++ public std::vector<CBString> be used, since its
-    semantics are usage are more standard.
-
-    ..........................................................................
-
-    extern int bstrListDestroy (struct bstrList * sl);
-
-    Destroy a struct bstrList structure that was returned by the bsplit 
-    function.  Note that this will destroy each bstring in the ->entry array
-    as well.  See bstrListCreate() above for structure of struct bstrList.
-
-    ..........................................................................
-
-    extern int bstrListAlloc (struct bstrList * sl, int msz);
-
-    Ensure that there is memory for at least msz number of entries for the
-    list.
-
-    ..........................................................................
-
-    extern int bstrListAllocMin (struct bstrList * sl, int msz);
-
-    Try to allocate the minimum amount of memory for the list to include at
-    least msz entries or sl->qty whichever is greater.
-
-    ..........................................................................
-
-    extern struct bstrList * bsplit (bstring str, unsigned char splitChar);
-
-    Create an array of sequential substrings from str divided by the 
-    character splitChar.  Successive occurrences of the splitChar will be 
-    divided by empty bstring entries, following the semantics from the Python 
-    programming language.  To reclaim the memory from this output structure, 
-    bstrListDestroy () should be called.  See bstrListCreate() above for 
-    structure of struct bstrList.
-
-    ..........................................................................
-
-    extern struct bstrList * bsplits (bstring str, const_bstring splitStr);
-
-    Create an array of sequential substrings from str divided by any 
-    character contained in splitStr.  An empty splitStr causes a single entry 
-    bstrList containing a copy of str to be returned.  See bstrListCreate() 
-    above for structure of struct bstrList.
-
-    ..........................................................................
-
-    extern struct bstrList * bsplitstr (bstring str, const_bstring splitStr);
-
-    Create an array of sequential substrings from str divided by the entire 
-    substring splitStr.  An empty splitStr causes a single entry bstrList 
-    containing a copy of str to be returned.  See bstrListCreate() above for 
-    structure of struct bstrList.
-
-    ..........................................................................
-
-    extern bstring bjoin (const struct bstrList * bl, const_bstring sep);
-
-    Join the entries of a bstrList into one bstring by sequentially 
-    concatenating them with the sep bstring in between.  If sep is NULL, it
-    is treated as if it were the empty bstring.  Note that:
-
-        bjoin (l = bsplit (b, s->data[0]), s);
-
-    should result in a copy of b, if s->slen is 1.  If there is an error NULL 
-    is returned, otherwise a bstring with the correct result is returned.  
-    See bstrListCreate() above for structure of struct bstrList.
-
-    ..........................................................................
-
-    extern int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
-	int (* cb) (void * parm, int ofs, int len), void * parm);
-
-    Iterate the set of disjoint sequential substrings over str starting at 
-    position pos divided by the character splitChar.  The parm passed to 
-    bsplitcb is passed on to cb.  If the function cb returns a value < 0, 
-    then further iterating is halted and this value is returned by bsplitcb.
-
-    Note: Non-destructive modification of str from within the cb function 
-    while performing this split is not undefined.  bsplitcb behaves in 
-    sequential lock step with calls to cb.  I.e., after returning from a cb 
-    that return a non-negative integer, bsplitcb continues from the position 
-    1 character after the last detected split character and it will halt 
-    immediately if the length of str falls below this point.  However, if the 
-    cb function destroys str, then it *must* return with a negative value, 
-    otherwise bsplitcb will continue in an undefined manner.
-
-    This function is provided as an incremental alternative to bsplit that is
-    abortable and which does not impose additional memory allocation.
-
-    ..........................................................................
-
-    extern int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
-	int (* cb) (void * parm, int ofs, int len), void * parm);
-
-    Iterate the set of disjoint sequential substrings over str starting at 
-    position pos divided by any of the characters in splitStr.  An empty 
-    splitStr causes the whole str to be iterated once.  The parm passed to 
-    bsplitcb is passed on to cb.  If the function cb returns a value < 0, 
-    then further iterating is halted and this value is returned by bsplitcb.
-
-    Note: Non-destructive modification of str from within the cb function 
-    while performing this split is not undefined.  bsplitscb behaves in 
-    sequential lock step with calls to cb.  I.e., after returning from a cb 
-    that return a non-negative integer, bsplitscb continues from the position 
-    1 character after the last detected split character and it will halt 
-    immediately if the length of str falls below this point.  However, if the 
-    cb function destroys str, then it *must* return with a negative value, 
-    otherwise bsplitscb will continue in an undefined manner.
-
-    This function is provided as an incremental alternative to bsplits that 
-    is abortable and which does not impose additional memory allocation.
-
-    ..........................................................................
-
-    extern int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
-	int (* cb) (void * parm, int ofs, int len), void * parm);
-
-    Iterate the set of disjoint sequential substrings over str starting at 
-    position pos divided by the entire substring splitStr.  An empty splitStr 
-    causes each character of str to be iterated.  The parm passed to bsplitcb 
-    is passed on to cb.  If the function cb returns a value < 0, then further 
-    iterating is halted and this value is returned by bsplitcb.
-
-    Note: Non-destructive modification of str from within the cb function 
-    while performing this split is not undefined.  bsplitstrcb behaves in 
-    sequential lock step with calls to cb.  I.e., after returning from a cb 
-    that return a non-negative integer, bsplitstrcb continues from the position 
-    1 character after the last detected split character and it will halt 
-    immediately if the length of str falls below this point.  However, if the 
-    cb function destroys str, then it *must* return with a negative value, 
-    otherwise bsplitscb will continue in an undefined manner.
-
-    This function is provided as an incremental alternative to bsplitstr that 
-    is abortable and which does not impose additional memory allocation.
-
-    ..........................................................................
-
-    extern bstring bformat (const char * fmt, ...);
-
-    Takes the same parameters as printf (), but rather than outputting 
-    results to stdio, it forms a bstring which contains what would have been 
-    output. Note that if there is an early generation of a '\0' character, 
-    the bstring will be truncated to this end point.
-
-    Note that %s format tokens correspond to '\0' terminated char * buffers, 
-    not bstrings.  To print a bstring, first dereference data element of the 
-    the bstring:
-
-        /* b1->data needs to be '\0' terminated, so tagbstrings generated 
-           by blk2tbstr () might not be suitable. */
-        b0 = bformat ("Hello, %s", b1->data);
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bformat function is not present.
-
-    ..........................................................................
-
-    extern int bformata (bstring b, const char * fmt, ...);
-
-    In addition to the initial output buffer b, bformata takes the same 
-    parameters as printf (), but rather than outputting results to stdio, it 
-    appends the results to the initial bstring parameter. Note that if 
-    there is an early generation of a '\0' character, the bstring will be 
-    truncated to this end point.
-
-    Note that %s format tokens correspond to '\0' terminated char * buffers, 
-    not bstrings.  To print a bstring, first dereference data element of the 
-    the bstring:
-
-        /* b1->data needs to be '\0' terminated, so tagbstrings generated 
-           by blk2tbstr () might not be suitable. */
-        bformata (b0 = bfromcstr ("Hello"), ", %s", b1->data); 
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bformata function is not present.
-
-    ..........................................................................
-
-    extern int bassignformat (bstring b, const char * fmt, ...);
-
-    After the first parameter, it takes the same parameters as printf (), but 
-    rather than outputting results to stdio, it outputs the results to 
-    the bstring parameter b. Note that if there is an early generation of a 
-    '\0' character, the bstring will be truncated to this end point.
-
-    Note that %s format tokens correspond to '\0' terminated char * buffers, 
-    not bstrings.  To print a bstring, first dereference data element of the 
-    the bstring:
-
-        /* b1->data needs to be '\0' terminated, so tagbstrings generated 
-           by blk2tbstr () might not be suitable. */
-        bassignformat (b0 = bfromcstr ("Hello"), ", %s", b1->data); 
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bassignformat function is not present.
-
-    ..........................................................................
-
-    extern int bvcformata (bstring b, int count, const char * fmt, va_list arglist);
-
-    The bvcformata function formats data under control of the format control 
-    string fmt and attempts to append the result to b.  The fmt parameter is 
-    the same as that of the printf function.  The variable argument list is 
-    replaced with arglist, which has been initialized by the va_start macro.
-    The size of the output is upper bounded by count.  If the required output
-    exceeds count, the string b is not augmented with any contents and a value
-    below BSTR_ERR is returned.  If a value below -count is returned then it
-    is recommended that the negative of this value be used as an update to the
-    count in a subsequent pass.  On other errors, such as running out of 
-    memory, parameter errors or numeric wrap around BSTR_ERR is returned.  
-    BSTR_OK is returned when the output is successfully generated and 
-    appended to b.
-
-    Note: There is no sanity checking of arglist, and this function is
-    destructive of the contents of b from the b->slen point onward.  If there 
-    is an early generation of a '\0' character, the bstring will be truncated 
-    to this end point.
-
-    Although this function is part of the external API for Bstrlib, the 
-    interface and semantics (length limitations, and unusual return codes) 
-    are fairly atypical.  The real purpose for this function is to provide an 
-    engine for the bvformata macro.
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bvcformata function is not present.
-
-    ..........................................................................
-
-    extern bstring bread (bNread readPtr, void * parm);
-    typedef size_t (* bNread) (void *buff, size_t elsize, size_t nelem, 
-                               void *parm);
-
-    Read an entire stream into a bstring, verbatum.  The readPtr function 
-    pointer is compatible with fread sematics, except that it need not obtain 
-    the stream data from a file.  The intention is that parm would contain 
-    the stream data context/state required (similar to the role of the FILE* 
-    I/O stream parameter of fread.)
-
-    Abstracting the block read function allows for block devices other than 
-    file streams to be read if desired.  Note that there is an ANSI 
-    compatibility issue if "fread" is used directly; see the ANSI issues 
-    section below.
-
-    ..........................................................................
-
-    extern int breada (bstring b, bNread readPtr, void * parm);
-
-    Read an entire stream and append it to a bstring, verbatum.  Behaves 
-    like bread, except that it appends it results to the bstring b.
-    BSTR_ERR is returned on error, otherwise 0 is returned.
-
-    ..........................................................................
-
-    extern bstring bgets (bNgetc getcPtr, void * parm, char terminator);
-    typedef int (* bNgetc) (void * parm);
-
-    Read a bstring from a stream.  As many bytes as is necessary are read
-    until the terminator is consumed or no more characters are available from
-    the stream.  If read from the stream, the terminator character will be
-    appended to the end of the returned bstring.  The getcPtr function must 
-    have the same semantics as the fgetc C library function (i.e., returning 
-    an integer whose value is negative when there are no more characters 
-    available, otherwise the value of the next available unsigned character 
-    from the stream.)  The intention is that parm would contain the stream 
-    data context/state required (similar to the role of the FILE* I/O stream 
-    parameter of fgets.)  If no characters are read, or there is some other 
-    detectable error, NULL is returned.
-
-    bgets will never call the getcPtr function more often than necessary to
-    construct its output (including a single call, if required, to determine 
-    that the stream contains no more characters.)
-
-    Abstracting the character stream function and terminator character allows
-    for different stream devices and string formats other than '\n' 
-    terminated lines in a file if desired (consider \032 terminated email 
-    messages, in a UNIX mailbox for example.)
-
-    For files, this function can be used analogously as fgets as follows:
-
-        fp = fopen ( ... );
-        if (fp) b = bgets ((bNgetc) fgetc, fp, '\n');
-
-    (Note that only one terminator character can be used, and that '\0' is 
-    not assumed to terminate the stream in addition to the terminator 
-    character. This is consistent with the semantics of fgets.)
-
-    ..........................................................................
-
-    extern int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator);
-
-    Read from a stream and concatenate to a bstring.  Behaves like bgets, 
-    except that it appends it results to the bstring b.  The value 1 is 
-    returned if no characters are read before a negative result is returned
-    from getcPtr.  Otherwise BSTR_ERR is returned on error, and 0 is returned
-    in other normal cases.
-
-    ..........................................................................
-
-    extern int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator);
-
-    Read from a stream and concatenate to a bstring.  Behaves like bgets, 
-    except that it assigns the results to the bstring b.  The value 1 is 
-    returned if no characters are read before a negative result is returned
-    from getcPtr.  Otherwise BSTR_ERR is returned on error, and 0 is returned
-    in other normal cases.
-
-    ..........................................................................
-
-    extern struct bStream * bsopen (bNread readPtr, void * parm);
-  
-    Wrap a given open stream (described by a fread compatible function 
-    pointer and stream handle) into an open bStream suitable for the bstring 
-    library streaming functions.
-  
-    ..........................................................................
-
-    extern void * bsclose (struct bStream * s);
-  
-    Close the bStream, and return the handle to the stream that was 
-    originally used to open the given stream.  If s is NULL or detectably 
-    invalid, NULL will be returned.
-
-    ..........................................................................
-
-    extern int bsbufflength (struct bStream * s, int sz);
-
-    Set the length of the buffer used by the bStream.  If sz is the macro
-    BSTR_BS_BUFF_LENGTH_GET (which is 0), the length is not set.  If s is 
-    NULL or sz is negative, the function will return with BSTR_ERR, otherwise 
-    this function returns with the previous length.
-
-    ..........................................................................
-
-    extern int bsreadln (bstring r, struct bStream * s, char terminator);
-  
-    Read a bstring terminated by the terminator character or the end of the
-    stream from the bStream (s) and return it into the parameter r.  The 
-    matched terminator, if found, appears at the end of the line read.  If
-    the stream has been exhausted of all available data, before any can be
-    read, BSTR_ERR is returned.  This function may read additional characters 
-    into the stream buffer from the core stream that are not returned, but 
-    will be retained for subsequent read operations.  When reading from high 
-    speed streams, this function can perform significantly faster than bgets.
-
-    ..........................................................................
-
-    extern int bsreadlna (bstring r, struct bStream * s, char terminator);
-  
-    Read a bstring terminated by the terminator character or the end of the
-    stream from the bStream (s) and concatenate it to the parameter r.  The 
-    matched terminator, if found, appears at the end of the line read.  If
-    the stream has been exhausted of all available data, before any can be
-    read, BSTR_ERR is returned.  This function may read additional characters 
-    into the stream buffer from the core stream that are not returned, but 
-    will be retained for subsequent read operations.  When reading from high 
-    speed streams, this function can perform significantly faster than bgets.
-
-    ..........................................................................
-
-    extern int bsreadlns (bstring r, struct bStream * s, bstring terminators);
-
-    Read a bstring terminated by any character in the terminators bstring or 
-    the end of the stream from the bStream (s) and return it into the 
-    parameter r. This function may read additional characters from the core 
-    stream that are not returned, but will be retained for subsequent read 
-    operations.
-
-    ..........................................................................
-
-    extern int bsreadlnsa (bstring r, struct bStream * s, bstring terminators);
-
-    Read a bstring terminated by any character in the terminators bstring or 
-    the end of the stream from the bStream (s) and concatenate it to the 
-    parameter r.  If the stream has been exhausted of all available data, 
-    before any can be read, BSTR_ERR is returned.  This function may read 
-    additional characters from the core stream that are not returned, but 
-    will be retained for subsequent read operations.
-
-    ..........................................................................
-
-    extern int bsread (bstring r, struct bStream * s, int n);
-  
-    Read a bstring of length n (or, if it is fewer, as many bytes as is 
-    remaining) from the bStream.  This function will read the minimum 
-    required number of additional characters from the core stream.  When the
-    stream is at the end of the file BSTR_ERR is returned, otherwise BSTR_OK 
-    is returned.
-
-    ..........................................................................
-
-    extern int bsreada (bstring r, struct bStream * s, int n);
-  
-    Read a bstring of length n (or, if it is fewer, as many bytes as is 
-    remaining) from the bStream and concatenate it to the parameter r.  This 
-    function will read the minimum required number of additional characters 
-    from the core stream.  When the stream is at the end of the file BSTR_ERR 
-    is returned, otherwise BSTR_OK is returned.
-  
-    ..........................................................................
-  
-    extern int bsunread (struct bStream * s, const_bstring b);
-  
-    Insert a bstring into the bStream at the current position.  These 
-    characters will be read prior to those that actually come from the core 
-    stream.
-
-    ..........................................................................
-
-    extern int bspeek (bstring r, const struct bStream * s);
-  
-    Return the number of currently buffered characters from the bStream that 
-    will be read prior to reads from the core stream, and append it to the
-    the parameter r.
-
-    ..........................................................................
-
-    extern int bssplitscb (struct bStream * s, const_bstring splitStr, 
-	int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-
-    Iterate the set of disjoint sequential substrings over the stream s 
-    divided by any character from the bstring splitStr.  The parm passed to 
-    bssplitscb is passed on to cb.  If the function cb returns a value < 0, 
-    then further iterating is halted and this return value is returned by 
-    bssplitscb.
-
-    Note: At the point of calling the cb function, the bStream pointer is 
-    pointed exactly at the position right after having read the split 
-    character.  The cb function can act on the stream by causing the bStream
-    pointer to move, and bssplitscb will continue by starting the next split
-    at the position of the pointer after the return from cb.
-
-    However, if the cb causes the bStream s to be destroyed then the cb must
-    return with a negative value, otherwise bssplitscb will continue in an 
-    undefined manner.
-
-    This function is provided as way to incrementally parse through a file
-    or other generic stream that in total size may otherwise exceed the 
-    practical or desired memory available.  As with the other split callback
-    based functions this is abortable and does not impose additional memory 
-    allocation.
-
-    ..........................................................................
-    
-    extern int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
-	int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-	
-    Iterate the set of disjoint sequential substrings over the stream s 
-    divided by the entire substring splitStr.  The parm passed to 
-    bssplitstrcb is passed on to cb.  If the function cb returns a 
-    value < 0, then further iterating is halted and this return value is 
-    returned by bssplitstrcb.
-
-    Note: At the point of calling the cb function, the bStream pointer is 
-    pointed exactly at the position right after having read the split 
-    character.  The cb function can act on the stream by causing the bStream
-    pointer to move, and bssplitstrcb will continue by starting the next 
-    split at the position of the pointer after the return from cb.
-
-    However, if the cb causes the bStream s to be destroyed then the cb must
-    return with a negative value, otherwise bssplitscb will continue in an 
-    undefined manner.
-
-    This function is provided as way to incrementally parse through a file
-    or other generic stream that in total size may otherwise exceed the 
-    practical or desired memory available.  As with the other split callback
-    based functions this is abortable and does not impose additional memory 
-    allocation.
-    
-    ..........................................................................
-    
-    extern int bseof (const struct bStream * s);
-
-    Return the defacto "EOF" (end of file) state of a stream (1 if the 
-    bStream is in an EOF state, 0 if not, and BSTR_ERR if stream is closed or 
-    detectably erroneous.)  When the readPtr callback returns a value <= 0 
-    the stream reaches its "EOF" state. Note that bunread with non-empty 
-    content will essentially turn off this state, and the stream will not be 
-    in its "EOF" state so long as its possible to read more data out of it.
-
-    Also note that the semantics of bseof() are slightly different from 
-    something like feof().  I.e., reaching the end of the stream does not
-    necessarily guarantee that bseof() will return with a value indicating
-    that this has happened.  bseof() will only return indicating that it has
-    reached the "EOF" and an attempt has been made to read past the end of
-    the bStream.
-
-The macros
-----------
-
-    The macros described below are shown in a prototype form indicating their
-    intended usage.  Note that the parameters passed to these macros will be
-    referenced multiple times.  As with all macros, programmer care is 
-    required to guard against unintended side effects.
-
-    int blengthe (const_bstring b, int err);
-
-    Returns the length of the bstring.  If the bstring is NULL err is 
-    returned.
-
-    ..........................................................................
-
-    int blength (const_bstring b);
-
-    Returns the length of the bstring.  If the bstring is NULL, the length 
-    returned is 0.
-
-    ..........................................................................
-
-    int bchare (const_bstring b, int p, int c);
-
-    Returns the p'th character of the bstring b.  If the position p refers to 
-    a position that does not exist in the bstring or the bstring is NULL, 
-    then c is returned.
-
-    ..........................................................................
-
-    char bchar (const_bstring b, int p);
-
-    Returns the p'th character of the bstring b.  If the position p refers to 
-    a position that does not exist in the bstring or the bstring is NULL, 
-    then '\0' is returned.
-
-    ..........................................................................
-
-    char * bdatae (bstring b, char * err);
-
-    Returns the char * data portion of the bstring b.  If b is NULL, err is
-    returned.
-
-    ..........................................................................
-
-    char * bdata (bstring b);
-
-    Returns the char * data portion of the bstring b.  If b is NULL, NULL is
-    returned.
-
-    ..........................................................................
-
-    char * bdataofse (bstring b, int ofs, char * err);
-
-    Returns the char * data portion of the bstring b offset by ofs.  If b is 
-    NULL, err is returned.
-
-    ..........................................................................
-
-    char * bdataofs (bstring b, int ofs);
-
-    Returns the char * data portion of the bstring b offset by ofs.  If b is 
-    NULL, NULL is returned.
-
-    ..........................................................................
-
-    struct tagbstring var = bsStatic ("...");
-
-    The bsStatic macro allows for static declarations of literal string 
-    constants as struct tagbstring structures.  The resulting tagbstring does 
-    not need to be freed or destroyed.  Note that this macro is only well
-    defined for string literal arguments.  For more general string pointers, 
-    use the btfromcstr macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    <void * blk, int len> <- bsStaticBlkParms ("...")
-
-    The bsStaticBlkParms macro emits a pair of comma seperated parameters 
-    corresponding to the block parameters for the block functions in Bstrlib 
-    (i.e., blk2bstr, bcatblk, blk2tbstr, bisstemeqblk, bisstemeqcaselessblk.) 
-    Note that this macro is only well defined for string literal arguments.
-
-    Examples:
-
-    bstring b = blk2bstr (bsStaticBlkParms ("Fast init. "));
-    bcatblk (b, bsStaticBlkParms ("No frills fast concatenation."));
-
-    These are faster than using bfromcstr() and bcatcstr() respectively 
-    because the length of the inline string is known as a compile time
-    constant.  Also note that seperate struct tagbstring declarations for
-    holding the output of a bsStatic() macro are not required.
-
-    ..........................................................................
-
-    void btfromcstr (struct tagbstring& t, const char * s);
-
-    Fill in the tagbstring t with the '\0' terminated char buffer s.  This 
-    action is purely reference oriented; no memory management is done.  The 
-    data member is just assigned s, and slen is assigned the strlen of s.  
-    The s parameter is accessed exactly once in this macro.
-
-    The resulting struct tagbstring is initially write protected.  Attempts 
-    to write to this struct tagbstring in a write protected state from any 
-    bstrlib function will lead to BSTR_ERR being returned.  Invoke the 
-    bwriteallow on this struct tagbstring to make it writeable (though this 
-    requires that s be obtained from a function compatible with malloc.)
-
-    ..........................................................................
-
-    void btfromblk (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len.  This 
-    action is purely reference oriented; no memory management is done.  The 
-    data member of t is just assigned s, and slen is assigned len.  Note that 
-    the buffer is not appended with a '\0' character.  The s and len 
-    parameters are accessed exactly once each in this macro.
-
-    The resulting struct tagbstring is initially write protected.  Attempts 
-    to write to this struct tagbstring in a write protected state from any 
-    bstrlib function will lead to BSTR_ERR being returned.  Invoke the 
-    bwriteallow on this struct tagbstring to make it writeable (though this 
-    requires that s be obtained from a function compatible with malloc.)
-
-    ..........................................................................
-
-    void btfromblkltrimws (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len after it
-    has been left trimmed.  This action is purely reference oriented; no 
-    memory management is done.  The data member of t is just assigned to a 
-    pointer inside the buffer s.  Note that the buffer is not appended with a 
-    '\0' character.  The s and len parameters are accessed exactly once each 
-    in this macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    void btfromblkrtrimws (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len after it
-    has been right trimmed.  This action is purely reference oriented; no 
-    memory management is done.  The data member of t is just assigned to a 
-    pointer inside the buffer s.  Note that the buffer is not appended with a 
-    '\0' character.  The s and len parameters are accessed exactly once each 
-    in this macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    void btfromblktrimws (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len after it
-    has been left and right trimmed.  This action is purely reference 
-    oriented; no memory management is done.  The data member of t is just 
-    assigned to a pointer inside the buffer s.  Note that the buffer is not 
-    appended with a '\0' character.  The s and len parameters are accessed 
-    exactly once each in this macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    void bmid2tbstr (struct tagbstring& t, bstring b, int pos, int len);
-
-    Fill the tagbstring t with the substring from b, starting from position
-    pos with a length len.  The segment is clamped by the boundaries of
-    the bstring b.  This action is purely reference oriented; no memory 
-    management is done.  Note that the buffer is not appended with a '\0' 
-    character.  Note that the t parameter to this macro may be accessed 
-    multiple times.  Note that the contents of t will become undefined 
-    if the contents of b change or are destroyed.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring in a write protected state from any 
-    bstrlib function will lead to BSTR_ERR being returned.  Invoking the
-    bwriteallow macro on this struct tagbstring will have no effect.
-
-    ..........................................................................
-
-    void bvformata (int& ret, bstring b, const char * format, lastarg);
-
-    Append the bstring b with printf like formatting with the format control
-    string, and the arguments taken from the ... list of arguments after
-    lastarg passed to the containing function.  If the containing function 
-    does not have ... parameters or lastarg is not the last named parameter 
-    before the ... then the results are undefined.  If successful, the 
-    results are appended to b and BSTR_OK is assigned to ret.  Otherwise 
-    BSTR_ERR is assigned to ret.
-
-    Example:
-
-    void dbgerror (FILE * fp, const char * fmt, ...) {
-        int ret;
-        bstring b;
-        bvformata (ret, b = bfromcstr ("DBG: "), fmt, fmt);
-        if (BSTR_OK == ret) fputs ((char *) bdata (b), fp);
-        bdestroy (b);
-    }
-
-    Note that if the BSTRLIB_NOVSNP macro was set when bstrlib had been 
-    compiled the bvformata macro will not link properly.  If the 
-    BSTRLIB_NOVSNP macro has been set, the bvformata macro will not be 
-    available.
-
-    ..........................................................................
-
-    void bwriteprotect (struct tagbstring& t);
-
-    Disallow bstring from being written to via the bstrlib API.  Attempts to 
-    write to the resulting tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.
-
-    Note: bstrings which are write protected cannot be destroyed via bdestroy.
-
-    Note to C++ users: Setting a CBString as write protected will not prevent
-    it from being destroyed by the destructor.
-
-    ..........................................................................
-
-    void bwriteallow (struct tagbstring& t);
-
-    Allow bstring to be written to via the bstrlib API.  Note that such an 
-    action makes the bstring both writable and destroyable.  If the bstring is
-    not legitimately writable (as is the case for struct tagbstrings 
-    initialized with a bsStatic value), the results of this are undefined.
-
-    Note that invoking the bwriteallow macro may increase the number of 
-    reallocs by one more than necessary for every call to bwriteallow 
-    interleaved with any bstring API which writes to this bstring.
-
-    ..........................................................................
-
-    int biswriteprotected (struct tagbstring& t);
-
-    Returns 1 if the bstring is write protected, otherwise 0 is returned.
-
-===============================================================================
-
-The bstest module
------------------
-
-The bstest module is just a unit test for the bstrlib module.  For correct
-implementations of bstrlib, it should execute with 0 failures being reported.
-This test should be utilized if modifications/customizations to bstrlib have
-been performed.  It tests each core bstrlib function with bstrings of every 
-mode (read-only, NULL, static and mutable) and ensures that the expected 
-semantics are observed (including results that should indicate an error). It
-also tests for aliasing support.  Passing bstest is a necessary but not a 
-sufficient condition for ensuring the correctness of the bstrlib module.
-
-
-The test module
----------------
-
-The test module is just a unit test for the bstrwrap module.  For correct
-implementations of bstrwrap, it should execute with 0 failures being 
-reported.  This test should be utilized if modifications/customizations to 
-bstrwrap have been performed.  It tests each core bstrwrap function with 
-CBStrings write protected or not and ensures that the expected semantics are 
-observed (including expected exceptions.)  Note that exceptions cannot be
-disabled to run this test.  Passing test is a necessary but not a sufficient 
-condition for ensuring the correctness of the bstrwrap module.
-
-===============================================================================
-
-Using Bstring and CBString as an alternative to the C library
--------------------------------------------------------------
-
-First let us give a table of C library functions and the alternative bstring 
-functions and CBString methods that should be used instead of them.
-
-C-library         Bstring alternative             CBString alternative
----------         -------------------             --------------------
-gets              bgets                           ::gets
-strcpy            bassign                         = operator
-strncpy           bassignmidstr                   ::midstr
-strcat            bconcat                         += operator
-strncat           bconcat + btrunc                += operator + ::trunc
-strtok            bsplit, bsplits                 ::split
-sprintf           b(assign)format                 ::format
-snprintf          b(assign)format + btrunc        ::format + ::trunc
-vsprintf          bvformata                       bvformata
-
-vsnprintf         bvformata + btrunc              bvformata + btrunc
-vfprintf          bvformata + fputs               use bvformata + fputs
-strcmp            biseq, bstrcmp                  comparison operators.
-strncmp           bstrncmp, memcmp                bstrncmp, memcmp
-strlen            ->slen, blength                 ::length
-strdup            bstrcpy                         constructor
-strset            bpattern                        ::fill
-strstr            binstr                          ::find
-strpbrk           binchr                          ::findchr
-stricmp           bstricmp                        cast & use bstricmp
-strlwr            btolower                        cast & use btolower
-strupr            btoupper                        cast & use btoupper
-strrev            bReverse (aux module)           cast & use bReverse
-strchr            bstrchr                         cast & use bstrchr
-strspnp           use strspn                      use strspn
-ungetc            bsunread                        bsunread
-
-The top 9 C functions listed here are troublesome in that they impose memory 
-management in the calling function.  The Bstring and CBstring interfaces have
-built-in memory management, so there is far less code with far less potential 
-for buffer overrun problems.  strtok can only be reliably called as a "leaf" 
-calculation, since it (quite bizarrely) maintains hidden internal state.  And
-gets is well known to be broken no matter what.  The Bstrlib alternatives do
-not suffer from those sorts of problems.
-
-The substitute for strncat can be performed with higher performance by using 
-the blk2tbstr macro to create a presized second operand for bconcat.
-
-C-library         Bstring alternative             CBString alternative
----------         -------------------             --------------------
-strspn            strspn acceptable               strspn acceptable
-strcspn           strcspn acceptable              strcspn acceptable
-strnset           strnset acceptable              strnset acceptable
-printf            printf acceptable               printf acceptable
-puts              puts acceptable                 puts acceptable
-fprintf           fprintf acceptable              fprintf acceptable
-fputs             fputs acceptable                fputs acceptable
-memcmp            memcmp acceptable               memcmp acceptable
-
-Remember that Bstring (and CBstring) functions will automatically append the
-'\0' character to the character data buffer.  So by simply accessing the data
-buffer directly, ordinary C string library functions can be called directly 
-on them.  Note that bstrcmp is not the same as memcmp in exactly the same way
-that strcmp is not the same as memcmp.
-
-C-library         Bstring alternative             CBString alternative
----------         -------------------             --------------------
-fread             balloc + fread                  ::alloc + fread
-fgets             balloc + fgets                  ::alloc + fgets
-
-These are odd ones because of the exact sizing of the buffer required.  The 
-Bstring and CBString alternatives requires that the buffers are forced to 
-hold at least the prescribed length, then just use fread or fgets directly.  
-However, typically the automatic memory management of Bstring and CBstring 
-will make the typical use of fgets and fread to read specifically sized 
-strings unnecessary.
-
-Implementation Choices
-----------------------
-
-Overhead:
-.........
-
-The bstring library has more overhead versus straight char buffers for most
-functions.  This overhead is essentially just the memory management and 
-string header allocation.  This overhead usually only shows up for small 
-string manipulations.  The performance loss has to be considered in
-light of the following:
-
-1) What would be the performance loss of trying to write this management
-   code in one's own application?
-2) Since the bstring library source code is given, a sufficiently powerful 
-   modern inlining globally optimizing compiler can remove function call 
-   overhead.
-
-Since the data type is exposed, a developer can replace any unsatisfactory
-function with their own inline implementation.  And that is besides the main 
-point of what the better string library is mainly meant to provide.  Any 
-overhead lost has to be compared against the value of the safe abstraction 
-for coupling memory management and string functionality.
-
-Performance of the C interface:
-...............................
-
-The algorithms used have performance advantages versus the analogous C 
-library functions.  For example:
-
-1. bfromcstr/blk2str/bstrcpy versus strcpy/strdup.  By using memmove instead 
-   of strcpy, the break condition of the copy loop is based on an independent 
-   counter (that should be allocated in a register) rather than having to 
-   check the results of the load.  Modern out-of-order executing CPUs can 
-   parallelize the final branch mis-predict penality with the loading of the 
-   source string.  Some CPUs will also tend to have better built-in hardware 
-   support for counted memory moves than load-compare-store.  (This is a 
-   minor, but non-zero gain.)
-2. biseq versus strcmp.  If the strings are unequal in length, bsiseq will
-   return in O(1) time.  If the strings are aliased, or have aliased data
-   buffers, biseq will return in O(1) time.  strcmp will always be O(k), 
-   where k is the length of the common prefix or the whole string if they are 
-   identical.
-3. ->slen versus strlen.  ->slen is obviously always O(1), while strlen is
-   always O(n) where n is the length of the string.
-4. bconcat versus strcat.  Both rely on precomputing the length of the 
-   destination string argument, which will favor the bstring library.  On 
-   iterated concatenations the performance difference can be enormous.
-5. bsreadln versus fgets.  The bsreadln function reads large blocks at a time
-   from the given stream, then parses out lines from the buffers directly.
-   Some C libraries will implement fgets as a loop over single fgetc calls.
-   Testing indicates that the bsreadln approach can be several times faster
-   for fast stream devices (such as a file that has been entirely cached.)
-6. bsplits/bsplitscb versus strspn.  Accelerators for the set of match 
-   characters are generated only once.
-7. binstr versus strstr.  The binstr implementation unrolls the loops to
-   help reduce loop overhead.  This will matter if the target string is 
-   long and source string is not found very early in the target string.
-   With strstr, while it is possible to unroll the source contents, it is
-   not possible to do so with the destination contents in a way that is
-   effective because every destination character must be tested against
-   '\0' before proceeding to the next character.
-8. bReverse versus strrev.  The C function must find the end of the string
-   first before swaping character pairs.
-9. bstrrchr versus no comparable C function.  Its not hard to write some C
-   code to search for a character from the end going backwards.  But there
-   is no way to do this without computing the length of the string with
-   strlen.
-
-Practical testing indicates that in general Bstrlib is never signifcantly 
-slower than the C library for common operations, while very often having a
-performance advantage that ranges from significant to massive.  Even for 
-functions like b(n)inchr versus str(c)spn() (where, in theory, there is no 
-advantage for the Bstrlib architecture) the performance of Bstrlib is vastly 
-superior to most tested C library implementations.
-
-Some of Bstrlib's extra functionality also lead to inevitable performance
-advantages over typical C solutions.  For example, using the blk2tbstr macro,
-one can (in O(1) time) generate an internal substring by reference while not 
-disturbing the original string.  If disturbing the original string is not an
-option, typically, a comparable char * solution would have to make a copy of 
-the substring to provide similar functionality.  Another example is reverse 
-character set scanning -- the str(c)spn functions only scan in a forward 
-direction which can complicate some parsing algorithms.
-
-Where high performance char * based algorithms are available, Bstrlib can 
-still leverage them by accessing the ->data field on bstrings.  So 
-realistically Bstrlib can never be significantly slower than any standard
-'\0' terminated char * based solutions.
-
-Performance of the C++ interface:
-.................................
-
-The C++ interface has been designed with an emphasis on abstraction and safety
-first.  However, since it is substantially a wrapper for the C bstring 
-functions, for longer strings the performance comments described in the 
-"Performance of the C interface" section above still apply. Note that the 
-(CBString *) type can be directly cast to a (bstring) type, and passed as 
-parameters to the C functions (though a CBString must never be passed to 
-bdestroy.)
-
-Probably the most controversial choice is performing full bounds checking on
-the [] operator.  This decision was made because 1) the fast alternative of
-not bounds checking is still available by first casting the CBString to a 
-(const char *) buffer or to a (struct tagbstring) then derefencing .data and 
-2) because the lack of bounds checking is seen as one of the main weaknesses 
-of C/C++ versus other languages.  This check being done on every access leads 
-to individual character extraction being actually slower than other languages 
-in this one respect (other language's compilers will normally dedicate more 
-resources on hoisting or removing bounds checking as necessary) but otherwise 
-bring C++ up to the level of other languages in terms of functionality.
-
-It is common for other C++ libraries to leverage the abstractions provided by
-C++ to use reference counting and "copy on write" policies.  While these 
-techniques can speed up some scenarios, they impose a problem with respect to
-thread safety.  bstrings and CBStrings can be properly protected with 
-"per-object" mutexes, meaning that two bstrlib calls can be made and execute
-simultaneously, so long as the bstrings and CBstrings are distinct.  With a
-reference count and alias before copy on write policy, global mutexes are 
-required that prevent multiple calls to the strings library to execute 
-simultaneously regardless of whether or not the strings represent the same
-string.
-
-One interesting trade off in CBString is that the default constructor is not 
-trivial.  I.e., it always prepares a ready to use memory buffer.  The purpose 
-is to ensure that there is a uniform internal composition for any functioning 
-CBString that is compatible with bstrings.  It also means that the other 
-methods in the class are not forced to perform "late initialization" checks. 
-In the end it means that construction of CBStrings are slower than other 
-comparable C++ string classes.  Initial testing, however, indicates that 
-CBString outperforms std::string and MFC's CString, for example, in all other 
-operations.  So to work around this weakness it is recommended that CBString 
-declarations be pushed outside of inner loops.
-
-Practical testing indicates that with the exception of the caveats given 
-above (constructors and safe index character manipulations) the C++ API for
-Bstrlib generally outperforms popular standard C++ string classes.  Amongst 
-the standard libraries and compilers, the quality of concatenation operations 
-varies wildly and very little care has gone into search functions.  Bstrlib
-dominates those performance benchmarks.
-
-Memory management:
-..................
-
-The bstring functions which write and modify bstrings will automatically 
-reallocate the backing memory for the char buffer whenever it is required to 
-grow.  The algorithm for resizing chosen is to snap up to sizes that are a 
-power of two which are sufficient to hold the intended new size.  Memory 
-reallocation is not performed when the required size of the buffer is 
-decreased.  This behavior can be relied on, and is necessary to make the 
-behaviour of balloc deterministic.  This trades off additional memory usage 
-for decreasing the frequency for required reallocations:
-
-1. For any bstring whose size never exceeds n, its buffer is not ever 
-   reallocated more than log_2(n) times for its lifetime.
-2. For any bstring whose size never exceeds n, its buffer is never more than
-   2*(n+1) in length.  (The extra characters beyond 2*n are to allow for the 
-   implicit '\0' which is always added by the bstring modifying functions.)
-
-Decreasing the buffer size when the string decreases in size would violate 1) 
-above and in real world case lead to pathological heap thrashing.  Similarly, 
-allocating more tightly than "least power of 2 greater than necessary" would 
-lead to a violation of 1) and have the same potential for heap thrashing.
-
-Property 2) needs emphasizing.  Although the memory allocated is always a 
-power of 2, for a bstring that grows linearly in size, its buffer memory also 
-grows linearly, not exponentially.  The reason is that the amount of extra 
-space increases with each reallocation, which decreases the frequency of 
-future reallocations.
-
-Obviously, given that bstring writing functions may reallocate the data 
-buffer backing the target bstring, one should not attempt to cache the data 
-buffer address and use it after such bstring functions have been called.  
-This includes making reference struct tagbstrings which alias to a writable 
-bstring.
-
-balloc or bfromcstralloc can be used to preallocate the minimum amount of 
-space used for a given bstring.  This will reduce even further the number of 
-times the data portion is reallocated.  If the length of the string is never 
-more than one less than the memory length then there will be no further 
-reallocations.
-
-Note that invoking the bwriteallow macro may increase the number of reallocs 
-by one more than necessary for every call to bwriteallow interleaved with any 
-bstring API which writes to this bstring.
-
-The library does not use any mechanism for automatic clean up for the C API.
-Thus explicit clean up via calls to bdestroy() are required to avoid memory
-leaks.
-
-Constant and static tagbstrings:
-................................
-
-A struct tagbstring can be write protected from any bstrlib function using 
-the bwriteprotect macro.  A write protected struct tagbstring can then be 
-reset to being writable via the bwriteallow macro.  There is, of course, no 
-protection from attempts to directly access the bstring members.  Modifying a 
-bstring which is write protected by direct access has undefined behavior.
-
-static struct tagbstrings can be declared via the bsStatic macro.  They are
-considered permanently unwritable.  Such struct tagbstrings's are declared 
-such that attempts to write to it are not well defined.  Invoking either 
-bwriteallow or bwriteprotect on static struct tagbstrings has no effect.  
-
-struct tagbstring's initialized via btfromcstr or blk2tbstr are protected by 
-default but can be made writeable via the bwriteallow macro.  If bwriteallow 
-is called on such struct tagbstring's, it is the programmer's responsibility 
-to ensure that:
-
-1) the buffer supplied was allocated from the heap.
-2) bdestroy is not called on this tagbstring (unless the header itself has
-   also been allocated from the heap.)
-3) free is called on the buffer to reclaim its memory.
-
-bwriteallow and bwriteprotect can be invoked on ordinary bstrings (they have 
-to be dereferenced with the (*) operator to get the levels of indirection 
-correct) to give them write protection.
-
-Buffer declaration:
-...................
-
-The memory buffer is actually declared "unsigned char *" instead of "char *".
-The reason for this is to trigger compiler warnings whenever uncasted char
-buffers are assigned to the data portion of a bstring.  This will draw more
-diligent programmers into taking a second look at the code where they 
-have carelessly left off the typically required cast.  (Research from 
-AT&T/Lucent indicates that additional programmer eyeballs is one of the most 
-effective mechanisms at ferreting out bugs.)
-
-Function pointers:
-..................
-
-The bgets, bread and bStream functions use function pointers to obtain 
-strings from data streams.  The function pointer declarations have been 
-specifically chosen to be compatible with the fgetc and fread functions. 
-While this may seem to be a convoluted way of implementing fgets and fread 
-style functionality, it has been specifically designed this way to ensure 
-that there is no dependency on a single narrowly defined set of device 
-interfaces, such as just stream I/O.  In the embedded world, its quite 
-possible to have environments where such interfaces may not exist in the 
-standard C library form.  Furthermore, the generalization that this opens up 
-allows for more sophisticated uses for these functions (performing an fgets 
-like function on a socket, for example.) By using function pointers, it also 
-allows such abstract stream interfaces to be created using the bstring library 
-itself while not creating a circular dependency.
-
-Use of int's for sizes:
-.......................
-
-This is just a recognition that 16bit platforms with requirements for strings
-that are larger than 64K and 32bit+ platforms with requirements for strings
-that are larger than 4GB are pretty marginal.  The main focus is for 32bit 
-platforms, and emerging 64bit platforms with reasonable < 4GB string 
-requirements.  Using ints allows for negative values which has meaning 
-internally to bstrlib.
-
-Semantic consideration:
-.......................
-
-Certain care needs to be taken when copying and aliasing bstrings.  A bstring
-is essentially a pointer type which points to a multipart abstract data
-structure.  Thus usage, and lifetime of bstrings have semantics that follow
-these considerations.  For example:
-
-    bstring a, b;
-    struct tagbstring t;
-
-    a = bfromcstr("Hello"); /* Create new bstring and copy "Hello" into it. */
-    b = a;                  /* Alias b to the contents of a.                */
-    t = *a;                 /* Create a current instance pseudo-alias of a. */
-    bconcat (a, b);         /* Double a and b, t is now undefined.          */
-    bdestroy (a);           /* Destroy the contents of both a and b.        */
-
-Variables of type bstring are really just references that point to real 
-bstring objects.  The equal operator (=) creates aliases, and the asterisk 
-dereference operator (*) creates a kind of alias to the current instance (which
-is generally not useful for any purpose.)  Using bstrcpy() is the correct way 
-of creating duplicate instances.  The ampersand operator (&) is useful for 
-creating aliases to struct tagbstrings (remembering that constructed struct 
-tagbstrings are not writable by default.)
-
-CBStrings use complete copy semantics for the equal operator (=), and thus do 
-not have these sorts of issues.  
-
-Debugging:
-..........
-
-Bstrings have a simple, exposed definition and construction, and the library 
-itself is open source.  So most debugging is going to be fairly straight- 
-forward.  But the memory for bstrings come from the heap, which can often be
-corrupted indirectly, and it might not be obvious what has happened even from
-direct examination of the contents in a debugger or a core dump.  There are
-some tools such as Purify, Insure++ and Electric Fence which can help solve
-such problems, however another common approach is to directly instrument the
-calls to malloc, realloc, calloc, free, memcpy, memmove and/or other calls
-by overriding them with macro definitions.
-
-Although the user could hack on the Bstrlib sources directly as necessary to 
-perform such an instrumentation, Bstrlib comes with a built-in mechanism for 
-doing this.  By defining the macro BSTRLIB_MEMORY_DEBUG and providing an 
-include file named memdbg.h this will force the core Bstrlib modules to 
-attempt to include this file.  In such a file, macros could be defined which 
-overrides Bstrlib's useage of the C standard library.
-
-Rather than calling malloc, realloc, free, memcpy or memmove directly, Bstrlib
-emits the macros bstr__alloc, bstr__realloc, bstr__free, bstr__memcpy and 
-bstr__memmove in their place respectively.  By default these macros are simply
-assigned to be equivalent to their corresponding C standard library function
-call.  However, if they are given earlier macro definitions (via the back 
-door include file) they will not be given their default definition.  In this
-way Bstrlib's interface to the standard library can be changed but without
-having to directly redefine or link standard library symbols (both of which 
-are not strictly ANSI C compliant.)
-
-An example definition might include:
-
-    #define bstr__alloc(sz) X_malloc ((sz), __LINE__, __FILE__)
-
-which might help contextualize heap entries in a debugging environment.
-
-The NULL parameter and sanity checking of bstrings is part of the Bstrlib 
-API, and thus Bstrlib itself does not present any different modes which would 
-correspond to "Debug" or "Release" modes.  Bstrlib always contains mechanisms
-which one might think of as debugging features, but retains the performance
-and small memory footprint one would normally associate with release mode
-code.
-
-Integration Microsoft's Visual Studio debugger:
-...............................................
-
-Microsoft's Visual Studio debugger has a capability of customizable mouse 
-float over data type descriptions.  This is accomplished by editting the
-AUTOEXP.DAT file to include the following:
-
-    ; new for CBString
-    tagbstring =slen=<slen> mlen=<mlen> <data,st>
-    Bstrlib::CBStringList =count=<size()>
-
-In Visual C++ 6.0 this file is located in the directory:
-
-    C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin
-
-and in Visual Studio .NET 2003 its located here:
-
-    C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Packages\Debugger
-
-This will improve the ability of debugging with Bstrlib under Visual Studio.
-
-Security
---------
-
-Bstrlib does not come with explicit security features outside of its fairly
-comprehensive error detection, coupled with its strict semantic support.  
-That is to say that certain common security problems, such as buffer overrun,
-constant overwrite, arbitrary truncation etc, are far less likely to happen 
-inadvertently.  Where it does help, Bstrlib maximizes its advantage by 
-providing developers a simple adoption path that lets them leave less secure
-string mechanisms behind.  The library will not leave developers wanting, so 
-they will be less likely to add new code using a less secure string library 
-to add functionality that might be missing from Bstrlib.
-
-That said there are a number of security ideas not addressed by Bstrlib:
-
-1. Race condition exploitation (i.e., verifying a string's contents, then 
-raising the privilege level and execute it as a shell command as two 
-non-atomic steps) is well beyond the scope of what Bstrlib can provide.  It 
-should be noted that MFC's built-in string mutex actually does not solve this 
-problem either -- it just removes immediate data corruption as a possible 
-outcome of such exploit attempts (it can be argued that this is worse, since 
-it will leave no trace of the exploitation).  In general race conditions have 
-to be dealt with by careful design and implementation; it cannot be assisted 
-by a string library.
-
-2. Any kind of access control or security attributes to prevent usage in 
-dangerous interfaces such as system().  Perl includes a "trust" attribute 
-which can be endowed upon strings that are intended to be passed to such 
-dangerous interfaces.  However, Perl's solution reflects its own limitations 
--- notably that it is not a strongly typed language.  In the example code for 
-Bstrlib, there is a module called taint.cpp.  It demonstrates how to write a 
-simple wrapper class for managing "untainted" or trusted strings using the 
-type system to prevent questionable mixing of ordinary untrusted strings with 
-untainted ones then passing them to dangerous interfaces.  In this way the 
-security correctness of the code reduces to auditing the direct usages of 
-dangerous interfaces or promotions of tainted strings to untainted ones.
-
-3. Encryption of string contents is way beyond the scope of Bstrlib.  
-Maintaining encrypted string contents in the futile hopes of thwarting things 
-like using system-level debuggers to examine sensitive string data is likely 
-to be a wasted effort (imagine a debugger that runs at a higher level than a 
-virtual processor where the application runs).  For more standard encryption 
-usages, since the bstring contents are simply binary blocks of data, this 
-should pose no problem for usage with other standard encryption libraries.
-
-Compatibility
--------------
-
-The Better String Library is known to compile and function correctly with the 
-following compilers:
-
-  - Microsoft Visual C++
-  - Watcom C/C++
-  - Intel's C/C++ compiler (Windows)
-  - The GNU C/C++ compiler (cygwin and Linux on PPC64)
-  - Borland C
-  - Turbo C
-
-Setting of configuration options should be unnecessary for these compilers
-(unless exceptions are being disabled or STLport has been added to WATCOM 
-C/C++).  Bstrlib has been developed with an emphasis on portability.  As such 
-porting it to other compilers should be straight forward.  This package 
-includes a porting guide (called porting.txt) which explains what issues may 
-exist for porting Bstrlib to different compilers and environments.
-
-ANSI issues
------------
-
-1. The function pointer types bNgetc and bNread have prototypes which are very
-similar to, but not exactly the same as fgetc and fread respectively.  
-Basically the FILE * parameter is replaced by void *.  The purpose of this
-was to allow one to create other functions with fgetc and fread like 
-semantics without being tied to ANSI C's file streaming mechanism.  I.e., one 
-could very easily adapt it to sockets, or simply reading a block of memory, 
-or procedurally generated strings (for fractal generation, for example.)
-
-The problem is that invoking the functions (bNgetc)fgetc and (bNread)fread is 
-not technically legal in ANSI C.  The reason being that the compiler is only 
-able to coerce the function pointers themselves into the target type, however 
-are unable to perform any cast (implicit or otherwise) on the parameters 
-passed once invoked.  I.e., if internally void * and FILE * need some kind of 
-mechanical coercion, the compiler will not properly perform this conversion 
-and thus lead to undefined behavior.
-
-Apparently a platform from Data General called "Eclipse" and another from 
-Tandem called "NonStop" have a different representation for pointers to bytes 
-and pointers to words, for example, where coercion via casting is necessary.  
-(Actual confirmation of the existence of such machines is hard to come by, so
-it is prudent to be skeptical about this information.)  However, this is not 
-an issue for any known contemporary platforms.  One may conclude that such 
-platforms are effectively apocryphal even if they do exist.
-
-To correctly work around this problem to the satisfaction of the ANSI 
-limitations, one needs to create wrapper functions for fgets and/or 
-fread with the prototypes of bNgetc and/or bNread respectively which performs 
-no other action other than to explicitely cast the void * parameter to a
-FILE *, and simply pass the remaining parameters straight to the function 
-pointer call.
-
-The wrappers themselves are trivial:
-
-    size_t freadWrap (void * buff, size_t esz, size_t eqty, void * parm) {
-        return fread (buff, esz, eqty, (FILE *) parm);
-    }
-
-    int fgetcWrap (void * parm) {
-        return fgetc ((FILE *) parm);
-    }
-
-These have not been supplied in bstrlib or bstraux to prevent unnecessary
-linking with file I/O functions.
-
-2. vsnprintf is not available on all compilers.  Because of this, the bformat
-and bformata functions (and format and formata methods) are not guaranteed to 
-work properly.  For those compilers that don't have vsnprintf, the 
-BSTRLIB_NOVSNP macro should be set before compiling bstrlib, and the format 
-functions/method will be disabled.
-
-The more recent ANSI C standards have specified the required inclusion of a 
-vsnprintf function.
-
-3. The bstrlib function names are not unique in the first 6 characters.  This
-is only an issue for older C compiler environments which do not store more 
-than 6 characters for function names.
-
-4. The bsafe module defines macros and function names which are part of the
-C library.  This simply overrides the definition as expected on all platforms
-tested, however it is not sanctioned by the ANSI standard.  This module is 
-clearly optional and should be omitted on platforms which disallow its 
-undefined semantics.
-
-In practice the real issue is that some compilers in some modes of operation 
-can/will inline these standard library functions on a module by module basis 
-as they appear in each.  The linker will thus have no opportunity to override
-the implementation of these functions for those cases.  This can lead to 
-inconsistent behaviour of the bsafe module on different platforms and 
-compilers.
-
-===============================================================================
-
-Comparison with Microsoft's CString class
------------------------------------------
-
-Although developed independently, CBStrings have very similar functionality to 
-Microsoft's CString class.  However, the bstring library has significant 
-advantages over CString:
-
-1. Bstrlib is a C-library as well as a C++ library (using the C++ wrapper).
-
-    - Thus it is compatible with more programming environments and 
-      available to a wider population of programmers.
-
-2. The internal structure of a bstring is considered exposed.
-
-    - A single contiguous block of data can be cut into read-only pieces by 
-      simply creating headers, without allocating additional memory to create 
-      reference copies of each of these sub-strings.
-    - In this way, using bstrings in a totally abstracted way becomes a choice
-      rather than an imposition.  Further this choice can be made differently
-      at different layers of applications that use it.
-
-3. Static declaration support precludes the need for constructor 
-   invocation.
-
-    - Allows for static declarations of constant strings that has no 
-      additional constructor overhead.
-
-4. Bstrlib is not attached to another library.
-
-    - Bstrlib is designed to be easily plugged into any other library 
-      collection, without dependencies on other libraries or paradigms (such 
-      as "MFC".)
-
-The bstring library also comes with a few additional functions that are not 
-available in the CString class:
-
-    - bsetstr
-    - bsplit
-    - bread
-    - breplace (this is different from CString::Replace())
-    - Writable indexed characters (for example a[i]='x')
-
-Interestingly, although Microsoft did implement mid$(), left$() and right$() 
-functional analogues (these are functions from GWBASIC) they seem to have
-forgotten that mid$() could be also used to write into the middle of a string.  
-This functionality exists in Bstrlib with the bsetstr() and breplace() 
-functions.
-
-Among the disadvantages of Bstrlib is that there is no special support for 
-localization or wide characters.  Such things are considered beyond the scope 
-of what bstrings are trying to deliver.  CString essentially supports the 
-older UCS-2 version of Unicode via widechar_t as an application-wide compile 
-time switch.
-
-CString's also use built-in mechanisms for ensuring thread safety under all
-situations.  While this makes writing thread safe code that much easier, this
-built-in safety feature has a price -- the inner loops of each CString method
-runs in its own critical section (grabbing and releasing a light weight mutex
-on every operation.)  The usual way to decrease the impact of a critical 
-section performance penalty is to amortize more operations per critical 
-section.  But since the implementation of CStrings is fixed as a one critical 
-section per-operation cost, there is no way to leverage this common 
-performance enhancing idea.
-
-The search facilities in Bstrlib are comparable to those in MFC's CString 
-class, though it is missing locale specific collation.  But because Bstrlib 
-is interoperable with C's char buffers, it will allow programmers to write 
-their own string searching mechanism (such as Boyer-Moore), or be able to 
-choose from a variety of available existing string searching libraries (such 
-as those for regular expressions) without difficulty.
-
-Microsoft used a very non-ANSI conforming trick in its implementation to
-allow printf() to use the "%s" specifier to output a CString correctly.  This
-can be convenient, but it is inherently not portable.  CBString requires an
-explicit cast, while bstring requires the data member to be dereferenced.  
-Microsoft's own documentation recommends casting, instead of relying on this
-feature.
-
-Comparison with C++'s std::string
----------------------------------
-
-This is the C++ language's standard STL based string class.
-
-1. There is no C implementation.
-2. The [] operator is not bounds checked.
-3. Missing a lot of useful functions like printf-like formatting.
-4. Some sub-standard std::string implementations (SGI) are necessarily unsafe 
-   to use with multithreading.
-5. Limited by STL's std::iostream which in turn is limited by ifstream which
-   can only take input from files.  (Compare to CBStream's API which can take
-   abstracted input.)
-6. Extremely uneven performance across implementations.
-
-Comparison with ISO C TR 24731 proposal
----------------------------------------
-
-Following the ISO C99 standard, Microsoft has proposed a group of C library 
-extensions which are supposedly "safer and more secure".  This proposal is
-expected to be adopted by the ISO C standard which follows C99.
-
-The proposal reveals itself to be very similar to Microsoft's "StrSafe" 
-library. The functions are basically the same as other standard C library 
-string functions except that destination parameters are paired with an 
-additional length parameter of type rsize_t.  rsize_t is the same as size_t, 
-however, the range is checked to make sure its between 1 and RSIZE_MAX.  Like 
-Bstrlib, the functions perform a "parameter check".  Unlike Bstrlib, when a 
-parameter check fails, rather than simply outputing accumulatable error 
-statuses, they call a user settable global error function handler, and upon 
-return of control performs no (additional) detrimental action.  The proposal 
-covers basic string functions as well as a few non-reenterable functions 
-(asctime, ctime, and strtok).
-
-1. Still based solely on char * buffers (and therefore strlen() and strcat()
-   is still O(n), and there are no faster streq() comparison functions.)
-2. No growable string semantics.
-3. Requires manual buffer length synchronization in the source code.
-4. No attempt to enhance functionality of the C library.
-5. Introduces a new error scenario (strings exceeding RSIZE_MAX length).
-
-The hope is that by exposing the buffer length requirements there will be 
-fewer buffer overrun errors.  However, the error modes are really just 
-transformed, rather than removed.  The real problem of buffer overflows is 
-that they all happen as a result of erroneous programming.  So forcing 
-programmers to manually deal with buffer limits, will make them more aware of 
-the problem but doesn't remove the possibility of erroneous programming.  So
-a programmer that erroneously mixes up the rsize_t parameters is no better off
-from a programmer that introduces potential buffer overflows through other 
-more typical lapses.  So at best this may reduce the rate of erroneous 
-programming, rather than making any attempt at removing failure modes.
-
-The error handler can discriminate between types of failures, but does not 
-take into account any callsite context.  So the problem is that the error is 
-going to be manifest in a piece of code, but there is no pointer to that 
-code.  It would seem that passing in the call site __FILE__, __LINE__ as 
-parameters would be very useful, but the API clearly doesn't support such a 
-thing (it would increase code bloat even more than the extra length 
-parameter does, and would require macro tricks to implement).
-
-The Bstrlib C API takes the position that error handling needs to be done at 
-the callsite, and just tries to make it as painless as possible.  Furthermore, 
-error modes are removed by supporting auto-growing strings and aliasing.  For 
-capturing errors in more central code fragments, Bstrlib's C++ API uses 
-exception handling extensively, which is superior to the leaf-only error 
-handler approach.
-
-Comparison with Managed String Library CERT proposal
-----------------------------------------------------
-
-The main webpage for the managed string library:
-http://www.cert.org/secure-coding/managedstring.html
-
-Robert Seacord at CERT has proposed a C string library that he calls the 
-"Managed String Library" for C. Like Bstrlib, it introduces a new type 
-which is called a managed string. The structure of a managed string 
-(string_m) is like a struct tagbstring but missing the length field.  This 
-internal structure is considered opaque. The length is, like the C standard 
-library, always computed on the fly by searching for a terminating NUL on 
-every operation that requires it. So it suffers from every performance 
-problem that the C standard library suffers from. Interoperating with C 
-string APIs (like printf, fopen, or anything else that takes a string 
-parameter) requires copying to additionally allocating buffers that have to 
-be manually freed -- this makes this library probably slower and more 
-cumbersome than any other string library in existence.
-
-The library gives a fully populated error status as the return value of every
-string function.  The hope is to be able to diagnose all problems 
-specifically from the return code alone.  Comparing this to Bstrlib, which 
-aways returns one consistent error message, might make it seem that Bstrlib 
-would be harder to debug; but this is not true.  With Bstrlib, if an error 
-occurs there is always enough information from just knowing there was an error
-and examining the parameters to deduce exactly what kind of error has 
-happened.  The managed string library thus gives up nested function calls 
-while achieving little benefit, while Bstrlib does not.
-
-One interesting feature that "managed strings" has is the idea of data 
-sanitization via character set whitelisting.  That is to say, a globally
-definable filter that makes any attempt to put invalid characters into strings 
-lead to an error and not modify the string.  The author gives the following 
-example:
-
-    // create valid char set
-    if (retValue = strcreate_m(&str1, "abc") ) {
-      fprintf(
-        stderr, 
-        "Error %d from strcreate_m.\n", 
-        retValue
-      );
-    }  
-    if (retValue = setcharset(str1)) {
-      fprintf(
-        stderr, 
-        "Error %d from  setcharset().\n", 
-        retValue
-      );
-    }
-    if (retValue = strcreate_m(&str1, "aabbccabc")) {
-      fprintf(
-        stderr, 
-        "Error %d from strcreate_m.\n", 
-        retValue
-      );
-    }
-    // create string with invalid char set
-    if (retValue = strcreate_m(&str1, "abbccdabc")) {
-      fprintf(
-        stderr, 
-        "Error %d from strcreate_m.\n", 
-        retValue
-      );
-    } 
-
-Which we can compare with a more Bstrlib way of doing things:
-
-    bstring bCreateWithFilter (const char * cstr, const_bstring filter) {
-      bstring b = bfromcstr (cstr);
-      if (BSTR_ERR != bninchr (b, filter) && NULL != b) {
-        fprintf (stderr, "Filter violation.\n");
-        bdestroy (b);
-        b = NULL;
-      }
-      return b;
-    }
-
-    struct tagbstring charFilter = bsStatic ("abc");
-    bstring str1 = bCreateWithFilter ("aabbccabc", &charFilter);
-    bstring str2 = bCreateWithFilter ("aabbccdabc", &charFilter);
-
-The first thing we should notice is that with the Bstrlib approach you can 
-have different filters for different strings if necessary.  Furthermore, 
-selecting a charset filter in the Managed String Library is uni-contextual. 
-That is to say, there can only be one such filter active for the entire 
-program, which means its usage is not well defined for intermediate library 
-usage (a library that uses it will interfere with user code that uses it, and 
-vice versa.)  It is also likely to be poorly defined in multi-threading 
-environments.
-
-There is also a question as to whether the data sanitization filter is checked
-on every operation, or just on creation operations.  Since the charset can be
-set arbitrarily at run time, it might be set *after* some managed strings have
-been created.  This would seem to imply that all functions should run this
-additional check every time if there is an attempt to enforce this.  This 
-would make things tremendously slow.  On the other hand, if it is assumed that
-only creates and other operations that take char *'s as input need be checked 
-because the charset was only supposed to be called once at and before any 
-other managed string was created, then one can see that its easy to cover 
-Bstrlib with equivalent functionality via a few wrapper calls such as the 
-example given above.
-
-And finally we have to question the value of sanitation in the first place.
-For example, for httpd servers, there is generally a requirement that the
-URLs parsed have some form that avoids undesirable translation to local file 
-system filenames or resources.  The problem is that the way URLs can be 
-encoded, it must be completely parsed and translated to know if it is using 
-certain invalid character combinations.  That is to say, merely filtering
-each character one at a time is not necessarily the right way to ensure that
-a string has safe contents.
-
-In the article that describes this proposal, it is claimed that it fairly 
-closely approximates the existing C API semantics.  On this point we should 
-compare this "closeness" with Bstrlib:
-
-                      Bstrlib                     Managed String Library
-                      -------                     ----------------------
-
-Pointer arithmetic    Segment arithmetic          N/A
-
-Use in C Std lib      ->data, or bdata{e}         getstr_m(x,*) ... free(x)
-
-String literals       bsStatic, bsStaticBlk       strcreate_m()
-
-Transparency          Complete                    None
-
-Its pretty clear that the semantic mapping from C strings to Bstrlib is fairly 
-straightforward, and that in general semantic capabilities are the same or
-superior in Bstrlib.  On the other hand the Managed String Library is either
-missing semantics or changes things fairly significantly.
-
-Comparison with Annexia's c2lib library
----------------------------------------
-
-This library is available at:
-http://www.annexia.org/freeware/c2lib
-
-1. Still based solely on char * buffers (and therefore strlen() and strcat()
-   is still O(n), and there are no faster streq() comparison functions.)
-   Their suggestion that alternatives which wrap the string data type (such as 
-   bstring does) imposes a difficulty in interoperating with the C langauge's
-   ordinary C string library is not founded.
-2. Introduction of memory (and vector?) abstractions imposes a learning
-   curve, and some kind of memory usage policy that is outside of the strings
-   themselves (and therefore must be maintained by the developer.)
-3. The API is massive, and filled with all sorts of trivial (pjoin) and
-   controvertial (pmatch -- regular expression are not sufficiently 
-   standardized, and there is a very large difference in performance between
-   compiled and non-compiled, REs) functions.  Bstrlib takes a decidely 
-   minimal approach -- none of the functionality in c2lib is difficult or
-   challenging to implement on top of Bstrlib (except the regex stuff, which
-   is going to be difficult, and controvertial no matter what.)
-4. Understanding why c2lib is the way it is pretty much requires a working 
-   knowledge of Perl.  bstrlib requires only knowledge of the C string library
-   while providing just a very select few worthwhile extras.
-5. It is attached to a lot of cruft like a matrix math library (that doesn't
-   include any functions for getting the determinant, eigenvectors, 
-   eigenvalues, the matrix inverse, test for singularity, test for 
-   orthogonality, a grahm schmit orthogonlization, LU decomposition ... I 
-   mean why bother?)
-
-Convincing a development house to use c2lib is likely quite difficult.  It
-introduces too much, while not being part of any kind of standards body.  The
-code must therefore be trusted, or maintained by those that use it.  While
-bstring offers nothing more on this front, since its so much smaller, covers 
-far less in terms of scope, and will typically improve string performance, 
-the barrier to usage should be much smaller.
-
-Comparison with stralloc/qmail
-------------------------------
-
-More information about this library can be found here:
-http://www.canonical.org/~kragen/stralloc.html or here:
-http://cr.yp.to/lib/stralloc.html
-
-1. Library is very very minimal.  A little too minimal.
-2. Untargetted source parameters are not declared const.
-3. Slightly different expected emphasis (like _cats function which takes an
-   ordinary C string char buffer as a parameter.)  Its clear that the 
-   remainder of the C string library is still required to perform more
-   useful string operations.
-
-The struct declaration for their string header is essentially the same as that
-for bstring.  But its clear that this was a quickly written hack whose goals
-are clearly a subset of what Bstrlib supplies.  For anyone who is served by
-stralloc, Bstrlib is complete substitute that just adds more functionality.
-
-stralloc actually uses the interesting policy that a NULL data pointer 
-indicates an empty string.  In this way, non-static empty strings can be
-declared without construction.  This advantage is minimal, since static empty
-bstrings can be declared inline without construction, and if the string needs
-to be written to it should be constructed from an empty string (or its first 
-initializer) in any event.
-
-wxString class
---------------
-
-This is the string class used in the wxWindows project.  A description of 
-wxString can be found here:
-http://www.wxwindows.org/manuals/2.4.2/wx368.htm#wxstring
-
-This C++ library is similar to CBString.  However, it is littered with 
-trivial functions (IsAscii, UpperCase, RemoveLast etc.)
-
-1. There is no C implementation.
-2. The memory management strategy is to allocate a bounded fixed amount of 
-   additional space on each resize, meaning that it does not have the 
-   log_2(n) property that Bstrlib has (it will thrash very easily, cause 
-   massive fragmentation in common heap implementations, and can easily be a 
-   common source of performance problems).
-3. The library uses a "copy on write" strategy, meaning that it has to deal 
-   with multithreading problems.
-
-Vstr
-----
-
-This is a highly orthogonal C string library with an emphasis on 
-networking/realtime programming.  It can be found here:
-http://www.and.org/vstr/
-
-1. The convoluted internal structure does not contain a '\0' char * compatible
-   buffer, so interoperability with the C library a non-starter.
-2. The API and implementation is very large (owing to its orthogonality) and
-   can lead to difficulty in understanding its exact functionality.
-3. An obvious dependency on gnu tools (confusing make configure step)
-4. Uses a reference counting system, meaning that it is not likely to be 
-   thread safe.
-
-The implementation has an extreme emphasis on performance for nontrivial 
-actions (adds, inserts and deletes are all constant or roughly O(#operations) 
-time) following the "zero copy" principle.  This trades off performance of 
-trivial functions (character access, char buffer access/coersion, alias 
-detection) which becomes significantly slower, as well as incremental 
-accumulative costs for its searching/parsing functions.  Whether or not Vstr 
-wins any particular performance benchmark will depend a lot on the benchmark, 
-but it should handily win on some, while losing dreadfully on others.
-
-The learning curve for Vstr is very steep, and it doesn't come with any 
-obvious way to build for Windows or other platforms without gnu tools.  At 
-least one mechanism (the iterator) introduces a new undefined scenario 
-(writing to a Vstr while iterating through it.)  Vstr has a very large 
-footprint, and is very ambitious in its total functionality.  Vstr has no C++ 
-API.
-
-Vstr usage requires context initialization via vstr_init() which must be run
-in a thread-local context.  Given the totally reference based architecture
-this means that sharing Vstrings across threads is not well defined, or at
-least not safe from race conditions.  This API is clearly geared to the older
-standard of fork() style multitasking in UNIX, and is not safely transportable
-to modern shared memory multithreading available in Linux and Windows.  There 
-is no portable external solution making the library thread safe (since it 
-requires a mutex around each Vstr context -- not each string.)
-
-In the documentation for this library, a big deal is made of its self hosted
-s(n)printf-like function.  This is an issue for older compilers that don't
-include vsnprintf(), but also an issue because Vstr has a slow conversion to
-'\0' terminated char * mechanism.  That is to say, using "%s" to format data 
-that originates from Vstr would be slow without some sort of native function 
-to do so.  Bstrlib sidesteps the issue by relying on what snprintf-like 
-functionality does exist and having a high performance conversion to a char * 
-compatible string so that "%s" can be used directly.
-
-Str Library
------------
-
-This is a fairly extensive string library, that includes full unicode support
-and targetted at the goal of out performing MFC and STL.  The architecture, 
-similarly to MFC's CStrings, is a copy on write reference counting mechanism.
-
-http://www.utilitycode.com/str/default.aspx
-
-1. Commercial.
-2. C++ only.
-
-This library, like Vstr, uses a ref counting system.  There is only so deeply
-I can analyze it, since I don't have a license for it.  However, performance 
-improvements over MFC's and STL, doesn't seem like a sufficient reason to 
-move your source base to it.  For example, in the future, Microsoft may 
-improve the performance CString.
-
-It should be pointed out that performance testing of Bstrlib has indicated 
-that its relative performance advantage versus MFC's CString and STL's 
-std::string is at least as high as that for the Str library.
-
-libmib astrings
----------------
-
-A handful of functional extensions to the C library that add dynamic string
-functionality.
-http://www.mibsoftware.com/libmib/astring/
-
-This package basically references strings through char ** pointers and assumes
-they are pointing to the top of an allocated heap entry (or NULL, in which 
-case memory will be newly allocated from the heap.)  So its still up to user
-to mix and match the older C string functions with these functions whenever
-pointer arithmetic is used (i.e., there is no leveraging of the type system
-to assert semantic differences between references and base strings as Bstrlib 
-does since no new types are introduced.)  Unlike Bstrlib, exact string length 
-meta data is not stored, thus requiring a strlen() call on *every* string 
-writing operation.  The library is very small, covering only a handful of C's
-functions.
-
-While this is better than nothing, it is clearly slower than even the 
-standard C library, less safe and less functional than Bstrlib.
-
-To explain the advantage of using libmib, their website shows an example of
-how dangerous C code:
-
-    char buf[256];
-    char *pszExtraPath = ";/usr/local/bin";
-
-    strcpy(buf,getenv("PATH")); /* oops! could overrun! */
-    strcat(buf,pszExtraPath); /* Could overrun as well! */
-
-    printf("Checking...%s\n",buf); /* Some printfs overrun too! */
-
-is avoided using libmib:
-
-    char *pasz = 0;      /* Must initialize to 0 */
-    char *paszOut = 0;
-    char *pszExtraPath = ";/usr/local/bin";
-
-    if (!astrcpy(&pasz,getenv("PATH"))) /* malloc error */ exit(-1);
-    if (!astrcat(&pasz,pszExtraPath)) /* malloc error */ exit(-1);
-	
-    /* Finally, a "limitless" printf! we can use */
-    asprintf(&paszOut,"Checking...%s\n",pasz);fputs(paszOut,stdout);
-
-    astrfree(&pasz); /* Can use free(pasz) also. */
-    astrfree(&paszOut);
-
-However, compare this to Bstrlib:
-
-    bstring b, out;
-
-    bcatcstr (b = bfromcstr (getenv ("PATH")), ";/usr/local/bin");
-    out = bformat ("Checking...%s\n", bdatae (b, "<Out of memory>"));
-    /* if (out && b) */ fputs (bdatae (out, "<Out of memory>"), stdout);
-    bdestroy (b);
-    bdestroy (out);
-
-Besides being shorter, we can see that error handling can be deferred right
-to the very end.  Also, unlike the above two versions, if getenv() returns 
-with NULL, the Bstrlib version will not exhibit undefined behavior. 
-Initialization starts with the relevant content rather than an extra 
-autoinitialization step.
-
-libclc
-------
-
-An attempt to add to the standard C library with a number of common useful
-functions, including additional string functions.
-http://libclc.sourceforge.net/
-
-1. Uses standard char * buffer, and adopts C 99's usage of "restrict" to pass
-   the responsibility to guard against aliasing to the programmer.
-2. Adds no safety or memory management whatsoever.
-3. Most of the supplied string functions are completely trivial.
-
-The goals of libclc and Bstrlib are clearly quite different.
-
-fireString
-----------
-
-http://firestuff.org/
-
-1. Uses standard char * buffer, and adopts C 99's usage of "restrict" to pass
-   the responsibility to guard against aliasing to the programmer.
-2. Mixes char * and length wrapped buffers (estr) functions, doubling the API
-   size, with safety limited to only half of the functions.
-
-Firestring was originally just a wrapper of char * functionality with extra
-length parameters.  However, it has been augmented with the inclusion of the 
-estr type which has similar functionality to stralloc.  But firestring does 
-not nearly cover the functional scope of Bstrlib.
-
-Safe C String Library
----------------------
-
-A library written for the purpose of increasing safety and power to C's string
-handling capabilities.
-http://www.zork.org/safestr/safestr.html
-
-1. While the safestr_* functions are safe in of themselves, interoperating 
-   with char * string has dangerous unsafe modes of operation.
-2. The architecture of safestr's causes the base pointer to change.  Thus,
-   its not practical/safe to store a safestr in multiple locations if any 
-   single instance can be manipulated.
-3. Dependent on an additional error handling library.
-4. Uses reference counting, meaning that it is either not thread safe or
-   slow and not portable.
-
-I think the idea of reallocating (and hence potentially changing) the base 
-pointer is a serious design flaw that is fatal to this architecture.  True 
-safety is obtained by having automatic handling of all common scenarios 
-without creating implicit constraints on the user.
-
-Because of its automatic temporary clean up system, it cannot use "const" 
-semantics on input arguments.  Interesting anomolies such as:
-
-    safestr_t s, t;
-    s = safestr_replace (t = SAFESTR_TEMP ("This is a test"),
-                         SAFESTR_TEMP (" "), SAFESTR_TEMP ("."));
-    /* t is now undefined. */
-
-are possible.  If one defines a function which takes a safestr_t as a 
-parameter, then the function would not know whether or not the safestr_t is 
-defined after it passes it to a safestr library function.  The author 
-recommended method for working around this problem is to examine the 
-attributes of the safestr_t within the function which is to modify any of
-its parameters and play games with its reference count.  I think, therefore,
-that the whole SAFESTR_TEMP idea is also fatally broken.
-
-The library implements immutability, optional non-resizability, and a "trust" 
-flag.  This trust flag is interesting, and suggests that applying any 
-arbitrary sequence of safestr_* function calls on any set of trusted strings 
-will result in a trusted string.  It seems to me, however, that if one wanted 
-to implement a trusted string semantic, one might do so by actually creating 
-a different *type* and only implement the subset of string functions that are 
-deemed safe (i.e., user input would be excluded, for example.)  This, in 
-essence, would allow the compiler to enforce trust propogation at compile 
-time rather than run time.  Non-resizability is also interesting, however, 
-it seems marginal (i.e., to want a string that cannot be resized, yet can be 
-modified and yet where a fixed sized buffer is undesirable.)
-
-===============================================================================
-
-Examples
---------
-
-    Dumping a line numbered file:
-
-    FILE * fp;
-    int i, ret;
-    struct bstrList * lines;
-    struct tagbstring prefix = bsStatic ("-> ");
-
-    if (NULL != (fp = fopen ("bstrlib.txt", "rb"))) {
-        bstring b = bread ((bNread) fread, fp);
-        fclose (fp);
-        if (NULL != (lines = bsplit (b, '\n'))) {
-            for (i=0; i < lines->qty; i++) {
-                binsert (lines->entry[i], 0, &prefix, '?');
-                printf ("%04d: %s\n", i, bdatae (lines->entry[i], "NULL"));
-            }
-            bstrListDestroy (lines);
-        }
-        bdestroy (b);
-    }
-
-For numerous other examples, see bstraux.c, bstraux.h and the example archive.
-
-===============================================================================
-
-License
--------
-
-The Better String Library is available under either the 3 clause BSD license 
-(see the accompanying license.txt) or the Gnu Public License version 2 (see 
-the accompanying gpl.txt) at the option of the user.
-
-===============================================================================
-
-Acknowledgements
-----------------
-
-The following individuals have made significant contributions to the design
-and testing of the Better String Library:
-
-Bjorn Augestad
-Clint Olsen
-Darryl Bleau
-Fabian Cenedese
-Graham Wideman
-Ignacio Burgueno
-International Business Machines Corporation
-Ira Mica
-John Kortink
-Manuel Woelker
-Marcel van Kervinck
-Michael Hsieh
-Richard A. Smith
-Simon Ekstrom
-Wayne Scott
-
-===============================================================================
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/license.txt b/Code/Tools/HLSLCrossCompiler/src/cbstring/license.txt
deleted file mode 100644
index cf78a984cc..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2002-2008 Paul Hsieh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, 
-    this list of conditions and the following disclaimer. 
-
-    Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution. 
-
-    Neither the name of bstrlib nor the names of its contributors may be used 
-    to endorse or promote products derived from this software without 
-    specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/porting.txt b/Code/Tools/HLSLCrossCompiler/src/cbstring/porting.txt
deleted file mode 100644
index 11d8d13130..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/porting.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-Better String library Porting Guide
------------------------------------
-
-by Paul Hsieh
-
-The bstring library is an attempt to provide improved string processing 
-functionality to the C and C++ language.  At the heart of the bstring library 
-is the management of "bstring"s which are a significant improvement over '\0'
-terminated char buffers.  See the accompanying documenation file bstrlib.txt
-for more information.
-
-===============================================================================
-
-Identifying the Compiler
-------------------------
-
-Bstrlib has been tested on the following compilers:
-
-    Microsoft Visual C++
-    Watcom C/C++ (32 bit flat)
-    Intel's C/C++ compiler (on Windows)
-    The GNU C/C++ compiler (on Windows/Linux on x86 and PPC64)
-    Borland C++
-    Turbo C
-
-There are slight differences in these compilers which requires slight 
-differences in the implementation of Bstrlib.  These are accomodated in the
-same sources using #ifdef/#if defined() on compiler specific macros.  To
-port Bstrlib to a new compiler not listed above, it is recommended that the
-same strategy be followed.  If you are unaware of the compiler specific 
-identifying preprocessor macro for your compiler you might find it here:
-
-http://predef.sourceforge.net/precomp.html
-
-Note that Intel C/C++ on Windows sets the Microsoft identifier: _MSC_VER.
-
-16-bit vs. 32-bit vs. 64-bit Systems
-------------------------------------
-
-Bstrlib has been architected to deal with strings of length between 0 and
-INT_MAX (inclusive).  Since the values of int are never higher than size_t
-there will be no issue here.  Note that on most 64-bit systems int is 32-bit.
-
-Dependency on The C-Library
----------------------------
-
-Bstrlib uses the functions memcpy, memmove, malloc, realloc, free and 
-vsnprintf.  Many free standing C compiler implementations that have a mode in 
-which the C library is not available will typically not include these 
-functions which will make porting Bstrlib to it onerous.  Bstrlib is not 
-designed for such bare bones compiler environments.  This usually includes 
-compilers that target ROM environments.
-
-Porting Issues
---------------
-
-Bstrlib has been written completely in ANSI/ISO C and ISO C++, however, there 
-are still a few porting issues.  These are described below.
-
-1. The vsnprintf () function.
-
-Unfortunately, the earlier ANSI/ISO C standards did not include this function.
-If the compiler of interest does not support this function then the 
-BSTRLIB_NOVSNP should be defined via something like:
-
-    #if !defined (BSTRLIB_VSNP_OK) && !defined (BSTRLIB_NOVSNP)
-    # if defined (__TURBOC__) || defined (__COMPILERVENDORSPECIFICMACRO__)
-    #  define BSTRLIB_NOVSNP
-    # endif
-    #endif
-
-which appears at the top of bstrlib.h.  Note that the bformat(a) functions 
-will not be declared or implemented if the BSTRLIB_NOVSNP macro is set.  If 
-the compiler has renamed vsnprintf() to some other named function, then 
-search for the definition of the exvsnprintf macro in bstrlib.c file and be 
-sure its defined appropriately:
-
-    #if defined (__COMPILERVENDORSPECIFICMACRO__)
-    # define exvsnprintf(r,b,n,f,a) {r=__compiler_specific_vsnprintf(b,n,f,a);}
-    #else
-    # define exvsnprintf(r,b,n,f,a) {r=vsnprintf(b,n,f,a);}
-    #endif
-
-Take notice of the return value being captured in the variable r.  It is 
-assumed that r exceeds n if and only if the underlying vsnprintf function has
-determined what the true maximal output length would be for output if the 
-buffer were large enough to hold it.  Non-modern implementations must output a
-lesser number (the macro can and should be modified to ensure this).
-
-2. Weak C++ compiler.
-
-C++ is a much more complicated language to implement than C.  This has lead 
-to varying quality of compiler implementations.  The weaknesses isolated in
-the initial ports are inclusion of the Standard Template Library, 
-std::iostream and exception handling.  By default it is assumed that the C++
-compiler supports all of these things correctly.  If your compiler does not
-support one or more of these define the corresponding macro:
-
-    BSTRLIB_CANNOT_USE_STL
-    BSTRLIB_CANNOT_USE_IOSTREAM
-    BSTRLIB_DOESNT_THROW_EXCEPTIONS
-
-The compiler specific detected macro should be defined at the top of 
-bstrwrap.h in the Configuration defines section.  Note that these disabling
-macros can be overrided with the associated enabling macro if a subsequent
-version of the compiler gains support.  (For example, its possible to rig
-up STLport to provide STL support for WATCOM C/C++, so -DBSTRLIB_CAN_USE_STL
-can be passed in as a compiler option.)
-
-3. The bsafe module, and reserved words.
-
-The bsafe module is in gross violation of the ANSI/ISO C standard in the 
-sense that it redefines what could be implemented as reserved words on a 
-given compiler.  The typical problem is that a compiler may inline some of the 
-functions and thus not be properly overridden by the definitions in the bsafe 
-module.  It is also possible that a compiler may prohibit the redefinitions in 
-the bsafe module.  Compiler specific action will be required to deal with 
-these situations.
-
-Platform Specific Files
------------------------
-
-The makefiles for the examples are basically setup of for particular 
-environments for each platform.  In general these makefiles are not portable
-and should be constructed as necessary from scratch for each platform.
-
-Testing a port
---------------
-
-To test that a port compiles correctly do the following:
-
-1. Build a sample project that includes the bstrlib, bstraux, bstrwrap, and 
-   bsafe modules.
-2. Compile bstest against the bstrlib module.
-3. Run bstest and ensure that 0 errors are reported.
-4. Compile test against the bstrlib and bstrwrap modules.
-5. Run test and ensure that 0 errors are reported.
-6. Compile each of the examples (except for the "re" example, which may be 
-   complicated and is not a real test of bstrlib and except for the mfcbench 
-   example which is Windows specific.)
-7. Run each of the examples.
-
-The builds must have 0 errors, and should have the absolute minimum number of
-warnings (in most cases can be reduced to 0.)  The result of execution should 
-be essentially identical on each platform.
-
-Performance
------------
-
-Different CPU and compilers have different capabilities in terms of 
-performance.  It is possible for Bstrlib to assume performance 
-characteristics that a platform doesn't have (since it was primarily 
-developed on just one platform).  The goal of Bstrlib is to provide very good 
-performance on all platforms regardless of this but without resorting to 
-extreme measures (such as using assembly language, or non-portable intrinsics 
-or library extensions.)
-
-There are two performance benchmarks that can be found in the example/ 
-directory.  They are: cbench.c and cppbench.cpp.  These are variations and 
-expansions of a benchmark for another string library.  They don't cover all
-string functionality, but do include the most basic functions which will be
-common in most string manipulation kernels.
-
-...............................................................................
-
-Feedback
---------
-
-In all cases, you may email issues found to the primary author of Bstrlib at 
-the email address: websnarf@users.sourceforge.net
-
-===============================================================================
diff --git a/Code/Tools/HLSLCrossCompiler/src/cbstring/security.txt b/Code/Tools/HLSLCrossCompiler/src/cbstring/security.txt
deleted file mode 100644
index 9761409f56..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/cbstring/security.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-Better String library Security Statement
-----------------------------------------
-
-by Paul Hsieh
-
-===============================================================================
-
-Introduction
-------------
-
-The Better String library (hereafter referred to as Bstrlib) is an attempt to 
-provide improved string processing functionality to the C and C++ languages.  
-At the heart of the Bstrlib is the management of "bstring"s which are a 
-significant improvement over '\0' terminated char buffers.  See the 
-accompanying documenation file bstrlib.txt for more information.
-
-DISCLAIMER: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT 
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Like any software, there is always a possibility of failure due to a flawed
-implementation.  Nevertheless a good faith effort has been made to minimize 
-such flaws in Bstrlib.  Also, use of Bstrlib by itself will not make an 
-application secure or free from implementation failures.  However, it is the
-author's conviction that use of Bstrlib can greatly facilitate the creation 
-of software meeting the highest possible standards of security.
-
-Part of the reason why this document has been created, is for the purpose of 
-security auditing, or the creation of further "Statements on Security" for 
-software that is created that uses Bstrlib.  An auditor may check the claims 
-below against Bstrlib, and use this as a basis for analysis of software which 
-uses Bstrlib.
-
-===============================================================================
-
-Statement on Security
----------------------
-
-This is a document intended to give consumers of the Better String Library
-who are interested in security an idea of where the Better String Library 
-stands on various security issues.  Any deviation observed in the actual 
-library itself from the descriptions below should be considered an 
-implementation error, not a design flaw.
-
-This statement is not an analytical proof of correctness or an outline of one
-but rather an assertion similar to a scientific claim or hypothesis.  By use,
-testing and open independent examination (otherwise known as scientific 
-falsifiability), the credibility of the claims made below can rise to the 
-level of an established theory.
-
-Common security issues:
-.......................
-
-1. Buffer Overflows
-
-The Bstrlib API allows the programmer a way to deal with strings without 
-having to deal with the buffers containing them.  Ordinary usage of the 
-Bstrlib API itself makes buffer overflows impossible.
-
-Furthermore, the Bstrlib API has a superset of basic string functionality as 
-compared to the C library's char * functions, C++'s std::string class and 
-Microsoft's MFC based CString class.  It also has abstracted mechanisms for 
-dealing with IO.  This is important as it gives developers a way of migrating 
-all their code from a functionality point of view.
-
-2. Memory size overflow/wrap around attack
-
-Bstrlib is, by design, impervious to memory size overflow attacks.  The 
-reason is it is resiliant to length overflows is that bstring lengths are 
-bounded above by INT_MAX, instead of ~(size_t)0.  So length addition 
-overflows cause a wrap around of the integer value making them negative 
-causing balloc() to fail before an erroneous operation can occurr.  Attempted 
-conversions of char * strings which may have lengths greater than INT_MAX are 
-detected and the conversion is aborted.
-
-It is unknown if this property holds on machines that don't represent 
-integers as 2s complement.  It is recommended that Bstrlib be carefully 
-auditted by anyone using a system which is not 2s complement based.
-
-3. Constant string protection
-
-Bstrlib implements runtime enforced constant and read-only string semantics.
-I.e., bstrings which are declared as constant via the bsStatic() macro cannot
-be modified or deallocated directly through the Bstrlib API, and this cannot
-be subverted by casting or other type coercion.  This is independent of the
-use of the const_bstring data type.
-
-The Bstrlib C API uses the type const_bstring to specify bstring parameters 
-whose contents do not change.  Although the C language cannot enforce this,
-this is nevertheless guaranteed by the implementation of the Bstrlib library
-of C functions.  The C++ API enforces the const attribute on CBString types
-correctly.
-
-4. Aliased bstring support
-
-Bstrlib detects and supports aliased parameter management throughout the API. 
-The kind of aliasing that is allowed is the one where pointers of the same
-basic type may be pointing to overlapping objects (this is the assumption the 
-ANSI C99 specification makes.)  Each function behaves as if all read-only 
-parameters were copied to temporaries which are used in their stead before 
-the function is enacted (it rarely actually does this).  No function in the 
-Bstrlib uses the "restrict" parameter attribute from the ANSI C99 
-specification.
-
-5. Information leaking
-
-In bstraux.h, using the semantically equivalent macros bSecureDestroy() and 
-bSecureWriteProtect() in place of bdestroy() and bwriteprotect() respectively 
-will ensure that stale data does not linger in the heap's free space after 
-strings have been released back to memory.  Created bstrings or CBStrings
-are not linked to anything external to themselves, and thus cannot expose 
-deterministic data leaking.  If a bstring is resized, the preimage may exist
-as a copy that is released to the heap.  Thus for sensitive data, the bstring 
-should be sufficiently presized before manipulated so that it is not resized. 
-bSecureInput() has been supplied in bstraux.c, which can be used to obtain 
-input securely without any risk of leaving any part of the input image in the 
-heap except for the allocated bstring that is returned.
-
-6. Memory leaking
-
-Bstrlib can be built using memdbg.h enabled via the BSTRLIB_MEMORY_DEBUG 
-macro.  User generated definitions for malloc, realloc and free can then be
-supplied which can implement special strategies for memory corruption 
-detection or memory leaking.  Otherwise, bstrlib does not do anything out of 
-the ordinary to attempt to deal with the standard problem of memory leaking 
-(i.e., losing references to allocated memory) when programming in the C and 
-C++ languages.  However, it does not compound the problem any more than exists 
-either, as it doesn't have any intrinsic inescapable leaks in it.  Bstrlib 
-does not preclude the use of automatic garbage collection mechanisms such as 
-the Boehm garbage collector.
-
-7. Encryption
-
-Bstrlib does not present any built-in encryption mechanism.  However, it 
-supports full binary contents in its data buffers, so any standard block 
-based encryption mechanism can make direct use of bstrings/CBStrings for 
-buffer management.
-
-8. Double freeing
-
-Freeing a pointer that is already free is an extremely rare, but nevertheless 
-a potentially ruthlessly corrupting operation (its possible to cause Win 98 to
-reboot, by calling free mulitiple times on already freed data using the WATCOM
-CRT.)  Bstrlib invalidates the bstring header data before freeing, so that in
-many cases a double free will be detected and an error will be reported 
-(though this behaviour is not guaranteed and should not be relied on).
-
-Using bstrFree pervasively (instead of bdestroy) can lead to somewhat 
-improved invalid free avoidance (it is completely safe whenever bstring
-instances are only stored in unique variables).  For example:
-
-    struct tagbstring hw = bsStatic ("Hello, world");
-    bstring cpHw = bstrcpy (&hw);
-
-    #ifdef NOT_QUITE_AS_SAFE
-        bdestroy (cpHw); /* Never fail */
-        bdestroy (cpHw); /* Error sometimes detected at runtime */
-        bdestroy (&hw);  /* Error detected at run time */
-    #else
-        bstrFree (cpHw); /* Never fail */
-        bstrFree (cpHw); /* Will do nothing */
-        bstrFree (&hw);  /* Will lead to a compile time error */
-    #endif
-
-9. Resource based denial of service
-
-bSecureInput() has been supplied in bstraux.c.  It has an optional upper limit
-for input length.  But unlike fgets(), it is also easily determined if the 
-buffer has been truncated early.  In this way, a program can set an upper limit
-on input sizes while still allowing for implementing context specific 
-truncation semantics (i.e., does the program consume but dump the extra 
-input, or does it consume it in later inputs?)
-
-10. Mixing char *'s and bstrings
-
-The bstring and char * representations are not identical.  So there is a risk
-when converting back and forth that data may lost.  Essentially bstrings can
-contain '\0' as a valid non-terminating character, while char * strings 
-cannot and in fact must use the character as a terminator.  The risk of data 
-loss is very low, since:
-
-  A) the simple method of only using bstrings in a char * semantically 
-     compatible way is both easy to achieve and pervasively supported.
-  B) obtaining '\0' content in a string is either deliberate or indicative
-     of another, likely more serious problem in the code.
-  C) the library comes with various functions which deal with this issue
-     (namely: bfromcstr(), bstr2cstr (), and bSetCstrChar ())
-
-Marginal security issues:
-.........................
-
-11. 8-bit versus 9-bit portability
-
-Bstrlib uses CHAR_BIT and other limits.h constants to the maximum extent 
-possible to avoid portability problems.  However, Bstrlib has not been tested 
-on any system that does not represent char as 8-bits.  So whether or not it 
-works on 9-bit systems is an open question.  It is recommended that Bstrlib be 
-carefully auditted by anyone using a system in which CHAR_BIT is not 8.
-
-12. EBCDIC/ASCII/UTF-8 data representation attacks.
-
-Bstrlib uses ctype.h functions to ensure that it remains portable to non-
-ASCII systems.  It also checks range to make sure it is well defined even for
-data that ANSI does not define for the ctype functions.
-
-Obscure issues:
-...............
-
-13. Data attributes
-
-There is no support for a Perl-like "taint" attribute, however, an example of 
-how to do this using C++'s type system is given as an example.
-
diff --git a/Code/Tools/HLSLCrossCompiler/src/decode.c b/Code/Tools/HLSLCrossCompiler/src/decode.c
deleted file mode 100644
index 0af6423971..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/decode.c
+++ /dev/null
@@ -1,1845 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/decode.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "internal_includes/reflect.h"
-#include "internal_includes/structs.h"
-#include "internal_includes/tokens.h"
-#include "stdio.h"
-#include "stdlib.h"
-
-enum
-{
-    FOURCC_DXBC = FOURCC('D', 'X', 'B', 'C')
-};  // DirectX byte code
-enum
-{
-    FOURCC_SHDR = FOURCC('S', 'H', 'D', 'R')
-};  // Shader model 4 code
-enum
-{
-    FOURCC_SHEX = FOURCC('S', 'H', 'E', 'X')
-};  // Shader model 5 code
-enum
-{
-    FOURCC_RDEF = FOURCC('R', 'D', 'E', 'F')
-};  // Resource definition (e.g. constant buffers)
-enum
-{
-    FOURCC_ISGN = FOURCC('I', 'S', 'G', 'N')
-};  // Input signature
-enum
-{
-    FOURCC_IFCE = FOURCC('I', 'F', 'C', 'E')
-};  // Interface (for dynamic linking)
-enum
-{
-    FOURCC_OSGN = FOURCC('O', 'S', 'G', 'N')
-};  // Output signature
-
-enum
-{
-    FOURCC_ISG1 = FOURCC('I', 'S', 'G', '1')
-};  // Input signature with Stream and MinPrecision
-enum
-{
-    FOURCC_OSG1 = FOURCC('O', 'S', 'G', '1')
-};  // Output signature with Stream and MinPrecision
-enum
-{
-    FOURCC_OSG5 = FOURCC('O', 'S', 'G', '5')
-};  // Output signature with Stream
-
-typedef struct DXBCContainerHeaderTAG
-{
-    unsigned fourcc;
-    uint32_t unk[4];
-    uint32_t one;
-    uint32_t totalSize;
-    uint32_t chunkCount;
-} DXBCContainerHeader;
-
-typedef struct DXBCChunkHeaderTAG
-{
-    unsigned fourcc;
-    unsigned size;
-} DXBCChunkHeader;
-
-#ifdef _DEBUG
-static uint64_t operandID = 0;
-static uint64_t instructionID = 0;
-#endif
-
-#if defined(_WIN32)
-#define osSprintf(dest, size, src) sprintf_s(dest, size, src)
-#else
-#define osSprintf(dest, size, src) sprintf(dest, src)
-#endif
-
-void DecodeNameToken(const uint32_t* pui32NameToken, Operand* psOperand)
-{
-    const size_t MAX_BUFFER_SIZE = sizeof(psOperand->pszSpecialName);
-    psOperand->eSpecialName = DecodeOperandSpecialName(*pui32NameToken);
-    switch (psOperand->eSpecialName)
-    {
-        case NAME_UNDEFINED:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "undefined");
-            break;
-        }
-        case NAME_POSITION:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "position");
-            break;
-        }
-        case NAME_CLIP_DISTANCE:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "clipDistance");
-            break;
-        }
-        case NAME_CULL_DISTANCE:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "cullDistance");
-            break;
-        }
-        case NAME_RENDER_TARGET_ARRAY_INDEX:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "renderTargetArrayIndex");
-            break;
-        }
-        case NAME_VIEWPORT_ARRAY_INDEX:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "viewportArrayIndex");
-            break;
-        }
-        case NAME_VERTEX_ID:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "vertexID");
-            break;
-        }
-        case NAME_PRIMITIVE_ID:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "primitiveID");
-            break;
-        }
-        case NAME_INSTANCE_ID:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "instanceID");
-            break;
-        }
-        case NAME_IS_FRONT_FACE:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "isFrontFace");
-            break;
-        }
-        case NAME_SAMPLE_INDEX:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "sampleIndex");
-            break;
-        }
-            // For the quadrilateral domain, there are 6 factors (4 sides, 2 inner).
-        case NAME_FINAL_QUAD_U_EQ_0_EDGE_TESSFACTOR:
-        case NAME_FINAL_QUAD_V_EQ_0_EDGE_TESSFACTOR:
-        case NAME_FINAL_QUAD_U_EQ_1_EDGE_TESSFACTOR:
-        case NAME_FINAL_QUAD_V_EQ_1_EDGE_TESSFACTOR:
-        case NAME_FINAL_QUAD_U_INSIDE_TESSFACTOR:
-        case NAME_FINAL_QUAD_V_INSIDE_TESSFACTOR:
-
-            // For the triangular domain, there are 4 factors (3 sides, 1 inner)
-        case NAME_FINAL_TRI_U_EQ_0_EDGE_TESSFACTOR:
-        case NAME_FINAL_TRI_V_EQ_0_EDGE_TESSFACTOR:
-        case NAME_FINAL_TRI_W_EQ_0_EDGE_TESSFACTOR:
-        case NAME_FINAL_TRI_INSIDE_TESSFACTOR:
-
-            // For the isoline domain, there are 2 factors (detail and density).
-        case NAME_FINAL_LINE_DETAIL_TESSFACTOR:
-        case NAME_FINAL_LINE_DENSITY_TESSFACTOR:
-        {
-            osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "tessFactor");
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    return;
-}
-
-uint32_t DecodeOperand(const uint32_t* pui32Tokens, Operand* psOperand)
-{
-    int i;
-    uint32_t ui32NumTokens = 1;
-    OPERAND_NUM_COMPONENTS eNumComponents;
-
-#ifdef _DEBUG
-    psOperand->id = operandID++;
-#endif
-
-    // Some defaults
-    psOperand->iWriteMaskEnabled = 1;
-    psOperand->iGSInput = 0;
-    psOperand->aeDataType[0] = SVT_FLOAT;
-    psOperand->aeDataType[1] = SVT_FLOAT;
-    psOperand->aeDataType[2] = SVT_FLOAT;
-    psOperand->aeDataType[3] = SVT_FLOAT;
-
-    psOperand->iExtended = DecodeIsOperandExtended(*pui32Tokens);
-
-    psOperand->eModifier = OPERAND_MODIFIER_NONE;
-    psOperand->psSubOperand[0] = 0;
-    psOperand->psSubOperand[1] = 0;
-    psOperand->psSubOperand[2] = 0;
-
-    psOperand->eMinPrecision = OPERAND_MIN_PRECISION_DEFAULT;
-
-    /* Check if this instruction is extended.  If it is,
-     * we need to print the information first */
-    if (psOperand->iExtended)
-    {
-        /* OperandToken1 is the second token */
-        ui32NumTokens++;
-
-        if (DecodeExtendedOperandType(pui32Tokens[1]) == EXTENDED_OPERAND_MODIFIER)
-        {
-            psOperand->eModifier = DecodeExtendedOperandModifier(pui32Tokens[1]);
-            psOperand->eMinPrecision = DecodeOperandMinPrecision(pui32Tokens[1]);
-        }
-    }
-
-    psOperand->iIndexDims = DecodeOperandIndexDimension(*pui32Tokens);
-    psOperand->eType = DecodeOperandType(*pui32Tokens);
-
-    psOperand->ui32RegisterNumber = 0;
-
-    eNumComponents = DecodeOperandNumComponents(*pui32Tokens);
-
-    switch (eNumComponents)
-    {
-        case OPERAND_1_COMPONENT:
-        {
-            psOperand->iNumComponents = 1;
-            break;
-        }
-        case OPERAND_4_COMPONENT:
-        {
-            psOperand->iNumComponents = 4;
-            break;
-        }
-        default:
-        {
-            psOperand->iNumComponents = 0;
-            break;
-        }
-    }
-
-    if (psOperand->iWriteMaskEnabled && psOperand->iNumComponents == 4)
-    {
-        psOperand->eSelMode = DecodeOperand4CompSelMode(*pui32Tokens);
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            psOperand->ui32CompMask = DecodeOperand4CompMask(*pui32Tokens);
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            psOperand->ui32Swizzle = DecodeOperand4CompSwizzle(*pui32Tokens);
-
-            if (psOperand->ui32Swizzle != NO_SWIZZLE)
-            {
-                psOperand->aui32Swizzle[0] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 0);
-                psOperand->aui32Swizzle[1] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 1);
-                psOperand->aui32Swizzle[2] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 2);
-                psOperand->aui32Swizzle[3] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 3);
-            }
-            else
-            {
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_X;
-                psOperand->aui32Swizzle[1] = OPERAND_4_COMPONENT_Y;
-                psOperand->aui32Swizzle[2] = OPERAND_4_COMPONENT_Z;
-                psOperand->aui32Swizzle[3] = OPERAND_4_COMPONENT_W;
-            }
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            psOperand->aui32Swizzle[0] = DecodeOperand4CompSel1(*pui32Tokens);
-        }
-    }
-
-    // Set externally to this function based on the instruction opcode.
-    psOperand->iIntegerImmediate = 0;
-
-    if (psOperand->eType == OPERAND_TYPE_IMMEDIATE32)
-    {
-        for (i = 0; i < psOperand->iNumComponents; ++i)
-        {
-            psOperand->afImmediates[i] = *((float*)(&pui32Tokens[ui32NumTokens]));
-            ui32NumTokens++;
-        }
-    }
-    else if (psOperand->eType == OPERAND_TYPE_IMMEDIATE64)
-    {
-        for (i = 0; i < psOperand->iNumComponents; ++i)
-        {
-            psOperand->adImmediates[i] = *((double*)(&pui32Tokens[ui32NumTokens]));
-            ui32NumTokens += 2;
-        }
-    }
-
-    if (psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL || psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL ||
-        psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH)
-    {
-        psOperand->ui32RegisterNumber = -1;
-        psOperand->ui32CompMask = -1;
-    }
-
-    for (i = 0; i < psOperand->iIndexDims; ++i)
-    {
-        OPERAND_INDEX_REPRESENTATION eRep = DecodeOperandIndexRepresentation(i, *pui32Tokens);
-
-        psOperand->eIndexRep[i] = eRep;
-
-        psOperand->aui32ArraySizes[i] = 0;
-        psOperand->ui32RegisterNumber = 0;
-
-        switch (eRep)
-        {
-            case OPERAND_INDEX_IMMEDIATE32:
-            {
-                psOperand->ui32RegisterNumber = *(pui32Tokens + ui32NumTokens);
-                psOperand->aui32ArraySizes[i] = psOperand->ui32RegisterNumber;
-                break;
-            }
-            case OPERAND_INDEX_RELATIVE:
-            {
-                psOperand->psSubOperand[i] = hlslcc_malloc(sizeof(Operand));
-                DecodeOperand(pui32Tokens + ui32NumTokens, psOperand->psSubOperand[i]);
-
-                ui32NumTokens++;
-                break;
-            }
-            case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-            {
-                psOperand->ui32RegisterNumber = *(pui32Tokens + ui32NumTokens);
-                psOperand->aui32ArraySizes[i] = psOperand->ui32RegisterNumber;
-
-                ui32NumTokens++;
-
-                psOperand->psSubOperand[i] = hlslcc_malloc(sizeof(Operand));
-                DecodeOperand(pui32Tokens + ui32NumTokens, psOperand->psSubOperand[i]);
-
-                ui32NumTokens++;
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-        }
-
-        ui32NumTokens++;
-    }
-
-    psOperand->pszSpecialName[0] = '\0';
-
-    return ui32NumTokens;
-}
-
-const uint32_t* DecodeDeclaration(Shader* psShader, const uint32_t* pui32Token, Declaration* psDecl)
-{
-    uint32_t ui32TokenLength = DecodeInstructionLength(*pui32Token);
-    const uint32_t bExtended = DecodeIsOpcodeExtended(*pui32Token);
-    const OPCODE_TYPE eOpcode = DecodeOpcodeType(*pui32Token);
-    uint32_t ui32OperandOffset = 1;
-
-    if (eOpcode < NUM_OPCODES && eOpcode >= 0)
-    {
-        psShader->aiOpcodeUsed[eOpcode] = 1;
-    }
-
-    psDecl->eOpcode = eOpcode;
-
-    psDecl->ui32TexReturnType = SVT_FLOAT;
-
-    if (bExtended)
-    {
-        ui32OperandOffset = 2;
-    }
-
-    switch (eOpcode)
-    {
-        case OPCODE_DCL_RESOURCE:  // DCL* opcodes have
-        {
-            ResourceBinding* psBinding = 0;
-            psDecl->value.eResourceDimension = DecodeResourceDimension(*pui32Token);
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-            if (psDecl->asOperands[0].eType == OPERAND_TYPE_RESOURCE &&
-                GetResourceFromBindingPoint(RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, &psShader->sInfo, &psBinding))
-            {
-                psDecl->ui32TexReturnType = psBinding->ui32ReturnType;
-            }
-            break;
-        }
-        case OPCODE_DCL_CONSTANT_BUFFER:  // custom operand formats.
-        {
-            psDecl->value.eCBAccessPattern = DecodeConstantBufferAccessPattern(*pui32Token);
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_SAMPLER:
-        {
-            break;
-        }
-        case OPCODE_DCL_INDEX_RANGE:
-        {
-            psDecl->ui32NumOperands = 1;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            psDecl->value.ui32IndexRange = pui32Token[ui32OperandOffset];
-
-            if (psDecl->asOperands[0].eType == OPERAND_TYPE_INPUT)
-            {
-                uint32_t i;
-                const uint32_t indexRange = psDecl->value.ui32IndexRange;
-                const uint32_t reg = psDecl->asOperands[0].ui32RegisterNumber;
-
-                psShader->aIndexedInput[reg] = indexRange;
-                psShader->aIndexedInputParents[reg] = reg;
-
-                //-1 means don't declare this input because it falls in
-                // the range of an already declared array.
-                for (i = reg + 1; i < reg + indexRange; ++i)
-                {
-                    psShader->aIndexedInput[i] = -1;
-                    psShader->aIndexedInputParents[i] = reg;
-                }
-            }
-
-            if (psDecl->asOperands[0].eType == OPERAND_TYPE_OUTPUT)
-            {
-                psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->value.ui32IndexRange;
-            }
-            break;
-        }
-        case OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
-        {
-            psDecl->value.eOutputPrimitiveTopology = DecodeGSOutputPrimitiveTopology(*pui32Token);
-            break;
-        }
-        case OPCODE_DCL_GS_INPUT_PRIMITIVE:
-        {
-            psDecl->value.eInputPrimitive = DecodeGSInputPrimitive(*pui32Token);
-            break;
-        }
-        case OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
-        {
-            psDecl->value.ui32MaxOutputVertexCount = pui32Token[1];
-            break;
-        }
-        case OPCODE_DCL_TESS_PARTITIONING:
-        {
-            psDecl->value.eTessPartitioning = DecodeTessPartitioning(*pui32Token);
-            break;
-        }
-        case OPCODE_DCL_TESS_DOMAIN:
-        {
-            psDecl->value.eTessDomain = DecodeTessDomain(*pui32Token);
-            break;
-        }
-        case OPCODE_DCL_TESS_OUTPUT_PRIMITIVE:
-        {
-            psDecl->value.eTessOutPrim = DecodeTessOutPrim(*pui32Token);
-            break;
-        }
-        case OPCODE_DCL_THREAD_GROUP:
-        {
-            psDecl->value.aui32WorkGroupSize[0] = pui32Token[1];
-            psDecl->value.aui32WorkGroupSize[1] = pui32Token[2];
-            psDecl->value.aui32WorkGroupSize[2] = pui32Token[3];
-            break;
-        }
-        case OPCODE_DCL_INPUT:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_INPUT_SIV:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            if (psShader->eShaderType == PIXEL_SHADER)
-            {
-                psDecl->value.eInterpolation = DecodeInterpolationMode(*pui32Token);
-            }
-            break;
-        }
-        case OPCODE_DCL_INPUT_PS:
-        {
-            psDecl->ui32NumOperands = 1;
-            psDecl->value.eInterpolation = DecodeInterpolationMode(*pui32Token);
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_INPUT_SGV:
-        case OPCODE_DCL_INPUT_PS_SGV:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            DecodeNameToken(pui32Token + 3, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_INPUT_PS_SIV:
-        {
-            psDecl->ui32NumOperands = 1;
-            psDecl->value.eInterpolation = DecodeInterpolationMode(*pui32Token);
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            DecodeNameToken(pui32Token + 3, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_OUTPUT:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_OUTPUT_SGV:
-        {
-            break;
-        }
-        case OPCODE_DCL_OUTPUT_SIV:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            DecodeNameToken(pui32Token + 3, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_TEMPS:
-        {
-            psDecl->value.ui32NumTemps = *(pui32Token + ui32OperandOffset);
-            break;
-        }
-        case OPCODE_DCL_INDEXABLE_TEMP:
-        {
-            psDecl->sIdxTemp.ui32RegIndex = *(pui32Token + ui32OperandOffset);
-            psDecl->sIdxTemp.ui32RegCount = *(pui32Token + ui32OperandOffset + 1);
-            psDecl->sIdxTemp.ui32RegComponentSize = *(pui32Token + ui32OperandOffset + 2);
-            break;
-        }
-        case OPCODE_DCL_GLOBAL_FLAGS:
-        {
-            psDecl->value.ui32GlobalFlags = DecodeGlobalFlags(*pui32Token);
-            break;
-        }
-        case OPCODE_DCL_INTERFACE:
-        {
-            uint32_t func = 0, numClassesImplementingThisInterface, arrayLen, interfaceID;
-            interfaceID = pui32Token[ui32OperandOffset];
-            ui32OperandOffset++;
-            psDecl->ui32TableLength = pui32Token[ui32OperandOffset];
-            ui32OperandOffset++;
-
-            numClassesImplementingThisInterface = DecodeInterfaceTableLength(*(pui32Token + ui32OperandOffset));
-            arrayLen = DecodeInterfaceArrayLength(*(pui32Token + ui32OperandOffset));
-
-            ui32OperandOffset++;
-
-            psDecl->value.interface.ui32InterfaceID = interfaceID;
-            psDecl->value.interface.ui32NumFuncTables = numClassesImplementingThisInterface;
-            psDecl->value.interface.ui32ArraySize = arrayLen;
-
-            psShader->funcPointer[interfaceID].ui32NumBodiesPerTable = psDecl->ui32TableLength;
-
-            for (; func < numClassesImplementingThisInterface; ++func)
-            {
-                uint32_t ui32FuncTable = *(pui32Token + ui32OperandOffset);
-                psShader->aui32FuncTableToFuncPointer[ui32FuncTable] = interfaceID;
-
-                psShader->funcPointer[interfaceID].aui32FuncTables[func] = ui32FuncTable;
-                ui32OperandOffset++;
-            }
-
-            break;
-        }
-        case OPCODE_DCL_FUNCTION_BODY:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_FUNCTION_TABLE:
-        {
-            uint32_t ui32Func;
-            const uint32_t ui32FuncTableID = pui32Token[ui32OperandOffset++];
-            const uint32_t ui32NumFuncsInTable = pui32Token[ui32OperandOffset++];
-
-            for (ui32Func = 0; ui32Func < ui32NumFuncsInTable; ++ui32Func)
-            {
-                const uint32_t ui32FuncBodyID = pui32Token[ui32OperandOffset++];
-
-                psShader->aui32FuncBodyToFuncTable[ui32FuncBodyID] = ui32FuncTableID;
-
-                psShader->funcTable[ui32FuncTableID].aui32FuncBodies[ui32Func] = ui32FuncBodyID;
-            }
-
-            // OpcodeToken0 is followed by a DWORD that represents the function table
-            // identifier and another DWORD (TableLength) that gives the number of
-            // functions in the table.
-            //
-            // This is followed by TableLength DWORDs which are function body indices.
-            //
-
-            break;
-        }
-        case OPCODE_DCL_INPUT_CONTROL_POINT_COUNT:
-        {
-            break;
-        }
-        case OPCODE_HS_DECLS:
-        {
-            break;
-        }
-        case OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT:
-        {
-            psDecl->value.ui32MaxOutputVertexCount = DecodeOutputControlPointCount(*pui32Token);
-            break;
-        }
-        case OPCODE_HS_JOIN_PHASE:
-        case OPCODE_HS_FORK_PHASE:
-        case OPCODE_HS_CONTROL_POINT_PHASE:
-        {
-            break;
-        }
-        case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-        {
-            ASSERT(psShader->ui32ForkPhaseCount != 0);  // Check for wrapping when we decrement.
-            psDecl->value.aui32HullPhaseInstanceInfo[0] = psShader->ui32ForkPhaseCount - 1;
-            psDecl->value.aui32HullPhaseInstanceInfo[1] = pui32Token[1];
-            break;
-        }
-        case OPCODE_CUSTOMDATA:
-        {
-            ui32TokenLength = pui32Token[1];
-            {
-                const uint32_t ui32NumVec4 = (ui32TokenLength - 2) / 4;
-                uint32_t uIdx = 0;
-
-                ICBVec4 const* pVec4Array = (void*)(pui32Token + 2);
-
-                // The buffer will contain at least one value, but not more than 4096 scalars/1024 vec4's.
-                ASSERT(ui32NumVec4 < MAX_IMMEDIATE_CONST_BUFFER_VEC4_SIZE);
-
-                /* must be a multiple of 4 */
-                ASSERT(((ui32TokenLength - 2) % 4) == 0);
-
-                for (uIdx = 0; uIdx < ui32NumVec4; uIdx++)
-                {
-                    psDecl->asImmediateConstBuffer[uIdx] = pVec4Array[uIdx];
-                }
-
-                psDecl->ui32NumOperands = ui32NumVec4;
-            }
-            break;
-        }
-        case OPCODE_DCL_HS_MAX_TESSFACTOR:
-        {
-            psDecl->value.fMaxTessFactor = *((float*)&pui32Token[1]);
-            break;
-        }
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-        {
-            psDecl->ui32NumOperands = 2;
-            psDecl->value.eResourceDimension = DecodeResourceDimension(*pui32Token);
-            psDecl->sUAV.ui32GloballyCoherentAccess = DecodeAccessCoherencyFlags(*pui32Token);
-            psDecl->sUAV.bCounter = 0;
-            psDecl->sUAV.ui32BufferSize = 0;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            psDecl->sUAV.Type = DecodeResourceReturnType(0, pui32Token[ui32OperandOffset]);
-            break;
-        }
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-        {
-
-            psDecl->ui32NumOperands = 1;
-            psDecl->sUAV.ui32GloballyCoherentAccess = DecodeAccessCoherencyFlags(*pui32Token);
-            psDecl->sUAV.bCounter = 0;
-            psDecl->sUAV.ui32BufferSize = 0;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            // This should be a RTYPE_UAV_RWBYTEADDRESS buffer. It is memory backed by
-            // a shader storage buffer whose is unknown at compile time.
-            psDecl->sUAV.ui32BufferSize = 0;
-            break;
-        }
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-        {
-            ResourceBinding* psBinding = NULL;
-            ConstantBuffer* psBuffer = NULL;
-
-            psDecl->ui32NumOperands = 1;
-            psDecl->sUAV.ui32GloballyCoherentAccess = DecodeAccessCoherencyFlags(*pui32Token);
-            psDecl->sUAV.bCounter = 0;
-            psDecl->sUAV.ui32BufferSize = 0;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-            GetResourceFromBindingPoint(RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, &psShader->sInfo, &psBinding);
-
-            GetConstantBufferFromBindingPoint(RGROUP_UAV, psBinding->ui32BindPoint, &psShader->sInfo, &psBuffer);
-            psDecl->sUAV.ui32BufferSize = psBuffer->ui32TotalSizeInBytes;
-            switch (psBinding->eType)
-            {
-                case RTYPE_UAV_RWSTRUCTURED_WITH_COUNTER:
-                case RTYPE_UAV_APPEND_STRUCTURED:
-                case RTYPE_UAV_CONSUME_STRUCTURED:
-                    psDecl->sUAV.bCounter = 1;
-                    break;
-                default:
-                    break;
-            }
-            break;
-        }
-        case OPCODE_DCL_RESOURCE_STRUCTURED:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_RESOURCE_RAW:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED:
-        {
-
-            psDecl->ui32NumOperands = 1;
-            psDecl->sUAV.ui32GloballyCoherentAccess = 0;
-
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-            psDecl->sTGSM.ui32Stride = pui32Token[ui32OperandOffset++];
-            psDecl->sTGSM.ui32Count = pui32Token[ui32OperandOffset++];
-            break;
-        }
-        case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW:
-        {
-
-            psDecl->ui32NumOperands = 1;
-            psDecl->sUAV.ui32GloballyCoherentAccess = 0;
-
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-            psDecl->sTGSM.ui32Stride = 4;
-            psDecl->sTGSM.ui32Count = pui32Token[ui32OperandOffset++] / 4;
-            break;
-        }
-        case OPCODE_DCL_STREAM:
-        {
-            psDecl->ui32NumOperands = 1;
-            DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-            break;
-        }
-        case OPCODE_DCL_GS_INSTANCE_COUNT:
-        {
-            psDecl->ui32NumOperands = 0;
-            psDecl->value.ui32GSInstanceCount = pui32Token[1];
-            break;
-        }
-        default:
-        {
-            // Reached end of declarations
-            return 0;
-        }
-    }
-
-    UpdateDeclarationReferences(psShader, psDecl);
-
-    return pui32Token + ui32TokenLength;
-}
-
-const uint32_t* DecodeInstruction(const uint32_t* pui32Token, Instruction* psInst, Shader* psShader)
-{
-    uint32_t ui32TokenLength = DecodeInstructionLength(*pui32Token);
-    const uint32_t bExtended = DecodeIsOpcodeExtended(*pui32Token);
-    const OPCODE_TYPE eOpcode = DecodeOpcodeType(*pui32Token);
-    uint32_t ui32OperandOffset = 1;
-
-#ifdef _DEBUG
-    psInst->id = instructionID++;
-#endif
-
-    psInst->eOpcode = eOpcode;
-
-    psInst->bSaturate = DecodeInstructionSaturate(*pui32Token);
-
-    psInst->bAddressOffset = 0;
-
-    psInst->ui32FirstSrc = 1;
-
-    if (bExtended)
-    {
-        do
-        {
-            const uint32_t ui32ExtOpcodeToken = pui32Token[ui32OperandOffset];
-            const EXTENDED_OPCODE_TYPE eExtType = DecodeExtendedOpcodeType(ui32ExtOpcodeToken);
-
-            if (eExtType == EXTENDED_OPCODE_SAMPLE_CONTROLS)
-            {
-                psInst->bAddressOffset = 1;
-
-                psInst->iUAddrOffset = DecodeImmediateAddressOffset(IMMEDIATE_ADDRESS_OFFSET_U, ui32ExtOpcodeToken);
-                psInst->iVAddrOffset = DecodeImmediateAddressOffset(IMMEDIATE_ADDRESS_OFFSET_V, ui32ExtOpcodeToken);
-                psInst->iWAddrOffset = DecodeImmediateAddressOffset(IMMEDIATE_ADDRESS_OFFSET_W, ui32ExtOpcodeToken);
-            }
-            else if (eExtType == EXTENDED_OPCODE_RESOURCE_RETURN_TYPE)
-            {
-                psInst->xType = DecodeExtendedResourceReturnType(0, ui32ExtOpcodeToken);
-                psInst->yType = DecodeExtendedResourceReturnType(1, ui32ExtOpcodeToken);
-                psInst->zType = DecodeExtendedResourceReturnType(2, ui32ExtOpcodeToken);
-                psInst->wType = DecodeExtendedResourceReturnType(3, ui32ExtOpcodeToken);
-            }
-            else if (eExtType == EXTENDED_OPCODE_RESOURCE_DIM)
-            {
-                psInst->eResDim = DecodeExtendedResourceDimension(ui32ExtOpcodeToken);
-            }
-
-            ui32OperandOffset++;
-        } while (DecodeIsOpcodeExtended(pui32Token[ui32OperandOffset - 1]));
-    }
-
-    if (eOpcode < NUM_OPCODES && eOpcode >= 0)
-    {
-        psShader->aiOpcodeUsed[eOpcode] = 1;
-    }
-
-    switch (eOpcode)
-    {
-            // no operands
-        case OPCODE_CUT:
-        case OPCODE_EMIT:
-        case OPCODE_EMITTHENCUT:
-        case OPCODE_RET:
-        case OPCODE_LOOP:
-        case OPCODE_ENDLOOP:
-        case OPCODE_BREAK:
-        case OPCODE_ELSE:
-        case OPCODE_ENDIF:
-        case OPCODE_CONTINUE:
-        case OPCODE_DEFAULT:
-        case OPCODE_ENDSWITCH:
-        case OPCODE_NOP:
-        case OPCODE_HS_CONTROL_POINT_PHASE:
-        case OPCODE_HS_FORK_PHASE:
-        case OPCODE_HS_JOIN_PHASE:
-        {
-            psInst->ui32NumOperands = 0;
-            psInst->ui32FirstSrc = 0;
-            break;
-        }
-        case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-        {
-            psInst->ui32NumOperands = 0;
-            psInst->ui32FirstSrc = 0;
-            break;
-        }
-        case OPCODE_SYNC:
-        {
-            psInst->ui32NumOperands = 0;
-            psInst->ui32FirstSrc = 0;
-            psInst->ui32SyncFlags = DecodeSyncFlags(*pui32Token);
-            break;
-        }
-
-            // 1 operand
-        case OPCODE_EMIT_STREAM:
-        case OPCODE_CUT_STREAM:
-        case OPCODE_EMITTHENCUT_STREAM:
-        case OPCODE_CASE:
-        case OPCODE_SWITCH:
-        case OPCODE_LABEL:
-        {
-            psInst->ui32NumOperands = 1;
-            psInst->ui32FirstSrc = 0;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-
-            //            if(eOpcode == OPCODE_CASE)
-            //            {
-            //                psInst->asOperands[0].iIntegerImmediate = 1;
-            //            }
-            break;
-        }
-
-        case OPCODE_INTERFACE_CALL:
-        {
-            psInst->ui32NumOperands = 1;
-            psInst->ui32FirstSrc = 0;
-            psInst->ui32FuncIndexWithinInterface = pui32Token[ui32OperandOffset];
-            ui32OperandOffset++;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-
-            break;
-        }
-
-            /* Floating point instruction decodes */
-
-            // Instructions with two operands go here
-        case OPCODE_MOV:
-        {
-            psInst->ui32NumOperands = 2;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-
-            // Mov with an integer dest. If src is an immediate then it must be encoded as an integer.
-            if (psInst->asOperands[0].eMinPrecision == OPERAND_MIN_PRECISION_SINT_16 || psInst->asOperands[0].eMinPrecision == OPERAND_MIN_PRECISION_UINT_16)
-            {
-                psInst->asOperands[1].iIntegerImmediate = 1;
-            }
-            break;
-        }
-        case OPCODE_LOG:
-        case OPCODE_RSQ:
-        case OPCODE_EXP:
-        case OPCODE_SQRT:
-        case OPCODE_ROUND_PI:
-        case OPCODE_ROUND_NI:
-        case OPCODE_ROUND_Z:
-        case OPCODE_ROUND_NE:
-        case OPCODE_FRC:
-        case OPCODE_FTOU:
-        case OPCODE_FTOI:
-        case OPCODE_UTOF:
-        case OPCODE_ITOF:
-        case OPCODE_INEG:
-        case OPCODE_IMM_ATOMIC_ALLOC:
-        case OPCODE_IMM_ATOMIC_CONSUME:
-        case OPCODE_DMOV:
-        case OPCODE_DTOF:
-        case OPCODE_FTOD:
-        case OPCODE_DRCP:
-        case OPCODE_COUNTBITS:
-        case OPCODE_FIRSTBIT_HI:
-        case OPCODE_FIRSTBIT_LO:
-        case OPCODE_FIRSTBIT_SHI:
-        case OPCODE_BFREV:
-        case OPCODE_F32TOF16:
-        case OPCODE_F16TOF32:
-        case OPCODE_RCP:
-        case OPCODE_DERIV_RTX:
-        case OPCODE_DERIV_RTY:
-        case OPCODE_DERIV_RTX_COARSE:
-        case OPCODE_DERIV_RTX_FINE:
-        case OPCODE_DERIV_RTY_COARSE:
-        case OPCODE_DERIV_RTY_FINE:
-        case OPCODE_NOT:
-        {
-            psInst->ui32NumOperands = 2;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            break;
-        }
-
-            // Instructions with three operands go here
-        case OPCODE_SINCOS:
-        {
-            psInst->ui32FirstSrc = 2;
-            // Intentional fall-through
-        }
-        case OPCODE_IMIN:
-        case OPCODE_UMIN:
-        case OPCODE_MIN:
-        case OPCODE_IMAX:
-        case OPCODE_UMAX:
-        case OPCODE_MAX:
-        case OPCODE_MUL:
-        case OPCODE_DIV:
-        case OPCODE_ADD:
-        case OPCODE_DP2:
-        case OPCODE_DP3:
-        case OPCODE_DP4:
-        case OPCODE_NE:
-        case OPCODE_OR:
-        case OPCODE_XOR:
-        case OPCODE_LT:
-        case OPCODE_IEQ:
-        case OPCODE_IADD:
-        case OPCODE_AND:
-        case OPCODE_GE:
-        case OPCODE_IGE:
-        case OPCODE_EQ:
-        case OPCODE_ISHL:
-        case OPCODE_ISHR:
-        case OPCODE_LD:
-        case OPCODE_ILT:
-        case OPCODE_INE:
-        case OPCODE_ATOMIC_AND:
-        case OPCODE_ATOMIC_IADD:
-        case OPCODE_ATOMIC_OR:
-        case OPCODE_ATOMIC_XOR:
-        case OPCODE_ATOMIC_IMAX:
-        case OPCODE_ATOMIC_IMIN:
-        case OPCODE_DADD:
-        case OPCODE_DMAX:
-        case OPCODE_DMIN:
-        case OPCODE_DMUL:
-        case OPCODE_DEQ:
-        case OPCODE_DGE:
-        case OPCODE_DLT:
-        case OPCODE_DNE:
-        case OPCODE_DDIV:
-        {
-            psInst->ui32NumOperands = 3;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            break;
-        }
-        case OPCODE_UGE:
-        case OPCODE_ULT:
-        case OPCODE_USHR:
-        case OPCODE_ATOMIC_UMAX:
-        case OPCODE_ATOMIC_UMIN:
-        {
-            psInst->ui32NumOperands = 3;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            break;
-        }
-            // Instructions with four operands go here
-        case OPCODE_MAD:
-        case OPCODE_MOVC:
-        case OPCODE_IMAD:
-        case OPCODE_UDIV:
-        case OPCODE_LOD:
-        case OPCODE_SAMPLE:
-        case OPCODE_GATHER4:
-        case OPCODE_LD_MS:
-        case OPCODE_UBFE:
-        case OPCODE_IBFE:
-        case OPCODE_ATOMIC_CMP_STORE:
-        case OPCODE_IMM_ATOMIC_IADD:
-        case OPCODE_IMM_ATOMIC_AND:
-        case OPCODE_IMM_ATOMIC_OR:
-        case OPCODE_IMM_ATOMIC_XOR:
-        case OPCODE_IMM_ATOMIC_EXCH:
-        case OPCODE_IMM_ATOMIC_IMAX:
-        case OPCODE_IMM_ATOMIC_IMIN:
-        case OPCODE_DMOVC:
-        case OPCODE_DFMA:
-        case OPCODE_IMUL:
-        {
-            psInst->ui32NumOperands = 4;
-
-            if (eOpcode == OPCODE_IMUL || eOpcode == OPCODE_UDIV)
-            {
-                psInst->ui32FirstSrc = 2;
-            }
-
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-
-            break;
-        }
-        case OPCODE_UADDC:
-        case OPCODE_USUBB:
-        case OPCODE_IMM_ATOMIC_UMAX:
-        case OPCODE_IMM_ATOMIC_UMIN:
-        {
-            psInst->ui32NumOperands = 4;
-
-            if (eOpcode == OPCODE_IMUL)
-            {
-                psInst->ui32FirstSrc = 2;
-            }
-
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-
-            break;
-        }
-        case OPCODE_GATHER4_PO:
-        case OPCODE_SAMPLE_L:
-        case OPCODE_BFI:
-        case OPCODE_SWAPC:
-        case OPCODE_IMM_ATOMIC_CMP_EXCH:
-        {
-            psInst->ui32NumOperands = 5;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[4]);
-
-            break;
-        }
-        case OPCODE_GATHER4_C:
-        case OPCODE_SAMPLE_C:
-        case OPCODE_SAMPLE_C_LZ:
-        case OPCODE_SAMPLE_B:
-        {
-            psInst->ui32NumOperands = 5;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[4]);
-            break;
-        }
-        case OPCODE_GATHER4_PO_C:
-        case OPCODE_SAMPLE_D:
-        {
-            psInst->ui32NumOperands = 6;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[4]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[5]);
-            break;
-        }
-        case OPCODE_IF:
-        case OPCODE_BREAKC:
-        case OPCODE_CONTINUEC:
-        case OPCODE_RETC:
-        case OPCODE_DISCARD:
-        {
-            psInst->eBooleanTestType = DecodeInstrTestBool(*pui32Token);
-            psInst->ui32NumOperands = 1;
-            psInst->ui32FirstSrc = 0;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            break;
-        }
-        case OPCODE_CALLC:
-        {
-            psInst->eBooleanTestType = DecodeInstrTestBool(*pui32Token);
-            psInst->ui32NumOperands = 2;
-            psInst->ui32FirstSrc = 0;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            break;
-        }
-        case OPCODE_CUSTOMDATA:
-        {
-            psInst->ui32NumOperands = 0;
-            ui32TokenLength = pui32Token[1];
-            break;
-        }
-        case OPCODE_EVAL_CENTROID:
-        {
-            psInst->ui32NumOperands = 2;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            break;
-        }
-        case OPCODE_EVAL_SAMPLE_INDEX:
-        case OPCODE_EVAL_SNAPPED:
-        case OPCODE_STORE_UAV_TYPED:
-        case OPCODE_LD_UAV_TYPED:
-        case OPCODE_LD_RAW:
-        case OPCODE_STORE_RAW:
-        {
-            psInst->ui32NumOperands = 3;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            break;
-        }
-        case OPCODE_STORE_STRUCTURED:
-        case OPCODE_LD_STRUCTURED:
-        {
-            psInst->ui32NumOperands = 4;
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-            break;
-        }
-        case OPCODE_RESINFO:
-        {
-            psInst->ui32NumOperands = 3;
-
-            psInst->eResInfoReturnType = DecodeResInfoReturnType(pui32Token[0]);
-
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-            ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-            break;
-        }
-        case OPCODE_MSAD:
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    UpdateInstructionReferences(psShader, psInst);
-
-    return pui32Token + ui32TokenLength;
-}
-
-void BindTextureToSampler(Shader* psShader, uint32_t ui32TextureRegister, uint32_t ui32SamplerRegister, uint32_t bCompare)
-{
-    uint32_t ui32Sampler, ui32TextureUnit, bLoad;
-    ASSERT(ui32TextureRegister < (1 << 10));
-    ASSERT(ui32SamplerRegister < (1 << 10));
-
-    if (psShader->sInfo.ui32NumSamplers >= MAX_RESOURCE_BINDINGS)
-    {
-        ASSERT(0);
-        return;
-    }
-
-    ui32TextureUnit = ui32TextureRegister;
-    for (ui32Sampler = 0; ui32Sampler < psShader->sInfo.ui32NumSamplers; ++ui32Sampler)
-    {
-        if (psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10TextureBindPoint == ui32TextureRegister)
-        {
-            if (psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10SamplerBindPoint == ui32SamplerRegister)
-                break;
-            ui32TextureUnit = MAX_RESOURCE_BINDINGS;  // Texture is used by two or more samplers - assign to an available texture unit later
-        }
-    }
-
-    // MAX_RESOURCE_BINDINGS means no sampler object (used for texture load)
-    bLoad = ui32SamplerRegister == MAX_RESOURCE_BINDINGS;
-
-    if (bCompare)
-        psShader->sInfo.asSamplers[ui32Sampler].sMask.bCompareSample = 1;
-    else if (!bLoad)
-        psShader->sInfo.asSamplers[ui32Sampler].sMask.bNormalSample = 1;
-    else
-    {
-        psShader->sInfo.asSamplers[ui32Sampler].sMask.bNormalSample = 0;
-        psShader->sInfo.asSamplers[ui32Sampler].sMask.bCompareSample = 0;
-    }
-
-    if (ui32Sampler == psShader->sInfo.ui32NumSamplers)
-    {
-        psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10TextureBindPoint = ui32TextureRegister;
-        psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10SamplerBindPoint = ui32SamplerRegister;
-        psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10TextureUnit = ui32TextureUnit;
-        ++psShader->sInfo.ui32NumSamplers;
-    }
-}
-
-void RegisterUniformBuffer(Shader* psShader, ResourceGroup eGroup, uint32_t ui32BindPoint)
-{
-    uint32_t ui32UniformBuffer = psShader->sInfo.ui32NumUniformBuffers;
-    psShader->sInfo.asUniformBuffers[ui32UniformBuffer].ui32BindPoint = ui32BindPoint;
-    psShader->sInfo.asUniformBuffers[ui32UniformBuffer].eGroup = eGroup;
-    ++psShader->sInfo.ui32NumUniformBuffers;
-}
-
-void RegisterStorageBuffer(Shader* psShader, ResourceGroup eGroup, uint32_t ui32BindPoint)
-{
-    uint32_t ui32StorageBuffer = psShader->sInfo.ui32NumStorageBuffers;
-    psShader->sInfo.asStorageBuffers[ui32StorageBuffer].ui32BindPoint = ui32BindPoint;
-    psShader->sInfo.asStorageBuffers[ui32StorageBuffer].eGroup = eGroup;
-    ++psShader->sInfo.ui32NumStorageBuffers;
-}
-
-void RegisterImage(Shader* psShader, ResourceGroup eGroup, uint32_t ui32BindPoint)
-{
-    uint32_t ui32Image = psShader->sInfo.ui32NumImages;
-    psShader->sInfo.asImages[ui32Image].ui32BindPoint = ui32BindPoint;
-    psShader->sInfo.asImages[ui32Image].eGroup = eGroup;
-    ++psShader->sInfo.ui32NumImages;
-}
-
-void AssignRemainingSamplers(Shader* psShader)
-{
-    uint32_t ui32Sampler;
-    uint32_t aui32TextureUnitsUsed[(MAX_RESOURCE_BINDINGS + 31) / 32];
-    uint32_t ui32MinAvailUnit;
-
-    memset((void*)aui32TextureUnitsUsed, 0, sizeof(aui32TextureUnitsUsed));
-    for (ui32Sampler = 0; ui32Sampler < psShader->sInfo.ui32NumSamplers; ++ui32Sampler)
-    {
-        uint32_t ui32Unit = psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10TextureUnit;
-        if (ui32Unit < MAX_RESOURCE_BINDINGS)
-            aui32TextureUnitsUsed[ui32Unit / 32] |= 1 << (ui32Unit % 32);
-    }
-
-    ui32MinAvailUnit = 0;
-    for (ui32Sampler = 0; ui32Sampler < psShader->sInfo.ui32NumSamplers; ++ui32Sampler)
-    {
-        uint32_t ui32Unit = psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10TextureUnit;
-        if (ui32Unit == MAX_RESOURCE_BINDINGS)
-        {
-            uint32_t ui32Mask, ui32AvailUnit;
-            uint32_t ui32WordIndex = ui32MinAvailUnit / 32;
-            uint32_t ui32BitIndex = ui32MinAvailUnit % 32;
-
-            while (ui32WordIndex < sizeof(aui32TextureUnitsUsed))
-            {
-                if (aui32TextureUnitsUsed[ui32WordIndex] != ~0L)
-                    break;
-                ++ui32WordIndex;
-                ui32BitIndex = 0;
-            }
-            if (ui32WordIndex == sizeof(aui32TextureUnitsUsed))
-            {
-                ASSERT(0);  // Not enough resource bindings
-                break;
-            }
-
-            ui32Mask = aui32TextureUnitsUsed[ui32WordIndex];
-            while (ui32BitIndex < 32)
-            {
-                if ((ui32Mask & (1 << ui32BitIndex)) == 0)
-                    break;
-                ++ui32BitIndex;
-            }
-            if (ui32BitIndex == 32)
-            {
-                ASSERT(0);
-                break;
-            }
-
-            ui32AvailUnit = 32 * ui32WordIndex + ui32BitIndex;
-            aui32TextureUnitsUsed[ui32WordIndex] |= (1 << ui32BitIndex);
-
-            psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10TextureUnit = ui32AvailUnit;
-            ui32MinAvailUnit = ui32AvailUnit + 1;
-
-            ASSERT(psShader->sInfo.asSamplers[ui32Sampler].sMask.ui10TextureUnit < MAX_RESOURCE_BINDINGS);
-        }
-    }
-}
-
-void UpdateDeclarationReferences(Shader* psShader, Declaration* psDecl)
-{
-    switch (psDecl->eOpcode)
-    {
-        case OPCODE_DCL_CONSTANT_BUFFER:
-            RegisterUniformBuffer(psShader, RGROUP_CBUFFER, psDecl->asOperands[0].aui32ArraySizes[0]);
-            break;
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-            RegisterImage(psShader, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber);
-            break;
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-            RegisterStorageBuffer(psShader, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber);
-            break;
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-            RegisterStorageBuffer(psShader, RGROUP_UAV, psDecl->asOperands[0].aui32ArraySizes[0]);
-            break;
-        case OPCODE_DCL_RESOURCE_RAW:
-            RegisterStorageBuffer(psShader, RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber);
-            break;
-        case OPCODE_DCL_RESOURCE_STRUCTURED:
-            RegisterStorageBuffer(psShader, RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber);
-            break;
-    }
-}
-
-void UpdateInstructionReferences(Shader* psShader, Instruction* psInst)
-{
-    uint32_t ui32Operand;
-    const uint32_t ui32NumOperands = psInst->ui32NumOperands;
-    for (ui32Operand = 0; ui32Operand < ui32NumOperands; ++ui32Operand)
-    {
-        Operand* psOperand = &psInst->asOperands[ui32Operand];
-        if (psOperand->eType == OPERAND_TYPE_INPUT || psOperand->eType == OPERAND_TYPE_INPUT_CONTROL_POINT)
-        {
-            if (psOperand->iIndexDims == INDEX_2D)
-            {
-                if (psOperand->aui32ArraySizes[1] != 0)  // gl_in[].gl_Position
-                {
-                    psShader->abInputReferencedByInstruction[psOperand->ui32RegisterNumber] = 1;
-                }
-            }
-            else
-            {
-                psShader->abInputReferencedByInstruction[psOperand->ui32RegisterNumber] = 1;
-            }
-        }
-    }
-
-    switch (psInst->eOpcode)
-    {
-        case OPCODE_SWAPC:
-            psShader->bUseTempCopy = 1;
-            break;
-        case OPCODE_SAMPLE:
-        case OPCODE_SAMPLE_L:
-        case OPCODE_SAMPLE_D:
-        case OPCODE_SAMPLE_B:
-        case OPCODE_GATHER4:
-            BindTextureToSampler(psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 0);
-            break;
-        case OPCODE_SAMPLE_C_LZ:
-        case OPCODE_SAMPLE_C:
-        case OPCODE_GATHER4_C:
-            BindTextureToSampler(psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1);
-            break;
-        case OPCODE_GATHER4_PO:
-            BindTextureToSampler(psShader, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[4].ui32RegisterNumber, 0);
-            break;
-        case OPCODE_GATHER4_PO_C:
-            BindTextureToSampler(psShader, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[4].ui32RegisterNumber, 1);
-            break;
-        case OPCODE_LD:
-        case OPCODE_LD_MS:
-            // MAX_RESOURCE_BINDINGS means no sampler object
-            BindTextureToSampler(psShader, psInst->asOperands[2].ui32RegisterNumber, MAX_RESOURCE_BINDINGS, 0);
-            break;
-    }
-}
-
-const uint32_t* DecodeHullShaderJoinPhase(const uint32_t* pui32Tokens, Shader* psShader)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = psShader->ui32ShaderLength;
-
-    Instruction* psInst;
-
-    // Declarations
-    Declaration* psDecl;
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32ShaderLength);
-    psShader->psHSJoinPhaseDecl = psDecl;
-    psShader->ui32HSJoinDeclCount = 0;
-
-    while (1)  // Keep going until we reach the first non-declaration token, or the end of the shader.
-    {
-        const uint32_t* pui32Result = DecodeDeclaration(psShader, pui32CurrentToken, psDecl);
-
-        if (pui32Result)
-        {
-            pui32CurrentToken = pui32Result;
-            psShader->ui32HSJoinDeclCount++;
-            psDecl++;
-
-            if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    // Instructions
-    psInst = hlslcc_malloc(sizeof(Instruction) * ui32ShaderLength);
-    psShader->psHSJoinPhaseInstr = psInst;
-    psShader->ui32HSJoinInstrCount = 0;
-
-    while (pui32CurrentToken < (psShader->pui32FirstToken + ui32ShaderLength))
-    {
-        const uint32_t* nextInstr = DecodeInstruction(pui32CurrentToken, psInst, psShader);
-
-#ifdef _DEBUG
-        if (nextInstr == pui32CurrentToken)
-        {
-            ASSERT(0);
-            break;
-        }
-#endif
-
-        pui32CurrentToken = nextInstr;
-        psShader->ui32HSJoinInstrCount++;
-
-        psInst++;
-    }
-
-    return pui32CurrentToken;
-}
-
-const uint32_t* DecodeHullShaderForkPhase(const uint32_t* pui32Tokens, Shader* psShader)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = psShader->ui32ShaderLength;
-    const uint32_t ui32ForkPhaseIndex = psShader->ui32ForkPhaseCount;
-
-    Instruction* psInst;
-
-    // Declarations
-    Declaration* psDecl;
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32ShaderLength);
-
-    ASSERT(ui32ForkPhaseIndex < MAX_FORK_PHASES);
-
-    psShader->ui32ForkPhaseCount++;
-
-    psShader->apsHSForkPhaseDecl[ui32ForkPhaseIndex] = psDecl;
-    psShader->aui32HSForkDeclCount[ui32ForkPhaseIndex] = 0;
-
-    while (1)  // Keep going until we reach the first non-declaration token, or the end of the shader.
-    {
-        const uint32_t* pui32Result = DecodeDeclaration(psShader, pui32CurrentToken, psDecl);
-
-        if (pui32Result)
-        {
-            pui32CurrentToken = pui32Result;
-            psShader->aui32HSForkDeclCount[ui32ForkPhaseIndex]++;
-            psDecl++;
-
-            if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    // Instructions
-    psInst = hlslcc_malloc(sizeof(Instruction) * ui32ShaderLength);
-    psShader->apsHSForkPhaseInstr[ui32ForkPhaseIndex] = psInst;
-    psShader->aui32HSForkInstrCount[ui32ForkPhaseIndex] = 0;
-
-    while (pui32CurrentToken < (psShader->pui32FirstToken + ui32ShaderLength))
-    {
-        const uint32_t* nextInstr = DecodeInstruction(pui32CurrentToken, psInst, psShader);
-
-#ifdef _DEBUG
-        if (nextInstr == pui32CurrentToken)
-        {
-            ASSERT(0);
-            break;
-        }
-#endif
-
-        pui32CurrentToken = nextInstr;
-
-        if (psInst->eOpcode == OPCODE_HS_FORK_PHASE)
-        {
-            pui32CurrentToken = DecodeHullShaderForkPhase(pui32CurrentToken, psShader);
-            return pui32CurrentToken;
-        }
-
-        psShader->aui32HSForkInstrCount[ui32ForkPhaseIndex]++;
-        psInst++;
-    }
-
-    return pui32CurrentToken;
-}
-
-const uint32_t* DecodeHullShaderControlPointPhase(const uint32_t* pui32Tokens, Shader* psShader)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = psShader->ui32ShaderLength;
-
-    Instruction* psInst;
-
-    // TODO one block of memory for instructions and declarions to reduce memory usage and number of allocs.
-    // hlscc_malloc max(sizeof(declaration), sizeof(instruction) * shader length; or sizeof(DeclInst) - unifying both structs.
-
-    // Declarations
-    Declaration* psDecl;
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32ShaderLength);
-    psShader->psHSControlPointPhaseDecl = psDecl;
-    psShader->ui32HSControlPointDeclCount = 0;
-
-    while (1)  // Keep going until we reach the first non-declaration token, or the end of the shader.
-    {
-        const uint32_t* pui32Result = DecodeDeclaration(psShader, pui32CurrentToken, psDecl);
-
-        if (pui32Result)
-        {
-            pui32CurrentToken = pui32Result;
-            psShader->ui32HSControlPointDeclCount++;
-            psDecl++;
-
-            if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    // Instructions
-    psInst = hlslcc_malloc(sizeof(Instruction) * ui32ShaderLength);
-    psShader->psHSControlPointPhaseInstr = psInst;
-    psShader->ui32HSControlPointInstrCount = 0;
-
-    while (pui32CurrentToken < (psShader->pui32FirstToken + ui32ShaderLength))
-    {
-        const uint32_t* nextInstr = DecodeInstruction(pui32CurrentToken, psInst, psShader);
-
-#ifdef _DEBUG
-        if (nextInstr == pui32CurrentToken)
-        {
-            ASSERT(0);
-            break;
-        }
-#endif
-
-        pui32CurrentToken = nextInstr;
-
-        if (psInst->eOpcode == OPCODE_HS_FORK_PHASE)
-        {
-            pui32CurrentToken = DecodeHullShaderForkPhase(pui32CurrentToken, psShader);
-            return pui32CurrentToken;
-        }
-        if (psInst->eOpcode == OPCODE_HS_JOIN_PHASE)
-        {
-            pui32CurrentToken = DecodeHullShaderJoinPhase(pui32CurrentToken, psShader);
-            return pui32CurrentToken;
-        }
-        psInst++;
-        psShader->ui32HSControlPointInstrCount++;
-    }
-
-    return pui32CurrentToken;
-}
-
-const uint32_t* DecodeHullShader(const uint32_t* pui32Tokens, Shader* psShader)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = psShader->ui32ShaderLength;
-    Declaration* psDecl;
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32ShaderLength);
-    psShader->psHSDecl = psDecl;
-    psShader->ui32HSDeclCount = 0;
-
-    while (1)  // Keep going until we reach the first non-declaration token, or the end of the shader.
-    {
-        const uint32_t* pui32Result = DecodeDeclaration(psShader, pui32CurrentToken, psDecl);
-
-        if (pui32Result)
-        {
-            pui32CurrentToken = pui32Result;
-
-            if (psDecl->eOpcode == OPCODE_HS_CONTROL_POINT_PHASE)
-            {
-                pui32CurrentToken = DecodeHullShaderControlPointPhase(pui32CurrentToken, psShader);
-                return pui32CurrentToken;
-            }
-            if (psDecl->eOpcode == OPCODE_HS_FORK_PHASE)
-            {
-                pui32CurrentToken = DecodeHullShaderForkPhase(pui32CurrentToken, psShader);
-                return pui32CurrentToken;
-            }
-            if (psDecl->eOpcode == OPCODE_HS_JOIN_PHASE)
-            {
-                pui32CurrentToken = DecodeHullShaderJoinPhase(pui32CurrentToken, psShader);
-                return pui32CurrentToken;
-            }
-
-            psDecl++;
-            psShader->ui32HSDeclCount++;
-
-            if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    return pui32CurrentToken;
-}
-
-void Decode(const uint32_t* pui32Tokens, Shader* psShader)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = pui32Tokens[1];
-    Instruction* psInst;
-    Declaration* psDecl;
-
-    psShader->ui32MajorVersion = DecodeProgramMajorVersion(*pui32CurrentToken);
-    psShader->ui32MinorVersion = DecodeProgramMinorVersion(*pui32CurrentToken);
-    psShader->eShaderType = DecodeShaderType(*pui32CurrentToken);
-
-    pui32CurrentToken++;  // Move to shader length
-    psShader->ui32ShaderLength = ui32ShaderLength;
-    pui32CurrentToken++;  // Move to after shader length (usually a declaration)
-
-    psShader->pui32FirstToken = pui32Tokens;
-
-#ifdef _DEBUG
-    operandID = 0;
-    instructionID = 0;
-#endif
-
-    if (psShader->eShaderType == HULL_SHADER)
-    {
-        pui32CurrentToken = DecodeHullShader(pui32CurrentToken, psShader);
-        return;
-    }
-
-    // Using ui32ShaderLength as the instruction count
-    // will allocate more than enough memory. Avoids having to
-    // traverse the entire shader just to get the real instruction count.
-    psInst = hlslcc_malloc(sizeof(Instruction) * ui32ShaderLength);
-    psShader->psInst = psInst;
-    psShader->ui32InstCount = 0;
-
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32ShaderLength);
-    psShader->psDecl = psDecl;
-    psShader->ui32DeclCount = 0;
-
-    while (1)  // Keep going until we reach the first non-declaration token, or the end of the shader.
-    {
-        const uint32_t* pui32Result = DecodeDeclaration(psShader, pui32CurrentToken, psDecl);
-
-        if (pui32Result)
-        {
-            pui32CurrentToken = pui32Result;
-            psShader->ui32DeclCount++;
-            psDecl++;
-
-            if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    while (pui32CurrentToken < (psShader->pui32FirstToken + ui32ShaderLength))
-    {
-        const uint32_t* nextInstr = DecodeInstruction(pui32CurrentToken, psInst, psShader);
-
-#ifdef _DEBUG
-        if (nextInstr == pui32CurrentToken)
-        {
-            ASSERT(0);
-            break;
-        }
-#endif
-
-        pui32CurrentToken = nextInstr;
-        psShader->ui32InstCount++;
-        psInst++;
-    }
-
-    AssignRemainingSamplers(psShader);
-}
-
-Shader* DecodeDXBC(uint32_t* data)
-{
-    Shader* psShader;
-    DXBCContainerHeader* header = (DXBCContainerHeader*)data;
-    uint32_t i;
-    uint32_t chunkCount;
-    uint32_t* chunkOffsets;
-    ReflectionChunks refChunks;
-    uint32_t* shaderChunk = 0;
-
-    if (header->fourcc != FOURCC_DXBC)
-    {
-        // Could be SM1/2/3. If the shader type token
-        // looks valid then we continue
-        uint32_t type = DecodeShaderTypeDX9(data[0]);
-
-        if (type != INVALID_SHADER)
-        {
-            return DecodeDX9BC(data);
-        }
-        return 0;
-    }
-
-    refChunks.pui32Inputs = NULL;
-    refChunks.pui32Interfaces = NULL;
-    refChunks.pui32Outputs = NULL;
-    refChunks.pui32Resources = NULL;
-    refChunks.pui32Inputs11 = NULL;
-    refChunks.pui32Outputs11 = NULL;
-    refChunks.pui32OutputsWithStreams = NULL;
-
-    chunkOffsets = (uint32_t*)(header + 1);
-
-    chunkCount = header->chunkCount;
-
-    for (i = 0; i < chunkCount; ++i)
-    {
-        uint32_t offset = chunkOffsets[i];
-
-        DXBCChunkHeader* chunk = (DXBCChunkHeader*)((char*)data + offset);
-
-        switch (chunk->fourcc)
-        {
-            case FOURCC_ISGN:
-            {
-                refChunks.pui32Inputs = (uint32_t*)(chunk + 1);
-                break;
-            }
-            case FOURCC_ISG1:
-            {
-                refChunks.pui32Inputs11 = (uint32_t*)(chunk + 1);
-                break;
-            }
-            case FOURCC_RDEF:
-            {
-                refChunks.pui32Resources = (uint32_t*)(chunk + 1);
-                break;
-            }
-            case FOURCC_IFCE:
-            {
-                refChunks.pui32Interfaces = (uint32_t*)(chunk + 1);
-                break;
-            }
-            case FOURCC_OSGN:
-            {
-                refChunks.pui32Outputs = (uint32_t*)(chunk + 1);
-                break;
-            }
-            case FOURCC_OSG1:
-            {
-                refChunks.pui32Outputs11 = (uint32_t*)(chunk + 1);
-                break;
-            }
-            case FOURCC_OSG5:
-            {
-                refChunks.pui32OutputsWithStreams = (uint32_t*)(chunk + 1);
-                break;
-            }
-            case FOURCC_SHDR:
-            case FOURCC_SHEX:
-            {
-                shaderChunk = (uint32_t*)(chunk + 1);
-                break;
-            }
-            default:
-            {
-                break;
-            }
-        }
-    }
-
-    if (shaderChunk)
-    {
-        uint32_t ui32MajorVersion;
-        uint32_t ui32MinorVersion;
-
-        psShader = hlslcc_calloc(1, sizeof(Shader));
-
-        ui32MajorVersion = DecodeProgramMajorVersion(*shaderChunk);
-        ui32MinorVersion = DecodeProgramMinorVersion(*shaderChunk);
-
-        LoadShaderInfo(ui32MajorVersion, ui32MinorVersion, &refChunks, &psShader->sInfo);
-
-        Decode(shaderChunk, psShader);
-
-        return psShader;
-    }
-
-    return 0;
-}
diff --git a/Code/Tools/HLSLCrossCompiler/src/decodeDX9.c b/Code/Tools/HLSLCrossCompiler/src/decodeDX9.c
deleted file mode 100644
index 68f4dd6225..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/decodeDX9.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/debug.h"
-#include "internal_includes/decode.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "internal_includes/reflect.h"
-#include "internal_includes/structs.h"
-#include "internal_includes/tokens.h"
-#include "stdio.h"
-#include "stdlib.h"
-
-enum
-{
-    FOURCC_CTAB = FOURCC('C', 'T', 'A', 'B')
-};  // Constant table
-
-#ifdef _DEBUG
-static uint64_t dx9operandID = 0;
-static uint64_t dx9instructionID = 0;
-#endif
-
-static uint32_t aui32ImmediateConst[256];
-static uint32_t ui32MaxTemp = 0;
-
-uint32_t DX9_DECODE_OPERAND_IS_SRC = 0x1;
-uint32_t DX9_DECODE_OPERAND_IS_DEST = 0x2;
-uint32_t DX9_DECODE_OPERAND_IS_DECL = 0x4;
-
-uint32_t DX9_DECODE_OPERAND_IS_CONST = 0x8;
-uint32_t DX9_DECODE_OPERAND_IS_ICONST = 0x10;
-uint32_t DX9_DECODE_OPERAND_IS_BCONST = 0x20;
-
-#define MAX_INPUTS 64
-
-static DECLUSAGE_DX9 aeInputUsage[MAX_INPUTS];
-static uint32_t aui32InputUsageIndex[MAX_INPUTS];
-
-static void DecodeOperandDX9(const Shader* psShader, const uint32_t ui32Token, const uint32_t ui32Token1, uint32_t ui32Flags, Operand* psOperand)
-{
-    const uint32_t ui32RegNum = DecodeOperandRegisterNumberDX9(ui32Token);
-    const uint32_t ui32RegType = DecodeOperandTypeDX9(ui32Token);
-    const uint32_t bRelativeAddr = DecodeOperandIsRelativeAddressModeDX9(ui32Token);
-
-    const uint32_t ui32WriteMask = DecodeDestWriteMaskDX9(ui32Token);
-    const uint32_t ui32Swizzle = DecodeOperandSwizzleDX9(ui32Token);
-
-    SHADER_VARIABLE_TYPE ConstType;
-
-    psOperand->ui32RegisterNumber = ui32RegNum;
-
-    psOperand->iNumComponents = 4;
-
-#ifdef _DEBUG
-    psOperand->id = dx9operandID++;
-#endif
-
-    psOperand->iWriteMaskEnabled = 0;
-    psOperand->iGSInput = 0;
-    psOperand->iExtended = 0;
-    psOperand->psSubOperand[0] = 0;
-    psOperand->psSubOperand[1] = 0;
-    psOperand->psSubOperand[2] = 0;
-
-    psOperand->iIndexDims = INDEX_0D;
-
-    psOperand->iIntegerImmediate = 0;
-
-    psOperand->pszSpecialName[0] = '\0';
-
-    psOperand->eModifier = OPERAND_MODIFIER_NONE;
-    if (ui32Flags & DX9_DECODE_OPERAND_IS_SRC)
-    {
-        uint32_t ui32Modifier = DecodeSrcModifierDX9(ui32Token);
-
-        switch (ui32Modifier)
-        {
-            case SRCMOD_DX9_NONE:
-            {
-                break;
-            }
-            case SRCMOD_DX9_NEG:
-            {
-                psOperand->eModifier = OPERAND_MODIFIER_NEG;
-                break;
-            }
-            case SRCMOD_DX9_ABS:
-            {
-                psOperand->eModifier = OPERAND_MODIFIER_ABS;
-                break;
-            }
-            case SRCMOD_DX9_ABSNEG:
-            {
-                psOperand->eModifier = OPERAND_MODIFIER_ABSNEG;
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-        }
-    }
-
-    if ((ui32Flags & DX9_DECODE_OPERAND_IS_DECL) == 0)
-    {
-        if (ui32Flags & DX9_DECODE_OPERAND_IS_DEST)
-        {
-            if (ui32WriteMask != DX9_WRITEMASK_ALL)
-            {
-                psOperand->iWriteMaskEnabled = 1;
-                psOperand->eSelMode = OPERAND_4_COMPONENT_MASK_MODE;
-
-                if (ui32WriteMask & DX9_WRITEMASK_0)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_X;
-                }
-                if (ui32WriteMask & DX9_WRITEMASK_1)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_Y;
-                }
-                if (ui32WriteMask & DX9_WRITEMASK_2)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_Z;
-                }
-                if (ui32WriteMask & DX9_WRITEMASK_3)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_W;
-                }
-            }
-        }
-        else if (ui32Swizzle != NO_SWIZZLE_DX9)
-        {
-            uint32_t component;
-
-            psOperand->iWriteMaskEnabled = 1;
-            psOperand->eSelMode = OPERAND_4_COMPONENT_SWIZZLE_MODE;
-
-            psOperand->ui32Swizzle = 1;
-
-            /* Add the swizzle */
-            if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(0))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_X;
-            }
-            else if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(1))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_Y;
-            }
-            else if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(2))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_Z;
-            }
-            else if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(3))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_W;
-            }
-            else
-            {
-                for (component = 0; component < 4; component++)
-                {
-                    uint32_t ui32CompSwiz = ui32Swizzle & (3 << (DX9_SWIZZLE_SHIFT + (component * 2)));
-                    ui32CompSwiz >>= (DX9_SWIZZLE_SHIFT + (component * 2));
-
-                    if (ui32CompSwiz == 0)
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_X;
-                    }
-                    else if (ui32CompSwiz == 1)
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_Y;
-                    }
-                    else if (ui32CompSwiz == 2)
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_Z;
-                    }
-                    else
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_W;
-                    }
-                }
-            }
-        }
-
-        if (bRelativeAddr)
-        {
-            psOperand->psSubOperand[0] = hlslcc_malloc(sizeof(Operand));
-            DecodeOperandDX9(psShader, ui32Token1, 0, ui32Flags, psOperand->psSubOperand[0]);
-
-            psOperand->iIndexDims = INDEX_1D;
-
-            psOperand->eIndexRep[0] = OPERAND_INDEX_RELATIVE;
-
-            psOperand->aui32ArraySizes[0] = 0;
-        }
-    }
-
-    if (ui32RegType == OPERAND_TYPE_DX9_CONSTBOOL)
-    {
-        ui32Flags |= DX9_DECODE_OPERAND_IS_BCONST;
-        ConstType = SVT_BOOL;
-    }
-    else if (ui32RegType == OPERAND_TYPE_DX9_CONSTINT)
-    {
-        ui32Flags |= DX9_DECODE_OPERAND_IS_ICONST;
-        ConstType = SVT_INT;
-    }
-    else if (ui32RegType == OPERAND_TYPE_DX9_CONST)
-    {
-        ui32Flags |= DX9_DECODE_OPERAND_IS_CONST;
-        ConstType = SVT_FLOAT;
-    }
-
-    switch (ui32RegType)
-    {
-        case OPERAND_TYPE_DX9_TEMP:
-        {
-            psOperand->eType = OPERAND_TYPE_TEMP;
-
-            if (ui32MaxTemp < ui32RegNum + 1)
-            {
-                ui32MaxTemp = ui32RegNum + 1;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_INPUT:
-        {
-            psOperand->eType = OPERAND_TYPE_INPUT;
-
-            ASSERT(ui32RegNum < MAX_INPUTS);
-
-            if (psShader->eShaderType == PIXEL_SHADER)
-            {
-                if (aeInputUsage[ui32RegNum] == DECLUSAGE_TEXCOORD)
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_TEXCOORD;
-                    psOperand->ui32RegisterNumber = aui32InputUsageIndex[ui32RegNum];
-                }
-                else
-                    // 0 = base colour, 1 = offset colour.
-                    if (ui32RegNum == 0)
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_OUTBASECOLOUR;
-                }
-                else
-                {
-                    ASSERT(ui32RegNum == 1);
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR;
-                }
-            }
-            break;
-        }
-            // Same value as OPERAND_TYPE_DX9_TEXCRDOUT
-            // OPERAND_TYPE_DX9_TEXCRDOUT is the pre-SM3 equivalent
-        case OPERAND_TYPE_DX9_OUTPUT:
-        {
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-
-            if (psShader->eShaderType == VERTEX_SHADER)
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_TEXCOORD;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_RASTOUT:
-        {
-            // RegNum:
-            // 0=POSIION
-            // 1=FOG
-            // 2=POINTSIZE
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-            switch (ui32RegNum)
-            {
-                case 0:
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_POSITION;
-                    break;
-                }
-                case 1:
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_FOG;
-                    break;
-                }
-                case 2:
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_POINTSIZE;
-                    psOperand->iNumComponents = 1;
-                    break;
-                }
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_ATTROUT:
-        {
-            ASSERT(psShader->eShaderType == VERTEX_SHADER);
-
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-
-            // 0 = base colour, 1 = offset colour.
-            if (ui32RegNum == 0)
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_OUTBASECOLOUR;
-            }
-            else
-            {
-                ASSERT(ui32RegNum == 1);
-                psOperand->eType = OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR;
-            }
-
-            break;
-        }
-        case OPERAND_TYPE_DX9_COLOROUT:
-        {
-            ASSERT(psShader->eShaderType == PIXEL_SHADER);
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-            break;
-        }
-        case OPERAND_TYPE_DX9_CONSTBOOL:
-        case OPERAND_TYPE_DX9_CONSTINT:
-        case OPERAND_TYPE_DX9_CONST:
-        {
-            // c# = constant float
-            // i# = constant int
-            // b# = constant bool
-
-            // c0 might be an immediate while i0 is in the constant buffer
-            if (aui32ImmediateConst[ui32RegNum] & ui32Flags)
-            {
-                if (ConstType != SVT_FLOAT)
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_IMMCONSTINT;
-                }
-                else
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_IMMCONST;
-                }
-            }
-            else
-            {
-                psOperand->eType = OPERAND_TYPE_CONSTANT_BUFFER;
-                psOperand->aui32ArraySizes[1] = psOperand->ui32RegisterNumber;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_ADDR:
-        {
-            // Vertex shader: address register (only have one of these)
-            // Pixel shader: texture coordinate register (a few of these)
-            if (psShader->eShaderType == PIXEL_SHADER)
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_TEXCOORD;
-            }
-            else
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_ADDRESS;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_SAMPLER:
-        {
-            psOperand->eType = OPERAND_TYPE_RESOURCE;
-            break;
-        }
-        case OPERAND_TYPE_DX9_LOOP:
-        {
-            psOperand->eType = OPERAND_TYPE_SPECIAL_LOOPCOUNTER;
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-}
-
-static void DeclareNumTemps(Shader* psShader, const uint32_t ui32NumTemps, Declaration* psDecl)
-{
-    (void)psShader;
-
-    psDecl->eOpcode = OPCODE_DCL_TEMPS;
-    psDecl->value.ui32NumTemps = ui32NumTemps;
-}
-
-static void SetupRegisterUsage(const Shader* psShader, const uint32_t ui32Token0, const uint32_t ui32Token1)
-{
-    (void)psShader;
-
-    DECLUSAGE_DX9 eUsage = DecodeUsageDX9(ui32Token0);
-    uint32_t ui32UsageIndex = DecodeUsageIndexDX9(ui32Token0);
-    uint32_t ui32RegNum = DecodeOperandRegisterNumberDX9(ui32Token1);
-    uint32_t ui32RegType = DecodeOperandTypeDX9(ui32Token1);
-
-    if (ui32RegType == OPERAND_TYPE_DX9_INPUT)
-    {
-        ASSERT(ui32RegNum < MAX_INPUTS);
-        aeInputUsage[ui32RegNum] = eUsage;
-        aui32InputUsageIndex[ui32RegNum] = ui32UsageIndex;
-    }
-}
-
-// Declaring one constant from a constant buffer will cause all constants in the buffer decalared.
-// In dx9 there is only one constant buffer per shader.
-static void DeclareConstantBuffer(const Shader* psShader, Declaration* psDecl)
-{
-    // Pick any constant register in the table. Might not start at c0 (e.g. when register(cX) is used).
-    uint32_t ui32RegNum = psShader->sInfo.psConstantBuffers->asVars[0].ui32StartOffset / 16;
-    OPERAND_TYPE_DX9 ui32RegType = OPERAND_TYPE_DX9_CONST;
-
-    if (psShader->sInfo.psConstantBuffers->asVars[0].sType.Type == SVT_INT)
-    {
-        ui32RegType = OPERAND_TYPE_DX9_CONSTINT;
-    }
-    else if (psShader->sInfo.psConstantBuffers->asVars[0].sType.Type == SVT_BOOL)
-    {
-        ui32RegType = OPERAND_TYPE_DX9_CONSTBOOL;
-    }
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT;
-    }
-    else
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT_PS;
-    }
-    psDecl->ui32NumOperands = 1;
-
-    DecodeOperandDX9(psShader, CreateOperandTokenDX9(ui32RegNum, ui32RegType), 0, DX9_DECODE_OPERAND_IS_DECL, &psDecl->asOperands[0]);
-
-    ASSERT(psDecl->asOperands[0].eType == OPERAND_TYPE_CONSTANT_BUFFER);
-
-    psDecl->eOpcode = OPCODE_DCL_CONSTANT_BUFFER;
-
-    ASSERT(psShader->sInfo.ui32NumConstantBuffers);
-
-    psDecl->asOperands[0].aui32ArraySizes[0] = 0;                                                               // Const buffer index
-    psDecl->asOperands[0].aui32ArraySizes[1] = psShader->sInfo.psConstantBuffers[0].ui32TotalSizeInBytes / 16;  // Number of vec4 constants.
-}
-
-static void DecodeDeclarationDX9(const Shader* psShader, const uint32_t ui32Token0, const uint32_t ui32Token1, Declaration* psDecl)
-{
-    uint32_t ui32RegType = DecodeOperandTypeDX9(ui32Token1);
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT;
-    }
-    else
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT_PS;
-    }
-    psDecl->ui32NumOperands = 1;
-    DecodeOperandDX9(psShader, ui32Token1, 0, DX9_DECODE_OPERAND_IS_DECL, &psDecl->asOperands[0]);
-
-    if (ui32RegType == OPERAND_TYPE_DX9_SAMPLER)
-    {
-        const RESOURCE_DIMENSION eResDim = DecodeTextureTypeMaskDX9(ui32Token0);
-        psDecl->value.eResourceDimension = eResDim;
-        psDecl->eOpcode = OPCODE_DCL_RESOURCE;
-    }
-
-    if (psDecl->asOperands[0].eType == OPERAND_TYPE_OUTPUT)
-    {
-        psDecl->eOpcode = OPCODE_DCL_OUTPUT;
-
-        if (psDecl->asOperands[0].ui32RegisterNumber == 0 && psShader->eShaderType == VERTEX_SHADER)
-        {
-            psDecl->eOpcode = OPCODE_DCL_OUTPUT_SIV;
-            // gl_Position
-            psDecl->asOperands[0].eSpecialName = NAME_POSITION;
-        }
-    }
-    else if (psDecl->asOperands[0].eType == OPERAND_TYPE_CONSTANT_BUFFER)
-    {
-        psDecl->eOpcode = OPCODE_DCL_CONSTANT_BUFFER;
-
-        ASSERT(psShader->sInfo.ui32NumConstantBuffers);
-
-        psDecl->asOperands[0].aui32ArraySizes[0] = 0;                                                               // Const buffer index
-        psDecl->asOperands[0].aui32ArraySizes[1] = psShader->sInfo.psConstantBuffers[0].ui32TotalSizeInBytes / 16;  // Number of vec4 constants.
-    }
-}
-
-static void DefineDX9(Shader* psShader,
-                      const uint32_t ui32RegNum,
-                      const uint32_t ui32Flags,
-                      const uint32_t c0,
-                      const uint32_t c1,
-                      const uint32_t c2,
-                      const uint32_t c3,
-                      Declaration* psDecl)
-{
-    (void)psShader;
-
-    psDecl->eOpcode = OPCODE_SPECIAL_DCL_IMMCONST;
-    psDecl->ui32NumOperands = 2;
-
-    memset(&psDecl->asOperands[0], 0, sizeof(Operand));
-    psDecl->asOperands[0].eType = OPERAND_TYPE_SPECIAL_IMMCONST;
-
-    psDecl->asOperands[0].ui32RegisterNumber = ui32RegNum;
-
-    if (ui32Flags & (DX9_DECODE_OPERAND_IS_ICONST | DX9_DECODE_OPERAND_IS_BCONST))
-    {
-        psDecl->asOperands[0].eType = OPERAND_TYPE_SPECIAL_IMMCONSTINT;
-    }
-
-    aui32ImmediateConst[ui32RegNum] |= ui32Flags;
-
-    memset(&psDecl->asOperands[1], 0, sizeof(Operand));
-    psDecl->asOperands[1].eType = OPERAND_TYPE_IMMEDIATE32;
-    psDecl->asOperands[1].iNumComponents = 4;
-    psDecl->asOperands[1].iIntegerImmediate = (ui32Flags & (DX9_DECODE_OPERAND_IS_ICONST | DX9_DECODE_OPERAND_IS_BCONST)) ? 1 : 0;
-    psDecl->asOperands[1].afImmediates[0] = *((float*)&c0);
-    psDecl->asOperands[1].afImmediates[1] = *((float*)&c1);
-    psDecl->asOperands[1].afImmediates[2] = *((float*)&c2);
-    psDecl->asOperands[1].afImmediates[3] = *((float*)&c3);
-}
-
-static void CreateD3D10Instruction(Shader* psShader,
-                                   Instruction* psInst,
-                                   const OPCODE_TYPE eType,
-                                   const uint32_t bHasDest,
-                                   const uint32_t ui32SrcCount,
-                                   const uint32_t* pui32Tokens)
-{
-    uint32_t ui32Src;
-    uint32_t ui32Offset = 1;
-
-    memset(psInst, 0, sizeof(Instruction));
-
-#ifdef _DEBUG
-    psInst->id = dx9instructionID++;
-#endif
-
-    psInst->eOpcode = eType;
-    psInst->ui32NumOperands = ui32SrcCount;
-
-    if (bHasDest)
-    {
-        ++psInst->ui32NumOperands;
-
-        DecodeOperandDX9(psShader, pui32Tokens[ui32Offset], pui32Tokens[ui32Offset + 1], DX9_DECODE_OPERAND_IS_DEST, &psInst->asOperands[0]);
-
-        if (DecodeDestModifierDX9(pui32Tokens[ui32Offset]) & DESTMOD_DX9_SATURATE)
-        {
-            psInst->bSaturate = 1;
-        }
-
-        ui32Offset++;
-        psInst->ui32FirstSrc = 1;
-    }
-
-    for (ui32Src = 0; ui32Src < ui32SrcCount; ++ui32Src)
-    {
-        DecodeOperandDX9(psShader, pui32Tokens[ui32Offset], pui32Tokens[ui32Offset + 1], DX9_DECODE_OPERAND_IS_SRC, &psInst->asOperands[bHasDest + ui32Src]);
-
-        ui32Offset++;
-    }
-}
-
-Shader* DecodeDX9BC(const uint32_t* pui32Tokens)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    uint32_t ui32NumInstructions = 0;
-    uint32_t ui32NumDeclarations = 0;
-    Instruction* psInst;
-    Declaration* psDecl;
-    uint32_t decl, inst;
-    uint32_t bDeclareConstantTable = 0;
-    Shader* psShader = hlslcc_calloc(1, sizeof(Shader));
-
-    memset(aui32ImmediateConst, 0, 256);
-
-    psShader->ui32MajorVersion = DecodeProgramMajorVersionDX9(*pui32CurrentToken);
-    psShader->ui32MinorVersion = DecodeProgramMinorVersionDX9(*pui32CurrentToken);
-    psShader->eShaderType = DecodeShaderTypeDX9(*pui32CurrentToken);
-
-    pui32CurrentToken++;
-
-    // Work out how many instructions and declarations we need to allocate memory for.
-    while (1)
-    {
-        OPCODE_TYPE_DX9 eOpcode = DecodeOpcodeTypeDX9(pui32CurrentToken[0]);
-        uint32_t ui32InstLen = DecodeInstructionLengthDX9(pui32CurrentToken[0]);
-
-        if (eOpcode == OPCODE_DX9_END)
-        {
-            // SM4+ always end with RET.
-            // Insert a RET instruction on END to
-            // replicate this behaviour.
-            ++ui32NumInstructions;
-            break;
-        }
-        else if (eOpcode == OPCODE_DX9_COMMENT)
-        {
-            ui32InstLen = DecodeCommentLengthDX9(pui32CurrentToken[0]);
-            if (pui32CurrentToken[1] == FOURCC_CTAB)
-            {
-                LoadD3D9ConstantTable((char*)(&pui32CurrentToken[2]), &psShader->sInfo);
-
-                ASSERT(psShader->sInfo.ui32NumConstantBuffers);
-
-                if (psShader->sInfo.psConstantBuffers[0].ui32NumVars)
-                {
-                    ++ui32NumDeclarations;
-                    bDeclareConstantTable = 1;
-                }
-            }
-        }
-        else if ((eOpcode == OPCODE_DX9_DEF) || (eOpcode == OPCODE_DX9_DEFI) || (eOpcode == OPCODE_DX9_DEFB))
-        {
-            ++ui32NumDeclarations;
-        }
-        else if (eOpcode == OPCODE_DX9_DCL)
-        {
-            const OPERAND_TYPE_DX9 eType = DecodeOperandTypeDX9(pui32CurrentToken[2]);
-            uint32_t ignoreDCL = 0;
-
-            // Inputs and outputs are declared in AddVersionDependentCode
-            if (psShader->eShaderType == PIXEL_SHADER && (OPERAND_TYPE_DX9_CONST != eType && OPERAND_TYPE_DX9_SAMPLER != eType))
-            {
-                ignoreDCL = 1;
-            }
-            if (!ignoreDCL)
-            {
-                ++ui32NumDeclarations;
-            }
-        }
-        else
-        {
-            switch (eOpcode)
-            {
-                case OPCODE_DX9_NRM:
-                {
-                    // Emulate with dp4 and rsq
-                    ui32NumInstructions += 2;
-                    break;
-                }
-                default:
-                {
-                    ++ui32NumInstructions;
-                    break;
-                }
-            }
-        }
-
-        pui32CurrentToken += ui32InstLen + 1;
-    }
-
-    psInst = hlslcc_malloc(sizeof(Instruction) * ui32NumInstructions);
-    psShader->psInst = psInst;
-    psShader->ui32InstCount = ui32NumInstructions;
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        // Declare gl_Position. vs_3_0 does declare it, SM1/2 do not
-        ui32NumDeclarations++;
-    }
-
-    // For declaring temps.
-    ui32NumDeclarations++;
-
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32NumDeclarations);
-    psShader->psDecl = psDecl;
-    psShader->ui32DeclCount = ui32NumDeclarations;
-
-    pui32CurrentToken = pui32Tokens + 1;
-
-    inst = 0;
-    decl = 0;
-    while (1)
-    {
-        OPCODE_TYPE_DX9 eOpcode = DecodeOpcodeTypeDX9(pui32CurrentToken[0]);
-        uint32_t ui32InstLen = DecodeInstructionLengthDX9(pui32CurrentToken[0]);
-
-        if (eOpcode == OPCODE_DX9_END)
-        {
-            CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RET, 0, 0, pui32CurrentToken);
-            inst++;
-            break;
-        }
-        else if (eOpcode == OPCODE_DX9_COMMENT)
-        {
-            ui32InstLen = DecodeCommentLengthDX9(pui32CurrentToken[0]);
-        }
-        else if (eOpcode == OPCODE_DX9_DCL)
-        {
-            const OPERAND_TYPE_DX9 eType = DecodeOperandTypeDX9(pui32CurrentToken[2]);
-            uint32_t ignoreDCL = 0;
-            // Inputs and outputs are declared in AddVersionDependentCode
-            if (psShader->eShaderType == PIXEL_SHADER && (OPERAND_TYPE_DX9_CONST != eType && OPERAND_TYPE_DX9_SAMPLER != eType))
-            {
-                ignoreDCL = 1;
-            }
-
-            SetupRegisterUsage(psShader, pui32CurrentToken[1], pui32CurrentToken[2]);
-
-            if (!ignoreDCL)
-            {
-                DecodeDeclarationDX9(psShader, pui32CurrentToken[1], pui32CurrentToken[2], &psDecl[decl]);
-                decl++;
-            }
-        }
-        else if ((eOpcode == OPCODE_DX9_DEF) || (eOpcode == OPCODE_DX9_DEFI) || (eOpcode == OPCODE_DX9_DEFB))
-        {
-            const uint32_t ui32Const0 = *(pui32CurrentToken + 2);
-            const uint32_t ui32Const1 = *(pui32CurrentToken + 3);
-            const uint32_t ui32Const2 = *(pui32CurrentToken + 4);
-            const uint32_t ui32Const3 = *(pui32CurrentToken + 5);
-            uint32_t ui32Flags = 0;
-
-            if (eOpcode == OPCODE_DX9_DEF)
-            {
-                ui32Flags |= DX9_DECODE_OPERAND_IS_CONST;
-            }
-            else if (eOpcode == OPCODE_DX9_DEFI)
-            {
-                ui32Flags |= DX9_DECODE_OPERAND_IS_ICONST;
-            }
-            else
-            {
-                ui32Flags |= DX9_DECODE_OPERAND_IS_BCONST;
-            }
-
-            DefineDX9(psShader, DecodeOperandRegisterNumberDX9(pui32CurrentToken[1]), ui32Flags, ui32Const0, ui32Const1, ui32Const2, ui32Const3, &psDecl[decl]);
-            decl++;
-        }
-        else
-        {
-            switch (eOpcode)
-            {
-                case OPCODE_DX9_MOV:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MOV, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_LIT:
-                {
-                    /*Dest.x = 1
-                    Dest.y = (Src0.x > 0) ? Src0.x : 0
-                    Dest.z = (Src0.x > 0 && Src0.y > 0) ? pow(Src0.y, Src0.w) : 0
-                    Dest.w = 1
-                    */
-                    ASSERT(0);
-                    break;
-                }
-                case OPCODE_DX9_ADD:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ADD, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_SUB:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ADD, 1, 2, pui32CurrentToken);
-                    ASSERT(psInst[inst].asOperands[2].eModifier == OPERAND_MODIFIER_NONE);
-                    psInst[inst].asOperands[2].eModifier = OPERAND_MODIFIER_NEG;
-                    break;
-                }
-                case OPCODE_DX9_MAD:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MAD, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_MUL:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MUL, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_RCP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RCP, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_RSQ:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RSQ, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DP3:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP3, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DP4:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP4, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_MIN:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MIN, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_MAX:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MAX, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_SLT:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LT, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_SGE:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_GE, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_EXP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_EXP, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_LOG:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LOG, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_NRM:
-                {
-                    // Convert NRM RESULT, SRCA into:
-                    // dp4 RESULT, SRCA, SRCA
-                    // rsq RESULT, RESULT
-
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP4, 1, 1, pui32CurrentToken);
-                    memcpy(&psInst[inst].asOperands[2], &psInst[inst].asOperands[1], sizeof(Operand));
-                    ++inst;
-
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RSQ, 0, 0, pui32CurrentToken);
-                    memcpy(&psInst[inst].asOperands[0], &psInst[inst - 1].asOperands[0], sizeof(Operand));
-                    break;
-                }
-                case OPCODE_DX9_SINCOS:
-                {
-                    // Before SM3, SINCOS has 2 extra constant sources -D3DSINCOSCONST1 and D3DSINCOSCONST2.
-                    // Ignore them.
-
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SINCOS, 1, 1, pui32CurrentToken);
-                    // Pre-SM4:
-                    // If the write mask is .x: dest.x = cos( V )
-                    // If the write mask is .y: dest.y = sin( V )
-                    // If the write mask is .xy:
-                    // dest.x = cos( V )
-                    // dest.y = sin( V )
-
-                    // SM4+
-                    // destSin destCos Angle
-
-                    psInst[inst].ui32NumOperands = 3;
-
-                    // Set the angle
-                    memcpy(&psInst[inst].asOperands[2], &psInst[inst].asOperands[1], sizeof(Operand));
-
-                    // Set the cosine dest
-                    memcpy(&psInst[inst].asOperands[1], &psInst[inst].asOperands[0], sizeof(Operand));
-
-                    // Set write masks
-                    psInst[inst].asOperands[0].ui32CompMask &= ~OPERAND_4_COMPONENT_MASK_Y;
-                    if (psInst[inst].asOperands[0].ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                    {
-                        // Need cosine
-                    }
-                    else
-                    {
-                        psInst[inst].asOperands[0].eType = OPERAND_TYPE_NULL;
-                    }
-                    psInst[inst].asOperands[1].ui32CompMask &= ~OPERAND_4_COMPONENT_MASK_X;
-                    if (psInst[inst].asOperands[1].ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                    {
-                        // Need sine
-                    }
-                    else
-                    {
-                        psInst[inst].asOperands[1].eType = OPERAND_TYPE_NULL;
-                    }
-
-                    break;
-                }
-                case OPCODE_DX9_FRC:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_FRC, 1, 1, pui32CurrentToken);
-                    break;
-                }
-
-                case OPCODE_DX9_MOVA:
-                {
-                    // MOVA preforms RoundToNearest on the src data.
-                    // The only rounding functions available in all GLSL version are ceil and floor.
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ROUND_NI, 1, 1, pui32CurrentToken);
-                    break;
-                }
-
-                case OPCODE_DX9_TEX:
-                {
-                    // texld r0, t0, s0
-                    // srcAddress[.swizzle], srcResource[.swizzle], srcSampler
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SAMPLE, 1, 2, pui32CurrentToken);
-                    psInst[inst].asOperands[2].ui32RegisterNumber = 0;
-
-                    break;
-                }
-                case OPCODE_DX9_TEXLDL:
-                {
-                    // texld r0, t0, s0
-                    // srcAddress[.swizzle], srcResource[.swizzle], srcSampler
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SAMPLE_L, 1, 2, pui32CurrentToken);
-                    psInst[inst].asOperands[2].ui32RegisterNumber = 0;
-
-                    // Lod comes from fourth coordinate of address.
-                    memcpy(&psInst[inst].asOperands[4], &psInst[inst].asOperands[1], sizeof(Operand));
-
-                    psInst[inst].ui32NumOperands = 5;
-
-                    break;
-                }
-
-                case OPCODE_DX9_IF:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_IF, 0, 1, pui32CurrentToken);
-                    psInst[inst].eDX9TestType = D3DSPC_BOOLEAN;
-                    break;
-                }
-
-                case OPCODE_DX9_IFC:
-                {
-                    const COMPARISON_DX9 eCmpOp = DecodeComparisonDX9(pui32CurrentToken[0]);
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_IF, 0, 2, pui32CurrentToken);
-                    psInst[inst].eDX9TestType = eCmpOp;
-                    break;
-                }
-                case OPCODE_DX9_ELSE:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ELSE, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_CMP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MOVC, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_REP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_REP, 0, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_ENDREP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ENDREP, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_BREAKC:
-                {
-                    const COMPARISON_DX9 eCmpOp = DecodeComparisonDX9(pui32CurrentToken[0]);
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_BREAKC, 0, 2, pui32CurrentToken);
-                    psInst[inst].eDX9TestType = eCmpOp;
-                    break;
-                }
-
-                case OPCODE_DX9_DSX:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DERIV_RTX, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DSY:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DERIV_RTY, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_TEXKILL:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DISCARD, 1, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_TEXLDD:
-                {
-                    // texldd, dst, src0, src1, src2, src3
-                    // srcAddress[.swizzle], srcResource[.swizzle], srcSampler, XGradient, YGradient
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SAMPLE_D, 1, 4, pui32CurrentToken);
-                    psInst[inst].asOperands[2].ui32RegisterNumber = 0;
-                    break;
-                }
-                case OPCODE_DX9_LRP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LRP, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DP2ADD:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP2ADD, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_POW:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_POW, 1, 2, pui32CurrentToken);
-                    break;
-                }
-
-                case OPCODE_DX9_DST:
-                case OPCODE_DX9_M4x4:
-                case OPCODE_DX9_M4x3:
-                case OPCODE_DX9_M3x4:
-                case OPCODE_DX9_M3x3:
-                case OPCODE_DX9_M3x2:
-                case OPCODE_DX9_CALL:
-                case OPCODE_DX9_CALLNZ:
-                case OPCODE_DX9_LABEL:
-
-                case OPCODE_DX9_CRS:
-                case OPCODE_DX9_SGN:
-                case OPCODE_DX9_ABS:
-
-                case OPCODE_DX9_TEXCOORD:
-                case OPCODE_DX9_TEXBEM:
-                case OPCODE_DX9_TEXBEML:
-                case OPCODE_DX9_TEXREG2AR:
-                case OPCODE_DX9_TEXREG2GB:
-                case OPCODE_DX9_TEXM3x2PAD:
-                case OPCODE_DX9_TEXM3x2TEX:
-                case OPCODE_DX9_TEXM3x3PAD:
-                case OPCODE_DX9_TEXM3x3TEX:
-                case OPCODE_DX9_TEXM3x3SPEC:
-                case OPCODE_DX9_TEXM3x3VSPEC:
-                case OPCODE_DX9_EXPP:
-                case OPCODE_DX9_LOGP:
-                case OPCODE_DX9_CND:
-                case OPCODE_DX9_TEXREG2RGB:
-                case OPCODE_DX9_TEXDP3TEX:
-                case OPCODE_DX9_TEXM3x2DEPTH:
-                case OPCODE_DX9_TEXDP3:
-                case OPCODE_DX9_TEXM3x3:
-                case OPCODE_DX9_TEXDEPTH:
-                case OPCODE_DX9_BEM:
-                case OPCODE_DX9_SETP:
-                case OPCODE_DX9_BREAKP:
-                {
-                    ASSERT(0);
-                    break;
-                }
-                case OPCODE_DX9_NOP:
-                case OPCODE_DX9_PHASE:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_NOP, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_LOOP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LOOP, 0, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_RET:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RET, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_ENDLOOP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ENDLOOP, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_ENDIF:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ENDIF, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_BREAK:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_BREAK, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                default:
-                {
-                    ASSERT(0);
-                    break;
-                }
-            }
-
-            UpdateInstructionReferences(psShader, &psInst[inst]);
-
-            inst++;
-        }
-
-        pui32CurrentToken += ui32InstLen + 1;
-    }
-
-    DeclareNumTemps(psShader, ui32MaxTemp, &psDecl[decl]);
-    ++decl;
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        // Declare gl_Position. vs_3_0 does declare it, SM1/2 do not
-        if (bDeclareConstantTable)
-        {
-            DecodeDeclarationDX9(psShader, 0, CreateOperandTokenDX9(0, OPERAND_TYPE_DX9_RASTOUT), &psDecl[decl + 1]);
-        }
-        else
-        {
-            DecodeDeclarationDX9(psShader, 0, CreateOperandTokenDX9(0, OPERAND_TYPE_DX9_RASTOUT), &psDecl[decl]);
-        }
-    }
-
-    if (bDeclareConstantTable)
-    {
-        DeclareConstantBuffer(psShader, &psDecl[decl]);
-    }
-
-    return psShader;
-}
diff --git a/Code/Tools/HLSLCrossCompiler/src/hlslccToolkit.c b/Code/Tools/HLSLCrossCompiler/src/hlslccToolkit.c
deleted file mode 100644
index 368b75c955..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/hlslccToolkit.c
+++ /dev/null
@@ -1,167 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-#include "internal_includes/hlslccToolkit.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/languages.h"
-
-bool DoAssignmentDataTypesMatch(SHADER_VARIABLE_TYPE dest, SHADER_VARIABLE_TYPE src)
-{
-    if (src == dest)
-        return true;
-
-    if ((dest == SVT_FLOAT || dest == SVT_FLOAT10 || dest == SVT_FLOAT16) &&
-        (src == SVT_FLOAT || src == SVT_FLOAT10 || src == SVT_FLOAT16))
-        return true;
-
-    if ((dest == SVT_INT || dest == SVT_INT12 || dest == SVT_INT16) &&
-        (src == SVT_INT || src == SVT_INT12 || src == SVT_INT16))
-        return true;
-
-    if ((dest == SVT_UINT || dest == SVT_UINT16) &&
-        (src == SVT_UINT || src == SVT_UINT16))
-        return true;
-
-    return false;
-}
-
-const char * GetConstructorForTypeGLSL(HLSLCrossCompilerContext* psContext, const SHADER_VARIABLE_TYPE eType, const int components, bool useGLSLPrecision)
-{
-    const bool usePrecision = useGLSLPrecision && HavePrecisionQualifers(psContext->psShader->eTargetLanguage);
-
-    static const char * const uintTypes[] = { " ", "uint", "uvec2", "uvec3", "uvec4" };
-    static const char * const uint16Types[] = { " ", "mediump uint", "mediump uvec2", "mediump uvec3", "mediump uvec4" };
-    static const char * const intTypes[] = { " ", "int", "ivec2", "ivec3", "ivec4" };
-    static const char * const int16Types[] = { " ", "mediump int", "mediump ivec2", "mediump ivec3", "mediump ivec4" };
-    static const char * const int12Types[] = { " ", "lowp int", "lowp ivec2", "lowp ivec3", "lowp ivec4" };
-    static const char * const floatTypes[] = { " ", "float", "vec2", "vec3", "vec4" };
-    static const char * const float16Types[] = { " ", "mediump float", "mediump vec2", "mediump vec3", "mediump vec4" };
-    static const char * const float10Types[] = { " ", "lowp float", "lowp vec2", "lowp vec3", "lowp vec4" };
-    static const char * const boolTypes[] = { " ", "bool", "bvec2", "bvec3", "bvec4" };
-
-    ASSERT(components >= 1 && components <= 4);
-
-    switch (eType)
-    {
-    case SVT_UINT:
-        return uintTypes[components];
-    case SVT_UINT16:
-        return usePrecision ? uint16Types[components] : uintTypes[components];
-    case SVT_INT:
-        return intTypes[components];
-    case SVT_INT16:
-        return usePrecision ? int16Types[components] : intTypes[components];
-    case SVT_INT12:
-        return usePrecision ? int12Types[components] : intTypes[components];
-    case SVT_FLOAT:
-        return floatTypes[components];
-    case SVT_FLOAT16:
-        return usePrecision ? float16Types[components] : floatTypes[components];
-    case SVT_FLOAT10:
-        return usePrecision ? float10Types[components] : floatTypes[components];
-    case SVT_BOOL:
-        return boolTypes[components];
-    default:
-        ASSERT(0);
-        return "";
-    }
-}
-
-SHADER_VARIABLE_TYPE TypeFlagsToSVTType(const uint32_t typeflags)
-{
-    if (typeflags & TO_FLAG_INTEGER)
-        return SVT_INT;
-    if (typeflags & TO_FLAG_UNSIGNED_INTEGER)
-        return SVT_UINT;
-    return SVT_FLOAT;
-}
-
-uint32_t SVTTypeToFlag(const SHADER_VARIABLE_TYPE eType)
-{
-    if (eType == SVT_FLOAT16 || eType == SVT_FLOAT10 || eType == SVT_FLOAT)
-    {
-        return TO_FLAG_FLOAT;
-    }
-    if (eType == SVT_UINT || eType == SVT_UINT16)
-    {
-        return TO_FLAG_UNSIGNED_INTEGER;
-    }
-    else if (eType == SVT_INT || eType == SVT_INT16 || eType == SVT_INT12)
-    {
-        return TO_FLAG_INTEGER;
-    }
-    else
-    {
-        return TO_FLAG_NONE;
-    }
-}
-
-bool CanDoDirectCast(SHADER_VARIABLE_TYPE src, SHADER_VARIABLE_TYPE dest)
-{
-    // uint<->int<->bool conversions possible
-    if ((src == SVT_INT || src == SVT_UINT || src == SVT_BOOL || src == SVT_INT12 || src == SVT_INT16 || src == SVT_UINT16) &&
-        (dest == SVT_INT || dest == SVT_UINT || dest == SVT_BOOL || dest == SVT_INT12 || dest == SVT_INT16 || dest == SVT_UINT16))
-        return true;
-
-    // float<->double possible
-    if ((src == SVT_FLOAT || src == SVT_DOUBLE || src == SVT_FLOAT16 || src == SVT_FLOAT10) &&
-        (dest == SVT_FLOAT || dest == SVT_DOUBLE || dest == SVT_FLOAT16 || dest == SVT_FLOAT10))
-        return true;
-
-    return false;
-}
-
-const char* GetBitcastOp(SHADER_VARIABLE_TYPE from, SHADER_VARIABLE_TYPE to)
-{
-    static const char* intToFloat = "intBitsToFloat";
-    static const char* uintToFloat = "uintBitsToFloat";
-    static const char* floatToInt = "floatBitsToInt";
-    static const char* floatToUint = "floatBitsToUint";
-
-    if ((to == SVT_FLOAT || to == SVT_FLOAT16 || to == SVT_FLOAT10) && from == SVT_INT)
-        return intToFloat;
-    else if ((to == SVT_FLOAT || to == SVT_FLOAT16 || to == SVT_FLOAT10) && from == SVT_UINT)
-        return uintToFloat;
-    else if (to == SVT_INT && (from == SVT_FLOAT || from == SVT_FLOAT16 || from == SVT_FLOAT10))
-        return floatToInt;
-    else if (to == SVT_UINT && (from == SVT_FLOAT || from == SVT_FLOAT16 || from == SVT_FLOAT10))
-        return floatToUint;
-
-    ASSERT(0);
-    return "";
-}
-
-bool IsGmemReservedSlot(FRAMEBUFFER_FETCH_TYPE typeMask, const uint32_t regNumber)
-{
-    if (((typeMask & FBF_ARM_COLOR) && regNumber == GMEM_ARM_COLOR_SLOT) ||
-        ((typeMask & FBF_ARM_DEPTH) && regNumber == GMEM_ARM_DEPTH_SLOT) ||
-        ((typeMask & FBF_ARM_STENCIL) && regNumber == GMEM_ARM_STENCIL_SLOT) || 
-        ((typeMask & FBF_EXT_COLOR) && regNumber >= GMEM_FLOAT_START_SLOT))
-    {
-        return true;
-    }
-
-    return false;
-}
-
-const char * GetAuxArgumentName(const SHADER_VARIABLE_TYPE varType)
-{
-    switch (varType)
-    {
-    case SVT_UINT:
-    case SVT_UINT8:
-    case SVT_UINT16:
-        return "uArg";
-    case SVT_INT:
-    case SVT_INT16:
-    case SVT_INT12:
-        return "iArg";
-    case SVT_FLOAT:
-    case SVT_FLOAT16:
-    case SVT_FLOAT10:
-        return "fArg";
-    case SVT_BOOL:
-        return "bArg";
-    default:
-        ASSERT(0);
-        return "";
-    }
-}
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/debug.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/debug.h
deleted file mode 100644
index 5b071709bc..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/debug.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef DEBUG_H_
-#define DEBUG_H_
-
-#ifdef _DEBUG
-#include "assert.h"
-#define ASSERT(expr) CustomAssert(expr)
-static void CustomAssert(int expression)
-{
-    if(!expression)
-    {
-        assert(0);
-    }
-}
-#else
-#define ASSERT(expr)
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/decode.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/decode.h
deleted file mode 100644
index d8102683a8..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/decode.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef DECODE_H
-#define DECODE_H
-
-#include "internal_includes/structs.h"
-
-Shader* DecodeDXBC(uint32_t* data);
-
-//You don't need to call this directly because DecodeDXBC
-//will call DecodeDX9BC if the shader looks
-//like it is SM1/2/3.
-Shader* DecodeDX9BC(const uint32_t* pui32Tokens);
-
-void UpdateDeclarationReferences(Shader* psShader, Declaration* psDeclaration);
-void UpdateInstructionReferences(Shader* psShader, Instruction* psInstruction);
-
-#define FOURCC(a, b, c, d) ((uint32_t)(uint8_t)(a) | ((uint32_t)(uint8_t)(b) << 8) | ((uint32_t)(uint8_t)(c) << 16) | ((uint32_t)(uint8_t)(d) << 24))
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslccToolkit.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslccToolkit.h
deleted file mode 100644
index d96a4b17be..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslccToolkit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-#ifndef HLSLCC_TOOLKIT_DECLARATION_H
-#define HLSLCC_TOOLKIT_DECLARATION_H
-
-#include "hlslcc.h"
-#include "bstrlib.h"
-#include "internal_includes/structs.h"
-
-#include <stdbool.h>
-
-// Check if "src" type can be assigned directly to the "dest" type.
-bool DoAssignmentDataTypesMatch(SHADER_VARIABLE_TYPE dest, SHADER_VARIABLE_TYPE src);
-
-// Returns the constructor needed depending on the type, the number of components and the use of precision qualifier.
-const char * GetConstructorForTypeGLSL(HLSLCrossCompilerContext* psContext, const SHADER_VARIABLE_TYPE eType, const int components, bool useGLSLPrecision);
-
-// Transform from a variable type to a shader variable flag.
-uint32_t SVTTypeToFlag(const SHADER_VARIABLE_TYPE eType);
-
-// Transform from a shader variable flag to a shader variable type.
-SHADER_VARIABLE_TYPE TypeFlagsToSVTType(const uint32_t typeflags);
-
-// Check if the "src" type can be casted using a constructor to the "dest" type (without bitcasting).
-bool CanDoDirectCast(SHADER_VARIABLE_TYPE src, SHADER_VARIABLE_TYPE dest);
-
-// Returns the bitcast operation needed to assign the "src" type to the "dest" type
-const char* GetBitcastOp(SHADER_VARIABLE_TYPE src, SHADER_VARIABLE_TYPE dest);
-
-// Check if the register number is part of the ones we used for signaling GMEM input
-bool IsGmemReservedSlot(FRAMEBUFFER_FETCH_TYPE type, const uint32_t regNumber);
-
-// Return the name of an auxiliary variable used to save intermediate values to bypass driver issues
-const char * GetAuxArgumentName(const SHADER_VARIABLE_TYPE varType);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslcc_malloc.c b/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslcc_malloc.c
deleted file mode 100644
index 0f1c8d62e6..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslcc_malloc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <stdlib.h>
-#endif
-#include <AzCore/PlatformDef.h>
-
-AZ_PUSH_DISABLE_WARNING(4232, "-Wunknown-warning-option") // address of malloc/free/calloc/realloc are not static
-void* (*hlslcc_malloc)(size_t size) = malloc;
-void* (*hlslcc_calloc)(size_t num,size_t size) = calloc;
-void (*hlslcc_free)(void *p) = free;
-void* (*hlslcc_realloc)(void *p,size_t size) = realloc;
-AZ_POP_DISABLE_WARNING
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslcc_malloc.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslcc_malloc.h
deleted file mode 100644
index 8f74eb5d6e..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/hlslcc_malloc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef __HLSCC_MALLOC_H
-#define __HLSCC_MALLOC_H
-
-extern void* (*hlslcc_malloc)(size_t size);
-extern void* (* hlslcc_calloc)(size_t num, size_t size);
-extern void (* hlslcc_free)(void* p);
-extern void* (* hlslcc_realloc)(void* p, size_t size);
-
-#define bstr__alloc hlslcc_malloc
-#define bstr__free hlslcc_free
-#define bstr__realloc hlslcc_realloc
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/languages.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/languages.h
deleted file mode 100644
index dd9562379a..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/languages.h
+++ /dev/null
@@ -1,242 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef LANGUAGES_H
-#define LANGUAGES_H
-
-#include "hlslcc.h"
-
-static int InOutSupported(const GLLang eLang)
-{
-    if(eLang == LANG_ES_100 || eLang == LANG_120)
-    {
-        return 0;
-    }
-    return 1;
-}
-
-static int WriteToFragData(const GLLang eLang)
-{
-    if(eLang == LANG_ES_100 || eLang == LANG_120)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int ShaderBitEncodingSupported(const GLLang eLang)
-{
-    if( eLang != LANG_ES_300 &&
-        eLang != LANG_ES_310 &&
-        eLang < LANG_330)
-    {
-        return 0;
-    }
-    return 1;
-}
-
-static int HaveOverloadedTextureFuncs(const GLLang eLang)
-{
-    if(eLang == LANG_ES_100 || eLang == LANG_120)
-    {
-        return 0;
-    }
-    return 1;
-}
-
-//Only enable for ES.
-//Not present in 120, ignored in other desktop languages.
-static int HavePrecisionQualifers(const GLLang eLang)
-{
-    if(eLang >= LANG_ES_100 && eLang <= LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-//Only on vertex inputs and pixel outputs.
-static int HaveLimitedInOutLocationQualifier(const GLLang eLang)
-{
-    if(eLang >= LANG_330 || eLang == LANG_ES_300 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveInOutLocationQualifier(const GLLang eLang,const struct GlExtensions *extensions)
-{
-    if(eLang >= LANG_410 || eLang == LANG_ES_310 || (extensions && ((GlExtensions*)extensions)->ARB_explicit_attrib_location))
-    {
-        return 1;
-    }
-    return 0;
-}
-
-//layout(binding = X) uniform {uniformA; uniformB;}
-//layout(location = X) uniform uniform_name;
-static int HaveUniformBindingsAndLocations(const GLLang eLang,const struct GlExtensions *extensions)
-{
-    if(eLang >= LANG_430 || eLang == LANG_ES_310 || (extensions && ((GlExtensions*)extensions)->ARB_explicit_uniform_location))
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int DualSourceBlendSupported(const GLLang eLang)
-{
-    if(eLang >= LANG_330)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int SubroutinesSupported(const GLLang eLang)
-{
-    if(eLang >= LANG_400)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-//Before 430, flat/smooth/centroid/noperspective must match
-//between fragment and its previous stage.
-//HLSL bytecode only tells us the interpolation in pixel shader.
-static int PixelInterpDependency(const GLLang eLang)
-{
-    if(eLang < LANG_430)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveUVec(const GLLang eLang)
-{
-    switch(eLang)
-    {
-    case LANG_ES_100:
-    case LANG_120:
-        return 0;
-    default:
-        break;
-    }
-    return 1;
-}
-
-static int HaveGather(const GLLang eLang)
-{
-    if(eLang >= LANG_400 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveGatherNonConstOffset(const GLLang eLang)
-{
-    if(eLang >= LANG_420 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-
-static int HaveQueryLod(const GLLang eLang)
-{
-    if(eLang >= LANG_400)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveQueryLevels(const GLLang eLang)
-{
-    if(eLang >= LANG_430)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-
-static int HaveAtomicCounter(const GLLang eLang)
-{
-    if(eLang >= LANG_420 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveAtomicMem(const GLLang eLang)
-{
-    if(eLang >= LANG_430)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveCompute(const GLLang eLang)
-{
-    if(eLang >= LANG_430 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveImageLoadStore(const GLLang eLang)
-{
-    if(eLang >= LANG_420 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int EmulateDepthClamp(const GLLang eLang)
-{
-    if (eLang >= LANG_ES_300 && eLang < LANG_120) //Requires gl_FragDepth available in fragment shader
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveNoperspectiveInterpolation(const GLLang eLang)
-{
-    if (eLang >= LANG_330)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int EarlyDepthTestSupported(const GLLang eLang)
-{
-    if ((eLang > LANG_410) || (eLang == LANG_ES_310))
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int StorageBlockBindingSupported(const GLLang eLang)
-{
-    if (eLang >= LANG_430)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/reflect.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/reflect.h
deleted file mode 100644
index bea00aafc4..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/reflect.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef REFLECT_H
-#define REFLECT_H
-
-#include "hlslcc.h"
-
-ResourceGroup ResourceTypeToResourceGroup(ResourceType);
-
-int GetResourceFromBindingPoint(const ResourceGroup eGroup, const uint32_t ui32BindPoint, const ShaderInfo* psShaderInfo, ResourceBinding** ppsOutBinding);
-
-void GetConstantBufferFromBindingPoint(const ResourceGroup eGroup, const uint32_t ui32BindPoint, const ShaderInfo* psShaderInfo, ConstantBuffer** ppsConstBuf);
-
-int GetInterfaceVarFromOffset(uint32_t ui32Offset, ShaderInfo* psShaderInfo, ShaderVar** ppsShaderVar);
-
-int GetInputSignatureFromRegister(const uint32_t ui32Register, const ShaderInfo* psShaderInfo, InOutSignature** ppsOut);
-int GetOutputSignatureFromRegister(const uint32_t ui32Register, const uint32_t ui32Stream, const uint32_t ui32CompMask, ShaderInfo* psShaderInfo, InOutSignature** ppsOut);
-
-int GetOutputSignatureFromSystemValue(SPECIAL_NAME eSystemValueType, uint32_t ui32SemanticIndex, ShaderInfo* psShaderInfo, InOutSignature** ppsOut);
-
-int GetShaderVarFromOffset(const uint32_t ui32Vec4Offset, const uint32_t* pui32Swizzle, ConstantBuffer* psCBuf, ShaderVarType** ppsShaderVar, int32_t* pi32Index, int32_t* pi32Rebase);
-
-typedef struct
-{
-    uint32_t* pui32Inputs;
-    uint32_t* pui32Outputs;
-    uint32_t* pui32Resources;
-    uint32_t* pui32Interfaces;
-    uint32_t* pui32Inputs11;
-    uint32_t* pui32Outputs11;
-    uint32_t* pui32OutputsWithStreams;
-} ReflectionChunks;
-
-void LoadShaderInfo(const uint32_t ui32MajorVersion, const uint32_t ui32MinorVersion, const ReflectionChunks* psChunks, ShaderInfo* psInfo);
-
-void LoadD3D9ConstantTable(const char* data, ShaderInfo* psInfo);
-
-void FreeShaderInfo(ShaderInfo* psShaderInfo);
-
-#endif
-
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/shaderLimits.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/shaderLimits.h
deleted file mode 100644
index 7bddbed4da..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/shaderLimits.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef HLSLCC_SHADER_LIMITS_H
-#define HLSLCC_SHADER_LIMITS_H
-
-static enum
-{
-    MAX_SHADER_VEC4_OUTPUT = 512
-};
-static enum
-{
-    MAX_SHADER_VEC4_INPUT = 512
-};
-static enum
-{
-    MAX_TEXTURES = 128
-};
-static enum
-{
-    MAX_FORK_PHASES = 2
-};
-static enum
-{
-    MAX_FUNCTION_BODIES = 1024
-};
-static enum
-{
-    MAX_CLASS_TYPES = 1024
-};
-static enum
-{
-    MAX_FUNCTION_POINTERS = 128
-};
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/structs.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/structs.h
deleted file mode 100644
index a9e7fd92b7..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/structs.h
+++ /dev/null
@@ -1,374 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef STRUCTS_H
-#define STRUCTS_H
-
-#include "hlslcc.h"
-#include "bstrlib.h"
-
-#include "internal_includes/tokens.h"
-#include "internal_includes/reflect.h"
-
-enum
-{
-    MAX_SUB_OPERANDS = 3
-};
-
-typedef struct Operand_TAG
-{
-    int iExtended;
-    OPERAND_TYPE eType;
-    OPERAND_MODIFIER eModifier;
-    OPERAND_MIN_PRECISION eMinPrecision;
-    int iIndexDims;
-    int indexRepresentation[4];
-    int writeMask;
-    int iGSInput;
-    int iWriteMaskEnabled;
-
-    int iNumComponents;
-
-    OPERAND_4_COMPONENT_SELECTION_MODE eSelMode;
-    uint32_t ui32CompMask;
-    uint32_t ui32Swizzle;
-    uint32_t aui32Swizzle[4];
-
-    uint32_t aui32ArraySizes[3];
-    uint32_t ui32RegisterNumber;
-    //If eType is OPERAND_TYPE_IMMEDIATE32
-    float afImmediates[4];
-    //If eType is OPERAND_TYPE_IMMEDIATE64
-    double adImmediates[4];
-
-    int iIntegerImmediate;
-
-    SPECIAL_NAME eSpecialName;
-    char pszSpecialName[64];
-
-    OPERAND_INDEX_REPRESENTATION eIndexRep[3];
-
-    struct Operand_TAG* psSubOperand[MAX_SUB_OPERANDS];
-
-    //One type for each component.
-    SHADER_VARIABLE_TYPE aeDataType[4];
-
-#ifdef _DEBUG
-    uint64_t id;
-#endif
-} Operand;
-
-typedef struct Instruction_TAG
-{
-    OPCODE_TYPE eOpcode;
-    INSTRUCTION_TEST_BOOLEAN eBooleanTestType;
-    COMPARISON_DX9 eDX9TestType;
-    uint32_t ui32SyncFlags;
-    uint32_t ui32NumOperands;
-    uint32_t ui32FirstSrc;
-    Operand asOperands[6];
-    uint32_t bSaturate;
-    uint32_t ui32FuncIndexWithinInterface;
-    RESINFO_RETURN_TYPE eResInfoReturnType;
-
-    int bAddressOffset;
-    int iUAddrOffset;
-    int iVAddrOffset;
-    int iWAddrOffset;
-    RESOURCE_RETURN_TYPE xType, yType, zType, wType;
-    RESOURCE_DIMENSION eResDim;
-
-#ifdef _DEBUG
-    uint64_t id;
-#endif
-} Instruction;
-
-enum
-{
-    MAX_IMMEDIATE_CONST_BUFFER_VEC4_SIZE = 1024
-};
-
-typedef struct ICBVec4_TAG
-{
-    uint32_t a;
-    uint32_t b;
-    uint32_t c;
-    uint32_t d;
-} ICBVec4;
-
-typedef struct Declaration_TAG
-{
-    OPCODE_TYPE eOpcode;
-
-    uint32_t ui32NumOperands;
-
-    Operand asOperands[2];
-
-    ICBVec4 asImmediateConstBuffer[MAX_IMMEDIATE_CONST_BUFFER_VEC4_SIZE];
-    //The declaration can set one of these
-    //values depending on the opcode.
-    union
-    {
-        uint32_t ui32GlobalFlags;
-        uint32_t ui32NumTemps;
-        RESOURCE_DIMENSION eResourceDimension;
-        CONSTANT_BUFFER_ACCESS_PATTERN eCBAccessPattern;
-        INTERPOLATION_MODE eInterpolation;
-        PRIMITIVE_TOPOLOGY eOutputPrimitiveTopology;
-        PRIMITIVE eInputPrimitive;
-        uint32_t ui32MaxOutputVertexCount;
-        TESSELLATOR_DOMAIN eTessDomain;
-        TESSELLATOR_PARTITIONING eTessPartitioning;
-        TESSELLATOR_OUTPUT_PRIMITIVE eTessOutPrim;
-        uint32_t aui32WorkGroupSize[3];
-        //Fork phase index followed by the instance count.
-        uint32_t aui32HullPhaseInstanceInfo[2];
-        float fMaxTessFactor;
-        uint32_t ui32IndexRange;
-        uint32_t ui32GSInstanceCount;
-
-        struct Interface_TAG
-        {
-            uint32_t ui32InterfaceID;
-            uint32_t ui32NumFuncTables;
-            uint32_t ui32ArraySize;
-        } interface;
-    } value;
-
-    struct UAV_TAG
-    {
-        uint32_t ui32GloballyCoherentAccess;
-        uint32_t ui32BufferSize;
-        uint8_t bCounter;
-        RESOURCE_RETURN_TYPE Type;
-    } sUAV;
-
-    struct TGSM_TAG
-    {
-        uint32_t ui32Stride;
-        uint32_t ui32Count;
-    } sTGSM;
-
-    struct IndexableTemp_TAG
-    {
-        uint32_t ui32RegIndex;
-        uint32_t ui32RegCount;
-        uint32_t ui32RegComponentSize;
-    } sIdxTemp;
-
-    uint32_t ui32TableLength;
-
-    uint32_t ui32TexReturnType;
-} Declaration;
-
-enum
-{
-    MAX_TEMP_VEC4 = 512
-};
-
-enum
-{
-    MAX_GROUPSHARED = 8
-};
-
-enum
-{
-    MAX_DX9_IMMCONST = 256
-};
-
-typedef struct Shader_TAG
-{
-    uint32_t ui32MajorVersion;
-    uint32_t ui32MinorVersion;
-    SHADER_TYPE eShaderType;
-
-    GLLang eTargetLanguage;
-    const struct GlExtensions *extensions;
-
-    int fp64;
-
-    //DWORDs in program code, including version and length tokens.
-    uint32_t ui32ShaderLength;
-
-    uint32_t ui32DeclCount;
-    Declaration* psDecl;
-
-    //Instruction* functions;//non-main subroutines
-
-    uint32_t aui32FuncTableToFuncPointer[MAX_FUNCTION_TABLES];//FIXME dynamic alloc
-    uint32_t aui32FuncBodyToFuncTable[MAX_FUNCTION_BODIES];
-
-    struct
-    {
-        uint32_t aui32FuncBodies[MAX_FUNCTION_BODIES];
-    }funcTable[MAX_FUNCTION_TABLES];
-
-    struct
-    {
-        uint32_t aui32FuncTables[MAX_FUNCTION_TABLES];
-        uint32_t ui32NumBodiesPerTable;
-    }funcPointer[MAX_FUNCTION_POINTERS];
-
-    uint32_t ui32NextClassFuncName[MAX_CLASS_TYPES];
-
-    uint32_t ui32InstCount;
-    Instruction* psInst;
-
-    const uint32_t* pui32FirstToken;//Reference for calculating current position in token stream.
-
-    //Hull shader declarations and instructions.
-    //psDecl, psInst are null for hull shaders.
-    uint32_t ui32HSDeclCount;
-    Declaration* psHSDecl;
-
-    uint32_t ui32HSControlPointDeclCount;
-    Declaration* psHSControlPointPhaseDecl;
-
-    uint32_t ui32HSControlPointInstrCount;
-    Instruction* psHSControlPointPhaseInstr;
-
-    uint32_t ui32ForkPhaseCount;
-
-    uint32_t aui32HSForkDeclCount[MAX_FORK_PHASES];
-    Declaration* apsHSForkPhaseDecl[MAX_FORK_PHASES];
-
-    uint32_t aui32HSForkInstrCount[MAX_FORK_PHASES];
-    Instruction* apsHSForkPhaseInstr[MAX_FORK_PHASES];
-
-    uint32_t ui32HSJoinDeclCount;
-    Declaration* psHSJoinPhaseDecl;
-
-    uint32_t ui32HSJoinInstrCount;
-    Instruction* psHSJoinPhaseInstr;
-
-    ShaderInfo sInfo;
-
-    int abScalarInput[MAX_SHADER_VEC4_INPUT];
-
-    int aIndexedOutput[MAX_SHADER_VEC4_OUTPUT];
-
-    int aIndexedInput[MAX_SHADER_VEC4_INPUT];
-    int aIndexedInputParents[MAX_SHADER_VEC4_INPUT];
-
-    RESOURCE_DIMENSION aeResourceDims[MAX_TEXTURES];
-
-    int aiInputDeclaredSize[MAX_SHADER_VEC4_INPUT];
-
-    int aiOutputDeclared[MAX_SHADER_VEC4_OUTPUT];
-
-    //Does not track built-in inputs.
-    int abInputReferencedByInstruction[MAX_SHADER_VEC4_INPUT];
-
-    int aiOpcodeUsed[NUM_OPCODES];
-
-    uint32_t ui32CurrentVertexOutputStream;
-
-    uint32_t ui32NumDx9ImmConst;
-    uint32_t aui32Dx9ImmConstArrayRemap[MAX_DX9_IMMCONST];
-
-    ShaderVarType sGroupSharedVarType[MAX_GROUPSHARED];
-
-    SHADER_VARIABLE_TYPE aeCommonTempVecType[MAX_TEMP_VEC4];
-    uint32_t bUseTempCopy;
-    FRAMEBUFFER_FETCH_TYPE eGmemType;
-} Shader;
-
-/* CONFETTI NOTE: DAVID SROUR
- * The following is super sketchy, but at the moment,
- * there is no way to figure out the type of a resource
- * since HLSL has only register sets for the following:
- * bool, int4, float4, sampler.
- * THIS CODE IS DUPLICATED FROM HLSLcc METAL.
- * IF ANYTHING CHANGES, BOTH TRANSLATORS SHOULD HAVE THE CHANGE.
- * TODO: CONSOLIDATE THE 2 HLSLcc PROJECTS.
- */
-enum
-{
-    GMEM_FLOAT4_START_SLOT = 120
-};
-enum
-{
-    GMEM_FLOAT3_START_SLOT = 112
-};
-enum
-{
-    GMEM_FLOAT2_START_SLOT = 104
-};
-enum
-{
-    GMEM_FLOAT_START_SLOT = 96
-};
-
-enum
-{
-    GMEM_ARM_COLOR_SLOT = 93,
-    GMEM_ARM_DEPTH_SLOT = 94,
-    GMEM_ARM_STENCIL_SLOT = 95
-};
-
-/* CONFETTI NOTE: DAVID SROUR
- * Following is the reserved slot for PLS extension (https://www.khronos.org/registry/gles/extensions/EXT/EXT_shader_pixel_local_storage.txt).
- * It will get picked up when a RWStructuredBuffer resource is defined at the following reserved slot.
- * Note that only one PLS struct can be present at a time otherwise the behavior is undefined.
- *
- * Types in the struct and their output conversion (each output variable will always be 4 bytes):
- * float2   -> rg16f
- * float3   -> r11f_g11f_b10f
- * float4   -> rgba8
- * uint     -> r32ui
- * int2     -> rg16i
- * int4     -> rgba8i
- */
-enum
-{
-    GMEM_PLS_RO_SLOT = 60
-};                              // READ-ONLY
-enum
-{
-    GMEM_PLS_WO_SLOT = 61
-};                              // WRITE-ONLY
-enum
-{
-    GMEM_PLS_RW_SLOT = 62
-};                              // READ/WRITE
-
-static const uint32_t MAIN_PHASE = 0;
-static const uint32_t HS_FORK_PHASE = 1;
-static const uint32_t HS_CTRL_POINT_PHASE = 2;
-static const uint32_t HS_JOIN_PHASE = 3;
-enum
-{
-    NUM_PHASES = 4
-};
-
-enum
-{
-    MAX_COLOR_MRT = 8
-};
-
-enum
-{
-    INPUT_RENDERTARGET = 1 << 0,
-    OUTPUT_RENDERTARGET = 1 << 1
-};
-
-typedef struct HLSLCrossCompilerContext_TAG
-{
-    bstring glsl;
-    bstring earlyMain;//Code to be inserted at the start of main()
-    bstring postShaderCode[NUM_PHASES];//End of main or before emit()
-    bstring debugHeader;
-
-    bstring* currentGLSLString;//either glsl or earlyMain
-
-    int havePostShaderCode[NUM_PHASES];
-    uint32_t currentPhase;
-
-    uint32_t rendertargetUse[MAX_COLOR_MRT];
-
-    int indent;
-    unsigned int flags;
-    Shader* psShader;
-} HLSLCrossCompilerContext;
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLDeclaration.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLDeclaration.h
deleted file mode 100644
index 337a771e19..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLDeclaration.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_GLSL_DECLARATION_H
-#define TO_GLSL_DECLARATION_H
-
-#include "internal_includes/structs.h"
-
-void TranslateDeclaration(HLSLCrossCompilerContext* psContext, const Declaration* psDecl);
-
-char* GetDeclaredInputName(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand);
-char* GetDeclaredOutputName(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand, int* stream);
-
-//Hull shaders have multiple phases.
-//Each phase has its own temps.
-//Convert to global temps for GLSL.
-void ConsolidateHullTempVars(Shader* psShader);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLInstruction.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLInstruction.h
deleted file mode 100644
index bf6795d931..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLInstruction.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_GLSL_INSTRUCTION_H
-#define TO_GLSL_INSTRUCTION_H
-
-#include "internal_includes/structs.h"
-
-void TranslateInstruction(HLSLCrossCompilerContext* psContext, Instruction* psInst);
-
-//For each MOV temp, immediate; check to see if the next instruction
-//using that temp has an integer opcode. If so then the immediate value
-//is flaged as having an integer encoding.
-void MarkIntegerImmediates(HLSLCrossCompilerContext* psContext);
-
-void SetDataTypes(HLSLCrossCompilerContext* psContext, Instruction* psInst, const int32_t i32InstCount, SHADER_VARIABLE_TYPE* aeCommonTempVecType);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLOperand.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLOperand.h
deleted file mode 100644
index 56487ea69b..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toGLSLOperand.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_GLSL_OPERAND_H
-#define TO_GLSL_OPERAND_H
-
-#include "internal_includes/structs.h"
-
-void TranslateOperand(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag);
-
-int GetMaxComponentFromComponentMask(const Operand* psOperand);
-void TranslateOperandIndex(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index);
-void TranslateOperandIndexMAD(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index, uint32_t multiply, uint32_t add);
-void TranslateVariableName(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t* pui32IgnoreSwizzle);
-void TranslateOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-
-uint32_t GetNumSwizzleElements(const Operand* psOperand);
-void AddSwizzleUsingElementCount(HLSLCrossCompilerContext* psContext, uint32_t count);
-int GetFirstOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-uint32_t IsSwizzleReplacated(const Operand* psOperand);
-
-void TextureName(bstring output, Shader* psShader, const uint32_t ui32TextureRegister, const uint32_t ui32SamplerRegister, const int bCompare);
-void UAVName(bstring output, Shader* psShader, const uint32_t ui32RegisterNumber);
-void UniformBufferName(bstring output, Shader* psShader, const uint32_t ui32RegisterNumber);
-
-void ConvertToTextureName(bstring output, Shader* psShader, const char* szName, const char* szSamplerName, const int bCompare);
-void ConvertToUAVName(bstring output, Shader* psShader, const char* szOriginalUAVName);
-void ConvertToUniformBufferName(bstring output, Shader* psShader, const char* szConstantBufferName);
-
-void ShaderVarName(bstring output, Shader* psShader, const char* OriginalName);
-void ShaderVarFullName(bstring output, Shader* psShader, const ShaderVarType* psShaderVar);
-
-uint32_t ConvertOperandSwizzleToComponentMask(const Operand* psOperand);
-//Non-zero means the components overlap
-int CompareOperandSwizzles(const Operand* psOperandA, const Operand* psOperandB);
-
-SHADER_VARIABLE_TYPE GetOperandDataType(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-
-
-// NOTE: CODE DUPLICATION FROM HLSLcc METAL ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void TranslateGmemOperandSwizzleWithMask(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask, uint32_t gmemNumElements);
-uint32_t GetGmemInputResourceSlot(uint32_t const slotIn);
-uint32_t GetGmemInputResourceNumElements(uint32_t const slotIn);
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALDeclaration.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALDeclaration.h
deleted file mode 100644
index 724723bf49..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALDeclaration.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_METAL_DECLARATION_H
-#define TO_METAL_DECLARATION_H
-
-#include "internal_includes/structs.h"
-
-void TranslateDeclarationMETAL(HLSLCrossCompilerContext* psContext, const Declaration* psDecl);
-
-char* GetDeclaredInputNameMETAL(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand);
-char* GetDeclaredOutputNameMETAL(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand);
-
-const char* GetMangleSuffixMETAL(const SHADER_TYPE eShaderType);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALInstruction.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALInstruction.h
deleted file mode 100644
index eb29e74685..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALInstruction.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_METAL_INSTRUCTION_H
-#define TO_METAL_INSTRUCTION_H
-
-#include "internal_includes/structs.h"
-
-void TranslateInstructionMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst);
-
-//For each MOV temp, immediate; check to see if the next instruction
-//using that temp has an integer opcode. If so then the immediate value
-//is flaged as having an integer encoding.
-void MarkIntegerImmediatesMETAL(HLSLCrossCompilerContext* psContext);
-
-void SetDataTypesMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, const int32_t i32InstCount, SHADER_VARIABLE_TYPE* aeCommonTempVecType);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALOperand.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALOperand.h
deleted file mode 100644
index d4bcbcbc73..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/toMETALOperand.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_METAL_OPERAND_H
-#define TO_METAL_OPERAND_H
-
-#include "internal_includes/structs.h"
-
-#define TO_FLAG_NONE    0x0
-#define TO_FLAG_INTEGER 0x1
-#define TO_FLAG_NAME_ONLY 0x2
-#define TO_FLAG_DECLARATION_NAME 0x4
-#define TO_FLAG_DESTINATION 0x8 //Operand is being written to by assignment.
-#define TO_FLAG_UNSIGNED_INTEGER 0x10
-#define TO_FLAG_DOUBLE 0x20
-#define TO_FLAG_FLOAT 0x40
-
-void TranslateOperandMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag);
-
-int GetMaxComponentFromComponentMaskMETAL(const Operand* psOperand);
-void TranslateOperandMETALIndex(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index);
-void TranslateOperandMETALIndexMAD(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index, uint32_t multiply, uint32_t add);
-void TranslateVariableNameMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t* pui32IgnoreSwizzle);
-void TranslateOperandMETALSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-uint32_t GetNumSwizzleElementsMETAL(const Operand* psOperand);
-void AddSwizzleUsingElementCountMETAL(HLSLCrossCompilerContext* psContext, uint32_t count);
-int GetFirstOperandSwizzleMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-uint32_t IsSwizzleReplacatedMETAL(const Operand* psOperand);
-
-void TextureNameMETAL(HLSLCrossCompilerContext* psContext, const uint32_t ui32RegisterNumber, const int bZCompare);
-
-uint32_t ConvertOperandSwizzleToComponentMaskMETAL(const Operand* psOperand);
-//Non-zero means the components overlap
-int CompareOperandSwizzlesMETAL(const Operand* psOperandA, const Operand* psOperandB);
-
-SHADER_VARIABLE_TYPE GetOperandDataTypeMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/tokens.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/tokens.h
deleted file mode 100644
index 635edf57be..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/tokens.h
+++ /dev/null
@@ -1,812 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TOKENS_H
-#define TOKENS_H
-
-#include "hlslcc.h"
-
-typedef enum
-{
-    INVALID_SHADER = -1,
-    PIXEL_SHADER,
-    VERTEX_SHADER,
-    GEOMETRY_SHADER,
-    HULL_SHADER,
-    DOMAIN_SHADER,
-    COMPUTE_SHADER,
-} SHADER_TYPE;
-
-static SHADER_TYPE DecodeShaderType(uint32_t ui32Token)
-{
-    return (SHADER_TYPE)((ui32Token & 0xffff0000) >> 16);
-}
-
-static uint32_t DecodeProgramMajorVersion(uint32_t ui32Token)
-{
-    return (ui32Token & 0x000000f0) >> 4;
-}
-
-static uint32_t DecodeProgramMinorVersion(uint32_t ui32Token)
-{
-    return (ui32Token & 0x0000000f);
-}
-
-static uint32_t DecodeInstructionLength(uint32_t ui32Token)
-{
-    return (ui32Token & 0x7f000000) >> 24;
-}
-
-static uint32_t DecodeIsOpcodeExtended(uint32_t ui32Token)
-{
-    return (ui32Token & 0x80000000) >> 31;
-}
-
-typedef enum EXTENDED_OPCODE_TYPE
-{
-    EXTENDED_OPCODE_EMPTY           = 0,
-    EXTENDED_OPCODE_SAMPLE_CONTROLS = 1,
-    EXTENDED_OPCODE_RESOURCE_DIM = 2,
-    EXTENDED_OPCODE_RESOURCE_RETURN_TYPE = 3,
-} EXTENDED_OPCODE_TYPE;
-
-static EXTENDED_OPCODE_TYPE DecodeExtendedOpcodeType(uint32_t ui32Token)
-{
-    return (EXTENDED_OPCODE_TYPE)(ui32Token & 0x0000003f);
-}
-
-typedef enum RESOURCE_RETURN_TYPE
-{
-    RETURN_TYPE_UNORM = 1,
-    RETURN_TYPE_SNORM = 2,
-    RETURN_TYPE_SINT = 3,
-    RETURN_TYPE_UINT = 4,
-    RETURN_TYPE_FLOAT = 5,
-    RETURN_TYPE_MIXED = 6,
-    RETURN_TYPE_DOUBLE = 7,
-    RETURN_TYPE_CONTINUED = 8,
-    RETURN_TYPE_UNUSED = 9,
-} RESOURCE_RETURN_TYPE;
-
-static RESOURCE_RETURN_TYPE DecodeResourceReturnType(uint32_t ui32Coord, uint32_t ui32Token)
-{
-    return (RESOURCE_RETURN_TYPE)((ui32Token>>(ui32Coord * 4))&0xF);
-}
-
-static RESOURCE_RETURN_TYPE DecodeExtendedResourceReturnType(uint32_t ui32Coord, uint32_t ui32Token)
-{
-    return (RESOURCE_RETURN_TYPE)((ui32Token>>(ui32Coord * 4 + 6))&0xF);
-}
-
-typedef enum
-{
-    //For DX9
-    OPCODE_POW = -6,
-    OPCODE_DP2ADD = -5,
-    OPCODE_LRP = -4,
-    OPCODE_ENDREP = -3,
-    OPCODE_REP = -2,
-    OPCODE_SPECIAL_DCL_IMMCONST = -1,
-
-    OPCODE_ADD,
-    OPCODE_AND,
-    OPCODE_BREAK,
-    OPCODE_BREAKC,
-    OPCODE_CALL,
-    OPCODE_CALLC,
-    OPCODE_CASE,
-    OPCODE_CONTINUE,
-    OPCODE_CONTINUEC,
-    OPCODE_CUT,
-    OPCODE_DEFAULT,
-    OPCODE_DERIV_RTX,
-    OPCODE_DERIV_RTY,
-    OPCODE_DISCARD,
-    OPCODE_DIV,
-    OPCODE_DP2,
-    OPCODE_DP3,
-    OPCODE_DP4,
-    OPCODE_ELSE,
-    OPCODE_EMIT,
-    OPCODE_EMITTHENCUT,
-    OPCODE_ENDIF,
-    OPCODE_ENDLOOP,
-    OPCODE_ENDSWITCH,
-    OPCODE_EQ,
-    OPCODE_EXP,
-    OPCODE_FRC,
-    OPCODE_FTOI,
-    OPCODE_FTOU,
-    OPCODE_GE,
-    OPCODE_IADD,
-    OPCODE_IF,
-    OPCODE_IEQ,
-    OPCODE_IGE,
-    OPCODE_ILT,
-    OPCODE_IMAD,
-    OPCODE_IMAX,
-    OPCODE_IMIN,
-    OPCODE_IMUL,
-    OPCODE_INE,
-    OPCODE_INEG,
-    OPCODE_ISHL,
-    OPCODE_ISHR,
-    OPCODE_ITOF,
-    OPCODE_LABEL,
-    OPCODE_LD,
-    OPCODE_LD_MS,
-    OPCODE_LOG,
-    OPCODE_LOOP,
-    OPCODE_LT,
-    OPCODE_MAD,
-    OPCODE_MIN,
-    OPCODE_MAX,
-    OPCODE_CUSTOMDATA,
-    OPCODE_MOV,
-    OPCODE_MOVC,
-    OPCODE_MUL,
-    OPCODE_NE,
-    OPCODE_NOP,
-    OPCODE_NOT,
-    OPCODE_OR,
-    OPCODE_RESINFO,
-    OPCODE_RET,
-    OPCODE_RETC,
-    OPCODE_ROUND_NE,
-    OPCODE_ROUND_NI,
-    OPCODE_ROUND_PI,
-    OPCODE_ROUND_Z,
-    OPCODE_RSQ,
-    OPCODE_SAMPLE,
-    OPCODE_SAMPLE_C,
-    OPCODE_SAMPLE_C_LZ,
-    OPCODE_SAMPLE_L,
-    OPCODE_SAMPLE_D,
-    OPCODE_SAMPLE_B,
-    OPCODE_SQRT,
-    OPCODE_SWITCH,
-    OPCODE_SINCOS,
-    OPCODE_UDIV,
-    OPCODE_ULT,
-    OPCODE_UGE,
-    OPCODE_UMUL,
-    OPCODE_UMAD,
-    OPCODE_UMAX,
-    OPCODE_UMIN,
-    OPCODE_USHR,
-    OPCODE_UTOF,
-    OPCODE_XOR,
-    OPCODE_DCL_RESOURCE, // DCL* opcodes have
-    OPCODE_DCL_CONSTANT_BUFFER, // custom operand formats.
-    OPCODE_DCL_SAMPLER,
-    OPCODE_DCL_INDEX_RANGE,
-    OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY,
-    OPCODE_DCL_GS_INPUT_PRIMITIVE,
-    OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT,
-    OPCODE_DCL_INPUT,
-    OPCODE_DCL_INPUT_SGV,
-    OPCODE_DCL_INPUT_SIV,
-    OPCODE_DCL_INPUT_PS,
-    OPCODE_DCL_INPUT_PS_SGV,
-    OPCODE_DCL_INPUT_PS_SIV,
-    OPCODE_DCL_OUTPUT,
-    OPCODE_DCL_OUTPUT_SGV,
-    OPCODE_DCL_OUTPUT_SIV,
-    OPCODE_DCL_TEMPS,
-    OPCODE_DCL_INDEXABLE_TEMP,
-    OPCODE_DCL_GLOBAL_FLAGS,
-
-    // -----------------------------------------------
-
-    OPCODE_RESERVED_10,
-
-    // ---------- DX 10.1 op codes---------------------
-
-    OPCODE_LOD,
-    OPCODE_GATHER4,
-    OPCODE_SAMPLE_POS,
-    OPCODE_SAMPLE_INFO,
-
-    // -----------------------------------------------
-
-    // This should be 10.1's version of NUM_OPCODES
-    OPCODE_RESERVED_10_1,
-
-    // ---------- DX 11 op codes---------------------
-    OPCODE_HS_DECLS, // token marks beginning of HS sub-shader
-    OPCODE_HS_CONTROL_POINT_PHASE, // token marks beginning of HS sub-shader
-    OPCODE_HS_FORK_PHASE, // token marks beginning of HS sub-shader
-    OPCODE_HS_JOIN_PHASE, // token marks beginning of HS sub-shader
-
-    OPCODE_EMIT_STREAM,
-    OPCODE_CUT_STREAM,
-    OPCODE_EMITTHENCUT_STREAM,
-    OPCODE_INTERFACE_CALL,
-
-    OPCODE_BUFINFO,
-    OPCODE_DERIV_RTX_COARSE,
-    OPCODE_DERIV_RTX_FINE,
-    OPCODE_DERIV_RTY_COARSE,
-    OPCODE_DERIV_RTY_FINE,
-    OPCODE_GATHER4_C,
-    OPCODE_GATHER4_PO,
-    OPCODE_GATHER4_PO_C,
-    OPCODE_RCP,
-    OPCODE_F32TOF16,
-    OPCODE_F16TOF32,
-    OPCODE_UADDC,
-    OPCODE_USUBB,
-    OPCODE_COUNTBITS,
-    OPCODE_FIRSTBIT_HI,
-    OPCODE_FIRSTBIT_LO,
-    OPCODE_FIRSTBIT_SHI,
-    OPCODE_UBFE,
-    OPCODE_IBFE,
-    OPCODE_BFI,
-    OPCODE_BFREV,
-    OPCODE_SWAPC,
-
-    OPCODE_DCL_STREAM,
-    OPCODE_DCL_FUNCTION_BODY,
-    OPCODE_DCL_FUNCTION_TABLE,
-    OPCODE_DCL_INTERFACE,
-
-    OPCODE_DCL_INPUT_CONTROL_POINT_COUNT,
-    OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT,
-    OPCODE_DCL_TESS_DOMAIN,
-    OPCODE_DCL_TESS_PARTITIONING,
-    OPCODE_DCL_TESS_OUTPUT_PRIMITIVE,
-    OPCODE_DCL_HS_MAX_TESSFACTOR,
-    OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT,
-    OPCODE_DCL_HS_JOIN_PHASE_INSTANCE_COUNT,
-
-    OPCODE_DCL_THREAD_GROUP,
-    OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED,
-    OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW,
-    OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED,
-    OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW,
-    OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED,
-    OPCODE_DCL_RESOURCE_RAW,
-    OPCODE_DCL_RESOURCE_STRUCTURED,
-    OPCODE_LD_UAV_TYPED,
-    OPCODE_STORE_UAV_TYPED,
-    OPCODE_LD_RAW,
-    OPCODE_STORE_RAW,
-    OPCODE_LD_STRUCTURED,
-    OPCODE_STORE_STRUCTURED,
-    OPCODE_ATOMIC_AND,
-    OPCODE_ATOMIC_OR,
-    OPCODE_ATOMIC_XOR,
-    OPCODE_ATOMIC_CMP_STORE,
-    OPCODE_ATOMIC_IADD,
-    OPCODE_ATOMIC_IMAX,
-    OPCODE_ATOMIC_IMIN,
-    OPCODE_ATOMIC_UMAX,
-    OPCODE_ATOMIC_UMIN,
-    OPCODE_IMM_ATOMIC_ALLOC,
-    OPCODE_IMM_ATOMIC_CONSUME,
-    OPCODE_IMM_ATOMIC_IADD,
-    OPCODE_IMM_ATOMIC_AND,
-    OPCODE_IMM_ATOMIC_OR,
-    OPCODE_IMM_ATOMIC_XOR,
-    OPCODE_IMM_ATOMIC_EXCH,
-    OPCODE_IMM_ATOMIC_CMP_EXCH,
-    OPCODE_IMM_ATOMIC_IMAX,
-    OPCODE_IMM_ATOMIC_IMIN,
-    OPCODE_IMM_ATOMIC_UMAX,
-    OPCODE_IMM_ATOMIC_UMIN,   
-    OPCODE_SYNC,
-
-    OPCODE_DADD,
-    OPCODE_DMAX,
-    OPCODE_DMIN,
-    OPCODE_DMUL,
-    OPCODE_DEQ,
-    OPCODE_DGE,
-    OPCODE_DLT,
-    OPCODE_DNE,
-    OPCODE_DMOV,
-    OPCODE_DMOVC,
-    OPCODE_DTOF,
-    OPCODE_FTOD,
-
-    OPCODE_EVAL_SNAPPED,
-    OPCODE_EVAL_SAMPLE_INDEX,
-    OPCODE_EVAL_CENTROID,
-
-    OPCODE_DCL_GS_INSTANCE_COUNT,
-
-    OPCODE_ABORT,
-    OPCODE_DEBUG_BREAK,
-
-    // -----------------------------------------------
-
-    // This marks the end of D3D11.0 opcodes
-    OPCODE_RESERVED_11,
-
-    OPCODE_DDIV,
-    OPCODE_DFMA,
-    OPCODE_DRCP,
-
-    OPCODE_MSAD,
-
-    OPCODE_DTOI,
-    OPCODE_DTOU,
-    OPCODE_ITOD,
-    OPCODE_UTOD,
-
-    // -----------------------------------------------
-
-    // This marks the end of D3D11.1 opcodes
-    OPCODE_RESERVED_11_1,
-
-    NUM_OPCODES,
-    OPCODE_INVAILD = NUM_OPCODES,
-} OPCODE_TYPE;
-
-static OPCODE_TYPE DecodeOpcodeType(uint32_t ui32Token)
-{
-    return (OPCODE_TYPE)(ui32Token & 0x00007ff);
-}
-
-typedef enum
-{
-    INDEX_0D,
-    INDEX_1D,
-    INDEX_2D,
-    INDEX_3D,
-} OPERAND_INDEX_DIMENSION;
-
-static OPERAND_INDEX_DIMENSION DecodeOperandIndexDimension(uint32_t ui32Token)
-{
-    return (OPERAND_INDEX_DIMENSION)((ui32Token & 0x00300000) >> 20);
-}
-
-typedef enum OPERAND_TYPE
-{
-    OPERAND_TYPE_SPECIAL_LOOPCOUNTER = -10,
-    OPERAND_TYPE_SPECIAL_IMMCONSTINT = -9,
-    OPERAND_TYPE_SPECIAL_TEXCOORD = -8,
-    OPERAND_TYPE_SPECIAL_POSITION = -7,
-    OPERAND_TYPE_SPECIAL_FOG = -6,
-    OPERAND_TYPE_SPECIAL_POINTSIZE = -5,
-    OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR = -4,
-    OPERAND_TYPE_SPECIAL_OUTBASECOLOUR = -3,
-    OPERAND_TYPE_SPECIAL_ADDRESS = -2,
-    OPERAND_TYPE_SPECIAL_IMMCONST = -1,
-    OPERAND_TYPE_TEMP           = 0,  // Temporary Register File
-    OPERAND_TYPE_INPUT          = 1,  // General Input Register File
-    OPERAND_TYPE_OUTPUT         = 2,  // General Output Register File
-    OPERAND_TYPE_INDEXABLE_TEMP = 3,  // Temporary Register File (indexable)
-    OPERAND_TYPE_IMMEDIATE32    = 4,  // 32bit/component immediate value(s)
-    // If for example, operand token bits
-    // [01:00]==OPERAND_4_COMPONENT,
-    // this means that the operand type:
-    // OPERAND_TYPE_IMMEDIATE32
-    // results in 4 additional 32bit
-    // DWORDS present for the operand.
-    OPERAND_TYPE_IMMEDIATE64    = 5,  // 64bit/comp.imm.val(s)HI:LO
-    OPERAND_TYPE_SAMPLER        = 6,  // Reference to sampler state
-    OPERAND_TYPE_RESOURCE       = 7,  // Reference to memory resource (e.g. texture)
-    OPERAND_TYPE_CONSTANT_BUFFER= 8,  // Reference to constant buffer
-    OPERAND_TYPE_IMMEDIATE_CONSTANT_BUFFER= 9,  // Reference to immediate constant buffer
-    OPERAND_TYPE_LABEL          = 10, // Label
-    OPERAND_TYPE_INPUT_PRIMITIVEID = 11, // Input primitive ID
-    OPERAND_TYPE_OUTPUT_DEPTH   = 12, // Output Depth
-    OPERAND_TYPE_NULL           = 13, // Null register, used to discard results of operations
-    // Below Are operands new in DX 10.1
-    OPERAND_TYPE_RASTERIZER     = 14, // DX10.1 Rasterizer register, used to denote the depth/stencil and render target resources
-    OPERAND_TYPE_OUTPUT_COVERAGE_MASK = 15, // DX10.1 PS output MSAA coverage mask (scalar)
-    // Below Are operands new in DX 11
-    OPERAND_TYPE_STREAM         = 16, // Reference to GS stream output resource
-    OPERAND_TYPE_FUNCTION_BODY  = 17, // Reference to a function definition
-    OPERAND_TYPE_FUNCTION_TABLE = 18, // Reference to a set of functions used by a class
-    OPERAND_TYPE_INTERFACE      = 19, // Reference to an interface
-    OPERAND_TYPE_FUNCTION_INPUT = 20, // Reference to an input parameter to a function
-    OPERAND_TYPE_FUNCTION_OUTPUT = 21, // Reference to an output parameter to a function
-    OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID = 22, // HS Control Point phase input saying which output control point ID this is
-    OPERAND_TYPE_INPUT_FORK_INSTANCE_ID = 23, // HS Fork Phase input instance ID
-    OPERAND_TYPE_INPUT_JOIN_INSTANCE_ID = 24, // HS Join Phase input instance ID
-    OPERAND_TYPE_INPUT_CONTROL_POINT = 25, // HS Fork+Join, DS phase input control points (array of them)
-    OPERAND_TYPE_OUTPUT_CONTROL_POINT = 26, // HS Fork+Join phase output control points (array of them)
-    OPERAND_TYPE_INPUT_PATCH_CONSTANT = 27, // DS+HSJoin Input Patch Constants (array of them)
-    OPERAND_TYPE_INPUT_DOMAIN_POINT = 28, // DS Input Domain point
-    OPERAND_TYPE_THIS_POINTER       = 29, // Reference to an interface this pointer
-    OPERAND_TYPE_UNORDERED_ACCESS_VIEW = 30, // Reference to UAV u#
-    OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY = 31, // Reference to Thread Group Shared Memory g#
-    OPERAND_TYPE_INPUT_THREAD_ID = 32, // Compute Shader Thread ID
-    OPERAND_TYPE_INPUT_THREAD_GROUP_ID = 33, // Compute Shader Thread Group ID
-    OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP = 34, // Compute Shader Thread ID In Thread Group
-    OPERAND_TYPE_INPUT_COVERAGE_MASK = 35, // Pixel shader coverage mask input
-    OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED = 36, // Compute Shader Thread ID In Group Flattened to a 1D value.
-    OPERAND_TYPE_INPUT_GS_INSTANCE_ID = 37, // Input GS instance ID
-    OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL = 38, // Output Depth, forced to be greater than or equal than current depth
-    OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL    = 39, // Output Depth, forced to be less than or equal to current depth
-    OPERAND_TYPE_CYCLE_COUNTER = 40, // Cycle counter
-} OPERAND_TYPE;
-
-static OPERAND_TYPE DecodeOperandType(uint32_t ui32Token)
-{
-    return (OPERAND_TYPE)((ui32Token & 0x000ff000) >> 12);
-}
-
-static SPECIAL_NAME DecodeOperandSpecialName(uint32_t ui32Token)
-{
-    return (SPECIAL_NAME)(ui32Token & 0x0000ffff);
-}
-
-typedef enum OPERAND_INDEX_REPRESENTATION
-{
-    OPERAND_INDEX_IMMEDIATE32               = 0, // Extra DWORD
-    OPERAND_INDEX_IMMEDIATE64               = 1, // 2 Extra DWORDs
-    //   (HI32:LO32)
-    OPERAND_INDEX_RELATIVE                  = 2, // Extra operand
-    OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE = 3, // Extra DWORD followed by
-    //   extra operand
-    OPERAND_INDEX_IMMEDIATE64_PLUS_RELATIVE = 4, // 2 Extra DWORDS
-    //   (HI32:LO32) followed
-    //   by extra operand
-} OPERAND_INDEX_REPRESENTATION;
-
-static OPERAND_INDEX_REPRESENTATION DecodeOperandIndexRepresentation(uint32_t ui32Dimension, uint32_t ui32Token)
-{
-    return (OPERAND_INDEX_REPRESENTATION)((ui32Token & (0x3<<(22+3*((ui32Dimension)&3)))) >> (22+3*((ui32Dimension)&3)));
-}
-
-typedef enum OPERAND_NUM_COMPONENTS
-{
-    OPERAND_0_COMPONENT = 0,
-    OPERAND_1_COMPONENT = 1,
-    OPERAND_4_COMPONENT = 2,
-    OPERAND_N_COMPONENT = 3 // unused for now
-} OPERAND_NUM_COMPONENTS;
-
-static OPERAND_NUM_COMPONENTS DecodeOperandNumComponents(uint32_t ui32Token)
-{
-    return (OPERAND_NUM_COMPONENTS)(ui32Token & 0x00000003);
-}
-
-typedef enum OPERAND_4_COMPONENT_SELECTION_MODE
-{
-    OPERAND_4_COMPONENT_MASK_MODE    = 0,  // mask 4 components
-    OPERAND_4_COMPONENT_SWIZZLE_MODE = 1,  // swizzle 4 components
-    OPERAND_4_COMPONENT_SELECT_1_MODE = 2, // select 1 of 4 components
-} OPERAND_4_COMPONENT_SELECTION_MODE;
-
-static OPERAND_4_COMPONENT_SELECTION_MODE DecodeOperand4CompSelMode(uint32_t ui32Token)
-{
-    return (OPERAND_4_COMPONENT_SELECTION_MODE)((ui32Token & 0x0000000c) >> 2);
-}
-
-#define OPERAND_4_COMPONENT_MASK_X      0x00000001
-#define OPERAND_4_COMPONENT_MASK_Y      0x00000002
-#define OPERAND_4_COMPONENT_MASK_Z      0x00000004
-#define OPERAND_4_COMPONENT_MASK_W      0x00000008
-#define OPERAND_4_COMPONENT_MASK_R      OPERAND_4_COMPONENT_MASK_X
-#define OPERAND_4_COMPONENT_MASK_G      OPERAND_4_COMPONENT_MASK_Y
-#define OPERAND_4_COMPONENT_MASK_B      OPERAND_4_COMPONENT_MASK_Z
-#define OPERAND_4_COMPONENT_MASK_A      OPERAND_4_COMPONENT_MASK_W
-#define OPERAND_4_COMPONENT_MASK_ALL    0x0000000f
-
-static uint32_t DecodeOperand4CompMask(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x000000f0) >> 4);
-}
-
-static uint32_t DecodeOperand4CompSwizzle(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x00000ff0) >> 4);
-}
-
-static uint32_t DecodeOperand4CompSel1(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x00000030) >> 4);
-}
-
-#define OPERAND_4_COMPONENT_X      0
-#define OPERAND_4_COMPONENT_Y      1
-#define OPERAND_4_COMPONENT_Z      2
-#define OPERAND_4_COMPONENT_W      3
-
-static uint32_t NO_SWIZZLE = (( (OPERAND_4_COMPONENT_X) | (OPERAND_4_COMPONENT_Y<<2) | (OPERAND_4_COMPONENT_Z << 4) | (OPERAND_4_COMPONENT_W << 6))/*<<4*/);
-
-static uint32_t XXXX_SWIZZLE = (((OPERAND_4_COMPONENT_X) | (OPERAND_4_COMPONENT_X<<2) | (OPERAND_4_COMPONENT_X << 4) | (OPERAND_4_COMPONENT_X << 6)));
-static uint32_t YYYY_SWIZZLE = (((OPERAND_4_COMPONENT_Y) | (OPERAND_4_COMPONENT_Y<<2) | (OPERAND_4_COMPONENT_Y << 4) | (OPERAND_4_COMPONENT_Y << 6)));
-static uint32_t ZZZZ_SWIZZLE = (((OPERAND_4_COMPONENT_Z) | (OPERAND_4_COMPONENT_Z<<2) | (OPERAND_4_COMPONENT_Z << 4) | (OPERAND_4_COMPONENT_Z << 6)));
-static uint32_t WWWW_SWIZZLE = (((OPERAND_4_COMPONENT_W) | (OPERAND_4_COMPONENT_W<<2) | (OPERAND_4_COMPONENT_W << 4) | (OPERAND_4_COMPONENT_W << 6)));
-
-static uint32_t DecodeOperand4CompSwizzleSource(uint32_t ui32Token, uint32_t comp)
-{
-    return (uint32_t)(((ui32Token)>>(4+2*((comp)&3)))&3);
-}
-
-typedef enum RESOURCE_DIMENSION
-{
-    RESOURCE_DIMENSION_UNKNOWN = 0,
-    RESOURCE_DIMENSION_BUFFER = 1,
-    RESOURCE_DIMENSION_TEXTURE1D = 2,
-    RESOURCE_DIMENSION_TEXTURE2D = 3,
-    RESOURCE_DIMENSION_TEXTURE2DMS = 4,
-    RESOURCE_DIMENSION_TEXTURE3D = 5,
-    RESOURCE_DIMENSION_TEXTURECUBE = 6,
-    RESOURCE_DIMENSION_TEXTURE1DARRAY = 7,
-    RESOURCE_DIMENSION_TEXTURE2DARRAY = 8,
-    RESOURCE_DIMENSION_TEXTURE2DMSARRAY = 9,
-    RESOURCE_DIMENSION_TEXTURECUBEARRAY = 10,
-    RESOURCE_DIMENSION_RAW_BUFFER = 11,
-    RESOURCE_DIMENSION_STRUCTURED_BUFFER = 12,
-} RESOURCE_DIMENSION;
-
-static RESOURCE_DIMENSION DecodeResourceDimension(uint32_t ui32Token)
-{
-    return (RESOURCE_DIMENSION)((ui32Token & 0x0000f800) >> 11);
-}
-
-static RESOURCE_DIMENSION DecodeExtendedResourceDimension(uint32_t ui32Token)
-{
-    return (RESOURCE_DIMENSION)((ui32Token & 0x000007C0) >> 6);
-}
-
-typedef enum CONSTANT_BUFFER_ACCESS_PATTERN
-{
-    CONSTANT_BUFFER_ACCESS_PATTERN_IMMEDIATEINDEXED = 0,
-    CONSTANT_BUFFER_ACCESS_PATTERN_DYNAMICINDEXED = 1
-} CONSTANT_BUFFER_ACCESS_PATTERN;
-
-static CONSTANT_BUFFER_ACCESS_PATTERN DecodeConstantBufferAccessPattern(uint32_t ui32Token)
-{
-    return (CONSTANT_BUFFER_ACCESS_PATTERN)((ui32Token & 0x00000800) >> 11);
-}
-
-typedef enum INSTRUCTION_TEST_BOOLEAN
-{
-    INSTRUCTION_TEST_ZERO       = 0,
-    INSTRUCTION_TEST_NONZERO    = 1
-} INSTRUCTION_TEST_BOOLEAN;
-
-static INSTRUCTION_TEST_BOOLEAN DecodeInstrTestBool(uint32_t ui32Token)
-{
-    return (INSTRUCTION_TEST_BOOLEAN)((ui32Token & 0x00040000) >> 18);
-}
-
-static uint32_t DecodeIsOperandExtended(uint32_t ui32Token)
-{
-    return (ui32Token & 0x80000000) >> 31;
-}
-
-typedef enum EXTENDED_OPERAND_TYPE
-{
-    EXTENDED_OPERAND_EMPTY            = 0,
-    EXTENDED_OPERAND_MODIFIER         = 1,
-} EXTENDED_OPERAND_TYPE;
-
-static EXTENDED_OPERAND_TYPE DecodeExtendedOperandType(uint32_t ui32Token)
-{
-    return (EXTENDED_OPERAND_TYPE)(ui32Token & 0x0000003f);
-}
-
-typedef enum OPERAND_MODIFIER
-{
-    OPERAND_MODIFIER_NONE     = 0,
-    OPERAND_MODIFIER_NEG      = 1,
-    OPERAND_MODIFIER_ABS      = 2,
-    OPERAND_MODIFIER_ABSNEG   = 3,
-} OPERAND_MODIFIER;
-
-static OPERAND_MODIFIER DecodeExtendedOperandModifier(uint32_t ui32Token)
-{
-    return (OPERAND_MODIFIER)((ui32Token & 0x00003fc0) >> 6);
-}
-
-static const uint32_t GLOBAL_FLAG_REFACTORING_ALLOWED = (1<<11);
-static const uint32_t GLOBAL_FLAG_ENABLE_DOUBLE_PRECISION_FLOAT_OPS = (1<<12);
-static const uint32_t GLOBAL_FLAG_FORCE_EARLY_DEPTH_STENCIL = (1<<13);
-static const uint32_t GLOBAL_FLAG_ENABLE_RAW_AND_STRUCTURED_BUFFERS = (1<<14);
-static const uint32_t GLOBAL_FLAG_SKIP_OPTIMIZATION = (1<<15);
-static const uint32_t GLOBAL_FLAG_ENABLE_MINIMUM_PRECISION = (1<<16);
-static const uint32_t GLOBAL_FLAG_ENABLE_DOUBLE_EXTENSIONS = (1<<17);
-static const uint32_t GLOBAL_FLAG_ENABLE_SHADER_EXTENSIONS = (1<<18);
-
-static uint32_t DecodeGlobalFlags(uint32_t ui32Token)
-{
-    return (uint32_t)(ui32Token & 0x00fff800);
-}
-
-static INTERPOLATION_MODE DecodeInterpolationMode(uint32_t ui32Token)
-{
-    return (INTERPOLATION_MODE)((ui32Token & 0x00007800) >> 11);
-}
-
-
-typedef enum PRIMITIVE_TOPOLOGY
-{
-    PRIMITIVE_TOPOLOGY_UNDEFINED = 0,
-    PRIMITIVE_TOPOLOGY_POINTLIST = 1,
-    PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    PRIMITIVE_TOPOLOGY_LINESTRIP = 3,
-    PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5,
-    // 6 is reserved for legacy triangle fans
-    // Adjacency values should be equal to (0x8 & non-adjacency):
-    PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11,
-    PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13,
-} PRIMITIVE_TOPOLOGY;
-
-static PRIMITIVE_TOPOLOGY DecodeGSOutputPrimitiveTopology(uint32_t ui32Token)
-{
-    return (PRIMITIVE_TOPOLOGY)((ui32Token & 0x0001f800) >> 11);
-}
-
-typedef enum PRIMITIVE
-{
-    PRIMITIVE_UNDEFINED = 0,
-    PRIMITIVE_POINT = 1,
-    PRIMITIVE_LINE = 2,
-    PRIMITIVE_TRIANGLE = 3,
-    // Adjacency values should be equal to (0x4 & non-adjacency):
-    PRIMITIVE_LINE_ADJ = 6,
-    PRIMITIVE_TRIANGLE_ADJ = 7,
-    PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    PRIMITIVE_10_CONTROL_POINT_PATCH = 17,
-    PRIMITIVE_11_CONTROL_POINT_PATCH = 18,
-    PRIMITIVE_12_CONTROL_POINT_PATCH = 19,
-    PRIMITIVE_13_CONTROL_POINT_PATCH = 20,
-    PRIMITIVE_14_CONTROL_POINT_PATCH = 21,
-    PRIMITIVE_15_CONTROL_POINT_PATCH = 22,
-    PRIMITIVE_16_CONTROL_POINT_PATCH = 23,
-    PRIMITIVE_17_CONTROL_POINT_PATCH = 24,
-    PRIMITIVE_18_CONTROL_POINT_PATCH = 25,
-    PRIMITIVE_19_CONTROL_POINT_PATCH = 26,
-    PRIMITIVE_20_CONTROL_POINT_PATCH = 27,
-    PRIMITIVE_21_CONTROL_POINT_PATCH = 28,
-    PRIMITIVE_22_CONTROL_POINT_PATCH = 29,
-    PRIMITIVE_23_CONTROL_POINT_PATCH = 30,
-    PRIMITIVE_24_CONTROL_POINT_PATCH = 31,
-    PRIMITIVE_25_CONTROL_POINT_PATCH = 32,
-    PRIMITIVE_26_CONTROL_POINT_PATCH = 33,
-    PRIMITIVE_27_CONTROL_POINT_PATCH = 34,
-    PRIMITIVE_28_CONTROL_POINT_PATCH = 35,
-    PRIMITIVE_29_CONTROL_POINT_PATCH = 36,
-    PRIMITIVE_30_CONTROL_POINT_PATCH = 37,
-    PRIMITIVE_31_CONTROL_POINT_PATCH = 38,
-    PRIMITIVE_32_CONTROL_POINT_PATCH = 39,
-} PRIMITIVE;
-
-static PRIMITIVE DecodeGSInputPrimitive(uint32_t ui32Token)
-{
-    return (PRIMITIVE)((ui32Token & 0x0001f800) >> 11);
-}
-
-static TESSELLATOR_PARTITIONING DecodeTessPartitioning(uint32_t ui32Token)
-{
-    return (TESSELLATOR_PARTITIONING)((ui32Token & 0x00003800) >> 11);
-}
-
-typedef enum TESSELLATOR_DOMAIN
-{
-    TESSELLATOR_DOMAIN_UNDEFINED = 0,
-    TESSELLATOR_DOMAIN_ISOLINE   = 1,
-    TESSELLATOR_DOMAIN_TRI       = 2,
-    TESSELLATOR_DOMAIN_QUAD      = 3
-} TESSELLATOR_DOMAIN;
-
-static TESSELLATOR_DOMAIN DecodeTessDomain(uint32_t ui32Token)
-{
-    return (TESSELLATOR_DOMAIN)((ui32Token & 0x00001800) >> 11);
-}
-
-static TESSELLATOR_OUTPUT_PRIMITIVE DecodeTessOutPrim(uint32_t ui32Token)
-{
-    return (TESSELLATOR_OUTPUT_PRIMITIVE)((ui32Token & 0x00003800) >> 11);
-}
-
-static const uint32_t SYNC_THREADS_IN_GROUP = 0x00000800;
-static const uint32_t SYNC_THREAD_GROUP_SHARED_MEMORY = 0x00001000;
-static const uint32_t SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GROUP = 0x00002000;
-static const uint32_t SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GLOBAL = 0x00004000;
-
-static uint32_t DecodeSyncFlags(uint32_t ui32Token)
-{
-    return ui32Token & 0x00007800;
-}
-
-// The number of types that implement this interface
-static uint32_t DecodeInterfaceTableLength(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x0000ffff) >> 0);
-}
-
-// The number of interfaces that are defined in this array.
-static uint32_t DecodeInterfaceArrayLength(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0xffff0000) >> 16);
-}
-
-typedef enum CUSTOMDATA_CLASS
-{
-    CUSTOMDATA_COMMENT = 0,
-    CUSTOMDATA_DEBUGINFO,
-    CUSTOMDATA_OPAQUE,
-    CUSTOMDATA_DCL_IMMEDIATE_CONSTANT_BUFFER,
-    CUSTOMDATA_SHADER_MESSAGE,
-} CUSTOMDATA_CLASS;
-
-static CUSTOMDATA_CLASS DecodeCustomDataClass(uint32_t ui32Token)
-{
-    return (CUSTOMDATA_CLASS)((ui32Token & 0xfffff800) >> 11);
-}
-
-static uint32_t DecodeInstructionSaturate(uint32_t ui32Token)
-{
-    return (ui32Token & 0x00002000) ? 1 : 0;
-}
-
-typedef enum OPERAND_MIN_PRECISION
-{
-    OPERAND_MIN_PRECISION_DEFAULT    = 0, // Default precision 
-    // for the shader model
-    OPERAND_MIN_PRECISION_FLOAT_16   = 1, // Min 16 bit/component float
-    OPERAND_MIN_PRECISION_FLOAT_2_8  = 2, // Min 10(2.8)bit/comp. float
-    OPERAND_MIN_PRECISION_SINT_16    = 4, // Min 16 bit/comp. signed integer
-    OPERAND_MIN_PRECISION_UINT_16    = 5, // Min 16 bit/comp. unsigned integer
-} OPERAND_MIN_PRECISION;
-
-static uint32_t DecodeOperandMinPrecision(uint32_t ui32Token)
-{
-    return (ui32Token & 0x0001C000) >> 14;
-}
-
-static uint32_t DecodeOutputControlPointCount(uint32_t ui32Token)
-{
-    return ((ui32Token & 0x0001f800) >> 11);
-}
-
-typedef enum IMMEDIATE_ADDRESS_OFFSET_COORD
-{
-    IMMEDIATE_ADDRESS_OFFSET_U        = 0,
-    IMMEDIATE_ADDRESS_OFFSET_V        = 1,
-    IMMEDIATE_ADDRESS_OFFSET_W        = 2,
-} IMMEDIATE_ADDRESS_OFFSET_COORD;
-
-
-#define IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord) (9+4*((Coord)&3))
-#define IMMEDIATE_ADDRESS_OFFSET_MASK(Coord) (0x0000000f<<IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord))
-
-static uint32_t DecodeImmediateAddressOffset(IMMEDIATE_ADDRESS_OFFSET_COORD eCoord, uint32_t ui32Token)
-{
-    return ((((ui32Token)&IMMEDIATE_ADDRESS_OFFSET_MASK(eCoord))>>(IMMEDIATE_ADDRESS_OFFSET_SHIFT(eCoord))));
-}
-
-// UAV access scope flags
-static const uint32_t GLOBALLY_COHERENT_ACCESS = 0x00010000;
-static uint32_t DecodeAccessCoherencyFlags(uint32_t ui32Token)
-{
-    return ui32Token & 0x00010000;
-}
-
-
-typedef enum RESINFO_RETURN_TYPE
-{
-    RESINFO_INSTRUCTION_RETURN_FLOAT      = 0,
-    RESINFO_INSTRUCTION_RETURN_RCPFLOAT   = 1,
-    RESINFO_INSTRUCTION_RETURN_UINT       = 2
-} RESINFO_RETURN_TYPE;
-
-static RESINFO_RETURN_TYPE DecodeResInfoReturnType(uint32_t ui32Token)
-{
-    return (RESINFO_RETURN_TYPE)((ui32Token & 0x00001800) >> 11);
-}
-
-#include "tokensDX9.h"
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompiler/src/internal_includes/tokensDX9.h b/Code/Tools/HLSLCrossCompiler/src/internal_includes/tokensDX9.h
deleted file mode 100644
index a71afd7b59..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/internal_includes/tokensDX9.h
+++ /dev/null
@@ -1,304 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "debug.h"
-
-static const uint32_t D3D9SHADER_TYPE_VERTEX = 0xFFFE0000;
-static const uint32_t D3D9SHADER_TYPE_PIXEL = 0xFFFF0000;
-
-static SHADER_TYPE DecodeShaderTypeDX9(const uint32_t ui32Token)
-{
-    uint32_t ui32Type = ui32Token & 0xFFFF0000;
-    if(ui32Type == D3D9SHADER_TYPE_VERTEX)
-        return VERTEX_SHADER;
-
-    if(ui32Type == D3D9SHADER_TYPE_PIXEL)
-        return PIXEL_SHADER;
-
-    return INVALID_SHADER;
-}
-
-static uint32_t DecodeProgramMajorVersionDX9(const uint32_t ui32Token)
-{
-    return ((ui32Token)>>8)&0xFF;
-}
-
-static uint32_t DecodeProgramMinorVersionDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0xFF;
-}
-
-typedef enum
-{
-    OPCODE_DX9_NOP          = 0,
-    OPCODE_DX9_MOV          ,
-    OPCODE_DX9_ADD          ,
-    OPCODE_DX9_SUB          ,
-    OPCODE_DX9_MAD          ,
-    OPCODE_DX9_MUL          ,
-    OPCODE_DX9_RCP          ,
-    OPCODE_DX9_RSQ          ,
-    OPCODE_DX9_DP3          ,
-    OPCODE_DX9_DP4          ,
-    OPCODE_DX9_MIN          ,
-    OPCODE_DX9_MAX          ,
-    OPCODE_DX9_SLT          ,
-    OPCODE_DX9_SGE          ,
-    OPCODE_DX9_EXP          ,
-    OPCODE_DX9_LOG          ,
-    OPCODE_DX9_LIT          ,
-    OPCODE_DX9_DST          ,
-    OPCODE_DX9_LRP          ,
-    OPCODE_DX9_FRC          ,
-    OPCODE_DX9_M4x4         ,
-    OPCODE_DX9_M4x3         ,
-    OPCODE_DX9_M3x4         ,
-    OPCODE_DX9_M3x3         ,
-    OPCODE_DX9_M3x2         ,
-    OPCODE_DX9_CALL         ,
-    OPCODE_DX9_CALLNZ       ,
-    OPCODE_DX9_LOOP         ,
-    OPCODE_DX9_RET          ,
-    OPCODE_DX9_ENDLOOP      ,
-    OPCODE_DX9_LABEL        ,
-    OPCODE_DX9_DCL          ,
-    OPCODE_DX9_POW          ,
-    OPCODE_DX9_CRS          ,
-    OPCODE_DX9_SGN          ,
-    OPCODE_DX9_ABS          ,
-    OPCODE_DX9_NRM          ,
-    OPCODE_DX9_SINCOS       ,
-    OPCODE_DX9_REP          ,
-    OPCODE_DX9_ENDREP       ,
-    OPCODE_DX9_IF           ,
-    OPCODE_DX9_IFC          ,
-    OPCODE_DX9_ELSE         ,
-    OPCODE_DX9_ENDIF        ,
-    OPCODE_DX9_BREAK        ,
-    OPCODE_DX9_BREAKC       ,
-    OPCODE_DX9_MOVA         ,
-    OPCODE_DX9_DEFB         ,
-    OPCODE_DX9_DEFI         ,
-
-    OPCODE_DX9_TEXCOORD     = 64,
-    OPCODE_DX9_TEXKILL      ,
-    OPCODE_DX9_TEX          ,
-    OPCODE_DX9_TEXBEM       ,
-    OPCODE_DX9_TEXBEML      ,
-    OPCODE_DX9_TEXREG2AR    ,
-    OPCODE_DX9_TEXREG2GB    ,
-    OPCODE_DX9_TEXM3x2PAD   ,
-    OPCODE_DX9_TEXM3x2TEX   ,
-    OPCODE_DX9_TEXM3x3PAD   ,
-    OPCODE_DX9_TEXM3x3TEX   ,
-    OPCODE_DX9_RESERVED0    ,
-    OPCODE_DX9_TEXM3x3SPEC  ,
-    OPCODE_DX9_TEXM3x3VSPEC ,
-    OPCODE_DX9_EXPP         ,
-    OPCODE_DX9_LOGP         ,
-    OPCODE_DX9_CND          ,
-    OPCODE_DX9_DEF          ,
-    OPCODE_DX9_TEXREG2RGB   ,
-    OPCODE_DX9_TEXDP3TEX    ,
-    OPCODE_DX9_TEXM3x2DEPTH ,
-    OPCODE_DX9_TEXDP3       ,
-    OPCODE_DX9_TEXM3x3      ,
-    OPCODE_DX9_TEXDEPTH     ,
-    OPCODE_DX9_CMP          ,
-    OPCODE_DX9_BEM          ,
-    OPCODE_DX9_DP2ADD       ,
-    OPCODE_DX9_DSX          ,
-    OPCODE_DX9_DSY          ,
-    OPCODE_DX9_TEXLDD       ,
-    OPCODE_DX9_SETP         ,
-    OPCODE_DX9_TEXLDL       ,
-    OPCODE_DX9_BREAKP       ,
-
-    OPCODE_DX9_PHASE        = 0xFFFD,
-    OPCODE_DX9_COMMENT      = 0xFFFE,
-    OPCODE_DX9_END          = 0xFFFF,
-
-    OPCODE_DX9_FORCE_DWORD  = 0x7fffffff,   // force 32-bit size enum
-} OPCODE_TYPE_DX9;
-
-static OPCODE_TYPE_DX9 DecodeOpcodeTypeDX9(const uint32_t ui32Token)
-{
-    return (OPCODE_TYPE_DX9)(ui32Token & 0x0000FFFF);
-}
-
-static uint32_t DecodeInstructionLengthDX9(const uint32_t ui32Token)
-{
-    return (ui32Token & 0x0F000000)>>24;
-}
-
-static uint32_t DecodeCommentLengthDX9(const uint32_t ui32Token)
-{
-    return (ui32Token & 0x7FFF0000)>>16;
-}
-
-static uint32_t DecodeOperandRegisterNumberDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0x000007FF;
-}
-
-typedef enum
-{
-    OPERAND_TYPE_DX9_TEMP           =  0, // Temporary Register File
-    OPERAND_TYPE_DX9_INPUT          =  1, // Input Register File
-    OPERAND_TYPE_DX9_CONST          =  2, // Constant Register File
-    OPERAND_TYPE_DX9_ADDR           =  3, // Address Register (VS)
-    OPERAND_TYPE_DX9_TEXTURE        =  3, // Texture Register File (PS)
-    OPERAND_TYPE_DX9_RASTOUT        =  4, // Rasterizer Register File
-    OPERAND_TYPE_DX9_ATTROUT        =  5, // Attribute Output Register File
-    OPERAND_TYPE_DX9_TEXCRDOUT      =  6, // Texture Coordinate Output Register File
-    OPERAND_TYPE_DX9_OUTPUT         =  6, // Output register file for VS3.0+
-    OPERAND_TYPE_DX9_CONSTINT       =  7, // Constant Integer Vector Register File
-    OPERAND_TYPE_DX9_COLOROUT       =  8, // Color Output Register File
-    OPERAND_TYPE_DX9_DEPTHOUT       =  9, // Depth Output Register File
-    OPERAND_TYPE_DX9_SAMPLER        = 10, // Sampler State Register File
-    OPERAND_TYPE_DX9_CONST2         = 11, // Constant Register File  2048 - 4095
-    OPERAND_TYPE_DX9_CONST3         = 12, // Constant Register File  4096 - 6143
-    OPERAND_TYPE_DX9_CONST4         = 13, // Constant Register File  6144 - 8191
-    OPERAND_TYPE_DX9_CONSTBOOL      = 14, // Constant Boolean register file
-    OPERAND_TYPE_DX9_LOOP           = 15, // Loop counter register file
-    OPERAND_TYPE_DX9_TEMPFLOAT16    = 16, // 16-bit float temp register file
-    OPERAND_TYPE_DX9_MISCTYPE       = 17, // Miscellaneous (single) registers.
-    OPERAND_TYPE_DX9_LABEL          = 18, // Label
-    OPERAND_TYPE_DX9_PREDICATE      = 19, // Predicate register
-    OPERAND_TYPE_DX9_FORCE_DWORD  = 0x7fffffff,         // force 32-bit size enum
-} OPERAND_TYPE_DX9;
-
-static OPERAND_TYPE_DX9 DecodeOperandTypeDX9(const uint32_t ui32Token)
-{
-    return (OPERAND_TYPE_DX9)(((ui32Token & 0x70000000) >> 28) |
-        ((ui32Token & 0x00001800) >> 8));
-}
-
-static uint32_t CreateOperandTokenDX9(const uint32_t ui32RegNum, const OPERAND_TYPE_DX9 eType)
-{
-    uint32_t ui32Token = ui32RegNum;
-    ASSERT(ui32RegNum <2048);
-    ui32Token |= (eType <<28) & 0x70000000;
-    ui32Token |= (eType <<8) & 0x00001800;
-    return ui32Token;
-}
-
-typedef enum { 
-    DECLUSAGE_POSITION      = 0,
-    DECLUSAGE_BLENDWEIGHT   = 1,
-    DECLUSAGE_BLENDINDICES  = 2,
-    DECLUSAGE_NORMAL        = 3,
-    DECLUSAGE_PSIZE         = 4,
-    DECLUSAGE_TEXCOORD      = 5,
-    DECLUSAGE_TANGENT       = 6,
-    DECLUSAGE_BINORMAL      = 7,
-    DECLUSAGE_TESSFACTOR    = 8,
-    DECLUSAGE_POSITIONT     = 9,
-    DECLUSAGE_COLOR         = 10,
-    DECLUSAGE_FOG           = 11,
-    DECLUSAGE_DEPTH         = 12,
-    DECLUSAGE_SAMPLE        = 13
-} DECLUSAGE_DX9;
-
-static DECLUSAGE_DX9 DecodeUsageDX9(const uint32_t ui32Token)
-{
-    return (DECLUSAGE_DX9) (ui32Token & 0x0000000f);
-}
-
-static uint32_t DecodeUsageIndexDX9(const uint32_t ui32Token)
-{
-    return (ui32Token & 0x000f0000)>>16;
-}
-
-static uint32_t DecodeOperandIsRelativeAddressModeDX9(const uint32_t ui32Token)
-{
-    return ui32Token & (1<<13);
-}
-
-static const uint32_t DX9_SWIZZLE_SHIFT = 16;
-#define NO_SWIZZLE_DX9 ((0<<DX9_SWIZZLE_SHIFT)|(1<<DX9_SWIZZLE_SHIFT)|(2<<DX9_SWIZZLE_SHIFT)|(3<<DX9_SWIZZLE_SHIFT))
-
-#define REPLICATE_SWIZZLE_DX9(CHANNEL) ((CHANNEL<<DX9_SWIZZLE_SHIFT)|(CHANNEL<<(DX9_SWIZZLE_SHIFT+2))|(CHANNEL<<(DX9_SWIZZLE_SHIFT+4))|(CHANNEL<<(DX9_SWIZZLE_SHIFT+6)))
-
-static uint32_t DecodeOperandSwizzleDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0x00FF0000;
-}
-
-static const uint32_t DX9_WRITEMASK_0 = 0x00010000;  // Component 0 (X;Red)
-static const uint32_t DX9_WRITEMASK_1 = 0x00020000;  // Component 1 (Y;Green)
-static const uint32_t DX9_WRITEMASK_2 = 0x00040000;  // Component 2 (Z;Blue)
-static const uint32_t DX9_WRITEMASK_3 = 0x00080000;  // Component 3 (W;Alpha)
-static const uint32_t DX9_WRITEMASK_ALL = 0x000F0000;  // All Components
-
-static uint32_t DecodeDestWriteMaskDX9(const uint32_t ui32Token)
-{
-    return ui32Token & DX9_WRITEMASK_ALL;
-}
-
-static RESOURCE_DIMENSION DecodeTextureTypeMaskDX9(const uint32_t ui32Token)
-{
-
-    switch(ui32Token & 0x78000000)
-    {
-    case 2 << 27:
-        return RESOURCE_DIMENSION_TEXTURE2D;
-    case 3 << 27:
-        return RESOURCE_DIMENSION_TEXTURECUBE;
-    case 4 << 27:
-        return RESOURCE_DIMENSION_TEXTURE3D;
-    default:
-        return RESOURCE_DIMENSION_UNKNOWN;
-    }
-}
-
-
-
-static const uint32_t DESTMOD_DX9_NONE    = 0;
-static const uint32_t DESTMOD_DX9_SATURATE    = (1 << 20);
-static const uint32_t DESTMOD_DX9_PARTIALPRECISION    = (2 << 20);
-static const uint32_t DESTMOD_DX9_MSAMPCENTROID = (4 << 20);
-static uint32_t DecodeDestModifierDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0xf00000;
-}
-
-typedef enum
-{
-    SRCMOD_DX9_NONE = 0 << 24,
-    SRCMOD_DX9_NEG = 1 << 24,
-    SRCMOD_DX9_BIAS = 2 << 24,
-    SRCMOD_DX9_BIASNEG = 3 << 24,
-    SRCMOD_DX9_SIGN = 4 << 24,
-    SRCMOD_DX9_SIGNNEG = 5 << 24,
-    SRCMOD_DX9_COMP = 6 << 24,
-    SRCMOD_DX9_X2 = 7 << 24,
-    SRCMOD_DX9_X2NEG = 8 << 24,
-    SRCMOD_DX9_DZ = 9 << 24,
-    SRCMOD_DX9_DW = 10 << 24,
-    SRCMOD_DX9_ABS = 11 << 24,
-    SRCMOD_DX9_ABSNEG = 12 << 24,
-    SRCMOD_DX9_NOT = 13 << 24,
-    SRCMOD_DX9_FORCE_DWORD = 0xffffffff
-} SRCMOD_DX9;
-static uint32_t DecodeSrcModifierDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0xf000000;
-}
-
-typedef enum
-{
-    D3DSPC_RESERVED0 = 0,
-    D3DSPC_GT = 1,
-    D3DSPC_EQ = 2,
-    D3DSPC_GE = 3,
-    D3DSPC_LT = 4,
-    D3DSPC_NE = 5,
-    D3DSPC_LE = 6,
-    D3DSPC_BOOLEAN = 7, //Make use of the RESERVED1 bit to indicate if-bool opcode.
-} COMPARISON_DX9;
-
-static COMPARISON_DX9 DecodeComparisonDX9(const uint32_t ui32Token)
-{
-    return (COMPARISON_DX9)((ui32Token & (0x07<<16))>>16);
-}
diff --git a/Code/Tools/HLSLCrossCompiler/src/reflect.c b/Code/Tools/HLSLCrossCompiler/src/reflect.c
deleted file mode 100644
index 66587c0152..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/reflect.c
+++ /dev/null
@@ -1,1075 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/reflect.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/decode.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "bstrlib.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-static void FormatVariableName(char* Name)
-{
-    int i;
-
-    /* MSDN http://msdn.microsoft.com/en-us/library/windows/desktop/bb944006(v=vs.85).aspx
-    The uniform function parameters appear in the
-    constant table prepended with a dollar sign ($),
-    unlike the global variables. The dollar sign is
-    required to avoid name collisions between local
-    uniform inputs and global variables of the same name.*/
-
-    /* Leave $ThisPointer, $Element and $Globals as-is.
-    Otherwise remove $ character ($ is not a valid character for GLSL variable names). */
-    if(Name[0] == '$')
-    {
-        if(strcmp(Name, "$Element") !=0 &&
-            strcmp(Name, "$Globals") != 0 &&
-            strcmp(Name, "$ThisPointer") != 0)
-        {
-            Name[0] = '_';
-        }
-    }
-
-    // remove "__" because it's reserved in OpenGL
-    for (i = 0; Name[i] != '\0'; ++i)
-    {
-        if (Name[i] == '_' && Name[i + 1] == '_')
-        {
-            Name[i + 1] = 'x';
-        }
-    }
-}
-
-static void ReadStringFromTokenStream(const uint32_t* tokens, char* str)
-{
-    char* charTokens = (char*) tokens;
-    char nextCharacter = *charTokens++;
-    int length = 0;
-
-    //Add each individual character until
-    //a terminator is found.
-    while(nextCharacter != 0) {
-
-        str[length++] = nextCharacter;
-
-        if(length > MAX_REFLECT_STRING_LENGTH)
-        {
-            str[length-1] = '\0';
-            return;
-        }
-
-        nextCharacter = *charTokens++;
-    }
-
-    str[length] = '\0';
-}
-
-static void ReadInputSignatures(const uint32_t* pui32Tokens, ShaderInfo* psShaderInfo, const int extended)
-{
-    uint32_t i;
-
-    InOutSignature* psSignatures;
-    const uint32_t* pui32FirstSignatureToken = pui32Tokens;
-    const uint32_t ui32ElementCount = *pui32Tokens++;
-    /* const uint32_t ui32Key = */ *pui32Tokens++;
-
-    psSignatures = hlslcc_malloc(sizeof(InOutSignature) * ui32ElementCount);
-    psShaderInfo->psInputSignatures = psSignatures;
-    psShaderInfo->ui32NumInputSignatures = ui32ElementCount;
-
-    for(i=0; i<ui32ElementCount; ++i)
-    {
-        uint32_t ui32ComponentMasks;
-        InOutSignature* psCurrentSignature = psSignatures + i;
-        uint32_t ui32SemanticNameOffset;
-
-        psCurrentSignature->ui32Stream = 0;
-        psCurrentSignature->eMinPrec = MIN_PRECISION_DEFAULT;
-
-        if(extended)
-            psCurrentSignature->ui32Stream = *pui32Tokens++;
-
-        ui32SemanticNameOffset = *pui32Tokens++;
-        psCurrentSignature->ui32SemanticIndex = *pui32Tokens++;
-        psCurrentSignature->eSystemValueType = (SPECIAL_NAME) *pui32Tokens++;
-        psCurrentSignature->eComponentType = (INOUT_COMPONENT_TYPE) *pui32Tokens++;
-        psCurrentSignature->ui32Register = *pui32Tokens++;
-
-        ui32ComponentMasks = *pui32Tokens++;
-        psCurrentSignature->ui32Mask = ui32ComponentMasks & 0x7F;
-        //Shows which components are read
-        psCurrentSignature->ui32ReadWriteMask = (ui32ComponentMasks & 0x7F00) >> 8;
-
-        if(extended)
-            psCurrentSignature->eMinPrec = *pui32Tokens++;
-
-        ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstSignatureToken+ui32SemanticNameOffset), psCurrentSignature->SemanticName);
-    }
-}
-
-static void ReadOutputSignatures(const uint32_t* pui32Tokens, ShaderInfo* psShaderInfo, const int minPrec, const int streams)
-{
-    uint32_t i;
-
-    InOutSignature* psSignatures;
-    const uint32_t* pui32FirstSignatureToken = pui32Tokens;
-    const uint32_t ui32ElementCount = *pui32Tokens++;
-    /* const uint32_t ui32Key = */ *pui32Tokens++;
-
-    psSignatures = hlslcc_malloc(sizeof(InOutSignature) * ui32ElementCount);
-    psShaderInfo->psOutputSignatures = psSignatures;
-    psShaderInfo->ui32NumOutputSignatures = ui32ElementCount;
-
-    for(i=0; i<ui32ElementCount; ++i)
-    {
-        uint32_t ui32ComponentMasks;
-        InOutSignature* psCurrentSignature = psSignatures + i;
-        uint32_t ui32SemanticNameOffset;
-
-        psCurrentSignature->ui32Stream = 0;
-        psCurrentSignature->eMinPrec = MIN_PRECISION_DEFAULT;
-
-        if(streams)
-            psCurrentSignature->ui32Stream = *pui32Tokens++;
-
-        ui32SemanticNameOffset = *pui32Tokens++;
-        psCurrentSignature->ui32SemanticIndex = *pui32Tokens++;
-        psCurrentSignature->eSystemValueType = (SPECIAL_NAME)*pui32Tokens++;
-        psCurrentSignature->eComponentType = (INOUT_COMPONENT_TYPE) *pui32Tokens++;
-        psCurrentSignature->ui32Register = *pui32Tokens++;
-
-        ui32ComponentMasks = *pui32Tokens++;
-        psCurrentSignature->ui32Mask = ui32ComponentMasks & 0x7F;
-        //Shows which components are NEVER written.
-        psCurrentSignature->ui32ReadWriteMask = (ui32ComponentMasks & 0x7F00) >> 8;
-
-        if(minPrec)
-            psCurrentSignature->eMinPrec = *pui32Tokens++;
-
-        ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstSignatureToken+ui32SemanticNameOffset), psCurrentSignature->SemanticName);
-    }
-}
-
-static const uint32_t* ReadResourceBinding(const uint32_t* pui32FirstResourceToken, const uint32_t* pui32Tokens, ResourceBinding* psBinding)
-{
-    uint32_t ui32NameOffset = *pui32Tokens++;
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstResourceToken+ui32NameOffset), psBinding->Name);
-    FormatVariableName(psBinding->Name);
-
-    psBinding->eType = *pui32Tokens++;
-    psBinding->ui32ReturnType = *pui32Tokens++;
-    psBinding->eDimension = (REFLECT_RESOURCE_DIMENSION)*pui32Tokens++;
-    psBinding->ui32NumSamples = *pui32Tokens++;
-    psBinding->ui32BindPoint = *pui32Tokens++;
-    psBinding->ui32BindCount = *pui32Tokens++;
-    psBinding->ui32Flags = *pui32Tokens++;
-
-    return pui32Tokens;
-}
-
-//Read D3D11_SHADER_TYPE_DESC
-static void ReadShaderVariableType(const uint32_t ui32MajorVersion, const uint32_t* pui32FirstConstBufToken, const uint32_t* pui32tokens, ShaderVarType* varType)
-{
-    const uint16_t* pui16Tokens = (const uint16_t*) pui32tokens;
-    uint16_t ui32MemberCount;
-    uint32_t ui32MemberOffset;
-    const uint32_t* pui32MemberTokens;
-    uint32_t i;
-
-    varType->Class = (SHADER_VARIABLE_CLASS)pui16Tokens[0];
-    varType->Type = (SHADER_VARIABLE_TYPE)pui16Tokens[1];
-    varType->Rows = pui16Tokens[2];
-    varType->Columns = pui16Tokens[3];
-    varType->Elements = pui16Tokens[4];
-
-    varType->MemberCount = ui32MemberCount = pui16Tokens[5];
-    varType->Members = 0;
-
-    if(ui32MemberCount)
-    {
-        varType->Members = (ShaderVarType*)hlslcc_malloc(sizeof(ShaderVarType)*ui32MemberCount);
-
-        ui32MemberOffset = pui32tokens[3];
-
-        pui32MemberTokens = (const uint32_t*)((const char*)pui32FirstConstBufToken+ui32MemberOffset);
-
-        for(i=0; i< ui32MemberCount; ++i)
-        {
-            uint32_t ui32NameOffset = *pui32MemberTokens++;
-            uint32_t ui32MemberTypeOffset = *pui32MemberTokens++;
-
-            varType->Members[i].Parent = varType;
-            varType->Members[i].ParentCount = varType->ParentCount + 1;
-
-            varType->Members[i].Offset = *pui32MemberTokens++;
-
-            ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstConstBufToken+ui32NameOffset), varType->Members[i].Name);
-
-            ReadShaderVariableType(ui32MajorVersion, pui32FirstConstBufToken, 
-                (const uint32_t*)((const char*)pui32FirstConstBufToken+ui32MemberTypeOffset), &varType->Members[i]);
-        }
-    }
-}
-
-static const uint32_t* ReadConstantBuffer(ShaderInfo* psShaderInfo, const uint32_t* pui32FirstConstBufToken, const uint32_t* pui32Tokens, ConstantBuffer* psBuffer)
-{
-    uint32_t i;
-    uint32_t ui32NameOffset = *pui32Tokens++;    
-    uint32_t ui32VarCount = *pui32Tokens++;
-    uint32_t ui32VarOffset = *pui32Tokens++;
-    const uint32_t* pui32VarToken = (const uint32_t*)((const char*)pui32FirstConstBufToken+ui32VarOffset);
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstConstBufToken+ui32NameOffset), psBuffer->Name);
-    FormatVariableName(psBuffer->Name);
-
-    psBuffer->ui32NumVars = ui32VarCount;
-
-    for(i=0; i<ui32VarCount; ++i)
-    {
-        //D3D11_SHADER_VARIABLE_DESC
-        ShaderVar * const psVar = &psBuffer->asVars[i];
-
-        uint32_t ui32TypeOffset;
-        uint32_t ui32DefaultValueOffset;
-
-        ui32NameOffset = *pui32VarToken++;
-
-        ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstConstBufToken+ui32NameOffset), psVar->Name);
-        FormatVariableName(psVar->Name);
-
-        psVar->ui32StartOffset = *pui32VarToken++;
-        psVar->ui32Size = *pui32VarToken++;
-        psVar->ui32Flags = *pui32VarToken++;
-        ui32TypeOffset = *pui32VarToken++;
-
-        strcpy(psVar->sType.Name, psVar->Name);
-        psVar->sType.Parent = 0;
-        psVar->sType.ParentCount = 0;
-        psVar->sType.Offset = 0;
-
-        ReadShaderVariableType(psShaderInfo->ui32MajorVersion, pui32FirstConstBufToken, 
-            (const uint32_t*)((const char*)pui32FirstConstBufToken+ui32TypeOffset), &psVar->sType);
-
-        ui32DefaultValueOffset = *pui32VarToken++;
-
-
-        if (psShaderInfo->ui32MajorVersion  >= 5)
-        {
-            /* uint32_t StartTexture = */ *pui32VarToken++;
-            /* uint32_t TextureSize = */ *pui32VarToken++;
-            /* uint32_t StartSampler = */ *pui32VarToken++;
-            /* uint32_t SamplerSize = */ *pui32VarToken++;
-        }
-
-        psVar->haveDefaultValue = 0;
-
-        if(ui32DefaultValueOffset)
-        {
-            const uint32_t ui32NumDefaultValues = psVar->ui32Size / 4;
-            const uint32_t* pui32DefaultValToken = (const uint32_t*)((const char*)pui32FirstConstBufToken+ui32DefaultValueOffset);
-
-            //Always a sequence of 4-bytes at the moment.
-            //bool const becomes 0 or 0xFFFFFFFF int, int & float are 4-bytes.
-            ASSERT(psVar->ui32Size%4 == 0);
-
-            psVar->haveDefaultValue = 1;
-
-            psVar->pui32DefaultValues = hlslcc_malloc(psVar->ui32Size);
-
-            for(uint32_t j=0; j<ui32NumDefaultValues;++j)
-            {
-                psVar->pui32DefaultValues[j] = pui32DefaultValToken[j];
-            }
-        }
-    }
-
-
-    {
-        uint32_t ui32Flags;
-        uint32_t ui32BufferType;
-
-        psBuffer->ui32TotalSizeInBytes = *pui32Tokens++;
-        psBuffer->blob = 0;
-        ui32Flags = *pui32Tokens++;
-        ui32BufferType = *pui32Tokens++;
-    }
-
-    return pui32Tokens;
-}
-
-static void ReadResources(const uint32_t* pui32Tokens, ShaderInfo* psShaderInfo)
-{
-    ResourceBinding* psResBindings;
-    ConstantBuffer* psConstantBuffers;
-    const uint32_t* pui32ConstantBuffers;
-    const uint32_t* pui32ResourceBindings;
-    const uint32_t* pui32FirstToken = pui32Tokens;
-    uint32_t i;
-
-    const uint32_t ui32NumConstantBuffers = *pui32Tokens++;
-    const uint32_t ui32ConstantBufferOffset = *pui32Tokens++;
-
-    uint32_t ui32NumResourceBindings = *pui32Tokens++;
-    uint32_t ui32ResourceBindingOffset = *pui32Tokens++;
-    /* uint32_t ui32ShaderModel = */ *pui32Tokens++;
-    /* uint32_t ui32CompileFlags = */ *pui32Tokens++;//D3DCompile flags? http://msdn.microsoft.com/en-us/library/gg615083(v=vs.85).aspx
-
-    //Resources
-    pui32ResourceBindings = (const uint32_t*)((const char*)pui32FirstToken + ui32ResourceBindingOffset);
-
-    psResBindings = hlslcc_malloc(sizeof(ResourceBinding)*ui32NumResourceBindings);
-
-    psShaderInfo->ui32NumResourceBindings = ui32NumResourceBindings;
-    psShaderInfo->psResourceBindings = psResBindings;
-
-    for(i=0; i < ui32NumResourceBindings; ++i)
-    {
-        pui32ResourceBindings = ReadResourceBinding(pui32FirstToken, pui32ResourceBindings, psResBindings+i);
-        ASSERT(psResBindings[i].ui32BindPoint < MAX_RESOURCE_BINDINGS);
-    }
-
-    //Constant buffers
-    pui32ConstantBuffers = (const uint32_t*)((const char*)pui32FirstToken + ui32ConstantBufferOffset);
-
-    psConstantBuffers = hlslcc_malloc(sizeof(ConstantBuffer) * ui32NumConstantBuffers);
-
-    psShaderInfo->ui32NumConstantBuffers = ui32NumConstantBuffers;
-    psShaderInfo->psConstantBuffers = psConstantBuffers;
-
-    for(i=0; i < ui32NumConstantBuffers; ++i)
-    {
-        pui32ConstantBuffers = ReadConstantBuffer(psShaderInfo, pui32FirstToken, pui32ConstantBuffers, psConstantBuffers+i);
-    }
-
-
-    //Map resource bindings to constant buffers
-    if(psShaderInfo->ui32NumConstantBuffers)
-    {
-        for(i=0; i < ui32NumResourceBindings; ++i)
-        {
-            ResourceGroup eRGroup;
-            uint32_t cbufIndex = 0;
-
-            eRGroup = ResourceTypeToResourceGroup(psResBindings[i].eType);
-
-            //Find the constant buffer whose name matches the resource at the given resource binding point
-            for(cbufIndex=0; cbufIndex < psShaderInfo->ui32NumConstantBuffers; cbufIndex++)
-            {
-                if(strcmp(psConstantBuffers[cbufIndex].Name, psResBindings[i].Name) == 0)
-                {
-                    psShaderInfo->aui32ResourceMap[eRGroup][psResBindings[i].ui32BindPoint] = cbufIndex;
-                }
-            }
-        }
-    }
-}
-
-static const uint16_t* ReadClassType(const uint32_t* pui32FirstInterfaceToken, const uint16_t* pui16Tokens, ClassType* psClassType)
-{
-    const uint32_t* pui32Tokens = (const uint32_t*)pui16Tokens;
-    uint32_t ui32NameOffset = *pui32Tokens;
-    pui16Tokens+= 2;
-
-    psClassType->ui16ID = *pui16Tokens++;
-    psClassType->ui16ConstBufStride = *pui16Tokens++;
-    psClassType->ui16Texture = *pui16Tokens++;
-    psClassType->ui16Sampler = *pui16Tokens++;
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstInterfaceToken+ui32NameOffset), psClassType->Name);
-
-    return pui16Tokens;
-}
-
-static const uint16_t* ReadClassInstance(const uint32_t* pui32FirstInterfaceToken, const uint16_t* pui16Tokens, ClassInstance* psClassInstance)
-{
-    uint32_t ui32NameOffset = *pui16Tokens++ << 16;
-    ui32NameOffset |= *pui16Tokens++;
-
-    psClassInstance->ui16ID = *pui16Tokens++;
-    psClassInstance->ui16ConstBuf = *pui16Tokens++;
-    psClassInstance->ui16ConstBufOffset = *pui16Tokens++;
-    psClassInstance->ui16Texture = *pui16Tokens++;
-    psClassInstance->ui16Sampler = *pui16Tokens++;
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstInterfaceToken+ui32NameOffset), psClassInstance->Name);
-
-    return pui16Tokens;
-}
-
-
-static void ReadInterfaces(const uint32_t* pui32Tokens, ShaderInfo* psShaderInfo)
-{
-    uint32_t i;
-    uint32_t ui32StartSlot;
-    const uint32_t* pui32FirstInterfaceToken = pui32Tokens;
-    const uint32_t ui32ClassInstanceCount = *pui32Tokens++;
-    const uint32_t ui32ClassTypeCount = *pui32Tokens++;
-    const uint32_t ui32InterfaceSlotRecordCount = *pui32Tokens++;
-    /* const uint32_t ui32InterfaceSlotCount = */ *pui32Tokens++;
-    const uint32_t ui32ClassInstanceOffset = *pui32Tokens++;
-    const uint32_t ui32ClassTypeOffset = *pui32Tokens++;
-    const uint32_t ui32InterfaceSlotOffset = *pui32Tokens++;
-
-    const uint16_t* pui16ClassTypes = (const uint16_t*)((const char*)pui32FirstInterfaceToken + ui32ClassTypeOffset);
-    const uint16_t* pui16ClassInstances = (const uint16_t*)((const char*)pui32FirstInterfaceToken + ui32ClassInstanceOffset);
-    const uint32_t* pui32InterfaceSlots = (const uint32_t*)((const char*)pui32FirstInterfaceToken + ui32InterfaceSlotOffset);
-
-    const uint32_t* pui32InterfaceSlotTokens = pui32InterfaceSlots;
-
-    ClassType* psClassTypes;
-    ClassInstance* psClassInstances;
-
-    psClassTypes = hlslcc_malloc(sizeof(ClassType) * ui32ClassTypeCount);
-    for(i=0; i<ui32ClassTypeCount; ++i)
-    {
-        pui16ClassTypes = ReadClassType(pui32FirstInterfaceToken, pui16ClassTypes, psClassTypes+i);
-        psClassTypes[i].ui16ID = (uint16_t)i;
-    }
-
-    psClassInstances = hlslcc_malloc(sizeof(ClassInstance) * ui32ClassInstanceCount);
-    for(i=0; i<ui32ClassInstanceCount; ++i)
-    {
-        pui16ClassInstances = ReadClassInstance(pui32FirstInterfaceToken, pui16ClassInstances, psClassInstances+i);
-    }
-
-    //Slots map function table to $ThisPointer cbuffer variable index
-    ui32StartSlot = 0;
-    for(i=0; i<ui32InterfaceSlotRecordCount;++i)
-    {
-        uint32_t k;
-
-        const uint32_t ui32SlotSpan = *pui32InterfaceSlotTokens++;
-        const uint32_t ui32Count = *pui32InterfaceSlotTokens++;
-        const uint32_t ui32TypeIDOffset = *pui32InterfaceSlotTokens++;
-        const uint32_t ui32TableIDOffset = *pui32InterfaceSlotTokens++;
-
-        const uint16_t* pui16TypeID = (const uint16_t*)((const char*)pui32FirstInterfaceToken+ui32TypeIDOffset);
-        const uint32_t* pui32TableID = (const uint32_t*)((const char*)pui32FirstInterfaceToken+ui32TableIDOffset);
-
-        for(k=0; k < ui32Count; ++k)
-        {
-            psShaderInfo->aui32TableIDToTypeID[*pui32TableID++] = *pui16TypeID++;
-        }
-
-        ui32StartSlot += ui32SlotSpan;
-    }
-
-    psShaderInfo->ui32NumClassInstances = ui32ClassInstanceCount;
-    psShaderInfo->psClassInstances = psClassInstances;
-
-    psShaderInfo->ui32NumClassTypes = ui32ClassTypeCount;
-    psShaderInfo->psClassTypes = psClassTypes;
-}
-
-void GetConstantBufferFromBindingPoint(const ResourceGroup eGroup, const uint32_t ui32BindPoint, const ShaderInfo* psShaderInfo, ConstantBuffer** ppsConstBuf)
-{
-    if(psShaderInfo->ui32MajorVersion > 3)
-    {
-        *ppsConstBuf = psShaderInfo->psConstantBuffers + psShaderInfo->aui32ResourceMap[eGroup][ui32BindPoint];
-    }
-    else
-    {
-        ASSERT(psShaderInfo->ui32NumConstantBuffers == 1);
-        *ppsConstBuf = psShaderInfo->psConstantBuffers;
-    }
-}
-
-int GetResourceFromBindingPoint(const ResourceGroup eGroup, uint32_t const ui32BindPoint, const ShaderInfo* psShaderInfo, ResourceBinding** ppsOutBinding)
-{
-    uint32_t i;
-    const uint32_t ui32NumBindings = psShaderInfo->ui32NumResourceBindings;
-    ResourceBinding* psBindings = psShaderInfo->psResourceBindings;
-
-    for(i=0; i<ui32NumBindings; ++i)
-    {
-        if(ResourceTypeToResourceGroup(psBindings[i].eType) == eGroup)
-        {
-            if(ui32BindPoint >= psBindings[i].ui32BindPoint && ui32BindPoint < (psBindings[i].ui32BindPoint + psBindings[i].ui32BindCount))
-            {
-                *ppsOutBinding = psBindings + i;
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-int GetInterfaceVarFromOffset(uint32_t ui32Offset, ShaderInfo* psShaderInfo, ShaderVar** ppsShaderVar)
-{
-    uint32_t i;
-    ConstantBuffer* psThisPointerConstBuffer = psShaderInfo->psThisPointerConstBuffer;
-
-    const uint32_t ui32NumVars = psThisPointerConstBuffer->ui32NumVars;
-
-    for(i=0; i<ui32NumVars; ++i)
-    {
-        if(ui32Offset >= psThisPointerConstBuffer->asVars[i].ui32StartOffset && 
-            ui32Offset < (psThisPointerConstBuffer->asVars[i].ui32StartOffset + psThisPointerConstBuffer->asVars[i].ui32Size))
-        {
-            *ppsShaderVar = &psThisPointerConstBuffer->asVars[i];
-            return 1;
-        }
-    }
-    return 0;
-}
-
-int GetInputSignatureFromRegister(const uint32_t ui32Register, const ShaderInfo* psShaderInfo, InOutSignature** ppsOut)
-{
-    uint32_t i;
-    const uint32_t ui32NumVars = psShaderInfo->ui32NumInputSignatures;
-
-    for(i=0; i<ui32NumVars; ++i)
-    {
-        InOutSignature* psInputSignatures = psShaderInfo->psInputSignatures;
-        if(ui32Register == psInputSignatures[i].ui32Register)
-        {
-            *ppsOut = psInputSignatures+i;
-            return 1;
-        }
-    }
-    return 0;
-}
-
-int GetOutputSignatureFromRegister(const uint32_t ui32Register, const uint32_t ui32CompMask, const uint32_t ui32Stream, ShaderInfo* psShaderInfo, InOutSignature** ppsOut)
-{
-    uint32_t i;
-    const uint32_t ui32NumVars = psShaderInfo->ui32NumOutputSignatures;
-
-    for(i=0; i<ui32NumVars; ++i)
-    {
-        InOutSignature* psOutputSignatures = psShaderInfo->psOutputSignatures;
-        if(ui32Register == psOutputSignatures[i].ui32Register &&
-            (ui32CompMask & psOutputSignatures[i].ui32Mask) &&
-            ui32Stream == psOutputSignatures[i].ui32Stream)
-        {
-            *ppsOut = psOutputSignatures+i;
-            return 1;
-        }
-    }
-    return 0;
-}
-
-int GetOutputSignatureFromSystemValue(SPECIAL_NAME eSystemValueType, uint32_t ui32SemanticIndex, ShaderInfo* psShaderInfo, InOutSignature** ppsOut)
-{
-    uint32_t i;
-    const uint32_t ui32NumVars = psShaderInfo->ui32NumOutputSignatures;
-
-    for(i=0; i<ui32NumVars; ++i)
-    {
-        InOutSignature* psOutputSignatures = psShaderInfo->psOutputSignatures;
-        if(eSystemValueType == psOutputSignatures[i].eSystemValueType &&
-            ui32SemanticIndex == psOutputSignatures[i].ui32SemanticIndex)
-        {
-            *ppsOut = psOutputSignatures+i;
-            return 1;
-        }
-    }
-    return 0;
-}
-
-static int IsOffsetInType(ShaderVarType* psType, uint32_t parentOffset, uint32_t offsetToFind, const uint32_t* pui32Swizzle, int32_t* pi32Index, int32_t* pi32Rebase)
-{
-    uint32_t thisOffset = parentOffset + psType->Offset;
-    uint32_t thisSize = psType->Columns * psType->Rows * 4;
-
-    if(psType->Elements)
-    {
-        thisSize += 16 * (psType->Elements - 1);
-    }
-
-    //Swizzle can point to another variable. In the example below
-    //cbUIUpdates.g_uMaxFaces would be cb1[2].z. The scalars are combined
-    //into vectors. psCBuf->ui32NumVars will be 3.
-
-    // cbuffer cbUIUpdates
-    // {
-    //
-    //   float g_fLifeSpan;                 // Offset:    0 Size:     4
-    //   float g_fLifeSpanVar;              // Offset:    4 Size:     4 [unused]
-    //   float g_fRadiusMin;                // Offset:    8 Size:     4 [unused]
-    //   float g_fRadiusMax;                // Offset:   12 Size:     4 [unused]
-    //   float g_fGrowTime;                 // Offset:   16 Size:     4 [unused]
-    //   float g_fStepSize;                 // Offset:   20 Size:     4
-    //   float g_fTurnRate;                 // Offset:   24 Size:     4
-    //   float g_fTurnSpeed;                // Offset:   28 Size:     4 [unused]
-    //   float g_fLeafRate;                 // Offset:   32 Size:     4
-    //   float g_fShrinkTime;               // Offset:   36 Size:     4 [unused]
-    //   uint g_uMaxFaces;                  // Offset:   40 Size:     4
-    //
-    // }
-
-    // Name                                 Type  Format         Dim Slot Elements
-    // ------------------------------ ---------- ------- ----------- ---- --------
-    // cbUIUpdates                       cbuffer      NA          NA    1        1
-
-    if(pui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-    {
-        offsetToFind += 4;
-    }
-    else
-        if(pui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-        {
-            offsetToFind += 8;
-        }
-        else
-            if(pui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                offsetToFind += 12;
-            }
-
-            if((offsetToFind >= thisOffset) &&
-                offsetToFind < (thisOffset + thisSize))
-            {
-
-                if(psType->Class == SVC_MATRIX_ROWS || 
-                    psType->Class == SVC_MATRIX_COLUMNS)
-                {
-                    //Matrices are treated as arrays of vectors.
-                    pi32Index[0] = (offsetToFind - thisOffset) / 16;
-                }
-                //Check for array of vectors
-                else if(psType->Class == SVC_VECTOR && psType->Elements > 1)
-                {
-                    pi32Index[0] = (offsetToFind - thisOffset) / 16;
-                }
-                else if(psType->Class == SVC_VECTOR && psType->Columns > 1)
-                {
-                    //Check for vector starting at a non-vec4 offset.
-
-                    // cbuffer $Globals
-                    // {
-                    //
-                    //   float angle;                       // Offset:    0 Size:     4
-                    //   float2 angle2;                     // Offset:    4 Size:     8
-                    //
-                    // }
-
-                    //cb0[0].x = angle
-                    //cb0[0].yzyy = angle2.xyxx
-
-                    //Rebase angle2 so that .y maps to .x, .z maps to .y
-
-                    pi32Rebase[0] = thisOffset % 16;
-                }
-
-                return 1;
-            }
-            return 0;
-}
-
-int GetShaderVarFromOffset(const uint32_t ui32Vec4Offset, const uint32_t* pui32Swizzle, ConstantBuffer* psCBuf, ShaderVarType** ppsShaderVar, int32_t* pi32Index, int32_t* pi32Rebase)
-{
-    uint32_t i;
-
-    uint32_t ui32ByteOffset = ui32Vec4Offset * 16;
-
-    const uint32_t ui32NumVars = psCBuf->ui32NumVars;
-
-    for(i=0; i<ui32NumVars; ++i)
-    {
-        if(psCBuf->asVars[i].sType.Class == SVC_STRUCT)
-        {
-            uint32_t m = 0;
-
-            for(m=0; m < psCBuf->asVars[i].sType.MemberCount; ++m)
-            {
-                ShaderVarType* psMember = psCBuf->asVars[i].sType.Members + m;
-
-                ASSERT(psMember->Class != SVC_STRUCT);
-
-                if(IsOffsetInType(psMember, psCBuf->asVars[i].ui32StartOffset, ui32ByteOffset, pui32Swizzle, pi32Index, pi32Rebase))
-                {
-                    ppsShaderVar[0] = psMember;
-                    return 1;
-                }
-            }
-        }
-        else
-        {
-            if(IsOffsetInType(&psCBuf->asVars[i].sType, psCBuf->asVars[i].ui32StartOffset, ui32ByteOffset, pui32Swizzle, pi32Index, pi32Rebase))
-            {
-                ppsShaderVar[0] = &psCBuf->asVars[i].sType;
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-ResourceGroup ResourceTypeToResourceGroup(ResourceType eType)
-{
-    switch(eType)
-    {
-    case RTYPE_CBUFFER:
-        return RGROUP_CBUFFER;
-
-    case RTYPE_SAMPLER:
-        return RGROUP_SAMPLER;
-
-    case RTYPE_TEXTURE:
-    case RTYPE_BYTEADDRESS:
-    case RTYPE_STRUCTURED:
-        return RGROUP_TEXTURE;
-
-    case RTYPE_UAV_RWTYPED:
-    case RTYPE_UAV_RWSTRUCTURED:
-    case RTYPE_UAV_RWBYTEADDRESS:
-    case RTYPE_UAV_APPEND_STRUCTURED:
-    case RTYPE_UAV_CONSUME_STRUCTURED:
-    case RTYPE_UAV_RWSTRUCTURED_WITH_COUNTER:
-        return RGROUP_UAV;
-
-    case RTYPE_TBUFFER:
-        ASSERT(0); // Need to find out which group this belongs to
-        return RGROUP_TEXTURE;
-    }
-
-    ASSERT(0);
-    return RGROUP_CBUFFER;
-}
-
-void LoadShaderInfo(const uint32_t ui32MajorVersion, const uint32_t ui32MinorVersion, const ReflectionChunks* psChunks, ShaderInfo* psInfo)
-{
-    uint32_t i;
-    const uint32_t* pui32Inputs = psChunks->pui32Inputs;
-    const uint32_t* pui32Inputs11 = psChunks->pui32Inputs11;
-    const uint32_t* pui32Resources = psChunks->pui32Resources;
-    const uint32_t* pui32Interfaces = psChunks->pui32Interfaces;
-    const uint32_t* pui32Outputs = psChunks->pui32Outputs;
-    const uint32_t* pui32Outputs11 = psChunks->pui32Outputs11;
-    const uint32_t* pui32OutputsWithStreams = psChunks->pui32OutputsWithStreams;
-
-    psInfo->eTessOutPrim = TESSELLATOR_OUTPUT_UNDEFINED;
-    psInfo->eTessPartitioning = TESSELLATOR_PARTITIONING_UNDEFINED;
-    for(i=0; i<MAX_SHADER_VEC4_INPUT;++i)
-        psInfo->aePixelInputInterpolation[i] = INTERPOLATION_LINEAR;
-
-    psInfo->ui32MajorVersion = ui32MajorVersion;
-    psInfo->ui32MinorVersion = ui32MinorVersion;
-
-    psInfo->ui32NumImports = 0;
-    psInfo->ui32NumExports = 0;
-    psInfo->psImports = 0;
-    psInfo->psExports = 0;
-    psInfo->ui32InputHash = 0;
-    psInfo->ui32SymbolsOffset = 0;
-    psInfo->ui32NumSamplers = 0;
-
-    if(pui32Inputs)
-        ReadInputSignatures(pui32Inputs, psInfo, 0);
-    if(pui32Inputs11)
-        ReadInputSignatures(pui32Inputs11, psInfo, 1);
-    if(pui32Resources)
-        ReadResources(pui32Resources, psInfo);
-    if(pui32Interfaces)
-        ReadInterfaces(pui32Interfaces, psInfo);
-    if(pui32Outputs)
-        ReadOutputSignatures(pui32Outputs, psInfo, 0, 0);
-    if(pui32Outputs11)
-        ReadOutputSignatures(pui32Outputs11, psInfo, 1, 1);
-    if(pui32OutputsWithStreams)
-        ReadOutputSignatures(pui32OutputsWithStreams, psInfo, 0, 1);
-
-    for(i=0; i<psInfo->ui32NumConstantBuffers;++i)
-    {
-        bstring cbufName = bfromcstr(&psInfo->psConstantBuffers[i].Name[0]);
-        bstring cbufThisPointer = bfromcstr("$ThisPointer");
-        if(bstrcmp(cbufName, cbufThisPointer) == 0)
-        {
-            psInfo->psThisPointerConstBuffer = &psInfo->psConstantBuffers[i];
-        }
-        bdestroy(cbufName);
-        bdestroy(cbufThisPointer);
-    }
-
-    memset(psInfo->asSamplers, 0, sizeof(psInfo->asSamplers));
-}
-
-void FreeShaderInfo(ShaderInfo* psShaderInfo)
-{
-    uint32_t uStep;
-    //Free any default values for constants.
-    uint32_t cbuf;
-    for(cbuf=0; cbuf<psShaderInfo->ui32NumConstantBuffers; ++cbuf)
-    {
-        ConstantBuffer* psCBuf = &psShaderInfo->psConstantBuffers[cbuf];
-        uint32_t var;
-        for(var=0; var < psCBuf->ui32NumVars; ++var)
-        {
-            ShaderVar* psVar = &psCBuf->asVars[var];
-            hlslcc_free(psVar->sType.Members);
-            if(psVar->haveDefaultValue)
-            {
-                hlslcc_free(psVar->pui32DefaultValues);
-            }
-        }
-    }
-    hlslcc_free(psShaderInfo->psInputSignatures);
-    hlslcc_free(psShaderInfo->psResourceBindings);
-    hlslcc_free(psShaderInfo->psConstantBuffers);
-    hlslcc_free(psShaderInfo->psClassTypes);
-    hlslcc_free(psShaderInfo->psClassInstances);
-    hlslcc_free(psShaderInfo->psOutputSignatures);
-    hlslcc_free(psShaderInfo->psImports);
-    hlslcc_free(psShaderInfo->psExports);
-
-    for (uStep = 0; uStep < psShaderInfo->ui32NumTraceSteps; ++uStep)
-    {
-        hlslcc_free(psShaderInfo->psTraceSteps[uStep].psVariables);
-    }
-    hlslcc_free(psShaderInfo->psTraceSteps);
-
-    psShaderInfo->ui32NumInputSignatures = 0;
-    psShaderInfo->ui32NumResourceBindings = 0;
-    psShaderInfo->ui32NumConstantBuffers = 0;
-    psShaderInfo->ui32NumClassTypes = 0;
-    psShaderInfo->ui32NumClassInstances = 0;
-    psShaderInfo->ui32NumOutputSignatures = 0;
-    psShaderInfo->ui32NumTraceSteps = 0;
-    psShaderInfo->ui32NumImports = 0;
-    psShaderInfo->ui32NumExports = 0;
-}
-
-typedef struct ConstantTableD3D9_TAG
-{
-    uint32_t size;
-    uint32_t creator;
-    uint32_t version;
-    uint32_t constants;
-    uint32_t constantInfos;
-    uint32_t flags;
-    uint32_t target;
-} ConstantTableD3D9;
-
-// These enums match those in d3dx9shader.h.
-enum RegisterSet
-{
-    RS_BOOL,
-    RS_INT4,
-    RS_FLOAT4,
-    RS_SAMPLER,
-};
-
-enum TypeClass
-{
-    CLASS_SCALAR,
-    CLASS_VECTOR,
-    CLASS_MATRIX_ROWS,
-    CLASS_MATRIX_COLUMNS,
-    CLASS_OBJECT,
-    CLASS_STRUCT,
-};
-
-enum Type
-{
-    PT_VOID,
-    PT_BOOL,
-    PT_INT,
-    PT_FLOAT,
-    PT_STRING,
-    PT_TEXTURE,
-    PT_TEXTURE1D,
-    PT_TEXTURE2D,
-    PT_TEXTURE3D,
-    PT_TEXTURECUBE,
-    PT_SAMPLER,
-    PT_SAMPLER1D,
-    PT_SAMPLER2D,
-    PT_SAMPLER3D,
-    PT_SAMPLERCUBE,
-    PT_PIXELSHADER,
-    PT_VERTEXSHADER,
-    PT_PIXELFRAGMENT,
-    PT_VERTEXFRAGMENT,
-    PT_UNSUPPORTED,
-};
-typedef struct ConstantInfoD3D9_TAG
-{
-    uint32_t name;
-    uint16_t registerSet;
-    uint16_t registerIndex;
-    uint16_t registerCount;
-    uint16_t reserved;
-    uint32_t typeInfo;
-    uint32_t defaultValue;
-} ConstantInfoD3D9;
-
-typedef struct TypeInfoD3D9_TAG
-{
-    uint16_t typeClass;
-    uint16_t type;
-    uint16_t rows;
-    uint16_t columns;
-    uint16_t elements;
-    uint16_t structMembers;
-    uint32_t structMemberInfos;
-} TypeInfoD3D9;
-
-typedef struct StructMemberInfoD3D9_TAG
-{
-    uint32_t name;
-    uint32_t typeInfo;
-} StructMemberInfoD3D9;
-
-void LoadD3D9ConstantTable(const char* data, ShaderInfo* psInfo)
-{
-    ConstantTableD3D9* ctab;
-    uint32_t constNum;
-    ConstantInfoD3D9* cinfos;
-    ConstantBuffer* psConstantBuffer;
-    uint32_t ui32ConstantBufferSize = 0;
-    uint32_t numResourceBindingsNeeded = 0;
-    ShaderVar* var;
-
-    ctab = (ConstantTableD3D9*)data;
-
-    cinfos = (ConstantInfoD3D9*)(data + ctab->constantInfos);
-
-    psInfo->ui32NumConstantBuffers++;
-
-    //Only 1 Constant Table in d3d9
-    ASSERT(psInfo->ui32NumConstantBuffers == 1);
-
-    psConstantBuffer = hlslcc_malloc(sizeof(ConstantBuffer));
-
-    psInfo->psConstantBuffers = psConstantBuffer;
-
-    psConstantBuffer->ui32NumVars = 0;
-    strcpy(psConstantBuffer->Name, "$Globals");
-
-    //Determine how many resource bindings to create
-    for (constNum = 0; constNum < ctab->constants; ++constNum)
-    {
-        if (cinfos[constNum].registerSet == RS_SAMPLER)
-        {
-            ++numResourceBindingsNeeded;
-        }
-    }
-
-    psInfo->psResourceBindings = hlslcc_malloc(numResourceBindingsNeeded * sizeof(ResourceBinding));
-
-    var = &psConstantBuffer->asVars[0];
-
-    for (constNum = 0; constNum < ctab->constants; ++constNum)
-    {
-        TypeInfoD3D9* typeInfo = (TypeInfoD3D9*)(data + cinfos[constNum].typeInfo);
-
-        if (cinfos[constNum].registerSet != RS_SAMPLER)
-        {
-            strcpy(var->Name, data + cinfos[constNum].name);
-            FormatVariableName(var->Name);
-            var->ui32Size = cinfos[constNum].registerCount * 16;
-            var->ui32StartOffset = cinfos[constNum].registerIndex * 16;
-            var->haveDefaultValue = 0;
-
-            if (ui32ConstantBufferSize < (var->ui32Size + var->ui32StartOffset))
-            {
-                ui32ConstantBufferSize = var->ui32Size + var->ui32StartOffset;
-            }
-
-            var->sType.Rows = typeInfo->rows;
-            var->sType.Columns = typeInfo->columns;
-            var->sType.Elements = typeInfo->elements;
-            var->sType.MemberCount = typeInfo->structMembers;
-            var->sType.Members = 0;
-            var->sType.Offset = 0;
-            var->sType.Parent = 0;
-            var->sType.ParentCount = 0;
-
-            switch (typeInfo->typeClass)
-            {
-            case CLASS_SCALAR:
-            {
-                var->sType.Class = SVC_SCALAR;
-                break;
-            }
-            case CLASS_VECTOR:
-            {
-                var->sType.Class = SVC_VECTOR;
-                break;
-            }
-            case CLASS_MATRIX_ROWS:
-            {
-                var->sType.Class = SVC_MATRIX_ROWS;
-                break;
-            }
-            case CLASS_MATRIX_COLUMNS:
-            {
-                var->sType.Class = SVC_MATRIX_COLUMNS;
-                break;
-            }
-            case CLASS_OBJECT:
-            {
-                var->sType.Class = SVC_OBJECT;
-                break;
-            }
-            case CLASS_STRUCT:
-            {
-                var->sType.Class = SVC_STRUCT;
-                break;
-            }
-            }
-
-            switch (cinfos[constNum].registerSet)
-            {
-            case RS_BOOL:
-            {
-                var->sType.Type = SVT_BOOL;
-                break;
-            }
-            case RS_INT4:
-            {
-                var->sType.Type = SVT_INT;
-                break;
-            }
-            case RS_FLOAT4:
-            {
-                var->sType.Type = SVT_FLOAT;
-                break;
-            }
-            }
-
-            var++;
-            psConstantBuffer->ui32NumVars++;
-        }
-        else
-        {
-            //Create a resource if it is sampler in order to replicate the d3d10+
-            //method of separating samplers from general constants.
-            uint32_t ui32ResourceIndex = psInfo->ui32NumResourceBindings++;
-            ResourceBinding* res = &psInfo->psResourceBindings[ui32ResourceIndex];
-
-            strcpy(res->Name, data + cinfos[constNum].name);
-            FormatVariableName(res->Name);
-
-            res->ui32BindPoint = cinfos[constNum].registerIndex;
-            res->ui32BindCount = cinfos[constNum].registerCount;
-            res->ui32Flags = 0;
-            res->ui32NumSamples = 1;
-            res->ui32ReturnType = 0;
-
-            res->eType = RTYPE_TEXTURE;
-
-            switch (typeInfo->type)
-            {
-            case PT_SAMPLER:
-            case PT_SAMPLER1D:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURE1D;
-                break;
-            case PT_SAMPLER2D:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURE2D;
-                break;
-            case PT_SAMPLER3D:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURE2D;
-                break;
-            case PT_SAMPLERCUBE:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURECUBE;
-                break;
-            }
-        }
-    }
-    psConstantBuffer->ui32TotalSizeInBytes = ui32ConstantBufferSize;
-}
diff --git a/Code/Tools/HLSLCrossCompiler/src/toGLSL.c b/Code/Tools/HLSLCrossCompiler/src/toGLSL.c
deleted file mode 100644
index ff1546b703..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/toGLSL.c
+++ /dev/null
@@ -1,1921 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/tokens.h"
-#include "internal_includes/structs.h"
-#include "internal_includes/decode.h"
-#include "stdlib.h"
-#include "stdio.h"
-#include "bstrlib.h"
-#include "internal_includes/toGLSLInstruction.h"
-#include "internal_includes/toGLSLOperand.h"
-#include "internal_includes/toGLSLDeclaration.h"
-#include "internal_includes/languages.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "internal_includes/hlslccToolkit.h"
-#include "../offline/hash.h"
-
-#if defined(_WIN32) && !defined(PORTABLE)
-#include <AzCore/PlatformDef.h>
-AZ_PUSH_DISABLE_WARNING(4115, "-Wunknown-warning-option") // 4115: named type definition in parentheses
-#include <d3dcompiler.h>
-AZ_POP_DISABLE_WARNING
-#pragma comment(lib,"d3dcompiler.lib")
-#endif //defined(_WIN32) && !defined(PORTABLE)
-
-#ifndef GL_VERTEX_SHADER_ARB
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#endif
-#ifndef GL_FRAGMENT_SHADER_ARB
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#endif
-#ifndef GL_GEOMETRY_SHADER
-#define GL_GEOMETRY_SHADER 0x8DD9
-#endif
-#ifndef GL_TESS_EVALUATION_SHADER
-#define GL_TESS_EVALUATION_SHADER 0x8E87
-#endif
-#ifndef GL_TESS_CONTROL_SHADER
-#define GL_TESS_CONTROL_SHADER 0x8E88
-#endif
-#ifndef GL_COMPUTE_SHADER
-#define GL_COMPUTE_SHADER 0x91B9
-#endif
-
-
-HLSLCC_API void HLSLCC_APIENTRY HLSLcc_SetMemoryFunctions(void* (*malloc_override)(size_t), void* (*calloc_override)(size_t, size_t), void (* free_override)(void*), void* (*realloc_override)(void*, size_t))
-{
-    hlslcc_malloc = malloc_override;
-    hlslcc_calloc = calloc_override;
-    hlslcc_free = free_override;
-    hlslcc_realloc = realloc_override;
-}
-
-void AddIndentation(HLSLCrossCompilerContext* psContext)
-{
-    int i;
-    int indent = psContext->indent;
-    bstring glsl = *psContext->currentGLSLString;
-    for (i = 0; i < indent; ++i)
-    {
-        bcatcstr(glsl, "    ");
-    }
-}
-
-uint32_t AddImport(HLSLCrossCompilerContext* psContext, SYMBOL_TYPE eType, uint32_t ui32ID, uint32_t ui32Default)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    uint32_t ui32Symbol = psContext->psShader->sInfo.ui32NumImports;
-
-    psContext->psShader->sInfo.psImports = (Symbol*)hlslcc_realloc(psContext->psShader->sInfo.psImports, (ui32Symbol + 1) * sizeof(Symbol));
-    ++psContext->psShader->sInfo.ui32NumImports;
-
-    bformata(glsl, "#ifndef IMPORT_%d\n", ui32Symbol);
-    bformata(glsl, "#define IMPORT_%d %d\n", ui32Symbol, ui32Default);
-    bformata(glsl, "#endif\n", ui32Symbol);
-
-    psContext->psShader->sInfo.psImports[ui32Symbol].eType = eType;
-    psContext->psShader->sInfo.psImports[ui32Symbol].ui32ID = ui32ID;
-    psContext->psShader->sInfo.psImports[ui32Symbol].ui32Value = ui32Default;
-
-    return ui32Symbol;
-}
-
-uint32_t AddExport(HLSLCrossCompilerContext* psContext, SYMBOL_TYPE eType, uint32_t ui32ID, uint32_t ui32Value)
-{
-    uint32_t ui32Param = psContext->psShader->sInfo.ui32NumExports;
-
-    psContext->psShader->sInfo.psExports = (Symbol*)hlslcc_realloc(psContext->psShader->sInfo.psExports, (ui32Param + 1) * sizeof(Symbol));
-    ++psContext->psShader->sInfo.ui32NumExports;
-
-    psContext->psShader->sInfo.psExports[ui32Param].eType = eType;
-    psContext->psShader->sInfo.psExports[ui32Param].ui32ID = ui32ID;
-    psContext->psShader->sInfo.psExports[ui32Param].ui32Value = ui32Value;
-
-    return ui32Param;
-}
-
-void AddVersionDependentCode(HLSLCrossCompilerContext* psContext)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    uint32_t ui32DepthClampImp;
-
-    if (!HaveCompute(psContext->psShader->eTargetLanguage))
-    {
-        if (psContext->psShader->eShaderType == COMPUTE_SHADER)
-        {
-            bcatcstr(glsl, "#extension GL_ARB_compute_shader : enable\n");
-            bcatcstr(glsl, "#extension GL_ARB_shader_storage_buffer_object : enable\n");
-        }
-    }
-
-    if (!HaveAtomicMem(psContext->psShader->eTargetLanguage) ||
-        !HaveAtomicCounter(psContext->psShader->eTargetLanguage))
-    {
-        if (psContext->psShader->aiOpcodeUsed[OPCODE_IMM_ATOMIC_ALLOC] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_IMM_ATOMIC_CONSUME] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED])
-        {
-            bcatcstr(glsl, "#extension GL_ARB_shader_atomic_counters : enable\n");
-
-            bcatcstr(glsl, "#extension GL_ARB_shader_storage_buffer_object : enable\n");
-        }
-    }
-
-    if (!HaveGather(psContext->psShader->eTargetLanguage))
-    {
-        if (psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO_C] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_C])
-        {
-            bcatcstr(glsl, "#extension GL_ARB_texture_gather : enable\n");
-        }
-    }
-
-    if (!HaveGatherNonConstOffset(psContext->psShader->eTargetLanguage))
-    {
-        if (psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO_C] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO])
-        {
-            bcatcstr(glsl, "#extension GL_ARB_gpu_shader5 : enable\n");
-        }
-    }
-
-    if (!HaveQueryLod(psContext->psShader->eTargetLanguage))
-    {
-        if (psContext->psShader->aiOpcodeUsed[OPCODE_LOD])
-        {
-            bcatcstr(glsl, "#extension GL_ARB_texture_query_lod : enable\n");
-        }
-    }
-
-    if (!HaveQueryLevels(psContext->psShader->eTargetLanguage))
-    {
-        if (psContext->psShader->aiOpcodeUsed[OPCODE_RESINFO])
-        {
-            bcatcstr(glsl, "#extension GL_ARB_texture_query_levels : enable\n");
-        }
-    }
-
-    if (!HaveImageLoadStore(psContext->psShader->eTargetLanguage) && (psContext->flags & HLSLCC_FLAG_AVOID_SHADER_LOAD_STORE_EXTENSION) == 0)
-    {
-        if (psContext->psShader->aiOpcodeUsed[OPCODE_STORE_UAV_TYPED] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_STORE_RAW] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_STORE_STRUCTURED])
-        {
-            bcatcstr(glsl, "#extension GL_ARB_shader_image_load_store : enable\n");
-            bcatcstr(glsl, "#extension GL_ARB_shader_bit_encoding : enable\n");
-        }
-        else
-        if (psContext->psShader->aiOpcodeUsed[OPCODE_LD_UAV_TYPED] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_LD_RAW] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_LD_STRUCTURED])
-        {
-            bcatcstr(glsl, "#extension GL_ARB_shader_image_load_store : enable\n");
-        }
-    }
-
-
-    // #extension directive must occur before any non-preprocessor token
-    if (EmulateDepthClamp(psContext->psShader->eTargetLanguage) && (psContext->psShader->eShaderType == VERTEX_SHADER || psContext->psShader->eShaderType == PIXEL_SHADER))
-    {
-        ui32DepthClampImp = AddImport(psContext, SYMBOL_EMULATE_DEPTH_CLAMP, 0, 0);
-
-        bformata(glsl, "#if IMPORT_%d > 0\n", ui32DepthClampImp);
-        if (!HaveNoperspectiveInterpolation(psContext->psShader->eTargetLanguage))
-        {
-            bcatcstr(glsl, "#ifdef GL_NV_shader_noperspective_interpolation\n");
-            bcatcstr(glsl, "#extension GL_NV_shader_noperspective_interpolation:enable\n");
-            bformata(glsl, "#endif\n");
-        }
-        bformata(glsl, "#endif\n");
-    }
-
-    if (psContext->psShader->ui32MajorVersion <= 3)
-    {
-        bcatcstr(glsl, "int RepCounter;\n");
-        bcatcstr(glsl, "int LoopCounter;\n");
-        bcatcstr(glsl, "int ZeroBasedCounter;\n");
-        if (psContext->psShader->eShaderType == VERTEX_SHADER)
-        {
-            uint32_t texCoord;
-            bcatcstr(glsl, "ivec4 Address;\n");
-
-            if (InOutSupported(psContext->psShader->eTargetLanguage))
-            {
-                bcatcstr(glsl, "out vec4 OffsetColour;\n");
-                bcatcstr(glsl, "out vec4 BaseColour;\n");
-
-                bcatcstr(glsl, "out vec4 Fog;\n");
-
-                for (texCoord = 0; texCoord < 8; ++texCoord)
-                {
-                    bformata(glsl, "out vec4 TexCoord%d;\n", texCoord);
-                }
-            }
-            else
-            {
-                bcatcstr(glsl, "varying vec4 OffsetColour;\n");
-                bcatcstr(glsl, "varying vec4 BaseColour;\n");
-
-                bcatcstr(glsl, "varying vec4 Fog;\n");
-
-                for (texCoord = 0; texCoord < 8; ++texCoord)
-                {
-                    bformata(glsl, "varying vec4 TexCoord%d;\n", texCoord);
-                }
-            }
-        }
-        else
-        {
-            uint32_t renderTargets, texCoord;
-
-            bcatcstr(glsl, "varying vec4 OffsetColour;\n");
-            bcatcstr(glsl, "varying vec4 BaseColour;\n");
-
-            bcatcstr(glsl, "varying vec4 Fog;\n");
-
-            for (texCoord = 0; texCoord < 8; ++texCoord)
-            {
-                bformata(glsl, "varying vec4 TexCoord%d;\n", texCoord);
-            }
-
-            for (renderTargets = 0; renderTargets < 8; ++renderTargets)
-            {
-                bformata(glsl, "#define Output%d gl_FragData[%d]\n", renderTargets, renderTargets);
-            }
-        }
-    }
-
-
-    if ((psContext->flags & HLSLCC_FLAG_ORIGIN_UPPER_LEFT)
-        && (psContext->psShader->eTargetLanguage >= LANG_150)
-        && (psContext->psShader->eShaderType == PIXEL_SHADER))
-    {
-        bcatcstr(glsl, "layout(origin_upper_left) in vec4 gl_FragCoord;\n");
-    }
-
-    if ((psContext->flags & HLSLCC_FLAG_PIXEL_CENTER_INTEGER)
-        && (psContext->psShader->eTargetLanguage >= LANG_150))
-    {
-        bcatcstr(glsl, "layout(pixel_center_integer) in vec4 gl_FragCoord;\n");
-    }
-
-    /* For versions which do not support a vec1 (currently all versions) */
-    bcatcstr(glsl, "struct vec1 {\n");
-    if (psContext->psShader->eTargetLanguage == LANG_ES_300 || psContext->psShader->eTargetLanguage == LANG_ES_310 || psContext->psShader->eTargetLanguage == LANG_ES_100)
-    {
-        bcatcstr(glsl, "\thighp float x;\n");
-    }
-    else
-    {
-        bcatcstr(glsl, "\tfloat x;\n");
-    }
-    bcatcstr(glsl, "};\n");
-
-    if (HaveUVec(psContext->psShader->eTargetLanguage))
-    {
-        bcatcstr(glsl, "struct uvec1 {\n");
-        bcatcstr(glsl, "\tuint x;\n");
-        bcatcstr(glsl, "};\n");
-    }
-
-    bcatcstr(glsl, "struct ivec1 {\n");
-    bcatcstr(glsl, "\tint x;\n");
-    bcatcstr(glsl, "};\n");
-
-    /*
-    OpenGL 4.1 API spec:
-    To use any built-in input or output in the gl_PerVertex block in separable
-    program objects, shader code must redeclare that block prior to use.
-    */
-    if (psContext->psShader->eShaderType == VERTEX_SHADER && psContext->psShader->eTargetLanguage >= LANG_410)
-    {
-        bcatcstr(glsl, "out gl_PerVertex {\n");
-        bcatcstr(glsl, "vec4 gl_Position;\n");
-        bcatcstr(glsl, "float gl_PointSize;\n");
-        bcatcstr(glsl, "float gl_ClipDistance[];");
-        bcatcstr(glsl, "};\n");
-    }
-
-    //The fragment language has no default precision qualifier for floating point types.
-    if (psContext->psShader->eShaderType == PIXEL_SHADER &&
-        psContext->psShader->eTargetLanguage == LANG_ES_100 || psContext->psShader->eTargetLanguage == LANG_ES_300  || psContext->psShader->eTargetLanguage == LANG_ES_310)
-    {
-        bcatcstr(glsl, "precision highp float;\n");
-    }
-
-    /* There is no default precision qualifier for the following sampler types in either the vertex or fragment language: */
-    if (psContext->psShader->eTargetLanguage == LANG_ES_300 || psContext->psShader->eTargetLanguage == LANG_ES_310)
-    {
-        bcatcstr(glsl, "precision lowp sampler3D;\n");
-        bcatcstr(glsl, "precision lowp samplerCubeShadow;\n");
-        bcatcstr(glsl, "precision lowp sampler2DShadow;\n");
-        bcatcstr(glsl, "precision lowp sampler2DArray;\n");
-        bcatcstr(glsl, "precision lowp sampler2DArrayShadow;\n");
-        bcatcstr(glsl, "precision lowp isampler2D;\n");
-        bcatcstr(glsl, "precision lowp isampler3D;\n");
-        bcatcstr(glsl, "precision lowp isamplerCube;\n");
-        bcatcstr(glsl, "precision lowp isampler2DArray;\n");
-        bcatcstr(glsl, "precision lowp usampler2D;\n");
-        bcatcstr(glsl, "precision lowp usampler3D;\n");
-        bcatcstr(glsl, "precision lowp usamplerCube;\n");
-        bcatcstr(glsl, "precision lowp usampler2DArray;\n");
-
-        if (psContext->psShader->eTargetLanguage == LANG_ES_310)
-        {
-            bcatcstr(glsl, "precision lowp isampler2DMS;\n");
-            bcatcstr(glsl, "precision lowp usampler2D;\n");
-            bcatcstr(glsl, "precision lowp usampler3D;\n");
-            bcatcstr(glsl, "precision lowp usamplerCube;\n");
-            bcatcstr(glsl, "precision lowp usampler2DArray;\n");
-            bcatcstr(glsl, "precision lowp usampler2DMS;\n");
-            bcatcstr(glsl, "precision lowp image2D;\n");
-            bcatcstr(glsl, "precision lowp image3D;\n");
-            bcatcstr(glsl, "precision lowp imageCube;\n");
-            bcatcstr(glsl, "precision lowp image2DArray;\n");
-            bcatcstr(glsl, "precision lowp iimage2D;\n");
-            bcatcstr(glsl, "precision lowp iimage3D;\n");
-            bcatcstr(glsl, "precision lowp iimageCube;\n");
-            bcatcstr(glsl, "precision lowp uimage2DArray;\n");
-            //Only highp is valid for atomic_uint
-            bcatcstr(glsl, "precision highp atomic_uint;\n");
-        }
-    }
-
-    if (SubroutinesSupported(psContext->psShader->eTargetLanguage))
-    {
-        bcatcstr(glsl, "subroutine void SubroutineType();\n");
-    }
-
-    if (EmulateDepthClamp(psContext->psShader->eTargetLanguage) && (psContext->psShader->eShaderType == VERTEX_SHADER || psContext->psShader->eShaderType == PIXEL_SHADER))
-    {
-        char* szInOut = psContext->psShader->eShaderType == VERTEX_SHADER ? "out" : "in";
-
-        bformata(glsl, "#if IMPORT_%d > 0\n", ui32DepthClampImp);
-        if (!HaveNoperspectiveInterpolation(psContext->psShader->eTargetLanguage))
-        {
-            bcatcstr(glsl, "#ifdef GL_NV_shader_noperspective_interpolation\n");
-        }
-        bcatcstr(glsl, "#define EMULATE_DEPTH_CLAMP 1\n");
-        bformata(glsl, "noperspective %s float unclampedDepth;\n", szInOut);
-        if (!HaveNoperspectiveInterpolation(psContext->psShader->eTargetLanguage))
-        {
-            bcatcstr(glsl, "#else\n");
-            bcatcstr(glsl, "#define EMULATE_DEPTH_CLAMP 2\n");
-            bformata(glsl, "%s float unclampedZ;\n", szInOut);
-            bformata(glsl, "#endif\n");
-        }
-        bformata(glsl, "#endif\n");
-
-        if (psContext->psShader->eShaderType == PIXEL_SHADER)
-        {
-            bcatcstr(psContext->earlyMain, "#ifdef EMULATE_DEPTH_CLAMP\n");
-            bcatcstr(psContext->earlyMain, "#if EMULATE_DEPTH_CLAMP == 2\n");
-            bcatcstr(psContext->earlyMain, "\tfloat unclampedDepth = gl_DepthRange.near + unclampedZ *  gl_FragCoord.w;\n");
-            bcatcstr(psContext->earlyMain, "#endif\n");
-            bcatcstr(psContext->earlyMain, "\tgl_FragDepth = clamp(unclampedDepth, 0.0, 1.0);\n");
-            bcatcstr(psContext->earlyMain, "#endif\n");
-        }
-    }
-}
-
-FRAMEBUFFER_FETCH_TYPE CollectGmemInfo(HLSLCrossCompilerContext* psContext)
-{
-    FRAMEBUFFER_FETCH_TYPE fetchType = FBF_NONE;
-    Shader* psShader = psContext->psShader;
-    memset(psContext->rendertargetUse, 0x00, sizeof(psContext->rendertargetUse));
-    for (uint32_t i = 0; i < psShader->ui32DeclCount; ++i)
-    {
-        Declaration* decl = psShader->psDecl + i;
-        if (decl->eOpcode == OPCODE_DCL_RESOURCE)
-        {
-            if (IsGmemReservedSlot(FBF_EXT_COLOR, decl->asOperands[0].ui32RegisterNumber))
-            {
-                int regNum = GetGmemInputResourceSlot(decl->asOperands[0].ui32RegisterNumber);
-                ASSERT(regNum < MAX_COLOR_MRT);
-                psContext->rendertargetUse[regNum] |= INPUT_RENDERTARGET;
-                fetchType |= FBF_EXT_COLOR;
-            }
-            else if (IsGmemReservedSlot(FBF_ARM_COLOR, decl->asOperands[0].ui32RegisterNumber))
-            {
-                fetchType |= FBF_ARM_COLOR;
-            }
-            else if (IsGmemReservedSlot(FBF_ARM_DEPTH, decl->asOperands[0].ui32RegisterNumber))
-            {
-                fetchType |= FBF_ARM_DEPTH;
-            }
-            else if (IsGmemReservedSlot(FBF_ARM_STENCIL, decl->asOperands[0].ui32RegisterNumber))
-            {
-                fetchType |= FBF_ARM_STENCIL;
-            }
-        }
-        else if (decl->eOpcode == OPCODE_DCL_OUTPUT && psShader->eShaderType == PIXEL_SHADER && decl->asOperands[0].eType != OPERAND_TYPE_OUTPUT_DEPTH)
-        {
-            ASSERT(decl->asOperands[0].ui32RegisterNumber < MAX_COLOR_MRT);
-            psContext->rendertargetUse[decl->asOperands[0].ui32RegisterNumber] |= OUTPUT_RENDERTARGET;
-        }
-    }
-
-    return fetchType;
-}
-
-uint16_t GetOpcodeWriteMask(OPCODE_TYPE eOpcode)
-{
-    switch (eOpcode)
-    {
-    default:
-        ASSERT(0);
-
-    // No writes
-    case OPCODE_ENDREP:
-    case OPCODE_REP:
-    case OPCODE_BREAK:
-    case OPCODE_BREAKC:
-    case OPCODE_CALL:
-    case OPCODE_CALLC:
-    case OPCODE_CASE:
-    case OPCODE_CONTINUE:
-    case OPCODE_CONTINUEC:
-    case OPCODE_CUT:
-    case OPCODE_DISCARD:
-    case OPCODE_ELSE:
-    case OPCODE_EMIT:
-    case OPCODE_EMITTHENCUT:
-    case OPCODE_ENDIF:
-    case OPCODE_ENDLOOP:
-    case OPCODE_ENDSWITCH:
-    case OPCODE_IF:
-    case OPCODE_LABEL:
-    case OPCODE_LOOP:
-    case OPCODE_NOP:
-    case OPCODE_RET:
-    case OPCODE_RETC:
-    case OPCODE_SWITCH:
-    case OPCODE_HS_DECLS:
-    case OPCODE_HS_CONTROL_POINT_PHASE:
-    case OPCODE_HS_FORK_PHASE:
-    case OPCODE_HS_JOIN_PHASE:
-    case OPCODE_EMIT_STREAM:
-    case OPCODE_CUT_STREAM:
-    case OPCODE_EMITTHENCUT_STREAM:
-    case OPCODE_INTERFACE_CALL:
-    case OPCODE_STORE_UAV_TYPED:
-    case OPCODE_STORE_RAW:
-    case OPCODE_STORE_STRUCTURED:
-    case OPCODE_ATOMIC_AND:
-    case OPCODE_ATOMIC_OR:
-    case OPCODE_ATOMIC_XOR:
-    case OPCODE_ATOMIC_CMP_STORE:
-    case OPCODE_ATOMIC_IADD:
-    case OPCODE_ATOMIC_IMAX:
-    case OPCODE_ATOMIC_IMIN:
-    case OPCODE_ATOMIC_UMAX:
-    case OPCODE_ATOMIC_UMIN:
-    case OPCODE_SYNC:
-    case OPCODE_ABORT:
-    case OPCODE_DEBUG_BREAK:
-        return 0;
-
-    // Write to 0
-    case OPCODE_POW:
-    case OPCODE_DP2ADD:
-    case OPCODE_LRP:
-    case OPCODE_ADD:
-    case OPCODE_AND:
-    case OPCODE_DERIV_RTX:
-    case OPCODE_DERIV_RTY:
-    case OPCODE_DEFAULT:
-    case OPCODE_DIV:
-    case OPCODE_DP2:
-    case OPCODE_DP3:
-    case OPCODE_DP4:
-    case OPCODE_EXP:
-    case OPCODE_FRC:
-    case OPCODE_ITOF:
-    case OPCODE_LOG:
-    case OPCODE_LT:
-    case OPCODE_MAD:
-    case OPCODE_MIN:
-    case OPCODE_MAX:
-    case OPCODE_MUL:
-    case OPCODE_ROUND_NE:
-    case OPCODE_ROUND_NI:
-    case OPCODE_ROUND_PI:
-    case OPCODE_ROUND_Z:
-    case OPCODE_RSQ:
-    case OPCODE_SQRT:
-    case OPCODE_UTOF:
-    case OPCODE_SAMPLE_POS:
-    case OPCODE_SAMPLE_INFO:
-    case OPCODE_DERIV_RTX_COARSE:
-    case OPCODE_DERIV_RTX_FINE:
-    case OPCODE_DERIV_RTY_COARSE:
-    case OPCODE_DERIV_RTY_FINE:
-    case OPCODE_RCP:
-    case OPCODE_F32TOF16:
-    case OPCODE_F16TOF32:
-    case OPCODE_DTOF:
-    case OPCODE_EQ:
-    case OPCODE_FTOU:
-    case OPCODE_GE:
-    case OPCODE_IEQ:
-    case OPCODE_IGE:
-    case OPCODE_ILT:
-    case OPCODE_NE:
-    case OPCODE_NOT:
-    case OPCODE_OR:
-    case OPCODE_ULT:
-    case OPCODE_UGE:
-    case OPCODE_UMAD:
-    case OPCODE_XOR:
-    case OPCODE_UMAX:
-    case OPCODE_UMIN:
-    case OPCODE_USHR:
-    case OPCODE_COUNTBITS:
-    case OPCODE_FIRSTBIT_HI:
-    case OPCODE_FIRSTBIT_LO:
-    case OPCODE_FIRSTBIT_SHI:
-    case OPCODE_UBFE:
-    case OPCODE_BFI:
-    case OPCODE_BFREV:
-    case OPCODE_IMM_ATOMIC_AND:
-    case OPCODE_IMM_ATOMIC_OR:
-    case OPCODE_IMM_ATOMIC_XOR:
-    case OPCODE_IMM_ATOMIC_EXCH:
-    case OPCODE_IMM_ATOMIC_CMP_EXCH:
-    case OPCODE_IMM_ATOMIC_UMAX:
-    case OPCODE_IMM_ATOMIC_UMIN:
-    case OPCODE_DEQ:
-    case OPCODE_DGE:
-    case OPCODE_DLT:
-    case OPCODE_DNE:
-    case OPCODE_MSAD:
-    case OPCODE_DTOU:
-    case OPCODE_FTOI:
-    case OPCODE_IADD:
-    case OPCODE_IMAD:
-    case OPCODE_IMAX:
-    case OPCODE_IMIN:
-    case OPCODE_IMUL:
-    case OPCODE_INE:
-    case OPCODE_INEG:
-    case OPCODE_ISHL:
-    case OPCODE_ISHR:
-    case OPCODE_BUFINFO:
-    case OPCODE_IBFE:
-    case OPCODE_IMM_ATOMIC_ALLOC:
-    case OPCODE_IMM_ATOMIC_CONSUME:
-    case OPCODE_IMM_ATOMIC_IADD:
-    case OPCODE_IMM_ATOMIC_IMAX:
-    case OPCODE_IMM_ATOMIC_IMIN:
-    case OPCODE_DTOI:
-    case OPCODE_DADD:
-    case OPCODE_DMAX:
-    case OPCODE_DMIN:
-    case OPCODE_DMUL:
-    case OPCODE_DMOV:
-    case OPCODE_DMOVC:
-    case OPCODE_FTOD:
-    case OPCODE_DDIV:
-    case OPCODE_DFMA:
-    case OPCODE_DRCP:
-    case OPCODE_ITOD:
-    case OPCODE_UTOD:
-    case OPCODE_LD:
-    case OPCODE_LD_MS:
-    case OPCODE_RESINFO:
-    case OPCODE_SAMPLE:
-    case OPCODE_SAMPLE_C:
-    case OPCODE_SAMPLE_C_LZ:
-    case OPCODE_SAMPLE_L:
-    case OPCODE_SAMPLE_D:
-    case OPCODE_SAMPLE_B:
-    case OPCODE_LOD:
-    case OPCODE_GATHER4:
-    case OPCODE_GATHER4_C:
-    case OPCODE_GATHER4_PO:
-    case OPCODE_GATHER4_PO_C:
-    case OPCODE_LD_UAV_TYPED:
-    case OPCODE_LD_RAW:
-    case OPCODE_LD_STRUCTURED:
-    case OPCODE_EVAL_SNAPPED:
-    case OPCODE_EVAL_SAMPLE_INDEX:
-    case OPCODE_EVAL_CENTROID:
-    case OPCODE_MOV:
-    case OPCODE_MOVC:
-        return 1u << 0;
-
-    // Write to 0, 1
-    case OPCODE_SINCOS:
-    case OPCODE_UDIV:
-    case OPCODE_UMUL:
-    case OPCODE_UADDC:
-    case OPCODE_USUBB:
-    case OPCODE_SWAPC:
-        return (1u << 0) | (1u << 1);
-    }
-}
-
-void CreateTracingInfo(Shader* psShader)
-{
-    VariableTraceInfo asInputVarsInfo[MAX_SHADER_VEC4_INPUT * 4];
-    uint32_t ui32NumInputVars = 0;
-    uint32_t uInputVec, uInstruction;
-
-    psShader->sInfo.ui32NumTraceSteps = psShader->ui32InstCount + 1;
-    psShader->sInfo.psTraceSteps = hlslcc_malloc(sizeof(StepTraceInfo) * psShader->sInfo.ui32NumTraceSteps);
-
-    for (uInputVec = 0; uInputVec < psShader->sInfo.ui32NumInputSignatures; ++uInputVec)
-    {
-        uint32_t ui32RWMask = psShader->sInfo.psInputSignatures[uInputVec].ui32ReadWriteMask;
-        uint8_t ui8Component = 0;
-
-        while (ui32RWMask != 0)
-        {
-            if (ui32RWMask & 1)
-            {
-                TRACE_VARIABLE_TYPE eType;
-                switch (psShader->sInfo.psInputSignatures[uInputVec].eComponentType)
-                {
-                default:
-                    ASSERT(0);
-                case INOUT_COMPONENT_UNKNOWN:
-                case INOUT_COMPONENT_UINT32:
-                    eType = TRACE_VARIABLE_UINT;
-                    break;
-                case INOUT_COMPONENT_SINT32:
-                    eType = TRACE_VARIABLE_SINT;
-                    break;
-                case INOUT_COMPONENT_FLOAT32:
-                    eType = TRACE_VARIABLE_FLOAT;
-                    break;
-                }
-
-                asInputVarsInfo[ui32NumInputVars].eGroup = TRACE_VARIABLE_INPUT;
-                asInputVarsInfo[ui32NumInputVars].eType = eType;
-                asInputVarsInfo[ui32NumInputVars].ui8Index = psShader->sInfo.psInputSignatures[uInputVec].ui32Register;
-                asInputVarsInfo[ui32NumInputVars].ui8Component = ui8Component;
-                ++ui32NumInputVars;
-            }
-            ui32RWMask >>= 1;
-            ++ui8Component;
-        }
-    }
-
-    psShader->sInfo.psTraceSteps[0].ui32NumVariables = ui32NumInputVars;
-    psShader->sInfo.psTraceSteps[0].psVariables = hlslcc_malloc(sizeof(VariableTraceInfo) * ui32NumInputVars);
-    memcpy(psShader->sInfo.psTraceSteps[0].psVariables, asInputVarsInfo, sizeof(VariableTraceInfo) * ui32NumInputVars);
-
-    for (uInstruction = 0; uInstruction < psShader->ui32InstCount; ++uInstruction)
-    {
-        VariableTraceInfo* psStepVars = NULL;
-        uint32_t ui32StepVarsCapacity = 0;
-        uint32_t ui32StepVarsSize = 0;
-        uint32_t auStepDirtyVecMask[MAX_TEMP_VEC4 + MAX_SHADER_VEC4_OUTPUT] = {0};
-        uint8_t auStepCompTypeMask[4 * (MAX_TEMP_VEC4 + MAX_SHADER_VEC4_OUTPUT)] = {0};
-        uint32_t uOpcodeWriteMask = GetOpcodeWriteMask(psShader->psInst[uInstruction].eOpcode);
-        uint32_t uOperand, uStepVec;
-
-        for (uOperand = 0; uOperand < psShader->psInst[uInstruction].ui32NumOperands; ++uOperand)
-        {
-            if (uOpcodeWriteMask & (1 << uOperand))
-            {
-                uint32_t ui32OperandCompMask = ConvertOperandSwizzleToComponentMask(&psShader->psInst[uInstruction].asOperands[uOperand]);
-                uint32_t ui32Register = psShader->psInst[uInstruction].asOperands[uOperand].ui32RegisterNumber;
-                uint32_t ui32VecOffset = 0;
-                uint8_t ui8Component = 0;
-                switch (psShader->psInst[uInstruction].asOperands[uOperand].eType)
-                {
-                case OPERAND_TYPE_TEMP:
-                    ui32VecOffset = 0;
-                    break;
-                case OPERAND_TYPE_OUTPUT:
-                    ui32VecOffset = MAX_TEMP_VEC4;
-                    break;
-                default:
-                    continue;
-                }
-
-                auStepDirtyVecMask[ui32VecOffset + ui32Register] |= ui32OperandCompMask;
-                while (ui32OperandCompMask)
-                {
-                    ASSERT(ui8Component < 4);
-                    if (ui32OperandCompMask & 1)
-                    {
-                        TRACE_VARIABLE_TYPE eOperandCompType = TRACE_VARIABLE_UNKNOWN;
-                        switch (psShader->psInst[uInstruction].asOperands[uOperand].aeDataType[ui8Component])
-                        {
-                        case SVT_INT:
-                            eOperandCompType = TRACE_VARIABLE_SINT;
-                            break;
-                        case SVT_FLOAT:
-                            eOperandCompType = TRACE_VARIABLE_FLOAT;
-                            break;
-                        case SVT_UINT:
-                            eOperandCompType = TRACE_VARIABLE_UINT;
-                            break;
-                        case SVT_DOUBLE:
-                            eOperandCompType = TRACE_VARIABLE_DOUBLE;
-                            break;
-                        }
-                        if (auStepCompTypeMask[4 * (ui32VecOffset + ui32Register) + ui8Component] == 0)
-                        {
-                            auStepCompTypeMask[4 * (ui32VecOffset + ui32Register) + ui8Component] = 1u + (uint8_t)eOperandCompType;
-                        }
-                        else if (auStepCompTypeMask[4 * (ui32VecOffset + ui32Register) + ui8Component] != eOperandCompType)
-                        {
-                            auStepCompTypeMask[4 * (ui32VecOffset + ui32Register) + ui8Component] = 1u + (uint8_t)TRACE_VARIABLE_UNKNOWN;
-                        }
-                    }
-                    ui32OperandCompMask >>= 1;
-                    ++ui8Component;
-                }
-            }
-        }
-
-        for (uStepVec = 0; uStepVec < MAX_TEMP_VEC4 + MAX_SHADER_VEC4_OUTPUT; ++uStepVec)
-        {
-            TRACE_VARIABLE_GROUP eGroup;
-            uint32_t uBase;
-            uint8_t ui8Component = 0;
-            if (uStepVec < MAX_TEMP_VEC4)
-            {
-                eGroup = TRACE_VARIABLE_TEMP;
-                uBase = 0;
-            }
-            else
-            {
-                eGroup = TRACE_VARIABLE_OUTPUT;
-                uBase = MAX_TEMP_VEC4;
-            }
-
-            while (auStepDirtyVecMask[uStepVec] != 0)
-            {
-                if (auStepDirtyVecMask[uStepVec] & 1)
-                {
-                    if (ui32StepVarsCapacity == ui32StepVarsSize)
-                    {
-                        ui32StepVarsCapacity = (1 > ui32StepVarsCapacity ? 1 : ui32StepVarsCapacity) * 16;
-                        if (psStepVars == NULL)
-                        {
-                            psStepVars = hlslcc_malloc(ui32StepVarsCapacity * sizeof(VariableTraceInfo));
-                        }
-                        else
-                        {
-                            psStepVars = hlslcc_realloc(psStepVars, ui32StepVarsCapacity * sizeof(VariableTraceInfo));
-                        }
-                    }
-                    ASSERT(ui32StepVarsSize < ui32StepVarsCapacity);
-
-                    psStepVars[ui32StepVarsSize].eGroup = eGroup;
-                    psStepVars[ui32StepVarsSize].eType = auStepCompTypeMask[4 * uStepVec + ui8Component] == 0 ? TRACE_VARIABLE_UNKNOWN : (TRACE_VARIABLE_TYPE)(auStepCompTypeMask[4 * uStepVec + ui8Component] - 1);
-                    psStepVars[ui32StepVarsSize].ui8Component = ui8Component;
-                    psStepVars[ui32StepVarsSize].ui8Index = uStepVec - uBase;
-                    ++ui32StepVarsSize;
-                }
-
-                ++ui8Component;
-                auStepDirtyVecMask[uStepVec] >>= 1;
-            }
-        }
-
-        psShader->sInfo.psTraceSteps[1 + uInstruction].ui32NumVariables = ui32StepVarsSize;
-        psShader->sInfo.psTraceSteps[1 + uInstruction].psVariables = psStepVars;
-    }
-}
-
-void WriteTraceDeclarations(HLSLCrossCompilerContext* psContext)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    AddIndentation(psContext);
-    bcatcstr(glsl, "layout (std430) buffer Trace\n");
-    AddIndentation(psContext);
-    bcatcstr(glsl, "{\n");
-    ++psContext->indent;
-    AddIndentation(psContext);
-    bcatcstr(glsl, "uint uTraceSize;\n");
-    AddIndentation(psContext);
-    bcatcstr(glsl, "uint uTraceStride;\n");
-    AddIndentation(psContext);
-    bcatcstr(glsl, "uint uTraceCapacity;\n");
-    switch (psContext->psShader->eShaderType)
-    {
-    case PIXEL_SHADER:
-        AddIndentation(psContext);
-        bcatcstr(glsl, "float fTracePixelCoordX;\n");
-        AddIndentation(psContext);
-        bcatcstr(glsl, "float fTracePixelCoordY;\n");
-        break;
-    case VERTEX_SHADER:
-        AddIndentation(psContext);
-        bcatcstr(glsl, "uint uTraceVertexID;\n");
-        break;
-    default:
-        AddIndentation(psContext);
-        bcatcstr(glsl, "// Trace ID not implelemented for this shader type\n");
-        break;
-    }
-    AddIndentation(psContext);
-    bcatcstr(glsl, "uint auTraceValues[];\n");
-    --psContext->indent;
-    AddIndentation(psContext);
-    bcatcstr(glsl, "};\n");
-}
-
-void WritePreStepsTrace(HLSLCrossCompilerContext* psContext, StepTraceInfo* psStep)
-{
-    uint32_t uVar;
-    bstring glsl = *psContext->currentGLSLString;
-
-    AddIndentation(psContext);
-    bcatcstr(glsl, "bool bRecord = ");
-    switch (psContext->psShader->eShaderType)
-    {
-    case VERTEX_SHADER:
-        bcatcstr(glsl, "uint(gl_VertexID) == uTraceVertexID");
-        break;
-    case PIXEL_SHADER:
-        bcatcstr(glsl, "max(abs(gl_FragCoord.x - fTracePixelCoordX), abs(gl_FragCoord.y - fTracePixelCoordY)) <= 0.5");
-        break;
-    default:
-        bcatcstr(glsl, "/* Trace condition not implelemented for this shader type */");
-        bcatcstr(glsl, "false");
-        break;
-    }
-    bcatcstr(glsl, ";\n");
-
-    AddIndentation(psContext);
-    bcatcstr(glsl, "uint uTraceIndex = atomicAdd(uTraceSize, uTraceStride * (bRecord ? 1 : 0));\n");
-    AddIndentation(psContext);
-    bcatcstr(glsl, "uint uTraceEnd = uTraceIndex + uTraceStride;\n");
-    AddIndentation(psContext);
-    bcatcstr(glsl, "bRecord = bRecord && uTraceEnd <= uTraceCapacity;\n");
-    AddIndentation(psContext);
-    bcatcstr(glsl, "uTraceEnd *= (bRecord ? 1 : 0);\n");
-
-    if (psStep->ui32NumVariables > 0)
-    {
-        AddIndentation(psContext);
-        bformata(glsl, "auTraceValues[min(++uTraceIndex, uTraceEnd)] = uint(0);\n"); // Adreno can't handle 0u (it's treated as int)
-
-        for (uVar = 0; uVar < psStep->ui32NumVariables; ++uVar)
-        {
-            VariableTraceInfo* psVar = &psStep->psVariables[uVar];
-            ASSERT(psVar->eGroup == TRACE_VARIABLE_INPUT);
-            if (psVar->eGroup == TRACE_VARIABLE_INPUT)
-            {
-                AddIndentation(psContext);
-                bcatcstr(glsl, "auTraceValues[min(++uTraceIndex, uTraceEnd)] = ");
-
-                switch (psVar->eType)
-                {
-                case TRACE_VARIABLE_FLOAT:
-                    bcatcstr(glsl, "floatBitsToUint(");
-                    break;
-                case TRACE_VARIABLE_SINT:
-                    bcatcstr(glsl, "uint(");
-                    break;
-                case TRACE_VARIABLE_DOUBLE:
-                    ASSERT(0);
-                    // Not implemented yet;
-                    break;
-                }
-
-                bformata(glsl, "Input%d.%c", psVar->ui8Index, "xyzw"[psVar->ui8Component]);
-
-                switch (psVar->eType)
-                {
-                case TRACE_VARIABLE_FLOAT:
-                case TRACE_VARIABLE_SINT:
-                    bcatcstr(glsl, ")");
-                    break;
-                }
-
-                bcatcstr(glsl, ";\n");
-            }
-        }
-    }
-}
-
-void WritePostStepTrace(HLSLCrossCompilerContext* psContext, uint32_t uStep)
-{
-    Instruction* psInstruction = psContext->psShader->psInst + uStep;
-    StepTraceInfo* psStep = psContext->psShader->sInfo.psTraceSteps + (1 + uStep);
-
-    if (psStep->ui32NumVariables > 0)
-    {
-        uint32_t uVar;
-
-        AddIndentation(psContext);
-        bformata(psContext->glsl, "auTraceValues[min(++uTraceIndex, uTraceEnd)] = %du;\n", uStep + 1);
-
-        for (uVar = 0; uVar < psStep->ui32NumVariables; ++uVar)
-        {
-            VariableTraceInfo* psVar = &psStep->psVariables[uVar];
-            uint16_t uOpcodeWriteMask = GetOpcodeWriteMask(psInstruction->eOpcode);
-            uint8_t uOperand = 0;
-            OPERAND_TYPE eOperandType = OPERAND_TYPE_NULL;
-            Operand* psOperand = NULL;
-            uint32_t uiIgnoreSwizzle = 0;
-
-            switch (psVar->eGroup)
-            {
-            case TRACE_VARIABLE_TEMP:
-                eOperandType = OPERAND_TYPE_TEMP;
-                break;
-            case TRACE_VARIABLE_OUTPUT:
-                eOperandType = OPERAND_TYPE_OUTPUT;
-                break;
-            }
-
-            if (psVar->eType == TRACE_VARIABLE_DOUBLE)
-            {
-                ASSERT(0);
-                // Not implemented yet
-                continue;
-            }
-            while (uOpcodeWriteMask)
-            {
-                if (uOpcodeWriteMask & 1)
-                {
-                    if (eOperandType == psInstruction->asOperands[uOperand].eType &&
-                        psVar->ui8Index == psInstruction->asOperands[uOperand].ui32RegisterNumber)
-                    {
-                        psOperand = &psInstruction->asOperands[uOperand];
-                        break;
-                    }
-                }
-                uOpcodeWriteMask >>= 1;
-                ++uOperand;
-            }
-
-            if (psOperand == NULL)
-            {
-                ASSERT(0);
-                continue;
-            }
-
-            AddIndentation(psContext);
-            bcatcstr(psContext->glsl, "auTraceValues[min(++uTraceIndex, uTraceEnd)] = ");
-
-            TranslateVariableName(psContext, psOperand, TO_FLAG_UNSIGNED_INTEGER, &uiIgnoreSwizzle);
-            ASSERT(uiIgnoreSwizzle == 0);
-
-            bformata(psContext->glsl, ".%c;\n", "xyzw"[psVar->ui8Component]);
-        }
-    }
-}
-
-void WriteEndTrace(HLSLCrossCompilerContext* psContext)
-{
-    AddIndentation(psContext);
-    bcatcstr(psContext->glsl, "auTraceValues[min(++uTraceIndex, uTraceEnd)] = 0xFFFFFFFFu;\n");
-}
-
-int FindEmbeddedResourceName(EmbeddedResourceName* psEmbeddedName, HLSLCrossCompilerContext* psContext, bstring name)
-{
-    int offset = binstr(psContext->glsl, 0, name);
-    int size = name->slen;
-
-    if (offset == BSTR_ERR || size > 0x3FF || offset > 0x7FFFF)
-    {
-        return 0;
-    }
-
-    psEmbeddedName->ui20Offset = offset;
-    psEmbeddedName->ui12Size = size;
-    return 1;
-}
-
-void IgnoreSampler(ShaderInfo* psInfo, uint32_t index)
-{
-    if (index + 1 < psInfo->ui32NumSamplers)
-    {
-        psInfo->asSamplers[index] = psInfo->asSamplers[psInfo->ui32NumSamplers - 1];
-    }
-    --psInfo->ui32NumSamplers;
-}
-
-void IgnoreResource(Resource* psResources, uint32_t* puSize, uint32_t index)
-{
-    if (index + 1 < *puSize)
-    {
-        psResources[index] = psResources[*puSize - 1];
-    }
-    --*puSize;
-}
-
-void FillInResourceDescriptions(HLSLCrossCompilerContext* psContext)
-{
-    uint32_t i;
-    bstring resourceName = bfromcstralloc(MAX_REFLECT_STRING_LENGTH, "");
-    Shader* psShader = psContext->psShader;
-
-    for (i = 0; i < psShader->sInfo.ui32NumSamplers; ++i)
-    {
-        Sampler* psSampler = psShader->sInfo.asSamplers + i;
-        SamplerMask* psMask = &psSampler->sMask;
-        if (psMask->bNormalSample || psMask->bCompareSample)
-        {
-            if (psMask->bNormalSample)
-            {
-                btrunc(resourceName, 0);
-                TextureName(resourceName, psShader, psMask->ui10TextureBindPoint, psMask->ui10SamplerBindPoint, 0);
-                if (!FindEmbeddedResourceName(&psSampler->sNormalName, psContext, resourceName))
-                {
-                    psMask->bNormalSample = 0;
-                }
-            }
-            if (psMask->bCompareSample)
-            {
-                btrunc(resourceName, 0);
-                TextureName(resourceName, psShader, psMask->ui10TextureBindPoint, psMask->ui10SamplerBindPoint, 1);
-                if (!FindEmbeddedResourceName(&psSampler->sCompareName, psContext, resourceName))
-                {
-                    psMask->bCompareSample = 0;
-                }
-            }
-            if (!psMask->bNormalSample && !psMask->bCompareSample)
-            {
-                IgnoreSampler(&psShader->sInfo, i); // Not used in the shader - ignore
-            }
-        }
-        else
-        {
-            btrunc(resourceName, 0);
-            TextureName(resourceName, psShader, psMask->ui10TextureBindPoint, psMask->ui10SamplerBindPoint, 0);
-            if (!FindEmbeddedResourceName(&psSampler->sNormalName, psContext, resourceName))
-            {
-                IgnoreSampler(&psShader->sInfo, i); // Not used in the shader - ignore
-            }
-        }
-    }
-
-    for (i = 0; i < psShader->sInfo.ui32NumImages; ++i)
-    {
-        Resource* psResources = psShader->sInfo.asImages;
-        uint32_t* puSize = &psShader->sInfo.ui32NumImages;
-
-        Resource* psResource = psResources + i;
-        ResourceBinding* psBinding = NULL;
-        if (!GetResourceFromBindingPoint(psResource->eGroup, psResource->ui32BindPoint, &psShader->sInfo, &psBinding))
-        {
-            ASSERT(0);
-            IgnoreResource(psResources, puSize, i);
-        }
-
-        btrunc(resourceName, 0);
-        ConvertToUAVName(resourceName, psShader, psBinding->Name);
-        if (!FindEmbeddedResourceName(&psResource->sName, psContext, resourceName))
-        {
-            IgnoreResource(psResources, puSize, i);
-        }
-    }
-
-    for (i = 0; i < psShader->sInfo.ui32NumUniformBuffers; ++i)
-    {
-        Resource* psResources = psShader->sInfo.asUniformBuffers;
-        uint32_t* puSize = &psShader->sInfo.ui32NumUniformBuffers;
-
-        Resource* psResource = psResources + i;
-        ConstantBuffer* psCB = NULL;
-        GetConstantBufferFromBindingPoint(psResource->eGroup, psResource->ui32BindPoint, &psShader->sInfo, &psCB);
-
-        btrunc(resourceName, 0);
-        ConvertToUniformBufferName(resourceName, psShader, psCB->Name);
-        if (!FindEmbeddedResourceName(&psResource->sName, psContext, resourceName))
-        {
-            IgnoreResource(psResources, puSize, i);
-        }
-    }
-
-    for (i = 0; i < psShader->sInfo.ui32NumStorageBuffers; ++i)
-    {
-        Resource* psResources = psShader->sInfo.asStorageBuffers;
-        uint32_t* puSize = &psShader->sInfo.ui32NumStorageBuffers;
-
-        Resource* psResource = psResources + i;
-        ConstantBuffer* psCB = NULL;
-        GetConstantBufferFromBindingPoint(psResource->eGroup, psResource->ui32BindPoint, &psShader->sInfo, &psCB);
-
-        btrunc(resourceName, 0);
-        if (psResource->eGroup == RGROUP_UAV)
-        {
-            ConvertToUAVName(resourceName, psShader, psCB->Name);
-        }
-        else
-        {
-            ConvertToTextureName(resourceName, psShader, psCB->Name, NULL, 0);
-        }
-        if (!FindEmbeddedResourceName(&psResource->sName, psContext, resourceName))
-        {
-            IgnoreResource(psResources, puSize, i);
-        }
-    }
-
-    bdestroy(resourceName);
-}
-
-GLLang ChooseLanguage(Shader* psShader)
-{
-    // Depends on the HLSL shader model extracted from bytecode.
-    switch (psShader->ui32MajorVersion)
-    {
-    case 5:
-    {
-        return LANG_430;
-    }
-    case 4:
-    {
-        return LANG_330;
-    }
-    default:
-    {
-        return LANG_120;
-    }
-    }
-}
-
-const char* GetVersionString(GLLang language)
-{
-    switch (language)
-    {
-    case LANG_ES_100:
-    {
-        return "#version 100\n";
-        break;
-    }
-    case LANG_ES_300:
-    {
-        return "#version 300 es\n";
-        break;
-    }
-    case LANG_ES_310:
-    {
-        return "#version 310 es\n";
-        break;
-    }
-    case LANG_120:
-    {
-        return "#version 120\n";
-        break;
-    }
-    case LANG_130:
-    {
-        return "#version 130\n";
-        break;
-    }
-    case LANG_140:
-    {
-        return "#version 140\n";
-        break;
-    }
-    case LANG_150:
-    {
-        return "#version 150\n";
-        break;
-    }
-    case LANG_330:
-    {
-        return "#version 330\n";
-        break;
-    }
-    case LANG_400:
-    {
-        return "#version 400\n";
-        break;
-    }
-    case LANG_410:
-    {
-        return "#version 410\n";
-        break;
-    }
-    case LANG_420:
-    {
-        return "#version 420\n";
-        break;
-    }
-    case LANG_430:
-    {
-        return "#version 430\n";
-        break;
-    }
-    case LANG_440:
-    {
-        return "#version 440\n";
-        break;
-    }
-    default:
-    {
-        return "";
-        break;
-    }
-    }
-}
-
-// Force precision of vertex output position to highp.
-// Using mediump or lowp for the position of the vertex can cause rendering artifacts in OpenGL ES.
-void ForcePositionOutputToHighp(Shader* shader)
-{
-    // Only sensible in vertex shaders
-    if (shader->eShaderType != VERTEX_SHADER)
-    {
-        return;
-    }
-
-    // Find the output position declaration
-    Declaration* posDeclaration = NULL;
-    for (uint32_t i = 0; i < shader->ui32DeclCount; ++i)
-    {
-        Declaration* decl = shader->psDecl + i;
-        if (decl->eOpcode == OPCODE_DCL_OUTPUT_SIV)
-        {
-            if (decl->asOperands[0].eSpecialName == NAME_POSITION)
-            {
-                posDeclaration = decl;
-                break;
-            }
-
-            if (decl->asOperands[0].eSpecialName != NAME_UNDEFINED)
-            {
-                continue;
-            }
-
-            // This might be SV_Position (because d3dcompiler is weird). Get signature and check
-            InOutSignature *sig = NULL;
-            GetOutputSignatureFromRegister(decl->asOperands[0].ui32RegisterNumber, decl->asOperands[0].ui32CompMask, 0, &shader->sInfo, &sig);
-            ASSERT(sig != NULL);
-            if ((sig->eSystemValueType == NAME_POSITION || strcmp(sig->SemanticName, "POS") == 0) && sig->ui32SemanticIndex == 0)
-            {
-                sig->eMinPrec = MIN_PRECISION_DEFAULT;
-                posDeclaration = decl;
-                break;
-            }
-        }
-        else if (decl->eOpcode == OPCODE_DCL_OUTPUT)
-        {
-            InOutSignature *sig = NULL;
-            GetOutputSignatureFromRegister(decl->asOperands[0].ui32RegisterNumber, decl->asOperands[0].ui32CompMask, 0, &shader->sInfo, &sig);
-            ASSERT(sig != NULL);
-            if ((sig->eSystemValueType == NAME_POSITION || strcmp(sig->SemanticName, "POS") == 0) && sig->ui32SemanticIndex == 0)
-            {
-                sig->eMinPrec = MIN_PRECISION_DEFAULT;
-                posDeclaration = decl;
-                break;
-            }
-        }
-    }
-
-    // Do nothing if we don't find suitable output. This may well be INTERNALTESSPOS for tessellation etc.
-    if (!posDeclaration)
-    {
-        return;
-    }
-
-    posDeclaration->asOperands[0].eMinPrecision = OPERAND_MIN_PRECISION_DEFAULT;
-    posDeclaration->asOperands[0].eSpecialName = NAME_POSITION;
-    // Go through all the instructions and update the operand.
-    for (uint32_t i = 0; i < shader->ui32InstCount; ++i)
-    {
-        Instruction *inst = shader->psInst + i;
-        for (uint32_t j = 0; j < inst->ui32FirstSrc; ++j)
-        {
-            Operand op = inst->asOperands[j];
-            // Since it's an output declaration we know that there's only one
-            // operand and it's in the first slot.
-            if (op.eType == OPERAND_TYPE_OUTPUT && op.ui32RegisterNumber == posDeclaration->asOperands[0].ui32RegisterNumber)
-            {
-                op.eMinPrecision = OPERAND_MIN_PRECISION_DEFAULT;
-                op.eSpecialName = NAME_POSITION;
-            }
-        }
-    }
-}
-
-void TranslateToGLSL(HLSLCrossCompilerContext* psContext, GLLang* planguage, const GlExtensions* extensions)
-{
-    bstring glsl;
-    uint32_t i;
-    Shader* psShader = psContext->psShader;
-    GLLang language = *planguage;
-    const uint32_t ui32InstCount = psShader->ui32InstCount;
-    const uint32_t ui32DeclCount = psShader->ui32DeclCount;
-
-    psContext->indent = 0;
-
-    if (language == LANG_DEFAULT)
-    {
-        language = ChooseLanguage(psShader);
-        *planguage = language;
-    }
-
-    glsl = bfromcstralloc (1024, "");
-    if (!(psContext->flags & HLSLCC_FLAG_NO_VERSION_STRING))
-    {
-        bcatcstr(glsl, GetVersionString(language));
-    }
-
-    if (psContext->flags & HLSLCC_FLAG_ADD_DEBUG_HEADER)
-    {
-        bstring version = glsl;
-        glsl = psContext->debugHeader;
-        bconcat(glsl, version);
-        bdestroy(version);
-    }
-
-    psContext->glsl = glsl;
-    psContext->earlyMain = bfromcstralloc (1024, "");
-    for (i = 0; i < NUM_PHASES; ++i)
-    {
-        psContext->postShaderCode[i] = bfromcstralloc (1024, "");
-    }
-
-    psContext->currentGLSLString = &glsl;
-    psShader->eTargetLanguage = language;
-    psShader->extensions = (const struct GlExtensions*)extensions;
-    psContext->currentPhase = MAIN_PHASE;
-
-    if (extensions)
-    {
-        if (extensions->ARB_explicit_attrib_location)
-        {
-            bcatcstr(glsl, "#extension GL_ARB_explicit_attrib_location : require\n");
-        }
-        if (extensions->ARB_explicit_uniform_location)
-        {
-            bcatcstr(glsl, "#extension GL_ARB_explicit_uniform_location : require\n");
-        }
-        if (extensions->ARB_shading_language_420pack)
-        {
-            bcatcstr(glsl, "#extension GL_ARB_shading_language_420pack : require\n");
-        }
-    }
-
-    psContext->psShader->sInfo.ui32SymbolsOffset = blength(glsl);
-
-    FRAMEBUFFER_FETCH_TYPE fetchType = CollectGmemInfo(psContext);
-    if (fetchType & FBF_EXT_COLOR)
-    {
-        bcatcstr(glsl, "#extension GL_EXT_shader_framebuffer_fetch : require\n");
-    }
-    if (fetchType & FBF_ARM_COLOR)
-    {
-        bcatcstr(glsl, "#extension GL_ARM_shader_framebuffer_fetch : require\n");
-    }
-    if (fetchType & (FBF_ARM_DEPTH | FBF_ARM_STENCIL))
-    {
-        bcatcstr(glsl, "#extension GL_ARM_shader_framebuffer_fetch_depth_stencil : require\n");
-    }
-    psShader->eGmemType = fetchType;
-
-    AddVersionDependentCode(psContext);
-
-    if (psContext->flags & HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT)
-    {
-        bcatcstr(glsl, "layout(std140) uniform;\n");
-    }
-
-    //Special case. Can have multiple phases.
-    if (psShader->eShaderType == HULL_SHADER)
-    {
-        int haveInstancedForkPhase = 0;
-        uint32_t forkIndex = 0;
-
-        ConsolidateHullTempVars(psShader);
-
-        for (i = 0; i < psShader->ui32HSDeclCount; ++i)
-        {
-            TranslateDeclaration(psContext, psShader->psHSDecl + i);
-        }
-
-        //control
-        psContext->currentPhase = HS_CTRL_POINT_PHASE;
-
-        if (psShader->ui32HSControlPointDeclCount)
-        {
-            bcatcstr(glsl, "//Control point phase declarations\n");
-            for (i = 0; i < psShader->ui32HSControlPointDeclCount; ++i)
-            {
-                TranslateDeclaration(psContext, psShader->psHSControlPointPhaseDecl + i);
-            }
-        }
-
-        if (psShader->ui32HSControlPointInstrCount)
-        {
-            SetDataTypes(psContext, psShader->psHSControlPointPhaseInstr, psShader->ui32HSControlPointInstrCount, NULL);
-
-            bcatcstr(glsl, "void control_point_phase()\n{\n");
-            psContext->indent++;
-
-            for (i = 0; i < psShader->ui32HSControlPointInstrCount; ++i)
-            {
-                TranslateInstruction(psContext, psShader->psHSControlPointPhaseInstr + i);
-            }
-            psContext->indent--;
-            bcatcstr(glsl, "}\n");
-        }
-
-        //fork
-        psContext->currentPhase = HS_FORK_PHASE;
-        for (forkIndex = 0; forkIndex < psShader->ui32ForkPhaseCount; ++forkIndex)
-        {
-            bcatcstr(glsl, "//Fork phase declarations\n");
-            for (i = 0; i < psShader->aui32HSForkDeclCount[forkIndex]; ++i)
-            {
-                TranslateDeclaration(psContext, psShader->apsHSForkPhaseDecl[forkIndex] + i);
-                if (psShader->apsHSForkPhaseDecl[forkIndex][i].eOpcode == OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT)
-                {
-                    haveInstancedForkPhase = 1;
-                }
-            }
-
-            bformata(glsl, "void fork_phase%d()\n{\n", forkIndex);
-            psContext->indent++;
-
-            SetDataTypes(psContext, psShader->apsHSForkPhaseInstr[forkIndex], psShader->aui32HSForkInstrCount[forkIndex] - 1, NULL);
-
-            if (haveInstancedForkPhase)
-            {
-                AddIndentation(psContext);
-                bformata(glsl, "for(int forkInstanceID = 0; forkInstanceID < HullPhase%dInstanceCount; ++forkInstanceID) {\n", forkIndex);
-                psContext->indent++;
-            }
-
-            //The minus one here is remove the return statement at end of phases.
-            //This is needed otherwise the for loop will only run once.
-            ASSERT(psShader->apsHSForkPhaseInstr[forkIndex][psShader->aui32HSForkInstrCount[forkIndex] - 1].eOpcode == OPCODE_RET);
-            for (i = 0; i < psShader->aui32HSForkInstrCount[forkIndex] - 1; ++i)
-            {
-                TranslateInstruction(psContext, psShader->apsHSForkPhaseInstr[forkIndex] + i);
-            }
-
-            if (haveInstancedForkPhase)
-            {
-                psContext->indent--;
-                AddIndentation(psContext);
-                bcatcstr(glsl, "}\n");
-
-                if (psContext->havePostShaderCode[psContext->currentPhase])
-                {
-#ifdef _DEBUG
-                    AddIndentation(psContext);
-                    bcatcstr(glsl, "//--- Post shader code ---\n");
-#endif
-                    bconcat(glsl, psContext->postShaderCode[psContext->currentPhase]);
-#ifdef _DEBUG
-                    AddIndentation(psContext);
-                    bcatcstr(glsl, "//--- End post shader code ---\n");
-#endif
-                }
-            }
-
-            psContext->indent--;
-            bcatcstr(glsl, "}\n");
-        }
-
-
-        //join
-        psContext->currentPhase = HS_JOIN_PHASE;
-        if (psShader->ui32HSJoinDeclCount)
-        {
-            bcatcstr(glsl, "//Join phase declarations\n");
-            for (i = 0; i < psShader->ui32HSJoinDeclCount; ++i)
-            {
-                TranslateDeclaration(psContext, psShader->psHSJoinPhaseDecl + i);
-            }
-        }
-
-        if (psShader->ui32HSJoinInstrCount)
-        {
-            SetDataTypes(psContext, psShader->psHSJoinPhaseInstr, psShader->ui32HSJoinInstrCount, NULL);
-
-            bcatcstr(glsl, "void join_phase()\n{\n");
-            psContext->indent++;
-
-            for (i = 0; i < psShader->ui32HSJoinInstrCount; ++i)
-            {
-                TranslateInstruction(psContext, psShader->psHSJoinPhaseInstr + i);
-            }
-
-            psContext->indent--;
-            bcatcstr(glsl, "}\n");
-        }
-
-        bcatcstr(glsl, "void main()\n{\n");
-
-        psContext->indent++;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//--- Start Early Main ---\n");
-#endif
-        bconcat(glsl, psContext->earlyMain);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//--- End Early Main ---\n");
-#endif
-
-        if (psShader->ui32HSControlPointInstrCount)
-        {
-            AddIndentation(psContext);
-            bcatcstr(glsl, "control_point_phase();\n");
-
-            if (psShader->ui32ForkPhaseCount || psShader->ui32HSJoinInstrCount)
-            {
-                AddIndentation(psContext);
-                bcatcstr(glsl, "barrier();\n");
-            }
-        }
-        for (forkIndex = 0; forkIndex < psShader->ui32ForkPhaseCount; ++forkIndex)
-        {
-            AddIndentation(psContext);
-            bformata(glsl, "fork_phase%d();\n", forkIndex);
-
-            if (psShader->ui32HSJoinInstrCount || (forkIndex + 1 < psShader->ui32ForkPhaseCount))
-            {
-                AddIndentation(psContext);
-                bcatcstr(glsl, "barrier();\n");
-            }
-        }
-        if (psShader->ui32HSJoinInstrCount)
-        {
-            AddIndentation(psContext);
-            bcatcstr(glsl, "join_phase();\n");
-        }
-
-        psContext->indent--;
-
-        bcatcstr(glsl, "}\n");
-
-        return;
-    }
-
-    if (psShader->eShaderType == DOMAIN_SHADER)
-    {
-        uint32_t ui32TessOutPrimImp = AddImport(psContext, SYMBOL_TESSELLATOR_OUTPUT_PRIMITIVE, 0, (uint32_t)TESSELLATOR_OUTPUT_TRIANGLE_CCW);
-        uint32_t ui32TessPartitioningImp = AddImport(psContext, SYMBOL_TESSELLATOR_PARTITIONING, 0, (uint32_t)TESSELLATOR_PARTITIONING_INTEGER);
-
-        bformata(glsl, "#if IMPORT_%d == %d\n", ui32TessOutPrimImp, (uint32_t)TESSELLATOR_OUTPUT_POINT);
-        bcatcstr(glsl, "layout(point_mode) in;\n");
-        bformata(glsl, "#elif IMPORT_%d == %d\n", ui32TessOutPrimImp, (uint32_t)TESSELLATOR_OUTPUT_LINE);
-        bcatcstr(glsl, "layout(isolines) in;\n");
-        bformata(glsl, "#elif IMPORT_%d == %d\n", ui32TessOutPrimImp, (uint32_t)TESSELLATOR_OUTPUT_TRIANGLE_CW);
-        bcatcstr(glsl, "layout(cw) in;\n");
-        bcatcstr(glsl, "#endif\n");
-
-        bformata(glsl, "#if IMPORT_%d == %d\n", ui32TessPartitioningImp, (uint32_t)TESSELLATOR_PARTITIONING_FRACTIONAL_ODD);
-        bcatcstr(glsl, "layout(fractional_odd_spacing) in;\n");
-        bformata(glsl, "#elif IMPORT_%d == %d\n", ui32TessPartitioningImp, (uint32_t)TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN);
-        bcatcstr(glsl, "layout(fractional_even_spacing) in;\n");
-        bcatcstr(glsl, "#endif\n");
-    }
-
-    for (i = 0; i < ui32DeclCount; ++i)
-    {
-        TranslateDeclaration(psContext, psShader->psDecl + i);
-    }
-
-    if (psContext->psShader->ui32NumDx9ImmConst)
-    {
-        bformata(psContext->glsl, "vec4 ImmConstArray [%d];\n", psContext->psShader->ui32NumDx9ImmConst);
-    }
-
-    MarkIntegerImmediates(psContext);
-
-    SetDataTypes(psContext, psShader->psInst, ui32InstCount, psContext->psShader->aeCommonTempVecType);
-
-    if (psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING)
-    {
-        for (i = 0; i < MAX_TEMP_VEC4; ++i)
-        {
-            switch (psShader->aeCommonTempVecType[i])
-            {
-            case SVT_VOID:
-                psShader->aeCommonTempVecType[i] = SVT_FLOAT;
-            case SVT_FLOAT:
-            case SVT_FLOAT10:
-            case SVT_FLOAT16:
-            case SVT_UINT:
-            case SVT_UINT8:
-            case SVT_UINT16:
-            case SVT_INT:
-            case SVT_INT12:
-            case SVT_INT16:
-                bformata(psContext->glsl, "%s Temp%d", GetConstructorForTypeGLSL(psContext, psShader->aeCommonTempVecType[i], 4, true), i);
-                break;
-            case SVT_FORCE_DWORD:
-                // temp register not used
-                continue;
-            default:
-                continue;
-            }
-
-            if (psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND)
-            {
-                bformata(psContext->glsl, "[1]");
-            }
-            bformata(psContext->glsl, ";\n");
-        }
-
-        if (psContext->psShader->bUseTempCopy)
-        {
-            bcatcstr(psContext->glsl, "vec4 TempCopy;\n");
-            bcatcstr(psContext->glsl, "uvec4 TempCopy_uint;\n");
-            bcatcstr(psContext->glsl, "ivec4 TempCopy_int;\n");
-        }
-    }
-
-    // Declare auxiliary variables used to save intermediate results to bypass driver issues
-    SHADER_VARIABLE_TYPE auxVarType = SVT_UINT;
-    bformata(psContext->glsl, "highp %s %s1;\n", GetConstructorForTypeGLSL(psContext, auxVarType, 4, false), GetAuxArgumentName(auxVarType));
-
-    if (psContext->flags & HLSLCC_FLAG_TRACING_INSTRUMENTATION)
-    {
-        CreateTracingInfo(psShader);
-        WriteTraceDeclarations(psContext);
-    }
-
-    bcatcstr(glsl, "void main()\n{\n");
-
-    psContext->indent++;
-
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bcatcstr(glsl, "//--- Start Early Main ---\n");
-#endif
-    bconcat(glsl, psContext->earlyMain);
-    if (psContext->flags & HLSLCC_FLAG_TRACING_INSTRUMENTATION)
-    {
-        WritePreStepsTrace(psContext, psShader->sInfo.psTraceSteps);
-    }
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bcatcstr(glsl, "//--- End Early Main ---\n");
-#endif
-
-    for (i = 0; i < ui32InstCount; ++i)
-    {
-        TranslateInstruction(psContext, psShader->psInst + i);
-
-        if (psContext->flags & HLSLCC_FLAG_TRACING_INSTRUMENTATION)
-        {
-            WritePostStepTrace(psContext, i);
-        }
-    }
-
-    psContext->indent--;
-
-    bcatcstr(glsl, "}\n");
-
-    // Add exports
-    if (psShader->eShaderType == PIXEL_SHADER)
-    {
-        uint32_t ui32Input;
-        for (ui32Input = 0; ui32Input < MAX_SHADER_VEC4_INPUT; ++ui32Input)
-        {
-            INTERPOLATION_MODE eMode = psShader->sInfo.aePixelInputInterpolation[ui32Input];
-            if (eMode != INTERPOLATION_LINEAR)
-            {
-                AddExport(psContext, SYMBOL_INPUT_INTERPOLATION_MODE, ui32Input, (uint32_t)eMode);
-            }
-        }
-    }
-    if (psShader->eShaderType == HULL_SHADER)
-    {
-        AddExport(psContext, SYMBOL_TESSELLATOR_PARTITIONING, 0, psShader->sInfo.eTessPartitioning);
-        AddExport(psContext, SYMBOL_TESSELLATOR_OUTPUT_PRIMITIVE, 0, psShader->sInfo.eTessOutPrim);
-    }
-
-    FillInResourceDescriptions(psContext);
-}
-
-static void FreeSubOperands(Instruction* psInst, const uint32_t ui32NumInsts)
-{
-    uint32_t ui32Inst;
-    for (ui32Inst = 0; ui32Inst < ui32NumInsts; ++ui32Inst)
-    {
-        Instruction* psCurrentInst = &psInst[ui32Inst];
-        const uint32_t ui32NumOperands = psCurrentInst->ui32NumOperands;
-        uint32_t ui32Operand;
-
-        for (ui32Operand = 0; ui32Operand < ui32NumOperands; ++ui32Operand)
-        {
-            uint32_t ui32SubOperand;
-            for (ui32SubOperand = 0; ui32SubOperand < MAX_SUB_OPERANDS; ++ui32SubOperand)
-            {
-                if (psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand])
-                {
-                    hlslcc_free(psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand]);
-                    psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand] = NULL;
-                }
-            }
-        }
-    }
-}
-
-void RemoveDoubleUnderscores(char* szName)
-{
-    char* position;
-    size_t length;
-    length = strlen(szName);
-    position = szName;
-    position = strstr(position, "__");
-    while (position)
-    {
-        position[1] = '0';
-        position += 2;
-        position = strstr(position, "__");
-    }
-}
-
-void RemoveDoubleUnderscoresFromIdentifiers(Shader* psShader)
-{
-    uint32_t i, j;
-    for (i = 0; i < psShader->sInfo.ui32NumConstantBuffers; ++i)
-    {
-        for (j = 0; j < psShader->sInfo.psConstantBuffers[i].ui32NumVars; ++j)
-        {
-            RemoveDoubleUnderscores(psShader->sInfo.psConstantBuffers[i].asVars[j].sType.Name);
-        }
-    }
-}
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromMem(const char* shader, size_t size, unsigned int flags, GLLang language, const GlExtensions* extensions, GLSLShader* result)
-{
-    uint32_t* tokens;
-    Shader* psShader;
-    char* glslcstr = NULL;
-    int GLSLShaderType = GL_FRAGMENT_SHADER_ARB;
-    int success = 0;
-    uint32_t i;
-
-    tokens = (uint32_t*)shader;
-
-    psShader = DecodeDXBC(tokens);
-
-    if (flags & (HLSLCC_FLAG_HASH_INPUT | HLSLCC_FLAG_ADD_DEBUG_HEADER))
-    {
-        uint64_t ui64InputHash = hash64((const uint8_t*)tokens, tokens[6], 0);
-        psShader->sInfo.ui32InputHash = (uint32_t)ui64InputHash ^ (uint32_t)(ui64InputHash >> 32);
-    }
-
-    RemoveDoubleUnderscoresFromIdentifiers(psShader);
-
-    if (psShader)
-    {
-        ForcePositionOutputToHighp(psShader);
-        HLSLCrossCompilerContext sContext;
-
-        sContext.psShader = psShader;
-        sContext.flags = flags;
-
-        for (i = 0; i < NUM_PHASES; ++i)
-        {
-            sContext.havePostShaderCode[i] = 0;
-        }
-
-        if (flags & HLSLCC_FLAG_ADD_DEBUG_HEADER)
-        {
-#if defined(_WIN32) && !defined(PORTABLE)
-            ID3DBlob* pDisassembly = NULL;
-#endif //defined(_WIN32) && !defined(PORTABLE)
-
-            sContext.debugHeader = bformat("// HASH = 0x%08X\n", psShader->sInfo.ui32InputHash);
-
-#if defined(_WIN32) && !defined(PORTABLE)
-            D3DDisassemble(shader, size, 0, "", &pDisassembly);
-            bcatcstr(sContext.debugHeader, "/*\n");
-            bcatcstr(sContext.debugHeader, (const char*)pDisassembly->lpVtbl->GetBufferPointer(pDisassembly));
-            bcatcstr(sContext.debugHeader, "\n*/\n");
-            pDisassembly->lpVtbl->Release(pDisassembly);
-#endif //defined(_WIN32) && !defined(PORTABLE)
-        }
-
-        TranslateToGLSL(&sContext, &language, extensions);
-
-        switch (psShader->eShaderType)
-        {
-        case VERTEX_SHADER:
-        {
-            GLSLShaderType = GL_VERTEX_SHADER_ARB;
-            break;
-        }
-        case GEOMETRY_SHADER:
-        {
-            GLSLShaderType = GL_GEOMETRY_SHADER;
-            break;
-        }
-        case DOMAIN_SHADER:
-        {
-            GLSLShaderType = GL_TESS_EVALUATION_SHADER;
-            break;
-        }
-        case HULL_SHADER:
-        {
-            GLSLShaderType = GL_TESS_CONTROL_SHADER;
-            break;
-        }
-        case COMPUTE_SHADER:
-        {
-            GLSLShaderType = GL_COMPUTE_SHADER;
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-
-        glslcstr = bstr2cstr(sContext.glsl, '\0');
-
-        bdestroy(sContext.glsl);
-        bdestroy(sContext.earlyMain);
-        for (i = 0; i < NUM_PHASES; ++i)
-        {
-            bdestroy(sContext.postShaderCode[i]);
-        }
-
-        hlslcc_free(psShader->psHSControlPointPhaseDecl);
-        FreeSubOperands(psShader->psHSControlPointPhaseInstr, psShader->ui32HSControlPointInstrCount);
-        hlslcc_free(psShader->psHSControlPointPhaseInstr);
-
-        for (i = 0; i < psShader->ui32ForkPhaseCount; ++i)
-        {
-            hlslcc_free(psShader->apsHSForkPhaseDecl[i]);
-            FreeSubOperands(psShader->apsHSForkPhaseInstr[i], psShader->aui32HSForkInstrCount[i]);
-            hlslcc_free(psShader->apsHSForkPhaseInstr[i]);
-        }
-        hlslcc_free(psShader->psHSJoinPhaseDecl);
-        FreeSubOperands(psShader->psHSJoinPhaseInstr, psShader->ui32HSJoinInstrCount);
-        hlslcc_free(psShader->psHSJoinPhaseInstr);
-
-        hlslcc_free(psShader->psDecl);
-        FreeSubOperands(psShader->psInst, psShader->ui32InstCount);
-        hlslcc_free(psShader->psInst);
-
-        memcpy(&result->reflection, &psShader->sInfo, sizeof(psShader->sInfo));
-
-
-        hlslcc_free(psShader);
-
-        success = 1;
-    }
-
-    shader = 0;
-    tokens = 0;
-
-    /* Fill in the result struct */
-
-    result->shaderType = GLSLShaderType;
-    result->sourceCode = glslcstr;
-    result->GLSLLanguage = language;
-
-    return success;
-}
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromFile(const char* filename, unsigned int flags, GLLang language, const GlExtensions* extensions, GLSLShader* result)
-{
-    FILE* shaderFile;
-    int length;
-    size_t readLength;
-    char* shader;
-    int success = 0;
-
-    shaderFile = fopen(filename, "rb");
-
-    if (!shaderFile)
-    {
-        return 0;
-    }
-
-    fseek(shaderFile, 0, SEEK_END);
-    length = ftell(shaderFile);
-    fseek(shaderFile, 0, SEEK_SET);
-
-    shader = (char*)hlslcc_malloc(length + 1);
-
-    readLength = fread(shader, 1, length, shaderFile);
-
-    fclose(shaderFile);
-    shaderFile = 0;
-
-    shader[readLength] = '\0';
-
-    success = TranslateHLSLFromMem(shader, readLength, flags, language, extensions, result);
-
-    hlslcc_free(shader);
-
-    return success;
-}
-
-HLSLCC_API void HLSLCC_APIENTRY FreeGLSLShader(GLSLShader* s)
-{
-    bcstrfree(s->sourceCode);
-    s->sourceCode = NULL;
-    FreeShaderInfo(&s->reflection);
-}
-
diff --git a/Code/Tools/HLSLCrossCompiler/src/toGLSLDeclaration.c b/Code/Tools/HLSLCrossCompiler/src/toGLSLDeclaration.c
deleted file mode 100644
index 3f08f2ab3d..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/toGLSLDeclaration.c
+++ /dev/null
@@ -1,2908 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "hlslcc.h"
-#include "internal_includes/toGLSLDeclaration.h"
-#include "internal_includes/toGLSLOperand.h"
-#include "internal_includes/languages.h"
-#include "internal_includes/hlslccToolkit.h"
-#include "bstrlib.h"
-#include "internal_includes/debug.h"
-#include <math.h>
-#include <float.h>
-#include <stdbool.h>
-
-#if !defined(isnan)
-#ifdef _MSC_VER
-#define isnan(x) _isnan(x)
-#define isinf(x) (!_finite(x))
-#endif
-#endif
-
-#define fpcheck(x) (isnan(x) || isinf(x))
-
-typedef enum
-{
-    GLVARTYPE_FLOAT,
-    GLVARTYPE_INT,
-    GLVARTYPE_FLOAT4,
-} GLVARTYPE;
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-extern uint32_t AddImport(HLSLCrossCompilerContext* psContext, SYMBOL_TYPE eType, uint32_t ui32ID, uint32_t ui32Default);
-extern uint32_t AddExport(HLSLCrossCompilerContext* psContext, SYMBOL_TYPE eType, uint32_t ui32ID, uint32_t ui32Value);
-
-const char* GetTypeString(GLVARTYPE eType)
-{
-    switch (eType)
-    {
-    case GLVARTYPE_FLOAT:
-    {
-        return "float";
-    }
-    case GLVARTYPE_INT:
-    {
-        return "int";
-    }
-    case GLVARTYPE_FLOAT4:
-    {
-        return "vec4";
-    }
-    default:
-    {
-        return "";
-    }
-    }
-}
-const uint32_t GetTypeElementCount(GLVARTYPE eType)
-{
-    switch (eType)
-    {
-    case GLVARTYPE_FLOAT:
-    case GLVARTYPE_INT:
-    {
-        return 1;
-    }
-    case GLVARTYPE_FLOAT4:
-    {
-        return 4;
-    }
-    default:
-    {
-        return 0;
-    }
-    }
-}
-
-void GetSTD140Layout(ShaderVarType* pType, uint32_t* puAlignment, uint32_t* puSize)
-{
-    *puSize = 0;
-    *puAlignment = 1;
-    switch (pType->Type)
-    {
-    case SVT_BOOL:
-    case SVT_UINT:
-    case SVT_UINT8:
-    case SVT_UINT16:
-    case SVT_INT:
-    case SVT_INT12:
-    case SVT_INT16:
-    case SVT_FLOAT:
-    case SVT_FLOAT10:
-    case SVT_FLOAT16:
-        *puSize = 4;
-        *puAlignment = 4;
-        break;
-    case SVT_DOUBLE:
-        *puSize = 8;
-        *puAlignment = 4;
-        break;
-    case SVT_VOID:
-        break;
-    default:
-        ASSERT(0);
-        break;
-    }
-    switch (pType->Class)
-    {
-    case SVC_SCALAR:
-        break;
-    case SVC_MATRIX_ROWS:
-    case SVC_MATRIX_COLUMNS:
-        // Matrices are translated to arrays of vectors
-        *puSize *= pType->Rows;
-    case SVC_VECTOR:
-        switch (pType->Columns)
-        {
-        case 2:
-            *puSize *= 2;
-            *puAlignment *= 2;
-            break;
-        case 3:
-        case 4:
-            *puSize *= 4;
-            *puAlignment *= 4;
-            break;
-        }
-        break;
-    case SVC_STRUCT:
-    {
-        uint32_t uMember;
-        for (uMember = 0; uMember < pType->MemberCount; ++uMember)
-        {
-            uint32_t uMemberAlignment, uMemberSize;
-            *puSize += pType->Members[uMember].Offset;
-            GetSTD140Layout(pType->Members + uMember, &uMemberAlignment, &uMemberSize);
-            *puSize += uMemberAlignment - 1;
-            *puSize -= *puSize % uMemberAlignment;
-            *puAlignment = *puAlignment > uMemberAlignment ? *puAlignment : uMemberAlignment;
-        }
-    }
-    break;
-    default:
-        ASSERT(0);
-        break;
-    }
-
-    if (pType->Elements > 1)
-    {
-        *puSize *= pType->Elements;
-    }
-
-    if (pType->Elements > 1 || pType->Class == SVC_MATRIX_ROWS || pType->Class == SVC_MATRIX_COLUMNS)
-    {
-        *puAlignment = (*puAlignment + 0x0000000F) & 0xFFFFFFF0;
-    }
-}
-
-void AddToDx9ImmConstIndexableArray(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    bstring* savedStringPtr = psContext->currentGLSLString;
-
-    psContext->currentGLSLString = &psContext->earlyMain;
-    psContext->indent++;
-    AddIndentation(psContext);
-    psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber] = psContext->psShader->ui32NumDx9ImmConst;
-    bformata(psContext->earlyMain, "ImmConstArray[%d] = ", psContext->psShader->ui32NumDx9ImmConst);
-    TranslateOperand(psContext, psOperand, TO_FLAG_NONE);
-    bcatcstr(psContext->earlyMain, ";\n");
-    psContext->indent--;
-    psContext->psShader->ui32NumDx9ImmConst++;
-
-    psContext->currentGLSLString = savedStringPtr;
-}
-
-void DeclareConstBufferShaderVariable(HLSLCrossCompilerContext* psContext, const char* Name, const struct ShaderVarType_TAG* psType, int unsizedArray)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    if (psType->Class == SVC_STRUCT)
-    {
-        bcatcstr(glsl, "\t");
-        ShaderVarName(glsl, psContext->psShader, Name);
-        bcatcstr(glsl, "_Type ");
-        ShaderVarName(glsl, psContext->psShader, Name);
-        if (psType->Elements > 1)
-        {
-            bformata(glsl, "[%d]", psType->Elements);
-        }
-    }
-    else if (psType->Class == SVC_MATRIX_COLUMNS || psType->Class == SVC_MATRIX_ROWS)
-    {
-        switch (psType->Type)
-        {
-        case SVT_FLOAT:
-        {
-            bformata(glsl, "\tvec%d ", psType->Columns);
-            ShaderVarName(glsl, psContext->psShader, Name);
-            bformata(glsl, "[%d", psType->Rows);
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-        }
-        if (psType->Elements > 1)
-        {
-            bformata(glsl, " * %d", psType->Elements);
-        }
-        bformata(glsl, "]");
-    }
-    else
-    if (psType->Class == SVC_VECTOR)
-    {
-        switch (psType->Type)
-        {
-        default:
-            ASSERT(0);
-        case SVT_FLOAT:
-        case SVT_FLOAT10:
-        case SVT_FLOAT16:
-        case SVT_UINT:
-        case SVT_UINT8:
-        case SVT_UINT16:
-        case SVT_INT:
-        case SVT_INT12:
-        case SVT_INT16:
-            bformata(glsl, "\t%s ", GetConstructorForTypeGLSL(psContext, psType->Type, psType->Columns, true));
-            break;
-        case SVT_DOUBLE:
-            bformata(glsl, "\tdvec%d ", psType->Columns);
-            break;
-        }
-
-        ShaderVarName(glsl, psContext->psShader, Name);
-
-        if (psType->Elements > 1)
-        {
-            bformata(glsl, "[%d]", psType->Elements);
-        }
-    }
-    else
-    if (psType->Class == SVC_SCALAR)
-    {
-        switch (psType->Type)
-        {
-        default:
-            ASSERT(0);
-        case SVT_FLOAT:
-        case SVT_FLOAT10:
-        case SVT_FLOAT16:
-        case SVT_UINT:
-        case SVT_UINT8:
-        case SVT_UINT16:
-        case SVT_INT:
-        case SVT_INT12:
-        case SVT_INT16:
-            bformata(glsl, "\t%s ", GetConstructorForTypeGLSL(psContext, psType->Type, 1, true));
-            break;
-        case SVT_DOUBLE:
-            bformata(glsl, "\tdouble ");
-            break;
-        case SVT_BOOL:
-            //Use int instead of bool.
-            //Allows implicit conversions to integer and
-            //bool consumes 4-bytes in HLSL and GLSL anyway.
-            bformata(glsl, "\tint ");
-            break;
-        }
-
-        ShaderVarName(glsl, psContext->psShader, Name);
-
-        if (psType->Elements > 1)
-        {
-            bformata(glsl, "[%d]", psType->Elements);
-        }
-    }
-    if (unsizedArray)
-    {
-        bformata(glsl, "[]");
-    }
-    bformata(glsl, ";\n");
-}
-
-//In GLSL embedded structure definitions are not supported.
-void PreDeclareStructType(HLSLCrossCompilerContext* psContext, const char* Name, const struct ShaderVarType_TAG* psType)
-{
-    uint32_t i;
-    bstring glsl = *psContext->currentGLSLString;
-
-    for (i = 0; i < psType->MemberCount; ++i)
-    {
-        if (psType->Members[i].Class == SVC_STRUCT)
-        {
-            PreDeclareStructType(psContext, psType->Members[i].Name, &psType->Members[i]);
-        }
-    }
-
-    if (psType->Class == SVC_STRUCT)
-    {
-#if !defined(NDEBUG)
-        uint32_t unnamed_struct = strcmp(Name, "$Element") == 0 ? 1 : 0;
-#endif
-        //Not supported at the moment
-        ASSERT(!unnamed_struct);
-
-        bcatcstr(glsl, "struct ");
-        ShaderVarName(glsl, psContext->psShader, Name);
-        bcatcstr(glsl, "_Type {\n");
-
-        for (i = 0; i < psType->MemberCount; ++i)
-        {
-            ASSERT(psType->Members != 0);
-
-            DeclareConstBufferShaderVariable(psContext, psType->Members[i].Name, &psType->Members[i], 0);
-        }
-
-        bformata(glsl, "};\n");
-    }
-}
-
-void DeclarePLSStructVars(HLSLCrossCompilerContext* psContext, const char* Name, const struct ShaderVarType_TAG* psType)
-{
-    (void)Name;
-
-    uint32_t i;
-    bstring glsl = *psContext->currentGLSLString;
-
-    ASSERT(psType->Members != 0);
-
-    for (i = 0; i < psType->MemberCount; ++i)
-    {
-        if (psType->Members[i].Class == SVC_STRUCT)
-        {
-            ASSERT(0); // PLS can't have nested structs
-        }
-    }
-
-    if (psType->Class == SVC_STRUCT)
-    {
-        for (i = 0; i < psType->MemberCount; ++i)
-        {
-            ShaderVarType cur_member = psType->Members[i];
-
-            if (cur_member.Class == SVC_VECTOR)
-            {
-                switch (cur_member.Type)
-                {
-                case SVT_FLOAT:
-                {
-                    // float2 -> rg16f
-                    if (2 == cur_member.Columns)
-                    {
-                        bcatcstr(glsl, "\tlayout(rg16f) highp vec2 ");
-                    }
-                    // float3 -> r11f_g11f_b10f
-                    else if (3 == cur_member.Columns)
-                    {
-                        bcatcstr(glsl, "\tlayout(r11f_g11f_b10f) highp vec3 ");
-                    }
-                    // float4 -> rgba8
-                    else if (4 == cur_member.Columns)
-                    {
-                        bcatcstr(glsl, "\tlayout(rgba8) highp vec4 ");
-                    }
-                    else
-                    {
-                        ASSERT(0); // not supported
-                    }
-                    break;
-                }
-                case SVT_INT:
-                {
-                    // int2 -> rg16i
-                    if (2 == cur_member.Columns)
-                    {
-                        bcatcstr(glsl, "\tlayout(rg16i) highp ivec2 ");
-                    }
-                    // int4 -> rgba8i
-                    else if (4 == cur_member.Columns)
-                    {
-                        bcatcstr(glsl, "\tlayout(rgba8i) highp ivec4 ");
-                    }
-                    else
-                    {
-                        ASSERT(0); // not supported
-                    }
-                    break;
-                }
-                case SVT_UINT:
-                case SVT_DOUBLE:
-                default:
-                    ASSERT(0);
-                }
-
-                if (cur_member.Elements > 1)
-                {
-                    ASSERT(0); // PLS can't have arrays
-                }
-            }
-            else if (cur_member.Class == SVC_SCALAR)
-            {
-                switch (cur_member.Type)
-                {
-                case SVT_UINT:
-                    bcatcstr(glsl, "\tlayout(r32ui) highp uint ");
-                    break;
-                case SVT_FLOAT:
-                case SVT_INT:
-                case SVT_DOUBLE:
-                case SVT_BOOL:
-                default:
-                    ASSERT(0);
-                }
-            }
-
-            ShaderVarName(glsl, psContext->psShader, cur_member.Name);
-            bcatcstr(glsl, ";\n");
-        }
-    }
-    else
-    {
-        ASSERT(0);
-    }
-}
-
-char* GetDeclaredInputName(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand)
-{
-    bstring inputName;
-    char* cstr;
-    InOutSignature* psIn;
-
-    if (eShaderType == GEOMETRY_SHADER)
-    {
-        inputName = bformat("VtxOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if (eShaderType == HULL_SHADER)
-    {
-        inputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if (eShaderType == DOMAIN_SHADER)
-    {
-        inputName = bformat("HullOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if (eShaderType == PIXEL_SHADER)
-    {
-        if (psContext->flags & HLSLCC_FLAG_TESS_ENABLED)
-        {
-            inputName = bformat("DomOutput%d", psOperand->ui32RegisterNumber);
-        }
-        else
-        {
-            inputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-        }
-    }
-    else
-    {
-        ASSERT(eShaderType == VERTEX_SHADER);
-        inputName = bformat("dcl_Input%d", psOperand->ui32RegisterNumber);
-    }
-    if ((psContext->flags & HLSLCC_FLAG_INOUT_SEMANTIC_NAMES) && GetInputSignatureFromRegister(psOperand->ui32RegisterNumber, &psContext->psShader->sInfo, &psIn))
-    {
-        bformata(inputName, "_%s%d", psIn->SemanticName, psIn->ui32SemanticIndex);
-    }
-
-    cstr = bstr2cstr(inputName, '\0');
-    bdestroy(inputName);
-    return cstr;
-}
-
-char* GetDeclaredOutputName(const HLSLCrossCompilerContext* psContext,
-    const SHADER_TYPE eShaderType,
-    const Operand* psOperand,
-    int* piStream)
-{
-    bstring outputName;
-    char* cstr;
-    InOutSignature* psOut;
-
-    int foundOutput = GetOutputSignatureFromRegister(psOperand->ui32RegisterNumber,
-            psOperand->ui32CompMask,
-            psContext->psShader->ui32CurrentVertexOutputStream,
-            &psContext->psShader->sInfo,
-            &psOut);
-
-    (void)(foundOutput);
-    ASSERT(foundOutput);
-
-    if (eShaderType == GEOMETRY_SHADER)
-    {
-        if (psOut->ui32Stream != 0)
-        {
-            outputName = bformat("VtxGeoOutput%d_S%d", psOperand->ui32RegisterNumber, psOut->ui32Stream);
-            piStream[0] = psOut->ui32Stream;
-        }
-        else
-        {
-            outputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-        }
-    }
-    else if (eShaderType == DOMAIN_SHADER)
-    {
-        outputName = bformat("DomOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if (eShaderType == VERTEX_SHADER)
-    {
-        if (psContext->flags & HLSLCC_FLAG_GS_ENABLED)
-        {
-            outputName = bformat("VtxOutput%d", psOperand->ui32RegisterNumber);
-        }
-        else
-        {
-            outputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-        }
-    }
-    else if (eShaderType == PIXEL_SHADER)
-    {
-        outputName = bformat("PixOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else
-    {
-        ASSERT(eShaderType == HULL_SHADER);
-        outputName = bformat("HullOutput%d", psOperand->ui32RegisterNumber);
-    }
-    if (psContext->flags & HLSLCC_FLAG_INOUT_SEMANTIC_NAMES)
-    {
-        bformata(outputName, "_%s%d", psOut->SemanticName, psOut->ui32SemanticIndex);
-    }
-
-    cstr = bstr2cstr(outputName, '\0');
-    bdestroy(outputName);
-    return cstr;
-}
-static void DeclareInput(
-    HLSLCrossCompilerContext* psContext,
-    const Declaration* psDecl,
-    const char* Interpolation, const char* StorageQualifier, const char* Precision, int iNumComponents, OPERAND_INDEX_DIMENSION eIndexDim, const char* InputName)
-{
-    Shader* psShader = psContext->psShader;
-    bstring glsl = *psContext->currentGLSLString;
-
-    // This falls within the specified index ranges. The default is 0 if no input range is specified
-    if (psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] == -1)
-    {
-        return;
-    }
-
-    if (psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == 0)
-    {
-        const char* vecType = "vec";
-        const char* scalarType = "float";
-        InOutSignature* psSignature = NULL;
-
-        if (GetInputSignatureFromRegister(psDecl->asOperands[0].ui32RegisterNumber, &psShader->sInfo, &psSignature))
-        {
-            switch (psSignature->eComponentType)
-            {
-            case INOUT_COMPONENT_UINT32:
-            {
-                vecType = "uvec";
-                scalarType = "uint";
-                break;
-            }
-            case INOUT_COMPONENT_SINT32:
-            {
-                vecType = "ivec";
-                scalarType = "int";
-                break;
-            }
-            case INOUT_COMPONENT_FLOAT32:
-            {
-                break;
-            }
-            }
-        }
-
-        if (psShader->eShaderType == PIXEL_SHADER)
-        {
-            psShader->sInfo.aePixelInputInterpolation[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->value.eInterpolation;
-        }
-
-        if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) ||
-            (psShader->eShaderType == VERTEX_SHADER && HaveLimitedInOutLocationQualifier(psContext->psShader->eTargetLanguage)))
-        {
-            bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-        }
-
-        switch (eIndexDim)
-        {
-        case INDEX_2D:
-        {
-            if (iNumComponents == 1)
-            {
-                const uint32_t arraySize = psDecl->asOperands[0].aui32ArraySizes[0];
-
-                psContext->psShader->abScalarInput[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-
-                bformata(glsl, "%s %s %s %s [%d];\n", StorageQualifier, Precision, scalarType, InputName, arraySize);
-
-                bformata(glsl, "%s1 Input%d;\n", vecType, psDecl->asOperands[0].ui32RegisterNumber);
-
-                psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = arraySize;
-            }
-            else
-            {
-                bformata(glsl, "%s %s %s%d %s [%d];\n", StorageQualifier, Precision, vecType, iNumComponents, InputName, psDecl->asOperands[0].aui32ArraySizes[0]);
-
-                bformata(glsl, "%s %s%d Input%d[%d];\n", Precision, vecType, iNumComponents, psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].aui32ArraySizes[0]);
-
-                psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->asOperands[0].aui32ArraySizes[0];
-            }
-            break;
-        }
-        default:
-        {
-            if (psDecl->asOperands[0].eType == OPERAND_TYPE_SPECIAL_TEXCOORD)
-            {
-                InputName = "TexCoord";
-            }
-
-            if (iNumComponents == 1)
-            {
-                psContext->psShader->abScalarInput[psDecl->asOperands[0].ui32RegisterNumber] = 1;
-
-                bformata(glsl, "%s %s %s %s %s;\n", Interpolation, StorageQualifier, Precision, scalarType, InputName);
-                bformata(glsl, "%s1 Input%d;\n", vecType, psDecl->asOperands[0].ui32RegisterNumber);
-
-                psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-            }
-            else
-            {
-                if (psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] > 0)
-                {
-                    bformata(glsl, "%s %s %s %s%d %s", Interpolation, StorageQualifier, Precision, vecType, iNumComponents, InputName);
-                    bformata(glsl, "[%d];\n", psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber]);
-
-                    bformata(glsl, "%s %s%d Input%d[%d];\n", Precision, vecType, iNumComponents, psDecl->asOperands[0].ui32RegisterNumber, psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber]);
-
-                    psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber];
-                }
-                else
-                {
-                    bformata(glsl, "%s %s %s %s%d %s;\n", Interpolation, StorageQualifier, Precision, vecType, iNumComponents, InputName);
-                    bformata(glsl, "%s %s%d Input%d;\n", Precision, vecType, iNumComponents, psDecl->asOperands[0].ui32RegisterNumber);
-
-                    psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-                }
-            }
-            break;
-        }
-        }
-    }
-
-    if (psShader->abInputReferencedByInstruction[psDecl->asOperands[0].ui32RegisterNumber])
-    {
-        psContext->currentGLSLString = &psContext->earlyMain;
-        psContext->indent++;
-
-        if (psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == -1) //Not an array
-        {
-            AddIndentation(psContext);
-            bformata(psContext->earlyMain, "Input%d = %s;\n", psDecl->asOperands[0].ui32RegisterNumber, InputName);
-        }
-        else
-        {
-            int arrayIndex = psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber];
-
-            while (arrayIndex)
-            {
-                AddIndentation(psContext);
-                bformata(psContext->earlyMain, "Input%d[%d] = %s[%d];\n", psDecl->asOperands[0].ui32RegisterNumber, arrayIndex - 1, InputName, arrayIndex - 1);
-
-                arrayIndex--;
-            }
-        }
-        psContext->indent--;
-        psContext->currentGLSLString = &psContext->glsl;
-    }
-}
-
-void AddBuiltinInput(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, const char* builtinName, uint32_t uNumComponents)
-{
-    (void)uNumComponents;
-
-    bstring glsl = *psContext->currentGLSLString;
-    Shader* psShader = psContext->psShader;
-
-    if (psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == 0)
-    {
-        SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, &psDecl->asOperands[0]);
-        bformata(glsl, "%s ", GetConstructorForTypeGLSL(psContext, eType, 4, false));
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bformata(glsl, ";\n");
-
-        psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = 1;
-    }
-    else
-    {
-        //This register has already been declared. The HLSL bytecode likely looks
-        //something like this then:
-        //  dcl_input_ps constant v3.x
-        //  dcl_input_ps_sgv v3.y, primitive_id
-
-        //GLSL does not allow assignment to a varying!
-    }
-
-    psContext->currentGLSLString = &psContext->earlyMain;
-    psContext->indent++;
-    AddIndentation(psContext);
-    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-
-    bformata(psContext->earlyMain, " = %s", builtinName);
-
-    switch (psDecl->asOperands[0].eSpecialName)
-    {
-    case NAME_POSITION:
-        TranslateOperandSwizzle(psContext, &psDecl->asOperands[0]);
-        // Invert w coordinate if necessary to be the same as SV_Position
-        if (psContext->psShader->eShaderType == PIXEL_SHADER)
-        {
-            if (psDecl->asOperands[0].eSelMode == OPERAND_4_COMPONENT_MASK_MODE &&
-                psDecl->asOperands[0].eType == OPERAND_TYPE_INPUT)
-            {
-                if (psDecl->asOperands[0].ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    uint32_t ui32IgnoreSwizzle;
-                    bcatcstr(psContext->earlyMain, ";\n#ifdef EMULATE_DEPTH_CLAMP\n");
-                    AddIndentation(psContext);
-                    TranslateVariableName(psContext, &psDecl->asOperands[0], TO_FLAG_NONE, &ui32IgnoreSwizzle);
-                    bcatcstr(psContext->earlyMain, ".z = unclampedDepth;\n");
-                    bcatcstr(psContext->earlyMain, "#endif\n");
-                }
-                if (psDecl->asOperands[0].ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    uint32_t ui32IgnoreSwizzle;
-                    bcatcstr(psContext->earlyMain, ";\n");
-                    AddIndentation(psContext);
-                    TranslateVariableName(psContext, &psDecl->asOperands[0], TO_FLAG_NONE, &ui32IgnoreSwizzle);
-                    bcatcstr(psContext->earlyMain, ".w = 1.0 / ");
-                    TranslateVariableName(psContext, &psDecl->asOperands[0], TO_FLAG_NONE, &ui32IgnoreSwizzle);
-                    bcatcstr(psContext->earlyMain, ".w;\n");
-                }
-            }
-            else
-            {
-                ASSERT(0);
-            }
-        }
-
-        break;
-    default:
-        //Scalar built-in. Don't apply swizzle.
-        break;
-    }
-    bcatcstr(psContext->earlyMain, ";\n");
-
-    psContext->indent--;
-    psContext->currentGLSLString = &psContext->glsl;
-}
-
-int OutputNeedsDeclaring(HLSLCrossCompilerContext* psContext, const Operand* psOperand, const int count)
-{
-    Shader* psShader = psContext->psShader;
-    
-    // Depth Output operands are a special case and won't have a ui32RegisterNumber,
-    // so first we have to check if the output operand is depth.
-    if (psShader->eShaderType == PIXEL_SHADER)
-    {
-        if (psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL ||
-            psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL)
-        {
-            return 1;
-        }
-        else if (psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH)
-        {
-            return 0; // OpenGL doesn't need to declare depth output variable (gl_FragDepth)
-        }
-    }
-    
-    const uint32_t declared = ((psContext->currentPhase + 1) << 3) | psShader->ui32CurrentVertexOutputStream;
-    ASSERT(psOperand->ui32RegisterNumber >= 0);
-    ASSERT(psOperand->ui32RegisterNumber < MAX_SHADER_VEC4_OUTPUT);
-    if (psShader->aiOutputDeclared[psOperand->ui32RegisterNumber] != declared)
-    {
-        int offset;
-
-        for (offset = 0; offset < count; offset++)
-        {
-            psShader->aiOutputDeclared[psOperand->ui32RegisterNumber + offset] = declared;
-        }
-        return 1;
-    }
-
-    return 0;
-}
-
-void AddBuiltinOutput(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, const GLVARTYPE type, int arrayElements, const char* builtinName)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    Shader* psShader = psContext->psShader;
-
-    psContext->havePostShaderCode[psContext->currentPhase] = 1;
-
-    if (OutputNeedsDeclaring(psContext, &psDecl->asOperands[0], arrayElements ? arrayElements : 1))
-    {
-        InOutSignature* psSignature = NULL;
-
-        GetOutputSignatureFromRegister(psDecl->asOperands[0].ui32RegisterNumber,
-            psDecl->asOperands[0].ui32CompMask,
-            0,
-            &psShader->sInfo, &psSignature);
-
-        bcatcstr(glsl, "#undef ");
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bcatcstr(glsl, "\n");
-
-        bcatcstr(glsl, "#define ");
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bformata(glsl, " phase%d_", psContext->currentPhase);
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bcatcstr(glsl, "\n");
-
-        bcatcstr(glsl, "vec4 ");
-        bformata(glsl, "phase%d_", psContext->currentPhase);
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        if (arrayElements)
-        {
-            bformata(glsl, "[%d];\n", arrayElements);
-        }
-        else
-        {
-            bcatcstr(glsl, ";\n");
-        }
-
-        psContext->currentGLSLString = &psContext->postShaderCode[psContext->currentPhase];
-        glsl = *psContext->currentGLSLString;
-        psContext->indent++;
-        if (arrayElements)
-        {
-            int elem;
-            for (elem = 0; elem < arrayElements; elem++)
-            {
-                AddIndentation(psContext);
-                bformata(glsl, "%s[%d] = %s(phase%d_", builtinName, elem, GetTypeString(type), psContext->currentPhase);
-                TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-                bformata(glsl, "[%d]", elem);
-                TranslateOperandSwizzle(psContext, &psDecl->asOperands[0]);
-                bformata(glsl, ");\n");
-            }
-        }
-        else
-        {
-            if (psDecl->asOperands[0].eSpecialName == NAME_CLIP_DISTANCE)
-            {
-                int max = GetMaxComponentFromComponentMask(&psDecl->asOperands[0]);
-
-                int applySiwzzle = GetNumSwizzleElements(&psDecl->asOperands[0]) > 1 ? 1 : 0;
-                int index;
-                int i;
-                int multiplier = 1;
-                char* swizzle[] = {".x", ".y", ".z", ".w"};
-
-                ASSERT(psSignature != NULL);
-
-                index = psSignature->ui32SemanticIndex;
-
-                //Clip distance can be spread across 1 or 2 outputs (each no more than a vec4).
-                //Some examples:
-                //float4 clip[2] : SV_ClipDistance; //8 clip distances
-                //float3 clip[2] : SV_ClipDistance; //6 clip distances
-                //float4 clip : SV_ClipDistance; //4 clip distances
-                //float clip : SV_ClipDistance; //1 clip distance.
-
-                //In GLSL the clip distance built-in is an array of up to 8 floats.
-                //So vector to array conversion needs to be done here.
-                if (index == 1)
-                {
-                    InOutSignature* psFirstClipSignature;
-                    if (GetOutputSignatureFromSystemValue(NAME_CLIP_DISTANCE, 1, &psShader->sInfo, &psFirstClipSignature))
-                    {
-                        if (psFirstClipSignature->ui32Mask & (1 << 3))
-                        {
-                            multiplier = 4;
-                        }
-                        else
-                        if (psFirstClipSignature->ui32Mask & (1 << 2))
-                        {
-                            multiplier = 3;
-                        }
-                        else
-                        if (psFirstClipSignature->ui32Mask & (1 << 1))
-                        {
-                            multiplier = 2;
-                        }
-                    }
-                }
-
-                for (i = 0; i < max; ++i)
-                {
-                    AddIndentation(psContext);
-                    bformata(glsl, "%s[%d] = (phase%d_", builtinName, i + multiplier * index, psContext->currentPhase);
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    if (applySiwzzle)
-                    {
-                        bformata(glsl, ")%s;\n", swizzle[i]);
-                    }
-                    else
-                    {
-                        bformata(glsl, ");\n");
-                    }
-                }
-            }
-            else
-            {
-                uint32_t elements = GetNumSwizzleElements(&psDecl->asOperands[0]);
-
-                if (elements != GetTypeElementCount(type))
-                {
-                    //This is to handle float3 position seen in control point phases
-                    //struct HS_OUTPUT
-                    //{
-                    //  float3 vPosition : POSITION;
-                    //}; -> dcl_output o0.xyz
-                    //gl_Position is vec4.
-                    AddIndentation(psContext);
-                    bformata(glsl, "%s = %s(phase%d_", builtinName, GetTypeString(type), psContext->currentPhase);
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    bformata(glsl, ", 1);\n");
-                }
-                else
-                {
-                    AddIndentation(psContext);
-                    bformata(glsl, "%s = %s(phase%d_", builtinName, GetTypeString(type), psContext->currentPhase);
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    bformata(glsl, ");\n");
-                }
-            }
-
-            if (psShader->eShaderType == VERTEX_SHADER && psDecl->asOperands[0].eSpecialName == NAME_POSITION)
-            {
-                if (psContext->flags & HLSLCC_FLAG_INVERT_CLIP_SPACE_Y)
-                {
-                    AddIndentation(psContext);
-                    bformata(glsl, "gl_Position.y = -gl_Position.y;\n");
-                }
-
-                if (EmulateDepthClamp(psContext->psShader->eTargetLanguage))
-                {
-                    bcatcstr(glsl, "#ifdef EMULATE_DEPTH_CLAMP\n");
-                    bcatcstr(glsl, "#if EMULATE_DEPTH_CLAMP == 1\n");
-                    AddIndentation(psContext);
-                    bcatcstr(glsl, "unclampedDepth = gl_DepthRange.near + gl_DepthRange.diff * gl_Position.z / gl_Position.w;\n");
-                    bcatcstr(glsl, "#elif EMULATE_DEPTH_CLAMP == 2\n");
-                    AddIndentation(psContext);
-                    bcatcstr(glsl, "unclampedZ = gl_DepthRange.diff * gl_Position.z;\n");
-                    bcatcstr(glsl, "#endif\n");
-                    AddIndentation(psContext);
-                    bcatcstr(glsl, "gl_Position.z = 0.0;\n");
-                }
-
-                if (psContext->flags & HLSLCC_FLAG_CONVERT_CLIP_SPACE_Z)
-                {
-                    if (EmulateDepthClamp(psContext->psShader->eTargetLanguage))
-                    {
-                        bcatcstr(glsl, "#else\n");
-                    }
-
-                    AddIndentation(psContext);
-                    bcatcstr(glsl, "gl_Position.z = gl_Position.z * 2.0 - gl_Position.w;\n");
-                }
-
-                if (EmulateDepthClamp(psContext->psShader->eTargetLanguage))
-                {
-                    bcatcstr(glsl, "#endif\n");
-                }
-            }
-        }
-        psContext->indent--;
-        psContext->currentGLSLString = &psContext->glsl;
-    }
-}
-
-void AddUserOutput(HLSLCrossCompilerContext* psContext, const Declaration* psDecl)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    Shader* psShader = psContext->psShader;
-
-    if (OutputNeedsDeclaring(psContext, &psDecl->asOperands[0], 1))
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        const char* Precision = "";
-        const char* type = "vec";
-
-        InOutSignature* psSignature = NULL;
-
-        GetOutputSignatureFromRegister(psDecl->asOperands[0].ui32RegisterNumber,
-            psDecl->asOperands[0].ui32CompMask,
-            psShader->ui32CurrentVertexOutputStream,
-            &psShader->sInfo,
-            &psSignature);
-
-        switch (psSignature->eComponentType)
-        {
-        case INOUT_COMPONENT_UINT32:
-        {
-            type = "uvec";
-            break;
-        }
-        case INOUT_COMPONENT_SINT32:
-        {
-            type = "ivec";
-            break;
-        }
-        case INOUT_COMPONENT_FLOAT32:
-        {
-            break;
-        }
-        }
-
-        if (HavePrecisionQualifers(psShader->eTargetLanguage))
-        {
-            switch (psOperand->eMinPrecision)
-            {
-            case OPERAND_MIN_PRECISION_DEFAULT:
-            {
-                Precision = "highp";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_FLOAT_16:
-            {
-                Precision = "mediump";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_FLOAT_2_8:
-            {
-                Precision = "lowp";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_SINT_16:
-            {
-                Precision = "mediump";
-                //type = "ivec";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_UINT_16:
-            {
-                Precision = "mediump";
-                //type = "uvec";
-                break;
-            }
-            }
-        }
-
-        switch (psShader->eShaderType)
-        {
-        case PIXEL_SHADER:
-        {
-            switch (psDecl->asOperands[0].eType)
-            {
-            case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-            case OPERAND_TYPE_OUTPUT_DEPTH:
-            {
-                break;
-            }
-            case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-            {
-                bcatcstr(glsl, "#ifdef GL_ARB_conservative_depth\n");
-                bcatcstr(glsl, "#extension GL_ARB_conservative_depth : enable\n");
-                bcatcstr(glsl, "layout (depth_greater) out float gl_FragDepth;\n");
-                bcatcstr(glsl, "#endif\n");
-                break;
-            }
-            case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-            {
-                bcatcstr(glsl, "#ifdef GL_ARB_conservative_depth\n");
-                bcatcstr(glsl, "#extension GL_ARB_conservative_depth : enable\n");
-                bcatcstr(glsl, "layout (depth_less) out float gl_FragDepth;\n");
-                bcatcstr(glsl, "#endif\n");
-                break;
-            }
-            default:
-            {
-                if (WriteToFragData(psContext->psShader->eTargetLanguage))
-                {
-                    bformata(glsl, "#define Output%d gl_FragData[%d]\n", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber);
-                }
-                else
-                {
-                    int stream = 0;
-                    char* OutputName = GetDeclaredOutputName(psContext, PIXEL_SHADER, psOperand, &stream);
-
-                    uint32_t renderTarget = psDecl->asOperands[0].ui32RegisterNumber;
-
-                    // Check if we already defined this as a "inout"
-                    if ((psContext->rendertargetUse[renderTarget] & INPUT_RENDERTARGET) == 0)
-                    {
-                        if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) || HaveLimitedInOutLocationQualifier(psContext->psShader->eTargetLanguage))
-                        {
-                            uint32_t index = 0;
-
-                            if ((psContext->flags & HLSLCC_FLAG_DUAL_SOURCE_BLENDING) && DualSourceBlendSupported(psContext->psShader->eTargetLanguage))
-                            {
-                                if (renderTarget > 0)
-                                {
-                                    renderTarget = 0;
-                                    index = 1;
-                                }
-                                bformata(glsl, "layout(location = %d, index = %d) ", renderTarget, index);
-                            }
-                            else
-                            {
-                                bformata(glsl, "layout(location = %d) ", renderTarget);
-                            }
-                        }
-
-                        bformata(glsl, "out %s %s4 %s;\n", Precision, type, OutputName);
-                    }
-
-                    if (stream)
-                    {
-                        bformata(glsl, "#define Output%d_S%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, stream, OutputName);
-                    }
-                    else
-                    {
-                        bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-                    }
-                    bcstrfree(OutputName);
-                }
-                break;
-            }
-            }
-            break;
-        }
-        case VERTEX_SHADER:
-        {
-            int iNumComponents = 4;    //GetMaxComponentFromComponentMask(&psDecl->asOperands[0]);
-            int stream = 0;
-            char* OutputName = GetDeclaredOutputName(psContext, VERTEX_SHADER, psOperand, &stream);
-
-            if (psShader->eShaderType == VERTEX_SHADER)
-            {
-                uint32_t ui32InterpImp = AddImport(psContext, SYMBOL_INPUT_INTERPOLATION_MODE, psDecl->asOperands[0].ui32RegisterNumber, (uint32_t)INTERPOLATION_LINEAR);
-                bformata(glsl, "#if IMPORT_%d == %d\n", ui32InterpImp, INTERPOLATION_CONSTANT);
-                bformata(glsl, "#define Output%dInterpolation flat\n", psDecl->asOperands[0].ui32RegisterNumber);
-                bformata(glsl, "#elif IMPORT_%d == %d\n", ui32InterpImp, INTERPOLATION_LINEAR_CENTROID);
-                bformata(glsl, "#define Output%dInterpolation centroid\n", psDecl->asOperands[0].ui32RegisterNumber);
-                bformata(glsl, "#elif IMPORT_%d == %d\n", ui32InterpImp, INTERPOLATION_LINEAR_NOPERSPECTIVE);
-                bformata(glsl, "#define Output%dInterpolation noperspective\n", psDecl->asOperands[0].ui32RegisterNumber);
-                bformata(glsl, "#elif IMPORT_%d == %d\n", ui32InterpImp, INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID);
-                bformata(glsl, "#define Output%dInterpolation noperspective centroid\n", psDecl->asOperands[0].ui32RegisterNumber);
-                bformata(glsl, "#elif IMPORT_%d == %d\n", ui32InterpImp, INTERPOLATION_LINEAR_SAMPLE);
-                bformata(glsl, "#define Output%dInterpolation sample\n", psDecl->asOperands[0].ui32RegisterNumber);
-                bformata(glsl, "#elif IMPORT_%d == %d\n", ui32InterpImp, INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE);
-                bformata(glsl, "#define Output%dInterpolation noperspective sample\n", psDecl->asOperands[0].ui32RegisterNumber);
-                bcatcstr(glsl, "#else\n");
-                bformata(glsl, "#define Output%dInterpolation \n", psDecl->asOperands[0].ui32RegisterNumber);
-                bcatcstr(glsl, "#endif\n");
-            }
-
-            if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions))
-            {
-                bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-            }
-
-            if (psShader->eShaderType == VERTEX_SHADER)
-            {
-                bformata(glsl, "Output%dInterpolation ", psDecl->asOperands[0].ui32RegisterNumber);
-            }
-
-            if (InOutSupported(psContext->psShader->eTargetLanguage))
-            {
-                bformata(glsl, "out %s %s%d %s;\n", Precision, type, iNumComponents, OutputName);
-            }
-            else
-            {
-                bformata(glsl, "varying %s %s%d %s;\n", Precision, type, iNumComponents, OutputName);
-            }
-            bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-            bcstrfree(OutputName);
-
-            break;
-        }
-        case GEOMETRY_SHADER:
-        {
-            int stream = 0;
-            char* OutputName = GetDeclaredOutputName(psContext, GEOMETRY_SHADER, psOperand, &stream);
-
-            if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions))
-            {
-                bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-            }
-
-            bformata(glsl, "out %s4 %s;\n", type, OutputName);
-            if (stream)
-            {
-                bformata(glsl, "#define Output%d_S%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, stream, OutputName);
-            }
-            else
-            {
-                bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-            }
-            bcstrfree(OutputName);
-            break;
-        }
-        case HULL_SHADER:
-        {
-            int stream = 0;
-            char* OutputName = GetDeclaredOutputName(psContext, HULL_SHADER, psOperand, &stream);
-
-            ASSERT(psDecl->asOperands[0].ui32RegisterNumber != 0);  //Reg 0 should be gl_out[gl_InvocationID].gl_Position.
-
-            if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions))
-            {
-                bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-            }
-            bformata(glsl, "out %s4 %s[];\n", type, OutputName);
-            bformata(glsl, "#define Output%d %s[gl_InvocationID]\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-            bcstrfree(OutputName);
-            break;
-        }
-        case DOMAIN_SHADER:
-        {
-            int stream = 0;
-            char* OutputName = GetDeclaredOutputName(psContext, DOMAIN_SHADER, psOperand, &stream);
-            if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions))
-            {
-                bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-            }
-            bformata(glsl, "out %s4 %s;\n", type, OutputName);
-            bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-            bcstrfree(OutputName);
-            break;
-        }
-        }
-    }
-    else
-    {
-        /*
-        Multiple outputs can be packed into one register. e.g.
-        // Name                 Index   Mask Register SysValue  Format   Used
-        // -------------------- ----- ------ -------- -------- ------- ------
-        // FACTOR                   0   x           3     NONE     int   x
-        // MAX                      0    y          3     NONE     int    y
-
-        We want unique outputs to make it easier to use transform feedback.
-
-        out  ivec4 FACTOR0;
-        #define Output3 FACTOR0
-        out  ivec4 MAX0;
-
-        MAIN SHADER CODE. Writes factor and max to Output3 which aliases FACTOR0.
-
-        MAX0.x = FACTOR0.y;
-
-        This unpacking of outputs is only done when using HLSLCC_FLAG_INOUT_SEMANTIC_NAMES.
-        When not set the application will be using HLSL reflection information to discover
-        what the input and outputs mean if need be.
-        */
-
-        //
-
-        if ((psContext->flags & HLSLCC_FLAG_INOUT_SEMANTIC_NAMES) && (psDecl->asOperands[0].eType == OPERAND_TYPE_OUTPUT))
-        {
-            const Operand* psOperand = &psDecl->asOperands[0];
-            InOutSignature* psSignature = NULL;
-            const char* type = "vec";
-            int stream = 0;
-            char* OutputName = GetDeclaredOutputName(psContext, psShader->eShaderType, psOperand, &stream);
-
-            GetOutputSignatureFromRegister(psOperand->ui32RegisterNumber,
-                psOperand->ui32CompMask,
-                0,
-                &psShader->sInfo,
-                &psSignature);
-
-            if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions))
-            {
-                bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-            }
-
-            switch (psSignature->eComponentType)
-            {
-            case INOUT_COMPONENT_UINT32:
-            {
-                type = "uvec";
-                break;
-            }
-            case INOUT_COMPONENT_SINT32:
-            {
-                type = "ivec";
-                break;
-            }
-            case INOUT_COMPONENT_FLOAT32:
-            {
-                break;
-            }
-            }
-            bformata(glsl, "out %s4 %s;\n", type, OutputName);
-
-            psContext->havePostShaderCode[psContext->currentPhase] = 1;
-
-            psContext->currentGLSLString = &psContext->postShaderCode[psContext->currentPhase];
-            glsl = *psContext->currentGLSLString;
-
-            bcatcstr(glsl, OutputName);
-            bcstrfree(OutputName);
-            AddSwizzleUsingElementCount(psContext, GetNumSwizzleElements(psOperand));
-            bformata(glsl, " = Output%d", psOperand->ui32RegisterNumber);
-            TranslateOperandSwizzle(psContext, psOperand);
-            bcatcstr(glsl, ";\n");
-
-            psContext->currentGLSLString = &psContext->glsl;
-            glsl = *psContext->currentGLSLString;
-        }
-    }
-}
-
-void DeclareUBOConstants(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint, ConstantBuffer* psCBuf)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    uint32_t i, implicitOffset;
-    const char* Name = psCBuf->Name;
-    uint32_t auiSortedVars[MAX_SHADER_VARS];
-    if (psCBuf->Name[0] == '$') //For $Globals
-    {
-        Name++;
-    }
-
-    for (i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        PreDeclareStructType(psContext, psCBuf->asVars[i].sType.Name, &psCBuf->asVars[i].sType);
-    }
-
-    /* [layout (location = X)] uniform vec4 HLSLConstantBufferName[numConsts]; */
-    if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) && (psContext->flags & HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS) == 0)
-    {
-        bformata(glsl, "layout(binding = %d) ", ui32BindingPoint);
-    }
-
-    bformata(glsl, "uniform ");
-    ConvertToUniformBufferName(glsl, psContext->psShader, psCBuf->Name);
-    bformata(glsl, " {\n ");
-
-    if (psCBuf->ui32NumVars > 0)
-    {
-        uint32_t bSorted = 1;
-        auiSortedVars[0] = 0;
-        for (i = 1; i < psCBuf->ui32NumVars; ++i)
-        {
-            auiSortedVars[i] = i;
-            bSorted = bSorted && psCBuf->asVars[i - 1].ui32StartOffset <= psCBuf->asVars[i].ui32StartOffset;
-        }
-        while (!bSorted)
-        {
-            bSorted = 1;
-            for (i = 1; i < psCBuf->ui32NumVars; ++i)
-            {
-                if (psCBuf->asVars[auiSortedVars[i - 1]].ui32StartOffset > psCBuf->asVars[auiSortedVars[i]].ui32StartOffset)
-                {
-                    uint32_t uiTemp = auiSortedVars[i];
-                    auiSortedVars[i] = auiSortedVars[i - 1];
-                    auiSortedVars[i - 1] = uiTemp;
-                    bSorted = 0;
-                }
-            }
-        }
-    }
-
-    implicitOffset = 0;
-    for (i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        uint32_t uVarAlignment, uVarSize;
-        ShaderVar* psVar = psCBuf->asVars + auiSortedVars[i];
-        GetSTD140Layout(&psVar->sType, &uVarAlignment, &uVarSize);
-
-        if ((implicitOffset + 16 - 1) / 16 < psVar->ui32StartOffset / 16)
-        {
-            uint32_t uNumPaddingUvecs = psVar->ui32StartOffset / 16 - (implicitOffset + 16 - 1) / 16;
-            bcatcstr(glsl, "\tuvec4 padding_");
-            ConvertToUniformBufferName(glsl, psContext->psShader, psCBuf->Name);
-            bformata(glsl, "_%d[%d];\n", implicitOffset, uNumPaddingUvecs);
-            implicitOffset = psVar->ui32StartOffset - psVar->ui32StartOffset % 16;
-        }
-
-        if ((implicitOffset + 4 - 1) / 4 < psVar->ui32StartOffset / 4)
-        {
-            uint32_t uNumPaddingUints = psVar->ui32StartOffset / 4 - (implicitOffset + 4 - 1) / 4;
-            uint32_t uPaddingUint;
-            for (uPaddingUint = 0; uPaddingUint < uNumPaddingUints; ++uPaddingUint)
-            {
-                bcatcstr(glsl, "\tuint padding_");
-                ConvertToUniformBufferName(glsl, psContext->psShader, psCBuf->Name);
-                bformata(glsl, "_%d_%d;\n", psVar->ui32StartOffset, uPaddingUint);
-            }
-            implicitOffset = psVar->ui32StartOffset - psVar->ui32StartOffset % 4;
-        }
-
-        implicitOffset += uVarAlignment - 1;
-        implicitOffset -= implicitOffset % uVarAlignment;
-
-        ASSERT(implicitOffset == psVar->ui32StartOffset);
-
-        DeclareConstBufferShaderVariable(psContext, psVar->sType.Name, &psVar->sType, 0);
-        implicitOffset += uVarSize;
-    }
-
-    bcatcstr(glsl, "};\n");
-}
-
-void DeclareBufferVariable(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint, ConstantBuffer* psCBuf, const Operand* psOperand, const uint32_t ui32GloballyCoherentAccess, const ResourceType eResourceType)
-{
-    const char* Name = psCBuf->Name;
-    bstring StructName;
-#if !defined(NDEBUG)
-    uint32_t unnamed_struct = strcmp(psCBuf->asVars[0].Name, "$Element") == 0 ? 1 : 0;
-#endif
-    bstring glsl = *psContext->currentGLSLString;
-
-    ASSERT(psCBuf->ui32NumVars == 1);
-    ASSERT(unnamed_struct);
-
-    StructName = bfromcstr("");
-
-    //TranslateOperand(psContext, psOperand, TO_FLAG_NAME_ONLY);
-    if (psOperand->eType == OPERAND_TYPE_RESOURCE && eResourceType == RTYPE_STRUCTURED)
-    {
-        bformata(StructName, "StructuredRes%d", psOperand->ui32RegisterNumber);
-    }
-    else if (psOperand->eType == OPERAND_TYPE_RESOURCE && eResourceType == RTYPE_UAV_RWBYTEADDRESS)
-    {
-        bformata(StructName, "RawRes%d", psOperand->ui32RegisterNumber);
-    }
-    else
-    {
-        bformata(StructName, "UAV%d", psOperand->ui32RegisterNumber);
-    }
-
-    PreDeclareStructType(psContext, bstr2cstr(StructName, '\0'), &psCBuf->asVars[0].sType);
-
-    // Add 'std430' layout for storage buffers.
-    // We don't use a global setting for all buffers because Mali drivers don't like that.
-    bcatcstr(glsl, "layout(std430");
-
-    /* [layout (location = X)] uniform vec4 HLSLConstantBufferName[numConsts]; */
-    // If storage blocking binding is not supported, then we must set the binding location in the shader. If we don't do it,
-    // all the storage buffers of the program get assigned the same value (0).
-    // Unfortunately this could cause binding collisions between different render stages for a storage buffer.
-    if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) &&
-        (!StorageBlockBindingSupported(psContext->psShader->eTargetLanguage) || (psContext->flags & HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS) == 0))
-    {
-        bformata(glsl, ", binding = %d", ui32BindingPoint);
-    }
-
-    // Close 'layout'
-    bcatcstr(glsl, ")");
-
-    if (ui32GloballyCoherentAccess & GLOBALLY_COHERENT_ACCESS)
-    {
-        bcatcstr(glsl, "coherent ");
-    }
-
-    if (eResourceType == RTYPE_STRUCTURED)
-    {
-        bcatcstr(glsl, "readonly ");
-    }
-
-    bcatcstr(glsl, "buffer ");
-    if (eResourceType == RTYPE_STRUCTURED)
-    {
-        ConvertToTextureName(glsl, psContext->psShader, Name, NULL, 0);
-    }
-    else
-    {
-        ConvertToUAVName(glsl, psContext->psShader, Name);
-    }
-    bcatcstr(glsl, " {\n ");
-
-    DeclareConstBufferShaderVariable(psContext, bstr2cstr(StructName, '\0'), &psCBuf->asVars[0].sType, 1);
-
-    bcatcstr(glsl, "};\n");
-
-    bdestroy(StructName);
-}
-
-void DeclarePLSVariable(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint, ConstantBuffer* plsVar, const Operand* psOperand, const uint32_t ui32GloballyCoherentAccess, const ResourceType eResourceType)
-{
-    (void)psOperand;
-    (void)ui32GloballyCoherentAccess;
-    (void)eResourceType;
-
-    const char* Name = plsVar->Name;
-#if !defined(NDEBUG)
-    uint32_t unnamed_struct = strcmp(plsVar->asVars[0].Name, "$Element") == 0 ? 1 : 0;
-#endif
-    bstring glsl = *psContext->currentGLSLString;
-
-    ASSERT(plsVar->ui32NumVars == 1);
-    ASSERT(unnamed_struct);
-
-    // Define extension
-    // TODO: if we need more than one PLS var... we can't redefine the extension every time
-    // Extensions need to be declared before any non-preprocessor symbols. So we put it all the way at the beginning.
-    bstring ext = bfromcstralloc(1024, "#extension GL_EXT_shader_pixel_local_storage : require\n");
-    bconcat(ext, glsl);
-    bassign(glsl, ext);
-    bdestroy(ext);
-
-    switch (ui32BindingPoint)
-    {
-    case GMEM_PLS_RO_SLOT:
-        bcatcstr(glsl, "__pixel_local_inEXT PLS_STRUCT_READ_ONLY");
-        break;
-    case GMEM_PLS_WO_SLOT:
-        bcatcstr(glsl, "__pixel_local_outEXT PLS_STRUCT_WRITE_ONLY");
-        break;
-    case GMEM_PLS_RW_SLOT:
-        bcatcstr(glsl, "__pixel_localEXT PLS_STRUCT_READ_WRITE");
-        break;
-    default:
-        ASSERT(0);
-    }
-
-    bcatcstr(glsl, "\n{\n");
-
-    ASSERT(plsVar->ui32NumVars == 1);
-    ASSERT(plsVar->asVars[0].sType.Members != 0);
-    DeclarePLSStructVars(psContext, plsVar->asVars[0].sType.Name, &plsVar->asVars[0].sType);
-
-    bcatcstr(glsl, "\n} ");
-    ConvertToUAVName(glsl, psContext->psShader, Name);
-    bcatcstr(glsl, ";\n\n");
-}
-
-void DeclareStructConstants(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint, ConstantBuffer* psCBuf, const Operand* psOperand)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    uint32_t i;
-
-    for (i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        PreDeclareStructType(psContext, psCBuf->asVars[i].sType.Name, &psCBuf->asVars[i].sType);
-    }
-
-    /* [layout (location = X)] uniform vec4 HLSLConstantBufferName[numConsts]; */
-    if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) && (psContext->flags & HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS) == 0)
-    {
-        bformata(glsl, "layout(location = %d) ", ui32BindingPoint);
-    }
-    bcatcstr(glsl, "uniform struct ");
-    TranslateOperand(psContext, psOperand, TO_FLAG_DECLARATION_NAME);
-
-    bcatcstr(glsl, "_Type {\n");
-
-    for (i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        DeclareConstBufferShaderVariable(psContext, psCBuf->asVars[i].sType.Name, &psCBuf->asVars[i].sType, 0);
-    }
-
-    bcatcstr(glsl, "} ");
-
-    TranslateOperand(psContext, psOperand, TO_FLAG_DECLARATION_NAME);
-
-    bcatcstr(glsl, ";\n");
-}
-
-void TranslateDeclaration(HLSLCrossCompilerContext* psContext, const Declaration* psDecl)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    Shader* psShader = psContext->psShader;
-
-    switch (psDecl->eOpcode)
-    {
-    case OPCODE_DCL_INPUT_SGV:
-    case OPCODE_DCL_INPUT_PS_SGV:
-    case OPCODE_DCL_INPUT_PS_SIV:
-    {
-        const SPECIAL_NAME eSpecialName = psDecl->asOperands[0].eSpecialName;
-        switch (eSpecialName)
-        {
-        case NAME_POSITION:
-        {
-            if (psShader->eShaderType == PIXEL_SHADER)
-            {
-                AddBuiltinInput(psContext, psDecl, "gl_FragCoord", 4);
-            }
-            else
-            {
-                AddBuiltinInput(psContext, psDecl, "gl_Position", 4);
-            }
-            break;
-        }
-        case NAME_RENDER_TARGET_ARRAY_INDEX:
-        {
-            AddBuiltinInput(psContext, psDecl, "gl_Layer", 1);
-            break;
-        }
-        case NAME_CLIP_DISTANCE:
-        {
-            AddBuiltinInput(psContext, psDecl, "gl_ClipDistance", 4);
-            break;
-        }
-        case NAME_VIEWPORT_ARRAY_INDEX:
-        {
-            AddBuiltinInput(psContext, psDecl, "gl_ViewportIndex", 1);
-            break;
-        }
-        case NAME_INSTANCE_ID:
-        {
-            AddBuiltinInput(psContext, psDecl, "uint(gl_InstanceID)", 1);
-            break;
-        }
-        case NAME_IS_FRONT_FACE:
-        {
-            /*
-            Cast to uint used because
-            if(gl_FrontFacing != 0) failed to compiled on Intel HD 4000.
-            Suggests no implicit conversion for bool<->uint.
-            */
-
-            AddBuiltinInput(psContext, psDecl, "uint(gl_FrontFacing)", 1);
-            break;
-        }
-        case NAME_SAMPLE_INDEX:
-        {
-            AddBuiltinInput(psContext, psDecl, "gl_SampleID", 1);
-            break;
-        }
-        case NAME_VERTEX_ID:
-        {
-            AddBuiltinInput(psContext, psDecl, "uint(gl_VertexID)", 1);
-            break;
-        }
-        case NAME_PRIMITIVE_ID:
-        {
-            AddBuiltinInput(psContext, psDecl, "gl_PrimitiveID", 1);
-            break;
-        }
-        default:
-        {
-            bformata(glsl, "in vec4 %s;\n", psDecl->asOperands[0].pszSpecialName);
-
-            bcatcstr(glsl, "#define ");
-            TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-            bformata(glsl, " %s\n", psDecl->asOperands[0].pszSpecialName);
-            break;
-        }
-        }
-        break;
-    }
-
-    case OPCODE_DCL_OUTPUT_SIV:
-    {
-        switch (psDecl->asOperands[0].eSpecialName)
-        {
-        case NAME_POSITION:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT4, 0, "gl_Position");
-            break;
-        }
-        case NAME_RENDER_TARGET_ARRAY_INDEX:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_INT, 0, "gl_Layer");
-            break;
-        }
-        case NAME_CLIP_DISTANCE:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_ClipDistance");
-            break;
-        }
-        case NAME_VIEWPORT_ARRAY_INDEX:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_INT, 0, "gl_ViewportIndex");
-            break;
-        }
-        case NAME_VERTEX_ID:
-        {
-            ASSERT(0);         //VertexID is not an output
-            break;
-        }
-        case NAME_PRIMITIVE_ID:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_INT, 0, "gl_PrimitiveID");
-            break;
-        }
-        case NAME_INSTANCE_ID:
-        {
-            ASSERT(0);         //InstanceID is not an output
-            break;
-        }
-        case NAME_IS_FRONT_FACE:
-        {
-            ASSERT(0);         //FrontFacing is not an output
-            break;
-        }
-        case NAME_FINAL_QUAD_U_EQ_0_EDGE_TESSFACTOR:
-        {
-            if (psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 4, "gl_TessLevelOuter");
-            }
-            else
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[0]");
-            }
-            break;
-        }
-        case NAME_FINAL_QUAD_V_EQ_0_EDGE_TESSFACTOR:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[1]");
-            break;
-        }
-        case NAME_FINAL_QUAD_U_EQ_1_EDGE_TESSFACTOR:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[2]");
-            break;
-        }
-        case NAME_FINAL_QUAD_V_EQ_1_EDGE_TESSFACTOR:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[3]");
-            break;
-        }
-        case NAME_FINAL_TRI_U_EQ_0_EDGE_TESSFACTOR:
-        {
-            if (psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 3, "gl_TessLevelOuter");
-            }
-            else
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[0]");
-            }
-            break;
-        }
-        case NAME_FINAL_TRI_V_EQ_0_EDGE_TESSFACTOR:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[1]");
-            break;
-        }
-        case NAME_FINAL_TRI_W_EQ_0_EDGE_TESSFACTOR:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[2]");
-            break;
-        }
-        case NAME_FINAL_LINE_DENSITY_TESSFACTOR:
-        {
-            if (psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 2, "gl_TessLevelOuter");
-            }
-            else
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[0]");
-            }
-            break;
-        }
-        case NAME_FINAL_LINE_DETAIL_TESSFACTOR:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[1]");
-            break;
-        }
-        case NAME_FINAL_TRI_INSIDE_TESSFACTOR:
-        case NAME_FINAL_QUAD_U_INSIDE_TESSFACTOR:
-        {
-            if (psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 2, "gl_TessLevelInner");
-            }
-            else
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelInner[0]");
-            }
-            break;
-        }
-        case NAME_FINAL_QUAD_V_INSIDE_TESSFACTOR:
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelInner[1]");
-            break;
-        }
-        default:
-        {
-            bformata(glsl, "out vec4 %s;\n", psDecl->asOperands[0].pszSpecialName);
-
-            bcatcstr(glsl, "#define ");
-            TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-            bformata(glsl, " %s\n", psDecl->asOperands[0].pszSpecialName);
-            break;
-        }
-        }
-        break;
-    }
-    case OPCODE_DCL_INPUT:
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        //Force the number of components to be 4.
-        /*dcl_output o3.xy
-        dcl_output o3.z
-
-        Would generate a vec2 and a vec3. We discard the second one making .z invalid!
-
-        */
-        int iNumComponents = 4;    //GetMaxComponentFromComponentMask(psOperand);
-        const char* StorageQualifier = "attribute";
-        char* InputName;
-        const char* Precision = "";
-
-        if ((psOperand->eType == OPERAND_TYPE_INPUT_DOMAIN_POINT) ||
-            (psOperand->eType == OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_COVERAGE_MASK) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_GROUP_ID) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED))
-        {
-            break;
-        }
-
-        //Already declared as part of an array.
-        if (psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] == -1)
-        {
-            break;
-        }
-
-        InputName = GetDeclaredInputName(psContext, psShader->eShaderType, psOperand);
-
-        if (InOutSupported(psContext->psShader->eTargetLanguage))
-        {
-            StorageQualifier = "in";
-        }
-
-        if (HavePrecisionQualifers(psShader->eTargetLanguage))
-        {
-            switch (psOperand->eMinPrecision)
-            {
-            case OPERAND_MIN_PRECISION_DEFAULT:
-            {
-                Precision = "highp";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_FLOAT_16:
-            {
-                Precision = "mediump";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_FLOAT_2_8:
-            {
-                Precision = "lowp";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_SINT_16:
-            {
-                Precision = "mediump";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_UINT_16:
-            {
-                Precision = "mediump";
-                break;
-            }
-            }
-        }
-
-        DeclareInput(psContext, psDecl,
-            "", StorageQualifier, Precision, iNumComponents, (OPERAND_INDEX_DIMENSION)psOperand->iIndexDims, InputName);
-        bcstrfree(InputName);
-
-        break;
-    }
-    case OPCODE_DCL_INPUT_SIV:
-    {
-        if (psShader->eShaderType == PIXEL_SHADER)
-        {
-            psShader->sInfo.aePixelInputInterpolation[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->value.eInterpolation;
-        }
-        break;
-    }
-    case OPCODE_DCL_INPUT_PS:
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        int iNumComponents = 4;    //GetMaxComponentFromComponentMask(psOperand);
-        const char* StorageQualifier = "varying";
-        const char* Precision = "";
-        char* InputName = GetDeclaredInputName(psContext, PIXEL_SHADER, psOperand);
-        const char* Interpolation = "";
-
-        //Already declared as part of an array.
-        if (psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] == -1)
-        {
-            break;
-        }
-
-        if (InOutSupported(psContext->psShader->eTargetLanguage))
-        {
-            StorageQualifier = "in";
-        }
-
-        switch (psDecl->value.eInterpolation)
-        {
-        case INTERPOLATION_CONSTANT:
-        {
-            Interpolation = "flat";
-            break;
-        }
-        case INTERPOLATION_LINEAR:
-        {
-            break;
-        }
-        case INTERPOLATION_LINEAR_CENTROID:
-        {
-            Interpolation = "centroid";
-            break;
-        }
-        case INTERPOLATION_LINEAR_NOPERSPECTIVE:
-        {
-            Interpolation = "noperspective";
-            break;
-        }
-        case INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID:
-        {
-            Interpolation = "noperspective centroid";
-            break;
-        }
-        case INTERPOLATION_LINEAR_SAMPLE:
-        {
-            Interpolation = "sample";
-            break;
-        }
-        case INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE:
-        {
-            Interpolation = "noperspective sample";
-            break;
-        }
-        }
-
-        if (HavePrecisionQualifers(psShader->eTargetLanguage))
-        {
-            switch (psOperand->eMinPrecision)
-            {
-            case OPERAND_MIN_PRECISION_DEFAULT:
-            {
-                Precision = "highp";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_FLOAT_16:
-            {
-                Precision = "mediump";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_FLOAT_2_8:
-            {
-                Precision = "lowp";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_SINT_16:
-            {
-                Precision = "mediump";
-                break;
-            }
-            case OPERAND_MIN_PRECISION_UINT_16:
-            {
-                Precision = "mediump";
-                break;
-            }
-            }
-        }
-
-        DeclareInput(psContext, psDecl,
-            Interpolation, StorageQualifier, Precision, iNumComponents, INDEX_1D, InputName);
-        bcstrfree(InputName);
-
-        break;
-    }
-    case OPCODE_DCL_TEMPS:
-    {
-        const uint32_t ui32NumTemps = psDecl->value.ui32NumTemps;
-
-        if (psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING && psContext->psShader->eShaderType != HULL_SHADER)
-        {
-            break;
-        }
-
-        if (ui32NumTemps > 0)
-        {
-            bformata(glsl, "vec4 Temp[%d];\n", ui32NumTemps);
-            if (psContext->psShader->bUseTempCopy)
-            {
-                bcatcstr(glsl, "vec4 TempCopy;\n");
-            }
-
-            bformata(glsl, "ivec4 Temp_int[%d];\n", ui32NumTemps);
-            if (psContext->psShader->bUseTempCopy)
-            {
-                bcatcstr(glsl, "vec4 TempCopy_int;\n");
-            }
-            if (HaveUVec(psShader->eTargetLanguage))
-            {
-                bformata(glsl, "uvec4 Temp_uint[%d];\n", ui32NumTemps);
-                if (psContext->psShader->bUseTempCopy)
-                {
-                    bcatcstr(glsl, "uvec4 TempCopy_uint;\n");
-                }
-            }
-            if (psShader->fp64)
-            {
-                bformata(glsl, "dvec4 Temp_double[%d];\n", ui32NumTemps);
-                if (psContext->psShader->bUseTempCopy)
-                {
-                    bcatcstr(glsl, "dvec4 TempCopy_double;\n");
-                }
-            }
-        }
-
-        break;
-    }
-    case OPCODE_SPECIAL_DCL_IMMCONST:
-    {
-        const Operand* psDest = &psDecl->asOperands[0];
-        const Operand* psSrc = &psDecl->asOperands[1];
-
-        ASSERT(psSrc->eType == OPERAND_TYPE_IMMEDIATE32);
-        if (psDest->eType == OPERAND_TYPE_SPECIAL_IMMCONSTINT)
-        {
-            bformata(glsl, "const ivec4 IntImmConst%d = ", psDest->ui32RegisterNumber);
-        }
-        else
-        {
-            bformata(glsl, "const vec4 ImmConst%d = ", psDest->ui32RegisterNumber);
-            AddToDx9ImmConstIndexableArray(psContext, psDest);
-        }
-        TranslateOperand(psContext, psSrc, TO_FLAG_NONE);
-        bcatcstr(glsl, ";\n");
-
-        break;
-    }
-    case OPCODE_DCL_CONSTANT_BUFFER:
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        const uint32_t ui32BindingPoint = psOperand->aui32ArraySizes[0];
-
-        ConstantBuffer* psCBuf = NULL;
-        GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, ui32BindingPoint, &psContext->psShader->sInfo, &psCBuf);
-
-        if (psCBuf)
-        {
-            // Constant buffers declared as "dynamicIndexed" are declared as raw vec4 arrays, as there is no general way to retrieve the member corresponding to a dynamic index.
-            // Simple cases can probably be handled easily, but for example when arrays (possibly nested with structs) are contained in the constant buffer and the shader reads
-            // from a dynamic index we would need to "undo" the operations done in order to compute the variable offset, and such a feature is not available at the moment.
-            psCBuf->blob = psDecl->value.eCBAccessPattern == CONSTANT_BUFFER_ACCESS_PATTERN_DYNAMICINDEXED;
-        }
-
-        // We don't have a original resource name, maybe generate one???
-        if (!psCBuf)
-        {
-            if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) && (psContext->flags & HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS) == 0)
-            {
-                bformata(glsl, "layout(location = %d) ", ui32BindingPoint);
-            }
-
-            bformata(glsl, "layout(std140) uniform ConstantBuffer%d {\n\tvec4 data[%d];\n} cb%d;\n", ui32BindingPoint, psOperand->aui32ArraySizes[1], ui32BindingPoint);
-            break;
-        }
-        else if (psCBuf->blob)
-        {
-            if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) && (psContext->flags & HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS) == 0)
-            {
-                bformata(glsl, "layout(location = %d) ", ui32BindingPoint);
-            }
-
-            bcatcstr(glsl, "layout(std140) uniform ");
-            ConvertToUniformBufferName(glsl, psShader, psCBuf->Name);
-            bcatcstr(glsl, " {\n\tvec4 ");
-            ConvertToUniformBufferName(glsl, psShader, psCBuf->Name);
-            bformata(glsl, "_data[%d];\n};\n", psOperand->aui32ArraySizes[1]);
-            break;
-        }
-
-        if (psContext->flags & HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT)
-        {
-            if (psContext->flags & HLSLCC_FLAG_GLOBAL_CONSTS_NEVER_IN_UBO && psCBuf->Name[0] == '$')
-            {
-                DeclareStructConstants(psContext, ui32BindingPoint, psCBuf, psOperand);
-            }
-            else
-            {
-                DeclareUBOConstants(psContext, ui32BindingPoint, psCBuf);
-            }
-        }
-        else
-        {
-            DeclareStructConstants(psContext, ui32BindingPoint, psCBuf, psOperand);
-        }
-        break;
-    }
-    case OPCODE_DCL_RESOURCE:
-    {
-        bool isGmemResource = false;
-        const int initialMemSize = 64;
-        bstring earlyMain = bfromcstralloc(initialMemSize, "");
-        if (IsGmemReservedSlot(FBF_EXT_COLOR, psDecl->asOperands[0].ui32RegisterNumber))
-        {
-            // A GMEM reserve slot was used.
-            // This is not a resource but an inout RT of the pixel shader            
-            int regNum = GetGmemInputResourceSlot(psDecl->asOperands[0].ui32RegisterNumber);
-            // FXC thinks this is a texture so we can't trust the number of elements. We get that from the "register number".
-            int numElements = GetGmemInputResourceNumElements(psDecl->asOperands[0].ui32RegisterNumber);
-            ASSERT(numElements);
-
-            const char* Precision = "highp";
-            const char* outputName = "PixOutput";
-
-            bformata(glsl, "layout(location = %d) ", regNum);
-            bformata(glsl, "inout %s vec%d %s%d;\n", Precision, numElements, outputName, regNum);
-
-            const char* mask[] = { "x", "y", "z", "w" };
-            // Since we are using Textures as GMEM inputs FXC will threat them as vec4 values. The rendertarget may not be a vec4 (numElements != 4)
-            // so we create a new variable (GMEM_InputXX) at the beginning of the shader that wraps the rendertarget value.
-            bformata(earlyMain, "%s vec4 GMEM_Input%d = %s vec4(%s%d.", Precision, regNum, Precision, outputName, regNum);
-            for (int i = 0; i < 4; ++i)
-            {
-                bformata(earlyMain, "%s", i < numElements ? mask[i] : mask[numElements - 1]);
-            }
-            bcatcstr(earlyMain, ");\n");
-            isGmemResource = true;
-        }
-        else if (IsGmemReservedSlot(FBF_ARM_COLOR, psDecl->asOperands[0].ui32RegisterNumber))
-        {
-            bcatcstr(earlyMain, "vec4 GMEM_Input0 = vec4(gl_LastFragColorARM);\n");
-            isGmemResource = true;
-        }
-        else if (IsGmemReservedSlot(FBF_ARM_DEPTH, psDecl->asOperands[0].ui32RegisterNumber))
-        {
-            bcatcstr(earlyMain, "vec4 GMEM_Depth = vec4(gl_LastFragDepthARM);\n");
-            isGmemResource = true;
-        }
-        else if (IsGmemReservedSlot(FBF_ARM_STENCIL, psDecl->asOperands[0].ui32RegisterNumber))
-        {
-            bcatcstr(earlyMain, "ivec4 GMEM_Stencil = ivec4(gl_LastFragStencilARM);\n");
-            isGmemResource = true;
-        }
-
-        if (isGmemResource)
-        {
-            if (earlyMain->slen)
-            {
-                bstring* savedStringPtr = psContext->currentGLSLString;
-                psContext->currentGLSLString = &psContext->earlyMain;
-                psContext->indent++;
-                AddIndentation(psContext);
-                bconcat(*psContext->currentGLSLString, earlyMain);
-                psContext->indent--;
-                psContext->currentGLSLString = savedStringPtr;
-            }
-            break;
-        }
-
-        char* szResourceTypeName = "";
-        uint32_t bCanBeCompare;
-        uint32_t i;
-        SamplerMask sMask;
-
-        if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions) && (psContext->flags & HLSLCC_FLAG_AVOID_RESOURCE_BINDINGS_AND_LOCATIONS) == 0)
-        {
-            //Constant buffer locations start at 0. Resource locations start at ui32NumConstantBuffers.
-            bformata(glsl, "layout(location = %d) ", psContext->psShader->sInfo.ui32NumConstantBuffers + psDecl->asOperands[0].ui32RegisterNumber);
-        }
-
-        switch (psDecl->value.eResourceDimension)
-        {
-        case RESOURCE_DIMENSION_BUFFER:
-            szResourceTypeName = "Buffer";
-            bCanBeCompare = 0;
-            break;
-        case RESOURCE_DIMENSION_TEXTURE1D:
-            szResourceTypeName = "1D";
-            bCanBeCompare = 1;
-            break;
-        case RESOURCE_DIMENSION_TEXTURE2D:
-            szResourceTypeName = "2D";
-            bCanBeCompare = 1;
-            break;
-        case RESOURCE_DIMENSION_TEXTURE2DMS:
-            szResourceTypeName = "2DMS";
-            bCanBeCompare = 0;
-            break;
-        case RESOURCE_DIMENSION_TEXTURE3D:
-            szResourceTypeName = "3D";
-            bCanBeCompare = 0;
-            break;
-        case RESOURCE_DIMENSION_TEXTURECUBE:
-            szResourceTypeName = "Cube";
-            bCanBeCompare = 1;
-            break;
-        case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-            szResourceTypeName = "1DArray";
-            bCanBeCompare = 1;
-            break;
-        case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-            szResourceTypeName = "2DArray";
-            bCanBeCompare = 1;
-            break;
-        case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-            szResourceTypeName = "2DMSArray";
-            bCanBeCompare = 0;
-            break;
-        case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-            szResourceTypeName = "CubeArray";
-            bCanBeCompare = 1;
-            break;
-        }
-
-        for (i = 0; i < psShader->sInfo.ui32NumSamplers; ++i)
-        {
-            if (psShader->sInfo.asSamplers[i].sMask.ui10TextureBindPoint == psDecl->asOperands[0].ui32RegisterNumber)
-            {
-                sMask = psShader->sInfo.asSamplers[i].sMask;
-
-                if (bCanBeCompare && sMask.bCompareSample)     // Sampled with depth comparison
-                {
-                    bformata(glsl, "uniform sampler%sShadow ", szResourceTypeName);
-                    TextureName(*psContext->currentGLSLString, psContext->psShader, psDecl->asOperands[0].ui32RegisterNumber, sMask.ui10SamplerBindPoint, 1);
-                    bcatcstr(glsl, ";\n");
-                }
-                if (sMask.bNormalSample || !sMask.bCompareSample)     // Either sampled normally or with texelFetch
-                {
-                    if (psDecl->ui32TexReturnType == RETURN_TYPE_SINT)
-                    {
-                        bformata(glsl, "uniform isampler%s ", szResourceTypeName);
-                    }
-                    else if (psDecl->ui32TexReturnType == RETURN_TYPE_UINT)
-                    {
-                        bformata(glsl, "uniform usampler%s ", szResourceTypeName);
-                    }
-                    else
-                    {
-                        bformata(glsl, "uniform sampler%s ", szResourceTypeName);
-                    }
-                    TextureName(*psContext->currentGLSLString, psContext->psShader, psDecl->asOperands[0].ui32RegisterNumber, sMask.ui10SamplerBindPoint, 0);
-                    bcatcstr(glsl, ";\n");
-                }
-            }
-        }
-
-        ASSERT(psDecl->asOperands[0].ui32RegisterNumber < MAX_TEXTURES);
-        psShader->aeResourceDims[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->value.eResourceDimension;
-        break;
-    }
-    case OPCODE_DCL_OUTPUT:
-    {
-        if (psShader->eShaderType == HULL_SHADER && psDecl->asOperands[0].ui32RegisterNumber == 0)
-        {
-            AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT4, 0, "gl_out[gl_InvocationID].gl_Position");
-        }
-        else
-        {
-            AddUserOutput(psContext, psDecl);
-        }
-        break;
-    }
-    case OPCODE_DCL_GLOBAL_FLAGS:
-    {
-        uint32_t ui32Flags = psDecl->value.ui32GlobalFlags;
-
-        // OpenGL versions lower than 4.1 don't support the
-        // layout(early_fragment_tests) directive and will fail to compile
-        // the shader
-        if (ui32Flags & GLOBAL_FLAG_FORCE_EARLY_DEPTH_STENCIL && EarlyDepthTestSupported(psShader->eTargetLanguage) && 
-            !(psShader->eGmemType & (FBF_ARM_DEPTH | FBF_ARM_STENCIL))) // Early fragment test is not allowed when fetching from the depth/stencil buffer. 
-        {
-            bcatcstr(glsl, "layout(early_fragment_tests) in;\n");
-        }
-        if (!(ui32Flags & GLOBAL_FLAG_REFACTORING_ALLOWED))
-        {
-            //TODO add precise
-            //HLSL precise - http://msdn.microsoft.com/en-us/library/windows/desktop/hh447204(v=vs.85).aspx
-        }
-        if (ui32Flags & GLOBAL_FLAG_ENABLE_DOUBLE_PRECISION_FLOAT_OPS)
-        {
-            bcatcstr(glsl, "#extension GL_ARB_gpu_shader_fp64 : enable\n");
-            psShader->fp64 = 1;
-        }
-        break;
-    }
-
-    case OPCODE_DCL_THREAD_GROUP:
-    {
-        bformata(glsl, "layout(local_size_x = %d, local_size_y = %d, local_size_z = %d) in;\n",
-            psDecl->value.aui32WorkGroupSize[0],
-            psDecl->value.aui32WorkGroupSize[1],
-            psDecl->value.aui32WorkGroupSize[2]);
-        break;
-    }
-    case OPCODE_DCL_TESS_OUTPUT_PRIMITIVE:
-    {
-        if (psContext->psShader->eShaderType == HULL_SHADER)
-        {
-            psContext->psShader->sInfo.eTessOutPrim = psDecl->value.eTessOutPrim;
-        }
-        break;
-    }
-    case OPCODE_DCL_TESS_DOMAIN:
-    {
-        if (psContext->psShader->eShaderType == DOMAIN_SHADER)
-        {
-            switch (psDecl->value.eTessDomain)
-            {
-            case TESSELLATOR_DOMAIN_ISOLINE:
-            {
-                bcatcstr(glsl, "layout(isolines) in;\n");
-                break;
-            }
-            case TESSELLATOR_DOMAIN_TRI:
-            {
-                bcatcstr(glsl, "layout(triangles) in;\n");
-                break;
-            }
-            case TESSELLATOR_DOMAIN_QUAD:
-            {
-                bcatcstr(glsl, "layout(quads) in;\n");
-                break;
-            }
-            default:
-            {
-                break;
-            }
-            }
-        }
-        break;
-    }
-    case OPCODE_DCL_TESS_PARTITIONING:
-    {
-        if (psContext->psShader->eShaderType == HULL_SHADER)
-        {
-            psContext->psShader->sInfo.eTessPartitioning = psDecl->value.eTessPartitioning;
-        }
-        break;
-    }
-    case OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
-    {
-        switch (psDecl->value.eOutputPrimitiveTopology)
-        {
-        case PRIMITIVE_TOPOLOGY_POINTLIST:
-        {
-            bcatcstr(glsl, "layout(points) out;\n");
-            break;
-        }
-        case PRIMITIVE_TOPOLOGY_LINELIST_ADJ:
-        case PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ:
-        case PRIMITIVE_TOPOLOGY_LINELIST:
-        case PRIMITIVE_TOPOLOGY_LINESTRIP:
-        {
-            bcatcstr(glsl, "layout(line_strip) out;\n");
-            break;
-        }
-
-        case PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ:
-        case PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ:
-        case PRIMITIVE_TOPOLOGY_TRIANGLESTRIP:
-        case PRIMITIVE_TOPOLOGY_TRIANGLELIST:
-        {
-            bcatcstr(glsl, "layout(triangle_strip) out;\n");
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-        break;
-    }
-    case OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
-    {
-        bformata(glsl, "layout(max_vertices = %d) out;\n", psDecl->value.ui32MaxOutputVertexCount);
-        break;
-    }
-    case OPCODE_DCL_GS_INPUT_PRIMITIVE:
-    {
-        switch (psDecl->value.eInputPrimitive)
-        {
-        case PRIMITIVE_POINT:
-        {
-            bcatcstr(glsl, "layout(points) in;\n");
-            break;
-        }
-        case PRIMITIVE_LINE:
-        {
-            bcatcstr(glsl, "layout(lines) in;\n");
-            break;
-        }
-        case PRIMITIVE_LINE_ADJ:
-        {
-            bcatcstr(glsl, "layout(lines_adjacency) in;\n");
-            break;
-        }
-        case PRIMITIVE_TRIANGLE:
-        {
-            bcatcstr(glsl, "layout(triangles) in;\n");
-            break;
-        }
-        case PRIMITIVE_TRIANGLE_ADJ:
-        {
-            bcatcstr(glsl, "layout(triangles_adjacency) in;\n");
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-        break;
-    }
-    case OPCODE_DCL_INTERFACE:
-    {
-        const uint32_t interfaceID = psDecl->value.interface.ui32InterfaceID;
-        const uint32_t numUniforms = psDecl->value.interface.ui32ArraySize;
-        const uint32_t ui32NumBodiesPerTable = psContext->psShader->funcPointer[interfaceID].ui32NumBodiesPerTable;
-        ShaderVar* psVar;
-        uint32_t varFound;
-
-        const char* uniformName;
-
-        varFound = GetInterfaceVarFromOffset(interfaceID, &psContext->psShader->sInfo, &psVar);
-        ASSERT(varFound);
-        uniformName = &psVar->sType.Name[0];
-
-        bformata(glsl, "subroutine uniform SubroutineType %s[%d*%d];\n", uniformName, numUniforms, ui32NumBodiesPerTable);
-        break;
-    }
-    case OPCODE_DCL_FUNCTION_BODY:
-    {
-        //bformata(glsl, "void Func%d();//%d\n", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].eType);
-        break;
-    }
-    case OPCODE_DCL_FUNCTION_TABLE:
-    {
-        break;
-    }
-    case OPCODE_CUSTOMDATA:
-    {
-        const uint32_t ui32NumVec4 = psDecl->ui32NumOperands;
-        const uint32_t ui32NumVec4Minus1 = (ui32NumVec4 - 1);
-        uint32_t ui32ConstIndex = 0;
-        int integerCoords[4];
-        bool qualcommWorkaround = (psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND) != 0;
-
-        if (qualcommWorkaround)
-        {
-            bformata(glsl, "const ");
-        }
-
-        bformata(glsl, "ivec4 immediateConstBufferInt[%d] = ivec4[%d] (\n", ui32NumVec4, ui32NumVec4);
-        for (ui32ConstIndex = 0; ui32ConstIndex < ui32NumVec4Minus1; ui32ConstIndex++)
-        {
-            integerCoords[0] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-            integerCoords[1] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-            integerCoords[2] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-            integerCoords[3] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-
-            bformata(glsl, "\tivec4(%d, %d, %d, %d), \n", integerCoords[0], integerCoords[1], integerCoords[2], integerCoords[3]);
-        }
-        //No trailing comma on this one
-        integerCoords[0] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-        integerCoords[1] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-        integerCoords[2] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-        integerCoords[3] = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-
-        bformata(glsl, "\tivec4(%d, %d, %d, %d)\n", integerCoords[0], integerCoords[1], integerCoords[2], integerCoords[3]);
-        bcatcstr(glsl, ");\n");
-
-        //If ShaderBitEncodingSupported then 1 integer buffer, use intBitsToFloat to get float values. - More instructions.
-        //else 2 buffers - one integer and one float. - More data
-
-        if (ShaderBitEncodingSupported(psShader->eTargetLanguage) == 0)
-        {
-            float floatCoords[4];
-            bcatcstr(glsl, "#define immediateConstBufferI(idx) immediateConstBufferInt[idx]\n");
-            bcatcstr(glsl, "#define immediateConstBufferF(idx) immediateConstBuffer[idx]\n");
-
-            bformata(glsl, "vec4 immediateConstBuffer[%d] = vec4[%d] (\n", ui32NumVec4, ui32NumVec4);
-            for (ui32ConstIndex = 0; ui32ConstIndex < ui32NumVec4Minus1; ui32ConstIndex++)
-            {
-                floatCoords[0] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-                floatCoords[1] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-                floatCoords[2] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-                floatCoords[3] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-
-                //A single vec4 can mix integer and float types.
-                //Forced NAN and INF to zero inside the immediate constant buffer. This will allow the shader to compile.
-                if (fpcheck(floatCoords[0]))
-                {
-                    floatCoords[0] = 0;
-                }
-                if (fpcheck(floatCoords[1]))
-                {
-                    floatCoords[1] = 0;
-                }
-                if (fpcheck(floatCoords[2]))
-                {
-                    floatCoords[2] = 0;
-                }
-                if (fpcheck(floatCoords[3]))
-                {
-                    floatCoords[3] = 0;
-                }
-
-                bformata(glsl, "\tvec4(%e, %e, %e, %e), \n", floatCoords[0], floatCoords[1], floatCoords[2], floatCoords[3]);
-            }
-            //No trailing comma on this one
-            floatCoords[0] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-            floatCoords[1] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-            floatCoords[2] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-            floatCoords[3] = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-            if (fpcheck(floatCoords[0]))
-            {
-                floatCoords[0] = 0;
-            }
-            if (fpcheck(floatCoords[1]))
-            {
-                floatCoords[1] = 0;
-            }
-            if (fpcheck(floatCoords[2]))
-            {
-                floatCoords[2] = 0;
-            }
-            if (fpcheck(floatCoords[3]))
-            {
-                floatCoords[3] = 0;
-            }
-            bformata(glsl, "\tvec4(%e, %e, %e, %e)\n", floatCoords[0], floatCoords[1], floatCoords[2], floatCoords[3]);
-            bcatcstr(glsl, ");\n");
-        }
-        else
-        {
-            if (qualcommWorkaround)
-            {
-                bcatcstr(glsl, "ivec4 immediateConstBufferI(int idx) { return immediateConstBufferInt[idx]; }\n");
-                bcatcstr(glsl, "vec4 immediateConstBufferF(int idx) { return intBitsToFloat(immediateConstBufferInt[idx]); }\n");
-            }
-            else
-            {
-                bcatcstr(glsl, "#define immediateConstBufferI(idx) immediateConstBufferInt[idx]\n");
-                bcatcstr(glsl, "#define immediateConstBufferF(idx) intBitsToFloat(immediateConstBufferInt[idx])\n");
-            }
-        }
-
-        break;
-    }
-    case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-    {
-        const uint32_t forkPhaseNum = psDecl->value.aui32HullPhaseInstanceInfo[0];
-        const uint32_t instanceCount = psDecl->value.aui32HullPhaseInstanceInfo[1];
-        bformata(glsl, "const int HullPhase%dInstanceCount = %d;\n", forkPhaseNum, instanceCount);
-        break;
-    }
-    case OPCODE_DCL_INDEXABLE_TEMP:
-    {
-        const uint32_t ui32RegIndex = psDecl->sIdxTemp.ui32RegIndex;
-        const uint32_t ui32RegCount = psDecl->sIdxTemp.ui32RegCount;
-        const uint32_t ui32RegComponentSize = psDecl->sIdxTemp.ui32RegComponentSize;
-        bformata(glsl, "vec%d TempArray%d[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-        bformata(glsl, "ivec%d TempArray%d_int[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-        if (HaveUVec(psShader->eTargetLanguage))
-        {
-            bformata(glsl, "uvec%d TempArray%d_uint[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-        }
-        if (psShader->fp64)
-        {
-            bformata(glsl, "dvec%d TempArray%d_double[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-        }
-        break;
-    }
-    case OPCODE_DCL_INDEX_RANGE:
-    {
-        break;
-    }
-    case OPCODE_HS_DECLS:
-    {
-        break;
-    }
-    case OPCODE_DCL_INPUT_CONTROL_POINT_COUNT:
-    {
-        break;
-    }
-    case OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT:
-    {
-        if (psContext->psShader->eShaderType == HULL_SHADER)
-        {
-            bformata(glsl, "layout(vertices=%d) out;\n", psDecl->value.ui32MaxOutputVertexCount);
-        }
-        break;
-    }
-    case OPCODE_HS_FORK_PHASE:
-    {
-        break;
-    }
-    case OPCODE_HS_JOIN_PHASE:
-    {
-        break;
-    }
-    case OPCODE_DCL_SAMPLER:
-    {
-        break;
-    }
-    case OPCODE_DCL_HS_MAX_TESSFACTOR:
-    {
-        //For GLSL the max tessellation factor is fixed to the value of gl_MaxTessGenLevel.
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-    {
-        if (psDecl->sUAV.ui32GloballyCoherentAccess & GLOBALLY_COHERENT_ACCESS)
-        {
-            bcatcstr(glsl, "coherent ");
-        }
-
-        if (psShader->aiOpcodeUsed[OPCODE_LD_UAV_TYPED] == 0)
-        {
-            bcatcstr(glsl, "writeonly ");
-        }
-        else
-        {
-            if (psShader->aiOpcodeUsed[OPCODE_STORE_UAV_TYPED] == 0)
-            {
-                bcatcstr(glsl, "readonly ");
-            }
-
-            switch (psDecl->sUAV.Type)
-            {
-            case RETURN_TYPE_FLOAT:
-                bcatcstr(glsl, "layout(rgba32f) ");
-                break;
-            case RETURN_TYPE_UNORM:
-                bcatcstr(glsl, "layout(rgba8) ");
-                break;
-            case RETURN_TYPE_SNORM:
-                bcatcstr(glsl, "layout(rgba8_snorm) ");
-                break;
-            case RETURN_TYPE_UINT:
-                bcatcstr(glsl, "layout(rgba32ui) ");
-                break;
-            case RETURN_TYPE_SINT:
-                bcatcstr(glsl, "layout(rgba32i) ");
-                break;
-            default:
-                ASSERT(0);
-            }
-        }
-
-        {
-            char* prefix = "";
-            switch (psDecl->sUAV.Type)
-            {
-            case RETURN_TYPE_UINT:
-                prefix = "u";
-                break;
-            case RETURN_TYPE_SINT:
-                prefix = "i";
-                break;
-            default:
-                break;
-            }
-
-            switch (psDecl->value.eResourceDimension)
-            {
-            case RESOURCE_DIMENSION_BUFFER:
-                bformata(glsl, "uniform %simageBuffer ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURE1D:
-                bformata(glsl, "uniform %simage1D ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURE2D:
-                bformata(glsl, "uniform %simage2D ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURE2DMS:
-                bformata(glsl, "uniform %simage2DMS ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURE3D:
-                bformata(glsl, "uniform %simage3D ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURECUBE:
-                bformata(glsl, "uniform %simageCube ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-                bformata(glsl, "uniform %simage1DArray ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-                bformata(glsl, "uniform %simage2DArray ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-                bformata(glsl, "uniform %simage3DArray ", prefix);
-                break;
-            case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-                bformata(glsl, "uniform %simageCubeArray ", prefix);
-                break;
-            }
-        }
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-    {
-        const uint32_t ui32BindingPoint = psDecl->asOperands[0].aui32ArraySizes[0];
-        ConstantBuffer* psCBuf = NULL;
-
-        if (psDecl->sUAV.bCounter)
-        {
-            bformata(glsl, "layout (binding = 1) uniform atomic_uint UAV%d_counter;\n", psDecl->asOperands[0].ui32RegisterNumber);
-        }
-
-        GetConstantBufferFromBindingPoint(RGROUP_UAV, ui32BindingPoint, &psContext->psShader->sInfo, &psCBuf);
-
-        if (ui32BindingPoint >= GMEM_PLS_RO_SLOT && ui32BindingPoint <= GMEM_PLS_RW_SLOT)
-        {
-            DeclarePLSVariable(psContext, ui32BindingPoint, psCBuf, &psDecl->asOperands[0], psDecl->sUAV.ui32GloballyCoherentAccess, RTYPE_UAV_RWSTRUCTURED);
-        }
-        else
-        {
-            DeclareBufferVariable(psContext, ui32BindingPoint, psCBuf, &psDecl->asOperands[0], psDecl->sUAV.ui32GloballyCoherentAccess, RTYPE_UAV_RWSTRUCTURED);
-        }
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-    {
-        bstring varName;
-        if (psDecl->sUAV.bCounter)
-        {
-            bformata(glsl, "layout (binding = 1) uniform atomic_uint UAV%d_counter;\n", psDecl->asOperands[0].ui32RegisterNumber);
-        }
-
-        varName = bfromcstralloc(16, "");
-        bformata(varName, "UAV%d", psDecl->asOperands[0].ui32RegisterNumber);
-
-        bformata(glsl, "buffer Block%d {\n\tuint ", psDecl->asOperands[0].ui32RegisterNumber);
-        ShaderVarName(glsl, psShader, bstr2cstr(varName, '\0'));
-        bcatcstr(glsl, "[];\n};\n");
-
-        bdestroy(varName);
-        break;
-    }
-    case OPCODE_DCL_RESOURCE_STRUCTURED:
-    {
-        ConstantBuffer* psCBuf = NULL;
-
-        GetConstantBufferFromBindingPoint(RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-
-        DeclareBufferVariable(psContext, psDecl->asOperands[0].ui32RegisterNumber, psCBuf, &psDecl->asOperands[0], 0, RTYPE_STRUCTURED);
-        break;
-    }
-    case OPCODE_DCL_RESOURCE_RAW:
-    {
-        bstring varName = bfromcstralloc(16, "");
-        bformata(varName, "RawRes%d", psDecl->asOperands[0].ui32RegisterNumber);
-
-        bformata(glsl, "buffer Block%d {\n\tuint ", psDecl->asOperands[0].ui32RegisterNumber);
-        ShaderVarName(glsl, psContext->psShader, bstr2cstr(varName, '\0'));
-        bcatcstr(glsl, "[];\n};\n");
-
-        bdestroy(varName);
-        break;
-    }
-    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW:
-    {
-        ShaderVarType* psVarType = &psShader->sGroupSharedVarType[psDecl->asOperands[0].ui32RegisterNumber];
-
-        ASSERT(psDecl->asOperands[0].ui32RegisterNumber < MAX_GROUPSHARED);
-        ASSERT(psDecl->sTGSM.ui32Count == 1);
-
-        bcatcstr(glsl, "shared uint ");
-
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-        bformata(glsl, "[%d];\n", psDecl->sTGSM.ui32Count);
-
-        memset(psVarType, 0, sizeof(ShaderVarType));
-        strcpy(psVarType->Name, "$Element");
-
-        psVarType->Columns = psDecl->sTGSM.ui32Stride / 4;
-        psVarType->Elements = psDecl->sTGSM.ui32Count;
-        psVarType->Type = SVT_UINT;
-        break;
-    }
-    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED:
-    {
-        ShaderVarType* psVarType = &psShader->sGroupSharedVarType[psDecl->asOperands[0].ui32RegisterNumber];
-
-        ASSERT(psDecl->asOperands[0].ui32RegisterNumber < MAX_GROUPSHARED);
-
-        bcatcstr(glsl, "shared struct {\n");
-        bformata(glsl, "uint value[%d];\n", psDecl->sTGSM.ui32Stride / 4);
-        bcatcstr(glsl, "} ");
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-        bformata(glsl, "[%d];\n",
-            psDecl->sTGSM.ui32Count);
-
-        memset(psVarType, 0, sizeof(ShaderVarType));
-        strcpy(psVarType->Name, "$Element");
-
-        psVarType->Columns = psDecl->sTGSM.ui32Stride / 4;
-        psVarType->Elements = psDecl->sTGSM.ui32Count;
-        psVarType->Type = SVT_UINT;
-        break;
-    }
-    case OPCODE_DCL_STREAM:
-    {
-        ASSERT(psDecl->asOperands[0].eType == OPERAND_TYPE_STREAM);
-
-        psShader->ui32CurrentVertexOutputStream = psDecl->asOperands[0].ui32RegisterNumber;
-
-        bformata(glsl, "layout(stream = %d) out;\n", psShader->ui32CurrentVertexOutputStream);
-
-        break;
-    }
-    case OPCODE_DCL_GS_INSTANCE_COUNT:
-    {
-        bformata(glsl, "layout(invocations = %d) in;\n", psDecl->value.ui32GSInstanceCount);
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-}
-
-//Convert from per-phase temps to global temps for GLSL.
-void ConsolidateHullTempVars(Shader* psShader)
-{
-    uint32_t i, k;
-    const uint32_t ui32NumDeclLists = 3 + psShader->ui32ForkPhaseCount;
-    Declaration* pasDeclArray[3 + MAX_FORK_PHASES];
-    uint32_t aui32DeclCounts[3 + MAX_FORK_PHASES];
-    uint32_t ui32NumTemps = 0;
-
-    i = 0;
-
-    pasDeclArray[i] = psShader->psHSDecl;
-    aui32DeclCounts[i++] = psShader->ui32HSDeclCount;
-
-    pasDeclArray[i] = psShader->psHSControlPointPhaseDecl;
-    aui32DeclCounts[i++] = psShader->ui32HSControlPointDeclCount;
-    for (k = 0; k < psShader->ui32ForkPhaseCount; ++k)
-    {
-        pasDeclArray[i] = psShader->apsHSForkPhaseDecl[k];
-        aui32DeclCounts[i++] = psShader->aui32HSForkDeclCount[k];
-    }
-    pasDeclArray[i] = psShader->psHSJoinPhaseDecl;
-    aui32DeclCounts[i++] = psShader->ui32HSJoinDeclCount;
-
-    for (k = 0; k < ui32NumDeclLists; ++k)
-    {
-        for (i = 0; i < aui32DeclCounts[k]; ++i)
-        {
-            Declaration* psDecl = pasDeclArray[k] + i;
-
-            if (psDecl->eOpcode == OPCODE_DCL_TEMPS)
-            {
-                if (ui32NumTemps < psDecl->value.ui32NumTemps)
-                {
-                    //Find the total max number of temps needed by the entire
-                    //shader.
-                    ui32NumTemps = psDecl->value.ui32NumTemps;
-                }
-                //Only want one global temp declaration.
-                psDecl->value.ui32NumTemps = 0;
-            }
-        }
-    }
-
-    //Find the first temp declaration and make it
-    //declare the max needed amount of temps.
-    for (k = 0; k < ui32NumDeclLists; ++k)
-    {
-        for (i = 0; i < aui32DeclCounts[k]; ++i)
-        {
-            Declaration* psDecl = pasDeclArray[k] + i;
-
-            if (psDecl->eOpcode == OPCODE_DCL_TEMPS)
-            {
-                psDecl->value.ui32NumTemps = ui32NumTemps;
-                return;
-            }
-        }
-    }
-}
-
-const char* GetMangleSuffix(const SHADER_TYPE eShaderType)
-{
-    switch (eShaderType)
-    {
-    case VERTEX_SHADER:
-        return "VS";
-    case PIXEL_SHADER:
-        return "PS";
-    case GEOMETRY_SHADER:
-        return "GS";
-    case HULL_SHADER:
-        return "HS";
-    case DOMAIN_SHADER:
-        return "DS";
-    case COMPUTE_SHADER:
-        return "CS";
-    }
-    ASSERT(0);
-    return "";
-}
-
diff --git a/Code/Tools/HLSLCrossCompiler/src/toGLSLInstruction.c b/Code/Tools/HLSLCrossCompiler/src/toGLSLInstruction.c
deleted file mode 100644
index e5124b4122..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/toGLSLInstruction.c
+++ /dev/null
@@ -1,5598 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/toGLSLInstruction.h"
-#include "internal_includes/toGLSLOperand.h"
-#include "internal_includes/languages.h"
-#include "internal_includes/hlslccToolkit.h"
-#include "bstrlib.h"
-#include "stdio.h"
-#include "internal_includes/debug.h"
-
-#include <stdbool.h>
-
-#ifndef min
-#define min(a, b)            (((a) < (b)) ? (a) : (b))
-#endif
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-extern void WriteEndTrace(HLSLCrossCompilerContext* psContext);
-
-typedef enum
-{
-    CMP_EQ,
-    CMP_LT,
-    CMP_GE,
-    CMP_NE,
-} ComparisonType;
-
-void BeginAssignmentEx(HLSLCrossCompilerContext* psContext, const Operand* psDestOperand, uint32_t uSrcToFlag, uint32_t bSaturate, const char* szDestSwizzle)
-{
-    if (psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING && psContext->psShader->eShaderType != HULL_SHADER)
-    {
-        const char* szCastFunction = "";
-        SHADER_VARIABLE_TYPE eSrcType;
-        SHADER_VARIABLE_TYPE eDestType = GetOperandDataType(psContext, psDestOperand);
-        uint32_t uDestElemCount = GetNumSwizzleElements(psDestOperand);
-
-        eSrcType = TypeFlagsToSVTType(uSrcToFlag);
-        if (bSaturate)
-        {
-            eSrcType = SVT_FLOAT;
-        }
-
-        if (!DoAssignmentDataTypesMatch(eDestType, eSrcType))
-        {
-            switch (eDestType)
-            {
-            case SVT_INT:
-            case SVT_INT12:
-            case SVT_INT16:
-            {
-                switch (eSrcType)
-                {
-                case SVT_UINT:
-                case SVT_UINT16:
-                    szCastFunction = GetConstructorForTypeGLSL(psContext, eDestType, uDestElemCount, false);
-                    break;
-                case SVT_FLOAT:
-                    szCastFunction = "floatBitsToInt";
-                    break;
-                default:
-                    // Bitcasts from lower precisions floats are ambiguous
-                    ASSERT(0);
-                    break;
-                }
-            }
-            break;
-            case SVT_UINT:
-            case SVT_UINT16:
-            {
-                switch (eSrcType)
-                {
-                case SVT_INT:
-                case SVT_INT12:
-                case SVT_INT16:
-                    szCastFunction = GetConstructorForTypeGLSL(psContext, eDestType, uDestElemCount, false);
-                    break;
-                case SVT_FLOAT:
-                    szCastFunction = "floatBitsToUint";
-                    break;
-                default:
-                    // Bitcasts from lower precisions floats are ambiguous
-                    ASSERT(0);
-                    break;
-                }
-            }
-            break;
-            case SVT_FLOAT:
-            case SVT_FLOAT10:
-            case SVT_FLOAT16:
-            {
-                switch (eSrcType)
-                {
-                case SVT_UINT:
-                    szCastFunction = "uintBitsToFloat";
-                    break;
-                case SVT_INT:
-                    szCastFunction = "intBitsToFloat";
-                    break;
-                default:
-                    // Bitcasts from lower precisions int/uint are ambiguous
-                    ASSERT(0);
-                    break;
-                }
-            }
-            break;
-            default:
-                ASSERT(0);
-                break;
-            }
-        }
-
-        TranslateOperand(psContext, psDestOperand, TO_FLAG_DESTINATION);
-        if (szDestSwizzle)
-        {
-            bformata(*psContext->currentGLSLString, ".%s = %s(", szDestSwizzle, szCastFunction);
-        }
-        else
-        {
-            bformata(*psContext->currentGLSLString, " = %s(", szCastFunction);
-        }
-    }
-    else
-    {
-        TranslateOperand(psContext, psDestOperand, TO_FLAG_DESTINATION | uSrcToFlag);
-        if (szDestSwizzle)
-        {
-            bformata(*psContext->currentGLSLString, ".%s = ", szDestSwizzle);
-        }
-        else
-        {
-            bcatcstr(*psContext->currentGLSLString, " = ");
-        }
-    }
-    if (bSaturate)
-    {
-        bcatcstr(*psContext->currentGLSLString, "clamp(");
-    }
-}
-
-void BeginAssignment(HLSLCrossCompilerContext* psContext, const Operand* psDestOperand, uint32_t uSrcToFlag, uint32_t bSaturate)
-{
-    BeginAssignmentEx(psContext, psDestOperand, uSrcToFlag, bSaturate, NULL);
-}
-
-void EndAssignment(HLSLCrossCompilerContext* psContext, const Operand* psDestOperand, uint32_t uSrcToFlag, uint32_t bSaturate)
-{
-    (void)psDestOperand;
-    (void)uSrcToFlag;
-
-    if (bSaturate)
-    {
-        bcatcstr(*psContext->currentGLSLString, ", 0.0, 1.0)");
-    }
-
-    if (psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING && psContext->psShader->eShaderType != HULL_SHADER)
-    {
-        bcatcstr(*psContext->currentGLSLString, ")");
-    }
-}
-
-static void AddComparision(HLSLCrossCompilerContext* psContext, Instruction* psInst, ComparisonType eType,
-    uint32_t typeFlag)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-    const uint32_t s0ElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-    const uint32_t s1ElemCount = GetNumSwizzleElements(&psInst->asOperands[2]);
-
-    uint32_t minElemCount = destElemCount < s0ElemCount ? destElemCount : s0ElemCount;
-
-    minElemCount = s1ElemCount < minElemCount ? s1ElemCount : minElemCount;
-
-    if (typeFlag == TO_FLAG_NONE)
-    {
-        const SHADER_VARIABLE_TYPE e0Type = GetOperandDataType(psContext, &psInst->asOperands[1]);
-        const SHADER_VARIABLE_TYPE e1Type = GetOperandDataType(psContext, &psInst->asOperands[2]);
-        if (e0Type != e1Type)
-        {
-            typeFlag = TO_FLAG_INTEGER;
-        }
-        else
-        {
-            switch (e0Type)
-            {
-            case SVT_INT:
-            case SVT_INT12:
-            case SVT_INT16:
-                typeFlag = TO_FLAG_INTEGER;
-                break;
-            case SVT_UINT:
-            case SVT_UINT8:
-            case SVT_UINT16:
-                typeFlag = TO_FLAG_UNSIGNED_INTEGER;
-                break;
-            default:
-                typeFlag = TO_FLAG_FLOAT;
-            }
-        }
-    }
-
-    if (destElemCount > 1)
-    {
-        const char* glslOpcode [] = {
-            "equal",
-            "lessThan",
-            "greaterThanEqual",
-            "notEqual",
-        };
-        char* constructor = "vec";
-
-        if (typeFlag & TO_FLAG_INTEGER)
-        {
-            constructor = "ivec";
-        }
-        else if (typeFlag & TO_FLAG_UNSIGNED_INTEGER)
-        {
-            constructor = "uvec";
-        }
-
-        bstring varName = bfromcstr(GetAuxArgumentName(SVT_UINT));
-        bcatcstr(varName, "1");
-
-        //Component-wise compare
-        AddIndentation(psContext);
-        if (psContext->psShader->ui32MajorVersion < 4)
-        {
-            BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        }
-        else
-        {
-            // Qualcomm driver workaround. Save the operation result into
-            // a temporary variable before assigning it to the register.
-            bconcat(glsl, varName);
-            AddSwizzleUsingElementCount(psContext, minElemCount);
-            bcatcstr(glsl, " = ");
-        }
-
-        bformata(glsl, "uvec%d(%s(%s4(", minElemCount, glslOpcode[eType], constructor);
-        TranslateOperand(psContext, &psInst->asOperands[1], typeFlag);
-        bcatcstr(glsl, ")");
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        //AddSwizzleUsingElementCount(psContext, minElemCount);
-        bformata(glsl, ", %s4(", constructor);
-        TranslateOperand(psContext, &psInst->asOperands[2], typeFlag);
-        bcatcstr(glsl, ")");
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        //AddSwizzleUsingElementCount(psContext, minElemCount);
-        if (psContext->psShader->ui32MajorVersion < 4)
-        {
-            //Result is 1.0f or 0.0f
-            bcatcstr(glsl, "))");
-            EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        }
-        else
-        {
-            bcatcstr(glsl, ")) * 0xFFFFFFFFu;\n");
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-            bconcat(glsl, varName);
-            AddSwizzleUsingElementCount(psContext, minElemCount);
-            EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        }
-        bcatcstr(glsl, ";\n");
-    }
-    else
-    {
-        const char* glslOpcode [] = {
-            "==",
-            "<",
-            ">=",
-            "!=",
-        };
-
-        bool qualcommWorkaround = (psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND) != 0;
-        const char* tempVariableName = "cond";
-        //Scalar compare
-        AddIndentation(psContext);
-        // There's a bug with Qualcomm OpenGLES 3.0 drivers that
-        // makes something like this: "temp1.x = temp2.x == 0 ? 1.0f : 0.0f" always return 0.0f
-        // The workaround is saving the result in a temp variable: bool cond = temp2.x == 0; temp1.x = !!cond ? 1.0f : 0.0f
-        if (qualcommWorkaround)
-        {
-            bcatcstr(glsl, "{\n");
-            ++psContext->indent;
-            AddIndentation(psContext);
-            bformata(glsl, "bool %s = ", tempVariableName);
-            bcatcstr(glsl, "(");
-            TranslateOperand(psContext, &psInst->asOperands[1], typeFlag);
-            bcatcstr(glsl, ")");
-            if (s0ElemCount > minElemCount)
-            {
-                AddSwizzleUsingElementCount(psContext, minElemCount);
-            }
-            bformata(glsl, " %s (", glslOpcode[eType]);
-            TranslateOperand(psContext, &psInst->asOperands[2], typeFlag);
-            bcatcstr(glsl, ")");
-            if (s1ElemCount > minElemCount)
-            {
-                AddSwizzleUsingElementCount(psContext, minElemCount);
-            }
-            bcatcstr(glsl, ";\n");
-            AddIndentation(psContext);
-        }
-
-        if (psContext->psShader->ui32MajorVersion < 4)
-        {
-            BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        }
-        else
-        {
-            BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        }
-
-        if (qualcommWorkaround)
-        {
-            // Using the temporary variable where we stored the result of the comparison for the ternary operator.
-            bformata(glsl, "!!%s ", tempVariableName);
-        }
-        else
-        {
-            bcatcstr(glsl, "((");
-            TranslateOperand(psContext, &psInst->asOperands[1], typeFlag);
-            bcatcstr(glsl, ")");
-            if (s0ElemCount > minElemCount)
-            {
-                AddSwizzleUsingElementCount(psContext, minElemCount);
-            }
-            bformata(glsl, " %s (", glslOpcode[eType]);
-            TranslateOperand(psContext, &psInst->asOperands[2], typeFlag);
-            bcatcstr(glsl, ")");
-            if (s1ElemCount > minElemCount)
-            {
-                AddSwizzleUsingElementCount(psContext, minElemCount);
-            }
-            bcatcstr(glsl, ") ");
-        }
-
-        if (psContext->psShader->ui32MajorVersion < 4)
-        {
-            bcatcstr(glsl, "? 1.0f : 0.0f");
-            EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        }
-        else
-        {
-            bcatcstr(glsl, "? 0xFFFFFFFFu : uint(0)"); // Adreno can't handle 0u (it's treated as int)
-            EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        }
-        bcatcstr(glsl, ";\n");
-        if (qualcommWorkaround)
-        {
-            --psContext->indent;
-            AddIndentation(psContext);
-            bcatcstr(glsl, "}\n");
-        }
-    }
-}
-
-static void AddMOVBinaryOp(HLSLCrossCompilerContext* psContext, const Operand* pDst, const Operand* pSrc, uint32_t bSrcCopy, uint32_t bSaturate)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    const SHADER_VARIABLE_TYPE eSrcType = GetOperandDataType(psContext, pSrc);
-    uint32_t srcCount = GetNumSwizzleElements(pSrc);
-    uint32_t dstCount = GetNumSwizzleElements(pDst);
-    uint32_t bMismatched = 0;
-
-    uint32_t ui32SrcFlags = TO_FLAG_FLOAT;
-    if (!bSaturate)
-    {
-        switch (eSrcType)
-        {
-        case SVT_INT:
-        case SVT_INT12:
-        case SVT_INT16:
-            ui32SrcFlags = TO_FLAG_INTEGER;
-            break;
-        case SVT_UINT:
-        case SVT_UINT8:
-        case SVT_UINT16:
-            ui32SrcFlags = TO_FLAG_UNSIGNED_INTEGER;
-            break;
-        }
-    }
-    if (bSrcCopy)
-    {
-        ui32SrcFlags |= TO_FLAG_COPY;
-    }
-
-    AddIndentation(psContext);
-    BeginAssignment(psContext, pDst, ui32SrcFlags, bSaturate);
-
-    //Mismatched element count or destination has any swizzle
-    if (srcCount != dstCount || (GetFirstOperandSwizzle(psContext, pDst) != -1))
-    {
-        bMismatched = 1;
-
-        // Special case for immediate operands that can be folded into *vec4
-        if (srcCount == 1)
-        {
-            switch (ui32SrcFlags)
-            {
-            case TO_FLAG_INTEGER:
-                bcatcstr(glsl, "ivec4");
-                break;
-            case TO_FLAG_UNSIGNED_INTEGER:
-                bcatcstr(glsl, "uvec4");
-                break;
-            default:
-                bcatcstr(glsl, "vec4");
-            }
-        }
-
-        bcatcstr(glsl, "(");
-    }
-
-    TranslateOperand(psContext, pSrc, ui32SrcFlags);
-
-    if (bMismatched)
-    {
-        bcatcstr(glsl, ")");
-
-        if (GetFirstOperandSwizzle(psContext, pDst) != -1)
-        {
-            TranslateOperandSwizzle(psContext, pDst);
-        }
-        else
-        {
-            AddSwizzleUsingElementCount(psContext, dstCount);
-        }
-    }
-
-    EndAssignment(psContext, pDst, ui32SrcFlags, bSaturate);
-    bcatcstr(glsl, ";\n");
-}
-
-static void AddMOVCBinaryOp(HLSLCrossCompilerContext* psContext, const Operand* pDest, uint32_t bDestCopy, const Operand* src0, const Operand* src1, const Operand* src2)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    uint32_t destElemCount = GetNumSwizzleElements(pDest);
-    uint32_t s0ElemCount = GetNumSwizzleElements(src0);
-    uint32_t s1ElemCount = GetNumSwizzleElements(src1);
-    uint32_t s2ElemCount = GetNumSwizzleElements(src2);
-    uint32_t destElem;
-    int qualcommWorkaround = psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND;
-
-    const char* swizzles = "xyzw";
-    uint32_t eDstDataType;
-    const char* szVecType;
-
-    uint32_t uDestFlags = TO_FLAG_DESTINATION;
-    if (bDestCopy)
-    {
-        uDestFlags |= TO_FLAG_COPY;
-    }
-
-    AddIndentation(psContext);
-    // Qualcomm OpenGLES 3.0 bug that makes something likes this: 
-    // temp4.xyz = vec3(floatsToInt(temp1).x != 0 ? temp2.x : temp2.x, floatsToInt(temp1).y != 0 ? temp2.y : temp2.y, floatsToInt(temp1).z != 0 ? temp2.z : temp2.z)
-    // to fail in the ternary operator. The workaround is to save the floatToInt(temp1) into a temp variable:
-    // { ivec4 cond = floatsToInt(temp1); temp4.xyz = vec3(cond.x != 0 ? temp2.x : temp2.x, cond.y != 0 ? temp2.y : temp2.y, cond.z != 0 ? temp2.z : temp2.z); }
-    if (qualcommWorkaround)
-    {
-        bformata(glsl, "{\n");
-        ++psContext->indent;
-        AddIndentation(psContext);
-        if (s0ElemCount > 1)
-            bformata(glsl, "ivec%d cond = ", s0ElemCount);
-        else
-            bformata(glsl, "int cond = ");
-        TranslateOperand(psContext, src0, TO_FLAG_INTEGER);
-        bformata(glsl, ";\n");
-        AddIndentation(psContext);
-    }
-
-    TranslateOperand(psContext, pDest, uDestFlags);
-
-    switch (GetOperandDataType(psContext, pDest))
-    {
-    case SVT_UINT:
-    case SVT_UINT8:
-    case SVT_UINT16:
-        szVecType = "uvec";
-        eDstDataType = TO_FLAG_UNSIGNED_INTEGER;
-        break;
-    case SVT_INT:
-    case SVT_INT12:
-    case SVT_INT16:
-        szVecType = "ivec";
-        eDstDataType = TO_FLAG_INTEGER;
-        break;
-    default:
-        szVecType = "vec";
-        eDstDataType = TO_FLAG_FLOAT;
-        break;
-    }
-
-    if (destElemCount > 1)
-    {
-        bformata(glsl, " = %s%d(", szVecType, destElemCount);
-    }
-    else
-    {
-        bcatcstr(glsl, " = ");
-    }
-
-    for (destElem = 0; destElem < destElemCount; ++destElem)
-    {
-        if (destElem > 0)
-        {
-            bcatcstr(glsl, ", ");
-        }
-
-        if (qualcommWorkaround)
-        {
-            bcatcstr(glsl, "cond");
-        }
-        else
-        {
-            TranslateOperand(psContext, src0, TO_FLAG_INTEGER);
-        }
-
-        if (s0ElemCount > 1)
-        {
-            TranslateOperandSwizzle(psContext, pDest);
-            bformata(glsl, ".%c", swizzles[destElem]);
-        }
-
-        bcatcstr(glsl, " != 0 ? ");
-
-        TranslateOperand(psContext, src1, eDstDataType);
-        if (s1ElemCount > 1)
-        {
-            TranslateOperandSwizzle(psContext, pDest);
-            bformata(glsl, ".%c", swizzles[destElem]);
-        }
-
-        bcatcstr(glsl, " : ");
-
-        TranslateOperand(psContext, src2, eDstDataType);
-        if (s2ElemCount > 1)
-        {
-            TranslateOperandSwizzle(psContext, pDest);
-            bformata(glsl, ".%c", swizzles[destElem]);
-        }
-    }
-    if (destElemCount > 1)
-    {
-        bcatcstr(glsl, ");\n");
-    }
-    else
-    {
-        bcatcstr(glsl, ";\n");
-    }
-
-    if (qualcommWorkaround)
-    {
-        --psContext->indent;
-        AddIndentation(psContext);
-        bcatcstr(glsl, "}\n");
-    }
-}
-
-void CallBinaryOp(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1, uint32_t dataType)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    uint32_t src1SwizCount = GetNumSwizzleElements(&psInst->asOperands[src1]);
-    uint32_t src0SwizCount = GetNumSwizzleElements(&psInst->asOperands[src0]);
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-
-    AddIndentation(psContext);
-    // Qualcomm OpenGLES 3.0 drivers don't support bitwise operators for vectors.
-    // Because of this we need to do the operation per component.
-    bool qualcommWorkaround = (psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND) != 0;
-    bool isBitwiseOperator = psInst->eOpcode == OPCODE_AND || psInst->eOpcode == OPCODE_OR || psInst->eOpcode == OPCODE_XOR;
-    const char* swizzleString[] = { ".x", ".y", ".z", ".w" };
-    if (src1SwizCount == src0SwizCount == dstSwizCount)
-    {
-        BeginAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        if (qualcommWorkaround && isBitwiseOperator && src0SwizCount > 1)
-        {
-            for (uint32_t i = 0; i < src0SwizCount; ++i)
-            {
-                if (i > 0)
-                {
-                    bcatcstr(glsl, ", ");
-                }
-                TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_NONE | dataType);
-                bformata(glsl, "%s", swizzleString[i]);
-                bformata(glsl, " %s ", name);
-                TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_NONE | dataType);
-                bformata(glsl, "%s", swizzleString[i]);
-            }
-        }
-        else
-        {
-            TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_NONE | dataType);
-            bformata(glsl, " %s ", name);
-            TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_NONE | dataType);
-        }
-        EndAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-    }
-    else
-    {
-        //Upconvert the inputs to vec4 then apply the dest swizzle.
-        BeginAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        if (dataType == TO_FLAG_UNSIGNED_INTEGER)
-        {
-            bcatcstr(glsl, "uvec4(");
-        }
-        else if (dataType == TO_FLAG_INTEGER)
-        {
-            bcatcstr(glsl, "ivec4(");
-        }
-        else
-        {
-            bcatcstr(glsl, "vec4(");
-        }
-
-        if (qualcommWorkaround && isBitwiseOperator && src0SwizCount > 1)
-        {
-            for (uint32_t i = 0; i < src0SwizCount; ++i)
-            {
-                if (i > 0)
-                {
-                    bcatcstr(glsl, ", ");
-                }
-                TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_NONE | dataType);
-                bformata(glsl, "%s", swizzleString[i]);
-                bformata(glsl, " %s ", name);
-                TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_NONE | dataType);
-                bformata(glsl, "%s", swizzleString[i]);
-            }
-        }
-        else
-        {
-            TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_NONE | dataType);
-            bformata(glsl, " %s ", name);
-            TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_NONE | dataType);
-        }
-        bcatcstr(glsl, ")");
-        //Limit src swizzles based on dest swizzle
-        //e.g. given hlsl asm: add r0.xy, v0.xyxx, l(0.100000, 0.000000, 0.000000, 0.000000)
-        //the two sources must become vec2
-        //Temp0.xy = Input0.xyxx + vec4(0.100000, 0.000000, 0.000000, 0.000000);
-        //becomes
-        //Temp0.xy = vec4(Input0.xyxx + vec4(0.100000, 0.000000, 0.000000, 0.000000)).xy;
-
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-        EndAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-    }
-}
-
-void CallTernaryOp(HLSLCrossCompilerContext* psContext, const char* op1, const char* op2, Instruction* psInst,
-    int dest, int src0, int src1, int src2, uint32_t dataType)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    uint32_t src2SwizCount = GetNumSwizzleElements(&psInst->asOperands[src2]);
-    uint32_t src1SwizCount = GetNumSwizzleElements(&psInst->asOperands[src1]);
-    uint32_t src0SwizCount = GetNumSwizzleElements(&psInst->asOperands[src0]);
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-
-    AddIndentation(psContext);
-
-    if (src1SwizCount == src0SwizCount == src2SwizCount == dstSwizCount)
-    {
-        BeginAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_NONE | dataType);
-        bformata(glsl, " %s ", op1);
-        TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_NONE | dataType);
-        bformata(glsl, " %s ", op2);
-        TranslateOperand(psContext, &psInst->asOperands[src2], TO_FLAG_NONE | dataType);
-        EndAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-    }
-    else
-    {
-        BeginAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        if (dataType == TO_FLAG_UNSIGNED_INTEGER)
-        {
-            bcatcstr(glsl, "uvec4(");
-        }
-        else if (dataType == TO_FLAG_INTEGER)
-        {
-            bcatcstr(glsl, "ivec4(");
-        }
-        else
-        {
-            bcatcstr(glsl, "vec4(");
-        }
-        TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_NONE | dataType);
-        bformata(glsl, " %s ", op1);
-        TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_NONE | dataType);
-        bformata(glsl, " %s ", op2);
-        TranslateOperand(psContext, &psInst->asOperands[src2], TO_FLAG_NONE | dataType);
-        bcatcstr(glsl, ")");
-        //Limit src swizzles based on dest swizzle
-        //e.g. given hlsl asm: add r0.xy, v0.xyxx, l(0.100000, 0.000000, 0.000000, 0.000000)
-        //the two sources must become vec2
-        //Temp0.xy = Input0.xyxx + vec4(0.100000, 0.000000, 0.000000, 0.000000);
-        //becomes
-        //Temp0.xy = vec4(Input0.xyxx + vec4(0.100000, 0.000000, 0.000000, 0.000000)).xy;
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-        EndAssignment(psContext, &psInst->asOperands[dest], dataType, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-    }
-}
-
-void CallHelper3(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1, int src2)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    AddIndentation(psContext);
-
-    BeginAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_FLOAT, psInst->bSaturate);
-
-    bcatcstr(glsl, "vec4(");
-
-    bcatcstr(glsl, name);
-    bcatcstr(glsl, "(");
-    TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_DESTINATION);
-    bcatcstr(glsl, ", ");
-    TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_FLOAT);
-    bcatcstr(glsl, ", ");
-    TranslateOperand(psContext, &psInst->asOperands[src2], TO_FLAG_FLOAT);
-    bcatcstr(glsl, "))");
-    TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-    EndAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_FLOAT, psInst->bSaturate);
-    bcatcstr(glsl, ";\n");
-}
-
-void CallHelper2(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    AddIndentation(psContext);
-
-    BeginAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_FLOAT, psInst->bSaturate);
-
-    bcatcstr(glsl, "vec4(");
-
-    bcatcstr(glsl, name);
-    bcatcstr(glsl, "(");
-    TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_FLOAT);
-    bcatcstr(glsl, ", ");
-    TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_FLOAT);
-    bcatcstr(glsl, "))");
-    TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-    EndAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_FLOAT, psInst->bSaturate);
-    bcatcstr(glsl, ";\n");
-}
-
-void CallHelper2Int(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    AddIndentation(psContext);
-
-    BeginAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_INTEGER, psInst->bSaturate);
-
-    bcatcstr(glsl, "ivec4(");
-
-    bcatcstr(glsl, name);
-    bcatcstr(glsl, "(int(");
-    TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_INTEGER);
-    bcatcstr(glsl, "), int(");
-    TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_INTEGER);
-    bcatcstr(glsl, ")))");
-    TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-    EndAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_INTEGER, psInst->bSaturate);
-    bcatcstr(glsl, ";\n");
-}
-void CallHelper2UInt(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    AddIndentation(psContext);
-
-    BeginAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-
-    bcatcstr(glsl, "uvec4(");
-
-    bcatcstr(glsl, name);
-    bcatcstr(glsl, "(uint(");
-    TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_UNSIGNED_INTEGER);
-    bcatcstr(glsl, "), uint(");
-    TranslateOperand(psContext, &psInst->asOperands[src1], TO_FLAG_UNSIGNED_INTEGER);
-    bcatcstr(glsl, ")))");
-    TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-    EndAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-    bcatcstr(glsl, ";\n");
-}
-
-void CallHelper1(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    AddIndentation(psContext);
-
-    BeginAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_FLOAT, psInst->bSaturate);
-
-    // Qualcomm driver workaround
-    // Example: Instead of Temp1.xyz = (vec4(log2(Temp0[0].xyzx)).xyz); we write 
-    // Temp1.xyz = (log2(vec4(Temp0[0].xyzx).xyz));
-    if (psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND)
-    {
-        bcatcstr(glsl, name);
-        bcatcstr(glsl, "(");
-        bcatcstr(glsl, "vec4(");
-        TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ")");
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-        bcatcstr(glsl, ")");
-    }
-    else
-    {
-        bcatcstr(glsl, "vec4(");
-        bcatcstr(glsl, name);
-        bcatcstr(glsl, "(");
-        TranslateOperand(psContext, &psInst->asOperands[src0], TO_FLAG_FLOAT);
-        bcatcstr(glsl, "))");
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[dest]);
-    }
-    EndAssignment(psContext, &psInst->asOperands[dest], TO_FLAG_FLOAT, psInst->bSaturate);
-    bcatcstr(glsl, ";\n");
-}
-
-//Makes sure the texture coordinate swizzle is appropriate for the texture type.
-//i.e. vecX for X-dimension texture.
-//Currently supports floating point coord only, so not used for texelFetch.
-static void TranslateTexCoord(HLSLCrossCompilerContext* psContext,
-    const RESOURCE_DIMENSION eResDim,
-    Operand* psTexCoordOperand)
-{
-    unsigned int uNumCoords = psTexCoordOperand->iNumComponents;
-    int constructor = 0;
-    bstring glsl = *psContext->currentGLSLString;
-
-    switch (eResDim)
-    {
-    case RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        //Vec1 texcoord. Mask out the other components.
-        psTexCoordOperand->aui32Swizzle[1] = 0xFFFFFFFF;
-        psTexCoordOperand->aui32Swizzle[2] = 0xFFFFFFFF;
-        psTexCoordOperand->aui32Swizzle[3] = 0xFFFFFFFF;
-        if (psTexCoordOperand->eType == OPERAND_TYPE_IMMEDIATE32 ||
-            psTexCoordOperand->eType == OPERAND_TYPE_IMMEDIATE64)
-        {
-            psTexCoordOperand->iNumComponents = 1;
-        }
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2D:
-    case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    {
-        //Vec2 texcoord. Mask out the other components.
-        psTexCoordOperand->aui32Swizzle[2] = 0xFFFFFFFF;
-        psTexCoordOperand->aui32Swizzle[3] = 0xFFFFFFFF;
-        if (psTexCoordOperand->eType == OPERAND_TYPE_IMMEDIATE32 ||
-            psTexCoordOperand->eType == OPERAND_TYPE_IMMEDIATE64)
-        {
-            psTexCoordOperand->iNumComponents = 2;
-        }
-        if (psTexCoordOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            constructor = 1;
-            bcatcstr(glsl, "vec2(");
-        }
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBE:
-    case RESOURCE_DIMENSION_TEXTURE3D:
-    case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    {
-        //Vec3 texcoord. Mask out the other component.
-        psTexCoordOperand->aui32Swizzle[3] = 0xFFFFFFFF;
-        if (psTexCoordOperand->eType == OPERAND_TYPE_IMMEDIATE32 ||
-            psTexCoordOperand->eType == OPERAND_TYPE_IMMEDIATE64)
-        {
-            psTexCoordOperand->iNumComponents = 3;
-        }
-        if (psTexCoordOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            constructor = 1;
-            bcatcstr(glsl, "vec3(");
-        }
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    {
-        uNumCoords = 4;
-        if (psTexCoordOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            constructor = 1;
-            bcatcstr(glsl, "vec4(");
-        }
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    //Mask out the other components.
-    switch (psTexCoordOperand->eSelMode)
-    {
-    case OPERAND_4_COMPONENT_SELECT_1_MODE:
-        ASSERT(uNumCoords == 1);
-        break;
-    case OPERAND_4_COMPONENT_SWIZZLE_MODE:
-        while (uNumCoords < 4)
-        {
-            psTexCoordOperand->aui32Swizzle[uNumCoords] = 0xFFFFFFFF;
-            ++uNumCoords;
-        }
-        break;
-    case OPERAND_4_COMPONENT_MASK_MODE:
-        if (psTexCoordOperand->ui32CompMask < 4)
-        {
-            psTexCoordOperand->ui32CompMask =
-                (uNumCoords > 0) * OPERAND_4_COMPONENT_MASK_X |
-                (uNumCoords > 1) * OPERAND_4_COMPONENT_MASK_Y |
-                (uNumCoords > 2) * OPERAND_4_COMPONENT_MASK_Z;
-        }
-        break;
-    }
-    TranslateOperand(psContext, psTexCoordOperand, TO_FLAG_FLOAT);
-
-    if (constructor)
-    {
-        bcatcstr(glsl, ")");
-    }
-}
-
-static int GetNumTextureDimensions(HLSLCrossCompilerContext* psContext,
-    const RESOURCE_DIMENSION eResDim)
-{
-    (void)(psContext);
-
-    switch (eResDim)
-    {
-    case RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        return 1;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2D:
-    case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    case RESOURCE_DIMENSION_TEXTURECUBE:
-    {
-        return 2;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE3D:
-    case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    {
-        return 3;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-    return 0;
-}
-
-void GetResInfoData(HLSLCrossCompilerContext* psContext, Instruction* psInst, int index)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    const RESINFO_RETURN_TYPE eResInfoReturnType = psInst->eResInfoReturnType;
-    const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-
-    //[width, height, depth or array size, total-mip-count]
-    if (index < 3)
-    {
-        int dim = GetNumTextureDimensions(psContext, eResDim);
-
-        if (dim < (index + 1))
-        {
-            bcatcstr(glsl, "0");
-        }
-        else
-        {
-            if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT)
-            {
-                bformata(glsl, "ivec%d(textureSize(", dim);
-            }
-            else if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_RCPFLOAT)
-            {
-                bformata(glsl, "vec%d(1.0f) / vec%d(textureSize(", dim, dim);
-            }
-            else
-            {
-                bformata(glsl, "vec%d(textureSize(", dim);
-            }
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, "))");
-
-            switch (index)
-            {
-            case 0:
-                bcatcstr(glsl, ".x");
-                break;
-            case 1:
-                bcatcstr(glsl, ".y");
-                break;
-            case 2:
-                bcatcstr(glsl, ".z");
-                break;
-            }
-        }
-    }
-    else
-    {
-        bcatcstr(glsl, "textureQueryLevels(");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(glsl, ")");
-    }
-}
-
-uint32_t GetReturnTypeToFlags(RESOURCE_RETURN_TYPE eReturnType)
-{
-    switch (eReturnType)
-    {
-    case RETURN_TYPE_FLOAT:
-        return TO_FLAG_FLOAT;
-    case RETURN_TYPE_UINT:
-        return TO_FLAG_UNSIGNED_INTEGER;
-    case RETURN_TYPE_SINT:
-        return TO_FLAG_INTEGER;
-    case RETURN_TYPE_DOUBLE:
-        return TO_FLAG_DOUBLE;
-    }
-    ASSERT(0);
-    return TO_FLAG_NONE;
-}
-
-uint32_t GetResourceReturnTypeToFlags(ResourceGroup eGroup, uint32_t ui32BindPoint, HLSLCrossCompilerContext* psContext)
-{
-    ResourceBinding* psBinding;
-    if (GetResourceFromBindingPoint(eGroup, ui32BindPoint, &psContext->psShader->sInfo, &psBinding))
-    {
-        return GetReturnTypeToFlags(psBinding->ui32ReturnType);
-    }
-    ASSERT(0);
-    return TO_FLAG_NONE;
-}
-
-#define TEXSMP_FLAG_NONE 0x0
-#define TEXSMP_FLAG_LOD 0x1 //LOD comes from operand
-#define TEXSMP_FLAG_COMPARE 0x2
-#define TEXSMP_FLAG_FIRSTLOD 0x4 //LOD is 0
-#define TEXSMP_FLAG_BIAS 0x8
-#define TEXSMP_FLAGS_GRAD 0x10
-static void TranslateTextureSample(HLSLCrossCompilerContext* psContext, Instruction* psInst, uint32_t ui32Flags)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    const char* funcName = "texture";
-    const char* offset = "";
-    const char* depthCmpCoordType = "";
-    const char* gradSwizzle = "";
-    uint32_t sampleTypeToFlags = TO_FLAG_FLOAT;
-
-    uint32_t ui32NumOffsets = 0;
-
-    const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-
-    const int iHaveOverloadedTexFuncs = HaveOverloadedTextureFuncs(psContext->psShader->eTargetLanguage);
-
-    ASSERT(psInst->asOperands[2].ui32RegisterNumber < MAX_TEXTURES);
-
-    if (psInst->bAddressOffset)
-    {
-        offset = "Offset";
-    }
-
-    switch (eResDim)
-    {
-    case RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        depthCmpCoordType = "vec2";
-        gradSwizzle = ".x";
-        ui32NumOffsets = 1;
-        if (!iHaveOverloadedTexFuncs)
-        {
-            funcName = "texture1D";
-            if (ui32Flags & TEXSMP_FLAG_COMPARE)
-            {
-                funcName = "shadow1D";
-            }
-        }
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2D:
-    {
-        depthCmpCoordType = "vec3";
-        gradSwizzle = ".xy";
-        ui32NumOffsets = 2;
-        if (!iHaveOverloadedTexFuncs)
-        {
-            funcName = "texture2D";
-            if (ui32Flags & TEXSMP_FLAG_COMPARE)
-            {
-                funcName = "shadow2D";
-            }
-        }
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBE:
-    {
-        depthCmpCoordType = "vec3";
-        gradSwizzle = ".xyz";
-        ui32NumOffsets = 3;
-        if (!iHaveOverloadedTexFuncs)
-        {
-            funcName = "textureCube";
-        }
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE3D:
-    {
-        depthCmpCoordType = "vec4";
-        gradSwizzle = ".xyz";
-        ui32NumOffsets = 3;
-        if (!iHaveOverloadedTexFuncs)
-        {
-            funcName = "texture3D";
-        }
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    {
-        depthCmpCoordType = "vec3";
-        gradSwizzle = ".x";
-        ui32NumOffsets = 1;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    {
-        depthCmpCoordType = "vec4";
-        gradSwizzle = ".xy";
-        ui32NumOffsets = 2;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    {
-        gradSwizzle = ".xyz";
-        ui32NumOffsets = 3;
-        if (ui32Flags & TEXSMP_FLAG_COMPARE)
-        {
-            //Special. Reference is a separate argument.
-            AddIndentation(psContext);
-            sampleTypeToFlags = TO_FLAG_FLOAT;
-            BeginAssignment(psContext, &psInst->asOperands[0], sampleTypeToFlags, psInst->bSaturate);
-            if (ui32Flags & (TEXSMP_FLAG_LOD | TEXSMP_FLAG_FIRSTLOD))
-            {
-                bcatcstr(glsl, "(vec4(textureLod(");
-            }
-            else
-            {
-                bcatcstr(glsl, "(vec4(texture(");
-            }
-            TextureName(*psContext->currentGLSLString, psContext->psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1);
-            bcatcstr(glsl, ",");
-            TranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-            bcatcstr(glsl, ",");
-            //.z = reference.
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_FLAG_FLOAT);
-
-            if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-            {
-                bcatcstr(glsl, ", 0.0");
-            }
-
-            bcatcstr(glsl, "))");
-            // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-            // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-            psInst->asOperands[2].iWriteMaskEnabled = 1;
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            bcatcstr(glsl, ")");
-
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-            EndAssignment(psContext, &psInst->asOperands[0], sampleTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-            return;
-        }
-
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    if (ui32Flags & TEXSMP_FLAG_COMPARE)
-    {
-        //For non-cubeMap Arrays the reference value comes from the
-        //texture coord vector in GLSL. For cubmap arrays there is a
-        //separate parameter.
-        //It is always separate paramter in HLSL.
-        AddIndentation(psContext);
-        sampleTypeToFlags = TO_FLAG_FLOAT;
-        BeginAssignment(psContext, &psInst->asOperands[0], sampleTypeToFlags, psInst->bSaturate);
-
-        if (ui32Flags & (TEXSMP_FLAG_LOD | TEXSMP_FLAG_FIRSTLOD))
-        {
-            bformata(glsl, "(vec4(%sLod%s(", funcName, offset);
-        }
-        else
-        {
-            bformata(glsl, "(vec4(%s%s(", funcName, offset);
-        }
-        TextureName(*psContext->currentGLSLString, psContext->psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1);
-        bformata(glsl, ", %s(", depthCmpCoordType);
-        TranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-        bcatcstr(glsl, ",");
-        //.z = reference.
-        TranslateOperand(psContext, &psInst->asOperands[4], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ")");
-
-        if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-        {
-            bcatcstr(glsl, ", 0.0");
-        }
-
-        bcatcstr(glsl, "))");
-    }
-    else
-    {
-        AddIndentation(psContext);
-        sampleTypeToFlags = GetResourceReturnTypeToFlags(RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], sampleTypeToFlags, psInst->bSaturate);
-        if (ui32Flags & (TEXSMP_FLAG_LOD | TEXSMP_FLAG_FIRSTLOD))
-        {
-            bformata(glsl, "(%sLod%s(", funcName, offset);
-        }
-        else
-        if (ui32Flags & TEXSMP_FLAGS_GRAD)
-        {
-            bformata(glsl, "(%sGrad%s(", funcName, offset);
-        }
-        else
-        {
-            bformata(glsl, "(%s%s(", funcName, offset);
-        }
-        TextureName(*psContext->currentGLSLString, psContext->psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 0);
-        bcatcstr(glsl, ", ");
-        TranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-
-        if (ui32Flags & (TEXSMP_FLAG_LOD))
-        {
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_FLAG_FLOAT);
-            if (psContext->psShader->ui32MajorVersion < 4)
-            {
-                bcatcstr(glsl, ".w");
-            }
-        }
-        else
-        if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-        {
-            bcatcstr(glsl, ", 0.0");
-        }
-        else
-        if (ui32Flags & TEXSMP_FLAGS_GRAD)
-        {
-            bcatcstr(glsl, ", vec4(");
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_FLAG_FLOAT);//dx
-            bcatcstr(glsl, ")");
-            bcatcstr(glsl, gradSwizzle);
-            bcatcstr(glsl, ", vec4(");
-            TranslateOperand(psContext, &psInst->asOperands[5], TO_FLAG_FLOAT);//dy
-            bcatcstr(glsl, ")");
-            bcatcstr(glsl, gradSwizzle);
-        }
-
-        if (psInst->bAddressOffset)
-        {
-            if (ui32NumOffsets == 1)
-            {
-                bformata(glsl, ", %d",
-                    psInst->iUAddrOffset);
-            }
-            else
-            if (ui32NumOffsets == 2)
-            {
-                bformata(glsl, ", ivec2(%d, %d)",
-                    psInst->iUAddrOffset,
-                    psInst->iVAddrOffset);
-            }
-            else
-            if (ui32NumOffsets == 3)
-            {
-                bformata(glsl, ", ivec3(%d, %d, %d)",
-                    psInst->iUAddrOffset,
-                    psInst->iVAddrOffset,
-                    psInst->iWAddrOffset);
-            }
-        }
-
-        if (ui32Flags & (TEXSMP_FLAG_BIAS))
-        {
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_FLAG_FLOAT);
-        }
-
-        bcatcstr(glsl, ")");
-    }
-
-    // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-    // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-    psInst->asOperands[2].iWriteMaskEnabled = 1;
-    TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-    bcatcstr(glsl, ")");
-
-    TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-    EndAssignment(psContext, &psInst->asOperands[0], sampleTypeToFlags, psInst->bSaturate);
-    bcatcstr(glsl, ";\n");
-}
-
-static ShaderVarType* LookupStructuredVarExtended(HLSLCrossCompilerContext* psContext,
-    Operand* psResource,
-    Operand* psByteOffset,
-    uint32_t ui32Component,
-    uint32_t* swizzle)
-{
-    ConstantBuffer* psCBuf = NULL;
-    ShaderVarType* psVarType = NULL;
-    uint32_t aui32Swizzle[4] = {OPERAND_4_COMPONENT_X};
-    int byteOffset = psByteOffset ? ((int*)psByteOffset->afImmediates)[0] + 4 * ui32Component : 0;
-    int vec4Offset = byteOffset >> 4;
-    int32_t index = -1;
-    int32_t rebase = -1;
-    int found;
-    //TODO: multi-component stores and vector writes need testing.
-
-    //aui32Swizzle[0] = psInst->asOperands[0].aui32Swizzle[component];
-
-    switch (byteOffset % 16)
-    {
-    case 0:
-        aui32Swizzle[0] = 0;
-        break;
-    case 4:
-        aui32Swizzle[0] = 1;
-        break;
-    case 8:
-        aui32Swizzle[0] = 2;
-        break;
-    case 12:
-        aui32Swizzle[0] = 3;
-        break;
-    }
-
-    switch (psResource->eType)
-    {
-    case OPERAND_TYPE_RESOURCE:
-        GetConstantBufferFromBindingPoint(RGROUP_TEXTURE, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-        break;
-    case OPERAND_TYPE_UNORDERED_ACCESS_VIEW:
-        GetConstantBufferFromBindingPoint(RGROUP_UAV, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-        break;
-    case OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY:
-    {
-        //dcl_tgsm_structured defines the amount of memory and a stride.
-        ASSERT(psResource->ui32RegisterNumber < MAX_GROUPSHARED);
-        ASSERT(swizzle == NULL);
-        return &psContext->psShader->sGroupSharedVarType[psResource->ui32RegisterNumber];
-    }
-    default:
-        ASSERT(0);
-        break;
-    }
-
-    found = GetShaderVarFromOffset(vec4Offset, aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-    ASSERT(found);
-
-    if (swizzle)
-    {
-        // Assuming the components are 4 bytes in length
-        const int bytesPerComponent = 4; 
-        // Calculate the variable swizzling based on the byteOffset and the position of the variable in the structure
-        ASSERT((byteOffset - psVarType->Offset) % 4 == 0);
-        *swizzle = (byteOffset - psVarType->Offset) / bytesPerComponent;
-        ASSERT(*swizzle < 4);
-    }
-
-    return psVarType;
-}
-
-static ShaderVarType* LookupStructuredVar(HLSLCrossCompilerContext* psContext,
-    Operand* psResource,
-    Operand* psByteOffset,
-    uint32_t ui32Component)
-{
-    return LookupStructuredVarExtended(psContext, psResource, psByteOffset, ui32Component, NULL);
-}
-
-static void TranslateShaderStorageVarName(bstring output, Shader* psShader, const Operand* operand, int structured)
-{
-    bstring varName = bfromcstr("");
-    if (operand->eType == OPERAND_TYPE_RESOURCE)
-    {
-        if (structured)
-        {
-            bformata(varName, "StructuredRes%d", operand->ui32RegisterNumber);
-        }
-        else
-        {
-            bformata(varName, "RawRes%d", operand->ui32RegisterNumber);
-        }
-    }
-    else if(operand->eType == OPERAND_TYPE_UNORDERED_ACCESS_VIEW)
-    {
-        bformata(varName, "UAV%d", operand->ui32RegisterNumber);
-    }
-    else
-    {
-        ASSERT(0);
-    }
-    ShaderVarName(output, psShader, bstr2cstr(varName, '\0'));
-    bdestroy(varName);
-}
-
-static void TranslateShaderStorageStore(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    ShaderVarType* psVarType = NULL;
-    int component;
-    int srcComponent = 0;
-
-    Operand* psDest = 0;
-    Operand* psDestAddr = 0;
-    Operand* psDestByteOff = 0;
-    Operand* psSrc = 0;
-    int structured = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_STORE_STRUCTURED:
-        psDest = &psInst->asOperands[0];
-        psDestAddr = &psInst->asOperands[1];
-        psDestByteOff = &psInst->asOperands[2];
-        psSrc = &psInst->asOperands[3];
-        structured = 1;
-        break;
-    case OPCODE_STORE_RAW:
-        psDest = &psInst->asOperands[0];
-        psDestByteOff = &psInst->asOperands[1];
-        psSrc = &psInst->asOperands[2];
-        break;
-    }
-
-    for (component = 0; component < 4; component++)
-    {
-        const char* swizzleString[] = { ".x", ".y", ".z", ".w" };
-        ASSERT(psInst->asOperands[0].eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-        if (psInst->asOperands[0].ui32CompMask & (1 << component))
-        {
-            uint32_t swizzle = 0;
-            if (structured && psDest->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                psVarType = LookupStructuredVarExtended(psContext, psDest, psDestByteOff, component, &swizzle);
-            }
-
-            AddIndentation(psContext);
-            TranslateShaderStorageVarName(glsl, psContext->psShader, psDest, structured);
-            bformata(glsl, "[");
-            if (structured) //Dest address and dest byte offset
-            {
-                if (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    TranslateOperand(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(glsl, "].value[");
-                    TranslateOperand(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(glsl, " >> 2u ");//bytes to floats
-                }
-                else
-                {
-                    TranslateOperand(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                }
-            }
-            else
-            {
-                TranslateOperand(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-            }
-
-            //RAW: change component using index offset
-            if (!structured || (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY))
-            {
-                bformata(glsl, " + %d", component);
-            }
-
-            bformata(glsl, "]");
-
-            if (structured && psDest->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                if (strcmp(psVarType->Name, "$Element") != 0)
-                {
-                    bcatcstr(glsl, ".");
-                    ShaderVarName(glsl, psContext->psShader, psVarType->Name);
-                }
-
-                if (psVarType->Columns > 1)
-                {
-                    bformata(glsl, swizzleString[swizzle]);
-                }
-            }
-
-
-            if (structured)
-            {
-                uint32_t flags = TO_FLAG_UNSIGNED_INTEGER;
-                if (psVarType)
-                {
-                    if (psVarType->Type == SVT_INT)
-                    {
-                        flags = TO_FLAG_INTEGER;
-                    }
-                    else if (psVarType->Type == SVT_FLOAT)
-                    {
-                        flags = TO_FLAG_NONE;
-                    }
-                }
-                //TGSM always uint
-                bformata(glsl, " = (");
-                TranslateOperand(psContext, psSrc, flags);
-            }
-            else
-            {
-                //Dest type is currently always a uint array.
-                bformata(glsl, " = (");
-                TranslateOperand(psContext, psSrc, TO_FLAG_UNSIGNED_INTEGER);
-            }
-
-            if (GetNumSwizzleElements(psSrc) > 1)
-            {
-                bformata(glsl, swizzleString[srcComponent++]);
-            }
-
-            //Double takes an extra slot.
-            if (psVarType && psVarType->Type == SVT_DOUBLE)
-            {
-                if (structured && psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    bcatcstr(glsl, ")");
-                }
-                component++;
-            }
-
-            bformata(glsl, ");\n");
-        }
-    }
-}
-
-static void TranslateShaderPLSStore(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    ShaderVarType* psVarType = NULL;
-    int component;
-    int srcComponent = 0;
-
-    Operand* psDest = 0;
-    Operand* psDestAddr = 0;
-    Operand* psDestByteOff = 0;
-    Operand* psSrc = 0;
-    int structured = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_STORE_STRUCTURED:
-        psDest = &psInst->asOperands[0];
-        psDestAddr = &psInst->asOperands[1];
-        psDestByteOff = &psInst->asOperands[2];
-        psSrc = &psInst->asOperands[3];
-        structured = 1;
-        break;
-    case OPCODE_STORE_RAW:
-    default:
-        ASSERT(0);
-    }
-
-    ASSERT(structured);
-
-    for (component = 0; component < 4; component++)
-    {
-        const char* swizzleString[] = { ".x", ".y", ".z", ".w" };
-        ASSERT(psInst->asOperands[0].eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-        if (psInst->asOperands[0].ui32CompMask & (1 << component))
-        {
-
-            ASSERT(psDest->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY);
-
-            psVarType = LookupStructuredVar(psContext, psDest, psDestByteOff, component);
-
-            AddIndentation(psContext);
-
-            if (structured && psDest->eType == OPERAND_TYPE_RESOURCE)
-            {
-                bstring varName = bfromcstralloc(16, "");
-                bformata(varName, "StructuredRes%d", psDest->ui32RegisterNumber);
-                ShaderVarName(glsl, psContext->psShader, bstr2cstr(varName, '\0'));
-                bdestroy(varName);
-            }
-            else
-            {
-                TranslateOperand(psContext, psDest, TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY);
-            }
-
-            ASSERT(strcmp(psVarType->Name, "$Element") != 0);
-
-            bcatcstr(glsl, ".");
-            ShaderVarName(glsl, psContext->psShader, psVarType->Name);
-
-            if (psVarType->Class == SVC_VECTOR)
-            {
-                int byteOffset = ((int*)psDestByteOff->afImmediates)[0] + 4 * (psDest->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psDest->aui32Swizzle[component] : component);
-                int byteOffsetOfVar = psVarType->Offset;
-                unsigned int startComponent = (byteOffset - byteOffsetOfVar) >> 2;
-                unsigned int s = startComponent;
-
-                bformata(glsl, "%s", swizzleString[s]);
-            }
-
-            uint32_t flags = TO_FLAG_UNSIGNED_INTEGER;
-            if (psVarType)
-            {
-                if (psVarType->Type == SVT_INT)
-                {
-                    flags = TO_FLAG_INTEGER;
-                }
-                else if (psVarType->Type == SVT_FLOAT)
-                {
-                    flags = TO_FLAG_NONE;
-                }
-                else
-                {
-                    ASSERT(0);
-                }
-            }
-            //TGSM always uint
-            bformata(glsl, " = (");
-            TranslateOperand(psContext, psSrc, flags);
-
-
-
-            if (GetNumSwizzleElements(psSrc) > 1)
-            {
-                bformata(glsl, swizzleString[srcComponent++]);
-            }
-
-            //Double takes an extra slot.
-            if (psVarType && psVarType->Type == SVT_DOUBLE)
-            {
-                if (structured && psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    bcatcstr(glsl, ")");
-                }
-                component++;
-            }
-
-            bformata(glsl, ");\n");
-        }
-    }
-}
-
-static void TranslateShaderStorageLoad(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    ShaderVarType* psVarType = NULL;
-    uint32_t aui32Swizzle[4] = {OPERAND_4_COMPONENT_X};
-    uint32_t ui32DataTypeFlag = TO_FLAG_INTEGER;
-    int component;
-    int destComponent = 0;
-
-    Operand* psDest = 0;
-    Operand* psSrcAddr = 0;
-    Operand* psSrcByteOff = 0;
-    Operand* psSrc = 0;
-    int structured = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_LD_STRUCTURED:
-        psDest = &psInst->asOperands[0];
-        psSrcAddr = &psInst->asOperands[1];
-        psSrcByteOff = &psInst->asOperands[2];
-        psSrc = &psInst->asOperands[3];
-        structured = 1;
-        break;
-    case OPCODE_LD_RAW:
-        psDest = &psInst->asOperands[0];
-        psSrcByteOff = &psInst->asOperands[1];
-        psSrc = &psInst->asOperands[2];
-        break;
-    }
-
-    if (psInst->eOpcode == OPCODE_LD_RAW)
-    {
-        unsigned int ui32CompNum = GetNumSwizzleElements(psDest);
-
-        for (component = 0; component < 4; component++)
-        {
-            const char* swizzleString [] = { "x", "y", "z", "w" };
-            ASSERT(psDest->eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-            if (psDest->ui32CompMask & (1 << component))
-            {
-                int addedBitcast = 0;
-
-                if (structured)
-                {
-                    psVarType = LookupStructuredVar(psContext, psSrc, psSrcByteOff, psSrc->aui32Swizzle[component]);
-                }
-
-                AddIndentation(psContext);
-
-                aui32Swizzle[0] = psSrc->aui32Swizzle[component];
-
-                if (ui32CompNum > 1)
-                {
-                    BeginAssignmentEx(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate, swizzleString[destComponent++]);
-                }
-                else
-                {
-                    BeginAssignment(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate);
-                }
-
-                if (psSrc->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    // unknown how to make this without TO_FLAG_NAME_ONLY
-                    bcatcstr(glsl, "uintBitsToFloat(");
-                    addedBitcast = 1;
-
-                    TranslateOperand(psContext, psSrc, ui32DataTypeFlag & TO_FLAG_NAME_ONLY);
-
-                    if (((int*)psSrcByteOff->afImmediates)[0] == 0)
-                    {
-                        bformata(glsl, "[0");
-                    }
-                    else
-                    {
-                        bformata(glsl, "[((");
-                        TranslateOperand(psContext, psSrcByteOff, TO_FLAG_INTEGER);
-                        bcatcstr(glsl, ") >> 2u)");
-                    }
-                }
-                else
-                {
-                    bstring varName = bfromcstralloc(16, "");
-                    bformata(varName, "RawRes%d", psSrc->ui32RegisterNumber);
-
-                    ShaderVarName(glsl, psContext->psShader, bstr2cstr(varName, '\0'));
-                    bcatcstr(glsl, "[((");
-                    TranslateOperand(psContext, psSrcByteOff, TO_FLAG_INTEGER);
-                    bcatcstr(glsl, ") >> 2u)");
-
-                    bdestroy(varName);
-                }
-
-                if (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE && psSrc->aui32Swizzle[component] != 0)
-                {
-                    bformata(glsl, " + %d", psSrc->aui32Swizzle[component]);
-                }
-                bcatcstr(glsl, "]");
-
-                if (addedBitcast)
-                {
-                    bcatcstr(glsl, ")");
-                }
-
-                EndAssignment(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate);
-                bformata(glsl, ";\n");
-            }
-        }
-    }
-    else
-    {
-        unsigned int ui32CompNum = GetNumSwizzleElements(psDest);
-
-        //(int)GetNumSwizzleElements(&psInst->asOperands[0])
-        for (component = 0; component < 4; component++)
-        {
-            const char* swizzleString [] = { "x", "y", "z", "w" };
-            ASSERT(psDest->eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-            if (psDest->ui32CompMask & (1 << component))
-            {
-                int addedBitcast = 0;
-
-                psVarType = LookupStructuredVar(psContext, psSrc, psSrcByteOff, psSrc->aui32Swizzle[component]);
-
-                AddIndentation(psContext);
-
-                aui32Swizzle[0] = psSrc->aui32Swizzle[component];
-
-                if (ui32CompNum > 1)
-                {
-                    BeginAssignmentEx(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate, swizzleString[destComponent++]);
-                }
-                else
-                {
-                    BeginAssignment(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate);
-                }
-
-                if (psSrc->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    // unknown how to make this without TO_FLAG_NAME_ONLY
-                    if (psVarType->Type == SVT_UINT)
-                    {
-                        bcatcstr(glsl, "uintBitsToFloat(");
-                        addedBitcast = 1;
-                    }
-                    else if (psVarType->Type == SVT_INT)
-                    {
-                        bcatcstr(glsl, "intBitsToFloat(");
-                        addedBitcast = 1;
-                    }
-                    else if (psVarType->Type == SVT_DOUBLE)
-                    {
-                        bcatcstr(glsl, "unpackDouble2x32(");
-                        addedBitcast = 1;
-                    }
-
-                    // input already in uints
-                    TranslateOperand(psContext, psSrc, TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, "[");
-                    TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                    bcatcstr(glsl, "].value[(");
-                    TranslateOperand(psContext, psSrcByteOff, TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(glsl, " >> 2u)]");
-                }
-                else
-                {
-                    ConstantBuffer* psCBuf = NULL;
-                    uint32_t swizzle = 0;
-                    psVarType = LookupStructuredVarExtended(psContext, psSrc, psSrcByteOff, psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component, &swizzle);
-                    GetConstantBufferFromBindingPoint(RGROUP_UAV, psSrc->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-
-                    if (psVarType->Type == SVT_UINT)
-                    {
-                        bcatcstr(glsl, "uintBitsToFloat(");
-                        addedBitcast = 1;
-                    }
-                    else if (psVarType->Type == SVT_INT)
-                    {
-                        bcatcstr(glsl, "intBitsToFloat(");
-                        addedBitcast = 1;
-                    }
-                    else if (psVarType->Type == SVT_DOUBLE)
-                    {
-                        bcatcstr(glsl, "unpackDouble2x32(");
-                        addedBitcast = 1;
-                    }
-
-                    if (psSrc->eType == OPERAND_TYPE_UNORDERED_ACCESS_VIEW)
-                    {
-                        TranslateShaderStorageVarName(glsl, psContext->psShader, psSrc, 1);
-                        bformata(glsl, "[");
-                        TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                        bcatcstr(glsl, "]");
-                        if (strcmp(psVarType->Name, "$Element") != 0)
-                        {
-                            bcatcstr(glsl, ".");
-                            ShaderVarName(glsl, psContext->psShader, psVarType->Name);
-                        }
-
-                        if (psVarType->Columns > 1)
-                        {
-                            bformata(glsl, ".%s", swizzleString[swizzle]);
-                        }
-                    }
-                    else if (psSrc->eType == OPERAND_TYPE_RESOURCE)
-                    {
-                        TranslateShaderStorageVarName(glsl, psContext->psShader, psSrc, 1);
-                        bcatcstr(glsl, "[");
-                        TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                        bcatcstr(glsl, "]");
-
-                        if (strcmp(psVarType->Name, "$Element") != 0)
-                        {
-                            bcatcstr(glsl, ".");
-                            ShaderVarName(glsl, psContext->psShader, psVarType->Name);
-                        }
-
-                        if (psVarType->Class == SVC_SCALAR)
-                        {
-                        }
-                        else if (psVarType->Class == SVC_VECTOR)
-                        {
-                            int byteOffset = ((int*)psSrcByteOff->afImmediates)[0] + 4 * (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-                            int byteOffsetOfVar = psVarType->Offset;
-                            unsigned int startComponent = (byteOffset - byteOffsetOfVar) >> 2;
-                            unsigned int s = startComponent;
-
-                            bcatcstr(glsl, ".");
-#if 0
-                            for (s = startComponent; s < min(min(psVarType->Columns, 4U - component), ui32CompNum); ++s)
-#endif
-                            bformata(glsl, "%s", swizzleString[s]);
-                        }
-                        else if (psVarType->Class == SVC_MATRIX_ROWS)
-                        {
-                            int byteOffset = ((int*)psSrcByteOff->afImmediates)[0] + 4 * (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-                            int byteOffsetOfVar = psVarType->Offset;
-                            unsigned int startRow       = ((byteOffset - byteOffsetOfVar) >> 2) / psVarType->Columns;
-                            unsigned int startComponent = ((byteOffset - byteOffsetOfVar) >> 2) % psVarType->Columns;
-                            unsigned int s = startComponent;
-
-                            bformata(glsl, "[%d]", startRow);
-                            bcatcstr(glsl, ".");
-#if 0
-                            for (s = startComponent; s < min(min(psVarType->Rows, 4U - component), ui32CompNum); ++s)
-#endif
-                            bformata(glsl, "%s", swizzleString[s]);
-                        }
-                        else if (psVarType->Class == SVC_MATRIX_COLUMNS)
-                        {
-                            int byteOffset = ((int*)psSrcByteOff->afImmediates)[0] + 4 * (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-                            int byteOffsetOfVar = psVarType->Offset;
-                            unsigned int startCol       = ((byteOffset - byteOffsetOfVar) >> 2) / psVarType->Rows;
-                            unsigned int startComponent = ((byteOffset - byteOffsetOfVar) >> 2) % psVarType->Rows;
-                            unsigned int s = startComponent;
-
-                            bformata(glsl, "[%d]", startCol);
-                            bcatcstr(glsl, ".");
-#if 0
-                            for (s = startComponent; s < min(min(psVarType->Columns, 4U - component), ui32CompNum); ++s)
-#endif
-                            bformata(glsl, "%s", swizzleString[s]);
-                        }
-                        else
-                        {
-                            //assert(0);
-                        }
-                    }
-                    else
-                    {
-                        TranslateOperand(psContext, psSrc, ui32DataTypeFlag & TO_FLAG_NAME_ONLY);
-                        bformata(glsl, "[");
-                        TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                        bcatcstr(glsl, "].");
-
-                        ShaderVarName(glsl, psContext->psShader, psVarType->Name);
-                    }
-
-                    if (psVarType->Type == SVT_DOUBLE)
-                    {
-                        component++; // doubles take up 2 slots
-                    }
-#if 0
-                    if (psVarType->Class == SVC_VECTOR)
-                    {
-                        component += min(psVarType->Columns, ui32CompNum) - 1; // vector take up various slots
-                    }
-                    if (psVarType->Class == SVC_MATRIX_ROWS)
-                    {
-                        component += min(psVarType->Columns * psVarType->Rows, ui32CompNum) - 1; // matrix take up various slots
-                    }
-                    if (psVarType->Class == SVC_MATRIX_COLUMNS)
-                    {
-                        component += min(psVarType->Columns * psVarType->Rows, ui32CompNum) - 1; // matrix take up various slots
-                    }
-#endif
-                }
-
-                if (addedBitcast)
-                {
-                    bcatcstr(glsl, ")");
-                }
-
-                EndAssignment(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate);
-                bformata(glsl, ";\n");
-            }
-        }
-    }
-}
-
-static void TranslateShaderPLSLoad(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    ShaderVarType* psVarType = NULL;
-    uint32_t aui32Swizzle[4] = { OPERAND_4_COMPONENT_X };
-    int component;
-    int destComponent = 0;
-
-    Operand* psDest = 0;
-    Operand* psSrcAddr = 0;
-    Operand* psSrcByteOff = 0;
-    Operand* psSrc = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_LD_STRUCTURED:
-        psDest = &psInst->asOperands[0];
-        psSrcAddr = &psInst->asOperands[1];
-        psSrcByteOff = &psInst->asOperands[2];
-        psSrc = &psInst->asOperands[3];
-        break;
-    case OPCODE_LD_RAW:
-    default:
-        ASSERT(0);
-    }
-
-    unsigned int ui32CompNum = GetNumSwizzleElements(psDest);
-
-    for (component = 0; component < 4; component++)
-    {
-        const char* swizzleString[] = { "x", "y", "z", "w" };
-        ASSERT(psDest->eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-        if (psDest->ui32CompMask & (1 << component))
-        {
-            int addedBitcast = 0;
-
-            psVarType = LookupStructuredVar(psContext, psSrc, psSrcByteOff, psSrc->aui32Swizzle[component]);
-
-            AddIndentation(psContext);
-
-            aui32Swizzle[0] = psSrc->aui32Swizzle[component];
-
-            if (ui32CompNum > 1)
-            {
-                BeginAssignmentEx(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate, swizzleString[destComponent++]);
-            }
-            else
-            {
-                BeginAssignment(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate);
-            }
-
-            ASSERT(psSrc->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY);
-
-            ConstantBuffer* psCBuf = NULL;
-            psVarType = LookupStructuredVar(psContext, psSrc, psSrcByteOff, psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-            GetConstantBufferFromBindingPoint(RGROUP_UAV, psSrc->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-
-            if (psVarType->Type == SVT_UINT)
-            {
-                bcatcstr(glsl, "uintBitsToFloat(");
-                addedBitcast = 1;
-            }
-            else if (psVarType->Type == SVT_INT)
-            {
-                bcatcstr(glsl, "intBitsToFloat(");
-                addedBitcast = 1;
-            }
-            else if (psVarType->Type == SVT_DOUBLE)
-            {
-                ASSERT(0);
-            }
-
-            ASSERT(psSrc->eType == OPERAND_TYPE_UNORDERED_ACCESS_VIEW);
-
-            TranslateOperand(psContext, psSrc, TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY);
-            ASSERT(strcmp(psVarType->Name, "$Element") != 0);
-
-            bcatcstr(glsl, ".");
-            ShaderVarName(glsl, psContext->psShader, psVarType->Name);
-
-            ASSERT(psVarType->Type != SVT_DOUBLE);
-            ASSERT(psVarType->Class != SVC_MATRIX_ROWS);
-            ASSERT(psVarType->Class != SVC_MATRIX_COLUMNS);
-
-            if (psVarType->Class == SVC_VECTOR)
-            {
-                int byteOffset = ((int*)psSrcByteOff->afImmediates)[0] + 4 * (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-                int byteOffsetOfVar = psVarType->Offset;
-                unsigned int startComponent = (byteOffset - byteOffsetOfVar) >> 2;
-                unsigned int s = startComponent;
-
-                bcatcstr(glsl, ".");
-                bformata(glsl, "%s", swizzleString[s]);
-            }
-
-            if (addedBitcast)
-            {
-                bcatcstr(glsl, ")");
-            }
-
-            EndAssignment(psContext, psDest, TO_FLAG_FLOAT, psInst->bSaturate);
-            bformata(glsl, ";\n");
-        }
-    }
-}
-
-void TranslateAtomicMemOp(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    ShaderVarType* psVarType = NULL;
-    uint32_t ui32DataTypeFlag = TO_FLAG_INTEGER;
-    const char* func = "";
-    Operand* dest = 0;
-    Operand* previousValue = 0;
-    Operand* destAddr = 0;
-    Operand* src = 0;
-    Operand* compare = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_IMM_ATOMIC_IADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_IADD\n");
-#endif
-        func = "atomicAdd";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_IADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_IADD\n");
-#endif
-        func = "atomicAdd";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_AND:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_AND\n");
-#endif
-        func = "atomicAnd";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_AND:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_AND\n");
-#endif
-        func = "atomicAnd";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_OR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_OR\n");
-#endif
-        func = "atomicOr";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_OR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_OR\n");
-#endif
-        func = "atomicOr";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_XOR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_XOR\n");
-#endif
-        func = "atomicXor";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_XOR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_XOR\n");
-#endif
-        func = "atomicXor";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-
-    case OPCODE_IMM_ATOMIC_EXCH:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_EXCH\n");
-#endif
-        func = "atomicExchange";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_CMP_EXCH:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_CMP_EXC\n");
-#endif
-        func = "atomicCompSwap";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        compare = &psInst->asOperands[3];
-        src = &psInst->asOperands[4];
-        break;
-    }
-    case OPCODE_ATOMIC_CMP_STORE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_CMP_STORE\n");
-#endif
-        func = "atomicCompSwap";
-        previousValue = 0;
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        compare = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_UMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_UMIN\n");
-#endif
-        func = "atomicMin";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_UMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_UMIN\n");
-#endif
-        func = "atomicMin";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_IMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_IMIN\n");
-#endif
-        func = "atomicMin";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_IMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_IMIN\n");
-#endif
-        func = "atomicMin";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_UMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_UMAX\n");
-#endif
-        func = "atomicMax";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_UMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_UMAX\n");
-#endif
-        func = "atomicMax";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_IMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_IMAX\n");
-#endif
-        func = "atomicMax";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_IMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ATOMIC_IMAX\n");
-#endif
-        func = "atomicMax";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    }
-
-    AddIndentation(psContext);
-
-    psVarType = LookupStructuredVar(psContext, dest, NULL, 0);
-
-    if (psVarType->Type == SVT_UINT)
-    {
-        ui32DataTypeFlag = TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER;
-    }
-    else if (psVarType->Type == SVT_INT)
-    {
-        ui32DataTypeFlag = TO_FLAG_INTEGER;
-    }
-
-    if (previousValue)
-    {
-        BeginAssignment(psContext, previousValue, ui32DataTypeFlag, psInst->bSaturate);
-    }
-
-    if (dest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-    {
-        bcatcstr(glsl, func);
-        bcatcstr(glsl, "(");
-        TranslateOperand(psContext, dest, ui32DataTypeFlag & TO_FLAG_NAME_ONLY);
-        bformata(glsl, "[%d]", 0);
-    }
-    else
-    {
-        bcatcstr(glsl, func);
-        bcatcstr(glsl, "(");
-        TranslateShaderStorageVarName(glsl, psContext->psShader, dest, 1);
-        bformata(glsl, "[");
-        TranslateOperand(psContext, destAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-        // For some reason the destAddr with the swizzle doesn't translate to an index
-        // I'm not sure if ".x" is the correct behavior.
-        bformata(glsl, ".x]");
-    }
-
-    if (strcmp(psVarType->Name, "$Element") != 0)
-    {
-        bcatcstr(glsl, ".");
-        ShaderVarName(glsl, psContext->psShader, psVarType->Name);
-    }
-    bcatcstr(glsl, ", ");
-
-    if (compare)
-    {
-        TranslateOperand(psContext, compare, ui32DataTypeFlag);
-        bcatcstr(glsl, ", ");
-    }
-
-    TranslateOperand(psContext, src, ui32DataTypeFlag);
-    bcatcstr(glsl, ")");
-
-    if (previousValue)
-    {
-        EndAssignment(psContext, previousValue, ui32DataTypeFlag, psInst->bSaturate);
-    }
-
-    bcatcstr(glsl, ";\n");
-}
-
-static void TranslateConditional(HLSLCrossCompilerContext* psContext,
-    Instruction* psInst,
-    bstring glsl)
-{
-    const char* statement = "";
-    uint32_t bWriteTraceEnd = 0;
-    if (psInst->eOpcode == OPCODE_BREAKC)
-    {
-        statement = "break";
-    }
-    else if (psInst->eOpcode == OPCODE_CONTINUEC)
-    {
-        statement = "continue";
-    }
-    else if (psInst->eOpcode == OPCODE_RETC)
-    {
-        statement = "return";
-        bWriteTraceEnd = (psContext->flags & HLSLCC_FLAG_TRACING_INSTRUMENTATION) != 0;
-    }
-
-    if (psContext->psShader->ui32MajorVersion < 4)
-    {
-        bcatcstr(glsl, "if(");
-
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-        switch (psInst->eDX9TestType)
-        {
-        case D3DSPC_GT:
-        {
-            bcatcstr(glsl, " > ");
-            break;
-        }
-        case D3DSPC_EQ:
-        {
-            bcatcstr(glsl, " == ");
-            break;
-        }
-        case D3DSPC_GE:
-        {
-            bcatcstr(glsl, " >= ");
-            break;
-        }
-        case D3DSPC_LT:
-        {
-            bcatcstr(glsl, " < ");
-            break;
-        }
-        case D3DSPC_NE:
-        {
-            bcatcstr(glsl, " != ");
-            break;
-        }
-        case D3DSPC_LE:
-        {
-            bcatcstr(glsl, " <= ");
-            break;
-        }
-        case D3DSPC_BOOLEAN:
-        {
-            bcatcstr(glsl, " != 0");
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-
-        if (psInst->eDX9TestType != D3DSPC_BOOLEAN)
-        {
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-        }
-
-        if (psInst->eOpcode != OPCODE_IF && !bWriteTraceEnd)
-        {
-            bformata(glsl, "){ %s; }\n", statement);
-        }
-        else
-        {
-            bcatcstr(glsl, "){\n");
-        }
-    }
-    else
-    {
-        if (psInst->eBooleanTestType == INSTRUCTION_TEST_ZERO)
-        {
-            bcatcstr(glsl, "if((");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-
-            if (psInst->eOpcode != OPCODE_IF && !bWriteTraceEnd)
-            {
-                if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-                {
-                    bformata(glsl, ")==uint(0){%s;}\n", statement); // Adreno can't handle 0u (it's treated as int)
-                }
-                else
-                {
-                    bformata(glsl, ")==0){%s;}\n", statement);
-                }
-            }
-            else
-            {
-                if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-                {
-                    bcatcstr(glsl, ")==uint(0){\n"); // Adreno can't handle 0u (it's treated as int)
-                }
-                else
-                {
-                    bcatcstr(glsl, ")==0){\n");
-                }
-            }
-        }
-        else
-        {
-            ASSERT(psInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO);
-            bcatcstr(glsl, "if((");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-
-            if (psInst->eOpcode != OPCODE_IF && !bWriteTraceEnd)
-            {
-                if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-                {
-                    bformata(glsl, ")!=uint(0)){%s;}\n", statement); // Adreno can't handle 0u (it's treated as int)
-                }
-                else
-                {
-                    bformata(glsl, ")!=0){%s;}\n", statement);
-                }
-            }
-            else
-            {
-                if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-                {
-                    bcatcstr(glsl, ")!=uint(0)){\n"); // Adreno can't handle 0u (it's treated as int)
-                }
-                else
-                {
-                    bcatcstr(glsl, ")!=0){\n");
-                }
-            }
-        }
-    }
-
-    if (bWriteTraceEnd)
-    {
-        ASSERT(*psContext->currentGLSLString == glsl);
-        ++psContext->indent;
-        WriteEndTrace(psContext);
-        AddIndentation(psContext);
-        bformata(glsl, "%s;\n", statement);
-        AddIndentation(psContext);
-        --psContext->indent;
-        bcatcstr(glsl, "}\n");
-    }
-}
-
-void UpdateCommonTempVecType(SHADER_VARIABLE_TYPE* peCommonTempVecType, SHADER_VARIABLE_TYPE eNewType)
-{
-    if (*peCommonTempVecType == SVT_FORCE_DWORD)
-    {
-        *peCommonTempVecType = eNewType;
-    }
-    else if (*peCommonTempVecType != eNewType)
-    {
-        *peCommonTempVecType = SVT_VOID;
-    }
-}
-
-bool IsFloatType(SHADER_VARIABLE_TYPE type)
-{
-    switch (type)
-    {
-    case SVT_FLOAT:
-    case SVT_FLOAT10:
-    case SVT_FLOAT16:
-        return true;
-    default:
-        return false;
-    }
-}
-
-void SetDataTypes(HLSLCrossCompilerContext* psContext, Instruction* psInst, const int32_t i32InstCount, SHADER_VARIABLE_TYPE* aeCommonTempVecType)
-{
-    int32_t i;
-
-    SHADER_VARIABLE_TYPE aeTempVecType[MAX_TEMP_VEC4 * 4];
-
-    for (i = 0; i < MAX_TEMP_VEC4 * 4; ++i)
-    {
-        aeTempVecType[i] = SVT_FLOAT;
-    }
-    if (aeCommonTempVecType != NULL)
-    {
-        for (i = 0; i < MAX_TEMP_VEC4; ++i)
-        {
-            aeCommonTempVecType[i] = SVT_FORCE_DWORD;
-        }
-    }
-
-    for (i = 0; i < i32InstCount; ++i, psInst++)
-    {
-        int k = 0;
-
-        if (psInst->ui32NumOperands == 0)
-        {
-            continue;
-        }
-
-        //Preserve the current type on dest array index
-        if (psInst->asOperands[0].eType == OPERAND_TYPE_INDEXABLE_TEMP)
-        {
-            Operand* psSubOperand = psInst->asOperands[0].psSubOperand[1];
-            if (psSubOperand != 0)
-            {
-                const uint32_t ui32RegIndex = psSubOperand->ui32RegisterNumber * 4;
-                ASSERT(psSubOperand->eType == OPERAND_TYPE_TEMP);
-
-                if (psSubOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-                {
-                    psSubOperand->aeDataType[psSubOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psSubOperand->aui32Swizzle[0]];
-                }
-                else if (psSubOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-                {
-                    if (psSubOperand->ui32Swizzle == (NO_SWIZZLE))
-                    {
-                        psSubOperand->aeDataType[0] = aeTempVecType[ui32RegIndex];
-                        psSubOperand->aeDataType[1] = aeTempVecType[ui32RegIndex];
-                        psSubOperand->aeDataType[2] = aeTempVecType[ui32RegIndex];
-                        psSubOperand->aeDataType[3] = aeTempVecType[ui32RegIndex];
-                    }
-                    else
-                    {
-                        psSubOperand->aeDataType[psSubOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psSubOperand->aui32Swizzle[0]];
-                    }
-                }
-                else if (psSubOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-                {
-                    int c = 0;
-                    uint32_t ui32CompMask = psSubOperand->ui32CompMask;
-                    if (!psSubOperand->ui32CompMask)
-                    {
-                        ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-                    }
-
-                    for (; c < 4; ++c)
-                    {
-                        if (ui32CompMask & (1 << c))
-                        {
-                            psSubOperand->aeDataType[c] = aeTempVecType[ui32RegIndex + c];
-                        }
-                    }
-                }
-            }
-        }
-
-        //Preserve the current type on sources.
-        for (k = psInst->ui32NumOperands - 1; k >= (int)psInst->ui32FirstSrc; --k)
-        {
-            int32_t subOperand;
-            Operand* psOperand = &psInst->asOperands[k];
-
-            if (psOperand->eType == OPERAND_TYPE_TEMP)
-            {
-                const uint32_t ui32RegIndex = psOperand->ui32RegisterNumber * 4;
-
-                if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-                {
-                    psOperand->aeDataType[psOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-                }
-                else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-                {
-                    if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-                    {
-                        psOperand->aeDataType[0] = aeTempVecType[ui32RegIndex];
-                        psOperand->aeDataType[1] = aeTempVecType[ui32RegIndex];
-                        psOperand->aeDataType[2] = aeTempVecType[ui32RegIndex];
-                        psOperand->aeDataType[3] = aeTempVecType[ui32RegIndex];
-                    }
-                    else
-                    {
-                        psOperand->aeDataType[psOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-                    }
-                }
-                else if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-                {
-                    int c = 0;
-                    uint32_t ui32CompMask = psOperand->ui32CompMask;
-                    if (!psOperand->ui32CompMask)
-                    {
-                        ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-                    }
-
-                    for (; c < 4; ++c)
-                    {
-                        if (ui32CompMask & (1 << c))
-                        {
-                            psOperand->aeDataType[c] = aeTempVecType[ui32RegIndex + c];
-                        }
-                    }
-                }
-            }
-
-            for (subOperand = 0; subOperand < MAX_SUB_OPERANDS; subOperand++)
-            {
-                if (psOperand->psSubOperand[subOperand] != 0)
-                {
-                    Operand* psSubOperand = psOperand->psSubOperand[subOperand];
-                    if (psSubOperand->eType == OPERAND_TYPE_TEMP)
-                    {
-                        const uint32_t ui32RegIndex = psSubOperand->ui32RegisterNumber * 4;
-
-                        if (psSubOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-                        {
-                            psSubOperand->aeDataType[psSubOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psSubOperand->aui32Swizzle[0]];
-                        }
-                        else if (psSubOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-                        {
-                            if (psSubOperand->ui32Swizzle == (NO_SWIZZLE))
-                            {
-                                psSubOperand->aeDataType[0] = aeTempVecType[ui32RegIndex];
-                                psSubOperand->aeDataType[1] = aeTempVecType[ui32RegIndex];
-                                psSubOperand->aeDataType[2] = aeTempVecType[ui32RegIndex];
-                                psSubOperand->aeDataType[3] = aeTempVecType[ui32RegIndex];
-                            }
-                            else
-                            {
-                                psSubOperand->aeDataType[psSubOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psSubOperand->aui32Swizzle[0]];
-                            }
-                        }
-                        else if (psSubOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-                        {
-                            int c = 0;
-                            uint32_t ui32CompMask = psSubOperand->ui32CompMask;
-                            if (!psSubOperand->ui32CompMask)
-                            {
-                                ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-                            }
-
-
-                            for (; c < 4; ++c)
-                            {
-                                if (ui32CompMask & (1 << c))
-                                {
-                                    psSubOperand->aeDataType[c] = aeTempVecType[ui32RegIndex + c];
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        SHADER_VARIABLE_TYPE eNewType = SVT_FORCE_DWORD;
-
-        switch (psInst->eOpcode)
-        {
-        case OPCODE_RESINFO:
-        {
-            if (psInst->eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT)
-            {
-                eNewType = SVT_INT;
-            }
-            else
-            {
-                eNewType = SVT_FLOAT;
-            }
-            break;
-        }
-        case OPCODE_AND:
-        case OPCODE_OR:
-        case OPCODE_XOR:
-        case OPCODE_NOT:
-        {
-            eNewType = SVT_UINT;
-            break;
-        }
-        case OPCODE_IADD:
-        case OPCODE_IMAD:
-        case OPCODE_IMAX:
-        case OPCODE_IMIN:
-        case OPCODE_IMUL:
-        case OPCODE_INEG:
-        case OPCODE_ISHL:
-        case OPCODE_ISHR:
-        {
-            eNewType = SVT_UINT;
-
-            //If the rhs evaluates to signed then that is the dest type picked.
-            for (uint32_t kk = psInst->ui32FirstSrc; kk < psInst->ui32NumOperands; ++kk)
-            {
-                if (GetOperandDataType(psContext, &psInst->asOperands[kk]) == SVT_INT ||
-                    psInst->asOperands[kk].eModifier == OPERAND_MODIFIER_NEG ||
-                    psInst->asOperands[kk].eModifier == OPERAND_MODIFIER_ABSNEG)
-                {
-                    eNewType = SVT_INT;
-                    break;
-                }
-            }
-
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_AND:
-        case OPCODE_IMM_ATOMIC_IADD:
-        case OPCODE_IMM_ATOMIC_IMAX:
-        case OPCODE_IMM_ATOMIC_IMIN:
-        case OPCODE_IMM_ATOMIC_UMAX:
-        case OPCODE_IMM_ATOMIC_UMIN:
-        case OPCODE_IMM_ATOMIC_OR:
-        case OPCODE_IMM_ATOMIC_XOR:
-        case OPCODE_IMM_ATOMIC_EXCH:
-        case OPCODE_IMM_ATOMIC_CMP_EXCH:
-        {
-            Operand* dest = &psInst->asOperands[1];
-            ShaderVarType* type = LookupStructuredVar(psContext, dest, NULL, 0);
-            eNewType = type->Type;
-            break;
-        }
-
-        case OPCODE_IEQ:
-        case OPCODE_IGE:
-        case OPCODE_ILT:
-        case OPCODE_INE:
-        case OPCODE_EQ:
-        case OPCODE_GE:
-        case OPCODE_LT:
-        case OPCODE_NE:
-        case OPCODE_UDIV:
-        case OPCODE_ULT:
-        case OPCODE_UGE:
-        case OPCODE_UMUL:
-        case OPCODE_UMAD:
-        case OPCODE_UMAX:
-        case OPCODE_UMIN:
-        case OPCODE_USHR:
-        case OPCODE_IMM_ATOMIC_ALLOC:
-        case OPCODE_IMM_ATOMIC_CONSUME:
-        {
-            if (psContext->psShader->ui32MajorVersion < 4)
-            {
-                //SLT and SGE are translated to LT and GE respectively.
-                //But SLT and SGE have a floating point 1.0f or 0.0f result
-                //instead of setting all bits on or all bits off.
-                eNewType = SVT_FLOAT;
-            }
-            else
-            {
-                eNewType = SVT_UINT;
-            }
-            break;
-        }
-
-        case OPCODE_SAMPLE:
-        case OPCODE_SAMPLE_L:
-        case OPCODE_SAMPLE_D:
-        case OPCODE_SAMPLE_B:
-        case OPCODE_LD:
-        case OPCODE_LD_MS:
-        case OPCODE_LD_UAV_TYPED:
-        {
-            ResourceBinding* psRes = NULL;
-            if (psInst->eOpcode == OPCODE_LD_UAV_TYPED)
-            {
-                GetResourceFromBindingPoint(RGROUP_UAV, psInst->asOperands[2].ui32RegisterNumber, &psContext->psShader->sInfo, &psRes);
-            }
-            else
-            {
-                GetResourceFromBindingPoint(RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, &psContext->psShader->sInfo, &psRes);
-            }
-            switch (psRes->ui32ReturnType)
-            {
-            case RETURN_TYPE_SINT:
-                eNewType = SVT_INT;
-                break;
-            case RETURN_TYPE_UINT:
-                eNewType = SVT_UINT;
-                break;
-            case RETURN_TYPE_FLOAT:
-                eNewType = SVT_FLOAT;
-                break;
-            default:
-                ASSERT(0);
-                break;
-            }
-            break;
-        }
-
-        case OPCODE_MOV:
-        {
-            //Inherit the type of the source operand
-            const Operand* psOperand = &psInst->asOperands[0];
-            if (psOperand->eType == OPERAND_TYPE_TEMP)
-            {
-                eNewType = GetOperandDataType(psContext, &psInst->asOperands[1]);
-            }
-            else
-            {
-                continue;
-            }
-            break;
-        }
-        case OPCODE_MOVC:
-        {
-            //Inherit the type of the source operand
-            const Operand* psOperand = &psInst->asOperands[0];
-            if (psOperand->eType == OPERAND_TYPE_TEMP)
-            {
-                eNewType = GetOperandDataType(psContext, &psInst->asOperands[2]);
-                //Check assumption that both the values which MOVC might pick have the same basic data type.
-                if (!psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING)
-                {
-                    ASSERT(GetOperandDataType(psContext, &psInst->asOperands[2]) == GetOperandDataType(psContext, &psInst->asOperands[3]));
-                }
-            }
-            else
-            {
-                continue;
-            }
-            break;
-        }
-        case OPCODE_FTOI:
-        {
-            ASSERT(IsFloatType(GetOperandDataType(psContext, &psInst->asOperands[1])) ||
-                GetOperandDataType(psContext, &psInst->asOperands[1]) == SVT_VOID);
-            eNewType = SVT_INT;
-            break;
-        }
-        case OPCODE_FTOU:
-        {
-            ASSERT(IsFloatType(GetOperandDataType(psContext, &psInst->asOperands[1])) ||
-                GetOperandDataType(psContext, &psInst->asOperands[1]) == SVT_VOID);
-            eNewType = SVT_UINT;
-            break;
-        }
-
-        case OPCODE_UTOF:
-        case OPCODE_ITOF:
-        {
-            eNewType = SVT_FLOAT;
-            break;
-        }
-        case OPCODE_IF:
-        case OPCODE_SWITCH:
-        case OPCODE_BREAKC:
-        {
-            const Operand* psOperand = &psInst->asOperands[0];
-            if (psOperand->eType == OPERAND_TYPE_TEMP)
-            {
-                const uint32_t ui32RegIndex = psOperand->ui32RegisterNumber * 4;
-
-                if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-                {
-                    eNewType = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-                }
-                else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-                {
-                    if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-                    {
-                        eNewType = aeTempVecType[ui32RegIndex];
-                    }
-                    else
-                    {
-                        eNewType = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-                    }
-                }
-                else if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-                {
-                    uint32_t ui32CompMask = psOperand->ui32CompMask;
-                    if (!psOperand->ui32CompMask)
-                    {
-                        ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-                    }
-                    for (; k < 4; ++k)
-                    {
-                        if (ui32CompMask & (1 << k))
-                        {
-                            eNewType = aeTempVecType[ui32RegIndex + k];
-                        }
-                    }
-                }
-            }
-            else
-            {
-                continue;
-            }
-            break;
-        }
-        case OPCODE_DADD:
-        {
-            eNewType = SVT_DOUBLE;
-            break;
-        }
-        case OPCODE_STORE_RAW:
-        {
-            eNewType = SVT_FLOAT;
-            break;
-        }
-        default:
-        {
-            eNewType = SVT_FLOAT;
-            break;
-        }
-        }
-
-        if (eNewType == SVT_UINT && HaveUVec(psContext->psShader->eTargetLanguage) == 0)
-        {
-            //Fallback to signed int if unsigned int is not supported.
-            eNewType = SVT_INT;
-        }
-
-        //Process the destination last in order to handle instructions
-        //where the destination register is also used as a source.
-        for (k = 0; k < (int)psInst->ui32FirstSrc; ++k)
-        {
-            Operand* psOperand = &psInst->asOperands[k];
-            if (psOperand->eType == OPERAND_TYPE_TEMP)
-            {
-                const uint32_t ui32RegIndex = psOperand->ui32RegisterNumber * 4;
-                if (HavePrecisionQualifers(psContext->psShader->eTargetLanguage))
-                {
-                    switch (psOperand->eMinPrecision)
-                    {
-                    case OPERAND_MIN_PRECISION_DEFAULT:
-                        break;
-                    case OPERAND_MIN_PRECISION_SINT_16:
-                        eNewType = SVT_INT16;
-                        break;
-                    case OPERAND_MIN_PRECISION_UINT_16:
-                        eNewType = SVT_UINT16;
-                        break;
-                    case OPERAND_MIN_PRECISION_FLOAT_2_8:
-                        eNewType = SVT_FLOAT10;
-                        break;
-                    case OPERAND_MIN_PRECISION_FLOAT_16:
-                        eNewType = SVT_FLOAT16;
-                        break;
-                    default:
-                        break;
-                    }
-                }
-
-                if (aeCommonTempVecType != NULL)
-                {
-                    UpdateCommonTempVecType(aeCommonTempVecType + psOperand->ui32RegisterNumber, eNewType);
-                }
-
-                if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-                {
-                    aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]] = eNewType;
-                    psOperand->aeDataType[psOperand->aui32Swizzle[0]] = eNewType;
-                }
-                else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-                {
-                    if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-                    {
-                        aeTempVecType[ui32RegIndex] = eNewType;
-                        psOperand->aeDataType[0] = eNewType;
-                        psOperand->aeDataType[1] = eNewType;
-                        psOperand->aeDataType[2] = eNewType;
-                        psOperand->aeDataType[3] = eNewType;
-                    }
-                    else
-                    {
-                        aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]] = eNewType;
-                        psOperand->aeDataType[psOperand->aui32Swizzle[0]] = eNewType;
-                    }
-                }
-                else if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-                {
-                    int c = 0;
-                    uint32_t ui32CompMask = psOperand->ui32CompMask;
-                    if (!psOperand->ui32CompMask)
-                    {
-                        ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-                    }
-
-                    for (; c < 4; ++c)
-                    {
-                        if (ui32CompMask & (1 << c))
-                        {
-                            aeTempVecType[ui32RegIndex + c] = eNewType;
-                            psOperand->aeDataType[c] = eNewType;
-                        }
-                    }
-                }
-            }
-        }
-        ASSERT(eNewType != SVT_FORCE_DWORD);
-    }
-}
-
-void TranslateInstruction(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bformata(glsl, "//Instruction %d\n", psInst->id);
-#if 0
-    if (psInst->id == 73)
-    {
-        ASSERT(1);     //Set breakpoint here to debug an instruction from its ID.
-    }
-#endif
-#endif
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_FTOI:     //Fall-through to MOV
-    case OPCODE_FTOU:     //Fall-through to MOV
-    case OPCODE_MOV:
-    {
-        uint32_t srcCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-        uint32_t dstCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        uint32_t ui32DstFlags = TO_FLAG_NONE;
-
-        if (psInst->eOpcode == OPCODE_FTOU)
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//FTOU\n");
-#endif
-            ui32DstFlags |= TO_FLAG_UNSIGNED_INTEGER;
-
-            ASSERT(IsFloatType(GetOperandDataType(psContext, &psInst->asOperands[1])));
-        }
-        else if (psInst->eOpcode == OPCODE_FTOI)
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//FTOI\n");
-#endif
-            ui32DstFlags |= TO_FLAG_INTEGER;
-
-            ASSERT(IsFloatType(GetOperandDataType(psContext, &psInst->asOperands[1])));
-        }
-        else
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//MOV\n");
-#endif
-        }
-
-        if (psInst->eOpcode == OPCODE_FTOU)
-        {
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32DstFlags, psInst->bSaturate);
-
-            if (srcCount == 1)
-            {
-                bcatcstr(glsl, "uint(");
-            }
-            if (srcCount == 2)
-            {
-                bcatcstr(glsl, "uvec2(");
-            }
-            if (srcCount == 3)
-            {
-                bcatcstr(glsl, "uvec3(");
-            }
-            if (srcCount == 4)
-            {
-                bcatcstr(glsl, "uvec4(");
-            }
-
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-            if (srcCount != dstCount)
-            {
-                bcatcstr(glsl, ")");
-                TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-                EndAssignment(psContext, &psInst->asOperands[0], ui32DstFlags, psInst->bSaturate);
-                bcatcstr(glsl, ";\n");
-            }
-            else
-            {
-                bcatcstr(glsl, ")");
-                EndAssignment(psContext, &psInst->asOperands[0], ui32DstFlags, psInst->bSaturate);
-                bcatcstr(glsl, ";\n");
-            }
-        }
-        else
-        if (psInst->eOpcode == OPCODE_FTOI)
-        {
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32DstFlags, psInst->bSaturate);
-
-            if (srcCount == 1)
-            {
-                bcatcstr(glsl, "int(");
-            }
-            if (srcCount == 2)
-            {
-                bcatcstr(glsl, "ivec2(");
-            }
-            if (srcCount == 3)
-            {
-                bcatcstr(glsl, "ivec3(");
-            }
-            if (srcCount == 4)
-            {
-                bcatcstr(glsl, "ivec4(");
-            }
-
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-
-            if (srcCount != dstCount)
-            {
-                bcatcstr(glsl, ")");
-                TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-                EndAssignment(psContext, &psInst->asOperands[0], ui32DstFlags, psInst->bSaturate);
-                bcatcstr(glsl, ";\n");
-            }
-            else
-            {
-                bcatcstr(glsl, ")");
-                EndAssignment(psContext, &psInst->asOperands[0], ui32DstFlags, psInst->bSaturate);
-                bcatcstr(glsl, ";\n");
-            }
-        }
-        else
-        {
-            AddMOVBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[1], 0, psInst->bSaturate);
-        }
-        break;
-    }
-    case OPCODE_ITOF:    //signed to float
-    case OPCODE_UTOF:    //unsigned to float
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_ITOF)
-        {
-            bcatcstr(glsl, "//ITOF\n");
-        }
-        else
-        {
-            bcatcstr(glsl, "//UTOF\n");
-        }
-#endif
-
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "vec4(");
-        TranslateOperand(psContext, &psInst->asOperands[1], (psInst->eOpcode == OPCODE_ITOF) ? TO_FLAG_INTEGER : TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_MAD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//MAD\n");
-#endif
-        CallTernaryOp(psContext, "*", "+", psInst, 0, 1, 2, 3, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_IMAD:
-    {
-        uint32_t ui32Flags = TO_FLAG_INTEGER;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMAD\n");
-#endif
-
-        if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            ui32Flags = TO_FLAG_UNSIGNED_INTEGER;
-        }
-
-        CallTernaryOp(psContext, "*", "+", psInst, 0, 1, 2, 3, ui32Flags);
-        break;
-    }
-    case OPCODE_DADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DADD\n");
-#endif
-        CallBinaryOp(psContext, "+", psInst, 0, 1, 2, TO_FLAG_DOUBLE);
-        break;
-    }
-    case OPCODE_IADD:
-    {
-        uint32_t ui32Flags = TO_FLAG_INTEGER;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IADD\n");
-#endif
-        //Is this a signed or unsigned add?
-        if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            ui32Flags = TO_FLAG_UNSIGNED_INTEGER;
-        }
-        CallBinaryOp(psContext, "+", psInst, 0, 1, 2, ui32Flags);
-        break;
-    }
-    case OPCODE_ADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ADD\n");
-#endif
-        CallBinaryOp(psContext, "+", psInst, 0, 1, 2, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_OR:
-    {
-        /*Todo: vector version */
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//OR\n");
-#endif
-        CallBinaryOp(psContext, "|", psInst, 0, 1, 2, TO_FLAG_INTEGER);
-        break;
-    }
-    case OPCODE_AND:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//AND\n");
-#endif
-        CallBinaryOp(psContext, "&", psInst, 0, 1, 2, TO_FLAG_INTEGER);
-        break;
-    }
-    case OPCODE_GE:
-    {
-        /*
-            dest = vec4(greaterThanEqual(vec4(srcA), vec4(srcB));
-            Caveat: The result is a boolean but HLSL asm returns 0xFFFFFFFF/0x0 instead.
-         */
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//GE\n");
-#endif
-        AddComparision(psContext, psInst, CMP_GE, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_MUL:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//MUL\n");
-#endif
-        CallBinaryOp(psContext, "*", psInst, 0, 1, 2, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_IMUL:
-    {
-        uint32_t ui32Flags = TO_FLAG_INTEGER;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMUL\n");
-#endif
-        if (GetOperandDataType(psContext, &psInst->asOperands[1]) == SVT_UINT)
-        {
-            ui32Flags = TO_FLAG_UNSIGNED_INTEGER;
-        }
-
-        ASSERT(psInst->asOperands[0].eType == OPERAND_TYPE_NULL);
-
-        CallBinaryOp(psContext, "*", psInst, 1, 2, 3, ui32Flags);
-        break;
-    }
-    case OPCODE_UDIV:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//UDIV\n");
-#endif
-        //destQuotient, destRemainder, src0, src1
-        CallBinaryOp(psContext, "/", psInst, 0, 2, 3, TO_FLAG_UNSIGNED_INTEGER);
-        CallBinaryOp(psContext, "%", psInst, 1, 2, 3, TO_FLAG_UNSIGNED_INTEGER);
-        break;
-    }
-    case OPCODE_DIV:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DIV\n");
-#endif
-        CallBinaryOp(psContext, "/", psInst, 0, 1, 2, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_SINCOS:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SINCOS\n");
-#endif
-        if (psInst->asOperands[0].eType != OPERAND_TYPE_NULL)
-        {
-            CallHelper1(psContext, "sin", psInst, 0, 2);
-        }
-
-        if (psInst->asOperands[1].eType != OPERAND_TYPE_NULL)
-        {
-            CallHelper1(psContext, "cos", psInst, 1, 2);
-        }
-        break;
-    }
-
-    case OPCODE_DP2:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DP2\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "vec4(dot((");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ").xy, (");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ").xy))");
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_DP3:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DP3\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "vec4(dot((");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ").xyz, (");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ").xyz))");
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_DP4:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DP4\n");
-#endif
-        CallHelper2(psContext, "dot", psInst, 0, 1, 2);
-        break;
-    }
-    case OPCODE_INE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//INE\n");
-#endif
-        AddComparision(psContext, psInst, CMP_NE, TO_FLAG_INTEGER);
-        break;
-    }
-    case OPCODE_NE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//NE\n");
-#endif
-        AddComparision(psContext, psInst, CMP_NE, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_IGE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IGE\n");
-#endif
-        AddComparision(psContext, psInst, CMP_GE, TO_FLAG_INTEGER);
-        break;
-    }
-    case OPCODE_ILT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ILT\n");
-#endif
-        AddComparision(psContext, psInst, CMP_LT, TO_FLAG_INTEGER);
-        break;
-    }
-    case OPCODE_LT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LT\n");
-#endif
-        AddComparision(psContext, psInst, CMP_LT, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_IEQ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IEQ\n");
-#endif
-        AddComparision(psContext, psInst, CMP_EQ, TO_FLAG_INTEGER);
-        break;
-    }
-    case OPCODE_ULT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ULT\n");
-#endif
-        AddComparision(psContext, psInst, CMP_LT, TO_FLAG_UNSIGNED_INTEGER);
-        break;
-    }
-    case OPCODE_UGE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//UGE\n");
-#endif
-        AddComparision(psContext, psInst, CMP_GE, TO_FLAG_UNSIGNED_INTEGER);
-        break;
-    }
-    case OPCODE_MOVC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//MOVC\n");
-#endif
-        AddMOVCBinaryOp(psContext, &psInst->asOperands[0], 0, &psInst->asOperands[1], &psInst->asOperands[2], &psInst->asOperands[3]);
-        break;
-    }
-    case OPCODE_SWAPC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SWAPC\n");
-#endif
-        AddMOVCBinaryOp(psContext, &psInst->asOperands[0], 1, &psInst->asOperands[2], &psInst->asOperands[4], &psInst->asOperands[3]);
-        AddMOVCBinaryOp(psContext, &psInst->asOperands[1], 0, &psInst->asOperands[2], &psInst->asOperands[3], &psInst->asOperands[4]);
-        AddMOVBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[0], 1, 0);
-        break;
-    }
-
-    case OPCODE_LOG:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LOG\n");
-#endif
-        CallHelper1(psContext, "log2", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_RSQ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//RSQ\n");
-#endif
-        CallHelper1(psContext, "inversesqrt", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_EXP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EXP\n");
-#endif
-        CallHelper1(psContext, "exp2", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_SQRT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SQRT\n");
-#endif
-        CallHelper1(psContext, "sqrt", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_ROUND_PI:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ROUND_PI\n");
-#endif
-        CallHelper1(psContext, "ceil", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_ROUND_NI:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ROUND_NI\n");
-#endif
-        CallHelper1(psContext, "floor", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_ROUND_Z:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ROUND_Z\n");
-#endif
-        CallHelper1(psContext, "trunc", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_ROUND_NE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ROUND_NE\n");
-#endif
-        CallHelper1(psContext, "roundEven", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_FRC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//FRC\n");
-#endif
-        CallHelper1(psContext, "fract", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_IMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMAX\n");
-#endif
-        CallHelper2Int(psContext, "max", psInst, 0, 1, 2);
-        break;
-    }
-    case OPCODE_UMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//UMAX\n");
-#endif
-        CallHelper2UInt(psContext, "max", psInst, 0, 1, 2);
-        break;
-    }
-    case OPCODE_MAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//MAX\n");
-#endif
-        CallHelper2(psContext, "max", psInst, 0, 1, 2);
-        break;
-    }
-    case OPCODE_IMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMIN\n");
-#endif
-        CallHelper2Int(psContext, "min", psInst, 0, 1, 2);
-        break;
-    }
-    case OPCODE_UMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//UMIN\n");
-#endif
-        CallHelper2UInt(psContext, "min", psInst, 0, 1, 2);
-        break;
-    }
-    case OPCODE_MIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//MIN\n");
-#endif
-        CallHelper2(psContext, "min", psInst, 0, 1, 2);
-        break;
-    }
-    case OPCODE_GATHER4:
-    {
-        //dest, coords, tex, sampler
-        const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-        const uint32_t ui32SampleToFlags = GetResourceReturnTypeToFlags(RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, psContext);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//GATHER4\n");
-#endif
-        //gather4 r7.xyzw, r3.xyxx, t3.xyzw, s0.x
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], ui32SampleToFlags, psInst->bSaturate);
-        bcatcstr(glsl, "(textureGather(");
-
-        TextureName(*psContext->currentGLSLString, psContext->psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 0);
-        bcatcstr(glsl, ", ");
-        TranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-        bcatcstr(glsl, ")");
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-        bcatcstr(glsl, ")");
-
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        EndAssignment(psContext, &psInst->asOperands[0], ui32SampleToFlags, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_GATHER4_PO_C:
-    {
-        //dest, coords, offset, tex, sampler, srcReferenceValue
-        const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[3].ui32RegisterNumber];
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//GATHER4_PO_C\n");
-#endif
-
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "(textureGatherOffset(");
-
-        TextureName(*psContext->currentGLSLString, psContext->psShader, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[4].ui32RegisterNumber, 1);
-
-        bcatcstr(glsl, ", ");
-
-        TranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-
-        bcatcstr(glsl, ", ");
-        TranslateOperand(psContext, &psInst->asOperands[5], TO_FLAG_NONE);
-
-        bcatcstr(glsl, ", ivec2(");
-        //ivec2 offset
-        psInst->asOperands[2].aui32Swizzle[2] = 0xFFFFFFFF;
-        psInst->asOperands[2].aui32Swizzle[3] = 0xFFFFFFFF;
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(glsl, "))");
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[3]);
-        bcatcstr(glsl, ")");
-
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_GATHER4_PO:
-    {
-        //dest, coords, offset, tex, sampler
-        const uint32_t ui32SampleToFlags = GetResourceReturnTypeToFlags(RGROUP_TEXTURE, psInst->asOperands[3].ui32RegisterNumber, psContext);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//GATHER4_PO\n");
-#endif
-
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], ui32SampleToFlags, psInst->bSaturate);
-        bcatcstr(glsl, "(textureGatherOffset(");
-
-        TextureName(*psContext->currentGLSLString, psContext->psShader, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[4].ui32RegisterNumber, 0);
-
-        bcatcstr(glsl, ", ");
-        //Texture coord cannot be vec4
-        //Determining if it is a vec3 for vec2 yet to be done.
-        psInst->asOperands[1].aui32Swizzle[2] = 0xFFFFFFFF;
-        psInst->asOperands[1].aui32Swizzle[3] = 0xFFFFFFFF;
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-
-        bcatcstr(glsl, ", ivec2(");
-        //ivec2 offset
-        psInst->asOperands[2].aui32Swizzle[2] = 0xFFFFFFFF;
-        psInst->asOperands[2].aui32Swizzle[3] = 0xFFFFFFFF;
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(glsl, "))");
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[3]);
-        bcatcstr(glsl, ")");
-
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        EndAssignment(psContext, &psInst->asOperands[0], ui32SampleToFlags, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_GATHER4_C:
-    {
-        //dest, coords, tex, sampler srcReferenceValue
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//GATHER4_C\n");
-#endif
-
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "(textureGather(");
-
-        TextureName(*psContext->currentGLSLString, psContext->psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1);
-
-        bcatcstr(glsl, ", ");
-        //Texture coord cannot be vec4
-        //Determining if it is a vec3 for vec2 yet to be done.
-        psInst->asOperands[1].aui32Swizzle[2] = 0xFFFFFFFF;
-        psInst->asOperands[1].aui32Swizzle[3] = 0xFFFFFFFF;
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-
-        bcatcstr(glsl, ", ");
-        TranslateOperand(psContext, &psInst->asOperands[4], TO_FLAG_NONE);
-        bcatcstr(glsl, ")");
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-        bcatcstr(glsl, ")");
-
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_SAMPLE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SAMPLE\n");
-#endif
-        TranslateTextureSample(psContext, psInst, TEXSMP_FLAG_NONE);
-        break;
-    }
-    case OPCODE_SAMPLE_L:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SAMPLE_L\n");
-#endif
-        TranslateTextureSample(psContext, psInst, TEXSMP_FLAG_LOD);
-        break;
-    }
-    case OPCODE_SAMPLE_C:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SAMPLE_C\n");
-#endif
-
-        TranslateTextureSample(psContext, psInst, TEXSMP_FLAG_COMPARE);
-        break;
-    }
-    case OPCODE_SAMPLE_C_LZ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SAMPLE_C_LZ\n");
-#endif
-
-        TranslateTextureSample(psContext, psInst, TEXSMP_FLAG_COMPARE | TEXSMP_FLAG_FIRSTLOD);
-        break;
-    }
-    case OPCODE_SAMPLE_D:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SAMPLE_D\n");
-#endif
-
-        TranslateTextureSample(psContext, psInst, TEXSMP_FLAGS_GRAD);
-        break;
-    }
-    case OPCODE_SAMPLE_B:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SAMPLE_B\n");
-#endif
-
-        TranslateTextureSample(psContext, psInst, TEXSMP_FLAG_BIAS);
-        break;
-    }
-    case OPCODE_RET:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//RET\n");
-#endif
-        if (psContext->havePostShaderCode[psContext->currentPhase])
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//--- Post shader code ---\n");
-#endif
-            bconcat(glsl, psContext->postShaderCode[psContext->currentPhase]);
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//--- End post shader code ---\n");
-#endif
-        }
-        if (psContext->flags & HLSLCC_FLAG_TRACING_INSTRUMENTATION)
-        {
-            WriteEndTrace(psContext);
-        }
-        AddIndentation(psContext);
-        bcatcstr(glsl, "return;\n");
-        break;
-    }
-    case OPCODE_INTERFACE_CALL:
-    {
-        const char* name;
-        ShaderVar* psVar;
-        uint32_t varFound;
-
-        uint32_t funcPointer;
-        uint32_t funcTableIndex;
-        uint32_t funcTable;
-        uint32_t funcBodyIndex;
-        uint32_t funcBody;
-        uint32_t ui32NumBodiesPerTable;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//INTERFACE_CALL\n");
-#endif
-
-        ASSERT(psInst->asOperands[0].eIndexRep[0] == OPERAND_INDEX_IMMEDIATE32);
-
-        funcPointer = psInst->asOperands[0].aui32ArraySizes[0];
-        funcTableIndex = psInst->asOperands[0].aui32ArraySizes[1];
-        funcBodyIndex = psInst->ui32FuncIndexWithinInterface;
-
-        ui32NumBodiesPerTable = psContext->psShader->funcPointer[funcPointer].ui32NumBodiesPerTable;
-
-        funcTable = psContext->psShader->funcPointer[funcPointer].aui32FuncTables[funcTableIndex];
-
-        funcBody = psContext->psShader->funcTable[funcTable].aui32FuncBodies[funcBodyIndex];
-
-        varFound = GetInterfaceVarFromOffset(funcPointer, &psContext->psShader->sInfo, &psVar);
-
-        ASSERT(varFound);
-
-        name = &psVar->sType.Name[0];
-
-        AddIndentation(psContext);
-        bcatcstr(glsl, name);
-        TranslateOperandIndexMAD(psContext, &psInst->asOperands[0], 1, ui32NumBodiesPerTable, funcBodyIndex);
-        //bformata(glsl, "[%d]", funcBodyIndex);
-        bcatcstr(glsl, "();\n");
-        break;
-    }
-    case OPCODE_LABEL:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LABEL\n");
-#endif
-        --psContext->indent;
-        AddIndentation(psContext);
-        bcatcstr(glsl, "}\n");     //Closing brace ends the previous function.
-        AddIndentation(psContext);
-
-        bcatcstr(glsl, "subroutine(SubroutineType)\n");
-        bcatcstr(glsl, "void ");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(glsl, "(){\n");
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_COUNTBITS:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//COUNTBITS\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, "bitCount(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_FIRSTBIT_HI:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//FIRSTBIT_HI\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, "findMSB(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_FIRSTBIT_LO:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//FIRSTBIT_LO\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, "findLSB(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_FIRSTBIT_SHI:     //signed high
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//FIRSTBIT_SHI\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, "findMSB(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_BFREV:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//BFREV\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, "bitfieldReverse(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_BFI:
-    {
-        uint32_t numelements_width = GetNumSwizzleElements(&psInst->asOperands[1]);
-        uint32_t numelements_offset = GetNumSwizzleElements(&psInst->asOperands[2]);
-        uint32_t numelements_dest = GetNumSwizzleElements(&psInst->asOperands[0]);
-        uint32_t numoverall_elements = min(min(numelements_width, numelements_offset), numelements_dest);
-        uint32_t i, j;
-        static const char* bfi_elementidx[] = { "x", "y", "z", "w" };
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//BFI\n");
-#endif
-
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bformata(glsl, "ivec%d(", numoverall_elements);
-        for (i = 0; i < numoverall_elements; ++i)
-        {
-            bcatcstr(glsl, "bitfieldInsert(");
-
-            for (j = 4; j >= 1; --j)
-            {
-                uint32_t opSwizzleCount = GetNumSwizzleElements(&psInst->asOperands[j]);
-
-                if (opSwizzleCount != 1)
-                {
-                    bcatcstr(glsl, " (");
-                }
-                TranslateOperand(psContext, &psInst->asOperands[j], TO_FLAG_INTEGER);
-                if (opSwizzleCount != 1)
-                {
-                    bformata(glsl, " ).%s", bfi_elementidx[i]);
-                }
-                if (j != 1)
-                {
-                    bcatcstr(glsl, ",");
-                }
-            }
-
-            bcatcstr(glsl, ") ");
-            if (i + 1 != numoverall_elements)
-            {
-                bcatcstr(glsl, ", ");
-            }
-        }
-
-        bcatcstr(glsl, ").");
-        for (i = 0; i < numoverall_elements; ++i)
-        {
-            bformata(glsl, "%s", bfi_elementidx[i]);
-        }
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_CUT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//CUT\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "EndPrimitive();\n");
-        break;
-    }
-    case OPCODE_EMIT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EMIT\n");
-#endif
-        if (psContext->havePostShaderCode[psContext->currentPhase])
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//--- Post shader code ---\n");
-#endif
-            bconcat(glsl, psContext->postShaderCode[psContext->currentPhase]);
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//--- End post shader code ---\n");
-#endif
-            AddIndentation(psContext);
-        }
-
-        AddIndentation(psContext);
-        bcatcstr(glsl, "EmitVertex();\n");
-        break;
-    }
-    case OPCODE_EMITTHENCUT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EMITTHENCUT\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "EmitVertex();\nEndPrimitive();\n");
-        break;
-    }
-
-    case OPCODE_CUT_STREAM:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//CUT\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "EndStreamPrimitive(");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(glsl, ");\n");
-
-        break;
-    }
-    case OPCODE_EMIT_STREAM:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EMIT\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "EmitStreamVertex(");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(glsl, ");\n");
-        break;
-    }
-    case OPCODE_EMITTHENCUT_STREAM:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EMITTHENCUT\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "EmitStreamVertex(");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(glsl, ");\n");
-        bcatcstr(glsl, "EndStreamPrimitive(");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(glsl, ");\n");
-        break;
-    }
-    case OPCODE_REP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//REP\n");
-#endif
-        //Need to handle nesting.
-        //Max of 4 for rep - 'Flow Control Limitations' http://msdn.microsoft.com/en-us/library/windows/desktop/bb219848(v=vs.85).aspx
-
-        AddIndentation(psContext);
-        bcatcstr(glsl, "RepCounter = ivec4(");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_NONE);
-        bcatcstr(glsl, ").x;\n");
-
-        AddIndentation(psContext);
-        bcatcstr(glsl, "while(RepCounter!=0){\n");
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_ENDREP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ENDREP\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "RepCounter--;\n");
-
-        --psContext->indent;
-
-        AddIndentation(psContext);
-        bcatcstr(glsl, "}\n");
-        break;
-    }
-    case OPCODE_LOOP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LOOP\n");
-#endif
-        AddIndentation(psContext);
-
-        if (psInst->ui32NumOperands == 2)
-        {
-            //DX9 version
-            ASSERT(psInst->asOperands[0].eType == OPERAND_TYPE_SPECIAL_LOOPCOUNTER);
-            bcatcstr(glsl, "for(");
-            bcatcstr(glsl, "LoopCounter = ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(glsl, ".y, ZeroBasedCounter = 0;");
-            bcatcstr(glsl, "ZeroBasedCounter < ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(glsl, ".x;");
-
-            bcatcstr(glsl, "LoopCounter += ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(glsl, ".z, ZeroBasedCounter++){\n");
-            ++psContext->indent;
-        }
-        else
-        {
-            bcatcstr(glsl, "while(true){\n");
-            ++psContext->indent;
-        }
-        break;
-    }
-    case OPCODE_ENDLOOP:
-    {
-        --psContext->indent;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ENDLOOP\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "}\n");
-        break;
-    }
-    case OPCODE_BREAK:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//BREAK\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "break;\n");
-        break;
-    }
-    case OPCODE_BREAKC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//BREAKC\n");
-#endif
-        AddIndentation(psContext);
-
-        TranslateConditional(psContext, psInst, glsl);
-        break;
-    }
-    case OPCODE_CONTINUEC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//CONTINUEC\n");
-#endif
-        AddIndentation(psContext);
-
-        TranslateConditional(psContext, psInst, glsl);
-        break;
-    }
-    case OPCODE_IF:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IF\n");
-#endif
-        AddIndentation(psContext);
-
-        TranslateConditional(psContext, psInst, glsl);
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_RETC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//RETC\n");
-#endif
-        AddIndentation(psContext);
-
-        TranslateConditional(psContext, psInst, glsl);
-        break;
-    }
-    case OPCODE_ELSE:
-    {
-        --psContext->indent;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ELSE\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "} else {\n");
-        psContext->indent++;
-        break;
-    }
-    case OPCODE_ENDSWITCH:
-    case OPCODE_ENDIF:
-    {
-        --psContext->indent;
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ENDIF\n");
-        AddIndentation(psContext);
-        bcatcstr(glsl, "}\n");
-        break;
-    }
-    case OPCODE_CONTINUE:
-    {
-        AddIndentation(psContext);
-        bcatcstr(glsl, "continue;\n");
-        break;
-    }
-    case OPCODE_DEFAULT:
-    {
-        --psContext->indent;
-        AddIndentation(psContext);
-        bcatcstr(glsl, "default:\n");
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_NOP:
-    {
-        break;
-    }
-    case OPCODE_SYNC:
-    {
-        const uint32_t ui32SyncFlags = psInst->ui32SyncFlags;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SYNC\n");
-#endif
-
-        if (ui32SyncFlags & SYNC_THREADS_IN_GROUP)
-        {
-            AddIndentation(psContext);
-            bcatcstr(glsl, "barrier();\n");
-            AddIndentation(psContext);
-            bcatcstr(glsl, "groupMemoryBarrier();\n");
-        }
-        if (ui32SyncFlags & SYNC_THREAD_GROUP_SHARED_MEMORY)
-        {
-            AddIndentation(psContext);
-            bcatcstr(glsl, "memoryBarrierShared();\n");
-        }
-        if (ui32SyncFlags & (SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GROUP | SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GLOBAL))
-        {
-            AddIndentation(psContext);
-            bcatcstr(glsl, "memoryBarrier();\n");
-        }
-        break;
-    }
-    case OPCODE_SWITCH:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//SWITCH\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(glsl, "switch(int(");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_NONE);
-        bcatcstr(glsl, ")){\n");
-
-        psContext->indent += 2;
-        break;
-    }
-    case OPCODE_CASE:
-    {
-        --psContext->indent;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//case\n");
-#endif
-        AddIndentation(psContext);
-
-        bcatcstr(glsl, "case ");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-        bcatcstr(glsl, ":\n");
-
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_EQ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EQ\n");
-#endif
-        AddComparision(psContext, psInst, CMP_EQ, TO_FLAG_FLOAT);
-        break;
-    }
-    case OPCODE_USHR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//USHR\n");
-#endif
-        CallBinaryOp(psContext, ">>", psInst, 0, 1, 2, TO_FLAG_UNSIGNED_INTEGER);
-        break;
-    }
-    case OPCODE_ISHL:
-    {
-        uint32_t ui32Flags = TO_FLAG_INTEGER;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ISHL\n");
-#endif
-
-        if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            ui32Flags = TO_FLAG_UNSIGNED_INTEGER;
-        }
-
-        CallBinaryOp(psContext, "<<", psInst, 0, 1, 2, ui32Flags);
-        break;
-    }
-    case OPCODE_ISHR:
-    {
-        uint32_t ui32Flags = TO_FLAG_INTEGER;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//ISHR\n");
-#endif
-
-        if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            ui32Flags = TO_FLAG_UNSIGNED_INTEGER;
-        }
-
-        CallBinaryOp(psContext, ">>", psInst, 0, 1, 2, ui32Flags);
-        break;
-    }
-    case OPCODE_LD:
-    case OPCODE_LD_MS:
-    {
-        ResourceBinding* psBinding = 0;
-        uint32_t ui32FetchTypeToFlags;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_LD)
-        {
-            bcatcstr(glsl, "//LD\n");
-        }
-        else
-        {
-            bcatcstr(glsl, "//LD_MS\n");
-        }
-#endif
-
-        GetResourceFromBindingPoint(RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, &psContext->psShader->sInfo, &psBinding);
-        ui32FetchTypeToFlags = GetReturnTypeToFlags(psBinding->ui32ReturnType);
-
-        const char* fetchFunctionString = psInst->bAddressOffset ? "texelFetchOffset" : "texelFetch";
-        switch (psBinding->eDimension)
-        {
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-        {
-            //texelFetch(samplerBuffer, int coord, level)
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, fetchFunctionString);
-            bcatcstr(glsl, "(");
-
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").x, int((");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").w)");
-            if (psInst->bAddressOffset)
-            {
-                bformata(glsl, ", %d", psInst->iUAddrOffset);
-            }
-            bcatcstr(glsl, ")");
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-            EndAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-        {
-            //texelFetch(samplerBuffer, ivec3 coord, level)
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, fetchFunctionString);
-            bcatcstr(glsl, "(");
-
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").xyz, int((");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").w)");
-            if (psInst->bAddressOffset)
-            {
-                if (psBinding->eDimension == REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY)
-                {
-                    bformata(glsl, ", ivec2(%d, %d)",
-                        psInst->iUAddrOffset,
-                        psInst->iVAddrOffset);
-                }
-                else
-                {
-                    bformata(glsl, ", ivec3(%d, %d, %d)",
-                        psInst->iUAddrOffset,
-                        psInst->iVAddrOffset,
-                        psInst->iWAddrOffset);
-                }
-            }
-            bcatcstr(glsl, ")");
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-            EndAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        {
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-
-            if (IsGmemReservedSlot(FBF_ANY, psInst->asOperands[2].ui32RegisterNumber))         // FRAMEBUFFER FETCH
-            {
-                TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            }
-            else
-            {
-                bcatcstr(glsl, fetchFunctionString);
-                bcatcstr(glsl, "(");
-
-                TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-                bcatcstr(glsl, ", (");
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                bcatcstr(glsl, ").xy, int((");
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                bcatcstr(glsl, ").w)");
-                if (psInst->bAddressOffset)
-                {
-                    if (psBinding->eDimension == REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY)
-                    {
-                        bformata(glsl, ", int(%d)", psInst->iUAddrOffset);
-                    }
-                    else
-                    {
-                        bformata(glsl, ", ivec2(%d, %d)",
-                            psInst->iUAddrOffset,
-                            psInst->iVAddrOffset);
-                    }
-                }
-                bcatcstr(glsl, ")");
-                TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            }
-
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-            EndAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_BUFFER:
-        {
-            //texelFetch(samplerBuffer, scalar integer coord)
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, "texelFetch(");
-
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").x)");
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-            EndAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:
-        {
-            //texelFetch(samplerBuffer, ivec2 coord, sample)
-
-            ASSERT(psInst->eOpcode == OPCODE_LD_MS);
-
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, "texelFetch(");
-
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").xy, int(");
-            TranslateOperand(psContext, &psInst->asOperands[3], TO_FLAG_INTEGER);
-            bcatcstr(glsl, "))");
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-            EndAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-        {
-            //texelFetch(samplerBuffer, ivec3 coord, sample)
-
-            ASSERT(psInst->eOpcode == OPCODE_LD_MS);
-
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, "texelFetch(");
-
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ivec3((");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").xyz), int(");
-            TranslateOperand(psContext, &psInst->asOperands[3], TO_FLAG_INTEGER);
-            bcatcstr(glsl, "))");
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-            EndAssignment(psContext, &psInst->asOperands[0], ui32FetchTypeToFlags, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        case REFLECT_RESOURCE_DIMENSION_BUFFEREX:
-        default:
-        {
-            break;
-        }
-        }
-        break;
-    }
-    case OPCODE_DISCARD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DISCARD\n");
-#endif
-        AddIndentation(psContext);
-        if (psContext->psShader->ui32MajorVersion <= 3)
-        {
-            bcatcstr(glsl, "if(any(lessThan((");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT);
-
-            if (psContext->psShader->ui32MajorVersion == 1)
-            {
-                /* SM1.X only kills based on the rgb channels */
-                bcatcstr(glsl, ").xyz, vec3(0.0)))){discard;}\n");
-            }
-            else
-            {
-                bcatcstr(glsl, "), vec4(0.0)))){discard;}\n");
-            }
-        }
-        else if (psInst->eBooleanTestType == INSTRUCTION_TEST_ZERO)
-        {
-            bcatcstr(glsl, "if((");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT);
-            bcatcstr(glsl, ")==0.0){discard;}\n");
-        }
-        else
-        {
-            ASSERT(psInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO);
-            bcatcstr(glsl, "if((");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT);
-            bcatcstr(glsl, ")!=0.0){discard;}\n");
-        }
-        break;
-    }
-    case OPCODE_LOD:
-    {
-        uint32_t ui32SampleTypeToFlags = GetResourceReturnTypeToFlags(RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, psContext);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LOD\n");
-#endif
-        //LOD computes the following vector (ClampedLOD, NonClampedLOD, 0, 0)
-
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], ui32SampleTypeToFlags, psInst->bSaturate);
-
-        //If the core language does not have query-lod feature,
-        //then the extension is used. The name of the function
-        //changed between extension and core.
-        if (HaveQueryLod(psContext->psShader->eTargetLanguage))
-        {
-            bcatcstr(glsl, "textureQueryLod(");
-        }
-        else
-        {
-            bcatcstr(glsl, "textureQueryLOD(");
-        }
-
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(glsl, ",");
-        TranslateTexCoord(psContext,
-            psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber],
-            &psInst->asOperands[1]);
-        bcatcstr(glsl, ")");
-
-        //The swizzle on srcResource allows the returned values to be swizzled arbitrarily before they are written to the destination.
-
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-        EndAssignment(psContext, &psInst->asOperands[0], ui32SampleTypeToFlags, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_EVAL_CENTROID:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EVAL_CENTROID\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "interpolateAtCentroid(");
-        //interpolateAtCentroid accepts in-qualified variables.
-        //As long as bytecode only writes vX registers in declarations
-        //we should be able to use the declared name directly.
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_DECLARATION_NAME);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_EVAL_SAMPLE_INDEX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EVAL_SAMPLE_INDEX\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "interpolateAtSample(");
-        //interpolateAtSample accepts in-qualified variables.
-        //As long as bytecode only writes vX registers in declarations
-        //we should be able to use the declared name directly.
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_DECLARATION_NAME);
-        bcatcstr(glsl, ", ");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_INTEGER);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_EVAL_SNAPPED:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//EVAL_SNAPPED\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "interpolateAtOffset(");
-        //interpolateAtOffset accepts in-qualified variables.
-        //As long as bytecode only writes vX registers in declarations
-        //we should be able to use the declared name directly.
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_DECLARATION_NAME);
-        bcatcstr(glsl, ", ");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_INTEGER);
-        bcatcstr(glsl, ".xy)");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_LD_STRUCTURED:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LD_STRUCTURED ");
-#endif
-        uint32_t reg_num = psInst->asOperands[3].ui32RegisterNumber;
-        if (reg_num >= GMEM_PLS_RO_SLOT && reg_num <= GMEM_PLS_RW_SLOT)
-        {
-#ifdef _DEBUG
-            bcatcstr(glsl, "-> LOAD FROM PLS\n");
-#endif
-            // Ensure it's not a write only PLS
-            ASSERT(reg_num != GMEM_PLS_WO_SLOT);
-
-            TranslateShaderPLSLoad(psContext, psInst);
-        }
-        else
-        {
-            bcatcstr(glsl, "\n");
-            TranslateShaderStorageLoad(psContext, psInst);
-        }
-        break;
-    }
-    case OPCODE_LD_UAV_TYPED:
-    {
-        uint32_t ui32UAVReturnTypeToFlags = GetResourceReturnTypeToFlags(RGROUP_UAV, psInst->asOperands[2].ui32RegisterNumber, psContext);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LD_UAV_TYPED\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], ui32UAVReturnTypeToFlags, psInst->bSaturate);
-        bcatcstr(glsl, "imageLoad(");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NAME_ONLY);
-
-        switch (psInst->eResDim)
-        {
-        case RESOURCE_DIMENSION_BUFFER:
-        case RESOURCE_DIMENSION_TEXTURE1D:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bformata(glsl, ").x)");
-            break;
-        case RESOURCE_DIMENSION_TEXTURE2D:
-        case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        case RESOURCE_DIMENSION_TEXTURE2DMS:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bformata(glsl, ").xy)");
-            break;
-        case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        case RESOURCE_DIMENSION_TEXTURE3D:
-        case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-        case RESOURCE_DIMENSION_TEXTURECUBE:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bformata(glsl, ").xyz)");
-            break;
-        case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bformata(glsl, ").xyzw)");
-            break;
-        }
-
-        TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-        EndAssignment(psContext, &psInst->asOperands[0], ui32UAVReturnTypeToFlags, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_STORE_RAW:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//STORE_RAW\n");
-#endif
-        TranslateShaderStorageStore(psContext, psInst);
-        break;
-    }
-    case OPCODE_STORE_STRUCTURED:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//STORE_STRUCTURE ");
-#endif
-        uint32_t reg_num = psInst->asOperands[0].ui32RegisterNumber;
-        if (reg_num >= GMEM_PLS_RO_SLOT && reg_num <= GMEM_PLS_RW_SLOT)
-        {
-#ifdef _DEBUG
-            bcatcstr(glsl, "-> STORE TO PLS\n");
-#endif
-            // Ensure it's not a read only PLS
-            ASSERT(reg_num != GMEM_PLS_RO_SLOT);
-
-            TranslateShaderPLSStore(psContext, psInst);
-        }
-        else
-        {
-            bcatcstr(glsl, "\n");
-            TranslateShaderStorageStore(psContext, psInst);
-        }
-        break;
-    }
-
-    case OPCODE_STORE_UAV_TYPED:
-    {
-        ResourceBinding* psRes;
-        int foundResource;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//STORE_UAV_TYPED\n");
-#endif
-        AddIndentation(psContext);
-
-        foundResource = GetResourceFromBindingPoint(RGROUP_UAV, psInst->asOperands[0].ui32RegisterNumber, &psContext->psShader->sInfo, &psRes);
-
-        ASSERT(foundResource);
-
-        bcatcstr(glsl, "imageStore(");
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_NAME_ONLY);
-
-        switch (psRes->eDimension)
-        {
-        case REFLECT_RESOURCE_DIMENSION_BUFFER:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ").x");
-
-            // HACK!!
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-            bformata(glsl, ");\n");
-            break;
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ".xy)");
-
-            // HACK!!
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_FLOAT);
-            bformata(glsl, ");\n");
-            break;
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ".xyz)");
-
-            // HACK!!
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_FLOAT);
-            bformata(glsl, ");\n");
-            break;
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-            bcatcstr(glsl, ", (");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ".xyzw)");
-
-            // HACK!!
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_FLOAT);
-            bformata(glsl, ");\n");
-            break;
-        }
-
-        break;
-    }
-    case OPCODE_LD_RAW:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LD_RAW\n");
-#endif
-
-        TranslateShaderStorageLoad(psContext, psInst);
-        break;
-    }
-
-    case OPCODE_ATOMIC_CMP_STORE:
-    case OPCODE_IMM_ATOMIC_AND:
-    case OPCODE_ATOMIC_AND:
-    case OPCODE_IMM_ATOMIC_IADD:
-    case OPCODE_ATOMIC_IADD:
-    case OPCODE_ATOMIC_OR:
-    case OPCODE_ATOMIC_XOR:
-    case OPCODE_ATOMIC_IMIN:
-    case OPCODE_ATOMIC_UMIN:
-    case OPCODE_ATOMIC_IMAX:
-    case OPCODE_ATOMIC_UMAX:
-    case OPCODE_IMM_ATOMIC_IMAX:
-    case OPCODE_IMM_ATOMIC_IMIN:
-    case OPCODE_IMM_ATOMIC_UMAX:
-    case OPCODE_IMM_ATOMIC_UMIN:
-    case OPCODE_IMM_ATOMIC_OR:
-    case OPCODE_IMM_ATOMIC_XOR:
-    case OPCODE_IMM_ATOMIC_EXCH:
-    case OPCODE_IMM_ATOMIC_CMP_EXCH:
-    {
-        TranslateAtomicMemOp(psContext, psInst);
-        break;
-    }
-    case OPCODE_UBFE:
-    case OPCODE_IBFE:
-    {
-        const char* swizzles = "xyzw";
-        uint32_t eDataType, destElem;
-        uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        uint32_t s0ElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-        uint32_t s1ElemCount = GetNumSwizzleElements(&psInst->asOperands[2]);
-        uint32_t s2ElemCount = GetNumSwizzleElements(&psInst->asOperands[3]);
-        const char* szVecType;
-        const char* szDataType;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_UBFE)
-        {
-            bcatcstr(glsl, "//OPCODE_UBFE\n");
-        }
-        else
-        {
-            bcatcstr(glsl, "//OPCODE_IBFE\n");
-        }
-#endif
-        if (psInst->eOpcode == OPCODE_UBFE)
-        {
-            eDataType = TO_FLAG_UNSIGNED_INTEGER;
-            szVecType = "uvec";
-            szDataType = "uint";
-        }
-        else
-        {
-            eDataType = TO_FLAG_INTEGER;
-            szVecType = "ivec";
-            szDataType = "int";
-        }
-
-        if (psContext->psShader->eTargetLanguage != LANG_ES_300)
-        {
-            AddIndentation(psContext);
-            BeginAssignment(psContext, &psInst->asOperands[0], eDataType, psInst->bSaturate);
-
-            if (destElemCount > 1)
-            {
-                bformata(glsl, "%s%d(", szVecType, destElemCount);
-            }
-
-            for (destElem = 0; destElem < destElemCount; ++destElem)
-            {
-                if (destElem > 0)
-                {
-                    bcatcstr(glsl, ", ");
-                }
-
-                bformata(glsl, "bitfieldExtract(");
-
-                TranslateOperand(psContext, &psInst->asOperands[3], eDataType);
-                if (s2ElemCount > 1)
-                {
-                    TranslateOperandSwizzle(psContext, &psInst->asOperands[3]);
-                    bformata(glsl, ".%c", swizzles[destElem]);
-                }
-
-                bcatcstr(glsl, ", ");
-
-                TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_INTEGER);
-                if (s1ElemCount > 1)
-                {
-                    TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-                    bformata(glsl, ".%c", swizzles[destElem]);
-                }
-
-                bcatcstr(glsl, ", ");
-
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                if (s0ElemCount > 1)
-                {
-                    TranslateOperandSwizzle(psContext, &psInst->asOperands[1]);
-                    bformata(glsl, ".%c", swizzles[destElem]);
-                }
-
-                bformata(glsl, ")");
-            }
-            if (destElemCount > 1)
-            {
-                bcatcstr(glsl, ")");
-            }
-            EndAssignment(psContext, &psInst->asOperands[0], eDataType, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-        }
-        else
-        {
-            // Following is the explicit impl' for ES3.0
-            //  Here's the description of what bitfieldExtract actually does
-            //  https://www.opengl.org/registry/specs/ARB/gpu_shader5.txt
-
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, "{\n");
-
-            //  << (32-bits-offset)
-            AddIndentation(psContext);
-            AddIndentation(psContext);
-            bcatcstr(glsl, "int offsetLeft = (32 - ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, " - ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ");\n");
-
-            //  >> (32-bits)
-            AddIndentation(psContext);
-            AddIndentation(psContext);
-            bcatcstr(glsl, "int offsetRight = (32 - ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ");\n");
-
-            AddIndentation(psContext);
-            AddIndentation(psContext);
-            bformata(glsl, "%s tmp;\n", szDataType);
-
-            for (destElem = 0; destElem < destElemCount; ++destElem)
-            {
-                AddIndentation(psContext);
-                AddIndentation(psContext);
-                bcatcstr(glsl, "tmp = ");
-
-                if (psInst->eOpcode == OPCODE_IBFE)
-                {
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                    bcatcstr(glsl, " ? ");
-                }
-
-                TranslateOperand(psContext, &psInst->asOperands[3], eDataType);
-                if (s2ElemCount > 1)
-                {
-                    TranslateOperandSwizzle(psContext, &psInst->asOperands[3]);
-                    bformata(glsl, ".%c", swizzles[destElem]);
-                }
-                if (psInst->eOpcode == OPCODE_IBFE)
-                {
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                    bcatcstr(glsl, " : 0 ");
-                }
-                bcatcstr(glsl, ";\n");
-
-                AddIndentation(psContext);
-                AddIndentation(psContext);
-                bcatcstr(glsl, "tmp = ((tmp << offsetLeft) >> offsetRight);\n");
-
-                AddIndentation(psContext);
-                AddIndentation(psContext);
-                BeginAssignment(psContext, &psInst->asOperands[0], 0, psInst->bSaturate);
-                if (eDataType == TO_FLAG_INTEGER)
-                {
-                    bcatcstr(glsl, "intBitsToFloat(tmp));\n");
-                }
-                else
-                {
-                    bcatcstr(glsl, "uintBitsToFloat(tmp));\n");
-                }
-            }
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, "}\n");
-        }
-
-        break;
-    }
-    case OPCODE_RCP:
-    {
-        const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//RCP\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "(vec4(1.0) / vec4(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-        bcatcstr(glsl, "))");
-        AddSwizzleUsingElementCount(psContext, destElemCount);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_F16TOF32:
-    {
-        const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        const uint32_t s0ElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-        uint32_t destElem;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//F16TOF32\n");
-#endif
-        for (destElem = 0; destElem < destElemCount; ++destElem)
-        {
-            const char* swizzle[] = {".x", ".y", ".z", ".w"};
-
-            //unpackHalf2x16 converts two f16s packed into uint to two f32s.
-
-            //dest.swiz.x = unpackHalf2x16(src.swiz.x).x
-            //dest.swiz.y = unpackHalf2x16(src.swiz.y).x
-            //dest.swiz.z = unpackHalf2x16(src.swiz.z).x
-            //dest.swiz.w = unpackHalf2x16(src.swiz.w).x
-
-            AddIndentation(psContext);
-            if (destElemCount > 1)
-            {
-                BeginAssignmentEx(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate, swizzle[destElem]);
-            }
-            else
-            {
-                BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-            }
-
-            bcatcstr(glsl, "unpackHalf2x16(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-            if (s0ElemCount > 1)
-            {
-                bcatcstr(glsl, swizzle[destElem]);
-            }
-            bcatcstr(glsl, ").x");
-            EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-        }
-        break;
-    }
-    case OPCODE_F32TOF16:
-    {
-        const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        const uint32_t s0ElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-        uint32_t destElem;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//F32TOF16\n");
-#endif
-        for (destElem = 0; destElem < destElemCount; ++destElem)
-        {
-            const char* swizzle[] = {".x", ".y", ".z", ".w"};
-
-            //packHalf2x16 converts two f32s to two f16s packed into a uint.
-
-            //dest.swiz.x = packHalf2x16(vec2(src.swiz.x)) & 0xFFFF
-            //dest.swiz.y = packHalf2x16(vec2(src.swiz.y)) & 0xFFFF
-            //dest.swiz.z = packHalf2x16(vec2(src.swiz.z)) & 0xFFFF
-            //dest.swiz.w = packHalf2x16(vec2(src.swiz.w)) & 0xFFFF
-
-            AddIndentation(psContext);
-            if (destElemCount > 1)
-            {
-                BeginAssignmentEx(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate, swizzle[destElem]);
-            }
-            else
-            {
-                BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-            }
-
-            bcatcstr(glsl, "packHalf2x16(vec2(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-            if (s0ElemCount > 1)
-            {
-                bcatcstr(glsl, swizzle[destElem]);
-            }
-            bcatcstr(glsl, ")) & 0xFFFFu");
-            EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-            bcatcstr(glsl, ";\n");
-        }
-        break;
-    }
-    case OPCODE_INEG:
-    {
-        uint32_t dstCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        uint32_t srcCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//INEG\n");
-#endif
-        //dest = 0 - src0
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        //bcatcstr(glsl, " = 0 - ");
-        bcatcstr(glsl, "-(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE | TO_FLAG_INTEGER);
-        if (srcCount > dstCount)
-        {
-            AddSwizzleUsingElementCount(psContext, dstCount);
-        }
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_DERIV_RTX_COARSE:
-    case OPCODE_DERIV_RTX_FINE:
-    case OPCODE_DERIV_RTX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DERIV_RTX\n");
-#endif
-        CallHelper1(psContext, "dFdx", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_DERIV_RTY_COARSE:
-    case OPCODE_DERIV_RTY_FINE:
-    case OPCODE_DERIV_RTY:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DERIV_RTY\n");
-#endif
-        CallHelper1(psContext, "dFdy", psInst, 0, 1);
-        break;
-    }
-    case OPCODE_LRP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//LRP\n");
-#endif
-        CallHelper3(psContext, "mix", psInst, 0, 2, 3, 1);
-        break;
-    }
-    case OPCODE_DP2ADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//DP2ADD\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "dot(vec2(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-        bcatcstr(glsl, "), vec2(");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ")) + ");
-        TranslateOperand(psContext, &psInst->asOperands[3], TO_FLAG_FLOAT);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_POW:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//POW\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, "pow(abs(");
-        TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_FLOAT);
-        bcatcstr(glsl, "), ");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_FLOAT);
-        bcatcstr(glsl, ")");
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_FLOAT, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-
-    case OPCODE_IMM_ATOMIC_ALLOC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_ALLOC\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, "atomicCounterIncrement(");
-        bformata(glsl, "UAV%d_counter)", psInst->asOperands[1].ui32RegisterNumber);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_CONSUME:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//IMM_ATOMIC_CONSUME\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, "atomicCounterDecrement(");
-        bformata(glsl, "UAV%d_counter)", psInst->asOperands[1].ui32RegisterNumber);
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-
-    case OPCODE_NOT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//INOT\n");
-#endif
-        AddIndentation(psContext);
-        BeginAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        
-        uint32_t uDestElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        uint32_t uSrcElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-
-        if (uDestElemCount == uSrcElemCount)
-        {
-            bcatcstr(glsl, "~(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ")");            
-        }
-        else
-        {   
-            ASSERT(uSrcElemCount > uDestElemCount);
-            bformata(glsl, "ivec%d(~(", uSrcElemCount);            
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, "))");
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);            
-        }
-         
-        EndAssignment(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, psInst->bSaturate);
-        bcatcstr(glsl, ";\n");
-        break;
-    }
-    case OPCODE_XOR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//XOR\n");
-#endif
-
-        CallBinaryOp(psContext, "^", psInst, 0, 1, 2, TO_FLAG_INTEGER);
-        break;
-    }
-    case OPCODE_RESINFO:
-    {
-        const RESINFO_RETURN_TYPE eResInfoReturnType = psInst->eResInfoReturnType;
-        uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        uint32_t destElem;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(glsl, "//RESINFO\n");
-#endif
-
-        //ASSERT(psInst->asOperands[0].eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-        //ASSERT(psInst->asOperands[0].ui32CompMask == OPERAND_4_COMPONENT_MASK_ALL);
-
-
-
-
-        for (destElem = 0; destElem < destElemCount; ++destElem)
-        {
-            const char* swizzle[] = {"x", "y", "z", "w"};
-            uint32_t ui32ResInfoReturnTypeToFlags = (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT) ? TO_FLAG_INTEGER /* currently it's treated as int */ : TO_FLAG_FLOAT;
-
-            AddIndentation(psContext);
-            if (destElemCount > 1)
-            {
-                BeginAssignmentEx(psContext, &psInst->asOperands[0], ui32ResInfoReturnTypeToFlags, psInst->bSaturate, swizzle[destElem]);
-            }
-            else
-            {
-                BeginAssignment(psContext, &psInst->asOperands[0], ui32ResInfoReturnTypeToFlags, psInst->bSaturate);
-            }
-
-            GetResInfoData(psContext, psInst, destElem);
-
-            EndAssignment(psContext, &psInst->asOperands[0], ui32ResInfoReturnTypeToFlags, psInst->bSaturate);
-
-            bcatcstr(glsl, ";\n");
-        }
-
-        break;
-    }
-
-
-    case OPCODE_DMAX:
-    case OPCODE_DMIN:
-    case OPCODE_DMUL:
-    case OPCODE_DEQ:
-    case OPCODE_DGE:
-    case OPCODE_DLT:
-    case OPCODE_DNE:
-    case OPCODE_DMOV:
-    case OPCODE_DMOVC:
-    case OPCODE_DTOF:
-    case OPCODE_FTOD:
-    case OPCODE_DDIV:
-    case OPCODE_DFMA:
-    case OPCODE_DRCP:
-    case OPCODE_MSAD:
-    case OPCODE_DTOI:
-    case OPCODE_DTOU:
-    case OPCODE_ITOD:
-    case OPCODE_UTOD:
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-}
-
-static int IsIntegerOpcode(OPCODE_TYPE eOpcode)
-{
-    switch (eOpcode)
-    {
-    case OPCODE_IADD:
-    case OPCODE_IF:
-    case OPCODE_IEQ:
-    case OPCODE_IGE:
-    case OPCODE_ILT:
-    case OPCODE_IMAD:
-    case OPCODE_IMAX:
-    case OPCODE_IMIN:
-    case OPCODE_IMUL:
-    case OPCODE_INE:
-    case OPCODE_INEG:
-    case OPCODE_ISHL:
-    case OPCODE_ISHR:
-    case OPCODE_ITOF:
-    case OPCODE_AND:
-    case OPCODE_OR:
-    {
-        return 1;
-    }
-    default:
-    {
-        return 0;
-    }
-    }
-}
-
-int InstructionUsesRegister(const Instruction* psInst, const Operand* psOperand)
-{
-    uint32_t operand;
-    for (operand = 0; operand < psInst->ui32NumOperands; ++operand)
-    {
-        if (psInst->asOperands[operand].eType == psOperand->eType)
-        {
-            if (psInst->asOperands[operand].ui32RegisterNumber == psOperand->ui32RegisterNumber)
-            {
-                if (CompareOperandSwizzles(&psInst->asOperands[operand], psOperand))
-                {
-                    return 1;
-                }
-            }
-        }
-    }
-    return 0;
-}
-
-void MarkIntegerImmediates(HLSLCrossCompilerContext* psContext)
-{
-    const uint32_t count = psContext->psShader->ui32InstCount;
-    Instruction* psInst = psContext->psShader->psInst;
-    uint32_t i;
-
-    for (i = 0; i < count; )
-    {
-        if (psInst[i].eOpcode == OPCODE_MOV && psInst[i].asOperands[1].eType == OPERAND_TYPE_IMMEDIATE32 &&
-            psInst[i].asOperands[0].eType == OPERAND_TYPE_TEMP)
-        {
-            uint32_t k;
-
-            for (k = i + 1; k < count; ++k)
-            {
-                if (psInst[k].eOpcode == OPCODE_ILT)
-                {
-                    k = k;
-                }
-                if (InstructionUsesRegister(&psInst[k], &psInst[i].asOperands[0]))
-                {
-                    if (IsIntegerOpcode(psInst[k].eOpcode))
-                    {
-                        psInst[i].asOperands[1].iIntegerImmediate = 1;
-                    }
-
-                    goto next_iteration;
-                }
-            }
-        }
-next_iteration:
-        ++i;
-    }
-}
diff --git a/Code/Tools/HLSLCrossCompiler/src/toGLSLOperand.c b/Code/Tools/HLSLCrossCompiler/src/toGLSLOperand.c
deleted file mode 100644
index b77576ed51..0000000000
--- a/Code/Tools/HLSLCrossCompiler/src/toGLSLOperand.c
+++ /dev/null
@@ -1,2121 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/toGLSLOperand.h"
-#include "internal_includes/toGLSLDeclaration.h"
-#include "internal_includes/hlslccToolkit.h"
-#include "internal_includes/languages.h"
-#include "bstrlib.h"
-#include "hlslcc.h"
-#include "internal_includes/debug.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdbool.h>
-
-#if !defined(isnan)
-#ifdef _MSC_VER
-#define isnan(x) _isnan(x)
-#define isinf(x) (!_finite(x))
-#endif
-#endif
-
-#define fpcheck(x) (isnan(x) || isinf(x))
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-
-// Returns true if types are just different precisions of the same underlying type
-static bool AreTypesCompatible(SHADER_VARIABLE_TYPE a, uint32_t ui32TOFlag)
-{
-    SHADER_VARIABLE_TYPE b = TypeFlagsToSVTType(ui32TOFlag);
-
-    if (a == b)
-        return true;
-
-    // Special case for array indices: both uint and int are fine
-    if ((ui32TOFlag & TO_FLAG_INTEGER) && (ui32TOFlag & TO_FLAG_UNSIGNED_INTEGER) &&
-        (a == SVT_INT || a == SVT_INT16 || a == SVT_UINT || a == SVT_UINT16))
-        return true;
-
-    if ((a == SVT_FLOAT || a == SVT_FLOAT16 || a == SVT_FLOAT10) &&
-        (b == SVT_FLOAT || b == SVT_FLOAT16 || b == SVT_FLOAT10))
-        return true;
-
-    if ((a == SVT_INT || a == SVT_INT16 || a == SVT_INT12) &&
-        (b == SVT_INT || b == SVT_INT16 || a == SVT_INT12))
-        return true;
-
-    if ((a == SVT_UINT || a == SVT_UINT16) &&
-        (b == SVT_UINT || b == SVT_UINT16))
-        return true;
-
-    return false;
-}
-
-int GetMaxComponentFromComponentMask(const Operand* psOperand)
-{
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Comonent Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 && psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    return 4;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    return 3;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    return 2;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    return 1;
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            return 4;
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            return 1;
-        }
-    }
-
-    return 4;
-}
-
-//Single component repeated
-//e..g .wwww
-uint32_t IsSwizzleReplacated(const Operand* psOperand)
-{
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle == WWWW_SWIZZLE ||
-                psOperand->ui32Swizzle == ZZZZ_SWIZZLE ||
-                psOperand->ui32Swizzle == YYYY_SWIZZLE ||
-                psOperand->ui32Swizzle == XXXX_SWIZZLE)
-            {
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-//e.g.
-//.z = 1
-//.x = 1
-//.yw = 2
-uint32_t GetNumSwizzleElements(const Operand* psOperand)
-{
-    uint32_t count = 0;
-
-    switch (psOperand->eType)
-    {
-    case OPERAND_TYPE_IMMEDIATE32:
-    case OPERAND_TYPE_IMMEDIATE64:
-    case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-    case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-    case OPERAND_TYPE_OUTPUT_DEPTH:
-    {
-        return psOperand->iNumComponents;
-    }
-    default:
-    {
-        break;
-    }
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Comonent Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 && psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    count++;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    count++;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    count++;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    count++;
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        count++;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        count++;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        count++;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        count++;
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                count++;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                count++;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                count++;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                count++;
-            }
-        }
-
-        //Component Select 1
-    }
-
-    if (!count)
-    {
-        return psOperand->iNumComponents;
-    }
-
-    return count;
-}
-
-void AddSwizzleUsingElementCount(HLSLCrossCompilerContext* psContext, uint32_t count)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    if (count)
-    {
-        bcatcstr(glsl, ".");
-        bcatcstr(glsl, "x");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(glsl, "y");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(glsl, "z");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(glsl, "w");
-        count--;
-    }
-}
-
-uint32_t ConvertOperandSwizzleToComponentMask(const Operand* psOperand)
-{
-    uint32_t mask = 0;
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Comonent Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            mask = psOperand->ui32CompMask;
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_X;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_Y;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_Z;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_W;
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_X;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_Y;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_Z;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_W;
-            }
-        }
-
-        //Component Select 1
-    }
-
-    return mask;
-}
-
-//Non-zero means the components overlap
-int CompareOperandSwizzles(const Operand* psOperandA, const Operand* psOperandB)
-{
-    uint32_t maskA = ConvertOperandSwizzleToComponentMask(psOperandA);
-    uint32_t maskB = ConvertOperandSwizzleToComponentMask(psOperandB);
-
-    return maskA & maskB;
-}
-
-
-void TranslateOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return;
-        }
-    }
-
-    if (psOperand->eType == OPERAND_TYPE_CONSTANT_BUFFER)
-    {
-        /*ConstantBuffer* psCBuf = NULL;
-        ShaderVar* psVar = NULL;
-        int32_t index = -1;
-        GetConstantBufferFromBindingPoint(psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-
-        //Access the Nth vec4 (N=psOperand->aui32ArraySizes[1])
-        //then apply the sizzle.
-
-        GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVar, &index);
-
-        bformata(glsl, ".%s", psVar->Name);
-        if(index != -1)
-        {
-        bformata(glsl, "[%d]", index);
-        }*/
-
-        //return;
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Comonent Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 && psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                bcatcstr(glsl, ".");
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    bcatcstr(glsl, "x");
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    bcatcstr(glsl, "y");
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    bcatcstr(glsl, "z");
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    bcatcstr(glsl, "w");
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                bcatcstr(glsl, ".");
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        bcatcstr(glsl, "x");
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        bcatcstr(glsl, "y");
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        bcatcstr(glsl, "z");
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        bcatcstr(glsl, "w");
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            bcatcstr(glsl, ".");
-
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                bcatcstr(glsl, "x");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                bcatcstr(glsl, "y");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                bcatcstr(glsl, "z");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                bcatcstr(glsl, "w");
-            }
-        }
-
-        //Component Select 1
-    }
-}
-
-int GetFirstOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return -1;
-        }
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Comonent Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 && psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    return 0;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    return 1;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    return 2;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    return 3;
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        return 0;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        return 1;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        return 2;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        return 3;
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                return 0;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                return 1;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                return 2;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                return 3;
-            }
-        }
-
-        //Component Select 1
-    }
-
-    return -1;
-}
-
-void TranslateOperandIndex(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index)
-{
-    int i = index;
-    int isGeoShader = psContext->psShader->eShaderType == GEOMETRY_SHADER ? 1 : 0;
-
-    bstring glsl = *psContext->currentGLSLString;
-
-    ASSERT(index < psOperand->iIndexDims);
-
-    switch (psOperand->eIndexRep[i])
-    {
-    case OPERAND_INDEX_IMMEDIATE32:
-    {
-        if (i > 0 || isGeoShader)
-        {
-            bformata(glsl, "[%d]", psOperand->aui32ArraySizes[i]);
-        }
-        else
-        {
-            bformata(glsl, "%d", psOperand->aui32ArraySizes[i]);
-        }
-        break;
-    }
-    case OPERAND_INDEX_RELATIVE:
-    {
-        bcatcstr(glsl, "[int(");     //Indexes must be integral.
-        TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-        bcatcstr(glsl, ")]");
-        break;
-    }
-    case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-    {
-        bcatcstr(glsl, "[int(");     //Indexes must be integral.
-        TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-        bformata(glsl, ") + %d]", psOperand->aui32ArraySizes[i]);
-        break;
-    }
-    default:
-    {
-        break;
-    }
-    }
-}
-
-void TranslateOperandIndexMAD(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index, uint32_t multiply, uint32_t add)
-{
-    int i = index;
-    int isGeoShader = psContext->psShader->eShaderType == GEOMETRY_SHADER ? 1 : 0;
-
-    bstring glsl = *psContext->currentGLSLString;
-
-    ASSERT(index < psOperand->iIndexDims);
-
-    switch (psOperand->eIndexRep[i])
-    {
-    case OPERAND_INDEX_IMMEDIATE32:
-    {
-        if (i > 0 || isGeoShader)
-        {
-            bformata(glsl, "[%d*%d+%d]", psOperand->aui32ArraySizes[i], multiply, add);
-        }
-        else
-        {
-            bformata(glsl, "%d*%d+%d", psOperand->aui32ArraySizes[i], multiply, add);
-        }
-        break;
-    }
-    case OPERAND_INDEX_RELATIVE:
-    {
-        bcatcstr(glsl, "[int(");     //Indexes must be integral.
-        TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-        bformata(glsl, ")*%d+%d]", multiply, add);
-        break;
-    }
-    case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-    {
-        bcatcstr(glsl, "[(int(");     //Indexes must be integral.
-        TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-        bformata(glsl, ") + %d)*%d+%d]", psOperand->aui32ArraySizes[i], multiply, add);
-        break;
-    }
-    default:
-    {
-        break;
-    }
-    }
-}
-
-void TranslateVariableNameByOperandType(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t* pui32IgnoreSwizzle)
-{
-    bstring glsl = *psContext->currentGLSLString;
-
-    switch (psOperand->eType)
-    {
-    case OPERAND_TYPE_IMMEDIATE32:
-    {
-        if (psOperand->iNumComponents == 1)
-        {
-            if (ui32TOFlag & TO_FLAG_UNSIGNED_INTEGER)
-            {
-                bformata(glsl, "%uu",
-                    *((unsigned int*)(&psOperand->afImmediates[0])));
-            }
-            else
-            if ((ui32TOFlag & TO_FLAG_INTEGER) || ((ui32TOFlag & TO_FLAG_FLOAT) == 0 && psOperand->iIntegerImmediate) || fpcheck(psOperand->afImmediates[0]))
-            {
-                if (ui32TOFlag & TO_FLAG_FLOAT)
-                {
-                    bcatcstr(glsl, "float");
-                }
-                else if (ui32TOFlag & TO_FLAG_INTEGER)
-                {
-                    bcatcstr(glsl, "int");
-                }
-                bcatcstr(glsl, "(");
-
-                //  yet another Qualcomm's special case
-                //  GLSL compiler thinks that -2147483648 is an integer overflow which is not
-                if (*((int*)(&psOperand->afImmediates[0])) == 2147483648)
-                {
-                    bformata(glsl, "-2147483647-1");
-                }
-                else
-                {
-                    //  this is expected to fix paranoid compiler checks such as Qualcomm's
-                    if (*((unsigned int*)(&psOperand->afImmediates[0])) >= 2147483648)
-                    {
-                        bformata(glsl, "%d",
-                            *((int*)(&psOperand->afImmediates[0])));
-                    }
-                    else
-                    {
-                        bformata(glsl, "%d",
-                            *((int*)(&psOperand->afImmediates[0])));
-                    }
-                }
-                bcatcstr(glsl, ")");
-            }
-            else
-            {
-                bformata(glsl, "%e",
-                    psOperand->afImmediates[0]);
-            }
-        }
-        else
-        {
-            if (ui32TOFlag & TO_FLAG_UNSIGNED_INTEGER)
-            {
-                bformata(glsl, "uvec4(%uu, %uu, %uu, %uu)",
-                    *(unsigned int*)&psOperand->afImmediates[0],
-                    *(unsigned int*)&psOperand->afImmediates[1],
-                    *(unsigned int*)&psOperand->afImmediates[2],
-                    *(unsigned int*)&psOperand->afImmediates[3]);
-            }
-            else
-            if ((ui32TOFlag & TO_FLAG_INTEGER) ||
-                ((ui32TOFlag & TO_FLAG_FLOAT) == 0 && psOperand->iIntegerImmediate) ||
-                fpcheck(psOperand->afImmediates[0]) ||
-                fpcheck(psOperand->afImmediates[1]) ||
-                fpcheck(psOperand->afImmediates[2]) ||
-                fpcheck(psOperand->afImmediates[3]))
-            {
-                //  this is expected to fix paranoid compiler checks such as Qualcomm's
-                if (ui32TOFlag & TO_FLAG_FLOAT)
-                {
-                    bcatcstr(glsl, "vec4");
-                }
-                else if (ui32TOFlag & TO_FLAG_INTEGER)
-                {
-                    bcatcstr(glsl, "ivec4");
-                }
-                else if (ui32TOFlag & TO_FLAG_UNSIGNED_INTEGER)
-                {
-                    bcatcstr(glsl, "uvec4");
-                }
-                bcatcstr(glsl, "(");
-                
-                if ((*(unsigned int*)&psOperand->afImmediates[0]) == 2147483648u)
-                {
-                    bformata(glsl, "int(-2147483647-1), ");
-                }
-                else
-                {
-                    bformata(glsl, "%d, ", *(int*)&psOperand->afImmediates[0]);
-                }
-                if ((*(unsigned int*)&psOperand->afImmediates[1]) == 2147483648u)
-                {
-                    bformata(glsl, "int(-2147483647-1), ");
-                }
-                else
-                {
-                    bformata(glsl, "%d, ", *(int*)&psOperand->afImmediates[1]);
-                }
-                if ((*(unsigned int*)&psOperand->afImmediates[2]) == 2147483648u)
-                {
-                    bformata(glsl, "int(-2147483647-1), ");
-                }
-                else
-                {
-                    bformata(glsl, "%d, ", *(int*)&psOperand->afImmediates[2]);
-                }
-                if ((*(unsigned int*)&psOperand->afImmediates[3]) == 2147483648u)
-                {
-                    bformata(glsl, "int(-2147483647-1)) ");
-                }
-                else
-                {
-                    bformata(glsl, "%d)", *(int*)&psOperand->afImmediates[3]);
-                }
-            }
-            else
-            {
-                bformata(glsl, "vec4(%e, %e, %e, %e)",
-                    psOperand->afImmediates[0],
-                    psOperand->afImmediates[1],
-                    psOperand->afImmediates[2],
-                    psOperand->afImmediates[3]);
-            }
-            if (psOperand->iNumComponents != 4)
-            {
-                AddSwizzleUsingElementCount(psContext, psOperand->iNumComponents);
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_IMMEDIATE64:
-    {
-        if (psOperand->iNumComponents == 1)
-        {
-            bformata(glsl, "%e",
-                psOperand->adImmediates[0]);
-        }
-        else
-        {
-            bformata(glsl, "dvec4(%e, %e, %e, %e)",
-                psOperand->adImmediates[0],
-                psOperand->adImmediates[1],
-                psOperand->adImmediates[2],
-                psOperand->adImmediates[3]);
-            if (psOperand->iNumComponents != 4)
-            {
-                AddSwizzleUsingElementCount(psContext, psOperand->iNumComponents);
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_INPUT:
-    {
-        switch (psOperand->iIndexDims)
-        {
-        case INDEX_2D:
-        {
-            if (psOperand->aui32ArraySizes[1] == 0)       //Input index zero - position.
-            {
-                bcatcstr(glsl, "gl_in");
-                TranslateOperandIndex(psContext, psOperand, TO_FLAG_NONE);        //Vertex index
-                bcatcstr(glsl, ".gl_Position");
-            }
-            else
-            {
-                const char* name = "Input";
-                if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-                {
-                    name = GetDeclaredInputName(psContext, psContext->psShader->eShaderType, psOperand);
-                }
-
-                bformata(glsl, "%s%d", name, psOperand->aui32ArraySizes[1]);
-                if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-                {
-                    bcstrfree((char*)name);
-                }
-                TranslateOperandIndex(psContext, psOperand, TO_FLAG_NONE);        //Vertex index
-            }
-            break;
-        }
-        default:
-        {
-            if (psOperand->eIndexRep[0] == OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE)
-            {
-                bformata(glsl, "Input%d[int(", psOperand->ui32RegisterNumber);
-                TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-                bcatcstr(glsl, ")]");
-            }
-            else
-            {
-                if (psContext->psShader->aIndexedInput[psOperand->ui32RegisterNumber] != 0)
-                {
-                    const uint32_t parentIndex = psContext->psShader->aIndexedInputParents[psOperand->ui32RegisterNumber];
-                    bformata(glsl, "Input%d[%d]", parentIndex,
-                        psOperand->ui32RegisterNumber - parentIndex);
-                }
-                else
-                {
-                    if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-                    {
-                        char* name = GetDeclaredInputName(psContext, psContext->psShader->eShaderType, psOperand);
-                        bcatcstr(glsl, name);
-                        bcstrfree(name);
-                    }
-                    else
-                    {
-                        bformata(glsl, "Input%d", psOperand->ui32RegisterNumber);
-                    }
-                }
-            }
-            break;
-        }
-        }
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT:
-    {
-        bformata(glsl, "Output%d", psOperand->ui32RegisterNumber);
-        if (psOperand->psSubOperand[0])
-        {
-            bcatcstr(glsl, "[int(");     //Indexes must be integral.
-            TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ")]");
-        }
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_DEPTH:
-    case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-    case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-    {
-        bcatcstr(glsl, "gl_FragDepth");
-        break;
-    }
-    case OPERAND_TYPE_TEMP:
-    {
-        SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, psOperand);
-        bcatcstr(glsl, "Temp");
-
-        if ((psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING) == 0 || psContext->psShader->eShaderType == HULL_SHADER)
-        {
-            if (eType == SVT_INT)
-            {
-                bcatcstr(glsl, "_int");
-            }
-            else if (eType == SVT_UINT)
-            {
-                bcatcstr(glsl, "_uint");
-            }
-            else if (eType == SVT_DOUBLE)
-            {
-                bcatcstr(glsl, "_double");
-            }
-            else if (eType == SVT_VOID ||
-                     (ui32TOFlag & TO_FLAG_DESTINATION))
-            {
-                if (ui32TOFlag & TO_FLAG_INTEGER)
-                {
-                    bcatcstr(glsl, "_int");
-                }
-                else
-                if (ui32TOFlag & TO_FLAG_UNSIGNED_INTEGER)
-                {
-                    bcatcstr(glsl, "_uint");
-                }
-            }
-
-            bformata(glsl, "[%d]", psOperand->ui32RegisterNumber);
-        }
-        else
-        {
-            if (psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND)
-                bformata(glsl, "%d[0]", psOperand->ui32RegisterNumber);
-            else
-                bformata(glsl, "%d", psOperand->ui32RegisterNumber);
-        }
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_IMMCONSTINT:
-    {
-        bformata(glsl, "IntImmConst%d", psOperand->ui32RegisterNumber);
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_IMMCONST:
-    {
-        if (psOperand->psSubOperand[0] != NULL)
-        {
-            bformata(glsl, "ImmConstArray[%d + ", psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber]);
-            TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_NONE);
-            bcatcstr(glsl, "]");
-        }
-        else
-        {
-            bformata(glsl, "ImmConst%d", psOperand->ui32RegisterNumber);
-        }
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_OUTBASECOLOUR:
-    {
-        bcatcstr(glsl, "BaseColour");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR:
-    {
-        bcatcstr(glsl, "OffsetColour");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_POSITION:
-    {
-        bcatcstr(glsl, "gl_Position");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_FOG:
-    {
-        bcatcstr(glsl, "Fog");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_POINTSIZE:
-    {
-        bcatcstr(glsl, "gl_PointSize");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_ADDRESS:
-    {
-        bcatcstr(glsl, "Address");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_LOOPCOUNTER:
-    {
-        bcatcstr(glsl, "LoopCounter");
-        pui32IgnoreSwizzle[0] = 1;
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_TEXCOORD:
-    {
-        bformata(glsl, "TexCoord%d", psOperand->ui32RegisterNumber);
-        break;
-    }
-    case OPERAND_TYPE_CONSTANT_BUFFER:
-    {
-        ConstantBuffer* psCBuf = NULL;
-        ShaderVarType* psVarType = NULL;
-        int32_t index = -1;
-        bool addParentheses = false;
-        GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-
-        if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-        {
-            pui32IgnoreSwizzle[0] = 1;
-        }
-
-        if ((psContext->flags & HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT) != HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT)
-        {
-            if (psCBuf)
-            {
-                //$Globals.
-                if (psCBuf->Name[0] == '$')
-                {
-                    ConvertToUniformBufferName(glsl, psContext->psShader, "$Globals");
-                }
-                else
-                {
-                    ConvertToUniformBufferName(glsl, psContext->psShader, psCBuf->Name);
-                }
-                if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-                {
-                    bcatcstr(glsl, ".");
-                }
-            }
-            else
-            {
-                //bformata(glsl, "cb%d", psOperand->aui32ArraySizes[0]);
-            }
-        }
-
-        if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-        {
-            //Work out the variable name. Don't apply swizzle to that variable yet.
-            int32_t rebase = 0;
-
-            if (psCBuf && !psCBuf->blob)
-            {
-                GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-                if (psContext->flags & HLSLCC_FLAG_QUALCOMM_GLES30_DRIVER_WORKAROUND)
-                {
-                    if (psVarType->Class == SVC_VECTOR || psVarType->Class == SVC_MATRIX_COLUMNS || psVarType->Class == SVC_MATRIX_ROWS)
-                    {
-                        switch (psVarType->Type)
-                        {
-                        case SVT_FLOAT:
-                        case SVT_FLOAT16:
-                        case SVT_FLOAT10:
-                        {
-                            bformata(glsl, "vec%d(", psVarType->Columns);
-                            break;
-                        }
-                        case SVT_UINT:
-                        case SVT_UINT16:
-                        {
-                            bformata(glsl, "uvec%d(", psVarType->Columns);
-                            break;
-                        }
-                        case SVT_INT:
-                        case SVT_INT16:
-                        case SVT_INT12:
-                        {
-                            bformata(glsl, "ivec%d(", psVarType->Columns);
-                            break;
-                        }
-                        default:
-                        {
-                            ASSERT(0);
-                            break;
-                        }
-                        }
-                        addParentheses = true;
-                    }
-                    else if (psVarType->Class == SVC_SCALAR)
-                    {
-                        switch (psVarType->Type)
-                        {
-                        case SVT_FLOAT:
-                        case SVT_FLOAT16:
-                        case SVT_FLOAT10:
-                        {
-                            bformata(glsl, "float(");
-                            break;
-                        }
-                        case SVT_UINT:
-                        case SVT_UINT16:
-                        {
-                            bformata(glsl, "uint(");
-                            break;
-                        }
-                        case SVT_INT:
-                        case SVT_INT16:
-                        case SVT_INT12:
-                        {
-                            bformata(glsl, "int(");
-                            break;
-                        }
-                        default:
-                        {
-                            ASSERT(0);
-                            break;
-                        }
-                        }
-                        addParentheses = true;
-                    }
-                }
-                ShaderVarFullName(glsl, psContext->psShader, psVarType);
-            }
-            else if (psCBuf)
-            {
-                ConvertToUniformBufferName(glsl, psContext->psShader, psCBuf->Name);
-                bcatcstr(glsl, "_data");
-                index = psOperand->aui32ArraySizes[1];
-            }
-            else
-            // We don't have a semantic for this variable, so try the raw dump appoach.
-            {
-                bformata(glsl, "cb%d.data", psOperand->aui32ArraySizes[0]);    //
-                index = psOperand->aui32ArraySizes[1];
-            }
-
-            //Dx9 only?
-            if (psOperand->psSubOperand[0] != NULL)
-            {
-                SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, psOperand->psSubOperand[0]);
-                if (eType != SVT_INT && eType != SVT_UINT)
-                {
-                    bcatcstr(glsl, "[int(");     //Indexes must be integral.
-                    TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-                    bcatcstr(glsl, ")]");
-                }
-                else
-                {
-                    bcatcstr(glsl, "[");     //Indexes must be integral.
-                    TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-                    bcatcstr(glsl, "]");
-                }
-            }
-            else
-            if (index != -1 && psOperand->psSubOperand[1] != NULL)
-            {
-                //Array of matrices is treated as array of vec4s
-                if (index != -1)
-                {
-                    SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, psOperand->psSubOperand[1]);
-                    if (eType != SVT_INT && eType != SVT_UINT)
-                    {
-                        bcatcstr(glsl, "[int(");
-                        TranslateOperand(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-                        bformata(glsl, ") + %d]", index);
-                    }
-                    else
-                    {
-                        bcatcstr(glsl, "[");
-                        TranslateOperand(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-                        bformata(glsl, " + %d]", index);
-                    }
-                }
-            }
-            else if (index != -1)
-            {
-                bformata(glsl, "[%d]", index);
-            }
-            else if (psOperand->psSubOperand[1] != NULL)
-            {
-                SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, psOperand->psSubOperand[1]);
-                if (eType != SVT_INT && eType != SVT_UINT)
-                {
-                    bcatcstr(glsl, "[");
-                    TranslateOperand(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-                    bcatcstr(glsl, "]");
-                }
-                else
-                {
-                    bcatcstr(glsl, "[int(");
-                    TranslateOperand(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-                    bcatcstr(glsl, ")]");
-                }
-            }
-
-            if (addParentheses)
-                bcatcstr(glsl, ")");
-
-            if (psVarType && psVarType->Class == SVC_VECTOR)
-            {
-                switch (rebase)
-                {
-                case 4:
-                {
-                    if (psVarType->Columns == 2)
-                    {
-                        //.x(GLSL) is .y(HLSL). .y(GLSL) is .z(HLSL)
-                        bcatcstr(glsl, ".xxyx");
-                    }
-                    else if (psVarType->Columns == 3)
-                    {
-                        //.x(GLSL) is .y(HLSL). .y(GLSL) is .z(HLSL) .z(GLSL) is .w(HLSL)
-                        bcatcstr(glsl, ".xxyz");
-                    }
-                    break;
-                }
-                case 8:
-                {
-                    if (psVarType->Columns == 2)
-                    {
-                        //.x(GLSL) is .z(HLSL). .y(GLSL) is .w(HLSL)
-                        bcatcstr(glsl, ".xxxy");
-                    }
-                    break;
-                }
-                case 0:
-                default:
-                {
-                    //No rebase, but extend to vec4.
-                    if (psVarType->Columns == 2)
-                    {
-                        bcatcstr(glsl, ".xyxx");
-                    }
-                    else if (psVarType->Columns == 3)
-                    {
-                        bcatcstr(glsl, ".xyzx");
-                    }
-                    break;
-                }
-                }
-            }
-
-            if (psVarType && psVarType->Class == SVC_SCALAR)
-            {
-                *pui32IgnoreSwizzle = 1;
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_RESOURCE:
-    {
-        TextureName(*psContext->currentGLSLString, psContext->psShader, psOperand->ui32RegisterNumber, MAX_RESOURCE_BINDINGS, 0);
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_SAMPLER:
-    {
-        bformata(glsl, "Sampler%d", psOperand->ui32RegisterNumber);
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_FUNCTION_BODY:
-    {
-        const uint32_t ui32FuncBody = psOperand->ui32RegisterNumber;
-        const uint32_t ui32FuncTable = psContext->psShader->aui32FuncBodyToFuncTable[ui32FuncBody];
-        //const uint32_t ui32FuncPointer = psContext->psShader->aui32FuncTableToFuncPointer[ui32FuncTable];
-        const uint32_t ui32ClassType = psContext->psShader->sInfo.aui32TableIDToTypeID[ui32FuncTable];
-        const char* ClassTypeName = &psContext->psShader->sInfo.psClassTypes[ui32ClassType].Name[0];
-        const uint32_t ui32UniqueClassFuncIndex = psContext->psShader->ui32NextClassFuncName[ui32ClassType]++;
-
-        bformata(glsl, "%s_Func%d", ClassTypeName, ui32UniqueClassFuncIndex);
-        break;
-    }
-    case OPERAND_TYPE_INPUT_FORK_INSTANCE_ID:
-    {
-        bcatcstr(glsl, "forkInstanceID");
-        *pui32IgnoreSwizzle = 1;
-        return;
-    }
-    case OPERAND_TYPE_IMMEDIATE_CONSTANT_BUFFER:
-    {
-        bcatcstr(glsl, "immediateConstBufferF");
-
-        if (psOperand->psSubOperand[0])
-        {
-            bcatcstr(glsl, "(int(");     //Indexes must be integral.
-            TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-            bcatcstr(glsl, "))");
-        }
-        break;
-    }
-    case OPERAND_TYPE_INPUT_DOMAIN_POINT:
-    {
-        bcatcstr(glsl, "gl_TessCoord");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_CONTROL_POINT:
-    {
-        if (psOperand->aui32ArraySizes[1] == 0)   //Input index zero - position.
-        {
-            bformata(glsl, "gl_in[%d].gl_Position", psOperand->aui32ArraySizes[0]);
-        }
-        else
-        {
-            bformata(glsl, "Input%d[%d]", psOperand->aui32ArraySizes[1], psOperand->aui32ArraySizes[0]);
-        }
-        break;
-    }
-    case OPERAND_TYPE_NULL:
-    {
-        // Null register, used to discard results of operations
-        bcatcstr(glsl, "//null");
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID:
-    {
-        bcatcstr(glsl, "gl_InvocationID");
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-    {
-        bcatcstr(glsl, "gl_SampleMask[0]");
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_INPUT_COVERAGE_MASK:
-    {
-        bcatcstr(glsl, "gl_SampleMaskIn[0]");
-        //Skip swizzle on scalar types.
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_ID://SV_DispatchThreadID
-    {
-        bcatcstr(glsl, "gl_GlobalInvocationID.xyzz");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_GROUP_ID://SV_GroupThreadID
-    {
-        bcatcstr(glsl, "gl_WorkGroupID.xyzz");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP://SV_GroupID
-    {
-        bcatcstr(glsl, "gl_LocalInvocationID.xyzz");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED://SV_GroupIndex
-    {
-        bcatcstr(glsl, "gl_LocalInvocationIndex.xyzz");
-        break;
-    }
-    case OPERAND_TYPE_UNORDERED_ACCESS_VIEW:
-    {
-        UAVName(*psContext->currentGLSLString, psContext->psShader, psOperand->ui32RegisterNumber);
-        break;
-    }
-    case OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY:
-    {
-        bformata(glsl, "TGSM%d", psOperand->ui32RegisterNumber);
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_INPUT_PRIMITIVEID:
-    {
-        bcatcstr(glsl, "gl_PrimitiveID");
-        break;
-    }
-    case OPERAND_TYPE_INDEXABLE_TEMP:
-    {
-        bformata(glsl, "TempArray%d", psOperand->aui32ArraySizes[0]);
-        bformata(glsl, "[%d", psOperand->aui32ArraySizes[1]);
-
-        if (psOperand->psSubOperand[1])
-        {
-            bcatcstr(glsl, "+");
-            TranslateOperand(psContext, psOperand->psSubOperand[1], TO_FLAG_UNSIGNED_INTEGER);
-        }
-        bcatcstr(glsl, "]");
-        break;
-    }
-    case OPERAND_TYPE_STREAM:
-    {
-        bformata(glsl, "%d", psOperand->ui32RegisterNumber);
-        break;
-    }
-    case OPERAND_TYPE_INPUT_GS_INSTANCE_ID:
-    {
-        bcatcstr(glsl, "gl_InvocationID");
-        break;
-    }
-    case OPERAND_TYPE_THIS_POINTER:
-    {
-        /*
-        The "this" register is a register that provides up to 4 pieces of information:
-        X: Which CB holds the instance data
-        Y: Base element offset of the instance data within the instance CB
-        Z: Base sampler index
-        W: Base Texture index
-
-        Can be different for each function call
-        */
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-}
-
-void TranslateVariableName(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t* pui32IgnoreSwizzle)
-{
-    bool hasConstructor = false;
-    bstring glsl = *psContext->currentGLSLString;
-
-    *pui32IgnoreSwizzle = 0;
-
-    if (psOperand->eType != OPERAND_TYPE_IMMEDIATE32 &&
-        psOperand->eType != OPERAND_TYPE_IMMEDIATE64)
-    {
-        if (ui32TOFlag != TO_FLAG_NONE && !(ui32TOFlag & (TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY | TO_FLAG_DECLARATION_NAME)))
-        {
-            SHADER_VARIABLE_TYPE requestedType = TypeFlagsToSVTType(ui32TOFlag);
-            const uint32_t swizCount = psOperand->iNumComponents;
-            SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, psOperand);
-
-            if (!AreTypesCompatible(eType, ui32TOFlag))
-            {
-                if (CanDoDirectCast(eType, requestedType))
-                {
-                    bformata(glsl, "%s(", GetConstructorForTypeGLSL(psContext, requestedType, swizCount, false));
-                }
-                else
-                {
-                    // Direct cast not possible, need to do bitcast.
-                    bformata(glsl, "%s(", GetBitcastOp(eType, requestedType));
-                }
-
-                hasConstructor = true;
-            }
-        } 
-    }
-
-    if (ui32TOFlag & TO_FLAG_COPY)
-    {
-        bcatcstr(glsl, "TempCopy");
-        if ((psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING) == 0)
-        {
-            SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, psOperand);
-            switch (eType)
-            {
-            case SVT_FLOAT:
-                break;
-            case SVT_INT:
-                bcatcstr(glsl, "_int");
-                break;
-            case SVT_UINT:
-                bcatcstr(glsl, "_uint");
-                break;
-            case SVT_DOUBLE:
-                bcatcstr(glsl, "_double");
-                break;
-            default:
-                ASSERT(0);
-                break;
-            }
-        }
-    }
-    else
-    {
-        TranslateVariableNameByOperandType(psContext, psOperand, ui32TOFlag, pui32IgnoreSwizzle);
-    }
-
-    if (hasConstructor)
-    {
-        bcatcstr(glsl, ")");
-    }
-}
-SHADER_VARIABLE_TYPE GetOperandDataType(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    if (HavePrecisionQualifers(psContext->psShader->eTargetLanguage))
-    {
-        // The min precision qualifier overrides all of the stuff below
-        switch (psOperand->eMinPrecision)
-        {
-        case OPERAND_MIN_PRECISION_FLOAT_16:
-            return SVT_FLOAT16;
-        case OPERAND_MIN_PRECISION_FLOAT_2_8:
-            return SVT_FLOAT10;
-        case OPERAND_MIN_PRECISION_SINT_16:
-            return SVT_INT16;
-        case OPERAND_MIN_PRECISION_UINT_16:
-            return SVT_UINT16;
-        default:
-            break;
-        }
-    }
-
-    switch (psOperand->eType)
-    {
-    case OPERAND_TYPE_TEMP:
-    {
-        SHADER_VARIABLE_TYPE eCurrentType = SVT_VOID;
-        int i = 0;
-
-        if (psContext->flags & HLSLCC_FLAG_AVOID_TEMP_REGISTER_ALIASING && psContext->psShader->eShaderType != HULL_SHADER)
-        {
-            return psContext->psShader->aeCommonTempVecType[psOperand->ui32RegisterNumber];
-        }
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            return psOperand->aeDataType[psOperand->aui32Swizzle[0]];
-        }
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-            {
-                return psOperand->aeDataType[0];
-            }
-
-            return psOperand->aeDataType[psOperand->aui32Swizzle[0]];
-        }
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t ui32CompMask = psOperand->ui32CompMask;
-            if (!psOperand->ui32CompMask)
-            {
-                ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-            }
-            for (; i < 4; ++i)
-            {
-                if (ui32CompMask & (1 << i))
-                {
-                    eCurrentType = psOperand->aeDataType[i];
-                    break;
-                }
-            }
-
-#ifdef _DEBUG
-            //Check if all elements have the same basic type.
-            for (; i < 4; ++i)
-            {
-                if (psOperand->ui32CompMask & (1 << i))
-                {
-                    if (eCurrentType != psOperand->aeDataType[i])
-                    {
-                        ASSERT(0);
-                    }
-                }
-            }
-#endif
-            return eCurrentType;
-        }
-
-        ASSERT(0);
-
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT:
-    {
-        const uint32_t ui32Register = psOperand->aui32ArraySizes[psOperand->iIndexDims - 1];
-        InOutSignature* psOut;
-
-        if (GetOutputSignatureFromRegister(ui32Register, psOperand->ui32CompMask, 0, &psContext->psShader->sInfo, &psOut))
-        {
-            if (psOut->eComponentType == INOUT_COMPONENT_UINT32)
-            {
-                return SVT_UINT;
-            }
-            else if (psOut->eComponentType == INOUT_COMPONENT_SINT32)
-            {
-                return SVT_INT;
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_INPUT:
-    {
-        const uint32_t ui32Register = psOperand->aui32ArraySizes[psOperand->iIndexDims - 1];
-        InOutSignature* psIn;
-
-        //UINT in DX, INT in GL.
-        if (psOperand->eSpecialName == NAME_PRIMITIVE_ID)
-        {
-            return SVT_INT;
-        }
-
-        if (GetInputSignatureFromRegister(ui32Register, &psContext->psShader->sInfo, &psIn))
-        {
-            if (psIn->eComponentType == INOUT_COMPONENT_UINT32)
-            {
-                return SVT_UINT;
-            }
-            else if (psIn->eComponentType == INOUT_COMPONENT_SINT32)
-            {
-                return SVT_INT;
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_CONSTANT_BUFFER:
-    {
-        ConstantBuffer* psCBuf = NULL;
-        ShaderVarType* psVarType = NULL;
-        int32_t index = -1;
-        int32_t rebase = -1;
-        int foundVar;
-        GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-        if (psCBuf && !psCBuf->blob)
-        {
-            foundVar = GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-            if (foundVar && index == -1 && psOperand->psSubOperand[1] == NULL)
-            {
-                return psVarType->Type;
-            }
-        }
-        else
-        {
-            // Todo: this isn't correct yet.
-            return SVT_FLOAT;
-        }
-        break;
-    }
-    case OPERAND_TYPE_IMMEDIATE32:
-    {
-        return psOperand->iIntegerImmediate ? SVT_INT : SVT_FLOAT;
-    }
-
-    case OPERAND_TYPE_INPUT_THREAD_ID:
-    case OPERAND_TYPE_INPUT_THREAD_GROUP_ID:
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP:
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED:
-    {
-        return SVT_UINT;
-    }
-    case OPERAND_TYPE_SPECIAL_ADDRESS:
-    {
-        return SVT_INT;
-    }
-    default:
-    {
-        return SVT_FLOAT;
-    }
-    }
-
-    return SVT_FLOAT;
-}
-
-void TranslateOperand(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag)
-{
-    bstring glsl = *psContext->currentGLSLString;
-    uint32_t ui32IgnoreSwizzle = 0;
-
-    if (ui32TOFlag & TO_FLAG_NAME_ONLY)
-    {
-        TranslateVariableName(psContext, psOperand, ui32TOFlag, &ui32IgnoreSwizzle);
-        return;
-    }
-
-    switch (psOperand->eModifier)
-    {
-    case OPERAND_MODIFIER_NONE:
-    {
-        break;
-    }
-    case OPERAND_MODIFIER_NEG:
-    {
-        bcatcstr(glsl, "-");
-        break;
-    }
-    case OPERAND_MODIFIER_ABS:
-    {
-        bcatcstr(glsl, "abs(");
-        break;
-    }
-    case OPERAND_MODIFIER_ABSNEG:
-    {
-        bcatcstr(glsl, "-abs(");
-        break;
-    }
-    }
-
-    TranslateVariableName(psContext, psOperand, ui32TOFlag, &ui32IgnoreSwizzle);
-
-    if (!ui32IgnoreSwizzle || IsGmemReservedSlot(FBF_ANY, psOperand->ui32RegisterNumber))
-    {
-        TranslateOperandSwizzle(psContext, psOperand);
-    }
-
-    switch (psOperand->eModifier)
-    {
-    case OPERAND_MODIFIER_NONE:
-    {
-        break;
-    }
-    case OPERAND_MODIFIER_NEG:
-    {
-        break;
-    }
-    case OPERAND_MODIFIER_ABS:
-    {
-        bcatcstr(glsl, ")");
-        break;
-    }
-    case OPERAND_MODIFIER_ABSNEG:
-    {
-        bcatcstr(glsl, ")");
-        break;
-    }
-    }
-}
-
-char ShaderTypePrefix(Shader* psShader)
-{
-    switch (psShader->eShaderType)
-    {
-    default:
-        ASSERT(0);
-    case PIXEL_SHADER:
-        return 'p';
-    case VERTEX_SHADER:
-        return 'v';
-    case GEOMETRY_SHADER:
-        return 'g';
-    case HULL_SHADER:
-        return 'h';
-    case DOMAIN_SHADER:
-        return 'd';
-    case COMPUTE_SHADER:
-        return 'c';
-    }
-}
-
-char ResourceGroupPrefix(ResourceGroup eResGroup)
-{
-    switch (eResGroup)
-    {
-    default:
-        ASSERT(0);
-    case RGROUP_CBUFFER:
-        return 'c';
-    case RGROUP_TEXTURE:
-        return 't';
-    case RGROUP_SAMPLER:
-        return 's';
-    case RGROUP_UAV:
-        return 'u';
-    }
-}
-
-void ResourceName(bstring output, Shader* psShader, const char* szName, ResourceGroup eGroup, const char* szSecondaryName, ResourceGroup eSecondaryGroup, uint32_t ui32ArrayOffset, const char* szModifier)
-{
-
-    const char* pBracket;
-
-    bconchar(output, ShaderTypePrefix(psShader));
-    bcatcstr(output, szModifier);
-
-    bconchar(output, ResourceGroupPrefix(eGroup));
-    while ((pBracket = strpbrk(szName, "[]")) != NULL)
-    {
-        //array syntax [X] becomes _0_
-        //Otherwise declarations could end up as:
-        //uniform sampler2D SomeTextures[0];
-        //uniform sampler2D SomeTextures[1];
-        bcatblk(output, (const void*)szName, (int)(pBracket - szName));
-        bconchar(output, '_');
-        szName = pBracket + 1;
-    }
-    bcatcstr(output, szName);
-
-    if (ui32ArrayOffset)
-    {
-        bformata(output, "%d", ui32ArrayOffset);
-    }
-
-    if (szSecondaryName != NULL)
-    {
-        bconchar(output, ResourceGroupPrefix(eSecondaryGroup));
-        bcatcstr(output, szSecondaryName);
-    }
-}
-
-void TextureName(bstring output, Shader* psShader, const uint32_t ui32TextureRegister, const uint32_t ui32SamplerRegister, const int bCompare)
-{
-    ResourceBinding* psTextureBinding = 0;
-    ResourceBinding* psSamplerBinding = 0;
-    int found;
-    const char* szModifier = bCompare ? "c" : "";
-
-    found = GetResourceFromBindingPoint(RGROUP_TEXTURE, ui32TextureRegister, &psShader->sInfo, &psTextureBinding);
-    if (ui32SamplerRegister < MAX_RESOURCE_BINDINGS)
-    {
-        found &= GetResourceFromBindingPoint(RGROUP_SAMPLER, ui32SamplerRegister, &psShader->sInfo, &psSamplerBinding);
-    }
-
-    if (found)
-    {
-        if (IsGmemReservedSlot(FBF_EXT_COLOR, ui32TextureRegister) || IsGmemReservedSlot(FBF_ARM_COLOR, ui32TextureRegister)) // FRAMEBUFFER FETCH
-        {
-            int regNum = GetGmemInputResourceSlot(ui32TextureRegister);
-            bformata(output, "GMEM_Input%d", regNum);
-        }
-        else if (IsGmemReservedSlot(FBF_ARM_DEPTH, ui32TextureRegister))
-        {
-            bcatcstr(output, "GMEM_Depth");
-        }
-        else if (IsGmemReservedSlot(FBF_ARM_STENCIL, ui32TextureRegister))
-        {
-            bcatcstr(output, "GMEM_Stencil");
-        }
-        else
-        {
-            ResourceName(output, psShader, psTextureBinding->Name, RGROUP_TEXTURE, psSamplerBinding ? psSamplerBinding->Name : NULL, RGROUP_SAMPLER, ui32TextureRegister - psTextureBinding->ui32BindPoint, szModifier);
-        }
-    }
-    else if (ui32SamplerRegister < MAX_RESOURCE_BINDINGS)
-    {
-        bformata(output, "UnknownTexture%s_%d_%d", szModifier, ui32TextureRegister, ui32SamplerRegister);
-    }
-    else
-    {
-        bformata(output, "UnknownTexture%s_%d", szModifier, ui32TextureRegister);
-    }
-}
-
-void UAVName(bstring output, Shader* psShader, const uint32_t ui32RegisterNumber)
-{
-    ResourceBinding* psBinding = 0;
-    int found;
-
-    found = GetResourceFromBindingPoint(RGROUP_UAV, ui32RegisterNumber, &psShader->sInfo, &psBinding);
-
-    if (found)
-    {
-        ResourceName(output, psShader, psBinding->Name, RGROUP_UAV, NULL, RGROUP_COUNT, ui32RegisterNumber - psBinding->ui32BindPoint, "");
-    }
-    else
-    {
-        bformata(output, "UnknownUAV%d", ui32RegisterNumber);
-    }
-}
-
-void UniformBufferName(bstring output, Shader* psShader, const uint32_t ui32RegisterNumber)
-{
-    ResourceBinding* psBinding = 0;
-    int found;
-
-    found = GetResourceFromBindingPoint(RGROUP_CBUFFER, ui32RegisterNumber, &psShader->sInfo, &psBinding);
-
-    if (found)
-    {
-        ResourceName(output, psShader, psBinding->Name, RGROUP_CBUFFER, NULL, RGROUP_COUNT, ui32RegisterNumber - psBinding->ui32BindPoint, "");
-    }
-    else
-    {
-        bformata(output, "UnknownUniformBuffer%d", ui32RegisterNumber);
-    }
-}
-
-void ShaderVarName(bstring output, Shader* psShader, const char* OriginalName)
-{
-    bconchar(output, ShaderTypePrefix(psShader));
-    bcatcstr(output, OriginalName);
-}
-
-void ShaderVarFullName(bstring output, Shader* psShader, const ShaderVarType* psShaderVar)
-{
-    if (psShaderVar->Parent != NULL)
-    {
-        ShaderVarFullName(output, psShader, psShaderVar->Parent);
-        bconchar(output, '.');
-    }
-    ShaderVarName(output, psShader, psShaderVar->Name);
-}
-
-void ConvertToTextureName(bstring output, Shader* psShader, const char* szName, const char* szSamplerName, const int bCompare)
-{
-    (void)bCompare;
-
-    ResourceName(output, psShader, szName, RGROUP_TEXTURE, szSamplerName, RGROUP_SAMPLER, 0, "");
-}
-
-void ConvertToUAVName(bstring output, Shader* psShader, const char* szOriginalUAVName)
-{
-    ResourceName(output, psShader, szOriginalUAVName, RGROUP_UAV, NULL, RGROUP_COUNT, 0, "");
-}
-
-void ConvertToUniformBufferName(bstring output, Shader* psShader, const char* szConstantBufferName)
-{
-    ResourceName(output, psShader, szConstantBufferName, RGROUP_CBUFFER, NULL, RGROUP_COUNT, 0, "");
-}
-
-uint32_t GetGmemInputResourceSlot(uint32_t const slotIn)
-{
-    if (slotIn == GMEM_ARM_COLOR_SLOT)
-    {
-        // ARM framebuffer fetch only works with COLOR0
-        return 0;
-    }
-    if (slotIn >= GMEM_FLOAT4_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT4_START_SLOT;
-    }
-    if (slotIn >= GMEM_FLOAT3_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT3_START_SLOT;
-    }
-    if (slotIn >= GMEM_FLOAT2_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT2_START_SLOT;
-    }
-    if (slotIn >= GMEM_FLOAT_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT_START_SLOT;
-    }
-    return slotIn;
-}
-
-uint32_t GetGmemInputResourceNumElements(uint32_t const slotIn)
-{
-    if (slotIn >= GMEM_FLOAT4_START_SLOT)
-    {
-        return 4;
-    }
-    if (slotIn >= GMEM_FLOAT3_START_SLOT)
-    {
-        return 3;
-    }
-    if (slotIn >= GMEM_FLOAT2_START_SLOT)
-    {
-        return 2;
-    }
-    if (slotIn >= GMEM_FLOAT_START_SLOT)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-void TranslateGmemOperandSwizzleWithMask(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask, uint32_t gmemNumElements)
-{
-    // Similar as TranslateOperandSwizzleWithMaskMETAL but need to considerate max # of elements
-
-    bstring metal = *psContext->currentGLSLString;
-
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return;
-        }
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents != 1)
-    {
-        //Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t mask;
-            if (psOperand->ui32CompMask != 0)
-            {
-                mask = psOperand->ui32CompMask & ui32ComponentMask;
-            }
-            else
-            {
-                mask = ui32ComponentMask;
-            }
-
-            if (mask != 0 && mask != OPERAND_4_COMPONENT_MASK_ALL)
-            {
-                bcatcstr(metal, ".");
-                if (mask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    bcatcstr(metal, "x");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    if (gmemNumElements < 2)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "y");
-                    }
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    if (gmemNumElements < 3)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "z");
-                    }
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    if (gmemNumElements < 4)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "w");
-                    }
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (ui32ComponentMask != OPERAND_4_COMPONENT_MASK_ALL ||
-                !(psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X &&
-                  psOperand->aui32Swizzle[1] == OPERAND_4_COMPONENT_Y &&
-                  psOperand->aui32Swizzle[2] == OPERAND_4_COMPONENT_Z &&
-                  psOperand->aui32Swizzle[3] == OPERAND_4_COMPONENT_W
-                  )
-                )
-            {
-                uint32_t i;
-
-                bcatcstr(metal, ".");
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (!(ui32ComponentMask & (OPERAND_4_COMPONENT_MASK_X << i)))
-                    {
-                        continue;
-                    }
-
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        if (gmemNumElements < 2)
-                        {
-                            bcatcstr(metal, "x");
-                        }
-                        else
-                        {
-                            bcatcstr(metal, "y");
-                        }
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        if (gmemNumElements < 3)
-                        {
-                            bcatcstr(metal, "x");
-                        }
-                        else
-                        {
-                            bcatcstr(metal, "z");
-                        }
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        if (gmemNumElements < 4)
-                        {
-                            bcatcstr(metal, "x");
-                        }
-                        else
-                        {
-                            bcatcstr(metal, "w");
-                        }
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)         // ui32ComponentMask is ignored in this case
-        {
-            bcatcstr(metal, ".");
-
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                bcatcstr(metal, "x");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                if (gmemNumElements < 2)
-                {
-                    bcatcstr(metal, "x");
-                }
-                else
-                {
-                    bcatcstr(metal, "y");
-                }
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                if (gmemNumElements < 3)
-                {
-                    bcatcstr(metal, "x");
-                }
-                else
-                {
-                    bcatcstr(metal, "z");
-                }
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                if (gmemNumElements < 4)
-                {
-                    bcatcstr(metal, "x");
-                }
-                else
-                {
-                    bcatcstr(metal, "w");
-                }
-            }
-        }
-
-        //Component Select 1
-    }
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/CMakeLists.txt b/Code/Tools/HLSLCrossCompilerMETAL/CMakeLists.txt
deleted file mode 100644
index 33fcc54e34..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if (PAL_TRAIT_BUILD_HOST_TOOLS)
-
-    ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-
-    include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-    if (NOT PAL_TRAIT_BUILD_HLSLCC_METAL)
-        return()
-    endif()
-
-    ly_add_target(
-        NAME HLSLcc_Metal EXECUTABLE
-        NAMESPACE AZ
-        OUTPUT_NAME HLSLcc
-        OUTPUT_SUBDIRECTORY Compiler/PCGMETAL/HLSLcc
-        FILES_CMAKE
-            hlslcc_metal_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                include
-                src
-                src/cbstring
-                offline/cjson
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzCore
-    )
-    ly_add_source_properties(
-        SOURCES
-            offline/compilerStandalone.cpp
-            offline/cjson/cJSON.c
-            src/toGLSL.c
-            src/toGLSLDeclaration.c
-            src/cbstring/bstrlib.c
-            src/cbstring/bstraux.c
-            src/reflect.c
-            src/decode.c
-            src/toMETAL.c
-            src/toMETALDeclaration.c
-        PROPERTY COMPILE_DEFINITIONS 
-        VALUES _CRT_SECURE_NO_WARNINGS
-    )
-
-endif()
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/Platform/Linux/PAL_linux.cmake b/Code/Tools/HLSLCrossCompilerMETAL/Platform/Linux/PAL_linux.cmake
deleted file mode 100644
index 7115fcc725..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/Platform/Linux/PAL_linux.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_HLSLCC_METAL FALSE)
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/Platform/Mac/PAL_mac.cmake b/Code/Tools/HLSLCrossCompilerMETAL/Platform/Mac/PAL_mac.cmake
deleted file mode 100644
index 7115fcc725..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/Platform/Mac/PAL_mac.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_HLSLCC_METAL FALSE)
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/Platform/Windows/PAL_windows.cmake b/Code/Tools/HLSLCrossCompilerMETAL/Platform/Windows/PAL_windows.cmake
deleted file mode 100644
index eb5580be07..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/Platform/Windows/PAL_windows.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_HLSLCC_METAL TRUE)
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/README b/Code/Tools/HLSLCrossCompilerMETAL/README
deleted file mode 100644
index 2f36e0966e..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/README
+++ /dev/null
@@ -1,52 +0,0 @@
-What does this software do?
-  Cross compiles HLSL bytecode to GLSL or GLSL ES. It also provides functions to
-  decode the reflection information embedded in HLSL bytecode. Both offline and online compiliation
-  is supported.
-
-Supported bytecode formats:
-  cs_4_0 cs_4_1 cs_5_0
-  ds_5_0
-  hs_5_0
-  gs_4_0 gs_4_1 gs_5_0
-  ps_4_0 ps_4_0_level_9_1 ps_4_0_level_9_3 ps_4_0_level_9_0 ps_4_1 ps_5_0
-  vs_4_0_level_9_3 vs_4_0_level_9_0 vs_4_1 vs_5_0   
-
-Work is underway to support the DX9 bytecode formats:
-  ps_2_0 ps_2_a ps_2_b ps_3_0
-  vs_1_1 vs_2_0 vs_2_a vs_3_0
-  
-Supported target languages:
-  GLSL ES 100
-  GLSL ES 300
-  GLSL ES 310
-  GLSL 120
-  GLSL 130
-  GLSL 140
-  GLSL 150
-  GLSL 330
-  GLSL 400
-  GLSL 410
-  GLSL 420
-  GLSL 430
-  GLSL 440
-  METAL
-
-I have plans to add support for more target languages including:
-  ARB assembly (ARB_vertex_program et al.)
-  NVIDIA assembly (NV_vertex_program et al.)
-
-If the source shader contains instructions not support by the target language then compilation is allowed
-to fail at the GLSL compile stage, i.e. the cross compiler may not generate errors/warnings but an OpenGL
-driver will reject the shader.
-
-The tests directory contains HLSL, bytecode and asm versions of some shaders used to verify this decoder.
-There are also a few sample applications used to make sure that generated GLSL is correct.
-
-A cmake makefile can be found in the mk directory.
-
-Generating hlsl_opcode_funcs_glsl.h
-  Use fwrap.py -f hlsl_opcode_funcs.glsl
-  fwrap.py can be found in my Helpful-scripts github repository.
-
-For further information please see the Wiki page for this project at
-https://github.com/James-Jones/HLSLCrossCompiler/wiki.
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/bin/win32/HLSLcc.exe b/Code/Tools/HLSLCrossCompilerMETAL/bin/win32/HLSLcc.exe
deleted file mode 100644
index f1206847af..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/bin/win32/HLSLcc.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35285dbf53617bf58f22035bb502d0b3328678344245635de578c2e73d484d04
-size 216064
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/bin/win32/HLSLcc_d.exe b/Code/Tools/HLSLCrossCompilerMETAL/bin/win32/HLSLcc_d.exe
deleted file mode 100644
index 64dab82ae4..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/bin/win32/HLSLcc_d.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99f686d3fc04c80f3460e6d35507acb09f5975f7c4d5e5cae95834e48a46898a
-size 462848
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/hlslcc_metal_files.cmake b/Code/Tools/HLSLCrossCompilerMETAL/hlslcc_metal_files.cmake
deleted file mode 100644
index a10ee7ed78..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/hlslcc_metal_files.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    include/hlslcc.h
-    include/hlslcc.hpp
-    include/pstdint.h
-    include/hlslcc_bin.hpp
-    offline/hash.h
-    offline/serializeReflection.h
-    offline/timer.h
-    offline/compilerStandalone.cpp
-    offline/serializeReflection.cpp
-    offline/timer.cpp
-    offline/cjson/cJSON.h
-    offline/cjson/cJSON.c
-    src/decode.c
-    src/decodeDX9.c
-    src/reflect.c
-    src/toGLSL.c
-    src/toMETAL.c
-    src/toMETALDeclaration.c
-    src/toMETALInstruction.c
-    src/toMETALOperand.c
-    src/toGLSLDeclaration.c
-    src/toGLSLInstruction.c
-    src/toGLSLOperand.c
-    src/internal_includes/debug.h
-    src/internal_includes/decode.h
-    src/internal_includes/hlslcc_malloc.h
-    src/internal_includes/hlslcc_malloc.c
-    src/internal_includes/languages.h
-    src/internal_includes/reflect.h
-    src/internal_includes/shaderLimits.h
-    src/internal_includes/structs.h
-    src/internal_includes/toMETALDeclaration.h
-    src/internal_includes/toMETALInstruction.h
-    src/internal_includes/toMETALOperand.h
-    src/internal_includes/toGLSLDeclaration.h
-    src/internal_includes/toGLSLInstruction.h
-    src/internal_includes/toGLSLOperand.h
-    src/internal_includes/tokens.h
-    src/internal_includes/tokensDX9.h
-    src/internal_includes/structsMetal.h
-    src/internal_includes/structsMetal.c
-    src/cbstring/bsafe.h
-    src/cbstring/bstraux.h
-    src/cbstring/bstrlib.h
-    src/cbstring/bsafe.c
-    src/cbstring/bstraux.c
-    src/cbstring/bstrlib.c
-)
-
-set(SKIP_UNITY_BUILD_INCLUSION_FILES
-    # 'bsafe.c' tries to forward declar 'strncpy', 'strncat', etc, but they are already declared in other modules. Remove from unity builds conideration
-    src/cbstring/bsafe.c
-)
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc.h b/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc.h
deleted file mode 100644
index b7444121bc..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc.h
+++ /dev/null
@@ -1,537 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef HLSLCC_H_
-#define HLSLCC_H_
-
-#if defined (_WIN32) && defined(HLSLCC_DYNLIB)
-    #define HLSLCC_APIENTRY __stdcall
-    #if defined(libHLSLcc_EXPORTS)
-        #define HLSLCC_API __declspec(dllexport)
-    #else
-        #define HLSLCC_API __declspec(dllimport)
-    #endif
-#else
-    #define HLSLCC_APIENTRY
-    #define HLSLCC_API
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-
-#ifndef __cplusplus
-    #ifndef max
-    #define max(a,b)            (((a) > (b)) ? (a) : (b))
-    #endif
-
-    #ifndef min
-    #define min(a,b)            (((a) < (b)) ? (a) : (b))
-    #endif
-#endif //__cplusplus
-
-typedef enum
-{
-    LANG_DEFAULT,// Depends on the HLSL shader model.
-    LANG_ES_100,
-    LANG_ES_300,
-    LANG_ES_310,
-    LANG_120,
-    LANG_130,
-    LANG_140,
-    LANG_150,
-    LANG_330,
-    LANG_400,
-    LANG_410,
-    LANG_420,
-    LANG_430,
-    LANG_440,
-    // CONFETTI
-    LANG_METAL,
-} ShaderLang;
-
-typedef struct
-{
-    uint32_t ARB_explicit_attrib_location : 1;
-    uint32_t ARB_explicit_uniform_location : 1;
-    uint32_t ARB_shading_language_420pack : 1;
-}GlExtensions;
-
-enum
-{
-    MAX_SHADER_VEC4_OUTPUT = 512
-};
-enum
-{
-    MAX_SHADER_VEC4_INPUT = 512
-};
-enum
-{
-    MAX_TEXTURES = 128
-};
-enum
-{
-    MAX_FORK_PHASES = 2
-};
-enum
-{
-    MAX_FUNCTION_BODIES = 1024
-};
-enum
-{
-    MAX_CLASS_TYPES = 1024
-};
-enum
-{
-    MAX_FUNCTION_POINTERS = 128
-};
-
-//Reflection
-#define MAX_REFLECT_STRING_LENGTH 512
-#define MAX_CBUFFERS 256
-#define MAX_UAV 256
-#define MAX_FUNCTION_TABLES 256
-#define MAX_RESOURCE_BINDINGS 256
-
-typedef enum SPECIAL_NAME
-{
-    NAME_UNDEFINED = 0,
-    NAME_POSITION = 1,
-    NAME_CLIP_DISTANCE = 2,
-    NAME_CULL_DISTANCE = 3,
-    NAME_RENDER_TARGET_ARRAY_INDEX = 4,
-    NAME_VIEWPORT_ARRAY_INDEX = 5,
-    NAME_VERTEX_ID = 6,
-    NAME_PRIMITIVE_ID = 7,
-    NAME_INSTANCE_ID = 8,
-    NAME_IS_FRONT_FACE = 9,
-    NAME_SAMPLE_INDEX = 10,
-    // The following are added for D3D11
-    NAME_FINAL_QUAD_U_EQ_0_EDGE_TESSFACTOR = 11,
-    NAME_FINAL_QUAD_V_EQ_0_EDGE_TESSFACTOR = 12,
-    NAME_FINAL_QUAD_U_EQ_1_EDGE_TESSFACTOR = 13,
-    NAME_FINAL_QUAD_V_EQ_1_EDGE_TESSFACTOR = 14,
-    NAME_FINAL_QUAD_U_INSIDE_TESSFACTOR = 15,
-    NAME_FINAL_QUAD_V_INSIDE_TESSFACTOR = 16,
-    NAME_FINAL_TRI_U_EQ_0_EDGE_TESSFACTOR = 17,
-    NAME_FINAL_TRI_V_EQ_0_EDGE_TESSFACTOR = 18,
-    NAME_FINAL_TRI_W_EQ_0_EDGE_TESSFACTOR = 19,
-    NAME_FINAL_TRI_INSIDE_TESSFACTOR = 20,
-    NAME_FINAL_LINE_DETAIL_TESSFACTOR = 21,
-    NAME_FINAL_LINE_DENSITY_TESSFACTOR = 22,
-} SPECIAL_NAME;
-
-
-typedef enum
-{
-    INOUT_COMPONENT_UNKNOWN  = 0,
-    INOUT_COMPONENT_UINT32   = 1,
-    INOUT_COMPONENT_SINT32   = 2,
-    INOUT_COMPONENT_FLOAT32  = 3
-} INOUT_COMPONENT_TYPE;
-
-typedef enum MIN_PRECISION
-{
-    MIN_PRECISION_DEFAULT    = 0,
-    MIN_PRECISION_FLOAT_16   = 1,
-    MIN_PRECISION_FLOAT_2_8  = 2,
-    MIN_PRECISION_RESERVED   = 3,
-    MIN_PRECISION_SINT_16    = 4,
-    MIN_PRECISION_UINT_16    = 5,
-    MIN_PRECISION_ANY_16     = 0xf0,
-    MIN_PRECISION_ANY_10     = 0xf1
-} MIN_PRECISION;
-
-typedef struct InOutSignature_TAG
-{
-    char SemanticName[MAX_REFLECT_STRING_LENGTH];
-    uint32_t ui32SemanticIndex;
-    SPECIAL_NAME eSystemValueType;
-    INOUT_COMPONENT_TYPE eComponentType;
-    uint32_t ui32Register;
-    uint32_t ui32Mask;
-    uint32_t ui32ReadWriteMask;
-
-    uint32_t ui32Stream;
-    MIN_PRECISION eMinPrec;
-} InOutSignature;
-
-typedef enum ResourceType_TAG
-{
-    RTYPE_CBUFFER,//0
-    RTYPE_TBUFFER,//1
-    RTYPE_TEXTURE,//2
-    RTYPE_SAMPLER,//3
-    RTYPE_UAV_RWTYPED,//4
-    RTYPE_STRUCTURED,//5
-    RTYPE_UAV_RWSTRUCTURED,//6
-    RTYPE_BYTEADDRESS,//7
-    RTYPE_UAV_RWBYTEADDRESS,//8
-    RTYPE_UAV_APPEND_STRUCTURED,//9
-    RTYPE_UAV_CONSUME_STRUCTURED,//10
-    RTYPE_UAV_RWSTRUCTURED_WITH_COUNTER,//11
-    RTYPE_COUNT,
-} ResourceType;
-
-typedef enum ResourceGroup_TAG
-{
-    RGROUP_CBUFFER,
-    RGROUP_TEXTURE,
-    RGROUP_SAMPLER,
-    RGROUP_UAV,
-    RGROUP_COUNT,
-} ResourceGroup;
-
-typedef enum UAVBindingArea_TAG
-{
-    UAVAREA_INVALID,
-    UAVAREA_CBUFFER,
-    UAVAREA_TEXTURE,
-    UAVAREA_COUNT,
-} UAVBindingArea;
-
-typedef enum REFLECT_RESOURCE_DIMENSION
-{
-    REFLECT_RESOURCE_DIMENSION_UNKNOWN = 0,
-    REFLECT_RESOURCE_DIMENSION_BUFFER = 1,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE1D = 2,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY = 3,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2D = 4,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY = 5,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS = 6,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY = 7,
-    REFLECT_RESOURCE_DIMENSION_TEXTURE3D = 8,
-    REFLECT_RESOURCE_DIMENSION_TEXTURECUBE = 9,
-    REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY = 10,
-    REFLECT_RESOURCE_DIMENSION_BUFFEREX = 11,
-} REFLECT_RESOURCE_DIMENSION;
-
-typedef struct ResourceBinding_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    ResourceType eType;
-    uint32_t ui32BindPoint;
-    uint32_t ui32BindCount;
-    uint32_t ui32Flags;
-    REFLECT_RESOURCE_DIMENSION eDimension;
-    uint32_t ui32ReturnType;
-    uint32_t ui32NumSamples;
-    UAVBindingArea eBindArea;
-} ResourceBinding;
-
-typedef enum _SHADER_VARIABLE_TYPE
-{
-    SVT_VOID                         = 0,
-    SVT_BOOL                         = 1,
-    SVT_INT                          = 2,
-    SVT_FLOAT                        = 3,
-    SVT_STRING                       = 4,
-    SVT_TEXTURE                      = 5,
-    SVT_TEXTURE1D                    = 6,
-    SVT_TEXTURE2D                    = 7,
-    SVT_TEXTURE3D                    = 8,
-    SVT_TEXTURECUBE                  = 9,
-    SVT_SAMPLER                      = 10,
-    SVT_PIXELSHADER                  = 15,
-    SVT_VERTEXSHADER                 = 16,
-    SVT_UINT                         = 19,
-    SVT_UINT8                        = 20,
-    SVT_GEOMETRYSHADER               = 21,
-    SVT_RASTERIZER                   = 22,
-    SVT_DEPTHSTENCIL                 = 23,
-    SVT_BLEND                        = 24,
-    SVT_BUFFER                       = 25,
-    SVT_CBUFFER                      = 26,
-    SVT_TBUFFER                      = 27,
-    SVT_TEXTURE1DARRAY               = 28,
-    SVT_TEXTURE2DARRAY               = 29,
-    SVT_RENDERTARGETVIEW             = 30,
-    SVT_DEPTHSTENCILVIEW             = 31,
-    SVT_TEXTURE2DMS                  = 32,
-    SVT_TEXTURE2DMSARRAY             = 33,
-    SVT_TEXTURECUBEARRAY             = 34,
-    SVT_HULLSHADER                   = 35,
-    SVT_DOMAINSHADER                 = 36,
-    SVT_INTERFACE_POINTER            = 37,
-    SVT_COMPUTESHADER                = 38,
-    SVT_DOUBLE                       = 39,
-    SVT_RWTEXTURE1D                  = 40,
-    SVT_RWTEXTURE1DARRAY             = 41,
-    SVT_RWTEXTURE2D                  = 42,
-    SVT_RWTEXTURE2DARRAY             = 43,
-    SVT_RWTEXTURE3D                  = 44,
-    SVT_RWBUFFER                     = 45,
-    SVT_BYTEADDRESS_BUFFER           = 46,
-    SVT_RWBYTEADDRESS_BUFFER         = 47,
-    SVT_STRUCTURED_BUFFER            = 48,
-    SVT_RWSTRUCTURED_BUFFER          = 49,
-    SVT_APPEND_STRUCTURED_BUFFER     = 50,
-    SVT_CONSUME_STRUCTURED_BUFFER    = 51,
-
-    // Partial precision types    
-    SVT_FLOAT10                      = 53,
-    SVT_FLOAT16                      = 54,
-    
-
-    SVT_FORCE_DWORD                  = 0x7fffffff
-} SHADER_VARIABLE_TYPE;
-
-typedef enum _SHADER_VARIABLE_CLASS
-{
-    SVC_SCALAR               = 0,
-    SVC_VECTOR               = (SVC_SCALAR + 1),
-    SVC_MATRIX_ROWS          = (SVC_VECTOR + 1),
-    SVC_MATRIX_COLUMNS       = (SVC_MATRIX_ROWS + 1),
-    SVC_OBJECT               = (SVC_MATRIX_COLUMNS + 1),
-    SVC_STRUCT               = (SVC_OBJECT + 1),
-    SVC_INTERFACE_CLASS      = (SVC_STRUCT + 1),
-    SVC_INTERFACE_POINTER    = (SVC_INTERFACE_CLASS + 1),
-    SVC_FORCE_DWORD          = 0x7fffffff
-} SHADER_VARIABLE_CLASS;
-
-typedef struct ShaderVarType_TAG
-{
-    SHADER_VARIABLE_CLASS Class;
-    SHADER_VARIABLE_TYPE  Type;
-    uint32_t                  Rows;
-    uint32_t                      Columns;
-    uint32_t                      Elements;
-    uint32_t                      MemberCount;
-    uint32_t                      Offset;
-    char                    Name[MAX_REFLECT_STRING_LENGTH];
-
-    uint32_t ParentCount;
-    struct ShaderVarType_TAG* Parent;
-    //Includes all parent names.
-    char                    FullName[MAX_REFLECT_STRING_LENGTH];
-
-    struct ShaderVarType_TAG* Members;
-} ShaderVarType;
-
-typedef struct ShaderVar_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    int haveDefaultValue;
-    uint32_t* pui32DefaultValues;
-    //Offset/Size in bytes.
-    uint32_t ui32StartOffset;
-    uint32_t ui32Size;
-
-    ShaderVarType sType;
-} ShaderVar;
-
-typedef struct ConstantBuffer_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-
-    uint32_t ui32NumVars;
-    ShaderVar* asVars;
-
-    uint32_t ui32TotalSizeInBytes;
-    int blob; // Used with dynamic indexed const. buffers
-} ConstantBuffer;
-
-typedef struct ClassType_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    uint16_t ui16ID;
-    uint16_t ui16ConstBufStride;
-    uint16_t ui16Texture;
-    uint16_t ui16Sampler;
-} ClassType;
-
-typedef struct ClassInstance_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-    uint16_t ui16ID;
-    uint16_t ui16ConstBuf;
-    uint16_t ui16ConstBufOffset;
-    uint16_t ui16Texture;
-    uint16_t ui16Sampler;
-} ClassInstance;
-
-typedef enum TESSELLATOR_PARTITIONING
-{
-    TESSELLATOR_PARTITIONING_UNDEFINED       = 0,
-    TESSELLATOR_PARTITIONING_INTEGER         = 1,
-    TESSELLATOR_PARTITIONING_POW2            = 2,
-    TESSELLATOR_PARTITIONING_FRACTIONAL_ODD  = 3,
-    TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4
-} TESSELLATOR_PARTITIONING;
-
-typedef enum TESSELLATOR_OUTPUT_PRIMITIVE
-{
-    TESSELLATOR_OUTPUT_UNDEFINED     = 0,
-    TESSELLATOR_OUTPUT_POINT         = 1,
-    TESSELLATOR_OUTPUT_LINE          = 2,
-    TESSELLATOR_OUTPUT_TRIANGLE_CW   = 3,
-    TESSELLATOR_OUTPUT_TRIANGLE_CCW  = 4
-} TESSELLATOR_OUTPUT_PRIMITIVE;
-
-typedef struct TextureSamplerPair_TAG
-{
-    char Name[MAX_REFLECT_STRING_LENGTH];
-} TextureSamplerPair;
-
-typedef struct TextureSamplerInfo_TAG
-{
-    uint32_t ui32NumTextureSamplerPairs;
-    TextureSamplerPair aTextureSamplerPair[MAX_RESOURCE_BINDINGS];
-} TextureSamplerInfo;
-
-typedef struct ShaderInfo_TAG
-{
-    uint32_t ui32MajorVersion;
-    uint32_t ui32MinorVersion;
-
-    uint32_t ui32NumInputSignatures;
-    InOutSignature* psInputSignatures;
-
-    uint32_t ui32NumOutputSignatures;
-    InOutSignature* psOutputSignatures;
-
-    uint32_t ui32NumPatchConstantSignatures;
-    InOutSignature* psPatchConstantSignatures;
-
-    uint32_t ui32NumResourceBindings;
-    ResourceBinding* psResourceBindings;
-
-    uint32_t ui32NumConstantBuffers;
-    ConstantBuffer* psConstantBuffers;
-    ConstantBuffer* psThisPointerConstBuffer;
-
-    uint32_t ui32NumClassTypes;
-    ClassType* psClassTypes;
-
-    uint32_t ui32NumClassInstances;
-    ClassInstance* psClassInstances;
-
-    //Func table ID to class name ID.
-    uint32_t aui32TableIDToTypeID[MAX_FUNCTION_TABLES];
-
-    uint32_t aui32ResourceMap[RGROUP_COUNT][MAX_RESOURCE_BINDINGS];
-
-    // Texture index to sampler slot
-    uint32_t aui32SamplerMap[MAX_RESOURCE_BINDINGS];
-
-    TESSELLATOR_PARTITIONING eTessPartitioning;
-    TESSELLATOR_OUTPUT_PRIMITIVE eTessOutPrim;
-
-    //compute shader thread number
-    uint32_t ui32Thread_x;
-    uint32_t ui32Thread_y;
-    uint32_t ui32Thread_z;
-} ShaderInfo;
-
-typedef enum INTERPOLATION_MODE
-{
-    INTERPOLATION_UNDEFINED = 0,
-    INTERPOLATION_CONSTANT = 1,
-    INTERPOLATION_LINEAR = 2,
-    INTERPOLATION_LINEAR_CENTROID = 3,
-    INTERPOLATION_LINEAR_NOPERSPECTIVE = 4,
-    INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID = 5,
-    INTERPOLATION_LINEAR_SAMPLE = 6,
-    INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE = 7,
-} INTERPOLATION_MODE;
-
-typedef struct
-{
-    int shaderType; //One of the GL enums.
-    char* sourceCode;
-    ShaderInfo reflection;
-    ShaderLang GLSLLanguage;
-    TextureSamplerInfo textureSamplerInfo;    // HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS fills this out
-} Shader;
-
-// NOTE: HLSLCC flags are specified by command line when executing this cross compiler.
-//       If these flags change, the command line switch '-flags=XXX' must change as well.
-//       Open 3D Engine composes the command line in file 'dev\Code\CryEngine\RenderDll\Common\Shaders\RemoteCompiler.cpp'
-
-/*HLSL constant buffers are treated as default-block unform arrays by default. This is done
-  to support versions of GLSL which lack ARB_uniform_buffer_object functionality.
-  Setting this flag causes each one to have its own uniform block.
-  Note: Currently the nth const buffer will be named UnformBufferN. This is likey to change to the original HLSL name in the future.*/
-static const unsigned int HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT = 0x1;
-
-static const unsigned int HLSLCC_FLAG_ORIGIN_UPPER_LEFT = 0x2;
-
-static const unsigned int HLSLCC_FLAG_PIXEL_CENTER_INTEGER = 0x4;
-
-static const unsigned int HLSLCC_FLAG_GLOBAL_CONSTS_NEVER_IN_UBO = 0x8;
-
-//GS enabled?
-//Affects vertex shader (i.e. need to compile vertex shader again to use with/without GS).
-//This flag is needed in order for the interfaces between stages to match when GS is in use.
-//PS inputs VtxGeoOutput
-//GS outputs VtxGeoOutput
-//Vs outputs VtxOutput if GS enabled. VtxGeoOutput otherwise.
-static const unsigned int HLSLCC_FLAG_GS_ENABLED = 0x10;
-
-static const unsigned int HLSLCC_FLAG_TESS_ENABLED = 0x20;
-
-//Either use this flag or glBindFragDataLocationIndexed.
-//When set the first pixel shader output is the first input to blend
-//equation, the others go to the second input.
-static const unsigned int HLSLCC_FLAG_DUAL_SOURCE_BLENDING = 0x40;
-
-//If set, shader inputs and outputs are declared with their semantic name.
-static const unsigned int HLSLCC_FLAG_INOUT_SEMANTIC_NAMES = 0x80;
-//If set, shader inputs and outputs are declared with their semantic name appended.
-static const unsigned int HLSLCC_FLAG_INOUT_APPEND_SEMANTIC_NAMES = 0x100;
-
-//If set, combines texture/sampler pairs used together into samplers named "texturename_X_samplername".
-static const unsigned int HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS = 0x200;
-
-//If set, attribute and uniform explicit location qualifiers are disabled (even if the language version supports that)
-static const unsigned int HLSLCC_FLAG_DISABLE_EXPLICIT_LOCATIONS = 0x400;
-
-//If set, global uniforms are not stored in a struct.
-static const unsigned int HLSLCC_FLAG_DISABLE_GLOBALS_STRUCT = 0x800;
-
-// If set, HLSL DX9 lower precision qualifiers (e.g half) will be transformed to DX11 style (e.g min16float)
-// before compiling. Necessary to preserve precision information. If not, FXC just silently transform
-// everything to full precision (e.g float32).
-static const unsigned int HLSLCC_FLAG_HALF_FLOAT_TRANSFORM = 0x40000;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-HLSLCC_API void HLSLCC_APIENTRY HLSLcc_SetMemoryFunctions(void* (*malloc_override)(size_t),
-    void* (*calloc_override)(size_t, size_t),
-    void (* free_override)(void*),
-    void* (*realloc_override)(void*, size_t));
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromFileToGLSL(const char* filename,
-    unsigned int flags,
-    ShaderLang language,
-    const GlExtensions* extensions,
-    Shader* result
-    );
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromMemToGLSL(const char* shader,
-    unsigned int flags,
-    ShaderLang language,
-    const GlExtensions* extensions,
-    Shader* result);
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromFileToMETAL(const char* filename,
-    unsigned int flags,
-    ShaderLang language,
-    Shader* result
-    );
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromMemToMETAL(const char* shader,
-    unsigned int flags,
-    ShaderLang language,
-    Shader* result);
-
-
-HLSLCC_API void HLSLCC_APIENTRY FreeShader(Shader*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc.hpp b/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc.hpp
deleted file mode 100644
index 193415f277..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-extern "C" {
-#include "hlslcc.h"
-}
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc_bin.hpp b/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc_bin.hpp
deleted file mode 100644
index cc41572aa2..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/include/hlslcc_bin.hpp
+++ /dev/null
@@ -1,448 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#define FOURCC(a, b, c, d) ((uint32_t)(uint8_t)(a) | ((uint32_t)(uint8_t)(b) << 8) | ((uint32_t)(uint8_t)(c) << 16) | ((uint32_t)(uint8_t)(d) << 24))
-
-enum
-{
-    DXBC_BASE_ALIGNMENT = 4,
-    FOURCC_DXBC = FOURCC('D', 'X', 'B', 'C'),
-    FOURCC_RDEF = FOURCC('R', 'D', 'E', 'F'),
-    FOURCC_ISGN = FOURCC('I', 'S', 'G', 'N'),
-    FOURCC_OSGN = FOURCC('O', 'S', 'G', 'N'),
-    FOURCC_PCSG = FOURCC('P', 'C', 'S', 'G'),
-    FOURCC_SHDR = FOURCC('S', 'H', 'D', 'R'),
-    FOURCC_SHEX = FOURCC('S', 'H', 'E', 'X'),
-    FOURCC_GLSL = FOURCC('G', 'L', 'S', 'L'),
-    FOURCC_ISG1 = FOURCC('I', 'S', 'G', '1'), // When lower precision float/int/uint is used
-    FOURCC_OSG1 = FOURCC('O', 'S', 'G', '1'), // When lower precision float/int/uint is used
-};
-
-#undef FOURCC
-
-template <typename T>
-inline T DXBCSwapBytes(const T& kValue)
-{
-    return kValue;
-}
-
-#if defined(__BIG_ENDIAN__) || SYSTEM_IS_BIG_ENDIAN
-
-inline uint16_t DXBCSwapBytes(const uint16_t& uValue)
-{
-    return
-        (((uValue) >> 8) & 0xFF) |
-        (((uValue) << 8) & 0xFF);
-}
-
-inline uint32_t DXBCSwapBytes(const uint32_t& uValue)
-{
-    return
-        (((uValue) >> 24) & 0x000000FF) |
-        (((uValue) >> 8)  & 0x0000FF00) |
-        (((uValue) << 8)  & 0x00FF0000) |
-        (((uValue) << 24) & 0xFF000000);
-}
-
-#endif //defined(__BIG_ENDIAN__) || SYSTEM_IS_BIG_ENDIAN
-
-template <typename Element>
-struct SDXBCBufferBase
-{
-    Element* m_pBegin;
-    Element* m_pEnd;
-    Element* m_pIter;
-
-    SDXBCBufferBase(Element* pBegin, Element* pEnd)
-        : m_pBegin(pBegin)
-        , m_pEnd(pEnd)
-        , m_pIter(pBegin)
-    {
-    }
-
-    bool SeekRel(int32_t iOffset)
-    {
-        Element* pIterAfter(m_pIter + iOffset);
-        if (pIterAfter > m_pEnd)
-        {
-            return false;
-        }
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-
-    bool SeekAbs(uint32_t uPosition)
-    {
-        Element* pIterAfter(m_pBegin + uPosition);
-        if (pIterAfter > m_pEnd)
-        {
-            return false;
-        }
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-};
-
-struct SDXBCInputBuffer
-    : SDXBCBufferBase<const uint8_t>
-{
-    SDXBCInputBuffer(const uint8_t* pBegin, const uint8_t* pEnd)
-        : SDXBCBufferBase(pBegin, pEnd)
-    {
-    }
-
-    bool Read(void* pElements, size_t uSize)
-    {
-        const uint8_t* pIterAfter(m_pIter + uSize);
-        if (pIterAfter > m_pEnd)
-        {
-            return false;
-        }
-
-        memcpy(pElements, m_pIter, uSize);
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-};
-
-struct SDXBCOutputBuffer
-    : SDXBCBufferBase<uint8_t>
-{
-    SDXBCOutputBuffer(uint8_t* pBegin,  uint8_t* pEnd)
-        : SDXBCBufferBase(pBegin, pEnd)
-    {
-    }
-
-    bool Write(const void* pElements, size_t uSize)
-    {
-        uint8_t* pIterAfter(m_pIter + uSize);
-        if (pIterAfter > m_pEnd)
-        {
-            return false;
-        }
-
-        memcpy(m_pIter, pElements, uSize);
-
-        m_pIter = pIterAfter;
-        return true;
-    }
-};
-
-template <typename S, typename External, typename Internal>
-inline bool DXBCReadAs(S& kStream, External& kValue)
-{
-    Internal kInternal;
-    bool bResult(kStream.Read(&kInternal, sizeof(Internal)));
-    kValue = static_cast<External>(DXBCSwapBytes(kInternal));
-    return bResult;
-}
-
-template <typename S, typename Internal>
-inline bool DXBCWriteAs(S& kStream, Internal kValue)
-{
-    Internal kInternal(DXBCSwapBytes(kValue));
-    return kStream.Write(&kInternal, sizeof(Internal));
-}
-
-template <typename S, typename T>
-bool DXBCReadUint8 (S& kStream, T& kValue) { return DXBCReadAs<S, T, uint8_t >(kStream, kValue); }
-template <typename S, typename T>
-bool DXBCReadUint16(S& kStream, T& kValue) { return DXBCReadAs<S, T, uint16_t>(kStream, kValue); }
-template <typename S, typename T>
-bool DXBCReadUint32(S& kStream, T& kValue) { return DXBCReadAs<S, T, uint32_t>(kStream, kValue); }
-
-template <typename S>
-bool DXBCWriteUint8 (S& kStream, uint8_t kValue)  { return DXBCWriteAs<S, uint8_t >(kStream, kValue); }
-template <typename S>
-bool DXBCWriteUint16(S& kStream, uint16_t kValue) { return DXBCWriteAs<S, uint16_t>(kStream, kValue); }
-template <typename S>
-bool DXBCWriteUint32(S& kStream, uint32_t kValue) { return DXBCWriteAs<S, uint32_t>(kStream, kValue); }
-
-template <typename O, typename I>
-bool DXBCCopy(O& kOutput, I& kInput, size_t uSize)
-{
-    char acBuffer[1024];
-    while (uSize > 0)
-    {
-        size_t uToCopy(std::min<size_t>(uSize, sizeof(acBuffer)));
-        if (!kInput.Read(acBuffer, uToCopy) ||
-            !kOutput.Write(acBuffer, uToCopy))
-        {
-            return false;
-        }
-        uSize -= uToCopy;
-    }
-    return true;
-}
-
-enum
-{
-    DXBC_SIZE_POSITION = 6 * 4,
-    DXBC_HEADER_SIZE = 7 * 4,
-    DXBC_CHUNK_HEADER_SIZE = 2 * 4,
-    DXBC_MAX_NUM_CHUNKS_IN = 128,
-    DXBC_MAX_NUM_CHUNKS_OUT = 8,
-    DXBC_OUT_CHUNKS_INDEX_SIZE = (1 + 1 + DXBC_MAX_NUM_CHUNKS_OUT) * 4,
-    DXBC_OUT_FIXED_SIZE = DXBC_HEADER_SIZE + DXBC_OUT_CHUNKS_INDEX_SIZE,
-};
-
-inline void DXBCSizeGLSLChunk(uint32_t& uGLSLChunkSize, uint32_t& uNumSamplers, uint32_t& uGLSLSourceSize, const Shader* pShader)
-{
-    enum
-    {
-        GLSL_HEADER_SIZE =  4 * 8,  // {uint32 uNumSamplers; uint32 uNumImports; uint32 uNumExports; uint32 uInputHash;uint32 uResources; uint32 ui32Thread_x; uint32 ui32Thread_y; uint32 ui32Thread_z}
-        GLSL_SAMPLER_SIZE = 4 * 2,  // {uint32 uTexture; uint32 uSampler;}
-        GLSL_SYMBOL_SIZE =  4 * 3,  // {uint32 uType; uint32 uID; uint32 uValue}
-        //extend for metal compute UAV type
-        GLSL_UAV_RESOURCES_AREA = 4 * 2, //{uint32 uResource; uint32 eBindArea}
-    };
-
-    // Only texture registers that are used are written
-    uNumSamplers = 0;
-    for (uint32_t uTexture = 0; uTexture < MAX_RESOURCE_BINDINGS; ++uTexture)
-    {
-        if (pShader->reflection.aui32SamplerMap[uTexture] != MAX_RESOURCE_BINDINGS)
-        {
-            ++uNumSamplers;
-        }
-    }
-
-    //uint32_t uNumSymbols(
-    //  pShader->reflection.ui32NumImports +
-    //  pShader->reflection.ui32NumExports);
-    uint32_t uNumSymbols(0); // always 0
-    uint32_t uNumResources(pShader->reflection.ui32NumResourceBindings);
-
-    uint32_t uGLSLInfoSize(
-        DXBC_CHUNK_HEADER_SIZE +
-        GLSL_HEADER_SIZE +
-        uNumSamplers * GLSL_SAMPLER_SIZE +
-        uNumSymbols  * GLSL_SYMBOL_SIZE +
-        uNumResources * GLSL_UAV_RESOURCES_AREA
-        );
-    uGLSLSourceSize = (uint32_t)strlen(pShader->sourceCode) + 1;
-    uGLSLChunkSize = uGLSLInfoSize + uGLSLSourceSize;
-    uGLSLChunkSize += DXBC_BASE_ALIGNMENT - 1 - (uGLSLChunkSize - 1) % DXBC_BASE_ALIGNMENT;
-}
-
-inline uint32_t DXBCSizeOutputChunk(uint32_t uCode, uint32_t uSizeIn)
-{
-    uint32_t uSizeOut;
-    switch (uCode)
-    {
-    case FOURCC_RDEF:
-    case FOURCC_ISGN:
-    case FOURCC_OSGN:
-    case FOURCC_PCSG:
-    case FOURCC_OSG1:
-    case FOURCC_ISG1:
-        // Preserve entire chunk
-        uSizeOut = uSizeIn;
-        break;
-    case FOURCC_SHDR:
-    case FOURCC_SHEX:
-        // Only keep the shader version
-        uSizeOut = uSizeIn <  4u ? uSizeIn : 4u;
-        break;
-    default:
-        // Discard the chunk
-        uSizeOut = 0;
-        break;
-    }
-
-    return uSizeOut + DXBC_BASE_ALIGNMENT - 1 - (uSizeOut - 1) % DXBC_BASE_ALIGNMENT;
-}
-
-template <typename I>
-size_t DXBCGetCombinedSize(I& kDXBCInput, const Shader* pShader)
-{
-    uint32_t uNumChunksIn;
-    if (!kDXBCInput.SeekAbs(DXBC_HEADER_SIZE) ||
-        !DXBCReadUint32(kDXBCInput, uNumChunksIn))
-    {
-        return 0;
-    }
-
-    uint32_t auChunkOffsetsIn[DXBC_MAX_NUM_CHUNKS_IN];
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn; ++uChunk)
-    {
-        if (!DXBCReadUint32(kDXBCInput, auChunkOffsetsIn[uChunk]))
-        {
-            return 0;
-        }
-    }
-
-    uint32_t uNumChunksOut(0);
-    uint32_t uOutSize(DXBC_OUT_FIXED_SIZE);
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn && uNumChunksOut < DXBC_MAX_NUM_CHUNKS_OUT; ++uChunk)
-    {
-        uint32_t uChunkCode, uChunkSizeIn;
-        if (!kDXBCInput.SeekAbs(auChunkOffsetsIn[uChunk]) ||
-            !DXBCReadUint32(kDXBCInput, uChunkCode) ||
-            !DXBCReadUint32(kDXBCInput, uChunkSizeIn))
-        {
-            return 0;
-        }
-
-        uint32_t uChunkSizeOut(DXBCSizeOutputChunk(uChunkCode, uChunkSizeIn));
-        if (uChunkSizeOut > 0)
-        {
-            uOutSize += DXBC_CHUNK_HEADER_SIZE + uChunkSizeOut;
-        }
-    }
-
-    uint32_t uNumSamplers, uGLSLSourceSize, uGLSLChunkSize;
-    DXBCSizeGLSLChunk(uGLSLChunkSize, uNumSamplers, uGLSLSourceSize, pShader);
-    uOutSize += uGLSLChunkSize;
-
-    return uOutSize;
-}
-
-template <typename I, typename O>
-bool DXBCCombineWithGLSL(I& kInput, O& kOutput, const Shader* pShader)
-{
-    uint32_t uNumChunksIn;
-    if (!DXBCCopy(kOutput, kInput, DXBC_HEADER_SIZE) ||
-        !DXBCReadUint32(kInput, uNumChunksIn)  ||
-        uNumChunksIn > DXBC_MAX_NUM_CHUNKS_IN)
-    {
-        return false;
-    }
-
-    uint32_t auChunkOffsetsIn[DXBC_MAX_NUM_CHUNKS_IN];
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn; ++uChunk)
-    {
-        if (!DXBCReadUint32(kInput, auChunkOffsetsIn[uChunk]))
-        {
-            return false;
-        }
-    }
-
-    uint32_t auZeroChunkIndex[DXBC_OUT_CHUNKS_INDEX_SIZE] = {0};
-    if (!kOutput.Write(auZeroChunkIndex, DXBC_OUT_CHUNKS_INDEX_SIZE))
-    {
-        return false;
-    }
-
-    // Copy required input chunks just after the chunk index
-    uint32_t uOutSize(DXBC_OUT_FIXED_SIZE);
-    uint32_t uNumChunksOut(0);
-    uint32_t auChunkOffsetsOut[DXBC_MAX_NUM_CHUNKS_OUT];
-    for (uint32_t uChunk = 0; uChunk < uNumChunksIn; ++uChunk)
-    {
-        uint32_t uChunkCode, uChunkSizeIn;
-        if (!kInput.SeekAbs(auChunkOffsetsIn[uChunk]) ||
-            !DXBCReadUint32(kInput, uChunkCode) ||
-            !DXBCReadUint32(kInput, uChunkSizeIn))
-        {
-            return false;
-        }
-
-        // Filter only input chunks of the specified types
-        uint32_t uChunkSizeOut(DXBCSizeOutputChunk(uChunkCode, uChunkSizeIn));
-        if (uChunkSizeOut > 0)
-        {
-            if (uNumChunksOut >= DXBC_MAX_NUM_CHUNKS_OUT)
-            {
-                return false;
-            }
-
-            if (!DXBCWriteUint32(kOutput, uChunkCode) ||
-                !DXBCWriteUint32(kOutput, uChunkSizeOut) ||
-                !DXBCCopy(kOutput, kInput, uChunkSizeOut))
-            {
-                return false;
-            }
-
-            auChunkOffsetsOut[uNumChunksOut] = uOutSize;
-            ++uNumChunksOut;
-            uOutSize += DXBC_CHUNK_HEADER_SIZE + uChunkSizeOut;
-        }
-    }
-    // Write GLSL chunk
-    uint32_t uGLSLChunkOffset(uOutSize);
-    uint32_t uGLSLChunkSize, uNumSamplers, uGLSLSourceSize;
-    DXBCSizeGLSLChunk(uGLSLChunkSize, uNumSamplers, uGLSLSourceSize, pShader);
-    if (!DXBCWriteUint32(kOutput, (uint32_t)FOURCC_GLSL) ||
-        !DXBCWriteUint32(kOutput, uGLSLChunkSize) ||
-        !DXBCWriteUint32(kOutput, uNumSamplers) ||
-        !DXBCWriteUint32(kOutput, 0) ||
-        !DXBCWriteUint32(kOutput, 0) ||
-        !DXBCWriteUint32(kOutput, 0) ||
-        /*!DXBCWriteUint32(kOutput, pShader->reflection.ui32NumImports) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumExports) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32InputHash)*/
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32NumResourceBindings) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32Thread_x) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32Thread_y) ||
-        !DXBCWriteUint32(kOutput, pShader->reflection.ui32Thread_z))
-    {
-        return false;
-    }
-    for (uint32_t uTexture = 0; uTexture < MAX_RESOURCE_BINDINGS; ++uTexture)
-    {
-        uint32_t uSampler(pShader->reflection.aui32SamplerMap[uTexture]);
-        if (uSampler != MAX_RESOURCE_BINDINGS)
-        {
-            if (!DXBCWriteUint32(kOutput, uTexture) ||
-                !DXBCWriteUint32(kOutput, uSampler))
-            {
-                return false;
-            }
-        }
-    }
-    //for (uint32_t uSymbol = 0; uSymbol < pShader->reflection.ui32NumImports; ++uSymbol)
-    //{
-    //  if (!DXBCWriteUint32(kOutput, pShader->reflection.psImports[uSymbol].eType) ||
-    //      !DXBCWriteUint32(kOutput, pShader->reflection.psImports[uSymbol].ui32ID) ||
-    //      !DXBCWriteUint32(kOutput, pShader->reflection.psImports[uSymbol].ui32Value))
-    //      return false;
-    //}
-    //for (uint32_t uSymbol = 0; uSymbol < pShader->reflection.ui32NumExports; ++uSymbol)
-    //{
-    //  if (!DXBCWriteUint32(kOutput, pShader->reflection.psExports[uSymbol].eType) ||
-    //      !DXBCWriteUint32(kOutput, pShader->reflection.psExports[uSymbol].ui32ID) ||
-    //      !DXBCWriteUint32(kOutput, pShader->reflection.psExports[uSymbol].ui32Value))
-    //      return false;
-    //}
-    for (uint32_t uResource = 0; uResource < pShader->reflection.ui32NumResourceBindings; ++uResource)
-    {
-        ResourceBinding* rb = pShader->reflection.psResourceBindings + uResource;
-        if (uResource != MAX_RESOURCE_BINDINGS)
-        {
-            if (!DXBCWriteUint32(kOutput, uResource) ||
-                !DXBCWriteUint32(kOutput, rb->eBindArea))
-            {
-                return false;
-            }
-        }
-    }
-
-    if (!kOutput.Write(pShader->sourceCode, uGLSLSourceSize))
-    {
-        return false;
-    }
-    uOutSize += uGLSLChunkSize;
-
-    // Write total size and chunk index
-    if (!kOutput.SeekAbs(DXBC_SIZE_POSITION) ||
-        !DXBCWriteUint32(kOutput, uOutSize) ||
-        !kOutput.SeekAbs(DXBC_HEADER_SIZE) ||
-        !DXBCWriteUint32(kOutput, uNumChunksOut + 1))
-    {
-        return false;
-    }
-    for (uint32_t uChunk = 0; uChunk < uNumChunksOut; ++uChunk)
-    {
-        if (!DXBCWriteUint32(kOutput, auChunkOffsetsOut[uChunk]))
-        {
-            return false;
-        }
-    }
-    DXBCWriteUint32(kOutput, uGLSLChunkOffset);
-
-    return true;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/include/pstdint.h b/Code/Tools/HLSLCrossCompilerMETAL/include/pstdint.h
deleted file mode 100644
index 6998242aa1..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/include/pstdint.h
+++ /dev/null
@@ -1,801 +0,0 @@
-/*  A portable stdint.h
- ****************************************************************************
- *  BSD License:
- ****************************************************************************
- *
- *  Copyright (c) 2005-2011 Paul Hsieh
- *  All rights reserved.
- *  
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *  
- *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************
- *
- *  Version 0.1.12
- *
- *  The ANSI C standard committee, for the C99 standard, specified the
- *  inclusion of a new standard include file called stdint.h.  This is
- *  a very useful and long desired include file which contains several
- *  very precise definitions for integer scalar types that is
- *  critically important for making portable several classes of
- *  applications including cryptography, hashing, variable length
- *  integer libraries and so on.  But for most developers its likely
- *  useful just for programming sanity.
- *
- *  The problem is that most compiler vendors have decided not to
- *  implement the C99 standard, and the next C++ language standard
- *  (which has a lot more mindshare these days) will be a long time in
- *  coming and its unknown whether or not it will include stdint.h or
- *  how much adoption it will have.  Either way, it will be a long time
- *  before all compilers come with a stdint.h and it also does nothing
- *  for the extremely large number of compilers available today which
- *  do not include this file, or anything comparable to it.
- *
- *  So that's what this file is all about.  Its an attempt to build a
- *  single universal include file that works on as many platforms as
- *  possible to deliver what stdint.h is supposed to.  A few things
- *  that should be noted about this file:
- *
- *    1) It is not guaranteed to be portable and/or present an identical
- *       interface on all platforms.  The extreme variability of the
- *       ANSI C standard makes this an impossibility right from the
- *       very get go. Its really only meant to be useful for the vast
- *       majority of platforms that possess the capability of
- *       implementing usefully and precisely defined, standard sized
- *       integer scalars.  Systems which are not intrinsically 2s
- *       complement may produce invalid constants.
- *
- *    2) There is an unavoidable use of non-reserved symbols.
- *
- *    3) Other standard include files are invoked.
- *
- *    4) This file may come in conflict with future platforms that do
- *       include stdint.h.  The hope is that one or the other can be
- *       used with no real difference.
- *
- *    5) In the current verison, if your platform can't represent
- *       int32_t, int16_t and int8_t, it just dumps out with a compiler
- *       error.
- *
- *    6) 64 bit integers may or may not be defined.  Test for their
- *       presence with the test: #ifdef INT64_MAX or #ifdef UINT64_MAX.
- *       Note that this is different from the C99 specification which
- *       requires the existence of 64 bit support in the compiler.  If
- *       this is not defined for your platform, yet it is capable of
- *       dealing with 64 bits then it is because this file has not yet
- *       been extended to cover all of your system's capabilities.
- *
- *    7) (u)intptr_t may or may not be defined.  Test for its presence
- *       with the test: #ifdef PTRDIFF_MAX.  If this is not defined
- *       for your platform, then it is because this file has not yet
- *       been extended to cover all of your system's capabilities, not
- *       because its optional.
- *
- *    8) The following might not been defined even if your platform is
- *       capable of defining it:
- *
- *       WCHAR_MIN
- *       WCHAR_MAX
- *       (u)int64_t
- *       PTRDIFF_MIN
- *       PTRDIFF_MAX
- *       (u)intptr_t
- *
- *    9) The following have not been defined:
- *
- *       WINT_MIN
- *       WINT_MAX
- *
- *   10) The criteria for defining (u)int_least(*)_t isn't clear,
- *       except for systems which don't have a type that precisely
- *       defined 8, 16, or 32 bit types (which this include file does
- *       not support anyways). Default definitions have been given.
- *
- *   11) The criteria for defining (u)int_fast(*)_t isn't something I
- *       would trust to any particular compiler vendor or the ANSI C
- *       committee.  It is well known that "compatible systems" are
- *       commonly created that have very different performance
- *       characteristics from the systems they are compatible with,
- *       especially those whose vendors make both the compiler and the
- *       system.  Default definitions have been given, but its strongly
- *       recommended that users never use these definitions for any
- *       reason (they do *NOT* deliver any serious guarantee of
- *       improved performance -- not in this file, nor any vendor's
- *       stdint.h).
- *
- *   12) The following macros:
- *
- *       PRINTF_INTMAX_MODIFIER
- *       PRINTF_INT64_MODIFIER
- *       PRINTF_INT32_MODIFIER
- *       PRINTF_INT16_MODIFIER
- *       PRINTF_LEAST64_MODIFIER
- *       PRINTF_LEAST32_MODIFIER
- *       PRINTF_LEAST16_MODIFIER
- *       PRINTF_INTPTR_MODIFIER
- *
- *       are strings which have been defined as the modifiers required
- *       for the "d", "u" and "x" printf formats to correctly output
- *       (u)intmax_t, (u)int64_t, (u)int32_t, (u)int16_t, (u)least64_t,
- *       (u)least32_t, (u)least16_t and (u)intptr_t types respectively.
- *       PRINTF_INTPTR_MODIFIER is not defined for some systems which
- *       provide their own stdint.h.  PRINTF_INT64_MODIFIER is not
- *       defined if INT64_MAX is not defined.  These are an extension
- *       beyond what C99 specifies must be in stdint.h.
- *
- *       In addition, the following macros are defined:
- *
- *       PRINTF_INTMAX_HEX_WIDTH
- *       PRINTF_INT64_HEX_WIDTH
- *       PRINTF_INT32_HEX_WIDTH
- *       PRINTF_INT16_HEX_WIDTH
- *       PRINTF_INT8_HEX_WIDTH
- *       PRINTF_INTMAX_DEC_WIDTH
- *       PRINTF_INT64_DEC_WIDTH
- *       PRINTF_INT32_DEC_WIDTH
- *       PRINTF_INT16_DEC_WIDTH
- *       PRINTF_INT8_DEC_WIDTH
- *
- *       Which specifies the maximum number of characters required to
- *       print the number of that type in either hexadecimal or decimal.
- *       These are an extension beyond what C99 specifies must be in
- *       stdint.h.
- *
- *  Compilers tested (all with 0 warnings at their highest respective
- *  settings): Borland Turbo C 2.0, WATCOM C/C++ 11.0 (16 bits and 32
- *  bits), Microsoft Visual C++ 6.0 (32 bit), Microsoft Visual Studio
- *  .net (VC7), Intel C++ 4.0, GNU gcc v3.3.3
- *
- *  This file should be considered a work in progress.  Suggestions for
- *  improvements, especially those which increase coverage are strongly
- *  encouraged.
- *
- *  Acknowledgements
- *
- *  The following people have made significant contributions to the
- *  development and testing of this file:
- *
- *  Chris Howie
- *  John Steele Scott
- *  Dave Thorup
- *  John Dill
- *
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-#include <stddef.h>
-#include <limits.h>
-#include <signal.h>
-
-/*
- *  For gcc with _STDINT_H, fill in the PRINTF_INT*_MODIFIER macros, and
- *  do nothing else.  On the Mac OS X version of gcc this is _STDINT_H_.
- */
-
-#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined (__UINT_FAST64_TYPE__)) )) && !defined (_PSTDINT_H_INCLUDED)
-#include <stdint.h>
-#define _PSTDINT_H_INCLUDED
-# ifndef PRINTF_INT64_MODIFIER
-#  define PRINTF_INT64_MODIFIER "ll"
-# endif
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-# ifndef PRINTF_INTMAX_MODIFIER
-#  define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
-# endif
-# ifndef PRINTF_INT64_HEX_WIDTH
-#  define PRINTF_INT64_HEX_WIDTH "16"
-# endif
-# ifndef PRINTF_INT32_HEX_WIDTH
-#  define PRINTF_INT32_HEX_WIDTH "8"
-# endif
-# ifndef PRINTF_INT16_HEX_WIDTH
-#  define PRINTF_INT16_HEX_WIDTH "4"
-# endif
-# ifndef PRINTF_INT8_HEX_WIDTH
-#  define PRINTF_INT8_HEX_WIDTH "2"
-# endif
-# ifndef PRINTF_INT64_DEC_WIDTH
-#  define PRINTF_INT64_DEC_WIDTH "20"
-# endif
-# ifndef PRINTF_INT32_DEC_WIDTH
-#  define PRINTF_INT32_DEC_WIDTH "10"
-# endif
-# ifndef PRINTF_INT16_DEC_WIDTH
-#  define PRINTF_INT16_DEC_WIDTH "5"
-# endif
-# ifndef PRINTF_INT8_DEC_WIDTH
-#  define PRINTF_INT8_DEC_WIDTH "3"
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
-# endif
-
-/*
- *  Something really weird is going on with Open Watcom.  Just pull some of
- *  these duplicated definitions from Open Watcom's stdint.h file for now.
- */
-
-# if defined (__WATCOMC__) && __WATCOMC__ >= 1250
-#  if !defined (INT64_C)
-#   define INT64_C(x)   (x + (INT64_MAX - INT64_MAX))
-#  endif
-#  if !defined (UINT64_C)
-#   define UINT64_C(x)  (x + (UINT64_MAX - UINT64_MAX))
-#  endif
-#  if !defined (INT32_C)
-#   define INT32_C(x)   (x + (INT32_MAX - INT32_MAX))
-#  endif
-#  if !defined (UINT32_C)
-#   define UINT32_C(x)  (x + (UINT32_MAX - UINT32_MAX))
-#  endif
-#  if !defined (INT16_C)
-#   define INT16_C(x)   (x)
-#  endif
-#  if !defined (UINT16_C)
-#   define UINT16_C(x)  (x)
-#  endif
-#  if !defined (INT8_C)
-#   define INT8_C(x)   (x)
-#  endif
-#  if !defined (UINT8_C)
-#   define UINT8_C(x)  (x)
-#  endif
-#  if !defined (UINT64_MAX)
-#   define UINT64_MAX  18446744073709551615ULL
-#  endif
-#  if !defined (INT64_MAX)
-#   define INT64_MAX  9223372036854775807LL
-#  endif
-#  if !defined (UINT32_MAX)
-#   define UINT32_MAX  4294967295UL
-#  endif
-#  if !defined (INT32_MAX)
-#   define INT32_MAX  2147483647L
-#  endif
-#  if !defined (INTMAX_MAX)
-#   define INTMAX_MAX INT64_MAX
-#  endif
-#  if !defined (INTMAX_MIN)
-#   define INTMAX_MIN INT64_MIN
-#  endif
-# endif
-#endif
-
-#ifndef _PSTDINT_H_INCLUDED
-#define _PSTDINT_H_INCLUDED
-
-#ifndef SIZE_MAX
-# define SIZE_MAX (~(size_t)0)
-#endif
-
-/*
- *  Deduce the type assignments from limits.h under the assumption that
- *  integer sizes in bits are powers of 2, and follow the ANSI
- *  definitions.
- */
-
-#ifndef UINT8_MAX
-# define UINT8_MAX 0xff
-#endif
-#ifndef uint8_t
-# if (UCHAR_MAX == UINT8_MAX) || defined (S_SPLINT_S)
-    typedef unsigned char uint8_t;
-#   define UINT8_C(v) ((uint8_t) v)
-# else
-#   error "Platform not supported"
-# endif
-#endif
-
-#ifndef INT8_MAX
-# define INT8_MAX 0x7f
-#endif
-#ifndef INT8_MIN
-# define INT8_MIN INT8_C(0x80)
-#endif
-#ifndef int8_t
-# if (SCHAR_MAX == INT8_MAX) || defined (S_SPLINT_S)
-    typedef signed char int8_t;
-#   define INT8_C(v) ((int8_t) v)
-# else
-#   error "Platform not supported"
-# endif
-#endif
-
-#ifndef UINT16_MAX
-# define UINT16_MAX 0xffff
-#endif
-#ifndef uint16_t
-#if (UINT_MAX == UINT16_MAX) || defined (S_SPLINT_S)
-  typedef unsigned int uint16_t;
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER ""
-# endif
-# define UINT16_C(v) ((uint16_t) (v))
-#elif (USHRT_MAX == UINT16_MAX)
-  typedef unsigned short uint16_t;
-# define UINT16_C(v) ((uint16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef INT16_MAX
-# define INT16_MAX 0x7fff
-#endif
-#ifndef INT16_MIN
-# define INT16_MIN INT16_C(0x8000)
-#endif
-#ifndef int16_t
-#if (INT_MAX == INT16_MAX) || defined (S_SPLINT_S)
-  typedef signed int int16_t;
-# define INT16_C(v) ((int16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER ""
-# endif
-#elif (SHRT_MAX == INT16_MAX)
-  typedef signed short int16_t;
-# define INT16_C(v) ((int16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef UINT32_MAX
-# define UINT32_MAX (0xffffffffUL)
-#endif
-#ifndef uint32_t
-#if (ULONG_MAX == UINT32_MAX) || defined (S_SPLINT_S)
-  typedef unsigned long uint32_t;
-# define UINT32_C(v) v ## UL
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-#elif (UINT_MAX == UINT32_MAX)
-  typedef unsigned int uint32_t;
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-# define UINT32_C(v) v ## U
-#elif (USHRT_MAX == UINT32_MAX)
-  typedef unsigned short uint32_t;
-# define UINT32_C(v) ((unsigned short) (v))
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef INT32_MAX
-# define INT32_MAX (0x7fffffffL)
-#endif
-#ifndef INT32_MIN
-# define INT32_MIN INT32_C(0x80000000)
-#endif
-#ifndef int32_t
-#if (LONG_MAX == INT32_MAX) || defined (S_SPLINT_S)
-  typedef signed long int32_t;
-# define INT32_C(v) v ## L
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-#elif (INT_MAX == INT32_MAX)
-  typedef signed int int32_t;
-# define INT32_C(v) v
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#elif (SHRT_MAX == INT32_MAX)
-  typedef signed short int32_t;
-# define INT32_C(v) ((short) (v))
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-/*
- *  The macro stdint_int64_defined is temporarily used to record
- *  whether or not 64 integer support is available.  It must be
- *  defined for any 64 integer extensions for new platforms that are
- *  added.
- */
-
-#undef stdint_int64_defined
-#if (defined(__STDC__) && defined(__STDC_VERSION__)) || defined (S_SPLINT_S)
-# if (__STDC__ && __STDC_VERSION__ >= 199901L) || defined (S_SPLINT_S)
-#  define stdint_int64_defined
-   typedef long long int64_t;
-   typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# endif
-#endif
-
-#if !defined (stdint_int64_defined)
-# if defined(__GNUC__)
-#  define stdint_int64_defined
-   __extension__ typedef long long int64_t;
-   __extension__ typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# elif defined(__MWERKS__) || defined (__SUNPRO_C) || defined (__SUNPRO_CC) || defined (__APPLE_CC__) || defined (_LONG_LONG) || defined (_CRAYC) || defined (S_SPLINT_S)
-#  define stdint_int64_defined
-   typedef long long int64_t;
-   typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined (__BORLANDC__) && __BORLANDC__ > 0x460) || defined (__alpha) || defined (__DECC)
-#  define stdint_int64_defined
-   typedef __int64 int64_t;
-   typedef unsigned __int64 uint64_t;
-#  define UINT64_C(v) v ## UI64
-#  define  INT64_C(v) v ## I64
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "I64"
-#  endif
-# endif
-#endif
-
-#if !defined (LONG_LONG_MAX) && defined (INT64_C)
-# define LONG_LONG_MAX INT64_C (9223372036854775807)
-#endif
-#ifndef ULONG_LONG_MAX
-# define ULONG_LONG_MAX UINT64_C (18446744073709551615)
-#endif
-
-#if !defined (INT64_MAX) && defined (INT64_C)
-# define INT64_MAX INT64_C (9223372036854775807)
-#endif
-#if !defined (INT64_MIN) && defined (INT64_C)
-# define INT64_MIN INT64_C (-9223372036854775808)
-#endif
-#if !defined (UINT64_MAX) && defined (INT64_C)
-# define UINT64_MAX UINT64_C (18446744073709551615)
-#endif
-
-/*
- *  Width of hexadecimal for number field.
- */
-
-#ifndef PRINTF_INT64_HEX_WIDTH
-# define PRINTF_INT64_HEX_WIDTH "16"
-#endif
-#ifndef PRINTF_INT32_HEX_WIDTH
-# define PRINTF_INT32_HEX_WIDTH "8"
-#endif
-#ifndef PRINTF_INT16_HEX_WIDTH
-# define PRINTF_INT16_HEX_WIDTH "4"
-#endif
-#ifndef PRINTF_INT8_HEX_WIDTH
-# define PRINTF_INT8_HEX_WIDTH "2"
-#endif
-
-#ifndef PRINTF_INT64_DEC_WIDTH
-# define PRINTF_INT64_DEC_WIDTH "20"
-#endif
-#ifndef PRINTF_INT32_DEC_WIDTH
-# define PRINTF_INT32_DEC_WIDTH "10"
-#endif
-#ifndef PRINTF_INT16_DEC_WIDTH
-# define PRINTF_INT16_DEC_WIDTH "5"
-#endif
-#ifndef PRINTF_INT8_DEC_WIDTH
-# define PRINTF_INT8_DEC_WIDTH "3"
-#endif
-
-/*
- *  Ok, lets not worry about 128 bit integers for now.  Moore's law says
- *  we don't need to worry about that until about 2040 at which point
- *  we'll have bigger things to worry about.
- */
-
-#ifdef stdint_int64_defined
-  typedef int64_t intmax_t;
-  typedef uint64_t uintmax_t;
-# define  INTMAX_MAX   INT64_MAX
-# define  INTMAX_MIN   INT64_MIN
-# define UINTMAX_MAX  UINT64_MAX
-# define UINTMAX_C(v) UINT64_C(v)
-# define  INTMAX_C(v)  INT64_C(v)
-# ifndef PRINTF_INTMAX_MODIFIER
-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
-# endif
-#else
-  typedef int32_t intmax_t;
-  typedef uint32_t uintmax_t;
-# define  INTMAX_MAX   INT32_MAX
-# define UINTMAX_MAX  UINT32_MAX
-# define UINTMAX_C(v) UINT32_C(v)
-# define  INTMAX_C(v)  INT32_C(v)
-# ifndef PRINTF_INTMAX_MODIFIER
-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT32_MODIFIER
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT32_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT32_DEC_WIDTH
-# endif
-#endif
-
-/*
- *  Because this file currently only supports platforms which have
- *  precise powers of 2 as bit sizes for the default integers, the
- *  least definitions are all trivial.  Its possible that a future
- *  version of this file could have different definitions.
- */
-
-#ifndef stdint_least_defined
-  typedef   int8_t   int_least8_t;
-  typedef  uint8_t  uint_least8_t;
-  typedef  int16_t  int_least16_t;
-  typedef uint16_t uint_least16_t;
-  typedef  int32_t  int_least32_t;
-  typedef uint32_t uint_least32_t;
-# define PRINTF_LEAST32_MODIFIER PRINTF_INT32_MODIFIER
-# define PRINTF_LEAST16_MODIFIER PRINTF_INT16_MODIFIER
-# define  UINT_LEAST8_MAX  UINT8_MAX
-# define   INT_LEAST8_MAX   INT8_MAX
-# define UINT_LEAST16_MAX UINT16_MAX
-# define  INT_LEAST16_MAX  INT16_MAX
-# define UINT_LEAST32_MAX UINT32_MAX
-# define  INT_LEAST32_MAX  INT32_MAX
-# define   INT_LEAST8_MIN   INT8_MIN
-# define  INT_LEAST16_MIN  INT16_MIN
-# define  INT_LEAST32_MIN  INT32_MIN
-# ifdef stdint_int64_defined
-    typedef  int64_t  int_least64_t;
-    typedef uint64_t uint_least64_t;
-#   define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER
-#   define UINT_LEAST64_MAX UINT64_MAX
-#   define  INT_LEAST64_MAX  INT64_MAX
-#   define  INT_LEAST64_MIN  INT64_MIN
-# endif
-#endif
-#undef stdint_least_defined
-
-/*
- *  The ANSI C committee pretending to know or specify anything about
- *  performance is the epitome of misguided arrogance.  The mandate of
- *  this file is to *ONLY* ever support that absolute minimum
- *  definition of the fast integer types, for compatibility purposes.
- *  No extensions, and no attempt to suggest what may or may not be a
- *  faster integer type will ever be made in this file.  Developers are
- *  warned to stay away from these types when using this or any other
- *  stdint.h.
- */
-
-typedef   int_least8_t   int_fast8_t;
-typedef  uint_least8_t  uint_fast8_t;
-typedef  int_least16_t  int_fast16_t;
-typedef uint_least16_t uint_fast16_t;
-typedef  int_least32_t  int_fast32_t;
-typedef uint_least32_t uint_fast32_t;
-#define  UINT_FAST8_MAX  UINT_LEAST8_MAX
-#define   INT_FAST8_MAX   INT_LEAST8_MAX
-#define UINT_FAST16_MAX UINT_LEAST16_MAX
-#define  INT_FAST16_MAX  INT_LEAST16_MAX
-#define UINT_FAST32_MAX UINT_LEAST32_MAX
-#define  INT_FAST32_MAX  INT_LEAST32_MAX
-#define   INT_FAST8_MIN   INT_LEAST8_MIN
-#define  INT_FAST16_MIN  INT_LEAST16_MIN
-#define  INT_FAST32_MIN  INT_LEAST32_MIN
-#ifdef stdint_int64_defined
-  typedef  int_least64_t  int_fast64_t;
-  typedef uint_least64_t uint_fast64_t;
-# define UINT_FAST64_MAX UINT_LEAST64_MAX
-# define  INT_FAST64_MAX  INT_LEAST64_MAX
-# define  INT_FAST64_MIN  INT_LEAST64_MIN
-#endif
-
-#undef stdint_int64_defined
-
-/*
- *  Whatever piecemeal, per compiler thing we can do about the wchar_t
- *  type limits.
- */
-
-#if defined(__WATCOMC__) || defined(_MSC_VER) || defined (__GNUC__)
-# include <wchar.h>
-# ifndef WCHAR_MIN
-#  define WCHAR_MIN 0
-# endif
-# ifndef WCHAR_MAX
-#  define WCHAR_MAX ((wchar_t)-1)
-# endif
-#endif
-
-/*
- *  Whatever piecemeal, per compiler/platform thing we can do about the
- *  (u)intptr_t types and limits.
- */
-
-#if defined (_MSC_VER) && defined (_UINTPTR_T_DEFINED)
-# define STDINT_H_UINTPTR_T_DEFINED
-#endif
-
-#ifndef STDINT_H_UINTPTR_T_DEFINED
-# if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (_WIN64)
-#  define stdint_intptr_bits 64
-# elif defined (__WATCOMC__) || defined (__TURBOC__)
-#  if defined(__TINY__) || defined(__SMALL__) || defined(__MEDIUM__)
-#    define stdint_intptr_bits 16
-#  else
-#    define stdint_intptr_bits 32
-#  endif
-# elif defined (__i386__) || defined (_WIN32) || defined (WIN32)
-#  define stdint_intptr_bits 32
-# elif defined (__INTEL_COMPILER)
-/* TODO -- what did Intel do about x86-64? */
-# endif
-
-# ifdef stdint_intptr_bits
-#  define stdint_intptr_glue3_i(a,b,c)  a##b##c
-#  define stdint_intptr_glue3(a,b,c)    stdint_intptr_glue3_i(a,b,c)
-#  ifndef PRINTF_INTPTR_MODIFIER
-#    define PRINTF_INTPTR_MODIFIER      stdint_intptr_glue3(PRINTF_INT,stdint_intptr_bits,_MODIFIER)
-#  endif
-#  ifndef PTRDIFF_MAX
-#    define PTRDIFF_MAX                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef PTRDIFF_MIN
-#    define PTRDIFF_MIN                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
-#  endif
-#  ifndef UINTPTR_MAX
-#    define UINTPTR_MAX                 stdint_intptr_glue3(UINT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef INTPTR_MAX
-#    define INTPTR_MAX                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef INTPTR_MIN
-#    define INTPTR_MIN                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
-#  endif
-#  ifndef INTPTR_C
-#    define INTPTR_C(x)                 stdint_intptr_glue3(INT,stdint_intptr_bits,_C)(x)
-#  endif
-#  ifndef UINTPTR_C
-#    define UINTPTR_C(x)                stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x)
-#  endif
-  typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;
-  typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;
-# else
-/* TODO -- This following is likely wrong for some platforms, and does
-   nothing for the definition of uintptr_t. */
-  typedef ptrdiff_t intptr_t;
-# endif
-# define STDINT_H_UINTPTR_T_DEFINED
-#endif
-
-/*
- *  Assumes sig_atomic_t is signed and we have a 2s complement machine.
- */
-
-#ifndef SIG_ATOMIC_MAX
-# define SIG_ATOMIC_MAX ((((sig_atomic_t) 1) << (sizeof (sig_atomic_t)*CHAR_BIT-1)) - 1)
-#endif
-
-#endif
-
-#if defined (__TEST_PSTDINT_FOR_CORRECTNESS)
-
-/* 
- *  Please compile with the maximum warning settings to make sure macros are not
- *  defined more than once.
- */
- 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
- 
-#define glue3_aux(x,y,z) x ## y ## z
-#define glue3(x,y,z) glue3_aux(x,y,z)
-
-#define DECLU(bits) glue3(uint,bits,_t) glue3(u,bits,=) glue3(UINT,bits,_C) (0);
-#define DECLI(bits) glue3(int,bits,_t) glue3(i,bits,=) glue3(INT,bits,_C) (0);
-
-#define DECL(us,bits) glue3(DECL,us,) (bits)
-
-#define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits)
- 
-int main () {
-    DECL(I,8)
-    DECL(U,8)
-    DECL(I,16)
-    DECL(U,16)
-    DECL(I,32)
-    DECL(U,32)
-#ifdef INT64_MAX
-    DECL(I,64)
-    DECL(U,64)
-#endif
-    intmax_t imax = INTMAX_C(0);
-    uintmax_t umax = UINTMAX_C(0);
-    char str0[256], str1[256];
-
-    sprintf (str0, "%d %x\n", 0, ~0);
-    
-    sprintf (str1, "%d %x\n",  i8, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1);
-    sprintf (str1, "%u %x\n",  u8, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with u8 : %s\n", str1);
-    sprintf (str1, "%d %x\n",  i16, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1);
-    sprintf (str1, "%u %x\n",  u16, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1);    
-    sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n",  i32, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1);
-    sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n",  u32, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1);
-#ifdef INT64_MAX    
-    sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n",  i64, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1);
-#endif
-    sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n",  imax, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1);
-    sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n",  umax, ~0);
-    if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1);    
-    
-    TESTUMAX(8);
-    TESTUMAX(16);
-    TESTUMAX(32);
-#ifdef INT64_MAX
-    TESTUMAX(64);
-#endif
-
-    return EXIT_SUCCESS;
-}
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/jni/Android.mk b/Code/Tools/HLSLCrossCompilerMETAL/jni/Android.mk
deleted file mode 100644
index 66e2bb4ecf..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/jni/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Android Makefile conversion
-# 
-# Leander Beernaert
-#
-# How to build: $ANDROID_NDK/ndk-build 
-#
-VERSION=1.17
-
-LOCAL_PATH := $(call my-dir)/../
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_ARM_NEON := true
-
-LOCAL_MODULE    := HLSLcc
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/include \
-	$(LOCAL_PATH)/src \
-	$(LOCAL_PATH)/src/cbstring
-LOCAL_CFLAGS += -Wall -W
-# For dynamic library
-#LOCAL_CFLAGS += -DHLSLCC_DYNLIB
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/src/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/cbstring/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/internal_includes/*.c)
-#LOCAL_LDLIBS += -lGLESv3
-
-include $(BUILD_STATIC_LIBRARY)
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/jni/Application.mk b/Code/Tools/HLSLCrossCompilerMETAL/jni/Application.mk
deleted file mode 100644
index a8ae0839b1..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/jni/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-APP_PLATFORM := android-18
-APP_ABI := armeabi-v7a
-APP_OPTIM := release
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/android-armeabi-v7a/libHLSLcc.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/android-armeabi-v7a/libHLSLcc.a
deleted file mode 100644
index 79305b66b7..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/android-armeabi-v7a/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3469d419dc589eb7a68be97885d7a55b8b0bbbffd74c5c1586959be4698fb273
-size 1046940
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/ios/libHLSLcc.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/ios/libHLSLcc.a
deleted file mode 100644
index 7ecdd304eb..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/ios/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98fbcc0779c4a400530ad643e1125727c50fdbf01912f059ca296153f209eec5
-size 466488
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/linux/libHLSLcc.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/linux/libHLSLcc.a
deleted file mode 100644
index c76e85704a..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/linux/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:270583c8762539856bf9f7c7cccf743c37db7fd4128cabd8fdfcfe3586177e27
-size 360488
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/linux/libHLSLcc_d.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/linux/libHLSLcc_d.a
deleted file mode 100644
index ee23387576..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/linux/libHLSLcc_d.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85f1fcddb62db461ff1012f91c38d323591a220ef3f6c1e41277161a43959333
-size 1139822
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/mac/libHLSLcc.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/mac/libHLSLcc.a
deleted file mode 100644
index 85bf31eed4..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/mac/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af9216c54d23dd3754f7ae18d56b97ae256eb29a0046d8e0d2a0716054d8c230
-size 218888
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/mac/libHLSLcc_d.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/mac/libHLSLcc_d.a
deleted file mode 100644
index 00095a3615..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/mac/libHLSLcc_d.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a07bec349614cdd3e40c3577bddace1203148016f9276c7ef807bdbc37dcabf
-size 671232
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/steamos/libHLSLcc.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/steamos/libHLSLcc.a
deleted file mode 100644
index c7b92fcc1e..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/steamos/libHLSLcc.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88acec4cedad5699900ec2d1a3ce83ab5e9365ebea4b4af0ababba562382f399
-size 296852
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/steamos/libHLSLcc_d.a b/Code/Tools/HLSLCrossCompilerMETAL/lib/steamos/libHLSLcc_d.a
deleted file mode 100644
index 29dd7fbf7a..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/steamos/libHLSLcc_d.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c0625b7f534df5817646dd1335f9d7916389f27a83b7d118fadab504064d910
-size 1144250
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/Debug/libHLSLcc.lib b/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/Debug/libHLSLcc.lib
deleted file mode 100644
index 311dec443e..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/Debug/libHLSLcc.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4d128256b757a7e800514482f1278348b489db53be2548b7770d701eece7ea9
-size 1022450
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/Release/libHLSLcc.lib b/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/Release/libHLSLcc.lib
deleted file mode 100644
index d7fda333b7..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/Release/libHLSLcc.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d037d414fea62daf076b41ad1a0ffbb451fcaf4443f8b2f721166a4a33fe5865
-size 632236
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/libHLSLcc.lib b/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/libHLSLcc.lib
deleted file mode 100644
index d531d2635f..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/win32/libHLSLcc.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e8d6023a2afd3db8f8bc6033db3d937d5a9ec635a9005bbc0dca121a196b2bb
-size 428768
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/win64/Release/libHLSLcc.lib b/Code/Tools/HLSLCrossCompilerMETAL/lib/win64/Release/libHLSLcc.lib
deleted file mode 100644
index d167e54c31..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/win64/Release/libHLSLcc.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7d890fdabc3b8cb4f61e10140090455bae656ec6d3fc8fa6460d96435120186
-size 809218
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/lib/win64/libHLSLcc.lib b/Code/Tools/HLSLCrossCompilerMETAL/lib/win64/libHLSLcc.lib
deleted file mode 100644
index 5135e7e081..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/lib/win64/libHLSLcc.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:caa74b7cebff2b35d0db9bb8b2eb70065ca7f5816a93004e8fa195aabefefe18
-size 600034
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/license.txt b/Code/Tools/HLSLCrossCompilerMETAL/license.txt
deleted file mode 100644
index e20caeefef..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/license.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Copyright (c) 2012 James Jones
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-This software makes use of the bstring library which is provided under the following license:
-
-Copyright (c) 2002-2008 Paul Hsieh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, 
-    this list of conditions and the following disclaimer. 
-
-    Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution. 
-
-    Neither the name of bstrlib nor the names of its contributors may be used 
-    to endorse or promote products derived from this software without 
-    specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/README b/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/README
deleted file mode 100644
index 7531c049a6..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/README
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-  Copyright (c) 2009 Dave Gamble
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-Welcome to cJSON.
-
-cJSON aims to be the dumbest possible parser that you can get your job done with.
-It's a single file of C, and a single header file.
-
-JSON is described best here: http://www.json.org/
-It's like XML, but fat-free. You use it to move data around, store things, or just
-generally represent your program's state.
-
-
-First up, how do I build?
-Add cJSON.c to your project, and put cJSON.h somewhere in the header search path.
-For example, to build the test app:
-
-gcc cJSON.c test.c -o test -lm
-./test
-
-
-As a library, cJSON exists to take away as much legwork as it can, but not get in your way.
-As a point of pragmatism (i.e. ignoring the truth), I'm going to say that you can use it
-in one of two modes: Auto and Manual. Let's have a quick run-through.
-
-
-I lifted some JSON from this page: http://www.json.org/fatfree.html
-That page inspired me to write cJSON, which is a parser that tries to share the same
-philosophy as JSON itself. Simple, dumb, out of the way.
-
-Some JSON:
-{
-    "name": "Jack (\"Bee\") Nimble", 
-    "format": {
-        "type":       "rect", 
-        "width":      1920, 
-        "height":     1080, 
-        "interlace":  false, 
-        "frame rate": 24
-    }
-}
-
-Assume that you got this from a file, a webserver, or magic JSON elves, whatever,
-you have a char * to it. Everything is a cJSON struct.
-Get it parsed:
-	cJSON *root = cJSON_Parse(my_json_string);
-
-This is an object. We're in C. We don't have objects. But we do have structs.
-What's the framerate?
-
-	cJSON *format = cJSON_GetObjectItem(root,"format");
-	int framerate = cJSON_GetObjectItem(format,"frame rate")->valueint;
-
-
-Want to change the framerate?
-	cJSON_GetObjectItem(format,"frame rate")->valueint=25;
-	
-Back to disk?
-	char *rendered=cJSON_Print(root);
-
-Finished? Delete the root (this takes care of everything else).
-	cJSON_Delete(root);
-
-That's AUTO mode. If you're going to use Auto mode, you really ought to check pointers
-before you dereference them. If you want to see how you'd build this struct in code?
-	cJSON *root,*fmt;
-	root=cJSON_CreateObject();	
-	cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
-	cJSON_AddItemToObject(root, "format", fmt=cJSON_CreateObject());
-	cJSON_AddStringToObject(fmt,"type",		"rect");
-	cJSON_AddNumberToObject(fmt,"width",		1920);
-	cJSON_AddNumberToObject(fmt,"height",		1080);
-	cJSON_AddFalseToObject (fmt,"interlace");
-	cJSON_AddNumberToObject(fmt,"frame rate",	24);
-
-Hopefully we can agree that's not a lot of code? There's no overhead, no unnecessary setup.
-Look at test.c for a bunch of nice examples, mostly all ripped off the json.org site, and
-a few from elsewhere.
-
-What about manual mode? First up you need some detail.
-Let's cover how the cJSON objects represent the JSON data.
-cJSON doesn't distinguish arrays from objects in handling; just type.
-Each cJSON has, potentially, a child, siblings, value, a name.
-
-The root object has: Object Type and a Child
-The Child has name "name", with value "Jack ("Bee") Nimble", and a sibling:
-Sibling has type Object, name "format", and a child.
-That child has type String, name "type", value "rect", and a sibling:
-Sibling has type Number, name "width", value 1920, and a sibling:
-Sibling has type Number, name "height", value 1080, and a sibling:
-Sibling hs type False, name "interlace", and a sibling:
-Sibling has type Number, name "frame rate", value 24
-
-Here's the structure:
-typedef struct cJSON {
-	struct cJSON *next,*prev;
-	struct cJSON *child;
-
-	int type;
-
-	char *valuestring;
-	int valueint;
-	double valuedouble;
-
-	char *string;
-} cJSON;
-
-By default all values are 0 unless set by virtue of being meaningful.
-
-next/prev is a doubly linked list of siblings. next takes you to your sibling,
-prev takes you back from your sibling to you.
-Only objects and arrays have a "child", and it's the head of the doubly linked list.
-A "child" entry will have prev==0, but next potentially points on. The last sibling has next=0.
-The type expresses Null/True/False/Number/String/Array/Object, all of which are #defined in
-cJSON.h
-
-A Number has valueint and valuedouble. If you're expecting an int, read valueint, if not read
-valuedouble.
-
-Any entry which is in the linked list which is the child of an object will have a "string"
-which is the "name" of the entry. When I said "name" in the above example, that's "string".
-"string" is the JSON name for the 'variable name' if you will.
-
-Now you can trivially walk the lists, recursively, and parse as you please.
-You can invoke cJSON_Parse to get cJSON to parse for you, and then you can take
-the root object, and traverse the structure (which is, formally, an N-tree),
-and tokenise as you please. If you wanted to build a callback style parser, this is how
-you'd do it (just an example, since these things are very specific):
-
-void parse_and_callback(cJSON *item,const char *prefix)
-{
-	while (item)
-	{
-		char *newprefix=malloc(strlen(prefix)+strlen(item->name)+2);
-		sprintf(newprefix,"%s/%s",prefix,item->name);
-		int dorecurse=callback(newprefix, item->type, item);
-		if (item->child && dorecurse) parse_and_callback(item->child,newprefix);
-		item=item->next;
-		free(newprefix);
-	}
-}
-
-The prefix process will build you a separated list, to simplify your callback handling.
-The 'dorecurse' flag would let the callback decide to handle sub-arrays on it's own, or
-let you invoke it per-item. For the item above, your callback might look like this:
-
-int callback(const char *name,int type,cJSON *item)
-{
-	if (!strcmp(name,"name"))	{ /* populate name */ }
-	else if (!strcmp(name,"format/type")	{ /* handle "rect" */ }
-	else if (!strcmp(name,"format/width")	{ /* 800 */ }
-	else if (!strcmp(name,"format/height")	{ /* 600 */ }
-	else if (!strcmp(name,"format/interlace")	{ /* false */ }
-	else if (!strcmp(name,"format/frame rate")	{ /* 24 */ }
-	return 1;
-}
-
-Alternatively, you might like to parse iteratively.
-You'd use:
-
-void parse_object(cJSON *item)
-{
-	int i; for (i=0;i<cJSON_GetArraySize(item);i++)
-	{
-		cJSON *subitem=cJSON_GetArrayItem(item,i);
-		// handle subitem.	
-	}
-}
-
-Or, for PROPER manual mode:
-
-void parse_object(cJSON *item)
-{
-	cJSON *subitem=item->child;
-	while (subitem)
-	{
-		// handle subitem
-		if (subitem->child) parse_object(subitem->child);
-		
-		subitem=subitem->next;
-	}
-}
-
-Of course, this should look familiar, since this is just a stripped-down version
-of the callback-parser.
-
-This should cover most uses you'll find for parsing. The rest should be possible
-to infer.. and if in doubt, read the source! There's not a lot of it! ;)
-
-
-In terms of constructing JSON data, the example code above is the right way to do it.
-You can, of course, hand your sub-objects to other functions to populate.
-Also, if you find a use for it, you can manually build the objects.
-For instance, suppose you wanted to build an array of objects?
-
-cJSON *objects[24];
-
-cJSON *Create_array_of_anything(cJSON **items,int num)
-{
-	int i;cJSON *prev, *root=cJSON_CreateArray();
-	for (i=0;i<24;i++)
-	{
-		if (!i)	root->child=objects[i];
-		else	prev->next=objects[i], objects[i]->prev=prev;
-		prev=objects[i];
-	}
-	return root;
-}
-	
-and simply: Create_array_of_anything(objects,24);
-
-cJSON doesn't make any assumptions about what order you create things in.
-You can attach the objects, as above, and later add children to each
-of those objects.
-
-As soon as you call cJSON_Print, it renders the structure to text.
-
-
-
-The test.c code shows how to handle a bunch of typical cases. If you uncomment
-the code, it'll load, parse and print a bunch of test files, also from json.org,
-which are more complex than I'd care to try and stash into a const char array[].
-
-
-Enjoy cJSON!
-
-
-- Dave Gamble, Aug 2009
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/cJSON.c b/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/cJSON.c
deleted file mode 100644
index 56fb753ee8..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/cJSON.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-  Copyright (c) 2009 Dave Gamble
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-// Modifications copyright Amazon.com, Inc. or its affiliates.
-
-/* cJSON */
-/* JSON parser in C. */
-
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include <float.h>
-#include <limits.h>
-#include <ctype.h>
-#include "cJSON.h"
-#include <AzCore/PlatformDef.h>
-
-static const char *ep;
-
-const char *cJSON_GetErrorPtr(void) {return ep;}
-
-static int cJSON_strcasecmp(const char *s1,const char *s2)
-{
-    if (!s1) return (s1==s2)?0:1;if (!s2) return 1;
-    for(; tolower(*s1) == tolower(*s2); ++s1, ++s2)    if(*s1 == 0)    return 0;
-    return tolower(*(const unsigned char *)s1) - tolower(*(const unsigned char *)s2);
-}
-
-AZ_PUSH_DISABLE_WARNING(4232, "-Wunknown-warning-option") // address of malloc/free are not static
-static void *(*cJSON_malloc)(size_t sz) = malloc;
-static void (*cJSON_free)(void *ptr) = free;
-AZ_POP_DISABLE_WARNING
-
-static char* cJSON_strdup(const char* str)
-{
-      size_t len = strlen(str) + 1;
-      char* copy = (char*)cJSON_malloc(len);
-
-      if (!copy) return 0;
-      memcpy(copy,str,len);
-      return copy;
-}
-
-void cJSON_InitHooks(cJSON_Hooks* hooks)
-{
-    if (!hooks) { /* Reset hooks */
-        cJSON_malloc = malloc;
-        cJSON_free = free;
-        return;
-    }
-
-    cJSON_malloc = (hooks->malloc_fn)?hooks->malloc_fn:malloc;
-    cJSON_free     = (hooks->free_fn)?hooks->free_fn:free;
-}
-
-/* Internal constructor. */
-static cJSON *cJSON_New_Item(void)
-{
-    cJSON* node = (cJSON*)cJSON_malloc(sizeof(cJSON));
-    if (node) memset(node,0,sizeof(cJSON));
-    return node;
-}
-
-/* Delete a cJSON structure. */
-void cJSON_Delete(cJSON *c)
-{
-    cJSON *next;
-    while (c)
-    {
-        next=c->next;
-        if (!(c->type&cJSON_IsReference) && c->child) cJSON_Delete(c->child);
-        if (!(c->type&cJSON_IsReference) && c->valuestring) cJSON_free(c->valuestring);
-        if (c->string) cJSON_free(c->string);
-        cJSON_free(c);
-        c=next;
-    }
-}
-
-/* Parse the input text to generate a number, and populate the result into item. */
-static const char *parse_number(cJSON *item,const char *num)
-{
-    double n=0,sign=1,scale=0;int subscale=0,signsubscale=1;
-
-    /* Could use sscanf for this? */
-    if (*num=='-') sign=-1,num++;    /* Has sign? */
-    if (*num=='0') num++;            /* is zero */
-    if (*num>='1' && *num<='9')    do    n=(n*10.0)+(*num++ -'0');    while (*num>='0' && *num<='9');    /* Number? */
-    if (*num=='.' && num[1]>='0' && num[1]<='9') {num++;        do    n=(n*10.0)+(*num++ -'0'),scale--; while (*num>='0' && *num<='9');}    /* Fractional part? */
-    if (*num=='e' || *num=='E')        /* Exponent? */
-    {    num++;if (*num=='+') num++;    else if (*num=='-') signsubscale=-1,num++;        /* With sign? */
-        while (*num>='0' && *num<='9') subscale=(subscale*10)+(*num++ - '0');    /* Number? */
-    }
-
-    n=sign*n*pow(10.0,(scale+subscale*signsubscale));    /* number = +/- number.fraction * 10^+/- exponent */
-    
-    item->valuedouble=n;
-    item->valueint=(int)n;
-    item->type=cJSON_Number;
-    return num;
-}
-
-/* Render the number nicely from the given item into a string. */
-static char *print_number(cJSON *item)
-{
-    char *str;
-    double d=item->valuedouble;
-    if (fabs(((double)item->valueint)-d)<=DBL_EPSILON && d<=INT_MAX && d>=INT_MIN)
-    {
-        str=(char*)cJSON_malloc(21);    /* 2^64+1 can be represented in 21 chars. */
-        if (str) sprintf(str,"%d",item->valueint);
-    }
-    else
-    {
-        str=(char*)cJSON_malloc(64);    /* This is a nice tradeoff. */
-        if (str)
-        {
-            if (fabs(floor(d)-d)<=DBL_EPSILON && fabs(d)<1.0e60)sprintf(str,"%.0f",d);
-            else if (fabs(d)<1.0e-6 || fabs(d)>1.0e9)            sprintf(str,"%e",d);
-            else                                                sprintf(str,"%f",d);
-        }
-    }
-    return str;
-}
-
-/* Parse the input text into an unescaped cstring, and populate item. */
-static const unsigned char firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-static const char *parse_string(cJSON *item,const char *str)
-{
-    const char *ptr=str+1;char *ptr2;char *out;int len=0;unsigned uc,uc2;
-    if (*str!='\"') {ep=str;return 0;}    /* not a string! */
-    
-    while (*ptr!='\"' && *ptr && ++len) if (*ptr++ == '\\') ptr++;    /* Skip escaped quotes. */
-    
-    out=(char*)cJSON_malloc(len+1);    /* This is how long we need for the string, roughly. */
-    if (!out) return 0;
-    
-    ptr=str+1;ptr2=out;
-    while (*ptr!='\"' && *ptr)
-    {
-        if (*ptr!='\\') *ptr2++=*ptr++;
-        else
-        {
-            ptr++;
-            switch (*ptr)
-            {
-                case 'b': *ptr2++='\b';    break;
-                case 'f': *ptr2++='\f';    break;
-                case 'n': *ptr2++='\n';    break;
-                case 'r': *ptr2++='\r';    break;
-                case 't': *ptr2++='\t';    break;
-                case 'u':     /* transcode utf16 to utf8. */
-                    sscanf(ptr+1,"%4x",&uc);ptr+=4;    /* get the unicode char. */
-
-                    if ((uc>=0xDC00 && uc<=0xDFFF) || uc==0)    break;    /* check for invalid.    */
-
-                    if (uc>=0xD800 && uc<=0xDBFF)    /* UTF16 surrogate pairs.    */
-                    {
-                        if (ptr[1]!='\\' || ptr[2]!='u')    break;    /* missing second-half of surrogate.    */
-                        sscanf(ptr+3,"%4x",&uc2);ptr+=6;
-                        if (uc2<0xDC00 || uc2>0xDFFF)        break;    /* invalid second-half of surrogate.    */
-                        uc=0x10000 + (((uc&0x3FF)<<10) | (uc2&0x3FF));
-                    }
-
-                    len=4;if (uc<0x80) len=1;else if (uc<0x800) len=2;else if (uc<0x10000) len=3; ptr2+=len;
-                    
-                    switch (len) {
-                        case 4: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                        case 3: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                        case 2: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                        case 1: *--ptr2 =(uc | firstByteMark[len]);
-                    }
-                    ptr2+=len;
-                    break;
-                default:  *ptr2++=*ptr; break;
-            }
-            ptr++;
-        }
-    }
-    *ptr2=0;
-    if (*ptr=='\"') ptr++;
-    item->valuestring=out;
-    item->type=cJSON_String;
-    return ptr;
-}
-
-/* Render the cstring provided to an escaped version that can be printed. */
-static char *print_string_ptr(const char *str)
-{
-    const char *ptr;char *ptr2,*out;int len=0;unsigned char token;
-    
-    if (!str) return cJSON_strdup("");
-    ptr=str;
-    token = *ptr;
-    while (token && ++len)
-    {
-        if (strchr("\"\\\b\f\n\r\t",token)) len++;
-        else if (token<32) len+=5;
-        ptr++;
-        token = *ptr;
-    }
-    
-    out=(char*)cJSON_malloc(len+3);
-    if (!out) return 0;
-
-    ptr2=out;ptr=str;
-    *ptr2++='\"';
-    while (*ptr)
-    {
-        if ((unsigned char)*ptr>31 && *ptr!='\"' && *ptr!='\\') *ptr2++=*ptr++;
-        else
-        {
-            *ptr2++='\\';
-            switch (token=*ptr++)
-            {
-                case '\\':    *ptr2++='\\';    break;
-                case '\"':    *ptr2++='\"';    break;
-                case '\b':    *ptr2++='b';    break;
-                case '\f':    *ptr2++='f';    break;
-                case '\n':    *ptr2++='n';    break;
-                case '\r':    *ptr2++='r';    break;
-                case '\t':    *ptr2++='t';    break;
-                default: sprintf(ptr2,"u%04x",token);ptr2+=5;    break;    /* escape and print */
-            }
-        }
-    }
-    *ptr2++='\"';*ptr2++=0;
-    return out;
-}
-/* Invote print_string_ptr (which is useful) on an item. */
-static char *print_string(cJSON *item)    {return print_string_ptr(item->valuestring);}
-
-/* Predeclare these prototypes. */
-static const char *parse_value(cJSON *item,const char *value);
-static char *print_value(cJSON *item,int depth,int fmt);
-static const char *parse_array(cJSON *item,const char *value);
-static char *print_array(cJSON *item,int depth,int fmt);
-static const char *parse_object(cJSON *item,const char *value);
-static char *print_object(cJSON *item,int depth,int fmt);
-
-/* Utility to jump whitespace and cr/lf */
-static const char *skip(const char *in) {while (in && *in && (unsigned char)*in<=32) in++; return in;}
-
-/* Parse an object - create a new root, and populate. */
-cJSON *cJSON_ParseWithOpts(const char *value,const char **return_parse_end,int require_null_terminated)
-{
-    const char *end=0;
-    cJSON *c=cJSON_New_Item();
-    ep=0;
-    if (!c) return 0;       /* memory fail */
-
-    end=parse_value(c,skip(value));
-    if (!end)    {cJSON_Delete(c);return 0;}    /* parse failure. ep is set. */
-
-    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
-    if (require_null_terminated) {end=skip(end);if (*end) {cJSON_Delete(c);ep=end;return 0;}}
-    if (return_parse_end) *return_parse_end=end;
-    return c;
-}
-/* Default options for cJSON_Parse */
-cJSON *cJSON_Parse(const char *value) {return cJSON_ParseWithOpts(value,0,0);}
-
-/* Render a cJSON item/entity/structure to text. */
-char *cJSON_Print(cJSON *item)                {return print_value(item,0,1);}
-char *cJSON_PrintUnformatted(cJSON *item)    {return print_value(item,0,0);}
-
-/* Parser core - when encountering text, process appropriately. */
-static const char *parse_value(cJSON *item,const char *value)
-{
-    if (!value)                        return 0;    /* Fail on null. */
-    if (!strncmp(value,"null",4))    { item->type=cJSON_NULL;  return value+4; }
-    if (!strncmp(value,"false",5))    { item->type=cJSON_False; return value+5; }
-    if (!strncmp(value,"true",4))    { item->type=cJSON_True; item->valueint=1;    return value+4; }
-    if (*value=='\"')                { return parse_string(item,value); }
-    if (*value=='-' || (*value>='0' && *value<='9'))    { return parse_number(item,value); }
-    if (*value=='[')                { return parse_array(item,value); }
-    if (*value=='{')                { return parse_object(item,value); }
-
-    ep=value;return 0;    /* failure. */
-}
-
-/* Render a value to text. */
-static char *print_value(cJSON *item,int depth,int fmt)
-{
-    char *out=0;
-    if (!item) return 0;
-    switch ((item->type)&255)
-    {
-        case cJSON_NULL:    out=cJSON_strdup("null");    break;
-        case cJSON_False:    out=cJSON_strdup("false");break;
-        case cJSON_True:    out=cJSON_strdup("true"); break;
-        case cJSON_Number:    out=print_number(item);break;
-        case cJSON_String:    out=print_string(item);break;
-        case cJSON_Array:    out=print_array(item,depth,fmt);break;
-        case cJSON_Object:    out=print_object(item,depth,fmt);break;
-    }
-    return out;
-}
-
-/* Build an array from input text. */
-static const char *parse_array(cJSON *item,const char *value)
-{
-    cJSON *child;
-    if (*value!='[')    {ep=value;return 0;}    /* not an array! */
-
-    item->type=cJSON_Array;
-    value=skip(value+1);
-    if (*value==']') return value+1;    /* empty array. */
-
-    item->child=child=cJSON_New_Item();
-    if (!item->child) return 0;         /* memory fail */
-    value=skip(parse_value(child,skip(value)));    /* skip any spacing, get the value. */
-    if (!value) return 0;
-
-    while (*value==',')
-    {
-        cJSON *new_item = cJSON_New_Item();
-        if (!new_item) return 0;     /* memory fail */
-        child->next=new_item;new_item->prev=child;child=new_item;
-        value=skip(parse_value(child,skip(value+1)));
-        if (!value) return 0;    /* memory fail */
-    }
-
-    if (*value==']') return value+1;    /* end of array */
-    ep=value;return 0;    /* malformed. */
-}
-
-/* Render an array to text */
-static char *print_array(cJSON *item,int depth,int fmt)
-{
-    char **entries;
-    char *out=0,*ptr,*ret;int len=5;
-    cJSON *child=item->child;
-    int numentries=0,i=0,fail=0;
-    
-    /* How many entries in the array? */
-    while (child) numentries++,child=child->next;
-    /* Explicitly handle numentries==0 */
-    if (!numentries)
-    {
-        out=(char*)cJSON_malloc(3);
-        if (out) strcpy(out,"[]");
-        return out;
-    }
-    /* Allocate an array to hold the values for each */
-    entries=(char**)cJSON_malloc(numentries*sizeof(char*));
-    if (!entries) return 0;
-    memset(entries,0,numentries*sizeof(char*));
-    /* Retrieve all the results: */
-    child=item->child;
-    while (child && !fail)
-    {
-        ret=print_value(child,depth+1,fmt);
-        entries[i++]=ret;
-        if (ret) len+=(int)strlen(ret)+2+(fmt?1:0); else fail=1;
-        child=child->next;
-    }
-    
-    /* If we didn't fail, try to malloc the output string */
-    if (!fail) out=(char*)cJSON_malloc(len);
-    /* If that fails, we fail. */
-    if (!out) fail=1;
-
-    /* Handle failure. */
-    if (fail)
-    {
-        for (i=0;i<numentries;i++) if (entries[i]) cJSON_free(entries[i]);
-        cJSON_free(entries);
-        return 0;
-    }
-    
-    /* Compose the output array. */
-    *out='[';
-    ptr=out+1;*ptr=0;
-    for (i=0;i<numentries;i++)
-    {
-        strcpy(ptr,entries[i]);ptr+=strlen(entries[i]);
-        if (i!=numentries-1) {*ptr++=',';if(fmt)*ptr++=' ';*ptr=0;}
-        cJSON_free(entries[i]);
-    }
-    cJSON_free(entries);
-    *ptr++=']';*ptr++=0;
-    return out;    
-}
-
-/* Build an object from the text. */
-static const char *parse_object(cJSON *item,const char *value)
-{
-    cJSON *child;
-    if (*value!='{')    {ep=value;return 0;}    /* not an object! */
-    
-    item->type=cJSON_Object;
-    value=skip(value+1);
-    if (*value=='}') return value+1;    /* empty array. */
-    
-    item->child=child=cJSON_New_Item();
-    if (!item->child) return 0;
-    value=skip(parse_string(child,skip(value)));
-    if (!value) return 0;
-    child->string=child->valuestring;child->valuestring=0;
-    if (*value!=':') {ep=value;return 0;}    /* fail! */
-    value=skip(parse_value(child,skip(value+1)));    /* skip any spacing, get the value. */
-    if (!value) return 0;
-    
-    while (*value==',')
-    {
-        cJSON *new_item = cJSON_New_Item();
-        if (!new_item)    return 0; /* memory fail */
-        child->next=new_item;new_item->prev=child;child=new_item;
-        value=skip(parse_string(child,skip(value+1)));
-        if (!value) return 0;
-        child->string=child->valuestring;child->valuestring=0;
-        if (*value!=':') {ep=value;return 0;}    /* fail! */
-        value=skip(parse_value(child,skip(value+1)));    /* skip any spacing, get the value. */
-        if (!value) return 0;
-    }
-    
-    if (*value=='}') return value+1;    /* end of array */
-    ep=value;return 0;    /* malformed. */
-}
-
-/* Render an object to text. */
-static char *print_object(cJSON *item,int depth,int fmt)
-{
-    char **entries=0,**names=0;
-    char *out=0,*ptr,*ret,*str;int len=7,i=0,j;
-    cJSON *child=item->child;
-    int numentries=0,fail=0;
-    /* Count the number of entries. */
-    while (child) numentries++,child=child->next;
-    /* Explicitly handle empty object case */
-    if (!numentries)
-    {
-        out=(char*)cJSON_malloc(fmt?depth+3:3);
-        if (!out)    return 0;
-        ptr=out;*ptr++='{';
-        if (fmt) {*ptr++='\n';for (i=0;i<depth-1;i++) *ptr++='\t';}
-        *ptr++='}';*ptr++=0;
-        return out;
-    }
-    /* Allocate space for the names and the objects */
-    entries=(char**)cJSON_malloc(numentries*sizeof(char*));
-    if (!entries) return 0;
-    names=(char**)cJSON_malloc(numentries*sizeof(char*));
-    if (!names) {cJSON_free(entries);return 0;}
-    memset(entries,0,sizeof(char*)*numentries);
-    memset(names,0,sizeof(char*)*numentries);
-
-    /* Collect all the results into our arrays: */
-    child=item->child;depth++;if (fmt) len+=depth;
-    while (child)
-    {
-        names[i]=str=print_string_ptr(child->string);
-        entries[i++]=ret=print_value(child,depth,fmt);
-        if (str && ret) len+=(int)(strlen(ret)+strlen(str))+2+(fmt?2+depth:0); else fail=1;
-        child=child->next;
-    }
-    
-    /* Try to allocate the output string */
-    if (!fail) out=(char*)cJSON_malloc(len);
-    if (!out) fail=1;
-
-    /* Handle failure */
-    if (fail)
-    {
-        for (i=0;i<numentries;i++) {if (names[i]) cJSON_free(names[i]);if (entries[i]) cJSON_free(entries[i]);}
-        cJSON_free(names);cJSON_free(entries);
-        return 0;
-    }
-    
-    /* Compose the output: */
-    *out='{';ptr=out+1;if (fmt)*ptr++='\n';*ptr=0;
-    for (i=0;i<numentries;i++)
-    {
-        if (fmt) for (j=0;j<depth;j++) *ptr++='\t';
-        strcpy(ptr,names[i]);ptr+=strlen(names[i]);
-        *ptr++=':';if (fmt) *ptr++='\t';
-        strcpy(ptr,entries[i]);ptr+=strlen(entries[i]);
-        if (i!=numentries-1) *ptr++=',';
-        if (fmt) *ptr++='\n';*ptr=0;
-        cJSON_free(names[i]);cJSON_free(entries[i]);
-    }
-    
-    cJSON_free(names);cJSON_free(entries);
-    if (fmt) for (i=0;i<depth-1;i++) *ptr++='\t';
-    *ptr++='}';*ptr++=0;
-    return out;    
-}
-
-/* Get Array size/item / object item. */
-int    cJSON_GetArraySize(cJSON *array)                            {cJSON *c=array->child;int i=0;while(c)i++,c=c->next;return i;}
-cJSON *cJSON_GetArrayItem(cJSON *array,int item)                {cJSON *c=array->child;  while (c && item>0) item--,c=c->next; return c;}
-cJSON *cJSON_GetObjectItem(cJSON *object,const char *string)    {cJSON *c=object->child; while (c && cJSON_strcasecmp(c->string,string)) c=c->next; return c;}
-
-/* Utility for array list handling. */
-static void suffix_object(cJSON *prev,cJSON *item) {prev->next=item;item->prev=prev;}
-/* Utility for handling references. */
-static cJSON *create_reference(cJSON *item) {cJSON *ref=cJSON_New_Item();if (!ref) return 0;memcpy(ref,item,sizeof(cJSON));ref->string=0;ref->type|=cJSON_IsReference;ref->next=ref->prev=0;return ref;}
-
-/* Add item to array/object. */
-void   cJSON_AddItemToArray(cJSON *array, cJSON *item)                        {cJSON *c=array->child;if (!item) return; if (!c) {array->child=item;} else {while (c && c->next) c=c->next; suffix_object(c,item);}}
-void   cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item)    {if (!item) return; if (item->string) cJSON_free(item->string);item->string=cJSON_strdup(string);cJSON_AddItemToArray(object,item);}
-void    cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)                        {cJSON_AddItemToArray(array,create_reference(item));}
-void    cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item)    {cJSON_AddItemToObject(object,string,create_reference(item));}
-
-cJSON *cJSON_DetachItemFromArray(cJSON *array,int which)            {cJSON *c=array->child;while (c && which>0) c=c->next,which--;if (!c) return 0;
-    if (c->prev) c->prev->next=c->next;if (c->next) c->next->prev=c->prev;if (c==array->child) array->child=c->next;c->prev=c->next=0;return c;}
-void   cJSON_DeleteItemFromArray(cJSON *array,int which)            {cJSON_Delete(cJSON_DetachItemFromArray(array,which));}
-cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string) {int i=0;cJSON *c=object->child;while (c && cJSON_strcasecmp(c->string,string)) i++,c=c->next;if (c) return cJSON_DetachItemFromArray(object,i);return 0;}
-void   cJSON_DeleteItemFromObject(cJSON *object,const char *string) {cJSON_Delete(cJSON_DetachItemFromObject(object,string));}
-
-/* Replace array/object items with new ones. */
-void   cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem)        {cJSON *c=array->child;while (c && which>0) c=c->next,which--;if (!c) return;
-    newitem->next=c->next;newitem->prev=c->prev;if (newitem->next) newitem->next->prev=newitem;
-    if (c==array->child) array->child=newitem; else newitem->prev->next=newitem;c->next=c->prev=0;cJSON_Delete(c);}
-void   cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem){int i=0;cJSON *c=object->child;while(c && cJSON_strcasecmp(c->string,string))i++,c=c->next;if(c){newitem->string=cJSON_strdup(string);cJSON_ReplaceItemInArray(object,i,newitem);}}
-
-/* Create basic types: */
-cJSON *cJSON_CreateNull(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_NULL;return item;}
-cJSON *cJSON_CreateTrue(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_True;return item;}
-cJSON *cJSON_CreateFalse(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_False;return item;}
-cJSON *cJSON_CreateBool(int b)                    {cJSON *item=cJSON_New_Item();if(item)item->type=b?cJSON_True:cJSON_False;return item;}
-cJSON *cJSON_CreateNumber(double num)            {cJSON *item=cJSON_New_Item();if(item){item->type=cJSON_Number;item->valuedouble=num;item->valueint=(int)num;}return item;}
-cJSON *cJSON_CreateString(const char *string)    {cJSON *item=cJSON_New_Item();if(item){item->type=cJSON_String;item->valuestring=cJSON_strdup(string);}return item;}
-cJSON *cJSON_CreateArray(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_Array;return item;}
-cJSON *cJSON_CreateObject(void)                    {cJSON *item=cJSON_New_Item();if(item)item->type=cJSON_Object;return item;}
-
-/* Create Arrays: */
-cJSON *cJSON_CreateIntArray(int *numbers,int count)                {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateNumber(numbers[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-cJSON *cJSON_CreateFloatArray(float *numbers,int count)            {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateNumber(numbers[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-cJSON *cJSON_CreateDoubleArray(double *numbers,int count)        {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateNumber(numbers[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-cJSON *cJSON_CreateStringArray(const char **strings,int count)    {int i;cJSON *n=0,*p=0,*a=cJSON_CreateArray();for(i=0;a && i<count;i++){n=cJSON_CreateString(strings[i]);if(!i)a->child=n;else suffix_object(p,n);p=n;}return a;}
-
-/* Duplication */
-cJSON *cJSON_Duplicate(cJSON *item,int recurse)
-{
-    cJSON *newitem,*cptr,*nptr=0,*newchild;
-    /* Bail on bad ptr */
-    if (!item) return 0;
-    /* Create new item */
-    newitem=cJSON_New_Item();
-    if (!newitem) return 0;
-    /* Copy over all vars */
-    newitem->type=item->type&(~cJSON_IsReference),newitem->valueint=item->valueint,newitem->valuedouble=item->valuedouble;
-    if (item->valuestring)    {newitem->valuestring=cJSON_strdup(item->valuestring);    if (!newitem->valuestring)    {cJSON_Delete(newitem);return 0;}}
-    if (item->string)        {newitem->string=cJSON_strdup(item->string);            if (!newitem->string)        {cJSON_Delete(newitem);return 0;}}
-    /* If non-recursive, then we're done! */
-    if (!recurse) return newitem;
-    /* Walk the ->next chain for the child. */
-    cptr=item->child;
-    while (cptr)
-    {
-        newchild=cJSON_Duplicate(cptr,1);        /* Duplicate (with recurse) each item in the ->next chain */
-        if (!newchild) {cJSON_Delete(newitem);return 0;}
-        if (nptr)    {nptr->next=newchild,newchild->prev=nptr;nptr=newchild;}    /* If newitem->child already set, then crosswire ->prev and ->next and move on */
-        else        {newitem->child=newchild;nptr=newchild;}                    /* Set newitem->child and move to it */
-        cptr=cptr->next;
-    }
-    return newitem;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/cJSON.h b/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/cJSON.h
deleted file mode 100644
index 50ae02b6f9..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/cjson/cJSON.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-  Copyright (c) 2009 Dave Gamble
- 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
- 
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
- 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-#ifndef cJSON__h
-#define cJSON__h
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* cJSON Types: */
-#define cJSON_False 0
-#define cJSON_True 1
-#define cJSON_NULL 2
-#define cJSON_Number 3
-#define cJSON_String 4
-#define cJSON_Array 5
-#define cJSON_Object 6
-    
-#define cJSON_IsReference 256
-
-/* The cJSON structure: */
-typedef struct cJSON {
-    struct cJSON *next,*prev;    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
-    struct cJSON *child;        /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
-
-    int type;                    /* The type of the item, as above. */
-
-    char *valuestring;            /* The item's string, if type==cJSON_String */
-    int valueint;                /* The item's number, if type==cJSON_Number */
-    double valuedouble;            /* The item's number, if type==cJSON_Number */
-
-    char *string;                /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
-} cJSON;
-
-typedef struct cJSON_Hooks {
-      void *(*malloc_fn)(size_t sz);
-      void (*free_fn)(void *ptr);
-} cJSON_Hooks;
-
-/* Supply malloc, realloc and free functions to cJSON */
-extern void cJSON_InitHooks(cJSON_Hooks* hooks);
-
-
-/* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */
-extern cJSON *cJSON_Parse(const char *value);
-/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */
-extern char  *cJSON_Print(cJSON *item);
-/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */
-extern char  *cJSON_PrintUnformatted(cJSON *item);
-/* Delete a cJSON entity and all subentities. */
-extern void   cJSON_Delete(cJSON *c);
-
-/* Returns the number of items in an array (or object). */
-extern int      cJSON_GetArraySize(cJSON *array);
-/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */
-extern cJSON *cJSON_GetArrayItem(cJSON *array,int item);
-/* Get item "string" from object. Case insensitive. */
-extern cJSON *cJSON_GetObjectItem(cJSON *object,const char *string);
-
-/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
-extern const char *cJSON_GetErrorPtr(void);
-    
-/* These calls create a cJSON item of the appropriate type. */
-extern cJSON *cJSON_CreateNull(void);
-extern cJSON *cJSON_CreateTrue(void);
-extern cJSON *cJSON_CreateFalse(void);
-extern cJSON *cJSON_CreateBool(int b);
-extern cJSON *cJSON_CreateNumber(double num);
-extern cJSON *cJSON_CreateString(const char *string);
-extern cJSON *cJSON_CreateArray(void);
-extern cJSON *cJSON_CreateObject(void);
-
-/* These utilities create an Array of count items. */
-extern cJSON *cJSON_CreateIntArray(int *numbers,int count);
-extern cJSON *cJSON_CreateFloatArray(float *numbers,int count);
-extern cJSON *cJSON_CreateDoubleArray(double *numbers,int count);
-extern cJSON *cJSON_CreateStringArray(const char **strings,int count);
-
-/* Append item to the specified array/object. */
-extern void cJSON_AddItemToArray(cJSON *array, cJSON *item);
-extern void    cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item);
-/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
-extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-extern void    cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item);
-
-/* Remove/Detatch items from Arrays/Objects. */
-extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which);
-extern void   cJSON_DeleteItemFromArray(cJSON *array,int which);
-extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string);
-extern void   cJSON_DeleteItemFromObject(cJSON *object,const char *string);
-    
-/* Update array items. */
-extern void cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem);
-extern void cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
-
-/* Duplicate a cJSON item */
-extern cJSON *cJSON_Duplicate(cJSON *item,int recurse);
-/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
-need to be released. With recurse!=0, it will duplicate any children connected to the item.
-The item->next and ->prev pointers are always zero on return from Duplicate. */
-
-/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
-extern cJSON *cJSON_ParseWithOpts(const char *value,const char **return_parse_end,int require_null_terminated);
-
-/* Macros for creating things quickly. */
-#define cJSON_AddNullToObject(object,name)        cJSON_AddItemToObject(object, name, cJSON_CreateNull())
-#define cJSON_AddTrueToObject(object,name)        cJSON_AddItemToObject(object, name, cJSON_CreateTrue())
-#define cJSON_AddFalseToObject(object,name)        cJSON_AddItemToObject(object, name, cJSON_CreateFalse())
-#define cJSON_AddBoolToObject(object,name,b)    cJSON_AddItemToObject(object, name, cJSON_CreateBool(b))
-#define cJSON_AddNumberToObject(object,name,n)    cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n))
-#define cJSON_AddStringToObject(object,name,s)    cJSON_AddItemToObject(object, name, cJSON_CreateString(s))
-
-/* When assigning an integer value, it needs to be propagated to valuedouble too. */
-#define cJSON_SetIntValue(object,val)            ((object)?(object)->valueint=(object)->valuedouble=(val):(val))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/compilerStandalone.cpp b/Code/Tools/HLSLCrossCompilerMETAL/offline/compilerStandalone.cpp
deleted file mode 100644
index eaed596a00..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/compilerStandalone.cpp
+++ /dev/null
@@ -1,825 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "hlslcc.hpp"
-#include "stdlib.h"
-#include "stdio.h"
-#include "bstrlib.h"
-#include <string>
-#include <string.h>
-#include "hash.h"
-#include "serializeReflection.h"
-#include "hlslcc_bin.hpp"
-
-#include <algorithm>
-#include <cctype>
-
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <sys/stat.h>
-#endif
-
-#include "timer.h"
-
-#if defined(_WIN32) && !defined(PORTABLE)
-#define VALIDATE_OUTPUT
-#endif
-
-#if defined(VALIDATE_OUTPUT)
-#if defined(_WIN32)
-#include <windows.h>
-#include <gl/GL.h>
-
-#pragma comment(lib, "opengl32.lib")
-
-typedef char GLcharARB;        /* native character */
-typedef unsigned int GLhandleARB;    /* shader object handle */
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB        0x8B84
-typedef void (WINAPI * PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB(WINAPI * PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (WINAPI * PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (WINAPI * PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef void (WINAPI * PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (WINAPI * PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef GLhandleARB(WINAPI * PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (WINAPI * PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (WINAPI * PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (WINAPI * PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (WINAPI * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLcharARB* infoLog);
-
-static PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
-static PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
-static PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
-static PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
-static PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
-static PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
-static PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
-static PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
-static PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
-static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
-static PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-
-#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
-#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
-#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
-#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
-#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
-#define WGL_CONTEXT_FLAGS_ARB 0x2094
-#define ERROR_INVALID_VERSION_ARB 0x2095
-#define ERROR_INVALID_PROFILE_ARB 0x2096
-
-#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
-#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
-#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
-
-typedef HGLRC(WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int* attribList);
-static PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
-
-void InitOpenGL()
-{
-    HGLRC rc;
-
-    // setup minimal required GL
-    HWND wnd = CreateWindowA(
-        "STATIC",
-        "GL",
-        WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
-        0, 0, 16, 16,
-        NULL, NULL,
-        GetModuleHandle(NULL), NULL);
-    HDC dc = GetDC(wnd);
-
-    PIXELFORMATDESCRIPTOR pfd = {
-        sizeof(PIXELFORMATDESCRIPTOR), 1,
-        PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL,
-        PFD_TYPE_RGBA, 32,
-        0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0,
-        16, 0,
-        0, PFD_MAIN_PLANE, 0, 0, 0, 0
-    };
-
-    int fmt = ChoosePixelFormat(dc, &pfd);
-    SetPixelFormat(dc, fmt, &pfd);
-
-    rc = wglCreateContext(dc);
-    wglMakeCurrent(dc, rc);
-
-    wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)wglGetProcAddress("wglCreateContextAttribsARB");
-
-    if (wglCreateContextAttribsARB)
-    {
-        const int OpenGLContextAttribs[] = {
-            WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-            WGL_CONTEXT_MINOR_VERSION_ARB, 3,
-#if defined(_DEBUG)
-            //WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB | WGL_CONTEXT_DEBUG_BIT_ARB,
-#else
-            //WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
-#endif
-            //WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-            0, 0
-        };
-
-        const HGLRC OpenGLContext = wglCreateContextAttribsARB(dc, 0, OpenGLContextAttribs);
-
-        wglMakeCurrent(dc, OpenGLContext);
-
-        wglDeleteContext(rc);
-
-        rc = OpenGLContext;
-    }
-
-    glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)wglGetProcAddress("glDeleteObjectARB");
-    glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)wglGetProcAddress("glCreateShaderObjectARB");
-    glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)wglGetProcAddress("glShaderSourceARB");
-    glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)wglGetProcAddress("glCompileShaderARB");
-    glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)wglGetProcAddress("glGetInfoLogARB");
-    glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)wglGetProcAddress("glGetObjectParameterivARB");
-    glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)wglGetProcAddress("glCreateProgramObjectARB");
-    glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)wglGetProcAddress("glAttachObjectARB");
-    glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)wglGetProcAddress("glLinkProgramARB");
-    glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)wglGetProcAddress("glUseProgramObjectARB");
-    glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)wglGetProcAddress("glGetShaderInfoLog");
-}
-#endif
-
-void PrintSingleLineError(FILE* pFile, char* error)
-{
-    while (*error != '\0')
-    {
-        char* pLineEnd = strchr(error, '\n');
-        if (pLineEnd == 0)
-            pLineEnd = error + strlen(error) - 1;
-        fwrite(error, 1, pLineEnd - error, pFile);
-        fwrite("\r", 1, 1, pFile);
-        error = pLineEnd + 1;
-    }
-}
-
-int TryCompileShader(GLenum eShaderType, const char* inFilename, char* shader, double* pCompileTime, int useStdErr)
-{
-    GLint iCompileStatus;
-    GLuint hShader;
-    Timer_t timer;
-
-    InitTimer(&timer);
-
-    InitOpenGL();
-
-    hShader = glCreateShaderObjectARB(eShaderType);
-    glShaderSourceARB(hShader, 1, (const char **)&shader, NULL);
-
-    ResetTimer(&timer);
-    glCompileShaderARB(hShader);
-    *pCompileTime = ReadTimer(&timer);
-
-    /* Check it compiled OK */
-    glGetObjectParameterivARB(hShader, GL_OBJECT_COMPILE_STATUS_ARB, &iCompileStatus);
-
-    if (iCompileStatus != GL_TRUE)
-    {
-        FILE* errorFile = NULL;
-        GLint iInfoLogLength = 0;
-        char* pszInfoLog;
-
-        glGetObjectParameterivARB(hShader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &iInfoLogLength);
-
-        pszInfoLog = new char[iInfoLogLength];
-
-        printf("Error: Failed to compile GLSL shader\n");
-
-        glGetInfoLogARB(hShader, iInfoLogLength, NULL, pszInfoLog);
-
-        printf(pszInfoLog);
-
-        if (!useStdErr)
-        {
-            std::string filename;
-            filename += inFilename;
-            filename += "_compileErrors.txt";
-
-            //Dump to file
-            errorFile = fopen(filename.c_str(), "w");
-
-            fclose(errorFile);
-        }
-        else
-        {
-            // Present error to stderror with no "new lines" as required by remote shader compiler
-            fprintf(stderr, "%s(-) error: ", inFilename);
-            PrintSingleLineError(stderr, pszInfoLog);
-            fprintf(stderr, "\rshader: ");
-            PrintSingleLineError(stderr, shader);
-        }
-
-        delete[] pszInfoLog;
-
-        return 0;
-    }
-
-    return 1;
-}
-#endif
-
-int fileExists(const char* path)
-{
-    FILE* shaderFile;
-    shaderFile = fopen(path, "rb");
-
-    if (shaderFile)
-    {
-        fclose(shaderFile);
-        return 1;
-    }
-    return 0;
-}
-
-ShaderLang LanguageFromString(const char* str)
-{
-    if (strcmp(str, "es100") == 0)
-    {
-        return LANG_ES_100;
-    }
-    if (strcmp(str, "es300") == 0)
-    {
-        return LANG_ES_300;
-    }
-    if (strcmp(str, "es310") == 0)
-    {
-        return LANG_ES_310;
-    }
-    if (strcmp(str, "120") == 0)
-    {
-        return LANG_120;
-    }
-    if (strcmp(str, "130") == 0)
-    {
-        return LANG_130;
-    }
-    if (strcmp(str, "140") == 0)
-    {
-        return LANG_140;
-    }
-    if (strcmp(str, "150") == 0)
-    {
-        return LANG_150;
-    }
-    if (strcmp(str, "330") == 0)
-    {
-        return LANG_330;
-    }
-    if (strcmp(str, "400") == 0)
-    {
-        return LANG_400;
-    }
-    if (strcmp(str, "410") == 0)
-    {
-        return LANG_410;
-    }
-    if (strcmp(str, "420") == 0)
-    {
-        return LANG_420;
-    }
-    if (strcmp(str, "430") == 0)
-    {
-        return LANG_430;
-    }
-    if (strcmp(str, "440") == 0)
-    {
-        return LANG_440;
-    }
-    if (strcmp(str, "metal") == 0)
-    {
-        return LANG_METAL;
-    }
-    return LANG_DEFAULT;
-}
-
-#define MAX_PATH_CHARS 256
-#define MAX_FXC_CMD_CHARS 1024
-#define MAX_DEBUG_READ_CHARS 512
-
-typedef struct
-{
-    ShaderLang language;
-
-    int flags;
-
-    const char* shaderFile;
-    char* outputShaderFile;
-
-    char* reflectPath;
-
-    char cacheKey[MAX_PATH_CHARS];
-
-    int bUseFxc;
-    std::string fxcCmdLine;
-} Options;
-
-void InitOptions(Options* psOptions)
-{
-    psOptions->language = LANG_DEFAULT;
-    psOptions->flags = 0;
-    psOptions->reflectPath = NULL;
-
-    psOptions->shaderFile = NULL;
-
-    psOptions->bUseFxc = 0;
-}
-
-void PrintHelp()
-{
-    printf("Command line options:\n");
-
-    printf("\t-lang=X \t Language to use. e.g. es100 or 140 or metal.\n");
-    printf("\t-flags=X \t The integer value of the HLSLCC_FLAGS to used.\n");
-    printf("\t-reflect=X \t File to write reflection JSON to.\n");
-    printf("\t-in=X \t Shader file to compile.\n");
-    printf("\t-out=X \t File to write the compiled shader from -in to.\n");
-
-    printf("\t-hashout=[dir/]out-file-name \t Output file name is a hash of 'out-file-name', put in the directory 'dir'.\n");
-
-    printf("\t-fxc=\"CMD\" HLSL compiler command line. If specified the input shader will be first compiled through this command first and then the resulting bytecode translated.\n");
-
-    printf("\n");
-}
-
-int GetOptions(int argc, char** argv, Options* psOptions)
-{
-    int i;
-    int fullShaderChain = -1;
-
-    InitOptions(psOptions);
-
-    for (i = 1; i < argc; i++)
-    {
-        char *option;
-
-        option = strstr(argv[i], "-help");
-        if (option != NULL)
-        {
-            PrintHelp();
-            return 0;
-        }
-
-        option = strstr(argv[i], "-reflect=");
-        if (option != NULL)
-        {
-            psOptions->reflectPath = option + strlen("-reflect=");
-        }
-
-        option = strstr(argv[i], "-lang=");
-        if (option != NULL)
-        {
-            psOptions->language = LanguageFromString((&option[strlen("-lang=")]));
-        }
-
-        option = strstr(argv[i], "-flags=");
-        if (option != NULL)
-        {
-            psOptions->flags = atol(&option[strlen("-flags=")]);
-        }
-
-        option = strstr(argv[i], "-in=");
-        if (option != NULL)
-        {
-            fullShaderChain = 0;
-            psOptions->shaderFile = option + strlen("-in=");
-            if (!fileExists(psOptions->shaderFile))
-            {
-                printf("Invalid path: %s\n", psOptions->shaderFile);
-                return 0;
-            }
-        }
-
-        option = strstr(argv[i], "-out=");
-        if (option != NULL)
-        {
-            fullShaderChain = 0;
-            psOptions->outputShaderFile = option + strlen("-out=");
-        }
-
-        option = strstr(argv[i], "-hashout");
-        if (option != NULL)
-        {
-            fullShaderChain = 0;
-            psOptions->outputShaderFile = option + strlen("-hashout=");
-
-            char* dir;
-            int64_t length;
-
-            uint64_t hash = hash64((const uint8_t*)psOptions->outputShaderFile, (uint32_t)strlen(psOptions->outputShaderFile), 0);
-
-            dir = strrchr(psOptions->outputShaderFile, '\\');
-
-            if (!dir)
-            {
-                dir = strrchr(psOptions->outputShaderFile, '//');
-            }
-
-            if (!dir)
-            {
-                length = 0;
-            }
-            else
-            {
-                length = (int)(dir - psOptions->outputShaderFile) + 1;
-            }
-
-            for (i = 0; i < length; ++i)
-            {
-                psOptions->cacheKey[i] = psOptions->outputShaderFile[i];
-            }
-
-            //sprintf(psOptions->cacheKey, "%x%x", high, low);
-            sprintf(&psOptions->cacheKey[i], "%010llX", hash);
-
-            psOptions->outputShaderFile = psOptions->cacheKey;
-        }
-
-        option = strstr(argv[i], "-fxc=");
-        if (option != NULL)
-        {
-            char* cmdLine = option + strlen("-fxc=");
-            size_t cmdLineLen = strlen(cmdLine);
-            if (cmdLineLen == 0 || cmdLineLen + 1 >= MAX_FXC_CMD_CHARS)
-                return 0;
-            psOptions->fxcCmdLine = std::string(cmdLine, cmdLineLen);
-            psOptions->bUseFxc = 1;
-        }
-    }
-
-    return 1;
-}
-
-void *malloc_hook(size_t size)
-{
-    return malloc(size);
-}
-void *calloc_hook(size_t num, size_t size)
-{
-    return calloc(num, size);
-}
-void *realloc_hook(void *p, size_t size)
-{
-    return realloc(p, size);
-}
-void free_hook(void *p)
-{
-    free(p);
-}
-
-int Run(const char* srcPath, const char* destPath, ShaderLang language, int flags, const char* reflectPath, Shader* shader, int useStdErr, [[maybe_unused]] const char *fxcCmdLine, [[maybe_unused]] const char *debugSrcPath)
-{
-    FILE* outputFile;
-    Shader tempShader;
-    Shader* result = shader ? shader : &tempShader;
-    Timer_t timer;
-    int compiledOK = 0;
-    double crossCompileTime = 0;
-    double glslCompileTime = 0;
-
-    HLSLcc_SetMemoryFunctions(malloc_hook, calloc_hook, free_hook, realloc_hook);
-
-    InitTimer(&timer);
-
-    ResetTimer(&timer);
-    GlExtensions ext;
-    ext.ARB_explicit_attrib_location = 0;
-    ext.ARB_explicit_uniform_location = 0;
-    ext.ARB_shading_language_420pack = 0;
-    if (language == LANG_METAL)
-    {
-        compiledOK = TranslateHLSLFromFileToMETAL(srcPath, flags, language, result);
-    }
-    else
-    {
-        compiledOK = TranslateHLSLFromFileToGLSL(srcPath, flags, language, &ext, result);
-    }
-    crossCompileTime = ReadTimer(&timer);
-
-    if (compiledOK)
-    {
-#ifdef _DEBUG
-        bstring debugString = bfromcstr(result->sourceCode);
-
-        bcatcstr(debugString, "\n\n// ------- DEBUG INFORMATION -------");
-
-        bformata(debugString, "\n// Shader Object Input: %s", srcPath);
-        bformata(debugString, "\n// Shader Output: %s", destPath);
-        if (debugSrcPath)
-        {
-            char debugStr[MAX_DEBUG_READ_CHARS];
-            FILE* debugFile = fopen(debugSrcPath, "r");
-            if (debugFile)
-            {
-                bformata(debugString, "\n// Shader HLSL Input: ");
-                while (!feof(debugFile))
-                    bformata(debugString, "// %s", fgets(debugStr, MAX_DEBUG_READ_CHARS, debugFile));
-                fclose(debugFile);
-            }
-        }
-        if (fxcCmdLine)
-            bformata(debugString, "\n// FXC Command: %s", fxcCmdLine);
-
-        result->sourceCode = bstr2cstr(debugString, '\0');
-#endif
-        printf("cc time: %.2f us\n", crossCompileTime);
-
-#if !defined(APPLE)
-        // https://msdn.microsoft.com/en-us/library/ms175782.aspx.  As to disable the "("'n' format specifier disabled", 0)" assertion.
-        _set_printf_count_output(1);
-#endif
-
-        if (destPath)
-        {
-            //Dump to file
-            outputFile = fopen(destPath, "w");
-            fprintf(outputFile, result->sourceCode);
-
-            fclose(outputFile);
-        }
-
-        if (reflectPath)
-        {
-            const char* jsonString = SerializeReflection(&result->reflection);
-            outputFile = fopen(reflectPath, "w");
-            fprintf(outputFile, jsonString);
-            fclose(outputFile);
-        }
-
-#if defined(VALIDATE_OUTPUT)
-        if (language != LANG_METAL)
-        {
-            compiledOK = TryCompileShader(result->shaderType, destPath ? destPath : "", result->sourceCode, &glslCompileTime, useStdErr);
-
-            if (compiledOK)
-            {
-                printf("glsl time: %.2f us\n", glslCompileTime);
-            }
-        }
-#endif
-
-        if (!shader)
-            FreeShader(result);
-    }
-    else if (useStdErr)
-    {
-        fprintf(stderr, "TranslateHLSLFromFile failed");
-    }
-
-    return compiledOK;
-}
-
-struct SDXBCFile
-{
-    FILE* m_pFile;
-
-    bool Read(void* pElements, size_t uSize)
-    {
-        return fread(pElements, 1, uSize, m_pFile) == uSize;
-    }
-
-    bool Write(const void* pElements, size_t uSize)
-    {
-        return fwrite(pElements, 1, uSize, m_pFile) == uSize;
-    }
-
-    bool SeekRel(int32_t iOffset)
-    {
-        return fseek(m_pFile, iOffset, SEEK_CUR) == 0;
-    }
-
-    bool SeekAbs(uint32_t uPosition)
-    {
-        return fseek(m_pFile, uPosition, SEEK_SET) == 0;
-    }
-};
-
-int CombineDXBCWithGLSL(char* dxbcFileName, char* outputFileName, Shader* shader)
-{
-    SDXBCFile dxbcFile = { fopen(dxbcFileName, "rb") };
-    SDXBCFile outputFile = { fopen(outputFileName, "wb") };
-
-    bool result =
-        dxbcFile.m_pFile != NULL && outputFile.m_pFile != NULL &&
-        DXBCCombineWithGLSL(dxbcFile, outputFile, shader);
-
-    if (dxbcFile.m_pFile != NULL)
-        fclose(dxbcFile.m_pFile);
-    if (outputFile.m_pFile != NULL)
-        fclose(outputFile.m_pFile);
-
-    return result;
-}
-
-#if !defined(_MSC_VER)
-#define sprintf_s(dest, size, ...) sprintf(dest, __VA_ARGS__)
-#endif
-
-#if defined(_WIN32) && defined(PORTABLE)
-
-DWORD FilterException(DWORD uExceptionCode)
-{
-    const char* szExceptionName;
-    char acTemp[10];
-    switch (uExceptionCode)
-    {
-#define _CASE(_Name) \
-    case _Name: \
-        szExceptionName = #_Name; \
-        break;
-        _CASE(EXCEPTION_ACCESS_VIOLATION)
-            _CASE(EXCEPTION_DATATYPE_MISALIGNMENT)
-            _CASE(EXCEPTION_BREAKPOINT)
-            _CASE(EXCEPTION_SINGLE_STEP)
-            _CASE(EXCEPTION_ARRAY_BOUNDS_EXCEEDED)
-            _CASE(EXCEPTION_FLT_DENORMAL_OPERAND)
-            _CASE(EXCEPTION_FLT_DIVIDE_BY_ZERO)
-            _CASE(EXCEPTION_FLT_INEXACT_RESULT)
-            _CASE(EXCEPTION_FLT_INVALID_OPERATION)
-            _CASE(EXCEPTION_FLT_OVERFLOW)
-            _CASE(EXCEPTION_FLT_STACK_CHECK)
-            _CASE(EXCEPTION_FLT_UNDERFLOW)
-            _CASE(EXCEPTION_INT_DIVIDE_BY_ZERO)
-            _CASE(EXCEPTION_INT_OVERFLOW)
-            _CASE(EXCEPTION_PRIV_INSTRUCTION)
-            _CASE(EXCEPTION_IN_PAGE_ERROR)
-            _CASE(EXCEPTION_ILLEGAL_INSTRUCTION)
-            _CASE(EXCEPTION_NONCONTINUABLE_EXCEPTION)
-            _CASE(EXCEPTION_STACK_OVERFLOW)
-            _CASE(EXCEPTION_INVALID_DISPOSITION)
-            _CASE(EXCEPTION_GUARD_PAGE)
-            _CASE(EXCEPTION_INVALID_HANDLE)
-            //_CASE(EXCEPTION_POSSIBLE_DEADLOCK)
-#undef _CASE
-    default:
-        sprintf_s(acTemp, "0x%08X", uExceptionCode);
-        szExceptionName = acTemp;
-    }
-
-    fprintf(stderr, "Hardware exception thrown (%s)\n", szExceptionName);
-    return 1;
-}
-
-#endif
-
-const char* PatchHLSLShaderFile(const char* path)
-{
-    // Need to transform "half" into "min16float" so FXC preserve min precision to the operands.
-    static char patchedFileName[MAX_PATH_CHARS];
-    const char* defines = "#define half min16float\n"
-        "#define half2 min16float2\n"
-        "#define half3 min16float3\n"
-        "#define half4 min16float4\n";
-
-    sprintf_s(patchedFileName, sizeof(patchedFileName), "%s.hlslPatched", path);
-    FILE* shaderFile = fopen(path, "rb");
-    if (!shaderFile)
-    {
-        return NULL;
-    }
-
-    FILE* patchedFile = fopen(patchedFileName, "wb");
-    if (!patchedFile)
-    {
-        return NULL;
-    }
-
-    // Get size of file
-    bool result = false;
-    fseek(shaderFile, 0, SEEK_END);
-    long size = ftell(shaderFile);
-    fseek(shaderFile, 0, SEEK_SET);
-    unsigned char* data = new unsigned char[size + 1]; // Extra byte for the '/0' character.
-    if (fread(data, 1, size, shaderFile) == size)
-    {
-        data[size] = '\0';
-        fprintf(patchedFile, "%s%s", defines, data);
-        result = true;
-    }
-
-    if (shaderFile)
-    {
-        fclose(shaderFile);
-    }
-
-    if (patchedFile)
-    {
-        fclose(patchedFile);
-    }
-
-    delete[] data;
-    return result ? patchedFileName : NULL;
-}
-
-int main(int argc, char** argv)
-{
-    Options options;
-
-#if defined(_WIN32) && defined(PORTABLE)
-    __try
-    {
-#endif
-
-        if (!GetOptions(argc, argv, &options))
-        {
-            return 1;
-        }
-
-        if (options.bUseFxc)
-        {
-            char dxbcFileName[MAX_PATH_CHARS];
-            char glslFileName[MAX_PATH_CHARS];
-            char fullFxcCmdLine[MAX_FXC_CMD_CHARS];
-            int retValue;
-
-            if (options.flags & HLSLCC_FLAG_HALF_FLOAT_TRANSFORM)
-            {
-                options.shaderFile = PatchHLSLShaderFile(options.shaderFile);
-                if (!options.shaderFile)
-                {
-                    return 1;
-                }
-            }
-
-            sprintf_s(dxbcFileName, sizeof(dxbcFileName), "%s.dxbc", options.shaderFile);
-            sprintf_s(glslFileName, sizeof(glslFileName), "%s.patched", options.shaderFile);
-
-            // Need to extract the path to the executable so we can enclose it in quotes
-            // in case it contains spaces.
-            const std::string fxcExeName = "fxc.exe";
-
-            // Case insensitive search
-            std::string::iterator fxcPos = std::search(
-                options.fxcCmdLine.begin(), options.fxcCmdLine.end(),
-                fxcExeName.begin(), fxcExeName.end(),
-                [](char ch1, char ch2) { return std::tolower(ch1) == std::tolower(ch2); }
-            );
-
-            if (fxcPos == options.fxcCmdLine.end())
-            {
-                fprintf(stderr, "Could not find fxc.exe in command line");
-                return 1;
-            }
-
-            // Add the fxcExeName so it gets copied to the fxcExe path.
-            fxcPos += fxcExeName.length();
-            std::string fxcExe(options.fxcCmdLine.begin(), fxcPos);
-            std::string fxcArguments(fxcPos, options.fxcCmdLine.end());
-
-#if defined(APPLE)
-            fprintf(stderr, "fxc.exe cannot be executed on Mac");
-            return 1;
-#else
-            // Need an extra set of quotes around the full command line because the way "system" executes it using cmd.
-            sprintf_s(fullFxcCmdLine, sizeof(fullFxcCmdLine), "\"\"%s\" %s \"%s\" \"%s\"\"", fxcExe.c_str(), fxcArguments.c_str(), dxbcFileName, options.shaderFile);
-#endif
-
-            retValue = system(fullFxcCmdLine);
-
-            if (retValue == 0)
-            {
-                Shader shader;
-                retValue = !Run(dxbcFileName, glslFileName, options.language, options.flags, options.reflectPath, &shader, 1, fullFxcCmdLine, options.shaderFile);
-
-                if (retValue == 0)
-                {
-                    retValue = !CombineDXBCWithGLSL(dxbcFileName, options.outputShaderFile, &shader);
-                    FreeShader(&shader);
-                }
-            }
-
-            remove(dxbcFileName);
-            remove(glslFileName);
-            if (options.flags & HLSLCC_FLAG_HALF_FLOAT_TRANSFORM)
-            {
-                // Removed the hlsl patched file that was created.
-                remove(options.shaderFile);
-            }
-
-            return retValue;
-        }
-        else if (options.shaderFile)
-        {
-            if (!Run(options.shaderFile, options.outputShaderFile, options.language, options.flags, options.reflectPath, NULL, 0, NULL, NULL))
-            {
-                return 1;
-            }
-        }
-
-#if defined(_WIN32) && defined(PORTABLE)
-    }
-    __except (FilterException(GetExceptionCode()))
-    {
-        return 1;
-    }
-#endif
-
-
-    return 0;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/hash.h b/Code/Tools/HLSLCrossCompilerMETAL/offline/hash.h
deleted file mode 100644
index e480417717..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/hash.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef HASH_H_
-#define HASH_H_
-
-/*
---------------------------------------------------------------------
-mix -- mix 3 64-bit values reversibly.
-mix() takes 48 machine instructions, but only 24 cycles on a superscalar
-  machine (like Intel's new MMX architecture).  It requires 4 64-bit
-  registers for 4::2 parallelism.
-All 1-bit deltas, all 2-bit deltas, all deltas composed of top bits of
-  (a,b,c), and all deltas of bottom bits were tested.  All deltas were
-  tested both on random keys and on keys that were nearly all zero.
-  These deltas all cause every bit of c to change between 1/3 and 2/3
-  of the time (well, only 113/400 to 287/400 of the time for some
-  2-bit delta).  These deltas all cause at least 80 bits to change
-  among (a,b,c) when the mix is run either forward or backward (yes it
-  is reversible).
-This implies that a hash using mix64 has no funnels.  There may be
-  characteristics with 3-bit deltas or bigger, I didn't test for
-  those.
---------------------------------------------------------------------
-*/
-#define mix64(a,b,c) \
-{ \
-  a -= b; a -= c; a ^= (c>>43); \
-  b -= c; b -= a; b ^= (a<<9); \
-  c -= a; c -= b; c ^= (b>>8); \
-  a -= b; a -= c; a ^= (c>>38); \
-  b -= c; b -= a; b ^= (a<<23); \
-  c -= a; c -= b; c ^= (b>>5); \
-  a -= b; a -= c; a ^= (c>>35); \
-  b -= c; b -= a; b ^= (a<<49); \
-  c -= a; c -= b; c ^= (b>>11); \
-  a -= b; a -= c; a ^= (c>>12); \
-  b -= c; b -= a; b ^= (a<<18); \
-  c -= a; c -= b; c ^= (b>>22); \
-}
-
-/*
---------------------------------------------------------------------
-hash64() -- hash a variable-length key into a 64-bit value
-  k     : the key (the unaligned variable-length array of bytes)
-  len   : the length of the key, counting by bytes
-  level : can be any 8-byte value
-Returns a 64-bit value.  Every bit of the key affects every bit of
-the return value.  No funnels.  Every 1-bit and 2-bit delta achieves
-avalanche.  About 41+5len instructions.
-
-The best hash table sizes are powers of 2.  There is no need to do
-mod a prime (mod is sooo slow!).  If you need less than 64 bits,
-use a bitmask.  For example, if you need only 10 bits, do
-  h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (ub1 **)k, do it like this:
-  for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
-
-By Bob Jenkins, Jan 4 1997.  bob_jenkins@burtleburtle.net.  You may
-use this code any way you wish, private, educational, or commercial,
-but I would appreciate if you give me credit.
-
-See http://burtleburtle.net/bob/hash/evahash.html
-Use for hash table lookup, or anything where one collision in 2^^64
-is acceptable.  Do NOT use for cryptographic purposes.
---------------------------------------------------------------------
-*/
-
-static uint64_t hash64( const uint8_t *k, uint32_t length, uint64_t initval )
-{
-  uint64_t a,b,c,len;
-
-  /* Set up the internal state */
-  len = length;
-  a = b = initval;                         /* the previous hash value */
-  c = 0x9e3779b97f4a7c13LL; /* the golden ratio; an arbitrary value */
-
-  /*---------------------------------------- handle most of the key */
-  while (len >= 24)
-  {
-    a += (k[0]        +((uint64_t)k[ 1]<< 8)+((uint64_t)k[ 2]<<16)+((uint64_t)k[ 3]<<24)
-     +((uint64_t)k[4 ]<<32)+((uint64_t)k[ 5]<<40)+((uint64_t)k[ 6]<<48)+((uint64_t)k[ 7]<<56));
-    b += (k[8]        +((uint64_t)k[ 9]<< 8)+((uint64_t)k[10]<<16)+((uint64_t)k[11]<<24)
-     +((uint64_t)k[12]<<32)+((uint64_t)k[13]<<40)+((uint64_t)k[14]<<48)+((uint64_t)k[15]<<56));
-    c += (k[16]       +((uint64_t)k[17]<< 8)+((uint64_t)k[18]<<16)+((uint64_t)k[19]<<24)
-     +((uint64_t)k[20]<<32)+((uint64_t)k[21]<<40)+((uint64_t)k[22]<<48)+((uint64_t)k[23]<<56));
-    mix64(a,b,c);
-    k += 24; len -= 24;
-  }
-
-  /*------------------------------------- handle the last 23 bytes */
-  c += length;
-  switch(len)              /* all the case statements fall through */
-  {
-  case 23: c+=((uint64_t)k[22]<<56);
-  case 22: c+=((uint64_t)k[21]<<48);
-  case 21: c+=((uint64_t)k[20]<<40);
-  case 20: c+=((uint64_t)k[19]<<32);
-  case 19: c+=((uint64_t)k[18]<<24);
-  case 18: c+=((uint64_t)k[17]<<16);
-  case 17: c+=((uint64_t)k[16]<<8);
-    /* the first byte of c is reserved for the length */
-  case 16: b+=((uint64_t)k[15]<<56);
-  case 15: b+=((uint64_t)k[14]<<48);
-  case 14: b+=((uint64_t)k[13]<<40);
-  case 13: b+=((uint64_t)k[12]<<32);
-  case 12: b+=((uint64_t)k[11]<<24);
-  case 11: b+=((uint64_t)k[10]<<16);
-  case 10: b+=((uint64_t)k[ 9]<<8);
-  case  9: b+=((uint64_t)k[ 8]);
-  case  8: a+=((uint64_t)k[ 7]<<56);
-  case  7: a+=((uint64_t)k[ 6]<<48);
-  case  6: a+=((uint64_t)k[ 5]<<40);
-  case  5: a+=((uint64_t)k[ 4]<<32);
-  case  4: a+=((uint64_t)k[ 3]<<24);
-  case  3: a+=((uint64_t)k[ 2]<<16);
-  case  2: a+=((uint64_t)k[ 1]<<8);
-  case  1: a+=((uint64_t)k[ 0]);
-    /* case 0: nothing left to add */
-  }
-  mix64(a,b,c);
-  /*-------------------------------------------- report the result */
-  return c;
-}
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/serializeReflection.cpp b/Code/Tools/HLSLCrossCompilerMETAL/offline/serializeReflection.cpp
deleted file mode 100644
index 15fe8d5b96..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/serializeReflection.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "serializeReflection.h"
-#include "cJSON.h"
-#include <string>
-#include <sstream>
-
-void* jsonMalloc(size_t sz)
-{
-    return new char[sz];
-}
-void jsonFree(void* ptr)
-{
-    char* charPtr = static_cast<char*>(ptr);
-    delete [] charPtr;
-}
-
-static void AppendIntToString(std::string& str, uint32_t num)
-{
-    std::stringstream ss;
-    ss << num;
-    str += ss.str();
-}
-
-static void WriteInOutSignature(InOutSignature* psSignature, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "SemanticName", cJSON_CreateString(psSignature->SemanticName));
-    cJSON_AddItemToObject(obj, "ui32SemanticIndex", cJSON_CreateNumber(psSignature->ui32SemanticIndex));
-    cJSON_AddItemToObject(obj, "eSystemValueType", cJSON_CreateNumber(psSignature->eSystemValueType));
-    cJSON_AddItemToObject(obj, "eComponentType", cJSON_CreateNumber(psSignature->eComponentType));
-    cJSON_AddItemToObject(obj, "ui32Register", cJSON_CreateNumber(psSignature->ui32Register));
-    cJSON_AddItemToObject(obj, "ui32Mask", cJSON_CreateNumber(psSignature->ui32Mask));
-    cJSON_AddItemToObject(obj, "ui32ReadWriteMask", cJSON_CreateNumber(psSignature->ui32ReadWriteMask));
-}
-
-static void WriteResourceBinding(ResourceBinding* psBinding, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psBinding->Name));
-    cJSON_AddItemToObject(obj, "eType", cJSON_CreateNumber(psBinding->eType));
-    cJSON_AddItemToObject(obj, "ui32BindPoint", cJSON_CreateNumber(psBinding->ui32BindPoint));
-    cJSON_AddItemToObject(obj, "ui32BindCount", cJSON_CreateNumber(psBinding->ui32BindCount));
-    cJSON_AddItemToObject(obj, "ui32Flags", cJSON_CreateNumber(psBinding->ui32Flags));
-    cJSON_AddItemToObject(obj, "eDimension", cJSON_CreateNumber(psBinding->eDimension));
-    cJSON_AddItemToObject(obj, "ui32ReturnType", cJSON_CreateNumber(psBinding->ui32ReturnType));
-    cJSON_AddItemToObject(obj, "ui32NumSamples", cJSON_CreateNumber(psBinding->ui32NumSamples));
-}
-
-static void WriteShaderVar(ShaderVar* psVar, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psVar->Name));
-    if(psVar->haveDefaultValue)
-    {
-        cJSON_AddItemToObject(obj, "aui32DefaultValues", cJSON_CreateIntArray((int*)psVar->pui32DefaultValues, psVar->ui32Size/4));
-    }
-    cJSON_AddItemToObject(obj, "ui32StartOffset", cJSON_CreateNumber(psVar->ui32StartOffset));
-    cJSON_AddItemToObject(obj, "ui32Size", cJSON_CreateNumber(psVar->ui32Size));
-}
-
-static void WriteConstantBuffer(ConstantBuffer* psCBuf, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psCBuf->Name));
-    cJSON_AddItemToObject(obj, "ui32NumVars", cJSON_CreateNumber(psCBuf->ui32NumVars));
-
-    for(uint32_t i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        std::string name;
-        name += "var";
-        AppendIntToString(name, i);
-
-        cJSON* varObj = cJSON_CreateObject();
-        cJSON_AddItemToObject(obj, name.c_str(), varObj);
-
-        WriteShaderVar(&psCBuf->asVars[i], varObj);
-    }
-
-    cJSON_AddItemToObject(obj, "ui32TotalSizeInBytes", cJSON_CreateNumber(psCBuf->ui32TotalSizeInBytes));
-}
-
-static void WriteClassType(ClassType* psClassType, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psClassType->Name));
-    cJSON_AddItemToObject(obj, "ui16ID", cJSON_CreateNumber(psClassType->ui16ID));
-    cJSON_AddItemToObject(obj, "ui16ConstBufStride", cJSON_CreateNumber(psClassType->ui16ConstBufStride));
-    cJSON_AddItemToObject(obj, "ui16Texture", cJSON_CreateNumber(psClassType->ui16Texture));
-    cJSON_AddItemToObject(obj, "ui16Sampler", cJSON_CreateNumber(psClassType->ui16Sampler));
-}
-
-static void WriteClassInstance(ClassInstance* psClassInst, cJSON* obj)
-{
-    cJSON_AddItemToObject(obj, "Name", cJSON_CreateString(psClassInst->Name));
-    cJSON_AddItemToObject(obj, "ui16ID", cJSON_CreateNumber(psClassInst->ui16ID));
-    cJSON_AddItemToObject(obj, "ui16ConstBuf", cJSON_CreateNumber(psClassInst->ui16ConstBuf));
-    cJSON_AddItemToObject(obj, "ui16ConstBufOffset", cJSON_CreateNumber(psClassInst->ui16ConstBufOffset));
-    cJSON_AddItemToObject(obj, "ui16Texture", cJSON_CreateNumber(psClassInst->ui16Texture));
-    cJSON_AddItemToObject(obj, "ui16Sampler", cJSON_CreateNumber(psClassInst->ui16Sampler));
-}
-
-const char* SerializeReflection(ShaderInfo* psReflection)
-{
-    cJSON* root;
-
-    cJSON_Hooks hooks;
-    hooks.malloc_fn = jsonMalloc;
-    hooks.free_fn = jsonFree;
-    cJSON_InitHooks(&hooks);
-
-    root=cJSON_CreateObject();
-    cJSON_AddItemToObject(root, "ui32MajorVersion", cJSON_CreateNumber(psReflection->ui32MajorVersion));
-    cJSON_AddItemToObject(root, "ui32MinorVersion", cJSON_CreateNumber(psReflection->ui32MinorVersion));
-
-    cJSON_AddItemToObject(root, "ui32NumInputSignatures", cJSON_CreateNumber(psReflection->ui32NumInputSignatures));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumInputSignatures; ++i)
-    {
-        std::string name;
-        name += "input";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteInOutSignature(psReflection->psInputSignatures+i, obj);
-    }
-
-    cJSON_AddItemToObject(root, "ui32NumOutputSignatures", cJSON_CreateNumber(psReflection->ui32NumOutputSignatures));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumOutputSignatures; ++i)
-    {
-        std::string name;
-        name += "output";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteInOutSignature(psReflection->psOutputSignatures+i, obj);
-    }
-
-    cJSON_AddItemToObject(root, "ui32NumResourceBindings", cJSON_CreateNumber(psReflection->ui32NumResourceBindings));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumResourceBindings; ++i)
-    {
-        std::string name;
-        name += "resource";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteResourceBinding(psReflection->psResourceBindings+i, obj);
-    }
-
-    cJSON_AddItemToObject(root, "ui32NumConstantBuffers", cJSON_CreateNumber(psReflection->ui32NumConstantBuffers));
-
-    for(uint32_t i = 0; i < psReflection->ui32NumConstantBuffers; ++i)
-    {
-        std::string name;
-        name += "cbuf";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteConstantBuffer(psReflection->psConstantBuffers+i, obj);
-    }
-
-    //psThisPointerConstBuffer is a cache. Don't need to write this out.
-    //It just points to the $ThisPointer cbuffer within the psConstantBuffers array.
-
-    for(uint32_t i = 0; i < psReflection->ui32NumClassTypes; ++i)
-    {
-        std::string name;
-        name += "classType";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteClassType(psReflection->psClassTypes+i, obj);
-    }
-
-    for(uint32_t i = 0; i < psReflection->ui32NumClassInstances; ++i)
-    {
-        std::string name;
-        name += "classInst";
-        AppendIntToString(name, i);
-
-        cJSON* obj = cJSON_CreateObject();
-        cJSON_AddItemToObject(root, name.c_str(), obj);
-
-        WriteClassInstance(psReflection->psClassInstances+i, obj);
-    }
-
-    //psReflection->aui32TableIDToTypeID
-    //psReflection->aui32ConstBufferBindpointRemap
-
-    cJSON_AddItemToObject(root, "eTessPartitioning", cJSON_CreateNumber(psReflection->eTessPartitioning));
-    cJSON_AddItemToObject(root, "eTessOutPrim", cJSON_CreateNumber(psReflection->eTessOutPrim));
-
-
-    const char* jsonString = cJSON_Print(root);
-
-    cJSON_Delete(root);
-
-    return jsonString;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/serializeReflection.h b/Code/Tools/HLSLCrossCompilerMETAL/offline/serializeReflection.h
deleted file mode 100644
index c8c4175a6a..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/serializeReflection.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef SERIALIZE_REFLECTION_H_
-#define SERIALIZE_REFLECTION_H_
-
-#include "hlslcc.h"
-
-const char* SerializeReflection(ShaderInfo* psReflection);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/timer.cpp b/Code/Tools/HLSLCrossCompilerMETAL/offline/timer.cpp
deleted file mode 100644
index c707e1bfa8..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/timer.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "timer.h"
-
-void InitTimer(Timer_t* psTimer)
-{
-#if defined(_WIN32)
-    QueryPerformanceFrequency(&psTimer->frequency);
-#endif
-}
-
-void ResetTimer(Timer_t* psTimer)
-{
-#if defined(_WIN32)
-    QueryPerformanceCounter(&psTimer->startCount);
-#else
-    gettimeofday(&psTimer->startCount, 0);
-#endif
-}
-
-/* Returns time in micro seconds */
-double ReadTimer(Timer_t* psTimer)
-{
-    double startTimeInMicroSec, endTimeInMicroSec;
-
-#if defined(_WIN32)
-    const double freq = (1000000.0 / psTimer->frequency.QuadPart);
-    QueryPerformanceCounter(&psTimer->endCount);
-    startTimeInMicroSec = psTimer->startCount.QuadPart * freq;
-    endTimeInMicroSec = psTimer->endCount.QuadPart * freq;
-#else
-    gettimeofday(&psTimer->endCount, 0);
-    startTimeInMicroSec = (psTimer->startCount.tv_sec * 1000000.0) + psTimer->startCount.tv_usec;
-    endTimeInMicroSec = (psTimer->endCount.tv_sec * 1000000.0) + psTimer->endCount.tv_usec;
-#endif
-
-    return endTimeInMicroSec - startTimeInMicroSec;
-}
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/offline/timer.h b/Code/Tools/HLSLCrossCompilerMETAL/offline/timer.h
deleted file mode 100644
index 3f4ea333fd..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/offline/timer.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TIMER_H
-#define TIMER_H
-
-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <sys/time.h>
-#endif
-
-typedef struct
-{
-#ifdef _WIN32
-    LARGE_INTEGER frequency;
-    LARGE_INTEGER startCount;
-    LARGE_INTEGER endCount;
-#else
-    struct timeval startCount;
-    struct timeval endCount;
-#endif
-} Timer_t;
-
-void InitTimer(Timer_t* psTimer);
-void ResetTimer(Timer_t* psTimer);
-double ReadTimer(Timer_t* psTimer);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bsafe.c b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bsafe.c
deleted file mode 100644
index 3f24fa3341..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bsafe.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bsafe.c
- *
- * This is an optional module that can be used to help enforce a safety
- * standard based on pervasive usage of bstrlib.  This file is not necessarily
- * portable, however, it has been tested to work correctly with Intel's C/C++
- * compiler, WATCOM C/C++ v11.x and Microsoft Visual C++.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "bsafe.h"
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bsafe.h b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bsafe.h
deleted file mode 100644
index 3e18e33493..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bsafe.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bsafe.h
- *
- * This is an optional module that can be used to help enforce a safety
- * standard based on pervasive usage of bstrlib.  This file is not necessarily
- * portable, however, it has been tested to work correctly with Intel's C/C++
- * compiler, WATCOM C/C++ v11.x and Microsoft Visual C++.
- */
-
-#ifndef BSTRLIB_BSAFE_INCLUDE
-#define BSTRLIB_BSAFE_INCLUDE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern char * (strncpy) (char *dst, const char *src, size_t n);
-extern char * (strncat) (char *dst, const char *src, size_t n);
-extern char * (strtok) (char *s1, const char *s2);
-extern char * (strdup) (const char *s);
-
-#undef strcpy
-#undef strcat
-#define strcpy(a,b) bsafe_strcpy(a,b) 
-#define strcat(a,b) bsafe_strcat(a,b) 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstraux.c b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstraux.c
deleted file mode 100644
index 2dc7b04840..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstraux.c
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstraux.c
- *
- * This file is not necessarily part of the core bstring library itself, but
- * is just an auxilliary module which includes miscellaneous or trivial 
- * functions.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include "bstrlib.h"
-#include "bstraux.h"
-
-/*  bstring bTail (bstring b, int n)
- *
- *  Return with a string of the last n characters of b.
- */
-bstring bTail (bstring b, int n) {
-    if (b == NULL || n < 0 || (b->mlen < b->slen && b->mlen > 0)) return NULL;
-    if (n >= b->slen) return bstrcpy (b);
-    return bmidstr (b, b->slen - n, n);
-}
-
-/*  bstring bHead (bstring b, int n)
- *
- *  Return with a string of the first n characters of b.
- */
-bstring bHead (bstring b, int n) {
-    if (b == NULL || n < 0 || (b->mlen < b->slen && b->mlen > 0)) return NULL;
-    if (n >= b->slen) return bstrcpy (b);
-    return bmidstr (b, 0, n);
-}
-
-/*  int bFill (bstring a, char c, int len)
- *
- *  Fill a given bstring with the character in parameter c, for a length n.
- */
-int bFill (bstring b, char c, int len) {
-    if (b == NULL || len < 0 || (b->mlen < b->slen && b->mlen > 0)) return -__LINE__;
-    b->slen = 0;
-    return bsetstr (b, len, NULL, c);
-}
-
-/*  int bReplicate (bstring b, int n)
- *
- *  Replicate the contents of b end to end n times and replace it in b.
- */
-int bReplicate (bstring b, int n) {
-    return bpattern (b, n * b->slen);
-}
-
-/*  int bReverse (bstring b)
- *
- *  Reverse the contents of b in place.
- */
-int bReverse (bstring b) {
-int i, n, m;
-unsigned char t;
-
-    if (b == NULL || b->slen < 0 || b->mlen < b->slen) return -__LINE__;
-    n = b->slen;
-    if (2 <= n) {
-        m = ((unsigned)n) >> 1;
-        n--;
-        for (i=0; i < m; i++) {
-            t = b->data[n - i];
-            b->data[n - i] = b->data[i];
-            b->data[i] = t;
-        }
-    }
-    return 0;
-}
-
-/*  int bInsertChrs (bstring b, int pos, int len, unsigned char c, unsigned char fill)
- *
- *  Insert a repeated sequence of a given character into the string at 
- *  position pos for a length len.
- */
-int bInsertChrs (bstring b, int pos, int len, unsigned char c, unsigned char fill) {
-    if (b == NULL || b->slen < 0 || b->mlen < b->slen || pos < 0 || len <= 0) return -__LINE__;
-
-    if (pos > b->slen 
-     && 0 > bsetstr (b, pos, NULL, fill)) return -__LINE__;
-
-    if (0 > balloc (b, b->slen + len)) return -__LINE__;
-    if (pos < b->slen) memmove (b->data + pos + len, b->data + pos, b->slen - pos);
-    memset (b->data + pos, c, len);
-    b->slen += len;
-    b->data[b->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bJustifyLeft (bstring b, int space)
- *
- *  Left justify a string.
- */
-int bJustifyLeft (bstring b, int space) {
-int j, i, s, t;
-unsigned char c = (unsigned char) space;
-
-    if (b == NULL || b->slen < 0 || b->mlen < b->slen) return -__LINE__;
-    if (space != (int) c) return BSTR_OK;
-
-    for (s=j=i=0; i < b->slen; i++) {
-        t = s;
-        s = c != (b->data[j] = b->data[i]);
-        j += (t|s);
-    }
-    if (j > 0 && b->data[j-1] == c) j--;
-
-    b->data[j] = (unsigned char) '\0';
-    b->slen = j;
-    return BSTR_OK;
-}
-
-/*  int bJustifyRight (bstring b, int width, int space)
- *
- *  Right justify a string to within a given width.
- */
-int bJustifyRight (bstring b, int width, int space) {
-int ret;
-    if (width <= 0) return -__LINE__;
-    if (0 > (ret = bJustifyLeft (b, space))) return ret;
-    if (b->slen <= width)
-        return bInsertChrs (b, 0, width - b->slen, (unsigned char) space, (unsigned char) space);
-    return BSTR_OK;
-}
-
-/*  int bJustifyCenter (bstring b, int width, int space)
- *
- *  Center a string's non-white space characters to within a given width by
- *  inserting whitespaces at the beginning.
- */
-int bJustifyCenter (bstring b, int width, int space) {
-int ret;
-    if (width <= 0) return -__LINE__;
-    if (0 > (ret = bJustifyLeft (b, space))) return ret;
-    if (b->slen <= width)
-        return bInsertChrs (b, 0, (width - b->slen + 1) >> 1, (unsigned char) space, (unsigned char) space);
-    return BSTR_OK;
-}
-
-/*  int bJustifyMargin (bstring b, int width, int space)
- *
- *  Stretch a string to flush against left and right margins by evenly
- *  distributing additional white space between words.  If the line is too
- *  long to be margin justified, it is left justified.
- */
-int bJustifyMargin (bstring b, int width, int space) {
-struct bstrList * sl;
-int i, l, c;
-
-    if (b == NULL || b->slen < 0 || b->mlen == 0 || b->mlen < b->slen) return -__LINE__;
-    if (NULL == (sl = bsplit (b, (unsigned char) space))) return -__LINE__;
-    for (l=c=i=0; i < sl->qty; i++) {
-        if (sl->entry[i]->slen > 0) {
-            c ++;
-            l += sl->entry[i]->slen;
-        }
-    }
-
-    if (l + c >= width || c < 2) {
-        bstrListDestroy (sl);
-        return bJustifyLeft (b, space);
-    }
-
-    b->slen = 0;
-    for (i=0; i < sl->qty; i++) {
-        if (sl->entry[i]->slen > 0) {
-            if (b->slen > 0) {
-                int s = (width - l + (c / 2)) / c;
-                bInsertChrs (b, b->slen, s, (unsigned char) space, (unsigned char) space);
-                l += s;
-            }
-            bconcat (b, sl->entry[i]);
-            c--;
-            if (c <= 0) break;
-        }
-    }
-
-    bstrListDestroy (sl);
-    return BSTR_OK;
-}
-
-static size_t readNothing (void *buff, size_t elsize, size_t nelem, void *parm) {
-    buff = buff;
-    elsize = elsize;
-    nelem = nelem;
-    parm = parm;
-    return 0; /* Immediately indicate EOF. */
-}
-
-/*  struct bStream * bsFromBstr (const_bstring b);
- *
- *  Create a bStream whose contents are a copy of the bstring passed in.
- *  This allows the use of all the bStream APIs with bstrings.
- */
-struct bStream * bsFromBstr (const_bstring b) {
-struct bStream * s = bsopen ((bNread) readNothing, NULL);
-    bsunread (s, b); /* Push the bstring data into the empty bStream. */
-    return s;
-}
-
-static size_t readRef (void *buff, size_t elsize, size_t nelem, void *parm) {
-struct tagbstring * t = (struct tagbstring *) parm;
-size_t tsz = elsize * nelem;
-
-    if (tsz > (size_t) t->slen) tsz = (size_t) t->slen;
-    if (tsz > 0) {
-        memcpy (buff, t->data, tsz);
-        t->slen -= (int) tsz;
-        t->data += tsz;
-        return tsz / elsize;
-    }
-    return 0;
-}
-
-/*  The "by reference" version of the above function.  This function puts
- *  a number of restrictions on the call site (the passed in struct 
- *  tagbstring *will* be modified by this function, and the source data
- *  must remain alive and constant for the lifetime of the bStream).  
- *  Hence it is not presented as an extern.
- */
-static struct bStream * bsFromBstrRef (struct tagbstring * t) {
-    if (!t) return NULL;
-    return bsopen ((bNread) readRef, t);
-}
-
-/*  char * bStr2NetStr (const_bstring b)
- *
- *  Convert a bstring to a netstring.  See 
- *  http://cr.yp.to/proto/netstrings.txt for a description of netstrings.
- *  Note: 1) The value returned should be freed with a call to bcstrfree() at 
- *           the point when it will no longer be referenced to avoid a memory 
- *           leak.
- *        2) If the returned value is non-NULL, then it also '\0' terminated
- *           in the character position one past the "," terminator.
- */
-char * bStr2NetStr (const_bstring b) {
-char strnum[sizeof (b->slen) * 3 + 1];
-bstring s;
-unsigned char * buff;
-
-    if (b == NULL || b->data == NULL || b->slen < 0) return NULL;
-    sprintf (strnum, "%d:", b->slen);
-    if (NULL == (s = bfromcstr (strnum))
-     || bconcat (s, b) == BSTR_ERR || bconchar (s, (char) ',') == BSTR_ERR) {
-        bdestroy (s);
-        return NULL;
-    }
-    buff = s->data;
-    bcstrfree ((char *) s);
-    return (char *) buff;
-}
-
-/*  bstring bNetStr2Bstr (const char * buf)
- *
- *  Convert a netstring to a bstring.  See 
- *  http://cr.yp.to/proto/netstrings.txt for a description of netstrings.
- *  Note that the terminating "," *must* be present, however a following '\0'
- *  is *not* required.
- */
-bstring bNetStr2Bstr (const char * buff) {
-int i, x;
-bstring b;
-    if (buff == NULL) return NULL;
-    x = 0;
-    for (i=0; buff[i] != ':'; i++) {
-        unsigned int v = buff[i] - '0';
-        if (v > 9 || x > ((INT_MAX - (signed int)v) / 10)) return NULL;
-        x = (x * 10) + v;
-    }
-
-    /* This thing has to be properly terminated */
-    if (buff[i + 1 + x] != ',') return NULL;
-
-    if (NULL == (b = bfromcstr (""))) return NULL;
-    if (balloc (b, x + 1) != BSTR_OK)  {
-        bdestroy (b);
-        return NULL;
-    }
-    memcpy (b->data, buff + i + 1, x);
-    b->data[x] = (unsigned char) '\0';
-    b->slen = x;
-    return b;
-}
-
-static char b64ETable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/*  bstring bBase64Encode (const_bstring b)
- *
- *  Generate a base64 encoding.  See: RFC1341
- */
-bstring bBase64Encode (const_bstring b) {
-int i, c0, c1, c2, c3;
-bstring out;
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-
-    out = bfromcstr ("");
-    for (i=0; i + 2 < b->slen; i += 3) {
-        if (i && ((i % 57) == 0)) {
-            if (bconchar (out, (char) '\015') < 0 || bconchar (out, (char) '\012') < 0) {
-                bdestroy (out);
-                return NULL;
-            }
-        }
-        c0 = b->data[i] >> 2;
-        c1 = ((b->data[i] << 4) |
-              (b->data[i+1] >> 4)) & 0x3F;
-        c2 = ((b->data[i+1] << 2) |
-              (b->data[i+2] >> 6)) & 0x3F;
-        c3 = b->data[i+2] & 0x3F;
-        if (bconchar (out, b64ETable[c0]) < 0 ||
-            bconchar (out, b64ETable[c1]) < 0 ||
-            bconchar (out, b64ETable[c2]) < 0 ||
-            bconchar (out, b64ETable[c3]) < 0) {
-            bdestroy (out);
-            return NULL;
-        }
-    }
-
-    if (i && ((i % 57) == 0)) {
-        if (bconchar (out, (char) '\015') < 0 || bconchar (out, (char) '\012') < 0) {
-            bdestroy (out);
-            return NULL;
-        }
-    }
-
-    switch (i + 2 - b->slen) {
-        case 0:    c0 = b->data[i] >> 2;
-                c1 = ((b->data[i] << 4) |
-                      (b->data[i+1] >> 4)) & 0x3F;
-                c2 = (b->data[i+1] << 2) & 0x3F;
-            if (bconchar (out, b64ETable[c0]) < 0 ||
-                bconchar (out, b64ETable[c1]) < 0 ||
-                bconchar (out, b64ETable[c2]) < 0 ||
-                bconchar (out, (char) '=') < 0) {
-                bdestroy (out);
-                return NULL;
-            }
-            break;
-        case 1:    c0 =  b->data[i] >> 2;
-                c1 = (b->data[i] << 4) & 0x3F;
-            if (bconchar (out, b64ETable[c0]) < 0 ||
-                bconchar (out, b64ETable[c1]) < 0 ||
-                bconchar (out, (char) '=') < 0 ||
-                bconchar (out, (char) '=') < 0) {
-                bdestroy (out);
-                return NULL;
-            }
-            break;
-        case 2: break;
-    }
-
-    return out;
-}
-
-#define B64_PAD (-2)
-#define B64_ERR (-1)
-
-static int base64DecodeSymbol (unsigned char alpha) {
-   if      ((alpha >= 'A') && (alpha <= 'Z')) return (int)(alpha - 'A');
-   else if ((alpha >= 'a') && (alpha <= 'z'))
-        return 26 + (int)(alpha - 'a');
-   else if ((alpha >= '0') && (alpha <= '9'))
-        return 52 + (int)(alpha - '0');
-   else if (alpha == '+') return 62;
-   else if (alpha == '/') return 63;
-   else if (alpha == '=') return B64_PAD;
-   else                   return B64_ERR;
-}
-
-/*  bstring bBase64DecodeEx (const_bstring b, int * boolTruncError)
- *
- *  Decode a base64 block of data.  All MIME headers are assumed to have been
- *  removed.  See: RFC1341
- */
-bstring bBase64DecodeEx (const_bstring b, int * boolTruncError) {
-int i, v;
-unsigned char c0, c1, c2;
-bstring out;
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-    if (boolTruncError) *boolTruncError = 0;
-    out = bfromcstr ("");
-    i = 0;
-    for (;;) {
-        do {
-            if (i >= b->slen) return out;
-            if (b->data[i] == '=') {    /* Bad "too early" truncation */
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c0 = (unsigned char) (v << 2);
-        do {
-            if (i >= b->slen || b->data[i] == '=') {    /* Bad "too early" truncation */
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c0 |= (unsigned char) (v >> 4);
-        c1  = (unsigned char) (v << 4);
-        do {
-            if (i >= b->slen) {
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            if (b->data[i] == '=') {
-                i++;
-                if (i >= b->slen || b->data[i] != '=' || bconchar (out, c0) < 0) {
-                    if (boolTruncError) {
-                        *boolTruncError = 1;
-                        return out;
-                    }
-                    bdestroy (out); /* Missing "=" at the end. */
-                    return NULL;
-                }
-                return out;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c1 |= (unsigned char) (v >> 2);
-        c2  = (unsigned char) (v << 6);
-        do {
-            if (i >= b->slen) {
-                if (boolTruncError) {
-                    *boolTruncError = 1;
-                    return out;
-                }
-                bdestroy (out);
-                return NULL;
-            }
-            if (b->data[i] == '=') {
-                if (bconchar (out, c0) < 0 || bconchar (out, c1) < 0) {
-                    if (boolTruncError) {
-                        *boolTruncError = 1;
-                        return out;
-                    }
-                    bdestroy (out);
-                    return NULL;
-                }
-                if (boolTruncError) *boolTruncError = 0;
-                return out;
-            }
-            v = base64DecodeSymbol (b->data[i]);
-            i++;
-        } while (v < 0);
-        c2 |= (unsigned char) (v);
-        if (bconchar (out, c0) < 0 ||
-            bconchar (out, c1) < 0 ||
-            bconchar (out, c2) < 0) {
-            if (boolTruncError) {
-                *boolTruncError = -1;
-                return out;
-            }
-            bdestroy (out);
-            return NULL;
-        }
-    }
-}
-
-#define UU_DECODE_BYTE(b) (((b) == (signed int)'`') ? 0 : (b) - (signed int)' ')
-
-struct bUuInOut {
-    bstring src, dst;
-    int * badlines;
-};
-
-#define UU_MAX_LINELEN 45
-
-static int bUuDecLine (void * parm, int ofs, int len) {
-struct bUuInOut * io = (struct bUuInOut *) parm;
-bstring s = io->src;
-bstring t = io->dst;
-int i, llen, otlen, ret, c0, c1, c2, c3, d0, d1, d2, d3;
-
-    if (len == 0) return 0;
-    llen = UU_DECODE_BYTE (s->data[ofs]);
-    ret = 0;
-
-    otlen = t->slen;
-
-    if (((unsigned) llen) > UU_MAX_LINELEN) { ret = -__LINE__; 
-        goto bl;
-    }
-
-    llen += t->slen;
-
-    for (i=1; i < s->slen && t->slen < llen;i += 4) {
-        unsigned char outoctet[3];
-        c0 = UU_DECODE_BYTE (d0 = (int) bchare (s, i+ofs+0, ' ' - 1));
-        c1 = UU_DECODE_BYTE (d1 = (int) bchare (s, i+ofs+1, ' ' - 1));
-        c2 = UU_DECODE_BYTE (d2 = (int) bchare (s, i+ofs+2, ' ' - 1));
-        c3 = UU_DECODE_BYTE (d3 = (int) bchare (s, i+ofs+3, ' ' - 1));
-
-        if (((unsigned) (c0|c1) >= 0x40)) { if (!ret) ret = -__LINE__;
-            if (d0 > 0x60 || (d0 < (' ' - 1) && !isspace (d0)) ||
-                d1 > 0x60 || (d1 < (' ' - 1) && !isspace (d1))) {
-                t->slen = otlen;
-                goto bl;
-            }
-            c0 = c1 = 0;
-        }
-        outoctet[0] = (unsigned char) ((c0 << 2) | ((unsigned) c1 >> 4));
-        if (t->slen+1 >= llen) {
-            if (0 > bconchar (t, (char) outoctet[0])) return -__LINE__;
-            break;
-        }
-        if ((unsigned) c2 >= 0x40) { if (!ret) ret = -__LINE__;
-            if (d2 > 0x60 || (d2 < (' ' - 1) && !isspace (d2))) {
-                t->slen = otlen;
-                goto bl;
-            }
-            c2 = 0;
-        }
-        outoctet[1] = (unsigned char) ((c1 << 4) | ((unsigned) c2 >> 2));
-        if (t->slen+2 >= llen) {
-            if (0 > bcatblk (t, outoctet, 2)) return -__LINE__;
-            break;
-        }
-        if ((unsigned) c3 >= 0x40) { if (!ret) ret = -__LINE__;
-            if (d3 > 0x60 || (d3 < (' ' - 1) && !isspace (d3))) {
-                t->slen = otlen;
-                goto bl;
-            }
-            c3 = 0;
-        }
-        outoctet[2] = (unsigned char) ((c2 << 6) | ((unsigned) c3));
-        if (0 > bcatblk (t, outoctet, 3)) return -__LINE__;
-    }
-    if (t->slen < llen) { if (0 == ret) ret = -__LINE__;
-        t->slen = otlen;
-    }
-    bl:;
-    if (ret && io->badlines) {
-        (*io->badlines)++;
-        return 0;
-    }
-    return ret;
-}
-
-/*  bstring bUuDecodeEx (const_bstring src, int * badlines)
- *
- *  Performs a UUDecode of a block of data.  If there are errors in the
- *  decoding, they are counted up and returned in "badlines", if badlines is
- *  not NULL. It is assumed that the "begin" and "end" lines have already 
- *  been stripped off.  The potential security problem of writing the 
- *  filename in the begin line is something that is beyond the scope of a 
- *  portable library.
- */
-
-#ifdef _MSC_VER
-#pragma warning(disable:4204)
-#endif
-
-bstring bUuDecodeEx (const_bstring src, int * badlines) {
-struct tagbstring t;
-struct bStream * s;
-struct bStream * d;
-bstring b;
-
-    if (!src) return NULL;
-    t = *src; /* Short lifetime alias to header of src */
-    s = bsFromBstrRef (&t); /* t is undefined after this */
-    if (!s) return NULL;
-    d = bsUuDecode (s, badlines);
-    b = bfromcstralloc (256, "");
-    if (NULL == b || 0 > bsread (b, d, INT_MAX)) {
-        bdestroy (b);
-        bsclose (d);
-        bsclose (s);
-        return NULL;
-    }
-    return b;
-}
-
-struct bsUuCtx {
-    struct bUuInOut io;
-    struct bStream * sInp;
-};
-
-static size_t bsUuDecodePart (void *buff, size_t elsize, size_t nelem, void *parm) {
-static struct tagbstring eol = bsStatic ("\r\n");
-struct bsUuCtx * luuCtx = (struct bsUuCtx *) parm;
-size_t tsz;
-int l, lret;
-
-    if (NULL == buff || NULL == parm) return 0;
-    tsz = elsize * nelem;
-
-    CheckInternalBuffer:;
-    /* If internal buffer has sufficient data, just output it */
-    if (((size_t) luuCtx->io.dst->slen) > tsz) {
-        memcpy (buff, luuCtx->io.dst->data, tsz);
-        bdelete (luuCtx->io.dst, 0, (int) tsz);
-        return nelem;
-    }
-
-    DecodeMore:;
-    if (0 <= (l = binchr (luuCtx->io.src, 0, &eol))) {
-        int ol = 0;
-        struct tagbstring t;
-        bstring s = luuCtx->io.src;
-        luuCtx->io.src = &t;
-
-        do {
-            if (l > ol) {
-                bmid2tbstr (t, s, ol, l - ol);
-                lret = bUuDecLine (&luuCtx->io, 0, t.slen);
-                if (0 > lret) {
-                    luuCtx->io.src = s;
-                    goto Done;
-                }
-            }
-            ol = l + 1;
-            if (((size_t) luuCtx->io.dst->slen) > tsz) break;
-            l = binchr (s, ol, &eol);
-        } while (BSTR_ERR != l);
-        bdelete (s, 0, ol);
-        luuCtx->io.src = s;
-        goto CheckInternalBuffer;
-    }
-
-    if (BSTR_ERR != bsreada (luuCtx->io.src, luuCtx->sInp, bsbufflength (luuCtx->sInp, BSTR_BS_BUFF_LENGTH_GET))) {
-        goto DecodeMore;
-    }
-
-    bUuDecLine (&luuCtx->io, 0, luuCtx->io.src->slen);
-
-    Done:;
-    /* Output any lingering data that has been translated */
-    if (((size_t) luuCtx->io.dst->slen) > 0) {
-        if (((size_t) luuCtx->io.dst->slen) > tsz) goto CheckInternalBuffer;
-        memcpy (buff, luuCtx->io.dst->data, luuCtx->io.dst->slen);
-        tsz = luuCtx->io.dst->slen / elsize;
-        luuCtx->io.dst->slen = 0;
-        if (tsz > 0) return tsz;
-    }
-
-    /* Deallocate once EOF becomes triggered */
-    bdestroy (luuCtx->io.dst);
-    bdestroy (luuCtx->io.src);
-    free (luuCtx);
-    return 0;
-}
-
-/*  bStream * bsUuDecode (struct bStream * sInp, int * badlines)
- *
- *  Creates a bStream which performs the UUDecode of an an input stream.  If
- *  there are errors in the decoding, they are counted up and returned in 
- *  "badlines", if badlines is not NULL. It is assumed that the "begin" and 
- *  "end" lines have already been stripped off.  The potential security 
- *  problem of writing the filename in the begin line is something that is 
- *  beyond the scope of a portable library.
- */
-
-struct bStream * bsUuDecode (struct bStream * sInp, int * badlines) {
-struct bsUuCtx * luuCtx = (struct bsUuCtx *) malloc (sizeof (struct bsUuCtx));
-struct bStream * sOut;
-
-    if (NULL == luuCtx) return NULL;
-
-    luuCtx->io.src = bfromcstr ("");
-    luuCtx->io.dst = bfromcstr ("");
-    if (NULL == luuCtx->io.dst || NULL == luuCtx->io.src) {
-        CleanUpFailureToAllocate:;
-        bdestroy (luuCtx->io.dst);
-        bdestroy (luuCtx->io.src);
-        free (luuCtx);
-        return NULL;
-    }
-    luuCtx->io.badlines = badlines;
-    if (badlines) *badlines = 0;
-
-    luuCtx->sInp = sInp;
-
-    sOut = bsopen ((bNread) bsUuDecodePart, luuCtx);
-    if (NULL == sOut) goto CleanUpFailureToAllocate;
-    return sOut;
-}
-
-#define UU_ENCODE_BYTE(b) (char) (((b) == 0) ? '`' : ((b) + ' '))
-
-/*  bstring bUuEncode (const_bstring src)
- *
- *  Performs a UUEncode of a block of data.  The "begin" and "end" lines are 
- *  not appended.
- */
-bstring bUuEncode (const_bstring src) {
-bstring out;
-int i, j, jm;
-unsigned int c0, c1, c2;
-    if (src == NULL || src->slen < 0 || src->data == NULL) return NULL;
-    if ((out = bfromcstr ("")) == NULL) return NULL;
-    for (i=0; i < src->slen; i += UU_MAX_LINELEN) {
-        if ((jm = i + UU_MAX_LINELEN) > src->slen) jm = src->slen;
-        if (bconchar (out, UU_ENCODE_BYTE (jm - i)) < 0) {
-            bstrFree (out);
-            break;
-        }
-        for (j = i; j < jm; j += 3) {
-            c0 = (unsigned int) bchar (src, j    );
-            c1 = (unsigned int) bchar (src, j + 1);
-            c2 = (unsigned int) bchar (src, j + 2);
-            if (bconchar (out, UU_ENCODE_BYTE ( (c0 & 0xFC) >> 2)) < 0 ||
-                bconchar (out, UU_ENCODE_BYTE (((c0 & 0x03) << 4) | ((c1 & 0xF0) >> 4))) < 0 ||
-                bconchar (out, UU_ENCODE_BYTE (((c1 & 0x0F) << 2) | ((c2 & 0xC0) >> 6))) < 0 ||
-                bconchar (out, UU_ENCODE_BYTE ( (c2 & 0x3F))) < 0) {
-                bstrFree (out);
-                goto End;
-            }
-        }
-        if (bconchar (out, (char) '\r') < 0 || bconchar (out, (char) '\n') < 0) {
-            bstrFree (out);
-            break;
-        }
-    }
-    End:;
-    return out;
-}
-
-/*  bstring bYEncode (const_bstring src)
- *
- *  Performs a YEncode of a block of data.  No header or tail info is 
- *  appended.  See: http://www.yenc.org/whatis.htm and 
- *  http://www.yenc.org/yenc-draft.1.3.txt
- */
-bstring bYEncode (const_bstring src) {
-int i;
-bstring out;
-unsigned char c;
-
-    if (src == NULL || src->slen < 0 || src->data == NULL) return NULL;
-    if ((out = bfromcstr ("")) == NULL) return NULL;
-    for (i=0; i < src->slen; i++) {
-        c = (unsigned char)(src->data[i] + 42);
-        if (c == '=' || c == '\0' || c == '\r' || c == '\n') {
-            if (0 > bconchar (out, (char) '=')) {
-                bdestroy (out);
-                return NULL;
-            }
-            c += (unsigned char) 64;
-        }
-        if (0 > bconchar (out, c)) {
-            bdestroy (out);
-            return NULL;
-        }
-    }
-    return out;
-}
-
-/*  bstring bYDecode (const_bstring src)
- *
- *  Performs a YDecode of a block of data.  See: 
- *  http://www.yenc.org/whatis.htm and http://www.yenc.org/yenc-draft.1.3.txt
- */
-#define MAX_OB_LEN (64)
-
-bstring bYDecode (const_bstring src) {
-int i;
-bstring out;
-unsigned char c;
-unsigned char octetbuff[MAX_OB_LEN];
-int obl;
-
-    if (src == NULL || src->slen < 0 || src->data == NULL) return NULL;
-    if ((out = bfromcstr ("")) == NULL) return NULL;
-
-    obl = 0;
-
-    for (i=0; i < src->slen; i++) {
-        if ('=' == (c = src->data[i])) { /* The = escape mode */
-            i++;
-            if (i >= src->slen) {
-                bdestroy (out);
-                return NULL;
-            }
-            c = (unsigned char) (src->data[i] - 64);
-        } else {
-            if ('\0' == c) {
-                bdestroy (out);
-                return NULL;
-            }
-
-            /* Extraneous CR/LFs are to be ignored. */
-            if (c == '\r' || c == '\n') continue;
-        }
-
-        octetbuff[obl] = (unsigned char) ((int) c - 42);
-        obl++;
-
-        if (obl >= MAX_OB_LEN) {
-            if (0 > bcatblk (out, octetbuff, obl)) {
-                bdestroy (out);
-                return NULL;
-            }
-            obl = 0;
-        }
-    }
-
-    if (0 > bcatblk (out, octetbuff, obl)) {
-        bdestroy (out);
-        out = NULL;
-    }
-    return out;
-}
-
-/*  bstring bStrfTime (const char * fmt, const struct tm * timeptr)
- *
- *  Takes a format string that is compatible with strftime and a struct tm
- *  pointer, formats the time according to the format string and outputs
- *  the bstring as a result. Note that if there is an early generation of a 
- *  '\0' character, the bstring will be truncated to this end point.
- */
-bstring bStrfTime (const char * fmt, const struct tm * timeptr) {
-#if defined (__TURBOC__) && !defined (__BORLANDC__)
-static struct tagbstring ns = bsStatic ("bStrfTime Not supported");
-    fmt = fmt;
-    timeptr = timeptr;
-    return &ns;
-#else
-bstring buff;
-int n;
-size_t r;
-
-    if (fmt == NULL) return NULL;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "strftime" call on increasing 
-       potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < 16) n = 16;
-    buff = bfromcstralloc (n+2, "");
-
-    for (;;) {
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return NULL;
-        }
-
-        r = strftime ((char *) buff->data, n + 1, fmt, timeptr);
-
-        if (r > 0) {
-            buff->slen = (int) r;
-            break;
-        }
-
-        n += n;
-    }
-
-    return buff;
-#endif
-}
-
-/*  int bSetCstrChar (bstring a, int pos, char c)
- *
- *  Sets the character at position pos to the character c in the bstring a.
- *  If the character c is NUL ('\0') then the string is truncated at this
- *  point.  Note: this does not enable any other '\0' character in the bstring
- *  as terminator indicator for the string.  pos must be in the position 
- *  between 0 and b->slen inclusive, otherwise BSTR_ERR will be returned.
- */
-int bSetCstrChar (bstring b, int pos, char c) {
-    if (NULL == b || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen)
-        return BSTR_ERR;
-    if (pos < 0 || pos > b->slen) return BSTR_ERR;
-
-    if (pos == b->slen) {
-        if ('\0' != c) return bconchar (b, c);
-        return 0;
-    }
-
-    b->data[pos] = (unsigned char) c;
-    if ('\0' == c) b->slen = pos;
-
-    return 0;
-}
-
-/*  int bSetChar (bstring b, int pos, char c)
- *
- *  Sets the character at position pos to the character c in the bstring a.
- *  The string is not truncated if the character c is NUL ('\0').  pos must
- *  be in the position between 0 and b->slen inclusive, otherwise BSTR_ERR
- *  will be returned.
- */
-int bSetChar (bstring b, int pos, char c) {
-    if (NULL == b || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen)
-        return BSTR_ERR;
-    if (pos < 0 || pos > b->slen) return BSTR_ERR;
-
-    if (pos == b->slen) {
-        return bconchar (b, c);
-    }
-
-    b->data[pos] = (unsigned char) c;
-    return 0;
-}
-
-#define INIT_SECURE_INPUT_LENGTH (256)
-
-/*  bstring bSecureInput (int maxlen, int termchar, 
- *                        bNgetc vgetchar, void * vgcCtx)
- *
- *  Read input from an abstracted input interface, for a length of at most
- *  maxlen characters.  If maxlen <= 0, then there is no length limit put
- *  on the input.  The result is terminated early if vgetchar() return EOF
- *  or the user specified value termchar.
- *
- */
-bstring bSecureInput (int maxlen, int termchar, bNgetc vgetchar, void * vgcCtx) {
-int i, m, c;
-bstring b, t;
-
-    if (!vgetchar) return NULL;
-
-    b = bfromcstralloc (INIT_SECURE_INPUT_LENGTH, "");
-    if ((c = UCHAR_MAX + 1) == termchar) c++;
-
-    for (i=0; ; i++) {
-        if (termchar == c || (maxlen > 0 && i >= maxlen)) c = EOF;
-        else c = vgetchar (vgcCtx);
-
-        if (EOF == c) break;
-
-        if (i+1 >= b->mlen) {
-
-            /* Double size, but deal with unusual case of numeric
-               overflows */
-
-            if ((m = b->mlen << 1)   <= b->mlen &&
-                (m = b->mlen + 1024) <= b->mlen &&
-                (m = b->mlen + 16)   <= b->mlen &&
-                (m = b->mlen + 1)    <= b->mlen) t = NULL;
-            else t = bfromcstralloc (m, "");
-
-            if (t) memcpy (t->data, b->data, i);
-            bSecureDestroy (b); /* Cleanse previous buffer */
-            b = t;
-            if (!b) return b;
-        }
-
-        b->data[i] = (unsigned char) c;
-    }
-
-    b->slen = i;
-    b->data[i] = (unsigned char) '\0';
-    return b;
-}
-
-#define BWS_BUFF_SZ (1024)
-
-struct bwriteStream {
-    bstring buff;    /* Buffer for underwrites                   */
-    void * parm;     /* The stream handle for core stream        */
-    bNwrite writeFn; /* fwrite work-a-like fnptr for core stream */
-    int isEOF;       /* track stream's EOF state                 */
-    int minBuffSz;
-};
-
-/*  struct bwriteStream * bwsOpen (bNwrite writeFn, void * parm)
- *
- *  Wrap a given open stream (described by a fwrite work-a-like function 
- *  pointer and stream handle) into an open bwriteStream suitable for write
- *  streaming functions.
- */
-struct bwriteStream * bwsOpen (bNwrite writeFn, void * parm) {
-struct bwriteStream * ws;
-
-    if (NULL == writeFn) return NULL;
-    ws = (struct bwriteStream *) malloc (sizeof (struct bwriteStream));
-    if (ws) {
-        if (NULL == (ws->buff = bfromcstr (""))) {
-            free (ws);
-            ws = NULL;
-        } else {
-            ws->parm = parm;
-            ws->writeFn = writeFn;
-            ws->isEOF = 0;
-            ws->minBuffSz = BWS_BUFF_SZ;
-        }
-    }
-    return ws;
-}
-
-#define internal_bwswriteout(ws,b) { \
-    if ((b)->slen > 0) { \
-        if (1 != (ws->writeFn ((b)->data, (b)->slen, 1, ws->parm))) { \
-            ws->isEOF = 1; \
-            return BSTR_ERR; \
-        } \
-    } \
-}
-
-/*  int bwsWriteFlush (struct bwriteStream * ws)
- *
- *  Force any pending data to be written to the core stream.
- */
-int bwsWriteFlush (struct bwriteStream * ws) {
-    if (NULL == ws || ws->isEOF || 0 >= ws->minBuffSz || 
-        NULL == ws->writeFn || NULL == ws->buff) return BSTR_ERR;
-    internal_bwswriteout (ws, ws->buff);
-    ws->buff->slen = 0;
-    return 0;
-}
-
-/*  int bwsWriteBstr (struct bwriteStream * ws, const_bstring b)
- *
- *  Send a bstring to a bwriteStream.  If the stream is at EOF BSTR_ERR is
- *  returned.  Note that there is no deterministic way to determine the exact
- *  cut off point where the core stream stopped accepting data.
- */
-int bwsWriteBstr (struct bwriteStream * ws, const_bstring b) {
-struct tagbstring t;
-int l;
-
-    if (NULL == ws || NULL == b || NULL == ws->buff ||
-        ws->isEOF || 0 >= ws->minBuffSz || NULL == ws->writeFn)
-        return BSTR_ERR;
-
-    /* Buffer prepacking optimization */
-    if (b->slen > 0 && ws->buff->mlen - ws->buff->slen > b->slen) {
-        static struct tagbstring empty = bsStatic ("");
-        if (0 > bconcat (ws->buff, b)) return BSTR_ERR;
-        return bwsWriteBstr (ws, &empty);
-    }
-
-    if (0 > (l = ws->minBuffSz - ws->buff->slen)) {
-        internal_bwswriteout (ws, ws->buff);
-        ws->buff->slen = 0;
-        l = ws->minBuffSz;
-    }
-
-    if (b->slen < l) return bconcat (ws->buff, b);
-
-    if (0 > bcatblk (ws->buff, b->data, l)) return BSTR_ERR;
-    internal_bwswriteout (ws, ws->buff);
-    ws->buff->slen = 0;
-
-    bmid2tbstr (t, (bstring) b, l, b->slen);
-
-    if (t.slen >= ws->minBuffSz) {
-        internal_bwswriteout (ws, &t);
-        return 0;
-    }
-
-    return bassign (ws->buff, &t);
-}
-
-/*  int bwsWriteBlk (struct bwriteStream * ws, void * blk, int len)
- *
- *  Send a block of data a bwriteStream.  If the stream is at EOF BSTR_ERR is 
- *  returned.
- */
-int bwsWriteBlk (struct bwriteStream * ws, void * blk, int len) {
-struct tagbstring t;
-    if (NULL == blk || len < 0) return BSTR_ERR;
-    blk2tbstr (t, blk, len);
-    return bwsWriteBstr (ws, &t);
-}
-
-/*  int bwsIsEOF (const struct bwriteStream * ws)
- *
- *  Returns 0 if the stream is currently writable, 1 if the core stream has 
- *  responded by not accepting the previous attempted write.
- */
-int bwsIsEOF (const struct bwriteStream * ws) {
-    if (NULL == ws || NULL == ws->buff || 0 > ws->minBuffSz || 
-        NULL == ws->writeFn) return BSTR_ERR;
-    return ws->isEOF;
-}
-
-/*  int bwsBuffLength (struct bwriteStream * ws, int sz)
- *
- *  Set the length of the buffer used by the bwsStream.  If sz is zero, the 
- *  length is not set.  This function returns with the previous length.
- */
-int bwsBuffLength (struct bwriteStream * ws, int sz) {
-int oldSz;
-    if (ws == NULL || sz < 0) return BSTR_ERR;
-    oldSz = ws->minBuffSz;
-    if (sz > 0) ws->minBuffSz = sz;
-    return oldSz;
-}
-
-/*  void * bwsClose (struct bwriteStream * s)
- *
- *  Close the bwriteStream, and return the handle to the stream that was 
- *  originally used to open the given stream.  Note that even if the stream
- *  is at EOF it still needs to be closed with a call to bwsClose.
- */
-void * bwsClose (struct bwriteStream * ws) {
-void * parm;
-    if (NULL == ws || NULL == ws->buff || 0 >= ws->minBuffSz || 
-        NULL == ws->writeFn) return NULL;
-    bwsWriteFlush (ws);
-    parm = ws->parm;
-    ws->parm = NULL;
-    ws->minBuffSz = -1;
-    ws->writeFn = NULL;
-    bstrFree (ws->buff);
-    free (ws);
-    return parm;
-}
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstraux.h b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstraux.h
deleted file mode 100644
index e10c6e1a68..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstraux.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstraux.h
- *
- * This file is not a necessary part of the core bstring library itself, but
- * is just an auxilliary module which includes miscellaneous or trivial 
- * functions.
- */
-
-#ifndef BSTRAUX_INCLUDE
-#define BSTRAUX_INCLUDE
-
-#include <time.h>
-#include "bstrlib.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Safety mechanisms */
-#define bstrDeclare(b)               bstring (b) = NULL; 
-#define bstrFree(b)                  {if ((b) != NULL && (b)->slen >= 0 && (b)->mlen >= (b)->slen) { bdestroy (b); (b) = NULL; }}
-
-/* Backward compatibilty with previous versions of Bstrlib */
-#define bAssign(a,b)                 ((bassign)((a), (b)))
-#define bSubs(b,pos,len,a,c)         ((breplace)((b),(pos),(len),(a),(unsigned char)(c)))
-#define bStrchr(b,c)                 ((bstrchr)((b), (c)))
-#define bStrchrFast(b,c)             ((bstrchr)((b), (c)))
-#define bCatCstr(b,s)                ((bcatcstr)((b), (s)))
-#define bCatBlk(b,s,len)             ((bcatblk)((b),(s),(len)))
-#define bCatStatic(b,s)              bCatBlk ((b), ("" s ""), sizeof (s) - 1)
-#define bTrunc(b,n)                  ((btrunc)((b), (n)))
-#define bReplaceAll(b,find,repl,pos) ((bfindreplace)((b),(find),(repl),(pos)))
-#define bUppercase(b)                ((btoupper)(b))
-#define bLowercase(b)                ((btolower)(b))
-#define bCaselessCmp(a,b)            ((bstricmp)((a), (b)))
-#define bCaselessNCmp(a,b,n)         ((bstrnicmp)((a), (b), (n)))
-#define bBase64Decode(b)             (bBase64DecodeEx ((b), NULL))
-#define bUuDecode(b)                 (bUuDecodeEx ((b), NULL))
-
-/* Unusual functions */
-extern struct bStream * bsFromBstr (const_bstring b);
-extern bstring bTail (bstring b, int n);
-extern bstring bHead (bstring b, int n);
-extern int bSetCstrChar (bstring a, int pos, char c);
-extern int bSetChar (bstring b, int pos, char c);
-extern int bFill (bstring a, char c, int len);
-extern int bReplicate (bstring b, int n);
-extern int bReverse (bstring b);
-extern int bInsertChrs (bstring b, int pos, int len, unsigned char c, unsigned char fill);
-extern bstring bStrfTime (const char * fmt, const struct tm * timeptr);
-#define bAscTime(t) (bStrfTime ("%c\n", (t)))
-#define bCTime(t)   ((t) ? bAscTime (localtime (t)) : NULL)
-
-/* Spacing formatting */
-extern int bJustifyLeft (bstring b, int space);
-extern int bJustifyRight (bstring b, int width, int space);
-extern int bJustifyMargin (bstring b, int width, int space);
-extern int bJustifyCenter (bstring b, int width, int space);
-
-/* Esoteric standards specific functions */
-extern char * bStr2NetStr (const_bstring b);
-extern bstring bNetStr2Bstr (const char * buf);
-extern bstring bBase64Encode (const_bstring b);
-extern bstring bBase64DecodeEx (const_bstring b, int * boolTruncError);
-extern struct bStream * bsUuDecode (struct bStream * sInp, int * badlines);
-extern bstring bUuDecodeEx (const_bstring src, int * badlines);
-extern bstring bUuEncode (const_bstring src);
-extern bstring bYEncode (const_bstring src);
-extern bstring bYDecode (const_bstring src);
-
-/* Writable stream */
-typedef int (* bNwrite) (const void * buf, size_t elsize, size_t nelem, void * parm);
-
-struct bwriteStream * bwsOpen (bNwrite writeFn, void * parm);
-int bwsWriteBstr (struct bwriteStream * stream, const_bstring b);
-int bwsWriteBlk (struct bwriteStream * stream, void * blk, int len);
-int bwsWriteFlush (struct bwriteStream * stream);
-int bwsIsEOF (const struct bwriteStream * stream);
-int bwsBuffLength (struct bwriteStream * stream, int sz);
-void * bwsClose (struct bwriteStream * stream);
-
-/* Security functions */
-#define bSecureDestroy(b) {                                                \
-bstring bstr__tmp = (b);                                                \
-    if (bstr__tmp && bstr__tmp->mlen > 0 && bstr__tmp->data) {          \
-        (void) memset (bstr__tmp->data, 0, (size_t) bstr__tmp->mlen);   \
-        bdestroy (bstr__tmp);                                           \
-    }                                                                   \
-}
-#define bSecureWriteProtect(t) {                                                  \
-    if ((t).mlen >= 0) {                                                          \
-        if ((t).mlen > (t).slen)) {                                               \
-            (void) memset ((t).data + (t).slen, 0, (size_t) (t).mlen - (t).slen); \
-        }                                                                         \
-        (t).mlen = -1;                                                            \
-    }                                                                             \
-}
-extern bstring bSecureInput (int maxlen, int termchar, 
-                             bNgetc vgetchar, void * vgcCtx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.c b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.c
deleted file mode 100644
index 61c8c60ee1..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.c
+++ /dev/null
@@ -1,2976 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstrlib.c
- *
- * This file is the core module for implementing the bstring functions.
- */
-
-#include <stdio.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "bstrlib.h"
-#include "../internal_includes/hlslcc_malloc.h"
-
-/* Optionally include a mechanism for debugging memory */
-
-#if defined(MEMORY_DEBUG) || defined(BSTRLIB_MEMORY_DEBUG)
-#include "memdbg.h"
-#endif
-
-#ifndef bstr__alloc
-#define bstr__alloc(x) malloc (x)
-#endif
-
-#ifndef bstr__free
-#define bstr__free(p) free (p)
-#endif
-
-#ifndef bstr__realloc
-#define bstr__realloc(p,x) realloc ((p), (x))
-#endif
-
-#ifndef bstr__memcpy
-#define bstr__memcpy(d,s,l) memcpy ((d), (s), (l))
-#endif
-
-#ifndef bstr__memmove
-#define bstr__memmove(d,s,l) memmove ((d), (s), (l))
-#endif
-
-#ifndef bstr__memset
-#define bstr__memset(d,c,l) memset ((d), (c), (l))
-#endif
-
-#ifndef bstr__memcmp
-#define bstr__memcmp(d,c,l) memcmp ((d), (c), (l))
-#endif
-
-#ifndef bstr__memchr
-#define bstr__memchr(s,c,l) memchr ((s), (c), (l))
-#endif
-
-/* Just a length safe wrapper for memmove. */
-
-#define bBlockCopy(D,S,L) { if ((L) > 0) bstr__memmove ((D),(S),(L)); }
-
-/* Compute the snapped size for a given requested size.  By snapping to powers
-   of 2 like this, repeated reallocations are avoided. */
-static int snapUpSize (int i) {
-    if (i < 8) {
-        i = 8;
-    } else {
-        unsigned int j;
-        j = (unsigned int) i;
-
-        j |= (j >>  1);
-        j |= (j >>  2);
-        j |= (j >>  4);
-        j |= (j >>  8);        /* Ok, since int >= 16 bits */
-#if (UINT_MAX != 0xffff)
-        j |= (j >> 16);        /* For 32 bit int systems */
-#if (UINT_MAX > 0xffffffffUL)
-        j |= (j >> 32);        /* For 64 bit int systems */
-#endif
-#endif
-        /* Least power of two greater than i */
-        j++;
-        if ((int) j >= i) i = (int) j;
-    }
-    return i;
-}
-
-/*  int balloc (bstring b, int len)
- *
- *  Increase the size of the memory backing the bstring b to at least len.
- */
-int balloc (bstring b, int olen) {
-    int len;
-    if (b == NULL || b->data == NULL || b->slen < 0 || b->mlen <= 0 || 
-        b->mlen < b->slen || olen <= 0) {
-        return BSTR_ERR;
-    }
-
-    if (olen >= b->mlen) {
-        unsigned char * x;
-
-        if ((len = snapUpSize (olen)) <= b->mlen) return BSTR_OK;
-
-        /* Assume probability of a non-moving realloc is 0.125 */
-        if (7 * b->mlen < 8 * b->slen) {
-
-            /* If slen is close to mlen in size then use realloc to reduce
-               the memory defragmentation */
-
-            reallocStrategy:;
-
-            x = (unsigned char *) bstr__realloc (b->data, (size_t) len);
-            if (x == NULL) {
-
-                /* Since we failed, try allocating the tighest possible 
-                   allocation */
-
-                if (NULL == (x = (unsigned char *) bstr__realloc (b->data, (size_t) (len = olen)))) {
-                    return BSTR_ERR;
-                }
-            }
-        } else {
-
-            /* If slen is not close to mlen then avoid the penalty of copying
-               the extra bytes that are allocated, but not considered part of
-               the string */
-
-            if (NULL == (x = (unsigned char *) bstr__alloc ((size_t) len))) {
-
-                /* Perhaps there is no available memory for the two 
-                   allocations to be in memory at once */
-
-                goto reallocStrategy;
-
-            } else {
-                if (b->slen) bstr__memcpy ((char *) x, (char *) b->data, (size_t) b->slen);
-                bstr__free (b->data);
-            }
-        }
-        b->data = x;
-        b->mlen = len;
-        b->data[b->slen] = (unsigned char) '\0';
-    }
-
-    return BSTR_OK;
-}
-
-/*  int ballocmin (bstring b, int len)
- *
- *  Set the size of the memory backing the bstring b to len or b->slen+1,
- *  whichever is larger.  Note that repeated use of this function can degrade
- *  performance.
- */
-int ballocmin (bstring b, int len) {
-    unsigned char * s;
-
-    if (b == NULL || b->data == NULL || (b->slen+1) < 0 || b->mlen <= 0 || 
-        b->mlen < b->slen || len <= 0) {
-        return BSTR_ERR;
-    }
-
-    if (len < b->slen + 1) len = b->slen + 1;
-
-    if (len != b->mlen) {
-        s = (unsigned char *) bstr__realloc (b->data, (size_t) len);
-        if (NULL == s) return BSTR_ERR;
-        s[b->slen] = (unsigned char) '\0';
-        b->data = s;
-        b->mlen = len;
-    }
-
-    return BSTR_OK;
-}
-
-/*  bstring bfromcstr (const char * str)
- *
- *  Create a bstring which contains the contents of the '\0' terminated char *
- *  buffer str.
- */
-bstring bfromcstr (const char * str) {
-bstring b;
-int i;
-size_t j;
-
-    if (str == NULL) return NULL;
-    j = (strlen) (str);
-    i = snapUpSize ((int) (j + (2 - (j != 0))));
-    if (i <= (int) j) return NULL;
-
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (NULL == b) return NULL;
-    b->slen = (int) j;
-    if (NULL == (b->data = (unsigned char *) bstr__alloc (b->mlen = i))) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    bstr__memcpy (b->data, str, j+1);
-    return b;
-}
-
-/*  bstring bfromcstralloc (int mlen, const char * str)
- *
- *  Create a bstring which contains the contents of the '\0' terminated char *
- *  buffer str.  The memory buffer backing the string is at least len 
- *  characters in length.
- */
-bstring bfromcstralloc (int mlen, const char * str) {
-bstring b;
-int i;
-size_t j;
-
-    if (str == NULL) return NULL;
-    j = (strlen) (str);
-    i = snapUpSize ((int) (j + (2 - (j != 0))));
-    if (i <= (int) j) return NULL;
-
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (b == NULL) return NULL;
-    b->slen = (int) j;
-    if (i < mlen) i = mlen;
-
-    if (NULL == (b->data = (unsigned char *) bstr__alloc (b->mlen = i))) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    bstr__memcpy (b->data, str, j+1);
-    return b;
-}
-
-/*  bstring blk2bstr (const void * blk, int len)
- *
- *  Create a bstring which contains the content of the block blk of length 
- *  len.
- */
-bstring blk2bstr (const void * blk, int len) {
-bstring b;
-int i;
-
-    if (blk == NULL || len < 0) return NULL;
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (b == NULL) return NULL;
-    b->slen = len;
-
-    i = len + (2 - (len != 0));
-    i = snapUpSize (i);
-
-    b->mlen = i;
-
-    b->data = (unsigned char *) bstr__alloc ((size_t) b->mlen);
-    if (b->data == NULL) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    if (len > 0) bstr__memcpy (b->data, blk, (size_t) len);
-    b->data[len] = (unsigned char) '\0';
-
-    return b;
-}
-
-/*  char * bstr2cstr (const_bstring s, char z)
- *
- *  Create a '\0' terminated char * buffer which is equal to the contents of 
- *  the bstring s, except that any contained '\0' characters are converted 
- *  to the character in z. This returned value should be freed with a 
- *  bcstrfree () call, by the calling application.
- */
-char * bstr2cstr (const_bstring b, char z) {
-int i, l;
-char * r;
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-    l = b->slen;
-    r = (char *) bstr__alloc ((size_t) (l + 1));
-    if (r == NULL) return r;
-
-    for (i=0; i < l; i ++) {
-        r[i] = (char) ((b->data[i] == '\0') ? z : (char) (b->data[i]));
-    }
-
-    r[l] = (unsigned char) '\0';
-
-    return r;
-}
-
-/*  int bcstrfree (char * s)
- *
- *  Frees a C-string generated by bstr2cstr ().  This is normally unnecessary
- *  since it just wraps a call to bstr__free (), however, if bstr__alloc () 
- *  and bstr__free () have been redefined as a macros within the bstrlib 
- *  module (via defining them in memdbg.h after defining 
- *  BSTRLIB_MEMORY_DEBUG) with some difference in behaviour from the std 
- *  library functions, then this allows a correct way of freeing the memory 
- *  that allows higher level code to be independent from these macro 
- *  redefinitions.
- */
-int bcstrfree (char * s) {
-    if (s) {
-        bstr__free (s);
-        return BSTR_OK;
-    }
-    return BSTR_ERR;
-}
-
-/*  int bconcat (bstring b0, const_bstring b1)
- *
- *  Concatenate the bstring b1 to the bstring b0.
- */
-int bconcat (bstring b0, const_bstring b1) {
-int len, d;
-bstring aux = (bstring) b1;
-
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL) return BSTR_ERR;
-
-    d = b0->slen;
-    len = b1->slen;
-    if ((d | (b0->mlen - d) | len | (d + len)) < 0) return BSTR_ERR;
-
-    if (b0->mlen <= d + len + 1) {
-        ptrdiff_t pd = b1->data - b0->data;
-        if (0 <= pd && pd < b0->mlen) {
-            if (NULL == (aux = bstrcpy (b1))) return BSTR_ERR;
-        }
-        if (balloc (b0, d + len + 1) != BSTR_OK) {
-            if (aux != b1) bdestroy (aux);
-            return BSTR_ERR;
-        }
-    }
-
-    bBlockCopy (&b0->data[d], &aux->data[0], (size_t) len);
-    b0->data[d + len] = (unsigned char) '\0';
-    b0->slen = d + len;
-    if (aux != b1) bdestroy (aux);
-    return BSTR_OK;
-}
-
-/*  int bconchar (bstring b, char c)
-/ *
- *  Concatenate the single character c to the bstring b.
- */
-int bconchar (bstring b, char c) {
-int d;
-
-    if (b == NULL) return BSTR_ERR;
-    d = b->slen;
-    if ((d | (b->mlen - d)) < 0 || balloc (b, d + 2) != BSTR_OK) return BSTR_ERR;
-    b->data[d] = (unsigned char) c;
-    b->data[d + 1] = (unsigned char) '\0';
-    b->slen++;
-    return BSTR_OK;
-}
-
-/*  int bcatcstr (bstring b, const char * s)
- *
- *  Concatenate a char * string to a bstring.
- */
-int bcatcstr (bstring b, const char * s) {
-char * d;
-int i, l;
-
-    if (b == NULL || b->data == NULL || b->slen < 0 || b->mlen < b->slen
-     || b->mlen <= 0 || s == NULL) return BSTR_ERR;
-
-    /* Optimistically concatenate directly */
-    l = b->mlen - b->slen;
-    d = (char *) &b->data[b->slen];
-    for (i=0; i < l; i++) {
-        if ((*d++ = *s++) == '\0') {
-            b->slen += i;
-            return BSTR_OK;
-        }
-    }
-    b->slen += i;
-
-    /* Need to explicitely resize and concatenate tail */
-    return bcatblk (b, (const void *) s, (int) strlen (s));
-}
-
-/*  int bcatblk (bstring b, const void * s, int len)
- *
- *  Concatenate a fixed length buffer to a bstring.
- */
-int bcatblk (bstring b, const void * s, int len) {
-int nl;
-
-    if (b == NULL || b->data == NULL || b->slen < 0 || b->mlen < b->slen
-     || b->mlen <= 0 || s == NULL || len < 0) return BSTR_ERR;
-
-    if (0 > (nl = b->slen + len)) return BSTR_ERR; /* Overflow? */
-    if (b->mlen <= nl && 0 > balloc (b, nl + 1)) return BSTR_ERR;
-
-    bBlockCopy (&b->data[b->slen], s, (size_t) len);
-    b->slen = nl;
-    b->data[nl] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  bstring bstrcpy (const_bstring b)
- *
- *  Create a copy of the bstring b.
- */
-bstring bstrcpy (const_bstring b) {
-bstring b0;
-int i,j;
-
-    /* Attempted to copy an invalid string? */
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-
-    b0 = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (b0 == NULL) {
-        /* Unable to allocate memory for string header */
-        return NULL;
-    }
-
-    i = b->slen;
-    j = snapUpSize (i + 1);
-
-    b0->data = (unsigned char *) bstr__alloc (j);
-    if (b0->data == NULL) {
-        j = i + 1;
-        b0->data = (unsigned char *) bstr__alloc (j);
-        if (b0->data == NULL) {
-            /* Unable to allocate memory for string data */
-            bstr__free (b0);
-            return NULL;
-        }
-    }
-
-    b0->mlen = j;
-    b0->slen = i;
-
-    if (i) bstr__memcpy ((char *) b0->data, (char *) b->data, i);
-    b0->data[b0->slen] = (unsigned char) '\0';
-
-    return b0;
-}
-
-/*  int bassign (bstring a, const_bstring b)
- *
- *  Overwrite the string a with the contents of string b.
- */
-int bassign (bstring a, const_bstring b) {
-    if (b == NULL || b->data == NULL || b->slen < 0)
-        return BSTR_ERR;
-    if (b->slen != 0) {
-        if (balloc (a, b->slen) != BSTR_OK) return BSTR_ERR;
-        bstr__memmove (a->data, b->data, b->slen);
-    } else {
-        if (a == NULL || a->data == NULL || a->mlen < a->slen || 
-            a->slen < 0 || a->mlen == 0) 
-            return BSTR_ERR;
-    }
-    a->data[b->slen] = (unsigned char) '\0';
-    a->slen = b->slen;
-    return BSTR_OK;
-}
-
-/*  int bassignmidstr (bstring a, const_bstring b, int left, int len)
- *
- *  Overwrite the string a with the middle of contents of string b 
- *  starting from position left and running for a length len.  left and 
- *  len are clamped to the ends of b as with the function bmidstr.
- */
-int bassignmidstr (bstring a, const_bstring b, int left, int len) {
-    if (b == NULL || b->data == NULL || b->slen < 0)
-        return BSTR_ERR;
-
-    if (left < 0) {
-        len += left;
-        left = 0;
-    }
-
-    if (len > b->slen - left) len = b->slen - left;
-
-    if (a == NULL || a->data == NULL || a->mlen < a->slen ||
-        a->slen < 0 || a->mlen == 0)
-        return BSTR_ERR;
-
-    if (len > 0) {
-        if (balloc (a, len) != BSTR_OK) return BSTR_ERR;
-        bstr__memmove (a->data, b->data + left, len);
-        a->slen = len;
-    } else {
-        a->slen = 0;
-    }
-    a->data[a->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bassigncstr (bstring a, const char * str)
- *
- *  Overwrite the string a with the contents of char * string str.  Note that 
- *  the bstring a must be a well defined and writable bstring.  If an error 
- *  occurs BSTR_ERR is returned however a may be partially overwritten.
- */
-int bassigncstr (bstring a, const char * str) {
-int i;
-size_t len;
-    if (a == NULL || a->data == NULL || a->mlen < a->slen ||
-        a->slen < 0 || a->mlen == 0 || NULL == str) 
-        return BSTR_ERR;
-
-    for (i=0; i < a->mlen; i++) {
-        if ('\0' == (a->data[i] = str[i])) {
-            a->slen = i;
-            return BSTR_OK;
-        }
-    }
-
-    a->slen = i;
-    len = strlen (str + i);
-    if (len > INT_MAX || i + len + 1 > INT_MAX ||
-        0 > balloc (a, (int) (i + len + 1))) return BSTR_ERR;
-    bBlockCopy (a->data + i, str + i, (size_t) len + 1);
-    a->slen += (int) len;
-    return BSTR_OK;
-}
-
-/*  int bassignblk (bstring a, const void * s, int len)
- *
- *  Overwrite the string a with the contents of the block (s, len).  Note that 
- *  the bstring a must be a well defined and writable bstring.  If an error 
- *  occurs BSTR_ERR is returned and a is not overwritten.
- */
-int bassignblk (bstring a, const void * s, int len) {
-    if (a == NULL || a->data == NULL || a->mlen < a->slen ||
-        a->slen < 0 || a->mlen == 0 || NULL == s || len + 1 < 1) 
-        return BSTR_ERR;
-    if (len + 1 > a->mlen && 0 > balloc (a, len + 1)) return BSTR_ERR;
-    bBlockCopy (a->data, s, (size_t) len);
-    a->data[len] = (unsigned char) '\0';
-    a->slen = len;
-    return BSTR_OK;
-}
-
-/*  int btrunc (bstring b, int n)
- *
- *  Truncate the bstring to at most n characters.
- */
-int btrunc (bstring b, int n) {
-    if (n < 0 || b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-    if (b->slen > n) {
-        b->slen = n;
-        b->data[n] = (unsigned char) '\0';
-    }
-    return BSTR_OK;
-}
-
-#define   upcase(c) (toupper ((unsigned char) c))
-#define downcase(c) (tolower ((unsigned char) c))
-#define   wspace(c) (isspace ((unsigned char) c))
-
-/*  int btoupper (bstring b)
- *
- *  Convert contents of bstring to upper case.
- */
-int btoupper (bstring b) {
-int i, len;
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-    for (i=0, len = b->slen; i < len; i++) {
-        b->data[i] = (unsigned char) upcase (b->data[i]);
-    }
-    return BSTR_OK;
-}
-
-/*  int btolower (bstring b)
- *
- *  Convert contents of bstring to lower case.
- */
-int btolower (bstring b) {
-int i, len;
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-    for (i=0, len = b->slen; i < len; i++) {
-        b->data[i] = (unsigned char) downcase (b->data[i]);
-    }
-    return BSTR_OK;
-}
-
-/*  int bstricmp (const_bstring b0, const_bstring b1)
- *
- *  Compare two strings without differentiating between case.  The return 
- *  value is the difference of the values of the characters where the two 
- *  strings first differ after lower case transformation, otherwise 0 is 
- *  returned indicating that the strings are equal.  If the lengths are 
- *  different, then a difference from 0 is given, but if the first extra 
- *  character is '\0', then it is taken to be the value UCHAR_MAX+1.
- */
-int bstricmp (const_bstring b0, const_bstring b1) {
-int i, v, n;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || 
-        bdata (b1) == NULL || b1->slen < 0) return SHRT_MIN;
-    if ((n = b0->slen) > b1->slen) n = b1->slen;
-    else if (b0->slen == b1->slen && b0->data == b1->data) return BSTR_OK;
-
-    for (i = 0; i < n; i ++) {
-        v  = (char) downcase (b0->data[i])
-           - (char) downcase (b1->data[i]);
-        if (0 != v) return v;
-    }
-
-    if (b0->slen > n) {
-        v = (char) downcase (b0->data[n]);
-        if (v) return v;
-        return UCHAR_MAX + 1;
-    }
-    if (b1->slen > n) {
-        v = - (char) downcase (b1->data[n]);
-        if (v) return v;
-        return - (int) (UCHAR_MAX + 1);
-    }
-    return BSTR_OK;
-}
-
-/*  int bstrnicmp (const_bstring b0, const_bstring b1, int n)
- *
- *  Compare two strings without differentiating between case for at most n
- *  characters.  If the position where the two strings first differ is
- *  before the nth position, the return value is the difference of the values
- *  of the characters, otherwise 0 is returned.  If the lengths are different
- *  and less than n characters, then a difference from 0 is given, but if the 
- *  first extra character is '\0', then it is taken to be the value 
- *  UCHAR_MAX+1.
- */
-int bstrnicmp (const_bstring b0, const_bstring b1, int n) {
-int i, v, m;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || 
-        bdata (b1) == NULL || b1->slen < 0 || n < 0) return SHRT_MIN;
-    m = n;
-    if (m > b0->slen) m = b0->slen;
-    if (m > b1->slen) m = b1->slen;
-
-    if (b0->data != b1->data) {
-        for (i = 0; i < m; i ++) {
-            v  = (char) downcase (b0->data[i]);
-            v -= (char) downcase (b1->data[i]);
-            if (v != 0) return b0->data[i] - b1->data[i];
-        }
-    }
-
-    if (n == m || b0->slen == b1->slen) return BSTR_OK;
-
-    if (b0->slen > m) {
-        v = (char) downcase (b0->data[m]);
-        if (v) return v;
-        return UCHAR_MAX + 1;
-    }
-
-    v = - (char) downcase (b1->data[m]);
-    if (v) return v;
-    return - (int) (UCHAR_MAX + 1);
-}
-
-/*  int biseqcaseless (const_bstring b0, const_bstring b1)
- *
- *  Compare two strings for equality without differentiating between case.  
- *  If the strings differ other than in case, 0 is returned, if the strings 
- *  are the same, 1 is returned, if there is an error, -1 is returned.  If 
- *  the length of the strings are different, this function is O(1).  '\0' 
- *  termination characters are not treated in any special way.
- */
-int biseqcaseless (const_bstring b0, const_bstring b1) {
-int i, n;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || 
-        bdata (b1) == NULL || b1->slen < 0) return BSTR_ERR;
-    if (b0->slen != b1->slen) return BSTR_OK;
-    if (b0->data == b1->data || b0->slen == 0) return 1;
-    for (i=0, n=b0->slen; i < n; i++) {
-        if (b0->data[i] != b1->data[i]) {
-            unsigned char c = (unsigned char) downcase (b0->data[i]);
-            if (c != (unsigned char) downcase (b1->data[i])) return 0;
-        }
-    }
-    return 1;
-}
-
-/*  int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len)
- *
- *  Compare beginning of string b0 with a block of memory of length len 
- *  without differentiating between case for equality.  If the beginning of b0
- *  differs from the memory block other than in case (or if b0 is too short), 
- *  0 is returned, if the strings are the same, 1 is returned, if there is an 
- *  error, -1 is returned.  '\0' characters are not treated in any special 
- *  way.
- */
-int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len) {
-int i;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || NULL == blk || len < 0)
-        return BSTR_ERR;
-    if (b0->slen < len) return BSTR_OK;
-    if (b0->data == (const unsigned char *) blk || len == 0) return 1;
-
-    for (i = 0; i < len; i ++) {
-        if (b0->data[i] != ((const unsigned char *) blk)[i]) {
-            if (downcase (b0->data[i]) != 
-                downcase (((const unsigned char *) blk)[i])) return 0;
-        }
-    }
-    return 1;
-}
-
-/*
- * int bltrimws (bstring b)
- *
- * Delete whitespace contiguous from the left end of the string.
- */
-int bltrimws (bstring b) {
-int i, len;
-
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-
-    for (len = b->slen, i = 0; i < len; i++) {
-        if (!wspace (b->data[i])) {
-            return bdelete (b, 0, i);
-        }
-    }
-
-    b->data[0] = (unsigned char) '\0';
-    b->slen = 0;
-    return BSTR_OK;
-}
-
-/*
- * int brtrimws (bstring b)
- *
- * Delete whitespace contiguous from the right end of the string.
- */
-int brtrimws (bstring b) {
-int i;
-
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-
-    for (i = b->slen - 1; i >= 0; i--) {
-        if (!wspace (b->data[i])) {
-            if (b->mlen > i) b->data[i+1] = (unsigned char) '\0';
-            b->slen = i + 1;
-            return BSTR_OK;
-        }
-    }
-
-    b->data[0] = (unsigned char) '\0';
-    b->slen = 0;
-    return BSTR_OK;
-}
-
-/*
- * int btrimws (bstring b)
- *
- * Delete whitespace contiguous from both ends of the string.
- */
-int btrimws (bstring b) {
-int i, j;
-
-    if (b == NULL || b->data == NULL || b->mlen < b->slen ||
-        b->slen < 0 || b->mlen <= 0) return BSTR_ERR;
-
-    for (i = b->slen - 1; i >= 0; i--) {
-        if (!wspace (b->data[i])) {
-            if (b->mlen > i) b->data[i+1] = (unsigned char) '\0';
-            b->slen = i + 1;
-            for (j = 0; wspace (b->data[j]); j++) {}
-            return bdelete (b, 0, j);
-        }
-    }
-
-    b->data[0] = (unsigned char) '\0';
-    b->slen = 0;
-    return BSTR_OK;
-}
-
-/*  int biseq (const_bstring b0, const_bstring b1)
- *
- *  Compare the string b0 and b1.  If the strings differ, 0 is returned, if 
- *  the strings are the same, 1 is returned, if there is an error, -1 is 
- *  returned.  If the length of the strings are different, this function is
- *  O(1).  '\0' termination characters are not treated in any special way.
- */
-int biseq (const_bstring b0, const_bstring b1) {
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL ||
-        b0->slen < 0 || b1->slen < 0) return BSTR_ERR;
-    if (b0->slen != b1->slen) return BSTR_OK;
-    if (b0->data == b1->data || b0->slen == 0) return 1;
-    return !bstr__memcmp (b0->data, b1->data, b0->slen);
-}
-
-/*  int bisstemeqblk (const_bstring b0, const void * blk, int len)
- *
- *  Compare beginning of string b0 with a block of memory of length len for 
- *  equality.  If the beginning of b0 differs from the memory block (or if b0 
- *  is too short), 0 is returned, if the strings are the same, 1 is returned, 
- *  if there is an error, -1 is returned.  '\0' characters are not treated in 
- *  any special way.
- */
-int bisstemeqblk (const_bstring b0, const void * blk, int len) {
-int i;
-
-    if (bdata (b0) == NULL || b0->slen < 0 || NULL == blk || len < 0)
-        return BSTR_ERR;
-    if (b0->slen < len) return BSTR_OK;
-    if (b0->data == (const unsigned char *) blk || len == 0) return 1;
-
-    for (i = 0; i < len; i ++) {
-        if (b0->data[i] != ((const unsigned char *) blk)[i]) return BSTR_OK;
-    }
-    return 1;
-}
-
-/*  int biseqcstr (const_bstring b, const char *s)
- *
- *  Compare the bstring b and char * string s.  The C string s must be '\0' 
- *  terminated at exactly the length of the bstring b, and the contents 
- *  between the two must be identical with the bstring b with no '\0' 
- *  characters for the two contents to be considered equal.  This is 
- *  equivalent to the condition that their current contents will be always be 
- *  equal when comparing them in the same format after converting one or the 
- *  other.  If the strings are equal 1 is returned, if they are unequal 0 is 
- *  returned and if there is a detectable error BSTR_ERR is returned.
- */
-int biseqcstr (const_bstring b, const char * s) {
-int i;
-    if (b == NULL || s == NULL || b->data == NULL || b->slen < 0) return BSTR_ERR;
-    for (i=0; i < b->slen; i++) {
-        if (s[i] == '\0' || b->data[i] != (unsigned char) s[i]) return BSTR_OK;
-    }
-    return s[i] == '\0';
-}
-
-/*  int biseqcstrcaseless (const_bstring b, const char *s)
- *
- *  Compare the bstring b and char * string s.  The C string s must be '\0' 
- *  terminated at exactly the length of the bstring b, and the contents 
- *  between the two must be identical except for case with the bstring b with 
- *  no '\0' characters for the two contents to be considered equal.  This is 
- *  equivalent to the condition that their current contents will be always be 
- *  equal ignoring case when comparing them in the same format after 
- *  converting one or the other.  If the strings are equal, except for case, 
- *  1 is returned, if they are unequal regardless of case 0 is returned and 
- *  if there is a detectable error BSTR_ERR is returned.
- */
-int biseqcstrcaseless (const_bstring b, const char * s) {
-int i;
-    if (b == NULL || s == NULL || b->data == NULL || b->slen < 0) return BSTR_ERR;
-    for (i=0; i < b->slen; i++) {
-        if (s[i] == '\0' || 
-            (b->data[i] != (unsigned char) s[i] && 
-             downcase (b->data[i]) != (unsigned char) downcase (s[i])))
-            return BSTR_OK;
-    }
-    return s[i] == '\0';
-}
-
-/*  int bstrcmp (const_bstring b0, const_bstring b1)
- *
- *  Compare the string b0 and b1.  If there is an error, SHRT_MIN is returned, 
- *  otherwise a value less than or greater than zero, indicating that the 
- *  string pointed to by b0 is lexicographically less than or greater than 
- *  the string pointed to by b1 is returned.  If the the string lengths are 
- *  unequal but the characters up until the length of the shorter are equal 
- *  then a value less than, or greater than zero, indicating that the string 
- *  pointed to by b0 is shorter or longer than the string pointed to by b1 is 
- *  returned.  0 is returned if and only if the two strings are the same.  If 
- *  the length of the strings are different, this function is O(n).  Like its
- *  standard C library counter part strcmp, the comparison does not proceed 
- *  past any '\0' termination characters encountered.
- */
-int bstrcmp (const_bstring b0, const_bstring b1) {
-int i, v, n;
-
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL ||
-        b0->slen < 0 || b1->slen < 0) return SHRT_MIN;
-    n = b0->slen; if (n > b1->slen) n = b1->slen;
-    if (b0->slen == b1->slen && (b0->data == b1->data || b0->slen == 0))
-        return BSTR_OK;
-
-    for (i = 0; i < n; i ++) {
-        v = ((char) b0->data[i]) - ((char) b1->data[i]);
-        if (v != 0) return v;
-        if (b0->data[i] == (unsigned char) '\0') return BSTR_OK;
-    }
-
-    if (b0->slen > n) return 1;
-    if (b1->slen > n) return -1;
-    return BSTR_OK;
-}
-
-/*  int bstrncmp (const_bstring b0, const_bstring b1, int n)
- *
- *  Compare the string b0 and b1 for at most n characters.  If there is an 
- *  error, SHRT_MIN is returned, otherwise a value is returned as if b0 and 
- *  b1 were first truncated to at most n characters then bstrcmp was called
- *  with these new strings are paremeters.  If the length of the strings are 
- *  different, this function is O(n).  Like its standard C library counter 
- *  part strcmp, the comparison does not proceed past any '\0' termination 
- *  characters encountered.
- */
-int bstrncmp (const_bstring b0, const_bstring b1, int n) {
-int i, v, m;
-
-    if (b0 == NULL || b1 == NULL || b0->data == NULL || b1->data == NULL ||
-        b0->slen < 0 || b1->slen < 0) return SHRT_MIN;
-    m = n;
-    if (m > b0->slen) m = b0->slen;
-    if (m > b1->slen) m = b1->slen;
-
-    if (b0->data != b1->data) {
-        for (i = 0; i < m; i ++) {
-            v = ((char) b0->data[i]) - ((char) b1->data[i]);
-            if (v != 0) return v;
-            if (b0->data[i] == (unsigned char) '\0') return BSTR_OK;
-        }
-    }
-
-    if (n == m || b0->slen == b1->slen) return BSTR_OK;
-
-    if (b0->slen > m) return 1;
-    return -1;
-}
-
-/*  bstring bmidstr (const_bstring b, int left, int len)
- *
- *  Create a bstring which is the substring of b starting from position left
- *  and running for a length len (clamped by the end of the bstring b.)  If
- *  b is detectably invalid, then NULL is returned.  The section described 
- *  by (left, len) is clamped to the boundaries of b.
- */
-bstring bmidstr (const_bstring b, int left, int len) {
-
-    if (b == NULL || b->slen < 0 || b->data == NULL) return NULL;
-
-    if (left < 0) {
-        len += left;
-        left = 0;
-    }
-
-    if (len > b->slen - left) len = b->slen - left;
-
-    if (len <= 0) return bfromcstr ("");
-    return blk2bstr (b->data + left, len);
-}
-
-/*  int bdelete (bstring b, int pos, int len)
- *
- *  Removes characters from pos to pos+len-1 inclusive and shifts the tail of 
- *  the bstring starting from pos+len to pos.  len must be positive for this 
- *  call to have any effect.  The section of the string described by (pos, 
- *  len) is clamped to boundaries of the bstring b.
- */
-int bdelete (bstring b, int pos, int len) {
-    /* Clamp to left side of bstring */
-    if (pos < 0) {
-        len += pos;
-        pos = 0;
-    }
-
-    if (len < 0 || b == NULL || b->data == NULL || b->slen < 0 || 
-        b->mlen < b->slen || b->mlen <= 0) 
-        return BSTR_ERR;
-    if (len > 0 && pos < b->slen) {
-        if (pos + len >= b->slen) {
-            b->slen = pos;
-        } else {
-            bBlockCopy ((char *) (b->data + pos),
-                        (char *) (b->data + pos + len), 
-                        b->slen - (pos+len));
-            b->slen -= len;
-        }
-        b->data[b->slen] = (unsigned char) '\0';
-    }
-    return BSTR_OK;
-}
-
-/*  int bdestroy (bstring b)
- *
- *  Free up the bstring.  Note that if b is detectably invalid or not writable
- *  then no action is performed and BSTR_ERR is returned.  Like a freed memory
- *  allocation, dereferences, writes or any other action on b after it has 
- *  been bdestroyed is undefined.
- */
-int bdestroy (bstring b) {
-    if (b == NULL || b->slen < 0 || b->mlen <= 0 || b->mlen < b->slen ||
-        b->data == NULL)
-        return BSTR_ERR;
-
-    bstr__free (b->data);
-
-    /* In case there is any stale usage, there is one more chance to 
-       notice this error. */
-
-    b->slen = -1;
-    b->mlen = -__LINE__;
-    b->data = NULL;
-
-    bstr__free (b);
-    return BSTR_OK;
-}
-
-/*  int binstr (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  forward.  If it is found then return with the first position where it is 
- *  found, otherwise return BSTR_ERR.  Note that this is just a brute force 
- *  string searcher that does not attempt clever things like the Boyer-Moore 
- *  search algorithm.  Because of this there are many degenerate cases where 
- *  this can take much longer than it needs to.
- */
-int binstr (const_bstring b1, int pos, const_bstring b2) {
-int j, ii, ll, lf;
-unsigned char * d0;
-unsigned char c0;
-register unsigned char * d1;
-register unsigned char c1;
-register int i;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos) return (b2->slen == 0)?pos:BSTR_ERR;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    /* No space to find such a string? */
-    if ((lf = b1->slen - b2->slen + 1) <= pos) return BSTR_ERR;
-
-    /* An obvious alias case */
-    if (b1->data == b2->data && pos == 0) return 0;
-
-    i = pos;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    ll = b2->slen;
-
-    /* Peel off the b2->slen == 1 case */
-    c0 = d0[0];
-    if (1 == ll) {
-        for (;i < lf; i++) if (c0 == d1[i]) return i;
-        return BSTR_ERR;
-    }
-
-    c1 = c0;
-    j = 0;
-    lf = b1->slen - 1;
-
-    ii = -1;
-    if (i < lf) do {
-        /* Unrolled current character test */
-        if (c1 != d1[i]) {
-            if (c1 != d1[1+i]) {
-                i += 2;
-                continue;
-            }
-            i++;
-        }
-
-        /* Take note if this is the start of a potential match */
-        if (0 == j) ii = i;
-
-        /* Shift the test character down by one */
-        j++;
-        i++;
-
-        /* If this isn't past the last character continue */
-        if (j < ll) {
-            c1 = d0[j];
-            continue;
-        }
-
-        N0:;
-
-        /* If no characters mismatched, then we matched */
-        if (i == ii+j) return ii;
-
-        /* Shift back to the beginning */
-        i -= j;
-        j  = 0;
-        c1 = c0;
-    } while (i < lf);
-
-    /* Deal with last case if unrolling caused a misalignment */
-    if (i == lf && ll == j+1 && c1 == d1[i]) goto N0;
-
-    return BSTR_ERR;
-}
-
-/*  int binstrr (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  backward.  If it is found then return with the first position where it is 
- *  found, otherwise return BSTR_ERR.  Note that this is just a brute force 
- *  string searcher that does not attempt clever things like the Boyer-Moore 
- *  search algorithm.  Because of this there are many degenerate cases where 
- *  this can take much longer than it needs to.
- */
-int binstrr (const_bstring b1, int pos, const_bstring b2) {
-int j, i, l;
-unsigned char * d0, * d1;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos && b2->slen == 0) return pos;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    /* Obvious alias case */
-    if (b1->data == b2->data && pos == 0 && b2->slen <= b1->slen) return 0;
-
-    i = pos;
-    if ((l = b1->slen - b2->slen) < 0) return BSTR_ERR;
-
-    /* If no space to find such a string then snap back */
-    if (l + 1 <= i) i = l;
-    j = 0;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    l  = b2->slen;
-
-    for (;;) {
-        if (d0[j] == d1[i + j]) {
-            j ++;
-            if (j >= l) return i;
-        } else {
-            i --;
-            if (i < 0) break;
-            j=0;
-        }
-    }
-
-    return BSTR_ERR;
-}
-
-/*  int binstrcaseless (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  forward but without regard to case.  If it is found then return with the 
- *  first position where it is found, otherwise return BSTR_ERR.  Note that 
- *  this is just a brute force string searcher that does not attempt clever 
- *  things like the Boyer-Moore search algorithm.  Because of this there are 
- *  many degenerate cases where this can take much longer than it needs to.
- */
-int binstrcaseless (const_bstring b1, int pos, const_bstring b2) {
-int j, i, l, ll;
-unsigned char * d0, * d1;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos) return (b2->slen == 0)?pos:BSTR_ERR;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    l = b1->slen - b2->slen + 1;
-
-    /* No space to find such a string? */
-    if (l <= pos) return BSTR_ERR;
-
-    /* An obvious alias case */
-    if (b1->data == b2->data && pos == 0) return BSTR_OK;
-
-    i = pos;
-    j = 0;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    ll = b2->slen;
-
-    for (;;) {
-        if (d0[j] == d1[i + j] || downcase (d0[j]) == downcase (d1[i + j])) {
-            j ++;
-            if (j >= ll) return i;
-        } else {
-            i ++;
-            if (i >= l) break;
-            j=0;
-        }
-    }
-
-    return BSTR_ERR;
-}
-
-/*  int binstrrcaseless (const_bstring b1, int pos, const_bstring b2)
- *
- *  Search for the bstring b2 in b1 starting from position pos, and searching 
- *  backward but without regard to case.  If it is found then return with the 
- *  first position where it is found, otherwise return BSTR_ERR.  Note that 
- *  this is just a brute force string searcher that does not attempt clever 
- *  things like the Boyer-Moore search algorithm.  Because of this there are 
- *  many degenerate cases where this can take much longer than it needs to.
- */
-int binstrrcaseless (const_bstring b1, int pos, const_bstring b2) {
-int j, i, l;
-unsigned char * d0, * d1;
-
-    if (b1 == NULL || b1->data == NULL || b1->slen < 0 ||
-        b2 == NULL || b2->data == NULL || b2->slen < 0) return BSTR_ERR;
-    if (b1->slen == pos && b2->slen == 0) return pos;
-    if (b1->slen < pos || pos < 0) return BSTR_ERR;
-    if (b2->slen == 0) return pos;
-
-    /* Obvious alias case */
-    if (b1->data == b2->data && pos == 0 && b2->slen <= b1->slen) return BSTR_OK;
-
-    i = pos;
-    if ((l = b1->slen - b2->slen) < 0) return BSTR_ERR;
-
-    /* If no space to find such a string then snap back */
-    if (l + 1 <= i) i = l;
-    j = 0;
-
-    d0 = b2->data;
-    d1 = b1->data;
-    l  = b2->slen;
-
-    for (;;) {
-        if (d0[j] == d1[i + j] || downcase (d0[j]) == downcase (d1[i + j])) {
-            j ++;
-            if (j >= l) return i;
-        } else {
-            i --;
-            if (i < 0) break;
-            j=0;
-        }
-    }
-
-    return BSTR_ERR;
-}
-
-
-/*  int bstrchrp (const_bstring b, int c, int pos)
- *
- *  Search for the character c in b forwards from the position pos 
- *  (inclusive).
- */
-int bstrchrp (const_bstring b, int c, int pos) {
-unsigned char * p;
-
-    if (b == NULL || b->data == NULL || b->slen <= pos || pos < 0) return BSTR_ERR;
-    p = (unsigned char *) bstr__memchr ((b->data + pos), (unsigned char) c, (b->slen - pos));
-    if (p) return (int) (p - b->data);
-    return BSTR_ERR;
-}
-
-/*  int bstrrchrp (const_bstring b, int c, int pos)
- *
- *  Search for the character c in b backwards from the position pos in string 
- *  (inclusive).
- */
-int bstrrchrp (const_bstring b, int c, int pos) {
-int i;
- 
-    if (b == NULL || b->data == NULL || b->slen <= pos || pos < 0) return BSTR_ERR;
-    for (i=pos; i >= 0; i--) {
-        if (b->data[i] == (unsigned char) c) return i;
-    }
-    return BSTR_ERR;
-}
-
-#if !defined (BSTRLIB_AGGRESSIVE_MEMORY_FOR_SPEED_TRADEOFF)
-#define LONG_LOG_BITS_QTY (3)
-#define LONG_BITS_QTY (1 << LONG_LOG_BITS_QTY)
-#define LONG_TYPE unsigned char
-
-#define CFCLEN ((1 << CHAR_BIT) / LONG_BITS_QTY)
-struct charField { LONG_TYPE content[CFCLEN]; };
-#define testInCharField(cf,c) ((cf)->content[(c) >> LONG_LOG_BITS_QTY] & (((long)1) << ((c) & (LONG_BITS_QTY-1))))
-#define setInCharField(cf,idx) { \
-    unsigned int c = (unsigned int) (idx); \
-    (cf)->content[c >> LONG_LOG_BITS_QTY] |= (LONG_TYPE) (1ul << (c & (LONG_BITS_QTY-1))); \
-}
-
-#else
-
-#define CFCLEN (1 << CHAR_BIT)
-struct charField { unsigned char content[CFCLEN]; };
-#define testInCharField(cf,c) ((cf)->content[(unsigned char) (c)])
-#define setInCharField(cf,idx) (cf)->content[(unsigned int) (idx)] = ~0
-
-#endif
-
-/* Convert a bstring to charField */
-static int buildCharField (struct charField * cf, const_bstring b) {
-int i;
-    if (b == NULL || b->data == NULL || b->slen <= 0) return BSTR_ERR;
-    memset ((void *) cf->content, 0, sizeof (struct charField));
-    for (i=0; i < b->slen; i++) {
-        setInCharField (cf, b->data[i]);
-    }
-    return BSTR_OK;
-}
-
-static void invertCharField (struct charField * cf) {
-int i;
-    for (i=0; i < CFCLEN; i++) cf->content[i] = ~cf->content[i];
-}
-
-/* Inner engine for binchr */
-static int binchrCF (const unsigned char * data, int len, int pos, const struct charField * cf) {
-int i;
-    for (i=pos; i < len; i++) {
-        unsigned char c = (unsigned char) data[i];
-        if (testInCharField (cf, c)) return i;
-    }
-    return BSTR_ERR;
-}
-
-/*  int binchr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the first position in b0 starting from pos or after, in which 
- *  one of the characters in b1 is found and return it.  If such a position 
- *  does not exist in b0, then BSTR_ERR is returned.
- */
-int binchr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL ||
-        b0->slen <= pos) return BSTR_ERR;
-    if (1 == b1->slen) return bstrchrp (b0, b1->data[0], pos);
-    if (0 > buildCharField (&chrs, b1)) return BSTR_ERR;
-    return binchrCF (b0->data, b0->slen, pos, &chrs);
-}
-
-/* Inner engine for binchrr */
-static int binchrrCF (const unsigned char * data, int pos, const struct charField * cf) {
-int i;
-    for (i=pos; i >= 0; i--) {
-        unsigned int c = (unsigned int) data[i];
-        if (testInCharField (cf, c)) return i;
-    }
-    return BSTR_ERR;
-}
-
-/*  int binchrr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the last position in b0 no greater than pos, in which one of 
- *  the characters in b1 is found and return it.  If such a position does not 
- *  exist in b0, then BSTR_ERR is returned.
- */
-int binchrr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL || b1 == NULL ||
-        b0->slen < pos) return BSTR_ERR;
-    if (pos == b0->slen) pos--;
-    if (1 == b1->slen) return bstrrchrp (b0, b1->data[0], pos);
-    if (0 > buildCharField (&chrs, b1)) return BSTR_ERR;
-    return binchrrCF (b0->data, pos, &chrs);
-}
-
-/*  int bninchr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the first position in b0 starting from pos or after, in which 
- *  none of the characters in b1 is found and return it.  If such a position 
- *  does not exist in b0, then BSTR_ERR is returned.
- */
-int bninchr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL || 
-        b0->slen <= pos) return BSTR_ERR;
-    if (buildCharField (&chrs, b1) < 0) return BSTR_ERR;
-    invertCharField (&chrs);
-    return binchrCF (b0->data, b0->slen, pos, &chrs);
-}
-
-/*  int bninchrr (const_bstring b0, int pos, const_bstring b1);
- *
- *  Search for the last position in b0 no greater than pos, in which none of 
- *  the characters in b1 is found and return it.  If such a position does not 
- *  exist in b0, then BSTR_ERR is returned.
- */
-int bninchrr (const_bstring b0, int pos, const_bstring b1) {
-struct charField chrs;
-    if (pos < 0 || b0 == NULL || b0->data == NULL || 
-        b0->slen < pos) return BSTR_ERR;
-    if (pos == b0->slen) pos--;
-    if (buildCharField (&chrs, b1) < 0) return BSTR_ERR;
-    invertCharField (&chrs);
-    return binchrrCF (b0->data, pos, &chrs);
-}
-
-/*  int bsetstr (bstring b0, int pos, bstring b1, unsigned char fill)
- *
- *  Overwrite the string b0 starting at position pos with the string b1. If 
- *  the position pos is past the end of b0, then the character "fill" is 
- *  appended as necessary to make up the gap between the end of b0 and pos.
- *  If b1 is NULL, it behaves as if it were a 0-length string.
- */
-int bsetstr (bstring b0, int pos, const_bstring b1, unsigned char fill) {
-int d, newlen;
-ptrdiff_t pd;
-bstring aux = (bstring) b1;
-
-    if (pos < 0 || b0 == NULL || b0->slen < 0 || NULL == b0->data || 
-        b0->mlen < b0->slen || b0->mlen <= 0) return BSTR_ERR;
-    if (b1 != NULL && (b1->slen < 0 || b1->data == NULL)) return BSTR_ERR;
-
-    d = pos;
-
-    /* Aliasing case */
-    if (NULL != aux) {
-        if ((pd = (ptrdiff_t) (b1->data - b0->data)) >= 0 && pd < (ptrdiff_t) b0->mlen) {
-            if (NULL == (aux = bstrcpy (b1))) return BSTR_ERR;
-        }
-        d += aux->slen;
-    }
-
-    /* Increase memory size if necessary */
-    if (balloc (b0, d + 1) != BSTR_OK) {
-        if (aux != b1) bdestroy (aux);
-        return BSTR_ERR;
-    }
-
-    newlen = b0->slen;
-
-    /* Fill in "fill" character as necessary */
-    if (pos > newlen) {
-        bstr__memset (b0->data + b0->slen, (int) fill, (size_t) (pos - b0->slen));
-        newlen = pos;
-    }
-
-    /* Copy b1 to position pos in b0. */
-    if (aux != NULL) {
-        bBlockCopy ((char *) (b0->data + pos), (char *) aux->data, aux->slen);
-        if (aux != b1) bdestroy (aux);
-    }
-
-    /* Indicate the potentially increased size of b0 */
-    if (d > newlen) newlen = d;
-
-    b0->slen = newlen;
-    b0->data[newlen] = (unsigned char) '\0';
-
-    return BSTR_OK;
-}
-
-/*  int binsert (bstring b1, int pos, bstring b2, unsigned char fill)
- *
- *  Inserts the string b2 into b1 at position pos.  If the position pos is 
- *  past the end of b1, then the character "fill" is appended as necessary to 
- *  make up the gap between the end of b1 and pos.  Unlike bsetstr, binsert
- *  does not allow b2 to be NULL.
- */
-int binsert (bstring b1, int pos, const_bstring b2, unsigned char fill) {
-int d, l;
-ptrdiff_t pd;
-bstring aux = (bstring) b2;
-
-    if (pos < 0 || b1 == NULL || b2 == NULL || b1->slen < 0 || 
-        b2->slen < 0 || b1->mlen < b1->slen || b1->mlen <= 0) return BSTR_ERR;
-
-    /* Aliasing case */
-    if ((pd = (ptrdiff_t) (b2->data - b1->data)) >= 0 && pd < (ptrdiff_t) b1->mlen) {
-        if (NULL == (aux = bstrcpy (b2))) return BSTR_ERR;
-    }
-
-    /* Compute the two possible end pointers */
-    d = b1->slen + aux->slen;
-    l = pos + aux->slen;
-    if ((d|l) < 0) return BSTR_ERR;
-
-    if (l > d) {
-        /* Inserting past the end of the string */
-        if (balloc (b1, l + 1) != BSTR_OK) {
-            if (aux != b2) bdestroy (aux);
-            return BSTR_ERR;
-        }
-        bstr__memset (b1->data + b1->slen, (int) fill, (size_t) (pos - b1->slen));
-        b1->slen = l;
-    } else {
-        /* Inserting in the middle of the string */
-        if (balloc (b1, d + 1) != BSTR_OK) {
-            if (aux != b2) bdestroy (aux);
-            return BSTR_ERR;
-        }
-        bBlockCopy (b1->data + l, b1->data + pos, d - l);
-        b1->slen = d;
-    }
-    bBlockCopy (b1->data + pos, aux->data, aux->slen);
-    b1->data[b1->slen] = (unsigned char) '\0';
-    if (aux != b2) bdestroy (aux);
-    return BSTR_OK;
-}
-
-/*  int breplace (bstring b1, int pos, int len, bstring b2, 
- *                unsigned char fill)
- *
- *  Replace a section of a string from pos for a length len with the string b2.
- *  fill is used is pos > b1->slen.
- */
-int breplace (bstring b1, int pos, int len, const_bstring b2, 
-              unsigned char fill) {
-int pl, ret;
-ptrdiff_t pd;
-bstring aux = (bstring) b2;
-
-    if (pos < 0 || len < 0 || (pl = pos + len) < 0 || b1 == NULL || 
-        b2 == NULL || b1->data == NULL || b2->data == NULL || 
-        b1->slen < 0 || b2->slen < 0 || b1->mlen < b1->slen ||
-        b1->mlen <= 0) return BSTR_ERR;
-
-    /* Straddles the end? */
-    if (pl >= b1->slen) {
-        if ((ret = bsetstr (b1, pos, b2, fill)) < 0) return ret;
-        if (pos + b2->slen < b1->slen) {
-            b1->slen = pos + b2->slen;
-            b1->data[b1->slen] = (unsigned char) '\0';
-        }
-        return ret;
-    }
-
-    /* Aliasing case */
-    if ((pd = (ptrdiff_t) (b2->data - b1->data)) >= 0 && pd < (ptrdiff_t) b1->slen) {
-        if (NULL == (aux = bstrcpy (b2))) return BSTR_ERR;
-    }
-
-    if (aux->slen > len) {
-        if (balloc (b1, b1->slen + aux->slen - len) != BSTR_OK) {
-            if (aux != b2) bdestroy (aux);
-            return BSTR_ERR;
-        }
-    }
-
-    if (aux->slen != len) bstr__memmove (b1->data + pos + aux->slen, b1->data + pos + len, b1->slen - (pos + len));
-    bstr__memcpy (b1->data + pos, aux->data, aux->slen);
-    b1->slen += aux->slen - len;
-    b1->data[b1->slen] = (unsigned char) '\0';
-    if (aux != b2) bdestroy (aux);
-    return BSTR_OK;
-}
-
-/*  
- *  findreplaceengine is used to implement bfindreplace and 
- *  bfindreplacecaseless. It works by breaking the three cases of
- *  expansion, reduction and replacement, and solving each of these
- *  in the most efficient way possible.
- */
-
-typedef int (*instr_fnptr) (const_bstring s1, int pos, const_bstring s2);
-
-#define INITIAL_STATIC_FIND_INDEX_COUNT 32
-
-static int findreplaceengine (bstring b, const_bstring find, const_bstring repl, int pos, instr_fnptr instr) {
-int i, ret, slen, mlen, delta, acc;
-int * d;
-int static_d[INITIAL_STATIC_FIND_INDEX_COUNT+1]; /* This +1 is unnecessary, but it shuts up LINT. */
-ptrdiff_t pd;
-bstring auxf = (bstring) find;
-bstring auxr = (bstring) repl;
-
-    if (b == NULL || b->data == NULL || find == NULL ||
-        find->data == NULL || repl == NULL || repl->data == NULL || 
-        pos < 0 || find->slen <= 0 || b->mlen < 0 || b->slen > b->mlen || 
-        b->mlen <= 0 || b->slen < 0 || repl->slen < 0) return BSTR_ERR;
-    if (pos > b->slen - find->slen) return BSTR_OK;
-
-    /* Alias with find string */
-    pd = (ptrdiff_t) (find->data - b->data);
-    if ((ptrdiff_t) (pos - find->slen) < pd && pd < (ptrdiff_t) b->slen) {
-        if (NULL == (auxf = bstrcpy (find))) return BSTR_ERR;
-    }
-
-    /* Alias with repl string */
-    pd = (ptrdiff_t) (repl->data - b->data);
-    if ((ptrdiff_t) (pos - repl->slen) < pd && pd < (ptrdiff_t) b->slen) {
-        if (NULL == (auxr = bstrcpy (repl))) {
-            if (auxf != find) bdestroy (auxf);
-            return BSTR_ERR;
-        }
-    }
-
-    delta = auxf->slen - auxr->slen;
-
-    /* in-place replacement since find and replace strings are of equal 
-       length */
-    if (delta == 0) {
-        while ((pos = instr (b, pos, auxf)) >= 0) {
-            bstr__memcpy (b->data + pos, auxr->data, auxr->slen);
-            pos += auxf->slen;
-        }
-        if (auxf != find) bdestroy (auxf);
-        if (auxr != repl) bdestroy (auxr);
-        return BSTR_OK;
-    }
-
-    /* shrinking replacement since auxf->slen > auxr->slen */
-    if (delta > 0) {
-        acc = 0;
-
-        while ((i = instr (b, pos, auxf)) >= 0) {
-            if (acc && i > pos)
-                bstr__memmove (b->data + pos - acc, b->data + pos, i - pos);
-            if (auxr->slen)
-                bstr__memcpy (b->data + i - acc, auxr->data, auxr->slen);
-            acc += delta;
-            pos = i + auxf->slen;
-        }
-
-        if (acc) {
-            i = b->slen;
-            if (i > pos)
-                bstr__memmove (b->data + pos - acc, b->data + pos, i - pos);
-            b->slen -= acc;
-            b->data[b->slen] = (unsigned char) '\0';
-        }
-
-        if (auxf != find) bdestroy (auxf);
-        if (auxr != repl) bdestroy (auxr);
-        return BSTR_OK;
-    }
-
-    /* expanding replacement since find->slen < repl->slen.  Its a lot 
-       more complicated.  This works by first finding all the matches and 
-       storing them to a growable array, then doing at most one resize of
-       the destination bstring and then performing the direct memory transfers
-       of the string segment pieces to form the final result. The growable 
-       array of matches uses a deferred doubling reallocing strategy.  What 
-       this means is that it starts as a reasonably fixed sized auto array in 
-       the hopes that many if not most cases will never need to grow this 
-       array.  But it switches as soon as the bounds of the array will be 
-       exceeded.  An extra find result is always appended to this array that
-       corresponds to the end of the destination string, so slen is checked
-       against mlen - 1 rather than mlen before resizing.
-    */
-
-    mlen = INITIAL_STATIC_FIND_INDEX_COUNT;
-    d = (int *) static_d; /* Avoid malloc for trivial/initial cases */
-    acc = slen = 0;
-
-    while ((pos = instr (b, pos, auxf)) >= 0) {
-        if (slen >= mlen - 1) {
-            int sl, *t;
-
-            mlen += mlen;
-            sl = sizeof (int *) * mlen;
-            if (static_d == d) d = NULL; /* static_d cannot be realloced */
-            if (mlen <= 0 || sl < mlen || NULL == (t = (int *) bstr__realloc (d, sl))) {
-                ret = BSTR_ERR;
-                goto done;
-            }
-            if (NULL == d) bstr__memcpy (t, static_d, sizeof (static_d));
-            d = t;
-        }
-        d[slen] = pos;
-        slen++;
-        acc -= delta;
-        pos += auxf->slen;
-        if (pos < 0 || acc < 0) {
-            ret = BSTR_ERR;
-            goto done;
-        }
-    }
-    
-    /* slen <= INITIAL_STATIC_INDEX_COUNT-1 or mlen-1 here. */
-    d[slen] = b->slen;
-
-    if (BSTR_OK == (ret = balloc (b, b->slen + acc + 1))) {
-        b->slen += acc;
-        for (i = slen-1; i >= 0; i--) {
-            int s, l;
-            s = d[i] + auxf->slen;
-            l = d[i+1] - s; /* d[slen] may be accessed here. */
-            if (l) {
-                bstr__memmove (b->data + s + acc, b->data + s, l);
-            }
-            if (auxr->slen) {
-                bstr__memmove (b->data + s + acc - auxr->slen, 
-                               auxr->data, auxr->slen);
-            }
-            acc += delta;        
-        }
-        b->data[b->slen] = (unsigned char) '\0';
-    }
-
-    done:;
-    if (static_d == d) d = NULL;
-    bstr__free (d);
-    if (auxf != find) bdestroy (auxf);
-    if (auxr != repl) bdestroy (auxr);
-    return ret;
-}
-
-/*  int bfindreplace (bstring b, const_bstring find, const_bstring repl, 
- *                    int pos)
- *
- *  Replace all occurrences of a find string with a replace string after a
- *  given point in a bstring.
- */
-int bfindreplace (bstring b, const_bstring find, const_bstring repl, int pos) {
-    return findreplaceengine (b, find, repl, pos, binstr);
-}
-
-/*  int bfindreplacecaseless (bstring b, const_bstring find, const_bstring repl, 
- *                    int pos)
- *
- *  Replace all occurrences of a find string, ignoring case, with a replace 
- *  string after a given point in a bstring.
- */
-int bfindreplacecaseless (bstring b, const_bstring find, const_bstring repl, int pos) {
-    return findreplaceengine (b, find, repl, pos, binstrcaseless);
-}
-
-/*  int binsertch (bstring b, int pos, int len, unsigned char fill)
- *
- *  Inserts the character fill repeatedly into b at position pos for a 
- *  length len.  If the position pos is past the end of b, then the 
- *  character "fill" is appended as necessary to make up the gap between the 
- *  end of b and the position pos + len.
- */
-int binsertch (bstring b, int pos, int len, unsigned char fill) {
-int d, l, i;
-
-    if (pos < 0 || b == NULL || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || len < 0) return BSTR_ERR;
-
-    /* Compute the two possible end pointers */
-    d = b->slen + len;
-    l = pos + len;
-    if ((d|l) < 0) return BSTR_ERR;
-
-    if (l > d) {
-        /* Inserting past the end of the string */
-        if (balloc (b, l + 1) != BSTR_OK) return BSTR_ERR;
-        pos = b->slen;
-        b->slen = l;
-    } else {
-        /* Inserting in the middle of the string */
-        if (balloc (b, d + 1) != BSTR_OK) return BSTR_ERR;
-        for (i = d - 1; i >= l; i--) {
-            b->data[i] = b->data[i - len];
-        }
-        b->slen = d;
-    }
-
-    for (i=pos; i < l; i++) b->data[i] = fill;
-    b->data[b->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bpattern (bstring b, int len)
- *
- *  Replicate the bstring, b in place, end to end repeatedly until it 
- *  surpasses len characters, then chop the result to exactly len characters. 
- *  This function operates in-place.  The function will return with BSTR_ERR 
- *  if b is NULL or of length 0, otherwise BSTR_OK is returned.
- */
-int bpattern (bstring b, int len) {
-int i, d;
-
-    d = blength (b);
-    if (d <= 0 || len < 0 || balloc (b, len + 1) != BSTR_OK) return BSTR_ERR;
-    if (len > 0) {
-        if (d == 1) return bsetstr (b, len, NULL, b->data[0]);
-        for (i = d; i < len; i++) b->data[i] = b->data[i - d];
-    }
-    b->data[len] = (unsigned char) '\0';
-    b->slen = len;
-    return BSTR_OK;
-}
-
-#define BS_BUFF_SZ (1024)
-
-/*  int breada (bstring b, bNread readPtr, void * parm)
- *
- *  Use a finite buffer fread-like function readPtr to concatenate to the 
- *  bstring b the entire contents of file-like source data in a roughly 
- *  efficient way.
- */
-int breada (bstring b, bNread readPtr, void * parm) {
-int i, l, n;
-
-    if (b == NULL || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || readPtr == NULL) return BSTR_ERR;
-
-    i = b->slen;
-    for (n=i+16; ; n += ((n < BS_BUFF_SZ) ? n : BS_BUFF_SZ)) {
-        if (BSTR_OK != balloc (b, n + 1)) return BSTR_ERR;
-        l = (int) readPtr ((void *) (b->data + i), 1, n - i, parm);
-        i += l;
-        b->slen = i;
-        if (i < n) break;
-    }
-
-    b->data[i] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  bstring bread (bNread readPtr, void * parm)
- *
- *  Use a finite buffer fread-like function readPtr to create a bstring 
- *  filled with the entire contents of file-like source data in a roughly 
- *  efficient way.
- */
-bstring bread (bNread readPtr, void * parm) {
-bstring buff;
-
-    if (0 > breada (buff = bfromcstr (""), readPtr, parm)) {
-        bdestroy (buff);
-        return NULL;
-    }
-    return buff;
-}
-
-/*  int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator)
- *
- *  Use an fgetc-like single character stream reading function (getcPtr) to 
- *  obtain a sequence of characters which are concatenated to the end of the
- *  bstring b.  The stream read is terminated by the passed in terminator 
- *  parameter.
- *
- *  If getcPtr returns with a negative number, or the terminator character 
- *  (which is appended) is read, then the stream reading is halted and the 
- *  function returns with a partial result in b.  If there is an empty partial
- *  result, 1 is returned.  If no characters are read, or there is some other 
- *  detectable error, BSTR_ERR is returned.
- */
-int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator) {
-int c, d, e;
-
-    if (b == NULL || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || getcPtr == NULL) return BSTR_ERR;
-    d = 0;
-    e = b->mlen - 2;
-
-    while ((c = getcPtr (parm)) >= 0) {
-        if (d > e) {
-            b->slen = d;
-            if (balloc (b, d + 2) != BSTR_OK) return BSTR_ERR;
-            e = b->mlen - 2;
-        }
-        b->data[d] = (unsigned char) c;
-        d++;
-        if (c == terminator) break;
-    }
-
-    b->data[d] = (unsigned char) '\0';
-    b->slen = d;
-
-    return d == 0 && c < 0;
-}
-
-/*  int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator)
- *
- *  Use an fgetc-like single character stream reading function (getcPtr) to 
- *  obtain a sequence of characters which are concatenated to the end of the
- *  bstring b.  The stream read is terminated by the passed in terminator 
- *  parameter.
- *
- *  If getcPtr returns with a negative number, or the terminator character 
- *  (which is appended) is read, then the stream reading is halted and the 
- *  function returns with a partial result concatentated to b.  If there is 
- *  an empty partial result, 1 is returned.  If no characters are read, or 
- *  there is some other detectable error, BSTR_ERR is returned.
- */
-int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator) {
-int c, d, e;
-
-    if (b == NULL || b->mlen <= 0 || b->slen < 0 || b->mlen < b->slen ||
-        b->mlen <= 0 || getcPtr == NULL) return BSTR_ERR;
-    d = b->slen;
-    e = b->mlen - 2;
-
-    while ((c = getcPtr (parm)) >= 0) {
-        if (d > e) {
-            b->slen = d;
-            if (balloc (b, d + 2) != BSTR_OK) return BSTR_ERR;
-            e = b->mlen - 2;
-        }
-        b->data[d] = (unsigned char) c;
-        d++;
-        if (c == terminator) break;
-    }
-
-    b->data[d] = (unsigned char) '\0';
-    b->slen = d;
-
-    return d == 0 && c < 0;
-}
-
-/*  bstring bgets (bNgetc getcPtr, void * parm, char terminator)
- *
- *  Use an fgetc-like single character stream reading function (getcPtr) to 
- *  obtain a sequence of characters which are concatenated into a bstring.  
- *  The stream read is terminated by the passed in terminator function.
- *
- *  If getcPtr returns with a negative number, or the terminator character 
- *  (which is appended) is read, then the stream reading is halted and the 
- *  result obtained thus far is returned.  If no characters are read, or 
- *  there is some other detectable error, NULL is returned.
- */
-bstring bgets (bNgetc getcPtr, void * parm, char terminator) {
-bstring buff;
-
-    if (0 > bgetsa (buff = bfromcstr (""), getcPtr, parm, terminator) || 0 >= buff->slen) {
-        bdestroy (buff);
-        buff = NULL;
-    }
-    return buff;
-}
-
-struct bStream {
-    bstring buff;        /* Buffer for over-reads */
-    void * parm;        /* The stream handle for core stream */
-    bNread readFnPtr;    /* fread compatible fnptr for core stream */
-    int isEOF;        /* track file's EOF state */
-    int maxBuffSz;
-};
-
-/*  struct bStream * bsopen (bNread readPtr, void * parm)
- *
- *  Wrap a given open stream (described by a fread compatible function 
- *  pointer and stream handle) into an open bStream suitable for the bstring 
- *  library streaming functions.
- */
-struct bStream * bsopen (bNread readPtr, void * parm) {
-struct bStream * s;
-
-    if (readPtr == NULL) return NULL;
-    s = (struct bStream *) bstr__alloc (sizeof (struct bStream));
-    if (s == NULL) return NULL;
-    s->parm = parm;
-    s->buff = bfromcstr ("");
-    s->readFnPtr = readPtr;
-    s->maxBuffSz = BS_BUFF_SZ;
-    s->isEOF = 0;
-    return s;
-}
-
-/*  int bsbufflength (struct bStream * s, int sz)
- *
- *  Set the length of the buffer used by the bStream.  If sz is zero, the 
- *  length is not set.  This function returns with the previous length.
- */
-int bsbufflength (struct bStream * s, int sz) {
-int oldSz;
-    if (s == NULL || sz < 0) return BSTR_ERR;
-    oldSz = s->maxBuffSz;
-    if (sz > 0) s->maxBuffSz = sz;
-    return oldSz;
-}
-
-int bseof (const struct bStream * s) {
-    if (s == NULL || s->readFnPtr == NULL) return BSTR_ERR;
-    return s->isEOF && (s->buff->slen == 0);
-}
-
-/*  void * bsclose (struct bStream * s)
- *
- *  Close the bStream, and return the handle to the stream that was originally
- *  used to open the given stream.
- */
-void * bsclose (struct bStream * s) {
-void * parm;
-    if (s == NULL) return NULL;
-    s->readFnPtr = NULL;
-    if (s->buff) bdestroy (s->buff);
-    s->buff = NULL;
-    parm = s->parm;
-    s->parm = NULL;
-    s->isEOF = 1;
-    bstr__free (s);
-    return parm;
-}
-
-/*  int bsreadlna (bstring r, struct bStream * s, char terminator)
- *
- *  Read a bstring terminated by the terminator character or the end of the
- *  stream from the bStream (s) and return it into the parameter r.  This 
- *  function may read additional characters from the core stream that are not 
- *  returned, but will be retained for subsequent read operations.
- */
-int bsreadlna (bstring r, struct bStream * s, char terminator) {
-int i, l, ret, rlo;
-char * b;
-struct tagbstring x;
-
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0 ||
-        r->slen < 0 || r->mlen < r->slen) return BSTR_ERR;
-    l = s->buff->slen;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    b = (char *) s->buff->data;
-    x.data = (unsigned char *) b;
-
-    /* First check if the current buffer holds the terminator */
-    b[l] = terminator; /* Set sentinel */
-    for (i=0; b[i] != terminator; i++) ;
-    if (i < l) {
-        x.slen = i + 1;
-        ret = bconcat (r, &x);
-        s->buff->slen = l;
-        if (BSTR_OK == ret) bdelete (s->buff, 0, i + 1);
-        return BSTR_OK;
-    }
-
-    rlo = r->slen;
-
-    /* If not then just concatenate the entire buffer to the output */
-    x.slen = l;
-    if (BSTR_OK != bconcat (r, &x)) return BSTR_ERR;
-
-    /* Perform direct in-place reads into the destination to allow for
-       the minimum of data-copies */
-    for (;;) {
-        if (BSTR_OK != balloc (r, r->slen + s->maxBuffSz + 1)) return BSTR_ERR;
-        b = (char *) (r->data + r->slen);
-        l = (int) s->readFnPtr (b, 1, s->maxBuffSz, s->parm);
-        if (l <= 0) {
-            r->data[r->slen] = (unsigned char) '\0';
-            s->buff->slen = 0;
-            s->isEOF = 1;
-            /* If nothing was read return with an error message */
-            return BSTR_ERR & -(r->slen == rlo);
-        }
-        b[l] = terminator; /* Set sentinel */
-        for (i=0; b[i] != terminator; i++) ;
-        if (i < l) break;
-        r->slen += l;
-    }
-
-    /* Terminator found, push over-read back to buffer */
-    i++;
-    r->slen += i;
-    s->buff->slen = l - i;
-    bstr__memcpy (s->buff->data, b + i, l - i);
-    r->data[r->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bsreadlnsa (bstring r, struct bStream * s, bstring term)
- *
- *  Read a bstring terminated by any character in the term string or the end 
- *  of the stream from the bStream (s) and return it into the parameter r.  
- *  This function may read additional characters from the core stream that 
- *  are not returned, but will be retained for subsequent read operations.
- */
-int bsreadlnsa (bstring r, struct bStream * s, const_bstring term) {
-int i, l, ret, rlo;
-unsigned char * b;
-struct tagbstring x;
-struct charField cf;
-
-    if (s == NULL || s->buff == NULL || r == NULL || term == NULL ||
-        term->data == NULL || r->mlen <= 0 || r->slen < 0 ||
-        r->mlen < r->slen) return BSTR_ERR;
-    if (term->slen == 1) return bsreadlna (r, s, term->data[0]);
-    if (term->slen < 1 || buildCharField (&cf, term)) return BSTR_ERR;
-
-    l = s->buff->slen;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    b = (unsigned char *) s->buff->data;
-    x.data = b;
-
-    /* First check if the current buffer holds the terminator */
-    b[l] = term->data[0]; /* Set sentinel */
-    for (i=0; !testInCharField (&cf, b[i]); i++) ;
-    if (i < l) {
-        x.slen = i + 1;
-        ret = bconcat (r, &x);
-        s->buff->slen = l;
-        if (BSTR_OK == ret) bdelete (s->buff, 0, i + 1);
-        return BSTR_OK;
-    }
-
-    rlo = r->slen;
-
-    /* If not then just concatenate the entire buffer to the output */
-    x.slen = l;
-    if (BSTR_OK != bconcat (r, &x)) return BSTR_ERR;
-
-    /* Perform direct in-place reads into the destination to allow for
-       the minimum of data-copies */
-    for (;;) {
-        if (BSTR_OK != balloc (r, r->slen + s->maxBuffSz + 1)) return BSTR_ERR;
-        b = (unsigned char *) (r->data + r->slen);
-        l = (int) s->readFnPtr (b, 1, s->maxBuffSz, s->parm);
-        if (l <= 0) {
-            r->data[r->slen] = (unsigned char) '\0';
-            s->buff->slen = 0;
-            s->isEOF = 1;
-            /* If nothing was read return with an error message */
-            return BSTR_ERR & -(r->slen == rlo);
-        }
-
-        b[l] = term->data[0]; /* Set sentinel */
-        for (i=0; !testInCharField (&cf, b[i]); i++) ;
-        if (i < l) break;
-        r->slen += l;
-    }
-
-    /* Terminator found, push over-read back to buffer */
-    i++;
-    r->slen += i;
-    s->buff->slen = l - i;
-    bstr__memcpy (s->buff->data, b + i, l - i);
-    r->data[r->slen] = (unsigned char) '\0';
-    return BSTR_OK;
-}
-
-/*  int bsreada (bstring r, struct bStream * s, int n)
- *
- *  Read a bstring of length n (or, if it is fewer, as many bytes as is 
- *  remaining) from the bStream.  This function may read additional 
- *  characters from the core stream that are not returned, but will be 
- *  retained for subsequent read operations.  This function will not read
- *  additional characters from the core stream beyond virtual stream pointer.
- */
-int bsreada (bstring r, struct bStream * s, int n) {
-int l, ret, orslen;
-char * b;
-struct tagbstring x;
-
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0
-     || r->slen < 0 || r->mlen < r->slen || n <= 0) return BSTR_ERR;
-
-    n += r->slen;
-    if (n <= 0) return BSTR_ERR;
-
-    l = s->buff->slen;
-
-    orslen = r->slen;
-
-    if (0 == l) {
-        if (s->isEOF) return BSTR_ERR;
-        if (r->mlen > n) {
-            l = (int) s->readFnPtr (r->data + r->slen, 1, n - r->slen, s->parm);
-            if (0 >= l || l > n - r->slen) {
-                s->isEOF = 1;
-                return BSTR_ERR;
-            }
-            r->slen += l;
-            r->data[r->slen] = (unsigned char) '\0';
-            return 0;
-        }
-    }
-
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    b = (char *) s->buff->data;
-    x.data = (unsigned char *) b;
-
-    do {
-        if (l + r->slen >= n) {
-            x.slen = n - r->slen;
-            ret = bconcat (r, &x);
-            s->buff->slen = l;
-            if (BSTR_OK == ret) bdelete (s->buff, 0, x.slen);
-            return BSTR_ERR & -(r->slen == orslen);
-        }
-
-        x.slen = l;
-        if (BSTR_OK != bconcat (r, &x)) break;
-
-        l = n - r->slen;
-        if (l > s->maxBuffSz) l = s->maxBuffSz;
-
-        l = (int) s->readFnPtr (b, 1, l, s->parm);
-
-    } while (l > 0);
-    if (l < 0) l = 0;
-    if (l == 0) s->isEOF = 1;
-    s->buff->slen = l;
-    return BSTR_ERR & -(r->slen == orslen);
-}
-
-/*  int bsreadln (bstring r, struct bStream * s, char terminator)
- *
- *  Read a bstring terminated by the terminator character or the end of the
- *  stream from the bStream (s) and return it into the parameter r.  This 
- *  function may read additional characters from the core stream that are not 
- *  returned, but will be retained for subsequent read operations.
- */
-int bsreadln (bstring r, struct bStream * s, char terminator) {
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0)
-        return BSTR_ERR;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    r->slen = 0;
-    return bsreadlna (r, s, terminator);
-}
-
-/*  int bsreadlns (bstring r, struct bStream * s, bstring term)
- *
- *  Read a bstring terminated by any character in the term string or the end 
- *  of the stream from the bStream (s) and return it into the parameter r.  
- *  This function may read additional characters from the core stream that 
- *  are not returned, but will be retained for subsequent read operations.
- */
-int bsreadlns (bstring r, struct bStream * s, const_bstring term) {
-    if (s == NULL || s->buff == NULL || r == NULL || term == NULL 
-     || term->data == NULL || r->mlen <= 0) return BSTR_ERR;
-    if (term->slen == 1) return bsreadln (r, s, term->data[0]);
-    if (term->slen < 1) return BSTR_ERR;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    r->slen = 0;
-    return bsreadlnsa (r, s, term);
-}
-
-/*  int bsread (bstring r, struct bStream * s, int n)
- *
- *  Read a bstring of length n (or, if it is fewer, as many bytes as is 
- *  remaining) from the bStream.  This function may read additional 
- *  characters from the core stream that are not returned, but will be 
- *  retained for subsequent read operations.  This function will not read
- *  additional characters from the core stream beyond virtual stream pointer.
- */
-int bsread (bstring r, struct bStream * s, int n) {
-    if (s == NULL || s->buff == NULL || r == NULL || r->mlen <= 0
-     || n <= 0) return BSTR_ERR;
-    if (BSTR_OK != balloc (s->buff, s->maxBuffSz + 1)) return BSTR_ERR;
-    r->slen = 0;
-    return bsreada (r, s, n);
-}
-
-/*  int bsunread (struct bStream * s, const_bstring b)
- *
- *  Insert a bstring into the bStream at the current position.  These 
- *  characters will be read prior to those that actually come from the core 
- *  stream.
- */
-int bsunread (struct bStream * s, const_bstring b) {
-    if (s == NULL || s->buff == NULL) return BSTR_ERR;
-    return binsert (s->buff, 0, b, (unsigned char) '?');
-}
-
-/*  int bspeek (bstring r, const struct bStream * s)
- *
- *  Return the currently buffered characters from the bStream that will be 
- *  read prior to reads from the core stream.
- */
-int bspeek (bstring r, const struct bStream * s) {
-    if (s == NULL || s->buff == NULL) return BSTR_ERR;
-    return bassign (r, s->buff);
-}
-
-/*  bstring bjoin (const struct bstrList * bl, const_bstring sep);
- *
- *  Join the entries of a bstrList into one bstring by sequentially 
- *  concatenating them with the sep string in between.  If there is an error 
- *  NULL is returned, otherwise a bstring with the correct result is returned.
- */
-bstring bjoin (const struct bstrList * bl, const_bstring sep) {
-bstring b;
-int i, c, v;
-
-    if (bl == NULL || bl->qty < 0) return NULL;
-    if (sep != NULL && (sep->slen < 0 || sep->data == NULL)) return NULL;
-
-    for (i = 0, c = 1; i < bl->qty; i++) {
-        v = bl->entry[i]->slen;
-        if (v < 0) return NULL;    /* Invalid input */
-        c += v;
-        if (c < 0) return NULL;    /* Wrap around ?? */
-    }
-
-    if (sep != NULL) c += (bl->qty - 1) * sep->slen;
-
-    b = (bstring) bstr__alloc (sizeof (struct tagbstring));
-    if (NULL == b) return NULL; /* Out of memory */
-    b->data = (unsigned char *) bstr__alloc (c);
-    if (b->data == NULL) {
-        bstr__free (b);
-        return NULL;
-    }
-
-    b->mlen = c;
-    b->slen = c-1;
-
-    for (i = 0, c = 0; i < bl->qty; i++) {
-        if (i > 0 && sep != NULL) {
-            bstr__memcpy (b->data + c, sep->data, sep->slen);
-            c += sep->slen;
-        }
-        v = bl->entry[i]->slen;
-        bstr__memcpy (b->data + c, bl->entry[i]->data, v);
-        c += v;
-    }
-    b->data[c] = (unsigned char) '\0';
-    return b;
-}
-
-#define BSSSC_BUFF_LEN (256)
-
-/*  int bssplitscb (struct bStream * s, const_bstring splitStr, 
- *    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings read from a stream 
- *  divided by any of the characters in splitStr.  An empty splitStr causes 
- *  the whole stream to be iterated once.
- *
- *  Note: At the point of calling the cb function, the bStream pointer is 
- *  pointed exactly at the position right after having read the split 
- *  character.  The cb function can act on the stream by causing the bStream
- *  pointer to move, and bssplitscb will continue by starting the next split
- *  at the position of the pointer after the return from cb.
- *
- *  However, if the cb causes the bStream s to be destroyed then the cb must
- *  return with a negative value, otherwise bssplitscb will continue in an 
- *  undefined manner.
- */
-int bssplitscb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm) {
-struct charField chrs;
-bstring buff;
-int i, p, ret;
-
-    if (cb == NULL || s == NULL || s->readFnPtr == NULL 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-
-    if (NULL == (buff = bfromcstr (""))) return BSTR_ERR;
-
-    if (splitStr->slen == 0) {
-        while (bsreada (buff, s, BSSSC_BUFF_LEN) >= 0) ;
-        if ((ret = cb (parm, 0, buff)) > 0) 
-            ret = 0;
-    } else {
-        buildCharField (&chrs, splitStr);
-        ret = p = i = 0;
-        for (;;) {
-            if (i >= buff->slen) {
-                bsreada (buff, s, BSSSC_BUFF_LEN);
-                if (i >= buff->slen) {
-                    if (0 < (ret = cb (parm, p, buff))) ret = 0;
-                    break;
-                }
-            }
-            if (testInCharField (&chrs, buff->data[i])) {
-                struct tagbstring t;
-                unsigned char c;
-
-                blk2tbstr (t, buff->data + i + 1, buff->slen - (i + 1));
-                if ((ret = bsunread (s, &t)) < 0) break;
-                buff->slen = i;
-                c = buff->data[i];
-                buff->data[i] = (unsigned char) '\0';
-                if ((ret = cb (parm, p, buff)) < 0) break;
-                buff->data[i] = c;
-                buff->slen = 0;
-                p += i + 1;
-                i = -1;
-            }
-            i++;
-        }
-    }
-
-    bdestroy (buff);
-    return ret;
-}
-
-/*  int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
- *    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings read from a stream 
- *  divided by the entire substring splitStr.  An empty splitStr causes 
- *  each character of the stream to be iterated.
- *
- *  Note: At the point of calling the cb function, the bStream pointer is 
- *  pointed exactly at the position right after having read the split 
- *  character.  The cb function can act on the stream by causing the bStream
- *  pointer to move, and bssplitscb will continue by starting the next split
- *  at the position of the pointer after the return from cb.
- *
- *  However, if the cb causes the bStream s to be destroyed then the cb must
- *  return with a negative value, otherwise bssplitscb will continue in an 
- *  undefined manner.
- */
-int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm) {
-bstring buff;
-int i, p, ret;
-
-    if (cb == NULL || s == NULL || s->readFnPtr == NULL 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-
-    if (splitStr->slen == 1) return bssplitscb (s, splitStr, cb, parm);
-
-    if (NULL == (buff = bfromcstr (""))) return BSTR_ERR;
-
-    if (splitStr->slen == 0) {
-        for (i=0; bsreada (buff, s, BSSSC_BUFF_LEN) >= 0; i++) {
-            if ((ret = cb (parm, 0, buff)) < 0) {
-                bdestroy (buff);
-                return ret;
-            }
-            buff->slen = 0;
-        }
-        return BSTR_OK;
-    } else {
-        ret = p = i = 0;
-        for (i=p=0;;) {
-            if ((ret = binstr (buff, 0, splitStr)) >= 0) {
-                struct tagbstring t;
-                blk2tbstr (t, buff->data, ret);
-                i = ret + splitStr->slen;
-                if ((ret = cb (parm, p, &t)) < 0) break;
-                p += i;
-                bdelete (buff, 0, i);
-            } else {
-                bsreada (buff, s, BSSSC_BUFF_LEN);
-                if (bseof (s)) {
-                    if ((ret = cb (parm, p, buff)) > 0) ret = 0;
-                    break;
-                }
-            }
-        }
-    }
-
-    bdestroy (buff);
-    return ret;
-}
-
-/*  int bstrListCreate (void)
- *
- *  Create a bstrList.
- */
-struct bstrList * bstrListCreate (void) {
-struct bstrList * sl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (sl) {
-        sl->entry = (bstring *) bstr__alloc (1*sizeof (bstring));
-        if (!sl->entry) {
-            bstr__free (sl);
-            sl = NULL;
-        } else {
-            sl->qty = 0;
-            sl->mlen = 1;
-        }
-    }
-    return sl;
-}
-
-/*  int bstrListDestroy (struct bstrList * sl)
- *
- *  Destroy a bstrList that has been created by bsplit, bsplits or bstrListCreate.
- */
-int bstrListDestroy (struct bstrList * sl) {
-int i;
-    if (sl == NULL || sl->qty < 0) return BSTR_ERR;
-    for (i=0; i < sl->qty; i++) {
-        if (sl->entry[i]) {
-            bdestroy (sl->entry[i]);
-            sl->entry[i] = NULL;
-        }
-    }
-    sl->qty  = -1;
-    sl->mlen = -1;
-    bstr__free (sl->entry);
-    sl->entry = NULL;
-    bstr__free (sl);
-    return BSTR_OK;
-}
-
-/*  int bstrListAlloc (struct bstrList * sl, int msz)
- *
- *  Ensure that there is memory for at least msz number of entries for the
- *  list.
- */
-int bstrListAlloc (struct bstrList * sl, int msz) {
-bstring * l;
-int smsz;
-size_t nsz;
-    if (!sl || msz <= 0 || !sl->entry || sl->qty < 0 || sl->mlen <= 0 || sl->qty > sl->mlen) return BSTR_ERR;
-    if (sl->mlen >= msz) return BSTR_OK;
-    smsz = snapUpSize (msz);
-    nsz = ((size_t) smsz) * sizeof (bstring);
-    if (nsz < (size_t) smsz) return BSTR_ERR;
-    l = (bstring *) bstr__realloc (sl->entry, nsz);
-    if (!l) {
-        smsz = msz;
-        nsz = ((size_t) smsz) * sizeof (bstring);
-        l = (bstring *) bstr__realloc (sl->entry, nsz);
-        if (!l) return BSTR_ERR;
-    }
-    sl->mlen = smsz;
-    sl->entry = l;
-    return BSTR_OK;
-}
-
-/*  int bstrListAllocMin (struct bstrList * sl, int msz)
- *
- *  Try to allocate the minimum amount of memory for the list to include at
- *  least msz entries or sl->qty whichever is greater.
- */
-int bstrListAllocMin (struct bstrList * sl, int msz) {
-bstring * l;
-size_t nsz;
-    if (!sl || msz <= 0 || !sl->entry || sl->qty < 0 || sl->mlen <= 0 || sl->qty > sl->mlen) return BSTR_ERR;
-    if (msz < sl->qty) msz = sl->qty;
-    if (sl->mlen == msz) return BSTR_OK;
-    nsz = ((size_t) msz) * sizeof (bstring);
-    if (nsz < (size_t) msz) return BSTR_ERR;
-    l = (bstring *) bstr__realloc (sl->entry, nsz);
-    if (!l) return BSTR_ERR;
-    sl->mlen = msz;
-    sl->entry = l;
-    return BSTR_OK;
-}
-
-/*  int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
- *    int (* cb) (void * parm, int ofs, int len), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings over str divided by the
- *  character in splitChar.
- *
- *  Note: Non-destructive modification of str from within the cb function 
- *  while performing this split is not undefined.  bsplitcb behaves in 
- *  sequential lock step with calls to cb.  I.e., after returning from a cb 
- *  that return a non-negative integer, bsplitcb continues from the position 
- *  1 character after the last detected split character and it will halt 
- *  immediately if the length of str falls below this point.  However, if the 
- *  cb function destroys str, then it *must* return with a negative value, 
- *  otherwise bsplitcb will continue in an undefined manner.
- */
-int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm) {
-int i, p, ret;
-
-    if (cb == NULL || str == NULL || pos < 0 || pos > str->slen) 
-        return BSTR_ERR;
-
-    p = pos;
-    do {
-        for (i=p; i < str->slen; i++) {
-            if (str->data[i] == splitChar) break;
-        }
-        if ((ret = cb (parm, p, i - p)) < 0) return ret;
-        p = i + 1;
-    } while (p <= str->slen);
-    return BSTR_OK;
-}
-
-/*  int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
- *    int (* cb) (void * parm, int ofs, int len), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings over str divided by any 
- *  of the characters in splitStr.  An empty splitStr causes the whole str to
- *  be iterated once.
- *
- *  Note: Non-destructive modification of str from within the cb function 
- *  while performing this split is not undefined.  bsplitscb behaves in 
- *  sequential lock step with calls to cb.  I.e., after returning from a cb 
- *  that return a non-negative integer, bsplitscb continues from the position 
- *  1 character after the last detected split character and it will halt 
- *  immediately if the length of str falls below this point.  However, if the 
- *  cb function destroys str, then it *must* return with a negative value, 
- *  otherwise bsplitscb will continue in an undefined manner.
- */
-int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm) {
-struct charField chrs;
-int i, p, ret;
-
-    if (cb == NULL || str == NULL || pos < 0 || pos > str->slen 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-    if (splitStr->slen == 0) {
-        if ((ret = cb (parm, 0, str->slen)) > 0) ret = 0;
-        return ret;
-    }
-
-    if (splitStr->slen == 1) 
-        return bsplitcb (str, splitStr->data[0], pos, cb, parm);
-
-    buildCharField (&chrs, splitStr);
-
-    p = pos;
-    do {
-        for (i=p; i < str->slen; i++) {
-            if (testInCharField (&chrs, str->data[i])) break;
-        }
-        if ((ret = cb (parm, p, i - p)) < 0) return ret;
-        p = i + 1;
-    } while (p <= str->slen);
-    return BSTR_OK;
-}
-
-/*  int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
- *    int (* cb) (void * parm, int ofs, int len), void * parm)
- *
- *  Iterate the set of disjoint sequential substrings over str divided by the 
- *  substring splitStr.  An empty splitStr causes the whole str to be 
- *  iterated once.
- *
- *  Note: Non-destructive modification of str from within the cb function 
- *  while performing this split is not undefined.  bsplitstrcb behaves in 
- *  sequential lock step with calls to cb.  I.e., after returning from a cb 
- *  that return a non-negative integer, bsplitscb continues from the position 
- *  1 character after the last detected split character and it will halt 
- *  immediately if the length of str falls below this point.  However, if the 
- *  cb function destroys str, then it *must* return with a negative value, 
- *  otherwise bsplitscb will continue in an undefined manner.
- */
-int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm) {
-int i, p, ret;
-
-    if (cb == NULL || str == NULL || pos < 0 || pos > str->slen 
-     || splitStr == NULL || splitStr->slen < 0) return BSTR_ERR;
-
-    if (0 == splitStr->slen) {
-        for (i=pos; i < str->slen; i++) {
-            if ((ret = cb (parm, i, 1)) < 0) return ret;
-        }
-        return BSTR_OK;
-    }
-
-    if (splitStr->slen == 1) 
-        return bsplitcb (str, splitStr->data[0], pos, cb, parm);
-
-    for (i=p=pos; i <= str->slen - splitStr->slen; i++) {
-        if (0 == bstr__memcmp (splitStr->data, str->data + i, splitStr->slen)) {
-            if ((ret = cb (parm, p, i - p)) < 0) return ret;
-            i += splitStr->slen;
-            p = i;
-        }
-    }
-    if ((ret = cb (parm, p, str->slen - p)) < 0) return ret;
-    return BSTR_OK;
-}
-
-struct genBstrList {
-    bstring b;
-    struct bstrList * bl;
-};
-
-static int bscb (void * parm, int ofs, int len) {
-struct genBstrList * g = (struct genBstrList *) parm;
-    if (g->bl->qty >= g->bl->mlen) {
-        int mlen = g->bl->mlen * 2;
-        bstring * tbl;
-
-        while (g->bl->qty >= mlen) {
-            if (mlen < g->bl->mlen) return BSTR_ERR;
-            mlen += mlen;
-        }
-
-        tbl = (bstring *) bstr__realloc (g->bl->entry, sizeof (bstring) * mlen);
-        if (tbl == NULL) return BSTR_ERR;
-
-        g->bl->entry = tbl;
-        g->bl->mlen = mlen;
-    }
-
-    g->bl->entry[g->bl->qty] = bmidstr (g->b, ofs, len);
-    g->bl->qty++;
-    return BSTR_OK;
-}
-
-/*  struct bstrList * bsplit (const_bstring str, unsigned char splitChar)
- *
- *  Create an array of sequential substrings from str divided by the character
- *  splitChar.  
- */
-struct bstrList * bsplit (const_bstring str, unsigned char splitChar) {
-struct genBstrList g;
-
-    if (str == NULL || str->data == NULL || str->slen < 0) return NULL;
-
-    g.bl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (g.bl == NULL) return NULL;
-    g.bl->mlen = 4;
-    g.bl->entry = (bstring *) bstr__alloc (g.bl->mlen * sizeof (bstring));
-    if (NULL == g.bl->entry) {
-        bstr__free (g.bl);
-        return NULL;
-    }
-
-    g.b = (bstring) str;
-    g.bl->qty = 0;
-    if (bsplitcb (str, splitChar, 0, bscb, &g) < 0) {
-        bstrListDestroy (g.bl);
-        return NULL;
-    }
-    return g.bl;
-}
-
-/*  struct bstrList * bsplitstr (const_bstring str, const_bstring splitStr)
- *
- *  Create an array of sequential substrings from str divided by the entire
- *  substring splitStr.
- */
-struct bstrList * bsplitstr (const_bstring str, const_bstring splitStr) {
-struct genBstrList g;
-
-    if (str == NULL || str->data == NULL || str->slen < 0) return NULL;
-
-    g.bl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (g.bl == NULL) return NULL;
-    g.bl->mlen = 4;
-    g.bl->entry = (bstring *) bstr__alloc (g.bl->mlen * sizeof (bstring));
-    if (NULL == g.bl->entry) {
-        bstr__free (g.bl);
-        return NULL;
-    }
-
-    g.b = (bstring) str;
-    g.bl->qty = 0;
-    if (bsplitstrcb (str, splitStr, 0, bscb, &g) < 0) {
-        bstrListDestroy (g.bl);
-        return NULL;
-    }
-    return g.bl;
-}
-
-/*  struct bstrList * bsplits (const_bstring str, bstring splitStr)
- *
- *  Create an array of sequential substrings from str divided by any of the 
- *  characters in splitStr.  An empty splitStr causes a single entry bstrList
- *  containing a copy of str to be returned.
- */
-struct bstrList * bsplits (const_bstring str, const_bstring splitStr) {
-struct genBstrList g;
-
-    if (     str == NULL ||      str->slen < 0 ||      str->data == NULL ||
-        splitStr == NULL || splitStr->slen < 0 || splitStr->data == NULL)
-        return NULL;
-
-    g.bl = (struct bstrList *) bstr__alloc (sizeof (struct bstrList));
-    if (g.bl == NULL) return NULL;
-    g.bl->mlen = 4;
-    g.bl->entry = (bstring *) bstr__alloc (g.bl->mlen * sizeof (bstring));
-    if (NULL == g.bl->entry) {
-        bstr__free (g.bl);
-        return NULL;
-    }
-    g.b = (bstring) str;
-    g.bl->qty = 0;
-
-    if (bsplitscb (str, splitStr, 0, bscb, &g) < 0) {
-        bstrListDestroy (g.bl);
-        return NULL;
-    }
-    return g.bl;
-}
-
-#if defined (__TURBOC__) && !defined (__BORLANDC__)
-# ifndef BSTRLIB_NOVSNP
-#  define BSTRLIB_NOVSNP
-# endif
-#endif
-
-/* Give WATCOM C/C++, MSVC some latitude for their non-support of vsnprintf */
-#if defined(__WATCOMC__) || defined(_MSC_VER)
-#define exvsnprintf(r,b,n,f,a) {r = _vsnprintf (b,n,f,a);}
-#else
-#ifdef BSTRLIB_NOVSNP
-/* This is just a hack.  If you are using a system without a vsnprintf, it is 
-   not recommended that bformat be used at all. */
-#define exvsnprintf(r,b,n,f,a) {vsprintf (b,f,a); r = -1;}
-#define START_VSNBUFF (256)
-#else
-
-#ifdef __GNUC__
-/* Something is making gcc complain about this prototype not being here, so 
-   I've just gone ahead and put it in. */
-//extern int vsnprintf (char *buf, size_t count, const char *format, va_list arg);
-#endif
-
-#define exvsnprintf(r,b,n,f,a) {r = vsnprintf (b,n,f,a);}
-#endif
-#endif
-
-#if !defined (BSTRLIB_NOVSNP)
-
-#ifndef START_VSNBUFF
-#define START_VSNBUFF (16)
-#endif
-
-/* On IRIX vsnprintf returns n-1 when the operation would overflow the target 
-   buffer, WATCOM and MSVC both return -1, while C99 requires that the 
-   returned value be exactly what the length would be if the buffer would be
-   large enough.  This leads to the idea that if the return value is larger 
-   than n, then changing n to the return value will reduce the number of
-   iterations required. */
-
-/*  int bformata (bstring b, const char * fmt, ...)
- *
- *  After the first parameter, it takes the same parameters as printf (), but 
- *  rather than outputting results to stdio, it appends the results to 
- *  a bstring which contains what would have been output. Note that if there 
- *  is an early generation of a '\0' character, the bstring will be truncated 
- *  to this end point.
- */
-int bformata (bstring b, const char * fmt, ...) {
-va_list arglist;
-bstring buff;
-int n, r;
-
-    if (b == NULL || fmt == NULL || b->data == NULL || b->mlen <= 0 
-     || b->slen < 0 || b->slen > b->mlen) return BSTR_ERR;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "vsnprintf" call (to avoid buffer
-       overflows) on increasing potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < START_VSNBUFF) n = START_VSNBUFF;
-    if (NULL == (buff = bfromcstralloc (n + 2, ""))) {
-        n = 1;
-        if (NULL == (buff = bfromcstralloc (n + 2, ""))) return BSTR_ERR;
-    }
-
-    for (;;) {
-        va_start (arglist, fmt);
-        exvsnprintf (r, (char *) buff->data, n + 1, fmt, arglist);
-        va_end (arglist);
-
-        buff->data[n] = (unsigned char) '\0';
-        buff->slen = (int) (strlen) ((char *) buff->data);
-
-        if (buff->slen < n) break;
-
-        if (r > n) n = r; else n += n;
-
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return BSTR_ERR;
-        }
-    }
-
-    r = bconcat (b, buff);
-    bdestroy (buff);
-    return r;
-}
-
-/*  int bassignformat (bstring b, const char * fmt, ...)
- *
- *  After the first parameter, it takes the same parameters as printf (), but 
- *  rather than outputting results to stdio, it outputs the results to 
- *  the bstring parameter b. Note that if there is an early generation of a 
- *  '\0' character, the bstring will be truncated to this end point.
- */
-int bassignformat (bstring b, const char * fmt, ...) {
-va_list arglist;
-bstring buff;
-int n, r;
-
-    if (b == NULL || fmt == NULL || b->data == NULL || b->mlen <= 0 
-     || b->slen < 0 || b->slen > b->mlen) return BSTR_ERR;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "vsnprintf" call (to avoid buffer
-       overflows) on increasing potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < START_VSNBUFF) n = START_VSNBUFF;
-    if (NULL == (buff = bfromcstralloc (n + 2, ""))) {
-        n = 1;
-        if (NULL == (buff = bfromcstralloc (n + 2, ""))) return BSTR_ERR;
-    }
-
-    for (;;) {
-        va_start (arglist, fmt);
-        exvsnprintf (r, (char *) buff->data, n + 1, fmt, arglist);
-        va_end (arglist);
-
-        buff->data[n] = (unsigned char) '\0';
-        buff->slen = (int) (strlen) ((char *) buff->data);
-
-        if (buff->slen < n) break;
-
-        if (r > n) n = r; else n += n;
-
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return BSTR_ERR;
-        }
-    }
-
-    r = bassign (b, buff);
-    bdestroy (buff);
-    return r;
-}
-
-/*  bstring bformat (const char * fmt, ...)
- *
- *  Takes the same parameters as printf (), but rather than outputting results
- *  to stdio, it forms a bstring which contains what would have been output.
- *  Note that if there is an early generation of a '\0' character, the 
- *  bstring will be truncated to this end point.
- */
-bstring bformat (const char * fmt, ...) {
-va_list arglist;
-bstring buff;
-int n, r;
-
-    if (fmt == NULL) return NULL;
-
-    /* Since the length is not determinable beforehand, a search is
-       performed using the truncating "vsnprintf" call (to avoid buffer
-       overflows) on increasing potential sizes for the output result. */
-
-    if ((n = (int) (2*strlen (fmt))) < START_VSNBUFF) n = START_VSNBUFF;
-    if (NULL == (buff = bfromcstralloc (n + 2, ""))) {
-        n = 1;
-        if (NULL == (buff = bfromcstralloc (n + 2, ""))) return NULL;
-    }
-
-    for (;;) {
-        va_start (arglist, fmt);
-        exvsnprintf (r, (char *) buff->data, n + 1, fmt, arglist);
-        va_end (arglist);
-
-        buff->data[n] = (unsigned char) '\0';
-        buff->slen = (int) (strlen) ((char *) buff->data);
-
-        if (buff->slen < n) break;
-
-        if (r > n) n = r; else n += n;
-
-        if (BSTR_OK != balloc (buff, n + 2)) {
-            bdestroy (buff);
-            return NULL;
-        }
-    }
-
-    return buff;
-}
-
-/*  int bvcformata (bstring b, int count, const char * fmt, va_list arglist)
- *
- *  The bvcformata function formats data under control of the format control 
- *  string fmt and attempts to append the result to b.  The fmt parameter is 
- *  the same as that of the printf function.  The variable argument list is 
- *  replaced with arglist, which has been initialized by the va_start macro.
- *  The size of the appended output is upper bounded by count.  If the 
- *  required output exceeds count, the string b is not augmented with any 
- *  contents and a value below BSTR_ERR is returned.  If a value below -count 
- *  is returned then it is recommended that the negative of this value be 
- *  used as an update to the count in a subsequent pass.  On other errors, 
- *  such as running out of memory, parameter errors or numeric wrap around 
- *  BSTR_ERR is returned.  BSTR_OK is returned when the output is successfully 
- *  generated and appended to b.
- *
- *  Note: There is no sanity checking of arglist, and this function is
- *  destructive of the contents of b from the b->slen point onward.  If there 
- *  is an early generation of a '\0' character, the bstring will be truncated 
- *  to this end point.
- */
-int bvcformata (bstring b, int count, const char * fmt, va_list arg) {
-int n, r, l;
-
-    if (b == NULL || fmt == NULL || count <= 0 || b->data == NULL
-     || b->mlen <= 0 || b->slen < 0 || b->slen > b->mlen) return BSTR_ERR;
-
-    if (count > (n = b->slen + count) + 2) return BSTR_ERR;
-    if (BSTR_OK != balloc (b, n + 2)) return BSTR_ERR;
-
-    exvsnprintf (r, (char *) b->data + b->slen, count + 2, fmt, arg);
-
-    /* Did the operation complete successfully within bounds? */
-    for (l = b->slen; l <= n; l++) {
-        if ('\0' == b->data[l]) {
-            b->slen = l;
-            return BSTR_OK;
-        }
-    }
-
-    /* Abort, since the buffer was not large enough.  The return value 
-       tries to help set what the retry length should be. */
-
-    b->data[b->slen] = '\0';
-    if (r > count + 1) {    /* Does r specify a particular target length? */
-        n = r;
-    } else {
-        n = count + count;    /* If not, just double the size of count */
-        if (count > n) n = INT_MAX;
-    }
-    n = -n;
-
-    if (n > BSTR_ERR-1) n = BSTR_ERR-1;
-    return n;
-}
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.h b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.h
deleted file mode 100644
index edf8c00fc6..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * This source file is part of the bstring string library.  This code was
- * written by Paul Hsieh in 2002-2010, and is covered by either the 3-clause 
- * BSD open source license or GPL v2.0. Refer to the accompanying documentation 
- * for details on usage and license.
- */
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-/*
- * bstrlib.h
- *
- * This file is the header file for the core module for implementing the 
- * bstring functions.
- */
-
-#ifndef BSTRLIB_INCLUDE
-#define BSTRLIB_INCLUDE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-
-#if !defined (BSTRLIB_VSNP_OK) && !defined (BSTRLIB_NOVSNP)
-# if defined (__TURBOC__) && !defined (__BORLANDC__)
-#  define BSTRLIB_NOVSNP
-# endif
-#endif
-
-#define BSTR_ERR (-1)
-#define BSTR_OK (0)
-#define BSTR_BS_BUFF_LENGTH_GET (0)
-
-typedef struct tagbstring * bstring;
-typedef const struct tagbstring * const_bstring;
-
-/* Copy functions */
-#define cstr2bstr bfromcstr
-extern bstring bfromcstr (const char * str);
-extern bstring bfromcstralloc (int mlen, const char * str);
-extern bstring blk2bstr (const void * blk, int len);
-extern char * bstr2cstr (const_bstring s, char z);
-extern int bcstrfree (char * s);
-extern bstring bstrcpy (const_bstring b1);
-extern int bassign (bstring a, const_bstring b);
-extern int bassignmidstr (bstring a, const_bstring b, int left, int len);
-extern int bassigncstr (bstring a, const char * str);
-extern int bassignblk (bstring a, const void * s, int len);
-
-/* Destroy function */
-extern int bdestroy (bstring b);
-
-/* Space allocation hinting functions */
-extern int balloc (bstring s, int len);
-extern int ballocmin (bstring b, int len);
-
-/* Substring extraction */
-extern bstring bmidstr (const_bstring b, int left, int len);
-
-/* Various standard manipulations */
-extern int bconcat (bstring b0, const_bstring b1);
-extern int bconchar (bstring b0, char c);
-extern int bcatcstr (bstring b, const char * s);
-extern int bcatblk (bstring b, const void * s, int len);
-extern int binsert (bstring s1, int pos, const_bstring s2, unsigned char fill);
-extern int binsertch (bstring s1, int pos, int len, unsigned char fill);
-extern int breplace (bstring b1, int pos, int len, const_bstring b2, unsigned char fill);
-extern int bdelete (bstring s1, int pos, int len);
-extern int bsetstr (bstring b0, int pos, const_bstring b1, unsigned char fill);
-extern int btrunc (bstring b, int n);
-
-/* Scan/search functions */
-extern int bstricmp (const_bstring b0, const_bstring b1);
-extern int bstrnicmp (const_bstring b0, const_bstring b1, int n);
-extern int biseqcaseless (const_bstring b0, const_bstring b1);
-extern int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len);
-extern int biseq (const_bstring b0, const_bstring b1);
-extern int bisstemeqblk (const_bstring b0, const void * blk, int len);
-extern int biseqcstr (const_bstring b, const char * s);
-extern int biseqcstrcaseless (const_bstring b, const char * s);
-extern int bstrcmp (const_bstring b0, const_bstring b1);
-extern int bstrncmp (const_bstring b0, const_bstring b1, int n);
-extern int binstr (const_bstring s1, int pos, const_bstring s2);
-extern int binstrr (const_bstring s1, int pos, const_bstring s2);
-extern int binstrcaseless (const_bstring s1, int pos, const_bstring s2);
-extern int binstrrcaseless (const_bstring s1, int pos, const_bstring s2);
-extern int bstrchrp (const_bstring b, int c, int pos);
-extern int bstrrchrp (const_bstring b, int c, int pos);
-#define bstrchr(b,c) bstrchrp ((b), (c), 0)
-#define bstrrchr(b,c) bstrrchrp ((b), (c), blength(b)-1)
-extern int binchr (const_bstring b0, int pos, const_bstring b1);
-extern int binchrr (const_bstring b0, int pos, const_bstring b1);
-extern int bninchr (const_bstring b0, int pos, const_bstring b1);
-extern int bninchrr (const_bstring b0, int pos, const_bstring b1);
-extern int bfindreplace (bstring b, const_bstring find, const_bstring repl, int pos);
-extern int bfindreplacecaseless (bstring b, const_bstring find, const_bstring repl, int pos);
-
-/* List of string container functions */
-struct bstrList {
-    int qty, mlen;
-    bstring * entry;
-};
-extern struct bstrList * bstrListCreate (void);
-extern int bstrListDestroy (struct bstrList * sl);
-extern int bstrListAlloc (struct bstrList * sl, int msz);
-extern int bstrListAllocMin (struct bstrList * sl, int msz);
-
-/* String split and join functions */
-extern struct bstrList * bsplit (const_bstring str, unsigned char splitChar);
-extern struct bstrList * bsplits (const_bstring str, const_bstring splitStr);
-extern struct bstrList * bsplitstr (const_bstring str, const_bstring splitStr);
-extern bstring bjoin (const struct bstrList * bl, const_bstring sep);
-extern int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm);
-extern int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm);
-extern int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
-    int (* cb) (void * parm, int ofs, int len), void * parm);
-
-/* Miscellaneous functions */
-extern int bpattern (bstring b, int len);
-extern int btoupper (bstring b);
-extern int btolower (bstring b);
-extern int bltrimws (bstring b);
-extern int brtrimws (bstring b);
-extern int btrimws (bstring b);
-
-/* <*>printf format functions */
-#if !defined (BSTRLIB_NOVSNP)
-extern bstring bformat (const char * fmt, ...);
-extern int bformata (bstring b, const char * fmt, ...);
-extern int bassignformat (bstring b, const char * fmt, ...);
-extern int bvcformata (bstring b, int count, const char * fmt, va_list arglist);
-
-#define bvformata(ret, b, fmt, lastarg) { \
-bstring bstrtmp_b = (b); \
-const char * bstrtmp_fmt = (fmt); \
-int bstrtmp_r = BSTR_ERR, bstrtmp_sz = 16; \
-    for (;;) { \
-        va_list bstrtmp_arglist; \
-        va_start (bstrtmp_arglist, lastarg); \
-        bstrtmp_r = bvcformata (bstrtmp_b, bstrtmp_sz, bstrtmp_fmt, bstrtmp_arglist); \
-        va_end (bstrtmp_arglist); \
-        if (bstrtmp_r >= 0) { /* Everything went ok */ \
-            bstrtmp_r = BSTR_OK; \
-            break; \
-        } else if (-bstrtmp_r <= bstrtmp_sz) { /* A real error? */ \
-            bstrtmp_r = BSTR_ERR; \
-            break; \
-        } \
-        bstrtmp_sz = -bstrtmp_r; /* Doubled or target size */ \
-    } \
-    ret = bstrtmp_r; \
-}
-
-#endif
-
-typedef int (*bNgetc) (void *parm);
-typedef size_t (* bNread) (void *buff, size_t elsize, size_t nelem, void *parm);
-
-/* Input functions */
-extern bstring bgets (bNgetc getcPtr, void * parm, char terminator);
-extern bstring bread (bNread readPtr, void * parm);
-extern int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator);
-extern int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator);
-extern int breada (bstring b, bNread readPtr, void * parm);
-
-/* Stream functions */
-extern struct bStream * bsopen (bNread readPtr, void * parm);
-extern void * bsclose (struct bStream * s);
-extern int bsbufflength (struct bStream * s, int sz);
-extern int bsreadln (bstring b, struct bStream * s, char terminator);
-extern int bsreadlns (bstring r, struct bStream * s, const_bstring term);
-extern int bsread (bstring b, struct bStream * s, int n);
-extern int bsreadlna (bstring b, struct bStream * s, char terminator);
-extern int bsreadlnsa (bstring r, struct bStream * s, const_bstring term);
-extern int bsreada (bstring b, struct bStream * s, int n);
-extern int bsunread (struct bStream * s, const_bstring b);
-extern int bspeek (bstring r, const struct bStream * s);
-extern int bssplitscb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-extern int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
-    int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-extern int bseof (const struct bStream * s);
-
-struct tagbstring {
-    int mlen;
-    int slen;
-    unsigned char * data;
-};
-
-/* Accessor macros */
-#define blengthe(b, e)      (((b) == (void *)0 || (b)->slen < 0) ? (int)(e) : ((b)->slen))
-#define blength(b)          (blengthe ((b), 0))
-#define bdataofse(b, o, e)  (((b) == (void *)0 || (b)->data == (void*)0) ? (char *)(e) : ((char *)(b)->data) + (o))
-#define bdataofs(b, o)      (bdataofse ((b), (o), (void *)0))
-#define bdatae(b, e)        (bdataofse (b, 0, e))
-#define bdata(b)            (bdataofs (b, 0))
-#define bchare(b, p, e)     ((((unsigned)(p)) < (unsigned)blength(b)) ? ((b)->data[(p)]) : (e))
-#define bchar(b, p)         bchare ((b), (p), '\0')
-
-/* Static constant string initialization macro */
-#define bsStaticMlen(q,m)   {(m), (int) sizeof(q)-1, (unsigned char *) ("" q "")}
-#if defined(_MSC_VER)
-/* There are many versions of MSVC which emit __LINE__ as a non-constant. */
-# define bsStatic(q)        bsStaticMlen(q,-32)
-#endif
-#ifndef bsStatic
-# define bsStatic(q)        bsStaticMlen(q,-__LINE__)
-#endif
-
-/* Static constant block parameter pair */
-#define bsStaticBlkParms(q) ((void *)("" q "")), ((int) sizeof(q)-1)
-
-/* Reference building macros */
-#define cstr2tbstr btfromcstr
-#define btfromcstr(t,s) {                                            \
-    (t).data = (unsigned char *) (s);                                \
-    (t).slen = ((t).data) ? ((int) (strlen) ((char *)(t).data)) : 0; \
-    (t).mlen = -1;                                                   \
-}
-#define blk2tbstr(t,s,l) {            \
-    (t).data = (unsigned char *) (s); \
-    (t).slen = l;                     \
-    (t).mlen = -1;                    \
-}
-#define btfromblk(t,s,l) blk2tbstr(t,s,l)
-#define bmid2tbstr(t,b,p,l) {                                                \
-    const_bstring bstrtmp_s = (b);                                           \
-    if (bstrtmp_s && bstrtmp_s->data && bstrtmp_s->slen >= 0) {              \
-        int bstrtmp_left = (p);                                              \
-        int bstrtmp_len  = (l);                                              \
-        if (bstrtmp_left < 0) {                                              \
-            bstrtmp_len += bstrtmp_left;                                     \
-            bstrtmp_left = 0;                                                \
-        }                                                                    \
-        if (bstrtmp_len > bstrtmp_s->slen - bstrtmp_left)                    \
-            bstrtmp_len = bstrtmp_s->slen - bstrtmp_left;                    \
-        if (bstrtmp_len <= 0) {                                              \
-            (t).data = (unsigned char *)"";                                  \
-            (t).slen = 0;                                                    \
-        } else {                                                             \
-            (t).data = bstrtmp_s->data + bstrtmp_left;                       \
-            (t).slen = bstrtmp_len;                                          \
-        }                                                                    \
-    } else {                                                                 \
-        (t).data = (unsigned char *)"";                                      \
-        (t).slen = 0;                                                        \
-    }                                                                        \
-    (t).mlen = -__LINE__;                                                    \
-}
-#define btfromblkltrimws(t,s,l) {                                            \
-    int bstrtmp_idx = 0, bstrtmp_len = (l);                                  \
-    unsigned char * bstrtmp_s = (s);                                         \
-    if (bstrtmp_s && bstrtmp_len >= 0) {                                     \
-        for (; bstrtmp_idx < bstrtmp_len; bstrtmp_idx++) {                   \
-            if (!isspace (bstrtmp_s[bstrtmp_idx])) break;                    \
-        }                                                                    \
-    }                                                                        \
-    (t).data = bstrtmp_s + bstrtmp_idx;                                      \
-    (t).slen = bstrtmp_len - bstrtmp_idx;                                    \
-    (t).mlen = -__LINE__;                                                    \
-}
-#define btfromblkrtrimws(t,s,l) {                                            \
-    int bstrtmp_len = (l) - 1;                                               \
-    unsigned char * bstrtmp_s = (s);                                         \
-    if (bstrtmp_s && bstrtmp_len >= 0) {                                     \
-        for (; bstrtmp_len >= 0; bstrtmp_len--) {                            \
-            if (!isspace (bstrtmp_s[bstrtmp_len])) break;                    \
-        }                                                                    \
-    }                                                                        \
-    (t).data = bstrtmp_s;                                                    \
-    (t).slen = bstrtmp_len + 1;                                              \
-    (t).mlen = -__LINE__;                                                    \
-}
-#define btfromblktrimws(t,s,l) {                                             \
-    int bstrtmp_idx = 0, bstrtmp_len = (l) - 1;                              \
-    unsigned char * bstrtmp_s = (s);                                         \
-    if (bstrtmp_s && bstrtmp_len >= 0) {                                     \
-        for (; bstrtmp_idx <= bstrtmp_len; bstrtmp_idx++) {                  \
-            if (!isspace (bstrtmp_s[bstrtmp_idx])) break;                    \
-        }                                                                    \
-        for (; bstrtmp_len >= bstrtmp_idx; bstrtmp_len--) {                  \
-            if (!isspace (bstrtmp_s[bstrtmp_len])) break;                    \
-        }                                                                    \
-    }                                                                        \
-    (t).data = bstrtmp_s + bstrtmp_idx;                                      \
-    (t).slen = bstrtmp_len + 1 - bstrtmp_idx;                                \
-    (t).mlen = -__LINE__;                                                    \
-}
-
-/* Write protection macros */
-#define bwriteprotect(t)     { if ((t).mlen >=  0) (t).mlen = -1; }
-#define bwriteallow(t)       { if ((t).mlen == -1) (t).mlen = (t).slen + ((t).slen == 0); }
-#define biswriteprotected(t) ((t).mlen <= 0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.txt b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.txt
deleted file mode 100644
index 8ebb188853..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/bstrlib.txt
+++ /dev/null
@@ -1,3201 +0,0 @@
-Better String library
----------------------
-
-by Paul Hsieh
-
-The bstring library is an attempt to provide improved string processing 
-functionality to the C and C++ language.  At the heart of the bstring library 
-(Bstrlib for short) is the management of "bstring"s which are a significant 
-improvement over '\0' terminated char buffers.
-
-===============================================================================
-
-Motivation
-----------
-
-The standard C string library has serious problems:
-
-    1) Its use of '\0' to denote the end of the string means knowing a 
-       string's length is O(n) when it could be O(1).
-    2) It imposes an interpretation for the character value '\0'.
-    3) gets() always exposes the application to a buffer overflow.
-    4) strtok() modifies the string its parsing and thus may not be usable in
-       programs which are re-entrant or multithreaded.
-    5) fgets has the unusual semantic of ignoring '\0's that occur before
-       '\n's are consumed.
-    6) There is no memory management, and actions performed such as strcpy,
-       strcat and sprintf are common places for buffer overflows.
-    7) strncpy() doesn't '\0' terminate the destination in some cases.
-    8) Passing NULL to C library string functions causes an undefined NULL 
-       pointer access.
-    9) Parameter aliasing (overlapping, or self-referencing parameters) 
-       within most C library functions has undefined behavior.
-   10) Many C library string function calls take integer parameters with 
-       restricted legal ranges.  Parameters passed outside these ranges are
-       not typically detected and cause undefined behavior.
-
-So the desire is to create an alternative string library that does not suffer
-from the above problems and adds in the following functionality:
-
-    1) Incorporate string functionality seen from other languages.
-        a) MID$() - from BASIC
-        b) split()/join() - from Python
-        c) string/char x n - from Perl
-    2) Implement analogs to functions that combine stream IO and char buffers
-       without creating a dependency on stream IO functionality.
-    3) Implement the basic text editor-style functions insert, delete, find,
-       and replace.
-    4) Implement reference based sub-string access (as a generalization of 
-       pointer arithmetic.)
-    5) Implement runtime write protection for strings.
-
-There is also a desire to avoid "API-bloat".  So functionality that can be
-implemented trivially in other functionality is omitted.  So there is no
-left$() or right$() or reverse() or anything like that as part of the core 
-functionality.
-
-Explaining Bstrings
--------------------
-
-A bstring is basically a header which wraps a pointer to a char buffer.  Lets
-start with the declaration of a struct tagbstring:
-
-    struct tagbstring {
-        int mlen;
-        int slen;
-        unsigned char * data;
-    };
-
-This definition is considered exposed, not opaque (though it is neither 
-necessary nor recommended that low level maintenance of bstrings be performed 
-whenever the abstract interfaces are sufficient).  The mlen field (usually)
-describes a lower bound for the memory allocated for the data field.  The 
-slen field describes the exact length for the bstring.  The data field is a 
-single contiguous buffer of unsigned chars.  Note that the existence of a '\0' 
-character in the unsigned char buffer pointed to by the data field does not 
-necessarily denote the end of the bstring.
-
-To be a well formed modifiable bstring the mlen field must be at least the 
-length of the slen field, and slen must be non-negative.  Furthermore, the 
-data field must point to a valid buffer in which access to the first mlen 
-characters has been acquired.  So the minimal check for correctness is:
-
-    (slen >= 0 && mlen >= slen && data != NULL)
-
-bstrings returned by bstring functions can be assumed to be either NULL or
-satisfy the above property.  (When bstrings are only readable, the mlen >= 
-slen restriction is not required; this is discussed later in this section.)  
-A bstring itself is just a pointer to a struct tagbstring:
-
-    typedef struct tagbstring * bstring;
-
-Note that use of the prefix "tag" in struct tagbstring is required to work
-around the inconsistency between C and C++'s struct namespace usage.  This
-definition is also considered exposed.
-
-Bstrlib basically manages bstrings allocated as a header and an associated 
-data-buffer.  Since the implementation is exposed, they can also be 
-constructed manually.  Functions which mutate bstrings assume that the header 
-and data buffer have been malloced; the bstring library may perform free() or 
-realloc() on both the header and data buffer of any bstring parameter. 
-Functions which return bstring's create new bstrings.  The string memory is 
-freed by a bdestroy() call (or using the bstrFree macro).
-
-The following related typedef is also provided:
-
-    typedef const struct tagbstring * const_bstring;
-
-which is also considered exposed.  These are directly bstring compatible (no
-casting required) but are just used for parameters which are meant to be 
-non-mutable.  So in general, bstring parameters which are read as input but 
-not meant to be modified will be declared as const_bstring, and bstring
-parameters which may be modified will be declared as bstring.  This convention
-is recommended for user written functions as well.
-
-Since bstrings maintain interoperability with C library char-buffer style 
-strings, all functions which modify, update or create bstrings also append a 
-'\0' character into the position slen + 1.  This trailing '\0' character is 
-not required for bstrings input to the bstring functions; this is provided 
-solely as a convenience for interoperability with standard C char-buffer 
-functionality.
-
-Analogs for the ANSI C string library functions have been created when they
-are necessary, but have also been left out when they are not.  In particular
-there are no functions analogous to fwrite, or puts just for the purposes of
-bstring.  The ->data member of any string is exposed, and therefore can be
-used just as easily as char buffers for C functions which read strings.
-
-For those that wish to hand construct bstrings, the following should be kept 
-in mind:
-
-    1) While bstrlib can accept constructed bstrings without terminating
-       '\0' characters, the rest of the C language string library will not
-       function properly on such non-terminated strings.  This is obvious
-       but must be kept in mind.
-    2) If it is intended that a constructed bstring be written to by the
-       bstring library functions then the data portion should be allocated
-       by the malloc function and the slen and mlen fields should be entered
-       properly.  The struct tagbstring header is not reallocated, and only
-       freed by bdestroy.
-    3) Writing arbitrary '\0' characters at various places in the string
-       will not modify its length as perceived by the bstring library 
-       functions.  In fact, '\0' is a legitimate non-terminating character
-       for a bstring to contain.
-    4) For read only parameters, bstring functions do not check the mlen.  
-       I.e., the minimal correctness requirements are reduced to:
-
-            (slen >= 0 && data != NULL)
-
-Better pointer arithmetic
--------------------------
-
-One built-in feature of '\0' terminated char * strings, is that its very easy
-and fast to obtain a reference to the tail of any string using pointer 
-arithmetic.  Bstrlib does one better by providing a way to get a reference to
-any substring of a bstring (or any other length delimited block of memory.)
-So rather than just having pointer arithmetic, with bstrlib one essentially 
-has segment arithmetic.  This is achieved using the macro blk2tbstr() which 
-builds a reference to a block of memory and the macro bmid2tbstr() which 
-builds a reference to a segment of a bstring.  Bstrlib also includes 
-functions for direct consumption of memory blocks into bstrings, namely 
-bcatblk () and blk2bstr ().
-
-One scenario where this can be extremely useful is when string contains many 
-substrings which one would like to pass as read-only reference parameters to 
-some string consuming function without the need to allocate entire new 
-containers for the string data.  More concretely, imagine parsing a command 
-line string whose parameters are space delimited.  This can only be done for 
-tails of the string with '\0' terminated char * strings.
-
-Improved NULL semantics and error handling
-------------------------------------------
-
-Unless otherwise noted, if a NULL pointer is passed as a bstring or any other 
-detectably illegal parameter, the called function will return with an error 
-indicator (either NULL or BSTR_ERR) rather than simply performing a NULL 
-pointer access, or having undefined behavior.
-
-To illustrate the value of this, consider the following example:
-
-        strcpy (p = malloc (13 * sizeof (char)), "Hello,");
-        strcat (p, " World");
-
-This is not correct because malloc may return NULL (due to an out of memory 
-condition), and the behaviour of strcpy is undefined if either of its 
-parameters are NULL.  However:
-
-        bstrcat (p = bfromcstr ("Hello,"), q = bfromcstr (" World"));
-        bdestroy (q);
-
-is well defined, because if either p or q are assigned NULL (indicating a 
-failure to allocate memory) both bstrcat and bdestroy will recognize it and 
-perform no detrimental action.
-
-Note that it is not necessary to check any of the members of a returned 
-bstring for internal correctness (in particular the data member does not need 
-to be checked against NULL when the header is non-NULL), since this is 
-assured by the bstring library itself.
-
-bStreams
---------
-
-In addition to the bgets and bread functions, bstrlib can abstract streams 
-with a high performance read only stream called a bStream.  In general, the 
-idea is to open a core stream (with something like fopen) then pass its
-handle as well as a bNread function pointer (like fread) to the bsopen 
-function which will return a handle to an open bStream.  Then the functions 
-bsread, bsreadln or bsreadlns can be called to read portions of the stream.  
-Finally, the bsclose function is called to close the bStream -- it will 
-return a handle to the original (core) stream.  So bStreams, essentially, 
-wrap other streams.
-
-The bStreams have two main advantages over the bgets and bread (as well as
-fgets/ungetc) paradigms:
-
-1) Improved functionality via the bunread function which allows a stream to 
-   unread characters, giving the bStream stack-like functionality if so 
-   desired.
-2) A very high performance bsreadln function.  The C library function fgets()
-   (and the bgets function) can typically be written as a loop on top of 
-   fgetc(), thus paying all of the overhead costs of calling fgetc on a per 
-   character basis.  bsreadln will read blocks at a time, thus amortizing the 
-   overhead of fread calls over many characters at once.
-
-However, clearly bStreams are suboptimal or unusable for certain kinds of 
-streams (stdin) or certain usage patterns (a few spotty, or non-sequential
-reads from a slow stream.)  For those situations, using bgets will be more 
-appropriate.
-
-The semantics of bStreams allows practical construction of layerable data 
-streams.  What this means is that by writing a bNread compatible function on
-top of a bStream, one can construct a new bStream on top of it.  This can be
-useful for writing multi-pass parsers that don't actually read the entire
-input more than once and don't require the use of intermediate storage.
-
-Aliasing
---------
-
-Aliasing occurs when a function is given two parameters which point to data
-structures which overlap in the memory they occupy.  While this does not
-disturb read only functions, for many libraries this can make functions that 
-write to these memory locations malfunction.  This is a common problem of the 
-C standard library and especially the string functions in the C standard 
-library.
-
-The C standard string library is entirely char by char oriented (as is 
-bstring) which makes conforming implementations alias safe for some 
-scenarios.  However no actual detection of aliasing is typically performed, 
-so it is easy to find cases where the aliasing will cause anomolous or 
-undesirable behaviour (consider: strcat (p, p).)  The C99 standard includes 
-the "restrict" pointer modifier which allows the compiler to document and 
-assume a no-alias condition on usage.  However, only the most trivial cases 
-can be caught (if at all) by the compiler at compile time, and thus there is 
-no actual enforcement of non-aliasing.
-
-Bstrlib, by contrast, permits aliasing and is completely aliasing safe, in 
-the C99 sense of aliasing.  That is to say, under the assumption that 
-pointers of incompatible types from distinct objects can never alias, bstrlib 
-is completely aliasing safe.  (In practice this means that the data buffer 
-portion of any bstring and header of any bstring are assumed to never alias.) 
-With the exception of the reference building macros, the library behaves as 
-if all read-only parameters are first copied and replaced by temporary 
-non-aliased parameters before any writing to any output bstring is performed 
-(though actual copying is extremely rarely ever done.)
-
-Besides being a useful safety feature, bstring searching/comparison 
-functions can improve to O(1) execution when aliasing is detected.
-
-Note that aliasing detection and handling code in Bstrlib is generally 
-extremely cheap.  There is almost never any appreciable performance penalty
-for using aliased parameters.
-
-Reenterancy
------------
-
-Nearly every function in Bstrlib is a leaf function, and is completely 
-reenterable with the exception of writing to common bstrings.  The split 
-functions which use a callback mechanism requires only that the source string 
-not be destroyed by the callback function unless the callback function returns
-with an error status (note that Bstrlib functions which return an error do 
-not modify the string in any way.)  The string can in fact be modified by the
-callback and the behaviour is deterministic.  See the documentation of the 
-various split functions for more details.
-
-Undefined scenarios
--------------------
-
-One of the basic important premises for Bstrlib is to not to increase the
-propogation of undefined situations from parameters that are otherwise legal
-in of themselves.  In particular, except for extremely marginal cases, usages 
-of bstrings that use the bstring library functions alone cannot lead to any 
-undefined action.  But due to C/C++ language and library limitations, there 
-is no way to define a non-trivial library that is completely without 
-undefined operations.  All such possible undefined operations are described 
-below:
-
-1) bstrings or struct tagbstrings that are not explicitely initialized cannot
-   be passed as a parameter to any bstring function.
-2) The members of the NULL bstring cannot be accessed directly.  (Though all
-   APIs and macros detect the NULL bstring.)
-3) A bstring whose data member has not been obtained from a malloc or 
-   compatible call and which is write accessible passed as a writable 
-   parameter will lead to undefined results.  (i.e., do not writeAllow any 
-   constructed bstrings unless the data portion has been obtained from the 
-   heap.)
-4) If the headers of two strings alias but are not identical (which can only 
-   happen via a defective manual construction), then passing them to a 
-   bstring function in which one is writable is not defined.
-5) If the mlen member is larger than the actual accessible length of the data 
-   member for a writable bstring, or if the slen member is larger than the 
-   readable length of the data member for a readable bstring, then the 
-   corresponding bstring operations are undefined.
-6) Any bstring definition whose header or accessible data portion has been
-   assigned to inaccessible or otherwise illegal memory clearly cannot be
-   acted upon by the bstring library in any way.
-7) Destroying the source of an incremental split from within the callback
-   and not returning with a negative value (indicating that it should abort)
-   will lead to undefined behaviour.  (Though *modifying* or adjusting the 
-   state of the source data, even if those modification fail within the 
-   bstrlib API, has well defined behavior.)
-8) Modifying a bstring which is write protected by direct access has 
-   undefined behavior.
-
-While this may seem like a long list, with the exception of invalid uses of 
-the writeAllow macro, and source destruction during an iterative split 
-without an accompanying abort, no usage of the bstring API alone can cause 
-any undefined scenario to occurr.  I.e., the policy of restricting usage of 
-bstrings to the bstring API can significantly reduce the risk of runtime 
-errors (in practice it should eliminate them) related to string manipulation 
-due to undefined action.
-
-C++ wrapper
------------
-
-A C++ wrapper has been created to enable bstring functionality for C++ in the
-most natural (for C++ programers) way possible.  The mandate for the C++ 
-wrapper is different from the base C bstring library.  Since the C++ language 
-has far more abstracting capabilities, the CBString structure is considered 
-fully abstracted -- i.e., hand generated CBStrings are not supported (though 
-conversion from a struct tagbstring is allowed) and all detectable errors are
-manifest as thrown exceptions.
-
-- The C++ class definitions are all under the namespace Bstrlib.  bstrwrap.h 
-  enables this namespace (with a using namespace Bstrlib; directive at the 
-  end) unless the macro BSTRLIB_DONT_ASSUME_NAMESPACE has been defined before 
-  it is included.
-
-- Erroneous accesses results in an exception being thrown.  The exception 
-  parameter is of type "struct CBStringException" which is derived from
-  std::exception if STL is used.  A verbose description of the error message 
-  can be obtained from the what() method.
-
-- CBString is a C++ structure derived from a struct tagbstring.  An address 
-  of a CBString cast to a bstring must not be passed to bdestroy.  The bstring 
-  C API has been made C++ safe and can be used directly in a C++ project.
-
-- It includes constructors which can take a char, '\0' terminated char 
-  buffer, tagbstring, (char, repeat-value), a length delimited buffer or a 
-  CBStringList to initialize it.
-
-- Concatenation is performed with the + and += operators.  Comparisons are 
-  done with the ==, !=, <, >, <= and >= operators.  Note that == and != use
-  the biseq call, while <, >, <= and >= use bstrcmp.
-
-- CBString's can be directly cast to const character buffers.
-
-- CBString's can be directly cast to double, float, int or unsigned int so
-  long as the CBString are decimal representations of those types (otherwise
-  an exception will be thrown).  Converting the other way should be done with
-  the format(a) method(s).
-
-- CBString contains the length, character and [] accessor methods.  The
-  character and [] accessors are aliases of each other.  If the bounds for 
-  the string are exceeded, an exception is thrown.  To avoid the overhead for
-  this check, first cast the CBString to a (const char *) and use [] to 
-  dereference the array as normal.  Note that the character and [] accessor 
-  methods allows both reading and writing of individual characters.
-
-- The methods: format, formata, find, reversefind, findcaseless, 
-  reversefindcaseless, midstr, insert, insertchrs, replace, findreplace, 
-  findreplacecaseless, remove, findchr, nfindchr, alloc, toupper, tolower, 
-  gets, read are analogous to the functions that can be found in the C API.
-
-- The caselessEqual and caselessCmp methods are analogous to biseqcaseless
-  and bstricmp functions respectively.
-
-- Note that just like the bformat function, the format and formata methods do 
-  not automatically cast CBStrings into char * strings for "%s"-type 
-  substitutions:
-
-	CBString w("world");
-	CBString h("Hello");
-	CBString hw;
-
-	/* The casts are necessary */
-	hw.format ("%s, %s", (const char *)h, (const char *)w);
-
-- The methods trunc and repeat have been added instead of using pattern.
-
-- ltrim, rtrim and trim methods have been added.  These remove characters 
-  from a given character string set (defaulting to the whitespace characters) 
-  from either the left, right or both ends of the CBString, respectively.
-
-- The method setsubstr is also analogous in functionality to bsetstr, except 
-  that it cannot be passed NULL.  Instead the method fill and the fill-style 
-  constructor have been supplied to enable this functionality.
-
-- The writeprotect(), writeallow() and iswriteprotected() methods are 
-  analogous to the bwriteprotect(), bwriteallow() and biswriteprotected() 
-  macros in the C API.  Write protection semantics in CBString are stronger 
-  than with the C API in that indexed character assignment is checked for 
-  write protection.  However, unlike with the C API, a write protected 
-  CBString can be destroyed by the destructor.
-
-- CBStream is a C++ structure which wraps a struct bStream (its not derived
-  from it, since destruction is slightly different).  It is constructed by
-  passing in a bNread function pointer and a stream parameter cast to void *. 
-  This structure includes methods for detecting eof, setting the buffer 
-  length, reading the whole stream or reading entries line by line or block 
-  by block, an unread function, and a peek function.
-
-- If STL is available, the CBStringList structure is derived from a vector of 
-  CBString with various split methods.  The split method has been overloaded 
-  to accept either a character or CBString as the second parameter (when the 
-  split parameter is a CBString any character in that CBString is used as a
-  seperator).  The splitstr method takes a CBString as a substring seperator. 
-  Joins can be performed via a CBString constructor which takes a 
-  CBStringList as a parameter, or just using the CBString::join() method.
-
-- If there is proper support for std::iostreams, then the >> and << operators 
-  and the getline() function have been added (with semantics the same as 
-  those for std::string).
-
-Multithreading
---------------
-
-A mutable bstring is kind of analogous to a small (two entry) linked list 
-allocated by malloc, with all aliasing completely under programmer control. 
-I.e., manipulation of one bstring will never affect any other distinct 
-bstring unless explicitely constructed to do so by the programmer via hand 
-construction or via building a reference.  Bstrlib also does not use any 
-static or global storage, so there are no hidden unremovable race conditions. 
-Bstrings are also clearly not inherently thread local.  So just like 
-char *'s, bstrings can be passed around from thread to thread and shared and 
-so on, so long as modifications to a bstring correspond to some kind of 
-exclusive access lock as should be expected (or if the bstring is read-only, 
-which can be enforced by bstring write protection) for any sort of shared 
-object in a multithreaded environment.
-
-Bsafe module
-------------
-
-For convenience, a bsafe module has been included.  The idea is that if this
-module is included, inadvertant usage of the most dangerous C functions will 
-be overridden and lead to an immediate run time abort.  Of course, it should 
-be emphasized that usage of this module is completely optional.  The 
-intention is essentially to provide an option for creating project safety 
-rules which can be enforced mechanically rather than socially.  This is 
-useful for larger, or open development projects where its more difficult to 
-enforce social rules or "coding conventions".
-
-Problems not solved
--------------------
-
-Bstrlib is written for the C and C++ languages, which have inherent weaknesses
-that cannot be easily solved:
-
-1. Memory leaks:  Forgetting to call bdestroy on a bstring that is about to be
-   unreferenced, just as forgetting to call free on a heap buffer that is 
-   about to be dereferenced.  Though bstrlib itself is leak free.
-2. Read before write usage:  In C, declaring an auto bstring does not 
-   automatically fill it with legal/valid contents.  This problem has been 
-   somewhat mitigated in C++.  (The bstrDeclare and bstrFree macros from 
-   bstraux can be used to help mitigate this problem.)
-
-Other problems not addressed:
-
-3. Built-in mutex usage to automatically avoid all bstring internal race 
-   conditions in multitasking environments: The problem with trying to 
-   implement such things at this low a level is that it is typically more 
-   efficient to use locks in higher level primitives. There is also no 
-   platform independent way to implement locks or mutexes.
-4. Unicode/widecharacter support.
-
-Note that except for spotty support of wide characters, the default C 
-standard library does not address any of these problems either.
-
-Configurable compilation options
---------------------------------
-
-All configuration options are meant solely for the purpose of compiler 
-compatibility.  Configuration options are not meant to change the semantics
-or capabilities of the library, except where it is unavoidable.
-
-Since some C++ compilers don't include the Standard Template Library and some 
-have the options of disabling exception handling, a number of macros can be 
-used to conditionally compile support for each of this:
-
-BSTRLIB_CAN_USE_STL
-
-  - defining this will enable the used of the Standard Template Library.  
-    Defining BSTRLIB_CAN_USE_STL overrides the BSTRLIB_CANNOT_USE_STL macro.
-
-BSTRLIB_CANNOT_USE_STL
-
-  - defining this will disable the use of the Standard Template Library.  
-    Defining BSTRLIB_CAN_USE_STL overrides the BSTRLIB_CANNOT_USE_STL macro.
-
-BSTRLIB_CAN_USE_IOSTREAM
-
-  - defining this will enable the used of streams from class std.  Defining 
-    BSTRLIB_CAN_USE_IOSTREAM overrides the BSTRLIB_CANNOT_USE_IOSTREAM macro.
-
-BSTRLIB_CANNOT_USE_IOSTREAM
-
-  - defining this will disable the use of streams from class std.  Defining 
-    BSTRLIB_CAN_USE_IOSTREAM overrides the BSTRLIB_CANNOT_USE_IOSTREAM macro.
-
-BSTRLIB_THROWS_EXCEPTIONS
-
-  - defining this will enable the exception handling within bstring.
-    Defining BSTRLIB_THROWS_EXCEPTIONS overrides the 
-    BSTRLIB_DOESNT_THROWS_EXCEPTIONS macro.
-
-BSTRLIB_DOESNT_THROW_EXCEPTIONS
-
-  - defining this will disable the exception handling within bstring.
-    Defining BSTRLIB_THROWS_EXCEPTIONS overrides the 
-    BSTRLIB_DOESNT_THROW_EXCEPTIONS macro.
-
-Note that these macros must be defined consistently throughout all modules 
-that use CBStrings including bstrwrap.cpp.
-
-Some older C compilers do not support functions such as vsnprintf.  This is 
-handled by the following macro variables:
-
-BSTRLIB_NOVSNP
-
-  - defining this indicates that the compiler does not support vsnprintf.
-    This will cause bformat and bformata to not be declared.  Note that
-    for some compilers, such as Turbo C, this is set automatically.
-    Defining BSTRLIB_NOVSNP overrides the BSTRLIB_VSNP_OK macro.
-
-BSTRLIB_VSNP_OK
-
-  - defining this will disable the autodetection of compilers the do not
-    support of compilers that do not support vsnprintf.
-    Defining BSTRLIB_NOVSNP overrides the BSTRLIB_VSNP_OK macro.
-
-Semantic compilation options
-----------------------------
-
-Bstrlib comes with very few compilation options for changing the semantics of
-of the library.  These are described below.
-
-BSTRLIB_DONT_ASSUME_NAMESPACE
-
-  - Defining this before including bstrwrap.h will disable the automatic 
-    enabling of the Bstrlib namespace for the C++ declarations.
-
-BSTRLIB_DONT_USE_VIRTUAL_DESTRUCTOR
-
-  - Defining this will make the CBString destructor non-virtual.
-
-BSTRLIB_MEMORY_DEBUG
-
-  - Defining this will cause the bstrlib modules bstrlib.c and bstrwrap.cpp
-    to invoke a #include "memdbg.h".  memdbg.h has to be supplied by the user.
-
-Note that these macros must be defined consistently throughout all modules 
-that use bstrings or CBStrings including bstrlib.c, bstraux.c and 
-bstrwrap.cpp.
-
-===============================================================================
-
-Files
------
-
-bstrlib.c       - C implementaion of bstring functions.
-bstrlib.h       - C header file for bstring functions.
-bstraux.c       - C example that implements trivial additional functions.
-bstraux.h       - C header for bstraux.c
-bstest.c        - C unit/regression test for bstrlib.c
-
-bstrwrap.cpp    - C++ implementation of CBString.
-bstrwrap.h      - C++ header file for CBString.
-test.cpp        - C++ unit/regression test for bstrwrap.cpp
-
-bsafe.c         - C runtime stubs to abort usage of unsafe C functions.
-bsafe.h         - C header file for bsafe.c functions.
-
-C projects need only include bstrlib.h and compile/link bstrlib.c to use the
-bstring library.  C++ projects need to additionally include bstrwrap.h and
-compile/link bstrwrap.cpp.  For both, there may be a need to make choices 
-about feature configuration as described in the "Configurable compilation 
-options" in the section above.
-
-Other files that are included in this archive are:
-
-license.txt     - The 3 clause BSD license for Bstrlib
-gpl.txt         - The GPL version 2
-security.txt    - A security statement useful for auditting Bstrlib
-porting.txt     - A guide to porting Bstrlib
-bstrlib.txt     - This file
-
-===============================================================================
-
-The functions
--------------
-
-    extern bstring bfromcstr (const char * str);
-
-    Take a standard C library style '\0' terminated char buffer and generate
-    a bstring with the same contents as the char buffer.  If an error occurs 
-    NULL is returned.
-
-    So for example:
-
-	bstring b = bfromcstr ("Hello");
-	if (!b) {
-		fprintf (stderr, "Out of memory");
-	} else {
-		puts ((char *) b->data);
-	}
-
-    ..........................................................................
-
-    extern bstring bfromcstralloc (int mlen, const char * str);
-
-    Create a bstring which contains the contents of the '\0' terminated 
-    char * buffer str.  The memory buffer backing the bstring is at least 
-    mlen characters in length.  If an error occurs NULL is returned.
-
-    So for example:
-
-	bstring b = bfromcstralloc (64, someCstr);
-	if (b) b->data[63] = 'x';
-
-    The idea is that this will set the 64th character of b to 'x' if it is at 
-    least 64 characters long otherwise do nothing.  And we know this is well 
-    defined so long as b was successfully created, since it will have been 
-    allocated with at least 64 characters.
-
-    ..........................................................................
-
-    extern bstring blk2bstr (const void * blk, int len);
-
-    Create a bstring whose contents are described by the contiguous buffer 
-    pointing to by blk with a length of len bytes.  Note that this function
-    creates a copy of the data in blk, rather than simply referencing it.  
-    Compare with the blk2tbstr macro.  If an error occurs NULL is returned.
-
-    ..........................................................................
-
-    extern char * bstr2cstr (const_bstring s, char z);
-
-    Create a '\0' terminated char buffer which contains the contents of the 
-    bstring s, except that any contained '\0' characters are converted to the 
-    character in z.  This returned value should be freed with bcstrfree(), by 
-    the caller.  If an error occurs NULL is returned.
-
-    ..........................................................................
-
-    extern int bcstrfree (char * s);
-
-    Frees a C-string generated by bstr2cstr ().  This is normally unnecessary
-    since it just wraps a call to free (), however, if malloc () and free () 
-    have been redefined as a macros within the bstrlib module (via macros in 
-    the memdbg.h backdoor) with some difference in behaviour from the std 
-    library functions, then this allows a correct way of freeing the memory 
-    that allows higher level code to be independent from these macro 
-    redefinitions.
-
-    ..........................................................................
-
-    extern bstring bstrcpy (const_bstring b1);
-
-    Make a copy of the passed in bstring.  The copied bstring is returned if 
-    there is no error, otherwise NULL is returned.
-
-    ..........................................................................
-
-    extern int bassign (bstring a, const_bstring b);
-
-    Overwrite the bstring a with the contents of bstring b.  Note that the 
-    bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a is not overwritten.
-
-    ..........................................................................
-
-    int bassigncstr (bstring a, const char * str);
-
-    Overwrite the string a with the contents of char * string str.  Note that 
-    the bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a may be partially overwritten.
-
-    ..........................................................................
-
-    int bassignblk (bstring a, const void * s, int len);
-
-    Overwrite the string a with the contents of the block (s, len).  Note that 
-    the bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a is not overwritten.
-
-    ..........................................................................
-
-    extern int bassignmidstr (bstring a, const_bstring b, int left, int len);
-
-    Overwrite the bstring a with the middle of contents of bstring b 
-    starting from position left and running for a length len.  left and 
-    len are clamped to the ends of b as with the function bmidstr.  Note that 
-    the bstring a must be a well defined and writable bstring.  If an error 
-    occurs BSTR_ERR is returned and a is not overwritten.
-
-    ..........................................................................
-
-    extern bstring bmidstr (const_bstring b, int left, int len);
-
-    Create a bstring which is the substring of b starting from position left 
-    and running for a length len (clamped by the end of the bstring b.)  If 
-    there was no error, the value of this constructed bstring is returned 
-    otherwise NULL is returned.
-
-    ..........................................................................
-
-    extern int bdelete (bstring s1, int pos, int len);
-
-    Removes characters from pos to pos+len-1 and shifts the tail of the 
-    bstring starting from pos+len to pos.  len must be positive for this call 
-    to have any effect.  The section of the bstring described by (pos, len) 
-    is clamped to boundaries of the bstring b.  The value BSTR_OK is returned 
-    if the operation is successful, otherwise BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bconcat (bstring b0, const_bstring b1);
-
-    Concatenate the bstring b1 to the end of bstring b0.  The value BSTR_OK 
-    is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int bconchar (bstring b, char c);
-
-    Concatenate the character c to the end of bstring b.  The value BSTR_OK 
-    is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int bcatcstr (bstring b, const char * s);
-
-    Concatenate the char * string s to the end of bstring b.  The value 
-    BSTR_OK is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int bcatblk (bstring b, const void * s, int len);
-
-    Concatenate a fixed length buffer (s, len) to the end of bstring b.  The 
-    value BSTR_OK is returned if the operation is successful, otherwise 
-    BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int biseq (const_bstring b0, const_bstring b1);
-
-    Compare the bstring b0 and b1 for equality.  If the bstrings differ, 0 
-    is returned, if the bstrings are the same, 1 is returned, if there is an 
-    error, -1 is returned.  If the length of the bstrings are different, this 
-    function has O(1) complexity.  Contained '\0' characters are not treated 
-    as a termination character.
-
-    Note that the semantics of biseq are not completely compatible with 
-    bstrcmp because of its different treatment of the '\0' character.
-
-    ..........................................................................
-
-    extern int bisstemeqblk (const_bstring b, const void * blk, int len);
-
-    Compare beginning of bstring b0 with a block of memory of length len for 
-    equality.  If the beginning of b0 differs from the memory block (or if b0 
-    is too short), 0 is returned, if the bstrings are the same, 1 is returned, 
-    if there is an error, -1 is returned.
-
-    ..........................................................................
-
-    extern int biseqcaseless (const_bstring b0, const_bstring b1);
-
-    Compare two bstrings for equality without differentiating between case.  
-    If the bstrings differ other than in case, 0 is returned, if the bstrings 
-    are the same, 1 is returned, if there is an error, -1 is returned.  If 
-    the length of the bstrings are different, this function is O(1).  '\0' 
-    termination characters are not treated in any special way.
-
-    ..........................................................................
-
-    extern int bisstemeqcaselessblk (const_bstring b0, const void * blk, int len);
-
-    Compare beginning of bstring b0 with a block of memory of length len 
-    without differentiating between case for equality.  If the beginning of b0
-    differs from the memory block other than in case (or if b0 is too short), 
-    0 is returned, if the bstrings are the same, 1 is returned, if there is an 
-    error, -1 is returned.
-
-    ..........................................................................
-
-    extern int biseqcstr (const_bstring b, const char *s);
-
-    Compare the bstring b and char * bstring s.  The C string s must be '\0' 
-    terminated at exactly the length of the bstring b, and the contents 
-    between the two must be identical with the bstring b with no '\0' 
-    characters for the two contents to be considered equal.  This is 
-    equivalent to the condition that their current contents will be always be 
-    equal when comparing them in the same format after converting one or the 
-    other.  If they are equal 1 is returned, if they are unequal 0 is 
-    returned and if there is a detectable error BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int biseqcstrcaseless (const_bstring b, const char *s);
-
-    Compare the bstring b and char * string s.  The C string s must be '\0'
-    terminated at exactly the length of the bstring b, and the contents
-    between the two must be identical except for case with the bstring b with
-    no '\0' characters for the two contents to be considered equal.  This is
-    equivalent to the condition that their current contents will be always be
-    equal ignoring case when comparing them in the same format after
-    converting one or the other.  If they are equal, except for case, 1 is 
-    returned, if they are unequal regardless of case 0 is returned and if 
-    there is a detectable error BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bstrcmp (const_bstring b0, const_bstring b1);
-
-    Compare the bstrings b0 and b1 for ordering.  If there is an error, 
-    SHRT_MIN is returned, otherwise a value less than or greater than zero, 
-    indicating that the bstring pointed to by b0 is lexicographically less 
-    than or greater than the bstring pointed to by b1 is returned.  If the
-    bstring lengths are unequal but the characters up until the length of the 
-    shorter are equal then a value less than, or greater than zero, 
-    indicating that the bstring pointed to by b0 is shorter or longer than the 
-    bstring pointed to by b1 is returned.  0 is returned if and only if the 
-    two bstrings are the same.  If the length of the bstrings are different, 
-    this function is O(n).  Like its standard C library counter part, the 
-    comparison does not proceed past any '\0' termination characters 
-    encountered.
-
-    The seemingly odd error return value, merely provides slightly more 
-    granularity than the undefined situation given in the C library function 
-    strcmp.  The function otherwise behaves very much like strcmp().
-
-    Note that the semantics of bstrcmp are not completely compatible with 
-    biseq because of its different treatment of the '\0' termination 
-    character.
-
-    ..........................................................................
-
-    extern int bstrncmp (const_bstring b0, const_bstring b1, int n);
-
-    Compare the bstrings b0 and b1 for ordering for at most n characters.  If 
-    there is an error, SHRT_MIN is returned, otherwise a value is returned as 
-    if b0 and b1 were first truncated to at most n characters then bstrcmp 
-    was called with these new bstrings are paremeters.  If the length of the 
-    bstrings are different, this function is O(n).  Like its standard C 
-    library counter part, the comparison does not proceed past any '\0' 
-    termination characters encountered.
-
-    The seemingly odd error return value, merely provides slightly more 
-    granularity than the undefined situation given in the C library function 
-    strncmp.  The function otherwise behaves very much like strncmp().
-
-    ..........................................................................
-
-    extern int bstricmp (const_bstring b0, const_bstring b1);
-
-    Compare two bstrings without differentiating between case.  The return 
-    value is the difference of the values of the characters where the two 
-    bstrings first differ, otherwise 0 is returned indicating that the 
-    bstrings are equal.  If the lengths are different, then a difference from 
-    0 is given, but if the first extra character is '\0', then it is taken to 
-    be the value UCHAR_MAX+1.
-
-    ..........................................................................
-
-    extern int bstrnicmp (const_bstring b0, const_bstring b1, int n);
-
-    Compare two bstrings without differentiating between case for at most n
-    characters.  If the position where the two bstrings first differ is
-    before the nth position, the return value is the difference of the values
-    of the characters, otherwise 0 is returned.  If the lengths are different
-    and less than n characters, then a difference from 0 is given, but if the 
-    first extra character is '\0', then it is taken to be the value 
-    UCHAR_MAX+1.
-
-    ..........................................................................
-
-    extern int bdestroy (bstring b);
-
-    Deallocate the bstring passed.  Passing NULL in as a parameter will have 
-    no effect.  Note that both the header and the data portion of the bstring 
-    will be freed.  No other bstring function which modifies one of its 
-    parameters will free or reallocate the header.  Because of this, in 
-    general, bdestroy cannot be called on any declared struct tagbstring even 
-    if it is not write protected.  A bstring which is write protected cannot 
-    be destroyed via the bdestroy call.  Any attempt to do so will result in 
-    no action taken, and BSTR_ERR will be returned.
-
-    Note to C++ users: Passing in a CBString cast to a bstring will lead to
-    undefined behavior (free will be called on the header, rather than the
-    CBString destructor.)  Instead just use the ordinary C++ language 
-    facilities to dealloc a CBString.
-
-    ..........................................................................
-
-    extern int binstr (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    forward (increasing) direction.  If it is found then it returns with the 
-    first position after pos where it is found, otherwise it returns BSTR_ERR.  
-    The algorithm used is brute force; O(m*n).
-
-    ..........................................................................
-
-    extern int binstrr (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    backward (decreasing) direction.  If it is found then it returns with the 
-    first position after pos where it is found, otherwise return BSTR_ERR.  
-    Note that the current position at pos is tested as well -- so to be 
-    disjoint from a previous forward search it is recommended that the 
-    position be backed up (decremented) by one position.  The algorithm used 
-    is brute force; O(m*n).
-
-    ..........................................................................
-
-    extern int binstrcaseless (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    forward (increasing) direction but without regard to case.  If it is 
-    found then it returns with the first position after pos where it is 
-    found, otherwise it returns BSTR_ERR. The algorithm used is brute force; 
-    O(m*n).
-
-    ..........................................................................
-
-    extern int binstrrcaseless (const_bstring s1, int pos, const_bstring s2);
-
-    Search for the bstring s2 in s1 starting at position pos and looking in a
-    backward (decreasing) direction but without regard to case.  If it is 
-    found then it returns with the first position after pos where it is 
-    found, otherwise return BSTR_ERR. Note that the current position at pos 
-    is tested as well -- so to be disjoint from a previous forward search it 
-    is recommended that the position be backed up (decremented) by one 
-    position.  The algorithm used is brute force; O(m*n).
-
-    ..........................................................................
-
-    extern int binchr (const_bstring b0, int pos, const_bstring b1);
-
-    Search for the first position in b0 starting from pos or after, in which 
-    one of the characters in b1 is found.  This function has an execution 
-    time of O(b0->slen + b1->slen).  If such a position does not exist in b0, 
-    then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int binchrr (const_bstring b0, int pos, const_bstring b1);
-
-    Search for the last position in b0 no greater than pos, in which one of 
-    the characters in b1 is found.  This function has an execution time
-    of O(b0->slen + b1->slen).  If such a position does not exist in b0, 
-    then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bninchr (const_bstring b0, int pos, const_bstring b1);
-
-    Search for the first position in b0 starting from pos or after, in which 
-    none of the characters in b1 is found and return it.  This function has 
-    an execution time of O(b0->slen + b1->slen).  If such a position does 
-    not exist in b0, then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bninchrr (const_bstring b0, int pos, const_bstring b1);
-  
-    Search for the last position in b0 no greater than pos, in which none of 
-    the characters in b1 is found and return it.  This function has an 
-    execution time of O(b0->slen + b1->slen).  If such a position does not 
-    exist in b0, then BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int bstrchr (const_bstring b, int c);
-
-    Search for the character c in the bstring b forwards from the start of 
-    the bstring.  Returns the position of the found character or BSTR_ERR if 
-    it is not found.
-
-    NOTE: This has been implemented as a macro on top of bstrchrp ().
-
-    ..........................................................................
-
-    extern int bstrrchr (const_bstring b, int c);
-
-    Search for the character c in the bstring b backwards from the end of the 
-    bstring.  Returns the position of the found character or BSTR_ERR if it is 
-    not found.
-
-    NOTE: This has been implemented as a macro on top of bstrrchrp ().
-
-    ..........................................................................
-
-    extern int bstrchrp (const_bstring b, int c, int pos);
-  
-    Search for the character c in b forwards from the position pos 
-    (inclusive).  Returns the position of the found character or BSTR_ERR if 
-    it is not found.
-
-    ..........................................................................
-
-    extern int bstrrchrp (const_bstring b, int c, int pos);
-
-    Search for the character c in b backwards from the position pos in bstring 
-    (inclusive).  Returns the position of the found character or BSTR_ERR if 
-    it is not found.
-
-    ..........................................................................
-
-    extern int bsetstr (bstring b0, int pos, const_bstring b1, unsigned char fill);
-
-    Overwrite the bstring b0 starting at position pos with the bstring b1. If 
-    the position pos is past the end of b0, then the character "fill" is 
-    appended as necessary to make up the gap between the end of b0 and pos.
-    If b1 is NULL, it behaves as if it were a 0-length bstring. The value 
-    BSTR_OK is returned if the operation is successful, otherwise BSTR_ERR is 
-    returned.
-
-    ..........................................................................
-
-    extern int binsert (bstring s1, int pos, const_bstring s2, unsigned char fill);
-
-    Inserts the bstring s2 into s1 at position pos.  If the position pos is 
-    past the end of s1, then the character "fill" is appended as necessary to 
-    make up the gap between the end of s1 and pos.  The value BSTR_OK is 
-    returned if the operation is successful, otherwise BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int binsertch (bstring s1, int pos, int len, unsigned char fill);
-
-    Inserts the character fill repeatedly into s1 at position pos for a 
-    length len.  If the position pos is past the end of s1, then the 
-    character "fill" is appended as necessary to make up the gap between the 
-    end of s1 and the position pos + len (exclusive).  The value BSTR_OK is 
-    returned if the operation is successful, otherwise BSTR_ERR is returned.
-
-    ..........................................................................
-
-    extern int breplace (bstring b1, int pos, int len, const_bstring b2, 
-                         unsigned char fill);
-
-    Replace a section of a bstring from pos for a length len with the bstring 
-    b2. If the position pos is past the end of b1 then the character "fill"
-    is appended as necessary to make up the gap between the end of b1 and 
-    pos.
-
-    ..........................................................................
-
-    extern int bfindreplace (bstring b, const_bstring find,
-                             const_bstring replace, int position);
-
-    Replace all occurrences of the find substring with a replace bstring 
-    after a given position in the bstring b.  The find bstring must have a 
-    length > 0 otherwise BSTR_ERR is returned.  This function does not 
-    perform recursive per character replacement; that is to say successive
-    searches resume at the position after the last replace.
-
-    So for example:
-
-        bfindreplace (a0 = bfromcstr("aabaAb"), a1 = bfromcstr("a"),
-                      a2 = bfromcstr("aa"), 0);
-
-    Should result in changing a0 to "aaaabaaAb".
-
-    This function performs exactly (b->slen - position) bstring comparisons, 
-    and data movement is bounded above by character volume equivalent to size 
-    of the output bstring.
-
-    ..........................................................................
-
-    extern int bfindreplacecaseless (bstring b, const_bstring find,
-                             const_bstring replace, int position);
-
-    Replace all occurrences of the find substring, ignoring case, with a 
-    replace bstring after a given position in the bstring b.  The find bstring 
-    must have a length > 0 otherwise BSTR_ERR is returned.  This function 
-    does not perform recursive per character replacement; that is to say 
-    successive searches resume at the position after the last replace.
-
-    So for example:
-
-        bfindreplacecaseless (a0 = bfromcstr("AAbaAb"), a1 = bfromcstr("a"),
-                              a2 = bfromcstr("aa"), 0);
-
-    Should result in changing a0 to "aaaabaaaab".
-
-    This function performs exactly (b->slen - position) bstring comparisons, 
-    and data movement is bounded above by character volume equivalent to size 
-    of the output bstring.
-
-    ..........................................................................
-
-    extern int balloc (bstring b, int length);
-
-    Increase the allocated memory backing the data buffer for the bstring b
-    to a length of at least length.  If the memory backing the bstring b is
-    already large enough, not action is performed.  This has no effect on the 
-    bstring b that is visible to the bstring API.  Usually this function will 
-    only be used when a minimum buffer size is required coupled with a direct 
-    access to the ->data member of the bstring structure.
-
-    Be warned that like any other bstring function, the bstring must be well
-    defined upon entry to this function.  I.e., doing something like:
-
-        b->slen *= 2; /* ?? Most likely incorrect */
-        balloc (b, b->slen);
-
-    is invalid, and should be implemented as:
-
-        int t;
-        if (BSTR_OK == balloc (b, t = (b->slen * 2))) b->slen = t;
-
-    This function will return with BSTR_ERR if b is not detected as a valid 
-    bstring or length is not greater than 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int ballocmin (bstring b, int length);
-
-    Change the amount of memory backing the bstring b to at least length.  
-    This operation will never truncate the bstring data including the 
-    extra terminating '\0' and thus will not decrease the length to less than
-    b->slen + 1.  Note that repeated use of this function may cause 
-    performance problems (realloc may be called on the bstring more than
-    the O(log(INT_MAX)) times).  This function will return with BSTR_ERR if b 
-    is not detected as a valid bstring or length is not greater than 0, 
-    otherwise BSTR_OK is returned.
-
-    So for example:
-
-	if (BSTR_OK == ballocmin (b, 64)) b->data[63] = 'x';
-
-    The idea is that this will set the 64th character of b to 'x' if it is at 
-    least 64 characters long otherwise do nothing.  And we know this is well 
-    defined so long as the ballocmin call was successfully, since it will 
-    ensure that b has been allocated with at least 64 characters.
-
-    ..........................................................................
-
-    int btrunc (bstring b, int n);
-
-    Truncate the bstring to at most n characters.  This function will return 
-    with BSTR_ERR if b is not detected as a valid bstring or n is less than 
-    0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int bpattern (bstring b, int len);
-
-    Replicate the starting bstring, b, end to end repeatedly until it 
-    surpasses len characters, then chop the result to exactly len characters. 
-    This function operates in-place.  This function will return with BSTR_ERR 
-    if b is NULL or of length 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int btoupper (bstring b);
-
-    Convert contents of bstring to upper case.  This function will return with 
-    BSTR_ERR if b is NULL or of length 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int btolower (bstring b);
-
-    Convert contents of bstring to lower case.  This function will return with 
-    BSTR_ERR if b is NULL or of length 0, otherwise BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int bltrimws (bstring b);
-
-    Delete whitespace contiguous from the left end of the bstring.  This 
-    function will return with BSTR_ERR if b is NULL or of length 0, otherwise 
-    BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int brtrimws (bstring b);
-
-    Delete whitespace contiguous from the right end of the bstring.  This 
-    function will return with BSTR_ERR if b is NULL or of length 0, otherwise 
-    BSTR_OK is returned.
-
-    ..........................................................................
-
-    extern int btrimws (bstring b);
-
-    Delete whitespace contiguous from both ends of the bstring.  This function 
-    will return with BSTR_ERR if b is NULL or of length 0, otherwise BSTR_OK 
-    is returned.
-
-    ..........................................................................
-
-    extern int bstrListCreate (void);
-
-    Create an empty struct bstrList. The struct bstrList output structure is 
-    declared as follows:
-
-    struct bstrList {
-        int qty, mlen;
-        bstring * entry;
-    };
-
-    The entry field actually is an array with qty number entries.  The mlen
-    record counts the maximum number of bstring's for which there is memory
-    in the entry record.
-
-    The Bstrlib API does *NOT* include a comprehensive set of functions for 
-    full management of struct bstrList in an abstracted way.  The reason for 
-    this is because aliasing semantics of the list are best left to the user 
-    of this function, and performance varies wildly depending on the 
-    assumptions made.  For a complete list of bstring data type it is 
-    recommended that the C++ public std::vector<CBString> be used, since its
-    semantics are usage are more standard.
-
-    ..........................................................................
-
-    extern int bstrListDestroy (struct bstrList * sl);
-
-    Destroy a struct bstrList structure that was returned by the bsplit 
-    function.  Note that this will destroy each bstring in the ->entry array
-    as well.  See bstrListCreate() above for structure of struct bstrList.
-
-    ..........................................................................
-
-    extern int bstrListAlloc (struct bstrList * sl, int msz);
-
-    Ensure that there is memory for at least msz number of entries for the
-    list.
-
-    ..........................................................................
-
-    extern int bstrListAllocMin (struct bstrList * sl, int msz);
-
-    Try to allocate the minimum amount of memory for the list to include at
-    least msz entries or sl->qty whichever is greater.
-
-    ..........................................................................
-
-    extern struct bstrList * bsplit (bstring str, unsigned char splitChar);
-
-    Create an array of sequential substrings from str divided by the 
-    character splitChar.  Successive occurrences of the splitChar will be 
-    divided by empty bstring entries, following the semantics from the Python 
-    programming language.  To reclaim the memory from this output structure, 
-    bstrListDestroy () should be called.  See bstrListCreate() above for 
-    structure of struct bstrList.
-
-    ..........................................................................
-
-    extern struct bstrList * bsplits (bstring str, const_bstring splitStr);
-
-    Create an array of sequential substrings from str divided by any 
-    character contained in splitStr.  An empty splitStr causes a single entry 
-    bstrList containing a copy of str to be returned.  See bstrListCreate() 
-    above for structure of struct bstrList.
-
-    ..........................................................................
-
-    extern struct bstrList * bsplitstr (bstring str, const_bstring splitStr);
-
-    Create an array of sequential substrings from str divided by the entire 
-    substring splitStr.  An empty splitStr causes a single entry bstrList 
-    containing a copy of str to be returned.  See bstrListCreate() above for 
-    structure of struct bstrList.
-
-    ..........................................................................
-
-    extern bstring bjoin (const struct bstrList * bl, const_bstring sep);
-
-    Join the entries of a bstrList into one bstring by sequentially 
-    concatenating them with the sep bstring in between.  If sep is NULL, it
-    is treated as if it were the empty bstring.  Note that:
-
-        bjoin (l = bsplit (b, s->data[0]), s);
-
-    should result in a copy of b, if s->slen is 1.  If there is an error NULL 
-    is returned, otherwise a bstring with the correct result is returned.  
-    See bstrListCreate() above for structure of struct bstrList.
-
-    ..........................................................................
-
-    extern int bsplitcb (const_bstring str, unsigned char splitChar, int pos,
-	int (* cb) (void * parm, int ofs, int len), void * parm);
-
-    Iterate the set of disjoint sequential substrings over str starting at 
-    position pos divided by the character splitChar.  The parm passed to 
-    bsplitcb is passed on to cb.  If the function cb returns a value < 0, 
-    then further iterating is halted and this value is returned by bsplitcb.
-
-    Note: Non-destructive modification of str from within the cb function 
-    while performing this split is not undefined.  bsplitcb behaves in 
-    sequential lock step with calls to cb.  I.e., after returning from a cb 
-    that return a non-negative integer, bsplitcb continues from the position 
-    1 character after the last detected split character and it will halt 
-    immediately if the length of str falls below this point.  However, if the 
-    cb function destroys str, then it *must* return with a negative value, 
-    otherwise bsplitcb will continue in an undefined manner.
-
-    This function is provided as an incremental alternative to bsplit that is
-    abortable and which does not impose additional memory allocation.
-
-    ..........................................................................
-
-    extern int bsplitscb (const_bstring str, const_bstring splitStr, int pos,
-	int (* cb) (void * parm, int ofs, int len), void * parm);
-
-    Iterate the set of disjoint sequential substrings over str starting at 
-    position pos divided by any of the characters in splitStr.  An empty 
-    splitStr causes the whole str to be iterated once.  The parm passed to 
-    bsplitcb is passed on to cb.  If the function cb returns a value < 0, 
-    then further iterating is halted and this value is returned by bsplitcb.
-
-    Note: Non-destructive modification of str from within the cb function 
-    while performing this split is not undefined.  bsplitscb behaves in 
-    sequential lock step with calls to cb.  I.e., after returning from a cb 
-    that return a non-negative integer, bsplitscb continues from the position 
-    1 character after the last detected split character and it will halt 
-    immediately if the length of str falls below this point.  However, if the 
-    cb function destroys str, then it *must* return with a negative value, 
-    otherwise bsplitscb will continue in an undefined manner.
-
-    This function is provided as an incremental alternative to bsplits that 
-    is abortable and which does not impose additional memory allocation.
-
-    ..........................................................................
-
-    extern int bsplitstrcb (const_bstring str, const_bstring splitStr, int pos,
-	int (* cb) (void * parm, int ofs, int len), void * parm);
-
-    Iterate the set of disjoint sequential substrings over str starting at 
-    position pos divided by the entire substring splitStr.  An empty splitStr 
-    causes each character of str to be iterated.  The parm passed to bsplitcb 
-    is passed on to cb.  If the function cb returns a value < 0, then further 
-    iterating is halted and this value is returned by bsplitcb.
-
-    Note: Non-destructive modification of str from within the cb function 
-    while performing this split is not undefined.  bsplitstrcb behaves in 
-    sequential lock step with calls to cb.  I.e., after returning from a cb 
-    that return a non-negative integer, bsplitstrcb continues from the position 
-    1 character after the last detected split character and it will halt 
-    immediately if the length of str falls below this point.  However, if the 
-    cb function destroys str, then it *must* return with a negative value, 
-    otherwise bsplitscb will continue in an undefined manner.
-
-    This function is provided as an incremental alternative to bsplitstr that 
-    is abortable and which does not impose additional memory allocation.
-
-    ..........................................................................
-
-    extern bstring bformat (const char * fmt, ...);
-
-    Takes the same parameters as printf (), but rather than outputting 
-    results to stdio, it forms a bstring which contains what would have been 
-    output. Note that if there is an early generation of a '\0' character, 
-    the bstring will be truncated to this end point.
-
-    Note that %s format tokens correspond to '\0' terminated char * buffers, 
-    not bstrings.  To print a bstring, first dereference data element of the 
-    the bstring:
-
-        /* b1->data needs to be '\0' terminated, so tagbstrings generated 
-           by blk2tbstr () might not be suitable. */
-        b0 = bformat ("Hello, %s", b1->data);
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bformat function is not present.
-
-    ..........................................................................
-
-    extern int bformata (bstring b, const char * fmt, ...);
-
-    In addition to the initial output buffer b, bformata takes the same 
-    parameters as printf (), but rather than outputting results to stdio, it 
-    appends the results to the initial bstring parameter. Note that if 
-    there is an early generation of a '\0' character, the bstring will be 
-    truncated to this end point.
-
-    Note that %s format tokens correspond to '\0' terminated char * buffers, 
-    not bstrings.  To print a bstring, first dereference data element of the 
-    the bstring:
-
-        /* b1->data needs to be '\0' terminated, so tagbstrings generated 
-           by blk2tbstr () might not be suitable. */
-        bformata (b0 = bfromcstr ("Hello"), ", %s", b1->data); 
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bformata function is not present.
-
-    ..........................................................................
-
-    extern int bassignformat (bstring b, const char * fmt, ...);
-
-    After the first parameter, it takes the same parameters as printf (), but 
-    rather than outputting results to stdio, it outputs the results to 
-    the bstring parameter b. Note that if there is an early generation of a 
-    '\0' character, the bstring will be truncated to this end point.
-
-    Note that %s format tokens correspond to '\0' terminated char * buffers, 
-    not bstrings.  To print a bstring, first dereference data element of the 
-    the bstring:
-
-        /* b1->data needs to be '\0' terminated, so tagbstrings generated 
-           by blk2tbstr () might not be suitable. */
-        bassignformat (b0 = bfromcstr ("Hello"), ", %s", b1->data); 
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bassignformat function is not present.
-
-    ..........................................................................
-
-    extern int bvcformata (bstring b, int count, const char * fmt, va_list arglist);
-
-    The bvcformata function formats data under control of the format control 
-    string fmt and attempts to append the result to b.  The fmt parameter is 
-    the same as that of the printf function.  The variable argument list is 
-    replaced with arglist, which has been initialized by the va_start macro.
-    The size of the output is upper bounded by count.  If the required output
-    exceeds count, the string b is not augmented with any contents and a value
-    below BSTR_ERR is returned.  If a value below -count is returned then it
-    is recommended that the negative of this value be used as an update to the
-    count in a subsequent pass.  On other errors, such as running out of 
-    memory, parameter errors or numeric wrap around BSTR_ERR is returned.  
-    BSTR_OK is returned when the output is successfully generated and 
-    appended to b.
-
-    Note: There is no sanity checking of arglist, and this function is
-    destructive of the contents of b from the b->slen point onward.  If there 
-    is an early generation of a '\0' character, the bstring will be truncated 
-    to this end point.
-
-    Although this function is part of the external API for Bstrlib, the 
-    interface and semantics (length limitations, and unusual return codes) 
-    are fairly atypical.  The real purpose for this function is to provide an 
-    engine for the bvformata macro.
-
-    Note that if the BSTRLIB_NOVSNP macro has been set when bstrlib has been 
-    compiled the bvcformata function is not present.
-
-    ..........................................................................
-
-    extern bstring bread (bNread readPtr, void * parm);
-    typedef size_t (* bNread) (void *buff, size_t elsize, size_t nelem, 
-                               void *parm);
-
-    Read an entire stream into a bstring, verbatum.  The readPtr function 
-    pointer is compatible with fread sematics, except that it need not obtain 
-    the stream data from a file.  The intention is that parm would contain 
-    the stream data context/state required (similar to the role of the FILE* 
-    I/O stream parameter of fread.)
-
-    Abstracting the block read function allows for block devices other than 
-    file streams to be read if desired.  Note that there is an ANSI 
-    compatibility issue if "fread" is used directly; see the ANSI issues 
-    section below.
-
-    ..........................................................................
-
-    extern int breada (bstring b, bNread readPtr, void * parm);
-
-    Read an entire stream and append it to a bstring, verbatum.  Behaves 
-    like bread, except that it appends it results to the bstring b.
-    BSTR_ERR is returned on error, otherwise 0 is returned.
-
-    ..........................................................................
-
-    extern bstring bgets (bNgetc getcPtr, void * parm, char terminator);
-    typedef int (* bNgetc) (void * parm);
-
-    Read a bstring from a stream.  As many bytes as is necessary are read
-    until the terminator is consumed or no more characters are available from
-    the stream.  If read from the stream, the terminator character will be
-    appended to the end of the returned bstring.  The getcPtr function must 
-    have the same semantics as the fgetc C library function (i.e., returning 
-    an integer whose value is negative when there are no more characters 
-    available, otherwise the value of the next available unsigned character 
-    from the stream.)  The intention is that parm would contain the stream 
-    data context/state required (similar to the role of the FILE* I/O stream 
-    parameter of fgets.)  If no characters are read, or there is some other 
-    detectable error, NULL is returned.
-
-    bgets will never call the getcPtr function more often than necessary to
-    construct its output (including a single call, if required, to determine 
-    that the stream contains no more characters.)
-
-    Abstracting the character stream function and terminator character allows
-    for different stream devices and string formats other than '\n' 
-    terminated lines in a file if desired (consider \032 terminated email 
-    messages, in a UNIX mailbox for example.)
-
-    For files, this function can be used analogously as fgets as follows:
-
-        fp = fopen ( ... );
-        if (fp) b = bgets ((bNgetc) fgetc, fp, '\n');
-
-    (Note that only one terminator character can be used, and that '\0' is 
-    not assumed to terminate the stream in addition to the terminator 
-    character. This is consistent with the semantics of fgets.)
-
-    ..........................................................................
-
-    extern int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator);
-
-    Read from a stream and concatenate to a bstring.  Behaves like bgets, 
-    except that it appends it results to the bstring b.  The value 1 is 
-    returned if no characters are read before a negative result is returned
-    from getcPtr.  Otherwise BSTR_ERR is returned on error, and 0 is returned
-    in other normal cases.
-
-    ..........................................................................
-
-    extern int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator);
-
-    Read from a stream and concatenate to a bstring.  Behaves like bgets, 
-    except that it assigns the results to the bstring b.  The value 1 is 
-    returned if no characters are read before a negative result is returned
-    from getcPtr.  Otherwise BSTR_ERR is returned on error, and 0 is returned
-    in other normal cases.
-
-    ..........................................................................
-
-    extern struct bStream * bsopen (bNread readPtr, void * parm);
-  
-    Wrap a given open stream (described by a fread compatible function 
-    pointer and stream handle) into an open bStream suitable for the bstring 
-    library streaming functions.
-  
-    ..........................................................................
-
-    extern void * bsclose (struct bStream * s);
-  
-    Close the bStream, and return the handle to the stream that was 
-    originally used to open the given stream.  If s is NULL or detectably 
-    invalid, NULL will be returned.
-
-    ..........................................................................
-
-    extern int bsbufflength (struct bStream * s, int sz);
-
-    Set the length of the buffer used by the bStream.  If sz is the macro
-    BSTR_BS_BUFF_LENGTH_GET (which is 0), the length is not set.  If s is 
-    NULL or sz is negative, the function will return with BSTR_ERR, otherwise 
-    this function returns with the previous length.
-
-    ..........................................................................
-
-    extern int bsreadln (bstring r, struct bStream * s, char terminator);
-  
-    Read a bstring terminated by the terminator character or the end of the
-    stream from the bStream (s) and return it into the parameter r.  The 
-    matched terminator, if found, appears at the end of the line read.  If
-    the stream has been exhausted of all available data, before any can be
-    read, BSTR_ERR is returned.  This function may read additional characters 
-    into the stream buffer from the core stream that are not returned, but 
-    will be retained for subsequent read operations.  When reading from high 
-    speed streams, this function can perform significantly faster than bgets.
-
-    ..........................................................................
-
-    extern int bsreadlna (bstring r, struct bStream * s, char terminator);
-  
-    Read a bstring terminated by the terminator character or the end of the
-    stream from the bStream (s) and concatenate it to the parameter r.  The 
-    matched terminator, if found, appears at the end of the line read.  If
-    the stream has been exhausted of all available data, before any can be
-    read, BSTR_ERR is returned.  This function may read additional characters 
-    into the stream buffer from the core stream that are not returned, but 
-    will be retained for subsequent read operations.  When reading from high 
-    speed streams, this function can perform significantly faster than bgets.
-
-    ..........................................................................
-
-    extern int bsreadlns (bstring r, struct bStream * s, bstring terminators);
-
-    Read a bstring terminated by any character in the terminators bstring or 
-    the end of the stream from the bStream (s) and return it into the 
-    parameter r. This function may read additional characters from the core 
-    stream that are not returned, but will be retained for subsequent read 
-    operations.
-
-    ..........................................................................
-
-    extern int bsreadlnsa (bstring r, struct bStream * s, bstring terminators);
-
-    Read a bstring terminated by any character in the terminators bstring or 
-    the end of the stream from the bStream (s) and concatenate it to the 
-    parameter r.  If the stream has been exhausted of all available data, 
-    before any can be read, BSTR_ERR is returned.  This function may read 
-    additional characters from the core stream that are not returned, but 
-    will be retained for subsequent read operations.
-
-    ..........................................................................
-
-    extern int bsread (bstring r, struct bStream * s, int n);
-  
-    Read a bstring of length n (or, if it is fewer, as many bytes as is 
-    remaining) from the bStream.  This function will read the minimum 
-    required number of additional characters from the core stream.  When the
-    stream is at the end of the file BSTR_ERR is returned, otherwise BSTR_OK 
-    is returned.
-
-    ..........................................................................
-
-    extern int bsreada (bstring r, struct bStream * s, int n);
-  
-    Read a bstring of length n (or, if it is fewer, as many bytes as is 
-    remaining) from the bStream and concatenate it to the parameter r.  This 
-    function will read the minimum required number of additional characters 
-    from the core stream.  When the stream is at the end of the file BSTR_ERR 
-    is returned, otherwise BSTR_OK is returned.
-  
-    ..........................................................................
-  
-    extern int bsunread (struct bStream * s, const_bstring b);
-  
-    Insert a bstring into the bStream at the current position.  These 
-    characters will be read prior to those that actually come from the core 
-    stream.
-
-    ..........................................................................
-
-    extern int bspeek (bstring r, const struct bStream * s);
-  
-    Return the number of currently buffered characters from the bStream that 
-    will be read prior to reads from the core stream, and append it to the
-    the parameter r.
-
-    ..........................................................................
-
-    extern int bssplitscb (struct bStream * s, const_bstring splitStr, 
-	int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-
-    Iterate the set of disjoint sequential substrings over the stream s 
-    divided by any character from the bstring splitStr.  The parm passed to 
-    bssplitscb is passed on to cb.  If the function cb returns a value < 0, 
-    then further iterating is halted and this return value is returned by 
-    bssplitscb.
-
-    Note: At the point of calling the cb function, the bStream pointer is 
-    pointed exactly at the position right after having read the split 
-    character.  The cb function can act on the stream by causing the bStream
-    pointer to move, and bssplitscb will continue by starting the next split
-    at the position of the pointer after the return from cb.
-
-    However, if the cb causes the bStream s to be destroyed then the cb must
-    return with a negative value, otherwise bssplitscb will continue in an 
-    undefined manner.
-
-    This function is provided as way to incrementally parse through a file
-    or other generic stream that in total size may otherwise exceed the 
-    practical or desired memory available.  As with the other split callback
-    based functions this is abortable and does not impose additional memory 
-    allocation.
-
-    ..........................................................................
-    
-    extern int bssplitstrcb (struct bStream * s, const_bstring splitStr, 
-	int (* cb) (void * parm, int ofs, const_bstring entry), void * parm);
-	
-    Iterate the set of disjoint sequential substrings over the stream s 
-    divided by the entire substring splitStr.  The parm passed to 
-    bssplitstrcb is passed on to cb.  If the function cb returns a 
-    value < 0, then further iterating is halted and this return value is 
-    returned by bssplitstrcb.
-
-    Note: At the point of calling the cb function, the bStream pointer is 
-    pointed exactly at the position right after having read the split 
-    character.  The cb function can act on the stream by causing the bStream
-    pointer to move, and bssplitstrcb will continue by starting the next 
-    split at the position of the pointer after the return from cb.
-
-    However, if the cb causes the bStream s to be destroyed then the cb must
-    return with a negative value, otherwise bssplitscb will continue in an 
-    undefined manner.
-
-    This function is provided as way to incrementally parse through a file
-    or other generic stream that in total size may otherwise exceed the 
-    practical or desired memory available.  As with the other split callback
-    based functions this is abortable and does not impose additional memory 
-    allocation.
-    
-    ..........................................................................
-    
-    extern int bseof (const struct bStream * s);
-
-    Return the defacto "EOF" (end of file) state of a stream (1 if the 
-    bStream is in an EOF state, 0 if not, and BSTR_ERR if stream is closed or 
-    detectably erroneous.)  When the readPtr callback returns a value <= 0 
-    the stream reaches its "EOF" state. Note that bunread with non-empty 
-    content will essentially turn off this state, and the stream will not be 
-    in its "EOF" state so long as its possible to read more data out of it.
-
-    Also note that the semantics of bseof() are slightly different from 
-    something like feof().  I.e., reaching the end of the stream does not
-    necessarily guarantee that bseof() will return with a value indicating
-    that this has happened.  bseof() will only return indicating that it has
-    reached the "EOF" and an attempt has been made to read past the end of
-    the bStream.
-
-The macros
-----------
-
-    The macros described below are shown in a prototype form indicating their
-    intended usage.  Note that the parameters passed to these macros will be
-    referenced multiple times.  As with all macros, programmer care is 
-    required to guard against unintended side effects.
-
-    int blengthe (const_bstring b, int err);
-
-    Returns the length of the bstring.  If the bstring is NULL err is 
-    returned.
-
-    ..........................................................................
-
-    int blength (const_bstring b);
-
-    Returns the length of the bstring.  If the bstring is NULL, the length 
-    returned is 0.
-
-    ..........................................................................
-
-    int bchare (const_bstring b, int p, int c);
-
-    Returns the p'th character of the bstring b.  If the position p refers to 
-    a position that does not exist in the bstring or the bstring is NULL, 
-    then c is returned.
-
-    ..........................................................................
-
-    char bchar (const_bstring b, int p);
-
-    Returns the p'th character of the bstring b.  If the position p refers to 
-    a position that does not exist in the bstring or the bstring is NULL, 
-    then '\0' is returned.
-
-    ..........................................................................
-
-    char * bdatae (bstring b, char * err);
-
-    Returns the char * data portion of the bstring b.  If b is NULL, err is
-    returned.
-
-    ..........................................................................
-
-    char * bdata (bstring b);
-
-    Returns the char * data portion of the bstring b.  If b is NULL, NULL is
-    returned.
-
-    ..........................................................................
-
-    char * bdataofse (bstring b, int ofs, char * err);
-
-    Returns the char * data portion of the bstring b offset by ofs.  If b is 
-    NULL, err is returned.
-
-    ..........................................................................
-
-    char * bdataofs (bstring b, int ofs);
-
-    Returns the char * data portion of the bstring b offset by ofs.  If b is 
-    NULL, NULL is returned.
-
-    ..........................................................................
-
-    struct tagbstring var = bsStatic ("...");
-
-    The bsStatic macro allows for static declarations of literal string 
-    constants as struct tagbstring structures.  The resulting tagbstring does 
-    not need to be freed or destroyed.  Note that this macro is only well
-    defined for string literal arguments.  For more general string pointers, 
-    use the btfromcstr macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    <void * blk, int len> <- bsStaticBlkParms ("...")
-
-    The bsStaticBlkParms macro emits a pair of comma seperated parameters 
-    corresponding to the block parameters for the block functions in Bstrlib 
-    (i.e., blk2bstr, bcatblk, blk2tbstr, bisstemeqblk, bisstemeqcaselessblk.) 
-    Note that this macro is only well defined for string literal arguments.
-
-    Examples:
-
-    bstring b = blk2bstr (bsStaticBlkParms ("Fast init. "));
-    bcatblk (b, bsStaticBlkParms ("No frills fast concatenation."));
-
-    These are faster than using bfromcstr() and bcatcstr() respectively 
-    because the length of the inline string is known as a compile time
-    constant.  Also note that seperate struct tagbstring declarations for
-    holding the output of a bsStatic() macro are not required.
-
-    ..........................................................................
-
-    void btfromcstr (struct tagbstring& t, const char * s);
-
-    Fill in the tagbstring t with the '\0' terminated char buffer s.  This 
-    action is purely reference oriented; no memory management is done.  The 
-    data member is just assigned s, and slen is assigned the strlen of s.  
-    The s parameter is accessed exactly once in this macro.
-
-    The resulting struct tagbstring is initially write protected.  Attempts 
-    to write to this struct tagbstring in a write protected state from any 
-    bstrlib function will lead to BSTR_ERR being returned.  Invoke the 
-    bwriteallow on this struct tagbstring to make it writeable (though this 
-    requires that s be obtained from a function compatible with malloc.)
-
-    ..........................................................................
-
-    void btfromblk (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len.  This 
-    action is purely reference oriented; no memory management is done.  The 
-    data member of t is just assigned s, and slen is assigned len.  Note that 
-    the buffer is not appended with a '\0' character.  The s and len 
-    parameters are accessed exactly once each in this macro.
-
-    The resulting struct tagbstring is initially write protected.  Attempts 
-    to write to this struct tagbstring in a write protected state from any 
-    bstrlib function will lead to BSTR_ERR being returned.  Invoke the 
-    bwriteallow on this struct tagbstring to make it writeable (though this 
-    requires that s be obtained from a function compatible with malloc.)
-
-    ..........................................................................
-
-    void btfromblkltrimws (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len after it
-    has been left trimmed.  This action is purely reference oriented; no 
-    memory management is done.  The data member of t is just assigned to a 
-    pointer inside the buffer s.  Note that the buffer is not appended with a 
-    '\0' character.  The s and len parameters are accessed exactly once each 
-    in this macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    void btfromblkrtrimws (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len after it
-    has been right trimmed.  This action is purely reference oriented; no 
-    memory management is done.  The data member of t is just assigned to a 
-    pointer inside the buffer s.  Note that the buffer is not appended with a 
-    '\0' character.  The s and len parameters are accessed exactly once each 
-    in this macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    void btfromblktrimws (struct tagbstring& t, void * s, int len);
-
-    Fill in the tagbstring t with the data buffer s with length len after it
-    has been left and right trimmed.  This action is purely reference 
-    oriented; no memory management is done.  The data member of t is just 
-    assigned to a pointer inside the buffer s.  Note that the buffer is not 
-    appended with a '\0' character.  The s and len parameters are accessed 
-    exactly once each in this macro.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.  Invoking the bwriteallow macro onto this struct 
-    tagbstring has no effect.
-
-    ..........................................................................
-
-    void bmid2tbstr (struct tagbstring& t, bstring b, int pos, int len);
-
-    Fill the tagbstring t with the substring from b, starting from position
-    pos with a length len.  The segment is clamped by the boundaries of
-    the bstring b.  This action is purely reference oriented; no memory 
-    management is done.  Note that the buffer is not appended with a '\0' 
-    character.  Note that the t parameter to this macro may be accessed 
-    multiple times.  Note that the contents of t will become undefined 
-    if the contents of b change or are destroyed.
-
-    The resulting struct tagbstring is permanently write protected.  Attempts 
-    to write to this struct tagbstring in a write protected state from any 
-    bstrlib function will lead to BSTR_ERR being returned.  Invoking the
-    bwriteallow macro on this struct tagbstring will have no effect.
-
-    ..........................................................................
-
-    void bvformata (int& ret, bstring b, const char * format, lastarg);
-
-    Append the bstring b with printf like formatting with the format control
-    string, and the arguments taken from the ... list of arguments after
-    lastarg passed to the containing function.  If the containing function 
-    does not have ... parameters or lastarg is not the last named parameter 
-    before the ... then the results are undefined.  If successful, the 
-    results are appended to b and BSTR_OK is assigned to ret.  Otherwise 
-    BSTR_ERR is assigned to ret.
-
-    Example:
-
-    void dbgerror (FILE * fp, const char * fmt, ...) {
-        int ret;
-        bstring b;
-        bvformata (ret, b = bfromcstr ("DBG: "), fmt, fmt);
-        if (BSTR_OK == ret) fputs ((char *) bdata (b), fp);
-        bdestroy (b);
-    }
-
-    Note that if the BSTRLIB_NOVSNP macro was set when bstrlib had been 
-    compiled the bvformata macro will not link properly.  If the 
-    BSTRLIB_NOVSNP macro has been set, the bvformata macro will not be 
-    available.
-
-    ..........................................................................
-
-    void bwriteprotect (struct tagbstring& t);
-
-    Disallow bstring from being written to via the bstrlib API.  Attempts to 
-    write to the resulting tagbstring from any bstrlib function will lead to 
-    BSTR_ERR being returned.
-
-    Note: bstrings which are write protected cannot be destroyed via bdestroy.
-
-    Note to C++ users: Setting a CBString as write protected will not prevent
-    it from being destroyed by the destructor.
-
-    ..........................................................................
-
-    void bwriteallow (struct tagbstring& t);
-
-    Allow bstring to be written to via the bstrlib API.  Note that such an 
-    action makes the bstring both writable and destroyable.  If the bstring is
-    not legitimately writable (as is the case for struct tagbstrings 
-    initialized with a bsStatic value), the results of this are undefined.
-
-    Note that invoking the bwriteallow macro may increase the number of 
-    reallocs by one more than necessary for every call to bwriteallow 
-    interleaved with any bstring API which writes to this bstring.
-
-    ..........................................................................
-
-    int biswriteprotected (struct tagbstring& t);
-
-    Returns 1 if the bstring is write protected, otherwise 0 is returned.
-
-===============================================================================
-
-The bstest module
------------------
-
-The bstest module is just a unit test for the bstrlib module.  For correct
-implementations of bstrlib, it should execute with 0 failures being reported.
-This test should be utilized if modifications/customizations to bstrlib have
-been performed.  It tests each core bstrlib function with bstrings of every 
-mode (read-only, NULL, static and mutable) and ensures that the expected 
-semantics are observed (including results that should indicate an error). It
-also tests for aliasing support.  Passing bstest is a necessary but not a 
-sufficient condition for ensuring the correctness of the bstrlib module.
-
-
-The test module
----------------
-
-The test module is just a unit test for the bstrwrap module.  For correct
-implementations of bstrwrap, it should execute with 0 failures being 
-reported.  This test should be utilized if modifications/customizations to 
-bstrwrap have been performed.  It tests each core bstrwrap function with 
-CBStrings write protected or not and ensures that the expected semantics are 
-observed (including expected exceptions.)  Note that exceptions cannot be
-disabled to run this test.  Passing test is a necessary but not a sufficient 
-condition for ensuring the correctness of the bstrwrap module.
-
-===============================================================================
-
-Using Bstring and CBString as an alternative to the C library
--------------------------------------------------------------
-
-First let us give a table of C library functions and the alternative bstring 
-functions and CBString methods that should be used instead of them.
-
-C-library         Bstring alternative             CBString alternative
----------         -------------------             --------------------
-gets              bgets                           ::gets
-strcpy            bassign                         = operator
-strncpy           bassignmidstr                   ::midstr
-strcat            bconcat                         += operator
-strncat           bconcat + btrunc                += operator + ::trunc
-strtok            bsplit, bsplits                 ::split
-sprintf           b(assign)format                 ::format
-snprintf          b(assign)format + btrunc        ::format + ::trunc
-vsprintf          bvformata                       bvformata
-
-vsnprintf         bvformata + btrunc              bvformata + btrunc
-vfprintf          bvformata + fputs               use bvformata + fputs
-strcmp            biseq, bstrcmp                  comparison operators.
-strncmp           bstrncmp, memcmp                bstrncmp, memcmp
-strlen            ->slen, blength                 ::length
-strdup            bstrcpy                         constructor
-strset            bpattern                        ::fill
-strstr            binstr                          ::find
-strpbrk           binchr                          ::findchr
-stricmp           bstricmp                        cast & use bstricmp
-strlwr            btolower                        cast & use btolower
-strupr            btoupper                        cast & use btoupper
-strrev            bReverse (aux module)           cast & use bReverse
-strchr            bstrchr                         cast & use bstrchr
-strspnp           use strspn                      use strspn
-ungetc            bsunread                        bsunread
-
-The top 9 C functions listed here are troublesome in that they impose memory 
-management in the calling function.  The Bstring and CBstring interfaces have
-built-in memory management, so there is far less code with far less potential 
-for buffer overrun problems.  strtok can only be reliably called as a "leaf" 
-calculation, since it (quite bizarrely) maintains hidden internal state.  And
-gets is well known to be broken no matter what.  The Bstrlib alternatives do
-not suffer from those sorts of problems.
-
-The substitute for strncat can be performed with higher performance by using 
-the blk2tbstr macro to create a presized second operand for bconcat.
-
-C-library         Bstring alternative             CBString alternative
----------         -------------------             --------------------
-strspn            strspn acceptable               strspn acceptable
-strcspn           strcspn acceptable              strcspn acceptable
-strnset           strnset acceptable              strnset acceptable
-printf            printf acceptable               printf acceptable
-puts              puts acceptable                 puts acceptable
-fprintf           fprintf acceptable              fprintf acceptable
-fputs             fputs acceptable                fputs acceptable
-memcmp            memcmp acceptable               memcmp acceptable
-
-Remember that Bstring (and CBstring) functions will automatically append the
-'\0' character to the character data buffer.  So by simply accessing the data
-buffer directly, ordinary C string library functions can be called directly 
-on them.  Note that bstrcmp is not the same as memcmp in exactly the same way
-that strcmp is not the same as memcmp.
-
-C-library         Bstring alternative             CBString alternative
----------         -------------------             --------------------
-fread             balloc + fread                  ::alloc + fread
-fgets             balloc + fgets                  ::alloc + fgets
-
-These are odd ones because of the exact sizing of the buffer required.  The 
-Bstring and CBString alternatives requires that the buffers are forced to 
-hold at least the prescribed length, then just use fread or fgets directly.  
-However, typically the automatic memory management of Bstring and CBstring 
-will make the typical use of fgets and fread to read specifically sized 
-strings unnecessary.
-
-Implementation Choices
-----------------------
-
-Overhead:
-.........
-
-The bstring library has more overhead versus straight char buffers for most
-functions.  This overhead is essentially just the memory management and 
-string header allocation.  This overhead usually only shows up for small 
-string manipulations.  The performance loss has to be considered in
-light of the following:
-
-1) What would be the performance loss of trying to write this management
-   code in one's own application?
-2) Since the bstring library source code is given, a sufficiently powerful 
-   modern inlining globally optimizing compiler can remove function call 
-   overhead.
-
-Since the data type is exposed, a developer can replace any unsatisfactory
-function with their own inline implementation.  And that is besides the main 
-point of what the better string library is mainly meant to provide.  Any 
-overhead lost has to be compared against the value of the safe abstraction 
-for coupling memory management and string functionality.
-
-Performance of the C interface:
-...............................
-
-The algorithms used have performance advantages versus the analogous C 
-library functions.  For example:
-
-1. bfromcstr/blk2str/bstrcpy versus strcpy/strdup.  By using memmove instead 
-   of strcpy, the break condition of the copy loop is based on an independent 
-   counter (that should be allocated in a register) rather than having to 
-   check the results of the load.  Modern out-of-order executing CPUs can 
-   parallelize the final branch mis-predict penality with the loading of the 
-   source string.  Some CPUs will also tend to have better built-in hardware 
-   support for counted memory moves than load-compare-store.  (This is a 
-   minor, but non-zero gain.)
-2. biseq versus strcmp.  If the strings are unequal in length, bsiseq will
-   return in O(1) time.  If the strings are aliased, or have aliased data
-   buffers, biseq will return in O(1) time.  strcmp will always be O(k), 
-   where k is the length of the common prefix or the whole string if they are 
-   identical.
-3. ->slen versus strlen.  ->slen is obviously always O(1), while strlen is
-   always O(n) where n is the length of the string.
-4. bconcat versus strcat.  Both rely on precomputing the length of the 
-   destination string argument, which will favor the bstring library.  On 
-   iterated concatenations the performance difference can be enormous.
-5. bsreadln versus fgets.  The bsreadln function reads large blocks at a time
-   from the given stream, then parses out lines from the buffers directly.
-   Some C libraries will implement fgets as a loop over single fgetc calls.
-   Testing indicates that the bsreadln approach can be several times faster
-   for fast stream devices (such as a file that has been entirely cached.)
-6. bsplits/bsplitscb versus strspn.  Accelerators for the set of match 
-   characters are generated only once.
-7. binstr versus strstr.  The binstr implementation unrolls the loops to
-   help reduce loop overhead.  This will matter if the target string is 
-   long and source string is not found very early in the target string.
-   With strstr, while it is possible to unroll the source contents, it is
-   not possible to do so with the destination contents in a way that is
-   effective because every destination character must be tested against
-   '\0' before proceeding to the next character.
-8. bReverse versus strrev.  The C function must find the end of the string
-   first before swaping character pairs.
-9. bstrrchr versus no comparable C function.  Its not hard to write some C
-   code to search for a character from the end going backwards.  But there
-   is no way to do this without computing the length of the string with
-   strlen.
-
-Practical testing indicates that in general Bstrlib is never signifcantly 
-slower than the C library for common operations, while very often having a
-performance advantage that ranges from significant to massive.  Even for 
-functions like b(n)inchr versus str(c)spn() (where, in theory, there is no 
-advantage for the Bstrlib architecture) the performance of Bstrlib is vastly 
-superior to most tested C library implementations.
-
-Some of Bstrlib's extra functionality also lead to inevitable performance
-advantages over typical C solutions.  For example, using the blk2tbstr macro,
-one can (in O(1) time) generate an internal substring by reference while not 
-disturbing the original string.  If disturbing the original string is not an
-option, typically, a comparable char * solution would have to make a copy of 
-the substring to provide similar functionality.  Another example is reverse 
-character set scanning -- the str(c)spn functions only scan in a forward 
-direction which can complicate some parsing algorithms.
-
-Where high performance char * based algorithms are available, Bstrlib can 
-still leverage them by accessing the ->data field on bstrings.  So 
-realistically Bstrlib can never be significantly slower than any standard
-'\0' terminated char * based solutions.
-
-Performance of the C++ interface:
-.................................
-
-The C++ interface has been designed with an emphasis on abstraction and safety
-first.  However, since it is substantially a wrapper for the C bstring 
-functions, for longer strings the performance comments described in the 
-"Performance of the C interface" section above still apply. Note that the 
-(CBString *) type can be directly cast to a (bstring) type, and passed as 
-parameters to the C functions (though a CBString must never be passed to 
-bdestroy.)
-
-Probably the most controversial choice is performing full bounds checking on
-the [] operator.  This decision was made because 1) the fast alternative of
-not bounds checking is still available by first casting the CBString to a 
-(const char *) buffer or to a (struct tagbstring) then derefencing .data and 
-2) because the lack of bounds checking is seen as one of the main weaknesses 
-of C/C++ versus other languages.  This check being done on every access leads 
-to individual character extraction being actually slower than other languages 
-in this one respect (other language's compilers will normally dedicate more 
-resources on hoisting or removing bounds checking as necessary) but otherwise 
-bring C++ up to the level of other languages in terms of functionality.
-
-It is common for other C++ libraries to leverage the abstractions provided by
-C++ to use reference counting and "copy on write" policies.  While these 
-techniques can speed up some scenarios, they impose a problem with respect to
-thread safety.  bstrings and CBStrings can be properly protected with 
-"per-object" mutexes, meaning that two bstrlib calls can be made and execute
-simultaneously, so long as the bstrings and CBstrings are distinct.  With a
-reference count and alias before copy on write policy, global mutexes are 
-required that prevent multiple calls to the strings library to execute 
-simultaneously regardless of whether or not the strings represent the same
-string.
-
-One interesting trade off in CBString is that the default constructor is not 
-trivial.  I.e., it always prepares a ready to use memory buffer.  The purpose 
-is to ensure that there is a uniform internal composition for any functioning 
-CBString that is compatible with bstrings.  It also means that the other 
-methods in the class are not forced to perform "late initialization" checks. 
-In the end it means that construction of CBStrings are slower than other 
-comparable C++ string classes.  Initial testing, however, indicates that 
-CBString outperforms std::string and MFC's CString, for example, in all other 
-operations.  So to work around this weakness it is recommended that CBString 
-declarations be pushed outside of inner loops.
-
-Practical testing indicates that with the exception of the caveats given 
-above (constructors and safe index character manipulations) the C++ API for
-Bstrlib generally outperforms popular standard C++ string classes.  Amongst 
-the standard libraries and compilers, the quality of concatenation operations 
-varies wildly and very little care has gone into search functions.  Bstrlib
-dominates those performance benchmarks.
-
-Memory management:
-..................
-
-The bstring functions which write and modify bstrings will automatically 
-reallocate the backing memory for the char buffer whenever it is required to 
-grow.  The algorithm for resizing chosen is to snap up to sizes that are a 
-power of two which are sufficient to hold the intended new size.  Memory 
-reallocation is not performed when the required size of the buffer is 
-decreased.  This behavior can be relied on, and is necessary to make the 
-behaviour of balloc deterministic.  This trades off additional memory usage 
-for decreasing the frequency for required reallocations:
-
-1. For any bstring whose size never exceeds n, its buffer is not ever 
-   reallocated more than log_2(n) times for its lifetime.
-2. For any bstring whose size never exceeds n, its buffer is never more than
-   2*(n+1) in length.  (The extra characters beyond 2*n are to allow for the 
-   implicit '\0' which is always added by the bstring modifying functions.)
-
-Decreasing the buffer size when the string decreases in size would violate 1) 
-above and in real world case lead to pathological heap thrashing.  Similarly, 
-allocating more tightly than "least power of 2 greater than necessary" would 
-lead to a violation of 1) and have the same potential for heap thrashing.
-
-Property 2) needs emphasizing.  Although the memory allocated is always a 
-power of 2, for a bstring that grows linearly in size, its buffer memory also 
-grows linearly, not exponentially.  The reason is that the amount of extra 
-space increases with each reallocation, which decreases the frequency of 
-future reallocations.
-
-Obviously, given that bstring writing functions may reallocate the data 
-buffer backing the target bstring, one should not attempt to cache the data 
-buffer address and use it after such bstring functions have been called.  
-This includes making reference struct tagbstrings which alias to a writable 
-bstring.
-
-balloc or bfromcstralloc can be used to preallocate the minimum amount of 
-space used for a given bstring.  This will reduce even further the number of 
-times the data portion is reallocated.  If the length of the string is never 
-more than one less than the memory length then there will be no further 
-reallocations.
-
-Note that invoking the bwriteallow macro may increase the number of reallocs 
-by one more than necessary for every call to bwriteallow interleaved with any 
-bstring API which writes to this bstring.
-
-The library does not use any mechanism for automatic clean up for the C API.
-Thus explicit clean up via calls to bdestroy() are required to avoid memory
-leaks.
-
-Constant and static tagbstrings:
-................................
-
-A struct tagbstring can be write protected from any bstrlib function using 
-the bwriteprotect macro.  A write protected struct tagbstring can then be 
-reset to being writable via the bwriteallow macro.  There is, of course, no 
-protection from attempts to directly access the bstring members.  Modifying a 
-bstring which is write protected by direct access has undefined behavior.
-
-static struct tagbstrings can be declared via the bsStatic macro.  They are
-considered permanently unwritable.  Such struct tagbstrings's are declared 
-such that attempts to write to it are not well defined.  Invoking either 
-bwriteallow or bwriteprotect on static struct tagbstrings has no effect.  
-
-struct tagbstring's initialized via btfromcstr or blk2tbstr are protected by 
-default but can be made writeable via the bwriteallow macro.  If bwriteallow 
-is called on such struct tagbstring's, it is the programmer's responsibility 
-to ensure that:
-
-1) the buffer supplied was allocated from the heap.
-2) bdestroy is not called on this tagbstring (unless the header itself has
-   also been allocated from the heap.)
-3) free is called on the buffer to reclaim its memory.
-
-bwriteallow and bwriteprotect can be invoked on ordinary bstrings (they have 
-to be dereferenced with the (*) operator to get the levels of indirection 
-correct) to give them write protection.
-
-Buffer declaration:
-...................
-
-The memory buffer is actually declared "unsigned char *" instead of "char *".
-The reason for this is to trigger compiler warnings whenever uncasted char
-buffers are assigned to the data portion of a bstring.  This will draw more
-diligent programmers into taking a second look at the code where they 
-have carelessly left off the typically required cast.  (Research from 
-AT&T/Lucent indicates that additional programmer eyeballs is one of the most 
-effective mechanisms at ferreting out bugs.)
-
-Function pointers:
-..................
-
-The bgets, bread and bStream functions use function pointers to obtain 
-strings from data streams.  The function pointer declarations have been 
-specifically chosen to be compatible with the fgetc and fread functions. 
-While this may seem to be a convoluted way of implementing fgets and fread 
-style functionality, it has been specifically designed this way to ensure 
-that there is no dependency on a single narrowly defined set of device 
-interfaces, such as just stream I/O.  In the embedded world, its quite 
-possible to have environments where such interfaces may not exist in the 
-standard C library form.  Furthermore, the generalization that this opens up 
-allows for more sophisticated uses for these functions (performing an fgets 
-like function on a socket, for example.) By using function pointers, it also 
-allows such abstract stream interfaces to be created using the bstring library 
-itself while not creating a circular dependency.
-
-Use of int's for sizes:
-.......................
-
-This is just a recognition that 16bit platforms with requirements for strings
-that are larger than 64K and 32bit+ platforms with requirements for strings
-that are larger than 4GB are pretty marginal.  The main focus is for 32bit 
-platforms, and emerging 64bit platforms with reasonable < 4GB string 
-requirements.  Using ints allows for negative values which has meaning 
-internally to bstrlib.
-
-Semantic consideration:
-.......................
-
-Certain care needs to be taken when copying and aliasing bstrings.  A bstring
-is essentially a pointer type which points to a multipart abstract data
-structure.  Thus usage, and lifetime of bstrings have semantics that follow
-these considerations.  For example:
-
-    bstring a, b;
-    struct tagbstring t;
-
-    a = bfromcstr("Hello"); /* Create new bstring and copy "Hello" into it. */
-    b = a;                  /* Alias b to the contents of a.                */
-    t = *a;                 /* Create a current instance pseudo-alias of a. */
-    bconcat (a, b);         /* Double a and b, t is now undefined.          */
-    bdestroy (a);           /* Destroy the contents of both a and b.        */
-
-Variables of type bstring are really just references that point to real 
-bstring objects.  The equal operator (=) creates aliases, and the asterisk 
-dereference operator (*) creates a kind of alias to the current instance (which
-is generally not useful for any purpose.)  Using bstrcpy() is the correct way 
-of creating duplicate instances.  The ampersand operator (&) is useful for 
-creating aliases to struct tagbstrings (remembering that constructed struct 
-tagbstrings are not writable by default.)
-
-CBStrings use complete copy semantics for the equal operator (=), and thus do 
-not have these sorts of issues.  
-
-Debugging:
-..........
-
-Bstrings have a simple, exposed definition and construction, and the library 
-itself is open source.  So most debugging is going to be fairly straight- 
-forward.  But the memory for bstrings come from the heap, which can often be
-corrupted indirectly, and it might not be obvious what has happened even from
-direct examination of the contents in a debugger or a core dump.  There are
-some tools such as Purify, Insure++ and Electric Fence which can help solve
-such problems, however another common approach is to directly instrument the
-calls to malloc, realloc, calloc, free, memcpy, memmove and/or other calls
-by overriding them with macro definitions.
-
-Although the user could hack on the Bstrlib sources directly as necessary to 
-perform such an instrumentation, Bstrlib comes with a built-in mechanism for 
-doing this.  By defining the macro BSTRLIB_MEMORY_DEBUG and providing an 
-include file named memdbg.h this will force the core Bstrlib modules to 
-attempt to include this file.  In such a file, macros could be defined which 
-overrides Bstrlib's useage of the C standard library.
-
-Rather than calling malloc, realloc, free, memcpy or memmove directly, Bstrlib
-emits the macros bstr__alloc, bstr__realloc, bstr__free, bstr__memcpy and 
-bstr__memmove in their place respectively.  By default these macros are simply
-assigned to be equivalent to their corresponding C standard library function
-call.  However, if they are given earlier macro definitions (via the back 
-door include file) they will not be given their default definition.  In this
-way Bstrlib's interface to the standard library can be changed but without
-having to directly redefine or link standard library symbols (both of which 
-are not strictly ANSI C compliant.)
-
-An example definition might include:
-
-    #define bstr__alloc(sz) X_malloc ((sz), __LINE__, __FILE__)
-
-which might help contextualize heap entries in a debugging environment.
-
-The NULL parameter and sanity checking of bstrings is part of the Bstrlib 
-API, and thus Bstrlib itself does not present any different modes which would 
-correspond to "Debug" or "Release" modes.  Bstrlib always contains mechanisms
-which one might think of as debugging features, but retains the performance
-and small memory footprint one would normally associate with release mode
-code.
-
-Integration Microsoft's Visual Studio debugger:
-...............................................
-
-Microsoft's Visual Studio debugger has a capability of customizable mouse 
-float over data type descriptions.  This is accomplished by editting the
-AUTOEXP.DAT file to include the following:
-
-    ; new for CBString
-    tagbstring =slen=<slen> mlen=<mlen> <data,st>
-    Bstrlib::CBStringList =count=<size()>
-
-In Visual C++ 6.0 this file is located in the directory:
-
-    C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin
-
-and in Visual Studio .NET 2003 its located here:
-
-    C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Packages\Debugger
-
-This will improve the ability of debugging with Bstrlib under Visual Studio.
-
-Security
---------
-
-Bstrlib does not come with explicit security features outside of its fairly
-comprehensive error detection, coupled with its strict semantic support.  
-That is to say that certain common security problems, such as buffer overrun,
-constant overwrite, arbitrary truncation etc, are far less likely to happen 
-inadvertently.  Where it does help, Bstrlib maximizes its advantage by 
-providing developers a simple adoption path that lets them leave less secure
-string mechanisms behind.  The library will not leave developers wanting, so 
-they will be less likely to add new code using a less secure string library 
-to add functionality that might be missing from Bstrlib.
-
-That said there are a number of security ideas not addressed by Bstrlib:
-
-1. Race condition exploitation (i.e., verifying a string's contents, then 
-raising the privilege level and execute it as a shell command as two 
-non-atomic steps) is well beyond the scope of what Bstrlib can provide.  It 
-should be noted that MFC's built-in string mutex actually does not solve this 
-problem either -- it just removes immediate data corruption as a possible 
-outcome of such exploit attempts (it can be argued that this is worse, since 
-it will leave no trace of the exploitation).  In general race conditions have 
-to be dealt with by careful design and implementation; it cannot be assisted 
-by a string library.
-
-2. Any kind of access control or security attributes to prevent usage in 
-dangerous interfaces such as system().  Perl includes a "trust" attribute 
-which can be endowed upon strings that are intended to be passed to such 
-dangerous interfaces.  However, Perl's solution reflects its own limitations 
--- notably that it is not a strongly typed language.  In the example code for 
-Bstrlib, there is a module called taint.cpp.  It demonstrates how to write a 
-simple wrapper class for managing "untainted" or trusted strings using the 
-type system to prevent questionable mixing of ordinary untrusted strings with 
-untainted ones then passing them to dangerous interfaces.  In this way the 
-security correctness of the code reduces to auditing the direct usages of 
-dangerous interfaces or promotions of tainted strings to untainted ones.
-
-3. Encryption of string contents is way beyond the scope of Bstrlib.  
-Maintaining encrypted string contents in the futile hopes of thwarting things 
-like using system-level debuggers to examine sensitive string data is likely 
-to be a wasted effort (imagine a debugger that runs at a higher level than a 
-virtual processor where the application runs).  For more standard encryption 
-usages, since the bstring contents are simply binary blocks of data, this 
-should pose no problem for usage with other standard encryption libraries.
-
-Compatibility
--------------
-
-The Better String Library is known to compile and function correctly with the 
-following compilers:
-
-  - Microsoft Visual C++
-  - Watcom C/C++
-  - Intel's C/C++ compiler (Windows)
-  - The GNU C/C++ compiler (cygwin and Linux on PPC64)
-  - Borland C
-  - Turbo C
-
-Setting of configuration options should be unnecessary for these compilers
-(unless exceptions are being disabled or STLport has been added to WATCOM 
-C/C++).  Bstrlib has been developed with an emphasis on portability.  As such 
-porting it to other compilers should be straight forward.  This package 
-includes a porting guide (called porting.txt) which explains what issues may 
-exist for porting Bstrlib to different compilers and environments.
-
-ANSI issues
------------
-
-1. The function pointer types bNgetc and bNread have prototypes which are very
-similar to, but not exactly the same as fgetc and fread respectively.  
-Basically the FILE * parameter is replaced by void *.  The purpose of this
-was to allow one to create other functions with fgetc and fread like 
-semantics without being tied to ANSI C's file streaming mechanism.  I.e., one 
-could very easily adapt it to sockets, or simply reading a block of memory, 
-or procedurally generated strings (for fractal generation, for example.)
-
-The problem is that invoking the functions (bNgetc)fgetc and (bNread)fread is 
-not technically legal in ANSI C.  The reason being that the compiler is only 
-able to coerce the function pointers themselves into the target type, however 
-are unable to perform any cast (implicit or otherwise) on the parameters 
-passed once invoked.  I.e., if internally void * and FILE * need some kind of 
-mechanical coercion, the compiler will not properly perform this conversion 
-and thus lead to undefined behavior.
-
-Apparently a platform from Data General called "Eclipse" and another from 
-Tandem called "NonStop" have a different representation for pointers to bytes 
-and pointers to words, for example, where coercion via casting is necessary.  
-(Actual confirmation of the existence of such machines is hard to come by, so
-it is prudent to be skeptical about this information.)  However, this is not 
-an issue for any known contemporary platforms.  One may conclude that such 
-platforms are effectively apocryphal even if they do exist.
-
-To correctly work around this problem to the satisfaction of the ANSI 
-limitations, one needs to create wrapper functions for fgets and/or 
-fread with the prototypes of bNgetc and/or bNread respectively which performs 
-no other action other than to explicitely cast the void * parameter to a
-FILE *, and simply pass the remaining parameters straight to the function 
-pointer call.
-
-The wrappers themselves are trivial:
-
-    size_t freadWrap (void * buff, size_t esz, size_t eqty, void * parm) {
-        return fread (buff, esz, eqty, (FILE *) parm);
-    }
-
-    int fgetcWrap (void * parm) {
-        return fgetc ((FILE *) parm);
-    }
-
-These have not been supplied in bstrlib or bstraux to prevent unnecessary
-linking with file I/O functions.
-
-2. vsnprintf is not available on all compilers.  Because of this, the bformat
-and bformata functions (and format and formata methods) are not guaranteed to 
-work properly.  For those compilers that don't have vsnprintf, the 
-BSTRLIB_NOVSNP macro should be set before compiling bstrlib, and the format 
-functions/method will be disabled.
-
-The more recent ANSI C standards have specified the required inclusion of a 
-vsnprintf function.
-
-3. The bstrlib function names are not unique in the first 6 characters.  This
-is only an issue for older C compiler environments which do not store more 
-than 6 characters for function names.
-
-4. The bsafe module defines macros and function names which are part of the
-C library.  This simply overrides the definition as expected on all platforms
-tested, however it is not sanctioned by the ANSI standard.  This module is 
-clearly optional and should be omitted on platforms which disallow its 
-undefined semantics.
-
-In practice the real issue is that some compilers in some modes of operation 
-can/will inline these standard library functions on a module by module basis 
-as they appear in each.  The linker will thus have no opportunity to override
-the implementation of these functions for those cases.  This can lead to 
-inconsistent behaviour of the bsafe module on different platforms and 
-compilers.
-
-===============================================================================
-
-Comparison with Microsoft's CString class
------------------------------------------
-
-Although developed independently, CBStrings have very similar functionality to 
-Microsoft's CString class.  However, the bstring library has significant 
-advantages over CString:
-
-1. Bstrlib is a C-library as well as a C++ library (using the C++ wrapper).
-
-    - Thus it is compatible with more programming environments and 
-      available to a wider population of programmers.
-
-2. The internal structure of a bstring is considered exposed.
-
-    - A single contiguous block of data can be cut into read-only pieces by 
-      simply creating headers, without allocating additional memory to create 
-      reference copies of each of these sub-strings.
-    - In this way, using bstrings in a totally abstracted way becomes a choice
-      rather than an imposition.  Further this choice can be made differently
-      at different layers of applications that use it.
-
-3. Static declaration support precludes the need for constructor 
-   invocation.
-
-    - Allows for static declarations of constant strings that has no 
-      additional constructor overhead.
-
-4. Bstrlib is not attached to another library.
-
-    - Bstrlib is designed to be easily plugged into any other library 
-      collection, without dependencies on other libraries or paradigms (such 
-      as "MFC".)
-
-The bstring library also comes with a few additional functions that are not 
-available in the CString class:
-
-    - bsetstr
-    - bsplit
-    - bread
-    - breplace (this is different from CString::Replace())
-    - Writable indexed characters (for example a[i]='x')
-
-Interestingly, although Microsoft did implement mid$(), left$() and right$() 
-functional analogues (these are functions from GWBASIC) they seem to have
-forgotten that mid$() could be also used to write into the middle of a string.  
-This functionality exists in Bstrlib with the bsetstr() and breplace() 
-functions.
-
-Among the disadvantages of Bstrlib is that there is no special support for 
-localization or wide characters.  Such things are considered beyond the scope 
-of what bstrings are trying to deliver.  CString essentially supports the 
-older UCS-2 version of Unicode via widechar_t as an application-wide compile 
-time switch.
-
-CString's also use built-in mechanisms for ensuring thread safety under all
-situations.  While this makes writing thread safe code that much easier, this
-built-in safety feature has a price -- the inner loops of each CString method
-runs in its own critical section (grabbing and releasing a light weight mutex
-on every operation.)  The usual way to decrease the impact of a critical 
-section performance penalty is to amortize more operations per critical 
-section.  But since the implementation of CStrings is fixed as a one critical 
-section per-operation cost, there is no way to leverage this common 
-performance enhancing idea.
-
-The search facilities in Bstrlib are comparable to those in MFC's CString 
-class, though it is missing locale specific collation.  But because Bstrlib 
-is interoperable with C's char buffers, it will allow programmers to write 
-their own string searching mechanism (such as Boyer-Moore), or be able to 
-choose from a variety of available existing string searching libraries (such 
-as those for regular expressions) without difficulty.
-
-Microsoft used a very non-ANSI conforming trick in its implementation to
-allow printf() to use the "%s" specifier to output a CString correctly.  This
-can be convenient, but it is inherently not portable.  CBString requires an
-explicit cast, while bstring requires the data member to be dereferenced.  
-Microsoft's own documentation recommends casting, instead of relying on this
-feature.
-
-Comparison with C++'s std::string
----------------------------------
-
-This is the C++ language's standard STL based string class.
-
-1. There is no C implementation.
-2. The [] operator is not bounds checked.
-3. Missing a lot of useful functions like printf-like formatting.
-4. Some sub-standard std::string implementations (SGI) are necessarily unsafe 
-   to use with multithreading.
-5. Limited by STL's std::iostream which in turn is limited by ifstream which
-   can only take input from files.  (Compare to CBStream's API which can take
-   abstracted input.)
-6. Extremely uneven performance across implementations.
-
-Comparison with ISO C TR 24731 proposal
----------------------------------------
-
-Following the ISO C99 standard, Microsoft has proposed a group of C library 
-extensions which are supposedly "safer and more secure".  This proposal is
-expected to be adopted by the ISO C standard which follows C99.
-
-The proposal reveals itself to be very similar to Microsoft's "StrSafe" 
-library. The functions are basically the same as other standard C library 
-string functions except that destination parameters are paired with an 
-additional length parameter of type rsize_t.  rsize_t is the same as size_t, 
-however, the range is checked to make sure its between 1 and RSIZE_MAX.  Like 
-Bstrlib, the functions perform a "parameter check".  Unlike Bstrlib, when a 
-parameter check fails, rather than simply outputing accumulatable error 
-statuses, they call a user settable global error function handler, and upon 
-return of control performs no (additional) detrimental action.  The proposal 
-covers basic string functions as well as a few non-reenterable functions 
-(asctime, ctime, and strtok).
-
-1. Still based solely on char * buffers (and therefore strlen() and strcat()
-   is still O(n), and there are no faster streq() comparison functions.)
-2. No growable string semantics.
-3. Requires manual buffer length synchronization in the source code.
-4. No attempt to enhance functionality of the C library.
-5. Introduces a new error scenario (strings exceeding RSIZE_MAX length).
-
-The hope is that by exposing the buffer length requirements there will be 
-fewer buffer overrun errors.  However, the error modes are really just 
-transformed, rather than removed.  The real problem of buffer overflows is 
-that they all happen as a result of erroneous programming.  So forcing 
-programmers to manually deal with buffer limits, will make them more aware of 
-the problem but doesn't remove the possibility of erroneous programming.  So
-a programmer that erroneously mixes up the rsize_t parameters is no better off
-from a programmer that introduces potential buffer overflows through other 
-more typical lapses.  So at best this may reduce the rate of erroneous 
-programming, rather than making any attempt at removing failure modes.
-
-The error handler can discriminate between types of failures, but does not 
-take into account any callsite context.  So the problem is that the error is 
-going to be manifest in a piece of code, but there is no pointer to that 
-code.  It would seem that passing in the call site __FILE__, __LINE__ as 
-parameters would be very useful, but the API clearly doesn't support such a 
-thing (it would increase code bloat even more than the extra length 
-parameter does, and would require macro tricks to implement).
-
-The Bstrlib C API takes the position that error handling needs to be done at 
-the callsite, and just tries to make it as painless as possible.  Furthermore, 
-error modes are removed by supporting auto-growing strings and aliasing.  For 
-capturing errors in more central code fragments, Bstrlib's C++ API uses 
-exception handling extensively, which is superior to the leaf-only error 
-handler approach.
-
-Comparison with Managed String Library CERT proposal
-----------------------------------------------------
-
-The main webpage for the managed string library:
-http://www.cert.org/secure-coding/managedstring.html
-
-Robert Seacord at CERT has proposed a C string library that he calls the 
-"Managed String Library" for C. Like Bstrlib, it introduces a new type 
-which is called a managed string. The structure of a managed string 
-(string_m) is like a struct tagbstring but missing the length field.  This 
-internal structure is considered opaque. The length is, like the C standard 
-library, always computed on the fly by searching for a terminating NUL on 
-every operation that requires it. So it suffers from every performance 
-problem that the C standard library suffers from. Interoperating with C 
-string APIs (like printf, fopen, or anything else that takes a string 
-parameter) requires copying to additionally allocating buffers that have to 
-be manually freed -- this makes this library probably slower and more 
-cumbersome than any other string library in existence.
-
-The library gives a fully populated error status as the return value of every
-string function.  The hope is to be able to diagnose all problems 
-specifically from the return code alone.  Comparing this to Bstrlib, which 
-aways returns one consistent error message, might make it seem that Bstrlib 
-would be harder to debug; but this is not true.  With Bstrlib, if an error 
-occurs there is always enough information from just knowing there was an error
-and examining the parameters to deduce exactly what kind of error has 
-happened.  The managed string library thus gives up nested function calls 
-while achieving little benefit, while Bstrlib does not.
-
-One interesting feature that "managed strings" has is the idea of data 
-sanitization via character set whitelisting.  That is to say, a globally
-definable filter that makes any attempt to put invalid characters into strings 
-lead to an error and not modify the string.  The author gives the following 
-example:
-
-    // create valid char set
-    if (retValue = strcreate_m(&str1, "abc") ) {
-      fprintf(
-        stderr, 
-        "Error %d from strcreate_m.\n", 
-        retValue
-      );
-    }  
-    if (retValue = setcharset(str1)) {
-      fprintf(
-        stderr, 
-        "Error %d from  setcharset().\n", 
-        retValue
-      );
-    }
-    if (retValue = strcreate_m(&str1, "aabbccabc")) {
-      fprintf(
-        stderr, 
-        "Error %d from strcreate_m.\n", 
-        retValue
-      );
-    }
-    // create string with invalid char set
-    if (retValue = strcreate_m(&str1, "abbccdabc")) {
-      fprintf(
-        stderr, 
-        "Error %d from strcreate_m.\n", 
-        retValue
-      );
-    } 
-
-Which we can compare with a more Bstrlib way of doing things:
-
-    bstring bCreateWithFilter (const char * cstr, const_bstring filter) {
-      bstring b = bfromcstr (cstr);
-      if (BSTR_ERR != bninchr (b, filter) && NULL != b) {
-        fprintf (stderr, "Filter violation.\n");
-        bdestroy (b);
-        b = NULL;
-      }
-      return b;
-    }
-
-    struct tagbstring charFilter = bsStatic ("abc");
-    bstring str1 = bCreateWithFilter ("aabbccabc", &charFilter);
-    bstring str2 = bCreateWithFilter ("aabbccdabc", &charFilter);
-
-The first thing we should notice is that with the Bstrlib approach you can 
-have different filters for different strings if necessary.  Furthermore, 
-selecting a charset filter in the Managed String Library is uni-contextual. 
-That is to say, there can only be one such filter active for the entire 
-program, which means its usage is not well defined for intermediate library 
-usage (a library that uses it will interfere with user code that uses it, and 
-vice versa.)  It is also likely to be poorly defined in multi-threading 
-environments.
-
-There is also a question as to whether the data sanitization filter is checked
-on every operation, or just on creation operations.  Since the charset can be
-set arbitrarily at run time, it might be set *after* some managed strings have
-been created.  This would seem to imply that all functions should run this
-additional check every time if there is an attempt to enforce this.  This 
-would make things tremendously slow.  On the other hand, if it is assumed that
-only creates and other operations that take char *'s as input need be checked 
-because the charset was only supposed to be called once at and before any 
-other managed string was created, then one can see that its easy to cover 
-Bstrlib with equivalent functionality via a few wrapper calls such as the 
-example given above.
-
-And finally we have to question the value of sanitation in the first place.
-For example, for httpd servers, there is generally a requirement that the
-URLs parsed have some form that avoids undesirable translation to local file 
-system filenames or resources.  The problem is that the way URLs can be 
-encoded, it must be completely parsed and translated to know if it is using 
-certain invalid character combinations.  That is to say, merely filtering
-each character one at a time is not necessarily the right way to ensure that
-a string has safe contents.
-
-In the article that describes this proposal, it is claimed that it fairly 
-closely approximates the existing C API semantics.  On this point we should 
-compare this "closeness" with Bstrlib:
-
-                      Bstrlib                     Managed String Library
-                      -------                     ----------------------
-
-Pointer arithmetic    Segment arithmetic          N/A
-
-Use in C Std lib      ->data, or bdata{e}         getstr_m(x,*) ... free(x)
-
-String literals       bsStatic, bsStaticBlk       strcreate_m()
-
-Transparency          Complete                    None
-
-Its pretty clear that the semantic mapping from C strings to Bstrlib is fairly 
-straightforward, and that in general semantic capabilities are the same or
-superior in Bstrlib.  On the other hand the Managed String Library is either
-missing semantics or changes things fairly significantly.
-
-Comparison with Annexia's c2lib library
----------------------------------------
-
-This library is available at:
-http://www.annexia.org/freeware/c2lib
-
-1. Still based solely on char * buffers (and therefore strlen() and strcat()
-   is still O(n), and there are no faster streq() comparison functions.)
-   Their suggestion that alternatives which wrap the string data type (such as 
-   bstring does) imposes a difficulty in interoperating with the C langauge's
-   ordinary C string library is not founded.
-2. Introduction of memory (and vector?) abstractions imposes a learning
-   curve, and some kind of memory usage policy that is outside of the strings
-   themselves (and therefore must be maintained by the developer.)
-3. The API is massive, and filled with all sorts of trivial (pjoin) and
-   controvertial (pmatch -- regular expression are not sufficiently 
-   standardized, and there is a very large difference in performance between
-   compiled and non-compiled, REs) functions.  Bstrlib takes a decidely 
-   minimal approach -- none of the functionality in c2lib is difficult or
-   challenging to implement on top of Bstrlib (except the regex stuff, which
-   is going to be difficult, and controvertial no matter what.)
-4. Understanding why c2lib is the way it is pretty much requires a working 
-   knowledge of Perl.  bstrlib requires only knowledge of the C string library
-   while providing just a very select few worthwhile extras.
-5. It is attached to a lot of cruft like a matrix math library (that doesn't
-   include any functions for getting the determinant, eigenvectors, 
-   eigenvalues, the matrix inverse, test for singularity, test for 
-   orthogonality, a grahm schmit orthogonlization, LU decomposition ... I 
-   mean why bother?)
-
-Convincing a development house to use c2lib is likely quite difficult.  It
-introduces too much, while not being part of any kind of standards body.  The
-code must therefore be trusted, or maintained by those that use it.  While
-bstring offers nothing more on this front, since its so much smaller, covers 
-far less in terms of scope, and will typically improve string performance, 
-the barrier to usage should be much smaller.
-
-Comparison with stralloc/qmail
-------------------------------
-
-More information about this library can be found here:
-http://www.canonical.org/~kragen/stralloc.html or here:
-http://cr.yp.to/lib/stralloc.html
-
-1. Library is very very minimal.  A little too minimal.
-2. Untargetted source parameters are not declared const.
-3. Slightly different expected emphasis (like _cats function which takes an
-   ordinary C string char buffer as a parameter.)  Its clear that the 
-   remainder of the C string library is still required to perform more
-   useful string operations.
-
-The struct declaration for their string header is essentially the same as that
-for bstring.  But its clear that this was a quickly written hack whose goals
-are clearly a subset of what Bstrlib supplies.  For anyone who is served by
-stralloc, Bstrlib is complete substitute that just adds more functionality.
-
-stralloc actually uses the interesting policy that a NULL data pointer 
-indicates an empty string.  In this way, non-static empty strings can be
-declared without construction.  This advantage is minimal, since static empty
-bstrings can be declared inline without construction, and if the string needs
-to be written to it should be constructed from an empty string (or its first 
-initializer) in any event.
-
-wxString class
---------------
-
-This is the string class used in the wxWindows project.  A description of 
-wxString can be found here:
-http://www.wxwindows.org/manuals/2.4.2/wx368.htm#wxstring
-
-This C++ library is similar to CBString.  However, it is littered with 
-trivial functions (IsAscii, UpperCase, RemoveLast etc.)
-
-1. There is no C implementation.
-2. The memory management strategy is to allocate a bounded fixed amount of 
-   additional space on each resize, meaning that it does not have the 
-   log_2(n) property that Bstrlib has (it will thrash very easily, cause 
-   massive fragmentation in common heap implementations, and can easily be a 
-   common source of performance problems).
-3. The library uses a "copy on write" strategy, meaning that it has to deal 
-   with multithreading problems.
-
-Vstr
-----
-
-This is a highly orthogonal C string library with an emphasis on 
-networking/realtime programming.  It can be found here:
-http://www.and.org/vstr/
-
-1. The convoluted internal structure does not contain a '\0' char * compatible
-   buffer, so interoperability with the C library a non-starter.
-2. The API and implementation is very large (owing to its orthogonality) and
-   can lead to difficulty in understanding its exact functionality.
-3. An obvious dependency on gnu tools (confusing make configure step)
-4. Uses a reference counting system, meaning that it is not likely to be 
-   thread safe.
-
-The implementation has an extreme emphasis on performance for nontrivial 
-actions (adds, inserts and deletes are all constant or roughly O(#operations) 
-time) following the "zero copy" principle.  This trades off performance of 
-trivial functions (character access, char buffer access/coersion, alias 
-detection) which becomes significantly slower, as well as incremental 
-accumulative costs for its searching/parsing functions.  Whether or not Vstr 
-wins any particular performance benchmark will depend a lot on the benchmark, 
-but it should handily win on some, while losing dreadfully on others.
-
-The learning curve for Vstr is very steep, and it doesn't come with any 
-obvious way to build for Windows or other platforms without gnu tools.  At 
-least one mechanism (the iterator) introduces a new undefined scenario 
-(writing to a Vstr while iterating through it.)  Vstr has a very large 
-footprint, and is very ambitious in its total functionality.  Vstr has no C++ 
-API.
-
-Vstr usage requires context initialization via vstr_init() which must be run
-in a thread-local context.  Given the totally reference based architecture
-this means that sharing Vstrings across threads is not well defined, or at
-least not safe from race conditions.  This API is clearly geared to the older
-standard of fork() style multitasking in UNIX, and is not safely transportable
-to modern shared memory multithreading available in Linux and Windows.  There 
-is no portable external solution making the library thread safe (since it 
-requires a mutex around each Vstr context -- not each string.)
-
-In the documentation for this library, a big deal is made of its self hosted
-s(n)printf-like function.  This is an issue for older compilers that don't
-include vsnprintf(), but also an issue because Vstr has a slow conversion to
-'\0' terminated char * mechanism.  That is to say, using "%s" to format data 
-that originates from Vstr would be slow without some sort of native function 
-to do so.  Bstrlib sidesteps the issue by relying on what snprintf-like 
-functionality does exist and having a high performance conversion to a char * 
-compatible string so that "%s" can be used directly.
-
-Str Library
------------
-
-This is a fairly extensive string library, that includes full unicode support
-and targetted at the goal of out performing MFC and STL.  The architecture, 
-similarly to MFC's CStrings, is a copy on write reference counting mechanism.
-
-http://www.utilitycode.com/str/default.aspx
-
-1. Commercial.
-2. C++ only.
-
-This library, like Vstr, uses a ref counting system.  There is only so deeply
-I can analyze it, since I don't have a license for it.  However, performance 
-improvements over MFC's and STL, doesn't seem like a sufficient reason to 
-move your source base to it.  For example, in the future, Microsoft may 
-improve the performance CString.
-
-It should be pointed out that performance testing of Bstrlib has indicated 
-that its relative performance advantage versus MFC's CString and STL's 
-std::string is at least as high as that for the Str library.
-
-libmib astrings
----------------
-
-A handful of functional extensions to the C library that add dynamic string
-functionality.
-http://www.mibsoftware.com/libmib/astring/
-
-This package basically references strings through char ** pointers and assumes
-they are pointing to the top of an allocated heap entry (or NULL, in which 
-case memory will be newly allocated from the heap.)  So its still up to user
-to mix and match the older C string functions with these functions whenever
-pointer arithmetic is used (i.e., there is no leveraging of the type system
-to assert semantic differences between references and base strings as Bstrlib 
-does since no new types are introduced.)  Unlike Bstrlib, exact string length 
-meta data is not stored, thus requiring a strlen() call on *every* string 
-writing operation.  The library is very small, covering only a handful of C's
-functions.
-
-While this is better than nothing, it is clearly slower than even the 
-standard C library, less safe and less functional than Bstrlib.
-
-To explain the advantage of using libmib, their website shows an example of
-how dangerous C code:
-
-    char buf[256];
-    char *pszExtraPath = ";/usr/local/bin";
-
-    strcpy(buf,getenv("PATH")); /* oops! could overrun! */
-    strcat(buf,pszExtraPath); /* Could overrun as well! */
-
-    printf("Checking...%s\n",buf); /* Some printfs overrun too! */
-
-is avoided using libmib:
-
-    char *pasz = 0;      /* Must initialize to 0 */
-    char *paszOut = 0;
-    char *pszExtraPath = ";/usr/local/bin";
-
-    if (!astrcpy(&pasz,getenv("PATH"))) /* malloc error */ exit(-1);
-    if (!astrcat(&pasz,pszExtraPath)) /* malloc error */ exit(-1);
-	
-    /* Finally, a "limitless" printf! we can use */
-    asprintf(&paszOut,"Checking...%s\n",pasz);fputs(paszOut,stdout);
-
-    astrfree(&pasz); /* Can use free(pasz) also. */
-    astrfree(&paszOut);
-
-However, compare this to Bstrlib:
-
-    bstring b, out;
-
-    bcatcstr (b = bfromcstr (getenv ("PATH")), ";/usr/local/bin");
-    out = bformat ("Checking...%s\n", bdatae (b, "<Out of memory>"));
-    /* if (out && b) */ fputs (bdatae (out, "<Out of memory>"), stdout);
-    bdestroy (b);
-    bdestroy (out);
-
-Besides being shorter, we can see that error handling can be deferred right
-to the very end.  Also, unlike the above two versions, if getenv() returns 
-with NULL, the Bstrlib version will not exhibit undefined behavior. 
-Initialization starts with the relevant content rather than an extra 
-autoinitialization step.
-
-libclc
-------
-
-An attempt to add to the standard C library with a number of common useful
-functions, including additional string functions.
-http://libclc.sourceforge.net/
-
-1. Uses standard char * buffer, and adopts C 99's usage of "restrict" to pass
-   the responsibility to guard against aliasing to the programmer.
-2. Adds no safety or memory management whatsoever.
-3. Most of the supplied string functions are completely trivial.
-
-The goals of libclc and Bstrlib are clearly quite different.
-
-fireString
-----------
-
-http://firestuff.org/
-
-1. Uses standard char * buffer, and adopts C 99's usage of "restrict" to pass
-   the responsibility to guard against aliasing to the programmer.
-2. Mixes char * and length wrapped buffers (estr) functions, doubling the API
-   size, with safety limited to only half of the functions.
-
-Firestring was originally just a wrapper of char * functionality with extra
-length parameters.  However, it has been augmented with the inclusion of the 
-estr type which has similar functionality to stralloc.  But firestring does 
-not nearly cover the functional scope of Bstrlib.
-
-Safe C String Library
----------------------
-
-A library written for the purpose of increasing safety and power to C's string
-handling capabilities.
-http://www.zork.org/safestr/safestr.html
-
-1. While the safestr_* functions are safe in of themselves, interoperating 
-   with char * string has dangerous unsafe modes of operation.
-2. The architecture of safestr's causes the base pointer to change.  Thus,
-   its not practical/safe to store a safestr in multiple locations if any 
-   single instance can be manipulated.
-3. Dependent on an additional error handling library.
-4. Uses reference counting, meaning that it is either not thread safe or
-   slow and not portable.
-
-I think the idea of reallocating (and hence potentially changing) the base 
-pointer is a serious design flaw that is fatal to this architecture.  True 
-safety is obtained by having automatic handling of all common scenarios 
-without creating implicit constraints on the user.
-
-Because of its automatic temporary clean up system, it cannot use "const" 
-semantics on input arguments.  Interesting anomolies such as:
-
-    safestr_t s, t;
-    s = safestr_replace (t = SAFESTR_TEMP ("This is a test"),
-                         SAFESTR_TEMP (" "), SAFESTR_TEMP ("."));
-    /* t is now undefined. */
-
-are possible.  If one defines a function which takes a safestr_t as a 
-parameter, then the function would not know whether or not the safestr_t is 
-defined after it passes it to a safestr library function.  The author 
-recommended method for working around this problem is to examine the 
-attributes of the safestr_t within the function which is to modify any of
-its parameters and play games with its reference count.  I think, therefore,
-that the whole SAFESTR_TEMP idea is also fatally broken.
-
-The library implements immutability, optional non-resizability, and a "trust" 
-flag.  This trust flag is interesting, and suggests that applying any 
-arbitrary sequence of safestr_* function calls on any set of trusted strings 
-will result in a trusted string.  It seems to me, however, that if one wanted 
-to implement a trusted string semantic, one might do so by actually creating 
-a different *type* and only implement the subset of string functions that are 
-deemed safe (i.e., user input would be excluded, for example.)  This, in 
-essence, would allow the compiler to enforce trust propogation at compile 
-time rather than run time.  Non-resizability is also interesting, however, 
-it seems marginal (i.e., to want a string that cannot be resized, yet can be 
-modified and yet where a fixed sized buffer is undesirable.)
-
-===============================================================================
-
-Examples
---------
-
-    Dumping a line numbered file:
-
-    FILE * fp;
-    int i, ret;
-    struct bstrList * lines;
-    struct tagbstring prefix = bsStatic ("-> ");
-
-    if (NULL != (fp = fopen ("bstrlib.txt", "rb"))) {
-        bstring b = bread ((bNread) fread, fp);
-        fclose (fp);
-        if (NULL != (lines = bsplit (b, '\n'))) {
-            for (i=0; i < lines->qty; i++) {
-                binsert (lines->entry[i], 0, &prefix, '?');
-                printf ("%04d: %s\n", i, bdatae (lines->entry[i], "NULL"));
-            }
-            bstrListDestroy (lines);
-        }
-        bdestroy (b);
-    }
-
-For numerous other examples, see bstraux.c, bstraux.h and the example archive.
-
-===============================================================================
-
-License
--------
-
-The Better String Library is available under either the 3 clause BSD license 
-(see the accompanying license.txt) or the Gnu Public License version 2 (see 
-the accompanying gpl.txt) at the option of the user.
-
-===============================================================================
-
-Acknowledgements
-----------------
-
-The following individuals have made significant contributions to the design
-and testing of the Better String Library:
-
-Bjorn Augestad
-Clint Olsen
-Darryl Bleau
-Fabian Cenedese
-Graham Wideman
-Ignacio Burgueno
-International Business Machines Corporation
-Ira Mica
-John Kortink
-Manuel Woelker
-Marcel van Kervinck
-Michael Hsieh
-Richard A. Smith
-Simon Ekstrom
-Wayne Scott
-
-===============================================================================
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/license.txt b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/license.txt
deleted file mode 100644
index cf78a984cc..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2002-2008 Paul Hsieh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, 
-    this list of conditions and the following disclaimer. 
-
-    Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution. 
-
-    Neither the name of bstrlib nor the names of its contributors may be used 
-    to endorse or promote products derived from this software without 
-    specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/porting.txt b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/porting.txt
deleted file mode 100644
index 11d8d13130..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/porting.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-Better String library Porting Guide
------------------------------------
-
-by Paul Hsieh
-
-The bstring library is an attempt to provide improved string processing 
-functionality to the C and C++ language.  At the heart of the bstring library 
-is the management of "bstring"s which are a significant improvement over '\0'
-terminated char buffers.  See the accompanying documenation file bstrlib.txt
-for more information.
-
-===============================================================================
-
-Identifying the Compiler
-------------------------
-
-Bstrlib has been tested on the following compilers:
-
-    Microsoft Visual C++
-    Watcom C/C++ (32 bit flat)
-    Intel's C/C++ compiler (on Windows)
-    The GNU C/C++ compiler (on Windows/Linux on x86 and PPC64)
-    Borland C++
-    Turbo C
-
-There are slight differences in these compilers which requires slight 
-differences in the implementation of Bstrlib.  These are accomodated in the
-same sources using #ifdef/#if defined() on compiler specific macros.  To
-port Bstrlib to a new compiler not listed above, it is recommended that the
-same strategy be followed.  If you are unaware of the compiler specific 
-identifying preprocessor macro for your compiler you might find it here:
-
-http://predef.sourceforge.net/precomp.html
-
-Note that Intel C/C++ on Windows sets the Microsoft identifier: _MSC_VER.
-
-16-bit vs. 32-bit vs. 64-bit Systems
-------------------------------------
-
-Bstrlib has been architected to deal with strings of length between 0 and
-INT_MAX (inclusive).  Since the values of int are never higher than size_t
-there will be no issue here.  Note that on most 64-bit systems int is 32-bit.
-
-Dependency on The C-Library
----------------------------
-
-Bstrlib uses the functions memcpy, memmove, malloc, realloc, free and 
-vsnprintf.  Many free standing C compiler implementations that have a mode in 
-which the C library is not available will typically not include these 
-functions which will make porting Bstrlib to it onerous.  Bstrlib is not 
-designed for such bare bones compiler environments.  This usually includes 
-compilers that target ROM environments.
-
-Porting Issues
---------------
-
-Bstrlib has been written completely in ANSI/ISO C and ISO C++, however, there 
-are still a few porting issues.  These are described below.
-
-1. The vsnprintf () function.
-
-Unfortunately, the earlier ANSI/ISO C standards did not include this function.
-If the compiler of interest does not support this function then the 
-BSTRLIB_NOVSNP should be defined via something like:
-
-    #if !defined (BSTRLIB_VSNP_OK) && !defined (BSTRLIB_NOVSNP)
-    # if defined (__TURBOC__) || defined (__COMPILERVENDORSPECIFICMACRO__)
-    #  define BSTRLIB_NOVSNP
-    # endif
-    #endif
-
-which appears at the top of bstrlib.h.  Note that the bformat(a) functions 
-will not be declared or implemented if the BSTRLIB_NOVSNP macro is set.  If 
-the compiler has renamed vsnprintf() to some other named function, then 
-search for the definition of the exvsnprintf macro in bstrlib.c file and be 
-sure its defined appropriately:
-
-    #if defined (__COMPILERVENDORSPECIFICMACRO__)
-    # define exvsnprintf(r,b,n,f,a) {r=__compiler_specific_vsnprintf(b,n,f,a);}
-    #else
-    # define exvsnprintf(r,b,n,f,a) {r=vsnprintf(b,n,f,a);}
-    #endif
-
-Take notice of the return value being captured in the variable r.  It is 
-assumed that r exceeds n if and only if the underlying vsnprintf function has
-determined what the true maximal output length would be for output if the 
-buffer were large enough to hold it.  Non-modern implementations must output a
-lesser number (the macro can and should be modified to ensure this).
-
-2. Weak C++ compiler.
-
-C++ is a much more complicated language to implement than C.  This has lead 
-to varying quality of compiler implementations.  The weaknesses isolated in
-the initial ports are inclusion of the Standard Template Library, 
-std::iostream and exception handling.  By default it is assumed that the C++
-compiler supports all of these things correctly.  If your compiler does not
-support one or more of these define the corresponding macro:
-
-    BSTRLIB_CANNOT_USE_STL
-    BSTRLIB_CANNOT_USE_IOSTREAM
-    BSTRLIB_DOESNT_THROW_EXCEPTIONS
-
-The compiler specific detected macro should be defined at the top of 
-bstrwrap.h in the Configuration defines section.  Note that these disabling
-macros can be overrided with the associated enabling macro if a subsequent
-version of the compiler gains support.  (For example, its possible to rig
-up STLport to provide STL support for WATCOM C/C++, so -DBSTRLIB_CAN_USE_STL
-can be passed in as a compiler option.)
-
-3. The bsafe module, and reserved words.
-
-The bsafe module is in gross violation of the ANSI/ISO C standard in the 
-sense that it redefines what could be implemented as reserved words on a 
-given compiler.  The typical problem is that a compiler may inline some of the 
-functions and thus not be properly overridden by the definitions in the bsafe 
-module.  It is also possible that a compiler may prohibit the redefinitions in 
-the bsafe module.  Compiler specific action will be required to deal with 
-these situations.
-
-Platform Specific Files
------------------------
-
-The makefiles for the examples are basically setup of for particular 
-environments for each platform.  In general these makefiles are not portable
-and should be constructed as necessary from scratch for each platform.
-
-Testing a port
---------------
-
-To test that a port compiles correctly do the following:
-
-1. Build a sample project that includes the bstrlib, bstraux, bstrwrap, and 
-   bsafe modules.
-2. Compile bstest against the bstrlib module.
-3. Run bstest and ensure that 0 errors are reported.
-4. Compile test against the bstrlib and bstrwrap modules.
-5. Run test and ensure that 0 errors are reported.
-6. Compile each of the examples (except for the "re" example, which may be 
-   complicated and is not a real test of bstrlib and except for the mfcbench 
-   example which is Windows specific.)
-7. Run each of the examples.
-
-The builds must have 0 errors, and should have the absolute minimum number of
-warnings (in most cases can be reduced to 0.)  The result of execution should 
-be essentially identical on each platform.
-
-Performance
------------
-
-Different CPU and compilers have different capabilities in terms of 
-performance.  It is possible for Bstrlib to assume performance 
-characteristics that a platform doesn't have (since it was primarily 
-developed on just one platform).  The goal of Bstrlib is to provide very good 
-performance on all platforms regardless of this but without resorting to 
-extreme measures (such as using assembly language, or non-portable intrinsics 
-or library extensions.)
-
-There are two performance benchmarks that can be found in the example/ 
-directory.  They are: cbench.c and cppbench.cpp.  These are variations and 
-expansions of a benchmark for another string library.  They don't cover all
-string functionality, but do include the most basic functions which will be
-common in most string manipulation kernels.
-
-...............................................................................
-
-Feedback
---------
-
-In all cases, you may email issues found to the primary author of Bstrlib at 
-the email address: websnarf@users.sourceforge.net
-
-===============================================================================
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/security.txt b/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/security.txt
deleted file mode 100644
index 9761409f56..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/cbstring/security.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-Better String library Security Statement
-----------------------------------------
-
-by Paul Hsieh
-
-===============================================================================
-
-Introduction
-------------
-
-The Better String library (hereafter referred to as Bstrlib) is an attempt to 
-provide improved string processing functionality to the C and C++ languages.  
-At the heart of the Bstrlib is the management of "bstring"s which are a 
-significant improvement over '\0' terminated char buffers.  See the 
-accompanying documenation file bstrlib.txt for more information.
-
-DISCLAIMER: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT 
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Like any software, there is always a possibility of failure due to a flawed
-implementation.  Nevertheless a good faith effort has been made to minimize 
-such flaws in Bstrlib.  Also, use of Bstrlib by itself will not make an 
-application secure or free from implementation failures.  However, it is the
-author's conviction that use of Bstrlib can greatly facilitate the creation 
-of software meeting the highest possible standards of security.
-
-Part of the reason why this document has been created, is for the purpose of 
-security auditing, or the creation of further "Statements on Security" for 
-software that is created that uses Bstrlib.  An auditor may check the claims 
-below against Bstrlib, and use this as a basis for analysis of software which 
-uses Bstrlib.
-
-===============================================================================
-
-Statement on Security
----------------------
-
-This is a document intended to give consumers of the Better String Library
-who are interested in security an idea of where the Better String Library 
-stands on various security issues.  Any deviation observed in the actual 
-library itself from the descriptions below should be considered an 
-implementation error, not a design flaw.
-
-This statement is not an analytical proof of correctness or an outline of one
-but rather an assertion similar to a scientific claim or hypothesis.  By use,
-testing and open independent examination (otherwise known as scientific 
-falsifiability), the credibility of the claims made below can rise to the 
-level of an established theory.
-
-Common security issues:
-.......................
-
-1. Buffer Overflows
-
-The Bstrlib API allows the programmer a way to deal with strings without 
-having to deal with the buffers containing them.  Ordinary usage of the 
-Bstrlib API itself makes buffer overflows impossible.
-
-Furthermore, the Bstrlib API has a superset of basic string functionality as 
-compared to the C library's char * functions, C++'s std::string class and 
-Microsoft's MFC based CString class.  It also has abstracted mechanisms for 
-dealing with IO.  This is important as it gives developers a way of migrating 
-all their code from a functionality point of view.
-
-2. Memory size overflow/wrap around attack
-
-Bstrlib is, by design, impervious to memory size overflow attacks.  The 
-reason is it is resiliant to length overflows is that bstring lengths are 
-bounded above by INT_MAX, instead of ~(size_t)0.  So length addition 
-overflows cause a wrap around of the integer value making them negative 
-causing balloc() to fail before an erroneous operation can occurr.  Attempted 
-conversions of char * strings which may have lengths greater than INT_MAX are 
-detected and the conversion is aborted.
-
-It is unknown if this property holds on machines that don't represent 
-integers as 2s complement.  It is recommended that Bstrlib be carefully 
-auditted by anyone using a system which is not 2s complement based.
-
-3. Constant string protection
-
-Bstrlib implements runtime enforced constant and read-only string semantics.
-I.e., bstrings which are declared as constant via the bsStatic() macro cannot
-be modified or deallocated directly through the Bstrlib API, and this cannot
-be subverted by casting or other type coercion.  This is independent of the
-use of the const_bstring data type.
-
-The Bstrlib C API uses the type const_bstring to specify bstring parameters 
-whose contents do not change.  Although the C language cannot enforce this,
-this is nevertheless guaranteed by the implementation of the Bstrlib library
-of C functions.  The C++ API enforces the const attribute on CBString types
-correctly.
-
-4. Aliased bstring support
-
-Bstrlib detects and supports aliased parameter management throughout the API. 
-The kind of aliasing that is allowed is the one where pointers of the same
-basic type may be pointing to overlapping objects (this is the assumption the 
-ANSI C99 specification makes.)  Each function behaves as if all read-only 
-parameters were copied to temporaries which are used in their stead before 
-the function is enacted (it rarely actually does this).  No function in the 
-Bstrlib uses the "restrict" parameter attribute from the ANSI C99 
-specification.
-
-5. Information leaking
-
-In bstraux.h, using the semantically equivalent macros bSecureDestroy() and 
-bSecureWriteProtect() in place of bdestroy() and bwriteprotect() respectively 
-will ensure that stale data does not linger in the heap's free space after 
-strings have been released back to memory.  Created bstrings or CBStrings
-are not linked to anything external to themselves, and thus cannot expose 
-deterministic data leaking.  If a bstring is resized, the preimage may exist
-as a copy that is released to the heap.  Thus for sensitive data, the bstring 
-should be sufficiently presized before manipulated so that it is not resized. 
-bSecureInput() has been supplied in bstraux.c, which can be used to obtain 
-input securely without any risk of leaving any part of the input image in the 
-heap except for the allocated bstring that is returned.
-
-6. Memory leaking
-
-Bstrlib can be built using memdbg.h enabled via the BSTRLIB_MEMORY_DEBUG 
-macro.  User generated definitions for malloc, realloc and free can then be
-supplied which can implement special strategies for memory corruption 
-detection or memory leaking.  Otherwise, bstrlib does not do anything out of 
-the ordinary to attempt to deal with the standard problem of memory leaking 
-(i.e., losing references to allocated memory) when programming in the C and 
-C++ languages.  However, it does not compound the problem any more than exists 
-either, as it doesn't have any intrinsic inescapable leaks in it.  Bstrlib 
-does not preclude the use of automatic garbage collection mechanisms such as 
-the Boehm garbage collector.
-
-7. Encryption
-
-Bstrlib does not present any built-in encryption mechanism.  However, it 
-supports full binary contents in its data buffers, so any standard block 
-based encryption mechanism can make direct use of bstrings/CBStrings for 
-buffer management.
-
-8. Double freeing
-
-Freeing a pointer that is already free is an extremely rare, but nevertheless 
-a potentially ruthlessly corrupting operation (its possible to cause Win 98 to
-reboot, by calling free mulitiple times on already freed data using the WATCOM
-CRT.)  Bstrlib invalidates the bstring header data before freeing, so that in
-many cases a double free will be detected and an error will be reported 
-(though this behaviour is not guaranteed and should not be relied on).
-
-Using bstrFree pervasively (instead of bdestroy) can lead to somewhat 
-improved invalid free avoidance (it is completely safe whenever bstring
-instances are only stored in unique variables).  For example:
-
-    struct tagbstring hw = bsStatic ("Hello, world");
-    bstring cpHw = bstrcpy (&hw);
-
-    #ifdef NOT_QUITE_AS_SAFE
-        bdestroy (cpHw); /* Never fail */
-        bdestroy (cpHw); /* Error sometimes detected at runtime */
-        bdestroy (&hw);  /* Error detected at run time */
-    #else
-        bstrFree (cpHw); /* Never fail */
-        bstrFree (cpHw); /* Will do nothing */
-        bstrFree (&hw);  /* Will lead to a compile time error */
-    #endif
-
-9. Resource based denial of service
-
-bSecureInput() has been supplied in bstraux.c.  It has an optional upper limit
-for input length.  But unlike fgets(), it is also easily determined if the 
-buffer has been truncated early.  In this way, a program can set an upper limit
-on input sizes while still allowing for implementing context specific 
-truncation semantics (i.e., does the program consume but dump the extra 
-input, or does it consume it in later inputs?)
-
-10. Mixing char *'s and bstrings
-
-The bstring and char * representations are not identical.  So there is a risk
-when converting back and forth that data may lost.  Essentially bstrings can
-contain '\0' as a valid non-terminating character, while char * strings 
-cannot and in fact must use the character as a terminator.  The risk of data 
-loss is very low, since:
-
-  A) the simple method of only using bstrings in a char * semantically 
-     compatible way is both easy to achieve and pervasively supported.
-  B) obtaining '\0' content in a string is either deliberate or indicative
-     of another, likely more serious problem in the code.
-  C) the library comes with various functions which deal with this issue
-     (namely: bfromcstr(), bstr2cstr (), and bSetCstrChar ())
-
-Marginal security issues:
-.........................
-
-11. 8-bit versus 9-bit portability
-
-Bstrlib uses CHAR_BIT and other limits.h constants to the maximum extent 
-possible to avoid portability problems.  However, Bstrlib has not been tested 
-on any system that does not represent char as 8-bits.  So whether or not it 
-works on 9-bit systems is an open question.  It is recommended that Bstrlib be 
-carefully auditted by anyone using a system in which CHAR_BIT is not 8.
-
-12. EBCDIC/ASCII/UTF-8 data representation attacks.
-
-Bstrlib uses ctype.h functions to ensure that it remains portable to non-
-ASCII systems.  It also checks range to make sure it is well defined even for
-data that ANSI does not define for the ctype functions.
-
-Obscure issues:
-...............
-
-13. Data attributes
-
-There is no support for a Perl-like "taint" attribute, however, an example of 
-how to do this using C++'s type system is given as an example.
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/decode.c b/Code/Tools/HLSLCrossCompilerMETAL/src/decode.c
deleted file mode 100644
index ce19d481d7..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/decode.c
+++ /dev/null
@@ -1,1750 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/tokens.h"
-#include "internal_includes/structs.h"
-#include "internal_includes/decode.h"
-#include "stdlib.h"
-#include "stdio.h"
-#include "internal_includes/reflect.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "internal_includes/toGLSLOperand.h"
-
-#define FOURCC(a, b, c, d) ((uint32_t)(uint8_t)(a) | ((uint32_t)(uint8_t)(b) << 8) | ((uint32_t)(uint8_t)(c) << 16) | ((uint32_t)(uint8_t)(d) << 24))
-enum
-{
-    FOURCC_DXBC = FOURCC('D', 'X', 'B', 'C')
-};                                               //DirectX byte code
-enum
-{
-    FOURCC_SHDR = FOURCC('S', 'H', 'D', 'R')
-};                                               //Shader model 4 code
-enum
-{
-    FOURCC_SHEX = FOURCC('S', 'H', 'E', 'X')
-};                                               //Shader model 5 code
-enum
-{
-    FOURCC_RDEF = FOURCC('R', 'D', 'E', 'F')
-};                                               //Resource definition (e.g. constant buffers)
-enum
-{
-    FOURCC_ISGN = FOURCC('I', 'S', 'G', 'N')
-};                                               //Input signature
-enum
-{
-    FOURCC_IFCE = FOURCC('I', 'F', 'C', 'E')
-};                                               //Interface (for dynamic linking)
-enum
-{
-    FOURCC_OSGN = FOURCC('O', 'S', 'G', 'N')
-};                                               //Output signature
-enum
-{
-    FOURCC_PSGN = FOURCC('P', 'C', 'S', 'G')
-};                                               //Patch-constant signature
-enum
-{
-    FOURCC_FX10 = FOURCC('F', 'X', '1', '0')
-};                                               //Effects 10 Binary data
-
-enum
-{
-    FOURCC_ISG1 = FOURCC('I', 'S', 'G', '1')
-};                                               //Input signature with Stream and MinPrecision
-enum
-{
-    FOURCC_OSG1 = FOURCC('O', 'S', 'G', '1')
-};                                               //Output signature with Stream and MinPrecision
-enum
-{
-    FOURCC_OSG5 = FOURCC('O', 'S', 'G', '5')
-};                                               //Output signature with Stream
-
-typedef struct DXBCContainerHeaderTAG
-{
-    unsigned fourcc;
-    uint32_t unk[4];
-    uint32_t one;
-    uint32_t totalSize;
-    uint32_t chunkCount;
-} DXBCContainerHeader;
-
-typedef struct DXBCChunkHeaderTAG
-{
-    unsigned fourcc;
-    unsigned size;
-} DXBCChunkHeader;
-
-#ifdef _DEBUG
-static uint64_t operandID = 0;
-static uint64_t instructionID = 0;
-#endif
-
-#if defined(_WIN32)
-#define osSprintf(dest, size, src) sprintf_s(dest, size, src)
-#else
-#define osSprintf(dest, size, src) sprintf(dest, src)
-#endif
-
-void DecodeNameToken(const uint32_t* pui32NameToken, Operand* psOperand)
-{
-    const size_t MAX_BUFFER_SIZE = sizeof(psOperand->pszSpecialName);
-    psOperand->eSpecialName = DecodeOperandSpecialName(*pui32NameToken);
-    switch (psOperand->eSpecialName)
-    {
-    case NAME_UNDEFINED:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "undefined");
-        break;
-    }
-    case NAME_POSITION:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "position");
-        break;
-    }
-    case NAME_CLIP_DISTANCE:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "clipDistance");
-        break;
-    }
-    case NAME_CULL_DISTANCE:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "cullDistance");
-        break;
-    }
-    case NAME_RENDER_TARGET_ARRAY_INDEX:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "renderTargetArrayIndex");
-        break;
-    }
-    case NAME_VIEWPORT_ARRAY_INDEX:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "viewportArrayIndex");
-        break;
-    }
-    case NAME_VERTEX_ID:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "vertexID");
-        break;
-    }
-    case NAME_PRIMITIVE_ID:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "primitiveID");
-        break;
-    }
-    case NAME_INSTANCE_ID:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "instanceID");
-        break;
-    }
-    case NAME_IS_FRONT_FACE:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "isFrontFace");
-        break;
-    }
-    case NAME_SAMPLE_INDEX:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "sampleIndex");
-        break;
-    }
-    //For the quadrilateral domain, there are 6 factors (4 sides, 2 inner).
-    case NAME_FINAL_QUAD_U_EQ_0_EDGE_TESSFACTOR:
-    case NAME_FINAL_QUAD_V_EQ_0_EDGE_TESSFACTOR:
-    case NAME_FINAL_QUAD_U_EQ_1_EDGE_TESSFACTOR:
-    case NAME_FINAL_QUAD_V_EQ_1_EDGE_TESSFACTOR:
-    case NAME_FINAL_QUAD_U_INSIDE_TESSFACTOR:
-    case NAME_FINAL_QUAD_V_INSIDE_TESSFACTOR:
-
-    //For the triangular domain, there are 4 factors (3 sides, 1 inner)
-    case NAME_FINAL_TRI_U_EQ_0_EDGE_TESSFACTOR:
-    case NAME_FINAL_TRI_V_EQ_0_EDGE_TESSFACTOR:
-    case NAME_FINAL_TRI_W_EQ_0_EDGE_TESSFACTOR:
-    case NAME_FINAL_TRI_INSIDE_TESSFACTOR:
-
-    //For the isoline domain, there are 2 factors (detail and density).
-    case NAME_FINAL_LINE_DETAIL_TESSFACTOR:
-    case NAME_FINAL_LINE_DENSITY_TESSFACTOR:
-    {
-        osSprintf(psOperand->pszSpecialName, MAX_BUFFER_SIZE, "tessFactor");
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    return;
-}
-
-// Find the declaration of the texture described by psTextureOperand and
-// mark it as a shadow type. (e.g. accessed via sampler2DShadow rather than sampler2D)
-void MarkTextureAsShadow(ShaderInfo* psShaderInfo, Declaration* psDeclList, const uint32_t ui32DeclCount, const Operand* psTextureOperand)
-{
-    (void)psShaderInfo;
-
-    Declaration* psDecl = psDeclList;
-    uint32_t i;
-
-    ASSERT(psTextureOperand->eType == OPERAND_TYPE_RESOURCE);
-
-    for (i = 0; i < ui32DeclCount; ++i)
-    {
-        if (psDecl->eOpcode == OPCODE_DCL_RESOURCE)
-        {
-            if (psDecl->asOperands[0].eType == OPERAND_TYPE_RESOURCE &&
-                psDecl->asOperands[0].ui32RegisterNumber == psTextureOperand->ui32RegisterNumber)
-            {
-                psDecl->ui32IsShadowTex = 1;
-                break;
-            }
-        }
-        psDecl++;
-    }
-}
-
-// Search through the list. Return the index if the value is found, return 0xffffffff if not found
-static uint32_t Find(uint32_t* psList, uint32_t ui32Count, uint32_t ui32Value)
-{
-    uint32_t i;
-    for (i = 0; i < ui32Count; i++)
-    {
-        if (psList[i] == ui32Value)
-        {
-            return i;
-        }
-    }
-    return 0xffffffff;
-}
-
-void MarkTextureSamplerPair(ShaderInfo* psShaderInfo, Declaration* psDeclList, const uint32_t ui32DeclCount, const Operand* psTextureOperand, const Operand* psSamplerOperand, TextureSamplerInfo* psTextureSamplerInfo)
-{
-    Declaration* psDecl = psDeclList;
-    uint32_t i;
-    bstring combinedname;
-    const char* cstr;
-
-    ASSERT(psTextureOperand->eType == OPERAND_TYPE_RESOURCE);
-    ASSERT(psSamplerOperand->eType == OPERAND_TYPE_SAMPLER);
-
-    for (i = 0; i < ui32DeclCount; ++i)
-    {
-        if (psDecl->eOpcode == OPCODE_DCL_RESOURCE)
-        {
-            if (psDecl->asOperands[0].eType == OPERAND_TYPE_RESOURCE &&
-                psDecl->asOperands[0].ui32RegisterNumber == psTextureOperand->ui32RegisterNumber)
-            {
-                // psDecl is the texture resource referenced by psTextureOperand
-                ASSERT(psDecl->ui32SamplerUsedCount < MAX_TEXTURE_SAMPLERS_PAIRS);
-
-                // add psSamplerOperand->ui32RegisterNumber to list of samplers that use this texture
-                if (Find(psDecl->ui32SamplerUsed, psDecl->ui32SamplerUsedCount, psSamplerOperand->ui32RegisterNumber) == 0xffffffff)
-                {
-                    psDecl->ui32SamplerUsed[psDecl->ui32SamplerUsedCount++] = psSamplerOperand->ui32RegisterNumber;
-
-                    // Record the texturename_X_samplername string in the TextureSamplerPair array that we return to the client
-                    ASSERT(psTextureSamplerInfo->ui32NumTextureSamplerPairs < MAX_RESOURCE_BINDINGS);
-                    combinedname = TextureSamplerName(psShaderInfo, psTextureOperand->ui32RegisterNumber, psSamplerOperand->ui32RegisterNumber, psDecl->ui32IsShadowTex);
-                    cstr = bstr2cstr(combinedname, '\0');
-                    bdestroy(combinedname);
-                    strcpy(psTextureSamplerInfo->aTextureSamplerPair[psTextureSamplerInfo->ui32NumTextureSamplerPairs++].Name, cstr);
-                }
-                break;
-            }
-        }
-        psDecl++;
-    }
-}
-
-uint32_t DecodeOperand (const uint32_t* pui32Tokens, Operand* psOperand)
-{
-    int i;
-    uint32_t ui32NumTokens = 1;
-    OPERAND_NUM_COMPONENTS eNumComponents;
-
-#ifdef _DEBUG
-    psOperand->id = operandID++;
-#endif
-
-    //Some defaults
-    psOperand->iWriteMaskEnabled = 1;
-    psOperand->iGSInput = 0;
-    psOperand->aeDataType[0] = SVT_FLOAT;
-    psOperand->aeDataType[1] = SVT_FLOAT;
-    psOperand->aeDataType[2] = SVT_FLOAT;
-    psOperand->aeDataType[3] = SVT_FLOAT;
-
-    psOperand->iExtended = DecodeIsOperandExtended(*pui32Tokens);
-
-
-    psOperand->eModifier = OPERAND_MODIFIER_NONE;
-    psOperand->psSubOperand[0] = 0;
-    psOperand->psSubOperand[1] = 0;
-    psOperand->psSubOperand[2] = 0;
-
-    psOperand->eMinPrecision = OPERAND_MIN_PRECISION_DEFAULT;
-
-    /* Check if this instruction is extended.  If it is,
-     * we need to print the information first */
-    if (psOperand->iExtended)
-    {
-        /* OperandToken1 is the second token */
-        ui32NumTokens++;
-
-        if (DecodeExtendedOperandType(pui32Tokens[1]) == EXTENDED_OPERAND_MODIFIER)
-        {
-            psOperand->eModifier = DecodeExtendedOperandModifier(pui32Tokens[1]);
-            psOperand->eMinPrecision = DecodeOperandMinPrecision(pui32Tokens[1]);
-        }
-    }
-
-    psOperand->iIndexDims = DecodeOperandIndexDimension(*pui32Tokens);
-    psOperand->eType = DecodeOperandType(*pui32Tokens);
-
-    psOperand->ui32RegisterNumber = 0;
-
-    eNumComponents = DecodeOperandNumComponents(*pui32Tokens);
-
-    if (psOperand->eType == OPERAND_TYPE_INPUT_GS_INSTANCE_ID)
-    {
-        eNumComponents = OPERAND_1_COMPONENT;
-        psOperand->aeDataType[0] = SVT_UINT;
-    }
-
-    switch (eNumComponents)
-    {
-    case OPERAND_1_COMPONENT:
-    {
-        psOperand->iNumComponents = 1;
-        break;
-    }
-    case OPERAND_4_COMPONENT:
-    {
-        psOperand->iNumComponents = 4;
-        break;
-    }
-    default:
-    {
-        psOperand->iNumComponents = 0;
-        break;
-    }
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        psOperand->eSelMode = DecodeOperand4CompSelMode(*pui32Tokens);
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            psOperand->ui32CompMask = DecodeOperand4CompMask(*pui32Tokens);
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            psOperand->ui32Swizzle = DecodeOperand4CompSwizzle(*pui32Tokens);
-
-            if (psOperand->ui32Swizzle != NO_SWIZZLE)
-            {
-                psOperand->aui32Swizzle[0] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 0);
-                psOperand->aui32Swizzle[1] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 1);
-                psOperand->aui32Swizzle[2] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 2);
-                psOperand->aui32Swizzle[3] = DecodeOperand4CompSwizzleSource(*pui32Tokens, 3);
-            }
-            else
-            {
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_X;
-                psOperand->aui32Swizzle[1] = OPERAND_4_COMPONENT_Y;
-                psOperand->aui32Swizzle[2] = OPERAND_4_COMPONENT_Z;
-                psOperand->aui32Swizzle[3] = OPERAND_4_COMPONENT_W;
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            psOperand->aui32Swizzle[0] = DecodeOperand4CompSel1(*pui32Tokens);
-        }
-    }
-
-    //Set externally to this function based on the instruction opcode.
-    psOperand->iIntegerImmediate = 0;
-
-    if (psOperand->eType == OPERAND_TYPE_IMMEDIATE32)
-    {
-        for (i = 0; i < psOperand->iNumComponents; ++i)
-        {
-            psOperand->afImmediates[i] = *((float*)(&pui32Tokens[ui32NumTokens]));
-            ui32NumTokens++;
-        }
-    }
-    else
-    if (psOperand->eType == OPERAND_TYPE_IMMEDIATE64)
-    {
-        for (i = 0; i < psOperand->iNumComponents; ++i)
-        {
-            psOperand->adImmediates[i] = *((double*)(&pui32Tokens[ui32NumTokens]));
-            ui32NumTokens += 2;
-        }
-    }
-
-    if (psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL ||
-        psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL ||
-        psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH)
-    {
-        psOperand->ui32RegisterNumber = -1;
-        psOperand->ui32CompMask = -1;
-    }
-
-    for (i = 0; i < psOperand->iIndexDims; ++i)
-    {
-        OPERAND_INDEX_REPRESENTATION eRep = DecodeOperandIndexRepresentation(i, *pui32Tokens);
-
-        psOperand->eIndexRep[i] = eRep;
-
-        psOperand->aui32ArraySizes[i] = 0;
-        psOperand->ui32RegisterNumber = 0;
-
-        switch (eRep)
-        {
-        case OPERAND_INDEX_IMMEDIATE32:
-        {
-            psOperand->ui32RegisterNumber = *(pui32Tokens + ui32NumTokens);
-            psOperand->aui32ArraySizes[i] = psOperand->ui32RegisterNumber;
-            break;
-        }
-        case OPERAND_INDEX_RELATIVE:
-        {
-            psOperand->psSubOperand[i] = hlslcc_malloc(sizeof(Operand));
-            DecodeOperand(pui32Tokens + ui32NumTokens, psOperand->psSubOperand[i]);
-
-            ui32NumTokens++;
-            break;
-        }
-        case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-        {
-            psOperand->ui32RegisterNumber = *(pui32Tokens + ui32NumTokens);
-            psOperand->aui32ArraySizes[i] = psOperand->ui32RegisterNumber;
-
-            ui32NumTokens++;
-
-            psOperand->psSubOperand[i] = hlslcc_malloc(sizeof(Operand));
-            DecodeOperand(pui32Tokens + ui32NumTokens, psOperand->psSubOperand[i]);
-
-            ui32NumTokens++;
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-        }
-
-        ui32NumTokens++;
-    }
-
-    psOperand->pszSpecialName[0] = '\0';
-
-    return ui32NumTokens;
-}
-
-const uint32_t* DecodeDeclaration(ShaderData* psShader, const uint32_t* pui32Token, Declaration* psDecl)
-{
-    uint32_t ui32TokenLength = DecodeInstructionLength(*pui32Token);
-    const uint32_t bExtended = DecodeIsOpcodeExtended(*pui32Token);
-    const OPCODE_TYPE eOpcode = DecodeOpcodeType(*pui32Token);
-    uint32_t ui32OperandOffset = 1;
-
-    if (eOpcode < NUM_OPCODES && eOpcode >= 0)
-    {
-        psShader->aiOpcodeUsed[eOpcode] = 1;
-    }
-
-    psDecl->eOpcode = eOpcode;
-
-    psDecl->ui32IsShadowTex = 0;
-
-    if (bExtended)
-    {
-        ui32OperandOffset = 2;
-    }
-
-    switch (eOpcode)
-    {
-    case OPCODE_DCL_RESOURCE:     // DCL* opcodes have
-    {
-        psDecl->value.eResourceDimension = DecodeResourceDimension(*pui32Token);
-        psDecl->ui32NumOperands = 1;
-        psDecl->ui32SamplerUsedCount = 0;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_CONSTANT_BUFFER:     // custom operand formats.
-    {
-        psDecl->value.eCBAccessPattern = DecodeConstantBufferAccessPattern(*pui32Token);
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_SAMPLER:
-    {
-        ResourceBinding* psBinding = 0;
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-        if (psDecl->asOperands[0].eType == OPERAND_TYPE_SAMPLER &&
-            GetResourceFromBindingPoint(RGROUP_SAMPLER, psDecl->asOperands[0].ui32RegisterNumber, &psShader->sInfo, &psBinding))
-        {
-            psDecl->bIsComparisonSampler = psBinding->ui32Flags & SHADER_INPUT_FLAG_COMPARISON_SAMPLER;
-        }
-        break;
-    }
-    case OPCODE_DCL_INDEX_RANGE:
-    {
-        psDecl->ui32NumOperands = 1;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        psDecl->value.ui32IndexRange = pui32Token[ui32OperandOffset];
-
-        if (psDecl->asOperands[0].eType == OPERAND_TYPE_INPUT)
-        {
-            uint32_t i;
-            const uint32_t indexRange = psDecl->value.ui32IndexRange;
-            const uint32_t reg = psDecl->asOperands[0].ui32RegisterNumber;
-
-            psShader->aIndexedInput[reg] = indexRange;
-            psShader->aIndexedInputParents[reg] = reg;
-
-            //-1 means don't declare this input because it falls in
-            //the range of an already declared array.
-            for (i = reg + 1; i < reg + indexRange; ++i)
-            {
-                psShader->aIndexedInput[i] = -1;
-                psShader->aIndexedInputParents[i] = reg;
-            }
-        }
-
-        if (psDecl->asOperands[0].eType == OPERAND_TYPE_OUTPUT)
-        {
-            psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->value.ui32IndexRange;
-        }
-        break;
-    }
-    case OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
-    {
-        psDecl->value.eOutputPrimitiveTopology = DecodeGSOutputPrimitiveTopology(*pui32Token);
-        break;
-    }
-    case OPCODE_DCL_GS_INPUT_PRIMITIVE:
-    {
-        psDecl->value.eInputPrimitive = DecodeGSInputPrimitive(*pui32Token);
-        break;
-    }
-    case OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
-    {
-        psDecl->value.ui32MaxOutputVertexCount = pui32Token[1];
-        break;
-    }
-    case OPCODE_DCL_TESS_PARTITIONING:
-    {
-        psDecl->value.eTessPartitioning = DecodeTessPartitioning(*pui32Token);
-        break;
-    }
-    case OPCODE_DCL_TESS_DOMAIN:
-    {
-        psDecl->value.eTessDomain = DecodeTessDomain(*pui32Token);
-        break;
-    }
-    case OPCODE_DCL_TESS_OUTPUT_PRIMITIVE:
-    {
-        psDecl->value.eTessOutPrim = DecodeTessOutPrim(*pui32Token);
-        break;
-    }
-    case OPCODE_DCL_THREAD_GROUP:
-    {
-        psDecl->value.aui32WorkGroupSize[0] = pui32Token[1];
-        psDecl->value.aui32WorkGroupSize[1] = pui32Token[2];
-        psDecl->value.aui32WorkGroupSize[2] = pui32Token[3];
-        break;
-    }
-    case OPCODE_DCL_INPUT:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_INPUT_SIV:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        if (psShader->eShaderType == PIXEL_SHADER)
-        {
-            psDecl->value.eInterpolation = DecodeInterpolationMode(*pui32Token);
-        }
-        break;
-    }
-    case OPCODE_DCL_INPUT_PS:
-    {
-        psDecl->ui32NumOperands = 1;
-        psDecl->value.eInterpolation = DecodeInterpolationMode(*pui32Token);
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_INPUT_SGV:
-    case OPCODE_DCL_INPUT_PS_SGV:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        DecodeNameToken(pui32Token + 3, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_INPUT_PS_SIV:
-    {
-        psDecl->ui32NumOperands = 1;
-        psDecl->value.eInterpolation = DecodeInterpolationMode(*pui32Token);
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        DecodeNameToken(pui32Token + 3, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_OUTPUT:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_OUTPUT_SGV:
-    {
-        break;
-    }
-    case OPCODE_DCL_OUTPUT_SIV:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        DecodeNameToken(pui32Token + 3, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_TEMPS:
-    {
-        psDecl->value.ui32NumTemps = *(pui32Token + ui32OperandOffset);
-        break;
-    }
-    case OPCODE_DCL_INDEXABLE_TEMP:
-    {
-        psDecl->sIdxTemp.ui32RegIndex = *(pui32Token + ui32OperandOffset);
-        psDecl->sIdxTemp.ui32RegCount = *(pui32Token + ui32OperandOffset + 1);
-        psDecl->sIdxTemp.ui32RegComponentSize = *(pui32Token + ui32OperandOffset + 2);
-        break;
-    }
-    case OPCODE_DCL_GLOBAL_FLAGS:
-    {
-        psDecl->value.ui32GlobalFlags = DecodeGlobalFlags(*pui32Token);
-        break;
-    }
-    case OPCODE_DCL_INTERFACE:
-    {
-        uint32_t func = 0, numClassesImplementingThisInterface, arrayLen, interfaceID;
-        interfaceID = pui32Token[ui32OperandOffset];
-        ui32OperandOffset++;
-        psDecl->ui32TableLength = pui32Token[ui32OperandOffset];
-        ui32OperandOffset++;
-
-        numClassesImplementingThisInterface = DecodeInterfaceTableLength(*(pui32Token + ui32OperandOffset));
-        arrayLen = DecodeInterfaceArrayLength(*(pui32Token + ui32OperandOffset));
-
-        ui32OperandOffset++;
-
-        psDecl->value.interface.ui32InterfaceID = interfaceID;
-        psDecl->value.interface.ui32NumFuncTables = numClassesImplementingThisInterface;
-        psDecl->value.interface.ui32ArraySize = arrayLen;
-
-        psShader->funcPointer[interfaceID].ui32NumBodiesPerTable = psDecl->ui32TableLength;
-
-        for (; func < numClassesImplementingThisInterface; ++func)
-        {
-            uint32_t ui32FuncTable = *(pui32Token + ui32OperandOffset);
-            psShader->aui32FuncTableToFuncPointer[ui32FuncTable] = interfaceID;
-
-            psShader->funcPointer[interfaceID].aui32FuncTables[func] = ui32FuncTable;
-            ui32OperandOffset++;
-        }
-
-        break;
-    }
-    case OPCODE_DCL_FUNCTION_BODY:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_FUNCTION_TABLE:
-    {
-        uint32_t ui32Func;
-        const uint32_t ui32FuncTableID = pui32Token[ui32OperandOffset++];
-        const uint32_t ui32NumFuncsInTable = pui32Token[ui32OperandOffset++];
-
-        for (ui32Func = 0; ui32Func < ui32NumFuncsInTable; ++ui32Func)
-        {
-            const uint32_t ui32FuncBodyID = pui32Token[ui32OperandOffset++];
-
-            psShader->aui32FuncBodyToFuncTable[ui32FuncBodyID] = ui32FuncTableID;
-
-            psShader->funcTable[ui32FuncTableID].aui32FuncBodies[ui32Func] = ui32FuncBodyID;
-        }
-
-        // OpcodeToken0 is followed by a DWORD that represents the function table
-        // identifier and another DWORD (TableLength) that gives the number of
-        // functions in the table.
-        //
-        // This is followed by TableLength DWORDs which are function body indices.
-        //
-
-        break;
-    }
-    case OPCODE_DCL_INPUT_CONTROL_POINT_COUNT:
-    {
-        break;
-    }
-    case OPCODE_HS_DECLS:
-    {
-        break;
-    }
-    case OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT:
-    {
-        psDecl->value.ui32MaxOutputVertexCount = DecodeOutputControlPointCount(*pui32Token);
-        break;
-    }
-    case OPCODE_HS_JOIN_PHASE:
-    case OPCODE_HS_FORK_PHASE:
-    case OPCODE_HS_CONTROL_POINT_PHASE:
-    {
-        break;
-    }
-    case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-    {
-        ASSERT(psShader->asPhase[HS_FORK_PHASE].ui32InstanceCount != 0);    //Check for wrapping when we decrement.
-        psDecl->value.aui32HullPhaseInstanceInfo[0] = psShader->asPhase[HS_FORK_PHASE].ui32InstanceCount - 1;
-        psDecl->value.aui32HullPhaseInstanceInfo[1] = pui32Token[1];
-        break;
-    }
-    case OPCODE_CUSTOMDATA:
-    {
-        ui32TokenLength = pui32Token[1];
-        {
-            const uint32_t ui32NumVec4 = (ui32TokenLength - 2) / 4;
-            uint32_t uIdx = 0;
-
-            ICBVec4 const* pVec4Array = (void*) (pui32Token + 2);
-
-            //The buffer will contain at least one value, but not more than 4096 scalars/1024 vec4's.
-            ASSERT(ui32NumVec4 < MAX_IMMEDIATE_CONST_BUFFER_VEC4_SIZE);
-
-            /* must be a multiple of 4 */
-            ASSERT(((ui32TokenLength - 2) % 4) == 0);
-
-            for (uIdx = 0; uIdx < ui32NumVec4; uIdx++)
-            {
-                psDecl->asImmediateConstBuffer[uIdx] = pVec4Array[uIdx];
-            }
-
-            psDecl->ui32NumOperands = ui32NumVec4;
-        }
-        break;
-    }
-    case OPCODE_DCL_HS_MAX_TESSFACTOR:
-    {
-        psDecl->value.fMaxTessFactor = *((float*)&pui32Token[1]);
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-    {
-        psDecl->ui32NumOperands = 2;
-        psDecl->value.eResourceDimension = DecodeResourceDimension(*pui32Token);
-        psDecl->sUAV.ui32GloballyCoherentAccess = DecodeAccessCoherencyFlags(*pui32Token);
-        psDecl->sUAV.bCounter = 0;
-        psDecl->sUAV.ui32BufferSize = 0;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        psDecl->sUAV.Type = DecodeResourceReturnType(0, pui32Token[ui32OperandOffset]);
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-    {
-        psDecl->ui32NumOperands = 1;
-        psDecl->sUAV.ui32GloballyCoherentAccess = DecodeAccessCoherencyFlags(*pui32Token);
-        psDecl->sUAV.bCounter = 0;
-        psDecl->sUAV.ui32BufferSize = 0;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        //This should be a RTYPE_UAV_RWBYTEADDRESS buffer. It is memory backed by
-        //a shader storage buffer whose is unknown at compile time.
-        psDecl->sUAV.ui32BufferSize = 0;
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-    {
-        ResourceBinding* psBinding = NULL;
-        ConstantBuffer* psBuffer = NULL;
-
-        psDecl->ui32NumOperands = 1;
-        psDecl->sUAV.ui32GloballyCoherentAccess = DecodeAccessCoherencyFlags(*pui32Token);
-        psDecl->sUAV.bCounter = 0;
-        psDecl->sUAV.ui32BufferSize = 0;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-        GetResourceFromBindingPoint(RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, &psShader->sInfo, &psBinding);
-
-        GetConstantBufferFromBindingPoint(RGROUP_UAV, psBinding->ui32BindPoint, &psShader->sInfo, &psBuffer);
-        psDecl->sUAV.ui32BufferSize = psBuffer->ui32TotalSizeInBytes;
-        switch (psBinding->eType)
-        {
-        case RTYPE_UAV_RWSTRUCTURED_WITH_COUNTER:
-        case RTYPE_UAV_APPEND_STRUCTURED:
-        case RTYPE_UAV_CONSUME_STRUCTURED:
-            psDecl->sUAV.bCounter = 1;
-            break;
-        default:
-            break;
-        }
-        break;
-    }
-    case OPCODE_DCL_RESOURCE_STRUCTURED:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_RESOURCE_RAW:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED:
-    {
-        psDecl->ui32NumOperands = 1;
-        psDecl->sUAV.ui32GloballyCoherentAccess = 0;
-
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-        psDecl->sTGSM.ui32Stride = pui32Token[ui32OperandOffset++];
-        psDecl->sTGSM.ui32Count = pui32Token[ui32OperandOffset++];
-        break;
-    }
-    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW:
-    {
-        psDecl->ui32NumOperands = 1;
-        psDecl->sUAV.ui32GloballyCoherentAccess = 0;
-
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-
-        psDecl->sTGSM.ui32Stride = 4;
-        psDecl->sTGSM.ui32Count = pui32Token[ui32OperandOffset++];
-        break;
-    }
-    case OPCODE_DCL_STREAM:
-    {
-        psDecl->ui32NumOperands = 1;
-        DecodeOperand(pui32Token + ui32OperandOffset, &psDecl->asOperands[0]);
-        break;
-    }
-    case OPCODE_DCL_GS_INSTANCE_COUNT:
-    {
-        psDecl->ui32NumOperands = 0;
-        psDecl->value.ui32GSInstanceCount = pui32Token[1];
-        break;
-    }
-    default:
-    {
-        //Reached end of declarations
-        return 0;
-    }
-    }
-
-    return pui32Token + ui32TokenLength;
-}
-
-const uint32_t* DeocdeInstruction(const uint32_t* pui32Token, Instruction* psInst, ShaderData* psShader)
-{
-    uint32_t ui32TokenLength = DecodeInstructionLength(*pui32Token);
-    const uint32_t bExtended = DecodeIsOpcodeExtended(*pui32Token);
-    const OPCODE_TYPE eOpcode = DecodeOpcodeType(*pui32Token);
-    uint32_t ui32OperandOffset = 1;
-
-#ifdef _DEBUG
-    psInst->id = instructionID++;
-#endif
-
-    psInst->eOpcode = eOpcode;
-
-    psInst->bSaturate = DecodeInstructionSaturate(*pui32Token);
-
-    psInst->bAddressOffset = 0;
-
-    psInst->ui32FirstSrc = 1;
-
-    if (bExtended)
-    {
-        do
-        {
-            const uint32_t ui32ExtOpcodeToken = pui32Token[ui32OperandOffset];
-            const EXTENDED_OPCODE_TYPE eExtType = DecodeExtendedOpcodeType(ui32ExtOpcodeToken);
-
-            if (eExtType == EXTENDED_OPCODE_SAMPLE_CONTROLS)
-            {
-                struct
-                {
-                    int i4 : 4;
-                } sU;
-                struct
-                {
-                    int i4 : 4;
-                } sV;
-                struct
-                {
-                    int i4 : 4;
-                } sW;
-
-                psInst->bAddressOffset = 1;
-
-                sU.i4 = DecodeImmediateAddressOffset(
-                        IMMEDIATE_ADDRESS_OFFSET_U, ui32ExtOpcodeToken);
-                sV.i4 = DecodeImmediateAddressOffset(
-                        IMMEDIATE_ADDRESS_OFFSET_V, ui32ExtOpcodeToken);
-                sW.i4 = DecodeImmediateAddressOffset(
-                        IMMEDIATE_ADDRESS_OFFSET_W, ui32ExtOpcodeToken);
-
-                psInst->iUAddrOffset = sU.i4;
-                psInst->iVAddrOffset = sV.i4;
-                psInst->iWAddrOffset = sW.i4;
-            }
-            else if (eExtType == EXTENDED_OPCODE_RESOURCE_RETURN_TYPE)
-            {
-                psInst->xType = DecodeExtendedResourceReturnType(0, ui32ExtOpcodeToken);
-                psInst->yType = DecodeExtendedResourceReturnType(1, ui32ExtOpcodeToken);
-                psInst->zType = DecodeExtendedResourceReturnType(2, ui32ExtOpcodeToken);
-                psInst->wType = DecodeExtendedResourceReturnType(3, ui32ExtOpcodeToken);
-            }
-            else if (eExtType == EXTENDED_OPCODE_RESOURCE_DIM)
-            {
-                psInst->eResDim = DecodeExtendedResourceDimension(ui32ExtOpcodeToken);
-            }
-
-            ui32OperandOffset++;
-        }
-        while (DecodeIsOpcodeExtended(pui32Token[ui32OperandOffset - 1]));
-    }
-
-    if (eOpcode < NUM_OPCODES && eOpcode >= 0)
-    {
-        psShader->aiOpcodeUsed[eOpcode] = 1;
-    }
-
-    switch (eOpcode)
-    {
-    //no operands
-    case OPCODE_CUT:
-    case OPCODE_EMIT:
-    case OPCODE_EMITTHENCUT:
-    case OPCODE_RET:
-    case OPCODE_LOOP:
-    case OPCODE_ENDLOOP:
-    case OPCODE_BREAK:
-    case OPCODE_ELSE:
-    case OPCODE_ENDIF:
-    case OPCODE_CONTINUE:
-    case OPCODE_DEFAULT:
-    case OPCODE_ENDSWITCH:
-    case OPCODE_NOP:
-    case OPCODE_HS_CONTROL_POINT_PHASE:
-    case OPCODE_HS_FORK_PHASE:
-    case OPCODE_HS_JOIN_PHASE:
-    {
-        psInst->ui32NumOperands = 0;
-        psInst->ui32FirstSrc = 0;
-        break;
-    }
-    case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-    {
-        psInst->ui32NumOperands = 0;
-        psInst->ui32FirstSrc = 0;
-        break;
-    }
-    case OPCODE_SYNC:
-    {
-        psInst->ui32NumOperands = 0;
-        psInst->ui32FirstSrc = 0;
-        psInst->ui32SyncFlags = DecodeSyncFlags(*pui32Token);
-        break;
-    }
-
-    //1 operand
-    case OPCODE_EMIT_STREAM:
-    case OPCODE_CUT_STREAM:
-    case OPCODE_EMITTHENCUT_STREAM:
-    case OPCODE_CASE:
-    case OPCODE_SWITCH:
-    case OPCODE_LABEL:
-    {
-        psInst->ui32NumOperands = 1;
-        psInst->ui32FirstSrc = 0;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-
-        if (eOpcode == OPCODE_CASE)
-        {
-            psInst->asOperands[0].iIntegerImmediate = 1;
-        }
-        break;
-    }
-
-    case OPCODE_INTERFACE_CALL:
-    {
-        psInst->ui32NumOperands = 1;
-        psInst->ui32FirstSrc = 0;
-        psInst->ui32FuncIndexWithinInterface = pui32Token[ui32OperandOffset];
-        ui32OperandOffset++;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-
-        break;
-    }
-
-    /* Floating point instruction decodes */
-
-    //Instructions with two operands go here
-    case OPCODE_MOV:
-    {
-        psInst->ui32NumOperands = 2;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-
-        //Mov with an integer dest. If src is an immediate then it must be encoded as an integer.
-        if (psInst->asOperands[0].eMinPrecision == OPERAND_MIN_PRECISION_SINT_16 ||
-            psInst->asOperands[0].eMinPrecision == OPERAND_MIN_PRECISION_UINT_16)
-        {
-            psInst->asOperands[1].iIntegerImmediate = 1;
-        }
-        break;
-    }
-    case OPCODE_LOG:
-    case OPCODE_RSQ:
-    case OPCODE_EXP:
-    case OPCODE_SQRT:
-    case OPCODE_ROUND_PI:
-    case OPCODE_ROUND_NI:
-    case OPCODE_ROUND_Z:
-    case OPCODE_ROUND_NE:
-    case OPCODE_FRC:
-    case OPCODE_FTOU:
-    case OPCODE_FTOI:
-    case OPCODE_UTOF:
-    case OPCODE_ITOF:
-    case OPCODE_INEG:
-    case OPCODE_IMM_ATOMIC_ALLOC:
-    case OPCODE_IMM_ATOMIC_CONSUME:
-    case OPCODE_DMOV:
-    case OPCODE_DTOF:
-    case OPCODE_FTOD:
-    case OPCODE_DRCP:
-    case OPCODE_COUNTBITS:
-    case OPCODE_FIRSTBIT_HI:
-    case OPCODE_FIRSTBIT_LO:
-    case OPCODE_FIRSTBIT_SHI:
-    case OPCODE_BFREV:
-    case OPCODE_F32TOF16:
-    case OPCODE_F16TOF32:
-    case OPCODE_RCP:
-    case OPCODE_DERIV_RTX:
-    case OPCODE_DERIV_RTY:
-    case OPCODE_DERIV_RTX_COARSE:
-    case OPCODE_DERIV_RTX_FINE:
-    case OPCODE_DERIV_RTY_COARSE:
-    case OPCODE_DERIV_RTY_FINE:
-    case OPCODE_NOT:
-    {
-        psInst->ui32NumOperands = 2;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        break;
-    }
-
-    //Instructions with three operands go here
-    case OPCODE_SINCOS:
-    {
-        psInst->ui32FirstSrc = 2;
-        //Intentional fall-through
-    }
-    case OPCODE_IMIN:
-    case OPCODE_MIN:
-    case OPCODE_UMIN:
-    case OPCODE_IMAX:
-    case OPCODE_MAX:
-    case OPCODE_UMAX:
-    case OPCODE_MUL:
-    case OPCODE_DIV:
-    case OPCODE_ADD:
-    case OPCODE_DP2:
-    case OPCODE_DP3:
-    case OPCODE_DP4:
-    case OPCODE_NE:
-    case OPCODE_OR:
-    case OPCODE_XOR:
-    case OPCODE_LT:
-    case OPCODE_IEQ:
-    case OPCODE_IADD:
-    case OPCODE_AND:
-    case OPCODE_GE:
-    case OPCODE_IGE:
-    case OPCODE_EQ:
-    case OPCODE_USHR:
-    case OPCODE_ISHL:
-    case OPCODE_ISHR:
-    case OPCODE_LD:
-    case OPCODE_ILT:
-    case OPCODE_INE:
-    case OPCODE_UGE:
-    case OPCODE_ULT:
-    case OPCODE_ATOMIC_AND:
-    case OPCODE_ATOMIC_IADD:
-    case OPCODE_ATOMIC_OR:
-    case OPCODE_ATOMIC_XOR:
-    case OPCODE_ATOMIC_IMAX:
-    case OPCODE_ATOMIC_IMIN:
-    case OPCODE_ATOMIC_UMAX:
-    case OPCODE_ATOMIC_UMIN:
-    case OPCODE_DADD:
-    case OPCODE_DMAX:
-    case OPCODE_DMIN:
-    case OPCODE_DMUL:
-    case OPCODE_DEQ:
-    case OPCODE_DGE:
-    case OPCODE_DLT:
-    case OPCODE_DNE:
-    case OPCODE_DDIV:
-    {
-        psInst->ui32NumOperands = 3;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        break;
-    }
-    //Instructions with four operands go here
-    case OPCODE_MAD:
-    case OPCODE_MOVC:
-    case OPCODE_IMAD:
-    case OPCODE_UDIV:
-    case OPCODE_LOD:
-    case OPCODE_SAMPLE:
-    case OPCODE_GATHER4:
-    case OPCODE_LD_MS:
-    case OPCODE_UBFE:
-    case OPCODE_IBFE:
-    case OPCODE_ATOMIC_CMP_STORE:
-    case OPCODE_IMM_ATOMIC_IADD:
-    case OPCODE_IMM_ATOMIC_AND:
-    case OPCODE_IMM_ATOMIC_OR:
-    case OPCODE_IMM_ATOMIC_XOR:
-    case OPCODE_IMM_ATOMIC_EXCH:
-    case OPCODE_IMM_ATOMIC_IMAX:
-    case OPCODE_IMM_ATOMIC_IMIN:
-    case OPCODE_IMM_ATOMIC_UMAX:
-    case OPCODE_IMM_ATOMIC_UMIN:
-    case OPCODE_DMOVC:
-    case OPCODE_DFMA:
-    case OPCODE_IMUL:
-    {
-        psInst->ui32NumOperands = 4;
-
-        if (eOpcode == OPCODE_IMUL)
-        {
-            psInst->ui32FirstSrc = 2;
-        }
-
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-        break;
-    }
-    case OPCODE_GATHER4_PO:
-    case OPCODE_SAMPLE_L:
-    case OPCODE_BFI:
-    case OPCODE_SWAPC:
-    case OPCODE_IMM_ATOMIC_CMP_EXCH:
-    {
-        psInst->ui32NumOperands = 5;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[4]);
-        break;
-    }
-    case OPCODE_GATHER4_C:
-    case OPCODE_SAMPLE_C:
-    case OPCODE_SAMPLE_C_LZ:
-    case OPCODE_SAMPLE_B:
-    {
-        psInst->ui32NumOperands = 5;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[4]);
-
-        /* sample_b is not a shadow sampler, others need flagging */
-        if (eOpcode != OPCODE_SAMPLE_B)
-        {
-            MarkTextureAsShadow(&psShader->sInfo,
-                psShader->asPhase[MAIN_PHASE].ppsDecl[0],
-                psShader->asPhase[MAIN_PHASE].pui32DeclCount[0], &psInst->asOperands[2]);
-        }
-
-        break;
-    }
-    case OPCODE_GATHER4_PO_C:
-    case OPCODE_SAMPLE_D:
-    {
-        psInst->ui32NumOperands = 6;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[4]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[5]);
-
-        /* sample_d is not a shadow sampler, others need flagging */
-        if (eOpcode != OPCODE_SAMPLE_D)
-        {
-            MarkTextureAsShadow(&psShader->sInfo,
-                psShader->asPhase[MAIN_PHASE].ppsDecl[0],
-                psShader->asPhase[MAIN_PHASE].pui32DeclCount[0], &psInst->asOperands[2]);
-        }
-        break;
-    }
-    case OPCODE_IF:
-    case OPCODE_BREAKC:
-    case OPCODE_CONTINUEC:
-    case OPCODE_RETC:
-    case OPCODE_DISCARD:
-    {
-        psInst->eBooleanTestType = DecodeInstrTestBool(*pui32Token);
-        psInst->ui32NumOperands = 1;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        break;
-    }
-    case OPCODE_CALLC:
-    {
-        psInst->eBooleanTestType = DecodeInstrTestBool(*pui32Token);
-        psInst->ui32NumOperands = 2;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        break;
-    }
-    case OPCODE_CUSTOMDATA:
-    {
-        psInst->ui32NumOperands = 0;
-        ui32TokenLength = pui32Token[1];
-        break;
-    }
-    case OPCODE_EVAL_CENTROID:
-    {
-        psInst->ui32NumOperands = 2;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        break;
-    }
-    case OPCODE_EVAL_SAMPLE_INDEX:
-    case OPCODE_EVAL_SNAPPED:
-    case OPCODE_STORE_UAV_TYPED:
-    case OPCODE_LD_UAV_TYPED:
-    case OPCODE_LD_RAW:
-    case OPCODE_STORE_RAW:
-    {
-        psInst->ui32NumOperands = 3;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        break;
-    }
-    case OPCODE_STORE_STRUCTURED:
-    case OPCODE_LD_STRUCTURED:
-    {
-        psInst->ui32NumOperands = 4;
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[3]);
-        break;
-    }
-    case OPCODE_RESINFO:
-    {
-        psInst->ui32NumOperands = 3;
-
-        psInst->eResInfoReturnType = DecodeResInfoReturnType(pui32Token[0]);
-
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[0]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[1]);
-        ui32OperandOffset += DecodeOperand(pui32Token + ui32OperandOffset, &psInst->asOperands[2]);
-        break;
-    }
-    case OPCODE_MSAD:
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    // For opcodes that sample textures, mark which samplers are used by each texture
-    {
-        uint32_t ui32TextureRegisterNumber;
-        uint32_t ui32SamplerRegisterNumber;
-        uint32_t bTextureSampleInstruction = 0;
-        switch (eOpcode)
-        {
-        case OPCODE_GATHER4:
-            // dest, coords, tex, sampler
-            ui32TextureRegisterNumber = 2;
-            ui32SamplerRegisterNumber = 3;
-            bTextureSampleInstruction = 1;
-            break;
-        case OPCODE_GATHER4_PO:
-            //dest, coords, offset, tex, sampler
-            ui32TextureRegisterNumber = 3;
-            ui32SamplerRegisterNumber = 4;
-            bTextureSampleInstruction = 1;
-            break;
-        case OPCODE_GATHER4_C:
-            //dest, coords, tex, sampler srcReferenceValue
-            ui32TextureRegisterNumber = 2;
-            ui32SamplerRegisterNumber = 3;
-            bTextureSampleInstruction = 1;
-            break;
-        case OPCODE_GATHER4_PO_C:
-            //dest, coords, offset, tex, sampler, srcReferenceValue
-            ui32TextureRegisterNumber = 3;
-            ui32SamplerRegisterNumber = 4;
-            bTextureSampleInstruction = 1;
-            break;
-        case OPCODE_SAMPLE:
-        case OPCODE_SAMPLE_L:
-        case OPCODE_SAMPLE_C:
-        case OPCODE_SAMPLE_C_LZ:
-        case OPCODE_SAMPLE_B:
-        case OPCODE_SAMPLE_D:
-            // dest, coords, tex, sampler [, reference]
-            ui32TextureRegisterNumber = 2;
-            ui32SamplerRegisterNumber = 3;
-            bTextureSampleInstruction = 1;
-            break;
-        }
-
-        if (bTextureSampleInstruction)
-        {
-            MarkTextureSamplerPair(&psShader->sInfo,
-                psShader->asPhase[MAIN_PHASE].ppsDecl[0],
-                psShader->asPhase[MAIN_PHASE].pui32DeclCount[0],
-                &psInst->asOperands[ui32TextureRegisterNumber],
-                &psInst->asOperands[ui32SamplerRegisterNumber],
-                &psShader->textureSamplerInfo);
-        }
-    }
-
-    UpdateOperandReferences(psShader, psInst);
-
-    return pui32Token + ui32TokenLength;
-}
-
-void BindTextureToSampler(ShaderData* psShader, uint32_t ui32TextureRegister, uint32_t ui32SamplerRegister)
-{
-    ASSERT(ui32TextureRegister < MAX_RESOURCE_BINDINGS &&
-        (psShader->sInfo.aui32SamplerMap[ui32TextureRegister] == MAX_RESOURCE_BINDINGS ||
-         psShader->sInfo.aui32SamplerMap[ui32TextureRegister] == ui32SamplerRegister));
-    ASSERT(ui32SamplerRegister < MAX_RESOURCE_BINDINGS);
-    psShader->sInfo.aui32SamplerMap[ui32TextureRegister] = ui32SamplerRegister;
-}
-
-void UpdateOperandReferences(ShaderData* psShader, Instruction* psInst)
-{
-    uint32_t ui32Operand;
-    const uint32_t ui32NumOperands = psInst->ui32NumOperands;
-    for (ui32Operand = 0; ui32Operand < ui32NumOperands; ++ui32Operand)
-    {
-        Operand* psOperand = &psInst->asOperands[ui32Operand];
-        if (psOperand->eType == OPERAND_TYPE_INPUT ||
-            psOperand->eType == OPERAND_TYPE_INPUT_CONTROL_POINT)
-        {
-            if (psOperand->iIndexDims == INDEX_2D)
-            {
-                if (psOperand->aui32ArraySizes[1] != 0)//gl_in[].gl_Position
-                {
-                    psShader->abInputReferencedByInstruction[psOperand->ui32RegisterNumber] = 1;
-                }
-            }
-            else
-            {
-                psShader->abInputReferencedByInstruction[psOperand->ui32RegisterNumber] = 1;
-            }
-        }
-    }
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_SAMPLE:
-    case OPCODE_SAMPLE_L:
-    case OPCODE_SAMPLE_C:
-    case OPCODE_SAMPLE_C_LZ:
-    case OPCODE_SAMPLE_B:
-    case OPCODE_SAMPLE_D:
-    case OPCODE_GATHER4:
-    case OPCODE_GATHER4_C:
-        BindTextureToSampler(psShader, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber);
-        break;
-    case OPCODE_GATHER4_PO:
-    case OPCODE_GATHER4_PO_C:
-        BindTextureToSampler(psShader, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[4].ui32RegisterNumber);
-        break;
-    }
-}
-
-const uint32_t* DecodeShaderPhase(const uint32_t* pui32Tokens,
-    ShaderData* psShader,
-    const uint32_t ui32Phase)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = psShader->ui32ShaderLength;
-    const uint32_t ui32InstanceIndex = psShader->asPhase[ui32Phase].ui32InstanceCount;
-
-    Instruction* psInst;
-
-    //Declarations
-    Declaration* psDecl;
-
-    //Using ui32ShaderLength as the declaration and instruction count
-    //will allocate more than enough memory. Avoids having to
-    //traverse the entire shader just to get the real counts.
-
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32ShaderLength);
-    psShader->asPhase[ui32Phase].ppsDecl[ui32InstanceIndex] = psDecl;
-    psShader->asPhase[ui32Phase].pui32DeclCount[ui32InstanceIndex] = 0;
-
-    psShader->asPhase[ui32Phase].ui32InstanceCount++;
-
-    while (1) //Keep going until we reach the first non-declaration token, or the end of the shader.
-    {
-        const uint32_t* pui32Result = DecodeDeclaration(psShader, pui32CurrentToken, psDecl);
-
-        if (pui32Result)
-        {
-            pui32CurrentToken = pui32Result;
-            psShader->asPhase[ui32Phase].pui32DeclCount[ui32InstanceIndex]++;
-            psDecl++;
-
-            if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-
-    //Instructions
-    psInst = hlslcc_malloc(sizeof(Instruction) * ui32ShaderLength);
-    psShader->asPhase[ui32Phase].ppsInst[ui32InstanceIndex] = psInst;
-    psShader->asPhase[ui32Phase].pui32InstCount[ui32InstanceIndex] = 0;
-
-    while (pui32CurrentToken < (psShader->pui32FirstToken + ui32ShaderLength))
-    {
-        const uint32_t* nextInstr = DeocdeInstruction(pui32CurrentToken, psInst, psShader);
-
-#ifdef _DEBUG
-        if (nextInstr == pui32CurrentToken)
-        {
-            ASSERT(0);
-            break;
-        }
-#endif
-
-        if (psInst->eOpcode == OPCODE_HS_FORK_PHASE)
-        {
-            return pui32CurrentToken;
-        }
-        else if (psInst->eOpcode == OPCODE_HS_JOIN_PHASE)
-        {
-            return pui32CurrentToken;
-        }
-        pui32CurrentToken = nextInstr;
-        psShader->asPhase[ui32Phase].pui32InstCount[ui32InstanceIndex]++;
-
-        psInst++;
-    }
-
-    return pui32CurrentToken;
-}
-
-void AllocateHullPhaseArrays(const uint32_t* pui32Tokens,
-    ShaderData* psShader,
-    uint32_t ui32Phase,
-    OPCODE_TYPE ePhaseOpcode)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = psShader->ui32ShaderLength;
-    uint32_t ui32InstanceCount = 0;
-
-    while (1) //Keep going until we reach the first non-declaration token, or the end of the shader.
-    {
-        uint32_t ui32TokenLength = DecodeInstructionLength(*pui32CurrentToken);
-        const OPCODE_TYPE eOpcode = DecodeOpcodeType(*pui32CurrentToken);
-
-        if (eOpcode == OPCODE_CUSTOMDATA)
-        {
-            ui32TokenLength = pui32CurrentToken[1];
-        }
-
-        pui32CurrentToken = pui32CurrentToken + ui32TokenLength;
-
-        if (eOpcode == ePhaseOpcode)
-        {
-            ui32InstanceCount++;
-        }
-
-        if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-        {
-            break;
-        }
-    }
-
-    if (ui32InstanceCount)
-    {
-        psShader->asPhase[ui32Phase].pui32DeclCount = hlslcc_malloc(sizeof(uint32_t) * ui32InstanceCount);
-        psShader->asPhase[ui32Phase].ppsDecl = hlslcc_malloc(sizeof(Declaration*) * ui32InstanceCount);
-        psShader->asPhase[ui32Phase].pui32DeclCount[0] = 0;
-
-        psShader->asPhase[ui32Phase].pui32InstCount = hlslcc_malloc(sizeof(uint32_t) * ui32InstanceCount);
-        psShader->asPhase[ui32Phase].ppsInst = hlslcc_malloc(sizeof(Instruction*) * ui32InstanceCount);
-        psShader->asPhase[ui32Phase].pui32InstCount[0] = 0;
-    }
-}
-
-const uint32_t* DecodeHullShader(const uint32_t* pui32Tokens, ShaderData* psShader)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = psShader->ui32ShaderLength;
-    Declaration* psDecl;
-
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32ShaderLength);
-
-    psShader->asPhase[HS_GLOBAL_DECL].ppsInst = 0;
-    psShader->asPhase[HS_GLOBAL_DECL].ppsDecl = hlslcc_malloc(sizeof(Declaration*));
-    psShader->asPhase[HS_GLOBAL_DECL].ppsDecl[0] = psDecl;
-    psShader->asPhase[HS_GLOBAL_DECL].pui32DeclCount = hlslcc_malloc(sizeof(uint32_t));
-    psShader->asPhase[HS_GLOBAL_DECL].pui32DeclCount[0] = 0;
-    psShader->asPhase[HS_GLOBAL_DECL].ui32InstanceCount = 1;
-
-    AllocateHullPhaseArrays(pui32Tokens, psShader, HS_CTRL_POINT_PHASE, OPCODE_HS_CONTROL_POINT_PHASE);
-    AllocateHullPhaseArrays(pui32Tokens, psShader, HS_FORK_PHASE, OPCODE_HS_FORK_PHASE);
-    AllocateHullPhaseArrays(pui32Tokens, psShader, HS_JOIN_PHASE, OPCODE_HS_JOIN_PHASE);
-
-    //Keep going until we have done all phases or the end of the shader.
-    while (1)
-    {
-        const uint32_t* pui32Result = DecodeDeclaration(psShader, pui32CurrentToken, psDecl);
-
-        if (pui32Result)
-        {
-            pui32CurrentToken = pui32Result;
-
-            if (psDecl->eOpcode == OPCODE_HS_CONTROL_POINT_PHASE)
-            {
-                pui32CurrentToken = DecodeShaderPhase(pui32CurrentToken, psShader, HS_CTRL_POINT_PHASE);
-            }
-            else if (psDecl->eOpcode == OPCODE_HS_FORK_PHASE)
-            {
-                pui32CurrentToken = DecodeShaderPhase(pui32CurrentToken, psShader, HS_FORK_PHASE);
-            }
-            else if (psDecl->eOpcode == OPCODE_HS_JOIN_PHASE)
-            {
-                pui32CurrentToken = DecodeShaderPhase(pui32CurrentToken, psShader, HS_JOIN_PHASE);
-            }
-            else
-            {
-                psDecl++;
-                psShader->asPhase[HS_GLOBAL_DECL].pui32DeclCount[0]++;
-            }
-
-            if (pui32CurrentToken >= (psShader->pui32FirstToken + ui32ShaderLength))
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    return pui32CurrentToken;
-}
-
-void Decode(const uint32_t* pui32Tokens, ShaderData* psShader)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    const uint32_t ui32ShaderLength = pui32Tokens[1];
-
-    psShader->ui32MajorVersion = DecodeProgramMajorVersion(*pui32CurrentToken);
-    psShader->ui32MinorVersion = DecodeProgramMinorVersion(*pui32CurrentToken);
-    psShader->eShaderType = DecodeShaderType(*pui32CurrentToken);
-
-    pui32CurrentToken++;//Move to shader length
-    psShader->ui32ShaderLength = ui32ShaderLength;
-    pui32CurrentToken++;//Move to after shader length (usually a declaration)
-
-    psShader->pui32FirstToken = pui32Tokens;
-
-    if (psShader->eShaderType == HULL_SHADER)
-    {
-        pui32CurrentToken = DecodeHullShader(pui32CurrentToken, psShader);
-        return;
-    }
-
-    psShader->asPhase[MAIN_PHASE].ui32InstanceCount = 0;
-    psShader->asPhase[MAIN_PHASE].pui32DeclCount = hlslcc_malloc(sizeof(uint32_t));
-    psShader->asPhase[MAIN_PHASE].ppsDecl = hlslcc_malloc(sizeof(Declaration*));
-    psShader->asPhase[MAIN_PHASE].pui32DeclCount[0] = 0;
-
-    psShader->asPhase[MAIN_PHASE].pui32InstCount = hlslcc_malloc(sizeof(uint32_t));
-    psShader->asPhase[MAIN_PHASE].ppsInst = hlslcc_malloc(sizeof(Instruction*));
-    psShader->asPhase[MAIN_PHASE].pui32InstCount[0] = 0;
-
-    DecodeShaderPhase(pui32CurrentToken, psShader, MAIN_PHASE);
-}
-
-ShaderData* DecodeDXBC(uint32_t* data)
-{
-    ShaderData* psShader;
-    DXBCContainerHeader* header = (DXBCContainerHeader*)data;
-    uint32_t i;
-    uint32_t chunkCount;
-    uint32_t* chunkOffsets;
-    ReflectionChunks refChunks;
-    uint32_t* shaderChunk = 0;
-
-    if (header->fourcc != FOURCC_DXBC)
-    {
-        //Could be SM1/2/3. If the shader type token
-        //looks valid then we continue
-        uint32_t type = DecodeShaderTypeDX9(data[0]);
-
-        if (type != INVALID_SHADER)
-        {
-            return DecodeDX9BC(data);
-        }
-        return 0;
-    }
-
-    refChunks.pui32Inputs = NULL;
-    refChunks.pui32Interfaces = NULL;
-    refChunks.pui32Outputs = NULL;
-    refChunks.pui32Resources = NULL;
-    refChunks.pui32Inputs11 = NULL;
-    refChunks.pui32Outputs11 = NULL;
-    refChunks.pui32OutputsWithStreams = NULL;
-    refChunks.pui32PatchConstants = NULL;
-    refChunks.pui32Effects10Data = NULL;
-
-    chunkOffsets = (uint32_t*)(header + 1);
-
-    chunkCount = header->chunkCount;
-
-    for (i = 0; i < chunkCount; ++i)
-    {
-        uint32_t offset = chunkOffsets[i];
-
-        DXBCChunkHeader* chunk = (DXBCChunkHeader*)((char*)data + offset);
-
-        switch (chunk->fourcc)
-        {
-        case FOURCC_ISGN:
-        {
-            refChunks.pui32Inputs = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_ISG1:
-        {
-            refChunks.pui32Inputs11 = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_RDEF:
-        {
-            refChunks.pui32Resources = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_IFCE:
-        {
-            refChunks.pui32Interfaces = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_OSGN:
-        {
-            refChunks.pui32Outputs = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_OSG1:
-        {
-            refChunks.pui32Outputs11 = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_OSG5:
-        {
-            refChunks.pui32OutputsWithStreams = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_SHDR:
-        case FOURCC_SHEX:
-        {
-            shaderChunk = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_PSGN:
-        {
-            refChunks.pui32PatchConstants = (uint32_t*)(chunk + 1);
-            break;
-        }
-        case FOURCC_FX10:
-        {
-            refChunks.pui32Effects10Data = (uint32_t*)(chunk + 1);
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-    }
-
-    if (shaderChunk)
-    {
-        uint32_t ui32MajorVersion;
-        uint32_t ui32MinorVersion;
-
-        psShader = hlslcc_calloc(1, sizeof(ShaderData));
-
-        ui32MajorVersion = DecodeProgramMajorVersion(*shaderChunk);
-        ui32MinorVersion = DecodeProgramMinorVersion(*shaderChunk);
-
-        LoadShaderInfo(ui32MajorVersion,
-            ui32MinorVersion,
-            &refChunks,
-            &psShader->sInfo);
-
-        Decode(shaderChunk, psShader);
-
-        return psShader;
-    }
-
-    return 0;
-}
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/decodeDX9.c b/Code/Tools/HLSLCrossCompilerMETAL/src/decodeDX9.c
deleted file mode 100644
index f33c5b4b0e..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/decodeDX9.c
+++ /dev/null
@@ -1,1133 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/debug.h"
-#include "internal_includes/decode.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "internal_includes/reflect.h"
-#include "internal_includes/structs.h"
-#include "internal_includes/tokens.h"
-#include "stdio.h"
-#include "stdlib.h"
-
-#define FOURCC(a, b, c, d) ((uint32_t)(uint8_t)(a) | ((uint32_t)(uint8_t)(b) << 8) | ((uint32_t)(uint8_t)(c) << 16) | ((uint32_t)(uint8_t)(d) << 24))
-enum
-{
-    FOURCC_CTAB = FOURCC('C', 'T', 'A', 'B')
-};  // Constant table
-
-#ifdef _DEBUG
-static uint64_t dx9operandID = 0;
-static uint64_t dx9instructionID = 0;
-#endif
-
-static uint32_t aui32ImmediateConst[256];
-static uint32_t ui32MaxTemp = 0;
-
-uint32_t DX9_DECODE_OPERAND_IS_SRC = 0x1;
-uint32_t DX9_DECODE_OPERAND_IS_DEST = 0x2;
-uint32_t DX9_DECODE_OPERAND_IS_DECL = 0x4;
-
-uint32_t DX9_DECODE_OPERAND_IS_CONST = 0x8;
-uint32_t DX9_DECODE_OPERAND_IS_ICONST = 0x10;
-uint32_t DX9_DECODE_OPERAND_IS_BCONST = 0x20;
-
-#define MAX_INPUTS 64
-
-static DECLUSAGE_DX9 aeInputUsage[MAX_INPUTS];
-static uint32_t aui32InputUsageIndex[MAX_INPUTS];
-
-static void DecodeOperandDX9(const ShaderData* psShader, const uint32_t ui32Token, const uint32_t ui32Token1, uint32_t ui32Flags, Operand* psOperand)
-{
-    const uint32_t ui32RegNum = DecodeOperandRegisterNumberDX9(ui32Token);
-    const uint32_t ui32RegType = DecodeOperandTypeDX9(ui32Token);
-    const uint32_t bRelativeAddr = DecodeOperandIsRelativeAddressModeDX9(ui32Token);
-
-    const uint32_t ui32WriteMask = DecodeDestWriteMaskDX9(ui32Token);
-    const uint32_t ui32Swizzle = DecodeOperandSwizzleDX9(ui32Token);
-
-    SHADER_VARIABLE_TYPE ConstType;
-
-    psOperand->ui32RegisterNumber = ui32RegNum;
-
-    psOperand->iNumComponents = 4;
-
-#ifdef _DEBUG
-    psOperand->id = dx9operandID++;
-#endif
-
-    psOperand->iWriteMaskEnabled = 0;
-    psOperand->iGSInput = 0;
-    psOperand->iExtended = 0;
-    psOperand->psSubOperand[0] = 0;
-    psOperand->psSubOperand[1] = 0;
-    psOperand->psSubOperand[2] = 0;
-
-    psOperand->iIndexDims = INDEX_0D;
-
-    psOperand->iIntegerImmediate = 0;
-
-    psOperand->pszSpecialName[0] = '\0';
-
-    psOperand->eModifier = OPERAND_MODIFIER_NONE;
-    if (ui32Flags & DX9_DECODE_OPERAND_IS_SRC)
-    {
-        uint32_t ui32Modifier = DecodeSrcModifierDX9(ui32Token);
-
-        switch (ui32Modifier)
-        {
-            case SRCMOD_DX9_NONE:
-            {
-                break;
-            }
-            case SRCMOD_DX9_NEG:
-            {
-                psOperand->eModifier = OPERAND_MODIFIER_NEG;
-                break;
-            }
-            case SRCMOD_DX9_ABS:
-            {
-                psOperand->eModifier = OPERAND_MODIFIER_ABS;
-                break;
-            }
-            case SRCMOD_DX9_ABSNEG:
-            {
-                psOperand->eModifier = OPERAND_MODIFIER_ABSNEG;
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-        }
-    }
-
-    if ((ui32Flags & DX9_DECODE_OPERAND_IS_DECL) == 0)
-    {
-        if (ui32Flags & DX9_DECODE_OPERAND_IS_DEST)
-        {
-            if (ui32WriteMask != DX9_WRITEMASK_ALL)
-            {
-                psOperand->iWriteMaskEnabled = 1;
-                psOperand->eSelMode = OPERAND_4_COMPONENT_MASK_MODE;
-
-                if (ui32WriteMask & DX9_WRITEMASK_0)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_X;
-                }
-                if (ui32WriteMask & DX9_WRITEMASK_1)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_Y;
-                }
-                if (ui32WriteMask & DX9_WRITEMASK_2)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_Z;
-                }
-                if (ui32WriteMask & DX9_WRITEMASK_3)
-                {
-                    psOperand->ui32CompMask |= OPERAND_4_COMPONENT_MASK_W;
-                }
-            }
-        }
-        else if (ui32Swizzle != NO_SWIZZLE_DX9)
-        {
-            uint32_t component;
-
-            psOperand->iWriteMaskEnabled = 1;
-            psOperand->eSelMode = OPERAND_4_COMPONENT_SWIZZLE_MODE;
-
-            psOperand->ui32Swizzle = 1;
-
-            /* Add the swizzle */
-            if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(0))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_X;
-            }
-            else if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(1))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_Y;
-            }
-            else if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(2))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_Z;
-            }
-            else if (ui32Swizzle == REPLICATE_SWIZZLE_DX9(3))
-            {
-                psOperand->eSelMode = OPERAND_4_COMPONENT_SELECT_1_MODE;
-                psOperand->aui32Swizzle[0] = OPERAND_4_COMPONENT_W;
-            }
-            else
-            {
-                for (component = 0; component < 4; component++)
-                {
-                    uint32_t ui32CompSwiz = ui32Swizzle & (3 << (DX9_SWIZZLE_SHIFT + (component * 2)));
-                    ui32CompSwiz >>= (DX9_SWIZZLE_SHIFT + (component * 2));
-
-                    if (ui32CompSwiz == 0)
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_X;
-                    }
-                    else if (ui32CompSwiz == 1)
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_Y;
-                    }
-                    else if (ui32CompSwiz == 2)
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_Z;
-                    }
-                    else
-                    {
-                        psOperand->aui32Swizzle[component] = OPERAND_4_COMPONENT_W;
-                    }
-                }
-            }
-        }
-
-        if (bRelativeAddr)
-        {
-            psOperand->psSubOperand[0] = hlslcc_malloc(sizeof(Operand));
-            DecodeOperandDX9(psShader, ui32Token1, 0, ui32Flags, psOperand->psSubOperand[0]);
-
-            psOperand->iIndexDims = INDEX_1D;
-
-            psOperand->eIndexRep[0] = OPERAND_INDEX_RELATIVE;
-
-            psOperand->aui32ArraySizes[0] = 0;
-        }
-    }
-
-    if (ui32RegType == OPERAND_TYPE_DX9_CONSTBOOL)
-    {
-        ui32Flags |= DX9_DECODE_OPERAND_IS_BCONST;
-        ConstType = SVT_BOOL;
-    }
-    else if (ui32RegType == OPERAND_TYPE_DX9_CONSTINT)
-    {
-        ui32Flags |= DX9_DECODE_OPERAND_IS_ICONST;
-        ConstType = SVT_INT;
-    }
-    else if (ui32RegType == OPERAND_TYPE_DX9_CONST)
-    {
-        ui32Flags |= DX9_DECODE_OPERAND_IS_CONST;
-        ConstType = SVT_FLOAT;
-    }
-
-    switch (ui32RegType)
-    {
-        case OPERAND_TYPE_DX9_TEMP:
-        {
-            psOperand->eType = OPERAND_TYPE_TEMP;
-
-            if (ui32MaxTemp < ui32RegNum + 1)
-            {
-                ui32MaxTemp = ui32RegNum + 1;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_INPUT:
-        {
-            psOperand->eType = OPERAND_TYPE_INPUT;
-
-            ASSERT(ui32RegNum < MAX_INPUTS);
-
-            if (psShader->eShaderType == PIXEL_SHADER)
-            {
-                if (aeInputUsage[ui32RegNum] == DECLUSAGE_TEXCOORD)
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_TEXCOORD;
-                    psOperand->ui32RegisterNumber = aui32InputUsageIndex[ui32RegNum];
-                }
-                else
-                    // 0 = base colour, 1 = offset colour.
-                    if (ui32RegNum == 0)
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_OUTBASECOLOUR;
-                }
-                else
-                {
-                    ASSERT(ui32RegNum == 1);
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR;
-                }
-            }
-            break;
-        }
-        // Same value as OPERAND_TYPE_DX9_TEXCRDOUT
-        // OPERAND_TYPE_DX9_TEXCRDOUT is the pre-SM3 equivalent
-        case OPERAND_TYPE_DX9_OUTPUT:
-        {
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-
-            if (psShader->eShaderType == VERTEX_SHADER)
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_TEXCOORD;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_RASTOUT:
-        {
-            // RegNum:
-            // 0=POSIION
-            // 1=FOG
-            // 2=POINTSIZE
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-            switch (ui32RegNum)
-            {
-                case 0:
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_POSITION;
-                    break;
-                }
-                case 1:
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_FOG;
-                    break;
-                }
-                case 2:
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_POINTSIZE;
-                    psOperand->iNumComponents = 1;
-                    break;
-                }
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_ATTROUT:
-        {
-            ASSERT(psShader->eShaderType == VERTEX_SHADER);
-
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-
-            // 0 = base colour, 1 = offset colour.
-            if (ui32RegNum == 0)
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_OUTBASECOLOUR;
-            }
-            else
-            {
-                ASSERT(ui32RegNum == 1);
-                psOperand->eType = OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR;
-            }
-
-            break;
-        }
-        case OPERAND_TYPE_DX9_COLOROUT:
-        {
-            ASSERT(psShader->eShaderType == PIXEL_SHADER);
-            psOperand->eType = OPERAND_TYPE_OUTPUT;
-            break;
-        }
-        case OPERAND_TYPE_DX9_CONSTBOOL:
-        case OPERAND_TYPE_DX9_CONSTINT:
-        case OPERAND_TYPE_DX9_CONST:
-        {
-            // c# = constant float
-            // i# = constant int
-            // b# = constant bool
-
-            // c0 might be an immediate while i0 is in the constant buffer
-            if (aui32ImmediateConst[ui32RegNum] & ui32Flags)
-            {
-                if (ConstType != SVT_FLOAT)
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_IMMCONSTINT;
-                }
-                else
-                {
-                    psOperand->eType = OPERAND_TYPE_SPECIAL_IMMCONST;
-                }
-            }
-            else
-            {
-                psOperand->eType = OPERAND_TYPE_CONSTANT_BUFFER;
-                psOperand->aui32ArraySizes[1] = psOperand->ui32RegisterNumber;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_ADDR:
-        {
-            // Vertex shader: address register (only have one of these)
-            // Pixel shader: texture coordinate register (a few of these)
-            if (psShader->eShaderType == PIXEL_SHADER)
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_TEXCOORD;
-            }
-            else
-            {
-                psOperand->eType = OPERAND_TYPE_SPECIAL_ADDRESS;
-            }
-            break;
-        }
-        case OPERAND_TYPE_DX9_SAMPLER:
-        {
-            psOperand->eType = OPERAND_TYPE_RESOURCE;
-            break;
-        }
-        case OPERAND_TYPE_DX9_LOOP:
-        {
-            psOperand->eType = OPERAND_TYPE_SPECIAL_LOOPCOUNTER;
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-}
-
-static void DeclareNumTemps(ShaderData* psShader, const uint32_t ui32NumTemps, Declaration* psDecl)
-{
-    (void)psShader;
-
-    psDecl->eOpcode = OPCODE_DCL_TEMPS;
-    psDecl->value.ui32NumTemps = ui32NumTemps;
-}
-
-static void SetupRegisterUsage(const ShaderData* psShader, const uint32_t ui32Token0, const uint32_t ui32Token1)
-{
-    (void)psShader;
-
-    DECLUSAGE_DX9 eUsage = DecodeUsageDX9(ui32Token0);
-    uint32_t ui32UsageIndex = DecodeUsageIndexDX9(ui32Token0);
-    uint32_t ui32RegNum = DecodeOperandRegisterNumberDX9(ui32Token1);
-    uint32_t ui32RegType = DecodeOperandTypeDX9(ui32Token1);
-
-    if (ui32RegType == OPERAND_TYPE_DX9_INPUT)
-    {
-        ASSERT(ui32RegNum < MAX_INPUTS);
-        aeInputUsage[ui32RegNum] = eUsage;
-        aui32InputUsageIndex[ui32RegNum] = ui32UsageIndex;
-    }
-}
-
-// Declaring one constant from a constant buffer will cause all constants in the buffer decalared.
-// In dx9 there is only one constant buffer per shader.
-static void DeclareConstantBuffer(const ShaderData* psShader, Declaration* psDecl)
-{
-    // Pick any constant register in the table. Might not start at c0 (e.g. when register(cX) is used).
-    uint32_t ui32RegNum = psShader->sInfo.psConstantBuffers->asVars[0].ui32StartOffset / 16;
-    OPERAND_TYPE_DX9 ui32RegType = OPERAND_TYPE_DX9_CONST;
-
-    if (psShader->sInfo.psConstantBuffers->asVars[0].sType.Type == SVT_INT)
-    {
-        ui32RegType = OPERAND_TYPE_DX9_CONSTINT;
-    }
-    else if (psShader->sInfo.psConstantBuffers->asVars[0].sType.Type == SVT_BOOL)
-    {
-        ui32RegType = OPERAND_TYPE_DX9_CONSTBOOL;
-    }
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT;
-    }
-    else
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT_PS;
-    }
-    psDecl->ui32NumOperands = 1;
-
-    DecodeOperandDX9(psShader, CreateOperandTokenDX9(ui32RegNum, ui32RegType), 0, DX9_DECODE_OPERAND_IS_DECL, &psDecl->asOperands[0]);
-
-    ASSERT(psDecl->asOperands[0].eType == OPERAND_TYPE_CONSTANT_BUFFER);
-
-    psDecl->eOpcode = OPCODE_DCL_CONSTANT_BUFFER;
-
-    ASSERT(psShader->sInfo.ui32NumConstantBuffers);
-
-    psDecl->asOperands[0].aui32ArraySizes[0] = 0;                                                               // Const buffer index
-    psDecl->asOperands[0].aui32ArraySizes[1] = psShader->sInfo.psConstantBuffers[0].ui32TotalSizeInBytes / 16;  // Number of vec4 constants.
-}
-
-static void DecodeDeclarationDX9(const ShaderData* psShader, const uint32_t ui32Token0, const uint32_t ui32Token1, Declaration* psDecl)
-{
-    /*uint32_t ui32UsageIndex = DecodeUsageIndexDX9(ui32Token0);*/
-    uint32_t ui32RegType = DecodeOperandTypeDX9(ui32Token1);
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT;
-    }
-    else
-    {
-        psDecl->eOpcode = OPCODE_DCL_INPUT_PS;
-    }
-    psDecl->ui32NumOperands = 1;
-    DecodeOperandDX9(psShader, ui32Token1, 0, DX9_DECODE_OPERAND_IS_DECL, &psDecl->asOperands[0]);
-
-    if (ui32RegType == OPERAND_TYPE_DX9_SAMPLER)
-    {
-        const RESOURCE_DIMENSION eResDim = DecodeTextureTypeMaskDX9(ui32Token0);
-        psDecl->value.eResourceDimension = eResDim;
-        psDecl->ui32IsShadowTex = 0;
-        psDecl->eOpcode = OPCODE_DCL_RESOURCE;
-    }
-
-    if (psDecl->asOperands[0].eType == OPERAND_TYPE_OUTPUT)
-    {
-        psDecl->eOpcode = OPCODE_DCL_OUTPUT;
-
-        if (psDecl->asOperands[0].ui32RegisterNumber == 0 && psShader->eShaderType == VERTEX_SHADER)
-        {
-            psDecl->eOpcode = OPCODE_DCL_OUTPUT_SIV;
-            // gl_Position
-            psDecl->asOperands[0].eSpecialName = NAME_POSITION;
-        }
-    }
-    else if (psDecl->asOperands[0].eType == OPERAND_TYPE_CONSTANT_BUFFER)
-    {
-        psDecl->eOpcode = OPCODE_DCL_CONSTANT_BUFFER;
-
-        ASSERT(psShader->sInfo.ui32NumConstantBuffers);
-
-        psDecl->asOperands[0].aui32ArraySizes[0] = 0;                                                               // Const buffer index
-        psDecl->asOperands[0].aui32ArraySizes[1] = psShader->sInfo.psConstantBuffers[0].ui32TotalSizeInBytes / 16;  // Number of vec4 constants.
-    }
-}
-
-static void DefineDX9(ShaderData* psShader,
-                      const uint32_t ui32RegNum,
-                      const uint32_t ui32Flags,
-                      const uint32_t c0,
-                      const uint32_t c1,
-                      const uint32_t c2,
-                      const uint32_t c3,
-                      Declaration* psDecl)
-{
-    (void)psShader;
-    (void)psDecl;
-
-    psDecl->eOpcode = OPCODE_SPECIAL_DCL_IMMCONST;
-    psDecl->ui32NumOperands = 2;
-
-    memset(&psDecl->asOperands[0], 0, sizeof(Operand));
-    psDecl->asOperands[0].eType = OPERAND_TYPE_SPECIAL_IMMCONST;
-
-    psDecl->asOperands[0].ui32RegisterNumber = ui32RegNum;
-
-    if (ui32Flags & (DX9_DECODE_OPERAND_IS_ICONST | DX9_DECODE_OPERAND_IS_BCONST))
-    {
-        psDecl->asOperands[0].eType = OPERAND_TYPE_SPECIAL_IMMCONSTINT;
-    }
-
-    aui32ImmediateConst[ui32RegNum] |= ui32Flags;
-
-    memset(&psDecl->asOperands[1], 0, sizeof(Operand));
-    psDecl->asOperands[1].eType = OPERAND_TYPE_IMMEDIATE32;
-    psDecl->asOperands[1].iNumComponents = 4;
-    psDecl->asOperands[1].iIntegerImmediate = (ui32Flags & (DX9_DECODE_OPERAND_IS_ICONST | DX9_DECODE_OPERAND_IS_BCONST)) ? 1 : 0;
-    psDecl->asOperands[1].afImmediates[0] = *((float*)&c0);
-    psDecl->asOperands[1].afImmediates[1] = *((float*)&c1);
-    psDecl->asOperands[1].afImmediates[2] = *((float*)&c2);
-    psDecl->asOperands[1].afImmediates[3] = *((float*)&c3);
-}
-
-static void CreateD3D10Instruction(ShaderData* psShader,
-                                   Instruction* psInst,
-                                   const OPCODE_TYPE eType,
-                                   const uint32_t bHasDest,
-                                   const uint32_t ui32SrcCount,
-                                   const uint32_t* pui32Tokens)
-{
-    uint32_t ui32Src;
-    uint32_t ui32Offset = 1;
-
-    memset(psInst, 0, sizeof(Instruction));
-
-#ifdef _DEBUG
-    psInst->id = dx9instructionID++;
-#endif
-
-    psInst->eOpcode = eType;
-    psInst->ui32NumOperands = ui32SrcCount;
-
-    if (bHasDest)
-    {
-        ++psInst->ui32NumOperands;
-
-        DecodeOperandDX9(psShader, pui32Tokens[ui32Offset], pui32Tokens[ui32Offset + 1], DX9_DECODE_OPERAND_IS_DEST, &psInst->asOperands[0]);
-
-        if (DecodeDestModifierDX9(pui32Tokens[ui32Offset]) & DESTMOD_DX9_SATURATE)
-        {
-            psInst->bSaturate = 1;
-        }
-
-        ui32Offset++;
-        psInst->ui32FirstSrc = 1;
-    }
-
-    for (ui32Src = 0; ui32Src < ui32SrcCount; ++ui32Src)
-    {
-        DecodeOperandDX9(psShader, pui32Tokens[ui32Offset], pui32Tokens[ui32Offset + 1], DX9_DECODE_OPERAND_IS_SRC, &psInst->asOperands[bHasDest + ui32Src]);
-
-        ui32Offset++;
-    }
-}
-
-ShaderData* DecodeDX9BC(const uint32_t* pui32Tokens)
-{
-    const uint32_t* pui32CurrentToken = pui32Tokens;
-    uint32_t ui32NumInstructions = 0;
-    uint32_t ui32NumDeclarations = 0;
-    Instruction* psInst;
-    Declaration* psDecl;
-    uint32_t decl, inst;
-    uint32_t bDeclareConstantTable = 0;
-    ShaderData* psShader = hlslcc_calloc(1, sizeof(ShaderData));
-
-    memset(aui32ImmediateConst, 0, 256);
-
-    psShader->ui32MajorVersion = DecodeProgramMajorVersionDX9(*pui32CurrentToken);
-    psShader->ui32MinorVersion = DecodeProgramMinorVersionDX9(*pui32CurrentToken);
-    psShader->eShaderType = DecodeShaderTypeDX9(*pui32CurrentToken);
-
-    pui32CurrentToken++;
-
-    // Work out how many instructions and declarations we need to allocate memory for.
-    while (1)
-    {
-        OPCODE_TYPE_DX9 eOpcode = DecodeOpcodeTypeDX9(pui32CurrentToken[0]);
-        uint32_t ui32InstLen = DecodeInstructionLengthDX9(pui32CurrentToken[0]);
-
-        if (eOpcode == OPCODE_DX9_END)
-        {
-            // SM4+ always end with RET.
-            // Insert a RET instruction on END to
-            // replicate this behaviour.
-            ++ui32NumInstructions;
-            break;
-        }
-        else if (eOpcode == OPCODE_DX9_COMMENT)
-        {
-            ui32InstLen = DecodeCommentLengthDX9(pui32CurrentToken[0]);
-            if (pui32CurrentToken[1] == FOURCC_CTAB)
-            {
-                LoadD3D9ConstantTable((char*)(&pui32CurrentToken[2]), &psShader->sInfo);
-
-                ASSERT(psShader->sInfo.ui32NumConstantBuffers);
-
-                if (psShader->sInfo.psConstantBuffers[0].ui32NumVars)
-                {
-                    ++ui32NumDeclarations;
-                    bDeclareConstantTable = 1;
-                }
-            }
-        }
-        else if ((eOpcode == OPCODE_DX9_DEF) || (eOpcode == OPCODE_DX9_DEFI) || (eOpcode == OPCODE_DX9_DEFB))
-        {
-            ++ui32NumDeclarations;
-        }
-        else if (eOpcode == OPCODE_DX9_DCL)
-        {
-            const OPERAND_TYPE_DX9 eType = DecodeOperandTypeDX9(pui32CurrentToken[2]);
-            uint32_t ignoreDCL = 0;
-
-            // Inputs and outputs are declared in AddVersionDependentCode
-            if (psShader->eShaderType == PIXEL_SHADER && (OPERAND_TYPE_DX9_CONST != eType && OPERAND_TYPE_DX9_SAMPLER != eType))
-            {
-                ignoreDCL = 1;
-            }
-            if (!ignoreDCL)
-            {
-                ++ui32NumDeclarations;
-            }
-        }
-        else
-        {
-            switch (eOpcode)
-            {
-                case OPCODE_DX9_NRM:
-                {
-                    // Emulate with dp4 and rsq
-                    ui32NumInstructions += 2;
-                    break;
-                }
-                default:
-                {
-                    ++ui32NumInstructions;
-                    break;
-                }
-            }
-        }
-
-        pui32CurrentToken += ui32InstLen + 1;
-    }
-
-    psInst = hlslcc_malloc(sizeof(Instruction) * ui32NumInstructions);
-    psShader->asPhase[MAIN_PHASE].ui32InstanceCount = 1;
-    psShader->asPhase[MAIN_PHASE].ppsInst = hlslcc_malloc(sizeof(Instruction*));
-    psShader->asPhase[MAIN_PHASE].ppsInst[0] = psInst;
-    psShader->asPhase[MAIN_PHASE].pui32InstCount = hlslcc_malloc(sizeof(uint32_t));
-    psShader->asPhase[MAIN_PHASE].pui32InstCount[0] = ui32NumInstructions;
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        // Declare gl_Position. vs_3_0 does declare it, SM1/2 do not
-        ui32NumDeclarations++;
-    }
-
-    // For declaring temps.
-    ui32NumDeclarations++;
-
-    psDecl = hlslcc_malloc(sizeof(Declaration) * ui32NumDeclarations);
-    psShader->asPhase[MAIN_PHASE].ppsDecl = hlslcc_malloc(sizeof(Declaration*));
-    psShader->asPhase[MAIN_PHASE].ppsDecl[0] = psDecl;
-    psShader->asPhase[MAIN_PHASE].pui32DeclCount = hlslcc_malloc(sizeof(uint32_t));
-    psShader->asPhase[MAIN_PHASE].pui32DeclCount[0] = ui32NumDeclarations;
-
-    pui32CurrentToken = pui32Tokens + 1;
-
-    inst = 0;
-    decl = 0;
-    while (1)
-    {
-        OPCODE_TYPE_DX9 eOpcode = DecodeOpcodeTypeDX9(pui32CurrentToken[0]);
-        uint32_t ui32InstLen = DecodeInstructionLengthDX9(pui32CurrentToken[0]);
-
-        if (eOpcode == OPCODE_DX9_END)
-        {
-            CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RET, 0, 0, pui32CurrentToken);
-            inst++;
-            break;
-        }
-        else if (eOpcode == OPCODE_DX9_COMMENT)
-        {
-            ui32InstLen = DecodeCommentLengthDX9(pui32CurrentToken[0]);
-        }
-        else if (eOpcode == OPCODE_DX9_DCL)
-        {
-            const OPERAND_TYPE_DX9 eType = DecodeOperandTypeDX9(pui32CurrentToken[2]);
-            uint32_t ignoreDCL = 0;
-            // Inputs and outputs are declared in AddVersionDependentCode
-            if (psShader->eShaderType == PIXEL_SHADER && (OPERAND_TYPE_DX9_CONST != eType && OPERAND_TYPE_DX9_SAMPLER != eType))
-            {
-                ignoreDCL = 1;
-            }
-
-            SetupRegisterUsage(psShader, pui32CurrentToken[1], pui32CurrentToken[2]);
-
-            if (!ignoreDCL)
-            {
-                DecodeDeclarationDX9(psShader, pui32CurrentToken[1], pui32CurrentToken[2], &psDecl[decl]);
-                decl++;
-            }
-        }
-        else if ((eOpcode == OPCODE_DX9_DEF) || (eOpcode == OPCODE_DX9_DEFI) || (eOpcode == OPCODE_DX9_DEFB))
-        {
-            const uint32_t ui32Const0 = *(pui32CurrentToken + 2);
-            const uint32_t ui32Const1 = *(pui32CurrentToken + 3);
-            const uint32_t ui32Const2 = *(pui32CurrentToken + 4);
-            const uint32_t ui32Const3 = *(pui32CurrentToken + 5);
-            uint32_t ui32Flags = 0;
-
-            if (eOpcode == OPCODE_DX9_DEF)
-            {
-                ui32Flags |= DX9_DECODE_OPERAND_IS_CONST;
-            }
-            else if (eOpcode == OPCODE_DX9_DEFI)
-            {
-                ui32Flags |= DX9_DECODE_OPERAND_IS_ICONST;
-            }
-            else
-            {
-                ui32Flags |= DX9_DECODE_OPERAND_IS_BCONST;
-            }
-
-            DefineDX9(psShader, DecodeOperandRegisterNumberDX9(pui32CurrentToken[1]), ui32Flags, ui32Const0, ui32Const1, ui32Const2, ui32Const3, &psDecl[decl]);
-            decl++;
-        }
-        else
-        {
-            switch (eOpcode)
-            {
-                case OPCODE_DX9_MOV:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MOV, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_LIT:
-                {
-                    /*Dest.x = 1
-                      Dest.y = (Src0.x > 0) ? Src0.x : 0
-                      Dest.z = (Src0.x > 0 && Src0.y > 0) ? pow(Src0.y, Src0.w) : 0
-                      Dest.w = 1
-                    */
-                    ASSERT(0);
-                    break;
-                }
-                case OPCODE_DX9_ADD:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ADD, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_SUB:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ADD, 1, 2, pui32CurrentToken);
-                    ASSERT(psInst[inst].asOperands[2].eModifier == OPERAND_MODIFIER_NONE);
-                    psInst[inst].asOperands[2].eModifier = OPERAND_MODIFIER_NEG;
-                    break;
-                }
-                case OPCODE_DX9_MAD:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MAD, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_MUL:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MUL, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_RCP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RCP, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_RSQ:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RSQ, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DP3:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP3, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DP4:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP4, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_MIN:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MIN, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_MAX:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MAX, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_SLT:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LT, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_SGE:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_GE, 1, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_EXP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_EXP, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_LOG:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LOG, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_NRM:
-                {
-                    // Convert NRM RESULT, SRCA into:
-                    // dp4 RESULT, SRCA, SRCA
-                    // rsq RESULT, RESULT
-
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP4, 1, 1, pui32CurrentToken);
-                    memcpy(&psInst[inst].asOperands[2], &psInst[inst].asOperands[1], sizeof(Operand));
-                    psInst[inst].ui32NumOperands++;
-                    ++inst;
-
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RSQ, 0, 0, pui32CurrentToken);
-                    memcpy(&psInst[inst].asOperands[0], &psInst[inst - 1].asOperands[0], sizeof(Operand));
-                    memcpy(&psInst[inst].asOperands[1], &psInst[inst - 1].asOperands[0], sizeof(Operand));
-                    psInst[inst].ui32NumOperands++;
-                    psInst[inst].ui32NumOperands++;
-                    break;
-                }
-                case OPCODE_DX9_SINCOS:
-                {
-                    // Before SM3, SINCOS has 2 extra constant sources -D3DSINCOSCONST1 and D3DSINCOSCONST2.
-                    // Ignore them.
-
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SINCOS, 1, 1, pui32CurrentToken);
-                    // Pre-SM4:
-                    // If the write mask is .x: dest.x = cos( V )
-                    // If the write mask is .y: dest.y = sin( V )
-                    // If the write mask is .xy:
-                    // dest.x = cos( V )
-                    // dest.y = sin( V )
-
-                    // SM4+
-                    // destSin destCos Angle
-
-                    psInst[inst].ui32NumOperands = 3;
-
-                    // Set the angle
-                    memcpy(&psInst[inst].asOperands[2], &psInst[inst].asOperands[1], sizeof(Operand));
-
-                    // Set the cosine dest
-                    memcpy(&psInst[inst].asOperands[1], &psInst[inst].asOperands[0], sizeof(Operand));
-
-                    // Set write masks
-                    psInst[inst].asOperands[0].ui32CompMask &= ~OPERAND_4_COMPONENT_MASK_Y;
-                    if (psInst[inst].asOperands[0].ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                    {
-                        // Need cosine
-                    }
-                    else
-                    {
-                        psInst[inst].asOperands[0].eType = OPERAND_TYPE_NULL;
-                    }
-                    psInst[inst].asOperands[1].ui32CompMask &= ~OPERAND_4_COMPONENT_MASK_X;
-                    if (psInst[inst].asOperands[1].ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                    {
-                        // Need sine
-                    }
-                    else
-                    {
-                        psInst[inst].asOperands[1].eType = OPERAND_TYPE_NULL;
-                    }
-
-                    break;
-                }
-                case OPCODE_DX9_FRC:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_FRC, 1, 1, pui32CurrentToken);
-                    break;
-                }
-
-                case OPCODE_DX9_MOVA:
-                {
-                    // MOVA preforms RoundToNearest on the src data.
-                    // The only rounding functions available in all GLSL version are ceil and floor.
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ROUND_NI, 1, 1, pui32CurrentToken);
-                    break;
-                }
-
-                case OPCODE_DX9_TEX:
-                {
-                    // texld r0, t0, s0
-                    // srcAddress[.swizzle], srcResource[.swizzle], srcSampler
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SAMPLE, 1, 2, pui32CurrentToken);
-                    psInst[inst].asOperands[2].ui32RegisterNumber = 0;
-
-                    break;
-                }
-                case OPCODE_DX9_TEXLDL:
-                {
-                    // texld r0, t0, s0
-                    // srcAddress[.swizzle], srcResource[.swizzle], srcSampler
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SAMPLE_L, 1, 2, pui32CurrentToken);
-                    psInst[inst].asOperands[2].ui32RegisterNumber = 0;
-
-                    // Lod comes from fourth coordinate of address.
-                    memcpy(&psInst[inst].asOperands[4], &psInst[inst].asOperands[1], sizeof(Operand));
-
-                    psInst[inst].ui32NumOperands = 5;
-
-                    break;
-                }
-
-                case OPCODE_DX9_IF:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_IF, 0, 1, pui32CurrentToken);
-                    psInst[inst].eDX9TestType = D3DSPC_BOOLEAN;
-                    break;
-                }
-
-                case OPCODE_DX9_IFC:
-                {
-                    const COMPARISON_DX9 eCmpOp = DecodeComparisonDX9(pui32CurrentToken[0]);
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_IF, 0, 2, pui32CurrentToken);
-                    psInst[inst].eDX9TestType = eCmpOp;
-                    break;
-                }
-                case OPCODE_DX9_ELSE:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ELSE, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_CMP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_MOVC, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_REP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_REP, 0, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_ENDREP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ENDREP, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_BREAKC:
-                {
-                    const COMPARISON_DX9 eCmpOp = DecodeComparisonDX9(pui32CurrentToken[0]);
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_BREAKC, 0, 2, pui32CurrentToken);
-                    psInst[inst].eDX9TestType = eCmpOp;
-                    break;
-                }
-
-                case OPCODE_DX9_DSX:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DERIV_RTX, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DSY:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DERIV_RTY, 1, 1, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_TEXKILL:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DISCARD, 1, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_TEXLDD:
-                {
-                    // texldd, dst, src0, src1, src2, src3
-                    // srcAddress[.swizzle], srcResource[.swizzle], srcSampler, XGradient, YGradient
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_SAMPLE_D, 1, 4, pui32CurrentToken);
-
-                    // Move the gradients one slot up
-                    memcpy(&psInst[inst].asOperands[5], &psInst[inst].asOperands[4], sizeof(Operand));
-                    memcpy(&psInst[inst].asOperands[4], &psInst[inst].asOperands[3], sizeof(Operand));
-
-                    // Sampler register
-                    psInst[inst].asOperands[3].ui32RegisterNumber = 0;
-                    psInst[inst].ui32NumOperands = 6;
-                    break;
-                }
-                case OPCODE_DX9_LRP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LRP, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_DP2ADD:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_DP2ADD, 1, 3, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_POW:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_POW, 1, 2, pui32CurrentToken);
-                    break;
-                }
-
-                case OPCODE_DX9_DST:
-                case OPCODE_DX9_M4x4:
-                case OPCODE_DX9_M4x3:
-                case OPCODE_DX9_M3x4:
-                case OPCODE_DX9_M3x3:
-                case OPCODE_DX9_M3x2:
-                case OPCODE_DX9_CALL:
-                case OPCODE_DX9_CALLNZ:
-                case OPCODE_DX9_LABEL:
-
-                case OPCODE_DX9_CRS:
-                case OPCODE_DX9_SGN:
-                case OPCODE_DX9_ABS:
-
-                case OPCODE_DX9_TEXCOORD:
-                case OPCODE_DX9_TEXBEM:
-                case OPCODE_DX9_TEXBEML:
-                case OPCODE_DX9_TEXREG2AR:
-                case OPCODE_DX9_TEXREG2GB:
-                case OPCODE_DX9_TEXM3x2PAD:
-                case OPCODE_DX9_TEXM3x2TEX:
-                case OPCODE_DX9_TEXM3x3PAD:
-                case OPCODE_DX9_TEXM3x3TEX:
-                case OPCODE_DX9_TEXM3x3SPEC:
-                case OPCODE_DX9_TEXM3x3VSPEC:
-                case OPCODE_DX9_EXPP:
-                case OPCODE_DX9_LOGP:
-                case OPCODE_DX9_CND:
-                case OPCODE_DX9_TEXREG2RGB:
-                case OPCODE_DX9_TEXDP3TEX:
-                case OPCODE_DX9_TEXM3x2DEPTH:
-                case OPCODE_DX9_TEXDP3:
-                case OPCODE_DX9_TEXM3x3:
-                case OPCODE_DX9_TEXDEPTH:
-                case OPCODE_DX9_BEM:
-                case OPCODE_DX9_SETP:
-                case OPCODE_DX9_BREAKP:
-                {
-                    ASSERT(0);
-                    break;
-                }
-                case OPCODE_DX9_NOP:
-                case OPCODE_DX9_PHASE:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_NOP, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_LOOP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_LOOP, 0, 2, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_RET:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_RET, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_ENDLOOP:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ENDLOOP, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_ENDIF:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_ENDIF, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                case OPCODE_DX9_BREAK:
-                {
-                    CreateD3D10Instruction(psShader, &psInst[inst], OPCODE_BREAK, 0, 0, pui32CurrentToken);
-                    break;
-                }
-                default:
-                {
-                    ASSERT(0);
-                    break;
-                }
-            }
-
-            UpdateOperandReferences(psShader, &psInst[inst]);
-
-            inst++;
-        }
-
-        pui32CurrentToken += ui32InstLen + 1;
-    }
-
-    DeclareNumTemps(psShader, ui32MaxTemp, &psDecl[decl]);
-    ++decl;
-
-    if (psShader->eShaderType == VERTEX_SHADER)
-    {
-        // Declare gl_Position. vs_3_0 does declare it, SM1/2 do not
-        if (bDeclareConstantTable)
-        {
-            DecodeDeclarationDX9(psShader, 0, CreateOperandTokenDX9(0, OPERAND_TYPE_DX9_RASTOUT), &psDecl[decl + 1]);
-        }
-        else
-        {
-            DecodeDeclarationDX9(psShader, 0, CreateOperandTokenDX9(0, OPERAND_TYPE_DX9_RASTOUT), &psDecl[decl]);
-        }
-    }
-
-    if (bDeclareConstantTable)
-    {
-        DeclareConstantBuffer(psShader, &psDecl[decl]);
-    }
-
-    return psShader;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/debug.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/debug.h
deleted file mode 100644
index 5b071709bc..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/debug.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef DEBUG_H_
-#define DEBUG_H_
-
-#ifdef _DEBUG
-#include "assert.h"
-#define ASSERT(expr) CustomAssert(expr)
-static void CustomAssert(int expression)
-{
-    if(!expression)
-    {
-        assert(0);
-    }
-}
-#else
-#define ASSERT(expr)
-#endif
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/decode.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/decode.h
deleted file mode 100644
index f0981cb15c..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/decode.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef DECODE_H
-#define DECODE_H
-
-#include "internal_includes/structs.h"
-
-ShaderData* DecodeDXBC(uint32_t* data);
-
-//You don't need to call this directly because DecodeDXBC
-//will call DecodeDX9BC if the shader looks
-//like it is SM1/2/3.
-ShaderData* DecodeDX9BC(const uint32_t* pui32Tokens);
-
-void UpdateOperandReferences(ShaderData* psShader, Instruction* psInst);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/hlslcc_malloc.c b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/hlslcc_malloc.c
deleted file mode 100644
index 57c86655b7..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/hlslcc_malloc.c
+++ /dev/null
@@ -1,37 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include <stdlib.h>
-
-#ifdef __APPLE_CC__
-    #include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
-
-// Wrapping these functions since we are taking the address of them and the std functions are dllimport which produce
-// warning C4232
-void* std_malloc(size_t size)
-{
-    return malloc(size);
-}
-
-void* std_calloc(size_t num, size_t size)
-{
-    return calloc(num, size);
-}
-
-void std_free(void* p)
-{
-    free(p);
-}
-
-void* std_realloc(void* p, size_t size)
-{
-    return realloc(p, size);
-}
-
-void* (*hlslcc_malloc)(size_t size) = std_malloc;
-void* (*hlslcc_calloc)(size_t num,size_t size) = std_calloc;
-void (*hlslcc_free)(void *p) = std_free;
-void* (*hlslcc_realloc)(void *p,size_t size) = std_realloc;
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/hlslcc_malloc.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/hlslcc_malloc.h
deleted file mode 100644
index 493aa1fe1e..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/hlslcc_malloc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef __HLSCC_MALLOC_H
-#define __HLSCC_MALLOC_H
-
-extern void* (*hlslcc_malloc)(size_t size);
-extern void* (*hlslcc_calloc)(size_t num,size_t size);
-extern void (*hlslcc_free)(void *p);
-extern void* (*hlslcc_realloc)(void *p,size_t size);
-
-#define bstr__alloc hlslcc_malloc
-#define bstr__free hlslcc_free
-#define bstr__realloc hlslcc_realloc
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/languages.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/languages.h
deleted file mode 100644
index 35d7a9b125..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/languages.h
+++ /dev/null
@@ -1,213 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef LANGUAGES_H
-#define LANGUAGES_H
-
-#include "hlslcc.h"
-
-static int InOutSupported(const ShaderLang eLang)
-{
-    if(eLang == LANG_ES_100 || eLang == LANG_120)
-    {
-        return 0;
-    }
-    return 1;
-}
-
-static int WriteToFragData(const ShaderLang eLang)
-{
-    if(eLang == LANG_ES_100 || eLang == LANG_120)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int ShaderBitEncodingSupported(const ShaderLang eLang)
-{
-    if( eLang != LANG_ES_300 &&
-        eLang != LANG_ES_310 &&
-        eLang < LANG_330)
-    {
-        return 0;
-    }
-    return 1;
-}
-
-static int HaveOverloadedTextureFuncs(const ShaderLang eLang)
-{
-    if(eLang == LANG_ES_100 || eLang == LANG_120)
-    {
-        return 0;
-    }
-    return 1;
-}
-
-//Only enable for ES.
-//Not present in 120, ignored in other desktop languages.
-static int HavePrecisionQualifers(const ShaderLang eLang)
-{
-    if(eLang >= LANG_ES_100 && eLang <= LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-//Only on vertex inputs and pixel outputs.
-static int HaveLimitedInOutLocationQualifier(const ShaderLang eLang, unsigned int flags)
-{
-    (void)flags;
-
-    if(eLang >= LANG_330 || eLang == LANG_ES_300 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveInOutLocationQualifier(const ShaderLang eLang,const struct GlExtensions *extensions, unsigned int flags)
-{
-    (void)flags;
-
-    if(eLang >= LANG_410 || eLang == LANG_ES_310 || (extensions && ((GlExtensions*)extensions)->ARB_explicit_attrib_location))
-    {
-        return 1;
-    }
-    return 0;
-}
-
-//layout(binding = X) uniform {uniformA; uniformB;}
-//layout(location = X) uniform uniform_name;
-static int HaveUniformBindingsAndLocations(const ShaderLang eLang,const struct GlExtensions *extensions, unsigned int flags)
-{
-    if (flags & HLSLCC_FLAG_DISABLE_EXPLICIT_LOCATIONS)
-        return 0;
-
-    if (eLang >= LANG_430 || eLang == LANG_ES_310 ||
-        (extensions && ((GlExtensions*)extensions)->ARB_explicit_uniform_location && ((GlExtensions*)extensions)->ARB_shading_language_420pack))
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int DualSourceBlendSupported(const ShaderLang eLang)
-{
-    if(eLang >= LANG_330)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int SubroutinesSupported(const ShaderLang eLang)
-{
-    if(eLang >= LANG_400)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-//Before 430, flat/smooth/centroid/noperspective must match
-//between fragment and its previous stage.
-//HLSL bytecode only tells us the interpolation in pixel shader.
-static int PixelInterpDependency(const ShaderLang eLang)
-{
-    if(eLang < LANG_430)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveUVec(const ShaderLang eLang)
-{
-    switch(eLang)
-    {
-    case LANG_ES_100:
-    case LANG_120:
-        return 0;
-    default:
-        break;
-    }
-    return 1;
-}
-
-static int HaveGather(const ShaderLang eLang)
-{
-    if(eLang >= LANG_400 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveGatherNonConstOffset(const ShaderLang eLang)
-{
-    if(eLang >= LANG_420 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-
-static int HaveQueryLod(const ShaderLang eLang)
-{
-    if(eLang >= LANG_400)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveQueryLevels(const ShaderLang eLang)
-{
-    if(eLang >= LANG_430)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-
-static int HaveAtomicCounter(const ShaderLang eLang)
-{
-    if(eLang >= LANG_420 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveAtomicMem(const ShaderLang eLang)
-{
-    if(eLang >= LANG_430)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveCompute(const ShaderLang eLang)
-{
-    if(eLang >= LANG_430 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static int HaveImageLoadStore(const ShaderLang eLang)
-{
-    if(eLang >= LANG_420 || eLang == LANG_ES_310)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/reflect.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/reflect.h
deleted file mode 100644
index 6db63de4ca..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/reflect.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef REFLECT_H
-#define REFLECT_H
-
-#include "hlslcc.h"
-
-ResourceGroup ResourceTypeToResourceGroup(ResourceType);
-
-int GetResourceFromBindingPoint(const ResourceGroup eGroup, const uint32_t ui32BindPoint, const ShaderInfo* psShaderInfo, ResourceBinding** ppsOutBinding);
-
-void GetConstantBufferFromBindingPoint(const ResourceGroup eGroup, const uint32_t ui32BindPoint, const ShaderInfo* psShaderInfo, ConstantBuffer** ppsConstBuf);
-
-int GetInterfaceVarFromOffset(uint32_t ui32Offset, ShaderInfo* psShaderInfo, ShaderVar** ppsShaderVar);
-
-int GetInputSignatureFromRegister(const uint32_t ui32Register, const ShaderInfo* psShaderInfo, InOutSignature** ppsOut);
-int GetOutputSignatureFromRegister(const uint32_t currentPhase,
-                                   const uint32_t ui32Register,
-                                   const uint32_t ui32Stream,
-                                   const uint32_t ui32CompMask,
-                                   ShaderInfo* psShaderInfo,
-                                   InOutSignature** ppsOut);
-
-int GetOutputSignatureFromSystemValue(SPECIAL_NAME eSystemValueType, uint32_t ui32SemanticIndex, ShaderInfo* psShaderInfo, InOutSignature** ppsOut);
-
-int GetShaderVarFromOffset(const uint32_t ui32Vec4Offset,
-                           const uint32_t* pui32Swizzle,
-                           ConstantBuffer* psCBuf,
-                           ShaderVarType** ppsShaderVar,
-                           int32_t* pi32Index,
-                           int32_t* pi32Rebase);
-
-typedef struct
-{
-    uint32_t* pui32Inputs;
-    uint32_t* pui32Outputs;
-    uint32_t* pui32Resources;
-    uint32_t* pui32Interfaces;
-    uint32_t* pui32Inputs11;
-    uint32_t* pui32Outputs11;
-    uint32_t* pui32OutputsWithStreams;
-    uint32_t* pui32PatchConstants;
-    uint32_t* pui32Effects10Data;
-} ReflectionChunks;
-
-void LoadShaderInfo(const uint32_t ui32MajorVersion,
-    const uint32_t ui32MinorVersion,
-    const ReflectionChunks* psChunks,
-    ShaderInfo* psInfo);
-
-void LoadD3D9ConstantTable(const char* data,
-    ShaderInfo* psInfo);
-
-void FreeShaderInfo(ShaderInfo* psShaderInfo);
-
-#if 0
-//--- Utility functions ---
-
-//Returns 0 if not found, 1 otherwise.
-int GetResourceFromName(const char* name, ShaderInfo* psShaderInfo, ResourceBinding* psBinding);
-
-//These call into OpenGL and modify the uniforms of the currently bound program.
-void SetResourceValueF(ResourceBinding* psBinding, float* value);
-void SetResourceValueI(ResourceBinding* psBinding, int* value);
-void SetResourceValueStr(ResourceBinding* psBinding, char* value); //Used for interfaces/subroutines. Also for constant buffers?
-
-void CreateUniformBufferObjectFromResource(ResourceBinding* psBinding, uint32_t* ui32GLHandle);
-//------------------------
-#endif
-
-#endif
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/shaderLimits.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/shaderLimits.h
deleted file mode 100644
index 3561f7c78b..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/shaderLimits.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef HLSLCC_SHADER_LIMITS_H
-#define HLSLCC_SHADER_LIMITS_H
-
-static enum {MAX_SHADER_VEC4_OUTPUT = 512};
-static enum {MAX_SHADER_VEC4_INPUT = 512};
-static enum {MAX_TEXTURES = 128};
-static enum {MAX_FUNCTION_BODIES = 1024};
-static enum {MAX_CLASS_TYPES = 1024};
-static enum {MAX_FUNCTION_POINTERS = 128};
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structs.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structs.h
deleted file mode 100644
index 541b28d86b..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structs.h
+++ /dev/null
@@ -1,338 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef STRUCTS_H
-#define STRUCTS_H
-
-#include "hlslcc.h"
-#include "bstrlib.h"
-
-#include "internal_includes/tokens.h"
-#include "internal_includes/reflect.h"
-
-enum
-{
-    MAX_SUB_OPERANDS = 3
-};
-
-typedef struct Operand_TAG
-{
-    int iExtended;
-    OPERAND_TYPE eType;
-    OPERAND_MODIFIER eModifier;
-    OPERAND_MIN_PRECISION eMinPrecision;
-    int iIndexDims;
-    int indexRepresentation[4];
-    int writeMask;
-    int iGSInput;
-    int iWriteMaskEnabled;
-
-    int iNumComponents;
-
-    OPERAND_4_COMPONENT_SELECTION_MODE eSelMode;
-    uint32_t ui32CompMask;
-    uint32_t ui32Swizzle;
-    uint32_t aui32Swizzle[4];
-
-    uint32_t aui32ArraySizes[3];
-    uint32_t ui32RegisterNumber;
-    //If eType is OPERAND_TYPE_IMMEDIATE32
-    float afImmediates[4];
-    //If eType is OPERAND_TYPE_IMMEDIATE64
-    double adImmediates[4];
-
-    int iIntegerImmediate;
-
-    SPECIAL_NAME eSpecialName;
-    char pszSpecialName[64];
-
-    OPERAND_INDEX_REPRESENTATION eIndexRep[3];
-
-    struct Operand_TAG* psSubOperand[MAX_SUB_OPERANDS];
-
-    //One type for each component.
-    SHADER_VARIABLE_TYPE aeDataType[4];
-
-#ifdef _DEBUG
-    uint64_t id;
-#endif
-} Operand;
-
-typedef struct Instruction_TAG
-{
-    OPCODE_TYPE eOpcode;
-    INSTRUCTION_TEST_BOOLEAN eBooleanTestType;
-    COMPARISON_DX9 eDX9TestType;
-    uint32_t ui32SyncFlags;
-    uint32_t ui32NumOperands;
-    uint32_t ui32FirstSrc;
-    Operand asOperands[6];
-    uint32_t bSaturate;
-    uint32_t ui32FuncIndexWithinInterface;
-    RESINFO_RETURN_TYPE eResInfoReturnType;
-
-    int bAddressOffset;
-    int8_t iUAddrOffset;
-    int8_t iVAddrOffset;
-    int8_t iWAddrOffset;
-    RESOURCE_RETURN_TYPE xType, yType, zType, wType;
-    RESOURCE_DIMENSION eResDim;
-
-#ifdef _DEBUG
-    uint64_t id;
-#endif
-} Instruction;
-
-enum
-{
-    MAX_IMMEDIATE_CONST_BUFFER_VEC4_SIZE = 1024
-};
-enum
-{
-    MAX_TEXTURE_SAMPLERS_PAIRS = 32
-};
-
-typedef struct ICBVec4_TAG
-{
-    uint32_t a;
-    uint32_t b;
-    uint32_t c;
-    uint32_t d;
-} ICBVec4;
-
-typedef struct Declaration_TAG
-{
-    OPCODE_TYPE eOpcode;
-
-    uint32_t ui32NumOperands;
-
-    Operand asOperands[2];
-
-    ICBVec4 asImmediateConstBuffer[MAX_IMMEDIATE_CONST_BUFFER_VEC4_SIZE];
-    //The declaration can set one of these
-    //values depending on the opcode.
-    union
-    {
-        uint32_t ui32GlobalFlags;
-        uint32_t ui32NumTemps;
-        RESOURCE_DIMENSION eResourceDimension;
-        CONSTANT_BUFFER_ACCESS_PATTERN eCBAccessPattern;
-        INTERPOLATION_MODE eInterpolation;
-        PRIMITIVE_TOPOLOGY eOutputPrimitiveTopology;
-        PRIMITIVE eInputPrimitive;
-        uint32_t ui32MaxOutputVertexCount;
-        TESSELLATOR_DOMAIN eTessDomain;
-        TESSELLATOR_PARTITIONING eTessPartitioning;
-        TESSELLATOR_OUTPUT_PRIMITIVE eTessOutPrim;
-        uint32_t aui32WorkGroupSize[3];
-        //Fork phase index followed by the instance count.
-        uint32_t aui32HullPhaseInstanceInfo[2];
-        float fMaxTessFactor;
-        uint32_t ui32IndexRange;
-        uint32_t ui32GSInstanceCount;
-
-        struct Interface_TAG
-        {
-            uint32_t ui32InterfaceID;
-            uint32_t ui32NumFuncTables;
-            uint32_t ui32ArraySize;
-        } interface;
-    } value;
-
-    struct UAV_TAG
-    {
-        uint32_t ui32GloballyCoherentAccess;
-        uint32_t ui32BufferSize;
-        uint8_t bCounter;
-        RESOURCE_RETURN_TYPE Type;
-    } sUAV;
-
-    struct TGSM_TAG
-    {
-        uint32_t ui32Stride;
-        uint32_t ui32Count;
-    } sTGSM;
-
-    struct IndexableTemp_TAG
-    {
-        uint32_t ui32RegIndex;
-        uint32_t ui32RegCount;
-        uint32_t ui32RegComponentSize;
-    } sIdxTemp;
-
-    uint32_t ui32TableLength;
-
-    uint32_t ui32IsShadowTex;
-
-    uint32_t ui32SamplerUsed[MAX_TEXTURE_SAMPLERS_PAIRS];
-    uint32_t ui32SamplerUsedCount;
-
-    uint32_t bIsComparisonSampler;
-} Declaration;
-
-enum
-{
-    MAX_TEMP_VEC4 = 512
-};
-
-enum
-{
-    MAX_GROUPSHARED = 8
-};
-
-enum
-{
-    MAX_COLOR_MRT = 8
-};
-
-enum
-{
-    MAX_DX9_IMMCONST = 256
-};
-
-static const uint32_t MAIN_PHASE = 0;
-static const uint32_t HS_GLOBAL_DECL = 1;
-static const uint32_t HS_CTRL_POINT_PHASE = 2;
-static const uint32_t HS_FORK_PHASE = 3;
-static const uint32_t HS_JOIN_PHASE = 4;
-enum
-{
-    NUM_PHASES = 5
-};
-
-typedef struct ShaderPhase_TAG
-{
-    //How many instances of this phase type are there?
-    uint32_t ui32InstanceCount;
-
-    uint32_t* pui32DeclCount;
-    Declaration** ppsDecl;
-
-    uint32_t* pui32InstCount;
-    Instruction** ppsInst;
-} ShaderPhase;
-
-typedef struct Shader_TAG
-{
-    uint32_t ui32MajorVersion;
-    uint32_t ui32MinorVersion;
-    SHADER_TYPE eShaderType;
-
-    ShaderLang eTargetLanguage;
-    const struct GlExtensions* extensions;
-
-    int fp64;
-
-    //DWORDs in program code, including version and length tokens.
-    uint32_t ui32ShaderLength;
-
-    //Instruction* functions;//non-main subroutines
-
-    uint32_t aui32FuncTableToFuncPointer[MAX_FUNCTION_TABLES];//FIXME dynamic alloc
-    uint32_t aui32FuncBodyToFuncTable[MAX_FUNCTION_BODIES];
-
-    struct
-    {
-        uint32_t aui32FuncBodies[MAX_FUNCTION_BODIES];
-    }funcTable[MAX_FUNCTION_TABLES];
-
-    struct
-    {
-        uint32_t aui32FuncTables[MAX_FUNCTION_TABLES];
-        uint32_t ui32NumBodiesPerTable;
-    }funcPointer[MAX_FUNCTION_POINTERS];
-
-    uint32_t ui32NextClassFuncName[MAX_CLASS_TYPES];
-
-    const uint32_t* pui32FirstToken;//Reference for calculating current position in token stream.
-
-    ShaderPhase asPhase[NUM_PHASES];
-
-    ShaderInfo sInfo;
-
-    int abScalarInput[MAX_SHADER_VEC4_INPUT];
-
-    int aIndexedOutput[MAX_SHADER_VEC4_OUTPUT];
-
-    int aIndexedInput[MAX_SHADER_VEC4_INPUT];
-    int aIndexedInputParents[MAX_SHADER_VEC4_INPUT];
-
-    RESOURCE_DIMENSION aeResourceDims[MAX_TEXTURES];
-
-    int aiInputDeclaredSize[MAX_SHADER_VEC4_INPUT];
-
-    int aiOutputDeclared[MAX_SHADER_VEC4_OUTPUT];
-
-    //Does not track built-in inputs.
-    int abInputReferencedByInstruction[MAX_SHADER_VEC4_INPUT];
-
-    int aiOpcodeUsed[NUM_OPCODES];
-
-    uint32_t ui32CurrentVertexOutputStream;
-
-    uint32_t ui32NumDx9ImmConst;
-    uint32_t aui32Dx9ImmConstArrayRemap[MAX_DX9_IMMCONST];
-
-    ShaderVarType sGroupSharedVarType[MAX_GROUPSHARED];
-
-    TextureSamplerInfo textureSamplerInfo;
-} ShaderData;
-
-// CONFETTI NOTE: DAVID SROUR
-// The following is super sketchy, but at the moment,
-// there is no way to figure out the type of a resource
-// since HLSL has only register sets for the following:
-// bool, int4, float4, sampler.
-enum
-{
-    GMEM_FLOAT4_START_SLOT = 120
-};
-enum
-{
-    GMEM_FLOAT3_START_SLOT = 112
-};
-enum
-{
-    GMEM_FLOAT2_START_SLOT = 104
-};
-enum
-{
-    GMEM_FLOAT_START_SLOT  = 96
-};
-
-// CONFETTI NOTE
-// Set the starting binding point for UAV_Buffer.
-// All the binding points after the starting point is reserved for UAV
-// only. This apply for both [[texture]] and [[buffer]]
-enum
-{
-    UAV_BUFFER_START_SLOT = 25
-};
-
-typedef struct HLSLCrossCompilerContext_TAG
-{
-    bstring mainShader;
-    bstring stagedInputDeclarations; // Metal only
-    bstring parameterDeclarations; // Metal only
-    bstring declaredOutputs; // Metal only
-    bstring earlyMain;//Code to be inserted at the start of main()
-    bstring postShaderCode[NUM_PHASES];//End of main or before emit()
-
-    bstring* currentShaderString;//either mainShader or earlyMain
-
-    int needsFragmentTestHint; // METAL only
-
-    int havePostShaderCode[NUM_PHASES];
-    uint32_t currentPhase;
-
-    // GMEM INPUT AND OUTPUT TYPES MUST MATCH!
-    // THIS TABLE KEEPS TRACK OF WHAT THE OUTPUT TYPE SHOULD
-    // BE IF GMEM INPUT WAS DECLARED TO THE SAME SLOT #
-    uint32_t gmemOutputNumElements[MAX_COLOR_MRT]; // Metal only
-
-    int indent;
-    unsigned int flags;
-    ShaderData* psShader;
-} HLSLCrossCompilerContext;
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structsMETAL.c b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structsMETAL.c
deleted file mode 100644
index d380100d83..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structsMETAL.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-#include "structsMetal.h"
-
-int IsAtomicVar(const ShaderVarType* const var, AtomicVarList* const list)
-{
-    for (uint32_t i = 0; i < list->Filled; i++)
-    {
-        if (var == list->AtomicVars[i])
-        {
-            return 1;
-        }
-    }
-    return 0;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structsMetal.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structsMetal.h
deleted file mode 100644
index cd63921310..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/structsMetal.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-
-#ifndef STRUCTSS_METAL_H
-#define STRUCTSS_METAL_H
-
-#include "hlslcc.h"
-#include <stdint.h>
-
-typedef struct AtomicVarList_s
-{
-    const ShaderVarType**  AtomicVars;
-    uint32_t    Filled;
-    uint32_t    Size;
-} AtomicVarList;
-
-int IsAtomicVar(const ShaderVarType* const var, AtomicVarList* const list);
-
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLDeclaration.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLDeclaration.h
deleted file mode 100644
index d18ee2c243..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLDeclaration.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_GLSL_DECLARATION_H
-#define TO_GLSL_DECLARATION_H
-
-#include "internal_includes/structs.h"
-
-void TranslateDeclaration(HLSLCrossCompilerContext* psContext, const Declaration* psDecl);
-
-const char* GetDeclaredInputName(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand);
-const char* GetDeclaredOutputName(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand, int* stream);
-
-//Hull shaders have multiple phases.
-//Each phase has its own temps.
-//Convert to global temps for GLSL.
-void ConsolidateHullTempVars(ShaderData* psShader);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLInstruction.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLInstruction.h
deleted file mode 100644
index 34f67cfe46..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLInstruction.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_GLSL_INSTRUCTION_H
-#define TO_GLSL_INSTRUCTION_H
-
-#include "internal_includes/structs.h"
-
-void TranslateInstruction(HLSLCrossCompilerContext* psContext, Instruction* psInst, Instruction* psNextInst);
-
-//For each MOV temp, immediate; check to see if the next instruction
-//using that temp has an integer opcode. If so then the immediate value
-//is flaged as having an integer encoding.
-void MarkIntegerImmediates(HLSLCrossCompilerContext* psContext);
-
-void SetDataTypes(HLSLCrossCompilerContext* psContext, Instruction* psInst, const int32_t i32InstCount);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLOperand.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLOperand.h
deleted file mode 100644
index 1d7430504c..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toGLSLOperand.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_GLSL_OPERAND_H
-#define TO_GLSL_OPERAND_H
-
-#include "internal_includes/structs.h"
-
-#define TO_FLAG_NONE    0x0
-#define TO_FLAG_INTEGER 0x1
-#define TO_FLAG_NAME_ONLY 0x2
-#define TO_FLAG_DECLARATION_NAME 0x4
-#define TO_FLAG_DESTINATION 0x8 //Operand is being written to by assignment.
-#define TO_FLAG_UNSIGNED_INTEGER 0x10
-#define TO_FLAG_DOUBLE 0x20
-#define TO_FLAG_FLOAT16 0x40
-// --- TO_AUTO_BITCAST_TO_FLOAT ---
-//If the operand is an integer temp variable then this flag
-//indicates that the temp has a valid floating point encoding
-//and that the current expression expects the operand to be floating point
-//and therefore intBitsToFloat must be applied to that variable.
-#define TO_AUTO_BITCAST_TO_FLOAT 0x80
-#define TO_AUTO_BITCAST_TO_INT 0x100
-#define TO_AUTO_BITCAST_TO_UINT 0x200
-#define TO_AUTO_BITCAST_TO_FLOAT16 0x400
-// AUTO_EXPAND flags automatically expand the operand to at least (i/u)vecX
-// to match HLSL functionality.
-#define TO_AUTO_EXPAND_TO_VEC2 0x800
-#define TO_AUTO_EXPAND_TO_VEC3 0x1000
-#define TO_AUTO_EXPAND_TO_VEC4 0x2000
-
-
-void TranslateOperand(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag);
-// Translate operand but add additional component mask
-void TranslateOperandWithMask(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t ui32ComponentMask);
-
-int GetMaxComponentFromComponentMask(const Operand* psOperand);
-void TranslateOperandIndex(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index);
-void TranslateOperandIndexMAD(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index, uint32_t multiply, uint32_t add);
-void TranslateOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-void TranslateOperandSwizzleWithMask(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask);
-
-uint32_t GetNumSwizzleElements(const Operand* psOperand);
-uint32_t GetNumSwizzleElementsWithMask(const Operand *psOperand, uint32_t ui32CompMask);
-void AddSwizzleUsingElementCount(HLSLCrossCompilerContext* psContext, uint32_t count);
-int GetFirstOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-uint32_t IsSwizzleReplicated(const Operand* psOperand);
-
-void ResourceName(bstring targetStr, HLSLCrossCompilerContext* psContext, ResourceGroup group, const uint32_t ui32RegisterNumber, const int bZCompare);
-
-bstring TextureSamplerName(ShaderInfo* psShaderInfo, const uint32_t ui32TextureRegisterNumber, const uint32_t ui32SamplerRegisterNumber, const int bZCompare);
-void ConcatTextureSamplerName(bstring str, ShaderInfo* psShaderInfo, const uint32_t ui32TextureRegisterNumber, const uint32_t ui32SamplerRegisterNumber, const int bZCompare);
-
-//Non-zero means the components overlap
-int CompareOperandSwizzles(const Operand* psOperandA, const Operand* psOperandB);
-
-// Returns the write mask for the operand used for destination
-uint32_t GetOperandWriteMask(const Operand *psOperand);
-
-SHADER_VARIABLE_TYPE GetOperandDataType(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-SHADER_VARIABLE_TYPE GetOperandDataTypeEx(HLSLCrossCompilerContext* psContext, const Operand* psOperand, SHADER_VARIABLE_TYPE ePreferredTypeForImmediates);
-
-const char * GetConstructorForType(const SHADER_VARIABLE_TYPE eType,
-    const int components);
-
-const char * GetConstructorForTypeFlag(const uint32_t ui32Flag,
-    const int components);
-
-uint32_t SVTTypeToFlag(const SHADER_VARIABLE_TYPE eType);
-SHADER_VARIABLE_TYPE TypeFlagsToSVTType(const uint32_t typeflags);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALDeclaration.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALDeclaration.h
deleted file mode 100644
index fb10d5b691..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALDeclaration.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_METAL_DECLARATION_H
-#define TO_METAL_DECLARATION_H
-
-#include "internal_includes/structs.h"
-#include "internal_includes/structsMetal.h"
-
-void TranslateDeclarationMETAL(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, AtomicVarList* psAtomicList);
-
-char* GetDeclaredInputNameMETAL(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand);
-char* GetDeclaredOutputNameMETAL(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALInstruction.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALInstruction.h
deleted file mode 100644
index e5b267cd58..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALInstruction.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_METAL_INSTRUCTION_H
-#define TO_METAL_INSTRUCTION_H
-
-#include "internal_includes/structs.h"
-#include "structsMetal.h"
-
-void TranslateInstructionMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, Instruction* psNextInst);
-void DetectAtomicInstructionMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, Instruction* psNextInst, AtomicVarList* psAtomicList);
-
-//For each MOV temp, immediate; check to see if the next instruction
-//using that temp has an integer opcode. If so then the immediate value
-//is flaged as having an integer encoding.
-void MarkIntegerImmediatesMETAL(HLSLCrossCompilerContext* psContext);
-
-void SetDataTypesMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, const int32_t i32InstCount);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALOperand.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALOperand.h
deleted file mode 100644
index 6cebf5bab6..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/toMETALOperand.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TO_METAL_OPERAND_H
-#define TO_METAL_OPERAND_H
-
-#include "internal_includes/structs.h"
-
-#define TO_FLAG_NONE    0x0
-#define TO_FLAG_INTEGER 0x1
-#define TO_FLAG_NAME_ONLY 0x2
-#define TO_FLAG_DECLARATION_NAME 0x4
-#define TO_FLAG_DESTINATION 0x8 //Operand is being written to by assignment.
-#define TO_FLAG_UNSIGNED_INTEGER 0x10
-#define TO_FLAG_DOUBLE 0x20
-#define TO_FLAG_FLOAT16 0x40
-// --- TO_AUTO_BITCAST_TO_FLOAT ---
-//If the operand is an integer temp variable then this flag
-//indicates that the temp has a valid floating point encoding
-//and that the current expression expects the operand to be floating point
-//and therefore intBitsToFloat must be applied to that variable.
-#define TO_AUTO_BITCAST_TO_FLOAT 0x80
-#define TO_AUTO_BITCAST_TO_INT 0x100
-#define TO_AUTO_BITCAST_TO_UINT 0x200
-#define TO_AUTO_BITCAST_TO_FLOAT16 0x400
-// AUTO_EXPAND flags automatically expand the operand to at least (i/u)vecX
-// to match HLSL functionality.
-#define TO_AUTO_EXPAND_TO_VEC2 0x800
-#define TO_AUTO_EXPAND_TO_VEC3 0x1000
-#define TO_AUTO_EXPAND_TO_VEC4 0x2000
-
-void TranslateOperandMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag);
-// Translate operand but add additional component mask
-void TranslateOperandWithMaskMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t ui32ComponentMask);
-
-int GetMaxComponentFromComponentMaskMETAL(const Operand* psOperand);
-void TranslateOperandIndexMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index);
-void TranslateOperandIndexMADMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index, uint32_t multiply, uint32_t add);
-void TranslateOperandSwizzleMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-void TranslateOperandSwizzleWithMaskMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask);
-
-void TranslateGmemOperandSwizzleWithMaskMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask, uint32_t gmemNumElements);
-
-uint32_t GetNumSwizzleElementsMETAL(const Operand* psOperand);
-uint32_t GetNumSwizzleElementsWithMaskMETAL(const Operand *psOperand, uint32_t ui32CompMask);
-void AddSwizzleUsingElementCountMETAL(HLSLCrossCompilerContext* psContext, uint32_t count);
-int GetFirstOperandSwizzleMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-uint32_t IsSwizzleReplicatedMETAL(const Operand* psOperand);
-
-void ResourceNameMETAL(bstring targetStr, HLSLCrossCompilerContext* psContext, ResourceGroup group, const uint32_t ui32RegisterNumber, const int bZCompare);
-
-bstring TextureSamplerNameMETAL(ShaderInfo* psShaderInfo, const uint32_t ui32TextureRegisterNumber, const uint32_t ui32SamplerRegisterNumber, const int bZCompare);
-void ConcatTextureSamplerNameMETAL(bstring str, ShaderInfo* psShaderInfo, const uint32_t ui32TextureRegisterNumber, const uint32_t ui32SamplerRegisterNumber, const int bZCompare);
-
-//Non-zero means the components overlap
-int CompareOperandSwizzlesMETAL(const Operand* psOperandA, const Operand* psOperandB);
-
-// Returns the write mask for the operand used for destination
-uint32_t GetOperandWriteMaskMETAL(const Operand *psOperand);
-
-SHADER_VARIABLE_TYPE GetOperandDataTypeMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand);
-SHADER_VARIABLE_TYPE GetOperandDataTypeExMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, SHADER_VARIABLE_TYPE ePreferredTypeForImmediates);
-
-const char * GetConstructorForTypeMETAL(const SHADER_VARIABLE_TYPE eType,
-    const int components);
-
-const char * GetConstructorForTypeFlagMETAL(const uint32_t ui32Flag,
-    const int components);
-
-uint32_t SVTTypeToFlagMETAL(const SHADER_VARIABLE_TYPE eType);
-SHADER_VARIABLE_TYPE TypeFlagsToSVTTypeMETAL(const uint32_t typeflags);
-
-
-uint32_t GetGmemInputResourceSlotMETAL(uint32_t const slotIn);
-
-uint32_t GetGmemInputResourceNumElementsMETAL(uint32_t const slotIn);
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/tokens.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/tokens.h
deleted file mode 100644
index ddf17058cd..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/tokens.h
+++ /dev/null
@@ -1,819 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#ifndef TOKENS_H
-#define TOKENS_H
-
-#include "hlslcc.h"
-
-typedef enum
-{
-    INVALID_SHADER = -1,
-    PIXEL_SHADER,
-    VERTEX_SHADER,
-    GEOMETRY_SHADER,
-    HULL_SHADER,
-    DOMAIN_SHADER,
-    COMPUTE_SHADER,
-} SHADER_TYPE;
-
-static SHADER_TYPE DecodeShaderType(uint32_t ui32Token)
-{
-    return (SHADER_TYPE)((ui32Token & 0xffff0000) >> 16);
-}
-
-static uint32_t DecodeProgramMajorVersion(uint32_t ui32Token)
-{
-    return (ui32Token & 0x000000f0) >> 4;
-}
-
-static uint32_t DecodeProgramMinorVersion(uint32_t ui32Token)
-{
-    return (ui32Token & 0x0000000f);
-}
-
-static uint32_t DecodeInstructionLength(uint32_t ui32Token)
-{
-    return (ui32Token & 0x7f000000) >> 24;
-}
-
-static uint32_t DecodeIsOpcodeExtended(uint32_t ui32Token)
-{
-    return (ui32Token & 0x80000000) >> 31;
-}
-
-typedef enum EXTENDED_OPCODE_TYPE
-{
-    EXTENDED_OPCODE_EMPTY           = 0,
-    EXTENDED_OPCODE_SAMPLE_CONTROLS = 1,
-    EXTENDED_OPCODE_RESOURCE_DIM = 2,
-    EXTENDED_OPCODE_RESOURCE_RETURN_TYPE = 3,
-} EXTENDED_OPCODE_TYPE;
-
-static EXTENDED_OPCODE_TYPE DecodeExtendedOpcodeType(uint32_t ui32Token)
-{
-    return (EXTENDED_OPCODE_TYPE)(ui32Token & 0x0000003f);
-}
-
-typedef enum RESOURCE_RETURN_TYPE
-{
-    RETURN_TYPE_UNORM = 1,
-    RETURN_TYPE_SNORM = 2,
-    RETURN_TYPE_SINT = 3,
-    RETURN_TYPE_UINT = 4,
-    RETURN_TYPE_FLOAT = 5,
-    RETURN_TYPE_MIXED = 6,
-    RETURN_TYPE_DOUBLE = 7,
-    RETURN_TYPE_CONTINUED = 8,
-    RETURN_TYPE_UNUSED = 9,
-} RESOURCE_RETURN_TYPE;
-
-static RESOURCE_RETURN_TYPE DecodeResourceReturnType(uint32_t ui32Coord, uint32_t ui32Token)
-{
-    return (RESOURCE_RETURN_TYPE)((ui32Token>>(ui32Coord * 4))&0xF);
-}
-
-static RESOURCE_RETURN_TYPE DecodeExtendedResourceReturnType(uint32_t ui32Coord, uint32_t ui32Token)
-{
-    return (RESOURCE_RETURN_TYPE)((ui32Token>>(ui32Coord * 4 + 6))&0xF);
-}
-
-typedef enum
-{
-    //For DX9
-    OPCODE_POW = -6,
-    OPCODE_DP2ADD = -5,
-    OPCODE_LRP = -4,
-    OPCODE_ENDREP = -3,
-    OPCODE_REP = -2,
-    OPCODE_SPECIAL_DCL_IMMCONST = -1,
-
-    OPCODE_ADD,
-    OPCODE_AND,
-    OPCODE_BREAK,
-    OPCODE_BREAKC,
-    OPCODE_CALL,
-    OPCODE_CALLC,
-    OPCODE_CASE,
-    OPCODE_CONTINUE,
-    OPCODE_CONTINUEC,
-    OPCODE_CUT,
-    OPCODE_DEFAULT,
-    OPCODE_DERIV_RTX,
-    OPCODE_DERIV_RTY,
-    OPCODE_DISCARD,
-    OPCODE_DIV,
-    OPCODE_DP2,
-    OPCODE_DP3,
-    OPCODE_DP4,
-    OPCODE_ELSE,
-    OPCODE_EMIT,
-    OPCODE_EMITTHENCUT,
-    OPCODE_ENDIF,
-    OPCODE_ENDLOOP,
-    OPCODE_ENDSWITCH,
-    OPCODE_EQ,
-    OPCODE_EXP,
-    OPCODE_FRC,
-    OPCODE_FTOI,
-    OPCODE_FTOU,
-    OPCODE_GE,
-    OPCODE_IADD,
-    OPCODE_IF,
-    OPCODE_IEQ,
-    OPCODE_IGE,
-    OPCODE_ILT,
-    OPCODE_IMAD,
-    OPCODE_IMAX,
-    OPCODE_IMIN,
-    OPCODE_IMUL,
-    OPCODE_INE,
-    OPCODE_INEG,
-    OPCODE_ISHL,
-    OPCODE_ISHR,
-    OPCODE_ITOF,
-    OPCODE_LABEL,
-    OPCODE_LD,
-    OPCODE_LD_MS,
-    OPCODE_LOG,
-    OPCODE_LOOP,
-    OPCODE_LT,
-    OPCODE_MAD,
-    OPCODE_MIN,
-    OPCODE_MAX,
-    OPCODE_CUSTOMDATA,
-    OPCODE_MOV,
-    OPCODE_MOVC,
-    OPCODE_MUL,
-    OPCODE_NE,
-    OPCODE_NOP,
-    OPCODE_NOT,
-    OPCODE_OR,
-    OPCODE_RESINFO,
-    OPCODE_RET,
-    OPCODE_RETC,
-    OPCODE_ROUND_NE,
-    OPCODE_ROUND_NI,
-    OPCODE_ROUND_PI,
-    OPCODE_ROUND_Z,
-    OPCODE_RSQ,
-    OPCODE_SAMPLE,
-    OPCODE_SAMPLE_C,
-    OPCODE_SAMPLE_C_LZ,
-    OPCODE_SAMPLE_L,
-    OPCODE_SAMPLE_D,
-    OPCODE_SAMPLE_B,
-    OPCODE_SQRT,
-    OPCODE_SWITCH,
-    OPCODE_SINCOS,
-    OPCODE_UDIV,
-    OPCODE_ULT,
-    OPCODE_UGE,
-    OPCODE_UMUL,
-    OPCODE_UMAD,
-    OPCODE_UMAX,
-    OPCODE_UMIN,
-    OPCODE_USHR,
-    OPCODE_UTOF,
-    OPCODE_XOR,
-    OPCODE_DCL_RESOURCE, // DCL* opcodes have
-    OPCODE_DCL_CONSTANT_BUFFER, // custom operand formats.
-    OPCODE_DCL_SAMPLER,
-    OPCODE_DCL_INDEX_RANGE,
-    OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY,
-    OPCODE_DCL_GS_INPUT_PRIMITIVE,
-    OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT,
-    OPCODE_DCL_INPUT,
-    OPCODE_DCL_INPUT_SGV,
-    OPCODE_DCL_INPUT_SIV,
-    OPCODE_DCL_INPUT_PS,
-    OPCODE_DCL_INPUT_PS_SGV,
-    OPCODE_DCL_INPUT_PS_SIV,
-    OPCODE_DCL_OUTPUT,
-    OPCODE_DCL_OUTPUT_SGV,
-    OPCODE_DCL_OUTPUT_SIV,
-    OPCODE_DCL_TEMPS,
-    OPCODE_DCL_INDEXABLE_TEMP,
-    OPCODE_DCL_GLOBAL_FLAGS,
-
-// -----------------------------------------------
-
-    OPCODE_RESERVED_10,
-    
-// ---------- DX 10.1 op codes---------------------
-
-    OPCODE_LOD,
-    OPCODE_GATHER4,
-    OPCODE_SAMPLE_POS,
-    OPCODE_SAMPLE_INFO,
-
-// -----------------------------------------------
-
-    // This should be 10.1's version of NUM_OPCODES
-    OPCODE_RESERVED_10_1,
-
-// ---------- DX 11 op codes---------------------
-    OPCODE_HS_DECLS, // token marks beginning of HS sub-shader
-    OPCODE_HS_CONTROL_POINT_PHASE, // token marks beginning of HS sub-shader
-    OPCODE_HS_FORK_PHASE, // token marks beginning of HS sub-shader
-    OPCODE_HS_JOIN_PHASE, // token marks beginning of HS sub-shader
-
-    OPCODE_EMIT_STREAM,
-    OPCODE_CUT_STREAM,
-    OPCODE_EMITTHENCUT_STREAM,
-    OPCODE_INTERFACE_CALL,
-
-    OPCODE_BUFINFO,
-    OPCODE_DERIV_RTX_COARSE,
-    OPCODE_DERIV_RTX_FINE,
-    OPCODE_DERIV_RTY_COARSE,
-    OPCODE_DERIV_RTY_FINE,
-    OPCODE_GATHER4_C,
-    OPCODE_GATHER4_PO,
-    OPCODE_GATHER4_PO_C,
-    OPCODE_RCP,
-    OPCODE_F32TOF16,
-    OPCODE_F16TOF32,
-    OPCODE_UADDC,
-    OPCODE_USUBB,
-    OPCODE_COUNTBITS,
-    OPCODE_FIRSTBIT_HI,
-    OPCODE_FIRSTBIT_LO,
-    OPCODE_FIRSTBIT_SHI,
-    OPCODE_UBFE,
-    OPCODE_IBFE,
-    OPCODE_BFI,
-    OPCODE_BFREV,
-    OPCODE_SWAPC,
-
-    OPCODE_DCL_STREAM,
-    OPCODE_DCL_FUNCTION_BODY,
-    OPCODE_DCL_FUNCTION_TABLE,
-    OPCODE_DCL_INTERFACE,
-    
-    OPCODE_DCL_INPUT_CONTROL_POINT_COUNT,
-    OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT,
-    OPCODE_DCL_TESS_DOMAIN,
-    OPCODE_DCL_TESS_PARTITIONING,
-    OPCODE_DCL_TESS_OUTPUT_PRIMITIVE,
-    OPCODE_DCL_HS_MAX_TESSFACTOR,
-    OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT,
-    OPCODE_DCL_HS_JOIN_PHASE_INSTANCE_COUNT,
-
-    OPCODE_DCL_THREAD_GROUP,
-    OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED,
-    OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW,
-    OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED,
-    OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW,
-    OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED,
-    OPCODE_DCL_RESOURCE_RAW,
-    OPCODE_DCL_RESOURCE_STRUCTURED,
-    OPCODE_LD_UAV_TYPED,
-    OPCODE_STORE_UAV_TYPED,
-    OPCODE_LD_RAW,
-    OPCODE_STORE_RAW,
-    OPCODE_LD_STRUCTURED,
-    OPCODE_STORE_STRUCTURED,
-    OPCODE_ATOMIC_AND,
-    OPCODE_ATOMIC_OR,
-    OPCODE_ATOMIC_XOR,
-    OPCODE_ATOMIC_CMP_STORE,
-    OPCODE_ATOMIC_IADD,
-    OPCODE_ATOMIC_IMAX,
-    OPCODE_ATOMIC_IMIN,
-    OPCODE_ATOMIC_UMAX,
-    OPCODE_ATOMIC_UMIN,
-    OPCODE_IMM_ATOMIC_ALLOC,
-    OPCODE_IMM_ATOMIC_CONSUME,
-    OPCODE_IMM_ATOMIC_IADD,
-    OPCODE_IMM_ATOMIC_AND,
-    OPCODE_IMM_ATOMIC_OR,
-    OPCODE_IMM_ATOMIC_XOR,
-    OPCODE_IMM_ATOMIC_EXCH,
-    OPCODE_IMM_ATOMIC_CMP_EXCH,
-    OPCODE_IMM_ATOMIC_IMAX,
-    OPCODE_IMM_ATOMIC_IMIN,
-    OPCODE_IMM_ATOMIC_UMAX,
-    OPCODE_IMM_ATOMIC_UMIN,   
-    OPCODE_SYNC,
-    
-    OPCODE_DADD,
-    OPCODE_DMAX,
-    OPCODE_DMIN,
-    OPCODE_DMUL,
-    OPCODE_DEQ,
-    OPCODE_DGE,
-    OPCODE_DLT,
-    OPCODE_DNE,
-    OPCODE_DMOV,
-    OPCODE_DMOVC,
-    OPCODE_DTOF,
-    OPCODE_FTOD,
-
-    OPCODE_EVAL_SNAPPED,
-    OPCODE_EVAL_SAMPLE_INDEX,
-    OPCODE_EVAL_CENTROID,
-    
-    OPCODE_DCL_GS_INSTANCE_COUNT,
-
-    OPCODE_ABORT,
-    OPCODE_DEBUG_BREAK,
-
-// -----------------------------------------------
-
-    // This marks the end of D3D11.0 opcodes
-    OPCODE_RESERVED_11,
-
-    OPCODE_DDIV,
-    OPCODE_DFMA,
-    OPCODE_DRCP,
-
-    OPCODE_MSAD,
-
-    OPCODE_DTOI,
-    OPCODE_DTOU,
-    OPCODE_ITOD,
-    OPCODE_UTOD,
-
-// -----------------------------------------------
-
-    // This marks the end of D3D11.1 opcodes
-    OPCODE_RESERVED_11_1,
-
-    NUM_OPCODES,
-    OPCODE_INVAILD = NUM_OPCODES,
-} OPCODE_TYPE;
-
-static OPCODE_TYPE DecodeOpcodeType(uint32_t ui32Token)
-{
-    return (OPCODE_TYPE)(ui32Token & 0x00007ff);
-}
-
-typedef enum
-{
-    INDEX_0D,
-    INDEX_1D,
-    INDEX_2D,
-    INDEX_3D,
-} OPERAND_INDEX_DIMENSION;
-
-static OPERAND_INDEX_DIMENSION DecodeOperandIndexDimension(uint32_t ui32Token)
-{
-    return (OPERAND_INDEX_DIMENSION)((ui32Token & 0x00300000) >> 20);
-}
-
-typedef enum OPERAND_TYPE
-{
-    OPERAND_TYPE_SPECIAL_LOOPCOUNTER = -10,
-    OPERAND_TYPE_SPECIAL_IMMCONSTINT = -9,
-    OPERAND_TYPE_SPECIAL_TEXCOORD = -8,
-    OPERAND_TYPE_SPECIAL_POSITION = -7,
-    OPERAND_TYPE_SPECIAL_FOG = -6,
-    OPERAND_TYPE_SPECIAL_POINTSIZE = -5,
-    OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR = -4,
-    OPERAND_TYPE_SPECIAL_OUTBASECOLOUR = -3,
-    OPERAND_TYPE_SPECIAL_ADDRESS = -2,
-    OPERAND_TYPE_SPECIAL_IMMCONST = -1,
-    OPERAND_TYPE_TEMP           = 0,  // Temporary Register File
-    OPERAND_TYPE_INPUT          = 1,  // General Input Register File
-    OPERAND_TYPE_OUTPUT         = 2,  // General Output Register File
-    OPERAND_TYPE_INDEXABLE_TEMP = 3,  // Temporary Register File (indexable)
-    OPERAND_TYPE_IMMEDIATE32    = 4,  // 32bit/component immediate value(s)
-                                          // If for example, operand token bits
-                                          // [01:00]==OPERAND_4_COMPONENT,
-                                          // this means that the operand type:
-                                          // OPERAND_TYPE_IMMEDIATE32
-                                          // results in 4 additional 32bit
-                                          // DWORDS present for the operand.
-    OPERAND_TYPE_IMMEDIATE64    = 5,  // 64bit/comp.imm.val(s)HI:LO
-    OPERAND_TYPE_SAMPLER        = 6,  // Reference to sampler state
-    OPERAND_TYPE_RESOURCE       = 7,  // Reference to memory resource (e.g. texture)
-    OPERAND_TYPE_CONSTANT_BUFFER= 8,  // Reference to constant buffer
-    OPERAND_TYPE_IMMEDIATE_CONSTANT_BUFFER= 9,  // Reference to immediate constant buffer
-    OPERAND_TYPE_LABEL          = 10, // Label
-    OPERAND_TYPE_INPUT_PRIMITIVEID = 11, // Input primitive ID
-    OPERAND_TYPE_OUTPUT_DEPTH   = 12, // Output Depth
-    OPERAND_TYPE_NULL           = 13, // Null register, used to discard results of operations
-                                               // Below Are operands new in DX 10.1
-    OPERAND_TYPE_RASTERIZER     = 14, // DX10.1 Rasterizer register, used to denote the depth/stencil and render target resources
-    OPERAND_TYPE_OUTPUT_COVERAGE_MASK = 15, // DX10.1 PS output MSAA coverage mask (scalar)
-                                               // Below Are operands new in DX 11
-    OPERAND_TYPE_STREAM         = 16, // Reference to GS stream output resource
-    OPERAND_TYPE_FUNCTION_BODY  = 17, // Reference to a function definition
-    OPERAND_TYPE_FUNCTION_TABLE = 18, // Reference to a set of functions used by a class
-    OPERAND_TYPE_INTERFACE      = 19, // Reference to an interface
-    OPERAND_TYPE_FUNCTION_INPUT = 20, // Reference to an input parameter to a function
-    OPERAND_TYPE_FUNCTION_OUTPUT = 21, // Reference to an output parameter to a function
-    OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID = 22, // HS Control Point phase input saying which output control point ID this is
-    OPERAND_TYPE_INPUT_FORK_INSTANCE_ID = 23, // HS Fork Phase input instance ID
-    OPERAND_TYPE_INPUT_JOIN_INSTANCE_ID = 24, // HS Join Phase input instance ID
-    OPERAND_TYPE_INPUT_CONTROL_POINT = 25, // HS Fork+Join, DS phase input control points (array of them)
-    OPERAND_TYPE_OUTPUT_CONTROL_POINT = 26, // HS Fork+Join phase output control points (array of them)
-    OPERAND_TYPE_INPUT_PATCH_CONSTANT = 27, // DS+HSJoin Input Patch Constants (array of them)
-    OPERAND_TYPE_INPUT_DOMAIN_POINT = 28, // DS Input Domain point
-    OPERAND_TYPE_THIS_POINTER       = 29, // Reference to an interface this pointer
-    OPERAND_TYPE_UNORDERED_ACCESS_VIEW = 30, // Reference to UAV u#
-    OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY = 31, // Reference to Thread Group Shared Memory g#
-    OPERAND_TYPE_INPUT_THREAD_ID = 32, // Compute Shader Thread ID
-    OPERAND_TYPE_INPUT_THREAD_GROUP_ID = 33, // Compute Shader Thread Group ID
-    OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP = 34, // Compute Shader Thread ID In Thread Group
-    OPERAND_TYPE_INPUT_COVERAGE_MASK = 35, // Pixel shader coverage mask input
-    OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED = 36, // Compute Shader Thread ID In Group Flattened to a 1D value.
-    OPERAND_TYPE_INPUT_GS_INSTANCE_ID = 37, // Input GS instance ID
-    OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL = 38, // Output Depth, forced to be greater than or equal than current depth
-    OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL    = 39, // Output Depth, forced to be less than or equal to current depth
-    OPERAND_TYPE_CYCLE_COUNTER = 40, // Cycle counter
-} OPERAND_TYPE;
-
-static OPERAND_TYPE DecodeOperandType(uint32_t ui32Token)
-{
-    return (OPERAND_TYPE)((ui32Token & 0x000ff000) >> 12);
-}
-
-static SPECIAL_NAME DecodeOperandSpecialName(uint32_t ui32Token)
-{
-    return (SPECIAL_NAME)(ui32Token & 0x0000ffff);
-}
-
-typedef enum OPERAND_INDEX_REPRESENTATION
-{
-    OPERAND_INDEX_IMMEDIATE32               = 0, // Extra DWORD
-    OPERAND_INDEX_IMMEDIATE64               = 1, // 2 Extra DWORDs
-                                                     //   (HI32:LO32)
-    OPERAND_INDEX_RELATIVE                  = 2, // Extra operand
-    OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE = 3, // Extra DWORD followed by
-                                                     //   extra operand
-    OPERAND_INDEX_IMMEDIATE64_PLUS_RELATIVE = 4, // 2 Extra DWORDS
-                                                     //   (HI32:LO32) followed
-                                                     //   by extra operand
-} OPERAND_INDEX_REPRESENTATION;
-
-static OPERAND_INDEX_REPRESENTATION DecodeOperandIndexRepresentation(uint32_t ui32Dimension, uint32_t ui32Token)
-{
-    return (OPERAND_INDEX_REPRESENTATION)((ui32Token & (0x3<<(22+3*((ui32Dimension)&3)))) >> (22+3*((ui32Dimension)&3)));
-}
-
-typedef enum OPERAND_NUM_COMPONENTS
-{
-    OPERAND_0_COMPONENT = 0,
-    OPERAND_1_COMPONENT = 1,
-    OPERAND_4_COMPONENT = 2,
-    OPERAND_N_COMPONENT = 3 // unused for now
-} OPERAND_NUM_COMPONENTS;
-
-static OPERAND_NUM_COMPONENTS DecodeOperandNumComponents(uint32_t ui32Token)
-{
-    return (OPERAND_NUM_COMPONENTS)(ui32Token & 0x00000003);
-}
-
-typedef enum OPERAND_4_COMPONENT_SELECTION_MODE
-{
-    OPERAND_4_COMPONENT_MASK_MODE    = 0,  // mask 4 components
-    OPERAND_4_COMPONENT_SWIZZLE_MODE = 1,  // swizzle 4 components
-    OPERAND_4_COMPONENT_SELECT_1_MODE = 2, // select 1 of 4 components
-} OPERAND_4_COMPONENT_SELECTION_MODE;
-
-static OPERAND_4_COMPONENT_SELECTION_MODE DecodeOperand4CompSelMode(uint32_t ui32Token)
-{
-    return (OPERAND_4_COMPONENT_SELECTION_MODE)((ui32Token & 0x0000000c) >> 2);
-}
-
-#define OPERAND_4_COMPONENT_MASK_X      0x00000001
-#define OPERAND_4_COMPONENT_MASK_Y      0x00000002
-#define OPERAND_4_COMPONENT_MASK_Z      0x00000004
-#define OPERAND_4_COMPONENT_MASK_W      0x00000008
-#define OPERAND_4_COMPONENT_MASK_R      OPERAND_4_COMPONENT_MASK_X
-#define OPERAND_4_COMPONENT_MASK_G      OPERAND_4_COMPONENT_MASK_Y
-#define OPERAND_4_COMPONENT_MASK_B      OPERAND_4_COMPONENT_MASK_Z
-#define OPERAND_4_COMPONENT_MASK_A      OPERAND_4_COMPONENT_MASK_W
-#define OPERAND_4_COMPONENT_MASK_ALL    0x0000000f
-
-static uint32_t DecodeOperand4CompMask(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x000000f0) >> 4);
-}
-
-static uint32_t DecodeOperand4CompSwizzle(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x00000ff0) >> 4);
-}
-
-static uint32_t DecodeOperand4CompSel1(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x00000030) >> 4);
-}
-
-#define OPERAND_4_COMPONENT_X      0
-#define OPERAND_4_COMPONENT_Y      1
-#define OPERAND_4_COMPONENT_Z      2
-#define OPERAND_4_COMPONENT_W      3
-
-static uint32_t NO_SWIZZLE = (( (OPERAND_4_COMPONENT_X) | (OPERAND_4_COMPONENT_Y<<2) | (OPERAND_4_COMPONENT_Z << 4) | (OPERAND_4_COMPONENT_W << 6))/*<<4*/);
-
-static uint32_t XXXX_SWIZZLE = (((OPERAND_4_COMPONENT_X) | (OPERAND_4_COMPONENT_X<<2) | (OPERAND_4_COMPONENT_X << 4) | (OPERAND_4_COMPONENT_X << 6)));
-static uint32_t YYYY_SWIZZLE = (((OPERAND_4_COMPONENT_Y) | (OPERAND_4_COMPONENT_Y<<2) | (OPERAND_4_COMPONENT_Y << 4) | (OPERAND_4_COMPONENT_Y << 6)));
-static uint32_t ZZZZ_SWIZZLE = (((OPERAND_4_COMPONENT_Z) | (OPERAND_4_COMPONENT_Z<<2) | (OPERAND_4_COMPONENT_Z << 4) | (OPERAND_4_COMPONENT_Z << 6)));
-static uint32_t WWWW_SWIZZLE = (((OPERAND_4_COMPONENT_W) | (OPERAND_4_COMPONENT_W<<2) | (OPERAND_4_COMPONENT_W << 4) | (OPERAND_4_COMPONENT_W << 6)));
-
-static uint32_t DecodeOperand4CompSwizzleSource(uint32_t ui32Token, uint32_t comp)
-{
-    return (uint32_t)(((ui32Token)>>(4+2*((comp)&3)))&3);
-}
-
-typedef enum RESOURCE_DIMENSION
-{
-    RESOURCE_DIMENSION_UNKNOWN = 0,
-    RESOURCE_DIMENSION_BUFFER = 1,
-    RESOURCE_DIMENSION_TEXTURE1D = 2,
-    RESOURCE_DIMENSION_TEXTURE2D = 3,
-    RESOURCE_DIMENSION_TEXTURE2DMS = 4,
-    RESOURCE_DIMENSION_TEXTURE3D = 5,
-    RESOURCE_DIMENSION_TEXTURECUBE = 6,
-    RESOURCE_DIMENSION_TEXTURE1DARRAY = 7,
-    RESOURCE_DIMENSION_TEXTURE2DARRAY = 8,
-    RESOURCE_DIMENSION_TEXTURE2DMSARRAY = 9,
-    RESOURCE_DIMENSION_TEXTURECUBEARRAY = 10,
-    RESOURCE_DIMENSION_RAW_BUFFER = 11,
-    RESOURCE_DIMENSION_STRUCTURED_BUFFER = 12,
-} RESOURCE_DIMENSION;
-
-static RESOURCE_DIMENSION DecodeResourceDimension(uint32_t ui32Token)
-{
-    return (RESOURCE_DIMENSION)((ui32Token & 0x0000f800) >> 11);
-}
-
-static RESOURCE_DIMENSION DecodeExtendedResourceDimension(uint32_t ui32Token)
-{
-    return (RESOURCE_DIMENSION)((ui32Token & 0x000007C0) >> 6);
-}
-
-static const uint32_t SHADER_INPUT_FLAG_COMPARISON_SAMPLER = (1 << 1);
-
-static uint32_t DecodeShaderInputFlags(uint32_t ui32Token)
-{
-    return (uint32_t)(ui32Token & 0x00000002);
-}
-
-typedef enum CONSTANT_BUFFER_ACCESS_PATTERN
-{
-    CONSTANT_BUFFER_ACCESS_PATTERN_IMMEDIATEINDEXED = 0,
-    CONSTANT_BUFFER_ACCESS_PATTERN_DYNAMICINDEXED = 1
-} CONSTANT_BUFFER_ACCESS_PATTERN;
-
-static CONSTANT_BUFFER_ACCESS_PATTERN DecodeConstantBufferAccessPattern(uint32_t ui32Token)
-{
-    return (CONSTANT_BUFFER_ACCESS_PATTERN)((ui32Token & 0x00000800) >> 11);
-}
-
-typedef enum INSTRUCTION_TEST_BOOLEAN
-{
-    INSTRUCTION_TEST_ZERO       = 0,
-    INSTRUCTION_TEST_NONZERO    = 1
-} INSTRUCTION_TEST_BOOLEAN;
-
-static INSTRUCTION_TEST_BOOLEAN DecodeInstrTestBool(uint32_t ui32Token)
-{
-    return (INSTRUCTION_TEST_BOOLEAN)((ui32Token & 0x00040000) >> 18);
-}
-
-static uint32_t DecodeIsOperandExtended(uint32_t ui32Token)
-{
-    return (ui32Token & 0x80000000) >> 31;
-}
-
-typedef enum EXTENDED_OPERAND_TYPE
-{
-    EXTENDED_OPERAND_EMPTY            = 0,
-    EXTENDED_OPERAND_MODIFIER         = 1,
-} EXTENDED_OPERAND_TYPE;
-
-static EXTENDED_OPERAND_TYPE DecodeExtendedOperandType(uint32_t ui32Token)
-{
-    return (EXTENDED_OPERAND_TYPE)(ui32Token & 0x0000003f);
-}
-
-typedef enum OPERAND_MODIFIER
-{
-    OPERAND_MODIFIER_NONE     = 0,
-    OPERAND_MODIFIER_NEG      = 1,
-    OPERAND_MODIFIER_ABS      = 2,
-    OPERAND_MODIFIER_ABSNEG   = 3,
-} OPERAND_MODIFIER;
-
-static OPERAND_MODIFIER DecodeExtendedOperandModifier(uint32_t ui32Token)
-{
-    return (OPERAND_MODIFIER)((ui32Token & 0x00003fc0) >> 6);
-}
-
-static const uint32_t GLOBAL_FLAG_REFACTORING_ALLOWED = (1<<11);
-static const uint32_t GLOBAL_FLAG_ENABLE_DOUBLE_PRECISION_FLOAT_OPS = (1<<12);
-static const uint32_t GLOBAL_FLAG_FORCE_EARLY_DEPTH_STENCIL = (1<<13);
-static const uint32_t GLOBAL_FLAG_ENABLE_RAW_AND_STRUCTURED_BUFFERS = (1<<14);
-static const uint32_t GLOBAL_FLAG_SKIP_OPTIMIZATION = (1<<15);
-static const uint32_t GLOBAL_FLAG_ENABLE_MINIMUM_PRECISION = (1<<16);
-static const uint32_t GLOBAL_FLAG_ENABLE_DOUBLE_EXTENSIONS = (1<<17);
-static const uint32_t GLOBAL_FLAG_ENABLE_SHADER_EXTENSIONS = (1<<18);
-
-static uint32_t DecodeGlobalFlags(uint32_t ui32Token)
-{
-    return (uint32_t)(ui32Token & 0x00fff800);
-}
-
-static INTERPOLATION_MODE DecodeInterpolationMode(uint32_t ui32Token)
-{
-    return (INTERPOLATION_MODE)((ui32Token & 0x00007800) >> 11);
-}
-
-
-typedef enum PRIMITIVE_TOPOLOGY
-{
-    PRIMITIVE_TOPOLOGY_UNDEFINED = 0,
-    PRIMITIVE_TOPOLOGY_POINTLIST = 1,
-    PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    PRIMITIVE_TOPOLOGY_LINESTRIP = 3,
-    PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5,
-    // 6 is reserved for legacy triangle fans
-    // Adjacency values should be equal to (0x8 & non-adjacency):
-    PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11,
-    PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13,
-} PRIMITIVE_TOPOLOGY;
-
-static PRIMITIVE_TOPOLOGY DecodeGSOutputPrimitiveTopology(uint32_t ui32Token)
-{
-    return (PRIMITIVE_TOPOLOGY)((ui32Token & 0x0001f800) >> 11);
-}
-
-typedef enum PRIMITIVE
-{
-    PRIMITIVE_UNDEFINED = 0,
-    PRIMITIVE_POINT = 1,
-    PRIMITIVE_LINE = 2,
-    PRIMITIVE_TRIANGLE = 3,
-    // Adjacency values should be equal to (0x4 & non-adjacency):
-    PRIMITIVE_LINE_ADJ = 6,
-    PRIMITIVE_TRIANGLE_ADJ = 7,
-    PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    PRIMITIVE_10_CONTROL_POINT_PATCH = 17,
-    PRIMITIVE_11_CONTROL_POINT_PATCH = 18,
-    PRIMITIVE_12_CONTROL_POINT_PATCH = 19,
-    PRIMITIVE_13_CONTROL_POINT_PATCH = 20,
-    PRIMITIVE_14_CONTROL_POINT_PATCH = 21,
-    PRIMITIVE_15_CONTROL_POINT_PATCH = 22,
-    PRIMITIVE_16_CONTROL_POINT_PATCH = 23,
-    PRIMITIVE_17_CONTROL_POINT_PATCH = 24,
-    PRIMITIVE_18_CONTROL_POINT_PATCH = 25,
-    PRIMITIVE_19_CONTROL_POINT_PATCH = 26,
-    PRIMITIVE_20_CONTROL_POINT_PATCH = 27,
-    PRIMITIVE_21_CONTROL_POINT_PATCH = 28,
-    PRIMITIVE_22_CONTROL_POINT_PATCH = 29,
-    PRIMITIVE_23_CONTROL_POINT_PATCH = 30,
-    PRIMITIVE_24_CONTROL_POINT_PATCH = 31,
-    PRIMITIVE_25_CONTROL_POINT_PATCH = 32,
-    PRIMITIVE_26_CONTROL_POINT_PATCH = 33,
-    PRIMITIVE_27_CONTROL_POINT_PATCH = 34,
-    PRIMITIVE_28_CONTROL_POINT_PATCH = 35,
-    PRIMITIVE_29_CONTROL_POINT_PATCH = 36,
-    PRIMITIVE_30_CONTROL_POINT_PATCH = 37,
-    PRIMITIVE_31_CONTROL_POINT_PATCH = 38,
-    PRIMITIVE_32_CONTROL_POINT_PATCH = 39,
-} PRIMITIVE;
-
-static PRIMITIVE DecodeGSInputPrimitive(uint32_t ui32Token)
-{
-    return (PRIMITIVE)((ui32Token & 0x0001f800) >> 11);
-}
-
-static TESSELLATOR_PARTITIONING DecodeTessPartitioning(uint32_t ui32Token)
-{
-    return (TESSELLATOR_PARTITIONING)((ui32Token & 0x00003800) >> 11);
-}
-
-typedef enum TESSELLATOR_DOMAIN
-{
-    TESSELLATOR_DOMAIN_UNDEFINED = 0,
-    TESSELLATOR_DOMAIN_ISOLINE   = 1,
-    TESSELLATOR_DOMAIN_TRI       = 2,
-    TESSELLATOR_DOMAIN_QUAD      = 3
-} TESSELLATOR_DOMAIN;
-
-static TESSELLATOR_DOMAIN DecodeTessDomain(uint32_t ui32Token)
-{
-    return (TESSELLATOR_DOMAIN)((ui32Token & 0x00001800) >> 11);
-}
-
-static TESSELLATOR_OUTPUT_PRIMITIVE DecodeTessOutPrim(uint32_t ui32Token)
-{
-    return (TESSELLATOR_OUTPUT_PRIMITIVE)((ui32Token & 0x00003800) >> 11);
-}
-
-static const uint32_t SYNC_THREADS_IN_GROUP = 0x00000800;
-static const uint32_t SYNC_THREAD_GROUP_SHARED_MEMORY = 0x00001000;
-static const uint32_t SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GROUP = 0x00002000;
-static const uint32_t SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GLOBAL = 0x00004000;
-
-static uint32_t DecodeSyncFlags(uint32_t ui32Token)
-{
-    return ui32Token & 0x00007800;
-}
-
-// The number of types that implement this interface
-static uint32_t DecodeInterfaceTableLength(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0x0000ffff) >> 0);
-}
-
-// The number of interfaces that are defined in this array.
-static uint32_t DecodeInterfaceArrayLength(uint32_t ui32Token)
-{
-    return (uint32_t)((ui32Token & 0xffff0000) >> 16);
-}
-
-typedef enum CUSTOMDATA_CLASS
-{
-    CUSTOMDATA_COMMENT = 0,
-    CUSTOMDATA_DEBUGINFO,
-    CUSTOMDATA_OPAQUE,
-    CUSTOMDATA_DCL_IMMEDIATE_CONSTANT_BUFFER,
-    CUSTOMDATA_SHADER_MESSAGE,
-} CUSTOMDATA_CLASS;
-
-static CUSTOMDATA_CLASS DecodeCustomDataClass(uint32_t ui32Token)
-{
-    return (CUSTOMDATA_CLASS)((ui32Token & 0xfffff800) >> 11);
-}
-
-static uint32_t DecodeInstructionSaturate(uint32_t ui32Token)
-{
-    return (ui32Token & 0x00002000) ? 1 : 0;
-}
-
-typedef enum OPERAND_MIN_PRECISION
-{
-    OPERAND_MIN_PRECISION_DEFAULT    = 0, // Default precision 
-                                            // for the shader model
-    OPERAND_MIN_PRECISION_FLOAT_16   = 1, // Min 16 bit/component float
-    OPERAND_MIN_PRECISION_FLOAT_2_8  = 2, // Min 10(2.8)bit/comp. float
-    OPERAND_MIN_PRECISION_SINT_16    = 4, // Min 16 bit/comp. signed integer
-    OPERAND_MIN_PRECISION_UINT_16    = 5, // Min 16 bit/comp. unsigned integer
-} OPERAND_MIN_PRECISION;
-
-static uint32_t DecodeOperandMinPrecision(uint32_t ui32Token)
-{
-    return (ui32Token & 0x0001C000) >> 14;
-}
-
-static uint32_t DecodeOutputControlPointCount(uint32_t ui32Token)
-{
-    return ((ui32Token & 0x0001f800) >> 11);
-}
-
-typedef enum IMMEDIATE_ADDRESS_OFFSET_COORD
-{
-    IMMEDIATE_ADDRESS_OFFSET_U        = 0,
-    IMMEDIATE_ADDRESS_OFFSET_V        = 1,
-    IMMEDIATE_ADDRESS_OFFSET_W        = 2,
-} IMMEDIATE_ADDRESS_OFFSET_COORD;
-
-
-#define IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord) (9+4*((Coord)&3))
-#define IMMEDIATE_ADDRESS_OFFSET_MASK(Coord) (0x0000000f<<IMMEDIATE_ADDRESS_OFFSET_SHIFT(Coord))
-
-static uint32_t DecodeImmediateAddressOffset(IMMEDIATE_ADDRESS_OFFSET_COORD eCoord, uint32_t ui32Token)
-{
-    return ((((ui32Token)&IMMEDIATE_ADDRESS_OFFSET_MASK(eCoord))>>(IMMEDIATE_ADDRESS_OFFSET_SHIFT(eCoord))));
-}
-
-// UAV access scope flags
-static const uint32_t GLOBALLY_COHERENT_ACCESS = 0x00010000;
-static uint32_t DecodeAccessCoherencyFlags(uint32_t ui32Token)
-{
-    return ui32Token & 0x00010000;
-}
-
-
-typedef enum RESINFO_RETURN_TYPE
-{
-    RESINFO_INSTRUCTION_RETURN_FLOAT      = 0,
-    RESINFO_INSTRUCTION_RETURN_RCPFLOAT   = 1,
-    RESINFO_INSTRUCTION_RETURN_UINT       = 2
-} RESINFO_RETURN_TYPE;
-
-static RESINFO_RETURN_TYPE DecodeResInfoReturnType(uint32_t ui32Token)
-{
-    return (RESINFO_RETURN_TYPE)((ui32Token & 0x00001800) >> 11);
-}
-
-#include "tokensDX9.h"
-
-#endif
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/tokensDX9.h b/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/tokensDX9.h
deleted file mode 100644
index 1284419ca2..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/internal_includes/tokensDX9.h
+++ /dev/null
@@ -1,304 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "debug.h"
-
-static const uint32_t D3D9SHADER_TYPE_VERTEX = 0xFFFE0000;
-static const uint32_t D3D9SHADER_TYPE_PIXEL = 0xFFFF0000;
-
-static SHADER_TYPE DecodeShaderTypeDX9(const uint32_t ui32Token)
-{
-    uint32_t ui32Type = ui32Token & 0xFFFF0000;
-    if(ui32Type == D3D9SHADER_TYPE_VERTEX)
-        return VERTEX_SHADER;
-
-    if(ui32Type == D3D9SHADER_TYPE_PIXEL)
-        return PIXEL_SHADER;
-
-    return INVALID_SHADER;
-}
-
-static uint32_t DecodeProgramMajorVersionDX9(const uint32_t ui32Token)
-{
-    return ((ui32Token)>>8)&0xFF;
-}
-
-static uint32_t DecodeProgramMinorVersionDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0xFF;
-}
-
-typedef enum
-{
-    OPCODE_DX9_NOP          = 0,
-    OPCODE_DX9_MOV          ,
-    OPCODE_DX9_ADD          ,
-    OPCODE_DX9_SUB          ,
-    OPCODE_DX9_MAD          ,
-    OPCODE_DX9_MUL          ,
-    OPCODE_DX9_RCP          ,
-    OPCODE_DX9_RSQ          ,
-    OPCODE_DX9_DP3          ,
-    OPCODE_DX9_DP4          ,
-    OPCODE_DX9_MIN          ,
-    OPCODE_DX9_MAX          ,
-    OPCODE_DX9_SLT          ,
-    OPCODE_DX9_SGE          ,
-    OPCODE_DX9_EXP          ,
-    OPCODE_DX9_LOG          ,
-    OPCODE_DX9_LIT          ,
-    OPCODE_DX9_DST          ,
-    OPCODE_DX9_LRP          ,
-    OPCODE_DX9_FRC          ,
-    OPCODE_DX9_M4x4         ,
-    OPCODE_DX9_M4x3         ,
-    OPCODE_DX9_M3x4         ,
-    OPCODE_DX9_M3x3         ,
-    OPCODE_DX9_M3x2         ,
-    OPCODE_DX9_CALL         ,
-    OPCODE_DX9_CALLNZ       ,
-    OPCODE_DX9_LOOP         ,
-    OPCODE_DX9_RET          ,
-    OPCODE_DX9_ENDLOOP      ,
-    OPCODE_DX9_LABEL        ,
-    OPCODE_DX9_DCL          ,
-    OPCODE_DX9_POW          ,
-    OPCODE_DX9_CRS          ,
-    OPCODE_DX9_SGN          ,
-    OPCODE_DX9_ABS          ,
-    OPCODE_DX9_NRM          ,
-    OPCODE_DX9_SINCOS       ,
-    OPCODE_DX9_REP          ,
-    OPCODE_DX9_ENDREP       ,
-    OPCODE_DX9_IF           ,
-    OPCODE_DX9_IFC          ,
-    OPCODE_DX9_ELSE         ,
-    OPCODE_DX9_ENDIF        ,
-    OPCODE_DX9_BREAK        ,
-    OPCODE_DX9_BREAKC       ,
-    OPCODE_DX9_MOVA         ,
-    OPCODE_DX9_DEFB         ,
-    OPCODE_DX9_DEFI         ,
-
-    OPCODE_DX9_TEXCOORD     = 64,
-    OPCODE_DX9_TEXKILL      ,
-    OPCODE_DX9_TEX          ,
-    OPCODE_DX9_TEXBEM       ,
-    OPCODE_DX9_TEXBEML      ,
-    OPCODE_DX9_TEXREG2AR    ,
-    OPCODE_DX9_TEXREG2GB    ,
-    OPCODE_DX9_TEXM3x2PAD   ,
-    OPCODE_DX9_TEXM3x2TEX   ,
-    OPCODE_DX9_TEXM3x3PAD   ,
-    OPCODE_DX9_TEXM3x3TEX   ,
-    OPCODE_DX9_RESERVED0    ,
-    OPCODE_DX9_TEXM3x3SPEC  ,
-    OPCODE_DX9_TEXM3x3VSPEC ,
-    OPCODE_DX9_EXPP         ,
-    OPCODE_DX9_LOGP         ,
-    OPCODE_DX9_CND          ,
-    OPCODE_DX9_DEF          ,
-    OPCODE_DX9_TEXREG2RGB   ,
-    OPCODE_DX9_TEXDP3TEX    ,
-    OPCODE_DX9_TEXM3x2DEPTH ,
-    OPCODE_DX9_TEXDP3       ,
-    OPCODE_DX9_TEXM3x3      ,
-    OPCODE_DX9_TEXDEPTH     ,
-    OPCODE_DX9_CMP          ,
-    OPCODE_DX9_BEM          ,
-    OPCODE_DX9_DP2ADD       ,
-    OPCODE_DX9_DSX          ,
-    OPCODE_DX9_DSY          ,
-    OPCODE_DX9_TEXLDD       ,
-    OPCODE_DX9_SETP         ,
-    OPCODE_DX9_TEXLDL       ,
-    OPCODE_DX9_BREAKP       ,
-
-    OPCODE_DX9_PHASE        = 0xFFFD,
-    OPCODE_DX9_COMMENT      = 0xFFFE,
-    OPCODE_DX9_END          = 0xFFFF,
-
-    OPCODE_DX9_FORCE_DWORD  = 0x7fffffff,   // force 32-bit size enum
-} OPCODE_TYPE_DX9;
-
-static OPCODE_TYPE_DX9 DecodeOpcodeTypeDX9(const uint32_t ui32Token)
-{
-    return (OPCODE_TYPE_DX9)(ui32Token & 0x0000FFFF);
-}
-
-static uint32_t DecodeInstructionLengthDX9(const uint32_t ui32Token)
-{
-    return (ui32Token & 0x0F000000)>>24;
-}
-
-static uint32_t DecodeCommentLengthDX9(const uint32_t ui32Token)
-{
-    return (ui32Token & 0x7FFF0000)>>16;
-}
-
-static uint32_t DecodeOperandRegisterNumberDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0x000007FF;
-}
-
-typedef enum
-{
-    OPERAND_TYPE_DX9_TEMP           =  0, // Temporary Register File
-    OPERAND_TYPE_DX9_INPUT          =  1, // Input Register File
-    OPERAND_TYPE_DX9_CONST          =  2, // Constant Register File
-    OPERAND_TYPE_DX9_ADDR           =  3, // Address Register (VS)
-    OPERAND_TYPE_DX9_TEXTURE        =  3, // Texture Register File (PS)
-    OPERAND_TYPE_DX9_RASTOUT        =  4, // Rasterizer Register File
-    OPERAND_TYPE_DX9_ATTROUT        =  5, // Attribute Output Register File
-    OPERAND_TYPE_DX9_TEXCRDOUT      =  6, // Texture Coordinate Output Register File
-    OPERAND_TYPE_DX9_OUTPUT         =  6, // Output register file for VS3.0+
-    OPERAND_TYPE_DX9_CONSTINT       =  7, // Constant Integer Vector Register File
-    OPERAND_TYPE_DX9_COLOROUT       =  8, // Color Output Register File
-    OPERAND_TYPE_DX9_DEPTHOUT       =  9, // Depth Output Register File
-    OPERAND_TYPE_DX9_SAMPLER        = 10, // Sampler State Register File
-    OPERAND_TYPE_DX9_CONST2         = 11, // Constant Register File  2048 - 4095
-    OPERAND_TYPE_DX9_CONST3         = 12, // Constant Register File  4096 - 6143
-    OPERAND_TYPE_DX9_CONST4         = 13, // Constant Register File  6144 - 8191
-    OPERAND_TYPE_DX9_CONSTBOOL      = 14, // Constant Boolean register file
-    OPERAND_TYPE_DX9_LOOP           = 15, // Loop counter register file
-    OPERAND_TYPE_DX9_TEMPFLOAT16    = 16, // 16-bit float temp register file
-    OPERAND_TYPE_DX9_MISCTYPE       = 17, // Miscellaneous (single) registers.
-    OPERAND_TYPE_DX9_LABEL          = 18, // Label
-    OPERAND_TYPE_DX9_PREDICATE      = 19, // Predicate register
-    OPERAND_TYPE_DX9_FORCE_DWORD  = 0x7fffffff,         // force 32-bit size enum
-} OPERAND_TYPE_DX9;
-
-static OPERAND_TYPE_DX9 DecodeOperandTypeDX9(const uint32_t ui32Token)
-{
-    return (OPERAND_TYPE_DX9)(((ui32Token & 0x70000000) >> 28) |
-            ((ui32Token & 0x00001800) >> 8));
-}
-
-static uint32_t CreateOperandTokenDX9(const uint32_t ui32RegNum, const OPERAND_TYPE_DX9 eType)
-{
-    uint32_t ui32Token = ui32RegNum;
-    ASSERT(ui32RegNum <2048);
-    ui32Token |= (eType <<28) & 0x70000000;
-    ui32Token |= (eType <<8) & 0x00001800;
-    return ui32Token;
-}
-
-typedef enum { 
-  DECLUSAGE_POSITION      = 0,
-  DECLUSAGE_BLENDWEIGHT   = 1,
-  DECLUSAGE_BLENDINDICES  = 2,
-  DECLUSAGE_NORMAL        = 3,
-  DECLUSAGE_PSIZE         = 4,
-  DECLUSAGE_TEXCOORD      = 5,
-  DECLUSAGE_TANGENT       = 6,
-  DECLUSAGE_BINORMAL      = 7,
-  DECLUSAGE_TESSFACTOR    = 8,
-  DECLUSAGE_POSITIONT     = 9,
-  DECLUSAGE_COLOR         = 10,
-  DECLUSAGE_FOG           = 11,
-  DECLUSAGE_DEPTH         = 12,
-  DECLUSAGE_SAMPLE        = 13
-} DECLUSAGE_DX9;
-
-static DECLUSAGE_DX9 DecodeUsageDX9(const uint32_t ui32Token)
-{
-    return (DECLUSAGE_DX9) (ui32Token & 0x0000000f);
-}
-
-static uint32_t DecodeUsageIndexDX9(const uint32_t ui32Token)
-{
-    return (ui32Token & 0x000f0000)>>16;
-}
-
-static uint32_t DecodeOperandIsRelativeAddressModeDX9(const uint32_t ui32Token)
-{
-    return ui32Token & (1<<13);
-}
-
-static const uint32_t DX9_SWIZZLE_SHIFT = 16;
-#define NO_SWIZZLE_DX9 ((0<<DX9_SWIZZLE_SHIFT)|(1<<DX9_SWIZZLE_SHIFT)|(2<<DX9_SWIZZLE_SHIFT)|(3<<DX9_SWIZZLE_SHIFT))
-
-#define REPLICATE_SWIZZLE_DX9(CHANNEL) ((CHANNEL<<DX9_SWIZZLE_SHIFT)|(CHANNEL<<(DX9_SWIZZLE_SHIFT+2))|(CHANNEL<<(DX9_SWIZZLE_SHIFT+4))|(CHANNEL<<(DX9_SWIZZLE_SHIFT+6)))
-
-static uint32_t DecodeOperandSwizzleDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0x00FF0000;
-}
-
-static const uint32_t DX9_WRITEMASK_0 = 0x00010000;  // Component 0 (X;Red)
-static const uint32_t DX9_WRITEMASK_1 = 0x00020000;  // Component 1 (Y;Green)
-static const uint32_t DX9_WRITEMASK_2 = 0x00040000;  // Component 2 (Z;Blue)
-static const uint32_t DX9_WRITEMASK_3 = 0x00080000;  // Component 3 (W;Alpha)
-static const uint32_t DX9_WRITEMASK_ALL = 0x000F0000;  // All Components
-
-static uint32_t DecodeDestWriteMaskDX9(const uint32_t ui32Token)
-{
-    return ui32Token & DX9_WRITEMASK_ALL;
-}
-
-static RESOURCE_DIMENSION DecodeTextureTypeMaskDX9(const uint32_t ui32Token)
-{
-
-    switch(ui32Token & 0x78000000)
-    {
-    case 2 << 27:
-        return RESOURCE_DIMENSION_TEXTURE2D;
-    case 3 << 27:
-        return RESOURCE_DIMENSION_TEXTURECUBE;
-    case 4 << 27:
-        return RESOURCE_DIMENSION_TEXTURE3D;
-    default:
-        return RESOURCE_DIMENSION_UNKNOWN;
-    }
-}
-
-
-
-static const uint32_t DESTMOD_DX9_NONE    = 0;
-static const uint32_t DESTMOD_DX9_SATURATE    = (1 << 20);
-static const uint32_t DESTMOD_DX9_PARTIALPRECISION    = (2 << 20);
-static const uint32_t DESTMOD_DX9_MSAMPCENTROID = (4 << 20);
-static uint32_t DecodeDestModifierDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0xf00000;
-}
-
-typedef enum
-{
-    SRCMOD_DX9_NONE = 0 << 24,
-    SRCMOD_DX9_NEG = 1 << 24,
-    SRCMOD_DX9_BIAS = 2 << 24,
-    SRCMOD_DX9_BIASNEG = 3 << 24,
-    SRCMOD_DX9_SIGN = 4 << 24,
-    SRCMOD_DX9_SIGNNEG = 5 << 24,
-    SRCMOD_DX9_COMP = 6 << 24,
-    SRCMOD_DX9_X2 = 7 << 24,
-    SRCMOD_DX9_X2NEG = 8 << 24,
-    SRCMOD_DX9_DZ = 9 << 24,
-    SRCMOD_DX9_DW = 10 << 24,
-    SRCMOD_DX9_ABS = 11 << 24,
-    SRCMOD_DX9_ABSNEG = 12 << 24,
-    SRCMOD_DX9_NOT = 13 << 24,
-    SRCMOD_DX9_FORCE_DWORD = 0xffffffff
-} SRCMOD_DX9;
-static uint32_t DecodeSrcModifierDX9(const uint32_t ui32Token)
-{
-    return ui32Token & 0xf000000;
-}
-
-typedef enum
-{
-    D3DSPC_RESERVED0 = 0,
-    D3DSPC_GT = 1,
-    D3DSPC_EQ = 2,
-    D3DSPC_GE = 3,
-    D3DSPC_LT = 4,
-    D3DSPC_NE = 5,
-    D3DSPC_LE = 6,
-    D3DSPC_BOOLEAN = 7, //Make use of the RESERVED1 bit to indicate if-bool opcode.
-} COMPARISON_DX9;
-
-static COMPARISON_DX9 DecodeComparisonDX9(const uint32_t ui32Token)
-{
-    return (COMPARISON_DX9)((ui32Token & (0x07<<16))>>16);
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/reflect.c b/Code/Tools/HLSLCrossCompilerMETAL/src/reflect.c
deleted file mode 100644
index 03f3388a93..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/reflect.c
+++ /dev/null
@@ -1,1213 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/reflect.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/decode.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "bstrlib.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-static void FormatVariableName(char* Name)
-{
-    /* MSDN http://msdn.microsoft.com/en-us/library/windows/desktop/bb944006(v=vs.85).aspx
-       The uniform function parameters appear in the
-       constant table prepended with a dollar sign ($),
-       unlike the global variables. The dollar sign is
-       required to avoid name collisions between local
-       uniform inputs and global variables of the same name.*/
-
-    /* Leave $ThisPointer, $Element and $Globals as-is.
-       Otherwise remove $ character ($ is not a valid character for GLSL variable names). */
-    if (Name[0] == '$')
-    {
-        if (strcmp(Name, "$Element") != 0 &&
-            strcmp(Name, "$Globals") != 0 &&
-            strcmp(Name, "$ThisPointer") != 0)
-        {
-            Name[0] = '_';
-        }
-    }
-}
-
-static void ReadStringFromTokenStream(const uint32_t* tokens, char* str)
-{
-    char* charTokens = (char*) tokens;
-    char nextCharacter = *charTokens++;
-    int length = 0;
-
-    //Add each individual character until
-    //a terminator is found.
-    while (nextCharacter != 0)
-    {
-        str[length++] = nextCharacter;
-
-        if (length > MAX_REFLECT_STRING_LENGTH)
-        {
-            str[length - 1] = '\0';
-            return;
-        }
-
-        nextCharacter = *charTokens++;
-    }
-
-    str[length] = '\0';
-}
-
-static void ReadInputSignatures(const uint32_t* pui32Tokens,
-    ShaderInfo* psShaderInfo,
-    const int extended)
-{
-    uint32_t i;
-
-    InOutSignature* psSignatures;
-    const uint32_t* pui32FirstSignatureToken = pui32Tokens;
-    const uint32_t ui32ElementCount = *pui32Tokens++;
-    /*const uint32_t ui32Key =*/ *pui32Tokens++;
-
-    psSignatures = hlslcc_malloc(sizeof(InOutSignature) * ui32ElementCount);
-    psShaderInfo->psInputSignatures = psSignatures;
-    psShaderInfo->ui32NumInputSignatures = ui32ElementCount;
-
-    for (i = 0; i < ui32ElementCount; ++i)
-    {
-        uint32_t ui32ComponentMasks;
-        InOutSignature* psCurrentSignature = psSignatures + i;
-        uint32_t ui32SemanticNameOffset;
-
-        psCurrentSignature->ui32Stream = 0;
-        psCurrentSignature->eMinPrec = MIN_PRECISION_DEFAULT;
-
-        if (extended)
-        {
-            psCurrentSignature->ui32Stream = *pui32Tokens++;
-        }
-
-        ui32SemanticNameOffset = *pui32Tokens++;
-        psCurrentSignature->ui32SemanticIndex = *pui32Tokens++;
-        psCurrentSignature->eSystemValueType = (SPECIAL_NAME) *pui32Tokens++;
-        psCurrentSignature->eComponentType = (INOUT_COMPONENT_TYPE) *pui32Tokens++;
-        psCurrentSignature->ui32Register = *pui32Tokens++;
-
-        ui32ComponentMasks = *pui32Tokens++;
-        psCurrentSignature->ui32Mask = ui32ComponentMasks & 0x7F;
-        //Shows which components are read
-        psCurrentSignature->ui32ReadWriteMask = (ui32ComponentMasks & 0x7F00) >> 8;
-
-        if (extended)
-        {
-            psCurrentSignature->eMinPrec = *pui32Tokens++;
-        }
-
-        ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstSignatureToken + ui32SemanticNameOffset), psCurrentSignature->SemanticName);
-    }
-}
-
-static void ReadOutputSignatures(const uint32_t* pui32Tokens,
-    ShaderInfo* psShaderInfo,
-    const int minPrec,
-    const int streams)
-{
-    uint32_t i;
-
-    InOutSignature* psSignatures;
-    const uint32_t* pui32FirstSignatureToken = pui32Tokens;
-    const uint32_t ui32ElementCount = *pui32Tokens++;
-    /*const uint32_t ui32Key =*/ *pui32Tokens++;
-
-    psSignatures = hlslcc_malloc(sizeof(InOutSignature) * ui32ElementCount);
-    psShaderInfo->psOutputSignatures = psSignatures;
-    psShaderInfo->ui32NumOutputSignatures = ui32ElementCount;
-
-    for (i = 0; i < ui32ElementCount; ++i)
-    {
-        uint32_t ui32ComponentMasks;
-        InOutSignature* psCurrentSignature = psSignatures + i;
-        uint32_t ui32SemanticNameOffset;
-
-        psCurrentSignature->ui32Stream = 0;
-        psCurrentSignature->eMinPrec = MIN_PRECISION_DEFAULT;
-
-        if (streams)
-        {
-            psCurrentSignature->ui32Stream = *pui32Tokens++;
-        }
-
-        ui32SemanticNameOffset = *pui32Tokens++;
-        psCurrentSignature->ui32SemanticIndex = *pui32Tokens++;
-        psCurrentSignature->eSystemValueType = (SPECIAL_NAME)*pui32Tokens++;
-        psCurrentSignature->eComponentType = (INOUT_COMPONENT_TYPE) *pui32Tokens++;
-        psCurrentSignature->ui32Register = *pui32Tokens++;
-
-        // Massage some special inputs/outputs to match the types of GLSL counterparts
-        if (psCurrentSignature->eSystemValueType == NAME_RENDER_TARGET_ARRAY_INDEX)
-        {
-            psCurrentSignature->eComponentType = INOUT_COMPONENT_SINT32;
-        }
-
-        ui32ComponentMasks = *pui32Tokens++;
-        psCurrentSignature->ui32Mask = ui32ComponentMasks & 0x7F;
-        //Shows which components are NEVER written.
-        psCurrentSignature->ui32ReadWriteMask = (ui32ComponentMasks & 0x7F00) >> 8;
-
-        if (minPrec)
-        {
-            psCurrentSignature->eMinPrec = *pui32Tokens++;
-        }
-
-        ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstSignatureToken + ui32SemanticNameOffset), psCurrentSignature->SemanticName);
-    }
-}
-
-static void ReadPatchConstantSignatures(const uint32_t* pui32Tokens,
-    ShaderInfo* psShaderInfo,
-    const int minPrec,
-    const int streams)
-{
-    uint32_t i;
-
-    InOutSignature* psSignatures;
-    const uint32_t* pui32FirstSignatureToken = pui32Tokens;
-    const uint32_t ui32ElementCount = *pui32Tokens++;
-    /*const uint32_t ui32Key =*/ *pui32Tokens++;
-
-    psSignatures = hlslcc_malloc(sizeof(InOutSignature) * ui32ElementCount);
-    psShaderInfo->psPatchConstantSignatures = psSignatures;
-    psShaderInfo->ui32NumPatchConstantSignatures = ui32ElementCount;
-
-    for (i = 0; i < ui32ElementCount; ++i)
-    {
-        uint32_t ui32ComponentMasks;
-        InOutSignature* psCurrentSignature = psSignatures + i;
-        uint32_t ui32SemanticNameOffset;
-
-        psCurrentSignature->ui32Stream = 0;
-        psCurrentSignature->eMinPrec = MIN_PRECISION_DEFAULT;
-
-        if (streams)
-        {
-            psCurrentSignature->ui32Stream = *pui32Tokens++;
-        }
-
-        ui32SemanticNameOffset = *pui32Tokens++;
-        psCurrentSignature->ui32SemanticIndex = *pui32Tokens++;
-        psCurrentSignature->eSystemValueType = (SPECIAL_NAME)*pui32Tokens++;
-        psCurrentSignature->eComponentType = (INOUT_COMPONENT_TYPE) *pui32Tokens++;
-        psCurrentSignature->ui32Register = *pui32Tokens++;
-
-        // Massage some special inputs/outputs to match the types of GLSL counterparts
-        if (psCurrentSignature->eSystemValueType == NAME_RENDER_TARGET_ARRAY_INDEX)
-        {
-            psCurrentSignature->eComponentType = INOUT_COMPONENT_SINT32;
-        }
-
-        ui32ComponentMasks = *pui32Tokens++;
-        psCurrentSignature->ui32Mask = ui32ComponentMasks & 0x7F;
-        //Shows which components are NEVER written.
-        psCurrentSignature->ui32ReadWriteMask = (ui32ComponentMasks & 0x7F00) >> 8;
-
-        if (minPrec)
-        {
-            psCurrentSignature->eMinPrec = *pui32Tokens++;
-        }
-
-        ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstSignatureToken + ui32SemanticNameOffset), psCurrentSignature->SemanticName);
-    }
-}
-
-static const uint32_t* ReadResourceBinding(const uint32_t* pui32FirstResourceToken, const uint32_t* pui32Tokens, ResourceBinding* psBinding)
-{
-    uint32_t ui32NameOffset = *pui32Tokens++;
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstResourceToken + ui32NameOffset), psBinding->Name);
-    FormatVariableName(psBinding->Name);
-
-    psBinding->eType = *pui32Tokens++;
-    psBinding->ui32ReturnType = *pui32Tokens++;
-    psBinding->eDimension = (REFLECT_RESOURCE_DIMENSION)*pui32Tokens++;
-    psBinding->ui32NumSamples = *pui32Tokens++;
-    psBinding->ui32BindPoint = *pui32Tokens++;
-    psBinding->ui32BindCount = *pui32Tokens++;
-    psBinding->ui32Flags = *pui32Tokens++;
-    psBinding->eBindArea = UAVAREA_INVALID;
-
-    return pui32Tokens;
-}
-
-//Read D3D11_SHADER_TYPE_DESC
-static void ReadShaderVariableType(const uint32_t ui32MajorVersion,
-    const uint32_t* pui32FirstConstBufToken,
-    const uint32_t* pui32tokens, ShaderVarType* varType)
-{
-    const uint16_t* pui16Tokens = (const uint16_t*) pui32tokens;
-    uint16_t ui32MemberCount;
-    uint32_t ui32MemberOffset;
-    const uint32_t* pui32MemberTokens;
-    uint32_t i;
-
-    varType->Class = (SHADER_VARIABLE_CLASS)pui16Tokens[0];
-    varType->Type = (SHADER_VARIABLE_TYPE)pui16Tokens[1];
-    varType->Rows = pui16Tokens[2];
-    varType->Columns = pui16Tokens[3];
-    varType->Elements = pui16Tokens[4];
-
-    varType->MemberCount = ui32MemberCount = pui16Tokens[5];
-    varType->Members = 0;
-
-    if (varType->ParentCount)
-    {
-        ASSERT((strlen(varType->Parent->FullName) + 1 + strlen(varType->Name) + 1 + 2) < MAX_REFLECT_STRING_LENGTH);
-
-        strcpy(varType->FullName, varType->Parent->FullName);
-        strcat(varType->FullName, ".");
-        strcat(varType->FullName, varType->Name);
-    }
-
-    if (ui32MemberCount)
-    {
-        varType->Members = (ShaderVarType*)hlslcc_malloc(sizeof(ShaderVarType) * ui32MemberCount);
-
-        ui32MemberOffset = pui32tokens[3];
-
-        pui32MemberTokens = (const uint32_t*)((const char*)pui32FirstConstBufToken + ui32MemberOffset);
-
-        for (i = 0; i < ui32MemberCount; ++i)
-        {
-            uint32_t ui32NameOffset = *pui32MemberTokens++;
-            uint32_t ui32MemberTypeOffset = *pui32MemberTokens++;
-
-            varType->Members[i].Parent = varType;
-            varType->Members[i].ParentCount = varType->ParentCount + 1;
-
-            varType->Members[i].Offset = *pui32MemberTokens++;
-
-            ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstConstBufToken + ui32NameOffset), varType->Members[i].Name);
-
-            ReadShaderVariableType(ui32MajorVersion, pui32FirstConstBufToken,
-                (const uint32_t*)((const char*)pui32FirstConstBufToken + ui32MemberTypeOffset), &varType->Members[i]);
-        }
-    }
-}
-
-static const uint32_t* ReadConstantBuffer(ShaderInfo* psShaderInfo,
-    const uint32_t* pui32FirstConstBufToken, const uint32_t* pui32Tokens, ConstantBuffer* psBuffer)
-{
-    uint32_t i;
-    uint32_t ui32NameOffset = *pui32Tokens++;
-    uint32_t ui32VarCount = *pui32Tokens++;
-    uint32_t ui32VarOffset = *pui32Tokens++;
-    const uint32_t* pui32VarToken = (const uint32_t*)((const char*)pui32FirstConstBufToken + ui32VarOffset);
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstConstBufToken + ui32NameOffset), psBuffer->Name);
-    FormatVariableName(psBuffer->Name);
-
-    psBuffer->ui32NumVars = ui32VarCount;
-    psBuffer->asVars = hlslcc_malloc(psBuffer->ui32NumVars * sizeof(ShaderVar));
-
-    for (i = 0; i < ui32VarCount; ++i)
-    {
-        //D3D11_SHADER_VARIABLE_DESC
-        ShaderVar* const psVar = &psBuffer->asVars[i];
-
-        uint32_t ui32Flags;
-        uint32_t ui32TypeOffset;
-        uint32_t ui32DefaultValueOffset;
-
-        ui32NameOffset = *pui32VarToken++;
-
-        ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstConstBufToken + ui32NameOffset), psVar->Name);
-        FormatVariableName(psVar->Name);
-
-        psVar->ui32StartOffset = *pui32VarToken++;
-        psVar->ui32Size = *pui32VarToken++;
-        ui32Flags = *pui32VarToken++;
-        ui32TypeOffset = *pui32VarToken++;
-
-        strcpy(psVar->sType.Name, psVar->Name);
-        strcpy(psVar->sType.FullName, psVar->Name);
-        psVar->sType.Parent = 0;
-        psVar->sType.ParentCount = 0;
-        psVar->sType.Offset = 0;
-
-        ReadShaderVariableType(psShaderInfo->ui32MajorVersion, pui32FirstConstBufToken,
-            (const uint32_t*)((const char*)pui32FirstConstBufToken + ui32TypeOffset), &psVar->sType);
-
-        ui32DefaultValueOffset = *pui32VarToken++;
-
-
-        if (psShaderInfo->ui32MajorVersion  >= 5)
-        {
-            /* uint32_t StartTexture = */ *pui32VarToken++;
-            /* uint32_t TextureSize = */ *pui32VarToken++;
-            /* uint32_t StartSampler = */ *pui32VarToken++;
-            /* uint32_t SamplerSize = */ *pui32VarToken++;
-        }
-
-        psVar->haveDefaultValue = 0;
-
-        if (ui32DefaultValueOffset)
-        {
-            const uint32_t ui32NumDefaultValues = psVar->ui32Size / 4;
-            const uint32_t* pui32DefaultValToken = (const uint32_t*)((const char*)pui32FirstConstBufToken + ui32DefaultValueOffset);
-
-            //Always a sequence of 4-bytes at the moment.
-            //bool const becomes 0 or 0xFFFFFFFF int, int & float are 4-bytes.
-            ASSERT(psVar->ui32Size % 4 == 0);
-
-            psVar->haveDefaultValue = 1;
-
-            psVar->pui32DefaultValues = hlslcc_malloc(psVar->ui32Size);
-
-            for (uint32_t ii = 0; ii < ui32NumDefaultValues; ++ii)
-            {
-                psVar->pui32DefaultValues[ii] = pui32DefaultValToken[ii];
-            }
-        }
-    }
-
-
-    {
-        uint32_t ui32Flags;
-        uint32_t ui32BufferType;
-
-        psBuffer->ui32TotalSizeInBytes = *pui32Tokens++;
-        psBuffer->blob = 0;
-        ui32Flags = *pui32Tokens++;
-        ui32BufferType = *pui32Tokens++;
-    }
-
-    return pui32Tokens;
-}
-
-static void ReadResources(const uint32_t* pui32Tokens,//in
-    ShaderInfo* psShaderInfo)               //out
-{
-    ResourceBinding* psResBindings;
-    ConstantBuffer* psConstantBuffers;
-    const uint32_t* pui32ConstantBuffers;
-    const uint32_t* pui32ResourceBindings;
-    const uint32_t* pui32FirstToken = pui32Tokens;
-    uint32_t i;
-
-    const uint32_t ui32NumConstantBuffers = *pui32Tokens++;
-    const uint32_t ui32ConstantBufferOffset = *pui32Tokens++;
-
-    uint32_t ui32NumResourceBindings = *pui32Tokens++;
-    uint32_t ui32ResourceBindingOffset = *pui32Tokens++;
-    /*uint32_t ui32ShaderModel =*/ *pui32Tokens++;
-    /*uint32_t ui32CompileFlags =*/ *pui32Tokens++;//D3DCompile flags? http://msdn.microsoft.com/en-us/library/gg615083(v=vs.85).aspx
-
-    //Resources
-    pui32ResourceBindings = (const uint32_t*)((const char*)pui32FirstToken + ui32ResourceBindingOffset);
-
-    psResBindings = hlslcc_malloc(sizeof(ResourceBinding) * ui32NumResourceBindings);
-
-    psShaderInfo->ui32NumResourceBindings = ui32NumResourceBindings;
-    psShaderInfo->psResourceBindings = psResBindings;
-
-    for (i = 0; i < ui32NumResourceBindings; ++i)
-    {
-        pui32ResourceBindings = ReadResourceBinding(pui32FirstToken, pui32ResourceBindings, psResBindings + i);
-        ASSERT(psResBindings[i].ui32BindPoint < MAX_RESOURCE_BINDINGS);
-    }
-
-    //Constant buffers
-    pui32ConstantBuffers = (const uint32_t*)((const char*)pui32FirstToken + ui32ConstantBufferOffset);
-
-    psConstantBuffers = hlslcc_malloc(sizeof(ConstantBuffer) * ui32NumConstantBuffers);
-
-    psShaderInfo->ui32NumConstantBuffers = ui32NumConstantBuffers;
-    psShaderInfo->psConstantBuffers = psConstantBuffers;
-
-    for (i = 0; i < ui32NumConstantBuffers; ++i)
-    {
-        pui32ConstantBuffers = ReadConstantBuffer(psShaderInfo, pui32FirstToken, pui32ConstantBuffers, psConstantBuffers + i);
-    }
-
-
-    //Map resource bindings to constant buffers
-    if (psShaderInfo->ui32NumConstantBuffers)
-    {
-        for (i = 0; i < ui32NumResourceBindings; ++i)
-        {
-            ResourceGroup eRGroup;
-            uint32_t cbufIndex = 0;
-
-            eRGroup = ResourceTypeToResourceGroup(psResBindings[i].eType);
-
-            //Find the constant buffer whose name matches the resource at the given resource binding point
-            for (cbufIndex = 0; cbufIndex < psShaderInfo->ui32NumConstantBuffers; cbufIndex++)
-            {
-                if (strcmp(psConstantBuffers[cbufIndex].Name, psResBindings[i].Name) == 0)
-                {
-                    psShaderInfo->aui32ResourceMap[eRGroup][psResBindings[i].ui32BindPoint] = cbufIndex;
-                }
-            }
-        }
-    }
-}
-
-static const uint16_t* ReadClassType(const uint32_t* pui32FirstInterfaceToken, const uint16_t* pui16Tokens, ClassType* psClassType)
-{
-    const uint32_t* pui32Tokens = (const uint32_t*)pui16Tokens;
-    uint32_t ui32NameOffset = *pui32Tokens;
-    pui16Tokens += 2;
-
-    psClassType->ui16ID = *pui16Tokens++;
-    psClassType->ui16ConstBufStride = *pui16Tokens++;
-    psClassType->ui16Texture = *pui16Tokens++;
-    psClassType->ui16Sampler = *pui16Tokens++;
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstInterfaceToken + ui32NameOffset), psClassType->Name);
-
-    return pui16Tokens;
-}
-
-static const uint16_t* ReadClassInstance(const uint32_t* pui32FirstInterfaceToken, const uint16_t* pui16Tokens, ClassInstance* psClassInstance)
-{
-    uint32_t ui32NameOffset = *pui16Tokens++ << 16;
-    ui32NameOffset |= *pui16Tokens++;
-
-    psClassInstance->ui16ID = *pui16Tokens++;
-    psClassInstance->ui16ConstBuf = *pui16Tokens++;
-    psClassInstance->ui16ConstBufOffset = *pui16Tokens++;
-    psClassInstance->ui16Texture = *pui16Tokens++;
-    psClassInstance->ui16Sampler = *pui16Tokens++;
-
-    ReadStringFromTokenStream((const uint32_t*)((const char*)pui32FirstInterfaceToken + ui32NameOffset), psClassInstance->Name);
-
-    return pui16Tokens;
-}
-
-
-static void ReadInterfaces(const uint32_t* pui32Tokens,
-    ShaderInfo* psShaderInfo)
-{
-    uint32_t i;
-    uint32_t ui32StartSlot;
-    const uint32_t* pui32FirstInterfaceToken = pui32Tokens;
-    const uint32_t ui32ClassInstanceCount = *pui32Tokens++;
-    const uint32_t ui32ClassTypeCount = *pui32Tokens++;
-    const uint32_t ui32InterfaceSlotRecordCount = *pui32Tokens++;
-    /*const uint32_t ui32InterfaceSlotCount =*/ *pui32Tokens++;
-    const uint32_t ui32ClassInstanceOffset = *pui32Tokens++;
-    const uint32_t ui32ClassTypeOffset = *pui32Tokens++;
-    const uint32_t ui32InterfaceSlotOffset = *pui32Tokens++;
-
-    const uint16_t* pui16ClassTypes = (const uint16_t*)((const char*)pui32FirstInterfaceToken + ui32ClassTypeOffset);
-    const uint16_t* pui16ClassInstances = (const uint16_t*)((const char*)pui32FirstInterfaceToken + ui32ClassInstanceOffset);
-    const uint32_t* pui32InterfaceSlots = (const uint32_t*)((const char*)pui32FirstInterfaceToken + ui32InterfaceSlotOffset);
-
-    const uint32_t* pui32InterfaceSlotTokens = pui32InterfaceSlots;
-
-    ClassType* psClassTypes;
-    ClassInstance* psClassInstances;
-
-    psClassTypes = hlslcc_malloc(sizeof(ClassType) * ui32ClassTypeCount);
-    for (i = 0; i < ui32ClassTypeCount; ++i)
-    {
-        pui16ClassTypes = ReadClassType(pui32FirstInterfaceToken, pui16ClassTypes, psClassTypes + i);
-        psClassTypes[i].ui16ID = (uint16_t)i;
-    }
-
-    psClassInstances = hlslcc_malloc(sizeof(ClassInstance) * ui32ClassInstanceCount);
-    for (i = 0; i < ui32ClassInstanceCount; ++i)
-    {
-        pui16ClassInstances = ReadClassInstance(pui32FirstInterfaceToken, pui16ClassInstances, psClassInstances + i);
-    }
-
-    //Slots map function table to $ThisPointer cbuffer variable index
-    ui32StartSlot = 0;
-    for (i = 0; i < ui32InterfaceSlotRecordCount; ++i)
-    {
-        uint32_t k;
-
-        const uint32_t ui32SlotSpan = *pui32InterfaceSlotTokens++;
-        const uint32_t ui32Count = *pui32InterfaceSlotTokens++;
-        const uint32_t ui32TypeIDOffset = *pui32InterfaceSlotTokens++;
-        const uint32_t ui32TableIDOffset = *pui32InterfaceSlotTokens++;
-
-        const uint16_t* pui16TypeID = (const uint16_t*)((const char*)pui32FirstInterfaceToken + ui32TypeIDOffset);
-        const uint32_t* pui32TableID = (const uint32_t*)((const char*)pui32FirstInterfaceToken + ui32TableIDOffset);
-
-        for (k = 0; k < ui32Count; ++k)
-        {
-            psShaderInfo->aui32TableIDToTypeID[*pui32TableID++] = *pui16TypeID++;
-        }
-
-        ui32StartSlot += ui32SlotSpan;
-    }
-
-    psShaderInfo->ui32NumClassInstances = ui32ClassInstanceCount;
-    psShaderInfo->psClassInstances = psClassInstances;
-
-    psShaderInfo->ui32NumClassTypes = ui32ClassTypeCount;
-    psShaderInfo->psClassTypes = psClassTypes;
-}
-
-void GetConstantBufferFromBindingPoint(const ResourceGroup eGroup, const uint32_t ui32BindPoint, const ShaderInfo* psShaderInfo, ConstantBuffer** ppsConstBuf)
-{
-    if (psShaderInfo->ui32MajorVersion > 3)
-    {
-        *ppsConstBuf = psShaderInfo->psConstantBuffers + psShaderInfo->aui32ResourceMap[eGroup][ui32BindPoint];
-    }
-    else
-    {
-        ASSERT(psShaderInfo->ui32NumConstantBuffers == 1);
-        *ppsConstBuf = psShaderInfo->psConstantBuffers;
-    }
-}
-
-int GetResourceFromBindingPoint(const ResourceGroup eGroup, uint32_t const ui32BindPoint, const ShaderInfo* psShaderInfo, ResourceBinding** ppsOutBinding)
-{
-    uint32_t i;
-    const uint32_t ui32NumBindings = psShaderInfo->ui32NumResourceBindings;
-    ResourceBinding* psBindings = psShaderInfo->psResourceBindings;
-
-    for (i = 0; i < ui32NumBindings; ++i)
-    {
-        if (ResourceTypeToResourceGroup(psBindings[i].eType) == eGroup)
-        {
-            if (ui32BindPoint >= psBindings[i].ui32BindPoint && ui32BindPoint < (psBindings[i].ui32BindPoint + psBindings[i].ui32BindCount))
-            {
-                *ppsOutBinding = psBindings + i;
-                return 1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int GetInterfaceVarFromOffset(uint32_t ui32Offset, ShaderInfo* psShaderInfo, ShaderVar** ppsShaderVar)
-{
-    uint32_t i;
-    ConstantBuffer* psThisPointerConstBuffer = psShaderInfo->psThisPointerConstBuffer;
-
-    const uint32_t ui32NumVars = psThisPointerConstBuffer->ui32NumVars;
-
-    for (i = 0; i < ui32NumVars; ++i)
-    {
-        if (ui32Offset >= psThisPointerConstBuffer->asVars[i].ui32StartOffset &&
-            ui32Offset < (psThisPointerConstBuffer->asVars[i].ui32StartOffset + psThisPointerConstBuffer->asVars[i].ui32Size))
-        {
-            *ppsShaderVar = &psThisPointerConstBuffer->asVars[i];
-            return 1;
-        }
-    }
-    return 0;
-}
-
-int GetInputSignatureFromRegister(const uint32_t ui32Register, const ShaderInfo* psShaderInfo, InOutSignature** ppsOut)
-{
-    uint32_t i;
-    const uint32_t ui32NumVars = psShaderInfo->ui32NumInputSignatures;
-
-    for (i = 0; i < ui32NumVars; ++i)
-    {
-        InOutSignature* psInputSignatures = psShaderInfo->psInputSignatures;
-        if (ui32Register == psInputSignatures[i].ui32Register)
-        {
-            *ppsOut = psInputSignatures + i;
-            return 1;
-        }
-    }
-    return 0;
-}
-
-int GetOutputSignatureFromRegister(const uint32_t currentPhase,
-    const uint32_t ui32Register,
-    const uint32_t ui32CompMask,
-    const uint32_t ui32Stream,
-    ShaderInfo* psShaderInfo,
-    InOutSignature** ppsOut)
-{
-    uint32_t i;
-
-    if (currentPhase == HS_JOIN_PHASE || currentPhase == HS_FORK_PHASE)
-    {
-        const uint32_t ui32NumVars = psShaderInfo->ui32NumPatchConstantSignatures;
-
-        for (i = 0; i < ui32NumVars; ++i)
-        {
-            InOutSignature* psOutputSignatures = psShaderInfo->psPatchConstantSignatures;
-            if (ui32Register == psOutputSignatures[i].ui32Register &&
-                (ui32CompMask & psOutputSignatures[i].ui32Mask) &&
-                ui32Stream == psOutputSignatures[i].ui32Stream)
-            {
-                *ppsOut = psOutputSignatures + i;
-                return 1;
-            }
-        }
-    }
-    else
-    {
-        const uint32_t ui32NumVars = psShaderInfo->ui32NumOutputSignatures;
-
-        for (i = 0; i < ui32NumVars; ++i)
-        {
-            InOutSignature* psOutputSignatures = psShaderInfo->psOutputSignatures;
-            if (ui32Register == psOutputSignatures[i].ui32Register &&
-                (ui32CompMask & psOutputSignatures[i].ui32Mask) &&
-                ui32Stream == psOutputSignatures[i].ui32Stream)
-            {
-                *ppsOut = psOutputSignatures + i;
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-int GetOutputSignatureFromSystemValue(SPECIAL_NAME eSystemValueType, uint32_t ui32SemanticIndex, ShaderInfo* psShaderInfo, InOutSignature** ppsOut)
-{
-    uint32_t i;
-    const uint32_t ui32NumVars = psShaderInfo->ui32NumOutputSignatures;
-
-    for (i = 0; i < ui32NumVars; ++i)
-    {
-        InOutSignature* psOutputSignatures = psShaderInfo->psOutputSignatures;
-        if (eSystemValueType == psOutputSignatures[i].eSystemValueType &&
-            ui32SemanticIndex == psOutputSignatures[i].ui32SemanticIndex)
-        {
-            *ppsOut = psOutputSignatures + i;
-            return 1;
-        }
-    }
-    return 0;
-}
-
-static int IsOffsetInType(ShaderVarType* psType,
-    uint32_t parentOffset,
-    uint32_t offsetToFind,
-    const uint32_t* pui32Swizzle,
-    int32_t* pi32Index,
-    int32_t* pi32Rebase)
-{
-    uint32_t thisOffset = parentOffset + psType->Offset;
-    uint32_t thisSize = psType->Columns * psType->Rows * 4;
-
-    if (psType->Elements)
-    {
-        // Everything smaller than vec4 in an array takes the space of vec4, except for the last one
-        if (thisSize < 4 * 4)
-        {
-            thisSize = (4 * 4 * (psType->Elements - 1)) + thisSize;
-        }
-        else
-        {
-            thisSize *= psType->Elements;
-        }
-    }
-
-    //Swizzle can point to another variable. In the example below
-    //cbUIUpdates.g_uMaxFaces would be cb1[2].z. The scalars are combined
-    //into vectors. psCBuf->ui32NumVars will be 3.
-
-    // cbuffer cbUIUpdates
-    // {
-    //
-    //   float g_fLifeSpan;                 // Offset:    0 Size:     4
-    //   float g_fLifeSpanVar;              // Offset:    4 Size:     4 [unused]
-    //   float g_fRadiusMin;                // Offset:    8 Size:     4 [unused]
-    //   float g_fRadiusMax;                // Offset:   12 Size:     4 [unused]
-    //   float g_fGrowTime;                 // Offset:   16 Size:     4 [unused]
-    //   float g_fStepSize;                 // Offset:   20 Size:     4
-    //   float g_fTurnRate;                 // Offset:   24 Size:     4
-    //   float g_fTurnSpeed;                // Offset:   28 Size:     4 [unused]
-    //   float g_fLeafRate;                 // Offset:   32 Size:     4
-    //   float g_fShrinkTime;               // Offset:   36 Size:     4 [unused]
-    //   uint g_uMaxFaces;                  // Offset:   40 Size:     4
-    //
-    // }
-
-    // Name                                 Type  Format         Dim Slot Elements
-    // ------------------------------ ---------- ------- ----------- ---- --------
-    // cbUIUpdates                       cbuffer      NA          NA    1        1
-
-    if (pui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-    {
-        offsetToFind += 4;
-    }
-    else
-    if (pui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-    {
-        offsetToFind += 8;
-    }
-    else
-    if (pui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-    {
-        offsetToFind += 12;
-    }
-
-    if ((offsetToFind >= thisOffset) &&
-        offsetToFind < (thisOffset + thisSize))
-    {
-        if (psType->Class == SVC_MATRIX_ROWS ||
-            psType->Class == SVC_MATRIX_COLUMNS)
-        {
-            //Matrices are treated as arrays of vectors.
-            pi32Index[0] = (offsetToFind - thisOffset) / 16;
-        }
-        //Check for array of scalars or vectors (both take up 16 bytes per element)
-        else if ((psType->Class == SVC_SCALAR || psType->Class == SVC_VECTOR) && psType->Elements > 1)
-        {
-            pi32Index[0] = (offsetToFind - thisOffset) / 16;
-        }
-        else if (psType->Class == SVC_VECTOR && psType->Columns > 1)
-        {
-            //Check for vector starting at a non-vec4 offset.
-
-            // cbuffer $Globals
-            // {
-            //
-            //   float angle;                       // Offset:    0 Size:     4
-            //   float2 angle2;                     // Offset:    4 Size:     8
-            //
-            // }
-
-            //cb0[0].x = angle
-            //cb0[0].yzyy = angle2.xyxx
-
-            //Rebase angle2 so that .y maps to .x, .z maps to .y
-
-            pi32Rebase[0] = thisOffset % 16;
-        }
-
-        return 1;
-    }
-    return 0;
-}
-
-int GetShaderVarFromOffset(const uint32_t ui32Vec4Offset,
-    const uint32_t* pui32Swizzle,
-    ConstantBuffer* psCBuf,
-    ShaderVarType** ppsShaderVar,
-    int32_t* pi32Index,
-    int32_t* pi32Rebase)
-{
-    uint32_t i;
-
-    uint32_t ui32ByteOffset = ui32Vec4Offset * 16;
-
-    const uint32_t ui32NumVars = psCBuf->ui32NumVars;
-
-    for (i = 0; i < ui32NumVars; ++i)
-    {
-        if (psCBuf->asVars[i].sType.Class == SVC_STRUCT)
-        {
-            uint32_t m = 0;
-
-            for (m = 0; m < psCBuf->asVars[i].sType.MemberCount; ++m)
-            {
-                ShaderVarType* psMember = psCBuf->asVars[i].sType.Members + m;
-
-                ASSERT(psMember->Class != SVC_STRUCT);
-
-                if (IsOffsetInType(psMember, psCBuf->asVars[i].ui32StartOffset, ui32ByteOffset, pui32Swizzle, pi32Index, pi32Rebase))
-                {
-                    ppsShaderVar[0] = psMember;
-                    return 1;
-                }
-            }
-        }
-        else
-        {
-            if (IsOffsetInType(&psCBuf->asVars[i].sType, psCBuf->asVars[i].ui32StartOffset, ui32ByteOffset, pui32Swizzle, pi32Index, pi32Rebase))
-            {
-                ppsShaderVar[0] = &psCBuf->asVars[i].sType;
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-ResourceGroup ResourceTypeToResourceGroup(ResourceType eType)
-{
-    switch (eType)
-    {
-    case RTYPE_CBUFFER:
-        return RGROUP_CBUFFER;
-
-    case RTYPE_SAMPLER:
-        return RGROUP_SAMPLER;
-
-    case RTYPE_TEXTURE:
-    case RTYPE_BYTEADDRESS:
-    case RTYPE_STRUCTURED:
-        return RGROUP_TEXTURE;
-
-    case RTYPE_UAV_RWTYPED:
-    case RTYPE_UAV_RWSTRUCTURED:
-    case RTYPE_UAV_RWBYTEADDRESS:
-    case RTYPE_UAV_APPEND_STRUCTURED:
-    case RTYPE_UAV_CONSUME_STRUCTURED:
-    case RTYPE_UAV_RWSTRUCTURED_WITH_COUNTER:
-        return RGROUP_UAV;
-
-    case RTYPE_TBUFFER:
-        ASSERT(0); // Need to find out which group this belongs to
-        return RGROUP_TEXTURE;
-    }
-
-    ASSERT(0);
-    return RGROUP_CBUFFER;
-}
-
-void LoadShaderInfo(const uint32_t ui32MajorVersion,
-    const uint32_t ui32MinorVersion,
-    const ReflectionChunks* psChunks,
-    ShaderInfo* psInfo)
-{
-    const uint32_t* pui32Inputs = psChunks->pui32Inputs;
-    const uint32_t* pui32Inputs11 = psChunks->pui32Inputs11;
-    const uint32_t* pui32Resources = psChunks->pui32Resources;
-    const uint32_t* pui32Interfaces = psChunks->pui32Interfaces;
-    const uint32_t* pui32Outputs = psChunks->pui32Outputs;
-    const uint32_t* pui32Outputs11 = psChunks->pui32Outputs11;
-    const uint32_t* pui32OutputsWithStreams = psChunks->pui32OutputsWithStreams;
-    const uint32_t* pui32PatchConstants = psChunks->pui32PatchConstants;
-
-    psInfo->eTessOutPrim = TESSELLATOR_OUTPUT_UNDEFINED;
-    psInfo->eTessPartitioning = TESSELLATOR_PARTITIONING_UNDEFINED;
-
-    psInfo->ui32MajorVersion = ui32MajorVersion;
-    psInfo->ui32MinorVersion = ui32MinorVersion;
-
-
-    if (pui32Inputs)
-    {
-        ReadInputSignatures(pui32Inputs, psInfo, 0);
-    }
-    if (pui32Inputs11)
-    {
-        ReadInputSignatures(pui32Inputs11, psInfo, 1);
-    }
-    if (pui32Resources)
-    {
-        ReadResources(pui32Resources, psInfo);
-    }
-    if (pui32Interfaces)
-    {
-        ReadInterfaces(pui32Interfaces, psInfo);
-    }
-    if (pui32Outputs)
-    {
-        ReadOutputSignatures(pui32Outputs, psInfo, 0, 0);
-    }
-    if (pui32Outputs11)
-    {
-        ReadOutputSignatures(pui32Outputs11, psInfo, 1, 1);
-    }
-    if (pui32OutputsWithStreams)
-    {
-        ReadOutputSignatures(pui32OutputsWithStreams, psInfo, 0, 1);
-    }
-    if (pui32PatchConstants)
-    {
-        ReadPatchConstantSignatures(pui32PatchConstants, psInfo, 0, 0);
-    }
-    // if(pui32Effects10Data)
-    //     ReadEffectsData(pui32Effects10Data, psInfo); NOT IMPLEMENTED
-
-    uint32_t i;
-    for (i = 0; i < psInfo->ui32NumConstantBuffers; ++i)
-    {
-        bstring cbufName = bfromcstr(&psInfo->psConstantBuffers[i].Name[0]);
-        bstring cbufThisPointer = bfromcstr("$ThisPointer");
-        if (bstrcmp(cbufName, cbufThisPointer) == 0)
-        {
-            psInfo->psThisPointerConstBuffer = &psInfo->psConstantBuffers[i];
-        }
-    }
-
-    for (i = 0; i < MAX_RESOURCE_BINDINGS; ++i)
-    {
-        psInfo->aui32SamplerMap[i] = MAX_RESOURCE_BINDINGS;
-    }
-}
-
-void FreeShaderInfo(ShaderInfo* psShaderInfo)
-{
-    //Free any default values for constants.
-    uint32_t cbuf;
-    for (cbuf = 0; cbuf < psShaderInfo->ui32NumConstantBuffers; ++cbuf)
-    {
-        ConstantBuffer* psCBuf = &psShaderInfo->psConstantBuffers[cbuf];
-        uint32_t var;
-        if (psCBuf->ui32NumVars)
-        {
-            for (var = 0; var < psCBuf->ui32NumVars; ++var)
-            {
-                ShaderVar* psVar = &psCBuf->asVars[var];
-                if (psVar->haveDefaultValue)
-                {
-                    hlslcc_free(psVar->pui32DefaultValues);
-                }
-            }
-            hlslcc_free(psCBuf->asVars);
-        }
-    }
-    hlslcc_free(psShaderInfo->psInputSignatures);
-    hlslcc_free(psShaderInfo->psResourceBindings);
-    hlslcc_free(psShaderInfo->psConstantBuffers);
-    hlslcc_free(psShaderInfo->psClassTypes);
-    hlslcc_free(psShaderInfo->psClassInstances);
-    hlslcc_free(psShaderInfo->psOutputSignatures);
-    hlslcc_free(psShaderInfo->psPatchConstantSignatures);
-
-    psShaderInfo->ui32NumInputSignatures = 0;
-    psShaderInfo->ui32NumResourceBindings = 0;
-    psShaderInfo->ui32NumConstantBuffers = 0;
-    psShaderInfo->ui32NumClassTypes = 0;
-    psShaderInfo->ui32NumClassInstances = 0;
-    psShaderInfo->ui32NumOutputSignatures = 0;
-    psShaderInfo->ui32NumPatchConstantSignatures = 0;
-}
-
-typedef struct ConstantTableD3D9_TAG
-{
-    uint32_t size;
-    uint32_t creator;
-    uint32_t version;
-    uint32_t constants;
-    uint32_t constantInfos;
-    uint32_t flags;
-    uint32_t target;
-} ConstantTableD3D9;
-
-// These enums match those in d3dx9shader.h.
-enum RegisterSet
-{
-    RS_BOOL,
-    RS_INT4,
-    RS_FLOAT4,
-    RS_SAMPLER,
-};
-
-enum TypeClass
-{
-    CLASS_SCALAR,
-    CLASS_VECTOR,
-    CLASS_MATRIX_ROWS,
-    CLASS_MATRIX_COLUMNS,
-    CLASS_OBJECT,
-    CLASS_STRUCT,
-};
-
-enum Type
-{
-    PT_VOID,
-    PT_BOOL,
-    PT_INT,
-    PT_FLOAT,
-    PT_STRING,
-    PT_TEXTURE,
-    PT_TEXTURE1D,
-    PT_TEXTURE2D,
-    PT_TEXTURE3D,
-    PT_TEXTURECUBE,
-    PT_SAMPLER,
-    PT_SAMPLER1D,
-    PT_SAMPLER2D,
-    PT_SAMPLER3D,
-    PT_SAMPLERCUBE,
-    PT_PIXELSHADER,
-    PT_VERTEXSHADER,
-    PT_PIXELFRAGMENT,
-    PT_VERTEXFRAGMENT,
-    PT_UNSUPPORTED,
-};
-typedef struct ConstantInfoD3D9_TAG
-{
-    uint32_t name;
-    uint16_t registerSet;
-    uint16_t registerIndex;
-    uint16_t registerCount;
-    uint16_t reserved;
-    uint32_t typeInfo;
-    uint32_t defaultValue;
-} ConstantInfoD3D9;
-
-typedef struct TypeInfoD3D9_TAG
-{
-    uint16_t typeClass;
-    uint16_t type;
-    uint16_t rows;
-    uint16_t columns;
-    uint16_t elements;
-    uint16_t structMembers;
-    uint32_t structMemberInfos;
-} TypeInfoD3D9;
-
-typedef struct StructMemberInfoD3D9_TAG
-{
-    uint32_t name;
-    uint32_t typeInfo;
-} StructMemberInfoD3D9;
-
-void LoadD3D9ConstantTable(const char* data,
-    ShaderInfo* psInfo)
-{
-    ConstantTableD3D9* ctab;
-    uint32_t constNum;
-    ConstantInfoD3D9* cinfos;
-    ConstantBuffer* psConstantBuffer;
-    uint32_t ui32ConstantBufferSize = 0;
-    uint32_t numResourceBindingsNeeded = 0;
-    ShaderVar* var;
-
-    ctab = (ConstantTableD3D9*)data;
-
-    cinfos = (ConstantInfoD3D9*) (data + ctab->constantInfos);
-
-    psInfo->ui32NumConstantBuffers++;
-
-    //Only 1 Constant Table in d3d9
-    ASSERT(psInfo->ui32NumConstantBuffers == 1);
-
-    psConstantBuffer = hlslcc_malloc(sizeof(ConstantBuffer));
-
-    psInfo->psConstantBuffers = psConstantBuffer;
-
-    psConstantBuffer->ui32NumVars = 0;
-    strcpy(psConstantBuffer->Name, "$Globals");
-
-    //Determine how many resource bindings to create
-    for (constNum = 0; constNum < ctab->constants; ++constNum)
-    {
-        if (cinfos[constNum].registerSet == RS_SAMPLER)
-        {
-            ++numResourceBindingsNeeded;
-        }
-    }
-
-    psInfo->psResourceBindings = hlslcc_malloc(numResourceBindingsNeeded * sizeof(ResourceBinding));
-
-    psConstantBuffer->asVars = hlslcc_malloc((ctab->constants - numResourceBindingsNeeded) * sizeof(ShaderVar));
-
-    var = &psConstantBuffer->asVars[0];
-
-    for (constNum = 0; constNum < ctab->constants; ++constNum)
-    {
-        TypeInfoD3D9* typeInfo = (TypeInfoD3D9*) (data + cinfos[constNum].typeInfo);
-
-        if (cinfos[constNum].registerSet != RS_SAMPLER)
-        {
-            strcpy(var->Name, data + cinfos[constNum].name);
-            FormatVariableName(var->Name);
-            var->ui32Size = cinfos[constNum].registerCount * 16;
-            var->ui32StartOffset = cinfos[constNum].registerIndex * 16;
-            var->haveDefaultValue = 0;
-
-            if (ui32ConstantBufferSize < (var->ui32Size + var->ui32StartOffset))
-            {
-                ui32ConstantBufferSize = var->ui32Size + var->ui32StartOffset;
-            }
-
-            var->sType.Rows = typeInfo->rows;
-            var->sType.Columns = typeInfo->columns;
-            var->sType.Elements = typeInfo->elements;
-            var->sType.MemberCount = typeInfo->structMembers;
-            var->sType.Members = 0;
-            var->sType.Offset = 0;
-            strcpy(var->sType.FullName, var->Name);
-            var->sType.Parent = 0;
-            var->sType.ParentCount = 0;
-
-            switch (typeInfo->typeClass)
-            {
-            case CLASS_SCALAR:
-            {
-                var->sType.Class = SVC_SCALAR;
-                break;
-            }
-            case CLASS_VECTOR:
-            {
-                var->sType.Class = SVC_VECTOR;
-                break;
-            }
-            case CLASS_MATRIX_ROWS:
-            {
-                var->sType.Class = SVC_MATRIX_ROWS;
-                break;
-            }
-            case CLASS_MATRIX_COLUMNS:
-            {
-                var->sType.Class = SVC_MATRIX_COLUMNS;
-                break;
-            }
-            case CLASS_OBJECT:
-            {
-                var->sType.Class = SVC_OBJECT;
-                break;
-            }
-            case CLASS_STRUCT:
-            {
-                var->sType.Class = SVC_STRUCT;
-                break;
-            }
-            }
-
-            switch (cinfos[constNum].registerSet)
-            {
-            case RS_BOOL:
-            {
-                var->sType.Type = SVT_BOOL;
-                break;
-            }
-            case RS_INT4:
-            {
-                var->sType.Type = SVT_INT;
-                break;
-            }
-            case RS_FLOAT4:
-            {
-                var->sType.Type = SVT_FLOAT;
-                break;
-            }
-            }
-
-            var++;
-            psConstantBuffer->ui32NumVars++;
-        }
-        else
-        {
-            //Create a resource if it is sampler in order to replicate the d3d10+
-            //method of separating samplers from general constants.
-            uint32_t ui32ResourceIndex = psInfo->ui32NumResourceBindings++;
-            ResourceBinding* res = &psInfo->psResourceBindings[ui32ResourceIndex];
-
-            strcpy(res->Name, data + cinfos[constNum].name);
-            FormatVariableName(res->Name);
-
-            res->ui32BindPoint = cinfos[constNum].registerIndex;
-            res->ui32BindCount = cinfos[constNum].registerCount;
-            res->ui32Flags = 0;
-            res->ui32NumSamples = 1;
-            res->ui32ReturnType = 0;
-
-            res->eType = RTYPE_TEXTURE;
-
-            switch (typeInfo->type)
-            {
-            case PT_SAMPLER:
-            case PT_SAMPLER1D:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURE1D;
-                break;
-            case PT_SAMPLER2D:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURE2D;
-                break;
-            case PT_SAMPLER3D:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURE3D;
-                break;
-            case PT_SAMPLERCUBE:
-                res->eDimension = REFLECT_RESOURCE_DIMENSION_TEXTURECUBE;
-                break;
-            }
-        }
-    }
-    psConstantBuffer->ui32TotalSizeInBytes = ui32ConstantBufferSize;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSL.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSL.c
deleted file mode 100644
index 6c9d02015e..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSL.c
+++ /dev/null
@@ -1,851 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/tokens.h"
-#include "internal_includes/structs.h"
-#include "internal_includes/decode.h"
-#include "stdlib.h"
-#include "stdio.h"
-#include "bstrlib.h"
-#include "internal_includes/toGLSLInstruction.h"
-#include "internal_includes/toGLSLOperand.h"
-#include "internal_includes/toGLSLDeclaration.h"
-#include "internal_includes/languages.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-
-#ifndef GL_VERTEX_SHADER_ARB
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#endif
-#ifndef GL_FRAGMENT_SHADER_ARB
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#endif
-#ifndef GL_GEOMETRY_SHADER
-#define GL_GEOMETRY_SHADER 0x8DD9
-#endif
-#ifndef GL_TESS_EVALUATION_SHADER
-#define GL_TESS_EVALUATION_SHADER 0x8E87
-#endif
-#ifndef GL_TESS_CONTROL_SHADER
-#define GL_TESS_CONTROL_SHADER 0x8E88
-#endif
-#ifndef GL_COMPUTE_SHADER
-#define GL_COMPUTE_SHADER 0x91B9
-#endif
-
-
-HLSLCC_API void HLSLCC_APIENTRY HLSLcc_SetMemoryFunctions(void* (*malloc_override)(size_t),void* (*calloc_override)(size_t,size_t),void (*free_override)(void *),void* (*realloc_override)(void*,size_t))
-{
-    hlslcc_malloc = malloc_override;
-    hlslcc_calloc = calloc_override;
-    hlslcc_free = free_override;    
-    hlslcc_realloc = realloc_override;
-}
-
-void AddIndentation(HLSLCrossCompilerContext* psContext)
-{
-    int i;
-    int indent = psContext->indent;
-    bstring glsl = *psContext->currentShaderString;
-    for(i=0; i < indent; ++i)
-    {
-        bcatcstr(glsl, "    ");
-    }
-}
-
-void AddVersionDependentCode(HLSLCrossCompilerContext* psContext)
-{
-    bstring glsl = *psContext->currentShaderString;
-
-    if(psContext->psShader->ui32MajorVersion > 3 && psContext->psShader->eTargetLanguage != LANG_ES_300 && psContext->psShader->eTargetLanguage != LANG_ES_310 && !(psContext->psShader->eTargetLanguage >= LANG_330))
-    {
-        //DX10+ bycode format requires the ability to treat registers
-        //as raw bits. ES3.0+ has that built-in, also 330 onwards
-        bcatcstr(glsl,"#extension GL_ARB_shader_bit_encoding : require\n");
-    }
-
-    if(!HaveCompute(psContext->psShader->eTargetLanguage))
-    {
-        if(psContext->psShader->eShaderType == COMPUTE_SHADER)
-        {
-            bcatcstr(glsl,"#extension GL_ARB_compute_shader : enable\n");
-            bcatcstr(glsl,"#extension GL_ARB_shader_storage_buffer_object : enable\n");
-        }
-    }
-
-    if (!HaveAtomicMem(psContext->psShader->eTargetLanguage) ||
-        !HaveAtomicCounter(psContext->psShader->eTargetLanguage))
-    {
-        if( psContext->psShader->aiOpcodeUsed[OPCODE_IMM_ATOMIC_ALLOC] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_IMM_ATOMIC_CONSUME] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED])
-        {
-            bcatcstr(glsl,"#extension GL_ARB_shader_atomic_counters : enable\n");
-
-            bcatcstr(glsl,"#extension GL_ARB_shader_storage_buffer_object : enable\n");
-        }
-    }
-
-    if(!HaveGather(psContext->psShader->eTargetLanguage))
-    {
-        if(psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO_C] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_C])
-        {
-            bcatcstr(glsl,"#extension GL_ARB_texture_gather : enable\n");
-        }
-    }
-
-    if(!HaveGatherNonConstOffset(psContext->psShader->eTargetLanguage))
-    {
-        if(psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO_C] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_GATHER4_PO])
-        {
-            bcatcstr(glsl,"#extension GL_ARB_gpu_shader5 : enable\n");
-        }
-    }
-
-    if(!HaveQueryLod(psContext->psShader->eTargetLanguage))
-    {
-        if(psContext->psShader->aiOpcodeUsed[OPCODE_LOD])
-        {
-            bcatcstr(glsl,"#extension GL_ARB_texture_query_lod : enable\n");
-        }
-    }
-
-    if(!HaveQueryLevels(psContext->psShader->eTargetLanguage))
-    {
-        if(psContext->psShader->aiOpcodeUsed[OPCODE_RESINFO])
-        {
-            bcatcstr(glsl,"#extension GL_ARB_texture_query_levels : enable\n");
-        }
-    }
-
-    if(!HaveImageLoadStore(psContext->psShader->eTargetLanguage))
-    {
-        if(psContext->psShader->aiOpcodeUsed[OPCODE_STORE_UAV_TYPED] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_STORE_RAW] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_STORE_STRUCTURED])
-        {
-            bcatcstr(glsl,"#extension GL_ARB_shader_image_load_store : enable\n");
-            bcatcstr(glsl,"#extension GL_ARB_shader_bit_encoding : enable\n");
-        }
-        else
-        if(psContext->psShader->aiOpcodeUsed[OPCODE_LD_UAV_TYPED] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_LD_RAW] ||
-            psContext->psShader->aiOpcodeUsed[OPCODE_LD_STRUCTURED])
-        {
-            bcatcstr(glsl,"#extension GL_ARB_shader_image_load_store : enable\n");
-        }
-    }
-    
-    //The fragment language has no default precision qualifier for floating point types.
-    if (psContext->psShader->eShaderType == PIXEL_SHADER &&
-        psContext->psShader->eTargetLanguage == LANG_ES_100 || psContext->psShader->eTargetLanguage == LANG_ES_300 || psContext->psShader->eTargetLanguage == LANG_ES_310)
-    {
-        bcatcstr(glsl, "precision highp float;\n");
-    }
-
-    /* There is no default precision qualifier for the following sampler types in either the vertex or fragment language: */
-    if (psContext->psShader->eTargetLanguage == LANG_ES_300 || psContext->psShader->eTargetLanguage == LANG_ES_310)
-    {
-        bcatcstr(glsl, "precision lowp sampler3D;\n");
-        bcatcstr(glsl, "precision lowp samplerCubeShadow;\n");
-        bcatcstr(glsl, "precision lowp sampler2DShadow;\n");
-        bcatcstr(glsl, "precision lowp sampler2DArray;\n");
-        bcatcstr(glsl, "precision lowp sampler2DArrayShadow;\n");
-        bcatcstr(glsl, "precision lowp isampler2D;\n");
-        bcatcstr(glsl, "precision lowp isampler3D;\n");
-        bcatcstr(glsl, "precision lowp isamplerCube;\n");
-        bcatcstr(glsl, "precision lowp isampler2DArray;\n");
-        bcatcstr(glsl, "precision lowp usampler2D;\n");
-        bcatcstr(glsl, "precision lowp usampler3D;\n");
-        bcatcstr(glsl, "precision lowp usamplerCube;\n");
-        bcatcstr(glsl, "precision lowp usampler2DArray;\n");
-
-        if (psContext->psShader->eTargetLanguage == LANG_ES_310)
-        {
-            bcatcstr(glsl, "precision lowp isampler2DMS;\n");
-            bcatcstr(glsl, "precision lowp usampler2D;\n");
-            bcatcstr(glsl, "precision lowp usampler3D;\n");
-            bcatcstr(glsl, "precision lowp usamplerCube;\n");
-            bcatcstr(glsl, "precision lowp usampler2DArray;\n");
-            bcatcstr(glsl, "precision lowp usampler2DMS;\n");
-            bcatcstr(glsl, "precision lowp image2D;\n");
-            bcatcstr(glsl, "precision lowp image3D;\n");
-            bcatcstr(glsl, "precision lowp imageCube;\n");
-            bcatcstr(glsl, "precision lowp image2DArray;\n");
-            bcatcstr(glsl, "precision lowp iimage2D;\n");
-            bcatcstr(glsl, "precision lowp iimage3D;\n");
-            bcatcstr(glsl, "precision lowp iimageCube;\n");
-            bcatcstr(glsl, "precision lowp uimage2DArray;\n");
-        }
-        bcatcstr(glsl, "\n");
-    }
-
-    if (SubroutinesSupported(psContext->psShader->eTargetLanguage))
-    {
-        bcatcstr(glsl, "subroutine void SubroutineType();\n");
-    }
-
-    if (psContext->psShader->ui32MajorVersion <= 3)
-    {
-        bcatcstr(glsl, "int RepCounter;\n");
-        bcatcstr(glsl, "int LoopCounter;\n");
-        bcatcstr(glsl, "int ZeroBasedCounter;\n");
-        if (psContext->psShader->eShaderType == VERTEX_SHADER)
-        {
-            uint32_t texCoord;
-            bcatcstr(glsl, "ivec4 Address;\n");
-
-            if (InOutSupported(psContext->psShader->eTargetLanguage))
-            {
-                bcatcstr(glsl, "out vec4 OffsetColour;\n");
-                bcatcstr(glsl, "out vec4 BaseColour;\n");
-
-                bcatcstr(glsl, "out vec4 Fog;\n");
-
-                for (texCoord = 0; texCoord < 8; ++texCoord)
-                {
-                    bformata(glsl, "out vec4 TexCoord%d;\n", texCoord);
-                }
-            }
-            else
-            {
-                bcatcstr(glsl, "varying vec4 OffsetColour;\n");
-                bcatcstr(glsl, "varying vec4 BaseColour;\n");
-
-                bcatcstr(glsl, "varying vec4 Fog;\n");
-
-                for (texCoord = 0; texCoord < 8; ++texCoord)
-                {
-                    bformata(glsl, "varying vec4 TexCoord%d;\n", texCoord);
-                }
-            }
-        }
-        else
-        {
-            uint32_t renderTargets, texCoord;
-
-            if (InOutSupported(psContext->psShader->eTargetLanguage))
-            {
-                bcatcstr(glsl, "in vec4 OffsetColour;\n");
-                bcatcstr(glsl, "in vec4 BaseColour;\n");
-
-                bcatcstr(glsl, "in vec4 Fog;\n");
-
-                for (texCoord = 0; texCoord < 8; ++texCoord)
-                {
-                    bformata(glsl, "in vec4 TexCoord%d;\n", texCoord);
-                }
-            }
-            else
-            {
-                bcatcstr(glsl, "varying vec4 OffsetColour;\n");
-                bcatcstr(glsl, "varying vec4 BaseColour;\n");
-
-                bcatcstr(glsl, "varying vec4 Fog;\n");
-
-                for (texCoord = 0; texCoord < 8; ++texCoord)
-                {
-                    bformata(glsl, "varying vec4 TexCoord%d;\n", texCoord);
-                }
-            }
-
-            if (psContext->psShader->eTargetLanguage > LANG_120)
-            {
-                bcatcstr(glsl, "out vec4 outFragData[8];\n");
-                for (renderTargets = 0; renderTargets < 8; ++renderTargets)
-                {
-                    bformata(glsl, "#define Output%d outFragData[%d]\n", renderTargets, renderTargets);
-                }
-            }
-            else if (psContext->psShader->eTargetLanguage >= LANG_ES_300 && psContext->psShader->eTargetLanguage < LANG_120)
-            {
-                // ES 3 supports min 4 rendertargets, I guess this is reasonable lower limit for DX9 shaders
-                bcatcstr(glsl, "out vec4 outFragData[4];\n");
-                for (renderTargets = 0; renderTargets < 4; ++renderTargets)
-                {
-                    bformata(glsl, "#define Output%d outFragData[%d]\n", renderTargets, renderTargets);
-                }
-            }
-            else if (psContext->psShader->eTargetLanguage == LANG_ES_100)
-            {
-                bcatcstr(glsl, "#define Output0 gl_FragColor;\n");
-            }
-            else
-            {
-                for (renderTargets = 0; renderTargets < 8; ++renderTargets)
-                {
-                    bformata(glsl, "#define Output%d gl_FragData[%d]\n", renderTargets, renderTargets);
-                }
-            }
-        }
-    }
-
-    if((psContext->flags & HLSLCC_FLAG_ORIGIN_UPPER_LEFT)
-        && (psContext->psShader->eTargetLanguage >= LANG_150))
-    {
-        bcatcstr(glsl,"layout(origin_upper_left) in vec4 gl_FragCoord;\n");
-    }
-
-    if((psContext->flags & HLSLCC_FLAG_PIXEL_CENTER_INTEGER)
-        && (psContext->psShader->eTargetLanguage >= LANG_150))
-    {
-        bcatcstr(glsl,"layout(pixel_center_integer) in vec4 gl_FragCoord;\n");
-    }
-
-    /* For versions which do not support a vec1 (currently all versions) */
-    bcatcstr(glsl,"struct vec1 {\n");
-    bcatcstr(glsl,"\tfloat x;\n");
-    bcatcstr(glsl,"};\n");
-
-    if(HaveUVec(psContext->psShader->eTargetLanguage))
-    {
-        bcatcstr(glsl,"struct uvec1 {\n");
-        bcatcstr(glsl,"\tuint x;\n");
-        bcatcstr(glsl,"};\n");
-    }
-
-    bcatcstr(glsl,"struct ivec1 {\n");
-    bcatcstr(glsl,"\tint x;\n");
-    bcatcstr(glsl,"};\n");
-
-    /*
-        OpenGL 4.1 API spec:
-        To use any built-in input or output in the gl_PerVertex block in separable
-        program objects, shader code must redeclare that block prior to use.
-    */
-    if(psContext->psShader->eShaderType == VERTEX_SHADER && psContext->psShader->eTargetLanguage >= LANG_410)
-    {
-        bcatcstr(glsl, "out gl_PerVertex {\n");
-        bcatcstr(glsl, "vec4 gl_Position;\n");
-        bcatcstr(glsl, "float gl_PointSize;\n");
-        bcatcstr(glsl, "float gl_ClipDistance[];");
-        bcatcstr(glsl, "};\n");
-    }
-}
-
-ShaderLang ChooseLanguage(ShaderData* psShader)
-{
-    // Depends on the HLSL shader model extracted from bytecode.
-    switch(psShader->ui32MajorVersion)
-    {
-        case 5:
-        {
-            return LANG_430;
-        }
-        case 4:
-        {
-            return LANG_330;
-        }
-        default:
-        {
-            return LANG_120;
-        }
-    }
-}
-
-const char* GetVersionString(ShaderLang language)
-{
-    switch(language)
-    {
-        case LANG_ES_100:
-        {
-            return "#version 100\n";
-            break;
-        }
-        case LANG_ES_300:
-        {
-            return "#version 300 es\n";
-            break;
-        }
-        case LANG_ES_310:
-        {
-            return "#version 310 es\n";
-            break;
-        }
-        case LANG_120:
-        {
-            return "#version 120\n";
-            break;
-        }
-        case LANG_130:
-        {
-            return "#version 130\n";
-            break;
-        }
-        case LANG_140:
-        {
-            return "#version 140\n";
-            break;
-        }
-        case LANG_150:
-        {
-            return "#version 150\n";
-            break;
-        }
-        case LANG_330:
-        {
-            return "#version 330\n";
-            break;
-        }
-        case LANG_400:
-        {
-            return "#version 400\n";
-            break;
-        }
-        case LANG_410:
-        {
-            return "#version 410\n";
-            break;
-        }
-        case LANG_420:
-        {
-            return "#version 420\n";
-            break;
-        }
-        case LANG_430:
-        {
-            return "#version 430\n";
-            break;
-        }
-        case LANG_440:
-        {
-            return "#version 440\n";
-            break;
-        }
-        default:
-        {
-            return "";
-            break;
-        }
-    }
-}
-
-void TranslateToGLSL(HLSLCrossCompilerContext* psContext, ShaderLang* planguage,const GlExtensions *extensions)
-{
-    bstring glsl;
-    uint32_t i;
-    ShaderData* psShader = psContext->psShader;
-    ShaderLang language = *planguage;
-    uint32_t ui32InstCount = 0;
-    uint32_t ui32DeclCount = 0;
-
-    psContext->indent = 0;
-
-    /*psShader->sPhase[MAIN_PHASE].ui32InstanceCount = 1;
-    psShader->sPhase[MAIN_PHASE].ppsDecl = hlslcc_malloc(sizeof(Declaration*));
-    psShader->sPhase[MAIN_PHASE].ppsInst = hlslcc_malloc(sizeof(Instruction*));
-    psShader->sPhase[MAIN_PHASE].pui32DeclCount = hlslcc_malloc(sizeof(uint32_t));
-    psShader->sPhase[MAIN_PHASE].pui32InstCount = hlslcc_malloc(sizeof(uint32_t));*/
-
-    if(language == LANG_DEFAULT)
-    {
-        language = ChooseLanguage(psShader);
-        *planguage = language;
-    }
-
-        glsl = bfromcstralloc (1024, GetVersionString(language));
-
-    psContext->mainShader = glsl;
-    psContext->earlyMain = bfromcstralloc (1024, "");
-    for(i=0; i<NUM_PHASES;++i)
-    {
-        psContext->postShaderCode[i] = bfromcstralloc (1024, "");
-    }
-    psContext->currentShaderString = &glsl;
-    psShader->eTargetLanguage = language;
-    psShader->extensions = (const struct GlExtensions*)extensions;
-    psContext->currentPhase = MAIN_PHASE;
-
-    if(extensions)
-    {
-        if(extensions->ARB_explicit_attrib_location)
-            bcatcstr(glsl,"#extension GL_ARB_explicit_attrib_location : require\n");
-        if(extensions->ARB_explicit_uniform_location)
-            bcatcstr(glsl,"#extension GL_ARB_explicit_uniform_location : require\n");
-        if(extensions->ARB_shading_language_420pack)
-            bcatcstr(glsl,"#extension GL_ARB_shading_language_420pack : require\n");
-    }
-
-    AddVersionDependentCode(psContext);
-
-    if(psContext->flags & HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT)
-    {
-        bcatcstr(glsl, "layout(std140) uniform;\n");
-    }
-
-    //Special case. Can have multiple phases.
-    if(psShader->eShaderType == HULL_SHADER)
-    {
-        int haveInstancedForkPhase = 0;            // Do we have an instanced fork phase?
-        int isCurrentForkPhasedInstanced = 0;    // Is the current fork phase instanced?
-        const char* asPhaseFuncNames[NUM_PHASES];
-        uint32_t ui32PhaseFuncCallOrder[3];
-        uint32_t ui32PhaseCallIndex;
-
-        uint32_t ui32Phase;
-        uint32_t ui32Instance;
-
-        asPhaseFuncNames[MAIN_PHASE] = "";
-        asPhaseFuncNames[HS_GLOBAL_DECL] = "";
-        asPhaseFuncNames[HS_FORK_PHASE] = "fork_phase";
-        asPhaseFuncNames[HS_CTRL_POINT_PHASE] = "control_point_phase";
-        asPhaseFuncNames[HS_JOIN_PHASE] = "join_phase";
-
-        ConsolidateHullTempVars(psShader);
-
-        for(i=0; i < psShader->asPhase[HS_GLOBAL_DECL].pui32DeclCount[0]; ++i)
-        {
-            TranslateDeclaration(psContext, psShader->asPhase[HS_GLOBAL_DECL].ppsDecl[0]+i);
-        }
-
-        for(ui32Phase=HS_CTRL_POINT_PHASE; ui32Phase<NUM_PHASES; ui32Phase++)
-        {
-            psContext->currentPhase = ui32Phase;
-            for(ui32Instance = 0; ui32Instance < psShader->asPhase[ui32Phase].ui32InstanceCount; ++ui32Instance)
-            {
-                isCurrentForkPhasedInstanced = 0; //reset for each fork phase for cases we don't have a fork phase instance count opcode.
-                bformata(glsl, "//%s declarations\n", asPhaseFuncNames[ui32Phase]);
-                for(i=0; i < psShader->asPhase[ui32Phase].pui32DeclCount[ui32Instance]; ++i)
-                {
-                    TranslateDeclaration(psContext, psShader->asPhase[ui32Phase].ppsDecl[ui32Instance]+i);
-                    if(psShader->asPhase[ui32Phase].ppsDecl[ui32Instance][i].eOpcode == OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT)
-                    {
-                        haveInstancedForkPhase = 1;
-                        isCurrentForkPhasedInstanced = 1;
-                    }
-                }
-
-                bformata(glsl, "void %s%d()\n{\n", asPhaseFuncNames[ui32Phase], ui32Instance);
-                psContext->indent++;
-
-                SetDataTypes(psContext, psShader->asPhase[ui32Phase].ppsInst[ui32Instance], psShader->asPhase[ui32Phase].pui32InstCount[ui32Instance]-1);
-
-                    if(isCurrentForkPhasedInstanced)
-                    {
-                        AddIndentation(psContext);
-                        bformata(glsl, "for(int forkInstanceID = 0; forkInstanceID < HullPhase%dInstanceCount; ++forkInstanceID) {\n", ui32Instance);
-                        psContext->indent++;
-                    }
-
-                        //The minus one here is remove the return statement at end of phases.
-                        //This is needed otherwise the for loop will only run once.
-                        ASSERT(psShader->asPhase[ui32Phase].ppsInst[ui32Instance]  [psShader->asPhase[ui32Phase].pui32InstCount[ui32Instance]-1].eOpcode == OPCODE_RET);
-                        for(i=0; i < psShader->asPhase[ui32Phase].pui32InstCount[ui32Instance]-1; ++i)
-                        {
-                            TranslateInstruction(psContext, psShader->asPhase[ui32Phase].ppsInst[ui32Instance]+i, NULL);
-                        }
-
-                    if(haveInstancedForkPhase)
-                    {
-                        psContext->indent--;
-                        AddIndentation(psContext);
-
-                        if(isCurrentForkPhasedInstanced)
-                        {
-                            bcatcstr(glsl, "}\n");
-                        }
-
-                        if(psContext->havePostShaderCode[psContext->currentPhase])
-                        {
-    #ifdef _DEBUG
-                            AddIndentation(psContext);
-                            bcatcstr(glsl, "//--- Post shader code ---\n");
-    #endif
-                            bconcat(glsl, psContext->postShaderCode[psContext->currentPhase]);
-    #ifdef _DEBUG
-                            AddIndentation(psContext);
-                            bcatcstr(glsl, "//--- End post shader code ---\n");
-    #endif
-                        }
-                }
-
-                psContext->indent--;
-                bcatcstr(glsl, "}\n");
-            }
-        }
-
-        bcatcstr(glsl, "void main()\n{\n");
-
-            psContext->indent++;
-
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//--- Start Early Main ---\n");
-#endif
-            bconcat(glsl, psContext->earlyMain);
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//--- End Early Main ---\n");
-#endif
-
-            ui32PhaseFuncCallOrder[0] = HS_CTRL_POINT_PHASE;
-            ui32PhaseFuncCallOrder[1] = HS_FORK_PHASE;
-            ui32PhaseFuncCallOrder[2] = HS_JOIN_PHASE;
-
-            for(ui32PhaseCallIndex=0; ui32PhaseCallIndex<3; ui32PhaseCallIndex++)
-            {
-                ui32Phase = ui32PhaseFuncCallOrder[ui32PhaseCallIndex];
-                for(ui32Instance = 0; ui32Instance < psShader->asPhase[ui32Phase].ui32InstanceCount; ++ui32Instance)
-                {
-                    AddIndentation(psContext);
-                    bformata(glsl, "%s%d();\n", asPhaseFuncNames[ui32Phase], ui32Instance);
-
-                    if(ui32Phase == HS_FORK_PHASE)
-                    {
-                        if(psShader->asPhase[HS_JOIN_PHASE].ui32InstanceCount ||
-                            (ui32Instance+1 < psShader->asPhase[HS_FORK_PHASE].ui32InstanceCount))
-                        {
-                            AddIndentation(psContext);
-                            bcatcstr(glsl, "barrier();\n");
-                        }
-                    }
-                }
-            }
-
-            psContext->indent--;
-
-        bcatcstr(glsl, "}\n");
-
-        return;
-    }
-
-
-    ui32InstCount = psShader->asPhase[MAIN_PHASE].pui32InstCount[0];
-    ui32DeclCount = psShader->asPhase[MAIN_PHASE].pui32DeclCount[0];
-
-    for(i=0; i < ui32DeclCount; ++i)
-    {
-        TranslateDeclaration(psContext, psShader->asPhase[MAIN_PHASE].ppsDecl[0]+i);
-    }
-
-    if(psContext->psShader->ui32NumDx9ImmConst)
-    {
-        bformata(psContext->mainShader, "vec4 ImmConstArray [%d];\n", psContext->psShader->ui32NumDx9ImmConst);
-    }
-
-    bcatcstr(glsl, "void main()\n{\n");
-
-    psContext->indent++;
-
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bcatcstr(glsl, "//--- Start Early Main ---\n");
-#endif
-    bconcat(glsl, psContext->earlyMain);
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bcatcstr(glsl, "//--- End Early Main ---\n");
-#endif
-
-    MarkIntegerImmediates(psContext);
-
-    SetDataTypes(psContext, psShader->asPhase[MAIN_PHASE].ppsInst[0], ui32InstCount);
-
-    for(i=0; i < ui32InstCount; ++i)
-    {
-        TranslateInstruction(psContext, psShader->asPhase[MAIN_PHASE].ppsInst[0]+i, i+1 < ui32InstCount ? psShader->asPhase[MAIN_PHASE].ppsInst[0]+i+1 : 0);
-    }
-
-    psContext->indent--;
-
-    bcatcstr(glsl, "}\n");
-}
-
-static void FreeSubOperands(Instruction* psInst, const uint32_t ui32NumInsts)
-{
-    uint32_t ui32Inst;
-    for(ui32Inst = 0; ui32Inst < ui32NumInsts; ++ui32Inst)
-    {
-        Instruction* psCurrentInst = &psInst[ui32Inst];
-        const uint32_t ui32NumOperands = psCurrentInst->ui32NumOperands;
-        uint32_t ui32Operand;
-
-        for(ui32Operand = 0; ui32Operand < ui32NumOperands; ++ui32Operand)
-        {
-            uint32_t ui32SubOperand;
-            for(ui32SubOperand = 0; ui32SubOperand < MAX_SUB_OPERANDS; ++ui32SubOperand)
-            {
-                if(psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand])
-                {
-                    hlslcc_free(psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand]);
-                    psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand] = NULL;
-                }
-            }
-        }
-    }
-}
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromMemToGLSL(const char* shader,
-    unsigned int flags,
-    ShaderLang language,
-    const GlExtensions *extensions,
-    Shader* result)
-{
-    uint32_t* tokens;
-    ShaderData* psShader;
-    char* glslcstr = NULL;
-    int GLSLShaderType = GL_FRAGMENT_SHADER_ARB;
-    int success = 0;
-    uint32_t i;
-
-    tokens = (uint32_t*)shader;
-
-    psShader = DecodeDXBC(tokens);
-
-    if(psShader)
-    {
-        HLSLCrossCompilerContext sContext;
-
-        if(psShader->ui32MajorVersion <= 3)
-        {
-            flags &= ~HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS;
-        }
-
-        sContext.psShader = psShader;
-        sContext.flags = flags;
-
-        for(i=0; i<NUM_PHASES;++i)
-        {
-            sContext.havePostShaderCode[i] = 0;
-        }
-
-        TranslateToGLSL(&sContext, &language,extensions);
-
-        switch(psShader->eShaderType)
-        {
-            case VERTEX_SHADER:
-            {
-                GLSLShaderType = GL_VERTEX_SHADER_ARB;
-                break;
-            }
-            case GEOMETRY_SHADER:
-            {
-                GLSLShaderType = GL_GEOMETRY_SHADER;
-                break;
-            }
-            case DOMAIN_SHADER:
-            {
-                GLSLShaderType = GL_TESS_EVALUATION_SHADER;
-                break;
-            }
-            case HULL_SHADER:
-            {
-                GLSLShaderType = GL_TESS_CONTROL_SHADER;
-                break;
-            }
-            case COMPUTE_SHADER:
-            {
-                GLSLShaderType = GL_COMPUTE_SHADER;
-                break;
-            }
-            default:
-            {
-                break;
-            }
-        }
-
-        glslcstr = bstr2cstr(sContext.mainShader, '\0');
-
-        bdestroy(sContext.mainShader);
-        bdestroy(sContext.earlyMain);
-        for(i=0; i<NUM_PHASES; ++i)
-        {
-            bdestroy(sContext.postShaderCode[i]);
-        }
-
-        for(i=0; i<NUM_PHASES;++i)
-        {
-            if(psShader->asPhase[i].ppsDecl != 0)
-            {
-                uint32_t k;
-                for(k=0; k < psShader->asPhase[i].ui32InstanceCount; ++k)
-                {
-                    hlslcc_free(psShader->asPhase[i].ppsDecl[k]);
-                }
-                hlslcc_free(psShader->asPhase[i].ppsDecl);
-            }
-            if(psShader->asPhase[i].ppsInst != 0)
-            {
-                uint32_t k;
-                for(k=0; k < psShader->asPhase[i].ui32InstanceCount; ++k)
-                {
-                    FreeSubOperands(psShader->asPhase[i].ppsInst[k], psShader->asPhase[i].pui32InstCount[k]);
-                    hlslcc_free(psShader->asPhase[i].ppsInst[k]);
-                }
-                hlslcc_free(psShader->asPhase[i].ppsInst);
-            }
-        }
-        
-        memcpy(&result->reflection,&psShader->sInfo,sizeof(psShader->sInfo));
-        
-        result->textureSamplerInfo.ui32NumTextureSamplerPairs = psShader->textureSamplerInfo.ui32NumTextureSamplerPairs;
-        for (i=0; i<result->textureSamplerInfo.ui32NumTextureSamplerPairs; i++)
-            strcpy(result->textureSamplerInfo.aTextureSamplerPair[i].Name, psShader->textureSamplerInfo.aTextureSamplerPair[i].Name);
-
-        hlslcc_free(psShader);
-
-        success = 1;
-    }
-
-    shader = 0;
-    tokens = 0;
-
-    /* Fill in the result struct */
-
-    result->shaderType = GLSLShaderType;
-    result->sourceCode = glslcstr;
-    result->GLSLLanguage = language;
-
-    return success;
-}
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromFileToGLSL(const char* filename,
-    unsigned int flags,
-    ShaderLang language,
-    const GlExtensions *extensions,
-    Shader* result)
-{
-    FILE* shaderFile;
-    int length;
-    size_t readLength;
-    char* shader;
-    int success = 0;
-
-    shaderFile = fopen(filename, "rb");
-
-    if(!shaderFile)
-    {
-        return 0;
-    }
-
-    fseek(shaderFile, 0, SEEK_END);
-    length = ftell(shaderFile);
-    fseek(shaderFile, 0, SEEK_SET);
-
-    shader = (char*)hlslcc_malloc(length+1);
-
-    readLength = fread(shader, 1, length, shaderFile);
-
-    fclose(shaderFile);
-    shaderFile = 0;
-
-    shader[readLength] = '\0';
-
-    success = TranslateHLSLFromMemToGLSL(shader, flags, language, extensions, result);
-
-    hlslcc_free(shader);
-
-    return success;
-}
-
-HLSLCC_API void HLSLCC_APIENTRY FreeShader(Shader* s)
-{
-    bcstrfree(s->sourceCode);
-    s->sourceCode = NULL;
-    FreeShaderInfo(&s->reflection);
-}
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLDeclaration.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLDeclaration.c
deleted file mode 100644
index 4d9195339f..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLDeclaration.c
+++ /dev/null
@@ -1,2678 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "hlslcc.h"
-#include "internal_includes/toGLSLDeclaration.h"
-#include "internal_includes/toGLSLOperand.h"
-#include "internal_includes/languages.h"
-#include "bstrlib.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include <math.h>
-#include <float.h>
-
-#ifdef _MSC_VER
-    #ifndef isnan
-    #define isnan(x) _isnan(x)
-    #endif
-
-    #ifndef isinf
-    #define isinf(x) (!_finite(x))
-    #endif
-#endif
-
-#define fpcheck(x) (isnan(x) || isinf(x))
-
-typedef enum {
-    GLVARTYPE_FLOAT,
-    GLVARTYPE_INT,
-    GLVARTYPE_FLOAT4,
-} GLVARTYPE;
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-
-const char* GetTypeString(GLVARTYPE eType)
-{
-    switch(eType)
-    {
-        case GLVARTYPE_FLOAT:
-        {
-            return "float";
-        }
-        case GLVARTYPE_INT:
-        {
-            return "int";
-        }
-        case GLVARTYPE_FLOAT4:
-        {
-            return "vec4";
-        }
-        default:
-        {
-            return "";
-        }
-    }
-}
-const uint32_t GetTypeElementCount(GLVARTYPE eType)
-{
-    switch(eType)
-    {
-        case GLVARTYPE_FLOAT:
-        case GLVARTYPE_INT:
-        {
-            return 1;
-        }
-        case GLVARTYPE_FLOAT4:
-        {
-            return 4;
-        }
-        default:
-        {
-            return 0;
-        }
-    }
-}
-
-void AddToDx9ImmConstIndexableArray(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    bstring* savedStringPtr = psContext->currentShaderString;
-
-    psContext->currentShaderString = &psContext->earlyMain;
-    psContext->indent++;
-    AddIndentation(psContext);
-    psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber] = psContext->psShader->ui32NumDx9ImmConst;
-    bformata(psContext->earlyMain, "ImmConstArray[%d] = ", psContext->psShader->ui32NumDx9ImmConst);
-    TranslateOperand(psContext, psOperand, TO_FLAG_NONE);
-    bcatcstr(psContext->earlyMain, ";\n");
-    psContext->indent--;
-    psContext->psShader->ui32NumDx9ImmConst++;
-
-    psContext->currentShaderString = savedStringPtr;
-}
-
-void DeclareConstBufferShaderVariable(bstring glsl, const char* Name, const struct ShaderVarType_TAG* psType, int unsizedArray)
-    //const SHADER_VARIABLE_CLASS eClass, const SHADER_VARIABLE_TYPE eType,
-    //const char* pszName)
-{
-    if(psType->Class == SVC_STRUCT)
-    {
-        bformata(glsl, "\t%s_Type %s", Name, Name);
-    }
-    else if(psType->Class == SVC_MATRIX_COLUMNS || psType->Class == SVC_MATRIX_ROWS)
-    {
-        switch(psType->Type)
-        {
-            case SVT_FLOAT:
-            {
-                bformata(glsl, "\tmat4 %s", Name);
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-        }
-        if(psType->Elements > 1)
-        {
-            bformata(glsl, "[%d]", psType->Elements);
-        }
-    }
-    else
-    if(psType->Class == SVC_VECTOR)
-    {
-        switch(psType->Type)
-        {
-            case SVT_FLOAT:
-            {
-                bformata(glsl, "\tvec%d %s", psType->Columns, Name);
-                break;
-            }
-            case SVT_UINT:
-            {
-                bformata(glsl, "\tuvec%d %s", psType->Columns, Name);
-                break;
-            }
-            case SVT_INT:
-            {
-                bformata(glsl, "\tivec%d %s", psType->Columns, Name);
-                break;
-            }
-            case SVT_DOUBLE:
-            {
-                bformata(glsl, "\tdvec%d %s", psType->Columns, Name);
-                break;
-            }
-            case SVT_BOOL:
-            {
-                bformata(glsl, "\tbvec%d %s", psType->Columns, Name);
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-        }
-
-        if(psType->Elements > 1)
-        {
-            bformata(glsl, "[%d]", psType->Elements);
-        }
-    }
-    else
-    if(psType->Class == SVC_SCALAR)
-    {
-        switch(psType->Type)
-        {
-            case SVT_FLOAT:
-            {
-                bformata(glsl, "\tfloat %s", Name);
-                break;
-            }
-            case SVT_UINT:
-            {
-                bformata(glsl, "\tuint %s", Name);
-                break;
-            }
-            case SVT_INT:
-            {
-                bformata(glsl, "\tint %s", Name);
-                break;
-            }
-            case SVT_DOUBLE:
-            {
-                bformata(glsl, "\tdouble %s", Name);
-                break;
-            }
-            case SVT_BOOL:
-            {
-                //Use int instead of bool.
-                //Allows implicit conversions to integer and
-                //bool consumes 4-bytes in HLSL and GLSL anyway.
-                bformata(glsl, "\tint %s", Name);
-                // Also change the definition in the type tree.
-                ((ShaderVarType *)psType)->Type = SVT_INT;
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-        }
-
-        if(psType->Elements > 1)
-        {
-            bformata(glsl, "[%d]", psType->Elements);
-        }
-    }
-    if(unsizedArray)
-        bformata(glsl, "[]");
-    bformata(glsl, ";\n");
-}
-
-//In GLSL embedded structure definitions are not supported.
-void PreDeclareStructType(bstring glsl, const char* Name, const struct ShaderVarType_TAG* psType)
-{
-    uint32_t i;
-
-    for(i=0; i<psType->MemberCount; ++i)
-    {
-        if(psType->Members[i].Class == SVC_STRUCT)
-        {
-            PreDeclareStructType(glsl, psType->Members[i].Name, &psType->Members[i]);
-        }
-    }
-
-    if(psType->Class == SVC_STRUCT)
-    {
-#if defined(_DEBUG)
-        uint32_t unnamed_struct = strcmp(Name, "$Element") == 0 ? 1 : 0;
-#endif
-        //Not supported at the moment
-        ASSERT(!unnamed_struct);
-
-        bformata(glsl, "struct %s_Type {\n", Name);
-
-        for(i=0; i<psType->MemberCount; ++i)
-        {
-            ASSERT(psType->Members != 0);
-
-            DeclareConstBufferShaderVariable(glsl, psType->Members[i].Name, &psType->Members[i], 0);
-        }
-
-        bformata(glsl, "};\n");
-    }
-}
-
-const char* GetDeclaredInputName(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand)
-{
-    bstring inputName;
-    char* cstr;
-    InOutSignature* psIn;
-    int found = GetInputSignatureFromRegister(psOperand->ui32RegisterNumber, &psContext->psShader->sInfo, &psIn);
-
-    if((psContext->flags & HLSLCC_FLAG_INOUT_SEMANTIC_NAMES) && found)
-    {
-        if (eShaderType == VERTEX_SHADER) /* We cannot have input and output names conflict, but vs output must match ps input. Prefix vs input. */
-            inputName = bformat("in_%s%d", psIn->SemanticName, psIn->ui32SemanticIndex);
-        else
-        inputName = bformat("%s%d", psIn->SemanticName, psIn->ui32SemanticIndex);
-    }
-    else if(eShaderType == GEOMETRY_SHADER)
-    {
-        inputName = bformat("VtxOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if(eShaderType == HULL_SHADER)
-    {
-        inputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if(eShaderType == DOMAIN_SHADER)
-    {
-        inputName = bformat("HullOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if(eShaderType == PIXEL_SHADER)
-    {
-        if(psContext->flags & HLSLCC_FLAG_TESS_ENABLED)
-        {
-            inputName = bformat("DomOutput%d", psOperand->ui32RegisterNumber);
-        }
-        else
-        {
-            inputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-        }
-    }
-    else
-    {
-        ASSERT(eShaderType == VERTEX_SHADER);
-        inputName = bformat("dcl_Input%d", psOperand->ui32RegisterNumber);
-    }
-    if((psContext->flags & HLSLCC_FLAG_INOUT_APPEND_SEMANTIC_NAMES) && found)
-    {
-        bformata(inputName,"_%s%d", psIn->SemanticName, psIn->ui32SemanticIndex);
-    }
-
-    cstr = bstr2cstr(inputName, '\0');
-    bdestroy(inputName);
-    return cstr;
-}
-
-const char* GetDeclaredOutputName(const HLSLCrossCompilerContext* psContext,
-                                  const SHADER_TYPE eShaderType,
-                                  const Operand* psOperand,
-                                  int* piStream)
-{
-    bstring outputName;
-    char* cstr;
-    InOutSignature* psOut;
-
-#if defined(_DEBUG)
-    int foundOutput =
-#endif
-        GetOutputSignatureFromRegister(
-            psContext->currentPhase,
-            psOperand->ui32RegisterNumber,
-            psOperand->ui32CompMask,
-            psContext->psShader->ui32CurrentVertexOutputStream,
-            &psContext->psShader->sInfo,
-            &psOut);
-
-    ASSERT(foundOutput);
-
-    if(psContext->flags & HLSLCC_FLAG_INOUT_SEMANTIC_NAMES)
-    {
-        outputName = bformat("%s%d", psOut->SemanticName, psOut->ui32SemanticIndex);
-    }
-    else if(eShaderType == GEOMETRY_SHADER)
-    {
-        if(psOut->ui32Stream != 0)
-        {
-            outputName = bformat("VtxGeoOutput%d_S%d", psOperand->ui32RegisterNumber, psOut->ui32Stream);
-            piStream[0] = psOut->ui32Stream;
-        }
-        else
-        {
-            outputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-        }
-
-    }
-    else if(eShaderType == DOMAIN_SHADER)
-    {
-        outputName = bformat("DomOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if(eShaderType == VERTEX_SHADER)
-    {
-        if(psContext->flags & HLSLCC_FLAG_GS_ENABLED)
-        {
-            outputName = bformat("VtxOutput%d", psOperand->ui32RegisterNumber);
-        }
-        else
-        {
-            outputName = bformat("VtxGeoOutput%d", psOperand->ui32RegisterNumber);
-        }
-    }
-    else if(eShaderType == PIXEL_SHADER)
-    {
-        outputName = bformat("PixOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else
-    {
-        ASSERT(eShaderType == HULL_SHADER);
-        outputName = bformat("HullOutput%d", psOperand->ui32RegisterNumber);
-    }
-    if(psContext->flags & HLSLCC_FLAG_INOUT_APPEND_SEMANTIC_NAMES)
-    {
-        bformata(outputName, "_%s%d", psOut->SemanticName, psOut->ui32SemanticIndex);
-    }
-
-    cstr = bstr2cstr(outputName, '\0');
-    bdestroy(outputName);
-    return cstr;
-}
-
-const char* GetInterpolationString(INTERPOLATION_MODE eMode)
-{
-    switch(eMode)
-    {
-        case INTERPOLATION_CONSTANT:
-        {
-            return "flat";
-        }
-        case INTERPOLATION_LINEAR:
-        {
-            return "";
-        }
-        case INTERPOLATION_LINEAR_CENTROID:
-        {
-            return "centroid";
-        }
-        case INTERPOLATION_LINEAR_NOPERSPECTIVE:
-        {
-            return "noperspective";
-            break;
-        }
-        case INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID:
-        {
-            return "noperspective centroid";
-        }
-        case INTERPOLATION_LINEAR_SAMPLE:
-        {
-            return "sample";
-        }
-        case INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE:
-        {
-            return "noperspective sample";
-        }
-        default:
-        {
-            return "";
-        }
-    }
-}
-
-static void DeclareInput(
-    HLSLCrossCompilerContext* psContext,
-    const Declaration* psDecl,
-    const char* Interpolation, const char* StorageQualifier, const char* Precision, int iNumComponents, OPERAND_INDEX_DIMENSION eIndexDim, const char* InputName)
-{
-    ShaderData* psShader = psContext->psShader;
-    bstring glsl = *psContext->currentShaderString;
-
-    // This falls within the specified index ranges. The default is 0 if no input range is specified
-    if(psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] == -1)
-        return;
-
-    if(psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == 0)
-    {
-        const char* vecType = "vec";
-        const char* scalarType = "float";
-        InOutSignature* psSignature = NULL;
-
-        if( GetInputSignatureFromRegister(psDecl->asOperands[0].ui32RegisterNumber, &psShader->sInfo, &psSignature) )
-        {
-            switch(psSignature->eComponentType)
-            {
-                case INOUT_COMPONENT_UINT32:
-                {
-                    vecType = "uvec";
-                    scalarType = "uint";
-                    break;
-                }
-                case INOUT_COMPONENT_SINT32:
-                {
-                    vecType = "ivec";
-                    scalarType = "int";
-                    break;
-                }
-                case INOUT_COMPONENT_FLOAT32:
-                {
-                    break;
-                }
-            }
-        }
-              
-        if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags) ||
-            (psShader->eShaderType == VERTEX_SHADER && HaveLimitedInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->flags)))
-        {
-            // Skip location if requested by the flags.
-            if (!(psContext->flags & HLSLCC_FLAG_DISABLE_EXPLICIT_LOCATIONS))
-            bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-        }
-
-        switch(eIndexDim)
-        {
-            case INDEX_2D:
-            {
-                if(iNumComponents == 1)
-                {
-                    const uint32_t arraySize = psDecl->asOperands[0].aui32ArraySizes[0];
-
-                    psContext->psShader->abScalarInput[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-
-                    bformata(glsl, "%s %s %s %s [%d];\n", StorageQualifier, Precision, scalarType, InputName,
-                        arraySize);
-
-                    bformata(glsl, "%s1 Input%d;\n", vecType, psDecl->asOperands[0].ui32RegisterNumber);
-
-                    psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = arraySize;
-                }
-                else
-                {
-                    bformata(glsl, "%s %s %s%d %s [%d];\n", StorageQualifier, Precision, vecType, iNumComponents, InputName,
-                        psDecl->asOperands[0].aui32ArraySizes[0]);
-
-                    bformata(glsl, "%s%d Input%d[%d];\n", vecType, iNumComponents, psDecl->asOperands[0].ui32RegisterNumber,
-                        psDecl->asOperands[0].aui32ArraySizes[0]);
-
-                    psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->asOperands[0].aui32ArraySizes[0];
-                }
-                break;
-            }
-            default:
-            {
-
-                if(psDecl->asOperands[0].eType == OPERAND_TYPE_SPECIAL_TEXCOORD)
-                {
-                    InputName = "TexCoord";
-                }
-                
-                if(iNumComponents == 1)
-                {
-                    psContext->psShader->abScalarInput[psDecl->asOperands[0].ui32RegisterNumber] = 1;
-
-                    bformata(glsl, "%s %s %s %s %s;\n", Interpolation, StorageQualifier, Precision, scalarType, InputName);
-                    bformata(glsl, "%s1 Input%d;\n", vecType, psDecl->asOperands[0].ui32RegisterNumber);
-
-                    psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-                }
-                else
-                {
-                    if(psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] > 0)
-                    {
-                        bformata(glsl, "%s %s %s %s%d %s", Interpolation, StorageQualifier, Precision, vecType, iNumComponents, InputName);
-                        bformata(glsl, "[%d];\n", psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber]);
-
-                        bformata(glsl, "%s%d Input%d[%d];\n", vecType, iNumComponents, psDecl->asOperands[0].ui32RegisterNumber,
-                            psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber]);
-
-
-                        psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber];
-                    }
-                    else
-                    {
-                        bformata(glsl, "%s %s %s %s%d %s;\n", Interpolation, StorageQualifier, Precision, vecType, iNumComponents, InputName);
-                        bformata(glsl, "%s%d Input%d;\n", vecType, iNumComponents, psDecl->asOperands[0].ui32RegisterNumber);
-
-                        psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    if(psShader->abInputReferencedByInstruction[psDecl->asOperands[0].ui32RegisterNumber])
-    {
-        psContext->currentShaderString = &psContext->earlyMain;
-        psContext->indent++;
-
-        if(psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == -1) //Not an array
-        {
-            AddIndentation(psContext);
-            bformata(psContext->earlyMain, "Input%d = %s;\n", psDecl->asOperands[0].ui32RegisterNumber, InputName);
-        }
-        else
-        {
-            int arrayIndex = psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber];
-
-            while(arrayIndex)
-            {
-                AddIndentation(psContext);
-                bformata(psContext->earlyMain, "Input%d[%d] = %s[%d];\n", psDecl->asOperands[0].ui32RegisterNumber, arrayIndex-1,
-                    InputName, arrayIndex-1);
-
-                arrayIndex--;
-            }
-        }
-        psContext->indent--;
-        psContext->currentShaderString = &psContext->mainShader;
-    }
-}
-
-void AddBuiltinInput(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, const char* builtinName)
-{
-    bstring glsl = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-
-    if(psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == 0)
-    {
-        SHADER_VARIABLE_TYPE eType = GetOperandDataType(psContext, &psDecl->asOperands[0]);
-        switch(eType)
-        {
-            case SVT_INT:
-                bformata(glsl, "ivec4 ");
-                break;
-            case SVT_UINT:
-                bformata(glsl, "uvec4 ");
-                break;
-            case SVT_BOOL:
-                bformata(glsl, "bvec4 ");
-                break;
-            default:
-                bformata(glsl, "vec4 ");
-                break;
-        }
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bformata(glsl, ";\n");
-
-        psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = 1;
-    }
-    else
-    {
-        //This register has already been declared. The HLSL bytecode likely looks
-        //something like this then:
-        //  dcl_input_ps constant v3.x
-        //  dcl_input_ps_sgv v3.y, primitive_id
-
-        //GLSL does not allow assignment to a varying!
-    }
-
-    psContext->currentShaderString = &psContext->earlyMain;
-    psContext->indent++;
-    AddIndentation(psContext);
-    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_DESTINATION);
-
-    bformata(psContext->earlyMain, " = %s", builtinName);
-
-    switch(psDecl->asOperands[0].eSpecialName)
-    {
-        case NAME_POSITION:
-            TranslateOperandSwizzle(psContext, &psDecl->asOperands[0]);
-            break;
-        default:
-            //Scalar built-in. Don't apply swizzle.
-            break;
-    }
-    bcatcstr(psContext->earlyMain, ";\n");
-
-    psContext->indent--;
-    psContext->currentShaderString = &psContext->mainShader;
-}
-
-int OutputNeedsDeclaring(HLSLCrossCompilerContext* psContext, const Operand* psOperand, const int count)
-{
-    ShaderData* psShader = psContext->psShader;
-    const uint32_t declared = ((psContext->currentPhase + 1) << 3) | psShader->ui32CurrentVertexOutputStream;
-    if(psShader->aiOutputDeclared[psOperand->ui32RegisterNumber] != declared)
-    {
-        int offset;
-
-        for(offset = 0; offset < count; offset++)
-        {
-            psShader->aiOutputDeclared[psOperand->ui32RegisterNumber+offset] = declared;
-        }
-        return 1;
-    }
-
-    if(psShader->eShaderType == PIXEL_SHADER)
-    {
-        if(psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL ||
-           psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL)
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-void AddBuiltinOutput(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, const GLVARTYPE type, int arrayElements, const char* builtinName)
-{
-    bstring glsl = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-
-    psContext->havePostShaderCode[psContext->currentPhase] = 1;
-
-    if(OutputNeedsDeclaring(psContext, &psDecl->asOperands[0], arrayElements ? arrayElements : 1))
-    {
-        InOutSignature* psSignature = NULL;
-
-        GetOutputSignatureFromRegister(
-            psContext->currentPhase,
-            psDecl->asOperands[0].ui32RegisterNumber,
-            psDecl->asOperands[0].ui32CompMask,
-            0,
-            &psShader->sInfo, &psSignature);
-
-        bcatcstr(glsl, "#undef ");
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bcatcstr(glsl, "\n");
-
-        bcatcstr(glsl, "#define ");
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bformata(glsl, " phase%d_", psContext->currentPhase);
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        bcatcstr(glsl, "\n");
-
-        switch (type)
-        {
-        case GLVARTYPE_INT:
-            bcatcstr(glsl, "ivec4 ");
-            break;
-        default:
-            bcatcstr(glsl, "vec4 ");
-        }
-        
-        bformata(glsl, "phase%d_", psContext->currentPhase);
-        TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-        if(arrayElements)
-            bformata(glsl, "[%d];\n", arrayElements);
-        else
-            bcatcstr(glsl, ";\n");
-
-        psContext->currentShaderString = &psContext->postShaderCode[psContext->currentPhase];
-        glsl = *psContext->currentShaderString;
-        psContext->indent++;
-        if(arrayElements)
-        {
-            int elem;
-            for(elem = 0; elem < arrayElements; elem++)
-            {
-                AddIndentation(psContext);
-                bformata(glsl, "%s[%d] = %s(phase%d_", builtinName, elem, GetTypeString(type), psContext->currentPhase);
-                TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NAME_ONLY);
-                bformata(glsl, "[%d]", elem);
-                TranslateOperandSwizzle(psContext, &psDecl->asOperands[0]);
-                bformata(glsl, ");\n");
-            }
-        }
-        else
-        {
-
-            if(psDecl->asOperands[0].eSpecialName == NAME_CLIP_DISTANCE)
-            {
-                int max = GetMaxComponentFromComponentMask(&psDecl->asOperands[0]);
-
-                int applySiwzzle = GetNumSwizzleElements(&psDecl->asOperands[0]) > 1 ? 1 : 0;
-                int index;
-                int i;
-                int multiplier = 1;
-                char* swizzle[] = {".x", ".y", ".z", ".w"};
-
-                ASSERT(psSignature!=NULL);
-
-                index = psSignature->ui32SemanticIndex;
-
-                //Clip distance can be spread across 1 or 2 outputs (each no more than a vec4).
-                //Some examples:
-                //float4 clip[2] : SV_ClipDistance; //8 clip distances
-                //float3 clip[2] : SV_ClipDistance; //6 clip distances
-                //float4 clip : SV_ClipDistance; //4 clip distances
-                //float clip : SV_ClipDistance; //1 clip distance.
-
-                //In GLSL the clip distance built-in is an array of up to 8 floats.
-                //So vector to array conversion needs to be done here.
-                if(index == 1)
-                {
-                    InOutSignature* psFirstClipSignature;
-                    if(GetOutputSignatureFromSystemValue(NAME_CLIP_DISTANCE, 1, &psShader->sInfo, &psFirstClipSignature))
-                    {
-                        if(psFirstClipSignature->ui32Mask & (1 << 3))
-                        {
-                            multiplier = 4;
-                        }
-                        else
-                        if(psFirstClipSignature->ui32Mask & (1 << 2))
-                        {
-                            multiplier = 3;
-                        }
-                        else
-                        if(psFirstClipSignature->ui32Mask & (1 << 1))
-                        {
-                            multiplier = 2;
-                        }
-                    }
-                }
-
-                for(i=0; i<max; ++i)
-                {
-                    AddIndentation(psContext);
-                    bformata(glsl, "%s[%d] = (phase%d_", builtinName, i + multiplier*index, psContext->currentPhase);
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    if(applySiwzzle)
-                    {
-                        bformata(glsl, ")%s;\n", swizzle[i]);
-                    }
-                    else
-                    {
-                        bformata(glsl, ");\n");
-                    }
-                }
-            }
-            else
-            {
-                uint32_t elements = GetNumSwizzleElements(&psDecl->asOperands[0]);
-
-                if(elements != GetTypeElementCount(type))
-                {
-                    //This is to handle float3 position seen in control point phases
-                    //struct HS_OUTPUT
-                    //{
-                    //    float3 vPosition : POSITION;
-                    //}; -> dcl_output o0.xyz
-                    //gl_Position is vec4.
-                    AddIndentation(psContext);
-                    bformata(glsl, "%s = %s(phase%d_", builtinName, GetTypeString(type), psContext->currentPhase);
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    bformata(glsl, ", 1);\n");
-                }
-                else
-                {
-                    AddIndentation(psContext);
-                    bformata(glsl, "%s = %s(phase%d_", builtinName, GetTypeString(type), psContext->currentPhase);
-                    TranslateOperand(psContext, &psDecl->asOperands[0], type == GLVARTYPE_INT ? TO_FLAG_INTEGER : TO_FLAG_NONE);
-                    bformata(glsl, ");\n");
-                }
-            }
-        }
-        psContext->indent--;
-        psContext->currentShaderString = &psContext->mainShader;
-    }
-}
-
-void AddUserOutput(HLSLCrossCompilerContext* psContext, const Declaration* psDecl)
-{
-    bstring glsl = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-
-    if(OutputNeedsDeclaring(psContext, &psDecl->asOperands[0], 1))
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        const char* Precision = "";
-        const char* type = "vec";
-
-        InOutSignature* psSignature = NULL;
-
-        GetOutputSignatureFromRegister(
-            psContext->currentPhase,
-            psDecl->asOperands[0].ui32RegisterNumber,
-            psDecl->asOperands[0].ui32CompMask,
-            psShader->ui32CurrentVertexOutputStream,
-            &psShader->sInfo,
-            &psSignature);
-
-        switch(psSignature->eComponentType)
-        {
-            case INOUT_COMPONENT_UINT32:
-            {
-                type = "uvec";
-                break;
-            }
-            case INOUT_COMPONENT_SINT32:
-            {
-                type = "ivec";
-                break;
-            }
-            case INOUT_COMPONENT_FLOAT32:
-            {
-                break;
-            }
-        }
-
-        if(HavePrecisionQualifers(psShader->eTargetLanguage))
-        {
-            switch(psOperand->eMinPrecision)
-            {
-                case OPERAND_MIN_PRECISION_DEFAULT:
-                {
-                    Precision = "highp";
-                    break;
-                }
-                case OPERAND_MIN_PRECISION_FLOAT_16:
-                {
-                    Precision = "mediump";
-                    break;
-                }
-                case OPERAND_MIN_PRECISION_FLOAT_2_8:
-                {
-                    Precision = "lowp";
-                    break;
-                }
-                case OPERAND_MIN_PRECISION_SINT_16:
-                {
-                    Precision = "mediump";
-                    //type = "ivec";
-                    break;
-                }
-                case OPERAND_MIN_PRECISION_UINT_16:
-                {
-                    Precision = "mediump";
-                    //type = "uvec";
-                    break;
-                }
-            }
-        }
-
-        switch(psShader->eShaderType)
-        {
-            case PIXEL_SHADER:
-            {
-                switch(psDecl->asOperands[0].eType)
-                {
-                    case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-                    case OPERAND_TYPE_OUTPUT_DEPTH:
-                    {
-
-                        break;
-                    }
-                    case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-                    {
-                        bcatcstr(glsl, "#ifdef GL_ARB_conservative_depth\n");
-                        bcatcstr(glsl, "#extension GL_ARB_conservative_depth : enable\n");
-                        bcatcstr(glsl, "layout (depth_greater) out float gl_FragDepth;\n");
-                        bcatcstr(glsl, "#endif\n");
-                        break;
-                    }
-                    case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-                    {
-                        bcatcstr(glsl, "#ifdef GL_ARB_conservative_depth\n");
-                        bcatcstr(glsl, "#extension GL_ARB_conservative_depth : enable\n");
-                        bcatcstr(glsl, "layout (depth_less) out float gl_FragDepth;\n");
-                        bcatcstr(glsl, "#endif\n");
-                        break;
-                    }
-                    default:
-                    {
-                        if(WriteToFragData(psContext->psShader->eTargetLanguage))
-                        {
-                            bformata(glsl, "#define Output%d gl_FragData[%d]\n", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber);
-                        }
-                        else
-                        {
-                            int stream = 0;
-                            const char* OutputName = GetDeclaredOutputName(psContext, PIXEL_SHADER, psOperand, &stream);
-
-                            if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags) || HaveLimitedInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->flags))
-                            {
-                                uint32_t index = 0;
-                                uint32_t renderTarget = psDecl->asOperands[0].ui32RegisterNumber;
-
-                                if((psContext->flags & HLSLCC_FLAG_DUAL_SOURCE_BLENDING) && DualSourceBlendSupported(psContext->psShader->eTargetLanguage))
-                                {
-                                    if(renderTarget > 0)
-                                    {
-                                        renderTarget = 0;
-                                        index = 1;
-                                    }
-                                    bformata(glsl, "layout(location = %d, index = %d) ", renderTarget, index);
-                                }
-                                else
-                                {
-                                    bformata(glsl, "layout(location = %d) ", renderTarget);
-                                }
-                            }
-
-                            bformata(glsl, "out %s %s4 %s;\n", Precision, type, OutputName);
-                            if(stream)
-                            {
-                                bformata(glsl, "#define Output%d_S%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, stream, OutputName);
-                            }
-                            else
-                            {
-                                bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-                            }
-                        }
-                        break;
-                    }
-                }
-                break;
-            }
-            case VERTEX_SHADER:
-            {
-                int iNumComponents = 4;//GetMaxComponentFromComponentMask(&psDecl->asOperands[0]);
-                const char* Interpolation = "";
-                int stream = 0;
-                const char* OutputName = GetDeclaredOutputName(psContext, VERTEX_SHADER, psOperand, &stream);
-
-                if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-                {
-                    if (!(psContext->flags & HLSLCC_FLAG_DISABLE_EXPLICIT_LOCATIONS))
-                    bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-                }
-
-                if(InOutSupported(psContext->psShader->eTargetLanguage))
-                {
-                    bformata(glsl, "%s out %s %s%d %s;\n", Interpolation, Precision, type, iNumComponents, OutputName);
-                }
-                else
-                {
-                    bformata(glsl, "%s varying %s %s%d %s;\n", Interpolation, Precision, type, iNumComponents, OutputName);
-                }
-                bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-
-                break;
-            }
-            case GEOMETRY_SHADER:
-            {
-                int stream = 0;
-                const char* OutputName = GetDeclaredOutputName(psContext, GEOMETRY_SHADER, psOperand, &stream);
-
-                if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-                {
-                    bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-                }
-
-                bformata(glsl, "out %s4 %s;\n", type, OutputName);
-                if(stream)
-                {
-                    bformata(glsl, "#define Output%d_S%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, stream, OutputName);
-                }
-                else
-                {
-                    bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-                }
-                break;
-            }
-            case HULL_SHADER:
-            {
-                int stream = 0;
-                const char* OutputName = GetDeclaredOutputName(psContext, HULL_SHADER, psOperand, &stream);
-
-                ASSERT(psDecl->asOperands[0].ui32RegisterNumber!=0);//Reg 0 should be gl_out[gl_InvocationID].gl_Position.
-
-                if(psContext->currentPhase == HS_JOIN_PHASE)
-                {
-                    bformata(glsl, "out patch %s4 %s[];\n", type, OutputName);
-                }
-                else
-                {
-                    if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-                    {
-                        bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-                    }
-
-                    bformata(glsl, "out %s4 %s[];\n", type, OutputName);
-                }
-                bformata(glsl, "#define Output%d %s[gl_InvocationID]\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-                break;
-            }
-            case DOMAIN_SHADER:
-            {
-                int stream = 0;
-                const char* OutputName = GetDeclaredOutputName(psContext, DOMAIN_SHADER, psOperand, &stream);
-                if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-                {
-                    bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-                }
-                bformata(glsl, "out %s4 %s;\n", type, OutputName);
-                bformata(glsl, "#define Output%d %s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-                break;
-            }
-        }
-    }
-    else
-    {
-        /*
-            Multiple outputs can be packed into one register. e.g.
-            // Name                 Index   Mask Register SysValue  Format   Used
-            // -------------------- ----- ------ -------- -------- ------- ------
-            // FACTOR                   0   x           3     NONE     int   x   
-            // MAX                      0    y          3     NONE     int    y  
-
-            We want unique outputs to make it easier to use transform feedback.
-
-            out  ivec4 FACTOR0;
-            #define Output3 FACTOR0
-            out  ivec4 MAX0;
-
-            MAIN SHADER CODE. Writes factor and max to Output3 which aliases FACTOR0.
-
-            MAX0.x = FACTOR0.y;
-
-            This unpacking of outputs is only done when using HLSLCC_FLAG_INOUT_SEMANTIC_NAMES/HLSLCC_FLAG_INOUT_APPEND_SEMANTIC_NAMES.
-            When not set the application will be using HLSL reflection information to discover
-            what the input and outputs mean if need be.
-        */
-
-        //
-
-        if((psContext->flags & (HLSLCC_FLAG_INOUT_SEMANTIC_NAMES|HLSLCC_FLAG_INOUT_APPEND_SEMANTIC_NAMES)) && (psDecl->asOperands[0].eType == OPERAND_TYPE_OUTPUT))
-        {
-            const Operand* psOperand = &psDecl->asOperands[0];
-            InOutSignature* psSignature = NULL;
-            const char* type = "vec";
-            int stream = 0;
-            const char* OutputName = GetDeclaredOutputName(psContext, psShader->eShaderType, psOperand, &stream);
-
-            GetOutputSignatureFromRegister(
-                psContext->currentPhase,
-                psOperand->ui32RegisterNumber,
-                psOperand->ui32CompMask,
-                0,
-                &psShader->sInfo,
-                &psSignature);
-
-            if (HaveInOutLocationQualifier(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-            {
-                if (!((psShader->eShaderType == VERTEX_SHADER) && (psContext->flags & HLSLCC_FLAG_DISABLE_EXPLICIT_LOCATIONS)))
-                bformata(glsl, "layout(location = %d) ", psDecl->asOperands[0].ui32RegisterNumber);
-            }
-
-            switch(psSignature->eComponentType)
-            {
-                case INOUT_COMPONENT_UINT32:
-                {
-                    type = "uvec";
-                    break;
-                }
-                case INOUT_COMPONENT_SINT32:
-                {
-                    type = "ivec";
-                    break;
-                }
-                case INOUT_COMPONENT_FLOAT32:
-                {
-                    break;
-                }
-            }
-            bformata(glsl, "out %s4 %s;\n", type, OutputName);
-
-            psContext->havePostShaderCode[psContext->currentPhase] = 1;
-
-            psContext->currentShaderString = &psContext->postShaderCode[psContext->currentPhase];
-            glsl = *psContext->currentShaderString;
-
-            bcatcstr(glsl, OutputName);
-            AddSwizzleUsingElementCount(psContext, GetNumSwizzleElements(psOperand));
-            bformata(glsl, " = Output%d", psOperand->ui32RegisterNumber);
-            TranslateOperandSwizzle(psContext, psOperand);
-            bcatcstr(glsl, ";\n");
-
-            psContext->currentShaderString = &psContext->mainShader;
-            glsl = *psContext->currentShaderString;
-        }
-    }
-}
-
-void DeclareUBOConstants(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint,
-                            ConstantBuffer* psCBuf,
-                            bstring glsl)
-{
-    uint32_t i;
-    const char* Name = psCBuf->Name;
-    if(psCBuf->Name[0] == '$') //For $Globals
-    {
-        Name++;
-    }
-
-    for(i=0; i < psCBuf->ui32NumVars; ++i)
-    {
-        PreDeclareStructType(glsl,
-            psCBuf->asVars[i].Name,
-            &psCBuf->asVars[i].sType);
-    }
-
-    /* [layout (location = X)] uniform vec4 HLSLConstantBufferName[numConsts]; */
-    if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-        bformata(glsl, "layout(binding = %d) ", ui32BindingPoint);
-
-    bformata(glsl, "uniform %s {\n ", Name);
-
-    for(i=0; i < psCBuf->ui32NumVars; ++i)
-    {
-        DeclareConstBufferShaderVariable(glsl,
-            psCBuf->asVars[i].Name,
-            &psCBuf->asVars[i].sType, 0);
-    }
-                
-    bcatcstr(glsl, "};\n");
-}
-
-void DeclareBufferVariable(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint,
-                            ConstantBuffer* psCBuf, const Operand* psOperand,
-                            const uint32_t ui32GloballyCoherentAccess,
-                            const ResourceType eResourceType,
-                            bstring glsl)
-{
-    bstring StructName;
-#if defined(_DEBUG)
-    uint32_t unnamed_struct =
-#endif
-        strcmp(psCBuf->asVars[0].Name, "$Element") == 0 ? 1 : 0;
-
-    ASSERT(psCBuf->ui32NumVars == 1);
-    ASSERT(unnamed_struct);
-
-    StructName = bfromcstr("");
-    
-    //TranslateOperand(psContext, psOperand, TO_FLAG_NAME_ONLY);
-    if(psOperand->eType == OPERAND_TYPE_RESOURCE && eResourceType == RTYPE_STRUCTURED)
-    {
-        bformata(StructName, "StructuredRes%d", psOperand->ui32RegisterNumber);
-    }
-    else if(psOperand->eType == OPERAND_TYPE_RESOURCE && eResourceType == RTYPE_UAV_RWBYTEADDRESS)
-    {
-        bformata(StructName, "RawRes%d", psOperand->ui32RegisterNumber);
-    }
-    else
-    {
-        ResourceName(StructName, psContext, RGROUP_UAV, psOperand->ui32RegisterNumber, 0);
-    }
-
-    PreDeclareStructType(glsl,
-        bstr2cstr(StructName, '\0'),
-        &psCBuf->asVars[0].sType);
-
-    /* [layout (location = X)] uniform vec4 HLSLConstantBufferName[numConsts]; */
-    if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-        bformata(glsl, "layout(binding = %d) ", ui32BindingPoint);
-
-    if(ui32GloballyCoherentAccess & GLOBALLY_COHERENT_ACCESS)
-    {
-        bcatcstr(glsl, "coherent ");
-    }
-
-    if(eResourceType == RTYPE_STRUCTURED)
-    {
-        bcatcstr(glsl, "readonly ");
-    }
-
-    bformata(glsl, "buffer Block%d {\n", psOperand->ui32RegisterNumber);
-
-    DeclareConstBufferShaderVariable(glsl,
-    bstr2cstr(StructName, '\0'),
-    &psCBuf->asVars[0].sType,
-    1);
-
-    bcatcstr(glsl, "};\n");
-
-    bdestroy(StructName);
-}
-
-
-void DeclareStructConstants(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint,
-                            ConstantBuffer* psCBuf, const Operand* psOperand,
-                            bstring glsl)
-{
-    uint32_t i;
-    int useGlobalsStruct = 1;
-
-    if(psContext->flags & HLSLCC_FLAG_DISABLE_GLOBALS_STRUCT && psCBuf->Name[0] == '$')
-        useGlobalsStruct = 0;
-
-    if(useGlobalsStruct)
-    {
-    for(i=0; i < psCBuf->ui32NumVars; ++i)
-    {
-        PreDeclareStructType(glsl,
-            psCBuf->asVars[i].Name,
-            &psCBuf->asVars[i].sType);
-    }
-    }
-
-    /* [layout (location = X)] uniform vec4 HLSLConstantBufferName[numConsts]; */
-    if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-        bformata(glsl, "layout(location = %d) ", ui32BindingPoint);
-    if(useGlobalsStruct)
-    {
-    bcatcstr(glsl, "uniform struct ");
-    TranslateOperand(psContext, psOperand, TO_FLAG_DECLARATION_NAME);
-
-    bcatcstr(glsl, "_Type {\n");
-    }
-
-    for(i=0; i < psCBuf->ui32NumVars; ++i)
-    {
-        if(!useGlobalsStruct)
-            bcatcstr(glsl, "uniform ");
-
-        DeclareConstBufferShaderVariable(glsl,
-            psCBuf->asVars[i].Name,
-            &psCBuf->asVars[i].sType, 0);
-    }
-                
-    if(useGlobalsStruct)
-    {
-    bcatcstr(glsl, "} ");
-
-    TranslateOperand(psContext, psOperand, TO_FLAG_DECLARATION_NAME);
-
-    bcatcstr(glsl, ";\n");
-}
-}
-
-char* GetSamplerType(HLSLCrossCompilerContext* psContext,
-                     const RESOURCE_DIMENSION eDimension,
-                     const uint32_t ui32RegisterNumber)
-{
-    ResourceBinding* psBinding = 0;
-    RESOURCE_RETURN_TYPE eType = RETURN_TYPE_UNORM;
-    int found;
-    found = GetResourceFromBindingPoint(RGROUP_TEXTURE, ui32RegisterNumber, &psContext->psShader->sInfo, &psBinding);
-    if(found)
-    {
-        eType = (RESOURCE_RETURN_TYPE)psBinding->ui32ReturnType;
-    }
-    switch(eDimension)
-    {
-        case RESOURCE_DIMENSION_BUFFER:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isamplerBuffer";
-                case RETURN_TYPE_UINT:
-                    return "usamplerBuffer";
-                default:
-                    return "samplerBuffer";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE1D:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isampler1D";
-                case RETURN_TYPE_UINT:
-                    return "usampler1D";
-                default:
-                    return "sampler1D";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE2D:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isampler2D";
-                case RETURN_TYPE_UINT:
-                    return "usampler2D";
-                default:
-                    return "sampler2D";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE2DMS:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isampler2DMS";
-                case RETURN_TYPE_UINT:
-                    return "usampler2DMS";
-                default:
-                    return "sampler2DMS";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE3D:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isampler3D";
-                case RETURN_TYPE_UINT:
-                    return "usampler3D";
-                default:
-                    return "sampler3D";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURECUBE:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isamplerCube";
-                case RETURN_TYPE_UINT:
-                    return "usamplerCube";
-                default:
-                    return "samplerCube";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isampler1DArray";
-                case RETURN_TYPE_UINT:
-                    return "usampler1DArray";
-                default:
-                    return "sampler1DArray";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isampler2DArray";
-                case RETURN_TYPE_UINT:
-                    return "usampler2DArray";
-                default:
-                    return "sampler2DArray";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isampler2DMSArray";
-                case RETURN_TYPE_UINT:
-                    return "usampler2DMSArray";
-                default:
-                    return "sampler2DMSArray";
-            }
-            break;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        {
-            switch(eType)
-            {
-                case RETURN_TYPE_SINT:
-                    return "isamplerCubeArray";
-                case RETURN_TYPE_UINT:
-                    return "usamplerCubeArray";
-                default:
-                    return "samplerCubeArray";
-            }
-            break;
-        }
-    }
-
-    return "sampler2D";
-}
-
-static void TranslateResourceTexture(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, uint32_t samplerCanDoShadowCmp)
-{
-    bstring glsl = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-    uint32_t i;
-
-    const char* samplerTypeName = GetSamplerType(psContext,
-        psDecl->value.eResourceDimension,
-        psDecl->asOperands[0].ui32RegisterNumber);
-    
-    if (psContext->flags & HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS)
-    {
-        if(samplerCanDoShadowCmp && psDecl->ui32IsShadowTex)
-        {
-            for (i = 0; i < psDecl->ui32SamplerUsedCount; i++)
-            {
-                bcatcstr(glsl, "uniform ");
-                bcatcstr(glsl, samplerTypeName);
-                bcatcstr(glsl, "Shadow ");
-                ConcatTextureSamplerName(glsl, &psShader->sInfo, psDecl->asOperands[0].ui32RegisterNumber, psDecl->ui32SamplerUsed[i], 1);
-                bcatcstr(glsl, ";\n");
-            }
-        }
-        for (i = 0; i < psDecl->ui32SamplerUsedCount; i++)
-        {
-            bcatcstr(glsl, "uniform ");
-            bcatcstr(glsl, samplerTypeName);
-            bcatcstr(glsl, " ");
-            ConcatTextureSamplerName(glsl, &psShader->sInfo, psDecl->asOperands[0].ui32RegisterNumber, psDecl->ui32SamplerUsed[i], 0);
-            bcatcstr(glsl, ";\n");
-        }
-    }
-
-    if(samplerCanDoShadowCmp && psDecl->ui32IsShadowTex)
-    {
-        //Create shadow and non-shadow sampler.
-        //HLSL does not have separate types for depth compare, just different functions.
-
-        bcatcstr(glsl, "uniform ");
-        bcatcstr(glsl, samplerTypeName);
-        bcatcstr(glsl, "Shadow ");
-        ResourceName(glsl, psContext, RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, 1);
-        bcatcstr(glsl, ";\n");
-    }
-                        
-    bcatcstr(glsl, "uniform ");
-    bcatcstr(glsl, samplerTypeName);
-    bcatcstr(glsl, " ");
-    ResourceName(glsl, psContext, RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, 0);
-    bcatcstr(glsl, ";\n");
-}
-
-void TranslateDeclaration(HLSLCrossCompilerContext* psContext, const Declaration* psDecl)
-{
-    bstring glsl = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-
-    switch(psDecl->eOpcode)
-    {
-        case OPCODE_DCL_INPUT_SGV:
-        case OPCODE_DCL_INPUT_PS_SGV:
-        {
-            const SPECIAL_NAME eSpecialName = psDecl->asOperands[0].eSpecialName;
-            switch(eSpecialName)
-            {
-                case NAME_POSITION:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_Position");
-                    break;
-                }
-                case NAME_RENDER_TARGET_ARRAY_INDEX:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_Layer");
-                    break;
-                }
-                case NAME_CLIP_DISTANCE:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_ClipDistance");
-                    break;
-                }
-                case NAME_VIEWPORT_ARRAY_INDEX:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_ViewportIndex");
-                    break;
-                }
-                case NAME_INSTANCE_ID:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_InstanceID");
-                    break;
-                }
-                case NAME_IS_FRONT_FACE:
-                {
-                    /*
-                        Cast to int used because
-                        if(gl_FrontFacing != 0) failed to compiled on Intel HD 4000.
-                        Suggests no implicit conversion for bool<->int.
-                    */
-
-                    AddBuiltinInput(psContext, psDecl, "int(gl_FrontFacing)");
-                    break;
-                }
-                case NAME_SAMPLE_INDEX:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_SampleID");
-                    break;
-                }
-                case NAME_VERTEX_ID:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_VertexID");
-                    break;
-                }
-                case NAME_PRIMITIVE_ID:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_PrimitiveID");
-                    break;
-                }
-                default:
-                {
-                    bformata(glsl, "in vec4 %s;\n", psDecl->asOperands[0].pszSpecialName);
-
-                    bcatcstr(glsl, "#define ");
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    bformata(glsl, " %s\n", psDecl->asOperands[0].pszSpecialName);
-                    break;
-                }
-            }
-            break;
-        }
-
-        case OPCODE_DCL_OUTPUT_SIV:
-        {
-            switch(psDecl->asOperands[0].eSpecialName)
-            {
-                case NAME_POSITION:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT4, 0, "gl_Position");
-                    break;
-                }
-                case NAME_RENDER_TARGET_ARRAY_INDEX:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_INT, 0, "gl_Layer");
-                    break;
-                }
-                case NAME_CLIP_DISTANCE:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_ClipDistance");
-                    break;
-                }
-                case NAME_VIEWPORT_ARRAY_INDEX:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_INT, 0, "gl_ViewportIndex");
-                    break;
-                }
-                case NAME_VERTEX_ID:
-                {
-                    ASSERT(0); //VertexID is not an output
-                    break;
-                }
-                case NAME_PRIMITIVE_ID:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_INT, 0, "gl_PrimitiveID");
-                    break;
-                }
-                case NAME_INSTANCE_ID:
-                {
-                    ASSERT(0); //InstanceID is not an output
-                    break;
-                }
-                case NAME_IS_FRONT_FACE:
-                {
-                    ASSERT(0); //FrontFacing is not an output
-                    break;
-                }
-                case NAME_FINAL_QUAD_U_EQ_0_EDGE_TESSFACTOR:
-                {
-                    if(psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 4, "gl_TessLevelOuter");
-                    }
-                    else
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[0]");
-                    }
-                    break;
-                }
-                case NAME_FINAL_QUAD_V_EQ_0_EDGE_TESSFACTOR: 
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[1]");
-                    break;
-                }
-                case NAME_FINAL_QUAD_U_EQ_1_EDGE_TESSFACTOR: 
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[2]");
-                    break;
-                }
-                case NAME_FINAL_QUAD_V_EQ_1_EDGE_TESSFACTOR:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[3]");
-                    break;
-                }
-                case NAME_FINAL_TRI_U_EQ_0_EDGE_TESSFACTOR:
-                {
-                    if(psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 3,"gl_TessLevelOuter");
-                    }
-                    else
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[0]");
-                    }
-                    break;
-                }
-                case NAME_FINAL_TRI_V_EQ_0_EDGE_TESSFACTOR:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[1]");
-                    break;
-                }
-                case NAME_FINAL_TRI_W_EQ_0_EDGE_TESSFACTOR:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[2]");
-                    break;
-                }
-                case NAME_FINAL_LINE_DENSITY_TESSFACTOR:
-                {
-                    if(psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 2, "gl_TessLevelOuter");
-                    }
-                    else
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[0]");
-                    }
-                    break;
-                }
-                case NAME_FINAL_LINE_DETAIL_TESSFACTOR:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelOuter[1]");
-                    break;
-                }
-                case NAME_FINAL_TRI_INSIDE_TESSFACTOR:
-                case NAME_FINAL_QUAD_U_INSIDE_TESSFACTOR:
-                {
-                    if(psContext->psShader->aIndexedOutput[psDecl->asOperands[0].ui32RegisterNumber])
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 2, "gl_TessLevelInner");
-                    }
-                    else
-                    {
-                        AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelInner[0]");
-                    }
-                    break;
-                }
-                case NAME_FINAL_QUAD_V_INSIDE_TESSFACTOR:
-                {
-                    AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT, 0, "gl_TessLevelInner[1]");
-                    break;
-                }
-                default:
-                {
-                    bformata(glsl, "out vec4 %s;\n", psDecl->asOperands[0].pszSpecialName);
-
-                    bcatcstr(glsl, "#define ");
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    bformata(glsl, " %s\n", psDecl->asOperands[0].pszSpecialName);
-                    break;
-                }
-            }
-            break;
-        }
-        case OPCODE_DCL_INPUT:
-        {
-            const Operand* psOperand = &psDecl->asOperands[0];
-            //Force the number of components to be 4.
-/*dcl_output o3.xy
-  dcl_output o3.z
-
-Would generate a vec2 and a vec3. We discard the second one making .z invalid!
-
-*/
-            int iNumComponents = 4;//GetMaxComponentFromComponentMask(psOperand);
-            const char* StorageQualifier = "attribute";
-            const char* InputName;
-            const char* Precision = "";
-
-            if((psOperand->eType == OPERAND_TYPE_INPUT_DOMAIN_POINT)||
-            (psOperand->eType == OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID)||
-            (psOperand->eType == OPERAND_TYPE_INPUT_COVERAGE_MASK)||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID)||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_GROUP_ID)||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP)||
-            (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_FORK_INSTANCE_ID))
-            {
-                break;
-            }
-
-            //Already declared as part of an array.
-            if(psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] == -1)
-            {
-                break;
-            }
-
-            InputName = GetDeclaredInputName(psContext, psShader->eShaderType, psOperand);
-
-            if(InOutSupported(psContext->psShader->eTargetLanguage))
-            {
-                StorageQualifier = "in";
-            }
-
-            if(HavePrecisionQualifers(psShader->eTargetLanguage))
-            {
-                switch(psOperand->eMinPrecision)
-                {
-                    case OPERAND_MIN_PRECISION_DEFAULT:
-                    {
-                        Precision = "highp";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_FLOAT_16:
-                    {
-                        Precision = "mediump";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_FLOAT_2_8:
-                    {
-                        Precision = "lowp";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_SINT_16:
-                    {
-                        Precision = "mediump";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_UINT_16:
-                    {
-                        Precision = "mediump";
-                        break;
-                    }
-                }
-            }
-
-            DeclareInput(psContext, psDecl,
-                "", StorageQualifier, Precision, iNumComponents, (OPERAND_INDEX_DIMENSION)psOperand->iIndexDims, InputName);
-
-            break;
-        }
-        case OPCODE_DCL_INPUT_PS_SIV:
-        {
-            switch(psDecl->asOperands[0].eSpecialName)
-            {
-                case NAME_POSITION:
-                {
-                    AddBuiltinInput(psContext, psDecl, "gl_FragCoord");
-                    break;
-                }
-            }
-            break;
-        }
-        case OPCODE_DCL_INPUT_SIV:
-        {
-            break;
-        }
-        case OPCODE_DCL_INPUT_PS:
-        {
-            const Operand* psOperand = &psDecl->asOperands[0];
-            int iNumComponents = 4;//GetMaxComponentFromComponentMask(psOperand);
-            const char* StorageQualifier = "varying";
-            const char* Precision = "";
-            const char* InputName = GetDeclaredInputName(psContext, PIXEL_SHADER, psOperand);
-            const char* Interpolation = "";
-
-            if(InOutSupported(psContext->psShader->eTargetLanguage))
-            {
-                StorageQualifier = "in";
-            }
-
-            switch(psDecl->value.eInterpolation)
-            {
-                case INTERPOLATION_CONSTANT:
-                {
-                    Interpolation = "flat";
-                    break;
-                }
-                case INTERPOLATION_LINEAR:
-                {
-                    break;
-                }
-                case INTERPOLATION_LINEAR_CENTROID:
-                {
-                    Interpolation = "centroid";
-                    break;
-                }
-                case INTERPOLATION_LINEAR_NOPERSPECTIVE:
-                {
-                    Interpolation = "noperspective";
-                    break;
-                }
-                case INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID:
-                {
-                    Interpolation = "noperspective centroid";
-                    break;
-                }
-                case INTERPOLATION_LINEAR_SAMPLE:
-                {
-                    Interpolation = "sample";
-                    break;
-                }
-                case INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE:
-                {
-                    Interpolation = "noperspective sample";
-                    break;
-                }
-            }
-
-            if(HavePrecisionQualifers(psShader->eTargetLanguage))
-            {
-                switch(psOperand->eMinPrecision)
-                {
-                    case OPERAND_MIN_PRECISION_DEFAULT:
-                    {
-                        Precision = "highp";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_FLOAT_16:
-                    {
-                        Precision = "mediump";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_FLOAT_2_8:
-                    {
-                        Precision = "lowp";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_SINT_16:
-                    {
-                        Precision = "mediump";
-                        break;
-                    }
-                    case OPERAND_MIN_PRECISION_UINT_16:
-                    {
-                        Precision = "mediump";
-                        break;
-                    }
-                }
-            }
-
-            DeclareInput(psContext, psDecl,
-                Interpolation, StorageQualifier, Precision, iNumComponents, INDEX_1D, InputName);
-            
-            break;
-        }
-        case OPCODE_DCL_TEMPS:
-        {
-            const uint32_t ui32NumTemps = psDecl->value.ui32NumTemps;
-
-            if(ui32NumTemps > 0)
-            {
-                bformata(glsl, "vec4 Temp[%d];\n", ui32NumTemps);
-
-                bformata(glsl, "ivec4 Temp_int[%d];\n", ui32NumTemps);
-                if(HaveUVec(psShader->eTargetLanguage))
-                {
-                    bformata(glsl, "uvec4 Temp_uint[%d];\n", ui32NumTemps);
-                }
-                if(psShader->fp64)
-                {
-                    bformata(glsl, "dvec4 Temp_double[%d];\n", ui32NumTemps);
-                }
-            }
-
-            break;
-        }
-        case OPCODE_SPECIAL_DCL_IMMCONST:
-        {
-            const Operand* psDest = &psDecl->asOperands[0];
-            const Operand* psSrc = &psDecl->asOperands[1];
-
-            ASSERT(psSrc->eType == OPERAND_TYPE_IMMEDIATE32);
-            if(psDest->eType == OPERAND_TYPE_SPECIAL_IMMCONSTINT)
-            {
-                bformata(glsl, "const ivec4 IntImmConst%d = ", psDest->ui32RegisterNumber);
-            }
-            else
-            {
-                bformata(glsl, "const vec4 ImmConst%d = ", psDest->ui32RegisterNumber);
-                AddToDx9ImmConstIndexableArray(psContext, psDest);
-            }
-            TranslateOperand(psContext, psSrc, psDest->eType == OPERAND_TYPE_SPECIAL_IMMCONSTINT ? TO_FLAG_INTEGER : TO_AUTO_BITCAST_TO_FLOAT);
-            bcatcstr(glsl, ";\n");
-            
-            break;
-        }
-        case OPCODE_DCL_CONSTANT_BUFFER:
-        {
-            const Operand* psOperand = &psDecl->asOperands[0];
-            const uint32_t ui32BindingPoint = psOperand->aui32ArraySizes[0];
-
-            const char* StageName = "VS";
-
-            switch(psContext->psShader->eShaderType)
-            {
-                case PIXEL_SHADER:
-                {
-                    StageName = "PS";
-                    break;
-                }
-                case HULL_SHADER:
-                {
-                    StageName = "HS";
-                    break;
-                }
-                case DOMAIN_SHADER:
-                {
-                    StageName = "DS";
-                    break;
-                }
-                case GEOMETRY_SHADER:
-                {
-                    StageName = "GS";
-                    break;
-                }
-                case COMPUTE_SHADER:
-                {
-                    StageName = "CS";
-                    break;
-                }
-                default:
-                {
-                    break;
-                }
-            }
-
-            ConstantBuffer* psCBuf = NULL;
-            GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, ui32BindingPoint, &psContext->psShader->sInfo, &psCBuf);
-
-            if (psCBuf)
-            {
-                // Constant buffers declared as "dynamicIndexed" are declared as raw vec4 arrays, as there is no general way to retrieve the member corresponding to a dynamic index.
-                // Simple cases can probably be handled easily, but for example when arrays (possibly nested with structs) are contained in the constant buffer and the shader reads
-                // from a dynamic index we would need to "undo" the operations done in order to compute the variable offset, and such a feature is not available at the moment.
-                psCBuf->blob = psDecl->value.eCBAccessPattern == CONSTANT_BUFFER_ACCESS_PATTERN_DYNAMICINDEXED;
-            }
-
-            // We don't have a original resource name, maybe generate one???
-            if(!psCBuf)
-            {
-                if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-                    bformata(glsl, "layout(location = %d) ",ui32BindingPoint);
-                    
-                bformata(glsl, "layout(std140) uniform ConstantBuffer%d {\n\tvec4 data[%d];\n} cb%d;\n", ui32BindingPoint,psOperand->aui32ArraySizes[1],ui32BindingPoint);
-                break;
-            }
-            else if (psCBuf->blob)
-            {
-                bformata(glsl, "layout(std140) uniform %s%s {\n\tvec4 %s%s_data[%d];\n};\n", psCBuf->Name, StageName, psCBuf->Name, StageName, psOperand->aui32ArraySizes[1]);
-                break;
-            }
-
-            if(psContext->flags & HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT)
-            {
-                if(psContext->flags & HLSLCC_FLAG_GLOBAL_CONSTS_NEVER_IN_UBO && psCBuf->Name[0] == '$')
-                {
-                    DeclareStructConstants(psContext, ui32BindingPoint, psCBuf, psOperand, glsl);
-                }
-                else
-                {
-                    DeclareUBOConstants(psContext, ui32BindingPoint, psCBuf, glsl);
-                }
-            }
-            else
-            {
-                DeclareStructConstants(psContext, ui32BindingPoint, psCBuf, psOperand, glsl);
-            }
-            break;
-        }
-        case OPCODE_DCL_RESOURCE:
-        {
-            if (HaveUniformBindingsAndLocations(psContext->psShader->eTargetLanguage, psContext->psShader->extensions, psContext->flags))
-            {
-                // Explicit layout bindings are not currently compatible with combined texture samplers. The layout below assumes there is exactly one GLSL sampler
-                // for each HLSL texture declaration, but when combining textures+samplers, there can be multiple OGL samplers for each HLSL texture declaration.
-                if((psContext->flags & HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS) != HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS)
-                {      
-                    //Constant buffer locations start at 0. Resource locations start at ui32NumConstantBuffers.
-                    bformata(glsl, "layout(location = %d) ", 
-                        psContext->psShader->sInfo.ui32NumConstantBuffers + psDecl->asOperands[0].ui32RegisterNumber);
-                }
-            }
-
-            switch(psDecl->value.eResourceDimension)
-            {
-                case RESOURCE_DIMENSION_BUFFER:
-                {
-                    bformata(glsl, "uniform %s ", GetSamplerType(psContext,
-                        RESOURCE_DIMENSION_BUFFER,
-                        psDecl->asOperands[0].ui32RegisterNumber));
-                    TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-                    bcatcstr(glsl, ";\n");
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURE1D:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 1);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURE2D:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 1);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURE2DMS:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 0);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURE3D:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 0);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURECUBE:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 1);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 1);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 1);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 0);
-                    break;
-                }
-                case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-                {
-                    TranslateResourceTexture(psContext, psDecl, 1);
-                    break;
-                }
-            }
-            ASSERT(psDecl->asOperands[0].ui32RegisterNumber < MAX_TEXTURES);
-            psShader->aeResourceDims[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->value.eResourceDimension;
-            break;
-        }
-        case OPCODE_DCL_OUTPUT:
-        {
-            if(psShader->eShaderType == HULL_SHADER && psDecl->asOperands[0].ui32RegisterNumber==0)
-            {
-                AddBuiltinOutput(psContext, psDecl, GLVARTYPE_FLOAT4, 0, "gl_out[gl_InvocationID].gl_Position");
-            }
-            else
-            {
-                AddUserOutput(psContext, psDecl);
-            }
-            break;
-        }
-        case OPCODE_DCL_GLOBAL_FLAGS:
-        {
-            uint32_t ui32Flags = psDecl->value.ui32GlobalFlags;
-            
-            if(ui32Flags & GLOBAL_FLAG_FORCE_EARLY_DEPTH_STENCIL)
-            {
-                bcatcstr(glsl, "layout(early_fragment_tests) in;\n");
-            }
-            if(!(ui32Flags & GLOBAL_FLAG_REFACTORING_ALLOWED))
-            {
-                //TODO add precise
-                //HLSL precise - http://msdn.microsoft.com/en-us/library/windows/desktop/hh447204(v=vs.85).aspx
-            }
-            if(ui32Flags & GLOBAL_FLAG_ENABLE_DOUBLE_PRECISION_FLOAT_OPS)
-            {
-                bcatcstr(glsl, "#extension GL_ARB_gpu_shader_fp64 : enable\n");
-                psShader->fp64 = 1;
-            }
-            break;
-        }
-
-        case OPCODE_DCL_THREAD_GROUP:
-        {
-            bformata(glsl, "layout(local_size_x = %d, local_size_y = %d, local_size_z = %d) in;\n",
-                psDecl->value.aui32WorkGroupSize[0],
-                psDecl->value.aui32WorkGroupSize[1],
-                psDecl->value.aui32WorkGroupSize[2]);
-            break;
-        }
-        case OPCODE_DCL_TESS_OUTPUT_PRIMITIVE:
-        {
-            if(psContext->psShader->eShaderType == HULL_SHADER)
-            {
-                psContext->psShader->sInfo.eTessOutPrim = psDecl->value.eTessOutPrim;
-            }
-            break;
-        }
-        case OPCODE_DCL_TESS_DOMAIN:
-        {
-            if(psContext->psShader->eShaderType == DOMAIN_SHADER)
-            {
-                switch(psDecl->value.eTessDomain)
-                {
-                    case TESSELLATOR_DOMAIN_ISOLINE:
-                    {
-                        bcatcstr(glsl, "layout(isolines) in;\n");
-                        break;
-                    }
-                    case TESSELLATOR_DOMAIN_TRI:
-                    {
-                        bcatcstr(glsl, "layout(triangles) in;\n");
-                        break;
-                    }
-                    case TESSELLATOR_DOMAIN_QUAD:
-                    {
-                        bcatcstr(glsl, "layout(quads) in;\n");
-                        break;
-                    }
-                    default:
-                    {
-                        break;
-                    }
-                }
-            }
-            break;
-        }
-        case OPCODE_DCL_TESS_PARTITIONING:
-        {
-            if(psContext->psShader->eShaderType == HULL_SHADER)
-            {
-                psContext->psShader->sInfo.eTessPartitioning = psDecl->value.eTessPartitioning;
-            }
-            break;
-        }
-        case OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
-        {
-            switch(psDecl->value.eOutputPrimitiveTopology)
-            {
-                case PRIMITIVE_TOPOLOGY_POINTLIST:
-                {
-                    bcatcstr(glsl, "layout(points) out;\n");
-                    break;
-                }
-                case PRIMITIVE_TOPOLOGY_LINELIST_ADJ:
-                case PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ:
-                case PRIMITIVE_TOPOLOGY_LINELIST:
-                case PRIMITIVE_TOPOLOGY_LINESTRIP:
-                {
-                    bcatcstr(glsl, "layout(line_strip) out;\n");
-                    break;
-                }
-
-                case PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ:
-                case PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ:
-                case PRIMITIVE_TOPOLOGY_TRIANGLESTRIP:
-                case PRIMITIVE_TOPOLOGY_TRIANGLELIST:
-                {
-                    bcatcstr(glsl, "layout(triangle_strip) out;\n");
-                    break;
-                }
-                default:
-                {
-                    break;
-                }
-            }
-            break;
-        }
-        case OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
-        {
-            bformata(glsl, "layout(max_vertices = %d) out;\n", psDecl->value.ui32MaxOutputVertexCount);
-            break;
-        }
-        case OPCODE_DCL_GS_INPUT_PRIMITIVE:
-        {
-            switch(psDecl->value.eInputPrimitive)
-            {
-                case PRIMITIVE_POINT:
-                {
-                    bcatcstr(glsl, "layout(points) in;\n");
-                    break;
-                }
-                case PRIMITIVE_LINE:
-                {
-                    bcatcstr(glsl, "layout(lines) in;\n");
-                    break;
-                }
-                case PRIMITIVE_LINE_ADJ:
-                {
-                    bcatcstr(glsl, "layout(lines_adjacency) in;\n");
-                    break;
-                }
-                case PRIMITIVE_TRIANGLE:
-                {
-                    bcatcstr(glsl, "layout(triangles) in;\n");
-                    break;
-                }
-                case PRIMITIVE_TRIANGLE_ADJ:
-                {
-                    bcatcstr(glsl, "layout(triangles_adjacency) in;\n");
-                    break;
-                }
-                default:
-                {
-                    break;
-                }
-            }
-            break;
-        }
-        case OPCODE_DCL_INTERFACE:
-        {
-            const uint32_t interfaceID = psDecl->value.interface.ui32InterfaceID;
-            const uint32_t numUniforms = psDecl->value.interface.ui32ArraySize;
-            const uint32_t ui32NumBodiesPerTable = psContext->psShader->funcPointer[interfaceID].ui32NumBodiesPerTable;
-            ShaderVar* psVar;
-            uint32_t varFound;
-
-            const char* uniformName;
-            
-            varFound = GetInterfaceVarFromOffset(interfaceID, &psContext->psShader->sInfo, &psVar);
-            ASSERT(varFound);
-            uniformName = &psVar->Name[0];
-
-            bformata(glsl, "subroutine uniform SubroutineType %s[%d*%d];\n", uniformName, numUniforms, ui32NumBodiesPerTable);
-            break;
-        }
-        case OPCODE_DCL_FUNCTION_BODY:
-        {
-            //bformata(glsl, "void Func%d();//%d\n", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].eType);
-            break;
-        }
-        case OPCODE_DCL_FUNCTION_TABLE:
-        {
-            break;
-        }
-        case OPCODE_CUSTOMDATA:
-        {
-            const uint32_t ui32NumVec4 = psDecl->ui32NumOperands;
-            const uint32_t ui32NumVec4Minus1 = (ui32NumVec4-1);
-            uint32_t ui32ConstIndex = 0;
-            float x, y, z, w;
-
-            //If ShaderBitEncodingSupported then 1 integer buffer, use intBitsToFloat to get float values. - More instructions.
-            //else 2 buffers - one integer and one float. - More data
-
-            if(ShaderBitEncodingSupported(psShader->eTargetLanguage) == 0)
-            {
-                bcatcstr(glsl, "#define immediateConstBufferI(idx) immediateConstBufferInt[idx]\n");
-                bcatcstr(glsl, "#define immediateConstBufferF(idx) immediateConstBuffer[idx]\n");
-
-                bformata(glsl, "vec4 immediateConstBuffer[%d] = vec4[%d] (\n", ui32NumVec4, ui32NumVec4);
-                for(;ui32ConstIndex < ui32NumVec4Minus1; ui32ConstIndex++)
-                {
-                    float loopLocalX, loopLocalY, loopLocalZ, loopLocalW;
-                    loopLocalX = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-                    loopLocalY = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-                    loopLocalZ = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-                    loopLocalW = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-
-                    //A single vec4 can mix integer and float types.
-                    //Forced NAN and INF to zero inside the immediate constant buffer. This will allow the shader to compile.
-                    if(fpcheck(loopLocalX))
-                    {
-                        loopLocalX = 0;
-                    }
-                    if(fpcheck(loopLocalY))
-                    {
-                        loopLocalY = 0;
-                    }
-                    if(fpcheck(loopLocalZ))
-                    {
-                        loopLocalZ = 0;
-                    }
-                    if(fpcheck(loopLocalW))
-                    {
-                        loopLocalW = 0;
-                    }
-
-                    bformata(glsl, "\tvec4(%f, %f, %f, %f), \n", loopLocalX, loopLocalY, loopLocalZ, loopLocalW);
-                }
-                //No trailing comma on this one
-                x = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-                y = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-                z = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-                w = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-                if(fpcheck(x))
-                {
-                    x = 0;
-                }
-                if(fpcheck(y))
-                {
-                    y = 0;
-                }
-                if(fpcheck(z))
-                {
-                    z = 0;
-                }
-                if(fpcheck(w))
-                {
-                    w = 0;
-                }
-                bformata(glsl, "\tvec4(%f, %f, %f, %f)\n", x, y, z, w);
-                bcatcstr(glsl, ");\n");
-            }
-            else
-            {
-                bcatcstr(glsl, "#define immediateConstBufferI(idx) immediateConstBufferInt[idx]\n");
-                bcatcstr(glsl, "#define immediateConstBufferF(idx) intBitsToFloat(immediateConstBufferInt[idx])\n");
-            }
-
-            {
-                uint32_t ui32ConstIndex2 = 0;
-                int x2, y2, z2, w2;
-
-                bformata(glsl, "ivec4 immediateConstBufferInt[%d] = ivec4[%d] (\n", ui32NumVec4, ui32NumVec4);
-                for (; ui32ConstIndex2 < ui32NumVec4Minus1; ui32ConstIndex2++)
-                {
-                    int loopLocalX, loopLocalY, loopLocalZ, loopLocalW;
-                    loopLocalX = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].a;
-                    loopLocalY = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].b;
-                    loopLocalZ = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].c;
-                    loopLocalW = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].d;
-
-                    bformata(glsl, "\tivec4(%d, %d, %d, %d), \n", loopLocalX, loopLocalY, loopLocalZ, loopLocalW);
-                }
-                //No trailing comma on this one
-                x2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].a;
-                y2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].b;
-                z2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].c;
-                w2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].d;
-
-                bformata(glsl, "\tivec4(%d, %d, %d, %d)\n", x2, y2, z2, w2);
-                bcatcstr(glsl, ");\n");
-            }
-
-            break;
-        }
-        case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-        {
-            const uint32_t forkPhaseNum = psDecl->value.aui32HullPhaseInstanceInfo[0];
-            const uint32_t instanceCount = psDecl->value.aui32HullPhaseInstanceInfo[1];
-            bformata(glsl, "const int HullPhase%dInstanceCount = %d;\n", forkPhaseNum, instanceCount);
-            break;
-        }
-        case OPCODE_DCL_INDEXABLE_TEMP:
-        {
-            const uint32_t ui32RegIndex = psDecl->sIdxTemp.ui32RegIndex;
-            const uint32_t ui32RegCount = psDecl->sIdxTemp.ui32RegCount;
-            const uint32_t ui32RegComponentSize = psDecl->sIdxTemp.ui32RegComponentSize;
-            bformata(glsl, "vec%d TempArray%d[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-            bformata(glsl, "ivec%d TempArray%d_int[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-            if(HaveUVec(psShader->eTargetLanguage))
-            {
-                bformata(glsl, "uvec%d TempArray%d_uint[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-            }
-            if(psShader->fp64)
-            {
-                bformata(glsl, "dvec%d TempArray%d_double[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-            }
-            break;
-        }
-        case OPCODE_DCL_INDEX_RANGE:
-        {
-            break;
-        }
-        case OPCODE_HS_DECLS:
-        {
-            break;
-        }
-        case OPCODE_DCL_INPUT_CONTROL_POINT_COUNT:
-        {
-            break;
-        }
-        case OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT:
-        {
-            if(psContext->psShader->eShaderType == HULL_SHADER)
-            {
-                bformata(glsl, "layout(vertices=%d) out;\n", psDecl->value.ui32MaxOutputVertexCount);
-            }
-            break;
-        }
-        case OPCODE_HS_FORK_PHASE:
-        {
-            break;
-        }
-        case OPCODE_HS_JOIN_PHASE:
-        {
-            break;
-        }
-        case OPCODE_DCL_SAMPLER:
-        {
-            break;
-        }
-        case OPCODE_DCL_HS_MAX_TESSFACTOR:
-        {
-            //For GLSL the max tessellation factor is fixed to the value of gl_MaxTessGenLevel. 
-            break;
-        }
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-        {
-            // non-float images need either 'i' or 'u' prefix.
-            char imageTypePrefix[2] = { 0, 0 };
-            if(psDecl->sUAV.ui32GloballyCoherentAccess & GLOBALLY_COHERENT_ACCESS)
-            {
-                bcatcstr(glsl, "coherent ");
-            }
-
-            if(psShader->aiOpcodeUsed[OPCODE_LD_UAV_TYPED] == 0)
-            {
-                bcatcstr(glsl, "writeonly ");
-            }
-            else
-            {
-                if(psShader->aiOpcodeUsed[OPCODE_STORE_UAV_TYPED] == 0)
-                {
-                    bcatcstr(glsl, "readonly ");
-                }
-
-                switch(psDecl->sUAV.Type)
-                {
-                case RETURN_TYPE_FLOAT:
-                    bcatcstr(glsl, "layout(rgba32f) ");
-                    break;
-                case RETURN_TYPE_UNORM:
-                    bcatcstr(glsl, "layout(rgba8) ");
-                    break;
-                case RETURN_TYPE_SNORM:
-                    bcatcstr(glsl, "layout(rgba8_snorm) ");
-                    break;
-                case RETURN_TYPE_UINT:
-                    bcatcstr(glsl, "layout(rgba32ui) ");
-                    imageTypePrefix[0] = 'u';
-                    break;
-                case RETURN_TYPE_SINT:
-                    bcatcstr(glsl, "layout(rgba32i) ");
-                    imageTypePrefix[0] = 'i';
-                    break;
-                default:
-                    ASSERT(0);
-                }
-            }
-
-            switch(psDecl->value.eResourceDimension)
-            {
-            case RESOURCE_DIMENSION_BUFFER:
-            {
-                bformata(glsl, "uniform %simageBuffer ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE1D:
-            {
-                bformata(glsl, "uniform %simage1D ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2D:
-            {
-                bformata(glsl, "uniform %simage2D ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2DMS:
-            {
-                bformata(glsl, "uniform %simage2DMS ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE3D:
-            {
-                bformata(glsl, "uniform %simage3D ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURECUBE:
-            {
-                bformata(glsl, "uniform %simageCube ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-            {
-                bformata(glsl, "uniform %simage1DArray ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-            {
-                bformata(glsl, "uniform %simage2DArray ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-            {
-                bformata(glsl, "uniform %simage3DArray ", imageTypePrefix);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-            {
-                bformata(glsl, "uniform %simageCubeArray ", imageTypePrefix);
-                break;
-            }
-            }
-            TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-        {
-            const uint32_t ui32BindingPoint = psDecl->asOperands[0].aui32ArraySizes[0];
-            ConstantBuffer* psCBuf = NULL;
-
-            if(psDecl->sUAV.bCounter)
-            {
-                bformata(glsl, "layout (binding = 1) uniform atomic_uint ");
-                ResourceName(glsl, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-                bformata(glsl, "_counter; \n");
-            }
-
-            GetConstantBufferFromBindingPoint(RGROUP_UAV, ui32BindingPoint, &psContext->psShader->sInfo, &psCBuf);
-
-            DeclareBufferVariable(psContext, ui32BindingPoint, psCBuf, &psDecl->asOperands[0], 
-                psDecl->sUAV.ui32GloballyCoherentAccess, RTYPE_UAV_RWSTRUCTURED, glsl);
-            break;
-        }
-        case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-        {
-            if(psDecl->sUAV.bCounter)
-            {
-                bformata(glsl, "layout (binding = 1) uniform atomic_uint ");
-                ResourceName(glsl, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-                bformata(glsl, "_counter; \n");
-            }
-
-            bformata(glsl, "buffer Block%d {\n\tuint ", psDecl->asOperands[0].ui32RegisterNumber);
-            ResourceName(glsl, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-            bcatcstr(glsl, "[];\n};\n");
-
-            break;
-        }
-        case OPCODE_DCL_RESOURCE_STRUCTURED:
-        {
-            ConstantBuffer* psCBuf = NULL;
-
-            GetConstantBufferFromBindingPoint(RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-
-            DeclareBufferVariable(psContext, psDecl->asOperands[0].ui32RegisterNumber, psCBuf, &psDecl->asOperands[0], 
-                0, RTYPE_STRUCTURED, glsl);
-            break;
-        }
-        case OPCODE_DCL_RESOURCE_RAW:
-        {
-            bformata(glsl, "buffer Block%d {\n\tuint RawRes%d[];\n};\n", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber);
-            break;
-        }
-        case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED:
-        {
-            ShaderVarType* psVarType = &psShader->sGroupSharedVarType[psDecl->asOperands[0].ui32RegisterNumber];
-
-            ASSERT(psDecl->asOperands[0].ui32RegisterNumber < MAX_GROUPSHARED);
-
-            bcatcstr(glsl, "shared struct {\n");
-                bformata(glsl, "uint value[%d];\n", psDecl->sTGSM.ui32Stride/4);
-            bcatcstr(glsl, "} ");
-            TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-            bformata(glsl, "[%d];\n",
-                psDecl->sTGSM.ui32Count);
-
-            memset(psVarType, 0, sizeof(ShaderVarType));
-            strcpy(psVarType->Name, "$Element");
-
-            psVarType->Columns = psDecl->sTGSM.ui32Stride/4;
-            psVarType->Elements = psDecl->sTGSM.ui32Count;
-            break;
-        }
-        case OPCODE_DCL_STREAM:
-        {
-            ASSERT(psDecl->asOperands[0].eType == OPERAND_TYPE_STREAM);
-
-            psShader->ui32CurrentVertexOutputStream = psDecl->asOperands[0].ui32RegisterNumber;
-            
-            bformata(glsl, "layout(stream = %d) out;\n", psShader->ui32CurrentVertexOutputStream);
-            
-            break;
-        }
-        case OPCODE_DCL_GS_INSTANCE_COUNT:
-        {            
-            bformata(glsl, "layout(invocations = %d) in;\n", psDecl->value.ui32GSInstanceCount);
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-}
-
-//Convert from per-phase temps to global temps for GLSL.
-void ConsolidateHullTempVars(ShaderData* psShader)
-{
-    uint32_t i, k;
-    uint32_t ui32Phase, ui32Instance;
-    const uint32_t ui32NumDeclLists = psShader->asPhase[HS_FORK_PHASE].ui32InstanceCount +
-        psShader->asPhase[HS_CTRL_POINT_PHASE].ui32InstanceCount +
-        psShader->asPhase[HS_JOIN_PHASE].ui32InstanceCount +
-        psShader->asPhase[HS_GLOBAL_DECL].ui32InstanceCount;
-
-    Declaration** pasDeclArray = hlslcc_malloc(sizeof(Declaration*) * ui32NumDeclLists);
-
-    uint32_t* pui32DeclCounts = hlslcc_malloc(sizeof(uint32_t) * ui32NumDeclLists);
-    uint32_t ui32NumTemps = 0;
-
-    i=0;
-    for(ui32Phase = HS_GLOBAL_DECL; ui32Phase < NUM_PHASES; ui32Phase++)
-    {
-        for(ui32Instance = 0; ui32Instance < psShader->asPhase[ui32Phase].ui32InstanceCount; ++ui32Instance)
-        {
-            pasDeclArray[i] = psShader->asPhase[ui32Phase].ppsDecl[ui32Instance];
-            pui32DeclCounts[i++] = psShader->asPhase[ui32Phase].pui32DeclCount[ui32Instance];
-        }
-    }
-
-    for(k = 0; k < ui32NumDeclLists; ++k)
-    {
-        for(i=0; i < pui32DeclCounts[k]; ++i)
-        {
-            Declaration* psDecl = pasDeclArray[k]+i;
- 
-            if(psDecl->eOpcode == OPCODE_DCL_TEMPS)
-            {
-                if(ui32NumTemps < psDecl->value.ui32NumTemps)
-                {
-                    //Find the total max number of temps needed by the entire
-                    //shader.
-                    ui32NumTemps = psDecl->value.ui32NumTemps;
-                }
-                //Only want one global temp declaration.
-                psDecl->value.ui32NumTemps = 0;
-            }
-        }
-    }
-
-    //Find the first temp declaration and make it
-    //declare the max needed amount of temps.
-    for(k = 0; k < ui32NumDeclLists; ++k)
-    {
-        for(i=0; i < pui32DeclCounts[k]; ++i)
-        {
-            Declaration* psDecl = pasDeclArray[k]+i;
- 
-            if(psDecl->eOpcode == OPCODE_DCL_TEMPS)
-            {
-                psDecl->value.ui32NumTemps = ui32NumTemps;
-                return;
-            }
-        }
-    }
-
-    hlslcc_free(pasDeclArray);
-    hlslcc_free(pui32DeclCounts);
-}
-
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLInstruction.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLInstruction.c
deleted file mode 100644
index cb72838092..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLInstruction.c
+++ /dev/null
@@ -1,4576 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/toGLSLInstruction.h"
-#include <stdlib.h>
-#include "bstrlib.h"
-#include "hlslcc.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/languages.h"
-#include "internal_includes/toGLSLOperand.h"
-#include "stdio.h"
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-static int GLSLIsIntegerImmediateOpcode(OPCODE_TYPE eOpcode);
-
-// Calculate the bits set in mask
-static int GLSLWriteMaskToComponentCount(uint32_t writeMask)
-{
-    uint32_t count;
-    // In HLSL bytecode writemask 0 also means everything
-    if (writeMask == 0)
-        return 4;
-
-    // Count bits set
-    // https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSet64
-    count = (writeMask * 0x200040008001ULL & 0x111111111111111ULL) % 0xf;
-
-    return (int)count;
-}
-
-static uint32_t GLSLBuildComponentMaskFromElementCount(int count)
-{
-    // Translate numComponents into bitmask
-    // 1 -> 1, 2 -> 3, 3 -> 7 and 4 -> 15
-    return (1 << count) - 1;
-}
-
-// This function prints out the destination name, possible destination writemask, assignment operator
-// and any possible conversions needed based on the eSrcType+ui32SrcElementCount (type and size of data expected to be coming in)
-// As an output, pNeedsParenthesis will be filled with the amount of closing parenthesis needed
-// and pSrcCount will be filled with the number of components expected
-// ui32CompMask can be used to only write to 1 or more components (used by MOVC)
-static void GLSLAddOpAssignToDestWithMask(HLSLCrossCompilerContext* psContext,
-                                          const Operand* psDest,
-                                          SHADER_VARIABLE_TYPE eSrcType,
-                                          uint32_t ui32SrcElementCount,
-                                          const char* szAssignmentOp,
-                                          int* pNeedsParenthesis,
-                                          uint32_t ui32CompMask)
-{
-    uint32_t ui32DestElementCount = GetNumSwizzleElementsWithMask(psDest, ui32CompMask);
-    bstring glsl = *psContext->currentShaderString;
-    SHADER_VARIABLE_TYPE eDestDataType = GetOperandDataType(psContext, psDest);
-    ASSERT(pNeedsParenthesis != NULL);
-
-    *pNeedsParenthesis = 0;
-
-    TranslateOperandWithMask(psContext, psDest, TO_FLAG_DESTINATION, ui32CompMask);
-
-    // Simple path: types match.
-    if (eDestDataType == eSrcType)
-    {
-        // Cover cases where the HLSL language expects the rest of the components to be default-filled
-        // eg. MOV r0, c0.x => Temp[0] = vec4(c0.x);
-        if (ui32DestElementCount > ui32SrcElementCount)
-        {
-            bformata(glsl, " %s %s(", szAssignmentOp, GetConstructorForType(eDestDataType, ui32DestElementCount));
-            *pNeedsParenthesis = 1;
-        }
-        else
-            bformata(glsl, " %s ", szAssignmentOp);
-        return;
-    }
-
-    switch (eDestDataType)
-    {
-        case SVT_INT:
-            if (eSrcType == SVT_FLOAT && psContext->psShader->ui32MajorVersion > 3)
-            {
-                bformata(glsl, " %s floatBitsToInt(", szAssignmentOp);
-                // Cover cases where the HLSL language expects the rest of the components to be default-filled
-                if (ui32DestElementCount > ui32SrcElementCount)
-                {
-                    bformata(glsl, "%s(", GetConstructorForType(eSrcType, ui32DestElementCount));
-                    (*pNeedsParenthesis)++;
-                }
-            }
-            else
-                bformata(glsl, " %s %s(", szAssignmentOp, GetConstructorForType(eDestDataType, ui32DestElementCount));
-            break;
-        case SVT_UINT:
-            if (eSrcType == SVT_FLOAT && psContext->psShader->ui32MajorVersion > 3)
-            {
-                bformata(glsl, " %s floatBitsToUint(", szAssignmentOp);
-                // Cover cases where the HLSL language expects the rest of the components to be default-filled
-                if (ui32DestElementCount > ui32SrcElementCount)
-                {
-                    bformata(glsl, "%s(", GetConstructorForType(eSrcType, ui32DestElementCount));
-                    (*pNeedsParenthesis)++;
-                }
-            }
-            else
-                bformata(glsl, " %s %s(", szAssignmentOp, GetConstructorForType(eDestDataType, ui32DestElementCount));
-            break;
-
-        case SVT_FLOAT:
-            if (psContext->psShader->ui32MajorVersion > 3)
-            {
-                if (eSrcType == SVT_INT)
-                    bformata(glsl, " %s intBitsToFloat(", szAssignmentOp);
-                else
-                    bformata(glsl, " %s uintBitsToFloat(", szAssignmentOp);
-                // Cover cases where the HLSL language expects the rest of the components to be default-filled
-                if (ui32DestElementCount > ui32SrcElementCount)
-                {
-                    bformata(glsl, "%s(", GetConstructorForType(eSrcType, ui32DestElementCount));
-                    (*pNeedsParenthesis)++;
-                }
-            }
-            else
-                bformata(glsl, " %s %s(", szAssignmentOp, GetConstructorForType(eDestDataType, ui32DestElementCount));
-            break;
-        default:
-            // TODO: Handle bools?
-            break;
-    }
-    (*pNeedsParenthesis)++;
-    return;
-}
-
-static void GLSLMETALAddAssignToDest(HLSLCrossCompilerContext* psContext,
-                                     const Operand* psDest,
-                                     SHADER_VARIABLE_TYPE eSrcType,
-                                     uint32_t ui32SrcElementCount,
-                                     int* pNeedsParenthesis)
-{
-    GLSLAddOpAssignToDestWithMask(psContext, psDest, eSrcType, ui32SrcElementCount, "=", pNeedsParenthesis, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-static void GLSLAddAssignPrologue(HLSLCrossCompilerContext* psContext, int numParenthesis)
-{
-    bstring glsl = *psContext->currentShaderString;
-    while (numParenthesis != 0)
-    {
-        bcatcstr(glsl, ")");
-        numParenthesis--;
-    }
-    bcatcstr(glsl, ";\n");
-}
-static uint32_t GLSLResourceReturnTypeToFlag(const RESOURCE_RETURN_TYPE eType)
-{
-    if (eType == RETURN_TYPE_SINT)
-    {
-        return TO_FLAG_INTEGER;
-    }
-    else if (eType == RETURN_TYPE_UINT)
-    {
-        return TO_FLAG_UNSIGNED_INTEGER;
-    }
-    else
-    {
-        return TO_FLAG_NONE;
-    }
-}
-
-typedef enum
-{
-    GLSL_CMP_EQ,
-    GLSL_CMP_LT,
-    GLSL_CMP_GE,
-    GLSL_CMP_NE,
-} GLSLComparisonType;
-
-static void GLSLAddComparision(HLSLCrossCompilerContext* psContext, Instruction* psInst, GLSLComparisonType eType, uint32_t typeFlag, Instruction* psNextInst)
-{
-    // Multiple cases to consider here:
-    // For shader model <=3: all comparisons are floats
-    // otherwise:
-    // OPCODE_LT, _GT, _NE etc: inputs are floats, outputs UINT 0xffffffff or 0. typeflag: TO_FLAG_NONE
-    // OPCODE_ILT, _IGT etc: comparisons are signed ints, outputs UINT 0xffffffff or 0 typeflag TO_FLAG_INTEGER
-    // _ULT, UGT etc: inputs unsigned ints, outputs UINTs typeflag TO_FLAG_UNSIGNED_INTEGER
-    //
-    // Additional complexity: if dest swizzle element count is 1, we can use normal comparison operators, otherwise glsl intrinsics.
-
-    bstring glsl = *psContext->currentShaderString;
-    const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-    const uint32_t s0ElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-    const uint32_t s1ElemCount = GetNumSwizzleElements(&psInst->asOperands[2]);
-
-    int floatResult = 0;
-    int needsParenthesis = 0;
-
-    ASSERT(s0ElemCount == s1ElemCount || s1ElemCount == 1 || s0ElemCount == 1);
-    if (s0ElemCount != s1ElemCount)
-    {
-        // Set the proper auto-expand flag is either argument is scalar
-        typeFlag |= (TO_AUTO_EXPAND_TO_VEC2 << (max(s0ElemCount, s1ElemCount) - 2));
-    }
-
-    if (psContext->psShader->ui32MajorVersion < 4)
-    {
-        floatResult = 1;
-    }
-
-    if (destElemCount > 1)
-    {
-        const char* glslOpcode[] = {
-            "equal",
-            "lessThan",
-            "greaterThanEqual",
-            "notEqual",
-        };
-
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], floatResult ? SVT_FLOAT : SVT_UINT, destElemCount, &needsParenthesis);
-
-        bcatcstr(glsl, GetConstructorForType(floatResult ? SVT_FLOAT : SVT_UINT, destElemCount));
-        bformata(glsl, "(%s(", glslOpcode[eType]);
-        TranslateOperand(psContext, &psInst->asOperands[1], typeFlag);
-        bcatcstr(glsl, ", ");
-        TranslateOperand(psContext, &psInst->asOperands[2], typeFlag);
-        bcatcstr(glsl, "))");
-        if (!floatResult)
-        {
-            bcatcstr(glsl, " * 0xFFFFFFFFu");
-        }
-
-        GLSLAddAssignPrologue(psContext, needsParenthesis);
-    }
-    else
-    {
-        const char* glslOpcode[] = {
-            "==",
-            "<",
-            ">=",
-            "!=",
-        };
-
-        // Scalar compare
-
-        // Optimization shortcut for the IGE+BREAKC_NZ combo:
-        // First print out the if(cond)->break directly, and then
-        // to guarantee correctness with side-effects, re-run
-        // the actual comparison. In most cases, the second run will
-        // be removed by the shader compiler optimizer pass (dead code elimination)
-        // This also makes it easier for some GLSL optimizers to recognize the for loop.
-
-        if (psInst->eOpcode == OPCODE_IGE && psNextInst && psNextInst->eOpcode == OPCODE_BREAKC &&
-            (psInst->asOperands[0].ui32RegisterNumber == psNextInst->asOperands[0].ui32RegisterNumber))
-        {
-            AddIndentation(psContext);
-            bcatcstr(glsl, "// IGE+BREAKC opt\n");
-            AddIndentation(psContext);
-
-            if (psNextInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO)
-                bcatcstr(glsl, "if ((");
-            else
-                bcatcstr(glsl, "if (!(");
-            TranslateOperand(psContext, &psInst->asOperands[1], typeFlag);
-            bformata(glsl, "%s ", glslOpcode[eType]);
-            TranslateOperand(psContext, &psInst->asOperands[2], typeFlag);
-            bcatcstr(glsl, ")) { break; }\n");
-
-            // Mark the BREAKC instruction as already handled
-            psNextInst->eOpcode = OPCODE_NOP;
-
-            // Continue as usual
-        }
-
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], floatResult ? SVT_FLOAT : SVT_UINT, destElemCount, &needsParenthesis);
-
-        bcatcstr(glsl, "(");
-        TranslateOperand(psContext, &psInst->asOperands[1], typeFlag);
-        bformata(glsl, "%s", glslOpcode[eType]);
-        TranslateOperand(psContext, &psInst->asOperands[2], typeFlag);
-        if (floatResult)
-        {
-            bcatcstr(glsl, ") ? 1.0 : 0.0");
-        }
-        else
-        {
-            bcatcstr(glsl, ") ? 0xFFFFFFFFu : 0u");
-        }
-        GLSLAddAssignPrologue(psContext, needsParenthesis);
-    }
-}
-
-static void GLSLAddMOVBinaryOp(HLSLCrossCompilerContext* psContext, const Operand* pDest, Operand* pSrc)
-{
-    int numParenthesis = 0;
-    int srcSwizzleCount = GetNumSwizzleElements(pSrc);
-    uint32_t writeMask = GetOperandWriteMask(pDest);
-
-    const SHADER_VARIABLE_TYPE eSrcType = GetOperandDataTypeEx(psContext, pSrc, GetOperandDataType(psContext, pDest));
-    uint32_t flags = SVTTypeToFlag(eSrcType);
-
-    GLSLMETALAddAssignToDest(psContext, pDest, eSrcType, srcSwizzleCount, &numParenthesis);
-    TranslateOperandWithMask(psContext, pSrc, flags, writeMask);
-
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static uint32_t GLSLElemCountToAutoExpandFlag(uint32_t elemCount)
-{
-    return TO_AUTO_EXPAND_TO_VEC2 << (elemCount - 2);
-}
-
-static void GLSLAddMOVCBinaryOp(HLSLCrossCompilerContext* psContext, const Operand* pDest, const Operand* src0, Operand* src1, Operand* src2)
-{
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t destElemCount = GetNumSwizzleElements(pDest);
-    uint32_t s0ElemCount = GetNumSwizzleElements(src0);
-    uint32_t s1ElemCount = GetNumSwizzleElements(src1);
-    uint32_t s2ElemCount = GetNumSwizzleElements(src2);
-    uint32_t destWriteMask = GetOperandWriteMask(pDest);
-    uint32_t destElem;
-
-    const SHADER_VARIABLE_TYPE eDestType = GetOperandDataType(psContext, pDest);
-    /*
-    for each component in dest[.mask]
-    if the corresponding component in src0 (POS-swizzle)
-    has any bit set
-    {
-    copy this component (POS-swizzle) from src1 into dest
-    }
-    else
-    {
-    copy this component (POS-swizzle) from src2 into dest
-    }
-    endfor
-    */
-
-    /* Single-component conditional variable (src0) */
-    if (s0ElemCount == 1 || IsSwizzleReplicated(src0))
-    {
-        int numParenthesis = 0;
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, pDest, eDestType, destElemCount, &numParenthesis);
-        bcatcstr(glsl, "(");
-        TranslateOperand(psContext, src0, TO_AUTO_BITCAST_TO_INT);
-        if (s0ElemCount > 1)
-            bcatcstr(glsl, ".x");
-        if (psContext->psShader->ui32MajorVersion < 4)
-        {
-            // cmp opcode uses >= 0
-            bcatcstr(glsl, " >= 0) ? ");
-        }
-        else
-        {
-            bcatcstr(glsl, " != 0) ? ");
-        }
-
-        if (s1ElemCount == 1 && destElemCount > 1)
-            TranslateOperand(psContext, src1, SVTTypeToFlag(eDestType) | GLSLElemCountToAutoExpandFlag(destElemCount));
-        else
-            TranslateOperandWithMask(psContext, src1, SVTTypeToFlag(eDestType), destWriteMask);
-
-        bcatcstr(glsl, " : ");
-        if (s2ElemCount == 1 && destElemCount > 1)
-            TranslateOperand(psContext, src2, SVTTypeToFlag(eDestType) | GLSLElemCountToAutoExpandFlag(destElemCount));
-        else
-            TranslateOperandWithMask(psContext, src2, SVTTypeToFlag(eDestType), destWriteMask);
-
-        GLSLAddAssignPrologue(psContext, numParenthesis);
-    }
-    else
-    {
-        // TODO: We can actually do this in one op using mix().
-        int srcElem = 0;
-        for (destElem = 0; destElem < 4; ++destElem)
-        {
-            int numParenthesis = 0;
-            if (pDest->eSelMode == OPERAND_4_COMPONENT_MASK_MODE && pDest->ui32CompMask != 0 && !(pDest->ui32CompMask & (1 << destElem)))
-                continue;
-
-            AddIndentation(psContext);
-            GLSLAddOpAssignToDestWithMask(psContext, pDest, eDestType, 1, "=", &numParenthesis, 1 << destElem);
-            bcatcstr(glsl, "(");
-            TranslateOperandWithMask(psContext, src0, TO_AUTO_BITCAST_TO_INT, 1 << srcElem);
-            if (psContext->psShader->ui32MajorVersion < 4)
-            {
-                // cmp opcode uses >= 0
-                bcatcstr(glsl, " >= 0) ? ");
-            }
-            else
-            {
-                bcatcstr(glsl, " != 0) ? ");
-            }
-
-            TranslateOperandWithMask(psContext, src1, SVTTypeToFlag(eDestType), 1 << srcElem);
-            bcatcstr(glsl, " : ");
-            TranslateOperandWithMask(psContext, src2, SVTTypeToFlag(eDestType), 1 << srcElem);
-
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-
-            srcElem++;
-        }
-    }
-}
-
-// Returns nonzero if operands are identical, only cares about temp registers currently.
-static int GLSLAreTempOperandsIdentical(const Operand* psA, const Operand* psB)
-{
-    if (!psA || !psB)
-        return 0;
-
-    if (psA->eType != OPERAND_TYPE_TEMP || psB->eType != OPERAND_TYPE_TEMP)
-        return 0;
-
-    if (psA->eModifier != psB->eModifier)
-        return 0;
-
-    if (psA->iNumComponents != psB->iNumComponents)
-        return 0;
-
-    if (psA->ui32RegisterNumber != psB->ui32RegisterNumber)
-        return 0;
-
-    if (psA->eSelMode != psB->eSelMode)
-        return 0;
-
-    if (psA->eSelMode == OPERAND_4_COMPONENT_MASK_MODE && psA->ui32CompMask != psB->ui32CompMask)
-        return 0;
-
-    if (psA->eSelMode != OPERAND_4_COMPONENT_MASK_MODE && psA->ui32Swizzle != psB->ui32Swizzle)
-        return 0;
-
-    return 1;
-}
-
-// Returns nonzero if the operation is commutative
-static int GLSLIsOperationCommutative(OPCODE_TYPE eOpCode)
-{
-    switch (eOpCode)
-    {
-        case OPCODE_DADD:
-        case OPCODE_IADD:
-        case OPCODE_ADD:
-        case OPCODE_MUL:
-        case OPCODE_IMUL:
-        case OPCODE_OR:
-        case OPCODE_AND:
-            return 1;
-        default:
-            return 0;
-    };
-}
-
-static void
-GLSLCallBinaryOp(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst, int dest, int src0, int src1, SHADER_VARIABLE_TYPE eDataType)
-{
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t src1SwizCount = GetNumSwizzleElements(&psInst->asOperands[src1]);
-    uint32_t src0SwizCount = GetNumSwizzleElements(&psInst->asOperands[src0]);
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-    uint32_t destMask = GetOperandWriteMask(&psInst->asOperands[dest]);
-    int needsParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    if (src1SwizCount == src0SwizCount == dstSwizCount)
-    {
-        // Optimization for readability (and to make for loops in WebGL happy): detect cases where either src == dest and emit +=, -= etc. instead.
-        if (GLSLAreTempOperandsIdentical(&psInst->asOperands[dest], &psInst->asOperands[src0]) != 0)
-        {
-            GLSLAddOpAssignToDestWithMask(psContext, &psInst->asOperands[dest], eDataType, dstSwizCount, name, &needsParenthesis, OPERAND_4_COMPONENT_MASK_ALL);
-            TranslateOperand(psContext, &psInst->asOperands[src1], SVTTypeToFlag(eDataType));
-            GLSLAddAssignPrologue(psContext, needsParenthesis);
-            return;
-        }
-        else if (GLSLAreTempOperandsIdentical(&psInst->asOperands[dest], &psInst->asOperands[src1]) != 0 && (GLSLIsOperationCommutative(psInst->eOpcode) != 0))
-        {
-            GLSLAddOpAssignToDestWithMask(psContext, &psInst->asOperands[dest], eDataType, dstSwizCount, name, &needsParenthesis, OPERAND_4_COMPONENT_MASK_ALL);
-            TranslateOperand(psContext, &psInst->asOperands[src0], SVTTypeToFlag(eDataType));
-            GLSLAddAssignPrologue(psContext, needsParenthesis);
-            return;
-        }
-    }
-
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], eDataType, dstSwizCount, &needsParenthesis);
-
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], SVTTypeToFlag(eDataType), destMask);
-    bformata(glsl, " %s ", name);
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src1], SVTTypeToFlag(eDataType), destMask);
-    GLSLAddAssignPrologue(psContext, needsParenthesis);
-}
-
-static void GLSLCallTernaryOp(HLSLCrossCompilerContext* psContext,
-                              const char* op1,
-                              const char* op2,
-                              Instruction* psInst,
-                              int dest,
-                              int src0,
-                              int src1,
-                              int src2,
-                              uint32_t dataType)
-{
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-    uint32_t destMask = GetOperandWriteMask(&psInst->asOperands[dest]);
-
-    uint32_t ui32Flags = dataType;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], TypeFlagsToSVTType(dataType), dstSwizCount, &numParenthesis);
-
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bformata(glsl, " %s ", op1);
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    bformata(glsl, " %s ", op2);
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src2], ui32Flags, destMask);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void GLSLCallHelper3(HLSLCrossCompilerContext* psContext,
-                            const char* name,
-                            Instruction* psInst,
-                            int dest,
-                            int src0,
-                            int src1,
-                            int src2,
-                            int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_FLOAT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMask(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_FLOAT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src2], ui32Flags, destMask);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void
-GLSLCallHelper2(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst, int dest, int src0, int src1, int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_FLOAT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMask(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-
-    int isDotProduct = (strncmp(name, "dot", 3) == 0) ? 1 : 0;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_FLOAT, isDotProduct ? 1 : dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void
-GLSLCallHelper2Int(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst, int dest, int src0, int src1, int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_INT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMask(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_INT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void
-GLSLCallHelper2UInt(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst, int dest, int src0, int src1, int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_UINT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMask(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_UINT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void GLSLCallHelper1(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst, int dest, int src0, int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_FLOAT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMask(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_FLOAT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-// Result is an int.
-static void GLSLCallHelper1Int(HLSLCrossCompilerContext* psContext,
-                               const char* name,
-                               Instruction* psInst,
-                               const int dest,
-                               const int src0,
-                               int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_INT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMask(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_INT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void GLSLTranslateTexelFetch(HLSLCrossCompilerContext* psContext, Instruction* psInst, ResourceBinding* psBinding, bstring glsl)
-{
-    int numParenthesis = 0;
-    uint32_t destCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-    AddIndentation(psContext);
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], TypeFlagsToSVTType(GLSLResourceReturnTypeToFlag(psBinding->ui32ReturnType)), 4,
-                             &numParenthesis);
-    bcatcstr(glsl, "texelFetch(");
-
-    switch (psBinding->eDimension)
-    {
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-        case REFLECT_RESOURCE_DIMENSION_BUFFER:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            if (psBinding->eDimension != REFLECT_RESOURCE_DIMENSION_BUFFER)
-                bcatcstr(glsl, ", 0");  // Buffers don't have LOD
-            bcatcstr(glsl, ")");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC3, 7 /* .xyz */);
-            bcatcstr(glsl, ", 0)");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC2, 3 /* .xy */);
-            bcatcstr(glsl, ", 0)");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:  // TODO does this make any sense at all?
-        {
-            ASSERT(psInst->eOpcode == OPCODE_LD_MS);
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC2, 3 /* .xy */);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[3], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            bcatcstr(glsl, ")");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-        {
-            ASSERT(psInst->eOpcode == OPCODE_LD_MS);
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC3, 7 /* .xyz */);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[3], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            bcatcstr(glsl, ")");
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        case REFLECT_RESOURCE_DIMENSION_BUFFEREX:
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    AddSwizzleUsingElementCount(psContext, destCount);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void GLSLTranslateTexelFetchOffset(HLSLCrossCompilerContext* psContext, Instruction* psInst, ResourceBinding* psBinding, bstring glsl)
-{
-    int numParenthesis = 0;
-    uint32_t destCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-    AddIndentation(psContext);
-    GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], TypeFlagsToSVTType(GLSLResourceReturnTypeToFlag(psBinding->ui32ReturnType)), 4,
-                             &numParenthesis);
-
-    bcatcstr(glsl, "texelFetchOffset(");
-
-    switch (psBinding->eDimension)
-    {
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            bformata(glsl, ", 0, %d)", psInst->iUAddrOffset);
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC3, 7 /* .xyz */);
-            bformata(glsl, ", 0, ivec2(%d, %d))", psInst->iUAddrOffset, psInst->iVAddrOffset);
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC3, 7 /* .xyz */);
-            bformata(glsl, ", 0, ivec3(%d, %d, %d))", psInst->iUAddrOffset, psInst->iVAddrOffset, psInst->iWAddrOffset);
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC2, 3 /* .xy */);
-            bformata(glsl, ", 0, ivec2(%d, %d))", psInst->iUAddrOffset, psInst->iVAddrOffset);
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        {
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC2, 3 /* .xy */);
-            bformata(glsl, ", 0, int(%d))", psInst->iUAddrOffset);
-            break;
-        }
-        case REFLECT_RESOURCE_DIMENSION_BUFFER:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-        case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        case REFLECT_RESOURCE_DIMENSION_BUFFEREX:
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    AddSwizzleUsingElementCount(psContext, destCount);
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-// Makes sure the texture coordinate swizzle is appropriate for the texture type.
-// i.e. vecX for X-dimension texture.
-// Currently supports floating point coord only, so not used for texelFetch.
-static void GLSLTranslateTexCoord(HLSLCrossCompilerContext* psContext, const RESOURCE_DIMENSION eResDim, Operand* psTexCoordOperand)
-{
-    uint32_t flags = TO_AUTO_BITCAST_TO_FLOAT;
-    uint32_t opMask = OPERAND_4_COMPONENT_MASK_ALL;
-
-    switch (eResDim)
-    {
-        case RESOURCE_DIMENSION_TEXTURE1D:
-        {
-            // Vec1 texcoord. Mask out the other components.
-            opMask = OPERAND_4_COMPONENT_MASK_X;
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2D:
-        case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        {
-            // Vec2 texcoord. Mask out the other components.
-            opMask = OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y;
-            flags |= TO_AUTO_EXPAND_TO_VEC2;
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURECUBE:
-        case RESOURCE_DIMENSION_TEXTURE3D:
-        case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        {
-            // Vec3 texcoord. Mask out the other components.
-            opMask = OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z;
-            flags |= TO_AUTO_EXPAND_TO_VEC3;
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        {
-            flags |= TO_AUTO_EXPAND_TO_VEC4;
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    // FIXME detect when integer coords are needed.
-    TranslateOperandWithMask(psContext, psTexCoordOperand, flags, opMask);
-}
-
-static int GLSLGetNumTextureDimensions(HLSLCrossCompilerContext* psContext, const RESOURCE_DIMENSION eResDim)
-{
-    (void)psContext;
-    switch (eResDim)
-    {
-        case RESOURCE_DIMENSION_TEXTURE1D:
-        {
-            return 1;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2D:
-        case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        case RESOURCE_DIMENSION_TEXTURECUBE:
-        {
-            return 2;
-        }
-
-        case RESOURCE_DIMENSION_TEXTURE3D:
-        case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        {
-            return 3;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-    return 0;
-}
-
-void GetResInfoData(HLSLCrossCompilerContext* psContext, Instruction* psInst, int index, int destElem)
-{
-    bstring glsl = *psContext->currentShaderString;
-    int numParenthesis = 0;
-    const RESINFO_RETURN_TYPE eResInfoReturnType = psInst->eResInfoReturnType;
-    const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-
-    AddIndentation(psContext);
-    GLSLAddOpAssignToDestWithMask(psContext, &psInst->asOperands[0], eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT ? SVT_UINT : SVT_FLOAT, 1, "=",
-                                  &numParenthesis, 1 << destElem);
-
-    //[width, height, depth or array size, total-mip-count]
-    if (index < 3)
-    {
-        int dim = GLSLGetNumTextureDimensions(psContext, eResDim);
-        bcatcstr(glsl, "(");
-        if (dim < (index + 1))
-        {
-            bcatcstr(glsl, eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT ? "0u" : "0.0");
-        }
-        else
-        {
-            if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT)
-            {
-                bformata(glsl, "uvec%d(textureSize(", dim);
-            }
-            else if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_RCPFLOAT)
-            {
-                bformata(glsl, "vec%d(1.0) / vec%d(textureSize(", dim, dim);
-            }
-            else
-            {
-                bformata(glsl, "vec%d(textureSize(", dim);
-            }
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, "))");
-
-            switch (index)
-            {
-                case 0:
-                    bcatcstr(glsl, ".x");
-                    break;
-                case 1:
-                    bcatcstr(glsl, ".y");
-                    break;
-                case 2:
-                    bcatcstr(glsl, ".z");
-                    break;
-            }
-        }
-
-        bcatcstr(glsl, ")");
-    }
-    else
-    {
-        if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT)
-            bcatcstr(glsl, "uint(");
-        else
-            bcatcstr(glsl, "float(");
-        bcatcstr(glsl, "textureQueryLevels(");
-        TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(glsl, "))");
-    }
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-#define TEXSMP_FLAG_NONE 0x0
-#define TEXSMP_FLAG_LOD 0x1  // LOD comes from operand
-#define TEXSMP_FLAG_DEPTHCOMPARE 0x2
-#define TEXSMP_FLAG_FIRSTLOD 0x4  // LOD is 0
-#define TEXSMP_FLAG_BIAS 0x8
-#define TEXSMP_FLAGS_GRAD 0x10
-
-// TODO FIXME: non-float samplers!
-static void GLSLTranslateTextureSample(HLSLCrossCompilerContext* psContext, Instruction* psInst, uint32_t ui32Flags)
-{
-    bstring glsl = *psContext->currentShaderString;
-    int numParenthesis = 0;
-
-    const char* funcName = "texture";
-    const char* offset = "";
-    const char* depthCmpCoordType = "";
-    const char* gradSwizzle = "";
-
-    uint32_t ui32NumOffsets = 0;
-
-    const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-
-    const int iHaveOverloadedTexFuncs = HaveOverloadedTextureFuncs(psContext->psShader->eTargetLanguage);
-
-    const int useCombinedTextureSamplers = (psContext->flags & HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS) ? 1 : 0;
-
-    ASSERT(psInst->asOperands[2].ui32RegisterNumber < MAX_TEXTURES);
-
-    if (psInst->bAddressOffset)
-    {
-        offset = "Offset";
-    }
-
-    switch (eResDim)
-    {
-        case RESOURCE_DIMENSION_TEXTURE1D:
-        {
-            depthCmpCoordType = "vec2";
-            gradSwizzle = ".x";
-            ui32NumOffsets = 1;
-            if (!iHaveOverloadedTexFuncs)
-            {
-                funcName = "texture1D";
-                if (ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE)
-                {
-                    funcName = "shadow1D";
-                }
-            }
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2D:
-        {
-            depthCmpCoordType = "vec3";
-            gradSwizzle = ".xy";
-            ui32NumOffsets = 2;
-            if (!iHaveOverloadedTexFuncs)
-            {
-                funcName = "texture2D";
-                if (ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE)
-                {
-                    funcName = "shadow2D";
-                }
-            }
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURECUBE:
-        {
-            depthCmpCoordType = "vec3";
-            gradSwizzle = ".xyz";
-            ui32NumOffsets = 3;
-            if (!iHaveOverloadedTexFuncs)
-            {
-                funcName = "textureCube";
-            }
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE3D:
-        {
-            depthCmpCoordType = "vec4";
-            gradSwizzle = ".xyz";
-            ui32NumOffsets = 3;
-            if (!iHaveOverloadedTexFuncs)
-            {
-                funcName = "texture3D";
-            }
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        {
-            depthCmpCoordType = "vec3";
-            gradSwizzle = ".x";
-            ui32NumOffsets = 1;
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        {
-            depthCmpCoordType = "vec4";
-            gradSwizzle = ".xy";
-            ui32NumOffsets = 2;
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        {
-            gradSwizzle = ".xyz";
-            ui32NumOffsets = 3;
-            if (ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE)
-            {
-                SHADER_VARIABLE_TYPE dataType = SVT_FLOAT;  // TODO!!
-                // Special. Reference is a separate argument.
-                AddIndentation(psContext);
-
-                GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], dataType, 1, &numParenthesis);
-                if (ui32Flags & (TEXSMP_FLAG_LOD | TEXSMP_FLAG_FIRSTLOD))
-                {
-                    bcatcstr(glsl, "textureLod(");
-                }
-                else
-                {
-                    bcatcstr(glsl, "texture(");
-                }
-                if (!useCombinedTextureSamplers)
-                    ResourceName(glsl, psContext, RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, (ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE) ? 1 : 0);
-                else
-                    bconcat(glsl, TextureSamplerName(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber,
-                                                     psInst->asOperands[3].ui32RegisterNumber, (ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE) ? 1 : 0));
-                bcatcstr(glsl, ",");
-                GLSLTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-                bcatcstr(glsl, ",");
-                //.z = reference.
-                TranslateOperand(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);
-
-                if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-                {
-                    bcatcstr(glsl, ", 0.0");
-                }
-
-                bcatcstr(glsl, ")");
-                // Doesn't make any sense to do swizzles here, depth comparison returns a scalar.
-                GLSLAddAssignPrologue(psContext, numParenthesis);
-                return;
-            }
-
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    if (ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE)
-    {
-        // For non-cubeMap Arrays the reference value comes from the
-        // texture coord vector in GLSL. For cubmap arrays there is a
-        // separate parameter.
-        // It is always separate paramter in HLSL.
-        SHADER_VARIABLE_TYPE dataType = SVT_FLOAT;  // TODO!!
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], dataType, GetNumSwizzleElements(&psInst->asOperands[2]), &numParenthesis);
-        if (ui32Flags & (TEXSMP_FLAG_LOD | TEXSMP_FLAG_FIRSTLOD))
-        {
-            bformata(glsl, "%sLod%s(", funcName, offset);
-        }
-        else
-        {
-            bformata(glsl, "%s%s(", funcName, offset);
-        }
-        if (!useCombinedTextureSamplers)
-            ResourceName(glsl, psContext, RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, 1);
-        else
-            bconcat(glsl,
-                    TextureSamplerName(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1));
-        bformata(glsl, ", %s(", depthCmpCoordType);
-        GLSLTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-        bcatcstr(glsl, ",");
-        //.z = reference.
-        TranslateOperand(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);
-        bcatcstr(glsl, ")");
-
-        if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-        {
-            bcatcstr(glsl, ", 0.0");
-        }
-
-        bcatcstr(glsl, ")");
-    }
-    else
-    {
-        SHADER_VARIABLE_TYPE dataType = SVT_FLOAT;  // TODO!!
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], dataType, GetNumSwizzleElements(&psInst->asOperands[2]), &numParenthesis);
-
-        if (ui32Flags & (TEXSMP_FLAG_LOD | TEXSMP_FLAG_FIRSTLOD))
-        {
-            bformata(glsl, "%sLod%s(", funcName, offset);
-        }
-        else if (ui32Flags & TEXSMP_FLAGS_GRAD)
-        {
-            bformata(glsl, "%sGrad%s(", funcName, offset);
-        }
-        else
-        {
-            bformata(glsl, "%s%s(", funcName, offset);
-        }
-        if (!useCombinedTextureSamplers)
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);  // resource
-        else
-            bconcat(glsl,
-                    TextureSamplerName(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 0));
-        bcatcstr(glsl, ", ");
-        GLSLTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-
-        if (ui32Flags & (TEXSMP_FLAG_LOD))
-        {
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);
-            if (psContext->psShader->ui32MajorVersion < 4)
-            {
-                bcatcstr(glsl, ".w");
-            }
-        }
-        else if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-        {
-            bcatcstr(glsl, ", 0.0");
-        }
-        else if (ui32Flags & TEXSMP_FLAGS_GRAD)
-        {
-            bcatcstr(glsl, ", vec4(");
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);  // dx
-            bcatcstr(glsl, ")");
-            bcatcstr(glsl, gradSwizzle);
-            bcatcstr(glsl, ", vec4(");
-            TranslateOperand(psContext, &psInst->asOperands[5], TO_AUTO_BITCAST_TO_FLOAT);  // dy
-            bcatcstr(glsl, ")");
-            bcatcstr(glsl, gradSwizzle);
-        }
-
-        if (psInst->bAddressOffset)
-        {
-            if (ui32NumOffsets == 1)
-            {
-                bformata(glsl, ", %d", psInst->iUAddrOffset);
-            }
-            else if (ui32NumOffsets == 2)
-            {
-                bformata(glsl, ", ivec2(%d, %d)", psInst->iUAddrOffset, psInst->iVAddrOffset);
-            }
-            else if (ui32NumOffsets == 3)
-            {
-                bformata(glsl, ", ivec3(%d, %d, %d)", psInst->iUAddrOffset, psInst->iVAddrOffset, psInst->iWAddrOffset);
-            }
-        }
-
-        if (ui32Flags & (TEXSMP_FLAG_BIAS))
-        {
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);
-        }
-
-        bcatcstr(glsl, ")");
-    }
-
-    if (!(ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE))
-    {
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzleWithMask(psContext, &psInst->asOperands[2], GetOperandWriteMask(&psInst->asOperands[0]));
-    }
-    GLSLAddAssignPrologue(psContext, numParenthesis);
-}
-
-static ShaderVarType* GLSLLookupStructuredVar(HLSLCrossCompilerContext* psContext, Operand* psResource, Operand* psByteOffset, uint32_t ui32Component)
-{
-    ConstantBuffer* psCBuf = NULL;
-    ShaderVarType* psVarType = NULL;
-    uint32_t aui32Swizzle[4] = {OPERAND_4_COMPONENT_X};
-    int byteOffset = ((int*)psByteOffset->afImmediates)[0] + 4 * ui32Component;
-    int vec4Offset = 0;
-    int32_t index = -1;
-    int32_t rebase = -1;
-    int found;
-
-    ASSERT(psByteOffset->eType == OPERAND_TYPE_IMMEDIATE32);
-    // TODO: multi-component stores and vector writes need testing.
-
-    // aui32Swizzle[0] = psInst->asOperands[0].aui32Swizzle[component];
-
-    switch (byteOffset % 16)
-    {
-        case 0:
-            aui32Swizzle[0] = 0;
-            break;
-        case 4:
-            aui32Swizzle[0] = 1;
-            break;
-        case 8:
-            aui32Swizzle[0] = 2;
-            break;
-        case 12:
-            aui32Swizzle[0] = 3;
-            break;
-    }
-
-    switch (psResource->eType)
-    {
-        case OPERAND_TYPE_RESOURCE:
-            GetConstantBufferFromBindingPoint(RGROUP_TEXTURE, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-            break;
-        case OPERAND_TYPE_UNORDERED_ACCESS_VIEW:
-            GetConstantBufferFromBindingPoint(RGROUP_UAV, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-            break;
-        case OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY:
-        {
-            // dcl_tgsm_structured defines the amount of memory and a stride.
-            ASSERT(psResource->ui32RegisterNumber < MAX_GROUPSHARED);
-            return &psContext->psShader->sGroupSharedVarType[psResource->ui32RegisterNumber];
-        }
-        default:
-            ASSERT(0);
-            break;
-    }
-
-    found = GetShaderVarFromOffset(vec4Offset, aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-    ASSERT(found);
-
-    return psVarType;
-}
-
-static void GLSLTranslateShaderStorageStore(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentShaderString;
-    ShaderVarType* psVarType = NULL;
-    int component;
-    int srcComponent = 0;
-
-    Operand* psDest = 0;
-    Operand* psDestAddr = 0;
-    Operand* psDestByteOff = 0;
-    Operand* psSrc = 0;
-    int structured = 0;
-
-    switch (psInst->eOpcode)
-    {
-        case OPCODE_STORE_STRUCTURED:
-            psDest = &psInst->asOperands[0];
-            psDestAddr = &psInst->asOperands[1];
-            psDestByteOff = &psInst->asOperands[2];
-            psSrc = &psInst->asOperands[3];
-            structured = 1;
-
-            break;
-        case OPCODE_STORE_RAW:
-            psDest = &psInst->asOperands[0];
-            psDestByteOff = &psInst->asOperands[1];
-            psSrc = &psInst->asOperands[2];
-            break;
-    }
-
-    for (component = 0; component < 4; component++)
-    {
-        ASSERT(psInst->asOperands[0].eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-        if (psInst->asOperands[0].ui32CompMask & (1 << component))
-        {
-
-            if (structured && psDest->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                psVarType = GLSLLookupStructuredVar(psContext, psDest, psDestByteOff, component);
-            }
-
-            AddIndentation(psContext);
-
-            if (structured && psDest->eType == OPERAND_TYPE_RESOURCE)
-            {
-                bformata(glsl, "StructuredRes%d", psDest->ui32RegisterNumber);
-            }
-            else
-            {
-                TranslateOperand(psContext, psDest, TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY);
-            }
-            bformata(glsl, "[");
-            if (structured)  // Dest address and dest byte offset
-            {
-                if (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    TranslateOperand(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(glsl, "].value[");
-                    TranslateOperand(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(glsl, "/4u ");  // bytes to floats
-                }
-                else
-                {
-                    TranslateOperand(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                }
-            }
-            else
-            {
-                TranslateOperand(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-            }
-
-            // RAW: change component using index offset
-            if (!structured || (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY))
-            {
-                bformata(glsl, " + %d", component);
-            }
-
-            bformata(glsl, "]");
-
-            if (structured && psDest->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                if (strcmp(psVarType->Name, "$Element") != 0)
-                {
-                    bformata(glsl, ".%s", psVarType->Name);
-                }
-            }
-
-            if (structured)
-            {
-                uint32_t flags = TO_FLAG_UNSIGNED_INTEGER;
-                if (psVarType)
-                {
-                    if (psVarType->Type == SVT_INT)
-                    {
-                        flags = TO_FLAG_INTEGER;
-                    }
-                    else if (psVarType->Type == SVT_FLOAT)
-                    {
-                        flags = TO_FLAG_NONE;
-                    }
-                }
-                // TGSM always uint
-                bformata(glsl, " = (");
-                if (GetNumSwizzleElements(psSrc) > 1)
-                    TranslateOperandWithMask(psContext, psSrc, flags, 1 << (srcComponent++));
-                else
-                    TranslateOperandWithMask(psContext, psSrc, flags, OPERAND_4_COMPONENT_MASK_X);
-            }
-            else
-            {
-                // Dest type is currently always a uint array.
-                bformata(glsl, " = (");
-                if (GetNumSwizzleElements(psSrc) > 1)
-                    TranslateOperandWithMask(psContext, psSrc, TO_FLAG_UNSIGNED_INTEGER, 1 << (srcComponent++));
-                else
-                    TranslateOperandWithMask(psContext, psSrc, TO_FLAG_UNSIGNED_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            }
-
-            // Double takes an extra slot.
-            if (psVarType && psVarType->Type == SVT_DOUBLE)
-            {
-                if (structured && psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                    bcatcstr(glsl, ")");
-                component++;
-            }
-
-            bformata(glsl, ");\n");
-        }
-    }
-}
-static void GLSLTranslateShaderStorageLoad(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentShaderString;
-    int component;
-    Operand* psDest = 0;
-    Operand* psSrcAddr = 0;
-    Operand* psSrcByteOff = 0;
-    Operand* psSrc = 0;
-    int structured = 0;
-
-    switch (psInst->eOpcode)
-    {
-        case OPCODE_LD_STRUCTURED:
-            psDest = &psInst->asOperands[0];
-            psSrcAddr = &psInst->asOperands[1];
-            psSrcByteOff = &psInst->asOperands[2];
-            psSrc = &psInst->asOperands[3];
-            structured = 1;
-            break;
-        case OPCODE_LD_RAW:
-            psDest = &psInst->asOperands[0];
-            psSrcByteOff = &psInst->asOperands[1];
-            psSrc = &psInst->asOperands[2];
-            break;
-    }
-
-    if (psInst->eOpcode == OPCODE_LD_RAW)
-    {
-        int numParenthesis = 0;
-        int firstItemAdded = 0;
-        uint32_t destCount = GetNumSwizzleElements(psDest);
-        uint32_t destMask = GetOperandWriteMask(psDest);
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, psDest, SVT_UINT, destCount, &numParenthesis);
-        if (destCount > 1)
-        {
-            bformata(glsl, "%s(", GetConstructorForType(SVT_UINT, destCount));
-            numParenthesis++;
-        }
-        for (component = 0; component < 4; component++)
-        {
-            if (!(destMask & (1 << component)))
-                continue;
-
-            if (firstItemAdded)
-                bcatcstr(glsl, ", ");
-            else
-                firstItemAdded = 1;
-
-            bformata(glsl, "RawRes%d[((", psSrc->ui32RegisterNumber);
-            TranslateOperand(psContext, psSrcByteOff, TO_FLAG_INTEGER);
-            bcatcstr(glsl, ") >> 2)");
-            if (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE && psSrc->aui32Swizzle[component] != 0)
-            {
-                bformata(glsl, " + %d", psSrc->aui32Swizzle[component]);
-            }
-            bcatcstr(glsl, "]");
-        }
-        GLSLAddAssignPrologue(psContext, numParenthesis);
-    }
-    else
-    {
-        int numParenthesis = 0;
-        int firstItemAdded = 0;
-        uint32_t destCount = GetNumSwizzleElements(psDest);
-        uint32_t destMask = GetOperandWriteMask(psDest);
-        ASSERT(psInst->eOpcode == OPCODE_LD_STRUCTURED);
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, psDest, SVT_UINT, destCount, &numParenthesis);
-        if (destCount > 1)
-        {
-            bformata(glsl, "%s(", GetConstructorForType(SVT_UINT, destCount));
-            numParenthesis++;
-        }
-        for (component = 0; component < 4; component++)
-        {
-            ShaderVarType* psVar = NULL;
-            int addedBitcast = 0;
-            if (!(destMask & (1 << component)))
-                continue;
-
-            if (firstItemAdded)
-                bcatcstr(glsl, ", ");
-            else
-                firstItemAdded = 1;
-
-            if (psSrc->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                // input already in uints
-                TranslateOperand(psContext, psSrc, TO_FLAG_NAME_ONLY);
-                bcatcstr(glsl, "[");
-                TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                bcatcstr(glsl, "].value[(");
-                TranslateOperand(psContext, psSrcByteOff, TO_FLAG_UNSIGNED_INTEGER);
-                bformata(glsl, " >> 2u) + %d]", psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-            }
-            else
-            {
-                ConstantBuffer* psCBuf = NULL;
-                psVar = GLSLLookupStructuredVar(psContext, psSrc, psSrcByteOff,
-                                                psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-                GetConstantBufferFromBindingPoint(RGROUP_UAV, psSrc->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-
-                if (psVar->Type == SVT_FLOAT)
-                {
-                    bcatcstr(glsl, "floatBitsToUint(");
-                    addedBitcast = 1;
-                }
-                else if (psVar->Type == SVT_DOUBLE)
-                {
-                    bcatcstr(glsl, "unpackDouble2x32(");
-                    addedBitcast = 1;
-                }
-                if (psSrc->eType == OPERAND_TYPE_UNORDERED_ACCESS_VIEW)
-                {
-                    bformata(glsl, "%s[", psCBuf->Name);
-                    TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                    bcatcstr(glsl, "]");
-                    if (strcmp(psVar->Name, "$Element") != 0)
-                    {
-                        bcatcstr(glsl, ".");
-                        bcatcstr(glsl, psVar->Name);
-                    }
-                }
-                else
-                {
-                    bformata(glsl, "StructuredRes%d[", psSrc->ui32RegisterNumber);
-                    TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                    bcatcstr(glsl, "].");
-
-                    bcatcstr(glsl, psVar->Name);
-                }
-
-                if (addedBitcast)
-                    bcatcstr(glsl, ")");
-                if (psVar->Type == SVT_DOUBLE)
-                    component++;  // doubles take up 2 slots
-            }
-        }
-        GLSLAddAssignPrologue(psContext, numParenthesis);
-
-        return;
-    }
-
-#if 0
-
-    //(int)GetNumSwizzleElements(&psInst->asOperands[0])
-    for (component = 0; component < 4; component++)
-    {
-        const char* swizzleString[] = { ".x", ".y", ".z", ".w" };
-        ASSERT(psDest->eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-        if (psDest->ui32CompMask & (1 << component))
-        {
-            if (structured && psSrc->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                psVarType = GLSLLookupStructuredVar(psContext, psSrc, psSrcByteOff, psSrc->aui32Swizzle[component]);
-            }
-
-            AddIndentation(psContext);
-
-            aui32Swizzle[0] = psSrc->aui32Swizzle[component];
-
-            TranslateOperand(psContext, psDest, TO_FLAG_DESTINATION);
-            if (GetNumSwizzleElements(psDest) > 1)
-                bformata(glsl, swizzleString[destComponent++]);
-
-            if (psVarType)
-            {
-                // TODO completely broken now after GLSLMETALAddAssignToDest refactorings.
-                GLSLMETALAddAssignToDest(psContext, psDest, SVTTypeToFlag(psVarType->Type), GetNumSwizzleElements(psDest), &numParenthesis);
-            }
-            else
-            {
-                GLSLMETALAddAssignToDest(psContext, psDest, TO_FLAG_NONE, GetNumSwizzleElements(psDest), &numParenthesis);
-            }
-
-            if (psSrc->eType == OPERAND_TYPE_RESOURCE)
-            {
-                if (structured)
-                    bformata(glsl, "(StructuredRes%d[", psSrc->ui32RegisterNumber);
-                else
-                    bformata(glsl, "(RawRes%d[", psSrc->ui32RegisterNumber);
-            }
-            else
-            {
-                bformata(glsl, "(");
-                TranslateOperand(psContext, psSrc, TO_FLAG_NAME_ONLY);
-                bformata(glsl, "[");
-                Translate
-            }
-
-            if (structured) //src address and src byte offset
-            {
-                if (psSrc->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(glsl, "].value[");
-                    TranslateOperand(psContext, psSrcByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(glsl, "/4u ");//bytes to floats
-                }
-                else
-                {
-                    TranslateOperand(psContext, psSrcAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                }
-            }
-            else
-            {
-                TranslateOperand(psContext, psSrcByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-            }
-
-            //RAW: change component using index offset
-            if (!structured || (psSrc->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY))
-            {
-                bformata(glsl, " + %d", psSrc->aui32Swizzle[component]);
-            }
-
-            bformata(glsl, "]");
-            if (structured && psSrc->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                if (strcmp(psVarType->Name, "$Element") != 0)
-                {
-                    bformata(glsl, ".%s", psVarType->Name);
-                }
-
-                if (psVarType->Type == SVT_DOUBLE)
-                {
-                    //Double takes an extra slot.
-                    component++;
-                }
-            }
-
-            bformata(glsl, ");\n");
-        }
-    }
-#endif
-}
-
-void TranslateAtomicMemOp(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring glsl = *psContext->currentShaderString;
-    int numParenthesis = 0;
-    ShaderVarType* psVarType = NULL;
-    uint32_t ui32DataTypeFlag = TO_FLAG_INTEGER;
-    const char* func = "";
-    Operand* dest = 0;
-    Operand* previousValue = 0;
-    Operand* destAddr = 0;
-    Operand* src = 0;
-    Operand* compare = 0;
-
-    switch (psInst->eOpcode)
-    {
-        case OPCODE_IMM_ATOMIC_IADD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_IADD\n");
-#endif
-            func = "atomicAdd";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_IADD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_IADD\n");
-#endif
-            func = "atomicAdd";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_AND:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_AND\n");
-#endif
-            func = "atomicAnd";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_AND:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_AND\n");
-#endif
-            func = "atomicAnd";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_OR:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_OR\n");
-#endif
-            func = "atomicOr";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_OR:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_OR\n");
-#endif
-            func = "atomicOr";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_XOR:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_XOR\n");
-#endif
-            func = "atomicXor";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_XOR:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_XOR\n");
-#endif
-            func = "atomicXor";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-
-        case OPCODE_IMM_ATOMIC_EXCH:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_EXCH\n");
-#endif
-            func = "atomicExchange";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_CMP_EXCH:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_CMP_EXC\n");
-#endif
-            func = "atomicCompSwap";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            compare = &psInst->asOperands[3];
-            src = &psInst->asOperands[4];
-            break;
-        }
-        case OPCODE_ATOMIC_CMP_STORE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_CMP_STORE\n");
-#endif
-            func = "atomicCompSwap";
-            previousValue = 0;
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            compare = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_UMIN:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_UMIN\n");
-#endif
-            func = "atomicMin";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_UMIN:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_UMIN\n");
-#endif
-            func = "atomicMin";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_IMIN:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_IMIN\n");
-#endif
-            func = "atomicMin";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_IMIN:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_IMIN\n");
-#endif
-            func = "atomicMin";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_UMAX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_UMAX\n");
-#endif
-            func = "atomicMax";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_UMAX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_UMAX\n");
-#endif
-            func = "atomicMax";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_IMAX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_IMAX\n");
-#endif
-            func = "atomicMax";
-            previousValue = &psInst->asOperands[0];
-            dest = &psInst->asOperands[1];
-            destAddr = &psInst->asOperands[2];
-            src = &psInst->asOperands[3];
-            break;
-        }
-        case OPCODE_ATOMIC_IMAX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ATOMIC_IMAX\n");
-#endif
-            func = "atomicMax";
-            dest = &psInst->asOperands[0];
-            destAddr = &psInst->asOperands[1];
-            src = &psInst->asOperands[2];
-            break;
-        }
-    }
-
-    AddIndentation(psContext);
-
-    psVarType = GLSLLookupStructuredVar(psContext, dest, destAddr, 0);
-    if (psVarType->Type == SVT_UINT)
-    {
-        ui32DataTypeFlag = TO_FLAG_UNSIGNED_INTEGER | TO_AUTO_BITCAST_TO_UINT;
-    }
-    else
-    {
-        ui32DataTypeFlag = TO_FLAG_INTEGER | TO_AUTO_BITCAST_TO_INT;
-    }
-
-    if (previousValue)
-    {
-        GLSLMETALAddAssignToDest(psContext, previousValue, psVarType->Type, 1, &numParenthesis);
-    }
-    bcatcstr(glsl, func);
-    bformata(glsl, "(");
-    ResourceName(glsl, psContext, RGROUP_UAV, dest->ui32RegisterNumber, 0);
-    bformata(glsl, "[0]");
-    if (strcmp(psVarType->Name, "$Element") != 0)
-    {
-        bformata(glsl, ".%s", psVarType->Name);
-    }
-
-    bcatcstr(glsl, ", ");
-
-    if (compare)
-    {
-        TranslateOperand(psContext, compare, ui32DataTypeFlag);
-        bcatcstr(glsl, ", ");
-    }
-
-    TranslateOperand(psContext, src, ui32DataTypeFlag);
-    bcatcstr(glsl, ")");
-    if (previousValue)
-    {
-        GLSLAddAssignPrologue(psContext, numParenthesis);
-    }
-    else
-        bcatcstr(glsl, ";\n");
-}
-
-static void GLSLTranslateConditional(HLSLCrossCompilerContext* psContext, Instruction* psInst, bstring glsl)
-{
-    const char* statement = "";
-    if (psInst->eOpcode == OPCODE_BREAKC)
-    {
-        statement = "break";
-    }
-    else if (psInst->eOpcode == OPCODE_CONTINUEC)
-    {
-        statement = "continue";
-    }
-    else if (psInst->eOpcode == OPCODE_RETC)
-    {
-        statement = "return";
-    }
-
-    if (psContext->psShader->ui32MajorVersion < 4)
-    {
-        bcatcstr(glsl, "if(");
-
-        TranslateOperand(psContext, &psInst->asOperands[0], SVTTypeToFlag(GetOperandDataType(psContext, &psInst->asOperands[0])));
-        switch (psInst->eDX9TestType)
-        {
-            case D3DSPC_GT:
-            {
-                bcatcstr(glsl, " > ");
-                break;
-            }
-            case D3DSPC_EQ:
-            {
-                bcatcstr(glsl, " == ");
-                break;
-            }
-            case D3DSPC_GE:
-            {
-                bcatcstr(glsl, " >= ");
-                break;
-            }
-            case D3DSPC_LT:
-            {
-                bcatcstr(glsl, " < ");
-                break;
-            }
-            case D3DSPC_NE:
-            {
-                bcatcstr(glsl, " != ");
-                break;
-            }
-            case D3DSPC_LE:
-            {
-                bcatcstr(glsl, " <= ");
-                break;
-            }
-            case D3DSPC_BOOLEAN:
-            {
-                bcatcstr(glsl, " != 0");
-                break;
-            }
-            default:
-            {
-                break;
-            }
-        }
-
-        if (psInst->eDX9TestType != D3DSPC_BOOLEAN)
-        {
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-        }
-
-        if (psInst->eOpcode != OPCODE_IF)
-        {
-            bformata(glsl, "){ %s; }\n", statement);
-        }
-        else
-        {
-            bcatcstr(glsl, "){\n");
-        }
-    }
-    else
-    {
-        if (psInst->eBooleanTestType == INSTRUCTION_TEST_ZERO)
-        {
-            bcatcstr(glsl, "if((");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER);
-
-            if (psInst->eOpcode != OPCODE_IF)
-            {
-                bformata(glsl, ")==0u){%s;}\n", statement);
-            }
-            else
-            {
-                bcatcstr(glsl, ")==0u){\n");
-            }
-        }
-        else
-        {
-            ASSERT(psInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO);
-            bcatcstr(glsl, "if((");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER);
-
-            if (psInst->eOpcode != OPCODE_IF)
-            {
-                bformata(glsl, ")!=0u){%s;}\n", statement);
-            }
-            else
-            {
-                bcatcstr(glsl, ")!=0u){\n");
-            }
-        }
-    }
-}
-
-// Returns the "more important" type of a and b, currently int < uint < float
-static SHADER_VARIABLE_TYPE GLSLSelectHigherType(SHADER_VARIABLE_TYPE a, SHADER_VARIABLE_TYPE b)
-{
-    if (a == SVT_FLOAT || b == SVT_FLOAT)
-        return SVT_FLOAT;
-    // Apart from floats, the enum values are fairly well-ordered, use that directly.
-    return a > b ? a : b;
-}
-
-// Helper function to set the vector type of 1 or more components in a vector
-// If the existing values (that we're writing to) are all SVT_VOID, just upgrade the value and we're done
-// Otherwise, set all the components in the vector that currently are set to that same value OR are now being written to
-// to the "highest" type value (ordering int->uint->float)
-static void GLSLSetVectorType(SHADER_VARIABLE_TYPE* aeTempVecType, uint32_t regBaseIndex, uint32_t componentMask, SHADER_VARIABLE_TYPE eType)
-{
-    int existingTypesFound = 0;
-    int i = 0;
-    for (i = 0; i < 4; i++)
-    {
-        if (componentMask & (1 << i))
-        {
-            if (aeTempVecType[regBaseIndex + i] != SVT_VOID)
-            {
-                existingTypesFound = 1;
-                break;
-            }
-        }
-    }
-
-    if (existingTypesFound != 0)
-    {
-        // Expand the mask to include all components that are used, also upgrade type
-        for (i = 0; i < 4; i++)
-        {
-            if (aeTempVecType[regBaseIndex + i] != SVT_VOID)
-            {
-                componentMask |= (1 << i);
-                eType = GLSLSelectHigherType(eType, aeTempVecType[regBaseIndex + i]);
-            }
-        }
-    }
-
-    // Now componentMask contains the components we actually need to update and eType may have been changed to something else.
-    // Write the results
-    for (i = 0; i < 4; i++)
-    {
-        if (componentMask & (1 << i))
-        {
-            aeTempVecType[regBaseIndex + i] = eType;
-        }
-    }
-}
-
-static void GLSLMarkOperandAs(Operand* psOperand, SHADER_VARIABLE_TYPE eType, SHADER_VARIABLE_TYPE* aeTempVecType)
-{
-    if (psOperand->eType == OPERAND_TYPE_INDEXABLE_TEMP || psOperand->eType == OPERAND_TYPE_TEMP)
-    {
-        const uint32_t ui32RegIndex = psOperand->ui32RegisterNumber * 4;
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            GLSLSetVectorType(aeTempVecType, ui32RegIndex, 1 << psOperand->aui32Swizzle[0], eType);
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            // 0xf == all components, swizzle order doesn't matter.
-            GLSLSetVectorType(aeTempVecType, ui32RegIndex, 0xf, eType);
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t ui32CompMask = psOperand->ui32CompMask;
-            if (!psOperand->ui32CompMask)
-            {
-                ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-            }
-
-            GLSLSetVectorType(aeTempVecType, ui32RegIndex, ui32CompMask, eType);
-        }
-    }
-}
-
-static void GLSLMarkAllOperandsAs(Instruction* psInst, SHADER_VARIABLE_TYPE eType, SHADER_VARIABLE_TYPE* aeTempVecType)
-{
-    uint32_t i = 0;
-    for (i = 0; i < psInst->ui32NumOperands; i++)
-    {
-        GLSLMarkOperandAs(&psInst->asOperands[i], eType, aeTempVecType);
-    }
-}
-
-static void GLSLWriteOperandTypes(Operand* psOperand, const SHADER_VARIABLE_TYPE* aeTempVecType)
-{
-    const uint32_t ui32RegIndex = psOperand->ui32RegisterNumber * 4;
-
-    if (psOperand->eType != OPERAND_TYPE_TEMP)
-        return;
-
-    if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-    {
-        psOperand->aeDataType[psOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-    }
-    else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-    {
-        if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-        {
-            psOperand->aeDataType[0] = aeTempVecType[ui32RegIndex];
-            psOperand->aeDataType[1] = aeTempVecType[ui32RegIndex + 1];
-            psOperand->aeDataType[2] = aeTempVecType[ui32RegIndex + 2];
-            psOperand->aeDataType[3] = aeTempVecType[ui32RegIndex + 3];
-        }
-        else
-        {
-            psOperand->aeDataType[psOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-            psOperand->aeDataType[psOperand->aui32Swizzle[1]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[1]];
-            psOperand->aeDataType[psOperand->aui32Swizzle[2]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[2]];
-            psOperand->aeDataType[psOperand->aui32Swizzle[3]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[3]];
-        }
-    }
-    else if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-    {
-        int c = 0;
-        uint32_t ui32CompMask = psOperand->ui32CompMask;
-        if (!psOperand->ui32CompMask)
-        {
-            ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-        }
-
-        for (; c < 4; ++c)
-        {
-            if (ui32CompMask & (1 << c))
-            {
-                psOperand->aeDataType[c] = aeTempVecType[ui32RegIndex + c];
-            }
-        }
-    }
-}
-
-// Mark scalars from CBs. TODO: Do we need to do the same for vec2/3's as well? There may be swizzles involved which make it vec4 or something else again.
-static void GLSLSetCBOperandComponents(HLSLCrossCompilerContext* psContext, Operand* psOperand)
-{
-    ConstantBuffer* psCBuf = NULL;
-    ShaderVarType* psVarType = NULL;
-    int32_t index = -1;
-    int rebase = 0;
-
-    if (psOperand->eType != OPERAND_TYPE_CONSTANT_BUFFER)
-        return;
-
-    GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-    GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-
-    if (psVarType->Class == SVC_SCALAR)
-        psOperand->iNumComponents = 1;
-}
-
-void SetDataTypes(HLSLCrossCompilerContext* psContext, Instruction* psInst, const int32_t i32InstCount)
-{
-    int32_t i;
-    Instruction* psFirstInst = psInst;
-
-    SHADER_VARIABLE_TYPE aeTempVecType[MAX_TEMP_VEC4 * 4];
-
-    if (psContext->psShader->ui32MajorVersion <= 3)
-    {
-        for (i = 0; i < MAX_TEMP_VEC4 * 4; ++i)
-        {
-            aeTempVecType[i] = SVT_FLOAT;
-        }
-    }
-    else
-    {
-        // Start with void, then move up the chain void->int->uint->float
-        for (i = 0; i < MAX_TEMP_VEC4 * 4; ++i)
-        {
-            aeTempVecType[i] = SVT_VOID;
-        }
-    }
-
-    //    if (psContext->psShader->ui32MajorVersion <= 3)
-    {
-        // First pass, do analysis: deduce the data type based on opcodes, fill out aeTempVecType table
-        // Only ever to int->float promotion (or int->uint), never the other way around
-        for (i = 0; i < i32InstCount; ++i, psInst++)
-        {
-            if (psInst->ui32NumOperands == 0)
-                continue;
-
-            switch (psInst->eOpcode)
-            {
-                    // All float-only ops
-                case OPCODE_ADD:
-                case OPCODE_DERIV_RTX:
-                case OPCODE_DERIV_RTY:
-                case OPCODE_DIV:
-                case OPCODE_DP2:
-                case OPCODE_DP3:
-                case OPCODE_DP4:
-                case OPCODE_EQ:
-                case OPCODE_EXP:
-                case OPCODE_FRC:
-                case OPCODE_LOG:
-                case OPCODE_MAD:
-                case OPCODE_MIN:
-                case OPCODE_MAX:
-                case OPCODE_MUL:
-                case OPCODE_NE:
-                case OPCODE_ROUND_NE:
-                case OPCODE_ROUND_NI:
-                case OPCODE_ROUND_PI:
-                case OPCODE_ROUND_Z:
-                case OPCODE_RSQ:
-                case OPCODE_SAMPLE:
-                case OPCODE_SAMPLE_C:
-                case OPCODE_SAMPLE_C_LZ:
-                case OPCODE_SAMPLE_L:
-                case OPCODE_SAMPLE_D:
-                case OPCODE_SAMPLE_B:
-                case OPCODE_SQRT:
-                case OPCODE_SINCOS:
-                case OPCODE_LOD:
-                case OPCODE_GATHER4:
-
-                case OPCODE_DERIV_RTX_COARSE:
-                case OPCODE_DERIV_RTX_FINE:
-                case OPCODE_DERIV_RTY_COARSE:
-                case OPCODE_DERIV_RTY_FINE:
-                case OPCODE_GATHER4_C:
-                case OPCODE_GATHER4_PO:
-                case OPCODE_GATHER4_PO_C:
-                case OPCODE_RCP:
-
-                    GLSLMarkAllOperandsAs(psInst, SVT_FLOAT, aeTempVecType);
-                    break;
-
-                    // Int-only ops, no need to do anything
-                case OPCODE_AND:
-                case OPCODE_BREAKC:
-                case OPCODE_CALLC:
-                case OPCODE_CONTINUEC:
-                case OPCODE_IADD:
-                case OPCODE_IEQ:
-                case OPCODE_IGE:
-                case OPCODE_ILT:
-                case OPCODE_IMAD:
-                case OPCODE_IMAX:
-                case OPCODE_IMIN:
-                case OPCODE_IMUL:
-                case OPCODE_INE:
-                case OPCODE_INEG:
-                case OPCODE_ISHL:
-                case OPCODE_ISHR:
-                case OPCODE_IF:
-                case OPCODE_NOT:
-                case OPCODE_OR:
-                case OPCODE_RETC:
-                case OPCODE_XOR:
-                case OPCODE_BUFINFO:
-                case OPCODE_COUNTBITS:
-                case OPCODE_FIRSTBIT_HI:
-                case OPCODE_FIRSTBIT_LO:
-                case OPCODE_FIRSTBIT_SHI:
-                case OPCODE_UBFE:
-                case OPCODE_IBFE:
-                case OPCODE_BFI:
-                case OPCODE_BFREV:
-                case OPCODE_ATOMIC_AND:
-                case OPCODE_ATOMIC_OR:
-                case OPCODE_ATOMIC_XOR:
-                case OPCODE_ATOMIC_CMP_STORE:
-                case OPCODE_ATOMIC_IADD:
-                case OPCODE_ATOMIC_IMAX:
-                case OPCODE_ATOMIC_IMIN:
-                case OPCODE_ATOMIC_UMAX:
-                case OPCODE_ATOMIC_UMIN:
-                case OPCODE_IMM_ATOMIC_ALLOC:
-                case OPCODE_IMM_ATOMIC_CONSUME:
-                case OPCODE_IMM_ATOMIC_IADD:
-                case OPCODE_IMM_ATOMIC_AND:
-                case OPCODE_IMM_ATOMIC_OR:
-                case OPCODE_IMM_ATOMIC_XOR:
-                case OPCODE_IMM_ATOMIC_EXCH:
-                case OPCODE_IMM_ATOMIC_CMP_EXCH:
-                case OPCODE_IMM_ATOMIC_IMAX:
-                case OPCODE_IMM_ATOMIC_IMIN:
-                case OPCODE_IMM_ATOMIC_UMAX:
-                case OPCODE_IMM_ATOMIC_UMIN:
-                case OPCODE_MOV:
-                case OPCODE_MOVC:
-                case OPCODE_SWAPC:
-                    GLSLMarkAllOperandsAs(psInst, SVT_INT, aeTempVecType);
-                    break;
-                    // uint ops
-                case OPCODE_UDIV:
-                case OPCODE_ULT:
-                case OPCODE_UGE:
-                case OPCODE_UMUL:
-                case OPCODE_UMAD:
-                case OPCODE_UMAX:
-                case OPCODE_UMIN:
-                case OPCODE_USHR:
-                case OPCODE_UADDC:
-                case OPCODE_USUBB:
-                    GLSLMarkAllOperandsAs(psInst, SVT_UINT, aeTempVecType);
-                    break;
-
-                    // Need special handling
-                case OPCODE_FTOI:
-                case OPCODE_FTOU:
-                    GLSLMarkOperandAs(&psInst->asOperands[0], psInst->eOpcode == OPCODE_FTOI ? SVT_INT : SVT_UINT, aeTempVecType);
-                    GLSLMarkOperandAs(&psInst->asOperands[1], SVT_FLOAT, aeTempVecType);
-                    break;
-
-                case OPCODE_GE:
-                case OPCODE_LT:
-                    GLSLMarkOperandAs(&psInst->asOperands[0], SVT_UINT, aeTempVecType);
-                    GLSLMarkOperandAs(&psInst->asOperands[1], SVT_FLOAT, aeTempVecType);
-                    GLSLMarkOperandAs(&psInst->asOperands[2], SVT_FLOAT, aeTempVecType);
-                    break;
-
-                case OPCODE_ITOF:
-                case OPCODE_UTOF:
-                    GLSLMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                    GLSLMarkOperandAs(&psInst->asOperands[1], psInst->eOpcode == OPCODE_ITOF ? SVT_INT : SVT_UINT, aeTempVecType);
-                    break;
-
-                case OPCODE_LD:
-                case OPCODE_LD_MS:
-                    // TODO: Would need to know the sampler return type
-                    GLSLMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                    break;
-
-                case OPCODE_RESINFO:
-                {
-                    if (psInst->eResInfoReturnType != RESINFO_INSTRUCTION_RETURN_UINT)
-                        GLSLMarkAllOperandsAs(psInst, SVT_FLOAT, aeTempVecType);
-                    break;
-                }
-
-                case OPCODE_SAMPLE_INFO:
-                    // TODO decode the _uint flag
-                    GLSLMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                    break;
-
-                case OPCODE_SAMPLE_POS:
-                    GLSLMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                    break;
-
-                case OPCODE_LD_UAV_TYPED:
-                case OPCODE_STORE_UAV_TYPED:
-                case OPCODE_LD_RAW:
-                case OPCODE_STORE_RAW:
-                case OPCODE_LD_STRUCTURED:
-                case OPCODE_STORE_STRUCTURED:
-                    GLSLMarkOperandAs(&psInst->asOperands[0], SVT_INT, aeTempVecType);
-                    break;
-
-                case OPCODE_F32TOF16:
-                case OPCODE_F16TOF32:
-                    // TODO
-                    break;
-
-                    // No-operands, should never get here anyway
-                    /*                case OPCODE_BREAK:
-                                    case OPCODE_CALL:
-                                    case OPCODE_CASE:
-                                    case OPCODE_CONTINUE:
-                                    case OPCODE_CUT:
-                                    case OPCODE_DEFAULT:
-                                    case OPCODE_DISCARD:
-                                    case OPCODE_ELSE:
-                                    case OPCODE_EMIT:
-                                    case OPCODE_EMITTHENCUT:
-                                    case OPCODE_ENDIF:
-                                    case OPCODE_ENDLOOP:
-                                    case OPCODE_ENDSWITCH:
-
-                                    case OPCODE_LABEL:
-                                    case OPCODE_LOOP:
-                                    case OPCODE_CUSTOMDATA:
-                                    case OPCODE_NOP:
-                                    case OPCODE_RET:
-                                    case OPCODE_SWITCH:
-                                    case OPCODE_DCL_RESOURCE: // DCL* opcodes have
-                                    case OPCODE_DCL_CONSTANT_BUFFER: // custom operand formats.
-                                    case OPCODE_DCL_SAMPLER:
-                                    case OPCODE_DCL_INDEX_RANGE:
-                                    case OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
-                                    case OPCODE_DCL_GS_INPUT_PRIMITIVE:
-                                    case OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
-                                    case OPCODE_DCL_INPUT:
-                                    case OPCODE_DCL_INPUT_SGV:
-                                    case OPCODE_DCL_INPUT_SIV:
-                                    case OPCODE_DCL_INPUT_PS:
-                                    case OPCODE_DCL_INPUT_PS_SGV:
-                                    case OPCODE_DCL_INPUT_PS_SIV:
-                                    case OPCODE_DCL_OUTPUT:
-                                    case OPCODE_DCL_OUTPUT_SGV:
-                                    case OPCODE_DCL_OUTPUT_SIV:
-                                    case OPCODE_DCL_TEMPS:
-                                    case OPCODE_DCL_INDEXABLE_TEMP:
-                                    case OPCODE_DCL_GLOBAL_FLAGS:
-
-
-                                    case OPCODE_HS_DECLS: // token marks beginning of HS sub-shader
-                                    case OPCODE_HS_CONTROL_POINT_PHASE: // token marks beginning of HS sub-shader
-                                    case OPCODE_HS_FORK_PHASE: // token marks beginning of HS sub-shader
-                                    case OPCODE_HS_JOIN_PHASE: // token marks beginning of HS sub-shader
-
-                                    case OPCODE_EMIT_STREAM:
-                                    case OPCODE_CUT_STREAM:
-                                    case OPCODE_EMITTHENCUT_STREAM:
-                                    case OPCODE_INTERFACE_CALL:
-
-
-                                    case OPCODE_DCL_STREAM:
-                                    case OPCODE_DCL_FUNCTION_BODY:
-                                    case OPCODE_DCL_FUNCTION_TABLE:
-                                    case OPCODE_DCL_INTERFACE:
-
-                                    case OPCODE_DCL_INPUT_CONTROL_POINT_COUNT:
-                                    case OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT:
-                                    case OPCODE_DCL_TESS_DOMAIN:
-                                    case OPCODE_DCL_TESS_PARTITIONING:
-                                    case OPCODE_DCL_TESS_OUTPUT_PRIMITIVE:
-                                    case OPCODE_DCL_HS_MAX_TESSFACTOR:
-                                    case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-                                    case OPCODE_DCL_HS_JOIN_PHASE_INSTANCE_COUNT:
-
-                                    case OPCODE_DCL_THREAD_GROUP:
-                                    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-                                    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-                                    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-                                    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW:
-                                    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED:
-                                    case OPCODE_DCL_RESOURCE_RAW:
-                                    case OPCODE_DCL_RESOURCE_STRUCTURED:
-                                    case OPCODE_SYNC:
-
-                                    // TODO
-                                    case OPCODE_DADD:
-                                    case OPCODE_DMAX:
-                                    case OPCODE_DMIN:
-                                    case OPCODE_DMUL:
-                                    case OPCODE_DEQ:
-                                    case OPCODE_DGE:
-                                    case OPCODE_DLT:
-                                    case OPCODE_DNE:
-                                    case OPCODE_DMOV:
-                                    case OPCODE_DMOVC:
-                                    case OPCODE_DTOF:
-                                    case OPCODE_FTOD:
-
-                                    case OPCODE_EVAL_SNAPPED:
-                                    case OPCODE_EVAL_SAMPLE_INDEX:
-                                    case OPCODE_EVAL_CENTROID:
-
-                                    case OPCODE_DCL_GS_INSTANCE_COUNT:
-
-                                    case OPCODE_ABORT:
-                                    case OPCODE_DEBUG_BREAK:*/
-
-                default:
-                    break;
-            }
-        }
-    }
-
-    // Fill the rest of aeTempVecType, just in case.
-    for (i = 0; i < MAX_TEMP_VEC4 * 4; i++)
-    {
-        if (aeTempVecType[i] == SVT_VOID)
-            aeTempVecType[i] = SVT_INT;
-    }
-
-    // Now the aeTempVecType table has been filled with (mostly) valid data, write it back to all operands
-    psInst = psFirstInst;
-    for (i = 0; i < i32InstCount; ++i, psInst++)
-    {
-        int k = 0;
-
-        if (psInst->ui32NumOperands == 0)
-            continue;
-
-        // Preserve the current type on dest array index
-        if (psInst->asOperands[0].eType == OPERAND_TYPE_INDEXABLE_TEMP)
-        {
-            Operand* psSubOperand = psInst->asOperands[0].psSubOperand[1];
-            if (psSubOperand != 0)
-            {
-                GLSLWriteOperandTypes(psSubOperand, aeTempVecType);
-            }
-        }
-        if (psInst->asOperands[0].eType == OPERAND_TYPE_CONSTANT_BUFFER)
-            GLSLSetCBOperandComponents(psContext, &psInst->asOperands[0]);
-
-        // Preserve the current type on sources.
-        for (k = psInst->ui32NumOperands - 1; k >= (int)psInst->ui32FirstSrc; --k)
-        {
-            int32_t subOperand;
-            Operand* psOperand = &psInst->asOperands[k];
-
-            GLSLWriteOperandTypes(psOperand, aeTempVecType);
-            if (psOperand->eType == OPERAND_TYPE_CONSTANT_BUFFER)
-                GLSLSetCBOperandComponents(psContext, psOperand);
-
-            for (subOperand = 0; subOperand < MAX_SUB_OPERANDS; subOperand++)
-            {
-                if (psOperand->psSubOperand[subOperand] != 0)
-                {
-                    Operand* psSubOperand = psOperand->psSubOperand[subOperand];
-                    GLSLWriteOperandTypes(psSubOperand, aeTempVecType);
-                    if (psSubOperand->eType == OPERAND_TYPE_CONSTANT_BUFFER)
-                        GLSLSetCBOperandComponents(psContext, psSubOperand);
-                }
-            }
-
-            // Set immediates
-            if (GLSLIsIntegerImmediateOpcode(psInst->eOpcode))
-            {
-                if (psOperand->eType == OPERAND_TYPE_IMMEDIATE32)
-                {
-                    psOperand->iIntegerImmediate = 1;
-                }
-            }
-        }
-
-        // Process the destination last in order to handle instructions
-        // where the destination register is also used as a source.
-        for (k = 0; k < (int)psInst->ui32FirstSrc; ++k)
-        {
-            Operand* psOperand = &psInst->asOperands[k];
-            GLSLWriteOperandTypes(psOperand, aeTempVecType);
-        }
-    }
-}
-
-void TranslateInstruction(HLSLCrossCompilerContext* psContext, Instruction* psInst, Instruction* psNextInst)
-{
-    bstring glsl = *psContext->currentShaderString;
-    int numParenthesis = 0;
-
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bformata(glsl, "//Instruction %d\n", psInst->id);
-#if 0
-    if(psInst->id == 73)
-    {
-        ASSERT(1); //Set breakpoint here to debug an instruction from its ID.
-    }
-#endif
-#endif
-
-    switch (psInst->eOpcode)
-    {
-        case OPCODE_FTOI:
-        case OPCODE_FTOU:
-        {
-            uint32_t dstCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-            uint32_t srcCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            if (psInst->eOpcode == OPCODE_FTOU)
-                bcatcstr(glsl, "//FTOU\n");
-            else
-                bcatcstr(glsl, "//FTOI\n");
-#endif
-
-            AddIndentation(psContext);
-
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], psInst->eOpcode == OPCODE_FTOU ? SVT_UINT : SVT_INT, srcCount, &numParenthesis);
-            bcatcstr(glsl, GetConstructorForType(psInst->eOpcode == OPCODE_FTOU ? SVT_UINT : SVT_INT, srcCount == dstCount ? dstCount : 4));
-            bcatcstr(glsl, "(");  // 1
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_AUTO_BITCAST_TO_FLOAT);
-            bcatcstr(glsl, ")");  // 1
-            // Add destination writemask if the component counts do not match
-            if (srcCount != dstCount)
-                AddSwizzleUsingElementCount(psContext, dstCount);
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-
-        case OPCODE_MOV:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//MOV\n");
-#endif
-            AddIndentation(psContext);
-            GLSLAddMOVBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[1]);
-            break;
-        }
-        case OPCODE_ITOF:  // signed to float
-        case OPCODE_UTOF:  // unsigned to float
-        {
-            uint32_t dstCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-            uint32_t srcCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            if (psInst->eOpcode == OPCODE_ITOF)
-            {
-                bcatcstr(glsl, "//ITOF\n");
-            }
-            else
-            {
-                bcatcstr(glsl, "//UTOF\n");
-            }
-#endif
-            AddIndentation(psContext);
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, srcCount, &numParenthesis);
-            bcatcstr(glsl, GetConstructorForType(SVT_FLOAT, srcCount == dstCount ? dstCount : 4));
-            bcatcstr(glsl, "(");  // 1
-            TranslateOperand(psContext, &psInst->asOperands[1], psInst->eOpcode == OPCODE_UTOF ? TO_AUTO_BITCAST_TO_UINT : TO_AUTO_BITCAST_TO_INT);
-            bcatcstr(glsl, ")");  // 1
-            // Add destination writemask if the component counts do not match
-            if (srcCount != dstCount)
-                AddSwizzleUsingElementCount(psContext, dstCount);
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-        case OPCODE_MAD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//MAD\n");
-#endif
-            GLSLCallTernaryOp(psContext, "*", "+", psInst, 0, 1, 2, 3, TO_FLAG_NONE);
-            break;
-        }
-        case OPCODE_IMAD:
-        {
-            uint32_t ui32Flags = TO_FLAG_INTEGER;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMAD\n");
-#endif
-
-            if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-            {
-                ui32Flags = TO_FLAG_UNSIGNED_INTEGER;
-            }
-
-            GLSLCallTernaryOp(psContext, "*", "+", psInst, 0, 1, 2, 3, ui32Flags);
-            break;
-        }
-        case OPCODE_DADD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DADD\n");
-#endif
-            GLSLCallBinaryOp(psContext, "+", psInst, 0, 1, 2, SVT_DOUBLE);
-            break;
-        }
-        case OPCODE_IADD:
-        {
-            SHADER_VARIABLE_TYPE eType = SVT_INT;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IADD\n");
-#endif
-            // Is this a signed or unsigned add?
-            if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-            {
-                eType = SVT_UINT;
-            }
-            GLSLCallBinaryOp(psContext, "+", psInst, 0, 1, 2, eType);
-            break;
-        }
-        case OPCODE_ADD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ADD\n");
-#endif
-            GLSLCallBinaryOp(psContext, "+", psInst, 0, 1, 2, SVT_FLOAT);
-            break;
-        }
-        case OPCODE_OR:
-        {
-            /*Todo: vector version */
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//OR\n");
-#endif
-            GLSLCallBinaryOp(psContext, "|", psInst, 0, 1, 2, SVT_UINT);
-            break;
-        }
-        case OPCODE_AND:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//AND\n");
-#endif
-            GLSLCallBinaryOp(psContext, "&", psInst, 0, 1, 2, SVT_UINT);
-            break;
-        }
-        case OPCODE_GE:
-        {
-            /*
-                dest = vec4(greaterThanEqual(vec4(srcA), vec4(srcB));
-                Caveat: The result is a boolean but HLSL asm returns 0xFFFFFFFF/0x0 instead.
-                */
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//GE\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_GE, TO_FLAG_NONE, NULL);
-            break;
-        }
-        case OPCODE_MUL:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//MUL\n");
-#endif
-            GLSLCallBinaryOp(psContext, "*", psInst, 0, 1, 2, SVT_FLOAT);
-            break;
-        }
-        case OPCODE_IMUL:
-        {
-            SHADER_VARIABLE_TYPE eType = SVT_INT;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMUL\n");
-#endif
-            if (GetOperandDataType(psContext, &psInst->asOperands[1]) == SVT_UINT)
-            {
-                eType = SVT_UINT;
-            }
-
-            ASSERT(psInst->asOperands[0].eType == OPERAND_TYPE_NULL);
-
-            GLSLCallBinaryOp(psContext, "*", psInst, 1, 2, 3, eType);
-            break;
-        }
-        case OPCODE_UDIV:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//UDIV\n");
-#endif
-            // destQuotient, destRemainder, src0, src1
-            GLSLCallBinaryOp(psContext, "/", psInst, 0, 2, 3, SVT_UINT);
-            GLSLCallBinaryOp(psContext, "%", psInst, 1, 2, 3, SVT_UINT);
-            break;
-        }
-        case OPCODE_DIV:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DIV\n");
-#endif
-            GLSLCallBinaryOp(psContext, "/", psInst, 0, 1, 2, SVT_FLOAT);
-            break;
-        }
-        case OPCODE_SINCOS:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SINCOS\n");
-#endif
-            // Need careful ordering if src == dest[0], as then the cos() will be reading from wrong value
-            if (psInst->asOperands[0].eType == psInst->asOperands[2].eType &&
-                psInst->asOperands[0].ui32RegisterNumber == psInst->asOperands[2].ui32RegisterNumber)
-            {
-                // sin() result overwrites source, do cos() first.
-                // The case where both write the src shouldn't really happen anyway.
-                if (psInst->asOperands[1].eType != OPERAND_TYPE_NULL)
-                {
-                    GLSLCallHelper1(psContext, "cos", psInst, 1, 2, 1);
-                }
-
-                if (psInst->asOperands[0].eType != OPERAND_TYPE_NULL)
-                {
-                    GLSLCallHelper1(psContext, "sin", psInst, 0, 2, 1);
-                }
-            }
-            else
-            {
-                if (psInst->asOperands[0].eType != OPERAND_TYPE_NULL)
-                {
-                    GLSLCallHelper1(psContext, "sin", psInst, 0, 2, 1);
-                }
-
-                if (psInst->asOperands[1].eType != OPERAND_TYPE_NULL)
-                {
-                    GLSLCallHelper1(psContext, "cos", psInst, 1, 2, 1);
-                }
-            }
-            break;
-        }
-
-        case OPCODE_DP2:
-        {
-            int numParenthesis2 = 0;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DP2\n");
-#endif
-            AddIndentation(psContext);
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, 1, &numParenthesis2);
-            bcatcstr(glsl, "dot(");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_AUTO_BITCAST_TO_FLOAT, 3 /* .xy */);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[2], TO_AUTO_BITCAST_TO_FLOAT, 3 /* .xy */);
-            bcatcstr(glsl, ")");
-            GLSLAddAssignPrologue(psContext, numParenthesis2);
-            break;
-        }
-        case OPCODE_DP3:
-        {
-            int numParenthesis2 = 0;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DP3\n");
-#endif
-            AddIndentation(psContext);
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, 1, &numParenthesis2);
-            bcatcstr(glsl, "dot(");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_AUTO_BITCAST_TO_FLOAT, 7 /* .xyz */);
-            bcatcstr(glsl, ", ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[2], TO_AUTO_BITCAST_TO_FLOAT, 7 /* .xyz */);
-            bcatcstr(glsl, ")");
-            GLSLAddAssignPrologue(psContext, numParenthesis2);
-            break;
-        }
-        case OPCODE_DP4:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DP4\n");
-#endif
-            GLSLCallHelper2(psContext, "dot", psInst, 0, 1, 2, 0);
-            break;
-        }
-        case OPCODE_INE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//INE\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_NE, TO_FLAG_INTEGER, NULL);
-            break;
-        }
-        case OPCODE_NE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//NE\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_NE, TO_FLAG_NONE, NULL);
-            break;
-        }
-        case OPCODE_IGE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IGE\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_GE, TO_FLAG_INTEGER, psNextInst);
-            break;
-        }
-        case OPCODE_ILT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ILT\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_LT, TO_FLAG_INTEGER, NULL);
-            break;
-        }
-        case OPCODE_LT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LT\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_LT, TO_FLAG_NONE, NULL);
-            break;
-        }
-        case OPCODE_IEQ:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IEQ\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_EQ, TO_FLAG_INTEGER, NULL);
-            break;
-        }
-        case OPCODE_ULT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ULT\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_LT, TO_FLAG_UNSIGNED_INTEGER, NULL);
-            break;
-        }
-        case OPCODE_UGE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//UGE\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_GE, TO_FLAG_UNSIGNED_INTEGER, NULL);
-            break;
-        }
-        case OPCODE_MOVC:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//MOVC\n");
-#endif
-            GLSLAddMOVCBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[1], &psInst->asOperands[2], &psInst->asOperands[3]);
-            break;
-        }
-        case OPCODE_SWAPC:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SWAPC\n");
-#endif
-            // TODO needs temps!!
-            GLSLAddMOVCBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[2], &psInst->asOperands[4], &psInst->asOperands[3]);
-            GLSLAddMOVCBinaryOp(psContext, &psInst->asOperands[1], &psInst->asOperands[2], &psInst->asOperands[3], &psInst->asOperands[4]);
-            break;
-        }
-
-        case OPCODE_LOG:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LOG\n");
-#endif
-            GLSLCallHelper1(psContext, "log2", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_RSQ:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//RSQ\n");
-#endif
-            GLSLCallHelper1(psContext, "inversesqrt", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_EXP:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EXP\n");
-#endif
-            GLSLCallHelper1(psContext, "exp2", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_SQRT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SQRT\n");
-#endif
-            GLSLCallHelper1(psContext, "sqrt", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_ROUND_PI:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ROUND_PI\n");
-#endif
-            GLSLCallHelper1(psContext, "ceil", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_ROUND_NI:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ROUND_NI\n");
-#endif
-            GLSLCallHelper1(psContext, "floor", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_ROUND_Z:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ROUND_Z\n");
-#endif
-            GLSLCallHelper1(psContext, "trunc", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_ROUND_NE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ROUND_NE\n");
-#endif
-            GLSLCallHelper1(psContext, "roundEven", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_FRC:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//FRC\n");
-#endif
-            GLSLCallHelper1(psContext, "fract", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_IMAX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMAX\n");
-#endif
-            GLSLCallHelper2Int(psContext, "max", psInst, 0, 1, 2, 1);
-            break;
-        }
-        case OPCODE_MAX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//MAX\n");
-#endif
-            GLSLCallHelper2(psContext, "max", psInst, 0, 1, 2, 1);
-            break;
-        }
-        case OPCODE_IMIN:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMIN\n");
-#endif
-            GLSLCallHelper2Int(psContext, "min", psInst, 0, 1, 2, 1);
-            break;
-        }
-        case OPCODE_MIN:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//MIN\n");
-#endif
-            GLSLCallHelper2(psContext, "min", psInst, 0, 1, 2, 1);
-            break;
-        }
-        case OPCODE_GATHER4:
-        {
-            // dest, coords, tex, sampler
-            const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-            const int useCombinedTextureSamplers = (psContext->flags & HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS) ? 1 : 0;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//GATHER4\n");
-#endif
-            // gather4 r7.xyzw, r3.xyxx, t3.xyzw, s0.x
-            AddIndentation(psContext);  // TODO FIXME integer samplers
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, GetNumSwizzleElements(&psInst->asOperands[2]), &numParenthesis);
-            bcatcstr(glsl, "textureGather(");
-
-            if (!useCombinedTextureSamplers)
-                ResourceName(glsl, psContext, RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, 0);
-            else
-                bconcat(glsl,
-                        TextureSamplerName(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 0));
-
-            bcatcstr(glsl, ", ");
-            GLSLTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-            bcatcstr(glsl, ")");
-            // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-            // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-            psInst->asOperands[2].iWriteMaskEnabled = 1;
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-
-            AddSwizzleUsingElementCount(psContext, GetNumSwizzleElements(&psInst->asOperands[0]));
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-        case OPCODE_GATHER4_PO_C:
-        {
-            // dest, coords, offset, tex, sampler, srcReferenceValue
-            const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[3].ui32RegisterNumber];
-            const int useCombinedTextureSamplers = (psContext->flags & HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS) ? 1 : 0;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//GATHER4_PO_C\n");
-#endif
-
-            AddIndentation(psContext);  // TODO FIXME integer samplers
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, GetNumSwizzleElements(&psInst->asOperands[2]), &numParenthesis);
-            bcatcstr(glsl, "textureGatherOffset(");
-
-            if (!useCombinedTextureSamplers)
-                ResourceName(glsl, psContext, RGROUP_TEXTURE, psInst->asOperands[3].ui32RegisterNumber, 1);
-            else
-                bconcat(glsl,
-                        TextureSamplerName(&psContext->psShader->sInfo, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1));
-
-            bcatcstr(glsl, ", ");
-
-            GLSLTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[5], TO_FLAG_NONE);
-
-            bcatcstr(glsl, ", ivec2(");
-            // ivec2 offset
-            psInst->asOperands[2].aui32Swizzle[2] = 0xFFFFFFFF;
-            psInst->asOperands[2].aui32Swizzle[3] = 0xFFFFFFFF;
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, "))");
-            // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-            // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-            psInst->asOperands[2].iWriteMaskEnabled = 1;
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[3]);
-            AddSwizzleUsingElementCount(psContext, GetNumSwizzleElements(&psInst->asOperands[0]));
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-        case OPCODE_GATHER4_PO:
-        {
-            // dest, coords, offset, tex, sampler
-            const int useCombinedTextureSamplers = (psContext->flags & HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS) ? 1 : 0;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//GATHER4_PO\n");
-#endif
-
-            AddIndentation(psContext);  // TODO FIXME integer samplers
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, GetNumSwizzleElements(&psInst->asOperands[2]), &numParenthesis);
-            bcatcstr(glsl, "textureGatherOffset(");
-
-            if (!useCombinedTextureSamplers)
-                ResourceName(glsl, psContext, RGROUP_TEXTURE, psInst->asOperands[3].ui32RegisterNumber, 0);
-            else
-                bconcat(glsl,
-                        TextureSamplerName(&psContext->psShader->sInfo, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[4].ui32RegisterNumber, 0));
-
-            bcatcstr(glsl, ", ");
-            // Texture coord cannot be vec4
-            // Determining if it is a vec3 for vec2 yet to be done.
-            psInst->asOperands[1].aui32Swizzle[2] = 0xFFFFFFFF;
-            psInst->asOperands[1].aui32Swizzle[3] = 0xFFFFFFFF;
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-
-            bcatcstr(glsl, ", ivec2(");
-            // ivec2 offset
-            psInst->asOperands[2].aui32Swizzle[2] = 0xFFFFFFFF;
-            psInst->asOperands[2].aui32Swizzle[3] = 0xFFFFFFFF;
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, "))");
-            // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-            // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-            psInst->asOperands[2].iWriteMaskEnabled = 1;
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[3]);
-            AddSwizzleUsingElementCount(psContext, GetNumSwizzleElements(&psInst->asOperands[0]));
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-        case OPCODE_GATHER4_C:
-        {
-            // dest, coords, tex, sampler srcReferenceValue
-            const int useCombinedTextureSamplers = (psContext->flags & HLSLCC_FLAG_COMBINE_TEXTURE_SAMPLERS) ? 1 : 0;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//GATHER4_C\n");
-#endif
-
-            AddIndentation(psContext);  // TODO FIXME integer samplers
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, GetNumSwizzleElements(&psInst->asOperands[2]), &numParenthesis);
-            bcatcstr(glsl, "textureGather(");
-
-            if (!useCombinedTextureSamplers)
-                ResourceName(glsl, psContext, RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, 1);
-            else
-                bconcat(glsl,
-                        TextureSamplerName(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1));
-
-            bcatcstr(glsl, ", ");
-            // Texture coord cannot be vec4
-            // Determining if it is a vec3 for vec2 yet to be done.
-            psInst->asOperands[1].aui32Swizzle[2] = 0xFFFFFFFF;
-            psInst->asOperands[1].aui32Swizzle[3] = 0xFFFFFFFF;
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[4], TO_FLAG_NONE);
-            bcatcstr(glsl, ")");
-            // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-            // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-            psInst->asOperands[2].iWriteMaskEnabled = 1;
-            TranslateOperandSwizzle(psContext, &psInst->asOperands[2]);
-            AddSwizzleUsingElementCount(psContext, GetNumSwizzleElements(&psInst->asOperands[0]));
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-        case OPCODE_SAMPLE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SAMPLE\n");
-#endif
-            GLSLTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_NONE);
-            break;
-        }
-        case OPCODE_SAMPLE_L:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SAMPLE_L\n");
-#endif
-            GLSLTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_LOD);
-            break;
-        }
-        case OPCODE_SAMPLE_C:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SAMPLE_C\n");
-#endif
-
-            GLSLTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_DEPTHCOMPARE);
-            break;
-        }
-        case OPCODE_SAMPLE_C_LZ:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SAMPLE_C_LZ\n");
-#endif
-
-            GLSLTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_DEPTHCOMPARE | TEXSMP_FLAG_FIRSTLOD);
-            break;
-        }
-        case OPCODE_SAMPLE_D:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SAMPLE_D\n");
-#endif
-
-            GLSLTranslateTextureSample(psContext, psInst, TEXSMP_FLAGS_GRAD);
-            break;
-        }
-        case OPCODE_SAMPLE_B:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SAMPLE_B\n");
-#endif
-
-            GLSLTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_BIAS);
-            break;
-        }
-        case OPCODE_RET:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//RET\n");
-#endif
-            if (psContext->havePostShaderCode[psContext->currentPhase])
-            {
-#ifdef _DEBUG
-                AddIndentation(psContext);
-                bcatcstr(glsl, "//--- Post shader code ---\n");
-#endif
-                bconcat(glsl, psContext->postShaderCode[psContext->currentPhase]);
-#ifdef _DEBUG
-                AddIndentation(psContext);
-                bcatcstr(glsl, "//--- End post shader code ---\n");
-#endif
-            }
-            AddIndentation(psContext);
-            bcatcstr(glsl, "return;\n");
-            break;
-        }
-        case OPCODE_INTERFACE_CALL:
-        {
-            const char* name;
-            ShaderVar* psVar;
-            uint32_t varFound;
-
-            uint32_t funcPointer;
-            uint32_t funcTableIndex;
-            uint32_t funcTable;
-            uint32_t funcBodyIndex;
-            uint32_t funcBody;
-            uint32_t ui32NumBodiesPerTable;
-
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//INTERFACE_CALL\n");
-#endif
-
-            ASSERT(psInst->asOperands[0].eIndexRep[0] == OPERAND_INDEX_IMMEDIATE32);
-
-            funcPointer = psInst->asOperands[0].aui32ArraySizes[0];
-            funcTableIndex = psInst->asOperands[0].aui32ArraySizes[1];
-            funcBodyIndex = psInst->ui32FuncIndexWithinInterface;
-
-            ui32NumBodiesPerTable = psContext->psShader->funcPointer[funcPointer].ui32NumBodiesPerTable;
-
-            funcTable = psContext->psShader->funcPointer[funcPointer].aui32FuncTables[funcTableIndex];
-
-            funcBody = psContext->psShader->funcTable[funcTable].aui32FuncBodies[funcBodyIndex];
-
-            varFound = GetInterfaceVarFromOffset(funcPointer, &psContext->psShader->sInfo, &psVar);
-
-            ASSERT(varFound);
-
-            name = &psVar->Name[0];
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, name);
-            TranslateOperandIndexMAD(psContext, &psInst->asOperands[0], 1, ui32NumBodiesPerTable, funcBodyIndex);
-            // bformata(glsl, "[%d]", funcBodyIndex);
-            bcatcstr(glsl, "();\n");
-            break;
-        }
-        case OPCODE_LABEL:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LABEL\n");
-#endif
-            --psContext->indent;
-            AddIndentation(psContext);
-            bcatcstr(glsl, "}\n");  // Closing brace ends the previous function.
-            AddIndentation(psContext);
-
-            bcatcstr(glsl, "subroutine(SubroutineType)\n");
-            bcatcstr(glsl, "void ");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, "(){\n");
-            ++psContext->indent;
-            break;
-        }
-        case OPCODE_COUNTBITS:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//COUNTBITS\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = bitCount(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_FIRSTBIT_HI:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//FIRSTBIT_HI\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER | TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = findMSB(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_FIRSTBIT_LO:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//FIRSTBIT_LO\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER | TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = findLSB(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_FIRSTBIT_SHI:  // signed high
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//FIRSTBIT_SHI\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = findMSB(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_BFREV:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//BFREV\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = bitfieldReverse(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_BFI:
-        {
-            uint32_t numelements_width = GetNumSwizzleElements(&psInst->asOperands[1]);
-            uint32_t numelements_offset = GetNumSwizzleElements(&psInst->asOperands[2]);
-            uint32_t numelements_dest = GetNumSwizzleElements(&psInst->asOperands[0]);
-            uint32_t numoverall_elements = min(min(numelements_width, numelements_offset), numelements_dest);
-            uint32_t i, j;
-            static const char* bfi_elementidx[] = {"x", "y", "z", "w"};
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//BFI\n");
-#endif
-
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_DESTINATION);
-            bformata(glsl, " = ivec%d(", numoverall_elements);
-            for (i = 0; i < numoverall_elements; ++i)
-            {
-                bcatcstr(glsl, "bitfieldInsert(");
-
-                for (j = 4; j >= 1; --j)
-                {
-                    uint32_t opSwizzleCount = GetNumSwizzleElements(&psInst->asOperands[j]);
-
-                    if (opSwizzleCount != 1)
-                        bcatcstr(glsl, " (");
-                    TranslateOperand(psContext, &psInst->asOperands[j], TO_FLAG_INTEGER);
-                    if (opSwizzleCount != 1)
-                        bformata(glsl, " ).%s", bfi_elementidx[i]);
-                    if (j != 1)
-                        bcatcstr(glsl, ",");
-                }
-
-                bcatcstr(glsl, ") ");
-                if (i + 1 != numoverall_elements)
-                    bcatcstr(glsl, ", ");
-            }
-
-            bcatcstr(glsl, ").");
-            for (i = 0; i < numoverall_elements; ++i)
-                bformata(glsl, "%s", bfi_elementidx[i]);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case OPCODE_CUT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//CUT\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "EndPrimitive();\n");
-            break;
-        }
-        case OPCODE_EMIT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EMIT\n");
-#endif
-            if (psContext->havePostShaderCode[psContext->currentPhase])
-            {
-#ifdef _DEBUG
-                AddIndentation(psContext);
-                bcatcstr(glsl, "//--- Post shader code ---\n");
-#endif
-                bconcat(glsl, psContext->postShaderCode[psContext->currentPhase]);
-#ifdef _DEBUG
-                AddIndentation(psContext);
-                bcatcstr(glsl, "//--- End post shader code ---\n");
-#endif
-            }
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, "EmitVertex();\n");
-            break;
-        }
-        case OPCODE_EMITTHENCUT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EMITTHENCUT\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "EmitVertex();\nEndPrimitive();\n");
-            break;
-        }
-
-        case OPCODE_CUT_STREAM:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//CUT\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "EndStreamPrimitive(");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, ");\n");
-
-            break;
-        }
-        case OPCODE_EMIT_STREAM:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EMIT_STREAM\n");
-#endif
-            if (psContext->havePostShaderCode[psContext->currentPhase])
-            {
-#ifdef _DEBUG
-                AddIndentation(psContext);
-                bcatcstr(glsl, "//--- Post shader code ---\n");
-#endif
-                bconcat(glsl, psContext->postShaderCode[psContext->currentPhase]);
-#ifdef _DEBUG
-                AddIndentation(psContext);
-                bcatcstr(glsl, "//--- End post shader code ---\n");
-#endif
-            }
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, "EmitStreamVertex(");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_EMITTHENCUT_STREAM:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EMITTHENCUT\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "EmitStreamVertex(");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, ");\n");
-            bcatcstr(glsl, "EndStreamPrimitive(");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_REP:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//REP\n");
-#endif
-            // Need to handle nesting.
-            // Max of 4 for rep - 'Flow Control Limitations' http://msdn.microsoft.com/en-us/library/windows/desktop/bb219848(v=vs.85).aspx
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, "RepCounter = ");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            bcatcstr(glsl, ";\n");
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, "while(RepCounter!=0){\n");
-            ++psContext->indent;
-            break;
-        }
-        case OPCODE_ENDREP:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ENDREP\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "RepCounter--;\n");
-
-            --psContext->indent;
-
-            AddIndentation(psContext);
-            bcatcstr(glsl, "}\n");
-            break;
-        }
-        case OPCODE_LOOP:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LOOP\n");
-#endif
-            AddIndentation(psContext);
-
-            if (psInst->ui32NumOperands == 2)
-            {
-                // DX9 version
-                ASSERT(psInst->asOperands[0].eType == OPERAND_TYPE_SPECIAL_LOOPCOUNTER);
-                bcatcstr(glsl, "for(");
-                bcatcstr(glsl, "LoopCounter = ");
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-                bcatcstr(glsl, ".y, ZeroBasedCounter = 0;");
-                bcatcstr(glsl, "ZeroBasedCounter < ");
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-                bcatcstr(glsl, ".x;");
-
-                bcatcstr(glsl, "LoopCounter += ");
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-                bcatcstr(glsl, ".z, ZeroBasedCounter++){\n");
-                ++psContext->indent;
-            }
-            else
-            {
-                bcatcstr(glsl, "while(true){\n");
-                ++psContext->indent;
-            }
-            break;
-        }
-        case OPCODE_ENDLOOP:
-        {
-            --psContext->indent;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ENDLOOP\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "}\n");
-            break;
-        }
-        case OPCODE_BREAK:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//BREAK\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "break;\n");
-            break;
-        }
-        case OPCODE_BREAKC:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//BREAKC\n");
-#endif
-            AddIndentation(psContext);
-
-            GLSLTranslateConditional(psContext, psInst, glsl);
-            break;
-        }
-        case OPCODE_CONTINUEC:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//CONTINUEC\n");
-#endif
-            AddIndentation(psContext);
-
-            GLSLTranslateConditional(psContext, psInst, glsl);
-            break;
-        }
-        case OPCODE_IF:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IF\n");
-#endif
-            AddIndentation(psContext);
-
-            GLSLTranslateConditional(psContext, psInst, glsl);
-            ++psContext->indent;
-            break;
-        }
-        case OPCODE_RETC:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//RETC\n");
-#endif
-            AddIndentation(psContext);
-
-            GLSLTranslateConditional(psContext, psInst, glsl);
-            break;
-        }
-        case OPCODE_ELSE:
-        {
-            --psContext->indent;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ELSE\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "} else {\n");
-            psContext->indent++;
-            break;
-        }
-        case OPCODE_ENDSWITCH:
-        case OPCODE_ENDIF:
-        {
-            --psContext->indent;
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ENDIF\n");
-            AddIndentation(psContext);
-            bcatcstr(glsl, "}\n");
-            break;
-        }
-        case OPCODE_CONTINUE:
-        {
-            AddIndentation(psContext);
-            bcatcstr(glsl, "continue;\n");
-            break;
-        }
-        case OPCODE_DEFAULT:
-        {
-            --psContext->indent;
-            AddIndentation(psContext);
-            bcatcstr(glsl, "default:\n");
-            ++psContext->indent;
-            break;
-        }
-        case OPCODE_NOP:
-        {
-            break;
-        }
-        case OPCODE_SYNC:
-        {
-            const uint32_t ui32SyncFlags = psInst->ui32SyncFlags;
-
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SYNC\n");
-#endif
-
-            if (ui32SyncFlags & SYNC_THREADS_IN_GROUP)
-            {
-                AddIndentation(psContext);
-                bcatcstr(glsl, "groupMemoryBarrier();\n");
-            }
-            if (ui32SyncFlags & SYNC_THREAD_GROUP_SHARED_MEMORY)
-            {
-                AddIndentation(psContext);
-                bcatcstr(glsl, "memoryBarrierShared();\n");
-            }
-            if (ui32SyncFlags & (SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GROUP | SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GLOBAL))
-            {
-                AddIndentation(psContext);
-                bcatcstr(glsl, "memoryBarrier();\n");
-            }
-            break;
-        }
-        case OPCODE_SWITCH:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//SWITCH\n");
-#endif
-            AddIndentation(psContext);
-            bcatcstr(glsl, "switch(int(");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ")){\n");
-
-            psContext->indent += 2;
-            break;
-        }
-        case OPCODE_CASE:
-        {
-            --psContext->indent;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//case\n");
-#endif
-            AddIndentation(psContext);
-
-            bcatcstr(glsl, "case ");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ":\n");
-
-            ++psContext->indent;
-            break;
-        }
-        case OPCODE_EQ:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EQ\n");
-#endif
-            GLSLAddComparision(psContext, psInst, GLSL_CMP_EQ, TO_FLAG_NONE, NULL);
-            break;
-        }
-        case OPCODE_USHR:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//USHR\n");
-#endif
-            GLSLCallBinaryOp(psContext, ">>", psInst, 0, 1, 2, SVT_UINT);
-            break;
-        }
-        case OPCODE_ISHL:
-        {
-            SHADER_VARIABLE_TYPE eType = SVT_INT;
-
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ISHL\n");
-#endif
-
-            if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-            {
-                eType = SVT_UINT;
-            }
-
-            GLSLCallBinaryOp(psContext, "<<", psInst, 0, 1, 2, eType);
-            break;
-        }
-        case OPCODE_ISHR:
-        {
-            SHADER_VARIABLE_TYPE eType = SVT_INT;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//ISHR\n");
-#endif
-
-            if (GetOperandDataType(psContext, &psInst->asOperands[0]) == SVT_UINT)
-            {
-                eType = SVT_UINT;
-            }
-
-            GLSLCallBinaryOp(psContext, ">>", psInst, 0, 1, 2, eType);
-            break;
-        }
-        case OPCODE_LD:
-        case OPCODE_LD_MS:
-        {
-            ResourceBinding* psBinding = 0;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            if (psInst->eOpcode == OPCODE_LD)
-                bcatcstr(glsl, "//LD\n");
-            else
-                bcatcstr(glsl, "//LD_MS\n");
-#endif
-
-            GetResourceFromBindingPoint(RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, &psContext->psShader->sInfo, &psBinding);
-
-            if (psInst->bAddressOffset)
-            {
-                GLSLTranslateTexelFetchOffset(psContext, psInst, psBinding, glsl);
-            }
-            else
-            {
-                GLSLTranslateTexelFetch(psContext, psInst, psBinding, glsl);
-            }
-            break;
-        }
-        case OPCODE_DISCARD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DISCARD\n");
-#endif
-            AddIndentation(psContext);
-            if (psContext->psShader->ui32MajorVersion <= 3)
-            {
-                bcatcstr(glsl, "if(any(lessThan((");
-                TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_NONE);
-
-                if (psContext->psShader->ui32MajorVersion == 1)
-                {
-                    /* SM1.X only kills based on the rgb channels */
-                    bcatcstr(glsl, ").xyz, vec3(0)))){discard;}\n");
-                }
-                else
-                {
-                    bcatcstr(glsl, "), vec4(0)))){discard;}\n");
-                }
-            }
-            else if (psInst->eBooleanTestType == INSTRUCTION_TEST_ZERO)
-            {
-                bcatcstr(glsl, "if((");
-                TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-                bcatcstr(glsl, ")==0){discard;}\n");
-            }
-            else
-            {
-                ASSERT(psInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO);
-                bcatcstr(glsl, "if((");
-                TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-                bcatcstr(glsl, ")!=0){discard;}\n");
-            }
-            break;
-        }
-        case OPCODE_LOD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LOD\n");
-#endif
-            // LOD computes the following vector (ClampedLOD, NonClampedLOD, 0, 0)
-
-            AddIndentation(psContext);
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, 4, &numParenthesis);
-
-            // If the core language does not have query-lod feature,
-            // then the extension is used. The name of the function
-            // changed between extension and core.
-            if (HaveQueryLod(psContext->psShader->eTargetLanguage))
-            {
-                bcatcstr(glsl, "textureQueryLod(");
-            }
-            else
-            {
-                bcatcstr(glsl, "textureQueryLOD(");
-            }
-
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ",");
-            GLSLTranslateTexCoord(psContext, psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber], &psInst->asOperands[1]);
-            bcatcstr(glsl, ")");
-
-            // The swizzle on srcResource allows the returned values to be swizzled arbitrarily before they are written to the destination.
-
-            // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-            // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-            psInst->asOperands[2].iWriteMaskEnabled = 1;
-            TranslateOperandSwizzleWithMask(psContext, &psInst->asOperands[2], GetOperandWriteMask(&psInst->asOperands[0]));
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-        case OPCODE_EVAL_CENTROID:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EVAL_CENTROID\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = interpolateAtCentroid(");
-            // interpolateAtCentroid accepts in-qualified variables.
-            // As long as bytecode only writes vX registers in declarations
-            // we should be able to use the declared name directly.
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_DECLARATION_NAME);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_EVAL_SAMPLE_INDEX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EVAL_SAMPLE_INDEX\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = interpolateAtSample(");
-            // interpolateAtSample accepts in-qualified variables.
-            // As long as bytecode only writes vX registers in declarations
-            // we should be able to use the declared name directly.
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_DECLARATION_NAME);
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_EVAL_SNAPPED:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//EVAL_SNAPPED\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = interpolateAtOffset(");
-            // interpolateAtOffset accepts in-qualified variables.
-            // As long as bytecode only writes vX registers in declarations
-            // we should be able to use the declared name directly.
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_DECLARATION_NAME);
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_INTEGER);
-            bcatcstr(glsl, ".xy);\n");
-            break;
-        }
-        case OPCODE_LD_STRUCTURED:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LD_STRUCTURED\n");
-#endif
-            GLSLTranslateShaderStorageLoad(psContext, psInst);
-            break;
-        }
-        case OPCODE_LD_UAV_TYPED:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LD_UAV_TYPED\n");
-#endif
-            switch (psInst->eResDim)
-            {
-                case RESOURCE_DIMENSION_TEXTURE1D:
-                    AddIndentation(psContext);
-                    TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-                    bcatcstr(glsl, " = imageLoad(");
-                    TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, ", (");
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                    bformata(glsl, ").x)");
-                    TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-                    bcatcstr(glsl, ";\n");
-                    break;
-                case RESOURCE_DIMENSION_TEXTURECUBE:
-                case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-                case RESOURCE_DIMENSION_TEXTURE2D:
-                case RESOURCE_DIMENSION_TEXTURE2DMS:
-                    AddIndentation(psContext);
-                    TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-                    bcatcstr(glsl, " = imageLoad(");
-                    TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, ", (");
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                    bformata(glsl, ").xy)");
-                    TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-                    bcatcstr(glsl, ";\n");
-                    break;
-                case RESOURCE_DIMENSION_TEXTURE3D:
-                case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-                case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-                case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-                    AddIndentation(psContext);
-                    TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-                    bcatcstr(glsl, " = imageLoad(");
-                    TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, ", (");
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-                    bformata(glsl, ").xyz)");
-                    TranslateOperandSwizzle(psContext, &psInst->asOperands[0]);
-                    bcatcstr(glsl, ";\n");
-                    break;
-            }
-            break;
-        }
-        case OPCODE_STORE_RAW:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//STORE_RAW\n");
-#endif
-            GLSLTranslateShaderStorageStore(psContext, psInst);
-            break;
-        }
-        case OPCODE_STORE_STRUCTURED:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//STORE_STRUCTURED\n");
-#endif
-            GLSLTranslateShaderStorageStore(psContext, psInst);
-            break;
-        }
-
-        case OPCODE_STORE_UAV_TYPED:
-        {
-            ResourceBinding* psRes;
-            int foundResource;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//STORE_UAV_TYPED\n");
-#endif
-            AddIndentation(psContext);
-
-            foundResource = GetResourceFromBindingPoint(RGROUP_UAV, psInst->asOperands[0].ui32RegisterNumber, &psContext->psShader->sInfo, &psRes);
-
-            ASSERT(foundResource);
-
-            bcatcstr(glsl, "imageStore(");
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_NAME_ONLY);
-            switch (psRes->eDimension)
-            {
-                case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-                    bcatcstr(glsl, ", int(");
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, "), ");
-                    break;
-                case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-                case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-                case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:
-                    bcatcstr(glsl, ", ivec2(");
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, ".xy), ");
-                    break;
-                case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-                case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-                case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-                case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-                    bcatcstr(glsl, ", ivec3(");
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, ".xyz), ");
-                    break;
-                case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-                    bcatcstr(glsl, ", ivec4(");
-                    TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                    bcatcstr(glsl, ".xyzw) ");
-                    break;
-            };
-
-            TranslateOperand(psContext, &psInst->asOperands[2], GLSLResourceReturnTypeToFlag(psRes->ui32ReturnType));
-            bformata(glsl, ");\n");
-
-            break;
-        }
-        case OPCODE_LD_RAW:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LD_RAW\n");
-#endif
-
-            GLSLTranslateShaderStorageLoad(psContext, psInst);
-            break;
-        }
-
-        case OPCODE_ATOMIC_CMP_STORE:
-        case OPCODE_IMM_ATOMIC_AND:
-        case OPCODE_ATOMIC_AND:
-        case OPCODE_IMM_ATOMIC_IADD:
-        case OPCODE_ATOMIC_IADD:
-        case OPCODE_ATOMIC_OR:
-        case OPCODE_ATOMIC_XOR:
-        case OPCODE_ATOMIC_IMIN:
-        case OPCODE_ATOMIC_UMIN:
-        case OPCODE_IMM_ATOMIC_IMAX:
-        case OPCODE_IMM_ATOMIC_IMIN:
-        case OPCODE_IMM_ATOMIC_UMAX:
-        case OPCODE_IMM_ATOMIC_UMIN:
-        case OPCODE_IMM_ATOMIC_OR:
-        case OPCODE_IMM_ATOMIC_XOR:
-        case OPCODE_IMM_ATOMIC_EXCH:
-        case OPCODE_IMM_ATOMIC_CMP_EXCH:
-        {
-            TranslateAtomicMemOp(psContext, psInst);
-            break;
-        }
-        case OPCODE_UBFE:
-        case OPCODE_IBFE:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            if (psInst->eOpcode == OPCODE_UBFE)
-                bcatcstr(glsl, "//OPCODE_UBFE\n");
-            else
-                bcatcstr(glsl, "//OPCODE_IBFE\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = bitfieldExtract(");
-            TranslateOperand(psContext, &psInst->asOperands[3], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ", ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-        case OPCODE_RCP:
-        {
-            const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//RCP\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = (vec4(1.0) / vec4(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(glsl, "))");
-            AddSwizzleUsingElementCount(psContext, destElemCount);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case OPCODE_F32TOF16:
-        {
-            const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-            const uint32_t s0ElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-            uint32_t destElem;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//F32TOF16\n");
-#endif
-            for (destElem = 0; destElem < destElemCount; ++destElem)
-            {
-                const char* swizzle[] = {".x", ".y", ".z", ".w"};
-
-                // unpackHalf2x16 converts two f16s packed into uint to two f32s.
-
-                // dest.swiz.x = unpackHalf2x16(src.swiz.x).x
-                // dest.swiz.y = unpackHalf2x16(src.swiz.y).x
-                // dest.swiz.z = unpackHalf2x16(src.swiz.z).x
-                // dest.swiz.w = unpackHalf2x16(src.swiz.w).x
-
-                AddIndentation(psContext);
-                TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-                if (destElemCount > 1)
-                    bcatcstr(glsl, swizzle[destElem]);
-
-                bcatcstr(glsl, " = unpackHalf2x16(");
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-                if (s0ElemCount > 1)
-                    bcatcstr(glsl, swizzle[destElem]);
-                bcatcstr(glsl, ").x;\n");
-            }
-            break;
-        }
-        case OPCODE_F16TOF32:
-        {
-            const uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-            const uint32_t s0ElemCount = GetNumSwizzleElements(&psInst->asOperands[1]);
-            uint32_t destElem;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//F16TOF32\n");
-#endif
-            for (destElem = 0; destElem < destElemCount; ++destElem)
-            {
-                const char* swizzle[] = {".x", ".y", ".z", ".w"};
-
-                // packHalf2x16 converts two f32s to two f16s packed into a uint.
-
-                // dest.swiz.x = packHalf2x16(vec2(src.swiz.x)) & 0xFFFF
-                // dest.swiz.y = packHalf2x16(vec2(src.swiz.y)) & 0xFFFF
-                // dest.swiz.z = packHalf2x16(vec2(src.swiz.z)) & 0xFFFF
-                // dest.swiz.w = packHalf2x16(vec2(src.swiz.w)) & 0xFFFF
-
-                AddIndentation(psContext);
-                TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION | TO_FLAG_UNSIGNED_INTEGER);
-                if (destElemCount > 1)
-                    bcatcstr(glsl, swizzle[destElem]);
-
-                bcatcstr(glsl, " = packHalf2x16(vec2(");
-                TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-                if (s0ElemCount > 1)
-                    bcatcstr(glsl, swizzle[destElem]);
-                bcatcstr(glsl, ")) & 0xFFFF;\n");
-            }
-            break;
-        }
-        case OPCODE_INEG:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//INEG\n");
-#endif
-            // dest = 0 - src0
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION | TO_FLAG_INTEGER);
-            bcatcstr(glsl, " = 0 - ");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE | TO_FLAG_INTEGER);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case OPCODE_DERIV_RTX_COARSE:
-        case OPCODE_DERIV_RTX_FINE:
-        case OPCODE_DERIV_RTX:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DERIV_RTX\n");
-#endif
-            GLSLCallHelper1(psContext, "dFdx", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_DERIV_RTY_COARSE:
-        case OPCODE_DERIV_RTY_FINE:
-        case OPCODE_DERIV_RTY:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DERIV_RTY\n");
-#endif
-            GLSLCallHelper1(psContext, "dFdy", psInst, 0, 1, 1);
-            break;
-        }
-        case OPCODE_LRP:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//LRP\n");
-#endif
-            GLSLCallHelper3(psContext, "mix", psInst, 0, 2, 3, 1, 1);
-            break;
-        }
-        case OPCODE_DP2ADD:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//DP2ADD\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = dot(vec2(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(glsl, "), vec2(");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ")) + ");
-            TranslateOperand(psContext, &psInst->asOperands[3], TO_FLAG_NONE);
-            bcatcstr(glsl, ";\n");
-            break;
-        }
-        case OPCODE_POW:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//POW\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = pow(abs(");
-            TranslateOperand(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(glsl, "), ");
-            TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(glsl, ");\n");
-            break;
-        }
-
-        case OPCODE_IMM_ATOMIC_ALLOC:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_ALLOC\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            bcatcstr(glsl, " = int(atomicCounterIncrement(");
-            ResourceName(glsl, psContext, RGROUP_UAV, psInst->asOperands[1].ui32RegisterNumber, 0);
-            bformata(glsl, "_counter");
-            bcatcstr(glsl, "));\n");
-            break;
-        }
-        case OPCODE_IMM_ATOMIC_CONSUME:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//IMM_ATOMIC_CONSUME\n");
-#endif
-            AddIndentation(psContext);
-            TranslateOperand(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            // Temps are always signed and atomci counters are always unsigned
-            // at the moment.
-            bcatcstr(glsl, " = int(atomicCounterDecrement(");
-            ResourceName(glsl, psContext, RGROUP_UAV, psInst->asOperands[1].ui32RegisterNumber, 0);
-            bformata(glsl, "_counter");
-            bcatcstr(glsl, "));\n");
-            break;
-        }
-
-        case OPCODE_NOT:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//INOT\n");
-#endif
-            AddIndentation(psContext);
-            GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_INT, GetNumSwizzleElements(&psInst->asOperands[1]), &numParenthesis);
-
-            bcatcstr(glsl, "~");
-            TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER, GetOperandWriteMask(&psInst->asOperands[0]));
-            GLSLAddAssignPrologue(psContext, numParenthesis);
-            break;
-        }
-        case OPCODE_XOR:
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//XOR\n");
-#endif
-
-            GLSLCallBinaryOp(psContext, "^", psInst, 0, 1, 2, SVT_UINT);
-            break;
-        }
-        case OPCODE_RESINFO:
-        {
-            uint32_t destElemCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-            uint32_t destElem;
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(glsl, "//RESINFO\n");
-#endif
-
-            for (destElem = 0; destElem < destElemCount; ++destElem)
-            {
-
-                GetResInfoData(psContext, psInst, psInst->asOperands[2].aui32Swizzle[destElem], destElem);
-            }
-
-            break;
-        }
-
-        case OPCODE_DMAX:
-        case OPCODE_DMIN:
-        case OPCODE_DMUL:
-        case OPCODE_DEQ:
-        case OPCODE_DGE:
-        case OPCODE_DLT:
-        case OPCODE_DNE:
-        case OPCODE_DMOV:
-        case OPCODE_DMOVC:
-        case OPCODE_DTOF:
-        case OPCODE_FTOD:
-        case OPCODE_DDIV:
-        case OPCODE_DFMA:
-        case OPCODE_DRCP:
-        case OPCODE_MSAD:
-        case OPCODE_DTOI:
-        case OPCODE_DTOU:
-        case OPCODE_ITOD:
-        case OPCODE_UTOD:
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    if (psInst->bSaturate)  // Saturate is only for floating point data (float opcodes or MOV)
-    {
-        int dstCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-        AddIndentation(psContext);
-        GLSLMETALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, dstCount, &numParenthesis);
-        bcatcstr(glsl, "clamp(");
-
-        TranslateOperand(psContext, &psInst->asOperands[0], TO_AUTO_BITCAST_TO_FLOAT);
-        bcatcstr(glsl, ", 0.0, 1.0)");
-        GLSLAddAssignPrologue(psContext, numParenthesis);
-    }
-}
-
-static int GLSLIsIntegerImmediateOpcode(OPCODE_TYPE eOpcode)
-{
-    switch (eOpcode)
-    {
-        case OPCODE_IADD:
-        case OPCODE_IF:
-        case OPCODE_IEQ:
-        case OPCODE_IGE:
-        case OPCODE_ILT:
-        case OPCODE_IMAD:
-        case OPCODE_IMAX:
-        case OPCODE_IMIN:
-        case OPCODE_IMUL:
-        case OPCODE_INE:
-        case OPCODE_INEG:
-        case OPCODE_ISHL:
-        case OPCODE_ISHR:
-        case OPCODE_ITOF:
-        case OPCODE_USHR:
-        case OPCODE_AND:
-        case OPCODE_OR:
-        case OPCODE_XOR:
-        case OPCODE_BREAKC:
-        case OPCODE_CONTINUEC:
-        case OPCODE_RETC:
-        case OPCODE_DISCARD:
-            // MOV is typeless.
-            // Treat immediates as int, bitcast to float if necessary
-        case OPCODE_MOV:
-        case OPCODE_MOVC:
-        {
-            return 1;
-        }
-        default:
-        {
-            return 0;
-        }
-    }
-}
-
-int InstructionUsesRegister(const Instruction* psInst, const Operand* psOperand)
-{
-    uint32_t operand;
-    for (operand = 0; operand < psInst->ui32NumOperands; ++operand)
-    {
-        if (psInst->asOperands[operand].eType == psOperand->eType)
-        {
-            if (psInst->asOperands[operand].ui32RegisterNumber == psOperand->ui32RegisterNumber)
-            {
-                if (CompareOperandSwizzles(&psInst->asOperands[operand], psOperand))
-                {
-                    return 1;
-                }
-            }
-        }
-    }
-    return 0;
-}
-
-void MarkIntegerImmediates(HLSLCrossCompilerContext* psContext)
-{
-    const uint32_t count = psContext->psShader->asPhase[MAIN_PHASE].pui32InstCount[0];
-    Instruction* psInst = psContext->psShader->asPhase[MAIN_PHASE].ppsInst[0];
-    uint32_t i;
-
-    for (i = 0; i < count;)
-    {
-        if (psInst[i].eOpcode == OPCODE_MOV && psInst[i].asOperands[1].eType == OPERAND_TYPE_IMMEDIATE32 && psInst[i].asOperands[0].eType == OPERAND_TYPE_TEMP)
-        {
-            uint32_t k;
-
-            for (k = i + 1; k < count; ++k)
-            {
-                if (psInst[k].eOpcode == OPCODE_ILT)
-                {
-                    k = k;
-                }
-                if (InstructionUsesRegister(&psInst[k], &psInst[i].asOperands[0]))
-                {
-                    if (GLSLIsIntegerImmediateOpcode(psInst[k].eOpcode))
-                    {
-                        psInst[i].asOperands[1].iIntegerImmediate = 1;
-                    }
-
-                    goto next_iteration;
-                }
-            }
-        }
-    next_iteration:
-        ++i;
-    }
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLOperand.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLOperand.c
deleted file mode 100644
index f6595ad2cf..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toGLSLOperand.c
+++ /dev/null
@@ -1,1869 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/toGLSLOperand.h"
-#include "bstrlib.h"
-#include "hlslcc.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/toGLSLDeclaration.h"
-
-#include <float.h>
-#include <stdlib.h>
-
-#ifdef _MSC_VER
-#define isnan(x) _isnan(x)
-#define isinf(x) (!_finite(x))
-#endif
-
-#define fpcheck(x) (isnan(x) || isinf(x))
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-
-uint32_t SVTTypeToFlag(const SHADER_VARIABLE_TYPE eType)
-{
-    if (eType == SVT_UINT)
-    {
-        return TO_FLAG_UNSIGNED_INTEGER;
-    }
-    else if (eType == SVT_INT)
-    {
-        return TO_FLAG_INTEGER;
-    }
-    else if (eType == SVT_BOOL)
-    {
-        return TO_FLAG_INTEGER;  // TODO bools?
-    }
-    else
-    {
-        return TO_FLAG_NONE;
-    }
-}
-
-SHADER_VARIABLE_TYPE TypeFlagsToSVTType(const uint32_t typeflags)
-{
-    if (typeflags & (TO_FLAG_INTEGER | TO_AUTO_BITCAST_TO_INT))
-        return SVT_INT;
-    if (typeflags & (TO_FLAG_UNSIGNED_INTEGER | TO_AUTO_BITCAST_TO_UINT))
-        return SVT_UINT;
-    return SVT_FLOAT;
-}
-
-uint32_t GetOperandWriteMask(const Operand* psOperand)
-{
-    if (psOperand->eSelMode != OPERAND_4_COMPONENT_MASK_MODE || psOperand->ui32CompMask == 0)
-        return OPERAND_4_COMPONENT_MASK_ALL;
-
-    return psOperand->ui32CompMask;
-}
-
-const char* GetConstructorForType(const SHADER_VARIABLE_TYPE eType, const int components)
-{
-    static const char* const uintTypes[] = {" ", "uint", "uvec2", "uvec3", "uvec4"};
-    static const char* const intTypes[] = {" ", "int", "ivec2", "ivec3", "ivec4"};
-    static const char* const floatTypes[] = {" ", "float", "vec2", "vec3", "vec4"};
-
-    if (components < 1 || components > 4)
-        return "ERROR TOO MANY COMPONENTS IN VECTOR";
-
-    switch (eType)
-    {
-        case SVT_UINT:
-            return uintTypes[components];
-        case SVT_INT:
-            return intTypes[components];
-        case SVT_FLOAT:
-            return floatTypes[components];
-        default:
-            return "ERROR UNSUPPORTED TYPE";
-    }
-}
-
-const char* GetConstructorForTypeFlag(const uint32_t ui32Flag, const int components)
-{
-    if (ui32Flag & TO_FLAG_UNSIGNED_INTEGER || ui32Flag & TO_AUTO_BITCAST_TO_UINT)
-    {
-        return GetConstructorForType(SVT_UINT, components);
-    }
-    else if (ui32Flag & TO_FLAG_INTEGER || ui32Flag & TO_AUTO_BITCAST_TO_INT)
-    {
-        return GetConstructorForType(SVT_INT, components);
-    }
-    else
-    {
-        return GetConstructorForType(SVT_FLOAT, components);
-    }
-}
-
-int GetMaxComponentFromComponentMask(const Operand* psOperand)
-{
-    if (psOperand->iWriteMaskEnabled && psOperand->iNumComponents == 4)
-    {
-        // Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 &&
-                psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    return 4;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    return 3;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    return 2;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    return 1;
-                }
-            }
-        }
-        else
-            // Component Swizzle
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            return 4;
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            return 1;
-        }
-    }
-
-    return 4;
-}
-
-// Single component repeated
-// e..g .wwww
-uint32_t IsSwizzleReplicated(const Operand* psOperand)
-{
-    if (psOperand->iWriteMaskEnabled && psOperand->iNumComponents == 4)
-    {
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle == WWWW_SWIZZLE || psOperand->ui32Swizzle == ZZZZ_SWIZZLE || psOperand->ui32Swizzle == YYYY_SWIZZLE ||
-                psOperand->ui32Swizzle == XXXX_SWIZZLE)
-            {
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-static uint32_t GLSLGetNumberBitsSet(uint32_t a)
-{
-    // Calculate number of bits in a
-    // Taken from https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSet64
-    // Works only up to 14 bits (we're only using up to 4)
-    return (a * 0x200040008001ULL & 0x111111111111111ULL) % 0xf;
-}
-
-// e.g.
-//.z = 1
-//.x = 1
-//.yw = 2
-uint32_t GetNumSwizzleElements(const Operand* psOperand)
-{
-    return GetNumSwizzleElementsWithMask(psOperand, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-// Get the number of elements returned by operand, taking additional component mask into account
-uint32_t GetNumSwizzleElementsWithMask(const Operand* psOperand, uint32_t ui32CompMask)
-{
-    uint32_t count = 0;
-
-    switch (psOperand->eType)
-    {
-        case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED:
-            return 1;  // TODO: does mask make any sense here?
-        case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP:
-        case OPERAND_TYPE_INPUT_THREAD_ID:
-        case OPERAND_TYPE_INPUT_THREAD_GROUP_ID:
-            // Adjust component count and break to more processing
-            ((Operand*)psOperand)->iNumComponents = 3;
-            break;
-        case OPERAND_TYPE_IMMEDIATE32:
-        case OPERAND_TYPE_IMMEDIATE64:
-        case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-        case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-        case OPERAND_TYPE_OUTPUT_DEPTH:
-        {
-            // Translate numComponents into bitmask
-            // 1 -> 1, 2 -> 3, 3 -> 7 and 4 -> 15
-            uint32_t compMask = (1 << psOperand->iNumComponents) - 1;
-
-            compMask &= ui32CompMask;
-            // Calculate bits left in compMask
-            return GLSLGetNumberBitsSet(compMask);
-        }
-        default:
-        {
-            break;
-        }
-    }
-
-    if (psOperand->iWriteMaskEnabled && psOperand->iNumComponents != 1)
-    {
-        // Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t compMask = psOperand->ui32CompMask;
-            if (compMask == 0)
-                compMask = OPERAND_4_COMPONENT_MASK_ALL;
-            compMask &= ui32CompMask;
-
-            if (compMask == OPERAND_4_COMPONENT_MASK_ALL)
-                return 4;
-
-            if (compMask & OPERAND_4_COMPONENT_MASK_X)
-            {
-                count++;
-            }
-            if (compMask & OPERAND_4_COMPONENT_MASK_Y)
-            {
-                count++;
-            }
-            if (compMask & OPERAND_4_COMPONENT_MASK_Z)
-            {
-                count++;
-            }
-            if (compMask & OPERAND_4_COMPONENT_MASK_W)
-            {
-                count++;
-            }
-        }
-        else
-            // Component Swizzle
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if ((ui32CompMask & (1 << i)) == 0)
-                        continue;
-
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        count++;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        count++;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        count++;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        count++;
-                    }
-                }
-            }
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X && (ui32CompMask & OPERAND_4_COMPONENT_MASK_X))
-            {
-                count++;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y && (ui32CompMask & OPERAND_4_COMPONENT_MASK_Y))
-            {
-                count++;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z && (ui32CompMask & OPERAND_4_COMPONENT_MASK_Z))
-            {
-                count++;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W && (ui32CompMask & OPERAND_4_COMPONENT_MASK_W))
-            {
-                count++;
-            }
-        }
-
-        // Component Select 1
-    }
-
-    if (!count)
-    {
-        // Translate numComponents into bitmask
-        // 1 -> 1, 2 -> 3, 3 -> 7 and 4 -> 15
-        uint32_t compMask = (1 << psOperand->iNumComponents) - 1;
-
-        compMask &= ui32CompMask;
-        // Calculate bits left in compMask
-        return GLSLGetNumberBitsSet(compMask);
-    }
-
-    return count;
-}
-
-void AddSwizzleUsingElementCount(HLSLCrossCompilerContext* psContext, uint32_t count)
-{
-    bstring glsl = *psContext->currentShaderString;
-    if (count == 4)
-        return;
-    if (count)
-    {
-        bcatcstr(glsl, ".");
-        bcatcstr(glsl, "x");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(glsl, "y");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(glsl, "z");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(glsl, "w");
-        count--;
-    }
-}
-
-static uint32_t GLSLConvertOperandSwizzleToComponentMask(const Operand* psOperand)
-{
-    uint32_t mask = 0;
-
-    if (psOperand->iWriteMaskEnabled && psOperand->iNumComponents == 4)
-    {
-        // Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            mask = psOperand->ui32CompMask;
-        }
-        else
-            // Component Swizzle
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_X;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_Y;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_Z;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_W;
-                    }
-                }
-            }
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_X;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_Y;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_Z;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_W;
-            }
-        }
-
-        // Component Select 1
-    }
-
-    return mask;
-}
-
-// Non-zero means the components overlap
-int CompareOperandSwizzles(const Operand* psOperandA, const Operand* psOperandB)
-{
-    uint32_t maskA = GLSLConvertOperandSwizzleToComponentMask(psOperandA);
-    uint32_t maskB = GLSLConvertOperandSwizzleToComponentMask(psOperandB);
-
-    return maskA & maskB;
-}
-
-void TranslateOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    TranslateOperandSwizzleWithMask(psContext, psOperand, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-void TranslateOperandSwizzleWithMask(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask)
-{
-    bstring glsl = *psContext->currentShaderString;
-
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return;
-        }
-    }
-
-    if (psOperand->eType == OPERAND_TYPE_CONSTANT_BUFFER)
-    {
-        /*ConstantBuffer* psCBuf = NULL;
-        ShaderVar* psVar = NULL;
-        int32_t index = -1;
-        GetConstantBufferFromBindingPoint(psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-
-        //Access the Nth vec4 (N=psOperand->aui32ArraySizes[1])
-        //then apply the sizzle.
-
-        GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVar, &index);
-
-        bformata(glsl, ".%s", psVar->Name);
-        if(index != -1)
-        {
-            bformata(glsl, "[%d]", index);
-        }*/
-
-        // return;
-    }
-
-    if (psOperand->iWriteMaskEnabled && psOperand->iNumComponents != 1)
-    {
-        // Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t mask;
-            if (psOperand->ui32CompMask != 0)
-                mask = psOperand->ui32CompMask & ui32ComponentMask;
-            else
-                mask = ui32ComponentMask;
-
-            if (mask != 0 && mask != OPERAND_4_COMPONENT_MASK_ALL)
-            {
-                bcatcstr(glsl, ".");
-                if (mask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    bcatcstr(glsl, "x");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    bcatcstr(glsl, "y");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    bcatcstr(glsl, "z");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    bcatcstr(glsl, "w");
-                }
-            }
-        }
-        else
-            // Component Swizzle
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (ui32ComponentMask != OPERAND_4_COMPONENT_MASK_ALL ||
-                !(psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X && psOperand->aui32Swizzle[1] == OPERAND_4_COMPONENT_Y &&
-                  psOperand->aui32Swizzle[2] == OPERAND_4_COMPONENT_Z && psOperand->aui32Swizzle[3] == OPERAND_4_COMPONENT_W))
-            {
-                uint32_t i;
-
-                bcatcstr(glsl, ".");
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (!(ui32ComponentMask & (OPERAND_4_COMPONENT_MASK_X << i)))
-                        continue;
-
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        bcatcstr(glsl, "x");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        bcatcstr(glsl, "y");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        bcatcstr(glsl, "z");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        bcatcstr(glsl, "w");
-                    }
-                }
-            }
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)  // ui32ComponentMask is ignored in this case
-        {
-            bcatcstr(glsl, ".");
-
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                bcatcstr(glsl, "x");
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                bcatcstr(glsl, "y");
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                bcatcstr(glsl, "z");
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                bcatcstr(glsl, "w");
-            }
-        }
-
-        // Component Select 1
-    }
-}
-
-int GetFirstOperandSwizzle(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return -1;
-        }
-    }
-
-    if (psOperand->iWriteMaskEnabled && psOperand->iNumComponents == 4)
-    {
-        // Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 &&
-                psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    return 0;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    return 1;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    return 2;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    return 3;
-                }
-            }
-        }
-        else
-            // Component Swizzle
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        return 0;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        return 1;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        return 2;
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        return 3;
-                    }
-                }
-            }
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                return 0;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                return 1;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                return 2;
-            }
-            else if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                return 3;
-            }
-        }
-
-        // Component Select 1
-    }
-
-    return -1;
-}
-
-void TranslateOperandIndex(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index)
-{
-    int i = index;
-    int isGeoShader = psContext->psShader->eShaderType == GEOMETRY_SHADER ? 1 : 0;
-
-    bstring glsl = *psContext->currentShaderString;
-
-    ASSERT(index < psOperand->iIndexDims);
-
-    switch (psOperand->eIndexRep[i])
-    {
-        case OPERAND_INDEX_IMMEDIATE32:
-        {
-            if (i > 0 || isGeoShader)
-            {
-                bformata(glsl, "[%d]", psOperand->aui32ArraySizes[i]);
-            }
-            else
-            {
-                bformata(glsl, "%d", psOperand->aui32ArraySizes[i]);
-            }
-            break;
-        }
-        case OPERAND_INDEX_RELATIVE:
-        {
-            bcatcstr(glsl, "[");
-            TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-            bcatcstr(glsl, "]");
-            break;
-        }
-        case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-        {
-            bcatcstr(glsl, "[");  // Indexes must be integral.
-            TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-            bformata(glsl, " + %d]", psOperand->aui32ArraySizes[i]);
-            break;
-        }
-        default:
-        {
-            break;
-        }
-    }
-}
-
-void TranslateOperandIndexMAD(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index, uint32_t multiply, uint32_t add)
-{
-    int i = index;
-    int isGeoShader = psContext->psShader->eShaderType == GEOMETRY_SHADER ? 1 : 0;
-
-    bstring glsl = *psContext->currentShaderString;
-
-    ASSERT(index < psOperand->iIndexDims);
-
-    switch (psOperand->eIndexRep[i])
-    {
-        case OPERAND_INDEX_IMMEDIATE32:
-        {
-            if (i > 0 || isGeoShader)
-            {
-                bformata(glsl, "[%d*%d+%d]", psOperand->aui32ArraySizes[i], multiply, add);
-            }
-            else
-            {
-                bformata(glsl, "%d*%d+%d", psOperand->aui32ArraySizes[i], multiply, add);
-            }
-            break;
-        }
-        case OPERAND_INDEX_RELATIVE:
-        {
-            bcatcstr(glsl, "[int(");  // Indexes must be integral.
-            TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_NONE);
-            bformata(glsl, ")*%d+%d]", multiply, add);
-            break;
-        }
-        case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-        {
-            bcatcstr(glsl, "[(int(");  // Indexes must be integral.
-            TranslateOperand(psContext, psOperand->psSubOperand[i], TO_FLAG_NONE);
-            bformata(glsl, ") + %d)*%d+%d]", psOperand->aui32ArraySizes[i], multiply, add);
-            break;
-        }
-        default:
-        {
-            break;
-        }
-    }
-}
-
-// Returns nonzero if a direct constructor can convert src->dest
-static int GLSLCanDoDirectCast(HLSLCrossCompilerContext* psContext, SHADER_VARIABLE_TYPE src, SHADER_VARIABLE_TYPE dest)
-{
-    // Only option on pre-SM4 stuff
-    if (psContext->psShader->ui32MajorVersion < 4)
-        return 1;
-
-    // uint<->int<->bool conversions possible
-    if ((src == SVT_INT || src == SVT_UINT || src == SVT_BOOL) && (dest == SVT_INT || dest == SVT_UINT || dest == SVT_BOOL))
-        return 1;
-
-    // float<->double possible
-    if ((src == SVT_FLOAT || src == SVT_DOUBLE) && (dest == SVT_FLOAT || dest == SVT_DOUBLE))
-        return 1;
-
-    return 0;
-}
-
-static const char* GetBitcastOp(SHADER_VARIABLE_TYPE from, SHADER_VARIABLE_TYPE to)
-{
-    if (to == SVT_FLOAT && from == SVT_INT)
-        return "intBitsToFloat";
-    else if (to == SVT_FLOAT && from == SVT_UINT)
-        return "uintBitsToFloat";
-    else if (to == SVT_INT && from == SVT_FLOAT)
-        return "floatBitsToInt";
-    else if (to == SVT_UINT && from == SVT_FLOAT)
-        return "floatBitsToUint";
-
-    return "ERROR missing components in GetBitcastOp()";
-}
-
-// Helper function to print out a single 32-bit immediate value in desired format
-static void GLSLprintImmediate32(HLSLCrossCompilerContext* psContext, uint32_t value, SHADER_VARIABLE_TYPE eType)
-{
-    bstring glsl = *psContext->currentShaderString;
-    int needsParenthesis = 0;
-
-    // Print floats as bit patterns.
-    if (eType == SVT_FLOAT && psContext->psShader->ui32MajorVersion > 3)
-    {
-        bcatcstr(glsl, "intBitsToFloat(");
-        eType = SVT_INT;
-        needsParenthesis = 1;
-    }
-
-    switch (eType)
-    {
-        default:
-        case SVT_INT:
-            // Need special handling for anything >= uint 0x3fffffff
-            if (value > 0x3ffffffe)
-                bformata(glsl, "int(0x%Xu)", value);
-            else
-                bformata(glsl, "0x%X", value);
-            break;
-        case SVT_UINT:
-            bformata(glsl, "%uu", value);
-            break;
-        case SVT_FLOAT:
-            bformata(glsl, "%f", *((float*)(&value)));
-            break;
-    }
-    if (needsParenthesis)
-        bcatcstr(glsl, ")");
-}
-
-static void GLSLGLSLTranslateVariableNameWithMask(HLSLCrossCompilerContext* psContext,
-                                                  const Operand* psOperand,
-                                                  uint32_t ui32TOFlag,
-                                                  uint32_t* pui32IgnoreSwizzle,
-                                                  uint32_t ui32CompMask)
-{
-    int numParenthesis = 0;
-    int hasCtor = 0;
-    bstring glsl = *psContext->currentShaderString;
-    SHADER_VARIABLE_TYPE requestedType = TypeFlagsToSVTType(ui32TOFlag);
-    SHADER_VARIABLE_TYPE eType = GetOperandDataTypeEx(psContext, psOperand, requestedType);
-    int numComponents = GetNumSwizzleElementsWithMask(psOperand, ui32CompMask);
-    int requestedComponents = 0;
-
-    if (ui32TOFlag & TO_AUTO_EXPAND_TO_VEC2)
-        requestedComponents = 2;
-    else if (ui32TOFlag & TO_AUTO_EXPAND_TO_VEC3)
-        requestedComponents = 3;
-    else if (ui32TOFlag & TO_AUTO_EXPAND_TO_VEC4)
-        requestedComponents = 4;
-
-    requestedComponents = max(requestedComponents, numComponents);
-
-    *pui32IgnoreSwizzle = 0;
-
-    if (!(ui32TOFlag & (TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY | TO_FLAG_DECLARATION_NAME)))
-    {
-        if (psOperand->eType == OPERAND_TYPE_IMMEDIATE32 || psOperand->eType == OPERAND_TYPE_IMMEDIATE64)
-        {
-            // Mark the operand type to match whatever we're asking for in the flags.
-            ((Operand*)psOperand)->aeDataType[0] = requestedType;
-            ((Operand*)psOperand)->aeDataType[1] = requestedType;
-            ((Operand*)psOperand)->aeDataType[2] = requestedType;
-            ((Operand*)psOperand)->aeDataType[3] = requestedType;
-        }
-
-        if (eType != requestedType)
-        {
-            if (GLSLCanDoDirectCast(psContext, eType, requestedType))
-            {
-                bformata(glsl, "%s(", GetConstructorForType(requestedType, requestedComponents));
-                numParenthesis++;
-                hasCtor = 1;
-            }
-            else
-            {
-                // Direct cast not possible, need to do bitcast.
-                bformata(glsl, "%s(", GetBitcastOp(eType, requestedType));
-                numParenthesis++;
-            }
-        }
-
-        // Add ctor if needed (upscaling)
-        if (numComponents < requestedComponents && (hasCtor == 0))
-        {
-            ASSERT(numComponents == 1);
-            bformata(glsl, "%s(", GetConstructorForType(requestedType, requestedComponents));
-            numParenthesis++;
-            hasCtor = 1;
-        }
-    }
-
-    switch (psOperand->eType)
-    {
-        case OPERAND_TYPE_IMMEDIATE32:
-        {
-            if (psOperand->iNumComponents == 1)
-            {
-                GLSLprintImmediate32(psContext, *((unsigned int*)(&psOperand->afImmediates[0])), requestedType);
-            }
-            else
-            {
-                int i;
-                int firstItemAdded = 0;
-                if (hasCtor == 0)
-                {
-                    bformata(glsl, "%s(", GetConstructorForType(requestedType, numComponents));
-                    numParenthesis++;
-                    hasCtor = 1;
-                }
-                for (i = 0; i < 4; i++)
-                {
-                    uint32_t uval;
-                    if (!(ui32CompMask & (1 << i)))
-                        continue;
-
-                    if (firstItemAdded)
-                        bcatcstr(glsl, ", ");
-                    uval = *((uint32_t*)(&psOperand->afImmediates[i]));
-                    GLSLprintImmediate32(psContext, uval, requestedType);
-                    firstItemAdded = 1;
-                }
-                bcatcstr(glsl, ")");
-                *pui32IgnoreSwizzle = 1;
-                numParenthesis--;
-            }
-            break;
-        }
-        case OPERAND_TYPE_IMMEDIATE64:
-        {
-            if (psOperand->iNumComponents == 1)
-            {
-                bformata(glsl, "%f", psOperand->adImmediates[0]);
-            }
-            else
-            {
-                bformata(glsl, "dvec4(%f, %f, %f, %f)", psOperand->adImmediates[0], psOperand->adImmediates[1], psOperand->adImmediates[2],
-                         psOperand->adImmediates[3]);
-                if (psOperand->iNumComponents != 4)
-                {
-                    AddSwizzleUsingElementCount(psContext, psOperand->iNumComponents);
-                }
-            }
-            break;
-        }
-        case OPERAND_TYPE_INPUT:
-        {
-            switch (psOperand->iIndexDims)
-            {
-                case INDEX_2D:
-                {
-                    if (psOperand->aui32ArraySizes[1] == 0)  // Input index zero - position.
-                    {
-                        bcatcstr(glsl, "gl_in");
-                        TranslateOperandIndex(psContext, psOperand, 0);  // Vertex index
-                        bcatcstr(glsl, ".gl_Position");
-                    }
-                    else
-                    {
-                        const char* name = "Input";
-                        if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-                        {
-                            name = GetDeclaredInputName(psContext, psContext->psShader->eShaderType, psOperand);
-                        }
-
-                        bformata(glsl, "%s%d", name, psOperand->aui32ArraySizes[1]);
-                        TranslateOperandIndex(psContext, psOperand, 0);  // Vertex index
-                    }
-                    break;
-                }
-                default:
-                {
-                    if (psOperand->eIndexRep[0] == OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE)
-                    {
-                        bformata(glsl, "Input%d[", psOperand->ui32RegisterNumber);
-                        TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-                        bcatcstr(glsl, "]");
-                    }
-                    else
-                    {
-                        if (psContext->psShader->aIndexedInput[psOperand->ui32RegisterNumber] != 0)
-                        {
-                            const uint32_t parentIndex = psContext->psShader->aIndexedInputParents[psOperand->ui32RegisterNumber];
-                            bformata(glsl, "Input%d[%d]", parentIndex, psOperand->ui32RegisterNumber - parentIndex);
-                        }
-                        else
-                        {
-                            if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-                            {
-                                const char* name = GetDeclaredInputName(psContext, psContext->psShader->eShaderType, psOperand);
-                                bcatcstr(glsl, name);
-                            }
-                            else
-                            {
-                                bformata(glsl, "Input%d", psOperand->ui32RegisterNumber);
-                            }
-                        }
-                    }
-                    break;
-                }
-            }
-            break;
-        }
-        case OPERAND_TYPE_OUTPUT:
-        {
-            bformata(glsl, "Output%d", psOperand->ui32RegisterNumber);
-            if (psOperand->psSubOperand[0])
-            {
-                bcatcstr(glsl, "[");
-                TranslateOperand(psContext, psOperand->psSubOperand[0], TO_AUTO_BITCAST_TO_INT);
-                bcatcstr(glsl, "]");
-            }
-            break;
-        }
-        case OPERAND_TYPE_OUTPUT_DEPTH:
-        case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-        case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-        {
-            bcatcstr(glsl, "gl_FragDepth");
-            break;
-        }
-        case OPERAND_TYPE_TEMP:
-        {
-            SHADER_VARIABLE_TYPE eType2 = GetOperandDataType(psContext, psOperand);
-            bcatcstr(glsl, "Temp");
-
-            if (eType2 == SVT_INT)
-            {
-                bcatcstr(glsl, "_int");
-            }
-            else if (eType2 == SVT_UINT)
-            {
-                bcatcstr(glsl, "_uint");
-            }
-            else if (eType2 == SVT_DOUBLE)
-            {
-                bcatcstr(glsl, "_double");
-            }
-            else if (eType2 == SVT_VOID && (ui32TOFlag & TO_FLAG_DESTINATION))
-            {
-                ASSERT(0 && "Should never get here!");
-                /*                if(ui32TOFlag & TO_FLAG_INTEGER)
-                                {
-                                    bcatcstr(glsl, "_int");
-                                }
-                                else
-                                if(ui32TOFlag & TO_FLAG_UNSIGNED_INTEGER)
-                                {
-                                    bcatcstr(glsl, "_uint");
-                                }*/
-            }
-
-            bformata(glsl, "[%d]", psOperand->ui32RegisterNumber);
-
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_IMMCONSTINT:
-        {
-            bformata(glsl, "IntImmConst%d", psOperand->ui32RegisterNumber);
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_IMMCONST:
-        {
-            if (psOperand->psSubOperand[0] != NULL)
-            {
-                if (psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber] != 0)
-                    bformata(glsl, "ImmConstArray[%d + ", psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber]);
-                else
-                    bcatcstr(glsl, "ImmConstArray[");
-                TranslateOperandWithMask(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-                bcatcstr(glsl, "]");
-            }
-            else
-            {
-                bformata(glsl, "ImmConst%d", psOperand->ui32RegisterNumber);
-            }
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_OUTBASECOLOUR:
-        {
-            bcatcstr(glsl, "BaseColour");
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR:
-        {
-            bcatcstr(glsl, "OffsetColour");
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_POSITION:
-        {
-            bcatcstr(glsl, "gl_Position");
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_FOG:
-        {
-            bcatcstr(glsl, "Fog");
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_POINTSIZE:
-        {
-            bcatcstr(glsl, "gl_PointSize");
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_ADDRESS:
-        {
-            bcatcstr(glsl, "Address");
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_LOOPCOUNTER:
-        {
-            bcatcstr(glsl, "LoopCounter");
-            pui32IgnoreSwizzle[0] = 1;
-            break;
-        }
-        case OPERAND_TYPE_SPECIAL_TEXCOORD:
-        {
-            bformata(glsl, "TexCoord%d", psOperand->ui32RegisterNumber);
-            break;
-        }
-        case OPERAND_TYPE_CONSTANT_BUFFER:
-        {
-            const char* StageName = "VS";
-            ConstantBuffer* psCBuf = NULL;
-            ShaderVarType* psVarType = NULL;
-            int32_t index = -1;
-            GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-
-            switch (psContext->psShader->eShaderType)
-            {
-                case PIXEL_SHADER:
-                {
-                    StageName = "PS";
-                    break;
-                }
-                case HULL_SHADER:
-                {
-                    StageName = "HS";
-                    break;
-                }
-                case DOMAIN_SHADER:
-                {
-                    StageName = "DS";
-                    break;
-                }
-                case GEOMETRY_SHADER:
-                {
-                    StageName = "GS";
-                    break;
-                }
-                case COMPUTE_SHADER:
-                {
-                    StageName = "CS";
-                    break;
-                }
-                default:
-                {
-                    break;
-                }
-            }
-
-            if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-            {
-                pui32IgnoreSwizzle[0] = 1;
-            }
-
-            // FIXME: With ES 3.0 the buffer name is often not prepended to variable names
-            if (((psContext->flags & HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT) != HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT) &&
-                ((psContext->flags & HLSLCC_FLAG_DISABLE_GLOBALS_STRUCT) != HLSLCC_FLAG_DISABLE_GLOBALS_STRUCT))
-            {
-                if (psCBuf)
-                {
-                    //$Globals.
-                    if (psCBuf->Name[0] == '$')
-                    {
-                        bformata(glsl, "Globals%s", StageName);
-                    }
-                    else
-                    {
-                        bformata(glsl, "%s%s", psCBuf->Name, StageName);
-                    }
-                    if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-                    {
-                        bcatcstr(glsl, ".");
-                    }
-                }
-                else
-                {
-                    // bformata(glsl, "cb%d", psOperand->aui32ArraySizes[0]);
-                }
-            }
-
-            if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-            {
-                // Work out the variable name. Don't apply swizzle to that variable yet.
-                int32_t rebase = 0;
-
-                if (psCBuf && !psCBuf->blob)
-                {
-                    GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-
-                    bformata(glsl, "%s", psVarType->FullName);
-                }
-                else if (psCBuf)
-                {
-                    bformata(glsl, "%s%s_data", psCBuf->Name, StageName);
-                    index = psOperand->aui32ArraySizes[1];
-                }
-                else  // We don't have a semantic for this variable, so try the raw dump appoach.
-                {
-                    bformata(glsl, "cb%d.data", psOperand->aui32ArraySizes[0]);  //
-                    index = psOperand->aui32ArraySizes[1];
-                }
-
-                // Dx9 only?
-                if (psOperand->psSubOperand[0] != NULL)
-                {
-                    // Array of matrices is treated as array of vec4s in HLSL,
-                    // but that would mess up uniform types in GLSL. Do gymnastics.
-                    uint32_t opFlags = TO_FLAG_INTEGER;
-
-                    if (psVarType && (psVarType->Class == SVC_MATRIX_COLUMNS || psVarType->Class == SVC_MATRIX_ROWS) && (psVarType->Elements > 1))
-                    {
-                        // Special handling for matrix arrays
-                        bcatcstr(glsl, "[(");
-                        TranslateOperand(psContext, psOperand->psSubOperand[0], opFlags);
-                        bformata(glsl, ") / 4]");
-                        if (psContext->psShader->eTargetLanguage <= LANG_120)
-                        {
-                            bcatcstr(glsl, "[int(mod(float(");
-                            TranslateOperandWithMask(psContext, psOperand->psSubOperand[0], opFlags, OPERAND_4_COMPONENT_MASK_X);
-                            bformata(glsl, "), 4.0))]");
-                        }
-                        else
-                        {
-                            bcatcstr(glsl, "[((");
-                            TranslateOperandWithMask(psContext, psOperand->psSubOperand[0], opFlags, OPERAND_4_COMPONENT_MASK_X);
-                            bformata(glsl, ") %% 4)]");
-                        }
-                    }
-                    else
-                    {
-                        bcatcstr(glsl, "[");
-                        TranslateOperand(psContext, psOperand->psSubOperand[0], opFlags);
-                        bformata(glsl, "]");
-                    }
-                }
-                else if (index != -1 && psOperand->psSubOperand[1] != NULL)
-                {
-                    // Array of matrices is treated as array of vec4s in HLSL,
-                    // but that would mess up uniform types in GLSL. Do gymnastics.
-                    SHADER_VARIABLE_TYPE eType2 = GetOperandDataType(psContext, psOperand->psSubOperand[1]);
-                    uint32_t opFlags = TO_FLAG_INTEGER;
-                    if (eType2 != SVT_INT && eType2 != SVT_UINT)
-                        opFlags = TO_AUTO_BITCAST_TO_INT;
-
-                    if (psVarType && (psVarType->Class == SVC_MATRIX_COLUMNS || psVarType->Class == SVC_MATRIX_ROWS) && (psVarType->Elements > 1))
-                    {
-                        // Special handling for matrix arrays
-                        bcatcstr(glsl, "[(");
-                        TranslateOperand(psContext, psOperand->psSubOperand[1], opFlags);
-                        bformata(glsl, " + %d) / 4]", index);
-                        if (psContext->psShader->eTargetLanguage <= LANG_120)
-                        {
-                            bcatcstr(glsl, "[int(mod(float(");
-                            TranslateOperand(psContext, psOperand->psSubOperand[1], opFlags);
-                            bformata(glsl, " + %d), 4.0))]", index);
-                        }
-                        else
-                        {
-                            bcatcstr(glsl, "[((");
-                            TranslateOperand(psContext, psOperand->psSubOperand[1], opFlags);
-                            bformata(glsl, " + %d) %% 4)]", index);
-                        }
-                    }
-                    else
-                    {
-                        bcatcstr(glsl, "[");
-                        TranslateOperand(psContext, psOperand->psSubOperand[1], opFlags);
-                        bformata(glsl, " + %d]", index);
-                    }
-                }
-                else if (index != -1)
-                {
-                    if ((psVarType->Class == SVC_MATRIX_COLUMNS || psVarType->Class == SVC_MATRIX_ROWS) && (psVarType->Elements > 1))
-                    {
-                        // Special handling for matrix arrays, open them up into vec4's
-                        size_t matidx = index / 4;
-                        size_t rowidx = index - (matidx * 4);
-                        bformata(glsl, "[%d][%d]", matidx, rowidx);
-                    }
-                    else
-                    {
-                        bformata(glsl, "[%d]", index);
-                    }
-                }
-                else if (psOperand->psSubOperand[1] != NULL)
-                {
-                    bcatcstr(glsl, "[");
-                    TranslateOperand(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-                    bcatcstr(glsl, "]");
-                }
-
-                if (psVarType && psVarType->Class == SVC_VECTOR)
-                {
-                    switch (rebase)
-                    {
-                        case 4:
-                        {
-                            if (psVarType->Columns == 2)
-                            {
-                                //.x(GLSL) is .y(HLSL). .y(GLSL) is .z(HLSL)
-                                bcatcstr(glsl, ".xxyx");
-                            }
-                            else if (psVarType->Columns == 3)
-                            {
-                                //.x(GLSL) is .y(HLSL). .y(GLSL) is .z(HLSL) .z(GLSL) is .w(HLSL)
-                                bcatcstr(glsl, ".xxyz");
-                            }
-                            break;
-                        }
-                        case 8:
-                        {
-                            if (psVarType->Columns == 2)
-                            {
-                                //.x(GLSL) is .z(HLSL). .y(GLSL) is .w(HLSL)
-                                bcatcstr(glsl, ".xxxy");
-                            }
-                            break;
-                        }
-                        case 0:
-                        default:
-                        {
-                            // No rebase, but extend to vec4.
-                            if (psVarType->Columns == 2)
-                            {
-                                bcatcstr(glsl, ".xyxx");
-                            }
-                            else if (psVarType->Columns == 3)
-                            {
-                                bcatcstr(glsl, ".xyzx");
-                            }
-                            break;
-                        }
-                    }
-                }
-
-                if (psVarType && psVarType->Class == SVC_SCALAR)
-                {
-                    *pui32IgnoreSwizzle = 1;
-                }
-            }
-            break;
-        }
-        case OPERAND_TYPE_RESOURCE:
-        {
-            ResourceName(glsl, psContext, RGROUP_TEXTURE, psOperand->ui32RegisterNumber, 0);
-            *pui32IgnoreSwizzle = 1;
-            break;
-        }
-        case OPERAND_TYPE_SAMPLER:
-        {
-            bformata(glsl, "Sampler%d", psOperand->ui32RegisterNumber);
-            *pui32IgnoreSwizzle = 1;
-            break;
-        }
-        case OPERAND_TYPE_FUNCTION_BODY:
-        {
-            const uint32_t ui32FuncBody = psOperand->ui32RegisterNumber;
-            const uint32_t ui32FuncTable = psContext->psShader->aui32FuncBodyToFuncTable[ui32FuncBody];
-            // const uint32_t ui32FuncPointer = psContext->psShader->aui32FuncTableToFuncPointer[ui32FuncTable];
-            const uint32_t ui32ClassType = psContext->psShader->sInfo.aui32TableIDToTypeID[ui32FuncTable];
-            const char* ClassTypeName = &psContext->psShader->sInfo.psClassTypes[ui32ClassType].Name[0];
-            const uint32_t ui32UniqueClassFuncIndex = psContext->psShader->ui32NextClassFuncName[ui32ClassType]++;
-
-            bformata(glsl, "%s_Func%d", ClassTypeName, ui32UniqueClassFuncIndex);
-            break;
-        }
-        case OPERAND_TYPE_INPUT_FORK_INSTANCE_ID:
-        {
-            bcatcstr(glsl, "forkInstanceID");
-            *pui32IgnoreSwizzle = 1;
-            return;
-        }
-        case OPERAND_TYPE_IMMEDIATE_CONSTANT_BUFFER:
-        {
-            bcatcstr(glsl, "immediateConstBufferF");
-
-            if (psOperand->psSubOperand[0])
-            {
-                bcatcstr(glsl, "(");  // Indexes must be integral.
-                TranslateOperand(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-                bcatcstr(glsl, ")");
-            }
-            break;
-        }
-        case OPERAND_TYPE_INPUT_DOMAIN_POINT:
-        {
-            bcatcstr(glsl, "gl_TessCoord");
-            break;
-        }
-        case OPERAND_TYPE_INPUT_CONTROL_POINT:
-        {
-            if (psOperand->aui32ArraySizes[1] == 0)  // Input index zero - position.
-            {
-                bformata(glsl, "gl_in[%d].gl_Position", psOperand->aui32ArraySizes[0]);
-            }
-            else
-            {
-                bformata(glsl, "Input%d[%d]", psOperand->aui32ArraySizes[1], psOperand->aui32ArraySizes[0]);
-            }
-            break;
-        }
-        case OPERAND_TYPE_NULL:
-        {
-            // Null register, used to discard results of operations
-            bcatcstr(glsl, "//null");
-            break;
-        }
-        case OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID:
-        {
-            bcatcstr(glsl, "gl_InvocationID");
-            *pui32IgnoreSwizzle = 1;
-            break;
-        }
-        case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-        {
-            bcatcstr(glsl, "gl_SampleMask[0]");
-            *pui32IgnoreSwizzle = 1;
-            break;
-        }
-        case OPERAND_TYPE_INPUT_COVERAGE_MASK:
-        {
-            bcatcstr(glsl, "gl_SampleMaskIn[0]");
-            // Skip swizzle on scalar types.
-            *pui32IgnoreSwizzle = 1;
-            break;
-        }
-        case OPERAND_TYPE_INPUT_THREAD_ID:  // SV_DispatchThreadID
-        {
-            bcatcstr(glsl, "gl_GlobalInvocationID");
-            break;
-        }
-        case OPERAND_TYPE_INPUT_THREAD_GROUP_ID:  // SV_GroupThreadID
-        {
-            bcatcstr(glsl, "gl_LocalInvocationID");
-            break;
-        }
-        case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP:  // SV_GroupID
-        {
-            bcatcstr(glsl, "gl_WorkGroupID");
-            break;
-        }
-        case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED:  // SV_GroupIndex
-        {
-            bcatcstr(glsl, "gl_LocalInvocationIndex");
-            *pui32IgnoreSwizzle = 1;  // No swizzle meaningful for scalar.
-            break;
-        }
-        case OPERAND_TYPE_UNORDERED_ACCESS_VIEW:
-        {
-            ResourceName(glsl, psContext, RGROUP_UAV, psOperand->ui32RegisterNumber, 0);
-            break;
-        }
-        case OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY:
-        {
-            bformata(glsl, "TGSM%d", psOperand->ui32RegisterNumber);
-            *pui32IgnoreSwizzle = 1;
-            break;
-        }
-        case OPERAND_TYPE_INPUT_PRIMITIVEID:
-        {
-            bcatcstr(glsl, "gl_PrimitiveID");
-            break;
-        }
-        case OPERAND_TYPE_INDEXABLE_TEMP:
-        {
-            bformata(glsl, "TempArray%d", psOperand->aui32ArraySizes[0]);
-            bcatcstr(glsl, "[");
-            if (psOperand->aui32ArraySizes[1] != 0 || !psOperand->psSubOperand[1])
-                bformata(glsl, "%d", psOperand->aui32ArraySizes[1]);
-
-            if (psOperand->psSubOperand[1])
-            {
-                if (psOperand->aui32ArraySizes[1] != 0)
-                    bcatcstr(glsl, "+");
-                TranslateOperand(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-            }
-            bcatcstr(glsl, "]");
-            break;
-        }
-        case OPERAND_TYPE_STREAM:
-        {
-            bformata(glsl, "%d", psOperand->ui32RegisterNumber);
-            break;
-        }
-        case OPERAND_TYPE_INPUT_GS_INSTANCE_ID:
-        {
-            // In HLSL the instance id is uint, so cast here.
-            bcatcstr(glsl, "uint(gl_InvocationID)");
-            break;
-        }
-        case OPERAND_TYPE_THIS_POINTER:
-        {
-            /*
-                The "this" register is a register that provides up to 4 pieces of information:
-                X: Which CB holds the instance data
-                Y: Base element offset of the instance data within the instance CB
-                Z: Base sampler index
-                W: Base Texture index
-
-                Can be different for each function call
-            */
-            break;
-        }
-        case OPERAND_TYPE_INPUT_PATCH_CONSTANT:
-        {
-            bformata(glsl, "myPatchConst%d", psOperand->ui32RegisterNumber);
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-    }
-
-    if (hasCtor && (*pui32IgnoreSwizzle == 0))
-    {
-        TranslateOperandSwizzleWithMask(psContext, psOperand, ui32CompMask);
-        *pui32IgnoreSwizzle = 1;
-    }
-
-    while (numParenthesis != 0)
-    {
-        bcatcstr(glsl, ")");
-        numParenthesis--;
-    }
-}
-
-static void GLSLTranslateVariableName(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t* pui32IgnoreSwizzle)
-{
-    GLSLGLSLTranslateVariableNameWithMask(psContext, psOperand, ui32TOFlag, pui32IgnoreSwizzle, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-SHADER_VARIABLE_TYPE GetOperandDataType(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    return GetOperandDataTypeEx(psContext, psOperand, SVT_INT);
-}
-
-SHADER_VARIABLE_TYPE GetOperandDataTypeEx(HLSLCrossCompilerContext* psContext, const Operand* psOperand, SHADER_VARIABLE_TYPE ePreferredTypeForImmediates)
-{
-    switch (psOperand->eType)
-    {
-        case OPERAND_TYPE_TEMP:
-        {
-            SHADER_VARIABLE_TYPE eCurrentType = SVT_VOID;
-            int i = 0;
-
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-            {
-                return psOperand->aeDataType[psOperand->aui32Swizzle[0]];
-            }
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-            {
-                if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-                {
-                    return psOperand->aeDataType[0];
-                }
-
-                return psOperand->aeDataType[psOperand->aui32Swizzle[0]];
-            }
-
-            if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-            {
-                uint32_t ui32CompMask = psOperand->ui32CompMask;
-                if (!psOperand->ui32CompMask)
-                {
-                    ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-                }
-                for (; i < 4; ++i)
-                {
-                    if (ui32CompMask & (1 << i))
-                    {
-                        eCurrentType = psOperand->aeDataType[i];
-                        break;
-                    }
-                }
-
-#ifdef _DEBUG
-                // Check if all elements have the same basic type.
-                for (; i < 4; ++i)
-                {
-                    if (psOperand->ui32CompMask & (1 << i))
-                    {
-                        if (eCurrentType != psOperand->aeDataType[i])
-                        {
-                            ASSERT(0);
-                        }
-                    }
-                }
-#endif
-                return eCurrentType;
-            }
-
-            ASSERT(0);
-
-            break;
-        }
-        case OPERAND_TYPE_OUTPUT:
-        {
-            const uint32_t ui32Register = psOperand->aui32ArraySizes[psOperand->iIndexDims - 1];
-            InOutSignature* psOut;
-
-            if (GetOutputSignatureFromRegister(psContext->currentPhase, ui32Register, psOperand->ui32CompMask, 0, &psContext->psShader->sInfo, &psOut))
-            {
-                if (psOut->eComponentType == INOUT_COMPONENT_UINT32)
-                {
-                    return SVT_UINT;
-                }
-                else if (psOut->eComponentType == INOUT_COMPONENT_SINT32)
-                {
-                    return SVT_INT;
-                }
-            }
-            break;
-        }
-        case OPERAND_TYPE_INPUT:
-        {
-            const uint32_t ui32Register = psOperand->aui32ArraySizes[psOperand->iIndexDims - 1];
-            InOutSignature* psIn;
-
-            // UINT in DX, INT in GL.
-            if (psOperand->eSpecialName == NAME_PRIMITIVE_ID)
-            {
-                return SVT_INT;
-            }
-
-            if (GetInputSignatureFromRegister(ui32Register, &psContext->psShader->sInfo, &psIn))
-            {
-                if (psIn->eComponentType == INOUT_COMPONENT_UINT32)
-                {
-                    return SVT_UINT;
-                }
-                else if (psIn->eComponentType == INOUT_COMPONENT_SINT32)
-                {
-                    return SVT_INT;
-                }
-            }
-            break;
-        }
-        case OPERAND_TYPE_CONSTANT_BUFFER:
-        {
-            ConstantBuffer* psCBuf = NULL;
-            ShaderVarType* psVarType = NULL;
-            int32_t index = -1;
-            int32_t rebase = -1;
-            int foundVar;
-            GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-            if (psCBuf && !psCBuf->blob)
-            {
-                foundVar = GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-                if (foundVar && index == -1 && psOperand->psSubOperand[1] == NULL)
-                {
-                    return psVarType->Type;
-                }
-            }
-            else
-            {
-                // Todo: this isn't correct yet.
-                return SVT_FLOAT;
-            }
-            break;
-        }
-        case OPERAND_TYPE_IMMEDIATE32:
-        {
-            return ePreferredTypeForImmediates;
-        }
-
-        case OPERAND_TYPE_INPUT_THREAD_ID:
-        case OPERAND_TYPE_INPUT_THREAD_GROUP_ID:
-        case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP:
-        case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED:
-        {
-            return SVT_UINT;
-        }
-        case OPERAND_TYPE_SPECIAL_ADDRESS:
-        case OPERAND_TYPE_SPECIAL_LOOPCOUNTER:
-        {
-            return SVT_INT;
-        }
-        case OPERAND_TYPE_INPUT_GS_INSTANCE_ID:
-        {
-            return SVT_UINT;
-        }
-        case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-        {
-            return SVT_INT;
-        }
-        case OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID:
-        {
-            return SVT_INT;
-        }
-        default:
-        {
-            return SVT_FLOAT;
-        }
-    }
-
-    return SVT_FLOAT;
-}
-
-void TranslateOperand(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag)
-{
-    TranslateOperandWithMask(psContext, psOperand, ui32TOFlag, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-void TranslateOperandWithMask(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t ui32ComponentMask)
-{
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t ui32IgnoreSwizzle = 0;
-
-    if (psContext->psShader->ui32MajorVersion <= 3)
-    {
-        ui32TOFlag &= ~(TO_AUTO_BITCAST_TO_FLOAT | TO_AUTO_BITCAST_TO_INT | TO_AUTO_BITCAST_TO_UINT);
-    }
-
-    if (ui32TOFlag & TO_FLAG_NAME_ONLY)
-    {
-        GLSLTranslateVariableName(psContext, psOperand, ui32TOFlag, &ui32IgnoreSwizzle);
-        return;
-    }
-
-    switch (psOperand->eModifier)
-    {
-        case OPERAND_MODIFIER_NONE:
-        {
-            break;
-        }
-        case OPERAND_MODIFIER_NEG:
-        {
-            bcatcstr(glsl, "(-");
-            break;
-        }
-        case OPERAND_MODIFIER_ABS:
-        {
-            bcatcstr(glsl, "abs(");
-            break;
-        }
-        case OPERAND_MODIFIER_ABSNEG:
-        {
-            bcatcstr(glsl, "-abs(");
-            break;
-        }
-    }
-
-    GLSLGLSLTranslateVariableNameWithMask(psContext, psOperand, ui32TOFlag, &ui32IgnoreSwizzle, ui32ComponentMask);
-
-    if (!ui32IgnoreSwizzle)
-    {
-        TranslateOperandSwizzleWithMask(psContext, psOperand, ui32ComponentMask);
-    }
-
-    switch (psOperand->eModifier)
-    {
-        case OPERAND_MODIFIER_NONE:
-        {
-            break;
-        }
-        case OPERAND_MODIFIER_NEG:
-        {
-            bcatcstr(glsl, ")");
-            break;
-        }
-        case OPERAND_MODIFIER_ABS:
-        {
-            bcatcstr(glsl, ")");
-            break;
-        }
-        case OPERAND_MODIFIER_ABSNEG:
-        {
-            bcatcstr(glsl, ")");
-            break;
-        }
-    }
-}
-
-void ResourceName(bstring targetStr, HLSLCrossCompilerContext* psContext, ResourceGroup group, const uint32_t ui32RegisterNumber, const int bZCompare)
-{
-    bstring glsl = (targetStr == NULL) ? *psContext->currentShaderString : targetStr;
-    ResourceBinding* psBinding = 0;
-    int found;
-
-    found = GetResourceFromBindingPoint(group, ui32RegisterNumber, &psContext->psShader->sInfo, &psBinding);
-
-    if (bZCompare)
-    {
-        bcatcstr(glsl, "hlslcc_zcmp");
-    }
-
-    if (found)
-    {
-        int i = 0;
-        char name[MAX_REFLECT_STRING_LENGTH];
-        uint32_t ui32ArrayOffset = ui32RegisterNumber - psBinding->ui32BindPoint;
-
-        while (psBinding->Name[i] != '\0' && i < (MAX_REFLECT_STRING_LENGTH - 1))
-        {
-            name[i] = psBinding->Name[i];
-
-            // array syntax [X] becomes _0_
-            // Otherwise declarations could end up as:
-            // uniform sampler2D SomeTextures[0];
-            // uniform sampler2D SomeTextures[1];
-            if (name[i] == '[' || name[i] == ']')
-                name[i] = '_';
-
-            ++i;
-        }
-
-        name[i] = '\0';
-
-        if (ui32ArrayOffset)
-        {
-            bformata(glsl, "%s%d", name, ui32ArrayOffset);
-        }
-        else
-        {
-            bformata(glsl, "%s", name);
-        }
-    }
-    else
-    {
-        bformata(glsl, "UnknownResource%d", ui32RegisterNumber);
-    }
-}
-
-bstring TextureSamplerName(ShaderInfo* psShaderInfo, const uint32_t ui32TextureRegisterNumber, const uint32_t ui32SamplerRegisterNumber, const int bZCompare)
-{
-    bstring result;
-    ResourceBinding* psTextureBinding = 0;
-    ResourceBinding* psSamplerBinding = 0;
-    int foundTexture, foundSampler;
-    uint32_t i = 0;
-    char textureName[MAX_REFLECT_STRING_LENGTH];
-    uint32_t ui32ArrayOffset;
-
-    foundTexture = GetResourceFromBindingPoint(RGROUP_TEXTURE, ui32TextureRegisterNumber, psShaderInfo, &psTextureBinding);
-    foundSampler = GetResourceFromBindingPoint(RGROUP_SAMPLER, ui32SamplerRegisterNumber, psShaderInfo, &psSamplerBinding);
-
-    if (!foundTexture || !foundSampler)
-    {
-        result = bformat("UnknownResource%d_%d", ui32TextureRegisterNumber, ui32SamplerRegisterNumber);
-        return result;
-    }
-
-    ui32ArrayOffset = ui32TextureRegisterNumber - psTextureBinding->ui32BindPoint;
-
-    while (psTextureBinding->Name[i] != '\0' && i < (MAX_REFLECT_STRING_LENGTH - 1))
-    {
-        textureName[i] = psTextureBinding->Name[i];
-
-        // array syntax [X] becomes _0_
-        // Otherwise declarations could end up as:
-        // uniform sampler2D SomeTextures[0];
-        // uniform sampler2D SomeTextures[1];
-        if (textureName[i] == '[' || textureName[i] == ']')
-        {
-            textureName[i] = '_';
-        }
-
-        ++i;
-    }
-    textureName[i] = '\0';
-
-    result = bfromcstr("");
-
-    if (bZCompare)
-    {
-        bcatcstr(result, "hlslcc_zcmp");
-    }
-
-    if (ui32ArrayOffset)
-    {
-        bformata(result, "%s%d_X_%s", textureName, ui32ArrayOffset, psSamplerBinding->Name);
-    }
-    else
-    {
-        if ((i > 0) && (textureName[i - 1] == '_'))  // Prevent double underscore which is reserved
-        {
-            bformata(result, "%sX_%s", textureName, psSamplerBinding->Name);
-        }
-        else
-        {
-            bformata(result, "%s_X_%s", textureName, psSamplerBinding->Name);
-        }
-    }
-
-    return result;
-}
-
-void ConcatTextureSamplerName(bstring str,
-                              ShaderInfo* psShaderInfo,
-                              const uint32_t ui32TextureRegisterNumber,
-                              const uint32_t ui32SamplerRegisterNumber,
-                              const int bZCompare)
-{
-    bstring texturesamplername = TextureSamplerName(psShaderInfo, ui32TextureRegisterNumber, ui32SamplerRegisterNumber, bZCompare);
-    bconcat(str, texturesamplername);
-    bdestroy(texturesamplername);
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETAL.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toMETAL.c
deleted file mode 100644
index acf5a58094..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETAL.c
+++ /dev/null
@@ -1,440 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/tokens.h"
-#include "internal_includes/structs.h"
-#include "internal_includes/decode.h"
-#include "stdlib.h"
-#include "stdio.h"
-#include "bstrlib.h"
-#include "internal_includes/toMETALInstruction.h"
-#include "internal_includes/toMETALOperand.h"
-#include "internal_includes/toMETALDeclaration.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "internal_includes/structsMetal.h"
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-extern void UpdateFullName(ShaderVarType* psParentVarType);
-extern void MangleIdentifiersPerStage(ShaderData* psShader);
-
-
-void TranslateToMETAL(HLSLCrossCompilerContext* psContext, ShaderLang* planguage)
-{
-    bstring metal;
-    uint32_t i;
-    ShaderData* psShader = psContext->psShader;
-    ShaderLang language = *planguage;
-    uint32_t ui32InstCount = 0;
-    uint32_t ui32DeclCount = 0;
-
-    psContext->indent = 0;
-
-    /*psShader->sPhase[MAIN_PHASE].ui32InstanceCount = 1;
-    psShader->sPhase[MAIN_PHASE].ppsDecl = hlslcc_malloc(sizeof(Declaration*));
-    psShader->sPhase[MAIN_PHASE].ppsInst = hlslcc_malloc(sizeof(Instruction*));
-    psShader->sPhase[MAIN_PHASE].pui32DeclCount = hlslcc_malloc(sizeof(uint32_t));
-    psShader->sPhase[MAIN_PHASE].pui32InstCount = hlslcc_malloc(sizeof(uint32_t));*/
-
-    if(language == LANG_DEFAULT)
-    {
-        language = LANG_METAL;
-        *planguage = language;
-    }
-
-    metal = bfromcstralloc (1024, "");
-
-    psContext->mainShader = metal;
-    psContext->stagedInputDeclarations = bfromcstralloc(1024, "");
-    psContext->parameterDeclarations = bfromcstralloc(1024, "");
-    psContext->declaredOutputs = bfromcstralloc(1024, "");
-    psContext->earlyMain = bfromcstralloc (1024, "");
-    for(i=0; i<NUM_PHASES;++i)
-    {
-        psContext->postShaderCode[i] = bfromcstralloc (1024, "");
-    }
-
-    psContext->needsFragmentTestHint = 0;
-
-    for (i = 0; i < MAX_COLOR_MRT; i++)
-        psContext->gmemOutputNumElements[i] = 0;
-
-    psContext->currentShaderString = &metal;
-    psShader->eTargetLanguage = language;
-    psContext->currentPhase = MAIN_PHASE;
-    
-    bcatcstr(metal, "#include <metal_stdlib>\n");
-    bcatcstr(metal, "using namespace metal;\n");
-
-
-    bcatcstr(metal, "struct float1 {\n");
-    bcatcstr(metal, "\tfloat x;\n");
-    bcatcstr(metal, "};\n");
-
-    bcatcstr(metal, "struct uint1 {\n");
-    bcatcstr(metal, "\tuint x;\n");
-    bcatcstr(metal, "};\n");
-
-    bcatcstr(metal, "struct int1 {\n");
-    bcatcstr(metal, "\tint x;\n");
-    bcatcstr(metal, "};\n");
-
-
-    ui32InstCount = psShader->asPhase[MAIN_PHASE].pui32InstCount[0];
-    ui32DeclCount = psShader->asPhase[MAIN_PHASE].pui32DeclCount[0];
-    
-    AtomicVarList atomicList;
-    atomicList.Filled = 0;
-    atomicList.Size = ui32InstCount;
-    atomicList.AtomicVars = (const ShaderVarType**)hlslcc_malloc(ui32InstCount * sizeof(ShaderVarType*));
-
-    for (i = 0; i < ui32InstCount; ++i)
-    {
-        DetectAtomicInstructionMETAL(psContext, psShader->asPhase[MAIN_PHASE].ppsInst[0] + i, i + 1 < ui32InstCount ? psShader->asPhase[MAIN_PHASE].ppsInst[0] + i + 1 : 0, &atomicList);
-    }
-
-    for(i=0; i < ui32DeclCount; ++i)
-    {
-        TranslateDeclarationMETAL(psContext, psShader->asPhase[MAIN_PHASE].ppsDecl[0] + i, &atomicList);
-    }
-
-    if(psContext->psShader->ui32NumDx9ImmConst)
-    {
-        bformata(psContext->mainShader, "float4 ImmConstArray [%d];\n", psContext->psShader->ui32NumDx9ImmConst);
-    }
-    
-    MarkIntegerImmediatesMETAL(psContext);
-
-    SetDataTypesMETAL(psContext, psShader->asPhase[MAIN_PHASE].ppsInst[0], ui32InstCount);
-
-    switch (psShader->eShaderType)
-    {
-    case VERTEX_SHADER:
-    {
-        int hasStageInput = 0;
-        int hasOutput = 0;
-        if (blength(psContext->stagedInputDeclarations) > 0)
-        {
-            hasStageInput = 1;
-            bcatcstr(metal, "struct metalVert_stageIn\n{\n");
-            bconcat(metal, psContext->stagedInputDeclarations);
-            bcatcstr(metal, "};\n");
-        }
-        if (blength(psContext->declaredOutputs) > 0)
-        {
-            hasOutput = 1;
-            bcatcstr(metal, "struct metalVert_out\n{\n");
-            bconcat(metal, psContext->declaredOutputs);
-            bcatcstr(metal, "};\n");
-        }
-
-        bformata(metal, "vertex %s metalMain(\n%s", 
-            hasOutput ? "metalVert_out" : "void",
-            hasStageInput ? "\tmetalVert_stageIn stageIn [[ stage_in ]]" : "");
-
-        int userInputDeclLength = blength(psContext->parameterDeclarations);
-        if (userInputDeclLength > 2)
-        {
-            if (hasStageInput)
-                bformata(metal, ",\n");
-            bdelete(psContext->parameterDeclarations, userInputDeclLength - 2, 2); // remove ",\n"
-        }
-
-        bconcat(metal, psContext->parameterDeclarations);
-        bcatcstr(metal, hasOutput ? "\t)\n{\n\tmetalVert_out output;\n" : ")\n{\n");
-        break;
-    }
-    case PIXEL_SHADER:
-    {
-        int hasStageInput = 0;
-        int hasOutput = 0;
-        int userInputDeclLength = blength(psContext->parameterDeclarations);
-        if (blength(psContext->stagedInputDeclarations) > 0)
-        {
-            hasStageInput = 1;
-            bcatcstr(metal, "struct metalFrag_stageIn\n{\n");
-            bconcat(metal, psContext->stagedInputDeclarations);
-            bcatcstr(metal, "};\n");
-        }
-        if (blength(psContext->declaredOutputs) > 0)
-        {
-            hasOutput = 1;
-            bcatcstr(metal, "struct metalFrag_out\n{\n");
-            bconcat(metal, psContext->declaredOutputs);
-            bcatcstr(metal, "};\n");
-        }
-
-        bcatcstr(metal, "fragment ");
-        if (psContext->needsFragmentTestHint)
-        {        
-             bcatcstr(metal, "\n#ifndef MTLLanguage1_1\n");
-             bcatcstr(metal, "[[ early_fragment_tests ]]\n");
-             bcatcstr(metal, "#endif\n");            
-         }
-
-        bformata(metal, "%s metalMain(\n%s", hasOutput ? "metalFrag_out" : "void",
-            hasStageInput ? "\tmetalFrag_stageIn stageIn [[ stage_in ]]" : "");
-        if (userInputDeclLength > 2)
-        {
-            if (hasStageInput)
-                bcatcstr(metal, ",\n");
-            bdelete(psContext->parameterDeclarations, userInputDeclLength - 2, 2); // remove the trailing comma and space
-        }
-        bconcat(metal, psContext->parameterDeclarations);
-        bcatcstr(metal, hasOutput ? ")\n{\n\tmetalFrag_out output;\n" : ")\n{\n");
-        break;
-    }
-    case COMPUTE_SHADER:
-    {
-        int hasStageInput = 0;
-        int hasOutput = 0;
-        if (blength(psContext->stagedInputDeclarations) > 0)
-        {
-            hasStageInput = 1;
-            bcatcstr(metal, "struct metalCompute_stageIn\n{\n");
-            bconcat(metal, psContext->stagedInputDeclarations);
-            bcatcstr(metal, "};\n");
-        }
-        if (blength(psContext->declaredOutputs) > 0)
-        {
-            hasOutput = 1;
-            bcatcstr(metal, "struct metalCompute_out\n{\n");
-            bconcat(metal, psContext->declaredOutputs);
-            bcatcstr(metal, "};\n");
-        }
-
-        bformata(metal, "kernel %s metalMain(\n%s",
-            hasOutput ? "metalCompute_out" : "void",
-            hasStageInput ? "\tmetalCompute_stageIn stageIn [[ stage_in ]]" : "");
-
-        int userInputDeclLength = blength(psContext->parameterDeclarations);
-        if (userInputDeclLength > 2)
-        {
-            if (hasStageInput)
-                bformata(metal, ",\n");
-            bdelete(psContext->parameterDeclarations, userInputDeclLength - 2, 2); // remove ",\n"
-        }
-
-        bconcat(metal, psContext->parameterDeclarations);
-        bcatcstr(metal, hasOutput ? "\t)\n{\n\tmetalCompute_out output;\n" : ")\n{\n");
-        break;
-    }
-    default:
-    {
-        ASSERT(0); 
-        // Geometry, Hull, and Domain shaders unsupported by Metal
-        //         int userInputDeclLength = blength(psContext->parameterDeclarations);
-        //         if (blength(psContext->outputDeclarations) > 0)
-        //         {
-        //             bcatcstr(metal, "struct metalComp_out\n{\n");
-        //             bconcat(metal, psContext->outputDeclarations);
-        // bcatcstr(metal, "};\n");
-        //             if (userInputDeclLength > 2)
-        //                 bdelete(psContext->parameterDeclarations, userInputDeclLength - 2, 2); // remove the trailing comma and space
-        //             bformata(metal, "kernel metalComp_out metalMain(%s)\n{\n\tmetalComp_out output;\n", psContext->parameterDeclarations);
-        //         }
-        //         else
-        //         {
-        //             if (userInputDeclLength > 2)
-        //                 bdelete(psContext->parameterDeclarations, userInputDeclLength - 2, 2); // remove the trailing comma and space
-        //             bformata(metal, "kernel void metalMain(%s)\n{\n", psContext->parameterDeclarations);
-        //         }
-        break;
-    }
-    }
-
-    psContext->indent++;
-
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bcatcstr(metal, "//--- Start Early Main ---\n");
-#endif
-    bconcat(metal, psContext->earlyMain);
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bcatcstr(metal, "//--- End Early Main ---\n");
-#endif
-
-
-    for(i=0; i < ui32InstCount; ++i)
-    {
-        TranslateInstructionMETAL(psContext, psShader->asPhase[MAIN_PHASE].ppsInst[0]+i, i+1 < ui32InstCount ? psShader->asPhase[MAIN_PHASE].ppsInst[0]+i+1 : 0);
-    }
-
-    hlslcc_free((void*)atomicList.AtomicVars);
-
-    psContext->indent--;
-
-    bcatcstr(metal, "}\n");
-}
-
-static void FreeSubOperands(Instruction* psInst, const uint32_t ui32NumInsts)
-{
-    uint32_t ui32Inst;
-    for(ui32Inst = 0; ui32Inst < ui32NumInsts; ++ui32Inst)
-    {
-        Instruction* psCurrentInst = &psInst[ui32Inst];
-        const uint32_t ui32NumOperands = psCurrentInst->ui32NumOperands;
-        uint32_t ui32Operand;
-
-        for(ui32Operand = 0; ui32Operand < ui32NumOperands; ++ui32Operand)
-        {
-            uint32_t ui32SubOperand;
-            for(ui32SubOperand = 0; ui32SubOperand < MAX_SUB_OPERANDS; ++ui32SubOperand)
-            {
-                if(psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand])
-                {
-                    hlslcc_free(psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand]);
-                    psCurrentInst->asOperands[ui32Operand].psSubOperand[ui32SubOperand] = NULL;
-                }
-            }
-        }
-    }
-}
-
-typedef enum {
-    MTLFunctionTypeVertex = 1,
-    MTLFunctionTypeFragment = 2,
-    MTLFunctionTypeKernel = 3
-} MTLFunctionType;
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromMemToMETAL(const char* shader,
-    unsigned int flags,
-    ShaderLang language,
-    Shader* result)
-{
-    uint32_t* tokens;
-    ShaderData* psShader;
-    char* glslcstr = NULL;
-    int ShaderType = MTLFunctionTypeFragment;
-    int success = 0;
-    uint32_t i;
-
-    tokens = (uint32_t*)shader;
-
-    psShader = DecodeDXBC(tokens);
-
-    if(psShader)
-    {
-        HLSLCrossCompilerContext sContext;
-
-        sContext.psShader = psShader;
-        sContext.flags = flags;
-
-        for(i=0; i<NUM_PHASES;++i)
-        {
-            sContext.havePostShaderCode[i] = 0;
-        }
-
-        TranslateToMETAL(&sContext, &language);
-
-        switch(psShader->eShaderType)
-        {
-            case VERTEX_SHADER:
-            {
-                ShaderType = MTLFunctionTypeVertex;
-                break;
-            }
-            case COMPUTE_SHADER:
-            {
-                ShaderType = MTLFunctionTypeKernel;
-                break;
-            }
-            default:
-            {
-                break;
-            }
-        }
-
-        glslcstr = bstr2cstr(sContext.mainShader, '\0');
-
-        bdestroy(sContext.mainShader);
-        bdestroy(sContext.earlyMain);
-        for(i=0; i<NUM_PHASES; ++i)
-        {
-            bdestroy(sContext.postShaderCode[i]);
-        }
-
-        for(i=0; i<NUM_PHASES;++i)
-        {
-            if(psShader->asPhase[i].ppsDecl != 0)
-            {
-                uint32_t k;
-                for(k=0; k < psShader->asPhase[i].ui32InstanceCount; ++k)
-                {
-                    hlslcc_free(psShader->asPhase[i].ppsDecl[k]);
-                }
-                hlslcc_free(psShader->asPhase[i].ppsDecl);
-            }
-            if(psShader->asPhase[i].ppsInst != 0)
-            {
-                uint32_t k;
-                for(k=0; k < psShader->asPhase[i].ui32InstanceCount; ++k)
-                {
-                    FreeSubOperands(psShader->asPhase[i].ppsInst[k], psShader->asPhase[i].pui32InstCount[k]);
-                    hlslcc_free(psShader->asPhase[i].ppsInst[k]);
-                }
-                hlslcc_free(psShader->asPhase[i].ppsInst);
-            }
-        }
-        
-        memcpy(&result->reflection,&psShader->sInfo,sizeof(psShader->sInfo));
-        
-        result->textureSamplerInfo.ui32NumTextureSamplerPairs = psShader->textureSamplerInfo.ui32NumTextureSamplerPairs;
-        for (i=0; i<result->textureSamplerInfo.ui32NumTextureSamplerPairs; i++)
-            strcpy(result->textureSamplerInfo.aTextureSamplerPair[i].Name, psShader->textureSamplerInfo.aTextureSamplerPair[i].Name);
-
-        hlslcc_free(psShader);
-
-        success = 1;
-    }
-
-    shader = 0;
-    tokens = 0;
-
-    /* Fill in the result struct */
-
-    result->shaderType = ShaderType;
-    result->sourceCode = glslcstr;
-    result->GLSLLanguage = language;
-
-    return success;
-}
-
-HLSLCC_API int HLSLCC_APIENTRY TranslateHLSLFromFileToMETAL(const char* filename,
-    unsigned int flags,
-    ShaderLang language,
-    Shader* result)
-{
-    FILE* shaderFile;
-    int length;
-    size_t readLength;
-    char* shader;
-    int success = 0;
-
-    shaderFile = fopen(filename, "rb");
-
-    if(!shaderFile)
-    {
-        return 0;
-    }
-
-    fseek(shaderFile, 0, SEEK_END);
-    length = ftell(shaderFile);
-    fseek(shaderFile, 0, SEEK_SET);
-
-    shader = (char*)hlslcc_malloc(length+1);
-
-    readLength = fread(shader, 1, length, shaderFile);
-
-    fclose(shaderFile);
-    shaderFile = 0;
-
-    shader[readLength] = '\0';
-
-    success = TranslateHLSLFromMemToMETAL(shader, flags, language, result);
-
-    hlslcc_free(shader);
-
-    return success;
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALDeclaration.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALDeclaration.c
deleted file mode 100644
index 79dcb809fd..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALDeclaration.c
+++ /dev/null
@@ -1,2281 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "hlslcc.h"
-#include "internal_includes/toMETALDeclaration.h"
-#include "internal_includes/toMETALOperand.h"
-#include "internal_includes/languages.h"
-#include "bstrlib.h"
-#include "internal_includes/debug.h"
-#include "internal_includes/hlslcc_malloc.h"
-#include "internal_includes/structsMetal.h"
-#include <math.h>
-#include <float.h>
-
-#if defined(__clang__)
-#pragma clang diagnostic ignored "-Wpointer-sign"
-#endif
-
-#ifdef _MSC_VER
-#ifndef isnan
-#define isnan(x) _isnan(x)
-#endif
-
-#ifndef isinf
-#define isinf(x) (!_finite(x))
-#endif
-#endif
-
-#define fpcheck(x) (isnan(x) || isinf(x))
-
-typedef enum
-{
-    GLVARTYPE_FLOAT,
-    GLVARTYPE_INT,
-    GLVARTYPE_FLOAT4,
-} GLVARTYPE;
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-
-const char* GetTypeStringMETAL(GLVARTYPE eType)
-{
-    switch (eType)
-    {
-    case GLVARTYPE_FLOAT:
-    {
-        return "float";
-    }
-    case GLVARTYPE_INT:
-    {
-        return "int";
-    }
-    case GLVARTYPE_FLOAT4:
-    {
-        return "float4";
-    }
-    default:
-    {
-        return "";
-    }
-    }
-}
-const uint32_t GetTypeElementCountMETAL(GLVARTYPE eType)
-{
-    switch (eType)
-    {
-    case GLVARTYPE_FLOAT:
-    case GLVARTYPE_INT:
-    {
-        return 1;
-    }
-    case GLVARTYPE_FLOAT4:
-    {
-        return 4;
-    }
-    default:
-    {
-        return 0;
-    }
-    }
-}
-
-void AddToDx9ImmConstIndexableArrayMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    bstring* savedStringPtr = psContext->currentShaderString;
-
-    psContext->currentShaderString = &psContext->earlyMain;
-    psContext->indent++;
-    AddIndentation(psContext);
-    psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber] = psContext->psShader->ui32NumDx9ImmConst;
-    bformata(psContext->earlyMain, "ImmConstArray[%d] = ", psContext->psShader->ui32NumDx9ImmConst);
-    TranslateOperandMETAL(psContext, psOperand, TO_FLAG_NONE);
-    bcatcstr(psContext->earlyMain, ";\n");
-    psContext->indent--;
-    psContext->psShader->ui32NumDx9ImmConst++;
-
-    psContext->currentShaderString = savedStringPtr;
-}
-
-void DeclareConstBufferShaderVariableMETAL(bstring metal, const char* Name, const struct ShaderVarType_TAG* psType, int pointerType, int const createDummyAlignment, AtomicVarList* psAtomicList)
-//const SHADER_VARIABLE_CLASS eClass, const SHADER_VARIABLE_TYPE eType,
-//const char* pszName)
-{
-    if (psType->Class == SVC_STRUCT)
-    {
-        bformata(metal, "%s_Type %s%s", Name, pointerType ? "*" : "", Name);
-        if (psType->Elements > 1)
-        {
-            bformata(metal, "[%d]", psType->Elements);
-        }
-    }
-    else if (psType->Class == SVC_MATRIX_COLUMNS || psType->Class == SVC_MATRIX_ROWS)
-    {
-        switch (psType->Type)
-        {
-        case SVT_FLOAT:
-        {
-            bformata(metal, "\tfloat%d %s%s[%d", psType->Columns, pointerType ? "*" : "", Name, psType->Rows);
-            break;
-        }
-        case SVT_FLOAT16:
-        {
-            bformata(metal, "\thalf%d %s%s[%d", psType->Columns, pointerType ? "*" : "", Name, psType->Rows);
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-        }
-        if (psType->Elements > 1)
-        {
-            bformata(metal, " * %d", psType->Elements);
-        }
-        bformata(metal, "]");
-    }
-    else
-    if (psType->Class == SVC_VECTOR)
-    {
-        switch (psType->Type)
-        {
-        case SVT_DOUBLE:
-        case SVT_FLOAT:
-        {
-            bformata(metal, "\tfloat%d %s%s", psType->Columns, pointerType ? "*" : "", Name);
-            break;
-        }
-        case SVT_FLOAT16:
-        {
-            bformata(metal, "\thalf%d %s%s", psType->Columns, pointerType ? "*" : "", Name);
-            break;
-        }
-        case SVT_UINT:
-        {
-            bformata(metal, "\tuint%d %s%s", psType->Columns, pointerType ? "*" : "", Name);
-            break;
-        }
-        case SVT_INT:
-        case SVT_BOOL:
-        {
-            bformata(metal, "\tint%d %s%s", psType->Columns, pointerType ? "*" : "", Name);
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-        }
-
-        if (psType->Elements > 1)
-        {
-            bformata(metal, "[%d]", psType->Elements);
-        }
-    }
-    else
-    if (psType->Class == SVC_SCALAR)
-    {
-        switch (psType->Type)
-        {
-        case SVT_DOUBLE:
-        case SVT_FLOAT:
-        {
-            bformata(metal, "\tfloat %s%s", pointerType ? "*" : "", Name);
-            break;
-        }
-        case SVT_FLOAT16:
-        {
-            bformata(metal, "\thalf %s%s", pointerType ? "*" : "", Name);
-            break;
-        }
-        case SVT_UINT:
-        {
-            if (IsAtomicVar(psType, psAtomicList))
-            {
-                bformata(metal, "\tvolatile atomic_uint %s%s", pointerType ? "*" : "", Name);
-            }
-            else
-            {
-                bformata(metal, "\tuint %s%s", pointerType ? "*" : "", Name);
-            }
-            break;
-        }
-        case SVT_INT:
-        {
-            if (IsAtomicVar(psType, psAtomicList))
-            {
-                bformata(metal, "\tvolatile atomic_int %s%s", pointerType ? "*" : "", Name);
-            }
-            else
-            {
-                bformata(metal, "\tint %s%s", pointerType ? "*" : "", Name);
-            }
-            break;
-        }
-        case SVT_BOOL:
-        {
-            //Use int instead of bool.
-            //Allows implicit conversions to integer and
-            //bool consumes 4-bytes in HLSL and metal anyway.
-            bformata(metal, "\tint %s%s", pointerType ? "*" : "", Name);
-            // Also change the definition in the type tree.
-            ((ShaderVarType*)psType)->Type = SVT_INT;
-            break;
-        }
-        default:
-        {
-            ASSERT(0);
-            break;
-        }
-        }
-
-        if (psType->Elements > 1)
-        {
-            bformata(metal, "[%d]", psType->Elements);
-        }
-    }
-    if (!pointerType)
-    {
-        bformata(metal, ";\n");
-    }
-
-    // We need to add more dummies if float2 or less since they are not 16 bytes aligned
-    // float = 4
-    // float2 = 8
-    // float3 = float4 = 16
-    // https://developer.apple.com/library/ios/documentation/Metal/Reference/MetalShadingLanguageGuide/data-types/data-types.html
-    if (createDummyAlignment)
-    {
-        uint16_t sizeInBytes = 16;
-        if (1 == psType->Columns)
-        {
-            sizeInBytes = 4;
-        }
-        else if (2 == psType->Columns)
-        {
-            sizeInBytes = 8;
-        }
-
-        if (4 == sizeInBytes)
-        {
-            bformata(metal, "\tfloat  offsetDummy_4Bytes_%s;\n", Name);
-            bformata(metal, "\tfloat2 offsetDummy_8Bytes_%s;\n", Name);
-        }
-        else if (8 == sizeInBytes)
-        {
-            bformata(metal, "\tfloat2 offsetDummy_8Bytes_%s;\n", Name);
-        }
-    }
-}
-
-//In metal embedded structure definitions are not supported.
-void PreDeclareStructTypeMETAL(bstring metal, const char* Name, const struct ShaderVarType_TAG* psType, AtomicVarList* psAtomicList)
-{
-    uint32_t i;
-
-    for (i = 0; i < psType->MemberCount; ++i)
-    {
-        if (psType->Members[i].Class == SVC_STRUCT)
-        {
-            PreDeclareStructTypeMETAL(metal, psType->Members[i].Name, &psType->Members[i], psAtomicList);
-        }
-    }
-
-    if (psType->Class == SVC_STRUCT)
-    {
-#if defined(_DEBUG)
-        uint32_t unnamed_struct = strcmp(Name, "$Element") == 0 ? 1 : 0;
-#endif
-
-        //Not supported at the moment
-        ASSERT(!unnamed_struct);
-
-        bformata(metal, "struct %s_Type {\n", Name);
-
-        for (i = 0; i < psType->MemberCount; ++i)
-        {
-            ASSERT(psType->Members != 0);
-
-            DeclareConstBufferShaderVariableMETAL(metal, psType->Members[i].Name, &psType->Members[i], 0, 0, psAtomicList);
-        }
-
-        bformata(metal, "};\n");
-    }
-}
-
-char* GetDeclaredInputNameMETAL(const HLSLCrossCompilerContext* psContext, const SHADER_TYPE eShaderType, const Operand* psOperand)
-{
-    bstring inputName;
-    char* cstr;
-    InOutSignature* psIn;
-
-    if (eShaderType == PIXEL_SHADER)
-    {
-        inputName = bformat("VtxOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else
-    {
-        ASSERT(eShaderType == VERTEX_SHADER);
-        inputName = bformat("dcl_Input%d", psOperand->ui32RegisterNumber);
-    }
-    if ((psContext->flags & HLSLCC_FLAG_INOUT_SEMANTIC_NAMES) && GetInputSignatureFromRegister(psOperand->ui32RegisterNumber, &psContext->psShader->sInfo, &psIn))
-    {
-        bformata(inputName, "_%s%d", psIn->SemanticName, psIn->ui32SemanticIndex);
-    }
-
-    cstr = bstr2cstr(inputName, '\0');
-    bdestroy(inputName);
-    return cstr;
-}
-
-char* GetDeclaredOutputNameMETAL(const HLSLCrossCompilerContext* psContext,
-    const SHADER_TYPE eShaderType,
-    const Operand* psOperand)
-{
-    bstring outputName = bformat("");
-    char* cstr;
-    InOutSignature* psOut;
-
-#if defined(_DEBUG)
-    int foundOutput =
-#endif
-        GetOutputSignatureFromRegister(
-            psContext->currentPhase,
-            psOperand->ui32RegisterNumber,
-            psOperand->ui32CompMask,
-            psContext->psShader->ui32CurrentVertexOutputStream,
-            &psContext->psShader->sInfo,
-            &psOut);
-
-    ASSERT(foundOutput);
-
-    if (eShaderType == VERTEX_SHADER)
-    {
-        outputName = bformat("VtxOutput%d", psOperand->ui32RegisterNumber);
-    }
-    else if (eShaderType == PIXEL_SHADER)
-    {
-        outputName = bformat("PixOutput%d", psOperand->ui32RegisterNumber);
-    }
-
-    if (psContext->flags & HLSLCC_FLAG_INOUT_APPEND_SEMANTIC_NAMES)
-    {
-        bformata(outputName, "_%s%d", psOut->SemanticName, psOut->ui32SemanticIndex);
-    }
-
-    cstr = bstr2cstr(outputName, '\0');
-    bdestroy(outputName);
-    return cstr;
-}
-
-const char* GetInterpolationStringMETAL(INTERPOLATION_MODE eMode)
-{
-    switch (eMode)
-    {
-    case INTERPOLATION_CONSTANT:
-    {
-        return "flat";
-    }
-    case INTERPOLATION_LINEAR:
-    {
-        return "center_perspective";
-    }
-    case INTERPOLATION_LINEAR_CENTROID:
-    {
-        return "centroid_perspective";
-    }
-    case INTERPOLATION_LINEAR_NOPERSPECTIVE:
-    {
-        return "center_no_perspective";
-        break;
-    }
-    case INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID:
-    {
-        return "centroid_no_perspective";
-    }
-    case INTERPOLATION_LINEAR_SAMPLE:
-    {
-        return "sample_perspective";
-    }
-    case INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE:
-    {
-        return "sample_no_perspective";
-    }
-    default:
-    {
-        return "";
-    }
-    }
-}
-
-static void DeclareInput(
-    HLSLCrossCompilerContext* psContext,
-    const Declaration* psDecl, const char* StorageQualifier, OPERAND_MIN_PRECISION minPrecision, int iNumComponents, OPERAND_INDEX_DIMENSION eIndexDim, const char* InputName)
-{
-    ShaderData* psShader = psContext->psShader;
-    psContext->currentShaderString = &psContext->parameterDeclarations;
-    bstring metal = *psContext->currentShaderString;
-
-    // This falls within the specified index ranges. The default is 0 if no input range is specified
-    if (psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] == -1)
-    {
-        return;
-    }
-
-    if (psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == 0)
-    {
-        
-        InOutSignature* psSignature = NULL;
-
-        const char* type = "float";
-        if (minPrecision == OPERAND_MIN_PRECISION_FLOAT_16)
-        {
-            type = "half";
-        }
-        if (GetInputSignatureFromRegister(psDecl->asOperands[0].ui32RegisterNumber, &psShader->sInfo, &psSignature))
-        {
-            switch (psSignature->eComponentType)
-            {
-            case INOUT_COMPONENT_UINT32:
-            {
-                type = "uint";
-                break;
-            }
-            case INOUT_COMPONENT_SINT32:
-            {
-                type = "int";
-                break;
-            }
-            case INOUT_COMPONENT_FLOAT32:
-            {
-                break;
-            }
-            }
-        }
-
-        bstring qual = bfromcstralloc(256, StorageQualifier);
-
-        if (biseqcstr(qual, "attribute"))
-        {
-            bformata(qual, "(%d)", psDecl->asOperands[0].ui32RegisterNumber);
-            psContext->currentShaderString = &psContext->stagedInputDeclarations;
-            metal = *psContext->currentShaderString;
-        }
-        else if (biseqcstr(qual, "user"))
-        {
-            bformata(qual, "(varying%d)", psDecl->asOperands[0].ui32RegisterNumber);
-            psContext->currentShaderString = &psContext->stagedInputDeclarations;
-            metal = *psContext->currentShaderString;
-        }
-        else if (biseqcstr(qual, "buffer"))
-        {
-            bformata(qual, "(%d)", psDecl->asOperands[0].ui32RegisterNumber);
-        }
-
-        if (metal == psContext->stagedInputDeclarations)
-        {
-            bformata(metal, "\t%s", type);
-            if (iNumComponents > 1)
-            {
-                bformata(metal, "%d", iNumComponents);
-            }
-        }
-        else
-        {
-            if (iNumComponents > 1)
-            {
-                bformata(metal, "\tdevice %s%d*", type, iNumComponents);
-            }
-            else
-            {
-                bformata(metal, "\tdevice %s*", type, iNumComponents);
-            }
-        }
-
-
-        if (psDecl->asOperands[0].eType == OPERAND_TYPE_SPECIAL_TEXCOORD)
-        {
-            InputName = "TexCoord";
-        }
-
-        bformata(metal, " %s", InputName);
-
-        switch (eIndexDim)
-        {
-        case INDEX_2D:
-        {
-            if (iNumComponents == 1)
-            {
-                psContext->psShader->abScalarInput[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-            }
-
-            const uint32_t arraySize = psDecl->asOperands[0].aui32ArraySizes[0];
-
-            bformata(metal, " [%d]", arraySize);
-
-            psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = arraySize;
-            break;
-        }
-        default:
-        {
-            if (iNumComponents == 1)
-            {
-                psContext->psShader->abScalarInput[psDecl->asOperands[0].ui32RegisterNumber] = 1;
-            }
-            else
-            {
-                if (psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] > 0)
-                {
-                    bformata(metal, "[%d]", type, iNumComponents, InputName,
-                        psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber]);
-
-                    psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber];
-                }
-                else
-                {
-                    psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = -1;
-                }
-            }
-            break;
-        }
-        }
-
-        if (blength(qual) > 0)
-        {
-            bformata(metal, " [[ %s ]]", bdata(qual));
-        }
-        bdestroy(qual);
-
-        bformata(metal, "%c\n", (metal == psContext->stagedInputDeclarations) ? ';' : ',');
-
-        if (psShader->abInputReferencedByInstruction[psDecl->asOperands[0].ui32RegisterNumber])
-        {
-            const char* stageInString = (metal == psContext->stagedInputDeclarations) ? "stageIn." : "";
-            const char* bufferAccessString = (metal == psContext->stagedInputDeclarations) ? "" : "[vId]";
-
-            psContext->currentShaderString = &psContext->earlyMain;
-            metal = *psContext->currentShaderString;
-            psContext->indent++;
-
-            if (psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == -1) //Not an array
-            {
-                AddIndentation(psContext);
-                bformata(metal, "%s%d Input%d = %s%s%s;\n", type, iNumComponents,
-                    psDecl->asOperands[0].ui32RegisterNumber, stageInString, InputName, bufferAccessString);
-            }
-            else
-            {
-                int arrayIndex = psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber];
-                bformata(metal, "%s%d Input%d[%d];\n", type, iNumComponents, psDecl->asOperands[0].ui32RegisterNumber,
-                    psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber]);
-
-                while (arrayIndex)
-                {
-                    AddIndentation(psContext);
-                    bformata(metal, "Input%d[%d] = %s%s%s[%d];\n", psDecl->asOperands[0].ui32RegisterNumber, arrayIndex - 1,
-                        stageInString, InputName, bufferAccessString, arrayIndex - 1);
-
-                    arrayIndex--;
-                }
-            }
-            psContext->indent--;
-        }
-    }
-    psContext->currentShaderString = &psContext->mainShader;
-}
-
-static void AddBuiltinInputMETAL(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, const char* builtinName, const char* type)
-{
-    psContext->currentShaderString = &psContext->stagedInputDeclarations;
-    bstring metal = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-    char* InputName = GetDeclaredInputNameMETAL(psContext, PIXEL_SHADER, &psDecl->asOperands[0]);
-
-    if (psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] == 0)
-    {
-        // CONFETTI NOTE: DAVID SROUR
-        // vertex_id and instance_id must be part of the function's params -- not part of stage_in!
-        if (psDecl->asOperands[0].eSpecialName == NAME_INSTANCE_ID || psDecl->asOperands[0].eSpecialName == NAME_VERTEX_ID)
-        {
-            bformata(psContext->parameterDeclarations, "\t%s %s [[ %s ]],\n", type, &psDecl->asOperands[0].pszSpecialName, builtinName);
-        }
-        else
-        {
-            bformata(metal, "\t%s %s [[ %s ]];\n", type, InputName, builtinName);
-        }
-
-        psShader->aiInputDeclaredSize[psDecl->asOperands[0].ui32RegisterNumber] = 1;
-    }
-
-    if (psShader->abInputReferencedByInstruction[psDecl->asOperands[0].ui32RegisterNumber])
-    {
-        psContext->currentShaderString = &psContext->earlyMain;
-        metal = *psContext->currentShaderString;
-        psContext->indent++;
-        AddIndentation(psContext);
-
-        if (psDecl->asOperands[0].eSpecialName == NAME_INSTANCE_ID || psDecl->asOperands[0].eSpecialName == NAME_VERTEX_ID)
-        {
-            bformata(metal, "uint4 ");
-            bformata(metal, "Input%d; Input%d.x = %s;\n",
-                psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber, &psDecl->asOperands[0].pszSpecialName);
-        }
-        else if (!strcmp(type, "bool"))
-        {
-            bformata(metal, "int4 ");
-            bformata(metal, "Input%d; Input%d.x = stageIn.%s;\n",
-                psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber, InputName);
-        }
-        else if (!strcmp(type, "float"))
-        {
-            bformata(metal, "float4 ");
-            bformata(metal, "Input%d; Input%d.x = stageIn.%s;\n",
-                psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber, InputName);
-        }
-        else if (!strcmp(type, "int"))
-        {
-            bformata(metal, "int4 ");
-            bformata(metal, "Input%d; Input%d.x = stageIn.%s;\n",
-                psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber, InputName);
-        }
-        else if (!strcmp(type, "uint"))
-        {
-            bformata(metal, "uint4 ");
-            bformata(metal, "Input%d; Input%d.x = stageIn.%s;\n",
-                psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber, InputName);
-        }
-        else
-        {
-            bformata(metal, "%s Input%d = stageIn.%s;\n", type,
-                psDecl->asOperands[0].ui32RegisterNumber, InputName);
-        }
-
-        if (psDecl->asOperands[0].eSpecialName == NAME_POSITION)
-        {
-            if (psContext->psShader->eShaderType == PIXEL_SHADER)
-            {
-                if (psDecl->asOperands[0].eSelMode == OPERAND_4_COMPONENT_MASK_MODE &&
-                    psDecl->asOperands[0].eType == OPERAND_TYPE_INPUT)
-                {
-                    if (psDecl->asOperands[0].ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                    {
-                        bformata(metal, "Input%d.w = 1.0 / Input%d.w;", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber);
-                    }
-                }
-            }
-        }
-
-        psContext->indent--;
-    }
-    bcstrfree(InputName);
-
-    psContext->currentShaderString = &psContext->mainShader;
-}
-
-int OutputNeedsDeclaringMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, const int count)
-{
-    ShaderData* psShader = psContext->psShader;
-    
-    // Depth Output operands are a special case and won't have a ui32RegisterNumber,
-    // so first we have to check if the output operand is depth.
-    if (psShader->eShaderType == PIXEL_SHADER)
-    {
-        if (psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL ||
-            psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL ||
-            psOperand->eType == OPERAND_TYPE_OUTPUT_DEPTH)
-        {
-            return 1;
-        }
-    }
-    
-    const uint32_t declared = ((psContext->currentPhase + 1) << 3) | psShader->ui32CurrentVertexOutputStream;
-    ASSERT(psOperand->ui32RegisterNumber >= 0);
-    ASSERT(psOperand->ui32RegisterNumber < MAX_SHADER_VEC4_OUTPUT);
-    if (psShader->aiOutputDeclared[psOperand->ui32RegisterNumber] != declared)
-    {
-        int offset;
-
-        for (offset = 0; offset < count; offset++)
-        {
-            psShader->aiOutputDeclared[psOperand->ui32RegisterNumber + offset] = declared;
-        }
-        return 1;
-    }
-
-    return 0;
-}
-
-void AddBuiltinOutputMETAL(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, const GLVARTYPE type, int arrayElements, const char* builtinName)
-{
-    (void)type;
-
-    bstring metal = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-
-    psContext->havePostShaderCode[psContext->currentPhase] = 1;
-
-    if (OutputNeedsDeclaringMETAL(psContext, &psDecl->asOperands[0], arrayElements ? arrayElements : 1))
-    {
-        psContext->currentShaderString = &psContext->declaredOutputs;
-        metal = *psContext->currentShaderString;
-        InOutSignature* psSignature = NULL;
-
-        int regNum = psDecl->asOperands[0].ui32RegisterNumber;
-
-        GetOutputSignatureFromRegister(psContext->currentPhase, regNum,
-            psDecl->asOperands[0].ui32CompMask,
-            0,
-            &psShader->sInfo, &psSignature);
-
-        if (psDecl->asOperands[0].eSpecialName == NAME_CLIP_DISTANCE)
-        {
-            int max = GetMaxComponentFromComponentMaskMETAL(&psDecl->asOperands[0]);
-            bformata(metal, "\tfloat %s [%d] [[ %s ]];\n", builtinName, max, builtinName);
-        }
-        else
-        {
-            bformata(metal, "\tfloat4 %s [[ %s ]];\n", builtinName, builtinName);
-        }
-        bformata(metal, "#define Output%d output.%s\n", regNum, builtinName);
-
-        psContext->currentShaderString = &psContext->mainShader;
-    }
-}
-
-void AddUserOutputMETAL(HLSLCrossCompilerContext* psContext, const Declaration* psDecl)
-{
-    psContext->currentShaderString = &psContext->declaredOutputs;
-    bstring metal = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-
-    if (OutputNeedsDeclaringMETAL(psContext, &psDecl->asOperands[0], 1))
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        const char* type = "\tfloat";
-        const SHADER_VARIABLE_TYPE eOutType = GetOperandDataTypeMETAL(psContext, &psDecl->asOperands[0]);
-
-        switch (eOutType)
-        {
-        case SVT_UINT:
-        {
-            type = "\tuint";
-            break;
-        }
-        case SVT_INT:
-        {
-            type = "\tint";
-            break;
-        }
-        case SVT_FLOAT16:
-        {
-            type = "\thalf";
-            break;
-        }
-        case SVT_FLOAT:
-        {
-            break;
-        }
-        }
-
-        switch (psShader->eShaderType)
-        {
-        case PIXEL_SHADER:
-        {
-            switch (psDecl->asOperands[0].eType)
-            {
-            case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-            {
-                break;
-            }
-            case OPERAND_TYPE_OUTPUT_DEPTH:
-            {
-                bformata(metal, "%s PixOutDepthAny [[ depth(any) ]];\n", type);
-                bformata(metal, "#define DepthAny output.PixOutDepthAny\n");
-                break;
-            }
-            case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-            {
-                bformata(metal, "%s PixOutDepthGreater [[ depth(greater) ]];\n", type);
-                bformata(metal, "#define DepthGreater output.PixOutDepthGreater\n");
-                break;
-            }
-            case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-            {
-                bformata(metal, "%s PixOutDepthLess [[ depth(less) ]];\n", type);
-                bformata(metal, "#define DepthLess output.PixOutDepthLess\n");
-                break;
-            }
-            default:
-            {
-                uint32_t renderTarget = psDecl->asOperands[0].ui32RegisterNumber;
-
-                if (!psContext->gmemOutputNumElements[psDecl->asOperands[0].ui32RegisterNumber])
-                {
-                    bformata(metal, "%s4 PixOutColor%d [[ color(%d) ]];\n", type, renderTarget, renderTarget);
-                }
-                else // GMEM output type must match the input!
-                {
-                    bformata(metal, "float%d PixOutColor%d [[ color(%d) ]];\n", psContext->gmemOutputNumElements[psDecl->asOperands[0].ui32RegisterNumber], renderTarget, renderTarget);
-                }
-                bformata(metal, "#define Output%d output.PixOutColor%d\n", psDecl->asOperands[0].ui32RegisterNumber, renderTarget);
-
-                break;
-            }
-            }
-            break;
-        }
-        case VERTEX_SHADER:
-        {
-            int iNumComponents = 4;//GetMaxComponentFromComponentMaskMETAL(&psDecl->asOperands[0]);
-            char* OutputName = GetDeclaredOutputNameMETAL(psContext, VERTEX_SHADER, psOperand);
-
-            bformata(metal, "%s%d %s [[ user(varying%d) ]];\n", type, iNumComponents, OutputName, psDecl->asOperands[0].ui32RegisterNumber);
-            bformata(metal, "#define Output%d output.%s\n", psDecl->asOperands[0].ui32RegisterNumber, OutputName);
-            bcstrfree(OutputName);
-
-            break;
-        }
-        }
-    }
-
-    psContext->currentShaderString = &psContext->mainShader;
-}
-
-void DeclareBufferVariableMETAL(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint,
-    ConstantBuffer* psCBuf, const Operand* psOperand,
-    const ResourceType eResourceType,
-    bstring metal, AtomicVarList* psAtomicList)
-{
-    (void)ui32BindingPoint;
-
-    bstring StructName;
-#if !defined(NDEBUG)
-    uint32_t unnamed_struct = strcmp(psCBuf->asVars[0].Name, "$Element") == 0 ? 1 : 0;
-#endif
-
-    ASSERT(psCBuf->ui32NumVars == 1);
-    ASSERT(unnamed_struct);
-
-    StructName = bfromcstr("");
-
-    //TranslateOperandMETAL(psContext, psOperand, TO_FLAG_NAME_ONLY);
-    if (psOperand->eType == OPERAND_TYPE_RESOURCE && eResourceType == RTYPE_STRUCTURED)
-    {
-        ResourceNameMETAL(StructName, psContext, RGROUP_TEXTURE, psOperand->ui32RegisterNumber, 0);
-    }
-    else if (psOperand->eType == OPERAND_TYPE_RESOURCE && eResourceType == RTYPE_UAV_RWBYTEADDRESS)
-    {
-        bformata(StructName, "RawRes%d", psOperand->ui32RegisterNumber);
-    }
-    else
-    {
-        ResourceNameMETAL(StructName, psContext, RGROUP_UAV, psOperand->ui32RegisterNumber, 0);
-    }
-
-    PreDeclareStructTypeMETAL(metal,
-        bstr2cstr(StructName, '\0'),
-        &psCBuf->asVars[0].sType, psAtomicList);
-
-
-    bcatcstr(psContext->parameterDeclarations, "\t");
-    if (eResourceType == RTYPE_STRUCTURED)
-    {
-        bcatcstr(psContext->parameterDeclarations, "constant ");
-    }
-    else
-    {
-        bcatcstr(psContext->parameterDeclarations, "device ");
-    }
-
-
-    DeclareConstBufferShaderVariableMETAL(psContext->parameterDeclarations,
-        bstr2cstr(StructName, '\0'),
-        &psCBuf->asVars[0].sType,
-        1, 0, psAtomicList);
-    if (eResourceType == RTYPE_UAV_RWSTRUCTURED)
-    {
-        //If it is UAV raw structured, let Metal compiler assign it with the first available location index
-        bformata(psContext->parameterDeclarations, " [[ buffer(%d) ]],\n", psOperand->ui32RegisterNumber + UAV_BUFFER_START_SLOT);
-        //modify the reflection data to match the binding index
-        int count = 0;
-        for (uint32_t index = 0; index < psContext->psShader->sInfo.ui32NumResourceBindings; index++)
-        {
-            if (strcmp(psContext->psShader->sInfo.psResourceBindings[index].Name, (const char*)StructName->data) == 0)
-            {
-                count++;
-                //psContext->psShader->sInfo.psResourceBindings[index].ui32BindPoint += UAV_BUFFER_START_SLOT;
-                psContext->psShader->sInfo.psResourceBindings[index].eBindArea = UAVAREA_CBUFFER;
-            }
-        }
-        //If count >2, the logic here is wrong and need to be modified.
-        ASSERT(count < 2);
-    }
-    else
-    {
-        bformata(psContext->parameterDeclarations, " [[ buffer(%d) ]],\n", psOperand->ui32RegisterNumber);
-    }
-
-    bdestroy(StructName);
-}
-
-static uint32_t ComputeVariableTypeSize(const ShaderVarType* psType)
-{
-    if (psType->Class == SVC_STRUCT)
-    {
-        uint32_t i;
-        uint32_t size = 0;
-        for (i = 0; i < psType->MemberCount; ++i)
-        {
-            size += ComputeVariableTypeSize(&psType->Members[i]);
-        }
-
-        if (psType->Elements > 1)
-        {
-            return size * psType->Elements;
-        }
-        else
-        {
-            return size;
-        }
-    }
-    else if (psType->Class == SVC_MATRIX_COLUMNS || psType->Class == SVC_MATRIX_ROWS)
-    {
-        if (psType->Elements > 1)
-        {
-            return psType->Rows * psType->Elements;
-        }
-        else
-        {
-            return psType->Rows;
-        }
-    }
-    else
-    if (psType->Class == SVC_VECTOR)
-    {
-        if (psType->Elements > 1)
-        {
-            return psType->Elements;
-        }
-        else
-        {
-            return 1;
-        }
-    }
-
-    return 1;
-}
-
-
-void DeclareStructConstantsMETAL(HLSLCrossCompilerContext* psContext, const uint32_t ui32BindingPoint,
-    ConstantBuffer* psCBuf, const Operand* psOperand,
-    bstring metal, AtomicVarList* psAtomicList)
-{
-    (void)psOperand;
-
-    uint32_t i;
-    const char* StageName = "VS";
-    uint32_t nextBufferRegister = 0;
-    uint32_t numDummyBuffers = 0;
-
-    for (i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        PreDeclareStructTypeMETAL(metal,
-            psCBuf->asVars[i].sType.Name,
-            &psCBuf->asVars[i].sType, psAtomicList);
-    }
-
-    switch (psContext->psShader->eShaderType)
-    {
-    case PIXEL_SHADER:
-    {
-        StageName = "PS";
-        break;
-    }
-    case COMPUTE_SHADER:
-    {
-        StageName = "CS";
-        break;
-    }
-    default:
-    {
-        break;
-    }
-    }
-
-    bformata(metal, "struct %s%s_Type {\n", psCBuf->Name, StageName);
-
-    for (i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        uint32_t ui32RegNum = psCBuf->asVars[i].ui32StartOffset / 16;
-        if (ui32RegNum > nextBufferRegister)
-        {
-            bformata(metal, "\tfloat4 offsetDummy_%d[%d];\n", numDummyBuffers++, ui32RegNum - nextBufferRegister);
-        }
-
-        DeclareConstBufferShaderVariableMETAL(metal,
-            psCBuf->asVars[i].sType.Name,
-            &psCBuf->asVars[i].sType, 0, i < psCBuf->ui32NumVars - 1, psAtomicList);
-
-        uint32_t varSize = ComputeVariableTypeSize(&psCBuf->asVars[i].sType);
-        nextBufferRegister = ui32RegNum + varSize;
-    }
-
-    bcatcstr(metal, "};\n");
-
-    bcatcstr(psContext->parameterDeclarations, "\tconstant ");
-    bformata(psContext->parameterDeclarations, "%s%s_Type ", psCBuf->Name, StageName);
-    bcatcstr(psContext->parameterDeclarations, "& ");
-
-    bformata(psContext->parameterDeclarations, "%s%s_In", psCBuf->Name, StageName);
-    bformata(psContext->parameterDeclarations, " [[ buffer(%d) ]],\n", ui32BindingPoint);
-
-    for (i = 0; i < psCBuf->ui32NumVars; ++i)
-    {
-        const struct ShaderVarType_TAG* psType = &psCBuf->asVars[i].sType;
-        const char* Name = psCBuf->asVars[i].sType.Name;
-        const char* addressSpace = "constant";
-
-        if (psType->Class == SVC_STRUCT)
-        {
-            bformata(psContext->earlyMain, "\t%s %s_Type%s const &%s", addressSpace, Name, psType->Elements > 1 ? "*" : "", Name);
-        }
-        else if (psType->Class == SVC_MATRIX_COLUMNS || psType->Class == SVC_MATRIX_ROWS)
-        {
-            switch (psType->Type)
-            {
-            case SVT_FLOAT:
-            {
-                bformata(psContext->earlyMain, "\t%s float%d%s const &%s", addressSpace, psType->Columns, "*", Name, psType->Rows);
-                break;
-            }
-            case SVT_FLOAT16:
-            {
-                bformata(psContext->earlyMain, "\t%s half%d%s const &%s", addressSpace, psType->Columns, "*", Name, psType->Rows);
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-            }
-        }
-        else
-        if (psType->Class == SVC_VECTOR)
-        {
-            switch (psType->Type)
-            {
-            case SVT_FLOAT:
-            case SVT_DOUBLE:     // double is not supported in metal
-            {
-                bformata(psContext->earlyMain, "\t%s float%d%s const &%s", addressSpace, psType->Columns, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            case SVT_FLOAT16:    
-            {
-                bformata(psContext->earlyMain, "\t%s half%d%s const &%s", addressSpace, psType->Columns, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            case SVT_UINT:
-            {
-                bformata(psContext->earlyMain, "\t%s uint%d%s const &%s", addressSpace, psType->Columns, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            case SVT_INT:
-            {
-                bformata(psContext->earlyMain, "\t%s int%d%s const &%s", addressSpace, psType->Columns, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-            }
-        }
-        else
-        if (psType->Class == SVC_SCALAR)
-        {
-            switch (psType->Type)
-            {
-            case SVT_FLOAT:
-            case SVT_DOUBLE:         // double is not supported in metal
-            {
-                bformata(psContext->earlyMain, "\t%s float%s const &%s", addressSpace, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            case SVT_FLOAT16:            
-            {
-                bformata(psContext->earlyMain, "\t%s half%s const &%s", addressSpace, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            case SVT_UINT:
-            {
-                bformata(psContext->earlyMain, "\t%s uint%s const &%s", addressSpace, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            case SVT_INT:
-            {
-                bformata(psContext->earlyMain, "\t%s int%s const &%s", addressSpace, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            case SVT_BOOL:
-            {
-                //Use int instead of bool.
-                //Allows implicit conversions to integer
-                bformata(psContext->earlyMain, "\t%s int%s const &%s", addressSpace, psType->Elements > 1 ? "*" : "", Name);
-                break;
-            }
-            default:
-            {
-                ASSERT(0);
-                break;
-            }
-            }
-        }
-
-        bformata(psContext->earlyMain, " = %s%s_In.%s;\n", psCBuf->Name, StageName, psCBuf->asVars[i].sType.Name);
-    }
-}
-
-char* GetSamplerTypeMETAL(HLSLCrossCompilerContext* psContext,
-    const RESOURCE_DIMENSION eDimension,
-    const uint32_t ui32RegisterNumber, const uint32_t isShadow)
-{
-    ResourceBinding* psBinding = 0;
-    RESOURCE_RETURN_TYPE eType = RETURN_TYPE_UNORM;
-    int found;
-    found = GetResourceFromBindingPoint(RGROUP_TEXTURE, ui32RegisterNumber, &psContext->psShader->sInfo, &psBinding);
-    if (found)
-    {
-        eType = (RESOURCE_RETURN_TYPE)psBinding->ui32ReturnType;
-    }
-    switch (eDimension)
-    {
-    case RESOURCE_DIMENSION_BUFFER:
-    {
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "";
-        case RETURN_TYPE_UINT:
-            return "";
-        default:
-            return "";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexture1d<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexture1d<uint>";
-        default:
-            return "\ttexture1d<float>";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE2D:
-    {
-        if (isShadow)
-        {
-            return "\tdepth2d<float>";
-        }
-
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexture2d<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexture2d<uint>";
-        default:
-            return "\ttexture2d<float>";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE2DMS:
-    {
-        if (isShadow)
-        {
-            return "\tdepth2d_ms<float>";
-        }
-
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexture2d_ms<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexture2d_ms<uint>";
-        default:
-            return "\ttexture2d_ms<float>";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE3D:
-    {
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexture3d<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexture3d<uint>";
-        default:
-            return "\ttexture3d<float>";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURECUBE:
-    {
-        if (isShadow)
-        {
-            return "\tdepthcube<float>";
-        }
-
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexturecube<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexturecube<uint>";
-        default:
-            return "\ttexturecube<float>";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    {
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexture1d_array<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexture1d_array<uint>";
-        default:
-            return "\ttexture1d_array<float>";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    {
-        if (isShadow)
-        {
-            return "\tdepth2d_array<float>";
-        }
-
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexture2d_array<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexture2d_array<uint>";
-        default:
-            return "\ttexture2d_array<float>";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-    {
-        //Metal does not support this type of resource
-        ASSERT(0);
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "";
-        case RETURN_TYPE_UINT:
-            return "";
-        default:
-            return "";
-        }
-        break;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    {
-        switch (eType)
-        {
-        case RETURN_TYPE_SINT:
-            return "\ttexturecube_array<int>";
-        case RETURN_TYPE_UINT:
-            return "\ttexturecube_array<uint>";
-        default:
-            return "\ttexturecube_array<float>";
-        }
-        break;
-    }
-    }
-
-    return "sampler2D";
-}
-
-static void TranslateResourceTexture(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, uint32_t samplerCanDoShadowCmp)
-{
-    bstring metal = *psContext->currentShaderString;
-
-    const char* samplerTypeName = GetSamplerTypeMETAL(psContext,
-            psDecl->value.eResourceDimension,
-            psDecl->asOperands[0].ui32RegisterNumber, samplerCanDoShadowCmp && psDecl->ui32IsShadowTex);
-
-    if (samplerCanDoShadowCmp && psDecl->ui32IsShadowTex)
-    {
-        //Create shadow and non-shadow sampler.
-        //HLSL does not have separate types for depth compare, just different functions.
-        bcatcstr(metal, samplerTypeName);
-        bcatcstr(metal, " ");
-        ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, 1);
-    }
-    else
-    {
-        bcatcstr(metal, samplerTypeName);
-        bcatcstr(metal, " ");
-        ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, 0);
-    }
-}
-
-void TranslateDeclarationMETAL(HLSLCrossCompilerContext* psContext, const Declaration* psDecl, AtomicVarList* psAtomicList)
-{
-    bstring metal = *psContext->currentShaderString;
-    ShaderData* psShader = psContext->psShader;
-
-    switch (psDecl->eOpcode)
-    {
-    case OPCODE_DCL_INPUT_SGV:
-    case OPCODE_DCL_INPUT_PS_SGV:
-    {
-        const SPECIAL_NAME eSpecialName = psDecl->asOperands[0].eSpecialName;
-
-        if (psShader->eShaderType == PIXEL_SHADER)
-        {
-            switch (eSpecialName)
-            {
-            case NAME_POSITION:
-            {
-                AddBuiltinInputMETAL(psContext, psDecl, "position", "float4");
-                break;
-            }
-            case NAME_CLIP_DISTANCE:
-            {
-                AddBuiltinInputMETAL(psContext, psDecl, "clip_distance", "float");
-                break;
-            }
-            case NAME_INSTANCE_ID:
-            {
-                AddBuiltinInputMETAL(psContext, psDecl, "instance_id", "uint");
-                break;
-            }
-            case NAME_IS_FRONT_FACE:
-            {
-                /*
-                Cast to int used because
-                if(gl_FrontFacing != 0) failed to compiled on Intel HD 4000.
-                Suggests no implicit conversion for bool<->int.
-                */
-
-                AddBuiltinInputMETAL(psContext, psDecl, "front_facing", "bool");
-                break;
-            }
-            case NAME_SAMPLE_INDEX:
-            {
-                AddBuiltinInputMETAL(psContext, psDecl, "sample_id", "uint");
-                break;
-            }
-            default:
-            {
-                DeclareInput(psContext, psDecl,
-                    "user", OPERAND_MIN_PRECISION_DEFAULT, 4, INDEX_1D, psDecl->asOperands[0].pszSpecialName);
-            }
-            }
-        }
-        else if (psShader->eShaderType == VERTEX_SHADER)
-        {
-            switch (eSpecialName)
-            {
-            case NAME_VERTEX_ID:
-            {
-                AddBuiltinInputMETAL(psContext, psDecl, "vertex_id", "uint");
-                break;
-            }
-            case NAME_INSTANCE_ID:
-            {
-                AddBuiltinInputMETAL(psContext, psDecl, "instance_id", "uint");
-                break;
-            }
-            default:
-            {
-                DeclareInput(psContext, psDecl,
-                    "attribute", OPERAND_MIN_PRECISION_DEFAULT, 4, INDEX_1D, psDecl->asOperands[0].pszSpecialName);
-            }
-            }
-        }
-        break;
-    }
-
-    case OPCODE_DCL_OUTPUT_SIV:
-    {
-        switch (psDecl->asOperands[0].eSpecialName)
-        {
-        case NAME_POSITION:
-        {
-            AddBuiltinOutputMETAL(psContext, psDecl, GLVARTYPE_FLOAT4, 0, "position");
-            break;
-        }
-        case NAME_CLIP_DISTANCE:
-        {
-            AddBuiltinOutputMETAL(psContext, psDecl, GLVARTYPE_FLOAT, 0, "clip_distance");
-            break;
-        }
-        case NAME_VERTEX_ID:
-        {
-            ASSERT(0); //VertexID is not an output
-            break;
-        }
-        case NAME_INSTANCE_ID:
-        {
-            ASSERT(0); //InstanceID is not an output
-            break;
-        }
-        case NAME_IS_FRONT_FACE:
-        {
-            ASSERT(0); //FrontFacing is not an output
-            break;
-        }
-        default:
-        {
-            bformata(metal, "float4 %s;\n", psDecl->asOperands[0].pszSpecialName);
-
-            bcatcstr(metal, "#define ");
-            TranslateOperandMETAL(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-            bformata(metal, " %s\n", psDecl->asOperands[0].pszSpecialName);
-            break;
-        }
-        }
-        break;
-    }
-    case OPCODE_DCL_INPUT:
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        //Force the number of components to be 4.
-        /*dcl_output o3.xy
-        dcl_output o3.z
-
-        Would generate a vec2 and a vec3. We discard the second one making .z invalid!
-
-        */
-        int iNumComponents = 4;//GetMaxComponentFromComponentMask(psOperand);
-        const char* InputName;
-
-        if ((psOperand->eType == OPERAND_TYPE_INPUT_DOMAIN_POINT) ||
-            (psOperand->eType == OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_COVERAGE_MASK) ||
-            (psOperand->eType == OPERAND_TYPE_INPUT_FORK_INSTANCE_ID))
-        {
-            break;
-        }
-        if (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID)
-        {
-            bformata(psContext->parameterDeclarations, "\tuint3 vThreadID [[ thread_position_in_grid ]],\n");
-            break;
-        }
-        if (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP)
-        {
-            bformata(psContext->parameterDeclarations, "\tuint3 vThreadIDInGroup [[ thread_position_in_threadgroup ]],\n");
-            break;
-        }
-        if (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_GROUP_ID)
-        {
-            bformata(psContext->parameterDeclarations, "\tuint3 vThreadGroupID [[ threadgroup_position_in_grid  ]],\n");
-            break;
-        }
-        if (psOperand->eType == OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED)
-        {
-            bformata(psContext->parameterDeclarations, "\tuint vThreadIDInGroupFlattened [[ thread_index_in_threadgroup ]],\n");
-            break;
-        }
-        //Already declared as part of an array.
-        if (psShader->aIndexedInput[psDecl->asOperands[0].ui32RegisterNumber] == -1)
-        {
-            break;
-        }
-
-        InputName = GetDeclaredInputNameMETAL(psContext, psShader->eShaderType, psOperand);
-
-        DeclareInput(psContext, psDecl,
-            "attribute", (OPERAND_MIN_PRECISION)psOperand->eMinPrecision, iNumComponents, (OPERAND_INDEX_DIMENSION)psOperand->iIndexDims, InputName);
-
-        break;
-    }
-    case OPCODE_DCL_INPUT_PS_SIV:
-    {
-        switch (psDecl->asOperands[0].eSpecialName)
-        {
-        case NAME_POSITION:
-        {
-            AddBuiltinInputMETAL(psContext, psDecl, "position", "float4");
-            break;
-        }
-        }
-        break;
-    }
-    case OPCODE_DCL_INPUT_SIV:
-    {
-        break;
-    }
-    case OPCODE_DCL_INPUT_PS:
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        int iNumComponents = 4;//GetMaxComponentFromComponentMask(psOperand);
-        const char* InputName = GetDeclaredInputNameMETAL(psContext, PIXEL_SHADER, psOperand);
-
-        DeclareInput(psContext, psDecl,
-            "user", (OPERAND_MIN_PRECISION)psOperand->eMinPrecision, iNumComponents, INDEX_1D, InputName);
-
-        break;
-    }
-    case OPCODE_DCL_TEMPS:
-    {
-        const uint32_t ui32NumTemps = psDecl->value.ui32NumTemps;
-
-        if (ui32NumTemps > 0)
-        {
-            bformata(psContext->earlyMain, "\tfloat4 Temp[%d];\n", ui32NumTemps);
-
-            bformata(psContext->earlyMain, "\tint4 Temp_int[%d];\n", ui32NumTemps);
-            bformata(psContext->earlyMain, "\tuint4 Temp_uint[%d];\n", ui32NumTemps);
-            bformata(psContext->earlyMain, "\thalf4 Temp_half[%d];\n", ui32NumTemps);
-        }
-
-        break;
-    }
-    case OPCODE_SPECIAL_DCL_IMMCONST:
-    {
-        const Operand* psDest = &psDecl->asOperands[0];
-        const Operand* psSrc = &psDecl->asOperands[1];
-
-        ASSERT(psSrc->eType == OPERAND_TYPE_IMMEDIATE32);
-        if (psDest->eType == OPERAND_TYPE_SPECIAL_IMMCONSTINT)
-        {
-            bformata(metal, "const int4 IntImmConst%d = ", psDest->ui32RegisterNumber);
-        }
-        else
-        {
-            bformata(metal, "const float4 ImmConst%d = ", psDest->ui32RegisterNumber);
-            AddToDx9ImmConstIndexableArrayMETAL(psContext, psDest);
-        }
-        TranslateOperandMETAL(psContext, psSrc, psDest->eType == OPERAND_TYPE_SPECIAL_IMMCONSTINT ? TO_FLAG_INTEGER : TO_AUTO_BITCAST_TO_FLOAT);
-        bcatcstr(metal, ";\n");
-
-        break;
-    }
-    case OPCODE_DCL_CONSTANT_BUFFER:
-    {
-        const Operand* psOperand = &psDecl->asOperands[0];
-        const uint32_t ui32BindingPoint = psOperand->aui32ArraySizes[0];
-
-        const char* StageName = "VS";
-
-        switch (psContext->psShader->eShaderType)
-        {
-        case PIXEL_SHADER:
-        {
-            StageName = "PS";
-            break;
-        }
-        case HULL_SHADER:
-        {
-            StageName = "HS";
-            break;
-        }
-        case DOMAIN_SHADER:
-        {
-            StageName = "DS";
-            break;
-        }
-        case GEOMETRY_SHADER:
-        {
-            StageName = "GS";
-            break;
-        }
-        case COMPUTE_SHADER:
-        {
-            StageName = "CS";
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-
-        ConstantBuffer* psCBuf = NULL;
-        GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, ui32BindingPoint, &psContext->psShader->sInfo, &psCBuf);
-
-        if (psCBuf)
-        {
-            // Constant buffers declared as "dynamicIndexed" are declared as raw vec4 arrays, as there is no general way to retrieve the member corresponding to a dynamic index.
-            // Simple cases can probably be handled easily, but for example when arrays (possibly nested with structs) are contained in the constant buffer and the shader reads
-            // from a dynamic index we would need to "undo" the operations done in order to compute the variable offset, and such a feature is not available at the moment.
-            psCBuf->blob = psDecl->value.eCBAccessPattern == CONSTANT_BUFFER_ACCESS_PATTERN_DYNAMICINDEXED;
-        }
-
-        // We don't have a original resource name, maybe generate one???
-        if (!psCBuf)
-        {
-            bformata(metal, "struct ConstantBuffer%d {\n\tfloat4 data[%d];\n};\n", ui32BindingPoint, psOperand->aui32ArraySizes[1], ui32BindingPoint);
-            // For vertex shaders HLSLcc generates code that expectes the
-            // constant buffer to be a pointer. For other shaders it generates
-            // code that expects a reference instead...
-            if (psContext->psShader->eShaderType == VERTEX_SHADER)
-            {
-                bformata(psContext->parameterDeclarations, "\tconstant ConstantBuffer%d* cb%d [[ buffer(%d) ]],\n", ui32BindingPoint, ui32BindingPoint, ui32BindingPoint);
-            }
-            else
-            {
-                bformata(psContext->parameterDeclarations, "\tconstant ConstantBuffer%d& cb%d [[ buffer(%d) ]],\n", ui32BindingPoint, ui32BindingPoint, ui32BindingPoint);
-            }
-            break;
-        }
-        else if (psCBuf->blob)
-        {
-            // For vertex shaders HLSLcc generates code that expectes the
-            // constant buffer to be a pointer. For other shaders it generates
-            // code that expects a reference instead...
-            bformata(metal, "struct ConstantBuffer%d {\n\tfloat4 %s[%d];\n};\n", ui32BindingPoint, psCBuf->asVars->Name, psOperand->aui32ArraySizes[1], ui32BindingPoint);
-            if (psContext->psShader->eShaderType == VERTEX_SHADER)
-            {
-                bformata(psContext->parameterDeclarations, "\tconstant ConstantBuffer%d* %s%s_data [[ buffer(%d) ]],\n", ui32BindingPoint, psCBuf->Name, StageName, ui32BindingPoint);
-            }
-            else
-            {
-                bformata(psContext->parameterDeclarations, "\tconstant ConstantBuffer%d& %s%s_data [[ buffer(%d) ]],\n", ui32BindingPoint, psCBuf->Name, StageName, ui32BindingPoint);
-            }
-            break;
-        }
-
-        DeclareStructConstantsMETAL(psContext, ui32BindingPoint, psCBuf, psOperand, metal, psAtomicList);
-
-        break;
-    }
-    case OPCODE_DCL_SAMPLER:
-    {
-        if (psDecl->bIsComparisonSampler)
-        {
-            psContext->currentShaderString = &psContext->mainShader;
-            metal = *psContext->currentShaderString;
-
-            bcatcstr(metal, "constexpr sampler ");
-            ResourceNameMETAL(metal, psContext, RGROUP_SAMPLER, psDecl->asOperands[0].ui32RegisterNumber, 1);
-            bformata(metal, "(compare_func::less);\n", psDecl->asOperands[0].ui32RegisterNumber);
-        }
-
-        /* CONFETTI NOTE (DAVID SROUR):
-         * The following declaration still needs to occur for comparison samplers.
-         * The Metal layer of the engine will still try to bind a sampler in the appropriate slot.
-         * This parameter of the shader's entrance function acts as a dummy comparison sampler for the engine.
-         * Note that 0 is always passed for the "bZCompare" argument of ResourceNameMETAL(...) as to give the dummy
-         * sampler a different name as the constexpr one.
-         */
-        {
-            psContext->currentShaderString = &psContext->parameterDeclarations;
-            metal = *psContext->currentShaderString;
-
-            bcatcstr(metal, "\tsampler ");
-            ResourceNameMETAL(metal, psContext, RGROUP_SAMPLER, psDecl->asOperands[0].ui32RegisterNumber, 0);
-            bformata(metal, "[[ sampler(%d) ]],\n", psDecl->asOperands[0].ui32RegisterNumber);
-        }
-        break;
-    }
-    case OPCODE_DCL_RESOURCE:
-    {
-        // CONFETTI BEGIN: David Srour
-        // METAL PIXEL SHADER RT FETCH
-        if (psDecl->asOperands[0].ui32RegisterNumber >= GMEM_FLOAT_START_SLOT)
-        {
-            int regNum = GetGmemInputResourceSlotMETAL(psDecl->asOperands[0].ui32RegisterNumber);
-            int numElements = GetGmemInputResourceNumElementsMETAL(psDecl->asOperands[0].ui32RegisterNumber);
-
-            switch (numElements)
-            {
-            case 1:
-                bformata(psContext->parameterDeclarations, "\tfloat");
-                break;
-            case 2:
-                bformata(psContext->parameterDeclarations, "\tfloat2");
-                break;
-            case 3:
-                bformata(psContext->parameterDeclarations, "\tfloat3");
-                break;
-            case 4:
-                bformata(psContext->parameterDeclarations, "\tfloat4");
-                break;
-            default:
-                bformata(psContext->parameterDeclarations, "\tfloat4");
-                break;
-            }
-
-            psContext->gmemOutputNumElements[regNum] = numElements;
-
-            // Function input framebuffer
-            bformata(psContext->parameterDeclarations, " GMEM_Input%d [[ color(%d) ]],\n", regNum, regNum);
-
-            break;
-        }
-        // CONFETTI END
-
-        psContext->currentShaderString = &psContext->parameterDeclarations;
-        metal = *psContext->currentShaderString;
-
-        switch (psDecl->value.eResourceDimension)
-        {
-        case RESOURCE_DIMENSION_BUFFER:
-        {
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE1D:
-        {
-            TranslateResourceTexture(psContext, psDecl, 1);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2D:
-        {
-            TranslateResourceTexture(psContext, psDecl, 1);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2DMS:
-        {
-            TranslateResourceTexture(psContext, psDecl, 0);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE3D:
-        {
-            TranslateResourceTexture(psContext, psDecl, 0);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURECUBE:
-        {
-            TranslateResourceTexture(psContext, psDecl, 1);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-        {
-            TranslateResourceTexture(psContext, psDecl, 1);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-        {
-            TranslateResourceTexture(psContext, psDecl, 1);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-        {
-            TranslateResourceTexture(psContext, psDecl, 1);
-            break;
-        }
-        case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-        {
-            TranslateResourceTexture(psContext, psDecl, 1);
-            break;
-        }
-        }
-
-        bformata(metal, "[[ texture(%d) ]],\n", psDecl->asOperands[0].ui32RegisterNumber);
-        psContext->currentShaderString = &psContext->mainShader;
-        metal = *psContext->currentShaderString;
-
-        ASSERT(psDecl->asOperands[0].ui32RegisterNumber < MAX_TEXTURES);
-        psShader->aeResourceDims[psDecl->asOperands[0].ui32RegisterNumber] = psDecl->value.eResourceDimension;
-        break;
-    }
-    case OPCODE_DCL_OUTPUT:
-    {
-        AddUserOutputMETAL(psContext, psDecl);
-        break;
-    }
-    case OPCODE_DCL_GLOBAL_FLAGS:
-    {
-        uint32_t ui32Flags = psDecl->value.ui32GlobalFlags;
-
-        if (ui32Flags & GLOBAL_FLAG_FORCE_EARLY_DEPTH_STENCIL)
-        {
-            psContext->needsFragmentTestHint = 1;
-        }
-        if (!(ui32Flags & GLOBAL_FLAG_REFACTORING_ALLOWED))
-        {
-            //TODO add precise
-            //HLSL precise - http://msdn.microsoft.com/en-us/library/windows/desktop/hh447204(v=vs.85).aspx
-        }
-        if (ui32Flags & GLOBAL_FLAG_ENABLE_DOUBLE_PRECISION_FLOAT_OPS)
-        {
-            // TODO
-            // Is there something for this in METAL?
-        }
-
-        break;
-    }
-
-    case OPCODE_DCL_THREAD_GROUP:
-    {
-        /* CONFETTI NOTE:
-        The thread group information need to be passed to engine side. Add the information
-        into reflection data.
-        */
-        psContext->psShader->sInfo.ui32Thread_x = psDecl->value.aui32WorkGroupSize[0];
-        psContext->psShader->sInfo.ui32Thread_y = psDecl->value.aui32WorkGroupSize[1];
-        psContext->psShader->sInfo.ui32Thread_z = psDecl->value.aui32WorkGroupSize[2];
-        break;
-    }
-    case OPCODE_DCL_TESS_OUTPUT_PRIMITIVE:
-    {
-        break;
-    }
-    case OPCODE_DCL_TESS_DOMAIN:
-    {
-        break;
-    }
-    case OPCODE_DCL_TESS_PARTITIONING:
-    {
-        break;
-    }
-    case OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
-    {
-        break;
-    }
-    case OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
-    {
-        break;
-    }
-    case OPCODE_DCL_GS_INPUT_PRIMITIVE:
-    {
-        break;
-    }
-    case OPCODE_DCL_INTERFACE:
-    {
-        break;
-    }
-    case OPCODE_DCL_FUNCTION_BODY:
-    {
-        //bformata(metal, "void Func%d();//%d\n", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].eType);
-        break;
-    }
-    case OPCODE_DCL_FUNCTION_TABLE:
-    {
-        break;
-    }
-    case OPCODE_CUSTOMDATA:
-    {
-        const uint32_t ui32NumVec4 = psDecl->ui32NumOperands;
-        const uint32_t ui32NumVec4Minus1 = (ui32NumVec4 - 1);
-        uint32_t ui32ConstIndex = 0;
-        float x, y, z, w;
-
-        //If ShaderBitEncodingSupported then 1 integer buffer, use intBitsToFloat to get float values. - More instructions.
-        //else 2 buffers - one integer and one float. - More data
-
-        if (ShaderBitEncodingSupported(psShader->eTargetLanguage) == 0)
-        {
-            bcatcstr(metal, "#define immediateConstBufferI(idx) immediateConstBufferInt[idx]\n");
-            bcatcstr(metal, "#define immediateConstBufferF(idx) immediateConstBuffer[idx]\n");
-
-            bformata(metal, "static constant float4 immediateConstBuffer[%d] = {\n", ui32NumVec4, ui32NumVec4);
-            for (; ui32ConstIndex < ui32NumVec4Minus1; ui32ConstIndex++)
-            {
-                float loopLocalX, loopLocalY, loopLocalZ, loopLocalW;
-                loopLocalX = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-                loopLocalY = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-                loopLocalZ = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-                loopLocalW = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-
-                //A single vec4 can mix integer and float types.
-                //Forced NAN and INF to zero inside the immediate constant buffer. This will allow the shader to compile.
-                if (fpcheck(loopLocalX))
-                {
-                    loopLocalX = 0;
-                }
-                if (fpcheck(loopLocalY))
-                {
-                    loopLocalY = 0;
-                }
-                if (fpcheck(loopLocalZ))
-                {
-                    loopLocalZ = 0;
-                }
-                if (fpcheck(loopLocalW))
-                {
-                    loopLocalW = 0;
-                }
-
-                bformata(metal, "\tfloat4(%f, %f, %f, %f), \n", loopLocalX, loopLocalY, loopLocalZ, loopLocalW);
-            }
-            //No trailing comma on this one
-            x = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].a;
-            y = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].b;
-            z = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].c;
-            w = *(float*)&psDecl->asImmediateConstBuffer[ui32ConstIndex].d;
-            if (fpcheck(x))
-            {
-                x = 0;
-            }
-            if (fpcheck(y))
-            {
-                y = 0;
-            }
-            if (fpcheck(z))
-            {
-                z = 0;
-            }
-            if (fpcheck(w))
-            {
-                w = 0;
-            }
-            bformata(metal, "\tfloat4(%f, %f, %f, %f)\n", x, y, z, w);
-            bcatcstr(metal, "};\n");
-        }
-        else
-        {
-            bcatcstr(metal, "#define immediateConstBufferI(idx) immediateConstBufferInt[idx]\n");
-            bcatcstr(metal, "#define immediateConstBufferF(idx) as_type<float4>(immediateConstBufferInt[idx])\n");
-        }
-
-        {
-            uint32_t ui32ConstIndex2 = 0;
-            int x2, y2, z2, w2;
-
-            bformata(metal, "static constant int4 immediateConstBufferInt[%d] = {\n", ui32NumVec4, ui32NumVec4);
-            for (; ui32ConstIndex2 < ui32NumVec4Minus1; ui32ConstIndex2++)
-            {
-                int loopLocalX, loopLocalY, loopLocalZ, loopLocalW;
-                loopLocalX = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].a;
-                loopLocalY = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].b;
-                loopLocalZ = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].c;
-                loopLocalW = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].d;
-
-                bformata(metal, "\tint4(%d, %d, %d, %d), \n", loopLocalX, loopLocalY, loopLocalZ, loopLocalW);
-            }
-            //No trailing comma on this one
-            x2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].a;
-            y2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].b;
-            z2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].c;
-            w2 = *(int*)&psDecl->asImmediateConstBuffer[ui32ConstIndex2].d;
-
-            bformata(metal, "\tint4(%d, %d, %d, %d)\n", x2, y2, z2, w2);
-            bcatcstr(metal, "};\n");
-        }
-
-        break;
-    }
-    case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-    {
-        break;
-    }
-    case OPCODE_DCL_INDEXABLE_TEMP:
-    {
-        const uint32_t ui32RegIndex = psDecl->sIdxTemp.ui32RegIndex;
-        const uint32_t ui32RegCount = psDecl->sIdxTemp.ui32RegCount;
-        const uint32_t ui32RegComponentSize = psDecl->sIdxTemp.ui32RegComponentSize;
-        bformata(psContext->earlyMain, "float%d TempArray%d[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-        bformata(psContext->earlyMain, "int%d TempArray%d_int[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-        if (HaveUVec(psShader->eTargetLanguage))
-        {
-            bformata(psContext->earlyMain, "uint%d TempArray%d_uint[%d];\n", ui32RegComponentSize, ui32RegIndex, ui32RegCount);
-        }
-        break;
-    }
-    case OPCODE_DCL_INDEX_RANGE:
-    {
-        break;
-    }
-    case OPCODE_HS_DECLS:
-    {
-        break;
-    }
-    case OPCODE_DCL_INPUT_CONTROL_POINT_COUNT:
-    {
-        break;
-    }
-    case OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT:
-    {
-        break;
-    }
-    case OPCODE_HS_FORK_PHASE:
-    {
-        break;
-    }
-    case OPCODE_HS_JOIN_PHASE:
-    {
-        break;
-    }
-    case OPCODE_DCL_HS_MAX_TESSFACTOR:
-    {
-        //For metal the max tessellation factor is fixed to the value of gl_MaxTessGenLevel.
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-    {
-        psContext->currentShaderString = &psContext->parameterDeclarations;
-        metal = *psContext->currentShaderString;
-
-        if (psDecl->value.eResourceDimension == RESOURCE_DIMENSION_BUFFER)
-        {
-            {
-                //give write access
-                bcatcstr(metal, "\tdevice ");
-            }
-            switch (psDecl->sUAV.Type)
-            {
-            case RETURN_TYPE_FLOAT:
-                bcatcstr(metal, "float ");
-                break;
-            case RETURN_TYPE_UNORM:
-                bcatcstr(metal, "TODO: OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED->RETURN_TYPE_UNORM ");
-                break;
-            case RETURN_TYPE_SNORM:
-                bcatcstr(metal, "TODO: OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED->RETURN_TYPE_SNORM ");
-                break;
-            case RETURN_TYPE_UINT:
-                bcatcstr(metal, "uint ");
-                break;
-            case RETURN_TYPE_SINT:
-                bcatcstr(metal, "int ");
-                break;
-            default:
-                ASSERT(0);
-            }
-            bstring StructName;
-            StructName = bfromcstr("");
-            ResourceNameMETAL(StructName, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-            bformata(metal, " * ");
-            TranslateOperandMETAL(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-            bformata(metal, " [[buffer(%d)]], \n", psDecl->asOperands[0].ui32RegisterNumber + UAV_BUFFER_START_SLOT);
-            int count = 0;
-            for (uint32_t index = 0; index < psContext->psShader->sInfo.ui32NumResourceBindings; index++)
-            {
-                if (strcmp(psContext->psShader->sInfo.psResourceBindings[index].Name, (const char*)StructName->data) == 0)
-                {
-                    count++;
-                    //psContext->psShader->sInfo.psResourceBindings[index].ui32BindPoint += UAV_BUFFER_START_SLOT;
-                    psContext->psShader->sInfo.psResourceBindings[index].eBindArea = UAVAREA_CBUFFER;
-                }
-            }
-            //If count >2, the logic here is wrong and need to be modified.
-            ASSERT(count < 2);
-        }
-        else
-        {
-            switch (psDecl->value.eResourceDimension)
-            {
-            case RESOURCE_DIMENSION_TEXTURE1D:
-            {
-                bformata(metal, "\ttexture1d<");
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2D:
-            {
-                bformata(metal, "\ttexture2d<");
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2DMS:
-            {
-                //metal does not support this
-                ASSERT(0);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE3D:
-            {
-                bformata(metal, "\ttexture3d<");
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURECUBE:
-            {
-                bformata(metal, "\ttexturecube<");
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-            {
-                bformata(metal, "\ttexture1d_array<");
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-            {
-                bformata(metal, "\ttexture2d_array<");
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-            {
-                //metal does not suuport this.
-                ASSERT(0);
-                break;
-            }
-            case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-            {
-                bformata(metal, "\ttexturecube_array<");
-                break;
-            }
-            }
-            switch (psDecl->sUAV.Type)
-            {
-            case RETURN_TYPE_FLOAT:
-                bcatcstr(metal, "float ");
-                break;
-            case RETURN_TYPE_UNORM:
-                bcatcstr(metal, "TODO: OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED->RETURN_TYPE_UNORM ");
-                break;
-            case RETURN_TYPE_SNORM:
-                bcatcstr(metal, "TODO: OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED->RETURN_TYPE_SNORM ");
-                break;
-            case RETURN_TYPE_UINT:
-                bcatcstr(metal, "uint ");
-                break;
-            case RETURN_TYPE_SINT:
-                bcatcstr(metal, "int ");
-                break;
-            default:
-                ASSERT(0);
-            }
-            if (psShader->aiOpcodeUsed[OPCODE_STORE_UAV_TYPED] == 0)
-            {
-                bcatcstr(metal, "> ");
-            }
-            else
-            {
-                //give write access
-                bcatcstr(metal, ", access::write> ");
-            }
-            bstring StructName;
-            StructName = bfromcstr("");
-            ResourceNameMETAL(StructName, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-            TranslateOperandMETAL(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-            bformata(metal, " [[texture(%d)]], \n", psDecl->asOperands[0].ui32RegisterNumber + UAV_BUFFER_START_SLOT);
-            int count = 0;
-            for (uint32_t index = 0; index < psContext->psShader->sInfo.ui32NumResourceBindings; index++)
-            {
-                if (strcmp(psContext->psShader->sInfo.psResourceBindings[index].Name, (const char*)StructName->data) == 0)
-                {
-                    count++;
-                    //psContext->psShader->sInfo.psResourceBindings[index].ui32BindPoint += UAV_BUFFER_START_SLOT;
-                    psContext->psShader->sInfo.psResourceBindings[index].eBindArea = UAVAREA_TEXTURE;
-                }
-            }
-            //If count >2, the logic here is wrong and need to be modified.
-            ASSERT(count < 2);
-            //TranslateOperand(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-        }
-        psContext->currentShaderString = &psContext->mainShader;
-        metal = *psContext->currentShaderString;
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-    {
-        const uint32_t ui32BindingPoint = psDecl->asOperands[0].aui32ArraySizes[0];
-        ConstantBuffer* psCBuf = NULL;
-
-        if (psDecl->sUAV.bCounter)
-        {
-            bformata(metal, "atomic_uint ");
-            ResourceNameMETAL(metal, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-            bformata(metal, "_counter; \n");
-        }
-
-        GetConstantBufferFromBindingPoint(RGROUP_UAV, ui32BindingPoint, &psContext->psShader->sInfo, &psCBuf);
-
-        DeclareBufferVariableMETAL(psContext, ui32BindingPoint, psCBuf, &psDecl->asOperands[0], RTYPE_UAV_RWSTRUCTURED, metal, psAtomicList);
-        break;
-    }
-    case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-    {
-        if (psDecl->sUAV.bCounter)
-        {
-            bformata(metal, "atomic_uint ");
-            ResourceNameMETAL(metal, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-            bformata(metal, "_counter; \n");
-        }
-
-        bformata(metal, "buffer Block%d {\n\tuint ", psDecl->asOperands[0].ui32RegisterNumber);
-        ResourceNameMETAL(metal, psContext, RGROUP_UAV, psDecl->asOperands[0].ui32RegisterNumber, 0);
-        bcatcstr(metal, "[];\n};\n");
-
-        break;
-    }
-    case OPCODE_DCL_RESOURCE_STRUCTURED:
-    {
-        ConstantBuffer* psCBuf = NULL;
-
-        GetConstantBufferFromBindingPoint(RGROUP_TEXTURE, psDecl->asOperands[0].ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-
-        DeclareBufferVariableMETAL(psContext, psDecl->asOperands[0].ui32RegisterNumber, psCBuf, &psDecl->asOperands[0],
-            RTYPE_STRUCTURED, psContext->mainShader, psAtomicList);
-        break;
-    }
-    case OPCODE_DCL_RESOURCE_RAW:
-    {
-        bformata(metal, "buffer Block%d {\n\tuint RawRes%d[];\n};\n", psDecl->asOperands[0].ui32RegisterNumber, psDecl->asOperands[0].ui32RegisterNumber);
-        break;
-    }
-    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED:
-    {
-        psContext->currentShaderString = &psContext->earlyMain;
-        metal = *psContext->currentShaderString;
-
-        ShaderVarType* psVarType = &psShader->sGroupSharedVarType[psDecl->asOperands[0].ui32RegisterNumber];
-
-        ASSERT(psDecl->asOperands[0].ui32RegisterNumber < MAX_GROUPSHARED);
-
-        bcatcstr(metal, "\tthreadgroup struct {\n");
-        bformata(metal, "\t\tuint value[%d];\n", psDecl->sTGSM.ui32Stride / 4);
-        bcatcstr(metal, "\t} ");
-        TranslateOperandMETAL(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-        bformata(metal, "[%d];\n",
-            psDecl->sTGSM.ui32Count);
-
-        memset(psVarType, 0, sizeof(ShaderVarType));
-        strcpy(psVarType->Name, "$Element");
-
-        psVarType->Columns = psDecl->sTGSM.ui32Stride / 4;
-        psVarType->Elements = psDecl->sTGSM.ui32Count;
-
-        psContext->currentShaderString = &psContext->mainShader;
-        metal = *psContext->currentShaderString;
-        break;
-    }
-    case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW:
-    {
-#ifdef _DEBUG
-        //AddIndentation(psContext);
-        //bcatcstr(metal, "//TODO: OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW\n");
-#endif
-        psContext->currentShaderString = &psContext->earlyMain;
-        metal = *psContext->currentShaderString;
-        bcatcstr(metal, "\tthreadgroup ");
-        bformata(metal, "atomic_uint ");
-        //psDecl->asOperands
-        TranslateOperandMETAL(psContext, &psDecl->asOperands[0], TO_FLAG_NONE);
-        bformata(metal, "[%d]; \n", psDecl->sTGSM.ui32Stride / 4);
-
-        psContext->currentShaderString = &psContext->mainShader;
-        metal = *psContext->currentShaderString;
-        break;
-    }
-    case OPCODE_DCL_STREAM:
-    {
-        break;
-    }
-    case OPCODE_DCL_GS_INSTANCE_COUNT:
-    {
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALInstruction.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALInstruction.c
deleted file mode 100644
index 547f293733..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALInstruction.c
+++ /dev/null
@@ -1,4946 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/toMETALInstruction.h"
-#include "internal_includes/toMETALOperand.h"
-#include "internal_includes/languages.h"
-#include "bstrlib.h"
-#include "stdio.h"
-#include <stdlib.h>
-#include "hlslcc.h"
-#include <internal_includes/toGLSLOperand.h>
-#include "internal_includes/debug.h"
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-static int METALIsIntegerImmediateOpcode(OPCODE_TYPE eOpcode);
-
-// Calculate the bits set in mask
-static int METALWriteMaskToComponentCount(uint32_t writeMask)
-{
-    uint32_t count;
-    // In HLSL bytecode writemask 0 also means everything
-    if (writeMask == 0)
-    {
-        return 4;
-    }
-
-    // Count bits set
-    // https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSet64
-    count = (writeMask * 0x200040008001ULL & 0x111111111111111ULL) % 0xf;
-
-    return (int)count;
-}
-
-static uint32_t METALBuildComponentMaskFromElementCount(int count)
-{
-    // Translate numComponents into bitmask
-    // 1 -> 1, 2 -> 3, 3 -> 7 and 4 -> 15
-    return (1 << count) - 1;
-}
-
-
-// This function prints out the destination name, possible destination writemask, assignment operator
-// and any possible conversions needed based on the eSrcType+ui32SrcElementCount (type and size of data expected to be coming in)
-// As an output, pNeedsParenthesis will be filled with the amount of closing parenthesis needed
-// and pSrcCount will be filled with the number of components expected
-// ui32CompMask can be used to only write to 1 or more components (used by MOVC)
-static void METALAddOpAssignToDestWithMask(HLSLCrossCompilerContext* psContext, const Operand* psDest,
-    SHADER_VARIABLE_TYPE eSrcType, uint32_t ui32SrcElementCount, const char* szAssignmentOp, int* pNeedsParenthesis, uint32_t ui32CompMask)
-{
-    uint32_t ui32DestElementCount = GetNumSwizzleElementsWithMaskMETAL(psDest, ui32CompMask);
-    bstring metal = *psContext->currentShaderString;
-    SHADER_VARIABLE_TYPE eDestDataType = GetOperandDataTypeMETAL(psContext, psDest);
-    ASSERT(pNeedsParenthesis != NULL);
-
-    *pNeedsParenthesis = 0;
-
-    uint32_t flags = TO_FLAG_DESTINATION;
-    // Default is full floats. Handle half floats if the source is half precision
-    if (eSrcType == SVT_FLOAT16)
-    {
-        flags |= TO_FLAG_FLOAT16;
-    }
-    TranslateOperandWithMaskMETAL(psContext, psDest, flags, ui32CompMask);
-    
-    //GMEM data output types can only be full floats.
-    if(eDestDataType== SVT_FLOAT16 && psDest->eType== OPERAND_TYPE_OUTPUT && psContext->gmemOutputNumElements[0]>0 )
-    {
-        eDestDataType = SVT_FLOAT;
-    }
-    
-    // Simple path: types match.
-    if (eDestDataType == eSrcType)
-    {
-        // Cover cases where the HLSL language expects the rest of the components to be default-filled
-        // eg. MOV r0, c0.x => Temp[0] = vec4(c0.x);
-        if (ui32DestElementCount > ui32SrcElementCount)
-        {
-            bformata(metal, " %s %s(", szAssignmentOp, GetConstructorForTypeMETAL(eDestDataType, ui32DestElementCount));
-            *pNeedsParenthesis = 1;
-        }
-        else
-        {
-            bformata(metal, " %s ", szAssignmentOp);
-        }
-        return;
-    }
-
-    switch (eDestDataType)
-    {
-    case SVT_INT:
-    {
-        if (1 == ui32DestElementCount)
-        {
-            bformata(metal, " %s as_type<int>(", szAssignmentOp);
-        }
-        else
-        {
-            bformata(metal, "%s as_type<int%d>(", szAssignmentOp, ui32DestElementCount);
-        }
-        break;
-    }
-    case SVT_UINT:
-    {
-        if (1 == ui32DestElementCount)
-        {
-            bformata(metal, " %s as_type<uint>(", szAssignmentOp);
-        }
-        else
-        {
-            bformata(metal, "%s as_type<uint%d>(", szAssignmentOp, ui32DestElementCount);
-        }
-        break;
-    }
-    case SVT_FLOAT:
-    {
-        const char* castType = eSrcType == SVT_FLOAT16 ? "static_cast" : "as_type";
-        if (1 == ui32DestElementCount)
-        {
-            bformata(metal, " %s %s<float>(", szAssignmentOp, castType);
-        }
-        else
-        {
-            bformata(metal, "%s %s<float%d>(", szAssignmentOp, castType, ui32DestElementCount);
-        }
-        break;
-    }
-    case SVT_FLOAT16:
-    {
-        if (1 == ui32DestElementCount)
-        {
-            bformata(metal, " %s static_cast<half>(", szAssignmentOp);
-        }
-        else
-        {
-            bformata(metal, "%s static_cast<half%d>(", szAssignmentOp, ui32DestElementCount);
-        }
-        break;
-    }
-    default:
-        // TODO: Handle bools?
-        break;
-    }
-    
-    switch (eDestDataType)
-    {
-        case SVT_INT:
-        case SVT_UINT:
-        case SVT_FLOAT:
-        case SVT_FLOAT16:
-        {
-            // Cover cases where the HLSL language expects the rest of the components to be default-filled
-            if (ui32DestElementCount > ui32SrcElementCount)
-            {
-                bformata(metal, "%s(", GetConstructorForTypeMETAL(eSrcType, ui32DestElementCount));
-                (*pNeedsParenthesis)++;
-            }
-        }
-    }
-    (*pNeedsParenthesis)++;
-    return;
-}
-
-static void METALAddAssignToDest(HLSLCrossCompilerContext* psContext, const Operand* psDest,
-    SHADER_VARIABLE_TYPE eSrcType, uint32_t ui32SrcElementCount, int* pNeedsParenthesis)
-{
-    METALAddOpAssignToDestWithMask(psContext, psDest, eSrcType, ui32SrcElementCount, "=", pNeedsParenthesis, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-static void METALAddAssignPrologue(HLSLCrossCompilerContext* psContext, int numParenthesis)
-{
-    bstring glsl = *psContext->currentShaderString;
-    while (numParenthesis != 0)
-    {
-        bcatcstr(glsl, ")");
-        numParenthesis--;
-    }
-    bcatcstr(glsl, ";\n");
-}
-static uint32_t METALResourceReturnTypeToFlag(const RESOURCE_RETURN_TYPE eType)
-{
-    if (eType == RETURN_TYPE_SINT)
-    {
-        return TO_FLAG_INTEGER;
-    }
-    else if (eType == RETURN_TYPE_UINT)
-    {
-        return TO_FLAG_UNSIGNED_INTEGER;
-    }
-    else
-    {
-        return TO_FLAG_NONE;
-    }
-}
-
-
-typedef enum
-{
-    METAL_CMP_EQ,
-    METAL_CMP_LT,
-    METAL_CMP_GE,
-    METAL_CMP_NE,
-} METALComparisonType;
-
-static void METALAddComparision(HLSLCrossCompilerContext* psContext, Instruction* psInst, METALComparisonType eType,
-    uint32_t typeFlag, Instruction* psNextInst)
-{
-    (void)psNextInst;
-
-    // Multiple cases to consider here:
-    // For shader model <=3: all comparisons are floats
-    // otherwise:
-    // OPCODE_LT, _GT, _NE etc: inputs are floats, outputs UINT 0xffffffff or 0. typeflag: TO_FLAG_NONE
-    // OPCODE_ILT, _IGT etc: comparisons are signed ints, outputs UINT 0xffffffff or 0 typeflag TO_FLAG_INTEGER
-    // _ULT, UGT etc: inputs unsigned ints, outputs UINTs typeflag TO_FLAG_UNSIGNED_INTEGER
-    //
-    // Additional complexity: if dest swizzle element count is 1, we can use normal comparison operators, otherwise glsl intrinsics.
-
-    uint32_t orig_type = typeFlag;
-
-    bstring metal = *psContext->currentShaderString;
-    const uint32_t destElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-    const uint32_t s0ElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[1]);
-    const uint32_t s1ElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[2]);
-
-    uint32_t minElemCount = destElemCount < s0ElemCount ? destElemCount : s0ElemCount;
-
-    int needsParenthesis = 0;
-
-    ASSERT(s0ElemCount == s1ElemCount || s1ElemCount == 1 || s0ElemCount == 1);
-    if (s0ElemCount != s1ElemCount)
-    {
-        // Set the proper auto-expand flag is either argument is scalar
-        typeFlag |= (TO_AUTO_EXPAND_TO_VEC2 << (max(s0ElemCount, s1ElemCount) - 2));
-    }
-
-    const char* metalOpcode[] = {
-        "==",
-        "<",
-        ">=",
-        "!=",
-    };
-
-    //Scalar compare
-
-    // Optimization shortcut for the IGE+BREAKC_NZ combo:
-    // First print out the if(cond)->break directly, and then
-    // to guarantee correctness with side-effects, re-run
-    // the actual comparison. In most cases, the second run will
-    // be removed by the shader compiler optimizer pass (dead code elimination)
-    // This also makes it easier for some GLSL optimizers to recognize the for loop.
-
-    //if (psInst->eOpcode == OPCODE_IGE &&
-    //  psNextInst &&
-    //  psNextInst->eOpcode == OPCODE_BREAKC &&
-    //  (psInst->asOperands[0].ui32RegisterNumber == psNextInst->asOperands[0].ui32RegisterNumber))
-    //{
-
-    //  AddIndentation(psContext);
-    //  bcatcstr(glsl, "// IGE+BREAKC opt\n");
-    //  AddIndentation(psContext);
-
-    //  if (psNextInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO)
-    //      bcatcstr(glsl, "if ((");
-    //  else
-    //      bcatcstr(glsl, "if (!(");
-    //  TranslateOperand(psContext, &psInst->asOperands[1], typeFlag);
-    //  bformata(glsl, "%s ", glslOpcode[eType]);
-    //  TranslateOperand(psContext, &psInst->asOperands[2], typeFlag);
-    //  bcatcstr(glsl, ")) { break; }\n");
-
-    //  // Mark the BREAKC instruction as already handled
-    //  psNextInst->eOpcode = OPCODE_NOP;
-
-    //  // Continue as usual
-    //}
-
-    AddIndentation(psContext);
-    METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_INT, destElemCount, &needsParenthesis);
-
-    bcatcstr(metal, "select(");
-
-    /* Confetti note:
-       ASM returns 0XFFFFFFFF or 0
-       It's important to use int.
-       A sign intrinsic converts to the following:
-       lt r0.x, l(0.000000), v0.z
-       lt r0.y, v0.z, l(0.000000)
-       iadd r0.x, -r0.x, r0.y
-       itof o0.xyzw, r0.xxxx
-     */
-
-    if (destElemCount == 1)
-    {
-        bcatcstr(metal, "0, (int)0xFFFFFFFF, (");
-    }
-    else
-    {
-        bformata(metal, "int%d(0), int%d(0xFFFFFFFF), (", destElemCount, destElemCount);
-    }
-
-    TranslateOperandMETAL(psContext, &psInst->asOperands[1], typeFlag);
-    bcatcstr(metal, ")");
-    if (destElemCount > 1)
-    {
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-    }
-    else if (s0ElemCount > minElemCount)
-    {
-        AddSwizzleUsingElementCountMETAL(psContext, minElemCount);
-    }
-    bformata(metal, " %s (", metalOpcode[eType]);
-    TranslateOperandMETAL(psContext, &psInst->asOperands[2], typeFlag);
-    bcatcstr(metal, ")");
-    if (destElemCount > 1)
-    {
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-    }
-    else if (s1ElemCount > minElemCount || orig_type != typeFlag)
-    {
-        AddSwizzleUsingElementCountMETAL(psContext, minElemCount);
-    }
-    bcatcstr(metal, ")");
-    METALAddAssignPrologue(psContext, needsParenthesis);
-}
-
-
-static void METALAddMOVBinaryOp(HLSLCrossCompilerContext* psContext, const Operand* pDest, Operand* pSrc)
-{
-    int numParenthesis = 0;
-    int srcSwizzleCount = GetNumSwizzleElementsMETAL(pSrc);
-    uint32_t writeMask = GetOperandWriteMaskMETAL(pDest);
-
-    const SHADER_VARIABLE_TYPE eSrcType = GetOperandDataTypeExMETAL(psContext, pSrc, GetOperandDataTypeMETAL(psContext, pDest));
-    uint32_t flags = SVTTypeToFlagMETAL(eSrcType);
-
-    METALAddAssignToDest(psContext, pDest, eSrcType, srcSwizzleCount, &numParenthesis);
-    TranslateOperandWithMaskMETAL(psContext, pSrc, flags, writeMask);
-
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-static uint32_t METALElemCountToAutoExpandFlag(uint32_t elemCount)
-{
-    return TO_AUTO_EXPAND_TO_VEC2 << (elemCount - 2);
-}
-
-static void METALAddMOVCBinaryOp(HLSLCrossCompilerContext* psContext, const Operand* pDest, const Operand* src0, Operand* src1, Operand* src2)
-{
-    bstring metal = *psContext->currentShaderString;
-    uint32_t destElemCount = GetNumSwizzleElementsMETAL(pDest);
-    uint32_t s0ElemCount = GetNumSwizzleElementsMETAL(src0);
-    uint32_t s1ElemCount = GetNumSwizzleElementsMETAL(src1);
-    uint32_t s2ElemCount = GetNumSwizzleElementsMETAL(src2);
-    uint32_t destWriteMask = GetOperandWriteMaskMETAL(pDest);
-    uint32_t destElem;
-
-    const SHADER_VARIABLE_TYPE eDestType = GetOperandDataTypeMETAL(psContext, pDest);
-    /*
-    for each component in dest[.mask]
-    if the corresponding component in src0 (POS-swizzle)
-    has any bit set
-    {
-    copy this component (POS-swizzle) from src1 into dest
-    }
-    else
-    {
-    copy this component (POS-swizzle) from src2 into dest
-    }
-    endfor
-    */
-
-    /* Single-component conditional variable (src0) */
-    if (s0ElemCount == 1 || IsSwizzleReplicatedMETAL(src0))
-    {
-        int numParenthesis = 0;
-        AddIndentation(psContext);
-
-        bcatcstr(metal, "if (");
-        TranslateOperandMETAL(psContext, src0, TO_AUTO_BITCAST_TO_INT);
-        if (s0ElemCount > 1)
-        {
-            bcatcstr(metal, ".x");
-        }
-
-        bcatcstr(metal, " != 0)\n");
-        AddIndentation(psContext);
-        AddIndentation(psContext);
-
-        METALAddAssignToDest(psContext, pDest, eDestType, destElemCount, &numParenthesis);
-
-        if (s1ElemCount == 1 && destElemCount > 1)
-        {
-            TranslateOperandMETAL(psContext, src1, SVTTypeToFlagMETAL(eDestType) | METALElemCountToAutoExpandFlag(destElemCount));
-        }
-        else
-        {
-            TranslateOperandWithMaskMETAL(psContext, src1, SVTTypeToFlagMETAL(eDestType), destWriteMask);
-        }
-
-        bcatcstr(metal, ";\n");
-        AddIndentation(psContext);
-        bcatcstr(metal, "else\n");
-        AddIndentation(psContext);
-        AddIndentation(psContext);
-
-        METALAddAssignToDest(psContext, pDest, eDestType, destElemCount, &numParenthesis);
-
-        if (s2ElemCount == 1 && destElemCount > 1)
-        {
-            TranslateOperandMETAL(psContext, src2, SVTTypeToFlagMETAL(eDestType) | METALElemCountToAutoExpandFlag(destElemCount));
-        }
-        else
-        {
-            TranslateOperandWithMaskMETAL(psContext, src2, SVTTypeToFlagMETAL(eDestType), destWriteMask);
-        }
-
-        METALAddAssignPrologue(psContext, numParenthesis);
-    }
-    else
-    {
-        // TODO: We can actually do this in one op using mix().
-        int srcElem = 0;
-        for (destElem = 0; destElem < 4; ++destElem)
-        {
-            int numParenthesis = 0;
-            if (pDest->eSelMode == OPERAND_4_COMPONENT_MASK_MODE && pDest->ui32CompMask != 0 && !(pDest->ui32CompMask & (1 << destElem)))
-            {
-                continue;
-            }
-
-            AddIndentation(psContext);
-
-            bcatcstr(metal, "if (");
-            TranslateOperandWithMaskMETAL(psContext, src0, TO_AUTO_BITCAST_TO_INT, 1 << destElem);
-            bcatcstr(metal, " != 0)\n");
-
-            AddIndentation(psContext);
-            AddIndentation(psContext);
-
-            METALAddOpAssignToDestWithMask(psContext, pDest, eDestType, 1, "=", &numParenthesis, 1 << destElem);
-
-            TranslateOperandWithMaskMETAL(psContext, src1, SVTTypeToFlagMETAL(eDestType), 1 << destElem);
-
-            bcatcstr(metal, ";\n");
-            AddIndentation(psContext);
-            bcatcstr(metal, "else\n");
-            AddIndentation(psContext);
-            AddIndentation(psContext);
-
-            METALAddOpAssignToDestWithMask(psContext, pDest, eDestType, 1, "=", &numParenthesis, 1 << destElem);
-            TranslateOperandWithMaskMETAL(psContext, src2, SVTTypeToFlagMETAL(eDestType), 1 << destElem);
-
-            METALAddAssignPrologue(psContext, numParenthesis);
-
-            srcElem++;
-        }
-    }
-}
-
-// Returns nonzero if operands are identical, only cares about temp registers currently.
-static int METALAreTempOperandsIdentical(const Operand* psA, const Operand* psB)
-{
-    if (!psA || !psB)
-    {
-        return 0;
-    }
-
-    if (psA->eType != OPERAND_TYPE_TEMP || psB->eType != OPERAND_TYPE_TEMP)
-    {
-        return 0;
-    }
-
-    if (psA->eModifier != psB->eModifier)
-    {
-        return 0;
-    }
-
-    if (psA->iNumComponents != psB->iNumComponents)
-    {
-        return 0;
-    }
-
-    if (psA->ui32RegisterNumber != psB->ui32RegisterNumber)
-    {
-        return 0;
-    }
-
-    if (psA->eSelMode != psB->eSelMode)
-    {
-        return 0;
-    }
-
-    if (psA->eSelMode == OPERAND_4_COMPONENT_MASK_MODE && psA->ui32CompMask != psB->ui32CompMask)
-    {
-        return 0;
-    }
-
-    if (psA->eSelMode != OPERAND_4_COMPONENT_MASK_MODE && psA->ui32Swizzle != psB->ui32Swizzle)
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-// Returns nonzero if the operation is commutative
-static int METALIsOperationCommutative(OPCODE_TYPE eOpCode)
-{
-    switch (eOpCode)
-    {
-    case OPCODE_DADD:
-    case OPCODE_IADD:
-    case OPCODE_ADD:
-    case OPCODE_MUL:
-    case OPCODE_IMUL:
-    case OPCODE_OR:
-    case OPCODE_AND:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-static void METALCallBinaryOp(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1, SHADER_VARIABLE_TYPE eDataType)
-{
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t src1SwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[src1]);
-    uint32_t src0SwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[src0]);
-    uint32_t dstSwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[dest]);
-    uint32_t destMask = GetOperandWriteMaskMETAL(&psInst->asOperands[dest]);
-    int needsParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    if (src1SwizCount == src0SwizCount == dstSwizCount)
-    {
-        // Optimization for readability (and to make for loops in WebGL happy): detect cases where either src == dest and emit +=, -= etc. instead.
-        if (METALAreTempOperandsIdentical(&psInst->asOperands[dest], &psInst->asOperands[src0]) != 0)
-        {
-            METALAddOpAssignToDestWithMask(psContext, &psInst->asOperands[dest], eDataType, dstSwizCount, name, &needsParenthesis, OPERAND_4_COMPONENT_MASK_ALL);
-            TranslateOperandMETAL(psContext, &psInst->asOperands[src1], SVTTypeToFlagMETAL(eDataType));
-            METALAddAssignPrologue(psContext, needsParenthesis);
-            return;
-        }
-        else if (METALAreTempOperandsIdentical(&psInst->asOperands[dest], &psInst->asOperands[src1]) != 0 && (METALIsOperationCommutative(psInst->eOpcode) != 0))
-        {
-            METALAddOpAssignToDestWithMask(psContext, &psInst->asOperands[dest], eDataType, dstSwizCount, name, &needsParenthesis, OPERAND_4_COMPONENT_MASK_ALL);
-            TranslateOperandMETAL(psContext, &psInst->asOperands[src0], SVTTypeToFlagMETAL(eDataType));
-            METALAddAssignPrologue(psContext, needsParenthesis);
-            return;
-        }
-    }
-
-    METALAddAssignToDest(psContext, &psInst->asOperands[dest], eDataType, dstSwizCount, &needsParenthesis);
-
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src0], SVTTypeToFlagMETAL(eDataType), destMask);
-    bformata(glsl, " %s ", name);
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src1], SVTTypeToFlagMETAL(eDataType), destMask);
-    METALAddAssignPrologue(psContext, needsParenthesis);
-}
-
-static void METALCallTernaryOp(HLSLCrossCompilerContext* psContext, const char* op1, const char* op2, Instruction* psInst,
-    int dest, int src0, int src1, int src2, uint32_t dataType)
-{
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[dest]);
-    uint32_t destMask = GetOperandWriteMaskMETAL(&psInst->asOperands[dest]);
-
-    const SHADER_VARIABLE_TYPE eDestType = GetOperandDataTypeMETAL(psContext, &psInst->asOperands[dest]);
-    uint32_t ui32Flags = dataType | SVTTypeToFlagMETAL(eDestType);
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    METALAddAssignToDest(psContext, &psInst->asOperands[dest], TypeFlagsToSVTTypeMETAL(dataType), dstSwizCount, &numParenthesis);
-
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bformata(glsl, " %s ", op1);
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    bformata(glsl, " %s ", op2);
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src2], ui32Flags, destMask);
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void METALCallHelper3(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1, int src2, int paramsShouldFollowWriteMask)
-{
-    const SHADER_VARIABLE_TYPE eDestType = GetOperandDataTypeMETAL(psContext, &psInst->asOperands[dest]);
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_FLOAT | SVTTypeToFlagMETAL(eDestType);
-    
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMaskMETAL(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    uint32_t dstSwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[dest]);
-    int numParenthesis = 0;
-
-
-    AddIndentation(psContext);
-
-    METALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_FLOAT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src2], ui32Flags, destMask);
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void METALCallHelper2(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1, int paramsShouldFollowWriteMask)
-{
-    const SHADER_VARIABLE_TYPE eDestType = GetOperandDataTypeMETAL(psContext, &psInst->asOperands[dest]);
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_FLOAT | SVTTypeToFlagMETAL(eDestType);
-    
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMaskMETAL(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    uint32_t dstSwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[dest]);
-
-    int isDotProduct = (strncmp(name, "dot", 3) == 0) ? 1 : 0;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-    METALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_FLOAT, isDotProduct ? 1 : dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void METALCallHelper2Int(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1, int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_INT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[dest]);
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMaskMETAL(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    METALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_INT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void METALCallHelper2UInt(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int src1, int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_UINT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[dest]);
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMaskMETAL(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    METALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_UINT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    bcatcstr(glsl, ", ");
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src1], ui32Flags, destMask);
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-static void METALCallHelper1(HLSLCrossCompilerContext* psContext, const char* name, Instruction* psInst,
-    int dest, int src0, int paramsShouldFollowWriteMask)
-{
-    uint32_t ui32Flags = TO_AUTO_BITCAST_TO_FLOAT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t dstSwizCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[dest]);
-    uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMaskMETAL(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-    int numParenthesis = 0;
-
-    AddIndentation(psContext);
-
-    METALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_FLOAT, dstSwizCount, &numParenthesis);
-
-    bformata(glsl, "%s(", name);
-    numParenthesis++;
-    TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-////Result is an int.
-//static void METALCallHelper1Int(HLSLCrossCompilerContext* psContext,
-//  const char* name,
-//  Instruction* psInst,
-//  const int dest,
-//  const int src0,
-//  int paramsShouldFollowWriteMask)
-//{
-//  uint32_t ui32Flags = TO_AUTO_BITCAST_TO_INT;
-//  bstring glsl = *psContext->currentShaderString;
-//  uint32_t src0SwizCount = GetNumSwizzleElements(&psInst->asOperands[src0]);
-//  uint32_t dstSwizCount = GetNumSwizzleElements(&psInst->asOperands[dest]);
-//  uint32_t destMask = paramsShouldFollowWriteMask ? GetOperandWriteMask(&psInst->asOperands[dest]) : OPERAND_4_COMPONENT_MASK_ALL;
-//  int numParenthesis = 0;
-//
-//  AddIndentation(psContext);
-//
-//  METALAddAssignToDest(psContext, &psInst->asOperands[dest], SVT_INT, dstSwizCount, &numParenthesis);
-//
-//  bformata(glsl, "%s(", name);
-//  numParenthesis++;
-//  TranslateOperandWithMask(psContext, &psInst->asOperands[src0], ui32Flags, destMask);
-//  METALAddAssignPrologue(psContext, numParenthesis);
-//}
-
-static void METALTranslateTexelFetch(HLSLCrossCompilerContext* psContext,
-    Instruction* psInst,
-    ResourceBinding* psBinding,
-    bstring metal)
-{
-    int numParenthesis = 0;
-    AddIndentation(psContext);
-    METALAddAssignToDest(psContext, &psInst->asOperands[0], TypeFlagsToSVTTypeMETAL(METALResourceReturnTypeToFlag(psBinding->ui32ReturnType)), 4, &numParenthesis);
-
-    switch (psBinding->eDimension)
-    {
-    case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ".read(");
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").x)");
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[2]);
-        bcatcstr(metal, ")");
-
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-
-        break;
-    }
-    case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    {
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ".read(");
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").x, (");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").y)");
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[2]);
-        bcatcstr(metal, ")");
-
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-
-        break;
-    }
-    case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-    {
-        // METAL PIXEL SHADER RT FETCH
-        if (psInst->asOperands[2].ui32RegisterNumber >= GMEM_FLOAT_START_SLOT)
-        {
-            bformata(metal, "(GMEM_Input%d", GetGmemInputResourceSlotMETAL(psInst->asOperands[2].ui32RegisterNumber));
-
-            int gmemNumElements = GetGmemInputResourceNumElementsMETAL(psInst->asOperands[2].ui32RegisterNumber);
-
-            int destNumElements = 0;
-
-            if (psInst->asOperands[0].iNumComponents != 1)
-            {
-                //Component Mask
-                uint32_t mask = psInst->asOperands[0].ui32CompMask;
-
-                if (mask == OPERAND_4_COMPONENT_MASK_ALL)
-                {
-                    destNumElements = 4;
-                }
-                else if (mask != 0)
-                {
-                    if (mask & OPERAND_4_COMPONENT_MASK_X)
-                    {
-                        destNumElements++;
-                    }
-                    if (mask & OPERAND_4_COMPONENT_MASK_Y)
-                    {
-                        destNumElements++;
-                    }
-                    if (mask & OPERAND_4_COMPONENT_MASK_Z)
-                    {
-                        destNumElements++;
-                    }
-                    if (mask & OPERAND_4_COMPONENT_MASK_W)
-                    {
-                        destNumElements++;
-                    }
-                }
-            }
-            else
-            {
-                destNumElements = 4;
-            }
-
-            TranslateGmemOperandSwizzleWithMaskMETAL(psContext, &psInst->asOperands[2], OPERAND_4_COMPONENT_MASK_ALL, gmemNumElements);
-            bcatcstr(metal, ")");
-
-            TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-        }
-        else
-        {
-            bcatcstr(metal, "(");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(metal, ".read(");
-            bcatcstr(metal, "(");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-            bcatcstr(metal, ").xy, (");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-            bcatcstr(metal, ").w)");
-            TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[2]);
-            bcatcstr(metal, ")");
-            TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-        }
-
-        break;
-    }
-    case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    {
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ".read(");
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").xy, (");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").z, (");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").w)");
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[2]);
-        bcatcstr(metal, ")");
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-
-        break;
-    }
-    case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-    {
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ".read(");
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").xyz, (");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").w)");
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[2]);
-        bcatcstr(metal, ")");
-
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-
-        break;
-    }
-    case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:
-    {
-        ASSERT(psInst->eOpcode == OPCODE_LD_MS);
-
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ".read(");
-
-        bcatcstr(metal, "(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ").xy, ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[3], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ")");
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[2]);
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[0]);
-
-        break;
-    }
-    case REFLECT_RESOURCE_DIMENSION_BUFFER:
-    case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-    case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-    case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    case REFLECT_RESOURCE_DIMENSION_BUFFEREX:
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-//static void METALTranslateTexelFetchOffset(HLSLCrossCompilerContext* psContext,
-//  Instruction* psInst,
-//  ResourceBinding* psBinding,
-//  bstring metal)
-//{
-//  int numParenthesis = 0;
-//  uint32_t destCount = GetNumSwizzleElements(&psInst->asOperands[0]);
-//  AddIndentation(psContext);
-//  METALAddAssignToDest(psContext, &psInst->asOperands[0], TypeFlagsToSVTType(METALResourceReturnTypeToFlag(psBinding->ui32ReturnType)), 4, &numParenthesis);
-//
-//  bcatcstr(metal, "texelFetchOffset(");
-//
-//  switch (psBinding->eDimension)
-//  {
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-//  {
-//      TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-//      bcatcstr(metal, ", ");
-//      TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-//      bformata(metal, ", 0, %d)", psInst->iUAddrOffset);
-//      break;
-//  }
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-//  {
-//      TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-//      bcatcstr(metal, ", ");
-//      TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC3, 7 /* .xyz */);
-//      bformata(metal, ", 0, int2(%d, %d))",
-//          psInst->iUAddrOffset,
-//          psInst->iVAddrOffset);
-//      break;
-//  }
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-//  {
-//      TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-//      bcatcstr(metal, ", ");
-//      TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC3, 7 /* .xyz */);
-//      bformata(metal, ", 0, int3(%d, %d, %d))",
-//          psInst->iUAddrOffset,
-//          psInst->iVAddrOffset,
-//          psInst->iWAddrOffset);
-//      break;
-//  }
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-//  {
-//      TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-//      bcatcstr(metal, ", ");
-//      TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC2, 3 /* .xy */);
-//      bformata(metal, ", 0, int2(%d, %d))", psInst->iUAddrOffset, psInst->iVAddrOffset);
-//      break;
-//  }
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-//  {
-//      TranslateOperand(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-//      bcatcstr(metal, ", ");
-//      TranslateOperandWithMask(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER | TO_AUTO_EXPAND_TO_VEC2, 3 /* .xy */);
-//      bformata(metal, ", 0, int(%d))", psInst->iUAddrOffset);
-//      break;
-//  }
-//  case REFLECT_RESOURCE_DIMENSION_BUFFER:
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-//  case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-//  case REFLECT_RESOURCE_DIMENSION_BUFFEREX:
-//  default:
-//  {
-//      ASSERT(0);
-//      break;
-//  }
-//  }
-//
-//  AddSwizzleUsingElementCount(psContext, destCount);
-//  METALAddAssignPrologue(psContext, numParenthesis);
-//}
-
-
-//Makes sure the texture coordinate swizzle is appropriate for the texture type.
-//i.e. vecX for X-dimension texture.
-//Currently supports floating point coord only, so not used for texelFetch.
-static void METALTranslateTexCoord(HLSLCrossCompilerContext* psContext,
-    const RESOURCE_DIMENSION eResDim,
-    Operand* psTexCoordOperand)
-{
-    uint32_t flags = TO_AUTO_BITCAST_TO_FLOAT;
-    bstring glsl = *psContext->currentShaderString;
-    uint32_t opMask = OPERAND_4_COMPONENT_MASK_ALL;
-    int isArray = 0;
-    switch (eResDim)
-    {
-    case RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        //Vec1 texcoord. Mask out the other components.
-        opMask = OPERAND_4_COMPONENT_MASK_X;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2D:
-    case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    {
-        //Vec2 texcoord. Mask out the other components.
-        opMask = OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y;
-        flags |= TO_AUTO_EXPAND_TO_VEC2;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBE:
-    case RESOURCE_DIMENSION_TEXTURE3D:
-    {
-        //Vec3 texcoord. Mask out the other components.
-        opMask = OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z;
-        flags |= TO_AUTO_EXPAND_TO_VEC3;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    {
-        //Vec3 texcoord. Mask out the other components.
-        opMask = OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y;
-        flags |= TO_AUTO_EXPAND_TO_VEC2;
-        isArray = 1;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    {
-        flags |= TO_AUTO_EXPAND_TO_VEC4;
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    //FIXME detect when integer coords are needed.
-    TranslateOperandWithMaskMETAL(psContext, psTexCoordOperand, flags, opMask);
-    if (isArray)
-    {
-        bformata(glsl, ",");
-        TranslateOperandWithMaskMETAL(psContext, psTexCoordOperand, 0, OPERAND_4_COMPONENT_MASK_Z);
-    }
-}
-
-static int METALGetNumTextureDimensions(HLSLCrossCompilerContext* psContext,
-    const RESOURCE_DIMENSION eResDim)
-{
-    (void)psContext;
-    switch (eResDim)
-    {
-    case RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        return 1;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2D:
-    case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    case RESOURCE_DIMENSION_TEXTURECUBE:
-    {
-        return 2;
-    }
-
-    case RESOURCE_DIMENSION_TEXTURE3D:
-    case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    {
-        return 3;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-    return 0;
-}
-
-void GetResInfoDataMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, int index, int destElem)
-{
-    bstring metal = *psContext->currentShaderString;
-    int numParenthesis = 0;
-    const RESINFO_RETURN_TYPE eResInfoReturnType = psInst->eResInfoReturnType;
-    const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-
-    AddIndentation(psContext);
-    METALAddOpAssignToDestWithMask(psContext, &psInst->asOperands[0], eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT ? SVT_UINT : SVT_FLOAT, 1, "=", &numParenthesis, 1 << destElem);
-
-    //[width, height, depth or array size, total-mip-count]
-    if (index < 3)
-    {
-        int dim = METALGetNumTextureDimensions(psContext, eResDim);
-        bcatcstr(metal, "(");
-        if (dim < (index + 1))
-        {
-            bcatcstr(metal, eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT ? "0u" : "0.0");
-        }
-        else
-        {
-            if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT)
-            {
-                bformata(metal, "uint%d(textureSize(", dim);
-            }
-            else if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_RCPFLOAT)
-            {
-                bformata(metal, "float%d(1.0) / float%d(textureSize(", dim, dim);
-            }
-            else
-            {
-                bformata(metal, "float%d(textureSize(", dim);
-            }
-            TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-            bcatcstr(metal, ", ");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-            bcatcstr(metal, "))");
-
-            switch (index)
-            {
-            case 0:
-                bcatcstr(metal, ".x");
-                break;
-            case 1:
-                bcatcstr(metal, ".y");
-                break;
-            case 2:
-                bcatcstr(metal, ".z");
-                break;
-            }
-        }
-
-        bcatcstr(metal, ")");
-    }
-    else
-    {
-        if (eResInfoReturnType == RESINFO_INSTRUCTION_RETURN_UINT)
-        {
-            bcatcstr(metal, "uint(");
-        }
-        else
-        {
-            bcatcstr(metal, "float(");
-        }
-        bcatcstr(metal, "textureQueryLevels(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, "))");
-    }
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-#define TEXSMP_FLAG_NONE 0x0
-#define TEXSMP_FLAG_LOD 0x1 //LOD comes from operand
-#define TEXSMP_FLAG_DEPTHCOMPARE 0x2
-#define TEXSMP_FLAG_FIRSTLOD 0x4 //LOD is 0
-#define TEXSMP_FLAG_BIAS 0x8
-#define TEXSMP_FLAGS_GRAD 0x10
-
-// TODO FIXME: non-float samplers!
-static void METALTranslateTextureSample(HLSLCrossCompilerContext* psContext, Instruction* psInst,
-    uint32_t ui32Flags)
-{
-    bstring metal = *psContext->currentShaderString;
-    int numParenthesis = 0;
-
-    const char* funcName = "sample";
-    const char* depthCmpCoordType = "";
-    const char* gradSwizzle = "";
-
-    uint32_t ui32NumOffsets = 0;
-
-    const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-
-    ASSERT(psInst->asOperands[2].ui32RegisterNumber < MAX_TEXTURES);
-    switch (eResDim)
-    {
-    case RESOURCE_DIMENSION_TEXTURE1D:
-    {
-        gradSwizzle = ".x";
-        ui32NumOffsets = 1;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2D:
-    {
-        depthCmpCoordType = "float2";
-        gradSwizzle = ".xy";
-        ui32NumOffsets = 2;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBE:
-    {
-        depthCmpCoordType = "float3";
-        gradSwizzle = ".xyz";
-        ui32NumOffsets = 3;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE3D:
-    {
-        gradSwizzle = ".xyz";
-        ui32NumOffsets = 3;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE1DARRAY:
-    {
-        gradSwizzle = ".x";
-        ui32NumOffsets = 1;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURE2DARRAY:
-    {
-        depthCmpCoordType = "float2";
-        gradSwizzle = ".xy";
-        ui32NumOffsets = 2;
-        break;
-    }
-    case RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-    {
-        //bformata(metal, "TODO:Sample from texture cube array LOD\n");
-        gradSwizzle = ".xyz";
-        ui32NumOffsets = 3;
-        //ASSERT(0);
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    if (ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE)
-    {
-        //For non-cubeMap Arrays the reference value comes from the
-        //texture coord vector in GLSL. For cubmap arrays there is a
-        //separate parameter.
-        //It is always separate paramter in HLSL.
-        SHADER_VARIABLE_TYPE dataType = SVT_FLOAT; // TODO!!
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], dataType, GetNumSwizzleElementsMETAL(&psInst->asOperands[2]), &numParenthesis);
-
-        bcatcstr(metal, "(float4(");
-        ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, 0);
-        bformata(metal, ".%s_compare(", funcName);
-        bconcat(metal, TextureSamplerNameMETAL(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 1));
-        bformata(metal, ", %s(", depthCmpCoordType);
-        METALTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-        bcatcstr(metal, "), ");
-        //.z = reference.
-        TranslateOperandMETAL(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);
-
-        if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-        {
-            bcatcstr(metal, ", level(0)");
-        }
-
-        if (psInst->bAddressOffset)
-        {
-            if (ui32NumOffsets == 2)
-            {
-                bformata(metal, ", int2(%d, %d)",
-                    psInst->iUAddrOffset,
-                    psInst->iVAddrOffset);
-            }
-            else
-            if (ui32NumOffsets == 3)
-            {
-                bformata(metal, ", int3(%d, %d, %d)",
-                    psInst->iUAddrOffset,
-                    psInst->iVAddrOffset,
-                    psInst->iWAddrOffset);
-            }
-        }
-        bcatcstr(metal, ")))");
-
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzleWithMaskMETAL(psContext, &psInst->asOperands[2], GetOperandWriteMaskMETAL(&psInst->asOperands[0]));
-    }
-    else
-    {
-        SHADER_VARIABLE_TYPE dataType = SVT_FLOAT; // TODO!!
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], dataType, GetNumSwizzleElementsMETAL(&psInst->asOperands[2]), &numParenthesis);
-
-        bcatcstr(metal, "(");
-        ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, 0);
-        bformata(metal, ".%s(", funcName);
-        bconcat(metal, TextureSamplerNameMETAL(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, 0));
-        bformata(metal, ", ");
-        METALTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-
-        if (ui32NumOffsets > 1)
-        {
-            if (ui32Flags & (TEXSMP_FLAG_LOD))
-            {
-                bcatcstr(metal, ", level(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);
-                bcatcstr(metal, ")");
-            }
-            else
-            if (ui32Flags & TEXSMP_FLAG_FIRSTLOD)
-            {
-                bcatcstr(metal, ", level(0)");
-            }
-            else
-            if (ui32Flags & (TEXSMP_FLAG_BIAS))
-            {
-                bcatcstr(metal, ", bias(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);
-                bcatcstr(metal, ")");
-            }
-            else
-            if (ui32Flags & TEXSMP_FLAGS_GRAD)
-            {
-                if (eResDim == RESOURCE_DIMENSION_TEXTURECUBE)
-                {
-                    bcatcstr(metal, ", gradientcube(float4(");
-                }
-                else
-                {
-                    bformata(metal, ", gradient%dd(float4(", ui32NumOffsets);
-                }
-
-                TranslateOperandMETAL(psContext, &psInst->asOperands[4], TO_AUTO_BITCAST_TO_FLOAT);            //dx
-                bcatcstr(metal, ")");
-                bcatcstr(metal, gradSwizzle);
-                bcatcstr(metal, ", float4(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[5], TO_AUTO_BITCAST_TO_FLOAT);            //dy
-                bcatcstr(metal, ")");
-                bcatcstr(metal, gradSwizzle);
-                bcatcstr(metal, ")");
-            }
-        }
-
-        if (psInst->bAddressOffset)
-        {
-            if (ui32NumOffsets == 1)
-            {
-                bformata(metal, ", %d",
-                    psInst->iUAddrOffset);
-            }
-            else
-            if (ui32NumOffsets == 2)
-            {
-                bformata(metal, ", int2(%d, %d)",
-                    psInst->iUAddrOffset,
-                    psInst->iVAddrOffset);
-            }
-            else
-            if (ui32NumOffsets == 3)
-            {
-                bformata(metal, ", int3(%d, %d, %d)",
-                    psInst->iUAddrOffset,
-                    psInst->iVAddrOffset,
-                    psInst->iWAddrOffset);
-            }
-        }
-
-        bcatcstr(metal, "))");
-    }
-
-    if (!(ui32Flags & TEXSMP_FLAG_DEPTHCOMPARE))
-    {
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzleWithMaskMETAL(psContext, &psInst->asOperands[2], GetOperandWriteMaskMETAL(&psInst->asOperands[0]));
-    }
-    METALAddAssignPrologue(psContext, numParenthesis);
-}
-
-static ShaderVarType* METALLookupStructuredVar(HLSLCrossCompilerContext* psContext,
-    Operand* psResource,
-    Operand* psByteOffset,
-    uint32_t ui32Component)
-{
-    ConstantBuffer* psCBuf = NULL;
-    ShaderVarType* psVarType = NULL;
-    uint32_t aui32Swizzle[4] = { OPERAND_4_COMPONENT_X };
-    int byteOffset = ((int*)psByteOffset->afImmediates)[0] + 4 * ui32Component;
-    int vec4Offset = 0;
-    int32_t index = -1;
-    int32_t rebase = -1;
-    int found;
-
-    ASSERT(psByteOffset->eType == OPERAND_TYPE_IMMEDIATE32);
-    //TODO: multi-component stores and vector writes need testing.
-
-    //aui32Swizzle[0] = psInst->asOperands[0].aui32Swizzle[component];
-    switch (psResource->eType)
-    {
-    case OPERAND_TYPE_RESOURCE:
-        GetConstantBufferFromBindingPoint(RGROUP_TEXTURE, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-        break;
-    case OPERAND_TYPE_UNORDERED_ACCESS_VIEW:
-        GetConstantBufferFromBindingPoint(RGROUP_UAV, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-        break;
-    case OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY:
-    {
-        //dcl_tgsm_structured defines the amount of memory and a stride.
-        ASSERT(psResource->ui32RegisterNumber < MAX_GROUPSHARED);
-        return &psContext->psShader->sGroupSharedVarType[psResource->ui32RegisterNumber];
-    }
-    default:
-        ASSERT(0);
-        break;
-    }
-
-    switch (byteOffset % 16)
-    {
-    case 0:
-        aui32Swizzle[0] = 0;
-        break;
-    case 4:
-        aui32Swizzle[0] = 1;
-        break;
-    case 8:
-        aui32Swizzle[0] = 2;
-        break;
-    case 12:
-        aui32Swizzle[0] = 3;
-        break;
-    }
-    vec4Offset = byteOffset / 16;
-
-    found = GetShaderVarFromOffset(vec4Offset, aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-    ASSERT(found);
-
-    return psVarType;
-}
-
-static ShaderVarType* METALLookupStructuredVarAtomic(HLSLCrossCompilerContext* psContext,
-    Operand* psResource,
-    Operand* psByteOffset,
-    uint32_t ui32Component)
-{
-    ConstantBuffer* psCBuf = NULL;
-    ShaderVarType* psVarType = NULL;
-    uint32_t aui32Swizzle[4] = { OPERAND_4_COMPONENT_X };
-    int byteOffset = ((int*)psByteOffset->afImmediates)[0] + 4 * ui32Component;
-    int vec4Offset = 0;
-    int32_t index = -1;
-    int32_t rebase = -1;
-    int found;
-
-    ASSERT(psByteOffset->eType == OPERAND_TYPE_IMMEDIATE32);
-    //TODO: multi-component stores and vector writes need testing.
-
-    //aui32Swizzle[0] = psInst->asOperands[0].aui32Swizzle[component];
-    switch (psResource->eType)
-    {
-    case OPERAND_TYPE_RESOURCE:
-        GetConstantBufferFromBindingPoint(RGROUP_TEXTURE, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-        break;
-    case OPERAND_TYPE_UNORDERED_ACCESS_VIEW:
-        GetConstantBufferFromBindingPoint(RGROUP_UAV, psResource->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-        break;
-    case OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY:
-    {
-        //dcl_tgsm_structured defines the amount of memory and a stride.
-        ASSERT(psResource->ui32RegisterNumber < MAX_GROUPSHARED);
-        return &psContext->psShader->sGroupSharedVarType[psResource->ui32RegisterNumber];
-    }
-    default:
-        ASSERT(0);
-        break;
-    }
-
-    if (psCBuf->asVars->sType.Class == SVC_STRUCT)
-    {
-        //recalculate offset based on address.y;
-        int offset = *((int*)(&psByteOffset->afImmediates[1]));
-        if (offset > 0)
-        {
-            byteOffset = offset + 4 * ui32Component;
-        }
-    }
-
-    switch (byteOffset % 16)
-    {
-    case 0:
-        aui32Swizzle[0] = 0;
-        break;
-    case 4:
-        aui32Swizzle[0] = 1;
-        break;
-    case 8:
-        aui32Swizzle[0] = 2;
-        break;
-    case 12:
-        aui32Swizzle[0] = 3;
-        break;
-    }
-    vec4Offset = byteOffset / 16;
-
-    found = GetShaderVarFromOffset(vec4Offset, aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-    ASSERT(found);
-
-    return psVarType;
-}
-
-static void METALTranslateShaderStorageStore(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring metal = *psContext->currentShaderString;
-    ShaderVarType* psVarType = NULL;
-    int component;
-    int srcComponent = 0;
-
-    Operand* psDest = 0;
-    Operand* psDestAddr = 0;
-    Operand* psDestByteOff = 0;
-    Operand* psSrc = 0;
-    int structured = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_STORE_STRUCTURED:
-        psDest = &psInst->asOperands[0];
-        psDestAddr = &psInst->asOperands[1];
-        psDestByteOff = &psInst->asOperands[2];
-        psSrc = &psInst->asOperands[3];
-        structured = 1;
-
-        break;
-    case OPCODE_STORE_RAW:
-        psDest = &psInst->asOperands[0];
-        psDestByteOff = &psInst->asOperands[1];
-        psSrc = &psInst->asOperands[2];
-        break;
-    }
-
-    for (component = 0; component < 4; component++)
-    {
-        const char* swizzleString[] = { ".x", ".y", ".z", ".w" };
-        ASSERT(psInst->asOperands[0].eSelMode == OPERAND_4_COMPONENT_MASK_MODE);
-        if (psInst->asOperands[0].ui32CompMask & (1 << component))
-        {
-
-            if (structured && psDest->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                psVarType = METALLookupStructuredVar(psContext, psDest, psDestByteOff, component);
-            }
-
-            AddIndentation(psContext);
-
-            if (!structured && (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY))
-            {
-                bformata(metal, "atomic_store_explicit( &");
-                TranslateOperandMETAL(psContext, psDest, TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY);
-                bformata(metal, "[");
-                if (structured) //Dest address and dest byte offset
-                {
-                    if (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                    {
-                        TranslateOperandMETAL(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                        bformata(metal, "].value[");
-                        TranslateOperandMETAL(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                        bformata(metal, "/4u ");//bytes to floats
-                    }
-                    else
-                    {
-                        TranslateOperandMETAL(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    }
-                }
-                else
-                {
-                    TranslateOperandMETAL(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                }
-                //RAW: change component using index offset
-                if (!structured || (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY))
-                {
-                    bformata(metal, " + %d", component);
-                }
-                bformata(metal, "],");
-
-                if (structured)
-                {
-                    uint32_t flags = TO_FLAG_UNSIGNED_INTEGER;
-                    if (psVarType)
-                    {
-                        if (psVarType->Type == SVT_INT)
-                        {
-                            flags = TO_FLAG_INTEGER;
-                        }
-                        else if (psVarType->Type == SVT_FLOAT)
-                        {
-                            flags = TO_FLAG_NONE;
-                        }
-                        else if (psVarType->Type == SVT_FLOAT16)
-                        {
-                            flags = TO_FLAG_FLOAT16;
-                        } 
-                        else
-                        {
-                            ASSERT(0);
-                        }
-                    }
-                    //TGSM always uint
-                    bformata(metal, " (");
-                    if (GetNumSwizzleElementsMETAL(psSrc) > 1)
-                    {
-                        TranslateOperandWithMaskMETAL(psContext, psSrc, flags, 1 << (srcComponent++));
-                    }
-                    else
-                    {
-                        TranslateOperandWithMaskMETAL(psContext, psSrc, flags, OPERAND_4_COMPONENT_MASK_X);
-                    }
-                }
-                else
-                {
-                    //Dest type is currently always a uint array.
-                    bformata(metal, " (");
-                    if (GetNumSwizzleElementsMETAL(psSrc) > 1)
-                    {
-                        TranslateOperandWithMaskMETAL(psContext, psSrc, TO_FLAG_UNSIGNED_INTEGER, 1 << (srcComponent++));
-                    }
-                    else
-                    {
-                        TranslateOperandWithMaskMETAL(psContext, psSrc, TO_FLAG_UNSIGNED_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-                    }
-                }
-
-                //Double takes an extra slot.
-                if (psVarType && psVarType->Type == SVT_DOUBLE)
-                {
-                    if (structured && psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                    {
-                        bcatcstr(metal, ")");
-                    }
-                    component++;
-                }
-
-                bformata(metal, "),");
-                bformata(metal, "memory_order_relaxed");
-                bformata(metal, ");\n");
-                return;
-            }
-
-            if (structured && psDest->eType == OPERAND_TYPE_RESOURCE)
-            {
-                ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psDest->ui32RegisterNumber, 0);
-            }
-            else
-            {
-                TranslateOperandMETAL(psContext, psDest, TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY);
-            }
-            bformata(metal, "[");
-            if (structured) //Dest address and dest byte offset
-            {
-                if (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    TranslateOperandMETAL(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(metal, "].value[");
-                    TranslateOperandMETAL(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                    bformata(metal, "/4u ");//bytes to floats
-                }
-                else
-                {
-                    TranslateOperandMETAL(psContext, psDestAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                }
-            }
-            else
-            {
-                TranslateOperandMETAL(psContext, psDestByteOff, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-            }
-
-            //RAW: change component using index offset
-            if (!structured || (psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY))
-            {
-                bformata(metal, " + %d", component);
-            }
-
-            bformata(metal, "]");
-
-            if (structured && psDest->eType != OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                if (strcmp(psVarType->Name, "$Element") != 0)
-                {
-                    bformata(metal, ".%s", psVarType->Name);
-                }
-                if (psVarType->Columns > 1 || psVarType->Rows > 1)
-                {
-                    bformata(metal, "%s", swizzleString[((((int*)psDestByteOff->afImmediates)[0] + 4 * component - psVarType->Offset) % 16 / 4)]);
-                }
-            }
-
-            if (structured)
-            {
-                uint32_t flags = TO_FLAG_UNSIGNED_INTEGER;
-                if (psVarType)
-                {
-                    if (psVarType->Type == SVT_INT)
-                    {
-                        flags = TO_FLAG_INTEGER;
-                    }
-                    else if (psVarType->Type == SVT_FLOAT)
-                    {
-                        flags = TO_FLAG_NONE;
-                    }
-                    else if (psVarType->Type == SVT_FLOAT16)
-                    {
-                        flags = TO_FLAG_FLOAT16;
-                    }
-                    else
-                    {
-                        ASSERT(0);
-                    }
-                }
-                //TGSM always uint
-                bformata(metal, " = (");
-                if (GetNumSwizzleElementsMETAL(psSrc) > 1)
-                {
-                    TranslateOperandWithMaskMETAL(psContext, psSrc, flags, 1 << (srcComponent++));
-                }
-                else
-                {
-                    TranslateOperandWithMaskMETAL(psContext, psSrc, flags, OPERAND_4_COMPONENT_MASK_X);
-                }
-            }
-            else
-            {
-                //Dest type is currently always a uint array.
-                bformata(metal, " = (");
-                if (GetNumSwizzleElementsMETAL(psSrc) > 1)
-                {
-                    TranslateOperandWithMaskMETAL(psContext, psSrc, TO_FLAG_UNSIGNED_INTEGER, 1 << (srcComponent++));
-                }
-                else
-                {
-                    TranslateOperandWithMaskMETAL(psContext, psSrc, TO_FLAG_UNSIGNED_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-                }
-            }
-
-            //Double takes an extra slot.
-            if (psVarType && psVarType->Type == SVT_DOUBLE)
-            {
-                if (structured && psDest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-                {
-                    bcatcstr(metal, ")");
-                }
-                component++;
-            }
-
-            bformata(metal, ");\n");
-        }
-    }
-}
-
-static void METALTranslateShaderStorageLoad(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring metal = *psContext->currentShaderString;
-    int component;
-    Operand* psDest = 0;
-    Operand* psSrcAddr = 0;
-    Operand* psSrcByteOff = 0;
-    Operand* psSrc = 0;
-    int structured = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_LD_STRUCTURED:
-        psDest = &psInst->asOperands[0];
-        psSrcAddr = &psInst->asOperands[1];
-        psSrcByteOff = &psInst->asOperands[2];
-        psSrc = &psInst->asOperands[3];
-        structured = 1;
-        break;
-    case OPCODE_LD_RAW:
-        psDest = &psInst->asOperands[0];
-        psSrcByteOff = &psInst->asOperands[1];
-        psSrc = &psInst->asOperands[2];
-        break;
-    }
-
-    if (psInst->eOpcode == OPCODE_LD_RAW)
-    {
-        int numParenthesis = 0;
-        int firstItemAdded = 0;
-        uint32_t destCount = GetNumSwizzleElementsMETAL(psDest);
-        uint32_t destMask = GetOperandWriteMaskMETAL(psDest);
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, psDest, SVT_UINT, destCount, &numParenthesis);
-        if (destCount > 1)
-        {
-            bformata(metal, "%s(", GetConstructorForTypeMETAL(SVT_UINT, destCount));
-            numParenthesis++;
-        }
-        for (component = 0; component < 4; component++)
-        {
-            if (!(destMask & (1 << component)))
-            {
-                continue;
-            }
-
-            if (firstItemAdded)
-            {
-                bcatcstr(metal, ", ");
-            }
-            else
-            {
-                firstItemAdded = 1;
-            }
-
-            if (psSrc->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                //ld from threadgroup shared memory
-                bformata(metal, "atomic_load_explicit( &");
-                bformata(metal, "TGSM%d[((", psSrc->ui32RegisterNumber);
-                TranslateOperandMETAL(psContext, psSrcByteOff, TO_FLAG_INTEGER);
-                bcatcstr(metal, ") >> 2)");
-                if (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE && psSrc->aui32Swizzle[component] != 0)
-                {
-                    bformata(metal, " + %d", psSrc->aui32Swizzle[component]);
-                }
-                bcatcstr(metal, "]");
-                bcatcstr(metal, " , ");
-                bcatcstr(metal, "memory_order::memory_order_relaxed");
-                bformata(metal, ")");
-
-                /*
-                bformata(metal, "TGSM%d[((", psSrc->ui32RegisterNumber);
-                TranslateOperandMETAL(psContext, psSrcByteOff, TO_FLAG_INTEGER);
-                bcatcstr(metal, ") >> 2)");
-                if (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE && psSrc->aui32Swizzle[component] != 0)
-                {
-                    bformata(metal, " + %d", psSrc->aui32Swizzle[component]);
-                }
-                bcatcstr(metal, "]");
-                */
-            }
-            else
-            {
-                //ld from raw buffer
-                bformata(metal, "RawRes%d[((", psSrc->ui32RegisterNumber);
-                TranslateOperandMETAL(psContext, psSrcByteOff, TO_FLAG_INTEGER);
-                bcatcstr(metal, ") >> 2)");
-                if (psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE && psSrc->aui32Swizzle[component] != 0)
-                {
-                    bformata(metal, " + %d", psSrc->aui32Swizzle[component]);
-                }
-                bcatcstr(metal, "]");
-            }
-        }
-        METALAddAssignPrologue(psContext, numParenthesis);
-    }
-    else
-    {
-        int numParenthesis = 0;
-        int firstItemAdded = 0;
-        uint32_t destCount = GetNumSwizzleElementsMETAL(psDest);
-        uint32_t destMask = GetOperandWriteMaskMETAL(psDest);
-        ASSERT(psInst->eOpcode == OPCODE_LD_STRUCTURED);
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, psDest, SVT_UINT, destCount, &numParenthesis);
-        if (destCount > 1)
-        {
-            bformata(metal, "%s(", GetConstructorForTypeMETAL(SVT_UINT, destCount));
-            numParenthesis++;
-        }
-        for (component = 0; component < 4; component++)
-        {
-            ShaderVarType* psVar = NULL;
-            int addedBitcast = 0;
-            if (!(destMask & (1 << component)))
-            {
-                continue;
-            }
-
-            if (firstItemAdded)
-            {
-                bcatcstr(metal, ", ");
-            }
-            else
-            {
-                firstItemAdded = 1;
-            }
-
-            if (psSrc->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-            {
-                // input already in uints
-                TranslateOperandMETAL(psContext, psSrc, TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, "[");
-                TranslateOperandMETAL(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                bcatcstr(metal, "].value[(");
-                TranslateOperandMETAL(psContext, psSrcByteOff, TO_FLAG_UNSIGNED_INTEGER);
-                bformata(metal, " >> 2u) + %d]", psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-            }
-            else
-            {
-                ConstantBuffer* psCBuf = NULL;
-                psVar = METALLookupStructuredVar(psContext, psSrc, psSrcByteOff, psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component);
-                GetConstantBufferFromBindingPoint(RGROUP_UAV, psSrc->ui32RegisterNumber, &psContext->psShader->sInfo, &psCBuf);
-
-                if (psVar->Type == SVT_FLOAT)
-                {
-                    bcatcstr(metal, "as_type<uint>(");
-                    bcatcstr(metal, "(");
-                    addedBitcast = 1;
-                }
-                else if (psVar->Type == SVT_DOUBLE)
-                {
-                    bcatcstr(metal, "as_type<uint>(");
-                    bcatcstr(metal, "(");
-                    addedBitcast = 1;
-                }
-                if (psSrc->eType == OPERAND_TYPE_UNORDERED_ACCESS_VIEW)
-                {
-                    bformata(metal, "%s[", psCBuf->Name);
-                    TranslateOperandMETAL(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                    bcatcstr(metal, "]");
-                    if (strcmp(psVar->Name, "$Element") != 0)
-                    {
-                        bcatcstr(metal, ".");
-                        bcatcstr(metal, psVar->Name);
-                    }
-
-                    int swizcomponent = psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component;
-                    int byteOffset = ((int*)psSrcByteOff->afImmediates)[0] + 4 * swizcomponent;
-                    int bytes = byteOffset - psVar->Offset;
-                    if (psVar->Class != SVC_SCALAR)
-                    {
-                        static const char* const m_swizzlers[] = { "x", "y", "z", "w" };
-                        int offset = (bytes % 16) / 4;
-                        if (offset == 0)
-                        {
-                            bcatcstr(metal, ".x");
-                        }
-                        if (offset == 1)
-                        {
-                            bcatcstr(metal, ".y");
-                        }
-                        if (offset == 2)
-                        {
-                            bcatcstr(metal, ".z");
-                        }
-                        if (offset == 3)
-                        {
-                            bcatcstr(metal, ".w");
-                        }
-                    }
-                }
-                else
-                {
-                    ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psSrc->ui32RegisterNumber, 0);
-                    bcatcstr(metal, "[");
-                    TranslateOperandMETAL(psContext, psSrcAddr, TO_FLAG_INTEGER);
-                    bcatcstr(metal, "]");
-                    if (strcmp(psVar->Name, "$Element") != 0)
-                    {
-                        bcatcstr(metal, ".");
-                        bcatcstr(metal, psVar->Name);
-                        int swizcomponent = psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component;
-                        int byteOffset = ((int*)psSrcByteOff->afImmediates)[0] + 4 * swizcomponent;
-                        int bytes = byteOffset - psVar->Offset;
-                        if (psVar->Class == SVC_MATRIX_ROWS)
-                        {
-                            int offset = bytes / 16;
-                            bcatcstr(metal, "[");
-                            bformata(metal, "%i", offset);
-                            bcatcstr(metal, "]");
-                        }
-                        if (psVar->Class != SVC_SCALAR)
-                        {
-                            static const char* const m_swizzlers[] = { "x", "y", "z", "w" };
-
-                            int offset = (bytes % 16) / 4;
-                            if (offset == 0)
-                            {
-                                bcatcstr(metal, ".x");
-                            }
-                            if (offset == 1)
-                            {
-                                bcatcstr(metal, ".y");
-                            }
-                            if (offset == 2)
-                            {
-                                bcatcstr(metal, ".z");
-                            }
-                            if (offset == 3)
-                            {
-                                bcatcstr(metal, ".w");
-                            }
-                        }
-                    }
-                    else if (psVar->Columns > 1)
-                    {
-                        int swizcomponent = psSrc->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE ? psSrc->aui32Swizzle[component] : component;
-                        int byteOffset = ((int*)psSrcByteOff->afImmediates)[0] + 4 * swizcomponent;
-                        int bytes = byteOffset - psVar->Offset;
-
-                        static const char* const m_swizzlers[] = { "x", "y", "z", "w" };
-
-                        int offset = (bytes % 16) / 4;
-                        if (offset == 0)
-                        {
-                            bcatcstr(metal, ".x");
-                        }
-                        if (offset == 1)
-                        {
-                            bcatcstr(metal, ".y");
-                        }
-                        if (offset == 2)
-                        {
-                            bcatcstr(metal, ".z");
-                        }
-                        if (offset == 3)
-                        {
-                            bcatcstr(metal, ".w");
-                        }
-                    }
-                }
-
-                if (addedBitcast)
-                {
-                    bcatcstr(metal, "))");
-                }
-
-                if (psVar->Columns > 1)
-                {
-                    int multiplier = 1;
-
-                    if (psVar->Type == SVT_DOUBLE)
-                    {
-                        multiplier++; // doubles take up 2 slots
-                    }
-                    //component += psVar->Columns * multiplier;
-                }
-            }
-        }
-        METALAddAssignPrologue(psContext, numParenthesis);
-
-        return;
-    }
-}
-
-void TranslateAtomicMemOpMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst)
-{
-    bstring metal = *psContext->currentShaderString;
-    int numParenthesis = 0;
-    ShaderVarType* psVarType = NULL;
-    uint32_t ui32DataTypeFlag = TO_FLAG_UNSIGNED_INTEGER;
-    const char* func = "";
-    Operand* dest = 0;
-    Operand* previousValue = 0;
-    Operand* destAddr = 0;
-    Operand* src = 0;
-    Operand* compare = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_IMM_ATOMIC_IADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_IADD\n");
-#endif
-        func = "atomic_fetch_add_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_IADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_IADD\n");
-#endif
-        func = "atomic_fetch_add_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_AND:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_AND\n");
-#endif
-        func = "atomic_fetch_and_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_AND:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_AND\n");
-#endif
-        func = "atomic_fetch_and_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_OR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_OR\n");
-#endif
-        func = "atomic_fetch_or_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_OR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_OR\n");
-#endif
-        func = "atomic_fetch_or_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_XOR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_XOR\n");
-#endif
-        func = "atomic_fetch_xor_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_XOR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_XOR\n");
-#endif
-        func = "atomic_fetch_xor_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-
-    case OPCODE_IMM_ATOMIC_EXCH:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_EXCH\n");
-#endif
-        func = "atomic_exchange_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_CMP_EXCH:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_CMP_EXC\n");
-#endif
-        func = "atomic_compare_exchange_weak_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        compare = &psInst->asOperands[3];
-        src = &psInst->asOperands[4];
-        break;
-    }
-    case OPCODE_ATOMIC_CMP_STORE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_CMP_STORE\n");
-#endif
-        func = "atomic_compare_exchange_weak_explicit";
-        previousValue = 0;
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        compare = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_UMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_UMIN\n");
-#endif
-        func = "atomic_fetch_min_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_UMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_UMIN\n");
-#endif
-        func = "atomic_fetch_min_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_IMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_IMIN\n");
-#endif
-        func = "atomic_fetch_min_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_IMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_IMIN\n");
-#endif
-        func = "atomic_fetch_min_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_UMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_UMAX\n");
-#endif
-        func = "atomic_fetch_max_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_UMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_UMAX\n");
-#endif
-        func = "atomic_fetch_max_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    case OPCODE_IMM_ATOMIC_IMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMM_ATOMIC_IMAX\n");
-#endif
-        func = "atomic_fetch_max_explicit";
-        previousValue = &psInst->asOperands[0];
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        src = &psInst->asOperands[3];
-        break;
-    }
-    case OPCODE_ATOMIC_IMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ATOMIC_IMAX\n");
-#endif
-        func = "atomic_fetch_max_explicit";
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        src = &psInst->asOperands[2];
-        break;
-    }
-    }
-
-    AddIndentation(psContext);
-
-    if (previousValue)
-    {
-        //all atomic operation returns uint or int
-        METALAddAssignToDest(psContext, previousValue, SVT_UINT, 1, &numParenthesis);
-    }
-
-    bcatcstr(metal, func);
-    bformata(metal, "( &");
-    TranslateOperandMETAL(psContext, dest, TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY);
-
-    if (dest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-    {
-        //threadgroup shared mem
-        bformata(metal, "[");
-        TranslateOperandMETAL(psContext, destAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-        bformata(metal, "]");
-    }
-    else
-    {
-        ResourceBinding* psRes;
-#if defined(_DEBUG)
-        int foundResource =
-#endif
-            GetResourceFromBindingPoint(RGROUP_UAV,
-                dest->ui32RegisterNumber,
-                &psContext->psShader->sInfo,
-                &psRes);
-
-        ASSERT(foundResource);
-
-        if (psRes->eBindArea == UAVAREA_CBUFFER)
-        {
-            //rwbuffer
-            if (psRes->eType == RTYPE_UAV_RWTYPED)
-            {
-                bformata(metal, "[");
-                TranslateOperandMETAL(psContext, destAddr, TO_FLAG_INTEGER | TO_FLAG_UNSIGNED_INTEGER);
-                bformata(metal, "]");
-            }
-            //rwstructured buffer
-            else if (psRes->eType == RTYPE_UAV_RWSTRUCTURED)
-            {
-                if (destAddr->eType == OPERAND_TYPE_IMMEDIATE32)
-                {
-                    psVarType = METALLookupStructuredVarAtomic(psContext, dest, destAddr, 0);
-                }
-                if (psVarType->Type == SVT_UINT)
-                {
-                    ui32DataTypeFlag = TO_FLAG_UNSIGNED_INTEGER | TO_AUTO_BITCAST_TO_UINT;
-                }
-                else
-                {
-                    ui32DataTypeFlag = TO_FLAG_INTEGER | TO_AUTO_BITCAST_TO_INT;
-                }
-                bformata(metal, "[");
-                bformata(metal, "%i", *((int*)(&destAddr->afImmediates[0])));
-                bformata(metal, "]");
-                if (strcmp(psVarType->Name, "$Element") != 0)
-                {
-                    bformata(metal, ".%s", psVarType->Name);
-                }
-            }
-        }
-        else if (psRes->eBindArea == UAVAREA_TEXTURE)
-        {
-            //Atomic operation on texture uav not supported
-            ASSERT(0);
-        }
-        else
-        {
-            //UAV is not exist in either [[buffer]] or [[texture]]
-            ASSERT(0);
-        }
-    }
-    //ResourceNameMETAL(metal, psContext, RGROUP_UAV, dest->ui32RegisterNumber, 0);
-
-    bcatcstr(metal, ", ");
-
-    if (compare)
-    {
-        bcatcstr(metal, "& ");
-        TranslateOperandMETAL(psContext, compare, ui32DataTypeFlag);
-        bcatcstr(metal, ", ");
-    }
-
-    TranslateOperandMETAL(psContext, src, ui32DataTypeFlag);
-    bcatcstr(metal, ", ");
-    if (compare)
-    {
-        bcatcstr(metal, "memory_order_relaxed ");
-        bcatcstr(metal, ",");
-    }
-    bcatcstr(metal, "memory_order_relaxed ");
-    bcatcstr(metal, ")");
-    if (previousValue)
-    {
-        METALAddAssignPrologue(psContext, numParenthesis);
-    }
-    else
-    {
-        bcatcstr(metal, ";\n");
-    }
-}
-
-static void METALTranslateConditional(HLSLCrossCompilerContext* psContext,
-    Instruction* psInst,
-    bstring glsl)
-{
-    const char* statement = "";
-    if (psInst->eOpcode == OPCODE_BREAKC)
-    {
-        statement = "break";
-    }
-    else if (psInst->eOpcode == OPCODE_CONTINUEC)
-    {
-        statement = "continue";
-    }
-    else if (psInst->eOpcode == OPCODE_RETC)
-    {
-        statement = "return";
-    }
-
-    if (psInst->eBooleanTestType == INSTRUCTION_TEST_ZERO)
-    {
-        bcatcstr(glsl, "if((");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER);
-
-        if (psInst->eOpcode != OPCODE_IF)
-        {
-            bformata(glsl, ")==0u){%s;}\n", statement);
-        }
-        else
-        {
-            bcatcstr(glsl, ")==0u){\n");
-        }
-    }
-    else
-    {
-        ASSERT(psInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO);
-        bcatcstr(glsl, "if((");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER);
-
-        if (psInst->eOpcode != OPCODE_IF)
-        {
-            bformata(glsl, ")!=0u){%s;}\n", statement);
-        }
-        else
-        {
-            bcatcstr(glsl, ")!=0u){\n");
-        }
-    }
-}
-
-// Returns the "more important" type of a and b, currently int < uint < float
-static SHADER_VARIABLE_TYPE METALSelectHigherType(SHADER_VARIABLE_TYPE a, SHADER_VARIABLE_TYPE b)
-{
-    if (a == SVT_FLOAT || b == SVT_FLOAT)
-    {
-        return SVT_FLOAT;
-    }
-
-    if (a == SVT_FLOAT16 || b == SVT_FLOAT16)
-    {
-        return SVT_FLOAT16;
-    }
-    // Apart from floats, the enum values are fairly well-ordered, use that directly.
-    return a > b ? a : b;
-}
-
-// Helper function to set the vector type of 1 or more components in a vector
-// If the existing values (that we're writing to) are all SVT_VOID, just upgrade the value and we're done
-// Otherwise, set all the components in the vector that currently are set to that same value OR are now being written to
-// to the "highest" type value (ordering int->uint->float)
-static void METALSetVectorType(SHADER_VARIABLE_TYPE* aeTempVecType, uint32_t regBaseIndex, uint32_t componentMask, SHADER_VARIABLE_TYPE eType)
-{
-    int existingTypesFound = 0;
-    int i = 0;
-    for (i = 0; i < 4; i++)
-    {
-        if (componentMask & (1 << i))
-        {
-            if (aeTempVecType[regBaseIndex + i] != SVT_VOID)
-            {
-                existingTypesFound = 1;
-                break;
-            }
-        }
-    }
-
-    if (existingTypesFound != 0)
-    {
-        // Expand the mask to include all components that are used, also upgrade type
-        for (i = 0; i < 4; i++)
-        {
-            if (aeTempVecType[regBaseIndex + i] != SVT_VOID)
-            {
-                componentMask |= (1 << i);
-                eType = METALSelectHigherType(eType, aeTempVecType[regBaseIndex + i]);
-            }
-        }
-    }
-
-    // Now componentMask contains the components we actually need to update and eType may have been changed to something else.
-    // Write the results
-    for (i = 0; i < 4; i++)
-    {
-        if (componentMask & (1 << i))
-        {
-            aeTempVecType[regBaseIndex + i] = eType;
-        }
-    }
-}
-
-static void METALMarkOperandAs(Operand* psOperand, SHADER_VARIABLE_TYPE eType, SHADER_VARIABLE_TYPE* aeTempVecType)
-{
-    if (psOperand->eType == OPERAND_TYPE_INDEXABLE_TEMP || psOperand->eType == OPERAND_TYPE_TEMP)
-    {
-        const uint32_t ui32RegIndex = psOperand->ui32RegisterNumber * 4;
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            METALSetVectorType(aeTempVecType, ui32RegIndex, 1 << psOperand->aui32Swizzle[0], eType);
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            // 0xf == all components, swizzle order doesn't matter.
-            METALSetVectorType(aeTempVecType, ui32RegIndex, 0xf, eType);
-        }
-        else if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t ui32CompMask = psOperand->ui32CompMask;
-            if (!psOperand->ui32CompMask)
-            {
-                ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-            }
-
-            METALSetVectorType(aeTempVecType, ui32RegIndex, ui32CompMask, eType);
-        }
-    }
-}
-
-static void METALMarkAllOperandsAs(Instruction* psInst, SHADER_VARIABLE_TYPE eType, SHADER_VARIABLE_TYPE* aeTempVecType)
-{
-    uint32_t i = 0;
-    for (i = 0; i < psInst->ui32NumOperands; i++)
-    {
-        METALMarkOperandAs(&psInst->asOperands[i], eType, aeTempVecType);
-    }
-}
-
-static void METALWriteOperandTypes(Operand* psOperand, const SHADER_VARIABLE_TYPE* aeTempVecType)
-{
-    const uint32_t ui32RegIndex = psOperand->ui32RegisterNumber * 4;
-
-    if (psOperand->eType != OPERAND_TYPE_TEMP)
-    {
-        return;
-    }
-
-    if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-    {
-        psOperand->aeDataType[psOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-    }
-    else if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-    {
-        if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-        {
-            psOperand->aeDataType[0] = aeTempVecType[ui32RegIndex];
-            psOperand->aeDataType[1] = aeTempVecType[ui32RegIndex + 1];
-            psOperand->aeDataType[2] = aeTempVecType[ui32RegIndex + 2];
-            psOperand->aeDataType[3] = aeTempVecType[ui32RegIndex + 3];
-        }
-        else
-        {
-            psOperand->aeDataType[psOperand->aui32Swizzle[0]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[0]];
-            psOperand->aeDataType[psOperand->aui32Swizzle[1]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[1]];
-            psOperand->aeDataType[psOperand->aui32Swizzle[2]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[2]];
-            psOperand->aeDataType[psOperand->aui32Swizzle[3]] = aeTempVecType[ui32RegIndex + psOperand->aui32Swizzle[3]];
-        }
-    }
-    else if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-    {
-        int c = 0;
-        uint32_t ui32CompMask = psOperand->ui32CompMask;
-        if (!psOperand->ui32CompMask)
-        {
-            ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-        }
-
-        for (; c < 4; ++c)
-        {
-            if (ui32CompMask & (1 << c))
-            {
-                psOperand->aeDataType[c] = aeTempVecType[ui32RegIndex + c];
-            }
-        }
-    }
-}
-
-// Mark scalars from CBs. TODO: Do we need to do the same for vec2/3's as well? There may be swizzles involved which make it vec4 or something else again.
-static void METALSetCBOperandComponents(HLSLCrossCompilerContext* psContext, Operand* psOperand)
-{
-    ConstantBuffer* psCBuf = NULL;
-    ShaderVarType* psVarType = NULL;
-    int32_t index = -1;
-    int rebase = 0;
-
-    if (psOperand->eType != OPERAND_TYPE_CONSTANT_BUFFER)
-    {
-        return;
-    }
-
-    GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-    GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-
-    if (psVarType->Class == SVC_SCALAR)
-    {
-        psOperand->iNumComponents = 1;
-    }
-}
-
-
-void SetDataTypesMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, const int32_t i32InstCount)
-{
-    int32_t i;
-    Instruction* psFirstInst = psInst;
-
-    SHADER_VARIABLE_TYPE aeTempVecType[MAX_TEMP_VEC4 * 4];
-
-    // Start with void, then move up the chain void->int->uint->float
-    for (i = 0; i < MAX_TEMP_VEC4 * 4; ++i)
-    {
-        aeTempVecType[i] = SVT_VOID;
-    }
-
-    {
-        // First pass, do analysis: deduce the data type based on opcodes, fill out aeTempVecType table
-        // Only ever to int->float promotion (or int->uint), never the other way around
-        for (i = 0; i < i32InstCount; ++i, psInst++)
-        {
-            if (psInst->ui32NumOperands == 0)
-            {
-                continue;
-            }
-
-            switch (psInst->eOpcode)
-            {
-            // All float-only ops
-            case OPCODE_ADD:
-            case OPCODE_DERIV_RTX:
-            case OPCODE_DERIV_RTY:
-            case OPCODE_DIV:
-            case OPCODE_DP2:
-            case OPCODE_DP3:
-            case OPCODE_DP4:
-            case OPCODE_EQ:
-            case OPCODE_EXP:
-            case OPCODE_FRC:
-            case OPCODE_LOG:
-            case OPCODE_MAD:
-            case OPCODE_MIN:
-            case OPCODE_MAX:
-            case OPCODE_MUL:
-            case OPCODE_NE:
-            case OPCODE_ROUND_NE:
-            case OPCODE_ROUND_NI:
-            case OPCODE_ROUND_PI:
-            case OPCODE_ROUND_Z:
-            case OPCODE_RSQ:
-            case OPCODE_SAMPLE:
-            case OPCODE_SAMPLE_C:
-            case OPCODE_SAMPLE_C_LZ:
-            case OPCODE_SAMPLE_L:
-            case OPCODE_SAMPLE_D:
-            case OPCODE_SAMPLE_B:
-            case OPCODE_SQRT:
-            case OPCODE_SINCOS:
-            case OPCODE_LOD:
-            case OPCODE_GATHER4:
-
-            case OPCODE_DERIV_RTX_COARSE:
-            case OPCODE_DERIV_RTX_FINE:
-            case OPCODE_DERIV_RTY_COARSE:
-            case OPCODE_DERIV_RTY_FINE:
-            case OPCODE_GATHER4_C:
-            case OPCODE_GATHER4_PO:
-            case OPCODE_GATHER4_PO_C:
-            case OPCODE_RCP:
-
-                METALMarkAllOperandsAs(psInst, SVT_FLOAT, aeTempVecType);
-                break;
-
-            // Int-only ops, no need to do anything
-            case OPCODE_AND:
-            case OPCODE_BREAKC:
-            case OPCODE_CALLC:
-            case OPCODE_CONTINUEC:
-            case OPCODE_IADD:
-            case OPCODE_IEQ:
-            case OPCODE_IGE:
-            case OPCODE_ILT:
-            case OPCODE_IMAD:
-            case OPCODE_IMAX:
-            case OPCODE_IMIN:
-            case OPCODE_IMUL:
-            case OPCODE_INE:
-            case OPCODE_INEG:
-            case OPCODE_ISHL:
-            case OPCODE_ISHR:
-            case OPCODE_IF:
-            case OPCODE_NOT:
-            case OPCODE_OR:
-            case OPCODE_RETC:
-            case OPCODE_XOR:
-            case OPCODE_BUFINFO:
-            case OPCODE_COUNTBITS:
-            case OPCODE_FIRSTBIT_HI:
-            case OPCODE_FIRSTBIT_LO:
-            case OPCODE_FIRSTBIT_SHI:
-            case OPCODE_UBFE:
-            case OPCODE_IBFE:
-            case OPCODE_BFI:
-            case OPCODE_BFREV:
-            case OPCODE_ATOMIC_AND:
-            case OPCODE_ATOMIC_OR:
-            case OPCODE_ATOMIC_XOR:
-            case OPCODE_ATOMIC_CMP_STORE:
-            case OPCODE_ATOMIC_IADD:
-            case OPCODE_ATOMIC_IMAX:
-            case OPCODE_ATOMIC_IMIN:
-            case OPCODE_ATOMIC_UMAX:
-            case OPCODE_ATOMIC_UMIN:
-            case OPCODE_IMM_ATOMIC_ALLOC:
-            case OPCODE_IMM_ATOMIC_CONSUME:
-            case OPCODE_IMM_ATOMIC_IADD:
-            case OPCODE_IMM_ATOMIC_AND:
-            case OPCODE_IMM_ATOMIC_OR:
-            case OPCODE_IMM_ATOMIC_XOR:
-            case OPCODE_IMM_ATOMIC_EXCH:
-            case OPCODE_IMM_ATOMIC_CMP_EXCH:
-            case OPCODE_IMM_ATOMIC_IMAX:
-            case OPCODE_IMM_ATOMIC_IMIN:
-            case OPCODE_IMM_ATOMIC_UMAX:
-            case OPCODE_IMM_ATOMIC_UMIN:
-            case OPCODE_MOV:
-            case OPCODE_MOVC:
-            case OPCODE_SWAPC:
-                METALMarkAllOperandsAs(psInst, SVT_INT, aeTempVecType);
-                break;
-            // uint ops
-            case OPCODE_UDIV:
-            case OPCODE_ULT:
-            case OPCODE_UGE:
-            case OPCODE_UMUL:
-            case OPCODE_UMAD:
-            case OPCODE_UMAX:
-            case OPCODE_UMIN:
-            case OPCODE_USHR:
-            case OPCODE_UADDC:
-            case OPCODE_USUBB:
-                METALMarkAllOperandsAs(psInst, SVT_UINT, aeTempVecType);
-                break;
-
-            // Need special handling
-            case OPCODE_FTOI:
-            case OPCODE_FTOU:
-                METALMarkOperandAs(&psInst->asOperands[0], psInst->eOpcode == OPCODE_FTOI ? SVT_INT : SVT_UINT, aeTempVecType);
-                METALMarkOperandAs(&psInst->asOperands[1], SVT_FLOAT, aeTempVecType);
-                break;
-
-            case OPCODE_GE:
-            case OPCODE_LT:
-                METALMarkOperandAs(&psInst->asOperands[0], SVT_UINT, aeTempVecType);
-                METALMarkOperandAs(&psInst->asOperands[1], SVT_FLOAT, aeTempVecType);
-                METALMarkOperandAs(&psInst->asOperands[2], SVT_FLOAT, aeTempVecType);
-                break;
-
-            case OPCODE_ITOF:
-            case OPCODE_UTOF:
-                METALMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                METALMarkOperandAs(&psInst->asOperands[1], psInst->eOpcode == OPCODE_ITOF ? SVT_INT : SVT_UINT, aeTempVecType);
-                break;
-
-            case OPCODE_LD:
-            case OPCODE_LD_MS:
-                // TODO: Would need to know the sampler return type
-                METALMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                break;
-
-
-            case OPCODE_RESINFO:
-            {
-                if (psInst->eResInfoReturnType != RESINFO_INSTRUCTION_RETURN_UINT)
-                {
-                    METALMarkAllOperandsAs(psInst, SVT_FLOAT, aeTempVecType);
-                }
-                break;
-            }
-
-            case OPCODE_SAMPLE_INFO:
-                // TODO decode the _uint flag
-                METALMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                break;
-
-            case OPCODE_SAMPLE_POS:
-                METALMarkOperandAs(&psInst->asOperands[0], SVT_FLOAT, aeTempVecType);
-                break;
-
-
-            case OPCODE_LD_UAV_TYPED:
-            case OPCODE_STORE_UAV_TYPED:
-            case OPCODE_LD_RAW:
-            case OPCODE_STORE_RAW:
-            case OPCODE_LD_STRUCTURED:
-            case OPCODE_STORE_STRUCTURED:
-            {
-                METALMarkOperandAs(&psInst->asOperands[0], SVT_INT, aeTempVecType);
-                break;
-            }
-            case OPCODE_F32TOF16:
-            case OPCODE_F16TOF32:
-                // TODO
-                break;
-
-
-
-            // No-operands, should never get here anyway
-            /*              case OPCODE_BREAK:
-            case OPCODE_CALL:
-            case OPCODE_CASE:
-            case OPCODE_CONTINUE:
-            case OPCODE_CUT:
-            case OPCODE_DEFAULT:
-            case OPCODE_DISCARD:
-            case OPCODE_ELSE:
-            case OPCODE_EMIT:
-            case OPCODE_EMITTHENCUT:
-            case OPCODE_ENDIF:
-            case OPCODE_ENDLOOP:
-            case OPCODE_ENDSWITCH:
-
-            case OPCODE_LABEL:
-            case OPCODE_LOOP:
-            case OPCODE_CUSTOMDATA:
-            case OPCODE_NOP:
-            case OPCODE_RET:
-            case OPCODE_SWITCH:
-            case OPCODE_DCL_RESOURCE: // DCL* opcodes have
-            case OPCODE_DCL_CONSTANT_BUFFER: // custom operand formats.
-            case OPCODE_DCL_SAMPLER:
-            case OPCODE_DCL_INDEX_RANGE:
-            case OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
-            case OPCODE_DCL_GS_INPUT_PRIMITIVE:
-            case OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
-            case OPCODE_DCL_INPUT:
-            case OPCODE_DCL_INPUT_SGV:
-            case OPCODE_DCL_INPUT_SIV:
-            case OPCODE_DCL_INPUT_PS:
-            case OPCODE_DCL_INPUT_PS_SGV:
-            case OPCODE_DCL_INPUT_PS_SIV:
-            case OPCODE_DCL_OUTPUT:
-            case OPCODE_DCL_OUTPUT_SGV:
-            case OPCODE_DCL_OUTPUT_SIV:
-            case OPCODE_DCL_TEMPS:
-            case OPCODE_DCL_INDEXABLE_TEMP:
-            case OPCODE_DCL_GLOBAL_FLAGS:
-
-
-            case OPCODE_HS_DECLS: // token marks beginning of HS sub-shader
-            case OPCODE_HS_CONTROL_POINT_PHASE: // token marks beginning of HS sub-shader
-            case OPCODE_HS_FORK_PHASE: // token marks beginning of HS sub-shader
-            case OPCODE_HS_JOIN_PHASE: // token marks beginning of HS sub-shader
-
-            case OPCODE_EMIT_STREAM:
-            case OPCODE_CUT_STREAM:
-            case OPCODE_EMITTHENCUT_STREAM:
-            case OPCODE_INTERFACE_CALL:
-
-
-            case OPCODE_DCL_STREAM:
-            case OPCODE_DCL_FUNCTION_BODY:
-            case OPCODE_DCL_FUNCTION_TABLE:
-            case OPCODE_DCL_INTERFACE:
-
-            case OPCODE_DCL_INPUT_CONTROL_POINT_COUNT:
-            case OPCODE_DCL_OUTPUT_CONTROL_POINT_COUNT:
-            case OPCODE_DCL_TESS_DOMAIN:
-            case OPCODE_DCL_TESS_PARTITIONING:
-            case OPCODE_DCL_TESS_OUTPUT_PRIMITIVE:
-            case OPCODE_DCL_HS_MAX_TESSFACTOR:
-            case OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT:
-            case OPCODE_DCL_HS_JOIN_PHASE_INSTANCE_COUNT:
-
-            case OPCODE_DCL_THREAD_GROUP:
-            case OPCODE_DCL_UNORDERED_ACCESS_VIEW_TYPED:
-            case OPCODE_DCL_UNORDERED_ACCESS_VIEW_RAW:
-            case OPCODE_DCL_UNORDERED_ACCESS_VIEW_STRUCTURED:
-            case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW:
-            case OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED:
-            case OPCODE_DCL_RESOURCE_RAW:
-            case OPCODE_DCL_RESOURCE_STRUCTURED:
-            case OPCODE_SYNC:
-
-            // TODO
-            case OPCODE_DADD:
-            case OPCODE_DMAX:
-            case OPCODE_DMIN:
-            case OPCODE_DMUL:
-            case OPCODE_DEQ:
-            case OPCODE_DGE:
-            case OPCODE_DLT:
-            case OPCODE_DNE:
-            case OPCODE_DMOV:
-            case OPCODE_DMOVC:
-            case OPCODE_DTOF:
-            case OPCODE_FTOD:
-
-            case OPCODE_EVAL_SNAPPED:
-            case OPCODE_EVAL_SAMPLE_INDEX:
-            case OPCODE_EVAL_CENTROID:
-
-            case OPCODE_DCL_GS_INSTANCE_COUNT:
-
-            case OPCODE_ABORT:
-            case OPCODE_DEBUG_BREAK:*/
-
-            default:
-                break;
-            }
-        }
-    }
-
-    // Fill the rest of aeTempVecType, just in case.
-    for (i = 0; i < MAX_TEMP_VEC4 * 4; i++)
-    {
-        if (aeTempVecType[i] == SVT_VOID)
-        {
-            aeTempVecType[i] = SVT_INT;
-        }
-    }
-
-    // Now the aeTempVecType table has been filled with (mostly) valid data, write it back to all operands
-    psInst = psFirstInst;
-    for (i = 0; i < i32InstCount; ++i, psInst++)
-    {
-        int k = 0;
-
-        if (psInst->ui32NumOperands == 0)
-        {
-            continue;
-        }
-
-        //Preserve the current type on dest array index
-        if (psInst->asOperands[0].eType == OPERAND_TYPE_INDEXABLE_TEMP)
-        {
-            Operand* psSubOperand = psInst->asOperands[0].psSubOperand[1];
-            if (psSubOperand != 0)
-            {
-                METALWriteOperandTypes(psSubOperand, aeTempVecType);
-            }
-        }
-        if (psInst->asOperands[0].eType == OPERAND_TYPE_CONSTANT_BUFFER)
-        {
-            METALSetCBOperandComponents(psContext, &psInst->asOperands[0]);
-        }
-
-        //Preserve the current type on sources.
-        for (k = psInst->ui32NumOperands - 1; k >= (int)psInst->ui32FirstSrc; --k)
-        {
-            int32_t subOperand;
-            Operand* psOperand = &psInst->asOperands[k];
-
-            METALWriteOperandTypes(psOperand, aeTempVecType);
-            if (psOperand->eType == OPERAND_TYPE_CONSTANT_BUFFER)
-            {
-                METALSetCBOperandComponents(psContext, psOperand);
-            }
-
-            for (subOperand = 0; subOperand < MAX_SUB_OPERANDS; subOperand++)
-            {
-                if (psOperand->psSubOperand[subOperand] != 0)
-                {
-                    Operand* psSubOperand = psOperand->psSubOperand[subOperand];
-                    METALWriteOperandTypes(psSubOperand, aeTempVecType);
-                    if (psSubOperand->eType == OPERAND_TYPE_CONSTANT_BUFFER)
-                    {
-                        METALSetCBOperandComponents(psContext, psSubOperand);
-                    }
-                }
-            }
-
-            //Set immediates
-            if (METALIsIntegerImmediateOpcode(psInst->eOpcode))
-            {
-                if (psOperand->eType == OPERAND_TYPE_IMMEDIATE32)
-                {
-                    psOperand->iIntegerImmediate = 1;
-                }
-            }
-        }
-
-        //Process the destination last in order to handle instructions
-        //where the destination register is also used as a source.
-        for (k = 0; k < (int)psInst->ui32FirstSrc; ++k)
-        {
-            Operand* psOperand = &psInst->asOperands[k];
-            METALWriteOperandTypes(psOperand, aeTempVecType);
-        }
-    }
-}
-
-void DetectAtomicInstructionMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, Instruction* psNextInst, AtomicVarList* psAtomicList)
-{
-    (void)psNextInst;
-
-    Operand* dest = 0;
-    Operand* destAddr = 0;
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_ATOMIC_CMP_STORE:
-    case OPCODE_ATOMIC_AND:
-    case OPCODE_ATOMIC_IADD:
-    case OPCODE_ATOMIC_OR:
-    case OPCODE_ATOMIC_XOR:
-    case OPCODE_ATOMIC_IMIN:
-    case OPCODE_ATOMIC_UMIN:
-    case OPCODE_ATOMIC_UMAX:
-    case OPCODE_ATOMIC_IMAX:
-        dest = &psInst->asOperands[0];
-        destAddr = &psInst->asOperands[1];
-        break;
-    case OPCODE_IMM_ATOMIC_IADD:
-    case OPCODE_IMM_ATOMIC_IMAX:
-    case OPCODE_IMM_ATOMIC_IMIN:
-    case OPCODE_IMM_ATOMIC_UMAX:
-    case OPCODE_IMM_ATOMIC_UMIN:
-    case OPCODE_IMM_ATOMIC_OR:
-    case OPCODE_IMM_ATOMIC_XOR:
-    case OPCODE_IMM_ATOMIC_EXCH:
-    case OPCODE_IMM_ATOMIC_CMP_EXCH:
-    case OPCODE_IMM_ATOMIC_AND:
-        dest = &psInst->asOperands[1];
-        destAddr = &psInst->asOperands[2];
-        break;
-    default:
-        return;
-    }
-
-    if (dest->eType == OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY)
-    {
-    }
-    else
-    {
-        ResourceBinding* psRes;
-#if defined(_DEBUG)
-        int foundResource =
-#endif
-            GetResourceFromBindingPoint(RGROUP_UAV,
-                dest->ui32RegisterNumber,
-                &psContext->psShader->sInfo,
-                &psRes);
-
-        ASSERT(foundResource);
-
-        {
-            //rwbuffer
-            if (psRes->eType == RTYPE_UAV_RWTYPED)
-            {
-            }
-            //rwstructured buffer
-            else if (psRes->eType == RTYPE_UAV_RWSTRUCTURED)
-            {
-                if (destAddr->eType == OPERAND_TYPE_IMMEDIATE32)
-                {
-                    psAtomicList->AtomicVars[psAtomicList->Filled] = METALLookupStructuredVarAtomic(psContext, dest, destAddr, 0);
-                    psAtomicList->Filled++;
-                }
-            }
-        }
-    }
-}
-
-void TranslateInstructionMETAL(HLSLCrossCompilerContext* psContext, Instruction* psInst, Instruction* psNextInst)
-{
-    bstring metal = *psContext->currentShaderString;
-    int numParenthesis = 0;
-
-#ifdef _DEBUG
-    AddIndentation(psContext);
-    bformata(metal, "//Instruction %d\n", psInst->id);
-#if 0
-    if (psInst->id == 73)
-    {
-        ASSERT(1); //Set breakpoint here to debug an instruction from its ID.
-    }
-#endif
-#endif
-
-    switch (psInst->eOpcode)
-    {
-    case OPCODE_FTOI:
-    case OPCODE_FTOU:
-    {
-        uint32_t dstCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-        uint32_t srcCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[1]);
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_FTOU)
-        {
-            bcatcstr(metal, "//FTOU\n");
-        }
-        else
-        {
-            bcatcstr(metal, "//FTOI\n");
-        }
-#endif
-
-        AddIndentation(psContext);
-
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], psInst->eOpcode == OPCODE_FTOU ? SVT_UINT : SVT_INT, srcCount, &numParenthesis);
-        bcatcstr(metal, GetConstructorForTypeMETAL(psInst->eOpcode == OPCODE_FTOU ? SVT_UINT : SVT_INT, srcCount == dstCount ? dstCount : 4));
-        bcatcstr(metal, "("); // 1
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_AUTO_BITCAST_TO_FLOAT);
-        bcatcstr(metal, ")"); // 1
-        // Add destination writemask if the component counts do not match
-        if (srcCount != dstCount)
-        {
-            AddSwizzleUsingElementCountMETAL(psContext, dstCount);
-        }
-        METALAddAssignPrologue(psContext, numParenthesis);
-        break;
-    }
-
-    case OPCODE_MOV:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//MOV\n");
-#endif
-        AddIndentation(psContext);
-        METALAddMOVBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[1]);
-        break;
-    }
-    case OPCODE_ITOF://signed to float
-    case OPCODE_UTOF://unsigned to float
-    {
-        uint32_t dstCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-        uint32_t srcCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[1]);
-        uint32_t destMask = GetOperandWriteMaskMETAL(&psInst->asOperands[0]);
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_ITOF)
-        {
-            bcatcstr(metal, "//ITOF\n");
-        }
-        else
-        {
-            bcatcstr(metal, "//UTOF\n");
-        }
-#endif
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, srcCount, &numParenthesis);
-        bcatcstr(metal, GetConstructorForTypeMETAL(SVT_FLOAT, dstCount));
-        bcatcstr(metal, "("); // 1
-        TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[1], psInst->eOpcode == OPCODE_UTOF ? TO_AUTO_BITCAST_TO_UINT : TO_AUTO_BITCAST_TO_INT, destMask);
-        bcatcstr(metal, ")"); // 1
-        // Add destination writemask if the component counts do not match
-        if (srcCount != dstCount)
-        {
-            AddSwizzleUsingElementCountMETAL(psContext, dstCount);
-        }
-        METALAddAssignPrologue(psContext, numParenthesis);
-        break;
-    }
-    case OPCODE_MAD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//MAD\n");
-#endif
-        METALCallTernaryOp(psContext, "*", "+", psInst, 0, 1, 2, 3, TO_FLAG_NONE);
-        break;
-    }
-    case OPCODE_IMAD:
-    {
-        uint32_t ui32Flags = TO_FLAG_INTEGER;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMAD\n");
-#endif
-
-        if (GetOperandDataTypeMETAL(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            ui32Flags = TO_FLAG_UNSIGNED_INTEGER;
-        }
-
-        METALCallTernaryOp(psContext, "*", "+", psInst, 0, 1, 2, 3, ui32Flags);
-        break;
-    }
-    case OPCODE_DADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DADD\n");
-#endif
-        METALCallBinaryOp(psContext, "+", psInst, 0, 1, 2, SVT_DOUBLE);
-        break;
-    }
-    case OPCODE_IADD:
-    {
-        SHADER_VARIABLE_TYPE eType = SVT_INT;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IADD\n");
-#endif
-        //Is this a signed or unsigned add?
-        if (GetOperandDataTypeMETAL(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            eType = SVT_UINT;
-        }
-        METALCallBinaryOp(psContext, "+", psInst, 0, 1, 2, eType);
-        break;
-    }
-    case OPCODE_ADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ADD\n");
-#endif
-        METALCallBinaryOp(psContext, "+", psInst, 0, 1, 2, SVT_FLOAT);
-        break;
-    }
-    case OPCODE_OR:
-    {
-        /*Todo: vector version */
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//OR\n");
-#endif
-        METALCallBinaryOp(psContext, "|", psInst, 0, 1, 2, SVT_UINT);
-        break;
-    }
-    case OPCODE_AND:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//AND\n");
-#endif
-        METALCallBinaryOp(psContext, "&", psInst, 0, 1, 2, SVT_UINT);
-        break;
-    }
-    case OPCODE_GE:
-    {
-        /*
-        dest = vec4(greaterThanEqual(vec4(srcA), vec4(srcB));
-        Caveat: The result is a boolean but HLSL asm returns 0xFFFFFFFF/0x0 instead.
-        */
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//GE\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_GE, TO_FLAG_NONE, NULL);
-        break;
-    }
-    case OPCODE_MUL:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//MUL\n");
-#endif
-        METALCallBinaryOp(psContext, "*", psInst, 0, 1, 2, SVT_FLOAT);
-        break;
-    }
-    case OPCODE_IMUL:
-    {
-        SHADER_VARIABLE_TYPE eType = SVT_INT;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMUL\n");
-#endif
-        if (GetOperandDataTypeMETAL(psContext, &psInst->asOperands[1]) == SVT_UINT)
-        {
-            eType = SVT_UINT;
-        }
-
-        ASSERT(psInst->asOperands[0].eType == OPERAND_TYPE_NULL);
-
-        METALCallBinaryOp(psContext, "*", psInst, 1, 2, 3, eType);
-        break;
-    }
-    case OPCODE_UDIV:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//UDIV\n");
-#endif
-        //destQuotient, destRemainder, src0, src1
-        METALCallBinaryOp(psContext, "/", psInst, 0, 2, 3, SVT_UINT);
-        METALCallBinaryOp(psContext, "%", psInst, 1, 2, 3, SVT_UINT);
-        break;
-    }
-    case OPCODE_DIV:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DIV\n");
-#endif
-        METALCallBinaryOp(psContext, "/", psInst, 0, 1, 2, SVT_FLOAT);
-        break;
-    }
-    case OPCODE_SINCOS:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SINCOS\n");
-#endif
-        // Need careful ordering if src == dest[0], as then the cos() will be reading from wrong value
-        if (psInst->asOperands[0].eType == psInst->asOperands[2].eType &&
-            psInst->asOperands[0].ui32RegisterNumber == psInst->asOperands[2].ui32RegisterNumber)
-        {
-            // sin() result overwrites source, do cos() first.
-            // The case where both write the src shouldn't really happen anyway.
-            if (psInst->asOperands[1].eType != OPERAND_TYPE_NULL)
-            {
-                METALCallHelper1(psContext, "cos", psInst, 1, 2, 1);
-            }
-
-            if (psInst->asOperands[0].eType != OPERAND_TYPE_NULL)
-            {
-                METALCallHelper1(psContext, "sin", psInst, 0, 2, 1);
-            }
-        }
-        else
-        {
-            if (psInst->asOperands[0].eType != OPERAND_TYPE_NULL)
-            {
-                METALCallHelper1(psContext, "sin", psInst, 0, 2, 1);
-            }
-
-            if (psInst->asOperands[1].eType != OPERAND_TYPE_NULL)
-            {
-                METALCallHelper1(psContext, "cos", psInst, 1, 2, 1);
-            }
-        }
-        break;
-    }
-
-    case OPCODE_DP2:
-    {
-        SHADER_VARIABLE_TYPE eDestDataType = GetOperandDataTypeMETAL(psContext, &psInst->asOperands[0]);
-        int numParenthesis2 = 0;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DP2\n");
-#endif
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, 1, &numParenthesis2);
-        bcatcstr(metal, "dot(");
-        TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[1], TO_AUTO_BITCAST_TO_FLOAT | SVTTypeToFlagMETAL(eDestDataType), 3 /* .xy */);
-        bcatcstr(metal, ", ");
-        TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[2], TO_AUTO_BITCAST_TO_FLOAT | SVTTypeToFlagMETAL(eDestDataType), 3 /* .xy */);
-        bcatcstr(metal, ")");
-        METALAddAssignPrologue(psContext, numParenthesis2);
-        break;
-    }
-    case OPCODE_DP3:
-    {
-        SHADER_VARIABLE_TYPE eDestDataType = GetOperandDataTypeMETAL(psContext, &psInst->asOperands[0]);
-        int numParenthesis2 = 0;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DP3\n");
-#endif
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, 1, &numParenthesis2);
-        bcatcstr(metal, "dot(");
-        TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[1], TO_AUTO_BITCAST_TO_FLOAT | SVTTypeToFlagMETAL(eDestDataType), 7 /* .xyz */);
-        bcatcstr(metal, ", ");
-        TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[2], TO_AUTO_BITCAST_TO_FLOAT | SVTTypeToFlagMETAL(eDestDataType), 7 /* .xyz */);
-        bcatcstr(metal, ")");
-        METALAddAssignPrologue(psContext, numParenthesis2);
-        break;
-    }
-    case OPCODE_DP4:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DP4\n");
-#endif
-        METALCallHelper2(psContext, "dot", psInst, 0, 1, 2, 0);
-        break;
-    }
-    case OPCODE_INE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//INE\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_NE, TO_FLAG_INTEGER, NULL);
-        break;
-    }
-    case OPCODE_NE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//NE\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_NE, TO_FLAG_NONE, NULL);
-        break;
-    }
-    case OPCODE_IGE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IGE\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_GE, TO_FLAG_INTEGER, psNextInst);
-        break;
-    }
-    case OPCODE_ILT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ILT\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_LT, TO_FLAG_INTEGER, NULL);
-        break;
-    }
-    case OPCODE_LT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LT\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_LT, TO_FLAG_NONE, NULL);
-        break;
-    }
-    case OPCODE_IEQ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IEQ\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_EQ, TO_FLAG_INTEGER, NULL);
-        break;
-    }
-    case OPCODE_ULT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ULT\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_LT, TO_FLAG_UNSIGNED_INTEGER, NULL);
-        break;
-    }
-    case OPCODE_UGE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//UGE\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_GE, TO_FLAG_UNSIGNED_INTEGER, NULL);
-        break;
-    }
-    case OPCODE_MOVC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//MOVC\n");
-#endif
-        METALAddMOVCBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[1], &psInst->asOperands[2], &psInst->asOperands[3]);
-        break;
-    }
-    case OPCODE_SWAPC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SWAPC\n");
-#endif
-        // TODO needs temps!!
-        METALAddMOVCBinaryOp(psContext, &psInst->asOperands[0], &psInst->asOperands[2], &psInst->asOperands[4], &psInst->asOperands[3]);
-        METALAddMOVCBinaryOp(psContext, &psInst->asOperands[1], &psInst->asOperands[2], &psInst->asOperands[3], &psInst->asOperands[4]);
-        break;
-    }
-
-    case OPCODE_LOG:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LOG\n");
-#endif
-        METALCallHelper1(psContext, "log2", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_RSQ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//RSQ\n");
-#endif
-        METALCallHelper1(psContext, "rsqrt", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_EXP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//EXP\n");
-#endif
-        METALCallHelper1(psContext, "exp2", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_SQRT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SQRT\n");
-#endif
-        METALCallHelper1(psContext, "sqrt", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_ROUND_PI:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ROUND_PI\n");
-#endif
-        METALCallHelper1(psContext, "ceil", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_ROUND_NI:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ROUND_NI\n");
-#endif
-        METALCallHelper1(psContext, "floor", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_ROUND_Z:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ROUND_Z\n");
-#endif
-        METALCallHelper1(psContext, "trunc", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_ROUND_NE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ROUND_NE\n");
-#endif
-        METALCallHelper1(psContext, "rint", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_FRC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//FRC\n");
-#endif
-        METALCallHelper1(psContext, "fract", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_IMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMAX\n");
-#endif
-        METALCallHelper2Int(psContext, "max", psInst, 0, 1, 2, 1);
-        break;
-    }
-    case OPCODE_MAX:
-    case OPCODE_UMAX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//MAX\n");
-#endif
-        METALCallHelper2(psContext, "max", psInst, 0, 1, 2, 1);
-        break;
-    }
-    case OPCODE_IMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IMIN\n");
-#endif
-        METALCallHelper2Int(psContext, "min", psInst, 0, 1, 2, 1);
-        break;
-    }
-    case OPCODE_MIN:
-    case OPCODE_UMIN:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//MIN\n");
-#endif
-        METALCallHelper2(psContext, "min", psInst, 0, 1, 2, 1);
-        break;
-    }
-    case OPCODE_GATHER4:
-    case OPCODE_GATHER4_C:
-    {
-        //dest, coords, tex, sampler
-        const RESOURCE_DIMENSION eResDim = psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber];
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_GATHER4_C)
-        {
-            bcatcstr(metal, "//GATHER4_C\n");
-        }
-        else
-        {
-            bcatcstr(metal, "//GATHER4\n");
-        }
-#endif
-        //gather4 r7.xyzw, r3.xyxx, t3.xyzw, s0.x
-        AddIndentation(psContext); // TODO FIXME integer samplers
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, GetNumSwizzleElementsMETAL(&psInst->asOperands[2]), &numParenthesis);
-        bcatcstr(metal, "(");
-
-        ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, 0);
-
-        bcatcstr(metal, ".gather(");
-        bconcat(metal, TextureSamplerNameMETAL(&psContext->psShader->sInfo, psInst->asOperands[2].ui32RegisterNumber, psInst->asOperands[3].ui32RegisterNumber, psInst->eOpcode == OPCODE_GATHER4_PO_C));
-        bcatcstr(metal, ", ");
-        METALTranslateTexCoord(psContext, eResDim, &psInst->asOperands[1]);
-
-        if (psInst->eOpcode == OPCODE_GATHER4_C)
-        {
-            bcatcstr(metal, ", ");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[4], TO_FLAG_NONE);
-        }
-        bcatcstr(metal, ")");
-
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[2]);
-        bcatcstr(metal, ")");
-
-        AddSwizzleUsingElementCountMETAL(psContext, GetNumSwizzleElementsMETAL(&psInst->asOperands[0]));
-        METALAddAssignPrologue(psContext, numParenthesis);
-        break;
-    }
-    case OPCODE_GATHER4_PO:
-    case OPCODE_GATHER4_PO_C:
-    {
-        //dest, coords, offset, tex, sampler, srcReferenceValue
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_GATHER4_PO_C)
-        {
-            bcatcstr(metal, "//GATHER4_PO_C\n");
-        }
-        else
-        {
-            bcatcstr(metal, "//GATHER4_PO\n");
-        }
-#endif
-
-        AddIndentation(psContext); // TODO FIXME integer samplers
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, GetNumSwizzleElementsMETAL(&psInst->asOperands[2]), &numParenthesis);
-        bcatcstr(metal, "(");
-
-        ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psInst->asOperands[3].ui32RegisterNumber, 0);
-
-        bcatcstr(metal, ".gather(");
-        bconcat(metal, TextureSamplerNameMETAL(&psContext->psShader->sInfo, psInst->asOperands[3].ui32RegisterNumber, psInst->asOperands[4].ui32RegisterNumber, psInst->eOpcode == OPCODE_GATHER4_PO_C));
-
-        bcatcstr(metal, ", ");
-        //Texture coord cannot be vec4
-        //Determining if it is a vec3 for vec2 yet to be done.
-        psInst->asOperands[1].aui32Swizzle[2] = 0xFFFFFFFF;
-        psInst->asOperands[1].aui32Swizzle[3] = 0xFFFFFFFF;
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-
-        if (psInst->eOpcode == OPCODE_GATHER4_PO_C)
-        {
-            bcatcstr(metal, ", ");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[5], TO_FLAG_NONE);
-        }
-
-        bcatcstr(metal, ", as_type<int2>(");
-        //ivec2 offset
-        psInst->asOperands[2].aui32Swizzle[2] = 0xFFFFFFFF;
-        psInst->asOperands[2].aui32Swizzle[3] = 0xFFFFFFFF;
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, "))");
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzleMETAL(psContext, &psInst->asOperands[3]);
-        bcatcstr(metal, ")");
-
-        AddSwizzleUsingElementCountMETAL(psContext, GetNumSwizzleElementsMETAL(&psInst->asOperands[0]));
-        METALAddAssignPrologue(psContext, numParenthesis);
-        break;
-    }
-    case OPCODE_SAMPLE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SAMPLE\n");
-#endif
-        METALTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_NONE);
-        break;
-    }
-    case OPCODE_SAMPLE_L:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SAMPLE_L\n");
-#endif
-        METALTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_LOD);
-        break;
-    }
-    case OPCODE_SAMPLE_C:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SAMPLE_C\n");
-#endif
-
-        METALTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_DEPTHCOMPARE);
-        break;
-    }
-    case OPCODE_SAMPLE_C_LZ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SAMPLE_C_LZ\n");
-#endif
-
-        METALTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_DEPTHCOMPARE | TEXSMP_FLAG_FIRSTLOD);
-        break;
-    }
-    case OPCODE_SAMPLE_D:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SAMPLE_D\n");
-#endif
-
-        METALTranslateTextureSample(psContext, psInst, TEXSMP_FLAGS_GRAD);
-        break;
-    }
-    case OPCODE_SAMPLE_B:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SAMPLE_B\n");
-#endif
-
-        METALTranslateTextureSample(psContext, psInst, TEXSMP_FLAG_BIAS);
-        break;
-    }
-    case OPCODE_RET:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//RET\n");
-#endif
-        if (psContext->havePostShaderCode[psContext->currentPhase])
-        {
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(metal, "//--- Post shader code ---\n");
-#endif
-            bconcat(metal, psContext->postShaderCode[psContext->currentPhase]);
-#ifdef _DEBUG
-            AddIndentation(psContext);
-            bcatcstr(metal, "//--- End post shader code ---\n");
-#endif
-        }
-        AddIndentation(psContext);
-        if (blength(psContext->declaredOutputs) > 0)
-        {
-            //has output
-            bcatcstr(metal, "return output;\n");
-        }
-        else
-        {
-            //no output declared
-            bcatcstr(metal, "return;\n");
-        }
-        break;
-    }
-    case OPCODE_INTERFACE_CALL:
-    {
-        const char* name;
-        ShaderVar* psVar;
-        uint32_t varFound;
-
-        uint32_t funcPointer;
-        uint32_t funcTableIndex;
-        uint32_t funcTable;
-        uint32_t funcBodyIndex;
-        uint32_t funcBody;
-        uint32_t ui32NumBodiesPerTable;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//INTERFACE_CALL\n");
-#endif
-
-        ASSERT(psInst->asOperands[0].eIndexRep[0] == OPERAND_INDEX_IMMEDIATE32);
-
-        funcPointer = psInst->asOperands[0].aui32ArraySizes[0];
-        funcTableIndex = psInst->asOperands[0].aui32ArraySizes[1];
-        funcBodyIndex = psInst->ui32FuncIndexWithinInterface;
-
-        ui32NumBodiesPerTable = psContext->psShader->funcPointer[funcPointer].ui32NumBodiesPerTable;
-
-        funcTable = psContext->psShader->funcPointer[funcPointer].aui32FuncTables[funcTableIndex];
-
-        funcBody = psContext->psShader->funcTable[funcTable].aui32FuncBodies[funcBodyIndex];
-
-        varFound = GetInterfaceVarFromOffset(funcPointer, &psContext->psShader->sInfo, &psVar);
-
-        ASSERT(varFound);
-
-        name = &psVar->Name[0];
-
-        AddIndentation(psContext);
-        bcatcstr(metal, name);
-        TranslateOperandIndexMADMETAL(psContext, &psInst->asOperands[0], 1, ui32NumBodiesPerTable, funcBodyIndex);
-        //bformata(glsl, "[%d]", funcBodyIndex);
-        bcatcstr(metal, "();\n");
-        break;
-    }
-    case OPCODE_LABEL:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LABEL\n");
-#endif
-        --psContext->indent;
-        AddIndentation(psContext);
-        bcatcstr(metal, "}\n"); //Closing brace ends the previous function.
-        AddIndentation(psContext);
-
-        bcatcstr(metal, "subroutine(SubroutineType)\n");
-        bcatcstr(metal, "void ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(metal, "(){\n");
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_COUNTBITS:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//COUNTBITS\n");
-#endif
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = popcount(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-        bcatcstr(metal, ");\n");
-        break;
-    }
-    case OPCODE_FIRSTBIT_HI:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//FIRSTBIT_HI\n");
-#endif
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER | TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = (32 - clz(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, "));\n");
-        break;
-    }
-    case OPCODE_FIRSTBIT_LO:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//FIRSTBIT_LO\n");
-#endif
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_UNSIGNED_INTEGER | TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = (1 + ctz(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ")));\n");
-        break;
-    }
-    case OPCODE_FIRSTBIT_SHI: //signed high
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//FIRSTBIT_SHI\n");
-#endif
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER | TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = (32 - clz(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-        bcatcstr(metal, " > 0 ? ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-        bcatcstr(metal, " : 0xFFFFFFFF ^ ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER);
-        bcatcstr(metal, ")));\n");
-        break;
-    }
-    case OPCODE_BFI:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//BFI\n");
-#endif
-        // This instruction is not available in Metal shading language.
-        // Need to expend it out (http://http.developer.nvidia.com/Cg/bitfieldInsert.html)
-
-        int numComponents = psInst->asOperands[0].iNumComponents;
-
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = 0;\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "{\n");
-
-        AddIndentation(psContext);
-        bformata(metal, "  %s mask = ~(%s(0xffffffff) << ", GetConstructorForTypeMETAL(SVT_UINT, numComponents), GetConstructorForTypeMETAL(SVT_UINT, numComponents));
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ") << ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ";\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "  mask = ~mask;\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "  ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bformata(metal, " = ( as_type<%s>( (", GetConstructorForTypeMETAL(psInst->asOperands[0].aeDataType[0], numComponents));
-        TranslateOperandMETAL(psContext, &psInst->asOperands[4], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, " & mask) | (");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[3], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, " << ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ")) )");
-        TranslateOperandSwizzleWithMaskMETAL(psContext, &psInst->asOperands[0], GetOperandWriteMaskMETAL(&psInst->asOperands[0]));
-        bcatcstr(metal, ";\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "}\n");
-
-
-
-        break;
-    }
-    case OPCODE_BFREV:
-    case OPCODE_CUT:
-    case OPCODE_EMIT:
-    case OPCODE_EMITTHENCUT:
-    case OPCODE_CUT_STREAM:
-    case OPCODE_EMIT_STREAM:
-    case OPCODE_EMITTHENCUT_STREAM:
-    {
-        // not implemented in metal
-        ASSERT(0);
-        break;
-    }
-    case OPCODE_REP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//REP\n");
-#endif
-        //Need to handle nesting.
-        //Max of 4 for rep - 'Flow Control Limitations' http://msdn.microsoft.com/en-us/library/windows/desktop/bb219848(v=vs.85).aspx
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "RepCounter = as_type<int4>(");
-        TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-        bcatcstr(metal, ").x;\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "while(RepCounter!=0){\n");
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_ENDREP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ENDREP\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(metal, "RepCounter--;\n");
-
-        --psContext->indent;
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "}\n");
-        break;
-    }
-    case OPCODE_LOOP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LOOP\n");
-#endif
-        AddIndentation(psContext);
-
-        if (psInst->ui32NumOperands == 2)
-        {
-            //DX9 version
-            ASSERT(psInst->asOperands[0].eType == OPERAND_TYPE_SPECIAL_LOOPCOUNTER);
-            bcatcstr(metal, "for(");
-            bcatcstr(metal, "LoopCounter = ");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(metal, ".y, ZeroBasedCounter = 0;");
-            bcatcstr(metal, "ZeroBasedCounter < ");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(metal, ".x;");
-
-            bcatcstr(metal, "LoopCounter += ");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            bcatcstr(metal, ".z, ZeroBasedCounter++){\n");
-            ++psContext->indent;
-        }
-        else
-        {
-            bcatcstr(metal, "while(true){\n");
-            ++psContext->indent;
-        }
-        break;
-    }
-    case OPCODE_ENDLOOP:
-    {
-        --psContext->indent;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ENDLOOP\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(metal, "}\n");
-        break;
-    }
-    case OPCODE_BREAK:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//BREAK\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(metal, "break;\n");
-        break;
-    }
-    case OPCODE_BREAKC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//BREAKC\n");
-#endif
-        AddIndentation(psContext);
-
-        METALTranslateConditional(psContext, psInst, metal);
-        break;
-    }
-    case OPCODE_CONTINUEC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//CONTINUEC\n");
-#endif
-        AddIndentation(psContext);
-
-        METALTranslateConditional(psContext, psInst, metal);
-        break;
-    }
-    case OPCODE_IF:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//IF\n");
-#endif
-        AddIndentation(psContext);
-
-        METALTranslateConditional(psContext, psInst, metal);
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_RETC:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//RETC\n");
-#endif
-        AddIndentation(psContext);
-
-        METALTranslateConditional(psContext, psInst, metal);
-        break;
-    }
-    case OPCODE_ELSE:
-    {
-        --psContext->indent;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ELSE\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(metal, "} else {\n");
-        psContext->indent++;
-        break;
-    }
-    case OPCODE_ENDSWITCH:
-    case OPCODE_ENDIF:
-    {
-        --psContext->indent;
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ENDIF\n");
-        AddIndentation(psContext);
-        bcatcstr(metal, "}\n");
-        break;
-    }
-    case OPCODE_CONTINUE:
-    {
-        AddIndentation(psContext);
-        bcatcstr(metal, "continue;\n");
-        break;
-    }
-    case OPCODE_DEFAULT:
-    {
-        --psContext->indent;
-        AddIndentation(psContext);
-        bcatcstr(metal, "default:\n");
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_NOP:
-    {
-        break;
-    }
-    case OPCODE_SYNC:
-    {
-        const uint32_t ui32SyncFlags = psInst->ui32SyncFlags;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SYNC\n");
-#endif
-        //  warning. Although Metal documentation claims the flag can be combined
-        //  this is not true in terms of binary operations. One can't simply OR flags
-        //  but rather have to use pre-defined literals.
-        char* aszBarrierType[] = {
-            "mem_flags::mem_none",
-            "mem_flags::mem_threadgroup",
-            "mem_flags::mem_device",
-            "mem_flags::mem_device_and_threadgroup"
-        };
-        typedef enum
-        {
-            BT_None,
-            BT_MemThreadGroup,
-            BT_MemDevice,
-            BT_MemDeviceAndMemThreadGroup
-        } BT;
-        BT  barrierType = BT_None;
-
-        if (ui32SyncFlags & SYNC_THREADS_IN_GROUP)
-        {
-            AddIndentation(psContext);
-            bcatcstr(metal, "threadgroup_barrier(");
-        }
-        else
-        {
-            AddIndentation(psContext);
-            //  simdgroup_barrier is faster than threadgroup_barrier. It is supported on iOS 10+ on all hardware.
-            bcatcstr(metal, "threadgroup_barrier(");
-        }
-
-        if (ui32SyncFlags & SYNC_THREAD_GROUP_SHARED_MEMORY)
-        {
-            barrierType = (BT)(barrierType | BT_MemThreadGroup);
-        }
-        if (ui32SyncFlags & (SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GROUP | SYNC_UNORDERED_ACCESS_VIEW_MEMORY_GLOBAL))
-        {
-            barrierType = (BT)(barrierType | BT_MemDevice);
-        }
-
-        bcatcstr(metal, aszBarrierType[barrierType]);
-        bcatcstr(metal, ");\n");
-
-        break;
-    }
-    case OPCODE_SWITCH:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//SWITCH\n");
-#endif
-        AddIndentation(psContext);
-        bcatcstr(metal, "switch(int(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-        bcatcstr(metal, ")){\n");
-
-        psContext->indent += 2;
-        break;
-    }
-    case OPCODE_CASE:
-    {
-        --psContext->indent;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//case\n");
-#endif
-        AddIndentation(psContext);
-
-        bcatcstr(metal, "case ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-        bcatcstr(metal, ":\n");
-
-        ++psContext->indent;
-        break;
-    }
-    case OPCODE_EQ:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//EQ\n");
-#endif
-        METALAddComparision(psContext, psInst, METAL_CMP_EQ, TO_FLAG_NONE, NULL);
-        break;
-    }
-    case OPCODE_USHR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//USHR\n");
-#endif
-        METALCallBinaryOp(psContext, ">>", psInst, 0, 1, 2, SVT_UINT);
-        break;
-    }
-    case OPCODE_ISHL:
-    {
-        SHADER_VARIABLE_TYPE eType = SVT_INT;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ISHL\n");
-#endif
-
-        if (GetOperandDataTypeMETAL(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            eType = SVT_UINT;
-        }
-
-        METALCallBinaryOp(psContext, "<<", psInst, 0, 1, 2, eType);
-        break;
-    }
-    case OPCODE_ISHR:
-    {
-        SHADER_VARIABLE_TYPE eType = SVT_INT;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//ISHR\n");
-#endif
-
-        if (GetOperandDataTypeMETAL(psContext, &psInst->asOperands[0]) == SVT_UINT)
-        {
-            eType = SVT_UINT;
-        }
-
-        METALCallBinaryOp(psContext, ">>", psInst, 0, 1, 2, eType);
-        break;
-    }
-    case OPCODE_LD:
-    case OPCODE_LD_MS:
-    {
-        ResourceBinding* psBinding = 0;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_LD)
-        {
-            bcatcstr(metal, "//LD\n");
-        }
-        else
-        {
-            bcatcstr(metal, "//LD_MS\n");
-        }
-#endif
-
-        GetResourceFromBindingPoint(RGROUP_TEXTURE, psInst->asOperands[2].ui32RegisterNumber, &psContext->psShader->sInfo, &psBinding);
-
-        //if (psInst->bAddressOffset)
-        //{
-        //  METALTranslateTexelFetchOffset(psContext, psInst, psBinding, metal);
-        //}
-        //else
-        //{
-        METALTranslateTexelFetch(psContext, psInst, psBinding, metal);
-        //}
-        break;
-    }
-    case OPCODE_DISCARD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DISCARD\n");
-#endif
-        AddIndentation(psContext);
-
-        if (psInst->eBooleanTestType == INSTRUCTION_TEST_ZERO)
-        {
-            bcatcstr(metal, "if(all(");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-            bcatcstr(metal, "==0)){discard_fragment();}\n");
-        }
-        else
-        {
-            ASSERT(psInst->eBooleanTestType == INSTRUCTION_TEST_NONZERO);
-            bcatcstr(metal, "if(any(");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_INTEGER);
-            bcatcstr(metal, "!=0)){discard_fragment();}\n");
-        }
-        break;
-    }
-    case OPCODE_LOD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LOD\n");
-#endif
-        //LOD computes the following vector (ClampedLOD, NonClampedLOD, 0, 0)
-
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, 4, &numParenthesis);
-
-        //If the core language does not have query-lod feature,
-        //then the extension is used. The name of the function
-        //changed between extension and core.
-        if (HaveQueryLod(psContext->psShader->eTargetLanguage))
-        {
-            bcatcstr(metal, "textureQueryLod(");
-        }
-        else
-        {
-            bcatcstr(metal, "textureQueryLOD(");
-        }
-
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ",");
-        METALTranslateTexCoord(psContext,
-            psContext->psShader->aeResourceDims[psInst->asOperands[2].ui32RegisterNumber],
-            &psInst->asOperands[1]);
-        bcatcstr(metal, ")");
-
-        //The swizzle on srcResource allows the returned values to be swizzled arbitrarily before they are written to the destination.
-
-        // iWriteMaskEnabled is forced off during DecodeOperand because swizzle on sampler uniforms
-        // does not make sense. But need to re-enable to correctly swizzle this particular instruction.
-        psInst->asOperands[2].iWriteMaskEnabled = 1;
-        TranslateOperandSwizzleWithMaskMETAL(psContext, &psInst->asOperands[2], GetOperandWriteMaskMETAL(&psInst->asOperands[0]));
-        METALAddAssignPrologue(psContext, numParenthesis);
-        break;
-    }
-    case OPCODE_EVAL_CENTROID:
-    case OPCODE_EVAL_SAMPLE_INDEX:
-    case OPCODE_EVAL_SNAPPED:
-    {
-        // ERROR: evaluation functions are not implemented in metal
-        ASSERT(0);
-        break;
-    }
-    case OPCODE_LD_STRUCTURED:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LD_STRUCTURED\n");
-#endif
-        METALTranslateShaderStorageLoad(psContext, psInst);
-        break;
-    }
-    case OPCODE_LD_UAV_TYPED:
-    {
-        // not implemented in metal
-        ASSERT(0);
-        break;
-    }
-    case OPCODE_STORE_RAW:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//STORE_RAW\n");
-#endif
-        METALTranslateShaderStorageStore(psContext, psInst);
-        break;
-    }
-    case OPCODE_STORE_STRUCTURED:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//STORE_STRUCTURED\n");
-#endif
-        METALTranslateShaderStorageStore(psContext, psInst);
-        break;
-    }
-
-    case OPCODE_STORE_UAV_TYPED:
-    {
-        ResourceBinding* psRes;
-        int foundResource;
-
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//STORE_UAV_TYPED\n");
-#endif
-        AddIndentation(psContext);
-
-        foundResource = GetResourceFromBindingPoint(RGROUP_UAV,
-                psInst->asOperands[0].ui32RegisterNumber,
-                &psContext->psShader->sInfo,
-                &psRes);
-
-        ASSERT(foundResource);
-
-        if (psRes->eBindArea == UAVAREA_CBUFFER)
-        {
-            TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_NAME_ONLY);
-            bcatcstr(metal, "[");
-            TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            bcatcstr(metal, "]=");
-            TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[2], METALResourceReturnTypeToFlag(psRes->ui32ReturnType), OPERAND_4_COMPONENT_MASK_X);
-            bcatcstr(metal, ";\n");
-        }
-        else if (psRes->eBindArea == UAVAREA_TEXTURE)
-        {
-            TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_NAME_ONLY);
-            bcatcstr(metal, ".write(");
-            TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[2], METALResourceReturnTypeToFlag(psRes->ui32ReturnType), OPERAND_4_COMPONENT_MASK_ALL);
-            switch (psRes->eDimension)
-            {
-            case REFLECT_RESOURCE_DIMENSION_TEXTURE1D:
-            {
-                bcatcstr(metal, ",as_type<uint>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ") ");
-                break;
-            }
-            case REFLECT_RESOURCE_DIMENSION_TEXTURE2D:
-            {
-                bcatcstr(metal, ",as_type<uint2>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".xy) ");
-                break;
-            }
-            case REFLECT_RESOURCE_DIMENSION_TEXTURE1DARRAY:
-            {
-                bcatcstr(metal, ",as_type<uint>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".x) ");
-                bcatcstr(metal, ",as_type<uint>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".y) ");
-                break;
-            }
-            case REFLECT_RESOURCE_DIMENSION_TEXTURE2DARRAY:
-            {
-                bcatcstr(metal, ",as_type<uint2>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".xy) ");
-                bcatcstr(metal, ",as_type<uint>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".z) ");
-                break;
-            }
-            case REFLECT_RESOURCE_DIMENSION_TEXTURE3D:
-            {
-                bcatcstr(metal, ", as_type<uint3>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".xyz) ");
-                break;
-            }
-            case REFLECT_RESOURCE_DIMENSION_TEXTURECUBE:
-            {
-                bcatcstr(metal, ",as_type<uint2>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".xy) ");
-                bcatcstr(metal, ",as_type<uint>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".z) ");
-                break;
-            }
-            case REFLECT_RESOURCE_DIMENSION_TEXTURECUBEARRAY:
-            {
-                bcatcstr(metal, ",as_type<uint2>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".xy) ");
-                bcatcstr(metal, ",as_type<uint>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".z) ");
-                bcatcstr(metal, ",as_type<uint>(");
-                TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NAME_ONLY);
-                bcatcstr(metal, ".w) ");
-                break;
-            }
-            case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMS:
-            case REFLECT_RESOURCE_DIMENSION_TEXTURE2DMSARRAY:
-                //not supported in mnetal
-                ASSERT(0);
-                break;
-            }
-            ;
-            bcatcstr(metal, ");\n");
-        }
-        else
-        {
-            //UAV is not exist in either [[buffer]] or [[texture]]
-            ASSERT(0);
-        }
-        break;
-    }
-    case OPCODE_LD_RAW:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LD_RAW\n");
-#endif
-
-        METALTranslateShaderStorageLoad(psContext, psInst);
-        break;
-    }
-
-    case OPCODE_ATOMIC_CMP_STORE:
-    case OPCODE_IMM_ATOMIC_AND:
-    case OPCODE_ATOMIC_AND:
-    case OPCODE_IMM_ATOMIC_IADD:
-    case OPCODE_ATOMIC_IADD:
-    case OPCODE_ATOMIC_OR:
-    case OPCODE_ATOMIC_XOR:
-    case OPCODE_ATOMIC_IMIN:
-    case OPCODE_ATOMIC_UMIN:
-    case OPCODE_ATOMIC_UMAX:
-    case OPCODE_ATOMIC_IMAX:
-    case OPCODE_IMM_ATOMIC_IMAX:
-    case OPCODE_IMM_ATOMIC_IMIN:
-    case OPCODE_IMM_ATOMIC_UMAX:
-    case OPCODE_IMM_ATOMIC_UMIN:
-    case OPCODE_IMM_ATOMIC_OR:
-    case OPCODE_IMM_ATOMIC_XOR:
-    case OPCODE_IMM_ATOMIC_EXCH:
-    case OPCODE_IMM_ATOMIC_CMP_EXCH:
-    {
-        TranslateAtomicMemOpMETAL(psContext, psInst);
-        break;
-    }
-    case OPCODE_UBFE:
-    case OPCODE_IBFE:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        if (psInst->eOpcode == OPCODE_UBFE)
-        {
-            bcatcstr(metal, "//OPCODE_UBFE\n");
-        }
-        else
-        {
-            bcatcstr(metal, "//OPCODE_IBFE\n");
-        }
-#endif
-        // These instructions are not available in Metal shading language.
-        // Need to expend it out (http://http.developer.nvidia.com/Cg/bitfieldExtract.html)
-        // NOTE: we assume bitoffset is always > 0 as to avoid dynamic branching.
-        // NOTE: We have taken out the -1 as this was breaking the GPU particles bitfields.
-
-        int numComponents = psInst->asOperands[0].iNumComponents;
-
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = 0;\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "{\n");
-
-        AddIndentation(psContext);
-        bformata(metal, "  %s mask = ~(%s(0xffffffff) << ", GetConstructorForTypeMETAL(SVT_UINT, numComponents), GetConstructorForTypeMETAL(SVT_UINT, numComponents));
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ");\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "  ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bformata(metal, " = ( as_type<%s>((", GetConstructorForTypeMETAL(psInst->asOperands[0].aeDataType[0], numComponents));
-        TranslateOperandMETAL(psContext, &psInst->asOperands[3], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, " >> ( ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_UNSIGNED_INTEGER);
-        bcatcstr(metal, ")) & mask) )");
-        TranslateOperandSwizzleWithMaskMETAL(psContext, &psInst->asOperands[0], GetOperandWriteMaskMETAL(&psInst->asOperands[0]));
-        bcatcstr(metal, ";\n");
-
-        AddIndentation(psContext);
-        bcatcstr(metal, "}\n");
-
-        break;
-    }
-    case OPCODE_RCP:
-    {
-        const uint32_t destElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//RCP\n");
-#endif
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = (float4(1.0) / float4(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-        bcatcstr(metal, "))");
-        AddSwizzleUsingElementCountMETAL(psContext, destElemCount);
-        bcatcstr(metal, ";\n");
-        break;
-    }
-    case OPCODE_F32TOF16:
-    {
-        const uint32_t destElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-        const uint32_t s0ElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[1]);
-        uint32_t destElem;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//F32TOF16\n");
-#endif
-        for (destElem = 0; destElem < destElemCount; ++destElem)
-        {
-            const char* swizzle[] = { ".x", ".y", ".z", ".w" };
-
-            AddIndentation(psContext);
-            TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-            if (destElemCount > 1)
-            {
-                bcatcstr(metal, swizzle[destElem]);
-            }
-
-            bcatcstr(metal, " = ");
-
-            SHADER_VARIABLE_TYPE eDestDataType = GetOperandDataTypeMETAL(psContext, &psInst->asOperands[0]);
-            if (SVT_FLOAT == eDestDataType)
-            {
-                bcatcstr(metal, "as_type<float>");
-            }
-            bcatcstr(metal, "( (uint( as_type<unsigned short>( (half)");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-            if (s0ElemCount > 1)
-            {
-                bcatcstr(metal, swizzle[destElem]);
-            }
-            bcatcstr(metal, " ) ) ) );\n");
-        }
-        break;
-    }
-    case OPCODE_F16TOF32:
-    {
-        const uint32_t destElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-        const uint32_t s0ElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[1]);
-        uint32_t destElem;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//F16TOF32\n");
-#endif
-        for (destElem = 0; destElem < destElemCount; ++destElem)
-        {
-            const char* swizzle[] = { ".x", ".y", ".z", ".w" };
-
-            AddIndentation(psContext);
-            TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION | TO_FLAG_UNSIGNED_INTEGER);
-            if (destElemCount > 1)
-            {
-                bcatcstr(metal, swizzle[destElem]);
-            }
-
-            bcatcstr(metal, " = as_type<half> ((unsigned short)");
-            TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_UNSIGNED_INTEGER);
-            if (s0ElemCount > 1)
-            {
-                bcatcstr(metal, swizzle[destElem]);
-            }
-            bcatcstr(metal, ");\n");
-        }
-        break;
-    }
-    case OPCODE_INEG:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//INEG\n");
-#endif
-        uint32_t dstCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-        uint32_t srcCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[1]);
-
-        //dest = 0 - src0
-        bcatcstr(metal, "-(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE | TO_FLAG_INTEGER);
-        if (srcCount > dstCount)
-        {
-            AddSwizzleUsingElementCountMETAL(psContext, dstCount);
-        }
-        bcatcstr(metal, ")");
-        bcatcstr(metal, ";\n");
-        break;
-    }
-    case OPCODE_DERIV_RTX_COARSE:
-    case OPCODE_DERIV_RTX_FINE:
-    case OPCODE_DERIV_RTX:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DERIV_RTX\n");
-#endif
-        METALCallHelper1(psContext, "dfdx", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_DERIV_RTY_COARSE:
-    case OPCODE_DERIV_RTY_FINE:
-    case OPCODE_DERIV_RTY:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DERIV_RTY\n");
-#endif
-        METALCallHelper1(psContext, "dfdy", psInst, 0, 1, 1);
-        break;
-    }
-    case OPCODE_LRP:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//LRP\n");
-#endif
-        METALCallHelper3(psContext, "mix", psInst, 0, 2, 3, 1, 1);
-        break;
-    }
-    case OPCODE_DP2ADD:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//DP2ADD\n");
-#endif
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = dot(float2(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-        bcatcstr(metal, "), float2(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ")) + ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[3], TO_FLAG_NONE);
-        bcatcstr(metal, ";\n");
-        break;
-    }
-    case OPCODE_POW:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//POW\n");
-#endif
-        AddIndentation(psContext);
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_FLAG_DESTINATION);
-        bcatcstr(metal, " = pow(abs(");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[1], TO_FLAG_NONE);
-        bcatcstr(metal, "), ");
-        TranslateOperandMETAL(psContext, &psInst->asOperands[2], TO_FLAG_NONE);
-        bcatcstr(metal, ");\n");
-        break;
-    }
-
-    case OPCODE_IMM_ATOMIC_ALLOC:
-    case OPCODE_IMM_ATOMIC_CONSUME:
-    {
-        // not implemented in metal
-        ASSERT(0);
-        break;
-    }
-
-    case OPCODE_NOT:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//INOT\n");
-#endif
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_INT, GetNumSwizzleElementsMETAL(&psInst->asOperands[1]), &numParenthesis);
-
-        bcatcstr(metal, "~");
-        TranslateOperandWithMaskMETAL(psContext, &psInst->asOperands[1], TO_FLAG_INTEGER, GetOperandWriteMaskMETAL(&psInst->asOperands[0]));
-        METALAddAssignPrologue(psContext, numParenthesis);
-        break;
-    }
-    case OPCODE_XOR:
-    {
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//XOR\n");
-#endif
-
-        METALCallBinaryOp(psContext, "^", psInst, 0, 1, 2, SVT_UINT);
-        break;
-    }
-    case OPCODE_RESINFO:
-    {
-        uint32_t destElemCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-        uint32_t destElem;
-#ifdef _DEBUG
-        AddIndentation(psContext);
-        bcatcstr(metal, "//RESINFO\n");
-#endif
-
-        for (destElem = 0; destElem < destElemCount; ++destElem)
-        {
-
-            GetResInfoDataMETAL(psContext, psInst, psInst->asOperands[2].aui32Swizzle[destElem], destElem);
-        }
-
-        break;
-    }
-
-
-    case OPCODE_DMAX:
-    case OPCODE_DMIN:
-    case OPCODE_DMUL:
-    case OPCODE_DEQ:
-    case OPCODE_DGE:
-    case OPCODE_DLT:
-    case OPCODE_DNE:
-    case OPCODE_DMOV:
-    case OPCODE_DMOVC:
-    case OPCODE_DTOF:
-    case OPCODE_FTOD:
-    case OPCODE_DDIV:
-    case OPCODE_DFMA:
-    case OPCODE_DRCP:
-    case OPCODE_MSAD:
-    case OPCODE_DTOI:
-    case OPCODE_DTOU:
-    case OPCODE_ITOD:
-    case OPCODE_UTOD:
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    if (psInst->bSaturate) //Saturate is only for floating point data (float opcodes or MOV)
-    {
-        int dstCount = GetNumSwizzleElementsMETAL(&psInst->asOperands[0]);
-        AddIndentation(psContext);
-        METALAddAssignToDest(psContext, &psInst->asOperands[0], SVT_FLOAT, dstCount, &numParenthesis);
-        bcatcstr(metal, "clamp(");
-
-        TranslateOperandMETAL(psContext, &psInst->asOperands[0], TO_AUTO_BITCAST_TO_FLOAT);
-        bcatcstr(metal, ", 0.0, 1.0)");
-        METALAddAssignPrologue(psContext, numParenthesis);
-    }
-}
-
-static int METALIsIntegerImmediateOpcode(OPCODE_TYPE eOpcode)
-{
-    switch (eOpcode)
-    {
-    case OPCODE_IADD:
-    case OPCODE_IF:
-    case OPCODE_IEQ:
-    case OPCODE_IGE:
-    case OPCODE_ILT:
-    case OPCODE_IMAD:
-    case OPCODE_IMAX:
-    case OPCODE_IMIN:
-    case OPCODE_IMUL:
-    case OPCODE_INE:
-    case OPCODE_INEG:
-    case OPCODE_ISHL:
-    case OPCODE_ISHR:
-    case OPCODE_ITOF:
-    case OPCODE_USHR:
-    case OPCODE_AND:
-    case OPCODE_OR:
-    case OPCODE_XOR:
-    case OPCODE_BREAKC:
-    case OPCODE_CONTINUEC:
-    case OPCODE_RETC:
-    case OPCODE_DISCARD:
-    //MOV is typeless.
-    //Treat immediates as int, bitcast to float if necessary
-    case OPCODE_MOV:
-    case OPCODE_MOVC:
-    {
-        return 1;
-    }
-    default:
-    {
-        return 0;
-    }
-    }
-}
-
-int InstructionUsesRegisterMETAL(const Instruction* psInst, const Operand* psOperand)
-{
-    uint32_t operand;
-    for (operand = 0; operand < psInst->ui32NumOperands; ++operand)
-    {
-        if (psInst->asOperands[operand].eType == psOperand->eType)
-        {
-            if (psInst->asOperands[operand].ui32RegisterNumber == psOperand->ui32RegisterNumber)
-            {
-                if (CompareOperandSwizzlesMETAL(&psInst->asOperands[operand], psOperand))
-                {
-                    return 1;
-                }
-            }
-        }
-    }
-    return 0;
-}
-
-void MarkIntegerImmediatesMETAL(HLSLCrossCompilerContext* psContext)
-{
-    const uint32_t count = psContext->psShader->asPhase[MAIN_PHASE].pui32InstCount[0];
-    Instruction* psInst = psContext->psShader->asPhase[MAIN_PHASE].ppsInst[0];
-    uint32_t i;
-
-    for (i = 0; i < count; )
-    {
-        if (psInst[i].eOpcode == OPCODE_MOV && psInst[i].asOperands[1].eType == OPERAND_TYPE_IMMEDIATE32 &&
-            psInst[i].asOperands[0].eType == OPERAND_TYPE_TEMP)
-        {
-            uint32_t k;
-
-            for (k = i + 1; k < count; ++k)
-            {
-                if (psInst[k].eOpcode == OPCODE_ILT)
-                {
-                    k = k;
-                }
-                if (InstructionUsesRegisterMETAL(&psInst[k], &psInst[i].asOperands[0]))
-                {
-                    if (METALIsIntegerImmediateOpcode(psInst[k].eOpcode))
-                    {
-                        psInst[i].asOperands[1].iIntegerImmediate = 1;
-                    }
-
-                    goto next_iteration;
-                }
-            }
-        }
-next_iteration:
-        ++i;
-    }
-}
diff --git a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALOperand.c b/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALOperand.c
deleted file mode 100644
index f1ab027108..0000000000
--- a/Code/Tools/HLSLCrossCompilerMETAL/src/toMETALOperand.c
+++ /dev/null
@@ -1,2377 +0,0 @@
-// Modifications copyright Amazon.com, Inc. or its affiliates
-// Modifications copyright Crytek GmbH
-
-#include "internal_includes/toMETALOperand.h"
-#include "internal_includes/toMETALDeclaration.h"
-#include "bstrlib.h"
-#include "hlslcc.h"
-#include "internal_includes/debug.h"
-
-#include <float.h>
-#include <stdlib.h>
-
-#ifdef _MSC_VER
-#define isnan(x) _isnan(x)
-#define isinf(x) (!_finite(x))
-#endif
-
-#define fpcheck(x) (isnan(x) || isinf(x))
-#define MAX_STR_LENGTH 128
-
-extern void AddIndentation(HLSLCrossCompilerContext* psContext);
-
-uint32_t SVTTypeToFlagMETAL(const SHADER_VARIABLE_TYPE eType)
-{
-    if (eType == SVT_UINT)
-    {
-        return TO_FLAG_UNSIGNED_INTEGER;
-    }
-    else if (eType == SVT_INT)
-    {
-        return TO_FLAG_INTEGER;
-    }
-    else if (eType == SVT_BOOL)
-    {
-        return TO_FLAG_INTEGER; // TODO bools?
-    }
-    else if (eType == SVT_FLOAT16)
-    {
-        return TO_FLAG_FLOAT16;
-    }
-    else
-    {
-        return TO_FLAG_NONE;
-    }
-}
-
-SHADER_VARIABLE_TYPE TypeFlagsToSVTTypeMETAL(const uint32_t typeflags)
-{
-    if (typeflags & (TO_FLAG_INTEGER | TO_AUTO_BITCAST_TO_INT))
-    {
-        return SVT_INT;
-    }
-    if (typeflags & (TO_FLAG_UNSIGNED_INTEGER | TO_AUTO_BITCAST_TO_UINT))
-    {
-        return SVT_UINT;
-    }
-    if (typeflags & (TO_FLAG_FLOAT16 | TO_AUTO_BITCAST_TO_FLOAT16))
-    {
-        return SVT_FLOAT16;
-    }
-    return SVT_FLOAT;
-}
-
-uint32_t GetOperandWriteMaskMETAL(const Operand* psOperand)
-{
-    if (psOperand->eSelMode != OPERAND_4_COMPONENT_MASK_MODE || psOperand->ui32CompMask == 0)
-    {
-        return OPERAND_4_COMPONENT_MASK_ALL;
-    }
-
-    return psOperand->ui32CompMask;
-}
-
-
-const char* GetConstructorForTypeMETAL(const SHADER_VARIABLE_TYPE eType,
-    const int components)
-{
-    static const char* const uintTypes[] = { " ", "uint", "uint2", "uint3", "uint4" };
-    static const char* const intTypes[] = { " ", "int", "int2", "int3", "int4" };
-    static const char* const floatTypes[] = { " ", "float", "float2", "float3", "float4" };
-    static const char* const float16Types[] = { " ", "half", "half2", "half3", "half4" };
-
-    if (components < 1 || components > 4)
-    {
-        return "ERROR TOO MANY COMPONENTS IN VECTOR";
-    }
-
-    switch (eType)
-    {
-    case SVT_UINT:
-        return uintTypes[components];
-    case SVT_INT:
-        return intTypes[components];
-    case SVT_FLOAT:
-        return floatTypes[components];
-    case SVT_FLOAT16:
-        return float16Types[components];
-    default:
-        return "ERROR UNSUPPORTED TYPE";
-    }
-}
-
-
-const char* GetConstructorForTypeFlagMETAL(const uint32_t ui32Flag,
-    const int components)
-{
-    if (ui32Flag & TO_FLAG_UNSIGNED_INTEGER || ui32Flag & TO_AUTO_BITCAST_TO_UINT)
-    {
-        return GetConstructorForTypeMETAL(SVT_UINT, components);
-    }
-    else if (ui32Flag & TO_FLAG_INTEGER || ui32Flag & TO_AUTO_BITCAST_TO_INT)
-    {
-        return GetConstructorForTypeMETAL(SVT_INT, components);
-    }
-    else
-    {
-        return GetConstructorForTypeMETAL(SVT_FLOAT, components);
-    }
-}
-
-int GetMaxComponentFromComponentMaskMETAL(const Operand* psOperand)
-{
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 && psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    return 4;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    return 3;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    return 2;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    return 1;
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            return 4;
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            return 1;
-        }
-    }
-
-    return 4;
-}
-
-//Single component repeated
-//e..g .wwww
-uint32_t IsSwizzleReplicatedMETAL(const Operand* psOperand)
-{
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle == WWWW_SWIZZLE ||
-                psOperand->ui32Swizzle == ZZZZ_SWIZZLE ||
-                psOperand->ui32Swizzle == YYYY_SWIZZLE ||
-                psOperand->ui32Swizzle == XXXX_SWIZZLE)
-            {
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-static uint32_t METALGetNumberBitsSet(uint32_t a)
-{
-    // Calculate number of bits in a
-    // Taken from https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSet64
-    // Works only up to 14 bits (we're only using up to 4)
-    return (a * 0x200040008001ULL & 0x111111111111111ULL) % 0xf;
-}
-
-//e.g.
-//.z = 1
-//.x = 1
-//.yw = 2
-uint32_t GetNumSwizzleElementsMETAL(const Operand* psOperand)
-{
-    return GetNumSwizzleElementsWithMaskMETAL(psOperand, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-// Get the number of elements returned by operand, taking additional component mask into account
-uint32_t GetNumSwizzleElementsWithMaskMETAL(const Operand* psOperand, uint32_t ui32CompMask)
-{
-    uint32_t count = 0;
-
-    switch (psOperand->eType)
-    {
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED:
-        return 1;     // TODO: does mask make any sense here?
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP:
-    case OPERAND_TYPE_INPUT_THREAD_ID:
-    case OPERAND_TYPE_INPUT_THREAD_GROUP_ID:
-        // Adjust component count and break to more processing
-        ((Operand*)psOperand)->iNumComponents = 3;
-        break;
-    case OPERAND_TYPE_IMMEDIATE32:
-    case OPERAND_TYPE_IMMEDIATE64:
-    case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-    case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-    case OPERAND_TYPE_OUTPUT_DEPTH:
-    {
-        // Translate numComponents into bitmask
-        // 1 -> 1, 2 -> 3, 3 -> 7 and 4 -> 15
-        uint32_t compMask = (1 << psOperand->iNumComponents) - 1;
-
-        compMask &= ui32CompMask;
-        // Calculate bits left in compMask
-        return METALGetNumberBitsSet(compMask);
-    }
-    default:
-    {
-        break;
-    }
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents != 1)
-    {
-        //Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t compMask = psOperand->ui32CompMask;
-            if (compMask == 0)
-            {
-                compMask = OPERAND_4_COMPONENT_MASK_ALL;
-            }
-            compMask &= ui32CompMask;
-
-            if (compMask == OPERAND_4_COMPONENT_MASK_ALL)
-            {
-                return 4;
-            }
-
-            if (compMask & OPERAND_4_COMPONENT_MASK_X)
-            {
-                count++;
-            }
-            if (compMask & OPERAND_4_COMPONENT_MASK_Y)
-            {
-                count++;
-            }
-            if (compMask & OPERAND_4_COMPONENT_MASK_Z)
-            {
-                count++;
-            }
-            if (compMask & OPERAND_4_COMPONENT_MASK_W)
-            {
-                count++;
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if ((ui32CompMask & (1 << i)) == 0)
-                    {
-                        continue;
-                    }
-
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        count++;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        count++;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        count++;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        count++;
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                count++;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                count++;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                count++;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                count++;
-            }
-        }
-
-        //Component Select 1
-    }
-
-    if (!count)
-    {
-        // Translate numComponents into bitmask
-        // 1 -> 1, 2 -> 3, 3 -> 7 and 4 -> 15
-        uint32_t compMask = (1 << psOperand->iNumComponents) - 1;
-
-        compMask &= ui32CompMask;
-        // Calculate bits left in compMask
-        return METALGetNumberBitsSet(compMask);
-    }
-
-    return count;
-}
-
-void AddSwizzleUsingElementCountMETAL(HLSLCrossCompilerContext* psContext, uint32_t count)
-{
-    bstring metal = *psContext->currentShaderString;
-    if (count == 4)
-    {
-        return;
-    }
-    if (count)
-    {
-        bcatcstr(metal, ".");
-        bcatcstr(metal, "x");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(metal, "y");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(metal, "z");
-        count--;
-    }
-    if (count)
-    {
-        bcatcstr(metal, "w");
-        count--;
-    }
-}
-
-static uint32_t METALConvertOperandSwizzleToComponentMask(const Operand* psOperand)
-{
-    uint32_t mask = 0;
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            mask = psOperand->ui32CompMask;
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_X;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_Y;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_Z;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        mask |= OPERAND_4_COMPONENT_MASK_W;
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_X;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_Y;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_Z;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                mask |= OPERAND_4_COMPONENT_MASK_W;
-            }
-        }
-
-        //Component Select 1
-    }
-
-    return mask;
-}
-
-//Non-zero means the components overlap
-int CompareOperandSwizzlesMETAL(const Operand* psOperandA, const Operand* psOperandB)
-{
-    uint32_t maskA = METALConvertOperandSwizzleToComponentMask(psOperandA);
-    uint32_t maskB = METALConvertOperandSwizzleToComponentMask(psOperandB);
-
-    return maskA & maskB;
-}
-
-
-void TranslateOperandSwizzleMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    TranslateOperandSwizzleWithMaskMETAL(psContext, psOperand, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-void TranslateOperandSwizzleWithMaskMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask)
-{
-    bstring metal = *psContext->currentShaderString;
-
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return;
-        }
-    }
-
-    if (psOperand->eType == OPERAND_TYPE_CONSTANT_BUFFER)
-    {
-        /*ConstantBuffer* psCBuf = NULL;
-        ShaderVar* psVar = NULL;
-        int32_t index = -1;
-        GetConstantBufferFromBindingPoint(psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-
-        //Access the Nth vec4 (N=psOperand->aui32ArraySizes[1])
-        //then apply the sizzle.
-
-        GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVar, &index);
-
-        bformata(metal, ".%s", psVar->Name);
-        if(index != -1)
-        {
-            bformata(metal, "[%d]", index);
-        }*/
-
-        //return;
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents != 1)
-    {
-        //Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t mask;
-            if (psOperand->ui32CompMask != 0)
-            {
-                mask = psOperand->ui32CompMask & ui32ComponentMask;
-            }
-            else
-            {
-                mask = ui32ComponentMask;
-            }
-
-            if (mask != 0 && mask != OPERAND_4_COMPONENT_MASK_ALL)
-            {
-                bcatcstr(metal, ".");
-                if (mask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    bcatcstr(metal, "x");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    bcatcstr(metal, "y");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    bcatcstr(metal, "z");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    bcatcstr(metal, "w");
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (ui32ComponentMask != OPERAND_4_COMPONENT_MASK_ALL ||
-                !(psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X &&
-                  psOperand->aui32Swizzle[1] == OPERAND_4_COMPONENT_Y &&
-                  psOperand->aui32Swizzle[2] == OPERAND_4_COMPONENT_Z &&
-                  psOperand->aui32Swizzle[3] == OPERAND_4_COMPONENT_W
-                  )
-                )
-            {
-                uint32_t i;
-
-                bcatcstr(metal, ".");
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (!(ui32ComponentMask & (OPERAND_4_COMPONENT_MASK_X << i)))
-                    {
-                        continue;
-                    }
-
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        bcatcstr(metal, "y");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        bcatcstr(metal, "z");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        bcatcstr(metal, "w");
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE) // ui32ComponentMask is ignored in this case
-        {
-            bcatcstr(metal, ".");
-
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                bcatcstr(metal, "x");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                bcatcstr(metal, "y");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                bcatcstr(metal, "z");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                bcatcstr(metal, "w");
-            }
-        }
-
-        //Component Select 1
-    }
-}
-
-void TranslateGmemOperandSwizzleWithMaskMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32ComponentMask, uint32_t gmemNumElements)
-{
-    // Similar as TranslateOperandSwizzleWithMaskMETAL but need to considerate max # of elements
-
-    bstring metal = *psContext->currentShaderString;
-
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return;
-        }
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents != 1)
-    {
-        //Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t mask;
-            if (psOperand->ui32CompMask != 0)
-            {
-                mask = psOperand->ui32CompMask & ui32ComponentMask;
-            }
-            else
-            {
-                mask = ui32ComponentMask;
-            }
-
-            if (mask != 0 && mask != OPERAND_4_COMPONENT_MASK_ALL)
-            {
-                bcatcstr(metal, ".");
-                if (mask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    bcatcstr(metal, "x");
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    if (gmemNumElements < 2)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "y");
-                    }
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    if (gmemNumElements < 3)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "z");
-                    }
-                }
-                if (mask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    if (gmemNumElements < 4)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "w");
-                    }
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (ui32ComponentMask != OPERAND_4_COMPONENT_MASK_ALL ||
-                !(psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X &&
-                  psOperand->aui32Swizzle[1] == OPERAND_4_COMPONENT_Y &&
-                  psOperand->aui32Swizzle[2] == OPERAND_4_COMPONENT_Z &&
-                  psOperand->aui32Swizzle[3] == OPERAND_4_COMPONENT_W
-                  )
-                )
-            {
-                uint32_t i;
-
-                bcatcstr(metal, ".");
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (!(ui32ComponentMask & (OPERAND_4_COMPONENT_MASK_X << i)))
-                    {
-                        continue;
-                    }
-
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        bcatcstr(metal, "x");
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        if (gmemNumElements < 2)
-                        {
-                            bcatcstr(metal, "x");
-                        }
-                        else
-                        {
-                            bcatcstr(metal, "y");
-                        }
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        if (gmemNumElements < 3)
-                        {
-                            bcatcstr(metal, "x");
-                        }
-                        else
-                        {
-                            bcatcstr(metal, "z");
-                        }
-                    }
-                    else if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        if (gmemNumElements < 4)
-                        {
-                            bcatcstr(metal, "x");
-                        }
-                        else
-                        {
-                            bcatcstr(metal, "w");
-                        }
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)         // ui32ComponentMask is ignored in this case
-        {
-            bcatcstr(metal, ".");
-
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                bcatcstr(metal, "x");
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                if (gmemNumElements < 2)
-                {
-                    bcatcstr(metal, "x");
-                }
-                else
-                {
-                    bcatcstr(metal, "y");
-                }
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                if (gmemNumElements < 3)
-                {
-                    bcatcstr(metal, "x");
-                }
-                else
-                {
-                    bcatcstr(metal, "z");
-                }
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                if (gmemNumElements < 4)
-                {
-                    bcatcstr(metal, "x");
-                }
-                else
-                {
-                    bcatcstr(metal, "w");
-                }
-            }
-        }
-
-        //Component Select 1
-    }
-}
-
-int GetFirstOperandSwizzleMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    if (psOperand->eType == OPERAND_TYPE_INPUT)
-    {
-        if (psContext->psShader->abScalarInput[psOperand->ui32RegisterNumber])
-        {
-            return -1;
-        }
-    }
-
-    if (psOperand->iWriteMaskEnabled &&
-        psOperand->iNumComponents == 4)
-    {
-        //Component Mask
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            if (psOperand->ui32CompMask != 0 && psOperand->ui32CompMask != (OPERAND_4_COMPONENT_MASK_X | OPERAND_4_COMPONENT_MASK_Y | OPERAND_4_COMPONENT_MASK_Z | OPERAND_4_COMPONENT_MASK_W))
-            {
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_X)
-                {
-                    return 0;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Y)
-                {
-                    return 1;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_Z)
-                {
-                    return 2;
-                }
-                if (psOperand->ui32CompMask & OPERAND_4_COMPONENT_MASK_W)
-                {
-                    return 3;
-                }
-            }
-        }
-        else
-        //Component Swizzle
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle != (NO_SWIZZLE))
-            {
-                uint32_t i;
-
-                for (i = 0; i < 4; ++i)
-                {
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_X)
-                    {
-                        return 0;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Y)
-                    {
-                        return 1;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_Z)
-                    {
-                        return 2;
-                    }
-                    else
-                    if (psOperand->aui32Swizzle[i] == OPERAND_4_COMPONENT_W)
-                    {
-                        return 3;
-                    }
-                }
-            }
-        }
-        else
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_X)
-            {
-                return 0;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Y)
-            {
-                return 1;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_Z)
-            {
-                return 2;
-            }
-            else
-            if (psOperand->aui32Swizzle[0] == OPERAND_4_COMPONENT_W)
-            {
-                return 3;
-            }
-        }
-
-        //Component Select 1
-    }
-
-    return -1;
-}
-
-void TranslateOperandIndexMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index)
-{
-    int i = index;
-
-    bstring metal = *psContext->currentShaderString;
-
-    ASSERT(index < psOperand->iIndexDims);
-
-    switch (psOperand->eIndexRep[i])
-    {
-    case OPERAND_INDEX_IMMEDIATE32:
-    {
-        if (i > 0)
-        {
-            bformata(metal, "[%d]", psOperand->aui32ArraySizes[i]);
-        }
-        else
-        {
-            bformata(metal, "%d", psOperand->aui32ArraySizes[i]);
-        }
-        break;
-    }
-    case OPERAND_INDEX_RELATIVE:
-    {
-        bcatcstr(metal, "[");
-        TranslateOperandMETAL(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-        bcatcstr(metal, "]");
-        break;
-    }
-    case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-    {
-        bcatcstr(metal, "[");     //Indexes must be integral.
-        TranslateOperandMETAL(psContext, psOperand->psSubOperand[i], TO_FLAG_INTEGER);
-        bformata(metal, " + %d]", psOperand->aui32ArraySizes[i]);
-        break;
-    }
-    default:
-    {
-        break;
-    }
-    }
-}
-
-void TranslateOperandIndexMADMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, int index, uint32_t multiply, uint32_t add)
-{
-    int i = index;
-
-    bstring metal = *psContext->currentShaderString;
-
-    ASSERT(index < psOperand->iIndexDims);
-
-    switch (psOperand->eIndexRep[i])
-    {
-    case OPERAND_INDEX_IMMEDIATE32:
-    {
-        if (i > 0)
-        {
-            bformata(metal, "[%d*%d+%d]", psOperand->aui32ArraySizes[i], multiply, add);
-        }
-        else
-        {
-            bformata(metal, "%d*%d+%d", psOperand->aui32ArraySizes[i], multiply, add);
-        }
-        break;
-    }
-    case OPERAND_INDEX_RELATIVE:
-    {
-        bcatcstr(metal, "[int(");     //Indexes must be integral.
-        TranslateOperandMETAL(psContext, psOperand->psSubOperand[i], TO_FLAG_NONE);
-        bformata(metal, ")*%d+%d]", multiply, add);
-        break;
-    }
-    case OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE:
-    {
-        bcatcstr(metal, "[(int(");     //Indexes must be integral.
-        TranslateOperandMETAL(psContext, psOperand->psSubOperand[i], TO_FLAG_NONE);
-        bformata(metal, ") + %d)*%d+%d]", psOperand->aui32ArraySizes[i], multiply, add);
-        break;
-    }
-    default:
-    {
-        break;
-    }
-    }
-}
-
-// Returns nonzero if a direct constructor can convert src->dest
-static int METALCanDoDirectCast( SHADER_VARIABLE_TYPE src, SHADER_VARIABLE_TYPE dest)
-{
-    // uint<->int<->bool conversions possible
-    if ((src == SVT_INT || src == SVT_UINT || src == SVT_BOOL) && (dest == SVT_INT || dest == SVT_UINT || dest == SVT_BOOL))
-    {
-        return 1;
-    }
-
-    // float<->double possible
-    if ((src == SVT_FLOAT || src == SVT_DOUBLE) && (dest == SVT_FLOAT || dest == SVT_DOUBLE))
-    {
-        return 1;
-    }
-
-    return 0;
-}
-
-// Returns true if one of the src or dest is half float while the other is not
-static int IsHalfFloatCastNeeded(SHADER_VARIABLE_TYPE src, SHADER_VARIABLE_TYPE dest)
-{
-    // uint<->int<->bool conversions possible
-    if ((src == SVT_FLOAT16) && (dest != SVT_FLOAT16))
-    {
-        return 1;
-    }
-
-    // float<->double possible
-    if ((src != SVT_FLOAT16) && (dest == SVT_FLOAT16))
-    {
-        return 1;
-    }
-
-    return 0;
-}
-
-static const char* GetOpDestType(SHADER_VARIABLE_TYPE to)
-{
-    switch (to)
-    {
-    case SVT_FLOAT:
-        return "float";
-        break;
-    case SVT_FLOAT16:
-        return "half";
-        break;
-    case SVT_INT:
-        return "int";
-        break;
-    case SVT_UINT:
-        return "uint";
-        break;
-    default:
-        ASSERT(0);
-        return "";
-    }
-}
-
-static const char* GetOpCastType(SHADER_VARIABLE_TYPE from, SHADER_VARIABLE_TYPE to)
-{
-    if (to == SVT_FLOAT && (from == SVT_INT || from == SVT_UINT))
-    {
-        return "as_type";
-    }
-    else if (to == SVT_INT && (from == SVT_FLOAT || from == SVT_UINT))
-    {
-        return "as_type";
-    }
-    else if (to == SVT_UINT && (from == SVT_FLOAT || from == SVT_INT))
-    {
-        return "as_type";
-    }
-    
-    ASSERT(0);
-    return "ERROR missing components in GetBitcastOp()";
-}
-
-// Helper function to print out a single 32-bit immediate value in desired format
-static void METALprintImmediate32(HLSLCrossCompilerContext* psContext, uint32_t value, SHADER_VARIABLE_TYPE eType)
-{
-    bstring metal = *psContext->currentShaderString;
-    int needsParenthesis = 0;
-
-    if (eType == SVT_FLOAT || eType == SVT_FLOAT16)
-    {
-        // Print floats as bit patterns.
-        switch (eType)
-        {
-        case SVT_FLOAT:
-            bcatcstr(metal, "as_type<float>(");
-            break;
-        case SVT_FLOAT16:
-            bcatcstr(metal, "static_cast<half>(");
-            break;
-        }
-        
-        eType = SVT_INT;
-        needsParenthesis = 1;
-    }
-    
-
-
-    switch (eType)
-    {
-    default:
-    case SVT_INT:
-        // Need special handling for anything >= uint 0x3fffffff
-        if (value > 0x3ffffffe)
-        {
-            bformata(metal, "int(0x%Xu)", value);
-        }
-        else
-        {
-            bformata(metal, "0x%X", value);
-        }
-        break;
-    case SVT_UINT:
-        bformata(metal, "%uu", value);
-        break;
-    case SVT_FLOAT:
-        bformata(metal, "%f", *((float*)(&value)));
-        break;
-    }
-    if (needsParenthesis)
-    {
-        bcatcstr(metal, ")");
-    }
-}
-
-static void METALMETALTranslateVariableNameWithMask(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t* pui32IgnoreSwizzle, uint32_t ui32CompMask)
-{
-    int numParenthesis = 0;
-    int hasCtor = 0;
-    bstring metal = *psContext->currentShaderString;
-    SHADER_VARIABLE_TYPE requestedType = TypeFlagsToSVTTypeMETAL(ui32TOFlag);
-    SHADER_VARIABLE_TYPE eType = GetOperandDataTypeExMETAL(psContext, psOperand, requestedType);
-    int numComponents = GetNumSwizzleElementsWithMaskMETAL(psOperand, ui32CompMask);
-    int requestedComponents = 0;
-
-    if (ui32TOFlag & TO_AUTO_EXPAND_TO_VEC2)
-    {
-        requestedComponents = 2;
-    }
-    else if (ui32TOFlag & TO_AUTO_EXPAND_TO_VEC3)
-    {
-        requestedComponents = 3;
-    }
-    else if (ui32TOFlag & TO_AUTO_EXPAND_TO_VEC4)
-    {
-        requestedComponents = 4;
-    }
-
-    requestedComponents = max(requestedComponents, numComponents);
-
-    *pui32IgnoreSwizzle = 0;
-
-
-    if (!(ui32TOFlag & (TO_FLAG_DESTINATION | TO_FLAG_NAME_ONLY | TO_FLAG_DECLARATION_NAME)))
-    {
-        if (psOperand->eType == OPERAND_TYPE_IMMEDIATE32 || psOperand->eType == OPERAND_TYPE_IMMEDIATE64)
-        {
-            // Mark the operand type to match whatever we're asking for in the flags.
-            ((Operand*)psOperand)->aeDataType[0] = requestedType;
-            ((Operand*)psOperand)->aeDataType[1] = requestedType;
-            ((Operand*)psOperand)->aeDataType[2] = requestedType;
-            ((Operand*)psOperand)->aeDataType[3] = requestedType;
-        }
-
-        if (eType != requestedType)
-        {
-            if (METALCanDoDirectCast(eType, requestedType))
-            {
-                bformata(metal, "%s(", GetConstructorForTypeMETAL(requestedType, requestedComponents));               
-                hasCtor = 1;
-            }
-            else if (IsHalfFloatCastNeeded(eType, requestedType))
-            {
-                // half float static cast needed
-                if (requestedComponents > 1)
-                {
-                    bformata(metal, "static_cast<%s%i>(", GetOpDestType(requestedType), requestedComponents);
-                }
-                else
-                {
-                    bformata(metal, "static_cast<%s>(", GetOpDestType(requestedType));
-                }                
-            }
-            else
-            {
-                // Direct cast not possible, need to do bitcast.
-                if (requestedComponents > 1)
-                {
-                    bformata(metal, "%s<%s%i>(", GetOpCastType(eType, requestedType), GetOpDestType(requestedType), requestedComponents);
-                }
-                else
-                {
-                    bformata(metal, "%s<%s>(", GetOpCastType(eType, requestedType), GetOpDestType(requestedType));
-                }               
-            }
-            numParenthesis++;
-        }
-
-        // Add ctor if needed (upscaling)
-        if (numComponents < requestedComponents && (hasCtor == 0))
-        {
-            ASSERT(numComponents == 1);
-            bformata(metal, "%s(", GetConstructorForTypeMETAL(requestedType, requestedComponents));
-            numParenthesis++;
-            hasCtor = 1;
-        }
-    }
-
-
-    switch (psOperand->eType)
-    {
-    case OPERAND_TYPE_IMMEDIATE32:
-    {
-        if (psOperand->iNumComponents == 1)
-        {
-            METALprintImmediate32(psContext, *((unsigned int*)(&psOperand->afImmediates[0])), requestedType);
-        }
-        else
-        {
-            int i;
-            int firstItemAdded = 0;
-            if (hasCtor == 0)
-            {
-                bformata(metal, "%s(", GetConstructorForTypeMETAL(requestedType, numComponents));
-                numParenthesis++;
-                hasCtor = 1;
-            }
-            for (i = 0; i < 4; i++)
-            {
-                uint32_t uval;
-                if (!(ui32CompMask & (1 << i)))
-                {
-                    continue;
-                }
-
-                if (firstItemAdded)
-                {
-                    bcatcstr(metal, ", ");
-                }
-                uval = *((uint32_t*)(&psOperand->afImmediates[i]));
-                METALprintImmediate32(psContext, uval, requestedType);
-                firstItemAdded = 1;
-            }
-            bcatcstr(metal, ")");
-            *pui32IgnoreSwizzle = 1;
-            numParenthesis--;
-        }
-        break;
-    }
-    case OPERAND_TYPE_IMMEDIATE64:
-    {
-        if (psOperand->iNumComponents == 1)
-        {
-            bformata(metal, "%f",
-                psOperand->adImmediates[0]);
-        }
-        else
-        {
-            bformata(metal, "float4(%f, %f, %f, %f)",
-                psOperand->adImmediates[0],
-                psOperand->adImmediates[1],
-                psOperand->adImmediates[2],
-                psOperand->adImmediates[3]);
-            if (psOperand->iNumComponents != 4)
-            {
-                AddSwizzleUsingElementCountMETAL(psContext, psOperand->iNumComponents);
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_INPUT:
-    {
-        switch (psOperand->iIndexDims)
-        {
-        case INDEX_2D:
-        {
-            if (psOperand->aui32ArraySizes[1] == 0)       //Input index zero - position.
-            {
-                bcatcstr(metal, "stageIn");
-                TranslateOperandIndexMETAL(psContext, psOperand, 0);        //Vertex index
-                bcatcstr(metal, ".position");
-            }
-            else
-            {
-                const char* name = "Input";
-                if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-                {
-                    name = GetDeclaredInputNameMETAL(psContext, psContext->psShader->eShaderType, psOperand);
-                }
-
-                bformata(metal, "%s%d", name, psOperand->aui32ArraySizes[1]);
-                TranslateOperandIndexMETAL(psContext, psOperand, 0);        //Vertex index
-            }
-            break;
-        }
-        default:
-        {
-            if (psOperand->eIndexRep[0] == OPERAND_INDEX_IMMEDIATE32_PLUS_RELATIVE)
-            {
-                bformata(metal, "Input%d[", psOperand->ui32RegisterNumber);
-                TranslateOperandMETAL(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-                bcatcstr(metal, "]");
-            }
-            else
-            {
-                if (psContext->psShader->aIndexedInput[psOperand->ui32RegisterNumber] != 0)
-                {
-                    const uint32_t parentIndex = psContext->psShader->aIndexedInputParents[psOperand->ui32RegisterNumber];
-                    bformata(metal, "Input%d[%d]", parentIndex,
-                        psOperand->ui32RegisterNumber - parentIndex);
-                }
-                else
-                {
-                    if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-                    {
-                        const char* name = GetDeclaredInputNameMETAL(psContext, psContext->psShader->eShaderType, psOperand);
-                        bcatcstr(metal, name);
-                    }
-                    else
-                    {
-                        bformata(metal, "Input%d", psOperand->ui32RegisterNumber);
-                    }
-                }
-            }
-            break;
-        }
-        }
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT:
-    {
-        bformata(metal, "Output%d", psOperand->ui32RegisterNumber);
-        if (psOperand->psSubOperand[0])
-        {
-            bcatcstr(metal, "[");
-            TranslateOperandMETAL(psContext, psOperand->psSubOperand[0], TO_AUTO_BITCAST_TO_INT);
-            bcatcstr(metal, "]");
-        }
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_DEPTH:
-    {
-        bcatcstr(metal, "DepthAny");
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_DEPTH_GREATER_EQUAL:
-    {
-        bcatcstr(metal, "DepthGreater");
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_DEPTH_LESS_EQUAL:
-    {
-        bcatcstr(metal, "DepthLess");
-        break;
-    }
-    case OPERAND_TYPE_TEMP:
-    {
-        SHADER_VARIABLE_TYPE eType2 = GetOperandDataTypeMETAL(psContext, psOperand);
-        bcatcstr(metal, "Temp");
-
-        if (eType2 == SVT_INT)
-        {
-            bcatcstr(metal, "_int");
-        }
-        else if (eType2 == SVT_UINT)
-        {
-            bcatcstr(metal, "_uint");
-        }
-        else if (eType2 == SVT_DOUBLE)
-        {
-            bcatcstr(metal, "_double");
-        }
-        else if (eType2 == SVT_FLOAT16)
-        {
-            bcatcstr(metal, "_half");
-        }
-        else if (eType2 == SVT_VOID &&
-                 (ui32TOFlag & TO_FLAG_DESTINATION))
-        {
-            ASSERT(0 && "Should never get here!");
-            /*                if(ui32TOFlag & TO_FLAG_INTEGER)
-                            {
-                                bcatcstr(metal, "_int");
-                            }
-                            else
-                            if(ui32TOFlag & TO_FLAG_UNSIGNED_INTEGER)
-                            {
-                                bcatcstr(metal, "_uint");
-                            }*/
-        }
-
-        bformata(metal, "[%d]", psOperand->ui32RegisterNumber);
-
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_IMMCONSTINT:
-    {
-        bformata(metal, "IntImmConst%d", psOperand->ui32RegisterNumber);
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_IMMCONST:
-    {
-        if (psOperand->psSubOperand[0] != NULL)
-        {
-            if (psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber] != 0)
-            {
-                bformata(metal, "ImmConstArray[%d + ", psContext->psShader->aui32Dx9ImmConstArrayRemap[psOperand->ui32RegisterNumber]);
-            }
-            else
-            {
-                bcatcstr(metal, "ImmConstArray[");
-            }
-            TranslateOperandWithMaskMETAL(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER, OPERAND_4_COMPONENT_MASK_X);
-            bcatcstr(metal, "]");
-        }
-        else
-        {
-            bformata(metal, "ImmConst%d", psOperand->ui32RegisterNumber);
-        }
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_OUTBASECOLOUR:
-    {
-        bcatcstr(metal, "BaseColour");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_OUTOFFSETCOLOUR:
-    {
-        bcatcstr(metal, "OffsetColour");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_POSITION:
-    {
-        switch (psContext->psShader->eShaderType)
-        {
-        case PIXEL_SHADER:
-        {
-            if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-            {
-                bcatcstr(metal, "stageIn.");
-            }
-            bcatcstr(metal, "position");
-            break;
-        }
-        case VERTEX_SHADER:
-        {
-            if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-            {
-                bcatcstr(metal, "output.");
-            }
-            bcatcstr(metal, "position");
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_FOG:
-    {
-        bcatcstr(metal, "Fog");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_POINTSIZE:
-    {
-        switch (psContext->psShader->eShaderType)
-        {
-        case PIXEL_SHADER:
-        {
-            if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-            {
-                bcatcstr(metal, "stageIn.");
-            }
-            bcatcstr(metal, "pointSize");
-            break;
-        }
-        case VERTEX_SHADER:
-        {
-            if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-            {
-                bcatcstr(metal, "output.");
-            }
-            bcatcstr(metal, "pointSize");
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_ADDRESS:
-    {
-        bcatcstr(metal, "Address");
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_LOOPCOUNTER:
-    {
-        bcatcstr(metal, "LoopCounter");
-        pui32IgnoreSwizzle[0] = 1;
-        break;
-    }
-    case OPERAND_TYPE_SPECIAL_TEXCOORD:
-    {
-        bformata(metal, "TexCoord%d", psOperand->ui32RegisterNumber);
-        break;
-    }
-    case OPERAND_TYPE_CONSTANT_BUFFER:
-    {
-        const char* StageName = "VS";
-        ConstantBuffer* psCBuf = NULL;
-        ShaderVarType* psVarType = NULL;
-        int32_t index = -1;
-        GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-
-        switch (psContext->psShader->eShaderType)
-        {
-        case PIXEL_SHADER:
-        {
-            StageName = "PS";
-            break;
-        }
-        ////////////////////// FOLLOWING SHOULDN'T HIT IN METAL AS IT'S NOT SUPPORTED //////////////////////////////////////////
-        case HULL_SHADER:
-        {
-            StageName = "HS";
-            break;
-        }
-        case DOMAIN_SHADER:
-        {
-            StageName = "DS";
-            break;
-        }
-        case GEOMETRY_SHADER:
-        {
-            StageName = "GS";
-            break;
-        }
-        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        case COMPUTE_SHADER:
-        {
-            StageName = "CS";
-            break;
-        }
-        default:
-        {
-            break;
-        }
-        }
-
-        if (ui32TOFlag & TO_FLAG_DECLARATION_NAME)
-        {
-            pui32IgnoreSwizzle[0] = 1;
-        }
-
-        // FIXME: With ES 3.0 the buffer name is often not prepended to variable names
-        if (((psContext->flags & HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT) != HLSLCC_FLAG_UNIFORM_BUFFER_OBJECT) &&
-            ((psContext->flags & HLSLCC_FLAG_DISABLE_GLOBALS_STRUCT) != HLSLCC_FLAG_DISABLE_GLOBALS_STRUCT))
-        {
-            if (psCBuf)
-            {
-                //$Globals.
-                if (psCBuf->Name[0] == '$')
-                {
-                    bformata(metal, "Globals%s", StageName);
-                }
-                else
-                {
-                    bformata(metal, "%s%s", psCBuf->Name, StageName);
-                }
-                if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-                {
-                    bcatcstr(metal, ".");
-                }
-            }
-            else
-            {
-                //bformata(metal, "cb%d", psOperand->aui32ArraySizes[0]);
-            }
-        }
-
-        if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-        {
-            //Work out the variable name. Don't apply swizzle to that variable yet.
-            int32_t rebase = 0;
-
-            if (psCBuf && !psCBuf->blob)
-            {
-                GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-
-                bformata(metal, "%s", psVarType->FullName);
-            }
-            else if (psCBuf)
-            {
-                bformata(metal, "%s%s_data", psCBuf->Name, StageName);
-                if (psContext->psShader->eShaderType == PIXEL_SHADER)
-                {
-                    bformata(metal, ".%s", psCBuf->asVars->Name);
-                }
-                else if (psContext->psShader->eShaderType == VERTEX_SHADER)
-                {
-                    bformata(metal, "->%s", psCBuf->asVars->Name);
-                }
-                else
-                {
-                    ASSERT(0);
-                }
-                index = psOperand->aui32ArraySizes[1];
-            }
-            else     // We don't have a semantic for this variable, so try the raw dump appoach.
-            {
-                bformata(metal, "cb%d.data", psOperand->aui32ArraySizes[0]);    //
-                index = psOperand->aui32ArraySizes[1];
-            }
-
-            //Dx9 only?
-            if (psOperand->psSubOperand[0] != NULL)
-            {
-                // Array of matrices is treated as array of vec4s in HLSL,
-                // but that would mess up uniform types in metal. Do gymnastics.
-                uint32_t opFlags = TO_FLAG_INTEGER;
-
-                if (psVarType && (psVarType->Class == SVC_MATRIX_COLUMNS || psVarType->Class == SVC_MATRIX_ROWS) && (psVarType->Elements > 1))
-                {
-                    // Special handling for matrix arrays
-                    bcatcstr(metal, "[(");
-                    TranslateOperandMETAL(psContext, psOperand->psSubOperand[0], opFlags);
-                    bformata(metal, ") / 4]");
-                    if (psContext->psShader->eTargetLanguage <= LANG_120)
-                    {
-                        bcatcstr(metal, "[int(mod(float(");
-                        TranslateOperandWithMaskMETAL(psContext, psOperand->psSubOperand[0], opFlags, OPERAND_4_COMPONENT_MASK_X);
-                        bformata(metal, "), 4.0))]");
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "[((");
-                        TranslateOperandWithMaskMETAL(psContext, psOperand->psSubOperand[0], opFlags, OPERAND_4_COMPONENT_MASK_X);
-                        bformata(metal, ") %% 4)]");
-                    }
-                }
-                else
-                {
-                    bcatcstr(metal, "[");
-                    TranslateOperandMETAL(psContext, psOperand->psSubOperand[0], opFlags);
-                    bformata(metal, "]");
-                }
-            }
-            else
-            if (index != -1 && psOperand->psSubOperand[1] != NULL)
-            {
-                // Array of matrices is treated as array of vec4s in HLSL,
-                // but that would mess up uniform types in metal. Do gymnastics.
-                SHADER_VARIABLE_TYPE eType2 = GetOperandDataTypeMETAL(psContext, psOperand->psSubOperand[1]);
-                uint32_t opFlags = TO_FLAG_INTEGER;
-                if (eType2 != SVT_INT && eType2 != SVT_UINT)
-                {
-                    opFlags = TO_AUTO_BITCAST_TO_INT;
-                }
-
-                if (psVarType && (psVarType->Class == SVC_MATRIX_COLUMNS || psVarType->Class == SVC_MATRIX_ROWS) && (psVarType->Elements > 1))
-                {
-                    // Special handling for matrix arrays
-                    bcatcstr(metal, "[(");
-                    TranslateOperandMETAL(psContext, psOperand->psSubOperand[1], opFlags);
-                    bformata(metal, " + %d) / 4]", index);
-                    if (psContext->psShader->eTargetLanguage <= LANG_120)
-                    {
-                        bcatcstr(metal, "[int(mod(float(");
-                        TranslateOperandMETAL(psContext, psOperand->psSubOperand[1], opFlags);
-                        bformata(metal, " + %d), 4.0))]", index);
-                    }
-                    else
-                    {
-                        bcatcstr(metal, "[((");
-                        TranslateOperandMETAL(psContext, psOperand->psSubOperand[1], opFlags);
-                        bformata(metal, " + %d) %% 4)]", index);
-                    }
-                }
-                else
-                {
-                    bcatcstr(metal, "[");
-                    TranslateOperandMETAL(psContext, psOperand->psSubOperand[1], opFlags);
-                    bformata(metal, " + %d]", index);
-                }
-            }
-            else if (index != -1)
-            {
-                if (psVarType && (psVarType->Class == SVC_MATRIX_COLUMNS || psVarType->Class == SVC_MATRIX_ROWS) && (psVarType->Elements > 1))
-                {
-                    // Special handling for matrix arrays, open them up into vec4's
-                    size_t matidx = index / 4;
-                    size_t rowidx = index - (matidx * 4);
-                    bformata(metal, "[%d][%d]", matidx, rowidx);
-                }
-                else
-                {
-                    bformata(metal, "[%d]", index);
-                }
-            }
-            else if (psOperand->psSubOperand[1] != NULL)
-            {
-                bcatcstr(metal, "[");
-                TranslateOperandMETAL(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-                bcatcstr(metal, "]");
-            }
-
-            if (psVarType && psVarType->Class == SVC_VECTOR)
-            {
-                switch (rebase)
-                {
-                case 4:
-                {
-                    if (psVarType->Columns == 2)
-                    {
-                        //.x(metal) is .y(HLSL). .y(metal) is .z(HLSL)
-                        bcatcstr(metal, ".xxyx");
-                    }
-                    else if (psVarType->Columns == 3)
-                    {
-                        //.x(metal) is .y(HLSL). .y(metal) is .z(HLSL) .z(metal) is .w(HLSL)
-                        bcatcstr(metal, ".xxyz");
-                    }
-                    break;
-                }
-                case 8:
-                {
-                    if (psVarType->Columns == 2)
-                    {
-                        //.x(metal) is .z(HLSL). .y(metal) is .w(HLSL)
-                        bcatcstr(metal, ".xxxy");
-                    }
-                    break;
-                }
-                case 0:
-                default:
-                {
-                    //No rebase, but extend to vec4.
-                    if (psVarType->Columns == 2)
-                    {
-                        bcatcstr(metal, ".xyxx");
-                    }
-                    else if (psVarType->Columns == 3)
-                    {
-                        bcatcstr(metal, ".xyzx");
-                    }
-                    break;
-                }
-                }
-            }
-
-            if (psVarType && psVarType->Class == SVC_SCALAR)
-            {
-                *pui32IgnoreSwizzle = 1;
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_RESOURCE:
-    {
-        ResourceNameMETAL(metal, psContext, RGROUP_TEXTURE, psOperand->ui32RegisterNumber, 0);
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_SAMPLER:
-    {
-        bformata(metal, "Sampler%d", psOperand->ui32RegisterNumber);
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_FUNCTION_BODY:
-    {
-        const uint32_t ui32FuncBody = psOperand->ui32RegisterNumber;
-        const uint32_t ui32FuncTable = psContext->psShader->aui32FuncBodyToFuncTable[ui32FuncBody];
-        //const uint32_t ui32FuncPointer = psContext->psShader->aui32FuncTableToFuncPointer[ui32FuncTable];
-        const uint32_t ui32ClassType = psContext->psShader->sInfo.aui32TableIDToTypeID[ui32FuncTable];
-        const char* ClassTypeName = &psContext->psShader->sInfo.psClassTypes[ui32ClassType].Name[0];
-        const uint32_t ui32UniqueClassFuncIndex = psContext->psShader->ui32NextClassFuncName[ui32ClassType]++;
-
-        bformata(metal, "%s_Func%d", ClassTypeName, ui32UniqueClassFuncIndex);
-        break;
-    }
-    case OPERAND_TYPE_INPUT_FORK_INSTANCE_ID:
-    {
-        bcatcstr(metal, "forkInstanceID");
-        *pui32IgnoreSwizzle = 1;
-        return;
-    }
-    case OPERAND_TYPE_IMMEDIATE_CONSTANT_BUFFER:
-    {
-        bcatcstr(metal, "immediateConstBufferF");
-
-        if (psOperand->psSubOperand[0])
-        {
-            bcatcstr(metal, "(");     //Indexes must be integral.
-            TranslateOperandMETAL(psContext, psOperand->psSubOperand[0], TO_FLAG_INTEGER);
-            bcatcstr(metal, ")");
-        }
-        break;
-    }
-    case OPERAND_TYPE_INPUT_DOMAIN_POINT:
-    {
-        bcatcstr(metal, "gl_TessCoord");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_CONTROL_POINT:
-    {
-        if (psOperand->aui32ArraySizes[1] == 0)   //Input index zero - position.
-        {
-            if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-            {
-                bcatcstr(metal, "stageIn.");
-            }
-            bformata(metal, "position", psOperand->aui32ArraySizes[0]);
-        }
-        else
-        {
-            bformata(metal, "Input%d[%d]", psOperand->aui32ArraySizes[1], psOperand->aui32ArraySizes[0]);
-        }
-        break;
-    }
-    case OPERAND_TYPE_NULL:
-    {
-        // Null register, used to discard results of operations
-        bcatcstr(metal, "//null");
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID:
-    {
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-    {
-        if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-        {
-            bcatcstr(metal, "output.");
-        }
-        bcatcstr(metal, "sampleMask");
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_INPUT_COVERAGE_MASK:
-    {
-        if ((ui32TOFlag & TO_FLAG_DECLARATION_NAME) != TO_FLAG_DECLARATION_NAME)
-        {
-            bcatcstr(metal, "stageIn.");
-        }
-        bcatcstr(metal, "sampleMask");
-        //Skip swizzle on scalar types.
-        *pui32IgnoreSwizzle = 1;
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_ID:    //SV_DispatchThreadID
-    {
-        bcatcstr(metal, "vThreadID");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_GROUP_ID:    //SV_GroupThreadID
-    {
-        bcatcstr(metal, "vThreadGroupID");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP:    //SV_GroupID
-    {
-        bcatcstr(metal, "vThreadIDInGroup");
-        break;
-    }
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED:    //SV_GroupIndex
-    {
-        bcatcstr(metal, "vThreadIDInGroupFlattened");
-        *pui32IgnoreSwizzle = 1;     // No swizzle meaningful for scalar.
-        break;
-    }
-    case OPERAND_TYPE_UNORDERED_ACCESS_VIEW:
-    {
-        ResourceNameMETAL(metal, psContext, RGROUP_UAV, psOperand->ui32RegisterNumber, 0);
-        if (ui32TOFlag | TO_FLAG_NAME_ONLY)
-        {
-            *pui32IgnoreSwizzle = 1;
-        }
-        break;
-    }
-    case OPERAND_TYPE_THREAD_GROUP_SHARED_MEMORY:
-    {
-        bformata(metal, "TGSM%d", psOperand->ui32RegisterNumber);
-        *pui32IgnoreSwizzle = 1;     // No swizzle meaningful for scalar.
-        break;
-    }
-    case OPERAND_TYPE_INPUT_PRIMITIVEID:
-    {
-        break;
-    }
-    case OPERAND_TYPE_INDEXABLE_TEMP:
-    {
-        bformata(metal, "TempArray%d", psOperand->aui32ArraySizes[0]);
-        bcatcstr(metal, "[");
-        if (psOperand->aui32ArraySizes[1] != 0 || !psOperand->psSubOperand[1])
-        {
-            bformata(metal, "%d", psOperand->aui32ArraySizes[1]);
-        }
-
-        if (psOperand->psSubOperand[1])
-        {
-            if (psOperand->aui32ArraySizes[1] != 0)
-            {
-                bcatcstr(metal, "+");
-            }
-            TranslateOperandMETAL(psContext, psOperand->psSubOperand[1], TO_FLAG_INTEGER);
-        }
-        bcatcstr(metal, "]");
-        break;
-    }
-    case OPERAND_TYPE_STREAM:
-    {
-        bformata(metal, "%d", psOperand->ui32RegisterNumber);
-        break;
-    }
-    case OPERAND_TYPE_INPUT_GS_INSTANCE_ID:
-    {
-        // No GS in METAL
-        break;
-    }
-    case OPERAND_TYPE_THIS_POINTER:
-    {
-        /*
-            The "this" register is a register that provides up to 4 pieces of information:
-            X: Which CB holds the instance data
-            Y: Base element offset of the instance data within the instance CB
-            Z: Base sampler index
-            W: Base Texture index
-
-            Can be different for each function call
-        */
-        break;
-    }
-    case OPERAND_TYPE_INPUT_PATCH_CONSTANT:
-    {
-        bformata(metal, "myPatchConst%d", psOperand->ui32RegisterNumber);
-        break;
-    }
-    default:
-    {
-        ASSERT(0);
-        break;
-    }
-    }
-
-    if (hasCtor && (*pui32IgnoreSwizzle == 0))
-    {
-        TranslateOperandSwizzleWithMaskMETAL(psContext, psOperand, ui32CompMask);
-        *pui32IgnoreSwizzle = 1;
-    }
-
-    if (*pui32IgnoreSwizzle == 0)
-    {
-        TranslateOperandSwizzleWithMaskMETAL(psContext, psOperand, ui32CompMask);
-    }
-
-    while (numParenthesis != 0)
-    {
-        bcatcstr(metal, ")");
-        numParenthesis--;
-    }
-}
-
-static void METALTranslateVariableName(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t* pui32IgnoreSwizzle)
-{
-    METALMETALTranslateVariableNameWithMask(psContext, psOperand, ui32TOFlag, pui32IgnoreSwizzle, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-
-SHADER_VARIABLE_TYPE GetOperandDataTypeMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand)
-{
-    return GetOperandDataTypeExMETAL(psContext, psOperand, SVT_INT);
-}
-
-SHADER_VARIABLE_TYPE GetOperandDataTypeExMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, SHADER_VARIABLE_TYPE ePreferredTypeForImmediates)
-{
-
-    // The min precision qualifier overrides all of the stuff below
-    if (psOperand->eMinPrecision == OPERAND_MIN_PRECISION_FLOAT_16)
-    {   
-        return SVT_FLOAT16;    
-    }
-
-    switch (psOperand->eType)
-    {
-    case OPERAND_TYPE_TEMP:
-    {
-        SHADER_VARIABLE_TYPE eCurrentType = SVT_VOID;
-        int i = 0;
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SELECT_1_MODE)
-        {
-            return psOperand->aeDataType[psOperand->aui32Swizzle[0]];
-        }
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_SWIZZLE_MODE)
-        {
-            if (psOperand->ui32Swizzle == (NO_SWIZZLE))
-            {
-                return psOperand->aeDataType[0];
-            }
-
-            return psOperand->aeDataType[psOperand->aui32Swizzle[0]];
-        }
-
-        if (psOperand->eSelMode == OPERAND_4_COMPONENT_MASK_MODE)
-        {
-            uint32_t ui32CompMask = psOperand->ui32CompMask;
-            if (!psOperand->ui32CompMask)
-            {
-                ui32CompMask = OPERAND_4_COMPONENT_MASK_ALL;
-            }
-            for (; i < 4; ++i)
-            {
-                if (ui32CompMask & (1 << i))
-                {
-                    eCurrentType = psOperand->aeDataType[i];
-                    break;
-                }
-            }
-
-    #ifdef _DEBUG
-            //Check if all elements have the same basic type.
-            for (; i < 4; ++i)
-            {
-                if (psOperand->ui32CompMask & (1 << i))
-                {
-                    if (eCurrentType != psOperand->aeDataType[i])
-                    {
-                        ASSERT(0);
-                    }
-                }
-            }
-    #endif
-            return eCurrentType;
-        }
-
-        ASSERT(0);
-
-        break;
-    }
-    case OPERAND_TYPE_OUTPUT:
-    {
-        const uint32_t ui32Register = psOperand->aui32ArraySizes[psOperand->iIndexDims - 1];
-        InOutSignature* psOut;
-
-        if (GetOutputSignatureFromRegister(psContext->currentPhase,
-                ui32Register,
-                psOperand->ui32CompMask,
-                0,
-                &psContext->psShader->sInfo,
-                &psOut))
-        {
-            if (psOut->eComponentType == INOUT_COMPONENT_UINT32)
-            {
-                return SVT_UINT;
-            }
-            else if (psOut->eComponentType == INOUT_COMPONENT_SINT32)
-            {
-                return SVT_INT;
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_INPUT:
-    {
-        const uint32_t ui32Register = psOperand->aui32ArraySizes[psOperand->iIndexDims - 1];
-        InOutSignature* psIn;
-
-        //UINT in DX, INT in GL.
-        if (psOperand->eSpecialName == NAME_PRIMITIVE_ID)
-        {
-            return SVT_INT;
-        }
-        if (psOperand->eSpecialName == NAME_IS_FRONT_FACE)
-        {
-            return SVT_BOOL;
-        }
-
-        if (GetInputSignatureFromRegister(ui32Register, &psContext->psShader->sInfo, &psIn))
-        {
-            if (psIn->eComponentType == INOUT_COMPONENT_UINT32)
-            {
-                return SVT_UINT;
-            }
-            else if (psIn->eComponentType == INOUT_COMPONENT_SINT32)
-            {
-                return SVT_INT;
-            }
-        }
-        break;
-    }
-    case OPERAND_TYPE_CONSTANT_BUFFER:
-    {
-        ConstantBuffer* psCBuf = NULL;
-        ShaderVarType* psVarType = NULL;
-        int32_t index = -1;
-        int32_t rebase = -1;
-        int foundVar;
-        GetConstantBufferFromBindingPoint(RGROUP_CBUFFER, psOperand->aui32ArraySizes[0], &psContext->psShader->sInfo, &psCBuf);
-        if (psCBuf && !psCBuf->blob)
-        {
-            foundVar = GetShaderVarFromOffset(psOperand->aui32ArraySizes[1], psOperand->aui32Swizzle, psCBuf, &psVarType, &index, &rebase);
-            if (foundVar && index == -1 && psOperand->psSubOperand[1] == NULL)
-            {
-                return psVarType->Type;
-            }
-        }
-        else
-        {
-            // Todo: this isn't correct yet.
-            return SVT_FLOAT;
-        }
-        break;
-    }
-    case OPERAND_TYPE_IMMEDIATE32:
-    {
-        return ePreferredTypeForImmediates;
-    }
-
-    case OPERAND_TYPE_INPUT_THREAD_ID:
-    case OPERAND_TYPE_INPUT_THREAD_GROUP_ID:
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP:
-    case OPERAND_TYPE_INPUT_THREAD_ID_IN_GROUP_FLATTENED:
-    {
-        return SVT_UINT;
-    }
-    case OPERAND_TYPE_SPECIAL_ADDRESS:
-    case OPERAND_TYPE_SPECIAL_LOOPCOUNTER:
-    {
-        return SVT_INT;
-    }
-    case OPERAND_TYPE_INPUT_GS_INSTANCE_ID:
-    {
-        return SVT_UINT;
-    }
-    case OPERAND_TYPE_OUTPUT_COVERAGE_MASK:
-    {
-        return SVT_INT;
-    }
-    case OPERAND_TYPE_OUTPUT_CONTROL_POINT_ID:
-    {
-        return SVT_INT;
-    }
-    default:
-    {
-        return SVT_FLOAT;
-    }
-    }
-
-    return SVT_FLOAT;
-}
-
-void TranslateOperandMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag)
-{
-    TranslateOperandWithMaskMETAL(psContext, psOperand, ui32TOFlag, OPERAND_4_COMPONENT_MASK_ALL);
-}
-
-void TranslateOperandWithMaskMETAL(HLSLCrossCompilerContext* psContext, const Operand* psOperand, uint32_t ui32TOFlag, uint32_t ui32ComponentMask)
-{
-    bstring metal = *psContext->currentShaderString;
-    uint32_t ui32IgnoreSwizzle = 0;
-
-    if (ui32TOFlag & TO_FLAG_NAME_ONLY)
-    {
-        METALTranslateVariableName(psContext, psOperand, ui32TOFlag, &ui32IgnoreSwizzle);
-        return;
-    }
-
-    switch (psOperand->eModifier)
-    {
-    case OPERAND_MODIFIER_NONE:
-    {
-        break;
-    }
-    case OPERAND_MODIFIER_NEG:
-    {
-        bcatcstr(metal, "(-");
-        break;
-    }
-    case OPERAND_MODIFIER_ABS:
-    {
-        bcatcstr(metal, "abs(");
-        break;
-    }
-    case OPERAND_MODIFIER_ABSNEG:
-    {
-        bcatcstr(metal, "-abs(");
-        break;
-    }
-    }
-
-    METALMETALTranslateVariableNameWithMask(psContext, psOperand, ui32TOFlag, &ui32IgnoreSwizzle, ui32ComponentMask);
-
-    switch (psOperand->eModifier)
-    {
-    case OPERAND_MODIFIER_NONE:
-    {
-        break;
-    }
-    case OPERAND_MODIFIER_NEG:
-    {
-        bcatcstr(metal, ")");
-        break;
-    }
-    case OPERAND_MODIFIER_ABS:
-    {
-        bcatcstr(metal, ")");
-        break;
-    }
-    case OPERAND_MODIFIER_ABSNEG:
-    {
-        bcatcstr(metal, ")");
-        break;
-    }
-    }
-}
-
-void ResourceNameMETAL(bstring targetStr, HLSLCrossCompilerContext* psContext, ResourceGroup group, const uint32_t ui32RegisterNumber, const int bZCompare)
-{
-    bstring metal = (targetStr == NULL) ? *psContext->currentShaderString : targetStr;
-    ResourceBinding* psBinding = 0;
-    int found;
-
-    found = GetResourceFromBindingPoint(group, ui32RegisterNumber, &psContext->psShader->sInfo, &psBinding);
-
-    if (found)
-    {
-        int i = 0;
-        char name[MAX_REFLECT_STRING_LENGTH];
-        uint32_t ui32ArrayOffset = ui32RegisterNumber - psBinding->ui32BindPoint;
-
-        while (psBinding->Name[i] != '\0' && i < (MAX_REFLECT_STRING_LENGTH - 1))
-        {
-            name[i] = psBinding->Name[i];
-
-            //array syntax [X] becomes _0_
-            //Otherwise declarations could end up as:
-            //uniform sampler2D SomeTextures[0];
-            //uniform sampler2D SomeTextures[1];
-            if (name[i] == '[' || name[i] == ']')
-            {
-                name[i] = '_';
-            }
-
-            ++i;
-        }
-
-        name[i] = '\0';
-
-        if (ui32ArrayOffset)
-        {
-            bformata(metal, "%s%d", name, ui32ArrayOffset);
-        }
-        else
-        {
-            bformata(metal, "%s", name);
-        }
-
-        if (RGROUP_SAMPLER == group)
-        {
-            if (bZCompare)
-            {
-                bcatcstr(metal, "_cmp");
-            }
-            else
-            {
-                bcatcstr(metal, "_s");
-            }
-        }
-    }
-    else
-    {
-        bformata(metal, "UnknownResource%d", ui32RegisterNumber);
-    }
-}
-
-bstring TextureSamplerNameMETAL(ShaderInfo* psShaderInfo, const uint32_t ui32TextureRegisterNumber, const uint32_t ui32SamplerRegisterNumber, const int bZCompare)
-{
-    bstring result;
-    ResourceBinding* psTextureBinding = 0;
-    ResourceBinding* psSamplerBinding = 0;
-    int foundTexture, foundSampler;
-    uint32_t i = 0;
-    char samplerName[MAX_REFLECT_STRING_LENGTH];
-    uint32_t ui32ArrayOffset;
-
-    foundTexture = GetResourceFromBindingPoint(RGROUP_TEXTURE, ui32TextureRegisterNumber, psShaderInfo, &psTextureBinding);
-    foundSampler = GetResourceFromBindingPoint(RGROUP_SAMPLER, ui32SamplerRegisterNumber, psShaderInfo, &psSamplerBinding);
-
-    if (!foundTexture || !foundSampler)
-    {
-        result = bformat("UnknownResource%d_%d", ui32TextureRegisterNumber, ui32SamplerRegisterNumber);
-        return result;
-    }
-
-    ui32ArrayOffset = ui32SamplerRegisterNumber - psSamplerBinding->ui32BindPoint;
-
-    while (psSamplerBinding->Name[i] != '\0' && i < (MAX_REFLECT_STRING_LENGTH - 1))
-    {
-        samplerName[i] = psSamplerBinding->Name[i];
-
-        //array syntax [X] becomes _0_
-        //Otherwise declarations could end up as:
-        //uniform sampler2D SomeTextures[0];
-        //uniform sampler2D SomeTextures[1];
-        if (samplerName[i] == '[' || samplerName[i] == ']')
-        {
-            samplerName[i] = '_';
-        }
-
-        ++i;
-    }
-    samplerName[i] = '\0';
-
-    result = bfromcstr("");
-
-
-
-    if (ui32ArrayOffset)
-    {
-        bformata(result, "%s%d", samplerName, ui32ArrayOffset);
-    }
-    else
-    {
-        bformata(result, "%s", samplerName);
-    }
-
-    if (bZCompare)
-    {
-        bcatcstr(result, "_cmp");
-    }
-    else
-    {
-        bcatcstr(result, "_s");
-    }
-
-    return result;
-}
-
-void ConcatTextureSamplerNameMETAL(bstring str, ShaderInfo* psShaderInfo, const uint32_t ui32TextureRegisterNumber, const uint32_t ui32SamplerRegisterNumber, const int bZCompare)
-{
-    bstring texturesamplername = TextureSamplerNameMETAL(psShaderInfo, ui32TextureRegisterNumber, ui32SamplerRegisterNumber, bZCompare);
-    bconcat(str, texturesamplername);
-    bdestroy(texturesamplername);
-}
-
-uint32_t GetGmemInputResourceSlotMETAL(uint32_t const slotIn)
-{
-    if (slotIn >= GMEM_FLOAT4_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT4_START_SLOT;
-    }
-    if (slotIn >= GMEM_FLOAT3_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT3_START_SLOT;
-    }
-    if (slotIn >= GMEM_FLOAT2_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT2_START_SLOT;
-    }
-    if (slotIn >= GMEM_FLOAT_START_SLOT)
-    {
-        return slotIn - GMEM_FLOAT_START_SLOT;
-    }
-    return slotIn;
-}
-
-uint32_t GetGmemInputResourceNumElementsMETAL(uint32_t const slotIn)
-{
-    if (slotIn >= GMEM_FLOAT4_START_SLOT)
-    {
-        return 4;
-    }
-    if (slotIn >= GMEM_FLOAT3_START_SLOT)
-    {
-        return 3;
-    }
-    if (slotIn >= GMEM_FLOAT2_START_SLOT)
-    {
-        return 2;
-    }
-    if (slotIn >= GMEM_FLOAT_START_SLOT)
-    {
-        return 1;
-    }
-    return 0;
-}
diff --git a/Code/Tools/ProjectManager/CMakeLists.txt b/Code/Tools/ProjectManager/CMakeLists.txt
new file mode 100644
index 0000000000..8315ef831c
--- /dev/null
+++ b/Code/Tools/ProjectManager/CMakeLists.txt
@@ -0,0 +1,41 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+ly_add_target(
+    NAME ProjectManager APPLICATION
+    OUTPUT_NAME o3de
+    NAMESPACE AZ
+    AUTOMOC
+    AUTOUIC
+    AUTORCC
+    FILES_CMAKE
+        project_manager_files.cmake
+        Platform/${PAL_PLATFORM_NAME}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+        PRIVATE
+            source
+
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::Qt::Core
+            3rdParty::Qt::Concurrent
+            3rdParty::Qt::Widgets
+            AZ::AzCore
+            AZ::AzFramework
+            AZ::AzToolsFramework
+            AZ::AzQtComponents
+)
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Android/platform_android.cmake b/Code/Tools/ProjectManager/Platform/Android/PAL_android.cmake
similarity index 100%
rename from Code/CryEngine/Cry3DEngine/Platform/Android/platform_android.cmake
rename to Code/Tools/ProjectManager/Platform/Android/PAL_android.cmake
diff --git a/Code/CryEngine/Cry3DEngine/Platform/Linux/platform_linux.cmake b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux.cmake
similarity index 100%
rename from Code/CryEngine/Cry3DEngine/Platform/Linux/platform_linux.cmake
rename to Code/Tools/ProjectManager/Platform/Linux/PAL_linux.cmake
diff --git a/Code/CryEngine/Cry3DEngine/Platform/iOS/platform_ios.cmake b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac.cmake
similarity index 100%
rename from Code/CryEngine/Cry3DEngine/Platform/iOS/platform_ios.cmake
rename to Code/Tools/ProjectManager/Platform/Mac/PAL_mac.cmake
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Linux/DXMETAL_linux.cmake b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows.cmake
similarity index 100%
rename from Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Linux/DXMETAL_linux.cmake
rename to Code/Tools/ProjectManager/Platform/Windows/PAL_windows.cmake
diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Windows/DXMETAL_windows.cmake b/Code/Tools/ProjectManager/Platform/iOS/PAL_ios.cmake
similarity index 100%
rename from Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Platform/Windows/DXMETAL_windows.cmake
rename to Code/Tools/ProjectManager/Platform/iOS/PAL_ios.cmake
diff --git a/Code/Tools/ProjectManager/Qt/FirstTimeUse.cpp b/Code/Tools/ProjectManager/Qt/FirstTimeUse.cpp
new file mode 100644
index 0000000000..640849740e
--- /dev/null
+++ b/Code/Tools/ProjectManager/Qt/FirstTimeUse.cpp
@@ -0,0 +1,31 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <Qt/FirstTimeUse.h>
+
+#include <Qt/ui_FirstTimeUse.h>
+
+namespace ProjectManager
+{
+    FirstTimeUse::FirstTimeUse(QWidget* parent)
+        : QWidget(parent)
+        , m_ui(new Ui::FirstTimeUseClass())
+    {
+        m_ui->setupUi(this);
+    }
+
+    FirstTimeUse::~FirstTimeUse()
+    {
+    }
+
+    //#include <Qt/moc_FirstTimeUse.cpp>
+} // namespace ProjectManager
diff --git a/Code/Tools/ProjectManager/Qt/FirstTimeUse.h b/Code/Tools/ProjectManager/Qt/FirstTimeUse.h
new file mode 100644
index 0000000000..85f344f3fe
--- /dev/null
+++ b/Code/Tools/ProjectManager/Qt/FirstTimeUse.h
@@ -0,0 +1,36 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class FirstTimeUseClass;
+}
+
+namespace ProjectManager
+{
+    class FirstTimeUse : public QWidget
+    {
+
+    public:
+        explicit FirstTimeUse(QWidget* parent);
+        ~FirstTimeUse();
+
+    private:
+        QScopedPointer<Ui::FirstTimeUseClass> m_ui;
+    };
+
+} // namespace ProjectManager
diff --git a/Code/Tools/ProjectManager/Qt/FirstTimeUse.ui b/Code/Tools/ProjectManager/Qt/FirstTimeUse.ui
new file mode 100644
index 0000000000..fdc195731f
--- /dev/null
+++ b/Code/Tools/ProjectManager/Qt/FirstTimeUse.ui
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FirstTimeUseClass</class>
+ <widget class="QWidget" name="FirstTimeUseClass">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>881</width>
+    <height>555</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="font">
+        <font>
+         <pointsize>30</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>READY. SET. CREATE!</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Welcome to O3DE! Start something new by creating a project. Not sure what to create? &lt;/p&gt;&lt;p&gt;Explore what’s available by downloading our sample project.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <item>
+      <widget class="QPushButton" name="createProjectButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Create Project</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../project_manager.qrc">
+         <normaloff>:/Resources/Add.svg</normaloff>:/Resources/Add.svg</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="openProjectButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Open a Project</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../project_manager.qrc">
+         <normaloff>:/Resources/Select_Folder.svg</normaloff>:/Resources/Select_Folder.svg</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../project_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.cpp b/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.cpp
new file mode 100644
index 0000000000..4a8486f877
--- /dev/null
+++ b/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.cpp
@@ -0,0 +1,49 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <Qt/ProjectManagerWindow.h>
+#include <Qt/FirstTimeUse.h>
+
+#include <AzQtComponents/Components/StyleManager.h>
+#include <AzCore/IO/Path/Path.h>
+
+#include <QDir>
+
+#include <Qt/ui_ProjectManagerWindow.h>
+
+namespace ProjectManager
+{
+    ProjectManagerWindow::ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath)
+        : QMainWindow(parent)
+        , m_ui(new Ui::ProjectManagerWindowClass())
+    {
+        m_ui->setupUi(this);
+
+        QDir rootDir = QString::fromUtf8(engineRootPath.Native().data(), aznumeric_cast<int>(engineRootPath.Native().size()));
+        const auto pathOnDisk = rootDir.absoluteFilePath("Code/Tools/ProjectManager/Resources");
+        const auto qrcPath = QStringLiteral(":/ProjectManagerWindow");
+        AzQtComponents::StyleManager::addSearchPaths("projectmanagerwindow", pathOnDisk, qrcPath, engineRootPath);
+
+        AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("projectlauncherwindow:ProjectManagerWindow.qss"));
+
+
+        FirstTimeUse* firstTimeUse = new FirstTimeUse(m_ui->centralwidget);
+
+        firstTimeUse->show();
+    }
+
+    ProjectManagerWindow::~ProjectManagerWindow()
+    {
+    }
+
+    //#include <Qt/moc_ProjectManagerWindow.cpp>
+} // namespace ProjectManager
diff --git a/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.h b/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.h
new file mode 100644
index 0000000000..a62e823a92
--- /dev/null
+++ b/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.h
@@ -0,0 +1,38 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QMainWindow>
+
+#include <AzCore/IO/Path/Path_fwd.h>
+#endif
+
+namespace Ui
+{
+    class ProjectManagerWindowClass;
+}
+
+namespace ProjectManager
+{
+    class ProjectManagerWindow : public QMainWindow
+    {
+
+    public:
+        explicit ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath);
+        ~ProjectManagerWindow();
+
+    private:
+        QScopedPointer<Ui::ProjectManagerWindowClass> m_ui;
+    };
+
+} // namespace ProjectManager
diff --git a/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.ui b/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.ui
new file mode 100644
index 0000000000..60ec2dd674
--- /dev/null
+++ b/Code/Tools/ProjectManager/Qt/ProjectManagerWindow.ui
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProjectManagerWindowClass</class>
+ <widget class="QMainWindow" name="ProjectManagerWindowClass">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>O3DE Project Manager</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout"/>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>36</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>16</pointsize>
+    </font>
+   </property>
+   <widget class="QMenu" name="menuIcon">
+    <property name="title">
+     <string>Icon</string>
+    </property>
+    <property name="icon">
+     <iconset resource="../project_manager.qrc">
+      <normaloff>:/Resources/o3de_editor.ico</normaloff>:/Resources/o3de_editor.ico</iconset>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menuProjects">
+    <property name="title">
+     <string>Projects</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menuSettings">
+    <property name="title">
+     <string>Engine</string>
+    </property>
+   </widget>
+   <addaction name="menuIcon"/>
+   <addaction name="menuProjects"/>
+   <addaction name="menuSettings"/>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../project_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Code/Tools/ProjectManager/Resources/Add.svg b/Code/Tools/ProjectManager/Resources/Add.svg
new file mode 100644
index 0000000000..d2b9b2e0a6
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/Add.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 3H11V11H3V13H11V21H13V13H21V11H13V3Z" fill="white"/>
+</svg>
diff --git a/Code/Tools/AssetProcessor/testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.ini b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
similarity index 100%
rename from Code/Tools/AssetProcessor/testdata/EmptyDummyProject/AssetProcessorGamePlatformConfig.ini
rename to Code/Tools/ProjectManager/Resources/ProjectManager.qss
diff --git a/Code/Tools/ProjectManager/Resources/Select_Folder.svg b/Code/Tools/ProjectManager/Resources/Select_Folder.svg
new file mode 100644
index 0000000000..72dcd3385e
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/Select_Folder.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.98407 4H2V6V7V19.8145H2.07539L6.02059 7.99123H19V6H11.328L9.98407 4ZM19 19.7473L22.0766 10H7.05436L3.68763 19.8329H18.973L18.9788 19.8145H19V19.7473Z" fill="white"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/o3de_editor.ico b/Code/Tools/ProjectManager/Resources/o3de_editor.ico
new file mode 100644
index 0000000000..0680ceea19
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/o3de_editor.ico
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a
+size 107016
diff --git a/Code/Tools/ProjectManager/project_manager.qrc b/Code/Tools/ProjectManager/project_manager.qrc
new file mode 100644
index 0000000000..408398584b
--- /dev/null
+++ b/Code/Tools/ProjectManager/project_manager.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+    <qresource>
+        <file>Resources/ProjectManager.qss</file>
+        <file>Resources/Add.svg</file>
+        <file>Resources/Select_Folder.svg</file>
+        <file>Resources/o3de_editor.ico</file>
+    </qresource>
+</RCC>
\ No newline at end of file
diff --git a/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake
new file mode 100644
index 0000000000..4d36550e56
--- /dev/null
+++ b/Code/Tools/ProjectManager/project_manager_files.cmake
@@ -0,0 +1,21 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    project_manager.qrc
+    source/main.cpp
+    Qt/FirstTimeUse.h
+    Qt/FirstTimeUse.cpp
+    Qt/FirstTimeUse.ui
+    Qt/ProjectManagerWindow.h
+    Qt/ProjectManagerWindow.cpp
+    Qt/ProjectManagerWindow.ui
+)
diff --git a/Code/Tools/ProjectManager/source/main.cpp b/Code/Tools/ProjectManager/source/main.cpp
new file mode 100644
index 0000000000..ecfae3b28e
--- /dev/null
+++ b/Code/Tools/ProjectManager/source/main.cpp
@@ -0,0 +1,55 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
+#include <AzQtComponents/Components/StyleManager.h>
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/IO/Path/Path.h>
+
+#include <Qt/ProjectManagerWindow.h>
+
+#include <QApplication>
+#include <QCoreApplication>
+#include <QGuiApplication>
+
+int main(int argc, char* argv[])
+{
+    QApplication::setOrganizationName("O3DE");
+    QApplication::setOrganizationDomain("o3de.org");
+    QCoreApplication::setApplicationName("ProjectManager");
+    QCoreApplication::setApplicationVersion("1.0");
+
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+    QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
+    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+    AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::SystemDpiAware);
+
+    QApplication app(argc, argv);
+
+    // Need to use settings registry to get EngineRootFolder
+    AZ::IO::FixedMaxPath engineRootPath;
+    {
+        AZ::ComponentApplication componentApplication;
+        auto settingsRegistry = AZ::SettingsRegistry::Get();
+        settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+    }
+
+    AzQtComponents::StyleManager styleManager(&app);
+    styleManager.initialize(&app, engineRootPath);
+
+    ProjectManager::ProjectManagerWindow window(nullptr, engineRootPath);
+    window.show();
+
+    return app.exec();
+}
diff --git a/Code/Tools/RC/CMakeLists.txt b/Code/Tools/RC/CMakeLists.txt
deleted file mode 100644
index ee39f70dc2..0000000000
--- a/Code/Tools/RC/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-add_subdirectory(ResourceCompiler)
-add_subdirectory(ResourceCompilerABC)
-add_subdirectory(ResourceCompilerImage)
-add_subdirectory(ResourceCompilerLegacy)
-add_subdirectory(ResourceCompilerPC)
-add_subdirectory(ResourceCompilerScene)
-add_subdirectory(ResourceCompilerSlice)
-add_subdirectory(ResourceCompilerUiCanvas)
-add_subdirectory(ResourceCompilerXML)
diff --git a/Code/Tools/RC/Config/rc/RCJob_Build_DBAs.xml b/Code/Tools/RC/Config/rc/RCJob_Build_DBAs.xml
deleted file mode 100644
index 7c755a73e9..0000000000
--- a/Code/Tools/RC/Config/rc/RCJob_Build_DBAs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<RCJobs>
-    <DefaultProperties
-        game="RPGSample"
-        target="TempRC"
-    />
-    
-
-    <DBAJob>
-        <Job input="*.i_caf"  animConfigFolder="Animations" sourceroot="${game}" targetroot="${target}" cafAlignTracks="1" dbaStreamPrepare="1" /> 
-        <Job input="*.dba" copyonly="1" sourceroot="${target}" targetroot="${game}" /> 
-        <Job input="*.img" copyonly="1" sourceroot="${target}" targetroot="${game}" /> 
-    </DBAJob>
-
-    <Run Job="DBAJob" /> <!-- Run the only job -->
-</RCJobs>
diff --git a/Code/Tools/RC/Config/rc/RCJob_Convert_TIF.xml b/Code/Tools/RC/Config/rc/RCJob_Convert_TIF.xml
deleted file mode 100644
index ad0cdc863b..0000000000
--- a/Code/Tools/RC/Config/rc/RCJob_Convert_TIF.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RCJobs>
-	<Properties CleanSettings="" /> <!-- This will force the settings to be read from the tif and written back out to .exportsettings -->
-	
-	<TexturesJob>
-		<Job Input="*.tif" /> <!-- Only applies to .tif files -->
-	</TexturesJob>
-
-	<Run Job="TexturesJob" /> <!-- Run the only job -->
-</RCJobs>
diff --git a/Code/Tools/RC/Config/rc/RCJob_Generic_MakeAuxiliaryContent.xml b/Code/Tools/RC/Config/rc/RCJob_Generic_MakeAuxiliaryContent.xml
deleted file mode 100644
index 4c8ac6bda4..0000000000
--- a/Code/Tools/RC/Config/rc/RCJob_Generic_MakeAuxiliaryContent.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<RCJobs>
-  <!--
-        DefaultProperties can be overriden from command line.
-    -->
-  <DefaultProperties
-      platform="pc"
-      project-path="AutomatedTesting"
-      src="${project-path}\Cache\${platform}"
-      trg="${project-path}\user\paks\${platform}"
-    />
-
-  <Properties
-
-      levels_pak_types="levels\*.*"
-      levels_pak_excludes="*\leveldata\*;*.pak"
-
-      gems_pak_types="gems\*.json;gem\*.*"
-      gems_pak_excludes=""
-      
-      shader_pak_types="shaders\*.ext;shaders\*.cfi;shaders\*.cfx"
-      shader_pak_excludes=""
-
-      src_game="${src}"
-      trg_paks="${trg}"
-    />
-
-  <!--
-        Copy just the basic files needed to run
-    -->
-  <CopyJob>
-    <IfNot SkipLevelPaks="1">
-        <Job sourceroot="${src_game}\levels" targetroot="${trg_paks}\levels" input="*.pak" copyonly="1"/>
-    </IfNot>
-    <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="*.awslogicalmappings.json" copyonly="1"/>
-    <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="launcher.deployment.json" copyonly="1"/>
-    <Job sourceroot="${src}" targetroot="${trg}" input="engine.json" copyonly="1"/>
-    <Job sourceroot="${src}" targetroot="${trg}" input="bootstrap.cfg" copyonly="1" recursive="0"/>
-    <Job sourceroot="${src}" targetroot="${trg}" input="system_windows_pc.cfg" copyonly="1" recursive="0"/>
-  </CopyJob>
-
-  <!--
-        Pack everything else up from the cache.
-    -->
-  <PakJob>
-    <Job sourceroot="${src_game}" input="${shader_pak_types}" zip="${trg_paks}\shaders.pak" exclude="${shader_pak_excludes}" />
-    <Job sourceroot="${src}"      input="${gems_pak_types}" zip="${trg_paks}\gems\gems.pak" exclude="${gems_pak_excludes}" />
-  </PakJob>
-  <Run Job="CopyJob"/>
-  <Run Job="PakJob"/>
-</RCJobs>
diff --git a/Code/Tools/RC/Config/rc/RCJob_Generic_MakePaks.xml b/Code/Tools/RC/Config/rc/RCJob_Generic_MakePaks.xml
deleted file mode 100644
index 416acd8e1d..0000000000
--- a/Code/Tools/RC/Config/rc/RCJob_Generic_MakePaks.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<RCJobs>
-    <!--
-        DefaultProperties can be overriden from command line.
-        Sounds pak properties moved here in order to override them.
-    -->
-    <DefaultProperties
-        platform="pc"
-        project-path="AutomatedTesting"
-        src="${project-path}\Cache\${platform}"
-        trg="${project-path}\user\paks\${platform}"
-
-        sounds_pak_types="sounds\*.*"
-        sounds_pak_excludes=""
-    />
-
-    <Properties
-        levels_pak_types="levels\*.*"
-        levels_pak_excludes="*\leveldata\*;*.pak"
-
-        game_data_pak_types="*.uicanvas;*.bin;*.grd;*.grp;*.cal;*.lut;*.sprite;prototypes\*.*;aws\*.*;difficulty\*.*;libs\*.*;materials\*.*;prefabs\*.*"
-        game_data_pak_excludes="*filelist.*"
-
-        animation_pak_types="animations\*.*"
-        animation_pak_excludes=""
-
-        objects_pak_types="objects\*.*"
-        objects_pak_excludes="objects\props\*.*;objects\characters\*.*"
-
-        character_pak_types="objects\characters\*.*;objects\props\*.*"
-        character_pak_excludes=""
-
-        textures_pak_types="textures\*.*"
-        textures_pak_excludes=""
-
-        scripts_pak_types="entities\*.*;scripts\*.*"
-        scripts_pak_excludes=""
-
-        shader_pak_types="shaders\*.ext;shaders\*.cfi;shaders\*.cfx"
-        shader_pak_excludes=""
-
-        engine_pak_types="fonts\*.*;engineassets\*.*;config\*.*"
-
-        gems_pak_types="gems\*.json;gem\*.*"
-        gems_pak_excludes=""
-
-        video_pak_types="*.mp4;*.mkv;*.webm;*.mov;*.bk2"
-        video_pak_excludes=""
-
-        misc_pak_types="*.*"
-        misc_pak_excludes="*cmakelists.*;editor\*.*;${levels_pak_types};${levels_pak_excludes};${game_data_pak_types};${game_data_pak_excludes};${animation_pak_types};${animation_pak_excludes};${objects_pak_types};${objects_pak_excludes};${character_pak_types};${character_pak_excludes};${textures_pak_types};${textures_pak_excludes};${sounds_pak_types};${sounds_pak_excludes};${scripts_pak_types};${scripts_pak_excludes};${shader_pak_types};${shader_pak_excludes};${engine_pak_types};${gems_pak_types};${gems_pak_excludes};${video_pak_types}"
-
-        src_game="${src}"
-        trg_paks="${trg}"
-    />
-
-    <!--
-        Copy just the basic files needed to run
-    -->
-    <CopyJob>
-        <Job sourceroot="${src_game}\levels" targetroot="${trg_paks}\levels" input="*.pak" copyonly="1"/>
-        <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="*.awslogicalmappings.json" copyonly="1"/>
-        <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="launcher.deployment.json" copyonly="1"/>
-        <Job sourceroot="${src}" targetroot="${trg}" input="engine.json" copyonly="1"/>
-        <Job sourceroot="${src}" targetroot="${trg}" input="*.cfg" copyonly="1" recursive="0"/>
-        <Job sourceroot="${src}" targetroot="${trg}" input="*.xml" copyonly="1" recursive="0"/>
-    </CopyJob>
-
-    <!--
-        Pack everything else up from the cache.
-    -->
-    <PakJob>
-        <Job sourceroot="${src_game}" input="${levels_pak_types}" zip="${trg_paks}\levels.pak" exclude="${levels_pak_excludes}" />
-
-        <Job sourceroot="${src_game}" input="${game_data_pak_types}" zip="${trg_paks}\gamedata.pak" exclude="${game_data_pak_excludes}" />
-        <Job sourceroot="${src_game}" input="${animation_pak_types}" zip="${trg_paks}\animations.pak" exclude="${animation_pak_excludes}" />
-        <Job sourceroot="${src_game}" input="${objects_pak_types}" zip="${trg_paks}\objects.pak" exclude="${objects_pak_excludes}" />
-        <Job sourceroot="${src_game}" input="${character_pak_types}" zip="${trg_paks}\characters.pak" exclude="${character_pak_excludes}" />
-        <Job sourceroot="${src_game}" input="${textures_pak_types}" zip="${trg_paks}\textures.pak" exclude="${textures_pak_excludes}" />
-        <Job sourceroot="${src_game}" input="${sounds_pak_types}" zip="${trg_paks}\sounds.pak" exclude="${sounds_pak_excludes}" zip_compression="0" />
-        <Job sourceroot="${src_game}" input="${scripts_pak_types}" zip="${trg_paks}\scripts.pak" exclude="${scripts_pak_excludes}" />
-        <Job sourceroot="${src_game}" input="${video_pak_types}" zip="${trg_paks}\videos.pak" exclude="${video_pak_excludes}" zip_compression="0" />
-
-        <Job sourceroot="${src_game}" input="${shader_pak_types}" zip="${trg_paks}\shaders.pak" exclude="${shader_pak_excludes}" />
-        <Job sourceroot="${src_game}" input="${engine_pak_types}" zip="${trg_paks}\engine.pak" />
-        <Job sourceroot="${src_game}" input="${misc_pak_types}" zip="${trg_paks}\misc.pak" exclude="${misc_pak_excludes}" />
-
-        <Job sourceroot="${src}"      input="${gems_pak_types}" zip="${trg_paks}\gems\gems.pak" exclude="${gems_pak_excludes}" />
-    </PakJob>
-
-    <Run Job="CopyJob"/>
-    <Run Job="PakJob"/>
-</RCJobs>
diff --git a/Code/Tools/RC/Config/rc/rc.ini b/Code/Tools/RC/Config/rc/rc.ini
deleted file mode 100644
index 7cb97bd8f8..0000000000
--- a/Code/Tools/RC/Config/rc/rc.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-[_platform]
-name=pc
-bigendian=0
-pointersize=8
-
-[_platform]
-name=server
-bigendian=0
-pointersize=8
-
-[_platform]
-name=osx_gl
-bigendian=0
-pointersize=8
-
-[_platform]
-name=provo
-bigendian=0
-pointersize=8
-
-[_platform]
-name=salem
-bigendian=0
-pointersize=8
-
-[_platform]
-name=jasper
-bigendian=0
-pointersize=8
-
-[_platform]
-name=es3
-bigendian=0
-pointersize=4
-
-[_platform]
-name=ios
-bigendian=0
-pointersize=8
diff --git a/Code/Tools/RC/Config/rc/xmlfilter.txt b/Code/Tools/RC/Config/rc/xmlfilter.txt
deleted file mode 100644
index 2fc7c45170..0000000000
--- a/Code/Tools/RC/Config/rc/xmlfilter.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-e - Styles
-e - NamedCell
-a + *:Name
-a + *:Data
-a + *:Index
-a + *:ExpandedRowCount
-a + *:ExpandedColumnCount
-a - *:*
-
-f table *text_game_controls.xml
-f table *text_ui_credit_list.xml
-f table *text_ui_messages.xml
-f table *text_ui_mp_messages.xml
-f table *text_platformspecific.xml
-f table *dialog_ai_recording_list.xml
-f table *dialog_recording_list.xml
-f table *text_ui_objectives.xml
-f table *dialog_mp_recording_list.xml
-f table *text_mp_messages.xml
-
-f table *MaterialEffects.xml
diff --git a/Code/Tools/RC/ResourceCompiler/AssetFileInfo.h b/Code/Tools/RC/ResourceCompiler/AssetFileInfo.h
deleted file mode 100644
index 7e5c0a7910..0000000000
--- a/Code/Tools/RC/ResourceCompiler/AssetFileInfo.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ASSETFILEINFO_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ASSETFILEINFO_H
-#pragma once
-
-#include <cstring>    // memset()
-#include "SimpleString.h"
-
-class CAssetFileInfo
-{
-public:
-    enum
-    {
-        kMaxCgfLods = 6
-    };
-
-    enum EType
-    {
-        eUnknown,
-        eTexture,
-        eCGF,
-        eCHR,
-        eCAF,
-        eLUA
-    };
-
-    struct TextureInfo
-    {
-        int w;
-        int h;
-        bool bAlpha;
-        SimpleString format;
-        SimpleString type;
-        int nNumMips;
-        int nDepth;
-        int nSides;
-    };
-
-    struct GeometryInfo
-    {
-        int nVertices;
-        int nIndices;
-        int nIndicesPerLod[kMaxCgfLods];
-        int nMeshSizePerLod[kMaxCgfLods];
-        int nMeshSize;
-        int nPhysProxySize;
-        int nPhysTriCount;
-        int nPhysProxyCount;
-        int nLods;
-        int nSubMeshCount;
-        int nJoints;
-        bool bSplitLods;
-    };
-
-    struct SourceControl
-    {
-        bool bValid;
-        SimpleString user;
-        SimpleString user_email;
-        SimpleString user_fullname;
-        SimpleString workspace;
-        SimpleString depotFile;
-        SimpleString changeDescription;
-        int change;
-        int revision;
-        int time;
-    };
-
-public:
-    EType         m_type;
-    int64         m_SrcFileSize;
-    int64         m_DstFileSize;
-
-    SimpleString  m_sInfo;            // separated list of properties (used for excel export)
-    SimpleString  m_sSourceFilename;
-    SimpleString  m_sDestFilename;
-    SimpleString  m_sPreset;
-    SimpleString  m_sErrorLog;
-
-    bool          m_bSuccess;
-    bool          m_bGetSourceControlInfo;
-    bool          m_bReferencedInLevels;
-
-    TextureInfo   m_textureInfo;
-    GeometryInfo  m_geomInfo;
-    SourceControl m_sc;
-
-public:
-    CAssetFileInfo()
-    {
-        memset(this, 0, sizeof(*this));
-        m_type = eUnknown;
-        m_bSuccess = true;
-        m_bGetSourceControlInfo = true;
-    }
-
-    template <class T>
-    void SafeStrCopy(T& to, const char* from)
-    {
-        to = from;
-    }
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ASSETFILEINFO_H
diff --git a/Code/Tools/RC/ResourceCompiler/CMakeLists.txt b/Code/Tools/RC/ResourceCompiler/CMakeLists.txt
deleted file mode 100644
index 5b56071a62..0000000000
--- a/Code/Tools/RC/ResourceCompiler/CMakeLists.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompiler.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        resourcecompiler_static_files.cmake
-        Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    PLATFORM_INCLUDE_FILES
-        Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-            ..
-    BUILD_DEPENDENCIES
-        PUBLIC
-            3rdParty::Qt::Widgets
-            Legacy::CryCommonTools
-            Legacy::CryCommon
-            Legacy::CryCommonTools
-            Legacy::CryXML
-            AZ::AzToolsFramework
-    RUNTIME_DEPENDENCIES
-        Legacy::CryXML
-)
-
-
-ly_add_target(
-    NAME RC EXECUTABLE
-    NAMESPACE Legacy
-    OUTPUT_NAME rc
-    FILES_CMAKE
-        resourcecompiler_files.cmake
-        Platform/Common/${PAL_TRAIT_COMPILER_ID}/rc_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Platform/${PAL_PLATFORM_NAME}
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::ResourceCompiler.Static
-)
-ly_add_source_properties(
-    SOURCES ResourceCompiler.cpp
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES ${LY_PAL_TOOLS_DEFINES}
-)
-
-set(file_targets RC)
-
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    ly_add_target(
-        NAME RC.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            resourcecompiler_test_files.cmake
-            Platform/Common/${PAL_TRAIT_COMPILER_ID}/rc_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Tests
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                Legacy::ResourceCompiler.Static
-                AZ::AzFrameworkTestShared
-    )
-    ly_add_googletest(
-        NAME Legacy::RC.Tests
-    )
-    list(APPEND file_targets RC.Tests)
-endif()
-
-ly_add_target_files(
-    TARGETS 
-        ${file_targets}
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../Config/rc/xmlfilter.txt
-        ${CMAKE_CURRENT_SOURCE_DIR}/../Config/rc/rc.ini
-)
diff --git a/Code/Tools/RC/ResourceCompiler/CfgFile.cpp b/Code/Tools/RC/ResourceCompiler/CfgFile.cpp
deleted file mode 100644
index 7730214402..0000000000
--- a/Code/Tools/RC/ResourceCompiler/CfgFile.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include "CfgFile.h"
-#include "Config.h"
-#include "DebugLog.h"
-#include "IRCLog.h"
-
-//#define  Log DebugLog
-#define  Log while (false)
-
-
-CfgFile::CfgFile()
-{
-    // Create empty section.
-    Section section;
-    section.name = "";
-    m_sections.push_back(section);
-
-    m_modified = false;
-}
-
-CfgFile::~CfgFile()
-{
-}
-
-void CfgFile::Release()
-{
-    delete this;
-}
-
-// Load configuration file.
-bool CfgFile::Load(const string& fileName)
-{
-    m_fileName = fileName;
-    m_modified = false;
-
-    FILE* file = nullptr;
-    azfopen(&file, fileName.c_str(), "rb");
-    if (!file)
-    {
-        RCLog("Can't open \"%s\"", fileName.c_str());
-        return false;
-    }
-
-    fseek(file, 0, SEEK_END);
-    int size = ftell(file);
-    fseek(file, 0, SEEK_SET);
-
-    // Read whole file to memory.
-    char* s = (char*)malloc(size + 1);
-    memset(s, 0, size + 1);
-    fread(s, 1, size, file);
-    LoadFromBuffer(s);
-    free(s);
-
-    fclose(file);
-
-    return true;
-}
-
-// Save configuration file, with the stored name in m_fileName
-bool CfgFile::Save()
-{
-    FILE* file = nullptr;
-    azfopen(&file, m_fileName.c_str(), "wb");
-
-    if (!file)
-    {
-        return(false);
-    }
-
-    // Loop on sections.
-    for (std::vector<Section>::iterator si = m_sections.begin(); si != m_sections.end(); si++)
-    {
-        Section& sec = *si;
-
-        if (sec.name != "")
-        {
-            fprintf(file, "[%s]\r\n", sec.name.c_str());                                                                                      // section
-        }
-        for (std::list<Entry>::iterator it = sec.entries.begin(); it != sec.entries.end(); ++it)
-        {
-            if ((*it).key == "")
-            {
-                fprintf(file, "%s\r\n", (*it).value.c_str());                                                         // comment
-            }
-            else
-            {
-                fprintf(file, "%s=%s\r\n", (*it).key.c_str(), (*it).value.c_str());        // key=value
-            }
-        }
-    }
-
-    fclose(file);
-    return(true);
-}
-
-void CfgFile::UpdateOrCreateEntry(const char* inszSection, const char* inszKey, const char* inszValue)
-{
-    const int sectionIndex = FindSection(inszSection);
-    Section* const sec = &m_sections[(sectionIndex < 0) ? 0 : sectionIndex];
-
-    for (std::list<Entry>::iterator it = sec->entries.begin(); it != sec->entries.end(); ++it)
-    {
-        if (azstricmp(it->key.c_str(), inszKey) == 0)              // Key found
-        {
-            if (!it->IsComment())                                    // update key
-            {
-                if (it->value == inszValue)
-                {
-                    return;
-                }
-
-                it->value = inszValue;
-                m_modified = true;
-                return;
-            }
-        }
-    }
-
-    // Create new key
-    Entry entry;
-    entry.key = inszKey;
-    entry.value = inszValue;
-
-    sec->entries.push_back(entry);
-    m_modified = true;
-}
-
-void CfgFile::RemoveEntry(const char* inszSection, const char* inszKey)
-{
-    const int sectionIndex = FindSection(inszSection);
-    Section* const sec = &m_sections[(sectionIndex < 0) ? 0 : sectionIndex];
-
-    for (std::list<Entry>::iterator it = sec->entries.begin(); it != sec->entries.end(); ++it)
-    {
-        if (azstricmp(it->key.c_str(), inszKey) == 0)
-        {
-            if (!it->IsComment())
-            {
-                sec->entries.erase(it);
-                return;
-            }
-        }
-    }
-}
-
-void CfgFile::LoadFromBuffer(const char* buf)
-{
-    // Read entries from config string buffer.
-    Section* curr_section = &m_sections.front();    // Empty section.
-
-    while (*buf != '\0')
-    {
-        size_t count = 0;
-        // Find the first line terminator
-        while (buf[count] != '\0' && buf[count] != '\r' && buf[count] != '\n')
-        {
-            count++;
-        }
-        
-        Entry entry;
-        entry.value = string(buf, count);
-
-        // Move buffer forward and skip any trailing line endings
-        buf += count;
-        while (*buf != '\0' && (*buf == '\r' || *buf == '\n'))
-        {
-            buf++;
-        }
-
-        Log("Parsing line: \"%s\"", entry.value.c_str());
-
-        bool isComment = entry.IsComment();
-        if (!isComment)
-        {
-            entry.value.Trim();
-        }
-
-        if (isComment || entry.value.empty())
-        {
-            Log(isComment ? "It's a comment" : "It's empty");
-            // Add this comment to current section.
-            curr_section->entries.push_back(entry);
-            continue;
-        }
-
-        // First check if the line is a section to avoid equal signs in the section name to cause incorrect parsing
-        if (entry.value[0] == '[' && entry.value[entry.value.size() - 1] == ']')
-        {
-            Section section;
-            section.name = entry.value.Mid(1, entry.value.size() - 2); // Remove braces.
-            Log("Section! name: %s", section.name.c_str());
-            m_sections.push_back(section);
-            
-            // Set current section.
-            curr_section = &m_sections.back();
-        }
-        else
-        {
-            size_t splitter = entry.value.find('=');
-            if (splitter != string::npos)
-            {
-                Log("found splitter at %d", splitter);
-
-                entry.key = entry.value.Mid(0, splitter);  // Before splitter is key name.
-                entry.value = entry.value.Mid(splitter + 1);   // Everything after splitter is value string.
-                entry.key.Trim();
-                entry.value.Trim();
-
-                Log("Key: %s, Value: %s", entry.key.c_str(), entry.value.c_str());
-
-                // Add this entry to current section.
-                curr_section->entries.push_back(entry);
-            }
-            else
-            {
-                // Nameless value
-                curr_section->entries.push_back(entry);
-            }
-        }
-    }
-}
-
-void CfgFile::CopySectionKeysToConfig(const EConfigPriority ePri, int sectionIndex, const char* keySuffixes, IConfigSink* config) const
-{
-    if (sectionIndex < 0 || sectionIndex >= m_sections.size())
-    {
-        return;
-    }
-
-    std::vector<string> suffixes;
-    if (keySuffixes)
-    {
-        StringHelpers::SplitByAnyOf(keySuffixes, ", ", false, suffixes);
-    }
-
-    const Section* const sec = &m_sections[sectionIndex];
-
-    for (std::list<Entry>::const_iterator it = sec->entries.begin(); it != sec->entries.end(); ++it)
-    {
-        const Entry& e = (*it);
-
-        if (e.IsComment())
-        {
-            continue;
-        }
-
-        const size_t delimiterPos = e.key.find(':');
-        if (delimiterPos == string::npos)
-        {
-            // The key has no suffix. Add key & value without any checks.
-            config->SetKeyValue(ePri, e.key.c_str(), e.value.c_str());
-        }
-        else
-        {
-            // The key has a suffix.
-            if (keySuffixes == 0)
-            {
-                // keySuffixes == 0 means that we must copy all keys, does not matter if they have
-                // suffix or not. Suffix (if exists) is preserved as part of the name of the key.
-                config->SetKeyValue(ePri, e.key.c_str(), e.value.c_str());
-            }
-            else
-            {
-                for (size_t i = 0; i < suffixes.size(); ++i)
-                {
-                    if (azstricmp(suffixes[i].c_str(), e.key.c_str() + delimiterPos + 1) == 0)
-                    {
-                        // The key's suffix is same as a suffix in keySuffixes. We add key (without suffix!) and value.
-                        config->SetKeyValue(ePri, e.key.substr(0, delimiterPos).c_str(), e.value.c_str());
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-
-const char* CfgFile::GetSectionName(int sectionIndex) const
-{
-    if ((sectionIndex < 0) || ((size_t)sectionIndex >= m_sections.size()))
-    {
-        return 0;
-    }
-
-    return(m_sections[sectionIndex].name.c_str());
-}
-
-int CfgFile::FindSection(const char* sectionName) const
-{
-    for (size_t i = 0, count = m_sections.size(); i < count; ++i)
-    {
-        if (azstricmp(m_sections[i].name.c_str(), sectionName) == 0)
-        {
-            return (int)i;
-        }
-    }
-    return -1;
-}
-
-bool CfgFile::Entry::IsComment() const
-{
-    const char* pBegin = value.c_str();
-    while (pBegin[0] == ' ' || pBegin[0] == '\t')
-    {
-        ++pBegin;
-    }
-
-    // "//" comment
-    if (pBegin[0] == '/' && pBegin[1] == '/')
-    {
-        return true;
-    }
-
-    // ";" comment
-    if (pBegin[0] == ';')
-    {
-        return true;
-    }
-
-    // empty line (treat it as comment)
-    if (pBegin[0] == 0)
-    {
-        return true;
-    }
-
-    return false;
-}
diff --git a/Code/Tools/RC/ResourceCompiler/CfgFile.h b/Code/Tools/RC/ResourceCompiler/CfgFile.h
deleted file mode 100644
index e962b0cc45..0000000000
--- a/Code/Tools/RC/ResourceCompiler/CfgFile.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CFGFILE_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CFGFILE_H
-#pragma once
-
-#include "ICfgFile.h"                       // ICfgFile
-#include <list>
-
-enum EConfigPriority : uint32_t;
-class Config;
-
-/** Configuration file class.
-        Uses format similar to windows .ini files.
-*/
-class CfgFile
-    : public ICfgFile
-{
-public:
-    CfgFile();
-    virtual ~CfgFile();
-
-    //////////////////////////////////////////////////////////////////////////
-    // interface ICfgFile
-    virtual void Release();
-    virtual bool Load(const string& fileName);
-    virtual bool Save(void);
-    virtual void UpdateOrCreateEntry(const char* inszSection, const char* inszKey, const char* inszValue);
-    virtual void RemoveEntry(const char* inszSection, const char* inszKey);
-    virtual void CopySectionKeysToConfig(EConfigPriority ePri, int sectionIndex, const char* keySuffixes, IConfigSink* config) const;
-    virtual const char* GetSectionName(int sectionIndex) const;
-    virtual int FindSection(const char* sectionName) const;
-    //////////////////////////////////////////////////////////////////////////
-
-private:
-    void LoadFromBuffer(const char* buf);
-
-private:
-    // Config file entry structure, filled by readSection method.
-    struct Entry
-    {
-        string key;     //!< keys (for comments this is "")
-        string value;   //!< values and comments (with leading ; or //)
-
-        bool IsComment() const;
-    };
-
-    struct Section
-    {
-        string           name;           //!< Section name. The first one has the name "" and is used if no section was specified.
-        std::list<Entry> entries;        //!< List of entries.
-    };
-
-    string               m_fileName;     //!< Configuration file name.
-    int                  m_modified;     //!< Set to true if config file been modified.
-    std::vector<Section> m_sections;     //!< List of sections in config file. (the first one has the name "" and is used if no section was specified)
-};
-
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CFGFILE_H
diff --git a/Code/Tools/RC/ResourceCompiler/Config.cpp b/Code/Tools/RC/ResourceCompiler/Config.cpp
deleted file mode 100644
index acf3999bce..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Config.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include "Config.h"
-#include "PropertyVars.h"
-#include "StringHelpers.h"
-#include "IRCLog.h"
-
-//////////////////////////////////////////////////////////////////////////
-Config::Config()
-    : m_pConfigKeyRegistry(0)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-Config::~Config()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Config::GetUnknownKeys(std::vector<string>& unknownKeys) const
-{
-    unknownKeys.clear();
-
-    if (!m_pConfigKeyRegistry)
-    {
-        return;
-    }
-
-    const Map::const_iterator end = m_map.end();
-
-    for (Map::const_iterator it = m_map.begin(); it != end; ++it)
-    {
-        const char* const keyName = it->first.m_sKeyName.c_str();
-        if (!m_pConfigKeyRegistry->HasKeyRegistered(keyName))
-        {
-            unknownKeys.push_back(keyName);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Config::SetConfigKeyRegistry(IConfigKeyRegistry* pConfigKeyRegistry)
-{
-    m_pConfigKeyRegistry = pConfigKeyRegistry;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IConfigKeyRegistry* Config::GetConfigKeyRegistry() const
-{
-    return m_pConfigKeyRegistry;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int Config::GetSum(const char* key) const
-{
-    if (m_pConfigKeyRegistry)
-    {
-        m_pConfigKeyRegistry->VerifyKeyRegistration(key);
-    }
-
-    MapKey mapKey;
-    mapKey.m_sKeyName = key;
-    mapKey.m_eKeyPri = eCP_PriorityHighest;
-    const Map::const_iterator lowerBound = m_map.lower_bound(mapKey);
-    mapKey.m_eKeyPri = eCP_PriorityLowest;
-    const Map::const_iterator upperBound = m_map.upper_bound(mapKey);
-
-    int ret = 0;
-
-    for (Map::const_iterator it = lowerBound; it != upperBound; ++it)
-    {
-        const MapKey& foundMapKey = it->first;
-
-        if (!StringHelpers::EqualsIgnoreCase(foundMapKey.m_sKeyName, mapKey.m_sKeyName))
-        {
-            RCLogError("Unexpected failure in %s", __FUNCTION__);
-            break;
-        }
-
-        int localvalue;
-        if (azsscanf(it->second.c_str(), "%d", &localvalue) == 1)
-        {
-            ret += localvalue;
-        }
-    }
-
-    return ret;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Config::GetKeyValue(const char* const key, const char*& value, const int ePriMask) const
-{
-    if (m_pConfigKeyRegistry)
-    {
-        m_pConfigKeyRegistry->VerifyKeyRegistration(key);
-    }
-
-    MapKey mapKey;
-    mapKey.m_sKeyName = key;
-    mapKey.m_eKeyPri = eCP_PriorityHighest;
-    const Map::const_iterator lowerBound = m_map.lower_bound(mapKey);
-    mapKey.m_eKeyPri = eCP_PriorityLowest;
-    const Map::const_iterator upperBound = m_map.upper_bound(mapKey);
-
-    for (Map::const_iterator it = lowerBound; it != upperBound; ++it)
-    {
-        const MapKey& foundMapKey = it->first;
-
-        if (ePriMask & foundMapKey.m_eKeyPri)
-        {
-            if (!StringHelpers::EqualsIgnoreCase(foundMapKey.m_sKeyName, mapKey.m_sKeyName))
-            {
-                RCLogError("Unexpected failure in %s", __FUNCTION__);
-                break;
-            }
-
-            value = it->second.c_str();
-            return true;
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Config::AddConfig(const IConfig* inpConfig)
-{
-    if (!inpConfig)
-    {
-        return;
-    }
-
-    const Config* const pConfig = inpConfig->GetInternalRepresentation();
-
-    if (!pConfig)
-    {
-        assert(0);
-        return;
-    }
-
-    const Map::const_iterator end = pConfig->m_map.end();
-
-    for (Map::const_iterator it = pConfig->m_map.begin(); it != end; ++it)
-    {
-        const MapKey& mapKey = it->first;
-        const string value = it->second;
-
-        SetKeyValue(mapKey.m_eKeyPri, mapKey.m_sKeyName.c_str(), value.c_str());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Config* Config::GetInternalRepresentation() const
-{
-    return this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Config::HasKeyRegistered(const char* szKey) const
-{
-    assert(szKey);
-    return m_pConfigKeyRegistry ? m_pConfigKeyRegistry->HasKeyRegistered(szKey) : false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Config::HasKeyMatchingWildcards(const char* wildcards) const
-{
-    if (!wildcards || !wildcards[0])
-    {
-        return false;
-    }
-
-    const string strWildcards(wildcards);
-
-    const Map::const_iterator end = m_map.end();
-    for (Map::const_iterator it = m_map.begin(); it != end; ++it)
-    {
-        if (StringHelpers::MatchesWildcardsIgnoreCase(it->first.m_sKeyName, strWildcards))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Config::Clear()
-{
-    m_map.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 Config::ClearPriorityUsage(const int ePriMask)
-{
-    uint32 dwRet = 0;
-
-    Map::const_iterator it = m_map.begin();
-
-    while (it != m_map.end())
-    {
-        Map::const_iterator itNext = it;
-        ++itNext;
-
-        const MapKey& mapKey = it->first;
-
-        if (mapKey.m_eKeyPri & ePriMask)
-        {
-            m_map.erase(mapKey);
-            ++dwRet;
-        }
-
-        it = itNext;
-    }
-
-    return dwRet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 Config::CountPriorityUsage(const int ePriMask)   const
-{
-    uint32 dwRet = 0;
-
-    const Map::const_iterator end = m_map.end();
-
-    for (Map::const_iterator it = m_map.begin(); it != end; ++it)
-    {
-        const MapKey& mapKey = it->first;
-
-        if (mapKey.m_eKeyPri == ePriMask)
-        {
-            ++dwRet;
-        }
-    }
-
-    return dwRet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Config::SetKeyValue(const EConfigPriority ePri, const char* key, const char* value)
-{
-    assert(Util::isPowerOfTwo(ePri));
-
-    if (!key || !key[0])
-    {
-        return;
-    }
-
-    MapKey mapKey;
-    mapKey.m_sKeyName = key;
-    mapKey.m_eKeyPri = ePri;
-
-    if (value == 0)
-    {
-        m_map.erase(mapKey);
-    }
-    else
-    {
-        m_map[mapKey] = value;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Config::CopyToConfig(const EConfigPriority ePri, IConfigSink* pDestConfig) const
-{
-    assert(Util::isPowerOfTwo(ePri));
-
-    const Map::const_iterator end = m_map.end();
-    for (Map::const_iterator it = m_map.begin(); it != end; ++it)
-    {
-        const MapKey& mapKey = it->first;
-        if (mapKey.m_eKeyPri == ePri)
-        {
-            pDestConfig->SetKeyValue(ePri, mapKey.m_sKeyName, it->second);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Config::CopyToPropertyVars(CPropertyVars& properties) const
-{
-    const Map::const_iterator end = m_map.end();
-    for (Map::const_iterator it = m_map.begin(); it != end; ++it)
-    {
-        const MapKey& mapKey = it->first;
-        properties.SetProperty(mapKey.m_sKeyName, it->second);
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompiler/Config.h b/Code/Tools/RC/ResourceCompiler/Config.h
deleted file mode 100644
index 145cfd0ce0..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CONFIG_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CONFIG_H
-#pragma once
-
-#include "IConfig.h"
-#include "StlUtils.h"
-#include "StringHelpers.h"
-
-class CPropertyVars;
-
-/** Implementation of IConfig interface.
-*/
-class Config
-    : public IConfig
-{
-public:
-    Config();
-    virtual ~Config();
-
-    void SetConfigKeyRegistry(IConfigKeyRegistry* pConfigKeyRegistry);
-    IConfigKeyRegistry* GetConfigKeyRegistry() const;
-
-    // interface IConfigSink ------------------------------------------
-
-    virtual void SetKeyValue(EConfigPriority ePri, const char* key, const char* value);
-
-    // interface IConfig ----------------------------------------------
-
-    virtual void Release() { delete this; };
-    virtual const Config* GetInternalRepresentation() const;
-    virtual bool HasKeyRegistered(const char* key) const;
-    virtual bool HasKeyMatchingWildcards(const char* wildcards) const;
-    virtual bool GetKeyValue(const char* key, const char*& value, int ePriMask) const;
-    virtual int GetSum(const char* key) const;
-    virtual void GetUnknownKeys(std::vector<string>& unknownKeys) const;
-    virtual void AddConfig(const IConfig* inpConfig);
-    virtual void Clear();
-    virtual uint32 ClearPriorityUsage(int ePriMask);
-    virtual uint32 CountPriorityUsage(int ePriMask) const;
-    virtual void CopyToConfig(EConfigPriority ePri, IConfigSink* pDestConfig) const;
-    virtual void CopyToPropertyVars(CPropertyVars& properties) const;
-
-private: // ---------------------------------------------------------------------
-
-    struct MapKey
-    {
-        string m_sKeyName;
-        EConfigPriority m_eKeyPri;
-
-        bool operator<(const MapKey& b) const
-        {
-            // sort by m_sKeyName
-            const int cmp = StringHelpers::CompareIgnoreCase(m_sKeyName, b.m_sKeyName);
-            if (cmp != 0)
-            {
-                return (cmp < 0);
-            }
-
-            // sort by m_eKeyPri (higher priority goes first)
-            return (m_eKeyPri > b.m_eKeyPri);
-        }
-    };
-
-    typedef std::map<MapKey, string> Map;
-
-    Map m_map;
-    IConfigKeyRegistry* m_pConfigKeyRegistry;   // used to verify key registration
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CONFIG_H
diff --git a/Code/Tools/RC/ResourceCompiler/ConvertContext.h b/Code/Tools/RC/ResourceCompiler/ConvertContext.h
deleted file mode 100644
index b10878ab79..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ConvertContext.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "PathHelpers.h"
-#include "string.h"
-#include "IMultiplatformConfig.h"
-#include "IResCompiler.h"
-
-class IConfig;
-
-// IConvertContext is a description of what and how should be processed by compiler
-struct IConvertContext
-{
-    virtual void SetConvertorExtension(const char* convertorExtension) = 0;
-
-    virtual void SetSourceFolder(const char* sourceFolder) = 0;
-    virtual void SetSourceFileNameOnly(const char* sourceFileNameOnly) = 0;
-    virtual void SetOutputFolder(const char* sOutputFolder) = 0;
-
-    virtual void SetRC(IResourceCompiler* pRC) = 0;
-    virtual void SetMultiplatformConfig(IMultiplatformConfig* pMultiConfig) = 0;
-    virtual void SetPlatformIndex(int platformIndex) = 0;
-    virtual void SetForceRecompiling(bool bForceRecompiling) = 0;
-
-    virtual void CopyTo(IConvertContext* context) = 0;
-
-};
-
-struct ConvertContext
-    : public IConvertContext
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Interface IConvertContext
-
-    virtual void SetConvertorExtension(const char* convertorExtension)
-    {
-        this->m_convertorExtension = convertorExtension;
-    }
-
-    virtual void SetSourceFolder(const char* sourceFolder)
-    {
-        this->m_sourceFolder = sourceFolder;
-    }
-    virtual void SetSourceFileNameOnly(const char* sourceFileNameOnly)
-    {
-        this->m_sourceFileNameOnly = sourceFileNameOnly;
-    }
-    virtual void SetOutputFolder(const char* sOutputFolder)
-    {
-        this->m_outputFolder = sOutputFolder;
-    }
-
-    virtual void SetRC(IResourceCompiler* pRC)
-    {
-        this->m_pRC = pRC;
-    }
-    virtual void SetMultiplatformConfig(IMultiplatformConfig* pMultiConfig)
-    {
-        this->m_multiConfig = pMultiConfig;
-        this->m_config = &pMultiConfig->getConfig();
-        this->m_platform = pMultiConfig->getActivePlatform();
-    }
-    virtual void SetPlatformIndex(int platformIndex)
-    {        
-        this->m_platform = platformIndex;
-        m_multiConfig->setActivePlatform(platformIndex);
-    }
-    virtual void SetForceRecompiling(bool bForceRecompiling)
-    {
-        this->m_bForceRecompiling = bForceRecompiling;
-    }
-
-    virtual void CopyTo(IConvertContext* context)
-    {
-        context->SetConvertorExtension(m_convertorExtension);
-        context->SetSourceFolder(m_sourceFolder);
-        context->SetSourceFileNameOnly(m_sourceFileNameOnly);
-        context->SetOutputFolder(m_outputFolder);
-        context->SetRC(m_pRC);
-        context->SetMultiplatformConfig(m_multiConfig);
-        context->SetForceRecompiling(m_bForceRecompiling);
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    const string GetSourcePath() const
-    {
-        return PathHelpers::Join(m_sourceFolder, m_sourceFileNameOnly).c_str();
-    }
-
-    const string& GetOutputFolder() const
-    {
-        return m_outputFolder;
-    }
-
-public:
-    // Convertor will assume that the source file has content matching this extension
-    // (the sourceFileNameOnly can have a different extension, say 'tmp').
-    string m_convertorExtension;
-
-    // Source file's folder.
-    string m_sourceFolder;
-    // Source file that needs to be converted, for example "test.tif".
-    // Contains filename only, the folder is stored in sourceFolder.
-    string m_sourceFileNameOnly;
-
-    // Pointer to resource compiler interface.
-    IResourceCompiler* m_pRC;
-
-    // Configuration settings.
-    IMultiplatformConfig* m_multiConfig;
-    // Platform to which file must be processed.
-    int m_platform;
-    // Platform's config.
-    const IConfig* m_config;
-
-    // true if compiler is requested to skip up-to-date checks
-    bool m_bForceRecompiling;
-
-private:
-    // Output folder.
-    string m_outputFolder;
-};
-
diff --git a/Code/Tools/RC/ResourceCompiler/DebugLog.h b/Code/Tools/RC/ResourceCompiler/DebugLog.h
deleted file mode 100644
index d7640347c6..0000000000
--- a/Code/Tools/RC/ResourceCompiler/DebugLog.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_DEBUGLOG_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_DEBUGLOG_H
-#pragma once
-
-inline void DebugLog (const char* szFormat, ...)
-{
-    
-    FILE* f = nullptr;
-    azfopen(&f, "Rc.Debug.log", "wa");
-    if (!f)
-    {
-        return;
-    }
-    va_list args;
-    va_start (args, szFormat);
-    vfprintf (f, szFormat, args);
-    fprintf (f, "\n");
-    vprintf (szFormat, args);
-    printf ("\n");
-    va_end(args);
-    fclose (f);
-}
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_DEBUGLOG_H
diff --git a/Code/Tools/RC/ResourceCompiler/DependencyList.cpp b/Code/Tools/RC/ResourceCompiler/DependencyList.cpp
deleted file mode 100644
index c77f15049c..0000000000
--- a/Code/Tools/RC/ResourceCompiler/DependencyList.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-
-#include "DependencyList.h"
-
-#include "IRCLog.h"
-#include "PathHelpers.h"
-#include "StringHelpers.h"
-
-#include <stdio.h>      // FILE
-
-
-CDependencyList::CDependencyList()
-    : m_bDuplicatesWereRemoved(true)
-{
-}
-
-CDependencyList::CDependencyList(const CDependencyList& obj)
-{
-    m_files = obj.m_files;
-    m_bDuplicatesWereRemoved = obj.m_bDuplicatesWereRemoved;
-}
-
-string CDependencyList::NormalizeFilename(const char* filename)
-{
-    return PathHelpers::ToDosPath(PathHelpers::GetAbsoluteAsciiPath(string(filename)));
-}
-
-void CDependencyList::Add(const char* sInputFilename, const char* sOutputFilename)
-{
-    SFile f;
-    f.inputFile = sInputFilename[0] ? NormalizeFilename(sInputFilename) : string();
-    f.outputFile = sOutputFilename[0] ? NormalizeFilename(sOutputFilename) : string();
-    m_files.push_back(f);
-    m_bDuplicatesWereRemoved = false;
-}
-
-void CDependencyList::RemoveDuplicates()
-{
-    if (m_bDuplicatesWereRemoved)
-    {
-        return;
-    }
-
-    m_bDuplicatesWereRemoved = true;
-
-    if (m_files.size() <= 1)
-    {
-        return;
-    }
-
-    struct CompareLess
-    {
-        bool operator()(const SFile& left, const SFile& right) const
-        {
-            const int res = StringHelpers::Compare(left.inputFile, right.inputFile);
-            if (res != 0)
-            {
-                return res < 0;
-            }
-            return (StringHelpers::Compare(left.outputFile, right.outputFile) < 0);
-        }
-    };
-
-    struct CompareEqual
-    {
-        bool operator()(const SFile& left, const SFile& right) const
-        {
-            return
-                StringHelpers::Equals(left.inputFile, right.inputFile) &&
-                StringHelpers::Equals(left.outputFile, right.outputFile);
-        }
-    };
-
-    std::sort(m_files.begin(), m_files.end(), CompareLess());
-
-    std::vector<SFile>::iterator end = std::unique(m_files.begin(), m_files.end(), CompareEqual());
-    if (end != m_files.end())
-    {
-        m_files.erase(end, m_files.end());
-    }
-}
-
-void CDependencyList::RemoveInputFiles(const std::vector<string>& inputFilesToRemove)
-{
-    if (m_files.empty())
-    {
-        return;
-    }
-
-    struct CompareLess
-    {
-        bool operator()(const SFile& left, const SFile& right) const
-        {
-            return (left.inputFile < right.inputFile);
-        }
-    };
-
-    std::sort(m_files.begin(), m_files.end(), CompareLess());
-
-    bool bDeleted = false;
-
-    const size_t count = inputFilesToRemove.size();
-    for (size_t i = 0; i < count; ++i)
-    {
-        SFile searchFile;
-        searchFile.inputFile = NormalizeFilename(inputFilesToRemove[i].c_str());
-
-        std::vector<SFile>::iterator it = std::lower_bound(m_files.begin(), m_files.end(), searchFile, CompareLess());
-
-        while (it != m_files.end())
-        {
-            if (!StringHelpers::Equals(it->inputFile, searchFile.inputFile))
-            {
-                break;
-            }
-            // Mark the entry for deleting
-            it->outputFile.clear();
-            ++it;
-            bDeleted = true;
-        }
-    }
-
-    // Delete marked entries
-    if (bDeleted)
-    {
-        struct MatchEmptyOutputFile
-        {
-            bool operator()(const SFile& file) const
-            {
-                return file.outputFile.empty();
-            }
-        };
-
-        m_files.erase(std::remove_if(m_files.begin(), m_files.end(), MatchEmptyOutputFile()), m_files.end());
-    }
-}
-
-void CDependencyList::Save(const char* filename) const
-{
-    FILE* file = nullptr; 
-    azfopen(&file, filename, "wt");
-
-    if (!file)
-    {
-        RCLogError("Cannot write filelist '%s'", filename);
-        return;
-    }
-
-    for (size_t i = 0; i < m_files.size(); ++i)
-    {
-        fprintf(file, "%s=%s\n", m_files[i].inputFile.c_str(), m_files[i].outputFile.c_str());
-    }
-    fclose(file);
-}
-
-void CDependencyList::SaveOutputOnly(const char* filename) const
-{
-    FILE* file = nullptr; 
-    azfopen(&file, filename, "wt");
-
-    if (!file)
-    {
-        RCLogError("Cannot write filelist (output files only) '%s'", filename);
-        return;
-    }
-
-    for (size_t i = 0; i < m_files.size(); ++i)
-    {
-        fprintf(file, "%s\n", m_files[i].outputFile.c_str());
-    }
-    fclose(file);
-}
-
-void CDependencyList::Load(const char* filename)
-{
-    FILE* file = nullptr; 
-    azfopen(&file, filename, "rt");
-
-    if (!file)
-    {
-        RCLogError("Cannot read filelist '%s' (probably the file does not exist)", filename);
-        return;
-    }
-
-    char linebuf[MAX_PATH * 4];
-    while (!feof(file))
-    {
-        char* const line = fgets(linebuf, sizeof(linebuf), file);
-        if (line && line[0])
-        {
-            char* const pos = strchr(line, '=');
-            if (pos)
-            {
-                *pos = 0;
-                const string sIn = string(line).Trim();
-                const string sOut = string(pos + 1).Trim();
-                if (!sIn.empty() && !sOut.empty())
-                {
-                    Add(sIn.c_str(), sOut.c_str());
-                }
-            }
-        }
-    }
-    fclose(file);
-}
diff --git a/Code/Tools/RC/ResourceCompiler/DependencyList.h b/Code/Tools/RC/ResourceCompiler/DependencyList.h
deleted file mode 100644
index 6359437959..0000000000
--- a/Code/Tools/RC/ResourceCompiler/DependencyList.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_DEPENDENCYLIST_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_DEPENDENCYLIST_H
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-class CDependencyList
-{
-public:
-    struct SFile
-    {
-        string inputFile;
-        string outputFile;
-    };
-
-private:
-    std::vector<SFile> m_files;
-    bool m_bDuplicatesWereRemoved;
-
-public:
-    CDependencyList();
-
-    CDependencyList(const CDependencyList& obj);
-
-    static string NormalizeFilename(const char* filename);
-
-    size_t GetCount() const
-    {
-        return m_files.size();
-    }
-
-    const SFile& GetElement(size_t index) const
-    {
-        return m_files[index];
-    }
-
-    void Add(const char* inputFilename, const char* outputFilename);
-
-    void RemoveDuplicates();
-
-    void RemoveInputFiles(const std::vector<string>& inputFilesToRemove);
-
-    void Save(const char* filename) const;
-
-    void SaveOutputOnly(const char* filename) const;
-
-    void Load(const char* filename);
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_DEPENDENCYLIST_H
diff --git a/Code/Tools/RC/ResourceCompiler/ExcelExport.cpp b/Code/Tools/RC/ResourceCompiler/ExcelExport.cpp
deleted file mode 100644
index f637c5fa2d..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ExcelExport.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the CryEngine Unit Testing framework
-
-
-#include "ResourceCompiler_precompiled.h"
-#include "ExcelExport.h"
-#include "ICryXML.h"
-#include "IXMLSerializer.h"
-#include "IRCLog.h"
-#include "CryPath.h"
-#include <CryLibrary.h>
-#include "ResourceCompiler.h"
-
-//////////////////////////////////////////////////////////////////////////
-string CExcelExportBase::GetXmlHeader() const
-{
-    return "<?xml version=\"1.0\"?>\n<?mso-application progid=\"Excel.Sheet\"?>\n";
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::InitExcelWorkbook(XmlNodeRef Workbook)
-{
-    m_Workbook = Workbook;
-    m_Workbook->setTag("Workbook");
-    m_Workbook->setAttr("xmlns", "urn:schemas-microsoft-com:office:spreadsheet");
-    XmlNodeRef ExcelWorkbook = Workbook->newChild("ExcelWorkbook");
-    ExcelWorkbook->setAttr("xmlns", "urn:schemas-microsoft-com:office:excel");
-
-    XmlNodeRef Styles = m_Workbook->newChild("Styles");
-    {
-        // Style s25
-        // Bold header, With Background Color.
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s25");
-        XmlNodeRef StyleFont = Style->newChild("Font");
-        StyleFont->setAttr("x:CharSet", "204");
-        StyleFont->setAttr("x:Family", "Swiss");
-        StyleFont->setAttr("ss:Bold", "1");
-        XmlNodeRef StyleInterior = Style->newChild("Interior");
-        StyleInterior->setAttr("ss:Color", "#00FF00");
-        StyleInterior->setAttr("ss:Pattern", "Solid");
-        XmlNodeRef NumberFormat = Style->newChild("NumberFormat");
-        NumberFormat->setAttr("ss:Format", "#,##0");
-    }
-    {
-        // Style s26
-        // Bold/Centered header.
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s26");
-        XmlNodeRef StyleFont = Style->newChild("Font");
-        StyleFont->setAttr("x:CharSet", "204");
-        StyleFont->setAttr("x:Family", "Swiss");
-        StyleFont->setAttr("ss:Bold", "1");
-        XmlNodeRef StyleInterior = Style->newChild("Interior");
-        StyleInterior->setAttr("ss:Color", "#FFFF99");
-        StyleInterior->setAttr("ss:Pattern", "Solid");
-        XmlNodeRef Alignment = Style->newChild("Alignment");
-        Alignment->setAttr("ss:Horizontal", "Center");
-        Alignment->setAttr("ss:Vertical", "Bottom");
-    }
-    {
-        // Style s27
-        // Bold Highlighted Cell, With Red Background Color, white Text, Centered.
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s27");
-        XmlNodeRef StyleFont = Style->newChild("Font");
-        StyleFont->setAttr("x:CharSet", "204");
-        StyleFont->setAttr("x:Family", "Swiss");
-        StyleFont->setAttr("ss:Bold", "1");
-        StyleFont->setAttr("ss:Color", "#FFFFFF");
-        XmlNodeRef StyleInterior = Style->newChild("Interior");
-        StyleInterior->setAttr("ss:Color", "#FF0000");
-        StyleInterior->setAttr("ss:Pattern", "Solid");
-        XmlNodeRef Alignment = Style->newChild("Alignment");
-        Alignment->setAttr("ss:Horizontal", "Center");
-        Alignment->setAttr("ss:Vertical", "Bottom");
-    }
-    {
-        // Style s28
-        // Bold Highlighted Cell, With Red Background Color, white Text.
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s28");
-        XmlNodeRef StyleFont = Style->newChild("Font");
-        StyleFont->setAttr("x:CharSet", "204");
-        StyleFont->setAttr("x:Family", "Swiss");
-        StyleFont->setAttr("ss:Bold", "1");
-        StyleFont->setAttr("ss:Color", "#FFFFFF");
-        XmlNodeRef StyleInterior = Style->newChild("Interior");
-        StyleInterior->setAttr("ss:Color", "#FF0000");
-        StyleInterior->setAttr("ss:Pattern", "Solid");
-    }
-    {
-        // Style s20
-        // Centered
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s20");
-        XmlNodeRef Alignment = Style->newChild("Alignment");
-        Alignment->setAttr("ss:Horizontal", "Center");
-        Alignment->setAttr("ss:Vertical", "Bottom");
-    }
-    {
-        // Style s21
-        // Bold
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s21");
-        XmlNodeRef StyleFont = Style->newChild("Font");
-        StyleFont->setAttr("x:CharSet", "204");
-        StyleFont->setAttr("x:Family", "Swiss");
-        StyleFont->setAttr("ss:Bold", "1");
-    }
-    {
-        // Style s22
-        // Centered, Integer Number format
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s22");
-        XmlNodeRef Alignment = Style->newChild("Alignment");
-        Alignment->setAttr("ss:Horizontal", "Center");
-        Alignment->setAttr("ss:Vertical", "Bottom");
-        XmlNodeRef NumberFormat = Style->newChild("NumberFormat");
-        NumberFormat->setAttr("ss:Format", "#,##0");
-    }
-    {
-        // Style s23
-        // Centered, Float Number format
-        XmlNodeRef Style = Styles->newChild("Style");
-        Style->setAttr("ss:ID", "s23");
-        XmlNodeRef Alignment = Style->newChild("Alignment");
-        Alignment->setAttr("ss:Horizontal", "Center");
-        Alignment->setAttr("ss:Vertical", "Bottom");
-        //XmlNodeRef NumberFormat = Style->newChild( "NumberFormat" );
-        //NumberFormat->setAttr( "ss:Format","#,##0" );
-    }
-
-    /*
-    <Style ss:ID="s25">
-    <Font x:CharSet="204" x:Family="Swiss" ss:Bold="1"/>
-    <Interior ss:Color="#FFFF99" ss:Pattern="Solid"/>
-    </Style>
-    */
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CExcelExportBase::NewWorksheet(const char* name)
-{
-    m_CurrWorksheet = m_Workbook->newChild("Worksheet");
-    m_CurrWorksheet->setAttr("ss:Name", name);
-    m_CurrTable = m_CurrWorksheet->newChild("Table");
-    return m_CurrWorksheet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AddRow()
-{
-    m_CurrRow = m_CurrTable->newChild("Row");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AddCell_SumOfRows(int nRows)
-{
-    XmlNodeRef cell = m_CurrRow->newChild("Cell");
-    XmlNodeRef data = cell->newChild("Data");
-    data->setAttr("ss:Type", "Number");
-    data->setContent("0");
-    m_CurrCell = cell;
-
-    if (nRows > 0)
-    {
-        char buf[128];
-        sprintf_s(buf, "=SUM(R[-%d]C:R[-1]C)", nRows);
-        m_CurrCell->setAttr("ss:Formula", buf);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AddCell(float number)
-{
-    XmlNodeRef cell = m_CurrRow->newChild("Cell");
-    cell->setAttr("ss:StyleID", "s23"); // Centered
-    XmlNodeRef data = cell->newChild("Data");
-    data->setAttr("ss:Type", "Number");
-    char str[128];
-    sprintf_s(str, "%.3f", number);
-    data->setContent(str);
-    m_CurrCell = cell;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AddCell(int number)
-{
-    XmlNodeRef cell = m_CurrRow->newChild("Cell");
-    cell->setAttr("ss:StyleID", "s22"); // Centered
-    XmlNodeRef data = cell->newChild("Data");
-    data->setAttr("ss:Type", "Number");
-    char str[128];
-    sprintf_s(str, "%d", number);
-    data->setContent(str);
-    m_CurrCell = cell;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AddCell(uint32 number)
-{
-    XmlNodeRef cell = m_CurrRow->newChild("Cell");
-    cell->setAttr("ss:StyleID", "s22"); // Centered
-    XmlNodeRef data = cell->newChild("Data");
-    data->setAttr("ss:Type", "Number");
-    char str[128];
-    sprintf_s(str, "%u", number);
-    data->setContent(str);
-    m_CurrCell = cell;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AddCell(const char* str, int nFlags)
-{
-    XmlNodeRef cell = m_CurrRow->newChild("Cell");
-    XmlNodeRef data = cell->newChild("Data");
-    data->setAttr("ss:Type", "String");
-    data->setContent(str);
-    SetCellFlags(cell, nFlags);
-    m_CurrCell = cell;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AddCellAtIndex(int nIndex, const char* str, int nFlags)
-{
-    XmlNodeRef cell = m_CurrRow->newChild("Cell");
-    cell->setAttr("ss:Index", nIndex);
-    XmlNodeRef data = cell->newChild("Data");
-    data->setAttr("ss:Type", "String");
-    data->setContent(str);
-    SetCellFlags(cell, nFlags);
-    m_CurrCell = cell;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::SetCellFlags(XmlNodeRef cell, int flags)
-{
-    if (flags & CELL_BOLD)
-    {
-        if (flags & CELL_CENTERED)
-        {
-            cell->setAttr("ss:StyleID", "s26");
-        }
-        else
-        {
-            cell->setAttr("ss:StyleID", "s21");
-        }
-    }
-    else if (flags & CELL_CENTERED)
-    {
-        cell->setAttr("ss:StyleID", "s20");
-    }
-    else if (flags & CELL_HIGHLIGHT)
-    {
-        cell->setAttr("ss:StyleID", "s27");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CExcelExportBase::SaveToFile(const char* filename) const
-{
-    string xml = m_Workbook->getXML();
-    string header = GetXmlHeader();
-
-    FILE* file = nullptr; 
-    azfopen(&file, filename, "wb");
-    if (file)
-    {
-        fprintf(file, "%s", header.c_str());
-        fprintf(file, "%s", xml.c_str());
-        fclose(file);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CExcelExportBase::NewWorkbook()
-{
-    XmlNodeRef Workbook = LoadICryXML()->GetXMLSerializer()->CreateNode("Workbook");
-    InitExcelWorkbook(Workbook);
-    return Workbook;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CExcelExportBase::AddColumn(const char* name, int nWidth)
-{
-    XmlNodeRef Column = m_CurrTable->newChild("Column");
-    Column->setAttr("ss:Width", nWidth);
-
-    m_columns.push_back(name);
-
-    return Column;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::BeginColumns()
-{
-    m_columns.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::EndColumns()
-{
-    AddRow();
-    m_CurrRow->setAttr("ss:StyleID", "s25");
-    for (int i = 0; i < m_columns.size(); i++)
-    {
-        AddCell(m_columns[i]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::FreezeFirstRow()
-{
-    XmlNodeRef options = m_CurrWorksheet->newChild("WorksheetOptions");
-    options->setAttr("xmlns", "urn:schemas-microsoft-com:office:excel");
-    options->newChild("FreezePanes");
-    options->newChild("FrozenNoSplit");
-    options->newChild("SplitHorizontal")->setContent("1");
-    options->newChild("TopRowBottomPane")->setContent("1");
-    options->newChild("ActivePane")->setContent("2");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelExportBase::AutoFilter(int nRow, int nNumColumns)
-{
-    XmlNodeRef options = m_CurrWorksheet->newChild("AutoFilter");
-    options->setAttr("xmlns", "urn:schemas-microsoft-com:office:excel");
-    string range;
-    range.Format("R%dC1:R%dC%d", nRow, nRow, nNumColumns);
-    options->setAttr("x:Range", range);  // x:Range="R1C1:R1C8"
-}
diff --git a/Code/Tools/RC/ResourceCompiler/ExcelExport.h b/Code/Tools/RC/ResourceCompiler/ExcelExport.h
deleted file mode 100644
index 957d96764d..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ExcelExport.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXCELEXPORT_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXCELEXPORT_H
-#pragma once
-
-#include <IXml.h>
-
-// Base class for custom CryEngine excel exporters
-class CExcelExportBase
-{
-public:
-    enum CellFlags
-    {
-        CELL_BOLD = 0x0001,
-        CELL_CENTERED = 0x0002,
-        CELL_HIGHLIGHT = 0x0004,
-    };
-
-    bool SaveToFile(const char* filename) const;
-
-    XmlNodeRef NewWorkbook();
-    void InitExcelWorkbook(XmlNodeRef Workbook);
-
-    XmlNodeRef NewWorksheet(const char* name);
-
-    XmlNodeRef AddColumn(const char* name, int nWidth);
-    void BeginColumns();
-    void EndColumns();
-
-    void AddCell(float number);
-    void AddCell(int number);
-    void AddCell(uint32 number);
-    void AddCell(uint64 number) { AddCell((uint32)number); };
-    void AddCell(int64 number) { AddCell((int)number); };
-    void AddCell(const char* str, int flags = 0);
-    void AddCellAtIndex(int nIndex, const char* str, int flags = 0);
-    void SetCellFlags(XmlNodeRef cell, int flags);
-    void AddRow();
-    void AddCell_SumOfRows(int nRows);
-    string GetXmlHeader() const;
-
-    void FreezeFirstRow();
-    void AutoFilter(int nRow, int nNumColumns);
-
-protected:
-    XmlNodeRef m_Workbook;
-    XmlNodeRef m_CurrTable;
-    XmlNodeRef m_CurrWorksheet;
-    XmlNodeRef m_CurrRow;
-    XmlNodeRef m_CurrCell;
-    std::vector<string> m_columns;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXCELEXPORT_H
diff --git a/Code/Tools/RC/ResourceCompiler/ExcelReport.cpp b/Code/Tools/RC/ResourceCompiler/ExcelReport.cpp
deleted file mode 100644
index c76b71a42b..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ExcelReport.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Implementation of the CryEngine Unit Testing framework
-
-
-#include "ResourceCompiler_precompiled.h"
-#include "AssetFileInfo.h"
-#include "CryPath.h"
-#include "ExcelReport.h"
-#include "IResCompiler.h"
-#include "StringUtils.h" // for cry_strcat
-
-//////////////////////////////////////////////////////////////////////////
-struct FilesComparePredicate
-{
-    bool operator()(const CAssetFileInfo* p1, const CAssetFileInfo* p2)
-    {
-        if (p1->m_bSuccess != p2->m_bSuccess)
-        {
-            return p1->m_bSuccess < p2->m_bSuccess;
-        }
-        return p1->m_DstFileSize > p2->m_DstFileSize;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-static inline int64 ComputeSizeInKB(int64 sz)
-{
-    return (sz < 0) ? 0 : (sz + 512) / 1024;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CExcelReport::Export(IResourceCompiler* pRC, const char* filename, std::vector<CAssetFileInfo*>& files)
-{
-    m_pRC = pRC;
-    XmlNodeRef WorkBook = NewWorkbook();
-
-    std::sort(files.begin(), files.end(), FilesComparePredicate());
-
-    ExportSummary(files);
-    ExportTextures(files);
-    ExportCGF(files);
-    ExportCHR(files);
-    ExportCAF(files);
-
-    return SaveToFile(filename);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelReport::ExportSummary(const std::vector<CAssetFileInfo*>& files)
-{
-    NewWorksheet("Summary");
-
-    const SFileVersion& fv = m_pRC->GetFileVersion();
-
-    AddColumn("", 150);
-    AddColumn("", 150);
-
-    AddRow();
-    AddCell("RC Version", CELL_BOLD);
-    char buffer[1024];
-    azsnprintf(buffer, sizeof(buffer), "%d.%d.%d", fv.v[2], fv.v[1], fv.v[0]);
-    AddCell(buffer);
-
-    AddRow();
-    AddCell("RC Compile Time", CELL_BOLD);
-    azsnprintf(buffer, sizeof(buffer), "%s %s", __DATE__, __TIME__);
-    AddCell(buffer);
-
-    AddRow();
-    AddRow();
-
-    size_t unusedCount = 0;
-    uint64 unusedSize = 0;
-    for (size_t i = 0; i < files.size(); i++)
-    {
-        const CAssetFileInfo& afi = *files[i];
-        if (!afi.m_bReferencedInLevels &&
-            (afi.m_type == CAssetFileInfo::eTexture ||
-             afi.m_type == CAssetFileInfo::eCGF ||
-             afi.m_type == CAssetFileInfo::eCHR))
-        {
-            ++unusedCount;
-            unusedSize += afi.m_DstFileSize;
-        }
-    }
-    azsnprintf(buffer, sizeof(buffer), "%d files processed", (int)files.size());
-    AddCell(buffer);
-    AddRow();
-    const unsigned int bytesInMegabyte = 1024 * 1024;
-    azsnprintf(buffer, sizeof(buffer), "%u unused assets found (%u MB)", (unsigned int)unusedCount, (unsigned int)(unusedSize / bytesInMegabyte));
-    AddCell(buffer);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelReport::ExportTextures(const std::vector<CAssetFileInfo*>& files)
-{
-    NewWorksheet("Textures");
-
-    FreezeFirstRow();
-    AutoFilter(1, 10);
-
-    BeginColumns();
-    AddColumn("Ok", 40);
-    AddColumn("File", 400);
-    AddColumn("In Levels", 60);
-    AddColumn("User", 80);
-    AddColumn("Size (KB)", 80);
-    AddColumn("Width", 50);
-    AddColumn("Height", 50);
-    AddColumn("Mips", 50);
-    AddColumn("Format", 80);
-    AddColumn("Type", 80);
-    AddColumn("Alpha", 50);
-    AddColumn("Sides", 50);
-    AddColumn("Perforce", 100);
-    AddColumn("Error", 100);
-    EndColumns();
-
-    for (uint32 i = 0; i < files.size(); i++)
-    {
-        const CAssetFileInfo& afi = *files[i];
-        if (afi.m_type != CAssetFileInfo::eTexture)
-        {
-            continue;
-        }
-
-        AddRow();
-
-        AddCell(afi.m_bSuccess ? "OK" : "FAIL", (afi.m_bSuccess ? 0 : CELL_HIGHLIGHT));
-        AddCell(afi.m_sSourceFilename);
-        AddCell(afi.m_bReferencedInLevels ? "USED" : "NOT USED", afi.m_bReferencedInLevels ? CELL_CENTERED : CELL_BOLD | CELL_CENTERED);
-
-        AddCell(ComputeSizeInKB(afi.m_DstFileSize));
-        AddCell(afi.m_textureInfo.w);
-        AddCell(afi.m_textureInfo.h);
-        AddCell(afi.m_textureInfo.nNumMips);
-        AddCell(afi.m_textureInfo.format, CELL_CENTERED);
-
-        const char* type = "2D";
-        if (afi.m_textureInfo.nDepth > 1)
-        {
-            type = "3D";
-        }
-        else if (afi.m_textureInfo.nSides > 1)
-        {
-            type = "Cubemap";
-        }
-        AddCell(type, CELL_CENTERED);
-        AddCell((afi.m_textureInfo.bAlpha) ? "Yes" : "", CELL_CENTERED);
-        AddCell(afi.m_textureInfo.nSides);
-
-        AddCell(afi.m_sErrorLog);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelReport::ExportCGF(const std::vector<CAssetFileInfo*>& files)
-{
-    NewWorksheet("Geometry");
-
-    FreezeFirstRow();
-    AutoFilter(1, 15);
-
-    BeginColumns();
-    AddColumn("Ok", 40);
-    AddColumn("File", 400);
-    AddColumn("In Levels", 60);
-    AddColumn("User", 80);
-    AddColumn("File Size", 80);
-    AddColumn("Mesh Size (KB)", 80);
-    AddColumn("Mesh Size Lod0 (KB)", 80);
-    AddColumn("LODs", 50);
-    AddColumn("Sub Meshes", 50);
-    AddColumn("Vertices", 50);
-    AddColumn("Tris", 50);
-    AddColumn("Joints", 50);
-    AddColumn("Phys Tris", 80);
-    AddColumn("Phys Size (KB)", 80);
-    AddColumn("Phys Proxies", 80);
-    AddColumn("LODs Tris", 80);
-    AddColumn("Split LODs", 80);
-    AddColumn("Perforce", 100);
-    AddColumn("Error", 100);
-    EndColumns();
-
-    for (uint32 i = 0; i < files.size(); i++)
-    {
-        const CAssetFileInfo& afi = *files[i];
-        if (afi.m_type != CAssetFileInfo::eCGF)
-        {
-            continue;
-        }
-
-        int nMeshSizeTotal = 0;
-        for (int lod = 0; lod < CAssetFileInfo::kMaxCgfLods; lod++)
-        {
-            nMeshSizeTotal += afi.m_geomInfo.nMeshSizePerLod[lod];
-        }
-
-        AddRow();
-
-        AddCell(afi.m_bSuccess ? "OK" : "FAIL", (afi.m_bSuccess ? 0 : CELL_HIGHLIGHT));
-        AddCell(afi.m_sSourceFilename);
-        AddCell(afi.m_bReferencedInLevels ? "USED" : "NOT USED", afi.m_bReferencedInLevels ? CELL_CENTERED : CELL_BOLD | CELL_CENTERED);
-        AddCell(ComputeSizeInKB(afi.m_DstFileSize));
-        AddCell((nMeshSizeTotal + 512) / 1024);
-        AddCell((afi.m_geomInfo.nMeshSize + 512) / 1024);
-        AddCell(afi.m_geomInfo.nLods);
-        AddCell(afi.m_geomInfo.nSubMeshCount);
-        AddCell(afi.m_geomInfo.nVertices);
-        AddCell(afi.m_geomInfo.nIndices / 3);
-        AddCell(afi.m_geomInfo.nJoints);
-        AddCell(afi.m_geomInfo.nPhysTriCount);
-        AddCell((afi.m_geomInfo.nPhysProxySize + 512) / 1024);
-        AddCell((afi.m_geomInfo.nPhysProxyCount));
-
-        if (afi.m_geomInfo.nLods > 1)
-        {
-            // Print lod1/lod2/lod3 ...
-            char tempstr[256];
-            char numstr[32];
-            tempstr[0] = 0;
-            int numlods = 0;
-            for (int lod = 0; lod < CAssetFileInfo::kMaxCgfLods; lod++)
-            {
-                if (afi.m_geomInfo.nIndicesPerLod[lod] != 0)
-                {
-                    azsnprintf(numstr, sizeof(numstr), "%d", (afi.m_geomInfo.nIndicesPerLod[lod] / 3));
-                    if (numlods > 0)
-                    {
-                        cry_strcat(tempstr, " / ");
-                    }
-                    cry_strcat(tempstr, numstr);
-                    numlods++;
-                }
-            }
-            AddCell(tempstr, CELL_CENTERED);
-        }
-        else
-        {
-            AddCell("");
-        }
-
-        AddCell((afi.m_geomInfo.bSplitLods) ? "Yes" : "");
-
-        AddCell(afi.m_sErrorLog);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelReport::ExportCHR(const std::vector<CAssetFileInfo*>& files)
-{
-    NewWorksheet("Characters");
-
-    FreezeFirstRow();
-    AutoFilter(1, 15);
-
-    BeginColumns();
-    AddColumn("Ok", 40);
-    AddColumn("File", 400);
-    AddColumn("In Levels", 60);
-    AddColumn("User", 80);
-    AddColumn("File Size", 80);
-    AddColumn("Mesh Size (KB)", 80);
-    AddColumn("Mesh Size Lod0 (KB)", 80);
-    AddColumn("LODs", 50);
-    AddColumn("Sub Meshes", 50);
-    AddColumn("Vertices", 50);
-    AddColumn("Tris", 50);
-    AddColumn("Phys Tris", 80);
-    AddColumn("Phys Size (KB)", 80);
-    AddColumn("Phys Proxies", 80);
-    AddColumn("LODs Tris", 80);
-    AddColumn("Perforce", 100);
-    AddColumn("Error", 100);
-    EndColumns();
-
-    for (uint32 i = 0; i < files.size(); i++)
-    {
-        const CAssetFileInfo& afi = *files[i];
-        if (afi.m_type != CAssetFileInfo::eCHR)
-        {
-            continue;
-        }
-
-        int nMeshSizeTotal = 0;
-        for (int lod = 0; lod < CAssetFileInfo::kMaxCgfLods; lod++)
-        {
-            nMeshSizeTotal += afi.m_geomInfo.nMeshSizePerLod[lod];
-        }
-
-        AddRow();
-
-        AddCell(afi.m_bSuccess ? "OK" : "FAIL", (afi.m_bSuccess ? 0 : CELL_HIGHLIGHT));
-        AddCell(afi.m_sSourceFilename);
-        AddCell(afi.m_bReferencedInLevels ? "USED" : "NOT USED", afi.m_bReferencedInLevels ? CELL_CENTERED : CELL_BOLD | CELL_CENTERED);
-        AddCell(ComputeSizeInKB(afi.m_DstFileSize));
-        AddCell((nMeshSizeTotal + 512) / 1024);
-        AddCell((afi.m_geomInfo.nMeshSize + 512) / 1024);
-        AddCell(afi.m_geomInfo.nLods);
-        AddCell(afi.m_geomInfo.nSubMeshCount);
-        AddCell(afi.m_geomInfo.nVertices);
-        AddCell(afi.m_geomInfo.nIndices / 3);
-        AddCell(afi.m_geomInfo.nPhysTriCount);
-        AddCell((afi.m_geomInfo.nPhysProxySize + 512) / 1024);
-        AddCell((afi.m_geomInfo.nPhysProxyCount));
-
-        if (afi.m_geomInfo.nLods > 1)
-        {
-            // Print lod1/lod2/lod3 ...
-            char tempstr[256];
-            char numstr[32];
-            tempstr[0] = 0;
-            int numlods = 0;
-            for (int lod = 0; lod < CAssetFileInfo::kMaxCgfLods; lod++)
-            {
-                if (afi.m_geomInfo.nIndicesPerLod[lod] != 0)
-                {
-                    sprintf_s(numstr, sizeof(numstr), "%d", (afi.m_geomInfo.nIndicesPerLod[lod] / 3));
-                    if (numlods > 0)
-                    {
-                        cry_strcat(tempstr, " / ");
-                    }
-                    cry_strcat(tempstr, numstr);
-                    numlods++;
-                }
-            }
-            AddCell(tempstr, CELL_CENTERED);
-        }
-        else
-        {
-            AddCell("");
-        }
-
-        AddCell(afi.m_sErrorLog);
-    }
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CExcelReport::ExportCAF(const std::vector<CAssetFileInfo*>& files)
-{
-    NewWorksheet("Animations");
-
-    FreezeFirstRow();
-    AutoFilter(1, 5);
-
-    BeginColumns();
-    AddColumn("Ok", 40);
-    AddColumn("File", 400);
-    AddColumn("User", 80);
-    AddColumn("File Size", 80);
-
-    AddColumn("Perforce", 100);
-    AddColumn("Error", 100);
-    EndColumns();
-
-    for (uint32 i = 0; i < files.size(); i++)
-    {
-        const CAssetFileInfo& afi = *files[i];
-        if (afi.m_type != CAssetFileInfo::eCAF)
-        {
-            continue;
-        }
-
-        int nMeshSizeTotal = 0;
-        for (int lod = 0; lod < CAssetFileInfo::kMaxCgfLods; lod++)
-        {
-            nMeshSizeTotal += afi.m_geomInfo.nMeshSizePerLod[lod];
-        }
-
-        AddRow();
-
-        AddCell(afi.m_bSuccess ? "OK" : "FAIL", (afi.m_bSuccess ? 0 : CELL_HIGHLIGHT));
-        AddCell(afi.m_sSourceFilename);
-        AddCell(ComputeSizeInKB(afi.m_DstFileSize));
-
-        AddCell(afi.m_sErrorLog);
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompiler/ExcelReport.h b/Code/Tools/RC/ResourceCompiler/ExcelReport.h
deleted file mode 100644
index 085d78fd31..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ExcelReport.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : ExcelReporter
-
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXCELREPORT_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXCELREPORT_H
-#pragma once
-
-#include "ExcelExport.h"
-#include "ConvertContext.h"
-
-// Base class for custom CryEngine excel exporters
-class CExcelReport
-    : public CExcelExportBase
-{
-public:
-    bool Export(IResourceCompiler* pRC, const char* filename, std::vector<CAssetFileInfo*>& files);
-
-    void ExportSummary(const std::vector<CAssetFileInfo*>& files);
-    void ExportTextures(const std::vector<CAssetFileInfo*>& files);
-    void ExportCGF(const std::vector<CAssetFileInfo*>& files);
-    void ExportCHR(const std::vector<CAssetFileInfo*>& files);
-    void ExportCAF(const std::vector<CAssetFileInfo*>& files);
-
-protected:
-    IResourceCompiler* m_pRC;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXCELREPORT_H
diff --git a/Code/Tools/RC/ResourceCompiler/ExtensionManager.cpp b/Code/Tools/RC/ResourceCompiler/ExtensionManager.cpp
deleted file mode 100644
index ca4166262e..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ExtensionManager.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include <time.h>
-#include "ExtensionManager.h"
-#include "IConvertor.h"
-#include "IResCompiler.h"       // IResourceCompiler
-#include "IRCLog.h"             // IRCLog
-#include "StringHelpers.h"
-
-//////////////////////////////////////////////////////////////////////////
-ExtensionManager::ExtensionManager()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-ExtensionManager::~ExtensionManager()
-{
-    UnregisterAll();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IConvertor* ExtensionManager::FindConvertor(const char* filename)  const
-{
-    string const strFilename = StringHelpers::MakeLowerCase(string(filename));
-
-    for (size_t i = 0; i < m_extVector.size(); ++i)
-    {
-        if (StringHelpers::EndsWith(strFilename, m_extVector[i].first))
-        {
-            return m_extVector[i].second;
-        }
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ExtensionManager::RegisterConvertor(const char* name, IConvertor* conv, [[maybe_unused]] IResourceCompiler* rc)
-{
-    assert(conv);
-    assert(rc);
-
-    m_convertors.push_back(conv);
-
-    string strExt;
-    for (int i = 0;; ++i)
-    {
-        const char* const ext = conv->GetExt(i);
-        if (!ext || !ext[0])
-        {
-            break;
-        }
-        if (i)
-        {
-            strExt += ", ";
-        }
-        strExt += "\"";
-        strExt += ext;
-        strExt += "\"";
-
-        const string extToAdd = StringHelpers::MakeLowerCase(string(".") + ext);
-        m_extVector.push_back(ExtVector::value_type(extToAdd, conv));
-    }
-
-    if (strExt.empty())
-    {
-        RCLogError("    %s failed to provide list of extensions", name);
-    }
-    else
-    {
-        RCLog("    Registered %s (%s)", name, strExt.c_str());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ExtensionManager::UnregisterAll()
-{
-    for (size_t i = 0; i < m_convertors.size(); ++i)
-    {
-        IConvertor* conv = m_convertors[i];
-        conv->Release();
-    }
-    m_convertors.clear();
-
-    m_extVector.clear();
-}
diff --git a/Code/Tools/RC/ResourceCompiler/ExtensionManager.h b/Code/Tools/RC/ResourceCompiler/ExtensionManager.h
deleted file mode 100644
index d2a924b22d..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ExtensionManager.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXTENSIONMANAGER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXTENSIONMANAGER_H
-#pragma once
-
-// forward declarations.
-struct IConvertor;
-
-/** Manages mapping between file extensions and convertors.
-*/
-class ExtensionManager
-{
-public:
-    ExtensionManager();
-    ~ExtensionManager();
-
-    //! Register new convertor with extension manager.
-    //!  \param conv must not be 0
-    //!  \param rc must not be 0
-    void RegisterConvertor(const char* name, IConvertor* conv, IResourceCompiler* rc);
-    //! Unregister all convertors.
-    void UnregisterAll();
-
-    //! Find convertor that matches given platform and extension.
-    IConvertor* FindConvertor(const char* filename) const;
-
-private:
-    // Links extensions and convertors.
-    typedef std::vector<std::pair<string, IConvertor*> > ExtVector;
-    ExtVector m_extVector;
-
-    std::vector<IConvertor*> m_convertors;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_EXTENSIONMANAGER_H
diff --git a/Code/Tools/RC/ResourceCompiler/FunctionThread.h b/Code/Tools/RC/ResourceCompiler/FunctionThread.h
deleted file mode 100644
index 17acc0ccf8..0000000000
--- a/Code/Tools/RC/ResourceCompiler/FunctionThread.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-#ifndef FUNCTIONTHREAD_H
-#define FUNCTIONTHREAD_H
-
-#include <QThread>
-
-#if !defined(AZ_PLATFORM_WINDOWS)
-#define STILL_ACTIVE 259
-#endif
-
-class FunctionThread : public QThread
-{
-public:
-    FunctionThread(unsigned int (*function)(void* param), void* param)
-    : m_function(function),
-    m_param(param)
-    {
-    }
-
-    unsigned int returnCode() const
-    {
-        return m_returnCode;
-    }
-
-    static FunctionThread* CreateThread(int,int, unsigned int (*function)(void* param), void* param, int, int)
-    {
-        auto t = new FunctionThread(function, param);
-        t->start();
-        return t;
-    }
-
-protected:
-    void run() override
-    {
-        m_returnCode = m_function(m_param);
-    }
-
-private:
-    unsigned int m_returnCode = STILL_ACTIVE;
-    unsigned int (*m_function)(void* param);
-    void* m_param;
-};
-
-#endif
diff --git a/Code/Tools/RC/ResourceCompiler/ICfgFile.h b/Code/Tools/RC/ResourceCompiler/ICfgFile.h
deleted file mode 100644
index 5dfac233bc..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ICfgFile.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICFGFILE_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICFGFILE_H
-#pragma once
-
-enum EConfigPriority : uint32_t;
-class IConfigSink;
-
-/** Configuration file interface.
-        Use format similar to windows .ini files.
-*/
-class ICfgFile
-{
-public:
-    virtual ~ICfgFile() {}
-
-    //! Delete instance of configuration file class.
-    virtual void Release() = 0;
-
-    //! Load configuration file.
-    //! @return true=success, false otherwise
-    virtual bool Load(const string& fileName) = 0;
-
-    //! Save configuration file, with the stored name in m_fileName
-    //! @return true=success, false otherwise
-    virtual bool Save() = 0;
-
-    //! @param inszSection
-    //! @param inszKey
-    //! @param inszValue
-    virtual void UpdateOrCreateEntry(const char* inszSection, const char* inszKey, const char* inszValue) = 0;
-
-    //! @param inszSection
-    //! @param inszKey
-    virtual void RemoveEntry(const char* inszSection, const char* inszKey) = 0;
-
-    //! Copy section keys to config specified by the 'config' parameter.
-    // keySuffixes is a non-empty string containing one or more comma-separated suffixes:
-    //     copies keys named <name>:<suffix> and <name>, suffix is stripped out.
-    // keySuffixes is an empty string:
-    //     copies keys named <name>. keys in format <name>:<suffix> are ignored.
-    // keySuffixes is 0:
-    //     copies all keys "as is".
-    virtual void CopySectionKeysToConfig(EConfigPriority ePri, int sectionIndex, const char* keySuffixes, IConfigSink* config) const = 0;
-
-    // can be used to iterate through the section names
-    //! @return 0 if sectionIndex is < 0 or >= than number of sections.
-    virtual const char* GetSectionName(int sectionIndex) const = 0;
-    //! @return section index or -1 if section not found.
-    virtual int FindSection(const char* sectionName) const = 0;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICFGFILE_H
diff --git a/Code/Tools/RC/ResourceCompiler/IConfig.cpp b/Code/Tools/RC/ResourceCompiler/IConfig.cpp
deleted file mode 100644
index 6901444deb..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IConfig.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "IConfig.h"
-#include "IRCLog.h"
-
-
-bool IConfig::HasKey(const char* const key, const int ePriMask) const
-{
-    const char* pValue;
-    return GetKeyValue(key, pValue, ePriMask);
-}
-
-
-IConfig::EResult IConfig::Get(const char* const key, bool& value, const int ePriMask) const
-{
-    const char* pValue;
-    if (!GetKeyValue(key, pValue, ePriMask))
-    {
-        return eResult_KeyIsNotFound;
-    }
-
-    {
-        int tmpInt;
-        if (azsscanf(pValue, "%d", &tmpInt) == 1)
-        {
-            value = (tmpInt != 0);
-            return eResult_Success;
-        }
-    }
-
-    if (!azstricmp(pValue, "true") ||
-        !azstricmp(pValue, "yes") ||
-        !azstricmp(pValue, "enable") ||
-        !azstricmp(pValue, "y") ||
-        !azstricmp(pValue, "t"))
-    {
-        value = true;
-        return eResult_Success;
-    }
-
-    if (!azstricmp(pValue, "false") ||
-        !azstricmp(pValue, "no") ||
-        !azstricmp(pValue, "disable") ||
-        !azstricmp(pValue, "n") ||
-        !azstricmp(pValue, "f"))
-    {
-        value = false;
-        return eResult_Success;
-    }
-
-    return eResult_ValueIsEmptyOrBad;
-}
-
-IConfig::EResult IConfig::Get(const char* const key, int& value, const int ePriMask) const
-{
-    const char* pValue;
-    if (!GetKeyValue(key, pValue, ePriMask))
-    {
-        return eResult_KeyIsNotFound;
-    }
-
-    int tmpValue;
-    if (azsscanf(pValue, "%d", &tmpValue) == 1)
-    {
-        value = tmpValue;
-        return eResult_Success;
-    }
-
-    return eResult_ValueIsEmptyOrBad;
-}
-
-IConfig::EResult IConfig::Get(const char* const key, float& value, const int ePriMask) const
-{
-    const char* pValue;
-    if (!GetKeyValue(key, pValue, ePriMask))
-    {
-        return eResult_KeyIsNotFound;
-    }
-
-    float tmpValue;
-    if (azsscanf(pValue, "%f", &tmpValue) == 1)
-    {
-        value = tmpValue;
-        return eResult_Success;
-    }
-
-    return eResult_ValueIsEmptyOrBad;
-}
-
-IConfig::EResult IConfig::Get(const char* const key, string& value, const int ePriMask) const
-{
-    const char* pValue;
-    if (!GetKeyValue(key, pValue, ePriMask))
-    {
-        return eResult_KeyIsNotFound;
-    }
-
-    if (pValue && pValue[0])
-    {
-        value = pValue;
-        return eResult_Success;
-    }
-
-    return eResult_ValueIsEmptyOrBad;
-}
-
-
-bool IConfig::GetAsBool(const char* const key, const bool keyIsNotFoundValue, const bool emptyOrBadValue, const int ePriMask) const
-{
-    bool value;
-    switch (Get(key, value, ePriMask))
-    {
-    case eResult_Success:
-        return value;
-    case eResult_KeyIsNotFound:
-        return keyIsNotFoundValue;
-    default:
-        return emptyOrBadValue;
-    }
-}
-
-int IConfig::GetAsInt(const char* const key, const int keyIsNotFoundValue, const int emptyOrBadValue, const int ePriMask) const
-{
-    int value;
-    switch (Get(key, value, ePriMask))
-    {
-    case eResult_Success:
-        return value;
-    case eResult_KeyIsNotFound:
-        return keyIsNotFoundValue;
-    default:
-        return emptyOrBadValue;
-    }
-}
-
-float IConfig::GetAsFloat(const char* const key, const float keyIsNotFoundValue, const float emptyOrBadValue, const int ePriMask) const
-{
-    float value;
-    switch (Get(key, value, ePriMask))
-    {
-    case eResult_Success:
-        return value;
-    case eResult_KeyIsNotFound:
-        return keyIsNotFoundValue;
-    default:
-        return emptyOrBadValue;
-    }
-}
-
-string IConfig::GetAsString(const char* const key, const char* const keyIsNotFoundValue, const char* const emptyOrBadValue, const int ePriMask) const
-{
-    string value;
-    switch (Get(key, value, ePriMask))
-    {
-    case eResult_Success:
-        return value;
-    case eResult_KeyIsNotFound:
-        return string(keyIsNotFoundValue);
-    default:
-        return string(emptyOrBadValue);
-    }
-}
-
-
-static inline void SkipWhitespace(const char*& p)
-{
-    while (*p && *p <= ' ')
-    {
-        ++p;
-    }
-}
-
-void IConfig::SetFromString(const EConfigPriority ePri, const char* p)
-{
-    assert(Util::isPowerOfTwo(ePri));
-
-    if (p == 0)
-    {
-        return;
-    }
-
-    while (*p)
-    {
-        string sKey;
-        string sValue;
-
-        SkipWhitespace(p);
-
-        if (*p != '/')
-        {
-            RCLog("Config string format is invalid ('/' expected): '%s'", p);
-            break;
-        }
-        ++p;   // jump over '/'
-
-        while (IsValidNameChar(*p))
-        {
-            sKey += *p++;
-        }
-
-        SkipWhitespace(p);
-
-        if (*p != '=')
-        {
-            RCLog("Config string format is invalid ('=' expected): '%s'", p);
-            break;
-        }
-        ++p;   // jump over '='
-
-        SkipWhitespace(p);
-
-        if (*p == '\"')   // in quotes
-        {
-            ++p;
-            while (*p && *p != '\"')   // value
-            {
-                sValue += *p++;
-            }
-            if (*p == '\"')
-            {
-                ++p;
-            }
-        }
-        else   // without quotes
-        {
-            while (IsValidNameChar(*p))   // value
-            {
-                sValue += *p++;
-            }
-        }
-
-        SkipWhitespace(p);
-
-        sKey.Trim();
-        sValue.Trim();
-
-        SetKeyValue(ePri, sKey, sValue);
-    }
-}
-
diff --git a/Code/Tools/RC/ResourceCompiler/IConfig.h b/Code/Tools/RC/ResourceCompiler/IConfig.h
deleted file mode 100644
index a2e8a0dd4b..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IConfig.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICONFIG_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICONFIG_H
-#pragma once
-
-#include "Util.h"     // BIT()
-#include <vector>
-#include <platform.h>
-
-class Config;
-class CPropertyVars;
-
-enum EConfigPriority : uint32_t
-{
-    // low priorities first
-
-    eCP_PriorityLowest   = BIT(0),     // used internally
-
-    eCP_PriorityFile     = BIT(1),     // per-file settings
-    eCP_PriorityPreset   = BIT(2),     // settings from section [<preset_name>] of rc.ini
-    eCP_PriorityRcIni    = BIT(3),     // settings from rc.ini (common + per-platform)
-    eCP_PriorityCmdline  = BIT(4),     // rc.exe's command line
-    eCP_PriorityProperty = BIT(5),     // settings from RCJob XML properties
-    eCP_PriorityJob      = BIT(6),     // per-job configuration
-
-    eCP_PriorityHighest  = BIT(7),     // used internally
-
-    eCP_PriorityAll = eCP_PriorityHighest + (eCP_PriorityHighest - 1)   // binary OR of all possible priority values
-};
-
-
-class IConfigSink
-{
-public:
-    virtual ~IConfigSink()
-    {
-    }
-
-    // Arguments:
-    //   value - can be 0 to delete a key, can be "" to set a key without value (e.g. /refresh)
-    virtual void SetKeyValue(EConfigPriority ePri, const char* key, const char* value) = 0;
-};
-
-
-/** Configuration options interface.
-*/
-class IConfig
-    : public IConfigSink
-{
-public:
-    // Delete instance of configuration class.
-    virtual void Release() = 0;
-
-    virtual const Config* GetInternalRepresentation() const = 0;
-
-    virtual bool HasKeyRegistered(const char* key) const = 0;
-
-    // Returns true if the config contains a key that matches 'wildcards' name.
-    virtual bool HasKeyMatchingWildcards(const char* wildcards) const = 0;
-
-    // Get pointer to ASCIIZ value of a key. The pointer is not modified if the key is not found.
-    // Returns:
-    //   true if key found, false if not.
-    virtual bool GetKeyValue(const char* key, const char*& value, int ePriMask = eCP_PriorityAll) const = 0;
-
-    // Get sum of all values of a key.
-    // Returns:
-    //   0 if key is not found or has no value
-    virtual int GetSum(const char* key) const = 0;
-
-    // Find unknown keys in configuration.
-    virtual void GetUnknownKeys(std::vector<string>& unknownKeys) const = 0;
-
-    // Merge configuration.
-    virtual void AddConfig(const IConfig* pCfg) = 0;
-
-    virtual void Clear() = 0;
-    virtual uint32 ClearPriorityUsage(int ePriMask) = 0;
-    virtual uint32 CountPriorityUsage(int ePriMask) const = 0;
-
-    virtual void CopyToConfig(EConfigPriority ePri, IConfigSink* pDestConfig) const = 0;
-
-    virtual void CopyToPropertyVars(CPropertyVars& properties) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-
-    // Check if configuration has a key
-    bool HasKey(const char* key, int ePriMask = eCP_PriorityAll) const;
-
-    // Get value of a key
-    bool GetAsBool(const char* const key, const bool keyIsNotFoundValue, const bool emptyOrBadValue, int ePriMask = eCP_PriorityAll) const;
-    int GetAsInt(const char* const key, const int keyIsNotFoundValue, const int emptyOrBadValue, int ePriMask = eCP_PriorityAll) const;
-    float GetAsFloat(const char* const key, const float keyIsNotFoundValue, const float emptyOrBadValue, int ePriMask = eCP_PriorityAll) const;
-    string GetAsString(const char* const key, const char* const keyIsNotFoundValue, const char* const emptyOrBadValue, int ePriMask = eCP_PriorityAll) const;
-
-    // str - e.g. "/reduce=2 /space=tangent"
-    void SetFromString(EConfigPriority ePri, const char* str);
-
-    static bool IsValidNameChar(const unsigned char c)
-    {
-        return (c > ' ') && (c != '=') && (c != ';') && (c != ':') && (c != '/');
-    }
-
-private:
-    // Get value of a key. The value (passed by reference) is not modified if
-    // the key is not found or the value attached to the key is empty or bad.
-    enum EResult
-    {
-        eResult_Success,
-        eResult_KeyIsNotFound,
-        eResult_ValueIsEmptyOrBad,
-    };
-    EResult Get(const char* key, bool& value, int ePriMask) const;
-    EResult Get(const char* key, int& value, int ePriMask) const;
-    EResult Get(const char* key, float& value, int ePriMask) const;
-    EResult Get(const char* key, string& value, int ePriMask) const;
-};
-
-
-class IConfigKeyRegistry
-{
-public:
-    virtual ~IConfigKeyRegistry()
-    {
-    }
-
-    virtual void VerifyKeyRegistration(const char* szKey) const = 0;
-    virtual bool HasKeyRegistered(const char* szKey) const = 0;
-};
-
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICONFIG_H
diff --git a/Code/Tools/RC/ResourceCompiler/IConvertor.h b/Code/Tools/RC/ResourceCompiler/IConvertor.h
deleted file mode 100644
index b2f28117b5..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IConvertor.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICONVERTOR_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICONVERTOR_H
-#pragma once
-
-
-#include "ConvertContext.h"
-
-
-// A Convertor does no actual work, it merely describes the work that a Compiler will do,
-// and can create Compiler instances to do the actual processing.
-
-// Compiler interface, all compilers must implement this interface.
-struct ICompiler
-{
-    virtual ~ICompiler() = default;
-
-    // Release memory of interface.
-    virtual void Release() = 0;
-
-    // This function is called by RC before starting processing files.
-    virtual void BeginProcessing(const IConfig* config) = 0;
-
-    // This function is called by RC after finishing processing files.
-    virtual void EndProcessing() = 0;
-
-    // Return a convert context object.
-    // RC will fill with compilation parameters right before calling Process().
-    virtual IConvertContext* GetConvertContext() = 0;
-
-    // Process a file.
-    //
-    // The file and processing parameters are provided by RC
-    // by calling appropriate functions of a convert context
-    // object returned by GetConvertContext().
-    //
-    // Returns true if succeeded.
-    virtual bool Process() = 0;
-
-    virtual bool CreateJobs() { return false; };
-};
-
-class RcFile;
-struct ConvertorInitContext
-{
-    const IConfig* config;
-    size_t inputFileCount;
-    const RcFile* inputFiles;
-    const char* appRootPath = nullptr;
-};
-
-// Convertor interface, all converters must implement this interface.
-struct IConvertor
-{
-    virtual ~IConvertor() = default;
-
-    // Release memory of interface.
-    virtual void Release() = 0;
-
-    //Init is called before any compilers are created.
-    virtual void Init([[maybe_unused]] const ConvertorInitContext& context) {}
-    virtual void DeInit() {}
-
-    // Return an object that will do actual processing.
-    // Called only once since we do not support multi-threading in RC
-    virtual ICompiler* CreateCompiler() = 0;
-
-    // Get supported extension by zero-based index.
-    // If index is < 0  or >= number of supported extensions,
-    // then the function *must* return 0.
-    virtual const char* GetExt(int index) const = 0;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ICONVERTOR_H
diff --git a/Code/Tools/RC/ResourceCompiler/IMultiplatformConfig.h b/Code/Tools/RC/ResourceCompiler/IMultiplatformConfig.h
deleted file mode 100644
index 31a2584c51..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IMultiplatformConfig.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IMULTIPLATFORMCONFIG_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IMULTIPLATFORMCONFIG_H
-#pragma once
-
-#include "IConfig.h"          // IConfig, IConfigKeyRegistry, enum EConfigPriority
-
-class IMultiplatformConfig
-{
-public:
-    virtual ~IMultiplatformConfig()
-    {
-    }
-
-    virtual void init(int platformCount, int activePlatform, IConfigKeyRegistry* pConfigKeyRegistry) = 0;
-
-    virtual int getPlatformCount() const = 0;
-    virtual int getActivePlatform() const = 0;
-
-    virtual const IConfig& getConfig(int platform) const = 0;
-    virtual IConfig& getConfig(int platform) = 0;
-    virtual const IConfig& getConfig() const = 0;
-    virtual IConfig& getConfig() = 0;
-
-    virtual void setKeyValue(EConfigPriority ePri, const char* key, const char* value) = 0;
-    virtual void setActivePlatform(int platformIndex) = 0;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IMULTIPLATFORMCONFIG_H
diff --git a/Code/Tools/RC/ResourceCompiler/IProgress.h b/Code/Tools/RC/ResourceCompiler/IProgress.h
deleted file mode 100644
index c189989f73..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IProgress.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IPROGRESS_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IPROGRESS_H
-#pragma once
-
-
-class IProgress
-{
-public:
-    virtual ~IProgress() {}
-
-    virtual void StartProgress() = 0;
-    virtual void ShowProgress(const char* pMessage, size_t progressValue, size_t maxProgressValue) = 0;
-    virtual void FinishProgress() = 0;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IPROGRESS_H
diff --git a/Code/Tools/RC/ResourceCompiler/IRCLog.h b/Code/Tools/RC/ResourceCompiler/IRCLog.h
deleted file mode 100644
index 9ea95956cb..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IRCLog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IRCLOG_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IRCLOG_H
-#pragma once
-
-
-#include <stdarg.h>
-
-
-// This interface is used by RC and convertors to log events
-struct IRCLog
-{
-    enum EType
-    {
-        eType_Info,
-        eType_Warning,
-        eType_Error,
-        eType_Context,
-        eType_Summary
-    };
-
-    virtual ~IRCLog()
-    {
-    }
-
-    virtual void LogV(const EType eType, const char* szFormat, va_list args) = 0;
-    virtual void Log(const EType eType, const char* szMessage) = 0;
-};
-
-
-void SetRCLog(IRCLog* pRCLog);
-void RCLog(const char* szFormat, ...);
-void RCLogWarning(const char* szFormat, ...);
-void RCLogError(const char* szFormat, ...);
-void RCLogContext(const char* szMessage);
-void RCLogSummary(const char* szFormat, ...);
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IRCLOG_H
diff --git a/Code/Tools/RC/ResourceCompiler/IResCompiler.h b/Code/Tools/RC/ResourceCompiler/IResCompiler.h
deleted file mode 100644
index 0c53afad7c..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IResCompiler.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : IResourceCompiler interface.
-
-#pragma once
-
-#include <platform.h>
-#include <AzCore/std/string/string.h>
-
-struct ConvertContext;
-struct CryChunkedFile;
-class ICfgFile;
-struct IAssetWriter;
-struct ICompiler;
-class IConfig;
-struct IConvertor;
-struct IPakSystem;
-struct IRCLog;
-class MultiplatformConfig;
-struct SFileVersion;
-class XmlNodeRef;
-
-namespace AZ
-{
-    namespace Internal
-    {
-        class EnvironmentInterface;
-    } // Internal
-} // AZ
-
-struct PlatformInfo
-{
-    enum
-    {
-        kMaxNameLength = 15
-    };
-    enum
-    {
-        kMaxPlatformNames = 3
-    };
-    int index;  // unique, starts from 0, increased by one for next platform, persistent for a session
-    bool bBigEndian;
-    int pointerSize;
-    char platformNames[kMaxPlatformNames][kMaxNameLength + 1];  // every name is guaranteed to be zero-terminated, [0] is guaranteed to be non-empty
-
-    void Clear()
-    {
-        index = -1;
-        pointerSize = 0;
-        for (int i = 0; i < kMaxPlatformNames; ++i)
-        {
-            platformNames[i][0] = 0;
-        }
-    }
-
-    bool HasName(const char* const pName) const
-    {
-        for (int i = 0; i < kMaxPlatformNames && platformNames[i][0] != 0; ++i)
-        {
-            if (azstricmp(pName, &platformNames[i][0]) == 0)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool SetName(int idx, const char* const pName)
-    {
-        if (idx < 0 || idx >= kMaxPlatformNames ||
-            !pName || !pName[0])
-        {
-            return false;
-        }
-        const size_t len = strlen(pName);
-        if (len + 1 > sizeof(platformNames[0]))
-        {
-            return false;
-        }
-        memcpy(platformNames[idx], pName, len + 1);
-        return true;
-    }
-
-    const char* GetMainName() const
-    {
-        return &platformNames[0][0];
-    }
-
-    const AZStd::string GetCommaSeparatedNames() const
-    {
-        AZStd::string names;
-        for (int i = 0; i < PlatformInfo::kMaxPlatformNames && platformNames[i][0] != 0; ++i)
-        {
-            if (!names.empty())
-            {
-                names += ",";
-            }
-            names += &platformNames[i][0];
-        }
-        return names;
-    }
-};
-
-
-/** Main interface of resource compiler.
-*/
-struct IResourceCompiler
-{
-    class IExitObserver
-    {
-    public:
-        virtual ~IExitObserver()
-        {
-        }
-
-        virtual void OnExit() = 0;
-    };
-
-    //! Register new convertor.
-    virtual void RegisterConvertor(const char* name, IConvertor* conv) = 0;
-
-    // Get the interface for opening files - handles files stored in ZIP archives.
-    virtual IPakSystem* GetPakSystem() = 0;
-
-    virtual const ICfgFile* GetIniFile() const = 0;
-
-    virtual int GetPlatformCount() const = 0;
-    virtual const PlatformInfo* GetPlatformInfo(int index) const = 0;
-    // Returns index of the platform (or -1 if platform not found)
-    virtual int FindPlatform(const char* name) const = 0;
-
-    // One input file can generate multiple output files.
-    virtual void AddInputOutputFilePair(const char* inputFilename, const char* outputFilename) = 0;
-
-    // Mark file for removal in clean stage.
-    virtual void MarkOutputFileForRemoval(const char* sOutputFilename) = 0;
-
-    // Add pointer to an observer object which will be notified in case of 'unexpected' exit()
-    virtual void AddExitObserver(IExitObserver* p) = 0;
-
-    // Remove an observer object which was added previously by AddExitObserver() call
-    virtual void RemoveExitObserver(IExitObserver* p) = 0;
-
-    virtual IRCLog* GetIRCLog() = 0;
-    virtual int GetVerbosityLevel() const = 0;
-
-    virtual const SFileVersion& GetFileVersion() const = 0;
-
-    virtual const void GetGenericInfo(char* buffer, size_t bufferSize, const char* rowSeparator) const = 0;
-
-    // Arguments:
-    //   key - must not be 0
-    //   helptxt - must not be 0
-    virtual void RegisterKey(const char* key, const char* helptxt) = 0;
-
-    // returns the path of the resource compiler executable's directory (ending with backslash)
-    virtual const char* GetExePath() const = 0;
-
-    // returns the path of a directory for temporary files (ending with backslash)
-    virtual const char* GetTmpPath() const = 0;
-
-    // returns directory which was current at the moment of RC call (ending with backslash)
-    virtual const char* GetInitialCurrentDir() const = 0;
-
-    // returns an xmlnode for the given xml file or null node if the file could not be parsed
-    virtual XmlNodeRef LoadXml(const char* filename) = 0;
-
-    // returns an xmlnode with the given tag name
-    virtual XmlNodeRef CreateXml(const char* tag) = 0;
-
-    virtual bool CompileSingleFileBySingleProcess(const char* filename) = 0;
-
-    // Register Asset Writer interface
-    virtual void SetAssetWriter(IAssetWriter* pAssetWriter) = 0;
-
-    // Get Asset Writer interface
-    virtual IAssetWriter* GetAssetWriter() const = 0;
-
-    // Get the app root that the resource 
-    virtual const char* GetAppRoot() const = 0;
-
-};
-
-
-extern "C"
-{
-// this is the plugin function that's exported by plugins
-// Registers all convertors residing in this DLL.
-// Must be called RegusterConvertors
-typedef void(__stdcall * FnRegisterConvertors)(IResourceCompiler* pRC);
-
-// this is the optional initialization function that may be exported by plugins
-// It accepts the AZ shared system environment and should attach to it
-typedef void (__stdcall * FnInitializeModule)(AZ::Internal::EnvironmentInterface* sharedEnvironment);
-
-// (optional) called before the DLL is unloaded to perform cleanup if you need to.
-// must be called BeforeUnloadDLL
-typedef void(__stdcall * FnBeforeUnloadDLL)();
-}
diff --git a/Code/Tools/RC/ResourceCompiler/IUnitTestHelper.h b/Code/Tools/RC/ResourceCompiler/IUnitTestHelper.h
deleted file mode 100644
index 1198ad38de..0000000000
--- a/Code/Tools/RC/ResourceCompiler/IUnitTestHelper.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IUNITTESTHELPER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IUNITTESTHELPER_H
-#pragma once
-
-// IT IS RECOMMENDED TO USE THESE MACROS FOR UNIT TESTS INSTEAD OF THE METHODS LISTED BELOW
-#define TEST_BOOL(statement) TestBool(statement, #statement)
-
-class IUnitTestHelper
-{
-public:
-    virtual ~IUnitTestHelper() {};
-
-    // This tests a boolean value that should be true, the test will fail if it is false
-    // It is recommended that you use the TEST_BOOL macro to auto-stringify the statement for easier identification when unit tests fail
-    // Alternatively, specify your own testValueStatement to also help identify which unit test fails
-    virtual bool TestBool(bool testValueIsTrue, const char* testValueStatement) = 0;
-};
-
-
-#endif // #ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_IUNITTESTHELPER_H
diff --git a/Code/Tools/RC/ResourceCompiler/ListFile.cpp b/Code/Tools/RC/ResourceCompiler/ListFile.cpp
deleted file mode 100644
index fbd085fd6c..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ListFile.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include "ListFile.h"
-#include "StringHelpers.h"
-#include "TempFilePakExtraction.h"
-#include "PathHelpers.h"
-#include "IPakSystem.h"
-#include "IResCompiler.h"
-#include "IRCLog.h"
-
-//////////////////////////////////////////////////////////////////////////
-CListFile::CListFile(IResourceCompiler* pRC)
-    : m_pRC(pRC)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CListFile::Process(
-    const string& listFile,
-    const string& formatList,
-    const string& wildcardList,
-    const string& defaultFolder,
-    std::vector< std::pair<string, string> >& outFiles)
-{
-    std::vector<string> wildcards;
-    StringHelpers::Split(wildcardList, ";", false, wildcards);
-    for (size_t i = 0; i < wildcards.size(); ++i)
-    {
-        wildcards[i] = PathHelpers::ToPlatformPath(wildcards[i]);
-    }
-
-    std::vector<string> formats;
-    StringHelpers::Split(formatList, ";", false, formats);
-    for (size_t i = 0; i < formats.size(); ++i)
-    {
-        formats[i] = PathHelpers::ToPlatformPath(formats[i]);
-    }
-    if (formats.empty())
-    {
-        formats.push_back("{0}");
-    }
-
-    if (!listFile.empty() && listFile[0] == '@')
-    {
-        int splitter = listFile.find_first_of("|;,");
-        if (splitter < 0)
-        {
-            return false;
-        }
-
-        string zipFilename = listFile.substr(1, splitter - 1);
-        string listFilename = listFile.substr(splitter + 1);
-        zipFilename.Trim();
-        listFilename.Trim();
-
-        ParseListFileInZip(zipFilename, listFilename, formats, wildcards, defaultFolder, outFiles);
-        return true;
-    }
-
-    // Parse List File.
-    std::vector<string> lines;
-    if (!ReadLines(listFile, lines))
-    {
-        return false;
-    }
-
-    for (size_t i = 0; i < lines.size(); ++i)
-    {
-        string line = lines[i];
-
-        // Line can either contain filename, folder & filename
-        // or a zip file + list file (ex: @Levels\AlienVessel\Level.pak|resourcelist.txt)
-        if (line[0] == '@')
-        {
-            // the line starts with '@' character, this means a zip file
-
-            line = line.substr(1); // erase @ character
-
-            const size_t splitter = line.find_first_of("|;,");
-            if (splitter == line.npos)
-            {
-                continue;
-            }
-
-            string zipFilename = line.substr(0, splitter);
-            string listFilename = line.substr(splitter + 1);
-            zipFilename.Trim();
-            listFilename.Trim();
-
-            ParseListFileInZip(zipFilename, listFilename, formats, wildcards, defaultFolder, outFiles);
-        }
-        else
-        {
-            if (!ProcessLine(line, formats, wildcards, defaultFolder, outFiles))
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CListFile::ParseListFileInZip(
-    const string& zipFilename,
-    const string& listFilename,
-    const std::vector<string>& formats,
-    const std::vector<string>& wildcards,
-    const string& defaultFolder,
-    std::vector< std::pair<string, string> >& outFiles)
-{
-    // Open zip file
-    IPakSystem* const pPakSystem = m_pRC->GetPakSystem();
-    const char* const pTempPath = m_pRC->GetTmpPath();
-
-    const string sFileInPak = string("@") + zipFilename + "|" + listFilename;
-    TempFilePakExtraction fileProxy(sFileInPak.c_str(), pTempPath, pPakSystem);
-
-    // Parse List File.
-    std::vector<string> lines;
-    if (!ReadLines(fileProxy.GetTempName(), lines))
-    {
-        RCLogWarning("List file %s not found in zip file %s", listFilename.c_str(), zipFilename.c_str());
-        return;
-    }
-
-    for (size_t i = 0; i < lines.size(); ++i)
-    {
-        if (!ProcessLine(lines[i], formats, wildcards, defaultFolder, outFiles))
-        {
-            return;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CListFile::ProcessLine(
-    const string& line,
-    const std::vector<string>& formats,
-    const std::vector<string>& wildcards,
-    const string& defaultFolder,
-    std::vector< std::pair<string, string> >& outFiles)
-{
-    string folderName;
-    string fileName;
-
-    {
-        // Line can either contain filename (in quotes or without them) or folder & filename (both in quotes).
-
-        const char* p0 = strchr(line.c_str(), '\"');
-        const char* p1 = (p0 ? strchr(p0 + 1, '\"') : 0);
-        const char* p2 = (p1 ? strchr(p1 + 1, '\"') : 0);
-        const char* p3 = (p2 ? strchr(p2 + 1, '\"') : 0);
-        if (p0 == 0)
-        {
-            // single filename without quotes
-            folderName = defaultFolder;
-            fileName = line;
-        }
-        else if (p1 && (p2 == 0))
-        {
-            // single filename in quotes
-            folderName = defaultFolder;
-            fileName = string(p0 + 1, p1);
-        }
-        else if (p3)
-        {
-            // folder & filename in quotes
-            folderName = string(p0 + 1, p1);
-            fileName = string(p2 + 1, p3);
-        }
-        else
-        {
-            RCLogError("Bad syntax of a row in list file");
-            return false;
-        }
-    }
-
-    if (fileName.empty())
-    {
-        RCLogError("Filename is empty in a row of list file");
-        return false;
-    }
-
-    fileName = PathHelpers::ToPlatformPath(fileName);
-    folderName = PathHelpers::ToPlatformPath(folderName);
-
-    std::vector<string> tokens;
-
-    {
-        bool bMatchFound = false;
-
-        for (size_t i = 0; i < wildcards.size(); ++i)
-        {
-            if (StringHelpers::MatchesWildcardsIgnoreCase(fileName, wildcards[i]))
-            {
-                if (!StringHelpers::MatchesWildcardsIgnoreCaseExt(fileName, wildcards[i], tokens))
-                {
-                    RCLogError("Unexpected failure in %s", __FUNCTION__);
-                    return false;
-                }
-                bMatchFound = true;
-                break;
-            }
-        }
-
-        if (!bMatchFound)
-        {
-            return true;
-        }
-    }
-
-    for (size_t formatIndex = 0; formatIndex < formats.size(); ++formatIndex)
-    {
-        string str = formats[formatIndex];
-
-        size_t scanFromPos = 0;
-        for (;; )
-        {
-            const size_t startPos = str.find('{', scanFromPos);
-            if (startPos == str.npos)
-            {
-                break;
-            }
-
-            const size_t endPos = str.find('}', startPos + 1);
-            if (endPos == str.npos)
-            {
-                break;
-            }
-
-            const string indexStr = str.substr(startPos + 1, endPos - startPos - 1);
-
-            bool bBadSyntax = indexStr.empty();
-            for (size_t i = 0; i < indexStr.length(); ++i)
-            {
-                if (!isdigit(indexStr[i]))
-                {
-                    bBadSyntax = true;
-                }
-            }
-            if (bBadSyntax)
-            {
-                RCLogError("Syntax error in element {%s} in input string %s", indexStr.c_str(), formats[formatIndex].c_str());
-                return false;
-            }
-
-            const int index = atoi(indexStr.c_str());
-            if ((index < 0) || (index > tokens.size()))
-            {
-                RCLogError("Bad index specified in {%s} in input string %s", indexStr.c_str(), formats[formatIndex].c_str());
-                return false;
-            }
-
-            const string& replaceWith = (index == 0) ? fileName : tokens[index - 1];
-            str = str.replace(startPos, endPos - startPos + 1, replaceWith);
-            scanFromPos = startPos + replaceWith.size();
-        }
-
-        outFiles.push_back(std::pair<string, string>(folderName, str));
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CListFile::ReadLines(
-    const string& listFile,
-    std::vector<string>& lines)
-{
-    FILE* f = nullptr; 
-    azfopen(&f, listFile, "rt");
-    if (!f)
-    {
-        return false;
-    }
-
-    char line[2048];
-    while (fgets(line, sizeof(line), f) != NULL)
-    {
-        if (line[0])
-        {
-            string strLine = line;
-            strLine.Trim();
-            if (!strLine.empty())
-            {
-                lines.push_back(strLine);
-            }
-        }
-    }
-
-    fclose(f);
-
-    return true;
-}
diff --git a/Code/Tools/RC/ResourceCompiler/ListFile.h b/Code/Tools/RC/ResourceCompiler/ListFile.h
deleted file mode 100644
index 2965d73f44..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ListFile.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_LISTFILE_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_LISTFILE_H
-#pragma once
-
-class CListFile
-{
-public:
-    CListFile(IResourceCompiler* pRC);
-
-    bool Process(
-        const string& listFile,
-        const string& formatList,
-        const string& wildcardList,
-        const string& defaultFolder,
-        std::vector< std::pair<string, string> >& outFiles);
-
-private:
-    void ParseListFileInZip(
-        const string& zipFilename,
-        const string& listFilename,
-        const std::vector<string>& formats,
-        const std::vector<string>& wildcards,
-        const string& defaultFolder,
-        std::vector< std::pair<string, string> >& outFiles);
-
-    bool ProcessLine(
-        const string& line,
-        const std::vector<string>& formats,
-        const std::vector<string>& wildcards,
-        const string& defaultFolder,
-        std::vector< std::pair<string, string> >& outFiles);
-
-    bool ReadLines(
-        const string& listFile,
-        std::vector<string>& lines);
-
-private:
-    IResourceCompiler* m_pRC;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_LISTFILE_H
diff --git a/Code/Tools/RC/ResourceCompiler/MemInterface.cpp b/Code/Tools/RC/ResourceCompiler/MemInterface.cpp
deleted file mode 100644
index b832ce6306..0000000000
--- a/Code/Tools/RC/ResourceCompiler/MemInterface.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-// Description : Memory management functions used by CryMemoryManager
-//               it looks for them first in the executable, then in CrySystem.dll
-
-// TEMPORARY FIX - define this macro to allow app to be built without using VS2005 SP1 CRT libraries - we
-// want to continue using the pre-SP1 libraries (at least for now), since non-programmers don't have the new
-// libraries as yet.
-
-#include <stdlib.h>
-#include <AzCore/PlatformDef.h>
-
-
-extern "C" {
-AZ_DLL_EXPORT void* CryMalloc(size_t size) {
-    return malloc(size);
-}
-AZ_DLL_EXPORT void* CryRealloc(void* memblock, size_t size) {
-    return realloc(memblock, size);
-}
-AZ_DLL_EXPORT void* CryReallocSize(void* memblock, size_t oldsize, size_t size) {
-    return realloc(memblock, size);
-}
-AZ_DLL_EXPORT void CryFree(void* p) { free(p); }
-AZ_DLL_EXPORT void CryFreeSize(void* p, size_t size) { free(p); }
-}
diff --git a/Code/Tools/RC/ResourceCompiler/MultiplatformConfig.h b/Code/Tools/RC/ResourceCompiler/MultiplatformConfig.h
deleted file mode 100644
index a9341d383b..0000000000
--- a/Code/Tools/RC/ResourceCompiler/MultiplatformConfig.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_MULTIPLATFORMCONFIG_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_MULTIPLATFORMCONFIG_H
-#pragma once
-
-#include "Config.h"
-#include "IMultiplatformConfig.h"
-
-
-class MultiplatformConfig
-    : public IMultiplatformConfig
-{
-public:
-    MultiplatformConfig()
-        : m_platformCount(0)
-    {
-    }
-
-    virtual void init(int platformCount, int activePlatform, IConfigKeyRegistry* pConfigKeyRegistry)
-    {
-        if (platformCount < 0 ||
-            platformCount > kMaxPlatformCount ||
-            unsigned(activePlatform) >= platformCount ||
-            pConfigKeyRegistry == 0)
-        {
-            assert(0);
-            m_platformCount = 0;
-            return;
-        }
-
-        m_platformCount = platformCount;
-        m_activePlatform = activePlatform;
-
-        for (int i = 0; i < platformCount; ++i)
-        {
-            m_config[i].SetConfigKeyRegistry(pConfigKeyRegistry);
-        }
-    }
-
-    virtual int getPlatformCount() const
-    {
-        return m_platformCount;
-    }
-
-    virtual int getActivePlatform() const
-    {
-        return m_activePlatform;
-    }
-
-    virtual const IConfig& getConfig(int platform) const
-    {
-        assert(unsigned(platform) < unsigned(m_platformCount));
-        return m_config[platform];
-    }
-
-    virtual IConfig& getConfig(int platform)
-    {
-        assert(unsigned(platform) < unsigned(m_platformCount));
-        return m_config[platform];
-    }
-
-    virtual const IConfig& getConfig() const
-    {
-        return getConfig(m_activePlatform);
-    }
-
-    virtual IConfig& getConfig()
-    {
-        return getConfig(m_activePlatform);
-    }
-
-    virtual void setKeyValue(EConfigPriority ePri, const char* key, const char* value)
-    {
-        for (int i = 0; i < m_platformCount; ++i)
-        {
-            m_config[i].SetKeyValue(ePri, key, value);
-        }
-    }
-
-    virtual void setActivePlatform(int platformIndex)
-    {
-        m_activePlatform = platformIndex;
-    }
-private:
-    enum
-    {
-        kMaxPlatformCount = 20
-    };
-    int m_platformCount;
-    int m_activePlatform;
-    Config m_config[kMaxPlatformCount];
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_MULTIPLATFORMCONFIG_H
diff --git a/Code/Tools/RC/ResourceCompiler/NameConvertor.h b/Code/Tools/RC/ResourceCompiler/NameConvertor.h
deleted file mode 100644
index 42b29ba19a..0000000000
--- a/Code/Tools/RC/ResourceCompiler/NameConvertor.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_NAMECONVERTOR_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_NAMECONVERTOR_H
-#pragma once
-
-#include "StringHelpers.h"
-#include "IRCLog.h"  // RCLog
-
-class NameConvertor
-{
-private:
-    struct Rule
-    {
-        string mask;
-        string format;
-    };
-    std::vector<Rule> m_rules;
-
-public:
-    bool HasRules() const
-    {
-        return !m_rules.empty();
-    }
-
-    bool SetRules(const string& rules)
-    {
-        m_rules.clear();
-
-        std::vector<string> tmpPairs;
-        std::vector<string> tmpPair;
-
-        StringHelpers::Split(rules, ";", false, tmpPairs);
-
-        for (size_t i = 0; i < tmpPairs.size(); ++i)
-        {
-            tmpPair.clear();
-            StringHelpers::Split(tmpPairs[i], ",", false, tmpPair);
-
-            if (tmpPair.size() != 2 || tmpPair[0].empty() || tmpPair[1].empty())
-            {
-                RCLogError("%s: Syntax error in converting rule: '%s'", __FUNCTION__, tmpPairs[i].c_str());
-                m_rules.clear();
-                return false;
-            }
-
-            Rule r;
-            r.mask = tmpPair[0];
-            r.format = tmpPair[1];
-            m_rules.push_back(r);
-        }
-
-        return true;
-    }
-
-    string GetConvertedName(const string& name) const
-    {
-        if (name.empty())
-        {
-            RCLogError("Empty name sent to %s", __FUNCTION__);
-            return string();
-        }
-
-        if (m_rules.empty())
-        {
-            return name;
-        }
-
-        const Rule* pRule = 0;
-        std::vector<string> tokens;
-
-        for (size_t i = 0; i < m_rules.size(); ++i)
-        {
-            if (StringHelpers::MatchesWildcardsIgnoreCase(name, m_rules[i].mask))
-            {
-                if (!StringHelpers::MatchesWildcardsIgnoreCaseExt(name, m_rules[i].mask, tokens))
-                {
-                    RCLogError("Unexpected failure in %s", __FUNCTION__);
-                    return string();
-                }
-                pRule = &m_rules[i];
-                break;
-            }
-        }
-
-        if (!pRule)
-        {
-            return name;
-        }
-
-        string newName = pRule->format;
-
-        size_t scanFromPos = 0;
-        for (;; )
-        {
-            const size_t startPos = newName.find('{', scanFromPos);
-            if (startPos == newName.npos)
-            {
-                break;
-            }
-
-            const size_t endPos = newName.find('}', startPos + 1);
-            if (endPos == newName.npos)
-            {
-                break;
-            }
-
-            const string indexStr = newName.substr(startPos + 1, endPos - startPos - 1);
-
-            bool bBadSyntax = indexStr.empty();
-            for (size_t i = 0; i < indexStr.length(); ++i)
-            {
-                if (!isdigit(indexStr[i]))
-                {
-                    bBadSyntax = true;
-                }
-            }
-            if (bBadSyntax)
-            {
-                RCLogError("%s: Syntax error in element {%s} in input string %s", __FUNCTION__, indexStr.c_str(), pRule->format.c_str());
-                return string();
-            }
-
-            const int index = atoi(indexStr.c_str());
-            if ((index < 0) || (index > tokens.size()))
-            {
-                RCLogError("%s: Bad index specified in {%s} in input string %s", __FUNCTION__, indexStr.c_str(), pRule->format.c_str());
-                return string();
-            }
-
-            const string& replaceWith = (index == 0) ? name : tokens[index - 1];
-            newName = newName.replace(startPos, endPos - startPos + 1, replaceWith);
-            scanFromPos = startPos + replaceWith.size();
-        }
-
-        return newName;
-    }
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_NAMECONVERTOR_H
diff --git a/Code/Tools/RC/ResourceCompiler/PakHelpers.cpp b/Code/Tools/RC/ResourceCompiler/PakHelpers.cpp
deleted file mode 100644
index 0e19e07a23..0000000000
--- a/Code/Tools/RC/ResourceCompiler/PakHelpers.cpp
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include "PakHelpers.h"
-
-#include "PathHelpers.h"
-#include "StringHelpers.h"
-#include "StringUtils.h"
-#include "FileUtil.h"
-#include "IRCLog.h"
-#include <AzCore/base.h>
-
-//////////////////////////////////////////////////////////////////////////
-bool PakHelpers::PakEntry::MakeSortableStreamingSuffix(const string& suffix, string* sortable, int nDigits, int nIncrement)
-{
-    int nMipmap = 0;
-    char cAttached = '\0';
-    char verify[32] = "";
-
-    // Scan, recreate and compare to verify if the given string is a valid streaming suffix
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-    int nTokens = sscanf_s(suffix.data(), "%d%c", &nMipmap, &cAttached, 1);
-#else
-    int nTokens = sscanf(suffix.data(), "%d%c", &nMipmap, &cAttached);
-#endif
-    switch (nTokens)
-    {
-    case 2:
-        // .dds.0a, .dds.1a, etc.
-        azsnprintf(verify, sizeof(verify), "%d%c", nMipmap, cAttached);
-        break;
-    case 1:
-        // .dds.0, .dds.1, etc.
-        azsnprintf(verify, sizeof(verify), "%d", nMipmap);
-        break;
-    default:
-        // .dds.a
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-        if (sscanf_s(suffix.data(), "%c", &cAttached, 1) == 1)
-#else
-        if (sscanf(suffix.data(), "%c", &cAttached) == 1)
-#endif
-        {
-            azsnprintf(verify, sizeof(verify), "%c", cAttached);
-            nTokens = 2;
-        }
-        break;
-    }
-
-    if (!StringHelpers::Equals(suffix, verify) || ((nTokens > 1) && (cAttached != 'a')))
-    {
-        return false;
-    }
-
-    // Recreate a streaming suffix we can use to sort (constant length)
-    if (sortable)
-    {
-        char digits[32];
-
-        if (nDigits > 0)
-        {
-            azsnprintf(digits, sizeof(digits), "%%0%dd", nDigits);
-        }
-        else
-        {
-            cry_strcpy(digits, "%d");
-        }
-
-        if (nTokens > 1)
-        {
-            cry_strcat(digits, "%c");
-        }
-
-        switch (nTokens)
-        {
-        case 2:
-            azsnprintf(verify, sizeof(verify), digits, nMipmap + nIncrement, cAttached);
-            break;
-        case 1:
-            azsnprintf(verify, sizeof(verify), digits, nMipmap + nIncrement);
-            break;
-        default:
-            break;
-        }
-
-        *sortable = verify;
-    }
-
-    return true;
-}
-
-string PakHelpers::PakEntry::GetRealFilename() const
-{
-    const string sRealFilename = PathHelpers::Join(m_rcFile.m_sourceLeftPath,
-            m_rcFile.m_sourceInnerPathAndName);
-    return sRealFilename;
-}
-
-string PakHelpers::PakEntry::GetStreamingSuffix() const
-{
-    const size_t splitter = m_rcFile.m_sourceInnerPathAndName.find_last_of('.');
-    if (splitter == string::npos)
-    {
-        return string();
-    }
-
-    // for split DDS files the file extension is .dds, .dds.1, .dds.a, .dds.1a ...
-    // Take the number part, and return just the mip number and alpha name
-    const string suffix = m_rcFile.m_sourceInnerPathAndName.substr(splitter + 1);
-    string sortablesuffix;
-    if (!MakeSortableStreamingSuffix(suffix, &sortablesuffix))
-    {
-        return string();
-    }
-
-    return sortablesuffix;
-}
-
-string PakHelpers::PakEntry::GetExtension() const
-{
-    size_t splitter = m_rcFile.m_sourceInnerPathAndName.find_last_of('.');
-    if (splitter == string::npos)
-    {
-        return string();
-    }
-
-    // for DDS files on consoles the file extension is .dds.0, .dds.1, .dds.0a, .dds.1a ...
-    // Skip the number part, and return the actual file extension without the mip number and alpha name
-    const string extension = m_rcFile.m_sourceInnerPathAndName.substr(splitter + 1);
-    if (!MakeSortableStreamingSuffix(extension))
-    {
-        return extension;
-    }
-
-    const string tmp = m_rcFile.m_sourceInnerPathAndName.substr(0, splitter);
-    splitter = tmp.find_last_of('.');
-    if (splitter == string::npos)
-    {
-        return string();
-    }
-
-    return tmp.substr(splitter + 1);
-}
-
-string PakHelpers::PakEntry::GetNameWithoutExtension(bool bFilenameOnly) const
-{
-    string name = m_rcFile.m_sourceInnerPathAndName;
-
-    if (bFilenameOnly)
-    {
-        name = PathHelpers::GetFilename(name);
-    }
-
-    size_t splitter = name.find_last_of('.');
-    if (splitter == string::npos)
-    {
-        return name;
-    }
-
-    // for DDS files on consoles the file extension is .dds.0, .dds.1, .dds.0a, .dds.1a ...
-    // Skip the number part, and return the actual file extension without the mip number and alpha name
-    const string extension = name.substr(splitter + 1);
-    if (MakeSortableStreamingSuffix(extension))
-    {
-        name = name.substr(0, splitter);
-    }
-
-    splitter = name.find_last_of('.');
-    if (splitter == string::npos)
-    {
-        return name;
-    }
-
-    return name.substr(0, splitter);
-}
-
-string PakHelpers::PakEntry::GetDirnameWithoutFile(bool bRootdirOnly) const
-{
-    string name = m_rcFile.m_sourceInnerPathAndName;
-
-    if (bRootdirOnly)
-    {
-        const size_t splitter = name.find_first_of("\\/");
-        if (splitter != string::npos)
-        {
-            name = name.substr(0, splitter);
-        }
-        else
-        {
-            name = "";
-        }
-    }
-    else
-    {
-        name = PathHelpers::GetDirectory(name);
-    }
-
-    return name;
-}
-
-PakHelpers::ETextureType PakHelpers::PakEntry::GetTextureType() const
-{
-    const string sLowerCaseName = StringHelpers::MakeLowerCase(PathHelpers::RemoveExtension(m_rcFile.m_sourceInnerPathAndName));
-    if (StringHelpers::EndsWith(sLowerCaseName, "_diff"))
-    {
-        return eTextureType_Diffuse;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_ddn") ||
-        StringHelpers::EndsWith(sLowerCaseName, "_ddna"))
-    {
-        return eTextureType_Normal;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_spec"))
-    {
-        return eTextureType_Specular;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_detail"))
-    {
-        return eTextureType_Detail;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_mask"))
-    {
-        return eTextureType_Mask;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_sss"))
-    {
-        return eTextureType_SubSurfaceScattering;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_cm") ||
-        StringHelpers::EndsWith(sLowerCaseName, "_cubemap"))
-    {
-        return eTextureType_Cubemap;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_cch"))
-    {
-        return eTextureType_Colorchart;
-    }
-    if (StringHelpers::EndsWith(sLowerCaseName, "_displ") ||
-        StringHelpers::EndsWith(sLowerCaseName, "_dmap"))
-    {
-        return eTextureType_Displacement;
-    }
-
-    return eTextureType_Undefined;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-namespace
-{
-    struct StreamingFileOrder
-    {
-        bool operator()(const PakHelpers::PakEntry& left, const PakHelpers::PakEntry& right) const
-        {
-            // first sort by extension
-            const string& extA = left.m_extension;
-            const string& extB = right.m_extension;
-            int res = StringHelpers::CompareIgnoreCase(extA, extB);
-            if (res != 0)
-            {
-                return res < 0;
-            }
-
-            if (StringHelpers::EqualsIgnoreCase(extA, "dds"))
-            {
-                // then sort dds textures by type
-                const PakHelpers::ETextureType eAType = left.m_textureType;
-                const PakHelpers::ETextureType eBType = right.m_textureType;
-                if (eAType != eBType)
-                {
-                    return eAType < eBType;
-                }
-
-                // then sort by name
-                const string& shortNameA = PathHelpers::Join(left.m_innerDir, left.m_baseName);
-                const string& shortNameB = PathHelpers::Join(right.m_innerDir, right.m_baseName);
-                res = StringHelpers::CompareIgnoreCase(shortNameA, shortNameB);
-                if (res != 0)
-                {
-                    return res < 0;
-                }
-
-                if (left.m_sourceFileSize != right.m_sourceFileSize)
-                {
-                    return left.m_sourceFileSize < right.m_sourceFileSize;
-                }
-            }
-            else
-            {
-                /*
-                // The following code is commented out because some of the files
-                // are loaded directly from an alphabetical resource list which breaks
-                // the whole loading times
-                if (left.m_sourceFileSize != right.m_sourceFileSize)
-                {
-                    return left.m_sourceFileSize < right.m_sourceFileSize;
-                }
-                */
-            }
-
-            res = StringHelpers::CompareIgnoreCase(
-                    left.m_rcFile.m_sourceInnerPathAndName, right.m_rcFile.m_sourceInnerPathAndName);
-            return res < 0;
-        }
-    };
-
-    struct SizeFileOrder
-    {
-        bool operator()(const PakHelpers::PakEntry& left, const PakHelpers::PakEntry& right) const
-        {
-            return left.m_sourceFileSize < right.m_sourceFileSize;
-        }
-    };
-
-    struct AlphabeticalFileOrder
-    {
-        bool operator()(const PakHelpers::PakEntry& left, const PakHelpers::PakEntry& right) const
-        {
-            const int res = StringHelpers::CompareIgnoreCase(
-                    left.m_rcFile.m_sourceInnerPathAndName, right.m_rcFile.m_sourceInnerPathAndName);
-            return res < 0;
-        }
-    };
-
-    struct StreamingSuffixFileOrder
-        : public AlphabeticalFileOrder
-    {
-        bool operator()(const PakHelpers::PakEntry& left, const PakHelpers::PakEntry& right) const
-        {
-            // first sort by streaming suffix
-            const string& sfxA = left.m_streamingSuffix;
-            const string& sfxB = right.m_streamingSuffix;
-
-            // Empty suffices always at the end of the PAK, no matter what
-            if (!sfxA.empty() || !sfxB.empty())
-            {
-                if (sfxA.empty())
-                {
-                    return true;
-                }
-
-                if (sfxB.empty())
-                {
-                    return false;
-                }
-
-                const int res = StringHelpers::CompareIgnoreCase(sfxA, sfxB);
-                if (res != 0)
-                {
-                    return res < 0;
-                }
-            }
-
-            // then sort by name
-            const string& shortNameA = left.m_baseName;
-            const string& shortNameB = right.m_baseName;
-
-            int res = StringHelpers::CompareIgnoreCase(shortNameA, shortNameB);
-            if (res != 0)
-            {
-                return res < 0;
-            }
-
-            // then sort by extension
-            const string& extA = left.m_extension;
-            const string& extB = right.m_extension;
-            res = StringHelpers::CompareIgnoreCase(extA, extB);
-            if (res != 0)
-            {
-                return res < 0;
-            }
-
-            // then alphabetically
-            return AlphabeticalFileOrder::operator()(left, right);
-        }
-    };
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-size_t PakHelpers::CreatePakEntryList(
-    const std::vector<RcFile>& files,
-    std::map<string, std::vector<PakHelpers::PakEntry> >& pakEntries,
-    PakHelpers::ESortType eSortType,
-    PakHelpers::ESplitType eSplitType,
-    const string& sPakName)
-{
-    const string sPakBase = PathHelpers::RemoveExtension(PathHelpers::GetFilename(sPakName));
-    string sPakDir;
-    size_t entryCount = 0;
-
-    for (std::vector<RcFile>::const_iterator it = files.begin(); it != files.end(); ++it)
-    {
-        const RcFile& file = *it;
-        string sNewPakName = sPakName;
-        bool bSkip = false;
-
-        PakEntry entry;
-        entry.m_rcFile = file;
-
-        entry.m_rcFile.m_sourceLeftPath = PathHelpers::ToPlatformPath(file.m_sourceLeftPath);
-        entry.m_rcFile.m_sourceInnerPathAndName = PathHelpers::ToPlatformPath(file.m_sourceInnerPathAndName);
-        entry.m_rcFile.m_targetLeftPath = PathHelpers::ToPlatformPath(file.m_targetLeftPath);
-
-        // cache values used for fast sorting
-        entry.m_streamingSuffix = entry.GetStreamingSuffix();
-        entry.m_extension = entry.GetExtension();
-        entry.m_textureType = entry.GetTextureType();
-        entry.m_baseName = entry.GetNameWithoutExtension(true);
-        entry.m_innerDir = entry.GetDirnameWithoutFile(false);
-        entry.m_sourceFileSize = FileUtil::GetFileSize(entry.GetRealFilename());
-
-        if (eSplitType == eSplitType_ExtensionMipmap)
-        {
-            if (entry.m_sourceFileSize >= 0)
-            {
-                if (StringHelpers::EqualsIgnoreCase(entry.m_extension, "dds"))
-                {
-                    if (!entry.m_streamingSuffix.empty())
-                    {
-                        const string szPlainSuffix = entry.m_rcFile.m_sourceInnerPathAndName.substr(entry.m_rcFile.m_sourceInnerPathAndName.find_last_of('.') + 1);
-                        string szIncrementedSuffix = "";
-
-                        if (entry.MakeSortableStreamingSuffix(szPlainSuffix, &szIncrementedSuffix, 0, 1))
-                        {
-                            string tmpFilename = PathHelpers::Join(file.m_sourceLeftPath, entry.m_innerDir);
-                            tmpFilename = PathHelpers::Join(tmpFilename, entry.m_baseName + "." + entry.m_extension + "." + szIncrementedSuffix);
-
-                            entry.m_bIsLastMip = !FileUtil::FileExists(tmpFilename);
-                        }
-                    }
-
-                    if (entry.m_bIsLastMip)
-                    {
-                        sNewPakName = sPakName + string("streaming\\dds_high.pak");
-                    }
-                    else
-                    {
-                        sNewPakName = sPakName + string("streaming\\dds_low.pak");
-                    }
-                }
-                else
-                {
-                    sNewPakName = sPakName + string("streaming\\") + entry.m_extension + string(".pak");
-                }
-            }
-            else
-            {
-                bSkip = true;
-            }
-        }
-        else if (eSplitType == eSplitType_Suffix)
-        {
-            // filter files without suffices > 0 into different pak
-            if (!entry.m_streamingSuffix.empty())
-            {
-                const string tmpFilename = PathHelpers::Join(file.m_sourceLeftPath,
-                        entry.m_innerDir + "\\" + entry.m_baseName + "." + entry.m_extension + ".1");
-
-                if (!FileUtil::FileExists(tmpFilename))
-                {
-                    entry.m_streamingSuffix = "";//"00o";
-                }
-            }
-
-            sNewPakName = sPakDir + sPakBase + "-m" + entry.m_streamingSuffix + string(".pak");
-        }
-        else if (eSplitType == eSplitType_Basedir)
-        {
-            sNewPakName = sPakDir + entry.GetDirnameWithoutFile(true) + string(".pak");
-        }
-        else
-        {
-            if (eSortType == eSortType_Size)
-            {
-                bSkip = !(entry.m_sourceFileSize >= 0);
-            }
-        }
-
-        if (StringHelpers::EqualsIgnoreCase(entry.m_extension, "$dds") ||
-            StringHelpers::EqualsIgnoreCase(entry.m_extension, "pak"))
-        {
-            bSkip = true;
-        }
-
-        if (!bSkip)
-        {
-            pakEntries[sNewPakName].push_back(entry);
-            ++entryCount;
-        }
-    }
-
-    // sort the entries by requested sorting operator
-    for (std::map<string, std::vector<PakEntry> >::iterator it = pakEntries.begin(); it != pakEntries.end(); ++it)
-    {
-        std::vector<PakEntry>& files = it->second;
-
-        // Sort by type
-        switch (eSortType)
-        {
-        case PakHelpers::eSortType_NoSort:
-        {
-            RCLog("Using sort method to add to pack : nosort");
-            break;
-        }
-        case PakHelpers::eSortType_Size:
-        {
-            RCLog("Using sort method to add to pack : size");
-            // Sort alphabetically first so there is a consistent ordering before sorting by size
-            // (to ensure that files with the same size are ordered by name)
-            std::sort(files.begin(), files.end(), AlphabeticalFileOrder());
-            std::stable_sort(files.begin(), files.end(), SizeFileOrder());
-            break;
-        }
-        case PakHelpers::eSortType_Streaming:
-        {
-            RCLog("Using sort method to add to pack : streaming");
-            std::sort(files.begin(), files.end(), StreamingFileOrder());
-            break;
-        }
-        case PakHelpers::eSortType_Suffix:
-        {
-            RCLog("Using sort method to add to pack : suffix");
-            std::sort(files.begin(), files.end(), StreamingSuffixFileOrder());
-            break;
-        }
-        case PakHelpers::eSortType_Alphabetically:
-        {
-            RCLog("Using sort method to add to pack : alphabetically");
-            std::sort(files.begin(), files.end(), AlphabeticalFileOrder());
-            break;
-        }
-        default:
-        {
-            assert(0);
-            RCLogError("Using sort method to add to pack : undefined!");
-            break;
-        }
-        }
-    }
-
-    return entryCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Tools/RC/ResourceCompiler/PakHelpers.h b/Code/Tools/RC/ResourceCompiler/PakHelpers.h
deleted file mode 100644
index cd823e30ed..0000000000
--- a/Code/Tools/RC/ResourceCompiler/PakHelpers.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PAKHELPERS_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PAKHELPERS_H
-#pragma once
-
-#include <map>                 // stl multimap<>
-
-#include "RcFile.h"
-
-namespace PakHelpers
-{
-    enum ESortType
-    {
-        eSortType_NoSort,               // don't sort files
-        eSortType_Size,                 // sort files by size
-        eSortType_Streaming,            // sort files by extension+type+name+size
-        eSortType_Suffix,               // sort files by suffix+name+extension
-        eSortType_Alphabetically,       // sort files by full path
-    };
-
-    enum ESplitType
-    {
-        eSplitType_Original,            // don't create paks differing from the original configuration (XML or command line)
-        eSplitType_Basedir,             // split paks by base directory name
-        eSplitType_ExtensionMipmap,     // split paks by extension and mipmap level (high/low)
-        eSplitType_Suffix,              // split paks by suffix
-    };
-
-    enum ETextureType
-    {
-        eTextureType_Diffuse,
-        eTextureType_Normal,
-        eTextureType_Specular,
-        eTextureType_Detail,
-        eTextureType_Mask,
-        eTextureType_SubSurfaceScattering,
-        eTextureType_Cubemap,
-        eTextureType_Colorchart,
-        eTextureType_Displacement,
-        eTextureType_Undefined,
-    };
-
-    struct PakEntry
-    {
-        PakEntry()
-            : m_sourceFileSize(-1)
-            , m_bIsLastMip(false)
-        {
-        }
-
-        RcFile m_rcFile;
-        int64 m_sourceFileSize;
-        bool m_bIsLastMip;
-
-        string m_streamingSuffix;
-        string m_extension;
-        ETextureType m_textureType;
-        string m_baseName;
-        string m_innerDir;
-
-        static bool MakeSortableStreamingSuffix(const string& suffix, string* sortable = NULL, int nDigits = 2, int nIncrement = 0);
-
-        string GetRealFilename() const;
-        string GetStreamingSuffix() const;
-        string GetExtension() const;
-        string GetNameWithoutExtension(bool bFilenameOnly) const;
-        string GetDirnameWithoutFile(bool bRootdirOnly) const;
-
-        ETextureType GetTextureType() const;
-    };
-
-    size_t CreatePakEntryList(
-        const std::vector<RcFile>& files,
-        std::map<string, std::vector<PakEntry> >& pakEntries,
-        ESortType eSortType,
-        ESplitType eSplitType,
-        const string& sPakName);
-}
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PAKHELPERS_H
diff --git a/Code/Tools/RC/ResourceCompiler/PakManager.cpp b/Code/Tools/RC/ResourceCompiler/PakManager.cpp
deleted file mode 100644
index 2fed7ba97b..0000000000
--- a/Code/Tools/RC/ResourceCompiler/PakManager.cpp
+++ /dev/null
@@ -1,934 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include "PakManager.h"
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <Shlwapi.h>  // PathRelativePathTo(), PathCanonicalize()
-#pragma message("Note: including Shlwapi.lib")
-#pragma comment(lib, "Shlwapi.lib")
-#endif
-
-#include "IRCLog.h"
-#include "FileUtil.h"
-#include <ResourceCompiler.h> // for functions like GetSourceRootsReversed
-#include "CryCrc32.h"
-#include "ZipEncryptor.h"
-#include "ThreadUtils.h"
-#include <AzCore/std/algorithm.h>
-#include <AzCore/IO/SystemFile.h>
-
-
-//////////////////////////////////////////////////////////////////////////
-PakManager::PakManager(IProgress* pProgress)
-    : m_pProgress(pProgress)
-{
-}
-
-PakManager::~PakManager()
-{
-}
-
-void PakManager::RegisterKeys(IResourceCompiler* pRC)
-{
-    pRC->RegisterKey("split_listfile_to_zips", "split a list file into multiple zip files");
-    pRC->RegisterKey("zip", "Compress source files into the zip file specified with this parameter");
-    pRC->RegisterKey("zip_encrypt", "Encrypts headers of zip files. Disabled by default.");
-    pRC->RegisterKey("zip_encrypt_key", "Specifies a 128-bit key in hexadecimal format: 32-character string. Low endian format.");
-    pRC->RegisterKey("zip_encrypt_content", "Encrypts files inside of zip. Works only when zip_encrypt enabled. Disabled by default.");
-    pRC->RegisterKey("zip_compression", "Specify compression level for zipped files. [0-9] 0=no compression, 9=max compression. Default is 6.");
-    pRC->RegisterKey("zip_sort", "Define sorting type when adding files to the pak, currently supported:\n"
-        "nosort, size, streaming, suffix, alphabetically. Alphabetically is default.");
-    pRC->RegisterKey("zip_split", "Define split type for distributing files into different paks automatically, currently supported:\n"
-        "original, basedir, streaming, suffix. 'original' is default, except for streaming for which it is streaming.");
-    pRC->RegisterKey("zip_maxsize", "Maximum compressed size of the zip in KBs");
-    pRC->RegisterKey("zip_sizesplit", "Split zip files automatically when the maximum compressed size (configured or supported) has been reached");
-    pRC->RegisterKey("zip_alignment", "Alignment of files inside zip. Default is 1 byte.");
-    pRC->RegisterKey("zip_new", "Forces creation of new zip file overwriting existing one");
-    pRC->RegisterKey("FolderInZip", "Put source files into this specified folder inside of zip file (see 'zip' command)");
-    pRC->RegisterKey("sourceminsize", "only copy or zip a source file if its size is greater or equal than the size specified. used with 'copyonly' and 'zip' commands.");
-    pRC->RegisterKey("sourcemaxsize", "only copy or zip a source file if its size is less or equal than the size specified. used with 'copyonly' and 'zip' commands.");
-    pRC->RegisterKey("unzip", "Decompress source file into the specified folder with this parameter");
-}
-
-//////////////////////////////////////////////////////////////////////////
-IPakSystem* PakManager::GetPakSystem()
-{
-    return &m_pPakSystem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-unsigned PakManager::GetMaxThreads() const
-{
-    return AZStd::GetMax<unsigned>(1, AZStd::thread::hardware_concurrency() / 2);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool PakManager::HasPakFiles() const
-{
-    return m_zipFiles.size() > 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-PakManager::ECallResult PakManager::CompileFilesIntoPaks(
-    const IConfig* config,
-    const std::vector<RcFile>& m_allFiles)
-{
-    {
-        const string pakFilePath = config->GetAsString("split_listfile_to_zips", "", "");
-        if (!pakFilePath.empty())
-        {
-            std::vector<string> sourceRootsReversed;
-            ResourceCompiler::GetSourceRootsReversed(config, sourceRootsReversed);
-
-            return SplitListFileToPaks(config, sourceRootsReversed, m_allFiles, pakFilePath);
-        }
-    }
-
-    {
-        const string pakFilename = config->GetAsString("zip", "", "");
-        if (!pakFilename.empty())
-        {
-            const string folderInPak = config->GetAsString("FolderInZip", "", "");
-            const bool bUpdate = !config->GetAsBool("zip_new", false, true); // forces to recreate pak-file
-
-            return CreatePakFile(config, m_allFiles, folderInPak, pakFilename, bUpdate);
-        }
-    }
-
-    {
-        const string unzipFolder = config->GetAsString("unzip", "", "");
-        if (!unzipFolder.empty())
-        {
-            return UnzipPakFile(config, m_allFiles, unzipFolder);
-        }
-    }
-
-    return eCallResult_Skipped;
-}
-
-//////////////////////////////////////////////////////////////////////////
-PakManager::ECallResult PakManager::SplitListFileToPaks(
-    const IConfig* config,
-    const std::vector<string>& sourceRootsReversed,
-    const std::vector<RcFile>& files,
-    const string& pakFilePath)
-{
-    typedef std::map<string, std::vector<RcFile> > TSplitListMap;
-    TSplitListMap splitListMap;
-    for (size_t i = 0; i < files.size(); ++i)
-    {
-        const string line(files[i].m_sourceInnerPathAndName);
-        const size_t splitter = line.find_first_of("|;,");
-        if (splitter == string::npos)
-        {
-            continue;
-        }
-
-        string groupName = line.substr(0, splitter);
-        string fileName = line.substr(splitter + 1);
-        groupName.Trim();
-        fileName.Trim();
-
-        const string sourceLeftPath = ResourceCompiler::FindSuitableSourceRoot(sourceRootsReversed, fileName);
-        splitListMap[groupName].push_back(RcFile(sourceLeftPath, fileName, ""));
-    }
-
-    for (TSplitListMap::iterator it = splitListMap.begin(); it != splitListMap.end(); ++it)
-    {
-        const string& groupName = it->first;
-        std::vector<RcFile>& fileList = it->second;
-
-        const string pakFilename = pakFilePath + groupName + ".pak";
-        CreatePakFile(config, fileList, "", pakFilename, true);
-    }
-
-    return eCallResult_Succeeded;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-PakManager::ECallResult PakManager::DeleteFilesFromPaks(
-    const IConfig* config,
-    const std::vector<string>& deletedTargetFiles)
-{
-    if (HasPakFiles() && deletedTargetFiles.size())
-    {
-        RCLog("Deleting files from zip archives");
-
-        return SynchronizePaks(config, deletedTargetFiles);
-    }
-
-    return eCallResult_Skipped;
-}
-
-PakManager::ECallResult PakManager::SynchronizePaks(
-    const IConfig* config,
-    const std::vector<string>& deletedTargetFiles)
-{
-    const int nTotalToScan = m_zipFiles.size() * deletedTargetFiles.size();
-    const int zipFileAlignment = config->GetAsInt("zip_alignment", 1, 1);
-
-    int nDeletedInZip = 0;
-    int nScannedFiles = 0;
-
-    // If we created some zip file, check if files need to be deleted from them.
-    for (size_t nzip = 0; (nzip < m_zipFiles.size()) && (nTotalToScan > 0); ++nzip)
-    {
-        string zipFilename = m_zipFiles[nzip];
-
-        PakSystemArchive* pPakFile = GetPakSystem()->OpenArchive(zipFilename.c_str(), zipFileAlignment);
-        if (pPakFile)
-        {
-            const string progress = string("Deleting files from ") + zipFilename;
-
-            char szRelative[MAX_PATH];
-            string zipFileDir = PathHelpers::GetDirectory(zipFilename);
-
-            for (size_t i = 0; i < deletedTargetFiles.size(); ++i)
-            {
-                string filename = deletedTargetFiles[i];
-#if defined(AZ_PLATFORM_WINDOWS)
-                // Detect path offset of the zip location to source folder
-                if (TRUE == PathRelativePathTo(szRelative, zipFileDir.c_str(), FILE_ATTRIBUTE_DIRECTORY, filename.c_str(), FILE_ATTRIBUTE_NORMAL))
-                {
-                    char szRelative2[MAX_PATH];
-                    PathCanonicalize(szRelative2, szRelative);
-                    filename = szRelative2;
-                }
-#else
-                //TODO: Needs implementation for other platforms via localFileIo. Adding an assert for now in case this code gets run.
-                assert(0);
-#endif
-                ++nScannedFiles;
-                if (GetPakSystem()->DeleteFromArchive(pPakFile, filename.c_str()))
-                {
-                    ++nDeletedInZip;
-
-                    RCLog("Remove file from zip: [%s] %s", zipFilename.c_str(), filename.c_str());
-                }
-
-                m_pProgress->ShowProgress(progress.c_str(), nScannedFiles, nTotalToScan);
-            }
-
-            GetPakSystem()->CloseArchive(pPakFile);
-        }
-    }
-
-    return eCallResult_Succeeded;
-}
-
-//////////////////////////////////////////////////////////////////////////
-PakManager::ECallResult PakManager::CreatePakFile(
-    const IConfig* config,
-    const std::vector<RcFile>& sourceFiles,
-    const string& folderInPak,
-    const string& requestedPakFilename,
-    bool bUpdate)
-{
-    const int iVerbose = config->GetAsInt("verbose", 0, 1);
-    const bool bSkipMissing = config->GetAsBool("skipmissing", false, true);
-
-    if (iVerbose > 0)
-    {
-        RCLog("CreatingPakFile %s ...", requestedPakFilename.c_str());
-    }
-
-    PakHelpers::ESortType eSortType = PakHelpers::eSortType_Alphabetically;
-    const string sortType = config->GetAsString("zip_sort", "", "");
-    if (!sortType.empty())
-    {
-        if (StringHelpers::EqualsIgnoreCase(sortType, "nosort"))
-        {
-            eSortType = PakHelpers::eSortType_NoSort;
-        }
-        else if (StringHelpers::EqualsIgnoreCase(sortType, "size"))
-        {
-            eSortType = PakHelpers::eSortType_Size;
-        }
-        else if (StringHelpers::EqualsIgnoreCase(sortType, "streaming"))
-        {
-            eSortType = PakHelpers::eSortType_Streaming;
-        }
-        else if (StringHelpers::EqualsIgnoreCase(sortType, "suffix"))
-        {
-            eSortType = PakHelpers::eSortType_Suffix;
-        }
-        else if (StringHelpers::EqualsIgnoreCase(sortType, "alphabetically"))
-        {
-            eSortType = PakHelpers::eSortType_Alphabetically;
-        }
-        else
-        {
-            RCLogError("Invalid zip_sort argument: '%s'. Creating of pak failed.", sortType.c_str());
-            return eCallResult_BadArgs;
-        }
-    }
-
-    PakHelpers::ESplitType eSplitType = PakHelpers::eSplitType_Original;
-    if (eSortType == PakHelpers::eSortType_Streaming)
-    {
-        eSplitType = PakHelpers::eSplitType_ExtensionMipmap;
-    }
-
-    const string splitType = config->GetAsString("zip_split", "", "");
-    if (!splitType.empty())
-    {
-        if (StringHelpers::EqualsIgnoreCase(splitType, "original"))
-        {
-            eSplitType = PakHelpers::eSplitType_Original;
-        }
-        else if (StringHelpers::EqualsIgnoreCase(splitType, "basedir"))
-        {
-            eSplitType = PakHelpers::eSplitType_Basedir;
-        }
-        else if (StringHelpers::EqualsIgnoreCase(splitType, "streaming"))
-        {
-            eSplitType = PakHelpers::eSplitType_ExtensionMipmap;
-        }
-        else if (StringHelpers::EqualsIgnoreCase(splitType, "suffix"))
-        {
-            eSplitType = PakHelpers::eSplitType_Suffix;
-        }
-        else
-        {
-            RCLogError("Invalid zip_split argument: '%s'. Creating of pak failed.", splitType.c_str());
-            return eCallResult_BadArgs;
-        }
-    }
-
-    string platformPakFilename = PathHelpers::ToPlatformPath(requestedPakFilename);
-    if (!FileUtil::EnsureDirectoryExists(PathHelpers::GetDirectory(platformPakFilename).c_str()))
-    {
-        RCLogError("Failed creating directory for %s", platformPakFilename.c_str());
-        return eCallResult_Failed;
-    }
-
-    std::map<string, std::vector<PakHelpers::PakEntry> > fileMap;
-
-    {
-        const size_t nCount = PakHelpers::CreatePakEntryList(sourceFiles, fileMap, eSortType, eSplitType, platformPakFilename);
-        if (nCount == 0)
-        {
-            return eCallResult_Failed;
-        }
-
-        RCLog("Requested %u files to be packed. Found %u valid files to add.", sourceFiles.size(), nCount);
-    }
-
-    std::set<unsigned int> crc32set;
-    const bool name_as_crc32 = config->GetAsBool("name_as_crc32", false, true);
-
-    const int nMinZipSize = sizeof(ZipFile::CDREnd);     // size of an empty CDR
-    const int nMaxZipSize = config->GetAsInt("zip_maxsize", 0, 0) * 1024;
-
-    const bool bSplitOnSizeOverflow = config->GetAsBool("zip_sizesplit", false, true);
-
-    const int nMaxSrcSize = config->GetAsInt("sourcemaxsize", -1, -1);
-    const int nMinSrcSize = config->GetAsInt("sourceminsize", 0, 0);
-
-    const int zipCompressionLevel = config->GetAsInt("zip_compression", 6, 6);
-
-    const bool useFastestDecompressionCodec = config->GetAsBool("use_fastest", false, false);
-
-    ECallResult bResult = eCallResult_Succeeded;
-    for (std::map<string, std::vector<PakHelpers::PakEntry> >::iterator it = fileMap.begin(); it != fileMap.end(); ++it)
-    {
-        const string& pakFilename = it->first;
-        std::vector<PakHelpers::PakEntry>& files = it->second;
-
-        RCLog("Found %u valid files to add to zip file %s", files.size(), pakFilename.c_str());
-
-        AZ::IO::LocalFileIO localFileIO;
-        if (!bUpdate)
-        {
-#if defined(AZ_PLATFORM_WINDOWS)
-            // Delete old pak file.
-            ::SetFileAttributes(pakFilename.c_str(), FILE_ATTRIBUTE_ARCHIVE);
-#endif
-            localFileIO.Remove(pakFilename.c_str());
-        }
-
-        if (!FileUtil::EnsureDirectoryExists(PathHelpers::GetDirectory(pakFilename).c_str()))
-        {
-            RCLogError("Failed creating directory for %s", pakFilename.c_str());
-            return eCallResult_Failed;
-        }
-
-        const int zipFileAlignment = config->GetAsInt("zip_alignment", 1, 1);
-
-        const bool zipEncrypt = config->GetAsBool("zip_encrypt", false, true);
-        const bool zipEncryptContent = config->GetAsBool("zip_encrypt_content", false, true);
-
-        const string zipEncryptKey = config->GetAsString("zip_encrypt_key", "", "");
-        uint32 encryptionKey[4];
-        if (!zipEncryptKey.empty())
-        {
-            if (!ZipEncryptor::ParseKey(encryptionKey, zipEncryptKey.c_str()))
-            {
-                RCLogError("Misformed zip_encrypt_key: expected 128-bit integer in hexadecimal format (32 character)");
-                return eCallResult_Failed;
-            }
-        }
-
-        // check if pak is multi-part and redirect it before opening the pak
-        bool bMultiPartPak = false;
-        string pakFilenameToWrite = pakFilename;
-        if (bSplitOnSizeOverflow)
-        {
-            string pakFilenameMultiPart = pakFilename;
-            pakFilenameMultiPart.replace(".pak", "-part0.pak");
-            if (FileUtil::FileExists(pakFilenameMultiPart))
-            {
-                RCLog("Found explicit multi-part zip, writing to zip file %s instead", pakFilenameMultiPart.c_str());
-
-                bMultiPartPak = true;
-                pakFilenameToWrite = pakFilenameMultiPart;
-            }
-        }
-
-        const size_t numFiles = files.size();
-        size_t numFilesAdded = 0;
-        size_t numFilesUpToDate = 0;
-        size_t numFilesSkipped = 0;
-        size_t numFilesMissing = 0;
-        size_t numFilesFailed = 0;
-
-        const string sProgressOp = "Adding files to zip file " + pakFilenameToWrite;
-        m_pProgress->StartProgress();
-
-        std::vector<string> realFilenames;
-        std::vector<string> filenamesInZip;
-
-        realFilenames.reserve(numFiles);
-        filenamesInZip.reserve(numFiles);
-
-        // create list of filenames
-        for (size_t i = 0; i < numFiles; ++i)
-        {
-            string sFileNameInZip = PathHelpers::RemoveDuplicateSeparators(PathHelpers::ToPlatformPath(PathHelpers::Join(folderInPak, files[i].m_rcFile.m_sourceInnerPathAndName)));
-
-            const string sRealFilename = PathHelpers::Join(files[i].m_rcFile.m_sourceLeftPath, files[i].m_rcFile.m_sourceInnerPathAndName);
-
-            // Skip files with extensions starting with "$" or "pak".
-            {
-                const string ext = PathHelpers::FindExtension(sRealFilename);
-                if (!ext.empty() && (ext[0] == '$' || _stricmp(ext, "pak") == 0))
-                {
-                    ++numFilesSkipped;
-                    continue;
-                }
-            }
-
-            if (name_as_crc32)
-            {
-                const unsigned int crc32 = CCrc32::ComputeLowercase(sFileNameInZip.c_str());
-                if (crc32set.find(crc32) != crc32set.end())
-                {
-                    RCLogError("Duplicate CRC32 code %X for file %s when creating Pak File: %s", crc32, sFileNameInZip.c_str(), pakFilenameToWrite.c_str());
-                    ++numFilesFailed;
-                    bResult = eCallResult_Erroneous;
-                    break;
-                }
-
-                crc32set.insert(crc32);
-                sFileNameInZip.Format("%X", crc32);
-            }
-
-            filenamesInZip.push_back(sFileNameInZip);
-            realFilenames.push_back(sRealFilename);
-        }
-
-        std::vector<const char*> realFilenamePtrs;
-        std::vector<const char*> filenameInZipPtrs;
-        std::vector<const char*> filenameInZipPtrsForDelete;
-
-        size_t filenameCount = realFilenames.size();
-        assert(filenameCount == filenamesInZip.size());
-
-        realFilenamePtrs.resize(filenameCount);
-        filenameInZipPtrs.resize(filenameCount);
-        for (size_t i = 0; i < filenameCount; ++i)
-        {
-            realFilenamePtrs[i] = realFilenames[i].c_str();
-            filenameInZipPtrs[i] = filenamesInZip[i].c_str();
-        }
-
-        size_t currentPakPart = 0;
-        bool bKeepTrying = false;
-        do
-        {
-            // Add them to pak file.
-            PakSystemArchive* pPakFile = GetPakSystem()->OpenArchive(pakFilenameToWrite.c_str(), zipFileAlignment, zipEncrypt, zipEncryptKey.empty() ? 0 : encryptionKey);
-
-            if (!pPakFile)
-            {
-                // Problem to accss the file? it could have get corrupted so try to delete the file and recreate it
-                AZ::IO::SystemFile::Delete(pakFilenameToWrite.c_str());
-                pPakFile = GetPakSystem()->OpenArchive(pakFilenameToWrite.c_str(), zipFileAlignment, zipEncrypt, zipEncryptKey.empty() ? 0 : encryptionKey);
-
-                if (!pPakFile)
-                {
-                    RCLogError("Error: Failed to create zip file %s", pakFilenameToWrite.c_str());
-                    return eCallResult_Failed;
-                }
-            }
-
-            // submit files for packing
-            {
-                struct ZipErrorReporter
-                    : public ZipDir::IReporter
-                {
-                    IProgress& m_progress;
-                    const char* m_zipFilename;
-                    bool m_bVerbose;
-
-                    size_t m_fileCount;
-                    size_t& m_numFilesAdded;
-                    size_t& m_numFilesUpToDate;
-                    size_t& m_numFilesSkipped;
-                    size_t& m_numFilesMissing;
-                    size_t& m_numFilesFailed;
-
-                    ZipErrorReporter(IProgress& progress, const char* zipFilename, int numFiles, bool verbose,
-                        size_t& numFilesAdded, size_t& numFilesUpToDate, size_t& numFilesSkipped, size_t& numFilesMissing, size_t& numFilesFailed)
-                        : m_progress(progress)
-                        , m_zipFilename(zipFilename)
-                        , m_bVerbose(verbose)
-                        , m_fileCount(numFiles)
-                        , m_numFilesAdded(numFilesAdded)
-                        , m_numFilesUpToDate(numFilesUpToDate)
-                        , m_numFilesSkipped(numFilesSkipped)
-                        , m_numFilesMissing(numFilesMissing)
-                        , m_numFilesFailed(numFilesFailed)
-                    {
-                    }
-
-                    virtual void ReportAdded(const char* filename)
-                    {
-                        if (m_bVerbose)
-                        {
-                            RCLog("Zip [%s]: added file %s", m_zipFilename, filename);
-                        }
-                        ++m_numFilesAdded;
-                        ShowProgress();
-                    }
-
-                    virtual void ReportMissing(const char* filename)
-                    {
-                        RCLogWarning("Zip [%s]: missing file %s", m_zipFilename, filename);
-                        ++m_numFilesMissing;
-                        ShowProgress();
-                    }
-
-                    virtual void ReportUpToDate(const char* filename)
-                    {
-                        if (m_bVerbose)
-                        {
-                            RCLog("Zip [%s]: up to date %s", m_zipFilename, filename);
-                        }
-                        ++m_numFilesUpToDate;
-                        ShowProgress();
-                    }
-
-                    virtual void ReportSkipped(const char* filename)
-                    {
-                        RCLog("Zip [%s]: skipped %s", m_zipFilename, filename);
-                        ++m_numFilesSkipped;
-                        ShowProgress();
-                    }
-
-                    virtual void ReportFailed(const char* filename, const char* reason)
-                    {
-                        RCLog("Zip [%s]: failed to add %s. %s", m_zipFilename, filename, reason);
-                        ++m_numFilesFailed;
-                        ShowProgress();
-                    }
-
-                    virtual void ReportSpeed(double speed)
-                    {
-                        RCLog("Zip [%s] compression speed: %.2f MB/sec", m_zipFilename, speed / 1024.0 / 1024.0);
-                        ShowProgress();
-                    }
-
-                    void ShowProgress()
-                    {
-                        size_t processedFiles = m_numFilesAdded + m_numFilesUpToDate + m_numFilesFailed + m_numFilesSkipped + m_numFilesMissing;
-                        m_progress.ShowProgress("Adding files into pak", processedFiles, m_fileCount);
-                    }
-                };
-
-                struct ZipSizeSplitter
-                    : public ZipDir::ISplitter
-                {
-                    int    m_fileLast;
-                    int    m_fileCount;
-                    size_t m_fileSizeLimit;
-                    size_t m_fileSizeThreshold;
-
-                    ZipSizeSplitter(int filenameCount, size_t filesizeLimit)
-                        : m_fileLast(filenameCount - 1)
-                        , m_fileCount(filenameCount - 1)
-                        , m_fileSizeLimit(filesizeLimit)
-                        , m_fileSizeThreshold(0)
-                    {
-                    }
-
-                    virtual bool CheckWriteLimit(size_t total, size_t add, size_t sub) const
-                    {
-                        return ((total - sub) > (m_fileSizeLimit - add));
-                    }
-
-                    virtual void SetLastFile([[maybe_unused]] size_t total, size_t add, [[maybe_unused]] size_t sub, int last)
-                    {
-                        m_fileLast = last;
-                        m_fileSizeThreshold = m_fileSizeLimit - add;
-                    }
-
-                    bool HasReachedWriteLimit() const
-                    {
-                        return m_fileLast < m_fileCount;
-                    }
-                };
-
-                ZipErrorReporter errorReporter(*m_pProgress, pakFilenameToWrite.c_str(), numFiles, iVerbose>1,
-                    numFilesAdded, numFilesUpToDate, numFilesSkipped, numFilesMissing, numFilesFailed);
-                ZipSizeSplitter sizeSplitter(filenameCount, nMaxZipSize ? min(nMaxZipSize, INT_MAX) : INT_MAX);
-
-                RCLog("Adding files into %s...", pakFilenameToWrite.c_str());
-                pPakFile->zip->UpdateMultipleFiles(&realFilenamePtrs[0], &filenameInZipPtrs[0], filenameCount,
-                    zipCompressionLevel, zipEncrypt && zipEncryptContent, nMaxZipSize, nMinSrcSize, nMaxSrcSize,
-                    GetMaxThreads(), &errorReporter, bSplitOnSizeOverflow ? &sizeSplitter : nullptr, useFastestDecompressionCodec);
-                
-
-                // divide files in case it has overflown the maximum allowed file-size
-                if (bSplitOnSizeOverflow)
-                {
-                    char cPart[16];
-                    char nPart[16];
-
-                    azsnprintf(cPart, sizeof(cPart), "-part%zu.pak", currentPakPart + 0);
-                    azsnprintf(nPart, sizeof(nPart), "-part%zu.pak", currentPakPart + 1);
-
-                    const size_t pos = pakFilenameToWrite.find(cPart);
-
-                    if (!bKeepTrying)
-                    {
-                        // delete previously consumed files from archive
-                        const size_t filenameCountForDelete = filenameInZipPtrsForDelete.size();
-                        for (size_t i = 0; i < filenameCountForDelete; ++i)
-                        {
-                            pPakFile->zip->RemoveFile(filenameInZipPtrsForDelete[i]);
-                        }
-                    }
-
-                    // move consumed filenames into deletable list
-                    const size_t filenameCountForDelete = filenameInZipPtrsForDelete.size();
-                    const size_t filenameCountConsumed = sizeSplitter.m_fileLast + 1;
-                    filenameInZipPtrsForDelete.resize(filenameCountForDelete + filenameCountConsumed);
-                    memcpy(&filenameInZipPtrsForDelete[filenameCountForDelete],
-                        &filenameInZipPtrs[0], sizeof(filenameInZipPtrs[0]) * filenameCountConsumed);
-
-                    filenameCount -= filenameCountConsumed;
-                    if (filenameCount > 0)
-                    {
-                        assert(realFilenamePtrs.size() > filenameCountConsumed);
-                        memmove(&realFilenamePtrs[0], &realFilenamePtrs[filenameCountConsumed],
-                            sizeof(realFilenamePtrs[0]) * filenameCount);
-
-                        assert(filenameInZipPtrs.size() > filenameCountConsumed);
-                        memmove(&filenameInZipPtrs[0], &filenameInZipPtrs[filenameCountConsumed],
-                            sizeof(filenameInZipPtrs[0]) * filenameCount);
-                    }
-                    realFilenamePtrs.resize(filenameCount);
-                    filenameInZipPtrs.resize(filenameCount);
-
-                    if (!bKeepTrying)
-                    {
-                        // delete skipped over files from archive
-                        for (size_t i = 0; i < filenameCount; ++i)
-                        {
-                            pPakFile->zip->RemoveFile(filenameInZipPtrs[i]);
-                        }
-                    }
-
-                    if (sizeSplitter.HasReachedWriteLimit())
-                    {
-                        RCLog("Hitting limit of %d bytes on %s, trying reconsolidation...", sizeSplitter.m_fileSizeLimit, pakFilenameToWrite.c_str());
-
-                        // close archive
-                        GetPakSystem()->CloseArchive(pPakFile);
-
-                        // check if the reconsolidation of the pak gave more space free than we needed previously
-                        // in case it did, keep adding to the same file, instead of adding it to the next part
-                        const int64 fileSize = FileUtil::GetFileSize(pakFilenameToWrite);
-                        if (fileSize < sizeSplitter.m_fileSizeThreshold)
-                        {
-                            // if we tried keepTrying without effect, don't try again
-                            if ((filenameCountConsumed != 0) || !bKeepTrying)
-                            {
-                                if (pos == string::npos)
-                                {
-                                    RCLog("Reconsolidation on %s dropped at least %d bytes below %d, keep adding...", pakFilenameToWrite.c_str(), sizeSplitter.m_fileSizeLimit - sizeSplitter.m_fileSizeThreshold, sizeSplitter.m_fileSizeLimit);
-                                }
-                                else
-                                {
-                                    RCLog("Reconsolidation on %s dropped at least %d bytes below %d, keep adding to part %d...", pakFilenameToWrite.c_str(), sizeSplitter.m_fileSizeLimit - sizeSplitter.m_fileSizeThreshold, sizeSplitter.m_fileSizeLimit, currentPakPart);
-                                }
-
-                                bKeepTrying = true;
-                                continue;
-                            }
-                        }
-
-                        // rename archive if it's the first time becoming multi-part
-                        if (pos == string::npos)
-                        {
-                            RCLog("Start splitting %s, writing to part %d...", pakFilenameToWrite.c_str(), currentPakPart + 1);
-
-                            string pakFilenameToRename = pakFilenameToWrite;
-                            pakFilenameToRename.replace(".pak", cPart);
-                            localFileIO.Rename(pakFilenameToWrite.c_str(), pakFilenameToRename.c_str());
-
-                            bMultiPartPak = true;
-                            pakFilenameToWrite = pakFilenameToRename;
-                        }
-                        else
-                        {
-                            RCLog("Continue splitting %s, writing to part %d...", pakFilenameToWrite.c_str(), currentPakPart + 1);
-                        }
-
-                        // continue adding to the next part
-                        pakFilenameToWrite.replace(cPart, nPart);
-                        currentPakPart++;
-
-                        bKeepTrying = false;
-                        continue;
-                    }
-
-                    assert(filenameCount == 0);
-                    assert(realFilenamePtrs.size() == 0);
-                    assert(filenameInZipPtrs.size() == 0);
-                }
-                else
-                {
-                    filenameCount = 0;
-                    realFilenamePtrs.clear();
-                    filenameInZipPtrs.clear();
-                }
-            }
-
-            GetPakSystem()->CloseArchive(pPakFile);
-            const int64 fileSize = FileUtil::GetFileSize(pakFilenameToWrite);
-            if (fileSize > INT_MAX)
-            {
-                RCLogError("PAK File size exceeds 2GB limit. This will not be loaded by Engine: %s", pakFilenameToWrite.c_str());
-            }
-
-            else if (bSplitOnSizeOverflow && bMultiPartPak)
-            {
-                // delete all 0 size pak-parts and close holes in the numbering of the parts
-                bool trailingUntouched = false;
-                int trailingPakPart = currentPakPart;
-                for (;; )
-                {
-                    char cPart[16];
-                    char nPart[16];
-
-                    azsnprintf(cPart, sizeof(cPart), "-part%d.pak", trailingPakPart + 0);
-                    azsnprintf(nPart, sizeof(nPart), "-part%d.pak", trailingPakPart + 1);
-
-                    string pakFilenameToDelete = pakFilename;
-                    pakFilenameToDelete.replace(".pak", cPart);
-                    if (!FileUtil::FileExists(pakFilenameToDelete))
-                    {
-                        break;
-                    }
-
-                    // delete skipped over files from archives not touched
-                    if (trailingUntouched)
-                    {
-                        PakSystemArchive* const pPakFile2 = GetPakSystem()->OpenArchive(pakFilenameToDelete.c_str(), zipFileAlignment, zipEncrypt, zipEncryptKey.empty() ? 0 : encryptionKey);
-                        if (pPakFile2)
-                        {
-                            const size_t filenameCountForDelete = filenameInZipPtrsForDelete.size();
-                            for (size_t i = 0; i < filenameCountForDelete; ++i)
-                            {
-                                pPakFile2->zip->RemoveFile(filenameInZipPtrsForDelete[i]);
-                            }
-
-                            GetPakSystem()->CloseArchive(pPakFile2);
-                        }
-                    }
-
-                    const int64 fileSize2 = FileUtil::GetFileSize(pakFilenameToDelete);
-                    if (fileSize2 <= nMinZipSize)
-                    {
-                        // eliminate paks without content (may occur by filtering or reordering)
-                        localFileIO.Remove(pakFilenameToDelete);
-
-                        // shift successive part-names into the hole left by the deleted pak
-                        for (int q = trailingPakPart;; q++)
-                        {
-                            char cPart2[16];
-                            char nPart2[16];
-
-                            azsnprintf(cPart2, sizeof(cPart2), "-part%d.pak", q + 0);
-                            azsnprintf(nPart2, sizeof(nPart2), "-part%d.pak", q + 1);
-
-                            string pakFilenameToReplace = pakFilename;
-                            string pakFilenameToRename = pakFilename;
-                            pakFilenameToReplace.replace(".pak", cPart2);
-                            pakFilenameToRename.replace(".pak", nPart2);
-                            if (!FileUtil::FileExists(pakFilenameToRename))
-                            {
-                                break;
-                            }
-
-                            localFileIO.Rename(pakFilenameToRename.c_str(), pakFilenameToReplace.c_str());
-                        }
-                    }
-                    else
-                    {
-                        ++trailingPakPart;
-                    }
-
-                    trailingUntouched = true;
-                }
-
-                {
-                    string pakFilenameFirstPart = pakFilename;
-                    string pakFilenameNextPart = pakFilename;
-
-                    pakFilenameFirstPart.replace(".pak", "-part0.pak");
-                    pakFilenameNextPart.replace(".pak", "-part1.pak");
-
-                    // remove part-suffix if just one part exists after cleanup
-                    if (FileUtil::FileExists(pakFilenameFirstPart) &&
-                        !FileUtil::FileExists(pakFilenameNextPart))
-                    {
-                        localFileIO.Rename(pakFilenameFirstPart.c_str(), pakFilename.c_str());
-                        m_zipFiles.push_back(pakFilename);
-                    }
-                    // register all parts of the pak for sucessive operations
-                    else
-                    {
-                        for (int q = 0; q < trailingPakPart; q++)
-                        {
-                            char cPart[16];
-
-                            azsnprintf(cPart, sizeof(cPart), "-part%d.pak", q + 0);
-
-                            string pakFilenamePart = pakFilename;
-                            pakFilenamePart.replace(".pak", cPart);
-                            m_zipFiles.push_back(pakFilenamePart);
-                        }
-                    }
-                }
-            }
-            else if (fileSize <= nMinZipSize)
-            {
-                // eliminate paks without content (may occur by filtering)
-                localFileIO.Remove(pakFilenameToWrite);
-            }
-            else
-            {
-                // Add this zip to the array.
-                m_zipFiles.push_back(pakFilenameToWrite);
-            }
-
-            bKeepTrying = false;
-        } while (filenameCount);
-
-        RCLog("Finished adding %d files to zip file %s:",
-            numFiles, pakFilename.c_str());
-        RCLog("    %d added, %d up-to-date, %d skipped, %d missing, %d failed",
-            numFilesAdded, numFilesUpToDate, numFilesSkipped, numFilesMissing, numFilesFailed);
-    }
-
-    return bResult;
-}
-
-struct UnpakParameters
-{
-    typedef AZStd::function<void(bool, const string&)> OnFinishCallback;
-
-    ZipDir::CachePtr m_cache;
-    string m_srcFile;
-    string m_destFolder;
-    OnFinishCallback& m_onFinishCb;
-};
-
-PakManager::ECallResult PakManager::UnzipPakFile(const IConfig* config, const std::vector<RcFile>& sourceFiles, const string& unzipFolder)
-{
-    const string zipDecryptKey = config->GetAsString("zip_encrypt_key", "", "");
-    const int decryptKeySizeInUint32 = 4;
-    uint32 decryptionKey[decryptKeySizeInUint32];
-    if (!zipDecryptKey.empty())
-    {
-        if (!ZipEncryptor::ParseKey(decryptionKey, zipDecryptKey.c_str()))
-        {
-            RCLogError("Misformed zip_encrypt_key: expected 128-bit integer in hexadecimal format (32 character)");
-            return eCallResult_Failed;
-        }
-    }
-
-    ThreadUtils::SimpleThreadPool pool(false);
-    std::vector<UnpakParameters> params;
-    params.reserve(sourceFiles.size());
-    // Don't capture parameters in the lambda so it can be converted to a function pointer. Instead pack everything in a struct that is passed as an argument.
-    auto unpakFunc = [](UnpakParameters* params)
-    {
-        params->m_onFinishCb(params->m_cache->UnpakToDisk(params->m_destFolder), params->m_srcFile);
-    };
-
-    AZStd::mutex progressMutex;
-    size_t currentProgress = 0;
-    UnpakParameters::OnFinishCallback onFinishCb = [&](bool result, const string& srcFile)
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(progressMutex);
-        string msg = (result ? "Finished unpacking file " : "Failed to unpack file ") + srcFile;
-        m_pProgress->ShowProgress(msg.c_str(), ++currentProgress, sourceFiles.size());
-    };
-
-    m_pProgress->StartProgress();
-    for (auto it = sourceFiles.begin(); it != sourceFiles.end(); ++it)
-    {
-        const RcFile& pakFile = *it;
-#if defined(AZ_PLATFORM_WINDOWS)
-        const string pakFilePath = PathHelpers::Join(PathHelpers::ToDosPath(pakFile.m_sourceLeftPath), PathHelpers::ToDosPath(pakFile.m_sourceInnerPathAndName));
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-        const string pakFilePath = PathHelpers::Join(PathHelpers::ToUnixPath(pakFile.m_sourceLeftPath), PathHelpers::ToUnixPath(pakFile.m_sourceInnerPathAndName));
-#endif
-        ZipDir::CacheFactory factory(ZipDir::ZD_INIT_FAST, 0);
-        ZipDir::CachePtr cache = factory.New(pakFilePath.c_str(), zipDecryptKey.empty() ? nullptr : decryptionKey);
-        size_t index = pakFile.m_sourceInnerPathAndName.find(PathHelpers::GetFilename(pakFile.m_sourceInnerPathAndName));
-        if (index == string::npos)
-        {
-            continue;
-        }
-#if defined(AZ_PLATFORM_WINDOWS)
-        const string destFolder = PathHelpers::Join(PathHelpers::ToDosPath(unzipFolder), PathHelpers::ToDosPath(pakFile.m_sourceInnerPathAndName.substr(0, index)));
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-        const string destFolder = PathHelpers::Join(PathHelpers::ToUnixPath(unzipFolder), PathHelpers::ToUnixPath(pakFile.m_sourceInnerPathAndName.substr(0, index)));
-#endif
-        params.emplace_back(UnpakParameters{ cache, pakFilePath, destFolder, onFinishCb });
-        pool.Submit<UnpakParameters>(unpakFunc, &params.back());
-    }
-
-    pool.Start(GetMaxThreads());
-    pool.WaitAllJobs();
-    m_pProgress->FinishProgress();
-    return eCallResult_Succeeded;
-}
diff --git a/Code/Tools/RC/ResourceCompiler/PakManager.h b/Code/Tools/RC/ResourceCompiler/PakManager.h
deleted file mode 100644
index e91a059226..0000000000
--- a/Code/Tools/RC/ResourceCompiler/PakManager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PAKMANAGER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PAKMANAGER_H
-#pragma once
-
-
-#include "ZipDir/ZipDir.h"
-#include "PakSystem.h"
-#include "PakHelpers.h"
-#include "RcFile.h"
-#include "IProgress.h"
-
-struct IResourceCompiler;
-class IConfig;
-
-class PakManager
-{
-public:
-    PakManager(IProgress* pProgress);
-    ~PakManager();
-
-    void RegisterKeys(IResourceCompiler* pRC);
-    IPakSystem* GetPakSystem();
-    bool HasPakFiles() const;
-
-    unsigned GetMaxThreads() const;
-    // -----------------------------------------------
-    enum ECallResult
-    {
-        eCallResult_Skipped,    // functionality didn't apply and has been skipped
-        eCallResult_Succeeded,  // call has been successfull
-        eCallResult_Erroneous,  // call has run and ended, but with minor errors (duplicate CRC etc.)
-        eCallResult_Failed,     // call has failed - pak files are in inconsistent state
-        eCallResult_BadArgs,    // arguments are illformed - pak files have not been touched or changed
-    };
-
-    ECallResult CompileFilesIntoPaks(
-        const IConfig* config,
-        const std::vector<RcFile>& m_allFiles);
-
-    ECallResult DeleteFilesFromPaks(
-        const IConfig* config,
-        const std::vector<string>& deletedTargetFiles);
-
-private:
-    ECallResult SplitListFileToPaks(
-        const IConfig* config,
-        const std::vector<string>& sourceRootsReversed,
-        const std::vector<RcFile>& files,
-        const string& pakFilePath);
-
-    ECallResult CreatePakFile(
-        const IConfig* config,
-        const std::vector<RcFile>& sourceFiles,
-        const string& folderInPak,
-        const string& requestedPakFilename,
-        bool bUpdate);
-
-    ECallResult SynchronizePaks(
-        const IConfig* config,
-        const std::vector<string>& deletedTargetFiles);
-
-    ECallResult UnzipPakFile(
-        const IConfig* config,
-        const std::vector<RcFile>& sourceFiles,
-        const string& unzipFolder); 
-
-private:
-    // All output zip files.
-    std::vector<string> m_zipFiles;
-
-    PakSystem m_pPakSystem;
-    IProgress* m_pProgress;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PAKMANAGER_H
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Common/Clang/rc_clang.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Common/Clang/rc_clang.cmake
deleted file mode 100644
index 61ea1d9cd0..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Common/Clang/rc_clang.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_OPTIONS PRIVATE -fexceptions)
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Common/MSVC/rc_msvc.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Common/MSVC/rc_msvc.cmake
deleted file mode 100644
index 5e03ba77cb..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Common/MSVC/rc_msvc.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_OPTIONS PRIVATE /EHsc)
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Linux/platform_linux.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Linux/platform_linux.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Linux/platform_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Linux/platform_linux_files.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Linux/platform_linux_files.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Linux/platform_linux_files.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Mac/platform_mac.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Mac/platform_mac.cmake
deleted file mode 100644
index 1dbf2b82d7..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Mac/platform_mac.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_TARGET_PROPERTIES
-    BUILD_RPATH "@executable_path/")
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Mac/platform_mac_files.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Mac/platform_mac_files.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Mac/platform_mac_files.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Windows/CrashHandler_Windows.cpp b/Code/Tools/RC/ResourceCompiler/Platform/Windows/CrashHandler_Windows.cpp
deleted file mode 100644
index d33f623fa8..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Windows/CrashHandler_Windows.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-
-#include "ResourceCompiler_precompiled.h"
-#include "CrashHandler_Windows.h"
-
-#include <IConsole.h>
-#include "IResourceCompilerHelper.h"
-
-#include "CryFixedString.h"
-
-#include <DbgHelp.h>
-
-#define DBGHELP_DLL_NAME "dbghelp.dll"
-
-
-//=============================================================================
-CrashHandler::CrashHandler()
-{
-    m_dumpFilename[0] = '\0';
-
-    BusConnect();
-}
-
-//=============================================================================
-CrashHandler::~CrashHandler()
-{
-    BusDisconnect();
-}
-
-//=============================================================================
-bool CrashHandler::OnException(const char* /*message*/)
-{
-    if (m_dumpFilename[0])
-    {
-        WriteMinidump();
-    }
-    return false;   // continue error handler execution
-}
-
-//=============================================================================
-void CrashHandler::SetDumpFile(const char* const dumpFilename)
-{
-    if (dumpFilename && dumpFilename[0])
-    {
-        azstrncpy(m_dumpFilename, AZ_ARRAY_SIZE(m_dumpFilename), dumpFilename, strlen(dumpFilename));
-    }
-}
-
-//=============================================================================
-void CrashHandler::WriteMinidump()
-{
-    // load any version we can.  Win now distributes the dll, and all the functions that are used have been around since winxp
-    HMODULE hDll = LoadLibraryA(DBGHELP_DLL_NAME);
-
-    CryFixedStringT<MAX_PATH + 200> strResult;
-
-    if (hDll)
-    {
-        // based on DbgHelp.h
-        typedef BOOL (WINAPI * MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
-            CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-            CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
-            CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
-
-        MINIDUMPWRITEDUMP pDump = (MINIDUMPWRITEDUMP)::GetProcAddress(hDll, "MiniDumpWriteDump");
-        if (pDump)
-        {
-            {
-                // create the file
-                HANDLE hFile = ::CreateFile(m_dumpFilename, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS,
-                        FILE_ATTRIBUTE_NORMAL, NULL);
-
-                if (hFile != INVALID_HANDLE_VALUE)
-                {
-                    _MINIDUMP_EXCEPTION_INFORMATION ExInfo;
-
-                    ExInfo.ThreadId = ::GetCurrentThreadId();
-                    ExInfo.ExceptionPointers = (PEXCEPTION_POINTERS)AZ::Debug::Trace::GetNativeExceptionInfo();
-                    ExInfo.ClientPointers = NULL;
-
-                    // write the dump
-                    MINIDUMP_TYPE const mdumpValue = (MINIDUMP_TYPE)
-                        (MiniDumpNormal                             // include call stack, thread info, etc
-                         | MiniDumpWithIndirectlyReferencedMemory   // try to find pointers on the stack and dump memory near where they're pointing
-                         | MiniDumpWithDataSegs);                   // dump global variables (like gEnv)
-                    BOOL const bOK = pDump(GetCurrentProcess(), GetCurrentProcessId(), hFile, mdumpValue, &ExInfo, NULL, NULL);
-                    if (bOK)
-                    {
-                        strResult.Format("Saved crash dump file to '%s'", m_dumpFilename);
-                    }
-                    else
-                    {
-                        strResult.Format("Failed to save crash dump file to '%s' (error %d)", m_dumpFilename, GetLastError());
-                    }
-                    ::CloseHandle(hFile);
-                }
-                else
-                {
-                    strResult.Format("Failed to create crash dump file '%s' (error %d)", m_dumpFilename, GetLastError());
-                }
-            }
-        }
-        else
-        {
-            strResult = "Failed to save crash dump file because " DBGHELP_DLL_NAME " is too old";
-        }
-    }
-    else
-    {
-        strResult = "Failed to save crash dump file because " DBGHELP_DLL_NAME " is not found";
-    }
-
-    if (!strResult.empty())
-    {
-        fprintf(stderr, "%s\r\n", strResult.c_str());
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Windows/CrashHandler_Windows.h b/Code/Tools/RC/ResourceCompiler/Platform/Windows/CrashHandler_Windows.h
deleted file mode 100644
index fc9dc64916..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Windows/CrashHandler_Windows.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Based on DebugCallStack code.
-
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CRASHHANDLER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CRASHHANDLER_H
-#pragma once
-
-#include <AzCore/Debug/TraceMessageBus.h>
-
-//!============================================================================
-//!
-//! CrashHandler class
-//! writes minidump files.
-//!
-//!============================================================================
-class CrashHandler : AZ::Debug::TraceMessageBus::Handler
-{
-public:
-    CrashHandler();
-    ~CrashHandler();
-
-    bool OnException(const char* message) override;
-
-    void SetDumpFile(const char* dumpFilename);
-
-private:
-    void WriteMinidump();
-
-    char m_dumpFilename[MAX_PATH];
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CRASHHANDLER_H
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Windows/platform_windows.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Windows/platform_windows.cmake
deleted file mode 100644
index b0ef0c00c9..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Windows/platform_windows.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        psapi.lib
-)
diff --git a/Code/Tools/RC/ResourceCompiler/Platform/Windows/platform_windows_files.cmake b/Code/Tools/RC/ResourceCompiler/Platform/Windows/platform_windows_files.cmake
deleted file mode 100644
index 1a57f310f5..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Platform/Windows/platform_windows_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    CrashHandler_Windows.cpp
-    CrashHandler_Windows.h
-)
diff --git a/Code/Tools/RC/ResourceCompiler/PropertyVars.cpp b/Code/Tools/RC/ResourceCompiler/PropertyVars.cpp
deleted file mode 100644
index 6d6b4fc040..0000000000
--- a/Code/Tools/RC/ResourceCompiler/PropertyVars.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include "PropertyVars.h"
-#include "IRCLog.h"
-#include "StringHelpers.h"
-
-CPropertyVars::CPropertyVars(IResourceCompiler* pRC)
-{
-    m_pRC = pRC;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPropertyVars::SetProperty(const string& name, const string& value)
-{
-    m_properties[StringHelpers::MakeLowerCase(name)] = value;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPropertyVars::RemoveProperty(const string& name)
-{
-    m_properties.erase(StringHelpers::MakeLowerCase(name));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPropertyVars::ClearProperties()
-{
-    m_properties.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPropertyVars::ExpandProperties(string& str) const
-{
-    const string original = str;
-
-    for (;; )
-    {
-        const size_t startpos = str.find("${");
-        if (startpos == str.npos)
-        {
-            return;
-        }
-
-        const size_t endpos = str.find('}', startpos + 2);
-        if (endpos == str.npos)
-        {
-            return;
-        }
-
-        // Find property.
-        const string propName = StringHelpers::MakeLowerCase(str.substr(startpos + 2, endpos - startpos - 2));
-        PropertyMap::const_iterator it = m_properties.find(propName);
-        if (it == m_properties.end())
-        {
-            RCLogError("Error: Unknown property name ${%s} in input string %s", propName.c_str(), original.c_str());
-            return;
-        }
-        const string value = it->second;
-
-        const string last = str;
-        str = str.replace(startpos, endpos - startpos + 1, value);
-
-        // If we did a replacement and the string is still the same we are in an infinite loop.
-        if (str.compare(last) == 0)
-        {
-            RCLogError("Error: Infinite loop with property ${%s} in input string '%s'. Original string '%s'.", propName.c_str(), last.c_str(), original.c_str());
-            return;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPropertyVars::GetProperty(const string& key, string& value) const
-{
-    PropertyMap::const_iterator it = m_properties.find(StringHelpers::MakeLowerCase(key));
-    if (it == m_properties.end())
-    {
-        return false;
-    }
-    value = it->second;
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPropertyVars::HasProperty(const string& key) const
-{
-    return m_properties.find(StringHelpers::MakeLowerCase(key)) != m_properties.end();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPropertyVars::PrintProperties() const
-{
-    for (PropertyMap::const_iterator it = m_properties.begin(); it != m_properties.end(); ++it)
-    {
-        RCLog("  %s \'%s\'", it->first.c_str(), it->second.c_str());
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompiler/PropertyVars.h b/Code/Tools/RC/ResourceCompiler/PropertyVars.h
deleted file mode 100644
index e5a6a39b30..0000000000
--- a/Code/Tools/RC/ResourceCompiler/PropertyVars.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PROPERTYVARS_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PROPERTYVARS_H
-#pragma once
-
-struct IResourceCompiler;
-
-class CPropertyVars
-{
-public:
-    CPropertyVars(IResourceCompiler* pRC);
-
-    void SetProperty(const string& name, const string& value);
-    void RemoveProperty(const string& key);
-    void ClearProperties();
-
-    // Return property.
-    bool GetProperty(const string& name, string& value) const;
-    bool HasProperty(const string& name) const;
-
-    // Expand variables as ${propertyName} with the value of propertyName variable
-    void ExpandProperties(string& str) const;
-
-    void PrintProperties() const;
-
-    // Enumerate properties
-    // Functor takes two arguments: (name, value)
-    template<typename Functor>
-    void Enumerate(const Functor& callback) const
-    {
-        for (PropertyMap::const_iterator it = m_properties.begin(); it != m_properties.end(); ++it)
-        {
-            callback(it->first, it->second);
-        }
-    }
-
-private:
-    typedef std::map<string, string> PropertyMap;
-    PropertyMap m_properties;
-
-    IResourceCompiler* m_pRC;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_PROPERTYVARS_H
diff --git a/Code/Tools/RC/ResourceCompiler/RcFile.h b/Code/Tools/RC/ResourceCompiler/RcFile.h
deleted file mode 100644
index cfec664a5b..0000000000
--- a/Code/Tools/RC/ResourceCompiler/RcFile.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_RCFILE_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_RCFILE_H
-#pragma once
-
-class RcFile
-{
-public:
-    string m_sourceLeftPath;
-    string m_sourceInnerPathAndName;
-    string m_targetLeftPath;
-
-public:
-    RcFile()
-    {
-    }
-
-    RcFile(const string& sourceLeftPath, const string& sourceInnerPathAndName, const string& targetLeftPath)
-        : m_sourceLeftPath(sourceLeftPath)
-        , m_sourceInnerPathAndName(sourceInnerPathAndName)
-        , m_targetLeftPath(targetLeftPath.empty() ? sourceLeftPath : targetLeftPath)
-    {
-    }
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_RCFILE_H
diff --git a/Code/Tools/RC/ResourceCompiler/ResourceCompiler.cpp b/Code/Tools/RC/ResourceCompiler/ResourceCompiler.cpp
deleted file mode 100644
index 54224c661c..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ResourceCompiler.cpp
+++ /dev/null
@@ -1,3335 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : Defines the entry point for the console application.
-
-
-#include "ResourceCompiler_precompiled.h"
-
-#include <time.h>
-#include <stdio.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include "MathHelpers.h"
-#include <psapi.h>       // GetProcessMemoryInfo()
-#endif //AZ_PLATFORM_WINDOWS
-
-#include "ResourceCompiler.h"
-
-#include "Config.h"
-#include "CfgFile.h"
-#include "FileUtil.h"
-#include "IConvertor.h"
-
-#include "CryPath.h"
-#include "StringHelpers.h"
-#include "ListFile.h"
-#include "Util.h"
-#include "ICryXML.h"
-#include "IXMLSerializer.h"
-
-#include "NameConvertor.h"
-#include "CryCrc32.h"
-#include "PropertyVars.h"
-#include "StlUtils.h"
-#include "TextFileReader.h"
-#include "IResourceCompilerHelper.h"
-#include "SettingsManagerHelpers.h"
-#include "CryLibrary.h"
-
-#include <AzCore/Module/Environment.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/CommandLine/CommandLine.h>
-
-#include <AzCore/Debug/Trace.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzCore/Debug/TraceMessagesDrillerBus.h>
-#include <AzCore/base.h>
-#include <AzCore/std/parallel/mutex.h>
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AzCore/std/parallel/thread.h>
-#include <AzCore/std/parallel/binary_semaphore.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Utils/Utils.h>
-
-#include <QThread>
-#include <QApplication>
-#include <AzCore/Memory/AllocatorManager.h>
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-#include <mach-o/dyld.h>  // Needed for _NSGetExecutablePath
-#endif
-
-#pragma comment( lib, "Version.lib" )
-
-const char* const ResourceCompiler::m_filenameRcExe            = "rc.exe";
-const char* const ResourceCompiler::m_filenameRcIni            = "rc.ini";
-const char* const ResourceCompiler::m_filenameOptions          = "rc_options.txt";
-const char* const ResourceCompiler::m_filenameLog              = "rc_log.log";
-const char* const ResourceCompiler::m_filenameLogWarnings      = "rc_log_warnings.log";
-const char* const ResourceCompiler::m_filenameLogErrors        = "rc_log_errors.log";
-const char* const ResourceCompiler::m_filenameCrashDump        = "rc_crash.dmp";
-const char* const ResourceCompiler::m_filenameOutputFileList   = "rc_outputfiles.txt";
-const char* const ResourceCompiler::m_filenameDeletedFileList  = "rc_deletedfiles.txt";
-const char* const ResourceCompiler::m_filenameCreatedFileList  = "rc_createdfiles.txt";
-const char* const ResourceCompiler::m_rcPluginSubfolder        = "rc_plugins";
-
-const size_t ResourceCompiler::s_internalBufferSize;
-const size_t ResourceCompiler::s_environmentBufferSize;
-
-namespace
-{
-    volatile bool g_gotCTRLBreakSignalFromOS = false;
-#if defined(AZ_PLATFORM_WINDOWS)
-    BOOL WINAPI CtrlHandlerRoutine([[maybe_unused]] DWORD dwCtrlType)
-    {
-        // we got this.
-        RCLogError("CTRL-BREAK was pressed!");
-        g_gotCTRLBreakSignalFromOS = true;
-        return TRUE;
-    }
-#else
-    void CtrlHandlerRoutine(int signo)
-    {
-        if (signo == SIGINT)
-        {
-            RCLogError("CTRL-BREAK was pressed!");
-            g_gotCTRLBreakSignalFromOS = true;
-        }
-    }
-#endif
-
-}
-
-// used to intercept asserts during shutdown.
-class AssertInterceptor
-    : public AZ::Debug::TraceMessageBus::Handler
-{
-public:
-    AssertInterceptor()
-    {
-        BusConnect();
-    }
-
-    virtual ~AssertInterceptor()
-    {
-    }
-
-    bool OnAssert(const char* message) override
-    {
-        RCLogWarning("An assert occurred during shutdown!  %s", message);
-        return true;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// ResourceCompiler implementation.
-//////////////////////////////////////////////////////////////////////////
-ResourceCompiler::ResourceCompiler()
-    : m_platformCount(0)
-    , m_bQuiet(false)
-    , m_verbosityLevel(0)
-    , m_numWarnings(0)
-    , m_numErrors(0)
-    , m_memorySizePeakMb(0)
-    , m_pAssetWriter(nullptr)
-    , m_pPakManager(nullptr)
-    , m_currentRcCompileFileInfo(nullptr)
-{
-    // install our ctrl handler by default, before we load system modules.  Unfortunately
-    // some modules may install their own, so we will install ours again after loading perforce and crysystem.
-#if defined(AZ_PLATFORM_WINDOWS)
-    SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandlerRoutine, TRUE);
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-    signal(SIGINT, CtrlHandlerRoutine);
-#endif
-}
-
-ResourceCompiler::~ResourceCompiler()
-{
-    delete m_pPakManager;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::StartProgress()
-{
-    m_progressLastPercent = -1;
-}
-
-void ResourceCompiler::ShowProgress(const char* pMessage, size_t progressValue, size_t maxProgressValue)
-{
-    float percent = (progressValue * 100.0f) / maxProgressValue;
-    if ((percent <= 100.0f) && (percent != m_progressLastPercent))
-    {
-        m_progressLastPercent = percent;
-        char str[1024];
-        azsnprintf(str, sizeof(str), "Progress: %d.%d%% %s", int(percent), int(percent * 10.0f) % 10, pMessage);
-#if defined(AZ_PLATFORM_WINDOWS)
-        SetConsoleTitle(str);
-#else
-        //TODO:: Needs cross platform support.
-#endif
-    }
-}
-
-void ResourceCompiler::FinishProgress()
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    SetConsoleTitle("Progress: 100%");
-#else
-    //TODO:: Needs cross platform support.
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::RegisterConvertor(const char* name, IConvertor* conv)
-{
-    m_extensionManager.RegisterConvertor(name, conv, this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IPakSystem* ResourceCompiler::GetPakSystem()
-{
-    return (m_pPakManager ? m_pPakManager->GetPakSystem() : 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-const ICfgFile* ResourceCompiler::GetIniFile() const
-{
-    return &m_iniFile;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int ResourceCompiler::GetPlatformCount() const
-{
-    return m_platformCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const PlatformInfo* ResourceCompiler::GetPlatformInfo(int index) const
-{
-    if (index < 0 || index > m_platformCount)
-    {
-        AZ_Assert(false, "assert");
-        return 0;
-    }
-    return &m_platforms[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-int ResourceCompiler::FindPlatform(const char* name) const
-{
-    for (int i = 0; i < m_platformCount; ++i)
-    {
-        if (m_platforms[i].HasName(name))
-        {
-            return i;
-        }
-    }
-    return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool ResourceCompiler::AddPlatform(const string& names, bool bBigEndian, int pointerSize)
-{
-    if (m_platformCount >= kMaxPlatformCount)
-    {
-        return false;
-    }
-
-    if (pointerSize != 4 && pointerSize != 8)
-    {
-        return false;
-    }
-
-    std::vector<string> arrNames;
-    StringHelpers::SplitByAnyOf(names, ",; ", false, arrNames);
-
-    if (arrNames.empty() || arrNames.size() > PlatformInfo::kMaxPlatformNames)
-    {
-        return false;
-    }
-
-    PlatformInfo& p = m_platforms[m_platformCount];
-
-    p.Clear();
-
-    for (size_t i = 0; i < arrNames.size(); ++i)
-    {
-        if (!p.SetName(i, arrNames[i].c_str()))
-        {
-            return false;
-        }
-    }
-
-    p.index = m_platformCount++;
-    p.bBigEndian = bBigEndian;
-    p.pointerSize = pointerSize;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* ResourceCompiler::GetLogPrefix() const
-{
-    return m_logPrefix.c_str();
-}
-
-void ResourceCompiler::RemoveOutputFiles()
-{
-    AZ::IO::SystemFile::Delete(FormLogFileName(m_filenameDeletedFileList));
-    AZ::IO::SystemFile::Delete(FormLogFileName(m_filenameCreatedFileList));
-}
-
-static void ThreadFunc(ResourceCompiler::RcCompileFileInfo* data);
-
-class CompileFileThread
-    : public QThread
-{
-public:
-    CompileFileThread(const ResourceCompiler::RcCompileFileInfo& compileInfo)
-        : m_compileInfo(compileInfo)
-    {}
-private:
-    void run()
-    {
-        ThreadFunc(&m_compileInfo);
-    }
-    ResourceCompiler::RcCompileFileInfo m_compileInfo;
-};
-
-static void CompileFilesMultiThreaded(
-    ResourceCompiler* pRC,
-    ResourceCompiler::FilesToConvert& a_files,
-    IConvertor* convertor)
-{
-    AZ_Assert(pRC, "assert");
-
-    bool bLogMemory = false;
-
-    while (!a_files.m_inputFiles.empty())
-    {
-        // Initialize the convertor
-        {
-            ConvertorInitContext initContext;
-            initContext.config = &pRC->GetMultiplatformConfig().getConfig();
-            initContext.inputFiles = a_files.m_inputFiles.empty() ? 0 : &a_files.m_inputFiles[0];
-            initContext.inputFileCount = a_files.m_inputFiles.size();
-            initContext.appRootPath = pRC->GetAppRoot();
-            convertor->Init(initContext);
-        }
-
-        // Initialize the thread data for each thread.
-        ResourceCompiler::RcCompileFileInfo compileInfo;
-        compileInfo.rc = pRC;
-        compileInfo.convertor = convertor;
-        compileInfo.compiler = convertor->CreateCompiler();
-        compileInfo.pFilesToConvert = &a_files;
-        compileInfo.bLogMemory = bLogMemory;
-        compileInfo.bWarningHeaderLine = false;
-        compileInfo.bErrorHeaderLine = false;
-        compileInfo.logHeaderLine = "";
-
-        AZStd::binary_semaphore waiter;
-
-        // Spawn the thread. The old /threads option is no longer supported, and this should remain limited to one thread.
-        // Although this is limited to a single thread, running ThreadFunc on the main thread leads to other issues (LY-85364, LY-85364)
-        // so we should still be creating a new thread here
-        QScopedPointer<CompileFileThread> thread(new CompileFileThread(compileInfo));
-        bool done = false;
-        QObject::connect(thread.data(), &QThread::finished, thread.data(), [&waiter, &done]()
-        {
-            // this makes the app break out of its event loop (below) ASAP.
-            done = true;
-            waiter.release();
-        });
-        thread->start();
-
-        // Wait until the thread has exited
-        while (!done)
-        {
-            // unfortunately the below call to processEvents(...),
-            // even with a 'wait for more events' flag applied, causes it to still use up an entire CPU core
-            // on windows platforms due to implementation details.
-            // To avoid this, we will periodically pump events, but we will also wait on a semaphore to be raised to let us quit instantly
-            // this allows us to spend most of our time with a sleeping main thread, but still instantly exit once the job is done.
-            waiter.try_acquire_for(AZStd::chrono::milliseconds(50));
-            qApp->processEvents(QEventLoop::AllEvents);
-        }
-
-        pRC->FinishProgress();
-
-        AZ_Assert(a_files.m_inputFiles.empty(), "assert");
-
-        // Release the compiler object
-        compileInfo.compiler->Release();
-
-        // Clean up the converter.
-        convertor->DeInit();
-
-        if (!a_files.m_outOfMemoryFiles.empty())
-        {
-            pRC->LogMemoryUsage(false);
-            RCLogError("Run out of memory while processing %i file(s):", (int)a_files.m_outOfMemoryFiles.size());
-            for (int i = 0; i < (int)a_files.m_outOfMemoryFiles.size(); ++i)
-            {
-                const RcFile& rf = a_files.m_outOfMemoryFiles[i];
-                RCLogError(" \"%s\" \"%s\"", rf.m_sourceLeftPath.c_str(), rf.m_sourceInnerPathAndName.c_str());
-            }
-
-            a_files.m_failedFiles.insert(a_files.m_failedFiles.end(), a_files.m_outOfMemoryFiles.begin(), a_files.m_outOfMemoryFiles.end());
-            a_files.m_outOfMemoryFiles.resize(0);
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-typedef std::set<string, stl::less_stricmp<string> > TStringSet;
-// Adds file into vector<RcFile> ensuring that only one sourceInnerPathAndName exists.
-static void AddRcFile(
-    std::vector<RcFile>& files,
-    TStringSet& addedFilenames,
-    const std::vector<string>& sourceRootsReversed,
-    const string& sourceLeftPath,
-    const string& sourceInnerPathAndName,
-    const string& targetLeftPath)
-{
-    if (sourceRootsReversed.size() == 1)
-    {
-        files.push_back(RcFile(sourceLeftPath, sourceInnerPathAndName, targetLeftPath));
-    }
-    else
-    {
-        if (addedFilenames.find(sourceInnerPathAndName) == addedFilenames.end())
-        {
-            files.push_back(RcFile(sourceLeftPath, sourceInnerPathAndName, targetLeftPath));
-            addedFilenames.insert(sourceInnerPathAndName);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::GetSourceRootsReversed(const IConfig* config, std::vector<string>& sourceRootsReversed)
-{
-    const int verbosityLevel = config->GetAsInt("verbose", 0, 1);
-    const string sourceRootsStr = config->GetAsString("sourceroot", "", "");
-
-    std::vector<string> sourceRoots;
-    StringHelpers::Split(sourceRootsStr, ";", true, sourceRoots);
-
-    const size_t sourceRootCount = sourceRoots.size();
-    sourceRootsReversed.resize(sourceRootCount);
-
-    if (verbosityLevel >= 2)
-    {
-        RCLog("Source Roots (%i):", (int)sourceRootCount);
-    }
-
-    for (size_t i = 0; i < sourceRootCount; ++i)
-    {
-        sourceRootsReversed[i] = PathHelpers::GetAbsoluteAsciiPath(sourceRoots[sourceRootCount - 1 - i]);
-        sourceRootsReversed[i] = PathHelpers::ToPlatformPath(sourceRootsReversed[i]);
-
-        if (verbosityLevel >= 3)
-        {
-            RCLog("  [%i]: '%s' (%s)", (int)i, sourceRootsReversed[i].c_str(), sourceRoots[sourceRootCount - 1 - i].c_str());
-        }
-        else if (verbosityLevel >= 2)
-        {
-            RCLog("  [%i]: '%s'", (int)i, sourceRootsReversed[i].c_str());
-        }
-    }
-
-    if (sourceRootsReversed.empty())
-    {
-        sourceRootsReversed.push_back(string());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool ResourceCompiler::CollectFilesToCompile(const string& filespec, std::vector<RcFile>& files)
-{
-    const IConfig* const config = &m_multiConfig.getConfig();
-
-    files.clear();
-
-    const bool bVerbose = GetVerbosityLevel() > 0;
-    const bool bRecursive = config->GetAsBool("recursive", true, true);
-    const bool bSkipMissing = config->GetAsBool("skipmissing", false, true);
-
-    // RC expects source filenames in command line in form
-    // "<source left path><mask for recursion>" or "<source left path><non-masked name>".
-    // After recursive subdirectory scan we will have a list with source filenames in
-    // form "<source left path><source inner path><name>".
-    // The target filename can be written as "<target left path><source inner path><name>".
-
-    // Determine the target output path (may be a different directory structure).
-    // If none is specified, the target path is the same as the <source left path>.
-    const string targetLeftPath = PathHelpers::ToPlatformPath(PathHelpers::CanonicalizePath(config->GetAsString("targetroot", "", "")));
-
-    std::vector<string> sourceRootsReversed;
-    GetSourceRootsReversed(config, sourceRootsReversed);
-
-    const string listFile = PathHelpers::ToPlatformPath(config->GetAsString("listfile", "", ""));
-
-    TStringSet addedFiles;
-    if (!listFile.empty())
-    {
-        const string listFormat = config->GetAsString("listformat", "", "");
-
-        for (size_t i = 0; i < sourceRootsReversed.size(); ++i)
-        {
-            const string& sourceRoot = sourceRootsReversed[i];
-            {
-                std::vector< std::pair<string, string> > filenames;
-
-                CListFile(this).Process(listFile, listFormat, filespec, sourceRoot, filenames);
-
-                for (size_t i2 = 0; i2 < filenames.size(); ++i2)
-                {
-                    AddRcFile(files, addedFiles, sourceRootsReversed, filenames[i2].first, filenames[i2].second, targetLeftPath);
-                }
-            }
-        }
-
-        if (files.empty())
-        {
-            if (!bSkipMissing)
-            {
-                RCLogError("No files to convert found in list file \"%s\" (filter is \"%s\")", listFile.c_str(), filespec.c_str());
-            }
-            return bSkipMissing;
-        }
-
-        if (bVerbose)
-        {
-            RCLog("Contents of the list file \"%s\" (filter is \"%s\"):", listFile.c_str(), filespec.c_str());
-            for (size_t i = 0; i < files.size(); ++i)
-            {
-                RCLog(" %3d: \"%s\" \"%s\"", i, files[i].m_sourceLeftPath.c_str(), files[i].m_sourceInnerPathAndName.c_str());
-            }
-        }
-    }
-    else
-    {
-        bool wildcardSearch = false;
-        // It's a mask (path\*.mask). Scan directory and accumulate matching filenames in the list.
-        // Multiple masks allowed, for example path\*.xml;*.dlg;path2\*.mtl
-
-        std::vector<string> tokens;
-        StringHelpers::Split(filespec, ";", false, tokens);
-
-        for (size_t i = 0; i < sourceRootsReversed.size(); ++i)
-        {
-            const string& sourceRoot = sourceRootsReversed[i];
-            for (size_t t = 0; t < tokens.size(); ++t)
-            {
-                if (tokens[t].find_first_of("*?") != string::npos)
-                {
-                    wildcardSearch = true;
-                    // Scan directory and accumulate matching filenames in the list.
-                    const string path = PathHelpers::ToPlatformPath(PathHelpers::Join(sourceRoot, PathHelpers::GetDirectory(tokens[t])));
-                    const string pattern = PathHelpers::GetFilename(tokens[t]);
-                    RCLog("Scanning directory '%s' for '%s'...", path.c_str(), pattern.c_str());
-                    std::vector<string> filenames;
-                    FileUtil::ScanDirectory(path, pattern, filenames, bRecursive, targetLeftPath);
-                    for (size_t i2 = 0; i2 < filenames.size(); ++i2)
-                    {
-                        string sourceLeftPath;
-                        string sourceInnerPathAndName;
-                        if (sourceRoot.empty())
-                        {
-                            sourceLeftPath = PathHelpers::GetDirectory(tokens[t]);
-                            sourceInnerPathAndName = filenames[i2];
-                        }
-                        else
-                        {
-                            sourceLeftPath = sourceRoot;
-                            sourceInnerPathAndName = PathHelpers::Join(PathHelpers::GetDirectory(tokens[t]), filenames[i2]);
-                        }
-
-                        const DWORD dwFileSpecAttr = GetFileAttributes(PathHelpers::Join(sourceLeftPath, sourceInnerPathAndName));
-                        if (dwFileSpecAttr & FILE_ATTRIBUTE_DIRECTORY)
-                        {
-                            RCLog("Skipping adding file '%s' matched by wildcard '%s' because it is a directory", sourceInnerPathAndName.c_str(), filespec.c_str());
-                        }
-                        else
-                        {
-                            AddRcFile(files, addedFiles, sourceRootsReversed, sourceLeftPath, sourceInnerPathAndName, targetLeftPath);
-                        }
-                    }
-                }
-                else
-                {
-                    const auto& thisFile = tokens[t];
-                    const DWORD dwFileSpecAttr = GetFileAttributes(PathHelpers::Join(sourceRoot, thisFile));
-
-                    if (dwFileSpecAttr == INVALID_FILE_ATTRIBUTES)
-                    {
-                        // There's no such file
-                        RCLog("RC did not find %s in %s", thisFile.c_str(), sourceRoot.c_str());
-                        if (sourceRoot.empty())
-                        {
-                            AddRcFile(files, addedFiles, sourceRootsReversed, PathHelpers::GetDirectory(thisFile), PathHelpers::GetFilename(thisFile), targetLeftPath);
-                        }
-                        else
-                        {
-                            AddRcFile(files, addedFiles, sourceRootsReversed, sourceRoot, thisFile, targetLeftPath);
-                        }
-                    }
-                    else
-                    {
-                        // The file exists
-
-                        if (dwFileSpecAttr & FILE_ATTRIBUTE_DIRECTORY)
-                        {
-                            // We found a file, but it's a directory, not a regular file.
-                            // Let's assume that the user wants to export every file in the
-                            // directory (with subdirectories if bRecursive == true) or
-                            // that he wants to export a file specified in /file option.
-                            const string path = PathHelpers::Join(sourceRoot, thisFile);
-                            const string pattern = config->GetAsString("file", "*.*", "*.*");
-                            RCLog("Scanning directory '%s' for '%s'...", path.c_str(), pattern.c_str());
-                            std::vector<string> filenames;
-                            FileUtil::ScanDirectory(path, pattern, filenames, bRecursive, targetLeftPath);
-                            for (size_t i2 = 0; i2 < filenames.size(); ++i2)
-                            {
-                                string sourceLeftPath;
-                                string sourceInnerPathAndName;
-                                if (sourceRoot.empty())
-                                {
-                                    sourceLeftPath = thisFile;
-                                    sourceInnerPathAndName = filenames[i2];
-                                }
-                                else
-                                {
-                                    sourceLeftPath = sourceRoot;
-                                    sourceInnerPathAndName = PathHelpers::Join(thisFile, filenames[i2]);
-                                }
-                                AddRcFile(files, addedFiles, sourceRootsReversed, sourceLeftPath, sourceInnerPathAndName, targetLeftPath);
-                            }
-                        }
-                        else
-                        {
-                            RCLog("Found %s in %s", thisFile.c_str(), sourceRoot.c_str());
-                            // we found a regular file
-                            if (sourceRoot.empty())
-                            {
-                                AddRcFile(files, addedFiles, sourceRootsReversed, PathHelpers::GetDirectory(thisFile), PathHelpers::GetFilename(thisFile), targetLeftPath);
-                            }
-                            else
-                            {
-                                AddRcFile(files, addedFiles, sourceRootsReversed, sourceRoot, thisFile, targetLeftPath);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (files.empty())
-        {
-            if (wildcardSearch)
-            {
-                // We failed to find any file matching the mask specified by user.
-                // Using mask (say, *.cgf) usually means that user doesn't know if
-                // the file exists or not, so it's better to return "success" code.
-                RCLog("RC can't find files matching '%s', 0 files converted", filespec.c_str());
-                return true;
-            }
-            if (!bSkipMissing)
-            {
-                RCLogError("No files found to convert.");
-            }
-            return bSkipMissing;
-        }
-    }
-
-    // Remove excluded files from the list of files to process.
-    FilterExcludedFiles(files);
-
-    if (files.empty())
-    {
-        if (!bSkipMissing)
-        {
-            RCLogError("No files to convert (all files were excluded by /exclude command).");
-        }
-        return bSkipMissing;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Returns true if successfully converted at least one file
-bool ResourceCompiler::CompileFilesBySingleProcess(const std::vector<RcFile>& files)
-{
-    const IConfig* const config = &m_multiConfig.getConfig();
-    const clock_t compilationStartTime = clock();
-
-    FilesToConvert filesToConvert;
-    filesToConvert.m_allFiles = files;
-
-    if (g_gotCTRLBreakSignalFromOS)
-    {
-        // abort!
-        return false;
-    }
-    bool bRecompress = false;
-    if (config->GetAsBool("recompress", false, false))
-    {
-        RCLog("Recompressing files with fastest decompressor for data");
-        bRecompress = true;
-    }
-    if (config->GetAsBool("copyonly", false, true) || config->GetAsBool("copyonlynooverwrite", false, true))
-    {
-        const string targetroot = PathHelpers::ToPlatformPath(PathHelpers::CanonicalizePath(config->GetAsString("targetroot", "", "")));
-        if (targetroot.empty() && config->GetAsBool("copyonly", false, true))
-        {
-            RCLogError("/copyonly: you must specify /targetroot.");
-            return false;
-        }
-        else if (targetroot.empty() && config->GetAsBool("copyonlynooverwrite", false, true))
-        {
-            RCLogError("/copyonlynooverwrite: you must specify /targetroot.");
-            return false;
-        }
-        CopyFiles(filesToConvert.m_allFiles, config->GetAsBool("copyonlynooverwrite", false, true), bRecompress);
-        if (!config->GetAsBool("outputproductdependencies", false, true))
-        {
-            return true;
-        }
-    }
-    else if (config->GetAsBool("outputproductdependencies", false, true))
-    {
-        RCLogError("/outputproductdependencies: you can only use this argument to output product dependencies for copy jobs.");
-        return false;
-    }
-
-    const PakManager::ECallResult eResult = m_pPakManager->CompileFilesIntoPaks(config, filesToConvert.m_allFiles);
-
-    if (eResult != PakManager::eCallResult_Skipped)
-    {
-        return eResult == PakManager::eCallResult_Succeeded;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    // Split up the files based on the convertor they are to use.
-    typedef std::map<IConvertor*, std::vector<RcFile> > FileConvertorMap;
-    FileConvertorMap fileConvertorMap;
-    for (size_t i = 0; i < filesToConvert.m_allFiles.size(); ++i)
-    {
-        if (g_gotCTRLBreakSignalFromOS)
-        {
-            // abort!
-            return false;
-        }
-
-        string filenameForConvertorSearch;
-        {
-            const string sOverWriteExtension = config->GetAsString("overwriteextension", "", "");
-            if (!sOverWriteExtension.empty())
-            {
-                filenameForConvertorSearch = string("filename.") + sOverWriteExtension;
-            }
-            else
-            {
-                filenameForConvertorSearch = filesToConvert.m_allFiles[i].m_sourceInnerPathAndName;
-            }
-        }
-
-        IConvertor* const convertor = m_extensionManager.FindConvertor(filenameForConvertorSearch.c_str());
-
-        if (!convertor)
-        {
-            // it is an error to fail to find a convertor.
-            RCLogError("Cannot find convertor for %s", filenameForConvertorSearch.c_str());
-            filesToConvert.m_failedFiles.push_back(filesToConvert.m_allFiles[i]);
-            filesToConvert.m_allFiles.erase(filesToConvert.m_allFiles.begin() + i);
-
-            --i;
-            continue;
-        }
-
-        FileConvertorMap::iterator convertorIt = fileConvertorMap.find(convertor);
-        if (convertorIt == fileConvertorMap.end())
-        {
-            convertorIt = fileConvertorMap.insert(std::make_pair(convertor, std::vector<RcFile>())).first;
-        }
-        (*convertorIt).second.push_back(filesToConvert.m_allFiles[i]);
-    }
-
-    if (GetVerbosityLevel() > 0)
-    {
-        RCLog("%d file%s to convert:", filesToConvert.m_allFiles.size(), ((filesToConvert.m_allFiles.size() != 1) ? "s" : ""));
-        for (size_t i = 0; i < filesToConvert.m_allFiles.size(); ++i)
-        {
-            RCLog("  \"%s\"  \"%s\" -> \"%s\"",
-                filesToConvert.m_allFiles[i].m_sourceLeftPath.c_str(),
-                filesToConvert.m_allFiles[i].m_sourceInnerPathAndName.c_str(),
-                filesToConvert.m_allFiles[i].m_targetLeftPath.c_str());
-        }
-        RCLog("");
-    }
-
-    // Loop through all the convertors that we need to invoke.
-    for (FileConvertorMap::iterator convertorIt = fileConvertorMap.begin(); convertorIt != fileConvertorMap.end(); ++convertorIt)
-    {
-        AZ_Assert(filesToConvert.m_inputFiles.empty(), "assert");
-        AZ_Assert(filesToConvert.m_outOfMemoryFiles.empty(), "assert");
-
-        IConvertor* const convertor = (*convertorIt).first;
-        AZ_Assert(convertor, "assert");
-
-        const std::vector<RcFile>& convertorFiles = (*convertorIt).second;
-        AZ_Assert(convertorFiles.size() > 0, "assert");
-
-        // implementation note: we insert filenames starting from last, because converting function will take filenames one by one from the end(!) of the array
-        for (int i = convertorFiles.size() - 1; i >= 0; --i)
-        {
-            filesToConvert.m_inputFiles.push_back(convertorFiles[i]);
-        }
-
-        LogMemoryUsage(false);
-
-        CompileFilesMultiThreaded(this, filesToConvert, convertor);
-
-        AZ_Assert(filesToConvert.m_inputFiles.empty(), "assert");
-        AZ_Assert(filesToConvert.m_outOfMemoryFiles.empty(), "assert");
-    }
-
-    const int numFilesConverted = filesToConvert.m_convertedFiles.size();
-    const int numFilesFailed = filesToConvert.m_failedFiles.size();
-    AZ_Assert(numFilesConverted + numFilesFailed == filesToConvert.m_allFiles.size(), "assert");
-
-    const bool savedTimeLogging = GetTimeLogging();
-    SetTimeLogging(false);
-
-    char szTimeMsg[128];
-    const float secondsElapsed = float(clock() - compilationStartTime) / CLOCKS_PER_SEC;
-    azsnprintf(szTimeMsg, sizeof(szTimeMsg), " in %.1f sec", secondsElapsed);
-
-    RCLog("");
-
-    if (numFilesFailed <= 0)
-    {
-        RCLog("%d file%s processed%s.", numFilesConverted, (numFilesConverted > 1 ? "s" : ""), szTimeMsg);
-        RCLog("");
-    }
-    else
-    {
-        RCLog("");
-        RCLog(
-            "%d of %d file%s were converted%s. Couldn't convert the following file%s:",
-            numFilesConverted,
-            numFilesConverted + numFilesFailed,
-            (numFilesConverted + numFilesFailed > 1 ? "s" : ""),
-            szTimeMsg,
-            (numFilesFailed > 1 ? "s" : ""));
-        RCLog("");
-        for (size_t i = 0; i < numFilesFailed; ++i)
-        {
-            const string failedFilename = PathHelpers::Join(filesToConvert.m_failedFiles[i].m_sourceLeftPath, filesToConvert.m_failedFiles[i].m_sourceInnerPathAndName);
-            RCLog("  %s", failedFilename.c_str());
-        }
-        RCLog("");
-    }
-
-    SetTimeLogging(savedTimeLogging);
-
-    return numFilesConverted > 0;
-}
-
-bool ResourceCompiler::CompileSingleFileBySingleProcess(const char* filename)
-{
-    std::vector<RcFile> list;
-    list.push_back(RcFile("", filename, ""));
-    return CompileFilesBySingleProcess(list);
-}
-
-void ThreadFunc(ResourceCompiler::RcCompileFileInfo* data)
-{
-    AZ_Assert(data, "assert");
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    MathHelpers::EnableFloatingPointExceptions(~(_CW_DEFAULT));
-#endif
-    data->rc->SetComplilingFileInfo(data);
-    data->compiler->BeginProcessing(&data->rc->GetMultiplatformConfig().getConfig());
-
-    while (!data->pFilesToConvert->m_inputFiles.empty())
-    {
-        if (g_gotCTRLBreakSignalFromOS)
-        {
-            RCLogError("Abort was requested during compilation.");
-            data->pFilesToConvert->m_failedFiles.insert(data->pFilesToConvert->m_failedFiles.begin(), data->pFilesToConvert->m_inputFiles.begin(), data->pFilesToConvert->m_inputFiles.end());
-            data->pFilesToConvert->m_inputFiles.clear();
-        }
-
-        enum EResult
-        {
-            eResult_Ok,
-            eResult_Error,
-            eResult_OutOfMemory,
-            eResult_Exception
-        };
-        EResult eResult;
-
-        const RcFile& fileToConvert = data->pFilesToConvert->m_inputFiles.back();
-        if (data->rc->CompileFile())
-        {
-            eResult = eResult_Ok;
-        }
-        else
-        {
-            eResult = eResult_Error;
-        }
-
-        data->pFilesToConvert->m_inputFiles.pop_back();
-
-        switch (eResult)
-        {
-        case eResult_Ok:
-            data->pFilesToConvert->m_convertedFiles.push_back(fileToConvert);
-            break;
-        case eResult_Error:
-            data->pFilesToConvert->m_failedFiles.push_back(fileToConvert);
-            break;
-        case eResult_OutOfMemory:
-            data->rc->LogMemoryUsage(false);
-            RCLogWarning("Run out of memory: \"%s\" \"%s\"", fileToConvert.m_sourceLeftPath.c_str(), fileToConvert.m_sourceInnerPathAndName.c_str());
-            data->pFilesToConvert->m_outOfMemoryFiles.push_back(fileToConvert);
-            break;
-        case eResult_Exception:
-            data->rc->LogMemoryUsage(false);
-            RCLogError("Unknown failure: \"%s\" \"%s\"", fileToConvert.m_sourceLeftPath.c_str(), fileToConvert.m_sourceInnerPathAndName.c_str());
-            data->pFilesToConvert->m_failedFiles.push_back(fileToConvert);
-            break;
-        default:
-            AZ_Assert(false, "assert");
-            break;
-        }
-    }
-
-    data->compiler->EndProcessing();
-    data->rc->SetComplilingFileInfo(nullptr);
-}
-
-
-const char* ResourceCompiler::GetExePath() const
-{
-    return m_exePath.c_str();
-}
-
-const char* ResourceCompiler::GetTmpPath() const
-{
-    return m_tempPath.c_str();
-}
-
-const char* ResourceCompiler::GetInitialCurrentDir() const
-{
-    return m_initialCurrentDir.c_str();
-}
-
-const char* ResourceCompiler::GetAppRoot() const
-{
-    return m_appRoot.c_str();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool ResourceCompiler::CompileFile()
-{
-    if (!m_currentRcCompileFileInfo)
-    {
-        return false;
-    }
-
-    RcCompileFileInfo& compileFileInfo = *m_currentRcCompileFileInfo;
-    const RcFile& fileToConvert = compileFileInfo.pFilesToConvert->m_allFiles.back();
-    const string sourceInnerPath = PathHelpers::GetDirectory(fileToConvert.m_sourceInnerPathAndName);
-    const string sourceFullFileName = PathHelpers::Join(fileToConvert.m_sourceLeftPath, fileToConvert.m_sourceInnerPathAndName);
-    const string targetLeftPath = fileToConvert.m_targetLeftPath;
-    const string targetFullFileName = PathHelpers::Join(targetLeftPath, sourceInnerPath);
-    ICompiler* compiler = compileFileInfo.compiler;
-
-    const bool bMemoryReportProblemsOnly = !compileFileInfo.bLogMemory;
-    LogMemoryUsage(bMemoryReportProblemsOnly);
-
-    MultiplatformConfig localMultiConfig = m_multiConfig;
-    const IConfig* const config = &m_multiConfig.getConfig();
-
-    if (GetVerbosityLevel() >= 2)
-    {
-        RCLog("CompileFile():");
-        RCLog("  sourceFullFileName: '%s'", sourceFullFileName.c_str());
-        RCLog("  targetLeftPath: '%s'", targetLeftPath.c_str());
-        RCLog("  sourceInnerPath: '%s'", sourceInnerPath.c_str());
-        RCLog("  targetPath: '%s'", targetFullFileName.c_str());
-    }
-
-    // Setup conversion context.
-    IConvertContext* const pCC = compiler->GetConvertContext();
-
-    pCC->SetMultiplatformConfig(&localMultiConfig);
-    pCC->SetRC(this);
-
-    {
-        bool bRefresh = config->GetAsBool("refresh", false, true);
-
-        // Force "refresh" to be true if user asked for dialog - it helps a lot
-        // when a command line used, because users very often forget to specify /refresh
-        // in such cases. Also, some tools, including CryTif exporter, call RC without
-        // providing /refresh
-        if (config->GetAsBool("userdialog", false, true))
-        {
-            bRefresh = true;
-        }
-
-        pCC->SetForceRecompiling(bRefresh);
-    }
-
-    {
-        const string sourceExtension = PathHelpers::FindExtension(sourceFullFileName);
-        const string convertorExtension = config->GetAsString("overwriteextension", sourceExtension, sourceExtension);
-        pCC->SetConvertorExtension(convertorExtension);
-    }
-
-    pCC->SetSourceFileNameOnly(PathHelpers::GetFilename(sourceFullFileName));
-    pCC->SetSourceFolder(PathHelpers::GetDirectory(PathHelpers::GetAbsoluteAsciiPath(sourceFullFileName)));
-
-    const string outputFolder = PathHelpers::GetAbsoluteAsciiPath(targetFullFileName.c_str());
-    pCC->SetOutputFolder(outputFolder);
-
-    if (!FileUtil::EnsureDirectoryExists(outputFolder.c_str()))
-    {
-        RCLogError("Creating directory failed: %s", outputFolder.c_str());
-        return false;
-    }
-
-    if (GetVerbosityLevel() >= 0)
-    {
-        RCLog("---------------------------------");
-    }
-
-    if (GetVerbosityLevel() >= 2)
-    {
-        RCLog("sourceFullFileName: '%s'", sourceFullFileName.c_str());
-        RCLog("outputFolder: '%s'", outputFolder.c_str());
-        RCLog("Path='%s'", PathHelpers::CanonicalizePath(sourceInnerPath).c_str());
-        RCLog("File='%s'", PathHelpers::GetFilename(sourceFullFileName).c_str());
-    }
-    else if (GetVerbosityLevel() > 0)
-    {
-        RCLog("Path='%s'", PathHelpers::CanonicalizePath(sourceInnerPath).c_str());
-        RCLog("File='%s'", PathHelpers::GetFilename(sourceFullFileName).c_str());
-    }
-    else if (GetVerbosityLevel() == 0)
-    {
-        const string sourceInnerPathAndName = PathHelpers::AddSeparator(sourceInnerPath) + PathHelpers::GetFilename(sourceFullFileName);
-        RCLog("File='%s'", sourceInnerPathAndName.c_str());
-    }
-
-    // file name changed - print new header for warnings and errors
-    compileFileInfo.bWarningHeaderLine = false;
-    compileFileInfo.bErrorHeaderLine = false;
-    compileFileInfo.logHeaderLine = sourceFullFileName;
-
-    bool bRet;
-    bool createJobs = this->GetMultiplatformConfig().getConfig().GetAsString("createjobs", "", "").empty() == false;
-
-    if (createJobs)
-    {
-        bRet = compiler->CreateJobs();
-
-        if (!bRet)
-        {
-            RCLogError("Failed to create jobs for file %s", sourceFullFileName.c_str());
-        }
-    }
-    else
-    {
-        // Compile file(s)
-        bRet = compiler->Process();
-
-        if (!bRet)
-        {
-            RCLogError("Failed to convert file %s", sourceFullFileName.c_str());
-        }
-    }
-
-    return bRet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::AddInputOutputFilePair(const char* inputFilename, const char* outputFilename)
-{
-    AZ_Assert(outputFilename && outputFilename[0], "assert");
-    AZ_Assert(inputFilename && inputFilename[0], "assert");
-
-    AZStd::lock_guard<AZStd::mutex> lock(m_inputOutputFilesLock);
-
-    m_inputOutputFileList.Add(inputFilename, outputFilename);
-}
-
-void ResourceCompiler::MarkOutputFileForRemoval(const char* outputFilename)
-{
-    AZ_Assert(outputFilename && outputFilename[0], "assert");
-
-    AZStd::lock_guard<AZStd::mutex> lock(m_inputOutputFilesLock);
-
-    // using empty input file name will force CleanTargetFolder(false) to delete the output file
-    m_inputOutputFileList.Add("", outputFilename);
-
-    if (GetVerbosityLevel() > 0)
-    {
-        RCLog("Marking file for removal: %s", outputFilename);
-    }
-}
-
-void ResourceCompiler::LogLine(const IRCLog::EType eType, const char* szText)
-{
-    AZStd::lock_guard<AZStd::mutex> lock(m_logLock);
-
-    if (eType == IRCLog::eType_Warning)
-    {
-        ++m_numWarnings;
-    }
-    else if (eType == IRCLog::eType_Error)
-    {
-        ++m_numErrors;
-    }
-
-    FILE* fLog = 0;
-    if (!m_mainLogFileName.empty())
-    {
-        azfopen(&fLog, m_mainLogFileName.c_str(), "a+t");
-    }
-
-
-    if (m_bQuiet)
-    {
-        if (fLog)
-        {
-            fprintf(fLog, "%s\n", szText);
-            fclose(fLog);
-        }
-        return;
-    }
-
-    char timeString[20];
-    timeString[0] = 0;
-    if (m_bTimeLogging)
-    {
-        const int seconds = int(float((clock() - m_startTime) / CLOCKS_PER_SEC) + 0.5f);
-        const int minutes = seconds / 60;
-        sprintf_s(timeString, "%2d:%02d ", minutes, seconds - (minutes * 60));
-    }
-
-    const char* prefix = "";
-    const char* additionalLogFileName = 0;
-    bool* pbAdditionalLogHeaderLine = 0;
-
-    switch (eType)
-    {
-    case IRCLog::eType_Info:
-        prefix = "   ";
-        break;
-
-    case IRCLog::eType_Warning:
-        prefix = "W: ";
-        if (!m_warningLogFileName.empty())
-        {
-            additionalLogFileName = m_warningLogFileName.c_str();
-            if (m_currentRcCompileFileInfo)
-            {
-                pbAdditionalLogHeaderLine = &m_currentRcCompileFileInfo->bWarningHeaderLine;
-            }
-        }
-        break;
-
-    case IRCLog::eType_Error:
-        prefix = "E: ";
-        if (!m_errorLogFileName.empty())
-        {
-            additionalLogFileName = m_errorLogFileName.c_str();
-            if (m_currentRcCompileFileInfo)
-            {
-                pbAdditionalLogHeaderLine = &m_currentRcCompileFileInfo->bErrorHeaderLine;
-            }
-        }
-        break;
-
-    case IRCLog::eType_Context:
-        prefix = "C: ";
-        break;
-
-    case IRCLog::eType_Summary:
-        prefix = "S: ";
-        break;
-
-    default:
-        AZ_Assert(false, "assert");
-        break;
-    }
-
-    FILE* fAdditionalLog = 0;
-    if (additionalLogFileName)
-    {
-        azfopen(&fAdditionalLog, additionalLogFileName, "a+t");
-    }
-
-    if (fAdditionalLog)
-    {
-        if (pbAdditionalLogHeaderLine && (*pbAdditionalLogHeaderLine == false))
-        {
-            fprintf(fAdditionalLog, "------------------------------------\n");
-            fprintf(fAdditionalLog, "%s%s%s\n", prefix, timeString, m_currentRcCompileFileInfo->logHeaderLine.c_str());
-            *pbAdditionalLogHeaderLine = true;
-        }
-    }
-
-    const char* line = szText;
-    for (;; )
-    {
-        size_t lineLen = 0;
-        while (line[lineLen] && line[lineLen] != '\n')
-        {
-            ++lineLen;
-        }
-
-        if (fAdditionalLog)
-        {
-            fprintf(fAdditionalLog, "%s%s%.*s\n", prefix, timeString, int(lineLen), line);
-        }
-
-        if (fLog)
-        {
-            fprintf(fLog, "%s%s%.*s\n", prefix, timeString, int(lineLen), line);
-        }
-
-        printf("%s%s%.*s\n", prefix, timeString, int(lineLen), line);
-        fflush(stdout);
-
-        line += lineLen;
-        if (*line == '\0')
-        {
-            break;
-        }
-        ++line;
-    }
-
-    if (fAdditionalLog)
-    {
-        fclose(fAdditionalLog);
-        fAdditionalLog = 0;
-    }
-
-    if (fLog)
-    {
-        fclose(fLog);
-        fLog = 0;
-    }
-
-    if (m_bWarningsAsErrors && (eType == IRCLog::eType_Warning || eType == IRCLog::eType_Error))
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        ::MessageBoxA(NULL, szText, "RC Compilation Error", MB_OK | MB_ICONERROR);
-#else
-        //TODO:Implement alert box functionality with an 'ok' button for other platforms
-#endif
-        this->NotifyExitObservers();
-        exit(eRcExitCode_Error);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::LogMultiLine(const char* szText)
-{
-    const char* p = szText;
-    char szLine[80], * pLine = szLine;
-
-    for (;; )
-    {
-        if (*p == '\n' || *p == 0 || (pLine - szLine) >= sizeof(szLine) - (5 + 2 + 1)) // 5 spaces +2 (W: or E:) +1 to avoid nextline jump
-        {
-            *pLine = 0;                                                     // zero termination
-            RCLog("     %s", szLine);                                      // 5 spaces
-            pLine = szLine;
-
-            if (*p == '\n')
-            {
-                ++p;
-                continue;
-            }
-        }
-
-        if (*p == 0)
-        {
-            return;
-        }
-
-        *pLine++ = *p++;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::ShowHelp(const bool bDetailed)
-{
-    RCLog("");
-    RCLog("Usage: RC filespec --platform=<platform> [--Key1=Value1] [--Key2=Value2] etc...");
-
-    if (bDetailed)
-    {
-        RCLog("");
-
-        std::map<string, string>::const_iterator it, end = m_KeyHelp.end();
-
-        for (it = m_KeyHelp.begin(); it != end; ++it)
-        {
-            const string& rKey = it->first;
-            const string& rHelp = it->second;
-
-            // hide internal keys (keys starting from '_')
-            if (!rKey.empty() && rKey[0] != '_')
-            {
-                RCLog("/%s", rKey.c_str());
-                LogMultiLine(rHelp.c_str());
-                RCLog("");
-            }
-        }
-    }
-    else
-    {
-        RCLog("       RC /help             // will list all usable keys with description");
-        RCLog("       RC /help >file.txt   // output help text to file.txt");
-        RCLog("");
-    }
-}
-
-void ResourceCompiler::AddPluginDLL(HMODULE pluginDLL)
-{
-    if (pluginDLL)
-    {
-        m_loadedPlugins.push_back(pluginDLL);
-    }
-}
-
-void ResourceCompiler::RemovePluginDLL(HMODULE pluginDLL)
-{
-    if (pluginDLL)
-    {
-        stl::find_and_erase_if(m_loadedPlugins, [pluginDLL](const HMODULE moduleToCheck) { return moduleToCheck == pluginDLL; });
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::InitPakManager()
-{
-    delete m_pPakManager;
-
-    m_pPakManager = new PakManager(this);
-    m_pPakManager->RegisterKeys(this);
-}
-
-string ResourceCompiler::GetResourceCompilerGenericInfo(const string& newline) const
-{
-    string s;
-    const SFileVersion& v = GetFileVersion();
-
-#if defined(_WIN64)
-    s += "ResourceCompiler  64-bit";
-#else
-    s += "ResourceCompiler  32-bit";
-#endif
-#if defined(_DEBUG)
-    s += "  DEBUG";
-#endif
-    s += newline;
-
-    s += "Platform support: PC";
-#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
-    s += ", " #PublicAuxName3;
-    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-#if defined(TOOLS_SUPPORT_POWERVR)
-    s += ", PowerVR";
-#endif
-#if defined(TOOLS_SUPPORT_ETC2COMP)
-    s += ", etc2Comp";
-#endif
-    s += newline;
-
-    s += StringHelpers::Format("Version %d.%d.%d.%d  %s %s", v.v[3], v.v[2], v.v[1], v.v[0], __DATE__, __TIME__);
-    s += newline;
-
-    s += newline;
-
-    s += "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates.";
-    s += newline;
-
-    s += newline;
-
-    s += "Exe directory:";
-    s += newline;
-    s += StringHelpers::Format("  \"%s\"", GetExePath());
-    s += newline;
-    s += "Temp directory:";
-    s += newline;
-    s += StringHelpers::Format("  \"%s\"", GetTmpPath());
-    s += newline;
-    s += "Current directory:";
-    s += newline;
-    s += StringHelpers::Format("  \"%s\"", GetInitialCurrentDir());
-    s += newline;
-
-    return s;
-}
-
-
-const void ResourceCompiler::GetGenericInfo(
-    char* buffer,
-    size_t bufferSize,
-    const char* rowSeparator) const
-{
-    if (bufferSize <= 0 || buffer == 0)
-    {
-        return;
-    }
-    const string s = GetResourceCompilerGenericInfo(string(rowSeparator));
-    cry_strcpy(buffer, bufferSize, s.c_str());
-}
-
-
-void ResourceCompiler::CopyStringToClipboard(const string& s)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    if (OpenClipboard(NULL))
-    {
-        const HGLOBAL hAllocResult = GlobalAlloc(GMEM_MOVEABLE, s.length() + 1);
-        if (hAllocResult)
-        {
-            const LPTSTR lptstrCopy = (LPTSTR)GlobalLock(hAllocResult);
-            memcpy(lptstrCopy, s.c_str(), s.length() + 1);
-            GlobalUnlock(hAllocResult);
-
-            EmptyClipboard();
-
-            if (::SetClipboardData(CF_TEXT, hAllocResult) == NULL)
-            {
-                GlobalFree(hAllocResult);
-            }
-        }
-        CloseClipboard();
-    }
-#endif
-}
-
-
-bool ResourceCompiler::CheckCommandLineOptions(const IConfig& config, const std::vector<string>* keysToIgnore)
-{
-    std::vector<string> unknownKeys;
-    config.GetUnknownKeys(unknownKeys);
-
-    if (keysToIgnore)
-    {
-        for (size_t i = 0; i < unknownKeys.size(); ++i)
-        {
-            if (std::find(keysToIgnore->begin(), keysToIgnore->end(), StringHelpers::MakeLowerCase(unknownKeys[i])) != keysToIgnore->end())
-            {
-                unknownKeys.erase(unknownKeys.begin() + i);
-                --i;
-            }
-        }
-    }
-
-    if (!unknownKeys.empty())
-    {
-        RCLogWarning("Unknown command-line options (use \"RC /help\"):");
-
-        for (size_t i = 0; i < unknownKeys.size(); ++i)
-        {
-            RCLogWarning("    /%s", unknownKeys[i].c_str());
-        }
-
-        if (config.GetAsBool("failonwarnings", false, true))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::PostBuild()
-{
-    const IConfig* const config = &m_multiConfig.getConfig();
-
-    // Save list of created files.
-    {
-        m_inputOutputFileList.RemoveDuplicates();
-        m_inputOutputFileList.SaveOutputOnly(FormLogFileName(m_filenameCreatedFileList));
-    }
-
-    switch (config->GetAsInt("clean_targetroot", 0, 1))
-    {
-    case 1:
-        CleanTargetFolder(false);
-        break;
-    case 2:
-        CleanTargetFolder(true);
-        break;
-    default:
-        break;
-    }
-
-    const string dependenciesFilename = m_multiConfig.getConfig().GetAsString("dependencies", "", "");
-    if (!dependenciesFilename.empty())
-    {
-        m_inputOutputFileList.RemoveDuplicates();
-        m_inputOutputFileList.Save(dependenciesFilename.c_str());
-    }
-}
-void ResourceCompiler::SetAppRootPath(const string& appRootPath)
-{
-    m_appRoot = appRootPath;
-}
-
-string ResourceCompiler::GetAppRootPathFromGameRoot(const string& gameRootPath)
-{
-    // Since we cannot rely on the current exe path or engine path to determine the app root path since
-    // the RC request could be coming in from an external game, we need to calculate it from the game root path.
-    // Typically, the game root path is one level above the app root (the app root and the engine path is the same
-    // if the game project resides in the engine folder).  If its external, we need the app root for that external
-    // project in order to negotiate communications back to the AP with the right branch token
-    //
-    // Example:
-    // Game root path        :   /LyEngine/MyGame/
-    // Derived app root path :   /LyEngine
-
-    size_t index = gameRootPath.length();
-    if (index == 0)
-    {
-        // Empty string, skip
-        return "";
-    }
-
-    char lastChar = gameRootPath.at(--index);
-    // Skip over any initial path delimiters or spaces (Reduce all trailing '/' for example:  c:\foo\bar\\\ -> c:\foo\bar)
-    while (((lastChar == AZ_CORRECT_FILESYSTEM_SEPARATOR) || (lastChar == AZ_WRONG_FILESYSTEM_SEPARATOR) || (lastChar == ' ')) && index>0)
-    {
-        lastChar = gameRootPath.at(--index);
-    }
-    // Invalid path (may have been '\\\\\\\\')
-    if (index == 0)
-    {
-        return "";
-    }
-
-    // Go to the next path delimeter
-    while (((lastChar != AZ_CORRECT_FILESYSTEM_SEPARATOR) && (lastChar != AZ_WRONG_FILESYSTEM_SEPARATOR)) && index>0)
-    {
-        lastChar = gameRootPath.at(--index);
-    }
-
-    // Invalid path (no path delimiter found after the first group, ie:  c:root\ would not resolve a parent )
-    if (index == 0)
-    {
-        return "";
-    }
-    return gameRootPath.substr(0, index);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::QueryVersionInfo()
-{
-
-    char moduleName[AZ_MAX_PATH_LEN] = {'\0'};
-
-    AZ::Utils::GetExecutablePathReturnType executablePathResult =  AZ::Utils::GetExecutablePath(moduleName,AZ_ARRAY_SIZE(moduleName));
-    switch (executablePathResult.m_pathStored)
-    {
-        case AZ::Utils::ExecutablePathResult::BufferSizeNotLargeEnough:
-            printf("RC QueryVersionInfo(): Buffer size not large enough to store module path");
-            exit(eRcExitCode_FatalError);
-
-        case AZ::Utils::ExecutablePathResult::GeneralError:
-            printf("RC QueryVersionInfo(): fatal error");
-            exit(eRcExitCode_FatalError);
-
-        case AZ::Utils::ExecutablePathResult::Success:
-            m_exePath = moduleName;
-            break;
-
-        default:
-            printf("RC QueryVersionInfo(): unknown error");
-            exit(eRcExitCode_FatalError);
-    }
-
-    if (m_exePath.empty())
-    {
-        printf("RC module name: fatal error");
-        exit(eRcExitCode_FatalError);
-    }
-    m_exePath = PathHelpers::AddSeparator(PathHelpers::GetDirectory(m_exePath));
-
-#if defined(AZ_PLATFORM_WINDOWS)
-
-    DWORD handle;
-    char ver[1024 * 8];
-    const int verSize = GetFileVersionInfoSizeA(moduleName, &handle);
-
-    if (verSize > 0 && verSize <= sizeof(ver))
-    {
-        GetFileVersionInfoA(moduleName, 0, sizeof(ver), ver);
-        VS_FIXEDFILEINFO* vinfo;
-        UINT len;
-        VerQueryValue(ver, "\\", (void**)&vinfo, &len);
-
-        m_fileVersion.v[0] = vinfo->dwFileVersionLS & 0xFFFF;
-        m_fileVersion.v[1] = vinfo->dwFileVersionLS >> 16;
-        m_fileVersion.v[2] = vinfo->dwFileVersionMS & 0xFFFF;
-        m_fileVersion.v[3] = vinfo->dwFileVersionMS >> 16;
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::InitPaths()
-{
-    if (m_exePath.empty())
-    {
-        printf("RC InitPaths(): internal error");
-        exit(eRcExitCode_FatalError);
-    }
-#if defined(AZ_PLATFORM_WINDOWS)
-    // Get wide-character temp path from OS
-    {
-        static const DWORD bufferSize = AZ_MAX_PATH_LEN;
-        wchar_t bufferWchars[bufferSize];
-
-        DWORD resultLength = GetTempPathW(bufferSize, bufferWchars);
-        if ((resultLength >= bufferSize) || (resultLength <= 0))
-        {
-            resultLength = 0;
-        }
-        bufferWchars[resultLength] = 0;
-
-        m_tempPath = PathHelpers::GetAbsoluteAsciiPath(bufferWchars);
-        if (m_tempPath.empty())
-        {
-            m_tempPath = m_exePath;
-        }
-        m_tempPath = PathHelpers::AddSeparator(m_tempPath);
-    }
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-    //The path supplied by the first environment variable found in the
-    //list TMPDIR, TMP, TEMP, TEMPDIR. If none of these are found, "/tmp".
-    //Another possibility is using QTemporaryDir for this work.
-    char const *tmpDir = getenv("TMPDIR");
-    if (tmpDir == 0)
-    {
-        tmpDir = getenv("TMP");
-        if (tmpDir == 0)
-        {
-            tmpDir = getenv("TEMP");
-            if (tmpDir == 0)
-            {
-                tmpDir = getenv("TEMPDIR");
-                if (tmpDir == 0)
-                {
-                    tmpDir = "/tmp";
-                }
-            }
-        }
-    }
-    m_tempPath = tmpDir;
-#else
-    #error Needs implementation!
-#endif
-    m_initialCurrentDir = PathHelpers::GetAbsoluteAsciiPath(".");
-    if (m_initialCurrentDir.empty())
-    {
-        printf("RC InitPaths(): internal error");
-        exit(eRcExitCode_FatalError);
-    }
-    m_initialCurrentDir = PathHelpers::AddSeparator(m_initialCurrentDir);
-
-    // Prepend one level up from rc.exe to the path, so child dlls
-    // can find engine or dependency dlls. -> Prepend so that our directory gets searched first!
-#if defined(AZ_PLATFORM_WINDOWS)
-    char pathEnv[s_environmentBufferSize] = {'\0'};
-    GetEnvironmentVariable("PATH", pathEnv, s_environmentBufferSize);
-
-    string pathEnvNew = m_exePath;
-    pathEnvNew.append("..\\;");
-    pathEnvNew.append(pathEnv);
-
-    SetEnvironmentVariable("PATH", pathEnvNew.c_str());
-
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-    const char * pathEnv = getenv("PATH");
-    string pathEnvNew = pathEnv;
-    pathEnvNew.append(":");
-    pathEnvNew.append(m_exePath);
-    pathEnvNew.append("../");
-    setenv("PATH", pathEnvNew.c_str(), 1);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool ResourceCompiler::LoadIniFile()
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    const string filename = PathHelpers::ToDosPath(m_exePath) + m_filenameRcIni;
-#elif defined(AZ_PLATFORM_MAC)
-    // Handle the case where RC is inside an App Bundle (for the Editor or AssetProcessor)
-    string filename = PathHelpers::ToUnixPath(m_exePath);
-    string::size_type appBundleDirPosition = filename.rfind(".app");
-    if (appBundleDirPosition != string::npos)
-    {
-        // ini file should be in the Resources directory. Doing the substr cuts
-        // off the .app part so add it back in as well.
-        filename = filename.substr(0, appBundleDirPosition);
-        filename += ".app/Contents/Resources/";
-    }
-    filename = filename + m_filenameRcIni;
-#else
-    const string filename = PathHelpers::ToUnixPath(m_exePath) + m_filenameRcIni;
-#endif
-
-    RCLog("Loading \"%s\"", filename.c_str());
-
-    if (!FileUtil::FileExists(filename.c_str()))
-    {
-        RCLogError("Resource compiler .ini file (%s) is missing.", filename.c_str());
-        return false;
-    }
-
-    if (!m_iniFile.Load(filename))
-    {
-        RCLogError("Failed to load resource compiler .ini file (%s).", filename.c_str());
-        return false;
-    }
-
-    RCLog("  Loaded \"%s\"", filename.c_str());
-    RCLog("");
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::Init(Config& config)
-{
-    m_bQuiet = config.GetAsBool("quiet", false, true);
-    m_verbosityLevel = config.GetAsInt("verbose", 0, 1);
-
-    m_bWarningsAsErrors = config.GetAsBool("wx", false, true);
-
-    m_startTime = clock();
-    m_bTimeLogging = false;
-
-    m_bUseFastestDecompressionCodec = config.GetAsBool("use_fastest", false,false);
-
-    InitLogs(config);
-    SetRCLog(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::UnregisterConvertors()
-{
-    m_extensionManager.UnregisterAll();
-
-    // let the before unload functions for all DLLs complete before you unload any of them
-    for (HMODULE pluginDll : m_loadedPlugins)
-    {
-        CryFreeLibrary(pluginDll);
-    }
-
-    m_loadedPlugins.resize(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-MultiplatformConfig& ResourceCompiler::GetMultiplatformConfig()
-{
-    return m_multiConfig;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::SetComplilingFileInfo(RcCompileFileInfo* compileFileInfo)
-{
-    m_currentRcCompileFileInfo = compileFileInfo;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::VerifyKeyRegistration(const char* szKey) const
-{
-    AZ_Assert(szKey, "assert");
-    const string sKey = StringHelpers::MakeLowerCase(string(szKey));
-
-    if (m_KeyHelp.count(sKey) == 0)
-    {
-        RCLogWarning("Key '%s' was not registered, call RegisterKey() before using the key", szKey);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool ResourceCompiler::HasKeyRegistered(const char* szKey) const
-{
-    AZ_Assert(szKey, "assert");
-    const string sKey = StringHelpers::MakeLowerCase(string(szKey));
-
-    return (m_KeyHelp.count(sKey) != 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::RegisterKey(const char* key, const char* helptxt)
-{
-    const string sKey = StringHelpers::MakeLowerCase(string(key));
-
-    AZ_Assert(m_KeyHelp.count(sKey) == 0, "assert");       // registered twice
-
-    m_KeyHelp[sKey] = helptxt;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::InitLogs(Config& config)
-{
-    m_logPrefix.clear();
-    m_logPrefix = config.GetAsString("logprefix", "", "");
-    if (m_logPrefix.empty())
-    {
-        m_logPrefix = m_exePath;
-    }
-
-    {
-        const string logDir = PathHelpers::GetDirectory(m_logPrefix + "unused.name");
-        if (!FileUtil::EnsureDirectoryExists(logDir.c_str()))
-        {
-            RCLogError("Creating directory failed: %s", logDir.c_str());
-        }
-    }
-
-    m_mainLogFileName    = FormLogFileName(m_filenameLog);
-    m_warningLogFileName = FormLogFileName(m_filenameLogWarnings);
-    m_errorLogFileName   = FormLogFileName(m_filenameLogErrors);
-
-    AZ::IO::LocalFileIO().Remove(m_mainLogFileName);
-    AZ::IO::LocalFileIO().Remove(m_warningLogFileName);
-    AZ::IO::LocalFileIO().Remove(m_errorLogFileName);
-
-    //if logfiles is false, disable logging by setting the m_mainLofFileName to empty string
-    if (config.GetAsBool("logfiles", false, true))
-    {
-        m_mainLogFileName = "";
-    }
-}
-
-string ResourceCompiler::FormLogFileName(const char* suffix) const
-{
-    return (suffix && suffix[0]) ? m_logPrefix + suffix : string();
-}
-
-const string& ResourceCompiler::GetMainLogFileName() const
-{
-    return m_mainLogFileName;
-}
-
-const string& ResourceCompiler::GetErrorLogFileName() const
-{
-    return m_errorLogFileName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-clock_t ResourceCompiler::GetStartTime() const
-{
-    return m_startTime;
-}
-
-bool ResourceCompiler::GetTimeLogging() const
-{
-    return m_bTimeLogging;
-}
-
-void ResourceCompiler::SetTimeLogging(bool enable)
-{
-    m_bTimeLogging = enable;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::AddExitObserver(IResourceCompiler::IExitObserver* p)
-{
-    if (p == 0)
-    {
-        return;
-    }
-
-    AZStd::lock_guard<AZStd::mutex> lock(m_exitObserversLock);
-
-    m_exitObservers.push_back(p);
-}
-
-void ResourceCompiler::RemoveExitObserver(IResourceCompiler::IExitObserver* p)
-{
-    if (p == 0)
-    {
-        return;
-    }
-
-    AZStd::lock_guard<AZStd::mutex> lock(m_exitObserversLock);
-
-    for (size_t i = 0; i < m_exitObservers.size(); ++i)
-    {
-        if (m_exitObservers[i] == p)
-        {
-            m_exitObservers.erase(m_exitObservers.begin() + i);
-            return;
-        }
-    }
-}
-
-void ResourceCompiler::NotifyExitObservers()
-{
-    AZStd::lock_guard<AZStd::mutex> lock(m_exitObserversLock);
-
-    for (size_t i = 0; i < m_exitObservers.size(); ++i)
-    {
-        m_exitObservers[i]->OnExit();
-    }
-
-    m_exitObservers.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::LogV(const IRCLog::EType eType, const char* szFormat, va_list args)
-{
-    char str[s_internalBufferSize];
-    azvsnprintf(str, s_internalBufferSize, szFormat, args);
-    str[s_internalBufferSize - 1] = 0;
-
-    // remove non-printable characters except newlines and tabs
-    char* p = str;
-    while (*p)
-    {
-        if ((*p < ' ') && (*p != '\n') && (*p != '\t'))
-        {
-            *p = ' ';
-        }
-        ++p;
-    }
-
-    LogLine(eType, str);
-}
-
-void ResourceCompiler::Log(const IRCLog::EType eType, const char* szMessage)
-{
-    char str[s_internalBufferSize];
-    azstrcpy(str, s_internalBufferSize, szMessage);
-    str[s_internalBufferSize - 1] = 0;
-
-    // remove non-printable characters except newlines and tabs
-    char* p = str;
-    while (*p)
-    {
-        if ((*p < ' ') && (*p != '\n') && (*p != '\t'))
-        {
-            *p = ' ';
-        }
-        ++p;
-    }
-
-    LogLine(eType, str);
-}
-
-namespace
-{
-    struct CheckEmptySourceInnerPathAndName
-    {
-        bool operator()(const RcFile& file) const
-        {
-            return file.m_sourceInnerPathAndName.empty();
-        }
-    };
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::FilterExcludedFiles(std::vector<RcFile>& files)
-{
-    const IConfig* const config = &m_multiConfig.getConfig();
-
-    const bool bVerbose = GetVerbosityLevel() > 1;
-
-    std::vector<string> excludes;
-    {
-        string excludeStr = config->GetAsString("exclude", "", "", eCP_PriorityAll & ~eCP_PriorityJob);
-        if (!excludeStr.empty())
-        {
-            excludeStr = PathHelpers::ToPlatformPath(excludeStr);
-            StringHelpers::Split(excludeStr, ";", false, excludes);
-        }
-
-        excludeStr = config->GetAsString("exclude", "", "", eCP_PriorityJob);
-        if (!excludeStr.empty())
-        {
-            excludeStr = PathHelpers::ToPlatformPath(excludeStr);
-            StringHelpers::Split(excludeStr, ";", false, excludes);
-        }
-
-        if (bVerbose)
-        {
-            excludeStr.clear();
-            for (size_t i = 0; i < excludes.size(); ++i)
-            {
-                if (i > 0)
-                {
-                    excludeStr += ";";
-                }
-                excludeStr += excludes[i];
-            }
-            RCLog("   Exclude: %s", excludeStr.c_str());
-        }
-    }
-
-    std::set<const char*, stl::less_stricmp<const char*> > excludedFiles;
-    std::vector<std::pair<string, string> > excludedStrings;
-    const string excludeListFile = config->GetAsString("exclude_listfile", "", "");
-    if (!excludeListFile.empty())
-    {
-        const string listFormat = config->GetAsString("listformat", "", "");
-        CListFile(this).Process(excludeListFile, listFormat, "*", string(), excludedStrings);
-        const size_t filenameCount = excludedStrings.size();
-        for (size_t i = 0; i < filenameCount; ++i)
-        {
-            string& name = excludedStrings[i].second;
-            name = PathHelpers::ToPlatformPath(name);
-            excludedFiles.insert(name.c_str());
-        }
-    }
-
-    if (excludes.empty() && excludedFiles.empty())
-    {
-        return;
-    }
-
-    string name;
-    for (size_t nFile = 0; nFile < files.size(); ++nFile)
-    {
-        name = files[nFile].m_sourceInnerPathAndName;
-        name = PathHelpers::ToPlatformPath(name);
-
-        if (excludedFiles.find(name.c_str()) != excludedFiles.end())
-        {
-            if (bVerbose)
-            {
-                RCLog("    Excluding file %s by %s", name.c_str(), excludeListFile.c_str());
-            }
-            files[nFile].m_sourceInnerPathAndName.clear();
-            continue;
-        }
-
-        for (size_t i = 0; i < excludes.size(); ++i)
-        {
-            if (StringHelpers::MatchesWildcardsIgnoreCase(name, excludes[i]))
-            {
-                if (bVerbose)
-                {
-                    RCLog("    Excluding file %s by %s", name.c_str(), excludes[i].c_str());
-                }
-                files[nFile].m_sourceInnerPathAndName.clear();
-                break;
-            }
-        }
-    }
-
-    const size_t sizeBefore = files.size();
-    files.erase(std::remove_if(files.begin(), files.end(), CheckEmptySourceInnerPathAndName()), files.end());
-
-    RCLog("Files excluded: %i", sizeBefore - files.size());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::GetFileListRecursively(const ZipDir::FileEntryTree* directory, const AZStd::string& directoryName, AZStd::vector<AZStd::string>& filenames) const
-{
-    //Get all the files in the current directory.
-    ZipDir::FileEntryTree::FileMap::const_iterator iterFile = directory->GetFileBegin();
-    while (iterFile != directory->GetFileEnd())
-    {
-        AZStd::string fullFileName = directoryName.c_str() + AZStd::string(iterFile->first);
-        filenames.push_back(fullFileName);
-        ++iterFile;
-    }
-
-    //Loop through all the directories and recurse all the way to the end.
-    ZipDir::FileEntryTree::SubdirMap::const_iterator iterDir = directory->GetDirBegin();
-    while (iterDir != directory->GetDirEnd())
-    {
-        const ZipDir::FileEntryTree* subDirectory = iterDir->second;
-        AZStd::string fullDirName;
-        if (directoryName.empty())
-        {
-            fullDirName = iterDir->first;
-        }
-        else
-        {
-            fullDirName = directoryName + AZStd::string(iterDir->first);
-        }
-        AzFramework::StringFunc::Path::AppendSeparator(fullDirName);
-        GetFileListRecursively(subDirectory, fullDirName, filenames);
-        ++iterDir;
-    }
-}
-
-bool ResourceCompiler::RecompressFiles(const string& sourceFileName, const string& destinationFileName)
-{
-    RCLog("Recompressing %s to %s", sourceFileName.c_str(), destinationFileName.c_str());
-
-    AZ::IO::FileIOBase* pFileIO = AZ::IO::FileIOBase::GetInstance();
-    if (pFileIO->Exists(destinationFileName.c_str()))
-    {
-        AZ::IO::Result removeResult = pFileIO->Remove(destinationFileName.c_str());
-        if (removeResult.GetResultCode() != AZ::IO::ResultCode::Success)
-        {
-            RCLog("Recompression failed because Failed to remove %s", destinationFileName.c_str());
-            return false;
-        }
-    }
-
-    IPakSystem* pakSystem = GetPakSystem();
-    AZ_Assert(pakSystem != nullptr, "Invalid IPakSystem in RecompressFiles");
-
-    PakSystemArchive* pSourcePAK = pakSystem->OpenArchive(sourceFileName.c_str());
-    PakSystemArchive* pDestinationPAK = pakSystem->OpenArchive(destinationFileName.c_str());
-
-    AZStd::vector<AZStd::string> filesInPAK;
-    if (pSourcePAK && pDestinationPAK)
-    {
-        RCLog("Opened PAK...");
-
-        GetFileListRecursively(pSourcePAK->zip->GetRoot(), "", filesInPAK);
-        RCLog("Got %d files from PAK for recompression", filesInPAK.size());
-
-        bool success = true;
-        for (AZStd::string& fileInsidePak : filesInPAK)
-        {
-            ZipDir::FileEntry* fileEntry = pSourcePAK->zip->FindFile(fileInsidePak.c_str());
-            unsigned int fileSizeCompressed = fileEntry->desc.lSizeCompressed;
-            unsigned int fileSizeUncompressed = fileEntry->desc.lSizeUncompressed;
-
-            char* bufferCompressed = new char[fileSizeCompressed];
-            char* bufferUncompressed = new char[fileSizeUncompressed];
-            ZipDir::ErrorEnum readResult = pSourcePAK->zip->ReadFile(fileEntry, bufferCompressed, bufferUncompressed);
-            delete[] bufferCompressed; //Not needed anymore.
-            if (readResult != ZipDir::ZD_ERROR_SUCCESS)
-            {
-                success = false;
-                delete[] bufferUncompressed;
-                break;// Exit the for loop.
-            }
-            pDestinationPAK->zip->UpdateFile(fileInsidePak.c_str(), bufferUncompressed, fileSizeUncompressed, ZipFile::METHOD_DEFLATE, 1, fileEntry->GetModificationTime());
-            delete[] bufferUncompressed;
-        }
-
-        pakSystem->CloseArchive(pSourcePAK);
-        pakSystem->CloseArchive(pDestinationPAK);
-
-        RCLog("Recompression completed %s", success ? "successfully" : "unsuccessfully");
-
-        _flushall();
-        return success;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void ResourceCompiler::CopyFiles(const std::vector<RcFile>& files, bool bNoOverwrite, bool recompress)
-{
-    const IConfig* const config = &m_multiConfig.getConfig();
-
-    const bool bSkipMissing = config->GetAsBool("skipmissing", false, true);
-    const int srcMaxSize = config->GetAsInt("sourcemaxsize", -1, -1);
-
-    const size_t numFiles = files.size();
-    size_t numFilesCopied = 0;
-    size_t numFilesUpToDate = 0;
-    size_t numFilesSkipped = 0;
-    size_t numFilesMissing = 0;
-    size_t numFilesFailed = 0;
-
-    RCLog("Starting copying %" PRISIZE_T " files", numFiles);
-
-    string progressString;
-    progressString.Format("Copying % " PRISIZE_T " files", numFiles);
-    StartProgress();
-
-    const bool bRefresh = config->GetAsBool("refresh", false, true);
-
-    NameConvertor nc;
-    if (!nc.SetRules(config->GetAsString("targetnameformat", "", "")))
-    {
-        return;
-    }
-
-    for (size_t i = 0; i < numFiles; ++i)
-    {
-        if (g_gotCTRLBreakSignalFromOS)
-        {
-            // abort!
-            return;
-        }
-
-        ShowProgress(progressString.c_str(), i, numFiles);
-
-        string srcFilename = PathHelpers::Join(files[i].m_sourceLeftPath, files[i].m_sourceInnerPathAndName);
-        string trgFilename = PathHelpers::Join(files[i].m_targetLeftPath, files[i].m_sourceInnerPathAndName);
-        if (nc.HasRules())
-        {
-            const string oldFilename = PathHelpers::GetFilename(trgFilename);
-            const string newFilename = nc.GetConvertedName(oldFilename);
-            if (newFilename.empty())
-            {
-                return;
-            }
-            if (!StringHelpers::EqualsIgnoreCase(oldFilename, newFilename))
-            {
-                if (GetVerbosityLevel() >= 2)
-                {
-                    RCLog("Target file name changed: %s -> %s", oldFilename.c_str(), newFilename.c_str());
-                }
-                trgFilename = PathHelpers::Join(PathHelpers::GetDirectory(trgFilename), newFilename);
-            }
-        }
-
-        if (GetVerbosityLevel() > 1)
-        {
-            RCLog("Copying %s to %s", srcFilename.c_str(), trgFilename.c_str());
-        }
-
-        const bool bSourceFileExists = FileUtil::FileExists(srcFilename.c_str());
-        const bool bTargetFileExists = FileUtil::FileExists(trgFilename.c_str());
-
-        if (!bSourceFileExists)
-        {
-            ++numFilesMissing;
-            if (!bSkipMissing)
-            {
-                RCLog("Source file %s does not exist", srcFilename.c_str());
-            }
-            continue;
-        }
-        else
-        {
-            if (!FileUtil::EnsureDirectoryExists(PathHelpers::GetDirectory(trgFilename).c_str()))
-            {
-                RCLog("Failed creating directory for %s", trgFilename.c_str());
-                ++numFilesFailed;
-                RCLog("Failed to copy %s to %s", srcFilename.c_str(), trgFilename.c_str());
-                continue;
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // Compare source and target files modify timestamps.
-            if (bTargetFileExists && FileUtil::FileTimesAreEqual(srcFilename, trgFilename) && !bRefresh)
-            {
-                // Up to date file already exists in target folder
-                ++numFilesUpToDate;
-                AddInputOutputFilePair(srcFilename, trgFilename);
-                continue;
-            }
-            //////////////////////////////////////////////////////////////////////////
-
-            //////////////////////////////////////////////////////////////////////////
-            // no overwrite
-            if (bTargetFileExists && bNoOverwrite && !bRefresh)
-            {
-                // Up to date file already exists in target folder
-                ++numFilesUpToDate;
-                AddInputOutputFilePair(srcFilename, trgFilename);
-                continue;
-            }
-            //////////////////////////////////////////////////////////////////////////
-
-            if (srcMaxSize >= 0)
-            {
-                const int64 fileSize = FileUtil::GetFileSize(srcFilename);
-                if (fileSize > srcMaxSize)
-                {
-                    ++numFilesSkipped;
-                    RCLog("Source file %s is bigger than %d bytes (size is %" PRId64 " ). Skipped.", srcFilename.c_str(), srcMaxSize, fileSize);
-                    AddInputOutputFilePair(srcFilename, trgFilename);
-                    continue;
-                }
-            }
-#if defined(AZ_PLATFORM_WINDOWS)
-            SetFileAttributes(trgFilename, FILE_ATTRIBUTE_ARCHIVE);
-#endif
-            bool bCopied = false;
-            bool didAttemptRecompress = false;
-            if (recompress)
-            {
-                //recompressing only makes sense when source is a PAK file.
-                AZStd::string srcExtension;
-                if (AzFramework::StringFunc::Path::GetExtension(srcFilename.c_str(), srcExtension, false))
-                {
-                    //Case Insensitive compare
-                    if (AzFramework::StringFunc::Equal(srcExtension.c_str(), "pak"))
-                    {
-                        didAttemptRecompress = true;
-                        AZ::IO::LocalFileIO localFileIO;
-                        char szFullPathDir[AZ_MAX_PATH_LEN];
-                        if (localFileIO.ConvertToAbsolutePath(trgFilename, szFullPathDir, sizeof(szFullPathDir)))
-                        {
-                            bCopied = RecompressFiles(srcFilename, szFullPathDir);
-                        }
-                    }
-                }
-            }
-
-            if (!didAttemptRecompress)
-            {
-                AZ::IO::LocalFileIO localFileIO;
-                bCopied = (localFileIO.Copy(srcFilename, trgFilename) != 0);
-            }
-
-            if (bCopied)
-            {
-                ++numFilesCopied;
-#if defined(AZ_PLATFORM_WINDOWS)
-                SetFileAttributes(trgFilename, FILE_ATTRIBUTE_ARCHIVE);
-#endif
-                FileUtil::SetFileTimes(srcFilename, trgFilename);
-            }
-            else
-            {
-                ++numFilesFailed;
-                RCLog("Failed to copy %s to %s", srcFilename.c_str(), trgFilename.c_str());
-            }
-        }
-
-        AddInputOutputFilePair(srcFilename, trgFilename);
-    }
-
-    RCLog("Finished copying %" PRISIZE_T " files: "
-        "%" PRISIZE_T " copied, "
-        "%" PRISIZE_T " up-to-date, "
-        "%" PRISIZE_T " skipped, "
-        "%" PRISIZE_T " missing, "
-        "%" PRISIZE_T " failed",
-        numFiles, numFilesCopied, numFilesUpToDate, numFilesSkipped, numFilesMissing, numFilesFailed);
-}
-
-//////////////////////////////////////////////////////////////////////////
-string ResourceCompiler::FindSuitableSourceRoot(const std::vector<string>& sourceRootsReversed, const string& fileName)
-{
-    if (sourceRootsReversed.empty())
-    {
-        return string();
-    }
-    if (sourceRootsReversed.size() > 1)
-    {
-        for (size_t i = 0; i < sourceRootsReversed.size(); ++i)
-        {
-            const string& sourceRoot = sourceRootsReversed[i];
-            const string fullPath = PathHelpers::Join(sourceRoot, fileName);
-            const DWORD fileAttribs = GetFileAttributes(fullPath);
-            if (fileAttribs == INVALID_FILE_ATTRIBUTES)
-            {
-                continue;
-            }
-            if ((fileAttribs & FILE_ATTRIBUTE_NORMAL) != 0)
-            {
-                return sourceRoot;
-            }
-        }
-    }
-
-    return sourceRootsReversed[0];
-}
-
-//////////////////////////////////////////////////////////////////////////
-typedef std::set<const char*, stl::less_strcmp<const char*> > References;
-
-void ResourceCompiler::ScanForAssetReferences(std::vector<string>& outReferences, const string& refsRoot)
-{
-    const char* const scanRoot = ".";
-
-    RCLog("Scanning for asset references in \"%s\"", scanRoot);
-
-    int numSources = 0;
-
-    References references;
-
-    std::list<string> strings; // storage for all strings
-    std::vector<char*> lines;
-
-    TextFileReader reader;
-
-    std::vector<string> resourceListFiles;
-    FileUtil::ScanDirectory(scanRoot, "auto_resource*.txt", resourceListFiles, true, string());
-    FileUtil::ScanDirectory(scanRoot, "resourcelist.txt", resourceListFiles, true, string());
-    for (size_t i = 0; i < resourceListFiles.size(); ++i)
-    {
-        const string& resourceListFile = resourceListFiles[i];
-        if (reader.Load(resourceListFile.c_str(), lines))
-        {
-            for (size_t j = 0; j < lines.size(); ++j)
-            {
-                const char* const line = lines[j];
-                if (references.find(line) == references.end())
-                {
-                    strings.push_back(line);
-                    references.insert(strings.back().c_str());
-                }
-            }
-            ++numSources;
-        }
-    }
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    if (!usePrefabSystemForLevels)
-    {
-        std::vector<string> levelPaks;
-        FileUtil::ScanDirectory(scanRoot, "level.pak", levelPaks, true, string());
-        for (size_t i = 0; i < levelPaks.size(); ++i)
-        {
-            const string path = PathHelpers::GetDirectory(levelPaks[i].c_str()) + "\\resourcelist.txt";
-            if (reader.LoadFromPak(GetPakSystem(), path, lines))
-            {
-                for (size_t j = 0; j < lines.size(); ++j)
-                {
-                    const char* const line = lines[j];
-                    if (references.find(line) == references.end())
-                    {
-                        strings.push_back(line);
-                        references.insert(strings.back().c_str());
-                    }
-                }
-                ++numSources;
-            }
-        }
-    }
-
-    RCLog("Found %i unique references in %i sources", references.size(), numSources);
-    RCLog("");
-
-    if (refsRoot.empty())
-    {
-        outReferences.insert(outReferences.end(), references.begin(), references.end());
-    }
-    else
-    {
-        // include mipmaps together with referenced dds-textures
-        const string ddsExt("dds");
-        const string cgfExt("cgf");
-        const string chrExt("chr");
-        const string skinExt("skin");
-        char extSuffix[16];
-
-        for (References::iterator it = references.begin(); it != references.end(); ++it)
-        {
-            const string ext = PathHelpers::FindExtension(*it);
-#if defined(AZ_PLATFORM_WINDOWS)
-            const string dosPath = PathHelpers::ToDosPath(*it);
-#else
-            const string dosPath = PathHelpers::ToUnixPath(*it);
-#endif
-
-            if (StringHelpers::EqualsIgnoreCase(ext, ddsExt))
-            {
-                string fullPath;
-                string mipPath;
-                for (int mip = 0;; ++mip)
-                {
-                    azsnprintf(extSuffix, sizeof(extSuffix), ".%i", mip);
-                    fullPath = PathHelpers::Join(refsRoot, dosPath + extSuffix);
-                    if (!FileUtil::FileExists(fullPath.c_str()))
-                    {
-                        break;
-                    }
-                    outReferences.push_back(string(*it) + extSuffix);
-                }
-                for (int mip = 0;; ++mip)
-                {
-                    azsnprintf(extSuffix, sizeof(extSuffix), ".%ia", mip);
-                    fullPath = PathHelpers::Join(refsRoot, dosPath + extSuffix);
-                    if (!FileUtil::FileExists(fullPath.c_str()))
-                    {
-                        break;
-                    }
-                    outReferences.push_back(string(*it) + extSuffix);
-                }
-            }
-            else if (StringHelpers::EqualsIgnoreCase(ext, cgfExt) || StringHelpers::EqualsIgnoreCase(ext, chrExt) || StringHelpers::EqualsIgnoreCase(ext, skinExt))
-            {
-                static const char* const cgfmext = "m";
-
-                string fullPath;
-                fullPath = PathHelpers::Join(refsRoot, dosPath + cgfmext);
-                if (FileUtil::FileExists(fullPath.c_str()))
-                {
-                    outReferences.push_back(string(*it) + cgfmext);
-                }
-            }
-
-            // we are interested only in existing files
-            const string fullPath = PathHelpers::Join(refsRoot, dosPath);
-            if (FileUtil::FileExists(fullPath))
-            {
-                outReferences.push_back(*it);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static bool MatchesWildcardsSet(const string& str, const std::vector<string>& masks)
-{
-    const size_t numMasks = masks.size();
-
-    for (size_t i = 0; i < numMasks; ++i)
-    {
-        if (StringHelpers::MatchesWildcardsIgnoreCase(str, masks[i]))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::SaveAssetReferences(const std::vector<string>& references, const string& filename, const string& includeMasksStr, const string& excludeMasksStr)
-{
-    std::vector<string> includeMasks;
-    StringHelpers::Split(includeMasksStr, ";", false, includeMasks);
-
-    std::vector<string> excludeMasks;
-    StringHelpers::Split(excludeMasksStr, ";", false, excludeMasks);
-
-    FILE* f = nullptr;
-    azfopen(&f, filename.c_str(), "wt");
-    if (!f)
-    {
-        RCLogError("Unable to open %s for writing", filename.c_str());
-        return;
-    }
-
-    for (std::vector<string>::const_iterator it = references.begin(); it != references.end(); ++it)
-    {
-        if (MatchesWildcardsSet(*it, excludeMasks))
-        {
-            continue;
-        }
-
-        if (!includeMasks.empty() && !MatchesWildcardsSet(*it, includeMasks))
-        {
-            continue;
-        }
-        fprintf(f, "%s\n", it->c_str());
-    }
-    fclose(f);
-}
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::CleanTargetFolder(bool bUseOnlyInputFiles)
-{
-    const IConfig* const config = &m_multiConfig.getConfig();
-
-    {
-        const string targetroot = PathHelpers::ToPlatformPath(PathHelpers::CanonicalizePath(config->GetAsString("targetroot", "", "")));
-        if (targetroot.empty())
-        {
-            return;
-        }
-        RCLog("Cleaning target folder %s", targetroot.c_str());
-    }
-
-    CDependencyList inputOutputFileList(m_inputOutputFileList);
-
-    // Look at the list of processed files.
-    {
-        inputOutputFileList.RemoveDuplicates();
-
-        const string filename = FormLogFileName(m_filenameOutputFileList);
-
-        if (FileUtil::FileExists(filename.c_str()))
-        {
-            const size_t oldCount = inputOutputFileList.GetCount();
-            inputOutputFileList.Load(filename);
-            const size_t loadedCount = inputOutputFileList.GetCount() - oldCount;
-            inputOutputFileList.RemoveDuplicates();
-            const size_t addedCount = inputOutputFileList.GetCount() - oldCount;
-            RCLog("%u entries (%u unique) found in list of processed files '%s'", (uint)loadedCount, (uint)addedCount, filename.c_str());
-        }
-        else
-        {
-            RCLog("List of processed files '%s' is not found", filename.c_str());
-        }
-
-        RCLog("%u entries in list of processed files", (uint)inputOutputFileList.GetCount());
-    }
-
-    // Prepare lists of files that were deleted.
-    std::vector<string> deletedSourceFiles;
-    std::vector<string> deletedTargetFiles;
-
-    if (bUseOnlyInputFiles)
-    {
-        for (size_t nInput = 0; nInput < m_inputFilesDeleted.size(); ++nInput)
-        {
-            const string& deletedInputFilename = m_inputFilesDeleted[nInput].m_sourceInnerPathAndName;
-            deletedSourceFiles.push_back(deletedInputFilename);
-            for (size_t i = 0; i < inputOutputFileList.GetCount(); ++i)
-            {
-                const CDependencyList::SFile& of = inputOutputFileList.GetElement(i);
-                if (deletedInputFilename == of.inputFile)
-                {
-                    deletedTargetFiles.push_back(of.outputFile);
-                }
-            }
-        }
-    }
-    else
-    {
-        string lastInputFile;
-        bool bSrcFileExists = false;
-        for (size_t i = 0; i < inputOutputFileList.GetCount(); ++i)
-        {
-            // Check if input file exists
-            const CDependencyList::SFile& of = inputOutputFileList.GetElement(i);
-            if (of.inputFile != lastInputFile)
-            {
-                lastInputFile = of.inputFile;
-                if (FileUtil::FileExists(of.inputFile.c_str()))
-                {
-                    bSrcFileExists = true;
-                }
-                else
-                {
-                    RCLog("Source file deleted: \"%s\"", of.inputFile.c_str());
-                    deletedSourceFiles.push_back(of.inputFile);
-                    bSrcFileExists = false;
-                }
-            }
-            if (!bSrcFileExists)
-            {
-                deletedTargetFiles.push_back(of.outputFile);
-            }
-        }
-    }
-
-    std::sort(deletedSourceFiles.begin(), deletedSourceFiles.end());
-    std::sort(deletedTargetFiles.begin(), deletedTargetFiles.end());
-
-    //////////////////////////////////////////////////////////////////////////
-    // Remove records with matching input filenames
-    inputOutputFileList.RemoveInputFiles(deletedSourceFiles);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Delete target files from disk
-    for (size_t i = 0; i < deletedTargetFiles.size(); ++i)
-    {
-        const string& filename = deletedTargetFiles[i];
-        if (i <= 0 || filename != deletedTargetFiles[i - 1])
-        {
-            RCLog("Deleting file \"%s\"", filename.c_str());
-            AZ::IO::LocalFileIO().Remove(filename.c_str());
-
-        }
-    }
-
-    StartProgress();
-
-    m_pPakManager->DeleteFilesFromPaks(config, deletedTargetFiles);
-
-    {
-        const string filename = FormLogFileName(m_filenameOutputFileList);
-        RCLog("Saving %s", filename.c_str());
-        inputOutputFileList.RemoveDuplicates();
-        inputOutputFileList.Save(filename.c_str());
-    }
-
-    // store deleted files list.
-    {
-        const string filename = FormLogFileName(m_filenameDeletedFileList);
-        RCLog("Saving %s", filename.c_str());
-
-        FILE* f = nullptr;
-        azfopen(&f, filename.c_str(), "wt");
-        if (f)
-        {
-            for (size_t i = 0; i < deletedTargetFiles.size(); ++i)
-            {
-                const string filename2 = CDependencyList::NormalizeFilename(deletedTargetFiles[i].c_str());
-                fprintf(f, "%s\n", filename2.c_str());
-            }
-            fclose(f);
-        }
-        else
-        {
-            RCLogError("Failed to write %s", filename.c_str());
-        }
-    }
-}
-
-class CryXmlCleanup
-{
-public:
-    ~CryXmlCleanup()
-    {
-        if (m_cryXmlModule)
-        {
-            CryFreeLibrary(m_cryXmlModule);
-        }
-    }
-
-    HMODULE m_cryXmlModule = nullptr;
-};
-static CryXmlCleanup g_cryXmlCleanup;
-
-//////////////////////////////////////////////////////////////////////////
-ICryXML* LoadICryXML()
-{
-    HMODULE hXMLLibrary = CryLoadLibraryDefName("CryXML");
-    if (NULL == hXMLLibrary)
-    {
-        RCLogError("Unable to load xml library (CryXML)");
-        return 0;
-    }
-    g_cryXmlCleanup.m_cryXmlModule = hXMLLibrary;
-
-    FnGetICryXML pfnGetICryXML = (FnGetICryXML)CryGetProcAddress(hXMLLibrary, "GetICryXML");
-    if (pfnGetICryXML == 0)
-    {
-        RCLogError("Unable to load xml library (CryXML) - cannot find exported function GetICryXML().");
-        return 0;
-    }
-    return pfnGetICryXML();
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef ResourceCompiler::LoadXml(const char* filename)
-{
-    ICryXML* pCryXML = LoadICryXML();
-    if (!pCryXML)
-    {
-        return 0;
-    }
-
-    // Get the xml serializer.
-    IXMLSerializer* pSerializer = pCryXML->GetXMLSerializer();
-
-    // Read in the input file.
-    XmlNodeRef root;
-    {
-        const bool bRemoveNonessentialSpacesFromContent = false;
-        char szErrorBuffer[1024];
-        root = pSerializer->Read(FileXmlBufferSource(filename), false, sizeof(szErrorBuffer), szErrorBuffer);
-        if (!root)
-        {
-            RCLogError("Failed to load XML file '%s': %s", filename, szErrorBuffer);
-            return 0;
-        }
-    }
-    return root;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef ResourceCompiler::CreateXml(const char* tag)
-{
-    ICryXML* pCryXML = LoadICryXML();
-    if (!pCryXML)
-    {
-        return 0;
-    }
-
-    // Get the xml serializer.
-    IXMLSerializer* pSerializer = pCryXML->GetXMLSerializer();
-
-    XmlNodeRef root;
-    {
-        root = pSerializer->CreateNode(tag);
-        if (!root)
-        {
-            RCLogError("Cannot create new XML node '%s'\n", tag);
-            return 0;
-        }
-    }
-    return root;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int ResourceCompiler::ProcessJobFile()
-{
-    const MultiplatformConfig savedConfig = m_multiConfig;
-    const IConfig* const config = &m_multiConfig.getConfig();
-
-    // Job file is an XML with multiple jobs for the RC
-    const string jobFile = config->GetAsString("job", "", "");
-    if (jobFile.empty())
-    {
-        RCLogError("No job file specified");
-        m_multiConfig = savedConfig;
-        return eRcExitCode_Error;
-    }
-
-    const string runJob = config->GetAsString("jobtarget", "", "");
-    const bool runJobFromCommandLine = !runJob.empty();
-
-    CPropertyVars properties(this);
-
-    properties.SetProperty("_rc_exe_folder", GetExePath());
-    properties.SetProperty("_rc_tmp_folder", GetTmpPath());
-
-    if (GetVerbosityLevel() >= 0)
-    {
-        RCLog("Pre-defined job properties:");
-        properties.PrintProperties();
-    }
-
-    config->CopyToPropertyVars(properties);
-
-    XmlNodeRef root = LoadXml(jobFile.c_str());
-    if (!root)
-    {
-        RCLogError("Failed to load job XML file %s", jobFile.c_str());
-        m_multiConfig = savedConfig;
-        return eRcExitCode_Error;
-    }
-
-    // Check command line with respect to known DefaultProperties
-    {
-        std::vector<string> defaultProperties;
-
-        for (int i = 0; i < root->getChildCount(); ++i)
-        {
-            ExtractJobDefaultProperties(defaultProperties, root->getChild(i));
-        }
-
-        if (!CheckCommandLineOptions(*config, &defaultProperties))
-        {
-            return eRcExitCode_Error;
-        }
-    }
-
-    int result = eRcExitCode_Success;
-
-    for (int i = 0; i < root->getChildCount(); ++i)
-    {
-        XmlNodeRef jobNode = root->getChild(i);
-        const bool runNodes = !runJobFromCommandLine;
-        const int tmpResult = EvaluateJobXmlNode(properties, jobNode, runNodes);
-        if (result == eRcExitCode_Success)
-        {
-            result = tmpResult;
-        }
-    }
-
-    if (runJobFromCommandLine)
-    {
-        const int tmpResult = RunJobByName(properties, root, runJob);
-        if (result == eRcExitCode_Success)
-        {
-            result = tmpResult;
-        }
-    }
-
-    m_multiConfig = savedConfig;
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::ExtractJobDefaultProperties(std::vector<string>& properties, const XmlNodeRef& jobNode)
-{
-    if (jobNode->isTag("DefaultProperties"))
-    {
-        // Attributes are config modifiers.
-        for (int attr = 0; attr < jobNode->getNumAttributes(); ++attr)
-        {
-            const char* key = "";
-            const char* value = "";
-            jobNode->getAttributeByIndex(attr, &key, &value);
-            if (std::find(properties.begin(), properties.end(), key) == properties.end())
-            {
-                properties.push_back(StringHelpers::MakeLowerCase(key));
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int ResourceCompiler::EvaluateJobXmlNode(CPropertyVars& properties, XmlNodeRef& jobNode, bool runJobs)
-{
-    IConfig* const config = &m_multiConfig.getConfig();
-
-    if (g_gotCTRLBreakSignalFromOS)
-    {
-        return eRcExitCode_Error;
-    }
-
-    if (jobNode->isTag("Properties"))
-    {
-        // Attributes are config modifiers.
-        for (int attr = 0; attr < jobNode->getNumAttributes(); attr++)
-        {
-            const char* key = "";
-            const char* value = "";
-            jobNode->getAttributeByIndex(attr, &key, &value);
-            string strValue = value;
-            properties.ExpandProperties(strValue);
-            properties.SetProperty(key, strValue);
-        }
-        return eRcExitCode_Success;
-    }
-
-    // Default properties don't overwrite existing ones (e.g. specified from command line)
-    if (jobNode->isTag("DefaultProperties"))
-    {
-        // Attributes are config modifiers.
-        for (int attr = 0; attr < jobNode->getNumAttributes(); attr++)
-        {
-            const char* key = "";
-            const char* value = "";
-            jobNode->getAttributeByIndex(attr, &key, &value);
-            if (!properties.HasProperty(key))
-            {
-                string strValue = value;
-                properties.ExpandProperties(strValue);
-                properties.SetProperty(key, strValue);
-            }
-        }
-        return eRcExitCode_Success;
-    }
-
-    if (jobNode->isTag("Run"))
-    {
-        if (!runJobs)
-        {
-            return eRcExitCode_Success;
-        }
-
-        const char* jobListName = jobNode->getAttr("Job");
-        if (strlen(jobListName) == 0)
-        {
-            return eRcExitCode_Success;
-        }
-
-        // Attributes are config modifiers.
-        const CPropertyVars previousProperties = properties;
-        for (int attr = 0; attr < jobNode->getNumAttributes(); attr++)
-        {
-            const char* key = "";
-            const char* value = "";
-            jobNode->getAttributeByIndex(attr, &key, &value);
-            string strValue = value;
-            properties.ExpandProperties(strValue);
-            properties.SetProperty(key, strValue);
-        }
-
-        int result = RunJobByName(properties, jobNode, jobListName);
-        properties = previousProperties;
-        return result;
-    }
-
-    if (jobNode->isTag("Include"))
-    {
-        const char* includeFile = jobNode->getAttr("file");
-        if (strlen(includeFile) == 0)
-        {
-            return eRcExitCode_Success;
-        }
-
-        const string jobFile = config->GetAsString("job", "", "");
-        const string includePath = PathHelpers::AddSeparator(PathHelpers::GetDirectory(jobFile)) + includeFile;
-
-        XmlNodeRef root = LoadXml(includePath);
-        if (!root)
-        {
-            RCLogError("Failed to load included job XML file '%s'", includePath.c_str());
-            return eRcExitCode_Error;
-        }
-
-        // Add include sub-nodes
-        XmlNodeRef parent = jobNode->getParent();
-        while (root->getChildCount() != 0)
-        {
-            XmlNodeRef subJobNode = root->getChild(0);
-            root->removeChild(subJobNode);
-            parent->addChild(subJobNode);
-        }
-        return eRcExitCode_Success;
-    }
-
-    // Condition node.
-    if (jobNode->isTag("if") || jobNode->isTag("ifnot"))
-    {
-        bool bIf = false;
-        for (int attr = 0; attr < jobNode->getNumAttributes(); attr++)
-        {
-            const char* key = "";
-            const char* value = "";
-            jobNode->getAttributeByIndex(attr, &key, &value);
-
-            string propValue;
-            properties.GetProperty(key, propValue);
-            if (azstricmp(value, propValue.c_str()) == 0)
-            {
-                // match.
-                bIf = true;
-            }
-        }
-        if (jobNode->isTag("ifnot"))
-        {
-            bIf = !bIf; // Invert
-        }
-        int result = eRcExitCode_Success;
-        if (bIf)
-        {
-            // Exec sub-nodes
-            for (int i = 0; i < jobNode->getChildCount(); i++)
-            {
-                XmlNodeRef subJobNode = jobNode->getChild(i);
-                const int tmpResult = EvaluateJobXmlNode(properties, subJobNode, true);
-                if (result == eRcExitCode_Success)
-                {
-                    result = tmpResult;
-                }
-            }
-        }
-        return result;
-    }
-
-    if (jobNode->isTag("Job"))
-    {
-        RCLog("-------------------------------------------------------------------");
-        string jobLog = "Job: ";
-        // Delete all config entries from previous job.
-        config->ClearPriorityUsage(eCP_PriorityJob);
-
-        bool bCleanTargetRoot = false;
-        string refsSaveFilename;
-        string refsSaveInclude;
-        string refsSaveExclude;
-        string refsRoot;
-
-        // Attributes are config modifiers.
-        for (int attr = 0; attr < jobNode->getNumAttributes(); attr++)
-        {
-            const char* key = "";
-            const char* value = "";
-            jobNode->getAttributeByIndex(attr, &key, &value);
-
-            string valueStr = value;
-            properties.ExpandProperties(valueStr);
-
-            if (azstricmp(key, "input") == 0)
-            {
-                jobLog += string("/") + key + "=" + valueStr + " ";
-                continue;
-            }
-            else if (azstricmp(key, "clean_targetroot") == 0)
-            {
-                bCleanTargetRoot = true;
-                continue;
-            }
-            else if (azstricmp(key, "refs_scan") == 0)
-            {
-                RCLogError("refs_scan is not supported anymore");
-                return eRcExitCode_Error;
-            }
-            else if (azstricmp(key, "refs_save") == 0)
-            {
-                if (valueStr.empty())
-                {
-                    RCLogError("Missing filename in refs_save option");
-                    return eRcExitCode_Error;
-                }
-                refsSaveFilename = valueStr;
-                continue;
-            }
-            else if (azstricmp(key, "refs_root") == 0)
-            {
-                refsRoot = valueStr;
-                continue;
-            }
-            else if (azstricmp(key, "refs_save_include") == 0)
-            {
-                refsSaveInclude = valueStr;
-                continue;
-            }
-            else if (azstricmp(key, "refs_save_exclude") == 0)
-            {
-                refsSaveExclude = valueStr;
-                continue;
-            }
-
-            config->SetKeyValue(eCP_PriorityJob, key, valueStr);
-            jobLog += string("/") + key + "=" + valueStr + " (attribute) ";
-        }
-
-        // Apply properties from RCJob to config
-        properties.Enumerate([config, &jobLog](const string& propName, const string& propVal)
-            {
-                if (config->HasKeyRegistered(propName) && !StringHelpers::EqualsIgnoreCase(propName, "job"))
-                {
-                    config->SetKeyValue(eCP_PriorityProperty, propName, propVal);
-                    jobLog += string("/") + propName + "=" + propVal + " (property) ";
-                }
-            });
-
-        // Check current platform property against start-up platform setting
-        // Reason: This setting cannot be modified after start-up
-        const char* pCurrentPlatform = NULL;
-        if (config->GetKeyValue("platform", pCurrentPlatform) && pCurrentPlatform)
-        {
-            int currentPlatformIndex = FindPlatform(pCurrentPlatform);
-            if (GetMultiplatformConfig().getActivePlatform() != currentPlatformIndex)
-            {
-                RCLogWarning("The platform property '--platform=%s' is ignored because it can only be specified on the command-line", pCurrentPlatform);
-            }
-        }
-
-        string fileSpec = jobNode->getAttr("input");
-        properties.ExpandProperties(fileSpec);
-        if (!fileSpec.empty())
-        {
-            RCLog(jobLog);
-            RemoveOutputFiles();
-            std::vector<RcFile> files;
-            if (CollectFilesToCompile(fileSpec, files) && !files.empty())
-            {
-                bool result = CompileFilesBySingleProcess(files);
-                if (!result)
-                {
-                    RCLogError("Error: Failed to compile files");
-                    return eRcExitCode_Error;
-                }
-            }
-        }
-        else
-        {
-            if (!refsSaveFilename.empty())
-            {
-                properties.ExpandProperties(refsSaveFilename);
-                if (refsSaveFilename.empty())
-                {
-                    RCLogError("Empty filename specified in refs_save option");
-                    return eRcExitCode_Error;
-                }
-
-                properties.ExpandProperties(refsRoot);
-
-                std::vector<string> references;
-                ScanForAssetReferences(references, refsRoot);
-                SaveAssetReferences(references, refsSaveFilename, refsSaveInclude, refsSaveExclude);
-            }
-            if (bCleanTargetRoot)
-            {
-                CleanTargetFolder(false);
-            }
-        }
-        // Delete all config entries from our job.
-        config->ClearPriorityUsage(eCP_PriorityJob | eCP_PriorityProperty);
-        return eRcExitCode_Success;
-    }
-
-    return eRcExitCode_Success;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int ResourceCompiler::RunJobByName(CPropertyVars& properties, XmlNodeRef& anyNode, const char* name)
-{
-    // Find root
-    XmlNodeRef root = anyNode;
-    while (root->getParent())
-    {
-        root = root->getParent();
-    }
-
-    // Find JobList.
-    XmlNodeRef jobListNode = root->findChild(name);
-    if (!jobListNode)
-    {
-        RCLogError("Unable to find job \"%s\"", name);
-        return eRcExitCode_Error;
-    }
-    {
-        // Execute Job sub nodes.
-        int result = eRcExitCode_Success;
-        for (int i = 0; i < jobListNode->getChildCount(); i++)
-        {
-            XmlNodeRef subJobNode = jobListNode->getChild(i);
-            const int tmpResult = EvaluateJobXmlNode(properties, subJobNode, true);
-            if (result == eRcExitCode_Success)
-            {
-                result = tmpResult;
-            }
-        }
-        return result;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ResourceCompiler::LogMemoryUsage(bool bReportProblemsOnly)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    PROCESS_MEMORY_COUNTERS p;
-    ZeroMemory(&p, sizeof(p));
-    p.cb = sizeof(p);
-
-
-    if (!GetProcessMemoryInfo(GetCurrentProcess(), &p, sizeof(p)))
-    {
-        RCLogError("Cannot obtain memory info");
-        return;
-    }
-
-    static const float megabyte = 1024 * 1024;
-    const float peakSizeMb = p.PeakWorkingSetSize / megabyte;
-#if defined(WIN64)
-    static const float warningMemorySizePeakMb =  7500.0f;
-    static const float errorMemorySizePeakMb   = 15500.0f;
-#else
-    static const float warningMemorySizePeakMb =  3100.0f;
-    static const float errorMemorySizePeakMb   =  3600.0f;
-#endif
-
-    bool bReportProblem = false;
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_memorySizeLock);
-        if (peakSizeMb > m_memorySizePeakMb)
-        {
-            m_memorySizePeakMb = peakSizeMb;
-            bReportProblem = (peakSizeMb >= warningMemorySizePeakMb);
-        }
-    }
-
-    if (bReportProblem || !bReportProblemsOnly)
-    {
-        if (peakSizeMb >= warningMemorySizePeakMb)
-        {
-            ((peakSizeMb >= errorMemorySizePeakMb) ? RCLogError : RCLogWarning)(
-                "Memory: working set %.1fMb (peak %.1fMb - DANGER!), pagefile %.1fMb (peak %.1fMb)",
-                p.WorkingSetSize / megabyte, p.PeakWorkingSetSize / megabyte,
-                p.PagefileUsage / megabyte, p.PeakPagefileUsage / megabyte);
-        }
-        else
-        {
-            RCLog(
-                "Memory: working set %.1fMb (peak %.1fMb), pagefile %.1fMb (peak %.1fMb)",
-                p.WorkingSetSize / megabyte, p.PeakWorkingSetSize / megabyte,
-                p.PagefileUsage / megabyte, p.PeakPagefileUsage / megabyte);
-        }
-    }
-#endif
-}
-
-void ResourceCompiler::RegisterDefaultKeys()
-{
-    RegisterKey("_debug", "");   // hidden key for debug-related activities. parsing is module-dependent and subject to change without prior notice.
-
-    RegisterKey("project-path", "Path to project. Used to find files related to the project.");
-    RegisterKey("project-name", R"(Name of the project. It's value is derived from the project.json file "project_name" field.)");
-    RegisterKey("wait",
-        "wait for an user action on start and/or finish of RC:\n"
-        "0-don't wait (default),\n"
-        "1 or empty-wait for a key pressed on finish,\n"
-        "2-pop up a message box and wait for the button pressed on finish,\n"
-        "3-pop up a message box and wait for the button pressed on start,\n"
-        "4-pop up a message box and wait for the button pressed on start and on finish\n");
-    RegisterKey("wx", "pause and display message box in case of warning or error");
-    RegisterKey("recursive", "traverse input directory with sub folders");
-    RegisterKey("refresh", "force recompilation of resources with up to date timestamp");
-    RegisterKey("platform", "to specify platform (for supported names see [_platform] sections in ini)");
-    RegisterKey("pi", "provides the platform id from the Asset Processor");
-    RegisterKey("statistics", "log statistics to rc_stats_* files");
-    RegisterKey("dependencies",
-        "Use it to specify a file with dependencies to be written.\n"
-        "Each line in the file will contain an input filename\n"
-        "and an output filename for every file written by ");
-    RegisterKey("clean_targetroot", "When 'targetroot' switch specified will clean up this folder after rc runs, to delete all files that were not processed");
-    RegisterKey("verbose", "to control amount of information in logs: 0-default, 1-detailed, 2-very detailed, etc");
-    RegisterKey("quiet", "to suppress all printouts");
-    RegisterKey("skipmissing", "do not produce warnings about missing input files");
-    RegisterKey("logfiles", "to suppress generating log file rc_log.log");
-    RegisterKey("logprefix", "prepends this prefix to every log file name used (by default the prefix is the exe's folder).");
-    RegisterKey("logtime", "logs time passed: 0=off, 1=on (default)");
-    RegisterKey("watchfolder", "The watched root folder that this file is located in.  Used to produce the relative asset name.");
-    RegisterKey("nosourcecontrol", "Boolean - if true, disables initialization of source control.  Disabling Source Control in the editor automatically disables it here, too.");
-    RegisterKey("sourceroot", "list of source folders separated by semicolon");
-    RegisterKey("targetroot", "to define the destination folder. note: this folder and its subtrees will be excluded from the source files scanning process");
-    RegisterKey("targetnameformat",
-        "Use it to specify format of the output filenames.\n"
-        "syntax is /targetnameformat=\"<pair[;pair[;pair[...]]]>\" where\n"
-        "<pair> is <mask>,<resultingname>.\n"
-        "<mask> is a name consisting of normal and wildcard chars.\n"
-        "<resultingname> is a name consisting of normal chars and special strings:\n"
-        "{0} filename of a file matching the mask,\n"
-        "{1} part of the filename matching the first wildcard of the mask,\n"
-        "{2} part of the filename matching the second wildcard of the mask,\n"
-        "and so on.\n"
-        "A filename will be processed by first pair that has matching mask.\n"
-        "If no any match for a filename found, then the filename stays\n"
-        "unmodified.\n"
-        "Example: /targetnameformat=\"*alfa*.txt,{1}beta{2}.txt\"");
-    RegisterKey("filesperprocess",
-        "to specify number of files converted by one process in one step\n"
-        "default is 100. this option is unused if /processes is 0.");
-    RegisterKey("failonwarnings", "return error code if warnings are encountered");
-
-    RegisterKey("help", "lists all usable keys of the ResourceCompiler with description");
-    RegisterKey("version", "shows version and exits");
-    RegisterKey("overwriteextension", "ignore existing file extension and use specified convertor");
-    RegisterKey("overwritefilename", "use the filename for output file (folder part is not affected)");
-
-    RegisterKey("listfile", "Specify List file, List file can contain file lists from zip files like: @Levels\\Test\\level.pak|resourcelist.txt");
-    RegisterKey("listformat",
-        "Specify format of the file name read from the list file. You may use special strings:\n"
-        "{0} the file name from the file list,\n"
-        "{1} text matching first wildcard from the input file mask,\n"
-        "{2} text matching second wildcard from the input file mask,\n"
-        "and so on.\n"
-        "Also, you can use multiple format strings, separated by semicolons.\n"
-        "In this case multiple filenames will be generated, one for\n"
-        "each format string.");
-    RegisterKey("copyonly", "copy source files to target root without processing");
-    RegisterKey("copyonlynooverwrite", "copy source files to target root without processing, will not overwrite if target file exists");
-    RegisterKey("outputproductdependencies", "output product dependencies");
-    RegisterKey("name_as_crc32", "When creating Pak File outputs target filename as the CRC32 code without the extension");
-    RegisterKey("exclude", "List of file exclusions for the command, separated by semicolon, may contain wildcard characters");
-    RegisterKey("exclude_listfile", "Specify a file which contains a list of files to be excluded from command input");
-
-    RegisterKey("validate", "When specified RC is running in a resource validation mode");
-    RegisterKey("MailServer", "SMTP Mail server used when RC needs to send an e-mail");
-    RegisterKey("MailErrors", "0=off 1=on When enabled sends an email to the user who checked in asset that failed validation");
-    RegisterKey("cc_email", "When sending mail this address will be added to CC, semicolon separates multiple addresses");
-    RegisterKey("job", "Process a job xml file");
-    RegisterKey("jobtarget", "Run only a job with specific name instead of whole job-file. Used only with /job option");
-    RegisterKey("unittest", "Run the unit tests for resource compiler and nothing else");
-    RegisterKey("unattended", "Prevents RC from opening any dialogs or message boxes");
-    RegisterKey("createjobs", "Instructs RC to read the specified input file (a CreateJobsRequest) and output a CreateJobsResponse");
-    RegisterKey("port", "Specifies the port that should be used to connect to the asset processor.  If not set, the default from the bootstrap cfg will be used instead");
-    RegisterKey("branchtoken", "Specifies a branchtoken that should be used by the RC to negotiate with the asset processor. if not set it will be set from the bootstrap file.");
-    RegisterKey("recompress", "Recompress a pack file during a copy job using the multi-variant process which picks the fastest decompressor");
-    RegisterKey("use_fastest", "Checks every compressor and uses the one that decompresses the data fastest when adding files to a PAK");
-    RegisterKey("skiplevelpaks", "Prevents RC from adding level related pak files to the auxiliary contents during auxiliary content creation step.");
-}
diff --git a/Code/Tools/RC/ResourceCompiler/ResourceCompiler.h b/Code/Tools/RC/ResourceCompiler/ResourceCompiler.h
deleted file mode 100644
index 1b60a6d3ad..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ResourceCompiler.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include "IRCLog.h"
-#include "IResCompiler.h"
-#include "CfgFile.h"
-#include "Config.h"
-#include "DependencyList.h"
-#include "ExtensionManager.h"
-#include "MultiplatformConfig.h"
-#include "PakSystem.h"
-#include "PakManager.h"
-#include "RcFile.h"
-#include "CryVersion.h"
-#include "IProgress.h"
-#include <ISystem.h>
-#include <AzFramework/Archive/Codec.h>
-
-#include <map>                 // stl multimap<>
-#include <AzCore/std/parallel/mutex.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-
-class CPropertyVars;
-class XmlNodeRef;
-class ICryXML;
-ICryXML* LoadICryXML();
-
-/** Implementation of IResCompiler interface.
-*/
-class ResourceCompiler
-    : public IResourceCompiler
-    , public IProgress
-    , public IRCLog
-    , public IConfigKeyRegistry
-{
-public:
-    struct FilesToConvert
-    {
-        std::vector<RcFile> m_allFiles;
-        std::vector<RcFile> m_inputFiles;
-        std::vector<RcFile> m_outOfMemoryFiles;
-        std::vector<RcFile> m_failedFiles;
-        std::vector<RcFile> m_convertedFiles;
-    };
-
-    struct RcCompileFileInfo
-    {
-        ResourceCompiler* rc;
-        FilesToConvert* pFilesToConvert;
-        IConvertor* convertor;
-        ICompiler* compiler;
-
-        bool bLogMemory;
-        bool bWarningHeaderLine;
-        bool bErrorHeaderLine;
-        string logHeaderLine;
-    };
-
-    ResourceCompiler();
-    virtual ~ResourceCompiler();
-
-    //! e.g. print statistics
-    void PostBuild();
-
-    int GetNumWarnings() const {return m_numWarnings; }
-    int GetNumErrors() const {return m_numErrors; }
-
-    // interface IProgress --------------------------------------------------
-
-    void RegisterDefaultKeys();
-
-    virtual void StartProgress();
-    virtual void ShowProgress(const char* pMessage, size_t progressValue, size_t maxProgressValue);
-    virtual void FinishProgress();
-
-    // interface IConfigKeyRegistry ------------------------------------------
-
-    virtual void VerifyKeyRegistration(const char* szKey) const;
-    virtual bool HasKeyRegistered(const char* szKey) const;
-    // -----------------------------------------------------------------------
-
-    // interface IResourceCompiler -------------------------------------------
-
-    virtual void RegisterKey(const char* key, const char* helptxt);
-
-    virtual const char* GetExePath() const;
-    virtual const char* GetTmpPath() const;
-    virtual const char* GetInitialCurrentDir() const;
-    const char* GetAppRoot() const override;
-
-
-    virtual void RegisterConvertor(const char* name, IConvertor* conv);
-
-    void AddPluginDLL(HMODULE pluginDLL);
-    void RemovePluginDLL(HMODULE pluginDLL);
-
-    virtual IPakSystem* GetPakSystem();
-
-    virtual const ICfgFile* GetIniFile() const;
-
-    virtual int GetPlatformCount() const;
-    virtual const PlatformInfo* GetPlatformInfo(int index) const;
-    virtual int FindPlatform(const char* name) const;
-
-    virtual XmlNodeRef LoadXml(const char* filename);
-    virtual XmlNodeRef CreateXml(const char* tag);
-
-    virtual void AddInputOutputFilePair(const char* inputFilename, const char* outputFilename);
-    virtual void MarkOutputFileForRemoval(const char* sOutputFilename);
-
-    virtual void AddExitObserver(IExitObserver* p);
-    virtual void RemoveExitObserver(IExitObserver* p);
-
-    virtual IRCLog* GetIRCLog()
-    {
-        return this;
-    }
-
-    virtual int GetVerbosityLevel() const
-    {
-        return m_verbosityLevel;
-    }
-
-    virtual bool UseFastestDecompressionCodec() const
-    {
-        return m_bUseFastestDecompressionCodec;
-    }
-
-    virtual const SFileVersion& GetFileVersion() const
-    {
-        return m_fileVersion;
-    }
-
-    virtual const void GetGenericInfo(char* buffer, size_t bufferSize, const char* rowSeparator) const;
-    string GetResourceCompilerGenericInfo(const string& newline) const;
-
-    static bool CheckCommandLineOptions(const IConfig& config, const std::vector<string>* keysToIgnore);
-
-    static void CopyStringToClipboard(const string& s);
-
-    virtual bool CompileSingleFileBySingleProcess(const char* filename);
-
-    virtual void SetAssetWriter(IAssetWriter* pAssetWriter)
-    {
-        m_pAssetWriter = pAssetWriter;
-    }
-
-    virtual IAssetWriter* GetAssetWriter() const
-    {
-        return m_pAssetWriter;
-    }
-    // -----------------------------------------------------------------------
-
-    // interface IRCLog ------------------------------------------------------
-
-    virtual void LogV(const IRCLog::EType eType, const char* szFormat, va_list args);
-    virtual void Log(const IRCLog::EType eType, const char* szMessage);
-    // -----------------------------------------------------------------------
-
-    //////////////////////////////////////////////////////////////////////////
-    // Resource compiler implementation.
-    //////////////////////////////////////////////////////////////////////////
-
-    void Init(Config& config);
-    bool LoadIniFile();
-    void UnregisterConvertors();
-
-    bool AddPlatform(const string& names, bool bBigEndian, int pointerSize);
-
-    MultiplatformConfig& GetMultiplatformConfig();
-
-    void SetComplilingFileInfo(RcCompileFileInfo* compileFileInfo);
-
-    bool CollectFilesToCompile(const string& filespec, std::vector<RcFile>& files);
-    bool CompileFilesBySingleProcess(const std::vector<RcFile>& files);
-    int  ProcessJobFile();
-    void RemoveOutputFiles();     // to remove old files for less confusion
-    void CleanTargetFolder(bool bUseOnlyInputFiles);
-
-    bool CompileFile();
-
-    const char* GetLogPrefix() const;
-
-    //! call this if user asks for help
-    void ShowHelp(bool bDetailed);
-    //////////////////////////////////////////////////////////////////////////
-
-    void SetAppRootPath(const string& appRootPath);
-
-    static string GetAppRootPathFromGameRoot(const string& gameRootPath);
-
-    void QueryVersionInfo();
-
-    void InitPaths();
-
-    void NotifyExitObservers();
-
-    void InitLogs(Config& config);
-    string FormLogFileName(const char* suffix) const;
-    const string& GetMainLogFileName() const;
-    const string& GetErrorLogFileName() const;
-
-    clock_t GetStartTime() const;
-    bool GetTimeLogging() const;
-    void SetTimeLogging(bool enable);
-
-    void LogMemoryUsage(bool bReportProblemsOnly);
-
-    void InitPakManager();
-
-    static string FindSuitableSourceRoot(const std::vector<string>& sourceRootsReversed, const string& fileName);
-    static void GetSourceRootsReversed(const IConfig* config, std::vector<string>& sourceRootsReversed);
-
-    void InitSystem(SSystemInitParams& startupParams);
-
-private:
-    void FilterExcludedFiles(std::vector<RcFile>& files);
-
-    void CopyFiles(const std::vector<RcFile>& files, bool bNoOverwrite = false, bool recompress = false);
-    /*!
-      Files discovered at the \p directory node will be added to \p filenames with full path, if other
-      directories are found inside \p directory then more files will be added recursively.
-      \param directory The input directory node
-      \param directoryName Full directory name of \p directory starting from the root directory.
-                           It is expected that only for the root directory this string is "".
-                           This function assumes that if this string is NOT empty, it includes the trailing "\\".
-      \param filenames Output vector where filepaths will be added as files are recursively discovered.
-      \returns void
-    */
-    void GetFileListRecursively(const ZipDir::FileEntryTree* directory, const AZStd::string& directoryName, AZStd::vector<AZStd::string>& filenames) const;
-    bool RecompressFiles(const string& sourceFileName, const string& destinationFileName);
-
-    bool    m_bUseFastestDecompressionCodec;
-
-    void ExtractJobDefaultProperties(std::vector<string>& properties, const XmlNodeRef& jobNode);
-    int  EvaluateJobXmlNode(CPropertyVars& properties, XmlNodeRef& jobNode, bool runJobs);
-    int  RunJobByName(CPropertyVars& properties, XmlNodeRef& anyNode, const char* name);
-
-    void ScanForAssetReferences(std::vector<string>& outReferences, const string& refsRoot);
-    void SaveAssetReferences(const std::vector<string>& references, const string& filename, const string& includeMasks, const string& excludeMasks);
-
-    void LogLine(const IRCLog::EType eType, const char* szText);
-
-    // to log multiple lines (\n separated) with padding before
-    void LogMultiLine(const char* szText);
-
-    // -----------------------------------------------------------------------
-public:
-    static const char* const m_filenameRcExe;
-    static const char* const m_filenameRcIni;
-    static const char* const m_filenameOptions;
-    static const char* const m_filenameLog;
-    static const char* const m_filenameLogWarnings;
-    static const char* const m_filenameLogErrors;
-    static const char* const m_filenameCrashDump;
-    static const char* const m_filenameOutputFileList;  //!< list of source=target filenames that rc processed, used for cleaning target folder
-    static const char* const m_filenameDeletedFileList;
-    static const char* const m_filenameCreatedFileList;
-    static const char* const m_rcPluginSubfolder;       //!< The name of the subfolder where the Resource Compiler plugins are built to relative of rc
-
-    bool m_bQuiet;                                      //!< true= don't log anything to console
-
-private:
-    static const size_t s_internalBufferSize = 4 * 1024;
-    static const size_t s_environmentBufferSize = 64 * 1024;
-
-    enum
-    {
-        kMaxPlatformCount = 20
-    };
-    int m_platformCount;
-    PlatformInfo m_platforms[kMaxPlatformCount];
-
-    ExtensionManager        m_extensionManager;
-
-    IAssetWriter*             m_pAssetWriter;
-
-    AZStd::mutex m_inputOutputFilesLock;
-    CDependencyList         m_inputOutputFileList;
-
-    std::vector<IExitObserver*> m_exitObservers;
-    AZStd::mutex m_exitObserversLock;
-    
-    float                   m_memorySizePeakMb;
-    AZStd::mutex m_memorySizeLock;
-    
-    // log files
-    string                  m_logPrefix;
-    string                  m_mainLogFileName;      //!< for all messages, might be empty (no file logging)
-    string                  m_warningLogFileName;   //!< for warnings only, might be empty (no file logging)
-    string                  m_errorLogFileName;     //!< for errors only, might be empty (no file logging)
-    string                  m_logHeaderLine;
-    AZStd::mutex m_logLock;
-    
-    clock_t                 m_startTime;
-    bool                    m_bTimeLogging;
-
-    float                   m_progressLastPercent;
-    int                     m_verbosityLevel;
-
-    CfgFile                 m_iniFile;
-    MultiplatformConfig     m_multiConfig;
-
-    bool                    m_bWarningHeaderLine;   //!< true= header was already printed, false= header needs to be printed
-    bool                    m_bErrorHeaderLine;     //!< true= header was already printed, false= header needs to be printed
-    bool                    m_bWarningsAsErrors;    //!< true= treat any warning as error.
-
-    RcCompileFileInfo*      m_currentRcCompileFileInfo;
-
-    SFileVersion            m_fileVersion;
-    string                  m_exePath;
-    string                  m_tempPath;
-    string                  m_initialCurrentDir;
-    string                  m_appRoot;
-
-    std::map<string, string> m_KeyHelp;              // [lower key] = help, created from RegisterKey
-
-    // Files to delete
-    std::vector<RcFile>     m_inputFilesDeleted;
-
-    PakManager*             m_pPakManager;
-
-    int                     m_numWarnings;
-    int                     m_numErrors;
-
-    std::vector<HMODULE> m_loadedPlugins;
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    bool                    m_isRunningFromBundle;
-    string                  m_bundleRoot;
-#endif
-};
-
diff --git a/Code/Tools/RC/ResourceCompiler/ResourceCompiler.rc b/Code/Tools/RC/ResourceCompiler/ResourceCompiler.rc
deleted file mode 100644
index b2f6af7583..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ResourceCompiler.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,8,6
- PRODUCTVERSION 1,1,8,6
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Resource Compiler"
-            VALUE "CompanyName", "Amazon.com, Inc."
-            VALUE "FileDescription", "Resource Compiler"
-            VALUE "FileVersion", "1.1.8.6"
-            VALUE "InternalName", "ResourceCompiler"
-            VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
-            VALUE "LegalTrademarks", "Open 3D Engine"
-            VALUE "OriginalFilename", "rc.exe"
-            VALUE "ProductName", "Resource Compiler"
-            VALUE "ProductVersion", "1.1.8.6"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Code/Tools/RC/ResourceCompiler/ResourceCompilerTests.cpp b/Code/Tools/RC/ResourceCompiler/ResourceCompilerTests.cpp
deleted file mode 100644
index 14bfc1e08b..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ResourceCompilerTests.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// ResourceCompilerTest.cpp
-
-#include "ResourceCompiler_precompiled.h"
-#include "IUnitTestHelper.h"
-#include "UnitTestHelper.h"
-#include "IResourceCompilerHelper.h"
-#include "string.h"
-
-namespace ResourceCompilerTests
-{
-    void TestFileTypes(UnitTestHelper* pUnitTestHelper)
-    {
-        //normal cases
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::GetNumSourceImageFormats() == IResourceCompilerHelper::NUM_SOURCE_IMAGE_TYPE);  //should return the enum
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::GetNumEngineImageFormats() == IResourceCompilerHelper::NUM_ENGINE_IMAGE_TYPE);  //should return the enum
-
-        //normal cases
-        pUnitTestHelper->TEST_BOOL(!azstricmp(IResourceCompilerHelper::GetSourceImageFormat(IResourceCompilerHelper::SOURCE_IMAGE_TYPE_TIF, true), ".tif"));  //dot tif
-        pUnitTestHelper->TEST_BOOL(!azstricmp(IResourceCompilerHelper::GetSourceImageFormat(IResourceCompilerHelper::SOURCE_IMAGE_TYPE_TIF, false), "tif"));  //without dot tif
-
-        pUnitTestHelper->TEST_BOOL(!azstricmp(IResourceCompilerHelper::GetSourceImageFormat(IResourceCompilerHelper::SOURCE_IMAGE_TYPE_PNG, true), ".png"));  //dot png
-        pUnitTestHelper->TEST_BOOL(!azstricmp(IResourceCompilerHelper::GetSourceImageFormat(IResourceCompilerHelper::SOURCE_IMAGE_TYPE_PNG, false), "png"));  //without dot png
-
-        //edge cases
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::GetSourceImageFormat(IResourceCompilerHelper::NUM_SOURCE_IMAGE_TYPE, true) == nullptr);         //invalid range with dot
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::GetSourceImageFormat(IResourceCompilerHelper::NUM_SOURCE_IMAGE_TYPE, false) == nullptr);        //invalid range without dot
-
-        //normal cases
-        pUnitTestHelper->TEST_BOOL(!azstricmp(IResourceCompilerHelper::GetEngineImageFormat(IResourceCompilerHelper::ENGINE_IMAGE_TYPE_DDS, true), ".dds"));  //dot dds
-        pUnitTestHelper->TEST_BOOL(!azstricmp(IResourceCompilerHelper::GetEngineImageFormat(IResourceCompilerHelper::ENGINE_IMAGE_TYPE_DDS, false), "dds"));  //without dot dds
-
-        //edge cases
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::GetEngineImageFormat(IResourceCompilerHelper::NUM_ENGINE_IMAGE_TYPE, true) == nullptr);         //invalid range with dot
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::GetEngineImageFormat(IResourceCompilerHelper::NUM_ENGINE_IMAGE_TYPE, false) == nullptr);        //invalid range without dot
-
-        //normal cases
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("somefile.tga") == true);          //file name
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("somefile.dds") == false);         //unsupported file name
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("blah/blah/some.png") == true);    //full file name
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("blah/blah/some.dds") == false);   //unsupported full file names
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("tga") == true);                   //no dot
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported(".tga") == true);                  //with dot
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported(".TGA") == true);                  //with dot case insensitive
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("Png") == true);                   //without case insensitive
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("gifs") == false);                 //extra characters not supported
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("Targa") == false);                //names not supported
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("dds") == false);                  //invalid format
-
-        //edge cases
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported("") == false);                     //empty string
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsSourceImageFormatSupported(nullptr) == false);                //nullptr
-
-        //normal cases
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("somefile.dds") == true);            //file name
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("somefile.gif") == false);           //unsupported file name
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("blah/blah/some.dds") == true);      //full file name
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("blah/blah/some.png") == false);     //unsupported full file names
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("dds") == true);                     //no dot
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported(".dds") == true);                    //with dot
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported(".DDs") == true);                    //with dot case insensitive
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("ddS") == true);                     //without case insensitive
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("ddSs") == false);                    //extra characters not supported
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("Direct Draw Surface") == false);    //names not supported
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("gif") == false);                    //invalid format
-
-        //edge cases
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported("") == false);                       //empty string
-        pUnitTestHelper->TEST_BOOL(IResourceCompilerHelper::IsGameImageFormatSupported(nullptr) == false);                  //nullptr
-    }
-
-    void Run(UnitTestHelper* pUnitTestHelper)
-    {
-        TestFileTypes(pUnitTestHelper);
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompiler/ResourceCompiler_precompiled.cpp b/Code/Tools/RC/ResourceCompiler/ResourceCompiler_precompiled.cpp
deleted file mode 100644
index 9fe4648996..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ResourceCompiler_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
diff --git a/Code/Tools/RC/ResourceCompiler/ResourceCompiler_precompiled.h b/Code/Tools/RC/ResourceCompiler/ResourceCompiler_precompiled.h
deleted file mode 100644
index b2c86261e3..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ResourceCompiler_precompiled.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// Description : include file for standard system include files,
-
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-
-#pragma once
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <CryCommon/platform.h>
-
-#include <CryCommon/IXml.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-// Standard C headers.
-#include <direct.h>
-#include <tchar.h>
-#define WIN32_EXTRA_LEAN
-#include <windows.h>
-#endif
-
-// STL headers.
-#include <vector>
-#include <list>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-
-//////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////
-
-
-#include <stdio.h>
-
-
-#define VC_EXTRALEAN
-
-
-//#include <StlDbgAlloc.h>
-// to make smoother transition back from cry to std namespace...
-#define cry std
-#define CRY_AS_STD
-
-#include <CryCommon/smartptr.h>
-
-//////////////////////////////////////////////////////////////////////////
-#include "ConvertContext.h"
-
-#include <CryCommon/Cry_Math.h>
-#include <CryCommon/primitives.h>
-#include <CryCommon/CryHeaders.h>
-#include <CryCommon/CryVersion.h>
-
-#include "CryCommon/StlUtils.h"
-
diff --git a/Code/Tools/RC/ResourceCompiler/SimpleString.h b/Code/Tools/RC/ResourceCompiler/SimpleString.h
deleted file mode 100644
index a42a83e9d3..0000000000
--- a/Code/Tools/RC/ResourceCompiler/SimpleString.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_SIMPLESTRING_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_SIMPLESTRING_H
-#pragma once
-
-#include <cstring>      // memcpy()
-
-// Implementation note: we cannot use name CSimpleString because it is already used by ATL
-class SimpleString
-{
-public:
-    SimpleString()
-        : m_str((char*)0)
-        , m_length(0)
-    {
-    }
-
-    explicit SimpleString(const char* s)
-        : m_str((char*)0)
-        , m_length(0)
-    {
-        *this = s;
-    }
-
-    SimpleString(const SimpleString& str)
-        : m_str((char*)0)
-        , m_length(0)
-    {
-        *this = str;
-    }
-
-    ~SimpleString()
-    {
-        if (m_str)
-        {
-            delete [] m_str;
-        }
-    }
-
-    SimpleString& operator=(const SimpleString& str)
-    {
-        if (this != &str)
-        {
-            *this = str.m_str;
-        }
-        return *this;
-    }
-
-    SimpleString& operator=(const char* s)
-    {
-        char* const oldStr = m_str;
-        m_str = (char*)0;
-        m_length = 0;
-        if (s && s[0])
-        {
-            m_length = strlen(s);
-            m_str = new char[m_length + 1];
-            memcpy(m_str, s, m_length + 1);
-        }
-        if (oldStr)
-        {
-            delete [] oldStr;
-        }
-        return *this;
-    }
-
-    operator const char*() const
-    {
-        return c_str();
-    }
-
-    const char* c_str() const
-    {
-        return (m_str) ? m_str : "";
-    }
-
-    size_t length() const
-    {
-        return m_length;
-    }
-
-private:
-    char* m_str;
-    size_t m_length;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_SIMPLESTRING_H
diff --git a/Code/Tools/RC/ResourceCompiler/Tests/ResourceCompilerTestHelper.h b/Code/Tools/RC/ResourceCompiler/Tests/ResourceCompilerTestHelper.h
deleted file mode 100644
index c24f3cfca3..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Tests/ResourceCompilerTestHelper.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/Memory/AllocatorScope.h>
-#include <AzCore/Memory/OSAllocator.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AzTest/AzTest.h>
-
-
-class ResourceCompilerTestEnvironment
-    : public AZ::Test::ITestEnvironment
-{
-public:
-    virtual ~ResourceCompilerTestEnvironment(){}
-
-protected:
-    void SetupEnvironment() override
-    {
-        m_allocatorScope.ActivateAllocators();
-        AZ::IO::FileIOBase::SetInstance(nullptr); // The API requires the old instance to be destroyed first
-        AZ::IO::FileIOBase::SetInstance(new AZ::IO::LocalFileIO());
-    }
-
-    void TeardownEnvironment() override
-    {
-        m_allocatorScope.DeactivateAllocators();
-    }
-    AZ::AllocatorScope<AZ::OSAllocator, AZ::SystemAllocator, AZ::LegacyAllocator, CryStringAllocator> m_allocatorScope;
-};
diff --git a/Code/Tools/RC/ResourceCompiler/Tests/ZipEncryptorTests.cpp b/Code/Tools/RC/ResourceCompiler/Tests/ZipEncryptorTests.cpp
deleted file mode 100644
index 4a42383ecb..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Tests/ZipEncryptorTests.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzTest/AzTest.h>
-#include "ZipEncryptor.h"
-
-TEST(ResourceCompilerZipEncryptorTest, ParseKey_InputTooShort_ReturnFalse_FT)
-{
-    uint32 key[4];
-    EXPECT_FALSE(ZipEncryptor::ParseKey(key, "Not32HexCharacters"));
-}
-
-TEST(ResourceCompilerZipEncryptorTest, ParseKey_ValidKey_ReturnTrue_FT)
-{
-    uint32 key[4];
-    EXPECT_TRUE(ZipEncryptor::ParseKey(key, "123456789012345678901234567890AB"));
-    EXPECT_EQ(key[0], 1450741931);
-    EXPECT_EQ(key[1], 2022707764);
-    EXPECT_EQ(key[2], 2417112150);
-    EXPECT_EQ(key[3], 305419896);
-}
-
-TEST(ResourceCompilerZipEncryptorTest, ParseKey_InvalidInputV1_ReturnFalse_FT)
-{
-    uint32 key[4];
-    EXPECT_FALSE(ZipEncryptor::ParseKey(key, "1234567890Z1345678901234567890AB"));
-    // Error text will be @Pos 11                       ^ HERE. Invalid Hex value
-}
-
-TEST(ResourceCompilerZipEncryptorTest, ParseKey_InvalidInputV2_ReturnFalse_FT)
-{
-    uint32 key[4];
-    EXPECT_FALSE(ZipEncryptor::ParseKey(key, "12345678901Z345678901234567890AB"));
-    // Error text will be @Pos 12                        ^ HERE. Invalid Hex value
-}
diff --git a/Code/Tools/RC/ResourceCompiler/Tests/test_Main.cpp b/Code/Tools/RC/ResourceCompiler/Tests/test_Main.cpp
deleted file mode 100644
index 693146c20b..0000000000
--- a/Code/Tools/RC/ResourceCompiler/Tests/test_Main.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include <ResourceCompiler.h>
-#include <AzTest/AzTest.h>
-#include <AzCore/Memory/AllocatorScope.h>
-#include <AzCore/Memory/OSAllocator.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <Utils/Utils.h>
-#include <AzFramework/IO/LocalFileIO.h>
-#include <fstream>
-
-class ResourceCompilerTestEnvironment
-    : public AZ::Test::ITestEnvironment
-{
-public:
-    virtual ~ResourceCompilerTestEnvironment()
-    {}
-
-protected:
-    void SetupEnvironment() override
-    {
-        m_allocatorScope.ActivateAllocators();
-        AZ::IO::FileIOBase::SetInstance(nullptr); // The API requires the old instance to be destroyed first
-        AZ::IO::FileIOBase::SetInstance(new AZ::IO::LocalFileIO());
-    }
-
-    void TeardownEnvironment() override
-    {
-        m_allocatorScope.DeactivateAllocators();
-    }
-    AZ::AllocatorScope<AZ::OSAllocator, AZ::SystemAllocator, AZ::LegacyAllocator, CryStringAllocator> m_allocatorScope;
-};
-
-AZ_UNIT_TEST_HOOK(new ResourceCompilerTestEnvironment)
-
-TEST(CollectFilesTest, CollectFiles_PatternWithAndWithoutWildcards_Success)
-{
-    UnitTest::ScopedTemporaryDirectory tempDir;
-
-    AZStd::string tempRoot;
-
-    AZ::StringFunc::Path::Join(tempDir.GetDirectory(), "root", tempRoot);
-    AZ::IO::LocalFileIO::GetInstance()->CreatePath(tempRoot.c_str());
-
-    AZStd::string tempFile;
-    AZ::StringFunc::Path::Join(tempRoot.c_str(), "temp.xml", tempFile);
-    std::ofstream outFile(tempFile.c_str(), std::ofstream::out | std::ofstream::app);
-    outFile << "Temp";
-    outFile.close();
-    AZStd::string sourceRoots{ tempRoot };
-
-    AZStd::string tempSubFolder;
-    AZ::StringFunc::Path::Join(tempRoot.c_str(), "foldera", tempSubFolder);
-    AZ::IO::LocalFileIO::GetInstance()->CreatePath(tempSubFolder.c_str());
-    
-    AZ::StringFunc::Path::Join(tempSubFolder.c_str(), "tempfile1.xml", tempFile);
-    std::ofstream outFile1(tempFile.c_str(), std::ofstream::out | std::ofstream::app);
-    outFile1 << "Tempfile1";
-    outFile1.close();
-
-    AZ::StringFunc::Path::Join(tempRoot.c_str(), "folderb", tempSubFolder);
-    AZ::IO::LocalFileIO::GetInstance()->CreatePath(tempSubFolder.c_str());
-
-    AZ::StringFunc::Path::Join(tempSubFolder.c_str(), "tempfile2.xml", tempFile);
-    std::ofstream outFile2(tempFile.c_str(), std::ofstream::out | std::ofstream::app);
-    outFile2 << "Tempfile2";
-    outFile2.close();
-
-    ResourceCompiler testResourceCompiler;
-
-    testResourceCompiler.RegisterDefaultKeys();
-
-    testResourceCompiler.GetMultiplatformConfig().init(1, 0, &testResourceCompiler);
-    testResourceCompiler.GetMultiplatformConfig().getConfig().SetKeyValue(eCP_PriorityCmdline, "sourceroot", sourceRoots.c_str());
-
-    std::vector<RcFile> resultList;
-    testResourceCompiler.CollectFilesToCompile("temp.xml", resultList);
-    EXPECT_EQ(resultList.size(), 1);
-
-    testResourceCompiler.CollectFilesToCompile("foldera/*.xml", resultList);
-    EXPECT_EQ(resultList.size(), 1);
-
-    testResourceCompiler.CollectFilesToCompile("foldera/*.xml;temp.xml;folderb/*.xml", resultList);
-    EXPECT_EQ(resultList.size(), 3);
-}
diff --git a/Code/Tools/RC/ResourceCompiler/TextFileReader.cpp b/Code/Tools/RC/ResourceCompiler/TextFileReader.cpp
deleted file mode 100644
index 63a0be2c5c..0000000000
--- a/Code/Tools/RC/ResourceCompiler/TextFileReader.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-
-#include "TextFileReader.h"
-#include "IPakSystem.h"
-
-bool TextFileReader::Load(const char* filename, std::vector<char*>& lines)
-{
-    FILE* file = nullptr; 
-    azfopen(&file, filename, "rb");
-    if (!file)
-    {
-        return false;
-    }
-
-    fseek(file, 0, SEEK_END);
-    const size_t size = ftell(file);
-    fseek(file, 0, SEEK_SET);
-
-    m_buffer.resize(size + 1); // +1 for last terminating zero
-    if (fread(&m_buffer[0], 1, size, file) != size)
-    {
-        fclose(file);
-        return false;
-    }
-    m_buffer[size] = '\0';
-
-    fclose(file);
-
-    PrepareLines(lines);
-    return true;
-}
-
-bool TextFileReader::LoadFromPak(IPakSystem* system, const char* filename, std::vector<char*>& lines)
-{
-    PakSystemFile* const file = system->Open(filename, "rb");
-    if (!file)
-    {
-        return false;
-    }
-
-    const size_t size = system->GetLength(file);
-    m_buffer.resize(size + 1); // +1 for last terminating zero
-
-    if (system->Read(file, &m_buffer[0], size) != size)
-    {
-        system->Close(file);
-        return false;
-    }
-    m_buffer[size] = '\0';
-
-    system->Close(file);
-
-    PrepareLines(lines);
-    return true;
-}
-
-// fix line endings to zeros, so we can use strings from the same buffer
-void TextFileReader::PrepareLines(std::vector<char*>& lines)
-{
-    lines.clear();
-
-    char* p = &m_buffer[0];
-    const char* const end = p + m_buffer.size();
-    char* line = p;
-    while (p != end)
-    {
-        if (*p == '\r' || *p == '\n')
-        {
-            *p = '\0';
-            if (*line)
-            {
-                lines.push_back(line);
-            }
-            ++p;
-            line = p;
-        }
-        else
-        {
-            ++p;
-        }
-    }
-    if (*line)
-    {
-        lines.push_back(line);
-    }
-}
-
diff --git a/Code/Tools/RC/ResourceCompiler/TextFileReader.h b/Code/Tools/RC/ResourceCompiler/TextFileReader.h
deleted file mode 100644
index e6a94cfa3c..0000000000
--- a/Code/Tools/RC/ResourceCompiler/TextFileReader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_TEXTFILEREADER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_TEXTFILEREADER_H
-#pragma once
-
-struct IPakSystem;
-
-// Summary:
-//  Utility class to read text files and split lines inplace. One allocation per one file.
-class TextFileReader
-{
-public:
-    bool Load(const char* filename, std::vector<char*>& lines);
-    bool LoadFromPak(IPakSystem* system, const char* filename, std::vector<char*>& lines);
-
-private:
-    // fix line endings to zeros, so we can use strings from the same buffer
-    void PrepareLines(std::vector<char*>& lines);
-
-    std::vector<char> m_buffer;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_TEXTFILEREADER_H
diff --git a/Code/Tools/RC/ResourceCompiler/UnitTestHelper.cpp b/Code/Tools/RC/ResourceCompiler/UnitTestHelper.cpp
deleted file mode 100644
index e8a64c3501..0000000000
--- a/Code/Tools/RC/ResourceCompiler/UnitTestHelper.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "ResourceCompiler_precompiled.h"
-
-#include "UnitTestHelper.h"
-#include "IRCLog.h"
-
-UnitTestHelper::UnitTestHelper()
-    : m_testsPerformed(0)
-    , m_testsSucceeded(0)
-{
-}
-
-UnitTestHelper::~UnitTestHelper()
-{
-}
-
-bool UnitTestHelper::TestBool(bool testValueIsTrue, const char* testValueStatement)
-{
-    ++m_testsPerformed;
-    if (testValueIsTrue)
-    {
-        ++m_testsSucceeded;
-    }
-    else
-    {
-        // Set a breakpoint here if you are debugging unit test failure
-        // Add callstack and other useful information here
-        RCLogError("Unit test failed! Evaluated to false when true was expected. Statement is: %s", testValueStatement ? testValueStatement : "Unknown statement");
-    }
-    return testValueIsTrue;
-}
-
-unsigned int UnitTestHelper::GetTestsPerformedCount()
-{
-    return m_testsPerformed;
-}
-
-unsigned int UnitTestHelper::GetTestsSucceededCount()
-{
-    return m_testsSucceeded;
-}
-
-bool UnitTestHelper::AllUnitTestsPassed()
-{
-    return m_testsSucceeded == m_testsPerformed;
-}
diff --git a/Code/Tools/RC/ResourceCompiler/UnitTestHelper.h b/Code/Tools/RC/ResourceCompiler/UnitTestHelper.h
deleted file mode 100644
index ba354fddde..0000000000
--- a/Code/Tools/RC/ResourceCompiler/UnitTestHelper.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_UNITTESTHELPER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_UNITTESTHELPER_H
-#pragma once
-
-#include "IUnitTestHelper.h"
-
-class UnitTestHelper
-    : public IUnitTestHelper
-{
-public:
-    UnitTestHelper();
-    ~UnitTestHelper();
-
-    bool TestBool(bool testValueIsTrue, const char* testValueStatement) override;
-    unsigned int GetTestsPerformedCount();
-    unsigned int GetTestsSucceededCount();
-    bool AllUnitTestsPassed();
-private:
-    unsigned int m_testsPerformed;
-    unsigned int m_testsSucceeded;
-};
-
-
-#endif // #ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_UNITTESTHELPER_H
diff --git a/Code/Tools/RC/ResourceCompiler/UpToDateFileHelpers.h b/Code/Tools/RC/ResourceCompiler/UpToDateFileHelpers.h
deleted file mode 100644
index a570ea3de7..0000000000
--- a/Code/Tools/RC/ResourceCompiler/UpToDateFileHelpers.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_UPTODATEFILEHELPERS_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_UPTODATEFILEHELPERS_H
-#pragma once
-
-#include <assert.h>
-#include "FileUtil.h"
-#include "IRCLog.h"  // RCLog
-
-namespace UpToDateFileHelpers
-{
-    inline bool FileExistsAndUpToDate(
-        const char* const pDstFileName,
-        const char* const pSrcFileName)
-    {
-        const FILETIME dstFileTime = FileUtil::GetLastWriteFileTime(pDstFileName);
-        if (!FileUtil::FileTimeIsValid(dstFileTime))
-        {
-            return false;
-        }
-
-        const FILETIME srcFileTime = FileUtil::GetLastWriteFileTime(pSrcFileName);
-        if (!FileUtil::FileTimeIsValid(srcFileTime))
-        {
-            RCLogWarning("%s: Source file \"%s\" doesn't exist", __FUNCTION__, pSrcFileName);
-            return false;
-        }
-
-        return FileUtil::FileTimesAreEqual(srcFileTime, dstFileTime);
-    }
-
-
-    inline bool SetMatchingFileTime(
-        const char* const pDstFileName,
-        const char* const pSrcFileName)
-    {
-        const FILETIME srcFileTime = FileUtil::GetLastWriteFileTime(pSrcFileName);
-        if (!FileUtil::FileTimeIsValid(srcFileTime))
-        {
-            RCLogError("%s: Source file \"%s\" doesn't exist", __FUNCTION__, pSrcFileName);
-            return false;
-        }
-
-        const FILETIME dstFileTime = FileUtil::GetLastWriteFileTime(pDstFileName);
-        if (!FileUtil::FileTimeIsValid(dstFileTime))
-        {
-            RCLogError("%s: Destination file \"%s\" doesn't exist", __FUNCTION__, pDstFileName);
-            return false;
-        }
-
-        if (!FileUtil::SetFileTimes(pSrcFileName, pDstFileName))
-        {
-            RCLogError("%s: Copying the date and time from \"%s\" to \"%s\" failed", __FUNCTION__, pSrcFileName, pDstFileName);
-            return false;
-        }
-
-        assert(FileExistsAndUpToDate(pDstFileName, pSrcFileName));
-        return true;
-    }
-} // namespace UpToDateFileHelpers
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_UPTODATEFILEHELPERS_H
diff --git a/Code/Tools/RC/ResourceCompiler/WindowsCompatibility.xml b/Code/Tools/RC/ResourceCompiler/WindowsCompatibility.xml
deleted file mode 100644
index d1f93af54c..0000000000
--- a/Code/Tools/RC/ResourceCompiler/WindowsCompatibility.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!--The ID below indicates application support for Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-      <!--The ID below indicates application support for Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-    </application>
-  </compatibility>
-</assembly>
diff --git a/Code/Tools/RC/ResourceCompiler/ZipEncryptor.cpp b/Code/Tools/RC/ResourceCompiler/ZipEncryptor.cpp
deleted file mode 100644
index d83a77184e..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ZipEncryptor.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompiler_precompiled.h"
-#include "IResCompiler.h"
-#include "IRCLog.h"
-#include "PakSystem.h"
-#include <set>
-#include "ZipEncryptor.h"
-#include "ZipDir/ZipDir.h"
-#include "FileUtil.h"
-#include "StringHelpers.h"
-#include <AzFramework/IO/LocalFileIO.h>
-
-ZipEncryptor::ZipEncryptor([[maybe_unused]] IResourceCompiler* pRC)
-{
-}
-
-ZipEncryptor::~ZipEncryptor()
-{
-}
-
-ICompiler* ZipEncryptor::CreateCompiler()
-{
-    return this;
-}
-
-void ZipEncryptor::Release()
-{
-}
-
-string ZipEncryptor::GetOutputFileNameOnly() const
-{
-    return m_CC.m_sourceFileNameOnly;
-}
-
-string ZipEncryptor::GetOutputPath() const
-{
-    return PathHelpers::Join(m_CC.GetOutputFolder(), GetOutputFileNameOnly());
-}
-
-const char* ZipEncryptor::GetExt(int index) const
-{
-    switch (index)
-    {
-    case 0:
-        return "pak";
-    case 1:
-        return "zip";
-    default:
-        return 0;
-    }
-}
-
-namespace {
-    struct EncryptPredicate
-        : ZipDir::IEncryptPredicate
-    {
-        string m_filter;
-        std::vector<string> m_filterItems;
-
-        EncryptPredicate(const string& filter)
-            : m_filter(filter)
-        {
-            if (!filter.empty())
-            {
-                StringHelpers::Split(filter, ";", false, m_filterItems);
-            }
-        }
-
-        virtual bool Match(const char* filename)
-        {
-            size_t count = m_filterItems.size();
-            for (size_t i = 0; i < count; ++i)
-            {
-                if (StringHelpers::MatchesWildcardsIgnoreCase(filename, m_filterItems[i]))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-    };
-}
-
-bool ZipEncryptor::Process()
-{
-    const IConfig* config = m_CC.m_config;
-
-    if (!m_CC.m_config->HasKey("zip_encrypt"))
-    {
-        RCLogError("zip_encrypt option is not specified.");
-        return false;
-    }
-    const bool zipEncrypt = m_CC.m_config->GetAsBool("zip_encrypt", false, true);
-
-    const int zipFileAlignment = config->GetAsInt("zip_alignment", 1, 1);
-
-    uint32 encryptionKey[4];
-    const string zipEncryptKey = config->GetAsString("zip_encrypt_key", "", "");
-
-    if (!zipEncryptKey.empty())
-    {
-        if (!ParseKey(encryptionKey, zipEncryptKey.c_str()))
-        {
-            RCLogError("Misformed zip_encrypt_key: expected 128-bit integer in hexadecimal format (32 character)");
-            return false;
-        }
-    }
-
-    const string outputPath = GetOutputPath();
-
-    RCLog(zipEncrypt ? "Encrypting zip: %s" : "Decrypting zip: %s", outputPath.c_str());
-
-    if (!FileUtil::FileExists(m_CC.GetSourcePath()))
-    {
-        RCLogError("Non-existing input file: %s", m_CC.GetSourcePath().c_str());
-        return false;
-    }
-
-    if (!StringHelpers::EqualsIgnoreCase(m_CC.GetSourcePath().c_str(), outputPath.c_str()))
-    {
-        if (AZ::IO::LocalFileIO().Copy(m_CC.GetSourcePath(), outputPath.c_str()) == FALSE)
-        {
-            RCLogError("Unable to copy archive from %s to %s.", m_CC.GetSourcePath().c_str(), outputPath.c_str());
-            return false;
-        }
-    }
-
-    PakSystemArchive* pPakFile = m_CC.m_pRC->GetPakSystem()->OpenArchive(outputPath.c_str(), zipFileAlignment, zipEncrypt, zipEncryptKey.empty() ? 0 : encryptionKey);
-    if (!pPakFile)
-    {
-        RCLogError("Failed to open zip file %s", outputPath.c_str());
-        return false;
-    }
-
-    const string zipEncryptFilter = config->GetAsString("zip_encrypt_filter", "", "");
-    std::unique_ptr<EncryptPredicate> encryptPredicate(new EncryptPredicate(zipEncryptFilter));
-
-    int numChanged = 0;
-    int numSkipped = 0;
-
-    if (!pPakFile->zip->EncryptArchive(zipEncrypt ? pPakFile->zip->ENCRYPT : pPakFile->zip->DECRYPT, encryptPredicate.get(), &numChanged, &numSkipped))
-    {
-        RCLogError("PAK encryption failed. Archive is corrupted.");
-        return false;
-    }
-
-    RCLog(zipEncrypt ? "Encrypted content of %i/%i files" : "Decrypted content of %i/%i files", numChanged, numChanged + numSkipped);
-
-    m_CC.m_pRC->GetPakSystem()->CloseArchive(pPakFile);
-    return true;
-}
-
-static unsigned char s_charValueTable[256] =
-{
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0,    1,    2,    3,    4,    5,    6,    7,
-    8,    9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff,   10,   11,   12,   13,   14,   15, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff,   10,   11,   12,   13,   14,   15, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-bool ZipEncryptor::ParseKey(uint32 outputKey[4], const char* inputString)
-{
-    if (!outputKey)
-    {
-        assert(outputKey);
-        return false;
-    }
-    if (!inputString)
-    {
-        assert(inputString);
-        return false;
-    }
-
-    size_t numBytes = sizeof(uint32) * 4;
-    size_t len = strlen(inputString);
-
-    if (len != numBytes * 2)
-    {
-        RCLogError("Encryption key should contain %i characters.", numBytes * 2);
-        return false;
-    }
-
-    size_t i = 0;
-    while (i != numBytes)
-    {
-        unsigned char v1 = s_charValueTable[(unsigned char)(inputString[i * 2])];
-        unsigned char v2 = s_charValueTable[(unsigned char)(inputString[i * 2 + 1])];
-        if (v1 == 0xff || v2 == 0xff)
-        {
-            size_t pos = i * 2 + ((v1 == 0xff) ? 1 : 2); // add 1 to position if v1==0xff, or 2 if v2==0xff
-            RCLogError("Encryption key contains bad character at position %i", pos);
-            return false;
-        }
-
-        ((unsigned char*)outputKey)[numBytes - i - 1] = v2 + (v1 << 4);
-        ++i;
-    }
-
-    return true;
-}
diff --git a/Code/Tools/RC/ResourceCompiler/ZipEncryptor.h b/Code/Tools/RC/ResourceCompiler/ZipEncryptor.h
deleted file mode 100644
index d64f442348..0000000000
--- a/Code/Tools/RC/ResourceCompiler/ZipEncryptor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ZIPENCRYPTOR_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ZIPENCRYPTOR_H
-#pragma once
-
-#include "IConvertor.h"
-
-struct ConvertContext;
-
-class ZipEncryptor
-    : public ICompiler
-    , public IConvertor
-{
-public:
-
-    ZipEncryptor(IResourceCompiler* pRC);
-    ~ZipEncryptor();
-
-    static bool ParseKey(uint32 outputKey[4], const char* inputString);
-
-    // ICompiler + IConvertor methods.
-    virtual void Release();
-
-    // ICompiler methods.
-    virtual void BeginProcessing([[maybe_unused]] const IConfig* config) { }
-    virtual void EndProcessing() { }
-    virtual IConvertContext* GetConvertContext() { return &m_CC; }
-    virtual bool Process();
-
-    // IConvertor methods.
-    virtual ICompiler* CreateCompiler();
-    virtual const char* GetExt(int index) const;
-
-private:
-    string GetOutputFileNameOnly() const;
-    string GetOutputPath() const;
-
-private:
-    ConvertContext m_CC;
-    int m_refCount;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_ZIPENCRYPTOR_H
diff --git a/Code/Tools/RC/ResourceCompiler/main.cpp b/Code/Tools/RC/ResourceCompiler/main.cpp
deleted file mode 100644
index 02dbd406d8..0000000000
--- a/Code/Tools/RC/ResourceCompiler/main.cpp
+++ /dev/null
@@ -1,760 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include "MathHelpers.h"
-#endif //AZ_PLATFORM_WINDOWS
-
-#include <QApplication>
-#include <QSettings>
-#include <QDir>
-
-#include <AzCore/Math/Sfmt.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/Settings/SettingsRegistryImpl.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzFramework/CommandLine/CommandLine.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <ResourceCompiler.h>
-#include <IResourceCompilerHelper.h>
-#include <CryLibrary.h>
-#include <ZipEncryptor.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <CrashHandler_Windows.h>
-
-CrashHandler& GetCrashHandler()
-{
-    static CrashHandler s_crashHandler;
-    return s_crashHandler;
-}
-#endif
-
-namespace
-{
-    volatile bool g_gotCTRLBreakSignalFromOS = false;
-#if defined(AZ_PLATFORM_WINDOWS)
-    BOOL WINAPI CtrlHandlerRoutine([[maybe_unused]] DWORD dwCtrlType)
-    {
-        // we got this.
-        RCLogError("CTRL-BREAK was pressed!");
-        g_gotCTRLBreakSignalFromOS = true;
-        return TRUE;
-    }
-#else
-    void CtrlHandlerRoutine(int signo)
-    {
-        if (signo == SIGINT)
-        {
-            RCLogError("CTRL-BREAK was pressed!");
-            g_gotCTRLBreakSignalFromOS = true;
-        }
-    }
-#endif
-}
-
-
-std::unique_ptr<QCoreApplication> CreateQApplication(int& argc, char** argv)
-{
-    //we are not going to start a mesg loop. so exec will not be called on the qapp
-
-    // special circumsance  - if 'userDialog' is present on the command line, we need an interactive app:
-    AzFramework::CommandLine cmdLine;
-    cmdLine.Parse(argc, argv);
-    bool userDialog = cmdLine.HasSwitch("userdialog") &&
-        ((cmdLine.GetNumSwitchValues("userdialog") == 0) || (cmdLine.GetSwitchValue("userdialog", 0) == "1"));
-
-    std::unique_ptr<QCoreApplication> qApplication = userDialog ? std::make_unique<QApplication>(argc, argv) : std::make_unique<QCoreApplication>(argc, argv);
-    return qApplication;
-}
-
-#if 0
-static void EnableCrtMemoryChecks()
-{
-    uint32 tmp = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-    tmp &= ~_CRTDBG_CHECK_ALWAYS_DF;
-    tmp |= _CRTDBG_ALLOC_MEM_DF;
-    tmp |= _CRTDBG_CHECK_CRT_DF;
-    tmp |= _CRTDBG_DELAY_FREE_MEM_DF;
-    tmp |= _CRTDBG_LEAK_CHECK_DF;    // used on exit
-    // Set desired check frequency
-    const uint32 eachX = 1;
-    tmp = (tmp & 0xFFFF) | (eachX << 16);
-    _CrtSetDbgFlag(tmp);
-    // Check heap every
-    //_CrtSetBreakAlloc(2031);
-}
-#endif
-
-
-static void ShowAboutDialog(const ResourceCompiler& rc)
-{
-    const string newline("\r\n");
-
-    const string s = rc.GetResourceCompilerGenericInfo(newline);
-
-    string sSuffix;
-    sSuffix += newline;
-    sSuffix += newline;
-    sSuffix += newline;
-    sSuffix += "Use \"RC /help\" to list all available command-line options.";
-    sSuffix += newline;
-    sSuffix += newline;
-    sSuffix += "Press [OK] to copy the info above to clipboard.";
-#if defined(AZ_PLATFORM_WINDOWS)
-    if (::MessageBoxA(NULL, (s + sSuffix).c_str(), "About", MB_OKCANCEL | MB_APPLMODAL | MB_SETFOREGROUND) == IDOK)
-    {
-        ResourceCompiler::CopyStringToClipboard(s);
-    }
-#else
-    if (CryMessageBox((s + sSuffix).c_str(), "About", 0) == 1)
-    {
-        //TODO: CopyStringToClipboard needs cross platform support! Throwing an assert for now.
-        assert(0);
-    }
-#endif
-}
-
-
-void GetCommandLineArguments(std::vector<string>& resArgs, int argc, char** argv)
-{
-    resArgs.clear();
-    resArgs.reserve(argc);
-    for (int i = 0; i < argc; ++i)
-    {
-        resArgs.push_back(string(argv[i]));
-    }
-}
-
-
-void AddCommandLineArgumentsFromFile(std::vector<string>& args, const char* const pFilename)
-{
-    FILE* f = nullptr;
-    azfopen(&f, pFilename, "rt");
-    if (!f)
-    {
-        return;
-    }
-
-    char line[1024];
-    while (fgets(line, sizeof(line), f) != 0)
-    {
-        if (line[0] == 0)
-        {
-            continue;
-        }
-
-        string sLine = line;
-        sLine.Trim();
-        if (sLine.empty())
-        {
-            continue;
-        }
-
-        args.push_back(sLine);
-    }
-
-    fclose(f);
-}
-
-
-static string GetTimeAsString(const time_t tm)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    char buffer[26];
-    ctime_s(buffer, sizeof buffer, &tm);
-#else
-    char* buffer = ctime(&tm);
-#endif
-    string str = buffer;
-    while (StringHelpers::EndsWith(str, "\n"))
-    {
-        str = str.substr(0, str.length() - 1);
-    }
-
-    return str;
-}
-
-
-static void ShowResourceCompilerVersionInfo(const ResourceCompiler& rc)
-{
-    const string newline("\n");
-    const string info = rc.GetResourceCompilerGenericInfo(newline);
-    std::vector<string> rows;
-    StringHelpers::Split(info, newline, true, rows);
-    for (size_t i = 0; i < rows.size(); ++i)
-    {
-        RCLog("%s", rows[i].c_str());
-    }
-}
-
-
-static void ShowResourceCompilerLaunchInfo(const std::vector<string>& args, int originalArgc, const ResourceCompiler& rc)
-{
-    ShowResourceCompilerVersionInfo(rc);
-
-    RCLog("");
-    RCLog("Command line:");
-    for (size_t i = 0; i < args.size(); ++i)
-    {
-        if ((int)i < originalArgc)
-        {
-            RCLog("  \"%s\"", args[i].c_str());
-        }
-        else
-        {
-            RCLog("  \"%s\"  (from %s)", args[i].c_str(), rc.m_filenameOptions);
-        }
-    }
-    RCLog("");
-
-    RCLog("Platforms specified in %s:", rc.m_filenameRcIni);
-    for (int i = 0; i < rc.GetPlatformCount(); ++i)
-    {
-        const PlatformInfo* const p = rc.GetPlatformInfo(i);
-        RCLog("  %s (%s)",
-            p->GetCommaSeparatedNames().c_str(),
-            (p->bBigEndian ? "big-endian" : "little-endian"));
-    }
-    RCLog("");
-
-    RCLog("Started at: %s", GetTimeAsString(time(0)).c_str());
-}
-
-
-static void ShowWaitDialog(const ResourceCompiler& rc, const string& action, const std::vector<string>& args, int originalArgc)
-{
-    const string newline("\r\n");
-
-    const string title = string("RC is about to ") + action;
-
-    string sPrefix;
-    sPrefix += title;
-    sPrefix += " (/wait was specified).";
-    sPrefix += newline;
-    sPrefix += newline;
-    sPrefix += newline;
-
-    string s;
-    s += rc.GetResourceCompilerGenericInfo(newline);
-    s += "Command line:";
-    s += newline;
-    for (size_t i = 0; i < args.size(); ++i)
-    {
-        s += "  \"";
-        s += args[i];
-        s += "\"";
-        if ((int)i >= originalArgc)
-        {
-            s += "  (from ";
-            s += rc.m_filenameOptions;
-            s += ")";
-        }
-        s += newline;
-    }
-
-    string sSuffix;
-    sSuffix += newline;
-    sSuffix += "Do you want to copy the info above to clipboard?";
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    if (::MessageBoxA(NULL, (sPrefix + s + sSuffix).c_str(), title.c_str(), MB_YESNO | MB_ICONINFORMATION | MB_APPLMODAL | MB_SETFOREGROUND) == IDYES)
-    {
-        ResourceCompiler::CopyStringToClipboard(s);
-    }
-#else
-    if (CryMessageBox((sPrefix + s + sSuffix).c_str(), title.c_str(), 0) == 1)
-    {
-        //TODO: CopyStringToClipboard needs cross platform support! Assert for now.
-        assert(0);
-    }
-#endif
-}
-
-
-static bool RegisterConvertors(ResourceCompiler* pRc)
-{
-    string strDir = pRc->GetExePath();
-
-    strDir.append(ResourceCompiler::m_rcPluginSubfolder);
-    strDir.append(AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING);
-
-    AZ::IO::LocalFileIO localFile;
-    localFile.FindFiles(strDir.c_str(), CryLibraryDefName("ResourceCompiler*"), [&](const char* pluginFilename) -> bool
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        HMODULE hPlugin = CryLoadLibrary(pluginFilename);
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-        HMODULE hPlugin = CryLoadLibrary(pluginFilename, false, false);
-#endif
-        if (!hPlugin)
-        {
-            const DWORD errCode = GetLastError();
-            char messageBuffer[1024] = { '?', 0 };
-#if defined(AZ_PLATFORM_WINDOWS)
-            FormatMessageA(
-                FORMAT_MESSAGE_FROM_SYSTEM,
-                NULL,
-                errCode,
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                messageBuffer,
-                sizeof(messageBuffer) - 1,
-                NULL);
-#endif
-            RCLogError("Couldn't load plug-in module \"%s\"", pluginFilename);
-            RCLogError("Error code: 0x%x = %s", errCode, messageBuffer);
-            // this return controls whether to keep going on other converters or stop the entire process here.
-            // it is NOT AN ERROR if one resource compiler dll fails to load
-            // it might not be the DLL that is required for this particular compile.
-            return true;
-        }
-
-
-        FnRegisterConvertors fnRegister =
-            hPlugin ? (FnRegisterConvertors)CryGetProcAddress(hPlugin, "RegisterConvertors") : NULL;
-        if (!fnRegister)
-        {
-            RCLog("Error: plug-in module \"%s\" doesn't have RegisterConvertors function", pluginFilename);
-            CryFreeLibrary(hPlugin);
-            // this return controls whether to keep going on other converters or stop the entire process here.
-            // it is NOT AN ERROR if one resource compiler dll fails to load
-            // it might not be the DLL that is required for this particular compile.
-            return true;
-        }
-
-        RCLog("  Loaded \"%s\"", pluginFilename);
-
-        pRc->AddPluginDLL(hPlugin);
-
-        const int oldErrorCount = pRc->GetNumErrors();
-        fnRegister(pRc);
-        const int newErrorCount = pRc->GetNumErrors();
-        if (newErrorCount > oldErrorCount)
-        {
-            RCLog("Error: plug-in module \"%s\" emitted errors during register", pluginFilename);
-            pRc->RemovePluginDLL(hPlugin);
-            FnBeforeUnloadDLL fnBeforeUnload = (FnBeforeUnloadDLL)CryGetProcAddress(hPlugin, "BeforeUnloadDLL");
-            if (fnBeforeUnload)
-            {
-                (*fnBeforeUnload)();
-            }
-            CryFreeLibrary(hPlugin);
-            // this return controls whether to keep going on other converters or stop the entire process here.
-            return true;
-        }
-
-        return true; // continue iterating to all plugins
-    });
-
-    return true;
-}
-
-
-int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    GetCrashHandler(); // just to initialize
-#endif
-
-    std::unique_ptr<QCoreApplication> qApplication = CreateQApplication(argc, argv);
-
-#if 0
-    EnableCrtMemoryChecks();
-#endif
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    MathHelpers::EnableFloatingPointExceptions(~(_CW_DEFAULT));
-#endif
-
-    ResourceCompiler rc;
-
-    rc.QueryVersionInfo();
-    rc.InitPaths();
-
-    if (argc <= 1)
-    {
-        ShowAboutDialog(rc);
-        return eRcExitCode_Success;
-    }
-
-    std::vector<string> args;
-    {
-        GetCommandLineArguments(args, argc, argv);
-
-        const string filename = string(rc.GetExePath()) + rc.m_filenameOptions;
-        AddCommandLineArgumentsFromFile(args, filename.c_str());
-    }
-
-    rc.RegisterDefaultKeys();
-
-    string fileSpec;
-
-    // Initialization, showing startup info, loading configs
-    {
-        Config mainConfig;
-        mainConfig.SetConfigKeyRegistry(&rc);
-
-        QSettings settings("HKEY_CURRENT_USER\\Software\\Amazon\\O3DE\\Settings", QSettings::NativeFormat);
-        bool enableSourceControl = settings.value("RC_EnableSourceControl", true).toBool();
-        mainConfig.SetKeyValue(eCP_PriorityCmdline, "nosourcecontrol", enableSourceControl ? "0" : "1");
-
-        AZ::CommandLine commandLine;
-        commandLine.Parse(argc, argv);
-
-        for (auto&& [option, value] : commandLine)
-        {
-            if (!option.empty())
-            {
-                mainConfig.SetKeyValue(EConfigPriority::eCP_PriorityCmdline, option.c_str(), value.c_str());
-            }
-            else
-            {
-                fileSpec = commandLine.GetMiscValue(0).c_str();
-            }
-        }
-
-
-        // initialize rc (also initializes logs)
-        rc.Init(mainConfig);
-
-        AZ::Debug::Trace::HandleExceptions(true);
-#if defined(AZ_PLATFORM_WINDOWS)
-        GetCrashHandler().SetDumpFile(rc.FormLogFileName(ResourceCompiler::m_filenameCrashDump));
-#endif
-
-        if (mainConfig.GetAsBool("version", false, true))
-        {
-            ShowResourceCompilerVersionInfo(rc);
-            return eRcExitCode_Success;
-        }
-
-        switch (mainConfig.GetAsInt("wait", 0, 1))
-        {
-        case 3:
-        case 4:
-            ShowWaitDialog(rc, "start", args, argc);
-            break;
-        default:
-            break;
-        }
-
-        ShowResourceCompilerLaunchInfo(args, argc, rc);
-
-        rc.SetTimeLogging(mainConfig.GetAsBool("logtime", true, true));
-
-        rc.LogMemoryUsage(false);
-
-        RCLog("");
-
-        if (!rc.LoadIniFile())
-        {
-            return eRcExitCode_FatalError;
-        }
-
-        // Make sure that rc.ini doesn't have obsolete settings
-        for (int i = 0;; ++i)
-        {
-            const char* const pName = rc.GetIniFile()->GetSectionName(i);
-            if (!pName)
-            {
-                break;
-            }
-
-            Config cfg;
-            rc.GetIniFile()->CopySectionKeysToConfig(eCP_PriorityRcIni, i, 0, &cfg);
-
-            if (cfg.HasKeyMatchingWildcards("srgb") || cfg.HasKeyMatchingWildcards("srgb:*"))
-            {
-                RCLogError("Obsolete setting 'srgb' found in %s", rc.m_filenameRcIni);
-                RCLog(
-                    "\n"
-                    "Please replace all occurences of 'srgb' by corresponding\n"
-                    "'colorspace' settings. Use the following table as the reference:\n"
-                    "  srgb=0 -> colorspace=linear,linear\n"
-                    "  srgb=1 -> colorspace=sRGB,auto\n"
-                    "  srgb=2 -> colorspace=sRGB,sRGB\n"
-                    "  srgb=3 -> colorspace=linear,sRGB\n"
-                    "  srgb=4 -> colorspace=sRGB,linear");
-                return eRcExitCode_FatalError;
-            }
-        }
-
-        // Load list of platforms
-        {
-            for (int i = 0;; ++i)
-            {
-                const char* const pName = rc.GetIniFile()->GetSectionName(i);
-                if (!pName)
-                {
-                    break;
-                }
-                if (!StringHelpers::Equals(pName, "_platform"))
-                {
-                    continue;
-                }
-
-                Config cfg;
-                rc.GetIniFile()->CopySectionKeysToConfig(eCP_PriorityRcIni, i, "", &cfg);
-
-                const string names = StringHelpers::MakeLowerCase(cfg.GetAsString("name", "", ""));
-                const bool bBigEndian = cfg.GetAsBool("bigendian", false, true);
-                const int pointerSize = cfg.GetAsInt("pointersize", 4, 0);
-
-                if (!rc.AddPlatform(names, bBigEndian, pointerSize))
-                {
-                    RCLogError("Bad platform data in %s", rc.m_filenameRcIni);
-                    return eRcExitCode_FatalError;
-                }
-            }
-
-            if (rc.GetPlatformCount() <= 0)
-            {
-                RCLogError("Missing [_platform] in %s", rc.m_filenameRcIni);
-                return eRcExitCode_FatalError;
-            }
-        }
-
-        // Obtain target platform
-        int platform;
-        {
-            string platformStr = mainConfig.GetAsString("platform", "", "");
-            if (platformStr.empty())
-            {
-                platformStr = mainConfig.GetAsString("p", "", "");
-            }
-            if (platformStr.empty())
-            {
-                if (!mainConfig.GetAsBool("version", false, true))
-                {
-                    RCLog("Platform (-p) not specified, defaulting to 'pc'.");
-                    RCLog("");
-                }
-                platformStr = "pc";
-                mainConfig.SetKeyValue(eCP_PriorityCmdline, "platform", platformStr.c_str());
-            }
-
-            platform = rc.FindPlatform(platformStr.c_str());
-            if (platform < 0)
-            {
-                RCLogError("Unknown platform specified: '%s'", platformStr.c_str());
-                return eRcExitCode_FatalError;
-            }
-        }
-
-        // Load configs for every platform
-        rc.GetMultiplatformConfig().init(rc.GetPlatformCount(), platform, &rc);
-        for (int i = 0; i < rc.GetPlatformCount(); ++i)
-        {
-            IConfig& cfg = rc.GetMultiplatformConfig().getConfig(i);
-            rc.GetIniFile()->CopySectionKeysToConfig(eCP_PriorityRcIni, 0, rc.GetPlatformInfo(i)->GetCommaSeparatedNames().c_str(), &cfg);
-            cfg.AddConfig(&mainConfig);
-        }
-    }
-
-     IConfig& config = rc.GetMultiplatformConfig().getConfig();
-
-    {
-        RCLog("Initializing pak management");
-        rc.InitPakManager();
-        RCLog("");
-
-        RCLog("Initializing System");
-
-        {
-            // Create a local SettingsRegistry to read the bootstrap.cfg settings if the engine root hasn't been overridden
-            // on the command line
-            AZ::CommandLine commandLine;
-            commandLine.Parse(argc, argv);
-            AZ::SettingsRegistryImpl settingsRegistry;
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(settingsRegistry);
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(settingsRegistry, commandLine, false);
-
-            const auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString::format(
-                "%s/project_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey);
-            string projectPath = config.GetAsString("project-path", "", "");
-            if (!projectPath.empty())
-            {
-                settingsRegistry.Set(projectPathKey, projectPath.c_str());
-            }
-
-            // Update the Runtime FilePaths and project settings
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(settingsRegistry);
-            // Set the project-path and project-name entries from the Settings registry into the RC config structure
-            if (AZ::IO::FixedMaxPathString projPath; settingsRegistry.Get(projPath, AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectPath))
-            {
-                config.SetKeyValue(eCP_PriorityCmdline, "project-path", projPath.c_str());
-            }
-
-            const auto projectNameKey = AZ::SettingsRegistryInterface::FixedValueString::format(
-                "%s/project_name", AZ::SettingsRegistryMergeUtils::ProjectSettingsRootKey);
-            if (AZ::IO::FixedMaxPathString projName; settingsRegistry.Get(projName, projectNameKey))
-            {
-                config.SetKeyValue(eCP_PriorityCmdline, "project-name", projName.c_str());
-            }
-            // and because we're a tool, add the tool folders:
-            if (AZ::SettingsRegistryInterface::FixedValueString appRoot; settingsRegistry.Get(appRoot, AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder))
-            {
-                rc.SetAppRootPath(string{ appRoot.c_str(), appRoot.size() });
-            }
-        }
-
-        // only after installing and setting those up, do we install our handler because perforce does this too...
-#if defined(AZ_PLATFORM_WINDOWS)
-        SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandlerRoutine, TRUE);
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-        signal(SIGINT, CtrlHandlerRoutine);
-#endif
-        RCLog("");
-
-        RCLog("Loading compiler plug-ins (ResourceCompiler*.dll)");
-
-        // Force the current working directory to be the same as the executable so
-        // that we can load any shared libraries that don't have run-time paths in
-        // them (I'm looking at you AWS SDK libraries!).
-        QString currentDir = QDir::currentPath();
-        QDir::setCurrent(QCoreApplication::applicationDirPath());
-
-        if (!RegisterConvertors(&rc))
-        {
-            RCLogError("A fatal error occurred when loading plug-ins (see error message(s) above). RC cannot continue.");
-            rc.UnregisterConvertors();
-            return eRcExitCode_FatalError;
-        }
-        // Restore currentDir so that file paths will work that are relative to
-        // where the user executed RC
-        QDir::setCurrent(currentDir);
-        RCLog("");
-
-        RCLog("Loading zip & pak compiler module");
-        rc.RegisterConvertor("zip & pak compiler", new ZipEncryptor(&rc));
-        RCLog("");
-
-        rc.LogMemoryUsage(false);
-    }
-
-    const bool bJobMode = config.HasKey("job");
-    // Don't even bother setting up if we aren't going to do anything
-    if (!bJobMode && !ResourceCompiler::CheckCommandLineOptions(config, 0))
-    {
-        return eRcExitCode_Error;
-    }
-
-    bool bExitCodeIsReady = false;
-    int exitCode = eRcExitCode_Success;
-
-    bool bShowUsage = false;
-    if (bJobMode)
-    {
-        const int tmpResult = rc.ProcessJobFile();
-        if (tmpResult)
-        {
-            exitCode = tmpResult;
-            bExitCodeIsReady = true;
-        }
-        rc.PostBuild();      // e.g. writing statistics files
-    }
-    else if (!fileSpec.empty())
-    {
-        rc.RemoveOutputFiles();
-        std::vector<RcFile> files;
-        if (rc.CollectFilesToCompile(fileSpec, files) && !files.empty())
-        {
-            rc.CompileFilesBySingleProcess(files);
-        }
-        rc.PostBuild();      // e.g. writing statistics files
-    }
-    else
-    {
-        bShowUsage = true;
-    }
-
-    rc.UnregisterConvertors();
-
-    rc.SetTimeLogging(false);
-
-    if (bShowUsage && !rc.m_bQuiet)
-    {
-        rc.ShowHelp(false);
-    }
-
-    if (config.GetAsBool("help", false, true))
-    {
-        rc.ShowHelp(true);
-    }
-
-    rc.LogMemoryUsage(false);
-
-    RCLog("");
-    RCLog("Finished at: %s", GetTimeAsString(time(0)).c_str());
-
-    if (rc.GetNumErrors() || rc.GetNumWarnings())
-    {
-        RCLog("");
-        RCLogSummary("%d errors, %d warnings.", rc.GetNumErrors(), rc.GetNumWarnings());
-    }
-
-    if (!bExitCodeIsReady)
-    {
-        const bool bFail = rc.GetNumErrors() || (rc.GetNumWarnings() && config.GetAsBool("failonwarnings", false, true));
-        exitCode = (bFail ? eRcExitCode_Error : eRcExitCode_Success);
-        bExitCodeIsReady = true;
-    }
-
-    switch (config.GetAsInt("wait", 0, 1))
-    {
-    case 1:
-        RCLog("");
-        RCLog("    Press <RETURN> (/wait was specified)");
-        getchar();
-        break;
-    case 2:
-    case 4:
-        ShowWaitDialog(rc, "finish", args, argc);
-        break;
-    default:
-        break;
-    }
-
-    return exitCode;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int __cdecl main(int argc, char** argv, char** envp)
-{
-    AZ::Sfmt::Create();
-
-    AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-    AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
-    AZ::AllocatorInstance<CryStringAllocator>::Create();
-
-    int exitCode = 1;
-    {
-        exitCode = rcmain(argc, argv, envp);
-    }
-
-    AZ::AllocatorInstance<CryStringAllocator>::Destroy();
-    AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
-    AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-
-    AZ::Sfmt::Destroy();
-
-    //////////////////////////////////////////////////////////////////////////
-    AZ::AllocatorManager::Destroy();
-    return exitCode;
-}
diff --git a/Code/Tools/RC/ResourceCompiler/platform_implRC.cpp b/Code/Tools/RC/ResourceCompiler/platform_implRC.cpp
deleted file mode 100644
index 238ea49643..0000000000
--- a/Code/Tools/RC/ResourceCompiler/platform_implRC.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// This file should only be included Once in DLL module.
-
-#include <platform.h>
-
-#if defined(AZ_MONOLITHIC_BUILD)
-#   error It is not allowed to have AZ_MONOLITHIC_BUILD defined
-#endif
-
-#include <platform_implRC.h>
-
-#include <Random.h>
-
-#include <ISystem.h>
-
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#define TLSALLOC(k)     (*(k)=TlsAlloc(), TLS_OUT_OF_INDEXES==*(k))
-#define TLSFREE(k)      (!TlsFree(k))
-#define TLSGET(k)       TlsGetValue(k)
-#define TLSSET(k, a)    (!TlsSetValue(k, a))
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-#define TLSALLOC(k)     pthread_key_create(k, 0)
-#define TLSFREE(k)       pthread_key_delete(k)
-#define TLSGET(k)       pthread_getspecific(k)
-#define TLSSET(k, a)    pthread_setspecific(k, a)
-#else
-#error TLS Not supported!!
-#endif
-
-IRCLog* g_pRCLog = 0;
-
-void SetRCLog(IRCLog* pRCLog)
-{
-    g_pRCLog = pRCLog;
-}
-
-void RCLog(const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    if (g_pRCLog)
-    {
-        g_pRCLog->LogV(IRCLog::eType_Info, szFormat, args);
-    }
-    else
-    {
-        vprintf(szFormat, args);
-        printf("\n");
-        fflush(stdout);
-    }
-    va_end(args);
-}
-
-void RCLogWarning(const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    if (g_pRCLog)
-    {
-        g_pRCLog->LogV(IRCLog::eType_Warning, szFormat, args);
-    }
-    else
-    {
-        vprintf(szFormat, args);
-        printf("\n");
-        fflush(stdout);
-    }
-    va_end(args);
-}
-
-void RCLogError(const char* szFormat, ...)
-{
-    va_list args;
-    va_start (args, szFormat);
-    if (g_pRCLog)
-    {
-        g_pRCLog->LogV(IRCLog::eType_Error, szFormat, args);
-    }
-    else
-    {
-        vprintf(szFormat, args);
-        printf("\n");
-        fflush(stdout);
-    }
-    va_end(args);
-}
-
-void RCLogContext(const char* szMessage)
-{
-    if (g_pRCLog)
-    {
-        g_pRCLog->Log(IRCLog::eType_Context, szMessage);
-    }
-    else
-    {
-        printf("%s\n", szMessage);
-        fflush(stdout);
-    }
-}
-
-void RCLogSummary(const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    if (g_pRCLog)
-    {
-        g_pRCLog->LogV(IRCLog::eType_Summary, szFormat, args);
-    }
-    else
-    {
-        vprintf(szFormat, args);
-        printf("\n");
-        fflush(stdout);
-    }
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Log important data that must be printed regardless verbosity.
-
-void PlatformLogOutput(const char*, ...) PRINTF_PARAMS(1, 2);
-
-inline void PlatformLogOutput(const char* format, ...)
-{
-    assert(g_pRCLog);
-    if (g_pRCLog)
-    {
-        va_list args;
-        va_start(args, format);
-        g_pRCLog->LogV(IRCLog::eType_Error,  format, args);
-        va_end(args);
-    }
-}
-
diff --git a/Code/Tools/RC/ResourceCompiler/platform_implRC.h b/Code/Tools/RC/ResourceCompiler/platform_implRC.h
deleted file mode 100644
index 5820a3874e..0000000000
--- a/Code/Tools/RC/ResourceCompiler/platform_implRC.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// This file should only be included Once in DLL module.
-
-#pragma once
-
-#include <IRCLog.h>
diff --git a/Code/Tools/RC/ResourceCompiler/resource.h b/Code/Tools/RC/ResourceCompiler/resource.h
deleted file mode 100644
index eb3b81fc1e..0000000000
--- a/Code/Tools/RC/ResourceCompiler/resource.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ResourceCompiler.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Code/Tools/RC/ResourceCompiler/resourcecompiler_files.cmake b/Code/Tools/RC/ResourceCompiler/resourcecompiler_files.cmake
deleted file mode 100644
index f2ca849c51..0000000000
--- a/Code/Tools/RC/ResourceCompiler/resourcecompiler_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    main.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompiler/resourcecompiler_static_files.cmake b/Code/Tools/RC/ResourceCompiler/resourcecompiler_static_files.cmake
deleted file mode 100644
index dc5b226d81..0000000000
--- a/Code/Tools/RC/ResourceCompiler/resourcecompiler_static_files.cmake
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    IRCLog.h
-    IConfig.cpp
-    IConvertor.h
-    platform_implRC.h
-    platform_implRC.cpp
-    ZipEncryptor.cpp
-    ZipEncryptor.h
-    ICfgFile.h
-    IConfig.h
-    IConvertor.h
-    IMultiplatformConfig.h
-    IRCLog.h
-    IResCompiler.h  
-    PakHelpers.cpp
-    PakManager.cpp
-    PakHelpers.h
-    PakManager.h
-    CfgFile.cpp
-    Config.cpp
-    DependencyList.cpp
-    ExcelExport.cpp
-    ExcelReport.cpp
-    ExtensionManager.cpp
-    ListFile.cpp
-    PropertyVars.cpp
-    ResourceCompiler_precompiled.cpp
-    ResourceCompiler_precompiled.h
-    TextFileReader.cpp
-    CfgFile.h
-    Config.h
-    ConvertContext.h
-    DebugLog.h
-    DependencyList.h
-    ExcelExport.h
-    ExcelReport.h
-    ExtensionManager.h
-    ListFile.h
-    MultiplatformConfig.h
-    PropertyVars.h
-    RcFile.h
-    resource.h
-    TextFileReader.h
-    AssetFileInfo.h
-    UpToDateFileHelpers.h
-    NameConvertor.h
-    SimpleString.h
-    IProgress.h
-    ResourceCompiler.rc
-    FunctionThread.h
-    ResourceCompiler.cpp
-    ResourceCompiler.h
-)
-
-set(SKIP_UNITY_BUILD_INCLUSION_FILES
-    IConfig.cpp
-    platform_implRC.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompiler/resourcecompiler_test_files.cmake b/Code/Tools/RC/ResourceCompiler/resourcecompiler_test_files.cmake
deleted file mode 100644
index 69403ed7c1..0000000000
--- a/Code/Tools/RC/ResourceCompiler/resourcecompiler_test_files.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    IUnitTestHelper.h
-    ResourceCompilerTests.cpp
-    UnitTestHelper.cpp
-    UnitTestHelper.h
-    Tests/test_Main.cpp
-    Tests/ResourceCompilerTestHelper.h
-    Tests/ZipEncryptorTests.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerABC/AlembicCompiler.cpp b/Code/Tools/RC/ResourceCompilerABC/AlembicCompiler.cpp
deleted file mode 100644
index 7026ba3712..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/AlembicCompiler.cpp
+++ /dev/null
@@ -1,2501 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerABC_precompiled.h"
-#include "AlembicCompiler.h"
-#include "GeomCacheEncoder.h"
-#include "StringHelpers.h"
-#include "IResCompiler.h"
-#include "IXml.h"
-#include "GeomCacheWriter.h"
-#include "UpToDateFileHelpers.h"
-#include "../../CryXML/ICryXML.h"
-#include "../../CryXML/IXMLSerializer.h"
-#include "ForsythFaceReorderer.h"   // for ForsythFaceReorderer
-#include "TangentSpaceCalculation.h"   // for CTangentSpaceCalculation
-#include "StringUtils.h"
-#include "CryPath.h"
-
-#include <AzCore/std/parallel/lock.h>
-
-namespace
-{
-    QuatTNS FromAlembicMatrix(const Alembic::AbcGeom::M44d& abcMatrix)
-    {
-        Matrix34 matrix;
-
-        matrix.m00 = (f32)abcMatrix.x[0][0];
-        matrix.m10 = (f32)abcMatrix.x[0][1];
-        matrix.m20 = (f32)abcMatrix.x[0][2];
-
-        matrix.m01 = (f32)abcMatrix.x[1][0];
-        matrix.m11 = (f32)abcMatrix.x[1][1];
-        matrix.m21 = (f32)abcMatrix.x[1][2];
-
-        matrix.m02 = (f32)abcMatrix.x[2][0];
-        matrix.m12 = (f32)abcMatrix.x[2][1];
-        matrix.m22 = (f32)abcMatrix.x[2][2];
-
-        matrix.m03 = (f32)abcMatrix.x[3][0] / 100.0f;
-        matrix.m13 = (f32)abcMatrix.x[3][1] / 100.0f;
-        matrix.m23 = (f32)abcMatrix.x[3][2] / 100.0f;
-
-        return QuatTNS(matrix);
-    }
-
-    Vec3 FromAlembicPosition(const Imath::Vec3<float>& abcPosition)
-    {
-        Vec3 position;
-        position[0] = abcPosition.x / 100.0f;
-        position[1] = abcPosition.y / 100.0f;
-        position[2] = abcPosition.z / 100.0f;
-        return position;
-    }
-
-    Vec4 FromAlembicColor(const Imath::Color3<float>& abcColor)
-    {
-        Vec4 color;
-        color[0] = abcColor.x;
-        color[1] = abcColor.y;
-        color[2] = abcColor.z;
-        color[3] = 0.0f;
-        return color;
-    }
-
-    Vec4 FromAlembicColor(const Imath::Color4<float>& abcColor)
-    {
-        Vec4 color;
-        color[0] = abcColor.r;
-        color[1] = abcColor.g;
-        color[2] = abcColor.b;
-        color[3] = abcColor.a;
-        return color;
-    }
-
-    Vec2 FromAlembicTexcoord(const Imath::Vec2<float>& abcTexcoord)
-    {
-        Vec2 texcoord;
-        texcoord.x = abcTexcoord.x;
-        texcoord.y = -abcTexcoord.y + 1.0f;
-        return texcoord;
-    }
-
-    class GeomCacheMeshTriangleInputProxy
-        : public ITriangleInputProxy
-    {
-    public:
-        GeomCacheMeshTriangleInputProxy(const std::vector<uint32>& indices, const std::vector<AlembicCompilerVertex>& vertices)
-            : m_indices(indices)
-            , m_vertices(vertices)
-        {
-            assert(m_indices.size() % 3 == 0);
-        }
-
-        virtual uint32 GetTriangleCount() const
-        {
-            return m_indices.size() / 3;
-        }
-
-        virtual void GetTriangleIndices(const uint32 indwTriNo, uint32 outdwPos[3], uint32 outdwNorm[3], uint32 outdwUV[3]) const
-        {
-            const uint32 indices[3] =
-            {
-                m_indices[indwTriNo * 3],
-                m_indices[indwTriNo * 3 + 1],
-                m_indices[indwTriNo * 3 + 2]
-            };
-
-            for (uint i = 0; i < 3; ++i)
-            {
-                // All attributes of one vertex share the same index
-                outdwPos[i] = indices[i];
-                outdwNorm[i] = indices[i];
-                outdwUV[i] = indices[i];
-            }
-        }
-
-        virtual void GetPos(const uint32 indwPos, Vec3& outfPos) const
-        {
-            outfPos[0] = m_vertices[indwPos].m_position[0];
-            outfPos[1] = m_vertices[indwPos].m_position[1];
-            outfPos[2] = m_vertices[indwPos].m_position[2];
-        }
-
-        virtual void GetUV(const uint32 indwPos, Vec2& outfUV) const
-        {
-            outfUV[0] = m_vertices[indwPos].m_texcoords[0];
-            outfUV[1] = m_vertices[indwPos].m_texcoords[1];
-        }
-
-        virtual void GetNorm(const uint32 indwTriNo, const uint32 indwVertNo, Vec3& outfNorm) const
-        {
-            const uint32 index = m_indices[indwTriNo * 3 + indwVertNo];
-            outfNorm[0] = m_vertices[index].m_normal[0];
-            outfNorm[1] = m_vertices[index].m_normal[1];
-            outfNorm[2] = m_vertices[index].m_normal[2];
-        }
-
-    private:
-        const std::vector<uint32>& m_indices;
-        const std::vector<AlembicCompilerVertex>& m_vertices;
-    };
-
-    // Helper class to wrap different color array types
-    class AlembicColorSampleArray
-    {
-    public:
-        AlembicColorSampleArray()
-            : pColorSamplesC3h(0)
-            , pColorSamplesC3f(0)
-            , pColorSamplesC3c(0)
-            , pColorSamplesC4h(0)
-            , pColorSamplesC4f(0)
-            , pColorSamplesC4c(0)
-            , pColorIndices(0) {}
-
-        AlembicColorSampleArray(const std::string& colorParamName, Alembic::AbcGeom::IPolyMeshSchema& meshSchema, Alembic::Abc::index_t index)
-            : pColorSamplesC3h(0)
-            , pColorSamplesC3f(0)
-            , pColorSamplesC3c(0)
-            , pColorSamplesC4h(0)
-            , pColorSamplesC4f(0)
-            , pColorSamplesC4c(0)
-        {
-            auto arbGeomParams = meshSchema.getArbGeomParams();
-
-            if (arbGeomParams)
-            {
-                const Alembic::Abc::PropertyHeader& propertyHeader = *arbGeomParams.getPropertyHeader(colorParamName);
-
-                if (Alembic::AbcGeom::IC3hGeomParam::matches(propertyHeader))
-                {
-                    Alembic::AbcGeom::IC3hGeomParam param(arbGeomParams, colorParamName);
-                    Alembic::AbcGeom::IC3hGeomParam::Sample colorSample;
-                    param.getIndexed(colorSample, index);
-                    pColorSamplesC3h = colorSample.getVals();
-                    pColorIndices = colorSample.getIndices();
-                }
-                else if (Alembic::AbcGeom::IC3fGeomParam::matches(propertyHeader))
-                {
-                    Alembic::AbcGeom::IC3fGeomParam param(arbGeomParams, colorParamName);
-                    Alembic::AbcGeom::IC3fGeomParam::Sample colorSample;
-                    param.getIndexed(colorSample, index);
-                    pColorSamplesC3f = colorSample.getVals();
-                    pColorIndices = colorSample.getIndices();
-                }
-                else if (Alembic::AbcGeom::IC3cGeomParam::matches(propertyHeader))
-                {
-                    Alembic::AbcGeom::IC3cGeomParam param(arbGeomParams, colorParamName);
-                    Alembic::AbcGeom::IC3cGeomParam::Sample colorSample;
-                    param.getIndexed(colorSample, index);
-                    pColorSamplesC3c = colorSample.getVals();
-                    pColorIndices = colorSample.getIndices();
-                }
-                else if (Alembic::AbcGeom::IC4hGeomParam::matches(propertyHeader))
-                {
-                    Alembic::AbcGeom::IC4hGeomParam param(arbGeomParams, colorParamName);
-                    Alembic::AbcGeom::IC4hGeomParam::Sample colorSample;
-                    param.getIndexed(colorSample, index);
-                    pColorSamplesC4h = colorSample.getVals();
-                    pColorIndices = colorSample.getIndices();
-                }
-                else if (Alembic::AbcGeom::IC4fGeomParam::matches(propertyHeader))
-                {
-                    Alembic::AbcGeom::IC4fGeomParam param(arbGeomParams, colorParamName);
-                    Alembic::AbcGeom::IC4fGeomParam::Sample colorSample;
-                    param.getIndexed(colorSample, index);
-                    pColorSamplesC4f = colorSample.getVals();
-                    pColorIndices = colorSample.getIndices();
-                }
-                else if (Alembic::AbcGeom::IC4cGeomParam::matches(propertyHeader))
-                {
-                    Alembic::AbcGeom::IC4cGeomParam param(arbGeomParams, colorParamName);
-                    Alembic::AbcGeom::IC4cGeomParam::Sample colorSample;
-                    param.getIndexed(colorSample, index);
-                    pColorSamplesC4c = colorSample.getVals();
-                    pColorIndices = colorSample.getIndices();
-                }
-            }
-        }
-
-        int32_t getIndex(int32_t currentIndexArraysIndex) const
-        {
-            if (pColorIndices)
-            {
-                return (*pColorIndices)[currentIndexArraysIndex];
-            }
-
-            return 0;
-        }
-
-        size_t GetSize() const
-        {
-            if (pColorSamplesC3h)
-            {
-                return pColorSamplesC3h->size();
-            }
-            else if (pColorSamplesC3f)
-            {
-                return pColorSamplesC3f->size();
-            }
-            else if (pColorSamplesC3c)
-            {
-                return pColorSamplesC3c->size();
-            }
-            if (pColorSamplesC4h)
-            {
-                return pColorSamplesC4h->size();
-            }
-            else if (pColorSamplesC4f)
-            {
-                return pColorSamplesC4f->size();
-            }
-            else if (pColorSamplesC4c)
-            {
-                return pColorSamplesC4c->size();
-            }
-
-            return 0;
-        }
-
-        size_t GetNumIndices() const
-        {
-            return pColorIndices->size();
-        }
-
-        Vec4 operator[](const size_t index) const
-        {
-            if (pColorSamplesC3h)
-            {
-                return FromAlembicColor((*pColorSamplesC3h)[index]);
-            }
-            else if (pColorSamplesC3f)
-            {
-                return FromAlembicColor((*pColorSamplesC3f)[index]);
-            }
-            else if (pColorSamplesC3c)
-            {
-                return FromAlembicColor((*pColorSamplesC3c)[index]);
-            }
-            else if (pColorSamplesC4h)
-            {
-                return FromAlembicColor((*pColorSamplesC4h)[index]);
-            }
-            else if (pColorSamplesC4f)
-            {
-                return FromAlembicColor((*pColorSamplesC4f)[index]);
-            }
-            else if (pColorSamplesC4c)
-            {
-                return FromAlembicColor((*pColorSamplesC4c)[index]);
-            }
-
-            return Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-        }
-
-    private:
-        Alembic::Abc::C3hArraySamplePtr pColorSamplesC3h;
-        Alembic::Abc::C3fArraySamplePtr pColorSamplesC3f;
-        Alembic::Abc::C3cArraySamplePtr pColorSamplesC3c;
-        Alembic::Abc::C4hArraySamplePtr pColorSamplesC4h;
-        Alembic::Abc::C4fArraySamplePtr pColorSamplesC4f;
-        Alembic::Abc::C4cArraySamplePtr pColorSamplesC4c;
-        Alembic::Abc::UInt32ArraySamplePtr pColorIndices;
-    };
-}
-
-AlembicMeshDigest::AlembicMeshDigest(Alembic::AbcGeom::IPolyMeshSchema& meshSchema)
-    : m_bHasNormals(meshSchema.getNormalsParam().valid())
-    , m_bHasTexcoords(meshSchema.getUVsParam().valid())
-    , m_bHasColors(false)
-{
-    Alembic::AbcGeom::ArraySampleKey positionDigest;
-    meshSchema.getPositionsProperty().getKey(positionDigest);
-
-    Alembic::AbcGeom::ArraySampleKey positionIndexDigest;
-    meshSchema.getFaceIndicesProperty().getKey(positionIndexDigest);
-
-    m_positionDigest = positionDigest;
-    m_positionIndexDigest = positionIndexDigest;
-
-    if (m_bHasNormals)
-    {
-        Alembic::AbcGeom::ArraySampleKey normalDigest;
-        meshSchema.getNormalsParam().getValueProperty().getKey(normalDigest);
-        m_normalsDigest = normalDigest;
-    }
-
-    if (m_bHasTexcoords)
-    {
-        Alembic::AbcGeom::ArraySampleKey texcoordDigest;
-        meshSchema.getUVsParam().getValueProperty().getKey(texcoordDigest);
-        m_texcoordDigest = texcoordDigest;
-    }
-
-    Alembic::AbcGeom::ArraySampleKey colorDigest;
-    auto arbParams = meshSchema.getArbGeomParams();
-    if (arbParams)
-    {
-        const uint numProperties = arbParams.getNumProperties();
-        for (uint i = 0; i < numProperties; ++i)
-        {
-            auto& propertyHeader = arbParams.getPropertyHeader(i);
-            const std::string& colorParamName = propertyHeader.getName();
-
-            if (Alembic::AbcGeom::IC3hGeomParam::matches(propertyHeader))
-            {
-                m_bHasColors = true;
-                Alembic::AbcGeom::IC3hGeomParam param(arbParams, colorParamName);
-                param.getValueProperty().getKey(colorDigest);
-            }
-            else if (Alembic::AbcGeom::IC3fGeomParam::matches(propertyHeader))
-            {
-                m_bHasColors = true;
-                Alembic::AbcGeom::IC3fGeomParam param(arbParams, colorParamName);
-                param.getValueProperty().getKey(colorDigest);
-            }
-            else if (Alembic::AbcGeom::IC3cGeomParam::matches(propertyHeader))
-            {
-                m_bHasColors = true;
-                Alembic::AbcGeom::IC3cGeomParam param(arbParams, colorParamName);
-                param.getValueProperty().getKey(colorDigest);
-            }
-            else if (Alembic::AbcGeom::IC4hGeomParam::matches(propertyHeader))
-            {
-                m_bHasColors = true;
-                Alembic::AbcGeom::IC4hGeomParam param(arbParams, colorParamName);
-                param.getValueProperty().getKey(colorDigest);
-            }
-            else if (Alembic::AbcGeom::IC4fGeomParam::matches(propertyHeader))
-            {
-                m_bHasColors = true;
-                Alembic::AbcGeom::IC4fGeomParam param(arbParams, colorParamName);
-                param.getValueProperty().getKey(colorDigest);
-            }
-            else if (Alembic::AbcGeom::IC4cGeomParam::matches(propertyHeader))
-            {
-                m_bHasColors = true;
-                Alembic::AbcGeom::IC4cGeomParam param(arbParams, colorParamName);
-                param.getValueProperty().getKey(colorDigest);
-            }
-        }
-    }
-}
-
-bool AlembicMeshDigest::operator==(const AlembicMeshDigest& digest) const
-{
-    if (m_bHasNormals != digest.m_bHasNormals)
-    {
-        return false;
-    }
-
-    if (m_bHasTexcoords != digest.m_bHasTexcoords)
-    {
-        return false;
-    }
-
-    if (m_bHasColors != digest.m_bHasColors)
-    {
-        return false;
-    }
-
-    if (m_bHasNormals && m_normalsDigest != digest.m_normalsDigest)
-    {
-        return false;
-    }
-
-    if (m_bHasTexcoords && m_texcoordDigest != digest.m_texcoordDigest)
-    {
-        return false;
-    }
-
-    if (m_bHasColors && m_colorsDigest != digest.m_colorsDigest)
-    {
-        return false;
-    }
-
-    return m_positionDigest == digest.m_positionDigest
-           && m_positionIndexDigest == digest.m_positionIndexDigest;
-}
-
-AlembicCompiler::AlembicCompiler(ICryXML* pXMLParser)
-    : m_pXMLParser(pXMLParser)
-    , m_refCount(1)
-    , m_errorCount(0)
-    , m_numAnimatedMeshes(0)
-    , m_b32BitIndices(false)
-{
-    m_rootNode.m_type = GeomCacheFile::eNodeType_Transform;
-    m_rootNode.m_transformType = GeomCacheFile::eTransformType_Constant;
-    m_rootNode.m_staticNodeData.m_bVisible = true;
-    m_rootNode.m_staticNodeData.m_transform.SetIdentity();
-    m_uvMax = RC_ABC_AUTOMATIC_UVMAX_DETECTION_VALUE;
-}
-
-void AlembicCompiler::Release()
-{
-    if (--m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-bool AlembicCompiler::Process()
-{
-    const string& sourcePath = m_CC.GetSourcePath();
-
-    if (!m_CC.m_bForceRecompiling && UpToDateFileHelpers::FileExistsAndUpToDate(GetOutputPath(), sourcePath))
-    {
-        // The file is up-to-date
-        m_CC.m_pRC->AddInputOutputFilePair(sourcePath, GetOutputPath());
-        return true;
-    }
-
-    // Open archive
-    RCLog(string("Beginning to open archive: ") + sourcePath.c_str());
-
-    Alembic::AbcCoreFactory::IFactory factory;
-    factory.setPolicy(Alembic::Abc::ErrorHandler::kQuietNoopPolicy);
-    Alembic::Abc::IArchive archive = factory.getArchive(sourcePath.c_str());
-
-    if (!archive.valid())
-    {
-        RCLogError("Not a valid alembic file.");
-        Cleanup();
-        return false;
-    }
-
-    std::string appName;
-    std::string libraryVersionString;
-    uint32 libraryVersion;
-    std::string whenWritten;
-    std::string userDescription;
-
-    Alembic::Abc::GetArchiveInfo(archive, appName, libraryVersionString, libraryVersion, whenWritten,   userDescription);
-    if (appName != "")
-    {
-        RCLog(string("  File written by: ") + appName.c_str());
-        RCLog(string("  Using alembic version: ") + libraryVersionString.c_str());
-        RCLog(string("  Written on: ") + whenWritten.c_str());
-        RCLog(string("  User description: ") + userDescription.c_str());
-    }
-
-    IXMLSerializer* pXMLSerializer = m_pXMLParser->GetXMLSerializer();
-    const string configPath = PathUtil::ReplaceExtension(sourcePath, "cbc");
-    XmlNodeRef config = ReadConfig(configPath, pXMLSerializer);
-
-    if (!config)
-    {
-        Cleanup();
-        return false;
-    }
-
-    const string s = m_CC.m_config->GetAsString("VertexIndexFormat", "u16", "u16");
-    m_b32BitIndices = StringHelpers::EqualsIgnoreCase(s, "u32");
-
-    // Reset stats
-    m_numExportedMeshes = 0;
-    m_numVertexSplits = 0;
-    m_numSharedMeshNodes = 0;
-
-    // Check time sampling
-    if (!CheckTimeSampling(archive))
-    {
-        Cleanup();
-        return false;
-    }
-
-    // Overwrite export file name if specified by command line
-    string exportFileName = GetOutputPath();
-    const size_t numFrames = m_frameTimes.size();
-    GeomCacheWriter geomCacheWriter(exportFileName, m_blockCompressionFormat, numFrames, m_bPlaybackFromMemory, m_b32BitIndices);
-    GeomCacheEncoder geomCacheEncoder(geomCacheWriter, m_rootNode, m_meshes, m_bUseBFrames, m_indexFrameDistance);
-
-    // Export static data (create mesh topologies etc.)
-    if (!CompileStaticData(archive))
-    {
-        Cleanup();
-        return false;
-    }
-
-    const int verbosityLevel = m_CC.m_config->HasKey("verbose") ? m_CC.m_config->GetAsInt("verbose", 1, 1) : 0;
-    if (verbosityLevel > 0)
-    {
-        RCLog("Compiled node tree:");
-        PrintNodeTreeRec(m_rootNode, "");
-    }
-
-    // Normalize frame times (first frame is always 0.0f)
-    std::vector<Alembic::Abc::chrono_t> normalizedFrameTimes;
-    const Alembic::Abc::chrono_t firstFrameTime = m_frameTimes.front();
-    for (uint i = 0; i < m_frameTimes.size(); ++i)
-    {
-        normalizedFrameTimes.push_back(m_frameTimes[i] - firstFrameTime);
-    }
-
-    geomCacheWriter.WriteStaticData(normalizedFrameTimes, m_meshes, m_rootNode);
-
-    // Export animated data (frames)
-    geomCacheEncoder.Init();
-    if (!CompileAnimationData(archive, geomCacheEncoder))
-    {
-        Cleanup();
-        return false;
-    }
-
-    GeomCacheWriterStats stats = geomCacheWriter.FinishWriting();
-
-    const Alembic::Abc::chrono_t sequenceLength = m_frameTimes.back() - m_frameTimes.front();
-    const double headerDataMegaBytes = static_cast<double>(stats.m_headerDataSize) / (1024.0 * 1024.0);
-    const double staticDataMegaBytes = static_cast<double>(stats.m_staticDataSize) / (1024.0 * 1024.0);
-    const double animationDataMegaBytes = static_cast<double>(stats.m_animationDataSize) / (1024.0 * 1024.0);
-
-    RCLog("Stats");
-    RCLog("  %.2f MiB header data", headerDataMegaBytes);
-    RCLog("  %.2f MiB static data", staticDataMegaBytes);
-    RCLog("  %.2f MiB animation data", animationDataMegaBytes);
-
-    if (stats.m_uncompressedAnimationSize > 0)
-    {
-        const double compressionRate = static_cast<double>(stats.m_animationDataSize) / static_cast<double>(stats.m_uncompressedAnimationSize) * 100.0f;
-        RCLog("  Compression ratio: %.1f%%", compressionRate);
-    }
-
-    if (sequenceLength > 0.0)
-    {
-        RCLog("  Average data rate: %.2f MiB/s", (double)animationDataMegaBytes / sequenceLength);
-    }
-
-    Cleanup();
-
-    if (!UpToDateFileHelpers::SetMatchingFileTime(GetOutputPath(), sourcePath))
-    {
-        return false;
-    }
-
-    m_CC.m_pRC->AddInputOutputFilePair(sourcePath, GetOutputPath());
-
-    return true;
-}
-
-string AlembicCompiler::GetOutputFileNameOnly() const
-{
-    const string sourceFileFinal = m_CC.m_config->GetAsString("overwritefilename", m_CC.m_sourceFileNameOnly.c_str(), m_CC.m_sourceFileNameOnly.c_str());
-    return PathHelpers::ReplaceExtension(sourceFileFinal, CRY_GEOM_CACHE_FILE_EXT);
-}
-
-string AlembicCompiler::GetOutputPath() const
-{
-    return PathHelpers::Join(m_CC.GetOutputFolder(), GetOutputFileNameOnly());
-}
-
-bool AlembicCompiler::CheckTimeSampling(Alembic::Abc::IArchive& archive)
-{
-    RCLog("Checking scene time sampling...");
-
-    m_minTime = std::numeric_limits<Alembic::Abc::chrono_t>::max();
-    m_maxTime = -std::numeric_limits<Alembic::Abc::chrono_t>::max();
-
-    CheckTimeSamplingRec(archive.getTop());
-
-    const uint numTimeSamplings = m_timeSamplings.size();
-    if (m_minTime >= m_maxTime)
-    {
-        RCLogWarning("  Scene is constant");
-        m_minTime = 0.0;
-        m_maxTime = 0.0;
-        m_frameTimes.push_back(0.0);
-    }
-    else if (numTimeSamplings == 1)
-    {
-        const Alembic::Abc::TimeSamplingType& timeSamplingType = m_timeSamplings[0].getTimeSamplingType();
-        OutputTimeSamplingType(timeSamplingType);
-
-        const size_t numSamplesPerCycles = timeSamplingType.getNumSamplesPerCycle();
-        const Alembic::Abc::chrono_t timePerCycle = timeSamplingType.getTimePerCycle();
-        const size_t numCycles = (timePerCycle > 0.0f) ? (size_t)ceil((m_maxTime - m_minTime) / timePerCycle) : 0;
-
-        for (size_t cycle = 0; cycle < numCycles; ++cycle)
-        {
-            for (size_t sample = 0; sample < numSamplesPerCycles; ++sample)
-            {
-                m_frameTimes.push_back(cycle * timePerCycle + m_timeSamplings[0].getSampleTime(sample));
-            }
-        }
-    }
-    else
-    {
-        RCLogWarning("  Found %d different time samplings. Will bake scene to fixed 30 FPS.", numTimeSamplings);
-
-        Alembic::Abc::chrono_t frameTime = 1.0 / 30.0;
-        const size_t numFrames = (size_t)ceil((m_maxTime - m_minTime) / frameTime) + 1;
-        for (size_t i = 0; i < numFrames; ++i)
-        {
-            m_frameTimes.push_back(i + frameTime);
-        }
-
-        for (uint i = 0; i < numTimeSamplings; ++i)
-        {
-            const Alembic::Abc::TimeSamplingType& timeSamplingType = m_timeSamplings[i].getTimeSamplingType();
-            OutputTimeSamplingType(timeSamplingType);
-        }
-    }
-
-    m_timeSamplings.clear();
-
-    RCLog("  Min time in Alembic is %g seconds, max time is %g seconds.", m_minTime, m_maxTime);
-    RCLog("  Exporting %Iu frames", m_frameTimes.size());
-
-    return true;
-}
-
-void AlembicCompiler::CheckTimeSamplingRec(const Alembic::Abc::IObject& currentObject)
-{
-    const Alembic::Abc::ICompoundProperty& compoundProperty = currentObject.getProperties();
-    CheckTimeSamplingRec(compoundProperty);
-
-    const size_t numChildren = currentObject.getNumChildren();
-    for (size_t i = 0; i < numChildren; ++i)
-    {
-        CheckTimeSamplingRec(currentObject.getChild(i));
-    }
-}
-
-void AlembicCompiler::CheckTimeSamplingRec(const Alembic::Abc::ICompoundProperty& currentProperty)
-{
-    const size_t numProperties = currentProperty.getNumProperties();
-    for (size_t i = 0; i < numProperties; ++i)
-    {
-        Alembic::Abc::PropertyHeader propertyHeader = currentProperty.getPropertyHeader(i);
-
-        if (propertyHeader.isSimple())
-        {
-            Alembic::Abc::TimeSamplingPtr timeSampling = propertyHeader.getTimeSampling();
-
-            if (propertyHeader.isArray())
-            {
-                Alembic::Abc::IArrayProperty childProperty(currentProperty, propertyHeader.getName());
-
-                if (!childProperty.isConstant())
-                {
-                    stl::push_back_unique(m_timeSamplings, *timeSampling);
-                    size_t numSamples = childProperty.getNumSamples();
-                    m_minTime = std::min(m_minTime, timeSampling->getSampleTime(0));
-                    m_maxTime = std::max(m_maxTime, timeSampling->getSampleTime(numSamples - 1));
-                }
-            }
-            else if (propertyHeader.isScalar())
-            {
-                Alembic::Abc::IScalarProperty childProperty(currentProperty, propertyHeader.getName());
-
-                if (!childProperty.isConstant())
-                {
-                    stl::push_back_unique(m_timeSamplings, *timeSampling);
-                    size_t numSamples = childProperty.getNumSamples();
-                    m_minTime = std::min(m_minTime, timeSampling->getSampleTime(0));
-                    m_maxTime = std::max(m_maxTime, timeSampling->getSampleTime(numSamples - 1));
-                }
-            }
-        }
-        else
-        {
-            Alembic::Abc::ICompoundProperty childProperty(currentProperty, propertyHeader.getName());
-            CheckTimeSamplingRec(childProperty);
-        }
-    }
-}
-
-void AlembicCompiler::OutputTimeSamplingType(const Alembic::Abc::TimeSamplingType& timeSamplingType)
-{
-    if (timeSamplingType.isUniform())
-    {
-        Alembic::Abc::chrono_t frameTime = timeSamplingType.getTimePerCycle();
-        RCLog("  Found uniform time sampling with %g FPS.", 1.0 / frameTime);
-    }
-    else if (timeSamplingType.isAcyclic())
-    {
-        RCLog("  Found acyclic time sampling with %d frames.", timeSamplingType.getNumSamplesPerCycle());
-    }
-    else if (timeSamplingType.isCyclic())
-    {
-        RCLog("  Found cyclic time sampling with %g second cycle time and %d frames per cycle.",
-            timeSamplingType.getTimePerCycle(), timeSamplingType.getNumSamplesPerCycle());
-    }
-}
-
-bool AlembicCompiler::CompileStaticData(Alembic::Abc::IArchive& archive)
-{
-#if !defined(AZ_PLATFORM_APPLE)
-    try
-#endif // !defined(AZ_PLATFORM_APPLE)
-    {
-        RCLog("Compiling static data...");
-
-        Alembic::Abc::IObject topObject = archive.getTop();
-        std::vector<Alembic::AbcGeom::IXform> abcXformStack;
-        CompileStaticDataRec(&m_rootNode, topObject, QuatTNS(IDENTITY), abcXformStack, false, GeomCacheFile::eTransformType_Constant);
-
-        // Sanity check, this should never happen
-        if (m_rootNode.m_transformType != GeomCacheFile::eTransformType_Constant ||
-            m_rootNode.m_staticNodeData.m_transform.q != Quat(IDENTITY) || m_rootNode.m_staticNodeData.m_transform.t != Vec3(0.0f) || m_rootNode.m_staticNodeData.m_transform.s != Vec3(1.0))
-        {
-            RCLogError("  Internal error: Root node is not constant or is not identity.");
-            return false;
-        }
-
-        if (m_errorCount > 0)
-        {
-            RCLogError("  Failed to compile %d meshes", m_errorCount.load());
-            return false;
-        }
-
-        if (m_numExportedMeshes == 0)
-        {
-            RCLogError("  Failed to compile any mesh");
-            return false;
-        }
-
-        RCLog("  Compiled %d meshes", m_numExportedMeshes);
-        RCLog("  %d nodes with shared mesh", m_numSharedMeshNodes);
-        RCLog("  Split %d vertices", m_numVertexSplits.load());
-    }
-#if !defined(AZ_PLATFORM_APPLE)
-    catch (const Alembic::Util::Exception& alembicException)
-    {
-        RCLogError("Alembic exception while processing %s static data: %s",
-            m_currentObjectPath.c_str(), alembicException.c_str());
-        return false;
-    }
-    catch (...)
-    {
-        RCLogError("Unknown exception while processing %s static data", m_currentObjectPath.c_str());
-        return false;
-    }
-#endif // !defined(AZ_PLATFORM_APPLE)
-
-    if (m_bConvertYUpToZUp)
-    {
-        m_rootNode.m_staticNodeData.m_transform = m_rootNode.m_staticNodeData.m_transform * Quat(Ang3(gf_PI / 2.0f, 0.0f, 0.0f));
-    }
-
-    return true;
-}
-
-bool AlembicCompiler::CompileStaticDataRec(GeomCache::Node* pParentNode, Alembic::Abc::IObject& currentObject,
-    const QuatTNS& localTransform, std::vector<Alembic::AbcGeom::IXform> abcXformStack,
-    const bool bParentRemoved, const GeomCacheFile::ETransformType parentTransform)
-{
-    m_currentObjectPath = currentObject.getFullName();
-
-    QuatTNS newLocalTransform = localTransform;
-    const size_t numChildren = currentObject.getNumChildren();
-
-    // If this node doesn't have children, discard this node
-    if (numChildren == 0 && !Alembic::AbcGeom::IPolyMesh::matches(currentObject.getHeader()))
-    {
-        return false;
-    }
-
-    // Check if node is always invisible
-    Alembic::AbcGeom::IVisibilityProperty visibilityProperty = Alembic::AbcGeom::GetVisibilityProperty(currentObject);
-
-    if (visibilityProperty && visibilityProperty.isConstant())
-    {
-        int8_t rawVisibilityValue;
-        rawVisibilityValue = visibilityProperty.getValue();
-        Alembic::AbcGeom::ObjectVisibility visibility = Alembic::AbcGeom::ObjectVisibility(rawVisibilityValue);
-
-        if (visibility == Alembic::AbcGeom::kVisibilityHidden)
-        {
-            RCLogWarning("  Ignoring invisible node:\n    %s.", currentObject.getFullName().c_str());
-            return false;
-        }
-    }
-
-    std::unique_ptr<GeomCache::Node> pCurrentNode(new GeomCache::Node);
-    pCurrentNode->m_staticNodeData.m_transform = localTransform;
-
-    pCurrentNode->m_name = currentObject.getFullName().c_str();
-
-    // Flag to indicate to flatten hierarchy when encountering static node transform
-    bool bFlatten = false;
-
-    // Stores if sub tree is valid
-    bool bValidSubTree = false;
-
-    // If node is mesh
-    bool bNodeIsTransform = false;
-
-    // If transform inherits parents transform
-    bool bInheritsTransform = true;
-
-    if (Alembic::AbcGeom::IPolyMesh::matches(currentObject.getHeader()))
-    {
-        pCurrentNode->m_transformType = bParentRemoved ? parentTransform : GeomCacheFile::eTransformType_Constant;
-        Alembic::AbcGeom::IPolyMesh mesh(currentObject, Alembic::Abc::kWrapExisting);
-
-        if (CryStringUtils::stristr(pCurrentNode->m_name.c_str(), "cryphys"))
-        {
-            // Export physics proxy
-            pCurrentNode->m_type = GeomCacheFile::eNodeType_PhysicsGeometry;
-            bValidSubTree = CompilePhysicsGeometry(*pCurrentNode, mesh);
-        }
-        else
-        {
-            // Export mesh
-            pCurrentNode->m_type = GeomCacheFile::eNodeType_Mesh;
-            bValidSubTree = CompileStaticMeshData(*pCurrentNode, mesh);
-        }
-    }
-    else if (Alembic::AbcGeom::IXform::matches(currentObject.getHeader()))
-    {
-        Alembic::AbcGeom::IXform xForm(currentObject, Alembic::Abc::kWrapExisting);
-        Alembic::AbcGeom::IXformSchema& schema = xForm.getSchema();
-        bFlatten = schema.isConstant();
-
-        const Alembic::AbcGeom::M44d& matrix = schema.getValue().getMatrix();
-        const QuatTNS abcLocalTransform = FromAlembicMatrix(matrix);
-
-        if (schema.getInheritsXforms())
-        {
-            abcXformStack.push_back(Alembic::AbcGeom::IXform(currentObject, Alembic::Abc::kWrapExisting));
-            newLocalTransform = localTransform * abcLocalTransform;
-
-            pCurrentNode->m_transformType = schema.isConstant()
-                ? (bParentRemoved ? parentTransform : GeomCacheFile::eTransformType_Constant)
-                : GeomCacheFile::eTransformType_Animated;
-        }
-        else
-        {
-            // Completely new base transform, discard parent transforms and re-parent to root.
-            bInheritsTransform = false;
-            pParentNode = &m_rootNode;
-            abcXformStack.clear();
-            abcXformStack.push_back(Alembic::AbcGeom::IXform(currentObject, Alembic::Abc::kWrapExisting));
-            newLocalTransform = abcLocalTransform;
-
-            pCurrentNode->m_transformType = schema.isConstant()
-                ? GeomCacheFile::eTransformType_Constant
-                : GeomCacheFile::eTransformType_Animated;
-        }
-
-        bNodeIsTransform = true;
-        pCurrentNode->m_staticNodeData.m_transform = newLocalTransform;
-    }
-    else
-    {
-        bFlatten = true;
-    }
-
-    pCurrentNode->m_abcObject = Alembic::Abc::IObject(Alembic::Abc::ALEMBIC_VERSION_NS::GetObjectReaderPtr(currentObject), Alembic::Abc::kWrapExisting);
-    pCurrentNode->m_abcXForms = abcXformStack;
-
-    // Flatten hierarchy if possible
-    if (bFlatten || (bNodeIsTransform && numChildren == 1))
-    {
-        for (size_t i = 0; i < numChildren; ++i)
-        {
-            Alembic::Abc::IObject child = currentObject.getChild(i);
-            bValidSubTree = CompileStaticDataRec(pParentNode, child,
-                    newLocalTransform, abcXformStack, true, pCurrentNode->m_transformType) || bValidSubTree;
-        }
-    }
-    else
-    {
-        // Otherwise use this node as new parent. The children need a new transform stack
-        abcXformStack.clear();
-
-        for (size_t i = 0; i < numChildren; ++i)
-        {
-            Alembic::Abc::IObject child = currentObject.getChild(i);
-            bValidSubTree = CompileStaticDataRec(pCurrentNode.get(), child,
-                    QuatTNS(IDENTITY), abcXformStack, false, pCurrentNode->m_transformType) || bValidSubTree;
-        }
-
-        if (bValidSubTree)
-        {
-            assert(pParentNode != pCurrentNode.get());
-            pParentNode->m_children.push_back(std::move(pCurrentNode));
-        }
-    }
-
-    if (!bValidSubTree)
-    {
-        RCLogWarning("  Node contains no meshes:\n    %s", currentObject.getFullName().c_str());
-    }
-
-    // If node does not inherit parents transform return false, because path
-    // to this node is irrelevant and tree can potentially be thrown away.
-    return bValidSubTree && bInheritsTransform;
-}
-
-bool AlembicCompiler::CompileStaticMeshData(GeomCache::Node& node, Alembic::AbcGeom::IPolyMesh& mesh)
-{
-#if defined(DEBUG)
-    RCLog("  Processing %s", mesh.getFullName().c_str());
-#endif
-
-    // Check basic mesh parameters
-    Alembic::AbcGeom::IPolyMeshSchema& meshSchema = mesh.getSchema();
-    Alembic::AbcGeom::MeshTopologyVariance topologyVariance = meshSchema.getTopologyVariance();
-
-    std::shared_ptr<GeomCache::Mesh> pMesh(new GeomCache::Mesh);
-    pMesh->m_constantStreams = GeomCacheFile::EStreams(0);
-    pMesh->m_animatedStreams = GeomCacheFile::EStreams(0);
-
-    switch (topologyVariance)
-    {
-    case Alembic::AbcGeom::kConstantTopology:
-        pMesh->m_constantStreams = GeomCacheFile::EStreams(pMesh->m_constantStreams | GeomCacheFile::eStream_Indices);
-        pMesh->m_constantStreams = GeomCacheFile::EStreams(pMesh->m_constantStreams | GeomCacheFile::eStream_Positions);
-        break;
-    case Alembic::AbcGeom::kHomogenousTopology:
-        pMesh->m_constantStreams = GeomCacheFile::EStreams(pMesh->m_constantStreams | GeomCacheFile::eStream_Indices);
-        pMesh->m_animatedStreams = GeomCacheFile::EStreams(pMesh->m_animatedStreams | GeomCacheFile::eStream_Positions);
-        break;
-    case Alembic::AbcGeom::kHeterogenousTopology:
-        // TODO: There is code that supports heterogeneous topology, but it's not complete and untested.
-        RCLogWarning("  Heterogeneous topology is currently not supported. Skipped.");
-        return false;
-    default:
-        RCLogWarning("  Unknown alembic topology variance. Skipped.");
-        return false;
-    }
-
-    // Check for normals & texcoords. We assume this is fixed over time
-    pMesh->m_bHasNormals = meshSchema.getNormalsParam().valid();
-    pMesh->m_bHasTexcoords = meshSchema.getUVsParam().valid();
-    CheckMeshForColors(meshSchema, *pMesh);
-
-    if (!pMesh->m_bHasNormals)
-    {
-        RCLogWarning("  Mesh doesn't have normals. Generating smooth normals:\n    %s", mesh.getFullName().c_str());
-    }
-
-    if (!pMesh->m_bHasTexcoords)
-    {
-        RCLogWarning("  Mesh doesn't have texcoords:\n    %s", mesh.getFullName().c_str());
-    }
-
-    if (!pMesh->m_bHasTexcoords || meshSchema.getUVsParam().getValueProperty().isConstant())
-    {
-        pMesh->m_constantStreams = GeomCacheFile::EStreams(pMesh->m_constantStreams | GeomCacheFile::eStream_Texcoords);
-    }
-    else
-    {
-        pMesh->m_animatedStreams = GeomCacheFile::EStreams(pMesh->m_animatedStreams | GeomCacheFile::eStream_Texcoords);
-    }
-
-    const bool bConstantNormals = pMesh->m_bHasNormals ? meshSchema.getNormalsParam().getValueProperty().isConstant() : true;
-    if (bConstantNormals && (pMesh->m_animatedStreams & (GeomCacheFile::eStream_Positions | GeomCacheFile::eStream_Texcoords)) == 0)
-    {
-        // If normals, positions & texcoords are constant we can use a constant qtangent stream
-        pMesh->m_constantStreams = GeomCacheFile::EStreams(pMesh->m_constantStreams | GeomCacheFile::eStream_QTangents);
-    }
-    else
-    {
-        pMesh->m_animatedStreams = GeomCacheFile::EStreams(pMesh->m_animatedStreams | GeomCacheFile::eStream_QTangents);
-    }
-
-    assert((pMesh->m_constantStreams & pMesh->m_animatedStreams) == 0);
-
-    pMesh->m_abcMesh = Alembic::AbcGeom::IPolyMesh(mesh, Alembic::Abc::kWrapExisting);
-    if (pMesh->m_animatedStreams == 0)
-    {
-        AlembicMeshDigest meshDigest(meshSchema);
-
-        // For constant meshes we allow mesh sharing. Check if we already
-        // have a mesh with that digest. If so share it.
-        auto findIter = m_digestToMeshMap.find(meshDigest);
-        if (findIter != m_digestToMeshMap.end())
-        {
-            ++m_numSharedMeshNodes;
-            node.m_pMesh = findIter->second;
-            return true;
-        }
-
-        if (!CompileFullMesh(*pMesh, 0, node.m_staticNodeData.m_transform))
-        {
-            return false;
-        }
-
-        // Add mesh to digest map
-        m_digestToMeshMap[meshDigest] = pMesh;
-    }
-    else
-    {
-        if (!CompileFullMesh(*pMesh, 0, node.m_staticNodeData.m_transform))
-        {
-            return false;
-        }
-    }
-
-    node.m_pMesh = pMesh;
-
-    m_meshes.push_back(pMesh.get());
-
-    if (pMesh->m_animatedStreams != 0)
-    {
-        ++m_numAnimatedMeshes;
-    }
-
-    // Yay, we exported one more mesh
-    ++m_numExportedMeshes;
-
-    return true;
-}
-
-bool AlembicCompiler::CompilePhysicsGeometry(GeomCache::Node& node, Alembic::AbcGeom::IPolyMesh& mesh)
-{
-    AZ_UNUSED(node)
-    AZ_UNUSED(mesh)
-    return true;
-}
-
-XmlNodeRef AlembicCompiler::ReadConfig(const string& configPath, IXMLSerializer* pXMLSerializer)
-{
-    RCLog(string("Reading cache build configuration: ") + configPath.c_str());
-    XmlNodeRef config = pXMLSerializer->Read(FileXmlBufferSource(configPath), false, 0, 0);
-
-    // Read in axis from config file
-    string upAxis = "Y";
-    string meshPrediction = "0";
-    string useBFrames = "0";
-    string indexFrameDistance = "10";
-    string blockCompressionFormat = "deflate";
-    string playbackFromMemory = "0";
-    string positionPrecision = "1";
-    float uvMax = RC_ABC_AUTOMATIC_UVMAX_DETECTION_VALUE;
-
-    if (config)
-    {
-        if (config->haveAttr("UpAxis"))
-        {
-            upAxis = config->getAttr("UpAxis");
-        }
-
-        if (config->haveAttr("MeshPrediction"))
-        {
-            meshPrediction = config->getAttr("MeshPrediction");
-        }
-
-        if (config->haveAttr("UseBFrames"))
-        {
-            useBFrames = config->getAttr("UseBFrames");
-        }
-
-        if (config->haveAttr("IndexFrameDistance"))
-        {
-            indexFrameDistance = config->getAttr("IndexFrameDistance");
-        }
-
-        if (config->haveAttr("BlockCompressionFormat"))
-        {
-            blockCompressionFormat = config->getAttr("BlockCompressionFormat");
-        }
-
-        if (config->haveAttr("PlaybackFromMemory"))
-        {
-            playbackFromMemory = config->getAttr("PlaybackFromMemory");
-        }
-
-        if (config->haveAttr("PositionPrecision"))
-        {
-            positionPrecision = config->getAttr("PositionPrecision");
-        }
-        if (config->haveAttr("UVmax"))
-        {
-            uvMax = static_cast<float>(atof(config->getAttr("UVmax")));
-        }
-    }
-    else
-    {
-        bool bSkipFilesWithoutBuildConfig = false;
-
-        if (m_CC.m_config->HasKey("skipFilesWithoutBuildConfig"))
-        {
-            bSkipFilesWithoutBuildConfig = m_CC.m_config->GetAsBool("skipFilesWithoutBuildConfig", bSkipFilesWithoutBuildConfig, bSkipFilesWithoutBuildConfig);
-        }
-
-        if (!bSkipFilesWithoutBuildConfig)
-        {
-            RCLogWarning("  Build configuration file not found, writing new one");
-            config = pXMLSerializer->CreateNode("CacheBuildConfiguration");
-        }
-        else
-        {
-            RCLogError("  Build configuration file not found. Skipped.");
-            return NULL;
-        }
-    }
-
-    // Command line overrides
-    upAxis = m_CC.m_config->GetAsString("upAxis", upAxis, upAxis);
-    meshPrediction = m_CC.m_config->GetAsString("meshPrediction", meshPrediction, meshPrediction);
-    useBFrames = m_CC.m_config->GetAsString("useBFrames", useBFrames, useBFrames);
-    indexFrameDistance = m_CC.m_config->GetAsString("indexFrameDistance", indexFrameDistance, indexFrameDistance);
-    blockCompressionFormat = m_CC.m_config->GetAsString("blockCompressionFormat", blockCompressionFormat, blockCompressionFormat);
-    playbackFromMemory = m_CC.m_config->GetAsString("playbackFromMemory", playbackFromMemory, playbackFromMemory);
-    positionPrecision = m_CC.m_config->GetAsString("positionPrecision", positionPrecision, positionPrecision);
-    uvMax = m_CC.m_config->GetAsFloat("uvMax", uvMax, uvMax);
-
-    // Check if we need to convert the axis
-    m_bConvertYUpToZUp = upAxis.compareNoCase("Y") == 0;
-    if (m_bConvertYUpToZUp)
-    {
-        RCLog("  Converting Y up to Z up");
-    }
-
-    m_bPlaybackFromMemory = playbackFromMemory.compareNoCase("1") == 0;
-    if (m_bPlaybackFromMemory)
-    {
-        RCLog("  Playback from memory");
-    }
-
-    m_bMeshPrediction = (meshPrediction.compareNoCase("1") == 0) && (blockCompressionFormat != "store");
-    if (m_bMeshPrediction)
-    {
-        RCLog("  Using mesh prediction");
-    }
-
-    m_indexFrameDistance = 15;
-    m_bUseBFrames = (useBFrames.compareNoCase("1") == 0) && (blockCompressionFormat != "store");
-    if (m_bUseBFrames)
-    {
-        m_indexFrameDistance = atoi(indexFrameDistance.c_str());
-        RCLog("  Using bi-directional predicted frames");
-        RCLog("  Index frame distance is %d", m_indexFrameDistance);
-    }
-
-    if (blockCompressionFormat == "store")
-    {
-        m_blockCompressionFormat = GeomCacheFile::eBlockCompressionFormat_None;
-        RCLog("  No frame compression");
-    }
-    else if (blockCompressionFormat == "lz4hc")
-    {
-        m_blockCompressionFormat = GeomCacheFile::eBlockCompressionFormat_LZ4HC;
-        RCLog("  Using LZ4 HC compression");
-    }
-    else if (blockCompressionFormat == "zstd")
-    {
-        m_blockCompressionFormat = GeomCacheFile::eBlockCompressionFormat_ZSTD;
-        RCLog("  Using ZSTANDARD compression");
-    }
-    else
-    {
-        m_blockCompressionFormat = GeomCacheFile::eBlockCompressionFormat_Deflate;
-        RCLog("  Using deflate (zlib) compression");
-    }
-
-    m_positionPrecision = std::max(atof(positionPrecision), 0.0);
-    if (m_positionPrecision == 0.0)
-    {
-        RCLog("  Maximum position precision", m_positionPrecision);
-    }
-    else
-    {
-        RCLog("  %g mm position precision", m_positionPrecision);
-    }
-
-    if (uvMax == RC_ABC_AUTOMATIC_UVMAX_DETECTION_VALUE)
-    {
-        RCLog("  Using auto-detected per-mesh UVmax range value.");
-    }
-    else
-    {
-        m_uvMax = std::max(uvMax, GeomCacheFile::kMinUVrange);
-        RCLog("  Using UVmax %g", m_uvMax);
-    }
-
-    config->setAttr("UpAxis", upAxis);
-    config->setAttr("MeshPrediction", meshPrediction);
-    config->setAttr("UseBFrames", useBFrames);
-    config->setAttr("IndexFrameDistance", indexFrameDistance);
-    config->setAttr("BlockCompressionFormat", blockCompressionFormat);
-    config->setAttr("PlaybackFromMemory", playbackFromMemory);
-    config->setAttr("PositionPrecision", positionPrecision);
-    config->setAttr("UVmax", uvMax);
-
-    return config;
-}
-
-template<class ParamType>
-inline void CheckColorParam(Alembic::Abc::ICompoundProperty& arbParams,
-    const Alembic::Abc::PropertyHeader& propertyHeader, GeomCache::Mesh& mesh, bool& bFoundColorProperty)
-{
-    const std::string& propertyName = propertyHeader.getName();
-
-    if (!bFoundColorProperty)
-    {
-        mesh.m_bHasColors = true;
-        mesh.m_colorParamName = propertyHeader.getName();
-
-        ParamType param(arbParams, propertyName);
-        if (param.isConstant())
-        {
-            mesh.m_constantStreams = GeomCacheFile::EStreams(mesh.m_constantStreams | GeomCacheFile::eStream_Colors);
-        }
-        else
-        {
-            mesh.m_animatedStreams = GeomCacheFile::EStreams(mesh.m_animatedStreams | GeomCacheFile::eStream_Colors);
-        }
-
-        bFoundColorProperty = true;
-    }
-    else
-    {
-        RCLogWarning("   Multiple color streams. Ignoring color stream %s", propertyName.c_str());
-    }
-}
-
-void AlembicCompiler::CheckMeshForColors(Alembic::AbcGeom::IPolyMeshSchema& meshSchema, GeomCache::Mesh& mesh) const
-{
-    mesh.m_bHasColors = false;
-
-    Alembic::Abc::ICompoundProperty arbParams = meshSchema.getArbGeomParams();
-
-    if (!arbParams)
-    {
-        return;
-    }
-
-    bool bFoundColorProperty = false;
-
-    const uint numProperties = arbParams.getNumProperties();
-    for (uint i = 0; i < numProperties; ++i)
-    {
-        const Alembic::Abc::PropertyHeader& propertyHeader = arbParams.getPropertyHeader(i);
-
-        if (Alembic::AbcGeom::IC3hGeomParam::matches(propertyHeader))
-        {
-            CheckColorParam<Alembic::AbcGeom::IC3hGeomParam>(arbParams, propertyHeader, mesh, bFoundColorProperty);
-        }
-        else if (Alembic::AbcGeom::IC3fGeomParam::matches(propertyHeader))
-        {
-            CheckColorParam<Alembic::AbcGeom::IC3fGeomParam>(arbParams, propertyHeader, mesh, bFoundColorProperty);
-        }
-        else if (Alembic::AbcGeom::IC3cGeomParam::matches(propertyHeader))
-        {
-            CheckColorParam<Alembic::AbcGeom::IC3cGeomParam>(arbParams, propertyHeader, mesh, bFoundColorProperty);
-        }
-        else if (Alembic::AbcGeom::IC4hGeomParam::matches(propertyHeader))
-        {
-            CheckColorParam<Alembic::AbcGeom::IC4hGeomParam>(arbParams, propertyHeader, mesh, bFoundColorProperty);
-        }
-        else if (Alembic::AbcGeom::IC4fGeomParam::matches(propertyHeader))
-        {
-            CheckColorParam<Alembic::AbcGeom::IC4fGeomParam>(arbParams, propertyHeader, mesh, bFoundColorProperty);
-        }
-        else if (Alembic::AbcGeom::IC4cGeomParam::matches(propertyHeader))
-        {
-            CheckColorParam<Alembic::AbcGeom::IC4cGeomParam>(arbParams, propertyHeader, mesh, bFoundColorProperty);
-        }
-    }
-}
-
-// Prints the node tree
-void AlembicCompiler::PrintNodeTreeRec(GeomCache::Node& node, string padding)
-{
-    if (&node != &m_rootNode)
-    {
-        padding += "\t";
-        RCLog("%s%s - %s", padding.c_str(), node.m_name.c_str(), (node.m_transformType == GeomCacheFile::eTransformType_Constant) ? "constant" : "animated");
-    }
-
-    const uint numChildren = node.m_children.size();
-    for (uint i = 0; i < numChildren; ++i)
-    {
-        PrintNodeTreeRec(*node.m_children[i], padding);
-    }
-}
-
-bool AlembicCompiler::CompileAnimationData([[maybe_unused]] Alembic::Abc::IArchive& archive, GeomCacheEncoder& geomCacheEncoder)
-{
-    RCLog("Compiling animation data...");
-
-    m_jobGroupData.m_pAlembicCompiler = this;
-
-    const size_t numFrames = m_frameTimes.size();
-    for (size_t currentFrame = 0; currentFrame < numFrames; ++currentFrame)
-    {
-        // Fill job data
-        m_jobGroupData.m_frameIndex = currentFrame;
-        m_jobGroupData.m_frameTime = m_frameTimes[currentFrame];
-        m_jobGroupData.m_frameAABB.Reset();
-        
-        for (size_t meshIndex = 0; meshIndex < m_meshes.size(); ++meshIndex)
-        {
-            GeomCache::Mesh* pMesh = m_meshes[meshIndex];
-
-            pMesh->m_meshDataBuffer.m_frameUseCount = 0;
-
-            if (pMesh->m_animatedStreams != 0)
-            {
-                AlembicCompiler::UpdateVertexDataWithErrorHandling(pMesh);
-            }
-        }
-
-        AlembicCompiler::UpdateTransformsWithErrorHandling();
-
-        PushCompletedFrames(geomCacheEncoder);
-    }
-
-    if (m_jobGroupData.m_errorCount > 0)
-    {
-        m_errorCount.fetch_add(m_jobGroupData.m_errorCount);
-        RCLogError("  Failed to compile %d meshes", m_jobGroupData.m_errorCount.load());
-        return false;
-    }
-
-    return true;
-}
-
-void AlembicCompiler::PushCompletedFrames(GeomCacheEncoder& geomCacheEncoder)
-{
-    const uint numMeshes = m_meshes.size();
-    for (uint i = 0; i < numMeshes; ++i)
-    {
-        GeomCache::Mesh& mesh = *m_meshes[i];
-        mesh.m_rawFrames.push_back(std::move(mesh.m_meshDataBuffer));
-    }
-
-    AppendTransformFrameDataRec(m_rootNode, m_jobGroupData.m_jobIndex);
-    const bool bIsLastFrame = (m_jobGroupData.m_frameIndex == (m_frameTimes.size() - 1));
-    geomCacheEncoder.AddFrame(m_jobGroupData.m_frameTime, m_jobGroupData.m_frameAABB, bIsLastFrame);
-}
-
-void AlembicCompiler::UpdateTransformsWithErrorHandling()
-{
-    std::string currentObjectPath;
-
-#if !defined(AZ_PLATFORM_APPLE)
-    try
-#endif // !defined(AZ_PLATFORM_APPLE)
-    {
-        TMatrixMap matrixMap;
-        TVisibilityMap visibilityMap;
-        UpdateTransformsRec(m_rootNode, m_jobGroupData.m_frameTime, m_jobGroupData.m_frameAABB, QuatTNS(IDENTITY), matrixMap, visibilityMap, currentObjectPath);
-    }
-#if !defined(AZ_PLATFORM_APPLE)
-    catch (const Alembic::Util::Exception& alembicException)
-    {
-        RCLogError("Alembic exception while processing %s in frame %u, time %g: %s",
-            currentObjectPath.c_str(), m_jobGroupData.m_frameIndex, m_jobGroupData.m_frameTime, alembicException.c_str());
-        ++m_jobGroupData.m_errorCount;
-    }
-    catch (...)
-    {
-        RCLogError("Unknown exception while processing %s in frame %u, time %g",
-            currentObjectPath.c_str(), m_jobGroupData.m_frameIndex, m_jobGroupData.m_frameTime);
-        ++m_jobGroupData.m_errorCount;
-    }
-#endif // !defined(AZ_PLATFORM_APPLE)
-}
-
-void AlembicCompiler::UpdateTransformsRec(GeomCache::Node& node, const Alembic::Abc::chrono_t frameTime,
-    AABB& frameAABB, QuatTNS currentTransform, TMatrixMap& matrixMap, TVisibilityMap& visibilityMap, std::string& currentObjectPath)
-{
-    if (node.m_transformType != GeomCacheFile::eTransformType_Constant)
-    {
-        node.m_nodeDataBuffer.m_transform.SetIdentity();
-
-        for (auto iter = node.m_abcXForms.begin(); iter != node.m_abcXForms.end(); ++iter)
-        {
-            Alembic::AbcGeom::IXform& xform = *iter;
-
-            currentObjectPath = xform.getFullName().c_str();
-
-            auto findIter = matrixMap.find(currentObjectPath);
-            if (findIter != matrixMap.end())
-            {
-                const Alembic::AbcGeom::M44d& matrix = findIter->second;
-                node.m_nodeDataBuffer.m_transform = node.m_nodeDataBuffer.m_transform * FromAlembicMatrix(matrix);
-            }
-            else
-            {
-                Alembic::AbcGeom::IXformSchema& schema = xform.getSchema();
-                Alembic::Abc::TimeSampling& timeSampling = *schema.getTimeSampling();
-
-                auto index = timeSampling.getNearIndex(frameTime, schema.getNumSamples());
-
-                const Alembic::AbcGeom::M44d& matrix = schema.getValue(index.first).getMatrix();
-                node.m_nodeDataBuffer.m_transform = node.m_nodeDataBuffer.m_transform * FromAlembicMatrix(matrix);
-
-                matrixMap[currentObjectPath] = matrix;
-            }
-        }
-    }
-    else
-    {
-        node.m_nodeDataBuffer.m_transform = node.m_staticNodeData.m_transform;
-    }
-
-    currentTransform = currentTransform * node.m_nodeDataBuffer.m_transform;
-
-    node.m_nodeDataBuffer.m_bVisible = true;
-
-    if (node.m_type == GeomCacheFile::eNodeType_Mesh || node.m_type == GeomCacheFile::eNodeType_PhysicsGeometry)
-    {
-        bool bVisible = true;
-        for (Alembic::Abc::IObject currentObject = node.m_abcObject; currentObject; currentObject = currentObject.getParent())
-        {
-            currentObjectPath = currentObject.getFullName().c_str();
-
-            auto findIter = visibilityMap.find(currentObjectPath);
-            if (findIter != visibilityMap.end())
-            {
-                const Alembic::AbcGeom::ObjectVisibility& visibility = findIter->second;
-                if (visibility == Alembic::AbcGeom::kVisibilityHidden)
-                {
-                    bVisible = false;
-                    break;
-                }
-            }
-            else
-            {
-                Alembic::AbcGeom::IVisibilityProperty visibilityProperty = Alembic::AbcGeom::GetVisibilityProperty(currentObject);
-
-                if (visibilityProperty)
-                {
-                    Alembic::Abc::TimeSamplingPtr timeSampling = visibilityProperty.getTimeSampling();
-                    auto index = timeSampling->getNearIndex(frameTime, visibilityProperty.getNumSamples());
-
-                    int8_t rawVisibilityValue;
-                    rawVisibilityValue = visibilityProperty.getValue(index.first);
-                    Alembic::AbcGeom::ObjectVisibility visibility = Alembic::AbcGeom::ObjectVisibility(rawVisibilityValue);
-
-                    visibilityMap[currentObjectPath] = visibility;
-
-                    if (visibility == Alembic::AbcGeom::kVisibilityHidden)
-                    {
-                        bVisible = false;
-                        break;
-                    }
-                }
-            }
-        }
-
-        node.m_nodeDataBuffer.m_bVisible = bVisible;
-
-        if (bVisible && (node.m_type == GeomCacheFile::eNodeType_Mesh))
-        {
-            AABB transformedMeshAABB;
-            transformedMeshAABB.SetTransformedAABB(Matrix34(currentTransform), node.m_pMesh->m_aabb);
-            frameAABB.Add(transformedMeshAABB);
-
-            ++node.m_pMesh->m_meshDataBuffer.m_frameUseCount;
-        }
-    }
-
-    const size_t numChildren = node.m_children.size();
-    for (size_t i = 0; i < numChildren; ++i)
-    {
-        UpdateTransformsRec(*node.m_children[i], frameTime, frameAABB, currentTransform, matrixMap, visibilityMap, currentObjectPath);
-    }
-}
-
-void AlembicCompiler::UpdateVertexDataWithErrorHandling(GeomCache::Mesh* mesh)
-{
-    const char* pMeshName = mesh->m_abcMesh.getFullName().c_str();
-
-#if !defined(AZ_PLATFORM_APPLE)
-    try
-#endif // !defined(AZ_PLATFORM_APPLE)
-    {
-        if (!UpdateVertexData(*mesh, m_jobGroupData.m_frameIndex))
-        {
-            // No need to print out an RCLogError for this case as
-            // UpdatVertexData and the functions it calls will log messages
-            ++m_jobGroupData.m_errorCount;
-        }
-    }
-#if !defined(AZ_PLATFORM_APPLE)
-    catch (const Alembic::Util::Exception& alembicException)
-    {
-        RCLogError("Alembic exception while processing %s in frame %u, time %g: %s",
-            pMeshName, m_jobGroupData.m_frameIndex, m_jobGroupData.m_frameTime, alembicException.c_str());
-        ++m_jobGroupData.m_errorCount;
-    }
-    catch (...)
-    {
-        RCLogError("Unknown exception while processing %s in frame %u, time %g",
-            pMeshName, m_jobGroupData.m_frameIndex, m_jobGroupData.m_frameTime);
-        ++m_jobGroupData.m_errorCount;
-    }
-#endif // !defined(AZ_PLATFORM_APPLE)
-}
-
-std::unordered_map<uint32, uint16> AlembicCompiler::GetMeshMaterialMap(const Alembic::AbcGeom::IPolyMesh& mesh, const Alembic::Abc::chrono_t frameTime)
-{
-    std::unordered_map<uint32, uint16> materialIdMap;
-
-    const uint numChildren = mesh.getNumChildren();
-    for (uint i = 0; i < numChildren; ++i)
-    {
-        Alembic::Abc::IObject child = mesh.getChild(i);
-        if (Alembic::AbcGeom::IFaceSet::matches(child.getHeader()))
-        {
-            Alembic::AbcGeom::IFaceSet faceSet(child,   Alembic::Abc::kWrapExisting);
-
-            Alembic::AbcGeom::IFaceSetSchema::Sample sample;
-            faceSet.getSchema().get(sample, Alembic::Abc::ISampleSelector(frameTime));
-
-            const std::string faceSetName = faceSet.getName();
-
-            // Parse first number in face set name
-            const char* pName = faceSetName.c_str();
-            while (*pName && !isdigit(*pName))
-            {
-                ++pName;
-            }
-
-            if (*pName == 0)
-            {
-                RCLogWarning("  Face set name '%s' contains no number, will map faces to material ID 1", faceSetName.c_str());
-                continue;
-            }
-
-            int materialId = atoi(pName);
-
-            if (materialId < 1 || materialId > 65536)
-            {
-                RCLogWarning("  Face set name '%s' refers to material ID out of range 1-65536, will map faces to material ID 1", faceSetName.c_str());
-                continue;
-            }
-
-            // Engine uses 0 based indices, but the UI displays them 1 based in sandbox. Subtract 1 from user input in DCC applications to be consistent.
-            materialId -= 1;
-
-            const int32* pFaces = static_cast<const int32*>(sample.getFaces()->getData());
-            const uint numFaces = sample.getFaces()->size();
-
-            for (uint i2 = 0; i2 < numFaces; ++i2)
-            {
-                const int32 face = pFaces[i2];
-                if (materialIdMap.find(face) != materialIdMap.end())
-                {
-                    RCLogWarning("  Face %i of mesh is referenced by more than one face set:\n    %s", pFaces[i2], mesh.getFullName().c_str());
-                }
-
-                materialIdMap[face] = materialId;
-            }
-        }
-    }
-
-    return materialIdMap;
-}
-
-uint32_t AlembicCompiler::GetIndex(Alembic::AbcGeom::GeometryScope geomScope, const Alembic::Abc::UInt32ArraySamplePtr& indicies, size_t currentIndexArraysIndex, int32_t positionIndex)
-{
-    uint32_t index = 0;
-    switch (geomScope)
-    {
-        case Alembic::AbcGeom::kFacevaryingScope:
-            index = (*indicies)[currentIndexArraysIndex];
-            break;
-        case Alembic::AbcGeom::kVertexScope:
-            index = positionIndex;
-            break;
-        default:
-            RCLogError("Unsupported geoscope type: %s", geomScope);
-            break;
-    }
-
-    return index;
-}
-
-bool AlembicCompiler::ComputeVertexHashes(std::vector<uint64>& abcVertexHashes, size_t currentFrame, const size_t numAbcIndices, GeomCache::Mesh& mesh,
-    Alembic::Abc::TimeSampling& meshTimeSampling, size_t numMeshSamples, Alembic::AbcGeom::IPolyMeshSchema& meshSchema, const bool bHasNormals,
-    const bool bHasTexcoords, const bool bHasColors, const size_t numAbcNormalIndices, const size_t numAbcTexcoordsIndices, const size_t numAbcFaces)
-{
-    abcVertexHashes.resize(numAbcIndices, 0);
-
-    size_t firstFrame;
-    size_t lastFrame;
-    if (mesh.m_animatedStreams == 0)
-    {
-        // Only need to process first frame for constant meshes, as they all are equal
-        firstFrame = 0;
-        lastFrame = 1;
-    }
-    else if ((mesh.m_animatedStreams & GeomCacheFile::eStream_Indices) == 0)
-    {
-        // If topology is not homogeneous we create one index buffer for the whole animation per mesh.
-        // This means we need to break vertices up if at any point in time normals or texcoords differ
-        // for two triangles that share the same vertex. We do this by creating a hash over the data for
-        // each triangle vertex over time.
-        firstFrame = 0;
-        lastFrame = m_frameTimes.size();
-    }
-    else
-    {
-        // For heterogeneous meshes we just check the current frame
-        firstFrame = currentFrame;
-        lastFrame = currentFrame + 1;
-    }
-
-    // Reset mesh AABB
-    mesh.m_aabb.Reset();
-
-    for (size_t currentFrame = firstFrame; currentFrame < lastFrame; ++currentFrame)
-    {
-        Alembic::Abc::chrono_t frameTime = m_frameTimes[currentFrame];
-        auto index = meshTimeSampling.getNearIndex(frameTime, numMeshSamples);
-
-        Alembic::AbcGeom::IPolyMeshSchema::Sample frameSample = meshSchema.getValue(index.first);
-
-        // Just check to make sure. This should not happen.
-        if (bHasNormals != meshSchema.getNormalsParam().valid() || bHasTexcoords != meshSchema.getUVsParam().valid())
-        {
-            RCLogWarning("  Mesh schema differs from frame 0 to frame %Iu. Skipped:\n    %s", currentFrame, mesh.m_abcMesh.getFullName().c_str());
-            return false;
-        }
-
-        // Get normal & texcoord samples
-        Alembic::AbcGeom::IN3fGeomParam::Sample frameNormalSample;
-        if (bHasNormals)
-        {
-            meshSchema.getNormalsParam().getIndexed(frameNormalSample, index.first);
-        }
-
-        Alembic::AbcGeom::IV2fGeomParam::Sample frameTexcoordSample;
-        if (bHasTexcoords)
-        {
-            meshSchema.getUVsParam().getIndexed(frameTexcoordSample, index.first);
-        }
-
-        // Get sample arrays
-        const auto& frameAbcPositions = *frameSample.getPositions();
-        const size_t frameNumAbcVertices = frameAbcPositions.size();
-        const auto& frameAbcFaceCounts = *frameSample.getFaceCounts();
-        const size_t frameNumAbcFaces = frameAbcFaceCounts.size();
-        const auto& frameAbcIndices = *frameSample.getFaceIndices();
-        const size_t frameNumAbcIndices = frameAbcIndices.size();
-
-        const Alembic::Abc::N3fArraySamplePtr pFrameAbcNormals = bHasNormals ? frameNormalSample.getVals() : 0;
-        const size_t frameNumAbcNormals = bHasNormals ? pFrameAbcNormals->size() : 0;
-        const Alembic::Abc::UInt32ArraySamplePtr pFrameAbcNormalIndices = bHasNormals ? frameNormalSample.getIndices() : 0;
-        const size_t frameNumAbcNormalIndices = bHasNormals ? pFrameAbcNormalIndices->size() : 0;
-
-        const Alembic::Abc::V2fArraySamplePtr pFrameAbcTexcoords = bHasTexcoords ? frameTexcoordSample.getVals() : 0;
-        const size_t frameNumAbcTexcoords = bHasTexcoords ? pFrameAbcTexcoords->size() : 0;
-        const Alembic::Abc::UInt32ArraySamplePtr pFrameAbcTexcoordIndices = bHasTexcoords ? frameTexcoordSample.getIndices() : 0;
-        const size_t frameNumAbcTexcoordsIndices = bHasTexcoords ? pFrameAbcTexcoordIndices->size() : 0;
-
-        Alembic::AbcGeom::GeometryScope normalGeoScope = Alembic::AbcGeom::kUnknownScope;
-        Alembic::AbcGeom::GeometryScope texcoordGeoScope = Alembic::AbcGeom::kUnknownScope;
-
-        if (bHasNormals)
-        {
-            normalGeoScope = Alembic::AbcGeom::GetGeometryScope(meshSchema.getNormalsParam().getMetaData());
-            if (normalGeoScope != Alembic::AbcGeom::kVertexScope && normalGeoScope != Alembic::AbcGeom::kFacevaryingScope)
-            {
-                RCLogWarning("Mesh normal vectors are in an format that's not implemented or illegal. mode:%Iu. Skipped:\n    %s", normalGeoScope, mesh.m_abcMesh.getFullName().c_str());
-                return false;
-            }
-        }
-
-        if (bHasTexcoords)
-        {
-            texcoordGeoScope = Alembic::AbcGeom::GetGeometryScope(meshSchema.getUVsParam().getMetaData());
-            if (texcoordGeoScope != Alembic::AbcGeom::kVertexScope && texcoordGeoScope != Alembic::AbcGeom::kFacevaryingScope)
-            {
-                RCLogWarning("Mesh uv texture coordinates are in an format that's not implemented or illegal. mode:%Iu. Skipped:\n    %s", texcoordGeoScope, mesh.m_abcMesh.getFullName().c_str());
-                return false;
-            }
-        }
-
-        AlembicColorSampleArray frameColors = bHasColors ? AlembicColorSampleArray(mesh.m_colorParamName, meshSchema, index.first) : AlembicColorSampleArray();
-
-        // Just check to make sure. This should not happen.
-        if (frameNumAbcIndices != numAbcIndices || frameNumAbcNormalIndices != numAbcNormalIndices
-            || frameNumAbcTexcoordsIndices != numAbcTexcoordsIndices || frameNumAbcFaces != numAbcFaces)
-        {
-            RCLogWarning("  Mesh index/face count differs from frame 0 to frame %Iu. Skipped:\n    %s", currentFrame, mesh.m_abcMesh.getFullName().c_str());
-            return false;
-        }
-
-        size_t currentIndexArraysIndex = 0;
-        for (size_t face = 0; face < frameNumAbcFaces; ++face)
-        {
-            size_t numFaceVertices = frameAbcFaceCounts[face];
-
-            if (numFaceVertices < 3)
-            {
-                currentIndexArraysIndex += numFaceVertices;
-                continue;
-            }
-
-            for (size_t faceVertexIndex = 0; faceVertexIndex < numFaceVertices; ++faceVertexIndex)
-            {
-                // Just to make sure check index array position
-                if (currentIndexArraysIndex >= numAbcIndices)
-                {
-                    RCLogWarning("Mesh contains invalid data - trying to index outside the valid number of indices. Skipped:\n%s", mesh.m_abcMesh.getFullName().c_str());
-                    return false;
-                }
-
-                const int32_t positionIndex = frameAbcIndices[currentIndexArraysIndex];
-
-                uint32_t normalIndex = bHasNormals ? GetIndex(normalGeoScope, pFrameAbcNormalIndices, currentIndexArraysIndex, positionIndex) : 0;
-                uint32_t texcoordsIndex = bHasTexcoords ? GetIndex(texcoordGeoScope, pFrameAbcTexcoordIndices, currentIndexArraysIndex, positionIndex) : 0;
-
-                const int32_t colorsIndex = frameColors.getIndex(currentIndexArraysIndex);
-
-                // Just to make sure check indices
-                if ((size_t)positionIndex >= frameNumAbcVertices
-                    || (bHasNormals && (size_t)normalIndex >= frameNumAbcNormals)
-                    || (bHasTexcoords && (size_t)texcoordsIndex >= frameNumAbcTexcoords)
-                    || (bHasColors && (size_t)colorsIndex >= frameColors.GetSize()))
-                {
-                    RCLogWarning("  Mesh contains invalid data. Skipped:\n    %s", mesh.m_abcMesh.getFullName().c_str());
-                    return false;
-                }
-
-                // Convert to geom cache vertex
-                AlembicCompilerVertex vertex;
-
-                const Imath::Vec3<float>& abcPosition = frameAbcPositions[positionIndex];
-                const Imath::Vec3<float>& abcNormal = bHasNormals ? (*pFrameAbcNormals)[normalIndex] : Imath::Vec3<float>(0.0f, 0.0f, 0.0f);
-                const Imath::Vec2<float>& abcTexcoord = bHasTexcoords ? (*pFrameAbcTexcoords)[texcoordsIndex] : Imath::Vec2<float>(0.0f, 0.0f);
-
-                vertex.m_position = FromAlembicPosition(abcPosition);
-                vertex.m_normal = Vec3(abcNormal.x, abcNormal.y, abcNormal.z);
-                vertex.m_texcoords = FromAlembicTexcoord(abcTexcoord);
-                vertex.m_rgba = frameColors[colorsIndex];
-
-                mesh.m_aabb.Add(vertex.m_position);
-
-                // Combine with hash from previous frames
-                AlembicCompilerHashCombine(abcVertexHashes[currentIndexArraysIndex], vertex);
-
-                // Advance index array index
-                ++currentIndexArraysIndex;
-            }
-        }
-    }
-
-    return true;
-}
-
-bool AlembicCompiler::CompileFullMesh(GeomCache::Mesh& mesh, const size_t currentFrame, const QuatTNS& transform)
-{
-    const Alembic::Abc::chrono_t frameTime = m_frameTimes[currentFrame];
-    mesh.m_materialIdMap = GetMeshMaterialMap(mesh.m_abcMesh, frameTime);
-
-    GeomCache::MeshData& meshData = mesh.m_staticMeshData;
-
-    mesh.m_indicesMap.clear();
-    meshData.m_positions.clear();
-    meshData.m_texcoords.clear();
-    meshData.m_qTangents.clear();
-    meshData.m_reds.clear();
-    meshData.m_greens.clear();
-    meshData.m_blues.clear();
-    meshData.m_alphas.clear();
-
-    const bool bHasNormals = mesh.m_bHasNormals;
-    const bool bHasTexcoords = mesh.m_bHasTexcoords;
-    const bool bHasColors = mesh.m_bHasColors;
-
-    Alembic::AbcGeom::IPolyMeshSchema& meshSchema = mesh.m_abcMesh.getSchema();
-    Alembic::Abc::TimeSampling& meshTimeSampling = *meshSchema.getTimeSampling();
-    size_t numMeshSamples = meshSchema.getNumSamples();
-
-    auto index = meshTimeSampling.getNearIndex(frameTime, numMeshSamples);
-
-    Alembic::AbcGeom::IN3fGeomParam::Sample normalSample;
-    if (bHasNormals)
-    {
-        meshSchema.getNormalsParam().getIndexed(normalSample, index.first);
-    }
-
-    Alembic::AbcGeom::IV2fGeomParam::Sample texcoordSample;
-    if (bHasTexcoords)
-    {
-        meshSchema.getUVsParam().getIndexed(texcoordSample, index.first);
-    }
-
-    // Get & check mesh data of current frame
-    Alembic::AbcGeom::IPolyMeshSchema::Sample sample = meshSchema.getValue(index.first);
-
-    const auto& abcPositions = *sample.getPositions();
-    const size_t numAbcVertices = abcPositions.size();
-    const auto& abcFaceCounts = *sample.getFaceCounts();
-    const size_t numAbcFaces = abcFaceCounts.size();
-    const auto& abcIndices = *sample.getFaceIndices();
-    const size_t numAbcIndices = abcIndices.size();
-
-    const Alembic::Abc::N3fArraySamplePtr pAbcNormals = bHasNormals ? normalSample.getVals() : 0;
-    const size_t numAbcNormals = bHasNormals ? pAbcNormals->size() : 0;
-    const Alembic::Abc::UInt32ArraySamplePtr pAbcNormalIndices = bHasNormals ? normalSample.getIndices() : 0;
-    const size_t numAbcNormalIndices = bHasNormals ? pAbcNormalIndices->size() : 0;
-
-    const Alembic::Abc::V2fArraySamplePtr pAbcTexcoords = bHasTexcoords ? texcoordSample.getVals() : 0;
-    const size_t numAbcTexcoords = bHasTexcoords ? pAbcTexcoords->size() : 0;
-    const Alembic::Abc::UInt32ArraySamplePtr pAbcTexcoordIndices = bHasTexcoords ? texcoordSample.getIndices() : 0;
-    const size_t numAbcTexcoordsIndices = bHasTexcoords ? pAbcTexcoordIndices->size() : 0;
-
-    Alembic::AbcGeom::GeometryScope normalGeoScope = Alembic::AbcGeom::kUnknownScope;
-    Alembic::AbcGeom::GeometryScope texcoordGeoScope = Alembic::AbcGeom::kUnknownScope;
-
-    if (bHasNormals)
-    {
-        normalGeoScope = Alembic::AbcGeom::GetGeometryScope(meshSchema.getNormalsParam().getMetaData());
-    }
-
-    if (bHasTexcoords)
-    {
-        texcoordGeoScope = Alembic::AbcGeom::GetGeometryScope(meshSchema.getUVsParam().getMetaData());
-    }
-
-    if (bHasTexcoords && numAbcIndices != numAbcTexcoordsIndices)
-    {
-        RCLogWarning("  Mesh number of position indices doesn't equal number of "
-            "texcoord indices (position indices: %u, texcoord indices: %u). Skipped:\n    %s",
-            (uint)numAbcIndices, (uint)numAbcTexcoordsIndices, mesh.m_abcMesh.getFullName().c_str());
-        return false;
-    }
-
-    AlembicColorSampleArray colors = bHasColors ? AlembicColorSampleArray(mesh.m_colorParamName, meshSchema, 0) : AlembicColorSampleArray();
-
-    if (bHasColors && numAbcIndices != colors.GetNumIndices())
-    {
-        RCLogWarning("  Mesh number of position indices doesn't equal number of "
-            "color indices (position indices: %u, color indices: %u). Skipped:\n    %s",
-            (uint)numAbcIndices, (uint)colors.GetNumIndices(), mesh.m_abcMesh.getFullName().c_str());
-        return false;
-    }
-
-    // Initialize hashes to detect same vertices.
-    // TODO: There could be hash collisions, but they are so unlikely, that we don't care for now.
-    std::vector<uint64> abcVertexHashes;
-    if (!ComputeVertexHashes(abcVertexHashes, currentFrame, numAbcIndices, mesh, meshTimeSampling, numMeshSamples,
-            meshSchema, bHasNormals, bHasTexcoords, bHasColors, numAbcNormalIndices, numAbcTexcoordsIndices, numAbcFaces))
-    {
-        return false;
-    }
-
-    // Now that we have the vertex hashes we can create the triangle topology.
-    // Convert to triangles (alembic supports arbitrary faces) and split vertices if necessary
-    // (GPU expects vertex, normals, texcoords, etc. buffers to have same cardinality)
-
-    // Temp buffer for face indices
-    std::vector<uint32> faceIndices;
-
-    // Map from material ID to indices
-    std::unordered_map<uint, std::vector<uint32> > indices;
-
-    // Stores the positions of vertices in the vertex buffer
-    std::unordered_map<uint64, uint32> vertexDigestToVertexBufferIndexMap;
-    std::vector<AlembicCompilerVertex> vertices;
-
-    size_t currentIndexArraysIndex = 0;
-    for (size_t face = 0; face < numAbcFaces; ++face)
-    {
-        size_t numFaceVertices = abcFaceCounts[face];
-
-        if (numFaceVertices < 3)
-        {
-            currentIndexArraysIndex += numFaceVertices;
-            continue;
-        }
-
-        // If face is not contained in a face set, the default material ID is 0
-        auto findIter = mesh.m_materialIdMap.find(face);
-        const uint faceMaterialId = (findIter != mesh.m_materialIdMap.end()) ? findIter->second : 0;
-
-        // First loop through face and create indices/vertices
-        faceIndices.resize(0);
-        for (size_t faceVertexIndex = 0; faceVertexIndex < numFaceVertices; ++faceVertexIndex)
-        {
-            const int32_t positionIndex = abcIndices[currentIndexArraysIndex];
-
-            uint32_t normalIndex = bHasNormals ? GetIndex(normalGeoScope, pAbcNormalIndices, currentIndexArraysIndex, positionIndex) : 0;
-            uint32_t texcoordsIndex = bHasTexcoords ? GetIndex(texcoordGeoScope, pAbcTexcoordIndices, currentIndexArraysIndex, positionIndex) : 0;
-
-            const int32_t colorsIndex = colors.getIndex(currentIndexArraysIndex);
-
-            // Search if vertex is already in vertex buffer by its digest
-            const uint64 vertexDigest = abcVertexHashes[currentIndexArraysIndex];
-
-            // Get normal & texcoords for that vertex
-            const Imath::Vec3<float>& abcPosition = abcPositions[positionIndex];
-            const Imath::Vec3<float>& abcNormal = bHasNormals ? (*pAbcNormals)[normalIndex] : Imath::Vec3<float>(0.0f, 0.0f, 0.0f);
-            const Imath::Vec2<float>& abcTexcoord = bHasTexcoords ? (*pAbcTexcoords)[texcoordsIndex] : Imath::Vec2<float>(0.0f, 0.0f);
-
-            // Convert to geom cache vertex
-            AlembicCompilerVertex vertex;
-            vertex.m_position = FromAlembicPosition(abcPosition);
-            vertex.m_normal = Vec3(abcNormal.x, abcNormal.y, abcNormal.z);
-            vertex.m_texcoords = FromAlembicTexcoord(abcTexcoord);
-            vertex.m_rgba = colors[colorsIndex];
-
-            uint32 vertexIndex;
-            auto findIter2 = vertexDigestToVertexBufferIndexMap.find(vertexDigest);
-            if (findIter2 != vertexDigestToVertexBufferIndexMap.end())
-            {
-                // Vertex already in buffer
-                vertexIndex = findIter2->second;
-            }
-            else
-            {
-                // We need to add a vertex
-                size_t newIndex = vertices.size();
-
-                // Check if index fits in 16 bits if necessary
-                if (!m_b32BitIndices && newIndex >= 65535)
-                {
-                    RCLogWarning("  Mesh results in more than 65536 compiled vertices. Skipped:\n    %s", mesh.m_abcMesh.getFullName().c_str());
-                    return false;
-                }
-
-                vertexIndex = (uint32)newIndex;
-                vertexDigestToVertexBufferIndexMap[vertexDigest] = vertexIndex;
-
-                // Add the vertex to the vertex buffer
-                vertices.push_back(vertex);
-            }
-
-            if (mesh.m_animatedStreams != 0 && (mesh.m_animatedStreams & GeomCacheFile::eStream_Indices) == 0 || !mesh.m_bHasNormals)
-            {
-                // Add to index mapping list
-                mesh.m_abcIndexToGeomCacheIndex.push_back(vertexIndex);
-            }
-
-            // Add to index buffer
-            faceIndices.push_back(vertexIndex);
-
-            // Advance to next index
-            ++currentIndexArraysIndex;
-        }
-
-        // Triangulate face
-        for (size_t i = 1; i < numFaceVertices - 1; ++i)
-        {
-            indices[faceMaterialId].push_back(faceIndices[0]);
-            indices[faceMaterialId].push_back(faceIndices[i + 1]);
-            indices[faceMaterialId].push_back(faceIndices[i]);
-        }
-    }
-
-    if (!mesh.m_bHasNormals)
-    {
-        CalculateSmoothNormals(vertices, mesh, abcFaceCounts, abcIndices, abcPositions);
-    }
-
-    // Compute mesh hash
-    uint64 meshHash = 0;
-    const size_t numVertexHashes = abcVertexHashes.size();
-    for (size_t i = 0; i < numVertexHashes; ++i)
-    {
-        uint64 vertexHash = abcVertexHashes[i];
-        AlembicCompilerHashCombine<uint64>(meshHash, vertexHash);
-    }
-    mesh.m_hash = meshHash;
-
-    // Optimize indices
-    for (auto iter = indices.begin(); iter != indices.end(); ++iter)
-    {
-        const size_t cacheSize = 16;
-        const uint verticesPerFace = 3;
-
-        const uint materialId = iter->first;
-        std::vector<uint32>& indices2 = iter->second;
-
-        ForsythFaceReorderer faceReorderer;
-        std::vector<uint32> optimizedIndices;
-        optimizedIndices.resize(indices2.size());
-        faceReorderer.reorderFaces(cacheSize, verticesPerFace, indices2.size(), &indices2[0], &optimizedIndices[0], 0);
-
-        mesh.m_indicesMap[materialId] = optimizedIndices;
-    }
-
-    if (vertices.size() < numAbcVertices)
-    {
-        RCLogWarning("  Mesh contains unused vertices:\n    %s", mesh.m_abcMesh.getFullName().c_str());
-    }
-    else
-    {
-        m_numVertexSplits.fetch_add((vertices.size() - numAbcVertices));
-    }
-
-    if (m_positionPrecision != 0.0)
-    {
-        // Calculate needed position precision
-        const Vec3 aabbSize = mesh.m_aabb.GetSize();
-        const Vec3d worldSize = Vec3d(aabbSize.x * transform.s.x, aabbSize.y * transform.s.y, aabbSize.z * transform.s.z);
-        const Vec3d wantedQuantization = (worldSize * 1000.0) / m_positionPrecision;
-        mesh.m_positionPrecision[0] = (wantedQuantization.x > 0.0) ? std::max((uint8)(std::min(ceil(log(wantedQuantization.x) / log(2.0)), 16.0)), (uint8)1) : 1;
-        mesh.m_positionPrecision[1] = (wantedQuantization.y > 0.0) ? std::max((uint8)(std::min(ceil(log(wantedQuantization.y) / log(2.0)), 16.0)), (uint8)1) : 1;
-        mesh.m_positionPrecision[2] = (wantedQuantization.z > 0.0) ? std::max((uint8)(std::min(ceil(log(wantedQuantization.z) / log(2.0)), 16.0)), (uint8)1) : 1;
-    }
-    else
-    {
-        // max precision - use all 16 bits
-        mesh.m_positionPrecision[0] = 16;
-        mesh.m_positionPrecision[1] = 16;
-        mesh.m_positionPrecision[2] = 16;
-    }
-
-    if (m_uvMax == RC_ABC_AUTOMATIC_UVMAX_DETECTION_VALUE)
-    {
-        // loop over mesh to determine the largeest UV value to store in mesh's m_uvMax
-        const size_t numVertices = vertices.size();
-        mesh.m_uvMax = .0f;
-        for (uint32 vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex)
-        {
-            const AlembicCompilerVertex& vertex = vertices[vertexIndex];
-            const float maxCoordUV = max(vertex.m_texcoords.x, vertex.m_texcoords.y);
-            if (mesh.m_uvMax < maxCoordUV)
-            {
-                mesh.m_uvMax = maxCoordUV;
-            }
-        }
-
-        RCLog("Detected per-mesh uvMax value: %g", mesh.m_uvMax);
-    }
-    else
-    {
-        // user specified cache-wide uvMax value
-        mesh.m_uvMax = m_uvMax;
-    }
-
-    // Finally compile vertices to stored format
-    if (!CompileVertices(vertices, mesh, mesh.m_staticMeshData, false))
-    {
-        return false;
-    }
-
-    if (mesh.m_animatedStreams != 0 && (mesh.m_animatedStreams & GeomCacheFile::eStream_Indices) == 0)
-    {
-        // Pass mesh to encoder to optimize vertex order for compression
-        if (!GeomCacheEncoder::OptimizeMeshForCompression(mesh, m_bMeshPrediction))
-        {
-            RCLogWarning("  Could not optimize for compression:\n    %s", mesh.m_abcMesh.getFullName().c_str());
-        }
-    }
-
-    return true;
-}
-
-bool AlembicCompiler::UpdateVertexData(GeomCache::Mesh& mesh, const size_t currentFrame)
-{
-    const bool bHasNormals = mesh.m_bHasNormals;
-    const bool bHasTexcoords = mesh.m_bHasTexcoords;
-    const bool bHasColors = mesh.m_bHasColors;
-
-    const Alembic::Abc::chrono_t frameTime = m_frameTimes[currentFrame];
-
-    Alembic::AbcGeom::IPolyMeshSchema& meshSchema = mesh.m_abcMesh.getSchema();
-    Alembic::Abc::TimeSampling& meshTimeSampling = *meshSchema.getTimeSampling();
-    size_t numMeshSamples = meshSchema.getNumSamples();
-
-    auto index = meshTimeSampling.getNearIndex(frameTime, numMeshSamples);
-
-    Alembic::AbcGeom::IN3fGeomParam::Sample normalSample;
-    if (bHasNormals)
-    {
-        meshSchema.getNormalsParam().getIndexed(normalSample, index.first);
-    }
-
-    Alembic::AbcGeom::IV2fGeomParam::Sample texcoordSample;
-    if (bHasTexcoords)
-    {
-        meshSchema.getUVsParam().getIndexed(texcoordSample, index.first);
-    }
-
-    // Get & check mesh data of first frame
-    Alembic::AbcGeom::IPolyMeshSchema::Sample sample = meshSchema.getValue(index.first);
-
-    const auto& abcPositions = *sample.getPositions();
-    const size_t numAbcVertices = abcPositions.size();
-    const auto& abcFaceCounts = *sample.getFaceCounts();
-    const size_t numAbcFaces = abcFaceCounts.size();
-    const auto& abcIndices = *sample.getFaceIndices();
-    const size_t numAbcIndices = abcIndices.size();
-
-    const Alembic::Abc::N3fArraySamplePtr pAbcNormals = bHasNormals ? normalSample.getVals() : 0;
-    const size_t numAbcNormals = bHasNormals ? pAbcNormals->size() : 0;
-    const Alembic::Abc::UInt32ArraySamplePtr pAbcNormalIndices = bHasNormals ? normalSample.getIndices() : 0;
-    const size_t numAbcNormalIndices = bHasNormals ? pAbcNormalIndices->size() : 0;
-
-    const Alembic::Abc::V2fArraySamplePtr pAbcTexcoords = bHasTexcoords ? texcoordSample.getVals() : Alembic::Abc::V2fArraySamplePtr();
-    const size_t numAbcTexcoords = bHasTexcoords ? pAbcTexcoords->size() : 0;
-    const Alembic::Abc::UInt32ArraySamplePtr pAbcTexcoordIndices = bHasTexcoords ? texcoordSample.getIndices() : Alembic::Abc::UInt32ArraySamplePtr();
-    const size_t numAbcTexcoordsIndices = bHasTexcoords ? pAbcTexcoordIndices->size() : 0;
-
-    AlembicColorSampleArray colors = mesh.m_bHasColors ? AlembicColorSampleArray(mesh.m_colorParamName, meshSchema, index.first) : AlembicColorSampleArray();
-
-    std::vector<AlembicCompilerVertex> vertices;
-    vertices.resize(mesh.m_staticMeshData.m_positions.size());
-
-    size_t currentIndexArraysIndex = 0;
-    for (size_t face = 0; face < numAbcFaces; ++face)
-    {
-        size_t numFaceVertices = abcFaceCounts[face];
-
-        if (numFaceVertices < 3)
-        {
-            currentIndexArraysIndex += numFaceVertices;
-            continue;
-        }
-
-        // First loop through face and create indices/vertices
-        for (size_t faceVertexIndex = 0; faceVertexIndex < numFaceVertices; ++faceVertexIndex)
-        {
-            const int32 positionIndex = abcIndices[currentIndexArraysIndex];
-            const int32 normalIndex = bHasNormals ? (*pAbcNormalIndices)[currentIndexArraysIndex] : 0;
-            const int32 texcoordsIndex = bHasTexcoords ? (*pAbcTexcoordIndices)[currentIndexArraysIndex] : 0;
-            const int32 colorsIndex = bHasColors ? colors.getIndex(currentIndexArraysIndex) : 0;
-
-            // Get normal & texcoords for that vertex
-            const Imath::Vec3<float>& abcPosition = abcPositions[positionIndex];
-            const Imath::Vec3<float>& abcNormal = bHasNormals ? (*pAbcNormals)[normalIndex] : Imath::Vec3<float>(0.0f, 0.0f, 0.0f);
-            const Imath::Vec2<float>& abcTexcoord = bHasTexcoords ? (*pAbcTexcoords)[texcoordsIndex] : Imath::Vec2<float>(0.0f, 0.0f);
-
-            // Convert to geom cache vertex
-            AlembicCompilerVertex vertex;
-            vertex.m_position = FromAlembicPosition(abcPosition);
-            vertex.m_normal = Vec3(abcNormal.x, abcNormal.y, abcNormal.z);
-            vertex.m_texcoords = FromAlembicTexcoord(abcTexcoord);
-            vertex.m_rgba = bHasColors ? colors[colorsIndex] : Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-
-            if (currentIndexArraysIndex >= mesh.m_abcIndexToGeomCacheIndex.size())
-            {
-                RCLogError("  Invalid index mapping:\n    %s", mesh.m_abcMesh.getFullName().c_str());
-                return false;
-            }
-
-            // Update the vertex in the index buffer. This write can happen multiple times to the same
-            // location, if the vertex is referred multiple times. The values are equal, so we don't care.
-            const uint32 vertexIndex = mesh.m_abcIndexToGeomCacheIndex[currentIndexArraysIndex];
-            vertices[vertexIndex] = vertex;
-
-            ++currentIndexArraysIndex;
-        }
-    }
-
-    if (!mesh.m_bHasNormals)
-    {
-        CalculateSmoothNormals(vertices, mesh, abcFaceCounts, abcIndices, abcPositions);
-    }
-
-    if (!CompileVertices(vertices, mesh, mesh.m_meshDataBuffer.m_meshData, true))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void AlembicCompiler::CalculateSmoothNormals(std::vector<AlembicCompilerVertex>& vertices, GeomCache::Mesh& mesh,
-    const Alembic::Abc::Int32ArraySample& faceCounts, const Alembic::Abc::Int32ArraySample& faceIndices,
-    const Alembic::Abc::P3fArraySample& facePositions)
-{
-    const size_t numFaces = faceCounts.size();
-    const size_t numPositions = facePositions.size();
-
-    std::vector<Vec3> normals(numPositions, Vec3(0.0f, 0.0f, 0.0f));
-    std::vector<Vec3> tempFacePositions;
-
-    // Compute face normals of alembic mesh and add up normals at each vertex
-    size_t currentIndexArraysIndex = 0;
-    for (size_t face = 0; face < numFaces; ++face)
-    {
-        size_t numFaceVertices = faceCounts[face];
-
-        if (numFaceVertices < 3)
-        {
-            currentIndexArraysIndex += numFaceVertices;
-            continue;
-        }
-
-        tempFacePositions.clear();
-        for (size_t i = 0; i < numFaceVertices; ++i)
-        {
-            uint index = faceIndices[currentIndexArraysIndex + i];
-            tempFacePositions.push_back(FromAlembicPosition(facePositions[index]));
-        }
-
-        for (size_t i = 1; i < numFaceVertices - 1; ++i)
-        {
-            Vec3 p1 = tempFacePositions[0];
-            Vec3 p2 = tempFacePositions[i + 1];
-            Vec3 p3 = tempFacePositions[i];
-
-            Vec3 edge12 = p2 - p1;
-            Vec3 edge23 = p3 - p2;
-            Vec3 edge31 = p1 - p3;
-
-            const float influence1 = edge12.Cross(edge31).GetLength();
-            const float influence2 = edge23.Cross(edge12).GetLength();
-            const float influence3 = edge31.Cross(edge23).GetLength();
-
-            Vec3 faceNormal = edge31.Cross(edge12);
-            faceNormal.Normalize();
-
-            normals[faceIndices[currentIndexArraysIndex]] += influence1 * faceNormal;
-            normals[faceIndices[currentIndexArraysIndex + i + 1]] += influence2 * faceNormal;
-            normals[faceIndices[currentIndexArraysIndex + i]] += influence3 * faceNormal;
-        }
-
-        currentIndexArraysIndex += numFaceVertices;
-    }
-
-    // Normalize all the normals
-    for (uint i = 0; i < numPositions; ++i)
-    {
-        normals[i].Normalize();
-    }
-
-    // Assign them to mesh vertices
-    currentIndexArraysIndex = 0;
-    for (size_t face = 0; face < numFaces; ++face)
-    {
-        size_t numFaceVertices = faceCounts[face];
-
-        if (numFaceVertices < 3)
-        {
-            currentIndexArraysIndex += numFaceVertices;
-            continue;
-        }
-
-        for (size_t i = 0; i < numFaceVertices; ++i)
-        {
-            uint index = mesh.m_abcIndexToGeomCacheIndex[currentIndexArraysIndex];
-            vertices[index].m_normal = normals[faceIndices[currentIndexArraysIndex++]];
-        }
-    }
-}
-
-namespace
-{
-    GeomCacheFile::QTangent EncodeQTangent(Matrix33 frame, const bool bReflection)
-    {
-        frame.OrthonormalizeFast();
-        if (!frame.IsOrthonormalRH(0.1f))
-        {
-            frame.SetIdentity();
-        }
-
-        Quat qFrame(frame);
-
-        qFrame.v = -qFrame.v;
-        if (qFrame.w < 0.0f)
-        {
-            qFrame = -qFrame;
-        }
-
-        const float kMultiplier = float((2 << (GeomCacheFile::kTangentQuatPrecision - 1)) - 1);
-
-        // Make sure w is never 0 by applying the smallest possible bias.
-        static const float kBias = 1.0f / kMultiplier;
-        static const float kBiasScale = sqrtf(1.0f - kBias * kBias);
-        if (qFrame.w < kBias && qFrame.w > -kBias)
-        {
-            qFrame *= kBiasScale;
-            qFrame.w = kBias;
-        }
-
-        if (bReflection)
-        {
-            qFrame = -qFrame;
-        }
-
-        GeomCacheFile::QTangent compressedQTangent;
-        compressedQTangent[0] = static_cast<int16>(qFrame.v[0] * kMultiplier);
-        compressedQTangent[1] = static_cast<int16>(qFrame.v[1] * kMultiplier);
-        compressedQTangent[2] = static_cast<int16>(qFrame.v[2] * kMultiplier);
-        compressedQTangent[3] = static_cast<int16>(qFrame.w * kMultiplier);
-
-        return compressedQTangent;
-    }
-}
-
-bool AlembicCompiler::CompileVertices(std::vector<AlembicCompilerVertex>& vertices, GeomCache::Mesh& mesh, GeomCache::MeshData& meshData, const bool bUpdate)
-{
-    // Resize arrays if necessary
-    if (meshData.m_positions.size() == 0)
-    {
-        meshData.m_positions.resize(vertices.size());
-        meshData.m_texcoords.resize(vertices.size());
-        meshData.m_qTangents.resize(vertices.size());
-
-        if (mesh.m_bHasColors)
-        {
-            meshData.m_reds.resize(vertices.size());
-            meshData.m_greens.resize(vertices.size());
-            meshData.m_blues.resize(vertices.size());
-            meshData.m_alphas.resize(vertices.size());
-        }
-    }
-    else
-    {
-        assert(meshData.m_positions.size() == vertices.size());
-        if (meshData.m_positions.size() != vertices.size())
-        {
-            return false;
-        }
-    }
-
-    if (!bUpdate)
-    {
-        mesh.m_reflections.resize(vertices.size());
-    }
-
-    // Avoid division by zero if mesh has no extent in a dimension
-    Vec3 aabbSize = mesh.m_aabb.GetSize();
-    aabbSize.x = (aabbSize.x == 0.0f) ? 1.0f : aabbSize.x;
-    aabbSize.y = (aabbSize.y == 0.0f) ? 1.0f : aabbSize.y;
-    aabbSize.z = (aabbSize.z == 0.0f) ? 1.0f : aabbSize.z;
-
-    const float kMultiplierX = float((2 << (mesh.m_positionPrecision[0] - 1)) - 1);
-    const float kMultiplierY = float((2 << (mesh.m_positionPrecision[1] - 1)) - 1);
-    const float kMultiplierZ = float((2 << (mesh.m_positionPrecision[2] - 1)) - 1);
-    const size_t numVertices = meshData.m_positions.size();
-    const int verbosityLevel = m_CC.m_config->HasKey("verbose") ? m_CC.m_config->GetAsInt("verbose", 1, 1) : 0;
-
-    if (verbosityLevel > 2)
-    {
-        RCLog("Using uvMax of %g", mesh.m_uvMax);
-    }
-
-    // Quantize positions & texcoords
-    for (uint32 vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex)
-    {
-        const AlembicCompilerVertex& vertex = vertices[vertexIndex];
-
-        // Remap position to [0, 1] range in AABB
-        Vec3 mappedPosition = (vertex.m_position - mesh.m_aabb.min) / aabbSize;
-
-        // Now map to range of 16 bit unsigned integer and store
-        GeomCacheFile::Position& compressedPosition = meshData.m_positions[vertexIndex];
-        compressedPosition.x = (uint16)(mappedPosition.x * kMultiplierX);
-        compressedPosition.y = (uint16)(mappedPosition.y * kMultiplierY);
-        compressedPosition.z = (uint16)(mappedPosition.z * kMultiplierZ);
-
-        // Wrap around texcoords at mesh.m_uvMax
-        Vec2 mappedTexcoords = Vec2(fmod(vertex.m_texcoords.x, mesh.m_uvMax),
-                fmod(vertex.m_texcoords.y, mesh.m_uvMax));
-
-        // Now map to range of 16 bit unsigned integer and store
-        GeomCacheFile::Texcoords& compressedTexcoords = meshData.m_texcoords[vertexIndex];
-        compressedTexcoords = (mappedTexcoords / mesh.m_uvMax) * 32767.0f;
-
-        if (mesh.m_bHasColors)
-        {
-            meshData.m_reds[vertexIndex] = static_cast<GeomCacheFile::Color>(clamp_tpl(vertex.m_rgba[0], 0.0f, 1.0f) * 255.0f);
-            meshData.m_greens[vertexIndex]  = static_cast<GeomCacheFile::Color>(clamp_tpl(vertex.m_rgba[1], 0.0f, 1.0f) * 255.0f);
-            meshData.m_blues[vertexIndex]  = static_cast<GeomCacheFile::Color>(clamp_tpl(vertex.m_rgba[2], 0.0f, 1.0f) * 255.0f);
-            meshData.m_alphas[vertexIndex]  = static_cast<GeomCacheFile::Color>(clamp_tpl(vertex.m_rgba[3], 0.0f, 1.0f) * 255.0f);
-        }
-    }
-
-    // Compute new tangents
-    for (auto iter = mesh.m_indicesMap.begin(); iter != mesh.m_indicesMap.end(); ++iter)
-    {
-        const std::vector<uint32>& indices = iter->second;
-        assert (indices.size() % 3 == 0);
-
-        GeomCacheMeshTriangleInputProxy inputProxy(indices, vertices);
-        CTangentSpaceCalculation tangentSpaceCalculation;
-
-        string errorMessage;
-        eCalculateTangentSpaceErrorCode errorCode =
-            tangentSpaceCalculation.CalculateTangentSpace(inputProxy, true, errorMessage);
-
-        if (errorCode != CALCULATE_TANGENT_SPACE_NO_ERRORS)
-        {
-            RCLogError("Tangent space calculation failed");
-            return false;
-        }
-
-        // Get tangents back and convert them to qtangents
-        const size_t numTriangles = indices.size() / 3;
-        for (uint32 triangleIndex = 0; triangleIndex < numTriangles; ++triangleIndex)
-        {
-            uint32 triangleBaseIndices[3];
-            tangentSpaceCalculation.GetTriangleBaseIndices(triangleIndex, triangleBaseIndices);
-
-            for (uint vertex = 0; vertex < 3; ++vertex)
-            {
-                Vec3 tangent, biTangent, normal;
-                tangentSpaceCalculation.GetBase(triangleBaseIndices[vertex], (float*)&tangent, (float*)&biTangent, (float*)&normal);
-
-                // Convert to q tangent
-                Vec3 crossedNormal = tangent.Cross(biTangent).GetNormalized();
-                bool bReflected = crossedNormal.Dot(normal) < 0.0f;
-
-                const size_t index = indices[triangleIndex * 3 + vertex];
-
-                if (!bUpdate)
-                {
-                    // Store tangent reflection values
-                    mesh.m_reflections[index] = bReflected;
-                }
-                else if (bReflected != mesh.m_reflections[index])
-                {
-                    // Enforce reflection of first frame
-                    bReflected = !bReflected;
-                    biTangent = -biTangent;
-                    crossedNormal = tangent.Cross(biTangent).GetNormalized();
-                }
-
-                Matrix33 frame;
-                frame.SetRow(0, tangent);
-                frame.SetRow(1, biTangent);
-                frame.SetRow(2, crossedNormal);
-
-                // Quantize and store
-                meshData.m_qTangents[index] = EncodeQTangent(frame, bReflected);
-            }
-        }
-    }
-
-    return true;
-}
-
-void AlembicCompiler::AppendTransformFrameDataRec(GeomCache::Node& node, const uint bufferIndex) const
-{
-    node.m_animatedNodeData.push_back(node.m_nodeDataBuffer);
-
-    const size_t numChildren = node.m_children.size();
-    for (size_t i = 0; i < numChildren; ++i)
-    {
-        AppendTransformFrameDataRec(*node.m_children[i], bufferIndex);
-    }
-}
-
-void AlembicCompiler::Cleanup()
-{
-    m_rootNode.m_type = GeomCacheFile::eNodeType_Transform;
-    m_rootNode.m_transformType = GeomCacheFile::eTransformType_Constant;
-    m_rootNode.m_staticNodeData.m_bVisible = true;
-    m_rootNode.m_staticNodeData.m_transform.SetIdentity();
-    m_rootNode.m_pMesh.reset();
-    m_rootNode.m_physicsGeometry.clear();
-    m_rootNode.m_children.clear();
-    m_rootNode.m_abcObject = Alembic::Abc::IObject();
-    m_rootNode.m_abcXForms.clear();
-    m_rootNode.m_animatedNodeData.clear();
-    m_rootNode.m_name.clear();
-
-    m_timeSamplings.clear();
-    m_frameTimes.clear();
-    m_meshes.clear();
-    m_digestToMeshMap.clear();
-    m_errorCount = 0;
-    m_numAnimatedMeshes = 0;
-}
diff --git a/Code/Tools/RC/ResourceCompilerABC/AlembicCompiler.h b/Code/Tools/RC/ResourceCompilerABC/AlembicCompiler.h
deleted file mode 100644
index 0197c268ed..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/AlembicCompiler.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_ALEMBICCOMPILER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_ALEMBICCOMPILER_H
-#pragma once
-
-#include "IConvertor.h"
-#include "GeomCache.h"
-#include "../ResourceCompilerPC/PhysWorld.h"
-#include <AzCore/std/parallel/atomic.h>
-#include <AzCore/std/parallel/mutex.h>
-#include <AzCore/std/parallel/condition_variable.h>
-
-#include <Alembic/AbcGeom/Visibility.h> // for Alembic::AbcGeom::ObjectVisibility
-
-#define RC_ABC_AUTOMATIC_UVMAX_DETECTION_VALUE .0f
-
-class ICryXML;
-class GeomCacheEncoder;
-class IXMLSerializer;
-
-// Used for detecting identical meshes. For two identical meshes all digests must match.
-class AlembicMeshDigest
-{
-    friend struct std::hash<AlembicMeshDigest>;
-public:
-    AlembicMeshDigest(Alembic::AbcGeom::IPolyMeshSchema& meshSchema);
-
-    bool operator==(const AlembicMeshDigest& digest) const;
-
-private:
-    bool m_bHasNormals;
-    bool m_bHasTexcoords;
-    bool m_bHasColors;
-
-    Alembic::AbcGeom::ArraySampleKey m_positionDigest;
-    Alembic::AbcGeom::ArraySampleKey m_positionIndexDigest;
-    Alembic::AbcGeom::ArraySampleKey m_normalsDigest;
-    Alembic::AbcGeom::ArraySampleKey m_texcoordDigest;
-    Alembic::AbcGeom::ArraySampleKey m_colorsDigest;
-};
-
-// Unoptimized vertex used in the compiler
-struct AlembicCompilerVertex
-{
-    Vec3 m_position;
-    Vec3 m_normal;
-    Vec2 m_texcoords;
-    Vec4 m_rgba;
-};
-
-template<class T>
-class AlembicCompilerHash;
-
-template<>
-class AlembicCompilerHash<float>
-{
-public:
-    uint64 operator()(const float value)
-    {
-        uint32 bits = alias_cast<uint32>(value);
-        bits = (bits == 0x80000000) ? 0 : bits; // -0 == 0
-
-        // Magic taken from CityHash64
-        const uint64 u = bits;
-        const uint64 kMul = 0x9ddfea08eb382d69ULL;
-        uint64 a = u * kMul;
-        a ^= (a >> 47);
-        a *= kMul;
-        return a;
-    }
-};
-
-template<>
-class AlembicCompilerHash<uint64>
-{
-public:
-    uint64 operator()(const uint64 value)
-    {
-        return value;
-    }
-};
-
-// Helper function to combine hashes
-template<class T>
-inline void AlembicCompilerHashCombine(uint64& seed, const T& v)
-{
-    AlembicCompilerHash<T> hasher;
-
-    // Magic taken from CityHash64
-    const uint64 kMul = 0x9ddfea08eb382d69ULL;
-    uint64 a = (hasher(v) ^ seed) * kMul;
-    a ^= (a >> 47);
-    uint64 b = (seed ^ a) * kMul;
-    b ^= (b >> 47);
-    seed = b * kMul;
-}
-
-template<>
-class AlembicCompilerHash<AlembicCompilerVertex>
-{
-public:
-    uint64 operator()(const AlembicCompilerVertex& vertex) const
-    {
-        uint64 hash = 0;
-
-        AlembicCompilerHashCombine(hash, vertex.m_position[0]);
-        AlembicCompilerHashCombine(hash, vertex.m_position[1]);
-        AlembicCompilerHashCombine(hash, vertex.m_position[2]);
-        AlembicCompilerHashCombine(hash, vertex.m_normal[0]);
-        AlembicCompilerHashCombine(hash, vertex.m_normal[1]);
-        AlembicCompilerHashCombine(hash, vertex.m_normal[2]);
-        AlembicCompilerHashCombine(hash, vertex.m_texcoords[0]);
-        AlembicCompilerHashCombine(hash, vertex.m_texcoords[1]);
-        AlembicCompilerHashCombine(hash, vertex.m_rgba[0]);
-        AlembicCompilerHashCombine(hash, vertex.m_rgba[1]);
-        AlembicCompilerHashCombine(hash, vertex.m_rgba[2]);
-        AlembicCompilerHashCombine(hash, vertex.m_rgba[3]);
-
-        return hash;
-    }
-};
-
-// std::hash<> specializations for std::unordered_map
-namespace std
-{
-    template<>
-    class hash<AlembicMeshDigest>
-    {
-    public:
-        size_t operator()(const AlembicMeshDigest& digest) const
-        {
-            // Just return the position digest. It's very likely that
-            // if positions match everything else is matching as well
-            return Alembic::AbcGeom::StdHash(digest.m_positionDigest);
-        }
-    };
-}
-
-class GeomCacheEncoder;
-
-class AlembicCompiler
-    : public ICompiler
-{
-    struct FrameData
-    {
-        FrameData()
-            : m_errorCount(0)
-            , m_pAlembicCompiler(nullptr) {}
-
-        FrameData(const FrameData& toBeCopied)
-            : m_errorCount(0)
-            , m_pAlembicCompiler(toBeCopied.m_pAlembicCompiler)
-        {
-            m_errorCount.store(toBeCopied.m_errorCount);
-        }
-
-        uint m_jobIndex;
-        uint m_frameIndex;
-        AZStd::atomic_uint m_errorCount;
-        Alembic::Abc::chrono_t m_frameTime;
-        AlembicCompiler* m_pAlembicCompiler;
-        AABB m_frameAABB;
-    };
-
-public:
-    AlembicCompiler(ICryXML* pXMLParser);
-    virtual ~AlembicCompiler() {}
-
-    // ICompiler methods.
-    virtual void Release();
-    virtual void BeginProcessing([[maybe_unused]] const IConfig* config) {}
-    virtual void EndProcessing() {}
-    virtual IConvertContext* GetConvertContext() { return &m_CC; }
-    virtual bool Process();
-
-private:
-    XmlNodeRef ReadConfig(const string& configPath, IXMLSerializer* pXMLSerializer);
-
-    string GetOutputFileNameOnly() const;
-    string GetOutputPath() const;
-
-    uint32_t GetIndex(Alembic::AbcGeom::GeometryScope geomScope, const Alembic::Abc::UInt32ArraySamplePtr& normalIndices, size_t currentIndexArraysIndex, int32_t positionIndex);
-
-    bool CheckTimeSampling(Alembic::Abc::IArchive& archive);
-    void OutputTimeSamplingType(const Alembic::Abc::TimeSamplingType& timeSamplingType);
-
-    void CheckTimeSamplingRec(const Alembic::Abc::IObject& currentObject);
-    void CheckTimeSamplingRec(const Alembic::Abc::ICompoundProperty& currentProperty);
-
-    // Setup static data for header
-    bool CompileStaticData(Alembic::Abc::IArchive& archive);
-    bool CompileStaticDataRec(GeomCache::Node* pParentNode, Alembic::Abc::IObject& currentObject, const QuatTNS& localTransform,
-        std::vector<Alembic::AbcGeom::IXform> abcXformStack, const bool bParentRemoved, const GeomCacheFile::ETransformType parentTransform);
-    bool CompileStaticMeshData(GeomCache::Node& node, Alembic::AbcGeom::IPolyMesh& mesh);
-    bool CompilePhysicsGeometry(GeomCache::Node& node, Alembic::AbcGeom::IPolyMesh& mesh);
-    void CheckMeshForColors(Alembic::AbcGeom::IPolyMeshSchema& meshSchema, GeomCache::Mesh& mesh) const;
-
-    // Prints the node tree
-    void PrintNodeTreeRec(GeomCache::Node& node, string padding);
-
-    // Compile stream of frames and  send them to the cache writer
-    bool CompileAnimationData(Alembic::Abc::IArchive& archive, GeomCacheEncoder& geomCacheEncoder);
-
-    // Pushes the completed frames in order to the encoder
-    void PushCompletedFrames(GeomCacheEncoder& geomCacheEncoder);
-
-    // Update transforms
-    void UpdateTransformsWithErrorHandling();
-    typedef std::unordered_map<std::string, Alembic::AbcGeom::M44d> TMatrixMap;
-    typedef std::unordered_map<std::string, Alembic::AbcGeom::ObjectVisibility> TVisibilityMap;
-    void UpdateTransformsRec(GeomCache::Node& node, const Alembic::Abc::chrono_t frameTime,
-        AABB& frameAABB, QuatTNS currentTransform, TMatrixMap& matrixMap, TVisibilityMap& visibilityMap, std::string& currentObjectPath);
-
-    // Compiles a mesh or update its vertices in a job
-    void UpdateVertexDataWithErrorHandling(GeomCache::Mesh* mesh);
-
-    // Gets mapping from alembic face Id to material ids
-    std::unordered_map<uint32, uint16> GetMeshMaterialMap(const Alembic::AbcGeom::IPolyMesh& mesh, const Alembic::Abc::chrono_t frameTime);
-
-    // Generates a hash for each vertex (all frames are taken into account)
-    bool ComputeVertexHashes(std::vector<uint64>& abcVertexHashes, const size_t currentFrame, const size_t numAbcIndices, GeomCache::Mesh& mesh,
-        Alembic::Abc::TimeSampling& meshTimeSampling, size_t numMeshSamples, Alembic::AbcGeom::IPolyMeshSchema& meshSchema, const bool bHasNormals,
-        const bool bHasTexcoords, const bool bHasColors, const size_t numAbcNormalIndices, const size_t numAbcTexcoordsIndices, const size_t numAbcFaces);
-
-    // This is used for the first frame compilation of constant/homogeneous meshes and for each frame for heterogeneous meshes.
-    bool CompileFullMesh(GeomCache::Mesh& mesh, const size_t currentFrame, const QuatTNS& transform);
-
-    // Update vertex data according to the mapping table produced by CompileFullMesh at frameTime. Used for homogeneous meshes.
-    bool UpdateVertexData(GeomCache::Mesh& mesh, const size_t currentFrame);
-
-    // Calculate smoothed normals
-    void CalculateSmoothNormals(std::vector<AlembicCompilerVertex>& vertices, GeomCache::Mesh& mesh,
-        const Alembic::Abc::Int32ArraySample& faceCounts, const Alembic::Abc::Int32ArraySample& faceIndices,
-        const Alembic::Abc::P3fArraySample& positions);
-
-    // Computes tangent space, quantizes vertex positions and fills MeshData
-    bool CompileVertices(std::vector<AlembicCompilerVertex>& vertices, GeomCache::Mesh& mesh, GeomCache::MeshData& meshData, const bool bUpdate);
-
-    // Goes through the node tree and update the transform frame dequeues
-    void AppendTransformFrameDataRec(GeomCache::Node& node, const uint bufferIndex) const;
-
-    // Cleans up data structures
-    void Cleanup();
-
-    // The RC XML parser instance
-    ICryXML* m_pXMLParser;
-
-    // Cache root node
-    GeomCache::Node m_rootNode;
-
-    // Context
-    ConvertContext m_CC;
-
-    // Ref count
-    int m_refCount;
-
-    // Flag for 32 bit index format
-    bool m_b32BitIndices;
-
-    // Config flags
-    bool m_bConvertYUpToZUp;
-    bool m_bMeshPrediction;
-    bool m_bUseBFrames;
-    bool m_bPlaybackFromMemory;
-    uint m_indexFrameDistance;
-    GeomCacheFile::EBlockCompressionFormat m_blockCompressionFormat;
-    double m_positionPrecision;
-    float m_uvMax;
-
-    // Time
-    std::vector<Alembic::Abc::TimeSampling> m_timeSamplings;
-    Alembic::Abc::chrono_t m_minTime;
-    Alembic::Abc::chrono_t m_maxTime;
-    std::vector<Alembic::Abc::chrono_t> m_frameTimes;
-
-    // Stats
-    AZStd::atomic_long m_numVertexSplits;
-    LONG m_numExportedMeshes;
-    LONG m_numSharedMeshNodes;
-
-    // For error handling
-    std::string m_currentObjectPath;
-
-    // List of unique meshes
-    std::vector<GeomCache::Mesh*> m_meshes;
-    uint m_numAnimatedMeshes;
-
-    // For detecting cloned meshes
-    std::unordered_map<AlembicMeshDigest, std::shared_ptr<GeomCache::Mesh> > m_digestToMeshMap;
-
-    // Data for each frame processing
-    FrameData m_jobGroupData;
-
-    // Error count
-    AZStd::atomic_uint m_errorCount;
-
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_ALEMBICCOMPILER_H
diff --git a/Code/Tools/RC/ResourceCompilerABC/AlembicConvertor.cpp b/Code/Tools/RC/ResourceCompilerABC/AlembicConvertor.cpp
deleted file mode 100644
index dc2f5b2c4a..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/AlembicConvertor.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerABC_precompiled.h"
-#include "AlembicConvertor.h"
-#include "AlembicCompiler.h"
-
-#include <AzCore/Memory/SystemAllocator.h>
-
-AlembicConvertor::AlembicConvertor(ICryXML* pXMLParser, IPakSystem* pPakSystem)
-    : m_refCount(1)
-    , m_pXMLParser(pXMLParser)
-    , m_pPakSystem(pPakSystem)
-{
-    AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-}
-
-AlembicConvertor::~AlembicConvertor()
-{
-    if (AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
-    {
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-    }
-}
-
-void AlembicConvertor::Release()
-{
-    if (--m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-ICompiler* AlembicConvertor::CreateCompiler()
-{
-    return new AlembicCompiler(m_pXMLParser);
-}
-
-const char* AlembicConvertor::GetExt(int index) const
-{
-    switch (index)
-    {
-    case 0:
-        return "abc";
-    default:
-        return 0;
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerABC/AlembicConvertor.h b/Code/Tools/RC/ResourceCompilerABC/AlembicConvertor.h
deleted file mode 100644
index 09c3d85601..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/AlembicConvertor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_ALEMBICCONVERTOR_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_ALEMBICCONVERTOR_H
-#pragma once
-
-
-#include "IConvertor.h"
-
-class ICryXML;
-
-class AlembicConvertor
-    : public IConvertor
-{
-public:
-    AlembicConvertor(ICryXML* pXMLParser, IPakSystem* pPakSystem);
-    virtual ~AlembicConvertor();
-
-    // IConvertor methods.
-    virtual void Release();
-    virtual void DeInit() {}
-    virtual ICompiler* CreateCompiler();
-    virtual const char* GetExt(int index) const;
-
-private:
-    int m_refCount;
-    ICryXML* m_pXMLParser;
-    IPakSystem* m_pPakSystem;
-};
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_ALEMBICCONVERTOR_H
diff --git a/Code/Tools/RC/ResourceCompilerABC/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerABC/CMakeLists.txt
deleted file mode 100644
index c326a4aec2..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common)
-
-ly_add_target(
-    NAME ResourceCompilerABC MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompilerabc_files.cmake
-    PLATFORM_INCLUDE_FILES
-        ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        ${common_dir}/${PAL_TRAIT_COMPILER_ID}/resourcecompilerabc_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::lz4
-            3rdParty::mikkelsen
-            3rdParty::zlib
-            3rdParty::zstd
-            Legacy::CryCommonTools
-            Legacy::Cry3DEngine.MeshCompiler.Static
-            Legacy::Cry3DEngine.CGF.Static
-        PUBLIC
-            3rdParty::alembic
-            Legacy::CryCommon
-            Legacy::ResourceCompiler.Static
-    RUNTIME_DEPENDENCIES
-        Legacy::CryXML
-)
-ly_add_dependencies(RC Legacy::ResourceCompilerABC)
diff --git a/Code/Tools/RC/ResourceCompilerABC/GeomCache.h b/Code/Tools/RC/ResourceCompilerABC/GeomCache.h
deleted file mode 100644
index e474c07f4b..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/GeomCache.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-
-#include "GeomCacheFileFormat.h"
-
-#include <Alembic/AbcGeom/IPolyMesh.h>  // for Alembic::AbcGeom::IPolyMesh
-#include <Alembic/AbcGeom/IXform.h>     // for Alembic::AbcGeom::IXform
-
-#include <primitives.h>
-#include <physinterface.h>
-
-#include <AzCore/std/parallel/atomic.h>
-#include <AzCore/std/parallel/mutex.h>
-
-#include <unordered_set>
-
-namespace GeomCache
-{
-    struct MeshData
-    {
-        std::vector<GeomCacheFile::Position> m_positions;
-        std::vector<GeomCacheFile::Texcoords> m_texcoords;
-        std::vector<GeomCacheFile::QTangent> m_qTangents;
-        std::vector<GeomCacheFile::Color> m_reds;
-        std::vector<GeomCacheFile::Color> m_greens;
-        std::vector<GeomCacheFile::Color> m_blues;
-        std::vector<GeomCacheFile::Color> m_alphas;
-    };
-
-    struct RawMeshFrame
-    {
-        RawMeshFrame()
-            : m_bDone(false)
-            , m_bEncoded(false) {}
-
-        RawMeshFrame(RawMeshFrame&& toBeCopied)
-            : m_bDone(toBeCopied.m_bDone)
-            , m_bEncoded(toBeCopied.m_bEncoded)
-            , m_meshData(std::move(toBeCopied.m_meshData))
-        {
-            m_frameUseCount.store(toBeCopied.m_frameUseCount);
-        }
-
-        bool m_bDone;
-        bool m_bEncoded;
-        AZStd::atomic_int m_frameUseCount;
-        MeshData m_meshData;
-    };
-
-    // Data stored for each mesh
-    struct Mesh
-    {
-        Mesh()
-            : m_bUsePredictor(false)
-            , m_firstRawFrameIndex(0) {}
-
-        // Variance
-        GeomCacheFile::EStreams m_constantStreams;
-        GeomCacheFile::EStreams m_animatedStreams;
-
-        // Mesh hash
-        uint64 m_hash;
-
-        // Static mesh AABB
-        AABB m_aabb;
-
-        // The number of required position quantization bits for each axis
-        uint8 m_positionPrecision[3];
-
-        // The abs value of the upper limit of the UV range
-        float m_uvMax;
-
-        // Static mesh data
-        MeshData m_staticMeshData;
-
-        // Compile buffer 
-        RawMeshFrame m_meshDataBuffer;
-
-        // Raw animated data frames for encoder
-        mutable AZStd::mutex m_rawFramesCS;
-        uint m_firstRawFrameIndex;
-        std::deque<RawMeshFrame> m_rawFrames;
-
-        // Encoded animated data frames for writer
-        mutable AZStd::mutex m_encodedFramesCS;
-        std::deque<std::vector<uint8> > m_encodedFrames;
-
-        // Material ID -> material indices. Needs to be std::map, because materials need to be sorted by their id.
-        std::map<uint16, std::vector<uint32> > m_indicesMap;
-
-        // Face ID -> Material ID
-        std::unordered_map<uint32, uint16> m_materialIdMap;
-
-        // Predictor data
-        std::vector<uint16> m_predictorData;
-        bool m_bUsePredictor;
-
-        // Compilation data
-        bool m_bHasNormals;
-        bool m_bHasTexcoords;
-        bool m_bHasColors;
-        std::string m_colorParamName;
-        std::vector<uint32> m_abcIndexToGeomCacheIndex; // map from alembic indices to GPU indices
-        Alembic::AbcGeom::IPolyMesh m_abcMesh; // The alembic poly mesh this originated from
-        std::vector<bool> m_reflections;
-    };
-
-    struct NodeData
-    {
-        bool m_bVisible;
-        QuatTNS m_transform;
-    };
-
-    // A node in the cache transform hierarchy.
-    // Can be a plain parent transform, a transform and mesh combined
-    // or a transform and a physics geometry combined.
-    struct Node
-    {
-        Node()
-            : m_type(GeomCacheFile::eNodeType_Transform)
-            , m_transformType(GeomCacheFile::eTransformType_Constant) {}
-
-        // Node type
-        GeomCacheFile::ENodeType m_type;
-
-        // Transform type
-        GeomCacheFile::ETransformType m_transformType;
-
-        // Static node data
-        NodeData m_staticNodeData;
-
-        // Compile buffer
-        NodeData m_nodeDataBuffer;
-
-        // Animated data frames for encoder
-        std::deque<NodeData> m_animatedNodeData;
-
-        // Encoded animated data frames for writer
-        mutable AZStd::mutex m_encodedFramesCS;
-        std::deque<std::vector<uint8> > m_encodedFrames;
-
-        // Mesh (if mesh node)
-        std::shared_ptr<Mesh> m_pMesh;
-
-        // Serialized physics geometry (if physics geometry node)
-        std::vector<char> m_physicsGeometry;
-
-        // Children
-        std::vector<std::unique_ptr<Node> > m_children;
-
-        // The alembic object
-        Alembic::Abc::IObject m_abcObject;
-
-        // The alembic xform stack for this node that will be merged down to one
-        // transform matrix in the compilation process
-        std::vector<Alembic::AbcGeom::IXform> m_abcXForms;
-
-        // For debug output
-        string m_name;
-    };
-}
diff --git a/Code/Tools/RC/ResourceCompilerABC/GeomCacheBlockCompressor.cpp b/Code/Tools/RC/ResourceCompilerABC/GeomCacheBlockCompressor.cpp
deleted file mode 100644
index ee63a18201..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/GeomCacheBlockCompressor.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerABC_precompiled.h"
-#include <zlib.h>
-#include "GeomCacheBlockCompressor.h"
-
-#include "zlib.h"
-#include "lz4.h"
-#include "lz4hc.h"
-#include <zstd.h>
-
-bool GeomCacheDeflateBlockCompressor::Compress(std::vector<char>& input, std::vector<char>& output)
-{
-    const size_t uncompressedSize = input.size();
-
-    // Reserve buffer. zlib maximum overhead is 5 bytes per 32KB block + 6 bytes fixed.
-    const size_t maxCompressedSize = uncompressedSize + ((uncompressedSize / 32768) + 1) * 5 + 6;
-    output.resize(maxCompressedSize);
-
-    unsigned long compressedSize = 0;
-
-    // Deflate
-    z_stream stream;
-    int error;
-
-    stream.next_in = (Bytef*)&input[0];
-    stream.avail_in = (uInt)uncompressedSize;
-
-    stream.next_out = (Bytef*)&output[0];
-    stream.avail_out = (uInt)maxCompressedSize;
-
-    stream.zalloc = Z_NULL;
-    stream.zfree  = Z_NULL;
-    stream.opaque = Z_NULL;
-
-    error = deflateInit2(&stream, Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 9, Z_DEFAULT_STRATEGY);
-    if (error != Z_OK)
-    {
-        return false;
-    }
-
-    error = deflate(&stream, Z_FINISH);
-    if (error != Z_STREAM_END)
-    {
-        deflateEnd(&stream);
-        return false;
-    }
-
-    compressedSize = stream.total_out;
-
-    error = deflateEnd(&stream);
-    if (error != Z_OK)
-    {
-        return false;
-    }
-
-    if (compressedSize == 0)
-    {
-        return false;
-    }
-
-    // Resize output to final, compressed size
-    output.resize(compressedSize);
-
-    return true;
-}
-
-bool GeomCacheLZ4HCBlockCompressor::Compress(std::vector<char>& input, std::vector<char>& output)
-{
-    const size_t uncompressedSize = input.size();
-
-    // Reserve compress buffer
-    const size_t maxCompressedSize = LZ4_compressBound(uncompressedSize);
-    output.resize(maxCompressedSize);
-
-    // Compress
-    int compressedSize = LZ4_compressHC(input.data(), output.data(), uncompressedSize);
-
-    if (compressedSize == 0)
-    {
-        return false;
-    }
-
-    // Resize output to final, compressed size
-    output.resize(compressedSize);
-
-    return true;
-}
-
-bool GeomCacheZStdBlockCompressor::Compress(std::vector<char>& input, std::vector<char>& output)
-{
-    const size_t uncompressedSize = input.size();
-
-    // Reserve compress buffer
-    const size_t maxCompressedSize = ZSTD_compressBound(uncompressedSize);
-    output.resize(maxCompressedSize);
-
-    // Compress
-    int compressedSize = ZSTD_compress(output.data(), output.size(), input.data(), input.size(), 1);
-
-    if (ZSTD_isError(compressedSize))
-    {
-        return false;
-    }
-
-    // Resize output to final, compressed size
-    output.resize(compressedSize);
-
-    return true;
-}
diff --git a/Code/Tools/RC/ResourceCompilerABC/GeomCacheBlockCompressor.h b/Code/Tools/RC/ResourceCompilerABC/GeomCacheBlockCompressor.h
deleted file mode 100644
index eedb33ef0b..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/GeomCacheBlockCompressor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEBLOCKCOMPRESSOR_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEBLOCKCOMPRESSOR_H
-#pragma once
-
-
-class IGeomCacheBlockCompressor
-{
-public:
-    virtual ~IGeomCacheBlockCompressor() = default;
-    virtual bool Compress(std::vector<char>& input, std::vector<char>& output) = 0;
-};
-
-// This just passes the input to the output vector and does no compression
-class GeomCacheStoreBlockCompressor
-    : public IGeomCacheBlockCompressor
-{
-    ~GeomCacheStoreBlockCompressor() override = default;
-    virtual bool Compress(std::vector<char>& input, std::vector<char>& output) override
-    {
-        input.swap(output);
-        return true;
-    }
-};
-
-// This is the deflate compressor
-class GeomCacheDeflateBlockCompressor
-    : public IGeomCacheBlockCompressor
-{
-    ~GeomCacheDeflateBlockCompressor() override = default;
-    virtual bool Compress(std::vector<char>& input, std::vector<char>& output) override;
-};
-
-// This is the LZ4 HC compressor
-class GeomCacheLZ4HCBlockCompressor
-    : public IGeomCacheBlockCompressor
-{
-    ~GeomCacheLZ4HCBlockCompressor() override = default;
-    virtual bool Compress(std::vector<char>& input, std::vector<char>& output) override;
-};
-
-// This is the ZStandard compressor
-class GeomCacheZStdBlockCompressor
-    : public IGeomCacheBlockCompressor
-{
-    virtual bool Compress(std::vector<char>& input, std::vector<char>& output) override;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEBLOCKCOMPRESSOR_H
diff --git a/Code/Tools/RC/ResourceCompilerABC/GeomCacheEncoder.cpp b/Code/Tools/RC/ResourceCompilerABC/GeomCacheEncoder.cpp
deleted file mode 100644
index 9cd1849cbe..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/GeomCacheEncoder.cpp
+++ /dev/null
@@ -1,1011 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerABC_precompiled.h"
-#include "GeomCacheEncoder.h"
-#include "../Cry3DEngine/GeomCachePredictors.h"
-
-#include <AzCore/std/parallel/lock.h>
-
-#include <iterator>
-#include <tuple>
-
-namespace
-{
-    // Helper to add blob data to std::vector<uint8>
-    template<class T>
-    void PushData(std::vector<uint8>& v, const T& d)
-    {
-        const uint8* pRawData = reinterpret_cast<const uint8*>(&d);
-        v.insert(v.end(), pRawData, pRawData + sizeof(T));
-    }
-
-    template<class T>
-    void PushData(std::vector<uint8>& v, std::vector<T>& d)
-    {
-        const uint8* pRawData = reinterpret_cast<const uint8*>(d.data());
-        v.insert(v.end(), pRawData, pRawData + (d.size() * sizeof(T)));
-    }
-
-    template<class T>
-    void PushDataPadded(std::vector<uint8>& v, std::vector<T>& d)
-    {
-        const uint8* pRawData = reinterpret_cast<const uint8*>(d.data());
-        v.insert(v.end(), pRawData, pRawData + (d.size() * sizeof(T)));
-
-        while ((v.size() % 16) != 0)
-        {
-            v.push_back(0);
-        }
-    }
-}
-
-GeomCacheEncoder::GeomCacheEncoder(GeomCacheWriter& geomCacheWriter, GeomCache::Node& rootNode,
-    const std::vector<GeomCache::Mesh*>& meshes, const bool bUseBFrames, const uint indexFrameDistance)
-    : m_rootNode(rootNode)
-    , m_meshes(meshes)
-    , m_geomCacheWriter(geomCacheWriter)
-    , m_nextFrameIndex(0)
-    , m_firstInfoFrameIndex(0)
-    , m_bUseBFrames(bUseBFrames)
-    , m_indexFrameDistance(indexFrameDistance)
-{
-    if (m_indexFrameDistance > GeomCacheFile::kMaxIFrameDistance)
-    {
-        RCLogWarning("Index frame distance clamped to %d", GeomCacheFile::kMaxIFrameDistance);
-        m_indexFrameDistance = GeomCacheFile::kMaxIFrameDistance;
-    }
-}
-
-void GeomCacheEncoder::Init()
-{
-    m_numNodes = 0;
-    CountNodesRec(m_rootNode);
-}
-
-void GeomCacheEncoder::CountNodesRec(GeomCache::Node& currentNode)
-{
-    ++m_numNodes;
-
-    const uint numChildren = currentNode.m_children.size();
-    for (uint i = 0; i < numChildren; ++i)
-    {
-        CountNodesRec(*currentNode.m_children[i]);
-    }
-}
-
-void GeomCacheEncoder::AddFrame(const Alembic::Abc::chrono_t frameTime, const AABB& aabb, const bool bIsLastFrame)
-{
-    GeomCacheEncoderFrameInfo* pFrame = new GeomCacheEncoderFrameInfo(this, m_nextFrameIndex, frameTime, aabb, bIsLastFrame);
-
-    if (!m_bUseBFrames || bIsLastFrame || (m_nextFrameIndex % m_indexFrameDistance) == 0)
-    {
-        pFrame->m_frameType = GeomCacheFile::eFrameType_IFrame;
-    }
-    else
-    {
-        pFrame->m_frameType = GeomCacheFile::eFrameType_BFrame;
-    }
-
-    ++m_nextFrameIndex;
-
-    EncodeFrame(pFrame);
-}
-
-GeomCacheEncoderFrameInfo& GeomCacheEncoder::GetInfoFromFrameIndex(const uint index)
-{
-    const uint frameInfoOffset = index - m_firstInfoFrameIndex;
-    return *m_frames[frameInfoOffset].get();
-}
-
-void GeomCacheEncoder::EncodeFrame(GeomCacheEncoderFrameInfo* pFrame)
-{
-    m_frames.push_back(std::unique_ptr<GeomCacheEncoderFrameInfo>(pFrame));
-
-    pFrame->m_encodeCountdown += m_numNodes;
-
-    EncodeNodesRec(m_rootNode, pFrame);
-    EncodeAllMeshes(pFrame);
-
-    FrameEncodeFinished(pFrame);
-}
-
-void GeomCacheEncoder::EncodeAllMeshes(GeomCacheEncoderFrameInfo* pFrame)
-{
-    const uint numMeshes = m_meshes.size();
-    int numAnimatedMeshes = 0;
-    for (uint i = 0; i < numMeshes; ++i)
-    {
-        GeomCache::Mesh* pCurrentMesh = m_meshes[i];
-
-        if (pCurrentMesh->m_animatedStreams != 0)
-        {
-            ++pFrame->m_encodeCountdown;
-            EncodeMesh(pCurrentMesh, pFrame);
-
-            // Only need to track the animated meshes we process if we are not the last frame. If we
-            // are processing the last frame then we can set the doneCountdown to 0 since we have by
-            // this point have encoded all the frames, including the current one.
-            if (!pFrame->m_bIsLastFrame)
-            {
-                numAnimatedMeshes++;
-            }
-        }
-    }
-    
-    pFrame->m_doneCountdown = numAnimatedMeshes;
-}
-
-void GeomCacheEncoder::FrameEncodeFinished([[maybe_unused]] GeomCacheEncoderFrameInfo* pFrame)
-{
-    // Write ready frames
-    const uint numFrames = m_frames.size();
-    for (uint i = 0; i < numFrames; ++i)
-    {
-        GeomCacheEncoderFrameInfo& frame = *m_frames[i].get();
-        if (frame.m_encodeCountdown == 0 && !frame.m_bWritten)
-        {
-            m_geomCacheWriter.WriteFrame(frame.m_frameIndex, frame.m_frameAABB, frame.m_frameType, m_meshes, m_rootNode);
-            frame.m_bWritten = true;
-        }
-    }
-    
-    // Remove frames that are not needed anymore
-    while (m_frames.size() > 0 && m_frames.front()->m_doneCountdown == 0)
-    {
-        m_frames.pop_front();
-        ++m_firstInfoFrameIndex;
-    }
-}
-
-void GeomCacheEncoder::EncodeNodesRec(GeomCache::Node& currentNode, GeomCacheEncoderFrameInfo* pFrame)
-{
-    const uint frameIndex = pFrame->m_frameIndex;
-
-    // Get frame to process
-    GeomCache::NodeData& rawFrame = currentNode.m_animatedNodeData.front();
-
-    // Add encoded frame
-    currentNode.m_encodedFramesCS.lock();
-    currentNode.m_encodedFrames.push_back(std::vector<uint8>());
-    std::vector<uint8>& output = currentNode.m_encodedFrames.back();
-    currentNode.m_encodedFramesCS.unlock();
-
-    // Encode index frame
-    EncodeNodeIFrame(currentNode, rawFrame, output);
-
-    assert(pFrame->m_encodeCountdown > 0);
-    --pFrame->m_encodeCountdown;
-    --pFrame->m_doneCountdown;
-
-    // Remove processed raw frame
-    currentNode.m_animatedNodeData.pop_front();
-
-    const uint numChildren = currentNode.m_children.size();
-    for (uint i = 0; i < numChildren; ++i)
-    {
-        EncodeNodesRec(*currentNode.m_children[i], pFrame);
-    }
-}
-
-void GeomCacheEncoder::EncodeNodeIFrame(const GeomCache::Node& currentNode, const GeomCache::NodeData& nodeData, std::vector<uint8>& output)
-{
-    uint32 flags = nodeData.m_bVisible ? 0 : GeomCacheFile::eFrameFlags_Hidden;
-    PushData(output, flags);
-
-    if (currentNode.m_transformType == GeomCacheFile::eTransformType_Animated)
-    {
-        QuatTNS transform = nodeData.m_transform;
-
-        if (!nodeData.m_bVisible)
-        {
-            memset(&transform, 0, sizeof(QuatTNS));
-        }
-
-        PushData(output, transform);
-    }
-}
-
-void GeomCacheEncoder::EncodeMesh(GeomCache::Mesh* pMesh, GeomCacheEncoderFrameInfo* pFrame)
-{
-    const uint frameIndex = pFrame->m_frameIndex;
-    const Alembic::Abc::chrono_t frameTime = pFrame->m_frameTime;
-
-    // Get frame and last index frame to process
-    pMesh->m_rawFramesCS.lock();
-
-    // Get raw mesh frame for current frame index
-    const uint offset = frameIndex - pMesh->m_firstRawFrameIndex;
-    GeomCache::RawMeshFrame& rawMeshFrame = pMesh->m_rawFrames[offset];
-
-    // Search backwards for last encoded index frame
-    GeomCache::RawMeshFrame* pLastIFrameRawFrame = nullptr;
-    GeomCacheEncoderFrameInfo* pLastIFrameInfo = nullptr;
-    uint lastIFrameIndex = 0;
-
-    for (int i = offset; i >= 0; --i)
-    {
-        const uint currentFrameIndex = pMesh->m_firstRawFrameIndex + i;
-        GeomCacheEncoderFrameInfo& frameInfo = GetInfoFromFrameIndex(currentFrameIndex);
-
-        GeomCache::RawMeshFrame& currentFrame = pMesh->m_rawFrames[i];
-        if (currentFrame.m_bEncoded && frameInfo.m_frameType == GeomCacheFile::eFrameType_IFrame)
-        {
-            // Get current raw mesh frame
-            pLastIFrameRawFrame = &currentFrame;
-
-            // Get current frame info structure
-            lastIFrameIndex = currentFrameIndex;
-            pLastIFrameInfo = &frameInfo;
-
-            break;
-        }
-    }
-
-    pMesh->m_rawFramesCS.unlock();
-
-    if (pLastIFrameInfo && pLastIFrameRawFrame)
-    {
-        const uint frameDelta = frameIndex - pLastIFrameInfo->m_frameIndex;
-        const Alembic::Abc::chrono_t timeDelta = frameTime - pLastIFrameInfo->m_frameTime;
-
-        if (pFrame->m_frameType == GeomCacheFile::eFrameType_IFrame)
-        {
-            // Don't need the last index frame anymore after this
-            pLastIFrameRawFrame->m_bDone = true;
-            GeomCache::RawMeshFrame* pPrevFrames[2] = { NULL, pLastIFrameRawFrame };
-            --pLastIFrameInfo->m_doneCountdown;
-
-            // Compress frames in between as b frames
-            for (uint bFrameIndex = lastIFrameIndex + 1; bFrameIndex < frameIndex; ++bFrameIndex)
-            {
-                assert(m_bUseBFrames);
-
-                pMesh->m_encodedFramesCS.lock();
-                pMesh->m_encodedFrames.push_back(std::vector<uint8>());
-                std::vector<uint8>& output = pMesh->m_encodedFrames.back();
-                pMesh->m_encodedFramesCS.unlock();
-
-                const uint offset2 = bFrameIndex - pMesh->m_firstRawFrameIndex;
-                GeomCache::RawMeshFrame& rawMeshBFrame = pMesh->m_rawFrames[offset2];
-                EncodeMeshBFrame(*pMesh, rawMeshBFrame, pPrevFrames, *pLastIFrameRawFrame, rawMeshFrame, output);
-                rawMeshBFrame.m_bDone = true;
-
-                GeomCacheEncoderFrameInfo& bFrameInfo = GetInfoFromFrameIndex(bFrameIndex);
-                --bFrameInfo.m_encodeCountdown;
-                --bFrameInfo.m_doneCountdown;
-
-                pPrevFrames[0] = pPrevFrames[1];
-                pPrevFrames[1] = (rawMeshBFrame.m_frameUseCount > 0) ? &rawMeshBFrame : NULL;
-            }
-
-            // Encode current frame as index frame
-            pMesh->m_encodedFramesCS.lock();
-            pMesh->m_encodedFrames.push_back(std::vector<uint8>());
-            std::vector<uint8>& output = pMesh->m_encodedFrames.back();
-            pMesh->m_encodedFramesCS.unlock();
-
-            EncodeMeshIFrame(*pMesh, rawMeshFrame, output);
-            GeomCacheEncoderFrameInfo& frameInfo = GetInfoFromFrameIndex(frameIndex);
-            --frameInfo.m_encodeCountdown;
-
-            // Remove unneeded frames. Don't remove last frame, because we might still need it for velocity vectors.
-            // Don't need to care if there are frames left in the end, it will be killed with the mesh data structure.
-            if (frameIndex > 1)
-            {
-                pMesh->m_rawFramesCS.lock();
-                for (uint i = 0; (m_firstInfoFrameIndex + i) < (frameIndex - 2); ++i)
-                {
-                    if (pMesh->m_rawFrames.front().m_bDone)
-                    {
-                        pMesh->m_rawFrames.pop_front();
-                        ++pMesh->m_firstRawFrameIndex;
-                    }
-                }
-                pMesh->m_rawFramesCS.unlock();
-            }
-        }
-    }
-    else
-    {
-        // No previous index frame, encode as first index frame
-        assert(frameIndex == 0);
-
-        pMesh->m_encodedFramesCS.lock();
-        pMesh->m_encodedFrames.push_back(std::vector<uint8>());
-        std::vector<uint8>& output = pMesh->m_encodedFrames.back();
-        pMesh->m_encodedFramesCS.unlock();
-
-        EncodeMeshIFrame(*pMesh, rawMeshFrame, output);
-        --GetInfoFromFrameIndex(frameIndex).m_encodeCountdown;
-    }
-}
-
-void GeomCacheEncoder::EncodeMeshIFrame(GeomCache::Mesh& mesh, GeomCache::RawMeshFrame& rawMeshFrame, std::vector<uint8>& output)
-{
-    const bool bMeshVisible = rawMeshFrame.m_frameUseCount > 0;
-    const bool bUsePrediction = mesh.m_bUsePredictor;
-
-    STATIC_ASSERT((sizeof(GeomCacheFile::SMeshFrameHeader) % 16) == 0, "SMeshFrameHeader size must be a multiple of 16");
-
-    GeomCacheFile::SMeshFrameHeader frameHeader;
-    memset(&frameHeader, 0, sizeof(GeomCacheFile::SMeshFrameHeader));
-    frameHeader.m_flags = bMeshVisible ? 0 : GeomCacheFile::eFrameFlags_Hidden;
-
-    rawMeshFrame.m_bEncoded = true;
-
-    const GeomCacheFile::EStreams streamMask = mesh.m_animatedStreams;
-
-    bool bWroteStream = false;
-    GeomCache::MeshData& meshData = rawMeshFrame.m_meshData;
-    uint numElements = meshData.m_positions.size();
-
-    std::vector<uint8> frameData;
-
-    if (streamMask & GeomCacheFile::eStream_Positions)
-    {
-        if (bUsePrediction)
-        {
-            std::vector<GeomCacheFile::Position> encodedPositions(numElements);
-            GeomCachePredictors::ParallelogramPredictor<GeomCacheFile::Position, true>(numElements, meshData.m_positions.data(), encodedPositions.data(), mesh.m_predictorData);
-
-#ifdef _DEBUG
-            // Make sure the encoding is reversible
-            std::vector<GeomCacheFile::Position> decodedPositions(numElements);
-            GeomCachePredictors::ParallelogramPredictor<GeomCacheFile::Position, false>(numElements, encodedPositions.data(), decodedPositions.data(), mesh.m_predictorData);
-            assert(decodedPositions == meshData.m_positions);
-#endif
-
-            PushDataPadded(frameData, encodedPositions);
-        }
-        else
-        {
-            PushDataPadded(frameData, meshData.m_positions);
-        }
-
-        bWroteStream = true;
-        numElements = meshData.m_positions.size();
-    }
-
-    if (streamMask & GeomCacheFile::eStream_Texcoords)
-    {
-        assert(!bWroteStream || meshData.m_texcoords.size() == numElements);
-
-        if (bUsePrediction)
-        {
-            std::vector<GeomCacheFile::Texcoords> encodedTexcoords(numElements);
-            GeomCachePredictors::ParallelogramPredictor<GeomCacheFile::Texcoords, true>(numElements, meshData.m_texcoords.data(), encodedTexcoords.data(), mesh.m_predictorData);
-
-#ifdef _DEBUG
-            // Make sure the encoding is reversible
-            std::vector<GeomCacheFile::Texcoords> decodedTexcoords(numElements);
-            GeomCachePredictors::ParallelogramPredictor<GeomCacheFile::Texcoords, false>(numElements, encodedTexcoords.data(), decodedTexcoords.data(), mesh.m_predictorData);
-            assert(decodedTexcoords == meshData.m_texcoords);
-#endif
-
-            PushDataPadded(frameData, encodedTexcoords);
-        }
-        else
-        {
-            PushDataPadded(frameData, meshData.m_texcoords);
-        }
-
-        bWroteStream = true;
-        numElements = meshData.m_texcoords.size();
-    }
-
-    if (streamMask & GeomCacheFile::eStream_QTangents)
-    {
-        assert(!bWroteStream || meshData.m_qTangents.size() == numElements);
-
-        if (bUsePrediction)
-        {
-            std::vector<GeomCacheFile::QTangent> encodedQTangents(numElements);
-            GeomCachePredictors::QTangentPredictor<true>(numElements, meshData.m_qTangents.data(), encodedQTangents.data(), mesh.m_predictorData);
-
-#ifdef _DEBUG
-            // Make sure the encoding is reversible
-            std::vector<GeomCacheFile::QTangent> decodedQTangents(numElements);
-            GeomCachePredictors::QTangentPredictor<false>(numElements, encodedQTangents.data(), decodedQTangents.data(), mesh.m_predictorData);
-            assert(decodedQTangents == meshData.m_qTangents);
-#endif
-
-            PushDataPadded(frameData, encodedQTangents);
-        }
-        else
-        {
-            PushDataPadded(frameData, meshData.m_qTangents);
-        }
-
-        bWroteStream = true;
-        numElements = meshData.m_qTangents.size();
-    }
-
-    if (streamMask & GeomCacheFile::eStream_Colors)
-    {
-        assert(!bWroteStream || meshData.m_reds.size() == numElements);
-        assert(!bWroteStream || meshData.m_greens.size() == numElements);
-        assert(!bWroteStream || meshData.m_blues.size() == numElements);
-
-        if (bUsePrediction)
-        {
-            std::vector<GeomCacheFile::Color> encodedReds(numElements);
-            GeomCachePredictors::ColorPredictor<true>(numElements, meshData.m_reds.data(), encodedReds.data(), mesh.m_predictorData);
-            std::vector<GeomCacheFile::Color> encodedGreens(numElements);
-            GeomCachePredictors::ColorPredictor<true>(numElements, meshData.m_greens.data(), encodedGreens.data(), mesh.m_predictorData);
-            std::vector<GeomCacheFile::Color> encodedBlues(numElements);
-            GeomCachePredictors::ColorPredictor<true>(numElements, meshData.m_blues.data(), encodedBlues.data(), mesh.m_predictorData);
-            std::vector<GeomCacheFile::Color> encodedAlphas(numElements);
-            GeomCachePredictors::ColorPredictor<true>(numElements, meshData.m_alphas.data(), encodedAlphas.data(), mesh.m_predictorData);
-
-#ifdef _DEBUG
-            // Make sure the encoding is reversible
-            std::vector<GeomCacheFile::Color> decodedReds(numElements);
-            GeomCachePredictors::ColorPredictor<false>(numElements, encodedReds.data(), decodedReds.data(), mesh.m_predictorData);
-            std::vector<GeomCacheFile::Color> decodedGreens(numElements);
-            GeomCachePredictors::ColorPredictor<false>(numElements, encodedGreens.data(), decodedGreens.data(), mesh.m_predictorData);
-            std::vector<GeomCacheFile::Color> decodedBlues(numElements);
-            GeomCachePredictors::ColorPredictor<false>(numElements, encodedBlues.data(), decodedBlues.data(), mesh.m_predictorData);
-            std::vector<GeomCacheFile::Color> decodedAlphas(numElements);
-            GeomCachePredictors::ColorPredictor<false>(numElements, encodedAlphas.data(), decodedAlphas.data(), mesh.m_predictorData);
-
-            assert(decodedReds == meshData.m_reds);
-            assert(decodedGreens == meshData.m_greens);
-            assert(decodedBlues == meshData.m_blues);
-            assert(decodedAlphas == meshData.m_alphas);
-#endif
-
-            PushDataPadded(frameData, encodedReds);
-            PushDataPadded(frameData, encodedGreens);
-            PushDataPadded(frameData, encodedBlues);
-            PushDataPadded(frameData, encodedAlphas);
-        }
-        else
-        {
-            PushDataPadded(frameData, meshData.m_reds);
-            PushDataPadded(frameData, meshData.m_greens);
-            PushDataPadded(frameData, meshData.m_blues);
-            PushDataPadded(frameData, meshData.m_alphas);
-        }
-
-        bWroteStream = true;
-        numElements = meshData.m_reds.size();
-    }
-
-    // If mesh is not visible and we are not using b frame we can zero out the
-    // complete index frame data resulting in almost no data stored after
-    // range/entropy coding
-    if (!bMeshVisible && !m_bUseBFrames)
-    {
-        std::fill(frameData.begin(), frameData.end(), 0);
-    }
-
-    PushData(output, frameHeader);
-    PushData(output, frameData);
-}
-
-namespace
-{
-    template<class T>
-    float Entropy(const uint numElements, const T* pData)
-    {
-        const uint8* pRawData = reinterpret_cast<const uint8*>(pData);
-
-        size_t symbolCounts[256];
-        std::fill(symbolCounts, symbolCounts + 256, 0);
-
-        const size_t numBytes = numElements * sizeof(T);
-        for (size_t i = 0; i < numBytes; ++i)
-        {
-            ++symbolCounts[pRawData[i]];
-        }
-
-        float sum = 0.0f;
-        for (uint i = 0; i < 256; ++i)
-        {
-            if (symbolCounts[i] > 0)
-            {
-                const float symbolPropability = ((float)symbolCounts[i] / (float)numBytes);
-                sum += symbolPropability * (log(symbolPropability) / log(2.0f));
-            }
-        }
-
-        return -sum;
-    }
-
-    template<class T>
-    uint8 BinarySearchPredictor(const uint numElements, std::function<const T*(uint8)> predictor)
-    {
-        uint8 min = std::numeric_limits<uint8>::min();
-        uint8 max = std::numeric_limits<uint8>::max();
-
-        const T* pLeft = predictor(min);
-        float leftEntropy = Entropy(numElements, pLeft);
-        const T* pRight = predictor(max);
-        float rightEntropy = Entropy(numElements, pRight);
-
-        while (min != max)
-        {
-            if (leftEntropy < rightEntropy)
-            {
-                max -= (max - min + 1) / 2;
-                rightEntropy = Entropy(numElements, predictor(max));
-            }
-            else
-            {
-                min += (max - min + 1) / 2;
-                leftEntropy = Entropy(numElements, predictor(min));
-            }
-
-            assert(max >= min);
-        }
-
-        return min;
-    }
-
-    template<class I, class T>
-    void TemporalPredictorEncode(GeomCacheFile::STemporalPredictorControl& controlOut, const GeomCachePredictors::STemporalPredictorData<T>& data, const T* pIn, T* pOut)
-    {
-        const uint numElements = data.m_numElements;
-
-        // Search for the best interpolate predictor value
-        controlOut.m_indexFrameLerpFactor = BinarySearchPredictor<T>(numElements, [&](uint8 lerpFactor) -> const T*
-                {
-                    GeomCachePredictors::InterpolateDeltaEncode<I, T>(numElements, lerpFactor, data.m_pFloorFrame, data.m_pCeilFrame, pIn, pOut);
-                    return pOut;
-                });
-
-        if (data.m_pPrevFrames[0] && data.m_pPrevFrames[1])
-        {
-            // Search for the best motion predictor value
-            controlOut.m_acceleration = BinarySearchPredictor<T>(numElements, [&](uint8 acceleration) -> const T*
-                    {
-                        GeomCachePredictors::MotionDeltaEncode<I, T>(numElements, acceleration, data.m_pPrevFrames, pIn, pOut);
-                        return pOut;
-                    });
-        }
-        else
-        {
-            controlOut.m_acceleration = 0;
-            controlOut.m_combineFactor = 0;
-            return;
-        }
-
-        // Finally search for the best combination
-        controlOut.m_acceleration = BinarySearchPredictor<T>(numElements, [&](uint8 combineFactor) -> const T*
-                {
-                    controlOut.m_combineFactor = combineFactor;
-                    GeomCachePredictors::InterpolateMotionDeltaPredictor<I, T, true>(controlOut, data, pIn, pOut);
-                    return pOut;
-                });
-
-        GeomCachePredictors::InterpolateMotionDeltaPredictor<I, T, true>(controlOut, data, pIn, pOut);
-
-#ifdef _DEBUG
-        // Make sure the encoding is reversible
-        std::vector<T> decoded(numElements);
-        GeomCachePredictors::InterpolateMotionDeltaPredictor<I, T, false>(controlOut, data, pOut, decoded.data());
-        const T* pDecoded = decoded.data();
-        assert(memcmp(pDecoded, pIn, sizeof(T) * numElements) == 0);
-#endif
-    }
-}
-
-void GeomCacheEncoder::EncodeMeshBFrame(GeomCache::Mesh& mesh, GeomCache::RawMeshFrame& rawMeshFrame,
-    GeomCache::RawMeshFrame* pPrevFrames[2], GeomCache::RawMeshFrame& floorIndexFrame,
-    GeomCache::RawMeshFrame& ceilIndexFrame, std::vector<uint8>& output)
-{
-    const bool bMeshVisible = rawMeshFrame.m_frameUseCount > 0;
-
-    GeomCacheFile::SMeshFrameHeader frameHeader;
-    memset(&frameHeader, 0, sizeof(GeomCacheFile::SMeshFrameHeader));
-    frameHeader.m_flags = bMeshVisible ? 0 : GeomCacheFile::eFrameFlags_Hidden;
-
-    rawMeshFrame.m_bEncoded = true;
-
-    const GeomCacheFile::EStreams streamMask = mesh.m_animatedStreams;
-    GeomCache::MeshData& meshData = rawMeshFrame.m_meshData;
-    uint numElements = meshData.m_positions.size();
-
-    std::vector<uint8> frameData;
-
-    const bool bCanMotionPredict = pPrevFrames[0] && pPrevFrames[1];
-
-    if (streamMask & GeomCacheFile::eStream_Positions)
-    {
-        GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Position> predictorData;
-        predictorData.m_numElements = numElements;
-        predictorData.m_pFloorFrame = floorIndexFrame.m_meshData.m_positions.data();
-        predictorData.m_pCeilFrame = ceilIndexFrame.m_meshData.m_positions.data();
-        predictorData.m_pPrevFrames[0] = pPrevFrames[0] ? pPrevFrames[0]->m_meshData.m_positions.data() : nullptr;
-        predictorData.m_pPrevFrames[1] = pPrevFrames[1] ? pPrevFrames[1]->m_meshData.m_positions.data() : nullptr;
-
-        std::vector<GeomCacheFile::Position> predictedPositions(numElements);
-
-        typedef Vec3_tpl<uint32> I;
-        TemporalPredictorEncode<I>(frameHeader.m_positionStreamPredictorControl, predictorData,
-            rawMeshFrame.m_meshData.m_positions.data(), predictedPositions.data());
-
-        PushDataPadded(frameData, predictedPositions);
-    }
-
-    if (streamMask & GeomCacheFile::eStream_Texcoords)
-    {
-        GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Texcoords> predictorData;
-        predictorData.m_numElements = numElements;
-        predictorData.m_pFloorFrame = floorIndexFrame.m_meshData.m_texcoords.data();
-        predictorData.m_pCeilFrame = ceilIndexFrame.m_meshData.m_texcoords.data();
-        predictorData.m_pPrevFrames[0] = pPrevFrames[0] ? pPrevFrames[0]->m_meshData.m_texcoords.data() : nullptr;
-        predictorData.m_pPrevFrames[1] = pPrevFrames[1] ? pPrevFrames[1]->m_meshData.m_texcoords.data() : nullptr;
-
-        std::vector<GeomCacheFile::Texcoords> predictedTexcoords(numElements);
-        typedef Vec2_tpl<uint32> I;
-        TemporalPredictorEncode<I>(frameHeader.m_texcoordStreamPredictorControl, predictorData,
-            rawMeshFrame.m_meshData.m_texcoords.data(), predictedTexcoords.data());
-
-        PushDataPadded(frameData, predictedTexcoords);
-    }
-
-    if (streamMask & GeomCacheFile::eStream_QTangents)
-    {
-        GeomCachePredictors::STemporalPredictorData<GeomCacheFile::QTangent> predictorData;
-        predictorData.m_numElements = numElements;
-        predictorData.m_pFloorFrame = floorIndexFrame.m_meshData.m_qTangents.data();
-        predictorData.m_pCeilFrame = ceilIndexFrame.m_meshData.m_qTangents.data();
-        predictorData.m_pPrevFrames[0] = pPrevFrames[0] ? pPrevFrames[0]->m_meshData.m_qTangents.data() : nullptr;
-        predictorData.m_pPrevFrames[1] = pPrevFrames[1] ? pPrevFrames[1]->m_meshData.m_qTangents.data() : nullptr;
-
-        std::vector<GeomCacheFile::QTangent> predictedQTangents(numElements);
-        typedef Vec4_tpl<uint32> I;
-        TemporalPredictorEncode<I>(frameHeader.m_qTangentStreamPredictorControl, predictorData,
-            rawMeshFrame.m_meshData.m_qTangents.data(), predictedQTangents.data());
-
-        PushDataPadded(frameData, predictedQTangents);
-    }
-
-    if (streamMask & GeomCacheFile::eStream_Colors)
-    {
-        {
-            GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Color> predictorData;
-            predictorData.m_numElements = numElements;
-            predictorData.m_pFloorFrame = floorIndexFrame.m_meshData.m_reds.data();
-            predictorData.m_pCeilFrame = ceilIndexFrame.m_meshData.m_reds.data();
-            predictorData.m_pPrevFrames[0] = pPrevFrames[0] ? pPrevFrames[0]->m_meshData.m_reds.data() : nullptr;
-            predictorData.m_pPrevFrames[1] = pPrevFrames[1] ? pPrevFrames[1]->m_meshData.m_reds.data() : nullptr;
-
-            std::vector<GeomCacheFile::Color> predictedReds(numElements);
-            typedef uint16 I;
-            TemporalPredictorEncode<I>(frameHeader.m_colorStreamPredictorControl[0], predictorData,
-                rawMeshFrame.m_meshData.m_reds.data(), predictedReds.data());
-
-            PushDataPadded(frameData, predictedReds);
-        }
-
-        {
-            GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Color> predictorData;
-            predictorData.m_numElements = numElements;
-            predictorData.m_pFloorFrame = floorIndexFrame.m_meshData.m_greens.data();
-            predictorData.m_pCeilFrame = ceilIndexFrame.m_meshData.m_greens.data();
-            predictorData.m_pPrevFrames[0] = pPrevFrames[0] ? pPrevFrames[0]->m_meshData.m_greens.data() : nullptr;
-            predictorData.m_pPrevFrames[1] = pPrevFrames[1] ? pPrevFrames[1]->m_meshData.m_greens.data() : nullptr;
-
-            std::vector<GeomCacheFile::Color> predictedGreens(numElements);
-            typedef uint16 I;
-            TemporalPredictorEncode<I>(frameHeader.m_colorStreamPredictorControl[1], predictorData,
-                rawMeshFrame.m_meshData.m_greens.data(), predictedGreens.data());
-
-            PushDataPadded(frameData, predictedGreens);
-        }
-
-        {
-            GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Color> predictorData;
-            predictorData.m_numElements = numElements;
-            predictorData.m_pFloorFrame = floorIndexFrame.m_meshData.m_blues.data();
-            predictorData.m_pCeilFrame = ceilIndexFrame.m_meshData.m_blues.data();
-            predictorData.m_pPrevFrames[0] = pPrevFrames[0] ? pPrevFrames[0]->m_meshData.m_blues.data() : nullptr;
-            predictorData.m_pPrevFrames[1] = pPrevFrames[1] ? pPrevFrames[1]->m_meshData.m_blues.data() : nullptr;
-
-            std::vector<GeomCacheFile::Color> predictedBlues(numElements);
-            typedef uint16 I;
-            TemporalPredictorEncode<I>(frameHeader.m_colorStreamPredictorControl[2], predictorData,
-                rawMeshFrame.m_meshData.m_blues.data(), predictedBlues.data());
-
-            PushDataPadded(frameData, predictedBlues);
-        }
-
-        {
-            GeomCachePredictors::STemporalPredictorData<GeomCacheFile::Color> predictorData;
-            predictorData.m_numElements = numElements;
-            predictorData.m_pFloorFrame = floorIndexFrame.m_meshData.m_alphas.data();
-            predictorData.m_pCeilFrame = ceilIndexFrame.m_meshData.m_alphas.data();
-            predictorData.m_pPrevFrames[0] = pPrevFrames[0] ? pPrevFrames[0]->m_meshData.m_alphas.data() : nullptr;
-            predictorData.m_pPrevFrames[1] = pPrevFrames[1] ? pPrevFrames[1]->m_meshData.m_alphas.data() : nullptr;
-
-            std::vector<GeomCacheFile::Color> predictedAlphas(numElements);
-            typedef uint16 I;
-            TemporalPredictorEncode<I>(frameHeader.m_colorStreamPredictorControl[3], predictorData,
-                rawMeshFrame.m_meshData.m_alphas.data(), predictedAlphas.data());
-
-            PushDataPadded(frameData, predictedAlphas);
-        }
-    }
-
-    // If mesh is not visible we can zero out the complete frame data
-    // resulting in almost no data stored after range/entropy coding
-    if (!bMeshVisible)
-    {
-        std::fill(frameData.begin(), frameData.end(), 0);
-    }
-
-    PushData(output, frameHeader);
-    PushData(output, frameData);
-}
-
-namespace std
-{
-    // Needed for unordered map. It's beyond me why this isn't included in the STL.
-    template<class T1, class T2>
-    class hash<std::pair<T1, T2> >
-    {
-    public:
-        size_t operator()(const std::pair<T1, T2>& pair) const
-        {
-            std::hash<T1> hasherT1;
-            std::hash<T2> hasherT2;
-            size_t hash1 = hasherT1(pair.first);
-            return hasherT2(pair.second) + 0x9e3779b9 + (hash1 << 6) + (hash1 >> 2);
-        }
-    };
-}
-
-namespace
-{
-    typedef std::unordered_map<uint32, uint32> ReorderMap;
-
-    template<class T>
-    void ReorderVector(std::vector<T>& vector, const ReorderMap& reorderMap)
-    {
-        std::vector<T> oldVector = vector;
-
-        const uint numElements = oldVector.size();
-        for (uint i = 0; i < numElements; ++i)
-        {
-            assert(reorderMap.find(i) != reorderMap.end());
-            const uint32 newIndex = reorderMap.find(i)->second;
-            vector[newIndex] = oldVector[i];
-        }
-    }
-}
-
-// Optimizes the given mesh for frame compression
-bool GeomCacheEncoder::OptimizeMeshForCompression(GeomCache::Mesh& mesh, const bool bUseMeshPrediction)
-{
-    // Reorder vertices based on first use in index arrays
-    ReorderMap reorderMap;
-
-    uint32 currentNewIndex = 0;
-    for (auto iter = mesh.m_indicesMap.begin(); iter != mesh.m_indicesMap.end(); ++iter)
-    {
-        std::vector<uint32>& materialIndices = iter->second;
-
-        const uint numMaterialIndices = materialIndices.size();
-        for (uint i = 0; i < numMaterialIndices; ++i)
-        {
-            const uint32 oldIndex = materialIndices[i];
-            if (reorderMap.find(oldIndex) == reorderMap.end())
-            {
-                reorderMap[oldIndex] = currentNewIndex++;
-            }
-        }
-    }
-
-    for (auto iter = mesh.m_indicesMap.begin(); iter != mesh.m_indicesMap.end(); ++iter)
-    {
-        std::vector<uint32>& materialIndices = iter->second;
-
-        const uint numMaterialIndices = materialIndices.size();
-        for (uint i = 0; i < numMaterialIndices; ++i)
-        {
-            assert(reorderMap.find(materialIndices[i]) != reorderMap.end());
-            materialIndices[i] = reorderMap[materialIndices[i]];
-        }
-    }
-
-    GeomCache::MeshData& staticMeshData = mesh.m_staticMeshData;
-
-    ReorderVector<>(staticMeshData.m_positions, reorderMap);
-    ReorderVector<>(staticMeshData.m_texcoords, reorderMap);
-    ReorderVector<>(staticMeshData.m_qTangents, reorderMap);
-    ReorderVector<>(staticMeshData.m_reds, reorderMap);
-    ReorderVector<>(staticMeshData.m_greens, reorderMap);
-    ReorderVector<>(staticMeshData.m_blues, reorderMap);
-    ReorderVector<>(staticMeshData.m_alphas, reorderMap);
-    ReorderVector<>(mesh.m_reflections, reorderMap);
-
-    uint numIndexToGeomCacheIndex = mesh.m_abcIndexToGeomCacheIndex.size();
-    for (uint i = 0; i < numIndexToGeomCacheIndex; ++i)
-    {
-        const uint32 oldIndex = mesh.m_abcIndexToGeomCacheIndex[i];
-        assert(reorderMap.find(oldIndex) != reorderMap.end());
-        const uint32 newIndex = reorderMap.find(oldIndex)->second;
-        mesh.m_abcIndexToGeomCacheIndex[i] = newIndex;
-    }
-
-    if (!bUseMeshPrediction)
-    {
-        mesh.m_bUsePredictor = false;
-        return true;
-    }
-
-    // Create map of neighbor indices for each index
-    std::unordered_map<uint32, std::vector<uint32> > neighborIndexMap;
-    for (auto iter = mesh.m_indicesMap.begin(); iter != mesh.m_indicesMap.end(); ++iter)
-    {
-        std::vector<uint32>& materialIndices = iter->second;
-
-        const uint numMaterialIndices = materialIndices.size();
-        for (uint i = 0; i < numMaterialIndices; i += 3)
-        {
-            const uint32 index1 = materialIndices[i];
-            const uint32 index2 = materialIndices[i + 1];
-            const uint32 index3 = materialIndices[i + 2];
-
-            stl::push_back_unique(neighborIndexMap[index1], index2);
-            stl::push_back_unique(neighborIndexMap[index2], index1);
-            stl::push_back_unique(neighborIndexMap[index2], index3);
-            stl::push_back_unique(neighborIndexMap[index3], index2);
-            stl::push_back_unique(neighborIndexMap[index3], index1);
-            stl::push_back_unique(neighborIndexMap[index1], index3);
-        }
-    }
-
-    // Sort neighbor arrays for fast set intersection
-    for (auto iter = neighborIndexMap.begin(); iter != neighborIndexMap.end(); ++iter)
-    {
-        std::sort(iter->second.begin(), iter->second.end());
-    }
-
-    uint foundNeighborCount = 0;
-    uint foundNoNeighborCount = 0;
-
-    // Create data structure for mesh predictor
-    STATIC_ASSERT(GeomCacheFile::kMeshPredictorLookBackMaxDist < 0xFFFF, "kMeshPredictorLookBackArraySize must be smaller than 0xFF");
-
-    uint64 averageDelta = 0;
-    const uint numPositions = staticMeshData.m_positions.size();
-    std::vector<uint32> intersection;
-    std::vector<std::tuple<uint, uint, uint> > foundNeighborTris;
-
-    for (uint currentIndex = 0; currentIndex < numPositions; ++currentIndex)
-    {
-        // Look up neighbors for this vertex index
-        std::vector<uint32>& neighbors = neighborIndexMap[currentIndex];
-        const uint numNeighbors = neighbors.size();
-
-        // Array of adjacent neighbor triangles
-        foundNeighborTris.clear();
-
-        bool bFoundNeighborTriangle = false;
-        for (uint i = 0; i < numNeighbors; ++i)
-        {
-            const uint neighborIndex = neighbors[i];
-            assert(neighborIndex != currentIndex);
-
-            // check if neighbor index is in the predictors look back range
-            const uint neighborIndexDistance = currentIndex - neighborIndex;
-
-            if (neighborIndex < currentIndex && neighborIndexDistance <= GeomCacheFile::kMeshPredictorLookBackMaxDist)
-            {
-                std::vector<uint32>& neighborNeighbors = neighborIndexMap[neighborIndex];
-                const uint numNeighborNeighbors = neighborNeighbors.size();
-
-                for (uint j = 0; j < numNeighborNeighbors; ++j)
-                {
-                    // Check neighbor neighbor index is also a neighbor of currentIndex and if it is in range
-                    const uint neighborNeighborIndex = neighborNeighbors[j];
-                    const uint neighborNeighborIndexDistance = currentIndex - neighborNeighborIndex;
-
-                    if (neighborNeighborIndexDistance < currentIndex
-                        && neighborNeighborIndexDistance <= GeomCacheFile::kMeshPredictorLookBackMaxDist
-                        && neighborNeighborIndex != i && stl::find(neighbors, neighborNeighborIndex))
-                    {
-                        // Now we have two indices that are neighbors of currentIndex and are themselves neighbors
-                        // Check if they share a common neighbor that is not currentIndex. If so we have a neighbor triangle.
-                        std::vector<uint32>& neighborNeighborNeighbors = neighborIndexMap[neighborNeighborIndex];
-
-                        intersection.clear();
-                        std::set_intersection(neighborNeighborNeighbors.begin(), neighborNeighborNeighbors.end(),
-                            neighborNeighbors.begin(), neighborNeighbors.end(), std::back_inserter(intersection));
-
-                        uint numSharedIndices = intersection.size();
-                        for (uint k = 0; k < numSharedIndices; ++k)
-                        {
-                            const uint32 sharedIndex = intersection[k];
-
-                            const uint sharedIndexDistance = currentIndex - sharedIndex;
-                            if (sharedIndexDistance < currentIndex
-                                && sharedIndexDistance <= GeomCacheFile::kMeshPredictorLookBackMaxDist
-                                && sharedIndex != currentIndex)
-                            {
-                                foundNeighborTris.push_back(std::make_tuple<>(neighborIndexDistance, neighborNeighborIndexDistance, sharedIndexDistance));
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Find best neighbor triangle for parallelogram prediction
-            const uint numNeighbors2 = foundNeighborTris.size();
-            if (numNeighbors2 > 0)
-            {
-                bFoundNeighborTriangle = true;
-                ++foundNeighborCount;
-                uint preferedNeighbor = 0;
-                uint bestDelta = std::numeric_limits<uint>::max();
-
-                for (uint j = 0; j < numNeighbors2; ++j)
-                {
-                    const uint uDist = std::get<0>(foundNeighborTris[j]);
-                    const uint vDist = std::get<1>(foundNeighborTris[j]);
-                    const uint wDist = std::get<2>(foundNeighborTris[j]);
-
-                    GeomCacheFile::Position& u = staticMeshData.m_positions[currentIndex - uDist];
-                    GeomCacheFile::Position& v = staticMeshData.m_positions[currentIndex - vDist];
-                    GeomCacheFile::Position& w = staticMeshData.m_positions[currentIndex - wDist];
-
-                    GeomCacheFile::Position& realPosition = staticMeshData.m_positions[currentIndex];
-                    GeomCacheFile::Position predictedPosition = u + v - w;
-
-                    uint delta = std::abs((int32)realPosition.x - (int32)predictedPosition.x)
-                        + std::abs((int32)realPosition.y - (int32)predictedPosition.y)
-                        + std::abs((int32)realPosition.z - (int32)predictedPosition.z);
-
-                    if (delta < bestDelta)
-                    {
-                        preferedNeighbor = j;
-                        bestDelta = delta;
-                    }
-                }
-
-                averageDelta += bestDelta;
-
-                mesh.m_predictorData.push_back(std::get<0>(foundNeighborTris[preferedNeighbor]));
-                mesh.m_predictorData.push_back(std::get<1>(foundNeighborTris[preferedNeighbor]));
-                mesh.m_predictorData.push_back(std::get<2>(foundNeighborTris[preferedNeighbor]));
-                break;
-            }
-        }
-
-        if (!bFoundNeighborTriangle)
-        {
-            mesh.m_predictorData.push_back(0xFFFF);
-            ++foundNoNeighborCount;
-        }
-    }
-
-    averageDelta /= numPositions;
-
-    // At least first vertices can't have a valid neighbor triangle
-    assert(foundNoNeighborCount >= 3);
-
-    bool bBadConnectivity = ((double)foundNeighborCount / (double)numPositions) < 0.5;
-
-    if (bBadConnectivity)
-    {
-        RCLogWarning("Less than 50%% of the vertices in mesh %s have a triangle neighbor. Mesh prediction could be impaired.", mesh.m_abcMesh.getName().c_str());
-    }
-
-    mesh.m_bUsePredictor = true;
-
-    return true;
-}
diff --git a/Code/Tools/RC/ResourceCompilerABC/GeomCacheEncoder.h b/Code/Tools/RC/ResourceCompilerABC/GeomCacheEncoder.h
deleted file mode 100644
index 1faca45fd6..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/GeomCacheEncoder.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEENCODER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEENCODER_H
-#pragma once
-
-
-#include "GeomCache.h"
-#include "GeomCacheWriter.h"
-#include "StealingThreadPool.h"
-
-#include <AzCore/std/parallel/atomic.h>
-#include <AzCore/std/parallel/condition_variable.h>
-#include <AzCore/std/parallel/mutex.h>
-
-class GeomCacheEncoder;
-
-struct GeomCacheEncoderFrameInfo
-{
-    GeomCacheEncoderFrameInfo(GeomCacheEncoder* pEncoder, const uint frameIndex,
-        const Alembic::Abc::chrono_t frameTime, const AABB& aabb, const bool bIsLastFrame)
-        : m_pEncoder(pEncoder)
-        , m_bWritten(false)
-        , m_encodeCountdown(0)
-        , m_frameIndex(frameIndex)
-        , m_frameTime(frameTime)
-        , m_frameAABB(aabb)
-        , m_bIsLastFrame(bIsLastFrame) {};
-
-    // The encoder that created this structure
-    GeomCacheEncoder* m_pEncoder;
-
-    // The ID of this frame
-    uint m_frameIndex;
-
-    // Frame type
-    GeomCacheFile::EFrameType m_frameType;
-
-    // If frame is the last one
-    bool m_bIsLastFrame;
-
-    // The time of this frame
-    Alembic::AbcCoreAbstract::chrono_t m_frameTime;
-
-    // If frame was written already
-    bool m_bWritten;
-
-    // If this counter reaches 0 the frame is ready to be written
-    uint m_encodeCountdown;
-
-    // If this counter reaches 0 the frame can be discarded
-    uint m_doneCountdown;
-
-    // AABB of frame
-    const AABB m_frameAABB;
-};
-
-class GeomCacheEncoder
-{
-public:
-    GeomCacheEncoder(GeomCacheWriter& geomCacheWriter, GeomCache::Node& rootNode,
-        const std::vector<GeomCache::Mesh*>& meshes, const bool bUseBFrames, const uint indexFrameDistance);
-
-    void Init();
-    void AddFrame(const Alembic::Abc::chrono_t frameTime, const AABB& aabb, const bool bIsLastFrame);
-
-    static bool OptimizeMeshForCompression(GeomCache::Mesh& mesh, const bool bUseMeshPrediction);
-
-private:
-    GeomCacheEncoderFrameInfo& GetInfoFromFrameIndex(const uint index);
-
-    void CountNodesRec(GeomCache::Node& currentNode);
-
-    void EncodeFrame(GeomCacheEncoderFrameInfo* pFrame);
-    void EncodeAllMeshes(GeomCacheEncoderFrameInfo* pFrame);
-
-    void FrameEncodeFinished(GeomCacheEncoderFrameInfo* pFrame);
-
-    void EncodeNodesRec(GeomCache::Node& currentNode, GeomCacheEncoderFrameInfo* pFrame);
-    void EncodeNodeIFrame(const GeomCache::Node& currentNode, const GeomCache::NodeData& rawFrame, std::vector<uint8>& output);
-
-    void EncodeMesh(GeomCache::Mesh* pMesh, GeomCacheEncoderFrameInfo* pFrame);
-    void EncodeMeshIFrame(GeomCache::Mesh& mesh, GeomCache::RawMeshFrame& rawMeshFrame, std::vector<uint8>& output);
-    void EncodeMeshBFrame(GeomCache::Mesh & mesh,  GeomCache::RawMeshFrame & rawMeshFrame, GeomCache::RawMeshFrame * pPrevFrames[2],
-        GeomCache::RawMeshFrame & floorIndexFrame, GeomCache::RawMeshFrame & ceilIndexFrame, std::vector<uint8> &output);
-
-    GeomCacheWriter& m_geomCacheWriter;
-
-    // Set to true if encoder should use bi-directional predicted frames
-    bool m_bUseBFrames;
-    uint m_indexFrameDistance;
-
-    // Number of animated nodes to compile
-    unsigned int m_numNodes;
-
-    // Frame data
-    uint m_firstInfoFrameIndex;
-    uint m_nextFrameIndex;
-    std::deque<std::unique_ptr<GeomCacheEncoderFrameInfo> > m_frames;
-
-    // Global scene structure handles from alembic compiler
-    GeomCache::Node& m_rootNode;
-    const std::vector<GeomCache::Mesh*>& m_meshes;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEENCODER_H
diff --git a/Code/Tools/RC/ResourceCompilerABC/GeomCacheWriter.cpp b/Code/Tools/RC/ResourceCompilerABC/GeomCacheWriter.cpp
deleted file mode 100644
index 4376742d4a..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/GeomCacheWriter.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerABC_precompiled.h"
-#include "GeomCacheWriter.h"
-#include "GeomCacheBlockCompressor.h"
-#include <GeomCacheFileFormat.h>
-
-#include <AzCore/std/bind/bind.h>
-#include <AzCore/std/chrono/types.h>
-#include <AzCore/std/parallel/lock.h>
-
-GeomCacheDiskWriteThread::GeomCacheDiskWriteThread(const string& fileName)
-    : m_bExit(false)
-{
-    m_fileHandle = nullptr; 
-    azfopen(&m_fileHandle, fileName, "w+b");
-}
-
-GeomCacheDiskWriteThread::~GeomCacheDiskWriteThread()
-{
-    assert(m_bExit);
-    fclose(m_fileHandle);
-}
-
-void GeomCacheDiskWriteThread::Write(std::vector<char>& buffer, long offset, int origin)
-{
-    if (buffer.empty() || m_bExit)
-    {
-        return;
-    }
-
-    fseek(m_fileHandle, offset, origin);
-
-    // Write and clear current read buffer
-    const size_t bufferSize = buffer.size();
-    m_bytesWritten += bufferSize;
-    /*size_t bytesWritten =*/ fwrite(buffer.data(), 1, bufferSize, m_fileHandle);
-
-    //RCLog("Written %Iu/%Iu bytes with error: %d", bytesWritten, bufferSize, ferror(m_fileHandle));
-}
-
-void GeomCacheDiskWriteThread::EndThread()
-{
-    m_bExit = true;
-    RCLog("  Disk write thread exited");
-}
-
-uint64 GeomCacheDiskWriteThread::GetCurrentPosition() const
-{
-#if defined(AZ_PLATFORM_LINUX)
-    off_t position;
-    position = ftello(m_fileHandle);
-    return static_cast<uint64>(position);
-#else
-    fpos_t position;
-    fgetpos(m_fileHandle, &position);
-    return static_cast<uint64>(position);
-#endif
-}
-
-GeomCacheBlockCompressionWriter::GeomCacheBlockCompressionWriter(IGeomCacheBlockCompressor* pBlockCompressor, GeomCacheDiskWriteThread& diskWriteThread)
-    : m_pBlockCompressor(pBlockCompressor)
-    , m_diskWriteThread(diskWriteThread)
-{
-}
-
-GeomCacheBlockCompressionWriter::~GeomCacheBlockCompressionWriter()
-{
-}
-
-void GeomCacheBlockCompressionWriter::PushData(const void* data, size_t size)
-{
-    size_t writePosition = m_data.size();
-    m_data.resize(m_data.size() + size);
-    memcpy(&m_data[writePosition], data, size);
-}
-
-DataBlockFileInfo GeomCacheBlockCompressionWriter::WriteBlock(bool bCompress, long offset, int origin)
-{
-    DataBlockFileInfo diskStats;
-    diskStats.m_size = m_data.size(); 
-
-    if (m_data.empty())
-    {
-        return diskStats;
-    }
-
-    // Fill job data
-    if (bCompress)
-    {
-        CompressData();
-    }
-
-    diskStats.m_position = m_diskWriteThread.GetCurrentPosition();
-    diskStats.m_size = m_data.size();
-
-    m_diskWriteThread.Write(m_data, offset, origin);
-
-    m_totalBytesWritten += diskStats.m_size;
-
-    m_data.clear();
-
-    return diskStats;
-}
-
-void GeomCacheBlockCompressionWriter::CompressData()
-{
-    // Remember uncompressed size
-    const uint32 uncompressedSize = m_data.size();
-
-    // Compress job data
-    std::vector<char> compressedData;
-    m_pBlockCompressor->Compress(m_data, compressedData);
-
-    std::vector<char> dataBuffer;
-    dataBuffer.reserve(sizeof(GeomCacheFile::SCompressedBlockHeader) + compressedData.size());
-    dataBuffer.resize(sizeof(GeomCacheFile::SCompressedBlockHeader));
-
-    GeomCacheFile::SCompressedBlockHeader* pBlockHeader = reinterpret_cast<GeomCacheFile::SCompressedBlockHeader*>(dataBuffer.data());
-    pBlockHeader->m_uncompressedSize = uncompressedSize;
-    pBlockHeader->m_compressedSize = compressedData.size();
-
-    dataBuffer.insert(dataBuffer.begin() + sizeof(GeomCacheFile::SCompressedBlockHeader), compressedData.begin(), compressedData.end());
-
-    m_data = dataBuffer;
-}
-
-GeomCacheWriter::GeomCacheWriter(const string& filename, GeomCacheFile::EBlockCompressionFormat compressionFormat,
-    [[maybe_unused]] const uint numFrames, const bool bPlaybackFromMemory, const bool b32BitIndices)
-    : m_compressionFormat(compressionFormat)
-    , m_totalUncompressedAnimationSize(0)
-{
-    m_animationAABB.Reset();
-
-    m_fileHeader.m_flags |= bPlaybackFromMemory ? GeomCacheFile::eFileHeaderFlags_PlaybackFromMemory : 0;
-    m_fileHeader.m_flags |= b32BitIndices ? GeomCacheFile::eFileHeaderFlags_32BitIndices : 0;
-
-    m_pDiskWriteThread.reset(new GeomCacheDiskWriteThread(filename));
-
-    switch (compressionFormat)
-    {
-    case GeomCacheFile::eBlockCompressionFormat_None:
-        m_pBlockCompressor.reset(new GeomCacheStoreBlockCompressor);
-        break;
-    case GeomCacheFile::eBlockCompressionFormat_Deflate:
-        m_pBlockCompressor.reset(new GeomCacheDeflateBlockCompressor);
-        break;
-    case GeomCacheFile::eBlockCompressionFormat_LZ4HC:
-        m_pBlockCompressor.reset(new GeomCacheLZ4HCBlockCompressor);
-        break;
-    case GeomCacheFile::eBlockCompressionFormat_ZSTD:
-        m_pBlockCompressor.reset(new GeomCacheZStdBlockCompressor);
-        break;
-    }
-
-    m_pCompressionWriter.reset(new GeomCacheBlockCompressionWriter(m_pBlockCompressor.get(), *m_pDiskWriteThread));
-
-    for (uint i = 0; i < m_kNumProgressStatusReports; ++i)
-    {
-        m_bShowedStatus[i] = false;
-    }
-}
-
-GeomCacheWriterStats GeomCacheWriter::FinishWriting()
-{
-    GeomCacheWriterStats stats = {0};
-
-    // Write frame offsets
-    RCLog("  Writing frame offsets/sizes...");
-    if (!WriteFrameInfos())
-    {
-        m_pDiskWriteThread->EndThread();
-        return stats;
-    }
-
-    // Last write header with proper signature, AABB & static mesh data offset
-    m_fileHeader.m_signature = GeomCacheFile::kFileSignature;
-    m_fileHeader.m_totalUncompressedAnimationSize = m_totalUncompressedAnimationSize;
-    for (unsigned int i = 0; i < 3; ++i)
-    {
-        m_fileHeader.m_aabbMin[i] = m_animationAABB.min[i];
-        m_fileHeader.m_aabbMax[i] = m_animationAABB.max[i];
-    }
-    m_pCompressionWriter->PushData((void*)&m_fileHeader, sizeof(GeomCacheFile::SHeader));
-
-    uint64 currentBytesWritten = m_pCompressionWriter->GetTotalBytesWritten();
-    m_pCompressionWriter->WriteBlock(false, 0, SEEK_SET);
-    uint64 animationBytesWritten = m_pCompressionWriter->GetTotalBytesWritten() - currentBytesWritten;
-
-    // Destroy compression writer and block compressor
-    m_pCompressionWriter.reset(nullptr);
-    m_pBlockCompressor.reset(nullptr);
-
-    m_pDiskWriteThread->EndThread();
-
-    stats.m_headerDataSize = m_headerWriteSize + m_placeholderForFrameInfos.m_size + m_staticNodeDataSize;
-    stats.m_staticDataSize = m_staticMeshDataSize;
-    stats.m_animationDataSize = animationBytesWritten;
-    stats.m_uncompressedAnimationSize = m_totalUncompressedAnimationSize;
-
-    return stats;
-}
-
-void GeomCacheWriter::WriteStaticData(const std::vector<Alembic::Abc::chrono_t>& frameTimes, const std::vector<GeomCache::Mesh*>& meshes, const GeomCache::Node& rootNode)
-{
-    RCLog("Writing static data to disk...");
-
-    DataBlockFileInfo stats;
-    // Write header with 0 signature, to avoid the engine to read incomplete caches.
-    // Correct signature will be written in FinishWriting at the end
-    m_fileHeader.m_blockCompressionFormat = m_compressionFormat;
-    m_fileHeader.m_numFrames = frameTimes.size();
-    m_pCompressionWriter->PushData((void*)&m_fileHeader, sizeof(GeomCacheFile::SHeader));
-    stats = m_pCompressionWriter->WriteBlock(false);
-    m_headerWriteSize = stats.m_size;
-
-    m_diskInfoForFrames.resize(frameTimes.size());
-
-    // Leave space for frame offsets/sizes (don't know them until frames are written)
-    // and pass future object to get write position for WriteFrameOffsets later
-    std::vector<GeomCacheFile::SFrameInfo> frameInfos(frameTimes.size());
-    memset(frameInfos.data(), 0, sizeof(GeomCacheFile::SFrameInfo) * frameInfos.size());
-    m_pCompressionWriter->PushData(frameInfos.data(), sizeof(GeomCacheFile::SFrameInfo) * frameInfos.size());
-    m_placeholderForFrameInfos = m_pCompressionWriter->WriteBlock(false);
-
-    // Reserve frame type array and store frame times
-    m_frameTypes.resize(frameTimes.size(), 0);
-    m_frameTimes = frameTimes;
-
-    // Write compressed physics geometries and node data
-    RCLog("  Writing node data");
-    WriteNodeStaticDataRec(rootNode, meshes);
-    stats = m_pCompressionWriter->WriteBlock(true);
-    m_staticNodeDataSize = stats.m_size;
-
-    // Write compressed static mesh data
-    RCLog("  Writing mesh data (%u meshes)", (uint)meshes.size());
-    WriteMeshesStaticData(meshes);
-    stats = m_pCompressionWriter->WriteBlock(true);
-    m_staticMeshDataSize = stats.m_size;
-}
-
-void GeomCacheWriter::WriteFrameTimes(const std::vector<Alembic::Abc::chrono_t>& frameTimes)
-{
-    RCLog("  Writing frame times");
-
-    const uint32 numFrameTimes = frameTimes.size();
-    m_pCompressionWriter->PushData((void*)&numFrameTimes, sizeof(uint32));
-
-    // Convert frame times to float
-    std::vector<float> floatFrameTimes;
-    floatFrameTimes.reserve(frameTimes.size());
-    for (auto iter = frameTimes.begin(); iter != frameTimes.end(); ++iter)
-    {
-        floatFrameTimes.push_back((float)*iter);
-    }
-
-    // Write out time array
-    m_pCompressionWriter->PushData(floatFrameTimes.data(), sizeof(float) * floatFrameTimes.size());
-}
-
-bool GeomCacheWriter::WriteFrameInfos()
-{
-    const size_t numFrames = m_diskInfoForFrames.size();
-
-    std::vector<GeomCacheFile::SFrameInfo> frameInfos(numFrames);
-
-    for (size_t i = 0; i < numFrames; ++i)
-    {
-        frameInfos[i].m_frameType = m_frameTypes[i];
-        frameInfos[i].m_frameOffset = m_diskInfoForFrames[i].m_position;
-        frameInfos[i].m_frameSize = m_diskInfoForFrames[i].m_size;
-        frameInfos[i].m_frameTime = (float)m_frameTimes[i];
-
-        if (frameInfos[i].m_frameOffset == 0 || frameInfos[i].m_frameSize == 0)
-        {
-            RCLogError("Invalid frame offset or size");
-            return false;
-        }
-    }
-    m_pCompressionWriter->PushData(frameInfos.data(), sizeof(GeomCacheFile::SFrameInfo) * frameInfos.size());
-
-    // Overwrite space left free for frame infos
-    m_pCompressionWriter->WriteBlock(false, (long)m_placeholderForFrameInfos.m_position, SEEK_SET);
-
-    return true;
-}
-
-void GeomCacheWriter::WriteMeshesStaticData(const std::vector<GeomCache::Mesh*>& meshes)
-{
-    const uint32 numMeshes = meshes.size();
-    m_pCompressionWriter->PushData((void*)&numMeshes, sizeof(uint32));
-
-    for (auto iter = meshes.begin(); iter != meshes.end(); ++iter)
-    {
-        const GeomCache::Mesh* pMesh = *iter;
-
-        const std::string& fullName = pMesh->m_abcMesh.getFullName();
-        const uint nameLength = fullName.size() + 1;
-
-        GeomCacheFile::SMeshInfo meshInfo;
-        meshInfo.m_constantStreams = static_cast<uint8>(pMesh->m_constantStreams);
-        meshInfo.m_animatedStreams = static_cast<uint8>(pMesh->m_animatedStreams);
-        meshInfo.m_positionPrecision[0] = pMesh->m_positionPrecision[0];
-        meshInfo.m_positionPrecision[1] = pMesh->m_positionPrecision[1];
-        meshInfo.m_positionPrecision[2] = pMesh->m_positionPrecision[2];
-        meshInfo.m_uvMax = pMesh->m_uvMax;
-        meshInfo.m_numVertices = static_cast<uint32>(pMesh->m_staticMeshData.m_positions.size());
-        meshInfo.m_numMaterials = static_cast<uint32>(pMesh->m_indicesMap.size());
-        meshInfo.m_flags = pMesh->m_bUsePredictor ? GeomCacheFile::eMeshIFrameFlags_UsePredictor : 0;
-        meshInfo.m_nameLength = nameLength;
-        meshInfo.m_hash = pMesh->m_hash;
-
-        for (unsigned int i = 0; i < 3; ++i)
-        {
-            meshInfo.m_aabbMin[i] = pMesh->m_aabb.min[i];
-            meshInfo.m_aabbMax[i] = pMesh->m_aabb.max[i];
-        }
-
-        m_pCompressionWriter->PushData((void*)&meshInfo, sizeof(GeomCacheFile::SMeshInfo));
-        m_pCompressionWriter->PushData(fullName.c_str(), nameLength);
-
-        // Write out material IDs
-        for (auto iter2 = pMesh->m_indicesMap.begin(); iter2 != pMesh->m_indicesMap.end(); ++iter2)
-        {
-            const uint16 materialId = iter2->first;
-            m_pCompressionWriter->PushData((void*)&materialId, sizeof(uint16));
-        }
-    }
-
-    for (auto iter = meshes.begin(); iter != meshes.end(); ++iter)
-    {
-        const GeomCache::Mesh& mesh = **iter;
-        const GeomCacheFile::EStreams mandatoryStreams = GeomCacheFile::EStreams(GeomCacheFile::eStream_Indices | GeomCacheFile::eStream_Positions
-                | GeomCacheFile::eStream_Texcoords | GeomCacheFile::eStream_QTangents);
-        assert (((mesh.m_constantStreams | mesh.m_animatedStreams) & mandatoryStreams) == mandatoryStreams);
-        WriteMeshStaticData(mesh, mesh.m_constantStreams);
-    }
-}
-
-void GeomCacheWriter::WriteNodeStaticDataRec(const GeomCache::Node& node, const std::vector<GeomCache::Mesh*>& meshes)
-{
-    GeomCacheFile::SNodeInfo fileNode;
-    fileNode.m_type = static_cast<uint8>(node.m_type);
-    fileNode.m_transformType = static_cast<uint16>(node.m_transformType);
-    fileNode.m_bVisible = node.m_staticNodeData.m_bVisible ? 1 : 0;
-    fileNode.m_meshIndex = std::numeric_limits<uint32>::max();
-
-    if (node.m_type == GeomCacheFile::eNodeType_Mesh)
-    {
-        auto findIter = std::find(meshes.begin(), meshes.end(), node.m_pMesh.get());
-        if (findIter != meshes.end())
-        {
-            fileNode.m_meshIndex = static_cast<uint32>(findIter - meshes.begin());
-        }
-    }
-
-    fileNode.m_numChildren = static_cast<uint32>(node.m_children.size());
-
-    const std::string& fullName = (node.m_abcObject != NULL) ? node.m_abcObject.getFullName() : "root";
-    const uint nameLength = fullName.size() + 1;
-    fileNode.m_nameLength = nameLength;
-
-    // Write out node infos
-    m_pCompressionWriter->PushData((void*)&fileNode, sizeof(GeomCacheFile::SNodeInfo));
-    m_pCompressionWriter->PushData(fullName.c_str(), nameLength);
-
-    // Store full initial pose. We could optimize this by leaving out animated branches without any physics proxies.
-    STATIC_ASSERT(sizeof(QuatTNS) == 10 * sizeof(float), "QuatTNS size should be 40 bytes");
-    m_pCompressionWriter->PushData((void*)&node.m_staticNodeData.m_transform, sizeof(QuatTNS));
-
-    if (node.m_type == GeomCacheFile::eNodeType_PhysicsGeometry)
-    {
-        uint32 geometrySize = node.m_physicsGeometry.size();
-        m_pCompressionWriter->PushData((void*)&geometrySize, sizeof(uint32));
-        m_pCompressionWriter->PushData((void*)node.m_physicsGeometry.data(), node.m_physicsGeometry.size());
-    }
-
-    for (auto iter = node.m_children.begin(); iter != node.m_children.end(); ++iter)
-    {
-        WriteNodeStaticDataRec(**iter, meshes);
-    }
-}
-
-void GeomCacheWriter::WriteFrame(const uint frameIndex, const AABB& frameAABB, const GeomCacheFile::EFrameType frameType,
-    const std::vector<GeomCache::Mesh*>& meshes, GeomCache::Node& rootNode)
-{
-    m_animationAABB.Add(frameAABB);
-
-    std::vector<uint32> meshOffsets;
-    GeomCacheFile::SFrameHeader frameHeader;
-    STATIC_ASSERT((sizeof(GeomCacheFile::SFrameHeader) % 16) == 0, "GeomCacheFile::SFrameHeader size must be a multiple of 16");
-
-    m_frameTypes[frameIndex] = frameType;
-
-    for (unsigned int i = 0; i < 3; ++i)
-    {
-        frameHeader.m_frameAABBMin[i] = frameAABB.min[i];
-        frameHeader.m_frameAABBMax[i] = frameAABB.max[i];
-    }
-
-    GetFrameData(frameHeader, meshes);
-    m_pCompressionWriter->PushData((void*)&frameHeader, sizeof(GeomCacheFile::SFrameHeader));
-
-    for (auto iter = meshes.begin(); iter != meshes.end(); ++iter)
-    {
-        GeomCache::Mesh* mesh = *iter;
-        WriteMeshFrameData(*mesh);
-    }
-
-    uint32 bytesWritten = 0;
-    WriteNodeFrameRec(rootNode, meshes, bytesWritten);
-
-    // Pad node data to 16 bytes
-    std::vector<uint8> paddingData(((bytesWritten + 15) & ~15) - bytesWritten, 0);
-    if (paddingData.size())
-    {
-        m_pCompressionWriter->PushData(paddingData.data(), paddingData.size());
-    }
-
-    m_totalUncompressedAnimationSize += m_pCompressionWriter->GetCurrentDataSize();
-    m_diskInfoForFrames[frameIndex] = m_pCompressionWriter->WriteBlock(true);
-
-    const uint fraction = uint((float)m_kNumProgressStatusReports * ((float)(frameIndex + 1) / (float)m_fileHeader.m_numFrames));
-    if (fraction > 0 && !m_bShowedStatus[fraction - 1])
-    {
-        const uint percent = (100 * fraction) / (m_kNumProgressStatusReports);
-        RCLog("  %u%% processed", percent);
-        m_bShowedStatus[fraction - 1] = true;
-    }
-}
-
-void GeomCacheWriter::GetFrameData(GeomCacheFile::SFrameHeader& header, const std::vector<GeomCache::Mesh*>& meshes)
-{
-    uint32 dataOffset = 0;
-
-    for (auto iter = meshes.begin(); iter != meshes.end(); ++iter)
-    {
-        const GeomCache::Mesh& mesh = **iter;
-
-        if (mesh.m_animatedStreams != 0)
-        {
-            AZStd::lock_guard<AZStd::mutex> jobLock(mesh.m_encodedFramesCS);
-            dataOffset += mesh.m_encodedFrames.front().size();
-        }
-    }
-
-    header.m_nodeDataOffset = dataOffset;
-}
-
-void GeomCacheWriter::WriteNodeFrameRec(GeomCache::Node& node, const std::vector<GeomCache::Mesh*>& meshes, uint32& bytesWritten)
-{
-    AZStd::lock_guard<AZStd::mutex> jobLock(node.m_encodedFramesCS);
-    m_pCompressionWriter->PushData(node.m_encodedFrames.front().data(),
-        node.m_encodedFrames.front().size());
-    bytesWritten += node.m_encodedFrames.front().size();
-    node.m_encodedFrames.pop_front();
-
-    for (auto iter = node.m_children.begin(); iter != node.m_children.end(); ++iter)
-    {
-        WriteNodeFrameRec(**iter, meshes, bytesWritten);
-    }
-}
-
-void GeomCacheWriter::WriteMeshFrameData(GeomCache::Mesh& mesh)
-{
-    if (mesh.m_animatedStreams != 0)
-    {
-        AZStd::lock_guard<AZStd::mutex> jobLock(mesh.m_encodedFramesCS);
-        m_pCompressionWriter->PushData(mesh.m_encodedFrames.front().data(), mesh.m_encodedFrames.front().size());
-        mesh.m_encodedFrames.pop_front();
-    }
-}
-
-void GeomCacheWriter::WriteMeshStaticData(const GeomCache::Mesh& mesh, GeomCacheFile::EStreams streamMask)
-{
-    if (streamMask & GeomCacheFile::eStream_Indices)
-    {
-        for (auto iter = mesh.m_indicesMap.begin(); iter != mesh.m_indicesMap.end(); ++iter)
-        {
-            const std::vector<uint32>& indices = iter->second;
-            const uint32 numIndices = indices.size();
-            m_pCompressionWriter->PushData(&numIndices, sizeof(uint32));
-
-            if ((m_fileHeader.m_flags & GeomCacheFile::eFileHeaderFlags_32BitIndices) != 0)
-            {
-                m_pCompressionWriter->PushData(indices.data(), sizeof(uint32) * numIndices);
-            }
-            else
-            {
-                std::vector<uint16> indices16Bit(indices.size());
-                std::transform(indices.begin(), indices.end(), indices16Bit.begin(), [](uint32 index) { return static_cast<uint16>(index); });
-                m_pCompressionWriter->PushData(indices16Bit.data(), sizeof(uint16) * numIndices);
-            }
-        }
-    }
-
-    bool bWroteStream = false;
-    unsigned int numElements = 0;
-
-    const GeomCache::MeshData& meshData = mesh.m_staticMeshData;
-
-    if (streamMask & GeomCacheFile::eStream_Positions)
-    {
-        m_pCompressionWriter->PushData(meshData.m_positions.data(), sizeof(GeomCacheFile::Position) * meshData.m_positions.size());
-        bWroteStream = true;
-        numElements = meshData.m_positions.size();
-    }
-
-    if (streamMask & GeomCacheFile::eStream_Texcoords)
-    {
-        assert(!bWroteStream || meshData.m_texcoords.size() == numElements);
-        m_pCompressionWriter->PushData(meshData.m_texcoords.data(), sizeof(GeomCacheFile::Texcoords) * meshData.m_texcoords.size());
-        bWroteStream = true;
-        numElements = meshData.m_texcoords.size();
-    }
-
-    if (streamMask & GeomCacheFile::eStream_QTangents)
-    {
-        assert(!bWroteStream || meshData.m_qTangents.size() == numElements);
-        m_pCompressionWriter->PushData(meshData.m_qTangents.data(), sizeof(GeomCacheFile::QTangent) * meshData.m_qTangents.size());
-        bWroteStream = true;
-        numElements = meshData.m_qTangents.size();
-    }
-
-    if (streamMask & GeomCacheFile::eStream_Colors)
-    {
-        assert(!bWroteStream || meshData.m_reds.size() == numElements);
-        assert(!bWroteStream || meshData.m_greens.size() == numElements);
-        assert(!bWroteStream || meshData.m_blues.size() == numElements);
-        assert(!bWroteStream || meshData.m_alphas.size() == numElements);
-        m_pCompressionWriter->PushData(meshData.m_reds.data(), sizeof(GeomCacheFile::Color) * meshData.m_reds.size());
-        m_pCompressionWriter->PushData(meshData.m_greens.data(), sizeof(GeomCacheFile::Color) * meshData.m_greens.size());
-        m_pCompressionWriter->PushData(meshData.m_blues.data(), sizeof(GeomCacheFile::Color) * meshData.m_blues.size());
-        m_pCompressionWriter->PushData(meshData.m_alphas.data(), sizeof(GeomCacheFile::Color) * meshData.m_alphas.size());
-        bWroteStream = true;
-        numElements = meshData.m_reds.size();
-    }
-
-    if (mesh.m_bUsePredictor)
-    {
-        const uint32 predictorDataSize = mesh.m_predictorData.size();
-        m_pCompressionWriter->PushData(&predictorDataSize, sizeof(uint32));
-        m_pCompressionWriter->PushData(mesh.m_predictorData.data(), sizeof(uint16) * mesh.m_predictorData.size());
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerABC/GeomCacheWriter.h b/Code/Tools/RC/ResourceCompilerABC/GeomCacheWriter.h
deleted file mode 100644
index 38e457bfd1..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/GeomCacheWriter.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEWRITER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEWRITER_H
-#pragma once
-
-
-#include "GeomCache.h"
-#include "GeomCacheBlockCompressor.h"
-#include "StealingThreadPool.h"
-
-#include <AzCore/std/parallel/atomic.h>
-#include <AzCore/std/parallel/condition_variable.h>
-#include <AzCore/std/parallel/mutex.h>
-#include <AzCore/std/parallel/thread.h>
-
-// This contains the position and size of a disk write
-struct DataBlockFileInfo
-{
-    DataBlockFileInfo()
-        : m_position(0)
-        , m_size(0) 
-    {
-    }
-
-    DataBlockFileInfo(uint64 position, uint32 size)
-        : m_position(position)
-        , m_size(size) 
-    {
-    }
-
-    uint64 m_position;
-    uint32 m_size;
-};
-
-// This writes the results from the compression job to disk and will
-// not run in the thread pool, because it requires almost no CPU.
-class GeomCacheDiskWriteThread
-{
-public:
-    GeomCacheDiskWriteThread(const string& fileName);
-    ~GeomCacheDiskWriteThread();
-
-    // Flushes the buffers to disk and exits the thread
-    void EndThread();
-
-    // Write with FIFO buffering. This will acquire ownership of the buffer.
-    void Write(std::vector<char>& buffer, long offset = 0, int origin = SEEK_CUR);
-
-    size_t GetBytesWritten() { return m_bytesWritten; }
-
-    uint64 GetCurrentPosition() const;
-
-private:
-    FILE* m_fileHandle;
-
-    bool m_bExit;
-
-    // Stats
-    size_t m_bytesWritten;
-};
-
-// This class will receive the data from the GeomCacheWriter.
-class GeomCacheBlockCompressionWriter
-{
-public:
-    GeomCacheBlockCompressionWriter(IGeomCacheBlockCompressor* pBlockCompressor, GeomCacheDiskWriteThread& diskWriteThread);
-    ~GeomCacheBlockCompressionWriter();
-
-    // This adds data to the current buffer.
-    void PushData(const void* data, size_t size);
-
-    // Compresses data in the current buffer and writes it to disk. Returns information about the disk write
-    DataBlockFileInfo WriteBlock(bool bCompress, long offset = 0, int origin = SEEK_CUR);
-
-    // Returns the total number of bytes written to disk. This can be less than 
-    // the data pushed to the writer because the data written to disk may have
-    // been compressed
-    uint64 GetTotalBytesWritten() const { return m_totalBytesWritten; }
-    size_t GetCurrentDataSize() const { return m_data.size(); }
-
-private:
-
-    void CompressData();
-
-    std::vector<char> m_data;
-
-    GeomCacheDiskWriteThread& m_diskWriteThread;
-    IGeomCacheBlockCompressor* m_pBlockCompressor;
-
-    uint64 m_totalBytesWritten;
-};
-
-struct GeomCacheWriterStats
-{
-    uint64 m_headerDataSize;
-    uint64 m_staticDataSize;
-    uint64 m_animationDataSize;
-    uint64 m_uncompressedAnimationSize;
-};
-
-class GeomCacheWriter
-{
-public:
-    GeomCacheWriter(const string& filename, GeomCacheFile::EBlockCompressionFormat compressionFormat,
-        const uint numFrames, const bool bPlaybackFromMemory,
-        const bool b32BitIndices);
-
-    void WriteStaticData(const std::vector<Alembic::Abc::chrono_t>& frameTimes, const std::vector<GeomCache::Mesh*>& meshes, const GeomCache::Node& rootNode);
-
-    void WriteFrame(const uint frameIndex, const AABB& frameAABB, const GeomCacheFile::EFrameType frameType,
-        const std::vector<GeomCache::Mesh*>& meshes, GeomCache::Node& rootNode);
-
-    // Flush all buffers, write frame offsets and return the size of the animation stream
-    GeomCacheWriterStats FinishWriting();
-
-private:
-    void WriteFrameTimes(const std::vector<Alembic::Abc::chrono_t>& frameTimes);
-    bool WriteFrameInfos();
-    void WriteMeshesStaticData(const std::vector<GeomCache::Mesh*>& meshes);
-    void WriteNodeStaticDataRec(const GeomCache::Node& node, const std::vector<GeomCache::Mesh*>& meshes);
-
-    void GetFrameData(GeomCacheFile::SFrameHeader& header, const std::vector<GeomCache::Mesh*>& meshes);
-    void WriteNodeFrameRec(GeomCache::Node& node, const std::vector<GeomCache::Mesh*>& meshes, uint32& bytesWritten);
-
-    void WriteMeshFrameData(GeomCache::Mesh& meshData);
-    void WriteMeshStaticData(const GeomCache::Mesh& meshData, GeomCacheFile::EStreams streamMask);
-
-    std::vector<DataBlockFileInfo> m_diskInfoForFrames;
-    std::vector<Alembic::Abc::chrono_t> m_frameTimes;
-    std::vector<uint> m_frameTypes;
-
-    GeomCacheFile::EBlockCompressionFormat m_compressionFormat;
-
-    GeomCacheFile::SHeader m_fileHeader;
-    AABB m_animationAABB;
-    static const uint m_kNumProgressStatusReports = 10;
-    bool m_bShowedStatus[m_kNumProgressStatusReports];
-
-    std::unique_ptr<IGeomCacheBlockCompressor> m_pBlockCompressor;
-    std::unique_ptr<GeomCacheDiskWriteThread> m_pDiskWriteThread;
-    std::unique_ptr<GeomCacheBlockCompressionWriter> m_pCompressionWriter;
-
-    DataBlockFileInfo m_placeholderForFrameInfos;
-
-    uint64 m_headerWriteSize;
-    uint64 m_staticNodeDataSize;
-    uint64 m_staticMeshDataSize;
-    uint64 m_totalUncompressedAnimationSize;
-};
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERABC_GEOMCACHEWRITER_H
diff --git a/Code/Tools/RC/ResourceCompilerABC/Platform/Common/Clang/resourcecompilerabc_clang.cmake b/Code/Tools/RC/ResourceCompilerABC/Platform/Common/Clang/resourcecompilerabc_clang.cmake
deleted file mode 100644
index 61ea1d9cd0..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/Platform/Common/Clang/resourcecompilerabc_clang.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_OPTIONS PRIVATE -fexceptions)
diff --git a/Code/Tools/RC/ResourceCompilerABC/Platform/Common/MSVC/resourcecompilerabc_msvc.cmake b/Code/Tools/RC/ResourceCompilerABC/Platform/Common/MSVC/resourcecompilerabc_msvc.cmake
deleted file mode 100644
index 5e03ba77cb..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/Platform/Common/MSVC/resourcecompilerabc_msvc.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_OPTIONS PRIVATE /EHsc)
diff --git a/Code/Tools/RC/ResourceCompilerABC/Platform/Linux/platform_linux.cmake b/Code/Tools/RC/ResourceCompilerABC/Platform/Linux/platform_linux.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/Platform/Linux/platform_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/Tools/RC/ResourceCompilerABC/Platform/Mac/platform_mac.cmake b/Code/Tools/RC/ResourceCompilerABC/Platform/Mac/platform_mac.cmake
deleted file mode 100644
index 90d1dbbf6d..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/Platform/Mac/platform_mac.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_BUILD_DEPENDENCIES
-    PUBLIC
-        3rdParty::Qt::Core
-)
-
diff --git a/Code/Tools/RC/ResourceCompilerABC/Platform/Windows/platform_windows.cmake b/Code/Tools/RC/ResourceCompilerABC/Platform/Windows/platform_windows.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/Platform/Windows/platform_windows.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC.cpp b/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC.cpp
deleted file mode 100644
index 54099a7533..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerABC_precompiled.h"
-#include "IResCompiler.h"
-#include "AlembicConvertor.h"
-#include "IRCLog.h"
-#include "CryLibrary.h"
-#include "../../CryXML/ICryXML.h"
-#include <AzCore/Utils/Utils.h>
-#include <ResourceCompiler/ResourceCompiler.h>
-
-extern "C" DLL_EXPORT void __stdcall RegisterConvertors(IResourceCompiler* pRC)
-{
-    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-
-    SetRCLog(pRC->GetIRCLog());
-
-    ICryXML* const pCryXML = LoadICryXML();
-
-    if (pCryXML == 0)
-    {
-        RCLogError("Loading xml library failed - not registering alembic converter.");
-    }
-    else
-    {
-        pRC->RegisterConvertor("AlembicCompiler", new AlembicConvertor(pCryXML, pRC->GetPakSystem()));
-
-        pRC->RegisterKey("upAxis", "[ABC] Up axis of alembic file\n"
-            "Z = Use Z as up axis: No conversion\n"
-            "Y = Use Y as up axis: Convert Y up to Z up (default)");
-
-        pRC->RegisterKey("meshPrediction", "[ABC] Use mesh prediction for index frames\n"
-            "0 = No mesh prediction (default)\n"
-            "1 = Use mesh prediction");
-
-        pRC->RegisterKey("useBFrames", "[ABC] Use bi-directional predicted frames\n"
-            "0 = Don't use b-frames (default)\n"
-            "1 = Use b-frames");
-
-        pRC->RegisterKey("indexFrameDistance", "[ABC] Index frame distance when using b-frames (default is 15)");
-
-        pRC->RegisterKey("blockCompressionFormat", "[ABC] Method used to compress data\n"
-            "store = No compression\n"
-            "deflate = Use deflate (zlib) compression (default)");
-
-        pRC->RegisterKey("playbackFromMemory", "[ABC] Set flag that resulting cache will be played back from memory\n"
-            "0 = Do not play back from memory (default)\n"
-            "1 = Cache plays from memory after loading");
-
-        pRC->RegisterKey("positionPrecision", "[ABC] Set the position precision in mm. Higher values usually result in better compression (default is 1)");
-
-        pRC->RegisterKey("uvMax", "[ABC] Set the upper value of the UV range. Values above this value will be wrapped.\n"
-            "0 = use detected per-mesh uvMax values. (default is 0)");
-
-        pRC->RegisterKey("skipFilesWithoutBuildConfig", "[ABC] Skip files without build configuration (.CBC)");
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC_precompiled.cpp b/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC_precompiled.cpp
deleted file mode 100644
index 344c977906..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerABC_precompiled.h"
diff --git a/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC_precompiled.h b/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC_precompiled.h
deleted file mode 100644
index 7841a0ae9e..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/ResourceCompilerABC_precompiled.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-
-#pragma once
-
-// When STD disables exceptions, it moves "exception" to stdext
-// When this happens, alembic ends up with an underfined symbol : void Alembic::Abc::v11::ErrorHandler::operator()(class stdext::exception&, ...
-// Since alembic was compiled with exceptions enabled, (instead of compile it with - D_HAS_EXCEPTIONS = 0), we need to here enable it so that
-// symbol doesnt get mixed up
-#undef _HAS_EXCEPTIONS
-#define _HAS_EXCEPTIONS 1
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <platform.h>
-
-#include <functional>
-#include <vector>
-#include <map>
-
-#include <stdio.h>
-
-#include <Cry_Math.h>
-#include <Cry_Geo.h>
-
-#include "CryFile.h"
-
-#include "IXml.h"
-
-#include "IRCLog.h"
-
-#include <VertexFormats.h>
-
-AZ_PUSH_DISABLE_WARNING(4996, "-Wdeprecated-declarations")
-#include <Alembic/Abc/All.h>
-AZ_POP_DISABLE_WARNING
-
-#include <Alembic/AbcGeom/All.h>
-#include <Alembic/AbcCoreFactory/All.h>
-#include <Alembic/AbcCoreHDF5/All.h>
-#include <Alembic/AbcCoreOgawa/All.h>
-#include <Alembic/Util/All.h>
-
-#include <AzCore/PlatformDef.h>
-#include <AzCore/base.h>
-
-#include "SwapEndianness.h"
diff --git a/Code/Tools/RC/ResourceCompilerABC/resourcecompilerabc_files.cmake b/Code/Tools/RC/ResourceCompilerABC/resourcecompilerabc_files.cmake
deleted file mode 100644
index 06ceff9a6d..0000000000
--- a/Code/Tools/RC/ResourceCompilerABC/resourcecompilerabc_files.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    AlembicCompiler.cpp
-    AlembicConvertor.cpp
-    GeomCacheBlockCompressor.cpp
-    GeomCacheEncoder.cpp
-    GeomCacheWriter.cpp
-    AlembicCompiler.h
-    AlembicConvertor.h
-    GeomCache.h
-    GeomCacheBlockCompressor.h
-    GeomCacheEncoder.h
-    GeomCacheWriter.h
-    ResourceCompilerABC.cpp
-    ResourceCompilerABC_precompiled.h
-    ResourceCompilerABC_precompiled.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerImage/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerImage/CMakeLists.txt
deleted file mode 100644
index 513e922ee2..0000000000
--- a/Code/Tools/RC/ResourceCompilerImage/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerImage MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompilerimage_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PUBLIC
-            Legacy::CryCommon
-            Legacy::ResourceCompiler.Static
-)
-ly_add_dependencies(RC Legacy::ResourceCompilerImage)
diff --git a/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage.cpp b/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage.cpp
deleted file mode 100644
index a9ca08a85c..0000000000
--- a/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerImage_precompiled.h"
-#include <IResCompiler.h>
-
-// Must be included only once in DLL module.
-#include <platform_implRC.h>
diff --git a/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage_precompiled.cpp b/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage_precompiled.cpp
deleted file mode 100644
index 46ddfa9690..0000000000
--- a/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerImage_precompiled.h"
diff --git a/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage_precompiled.h b/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage_precompiled.h
deleted file mode 100644
index 2e281af836..0000000000
--- a/Code/Tools/RC/ResourceCompilerImage/ResourceCompilerImage_precompiled.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <platform.h>
-
-#include <functional>
-#include <vector>
-#include <map>
-
-#include <stdio.h>
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <tchar.h>
-#endif
-
-#include "IRCLog.h"
diff --git a/Code/Tools/RC/ResourceCompilerImage/resourcecompilerimage_files.cmake b/Code/Tools/RC/ResourceCompilerImage/resourcecompilerimage_files.cmake
deleted file mode 100644
index 9c3903f3e6..0000000000
--- a/Code/Tools/RC/ResourceCompilerImage/resourcecompilerimage_files.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerImage.cpp
-    ResourceCompilerImage_precompiled.h
-    ResourceCompilerImage_precompiled.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerLegacy/CMakeLists.txt
deleted file mode 100644
index f29938783a..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-
-if(NOT PAL_TRAIT_BUILD_RESOURCECOMPILERLEGACY_SUPPORTED OR NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerLegacy.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        resourcecompilerlegacy_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::SceneCore
-        PUBLIC
-            Legacy::CryCommon
-            Legacy::CryCommonTools
-            Legacy::ResourceCompiler.Static
-            AZ::AssetBuilderSDK
-)
-
-ly_add_target(
-    NAME ResourceCompilerLegacy MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompilerlegacy_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::ResourceCompilerLegacy.Static
-)
-
-ly_add_dependencies(RC Legacy::ResourceCompilerLegacy)
-
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    ly_add_target(
-        NAME ResourceCompilerLegacy.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            resourcecompilerlegacy_test_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Source
-                Tests
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                Legacy::ResourceCompilerLegacy.Static
-    )
-    ly_add_googletest(
-        NAME Legacy::ResourceCompilerLegacy.Tests
-    )
-endif()
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/AssetParser.cpp b/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/AssetParser.cpp
deleted file mode 100644
index 615a575651..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/AssetParser.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "AssetParser.h"
-
-namespace AZ
-{
-    namespace RC
-    {
-        AssetParser::AssetParser(const AZStd::string& assetName)
-            : m_assetName(assetName)
-        {
-        }
-
-        AssetBuilderSDK::ProductPathDependencySet AssetParser::GetProductDependencies(const AZStd::string& /*fullPath*/)
-        {
-            return {};
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/AssetParser.h b/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/AssetParser.h
deleted file mode 100644
index 423e5072db..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/AssetParser.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/vector.h>
-#include "AssetBuilderSDK/AssetBuilderSDK.h"
-
-namespace AZ
-{
-    namespace RC
-    {
-        class AssetParser
-        {
-        public:
-            AssetParser(const AZStd::string& assetName);
-            virtual ~AssetParser() {}
-            virtual AssetBuilderSDK::ProductPathDependencySet GetProductDependencies(const AZStd::string& fullPath);
-
-        protected:
-            AZStd::string m_assetName;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/ProductInfoCreator.cpp b/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/ProductInfoCreator.cpp
deleted file mode 100644
index 90c3200e7d..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/ProductInfoCreator.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "ProductInfoCreator.h"
-
-#include <CryPath.h>
-
-#include <QFileInfo>
-
-namespace AZ
-{
-    namespace RC
-    {
-        ProductInfoCreator::ProductInfoCreator()
-        {
-            m_productAssetType = AZ::Data::AssetType::CreateNull();
-        }
-
-        AssetBuilderSDK::JobProduct ProductInfoCreator::GenerateProductInfo(const AZStd::string& sourceFile, const AZStd::string& fullPath)
-        {
-            AZStd::unique_ptr<AssetParser> legacyAssetParser = CreateLegacyAssetParser(sourceFile);
-            AZStd::string fileName = QFileInfo(sourceFile.c_str()).fileName().toUtf8().constData();
-
-            AssetBuilderSDK::JobProduct product(fileName, m_productAssetType);
-            product.m_pathDependencies = legacyAssetParser->GetProductDependencies(fullPath);
-            product.m_dependenciesHandled = true; // We've populated the dependencies immediately above so it's OK to tell the AP we've handled dependencies
-
-            return product;
-
-        }
-
-        AZStd::unique_ptr<AssetParser> ProductInfoCreator::CreateLegacyAssetParser(const AZStd::string& sourceFile)
-        {
-            AZStd::string fileExtension(PathUtil::GetExt(sourceFile.c_str()));
-
-            // Use the file extension to select the correct asset parser.
-
-            /*Sample code:
-            if (fileExtension == "font" || fileExtension == "fontfamily")
-            {
-                m_productAssetType = fontAssetType;
-                return AZStd::unique_ptr<AssetParser>(new FontAssetParser(sourceFile));
-            }*/
-            
-            return AZStd::unique_ptr<AssetParser>(new AssetParser(sourceFile));
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/ProductInfoCreator.h b/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/ProductInfoCreator.h
deleted file mode 100644
index 440cb694cd..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyAssetParser/ProductInfoCreator.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include "AssetParser.h"
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        static AZ::Data::AssetType fontAssetType("{57767D37-0EBE-43BE-8F60-AB36D2056EF8}"); // form UiAssetTypes.h
-
-        class ProductInfoCreator
-        {
-        public:
-
-            ProductInfoCreator();
-
-            AssetBuilderSDK::JobProduct GenerateProductInfo(const AZStd::string& sourceFile, const AZStd::string& fullPath);
-
-        protected:
-
-            virtual AZStd::unique_ptr<AssetParser> CreateLegacyAssetParser(const AZStd::string& sourceFile);
-
-            AZ::Data::AssetType m_productAssetType;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyCompiler.cpp b/Code/Tools/RC/ResourceCompilerLegacy/LegacyCompiler.cpp
deleted file mode 100644
index 3bff77e22a..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyCompiler.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "ResourceCompilerLegacy_precompiled.h"
-
-#include "LegacyCompiler.h"
-#include "LegacyAssetParser/ProductInfoCreator.h"
-#include "Utilities.h"
-#include "CryPath.h"
-
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-#include <AzCore/Memory/AllocatorManager.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        LegacyCompiler::LegacyCompiler()
-        {
-        }
-
-        void LegacyCompiler::Release()
-        {
-            delete this;
-        }
-
-        void LegacyCompiler::BeginProcessing(const IConfig* /*config*/)
-        {
-        }
-
-        bool LegacyCompiler::Process()
-        {
-            // Register the AssetBuilderSDK structures needed later on.
-            AzToolsFramework::ToolsApplication application;
-            AZ::ComponentApplication::Descriptor descriptor;
-            application.Start(descriptor);
-            AssetBuilderSDK::InitializeSerializationContext();
-
-            AssetBuilderSDK::ProcessJobResponse response;
-
-            // Read ProcessJobRequest.xml from the output folder
-            AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest> request = ReadJobRequest(m_context.GetOutputFolder().c_str());
-            if (!request)
-            {
-                return WriteResponse(m_context.GetOutputFolder().c_str(), response, false);
-            }
-            
-            // Parse the source file and get product dependencies
-            ProductInfoCreator productInfoCreator;
-            response.m_outputProducts.push_back(productInfoCreator.GenerateProductInfo(request->m_sourceFile, request->m_fullPath));
-            
-            // Write ProcessJobResponse.xml to the output folder
-            return WriteResponse(m_context.GetOutputFolder().c_str(), response, true);
-        }
-
-        void LegacyCompiler::EndProcessing()
-        {
-        }
-
-        IConvertContext* LegacyCompiler::GetConvertContext()
-        {
-            return &m_context;
-        }
-
-        AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest> LegacyCompiler::ReadJobRequest(const char* folder) const
-        {
-            AZStd::string requestFilePath;
-            AzFramework::StringFunc::Path::ConstructFull(folder, AssetBuilderSDK::s_processJobRequestFileName, requestFilePath);
-            AssetBuilderSDK::ProcessJobRequest* result = AZ::Utils::LoadObjectFromFile<AssetBuilderSDK::ProcessJobRequest>(requestFilePath);
-
-            if (!result)
-            {
-                AZ_Error(LegacyCompilerUtils::TracePrint, false,"Unable to load ProcessJobRequest. Not enough information to process this file %s.\n", requestFilePath.c_str());
-            }
-
-            return AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest>(result);
-        }
-
-        bool LegacyCompiler::WriteResponse(const char* cacheFolder, AssetBuilderSDK::ProcessJobResponse& response, bool success) const
-        {
-            AZStd::string responseFilePath;
-            AzFramework::StringFunc::Path::ConstructFull(cacheFolder, AssetBuilderSDK::s_processJobResponseFileName, responseFilePath);
-
-            response.m_requiresSubIdGeneration = false;
-            response.m_resultCode = success ? AssetBuilderSDK::ProcessJobResult_Success : AssetBuilderSDK::ProcessJobResult_Failed;
-
-            bool result = AZ::Utils::SaveObjectToFile(responseFilePath, AZ::DataStream::StreamType::ST_XML, &response);
-
-            if (!result)
-            {
-                AZ_Error(LegacyCompilerUtils::TracePrint, false, "Unable to save ProcessJobResponse file to %s.\n", responseFilePath.c_str());
-            }
-
-            return result && success;
-        }
-    } // namespace RC
-
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyCompiler.h b/Code/Tools/RC/ResourceCompilerLegacy/LegacyCompiler.h
deleted file mode 100644
index 2ad967ed7c..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyCompiler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include "ResourceCompilerLegacy_precompiled.h"
-#include <IConvertor.h>
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/Asset/AssetCommon.h>
-
-namespace AssetBuilderSDK
-{
-    struct ProcessJobRequest;
-    struct ProcessJobResponse;
-}
-namespace AZ
-{
-    namespace RC
-    {
-        class LegacyCompiler
-            : public ICompiler
-        {
-        public:
-            LegacyCompiler();
-
-            void Release() override;
-
-            void BeginProcessing(const IConfig* config) override;
-            bool Process() override;
-            void EndProcessing() override;
-
-            IConvertContext* GetConvertContext() override;
-
-        protected:
-
-            AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest> ReadJobRequest(const char* folder) const;
-            bool WriteResponse(const char* folder, AssetBuilderSDK::ProcessJobResponse& response, bool success = true) const;
-
-            ConvertContext m_context;
-        };
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyConverter.cpp b/Code/Tools/RC/ResourceCompilerLegacy/LegacyConverter.cpp
deleted file mode 100644
index 374893539a..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyConverter.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "ResourceCompilerLegacy_precompiled.h"
-#include <LegacyConverter.h>
-#include <LegacyCompiler.h>
-#include <AzCore/std/iterator.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        LegacyConverter::LegacyConverter()
-        {
-        }
-
-        void LegacyConverter::Release()
-        {
-            delete this;
-        }
-        void LegacyConverter::Init([[maybe_unused]] const ConvertorInitContext& context)
-        {
-        }
-
-        ICompiler* LegacyConverter::CreateCompiler()
-        {
-            return new LegacyCompiler();
-        }
-
-        const char* LegacyConverter::GetExt(int index) const
-        {
-            // List all the file types that should use this resource compiler module to retrieve product dependencies.
-            // These file types require the old cry code to parse the source asset file.
-
-            // Sample Code:
-            if (index == 0)
-            {
-                return "font";
-            }
-            else if (index == 1)
-            {
-                return "fontfamily";
-            }
-
-            return nullptr;
-        }
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/LegacyConverter.h b/Code/Tools/RC/ResourceCompilerLegacy/LegacyConverter.h
deleted file mode 100644
index 7643d209b1..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/LegacyConverter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <IConvertor.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        class LegacyConverter
-            : public IConvertor
-        {
-        public:
-            LegacyConverter();
-
-            void Release() override;
-            void Init(const ConvertorInitContext& context) override;
-
-            ICompiler* CreateCompiler() override;
-            const char* GetExt(int index) const override;
-        };
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Android/PAL_android.cmake b/Code/Tools/RC/ResourceCompilerLegacy/Platform/Android/PAL_android.cmake
deleted file mode 100644
index e6a57a2d8b..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Android/PAL_android.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_RESOURCECOMPILERLEGACY_SUPPORTED FALSE)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Linux/PAL_linux.cmake b/Code/Tools/RC/ResourceCompilerLegacy/Platform/Linux/PAL_linux.cmake
deleted file mode 100644
index e6a57a2d8b..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Linux/PAL_linux.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_RESOURCECOMPILERLEGACY_SUPPORTED FALSE)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Mac/PAL_mac.cmake b/Code/Tools/RC/ResourceCompilerLegacy/Platform/Mac/PAL_mac.cmake
deleted file mode 100644
index 57947271df..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Mac/PAL_mac.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_RESOURCECOMPILERLEGACY_SUPPORTED TRUE)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Windows/PAL_windows.cmake b/Code/Tools/RC/ResourceCompilerLegacy/Platform/Windows/PAL_windows.cmake
deleted file mode 100644
index 57947271df..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Platform/Windows/PAL_windows.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_RESOURCECOMPILERLEGACY_SUPPORTED TRUE)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Platform/iOS/PAL_ios.cmake b/Code/Tools/RC/ResourceCompilerLegacy/Platform/iOS/PAL_ios.cmake
deleted file mode 100644
index e6a57a2d8b..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Platform/iOS/PAL_ios.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(PAL_TRAIT_BUILD_RESOURCECOMPILERLEGACY_SUPPORTED FALSE)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/ResourceCompilerLegacy.cpp b/Code/Tools/RC/ResourceCompilerLegacy/ResourceCompilerLegacy.cpp
deleted file mode 100644
index 3386132e82..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/ResourceCompilerLegacy.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "ResourceCompilerLegacy_precompiled.h"
-#include <IResCompiler.h>
-#include <LegacyConverter.h>
-#include <CryCommon/ISystem.h>
-
-//=========================================================================
-// RegisterConvertors
-//=========================================================================
-extern "C" DLL_EXPORT void __stdcall RegisterConvertors(IResourceCompiler* pRC)
-{
-    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-
-    SetRCLog(pRC->GetIRCLog());
-
-    pRC->RegisterConvertor("LegacyConverter", new AZ::RC::LegacyConverter());
-}
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/ResourceCompilerLegacy_precompiled.h b/Code/Tools/RC/ResourceCompilerLegacy/ResourceCompilerLegacy_precompiled.h
deleted file mode 100644
index 47e378e1aa..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/ResourceCompilerLegacy_precompiled.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <platform.h>
-
-#include <functional>
-#include <vector>
-#include <map>
-
-#include <stdio.h>
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <tchar.h>
-#endif
-
-#include "IRCLog.h"
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Tests/Output/ProcessJobRequest.xml b/Code/Tools/RC/ResourceCompilerLegacy/Tests/Output/ProcessJobRequest.xml
deleted file mode 100644
index 112136753c..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Tests/Output/ProcessJobRequest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<ObjectStream version="3">
-	<Class name="ProcessJobRequest" version="2" type="{20461454-D2F9-4079-AB95-703905E06002}">
-		<Class name="AZStd::string" field="Source File" value="Example.fontfamily" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		<Class name="AZStd::string" field="Watch Folder" value="Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		<Class name="AZStd::string" field="Full Path" value="Output/Example.fontfamily" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		<Class name="AZ::Uuid" field="Builder Guid" value="{31B74BFD-7046-47AC-A7DA-7D5167E9B2F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-		<Class name="JobDescriptor" field="Job Description" version="3" type="{BD0472A4-7634-41F3-97EF-00F3B239BAE2}">
-			<Class name="AZStd::string" field="Additional Fingerprint Info" value="0copy{57767D37-0EBE-43BE-8F60-AB36D2056EF8}" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-			<Class name="int" field="Platform" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
-			<Class name="AZStd::string" field="Platform Identifier" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-			<Class name="AZStd::string" field="Job Key" value="fontfamily" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-			<Class name="bool" field="Critical" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-			<Class name="int" field="Priority" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
-			<Class name="AZStd::unordered_map" field="Job Parameters" type="{4113BC4E-1027-500F-93A2-545C3DBB824D}">
-				<Class name="AZStd::pair" field="element" type="{3690DA11-3F3B-5A64-B683-471C4BA90FFC}">
-					<Class name="unsigned int" field="value1" value="1589735409" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-					<Class name="AZStd::string" field="value2" value="fontfamily" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				</Class>
-			</Class>
-			<Class name="bool" field="Check Exclusive Lock" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-			<Class name="bool" field="Fail On Error" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-			<Class name="AZStd::vector" field="Job Dependency List" type="{DEFBFFD3-D0FA-53B3-B5D3-0ABA49B2FEBD}"/>
-		</Class>
-		<Class name="AZStd::string" field="Temp Dir Path" value="Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		<Class name="PlatformInfo" field="Platform Info" version="1" type="{F7DA39A5-C319-4552-954B-3479E2454D3F}">
-			<Class name="AZStd::string" field="Platform Identifier" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-			<Class name="AZStd::unordered_set" field="Tags on Platform" type="{32EC831B-8AE7-5715-998B-C0C723CB61DA}">
-				<Class name="AZStd::string" field="element" value="tools" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="AZStd::string" field="element" value="renderer" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-			</Class>
-		</Class>
-		<Class name="AZStd::vector" field="Source File Dependency List" type="{A78563AF-17EE-5D6D-940A-9FE76BD74AB9}"/>
-		<Class name="AZ::Uuid" field="Source File UUID" value="{A1CEEB96-D5FC-52A6-8678-86722B7DCFB2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-	</Class>
-</ObjectStream>
-
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Tests/test_Main.cpp b/Code/Tools/RC/ResourceCompilerLegacy/Tests/test_Main.cpp
deleted file mode 100644
index 015d69579c..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Tests/test_Main.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "ResourceCompilerLegacy_precompiled.h"
-#include "LegacyCompiler.h"
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/UnitTest/UnitTest.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzTest/AzTest.h>
-#include <AzTest/Utils.h>
-
-class ResourceCompilerLegacyTest
-    : public ::testing::Test
-    , public AZ::RC::LegacyCompiler
-{
-protected:
-    void SetUp() override
-    {
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-
-        m_app.reset(aznew AzFramework::Application());
-        AZ::ComponentApplication::Descriptor desc;
-        desc.m_useExistingAllocator = true;
-        m_app->Start(desc);
-
-        // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
-        // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
-        // in the unit tests.
-        AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
-
-        AssetBuilderSDK::InitializeSerializationContext();
-    }
-
-    void TearDown() override
-    {
-        m_app->Destroy();
-        m_app.reset();
-
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-    }
-
-    AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest> WrapReadJobRequest(const char* folder) const
-    {
-        return ReadJobRequest(folder);
-    }
-
-    bool WrapWriteResponse(const char* folder, AssetBuilderSDK::ProcessJobResponse& response, bool success = true) const
-    {
-        return WriteResponse(folder, response, success);
-    }
-
-    AZStd::unique_ptr<AzFramework::Application> m_app;
-};
-
-TEST_F(ResourceCompilerLegacyTest, ReadJobRequest_NoRequestFile_GenerateProcessJobRequest)
-{
-    // Tests without ProcessJobRequest.xml
-    const char* testFileFolder = "@devroot@/Code/Tools/RC/ResourceCompilerLegacy/Tests";
-    char testFileResolvedPath[AZ_MAX_PATH_LEN];
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(testFileFolder, testFileResolvedPath, AZ_ARRAY_SIZE(testFileResolvedPath));
-
-    AZ_TEST_START_TRACE_SUPPRESSION;
-    ASSERT_FALSE(WrapReadJobRequest(testFileResolvedPath));
-    // Expected error:
-    //  Unable to load ProcessJobRequest. Not enough information to process this file
-    AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-}
-
-TEST_F(ResourceCompilerLegacyTest, ReadJobRequest_ValidRequestFile_GenerateProcessJobRequest)
-{
-    // Tests reading ProcessJobRequest.xml
-    const char* testFileFolder = "@devroot@/Code/Tools/RC/ResourceCompilerLegacy/Tests/Output";
-    char testFileResolvedFolder[AZ_MAX_PATH_LEN];
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(testFileFolder, testFileResolvedFolder, AZ_ARRAY_SIZE(testFileResolvedFolder));
-
-    ASSERT_TRUE(WrapReadJobRequest(testFileResolvedFolder));
-}
-
-TEST_F(ResourceCompilerLegacyTest, WriteJobResponse_ValidProcessJobResponse_WriteProcessJobResponseToDisk)
-{
-    // Tests writing ProcessJobResponse.xml to disk
-
-    const char* testFileFolder = "@assets@/Code/Tools/RC/ResourceCompilerLegacy/Tests/Output";
-    char testFileResolvedFolder[AZ_MAX_PATH_LEN];
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(testFileFolder, testFileResolvedFolder, AZ_ARRAY_SIZE(testFileResolvedFolder));
-
-    AssetBuilderSDK::ProcessJobResponse response;
-    ASSERT_TRUE(WrapWriteResponse(testFileResolvedFolder, response));
-
-    AZStd::string responseFilePath;
-    AzFramework::StringFunc::Path::ConstructFull(testFileResolvedFolder, AssetBuilderSDK::s_processJobResponseFileName, responseFilePath);
-    ASSERT_TRUE(AZ::IO::FileIOBase::GetInstance()->Exists(responseFilePath.c_str()));
-    ASSERT_TRUE(AZ::IO::FileIOBase::GetInstance()->Remove(responseFilePath.c_str()));
-}
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
-
-
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/Utilities.h b/Code/Tools/RC/ResourceCompilerLegacy/Utilities.h
deleted file mode 100644
index 7dea049553..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/Utilities.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace LegacyCompilerUtils
-        {
-            // Window name used for logging through AZ_TracePrintf.
-            const char* const TracePrint = "LegacyCompiler";
-        } // LegacyCompilerUtils
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_files.cmake b/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_files.cmake
deleted file mode 100644
index 9e12d28a81..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_files.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerLegacy_precompiled.h
-    LegacyConverter.h
-    LegacyConverter.cpp
-    LegacyCompiler.h
-    LegacyCompiler.cpp
-    Utilities.h
-    LegacyAssetParser/AssetParser.h
-    LegacyAssetParser/AssetParser.cpp
-    LegacyAssetParser/ProductInfoCreator.h
-    LegacyAssetParser/ProductInfoCreator.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_shared_files.cmake b/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_shared_files.cmake
deleted file mode 100644
index de9adc1141..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_shared_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerLegacy.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_test_files.cmake b/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_test_files.cmake
deleted file mode 100644
index 34a263d5f5..0000000000
--- a/Code/Tools/RC/ResourceCompilerLegacy/resourcecompilerlegacy_test_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Tests/test_Main.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerPC/AdjustRotLog.h b/Code/Tools/RC/ResourceCompilerPC/AdjustRotLog.h
deleted file mode 100644
index 09051bedb5..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/AdjustRotLog.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_ADJUSTROTLOG_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_ADJUSTROTLOG_H
-#pragma once
-
-
-inline double DLength (const Vec3& v)
-{
-    return sqrt (double(v.x) * double(v.x) + double(v.y) * double(v.y) + double(v.z) * double(v.z));
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Given the rotations in logarithmic space, adjusts the target rotation so
-// that it's the same in rotational group, but the closest to the reference
-// in the QLog space.
-inline void AdjustRotLog (Vec3& vTgt, const Vec3& vRef)
-{
-    double dLenTgt = DLength(vTgt);
-    const double dPi = 3.1415926535897932384626433832795;
-    if (dLenTgt < 1e-4)
-    {
-        // the target is very small rotation, so the algorithm is to find
-        // ANY vector of length n*PI closest to the vRef point
-        double dLenRef = DLength(vRef);
-        if (dLenRef > dPi / 2) // Otherwise the vRef vector is small enough not to make any adjustments
-        {
-            double f = (dPi * floor(dLenRef / dPi + 0.5) / dLenRef);
-            vTgt.x = float(vRef.x * f);
-            vTgt.y = float(vRef.y * f);
-            vTgt.z = float(vRef.z * f);
-        }
-    }
-    else
-    {
-        // the target is big enough rotation to pick the rotation axis out
-
-        // find the projection of the reference to the target axis
-        // then find the target (projection) mod PI
-        // there are basically three possibilities: the new target is in the same PI interval
-        // as the reference projection, in the next or in the previous. Find the closest.
-
-        double dProjRef = (vRef * vTgt) / dLenTgt;
-        double dModTgt = fmod (dLenTgt, dPi);
-        if (dModTgt < 0)
-        {
-            dModTgt += dPi;
-        }
-        assert (dModTgt >= 0 && dModTgt < dPi);
-
-        double dBaseTgt = dPi * floor (dProjRef / dPi + 0.5);
-
-        double dNewTgtR = dBaseTgt + dModTgt;
-        double dNewTgtL = dBaseTgt + dModTgt - dPi;
-        double dNewTgt = (fabs(dNewTgtR - dProjRef) < fabs(dNewTgtL  - dProjRef))
-            ? dNewTgtR : dNewTgtL;
-
-        assert (fabs(dNewTgt + dPi - dProjRef) > fabs(dNewTgt - dProjRef));
-        assert (fabs(dNewTgt - dPi - dProjRef) > fabs(dNewTgt - dProjRef));
-
-        double f = (dNewTgt / dLenTgt);
-        vTgt.x = float(vTgt.x * f);
-        vTgt.y = float(vTgt.y * f);
-        vTgt.z = float(vTgt.z * f);
-    }
-}
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_ADJUSTROTLOG_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/CGF/AssetWriter.cpp b/Code/Tools/RC/ResourceCompilerPC/CGF/AssetWriter.cpp
deleted file mode 100644
index 4a631e4ff0..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CGF/AssetWriter.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "../CryEngine/Cry3DEngine/CGF/ChunkFile.h"
-#include "StaticObjectCompiler.h"
-#include "CGF/CGFSaver.h"
-#include "MathHelpers.h"
-#include "StringHelpers.h"
-
-#include "AssetWriter.h"
-
-#include <SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h>
-
-const bool AssetWriter::s_swapEndian;
-
-bool AssetWriter::WriteCGF(CContentCGF* content)
-{
-    if (!content)
-    {
-        return false;
-    }
-
-    CChunkFile chunkFile;
-    CSaverCGF cgfSaver(chunkFile);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    // _EM_INVALID is used to avoid Floating Point Exception inside CryPhysics
-    MathHelpers::AutoFloatingPointExceptions autoFpe(~(_EM_INEXACT | _EM_UNDERFLOW | _EM_INVALID));
-#endif
-    
-    CStaticObjectCompiler compiler(false);
-    CContentCGF* const pCompiledCGF = compiler.MakeCompiledCGF(content);
-
-    if (!pCompiledCGF)
-    {
-        return false;
-    }
-
-    const bool bNeedEndianSwap = false;
-    const bool bUseQtangents = false;
-    const bool bStorePositionsAsF16 = false;
-    const bool bStoreIndicesAsU16 = false;
-    cgfSaver.SaveContent(pCompiledCGF, bNeedEndianSwap, bStorePositionsAsF16, bUseQtangents, bStoreIndicesAsU16);
-
-    chunkFile.Write(content->GetFilename());
-
-    return true;
-}
-
-//
-// Implemented by referencing to ColladaCompiler::CompileToCHR
-//
-bool AssetWriter::WriteCHR(CContentCGF* content, [[maybe_unused]] IConvertContext* convertContext)
-{
-    if (!content)
-    {
-        return false;
-    }
-
-    CChunkFile chunkFile;
-    CSaverCGF cgfSaver(chunkFile);
-
-    cgfSaver.SetContent(content);
-    cgfSaver.SaveExportFlags(s_swapEndian);
-    
-    if (!PrepareSkeletonDataChunks(&cgfSaver))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool AssetWriter::WriteSKIN(CContentCGF* content, [[maybe_unused]] IConvertContext* convertContext, bool exportMorphTargets)
-{
-    if (!content)
-    {
-        return false;
-    }
-
-    CChunkFile chunkFile;
-    CSaverCGF cgfSaver(chunkFile);
-
-    cgfSaver.SetContent(content);
-    cgfSaver.SaveExportFlags(s_swapEndian);
-    cgfSaver.SaveMaterials(s_swapEndian);
-    cgfSaver.SaveUncompiledNodes();
-    if (exportMorphTargets)
-    {
-        cgfSaver.SaveUncompiledMorphTargets();
-    }
-
-    if (!PrepareSkeletonDataChunks(&cgfSaver))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool AssetWriter::PrepareSkeletonDataChunks(CSaverCGF* cgfSaver)
-{
-    const CSkinningInfo* skinningInfo = cgfSaver->GetContent()->GetSkinningInfo();
-
-    if (skinningInfo->m_arrBonesDesc.empty())
-    {
-        return false;
-    }
-
-    if (skinningInfo->m_arrBonesDesc.size() != skinningInfo->m_arrBoneEntities.size())
-    {
-        RCLogError("Bone description number and bone entity data number don't match.\n");
-        return false;
-    }
-
-    // Save bone entity data to chunk
-    DynArray<BONE_ENTITY> tempBoneEntities = skinningInfo->m_arrBoneEntities;
-    for (int i = 0; i < tempBoneEntities.size(); ++i)
-    {
-        tempBoneEntities[i].phys.nPhysGeom = -1;
-        StringHelpers::SafeCopyPadZeros(tempBoneEntities[i].prop, sizeof(tempBoneEntities[i].prop), skinningInfo->m_arrBoneEntities[i].prop);
-    }
-
-    const int numBones = skinningInfo->m_arrBonesDesc.size();
-    cgfSaver->SaveBones(s_swapEndian, &tempBoneEntities[0], numBones, numBones*sizeof(BONE_ENTITY));
-
-    // Save bone names
-    std::vector<char> boneNames;
-    static const int maxBoneNameLength = 32;
-    boneNames.reserve(maxBoneNameLength * numBones);
-    std::vector<SBoneInitPosMatrix> boneMatices(numBones);
-    for (int boneId = 0; boneId < numBones; ++boneId)
-    {
-        const char* boneName = skinningInfo->m_arrBonesDesc[boneId].m_arrBoneName;
-        size_t len = strlen(boneName);
-        boneNames.insert(boneNames.end(), boneName, boneName + len);
-        boneNames.push_back('\0');
-
-        for (int x = 0; x < 4; ++x)
-        {
-            // Reference to ColladaCompiler::CompileToCHR
-            // CryTek requires the bone matrix is converted from meter unit to centimeter unit
-            // We have intentionally convert bone transform matrix to meter unit in FbxSceneSystem::ConvertBoneUnit
-            // For example, a valid bone matrix would look like
-            // 100 0   0   | 50
-            // 0   100 0   | 0
-            // 0   0   100 | 0
-            // In which 50 means 50 centimeters
-            Matrix34 m = Matrix34::CreateScale(Vec3(100.0f, 100.0f, 100.0f)) * skinningInfo->m_arrBonesDesc[boneId].m_DefaultB2W;
-            Vec3 column = m.GetColumn(x);
-            for (int y = 0; y < 3; ++y)
-            {
-                boneMatices[boneId][x][y] = column[y];
-            }
-        }
-    }
-    boneNames.push_back('\0');
-
-    cgfSaver->SaveBoneNames(s_swapEndian, &boneNames[0], numBones, boneNames.size());
-    cgfSaver->SaveBoneInitialMatrices(s_swapEndian, &boneMatices[0], numBones, sizeof(SBoneInitPosMatrix)*numBones);
-
-    return true;
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/CGF/AssetWriter.h b/Code/Tools/RC/ResourceCompilerPC/CGF/AssetWriter.h
deleted file mode 100644
index b3e88f9906..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CGF/AssetWriter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_ASSETWRITER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_ASSETWRITER_H
-#pragma once
-
-#include "CGFContent.h"
-
-class CSaverCGF;
-
-class AssetWriter
-    : public IAssetWriter
-{
-public:
-    bool WriteCGF(CContentCGF* content) override;
-    bool WriteCHR(CContentCGF* content, IConvertContext* convertContext) override;
-    bool WriteSKIN(CContentCGF* content, IConvertContext* convertContext, bool exportMorphTargets = false) override;
-
-protected:
-    bool PrepareSkeletonDataChunks(CSaverCGF* cgfSaver);
-    
-    static const bool s_swapEndian = false;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_ASSETWRITER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/CGF/CGFNodeMerger.cpp b/Code/Tools/RC/ResourceCompilerPC/CGF/CGFNodeMerger.cpp
deleted file mode 100644
index 7092b43f45..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CGF/CGFNodeMerger.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "CGFNodeMerger.h"
-#include "CGFContent.h"
-#include "StringHelpers.h"
-
-//////////////////////////////////////////////////////////////////////////
-bool CGFNodeMerger::SetupMeshSubsets(CContentCGF* pCGF, CMesh& mesh, CMaterialCGF* pMaterialCGF, string& errorMessage)
-{
-    const DynArray<int>& usedMaterialIds = pCGF->GetUsedMaterialIDs();
-
-    unsigned int i;
-    if (mesh.m_subsets.empty())
-    {
-        //////////////////////////////////////////////////////////////////////////
-        // Setup mesh subsets.
-        //////////////////////////////////////////////////////////////////////////
-        mesh.m_subsets.clear();
-        for (i = 0; i < usedMaterialIds.size(); i++)
-        {
-            SMeshSubset meshSubset;
-            int nMatID = usedMaterialIds[i];
-            meshSubset.nMatID = nMatID;
-            meshSubset.nPhysicalizeType = PHYS_GEOM_TYPE_NONE;
-            mesh.m_subsets.push_back(meshSubset);
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-    // Setup physicalization type from materials (and autofix matId if needed)
-    //////////////////////////////////////////////////////////////////////////
-    if (pMaterialCGF)
-    {
-        for (i = 0; i < mesh.m_subsets.size(); i++)
-        {
-            SMeshSubset& meshSubset = mesh.m_subsets[i];
-            if (pMaterialCGF->subMaterials.size() > 0)
-            {
-                int id = meshSubset.nMatID;
-                if (id >= (int)pMaterialCGF->subMaterials.size())
-                {
-                    // Let's use 3dsMax's approach of handling material ids out of range
-                    id %= (int)pMaterialCGF->subMaterials.size();
-                }
-
-                if (id >= 0 && pMaterialCGF->subMaterials[id] != NULL)
-                {
-                    meshSubset.nMatID = id;
-                    meshSubset.nPhysicalizeType = pMaterialCGF->subMaterials[id]->nPhysicalizeType;
-                }
-                else
-                {
-                    errorMessage = StringHelpers::Format(
-                            "%s: Submaterial %d is not available for subset %d (%d subsets) in %s",
-                            __FUNCTION__, meshSubset.nMatID, i, (int)mesh.m_subsets.size(), pCGF->GetFilename());
-                    return false;
-                }
-            }
-            else
-            {
-                meshSubset.nPhysicalizeType = pMaterialCGF->nPhysicalizeType;
-            }
-        }
-    }
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CGFNodeMerger::MergeNodes(CContentCGF* pCGF, std::vector<CNodeCGF*> nodes, string& errorMessage, CMesh* pMergedMesh)
-{
-    assert(pMergedMesh);
-
-    AABB meshBBox;
-    meshBBox.Reset();
-    for (size_t i = 0; i < nodes.size(); i++)
-    {
-        CNodeCGF* pNode = nodes[i];
-        assert(pNode->pMesh == 0 || pNode->pMesh->m_pPositionsF16 == 0);
-        int nOldVerts = pMergedMesh->GetVertexCount();
-        if (pMergedMesh->GetVertexCount() == 0)
-        {
-            pMergedMesh->Copy(*pNode->pMesh);
-        }
-        else
-        {
-            const char* const errText = pMergedMesh->Append(*pNode->pMesh);
-            if (errText)
-            {
-                errorMessage = errText;
-                return false;
-            }
-            // Keep color stream in sync size with vertex/normals stream.
-            if (pMergedMesh->m_streamSize[CMesh::COLORS][0] > 0 && pMergedMesh->m_streamSize[CMesh::COLORS][0] < pMergedMesh->GetVertexCount())
-            {
-                int nOldCount = pMergedMesh->m_streamSize[CMesh::COLORS][0];
-                pMergedMesh->ReallocStream(CMesh::COLORS, 0, pMergedMesh->GetVertexCount());
-                memset(pMergedMesh->m_pColor0 + nOldCount, 255, (pMergedMesh->GetVertexCount() - nOldCount) * sizeof(SMeshColor));
-            }
-            if (pMergedMesh->m_streamSize[CMesh::COLORS][1] > 0 && pMergedMesh->m_streamSize[CMesh::COLORS][1] < pMergedMesh->GetVertexCount())
-            {
-                int nOldCount = pMergedMesh->m_streamSize[CMesh::COLORS][1];
-                pMergedMesh->ReallocStream(CMesh::COLORS, 1, pMergedMesh->GetVertexCount());
-                memset(pMergedMesh->m_pColor1 + nOldCount, 255, (pMergedMesh->GetVertexCount() - nOldCount) * sizeof(SMeshColor));
-            }
-        }
-
-        AABB bbox = pNode->pMesh->m_bbox;
-        if (!pNode->bIdentityMatrix)
-        {
-            bbox.SetTransformedAABB(pNode->worldTM, bbox);
-        }
-
-        meshBBox.Add(bbox.min);
-        meshBBox.Add(bbox.max);
-        pMergedMesh->m_bbox = meshBBox;
-
-        if (!pNode->bIdentityMatrix)
-        {
-            // Transform merged mesh into the world space.
-            // Only transform newly added vertices.
-            for (int j = nOldVerts; j < pMergedMesh->GetVertexCount(); j++)
-            {
-                pMergedMesh->m_pPositions[j] = pNode->worldTM.TransformPoint(pMergedMesh->m_pPositions[j]);
-                pMergedMesh->m_pNorms[j].RotateSafelyBy(pNode->worldTM);
-            }
-        }
-    }
-
-    bool setupMeshSuccessful = true;
-    if (pCGF != NULL)
-    {
-        if (!SetupMeshSubsets(pCGF, *pMergedMesh, pCGF->GetCommonMaterial(), errorMessage))
-        {
-            return false;
-        }
-    }
-    pMergedMesh->RecomputeTexMappingDensity();
-
-    return setupMeshSuccessful;
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/CGF/CGFNodeMerger.h b/Code/Tools/RC/ResourceCompilerPC/CGF/CGFNodeMerger.h
deleted file mode 100644
index fc89936761..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CGF/CGFNodeMerger.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_CGFNODEMERGER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_CGFNODEMERGER_H
-#pragma once
-
-
-class CContentCGF;
-class CMesh;
-struct CMaterialCGF;
-struct CNodeCGF;
-
-namespace CGFNodeMerger
-{
-    bool SetupMeshSubsets(CContentCGF* pCGF, CMesh& mesh, CMaterialCGF* pMaterialCGF, string& errorMessage);
-    bool MergeNodes(CContentCGF* pCGF, std::vector<CNodeCGF*> nodes, string& errorMessage, CMesh* pOutMesh);
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_CGFNODEMERGER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/CGF/ChunkData.h b/Code/Tools/RC/ResourceCompilerPC/CGF/ChunkData.h
deleted file mode 100644
index 3b800bc70e..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CGF/ChunkData.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_CHUNKDATA_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_CHUNKDATA_H
-#pragma once
-
-struct CChunkData
-{
-    char* data;
-    int size;
-
-    CChunkData() { data = 0; size = 0; }
-    ~CChunkData() { free(data); }
-
-    template <class T>
-    void Add(const T& object)
-    {
-        AddData(&object, sizeof(object));
-    }
-    void AddData(const void* pSrcData, int nSrcDataSize)
-    {
-        data = (char*)realloc(data, size + nSrcDataSize);
-        memcpy(data + size, pSrcData, nSrcDataSize);
-        size += nSrcDataSize;
-    }
-};
-
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_CHUNKDATA_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/CGF/DataWriter.cpp b/Code/Tools/RC/ResourceCompilerPC/CGF/DataWriter.cpp
deleted file mode 100644
index b419a1f2dd..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CGF/DataWriter.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "DataWriter.h"
-#include "CryEndian.h"
-
-DataWriter::DataWriter()
-{
-    m_outputBuffer = NULL;
-    Reset();
-}
-
-DataWriter::~DataWriter()
-{
-    this->Reset();
-}
-
-void DataWriter::Reset()
-{
-    if (m_outputBuffer)
-    {
-        free(m_outputBuffer);
-    }
-
-    m_currentBufferSize = 0;
-    m_outputBuffer = NULL;
-    m_writtenBytes = 0;
-    m_labelMap.clear();
-    m_offsetLocations.clear();
-    m_bClosed = false;
-    m_bSwapEndian = false;
-}
-
-void DataWriter::SetSwapEndian(bool bEnable)
-{
-    m_bSwapEndian = bEnable;
-}
-
-void* DataWriter::GetDataAndTakeOwnership()
-{
-    if (m_bClosed && m_outputBuffer)
-    {
-        void* returnData = m_outputBuffer;
-        m_outputBuffer = NULL;
-        Reset();
-        return returnData;
-    }
-    return NULL;
-}
-
-uint32 DataWriter::GetDataSize() const
-{
-    return (m_bClosed && m_outputBuffer) ? m_writtenBytes : 0;
-}
-
-void DataWriter::BeginWriting()
-{
-    ExpandBuffer(1);
-    AddLabel("fileStart");
-}
-
-void DataWriter::WriteUInt8(const uint8 v)
-{
-    ExpandBuffer(sizeof(v));
-    uint8* out = (uint8*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    *out = v;
-    SwapEndian(*out, m_bSwapEndian);
-    m_writtenBytes += sizeof(v);
-}
-
-void DataWriter::WriteInt8(const int8 v)
-{
-    ExpandBuffer(sizeof(v));
-    int8* out = (int8*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    *out = v;
-    SwapEndian(*out, m_bSwapEndian);
-    m_writtenBytes += sizeof(v);
-}
-
-void DataWriter::WriteUInt16(const uint16 v)
-{
-    ExpandBuffer(sizeof(v));
-    uint16* out = (uint16*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    *out = v;
-    SwapEndian(*out, m_bSwapEndian);
-    m_writtenBytes += sizeof(v);
-}
-
-void DataWriter::WriteInt16(const int16 v)
-{
-    ExpandBuffer(sizeof(v));
-    int16* out = (int16*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    *out = v;
-    SwapEndian(*out, m_bSwapEndian);
-    m_writtenBytes += sizeof(v);
-}
-
-void DataWriter::WriteUInt32(const uint32 v)
-{
-    ExpandBuffer(sizeof(v));
-    uint32* out = (uint32*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    *out = v;
-    SwapEndian(*out, m_bSwapEndian);
-    m_writtenBytes += sizeof(v);
-}
-
-void DataWriter::WriteInt32(const int32 v)
-{
-    ExpandBuffer(sizeof(v));
-    int32* out = (int32*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    *out = v;
-    SwapEndian(*out, m_bSwapEndian);
-    m_writtenBytes += sizeof(v);
-}
-
-void DataWriter::WriteFloat(const float v)
-{
-    ExpandBuffer(sizeof(v));
-    float* out = (float*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    *out = v;
-    SwapEndian(*out, m_bSwapEndian);
-    m_writtenBytes += sizeof(v);
-}
-
-void DataWriter::WriteData(const void* v, const uint32 size)
-{
-    ExpandBuffer(size);
-    void* out = (void*)(((uint8*)m_outputBuffer) + m_writtenBytes);
-    memcpy(out, v, size);
-    m_writtenBytes += size;
-}
-
-void DataWriter::WriteAlign(const uint32 alignBytes)
-{
-    const uint32 a = m_writtenBytes % alignBytes;
-    if (a != 0)
-    {
-        m_writtenBytes += (alignBytes - a);
-    }
-    ExpandBuffer();
-}
-
-void DataWriter::AddLabel(const string& label)
-{
-    const std::map<string, uint32>::iterator f = m_labelMap.find(label);
-    if (f == m_labelMap.end())
-    {
-        m_labelMap.insert(std::make_pair(label, m_writtenBytes));
-    }
-}
-
-void DataWriter::WriteOffsetInt32(const string& label)
-{
-    this->WriteOffsetInt32("", label);
-}
-
-void DataWriter::WriteOffsetInt32(const string& fromLabel, const string& label)
-{
-    SOffsetLocation loc;
-    loc.b16Bit = false;
-    loc.offset = m_writtenBytes;
-    loc.labelName = label;
-    loc.fromLabelName = fromLabel;
-    m_offsetLocations.push_back(loc);
-    WriteInt32(0);   // Make space to write the offset into later
-}
-
-void DataWriter::WriteOffsetInt16(const string& label)
-{
-    this->WriteOffsetInt16("", label);
-}
-
-void DataWriter::WriteOffsetInt16(const string& fromLabel, const string& label)
-{
-    SOffsetLocation loc;
-    loc.b16Bit = true;
-    loc.offset = m_writtenBytes;
-    loc.labelName = label;
-    loc.fromLabelName = fromLabel;
-    m_offsetLocations.push_back(loc);
-    WriteInt16(0);   // Make space to write the offset into later
-}
-
-bool DataWriter::EndWriting()
-{
-    m_missingLabels.clear();
-
-    for (int iOffset = 0; iOffset < m_offsetLocations.size(); iOffset++)
-    {
-        const SOffsetLocation* loc = &m_offsetLocations[iOffset];
-        const std::map<string, uint32>::iterator itLabel = m_labelMap.find(loc->labelName);
-
-        if (itLabel != m_labelMap.end())
-        {
-            const uint32 labelLoc = (*itLabel).second;
-            uint32 fromLoc = 0;
-            if (loc->fromLabelName.length() > 0)
-            {
-                const std::map<string, uint32>::iterator itFromLabel = m_labelMap.find(loc->fromLabelName);
-                if (itFromLabel != m_labelMap.end())
-                {
-                    fromLoc = (*itFromLabel).second;
-                }
-                else
-                {
-                    m_missingLabels.push_back(loc->fromLabelName);
-                }
-            }
-
-            if (loc->b16Bit)
-            {
-                const int16 offset = (int16)(labelLoc - fromLoc);
-                int16* out = (int16*)(((uint8*)m_outputBuffer) + loc->offset);
-                *out = offset;
-                SwapEndian(*out, m_bSwapEndian);
-            }
-            else
-            {
-                const int32 offset = labelLoc - fromLoc;
-                int32* out = (int32*)(((uint8*)m_outputBuffer) + loc->offset);
-                *out = offset;
-                SwapEndian(*out, m_bSwapEndian);
-            }
-        }
-        else
-        {
-            m_missingLabels.push_back(loc->labelName);
-        }
-    }
-
-    m_bClosed = true;
-
-    return m_missingLabels.empty();
-}
-
-uint32 DataWriter::CalculateSize(const string& fromLabel, const string& toLabel)
-{
-    const std::map<string, uint32>::iterator itFromLabel = m_labelMap.find(fromLabel);
-    const std::map<string, uint32>::iterator itToLabel = m_labelMap.find(toLabel);
-
-    uint32 size = 0;
-    if (itFromLabel != m_labelMap.end() && itToLabel != m_labelMap.end())
-    {
-        const uint32 fromLoc = (*itFromLabel).second;
-        const uint32 toLoc = (*itToLabel).second;
-        if (fromLoc < toLoc)
-        {
-            size = toLoc - fromLoc;
-        }
-        else
-        {
-            size = 0;
-        }
-    }
-    return size;
-}
-
-#define BUFFERINCREASESIZE (1024 * 1024)
-
-void DataWriter::ExpandBuffer(const uint32 addBytes)
-{
-    if (m_writtenBytes + addBytes > m_currentBufferSize)
-    {
-        const uint32 newBufferSize = m_currentBufferSize + BUFFERINCREASESIZE;
-        if (m_outputBuffer)
-        {
-            void* tmpBuffer = realloc(m_outputBuffer, newBufferSize);
-            AZ_Assert(
-                tmpBuffer != nullptr,
-                "realloc failed, this is possible when allocating a large data array whose size is comparable to RAM size, and also when "
-                "the memory is highly segmented");
-            if (tmpBuffer)
-            {
-                m_outputBuffer = tmpBuffer;
-                m_currentBufferSize = newBufferSize;
-            }
-        }
-        else
-        {
-            m_outputBuffer = malloc(newBufferSize);
-            m_currentBufferSize = newBufferSize;
-        }
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/CGF/DataWriter.h b/Code/Tools/RC/ResourceCompilerPC/CGF/DataWriter.h
deleted file mode 100644
index 83f6033ed9..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CGF/DataWriter.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_DATAWRITER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_DATAWRITER_H
-#pragma once
-
-class DataWriter
-{
-public:
-    DataWriter();
-    virtual ~DataWriter();
-
-    void Reset();
-
-    void SetSwapEndian(bool bEnable);
-
-    uint32 GetDataSize() const;
-    void* GetDataAndTakeOwnership();
-
-    void BeginWriting();
-
-    void WriteUInt8(const uint8 v);
-    void WriteInt8(const int8 v);
-    void WriteUInt16(const uint16 v);
-    void WriteInt16(const int16 v);
-    void WriteUInt32(const uint32 v);
-    void WriteInt32(const int32 v);
-    void WriteFloat(const float v);
-
-    void WriteData(const void* v, const uint32 size);
-
-    void WriteAlign(const uint32 alignBytes);
-
-    void AddLabel(const string& label);
-    void WriteOffsetInt32(const string& label);
-    void WriteOffsetInt32(const string& fromLabel, const string& label);
-    void WriteOffsetInt16(const string& label);
-    void WriteOffsetInt16(const string& fromLabel, const string& label);
-
-    bool EndWriting();
-
-    uint32 CalculateSize(const string& fromLabel, const string& toLabel);
-
-private:
-
-    void ExpandBuffer(const uint32 addBytes = 0);
-
-    uint32 m_currentBufferSize;
-    void* m_outputBuffer;
-    uint32 m_writtenBytes;
-    bool m_bClosed;
-    bool m_bSwapEndian;
-
-    std::map<string, uint32> m_labelMap;
-
-    struct SOffsetLocation
-    {
-        bool b16Bit;
-        uint32 offset;
-        string labelName;
-        string fromLabelName;
-    };
-
-    std::vector< SOffsetLocation > m_offsetLocations;
-    std::vector<string> m_missingLabels;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CGF_DATAWRITER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerPC/CMakeLists.txt
deleted file mode 100644
index bf582ee26c..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/CMakeLists.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerPC.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        resourcecompilerpc_files.cmake
-    PLATFORM_INCLUDE_FILES
-        Platform/Common/${PAL_TRAIT_COMPILER_ID}/resourcecompilerpc_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    COMPILE_DEFINITIONS
-        PRIVATE
-            RESOURCE_COMPILER
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::mikkelsen
-            Legacy::EditorCommon.Headers
-            Legacy::Cry3DEngine.Static
-            Legacy::Cry3DEngine.MeshCompiler.Static
-            Legacy::Cry3DEngine.CGF.RC.Static
-            Legacy::CryCommon.EngineSettings.RC.Static
-            Legacy::CryCommonTools
-            AZ::SceneData
-            AZ::AzToolsFramework
-            AZ::AssetBuilderSDK
-        PUBLIC
-            Legacy::CryCommon
-            Legacy::ResourceCompiler.Static
-            AZ::AzCore
-            ${additional_dependencies}
-    RUNTIME_DEPENDENCIES
-        Legacy::CryXML
-)
-
-ly_add_target(
-    NAME ResourceCompilerPC MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompilerpc_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::ResourceCompilerPC.Static
-            Legacy::Cry3DEngine.Static
-            Legacy::CryCommonTools
-            AZ::AzToolsFramework
-)
-
-ly_add_dependencies(RC Legacy::ResourceCompilerPC)
-
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    ly_add_target(
-        NAME ResourceCompilerPC.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            resourcecompilerpc_test_files.cmake
-        PLATFORM_INCLUDE_FILES
-            Platform/Common/${PAL_TRAIT_COMPILER_ID}/resourcecompilerpc_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
-        COMPILE_DEFINITIONS
-            PRIVATE
-                RESOURCE_COMPILER
-                CGF_PHYSX_COMPILER
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Source
-                Tests
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                Legacy::ResourceCompilerPC.Static
-                AZ::AssetBuilderSDK
-                Legacy::CryCommonTools
-                Legacy::Cry3DEngine.Static
-    )
-    ly_add_googletest(
-        NAME Legacy::ResourceCompilerPC.Tests
-    )
-endif()
diff --git a/Code/Tools/RC/ResourceCompilerPC/ChunkCompiler.cpp b/Code/Tools/RC/ResourceCompilerPC/ChunkCompiler.cpp
deleted file mode 100644
index ed27195673..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/ChunkCompiler.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "ConvertContext.h"
-#include "ChunkCompiler.h"
-#include "../Cry3DEngine/CGF/ChunkFileReaders.h"
-#include "../Cry3DEngine/CGF/ChunkFileWriters.h"
-#include "CryHeaders.h"
-#include "IChunkFile.h"
-#include "IConfig.h"
-#include "IResCompiler.h"
-#include "IResourceCompilerHelper.h"
-#include "StringHelpers.h"
-#include "UpToDateFileHelpers.h"
-
-
-static bool writeChunkFile(
-    ChunkFile::MemorylessChunkFileWriter::EChunkFileFormat eFormat,
-    const char* dstFilename,
-    ChunkFile::IReader* pReader,
-    const char* srcFilename,
-    const std::vector<IChunkFile::ChunkDesc>& chunks)
-{
-    ChunkFile::OsFileWriter writer;
-
-    if (!writer.Create(dstFilename))
-    {
-        RCLogError("Failed to create '%s'", dstFilename);
-        return false;
-    }
-
-    ChunkFile::MemorylessChunkFileWriter wr(eFormat, &writer);
-
-    wr.SetAlignment(4);
-
-    while (wr.StartPass())
-    {
-        for (uint32 i = 0; i < chunks.size(); ++i)
-        {
-            wr.StartChunk((chunks[i].bSwapEndian ? eEndianness_NonNative : eEndianness_Native), chunks[i].chunkType, chunks[i].chunkVersion, chunks[i].chunkId);
-
-            uint32 srcSize = chunks[i].size;
-            if (srcSize <= 0)
-            {
-                continue;
-            }
-
-            if (!pReader->SetPos(chunks[i].fileOffset) != 0)
-            {
-                RCLogError("Failed to read (seek) file %s.", srcFilename);
-                return false;
-            }
-
-            while (srcSize > 0)
-            {
-                char bf[4 * 1024];
-                const uint32 sz = Util::getMin((uint32)sizeof(bf), srcSize);
-                srcSize -= sz;
-
-                if (!pReader->Read(bf, sz))
-                {
-                    RCLogError("Failed to read %u byte(s) from file %s.", (uint)sz, srcFilename);
-                    return false;
-                }
-
-                wr.AddChunkData(bf, sz);
-            }
-        }
-    }
-
-    if (!wr.HasWrittenSuccessfully())
-    {
-        RCLogError("Failed to write %s.", dstFilename);
-        return false;
-    }
-
-    return true;
-}
-
-
-static bool convertChunkFile(const uint32 version, const char* srcFilename, const char* dstFilename)
-{
-    if (srcFilename == 0 || srcFilename[0] == 0 || dstFilename == 0 || dstFilename[0] == 0)
-    {
-        RCLogError("Empty name of a chunk file. Contact RC programmer.");
-        return false;
-    }
-
-    ChunkFile::CryFileReader f;
-
-    if (!f.Open(srcFilename))
-    {
-        RCLogError("File to open file %s for reading", srcFilename);
-        return false;
-    }
-
-    std::vector<IChunkFile::ChunkDesc> chunks;
-
-    string s;
-    s = ChunkFile::GetChunkTableEntries_0x746(&f, chunks);
-    if (!s.empty())
-    {
-        s = ChunkFile::GetChunkTableEntries_0x744_0x745(&f, chunks);
-        if (s.empty())
-        {
-            s = ChunkFile::StripChunkHeaders_0x744_0x745(&f, chunks);
-        }
-    }
-
-    if (!s.empty())
-    {
-        RCLogError("%s", s.c_str());
-        return false;
-    }
-
-    const ChunkFile::MemorylessChunkFileWriter::EChunkFileFormat eFormat =
-        (version == 0x745)
-        ? ChunkFile::MemorylessChunkFileWriter::eChunkFileFormat_0x745
-        : ChunkFile::MemorylessChunkFileWriter::eChunkFileFormat_0x746;
-
-    const bool bOk = writeChunkFile(eFormat, dstFilename, &f, srcFilename, chunks);
-    return bOk;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CChunkCompiler::CChunkCompiler()
-{
-    m_refCount = 1;
-}
-
-
-CChunkCompiler::~CChunkCompiler()
-{
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// ICompiler + IConvertor methods.
-//////////////////////////////////////////////////////////////////////////
-void CChunkCompiler::Release()
-{
-    if (--m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// ICompiler methods.
-//////////////////////////////////////////////////////////////////////////
-string CChunkCompiler::GetOutputFileNameOnly() const
-{
-    const string sourceFileFinal = m_CC.m_config->GetAsString("overwritefilename", m_CC.m_sourceFileNameOnly.c_str(), m_CC.m_sourceFileNameOnly.c_str());
-    return sourceFileFinal;
-}
-
-
-string CChunkCompiler::GetOutputPath() const
-{
-    return PathHelpers::Join(m_CC.GetOutputFolder(), GetOutputFileNameOnly());
-}
-
-
-bool CChunkCompiler::Process()
-{
-    const string sourceFile = m_CC.GetSourcePath();
-    const string outputFile = GetOutputPath();
-
-    if (!m_CC.m_bForceRecompiling && UpToDateFileHelpers::FileExistsAndUpToDate(GetOutputPath(), m_CC.GetSourcePath()))
-    {
-        // The file is up-to-date
-        m_CC.m_pRC->AddInputOutputFilePair(m_CC.GetSourcePath(), GetOutputPath());
-        return true;
-    }
-
-    if (m_CC.m_config->GetAsBool("SkipMissing", false, true))
-    {
-        // Skip missing source files.
-        const DWORD dwFileSpecAttr = GetFileAttributes(sourceFile.c_str());
-        if (dwFileSpecAttr == INVALID_FILE_ATTRIBUTES)
-        {
-            // Skip missing file instead of reporting it as an error.
-            return true;
-        }
-    }
-
-    bool bOk = false;
-
-#if !defined(AZ_PLATFORM_LINUX) && !defined(AZ_PLATFORM_APPLE) // Exception handling not enabled on linux/mac builds
-    try
-#endif // !defined(AZ_PLATFORM_LINUX)
-    {
-        const uint32 version =
-            StringHelpers::EndsWith(m_CC.m_config->GetAsString("targetversion", "0x746", "0x746"), "745")
-            ? 0x745
-            : 0x746;
-        bOk = convertChunkFile(version, sourceFile.c_str(), outputFile.c_str());
-    }
-#if !defined(AZ_PLATFORM_LINUX) && !defined(AZ_PLATFORM_APPLE)// Exception handling not enabled on linux builds
-    catch (char*)
-    {
-        RCLogError("Unexpected failure in processing %s - contact an RC programmer.", sourceFile.c_str());
-        return false;
-    }
-#endif // !defined(AZ_PLATFORM_LINUX) && !defined(AZ_PLATFORM_APPLE)
-
-    if (bOk)
-    {
-        if (!UpToDateFileHelpers::SetMatchingFileTime(GetOutputPath(), m_CC.GetSourcePath()))
-        {
-            return false;
-        }
-        m_CC.m_pRC->AddInputOutputFilePair(m_CC.GetSourcePath(), GetOutputPath());
-    }
-    return bOk;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// IConvertor methods.
-//////////////////////////////////////////////////////////////////////////
-ICompiler* CChunkCompiler::CreateCompiler()
-{
-    // Only ever return one compiler, since we don't support multithreading. Since
-    // the compiler is just this object, we can tell whether we have already returned
-    // a compiler by checking the ref count.
-    if (m_refCount >= 2)
-    {
-        return 0;
-    }
-
-    // Until we support multithreading for this convertor, the compiler and the
-    // convertor may as well just be the same object.
-    ++m_refCount;
-    return this;
-}
-
-
-const char* CChunkCompiler::GetExt(int index) const
-{
-    return (index == 0) ? "chunk" : 0;
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/ChunkCompiler.h b/Code/Tools/RC/ResourceCompilerPC/ChunkCompiler.h
deleted file mode 100644
index aeb38a16fa..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/ChunkCompiler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CHUNKCOMPILER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CHUNKCOMPILER_H
-#pragma once
-
-
-#include "IConvertor.h"
-
-struct ConvertContext;
-
-class CChunkCompiler
-    : public ICompiler
-    , public IConvertor
-{
-public:
-    class Error
-    {
-    public:
-        Error(int nCode);
-        Error(const char* szFormat, ...);
-        const char* c_str() const
-        {
-            return m_strReason.c_str();
-        }
-    protected:
-        string m_strReason;
-    };
-
-    CChunkCompiler();
-    ~CChunkCompiler();
-
-    // ICompiler + IConvertor methods.
-    virtual void Release();
-
-    // ICompiler methods.
-    virtual void BeginProcessing([[maybe_unused]] const IConfig* config) { }
-    virtual void EndProcessing() { }
-    virtual IConvertContext* GetConvertContext() { return &m_CC; }
-    virtual bool Process();
-
-    // IConvertor methods.
-    virtual ICompiler* CreateCompiler();
-    virtual const char* GetExt(int index) const;
-
-private:
-    string GetOutputFileNameOnly() const;
-    string GetOutputPath() const;
-
-    ConvertContext m_CC;
-    int m_refCount;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_CHUNKCOMPILER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/LuaCompiler.cpp b/Code/Tools/RC/ResourceCompilerPC/LuaCompiler.cpp
deleted file mode 100644
index bcd41d623f..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/LuaCompiler.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "ConvertContext.h"
-#include "IConfig.h"
-#include "FileUtil.h"
-#include "UpToDateFileHelpers.h"
-
-#include "LuaCompiler.h"
-
-extern "C"
-{
-#include <Lua/lua.h>
-#include <Lua/lauxlib.h>
-
-#include <Lua/ldo.h>
-#include <Lua/lfunc.h>
-#include <Lua/lmem.h>
-#include <Lua/lobject.h>
-#include <Lua/lopcodes.h>
-#include <Lua/lstring.h>
-#include <Lua/lundump.h>
-}
-
-extern "C"
-{
-float script_frand0_1()
-{
-    return rand() / static_cast<float>(RAND_MAX);
-}
-
-void script_randseed(uint seed)
-{
-    srand(seed);
-}
-}
-
-// Shamelessly stolen from luac.c and modified a bit to support rc usage
-
-#define toproto(L, i) (clvalue(L->top + (i))->l.p)
-
-static const Proto* combine(lua_State* L)
-{
-    return toproto(L, -1);
-}
-
-static int writer(lua_State* L, const void* p, size_t size, void* u)
-{
-    UNUSED(L);
-    return (fwrite(p, size, 1, (FILE*)u) != 1) && (size != 0);
-}
-
-static int pmain(lua_State* L)
-{
-    LuaCompiler* pCompiler = reinterpret_cast<LuaCompiler*>(lua_touserdata(L, 1));
-    const Proto* f;
-    const char* filename = pCompiler->GetInFilename();
-    if (luaL_loadfile(L, filename) != 0)
-    {
-        RCLogError(lua_tostring(L, -1));
-        return 1;
-    }
-
-    f = combine(L);
-    if (pCompiler->IsDumping())
-    {
-        const char* outputFilename = pCompiler->GetOutFilename();
-
-        FILE* D = nullptr; 
-        azfopen(&D, outputFilename, "wb");
-        if (D == NULL)
-        {
-            RCLogError("Cannot open %s", outputFilename);
-            return 1;
-        }
-
-        lua_lock(L);
-        luaU_dump(L, f, writer, D, (int)pCompiler->IsStripping());
-        lua_unlock(L);
-
-        if (ferror(D))
-        {
-            RCLogError("Cannot write to %s", outputFilename);
-            return 1;
-        }
-
-        if (fclose(D))
-        {
-            RCLogError("Cannot close %s", outputFilename);
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-LuaCompiler::LuaCompiler()
-    : m_bIsDumping(true)
-    , m_bIsStripping(true)
-    , m_bIsBigEndian(false)
-{
-    m_refCount = 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-LuaCompiler::~LuaCompiler()
-{
-}
-
-////////////////////////////////////////////////////////////
-string LuaCompiler::GetOutputFileNameOnly() const
-{
-    return PathHelpers::RemoveExtension(m_CC.m_sourceFileNameOnly) + ".lua";
-}
-
-////////////////////////////////////////////////////////////
-string LuaCompiler::GetOutputPath() const
-{
-    return PathHelpers::Join(m_CC.GetOutputFolder(), GetOutputFileNameOnly());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void LuaCompiler::Release()
-{
-    if (--m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-ICompiler* LuaCompiler::CreateCompiler()
-{
-    // Only ever return one compiler, since we don't support multithreading. Since
-    // the compiler is just this object, we can tell whether we have already returned
-    // a compiler by checking the ref count.
-    if (m_refCount >= 2)
-    {
-        return 0;
-    }
-
-    // Until we support multithreading for this convertor, the compiler and the
-    // convertor may as well just be the same object.
-    ++m_refCount;
-    return this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool LuaCompiler::Process()
-{
-    string sourceFile = m_CC.GetSourcePath();
-    string outputFile = GetOutputPath();
-    std::replace(sourceFile.begin(), sourceFile.end(), '/', '\\');
-    std::replace(outputFile.begin(), outputFile.end(), '/', '\\');
-
-    if (!m_CC.m_bForceRecompiling && UpToDateFileHelpers::FileExistsAndUpToDate(GetOutputPath(), m_CC.GetSourcePath()))
-    {
-        // The file is up-to-date
-        m_CC.m_pRC->AddInputOutputFilePair(m_CC.GetSourcePath(), GetOutputPath());
-        return true;
-    }
-
-    bool ok = false;
-
-    const bool isPlatformBigEndian = m_CC.m_pRC->GetPlatformInfo(m_CC.m_platform)->bBigEndian;
-
-    m_bIsDumping = true;
-    m_bIsStripping = true;
-    m_bIsBigEndian = isPlatformBigEndian;
-    m_sInFilename = sourceFile;
-    m_sOutFilename = outputFile;
-
-    lua_State* L = luaL_newstate();
-
-    if (L)
-    {
-        lua_pushcfunction(L, pmain);
-        lua_pushlightuserdata(L, this);
-
-        if (lua_pcall(L, 1, 0, 0) == 0)
-        {
-            ok = true;
-        }
-        else
-        {
-            RCLogError(lua_tostring(L, -1));
-        }
-
-        lua_close(L);
-    }
-    else
-    {
-        RCLogError("Not enough memory for lua state");
-    }
-
-    if (ok)
-    {
-        if (!UpToDateFileHelpers::SetMatchingFileTime(GetOutputPath(), m_CC.GetSourcePath()))
-        {
-            return false;
-        }
-        m_CC.m_pRC->AddInputOutputFilePair(m_CC.GetSourcePath(), GetOutputPath());
-    }
-
-    return ok;
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/LuaCompiler.h b/Code/Tools/RC/ResourceCompilerPC/LuaCompiler.h
deleted file mode 100644
index f1d8b1513b..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/LuaCompiler.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_LUACOMPILER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_LUACOMPILER_H
-#pragma once
-
-
-#include "IConvertor.h"
-
-struct ConvertContext;
-
-class LuaCompiler
-    : public IConvertor
-    , public ICompiler
-{
-public:
-    LuaCompiler();
-    ~LuaCompiler();
-
-    // IConvertor methods.
-    virtual ICompiler* CreateCompiler();
-    virtual const char* GetExt(int index) const { return (index == 0) ? "lua" : 0; }
-
-    // ICompiler methods.
-    virtual void BeginProcessing([[maybe_unused]] const IConfig* config) { }
-    virtual void EndProcessing() { }
-    virtual IConvertContext* GetConvertContext() { return &m_CC; }
-    virtual bool Process();
-
-    // ICompiler + IConvertor methods.
-    void Release();
-
-public:
-    bool IsDumping() const { return m_bIsDumping; }
-    bool IsStripping() const { return m_bIsStripping; }
-    bool IsBigEndian() const { return m_bIsBigEndian; }
-    const char* GetInFilename() const { return m_sInFilename.c_str(); }
-    const char* GetOutFilename() const { return m_sOutFilename.c_str(); }
-
-private:
-    string GetOutputFileNameOnly() const;
-    string GetOutputPath() const;
-
-private:
-    int m_refCount;
-
-private:
-    bool m_bIsDumping;          /* dump bytecodes? */
-    bool m_bIsStripping;            /* strip debug information? */
-    bool m_bIsBigEndian;
-    string m_sInFilename;
-    string m_sOutFilename;
-    ConvertContext m_CC;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_LUACOMPILER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/PhysWorld.h b/Code/Tools/RC/ResourceCompilerPC/PhysWorld.h
deleted file mode 100644
index e2cef84b98..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/PhysWorld.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_PHYSWORLD_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_PHYSWORLD_H
-#pragma once
-
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_PHYSWORLD_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/Platform/Common/Clang/resourcecompilerpc_clang.cmake b/Code/Tools/RC/ResourceCompilerPC/Platform/Common/Clang/resourcecompilerpc_clang.cmake
deleted file mode 100644
index 61ea1d9cd0..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Platform/Common/Clang/resourcecompilerpc_clang.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_OPTIONS PRIVATE -fexceptions)
diff --git a/Code/Tools/RC/ResourceCompilerPC/Platform/Common/MSVC/resourcecompilerpc_msvc.cmake b/Code/Tools/RC/ResourceCompilerPC/Platform/Common/MSVC/resourcecompilerpc_msvc.cmake
deleted file mode 100644
index 5e03ba77cb..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Platform/Common/MSVC/resourcecompilerpc_msvc.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_COMPILE_OPTIONS PRIVATE /EHsc)
diff --git a/Code/Tools/RC/ResourceCompilerPC/Platform/Linux/platform_linux.cmake b/Code/Tools/RC/ResourceCompilerPC/Platform/Linux/platform_linux.cmake
deleted file mode 100644
index aadbfe9789..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Platform/Linux/platform_linux.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-
diff --git a/Code/Tools/RC/ResourceCompilerPC/Platform/Mac/platform_mac.cmake b/Code/Tools/RC/ResourceCompilerPC/Platform/Mac/platform_mac.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Platform/Mac/platform_mac.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/Tools/RC/ResourceCompilerPC/Platform/Windows/platform_windows.cmake b/Code/Tools/RC/ResourceCompilerPC/Platform/Windows/platform_windows.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Platform/Windows/platform_windows.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/Code/Tools/RC/ResourceCompilerPC/RenderMeshBuilder.cpp b/Code/Tools/RC/ResourceCompilerPC/RenderMeshBuilder.cpp
deleted file mode 100644
index 747a3dfff3..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/RenderMeshBuilder.cpp
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "RenderMeshBuilder.h"
-#include "StlUtils.h"
-#include "NvTriStrip/NvTriStrip.h"
-
-// constructs everything for the render mesh out of the given mesh
-void CRenderMeshBuilder::build (const CryChunkedFile::MeshDesc* pMeshDesc)
-{
-    clear();
-    m_pMeshDesc = pMeshDesc;
-    // build the tangent bases
-    MeshProxy Proxy;
-    Proxy.init(pMeshDesc);
-    m_TangBaseBuilder.CalculateTangentSpace (Proxy);
-
-    buildExtToIntMaps();
-
-    // create the m_arrMtlFaces: the faces are sorted and perhaps
-    // degraded faces are deleted
-    buildMtlFaces();
-
-    // create the indices and the array m_arrMaterials
-    buildIndexBuffer();
-
-    // optimize the final vertex buffer spacial locality
-    remapIndicesForVBCache();
-
-    //selfValidate();
-}
-
-// increases all indices of materials by the given offset
-void CRenderMeshBuilder::addMaterialOffset (unsigned nOffset)
-{
-    for (MaterialGroupArray::iterator it = m_arrPrimGroups.begin(); it != m_arrPrimGroups.end(); ++it)
-    {
-        it->nMaterial += nOffset;
-    }
-}
-
-// cleans up the object
-void CRenderMeshBuilder::clear()
-{
-    m_arrIndices.clear();
-    m_arrPrimGroups.clear();
-    m_arrExtTangMap.clear();
-    m_arrExtUVMap.clear();
-    m_arrExtTangents.clear();
-    m_arrMtlFaces.clear();
-    m_arrExtFaces.clear();
-    m_mapVUVP.clear();
-    m_arrExtToTBBMap.clear();
-    m_pMeshDesc = NULL;
-}
-
-
-// returns the number of vertices in the resulting vertex buffer
-unsigned CRenderMeshBuilder::numVertices() const
-{
-    // the number of external tangent bases determine this, because the
-    // tangent base calculation algorithm completely splits all the necessary
-    // vertices, so that the vertex buffer can be formed
-    return m_arrExtTangents.size();
-}
-
-// prepares the m_arrExtTangents, m_arrExtToTBBMap, m_arrExtTangMap and m_arrExtUVMap
-void CRenderMeshBuilder::prepareExtToIntMapping ()
-{
-    unsigned numTBBTangents = m_TangBaseBuilder.GetBaseCount();
-    unsigned numTBBTangents_Reserve = numTBBTangents * 9 / 7;
-    // prepare ext->TBB and the table of actual tangents
-    m_arrExtToTBBMap.reserve (numTBBTangents_Reserve);
-    //m_arrExtToTBBMap.resize (numTBBTangents);
-    m_arrExtTangents.reserve (numTBBTangents_Reserve);
-    //m_arrExtTangents.resize (numTBBTangents);
-    //for (i = 0; i < numTBBTangents; ++i)
-    //{
-    //  m_arrExtToTBBMap[i] = i;
-    //  TangData& rBase = m_arrExtTangents[i];
-    //  m_TangBaseBuilder.GetBase(i, &rBase.tangent.x, &rBase.binormal.x, &rBase.tnormal.x);
-    //}
-
-    // create the indexation map new->old
-    m_arrExtTangMap.reserve(numTBBTangents_Reserve);
-    //m_arrExtTangMap.resize (numTBBTangents,-1);
-    if (m_pMeshDesc->numTexFaces())
-    {
-        m_arrExtUVMap.reserve(numTBBTangents_Reserve);
-        //m_arrExtUVMap.resize (numTBBTangents, -1);
-    }
-
-    m_arrExtFaces.reserve (m_pMeshDesc->numFaces());
-}
-
-
-// adds an entry to all required maps - m_arrExtTangents, m_arrExtToTBBMap, m_arrExtTangMap and m_arrExtUVMap
-bool CRenderMeshBuilder::addExtToIntMapEntry (DWORD FaceExt[3], const CryFace& FaceInt, const CryTexFace& TexFaceInt)
-{
-    unsigned numTBBTangents = m_TangBaseBuilder.GetBaseCount();
-    assert (m_arrExtTangMap.size() == m_arrExtUVMap.size() || m_arrExtUVMap.empty());
-    assert (m_arrExtTangMap.size() == m_arrExtTangents.size());
-
-    CryFace NewExtFace = FaceInt;
-
-    if (FaceExt[0] == FaceExt[1] || FaceExt[1] == FaceExt[2] || FaceExt[2] == FaceExt[0])
-    {
-        return false;
-    }
-
-    for (unsigned i = 0; i < 3; ++i)
-    {
-        VertexUVPair VUVPair((ushort)FaceInt[i], (ushort)TexFaceInt[i], (ushort)FaceExt[i]);
-        VertexUVPairMap::iterator itVUVPair = m_mapVUVP.find (VUVPair);
-        unsigned nExtEntry;
-        if (itVUVPair == m_mapVUVP.end())
-        {
-            // no such pair, add a new one.
-            nExtEntry = m_arrExtTangents.size();
-            TangData rBase;
-            m_TangBaseBuilder.GetBase (FaceExt[i], &rBase.tangent.x, &rBase.binormal.x, &rBase.tnormal.x);
-            AdjustBase(rBase);
-            m_arrExtTangents.push_back (rBase);
-
-            m_arrExtTangMap.push_back(FaceInt[i]);
-            m_arrExtToTBBMap.push_back((ushort)FaceExt[i]);
-            if (m_pMeshDesc->numTexFaces())
-            {
-                m_arrExtUVMap.push_back(TexFaceInt[i]);
-            }
-            m_mapVUVP.insert (VertexUVPairMap::value_type(VUVPair, nExtEntry));
-        }
-        else
-        {
-            // there's already such a pair, use it
-            nExtEntry = itVUVPair->second;
-        }
-
-        NewExtFace[i] = nExtEntry;
-    }
-
-    assert(!NewExtFace.isDegenerate());
-    m_arrExtFaces.push_back(NewExtFace);
-    return true;
-}
-
-
-
-// creates the mapping from the external to internal indices
-void CRenderMeshBuilder::buildExtToIntMaps()
-{
-    unsigned i, numTBBTangents = m_TangBaseBuilder.GetBaseCount();
-    prepareExtToIntMapping();
-
-    unsigned numDegenerate = 0;
-
-    CryTexFace TexFaceInt (0, 0, 0);
-    DWORD FaceExt[3];
-    for (i = 0; i < m_pMeshDesc->numFaces(); ++i)
-    {
-        // internal indexation face
-        const CryFace& FaceInt = m_pMeshDesc->pFaces[i];
-        // external indexation face
-
-        m_TangBaseBuilder.GetTriangleBaseIndices(i, FaceExt);
-
-        if (m_pMeshDesc->numTexFaces())
-        {
-            TexFaceInt = m_pMeshDesc->pTexFaces[i];
-        }
-
-        if (!addExtToIntMapEntry (FaceExt, FaceInt, TexFaceInt))
-        {
-            ++numDegenerate;
-            continue; // degenerate face
-        }
-
-#ifdef _DEBUG
-        CryFace& NewExtFace = m_arrExtFaces.back();
-        for (int j = 0; j < 3; ++j)
-        {
-            assert (m_arrExtUVMap[NewExtFace[j]] == TexFaceInt[j]);
-            assert (m_arrExtTangMap[NewExtFace[j]] == FaceInt[j]);
-        }
-#endif
-    }
-    if (numDegenerate)
-    {
-        LogWarning("%u degenerate faces (skipped)", numDegenerate);
-    }
-}
-
-
-// calculate the number of elements == nEl
-
-
-// create the indices and the array m_arrMaterials
-
-// Create the m_arrMtlFaces
-// degraded faces are deleted
-void CRenderMeshBuilder::buildMtlFaces()
-{
-    unsigned nFace, numExtFaces = m_arrExtFaces.size();
-    // pass 1: calculate each material's number of faces, and the number of materials
-    // SKIPPED NOW
-    const unsigned nMaxMatID = 0x400;
-    // pass 2: create the face groups and reserve space for the faces
-    m_arrMtlFaces.reserve (nMaxMatID / 4);
-
-    unsigned numSkippedFaces = 0;
-
-    // pass 3: create the faces in the face groups
-    for (nFace = 0; nFace < numExtFaces; ++nFace)
-    {
-        // external indexation face
-        const CryFace& rExtFace = m_arrExtFaces[nFace];
-
-        int nMatID = rExtFace.MatID;
-        // material id of the face to count
-        if (nMatID < 0 || nMatID > nMaxMatID)
-        {
-            ++numSkippedFaces;
-            continue;
-        }
-        assert (!rExtFace.isDegenerate());
-        if (m_arrMtlFaces.size() <= (unsigned)nMatID)
-        {
-            m_arrMtlFaces.resize (nMatID + 1);
-        }
-        m_arrMtlFaces[nMatID].push_back (Face(rExtFace));
-    }
-
-    if (numSkippedFaces)
-    {
-        LogWarning ("%d faces skipped: no material or material id is out of range", numSkippedFaces);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// create the indices and the array m_arrMaterials out of m_arrMtlFaces
-void CRenderMeshBuilder::buildIndexBuffer()
-{
-    m_arrIndices.reserve (m_pMeshDesc->numFaces() * 3);
-    SetListsOnly (true);
-
-    for (unsigned nMaterial = 0; nMaterial < m_arrMtlFaces.size(); ++nMaterial)
-    {
-        const FaceArray& arrFaces = m_arrMtlFaces[nMaterial];
-        if (arrFaces.empty())
-        {
-            continue;
-        }
-
-        PrimitiveGroup* pGroup = NULL;
-        unsigned short numGroups = 0;
-        GenerateStrips((unsigned short*)&arrFaces[0], arrFaces.size() * 3, &pGroup, &numGroups);
-
-        for (unsigned nGroup = 0; nGroup < numGroups; ++nGroup)
-        {
-            appendNvidiaStrip (pGroup[nGroup], nMaterial);
-        }
-
-        delete[numGroups] pGroup;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// remaps (transposes, permutates) the indices to improve spatial locality of the vertex buffer
-void CRenderMeshBuilder::remapIndicesForVBCache()
-{
-    // this is the old->new indexation
-    std::vector<unsigned> arrVCache;
-    arrVCache.resize (m_arrExtTangents.size(), -1);
-    unsigned nNextVertex = 0;
-    for (unsigned i = 0; i < m_arrIndices.size(); ++i)
-    {
-        ushort nVertex = m_arrIndices[i];
-        if (arrVCache[nVertex] == -1)
-        {
-            // we've met this vertex for the first time
-            arrVCache[nVertex] = nNextVertex++;
-        }
-    }
-
-    remapExtIndices(&arrVCache[0], nNextVertex);
-}
-
-// permutate the contents of the array with a permutation old->new
-template <class T>
-void Permutate (std::vector<T>& arrOld, unsigned* pPermutation, unsigned newSize)
-{
-    assert (newSize <= arrOld.size());
-    std::vector<T> arrNew;
-    arrNew.resize (newSize);
-    for (unsigned nEntry = 0; nEntry < arrOld.size(); ++nEntry)
-    {
-        if (pPermutation[nEntry] < arrNew.size())
-        {
-            arrNew[pPermutation[nEntry]] = arrOld[nEntry];
-        }
-        else
-        {
-            assert (pPermutation[nEntry] == -1);
-        }
-    }
-    arrOld.swap(arrNew);
-}
-
-
-// remaps external indices according to the given permutation old->new
-void CRenderMeshBuilder::remapExtIndices (unsigned* pPermutation, unsigned numNewVertices)
-{
-    unsigned numVertices = this->numVertices();
-    // remap the indices
-    for (unsigned nIndex = 0; nIndex < m_arrIndices.size(); ++nIndex)
-    {
-        assert (m_arrIndices[nIndex] < numVertices);
-        m_arrIndices[nIndex] = pPermutation[m_arrIndices[nIndex]];
-        assert (m_arrIndices[nIndex] < numNewVertices);
-    }
-
-    for (unsigned nFace = 0; nFace < m_arrExtFaces.size(); ++nFace)
-    {
-        m_arrExtFaces[nFace].v0 = pPermutation[m_arrExtFaces[nFace].v0];
-        m_arrExtFaces[nFace].v1 = pPermutation[m_arrExtFaces[nFace].v1];
-        m_arrExtFaces[nFace].v2 = pPermutation[m_arrExtFaces[nFace].v2];
-    }
-
-    // remap the ExtToInt mappings
-    assert (m_arrExtTangMap.size() == numVertices);
-    Permutate(m_arrExtTangMap, pPermutation, numNewVertices);
-
-    if (m_pMeshDesc->numTexFaces())
-    {
-        assert (m_arrExtUVMap.size() == numVertices);
-        Permutate(m_arrExtUVMap, pPermutation, numNewVertices);
-    }
-
-    assert (m_arrExtTangents.size() == numVertices);
-    // remap the tangent bases
-    Permutate(m_arrExtTangents, pPermutation, numNewVertices);
-    assert (m_arrExtTangents.size() == numNewVertices);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// add the primitive group(s) and indices (m_arrPrimGroups and m_arrIndices)
-// from the given primitives generated by Nvidia Stripifier
-void CRenderMeshBuilder::appendNvidiaStrip (const struct PrimitiveGroup& rGroup, unsigned nMaterial)
-{
-    int j;
-
-    // in case we'll add this material group, collect info in it
-    MaterialGroup MatGroup;
-    MatGroup.nMaterial  = nMaterial;
-    MatGroup.nIndexBase = m_arrIndices.size();
-    MatGroup.numIndices = 0;
-
-    for (int nIndex = 0; nIndex < (int)rGroup.numIndices - 2; )
-    {
-        int v[3];
-        unsigned short* src = rGroup.indices + nIndex;
-        switch (rGroup.type)
-        {
-        case PT_LIST:
-            v[0] = src[0];
-            v[1] = src[1];
-            v[2] = src[2];
-            nIndex += 3;
-            break;
-        case PT_STRIP:
-            if (nIndex & 1)
-            {
-                v[0] = src[1];
-                v[1] = src[0];
-                v[2] = src[2];
-            }
-            else
-            {
-                v[0] = src[0];
-                v[1] = src[1];
-                v[2] = src[2];
-            }
-            nIndex += 1;
-            break;
-        case PT_FAN:
-            v[0] = rGroup.indices[0];
-            v[1] = src[1];
-            v[2] = src[2];
-            break;
-        }
-        if (v[0] == v[1] || v[1] == v[2] || v[2] == v[0])
-        {
-            continue;
-        }
-
-        MatGroup.numIndices += 3;
-        for (j = 0; j < 3; ++j)
-        {
-            m_arrIndices.push_back(v[j]);
-        }
-    }
-
-    if (MatGroup.numIndices)
-    {
-        // there were some triangles - add a new group or append those triangles to the previous group
-        if (!m_arrPrimGroups.empty() && m_arrPrimGroups.back().nMaterial == nMaterial)
-        {
-            m_arrPrimGroups.back().numIndices += MatGroup.numIndices;
-        }
-        else
-        {
-            m_arrPrimGroups.push_back(MatGroup);
-        }
-    }
-}
-
-
-void CRenderMeshBuilder::selfValidate()
-{
-    assert (m_arrExtFaces.size() <= m_pMeshDesc->numFaces());
-    unsigned numFaces = m_arrExtFaces.size();
-    for (unsigned nFace = 0; nFace < numFaces; ++nFace)
-    {
-        CryFace ExtFace = m_arrExtFaces[nFace];
-        CryFace IntFace = m_pMeshDesc->pFaces[nFace];
-        CryTexFace TexFace = m_pMeshDesc->pTexFaces[nFace];
-
-        for (int i = 0; i < 3; ++i)
-        {
-            // this is only applicable to a normal manifold mesh
-            assert (m_arrExtUVMap[ExtFace[i]] == TexFace[i]);
-            assert (m_arrExtTangMap[ExtFace[i]] == IntFace[i]);
-        }
-    }
-}
-
-// adjusts the base - converts from Martin's algorithm's requirements to the engine requirements
-void CRenderMeshBuilder::AdjustBase(TangData& rBase)
-{
-    /*
-        float fBinormal = rBase.binormal * rBase.tnormal;
-        float fTangent = rBase.tangent * rBase.tnormal;
-        assert (fabs(fBinormal) < 1e-2 && fabs(fTangent) < 1e-2);
-    /*  // normalize the normal
-        float fEpsilon = 0.0005f;
-        float fSqrt1_2 = 0.70710678118654752440084436210485f; // square root of 1/2
-        float fNormalLen = rBase.tnormal.GetLength();
-        if (fNormalLen < fEpsilon)
-            rBase.tnormal /= fNormalLen;
-        rBase.tnormal /= fNormalLen;
-
-        // make the bisect that
-        Vec3 vBisect = rBase.binormal+rBase.tangent;
-        vBisect -= (vBisect * rBase.tnormal) * rBase.tnormal; // make it orthogonal to the normal
-        float fBisectLen = vBisect.GetLength();
-        if (fBisectLen < fEpsilon)
-            return;
-        vBisect /= fBisectLen;
-
-        Vec3 vBase = vBisect ^ rBase.tnormal;
-
-        if (rBase.binormal * vBase > rBase.tangent * vBase)
-        {
-            assert (rBase.binormal * vBase > 0 && rBase.tangent * vBase < 0);
-            rBase.binormal = (vBisect + vBase) * fSqrt1_2;
-            rBase.tangent  = (vBisect - vBase) * fSqrt1_2;
-        }
-        else
-        {
-            assert (rBase.binormal * vBase < 0 && rBase.tangent * vBase > 0);
-            rBase.binormal = (vBisect - vBase) * fSqrt1_2;
-            rBase.tangent  = (vBisect + vBase) * fSqrt1_2;
-        }
-        */
-    //std::swap(rBase.binormal, rBase.tangent);
-    rBase.binormal = -rBase.binormal;
-}
-
-void CRenderMeshBuilder::MeshProxy::GetPos(const DWORD indwPos, float outfPos[3]) const
-{
-    const Vec3 ptPos = m_pMeshDesc->pVertices[indwPos].p;
-    // unrotate the object
-    for (int i = 0; i < 3; ++i)
-    {
-        outfPos[i] = m_tm(0, i) * ptPos.x + m_tm(1, i) * ptPos.y + m_tm(2, i) * ptPos.z;
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/RenderMeshBuilder.h b/Code/Tools/RC/ResourceCompilerPC/RenderMeshBuilder.h
deleted file mode 100644
index fc07a1fefb..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/RenderMeshBuilder.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// This is the class that makes a renderable (stripified) vertex/index buffers
-// and tangent bases out of a CGF mesh
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_RENDERMESHBUILDER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_RENDERMESHBUILDER_H
-#pragma once
-
-
-#include "CryChunkedFile.h"
-#include "TangentSpaceCalculation.h"
-#include "CryCompiledFile.h"
-
-// Calculates tangent spaces
-// Builds index buffer (stripifies), material group array, ext-to-int map.
-class CRenderMeshBuilder
-{
-public:
-    // constructs everything for the render mesh out of the given mesh
-    void build (const CryChunkedFile::MeshDesc* pMeshDesc);
-    // increases all indices of materials by the given offset
-    void addMaterialOffset (unsigned nOffset);
-    // cleans up the object
-    void clear();
-
-    // this error class is thrown from the constructor when the object can't be constructed
-    class Error
-    {
-    public:
-        Error(const char* szDesc)
-            : m_szDesc(szDesc){}
-        const char* c_str() const{return m_szDesc; }
-    protected:
-        const char* m_szDesc;
-    };
-
-    // returns the number of vertices in the resulting vertex buffer
-    unsigned numVertices() const;
-
-    // face/vertex index type
-    typedef unsigned short ushort;
-
-    // this is the index buffer (external indexation)
-    std::vector<ushort> m_arrIndices;
-
-    // this array represents the groups of indices in the index buffer:
-    // each group has its own material id and number of elements (indices, i.e. number of faces * 3 in case of strip stripification)
-    typedef CCFMaterialGroup MaterialGroup;
-    typedef std::vector<MaterialGroup> MaterialGroupArray;
-    MaterialGroupArray m_arrPrimGroups;
-
-    // this is the mapping from new indices to original
-    std::vector<ushort> m_arrExtTangMap;
-
-    // this is the mapping from new indices to original UV indices
-    // in the original CGF, texture and geometric mesh (faces/tex faces) are
-    // different (tex face indices are not necessarily the same as face indices),
-    // this is why the ExtToInt map doesn't coincide with this ExtUVMap
-    std::vector<ushort> m_arrExtUVMap;
-
-    // these are the tangent bases (external indexation)
-    std::vector<TangData> m_arrExtTangents;
-
-#pragma pack(push,2)
-    // this is a group of faces, as they will be inside a group (material)
-    struct Face
-    {
-        ushort v[3];
-        Face(){}
-        Face(ushort v0, ushort v1, ushort v2)
-        {
-            v[0] = v0;
-            v[1] = v1;
-            v[2] = v2;
-        }
-        Face (const CryFace& rFace)
-        {
-            v[0] = rFace.v0;
-            v[1] = rFace.v1;
-            v[2] = rFace.v2;
-        }
-        Face (DWORD src[3])
-        {
-            v[0] = (ushort)src[0];
-            v[1] = (ushort)src[1];
-            v[2] = (ushort)src[2];
-        }
-        bool isDegenerate() const
-        {
-            return v[0] == v[1] || v[1] == v[2] || v[2] == v[0];
-        }
-    };
-#pragma pack(pop)
-
-    // WARNING: this array must be binary-compatible with the array of unsigned shorts
-    // passed to Nvidia Stripifier. external indexation
-    typedef std::vector<Face> FaceArray;
-
-    // this is the array of faces for each material
-    std::vector<FaceArray> m_arrMtlFaces;
-
-    // this is the actual array of faces, but in the final external indexation
-    std::vector<CryFace> m_arrExtFaces;
-protected:
-    // adjusts the base - converts from Martin's algorithm's requirements to the engine requirements
-    static void AdjustBase(TangData& rBase);
-
-    // creates the mapping from the external to internal indices
-    void buildExtToIntMaps();
-
-    // create m_arrMtlFaces; the degenerated faces are not included
-    void buildMtlFaces();
-
-    // create the indices and the array m_arrMaterials out of m_arrMtlFaces
-    void buildIndexBuffer();
-
-    // remaps (transposes, permutates) the indices to improve spatial locality of the vertex buffer
-    void remapIndicesForVBCache();
-
-    // remaps external indices according to the given permutation old->new
-    void remapExtIndices (unsigned* pPermutation, unsigned numNewTargets);
-
-    // prepares the m_arrExtTangents, m_arrExtToTBBMap, m_arrExtTangMap and m_arrExtUVMap
-    void prepareExtToIntMapping();
-
-    // adds an entry to all required maps - m_arrExtTangents, m_arrExtToTBBMap, m_arrExtTangMap and m_arrExtUVMap
-    bool addExtToIntMapEntry (DWORD FaceExt[3], const CryFace&FaceInt, const CryTexFace &TexFaceInt);
-
-protected:
-    // add the primitive group(s) and indices (m_arrPrimGroups and m_arrIndices)
-    // from the given primitives generated by Nvidia Stripifier
-    void appendNvidiaStrip (const struct PrimitiveGroup& Group, unsigned nMaterial);
-
-    void selfValidate();
-protected:
-
-    const CryChunkedFile::MeshDesc* m_pMeshDesc;
-
-    struct VertexUVPair
-    {
-        VertexUVPair(){}
-        VertexUVPair(ushort _nVertex, ushort _nTexVertex, ushort _nExtTangent)
-            : nVertex(_nVertex)
-            , nTexVertex (_nTexVertex)
-            , nExtTangent(_nExtTangent){}
-
-        bool operator <  (const VertexUVPair& right) const
-        {
-            return
-                nVertex < right.nVertex ? true:
-                nVertex > right.nVertex ? false :
-                nTexVertex < right.nTexVertex? true:
-                nTexVertex > right.nTexVertex ? false :
-                nExtTangent < right.nExtTangent;
-        }
-
-        ushort nVertex; // vertex in internal indexation
-        ushort nTexVertex; // texture vertex (UV) in internal indexation
-        ushort nExtTangent; // vertex in TBB indexation, or tangent in the array of tangents generated by TBB
-    };
-
-    // this is the map from the vertex-uv pair to the index of the
-    // temporary vertex mapping in this->arrVertMap;
-    typedef std::map <VertexUVPair, ushort> VertexUVPairMap;
-
-    //////////////////////////////////////////////////////////////////////////
-    // a proxy structure that gets passed to the tangent space calculation algorithm
-    struct MeshProxy
-    {
-    public:
-        MeshProxy ()
-        {
-            m_pMeshDesc = NULL;
-        }
-
-        // creates temporary mapping for splitting the vertices
-        // with different UVs
-        void init (const CryChunkedFile::MeshDesc* pMeshDesc)
-        {
-            m_pMeshDesc = pMeshDesc;
-            Matrix34 tm;
-            const float* pMat = &m_pMeshDesc->pNode->pDesc->tm[0][0];
-            tm.SetFromVectors(
-                Vec3(pMat[ 0], pMat[ 1], pMat[ 2]),
-                Vec3(pMat[ 4], pMat[ 5], pMat[ 6]),
-                Vec3(pMat[ 8], pMat[ 9], pMat[10]),
-                Vec3(pMat[12], pMat[13], pMat[14]));
-            m_tm = tm;
-        }
-
-        DWORD GetTriangleCount(void) const
-        {
-            return m_pMeshDesc->numFaces();
-        }
-
-        void GetTriangleIndices(const DWORD indwTriNo, DWORD outdwPos[3], DWORD outdwNorm[3], DWORD outdwUV[3]) const
-        {
-            const CryFace& rFace = m_pMeshDesc->pFaces[indwTriNo];
-            outdwNorm[0] = outdwPos[0] = rFace.v0;
-            outdwNorm[1] = outdwPos[1] = rFace.v1;
-            outdwNorm[2] = outdwPos[2] = rFace.v2;
-            if (m_pMeshDesc->numTexFaces())
-            {
-                const CryTexFace& rTexFace = m_pMeshDesc->pTexFaces[indwTriNo];
-                outdwUV[0] = rTexFace.t0;
-                outdwUV[1] = rTexFace.t1;
-                outdwUV[2] = rTexFace.t2;
-            }
-            else
-            {
-                outdwUV[0] = outdwUV[1] = outdwUV[2] = 0;
-            }
-        }
-
-        void GetPos(const DWORD indwPos, float outfPos[3]) const;
-
-        void GetUV (const DWORD indwPos, float outfUV[2]) const
-        {
-            const CryUV& uv = m_pMeshDesc->pUVs[indwPos];
-            outfUV[0] = uv.u;
-            outfUV[1] = uv.v;
-        }
-
-        std::vector<VertexUVPair> arrVertMap;
-    protected:
-        const CryChunkedFile::MeshDesc* m_pMeshDesc;
-        Matrix34 m_tm;
-    };
-
-    CTangentSpaceCalculation<MeshProxy> m_TangBaseBuilder;
-
-    // this mapping gives the ext->tang ext mapping, i.e.
-    // maps from the final external indexation (that's found in
-    // m_arrExtTangMap, m_arrExtUVMap, m_arrExtTangents)
-    // to the tangent base indexation in m_TangBaseBuilder
-    // (GetBaseCount, GetTriangleBaseIndices, GetBase)
-    std::vector<ushort> m_arrExtToTBBMap;
-
-    // this is used during construction of the external maps to quickly find
-    // corresponding vertex-uv pairs and avoid collisions
-    // the vertex-uv indices are in internal indexations of vertices and UVs
-    VertexUVPairMap m_mapVUVP;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_RENDERMESHBUILDER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC.cpp b/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC.cpp
deleted file mode 100644
index e23ddcfbbc..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "CryAssert_impl.h"
-#include "StatCGFCompiler.h"
-#include "ChunkCompiler.h"
-#include "LuaCompiler.h"
-#include "CGF/AssetWriter.h"
-#include "../../CryXML/ICryXML.h"
-#include <AzCore/Module/Environment.h>
-#include <AzCore/Utils/Utils.h>
-#include <CryLibrary.h>
-#include <ResourceCompiler/ResourceCompiler.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>    // HANDLE
-#endif
-
-#include "ResourceCompilerPC.h"
-
-static HMODULE g_hInst;
-
-static AssetWriter g_AssetWriter;
-
-#if defined(AZ_PLATFORM_WINDOWS) && !defined(AZ_MONOLITHIC_BUILD)
-BOOL APIENTRY DllMain(
-    HANDLE hModule,
-    DWORD  ul_reason_for_call,
-    [[maybe_unused]] LPVOID lpReserved)
-{
-    switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
-        g_hInst = (HMODULE)hModule;
-        break;
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-#endif
-
-extern "C" DLL_EXPORT void __stdcall RegisterConvertors(IResourceCompiler* const pRC)
-{
-    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-
-    SetRCLog(pRC->GetIRCLog());
-
-    pRC->RegisterConvertor("StatCGFCompiler", new CStatCGFCompiler());
-
-    pRC->RegisterConvertor("ChunkCompiler", new CChunkCompiler());
-
-    pRC->RegisterConvertor("LuaCompiler", new LuaCompiler());
-
-    pRC->SetAssetWriter(&g_AssetWriter);
-
-    ICryXML* const pCryXML = LoadICryXML();
-
-    if (pCryXML == 0)
-    {
-        RCLogError("Loading xml library failed - not registering collada converter.");
-    }
-
-    pRC->RegisterKey("createmtl", "[DAE] 0=don't create .mtl files (default), 1=create .mtl files");
-
-    pRC->RegisterKey("file", "animation file for processing");
-    pRC->RegisterKey("dest", "destination folder for the results\n"
-        "OBSOLETE. Use 'targetroot' pointing to folder with .cba file instead.");
-    pRC->RegisterKey("report", "report mode");
-    pRC->RegisterKey("dcc", "the name of the dcc that called the rc.");
-    pRC->RegisterKey("dccv", "the version of the dcc that called the rc.");
-    pRC->RegisterKey("SkipDba", "skip build dba");
-    pRC->RegisterKey("animConfigFolder", "Path to a folder that contains SkeletonList.xml and DBATable.json");
-    pRC->RegisterKey("cbaUpdate", "Check for CBA-update only. Do not recompile CAF-s when CBA is up to date");
-    pRC->RegisterKey("checkloco",
-        "should be used with report mode.\n"
-        "Compare locomotion_locator motion with recalculated root motion");
-    pRC->RegisterKey("debugcompression", "[I_CAF] show per-bone compression values during CAF-compression");
-    pRC->RegisterKey("ignorepresets", "[I_CAF] do not apply compression presets");
-    pRC->RegisterKey("animSettingsFile", "File to use instead of the default animation settings file");
-    pRC->RegisterKey("cafAlignTracks", "[I_CAF] Apply padding to animation tracks to make the CAF suitable for in-place streaming");
-    pRC->RegisterKey("dbaStreamPrepare", "[DBA] Prepare DBAs so they can be streamed in-place");
-
-    pRC->RegisterKey("qtangents", "0=use vectors to represent tangent space(default), 1=use quaternions");
-
-    pRC->RegisterKey("vertexPositionFormat",
-        "[CGF] Format of mesh vertex positions:\n"
-        "f32 = 32-bit floating point (default)\n"
-        "f16 = 16-bit floating point\n"
-        "exporter = format specified in exporter\n");
-
-    pRC->RegisterKey("vertexIndexFormat",
-        "[CGF] Format of mesh vertex indices:\n"
-        "u32 = 32-bit unsigned integer (default)\n"
-        "u16 = 16-bit unsigned integer\n");
-
-    pRC->RegisterKey("debugdump", "[CGF] dump contents of source .cgf file instead of compiling it");
-    pRC->RegisterKey("debugvalidate", "[CGF, CHR] validate source file instead of compiling it");
-
-    pRC->RegisterKey("targetversion", "[chunk] Convert chunk file to the specified version\n"
-        "0x745 = chunk data contain chunk headers\n"
-        "0x746 = chunk data has no chunk headers (default)\n");
-
-    pRC->RegisterKey("StripMesh", "[CGF/CHR] Strip mesh chunks from output files\n"
-        "0 = No stripping\n"
-        "1 = Only strip mesh\n"
-        "3 = [CHR] Treat input as a skin file, stripping all unnecessary chunks (including mesh)\n"
-        "4 = [CHR] Treat input as a skel file, stripping all unnecessary chunks (including mesh)");
-    pRC->RegisterKey("StripNonMesh", "[CGF/CHR] Strip non mesh chunks from the output files");
-    pRC->RegisterKey("CompactVertexStreams",
-        "[CGF] Optimise vertex streams for streaming, by removing those that are unneeded for streaming,\n"
-        "and packing those streams that are left into the format used internally by the engine.");
-    // Confetti: Nicholas Baldwin
-    //    add option for outputting triangle strip mesh primitives for processors that prefer them.
-    pRC->RegisterKey("OptimizedPrimitiveType", "[CGF/CHR] Choose the preferred optimized mesh primitive type\n"
-        "0 = Forsyth Indexed Triangle Lists Algorithm (default)\n"
-        "1 = PowerVR Indexed Triangle Strips Lists Algorithm");
-    pRC->RegisterKey("ComputeSubsetTexelDensity", "[CGF] Compute per-subset texel density");
-    pRC->RegisterKey("SplitLODs", "[CGF] Auto split LODs into the separate files");
-
-    pRC->RegisterKey("maxWeightsPerVertex", "[CHR] Maximum number of weights per vertex (default is 4)");
-
-    pRC->RegisterKey("DegenerateFacesAreErrors", "If the meshcompiler finds a degenerate face, it is a suboptimal mesh. Should the we treat this as a warning or error.");
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC.h b/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC.h
deleted file mode 100644
index f0e28748c3..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_RESOURCECOMPILERPC_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_RESOURCECOMPILERPC_H
-#pragma once
-
-#include "IRCLog.h"
-#include "IResCompiler.h"
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_RESOURCECOMPILERPC_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC_precompiled.cpp b/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC_precompiled.cpp
deleted file mode 100644
index 4df250d328..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
diff --git a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC_precompiled.h b/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC_precompiled.h
deleted file mode 100644
index 5ab1f3cacb..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/ResourceCompilerPC_precompiled.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// StdAfx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-
-#pragma once
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <platform.h>
-
-typedef string tstring;
-
-#include <float.h>
-
-#include <memory>
-#include <set>
-#include <map>
-#include <vector>
-#include <algorithm>
-
-#include <stdio.h>
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some string constructors will be explicit
-
-#include "IXml.h"
-
-#include <Cry_Math.h>
-#include <Cry_Geo.h>
-#include <CryHeaders.h>
-#include <primitives.h>
-#include <smartptr.h>
-#include <physinterface.h>
-#include <CrySizer.h>
-
-#include "ResourceCompilerPC.h"
-
-#include "CryFile.h"
-
-#include <VertexFormats.h>
-
-#include "IRCLog.h"
-
diff --git a/Code/Tools/RC/ResourceCompilerPC/StatCGFCompiler.cpp b/Code/Tools/RC/ResourceCompilerPC/StatCGFCompiler.cpp
deleted file mode 100644
index 8e4dc87d07..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/StatCGFCompiler.cpp
+++ /dev/null
@@ -1,1260 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "ConvertContext.h"
-#include "IConfig.h"
-#include "StatCGFCompiler.h"
-
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/Asset/AssetSystemComponent.h>
-#include <AzCore/Memory/AllocatorManager.h>
-#include <AzCore/Memory/MemoryComponent.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/Utils/Utils.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserComponent.h>
-#include <AzFramework/TargetManagement/TargetManagementComponent.h>
-#include <AzToolsFramework/SourceControl/PerforceComponent.h>
-
-#include "../CryEngine/Cry3DEngine/CGF/CGFLoader.h"
-#include "CGF/CGFSaver.h"
-#include "CryVersion.h"
-#include "StaticObjectCompiler.h"
-#include "FileUtil.h"
-#include "MathHelpers.h"
-#include "StringHelpers.h"
-#include "UpToDateFileHelpers.h"
-
-AZ::ComponentTypeList CGFToolApplication::GetRequiredSystemComponents() const
-{
-    AZ::ComponentTypeList components = AzToolsFramework::ToolsApplication::GetRequiredSystemComponents();
-
-    auto removed = AZStd::remove_if(components.begin(), components.end(),
-        [](const AZ::Uuid& id) -> bool
-    {
-        return id == azrtti_typeid<AzFramework::TargetManagementComponent>()
-            || id == azrtti_typeid<AzToolsFramework::PerforceComponent>()
-            || id == azrtti_typeid<AZ::UserSettingsComponent>()
-            || id == azrtti_typeid<AzToolsFramework::AssetBrowser::AssetBrowserComponent>();
-    });
-    components.erase(removed, components.end());
-
-    return components;
-}
-
-void CGFToolApplication::SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations)
-{
-    AzToolsFramework::ToolsApplication::SetSettingsRegistrySpecializations(specializations);
-    specializations.Append("statcgfcompiler");
-}
-
-/////////////////////////////////////////////////////////////////////////
-CStatCGFCompiler::CStatCGFCompiler()
-{
-    //MessageBox(NULL, "Pres OK baton ->", "Ok?", MB_OK);
-
-    m_refCount = 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CStatCGFCompiler::~CStatCGFCompiler()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-string CStatCGFCompiler::GetOutputFileNameOnly() const
-{
-    string sourceFileFinal = m_CC.m_config->GetAsString("overwritefilename", m_CC.m_sourceFileNameOnly.c_str(), m_CC.m_sourceFileNameOnly.c_str());
-
-    if (StringHelpers::EqualsIgnoreCase(PathHelpers::FindExtension(sourceFileFinal), "i_cgf"))
-    {
-        sourceFileFinal = PathHelpers::ReplaceExtension(sourceFileFinal, "cgf");
-    }
-
-    const string ext = PathHelpers::FindExtension(sourceFileFinal);
-    if (StringHelpers::EqualsIgnoreCase(ext, "cgf") || StringHelpers::EqualsIgnoreCase(ext, "cga"))
-    {
-        if (m_CC.m_config->GetAsBool("StripNonMesh", false, true))
-        {
-            sourceFileFinal += "m";
-        }
-    }
-
-    return sourceFileFinal;
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZStd::string CStatCGFCompiler::GetDependencyAbsolutePath(const AZStd::string& fileName) const
-{
-    AZStd::string cgfSourcePath = PathHelpers::GetDirectory(m_CC.GetSourcePath().c_str()).c_str();
-    EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, cgfSourcePath);
-                        
-    // register the absolute path of the file as the dependency here, as the asset catalog will take care
-    //  of resolving it to its proper scan folder and path relative to that scan folder.
-    AZStd::string absoluteFilePath = fileName.c_str();
-    if (!cgfSourcePath.empty())
-    {
-        AzFramework::StringFunc::AssetDatabasePath::Join(cgfSourcePath.c_str(), fileName.c_str(), absoluteFilePath);
-        AzFramework::StringFunc::AssetDatabasePath::Normalize(absoluteFilePath);
-    }
-    return absoluteFilePath;
-}
-
-//////////////////////////////////////////////////////////////////////////
-string CStatCGFCompiler::GetOutputPath() const
-{
-    return PathHelpers::Join(m_CC.GetOutputFolder(), GetOutputFileNameOnly());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatCGFCompiler::Release()
-{
-    if (--m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-ICompiler* CStatCGFCompiler::CreateCompiler()
-{
-    // Only ever return one compiler, since we don't support multithreading. Since
-    // the compiler is just this object, we can tell whether we have already returned
-    // a compiler by checking the ref count.
-    if (m_refCount >= 2)
-    {
-        return 0;
-    }
-
-    // Until we support multithreading for this convertor, the compiler and the
-    // convertor may as well just be the same object.
-    ++m_refCount;
-    return this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-static string getTextMatrix(const Matrix34& M)
-{
-    string text = "";
-
-    char buff[200];
-
-    azsnprintf(buff, sizeof(buff), "axisX(%g %g %g)", M.m00, M.m10, M.m20);
-    text += buff;
-    azsnprintf(buff, sizeof(buff), " axisY(%g %g %g)", M.m01, M.m11, M.m21);
-    text += buff;
-    azsnprintf(buff, sizeof(buff), " axisZ(%g %g %g)", M.m02, M.m12, M.m22);
-    text += buff;
-    azsnprintf(buff, sizeof(buff), " trans(%g %g %g)", M.m03, M.m13, M.m23);
-    text += buff;
-
-    return text;
-}
-
-static const char* getTextNodeType(CNodeCGF::ENodeType const type)
-{
-    const char* text;
-
-    switch (type)
-    {
-    case CNodeCGF::NODE_HELPER:
-        text = "NODE_HELPER";
-        break;
-    case CNodeCGF::NODE_LIGHT:
-        text = "NODE_LIGHT";
-        break;
-    case CNodeCGF::NODE_MESH:
-        text = "NODE_MESH";
-        break;
-    default:
-        text = "***UNKNOWN***";
-        break;
-    }
-
-    return text;
-}
-
-static const char* getTextHelperType(HelperTypes const type)
-{
-    const char* text;
-
-    switch (type)
-    {
-    case HP_POINT:
-        text = "HP_POINT";
-        break;
-    case HP_DUMMY:
-        text = "HP_DUMMY";
-        break;
-    case HP_XREF:
-        text = "HP_XREF";
-        break;
-    case HP_CAMERA:
-        text = "HP_CAMERA";
-        break;
-    case HP_GEOMETRY:
-        text = "HP_GEOMETRY";
-        break;
-    default:
-        text = "*** UNKNOWN ***";
-        break;
-    }
-
-    return text;
-}
-
-static string getTextPhysicalizeType(int const type)
-{
-    string text;
-
-    switch (type)
-    {
-    case PHYS_GEOM_TYPE_NONE:
-        text += "PHYS_GEOM_TYPE_NONE";
-        break;
-    case PHYS_GEOM_TYPE_DEFAULT:
-        text += "PHYS_GEOM_TYPE_DEFAULT";
-        break;
-    case PHYS_GEOM_TYPE_NO_COLLIDE:
-        text += "PHYS_GEOM_TYPE_NO_COLLIDE";
-        break;
-    case PHYS_GEOM_TYPE_OBSTRUCT:
-        text += "PHYS_GEOM_TYPE_OBSTRUCT";
-        break;
-    case PHYS_GEOM_TYPE_DEFAULT_PROXY:
-        text += "PHYS_GEOM_TYPE_DEFAULT_PROXY";
-        break;
-    default:
-    {
-        text += "*** UNKNOWN ***";
-        char buff[50];
-        azsnprintf(buff, sizeof(buff), " (0x%x)", type);
-        text += buff;
-    }
-    break;
-    }
-
-    return text;
-}
-
-static string getTextPhysicalizeFlags(int const flags)
-{
-    string text;
-
-    switch (flags)
-    {
-    case 0:
-        text += "none";
-        break;
-    case CNodeCGF::ePhysicsalizeFlag_MeshNotNeeded:
-        text += "MeshNotNeeded";
-        break;
-    default:
-    {
-        text += "*** UNKNOWN ***";
-        char buff[50];
-        azsnprintf(buff, sizeof(buff), " (0x%x)", flags);
-        text += buff;
-    }
-    break;
-    }
-
-    return text;
-}
-
-bool CStatCGFCompiler::DebugDumpCGF(const char* sourceFileName, const char* outputFilePath)
-{
-    RCLog("Dumping geometry file %s...", sourceFileName);
-
-    class Listener
-        : public ILoaderCGFListener
-    {
-    public:
-        Listener()
-        {
-        }
-        virtual void Warning(const char* format)
-        {
-            RCLogWarning("%s", format);
-        }
-        virtual void Error(const char* format)
-        {
-            RCLogError("%s", format);
-        }
-    };
-
-    Listener listener;
-    CChunkFile chunkFile;
-    CLoaderCGF cgfLoader;
-    CContentCGF* pCGF = cgfLoader.LoadCGF(sourceFileName, chunkFile, &listener);
-
-    if (!pCGF)
-    {
-        RCLogError("Dump: Failed to load geometry file %s - %s", sourceFileName, cgfLoader.GetLastError());
-        return false;
-    }
-
-    if (pCGF->GetConsoleFormat())
-    {
-        RCLogError("Dump: Cannot dump geometry file %s because it's in console format.", sourceFileName);
-        delete pCGF;
-        return false;
-    }
-
-    string dumpFilename = outputFilePath;
-    dumpFilename += ".dump";    
-
-    char resolvedPath[AZ_MAX_PATH_LEN];
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(dumpFilename.c_str(), resolvedPath, AZ_MAX_PATH_LEN);
-
-    FILE* f = nullptr; 
-    azfopen(&f, resolvedPath, "wt");
-
-    if (f == 0)
-    {
-        RCLogError("Dump: Cannot create dump file %s.", resolvedPath);
-        delete pCGF;
-        return false;
-    }
-
-
-    fprintf(f, "<<< Dump of '%s' >>>\n", sourceFileName);
-    fprintf(f, "\n");
-
-    fprintf(f, "---------------------------------------------\n");
-    fprintf(f, "material#: %d\n", pCGF->GetMaterialCount());
-    fprintf(f, "\n");
-
-    std::vector<CMesh*> meshes;
-
-    for (int materialIdx = 0; materialIdx < pCGF->GetMaterialCount(); ++materialIdx)
-    {
-        fprintf(f, "material[%d]:\n", materialIdx);
-        const CMaterialCGF* pMat = pCGF->GetMaterial(materialIdx);
-
-        if (pMat == 0)
-        {
-            fprintf(f, "\t" "***NULL MATERIAL***");
-            continue;
-        }
-
-        fprintf(f, "\t" "name: '%s'\n", pMat->name);
-        fprintf(f, "\t" "nPhysicalizeType: %s\n", getTextPhysicalizeType(pMat->nPhysicalizeType).c_str());
-
-        fprintf(f, "\t" "subMaterials[]: size=%d, capacity=%d\n", pMat->subMaterials.size(), pMat->subMaterials.capacity());
-        for (int i = 0; i < pMat->subMaterials.size(); ++i)
-        {
-            CMaterialCGF* const pSubMat = pMat->subMaterials[i];
-
-            fprintf(f, "\t\t" "subMaterials[%d]: ", i);
-            if (pSubMat == 0)
-            {
-                fprintf(f, "NULL");
-            }
-            else
-            {
-                // Trying to find pSubMat in our materials
-                bool found = false;
-                for (int j = 0; j < pCGF->GetMaterialCount(); ++j)
-                {
-                    if (pSubMat == pCGF->GetMaterial(j))
-                    {
-                        found = true;
-                        fprintf(f, "material[%d] '%s'", j, pSubMat->name);
-                        break;
-                    }
-                }
-                if (!found)
-                {
-                    fprintf(f, "*** not in material[] *** '%s'", pSubMat->name);
-                }
-            }
-            fprintf(f, "\n");
-        }
-
-        fprintf(f, "\t" "internals:\n");
-        fprintf(f, "\t\t" "nChunkId: %d\n", pMat->nChunkId);
-
-        fprintf(f, "\n");
-    }
-    fprintf(f, "---------------------------------------------\n");
-
-    {
-        CMaterialCGF* pMat = pCGF->GetCommonMaterial();
-
-        fprintf(f, "\t" "pCommonMaterial: ");
-        if (pMat == 0)
-        {
-            fprintf(f, "NULL");
-        }
-        else
-        {
-            // Trying to find commonmaterial in our materials
-            bool found = false;
-            for (int j = 0; j < pCGF->GetMaterialCount(); ++j)
-            {
-                if (pMat == pCGF->GetMaterial(j))
-                {
-                    found = true;
-                    fprintf(f, "material[%d] '%s'", j, pMat->name);
-                    break;
-                }
-            }
-            if (!found)
-            {
-                fprintf(f, "*** not in material[] *** '%s'", pMat->name);
-            }
-        }
-        fprintf(f, "\n");
-    }
-
-    {
-        //const CPhysicalizeInfoCGF* pPhys = pCGF->GetPhysicalizeInfo();
-        fprintf(f, "\t" "PhysicalizeInfo: (not printed yet)\n");
-    }
-
-    {
-        //CExportInfoCGF* pExport = pCGF->GetExportInfo();
-        fprintf(f, "\t" "ExportInfo: (not printed yet)\n");
-    }
-
-    {
-        //CSkinningInfo* pSkin = pCGF->GetSkinningInfo();
-        fprintf(f, "\t" "SkinningInfo: (not printed yet)\n");
-    }
-
-    {
-        //SFoliageInfoCGF* pSkin = pCGF->GetFoliageInfo();
-        fprintf(f, "\t" "FoliageInfo: (not printed yet)\n");
-    }
-
-    fprintf(f, "---------------------------------------------\n");
-
-    fprintf(f, "node#: %d\n", pCGF->GetNodeCount());
-    fprintf(f, "\n");
-
-    for (int nodeIdx = 0; nodeIdx < pCGF->GetNodeCount(); ++nodeIdx)
-    {
-        fprintf(f, "node[%d]:\n", nodeIdx);
-        const CNodeCGF* pNode = pCGF->GetNode(nodeIdx);
-
-        if (pNode == 0)
-        {
-            fprintf(f, "\t" "***NULL NODE***");
-            continue;
-        }
-
-        fprintf(f, "\t" "type: %s\n", getTextNodeType(pNode->type));
-        fprintf(f, "\t" "name: '%s'\n", pNode->name);
-        fprintf(f, "\t" "properties: '%s'\n", pNode->properties.c_str());
-        fprintf(f, "\t" "localTM: %s\n", getTextMatrix(pNode->localTM).c_str());
-        fprintf(f, "\t" "worldTM: %s\n", getTextMatrix(pNode->worldTM).c_str());
-
-        fprintf(f, "\t" "pParent: ");
-        if (pNode->pParent == 0)
-        {
-            fprintf(f, "NULL");
-        }
-        else
-        {
-            // Trying to find pParent node in our nodes
-            bool found = false;
-            for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-            {
-                if (pNode->pParent == pCGF->GetNode(i))
-                {
-                    found = true;
-                    fprintf(f, "node[%d] '%s'", i, pNode->pParent->name);
-                    break;
-                }
-            }
-            if (!found)
-            {
-                fprintf(f, "*** not in node[] *** '%s'", pNode->pParent->name);
-            }
-        }
-        fprintf(f, "\n");
-
-        fprintf(f, "\t" "pSharedMesh: ");
-        if (pNode->pSharedMesh == 0)
-        {
-            fprintf(f, "NULL");
-        }
-        else
-        {
-            // Trying to find pSharedMesh node in our nodes
-            bool found = false;
-            for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-            {
-                if (pNode->pSharedMesh == pCGF->GetNode(i))
-                {
-                    found = true;
-                    fprintf(f, "node[%d] '%s'", i, pNode->pSharedMesh->name);
-                    break;
-                }
-            }
-            if (!found)
-            {
-                fprintf(f, "*** not in node[] *** '%s'", pNode->pSharedMesh->name);
-            }
-        }
-        fprintf(f, "\n");
-
-        //if (pNode->type == CNodeCGF::NODE_MESH)
-        {
-            fprintf(f, "\t" "pMesh: ");
-            CMesh* const pMesh = pNode->pMesh;
-            if (pMesh == 0)
-            {
-                fprintf(f, "NULL");
-            }
-            else
-            {
-                unsigned int i;
-                for (i = 0; i < meshes.size(); ++i)
-                {
-                    if (meshes[i] == pMesh)
-                    {
-                        break;
-                    }
-                }
-                if (i >= meshes.size())
-                {
-                    meshes.push_back(pMesh);
-                    i = meshes.size() - 1;
-                }
-                fprintf(f, "\t" "mesh[%d]", i);
-            }
-            fprintf(f, "\n");
-        }
-
-        if (pNode->type == CNodeCGF::NODE_HELPER)
-        {
-            fprintf(f, "\t" "helperType: %s\n", getTextHelperType(pNode->helperType));
-            fprintf(f, "\t" "helperSize: %g %g %g\n", pNode->helperSize.x, pNode->helperSize.y, pNode->helperSize.z);
-        }
-
-        fprintf(f, "\t" "pMaterial: ");
-        if (pNode->pMaterial == 0)
-        {
-            fprintf(f, "NULL");
-        }
-        else
-        {
-            // Trying to find pMaterial in our materials
-            bool found = false;
-            for (int i = 0; i < pCGF->GetMaterialCount(); ++i)
-            {
-                if (pNode->pMaterial == pCGF->GetMaterial(i))
-                {
-                    found = true;
-                    fprintf(f, "material[%d] '%s'", i, pNode->pMaterial->name);
-                    break;
-                }
-            }
-            if (!found)
-            {
-                fprintf(f, "*** not in material[] *** '%s'", pNode->pMaterial->name);
-            }
-        }
-        fprintf(f, "\n");
-
-        fprintf(f, "\t" "nPhysicalizeFlags: %s\n", getTextPhysicalizeFlags(pNode->nPhysicalizeFlags).c_str());
-
-        {
-            bool bIsEmpty = true;
-
-            for (int i = 0; i < 4; ++i)
-            {
-                const bool bSlotIsEmpty = (pNode->physicalGeomData[i].size() == 0) && (pNode->physicalGeomData[i].capacity() == 0);
-                if (!bSlotIsEmpty)
-                {
-                    bIsEmpty = false;
-                    break;
-                }
-            }
-
-            if (bIsEmpty)
-            {
-                fprintf(f, "\t" "physicalGeomData[]: empty\n");
-            }
-            else
-            {
-                for (int i = 0; i < 4; ++i)
-                {
-                    const bool bSlotIsEmpty = (pNode->physicalGeomData[i].size() == 0) && (pNode->physicalGeomData[i].capacity() == 0);
-                    if (!bSlotIsEmpty)
-                    {
-                        fprintf(f, "\t" "physicalGeomData[%d]: size=%zu, capacity=%zu\n", i, pNode->physicalGeomData[i].size(), pNode->physicalGeomData[i].capacity());
-                    }
-                }
-            }
-        }
-
-        fprintf(f, "\t" "internals:\n");
-
-        fprintf(f, "\t\t" "nChunkId:       %d\n", pNode->nChunkId);
-        fprintf(f, "\t\t" "nParentChunkId: %d\n", pNode->nParentChunkId);
-        fprintf(f, "\t\t" "nObjectChunkId: %d\n", pNode->nObjectChunkId);
-        fprintf(f, "\t\t" "pos_controller_id:    %d\n", pNode->pos_cont_id);
-        fprintf(f, "\t\t" "rot_controller_id:    %d\n", pNode->rot_cont_id);
-        fprintf(f, "\t\t" "scl_controller_id:    %d\n", pNode->scl_cont_id);
-
-        fprintf(f, "\t" "bIdentityMatrix: %s\n", (pNode->bIdentityMatrix ? "true" : "false"));
-        fprintf(f, "\t" "bPhysicsProxy:   %s\n", (pNode->bPhysicsProxy   ? "true" : "false"));
-        fprintf(f, "\n");
-    }
-    fprintf(f, "---------------------------------------------\n");
-
-    bool hasError = false;
-
-    fprintf(f, "mesh#: %zu\n", meshes.size());
-    fprintf(f, "\n");
-
-    for (int meshIdx = 0; meshIdx < meshes.size(); ++meshIdx)
-    {
-        fprintf(f, "mesh[%d]:\n", meshIdx);
-
-        CMesh* const pMesh = meshes[meshIdx];
-
-        const char* pErrorDescription = 0;
-        bool const bMeshValid = pMesh->Validate(&pErrorDescription);
-        if (!bMeshValid)
-        {
-            hasError = true;
-            fprintf(f, "\t\t" "** ERROR **: mesh is invalid (%s)\n", pErrorDescription);
-        }
-
-        fprintf(f, "\t" "numFaces:    %d\n", pMesh->GetFaceCount());
-        fprintf(f, "\t" "numVertices: %d\n", pMesh->GetVertexCount());
-        fprintf(f, "\t" "nCoorCount:  %d\n", pMesh->GetTexCoordCount());
-        fprintf(f, "\t" "nIndexCount: %d\n", pMesh->GetIndexCount());
-
-        fprintf(f,
-            "\t" "bbox: min(%g %g %g) max(%g %g %g)\n",
-            pMesh->m_bbox.min.x, pMesh->m_bbox.min.y, pMesh->m_bbox.min.z,
-            pMesh->m_bbox.max.x, pMesh->m_bbox.max.y, pMesh->m_bbox.max.z);
-
-        fprintf(f, "\t" "texMappingDensity: %g\n", pMesh->m_texMappingDensity);
-
-        fprintf(f, "\t" "subsets[]: size=%d, capacity=%d\n", pMesh->m_subsets.size(), pMesh->m_subsets.capacity());
-        for (int i = 0; i < pMesh->m_subsets.size(); ++i)
-        {
-            SMeshSubset& subset = pMesh->m_subsets[i];
-
-            fprintf(f, "\t" "subset[%d]:\n", i);
-
-            fprintf(f, "\t\t" "center: %g %g %g\n", subset.vCenter.x, subset.vCenter.y, subset.vCenter.z);
-            fprintf(f, "\t\t" "radius: %g\n", subset.fRadius);
-
-            fprintf(f, "\t\t" "nFirstIndexId: %d\n", subset.nFirstIndexId);
-            fprintf(f, "\t\t" "nNumIndices: %d\n", subset.nNumIndices);
-
-            fprintf(f, "\t\t" "nFirstVertId: %d\n", subset.nFirstVertId);
-            fprintf(f, "\t\t" "nNumVerts: %d\n", subset.nNumVerts);
-
-            fprintf(f, "\t\t" "nMatID: %d\n", subset.nMatID);
-            fprintf(f, "\t\t" "nMatFlags: 0x%08x\n", subset.nMatFlags);
-            fprintf(f, "\t\t" "nPhysicalizeType: %s\n", getTextPhysicalizeType(subset.nPhysicalizeType).c_str());
-
-            if (!bMeshValid)
-            {
-                // Check indices
-                if (subset.nNumIndices > 0)
-                {
-                    const vtx_idx* const pIndices = pMesh->m_pIndices;
-                    if (pIndices == 0)
-                    {
-                        fprintf(f, "\t\t" "pIndices: NULL   ** ERROR **\n");
-                        break;
-                    }
-                    if (subset.nNumIndices % 3)
-                    {
-                        fprintf(f, "\t\t" "nNumIndices is not multiplication of 3   ** ERROR **\n");
-                        break;
-                    }
-                    if (subset.nFirstIndexId < 0)
-                    {
-                        fprintf(f, "\t\t" "nFirstIndexId < 0  ** ERROR **\n");
-                        break;
-                    }
-                    if (subset.nFirstIndexId + subset.nNumIndices > pMesh->GetIndexCount())
-                    {
-                        fprintf(f, "\t\t" "nIndices + numIndices > mesh's nIndexCount   ** ERROR **\n");
-                        break;
-                    }
-                    if (subset.nNumVerts <= 0)
-                    {
-                        fprintf(f, "\t\t" "nNumVerts <= 0  ** ERROR **\n");
-                        break;
-                    }
-                    if (subset.nFirstVertId < 0)
-                    {
-                        fprintf(f, "\t\t" "nFirstVertId < 0  ** ERROR **\n");
-                        break;
-                    }
-                    if (subset.nFirstVertId + subset.nNumVerts > pMesh->GetVertexCount())
-                    {
-                        fprintf(f, "\t\t" "nFirstVertId + nNumVerts > mesh's numVertices   ** ERROR **\n");
-                        break;
-                    }
-                    for (int ii = 0; ii < subset.nNumIndices; ++ii)
-                    {
-                        const int vertexIndex = pIndices[subset.nFirstIndexId + ii];
-                        const int nLastVertId = subset.nFirstVertId + subset.nNumVerts - 1;
-                        if ((vertexIndex < subset.nFirstVertId) || (vertexIndex > nLastVertId))
-                        {
-                            fprintf(f, "\t\t" "%ith index refers to vertex %i (outside of [%i;%i])   ** ERROR **\n", ii, vertexIndex, subset.nFirstIndexId, nLastVertId);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        fprintf(f, "\n");
-    }
-
-    if (hasError)
-    {
-        fprintf(f, "** ATTENTION! At least one mesh has fatal errors in geometry. Search for '** ERROR **' above\n");
-    }
-
-    fprintf(f, "<<< End of dump of '%s' >>>\n", sourceFileName);
-
-    fclose(f);
-    f = 0;
-
-    delete pCGF;
-    pCGF = 0;
-
-    RCLog("Finished dumping geometry file %s.", sourceFileName);
-
-    return true;
-}
-
-
-bool debugValidateCGF(CContentCGF* pCGF, const char* a_filename)
-{
-    RCLog("Validating geometry file %s...", a_filename);
-
-    if (!pCGF)
-    {
-        RCLogError("Validate: Failed to load geometry file %s", a_filename);
-        return false;
-    }
-
-    if (pCGF->GetConsoleFormat())
-    {
-        RCLogError("Validate: Cannot validate geometry file %s because it's in console format.", a_filename);
-        return false;
-    }
-
-    const char* pErrorDescription = 0;
-    if (!pCGF->ValidateMeshes(&pErrorDescription))
-    {
-        RCLogError("Validate: Geometry file %s is damaged (%s).", a_filename, pErrorDescription);
-        return false;
-    }
-
-    RCLog("Validate: Geometry file %s is ok.", a_filename);
-    return true;
-}
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <conio.h>
-#endif
-//////////////////////////////////////////////////////////////////////////
-bool CStatCGFCompiler::Process()
-{
-    // Register the AssetBuilderSDK structures needed later on.
-    CGFToolApplication application;
-    AZ::ComponentApplication::Descriptor descriptor;
-    application.Start(descriptor);
-
-    AssetBuilderSDK::InitializeSerializationContext();
-    AssetBuilderSDK::ProcessJobResponse response;
-
-    // We want to query the watch folder here for cases where we have to build a material relative path dependency.
-    // This is necessary for cases where the source assets lie outside of the game project directory
-    AZStd::string sourceWatchFolder = m_CC.m_config->GetAsString("watchfolder", "", "").c_str();
-    if (sourceWatchFolder.empty())
-    {
-        // Fallbacks just in case watchfolder is not set for some reason
-        sourceWatchFolder = m_CC.m_config->GetAsString("sourceroot", "", "").c_str();
-        if (sourceWatchFolder.empty())
-        {
-            sourceWatchFolder = m_CC.m_config->GetAsString("project-path", "", "").c_str();
-        }
-    }
-
-    bool compileSuccess = CompileCGF(response, sourceWatchFolder);
-
-    return WriteResponse(m_CC.GetOutputFolder(), response, compileSuccess);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-bool CStatCGFCompiler::CompileCGF(AssetBuilderSDK::ProcessJobResponse& response, AZStd::string assetRoot, AZStd::string gameFolder)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    // _EM_INVALID is used to avoid Floating Point Exception inside CryPhysics
-    MathHelpers::AutoFloatingPointExceptions autoFpe(~(_EM_INEXACT | _EM_UNDERFLOW | _EM_INVALID));
-#endif
-
-    // If no game project was specified, then query it from the Settings Registry
-    if (gameFolder.empty())
-    {
-        gameFolder = AZ::Utils::GetProjectName();
-    }
-
-    // If no asset root was specified, then query it from the application
-    if (assetRoot.empty())
-    {
-        if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-        {
-            settingsRegistry->Get(assetRoot, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder);
-        }
-    }
-    
-    const string sourceFile = m_CC.GetSourcePath();
-    const string outputFile = GetOutputPath();
-
-#if !defined(AZ_PLATFORM_LINUX) && !defined(AZ_PLATFORM_APPLE) // Exception handling not enabled on linux/mac builds
-    try
-#endif
-    {
-        const bool bStripMeshData = m_CC.m_config->HasKey("StripMesh");
-        const bool bStripNonMeshData = m_CC.m_config->GetAsBool("StripNonMesh", false, true);
-        const bool bCompactVertexStreams = m_CC.m_config->GetAsBool("CompactVertexStreams", false, true);
-        // Confetti: Nicholas Baldwin
-        const bool bOptimizePVRStripify = m_CC.m_config->GetAsInt("OptimizedPrimitiveType", 0, 0) == 1;
-        const bool bComputeSubsetTexelDensity = m_CC.m_config->GetAsBool("ComputeSubsetTexelDensity", false, true);
-        const bool bSplitLods = m_CC.m_config->GetAsBool("SplitLODs", false, true);
-
-        if (m_CC.m_config->GetAsBool("debugdump", false, true))
-        {
-            // Write a debug .dump file into the cache
-            DebugDumpCGF(sourceFile.c_str(), GetOutputPath());
-        }
-
-        class Listener
-            : public ILoaderCGFListener
-        {
-        public:
-            Listener()
-                : m_bLoadingErrors(false)
-                , m_bLoadingWarnings(false)
-            {
-            }
-            virtual void Warning(const char* format)
-            {
-                RCLogWarning("%s", format);
-                m_bLoadingWarnings = true;
-            }
-            virtual void Error(const char* format)
-            {
-                RCLogError("%s", format);
-                m_bLoadingErrors = true;
-            }
-
-        public:
-            bool m_bLoadingErrors;
-            bool m_bLoadingWarnings;
-        };
-
-        if (m_CC.m_pRC->GetVerbosityLevel() > 2)
-        {
-            RCLog("Loading CGF file %s", sourceFile.c_str());
-        }
-
-        Listener listener;
-        CChunkFile chunkFile;
-        CLoaderCGF cgfLoader;
-        CContentCGF* const pCGF = cgfLoader.LoadCGF(sourceFile, chunkFile, &listener);
-
-        if (m_CC.m_pRC->GetVerbosityLevel() > 2)
-        {
-            RCLog("Loaded CGF file %s", sourceFile.c_str());
-        }
-
-        if (!pCGF || listener.m_bLoadingErrors)
-        {
-            RCLogError("%s: Failed to load geometry file %s: %s", __FUNCTION__, sourceFile.c_str(), cgfLoader.GetLastError());
-            delete pCGF;
-            return false;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Validate mesh, but abort compilation if validation fails
-        if (m_CC.m_config->GetAsBool("debugvalidate", false, true))
-        {
-            bool isValid = debugValidateCGF(pCGF, sourceFile.c_str());
-            if (!isValid)
-            {
-                delete pCGF;
-                return false;
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        const bool bConsole = !m_CC.m_pRC->GetPlatformInfo(m_CC.m_platform)->HasName("pc");
-        const bool bNeedEndianSwap = (m_CC.m_pRC->GetPlatformInfo(m_CC.m_platform)->bBigEndian != SYSTEM_IS_BIG_ENDIAN);
-        const bool bUseQuaternions = m_CC.m_config->GetAsBool("qtangents", false, true);
-
-        bool bStorePositionsAsF16;
-        {
-            const char* const optionName = "vertexPositionFormat";
-            const string s = m_CC.m_config->GetAsString(optionName, "f32", "f32");
-
-            if (StringHelpers::EqualsIgnoreCase(s, "f32"))
-            {
-                bStorePositionsAsF16 = false;
-            }
-            else if (StringHelpers::EqualsIgnoreCase(s, "f16"))
-            {
-                bStorePositionsAsF16 = true;
-            }
-            else if (StringHelpers::EqualsIgnoreCase(s, "exporter"))
-            {
-                bStorePositionsAsF16 = !pCGF->GetExportInfo()->bWantF32Vertices;
-            }
-            else
-            {
-                RCLogError("Unknown value of '%s': '%s'. Valid values are: 'f32', 'f16', 'exporter'.", optionName, s.c_str());
-                delete pCGF;
-                return false;
-            }
-        }
-
-        bool bStoreIndicesAsU16;
-        {
-            const char* const optionName = "vertexIndexFormat";
-            const string s = m_CC.m_config->GetAsString(optionName, "u32", "u32");
-
-            if (StringHelpers::EqualsIgnoreCase(s, "u32"))
-            {
-                bStoreIndicesAsU16 = false;
-            }
-            else if (StringHelpers::EqualsIgnoreCase(s, "u16"))
-            {
-                bStoreIndicesAsU16 = true;
-            }
-            else
-            {
-                RCLogError("Unknown value of '%s': '%s'. Valid values are: 'u32', 'u16'.", optionName, s.c_str());
-                delete pCGF;
-                return false;
-            }
-        }
-
-        // Delete Node and Mesh chunks from CGF chunk file.
-        {
-            if (m_CC.m_pRC->GetVerbosityLevel() > 2)
-            {
-                RCLog("Deleting old chunks");
-            }
-            DeleteOldChunks(pCGF, chunkFile);
-        }
-
-
-        CStaticObjectCompiler statCgfCompiler(bConsole, m_CC.m_pRC->GetVerbosityLevel());
-        statCgfCompiler.SetSplitLods(bSplitLods);
-        // Confetti: Nicholas Baldwin
-        statCgfCompiler.SetOptimizeStripify(bOptimizePVRStripify);
-
-        if (m_CC.m_pRC->GetVerbosityLevel() > 2)
-        {
-            RCLog("Making compilied CGF");
-        }
-
-        CContentCGF* const pCompiledCGF = statCgfCompiler.MakeCompiledCGF(pCGF, m_CC.m_bForceRecompiling);
-        if (!pCompiledCGF)
-        {
-            RCLogError(
-                "Failed to process geometry file %s. Try to re-export the file. If it not helps - contact an RC programmer.",
-                sourceFile.c_str());
-            delete pCGF;
-            return false;
-        }
-
-        // Check that we didn't have internal failures in data processing
-        {
-            if (m_CC.m_pRC->GetVerbosityLevel() > 2)
-            {
-                RCLog("Validating meshes");
-            }
-
-            const char* pErrorDescription = 0;
-            if (!pCompiledCGF->ValidateMeshes(&pErrorDescription))
-            {
-                RCLogError(
-                    "Failed to process geometry in file %s (%s). Try to re-export the file. If it not helps - contact an RC programmer.",
-                    sourceFile.c_str(),
-                    pErrorDescription);
-                delete pCGF;
-                return false;
-            }
-        }
-
-        {
-            const SFileVersion& fv = m_CC.m_pRC->GetFileVersion();
-            pCompiledCGF->GetExportInfo()->rc_version[0] = fv.v[0];
-            pCompiledCGF->GetExportInfo()->rc_version[1] = fv.v[1];
-            pCompiledCGF->GetExportInfo()->rc_version[2] = fv.v[2];
-            pCompiledCGF->GetExportInfo()->rc_version[3] = fv.v[3];
-
-            StringHelpers::SafeCopyPadZeros(
-                pCompiledCGF->GetExportInfo()->rc_version_string,
-                sizeof(pCompiledCGF->GetExportInfo()->rc_version_string),
-                StringHelpers::Format(" RCVer:%d.%d ", fv.v[2], fv.v[1]).c_str());
-        }
-
-        // Write modified content to the output chunk file
-        {
-            CSaverCGF cgfSaver(chunkFile);
-            cgfSaver.SetMeshDataSaving(!bStripMeshData);
-            cgfSaver.SetNonMeshDataSaving(!bStripNonMeshData);
-            cgfSaver.SetSavePhysicsMeshes(!bStripNonMeshData);
-            cgfSaver.SetVertexStreamCompacting(bCompactVertexStreams);
-            cgfSaver.SetSubsetTexelDensityComputing(bComputeSubsetTexelDensity);
-
-            if (bStripNonMeshData)
-            {
-                // Start from a blank slate for stripped cgfs
-                chunkFile.Clear();
-            }
-
-            cgfSaver.SaveContent(pCompiledCGF, bNeedEndianSwap, bStorePositionsAsF16, bUseQuaternions, bStoreIndicesAsU16);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-            SetFileAttributes(outputFile, FILE_ATTRIBUTE_ARCHIVE);
-#endif
-            
-            if (!chunkFile.Write(outputFile))
-            {
-                RCLogError(
-                    "Failed to process geometry file %s: %s. Try to re-export the file. If it not helps - contact an RC programmer.",
-                    sourceFile.c_str(), chunkFile.GetLastError());
-                delete pCGF;
-                return false;
-            }
-
-            m_CC.m_pRC->AddInputOutputFilePair(m_CC.GetSourcePath(), GetOutputPath());
-        }
-
-        // Add base CGF product
-        static AZ::Data::AssetType meshAssetType("{C2869E3B-DDA0-4E01-8FE3-6770D788866B}"); // from MeshAsset.h
-        {
-            // Add our base job product.  
-            // This accepts either the full path or the path relative to the Asset Processor temp directory, which is just the filename in this case
-            AssetBuilderSDK::JobProduct baseJobProduct(m_CC.m_sourceFileNameOnly.c_str(), meshAssetType, 0); // sub-id 0
-
-            // Add material product dependencies
-            {
-                CMaterialCGF* commonMaterial = pCGF->GetCommonMaterial();
-                if (commonMaterial != nullptr)
-                {
-                    // Append .mtl to the material name
-                    AZStd::string materialName = AZStd::string::format("%s.mtl", commonMaterial->name);
-
-                    // Check if our material name is just a name, or if it contains a path
-                    if (strstr(materialName.c_str(), "/") || strstr(materialName.c_str(), "\\"))
-                    {
-                        // The material path is already relative to devroot, for example "automatedtesting/materials/foo.mtl"
-                        // We need to convert this to the cache path AP generates.  In this case, cut off the game project name.
-                        AZStd::string materialRelativePath = materialName;
-                        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePath, gameFolder);
-                        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, MakePathRelative, materialRelativePath, gameFolder.c_str());
-                        baseJobProduct.m_pathDependencies.emplace(materialRelativePath, AssetBuilderSDK::ProductPathDependencyType::ProductFile);
-                    }
-                    else
-                    {
-                        // In this case, we just have the name of the material.  The material is assumed to be in the same directory as the CGF.
-                        // Now we need to generate that directory...
-                        baseJobProduct.m_pathDependencies.emplace(GetDependencyAbsolutePath(materialName), AssetBuilderSDK::ProductPathDependencyType::SourceFile);
-                    }
-                }
-
-                baseJobProduct.m_dependenciesHandled = true; // We've populated the dependencies immediately above so it's OK to tell the AP we've handled dependencies
-            }
-
-            response.m_outputProducts.push_back(baseJobProduct);
-        }
-
-        bool bHaveSplitLods = false;
-        if (bSplitLods)
-        {
-            std::vector<string> unusedFiles;
-
-            // Save split LODs
-            for (int lodIndex = 1; lodIndex < CStaticObjectCompiler::MAX_LOD_COUNT; ++lodIndex)
-            {
-                string lodFileName = PathHelpers::RemoveExtension(GetOutputFileNameOnly());
-                lodFileName += "_lod";
-                lodFileName += '0' + lodIndex;
-                lodFileName += '.';
-                lodFileName += PathHelpers::FindExtension(outputFile);
-                string lodFullPath = PathHelpers::Join(m_CC.GetOutputFolder(), lodFileName);
-
-                CContentCGF* const pLodCgf = statCgfCompiler.m_pLODs[lodIndex];
-                if (!pLodCgf)
-                {
-                    if (FileUtil::FileExists(lodFullPath.c_str()))
-                    {
-                        unusedFiles.push_back(lodFullPath);
-                    }
-                    continue;
-                }
-
-                // Check that we didn't have internal failures in data processing
-                {
-                    const char* pErrorDescription = 0;
-                    if (!pLodCgf->ValidateMeshes(&pErrorDescription))
-                    {
-                        RCLogError(
-                            "Failed to process geometry of LOD %i in file %s (%s). Try to re-export the file. If it not helps - contact an RC programmer.",
-                            lodIndex,
-                            sourceFile.c_str(),
-                            pErrorDescription);
-                        delete pCGF;
-                        return false;
-                    }
-                }
-
-                // Set pParent to 0 for every node (for details read big comment block
-                // above in the end of CStaticObjectCompiler::SplitLODs(), above AddNode()
-                // call).
-                for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-                {
-                    CNodeCGF* const pNode = pCGF->GetNode(i);
-                    pNode->pParent = 0;
-                }
-
-                // Save LOD content to the LOD chunk file
-                {
-                    CChunkFile lodChunkFile;
-                    CSaverCGF lodCgfSaver(lodChunkFile);
-                    lodCgfSaver.SetMeshDataSaving(!bStripMeshData);
-                    lodCgfSaver.SetNonMeshDataSaving(!bStripNonMeshData);
-                    lodCgfSaver.SetSavePhysicsMeshes(!bStripNonMeshData);
-                    lodCgfSaver.SetVertexStreamCompacting(bCompactVertexStreams);
-                    lodCgfSaver.SetSubsetTexelDensityComputing(bComputeSubsetTexelDensity);
-                    lodCgfSaver.SaveContent(pLodCgf, bNeedEndianSwap, bStorePositionsAsF16, bUseQuaternions, bStoreIndicesAsU16);
-#if defined(AZ_PLATFORM_WINDOWS)
-                    SetFileAttributes(lodFullPath, FILE_ATTRIBUTE_ARCHIVE);
-#endif
-                    lodChunkFile.Write(lodFullPath);
-
-                    // Each LOD writes to a CGF which is an output product
-                    static const AZ::Data::AssetType staticMeshLodsAssetType("{9AAE4926-CB6A-4C60-9948-A1A22F51DB23}");
-                    AssetBuilderSDK::JobProduct lodJobProduct(lodFileName.c_str(), staticMeshLodsAssetType, lodIndex); // sub-id is the lod index
-                    response.m_outputProducts.push_back(lodJobProduct);
-                    response.m_outputProducts.at(0).m_pathDependencies.emplace(
-                        GetDependencyAbsolutePath(lodFileName.c_str()),
-                        AssetBuilderSDK::ProductPathDependencyType::ProductFile);
-                    response.m_outputProducts.at(0).m_dependenciesHandled = true; // We've populated the dependencies immediately above so it's OK to tell the AP we've handled dependencies
-
-                    m_CC.m_pRC->AddInputOutputFilePair(m_CC.GetSourcePath(), lodFullPath);
-                }
-
-                bHaveSplitLods = true;
-            }
-
-            for (size_t i = 0; i < unusedFiles.size(); ++i)
-            {
-                m_CC.m_pRC->MarkOutputFileForRemoval(unusedFiles[i]);
-            }
-        }
-
-        if (!UpToDateFileHelpers::SetMatchingFileTime(GetOutputPath(), m_CC.GetSourcePath()))
-        {
-            return false;
-        }
-        
-        m_CC.m_pRC->AddInputOutputFilePair(m_CC.GetSourcePath(), GetOutputPath());
-
-        delete pCGF;
-    }
-#if !defined(AZ_PLATFORM_LINUX) && !defined(AZ_PLATFORM_APPLE) // Exception handling not enabled on linux/mac builds
-    catch (char*)
-    {
-        RCLogError("Unexpected failure in processing %s to %s.", sourceFile.c_str(), outputFile.c_str());
-        return false;
-    }
-#endif // !defined(AZ_PLATFORM_LINUX)
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStatCGFCompiler::DeleteOldChunks(CContentCGF* pCGF, CChunkFile& chunkFile)
-{
-    for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-    {
-        CNodeCGF* const pNode = pCGF->GetNode(i);
-        if (pNode->nChunkId)
-        {
-            chunkFile.DeleteChunkById(pNode->nChunkId); // Delete chunk of node.
-            // Check if light node, for light nodes we not change light object.
-            if (pNode->nObjectChunkId && pNode->type != CNodeCGF::NODE_LIGHT)
-            {
-                chunkFile.DeleteChunkById(pNode->nObjectChunkId); // Delete chunk of mesh.
-            }
-            pNode->nObjectChunkId = 0;
-        }
-    }
-
-    chunkFile.DeleteChunksByType(ChunkType_ExportFlags);
-    chunkFile.DeleteChunksByType(ChunkType_MtlName);
-    chunkFile.DeleteChunksByType(ChunkType_Mesh);
-    chunkFile.DeleteChunksByType(ChunkType_MeshSubsets);
-    chunkFile.DeleteChunksByType(ChunkType_DataStream);
-    chunkFile.DeleteChunksByType(ChunkType_MeshPhysicsData);
-    chunkFile.DeleteChunksByType(ChunkType_BreakablePhysics);
-    chunkFile.DeleteChunksByType(ChunkType_FoliageInfo);
-    chunkFile.DeleteChunksByType(ChunkType_FaceMap);
-    chunkFile.DeleteChunksByType(ChunkType_VertAnim);
-    chunkFile.DeleteChunksByType(ChunkType_SceneProps);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatCGFCompiler::IsLodFile(const string& filename) const
-{
-    string file = filename;
-    file.MakeLower();
-    const char* const s = strstr(file.c_str(), "_lod");
-    return (s && s[4] >= '0' && s[4] <= '9' && s[5] == '.');
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStatCGFCompiler::WriteResponse(const char* cacheFolder, AssetBuilderSDK::ProcessJobResponse& response, bool success) const
-{
-    AZStd::string responseFilePath;
-    AzFramework::StringFunc::Path::ConstructFull(cacheFolder, AssetBuilderSDK::s_processJobResponseFileName, responseFilePath);
-
-    response.m_requiresSubIdGeneration = false;
-    response.m_resultCode = success ? AssetBuilderSDK::ProcessJobResult_Success : AssetBuilderSDK::ProcessJobResult_Failed;
-
-    bool result = AZ::Utils::SaveObjectToFile(responseFilePath, AZ::DataStream::StreamType::ST_XML, &response);
-
-    if (!result)
-    {
-        AZ_Error("CStatCGFCompiler", false, "Unable to save ProcessJobResponse file to %s.\n", responseFilePath.c_str());
-    }
-
-    return result && success;
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/StatCGFCompiler.h b/Code/Tools/RC/ResourceCompilerPC/StatCGFCompiler.h
deleted file mode 100644
index e265e3bdf0..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/StatCGFCompiler.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_STATCGFCOMPILER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_STATCGFCOMPILER_H
-#pragma once
-
-
-#include "Cry_Color.h"
-#include <IConvertor.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include "../../CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.h"
-#include <AzToolsFramework/Application/ToolsApplication.h>
-
-struct ConvertContext;
-class CContentCGF;
-class CChunkFile;
-class CPhysicsInterface;
-struct CMaterialCGF;
-namespace AssetBuilderSDK
-{
-    struct ProcessJobResponse;
-}
-
-
-class CGFToolApplication : public AzToolsFramework::ToolsApplication
-{
-public:
-    CGFToolApplication() = default;
-
-    AZ::ComponentTypeList GetRequiredSystemComponents() const override;
-
-    void SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations) override;
-};
-
-
-class CStatCGFCompiler
-    : public IConvertor
-    , public ICompiler
-{
-public:
-    class Error
-    {
-    public:
-        Error (int nCode);
-        Error (const char* szFormat, ...);
-        const char* c_str() const { return m_strReason.c_str(); }
-    protected:
-        string m_strReason;
-    };
-
-    CStatCGFCompiler();
-    ~CStatCGFCompiler();
-
-    // IConvertor methods.
-    virtual ICompiler* CreateCompiler();
-    virtual const char* GetExt(int index) const
-    {
-        switch (index)
-        {
-        case 0:
-            return "cga";
-        case 1:
-            return "cgf";
-        case 2:
-            return "i_cgf";
-        default:
-            return 0;
-        }
-    }
-
-    // ICompiler methods.
-    virtual void BeginProcessing([[maybe_unused]] const IConfig* config) { }
-    virtual void EndProcessing() { }
-    virtual IConvertContext* GetConvertContext() { return &m_CC; }
-    virtual bool Process();
-
-    // ICompiler + IConvertor methods.
-    virtual void Release();
-
-    // Helper function to dump detailed debug information for a CGF
-    static bool DebugDumpCGF(const char* sourceFileName, const char* outputFilePath);
-
-    // Do the entire compilation process for the CGF source asset, populating the ProcessJobResponse
-    bool CompileCGF(AssetBuilderSDK::ProcessJobResponse& response, AZStd::string assetRoot = "", AZStd::string gameFolder = "");
-
-    // Write the JobProduct response file
-    bool WriteResponse(const char* folder, AssetBuilderSDK::ProcessJobResponse& response, bool success = true) const;
-
-private:
-    string GetOutputFileNameOnly() const;
-    string GetOutputPath() const;
-    AZStd::string GetDependencyAbsolutePath(const AZStd::string& fileName) const;
-    void DeleteOldChunks(CContentCGF* pCGF, CChunkFile& chunkFile);
-    bool IsLodFile(const string& filename) const;
-
-private:
-    ConvertContext m_CC;
-
-    int m_refCount;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_STATCGFCOMPILER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/StaticObjectCompiler.cpp b/Code/Tools/RC/ResourceCompilerPC/StaticObjectCompiler.cpp
deleted file mode 100644
index f3291a088e..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/StaticObjectCompiler.cpp
+++ /dev/null
@@ -1,1589 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerPC_precompiled.h"
-#include "StaticObjectCompiler.h"
-#include "../../CryEngine/Cry3DEngine/MeshCompiler/MeshCompiler.h"
-#include "CGF/CGFNodeMerger.h"
-#include "StringHelpers.h"
-#include "Util.h"
-
-#include "PropertyHelpers.h"
-#include "AzFramework/StringFunc/StringFunc.h"
-#include "CGFContent.h"
-
-static const char* const s_consolesLod0MarkerStr = "consoles_lod0";
-static const uint8 s_maxSkinningWeight = 0xFF;
-
-static bool NodeHasProperty(const CNodeCGF* pNode, const char* property)
-{
-    return strstr(StringHelpers::MakeLowerCase(pNode->properties).c_str(), property) != 0;
-}
-
-static bool HasNodeWithConsolesLod0(const CContentCGF* pCGF)
-{
-    const string lodNamePrefix(CGF_NODE_NAME_LOD_PREFIX);
-    const int nodeCount = pCGF->GetNodeCount();
-    for (int i = 0; i < nodeCount; ++i)
-    {
-        const CNodeCGF* const pNode = pCGF->GetNode(i);
-        if (!pNode)
-        {
-            continue;
-        }
-
-        if (!StringHelpers::StartsWithIgnoreCase(string(pNode->name), lodNamePrefix))
-        {
-            continue;
-        }
-
-        if (NodeHasProperty(pNode, s_consolesLod0MarkerStr))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-static CNodeCGF* FindNodeByName(CContentCGF* pCGF, const char* name)
-{
-    if (name == 0)
-    {
-        assert(name);
-        return 0;
-    }
-    const int nodeCount = pCGF->GetNodeCount();
-    for (int i = 0; i < nodeCount; ++i)
-    {
-        CNodeCGF* const pNode = pCGF->GetNode(i);
-        if (pNode && strcmp(pNode->name, name) == 0)
-        {
-            return pNode;
-        }
-    }
-    return 0;
-}
-
-static void ReportDuplicatedMeshNodeNames(const CContentCGF* pCGF)
-{
-    assert(pCGF);
-
-    const string ignoreNamePrefix("$");
-
-    std::set<const char*, stl::less_stricmp<const char*> > names;
-
-    const int nodeCount = pCGF->GetNodeCount();
-
-    for (int i = 0; i < nodeCount; ++i)
-    {
-        const CNodeCGF* const pNode = pCGF->GetNode(i);
-        if (pNode == 0)
-        {
-            assert(pNode);
-            continue;
-        }
-
-        const char* const pName = &pNode->name[0];
-
-        if (pName[0] == 0)
-        {
-            RCLogWarning("Node with empty name found in %s", pCGF->GetFilename());
-            continue;
-        }
-
-        if (StringHelpers::StartsWithIgnoreCase(string(pName), ignoreNamePrefix))
-        {
-            continue;
-        }
-
-        if (pNode->pMesh == 0)
-        {
-            continue;
-        }
-
-        if (names.find(pName) == names.end())
-        {
-            names.insert(pName);
-        }
-        else
-        {
-            RCLogWarning(
-                "Duplicated mesh node name %s found in %s. Please make sure that all mesh nodes have unique names.",
-                pName, pCGF->GetFilename());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CStaticObjectCompiler::CStaticObjectCompiler(bool bConsole, int logVerbosityLevel)
-    : m_bConsole(bConsole)
-    , m_logVerbosityLevel(logVerbosityLevel)
-    , m_bOptimizePVRStripify(false)
-{
-    m_bSplitLODs = false;
-    m_bOwnLod0 = false;
-
-    for (int i = 0; i < MAX_LOD_COUNT; ++i)
-    {
-        m_pLODs[i] = 0;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CStaticObjectCompiler::~CStaticObjectCompiler()
-{
-    for (int i = 0; i < MAX_LOD_COUNT; ++i)
-    {
-        if (i != 0 || m_bOwnLod0)
-        {
-            delete m_pLODs[i];
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStaticObjectCompiler::SetSplitLods(bool bSplit)
-{
-    m_bSplitLODs = bSplit;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Confetti: Nicholas Baldwin
-void CStaticObjectCompiler::SetOptimizeStripify(bool bStripify)
-{
-    m_bOptimizePVRStripify = bStripify;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CContentCGF* CStaticObjectCompiler::MakeCompiledCGF(CContentCGF* pCGF, bool const forceRecompile)
-{
-    if (pCGF->GetExportInfo()->bCompiledCGF)
-    {
-        const bool ok = ProcessCompiledCGF(pCGF);
-        if (!ok)
-        {
-            return 0;
-        }
-
-        if (forceRecompile)
-        {
-            // most likely combined with "OptimizedPrimitiveType=1"
-            // otherwise CompileMeshes() will just bail out since the CGF was already compiled.
-            if (!CompileMeshes(pCGF))
-            {
-                return 0;
-            }
-        }
-
-        return pCGF;
-    }
-
-    if (m_logVerbosityLevel > 2)
-    {
-        RCLog("Compiling CGF");
-    }
-
-    m_bOwnLod0 = true;
-    MakeLOD(0, pCGF);
-
-    CContentCGF* const pCompiledCGF = m_pLODs[0];
-
-    // Setup mesh subsets for the original CGF.
-    for (int i = 0, num = pCGF->GetNodeCount(); i < num; ++i)
-    {
-        CNodeCGF* const pNode = pCGF->GetNode(i);
-        if (pNode->pMesh)
-        {
-            string errorMessage;
-            if (!CGFNodeMerger::SetupMeshSubsets(pCGF, *pNode->pMesh, pNode->pMaterial, errorMessage))
-            {
-                RCLogError("%s: %s", __FUNCTION__, errorMessage.c_str());
-                return 0;
-            }
-        }
-    }
-
-    if (pCGF->GetExportInfo()->bMergeAllNodes)
-    {
-        if (m_logVerbosityLevel > 2)
-        {
-            RCLog("Merging nodes");
-        }
-        if (!MakeMergedCGF(pCompiledCGF, pCGF))
-        {
-            return 0;
-        }
-    }
-    else
-    {
-        for (int i = 0, num = pCGF->GetNodeCount(); i < num; ++i)
-        {
-            CNodeCGF* const pNodeCGF = pCGF->GetNode(i);
-            pCompiledCGF->AddNode(pNodeCGF);
-        }
-    }
-
-    // Compile meshes in all nodes.
-    {
-        if (m_logVerbosityLevel > 2)
-        {
-            RCLog("Compiling meshes");
-        }
-        if (!CompileMeshes(pCompiledCGF))
-        {
-            return 0;
-        }
-    }
-
-    // Try to find shared meshes.
-    {
-        if (m_logVerbosityLevel > 2)
-        {
-            RCLog("Searching for shared meshes");
-        }
-        AnalyzeSharedMeshes(pCompiledCGF);
-    }
-
-    {
-        if (m_logVerbosityLevel > 2)
-        {
-            RCLog("Physicalizing");
-        }
-        const bool ok = Physicalize(pCompiledCGF, pCGF);
-        if (!ok)
-        {
-            return 0;
-        }
-
-        if (m_logVerbosityLevel > 2)
-        {
-            RCLog("Compiling deformable physics data");
-        }
-        CompileDeformablePhysData(pCompiledCGF);
-    }
-
-    if (!ValidateBoundingBoxes(pCompiledCGF))
-    {
-        return 0;
-    }
-
-    // Try to split LODs
-    if (m_bSplitLODs)
-    {
-        if (m_logVerbosityLevel > 2)
-        {
-            RCLog("Splitting to LODs");
-        }
-        const bool ok = SplitLODs(pCompiledCGF);
-        if (!ok)
-        {
-            return 0;
-        }
-    }
-
-    {
-        if (m_logVerbosityLevel > 2)
-        {
-            RCLog("Validating breakable joints");
-        }
-        ValidateBreakableJoints(pCGF);
-    }
-
-    return pCompiledCGF;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStaticObjectCompiler::ValidateBreakableJoints(const CContentCGF* pCGF)
-{
-    // Warn in case we have too many sub-meshes.
-
-    const int subMeshCount = GetSubMeshCount(m_pLODs[0]);
-    const int jointCount = GetJointCount(pCGF);
-
-    enum
-    {
-        kBreakableSubMeshLimit = 64
-    };
-
-    if (jointCount > 0 && subMeshCount > kBreakableSubMeshLimit)
-    {
-        RCLogError("Breakable CGF contains %d sub-meshes (%d is the maximum): %s",
-            subMeshCount, (int)kBreakableSubMeshLimit, pCGF->GetFilename());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStaticObjectCompiler::CompileDeformablePhysData(CContentCGF* pCompiledCGF)
-{
-    if (!pCompiledCGF->GetExportInfo()->bSkinnedCGF)
-    {
-        for (int i = 0; i < pCompiledCGF->GetNodeCount(); ++i)
-        {
-            if (pCompiledCGF->GetNode(i)->type == CNodeCGF::NODE_MESH)
-            {
-                break;
-            }
-        }
-    }
-
-    const string skeletonPrefix = "skeleton_";
-
-    for (int i = 0; i < pCompiledCGF->GetNodeCount(); ++i)
-    {
-        CNodeCGF* pSkeletonNode = pCompiledCGF->GetNode(i);
-        if (StringHelpers::StartsWithIgnoreCase(pSkeletonNode->name, skeletonPrefix))
-        {
-            const char* meshName = pSkeletonNode->name + skeletonPrefix.size();
-            CNodeCGF* pMeshNode = FindNodeByName(pCompiledCGF, meshName);
-            bool bKeepSkeleton = true; // always keep for PC
-
-            if (!pMeshNode)
-            {
-                RCLogError("Unable to find mesh node \"%s\" for \"%s\"", meshName, pSkeletonNode->name);
-                continue;
-            }
-
-            if (pMeshNode->pMesh == 0)
-            {
-                RCLogError("Node %s: Has corresponding skeleton, but no mesh. Disabling deformation.", pMeshNode->name);
-                bKeepSkeleton = false;
-            }
-
-            if (m_bConsole)
-            {
-                if (NodeHasProperty(pSkeletonNode, "consoles_deformable")) // enabled for consoles only by UDP
-                {
-                    if (HasNodeWithConsolesLod0(pCompiledCGF))
-                    {
-                        RCLogWarning("Node %s: %s and consoles_deformable may not be used together. Disabling object deformation.",
-                            pMeshNode->name, s_consolesLod0MarkerStr);
-                        bKeepSkeleton = false;
-                    }
-                }
-                else
-                {
-                    bKeepSkeleton = false;
-                }
-            }
-
-            if (bKeepSkeleton)
-            {
-                float r = 0.0f;
-                if (const char* ptr = strstr(pSkeletonNode->properties, "skin_dist"))
-                {
-                    for (; *ptr && (*ptr<'0' || * ptr>'9'); ptr++)
-                    {
-                        ;
-                    }
-                    if (*ptr)
-                    {
-                        r = (float)atof(ptr);
-                    }
-                }
-                PrepareSkinData(pMeshNode, pMeshNode->localTM.GetInverted() * pSkeletonNode->localTM, pSkeletonNode, r, false);
-            }
-            else
-            {
-                SAFE_DELETE_ARRAY(pMeshNode->pSkinInfo);
-                pCompiledCGF->RemoveNode(pSkeletonNode);
-                --i;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStaticObjectCompiler::CompileMeshes(CContentCGF* pCGF)
-{
-    // Compile Meshes in all nodes.
-    for (int i = 0; i < pCGF->GetNodeCount(); i++)
-    {
-        CNodeCGF* pNodeCGF = pCGF->GetNode(i);
-
-        if (pNodeCGF->pMesh)
-        {
-            if (m_logVerbosityLevel > 2)
-            {
-                RCLog("Compiling geometry in node '%s'", pNodeCGF->name);
-            }
-
-            mesh_compiler::CMeshCompiler meshCompiler;
-
-            const bool DegenerateFacesAreErrors = false;    // We need to get this from a CVar properly in order to make this an option, but for now,
-                                                            // always treat this as a warning
-            int nMeshCompileFlags =   mesh_compiler::MESH_COMPILE_TANGENTS
-                                    | ((DegenerateFacesAreErrors) ? mesh_compiler::MESH_COMPILE_VALIDATE_FAIL_ON_DEGENERATE_FACES : 0)
-                                    | mesh_compiler::MESH_COMPILE_VALIDATE;
-            if (pCGF->GetExportInfo()->bUseCustomNormals)
-            {
-                nMeshCompileFlags |= mesh_compiler::MESH_COMPILE_USECUSTOMNORMALS;
-            }
-            if (!pNodeCGF->bPhysicsProxy)
-            {
-                // Confetti: Nicholas Baldwin
-                nMeshCompileFlags |= (m_bOptimizePVRStripify) ? mesh_compiler::MESH_COMPILE_PVR_STRIPIFY : mesh_compiler::MESH_COMPILE_OPTIMIZE;
-            }
-
-            if (!meshCompiler.Compile(*pNodeCGF->pMesh, nMeshCompileFlags))
-            {
-                RCLogError("Failed to compile geometry in node '%s' in file %s - %s", pNodeCGF->name, pCGF->GetFilename(), meshCompiler.GetLastError());
-                return false;
-            }
-
-            //if we dont pass in MESH_COMPILE_VALIDATE_FAIL_ON_DEGENERATE_FACES during compilation
-            //it will not check for degenerate faces and fail, but we still want to warn on degenerate faces
-            if (!(nMeshCompileFlags & mesh_compiler::MESH_COMPILE_VALIDATE_FAIL_ON_DEGENERATE_FACES))
-            {
-                if (meshCompiler.CheckForDegenerateFaces(*pNodeCGF->pMesh))
-                {
-                    RCLogWarning("Geometry in node '%s' in file %s contains degenerate faces. This mesh is sub optimal and should be fixed!", pNodeCGF->name, pCGF->GetFilename());
-                }
-            }
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CStaticObjectCompiler::AnalyzeSharedMeshes(CContentCGF* pCGF)
-{
-    // Check if any duplicate meshes exist, and try to share them.
-    mesh_compiler::CMeshCompiler meshCompiler;
-    uint32 numNodes = pCGF->GetNodeCount();
-    for (int i = 0; i < numNodes - 1; i++)
-    {
-        CNodeCGF* pNode1 = pCGF->GetNode(i);
-        if (!pNode1->pMesh || pNode1->pSharedMesh)
-        {
-            continue;
-        }
-
-        if (!(pNode1->pMesh->GetVertexCount() && pNode1->pMesh->GetFaceCount()))
-        {
-            continue;
-        }
-
-        if (pNode1->bPhysicsProxy)
-        {
-            continue;
-        }
-
-        for (int j = i + 1; j < numNodes; j++)
-        {
-            CNodeCGF* pNode2 = pCGF->GetNode(j);
-            if (pNode1 == pNode2 || !pNode2->pMesh)
-            {
-                continue;
-            }
-
-            if (pNode2->bPhysicsProxy)
-            {
-                continue;
-            }
-
-            if (pNode1->properties == pNode2->properties)
-            {
-                if (pNode1->pMesh != pNode2->pMesh && meshCompiler.CompareMeshes(*pNode1->pMesh, *pNode2->pMesh))
-                {
-                    // Meshes are same, share them.
-                    delete pNode2->pMesh;
-                    pNode2->pMesh = pNode1->pMesh;
-                    pNode2->pSharedMesh = pNode1;
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStaticObjectCompiler::ValidateBoundingBoxes(CContentCGF* pCGF)
-{
-    static const float maxValidObjectRadius = 10000000000.0f;
-    bool ok = true;
-    for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-    {
-        const CNodeCGF* const pNode = pCGF->GetNode(i);
-        if (pNode->type == CNodeCGF::NODE_MESH && pNode->pMesh && pNode->pMesh->GetVertexCount() == 0 && pNode->pMesh->GetIndexCount() == 0)
-        {
-            const float radius = pNode->pMesh->m_bbox.GetRadius();
-            if (radius <= 0 || radius > maxValidObjectRadius || !_finite(radius))
-            {
-                RCLogWarning(
-                    "Node '%s' in file %s has an invalid bounding box, the engine will fail to load this object. Check that the node has valid geometry and is not empty.",
-                    pNode->name, pCGF->GetFilename());
-                ok = false;
-            }
-        }
-    }
-    return ok;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStaticObjectCompiler::Physicalize(CContentCGF* pCompiledCGF, CContentCGF* pSrcCGF)
-{    
-    AZ_UNUSED(pCompiledCGF);
-    AZ_UNUSED(pSrcCGF);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-inline int check_mask(unsigned int* pMask, int i)
-{
-    return pMask[i >> 5] >> (i & 31) & 1;
-}
-inline void set_mask(unsigned int* pMask, int i)
-{
-    pMask[i >> 5] |= 1u << (i & 31);
-}
-inline void clear_mask(unsigned int* pMask, int i)
-{
-    pMask[i >> 5] &= ~(1u << (i & 31));
-}
-
-
-int UpdatePtTriDist(const Vec3* vtx, const Vec3& n, const Vec3& pt, float& minDist, float& minDenom)
-{
-    float rvtx[3] = { (vtx[0] - pt).len2(), (vtx[1] - pt).len2(), (vtx[2] - pt).len2() }, elen2[2], dist, denom;
-    int i = idxmin3(rvtx), bInside[2];
-    Vec3 edge[2], dp = pt - vtx[i];
-
-    edge[0] = vtx[incm3(i)] - vtx[i];
-    elen2[0] = edge[0].len2();
-    edge[1] = vtx[decm3(i)] - vtx[i];
-    elen2[1] = edge[1].len2();
-    bInside[0] = isneg((dp ^ edge[0]) * n);
-    bInside[1] = isneg((edge[1] ^ dp) * n);
-    rvtx[i] = rvtx[i] * elen2[bInside[0]] - sqr(Util::getMax(0.0f, dp * edge[bInside[0]])) * (bInside[0] | bInside[1]);
-    denom = elen2[bInside[0]];
-
-    if (bInside[0] & bInside[1])
-    {
-        if (edge[0] * edge[1] < 0)
-        {
-            edge[0] = vtx[decm3(i)] - vtx[incm3(i)];
-            dp = pt - vtx[incm3(i)];
-            if ((dp ^ edge[0]) * n > 0)
-            {
-                dist = rvtx[incm3(i)] * edge[0].len2() - sqr(dp * edge[0]);
-                denom = edge[0].len2();
-                goto found;
-            }
-        }
-        dist = sqr((pt - vtx[0]) * n), denom = n.len2();
-    }
-    else
-    {
-        dist = rvtx[i];
-    }
-
-found:
-    if (dist * minDenom < minDist * denom)
-    {
-        minDist = dist;
-        minDenom = denom;
-        return 1;
-    }
-    return 0;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CStaticObjectCompiler::PrepareSkinData([[maybe_unused]] CNodeCGF* pNode, [[maybe_unused]] const Matrix34& mtxSkelToMesh, [[maybe_unused]] CNodeCGF* pNodeSkel, [[maybe_unused]] float r, [[maybe_unused]] bool bSwapEndian)
-{
-    assert(pNode->pMesh->m_pPositionsF16 == 0);
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStaticObjectCompiler::ProcessCompiledCGF(CContentCGF* pCGF)
-{
-    assert(pCGF->GetExportInfo()->bCompiledCGF);
-
-
-    // CGF is already compiled, so we just need to perform some validation and re-compiling steps.
-
-    ReportDuplicatedMeshNodeNames(pCGF);
-
-    m_pLODs[0] = pCGF;
-    m_bOwnLod0 = false;
-
-
-    CompileDeformablePhysData(pCGF);
-
-    // Try to split LODs
-    if (m_bSplitLODs)
-    {
-        const bool ok = SplitLODs(pCGF);
-        if (!ok)
-        {
-            return false;
-        }
-    }
-
-    ValidateBreakableJoints(pCGF);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-namespace LodHelpers
-{
-    static bool NodeHasChildren(
-        const CContentCGF* const pCGF,
-        const CNodeCGF* const pNode)
-    {
-        for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-        {
-            const CNodeCGF* const p = pCGF->GetNode(i);
-            if (p->pParent == pNode)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    static int GetLodIndex(const char* const pName, const string& lodNamePrefix)
-    {
-        if (!StringHelpers::StartsWithIgnoreCase(string(pName), lodNamePrefix))
-        {
-            return -1;
-        }
-
-        int value = 0;
-        const char* p = pName + lodNamePrefix.length();
-        while ((p[0] >= '0') && (p[0] <= '9'))
-        {
-            value = value * 10 + (p[0] - '0');
-            ++p;
-        }
-
-        return value;
-    }
-
-    static bool ValidateLodNodes(CContentCGF* const pCGF, const string& lodNamePrefix)
-    {
-        static const char* const howToFix = " Please modify and re-export source asset file.";
-
-        for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-        {
-            const CNodeCGF* const pNode = pCGF->GetNode(i);
-
-            const string nodeName = pNode->name;
-            if (!StringHelpers::StartsWithIgnoreCase(nodeName, lodNamePrefix))
-            {
-                continue;
-            }
-
-            if (nodeName.length() == lodNamePrefix.length())
-            {
-                RCLogError(
-                    "LOD node '%s' has no index. Valid name format is '%sNxxx', where N is LOD index 1-%i and xxx is any text. File: %s.%s",
-                    nodeName.c_str(), lodNamePrefix.c_str(), (int)CStaticObjectCompiler::MAX_LOD_COUNT - 1, pCGF->GetFilename(), howToFix);
-                return false;
-            }
-
-            const int lodIndex = GetLodIndex(nodeName.c_str(), lodNamePrefix);
-            if ((lodIndex <= 0) || (lodIndex >= CStaticObjectCompiler::MAX_LOD_COUNT))
-            {
-                RCLogError(
-                    "LOD node '%s' has bad or missing LOD index. Valid LOD name format is '%sNxxx', where N is LOD index 1-%i and xxx is any text. File: %s.%s",
-                    nodeName.c_str(), lodNamePrefix.c_str(), (int)CStaticObjectCompiler::MAX_LOD_COUNT - 1, pCGF->GetFilename(), howToFix);
-                return false;
-            }
-
-            if (pNode->pParent == NULL)
-            {
-                RCLogError(
-                    "LOD node '%s' has no parent node. File: %s.%s",
-                    nodeName.c_str(), pCGF->GetFilename(), howToFix);
-                return false;
-            }
-
-            if ((pNode->pParent->type != CNodeCGF::NODE_MESH) && (pNode->pParent->type != CNodeCGF::NODE_HELPER))
-            {
-                RCLogError(
-                    "LOD0 node '%s' (parent node of LOD node '%s') is neither MESH nor HELPER. File: %s.%s",
-                    pNode->pParent->name, nodeName.c_str(), pCGF->GetFilename(), howToFix);
-                return false;
-            }
-
-            if (pNode->pParent->pMesh == 0)
-            {
-                RCLogError(
-                    "LOD0 node '%s' (parent node of LOD node '%s') has no mesh data. File: %s.%s",
-                    pNode->pParent->name, nodeName.c_str(), pCGF->GetFilename(), howToFix);
-                return false;
-            }
-
-            if ((pNode->type != CNodeCGF::NODE_MESH) && (pNode->type != CNodeCGF::NODE_HELPER))
-            {
-                RCLogError(
-                    "LOD node '%s' is neither MESH nor HELPER. File %s.%s",
-                    nodeName.c_str(), pCGF->GetFilename(), howToFix);
-                return false;
-            }
-
-            if (pNode->pMesh == 0)
-            {
-                RCLogError(
-                    "LOD node '%s' has no mesh data. File: %s.%s",
-                    nodeName.c_str(), pCGF->GetFilename(), howToFix);
-                return false;
-            }
-
-            if (NodeHasChildren(pCGF, pNode))
-            {
-                RCLogError(
-                    "LOD node '%s' has children. File: %s.%s",
-                    nodeName.c_str(), pCGF->GetFilename(), howToFix);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    static void FindLodNodes(
-        std::vector<CNodeCGF*>& resultLodNodes,
-        CContentCGF* const pCGF,
-        bool bReturnSingleNode,
-        const CNodeCGF* const pParent,
-        const string& lodNamePrefix)
-    {
-        for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-        {
-            CNodeCGF* const pNode = pCGF->GetNode(i);
-
-            if (pParent && (pNode->pParent != pParent))
-            {
-                continue;
-            }
-
-            if (StringHelpers::StartsWithIgnoreCase(string(pNode->name), lodNamePrefix))
-            {
-                resultLodNodes.push_back(pNode);
-                if (bReturnSingleNode)
-                {
-                    // Caller asked for *single* arbitrary LOD node
-                    break;
-                }
-            }
-        }
-    }
-
-    static bool ValidateMeshSharing(const CContentCGF* pCGF)
-    {
-        assert(pCGF);
-
-        typedef std::set<CMesh*> MeshSet;
-        MeshSet meshes;
-
-        for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-        {
-            const CNodeCGF* const pNode = pCGF->GetNode(i);
-            assert(pNode);
-
-            if (pNode->pMesh == 0)
-            {
-                if (pNode->pSharedMesh)
-                {
-                    RCLogError(
-                        "Data integrity check failed on %s: node refers a shared node, but pointer to shared mesh is NULL. Contact an RC programmer.",
-                        pCGF->GetFilename());
-                    return false;
-                }
-            }
-            else if (pNode->pSharedMesh == 0)
-            {
-                const MeshSet::const_iterator it = meshes.find(pNode->pMesh);
-                if (it == meshes.end())
-                {
-                    meshes.insert(pNode->pMesh);
-                }
-                else
-                {
-                    RCLogError(
-                        "Data integrity check failed on %s: a mesh referenced from few nodes without using sharing. Contact an RC programmer.",
-                        pCGF->GetFilename());
-                    return false;
-                }
-            }
-            else
-            {
-                if (pNode == pNode->pSharedMesh)
-                {
-                    RCLogError(
-                        "Data integrity check failed on %s: a node refers itself. Contact an RC programmer.",
-                        pCGF->GetFilename());
-                    return false;
-                }
-                if (pNode->pSharedMesh->pSharedMesh)
-                {
-                    RCLogError(
-                        "Data integrity check failed on %s: a chain of shared nodes found. Contact an RC programmer.",
-                        pCGF->GetFilename());
-                    return false;
-                }
-                if (!pNode->pSharedMesh->pMesh)
-                {
-                    RCLogError(
-                        "Data integrity check failed on %s: mesh in shared node is NULL. Contact an RC programmer.",
-                        pCGF->GetFilename());
-                    return false;
-                }
-                if (pNode->pSharedMesh->pMesh != pNode->pMesh)
-                {
-                    RCLogError(
-                        "Data integrity check failed on %s: pointer to shared mesh does not point to mesh in shared node. Contact an RC programmer.",
-                        pCGF->GetFilename());
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    static bool CopyMeshData(CContentCGF* pCGF, CNodeCGF* pDstNode, CNodeCGF* pSrcNode)
-    {
-        assert(pDstNode != pSrcNode);
-
-        if (!ValidateMeshSharing(pCGF))
-        {
-            return false;
-        }
-
-        if (!pSrcNode->pMesh)
-        {
-            RCLogError(
-                "Unexpected empty LOD mesh in %s. Contact an RC programmer.",
-                pCGF->GetFilename());
-            return false;
-        }
-
-        if (!pDstNode->pMesh)
-        {
-            RCLogError(
-                "Unexpected empty LOD 0 mesh in %s. Contact an RC programmer.",
-                pCGF->GetFilename());
-            return false;
-        }
-
-        if (pSrcNode->pSharedMesh == pDstNode)
-        {
-            return true;
-        }
-
-        // Make destination node "meshless"
-        if (pDstNode->pSharedMesh == 0)
-        {
-            // Find new owner for destination node's mesh.
-            CNodeCGF* newOwnerOfDstMesh = 0;
-            for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-            {
-                CNodeCGF* const pNode = pCGF->GetNode(i);
-                if (pNode->pSharedMesh == pDstNode)
-                {
-                    if (newOwnerOfDstMesh == 0)
-                    {
-                        newOwnerOfDstMesh = pNode;
-                        pNode->pSharedMesh = 0;
-                    }
-                    else
-                    {
-                        pNode->pSharedMesh = newOwnerOfDstMesh;
-                    }
-                }
-            }
-            if (newOwnerOfDstMesh == 0)
-            {
-                delete pDstNode->pMesh;
-            }
-        }
-        pDstNode->pMesh = 0;
-        pDstNode->pSharedMesh = 0;
-
-        // Everyone who referred source node, now should refer destination node
-        for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-        {
-            CNodeCGF* const pNode = pCGF->GetNode(i);
-            if (pNode->pSharedMesh == pSrcNode)
-            {
-                pNode->pSharedMesh = pDstNode;
-            }
-        }
-
-        // Transfer mesh data from source to destination node
-        pDstNode->pMesh = pSrcNode->pMesh;
-        pDstNode->pSharedMesh = pSrcNode->pSharedMesh ? pSrcNode->pSharedMesh : 0;
-        pSrcNode->pSharedMesh = pDstNode;
-
-        if (!ValidateMeshSharing(pCGF))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    static bool DeleteNode(CContentCGF* pCGF, CNodeCGF* pDeleteNode)
-    {
-        assert(pDeleteNode);
-
-        if (!ValidateMeshSharing(pCGF))
-        {
-            return false;
-        }
-
-        pCGF->RemoveNode(pDeleteNode);
-
-        if (!ValidateMeshSharing(pCGF))
-        {
-            return false;
-        }
-
-        return true;
-    }
-} // namespace LodHelpers
-  //////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-bool CStaticObjectCompiler::SplitLODs(CContentCGF* pCGF)
-{
-    const string lodNamePrefix(CGF_NODE_NAME_LOD_PREFIX);
-
-    if (!LodHelpers::ValidateMeshSharing(pCGF) || !LodHelpers::ValidateLodNodes(pCGF, lodNamePrefix))
-    {
-        return false;
-    }
-
-    // Check that meshes are not damaged
-    for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-    {
-        const CNodeCGF* const pNode = pCGF->GetNode(i);
-        if (!pNode)
-        {
-            RCLogError(
-                "Unexpected NULL node in %s. Contact an RC programmer.",
-                pCGF->GetFilename());
-            return false;
-        }
-        const CMesh* const pMesh = pNode->pMesh;
-        if (!pMesh)
-        {
-            continue;
-        }
-        const char* pError = "";
-        if (!pMesh->Validate(&pError))
-        {
-            RCLogError(
-                "Mesh in node '%s' is damaged: %s. File %s.",
-                pNode->name, pError, pCGF->GetFilename());
-            return false;
-        }
-    }
-
-    std::vector<CNodeCGF*> lodNodes;
-
-    LodHelpers::FindLodNodes(lodNodes, pCGF, true, NULL, lodNamePrefix);
-    if (lodNodes.empty())
-    {
-        // We don't have any LOD nodes. Done.
-        return true;
-    }
-
-    //
-    // Collect all nodes which can potentially have LODs.
-    //
-
-    struct LodableNodeInfo
-    {
-        CNodeCGF* pNode;
-        size_t maxLodFound;
-        size_t lod0Index;
-        LodableNodeInfo(CNodeCGF* a_pNode, size_t a_maxLodFound, size_t a_lod0Index)
-            : pNode(a_pNode)
-            , maxLodFound(a_maxLodFound)
-            , lod0Index(a_lod0Index)
-        {
-            assert(a_pNode);
-        }
-    };
-    std::vector<LodableNodeInfo> lodableNodes;
-
-    for (int i = 0; i < pCGF->GetNodeCount(); ++i)
-    {
-        CNodeCGF* const pNode = pCGF->GetNode(i);
-
-        // Skip nodes which cannot have LODs
-        {
-            if (pNode->pMesh == 0)
-            {
-                continue;
-            }
-
-            if ((pNode->type != CNodeCGF::NODE_MESH) && (pNode->type != CNodeCGF::NODE_HELPER))
-            {
-                continue;
-            }
-
-            const string nodeName = pNode->name;
-            if (StringHelpers::StartsWithIgnoreCase(nodeName, lodNamePrefix))
-            {
-                continue;
-            }
-        }
-
-        //
-        // Get and analyze children LOD nodes, if any
-        //
-
-        LodableNodeInfo lodsInfo(pNode, 0, 0);
-
-        lodNodes.clear();
-        LodHelpers::FindLodNodes(lodNodes, pCGF, false, pNode, lodNamePrefix);
-        if (lodNodes.empty())
-        {
-            lodableNodes.push_back(lodsInfo);
-            continue;
-        }
-
-        CNodeCGF* arrLodNodes[MAX_LOD_COUNT] = { 0 };
-
-        for (size_t ii = 0; ii < lodNodes.size(); ++ii)
-        {
-            CNodeCGF* const pLodNode = lodNodes[ii];
-            assert(pLodNode);
-            assert(pNode == pLodNode->pParent);
-            const int lodIndex = LodHelpers::GetLodIndex(pLodNode->name, lodNamePrefix);
-            assert((lodIndex > 0) && (lodIndex < CStaticObjectCompiler::MAX_LOD_COUNT));
-            if (arrLodNodes[lodIndex])
-            {
-                RCLogError(
-                    "More than one node of LOD %i ('%s', '%s') attached to same parent node '%s' in file %s. Please modify and re-export source asset file.",
-                    lodIndex, arrLodNodes[lodIndex]->name, pLodNode->name, pNode->name, pCGF->GetFilename());
-                return false;
-            }
-            arrLodNodes[lodIndex] = pLodNode;
-
-            if (lodIndex > lodsInfo.maxLodFound)
-            {
-                lodsInfo.maxLodFound = lodIndex;
-            }
-        }
-        assert(arrLodNodes[0] == 0);
-
-        //
-        // Check LOD sequence for validity
-        //
-        {
-            arrLodNodes[0] = pNode;
-
-            // Check that we don't have gaps in the LOD sequence
-            {
-                int gapStart = -1;
-                for (int lodIndex = 1; lodIndex < MAX_LOD_COUNT; ++lodIndex)
-                {
-                    if ((gapStart < 0) && !arrLodNodes[lodIndex] && arrLodNodes[lodIndex - 1])
-                    {
-                        gapStart = lodIndex;
-                    }
-
-                    if ((gapStart >= 0) && arrLodNodes[lodIndex])
-                    {
-                        RCLogError(
-                            "Missing LOD node%s between '%s' and '%s' in file %s. Please modify and re-export source asset file.",
-                            ((lodIndex - gapStart > 1) ? "s" : ""), arrLodNodes[gapStart - 1]->name, arrLodNodes[lodIndex]->name, pCGF->GetFilename());
-                        return false;
-                    }
-                }
-            }
-
-            // Check that geometry simplification of the LODs is good
-            for (int lodIndex = 1; lodIndex < MAX_LOD_COUNT; ++lodIndex)
-            {
-                const CNodeCGF* const pLod0 = arrLodNodes[lodIndex - 1];
-                const CNodeCGF* const pLod1 = arrLodNodes[lodIndex];
-
-                if (pLod1 == 0)
-                {
-                    break;
-                }
-
-                const int subsetCount0 = pLod0->pMesh->GetSubSetCount();
-                const int subsetCount1 = pLod1->pMesh->GetSubSetCount();
-
-                if (subsetCount1 < subsetCount0)
-                {
-                    // Number of draw calls decreased. The LOD is good.
-                    continue;
-                }
-
-                if (subsetCount1 > subsetCount0)
-                {
-                    RCLogWarning(
-                        "LOD node '%s' has more submaterials used than node '%s' (%d vs %d) in file %s. Please modify and re-export source asset file.",
-                        pLod1->name, pLod0->name, subsetCount1, subsetCount0, pCGF->GetFilename());
-                    continue;
-                }
-
-                // Number of draw calls is same. Let's check that number of faces is small enough comparing to previous LOD.
-
-                const int faceCount0 = pLod0->pMesh->GetIndexCount() / 3;
-                const int faceCount1 = pLod1->pMesh->GetIndexCount() / 3;
-
-                static const float faceCountRatio = 1.5f;
-                const int maxFaceCount1 = int(faceCount0 / faceCountRatio);
-
-                if (faceCount1 > maxFaceCount1)
-                {
-                    RCLogWarning(
-                        "LOD node '%s' should have less than %2.0f%% of the faces of it's parent. It has %d faces, it's parent has %d. It should have less than %d.",
-                        pLod1->name, 100.0f / faceCountRatio, faceCount1, faceCount0, maxFaceCount1);
-                    continue;
-                }
-            }
-
-            arrLodNodes[0] = 0;
-        }
-
-        //
-        // For consoles user can mark a LOD as being LOD0. Let's handle it.
-        //
-        if (m_bConsole)
-        {
-            int newLod0 = -1;
-            for (int lodIndex = 0; lodIndex < MAX_LOD_COUNT; ++lodIndex)
-            {
-                CNodeCGF* const pLodNode = arrLodNodes[lodIndex];
-                if (pLodNode && NodeHasProperty(pLodNode, s_consolesLod0MarkerStr))
-                {
-                    newLod0 = lodIndex;
-                    break;
-                }
-            }
-
-            if (newLod0 >= 0)
-            {
-                // Breakable objects expect rendering and physics geometry matching each other,
-                // so we cannot change geometry (LOD0's by consoles_lod0's)
-
-                const string filename = StringHelpers::MakeLowerCase(PathHelpers::GetFilename(pCGF->GetFilename()));
-                if (strstr(filename.c_str(), "break"))
-                {
-                    RCLogWarning(
-                        "Ignoring property '%s' in node '%s' because the mesh is Breakable. File %s.",
-                        s_consolesLod0MarkerStr, arrLodNodes[newLod0]->name, pCGF->GetFilename());
-                    newLod0 = -1;
-                }
-            }
-
-            if (newLod0 >= 0)
-            {
-                RCLog(
-                    "Found property '%s' in node '%s' of file %s. This node becomes LOD 0.",
-                    s_consolesLod0MarkerStr, arrLodNodes[newLod0]->name, pCGF->GetFilename());
-                lodsInfo.lod0Index = newLod0;
-            }
-        }
-
-        lodableNodes.push_back(lodsInfo);
-    }
-
-    assert(!lodableNodes.empty());
-
-    //
-    // Process all nodes which can potentially have LODs.
-    //
-
-    size_t maxFinalLod = 0;
-    for (size_t lodableIndex = 0; lodableIndex < lodableNodes.size(); ++lodableIndex)
-    {
-        const LodableNodeInfo& info = lodableNodes[lodableIndex];
-        const size_t finalLod = info.maxLodFound - info.lod0Index;
-        if (finalLod > maxFinalLod)
-        {
-            maxFinalLod = finalLod;
-        }
-    }
-
-    int64 finalLodVertexCount[MAX_LOD_COUNT] = { 0 };
-    int finalLodMaxAutocopyReceiver = 0;
-    bool bUsedAutocopyLimit = false;
-
-    // Two passes: first one computes resulting mesh sizes; second one
-    // performs modifications to nodes and forms final lod lists.
-    // Between passes we will made decision about how many lod levels
-    // should be auto-copied.
-    for (int pass = 0; pass < 2; ++pass)
-    {
-        // Find maximal LOD which should receive auto-copied LODs
-        if (pass == 1)
-        {
-            for (int finalLodIndex = 1; finalLodIndex <= maxFinalLod; ++finalLodIndex)
-            {
-                const double vertexCount0 = (double)finalLodVertexCount[finalLodIndex - 1];
-                const double vertexCount1 = (double)finalLodVertexCount[finalLodIndex];
-
-                if (vertexCount1 > vertexCount0 * 0.6)
-                {
-                    // size of this LOD is more than 60% of previous LOD,
-                    // so it's better to disable auto-copying to this LOD
-                    break;
-                }
-
-                finalLodMaxAutocopyReceiver = finalLodIndex;
-            }
-        }
-
-        for (size_t lodableIndex = 0; lodableIndex < lodableNodes.size(); ++lodableIndex)
-        {
-            const LodableNodeInfo& info = lodableNodes[lodableIndex];
-
-            CNodeCGF* const pNode = info.pNode;
-            assert(info.lod0Index + maxFinalLod >= info.maxLodFound);
-
-            lodNodes.clear();
-            LodHelpers::FindLodNodes(lodNodes, pCGF, false, pNode, lodNamePrefix);
-
-            CNodeCGF* arrLodNodes[MAX_LOD_COUNT] = { 0 };
-
-            for (size_t i = 0; i < lodNodes.size(); ++i)
-            {
-                CNodeCGF* const pLodNode = lodNodes[i];
-                const int lodIndex = LodHelpers::GetLodIndex(pLodNode->name, lodNamePrefix);
-                assert((lodIndex > 0) && (lodIndex < CStaticObjectCompiler::MAX_LOD_COUNT));
-                arrLodNodes[lodIndex] = pLodNode;
-            }
-            arrLodNodes[0] = pNode;
-
-            // Handle shifting LODs according to consoles_lod0
-            if ((pass == 1) && (info.lod0Index > 0))
-            {
-                if (!LodHelpers::CopyMeshData(pCGF, pNode, arrLodNodes[info.lod0Index]))
-                {
-                    return false;
-                }
-
-                // Delete unused LOD nodes
-                for (int lodIndex = 1; lodIndex <= info.lod0Index; ++lodIndex)
-                {
-                    if (arrLodNodes[lodIndex])
-                    {
-                        if (!LodHelpers::DeleteNode(pCGF, arrLodNodes[lodIndex]))
-                        {
-                            return false;
-                        }
-                    }
-                }
-
-                arrLodNodes[info.lod0Index] = pNode;
-            }
-
-            // Add LOD nodes to appropriate CGF objects
-            static const bool bShowAutcopyStatistics = false;
-            CNodeCGF* pLastLodNode = arrLodNodes[info.lod0Index];
-            for (int finalLodIndex = 0; finalLodIndex <= maxFinalLod; ++finalLodIndex)
-            {
-                const size_t lodIndex = info.lod0Index + finalLodIndex;
-
-                const bool bDuplicate = ((lodIndex >= MAX_LOD_COUNT) || (arrLodNodes[lodIndex] == 0));
-                CNodeCGF* const pLodNode = bDuplicate ? pLastLodNode : arrLodNodes[lodIndex];
-
-                if (bDuplicate && (pNode->name[0] == '$'))
-                {
-                    // No need to autocopy special nodes, engine doesn't handle them
-                    // correctly when they are stored in LODs
-                    continue;
-                }
-
-                if ((pass == 0) || (finalLodIndex == 0))
-                {
-                    if (pass == 0)
-                    {
-                        finalLodVertexCount[finalLodIndex] += pLodNode->pMesh->GetVertexCount();
-                    }
-                    continue;
-                }
-
-                if (bDuplicate && (pLodNode->pMesh->GetVertexCount() <= 0))
-                {
-                    // No need to autocopy meshes without geometry, streaming in the
-                    // engine doesn't use such nodes.
-                    continue;
-                }
-
-                if (bDuplicate && (finalLodIndex > finalLodMaxAutocopyReceiver))
-                {
-                    bUsedAutocopyLimit = true;
-                    continue;
-                }
-
-                if constexpr (bShowAutcopyStatistics && bDuplicate)
-                {
-                    const int subsetCount = pLodNode->pMesh->GetSubSetCount();
-                    const int faceCount = pLodNode->pMesh->GetIndexCount() / 3;
-                    const int vertexCount = pLodNode->pMesh->GetVertexCount();
-                    RCLogWarning(
-                        "@,%u,%u,%u,%u,%u,%s,%s",
-                        (uint)finalLodIndex - 1, (uint)maxFinalLod, (uint)subsetCount, (uint)faceCount, (uint)vertexCount, pLodNode->name, pCGF->GetFilename());
-                }
-
-                if (pLodNode != pNode)
-                {
-                    cry_strcpy(pLodNode->name, pNode->name);
-                    pLodNode->pParent = 0;
-                }
-
-                CContentCGF* const pLodCGF = (m_pLODs[finalLodIndex] == 0)
-                    ? MakeLOD(finalLodIndex, pCGF)
-                    : m_pLODs[finalLodIndex];
-
-                // Note: we should set lod nodes' pParent to 0 right before saving lod nodes to
-                // a file. Otherwise parent nodes (LOD0 and its parents) will be exported also,
-                // which is wrong for lod files.
-                // Note that we cannot set pParent to 0 *here*, because in case of LODs auto-copying
-                // the lod node can actually be the LOD0 node (pLodNome == pNode), so setting its
-                // pParent to 0 will destroy LOD0's parenting info, which is bad, because we really
-                // need to have proper hierarchy for LOD0 CGF.
-                pLodCGF->AddNode(pLodNode);
-
-                pLastLodNode = pLodNode;
-            }
-
-            // Delete LOD nodes from LOD0 CGF
-            if (pass == 1)
-            {
-                for (int finalLodIndex = 1; finalLodIndex < MAX_LOD_COUNT; ++finalLodIndex)
-                {
-                    const size_t lodIndex = info.lod0Index + finalLodIndex;
-                    if ((lodIndex < MAX_LOD_COUNT) && arrLodNodes[lodIndex])
-                    {
-                        if (!LodHelpers::DeleteNode(pCGF, arrLodNodes[lodIndex]))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (bUsedAutocopyLimit)
-    {
-        RCLogWarning(
-            "Autocopying LODs was limited to LOD %d because vertex count difference between LODs is less than 40%% (%lli vs %lli). File %s.",
-            finalLodMaxAutocopyReceiver, finalLodVertexCount[finalLodMaxAutocopyReceiver], finalLodVertexCount[finalLodMaxAutocopyReceiver + 1], pCGF->GetFilename());
-    }
-
-    if (!LodHelpers::ValidateMeshSharing(pCGF) || !LodHelpers::ValidateLodNodes(pCGF, lodNamePrefix))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CContentCGF* CStaticObjectCompiler::MakeLOD(int lodIndex, const CContentCGF* pCGF)
-{
-    assert((lodIndex >= 0) && (lodIndex < MAX_LOD_COUNT));
-
-    if (m_pLODs[lodIndex])
-    {
-        return 0;
-    }
-
-    const string filename = pCGF->GetFilename();
-    m_pLODs[lodIndex] = new CContentCGF(filename.c_str());
-
-    CContentCGF* pCompiledCGF = m_pLODs[lodIndex];
-    *pCompiledCGF->GetExportInfo() = *pCGF->GetExportInfo(); // Copy export info.
-    *pCompiledCGF->GetPhysicalizeInfo() = *pCGF->GetPhysicalizeInfo();
-    pCompiledCGF->GetExportInfo()->bCompiledCGF = true;
-    pCompiledCGF->GetUsedMaterialIDs() = pCGF->GetUsedMaterialIDs();
-    *pCompiledCGF->GetSkinningInfo() = *pCGF->GetSkinningInfo();
-
-    if (lodIndex > 0 && m_pLODs[0])
-    {
-        m_pLODs[0]->GetExportInfo()->bHaveAutoLods = true;
-    }
-
-    return m_pLODs[lodIndex];
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CStaticObjectCompiler::MakeMergedCGF(CContentCGF* pCompiledCGF, CContentCGF* pCGF)
-{
-    std::vector<CNodeCGF*> merge_nodes;
-    for (int i = 0; i < pCGF->GetNodeCount(); i++)
-    {
-        CNodeCGF* pNode = pCGF->GetNode(i);
-        if (pNode->pMesh && !pNode->bPhysicsProxy && pNode->type == CNodeCGF::NODE_MESH)
-        {
-            merge_nodes.push_back(pNode);
-        }
-    }
-
-    if (merge_nodes.empty())
-    {
-        RCLogError("Error merging nodes, No mergeable geometry in CGF %s", pCGF->GetFilename());
-        return false;
-    }
-
-    CMesh* pMergedMesh = new CMesh;
-    string errorMessage;
-    if (!CGFNodeMerger::MergeNodes(pCGF, merge_nodes, errorMessage, pMergedMesh))
-    {
-        RCLogError("Error merging nodes: %s, in CGF %s", errorMessage.c_str(), pCGF->GetFilename());
-        delete pMergedMesh;
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Add single node for merged mesh.
-    CNodeCGF* pNode = new CNodeCGF;
-    pNode->type = CNodeCGF::NODE_MESH;
-    cry_strcpy(pNode->name, "Merged");
-    pNode->bIdentityMatrix = true;
-    pNode->pMesh = pMergedMesh;
-    pNode->pMaterial = pCGF->GetCommonMaterial();
-
-    CNodeCGF* pMergedNode = pNode;
-
-    // Add node to CGF contents.
-    pCompiledCGF->AddNode(pNode);
-    //////////////////////////////////////////////////////////////////////////
-
-    const string lodNamePrefix(CGF_NODE_NAME_LOD_PREFIX);
-
-    for (int nLod = 1; nLod < MAX_LOD_COUNT; nLod++)
-    {
-        // Try to merge LOD nodes.
-        merge_nodes.clear();
-        for (int i = 0; i < pCGF->GetNodeCount(); i++)
-        {
-            CNodeCGF* pNode2 = pCGF->GetNode(i);
-            if (pNode2->pMesh && !pNode2->bPhysicsProxy && pNode2->type == CNodeCGF::NODE_HELPER)
-            {
-                const string nodeName(pNode2->name);
-                if (StringHelpers::StartsWithIgnoreCase(nodeName, lodNamePrefix))
-                {
-                    if (nodeName.length() <= lodNamePrefix.length())
-                    {
-                        RCLogError("Error merging LOD %d nodes: LOD node name '%s' doesn't contain LOD index in CGF %s", nLod, nodeName.c_str(), pCGF->GetFilename());
-                        return false;
-                    }
-                    const int lodIndex = atoi(nodeName.c_str() + lodNamePrefix.length());
-                    if (lodIndex == nLod)
-                    {
-                        // This is a LOD helper.
-                        merge_nodes.push_back(pNode2);
-                    }
-                }
-            }
-        }
-        if (!merge_nodes.empty())
-        {
-            CMesh* pMergedLodMesh = new CMesh;
-            string errorMessage2;
-            if (!CGFNodeMerger::MergeNodes(pCGF, merge_nodes, errorMessage2, pMergedLodMesh))
-            {
-                RCLogError("Error merging LOD %d nodes: %s, in CGF %s", nLod, errorMessage2.c_str(), pCGF->GetFilename());
-                delete pMergedLodMesh;
-                return false;
-            }
-
-            //////////////////////////////////////////////////////////////////////////
-            // Add LOD node
-            //////////////////////////////////////////////////////////////////////////
-            //////////////////////////////////////////////////////////////////////////
-            // Add single node for merged mesh.
-            CNodeCGF* pNode2 = new CNodeCGF;
-            pNode2->type = CNodeCGF::NODE_HELPER;
-            pNode2->helperType = HP_GEOMETRY;
-            azsnprintf(pNode2->name, sizeof(pNode2->name), "%s%d_%s", lodNamePrefix.c_str(), nLod, pMergedNode->name);
-            pNode2->bIdentityMatrix = true;
-            pNode2->pMesh = pMergedLodMesh;
-            pNode2->pParent = pMergedNode;
-            pNode2->pMaterial = pCGF->GetCommonMaterial();
-
-            // Add node to CGF contents.
-            pCompiledCGF->AddNode(pNode2);
-            //////////////////////////////////////////////////////////////////////////
-        }
-    }
-
-    // Add rest of the helper nodes.
-    int numNodes = pCGF->GetNodeCount();
-    for (int i = 0; i < numNodes; i++)
-    {
-        CNodeCGF* pNode2 = pCGF->GetNode(i);
-
-        if (pNode2->type != CNodeCGF::NODE_MESH)
-        {
-            // Do not add LOD nodes.
-            if (!StringHelpers::StartsWithIgnoreCase(string(pNode2->name), lodNamePrefix))
-            {
-                if (pNode2->pParent && pNode2->pParent->type == CNodeCGF::NODE_MESH)
-                {
-                    pNode2->pParent = pMergedNode;
-                }
-                pCompiledCGF->AddNode(pNode2);
-            }
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CStaticObjectCompiler::GetSubMeshCount(const CContentCGF* pCGFLod0)
-{
-    int subMeshCount = 0;
-    if (pCGFLod0)
-    {
-        const int nodeCount = pCGFLod0->GetNodeCount();
-        for (int i = 0; i < nodeCount; ++i)
-        {
-            const CNodeCGF* const pNode = pCGFLod0->GetNode(i);
-            if (pNode && pNode->type == CNodeCGF::NODE_MESH && pNode->pMesh)
-            {
-                ++subMeshCount;
-            }
-        }
-    }
-    return subMeshCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CStaticObjectCompiler::GetJointCount(const CContentCGF* pCGF)
-{
-    int jointCount = 0;
-    if (pCGF)
-    {
-        const int nodeCount = pCGF->GetNodeCount();
-        for (int i = 0; i < nodeCount; ++i)
-        {
-            const CNodeCGF* const pNode = pCGF->GetNode(i);
-            if (pNode && pNode->type == CNodeCGF::NODE_HELPER && StringHelpers::StartsWith(pNode->name, "$joint"))
-            {
-                ++jointCount;
-            }
-        }
-    }
-    return jointCount;
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/StaticObjectCompiler.h b/Code/Tools/RC/ResourceCompilerPC/StaticObjectCompiler.h
deleted file mode 100644
index eea8f75622..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/StaticObjectCompiler.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_STATICOBJECTCOMPILER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_STATICOBJECTCOMPILER_H
-#pragma once
-
-
-#include "ConvertContext.h"
-
-class CContentCGF;
-struct CMaterialCGF;
-class CMesh;
-class CPhysicsInterface;
-//START: Add Skinned Geometry (.CGF) export type (for touch bending vegetation)
-struct CSkinningInfo;
-struct SFoliageInfoCGF;
-struct SSpineRC;
-//END: Add Skinned Geometry (.CGF) export type (for touch bending vegetation)
-struct CNodeCGF;
-
-class CStaticObjectCompiler
-{
-public:
-    CStaticObjectCompiler(bool bConsole, int logVerbosityLevel = 0);
-    ~CStaticObjectCompiler();
-
-    void SetSplitLods(bool bSplit);
-    // Confetti: Nicholas Baldwin
-    void SetOptimizeStripify(bool bStripify);
-    void SetUseMikkTB(bool bUseMikkTB);
-
-    CContentCGF* MakeCompiledCGF(CContentCGF* pCGF, bool const forceRecompile = false);
-
-    static int GetSubMeshCount(const CContentCGF* pCGFLod0);
-    static int GetJointCount(const CContentCGF* pCGF);
-
-private:
-    bool ProcessCompiledCGF(CContentCGF* pCGF);
-
-    void AnalyzeSharedMeshes(CContentCGF* pCGF);
-    bool CompileMeshes(CContentCGF* pCGF);
-
-    bool SplitLODs(CContentCGF* pCGF);
-    CContentCGF* MakeLOD(int nLodNum, const CContentCGF* pCGF);
-
-    bool Physicalize(CContentCGF* pCompiledCGF, CContentCGF* pSrcCGF);
-    void CompileDeformablePhysData(CContentCGF* pCGF);
-    void PrepareSkinData(CNodeCGF* pNode, const Matrix34& mtxSkelToMesh, CNodeCGF* pNodeSkel, float r, bool bSwapEndian);
-
-    bool ValidateBoundingBoxes(CContentCGF* pCGF);
-    void ValidateBreakableJoints(const CContentCGF* pCGF);
-
-    bool MakeMergedCGF(CContentCGF* pCompiledCGF, CContentCGF* pCGF);
-
-private:
-    bool m_bSplitLODs;
-    bool m_bOwnLod0;
-    bool m_bConsole;
-    int m_logVerbosityLevel;
-    bool m_bUseMikkTB;
-    // Confetti: Nicholas Baldwin
-    bool m_bOptimizePVRStripify;
-
-public:
-    enum
-    {
-        MAX_LOD_COUNT = 6
-    };
-    CContentCGF* m_pLODs[MAX_LOD_COUNT];
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_STATICOBJECTCOMPILER_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Materials/GettingStartedMaterials/gs_block.mtl b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Materials/GettingStartedMaterials/gs_block.mtl
deleted file mode 100644
index 59661eeded..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Materials/GettingStartedMaterials/gs_block.mtl
+++ /dev/null
@@ -1,23 +0,0 @@
-<Material MtlFlags="524544" vertModifType="0">
- <SubMaterials>
-  <Material Name="Block_01" MtlFlags="524416" Shader="Illum" GenMask="80000001" StringGenMask="%ALLOW_SILHOUETTE_POM%SUBSURFACE_SCATTERING" SurfaceType="mat_wood" MatTemplate="" Diffuse="0.016807377,0.12743771,0.016807377" Specular="0,0,0" Emissive="0,0,0" Opacity="1" Shininess="10" CloakAmount="0" vertModifType="0" LayerAct="1">
-   <Textures>
-    <Texture Map="Diffuse" File="textures/gettingstartedtextures/white.tif"/>
-   </Textures>
-   <PublicParams SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
-  </Material>
-  <Material Name="Block_02" MtlFlags="524416" Shader="Illum" GenMask="80000001" StringGenMask="%ALLOW_SILHOUETTE_POM%SUBSURFACE_SCATTERING" SurfaceType="mat_wood" MatTemplate="" Diffuse="0.12743771,0.016807377,0.016807377" Specular="0,0,0" Emissive="0,0,0" Opacity="1" Shininess="10" CloakAmount="0" vertModifType="0" LayerAct="1">
-   <Textures>
-    <Texture Map="Diffuse" File="textures/gettingstartedtextures/white.tif"/>
-   </Textures>
-   <PublicParams SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
-  </Material>
-  <Material Name="Block_03" MtlFlags="524416" Shader="Illum" GenMask="80000001" StringGenMask="%ALLOW_SILHOUETTE_POM%SUBSURFACE_SCATTERING" SurfaceType="mat_wood" MatTemplate="" Diffuse="0.016807377,0.016807377,0.12743771" Specular="0,0,0" Emissive="0,0,0" Opacity="1" Shininess="10" CloakAmount="0" vertModifType="0" LayerAct="1">
-   <Textures>
-    <Texture Map="Diffuse" File="textures/gettingstartedtextures/white.tif"/>
-   </Textures>
-   <PublicParams SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
-  </Material>
- </SubMaterials>
- <PublicParams SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
-</Material>
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/CGF_LOD_Test.cgf b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/CGF_LOD_Test.cgf
deleted file mode 100644
index 808932ce83..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/CGF_LOD_Test.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c02e949b50a340cb7507c14ce7b01933ed471f03d8d11f3d191f0063c85fca2e
-size 33820
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/GettingStartedAssets/gs_block.cgf b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/GettingStartedAssets/gs_block.cgf
deleted file mode 100644
index 7b2cf557dd..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/GettingStartedAssets/gs_block.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7acc775dee00c5ae3be27578ca8722935b6afbaaa53348667291ad57c3f76b62
-size 2948
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Grass_Atlas_matGroup.mtl b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Grass_Atlas_matGroup.mtl
deleted file mode 100644
index b13dab406c..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Grass_Atlas_matGroup.mtl
+++ /dev/null
@@ -1,12 +0,0 @@
-<Material MtlFlags="557312" DccMaterialHash="0" vertModifType="0">
- <SubMaterials>
-  <Material Name="Grass_Atlas" MtlFlags="524416" DccMaterialHash="0" Shader="Vegetation" GenMask="2400201000" StringGenMask="%DETAIL_BENDING%GRASS%TEMP_VEGETATION%VERTCOLORS" SurfaceType="mat_default" Diffuse="1,1,1,1" Specular="0,0,0,1" Opacity="1" Shininess="10" AlphaTest="0.46000001" vertModifType="0" LayerAct="1">
-   <Textures>
-    <Texture Map="Diffuse" File="objects/natural/vegetation/grass_atlas_diff.dds">
-     <TexMod TexMod_RotateType="0" TexMod_TexGenType="0" TexMod_bTexGenProjected="0"/>
-    </Texture>
-   </Textures>
-   <PublicParams bendDetailLeafAmplitude="0.2" bendDetailFrequency="1" bendDetailBranchAmplitude="-0.5" BlendTerrainCol="0" NormalViewDependency="0.5" TransmittanceColor="1,1,0.60000002" BackDiffuseMultiplier="1" BlendTerrainColDist="0.5" IndirectColor="0.25,0.25,0.25"/>
-  </Material>
- </SubMaterials>
-</Material>
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/cube_material_same_folder.cgf b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/cube_material_same_folder.cgf
deleted file mode 100644
index 3cecb48604..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/cube_material_same_folder.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ba56813f5d8e5c73e7d245154e130ed8fbb43dd4891fac0b9977f9383db62dd
-size 2440
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/primitives_001_diff.tif b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/primitives_001_diff.tif
deleted file mode 100644
index 9477c21bc8..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/primitives_001_diff.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35452caba31ce0de0c53bd811e5c35e826e9b4b7c058458199ae83b0553ed8e9
-size 28088
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/primitives_001_mg.mtl b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/primitives_001_mg.mtl
deleted file mode 100644
index 594908e410..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Objects/Primitives/primitives_001_mg.mtl
+++ /dev/null
@@ -1,13 +0,0 @@
-<Material MtlFlags="524544" vertModifType="0">
- <SubMaterials>
-  <Material Name="primitives_default_001_mat" MtlFlags="524416" Shader="Illum" GenMask="80000001" StringGenMask="%ALLOW_SILHOUETTE_POM%SUBSURFACE_SCATTERING" SurfaceType="" Diffuse="1,1,1" Specular="0.5,0.5,0.5" Emissive="0,0,0" Opacity="1" Shininess="10" vertModifType="0" LayerAct="1">
-   <Textures>
-    <Texture Map="Diffuse" File="primitives_001_diff.tif"/>
-   </Textures>
-   <PublicParams SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
-  </Material>
-  <Material Name="primitives_proxy_001_mat" MtlFlags="525440" Shader="Nodraw" GenMask="0" StringGenMask="" SurfaceType="mat_nodraw" Diffuse="1,0,0" Specular="0.5,0.5,0.5" Emissive="0,0,0" Opacity="1" Shininess="10" vertModifType="0" LayerAct="1">
-   <Textures />
-  </Material>
- </SubMaterials>
-</Material>
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Textures/GettingStartedTextures/White.tif b/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Textures/GettingStartedTextures/White.tif
deleted file mode 100644
index f2fd79749e..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/Textures/GettingStartedTextures/White.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a44a5b1b222256a1904ea8da54cfb70db6cc1944b42a15a3ab0a78443e7a4252
-size 812376
diff --git a/Code/Tools/RC/ResourceCompilerPC/Tests/test_Main.cpp b/Code/Tools/RC/ResourceCompilerPC/Tests/test_Main.cpp
deleted file mode 100644
index 19d1e380e1..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Tests/test_Main.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "ResourceCompilerPC_precompiled.h"
-#include <AzTest/AzTest.h>
-#include <AzTest/Utils.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzCore/Utils/Utils.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include "../CryEngine/Cry3DEngine/CGF/CGFLoader.h"
-
-#include "StatCGFCompiler.h"
-#include "MultiplatformConfig.h"
-#include <QTemporaryDir>
-
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
-
-
-AZStd::string GetTestAssetRootPath()
-{
-    char resolvedDir[AZ_MAX_PATH_LEN];
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(
-        "@engroot@/Code/Tools/RC/ResourceCompilerPC/Tests/TestAssets/SamplesProject/",
-        resolvedDir, sizeof(resolvedDir));
-    return AZStd::string(resolvedDir);
-}
-
-
-// This is a dummy ResourceCompiler object overload.
-// The CGF compiler is heavily dependent upon a ResourceCompiler object existing, so this overload
-// just does the minimum amount of work to allow the CGF compiler to query it for default values and
-// specific values needed for our test cases.
-class ResourceCompilerForTesting
-    : public IResourceCompiler
-    , public IConfigKeyRegistry
-{
-public:
-    ResourceCompilerForTesting()
-    {
-        platformInfo.SetName(0, "pc");
-        platformInfo.bBigEndian = false;
-    }
-    virtual ~ResourceCompilerForTesting() {}
-
-    //IConfigKeyRegistry
-    virtual void VerifyKeyRegistration([[maybe_unused]] const char* szKey) const {}
-    virtual bool HasKeyRegistered([[maybe_unused]] const char* szKey) const { return false; }
-
-    //IResourceCompiler
-    virtual void RegisterConvertor([[maybe_unused]] const char* name, [[maybe_unused]] IConvertor* conv) {}
-    virtual IPakSystem* GetPakSystem() { return nullptr; }
-    virtual const ICfgFile* GetIniFile() const { return nullptr; }
-    virtual int GetPlatformCount() const { return 1; }
-    virtual const PlatformInfo* GetPlatformInfo([[maybe_unused]] int index) const { return &platformInfo; }
-    virtual int FindPlatform([[maybe_unused]] const char* name) const { return 0; }
-    virtual void AddInputOutputFilePair([[maybe_unused]] const char* inputFilename, [[maybe_unused]] const char* outputFilename) {}
-    virtual void MarkOutputFileForRemoval([[maybe_unused]] const char* sOutputFilename) {}
-    virtual void AddExitObserver([[maybe_unused]] IExitObserver* p) {}
-    virtual void RemoveExitObserver([[maybe_unused]] IExitObserver* p) {}
-    virtual IRCLog* GetIRCLog() { return nullptr; }
-    virtual int GetVerbosityLevel() const { return 0; }
-    virtual const SFileVersion& GetFileVersion() const { return fileVersionInfo; }
-    virtual const void GetGenericInfo([[maybe_unused]] char* buffer, [[maybe_unused]] size_t bufferSize, [[maybe_unused]] const char* rowSeparator) const {}
-    virtual void RegisterKey([[maybe_unused]] const char* key, [[maybe_unused]] const char* helptxt) {}
-    virtual const char* GetExePath() const { return nullptr; }
-    virtual const char* GetTmpPath() const { return nullptr; }
-    virtual const char* GetInitialCurrentDir() const { return nullptr; }
-    virtual XmlNodeRef LoadXml([[maybe_unused]] const char* filename) { XmlNodeRef tmp; return tmp; }
-    virtual XmlNodeRef CreateXml([[maybe_unused]] const char* tag) { XmlNodeRef tmp; return tmp; }
-    virtual bool CompileSingleFileBySingleProcess([[maybe_unused]] const char* filename) { return true; }
-    virtual void SetAssetWriter([[maybe_unused]] IAssetWriter* pAssetWriter) {}
-    virtual IAssetWriter* GetAssetWriter() const { return nullptr; }
-    virtual const char* GetAppRoot() const { return nullptr; }
-
-    SFileVersion fileVersionInfo;
-    PlatformInfo platformInfo;
-    MultiplatformConfig localMultiConfig;
-};
-
-class CGFBuilderTest
-    : public ::testing::Test
-{
-protected:
-    AZStd::string GetTemporaryDirectory()
-    {
-        QString tempPath = m_temporaryDirectory.path();
-        return AZStd::string(tempPath.toUtf8().constData());
-    }
-
-    void SetUp() override
-    {
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-        AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
-        AZ::AllocatorInstance<CryStringAllocator>::Create();
-
-        m_app.reset(aznew AzToolsFramework::ToolsApplication());
-        AZ::ComponentApplication::Descriptor desc;
-        desc.m_useExistingAllocator = true;
-        m_app->Start(desc);
-
-        // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
-        // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
-        // in the unit tests.
-        AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
-
-        AssetBuilderSDK::InitializeSerializationContext();
-
-        const AZStd::string engroot = AZ::Test::GetEngineRootPath();
-        AZ::IO::FileIOBase::GetInstance()->SetAlias("@engroot@", engroot.c_str());
-
-        AZ::IO::Path assetRoot(AZ::Utils::GetProjectPath());
-        assetRoot /= "Cache";
-        AZ::IO::FileIOBase::GetInstance()->SetAlias("@root@", assetRoot.c_str());
-
-        m_rc = new ResourceCompilerForTesting();
-        m_compiler = new CStatCGFCompiler();
-
-        m_rc->localMultiConfig.init(1, 0, m_rc);
-        m_rc->localMultiConfig.setActivePlatform(0);
-    }
-
-    void TearDown() override
-    {
-        delete m_compiler;
-        delete m_rc;
-        m_compiler = nullptr;
-        m_rc = nullptr;
-        m_app->Stop();
-        m_app = nullptr;
-
-        AZ::AllocatorInstance<CryStringAllocator>::Destroy();
-        AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-    }
-
-    void LoadCompileAndValidateCGF(const AZStd::string& cgfName, const AZStd::string& cgfPath, const AZStd::string& outputPath, AssetBuilderSDK::ProcessJobResponse& response);
-
-    AZStd::unique_ptr<AzToolsFramework::ToolsApplication> m_app;
-    QTemporaryDir m_temporaryDirectory;
-
-    CStatCGFCompiler* m_compiler = nullptr;
-    ResourceCompilerForTesting* m_rc = nullptr;
-};
-
-void CGFBuilderTest::LoadCompileAndValidateCGF(const AZStd::string& cgfName, const AZStd::string& cgfPath, const AZStd::string& outputPath, AssetBuilderSDK::ProcessJobResponse& response)
-{
-    // Pass in a custom asset root to the CGF compiler because our test assets are not going through AP
-    AZStd::string assetRoot(GetTestAssetRootPath());
-    
-    // Our test assets came from SamplesProject, so emulate that being our game project
-    AZStd::string gameFolder = "SamplesProject";
-
-    IConvertContext* const pCC = m_compiler->GetConvertContext();
-    pCC->SetMultiplatformConfig(&m_rc->localMultiConfig);
-    pCC->SetRC(m_rc);
-
-    pCC->SetForceRecompiling(true);
-    pCC->SetConvertorExtension(".cgf");
-    pCC->SetSourceFileNameOnly(cgfName.c_str());
-    pCC->SetSourceFolder(cgfPath.c_str());
-    pCC->SetOutputFolder(outputPath.c_str());
-
-    bool compileSuccess = m_compiler->CompileCGF(response, assetRoot, gameFolder);
-
-    EXPECT_TRUE(compileSuccess);
-
-    bool responseSuccess = m_compiler->WriteResponse(outputPath.c_str(), response, compileSuccess);
-
-    EXPECT_TRUE(responseSuccess);
-}
-
-// In this case, we load a basic CGF where the material path is just the name of the material file, 
-// so it is assumed that material is in the same folder as the CGF
-TEST_F(CGFBuilderTest, CGF_MaterialInSameFolder)
-{
-    AZStd::string cgfName = "cube_material_same_folder.cgf";
-
-    AZStd::string cgfPath(PathHelpers::Join(GetTestAssetRootPath().c_str(),"Objects/Primitives/"));
-
-    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, cgfPath);
-    AZStd::string outputPath = GetTemporaryDirectory();
-
-    AZStd::string expectedMaterialPath;
-    AzFramework::StringFunc::AssetDatabasePath::Join(cgfPath.c_str(), "primitives_001_mg.mtl", expectedMaterialPath);
-
-    AssetBuilderSDK::ProcessJobResponse response;
-    LoadCompileAndValidateCGF(cgfName, cgfPath, outputPath, response);
-
-    ASSERT_EQ(response.m_outputProducts.size(), 1);
-    AZStd::string productPath = response.m_outputProducts[0].m_productFileName;
-    EXPECT_TRUE(productPath == "cube_material_same_folder.cgf"); // Path would be relative to the AP temp directory, so just the file name itself
-
-    ASSERT_EQ(response.m_outputProducts[0].m_pathDependencies.size(), 1);
-    AssetBuilderSDK::ProductPathDependency& dependency = *response.m_outputProducts[0].m_pathDependencies.begin();
-    AZStd::string materialPath = dependency.m_dependencyPath;
-    EXPECT_TRUE(materialPath == expectedMaterialPath);
-    EXPECT_EQ(dependency.m_dependencyType, AssetBuilderSDK::ProductPathDependencyType::SourceFile);
-}
-
-// In this case, we load a basic CGF where the material path is absolute from the dev/ folder,
-// for example "automatedtesting/materials/test.mtl".
-TEST_F(CGFBuilderTest, CGF_MaterialInDifferentFolder)
-{
-    AZStd::string cgfName = "gs_block.cgf";
-    AZStd::string cgfPath(PathHelpers::Join(GetTestAssetRootPath().c_str(), "Objects/GettingStartedAssets/"));
-    AZStd::string outputPath = GetTemporaryDirectory();
-
-    AssetBuilderSDK::ProcessJobResponse response;
-    LoadCompileAndValidateCGF(cgfName, cgfPath, outputPath, response);
-
-    ASSERT_EQ(response.m_outputProducts.size(), 1);
-    AZStd::string productPath = response.m_outputProducts[0].m_productFileName;
-    EXPECT_TRUE(productPath == "gs_block.cgf"); // Path would be relative to the AP temp directory, so just the file name itself
-
-    ASSERT_EQ(response.m_outputProducts[0].m_pathDependencies.size(), 1);
-    AssetBuilderSDK::ProductPathDependency& dependency = *response.m_outputProducts[0].m_pathDependencies.begin();
-    AZStd::string materialPath = dependency.m_dependencyPath;
-    EXPECT_TRUE(materialPath == "materials/gettingstartedmaterials/gs_block.mtl");
-    EXPECT_EQ(dependency.m_dependencyType, AssetBuilderSDK::ProductPathDependencyType::ProductFile);
-}
-
-// A simple CGF with 2 lods, outputting to just 1 compiled CGF file
-TEST_F(CGFBuilderTest, CGF_WithLOD_NoSplit)
-{
-    AZStd::string cgfName = "CGF_LOD_Test.cgf";
-
-    AZStd::string cgfPath(PathHelpers::Join(GetTestAssetRootPath().c_str(), "Objects/"));
-
-    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, cgfPath);
-    AZStd::string outputPath = GetTemporaryDirectory();
-
-    AZStd::string expectedMaterialPath;
-    AzFramework::StringFunc::AssetDatabasePath::Join(cgfPath.c_str(), "Grass_Atlas_matGroup.mtl", expectedMaterialPath);
-
-    m_rc->localMultiConfig.setKeyValue(eCP_PriorityLowest, "SplitLODs", "false");
-
-    AssetBuilderSDK::ProcessJobResponse response;
-    LoadCompileAndValidateCGF(cgfName, cgfPath, outputPath, response);
-
-    ASSERT_EQ(response.m_outputProducts.size(), 1);
-    AZStd::string productPath = response.m_outputProducts[0].m_productFileName;
-    EXPECT_TRUE(productPath == "CGF_LOD_Test.cgf"); // Path would be relative to the AP temp directory, so just the file name itself
-
-    ASSERT_EQ(response.m_outputProducts[0].m_pathDependencies.size(), 1);
-    AssetBuilderSDK::ProductPathDependency& dependency = *response.m_outputProducts[0].m_pathDependencies.begin();
-    AZStd::string materialPath = dependency.m_dependencyPath;
-    EXPECT_TRUE(materialPath == expectedMaterialPath);
-}
-
-// A simple CGF with 2 lods, outputting to a unique CGF per lod
-TEST_F(CGFBuilderTest, CGF_WithLOD_Split)
-{
-    AZStd::string cgfName = "CGF_LOD_Test.cgf";
-
-    AZStd::string cgfPath(PathHelpers::Join(GetTestAssetRootPath().c_str(), "Objects/"));
-    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, cgfPath);
-    AZStd::string outputPath = GetTemporaryDirectory();
-
-    m_rc->localMultiConfig.setKeyValue(eCP_PriorityLowest, "SplitLODs", "true");
-
-    AssetBuilderSDK::ProcessJobResponse response;
-    LoadCompileAndValidateCGF(cgfName, cgfPath, outputPath, response);
-
-    ASSERT_EQ(response.m_outputProducts.size(), 3);
-    AZStd::string productPath = response.m_outputProducts[0].m_productFileName;
-    EXPECT_TRUE(productPath == "CGF_LOD_Test.cgf");
-
-    productPath = response.m_outputProducts[1].m_productFileName;
-    EXPECT_TRUE(productPath == "CGF_LOD_Test_lod1.cgf");
-
-    productPath = response.m_outputProducts[2].m_productFileName;
-    EXPECT_TRUE(productPath == "CGF_LOD_Test_lod2.cgf");
-
-    EXPECT_TRUE(response.m_outputProducts[0].m_pathDependencies.size() == 3);
-    AZStd::vector<AZStd::string> expectedDependencyPaths = {
-        "Grass_Atlas_matGroup.mtl",
-        "CGF_LOD_Test_lod1.cgf",
-        "CGF_LOD_Test_lod2.cgf"
-    };
-    
-    for (AZStd::string& expectedDependency : expectedDependencyPaths)
-    {
-        const char* fileName = expectedDependency.c_str();
-        AzFramework::StringFunc::AssetDatabasePath::Join(cgfPath.c_str(), fileName, expectedDependency);
-    }
-
-    for (const AssetBuilderSDK::ProductPathDependency& dependency : response.m_outputProducts[0].m_pathDependencies)
-    {
-        ASSERT_TRUE(AZStd::find(expectedDependencyPaths.begin(), expectedDependencyPaths.end(), dependency.m_dependencyPath) != expectedDependencyPaths.end());
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerPC/Ticks.h b/Code/Tools/RC/ResourceCompilerPC/Ticks.h
deleted file mode 100644
index b64eda6b4c..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/Ticks.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_TICKS_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_TICKS_H
-#pragma once
-
-
-
-#define TICKS_PER_SECOND (30)                       //the maximum keyframe value is 4800Hz per second
-#define SECONDS_PER_TICK (1.0f / 30.0f)       //the maximum keyframe value is 4800Hz per second
-#define TICKS_PER_FRAME (1)                         //if we have 30 keyframes per second, then one tick is 1
-#define TICKS_CONVERT (160)
-
-//#define TICKS_PER_SECOND (120)                    //the maximum keyframe value is 4800Hz per second
-//#define SECONDS_PER_TICK (1.0f/120.0f)    //the maximum keyframe value is 4800Hz per second
-//#define TICKS_PER_FRAME (4)                           //if we have 30 keyframes per second, then one tick is 4
-//#define TICKS_CONVERT (40)
-
-//#define TICKS_PER_SECOND (4800)                       //the maximum keyframe value is 4800Hz per second
-//#define SECONDS_PER_TICK (1.0f/4800.0f)       //the time for 1 tick
-//#define TICKS_PER_FRAME (160)                         //if we have 30 keyframes per second, then one tick is 160
-//#define TICKS_CONVERT (1)
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERPC_TICKS_H
diff --git a/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_files.cmake b/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_files.cmake
deleted file mode 100644
index 7c5eff03e5..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_files.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    CGF/CGFNodeMerger.cpp
-    CGF/DataWriter.cpp
-    CGF/AssetWriter.cpp
-    CGF/CGFNodeMerger.h
-    CGF/ChunkData.h
-    CGF/DataWriter.h
-    CGF/AssetWriter.h
-    ChunkCompiler.cpp
-    ChunkCompiler.h
-    LuaCompiler.cpp
-    LuaCompiler.h
-    ResourceCompilerPC_precompiled.h
-    ResourceCompilerPC_precompiled.cpp
-    StatCGFCompiler.cpp
-    StaticObjectCompiler.cpp
-    StatCGFCompiler.h
-    StaticObjectCompiler.h
-    PhysWorld.h
-)
-
-set(SKIP_UNITY_BUILD_INCLUSION_FILES
-    StatCGFCompiler.h
-    StatCGFCompiler.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_shared_files.cmake b/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_shared_files.cmake
deleted file mode 100644
index e1c89c72f8..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_shared_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerPC.cpp
-    ResourceCompilerPC.h
-)
diff --git a/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_test_files.cmake b/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_test_files.cmake
deleted file mode 100644
index 8fa803e417..0000000000
--- a/Code/Tools/RC/ResourceCompilerPC/resourcecompilerpc_test_files.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Tests/test_Main.cpp
-    ResourceCompilerPC.cpp
-    StatCGFCompiler.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerScene/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerScene/CMakeLists.txt
deleted file mode 100644
index 85e8615677..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/CMakeLists.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerScene.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        resourcecompilerscene_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-            ../..
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-            Legacy::CryCommon
-            Legacy::ResourceCompiler.Static
-            Legacy::ResourceCompilerPC.Static
-            AZ::AssetBuilderSDK
-        PUBLIC
-            AZ::AzToolsFramework
-            AZ::SceneCore
-            AZ::FbxSceneBuilder
-            AZ::GFxFramework
-)
-
-
-if(TARGET AssetBuilder)
-    # The SceneBuilder uses the AssetBuilder gem dependency list to determine which gems it should load in order to process
-    # Therefore the AssetBuilder target is set as the LY_CMAKE_TARGET for the SceneCompiler.cpp in order
-    # to allow it to use the Settings Regisry specialization the AssetBuilder in order
-    # to load the cmake_dependencies.<project>.AssetBuilder.setreg file to gather the list of gems to load
-    set_source_files_properties(
-        SceneCompiler.cpp
-        PROPERTIES
-            COMPILE_DEFINITIONS
-                LY_CMAKE_TARGET="AssetBuilder"
-    )
-else()
-    message(FATAL_ERROR "Cannot set LY_CMAKE_TARGET define to AssetBuilder as the AssetBuilder TARGET doesn't exist.")
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerScene MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompilerscene_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-            ../..
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::ResourceCompilerScene.Static
-            Legacy::ResourceCompiler.Static
-            Legacy::CryCommon
-            Gem::EditorPythonBindings.Static
-)
-
-ly_add_dependencies(RC Legacy::ResourceCompilerScene)
-
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    ly_add_target(
-        NAME ResourceCompilerScene.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        FILES_CMAKE
-            resourcecompilerscene_tests_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Tests
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                Legacy::ResourceCompilerScene.Static
-                Legacy::CryCommon
-                Legacy::ResourceCompiler.Static
-        RUNTIME_DEPENDENCIES
-            Legacy::CrySystem
-    )
-    ly_add_googletest(
-        NAME Legacy::ResourceCompilerScene.Tests
-    )
-endif()
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExportContexts.cpp b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExportContexts.cpp
deleted file mode 100644
index 2c9c654dd8..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExportContexts.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        CgfGroupExportContext::CgfGroupExportContext(SceneAPI::Events::ExportEventContext& parent,
-            const SceneAPI::DataTypes::IMeshGroup& group, Phase phase)
-            : m_products(parent.GetProductList())
-            , m_scene(parent.GetScene())
-            , m_outputDirectory(parent.GetOutputDirectory())
-            , m_group(group)
-            , m_phase(phase)
-        {
-        }
-
-        CgfGroupExportContext::CgfGroupExportContext(SceneAPI::Events::ExportProductList& products, const SceneAPI::Containers::Scene& scene, 
-            const AZStd::string& outputDirectory, const SceneAPI::DataTypes::IMeshGroup& group, Phase phase)
-            : m_products(products)
-            , m_scene(scene)
-            , m_outputDirectory(outputDirectory)
-            , m_group(group)
-            , m_phase(phase)
-        {
-        }
-
-        CgfGroupExportContext::CgfGroupExportContext(const CgfGroupExportContext& copyContext, Phase phase)
-            : m_products(copyContext.m_products)
-            , m_scene(copyContext.m_scene)
-            , m_outputDirectory(copyContext.m_outputDirectory)
-            , m_group(copyContext.m_group)
-            , m_phase(phase)
-        {
-        }
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExportContexts.h b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExportContexts.h
deleted file mode 100644
index 657fad05bd..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExportContexts.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
-#include <SceneAPI/SceneCore/Events/ExportEventContext.h>
-#include <RC/ResourceCompilerScene/Common/ExportContextGlobal.h>
-#include <CryHeaders.h>
-
-class CContentCGF;
-struct CNodeCGF;
-class CMesh;
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace DataTypes
-        {
-            class IGroup;
-            class IMeshGroup;
-        }
-        namespace Events
-        {
-            class ExportProductList;
-        }
-    }
-    namespace RC
-    {
-        // Called to export a specific Mesh (Cgf) Group.
-        struct CgfGroupExportContext
-            : public SceneAPI::Events::ICallContext
-        {
-            AZ_RTTI(CgfGroupExportContext, "{974FF54E-9724-4E8B-A2A1-D360C3B3DA80}", SceneAPI::Events::ICallContext);
-
-            CgfGroupExportContext(SceneAPI::Events::ExportEventContext& parent,
-                const SceneAPI::DataTypes::IMeshGroup& group, Phase phase);
-            CgfGroupExportContext(SceneAPI::Events::ExportProductList& products, const SceneAPI::Containers::Scene& scene, const AZStd::string& outputDirectory,
-                const SceneAPI::DataTypes::IMeshGroup& group, Phase phase);
-            CgfGroupExportContext(const CgfGroupExportContext& copyContext, Phase phase);
-            CgfGroupExportContext(const CgfGroupExportContext& copyContext) = delete;
-            ~CgfGroupExportContext() override = default;
-
-            CgfGroupExportContext& operator=(const CgfGroupExportContext& other) = delete;
-
-            SceneAPI::Events::ExportProductList& m_products;
-            const SceneAPI::Containers::Scene& m_scene;
-            const AZStd::string& m_outputDirectory;
-            const SceneAPI::DataTypes::IMeshGroup& m_group;
-            const Phase m_phase; 
-        };
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExporter.cpp
deleted file mode 100644
index 5f9c63dc2f..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExporter.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Cgf/CgfExporter.h>
-#include <Cry_Geo.h>
-#include <ConvertContext.h>
-#include <CGFContent.h>
-
-#include <AzToolsFramework/Debug/TraceContext.h>
-
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneManifest.h>
-#include <SceneAPI/SceneCore/Containers/Utilities/Filters.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
-#include <SceneAPI/SceneCore/Events/ExportEventContext.h>
-
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-
-        CgfExporter::CgfExporter(IConvertContext* convertContext)
-            : m_convertContext(convertContext)
-        {
-            BindToCall(&CgfExporter::ProcessContext);
-            ActivateBindings();
-        }
-
-        SceneEvents::ProcessingResult CgfExporter::ProcessContext(SceneEvents::ExportEventContext& context)
-        {
-            AZ_TraceContext("Scene name", context.GetScene().GetName());
-            AZ_TraceContext("Source file", context.GetScene().GetSourceFilename());
-            AZ_TraceContext("Output path", context.GetOutputDirectory());
-
-            const SceneContainers::SceneManifest& manifest = context.GetScene().GetManifest();
-            auto valueStorage = manifest.GetValueStorage();
-            auto view = SceneContainers::MakeDerivedFilterView<SceneDataTypes::IMeshGroup>(valueStorage);
-
-            SceneEvents::ProcessingResultCombiner result;
-            for (const SceneDataTypes::IMeshGroup& meshGroup : view)
-            {
-                AZ_TraceContext("Mesh group", meshGroup.GetName());
-                result += SceneEvents::Process<CgfGroupExportContext>(context, meshGroup, Phase::Construction);
-                result += SceneEvents::Process<CgfGroupExportContext>(context, meshGroup, Phase::Filling);
-                result += SceneEvents::Process<CgfGroupExportContext>(context, meshGroup, Phase::Finalizing);
-            }
-            return result.GetResult();
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExporter.h b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExporter.h
deleted file mode 100644
index 1dd9689917..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfExporter.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Events/CallProcessorBinder.h>
-
-struct IConvertContext;
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace Events
-        {
-            class ExportEventContext;
-        }
-    }
-
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-
-        class CgfExporter
-            : public SceneEvents::CallProcessorBinder
-        {
-        public:
-            CgfExporter(IConvertContext* convertContext);
-            ~CgfExporter() override = default;
-
-            SceneEvents::ProcessingResult ProcessContext(SceneEvents::ExportEventContext& context);
-
-        private:
-            IConvertContext* m_convertContext;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfGroupExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfGroupExporter.cpp
deleted file mode 100644
index 12172a095f..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfGroupExporter.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for CGFContent.h
-#include <CGFContent.h>
-#include <AzCore/IO/SystemFile.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfGroupExporter.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfUtils.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Utilities/SceneGraphSelector.h>
-#include <SceneAPI/SceneCore/Utilities/FileUtilities.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h>
-#include <SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h>
-#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
-#include <SceneAPI/SceneCore/Events/ExportProductList.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneUtil = AZ::SceneAPI::Utilities;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-
-        const AZStd::string CgfGroupExporter::s_fileExtension = "cgf";
-
-        CgfGroupExporter::CgfGroupExporter(IAssetWriter* writer)
-            : m_assetWriter(writer)
-        {
-            BindToCall(&CgfGroupExporter::ProcessContext);
-            ActivateBindings();
-        }
-
-        SceneEvents::ProcessingResult CgfGroupExporter::ProcessContext(CgfGroupExportContext& context) const
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            AZStd::string filename = SceneUtil::FileUtilities::CreateOutputFileName(context.m_group.GetName(), context.m_outputDirectory, s_fileExtension);
-            AZ_TraceContext("CGF File Name", filename);
-            if (filename.empty() || !SceneUtil::FileUtilities::EnsureTargetFolderExists(filename))
-            {
-                AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Unable to write CGF file. Filename is empty or target folder does not exist.");
-                return SceneEvents::ProcessingResult::Failure;
-            }
-
-            SceneEvents::ProcessingResultCombiner result;
-            
-            CContentCGF cgfContent(filename.c_str());
-            ConfigureCgfContent(cgfContent);
-            
-            const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-
-            AZStd::vector<AZStd::string> targetNodes = SceneUtil::SceneGraphSelector::GenerateTargetNodes(graph,
-                context.m_group.GetSceneNodeSelectionList(), SceneUtil::SceneGraphSelector::IsMesh);
-            
-            result += ProcessMeshes(context, cgfContent, targetNodes);
-            
-            if (m_assetWriter && cgfContent.GetNodeCount() > 0)
-            {
-                if (m_assetWriter->WriteCGF(&cgfContent))
-                {
-                    static const Data::AssetType staticMeshAssetType("{C2869E3B-DDA0-4E01-8FE3-6770D788866B}"); // from MeshAsset.h
-                    AZ::SceneAPI::Events::ExportProduct& exportProduct = context.m_products.AddProduct(AZStd::move(filename), context.m_group.GetId(), staticMeshAssetType, 0, AZStd::nullopt);
-
-                    // If the mesh group has a material rule, then add the material path dependency
-                    if (context.m_group.GetRuleContainerConst().FindFirstByType<SceneDataTypes::IMaterialRule>())
-                    {
-                        // All CGFs are assumed to have a single material with their same name in their same folder.
-                        // Add just the material file name as a path dependency for now.
-                        // Note that at this point, the .mtl file may or may not exist, which is fine.
-                        AZStd::string materialName;
-                        AzFramework::StringFunc::Path::GetFullFileName(context.m_scene.GetSourceFilename().c_str(), materialName);
-                        AzFramework::StringFunc::Path::ReplaceExtension(materialName, ".mtl");
-                        exportProduct.m_legacyPathDependencies.push_back(materialName);
-                    }
-                }
-                else
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Unable to write CGF file.");
-                    result += SceneEvents::ProcessingResult::Failure;
-                }
-            }
-            else
-            {
-                if (!m_assetWriter)
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "No asset writer found. Unable to write cgf to disk");
-                }   
-                if (cgfContent.GetNodeCount() == 0 )
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Empty Cgf file. Cgf not written to disk." );
-                }   
-                result += SceneEvents::ProcessingResult::Failure;
-            }
-            return result.GetResult();
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfGroupExporter.h b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfGroupExporter.h
deleted file mode 100644
index 99d7e06921..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfGroupExporter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBinder.h>
-
-class CContentCGF;
-struct IAssetWriter;
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct CgfGroupExportContext;
-
-        namespace SceneEvents = AZ::SceneAPI::Events;
-
-        class CgfGroupExporter
-            : public SceneEvents::CallProcessorBinder
-        {
-        public:
-            CgfGroupExporter(IAssetWriter* writer);
-            ~CgfGroupExporter() override = default;
-
-            static const AZStd::string s_fileExtension;
-
-            SceneEvents::ProcessingResult ProcessContext(CgfGroupExportContext& context) const;
-
-        protected:
-            IAssetWriter* m_assetWriter;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfLodExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfLodExporter.cpp
deleted file mode 100644
index 1d9b82e1a6..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfLodExporter.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for CGFContent.h
-#include <CGFContent.h>
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfLodExporter.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfUtils.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Utilities/SceneGraphSelector.h>
-#include <SceneAPI/SceneCore/Utilities/FileUtilities.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h>
-#include <SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/ILodRule.h>
-#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
-#include <SceneAPI/SceneCore/Events/ExportProductList.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneUtil = AZ::SceneAPI::Utilities;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-
-        const AZStd::string CgfLodExporter::s_fileExtension = "cgf";
-
-        CgfLodExporter::CgfLodExporter(IAssetWriter* writer)
-            : m_assetWriter(writer)
-        {
-            BindToCall(&CgfLodExporter::ProcessContext);
-            ActivateBindings();
-        }
-
-        SceneEvents::ProcessingResult CgfLodExporter::ProcessContext(CgfGroupExportContext& context) const
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-            
-            AZStd::shared_ptr<const SceneDataTypes::ILodRule> lodRule = context.m_group.GetRuleContainerConst().FindFirstByType<SceneDataTypes::ILodRule>();
-            if (!lodRule)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            // Create the base CGF name
-            AZStd::string baseCGFfilename = SceneUtil::FileUtilities::CreateOutputFileName(context.m_group.GetName(), context.m_outputDirectory, s_fileExtension);
-
-            SceneEvents::ProcessingResultCombiner result;
-            
-            for (size_t index = 0; index < lodRule->GetLodCount(); ++index)
-            {
-                AZStd::string filename = SceneUtil::FileUtilities::CreateOutputFileName(
-                    context.m_group.GetName() + "_LOD" + AZStd::to_string(static_cast<int>(index + 1)), context.m_outputDirectory, s_fileExtension);
-                AZ_TraceContext("CGF Lod File Name", filename);
-                if (filename.empty() || !SceneUtil::FileUtilities::EnsureTargetFolderExists(filename))
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Unable to write CGF Lod file. Filename is empty or target folder does not exist.");
-                    result += SceneEvents::ProcessingResult::Failure;
-                    break;
-                }
-
-                CContentCGF cgfContent(filename.c_str());
-                ConfigureCgfContent(cgfContent);
-
-                const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-                AZStd::vector<AZStd::string> targetNodes = SceneUtil::SceneGraphSelector::GenerateTargetNodes(graph,
-                    lodRule->GetSceneNodeSelectionList(index), SceneUtil::SceneGraphSelector::IsMesh);
-
-                result += ProcessMeshes(context, cgfContent, targetNodes);
-                if (cgfContent.GetNodeCount() == 0)
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Empty LoD Detected at level %d.", index);
-                    result += SceneEvents::ProcessingResult::Failure;
-                    break;
-                }
-
-                if (m_assetWriter)
-                {
-                    if (m_assetWriter->WriteCGF(&cgfContent))
-                    {
-                        static const AZ::Data::AssetType staticMeshLodsAssetType("{9AAE4926-CB6A-4C60-9948-A1A22F51DB23}");
-                        // Using the same guid as the parent group/cgf as this needs to be a lod of that cgf.
-                        // Setting the lod to index+1 as 0 means the base mesh and 1-6 are lod levels 0-5.
-                        AZ::SceneAPI::Events::ExportProduct& lodProduct = context.m_products.AddProduct(AZStd::move(filename), context.m_group.GetId(), staticMeshLodsAssetType, index + 1, AZStd::nullopt);
-
-                        // Add this LOD as a dependency to the base CGF
-                        context.m_products.AddDependencyToProduct(baseCGFfilename, lodProduct);
-                    }
-                    else
-                    {
-                        AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Unable to write CGF LoD file at level %d.", index);
-                        result += SceneEvents::ProcessingResult::Failure;
-                        break;
-                    }
-                }
-                else
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "No asset writer found. Unable to write cgf to disk");
-                    result += SceneEvents::ProcessingResult::Failure;
-                    break;
-                }
-            }
-
-            return result.GetResult();
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfLodExporter.h b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfLodExporter.h
deleted file mode 100644
index d0ee96482a..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfLodExporter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBinder.h>
-
-class CContentCGF;
-struct IAssetWriter;
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct CgfGroupExportContext;
-
-        namespace SceneEvents = AZ::SceneAPI::Events;
-
-        class CgfLodExporter
-            : public SceneEvents::CallProcessorBinder
-        {
-        public:
-            CgfLodExporter(IAssetWriter* writer);
-            ~CgfLodExporter() override = default;
-
-            static const AZStd::string s_fileExtension;
-
-            SceneEvents::ProcessingResult ProcessContext(CgfGroupExportContext& context) const;
-
-        protected:
-            IAssetWriter* m_assetWriter;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfUtils.cpp b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfUtils.cpp
deleted file mode 100644
index 7c9fa86ea4..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfUtils.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for CGFContent.h
-#include <CGFContent.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfUtils.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
-#include <SceneAPI/SceneCore/Utilities/SceneGraphSelector.h>
-#include <SceneAPI/SceneCore/Utilities/FileUtilities.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        void ConfigureCgfContent(CContentCGF& content)
-        {
-            CExportInfoCGF* exportInfo = content.GetExportInfo();
-
-            bool useCustomNormalDefault = true;
-            AZ::SceneAPI::Events::AssetImportRequestBus::Broadcast(&AZ::SceneAPI::Events::AssetImportRequestBus::Events::AreCustomNormalsUsed, useCustomNormalDefault);
-
-            exportInfo->bMergeAllNodes = true;
-            exportInfo->bUseCustomNormals = useCustomNormalDefault;  // This will be overritten by StaticMeshAdvancedRule (if teh rule exists) when calling ContainerSettingsExporter::ProcessContext
-            exportInfo->bCompiledCGF = false;
-            exportInfo->bHavePhysicsProxy = false;
-            exportInfo->bHaveAutoLods = false;
-            exportInfo->bNoMesh = true;
-            exportInfo->b8WeightsPerVertex = false;
-            exportInfo->bWantF32Vertices = false;
-            exportInfo->authorToolVersion = 1;
-        }
-
-        void ProcessMeshType(ContainerExportContext& context, CContentCGF& content, const AZStd::vector<AZStd::string>& targetNodes, EPhysicsGeomType physicalizeType)
-        {
-            const SceneAPI::Containers::SceneGraph& graph = context.m_scene.GetGraph();
-            for (const AZStd::string& nodeName : targetNodes)
-            {
-                AZ_TraceContext("Mesh node", nodeName);
-                SceneAPI::Containers::SceneGraph::NodeIndex index = graph.Find(nodeName);
-                if (index.IsValid())
-                {
-                    CNodeCGF* node = new CNodeCGF(); // will be auto deleted by CContentCGF cgf
-                    SetNodeName(nodeName, *node);
-                    AZStd::string rootBoneName;
-                    SceneAPI::Events::Process<NodeExportContext>(context, *node, nodeName, index, physicalizeType, rootBoneName, Phase::Construction);
-                    SceneAPI::Events::Process<NodeExportContext>(context, *node, nodeName, index, physicalizeType, rootBoneName, Phase::Filling);
-                    content.AddNode(node);
-                    SceneAPI::Events::Process<NodeExportContext>(context, *node, nodeName, index, physicalizeType, rootBoneName, Phase::Finalizing);
-                }
-            }
-        }
-
-        void SetNodeName(const AZStd::string& name, CNodeCGF& node)
-        {
-            static const size_t nodeNameCount = sizeof(node.name) / sizeof(node.name[0]);
-            size_t offset = name.length() < nodeNameCount ? 0 : name.length() - nodeNameCount + 1;
-            azstrcpy(node.name, nodeNameCount, name.c_str() + offset);
-        }
-
-        SceneAPI::Events::ProcessingResult ProcessMeshes(CgfGroupExportContext& context, CContentCGF& content, const AZStd::vector<AZStd::string>& targetNodes)
-        {
-            SceneAPI::Events::ProcessingResultCombiner result;
-
-            ContainerExportContext containerContext(context.m_scene, context.m_outputDirectory, context.m_group, content, Phase::Construction);
-            result += SceneAPI::Events::Process(containerContext);
-            result += SceneAPI::Events::Process<ContainerExportContext>(containerContext, Phase::Filling);
-
-            ProcessMeshType(containerContext, content, targetNodes, PHYS_GEOM_TYPE_NONE);
-
-            result += SceneAPI::Events::Process<ContainerExportContext>(containerContext, Phase::Finalizing);
-
-            return result.GetResult();
-        }
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfUtils.h b/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfUtils.h
deleted file mode 100644
index 9bf9026a99..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Cgf/CgfUtils.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/ProcessingResult.h>
-
-class CContentCGF;
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct CgfContainerExportContext;
-        struct CgfGroupExportContext;
-
-        void ConfigureCgfContent(CContentCGF& content);
-        AZ::SceneAPI::Events::ProcessingResult ProcessMeshes(CgfGroupExportContext& context, CContentCGF& content, const AZStd::vector<AZStd::string>& targetNodes);
-        void ProcessMeshType(ContainerExportContext& context, CContentCGF& content, const AZStd::vector<AZStd::string>& targetNodes, EPhysicsGeomType physicalizeType);
-        void SetNodeName(const AZStd::string& name, CNodeCGF& node);
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/AssetExportUtilities.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/AssetExportUtilities.cpp
deleted file mode 100644
index e5609246b8..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/AssetExportUtilities.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Common/AssetExportUtilities.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        Matrix34 AssetExportUtilities::ConvertToCryMatrix34(const SceneAPI::DataTypes::MatrixType& transform)
-        {
-            Matrix34 matrix;
-
-            matrix.m00 = transform.GetColumn(0).GetX();
-            matrix.m10 = transform.GetColumn(0).GetY();
-            matrix.m20 = transform.GetColumn(0).GetZ();
-
-            matrix.m01 = transform.GetColumn(1).GetX();
-            matrix.m11 = transform.GetColumn(1).GetY();
-            matrix.m21 = transform.GetColumn(1).GetZ();
-
-            matrix.m02 = transform.GetColumn(2).GetX();
-            matrix.m12 = transform.GetColumn(2).GetY();
-            matrix.m22 = transform.GetColumn(2).GetZ();
-
-            matrix.m03 = transform.GetColumn(3).GetX();
-            matrix.m13 = transform.GetColumn(3).GetY();
-            matrix.m23 = transform.GetColumn(3).GetZ();
-
-            return matrix;
-        }
-
-        float AssetExportUtilities::CryQuatDotProd(const CryQuat& q, const CryQuat& p)
-        {
-            return q.w*p.w + q.v*p.v;
-        }
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/AssetExportUtilities.h b/Code/Tools/RC/ResourceCompilerScene/Common/AssetExportUtilities.h
deleted file mode 100644
index b2eabc07cf..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/AssetExportUtilities.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Math.h>
-#include <SceneAPI/SceneCore/DataTypes/MatrixType.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        class AssetExportUtilities
-        {
-        public:
-            static Matrix34 ConvertToCryMatrix34(const SceneAPI::DataTypes::MatrixType& transform);
-            static float CryQuatDotProd(const CryQuat& q, const CryQuat& p);
-        };
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/BlendShapeExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/BlendShapeExporter.cpp
deleted file mode 100644
index 697a566eb3..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/BlendShapeExporter.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h>
-#include <CGFContent.h>
-#include <IIndexedMesh.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/std/algorithm.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneCore/Utilities/SceneGraphSelector.h>
-#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/Containers/Utilities/Filters.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IBlendShapeData.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/ITransform.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IBlendShapeRule.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/BlendShapeExporter.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        BlendShapeExporter::BlendShapeExporter()
-        {
-            BindToCall(&BlendShapeExporter::ProcessBlendShapes);
-        }
-
-        void BlendShapeExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<BlendShapeExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneAPI::Events::ProcessingResult BlendShapeExporter::ProcessBlendShapes(MeshNodeExportContext& context)
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneAPI::Events::ProcessingResult::Ignored;
-            }
-
-            if (!context.m_group.RTTI_IsTypeOf(AZ::SceneAPI::DataTypes::ISkinGroup::TYPEINFO_Uuid()))
-            {
-                return SceneAPI::Events::ProcessingResult::Ignored;
-            }
-
-            AZStd::shared_ptr<const AZ::SceneAPI::DataTypes::IBlendShapeRule> blendShapeRule = context.m_group.GetRuleContainerConst().FindFirstByType<AZ::SceneAPI::DataTypes::IBlendShapeRule>();
-            if (!blendShapeRule)
-            {
-                return SceneAPI::Events::ProcessingResult::Ignored;
-            }
-
-            const SceneAPI::Containers::SceneGraph& graph = context.m_scene.GetGraph();
-
-            CSkinningInfo* skinInfo = context.m_container.GetSkinningInfo();
-
-            for (size_t index = 0; index < blendShapeRule->GetSceneNodeSelectionList().GetSelectedNodeCount(); ++index)
-            {
-                SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex = graph.Find(blendShapeRule->GetSceneNodeSelectionList().GetSelectedNode(index));
-
-                if (!nodeIndex.IsValid())
-                {
-                    AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Invalid name %s for blend shape.", blendShapeRule->GetSceneNodeSelectionList().GetSelectedNode(index).c_str());
-                    return SceneAPI::Events::ProcessingResult::Failure;
-                }
-
-                AZStd::shared_ptr<const SceneAPI::DataTypes::IBlendShapeData> blendShape =
-                    azrtti_cast<const SceneAPI::DataTypes::IBlendShapeData*>(graph.GetNodeContent(nodeIndex));
-
-
-                if (!blendShape)
-                {
-                    AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unable to find blend shape.");
-                    return SceneAPI::Events::ProcessingResult::Failure;
-                }
-
-                SceneAPI::DataTypes::MatrixType skinTransform = SceneAPI::DataTypes::MatrixType::Identity();
-                //Check to see if the blend shape parent skin has a transform an propagate that transform onto the vertices. 
-                auto view = MakeSceneGraphChildView(graph, graph.GetNodeParent(nodeIndex), graph.GetContentStorage().begin(), true);
-                auto transform = AZStd::find_if(view.begin(), view.end(), SceneAPI::Containers::DerivedTypeFilter<SceneAPI::DataTypes::ITransform>());
-
-                if (transform != view.end())
-                {
-                    skinTransform = azrtti_cast<const SceneAPI::DataTypes::ITransform*>(*transform)->GetMatrix();
-                }
-
-                MorphTargets* target = new MorphTargets();
-                target->MeshID = -1; //Based on the collada importer there's not a great way to set this.
-                target->m_strName = string(graph.GetNodeName(nodeIndex).GetName());
-
-                const size_t controlPointCount = blendShape->GetUsedControlPointCount();
-
-                for (size_t controlPointIndex = 0; controlPointIndex < controlPointCount; ++controlPointIndex)
-                {
-                    SMeshMorphTargetVertex vert;
-                    vert.nVertexId = controlPointIndex;
-                    
-                    AZ::Vector3 vtx = blendShape->GetPosition(blendShape->GetUsedPointIndexForControlPoint(controlPointIndex));
-
-                    //Apply base skin transform if one exists.
-                    vtx = skinTransform * vtx;
-
-                    vert.ptVertex = Vec3(vtx.GetX(), vtx.GetY(), vtx.GetZ());
-                    target->m_arrIntMorph.push_back(vert);
-                }
-
-                skinInfo->m_arrMorphTargets.push_back(target);
-            }
-
-            return SceneAPI::Events::ProcessingResult::Success;
-
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/BlendShapeExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/BlendShapeExporter.h
deleted file mode 100644
index 1804a97aa8..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/BlendShapeExporter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct MeshNodeExportContext;
-
-        class BlendShapeExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            AZ_COMPONENT(BlendShapeExporter, "{1A27BF62-F684-4F9E-B2C6-B15E728659EA}", SceneAPI::SceneCore::RCExportingComponent);
-            
-            BlendShapeExporter();
-            ~BlendShapeExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult ProcessBlendShapes(MeshNodeExportContext& context);
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/ColorStreamExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/ColorStreamExporter.cpp
deleted file mode 100644
index 145fcfc76a..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/ColorStreamExporter.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for IIndexedMesh.h
-#include <IIndexedMesh.h>
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h>
-#include <SceneAPI/SceneCore/Containers/Utilities/Filters.h>
-#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexColorData.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/ColorStreamExporter.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-        namespace SceneUtilities = AZ::SceneAPI::Utilities;
-
-        ColorStreamExporter::ColorStreamExporter()
-        {
-            BindToCall(&ColorStreamExporter::CopyVertexColorStream);
-        }
-        
-        void ColorStreamExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<ColorStreamExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneEvents::ProcessingResult ColorStreamExporter::CopyVertexColorStream(MeshNodeExportContext& context) const
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-            const SceneDataTypes::IGroup& group = context.m_group;
-
-            AZStd::shared_ptr<const SceneDataTypes::IMeshVertexColorData> colors = nullptr;
-            AZStd::string streamName;
-
-            AZStd::shared_ptr<const SceneDataTypes::IMeshAdvancedRule> rule = group.GetRuleContainerConst().FindFirstByType<SceneDataTypes::IMeshAdvancedRule>();
-            if (!rule || rule->IsVertexColorStreamDisabled() || rule->GetVertexColorStreamName().empty())
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            AZ_TraceContext("Vertex color stream", rule->GetVertexColorStreamName());
-            SceneContainers::SceneGraph::NodeIndex index = graph.Find(context.m_nodeIndex, rule->GetVertexColorStreamName());
-            colors = azrtti_cast<const SceneDataTypes::IMeshVertexColorData*>(graph.GetNodeContent(index));
-            if (colors)
-            {
-                bool countMatch = context.m_mesh.GetVertexCount() == colors->GetCount();
-                if (!countMatch)
-                {
-                    AZ_TracePrintf(SceneUtilities::ErrorWindow,
-                        "Number of vertices in the mesh (%i) don't match with the number of stored vertex color stream (%i).",
-                        context.m_mesh.GetVertexCount(), colors->GetCount());
-                    return SceneEvents::ProcessingResult::Failure;
-                }
-
-                // Vertex coloring always uses the first vertex color stream.
-                context.m_mesh.ReallocStream(CMesh::COLORS, 0, context.m_mesh.GetVertexCount());
-                for (int i = 0; i < context.m_mesh.GetVertexCount(); ++i)
-                {
-                    const SceneDataTypes::Color& color = colors->GetColor(i);
-                    context.m_mesh.m_pColor0[i] = SMeshColor(
-                        static_cast<uint8_t>(GetClamp<float>(color.red, 0.0f, 1.0f) * 255.0f),
-                        static_cast<uint8_t>(GetClamp<float>(color.green, 0.0f, 1.0f) * 255.0f),
-                        static_cast<uint8_t>(GetClamp<float>(color.blue, 0.0f, 1.0f) * 255.0f),
-                        static_cast<uint8_t>(GetClamp<float>(color.alpha, 0.0f, 1.0f) * 255.0f));
-                }
-            }
-            else
-            {
-                AZ_TracePrintf(SceneUtilities::WarningWindow, "Vertex color stream not found or name doesn't refer to a vertex color stream.");
-                context.m_mesh.ReallocStream(CMesh::COLORS, 0, context.m_mesh.GetVertexCount());
-                for (int i = 0; i < context.m_mesh.GetVertexCount(); ++i)
-                {
-                    context.m_mesh.m_pColor0[i] = SMeshColor(255, 255, 255, 255);
-                }
-            }
-            return SceneEvents::ProcessingResult::Success;
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/ColorStreamExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/ColorStreamExporter.h
deleted file mode 100644
index 3abe4e1b23..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/ColorStreamExporter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct MeshNodeExportContext;
-
-        class ColorStreamExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            AZ_COMPONENT(ColorStreamExporter, "{912F9D7B-55C1-4871-A3BE-6C63B27E6B49}", SceneAPI::SceneCore::RCExportingComponent);
-
-            ColorStreamExporter();
-            ~ColorStreamExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult CopyVertexColorStream(MeshNodeExportContext& context) const;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/CommonExportContexts.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/CommonExportContexts.cpp
deleted file mode 100644
index 93320303b4..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/CommonExportContexts.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/ISceneNodeGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        ContainerExportContext::ContainerExportContext(SceneAPI::Events::ExportEventContext& parent,
-            const SceneAPI::DataTypes::IGroup& group, CContentCGF& container, Phase phase)
-            : m_scene(parent.GetScene())
-            , m_outputDirectory(parent.GetOutputDirectory())
-            , m_group(group)
-            , m_container(container)
-            , m_phase(phase)
-        {
-        }
-
-        ContainerExportContext::ContainerExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& outputDirectory,
-            const SceneAPI::DataTypes::IGroup& group, CContentCGF& container, Phase phase)
-            : m_scene(scene)
-            , m_outputDirectory(outputDirectory)
-            , m_group(group)
-            , m_container(container)
-            , m_phase(phase)
-        {
-        }
-
-        ContainerExportContext::ContainerExportContext(const ContainerExportContext& copyContext, Phase phase)
-            : m_scene(copyContext.m_scene)
-            , m_outputDirectory(copyContext.m_outputDirectory)
-            , m_group(copyContext.m_group)
-            , m_container(copyContext.m_container)
-            , m_phase(phase)
-        {
-        }
-
-        NodeExportContext::NodeExportContext(ContainerExportContext& parent, CNodeCGF& node, const AZStd::string& nodeName,
-            SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex, EPhysicsGeomType physicalizeType, AZStd::string& rootBoneName, Phase phase)
-            : ContainerExportContext(parent, phase) 
-            , m_node(node)
-            , m_nodeName(nodeName)
-            , m_nodeIndex(nodeIndex)
-            , m_physicalizeType(physicalizeType)
-            , m_rootBoneName(rootBoneName)
-        {
-        }
-
-        NodeExportContext::NodeExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& outputDirectory,
-            const SceneAPI::DataTypes::IGroup& group, CContentCGF& container, CNodeCGF& node, 
-            const AZStd::string& nodeName, SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex, EPhysicsGeomType physicalizeType,
-            AZStd::string& rootBoneName, Phase phase)
-            : ContainerExportContext(scene, outputDirectory, group, container, phase)
-            , m_node(node)
-            , m_nodeName(nodeName)
-            , m_nodeIndex(nodeIndex)
-            , m_physicalizeType(physicalizeType)
-            , m_rootBoneName(rootBoneName)
-        {
-        }
-
-        NodeExportContext::NodeExportContext(const NodeExportContext& copyContext, Phase phase)
-            : ContainerExportContext(copyContext, phase)
-            , m_node(copyContext.m_node)
-            , m_nodeName(copyContext.m_nodeName)
-            , m_nodeIndex(copyContext.m_nodeIndex)
-            , m_physicalizeType(copyContext.m_physicalizeType)
-            , m_rootBoneName(copyContext.m_rootBoneName)
-        {
-        }
-
-        MeshNodeExportContext::MeshNodeExportContext(NodeExportContext& parent, CMesh& mesh, Phase phase)
-            : NodeExportContext(parent, phase)
-            , m_mesh(mesh)
-        {
-        }
-
-        MeshNodeExportContext::MeshNodeExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& outputDirectory,
-            const SceneAPI::DataTypes::IGroup& group, CContentCGF& container, CNodeCGF& node, 
-            const AZStd::string& nodeName, SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex, EPhysicsGeomType physicalizeType, 
-            AZStd::string& rootBoneName, CMesh& mesh, Phase phase)
-            : NodeExportContext(scene, outputDirectory, group, container, node, nodeName, nodeIndex, physicalizeType, rootBoneName, phase)
-            , m_mesh(mesh)
-        {
-        }
-
-        MeshNodeExportContext::MeshNodeExportContext(const MeshNodeExportContext& copyContext, Phase phase)
-            : NodeExportContext(copyContext, phase)
-            , m_mesh(copyContext.m_mesh)
-        {
-        }
-
-        TouchBendableMeshNodeExportContext::TouchBendableMeshNodeExportContext(const MeshNodeExportContext& copyContext, AZStd::string& rootBoneName, Phase phase)
-            : MeshNodeExportContext(copyContext, phase)
-        {
-            m_rootBoneName = rootBoneName;
-        }
-
-        ResolveRootBoneFromNodeContext::ResolveRootBoneFromNodeContext(
-            AZStd::string& result, const SceneAPI::Containers::Scene& scene, SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex)
-            : m_scene(scene)
-            , m_rootBoneName(result)
-            , m_nodeIndex(nodeIndex)
-        {
-        }
-
-        ResolveRootBoneFromBoneContext::ResolveRootBoneFromBoneContext(
-            AZStd::string& result, const SceneAPI::Containers::Scene& scene, const AZStd::string& boneName)
-            : m_scene(scene)
-            , m_boneName(boneName)
-            , m_rootBoneName(result)
-        {
-        }
-
-        AddBonesToSkinningInfoContext::AddBonesToSkinningInfoContext(
-            CSkinningInfo& skinningInfo, const SceneAPI::Containers::Scene& scene, const AZStd::string& rootBoneName)
-            : m_scene(scene)
-            , m_rootBoneName(rootBoneName)
-            , m_skinningInfo(skinningInfo)
-        {
-        }
-
-        BuildBoneMapContext::BuildBoneMapContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& rootBoneName,
-            AZStd::unordered_map<AZStd::string, int>& boneNameIdMap)
-            : m_scene(scene)
-            , m_rootBoneName(rootBoneName)
-            , m_boneNameIdMap(boneNameIdMap)
-        {
-        }
-
-        SkeletonExportContext::SkeletonExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& rootBoneName, CSkinningInfo& skinningInfo,
-            [[maybe_unused]] AZStd::unordered_map<AZStd::string, int>& boneNameIdMap, Phase phase)
-            : m_scene(scene)
-            , m_rootBoneName(rootBoneName)
-            , m_skinningInfo(skinningInfo)
-            , m_phase(phase)
-        {
-        }
-
-        SkeletonExportContext::SkeletonExportContext(const SkeletonExportContext& copyContext, Phase phase)
-            : m_scene(copyContext.m_scene)
-            , m_rootBoneName(copyContext.m_rootBoneName)
-            , m_skinningInfo(copyContext.m_skinningInfo)
-            , m_phase(phase)
-        {
-        }
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/CommonExportContexts.h b/Code/Tools/RC/ResourceCompilerScene/Common/CommonExportContexts.h
deleted file mode 100644
index 3027ddfcc4..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/CommonExportContexts.h
+++ /dev/null
@@ -1,195 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
-#include <SceneAPI/SceneCore/Events/ExportEventContext.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h>
-#include <RC/ResourceCompilerScene/Common/ExportContextGlobal.h>
-#include <CryHeaders.h>
-
-class CContentCGF;
-struct CNodeCGF;
-class CMesh;
-struct CSkinningInfo;
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace DataTypes
-        {
-            class IGroup;
-            class ISceneNodeSelectionList;
-        }
-    }
-    namespace RC
-    {
-        // Called while creating, filling and finalizing a CContentCGF container.
-        struct ContainerExportContext
-            : public SceneAPI::Events::ICallContext
-        {
-            AZ_RTTI(ContainerExportContext, "{667A9E60-F3AA-45E1-8E66-05B0C971A094}", SceneAPI::Events::ICallContext);
-            ContainerExportContext(SceneAPI::Events::ExportEventContext& parent,
-                const SceneAPI::DataTypes::IGroup& group, CContentCGF& container, Phase phase);
-            ContainerExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& outputDirectory,
-                const SceneAPI::DataTypes::IGroup& group, CContentCGF& container, Phase phase);
-            ContainerExportContext(const ContainerExportContext& copyContext, Phase phase);
-            ContainerExportContext(const ContainerExportContext& copyContext) = delete;
-            ~ContainerExportContext() override = default;
-
-            ContainerExportContext& operator=(const ContainerExportContext& other) = delete;
-
-            const SceneAPI::Containers::Scene& m_scene;
-            const AZStd::string& m_outputDirectory;
-            const SceneAPI::DataTypes::IGroup& m_group;
-            CContentCGF& m_container;
-            const Phase m_phase;
-        };
-
-        // Called when a new CNode is added to a CContentCGF container.
-        struct NodeExportContext
-            : public ContainerExportContext
-        {
-            AZ_RTTI(NodeExportContext, "{A7D130C6-2CB2-47AC-9D9C-969FA473DFDA}", ContainerExportContext);
-
-            NodeExportContext(ContainerExportContext& parent, CNodeCGF& node, const AZStd::string& nodeName,
-                SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex, EPhysicsGeomType physicalizeType, AZStd::string& rootBoneName, Phase phase);
-            NodeExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& outputDirectory,
-                const SceneAPI::DataTypes::IGroup& group,
-                CContentCGF& container, CNodeCGF& node, const AZStd::string& nodeName, SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex,
-                EPhysicsGeomType physicalizeType, AZStd::string& rootBoneName, Phase phase);
-            NodeExportContext(const NodeExportContext& copyContext, Phase phase);
-            NodeExportContext(const NodeExportContext& copyContext) = delete;
-            ~NodeExportContext() override = default;
-
-            NodeExportContext& operator=(const NodeExportContext& other) = delete;
-
-            CNodeCGF& m_node;
-            const AZStd::string& m_nodeName;
-            SceneAPI::Containers::SceneGraph::NodeIndex m_nodeIndex;
-            EPhysicsGeomType m_physicalizeType;
-            AZStd::string& m_rootBoneName;
-        };
-
-        // Called when new mesh data was added to a CNode in a CContentCGF container.
-        struct MeshNodeExportContext
-            : public NodeExportContext
-        {
-            AZ_RTTI(MeshNodeExportContext, "{D39D08D6-8EB5-4058-B9D7-BED4EB460555}", NodeExportContext);
-
-            MeshNodeExportContext(NodeExportContext& parent, CMesh& mesh, Phase phase);
-            MeshNodeExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& outputDirectory,
-                const SceneAPI::DataTypes::IGroup& group, CContentCGF& container, CNodeCGF& node,
-                const AZStd::string& nodeName, SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex, EPhysicsGeomType physicalizeType,
-                AZStd::string& rootBoneName, CMesh& mesh, Phase phase);
-            MeshNodeExportContext(const MeshNodeExportContext& copyContext, Phase phase);
-            MeshNodeExportContext(const MeshNodeExportContext& copyContext) = delete;
-            ~MeshNodeExportContext() override = default;
-            
-            MeshNodeExportContext& operator=(const MeshNodeExportContext& other) = delete;
-
-            CMesh& m_mesh;
-        };
-
-        struct TouchBendableMeshNodeExportContext
-            : public MeshNodeExportContext
-        {
-            AZ_RTTI(TouchBendableMeshNodeExportContext, "{A3370E01-EF04-4F5A-95F3-5B9ADFEFD2F0}", MeshNodeExportContext);
-
-            TouchBendableMeshNodeExportContext(const MeshNodeExportContext& copyContext, AZStd::string& rootBoneName, Phase phase);
-            TouchBendableMeshNodeExportContext(const TouchBendableMeshNodeExportContext& copyContext) = delete;
-            ~TouchBendableMeshNodeExportContext() override = default;
-
-            TouchBendableMeshNodeExportContext& operator=(const TouchBendableMeshNodeExportContext& other) = delete;
-        };
-
-        // Finds a root bone of the skeleton that is referenced by the given node.
-        struct ResolveRootBoneFromNodeContext
-            : public SceneAPI::Events::ICallContext
-        {
-            AZ_RTTI(ResolveRootBoneFromNodeContext, "{7BA28E30-E313-4B55-8200-C3BDD4EEE240}", SceneAPI::Events::ICallContext);
-
-            ResolveRootBoneFromNodeContext(AZStd::string& result, const SceneAPI::Containers::Scene& scene, SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex);
-            ~ResolveRootBoneFromNodeContext() override = default;
-
-            const SceneAPI::Containers::Scene& m_scene;
-            AZStd::string& m_rootBoneName;
-            SceneAPI::Containers::SceneGraph::NodeIndex m_nodeIndex;
-        };
-
-        // Finds a root bone of the skeleton that contains m_boneName. If the given bone name is not a fully specified
-        //      path the graph will be searched for the node that's closest to the root that matches the name.
-        struct ResolveRootBoneFromBoneContext
-            : public SceneAPI::Events::ICallContext
-        {
-            AZ_RTTI(ResolveRootBoneFromBoneContext, "{DCA7DE80-28D8-42B1-845D-2FD596E7B8D5}", SceneAPI::Events::ICallContext);
-
-            ResolveRootBoneFromBoneContext(AZStd::string& result, const SceneAPI::Containers::Scene& scene, const AZStd::string& boneName);
-            ~ResolveRootBoneFromBoneContext() override = default;
-
-            const SceneAPI::Containers::Scene& m_scene;
-            const AZStd::string& m_boneName;
-            AZStd::string& m_rootBoneName;
-        };
-
-        struct AddBonesToSkinningInfoContext
-            : public SceneAPI::Events::ICallContext
-        {
-            AZ_RTTI(AddBonesToSkinningInfoContext, "{18BFBCA3-DE2D-45BF-A776-E93A991C467E}", SceneAPI::Events::ICallContext);
-
-            AddBonesToSkinningInfoContext(CSkinningInfo& skinningInfo, const SceneAPI::Containers::Scene& scene, const AZStd::string& rootBoneName);
-            ~AddBonesToSkinningInfoContext() override = default;
-
-            const SceneAPI::Containers::Scene& m_scene;
-            const AZStd::string& m_rootBoneName;
-            CSkinningInfo& m_skinningInfo;
-        };
-
-        struct BuildBoneMapContext
-            : public SceneAPI::Events::ICallContext
-        {
-            AZ_RTTI(BuildBoneMapContext, "{9D9EE333-EC8C-4811-AB82-CC3B414E334C}", SceneAPI::Events::ICallContext);
-
-            BuildBoneMapContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& rootBoneName, 
-                AZStd::unordered_map<AZStd::string, int>& boneNameIdMap);
-            ~BuildBoneMapContext() override = default;
-
-            const SceneAPI::Containers::Scene& m_scene;
-            const AZStd::string& m_rootBoneName;
-            AZStd::unordered_map<AZStd::string, int>& m_boneNameIdMap;
-        };
-
-        struct SkeletonExportContext
-            : public SceneAPI::Events::ICallContext
-        {
-            AZ_RTTI(SkeletonExportContext, "{40512752-150F-4BAF-BC4E-01016DAE5088}", SceneAPI::Events::ICallContext);
-
-            SkeletonExportContext(const SceneAPI::Containers::Scene& scene, const AZStd::string& rootBoneName, CSkinningInfo& skinningInfo,
-                AZStd::unordered_map<AZStd::string, int>& boneNameIdMap, Phase phase);
-            SkeletonExportContext(const SkeletonExportContext& copyContext, Phase phase);
-            SkeletonExportContext(const SkeletonExportContext& copyContext) = delete;
-            ~SkeletonExportContext() override = default;
-
-            SkeletonExportContext& operator=(const SkeletonExportContext& other) = delete;
-
-            const SceneAPI::Containers::Scene& m_scene;
-            const AZStd::string& m_rootBoneName;
-            CSkinningInfo& m_skinningInfo;
-            const Phase m_phase;
-        };
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/ContainerSettingsExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/ContainerSettingsExporter.cpp
deleted file mode 100644
index b23acb1d33..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/ContainerSettingsExporter.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for CGFContent.h
-#include <CGFContent.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/ContainerSettingsExporter.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-
-        ContainerSettingsExporter::ContainerSettingsExporter()
-        {
-            BindToCall(&ContainerSettingsExporter::ProcessContext);
-        }
-
-        void ContainerSettingsExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<ContainerSettingsExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneEvents::ProcessingResult ContainerSettingsExporter::ProcessContext(ContainerExportContext& context) const
-        {
-            if (context.m_phase != Phase::Construction)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            AZStd::shared_ptr<const SceneDataTypes::IMeshAdvancedRule> advancedRule = context.m_group.GetRuleContainerConst().FindFirstByType<SceneDataTypes::IMeshAdvancedRule>();
-            if (advancedRule)
-            {
-                context.m_container.GetExportInfo()->bWantF32Vertices = advancedRule->Use32bitVertices();
-                context.m_container.GetExportInfo()->bMergeAllNodes = advancedRule->MergeMeshes();
-                context.m_container.GetExportInfo()->bUseCustomNormals = advancedRule->UseCustomNormals();
-                return SceneEvents::ProcessingResult::Success;
-            }
-            else
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-        }
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/ContainerSettingsExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/ContainerSettingsExporter.h
deleted file mode 100644
index 22d66c7430..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/ContainerSettingsExporter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct ContainerExportContext;
-
-        class ContainerSettingsExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            AZ_COMPONENT(ContainerSettingsExporter, "{878C641C-6614-413A-A174-EDFF84D8B119}", SceneAPI::SceneCore::RCExportingComponent);
-
-            ContainerSettingsExporter();
-            ~ContainerSettingsExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult ProcessContext(ContainerExportContext& context) const;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/ExportContextGlobal.h b/Code/Tools/RC/ResourceCompilerScene/Common/ExportContextGlobal.h
deleted file mode 100644
index f10d960c48..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/ExportContextGlobal.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-namespace AZ
-{
-    namespace RC
-    {
-        enum class Phase
-        {
-            Construction,   // The target is created.
-            Filling,        // Data is added to the target.
-            Finalizing      // Work on the target has completed.
-        };
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/MaterialExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/MaterialExporter.cpp
deleted file mode 100644
index 32e13de700..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/MaterialExporter.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include <Cry_Geo.h>
-#include <IIndexedMesh.h>
-#include <CGFContent.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <GFxFramework/MaterialIO/Material.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IRule.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h>
-#include <SceneAPI/SceneCore/Containers/Utilities/Filters.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IMaterialData.h>
-#include <SceneAPI/SceneCore/Utilities/FileUtilities.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneCore/Export/MtlMaterialExporter.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/MaterialExporter.h>
-#include <SceneAPI/SceneCore/Containers/RuleContainer.h>
-
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-        namespace SceneViews = AZ::SceneAPI::Containers::Views;
-
-        MaterialExporter::MaterialExporter()
-            : SceneAPI::SceneCore::RCExportingComponent()
-            , m_cachedGroup(nullptr)
-            , m_exportMaterial(true)
-        {
-            m_physMaterialNames[PHYS_GEOM_TYPE_DEFAULT_PROXY] = GFxFramework::MaterialExport::g_stringPhysicsNoDraw;
-
-            BindToCall(&MaterialExporter::ConfigureContainer);
-            BindToCall(&MaterialExporter::ProcessNode);
-            BindToCall(&MaterialExporter::PatchMesh);
-        }
-
-        void MaterialExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<MaterialExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneEvents::ProcessingResult MaterialExporter::ConfigureContainer(ContainerExportContext& context)
-        {
-            switch (context.m_phase)
-            {
-            case Phase::Construction:
-            {
-                if (!context.m_group.GetRuleContainerConst().FindFirstByType<SceneDataTypes::IMaterialRule>())
-                {
-                    m_exportMaterial = false;
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::LogWindow, "Skipping material processing due to material rule not being present.");
-                    return SceneEvents::ProcessingResult::Ignored;
-                }
-
-                if (!LoadMaterialFile(context))
-                {
-                    m_exportMaterial = false;
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Unable to read MTL file for processing meshes.");
-                    return SceneEvents::ProcessingResult::Failure;
-                }
-                m_cachedGroup = &(context.m_group);
-                SetupGlobalMaterial(context);
-                return SceneEvents::ProcessingResult::Success;
-            }
-            case Phase::Finalizing:
-                if (!m_exportMaterial)
-                {
-                    Reset();
-                    return SceneEvents::ProcessingResult::Ignored;
-                }
-
-                PatchSubmeshes(context);
-                CreateSubMaterials(context);
-                Reset();
-                return SceneEvents::ProcessingResult::Success;
-            default:
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-        }
-
-        SceneEvents::ProcessingResult MaterialExporter::ProcessNode(NodeExportContext& context)
-        {
-            if (context.m_phase == Phase::Filling && m_exportMaterial)
-            {
-                AssignCommonMaterial(context);
-                return SceneEvents::ProcessingResult::Success;
-            }
-            else
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-        }
-        
-        SceneEvents::ProcessingResult MaterialExporter::PatchMesh(MeshNodeExportContext& context)
-        {
-            if (context.m_phase == Phase::Filling && m_exportMaterial)
-            {
-                return PatchMaterials(context);
-            }
-            else
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-        }
-
-        bool MaterialExporter::LoadMaterialFile(ContainerExportContext& context)
-        {
-            // Load the material from the source first. If there's no source material a temporary material should have been 
-            //      created in the cache by the MaterialExporterComponent in SceneCore.
-
-            m_materialGroup = AZStd::make_shared<GFxFramework::MaterialGroup>();
-            bool fileRead = false;
-            
-            AZStd::string materialPath = context.m_scene.GetSourceFilename();
-            AzFramework::StringFunc::Path::ReplaceExtension(materialPath, GFxFramework::MaterialExport::g_mtlExtension);
-            AZ_TraceContext("Material source file path", materialPath);
-            
-            //get if we need to upate materials in source folder
-            const AZ::SceneAPI::Containers::RuleContainer& rules = context.m_group.GetRuleContainerConst();
-            AZStd::shared_ptr<const SceneDataTypes::IMaterialRule> materialRule = rules.FindFirstByType<SceneDataTypes::IMaterialRule>();
-            bool updateMaterials = materialRule->UpdateMaterials();
-
-            //if the source material exist and we won't need to update material later then we load the material from source folder
-            if (AZ::IO::SystemFile::Exists(materialPath.c_str()) && !updateMaterials)
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Using source material file for linking to meshes.");
-                fileRead = m_materialGroup->ReadMtlFile(materialPath.c_str());
-            }
-            else
-            {
-                materialPath = SceneAPI::Utilities::FileUtilities::CreateOutputFileName(
-                    context.m_scene.GetName(), context.m_outputDirectory, GFxFramework::MaterialExport::g_dccMaterialExtension);
-                AZ_TraceContext("Material cache file path", materialPath);
-                if (AZ::IO::SystemFile::Exists(materialPath.c_str()))
-                {
-                    AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Using cached material file for linking to meshes.");
-                    fileRead = m_materialGroup->ReadMtlFile(materialPath.c_str());
-                }
-            }
-
-            if (!fileRead)
-            {
-                m_materialGroup.reset();
-            }
-
-            return fileRead;
-        }
-
-        void MaterialExporter::SetupGlobalMaterial(ContainerExportContext& context)
-        {
-            AZ_Assert(m_cachedGroup == &context.m_group, "ContainerExportContext doesn't belong to chain of previously called MeshGroupExportContext.");
-
-            CMaterialCGF* rootMaterial = context.m_container.GetCommonMaterial();
-            if (!rootMaterial)
-            {
-                rootMaterial = new CMaterialCGF();
-                rootMaterial->nPhysicalizeType = PHYS_GEOM_TYPE_NONE;
-                azstrcpy(rootMaterial->name, sizeof(rootMaterial->name), context.m_scene.GetName().c_str());
-                context.m_container.SetCommonMaterial(rootMaterial);
-            }
-        }
-
-        void MaterialExporter::AssignCommonMaterial(NodeExportContext& context)
-        {
-            AZ_Assert(m_cachedGroup == &context.m_group, "MeshNodeExportContext doesn't belong to chain of previously called MeshGroupExportContext.");
-
-            CMaterialCGF* rootMaterial = context.m_container.GetCommonMaterial();
-            AZ_Assert(rootMaterial, "Previously assigned root material has been deleted.");
-            context.m_node.pMaterial = rootMaterial;
-        }
-
-        SceneAPI::Events::ProcessingResult MaterialExporter::PatchMaterials(MeshNodeExportContext& context)
-        {
-            AZ_Assert(m_cachedGroup == &context.m_group, "MeshNodeExportContext doesn't belong to chain of previously\
-called MeshGroupExportContext.");
-
-            AZStd::vector<size_t> relocationTable;
-            SceneEvents::ProcessingResult result = BuildRelocationTable(relocationTable, context);
-
-            if (result == SceneEvents::ProcessingResult::Failure)
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Material mapping error, mesh generation failed. \
-Change FBX Setting's \"Update Materials\" to true or modify the associated material file(.mtl) to fix the issue.");
-                return result;
-            }
-
-            if (relocationTable.empty())
-            {
-                // If the relocationTable is empty no materials were assigned to any of the
-                //      selected meshes. In this case simply leave the subsets as assigned
-                //      so users can later manually add materials if needed.
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            if (context.m_container.GetExportInfo()->bMergeAllNodes)
-            {
-                // Due to a bug which cases subsets to not merge correctly (see PatchSubmeshes for more details) use the global
-                //      table so far to patch the subset index in the face info instead. This way they will be assigned to the
-                //      eventual global subset stored in the first mesh.
-                int faceCount = context.m_mesh.GetFaceCount();
-                for (int i = 0; i < faceCount; ++i)
-                {
-                    context.m_mesh.m_pFaces[i].nSubset = relocationTable[context.m_mesh.m_pFaces[i].nSubset];
-                }
-            }
-            else
-            {
-                for (SMeshSubset& subset : context.m_mesh.m_subsets)
-                {
-                    subset.nMatID = relocationTable[subset.nMatID];
-                }
-            }
-
-            return SceneEvents::ProcessingResult::Success;
-        }
-
-        void MaterialExporter::PatchSubmeshes(ContainerExportContext& context)
-        {
-            // Due to a bug in the merging process of the Compiler it will always take the number of subsets of the first mesh
-            //      it finds. This causes files with more materials than the first model to not merge properly and ultimately cause
-            //      the entire export to fail. (See CGFNodeMerger::MergeNodes for more details.) The work-around for now is to fill
-            //      the first mesh up with placeholder subsets and adjust the subset indices in the face info.
-            AZ_Assert(m_cachedGroup == &context.m_group, "ContainerExportContext doesn't belong to chain of previously called MeshGroupExportContext.");
-
-            if (context.m_container.GetExportInfo()->bMergeAllNodes)
-            {
-                CMesh* firstMesh = nullptr;
-                int nodeCount = context.m_container.GetNodeCount();
-                for (int i = 0; i < nodeCount; ++i)
-                {
-                    CNodeCGF* node = context.m_container.GetNode(i);
-                    if (node->pMesh && !node->bPhysicsProxy && node->type == CNodeCGF::NODE_MESH)
-                    {
-                        firstMesh = node->pMesh;
-                        break;
-                    }
-                }
-
-                if (firstMesh)
-                {
-                    int subsetCount = firstMesh->GetSubSetCount();
-                    size_t materialCount = m_materialGroup->GetMaterialCount();
-
-                    for (int i = 0; i < subsetCount; ++i)
-                    {
-                        AZ_Assert(firstMesh->m_subsets[i].nMatID == i, "Materials addition order broken. (%i vs. %i)", firstMesh->m_subsets[i].nMatID, i);
-                    }
-
-                    for (size_t i = subsetCount; i < materialCount; ++i)
-                    {
-                        SMeshSubset meshSubset;
-                        meshSubset.nMatID = i;
-                        firstMesh->m_subsets.push_back(meshSubset);
-                    }
-                }
-            }
-        }
-
-        SceneAPI::Events::ProcessingResult MaterialExporter::BuildRelocationTable(AZStd::vector<size_t>& table, MeshNodeExportContext& context)
-        {
-            SceneEvents::ProcessingResultCombiner result;
-
-            auto physicalizeType = context.m_physicalizeType;
-            if ((physicalizeType == PHYS_GEOM_TYPE_DEFAULT_PROXY) || (physicalizeType == PHYS_GEOM_TYPE_NO_COLLIDE))
-            {
-                table.push_back(m_materialGroup->FindMaterialIndex(GFxFramework::MaterialExport::g_stringPhysicsNoDraw));
-            }
-            else
-            {
-                const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-
-                auto view = SceneViews::MakeSceneGraphChildView<SceneViews::AcceptEndPointsOnly>(
-                    graph, context.m_nodeIndex, graph.GetContentStorage().begin(), true);
-                for (auto it = view.begin(); it != view.end(); ++it)
-                {
-                    if ((*it) && (*it)->RTTI_IsTypeOf(SceneDataTypes::IMaterialData::TYPEINFO_Uuid()))
-                    {
-                        AZStd::string nodeName = graph.GetNodeName(graph.ConvertToNodeIndex(it.GetHierarchyIterator())).GetName();
-                        size_t index = m_materialGroup->FindMaterialIndex(nodeName);
-                        
-                        if (index == GFxFramework::MaterialExport::g_materialNotFound)
-                        {
-                            AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unable to find material named %s in mtl file while building FBX to Open 3D Engine material index table.", nodeName.c_str());
-                            result += SceneEvents::ProcessingResult::Failure;
-                        }
-                        table.push_back(index);
-                    }
-                }
-            }
-            return result.GetResult();
-        }
-
-        void MaterialExporter::CreateSubMaterials(ContainerExportContext& context)
-        {
-            AZ_Assert(m_cachedGroup == &context.m_group, "MeshNodeExportContext doesn't belong to chain of previously called MeshGroupExportContext.");
-
-            CMaterialCGF* rootMaterial = context.m_container.GetCommonMaterial();
-            if (!rootMaterial)
-            {
-                AZ_Assert(rootMaterial, "Previously assigned root material has been deleted.");
-                return;
-            }
-
-            // Create sub-materials stored in root material. Sub-materials will be used to assign physical types
-            // to subsets stored in meshes when mesh gets compiled later on.
-            rootMaterial->subMaterials.resize(m_materialGroup->GetMaterialCount(), nullptr);
-
-            for (size_t i = 0; i < m_materialGroup->GetMaterialCount(); ++i)
-            {
-                CMaterialCGF* materialCGF = new CMaterialCGF();
-                AZStd::shared_ptr<const GFxFramework::IMaterial> material = m_materialGroup->GetMaterial(i);
-                if (material)
-                {
-                    azstrncpy(materialCGF->name, sizeof(materialCGF->name), material->GetName().c_str(), sizeof(materialCGF->name));
-                    int materialFlags = material->GetMaterialFlags();
-                    //MTL_FLAG_NODRAW_TOUCHBENDING and MTL_FLAG_NODRAW are mutually exclusive.
-                    const int errorMask = AZ::GFxFramework::EMaterialFlags::MTL_FLAG_NODRAW_TOUCHBENDING |
-                                          AZ::GFxFramework::EMaterialFlags::MTL_FLAG_NODRAW;
-                    AZ_Assert((materialFlags & errorMask) != errorMask, "A physics material can not be NODRAW and NODRAW_TOUCHBENDING at the the same time.");
-                    if (materialFlags & AZ::GFxFramework::EMaterialFlags::MTL_FLAG_NODRAW_TOUCHBENDING)
-                    {
-                        materialCGF->nPhysicalizeType = PHYS_GEOM_TYPE_NO_COLLIDE;
-                    }
-                    else if (materialFlags & AZ::GFxFramework::EMaterialFlags::MTL_FLAG_NODRAW)
-                    {
-                        materialCGF->nPhysicalizeType = PHYS_GEOM_TYPE_DEFAULT_PROXY;
-                    }
-                    else
-                    {
-                        materialCGF->nPhysicalizeType = PHYS_GEOM_TYPE_NONE;
-                    }
-                    rootMaterial->subMaterials[i] = materialCGF;
-                }
-            }
-        }
-
-        void MaterialExporter::Reset()
-        {
-            m_materialGroup = nullptr;
-            m_exportMaterial = true;
-        }
-
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/MaterialExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/MaterialExporter.h
deleted file mode 100644
index ba6e7633a5..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/MaterialExporter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/containers/unordered_map.h>
-#include <GFxFramework/MaterialIO/IMaterial.h>
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace DataTypes
-        {
-            class IGroup;
-        }
-    }
-    namespace RC
-    {
-        struct ContainerExportContext;
-        struct NodeExportContext;
-        struct MeshNodeExportContext;
-
-        class MaterialExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            AZ_COMPONENT(MaterialExporter, "{F82300E0-ABE7-49F2-8BFF-1BFBD8BF3288}", SceneAPI::SceneCore::RCExportingComponent);
-
-            MaterialExporter();
-            ~MaterialExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult ConfigureContainer(ContainerExportContext& context);
-            SceneAPI::Events::ProcessingResult ProcessNode(NodeExportContext& context);
-            SceneAPI::Events::ProcessingResult PatchMesh(MeshNodeExportContext& context);
-
-        protected:
-            bool LoadMaterialFile(ContainerExportContext& context);
-
-            void SetupGlobalMaterial(ContainerExportContext& context);
-            void CreateSubMaterials(ContainerExportContext& context);
-            void PatchSubmeshes(ContainerExportContext& context);
-            void AssignCommonMaterial(NodeExportContext& context);
-            SceneAPI::Events::ProcessingResult PatchMaterials(MeshNodeExportContext& context);
-            SceneAPI::Events::ProcessingResult BuildRelocationTable(AZStd::vector<size_t>& table, MeshNodeExportContext& context);
-            void Reset();
-
-            AZStd::shared_ptr<AZ::GFxFramework::IMaterialGroup> m_materialGroup;
-            AZStd::unordered_map<int, AZStd::string> m_physMaterialNames;
-            const SceneAPI::DataTypes::IGroup* m_cachedGroup;
-            bool m_exportMaterial;
-        };
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/MeshExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/MeshExporter.cpp
deleted file mode 100644
index 1af42990c1..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/MeshExporter.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h>
-#include <IIndexedMesh.h>
-#include <CGFContent.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <RC/ResourceCompilerScene/Common/MeshExporter.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-
-        MeshExporter::MeshExporter()
-        {
-            BindToCall(&MeshExporter::ProcessMesh);
-        }
-
-        void MeshExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<MeshExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneEvents::ProcessingResult MeshExporter::ProcessMesh(NodeExportContext& context) const
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-            AZStd::shared_ptr<const SceneDataTypes::IMeshData> meshData = 
-                azrtti_cast<const SceneDataTypes::IMeshData*>(graph.GetNodeContent(context.m_nodeIndex));
-            if (meshData)
-            {
-                SceneEvents::ProcessingResultCombiner result;
-
-                CMesh* mesh = new CMesh();
-                result += SceneEvents::Process<MeshNodeExportContext>(context, *mesh, Phase::Construction);
-
-                MeshNodeExportContext meshNodeContextFilling(context, *mesh, Phase::Filling);
-                SetMeshFaces(*meshData, *mesh, context.m_physicalizeType);
-                if (!SetMeshVertices(*meshData, *mesh))
-                {
-                    return SceneEvents::ProcessingResult::Failure;
-                }
-                if (!SetMeshNormals(*meshData, *mesh))
-                {
-                    return SceneEvents::ProcessingResult::Failure;
-                }
-                SetMeshTopologyIds(*meshData, *mesh, context);
-                context.m_node.type = CNodeCGF::NODE_MESH;
-                context.m_node.pMesh = mesh;
-                result += SceneEvents::Process(meshNodeContextFilling);
-
-                MeshNodeExportContext meshNodeContextFinalizing(context, *mesh, Phase::Finalizing);
-                context.m_container.GetExportInfo()->bNoMesh = false;
-                result += SceneEvents::Process(meshNodeContextFinalizing);
-                
-                return result.GetResult();
-            }
-            else
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-        }
-
-        void MeshExporter::SetMeshFaces(const SceneDataTypes::IMeshData& meshData, CMesh& mesh, EPhysicsGeomType physicalizeType) const
-        {
-            if (meshData.GetFaceCount() == 0)
-            {
-                AZ_TracePrintf(AZ::SceneAPI::Utilities::LogWindow, "No mesh faces specified.");
-                return;
-            }
-
-            mesh.ReallocStream(CMesh::FACES, 0, meshData.GetFaceCount());
-            for (uint32_t i = 0; i < meshData.GetFaceCount(); ++i)
-            {
-                const SceneDataTypes::IMeshData::Face& face = meshData.GetFaceInfo(i);
-                mesh.m_pFaces[i].v[0] = face.vertexIndex[0];
-                mesh.m_pFaces[i].v[1] = face.vertexIndex[1];
-                mesh.m_pFaces[i].v[2] = face.vertexIndex[2];
-
-                // Create and use a unified subset if the mesh is chosen to be physicalized
-                if (physicalizeType == PHYS_GEOM_TYPE_DEFAULT_PROXY ||
-                    physicalizeType == PHYS_GEOM_TYPE_OBSTRUCT ||
-                    physicalizeType == PHYS_GEOM_TYPE_NO_COLLIDE)
-                {
-                    mesh.m_pFaces[i].nSubset = 0;
-                    if (mesh.m_subsets.empty())
-                    {
-                        SMeshSubset meshSubset;
-                        meshSubset.nMatID = 0;
-                        mesh.m_subsets.push_back(meshSubset);
-                    }
-                }
-                else
-                {
-                    int materialIndex = meshData.GetFaceMaterialId(i);
-                    mesh.m_pFaces[i].nSubset = materialIndex;
-
-                    while (mesh.m_subsets.size() <= materialIndex)
-                    {
-                        SMeshSubset meshSubset;
-                        meshSubset.nMatID = mesh.m_subsets.size();
-                        mesh.m_subsets.push_back(meshSubset);
-                    }
-                }
-            }
-        }
-
-        bool MeshExporter::SetMeshVertices(const SceneDataTypes::IMeshData& meshData, CMesh& mesh) const
-        {
-            mesh.ReallocStream(CMesh::POSITIONS, 0, meshData.GetVertexCount());
-            for (uint32_t i = 0; i < meshData.GetVertexCount(); ++i)
-            {
-                const Vector3& position = meshData.GetPosition(i);
-                if (!position.IsFinite())
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Invalid vertex data detected at index %d", i);
-                    return false;
-                }
-                mesh.m_pPositions[i] = Vec3(position.GetX(), position.GetY(), position.GetZ());
-            }
-            return true;
-        }
-
-        bool MeshExporter::SetMeshNormals(const SceneDataTypes::IMeshData& meshData, CMesh& mesh) const
-        {
-            // Mesh requires normals. If they're missing add a stream of default normals.
-            mesh.ReallocStream(CMesh::NORMALS, 0, meshData.GetVertexCount());
-            if (meshData.HasNormalData())
-            {
-                for (int i = 0; i < meshData.GetVertexCount(); ++i)
-                {
-                    const Vector3& normal = meshData.GetNormal(i);
-                    if (!normal.IsFinite())
-                    {
-                        AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Invalid normal data detected at index %d", i);
-                        return false;
-                    }
-                    mesh.m_pNorms[i] = SMeshNormal(Vec3(normal.GetX(), normal.GetY(), normal.GetZ()));
-                }
-            }
-            else
-            {
-                AZ_TracePrintf(AZ::SceneAPI::Utilities::LogWindow, "No mesh normals detected. Adding default normals.");
-                static const SMeshNormal defaultNormal(Vec3(1.0f, 0.0f, 0.0f));
-                for (int i = 0; i < meshData.GetVertexCount(); ++i)
-                {
-                    mesh.m_pNorms[i] = defaultNormal;
-                }
-            }
-            return true;
-        }
-
-        void MeshExporter::SetMeshTopologyIds(const SceneAPI::DataTypes::IMeshData& meshData, CMesh& mesh, NodeExportContext& context) const
-        {
-            // Note, If this is a skin mesh create dummy topology id data even though it seems to be unnecessary data. 
-            // Currently just provide it to prevent crash during skin mesh processing due to data misalignments.
-            if (context.m_group.RTTI_IsTypeOf(AZ::SceneAPI::DataTypes::ISkinGroup::TYPEINFO_Uuid()))
-            {
-                mesh.ReallocStream(CMesh::TOPOLOGY_IDS, 0, meshData.GetVertexCount());
-            }
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/MeshExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/MeshExporter.h
deleted file mode 100644
index 9835a914ca..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/MeshExporter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <CryHeaders.h>
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-
-class CMesh;
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace DataTypes
-        {
-            class IMeshData;
-        }
-    }
-    namespace RC
-    {
-        struct NodeExportContext;
-
-        class MeshExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            AZ_COMPONENT(MeshExporter, "{1F826DB8-D6B0-4392-90C8-8F6E63F649CA}", SceneAPI::SceneCore::RCExportingComponent);
-
-            MeshExporter();
-            ~MeshExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult ProcessMesh(NodeExportContext& context) const;
-
-        protected:
-            void SetMeshFaces(const SceneAPI::DataTypes::IMeshData& meshData, CMesh& mesh, EPhysicsGeomType physicalizeType) const;
-            bool SetMeshVertices(const SceneAPI::DataTypes::IMeshData& meshData, CMesh& mesh) const;
-            bool SetMeshNormals(const SceneAPI::DataTypes::IMeshData& meshData, CMesh& mesh) const;
-            void SetMeshTopologyIds(const SceneAPI::DataTypes::IMeshData& meshData, CMesh& mesh, NodeExportContext& context) const;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/SkeletonExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/SkeletonExporter.cpp
deleted file mode 100644
index 1dc747d9bd..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/SkeletonExporter.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for CGFContent.h
-#include <CryCrc32.h>
-#include <CGFContent.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/SkeletonExporter.h>
-#include <RC/ResourceCompilerScene/Common/AssetExportUtilities.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IBoneData.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneUtil = AZ::SceneAPI::Utilities;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-
-        SkeletonExporter::SkeletonExporter()
-        {
-            BindToCall(&SkeletonExporter::ResolveRootBoneFromBone);
-            BindToCall(&SkeletonExporter::BuildBoneMap);
-            BindToCall(&SkeletonExporter::AddBonesToSkinningInfo);
-            BindToCall(&SkeletonExporter::ProcessSkeleton);
-        }
-
-        void SkeletonExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<SkeletonExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneAPI::Events::ProcessingResult SkeletonExporter::ResolveRootBoneFromBone(ResolveRootBoneFromBoneContext& context)
-        {
-            const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-
-            const AZStd::string& boneName = context.m_boneName;
-            AZ_TraceContext("Bone name", boneName.c_str());
-
-            auto contentStorage = graph.GetContentStorage();
-            auto nameStorage = graph.GetNameStorage();
-            auto nameContentView = SceneContainers::Views::MakePairView(nameStorage, contentStorage);
-
-            // If the boneName is a full graph path, use that particular bone.
-            SceneContainers::SceneGraph::NodeIndex boneIndex = graph.Find(boneName);
-            if (!boneIndex.IsValid())
-            {
-                // If the the bone index is only the name, start looking for the first bone found with that name. The bone closest to
-                //      the root of the graph is preferred.
-                auto graphDownwardsView = SceneContainers::Views::MakeSceneGraphDownwardsView<SceneContainers::Views::BreadthFirst>(
-                    graph, graph.GetRoot(), nameContentView.begin(), true);
-
-                auto it = AZStd::find_if(graphDownwardsView.begin(), graphDownwardsView.end(),
-                    [&boneName](const decltype(*nameContentView.begin())& entry) -> bool
-                    {
-                        if (!entry.second || !entry.second->RTTI_IsTypeOf(SceneDataTypes::IBoneData::TYPEINFO_Uuid()))
-                        {
-                            return false;
-                        }
-                        return azstrnicmp(entry.first.GetName(), boneName.c_str(), entry.first.GetNameLength()) == 0;
-                    });
-
-                if (it == graphDownwardsView.end())
-                {
-                    AZ_TracePrintf(SceneUtil::ErrorWindow, "Unable to find the skeleton root bone for bone");
-                    return  SceneEvents::ProcessingResult::Failure;
-                }
-                boneIndex = graph.ConvertToNodeIndex(it.GetHierarchyIterator());
-            }
-
-            AZ_Assert(boneIndex.IsValid(), "A bone was found but the index for it's node is still invalid.");
-
-            // Now that the bone has been found, search upwards to find the root bone of the skeleton the bone belongs to.
-            auto graphUpwardsView = SceneContainers::Views::MakeSceneGraphUpwardsView(graph, boneIndex, nameContentView.begin(), true);
-            const char* rootBoneName = nullptr;
-            for (const auto& it : graphUpwardsView)
-            {
-                if (it.second && it.second->RTTI_IsTypeOf(SceneDataTypes::IBoneData::TYPEINFO_Uuid()))
-                {
-                    rootBoneName = it.first.GetPath();
-                }
-                else
-                {
-                    break;
-                }
-            }
-            AZ_Assert(rootBoneName, "The name of the first bone should have been found.");
-            context.m_rootBoneName = rootBoneName;
-
-            return SceneEvents::ProcessingResult::Success;
-        }
-        
-        SceneEvents::ProcessingResult SkeletonExporter::BuildBoneMap(BuildBoneMapContext& context)
-        {
-            return BuildBoneMap(context.m_boneNameIdMap, context.m_scene.GetGraph(), context.m_rootBoneName) ?
-                SceneEvents::ProcessingResult::Success : SceneEvents::ProcessingResult::Failure;
-        }
-
-        SceneEvents::ProcessingResult SkeletonExporter::AddBonesToSkinningInfo(AddBonesToSkinningInfoContext& context)
-        {
-            return AddBonesToSkinningInfo(context.m_skinningInfo, context.m_scene.GetGraph(), context.m_rootBoneName) ?
-                SceneEvents::ProcessingResult::Success : SceneEvents::ProcessingResult::Failure;
-        }
-
-        SceneEvents::ProcessingResult SkeletonExporter::ProcessSkeleton(SkeletonExportContext& context)
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            return AddBonesToSkinningInfo(context.m_skinningInfo, context.m_scene.GetGraph(), context.m_rootBoneName) ?
-                SceneEvents::ProcessingResult::Success : SceneEvents::ProcessingResult::Failure;
-        }
-
-        bool SkeletonExporter::AddBonesToSkinningInfo(CSkinningInfo& skinningInfo, const SceneContainers::SceneGraph& graph, const AZStd::string& rootBoneName) const
-        {
-            if (rootBoneName.empty())
-            {
-                AZ_TracePrintf(SceneUtil::ErrorWindow, "Root bone name cannot be empty.");
-                return false;
-            }
-            AZ_TraceContext("Root bone", rootBoneName);
-
-            AZStd::unordered_map<AZStd::string, int> boneNameIdMap;
-            if (!BuildBoneMap(boneNameIdMap, graph, rootBoneName))
-            {
-                // Error already reported by BuildBoneMap.
-                return false;
-            }
-
-            SceneContainers::SceneGraph::NodeIndex nodeIndex = graph.Find(rootBoneName);
-            if (!nodeIndex.IsValid())
-            {
-                AZ_TracePrintf(SceneUtil::ErrorWindow, "Unable to find root bone in scene graph.");
-                return false;
-            }
-
-            auto contentStorage = graph.GetContentStorage();
-            auto nameStorage = graph.GetNameStorage();
-            auto pairView = SceneContainers::Views::MakePairView(contentStorage, nameStorage);
-            auto view = SceneContainers::Views::MakeSceneGraphDownwardsView<SceneContainers::Views::DepthFirst>(graph, nodeIndex, pairView.begin(), true);
-            for (auto it = view.begin(); it != view.end(); ++it)
-            {
-                if (it->first && it->first->RTTI_IsTypeOf(SceneDataTypes::IBoneData::TYPEINFO_Uuid()))
-                {
-                    AZ_TraceContext("Bone", it->second.GetPath());
-                    AZStd::shared_ptr<const SceneDataTypes::IBoneData> boneData = azrtti_cast<const SceneDataTypes::IBoneData*>(it->first);
-                    AZ_Assert(boneData, "Graph object couldn't be converted to bone data even though it matched the type.");
-
-                    // Example fbx file exported from Maya will have default unit in centimeter.
-                    // E.g. A global transformation in meter unit:
-                    // 0.01 0    0    | 0.05
-                    // 0    0.01 0    | 0
-                    // 0    0    0.01 | 0
-                    // while a global transform in centimeter unit:
-                    // 1    0    0    | 5
-                    // 0    1    0    | 0
-                    // 0    0    1    | 0
-                    // We need to remove scale from transform matrix (so the root bone's rotation matrix is identity) to satisfy the
-                    // input requirement of AssetWriter
-                    SceneAPI::DataTypes::MatrixType transformNoScale = boneData->GetWorldTransform();
-                    AZ_Assert(transformNoScale.RetrieveScale().GetLength() >= Constants::FloatEpsilon, "Transform on bone %s has 0 scale", it->second.GetName());
-                    transformNoScale.ExtractScale();
-                    AddBoneDescriptor(skinningInfo, it->second.GetName(), it->second.GetNameLength(), transformNoScale);
-                    if (!AddBoneEntity(skinningInfo, graph, graph.ConvertToNodeIndex(it.GetHierarchyIterator()), boneNameIdMap,
-                        it->second.GetName(), it->second.GetPath(), rootBoneName))
-                    {
-                        // Error already reported in AddBoneEntity.
-                        return false;
-                    }
-                }
-                else
-                {
-                    // End of bone chain or interruption in the bone chain. In both cases stop looking into this part of hierarchy further.
-                    it.IgnoreNodeDescendants();
-                }
-            }
-
-            return true;
-        }
-
-        bool SkeletonExporter::BuildBoneMap(AZStd::unordered_map<AZStd::string, int>& boneNameIdMap, const SceneContainers::SceneGraph& graph, const AZStd::string& rootBoneName) const
-        {
-            if (rootBoneName.empty())
-            {
-                AZ_TracePrintf(SceneUtil::ErrorWindow, "Root bone name cannot be empty.");
-                return false;
-            }
-
-            AZ_TraceContext("Root bone", rootBoneName);
-            SceneContainers::SceneGraph::NodeIndex nodeIndex = graph.Find(rootBoneName);
-            if (!nodeIndex.IsValid())
-            {
-                AZ_TracePrintf(SceneUtil::ErrorWindow, "Unable to find root bone in scene graph.");
-                return false;
-            }
-
-            auto contentStorage = graph.GetContentStorage();
-            auto nameStorage = graph.GetNameStorage();
-            auto pairView = SceneContainers::Views::MakePairView(contentStorage, nameStorage);
-            auto view = SceneContainers::Views::MakeSceneGraphDownwardsView<SceneContainers::Views::DepthFirst>(graph, nodeIndex, pairView.begin(), true);
-            int index = 0;
-            for (auto it = view.begin(); it != view.end(); ++it)
-            {
-                if (it->first && it->first->RTTI_IsTypeOf(SceneDataTypes::IBoneData::TYPEINFO_Uuid()))
-                {
-                    boneNameIdMap[it->second.GetName()] = index;
-                    index++;
-                }
-                else
-                {
-                    // End of bone chain or interruption in the bone chain. In both cases stop looking into this part of hierarchy further.
-                    it.IgnoreNodeDescendants();
-                }
-            }
-
-            return true;
-        }
-
-        void SkeletonExporter::AddBoneDescriptor(CSkinningInfo& skinningInfo, const char* boneName, size_t boneNameLength,
-            const SceneAPI::DataTypes::MatrixType& worldTransform) const
-        {
-            CryBoneDescData boneDesc;
-            auto convertedTransform{ AssetExportUtilities::ConvertToCryMatrix34(worldTransform) };
-
-            AZ_Assert(convertedTransform.IsValid(), "Bone %s has invalid world transform", boneName);
-
-            // Invalid transform will set off an assertion in the equals operator below - the check above is so
-            // in case of that assertion AP will give a hint of what to look at in the logs
-            boneDesc.m_DefaultB2W = convertedTransform;
-            boneDesc.m_DefaultW2B = boneDesc.m_DefaultB2W.GetInverted();
-
-            SetBoneName(boneName, boneNameLength, boneDesc);
-            boneDesc.m_nControllerID = CCrc32::ComputeLowercase(boneName);
-
-            skinningInfo.m_arrBonesDesc.push_back(boneDesc);
-        }
-
-        bool SkeletonExporter::AddBoneEntity(CSkinningInfo& skinningInfo, const SceneContainers::SceneGraph& graph, const SceneContainers::SceneGraph::NodeIndex index,
-            const AZStd::unordered_map<AZStd::string, int>& boneNameIdMap, const char* boneName, const char* bonePath, const AZStd::string& rootBoneName) const
-        {
-            BONE_ENTITY boneEntity;
-            memset(&boneEntity, 0, sizeof(boneEntity));
-
-            auto boneIndex = boneNameIdMap.find(boneName);
-            if (boneIndex != boneNameIdMap.end())
-            {
-                boneEntity.BoneID = boneIndex->second;
-                boneEntity.ParentID = -1;
-                if (rootBoneName.compare(bonePath) != 0)
-                {
-                    SceneContainers::SceneGraph::NodeIndex parentIndex = graph.GetNodeParent(index);
-                    auto parentIt = boneNameIdMap.find(graph.GetNodeName(parentIndex).GetName());
-                    if (parentIt != boneNameIdMap.end())
-                    {
-                        boneEntity.ParentID = parentIt->second;
-                    }
-                    else
-                    {
-                        AZ_TracePrintf(SceneUtil::ErrorWindow, "Bone is not the root bone but doesn't have another bone as it's parent.");
-                        return false;
-                    }
-                }
-            }
-            boneEntity.ControllerID = CCrc32::ComputeLowercase(boneName);
-            boneEntity.phys.nPhysGeom = -1;
-
-            auto childBones = SceneContainers::Views::MakeSceneGraphChildView<SceneContainers::Views::AcceptNodesOnly>(
-                graph, index, graph.GetNameStorage().begin(), true);
-            boneEntity.nChildren = aznumeric_caster(AZStd::count_if(childBones.begin(), childBones.end(),
-                [&boneNameIdMap](const SceneContainers::SceneGraph::Name& name)
-                {
-                    return boneNameIdMap.find(name.GetName()) != boneNameIdMap.end();
-                }));
-
-            skinningInfo.m_arrBoneEntities.push_back(boneEntity);
-
-            return true;
-        }
-
-        void SkeletonExporter::SetBoneName(const char* name, size_t nameLength, CryBoneDescData& boneDesc) const
-        {
-            static const size_t nodeNameCount = sizeof(boneDesc.m_arrBoneName) / sizeof(boneDesc.m_arrBoneName[0]);
-            size_t offset = (nameLength < nodeNameCount) ? 0 : (nameLength - nodeNameCount + 1);
-            azstrcpy(boneDesc.m_arrBoneName, nodeNameCount, name + offset);
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/SkeletonExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/SkeletonExporter.h
deleted file mode 100644
index 704b025f03..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/SkeletonExporter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/DataTypes/MatrixType.h>
-
-struct CryBoneDescData;
-struct CSkinningInfo;
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct SkeletonExportContext;
-        struct ResolveRootBoneFromBoneContext;
-        struct BuildBoneMapContext;
-        struct AddBonesToSkinningInfoContext;
-
-        class SkeletonExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            AZ_COMPONENT(SkeletonExporter, "{FDEC2360-3D9C-4027-BCFB-E8C99CAADB43}", SceneAPI::SceneCore::RCExportingComponent);
-
-            SkeletonExporter();
-            ~SkeletonExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult ResolveRootBoneFromBone(ResolveRootBoneFromBoneContext& context);
-            SceneAPI::Events::ProcessingResult BuildBoneMap(BuildBoneMapContext& context);
-            SceneAPI::Events::ProcessingResult AddBonesToSkinningInfo(AddBonesToSkinningInfoContext& context);
-            SceneAPI::Events::ProcessingResult ProcessSkeleton(SkeletonExportContext& context);
-            
-        protected:
-            bool AddBonesToSkinningInfo(CSkinningInfo& skinningInfo,
-                const AZ::SceneAPI::Containers::SceneGraph& graph, const AZStd::string& rootBoneName) const;
-            bool BuildBoneMap(AZStd::unordered_map<AZStd::string, int>& boneNameIdMap, 
-                const AZ::SceneAPI::Containers::SceneGraph& graph, const AZStd::string& rootBoneName) const;
-            void AddBoneDescriptor(CSkinningInfo& skinningInfo, const char* boneName, size_t boneNameLength,
-                const SceneAPI::DataTypes::MatrixType& worldTransform) const;
-            bool AddBoneEntity(CSkinningInfo& skinningInfo, const AZ::SceneAPI::Containers::SceneGraph& graph,
-                const AZ::SceneAPI::Containers::SceneGraph::NodeIndex index, const AZStd::unordered_map<AZStd::string, int>& boneNameIdMap,
-                const char* boneName, const char* bonePath, const AZStd::string& rootBoneName) const;
-            void SetBoneName(const char* name, size_t nameLength, CryBoneDescData& boneDesc) const;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/SkinWeightExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/SkinWeightExporter.cpp
deleted file mode 100644
index b4cfb1209c..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/SkinWeightExporter.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h>
-#include <IIndexedMesh.h>
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/Containers/Utilities/Filters.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IBoneData.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/SkinWeightExporter.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-        namespace SceneUtils = AZ::SceneAPI::Utilities;
-        namespace SceneViews = SceneContainers::Views;
-
-        SkinWeightExporter::SkinWeightExporter()
-        {
-            BindToCall(&SkinWeightExporter::ResolveRootBoneFromNode);
-            BindToCall(&SkinWeightExporter::ProcessSkinWeights);
-            BindToCall(&SkinWeightExporter::ProcessTouchBendableSkinWeights);
-        }
-
-        void SkinWeightExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<SkinWeightExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneEvents::ProcessingResult SkinWeightExporter::ResolveRootBoneFromNode(ResolveRootBoneFromNodeContext& context)
-        {
-            using namespace SceneContainers;
-            using namespace SceneContainers::Views;
-            using namespace SceneDataTypes;
-            using namespace SceneEvents;
-            
-            const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-            auto attributeView = MakeSceneGraphChildView<AcceptEndPointsOnly>(graph, context.m_nodeIndex, graph.GetContentStorage().begin(), true);
-            auto weights = AZStd::find_if(attributeView.begin(), attributeView.end(), DerivedTypeFilter<ISkinWeightData>());
-            if (weights == attributeView.end() || azrtti_cast<const SceneDataTypes::ISkinWeightData*>(*weights)->GetBoneCount() == 0)
-            {
-                AZ_TracePrintf(SceneUtils::WarningWindow, "No skin weight data, skin weight data ignored.");
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            const AZStd::string& boneName = azrtti_cast<const SceneDataTypes::ISkinWeightData*>(*weights)->GetBoneName(0);
-            AZ_TraceContext("Bone name", boneName);
-
-            ProcessingResult result = SceneEvents::Process<ResolveRootBoneFromBoneContext>(context.m_rootBoneName, context.m_scene, boneName);
-            if (result == ProcessingResult::Ignored)
-            {
-                AZ_TracePrintf(SceneUtils::WarningWindow, "No system registered that can resolve bone names.");
-            }
-            else if (result == ProcessingResult::Failure)
-            {
-                AZ_TracePrintf(SceneUtils::ErrorWindow, "Failed to resolve skeleton from bone.");
-            }
-            return result;
-        }
-
-        SceneEvents::ProcessingResult SkinWeightExporter::ProcessSkinWeights(MeshNodeExportContext& context)
-        {
-            if (context.m_phase != Phase::Filling || !context.m_group.RTTI_IsTypeOf(AZ::SceneAPI::DataTypes::ISkinGroup::TYPEINFO_Uuid()))
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            AZ_TraceContext("Root bone", context.m_rootBoneName);
-
-            BoneNameIdMap boneNameIdMap;
-            SceneEvents::ProcessingResult result = SceneAPI::Events::Process<BuildBoneMapContext>(context.m_scene, context.m_rootBoneName, boneNameIdMap);
-            if (result == SceneEvents::ProcessingResult::Ignored)
-            {
-                AZ_TracePrintf(SceneUtils::WarningWindow, "No system registered that can handle skeletons for skins.");
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-            else if (result == SceneEvents::ProcessingResult::Failure)
-            {
-                AZ_TracePrintf(SceneUtils::ErrorWindow, "Failed to load bone mapping for skin.");
-                return SceneEvents::ProcessingResult::Failure;
-            }
-
-            SetSkinWeights(context, boneNameIdMap);
-            return SceneEvents::ProcessingResult::Success;
-        }
-
-        SceneEvents::ProcessingResult SkinWeightExporter::ProcessTouchBendableSkinWeights(TouchBendableMeshNodeExportContext& context)
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            AZ_TraceContext("Root bone", context.m_rootBoneName);
-
-            BoneNameIdMap boneNameIdMap;
-            SceneEvents::ProcessingResult result = SceneAPI::Events::Process<BuildBoneMapContext>(context.m_scene, context.m_rootBoneName, boneNameIdMap);
-            if (result == SceneEvents::ProcessingResult::Ignored)
-            {
-                AZ_TracePrintf(SceneUtils::WarningWindow, "No system registered that can handle skeletons for skins.");
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-            else if (result == SceneEvents::ProcessingResult::Failure)
-            {
-                AZ_TracePrintf(SceneUtils::ErrorWindow, "Failed to load bone mapping for skin.");
-                return SceneEvents::ProcessingResult::Failure;
-            }
-
-            SetSkinWeights(context, boneNameIdMap);
-            return SceneEvents::ProcessingResult::Success;
-        }
-
-        void SkinWeightExporter::SetSkinWeights(MeshNodeExportContext& context, BoneNameIdMap boneNameIdMap)
-        {
-            AZStd::shared_ptr<const SceneDataTypes::ISkinWeightData> skinWeights = nullptr;
-            AZStd::shared_ptr<const SceneData::GraphData::MeshData> meshData = nullptr;
-            const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
-            SceneContainers::SceneGraph::NodeIndex index = graph.GetNodeChild(context.m_nodeIndex);
-            while (index.IsValid())
-            {
-                skinWeights = azrtti_cast<const SceneDataTypes::ISkinWeightData*>(graph.GetNodeContent(index));
-                if (skinWeights)
-                {
-                    // Support first set of skin weights for now
-                    auto parentIndex = graph.GetNodeParent(index);
-                    if (parentIndex.IsValid())
-                    {
-                        meshData = azrtti_cast<const SceneData::GraphData::MeshData*>(graph.GetNodeContent(parentIndex));  
-                    }
-                    else
-                    {
-                        AZ_TracePrintf(SceneUtils::WarningWindow, "Invalid mesh parent data for skin weights data");
-                    }
-                    break;
-                }
-                index = graph.GetNodeSibling(index);
-            }
-
-            if (skinWeights)
-            {
-                if (skinWeights->GetVertexCount() == 0)
-                {
-                    AZ_TracePrintf(SceneUtils::WarningWindow, "Empty skin weight data, skin weight data ignored.");
-                    return;
-                }                
-                
-                bool hasExtraWeights = false;
-                for (size_t vertexIndex = 0; vertexIndex < skinWeights->GetVertexCount(); ++vertexIndex)
-                {
-                    if (skinWeights->GetLinkCount(vertexIndex) > 4)
-                    {
-                        hasExtraWeights = true;
-                        break;
-                    }
-                }
-
-                context.m_mesh.ReallocStream(CMesh::BONEMAPPING, 0, context.m_mesh.GetVertexCount());
-                if (hasExtraWeights)
-                {
-                    context.m_mesh.ReallocStream(CMesh::EXTRABONEMAPPING, 0, context.m_mesh.GetVertexCount());
-                }
-
-                for (size_t vertexIndex = 0; vertexIndex < context.m_mesh.GetVertexCount(); ++vertexIndex)
-                {
-                    int controlPointIndex = meshData->GetControlPointIndex(vertexIndex);
-                    size_t linkCount = skinWeights->GetLinkCount(controlPointIndex);
-                    for (size_t linkIndex = 0; linkIndex < 4 && linkIndex < linkCount; ++linkIndex)
-                    {
-                        const SceneDataTypes::ISkinWeightData::Link& link = skinWeights->GetLink(controlPointIndex, linkIndex);
-                        context.m_mesh.m_pBoneMapping[vertexIndex].weights[linkIndex] = aznumeric_caster(GetClamp<float>(255.0f*link.weight, 0.0f, 255.0f));
-                        context.m_mesh.m_pBoneMapping[vertexIndex].boneIds[linkIndex] = 
-                            aznumeric_caster(GetGlobalBoneId(skinWeights, boneNameIdMap, link.boneId));
-                    }
-
-                    if (hasExtraWeights)
-                    {
-                        for (size_t linkIndex = 4; linkIndex < 8 && linkIndex < linkCount; ++linkIndex)
-                        {
-                            const SceneDataTypes::ISkinWeightData::Link& link = skinWeights->GetLink(controlPointIndex, linkIndex);
-                            context.m_mesh.m_pExtraBoneMapping[vertexIndex].weights[linkIndex - 4] = aznumeric_caster(GetClamp<float>(255.0f*link.weight, 0.0f, 255.0f));
-                            context.m_mesh.m_pExtraBoneMapping[vertexIndex].boneIds[linkIndex - 4] = 
-                                aznumeric_caster(GetGlobalBoneId(skinWeights, boneNameIdMap, link.boneId));
-                        }
-                    }
-                }
-            }
-        }
-
-        int SkinWeightExporter::GetGlobalBoneId(
-            const AZStd::shared_ptr<const SceneDataTypes::ISkinWeightData>& skinWeights, BoneNameIdMap boneNameIdMap, int boneId)
-        {
-            AZ_TraceContext("Bone id", boneId);
-            const AZStd::string& boneName = skinWeights->GetBoneName(boneId);
-            AZ_TraceContext("Bone name", boneName);
-
-            if (boneName.empty())
-            {
-                AZ_TracePrintf(SceneUtils::WarningWindow, "Invalid local bone id referenced in skin weight data");
-                return -1;
-            }
-            
-            auto it = boneNameIdMap.find(boneName);
-            if (it == boneNameIdMap.end())
-            {
-                AZ_TracePrintf(SceneUtils::WarningWindow, "Local bone name referenced in skin weight data doesn't exist in global bone map");
-                return -1;
-            }
-            return it->second;
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/SkinWeightExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/SkinWeightExporter.h
deleted file mode 100644
index 7d0442ce58..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/SkinWeightExporter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace DataTypes
-        {
-            class ISkinWeightData;
-        }
-    }
-
-    namespace RC
-    {
-        struct ResolveRootBoneFromNodeContext;
-        struct MeshNodeExportContext;
-
-        class SkinWeightExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            using BoneNameIdMap = AZStd::unordered_map<AZStd::string, int>;
-
-            AZ_COMPONENT(SkinWeightExporter, "{97C7D185-14F5-4BB1-AAE0-120A722882D1}", SceneAPI::SceneCore::RCExportingComponent);
-
-            SkinWeightExporter();
-            ~SkinWeightExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult ResolveRootBoneFromNode(ResolveRootBoneFromNodeContext& context);
-            SceneAPI::Events::ProcessingResult ProcessSkinWeights(MeshNodeExportContext& context);
-            SceneAPI::Events::ProcessingResult ProcessTouchBendableSkinWeights(TouchBendableMeshNodeExportContext& context);
-
-        protected:
-            void SetSkinWeights(MeshNodeExportContext& context, BoneNameIdMap boneNameIdMap);
-            int GetGlobalBoneId(const AZStd::shared_ptr<const SceneAPI::DataTypes::ISkinWeightData>& skinWeights, BoneNameIdMap boneNameIdMap, int boneId);
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/UVStreamExporter.cpp b/Code/Tools/RC/ResourceCompilerScene/Common/UVStreamExporter.cpp
deleted file mode 100644
index d22399c55a..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/UVStreamExporter.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for IIndexedMesh.h
-#include <IIndexedMesh.h>
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexUVData.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/UVStreamExporter.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneDataTypes = AZ::SceneAPI::DataTypes;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-        namespace SceneUtilities = AZ::SceneAPI::Utilities;
-
-        UVStreamExporter::UVStreamExporter()
-        {
-            BindToCall(&UVStreamExporter::CopyUVStream);
-        }
-
-        void UVStreamExporter::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<UVStreamExporter, SceneAPI::SceneCore::RCExportingComponent>()->Version(1);
-            }
-        }
-
-        SceneEvents::ProcessingResult UVStreamExporter::CopyUVStream(MeshNodeExportContext& context) const
-        {
-            if (context.m_phase != Phase::Filling)
-            {
-                return SceneEvents::ProcessingResult::Ignored;
-            }
-
-            const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();          
-            
-            SceneEvents::ProcessingResultCombiner result;
-
-            AZStd::vector<AZStd::shared_ptr<const SceneDataTypes::IMeshVertexUVData>> uvStreams;
-            // Find all uv streams and save them into uvStreams to be used later
-            SceneContainers::SceneGraph::NodeIndex index = graph.GetNodeChild(context.m_nodeIndex);
-            while (index.IsValid())
-            {
-                AZStd::string streamName;
-
-                AZStd::shared_ptr<const SceneDataTypes::IMeshVertexUVData> uvStream = azrtti_cast<const SceneDataTypes::IMeshVertexUVData*>(graph.GetNodeContent(index));
-                if (uvStream)
-                {
-                    uvStreams.push_back(uvStream);
-
-                    streamName = graph.GetNodeName(index).GetName();
-                    AZ_TraceContext("UV set", streamName);
-
-                    if (context.m_mesh.GetVertexCount() != uvStream->GetCount())
-                    {
-                        AZ_TracePrintf(SceneUtilities::ErrorWindow,
-                            "Number of vertices in the mesh (%i) doesn't match with the number of stored UVs (%i).",
-                            context.m_mesh.GetVertexCount(), uvStream->GetCount(), streamName.c_str());
-                        result += SceneEvents::ProcessingResult::Failure;
-                    }
-                }
-                index = graph.GetNodeSibling(index);
-            }
-            // Populate a default uv if there is no existing uv stream.
-            if (uvStreams.size() == 0)
-            {
-                AZ_TraceContext("UV set", "UVs not used");
-                uvStreams.emplace_back(nullptr);
-            }
-
-            for (size_t uvIndex = 0; uvIndex < AZStd::min((size_t)s_uvMaxStreamCount, uvStreams.size()); ++uvIndex)
-            {
-                AZStd::shared_ptr<const SceneDataTypes::IMeshVertexUVData> uvs = uvStreams[uvIndex];
-
-                result += PopulateUVStream(context, uvIndex, uvs);
-            }
-            return result.GetResult();
-        }
-
-        SceneEvents::ProcessingResult UVStreamExporter::PopulateUVStream(MeshNodeExportContext& context, int index, AZStd::shared_ptr<const SceneDataTypes::IMeshVertexUVData> uvs) const
-        {
-            context.m_mesh.ReallocStream(CMesh::TEXCOORDS, index, context.m_mesh.GetVertexCount());
-            SMeshTexCoord* uvStream = context.m_mesh.template GetStreamPtr<SMeshTexCoord>(CMesh::TEXCOORDS, index);
-            if (uvs)
-            {
-                for (int i = 0; i < context.m_mesh.GetVertexCount(); ++i)
-                {
-                    const AZ::Vector2& uv = uvs->GetUV(i);
-
-                    if (!uv.IsFinite())
-                    {
-                        AZ_TracePrintf(SceneUtilities::ErrorWindow, "Invalid UV data detected at index %d.", i);
-                        return SceneEvents::ProcessingResult::Failure;
-                    }
-
-                    // Note: If this is a skin mesh the y value of texture coordinate needs to be inverted, because as it processes 
-                    // through CharacterCompiler::ProcessWork, it will get inverted again. This pre-corrects things to ensure the
-                    // finally generated skin's uv texture coordinates are correct.
-                    if (context.m_group.RTTI_IsTypeOf(AZ::SceneAPI::DataTypes::ISkinGroup::TYPEINFO_Uuid()))
-                    {
-                        uvStream[i] = SMeshTexCoord(uv.GetX(), 1.0f - uv.GetY());
-                    }
-                    else
-                    {
-                        uvStream[i] = SMeshTexCoord(uv.GetX(), uv.GetY());
-                    }
-                }
-            }
-            //Default to a dummy stream of data.
-            else
-            {
-                static const SMeshTexCoord defaultTextureCoordinate(0.0f, 0.0f);
-                for (int i = 0; i < context.m_mesh.GetVertexCount(); ++i)
-                {
-                    uvStream[i] = defaultTextureCoordinate;
-                }
-            }
-            return SceneEvents::ProcessingResult::Success;
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Common/UVStreamExporter.h b/Code/Tools/RC/ResourceCompilerScene/Common/UVStreamExporter.h
deleted file mode 100644
index 522de0e24e..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Common/UVStreamExporter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexUVData.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        struct MeshNodeExportContext;
-
-        class UVStreamExporter
-            : public SceneAPI::SceneCore::RCExportingComponent
-        {
-        public:
-            AZ_COMPONENT(UVStreamExporter, "{3840C94B-C131-4C34-B35B-C8E8CFC5AFD1}", SceneAPI::SceneCore::RCExportingComponent);
-
-            UVStreamExporter();
-            ~UVStreamExporter() override = default;
-
-            static void Reflect(ReflectContext* context);
-
-            SceneAPI::Events::ProcessingResult CopyUVStream(MeshNodeExportContext& context) const;
-        protected:
-            SceneAPI::Events::ProcessingResult PopulateUVStream(MeshNodeExportContext& context, int index, AZStd::shared_ptr<const SceneAPI::DataTypes::IMeshVertexUVData> uvs) const;
-            static const size_t s_uvMaxStreamCount = 2;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/ISceneConfig.h b/Code/Tools/RC/ResourceCompilerScene/ISceneConfig.h
deleted file mode 100644
index a8fa3c9289..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/ISceneConfig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <cstddef>
-
-class IConfig;
-
-namespace AZ
-{
-    class SerializeContext;
-
-    namespace RC
-    {
-        class ISceneConfig
-        {
-        public:
-            virtual ~ISceneConfig() = 0;
-
-            virtual size_t GetErrorCount() const = 0;
-        };
-
-        inline ISceneConfig::~ISceneConfig() = default;
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/ResourceCompilerScene.cpp b/Code/Tools/RC/ResourceCompilerScene/ResourceCompilerScene.cpp
deleted file mode 100644
index 1860eb3e32..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/ResourceCompilerScene.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <ISystem.h>
-#include <platform.h>
-#include <IResCompiler.h>
-#include <IRCLog.h>
-
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <SceneConfig.h>
-#include <SceneConverter.h>
-
-extern "C"
-{
-    DLL_EXPORT void __stdcall RegisterConvertors(IResourceCompiler* pRC)
-    {
-        PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-
-        SetRCLog(pRC->GetIRCLog());
-
-        AZStd::shared_ptr<AZ::RC::SceneConfig> config = AZStd::make_shared<AZ::RC::SceneConfig>();
-        pRC->RegisterConvertor("SceneConverter", new AZ::RC::SceneConverter(config));
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneCompiler.cpp b/Code/Tools/RC/ResourceCompilerScene/SceneCompiler.cpp
deleted file mode 100644
index aaee25afae..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneCompiler.cpp
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <IRCLog.h>
-#include <ISceneConfig.h>
-#include <ISystem.h>
-#include <SceneCompiler.h>
-
-#include <AzCore/Casting/lossy_cast.h>
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/Memory/AllocatorManager.h>
-#include <AzCore/Memory/MemoryComponent.h>
-#include <AzCore/Serialization/Utils.h>
-#include <AzCore/std/algorithm.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-
-#include <AzFramework/Asset/AssetSystemComponent.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/TargetManagement/TargetManagementComponent.h>
-
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <AzToolsFramework/SourceControl/PerforceComponent.h>
-
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-#include <RC/ResourceCompilerScene/Cgf/CgfExporter.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfGroupExporter.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfLodExporter.h>
-
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/ContainerSettingsExporter.h>
-#include <RC/ResourceCompilerScene/Common/MeshExporter.h>
-#include <RC/ResourceCompilerScene/Common/MaterialExporter.h>
-#include <RC/ResourceCompilerScene/Common/ColorStreamExporter.h>
-#include <RC/ResourceCompilerScene/Common/UVStreamExporter.h>
-#include <RC/ResourceCompilerScene/Common/SkeletonExporter.h>
-#include <RC/ResourceCompilerScene/Common/SkinWeightExporter.h>
-#include <RC/ResourceCompilerScene/Common/BlendShapeExporter.h>
-#include <RC/ResourceCompilerScene/SceneSerializationHandler.h>
-
-#include <SceneAPI/SceneCore/Components/ExportingComponent.h>
-#include <SceneAPI/SceneCore/Components/GenerationComponent.h>
-#include <SceneAPI/SceneCore/Components/RCExportingComponent.h>
-#include <SceneAPI/SceneCore/Components/SceneSystemComponent.h>
-#include <SceneAPI/SceneCore/Components/Utilities/EntityConstructor.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-#include <SceneAPI/SceneCore/Events/GenerateEventContext.h>
-#include <SceneAPI/SceneCore/Events/ExportProductList.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-            //! This function returns the build system target name
-            AZStd::string_view GetAssetBuilderTargetName()
-            {
-#if !defined (LY_CMAKE_TARGET)
-#error "LY_CMAKE_TARGET must be defined to the build target of the AssetBuilder application which is currently \"AssetBuilder\" via the source file properties for the SceneCompiler.cpp"
-#endif
-                return AZStd::string_view{ LY_CMAKE_TARGET };
-            }
-
-        static const u32 s_maxLegacyCrcClashRetries = 255;
-
-        namespace SceneEvents = AZ::SceneAPI::Events;
-        namespace SceneContainers = AZ::SceneAPI::Containers;
-
-        RCToolApplication::RCToolApplication()
-        {
-        }
-
-        void RCToolApplication::RegisterDescriptors()
-        {
-            RegisterComponentDescriptor(SceneSerializationHandler::CreateDescriptor());
-            RegisterComponentDescriptor(BlendShapeExporter::CreateDescriptor());
-            RegisterComponentDescriptor(ColorStreamExporter::CreateDescriptor());
-            RegisterComponentDescriptor(ContainerSettingsExporter::CreateDescriptor());
-            RegisterComponentDescriptor(MaterialExporter::CreateDescriptor());
-            RegisterComponentDescriptor(MeshExporter::CreateDescriptor());
-            RegisterComponentDescriptor(SkeletonExporter::CreateDescriptor());
-            RegisterComponentDescriptor(SkinWeightExporter::CreateDescriptor());
-            RegisterComponentDescriptor(UVStreamExporter::CreateDescriptor());
-        }
-
-        AZ::ComponentTypeList RCToolApplication::GetRequiredSystemComponents() const
-        {
-            AZ::ComponentTypeList components = AzToolsFramework::ToolsApplication::GetRequiredSystemComponents();
-            
-            auto removed = AZStd::remove_if(components.begin(), components.end(), 
-                [](const Uuid& id) -> bool
-                {
-                    return id == azrtti_typeid<AzFramework::TargetManagementComponent>()
-                        || id == azrtti_typeid<AzToolsFramework::PerforceComponent>()
-                        || id == azrtti_typeid<AZ::UserSettingsComponent>();
-                });
-            components.erase(removed, components.end());
-
-            return components;
-        }
-
-        void RCToolApplication::SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations)
-        {
-            AzToolsFramework::ToolsApplication::SetSettingsRegistrySpecializations(specializations);
-            specializations.Append("scenecompiler");
-        }
-
-        SceneCompiler::SceneCompiler(const AZStd::shared_ptr<ISceneConfig>& config, const char* appRoot)
-            : m_config(config)
-            , m_appRoot(appRoot)
-        {
-        }
-
-        void SceneCompiler::Release()
-        {
-            delete this;
-        }
-
-        void SceneCompiler::BeginProcessing(const IConfig* /*config*/)
-        {
-        }
-
-        bool SceneCompiler::Process()
-        {
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Starting scene processing.\n");
-            AssetBuilderSDK::ProcessJobResponse response;
-
-            RCToolApplication application;
-
-            // Add the Build Target name as a specialization to the settings registry
-            AZ::SettingsRegistryInterface& registry = *AZ::SettingsRegistry::Get();
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
-                registry, AZ::RC::GetAssetBuilderTargetName());
-
-            AZ::CommandLine* commandLine = application.GetAzCommandLine();
-
-            AZStd::string overrideProjectPath = m_context.m_config->GetAsString("project-path", "", "").c_str();
-            if (!overrideProjectPath.empty())
-            {
-                auto overrideArgs = AZStd::string::format(
-                    "--regset=%s/project_path=%s", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, overrideProjectPath.c_str());
-
-                AZ::CommandLine::ParamContainer commandLineArgs;
-                commandLine->Dump(commandLineArgs);
-                commandLineArgs.emplace_back(overrideArgs.c_str(), overrideArgs.size());
-                commandLine->Parse(commandLineArgs);
-            }
-
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(registry, *commandLine, false);
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(registry);
-
-            bool connectedToAP;
-            if (!PrepareForExporting(application, m_appRoot, connectedToAP))
-            {
-                bool result = WriteResponse(m_context.GetOutputFolder().c_str(), response, connectedToAP ? AssetBuilderSDK::ProcessJobResult_Failed : AssetBuilderSDK::ProcessJobResult_NetworkIssue);
-                AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystemRequestBus::Events::StartDisconnectingAssetProcessor);
-                return result;
-            }
-
-            // Do this  after PrepareForExporting is called so the types are registered for reading the request and writing a response.
-            AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest> request = ReadJobRequest(m_context.GetOutputFolder().c_str());
-            if (!request)
-            {
-                bool result = WriteResponse(m_context.GetOutputFolder().c_str(), response, AssetBuilderSDK::ProcessJobResult_Failed);
-                AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystemRequestBus::Events::StartDisconnectingAssetProcessor);
-                return result;
-            }
-
-            bool result = false;
-            // Active components, load the scene then process and export it.
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Creating scene system modules.\n");
-                AZ::Entity* systemEntity = AZ::SceneAPI::SceneCore::EntityConstructor::BuildSceneSystemEntity();
-                if (systemEntity)
-                {
-                    constexpr const char PythonMarshalComponentTypeId[] = "{C733E1AD-9FDD-484E-A8D9-3EAB944B7841}";
-                    constexpr const char PythonReflectionComponentTypeId[] = "{CBF32BE1-292C-4988-9E64-25127A8525A7}";
-                    constexpr const char PythonSystemComponentTypeId[] = "{97F88B0F-CF68-4623-9541-549E59EE5F0C}";
-                    systemEntity->CreateComponentIfReady({PythonSystemComponentTypeId});
-                    systemEntity->CreateComponentIfReady({PythonMarshalComponentTypeId});
-                    systemEntity->CreateComponentIfReady({PythonReflectionComponentTypeId});
-
-                    systemEntity->Init();
-                    systemEntity->Activate();
-
-                    AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Processing scene file.\n");
-                    result = LoadAndExportScene(*request, response);
-
-                    systemEntity->Deactivate();
-                    delete systemEntity;
-                }
-                else
-                {
-                    AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unable to create a system component for the SceneAPI.\n");
-                    result = false;
-                }
-            }
-
-            if (!result || m_config->GetErrorCount() > 0)
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "During processing one or more problems were found.\n");
-                result = false;
-            }
-
-            // Manually disconnect from the Asset Processor before the application goes out of scope to avoid
-            // a potential serialization issue due to deficiencies in the order of teardown operations.
-            AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystemRequestBus::Events::StartDisconnectingAssetProcessor);
-            
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Finished scene processing.\n");
-            return WriteResponse(m_context.GetOutputFolder().c_str(), response, result ? AssetBuilderSDK::ProcessJobResult_Success : AssetBuilderSDK::ProcessJobResult_Failed);
-        }
-
-        void SceneCompiler::EndProcessing()
-        {
-        }
-
-        IConvertContext* SceneCompiler::GetConvertContext()
-        {
-            return &m_context;
-        }
-
-        bool SceneCompiler::PrepareForExporting(RCToolApplication& application, [[maybe_unused]] const AZStd::string& appRoot, bool& connectedToAssetProcessor)
-        {
-            // Not all Gems shutdown properly and leak memory, but this shouldn't
-            //      prevent this builder from completing.
-            AZ::AllocatorManager::Instance().SetAllocatorLeaking(true);
-
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Initializing tools application environment.\n");
-            AZ::ComponentApplication::Descriptor descriptor;
-            descriptor.m_useExistingAllocator = true;
-            descriptor.m_enableScriptReflection = false;
-
-            AZ::ComponentApplication::StartupParameters startupParam;
-            startupParam.m_loadDynamicModules = false;
-
-            application.Start(descriptor, startupParam);
-
-            // Load Dynamic Modules after the Application::Start has been called to avoid creating
-            // creating SystemComponents automatically
-            application.LoadDynamicModules();
-
-            application.RegisterDescriptors();
-
-            // Register the AssetBuilderSDK structures needed later on.
-            AssetBuilderSDK::InitializeSerializationContext();
-
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Connecting to asset processor.\n");
-
-            // Retrieve the asset processor connection params from the settings registry
-            AzFramework::AssetSystem::ConnectionSettings connectionSettings;
-            bool succeeded = AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
-            if(!succeeded)
-            {
-                AZ_Error("RC Scene Compiler", false, "Getting bootstrap params failed");
-                return false;
-            }
-
-            //override bootstrap params
-            //the branch token can be overridden, check it
-            AZStd::string overrideBranchToken;
-            overrideBranchToken = m_context.m_config->GetAsString("branchtoken", "", "");
-            if (!overrideBranchToken.empty())
-            {
-                connectionSettings.m_branchToken = overrideBranchToken;
-            }
-
-            //the port can be overridden, check it
-            AZ::u16 overridePort = 0;
-            overridePort = aznumeric_cast<AZ::u16>(m_context.m_config->GetAsInt("port", 0, 0));
-            if (overridePort)
-            {
-                connectionSettings.m_assetProcessorPort = overridePort;
-            }
-
-            //the project name can be overridden, check it
-            AZStd::string overrideProjectName;
-            overrideProjectName = m_context.m_config->GetAsString("project-name", "", "");
-            if (!overrideProjectName.empty())
-            {
-                connectionSettings.m_projectName = overrideProjectName;
-            }
-
-            connectionSettings.m_connectionIdentifier = "RC Scene Compiler";
-            connectionSettings.m_connectionDirection = AzFramework::AssetSystem::ConnectionSettings::ConnectionDirection::ConnectToAssetProcessor;
-            connectionSettings.m_launchAssetProcessorOnFailedConnection = false; // builders shouldn't launch the AssetProcessor
-            connectionSettings.m_waitUntilAssetProcessorIsReady = false; // builders are what make the AssetProcessor ready, so the cannot wait until the AssetProcessor is ready
-            connectionSettings.m_waitForConnect = true; // application is a builder so it needs to wait for a connection
-
-            // connect to Asset Processor.
-            AzFramework::AssetSystemRequestBus::BroadcastResult(connectedToAssetProcessor,
-                &AzFramework::AssetSystemRequestBus::Events::EstablishAssetProcessorConnection, connectionSettings);
-
-            return connectedToAssetProcessor;
-        }
-
-        bool SceneCompiler::LoadAndExportScene(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response)
-        {
-            const string platformName = m_context.m_config->GetAsString("platform", "<unknown>", "<invalid>");
-            AZ_TraceContext("Platform", platformName.c_str());
-
-            if (platformName == "<unknown>")
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "No target platform provided - this compiler requires the --platform=platformIdentifier option\n");
-                return false;
-            }
-
-            if (platformName == "<invalid>")
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Invalid target platform provided (Parse error reading command line)\n");
-                return false;
-            }
-
-            AZStd::string sourcePath = m_context.GetSourcePath().c_str();
-            AZ_TraceContext("Source", sourcePath);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Loading source files.\n");
-            AZStd::shared_ptr<SceneContainers::Scene> scene;
-            SceneEvents::SceneSerializationBus::BroadcastResult(scene, &SceneEvents::SceneSerializationBus::Events::LoadScene, sourcePath, request.m_sourceFileUUID);
-            if (!scene)
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Failed to load scene file.\n");
-                return false;
-            }
-
-            AZ_TraceContext("Manifest", scene->GetManifestFilename());
-            if (scene->GetManifest().IsEmpty())
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::WarningWindow, "No manifest loaded and not enough information to create a default manifest.\n");
-                return true;
-            }
-
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Generating data into scene.\n");
-            if (!GenerateScene(*scene, platformName.c_str()))
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Failed to run data generation for scene.\n");
-                return false;
-            }
-
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Exporting loaded data to engine specific formats.\n");
-            if (!ExportScene(request, response, *scene, platformName.c_str()))
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Failed to convert and export scene\n");
-                return false;
-            }
-            return true;
-        }
-
-        bool SceneCompiler::GenerateScene(AZ::SceneAPI::Containers::Scene& scene, const char* platformIdentifier)
-        {
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Creating generation entities.\n");
-            AZ::SceneAPI::SceneCore::EntityConstructor::EntityPointer rcExporter = AZ::SceneAPI::SceneCore::EntityConstructor::BuildEntity(
-                "Scene Generators", AZ::SceneAPI::SceneCore::GenerationComponent::TYPEINFO_Uuid());
-
-            SceneEvents::ProcessingResultCombiner result;
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Preparing for generation.\n");
-            result += SceneEvents::Process<SceneEvents::PreGenerateEventContext>(scene, platformIdentifier);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Generating...\n");
-            result += SceneEvents::Process<SceneEvents::GenerateEventContext>(scene, platformIdentifier);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Generating LODs...\n");
-            result += SceneEvents::Process<SceneEvents::GenerateLODEventContext>(scene, platformIdentifier);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Generating additions...\n");
-            result += SceneEvents::Process<SceneEvents::GenerateAdditionEventContext>(scene, platformIdentifier);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Simplifing scene...\n");
-            result += SceneEvents::Process<SceneEvents::GenerateSimplificationEventContext>(scene, platformIdentifier);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Finalizing generation process.\n");
-            result += SceneEvents::Process<SceneEvents::PostGenerateEventContext>(scene, platformIdentifier);
-
-            switch (result.GetResult())
-            {
-            case SceneEvents::ProcessingResult::Success:
-            case SceneEvents::ProcessingResult::Ignored:
-                return true;
-            case SceneEvents::ProcessingResult::Failure:
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Failure during conversion and exporting.\n");
-                return false;
-            }
-            return false;
-        }
-
-        bool SceneCompiler::ExportScene(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response, const AZ::SceneAPI::Containers::Scene& scene, const char* platformIdentifier)
-        {
-            AZ_TraceContext("Output folder", m_context.GetOutputFolder().c_str());
-            AZ_Assert(m_context.m_pRC->GetAssetWriter() != nullptr, "Invalid IAssetWriter initialization.");
-            if (!m_context.m_pRC->GetAssetWriter())
-            {
-                return false;
-            }
-
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Creating export entities.\n");
-            AZ::SceneAPI::SceneCore::EntityConstructor::EntityPointer rcExporter = AZ::SceneAPI::SceneCore::EntityConstructor::BuildEntity(
-                "Scene RC Exporters", AZ::SceneAPI::SceneCore::RCExportingComponent::TYPEINFO_Uuid());
-
-            // Register additional processors. Will be automatically unregistered when leaving scope.
-            //      These have not yet been converted to components as they need special attention due
-            //      to the arguments they currently need.
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Registering export processors.\n");
-
-            CgfExporter cgfProcessor(&m_context);
-            CgfGroupExporter meshGroupExporter(m_context.m_pRC->GetAssetWriter());
-            CgfLodExporter meshLodExporter(m_context.m_pRC->GetAssetWriter());
-
-            SceneAPI::Events::ExportProductList productList;
-            SceneEvents::ProcessingResultCombiner result;
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Preparing for export.\n");
-            result += SceneEvents::Process<SceneEvents::PreExportEventContext>(productList, m_context.GetOutputFolder().c_str(), scene, platformIdentifier);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Exporting...\n");
-            result += SceneEvents::Process<SceneEvents::ExportEventContext>(productList, m_context.GetOutputFolder().c_str(), scene, platformIdentifier);
-            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Finalizing export process.\n");
-            result += SceneEvents::Process<SceneEvents::PostExportEventContext>(productList, m_context.GetOutputFolder().c_str(), platformIdentifier);
-
-            AZStd::map<AZStd::string, size_t> preSubIdFiles;
-            for (const auto& it : productList.GetProducts())
-            {
-                size_t index = response.m_outputProducts.size();
-                AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Listed product: %s+0x%08x - %s (type %s)\n", it.m_id.ToString<AZStd::string>().c_str(),
-                    BuildSubId(it), it.m_filename.c_str(), it.m_assetType.ToString<AZStd::string>().c_str());
-                response.m_outputProducts.emplace_back(AZStd::move(it.m_filename), it.m_assetType, BuildSubId(it));
-
-                if (IsPreSubIdFile(it.m_filename))
-                {
-                    preSubIdFiles[it.m_filename] = index;
-                }
-
-                for (const AZStd::string& legacyIt : it.m_legacyFileNames)
-                {
-                    AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "  -> Legacy name: %s\n", legacyIt.c_str());
-                    preSubIdFiles[legacyIt] = index;
-                }
-
-                // Add our relative path dependencies the exporters may have generated
-                AssetBuilderSDK::JobProduct& currentProduct = response.m_outputProducts.back();
-                for (const AZStd::string& pathDep : it.m_legacyPathDependencies)
-                {
-                    // For now, we assume the relative path dependencies are simply file names.
-                    // Append the source product path to these dependencies to generate the proper path dependency
-                    AZStd::string relativePath;
-                    AzFramework::StringFunc::Path::GetFolderPath(request.m_sourceFile.c_str(), relativePath);
-                    AzFramework::StringFunc::AssetDatabasePath::Join(relativePath.c_str(), pathDep.c_str(), relativePath);
-                    currentProduct.m_pathDependencies.emplace(relativePath, AssetBuilderSDK::ProductPathDependencyType::SourceFile);
-                }
-
-                // If we have any output products that are a dependency of this product, add them here.
-                // This will include adding LODs as dependencies of the base CGFs
-                for (auto& exportProduct : it.m_productDependencies)
-                {
-                    AZ::Data::AssetId productAssetId(request.m_sourceFileUUID, BuildSubId(exportProduct));
-                    currentProduct.m_dependencies.push_back(AssetBuilderSDK::ProductDependency(productAssetId, exportProduct.m_dependencyFlags));
-                }
-
-                currentProduct.m_dependenciesHandled = true; // We've populated the dependencies immediately above so it's OK to tell the AP we've handled dependencies
-            }
-            ResolvePreSubIds(response, preSubIdFiles);
-
-            switch (result.GetResult())
-            {
-            case SceneEvents::ProcessingResult::Success:
-                return true;
-            case SceneEvents::ProcessingResult::Ignored:
-                return true;
-            case SceneEvents::ProcessingResult::Failure:
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Failure during conversion and exporting.\n");
-                return false;
-            default:
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow,
-                    "Unexpected result from conversion and exporting (%i).\n", result.GetResult());
-                return false;
-            }
-        }
-
-        bool SceneCompiler::IsPreSubIdFile(const AZStd::string& file) const
-        {
-            AZStd::string extension;
-            if (!AzFramework::StringFunc::Path::GetExtension(file.c_str(), extension))
-            {
-                return false;
-            }
-
-            return extension == ".caf" || extension == ".cgf" || extension == ".chr" || extension == ".mtl" || extension == ".skin";
-        }
-
-        // BuildSubId has an equivalent counterpart in SceneBuilder. Both need to remain the same to avoid problems with sub ids.
-        u32 SceneCompiler::BuildSubId(const SceneAPI::Events::ExportProduct& product) const
-        {
-            // Instead of the just the lower 16-bits, use the full 32-bits that are available. There are production examples of
-            //      uber-fbx files that contain hundreds of meshes that need to be split into individual mesh objects as an example.
-            u32 id = static_cast<u32>(product.m_id.GetHash());
-
-            if (product.m_lod.has_value())
-            {
-                AZ::u8 lod = product.m_lod.value();
-                if (lod > 0xF)
-                {
-                    AZ_TracePrintf(SceneAPI::Utilities::WarningWindow, "%i is too large to fit in the allotted bits for LOD.\n", static_cast<u32>(lod));
-                    lod = 0xF;
-                }
-                // The product uses lods so mask out the lod bits and set them appropriately.
-                id &= ~AssetBuilderSDK::SUBID_MASK_LOD_LEVEL;
-                id |= lod << AssetBuilderSDK::SUBID_LOD_LEVEL_SHIFT;
-            }
-
-            return id;
-        }
-
-        void SceneCompiler::ResolvePreSubIds(AssetBuilderSDK::ProcessJobResponse& response, const AZStd::map<AZStd::string, size_t>& preSubIdFiles) const
-        {
-            if (!preSubIdFiles.empty())
-            {
-                // Start by compiling a list of known sub ids. Include sub ids from non-legacy files as well because sub ids created
-                //      here are not allowed to clash with any sub id not matter if it's legacy or not.
-                AZStd::unordered_set<u32> assignedSubIds;
-                for (const auto& it : response.m_outputProducts)
-                {
-                    if (assignedSubIds.find(it.m_productSubID) == assignedSubIds.end())
-                    {
-                        assignedSubIds.insert(it.m_productSubID);
-                    }
-                    else
-                    {
-                        AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Sub id collision found (0x%04x).\n", it.m_productSubID);
-                    }
-                }
-
-                // First legacy product always had sub id 0. Also add the hashed version in the loop though as there might be a file in 
-                //      front of it that the RCScene doesn't know about.
-                response.m_outputProducts[preSubIdFiles.begin()->second].m_legacySubIDs.push_back(0);
-
-                AZStd::string filename;
-                for (const auto& it : preSubIdFiles)
-                {
-                    AZ_TraceContext("Legacy file name", it.first);
-                    if (!AzFramework::StringFunc::Path::GetFullFileName(it.first.c_str(), filename))
-                    {
-                        AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unable to extract filename for legacy sub id.\n");
-                        continue;
-                    }
-
-                    // Modified version of the algorithm in RCBuilder.
-                    for (u32 seedValue = 0; seedValue < s_maxLegacyCrcClashRetries; ++seedValue)
-                    {
-                        u32 fullCrc = AZ::Crc32(filename.c_str());
-                        u32 maskedCrc = (fullCrc + seedValue) & AssetBuilderSDK::SUBID_MASK_ID;
-
-                        if (assignedSubIds.find(maskedCrc) == assignedSubIds.end())
-                        {
-                            response.m_outputProducts[it.second].m_legacySubIDs.push_back(maskedCrc);
-                            assignedSubIds.insert(maskedCrc);
-                            AZ_TracePrintf(SceneAPI::Utilities::LogWindow, "Added legacy sub id 0x%04x - %s\n", maskedCrc, filename.c_str());
-                            break;
-                        }
-                    }
-
-                    filename.clear();
-                }
-            }
-        }
-
-        AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest> SceneCompiler::ReadJobRequest(const char* cacheFolder) const
-        {
-            AZStd::string requestFilePath;
-            AzFramework::StringFunc::Path::ConstructFull(cacheFolder, AssetBuilderSDK::s_processJobRequestFileName, requestFilePath);
-            AssetBuilderSDK::ProcessJobRequest* result = AZ::Utils::LoadObjectFromFile<AssetBuilderSDK::ProcessJobRequest>(requestFilePath);
-
-            if (!result)
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unable to load ProcessJobRequest. Not enough information to process this file %s.\n", requestFilePath.c_str());
-            }
-
-            return AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest>(result);
-        }
-
-        bool SceneCompiler::WriteResponse(const char* cacheFolder, AssetBuilderSDK::ProcessJobResponse& response, AssetBuilderSDK::ProcessJobResultCode jobResult) const
-        {
-            AZStd::string responseFilePath;
-            AzFramework::StringFunc::Path::ConstructFull(cacheFolder, AssetBuilderSDK::s_processJobResponseFileName, responseFilePath);
-
-            response.m_requiresSubIdGeneration = false;
-            response.m_resultCode = jobResult;
-            
-            bool result = AZ::Utils::SaveObjectToFile(responseFilePath, AZ::DataStream::StreamType::ST_XML, &response);
-            return result && jobResult == AssetBuilderSDK::ProcessJobResult_Success;
-        }
-    } // namespace RC
-
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneCompiler.h b/Code/Tools/RC/ResourceCompilerScene/SceneCompiler.h
deleted file mode 100644
index a9c8cbb078..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneCompiler.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <IConvertor.h>
-#include <AzCore/std/containers/map.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/std/string/string.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-namespace AssetBuilderSDK
-{
-    struct ProcessJobRequest;
-    struct ProcessJobResponse;
-}
-namespace AZ
-{
-    class Entity;
-
-    namespace SceneAPI
-    {
-        namespace Containers
-        {
-            class Scene;
-            class SceneManifest;
-        }
-        namespace Events
-        {
-            struct ExportProduct;
-        }
-        namespace Import
-        {
-            class IImportersList;
-        }
-    }
-    namespace RC
-    {
-        // Used, among other things, to make sure a valid SerializeContext is available.
-        class RCToolApplication : public AzToolsFramework::ToolsApplication
-        {
-        public:
-            RCToolApplication();
-            void RegisterDescriptors();
-
-            AZ::ComponentTypeList GetRequiredSystemComponents() const override;
-
-            void SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations) override;
-        };
-
-        class ISceneConfig;
-        class SceneCompiler
-            : public ICompiler
-        {
-        public:
-            SceneCompiler(const AZStd::shared_ptr<ISceneConfig>& config, const char* appRoot);
-
-            void Release() override;
-
-            void BeginProcessing(const IConfig* config) override;
-            bool Process() override;
-            void EndProcessing() override;
-
-            IConvertContext* GetConvertContext() override;
-
-        protected:
-            bool PrepareForExporting(RCToolApplication& application, const AZStd::string& appRoot, bool& connectedToAssetProcessor);
-            bool LoadAndExportScene(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response);
-
-            // @brief Execute runtime modifications to the Scene graph
-            //
-            // This step is run after the scene is loaded, but before the scene
-            // is exported. It emits events with the GenerateEventContext.
-            // Event handlers bound to that event can apply arbitrary
-            // transformations to the Scene, adding new nodes, replacing nodes,
-            // or removing nodes.
-            bool GenerateScene(AZ::SceneAPI::Containers::Scene& scene, const char* platformIdentifier);
-            bool ExportScene(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response, const AZ::SceneAPI::Containers::Scene& scene, const char* platformIdentifier);
-            
-            // Several file produced by this compiler used to have their sub id automatically assigned by the AP. This was causing problems with keeping
-            //      the sub id stable and the sub id was changed to be provided by this compiler. However these new sub ids differ from the original sub id
-            //      so to be compatible with legacy sub ids, the previously automatically created sub id is calculated for all files that used to 
-            //      have them. This has to be limited to only the products that would have previously had an automated sub id assigned as some of
-            //      the automatically generated sub ids were file order depended.
-            virtual bool IsPreSubIdFile(const AZStd::string& file) const;
-            virtual void ResolvePreSubIds(AssetBuilderSDK::ProcessJobResponse& response, const AZStd::map<AZStd::string, size_t>& preSubIdFiles) const;
-            virtual u32 BuildSubId(const SceneAPI::Events::ExportProduct& product) const;
-            
-            virtual AZStd::unique_ptr<AssetBuilderSDK::ProcessJobRequest> ReadJobRequest(const char* cacheFolder) const;
-            virtual bool WriteResponse(const char* cacheFolder, AssetBuilderSDK::ProcessJobResponse& response, AssetBuilderSDK::ProcessJobResultCode jobResult) const;
-
-            ConvertContext m_context;
-            AZStd::shared_ptr<ISceneConfig> m_config;
-            AZStd::string m_appRoot;
-
-        private:
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneConfig.cpp b/Code/Tools/RC/ResourceCompilerScene/SceneConfig.cpp
deleted file mode 100644
index 72d6e4a5c2..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneConfig.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <IConfig.h>
-#include <SceneConfig.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        SceneConfig::SceneConfig()
-        {
-            LoadSceneLibrary("SceneCore");
-            LoadSceneLibrary("FbxSceneBuilder"); // Still needs to be explicitly loaded in order to be able to get the supported file extensions.
-        }
-
-        SceneConfig::~SceneConfig()
-        {
-            // Explicitly uninitialize all modules. Because we loaded them twice, we need to explicitly uninit them.
-            for (AZStd::unique_ptr<AZ::DynamicModuleHandle>& module : m_modules)
-            {
-                auto uninit = module->GetFunction<UninitializeDynamicModuleFunction>(UninitializeDynamicModuleFunctionName);
-                if (uninit)
-                {
-                    (*uninit)();
-                }
-            }
-        }
-
-        void SceneConfig::LoadSceneLibrary(const char* name)
-        {
-            AZStd::unique_ptr<DynamicModuleHandle> module = AZ::DynamicModuleHandle::Create(name);
-            AZ_Assert(module, "Failed to initialize library '%s'", name);
-            if (!module)
-            {
-                return;
-            }
-            module->Load(false);
-
-            // Explicitly initialize all modules. Because we're loading them twice (link time, and now-time), we need to explicitly uninit them.
-            auto init = module->GetFunction<InitializeDynamicModuleFunction>(InitializeDynamicModuleFunctionName);
-            if (init)
-            {
-                (*init)(AZ::Environment::GetInstance());
-            }
-
-            m_modules.push_back(AZStd::move(module));
-        }
-
-        size_t SceneConfig::GetErrorCount() const
-        {
-            return traceHook.GetErrorCount();
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneConfig.h b/Code/Tools/RC/ResourceCompilerScene/SceneConfig.h
deleted file mode 100644
index 90b28594bf..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneConfig.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <ISceneConfig.h>
-#include <TraceDrillerHook.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/Module/DynamicModuleHandle.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        class SceneConfig
-            : public ISceneConfig
-        {
-        public:
-            SceneConfig();
-            ~SceneConfig() override;
-
-            size_t GetErrorCount() const override;
-
-        protected:
-            virtual void LoadSceneLibrary(const char* name);
-            
-            AZStd::vector<AZStd::unique_ptr<AZ::DynamicModuleHandle>> m_modules;
-
-            TraceDrillerHook traceHook;
-        };
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneConverter.cpp b/Code/Tools/RC/ResourceCompilerScene/SceneConverter.cpp
deleted file mode 100644
index 1fa04b3eec..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneConverter.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <SceneConverter.h>
-#include <SceneCompiler.h>
-#include <ISceneConfig.h>
-#include <AzCore/std/iterator.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        SceneConverter::SceneConverter(const AZStd::shared_ptr<ISceneConfig>& config)
-            : m_config(config)
-        {
-            AZStd::unordered_set<AZStd::string> extensions;
-            EBUS_EVENT(SceneAPI::Events::AssetImportRequestBus, GetSupportedFileExtensions, extensions);
-            m_extensions.reserve(extensions.size() + 1);
-            AZStd::move(extensions.begin(), extensions.end(), AZStd::back_inserter(m_extensions));
-
-            AZStd::string manifestExtension;
-            EBUS_EVENT(SceneAPI::Events::AssetImportRequestBus, GetManifestExtension, manifestExtension);
-            m_extensions.push_back(AZStd::move(manifestExtension));
-        }
-
-        void SceneConverter::Release()
-        {
-            delete this;
-        }
-        void SceneConverter::Init(const ConvertorInitContext& context)
-        {
-            m_appRoot = context.appRootPath;
-        }
-
-
-        ICompiler* SceneConverter::CreateCompiler()
-        {
-            return new SceneCompiler(m_config, m_appRoot.c_str());
-        }
-
-        const char* SceneConverter::GetExt(int index) const
-        {
-            if (index < m_extensions.size())
-            {
-                const char* result = m_extensions[index].c_str();
-                return result[0] == '.' ? result + 1 : result;
-            }
-            else
-            {
-                return nullptr;
-            }
-        }
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneConverter.h b/Code/Tools/RC/ResourceCompilerScene/SceneConverter.h
deleted file mode 100644
index db143deb50..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneConverter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <IConvertor.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        class ISceneConfig;
-        class SceneConverter
-            : public IConvertor
-        {
-        public:
-            explicit SceneConverter(const AZStd::shared_ptr<ISceneConfig>& config);
-
-            void Release() override;
-            void Init(const ConvertorInitContext& context) override;
-
-            ICompiler* CreateCompiler() override;
-            const char* GetExt(int index) const override;
-
-        private:
-            AZStd::shared_ptr<ISceneConfig> m_config;
-            AZStd::vector<AZStd::string> m_extensions;
-            AZStd::string m_appRoot;
-        };
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneSerializationHandler.cpp b/Code/Tools/RC/ResourceCompilerScene/SceneSerializationHandler.cpp
deleted file mode 100644
index 774369727d..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneSerializationHandler.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/std/algorithm.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneSerializationHandler.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        void SceneSerializationHandler::Activate()
-        {
-            BusConnect();
-        }
-
-        void SceneSerializationHandler::Deactivate()
-        {
-            BusDisconnect();
-        }
-
-        void SceneSerializationHandler::Reflect(ReflectContext* context)
-        {
-            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-            if (serializeContext)
-            {
-                serializeContext->Class<SceneSerializationHandler>()->Version(1);
-            }
-        }
-
-        AZStd::shared_ptr<SceneAPI::Containers::Scene> SceneSerializationHandler::LoadScene(
-            const AZStd::string& filePath, Uuid sceneSourceGuid)
-        {
-            namespace Utilities = AZ::SceneAPI::Utilities;
-            using AZ::SceneAPI::Events::AssetImportRequest;
-
-            AZ_TraceContext("File", filePath);
-
-            if (sceneSourceGuid.IsNull())
-            {
-                AZ_TracePrintf(Utilities::ErrorWindow, "Invalid source guid for the scene file.");
-                return nullptr;
-            }
-
-            if (AZ::SceneAPI::Events::AssetImportRequest::IsManifestExtension(filePath.c_str()))
-            {
-                AZ_TracePrintf(Utilities::ErrorWindow, "Provided path contains the manifest path, not the path to the source file.");
-                return nullptr;
-            }
-            if (!AZ::SceneAPI::Events::AssetImportRequest::IsSceneFileExtension(filePath.c_str()))
-            {
-                AZ_TracePrintf(Utilities::ErrorWindow, "Provided path doesn't contain an extension supported by the SceneAPI.");
-                return nullptr;
-            }
-            if (AzFramework::StringFunc::Path::IsRelative(filePath.c_str()))
-            {
-                AZ_TracePrintf(Utilities::ErrorWindow, "Given file path is relative where an absolute path was expected.");
-                return nullptr;
-            }
-
-            if (!AZ::IO::SystemFile::Exists(filePath.c_str()))
-            {
-                AZ_TracePrintf(Utilities::ErrorWindow, "No file exists at given source path.");
-                return nullptr;
-            }
-
-            AZStd::shared_ptr<SceneAPI::Containers::Scene> scene =
-                AssetImportRequest::LoadSceneFromVerifiedPath(filePath, sceneSourceGuid, AssetImportRequest::RequestingApplication::AssetProcessor);
-
-            if (!scene)
-            {
-                AZ_TracePrintf(Utilities::ErrorWindow, "Failed to load the requested scene.");
-                return nullptr;
-            }
-
-            return scene;
-        }
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/SceneSerializationHandler.h b/Code/Tools/RC/ResourceCompilerScene/SceneSerializationHandler.h
deleted file mode 100644
index 44b79e2578..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/SceneSerializationHandler.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/std/containers/unordered_set.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/SceneSerializationBus.h>
-#include <SceneAPI/SceneCore/Components/SceneSystemComponent.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        class SceneSerializationHandler
-            : public SceneAPI::SceneCore::SceneSystemComponent
-            , public SceneAPI::Events::SceneSerializationBus::Handler
-        {
-        public:
-            AZ_COMPONENT(SceneSerializationHandler, "{944BB08A-FECB-4029-8E7C-810C801357B2}", SceneAPI::SceneCore::SceneSystemComponent);
-
-            SceneSerializationHandler() = default;
-            ~SceneSerializationHandler() override = default;
-
-            void Activate() override;
-            void Deactivate() override;
-
-            static void Reflect(ReflectContext* context);
-
-            AZStd::shared_ptr<SceneAPI::Containers::Scene> LoadScene(
-                const AZStd::string& sceneFilePath, Uuid sceneSourceGuid) override;
-        };
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfColorStreamExporterTests.cpp b/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfColorStreamExporterTests.cpp
deleted file mode 100644
index 9e7b1987ca..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfColorStreamExporterTests.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h>
-#include <RC/ResourceCompilerScene/Common/ColorStreamExporter.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshData.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexColorData.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        using ::testing::Return;
-        using ::testing::ReturnRef;
-        using ::testing::_;
-
-        class ColorStreamExporterContextTestBase
-            : public CgfExporterContextTestBase
-        {
-        public:
-            ColorStreamExporterContextTestBase()
-                : m_stubMeshData(new SceneAPI::DataTypes::MockIMeshData())
-                , m_stubMeshVertexColorData(new SceneAPI::DataTypes::MockIMeshVertexColorData())
-                , m_sampleColor({1.f, 0.f, 0.f, 1.f})
-            {
-            }
-            ~ColorStreamExporterContextTestBase() override = default;
-
-        protected:
-            // Minimal data subset:
-            // - Graph contains a single MeshData node
-            // - MeshData node has a single MeshDataVertexColor child
-            void SetUp() override
-            {
-                CgfExporterContextTestBase::SetUp();
-
-                SceneAPI::Containers::SceneGraph& graph = m_stubScene.GetGraph();
-                SceneAPI::Containers::SceneGraph::NodeIndex rootIndex = graph.GetRoot();
-
-                SceneAPI::Containers::SceneGraph::NodeIndex meshIndex = graph.AddChild(rootIndex, "sampleMeshData", m_stubMeshData);
-                UpdateNodeIndex(meshIndex);
-                graph.AddChild(m_sampleNodeIndex, "sampleMeshVertexColorData", m_stubMeshVertexColorData);
-
-                m_outMesh.SetVertexCount(3);
-
-                EXPECT_CALL(*m_stubMeshData, GetVertexCount())
-                    .WillRepeatedly(Return(3));
-                EXPECT_CALL(*m_stubMeshVertexColorData, GetCount())
-                    .WillRepeatedly(Return(3));
-                EXPECT_CALL(*m_stubMeshVertexColorData, GetColor(_))
-                    .WillRepeatedly(ReturnRef(m_sampleColor));
-            }
-
-            bool TestCausedNoChanges()
-            {
-                CMesh emptyMesh;
-                emptyMesh.SetVertexCount(3);
-                return emptyMesh.CompareStreams(m_outMesh);
-            }
-
-            AZStd::shared_ptr<SceneAPI::DataTypes::MockIMeshData> m_stubMeshData;
-            AZStd::shared_ptr<SceneAPI::DataTypes::MockIMeshVertexColorData> m_stubMeshVertexColorData;
-            ColorStreamExporter m_testExporter;
-            AZ::SceneAPI::DataTypes::Color m_sampleColor;
-        };
-
-        class ColorStreamExporterNoOpTests
-            : public ColorStreamExporterContextTestBase
-        {
-        public:
-            ~ColorStreamExporterNoOpTests() override = default;
-        };
-
-        TEST_P(ColorStreamExporterNoOpTests, Process_UnsupportedContext_MeshRemainsEmpty)
-        {
-            m_testExporter.Process(m_stubContext);
-            EXPECT_TRUE(TestCausedNoChanges());
-        }
-
-        static const ContextPhaseTuple g_CgfColorStreamExporterTestsunsupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshGroup, Phase::Construction },
-            { TestContextMeshGroup, Phase::Filling },
-            { TestContextMeshGroup, Phase::Finalizing },
-            { TestContextContainer, Phase::Construction },
-            { TestContextContainer, Phase::Filling },
-            { TestContextContainer, Phase::Finalizing },
-            { TestContextNode, Phase::Construction },
-            { TestContextNode, Phase::Filling },
-            { TestContextNode, Phase::Finalizing },
-            { TestContextMeshNode, Phase::Construction },
-            { TestContextMeshNode, Phase::Finalizing }
-        };
-
-        INSTANTIATE_TEST_CASE_P(ColorStreamExporter,
-            ColorStreamExporterNoOpTests,
-            ::testing::ValuesIn(g_CgfColorStreamExporterTestsunsupportedContextPhaseTuples));
-
-        class ColorStreamExporterSimpleTests
-            : public ColorStreamExporterContextTestBase
-        {
-        public:
-            ~ColorStreamExporterSimpleTests() override = default;
-        };
-
-        // Need a new way to test as ColorStreamExporter is update to derive from CallProcessorBinder
-        //TEST_P(ColorStreamExporterSimpleTests, Process_SupportedContext_MeshIsNotEmpty)
-        //{
-        //    m_testExporter.Process(m_stubContext);
-        //    EXPECT_TRUE(!TestCausedNoChanges());
-        //}
-
-        static const ContextPhaseTuple g_CgfColorStreamExporterTestsSupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshNode, Phase::Filling }
-        };
-
-        INSTANTIATE_TEST_CASE_P(ColorStreamExporter,
-            ColorStreamExporterSimpleTests,
-            ::testing::ValuesIn(g_CgfColorStreamExporterTestsSupportedContextPhaseTuples));
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfContainerSettingsExporterTests.cpp b/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfContainerSettingsExporterTests.cpp
deleted file mode 100644
index 5d66cdb69f..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfContainerSettingsExporterTests.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h>
-#include <RC/ResourceCompilerScene/Common/ContainerSettingsExporter.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIMeshAdvancedRule.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        using ::testing::Const;
-        using ::testing::Return;
-        using ::testing::ReturnRef;
-        using ::testing::_;
-
-        class ContainerSettingsExporterContextTestBase
-            : public CgfExporterContextTestBase
-        {
-        public:
-            ContainerSettingsExporterContextTestBase()
-                : m_stubMeshAdvancedRule(new SceneAPI::DataTypes::MockIMeshAdvancedRule())
-            {
-                m_ruleContainer.AddRule(m_stubMeshAdvancedRule);
-            }
-
-            ~ContainerSettingsExporterContextTestBase() override = default;
-
-        protected:
-            // Minimal subset for check
-            // - Group has advanced rule
-            // - Advanced rule defines 32 bit vertex precision to be true
-            void SetUp() override
-            {
-                CgfExporterContextTestBase::SetUp();
-
-                EXPECT_CALL(*m_stubMeshAdvancedRule, Use32bitVertices())
-                    .WillRepeatedly(Return(true));
-                EXPECT_CALL(*m_stubMeshAdvancedRule, MergeMeshes())
-                    .WillRepeatedly(Return(false));
-                ON_CALL(m_stubMeshGroup, GetRuleContainer())
-                    .WillByDefault(ReturnRef(m_ruleContainer));
-                ON_CALL(Const(m_stubMeshGroup), GetRuleContainerConst())
-                    .WillByDefault(ReturnRef(m_ruleContainer));
-            }
-
-            bool TestDataChanged()
-            {
-                return m_outContent.GetExportInfo()->bWantF32Vertices;
-            }
-
-            AZStd::shared_ptr<SceneAPI::DataTypes::MockIMeshAdvancedRule> m_stubMeshAdvancedRule;
-            SceneAPI::Containers::RuleContainer m_ruleContainer;
-            ContainerSettingsExporter m_testExporter;
-        };
-
-        class ContainerSettingsExporterNoOpTests
-            : public ContainerSettingsExporterContextTestBase
-        {
-        public:
-            ~ContainerSettingsExporterNoOpTests() override = default;
-        };
-
-        TEST_P(ContainerSettingsExporterNoOpTests, Process_UnsupportedContext_ExportInfoNotChanged)
-        {
-            m_testExporter.Process(m_stubContext);
-            EXPECT_FALSE(TestDataChanged());
-        }
-
-        static const ContextPhaseTuple g_CgfContainerSettingsExporterTestsUnsupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshGroup, Phase::Construction },
-            { TestContextMeshGroup, Phase::Filling },
-            { TestContextMeshGroup, Phase::Finalizing },
-            { TestContextContainer, Phase::Filling },
-            { TestContextContainer, Phase::Finalizing },
-            { TestContextNode, Phase::Construction },
-            { TestContextNode, Phase::Filling },
-            { TestContextNode, Phase::Finalizing },
-            { TestContextMeshNode, Phase::Construction },
-            { TestContextMeshNode, Phase::Filling },
-            { TestContextMeshNode, Phase::Finalizing }
-        };
-
-        INSTANTIATE_TEST_CASE_P(ContainerSettingsExporter,
-            ContainerSettingsExporterNoOpTests,
-            ::testing::ValuesIn(g_CgfContainerSettingsExporterTestsUnsupportedContextPhaseTuples));
-
-        class ContainerSettingsExporterSimpleTests
-            : public ContainerSettingsExporterContextTestBase
-        {
-        public:
-            ~ContainerSettingsExporterSimpleTests() override = default;
-        };
-
-        TEST_P(ContainerSettingsExporterSimpleTests, Process_SupportedContext_ExportInfoChanged)
-        {
-            m_testExporter.Process(m_stubContext);
-            EXPECT_TRUE(TestDataChanged());
-        }
-
-        static const ContextPhaseTuple g_CgfContainerSettingsExporterTestsSupportedContextPhaseTuples[] =
-        {
-            {TestContextContainer, Phase::Construction}
-        };
-
-        INSTANTIATE_TEST_CASE_P(ContainerSettingsExporter,
-            ContainerSettingsExporterSimpleTests,
-            ::testing::ValuesIn(g_CgfContainerSettingsExporterTestsSupportedContextPhaseTuples));
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h b/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h
deleted file mode 100644
index 43521f3411..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h>
-#include <Mocks/MockCGFContent.h>
-#include <RC/ResourceCompilerScene/Common/CommonExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Events/ExportProductList.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIMeshGroup.h>
-#include <gmock/gmock.h>
-
-#pragma once
-
-namespace AZ
-{
-    namespace RC
-    {
-        using ::testing::StrictMock;
-        namespace SceneEvents = SceneAPI::Events;
-
-        enum TestContextType
-        {
-            TestContextMeshGroup,
-            TestContextContainer,
-            TestContextNode,
-            TestContextMeshNode,
-            TestContextCount
-        };
-
-        typedef AZStd::pair<TestContextType, Phase> ContextPhaseTuple;
-
-        class CgfExporterContextTestBase
-            : public ::testing::TestWithParam<ContextPhaseTuple>
-        {
-        public:
-            CgfExporterContextTestBase()
-                : m_stubScene(m_sampleSceneName)
-                , m_outContent(m_sampleOutputDirectory.c_str())
-                , m_sampleNodeIndex(m_stubScene.GetGraph().Find("InvalidNodeName"))
-                , m_stubContext(nullptr)
-                , m_stubMeshGroupExportContext(m_productList, m_stubScene, m_sampleOutputDirectory, m_stubMeshGroup, GetParam().second)
-                , m_stubContainerExportContext(m_stubScene, m_sampleOutputDirectory, m_stubMeshGroup, m_outContent, GetParam().second)
-                , m_stubNodeExportContext(m_stubContainerExportContext, m_outNode, m_sampleNodeName, m_sampleNodeIndex, m_samplePhysGeomType, m_sampleRootBoneName, GetParam().second)
-                , m_stubMeshNodeExportContext(m_stubNodeExportContext, m_outMesh, GetParam().second)
-            {
-                m_outContent.GetExportInfo()->bWantF32Vertices = false;
-            }
-            ~CgfExporterContextTestBase() override = default;
-
-        protected:
-            void SetUp() override
-            {
-                switch(GetParam().first)
-                {
-                case TestContextMeshGroup:
-                    m_stubContext = &m_stubMeshGroupExportContext;
-                    break;
-                case TestContextContainer:
-                    m_stubContext = &m_stubContainerExportContext;
-                    break;
-                case TestContextNode:
-                    m_stubContext = &m_stubNodeExportContext;
-                    break;
-                case TestContextMeshNode:
-                    m_stubContext = &m_stubMeshNodeExportContext;
-                    break;
-                default:
-                    m_stubContext = nullptr;
-                    break;
-                }
-            }
-
-            void TearDown() override
-            {
-            }
-
-            void UpdateNodeIndex(SceneAPI::Containers::SceneGraph::NodeIndex nodeIndex)
-            {
-                m_sampleNodeIndex = nodeIndex;
-                m_stubNodeExportContext.m_nodeIndex = nodeIndex;
-                m_stubMeshNodeExportContext.m_nodeIndex = nodeIndex;
-            }
-
-            // Sample Context Data Payloads
-            AZ::SceneAPI::Events::ExportProductList m_productList;
-            AZStd::string m_sampleSceneName = "SampleScene";
-            SceneAPI::Containers::Scene m_stubScene;
-            AZStd::string m_sampleOutputDirectory = "TEST:\\Sample\\Output";
-            AZStd::string m_sampleGroupName = "SampleGroupName";
-            SceneAPI::DataTypes::MockIMeshGroup m_stubMeshGroup;
-            CContentCGF m_outContent;
-            CNodeCGF m_outNode;
-            AZStd::string m_sampleNodeName = "SampleNodeName";
-            // Note that m_sampleNodeIndex will always be invalid and fetched using a non existent node
-            // from the graph. This is not important for the tests, just needs to be present as a parameter
-            SceneAPI::Containers::SceneGraph::NodeIndex m_sampleNodeIndex;
-            EPhysicsGeomType m_samplePhysGeomType = PHYS_GEOM_TYPE_NONE;
-            AZStd::string m_sampleRootBoneName;
-            CMesh m_outMesh;
-
-            // Sample Context Types
-            SceneEvents::ICallContext* m_stubContext;
-            CgfGroupExportContext m_stubMeshGroupExportContext;
-            ContainerExportContext m_stubContainerExportContext;
-            NodeExportContext m_stubNodeExportContext;
-            MeshNodeExportContext m_stubMeshNodeExportContext;
-        };
-    }
-}
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMaterialExporterTests.cpp b/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMaterialExporterTests.cpp
deleted file mode 100644
index b7078509f8..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMaterialExporterTests.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Cry_Geo.h> // Needed for Cry_Matrix34.h
-#include <IIndexedMesh.h>
-#include <CGFContent.h>
-#include <ConvertContext.h>
-#include <RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h>
-#include <RC/ResourceCompilerScene/Common/MaterialExporter.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        class MaterialExporterContextTestBase
-            : public CgfExporterContextTestBase
-        {
-        public:
-            MaterialExporterContextTestBase()
-                : m_cacheGenerationContext(m_productList, m_stubScene, m_sampleOutputDirectory, m_stubMeshGroup, Phase::Construction)
-                , m_testExporter()
-            {
-            }
-            ~MaterialExporterContextTestBase() override = default;
-
-        protected:
-            static const size_t s_testFaceCount = 3;
-            static const unsigned char s_testDefaultSubset = 0;
-
-            void SetUp() override
-            {
-                CgfExporterContextTestBase::SetUp();
-
-                m_outContent.SetCommonMaterial(nullptr);
-                m_outNode.pMaterial = nullptr;
-
-                // We require a MeshGroupContext in the Construction phase for correct behavior of 
-                // all other contexts
-                m_testExporter.Process(&m_cacheGenerationContext);
-            }
-
-            virtual bool TestChangedData()
-            {
-                if (m_outContent.GetCommonMaterial() != nullptr)
-                {
-                    return true;
-                }
-                
-                if (m_outNode.pMaterial != nullptr)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-
-            ConvertContext m_convertContext;
-            CgfGroupExportContext m_cacheGenerationContext;
-            MaterialExporter m_testExporter;
-        };
-
-        class MaterialExporterNoOpTests
-            : public MaterialExporterContextTestBase
-        {
-        public:
-            ~MaterialExporterNoOpTests() override = default;
-
-        protected:
-            // To 
-            void SetUp() override
-            {
-                MaterialExporterContextTestBase::SetUp();
-            }
-        };
-
-        TEST_P(MaterialExporterNoOpTests, Process_UnsupportedContext_DataNotChanged)
-        {
-            m_testExporter.Process(m_stubContext);
-            EXPECT_FALSE(TestChangedData());
-        }
-
-        static const ContextPhaseTuple g_CgfMaterialExporterTestsUnsupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshGroup, Phase::Filling },
-            { TestContextMeshGroup, Phase::Finalizing }, // Technically changes, but only internal state
-            { TestContextContainer, Phase::Filling },
-            { TestContextNode, Phase::Construction },
-            { TestContextNode, Phase::Finalizing },
-            { TestContextMeshNode, Phase::Construction },
-            { TestContextMeshNode, Phase::Finalizing }
-        };
-
-        INSTANTIATE_TEST_CASE_P(MaterialExporter,
-            MaterialExporterNoOpTests,
-            ::testing::ValuesIn(g_CgfMaterialExporterTestsUnsupportedContextPhaseTuples));
-
-        class MaterialExporterContainerContextTests
-            : public MaterialExporterContextTestBase
-        {
-        public:
-            ~MaterialExporterContainerContextTests() override = default;
-
-        protected:
-            // To 
-            void SetUp() override
-            {
-                MaterialExporterContextTestBase::SetUp();
-            }
-        };
-
-        // Tests still required
-        // ContainerContext/Finalizing - Should be trivial
-        // NodeContext/Filling - Will require complex setup of internal cache
-        // MeshNodeContext/Filling - Will require complex setup of internal cache
-
-        static const ContextPhaseTuple g_CgfMaterialExporterTestsSupportedContextPhaseTuples[] =
-        {
-            { TestContextContainer, Phase::Construction }
-        };
-
-        INSTANTIATE_TEST_CASE_P(MaterialExporter,
-            MaterialExporterContainerContextTests,
-            ::testing::ValuesIn(g_CgfMaterialExporterTestsSupportedContextPhaseTuples));
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMeshExporterTests.cpp b/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMeshExporterTests.cpp
deleted file mode 100644
index 91ab730afa..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMeshExporterTests.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h>
-#include <RC/ResourceCompilerScene/Common/MeshExporter.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshData.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        using ::testing::Return;
-
-        class MeshExporterContextTestBase
-            : public CgfExporterContextTestBase
-        {
-        public:
-            MeshExporterContextTestBase()
-                : m_stubMeshData(new SceneAPI::DataTypes::MockIMeshData())
-            {
-            }
-            ~MeshExporterContextTestBase() override = default;
-
-        protected:
-            // Minimal subset for a valid Processing pass
-            void SetUp() override
-            {
-                CgfExporterContextTestBase::SetUp();
-
-                SceneAPI::Containers::SceneGraph& graph = m_stubScene.GetGraph();
-                SceneAPI::Containers::SceneGraph::NodeIndex rootIndex = graph.GetRoot();
-                SceneAPI::Containers::SceneGraph::NodeIndex meshIndex = graph.AddChild(rootIndex, "sampleMeshData", m_stubMeshData);
-
-                UpdateNodeIndex(meshIndex);
-
-                m_outMesh.SetVertexCount(3);
-
-                m_outContent.GetExportInfo()->bNoMesh = true;
-            }
-
-            bool TestChangedData()
-            {
-                return !m_outContent.GetExportInfo()->bNoMesh;
-            }
-
-            AZStd::shared_ptr<SceneAPI::DataTypes::MockIMeshData> m_stubMeshData;
-            MeshExporter m_testExporter;
-        };
-
-        class MeshExporterNoOpTests
-            : public MeshExporterContextTestBase
-        {
-        public:
-            ~MeshExporterNoOpTests() override = default;
-        };
-
-        TEST_P(MeshExporterNoOpTests, Process_UnsupportedContext_ContentNotChanged)
-        {
-            m_testExporter.Process(m_stubContext);
-            EXPECT_FALSE(TestChangedData());
-        }
-
-        static const ContextPhaseTuple g_CgfMeshExporterTestsUnsupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshGroup, Phase::Construction },
-            { TestContextMeshGroup, Phase::Filling },
-            { TestContextMeshGroup, Phase::Finalizing },
-            { TestContextContainer, Phase::Construction },
-            { TestContextContainer, Phase::Filling },
-            { TestContextContainer, Phase::Finalizing },
-            { TestContextNode, Phase::Construction },
-            { TestContextNode, Phase::Finalizing },
-            { TestContextMeshNode, Phase::Construction },
-            { TestContextMeshNode, Phase::Filling },
-            { TestContextMeshNode, Phase::Finalizing }
-        };
-
-        INSTANTIATE_TEST_CASE_P(MeshExporter,
-            MeshExporterNoOpTests,
-            ::testing::ValuesIn(g_CgfMeshExporterTestsUnsupportedContextPhaseTuples));
-
-        class MeshExporterSimpleTests
-            : public MeshExporterContextTestBase
-        {
-        public:
-            ~MeshExporterSimpleTests() override = default;
-        };
-
-        TEST_P(MeshExporterSimpleTests, Process_SupportedContext_ContentChanged)
-        {
-            EXPECT_CALL(*m_stubMeshData, GetVertexCount())
-                .WillRepeatedly(Return(0));
-            EXPECT_CALL(*m_stubMeshData, GetFaceCount())
-                .WillRepeatedly(Return(0));
-            EXPECT_CALL(*m_stubMeshData, HasNormalData())
-                .WillRepeatedly(Return(false));
-
-            m_testExporter.Process(&m_stubNodeExportContext);
-            EXPECT_TRUE(TestChangedData());
-        }
-
-        static const ContextPhaseTuple g_CgfMeshExporterTestsSupportedContextPhaseTuples[] =
-        {
-            {TestContextNode, Phase::Filling}
-        };
-
-        INSTANTIATE_TEST_CASE_P(MeshExporter,
-            MeshExporterSimpleTests,
-            ::testing::ValuesIn(g_CgfMeshExporterTestsSupportedContextPhaseTuples));
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMeshGroupExporterTests.cpp b/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMeshGroupExporterTests.cpp
deleted file mode 100644
index f230f045d9..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfMeshGroupExporterTests.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfGroupExporter.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        using ::testing::Return;
-        using ::testing::ReturnRef;
-        using ::testing::Const;
-
-        class CgfGroupExporterContextTestBase
-            : public CgfExporterContextTestBase
-        {
-        public:
-            CgfGroupExporterContextTestBase()
-                : m_testExporter(&m_mockAssetWriter)
-            {
-            }
-            ~CgfGroupExporterContextTestBase() override = default;
-
-        protected:
-            StrictMock<MockIAssetWriter> m_mockAssetWriter;
-            CgfGroupExporter m_testExporter;
-        };
-
-        class CgfGroupExporterNoOpTests
-            : public CgfGroupExporterContextTestBase
-        {
-        public:
-            ~CgfGroupExporterNoOpTests() override = default;
-        };
-
-        TEST_P(CgfGroupExporterNoOpTests, Process_UnsupportedContext_WriterNotUsed)
-        {
-            m_testExporter.Process(m_stubContext);
-        }
-
-        static const ContextPhaseTuple g_CgfMeshGroupExporterTestsUnsupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshGroup, Phase::Construction },
-            { TestContextMeshGroup, Phase::Finalizing },
-            { TestContextContainer, Phase::Construction },
-            { TestContextContainer, Phase::Filling },
-            { TestContextContainer, Phase::Finalizing },
-            { TestContextNode, Phase::Construction },
-            { TestContextNode, Phase::Filling },
-            { TestContextNode, Phase::Finalizing },
-            { TestContextMeshNode, Phase::Construction },
-            { TestContextMeshNode, Phase::Filling },
-            { TestContextMeshNode, Phase::Finalizing }
-        };
-
-        INSTANTIATE_TEST_CASE_P(MeshGroupExporter,
-            CgfGroupExporterNoOpTests,
-            ::testing::ValuesIn(g_CgfMeshGroupExporterTestsUnsupportedContextPhaseTuples));
-
-        class CgfGroupExporterSimpleTestFramework
-            : public CgfGroupExporterContextTestBase
-        {
-        public:
-            ~CgfGroupExporterSimpleTestFramework() override = default;
-
-        protected:
-            void SetUp() override
-            {
-            }
-
-            void TearDown() override
-            {
-            }
-            
-            SceneAPI::DataTypes::MockISceneNodeSelectionList m_stubSceneNodeSelectionList;
-        };
-
-        TEST_P(CgfGroupExporterSimpleTestFramework, Process_SupportedContextNoNodesSelected_WriterNotUsed)
-        {
-            AZStd::string testGroupName = "testName";
-            EXPECT_CALL(m_stubSceneNodeSelectionList, GetSelectedNodeCount())
-                .WillRepeatedly(Return(0));
-            EXPECT_CALL(m_stubSceneNodeSelectionList, GetUnselectedNodeCount())
-                .WillRepeatedly(Return(0));
-            EXPECT_CALL(Const(m_stubMeshGroup), GetSceneNodeSelectionList())
-                .WillRepeatedly(ReturnRef(m_stubSceneNodeSelectionList));
-            EXPECT_CALL(m_stubMeshGroup, GetName())
-                .WillRepeatedly(ReturnRef(testGroupName));
-            m_testExporter.Process(&m_stubMeshGroupExportContext);
-        }
-
-        static const ContextPhaseTuple g_CgfMeshGroupExporterTestsSupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshGroup, Phase::Filling }
-        };
-
-        INSTANTIATE_TEST_CASE_P(MeshGroupExporter,
-            CgfGroupExporterSimpleTestFramework,
-            ::testing::ValuesIn(g_CgfMeshGroupExporterTestsSupportedContextPhaseTuples));
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfUVStreamExporterTests.cpp b/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfUVStreamExporterTests.cpp
deleted file mode 100644
index fab069b654..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/Cgf/CgfUVStreamExporterTests.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <RC/ResourceCompilerScene/Tests/Cgf/CgfExportContextTestBase.h>
-#include <RC/ResourceCompilerScene/Cgf/CgfExportContexts.h>
-#include <RC/ResourceCompilerScene/Common/UVStreamExporter.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshData.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexUVData.h>
-#include <SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        using ::testing::Return;
-        using ::testing::ReturnRef;
-        using ::testing::_;
-
-        class UVStreamExporterContextTestBase
-            : public CgfExporterContextTestBase
-        {
-        public:
-            UVStreamExporterContextTestBase()
-                : m_stubMeshData(new SceneAPI::DataTypes::MockIMeshData())
-                , m_stubMeshVertexUVData(new SceneAPI::DataTypes::MockIMeshVertexUVData())
-            {
-            }
-            ~UVStreamExporterContextTestBase() override = default;
-
-        protected:
-            // Minimal data subset:
-            // - Graph contains a single MeshData node
-            // - MeshData node has a single MeshDataVertexColor child
-            void SetUp() override
-            {
-                CgfExporterContextTestBase::SetUp();
-
-                SceneAPI::Containers::SceneGraph& graph = m_stubScene.GetGraph();
-                SceneAPI::Containers::SceneGraph::NodeIndex rootIndex = graph.GetRoot();
-                SceneAPI::Containers::SceneGraph::NodeIndex meshIndex = graph.AddChild(rootIndex, "sampleMeshData", m_stubMeshData);
-                UpdateNodeIndex(meshIndex);
-                graph.AddChild(m_sampleNodeIndex, "sampleMeshVertexColorData", m_stubMeshVertexUVData);
-
-                m_outMesh.SetVertexCount(3);
-
-                m_uvs.push_back(AZ::Vector2(0.f, 0.f));
-                m_uvs.push_back(AZ::Vector2(1.f, 0.f));
-                m_uvs.push_back(AZ::Vector2(1.f, 1.f));
-
-                EXPECT_CALL(*m_stubMeshData, GetVertexCount())
-                    .WillRepeatedly(Return(3));
-                EXPECT_CALL(*m_stubMeshVertexUVData, GetCount())
-                    .WillRepeatedly(Return(3));
-                EXPECT_CALL(*m_stubMeshVertexUVData, GetUV(0))
-                    .WillRepeatedly(ReturnRef(m_uvs[0]));
-                EXPECT_CALL(*m_stubMeshVertexUVData, GetUV(1))
-                    .WillRepeatedly(ReturnRef(m_uvs[1]));
-                EXPECT_CALL(*m_stubMeshVertexUVData, GetUV(2))
-                    .WillRepeatedly(ReturnRef(m_uvs[2]));
-            }
-
-            bool TestCausedNoChanges()
-            {
-                CMesh emptyMesh;
-                emptyMesh.SetVertexCount(3);
-                return emptyMesh.CompareStreams(m_outMesh);
-            }
-
-            AZStd::shared_ptr<SceneAPI::DataTypes::MockIMeshData> m_stubMeshData;
-            AZStd::shared_ptr<SceneAPI::DataTypes::MockIMeshVertexUVData> m_stubMeshVertexUVData;
-            UVStreamExporter m_testExporter;
-            AZStd::vector<AZ::Vector2> m_uvs;
-        };
-
-        class UVStreamExporterNoOpTests
-            : public UVStreamExporterContextTestBase
-        {
-        public:
-            ~UVStreamExporterNoOpTests() override = default;
-        };
-
-        TEST_P(UVStreamExporterNoOpTests, Process_UnsupportedContext_OutDataNotChanged)
-        {
-            m_testExporter.Process(m_stubContext);
-            EXPECT_TRUE(TestCausedNoChanges());
-        }
-
-        static const ContextPhaseTuple g_CgfUVStreamExporterTestsUnsupportedContextPhaseTuples[] =
-        {
-            { TestContextMeshGroup, Phase::Construction },
-            { TestContextMeshGroup, Phase::Filling },
-            { TestContextMeshGroup, Phase::Finalizing },
-            { TestContextContainer, Phase::Construction },
-            { TestContextContainer, Phase::Filling },
-            { TestContextContainer, Phase::Finalizing },
-            { TestContextNode, Phase::Construction },
-            { TestContextNode, Phase::Filling },
-            { TestContextNode, Phase::Finalizing },
-            { TestContextMeshNode, Phase::Construction },
-            { TestContextMeshNode, Phase::Finalizing }
-        };
-
-        INSTANTIATE_TEST_CASE_P(UVStreamExporter,
-            UVStreamExporterNoOpTests,
-            ::testing::ValuesIn(g_CgfUVStreamExporterTestsUnsupportedContextPhaseTuples));
-
-        class UVStreamExporterSimpleTests
-            : public UVStreamExporterContextTestBase
-        {
-        public:
-            ~UVStreamExporterSimpleTests() override = default;
-        };
-
-        TEST_P(UVStreamExporterSimpleTests, Process_SupportedContext_OutDataChanged)
-        {
-            m_testExporter.Process(&m_stubMeshNodeExportContext);
-            EXPECT_FALSE(TestCausedNoChanges());
-        }
-
-        static const ContextPhaseTuple g_CgfUVStreamExporterTestsSupportedContextPhaseTuples[] = {
-            {TestContextMeshNode, Phase::Filling}
-        };
-
-        INSTANTIATE_TEST_CASE_P(UVStreamExporter,
-            UVStreamExporterSimpleTests,
-            ::testing::ValuesIn(g_CgfUVStreamExporterTestsSupportedContextPhaseTuples));
-    } // namespace RC
-} // namespace AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/Tests/TestsMain.cpp b/Code/Tools/RC/ResourceCompilerScene/Tests/TestsMain.cpp
deleted file mode 100644
index 317e117d73..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/Tests/TestsMain.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzTest/AzTest.h>
-
-#include <AzCore/Module/Environment.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Module/DynamicModuleHandle.h>
-
-class ResourceCompilerSceneTestEnvironment
-    : public AZ::Test::ITestEnvironment
-{
-public:
-    virtual ~ResourceCompilerSceneTestEnvironment()
-    {}
-
-protected:
-    void SetupEnvironment() override
-    {
-        if (!AZ::AllocatorInstance<AZ::SystemAllocator>().IsReady())
-        {
-            AZ::AllocatorInstance<AZ::SystemAllocator>().Create();
-            m_hasLocalMemoryAllocator = true;
-        }
-
-        {
-            sceneCoreModule = AZ::DynamicModuleHandle::Create("SceneCore");
-            AZ_Assert(sceneCoreModule, "ResourceCompilerScene unit tests failed to create SceneCore module.");
-            [[maybe_unused]] bool loaded = sceneCoreModule->Load(false);
-            AZ_Assert(loaded, "ResourceCompilerScene unit tests failed to load SceneCore module.");
-            auto init = sceneCoreModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
-            AZ_Assert(init, "ResourceCompilerScene unit tests failed to find the initialization function the SceneCore module.");
-            (*init)(AZ::Environment::GetInstance());
-        }
-        {
-            sceneDataModule = AZ::DynamicModuleHandle::Create("SceneData");
-            AZ_Assert(sceneDataModule, "ResourceCompilerScene unit tests failed to create SceneData module.");
-            [[maybe_unused]] bool loaded = sceneDataModule->Load(false);
-            AZ_Assert(loaded, "ResourceCompilerScene unit tests failed to load SceneData module.");
-            auto init = sceneDataModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
-            AZ_Assert(init, "ResourceCompilerScene unit tests failed to find the initialization function the SceneData module.");
-            (*init)(AZ::Environment::GetInstance());
-        }
-
-        {
-            fbxSceneBuilderModule = AZ::DynamicModuleHandle::Create("FbxSceneBuilder");
-            AZ_Assert(fbxSceneBuilderModule, "ResourceCompilerScene unit tests failed to create FbxSceneBuilder module.");
-            [[maybe_unused]] bool loaded = fbxSceneBuilderModule->Load(false);
-            AZ_Assert(loaded, "ResourceCompilerScene unit tests failed to load FbxSceneBuilder module.");
-        }
-    }
-
-    void TeardownEnvironment() override
-    {
-        fbxSceneBuilderModule.reset();
-
-        auto uninit = sceneDataModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
-        AZ_Assert(uninit, "FbxSceneBuilder unit tests failed to find the uninitialization function the SceneData module.");
-        (*uninit)();
-        sceneDataModule.reset();
-
-        uninit = sceneCoreModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
-        AZ_Assert(uninit, "FbxSceneBuilder unit tests failed to find the uninitialization function the SceneCore module.");
-        (*uninit)();
-        sceneCoreModule.reset();
-        if (m_hasLocalMemoryAllocator)
-        {
-            AZ::AllocatorInstance<AZ::SystemAllocator>().Destroy();
-        }
-    }
-
-private:
-    bool m_hasLocalMemoryAllocator = false;
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> sceneCoreModule;
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> sceneDataModule;
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> fbxSceneBuilderModule;
-};
-
-AZ_UNIT_TEST_HOOK(new ResourceCompilerSceneTestEnvironment);
diff --git a/Code/Tools/RC/ResourceCompilerScene/TraceDrillerHook.cpp b/Code/Tools/RC/ResourceCompilerScene/TraceDrillerHook.cpp
deleted file mode 100644
index 0ee1ae5423..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/TraceDrillerHook.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzToolsFramework/Debug/TraceContextLogFormatter.h>
-#include <TraceDrillerHook.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        TraceDrillerHook::TraceDrillerHook()
-            : m_errorCount(0)
-        {
-            BusConnect();
-        }
-        
-        TraceDrillerHook::~TraceDrillerHook()
-        {
-            BusDisconnect();
-        }
-
-        bool TraceDrillerHook::OnPreAssert(const char* fileName, int line, const char* func, const char* message)
-        {
-            AZ_UNUSED(fileName);
-            AZ_UNUSED(line);
-            AZ_UNUSED(func);
-
-            DumpContextStack();
-            m_errorCount++;
-            RCLogError("%.*s", CalculateLineLength(message), message);
-            return true;
-        }
-
-        bool TraceDrillerHook::OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message)
-        {
-            AZ_UNUSED(window);
-            AZ_UNUSED(fileName);
-            AZ_UNUSED(line);
-            AZ_UNUSED(func);
-            
-            DumpContextStack();
-            m_errorCount++;
-            RCLogError("%.*s", CalculateLineLength(message), message);
-            return true;
-        }
-
-        bool TraceDrillerHook::OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message)
-        {
-            AZ_UNUSED(window);
-            AZ_UNUSED(fileName);
-            AZ_UNUSED(line);
-            AZ_UNUSED(func);
-
-            DumpContextStack();
-            RCLogWarning("%.*s", CalculateLineLength(message), message);
-            return true;
-        }
-
-        bool TraceDrillerHook::OnPrintf(const char* window, const char* message)
-        {
-            DumpContextStack();
-            
-            // "%.*s" specifier only supports int for its size
-            int messageLineLen = aznumeric_cast<int>(CalculateLineLength(message));
-            if (AzFramework::StringFunc::Equal(window, SceneAPI::Utilities::ErrorWindow))
-            {
-                m_errorCount++;
-                RCLogError("%.*s", messageLineLen, message);
-            }
-            else if (AzFramework::StringFunc::Equal(window, SceneAPI::Utilities::WarningWindow))
-            {
-                RCLogWarning("%.*s", messageLineLen, message);
-            }
-            else
-            {
-                RCLog("%.*s", messageLineLen, message);
-            }
-            return true;
-        }
-
-        size_t TraceDrillerHook::GetErrorCount() const
-        {
-            return m_errorCount;
-        }
-
-        void TraceDrillerHook::DumpContextStack() const
-        {
-            AZStd::shared_ptr<const AzToolsFramework::Debug::TraceContextStack> stack = m_stacks.GetCurrentStack();
-            if (stack)
-            {
-                AZStd::string line;
-                size_t stackSize = stack->GetStackCount();
-                for (size_t i = 0; i < stackSize; ++i)
-                {
-                    line.clear();
-                    if (stack->GetType(i) == AzToolsFramework::Debug::TraceContextStackInterface::ContentType::UuidType)
-                    {
-                        continue;
-                    }
-
-                    AzToolsFramework::Debug::TraceContextLogFormatter::PrintLine(line, *stack, i);
-                    RCLogContext(line.c_str());
-                }
-            }
-        }
-
-        size_t TraceDrillerHook::CalculateLineLength(const char* message) const
-        {
-            size_t length = strlen(message);
-            while ((message[length - 1] == '\n' || message[length - 1] == '\r' ) && length > 1)
-            {
-                length--;
-            }
-            return length;
-        }
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/TraceDrillerHook.h b/Code/Tools/RC/ResourceCompilerScene/TraceDrillerHook.h
deleted file mode 100644
index fcf01d5e5f..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/TraceDrillerHook.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <cstdint>
-#include <IRCLog.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContextMultiStackHandler.h>
-
-namespace AZ
-{
-    namespace RC
-    {
-        class TraceDrillerHook
-            : public AZ::Debug::TraceMessageBus::Handler
-        {
-        public:
-            TraceDrillerHook();
-            ~TraceDrillerHook() override;
-
-            // Support for legacy Cry system cause AzCoreLogSink to eat asserts and errors, so registering for these
-            // callbacks never fires them. To still receive messages the OnPre* calls are hooked into. This isn't needed
-            // for warning, but is still done for consistency.
-
-            bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override;
-            bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override;
-            bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
-
-            bool OnPrintf(const char* window, const char* message) override;
-
-            size_t GetErrorCount() const;
-
-        private:
-            void DumpContextStack() const;
-            size_t CalculateLineLength(const char* message) const;
-
-            AzToolsFramework::Debug::TraceContextMultiStackHandler m_stacks;
-            size_t m_errorCount;
-        };
-    } // RC
-} // AZ
diff --git a/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_files.cmake b/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_files.cmake
deleted file mode 100644
index 7ec21afee6..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_files.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    TraceDrillerHook.h
-    TraceDrillerHook.cpp
-    ISceneConfig.h
-    SceneConfig.h
-    SceneConfig.cpp
-    SceneConverter.h
-    SceneConverter.cpp
-    SceneCompiler.h
-    SceneCompiler.cpp
-    SceneSerializationHandler.h
-    SceneSerializationHandler.cpp
-    Common/AssetExportUtilities.h
-    Common/AssetExportUtilities.cpp
-    Common/ExportContextGlobal.h
-    Common/CommonExportContexts.h
-    Common/CommonExportContexts.cpp
-    Common/ContainerSettingsExporter.h
-    Common/ContainerSettingsExporter.cpp
-    Common/MeshExporter.h
-    Common/MeshExporter.cpp
-    Common/MaterialExporter.h
-    Common/MaterialExporter.cpp
-    Common/ColorStreamExporter.h
-    Common/ColorStreamExporter.cpp
-    Common/UVStreamExporter.h
-    Common/UVStreamExporter.cpp
-    Common/SkeletonExporter.h
-    Common/SkeletonExporter.cpp
-    Common/SkinWeightExporter.h
-    Common/SkinWeightExporter.cpp
-    Common/BlendShapeExporter.h
-    Common/BlendShapeExporter.cpp
-    Cgf/CgfExportContexts.h
-    Cgf/CgfExportContexts.cpp
-    Cgf/CgfGroupExporter.h
-    Cgf/CgfGroupExporter.cpp
-    Cgf/CgfLodExporter.h
-    Cgf/CgfLodExporter.cpp
-    Cgf/CgfExporter.h
-    Cgf/CgfExporter.cpp
-    Cgf/CgfUtils.h
-    Cgf/CgfUtils.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_shared_files.cmake b/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_shared_files.cmake
deleted file mode 100644
index cd378fffe0..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_shared_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerScene.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_tests_files.cmake b/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_tests_files.cmake
deleted file mode 100644
index 7bdcc716cc..0000000000
--- a/Code/Tools/RC/ResourceCompilerScene/resourcecompilerscene_tests_files.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Tests/TestsMain.cpp
-    Tests/Cgf/CgfExportContextTestBase.h
-    Tests/Cgf/CgfColorStreamExporterTests.cpp
-    Tests/Cgf/CgfContainerSettingsExporterTests.cpp
-    Tests/Cgf/CgfMaterialExporterTests.cpp
-    Tests/Cgf/CgfMeshExporterTests.cpp
-    Tests/Cgf/CgfMeshGroupExporterTests.cpp
-    Tests/Cgf/CgfUVStreamExporterTests.cpp
-    ResourceCompilerScene.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerSlice/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerSlice/CMakeLists.txt
deleted file mode 100644
index c9c9b7f5a6..0000000000
--- a/Code/Tools/RC/ResourceCompilerSlice/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerSlice MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompilerslice_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::ResourceCompiler.Static
-)
-
-ly_add_dependencies(RC Legacy::ResourceCompilerSlice)
diff --git a/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice.cpp b/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice.cpp
deleted file mode 100644
index a02f0f75e5..0000000000
--- a/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerSlice_precompiled.h"
-#include <IResCompiler.h>
-#include <CryCommon/ISystem.h>
-
-#include <AzCore/Module/ModuleManagerBus.h>
-//=========================================================================
-// RegisterConvertors
-//=========================================================================
-extern "C" DLL_EXPORT void __stdcall RegisterConvertors([[maybe_unused]] IResourceCompiler* pRC)
-{
-    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-}
diff --git a/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice_precompiled.cpp b/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice_precompiled.cpp
deleted file mode 100644
index bfd5e41b5c..0000000000
--- a/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerSlice_precompiled.h"
diff --git a/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice_precompiled.h b/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice_precompiled.h
deleted file mode 100644
index c2e2948be8..0000000000
--- a/Code/Tools/RC/ResourceCompilerSlice/ResourceCompilerSlice_precompiled.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <platform.h>
-
-#include <functional>
-#include <vector>
-#include <map>
-
-#include <stdio.h>
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <tchar.h>
-#endif
-
-#include "IRCLog.h"
diff --git a/Code/Tools/RC/ResourceCompilerSlice/resourcecompilerslice_files.cmake b/Code/Tools/RC/ResourceCompilerSlice/resourcecompilerslice_files.cmake
deleted file mode 100644
index cdee62a731..0000000000
--- a/Code/Tools/RC/ResourceCompilerSlice/resourcecompilerslice_files.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerSlice.cpp
-    ResourceCompilerSlice_precompiled.h
-    ResourceCompilerSlice_precompiled.cpp
-)
diff --git a/Code/Tools/RC/ResourceCompilerUiCanvas/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerUiCanvas/CMakeLists.txt
deleted file mode 100644
index 0627464703..0000000000
--- a/Code/Tools/RC/ResourceCompilerUiCanvas/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerUiCanvas MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompileruicanvas_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::ResourceCompiler.Static
-)
-
-ly_add_dependencies(RC Legacy::ResourceCompilerUiCanvas)
diff --git a/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas.cpp b/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas.cpp
deleted file mode 100644
index aaf5227b82..0000000000
--- a/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerUiCanvas_precompiled.h"
-#include <IResCompiler.h>
-#include <CryCommon/ISystem.h>
-
-#include <AzCore/Module/ModuleManagerBus.h>
-//=========================================================================
-// RegisterConvertors
-//=========================================================================
-extern "C" DLL_EXPORT void __stdcall RegisterConvertors([[maybe_unused]] IResourceCompiler* pRC)
-{
-    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-}
diff --git a/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas_precompiled.cpp b/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas_precompiled.cpp
deleted file mode 100644
index 8259eb19e6..0000000000
--- a/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerUiCanvas_precompiled.h"
diff --git a/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas_precompiled.h b/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas_precompiled.h
deleted file mode 100644
index c2e2948be8..0000000000
--- a/Code/Tools/RC/ResourceCompilerUiCanvas/ResourceCompilerUiCanvas_precompiled.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <platform.h>
-
-#include <functional>
-#include <vector>
-#include <map>
-
-#include <stdio.h>
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <tchar.h>
-#endif
-
-#include "IRCLog.h"
diff --git a/Code/Tools/RC/ResourceCompilerUiCanvas/resourcecompileruicanvas_files.cmake b/Code/Tools/RC/ResourceCompilerUiCanvas/resourcecompileruicanvas_files.cmake
deleted file mode 100644
index 6a2b5faac2..0000000000
--- a/Code/Tools/RC/ResourceCompilerUiCanvas/resourcecompileruicanvas_files.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerUiCanvas.cpp
-    ResourceCompilerUiCanvas_precompiled.cpp
-    ResourceCompilerUiCanvas_precompiled.h
-)
diff --git a/Code/Tools/RC/ResourceCompilerXML/CMakeLists.txt b/Code/Tools/RC/ResourceCompilerXML/CMakeLists.txt
deleted file mode 100644
index 77ba46bc7c..0000000000
--- a/Code/Tools/RC/ResourceCompilerXML/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ResourceCompilerXML MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY rc_plugins
-    FILES_CMAKE
-        resourcecompilerxml_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            Legacy::ResourceCompiler.Static
-            Legacy::CryCommonTools
-            Legacy::CryXML
-            Legacy::CrySystem.XMLBinary
-)
-
-ly_add_dependencies(RC Legacy::ResourceCompilerXML)
diff --git a/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML.cpp b/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML.cpp
deleted file mode 100644
index 3203a3a911..0000000000
--- a/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerXML_precompiled.h"
-#include "IResCompiler.h"
-#include "XMLConverter.h"
-#include "IRCLog.h"
-#include "XML/xml.h"
-#include <CryLibrary.h>
-#include <CryCommon/ISystem.h>
-#include <ResourceCompiler/ResourceCompiler.h>
-
-XmlStrCmpFunc g_pXmlStrCmp = &azstricmp;
-
-extern "C" DLL_EXPORT void __stdcall RegisterConvertors(IResourceCompiler* pRC)
-{
-    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-
-    SetRCLog(pRC->GetIRCLog());
-
-    ICryXML* pCryXML = LoadICryXML();
-    if (pCryXML == 0)
-    {
-        RCLogError("Loading xml library failed - not registering xml converter.");
-        return;
-    }
-
-    pCryXML->AddRef();
-
-    pRC->RegisterConvertor("XMLConverter", new XMLConverter(pCryXML));
-
-    pRC->RegisterKey("xmlFilterFile", "specify file with special commands to filter out unneeded XML elements and attributes");
-
-    pCryXML->Release();
-}
-
diff --git a/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML_precompiled.cpp b/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML_precompiled.cpp
deleted file mode 100644
index bf8e04b724..0000000000
--- a/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerXML_precompiled.h"
diff --git a/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML_precompiled.h b/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML_precompiled.h
deleted file mode 100644
index 898c532c55..0000000000
--- a/Code/Tools/RC/ResourceCompilerXML/ResourceCompilerXML_precompiled.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#pragma once
-
-#include <assert.h>
-
-#define CRY_ASSERT(condition) assert(condition)
-#define CRY_ASSERT_TRACE(condition, message) assert(condition)
-#define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-
-// Define this to prevent including CryAssert (there is no proper hook for turning this off, like the above).
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_H
-
-#include <platform.h>
-
-#include <AzCore/base.h>
-
-#include <vector>
-#include <map>
-
-#include <stdio.h>
diff --git a/Code/Tools/RC/ResourceCompilerXML/XMLConverter.cpp b/Code/Tools/RC/ResourceCompilerXML/XMLConverter.cpp
deleted file mode 100644
index 21634d45e3..0000000000
--- a/Code/Tools/RC/ResourceCompilerXML/XMLConverter.cpp
+++ /dev/null
@@ -1,704 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "ResourceCompilerXML_precompiled.h"
-#include "XMLConverter.h"
-#include "IRCLog.h"
-#include "IXMLSerializer.h"
-#include "XMLBinaryHeaders.h"
-#include <CrySystem/XML/XMLBinaryReader.h>
-#include <CrySystem/XML/XMLBinaryWriter.h>
-#include "IConfig.h"
-#include "IResCompiler.h"
-#include "FileUtil.h"
-#include "StringHelpers.h"
-#include "UpToDateFileHelpers.h"
-
-#include <QDir>
-
-XMLCompiler::XMLCompiler(
-    ICryXML* pCryXML,
-    const std::vector<XMLFilterElement>& filter,
-    const std::vector<string>& tableFilemasks,
-    const NameConvertor& nameConverter)
-    : m_refCount(1)
-    , m_pCryXML(pCryXML)
-    , m_pFilter(&filter)
-    , m_pTableFilemasks(&tableFilemasks)
-    , m_pNameConverter(&nameConverter)
-{
-}
-
-void XMLCompiler::Release()
-{
-    if (--m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-XMLConverter::XMLConverter(ICryXML* pCryXML)
-    : m_pCryXML(pCryXML)
-    , m_refCount(1)
-{
-    m_pCryXML->AddRef();
-}
-
-XMLConverter::~XMLConverter()
-{
-    m_pCryXML->Release();
-}
-
-void XMLConverter::Release()
-{
-    if (--m_refCount <= 0)
-    {
-        delete this;
-    }
-}
-
-void XMLConverter::Init(const ConvertorInitContext& context)
-{
-    m_filter.clear();
-    m_tableFilemasks.clear();
-
-    if (!m_nameConvertor.SetRules(context.config->GetAsString("targetnameformat", "", "")))
-    {
-        return;
-    }
-
-    const string xmlFilterFile = context.config->GetAsString("xmlFilterFile", "", "");
-    if (xmlFilterFile.empty())
-    {
-        return;
-    }
-
-    FILE* f = nullptr;
-    azfopen(&f, xmlFilterFile.c_str(), "rt");
-    if (!f)
-    {
-        RCLogError("XML: Failed to open XML filter file \"%s\"", xmlFilterFile.c_str());
-        return;
-    }
-
-    char line[1024];
-    while (fgets(line, sizeof(line), f) != NULL)
-    {
-        if (line[0] == 0)
-        {
-            continue;
-        }
-
-        string sLine = line;
-        sLine.Trim();
-        if (sLine.empty())
-        {
-            continue;
-        }
-
-        if (::tolower(sLine[0]) == 'f')
-        {
-            sLine = sLine.substr(1, sLine.npos);
-            sLine.TrimLeft();
-            const string sKeywordTable = "table";
-            if (StringHelpers::StartsWithIgnoreCase(sLine, sKeywordTable))
-            {
-                sLine.erase(0, sKeywordTable.length());
-                sLine.TrimLeft();
-                if (!sLine.empty())
-                {
-                    m_tableFilemasks.push_back(PathHelpers::ToDosPath(sLine));
-                }
-            }
-            continue;
-        }
-
-        if ((::tolower(sLine[0]) == 'a' || ::tolower(sLine[0]) == 'e'))
-        {
-            XMLFilterElement fe;
-            fe.type = (::tolower(sLine[0]) == 'a')
-                ? XMLBinary::IFilter::eType_AttributeName
-                : XMLBinary::IFilter::eType_ElementName;
-            sLine = sLine.substr(1, sLine.npos);
-            sLine.TrimLeft();
-            if (!sLine.empty() && (sLine[0] == '+' || sLine[0] == '-'))
-            {
-                fe.bAccept = (sLine[0] == '+');
-                sLine = sLine.substr(1, sLine.npos);
-                sLine.TrimLeft();
-                if (!sLine.empty())
-                {
-                    fe.wildcards = sLine;
-                    m_filter.push_back(fe);
-                }
-            }
-        }
-    }
-
-    fclose(f);
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CXmlBinaryDataWriterFile
-    : public XMLBinary::IDataWriter
-{
-public:
-    CXmlBinaryDataWriterFile(const char* file)
-    {
-        m_file = nullptr; 
-        azfopen(&m_file, file, "wb");
-    }
-    ~CXmlBinaryDataWriterFile()
-    {
-        if (m_file)
-        {
-            fclose(m_file);
-        }
-    }
-    virtual bool IsOk()
-    {
-        return m_file != 0;
-    }
-    virtual void Write(const void* pData, size_t size)
-    {
-        if (m_file)
-        {
-            fwrite(pData, size, 1, m_file);
-        }
-    }
-private:
-    FILE* m_file;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CXmlFilter
-    : public XMLBinary::IFilter
-{
-public:
-    CXmlFilter(const std::vector<XMLFilterElement>* pFilterArray)
-        : m_pFilterArray((pFilterArray && !pFilterArray->empty()) ? pFilterArray : 0)
-    {
-    }
-
-    virtual bool IsAccepted(EType type, const char* pName) const
-    {
-        if (!m_pFilterArray)
-        {
-            return true;
-        }
-
-        const string name(pName);
-        for (size_t i = 0; i < m_pFilterArray->size(); ++i)
-        {
-            if (((*m_pFilterArray)[i].type == type) &&
-                StringHelpers::MatchesWildcardsIgnoreCase(name, (*m_pFilterArray)[i].wildcards))
-            {
-                return (*m_pFilterArray)[i].bAccept;
-            }
-        }
-
-        return true;
-    }
-
-private:
-    const std::vector<XMLFilterElement>* m_pFilterArray;
-};
-
-//////////////////////////////////////////////////////////////////////////
-static bool xmlsAreEqual(XmlNodeRef node0, XmlNodeRef node1, XMLBinary::IFilter* pFilter,  const char*& mismatchInfo)
-{
-    mismatchInfo = 0;
-
-    {
-        const char* const tag0 = node0->getTag();
-        const char* const tag1 = node1->getTag();
-
-        if (strcmp(tag0, tag1) != 0)
-        {
-            mismatchInfo = "tags";
-            return false;
-        }
-    }
-
-    {
-        const char* const content0 = node0->getContent();
-        const char* const content1 = node1->getContent();
-
-        if (strcmp(content0, content1) != 0)
-        {
-            mismatchInfo = "content";
-            return false;
-        }
-    }
-
-    {
-        const int count0 = node0->getNumAttributes();
-        const int count1 = node1->getNumAttributes();
-        int index1 = 0;
-        int filteredCount1 = 0;
-
-        for (int index0 = 0; index0 < count0; ++index0)
-        {
-            const char* key0;
-            const char* value0;
-            node0->getAttributeByIndex(index0, &key0, &value0);
-
-            const char* key1;
-            const char* value1;
-            for (;; )
-            {
-                if (index1 >= count1)
-                {
-                    mismatchInfo = "attribute count";
-                    return false;
-                }
-                node1->getAttributeByIndex(index1++, &key1, &value1);
-                if (!pFilter || pFilter->IsAccepted(XMLBinary::IFilter::eType_AttributeName, key1))
-                {
-                    ++filteredCount1;
-                    break;
-                }
-            }
-
-            if (strcmp(key0, key1) != 0)
-            {
-                mismatchInfo = "attribute name";
-                return false;
-            }
-
-            if (strcmp(value0, value1) != 0)
-            {
-                mismatchInfo = "attribute value";
-                return false;
-            }
-        }
-
-        if (count0 != filteredCount1)
-        {
-            mismatchInfo = "attribute count";
-            return false;
-        }
-    }
-
-    {
-        const int count0 = node0->getChildCount();
-        const int count1 = node1->getChildCount();
-        int index1 = 0;
-        int filteredCount1 = 0;
-
-        for (int index0 = 0; index0 < count0; ++index0)
-        {
-            XmlNodeRef child0 = node0->getChild(index0);
-
-            XmlNodeRef child1;
-            for (;; )
-            {
-                if (index1 >= count1)
-                {
-                    mismatchInfo = "child count";
-                    return false;
-                }
-                child1 = node1->getChild(index1++);
-                if (!pFilter || pFilter->IsAccepted(XMLBinary::IFilter::eType_ElementName, child1->getTag()))
-                {
-                    ++filteredCount1;
-                    break;
-                }
-            }
-
-            const bool bEqual = xmlsAreEqual(child0, child1, pFilter, mismatchInfo);
-            if (!bEqual)
-            {
-                return false;
-            }
-        }
-
-        if (count0 != filteredCount1)
-        {
-            mismatchInfo = "child count";
-            return false;
-        }
-    }
-
-    return true;
-}
-
-static string GetNormalizedFullPath(const string& relativePath)
-{
-    QFileInfo file(relativePath.c_str());
-    return file.absoluteFilePath().toStdString().c_str();
-}
-
-static XmlNodeRef ConvertFromExcelXmlToCryEngineTableXml(XmlNodeRef root, IXMLSerializer* pSerializer, const string& sInputFile)
-{
-    XmlNodeRef nodeTable;
-
-    {
-        const char* err = 0;
-        XmlNodeRef nodeWorksheet = root->findChild("Worksheet");
-        if (!nodeWorksheet)
-        {
-            err = "element 'Worksheet' is missing";
-        }
-        else
-        {
-            nodeTable = nodeWorksheet->findChild("Table");
-            if (!nodeTable)
-            {
-                err = "element 'Table' is missing in 'Worksheet'";
-            }
-        }
-
-        if (err)
-        {
-            RCLogError(
-                "XML: File \"%s\" expected to be an Excel spreadsheet XML, but it's not: %s. Check your /xmlfilterfile's file.",
-                sInputFile.c_str(), err);
-            return XmlNodeRef(0);
-        }
-    }
-
-    XmlNodeRef outTable = pSerializer->CreateNode("Table");
-
-    const bool bKeepEmptyRows = false;
-
-    const string sNewLine("\n");
-    string sRow;
-
-    int rowIndex = -1;
-    for (int row = 0; row < nodeTable->getChildCount(); ++row)
-    {
-        XmlNodeRef nodeRow = nodeTable->getChild(row);
-        if (!nodeRow->isTag("Row"))
-        {
-            continue;
-        }
-
-        ++rowIndex;
-
-        // Handling skipped rows
-        {
-            int index = 0;
-            if (nodeRow->getAttr("ss:Index", index))
-            {
-                --index; // one-based -> zero-based
-                if (index < rowIndex)
-                {
-                    RCLogError("XML: \"%s\": ss:Index has unexpected value %d", sInputFile.c_str(), index + 1);
-                    return XmlNodeRef(0);
-                }
-                if (bKeepEmptyRows)
-                {
-                    while (rowIndex < index)
-                    {
-                        XmlNodeRef outRow = pSerializer->CreateNode("Row");
-                        outTable->addChild(outRow);
-                        ++rowIndex;
-                    }
-                }
-                else
-                {
-                    rowIndex = index;
-                }
-            }
-        }
-
-        sRow.clear();
-
-        int cellIndex = -1;
-        for (int cell = 0; cell < nodeRow->getChildCount(); ++cell)
-        {
-            XmlNodeRef nodeCell = nodeRow->getChild(cell);
-            if (!nodeCell->isTag("Cell"))
-            {
-                continue;
-            }
-
-            ++cellIndex;
-
-            // Handling skipped columns
-            {
-                int index = 0;
-                if (nodeCell->getAttr("ss:Index", index))
-                {
-                    --index; // one-based -> zero-based
-                    if (index < cellIndex)
-                    {
-                        RCLogError("XML: \"%s\": ss:Index has unexpected value %d", sInputFile.c_str(), index + 1);
-                        return XmlNodeRef(0);
-                    }
-                    while (cellIndex < index)
-                    {
-                        sRow.append(sNewLine);
-                        ++cellIndex;
-                    }
-                }
-            }
-
-            XmlNodeRef nodeCellData = nodeCell->findChild("Data");
-            if (nodeCellData)
-            {
-                const char* const pContent = nodeCellData->getContent();
-                if (pContent)
-                {
-                    sRow.append(pContent);
-                }
-            }
-            sRow.append(sNewLine);
-        }
-
-        // Erase empty trailing cells in the row
-        while (StringHelpers::EndsWith(sRow, sNewLine))
-        {
-            sRow.erase(sRow.length() - sNewLine.length());
-        }
-
-        if (!sRow.empty() || bKeepEmptyRows)
-        {
-            XmlNodeRef outRow = pSerializer->CreateNode("Row");
-            outRow->setContent(sRow.c_str());
-            outTable->addChild(outRow);
-        }
-    }
-
-    XmlNodeRef outRoot = pSerializer->CreateNode("Tables");
-    outRoot->addChild(outTable);
-
-    if (false)
-    {
-        const string sFilename = sInputFile + ".debug.xml";
-        const bool ok = pSerializer->Write(outRoot, sFilename.c_str());
-        if (!ok)
-        {
-            RCLogError("XML: Failed to write XML file \"%s\".", sFilename.c_str());
-            return XmlNodeRef(0);
-        }
-    }
-
-    return outRoot;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool XMLCompiler::Process()
-{
-    const int verbosityLevel = m_CC.m_pRC->GetVerbosityLevel();
-
-    const bool bNeedSwapEndian = m_CC.m_pRC->GetPlatformInfo(m_CC.m_platform)->bBigEndian;
-    if (verbosityLevel >= 1 && bNeedSwapEndian)
-    {
-        RCLog("XML: Endian conversion specified");
-    }
-
-    // Get the files to process.
-    const string sInputFile = m_CC.GetSourcePath();
-    string sOutputFile = GetOutputPath();
-    if (m_pNameConverter->HasRules())
-    {
-        const string oldFilename = PathHelpers::GetFilename(sOutputFile);
-        const string newFilename = m_pNameConverter->GetConvertedName(oldFilename);
-        if (newFilename.empty())
-        {
-            return false;
-        }
-        if (!StringHelpers::EqualsIgnoreCase(oldFilename, newFilename))
-        {
-            if (verbosityLevel >= 2)
-            {
-                RCLog("Target file name changed: %s -> %s", oldFilename.c_str(), newFilename.c_str());
-            }
-            sOutputFile = PathHelpers::Join(PathHelpers::GetDirectory(sOutputFile), newFilename);
-        }
-    }
-
-    // Check that we will not overwrite source file
-    {
-        const string fname0 = GetNormalizedFullPath(sInputFile);
-        const string fname1 = GetNormalizedFullPath(sOutputFile);
-
-        if (fname0.empty() || fname1.empty())
-        {
-            return false;
-        }
-
-        if (StringHelpers::EqualsIgnoreCase(fname0, fname1))
-        {
-            RCLogError("XML: Source file cannot be same as target file. Use /targetroot=... option.");
-            return false;
-        }
-    }
-
-    if (!m_CC.m_bForceRecompiling && UpToDateFileHelpers::FileExistsAndUpToDate(sOutputFile, sInputFile))
-    {
-        // The file is up-to-date
-        m_CC.m_pRC->AddInputOutputFilePair(sInputFile, sOutputFile);
-        return true;
-    }
-
-    // Check that the input file exists.
-    if (!FileUtil::FileExists(sInputFile.c_str()))
-    {
-        RCLogError("XML: File \"%s\" does not exist", sInputFile.c_str());
-        return false;
-    }
-
-    // Get XML serializer.
-    IXMLSerializer* pSerializer = m_pCryXML->GetXMLSerializer();
-
-    // Ensure that the input file is not in binary XML format.
-    {
-        XMLBinary::XMLBinaryReader binReader;
-        XMLBinary::XMLBinaryReader::EResult binResult;
-        XmlNodeRef rootBin = binReader.LoadFromFile(sInputFile.c_str(), binResult);
-        if (binResult == XMLBinary::XMLBinaryReader::eResult_Success)
-        {
-            RCLogError("XML: Source file is binary XML \"%s\"", sInputFile.c_str());
-            return false;
-        }
-        if (binResult == XMLBinary::XMLBinaryReader::eResult_Error)
-        {
-            RCLogError("XML: Input XML file is either binary or damaged \"%s\": %s", sInputFile.c_str(), binReader.GetErrorDescription());
-            return false;
-        }
-    }
-
-    // Read input XML file.
-    XmlNodeRef root;
-    {
-        const bool bRemoveNonessentialSpacesFromContent = true;
-        char szErrorBuffer[1024];
-        szErrorBuffer[0] = 0;
-        root = pSerializer->Read(FileXmlBufferSource(sInputFile.c_str()), bRemoveNonessentialSpacesFromContent, sizeof(szErrorBuffer), szErrorBuffer);
-        if (!root)
-        {
-            const char* const pErrorStr =
-                (szErrorBuffer[0])
-                ? &szErrorBuffer[0]
-                : "Probably this file has bad XML syntax or it's not XML file at all";
-            RCLogError("XML: Cannot read file \"%s\": %s", sInputFile.c_str(), pErrorStr);
-            return false;
-        }
-    }
-
-    // Convert Excel's XML format to CryEngine's table XML format, if requested.
-    {
-        bool bConvert = false;
-        for (size_t i = 0; i < m_pTableFilemasks->size(); ++i)
-        {
-            if (StringHelpers::MatchesWildcardsIgnoreCase(sInputFile, (*m_pTableFilemasks)[i]))
-            {
-                bConvert = true;
-                break;
-            }
-        }
-
-        if (bConvert)
-        {
-            XmlNodeRef rootConverted = ConvertFromExcelXmlToCryEngineTableXml(root, pSerializer, sInputFile);
-            if (!rootConverted)
-            {
-                return false;
-            }
-            root = rootConverted;
-        }
-    }
-
-    // Create filter to get rid of unneeded elements and attributes
-    CXmlFilter filter(m_pFilter);
-
-    // Write out the destination file.
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        SetFileAttributes(sOutputFile.c_str(), FILE_ATTRIBUTE_ARCHIVE);
-#endif
-
-        FILE* pDestinationFile = nullptr; 
-        azfopen(&pDestinationFile, sOutputFile.c_str(), "wb");
-        if (pDestinationFile == 0)
-        {
-            char error[1024];
-            azstrerror_s(error, AZ_ARRAY_SIZE(error), errno);
-            RCLogError("XML: Cannot write file \"%s\": %s", sInputFile.c_str(), error);
-            return false;
-        }
-        fclose(pDestinationFile);
-
-        CXmlBinaryDataWriterFile outputFile(sOutputFile.c_str());
-        XMLBinary::CXMLBinaryWriter xmlBinaryWriter;
-        string error;
-        const bool ok = xmlBinaryWriter.WriteNode(&outputFile, root, bNeedSwapEndian, &filter, error);
-        if (!ok)
-        {
-            remove(sOutputFile.c_str());
-            RCLogError("XML: Failed to write binary XML file \"%s\": %s", sOutputFile.c_str(), error.c_str());
-            return false;
-        }
-    }
-
-    // Verify that the output file was written
-    if (!FileUtil::FileExists(sOutputFile.c_str()))
-    {
-        RCLogError("XML: Failed to write file \"%s\"", sOutputFile.c_str());
-        return false;
-    }
-
-    // Check that the output binary XML file has same content as the input XML
-    if (!bNeedSwapEndian)
-    {
-        XMLBinary::XMLBinaryReader binReader;
-        XMLBinary::XMLBinaryReader::EResult binResult;
-        XmlNodeRef rootBin = binReader.LoadFromFile(sOutputFile.c_str(), binResult);
-        if (!rootBin)
-        {
-            RCLogError("XML: Cannot read binary XML file \"%s\". Contact RC programmers.", sOutputFile.c_str());
-            return false;
-        }
-
-        const char* mismatchInfo = 0;
-        const bool bEqual = xmlsAreEqual(rootBin, root, &filter, mismatchInfo);
-        if (!bEqual)
-        {
-            RCLogError(
-                "XML: Source XML file \"%s\" and result binary XML file \"%s\" are different: %s. Contact RC programmers.",
-                sInputFile.c_str(), sOutputFile.c_str(), mismatchInfo);
-            return false;
-        }
-    }
-
-    if (!UpToDateFileHelpers::SetMatchingFileTime(sOutputFile, sInputFile))
-    {
-        return false;
-    }
-    m_CC.m_pRC->AddInputOutputFilePair(sInputFile, sOutputFile);
-
-    return true;
-}
-
-string XMLCompiler::GetOutputFileNameOnly() const
-{
-    return m_CC.m_config->GetAsString("overwritefilename", m_CC.m_sourceFileNameOnly.c_str(), m_CC.m_sourceFileNameOnly.c_str());
-}
-
-string XMLCompiler::GetOutputPath() const
-{
-    return PathHelpers::Join(m_CC.GetOutputFolder(), GetOutputFileNameOnly());
-}
-
-const char* XMLConverter::GetExt(int index) const
-{
-    return (index == 0) ? "xml" : 0;
-}
-
-ICompiler* XMLConverter::CreateCompiler()
-{
-    return new XMLCompiler(m_pCryXML, m_filter, m_tableFilemasks, m_nameConvertor);
-}
diff --git a/Code/Tools/RC/ResourceCompilerXML/XMLConverter.h b/Code/Tools/RC/ResourceCompilerXML/XMLConverter.h
deleted file mode 100644
index fc1d27ac1f..0000000000
--- a/Code/Tools/RC/ResourceCompilerXML/XMLConverter.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERXML_XMLCONVERTER_H
-#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERXML_XMLCONVERTER_H
-#pragma once
-
-
-#include "IConvertor.h"
-#include "ICryXML.h"
-#include "NameConvertor.h"
-#include "XMLBinaryHeaders.h"
-
-struct XMLFilterElement
-{
-    XMLBinary::IFilter::EType type;
-    bool bAccept;
-    string wildcards;
-};
-
-class XMLCompiler
-    : public ICompiler
-{
-public:
-    XMLCompiler(
-        ICryXML* pCryXML,
-        const std::vector<XMLFilterElement>& filter,
-        const std::vector<string>& tableFilemasks,
-        const NameConvertor& nameConverter);
-
-public:
-    virtual void Release();
-
-    virtual void BeginProcessing([[maybe_unused]] const IConfig* config) { }
-    virtual void EndProcessing() { }
-    virtual IConvertContext* GetConvertContext() { return &m_CC; }
-    virtual bool Process();
-
-private:
-    string GetOutputFileNameOnly() const;
-    string GetOutputPath() const;
-
-private:
-    int m_refCount;
-    ICryXML* m_pCryXML;
-    const std::vector<XMLFilterElement>* m_pFilter;
-    const std::vector<string>* m_pTableFilemasks;
-    const NameConvertor* m_pNameConverter;
-    ConvertContext m_CC;
-};
-
-class XMLConverter
-    : public IConvertor
-{
-public:
-    XMLConverter(ICryXML* pCryXML);
-    ~XMLConverter();
-
-    virtual void Release();
-
-    virtual void Init(const ConvertorInitContext& context);
-    virtual ICompiler* CreateCompiler();
-    virtual const char* GetExt(int index) const;
-
-private:
-    int m_refCount;
-    ICryXML* m_pCryXML;
-    std::vector<XMLFilterElement> m_filter;
-    std::vector<string> m_tableFilemasks;
-    NameConvertor m_nameConvertor;
-};
-
-#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILERXML_XMLCONVERTER_H
diff --git a/Code/Tools/RC/ResourceCompilerXML/resourcecompilerxml_files.cmake b/Code/Tools/RC/ResourceCompilerXML/resourcecompilerxml_files.cmake
deleted file mode 100644
index 7a22c18391..0000000000
--- a/Code/Tools/RC/ResourceCompilerXML/resourcecompilerxml_files.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ResourceCompilerXML.cpp
-    XMLConverter.cpp
-    ResourceCompilerXML_precompiled.h
-    ResourceCompilerXML_precompiled.cpp
-    XMLConverter.h
-)
diff --git a/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp
index 4de42eb944..f2fda63ec4 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp
@@ -25,9 +25,12 @@ namespace AZ
                 AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
                 if (behaviorContext)
                 {
+                    behaviorContext->Class<DataTypes::IGraphObject>();
+
                     behaviorContext->Class<GraphObjectProxy>()
                         ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                         ->Attribute(AZ::Script::Attributes::Module, "scene.graph")
+                        ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                         ->Method("CastWithTypeName", &GraphObjectProxy::CastWithTypeName)
                         ->Method("Invoke", &GraphObjectProxy::Invoke)
                         ;
diff --git a/Code/Tools/SceneAPI/SceneUI/SceneUI.qrc b/Code/Tools/SceneAPI/SceneUI/SceneUI.qrc
index 9b4ad04628..023f881ad7 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneUI.qrc
+++ b/Code/Tools/SceneAPI/SceneUI/SceneUI.qrc
@@ -1,21 +1,21 @@
 <RCC>
     <qresource prefix="/SceneUI/Graph">
-      <file alias="MeshIcon.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
-      <file alias="AnimationIcon.png">../../../../Editor/Icons/AssetImporter/animation_on.png</file>
-      <file alias="BoneIcon.png">../../../../Editor/Icons/AssetImporter/skeleton_on.png</file>
+      <file alias="MeshIcon.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
+      <file alias="AnimationIcon.png">../../../../Assets/Editor/Icons/AssetImporter/animation_on.png</file>
+      <file alias="BoneIcon.png">../../../../Assets/Editor/Icons/AssetImporter/skeleton_on.png</file>
     </qresource>
     <qresource prefix="/SceneUI/Manifest">
-      <file alias="TreeIcon.png">../../../../Editor/Icons/AssetImporter/tree.png</file>
-      <file alias="MeshGroupIcon.png">../../../../Editor/Icons/AssetImporter/mesh.png</file>
-      <file alias="AnimationGroupIcon.png">../../../../Editor/Icons/AssetImporter/animation.png</file>
-      <file alias="SkeletonGroupIcon.png">../../../../Editor/Icons/AssetImporter/skeleton.png</file>
-      <file alias="SkinGroupIcon.png">../../../../Editor/Icons/AssetImporter/skin.png</file>
+      <file alias="TreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/tree.png</file>
+      <file alias="MeshGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/mesh.png</file>
+      <file alias="AnimationGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/animation.png</file>
+      <file alias="SkeletonGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/skeleton.png</file>
+      <file alias="SkinGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/skin.png</file>
     </qresource>
     <qresource prefix="/SceneUI/Common">
-      <file alias="WarningIcon.png">../../../../Editor/Styles/StyleSheetImages/info_icon.png</file>
-      <file alias="ErrorIcon.png">../../../../Editor/Styles/StyleSheetImages/error_icon.png</file>
-      <file alias="AssertIcon.png">../../../../Editor/Icons/Assets/Lua.png</file>
-      <file alias="ExpandIcon.png">../../../../Editor/Icons/PropertyEditor/group_closed.png</file>
-      <file alias="CollapseIcon.png">../../../../Editor/Icons/PropertyEditor/group_open.png</file>
+      <file alias="WarningIcon.png">../../../../Assets/Editor/Styles/StyleSheetImages/info_icon.png</file>
+      <file alias="ErrorIcon.png">../../../../Assets/Editor/Styles/StyleSheetImages/error_icon.png</file>
+      <file alias="AssertIcon.png">../../../../Assets/Editor/Icons/Assets/Lua.png</file>
+      <file alias="ExpandIcon.png">../../../../Assets/Editor/Icons/PropertyEditor/group_closed.png</file>
+      <file alias="CollapseIcon.png">../../../../Assets/Editor/Icons/PropertyEditor/group_open.png</file>
     </qresource>
 </RCC>
diff --git a/Code/Tools/ShaderCacheGen/CMakeLists.txt b/Code/Tools/ShaderCacheGen/CMakeLists.txt
deleted file mode 100644
index 72613aa20f..0000000000
--- a/Code/Tools/ShaderCacheGen/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-add_subdirectory(ShaderCacheGen)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Alert.h b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Alert.h
deleted file mode 100644
index 39b6036aec..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Alert.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-namespace Alert
-{
-    enum Buttons
-    {
-        Ok = 0x1,
-        Yes = 0x2,
-        No = 0x4,
-        YesNo = Yes | No
-    };
-
-    Buttons ShowMessage(const char* message, int buttons);
-    Buttons ShowMessage(const char* title, const char* message, int buttons);
-}
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/CMakeLists.txt b/Code/Tools/ShaderCacheGen/ShaderCacheGen/CMakeLists.txt
deleted file mode 100644
index 71bb39ab74..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_get_pal_tool_dirs(pal_tool_dirs ${CMAKE_CURRENT_LIST_DIR}/Platform)
- 
-set(pal_files "")
-set(pal_cmake_files "")
-foreach(enabled_platform ${LY_PAL_TOOLS_ENABLED})
-    string(TOLOWER ${enabled_platform} enabled_platform_lowercase)
-    ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${enabled_platform})
-    list(APPEND pal_files ${pal_dir}/platform_${enabled_platform_lowercase}_files.cmake)
-    list(APPEND pal_cmake_files ${pal_dir}/platform_${enabled_platform_lowercase}.cmake)
-endforeach()
-
-ly_add_target(
-    NAME ShaderCacheGen EXECUTABLE
-    NAMESPACE Legacy
-    FILES_CMAKE
-        shader_cache_gen_files.cmake
-        ${pal_files}
-    PLATFORM_INCLUDE_FILES
-        ${pal_cmake_files}
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-            ${pal_tool_dirs}
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::CryCommon
-)
-ly_add_source_properties(
-    SOURCES ShaderCacheGen.cpp
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES ${LY_PAL_TOOLS_DEFINES}
-)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Android/platform_android.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Android/platform_android.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Android/platform_android.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Android/platform_android_files.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Android/platform_android_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Android/platform_android_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Linux/platform_linux.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Linux/platform_linux.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Linux/platform_linux.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Linux/platform_linux_files.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Linux/platform_linux_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Linux/platform_linux_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/Alert_darwin.mm b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/Alert_darwin.mm
deleted file mode 100644
index 138ee43b5e..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/Alert_darwin.mm
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Alert.h>
-#include <AzCore/std/containers/vector.h>
-
-#import <AppKit/NSAlert.h>
-#import <AppKit/NSPanel.h>
-
-namespace {
-    Alert::Buttons fromCocoaResponse(NSModalResponse response, const AZStd::vector<Alert::Buttons>& ids)
-    {
-        return ids.at(response -NSAlertFirstButtonReturn);
-    }
-}
-
-Alert::Buttons Alert::ShowMessage(const char* message, int buttons)
-{
-    return ShowMessage("", message, buttons);
-}
-
-Alert::Buttons Alert::ShowMessage(const char* title, const char* message, int buttons)
-{
-    // macOS alert dialogs don't show title
-    AZ_UNUSED(title);
-
-    AZStd::vector<Alert::Buttons> ids;
-    NSAlert* alert = [[NSAlert alloc] init];
-
-    // Ensure the alert stay on top of everything by default
-    NSPanel* panel = static_cast<NSPanel*>([alert window]);
-    panel.floatingPanel = YES;
-
-    [alert setMessageText:[NSString stringWithUTF8String:message]];
-
-    if (buttons & Alert::Ok)
-    {
-        [alert addButtonWithTitle:@"Ok"];
-        ids.push_back(Alert::Ok);
-    }
-    if (buttons & Alert::No)
-    {
-        [alert addButtonWithTitle:@"No"];
-        ids.push_back(Alert::No);
-    }
-    if (buttons & Alert::Yes)
-    {
-        [alert addButtonWithTitle:@"Yes"];
-        ids.push_back(Alert::Yes);
-    }
-    if (buttons & Alert::YesNo)
-    {
-        {
-            [alert addButtonWithTitle:@"No"];
-            ids.push_back(Alert::No);
-        }
-        {
-            [alert addButtonWithTitle:@"Yes"];
-            ids.push_back(Alert::Yes);
-        }
-    }
-
-    const NSModalResponse result = [alert runModal];
-    return fromCocoaResponse(result, ids);
-}
-
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/platform_mac.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/platform_mac.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/platform_mac.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/platform_mac_files.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/platform_mac_files.cmake
deleted file mode 100644
index 33bd58663b..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Mac/platform_mac_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Alert_darwin.mm
-)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/Alert_win.cpp b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/Alert_win.cpp
deleted file mode 100644
index 2ffb98d573..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/Alert_win.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Alert.h>
-#include <Windows.h>
-#include <cassert>
-
-namespace {
-    UINT toWinButtons(int buttons)
-    {
-        UINT result = 0;
-
-        if (buttons & Alert::Ok)
-        {
-            result |= MB_OK;
-        }
-        if (buttons & Alert::YesNo)
-        {
-            result |= MB_YESNO;
-        }
-
-        return result;
-    }
-
-    Alert::Buttons fromWinId(UINT id)
-    {
-        switch (id)
-        {
-            case IDOK:
-                return Alert::Ok;
-            case IDYES:
-                return Alert::Yes;
-            case IDNO:
-                return Alert::No;
-            default:
-                assert(false);
-        }
-
-        // Shouldn't reach here
-        return Alert::No;
-    }
-}
-
-Alert::Buttons Alert::ShowMessage(const char* message, int buttons)
-{
-    return ShowMessage("", message, buttons);
-}
-
-Alert::Buttons Alert::ShowMessage(const char* title, const char* message, int buttons)
-{
-    const UINT result = MessageBox(GetDesktopWindow(), message, title, toWinButtons(buttons));
-    return fromWinId(result);
-}
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/platform_windows.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/platform_windows.cmake
deleted file mode 100644
index ed4ec3e0a1..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/platform_windows.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LY_RUNTIME_DEPENDENCIES
-    Legacy::CryRenderD3D11
-)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/platform_windows_files.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/platform_windows_files.cmake
deleted file mode 100644
index de3425c5e6..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/Windows/platform_windows_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Alert_win.cpp
-)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/iOS/platform_ios.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/iOS/platform_ios.cmake
deleted file mode 100644
index f5b9ea77a2..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/iOS/platform_ios.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/iOS/platform_ios_files.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/iOS/platform_ios_files.cmake
deleted file mode 100644
index 5714be5dfb..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/Platform/iOS/platform_ios_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-)
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/ShaderCacheGen.cpp b/Code/Tools/ShaderCacheGen/ShaderCacheGen/ShaderCacheGen.cpp
deleted file mode 100644
index 4dbf6a9f90..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/ShaderCacheGen.cpp
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-// #include <platform.h>
-// #include <ProjectDefines.h>
-
-// Insert your headers here
-// #include <AzCore/PlatformIncl.h>
-// #include <algorithm>
-// #include <vector>
-
-#include <platform.h>
-#include <ISystem.h>
-
-#include <StringUtils.h>
-
-#include <AzFramework/Application/Application.h>
-#include <AzCore/Module/DynamicModuleHandle.h>
-#include <AzCore/PlatformId/PlatformId.h>
-#include <AzCore/std/string/osstring.h>
-#include <AzCore/IPC/SharedMemory.h>
-
-#include <CryLibrary.h>
-#include <IConsole.h>
-
-#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#undef AZ_RESTRICTED_SECTION
-#define SHADERCACHEGEN_CPP_SECTION_1 1
-#endif
-
-#if defined(AZ_PLATFORM_MAC)
-#include <fcntl.h>
-#include <errno.h>
-#include <semaphore.h>
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-static bool s_displayMessageBox = true;
-
-struct COutputPrintSink
-    : public IOutputPrintSink
-{
-    virtual void Print(const char* inszText)
-    {
-        printf("%s\n", inszText);
-    }
-};
-
-#if defined(AZ_PLATFORM_MAC)
-CFOptionFlags MessageBox(const char* title, const char* message, CFStringRef defaultButton, CFStringRef alternateButton)
-{
-    CFStringRef strHeader = CFStringCreateWithCString(NULL, title, kCFStringEncodingMacRoman);
-    CFStringRef strMsg = CFStringCreateWithCString(NULL, message, kCFStringEncodingMacRoman);
-    
-    CFOptionFlags result;
-    CFUserNotificationDisplayAlert(
-                                   0,
-                                   kCFUserNotificationNoteAlertLevel,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   strHeader,
-                                   strMsg,
-                                   defaultButton,
-                                   alternateButton,
-                                   NULL,
-                                   &result
-                                   );
-    
-    if (strHeader)
-    {
-        CFRelease(strHeader);
-    }
-
-    if (strMsg)
-    {
-        CFRelease(strMsg);
-    }
-    return result;
-}
-#endif // defined(AZ_PLATFORM_MAC)
-
-bool DisplayYesNoMessageBox(const char* title, const char* message)
-{
-    if (!s_displayMessageBox)
-    {
-        return false;
-    }
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    return MessageBox(0, message, title, MB_YESNO) == IDYES;
-#elif defined(AZ_PLATFORM_MAC)
-    return MessageBox(title, message, CFSTR("Yes"), CFSTR("No")) == kCFUserNotificationDefaultResponse;
-#else
-    return false;
-#endif
-}
-
-void DisplayErrorMessageBox(const char* message)
-{
-    if (!s_displayMessageBox)
-    {
-        printf("Error: %s\n", message);
-        return;
-    }
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    MessageBox(0, message, "Error", MB_OK | MB_DEFAULT_DESKTOP_ONLY);
-#elif defined(AZ_PLATFORM_MAC)
-    MessageBox("Error", message, NULL, NULL);
-#endif
-}
-
-void ClearPlatformCVars(ISystem* pISystem)
-{
-    pISystem->GetIConsole()->ExecuteString("r_ShadersDX11 = 0");
-    pISystem->GetIConsole()->ExecuteString("r_ShadersMETAL = 0");
-    pISystem->GetIConsole()->ExecuteString("r_ShadersGL4 = 0");
-    pISystem->GetIConsole()->ExecuteString("r_ShadersGLES3 = 0");
-    pISystem->GetIConsole()->ExecuteString("r_ShadersOrbis = 0");
-}
-
-bool IsO3DERunning()
-{
-    bool isRunning = false;
-    const char* mutexName = "O3DEApplication";
-#if defined(AZ_PLATFORM_WINDOWS)
-    HANDLE mutex = CreateMutex(NULL, TRUE, mutexName);
-    isRunning = GetLastError() == ERROR_ALREADY_EXISTS;
-    if (mutex)
-    {
-        CloseHandle(mutex);
-    }
-#elif defined(AZ_PLATFORM_MAC)
-    sem_t* mutex = sem_open(mutexName, O_CREAT | O_EXCL);
-    if (mutex == SEM_FAILED && errno == EEXIST)
-    {
-        isRunning = true;
-    }
-    else
-    {
-        sem_close(mutex);
-        sem_unlink(mutexName);
-    }
-#endif
-
-    return isRunning;
-}
-
-static AZ::EnvironmentVariable<IMemoryManager*> s_cryMemoryManager = nullptr;
-HMODULE s_crySystemDll = nullptr;
-
-void AcquireCryMemoryManager()
-{
-    using GetMemoryManagerInterfaceFunction = decltype(CryGetIMemoryManagerInterface)*;
-
-    IMemoryManager* cryMemoryManager = nullptr;
-    GetMemoryManagerInterfaceFunction getMemoryManager = nullptr;
-
-    s_crySystemDll = CryLoadLibraryDefName("CrySystem");
-    AZ_Assert(s_crySystemDll, "Unable to load CrySystem to resolve memory manager");
-    getMemoryManager = reinterpret_cast<GetMemoryManagerInterfaceFunction>(CryGetProcAddress(s_crySystemDll, "CryGetIMemoryManagerInterface"));
-    AZ_Assert(getMemoryManager, "Unable to resolve CryGetIMemoryInterface via CrySystem");
-    getMemoryManager((void**)&cryMemoryManager);
-    AZ_Assert(cryMemoryManager, "Unable to resolve CryMemoryManager");
-    s_cryMemoryManager = AZ::Environment::CreateVariable<IMemoryManager*>("CryIMemoryManagerInterface", cryMemoryManager);
-}
-
-void ReleaseCryMemoryManager()
-{
-    s_cryMemoryManager.Reset();
-    if (s_crySystemDll)
-    {
-        while (CryFreeLibrary(s_crySystemDll))
-        {
-            // keep freeing until free.
-            // this is unfortunate, but CryMemoryManager currently in its internal impl grabs an extra handle to this and does not free it nor
-            // does it have an interface to do so.
-            // until we can rewrite the memory manager init and shutdown code, we need to do this here because we need crysystem GONE
-            // before we attempt to destroy the memory managers which it uses.
-            ;
-        }
-        s_crySystemDll = nullptr;
-    }
-}
-
-// wrapped main so that it can be inside the lifetime of an AZCore Application in the real main()
-// and all memory created on the stack here in main_wrapped can go out of scope before we stop the application
-int main_wrapped(int argc, char* argv[])
-{
-    const int errorCode = 1;
-    if (argc < 2)
-    {
-        printf("\nInvalid number of arguments. Usage:\n\
-                ShaderGen BuildGlobalCache [NoCompile] | BuildLevelCache\n\
-                ShadersPlatform={D3D11/GLES3/GL4/METAL}\n\
-                TargetPlatform={pc/es3/ios/osx_gl}\n\
-                [-nopromt][-devmode]\n");
-        return errorCode;
-    }
-
-    AZ::OSString cmdLineString;
-    for (int i = 0; i < argc - 1; ++i)
-    {
-        cmdLineString += argv[i];
-        cmdLineString += " ";
-    }
-    cmdLineString += argv[argc - 1];
-    const char* commandLine = cmdLineString.c_str();
-    
-    if (CryStringUtils::stristr(commandLine, "-noprompt"))
-    {
-        s_displayMessageBox = false;
-    }
-
-    if (IsO3DERunning())
-    {
-        if (CryStringUtils::stristr(commandLine, "-devmode") == 0)
-        {
-            DisplayErrorMessageBox("There is already a Open 3D Engine application running. Cannot start another one!");
-            return errorCode;
-        }
-
-        if (s_displayMessageBox)
-        {
-            if (!DisplayYesNoMessageBox("Too many apps", "There is already a Open 3D Engine application running\nDo you want to start another one?"))
-            {
-                return errorCode;
-            }
-        }
-    }
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    InitRootDir();
-#endif
-
-    PFNCREATESYSTEMINTERFACE CreateSystemInterface = reinterpret_cast<PFNCREATESYSTEMINTERFACE>(CryGetProcAddress(s_crySystemDll, "CreateSystemInterface"));
-
-    COutputPrintSink printSink;
-    SSystemInitParams sip;
-
-    using PlatformMap = AZStd::unordered_map<AZ::OSString, AZ::PlatformID, AZStd::hash<AZ::OSString>>;
-    using PlatformMapElement = PlatformMap::value_type;
-
-    const PlatformMap platforms =
-    {
-        { "pc", AZ::PlatformID::PLATFORM_WINDOWS_64 },
-        { "es3", AZ::PlatformID::PLATFORM_ANDROID_64 },
-        { "ios", AZ::PlatformID::PLATFORM_APPLE_IOS },
-        { "osx_gl", AZ::PlatformID::PLATFORM_APPLE_OSX },
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
-        { #codename,    AZ::PlatformID::PLATFORM_##PUBLICNAME },
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM)
-        AZ_EXPAND_FOR_RESTRICTED_PLATFORM
-#else
-        AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#endif
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-        
-    };
-
-    AZ::PlatformID platform = AZ::PlatformID::PLATFORM_MAX;
-    AZ::OSString shaderTypeCommand;
-
-    // Parse the args that have to do with shader type and target platform
-    if (CryStringUtils::stristr(commandLine, "ShadersPlatform"))
-    {
-        if (CryStringUtils::stristr(commandLine, "ShadersPlatform=PC") || CryStringUtils::stristr(commandLine, "ShadersPlatform=D3D11") != 0)
-        {
-            shaderTypeCommand = "r_ShadersDX11 = 1";
-            platform = AZ::PlatformID::PLATFORM_WINDOWS_64;
-        }
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
-        else if (CryStringUtils::stristr(commandLine, "ShadersPlatform=" #PrivateName) != 0)       \
-        {                                                                                       \
-            shaderTypeCommand = "r_Shaders" #PrivateName " = 1";                                \
-            platform = AZ::PlatformID::PLATFORM_##PUBLICNAME;                                               \
-        }
-#if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM)
-        AZ_EXPAND_FOR_RESTRICTED_PLATFORM
-#else
-        AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#endif
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-        else if (CryStringUtils::stristr(commandLine, "ShadersPlatform=GL4") != 0)
-        {
-            shaderTypeCommand = "r_ShadersGL4 = 1";
-            platform = AZ::PlatformID::PLATFORM_WINDOWS_64;
-        }
-        else if (CryStringUtils::stristr(commandLine, "ShadersPlatform=GLES3") != 0)
-        {
-            shaderTypeCommand = "r_ShadersGLES3 = 1";
-            platform = AZ::PlatformID::PLATFORM_ANDROID_64;
-        }
-        else if (CryStringUtils::stristr(commandLine, "ShadersPlatform=METAL") != 0)
-        {
-            shaderTypeCommand = "r_ShadersMETAL = 1";
-            // For metal the platform has to be specified in the command line
-        }
-    }
-
-    const char* platformArg = "TargetPlatform=";
-    if (const char* platformString = CryStringUtils::stristr(commandLine, platformArg))
-    {
-        // Get the platform value
-        platformString += strlen(platformArg);
-        // Search for the next white space
-        const char* platformStringEnd = strchr(platformString, ' ');
-        size_t stringLen = platformStringEnd ? platformStringEnd - platformString : strlen(platformString);
-        AZ::OSString platformAsString(platformString, stringLen);
-        AZStd::to_lower(platformAsString.begin(), platformAsString.end());
-        auto it = platforms.find(platformAsString);
-        if (it != platforms.end())
-        {
-            platform = it->second;
-        }
-    }
-
-    // Search for the platform name using the enum value
-    PlatformMap::const_iterator foundPlatform = AZStd::find_if(platforms.begin(), platforms.end(), [&platform](const PlatformMapElement& element) { return element.second == platform; });
-    if (foundPlatform == platforms.end())
-    {
-        DisplayErrorMessageBox("Invalid target platform");
-        return errorCode;
-    }
-
-    sip.bShaderCacheGen = true;
-    sip.bDedicatedServer = false;
-    sip.bPreview = false;
-    sip.bTestMode = false;
-    sip.bMinimal = true;
-    sip.bToolMode = true;
-    sip.pSharedEnvironment = AZ::Environment::GetInstance();
-
-    sip.pPrintSync = &printSink;
-    cry_strcpy(sip.szSystemCmdLine, commandLine);
-
-    // this actually detects our root as part of construction.
-    // we will load an alternate bootstrap file so that this tool never turns on VFS.
-
-    sip.sLogFileName = "@log@/ShaderCacheGen.log";
-    sip.bSkipFont = true;
-
-    ISystem* pISystem = CreateSystemInterface(sip);
-    if (!pISystem)
-    {
-        DisplayErrorMessageBox("CreateSystemInterface Failed");
-        return false;
-    }
-
-    ////////////////////////////////////
-    // Current command line options
-
-    pISystem->ExecuteCommandLine();
-
-    // Set the shader type
-    if (!shaderTypeCommand.empty())
-    {
-        ClearPlatformCVars(pISystem);
-
-        pISystem->GetIConsole()->ExecuteString(shaderTypeCommand.c_str());
-
-#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#if defined(TOOLS_SUPPORT_JASPER)
-#define AZ_RESTRICTED_SECTION SHADERCACHEGEN_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE_EXPLICIT(ShaderCacheGen_cpp, jasper)
-#endif
-#if defined(TOOLS_SUPPORT_PROVO)
-#define AZ_RESTRICTED_SECTION SHADERCACHEGEN_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE_EXPLICIT(ShaderCacheGen_cpp, provo)
-#endif
-#if defined(TOOLS_SUPPORT_SALEM)
-#define AZ_RESTRICTED_SECTION SHADERCACHEGEN_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE_EXPLICIT(ShaderCacheGen_cpp, salem)
-#endif
-#endif
-
-    }
-
-    // Set the target platform
-    if (platform != AZ::PlatformID::PLATFORM_MAX)
-    {
-        pISystem->GetIConsole()->ExecuteString(AZStd::string::format("r_ShadersPlatform = %d", static_cast<AZ::u32>(platform)).c_str());
-    }
-    
-    if (CryStringUtils::stristr(commandLine, "BuildGlobalCache") != 0)
-    {
-        // to only compile shader explicitly listed in global list, call PrecacheShaderList
-        if (CryStringUtils::stristr(commandLine, "NoCompile") != 0)
-        {
-            pISystem->GetIConsole()->ExecuteString("r_StatsShaderList");
-        }
-        else
-        {
-            pISystem->GetIConsole()->ExecuteString("r_PrecacheShaderList");
-        }
-    }
-    else if (CryStringUtils::stristr(commandLine, "BuildLevelCache") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_PrecacheShadersLevels");
-    }
-    else if (CryStringUtils::stristr(commandLine, "GetShaderList") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_GetShaderList");
-    }
-
-    ////////////////////////////////////
-    // Deprecated command line options
-    if (strstr(commandLine, "PrecacheShaderList") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_PrecacheShaderList");
-    }
-    else if (strstr(commandLine, "StatsShaderList") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_StatsShaderList");
-    }
-    else if (strstr(commandLine, "StatsShaders") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_StatsShaders");
-    }
-    else if (strstr(commandLine, "PrecacheShadersLevels") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_PrecacheShadersLevels");
-    }
-    else if (strstr(commandLine, "PrecacheShaders") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_PrecacheShaders");
-    }
-    else if (strstr(commandLine, "MergeShaders") != 0)
-    {
-        pISystem->GetIConsole()->ExecuteString("r_MergeShaders");
-    }
-
-    if (pISystem)
-    {
-        pISystem->Quit();
-        pISystem->Release();
-    }
-    pISystem = nullptr;
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int main(int argc, char* argv[])
-{
-    AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-    AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
-    AZ::AllocatorInstance<CryStringAllocator>::Create();
-
-    AzFramework::Application app(&argc, &argv);
-    AzFramework::Application::StartupParameters startupParams;
-    AzFramework::Application::Descriptor descriptor;
-    app.Start(descriptor, startupParams);
-    AcquireCryMemoryManager();
-
-    AZ::Debug::Trace::Instance().Init();
-
-    int returncode = main_wrapped(argc, argv);
-
-    app.Stop();
-
-    AZ::Debug::Trace::Instance().Destroy();
-
-    ReleaseCryMemoryManager();
-    AZ::AllocatorInstance<CryStringAllocator>::Destroy();
-    AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
-    AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-    return returncode;
-}
diff --git a/Code/Tools/ShaderCacheGen/ShaderCacheGen/shader_cache_gen_files.cmake b/Code/Tools/ShaderCacheGen/ShaderCacheGen/shader_cache_gen_files.cmake
deleted file mode 100644
index 3dc6abffca..0000000000
--- a/Code/Tools/ShaderCacheGen/ShaderCacheGen/shader_cache_gen_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ShaderCacheGen.cpp
-)
diff --git a/Code/Tools/Standalone/Source/ThumbnailerNullComponent.cpp b/Code/Tools/Standalone/Source/ThumbnailerNullComponent.cpp
index 0818291a33..e33cb8aa51 100644
--- a/Code/Tools/Standalone/Source/ThumbnailerNullComponent.cpp
+++ b/Code/Tools/Standalone/Source/ThumbnailerNullComponent.cpp
@@ -20,10 +20,8 @@ namespace LUAEditor
 {
     namespace Thumbnailer
     {
-        const int DEFAULT_THUMBNAIL_SIZE = 100;
-
         ThumbnailerNullComponent::ThumbnailerNullComponent() :
-            m_nullThumbnail(new AzToolsFramework::Thumbnailer::MissingThumbnail(DEFAULT_THUMBNAIL_SIZE))
+            m_nullThumbnail(new AzToolsFramework::Thumbnailer::MissingThumbnail())
         {
         }
 
@@ -53,7 +51,7 @@ namespace LUAEditor
             services.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
         }
 
-        void ThumbnailerNullComponent::RegisterContext(const char* /*contextName*/, int /*thumbnailSize*/)
+        void ThumbnailerNullComponent::RegisterContext(const char* /*contextName*/)
         {
         }
 
diff --git a/Code/Tools/Standalone/Source/ThumbnailerNullComponent.h b/Code/Tools/Standalone/Source/ThumbnailerNullComponent.h
index bb56a27e8f..9d0c638305 100644
--- a/Code/Tools/Standalone/Source/ThumbnailerNullComponent.h
+++ b/Code/Tools/Standalone/Source/ThumbnailerNullComponent.h
@@ -42,7 +42,7 @@ namespace LUAEditor
             //////////////////////////////////////////////////////////////////////////
             // ThumbnailerRequests
             //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName, int thumbnailSize) override;
+            void RegisterContext(const char* contextName) override;
             void UnregisterContext(const char* contextName) override;
             bool HasContext(const char* contextName) const override;
             void RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider provider, const char* contextName) override;
diff --git a/Editor/Editor.env b/Editor/Editor.env
deleted file mode 100644
index 1596bbd595..0000000000
--- a/Editor/Editor.env
+++ /dev/null
@@ -1,4 +0,0 @@
-<EditorShelves>
-	<Shelves scriptPath="Editor/Scripts" shelvesPath="Editor/Scripts/Shelves" />
-	<Shelves scriptPath="Tools/Editor/Scripts" shelvesPath="Tools/Editor/Scripts/Shelves" />
-</EditorShelves>
diff --git a/Editor/Materials/lodgen_template.mtl b/Editor/Materials/lodgen_template.mtl
deleted file mode 100644
index 0866c7b28b..0000000000
--- a/Editor/Materials/lodgen_template.mtl
+++ /dev/null
@@ -1,8 +0,0 @@
-<Material MtlFlags="524416" Shader="Illum" GenMask="C0000081" StringGenMask="%ALLOW_SILHOUETTE_POM%BUMP_MAP%SPEC_MAP%SUBSURFACE_SCATTERING" SurfaceType="" MatTemplate="" Diffuse="1,1,1" Specular="0.035,0.035,0.035" Emissive="0,0,0" Shininess="255" Opacity="1" LayerAct="1">
- <Textures>
-  <Texture Map="Diffuse" File="Engine/EngineAssets/TextureMsg/ReplaceMe.tif" IsTileU="0" IsTileV="0"/>
-  <Texture Map="Specular" File="Engine/EngineAssets/TextureMsg/ReplaceMe.tif" IsTileU="0" IsTileV="0"/>
-  <Texture Map="Bumpmap" File="Engine/EngineAssets/TextureMsg/ReplaceMe.tif" IsTileU="0" IsTileV="0"/>
- </Textures>
- <PublicParams SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
-</Material>
diff --git a/Editor/cryassetdb_mysql.sql b/Editor/cryassetdb_mysql.sql
deleted file mode 100644
index 475b9c48ed..0000000000
--- a/Editor/cryassetdb_mysql.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-CREATE DATABASE IF NOT EXISTS `CryAssetDB`;
-
-USE `CryAssetDB`;
-
-CREATE TABLE `categories` (
-  `category_id` int(10) NOT NULL auto_increment,
-  `category` varchar(255) UNIQUE NOT NULL,
-  `order_id` int(10) NOT NULL,
-  PRIMARY KEY  (`category_id`)
-);
-
-CREATE TABLE IF NOT EXISTS `tags` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `tag` varchar(64) NOT NULL,
-  `category_id` int(10) default NULL,
-  PRIMARY KEY (`id`),
-  KEY `FK_tags_to_category_id` (`category_id`),
-  UNIQUE KEY `tag` (`tag`),
-  CONSTRAINT `FK_tags_to_category_id` FOREIGN KEY (`category_id`) REFERENCES `categories` (`category_id`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS `projects` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(32) NOT NULL COMMENT 'Convenient project name for easy filtering',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `name` (`name`)
-);
-
-CREATE TABLE IF NOT EXISTS `asset_inventory` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `project_id` int(10) unsigned NOT NULL,
-  `relpath` varchar(255) NOT NULL COMMENT 'relpath to the asset',
-  `description` varchar(255) default NULL,
-  PRIMARY KEY  (`id`),
-  KEY `FK_asset_inventory_to_project_id` (`project_id`),
-  CONSTRAINT `FK_asset_inventory_to_project_id` FOREIGN KEY (`project_id`) REFERENCES `projects` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS `asset_tags` (
-  `asset_id` bigint(20) unsigned NOT NULL,
-  `tag_id` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`asset_id`,`tag_id`),
-  KEY `FK_asset_tags_to_asset_id` (`asset_id`),
-  KEY `FK_asset_tags_to_tag_id` (`tag_id`),
-  CONSTRAINT `FK_asset_tags_to_asset_id` FOREIGN KEY (`asset_id`) REFERENCES `asset_inventory` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `FK_asset_tags_to_tag_id` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-)
diff --git a/Editor/cryassetdb_sqlite.sql b/Editor/cryassetdb_sqlite.sql
deleted file mode 100644
index 7d517999f4..0000000000
--- a/Editor/cryassetdb_sqlite.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE TABLE `categories` (
-  `category_id` INTEGER PRIMARY KEY,
-  `category` varchar(255) UNIQUE NOT NULL,
-  `order_id` int(10) NOT NULL,
-  PRIMARY KEY  (`category_id`)
-);
-
-CREATE TABLE IF NOT EXISTS `tags` (
-  `id` INTEGER PRIMARY KEY,
-  `tag` varchar(64) NOT NULL,
-  `category_id` INTEGER NOT NULL,
-  FOREIGN KEY (`category_id`) REFERENCES `categories` (`category_id`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS `projects` (
-  `id` INTEGER PRIMARY KEY,
-  `name` varchar(32) UNIQUE NOT NULL
-);
-
-
-CREATE TABLE IF NOT EXISTS `asset_inventory` (
-  `id` INTEGER PRIMARY KEY,
-  `project_id` INTEGER NOT NULL,
-  `relpath` varchar(255) NOT NULL,
-  `description` varchar(255),
-  FOREIGN KEY (`project_id`) REFERENCES `projects` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS `asset_tags` (
-  `asset_id` INTEGER NOT NULL,
-  `tag_id` INTEGER NOT NULL,
-  PRIMARY KEY (`asset_id`,`tag_id`),
-  FOREIGN KEY (`asset_id`) REFERENCES `asset_inventory` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  FOREIGN KEY (`tag_id`) REFERENCES `tags` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-);
diff --git a/Engine/EngineAssets/Textures/rotrandom.dds b/Engine/EngineAssets/Textures/rotrandom.dds
deleted file mode 100644
index bc1be0f4aa..0000000000
--- a/Engine/EngineAssets/Textures/rotrandom.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19b28d4c7f7ce3aca08d902a56338f956e008892f2693e01d6341a29656f5706
-size 21972
diff --git a/Engine/Libs/FlowNodes/FlownodeBlacklist.xml b/Engine/Libs/FlowNodes/FlownodeBlacklist.xml
deleted file mode 100644
index 36c95af5cb..0000000000
--- a/Engine/Libs/FlowNodes/FlownodeBlacklist.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<FlowNodeBlackList>
-</FlowNodeBlackList>
\ No newline at end of file
diff --git a/Engine/Libs/FlowNodes/Substitutions.xml b/Engine/Libs/FlowNodes/Substitutions.xml
deleted file mode 100644
index 8ff1f7e4e4..0000000000
--- a/Engine/Libs/FlowNodes/Substitutions.xml
+++ /dev/null
@@ -1,636 +0,0 @@
-<Substitutions>
-  <!-- Here you can change and old node class to a new class and also reconnect edges to new ports, by remapping old ports to new ones
-         Optionally you can also remap the value of an old input port to an new one, when the port name has changed
-         Also, you can set the input port values of the new node to reasonable/appropriate values
-    -->
-
-  <!-- EXAMPLE
-    <Node OldClass="Physics:ActionImpulse" NewClass="Physics:ActionImpulse">
-        <InputPort OldName="impulseDirection" NewName="impulse" RemapValue="1"/>
-        <InputPort OldName="Momentum" NewName="angImpulse" RemapValue="1"/>
-    </Node>
-    -->
-  <!-- copy-paste these into the file!  fill in the names!
-    
-    <Node OldClass="" NewClass="">
-     <InputPort OldName="" NewName="" />
-     <OutputPort OldName="" NewName="" />
-    </Node>
-    
-    -->
-
-
-  <!-- Gameplay event NODES -->
-  <Node OldClass="ComponentEntity:GameplayEventHandler:Float" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  <Node OldClass="ComponentEntity:GameplayEventHandler:String" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  <Node OldClass="ComponentEntity:GameplayEventHandler:Vector3" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  <Node OldClass="ComponentEntity:GameplayEventHandler:EntityId" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  <Node OldClass="ComponentEntity:EventActionHandler:Float" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  <Node OldClass="ComponentEntity:EventActionHandler:String" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  <Node OldClass="ComponentEntity:EventActionHandler:Vector3" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  <Node OldClass="ComponentEntity:EventActionHandler:EntityId" NewClass="ComponentEntity:GameplayEventHandler">
-    <OutputPort OldName="Success" NewName="OnEventBegin" />
-    <OutputPort OldName="Failure" NewName="OnEventEnd" />
-  </Node>
-  
-  <Node OldClass="ComponentEntity:GameplayEventSender:Float" NewClass="ComponentEntity:GameplayEventSender">
-    <InputPort OldName="Activate" NewName="Activate" />
-    <InputPort OldName="ChannelId" NewName="ChannelId" />
-    <InputPort OldName="SendEventValue" NewName="SendEventValue" />
-    <InputPort OldName="EventName" NewName="EventName" />
-  </Node>
-  <Node OldClass="ComponentEntity:GameplayEventSender:String" NewClass="ComponentEntity:GameplayEventSender">
-    <InputPort OldName="Activate" NewName="Activate" />
-    <InputPort OldName="ChannelId" NewName="ChannelId" />
-    <InputPort OldName="SendEventValue" NewName="SendEventValue" />
-    <InputPort OldName="EventName" NewName="EventName" />
-  </Node>
-  <Node OldClass="ComponentEntity:GameplayEventSender:Vector3" NewClass="ComponentEntity:GameplayEventSender">
-    <InputPort OldName="Activate" NewName="Activate" />
-    <InputPort OldName="ChannelId" NewName="ChannelId" />
-    <InputPort OldName="SendEventValue" NewName="SendEventValue" />
-    <InputPort OldName="EventName" NewName="EventName" />
-  </Node>
-  <Node OldClass="ComponentEntity:GameplayEventSender:EntityId" NewClass="ComponentEntity:GameplayEventSender">
-    <InputPort OldName="Activate" NewName="Activate" />
-    <InputPort OldName="ChannelId" NewName="ChannelId" />
-    <InputPort OldName="SendEventValue" NewName="SendEventValue" />
-    <InputPort OldName="EventName" NewName="EventName" />
-  </Node>
-  
-  <!-- IMAGE NODES -->
-  <Node OldClass="Image:ColorCorrection" NewClass="Image:ColorCorrection">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectFrost" NewClass="Image:EffectFrost">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectCondensation" NewClass="Image:EffectCondensation">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectWaterDroplets" NewClass="Image:EffectWaterDroplets">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectWaterFlow" NewClass="Image:EffectWaterFlow">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectBloodSplats" NewClass="Image:EffectBloodSplats">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectGhosting" NewClass="Image:EffectGhosting">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectDepthOfField" NewClass="Image:EffectDepthOfField">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectVolumetricScattering" NewClass="Image:EffectVolumetricScattering">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectAlienInterference" NewClass="Image:EffectAlienInterference">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:EffectRainDrops" NewClass="Image:EffectRainDrops">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:FilterBlur" NewClass="Image:FilterBlur">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:FilterRadialBlur" NewClass="Image:FilterRadialBlur">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:FilterSharpen" NewClass="Image:FilterSharpen">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:FilterChromaShift" NewClass="Image:FilterChromaShift">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:FilterGrain" NewClass="Image:FilterGrain">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:FilterDirectionalBlur" NewClass="Image:FilterDirectionalBlur">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:FilterVisualArtifacts" NewClass="Image:FilterVisualArtifacts">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Image:3DHudInterference" NewClass="Image:3DHudInterference">
-    <InputPort OldName="Enabled" NewName="Enable" />
-    <InputPort OldName="Disabled" NewName="Disable" />
-  </Node>
-
-  <!-- INTERPOL NODES -->
-
-  <Node OldClass="Interpol:Int" NewClass="Interpolate:Int" />
-
-  <Node OldClass="Interpol:Float" NewClass="Interpolate:Float" />
-
-  <Node OldClass="Interpol:Vec3" NewClass="Interpolate:Vec3" />
-
-  <Node OldClass="Interpol:Color" NewClass="Interpolate:Color" />
-
-  <Node OldClass="Interpol:SmoothInt" NewClass="Interpolate:SmoothInt">
-    <InputPort OldName="Value" NewName="TargetValue" />
-  </Node>
-
-  <Node OldClass="Interpol:SmoothFloat" NewClass="Interpolate:SmoothFloat">
-    <InputPort OldName="Value" NewName="TargetValue" />
-  </Node>
-
-  <Node OldClass="Interpol:SmoothVec3" NewClass="Interpolate:SmoothVec3">
-    <InputPort OldName="Value" NewName="TargetValue" />
-  </Node>
-
-  <Node OldClass="Interpol:SmoothColor" NewClass="Interpolate:SmoothColor">
-    <InputPort OldName="Value" NewName="TargetValue" />
-  </Node>
-
-
-  <!-- ITERATOR NODES -->
-
-  <Node OldClass="Iterator:GetEntitiesInSphere" NewClass="Iterator:GetEntitiesInSphere">
-    <InputPort OldName="Start" NewName="Activate" />
-    <InputPort OldName="Range" NewName="Radius" />
-    <OutputPort OldName="Entity" NewName="OutEntityId" />
-  </Node>
-
-  <Node OldClass="Iterator:GetEntitiesInBox" NewClass="Iterator:GetEntitiesInBox">
-    <InputPort OldName="Start" NewName="Activate" />
-    <OutputPort OldName="Entity" NewName="OutEntityId" />
-  </Node>
-
-  <Node OldClass="Iterator:GetEntitiesInArea" NewClass="Iterator:GetEntitiesInArea">
-    <InputPort OldName="Start" NewName="Activate" />
-    <OutputPort OldName="Entity" NewName="OutEntityId" />
-  </Node>
-
-  <Node OldClass="Iterator:GetEntities" NewClass="Iterator:GetEntities">
-    <InputPort OldName="Start" NewName="Activate" />
-    <OutputPort OldName="Entity" NewName="OutEntityId" />
-  </Node>
-
-  <!-- INPUT NODES -->
-
-  <Node OldClass="Input:Action" NewClass="Input:ActionListener" />
-
-  <Node OldClass="Input:MouseCoords" NewClass="Input:MouseCoords">
-    <OutputPort OldName="World" NewName="WorldPosition" />
-  </Node>
-
-  <Node OldClass="Input:MultiTouchCoordsFiltered" NewClass="Input:MultiTouchCoordsFiltered">
-    <InputPort OldName="fingerIdFilter" NewName="FingerIdFilter" />
-  </Node>
-
-  <Node OldClass="Iterator:GetEntitiesInSphere" NewClass="Iterator:GetEntitiesInSphere">
-    <InputPort OldName="Range" NewName="Radius" />
-    <OutputPort Entity="World" NewName="OutEntityId" />
-  </Node>
-
-  <Node OldClass="Iterator:GetEntitiesInBox" NewClass="Iterator:GetEntitiesInBox">
-    <OutputPort Entity="World" NewName="OutEntityId" />
-  </Node>
-
-  <Node OldClass="Iterator:GetEntitiesInArea" NewClass="Iterator:GetEntitiesInArea">
-    <OutputPort Entity="World" NewName="OutEntityId" />
-  </Node>
-
-  <Node OldClass="Iterator:GetEntities" NewClass="Iterator:GetEntities">
-    <OutputPort Entity="World" NewName="OutEntityId" />
-  </Node>
-
-  <!-- LOGIC NODES -->
-
-  <Node OldClass="Logic:Condition" NewClass="Logic:IfCondition" />
-
-  <Node OldClass="Logic:ConditionInverse" NewClass="Logic:SelectCondition">
-    <InputPort OldName="True" NewName="InTrue" />
-    <InputPort OldName="False" NewName="InFalse" />
-  </Node>
-
-  <Node OldClass="Logic:AND" NewClass="Logic:AND">
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Logic:OR" NewClass="Logic:OR">
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Logic:XOR" NewClass="Logic:XOR">
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Logic:NOT" NewClass="Logic:NOT"/>
-
-  <Node OldClass="Logic:Any" NewClass="Logic:Any">
-    <InputPort OldName="in10" NewName="In0" />
-  </Node>
-
-  <Node OldClass="Logic:All" NewClass="Logic:All"/>
-
-  <Node OldClass="Logic:Once" NewClass="Logic:Once">
-    <InputPort OldName="Input1" NewName="In0" />
-    <InputPort OldName="Input2" NewName="In1" />
-    <InputPort OldName="Input3" NewName="In2" />
-    <InputPort OldName="Input4" NewName="In3" />
-    <InputPort OldName="Input5" NewName="In4" />
-    <InputPort OldName="Input6" NewName="In5" />
-  </Node>
-
-  <Node OldClass="Logic:NoSerializeOnce" NewClass="Logic:OnceNoSerialize">
-    <InputPort OldName="Input1" NewName="In" />
-  </Node>
-
-  <Node OldClass="Logic:RandomSelect" NewClass="Logic:RandomSelect">
-    <InputPort OldName="outMin" NewName="MinOut" />
-    <InputPort OldName="outMax" NewName="MaxOut" />
-    <OutputPort OldName="Out10" NewName="Out0" />
-    <!-- This full renaming causes an issue because many of the new names are
-          the same as the old names, so substitution happens repeatedly with
-          undesired results.
-     <OutputPort OldName="Out1" NewName="Out0" />
-     <OutputPort OldName="Out2" NewName="Out1" />
-     <OutputPort OldName="Out3" NewName="Out2" />
-     <OutputPort OldName="Out4" NewName="Out3" />
-     <OutputPort OldName="Out5" NewName="Out4" />
-     <OutputPort OldName="Out6" NewName="Out5" />
-     <OutputPort OldName="Out7" NewName="Out6" />
-     <OutputPort OldName="Out8" NewName="Out7" />
-     <OutputPort OldName="Out9" NewName="Out8" />
-     <OutputPort OldName="Out10" NewName="Out9" />
-     -->
-  </Node>
-
-  <Node OldClass="Logic:RandomTrigger" NewClass="Logic:RandomTrigger">
-    <OutputPort OldName="Out10" NewName="Out0" />
-  </Node>
-
-  <Node OldClass="Logic:Sequentializer" NewClass="Logic:Sequencer">
-    <OutputPort OldName="Out10" NewName="Out0" />
-  </Node>
-
-  <Node OldClass="Logic:Indexer" NewClass="Logic:Indexer">
-    <InputPort OldName="Port1" NewName="In0" />
-    <InputPort OldName="Port2" NewName="In1" />
-    <InputPort OldName="Port3" NewName="In2" />
-    <InputPort OldName="Port4" NewName="In3" />
-    <InputPort OldName="Port5" NewName="In4" />
-    <InputPort OldName="Port6" NewName="In5" />
-    <InputPort OldName="Port7" NewName="In6" />
-    <InputPort OldName="Port8" NewName="In7" />
-    <OutputPort OldName="out" NewName="OutIndex" />
-  </Node>
-
-  <Node OldClass="Logic:Multiplexer" NewClass="Logic:Multiplexer">
-    <InputPort OldName="Port0" NewName="In0" />
-    <InputPort OldName="Port1" NewName="In1" />
-    <InputPort OldName="Port2" NewName="In2" />
-    <InputPort OldName="Port3" NewName="In3" />
-    <InputPort OldName="Port4" NewName="In4" />
-    <InputPort OldName="Port5" NewName="In5" />
-    <InputPort OldName="Port6" NewName="In6" />
-    <InputPort OldName="Port7" NewName="In7" />
-  </Node>
-
-  <Node OldClass="Logic:DeMultiplexer" NewClass="Logic:DeMultiplexer">
-    <InputPort OldName="Input" NewName="In" />
-    <OutputPort OldName="Port0" NewName="Out0" />
-    <OutputPort OldName="Port1" NewName="Out1" />
-    <OutputPort OldName="Port2" NewName="Out2" />
-    <OutputPort OldName="Port3" NewName="Out3" />
-    <OutputPort OldName="Port4" NewName="Out4" />
-    <OutputPort OldName="Port5" NewName="Out5" />
-    <OutputPort OldName="Port6" NewName="Out6" />
-    <OutputPort OldName="Port7" NewName="Out7" />
-  </Node>
-
-  <!-- MATERIAL NODES -->
-
-  <Node OldClass="Material:EntityMaterialChange" NewClass="Material:EntityMaterialChange">
-    <InputPort OldName="mat_Material" NewName="mat_MaterialName" />
-    <InputPort OldName="Set" NewName="Activate" />
-    <InputPort OldName="Serialize" NewName="SerializeChanges" />
-  </Node>
-
-  <Node OldClass="Material:MaterialParams" NewClass="Material:MaterialParams">
-    <InputPort OldName="Get" NewName="Activate" />
-    <InputPort OldName="mat_Material" NewName="mat_MaterialName" />
-    <InputPort OldName="Serialize" NewName="SerializeChanges" />
-    <OutputPort OldName="ValueFloat" NewName="FloatValue" />
-    <OutputPort OldName="ValueColor" NewName="ColorValue" />
-  </Node>
-
-  <Node OldClass="Material:EntityMaterialParams" NewClass="Material:EntityMaterialParams">
-    <InputPort OldName="Get" NewName="Activate" />
-    <OutputPort OldName="ValueFloat" NewName="FloatValue" />
-    <OutputPort OldName="ValueColor" NewName="ColorValue" />
-  </Node>
-
-  <Node OldClass="Material:MaterialClone" NewClass="Material:MaterialClone">
-    <InputPort OldName="Clone" NewName="Activate" />
-    <OutputPort OldName="Cloned" NewName="OnCloned" />
-    <OutputPort OldName="Reset" NewName="OnReset" />
-  </Node>
-
-  <Node OldClass="Engine:SetObjectMaterial" NewClass="Material:SetObjectMaterial" />
-
-  <!-- MATH NODES -->
-
-  <Node OldClass="Math:SetNumber" NewClass="Math:SetNumber">
-    <InputPort OldName="set" NewName="Activate" />
-  </Node>
-
-  <Node OldClass="Vec3:ToVec3" NewClass="Vec3:ToVec3">
-    <OutputPort OldName="vec3" NewName="Result" />
-  </Node>
-
-  <Node OldClass="Math:Calculate" NewClass="Math:Calculate">
-    <InputPort OldName="DoCalc" NewName="Activate" />
-    <InputPort OldName="Op" NewName="Operation" />
-  </Node>
-
-  <Node OldClass="Vec3:Calculate" NewClass="Vec3:Calculate">
-    <InputPort OldName="DoCalc" NewName="Activate" />
-    <InputPort OldName="Op" NewName="Operator" />
-  </Node>
-
-  <Node OldClass="Vec3:NormalizeVec3" NewClass="Vec3:NormalizeVec3">
-    <OutputPort OldName="lenght" NewName="Length" />
-  </Node>
-
-  <Node OldClass="Math:InRange" NewClass="Math:InRange">
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Math:Equal" NewClass="Math:Equal">
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Math:Less" NewClass="Math:Less">
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Math:Select2" NewClass="Math:EvenOrOdd">
-    <OutputPort OldName="one" NewName="Odd" />
-    <OutputPort OldName="two" NewName="Even" />
-  </Node>
-
-  <Node OldClass="Math:SetNumber" NewClass="Math:SetNumber">
-    <InputPort OldName="set" NewName="Activate" />
-  </Node>
-
-  <Node OldClass="Math:UpDownCounter" NewClass="Math:UpDownCounter">
-    <InputPort OldName="HighLimit" NewName="Max" />
-    <InputPort OldName="LowLimit" NewName="Min" />
-    <InputPort OldName="Dec" NewName="Decrement" />
-    <InputPort OldName="Inc" NewName="Increment" />
-    <InputPort OldName="out" NewName="Out" />
-  </Node>
-
-  <Node OldClass="Math:Ceil" NewClass="Math:Ceil">
-    <InputPort OldName="A" NewName="In" />
-  </Node>
-
-  <Node OldClass="Math:Mod" NewClass="Math:Mod">
-    <OutputPort OldName="out" NewName="Result" />
-  </Node>
-
-  <Node OldClass="Math:Floor" NewClass="Math:Floor">
-    <InputPort OldName="A" NewName="In" />
-  </Node>
-
-  <Node OldClass="Math:Sinus" NewClass="Math:Sine" />
-  <Node OldClass="Math:Cosinus" NewClass="Math:Cosine" />
-  <Node OldClass="Math:SinusInverse" NewClass="Math:ArcSin" />
-  <Node OldClass="Math:CosinusInverse" NewClass="Math:ArcCos" />
-  <Node OldClass="Math:TangentInverse" NewClass="Math:ArcTan" />
-
-  <Node OldClass="Math:Round" NewClass="Math:Round">
-    <OutputPort OldName="outRounded" NewName="OutRounded" />
-  </Node>
-
-  <Node OldClass="Math:InRange" NewClass="Math:InRange">
-    <OutputPort OldName="out" NewName="Out" />
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Math:EqualCheck" NewClass="Math:Equal">
-    <InputPort OldName="Check" NewName="Activate" />
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Math:LessCheck" NewClass="Math:Less">
-    <InputPort OldName="Check" NewName="Activate" />
-    <OutputPort OldName="true" NewName="OnTrue" />
-    <OutputPort OldName="false" NewName="OnFalse" />
-  </Node>
-
-  <!-- MOVEMENT NODES -->
-
-  <Node OldClass="Movement:RotateEntityToEx" NewClass="Movement:RotateEntityTo" />
-
-  <Node OldClass="Movement:RotateEntityTo" NewClass="Movement:RotateEntityTo">
-    <OutputPort OldName="Current" NewName="CurrentDeg" />
-    <OutputPort OldName="Start" NewName="OnStart" />
-    <OutputPort OldName="Stop" NewName="OnStop" />
-  </Node>
-
-  <Node OldClass="Movement:RotateEntity" NewClass="Movement:RotateEntity">
-    <InputPort OldName="Speed" NewName="Velocity" />
-    <InputPort OldName="paused" NewName="Disable" />
-  </Node>
-
-  <Node OldClass="Movement:MoveEntityTo" NewClass="Movement:MoveEntityTo">
-    <InputPort OldName="DynamicUpdate" NewName="DynamicDestination" />
-    <InputPort OldName="Speed" NewName="Value" />
-    <InputPort OldName="EaseDistance" NewName="EaseInDistance" />
-    <OutputPort OldName="Start" NewName="OnStart" />
-    <OutputPort OldName="Stop" NewName="OnStop" />
-  </Node>
-
-  <!-- MISSION NODES -->
-
-  <Node OldClass="Mission:ModifyToken" NewClass="Mission:GameTokenModify">
-    <InputPort OldName="Trigger" NewName="Activate" />
-    <InputPort OldName="Op" NewName="Operation" />
-    <InputPort OldName="Type" NewName="TokenType" />
-    <InputPort OldName="Value" NewName="OtherValue" />
-    <OutputPort OldName="OutValue" NewName="Result" />
-  </Node>
-
-  <Node OldClass="Mission:SetGameToken" NewClass="Mission:GameTokenSet">
-    <InputPort OldName="Trigger" NewName="Activate" />
-    <InputPort OldName="Value" NewName="TokenValue" />
-  </Node>
-
-  <Node OldClass="Mission:GameTokenSet" NewClass="Mission:GameTokenSet">
-    <InputPort OldName="Trigger" NewName="Activate" />
-  </Node>
-
-  <Node OldClass="Mission:GetGameToken" NewClass="Mission:GameTokenGet">
-    <InputPort OldName="Trigger" NewName="Activate" />
-  </Node>
-
-  <Node OldClass="Mission:CheckGameToken" NewClass="Mission:GameTokenCheck">
-    <InputPort OldName="Trigger" NewName="Activate" />
-    <InputPort OldName="CheckValue" NewName="CompareValue" />
-    <OutputPort OldName="OutValue" NewName="TokenValue" />
-    <OutputPort OldName="True" NewName="OnTrue" />
-    <OutputPort OldName="False" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Mission:GameTokenCheck" NewClass="Mission:GameTokenCheck">
-    <InputPort OldName="Trigger" NewName="Activate" />
-    <OutputPort OldName="False" NewName="OnFalse" />
-    <OutputPort OldName="True" NewName="OnTrue" />
-  </Node>
-
-  <Node OldClass="Mission:GameTokenCheckMulti" NewClass="Mission:GameTokenCheckMulti">
-    <InputPort OldName="Trigger" NewName="Activate" />
-    <OutputPort OldName="OutValue" NewName="TokenValue" />
-    <OutputPort OldName="One_True" NewName="OneTrue" />
-    <OutputPort OldName="All_False" NewName="AllFalse" />
-  </Node>
-
-  <Node OldClass="Mission:GameToken" NewClass="Mission:GameToken">
-    <InputPort OldName="compare_Value" NewName="CompareValue" />
-    <OutputPort OldName="Out" NewName="TokenValue" />
-    <OutputPort OldName="Equal True" NewName="OnTrue" />
-    <OutputPort OldName="Equal False" NewName="OnFalse" />
-  </Node>
-
-  <Node OldClass="Mission:GameTokensLevelToLevelStore" NewClass="Mission:GameTokensLevelToLevelStore">
-    <InputPort OldName="Trigger" NewName="Activate" />
-  </Node>
-
-  <Node OldClass="Mission:GameTokensLevelToLevelRestore" NewClass="Mission:GameTokensLevelToLevelRestore">
-    <InputPort OldName="Trigger" NewName="Activate" />
-  </Node>
-
-  <!-- PHYSICS NODES -->
-
-  <Node OldClass="Physics:Dynamics" NewClass="Physics:Dynamics">
-    <InputPort OldName="active" NewName="Enable" />
-    <OutputPort OldName="v" NewName="Velocity" />
-    <OutputPort OldName="a" NewName="Acceleration" />
-    <OutputPort OldName="w" NewName="AngularVelocity" />
-    <OutputPort OldName="wa" NewName="AngularAcceleration" />
-    <OutputPort OldName="m" NewName="Mass" />
-  </Node>
-
-  <Node OldClass="Physics:PhysicsSleepQuery" NewClass="Physics:PhysicsSleepQuery">
-    <OutputPort OldName="sleep" NewName="OnSleep" />
-    <OutputPort OldName="awake" NewName="OnAwake" />
-  </Node>
-
-  <Node OldClass="Physics:ActionImpulse" NewClass="Physics:ActionImpulse">
-    <InputPort OldName="angImpulse" NewName="AngularImpulse" />
-    <InputPort OldName="CoordSys" NewName="CoordSystem" />
-  </Node>
-
-  <Node OldClass="Physics:RayCast" NewClass="Physics:RayCast">
-    <InputPort OldName="go" NewName="Activate" />
-    <InputPort OldName="transformDir" NewName="TransformDirection" />
-    <OutputPort OldName="direction" NewName="RayDirection" />
-    <OutputPort OldName="distance" NewName="HitDistance" />
-    <OutputPort OldName="normal" NewName="HitNormal" />
-    <OutputPort OldName="surfacetype" NewName="HitSurfaceType" />
-    <OutputPort OldName="entity" NewName="HitEntity" />
-  </Node>
-
-  <Node OldClass="Physics:RayCastCamera" NewClass="Physics:RayCastCamera">
-    <InputPort OldName="go" NewName="Activate" />
-    <InputPort OldName="offset" NewName="PositionOffset" />
-    <OutputPort OldName="direction" NewName="RayDirection" />
-    <OutputPort OldName="distance" NewName="HitDistance" />
-    <OutputPort OldName="normal" NewName="HitNormal" />
-    <OutputPort OldName="surfacetype" NewName="HitSurfaceType" />
-    <OutputPort OldName="entity" NewName="HitEntity" />
-  </Node>
-
-  <Node OldClass="Physics:PhysicsEnable" NewClass="Physics:PhysicsEnable">
-    <InputPort OldName="Enable" NewName="EnablePhysics" />
-    <InputPort OldName="Disable" NewName="DisablePhysics" />
-    <InputPort OldName="AI_Enable" NewName="EnableAI" />
-    <InputPort OldName="AI_Disable" NewName="DisableAI" />
-  </Node>
-
-  <!-- Vector Nodes -->
-
-  <Node OldClass="Vec3:Calculate" NewClass="Vec3:Calculate">
-    <InputPort OldName="DoCalc" NewName="Activate" />
-    <InputPort OldName="Op" NewName="Operator" />
-    <OutputPort OldName="out" NewName="Out" />
-  </Node>
-
-  <Node OldClass="Vec3:NormalizeVec3" NewClass="Vec3:NormalizeVec3">
-    <InputPort OldName="lenght" NewName="length" />
-  </Node>
-  
-  <!-- VR Nodes -->
-  <Node OldClass="VR:SetTrackignLevel" NewClass="VR:SetTrackingLevel" />
-
-</Substitutions>
\ No newline at end of file
diff --git a/Engine/Registry/Platform/Windows/streamer.game.setreg b/Engine/Registry/Platform/Windows/streamer.game.setreg
deleted file mode 100644
index f45f009b03..0000000000
--- a/Engine/Registry/Platform/Windows/streamer.game.setreg
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    "Amazon":
-    {
-        "AzCore":
-        {
-            "Streamer":
-            {
-                "UseAllHardware": false,
-                "Profiles":
-                {
-                    "Generic":
-                    {
-                        "Stack":
-                        [
-                            {
-                                "$type": "AZ::IO::WindowsStorageDriveConfig",
-                                // The maximum number of file handles that are cached. Only a small number are needed when running from 
-                                // archives, but it's recommended that a larger number are kept open when reading from loose files.
-                                "MaxFileHandles": 32,
-                                // The maximum number of files to keep meta data, such as the file size, to cache. Only a small number are 
-                                // needed when running from archives, but it's recommended that a larger number are kept open when reading 
-                                // from loose files.
-                                "MaxMetaDataCache": 32,
-                                // The number of additional slots that will be reported as available. This makes sure that there are always
-                                // a few requests pending to avoid starvation. An over-commit that is too large can negatively impact the 
-                                // scheduler's ability to re-order requests for optimal read order. A negative value will under-commit and
-                                // will avoid saturating the IO controller which can be needed if the drive is used by other applications.
-                                "Overcommit": 8,
-                                // Globally enable file sharing. This allows files to used outside AZ::IO::Streamer, including other 
-                                // applications while in use by AZ::IO::Streamer. File sharing can negatively impact performance and is 
-                                // recommended for development only. 
-                                "EnableFileSharing": false,
-                                // Use unbuffered reads for the fastest possible read speeds by bypassing the Windows file cache. This 
-                                // results in a faster read the first time a file is read, but subsequent reads will possibly be slower as
-                                // those could have been serviced from the faster OS cache. During development or for games that reread 
-                                // files frequently it's recommended to set this option to false, but generally it's best to be turned on.
-                                "EnableUnbufferedReads": true,
-                                // If true, only information that's explicitly requested or issues are reported. If false, status information
-                                // such as when drives are created and destroyed is reported as well.
-                                "MinimalReporting": false
-                            },
-                            {
-                                "$type": "AZ::IO::ReadSplitterConfig",
-                                "BufferSizeMib": 6,
-                                "SplitSize": "MaxTransfer",
-                                "AdjustOffset": true,
-                                "SplitAlignedRequests": false
-                            },
-                            {
-                                "$type": "AZ::IO::BlockCacheConfig",
-                                "CacheSizeMib": 10,
-                                "BlockSize": "MaxTransfer"
-                            },
-                            {
-                                "$type": "AZ::IO::DedicatedCacheConfig",
-                                "CacheSizeMib": 2,
-                                "BlockSize": "MemoryAlignment",
-                                "WriteOnlyEpilog": true
-                            },
-                            {
-                                "$type": "AZ::IO::FullFileDecompressorConfig",
-                                "MaxNumReads": 2,
-                                "MaxNumJobs": 2
-                            }
-                        ]
-                    },
-                    "DevMode":
-                    {
-                        "Stack":
-                        [
-                            {
-                                "$type": "AZ::IO::WindowsStorageDriveConfig",
-                                "MaxFileHandles": 1024,
-                                "MaxMetaDataCache": 1024,
-                                "Overcommit": 8,
-                                "EnableFileSharing": false,
-                                "EnableUnbufferedReads": false
-                            },
-                            {
-                                "$type": "AzFramework::RemoteStorageDriveConfig",
-                                "MaxFileHandles": 1024 
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Engine/Registry/Platform/Windows/streamer.test.setreg b/Engine/Registry/Platform/Windows/streamer.test.setreg
deleted file mode 100644
index a87dc599c8..0000000000
--- a/Engine/Registry/Platform/Windows/streamer.test.setreg
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "Amazon":
-    {
-        "AzCore":
-        {
-            "Streamer":
-            {
-                "ReportHardware": false,
-                "Profiles":
-                {
-                    "Generic":
-                    {
-                        "Stack":
-                        [
-                            {
-                                "$type": "AZ::IO::StorageDriveConfig",
-                                "MaxFileHandles": 1024
-                            },
-                            {
-                                "$type": "AZ::IO::WindowsStorageDriveConfig",
-                                "MaxFileHandles": 1024,
-                                "MaxMetaDataCache": 1024,
-                                "Overcommit": 8,
-                                "EnableFileSharing": false,
-                                "EnableUnbufferedReads": true,
-                                "MinimalReporting": true
-                            },
-                            {
-                                "$type": "AZ::IO::ReadSplitterConfig",
-                                "BufferSizeMib": 10,
-                                "SplitSize": "MaxTransfer",
-                                "AdjustOffset": true,
-                                "SplitAlignedRequests": false
-                            },
-                            {
-                                "$type": "AZ::IO::BlockCacheConfig",
-                                "CacheSizeMib": 10,
-                                "BlockSize": "MaxTransfer"
-                            },
-                            {
-                                "$type": "AZ::IO::DedicatedCacheConfig",
-                                "CacheSizeMib": 10,
-                                "BlockSize": "MemoryAlignment",
-                                "WriteOnlyEpilog": true
-                            },
-                            {
-                                "$type": "AZ::IO::FullFileDecompressorConfig",
-                                "MaxNumReads": 4,
-                                "MaxNumJobs": 4
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt
index cfb646710e..a58b02d1d4 100644
--- a/Gems/AWSCore/Code/CMakeLists.txt
+++ b/Gems/AWSCore/Code/CMakeLists.txt
@@ -70,7 +70,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
         NAME AWSCore.Editor MODULE
         NAMESPACE Gem
-        OUTPUT_SUBDIRECTORY AWSCoreEditorPlugins
         FILES_CMAKE
             awscore_editor_shared_files.cmake
         INCLUDE_DIRECTORIES
@@ -85,6 +84,21 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Gem::AWSCore.Static
                 Gem::AWSCore.Editor.Static
     )
+
+    ly_add_target(
+        NAME AWSCore.ResourceMappingTool MODULE
+        NAMESPACE Gem
+        OUTPUT_SUBDIRECTORY AWSCoreEditorQtBin
+        FILES_CMAKE
+            awscore_resourcemappingtool_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                Include/Private
+        BUILD_DEPENDENCIES
+            PRIVATE
+                Gem::AWSCore.Editor.Static
+    )
+    ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool)
 endif()
 
 ################################################################################
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
index 3994379df9..19f241e368 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
@@ -18,6 +18,11 @@
 
 #include <QMenu>
 
+namespace AzFramework
+{
+    class ProcessWatcher;
+}
+
 namespace AWSCore
 {
     class AWSCoreEditorMenu
@@ -25,7 +30,11 @@ namespace AWSCore
         , AWSCoreEditorRequestBus::Handler
     {
     public:
-        static constexpr const char ResourceMappingToolPath[] = "Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.cmd";
+        static constexpr const char AWSResourceMappingToolReadMeWarningText[] =
+            "Failed to launch Resource Mapping Tool, please follow <a href=\"file:///%s\">README</a> to setup tool before using it.";
+        static constexpr const char AWSResourceMappingToolIsRunningText[] = "Resource Mapping Tool is running...";
+        static constexpr const char AWSResourceMappingToolLogWarningText[] =
+            "Failed to launch Resource Mapping Tool, please check <a href=\"file:///%s\">logs</a> for details.";
         static constexpr const char AWSResourceMappingToolActionText[] = "AWS Resource Mapping Tool...";
         static constexpr const char CredentialConfigurationActionText[] = "Credential Configuration";
         static constexpr const char CredentialConfigurationUrl[] = "https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html";
@@ -40,23 +49,17 @@ namespace AWSCore
         ~AWSCoreEditorMenu();
 
     private:
-        void InitializeEngineRootFolder();
         void InitializeResourceMappingToolAction();
         void InitializeAWSDocActions();
         void InitializeAWSFeatureGemActions();
 
-        void StartResourceMappingProcess();
-
         // AWSCoreEditorRequestBus interface implementation
         void SetAWSClientAuthEnabled() override;
         void SetAWSMetricsEnabled() override;
 
         void SetAWSFeatureActionsEnabled(const AZStd::string actionText);
 
-        AZStd::string m_engineRootFolder;
-
-        AZStd::mutex m_resourceMappingToolMutex;
-        bool m_resourceMappintToolIsRunning;
-        AZStd::thread m_resourceMappingToolThread;
+        // To improve experience, use process watcher to keep track of ongoing tool process
+        AZStd::unique_ptr<AzFramework::ProcessWatcher> m_resourceMappingToolWatcher;
     };
 } // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
new file mode 100644
index 0000000000..c7391fcfc9
--- /dev/null
+++ b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
@@ -0,0 +1,42 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#include <AzCore/std/string/string.h>
+
+#include <QAction>
+
+namespace AWSCore
+{
+    class AWSCoreResourceMappingToolAction
+        : public QAction
+    {
+    public:
+        static constexpr const char ResourceMappingToolDirectoryPath[] = "Gems/AWSCore/Code/Tools/ResourceMappingTool";
+        static constexpr const char EngineWindowsPythonEntryScriptPath[] = "python/python.cmd";
+
+        AWSCoreResourceMappingToolAction(const QString& text);
+
+        AZStd::string GetToolLaunchCommand() const;
+        AZStd::string GetToolLogPath() const;
+        AZStd::string GetToolReadMePath() const;
+
+    private:
+        bool m_isDebug;
+        AZStd::string m_enginePythonEntryPath;
+        AZStd::string m_toolScriptPath;
+        AZStd::string m_toolQtBinDirectoryPath;
+
+        AZStd::string m_toolLogPath;
+        AZStd::string m_toolReadMePath;
+    };
+} // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
index 5d7baf19a1..9d779e3629 100644
--- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
+++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
@@ -75,6 +75,16 @@ namespace AWSCore
     class AWSScriptBehaviorS3
         : public AWSScriptBehaviorBase
     {
+        static constexpr const char AWSScriptBehaviorS3Name[] = "AWSScriptBehaviorS3";
+        static constexpr const char OutputFileIsEmptyErrorMessage[] = "Request validation failed, output file is empty.";
+        static constexpr const char OutputFileMissFullPathErrorMessage[] = "Request validation failed, output file miss full path.";
+        static constexpr const char OutputFileIsDirectoryErrorMessage[] = "Request validation failed, output file is a directory.";
+        static constexpr const char OutputFileDirectoryNotExistErrorMessage[] = "Request validation failed, output file directory doesn't exist.";
+        static constexpr const char OutputFileIsReadOnlyErrorMessage[] = "Request validation failed, output file is read-only.";
+        static constexpr const char BucketNameIsEmptyErrorMessage[] = "Request validation failed, bucket name is empty";
+        static constexpr const char ObjectKeyNameIsEmptyErrorMessage[] = "Request validation failed, object key name is empty.";
+        static constexpr const char RegionNameIsEmptyErrorMessage[] = "Request validation failed, region name is empty.";
+
     public:
         AWS_SCRIPT_BEHAVIOR_DEFINITION(AWSScriptBehaviorS3, "{7F4E956C-7463-4236-B320-C992D36A9C6E}");
 
@@ -87,7 +97,7 @@ namespace AWSCore
     private:
         using S3NotificationFunctionType =  void(AWSScriptBehaviorS3Notifications::*)(const AZStd::string&);
         static bool ValidateGetObjectRequest(S3NotificationFunctionType notificationFunc,
-            const AZStd::string& bucket, const AZStd::string& objectKey, const AZStd::string& region, const AZStd::string& outFile);
+            const AZStd::string& bucket, const AZStd::string& objectKey, const AZStd::string& region, AZStd::string& outFile);
 
         static bool ValidateHeadObjectRequest(S3NotificationFunctionType notificationFunc,
             const AZStd::string& bucket, const AZStd::string& key, const AZStd::string& region);
diff --git a/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp b/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp
new file mode 100644
index 0000000000..794ee6c880
--- /dev/null
+++ b/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp
@@ -0,0 +1,44 @@
+/*
+* All or portions of this file Copyright(c) Amazon.com, Inc.or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#include <AzCore/Module/Module.h>
+#include <AWSCoreEditorSystemComponent.h>
+
+namespace AWSCore
+{
+    class AWSCoreResourceMappingToolModule
+        : public AZ::Module
+    {
+    public:
+        AZ_RTTI(AWSCoreResourceMappingToolModule, "{9D16F400-009C-47FF-A186-E48BEB73D94D}", AZ::Module);
+        AZ_CLASS_ALLOCATOR(AWSCoreResourceMappingToolModule, AZ::SystemAllocator, 0);
+
+        AWSCoreResourceMappingToolModule()
+        {
+            m_descriptors.insert(m_descriptors.end(),
+                {
+                    AWSCoreEditorSystemComponent::CreateDescriptor(),
+                });
+        }
+
+        ~AWSCoreResourceMappingToolModule() override = default;
+
+        AZ::ComponentTypeList GetRequiredSystemComponents() const override
+        {
+            return AZ::ComponentTypeList{azrtti_typeid<AWSCoreEditorSystemComponent>()};
+        }
+    };
+}
+
+// DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
+// The first parameter should be GemName_GemIdLower
+// The second should be the fully qualified name of the class above
+AZ_DECLARE_MODULE_CLASS(Gem_AWSCore_ResourceMappingTool, AWSCore::AWSCoreResourceMappingToolModule)
diff --git a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
index 62ead9ba4a..754cc32751 100644
--- a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
@@ -13,17 +13,20 @@
 #include <AzCore/Debug/Trace.h>
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/Jobs/JobFunction.h>
+#include <AzFramework/Process/ProcessWatcher.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 
 #include <AWSCoreEditor_Traits_Platform.h>
 #include <Editor/UI/AWSCoreEditorMenu.h>
+#include <Editor/UI/AWSCoreResourceMappingToolAction.h>
 
 #include <QAction>
+#include <QApplication>
 #include <QDesktopServices>
 #include <QIcon>
 #include <QList>
+#include <QMessageBox>
 #include <QObject>
-#include <QProcess>
 #include <QString>
 #include <QUrl>
 
@@ -31,15 +34,9 @@ namespace AWSCore
 {
     AWSCoreEditorMenu::AWSCoreEditorMenu(const QString& text)
         : QMenu(text)
-        , m_engineRootFolder("")
-        , m_resourceMappintToolIsRunning(false)
+        , m_resourceMappingToolWatcher(nullptr)
     {
-        InitializeEngineRootFolder();
-
-#ifdef AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED
         InitializeResourceMappingToolAction();
-        this->addSeparator();
-#endif
         InitializeAWSDocActions();
         this->addSeparator();
         InitializeAWSFeatureGemActions();
@@ -50,46 +47,58 @@ namespace AWSCore
     AWSCoreEditorMenu::~AWSCoreEditorMenu()
     {
         AWSCoreEditorRequestBus::Handler::BusDisconnect();
-
-        if (m_resourceMappingToolThread.joinable())
-        {
-            m_resourceMappingToolThread.join();
-        }
-    }
-
-    void AWSCoreEditorMenu::InitializeEngineRootFolder()
-    {
-        auto engineRootFolder = AZ::IO::FileIOBase::GetInstance()->GetAlias("@engroot@");
-        if (!engineRootFolder)
+        if (m_resourceMappingToolWatcher)
         {
-            AZ_Error("AWSCoreEditorMenu", false, "Failed to initialize engine root folder path.");
-        }
-        else
-        {
-            m_engineRootFolder = engineRootFolder;
+            if (m_resourceMappingToolWatcher->IsProcessRunning())
+            {
+                m_resourceMappingToolWatcher->TerminateProcess(AZ::u32(-1));
+            }
+            m_resourceMappingToolWatcher.reset();
         }
+        this->clear();
     }
 
     void AWSCoreEditorMenu::InitializeResourceMappingToolAction()
     {
-        QAction* resourceMappingAction = new QAction(QObject::tr(AWSResourceMappingToolActionText));
-        QObject::connect(resourceMappingAction, &QAction::triggered, this, [this]() {
-            AZStd::lock_guard<AZStd::mutex> lockGuard{m_resourceMappingToolMutex};
-            if (!m_resourceMappintToolIsRunning)
-            {
-                m_resourceMappintToolIsRunning = true;
-                if (m_resourceMappingToolThread.joinable())
+#ifdef AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED
+        AWSCoreResourceMappingToolAction* resourceMappingTool =
+            new AWSCoreResourceMappingToolAction(QObject::tr(AWSResourceMappingToolActionText));
+        QObject::connect(resourceMappingTool, &QAction::triggered, this,
+            [resourceMappingTool, this]() {
+                AZStd::string launchCommand = resourceMappingTool->GetToolLaunchCommand();
+                if (launchCommand.empty())
                 {
-                    m_resourceMappingToolThread.join();
+                    AZStd::string resourceMappingToolReadMePath = resourceMappingTool->GetToolReadMePath();
+                    AZStd::string message = AZStd::string::format(AWSResourceMappingToolReadMeWarningText, resourceMappingToolReadMePath.c_str());
+                    QMessageBox::warning(QApplication::activeWindow(), "Warning", message.c_str(), QMessageBox::Ok);
+                    return;
+                }
+                if (m_resourceMappingToolWatcher && m_resourceMappingToolWatcher->IsProcessRunning())
+                {
+                    QMessageBox::information(QApplication::activeWindow(), "Info", AWSResourceMappingToolIsRunningText, QMessageBox::Ok);
+                    return;
+                }
+                if (m_resourceMappingToolWatcher)
+                {
+                    m_resourceMappingToolWatcher.reset();
+                }
+
+                AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
+                processLaunchInfo.m_commandlineParameters = launchCommand;
+                processLaunchInfo.m_showWindow = false;
+                m_resourceMappingToolWatcher = AZStd::unique_ptr<AzFramework::ProcessWatcher>(
+                    AzFramework::ProcessWatcher::LaunchProcess(processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_NONE));
+
+                if (!m_resourceMappingToolWatcher || !m_resourceMappingToolWatcher->IsProcessRunning())
+                {
+                    AZStd::string resourceMappingToolLogPath = resourceMappingTool->GetToolLogPath();
+                    AZStd::string message = AZStd::string::format(AWSResourceMappingToolLogWarningText, resourceMappingToolLogPath.c_str());
+                    QMessageBox::warning(QApplication::activeWindow(), "Warning", message.c_str(), QMessageBox::Ok);
                 }
-                m_resourceMappingToolThread = AZStd::thread(AZStd::bind(&AWSCoreEditorMenu::StartResourceMappingProcess, this));
-            }
-            else
-            {
-                AZ_Warning("AWSCoreEditorMenu", false, "Resource Mapping Tool is already running...");
-            }
         });
-        this->addAction(resourceMappingAction);
+        this->addAction(resourceMappingTool);
+        this->addSeparator();
+#endif
     }
 
     void AWSCoreEditorMenu::InitializeAWSDocActions()
@@ -124,31 +133,6 @@ namespace AWSCore
         this->addAction(metrics);
     }
 
-    void AWSCoreEditorMenu::StartResourceMappingProcess()
-    {
-        AZStd::string toolScriptPath = AZStd::string::format("%s/%s", m_engineRootFolder.c_str(), ResourceMappingToolPath);
-        AzFramework::StringFunc::Path::Normalize(toolScriptPath);
-        QProcess resourceMappingToolProcess;
-        resourceMappingToolProcess.setProgram("cmd.exe");
-        resourceMappingToolProcess.setArguments({"/C", toolScriptPath.c_str()});
-
-        resourceMappingToolProcess.start();
-        while (!resourceMappingToolProcess.waitForFinished())
-        {
-            if (resourceMappingToolProcess.state() != QProcess::Running)
-            {
-                break;
-            }
-        }
-        if (resourceMappingToolProcess.exitCode() != 0)
-        {
-            AZ_Error("AWSCoreEditorMenu", false,
-                "Failed to launch Resource Mapping Tool, please follow README to setup tool before using it.");
-        }
-        AZStd::lock_guard<AZStd::mutex> lockGuard{m_resourceMappingToolMutex};
-        m_resourceMappintToolIsRunning = false;
-    }
-
     void AWSCoreEditorMenu::SetAWSClientAuthEnabled()
     {
         SetAWSFeatureActionsEnabled(AWSClientAuthActionText);
diff --git a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
new file mode 100644
index 0000000000..fb46a8a700
--- /dev/null
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
@@ -0,0 +1,134 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AzCore/IO/FileIO.h>
+#include <AzCore/Utils/Utils.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#include <Editor/UI/AWSCoreResourceMappingToolAction.h>
+
+namespace AWSCore
+{
+    AWSCoreResourceMappingToolAction::AWSCoreResourceMappingToolAction(const QString& text)
+        : QAction(text)
+        , m_isDebug(false)
+        , m_enginePythonEntryPath("")
+        , m_toolScriptPath("")
+        , m_toolQtBinDirectoryPath("")
+        , m_toolLogPath("")
+        , m_toolReadMePath("")
+    {
+        auto engineRootPath = AZ::IO::FileIOBase::GetInstance()->GetAlias("@engroot@");
+        if (!engineRootPath)
+        {
+            AZ_Error("AWSCoreEditor", false, "Failed to determine engine root path.");
+        }
+        else
+        {
+            m_enginePythonEntryPath = AZStd::string::format("%s/%s", engineRootPath, EngineWindowsPythonEntryScriptPath);
+            AzFramework::StringFunc::Path::Normalize(m_enginePythonEntryPath);
+            if (!AZ::IO::SystemFile::Exists(m_enginePythonEntryPath.c_str()))
+            {
+                AZ_Error("AWSCoreEditor", false, "Failed to find engine python entry at %s.", m_enginePythonEntryPath.c_str());
+                m_enginePythonEntryPath.clear();
+            }
+
+            m_toolScriptPath = AZStd::string::format("%s/%s/resource_mapping_tool.py", engineRootPath, ResourceMappingToolDirectoryPath);
+            AzFramework::StringFunc::Path::Normalize(m_toolScriptPath);
+            if (!AZ::IO::SystemFile::Exists(m_toolScriptPath.c_str()))
+            {
+                AZ_Error("AWSCoreEditor", false, "Failed to find ResourceMappingTool python script at %s.", m_toolScriptPath.c_str());
+                m_toolScriptPath.clear();
+            }
+
+            m_toolLogPath = AZStd::string::format("%s/%s/resource_mapping_tool.log", engineRootPath, ResourceMappingToolDirectoryPath);
+            AzFramework::StringFunc::Path::Normalize(m_toolLogPath);
+            if (!AZ::IO::SystemFile::Exists(m_toolLogPath.c_str()))
+            {
+                AZ_Error("AWSCoreEditor", false, "Failed to find ResourceMappingTool log file at %s.", m_toolLogPath.c_str());
+                m_toolLogPath.clear();
+            }
+
+            m_toolReadMePath = AZStd::string::format("%s/%s/README.md", engineRootPath, ResourceMappingToolDirectoryPath);
+            AzFramework::StringFunc::Path::Normalize(m_toolReadMePath);
+            if (!AZ::IO::SystemFile::Exists(m_toolReadMePath.c_str()))
+            {
+                AZ_Error("AWSCoreEditor", false, "Failed to find ResourceMappingTool README file at %s.", m_toolReadMePath.c_str());
+                m_toolReadMePath.clear();
+            }
+
+            char executablePath[AZ_MAX_PATH_LEN];
+            auto result = AZ::Utils::GetExecutablePath(executablePath, AZ_MAX_PATH_LEN);
+            if (result.m_pathStored != AZ::Utils::ExecutablePathResult::Success)
+            {
+                AZ_Error("AWSCoreEditor", false, "Failed to find engine executable path.");
+            }
+            else
+            {
+                if (result.m_pathIncludesFilename)
+                {
+                    // Remove the file name if it exists, and keep the parent folder only
+                    char* lastSeparatorAddress = strrchr(executablePath, AZ_CORRECT_FILESYSTEM_SEPARATOR);
+                    if (lastSeparatorAddress)
+                    {
+                        *lastSeparatorAddress = '\0';
+                    }
+                }
+            }
+
+            AZStd::string binDirectoryPath(executablePath);
+            auto lastSeparator = binDirectoryPath.find_last_of(AZ_CORRECT_FILESYSTEM_SEPARATOR);
+            if (lastSeparator != AZStd::string::npos)
+            {
+                m_isDebug = binDirectoryPath.substr(lastSeparator).contains("debug");
+            }
+
+            m_toolQtBinDirectoryPath = AZStd::string::format("%s/%s", binDirectoryPath.c_str(), "AWSCoreEditorQtBin");
+            AzFramework::StringFunc::Path::Normalize(m_toolQtBinDirectoryPath);
+            if (!AZ::IO::SystemFile::Exists(m_toolQtBinDirectoryPath.c_str()))
+            {
+                AZ_Error("AWSCoreEditor", false, "Failed to find ResourceMappingTool Qt binaries at %s.", m_toolQtBinDirectoryPath.c_str());
+                m_toolQtBinDirectoryPath.clear();
+            }
+        }
+    }
+
+    AZStd::string AWSCoreResourceMappingToolAction::GetToolLaunchCommand() const
+    {
+        if (m_enginePythonEntryPath.empty() || m_toolScriptPath.empty() || m_toolQtBinDirectoryPath.empty())
+        {
+            return "";
+        }
+        if (m_isDebug)
+        {
+            return AZStd::string::format(
+                "%s debug %s --binaries_path %s --debug",
+                m_enginePythonEntryPath.c_str(), m_toolScriptPath.c_str(), m_toolQtBinDirectoryPath.c_str());
+        }
+        else
+        {
+            return AZStd::string::format(
+                "%s %s --binaries_path %s",
+                m_enginePythonEntryPath.c_str(), m_toolScriptPath.c_str(), m_toolQtBinDirectoryPath.c_str());
+        }
+    }
+
+    AZStd::string AWSCoreResourceMappingToolAction::GetToolLogPath() const
+    {
+        return m_toolLogPath;
+    }
+
+    AZStd::string AWSCoreResourceMappingToolAction::GetToolReadMePath() const
+    {
+        return m_toolReadMePath;
+    }
+} // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp
index 742a6826af..1f529572f1 100644
--- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp
+++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp
@@ -43,7 +43,7 @@ namespace AWSCore
 
     void AWSScriptBehaviorS3::ReflectBehaviors(AZ::BehaviorContext* behaviorContext)
     {
-        behaviorContext->Class<AWSScriptBehaviorS3>("AWSScriptBehaviorS3")
+        behaviorContext->Class<AWSScriptBehaviorS3>(AWSScriptBehaviorS3Name)
             ->Attribute(AZ::Script::Attributes::Category, "AWSCore")
             ->Method("GetObject", &AWSScriptBehaviorS3::GetObject,
                 {{{"Bucket Resource KeyName", "The resource key name of the bucket in resource mapping config file."},
@@ -86,7 +86,9 @@ namespace AWSCore
     void AWSScriptBehaviorS3::GetObjectRaw(
         const AZStd::string& bucket, const AZStd::string& objectKey, const AZStd::string& region, const AZStd::string& outFile)
     {
-        if (!ValidateGetObjectRequest(&AWSScriptBehaviorS3NotificationBus::Events::OnGetObjectError, bucket, objectKey, region, outFile))
+        AZStd::string normalizedOutFile = outFile;
+        if (!ValidateGetObjectRequest(
+                &AWSScriptBehaviorS3NotificationBus::Events::OnGetObjectError, bucket, objectKey, region, normalizedOutFile))
         {
             return;
         }
@@ -112,10 +114,10 @@ namespace AWSCore
 
         job->request.SetBucket(Aws::String(bucket.c_str()));
         job->request.SetKey(Aws::String(objectKey.c_str()));
-        Aws::String outFileName(outFile.c_str());
+        Aws::String outFileName(normalizedOutFile.c_str());
         job->request.SetResponseStreamFactory([outFileName]() {
             return Aws::New<Aws::FStream>(
-                "AWSScriptBehaviorS3", outFileName.c_str(),
+                AWSScriptBehaviorS3Name, outFileName.c_str(),
                 std::ios_base::out | std::ios_base::in | std::ios_base::binary | std::ios_base::trunc);
         });
         job->Start();
@@ -163,20 +165,44 @@ namespace AWSCore
     }
 
     bool AWSScriptBehaviorS3::ValidateGetObjectRequest(S3NotificationFunctionType notificationFunc,
-        const AZStd::string& bucket, const AZStd::string& objectKey, const AZStd::string& region, const AZStd::string& outFile)
+        const AZStd::string& bucket, const AZStd::string& objectKey, const AZStd::string& region, AZStd::string& outFile)
     {
         if (ValidateHeadObjectRequest(notificationFunc, bucket, objectKey, region))
         {
-            if (!AzFramework::StringFunc::Path::IsValid(outFile.c_str()))
+            AzFramework::StringFunc::Path::Normalize(outFile);
+            if (outFile.empty())
             {
-                AZ_Warning("AWSScriptBehaviorS3", false, "Request validation failed, outfile is not valid.");
-                AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, "Request validation failed, outfile is not valid.");
+                AZ_Warning(AWSScriptBehaviorS3Name, false, OutputFileIsEmptyErrorMessage);
+                AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, OutputFileIsEmptyErrorMessage);
                 return false;
             }
+            if (!AzFramework::StringFunc::Path::HasDrive(outFile.c_str()))
+            {
+                AZ_Warning(AWSScriptBehaviorS3Name, false, OutputFileMissFullPathErrorMessage);
+                AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, OutputFileMissFullPathErrorMessage);
+                return false;
+            }
+            if (AZ::IO::FileIOBase::GetInstance()->IsDirectory(outFile.c_str()))
+            {
+                AZ_Warning(AWSScriptBehaviorS3Name, false, OutputFileIsDirectoryErrorMessage);
+                AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, OutputFileIsDirectoryErrorMessage);
+                return false;
+            }
+            auto lastSeparator = outFile.find_last_of(AZ_CORRECT_FILESYSTEM_SEPARATOR);
+            if (lastSeparator != AZStd::string::npos)
+            {
+                auto parentPath = outFile.substr(0, lastSeparator);
+                if (!AZ::IO::FileIOBase::GetInstance()->Exists(parentPath.c_str()))
+                {
+                    AZ_Warning(AWSScriptBehaviorS3Name, false, OutputFileDirectoryNotExistErrorMessage);
+                    AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, OutputFileDirectoryNotExistErrorMessage);
+                    return false;
+                }
+            }
             if (AZ::IO::FileIOBase::GetInstance()->IsReadOnly(outFile.c_str()))
             {
-                AZ_Warning("AWSScriptBehaviorS3", false, "Request validation failed, outfile is read-only.");
-                AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, "Request validation failed, outfile is read-only.");
+                AZ_Warning(AWSScriptBehaviorS3Name, false, OutputFileIsReadOnlyErrorMessage);
+                AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, OutputFileIsReadOnlyErrorMessage);
                 return false;
             }
             return true;
@@ -189,20 +215,20 @@ namespace AWSCore
     {
         if (bucket.empty())
         {
-            AZ_Warning("AWSScriptBehaviorS3", false, "Request validation failed, bucket name is required.");
-            AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, "Request validation failed, bucket name is required.");
+            AZ_Warning(AWSScriptBehaviorS3Name, false, BucketNameIsEmptyErrorMessage);
+            AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, BucketNameIsEmptyErrorMessage);
             return false;
         }
         if (objectKey.empty())
         {
-            AZ_Warning("AWSScriptBehaviorS3", false, "Request validation failed, object key name is required.");
-            AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, "Request validation failed, object key name is required.");
+            AZ_Warning(AWSScriptBehaviorS3Name, false, ObjectKeyNameIsEmptyErrorMessage);
+            AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, ObjectKeyNameIsEmptyErrorMessage);
             return false;
         }
         if (region.empty())
         {
-            AZ_Warning("AWSScriptBehaviorS3", false, "Request validation failed, region name is required.");
-            AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, "Request validation failed, region name is required.");
+            AZ_Warning(AWSScriptBehaviorS3Name, false, RegionNameIsEmptyErrorMessage);
+            AWSScriptBehaviorS3NotificationBus::Broadcast(notificationFunc, RegionNameIsEmptyErrorMessage);
             return false;
         }
         return true;
diff --git a/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp b/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp
index 6d0484c11a..e9c249f1c8 100644
--- a/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp
+++ b/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp
@@ -36,7 +36,6 @@ class AWSCoreEditorSystemComponentTest
         AWSCoreEditorUIFixture::SetUp();
         AWSCoreFixture::SetUp();
 
-        m_localFileIO->SetAlias("@engroot@", "dummy engine root");
         m_serializeContext = AZStd::make_unique<AZ::SerializeContext>();
         m_serializeContext->CreateEditContext();
         m_behaviorContext = AZStd::make_unique<AZ::BehaviorContext>();
@@ -46,7 +45,9 @@ class AWSCoreEditorSystemComponentTest
 
         m_entity = aznew AZ::Entity();
         m_coreEditorSystemsComponent.reset(m_entity->CreateComponent<AWSCoreEditorSystemComponent>());
+        AZ_TEST_START_TRACE_SUPPRESSION;
         m_entity->Init();
+        AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above have thrown an AZ_Error
         m_entity->Activate();
     }
 
diff --git a/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp
index 007fef46df..84efabc0f6 100644
--- a/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp
@@ -27,8 +27,6 @@ class AWSCoreEditorManagerTest
     {
         AWSCoreEditorUIFixture::SetUp();
         AWSCoreFixture::SetUp();
-
-        m_localFileIO->SetAlias("@engroot@", "dummy engine root");
     }
 
     void TearDown() override
@@ -40,6 +38,8 @@ class AWSCoreEditorManagerTest
 
 TEST_F(AWSCoreEditorManagerTest, AWSCoreEditorManager_Constructor_HaveExpectedUIResourcesCreated)
 {
+    AZ_TEST_START_TRACE_SUPPRESSION;
     AWSCoreEditorManager testManager;
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above have thrown an AZ_Error
     EXPECT_TRUE(testManager.GetAWSCoreEditorMenu());
 }
diff --git a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
index 01622a5a92..7a578d2bbe 100644
--- a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
@@ -35,8 +35,6 @@ class AWSCoreEditorMenuTest
     {
         AWSCoreEditorUIFixture::SetUp();
         AWSCoreFixture::SetUp();
-
-        m_localFileIO->SetAlias("@engroot@", "dummy engine root");
     }
 
     void TearDown() override
@@ -48,7 +46,6 @@ class AWSCoreEditorMenuTest
 
 TEST_F(AWSCoreEditorMenuTest, AWSCoreEditorMenu_NoEngineRootFolder_ExpectOneError)
 {
-    m_localFileIO->ClearAlias("@engroot@");
     AZ_TEST_START_TRACE_SUPPRESSION;
     AWSCoreEditorMenu testMenu("dummy title");
     AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above have thrown an AZ_Error
@@ -56,7 +53,9 @@ TEST_F(AWSCoreEditorMenuTest, AWSCoreEditorMenu_NoEngineRootFolder_ExpectOneErro
 
 TEST_F(AWSCoreEditorMenuTest, AWSCoreEditorMenu_GetAllActions_GetExpectedNumberOfActions)
 {
+    AZ_TEST_START_TRACE_SUPPRESSION;
     AWSCoreEditorMenu testMenu("dummy title");
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above have thrown an AZ_Error
 
     QList<QAction*> actualActions = testMenu.actions();
 #ifdef AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED
@@ -68,7 +67,9 @@ TEST_F(AWSCoreEditorMenuTest, AWSCoreEditorMenu_GetAllActions_GetExpectedNumberO
 
 TEST_F(AWSCoreEditorMenuTest, AWSCoreEditorMenu_BroadcastFeatureGemsAreEnabled_CorrespondingActionsAreEnabled)
 {
+    AZ_TEST_START_TRACE_SUPPRESSION;
     AWSCoreEditorMenu testMenu("dummy title");
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above have thrown an AZ_Error
 
     AWSCoreEditorRequestBus::Broadcast(&AWSCoreEditorRequests::SetAWSClientAuthEnabled);
     AWSCoreEditorRequestBus::Broadcast(&AWSCoreEditorRequests::SetAWSMetricsEnabled);
diff --git a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
new file mode 100644
index 0000000000..7efe77bc01
--- /dev/null
+++ b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
@@ -0,0 +1,57 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AzTest/AzTest.h>
+
+#include <Editor/UI/AWSCoreResourceMappingToolAction.h>
+#include <Editor/UI/AWSCoreEditorUIFixture.h>
+#include <TestFramework/AWSCoreFixture.h>
+
+#include <QAction>
+
+using namespace AWSCore;
+
+class AWSCoreResourceMappingToolActionTest
+    : public AWSCoreFixture
+    , public AWSCoreEditorUIFixture
+{
+    void SetUp() override
+    {
+        AWSCoreEditorUIFixture::SetUp();
+        AWSCoreFixture::SetUp();
+        m_localFileIO->SetAlias("@engroot@", "dummy engine root");
+    }
+
+    void TearDown() override
+    {
+        AWSCoreFixture::TearDown();
+        AWSCoreEditorUIFixture::TearDown();
+    }
+};
+
+TEST_F(AWSCoreResourceMappingToolActionTest, AWSCoreResourceMappingToolAction_NoEngineRootFolder_ExpectOneError)
+{
+    m_localFileIO->ClearAlias("@engroot@");
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    AWSCoreResourceMappingToolAction testAction("dummy title");
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // expect the above have thrown an AZ_Error
+}
+
+TEST_F(AWSCoreResourceMappingToolActionTest, AWSCoreResourceMappingToolAction_UnableToFindExpectedFileOrFolder_ExpectFiveErrorsAndEmptyResult)
+{
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    AWSCoreResourceMappingToolAction testAction("dummy title");
+    AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+    EXPECT_TRUE(testAction.GetToolLaunchCommand() == "");
+    EXPECT_TRUE(testAction.GetToolLogPath() == "");
+    EXPECT_TRUE(testAction.GetToolReadMePath() == "");
+}
diff --git a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp
index fe258580e0..3489f09ac3 100644
--- a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp
+++ b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp
@@ -11,6 +11,7 @@
  */
 
 #include <AzCore/RTTI/BehaviorContext.h>
+#include <AzFramework/StringFunc/StringFunc.h>
 #include <AzTest/AzTest.h>
 
 #include <ScriptCanvas/AWSScriptBehaviorS3.h>
@@ -38,7 +39,37 @@ public:
     MOCK_METHOD1(OnGetObjectError, void(const AZStd::string&));
 };
 
-using AWSScriptBehaviorS3Test = UnitTest::ScopedAllocatorSetupFixture;
+class AWSScriptBehaviorS3Test
+    : public AWSCoreFixture
+{
+public:
+    void CreateReadOnlyTestFile(const AZStd::string& filePath)
+    {
+        AZ::IO::SystemFile file;
+        if (!file.Open(
+                filePath.c_str(),
+                AZ::IO::SystemFile::OpenMode::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY))
+        {
+            AZ_Assert(false, "Failed to open test file at %s", filePath.c_str());
+        }
+        AZStd::string testContent = "It is a test file";
+        if (file.Write(testContent.c_str(), testContent.size()) != testContent.size())
+        {
+            AZ_Assert(false, "Failed to write test file with content %s", testContent.c_str());
+        }
+        file.Close();
+        AZ_Assert(AZ::IO::SystemFile::SetWritable(filePath.c_str(), false), "Failed to mark test file as read-only");
+    }
+
+    void RemoveReadOnlyTestFile(const AZStd::string& filePath)
+    {
+        if (!filePath.empty())
+        {
+            AZ_Assert(AZ::IO::SystemFile::SetWritable(filePath.c_str(), true), "Failed to mark test file as writeable");
+            AZ_Assert(AZ::IO::SystemFile::Delete(filePath.c_str()), "Failed to delete test config file at %s", filePath.c_str());
+        }
+    }
+};
 
 TEST_F(AWSScriptBehaviorS3Test, HeadObjectRaw_CallWithEmptyBucketName_InvokeOnError)
 {
@@ -96,6 +127,40 @@ TEST_F(AWSScriptBehaviorS3Test, GetObjectRaw_CallWithEmptyOutfileName_InvokeOnEr
     AWSScriptBehaviorS3::GetObjectRaw("dummyBucket", "dummyObject", "dummyRegion", "");
 }
 
+TEST_F(AWSScriptBehaviorS3Test, GetObjectRaw_CallWithOutfileNameMissFullPath_InvokeOnError)
+{
+    AWSScriptBehaviorS3NotificationBusHandlerMock s3HandlerMock;
+    EXPECT_CALL(s3HandlerMock, OnGetObjectError(::testing::_)).Times(1);
+    AWSScriptBehaviorS3::GetObjectRaw("dummyBucket", "dummyObject", "dummyRegion", "dummyOut.txt");
+}
+
+TEST_F(AWSScriptBehaviorS3Test, GetObjectRaw_CallWithOutfileNameIsDirectory_InvokeOnError)
+{
+    AWSScriptBehaviorS3NotificationBusHandlerMock s3HandlerMock;
+    EXPECT_CALL(s3HandlerMock, OnGetObjectError(::testing::_)).Times(1);
+    AWSScriptBehaviorS3::GetObjectRaw("dummyBucket", "dummyObject", "dummyRegion", AZ::Test::GetCurrentExecutablePath());
+}
+
+TEST_F(AWSScriptBehaviorS3Test, GetObjectRaw_CallWithOutfileDirectoryNoExist_InvokeOnError)
+{
+    AWSScriptBehaviorS3NotificationBusHandlerMock s3HandlerMock;
+    EXPECT_CALL(s3HandlerMock, OnGetObjectError(::testing::_)).Times(1);
+    AZStd::string dummyDirectory = AZStd::string::format("%s/dummyDirectory/dummyOut.txt", AZ::Test::GetCurrentExecutablePath().c_str());
+    AWSScriptBehaviorS3::GetObjectRaw("dummyBucket", "dummyObject", "dummyRegion", dummyDirectory);
+}
+
+TEST_F(AWSScriptBehaviorS3Test, GetObjectRaw_CallWithOutfileIsReadOnly_InvokeOnError)
+{
+    AWSScriptBehaviorS3NotificationBusHandlerMock s3HandlerMock;
+    EXPECT_CALL(s3HandlerMock, OnGetObjectError(::testing::_)).Times(1);
+    AZStd::string randomTestFile = AZStd::string::format("%s/test%s.txt",
+        AZ::Test::GetCurrentExecutablePath().c_str(), AZ::Uuid::CreateRandom().ToString<AZStd::string>(false, false).c_str());
+    AzFramework::StringFunc::Path::Normalize(randomTestFile);
+    CreateReadOnlyTestFile(randomTestFile);
+    AWSScriptBehaviorS3::GetObjectRaw("dummyBucket", "dummyObject", "dummyRegion", randomTestFile);
+    RemoveReadOnlyTestFile(randomTestFile);
+}
+
 TEST_F(AWSScriptBehaviorS3Test, GetObject_NoBucketNameInResourceMappingFound_InvokeOnError)
 {
     AWSScriptBehaviorS3NotificationBusHandlerMock s3HandlerMock;
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md
index d90f78465b..78a8856288 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md
@@ -3,45 +3,44 @@
 
 ## Setup aws config and credential
 Resource mapping tool is using boto3 to interact with aws services:
- * Follow boto3
+ * Read boto3
    [Configuration](https://boto3.amazonaws.com/v1/documentation/api/latest/guide/configuration.html) to setup default aws region.
- * Follow boto3
+ * Read boto3
    [Credentials](https://boto3.amazonaws.com/v1/documentation/api/latest/guide/credentials.html) to setup default profile or credential keys.
 
 Or follow **AWS CLI** configuration which can be reused by boto3 lib:
  * Follow
    [Quick configuration with aws configure](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-quickstart.html#cli-configure-quickstart-config)
 
-**In Progress** - Override default aws profile in resource mapping tool
-
 ## Python Environment Setup Options
-### 1. Engine python environment
-In order to use engine python environment, it requires to link Qt binaries for this tool.
+### 1. Engine python environment (Including Editor)
+1. In order to use engine python environment, it requires to link Qt binaries for this tool.
 Follow cmake instructions to configure your project, for example:
-
-```
-$ cmake -B <BUILD_FOLDER> -S . -G "Visual Studio 16 2019" -DLY_3RDPARTY_PATH=<PATH_TO_3RDPARTY> -DLY_PROJECTS=<PROJECT_NAME>
-```
-
-Build project with **AWSCore.Editor** target to generate required Qt binaries.
-(Or use **Editor** target)
-
-```
-$ cmake --build <BUILD_FOLDER> --target AWSCore.Editor --config <CONFIG> -j <NUM_JOBS>
-```
-
-Launch resource mapping tool under engine root folder:
-
-#### Windows
-##### release mode
-```
-$ python\python.cmd Gems\AWSCore\Code\Tools\ResourceMappingTool\resource_mapping_tool.py --binaries_path <PATH_TO_BUILD_FOLDER>\bin\profile\AWSCoreEditorPlugins
-```
-##### debug mode
-```
-$ python\python.cmd debug Gems\AWSCore\Code\Tools\ResourceMappingTool\resource_mapping_tool.py --binaries_path <PATH_TO_BUILD_FOLDER>\bin\debug\AWSCoreEditorPlugins
-```
-
+   ```
+   $ cmake -B <BUILD_FOLDER> -S . -G "Visual Studio 16 2019" -DLY_3RDPARTY_PATH=<PATH_TO_3RDPARTY> -DLY_PROJECTS=<PROJECT_NAME>
+   ```
+
+2. At this point, double check engine python environment gets setup under *<ENGINE_ROOT_PATH>/python/runtime* directory
+
+3. Build project with **AWSCore.Editor** (or **AWSCore.ResourceMappintTool**, or **Editor**) target to generate required Qt binaries.
+   ```
+   $ cmake --build <BUILD_FOLDER> --target AWSCore.Editor --config <CONFIG> -j <NUM_JOBS>
+   ```
+
+4. At this point, double check Qt binaries gets generated under *<BUILD_FOLDER>/bin/<CONFIG_FOLDER>/AWSCoreEditorQtBin* directory
+
+5. Launch resource mapping tool under engine root folder:
+   * Windows
+      * release mode
+      ```
+      $ python\python.cmd Gems\AWSCore\Code\Tools\ResourceMappingTool\resource_mapping_tool.py --binaries_path <PATH_TO_BUILD_FOLDER>\bin\profile\AWSCoreEditorQtBin
+      ```
+      * debug mode
+      ```
+      $ python\python.cmd debug Gems\AWSCore\Code\Tools\ResourceMappingTool\resource_mapping_tool.py --binaries_path <PATH_TO_BUILD_FOLDER>\bin\debug\AWSCoreEditorQtBin
+      ```
+* Note - Editor is integrated with the same engine python environment to launch Resource Mapping Tool. If it is failed to launch the tool
+in Editor, please follow above steps to make sure expected scripts/binaries are present.
 
 ### 2. Python virtual environment
 This project is set up like a standard Python project. The initialization
@@ -51,47 +50,42 @@ directory.  To create the virtualenv it assumes that there is a `python3`
 package. If for any reason the automatic creation of the virtualenv fails,
 you can create the virtualenv manually.
 
-To manually create a virtualenv on MacOS and Linux:
-
-```
-$ python -m venv .env
-```
-
-Once the virtualenv is created, you can use the following step to activate your virtualenv.
-
-```
-$ source .env/bin/activate
-```
-
-If you are a Windows platform, you would activate the virtualenv like this:
-
-```
-% .env\Scripts\activate.bat
-```
-
-Once the virtualenv is activated, you can install the required dependencies.
-
-```
-$ pip install -r requirements.txt
-```
-
-#### 2.1 Launch Options
-##### 2.1.1 Launch Resource Mapping Tool from python directly
-At this point you can launch tool like other standard python project.
-
-```
-$ python resource_mapping_tool.py
-```
-
-##### 2.1.2 Launch Resource Mapping Tool from batch script/Editor
-Update `resource_mapping_tool.cmd` with your virtualenv full path.
-
- * **VIRTUALENV_PATH**: Fill this variable with your virtualenv full path.
-
-Then you can launch the resource mapping tool by running the batch script directly.
-
-```
-$ resource_mapping_tool.cmd
-```
-
-Or you can launch the resource mapping tool from menu action Cloud services/AWS Resource Mapping Tool...
+1. To manually create a virtualenv:
+   * Windows
+   ```
+   $ python -m venv .env
+   ```
+   * Mac or Linux
+   ```
+   $ python3 -m venv .env
+   ```
+
+2. Once the virtualenv is created, you can use the following step to activate your virtualenv:
+   * Windows
+   ```
+   % .env\Scripts\activate.bat
+   ```
+   * Mac or Linux
+   ```
+   $ source .env/bin/activate
+   ```
+
+3. Once the virtualenv is activated, you can install the required dependencies:
+   * Windows
+   ```
+   $ pip install -r requirements.txt
+   ```
+   * Mac or Linux
+   ```
+   $ pip3 install -r requirements.txt
+   ```
+
+4. At this point you can launch tool like other standard python project.
+   * Windows
+   ```
+   $ python resource_mapping_tool.py
+   ```
+   * Mac or Linux
+   ```
+   $ python3 resource_mapping_tool.py
+   ```
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.cmd b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.cmd
deleted file mode 100644
index be2f308de7..0000000000
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.cmd
+++ /dev/null
@@ -1,24 +0,0 @@
-@ECHO OFF
-REM 
-REM All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-REM its licensors.
-REM
-REM For complete copyright and license terms please see the LICENSE at the root of this
-REM distribution (the "License"). All use of this software is governed by the License,
-REM or, if provided, by the license below or the license accompanying this file. Do not
-REM remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM
-REM Original file Copyright Crytek GMBH or its affiliates, used under license.
-REM
-
-SETLOCAL
-SET CMD_DIR=%~dp0
-SET CMD_DIR=%CMD_DIR:~0,-1%
-
-SET VIRTUALENV_PATH=
-SET RESOURCE_MAPPING_DIR=%CMD_DIR%
-SET LOCAL_PYTHONPATH=%VIRTUALENV_PATH%\Scripts\python.exe
-
-%LOCAL_PYTHONPATH% %RESOURCE_MAPPING_DIR%\resource_mapping_tool.py %* && exit 0
-exit 1
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
index b067105ce3..90e702b997 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
@@ -19,7 +19,7 @@ from utils import file_utils
 # arguments setup
 argument_parser: ArgumentParser = ArgumentParser()
 argument_parser.add_argument('--binaries_path', help='Path to QT Binaries necessary for PySide.')
-argument_parser.add_argument('--debug', action='store_true', help='Execute on debug mode.')
+argument_parser.add_argument('--debug', action='store_true', help='Execute on debug mode to enable DEBUG logging level')
 arguments: Namespace = argument_parser.parse_args()
 
 # logging setup
diff --git a/Gems/AWSCore/Code/awscore_editor_files.cmake b/Gems/AWSCore/Code/awscore_editor_files.cmake
index b8b9fbbc11..652f0455e1 100644
--- a/Gems/AWSCore/Code/awscore_editor_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_files.cmake
@@ -13,7 +13,9 @@ set(FILES
     Include/Private/AWSCoreEditorSystemComponent.h
     Include/Private/Editor/AWSCoreEditorManager.h
     Include/Private/Editor/UI/AWSCoreEditorMenu.h
+    Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
     Source/AWSCoreEditorSystemComponent.cpp
     Source/Editor/AWSCoreEditorManager.cpp
     Source/Editor/UI/AWSCoreEditorMenu.cpp
+    Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
 )
diff --git a/Gems/AWSCore/Code/awscore_editor_tests_files.cmake b/Gems/AWSCore/Code/awscore_editor_tests_files.cmake
index 60852746fb..ff89b6b5bd 100644
--- a/Gems/AWSCore/Code/awscore_editor_tests_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_tests_files.cmake
@@ -13,6 +13,7 @@ set(FILES
     Tests/AWSCoreEditorSystemComponentTest.cpp
     Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
     Tests/Editor/UI/AWSCoreEditorUIFixture.h
+    Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
     Tests/Editor/AWSCoreEditorManagerTest.cpp
     Tests/Editor/AWSCoreEditorTest.cpp
 )
diff --git a/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake b/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
new file mode 100644
index 0000000000..466a2c917f
--- /dev/null
+++ b/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    Source/AWSCoreResourceMappingToolModule.cpp
+)
diff --git a/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt b/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt
index 7cca815017..df97feaa3f 100644
--- a/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt
+++ b/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt
@@ -23,7 +23,6 @@ ly_add_target(
         PUBLIC
             AZ::AzCore
             Legacy::CryCommon
-            Legacy::CryRender.Headers
             Gem::ImGui.Static
 )
 
diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp
index ac3ab0dd04..f371210d68 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp
@@ -54,8 +54,7 @@ namespace AssetMemoryAnalyzer
 namespace AssetMemoryAnalyzer
 {
     class AnalyzerImpl :
-        public AZ::Debug::MemoryDrillerBus::Handler,
-        public Render::Debug::VRAMDrillerBus::Handler
+        public AZ::Debug::MemoryDrillerBus::Handler
     {
     public:
         AZ_TYPE_INFO(AnalyzerImpl, "{E460E4DE-2160-4171-A4B6-3C2DB6692C32}");
@@ -73,13 +72,6 @@ namespace AssetMemoryAnalyzer
         void ReallocateAllocation(AZ::IAllocator* allocator, void* prevAddress, void* newAddress, size_t newByteSize, size_t newAlignment) override;
         void ResizeAllocation(AZ::IAllocator* allocator, void* address, size_t newSize) override;
 
-        // VRAMDrillerBus
-        void RegisterCategory(Render::Debug::VRAMAllocationCategory category, const char* categoryName, const Render::Debug::VRAMSubCategoryType& subcategories) override;
-        void UnregisterAllCategories() override;
-        void RegisterAllocation(void* address, size_t byteSize, const char* allocationName, Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategories) override;
-        void UnregisterAllocation(void* address) override;
-        void GetCurrentVRAMStats(Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategory, AZStd::string& categoryName, AZStd::string& subcategoryName, size_t& numberBytesAllocated, size_t& numberAllocations) override;
-
         AZStd::shared_ptr<FrameAnalysis> GetAnalysis();
 
     private:
@@ -112,13 +104,11 @@ namespace AssetMemoryAnalyzer
         m_assetTracking(&m_assetTree, &m_allocationTable)
     {
         AZ::Debug::MemoryDrillerBus::Handler::BusConnect();
-        Render::Debug::VRAMDrillerBus::Handler::BusConnect();
     }
 
     AnalyzerImpl::~AnalyzerImpl()
     {
         AZ::Debug::MemoryDrillerBus::Handler::BusDisconnect();
-        Render::Debug::VRAMDrillerBus::Handler::BusDisconnect();
     }
 
     void AnalyzerImpl::RegisterAllocator(AZ::IAllocator* allocator)
@@ -181,44 +171,6 @@ namespace AssetMemoryAnalyzer
         m_allocationTable.ResizeAllocation(address, newSize);
     }
 
-    void AnalyzerImpl::RegisterCategory(Render::Debug::VRAMAllocationCategory category, const char* categoryName, const Render::Debug::VRAMSubCategoryType& subcategories)
-    {
-        AZ_UNUSED(category);
-        AZ_UNUSED(categoryName);
-        AZ_UNUSED(subcategories);
-    }
-
-    void AnalyzerImpl::UnregisterAllCategories()
-    {
-    }
-
-    void AnalyzerImpl::RegisterAllocation(void* address, size_t byteSize, const char* allocationName, Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategories)
-    {
-        // Bit-flip address so that it won't collide with heap allocations (calls to the VRAM driller tend to use the same pointers from the heap objects that own the VRAM)
-        address = (void*)~(size_t)address;
-
-        Data::AllocationData::CategoryInfo categoryInfo;
-        categoryInfo.m_vramInfo.m_category = category;
-        categoryInfo.m_vramInfo.m_subcategories = subcategories;
-        RegisterAllocationCommon(address, byteSize, allocationName, 0, categoryInfo, Data::AllocationCategories::VRAM);
-    }
-
-    void AnalyzerImpl::UnregisterAllocation(void* address)
-    {
-        address = (void*)~(size_t)address;
-        UnregisterAllocationCommon(address);
-    }
-
-    void AnalyzerImpl::GetCurrentVRAMStats(Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategory, AZStd::string& categoryName, AZStd::string& subcategoryName, size_t& numberBytesAllocated, size_t& numberAllocations)
-    {
-        AZ_UNUSED(category);
-        AZ_UNUSED(subcategory);
-        AZ_UNUSED(categoryName);
-        AZ_UNUSED(subcategoryName);
-        AZ_UNUSED(numberBytesAllocated);
-        AZ_UNUSED(numberAllocations);
-    }
-
     void AnalyzerImpl::RegisterAllocationCommon(void* address, size_t byteSize, const char* fileName, int lineNum, Data::AllocationData::CategoryInfo categoryInfo, Data::AllocationCategories category)
     {
         if (m_performingAnalysis)
diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h
index 9107604cf1..951877ab28 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <AzCore/Debug/AssetTrackingTypes.h>
-#include <Common/Memory/VRAMDriller.h>
 
 namespace AssetMemoryAnalyzer
 {
@@ -48,13 +47,6 @@ namespace AssetMemoryAnalyzer
                     AZ::IAllocator* m_allocator;
                 }
                 m_heapInfo;
-
-                struct
-                {
-                    Render::Debug::VRAMAllocationCategory m_category;
-                    Render::Debug::VRAMAllocationSubcategory m_subcategories;
-                }
-                m_vramInfo;
             };
 
             CodePoint* m_codePoint;
diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp
index 733fa8b210..26eb94c5ec 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp
@@ -12,9 +12,9 @@
 #include "AssetMemoryAnalyzer_precompiled.h"
 
 #include <AzCore/Debug/AssetTrackingTypesImpl.h>
+#include <AzCore/IO/SystemFile.h> // For AZ_MAX_PATH_LEN
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
-#include <Common/Memory/VRAMDrillerBus.h>
 
 #include "AssetMemoryAnalyzerSystemComponent.h"
 
@@ -186,9 +186,6 @@ namespace AssetMemoryAnalyzer
 
     void AssetMemoryAnalyzerSystemComponent::Init()
     {
-        static_assert(AZ_ARRAY_SIZE(VRAM_CATEGORIES) == Render::Debug::VRAMAllocationCategory::VRAM_CATEGORY_NUMBER_CATEGORIES, "VRAMAllocationCategory has changed length! Fix VRAM_CATEGORIES to match.");
-        static_assert(AZ_ARRAY_SIZE(VRAM_SUBCATEGORIES) == Render::Debug::VRAMAllocationSubcategory::VRAM_SUBCATEGORY_NUMBER_SUBCATEGORIES, "VRAMAllocationSubcategory has changed length! Fix VRAM_SUBCATEGORIES to match.");
-
         m_impl->m_debugImGUI.Init(this);
         m_impl->m_exportCSV.Init(this);
         m_impl->m_exportJSON.Init(this);
diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
index d4f699bcde..f7b8633eb6 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
@@ -18,7 +18,6 @@
 #include "FormatUtils.h"
 
 #include <AzCore/Debug/AssetTracking.h>
-#include <Common/Memory/VRAMDrillerBus.h>
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/JSON/filewritestream.h>
 #include <AzCore/JSON/rapidjson.h>
diff --git a/Gems/AssetValidation/Code/Source/AssetSeedUtil.h b/Gems/AssetValidation/Code/Source/AssetSeedUtil.h
index 4a6ff1f1d8..60d94e8903 100644
--- a/Gems/AssetValidation/Code/Source/AssetSeedUtil.h
+++ b/Gems/AssetValidation/Code/Source/AssetSeedUtil.h
@@ -30,7 +30,7 @@ namespace AssetValidation::AssetSeed
     constexpr char GemsDirectoryName[] = "Gems";
     constexpr char GemsSeedFileName[] = "seedList";
     constexpr char EngineSeedFileName[] = "SeedAssetList";
-    constexpr char EngineDirectoryName[] = "Engine";
+    constexpr auto EngineDirectoryName = AZ::IO::FixedMaxPath("Assets") / "Engine";
 
     void AddPlatformSeeds(const AZStd::string& rootFolder, AZStd::vector<AZStd::string>& defaultSeedLists, AzFramework::PlatformFlags platformFlags);
 
diff --git a/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp b/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp
index a5ff671fc3..5003c4484c 100644
--- a/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp
+++ b/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp
@@ -32,20 +32,21 @@ TEST_F(AssetValidationTest, DefaultSeedList_ReturnsExpectedSeedLists)
 {
     AZStd::vector<AzFramework::GemInfo> gemInfo;
 
-    AZStd::string gemSeedList, engineSeedList, projectSeedList;
+    AZ::IO::Path gemSeedList, engineSeedList, projectSeedList;
 
-    ASSERT_TRUE(CreateDummyFile((AZ::IO::Path("mockGem") / AzFramework::GemInfo::GetGemAssetFolder()).c_str(), "seedList", "Mock Gem Seed List", gemSeedList));
-    ASSERT_TRUE(CreateDummyFile("Engine", "SeedAssetList", "Engine Seed List", engineSeedList));
+    ASSERT_TRUE(CreateDummyFile((AZ::IO::Path("mockGem") / AzFramework::GemInfo::GetGemAssetFolder()).c_str(), "seedList", "Mock Gem Seed List", gemSeedList.Native()));
+    ASSERT_TRUE(CreateDummyFile((AZ::IO::Path("Assets") / "Engine").c_str(), "SeedAssetList", "Engine Seed List", engineSeedList.Native()));
 
     AZ::SettingsRegistryInterface::FixedValueString projectName = AZ::Utils::GetProjectName();
     ASSERT_FALSE(projectName.empty());
-    ASSERT_TRUE(CreateDummyFile(projectName.c_str(), "SeedAssetList", "Project Seed List", projectSeedList));
+    ASSERT_TRUE(CreateDummyFile(projectName.c_str(), "SeedAssetList", "Project Seed List", projectSeedList.Native()));
 
     AzFramework::GemInfo mockGem("MockGem");
     mockGem.m_absoluteSourcePaths.push_back((m_tempDir / "mockGem").string().c_str());
     gemInfo.push_back(mockGem);
 
-    AZStd::vector<AZStd::string> defaultSeedLists = AssetValidation::AssetSeed::GetDefaultSeedListFiles(gemInfo, AzFramework::PlatformFlags::Platform_PC);
+    AZStd::vector<AZStd::string> defaultSeedStringList = AssetValidation::AssetSeed::GetDefaultSeedListFiles(gemInfo, AzFramework::PlatformFlags::Platform_PC);
+    AZStd::vector<AZ::IO::Path> defaultSeedLists{ AZStd::make_move_iterator(defaultSeedStringList.begin()), AZStd::make_move_iterator(defaultSeedStringList.end()) };
 
     ASSERT_THAT(defaultSeedLists, ::testing::UnorderedElementsAre(gemSeedList, engineSeedList, projectSeedList));
 }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
index 5d5fd21b44..ccba00f15f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
@@ -188,26 +188,6 @@ namespace ImageProcessingAtom
     // the request will contain the CreateJobResponse you constructed earlier, including any keys and values you placed into the hash table
     void ImageBuilderWorker::ProcessJob(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response)
     {
-        // Exclude the "Engine/EngineAssets/Textures/rotrandom.dds" which is not a legit dds file but required by Cry3dEngine.
-        // [GFX TODO] Remove this block of code when removing Cry3dEngine and its engine assets entirely. 
-        AZStd::string assetFileName;
-        AzFramework::StringFunc::Path::GetFullFileName(request.m_sourceFile.data(), assetFileName);
-        if (azstricmp(assetFileName.data(), "rotrandom.dds") == 0)
-        {
-            AZStd::string assetPath = request.m_fullPath;
-            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::MakePathRootRelative, assetPath);
-            // The MakePathRootRelative only normalize but not convert the path to lower case, we need to call NormalizePath to convert it to lower case
-            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::NormalizePath, assetPath);
-            AZStd::string excludePath = "Engine/EngineAssets/Textures/rotrandom.dds";
-            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::NormalizePath, excludePath);
-
-            if (assetPath == excludePath)
-            {
-                response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-                return;
-            }
-        }
-
         // Before we begin, let's make sure we are not meant to abort.
         AssetBuilderSDK::JobCancelListener jobCancelListener(request.m_jobId);
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
index a586de9724..dda4587588 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
@@ -22,13 +22,13 @@ namespace ImageProcessingAtom
 {
     namespace Thumbnails
     {
-        const int ImageThumbnailSize = 200;
+        static constexpr const int ImageThumbnailSize = 256;
 
         //////////////////////////////////////////////////////////////////////////
         // ImageThumbnail
         //////////////////////////////////////////////////////////////////////////
-        ImageThumbnail::ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        ImageThumbnail::ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
         {
             auto sourceKey = azrtti_cast<const AzToolsFramework::AssetBrowser::SourceThumbnailKey*>(key.data());
             if (sourceKey)
@@ -66,7 +66,7 @@ namespace ImageProcessingAtom
             AzToolsFramework::Thumbnailer::ThumbnailerRendererRequestBus::QueueEvent(
                 AZ::RPI::StreamingImageAsset::RTTI_Type(), &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail,
                 m_key,
-                m_thumbnailSize);
+                ImageThumbnailSize);
             // wait for response from thumbnail renderer
             m_renderWait.acquire();
         }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
index 85ce9d59e6..a73a742b83 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
@@ -34,7 +34,7 @@ namespace ImageProcessingAtom
         {
             Q_OBJECT
         public:
-            ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
             ~ImageThumbnail() override;
 
             //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
index 14f125c283..1af6563577 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
@@ -129,7 +129,7 @@ namespace ImageProcessingAtom
                 {
                     AZStd::string fullPath;
                     AZ::StringFunc::Path::Join(watchFolder.c_str(), assetInfo.m_relativePath.c_str(), fullPath);
-                    if (RenerThumbnailFromImage(thumbnailKey, thumbnailSize, IImageObjectPtr(LoadImageFromFile(fullPath))))
+                    if (RenderThumbnailFromImage(thumbnailKey, thumbnailSize, IImageObjectPtr(LoadImageFromFile(fullPath))))
                     {
                         return;
                     }
@@ -139,7 +139,7 @@ namespace ImageProcessingAtom
             auto productKey = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(thumbnailKey.data());
             if (productKey)
             {
-                if (RenerThumbnailFromImage(thumbnailKey, thumbnailSize, Utils::LoadImageFromImageAsset(productKey->GetAssetId())))
+                if (RenderThumbnailFromImage(thumbnailKey, thumbnailSize, Utils::LoadImageFromImageAsset(productKey->GetAssetId())))
                 {
                     return;
                 }
@@ -149,7 +149,7 @@ namespace ImageProcessingAtom
                 thumbnailKey, &AzToolsFramework::Thumbnailer::ThumbnailerRendererNotifications::ThumbnailFailedToRender);
         }
 
-        bool ImageThumbnailSystemComponent::RenerThumbnailFromImage(
+        bool ImageThumbnailSystemComponent::RenderThumbnailFromImage(
             AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize, IImageObjectPtr previewImage) const
         {
             if (!previewImage)
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h
index 943857fd35..ca2453b532 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h
@@ -52,7 +52,7 @@ namespace ImageProcessingAtom
             bool Installed() const override;
             void RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize) override;
 
-            bool RenerThumbnailFromImage(
+            bool RenderThumbnailFromImage(
                 AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize, IImageObjectPtr previewImage) const;
         };
     } // namespace Thumbnails
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
index dcbaea96aa..01595a3425 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
@@ -7,7 +7,10 @@
             "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",
             "Name": "UserInterface_Compressed",
             "SuppressEngineReduce": true,
-            "PixelFormat": "R8G8B8X8"
+            "PixelFormat": "R8G8B8A8",
+            "SourceColor": "Linear",
+            "DestColor": "Linear",
+            "FileMasks": [ "_ui" ]
         },
         "PlatformsPresets": {
             "es3": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
index 5ccaa3ac16..78c63790ab 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
@@ -7,32 +7,35 @@
             "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
             "Name": "UserInterface_Lossless",
             "SuppressEngineReduce": true,
-            "PixelFormat": "R8G8B8X8"
+            "PixelFormat": "R8G8B8A8",
+            "SourceColor": "Linear",
+            "DestColor": "Linear",
+            "FileMasks": [ "_ui" ]
         },
         "PlatformsPresets": {
             "es3": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,
-                "PixelFormat": "R8G8B8X8"
+                "PixelFormat": "R8G8B8A8"
             },
             "ios": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,
-                "PixelFormat": "R8G8B8X8"
+                "PixelFormat": "R8G8B8A8"
             },
             "osx_gl": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,
-                "PixelFormat": "R8G8B8X8"
+                "PixelFormat": "R8G8B8A8"
             },
             "provo": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,
-                "PixelFormat": "R8G8B8X8"
+                "PixelFormat": "R8G8B8A8"
             }
         }
     }
diff --git a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli
index 12fd787150..8f0d4dd392 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli
@@ -19,3 +19,7 @@
 #define AZ_TRAIT_ASTC_COMPRESSION 1
 
 static const float4 s_AzslDebugColor = float4(165.0 / 255.0, 30.0 / 255.0, 36.0 / 255.0, 1);
+
+// Uniform limitation need to be taken into consideration for mobile devices
+// [ATOM-14949]
+#define AZ_TRAIT_CONSTANT_BUFFER_LIMITATIONS 1
\ No newline at end of file
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
index 80449a3eb7..84a95b2c54 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
@@ -25,6 +25,7 @@
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/Casting/numeric_cast.h>
 #include <AzCore/IO/SystemFile.h>
+#include <AzCore/Utils/Utils.h>
 
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzFramework/API/ApplicationAPI.h>
@@ -299,6 +300,9 @@ namespace AZ
 
             // we transfer to a set, to order the folders, uniquify them, and ensure deterministic build behavior
             AZStd::set<AZStd::string> scanFoldersSet;
+            // Add the project path to list of include paths
+            AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
+            scanFoldersSet.emplace(projectPath.c_str(), projectPath.size());
             // but while we transfer to the set, we're going to keep only folders where +/ShaderLib exists
             for (AZStd::string folder : scanFoldersVector)
             {
@@ -310,14 +314,12 @@ namespace AZ
             } // the folders constructed this fashion constitute the base of automatic include search paths
 
             // get the engine root:
-            AZStd::string engineRoot;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            AzFramework::StringFunc::Path::Normalize(engineRoot);
+            AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
 
             // add optional additional options
             for (AZStd::string& path : options.m_projectIncludePaths)
             {
-                AzFramework::StringFunc::Path::Join(engineRoot.c_str(), path.c_str(), path);
+                path = (engineRoot / path).String();
                 DeleteFromSet(path, scanFoldersSet);  // no need to add a path two times.
             }
             // back-insert the default paths (after the config-read paths we just read)
diff --git a/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h
index ee7f37adf3..b20535810c 100644
--- a/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h
+++ b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h
@@ -13,7 +13,7 @@
 
 #include <AzCore/EBus/EBus.h>
 
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <Atom/RPI.Public/Scene.h>
 namespace AZ
 {
@@ -43,15 +43,15 @@ namespace AZ
                         EBusConnectionPolicy<Bus>::Connect(busPtr, context, handler, connectLock, id);
 
                         // Check if bootstrap scene already exists and fire notifications if it does
-                        AZStd::vector<AzFramework::Scene*> scenes;
-                        AzFramework::SceneSystemRequestBus::BroadcastResult(scenes, &AzFramework::SceneSystemRequests::GetAllScenes);
-                        AZ_Assert(scenes.size() > 0, "AzFramework didn't set up any scenes.");
+                        auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+                        AZ_Assert(sceneSystem, "Notification bus called before the scene system has been initialized.");
+                        AZStd::shared_ptr<AzFramework::Scene> mainScene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
+                        AZ_Assert(mainScene, "AzFramework didn't set up any scenes.");
 
-                        // Assume first scene is the default scene
-                        AZ::RPI::Scene* defaultScene = scenes.at(0)->GetSubsystem<AZ::RPI::Scene>();
-                        if (defaultScene && defaultScene->GetDefaultRenderPipeline())
+                        AZ::RPI::ScenePtr* defaultScene = mainScene->FindSubsystem<AZ::RPI::ScenePtr>();
+                        if (defaultScene && *defaultScene && (*defaultScene)->GetDefaultRenderPipeline())
                         {
-                            handler->OnBootstrapSceneReady(defaultScene);
+                            handler->OnBootstrapSceneReady(defaultScene->get());
                         }
                     }
                 };
diff --git a/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h
index 807c00fce6..bd0c2d93d5 100644
--- a/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h
+++ b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h
@@ -13,7 +13,7 @@
 
 #include <AzCore/EBus/EBus.h>
 
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <Atom/RPI.Public/Scene.h>
 
 namespace AZ::Render::Bootstrap
diff --git a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
index 099e9062cf..ddf0ae9274 100644
--- a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
+++ b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
@@ -269,7 +269,7 @@ namespace AZ
 
                 // Register scene to RPI system so it will be processed/rendered per tick
                 RPI::RPISystemInterface::Get()->RegisterScene(atomScene);
-                scene->SetSubsystem(atomScene.get());
+                scene->SetSubsystem(atomScene);
 
                 atomSceneHandle = atomScene;
 
@@ -279,11 +279,19 @@ namespace AZ
             void BootstrapSystemComponent::CreateDefaultScene()
             {
                 // Bind atomScene to the GameEntityContext's AzFramework::Scene
-                AZStd::vector<AzFramework::Scene*> scenes;
-                AzFramework::SceneSystemRequestBus::BroadcastResult(scenes, &AzFramework::SceneSystemRequests::GetAllScenes);
-                AZ_Assert(scenes.size() > 0, "Error: Scenes missing during system component initialization"); // This should never happen unless scene creation has changed.
-                m_defaultFrameworkScene = scenes[0];
-                m_defaultScene = GetOrCreateAtomSceneFromAzScene(m_defaultFrameworkScene);
+                m_defaultFrameworkScene = AzFramework::SceneSystemInterface::Get()->GetScene(AzFramework::Scene::MainSceneName);
+                // This should never happen unless scene creation has changed.
+                AZ_Assert(m_defaultFrameworkScene, "Error: Scenes missing during system component initialization");
+                m_sceneRemovalHandler = AzFramework::Scene::RemovalEvent::Handler(
+                    [this](AzFramework::Scene&, AzFramework::Scene::RemovalEventType eventType)
+                    {
+                        if (eventType == AzFramework::Scene::RemovalEventType::Zombified)
+                        {
+                            m_defaultFrameworkScene.reset();
+                        }
+                    });
+                m_defaultFrameworkScene->ConnectToEvents(m_sceneRemovalHandler);
+                m_defaultScene = GetOrCreateAtomSceneFromAzScene(m_defaultFrameworkScene.get());
             }
 
             bool BootstrapSystemComponent::EnsureDefaultRenderPipelineInstalledForScene(AZ::RPI::ScenePtr scene, AZ::RPI::ViewportContextPtr viewportContext)
@@ -405,15 +413,6 @@ namespace AZ
                 AzFramework::WindowNotificationBus::Handler::BusDisconnect();
             }
 
-            void BootstrapSystemComponent::SceneAboutToBeRemoved(AzFramework::Scene& scene)
-            {
-                if (&scene == m_defaultFrameworkScene)
-                {
-                    // Set to nullptr so we don't try to unbind the RPI::Scene from it later.
-                    m_defaultFrameworkScene = nullptr;
-                }
-            }
-
             AzFramework::NativeWindowHandle BootstrapSystemComponent::GetDefaultWindowHandle()
             {
                 return m_windowHandle;
diff --git a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h
index f655272350..7323a54221 100644
--- a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h
+++ b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h
@@ -17,7 +17,7 @@
 
 #include <AzFramework/Asset/AssetCatalogBus.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <AzFramework/Windowing/NativeWindow.h>
 #include <AzFramework/Windowing/WindowBus.h>
 
@@ -45,7 +45,6 @@ namespace AZ
                 , public TickBus::Handler
                 , public AzFramework::WindowNotificationBus::Handler
                 , public AzFramework::AssetCatalogEventBus::Handler
-                , private AzFramework::SceneSystemNotificationBus::Handler
                 , public AzFramework::WindowSystemNotificationBus::Handler
                 , public AzFramework::WindowSystemRequestBus::Handler
                 , public Render::Bootstrap::DefaultWindowBus::Handler
@@ -90,9 +89,6 @@ namespace AZ
                 // AzFramework::AssetCatalogEventBus::Handler overrides ...
                 void OnCatalogLoaded(const char* catalogFile) override;
 
-                // AzFramework::SceneSystemNotificationBus::Handler overrides ...
-                void SceneAboutToBeRemoved(AzFramework::Scene& scene) override;
-
                 // AzFramework::WindowSystemNotificationBus::Handler overrides ...
                 void OnWindowCreated(AzFramework::NativeWindowHandle windowHandle) override;
 
@@ -104,12 +100,14 @@ namespace AZ
 
                 void CreateWindowContext();
 
+                AzFramework::Scene::RemovalEvent::Handler m_sceneRemovalHandler;
+
                 AZStd::unique_ptr<AzFramework::NativeWindow> m_nativeWindow;
                 AzFramework::NativeWindowHandle m_windowHandle = nullptr;
                 RPI::ViewportContextPtr m_viewportContext;
 
                 RPI::ScenePtr m_defaultScene = nullptr;
-                AzFramework::Scene* m_defaultFrameworkScene = nullptr;
+                AZStd::shared_ptr<AzFramework::Scene> m_defaultFrameworkScene = nullptr;
 
                 float m_simulateTime = 0;
                 float m_deltaTime = 0.016f;
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurMobile.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurMobile.pass
new file mode 100644
index 0000000000..e11bcac78d
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurMobile.pass
@@ -0,0 +1,43 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "PassAsset",
+    "ClassData": {
+        "PassTemplate": {
+            "Name": "ReflectionScreenSpaceBlurMobilePassTemplate",
+            "PassClass": "ReflectionScreenSpaceBlurPass",
+            "Slots": [
+                {
+                    "Name": "PreviousFrameInputOutput",
+                    "SlotType": "InputOutput",
+                    "ScopeAttachmentUsage": "Shader"
+                }
+            ],
+            "ImageAttachments": [
+                {
+                    "Name": "PreviousFrameImage",
+                    "SizeSource": {
+                        "Source": {
+                            "Pass": "Parent",
+                            "Attachment": "SpecularInput"
+                        }
+                    },
+                    "ImageDescriptor": {
+                        "Format": "R8G8B8A8_SINT",
+                        "MipLevels": "8",
+                        "SharedQueueMask": "Graphics"
+                    }
+                }
+            ],
+            "Connections": [
+                {
+                    "LocalSlot": "PreviousFrameInputOutput",
+                    "AttachmentRef": {
+                        "Pass": "This",
+                        "Attachment": "PreviousFrameImage"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceMobile.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceMobile.pass
new file mode 100644
index 0000000000..648d643496
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceMobile.pass
@@ -0,0 +1,137 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "PassAsset",
+    "ClassData": {
+        "PassTemplate": {
+            "Name": "ReflectionScreenSpaceMobilePassTemplate",
+            "PassClass": "ParentPass",
+            "Slots": [
+                {
+                    "Name": "NormalInput",
+                    "SlotType": "Input",
+                    "ScopeAttachmentUsage": "Shader"
+                },
+                {
+                    "Name": "SpecularF0Input",
+                    "SlotType": "Input",
+                    "ScopeAttachmentUsage": "Shader"
+                },
+                {
+                    "Name": "SpecularInput",
+                    "SlotType": "Input",
+                    "ScopeAttachmentUsage": "Shader"
+                },
+                {
+                    "Name": "DepthStencilInput",
+                    "SlotType": "Input",
+                    "ScopeAttachmentUsage": "DepthStencil"
+                },
+                {
+                    "Name": "ReflectionInputOutput",
+                    "SlotType": "InputOutput",
+                    "ScopeAttachmentUsage": "RenderTarget"
+                }
+            ],
+            "PassRequests": [
+                {
+                    "Name": "ReflectionScreenSpaceBlurMobilePass",
+                    "TemplateName": "ReflectionScreenSpaceBlurMobilePassTemplate"
+                },
+                {
+                    "Name": "ReflectionScreenSpaceTracePass",
+                    "TemplateName": "ReflectionScreenSpaceTracePassTemplate",
+                    "Connections": [
+                        {
+                            "LocalSlot": "DepthStencilTextureInput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "DepthStencilInput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "NormalInput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "NormalInput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "DepthStencilInput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "DepthStencilInput"
+
+                            }
+                        },
+                        {
+                            "LocalSlot": "SpecularF0Input",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "SpecularF0Input"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "Name": "ReflectionScreenSpaceCompositePass",
+                    "TemplateName": "ReflectionScreenSpaceCompositePassTemplate",
+                    "ExecuteAfter": [
+                        "ReflectionScreenSpaceBlurPass"
+                    ],
+                    "Connections": [
+                        {
+                            "LocalSlot": "TraceInput",
+                            "AttachmentRef": {
+                                "Pass": "ReflectionScreenSpaceTracePass",
+                                "Attachment": "Output"
+                            }
+                        },
+                        {
+                            "LocalSlot": "PreviousFrameBufferInput",
+                            "AttachmentRef": {
+                                "Pass": "ReflectionScreenSpaceBlurPass",
+                                "Attachment": "PreviousFrameInputOutput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "NormalInput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "NormalInput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "SpecularF0Input",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "SpecularF0Input"
+                            }
+                        },
+                        {
+                            "LocalSlot": "DepthStencilTextureInput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "DepthStencilInput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "DepthStencilInput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "DepthStencilInput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "Output",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "ReflectionInputOutput"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    }
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass b/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass
index 5e69ded5ac..a35352b9f0 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/Reflections_nomsaa.pass
@@ -247,8 +247,10 @@
                     }
                 },
                 {
-                    "Name": "ReflectionScreenSpacePass",
-                    "TemplateName": "ReflectionScreenSpacePassTemplate",
+                    // Using cut-down version of screen space reflection for handling the attachment format compatibility issues.
+                    // This is used for mobile devices with limited capabilities.
+                    "Name": "ReflectionScreenSpaceMobilePass",
+                    "TemplateName": "ReflectionScreenSpaceMobilePassTemplate",
                     "Enabled": false,
                     "Connections": [
                         {
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.shader b/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.shader
index c6180c8873..95ffc36a11 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.shader
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.shader
@@ -10,6 +10,7 @@
           "type": "Compute"
         }
       ]
-    }
+    },
+    "DisabledRHIBackends": ["metal"]
 
 }
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.shader b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.shader
index f9b3f5f72d..566144bab8 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.shader
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.shader
@@ -12,6 +12,7 @@
           "type": "Compute"
         }
       ]
-    }
+    },
+    "DisabledRHIBackends": ["metal"]
 
 }
diff --git a/Gems/Atom/Feature/Common/Code/CMakeLists.txt b/Gems/Atom/Feature/Common/Code/CMakeLists.txt
index 93da352c6e..6f087edefe 100644
--- a/Gems/Atom/Feature/Common/Code/CMakeLists.txt
+++ b/Gems/Atom/Feature/Common/Code/CMakeLists.txt
@@ -30,7 +30,6 @@ ly_add_target(
         PUBLIC
             Include
             Source
-            3rdParty/ACES
     COMPILE_DEFINITIONS
         PRIVATE
             IMGUI_DISABLE_OBSOLETE_FUNCTIONS
@@ -58,6 +57,7 @@ ly_add_target(
             ${pal_source_dir}
         PUBLIC
             Include
+            3rdParty/ACES
     COMPILE_DEFINITIONS
         PRIVATE
             IMGUI_DISABLE_OBSOLETE_FUNCTIONS
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h
index f1d8337a35..e79dc6d29e 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h
@@ -61,13 +61,14 @@ namespace AZ
             AZ_TYPE_INFO(AZ::Render::LightConfig, "{02644F52-9483-47A8-9028-37671695C34E}");
             static void Reflect(AZ::ReflectContext* context);
 
-            AZ::Vector3 m_direction = AZ::Vector3::CreateAxisY();
+            // Setting default direction to produce a visible shadow
+            AZ::Vector3 m_direction = AZ::Vector3(1.0f / 3.0f, 1.0f / 3.0f, -1.0f / 3.0f);
             AZ::Color m_color = AZ::Color::CreateOne();
             float m_intensity = 1.0f;
-            uint16_t m_shadowCascadeCount = 1;
-            float m_shadowRatioLogarithmUniform = 0.5f;
+            uint16_t m_shadowCascadeCount = 4;
+            float m_shadowRatioLogarithmUniform = 1.0f;
             float m_shadowFarClipDistance = 20.0f;
-            ShadowmapSize m_shadowmapSize = ShadowmapSize::Size1024;
+            ShadowmapSize m_shadowmapSize = ShadowmapSize::Size2048;
             bool m_enableShadowDebugColoring = false;
         };
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
index 04175c461f..60bf487de3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
@@ -731,11 +731,12 @@ namespace AZ
                     }
                 }
             }
-
+            
             // Remove unnecessary camera views in shadow properties
-            for (uint16_t lightIndex = 0; lightIndex < aznumeric_cast<uint16_t>(m_shadowProperties.GetDataCount()); ++lightIndex)
+            auto& shadowPropertiesVector = m_shadowProperties.GetDataVector();
+            for (ShadowProperty& shadowProperty : shadowPropertiesVector)
             {
-                AZStd::unordered_map<const RPI::View*, AZStd::fixed_vector<CascadeSegment, Shadow::MaxNumberOfCascades>>& cascades = m_shadowProperties.GetData(lightIndex).m_segments;
+                auto& cascades = shadowProperty.m_segments;
                 for (auto it = cascades.begin(); it != cascades.end();)
                 {
                     if (AZStd::find(cameraViews.begin(), cameraViews.end(), it->first) != cameraViews.end())
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp
index 8a349083ea..5be1303434 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp
@@ -263,7 +263,7 @@ namespace AZ
                 RHI::ImageInitRequest request;
                 request.m_image = m_classificationImage[m_currentImageIndex].get();
                 request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite, width, height, DiffuseProbeGridRenderData::ClassificationImageFormat);
-                RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
+                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
                 AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeClassificationImage image");
             }
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
index 6a0e618830..143ae1a08c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
@@ -294,7 +294,7 @@ namespace AZ
 
                 // probe classification
                 {
-                    RHI::ResultCode result = frameGraph.GetAttachmentDatabase().ImportImage(diffuseProbeGrid->GetClassificationImageAttachmentId(), diffuseProbeGrid->GetClassificationImage());
+                    [[maybe_unused]] RHI::ResultCode result = frameGraph.GetAttachmentDatabase().ImportImage(diffuseProbeGrid->GetClassificationImageAttachmentId(), diffuseProbeGrid->GetClassificationImage());
                     AZ_Assert(result == RHI::ResultCode::Success, "Failed to import probeClassificationImage");
 
                     RHI::ImageScopeAttachmentDescriptor desc;
diff --git a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
index f1c41576ef..90499be8b8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
@@ -31,6 +31,11 @@
 #include <AzFramework/StringFunc/StringFunc.h>
 
 #include <AzCore/Preprocessor/EnumReflectUtils.h>
+#include <AzCore/Console/Console.h>
+
+#if defined(OPEN_IMAGE_IO_ENABLED)
+#include <OpenImageIO/imageio.h>
+#endif
 
 namespace AZ
 {
@@ -38,6 +43,41 @@ namespace AZ
     {
         AZ_ENUM_DEFINE_REFLECT_UTILITIES(FrameCaptureResult);
 
+#if defined(OPEN_IMAGE_IO_ENABLED)
+        AZ_CVAR(unsigned int,
+            r_pngCompressionLevel,
+            3, // A compression level of 3 seems like the best default in terms of file size and saving speeds
+            nullptr,
+            ConsoleFunctorFlags::Null,
+            "Sets the compression level for saving png screenshots. Valid values are from 0 to 8"
+        );
+
+        FrameCaptureOutputResult PngFrameCaptureOutput(
+            const AZStd::string& outputFilePath, const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult)
+        {
+            using namespace OIIO;
+            AZStd::unique_ptr<ImageOutput> out = ImageOutput::create(outputFilePath.c_str());
+            if (out)
+            {
+                ImageSpec spec(
+                    readbackResult.m_imageDescriptor.m_size.m_width,
+                    readbackResult.m_imageDescriptor.m_size.m_height,
+                    AZ::RHI::GetFormatComponentCount(readbackResult.m_imageDescriptor.m_format)
+                );
+                spec.attribute("png:compressionLevel", r_pngCompressionLevel);
+
+                if (out->open(outputFilePath.c_str(), spec))
+                {
+                    out->write_image(TypeDesc::UINT8, readbackResult.m_dataBuffer->data());
+                    out->close();
+                    return FrameCaptureOutputResult{FrameCaptureResult::Success, AZStd::nullopt};
+                }
+            }
+
+            return FrameCaptureOutputResult{FrameCaptureResult::InternalError, "Unable to save frame capture output to " + outputFilePath};
+        }
+#endif
+
         FrameCaptureOutputResult DdsFrameCaptureOutput(
             const AZStd::string& outputFilePath, const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult)
         {
@@ -377,7 +417,6 @@ namespace AZ
                 if (readbackResult.m_attachmentType == AZ::RHI::AttachmentType::Buffer)
                 {
                     // write buffer data to the data file
-
                     AZ::IO::FileIOStream fileStream(m_outputFilePath.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath);
                     if (fileStream.IsOpen())
                     {
@@ -418,6 +457,18 @@ namespace AZ
                         m_result = ddsFrameCapture.m_result;
                         m_latestCaptureInfo = ddsFrameCapture.m_errorMessage.value_or("");
                     }
+#if defined(OPEN_IMAGE_IO_ENABLED)
+                    else if (extension == "png")
+                    {
+                        AZStd::string folderPath;
+                        AzFramework::StringFunc::Path::GetFolderPath(m_outputFilePath.c_str(), folderPath);
+                        AZ::IO::SystemFile::CreateDir(folderPath.c_str());
+
+                        const auto frameCaptureResult = PngFrameCaptureOutput(m_outputFilePath, readbackResult);
+                        m_result = frameCaptureResult.m_result;
+                        m_latestCaptureInfo = frameCaptureResult.m_errorMessage.value_or("");
+                    }
+#endif
                     else
                     {
                         m_latestCaptureInfo = AZStd::string::format("Only supports saving image to ppm or dds files");
diff --git a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake
index f5b9ea77a2..b12b5de9ce 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake
@@ -9,3 +9,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
+set(LY_BUILD_DEPENDENCIES
+    PRIVATE
+        3rdParty::OpenImageIO
+        3rdParty::ilmbase
+)
+
+# [GFX-TODO] Add macro defintion in OpenImageIO 3rd party find cmake file
+set(LY_COMPILE_DEFINITIONS
+    PRIVATE
+        OPEN_IMAGE_IO_ENABLED
+)
diff --git a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
index 337d111130..0c24c2953d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
@@ -118,6 +118,7 @@ namespace AZ
 
             // set initial transform
             mesh.m_transform = m_transformServiceFeatureProcessor->GetTransformForId(objectId);
+            mesh.m_nonUniformScale = m_transformServiceFeatureProcessor->GetNonUniformScaleForId(objectId);
 
             m_revision++;
             m_subMeshCount += aznumeric_cast<uint32_t>(subMeshes.size());
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
index 0826739119..cfce718146 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
@@ -120,13 +120,13 @@ namespace AZ
             {
                 // stencil Srg
                 // Note: the stencil pass uses a slightly reduced inner AABB to avoid seams
-                Vector3 innerExtentsReduced = m_innerExtents - Vector3(0.1f, 0.1f, 0.1f);
-                Matrix3x4 modelToWorldStencil = Matrix3x4::CreateFromMatrix3x3AndTranslation(Matrix3x3::CreateIdentity(), m_position) * Matrix3x4::CreateScale(innerExtentsReduced);
+                Vector3 innerExtentsReduced = m_innerExtents * m_transform.GetScale() - Vector3(0.1f, 0.1f, 0.1f);
+                Matrix3x4 modelToWorldStencil = Matrix3x4::CreateFromMatrix3x3AndTranslation(Matrix3x3::CreateIdentity(), m_transform.GetTranslation()) * Matrix3x4::CreateScale(innerExtentsReduced);
                 m_stencilSrg->SetConstant(m_reflectionRenderData->m_modelToWorldStencilConstantIndex, modelToWorldStencil);
                 m_stencilSrg->Compile();
 
                 // blend weight Srg
-                Matrix3x4 modelToWorldOuter = Matrix3x4::CreateFromMatrix3x3AndTranslation(Matrix3x3::CreateIdentity(), m_position) * Matrix3x4::CreateScale(m_outerExtents);
+                Matrix3x4 modelToWorldOuter = Matrix3x4::CreateFromMatrix3x3AndTranslation(Matrix3x3::CreateIdentity(), m_transform.GetTranslation()) * Matrix3x4::CreateScale(m_outerExtents * m_transform.GetScale());
                 m_blendWeightSrg->SetConstant(m_reflectionRenderData->m_modelToWorldRenderConstantIndex, modelToWorldOuter);
                 m_blendWeightSrg->SetConstant(m_reflectionRenderData->m_aabbPosRenderConstantIndex, m_outerAabbWs.GetCenter());
                 m_blendWeightSrg->SetConstant(m_reflectionRenderData->m_outerAabbMinRenderConstantIndex, m_outerAabbWs.GetMin());
@@ -149,7 +149,7 @@ namespace AZ
                 m_renderOuterSrg->Compile();
 
                 // render inner Srg
-                Matrix3x4 modelToWorldInner = Matrix3x4::CreateFromMatrix3x3AndTranslation(Matrix3x3::CreateIdentity(), m_position) * Matrix3x4::CreateScale(m_innerExtents);
+                Matrix3x4 modelToWorldInner = Matrix3x4::CreateFromMatrix3x3AndTranslation(Matrix3x3::CreateIdentity(), m_transform.GetTranslation()) * Matrix3x4::CreateScale(m_innerExtents * m_transform.GetScale());
                 m_renderInnerSrg->SetConstant(m_reflectionRenderData->m_modelToWorldRenderConstantIndex, modelToWorldInner);
                 m_renderInnerSrg->SetConstant(m_reflectionRenderData->m_aabbPosRenderConstantIndex, m_outerAabbWs.GetCenter());
                 m_renderInnerSrg->SetConstant(m_reflectionRenderData->m_outerAabbMinRenderConstantIndex, m_outerAabbWs.GetMin());
@@ -208,24 +208,29 @@ namespace AZ
 
         void ReflectionProbe::SetTransform(const AZ::Transform& transform)
         {
-            m_position = transform.GetTranslation();
-            m_meshFeatureProcessor->SetTransform(m_visualizationMeshHandle, transform);
-            m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_position, m_outerExtents / 2.0f);
-            m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_position, m_innerExtents / 2.0f);
+            m_transform = transform;
+
+            // avoid scaling the visualization sphere
+            AZ::Transform visualizationTransform = m_transform;
+            visualizationTransform.ExtractScale();
+            m_meshFeatureProcessor->SetTransform(m_visualizationMeshHandle, visualizationTransform);
+
+            m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents * m_transform.GetScale() / 2.0f);
+            m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents * m_transform.GetScale() / 2.0f);
             m_updateSrg = true;
         }
 
         void ReflectionProbe::SetOuterExtents(const AZ::Vector3& outerExtents)
         {
             m_outerExtents = outerExtents;
-            m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_position, m_outerExtents / 2.0f);
+            m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents * m_transform.GetScale() / 2.0f);
             m_updateSrg = true;
         }
 
         void ReflectionProbe::SetInnerExtents(const AZ::Vector3& innerExtents)
         {
             m_innerExtents = innerExtents;
-            m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_position, m_innerExtents / 2.0f);
+            m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents * m_transform.GetScale() / 2.0f);
             m_updateSrg = true;
         }
 
@@ -261,7 +266,7 @@ namespace AZ
             m_environmentCubeMapPipelineId = environmentCubeMapPipeline->GetId();
 
             AZStd::shared_ptr<RPI::EnvironmentCubeMapPassData> passData = AZStd::make_shared<RPI::EnvironmentCubeMapPassData>();
-            passData->m_position = m_position;
+            passData->m_position = m_transform.GetTranslation();
 
             RPI::PassDescriptor environmentCubeMapPassDescriptor(Name("EnvironmentCubeMapPass"));
             environmentCubeMapPassDescriptor.m_passData = passData;
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
index 22645a4ed3..42b3ff5c5a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
@@ -75,13 +75,13 @@ namespace AZ
             void Init(RPI::Scene* scene, ReflectionRenderData* reflectionRenderData);
             void Simulate(uint32_t probeIndex);
 
-            const Vector3& GetPosition() const { return m_position; }
+            const Vector3& GetPosition() const { return m_transform.GetTranslation(); }
             void SetTransform(const AZ::Transform& transform);
 
-            const AZ::Vector3& GetOuterExtents() const { return m_outerExtents; }
+            AZ::Vector3 GetOuterExtents() const { return m_outerExtents * m_transform.GetScale(); }
             void SetOuterExtents(const AZ::Vector3& outerExtents);
 
-            const AZ::Vector3& GetInnerExtents() const { return m_innerExtents; }
+            AZ::Vector3 GetInnerExtents() const { return m_innerExtents * m_transform.GetScale(); }
             void SetInnerExtents(const AZ::Vector3& innerExtents);
 
             const Aabb& GetOuterAabbWs() const { return m_outerAabbWs; }
@@ -122,8 +122,8 @@ namespace AZ
             // scene
             RPI::Scene* m_scene = nullptr;
 
-            // probe capture position
-            AZ::Vector3 m_position = AZ::Vector3(0.0f, 0.0f, 0.0f);
+            // probe volume transform
+            AZ::Transform m_transform = AZ::Transform::CreateIdentity();
 
             // extents of the probe volume
             AZ::Vector3 m_outerExtents = AZ::Vector3(0.0f, 0.0f, 0.0f);
diff --git a/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp
index 77924b87a3..91ad31648b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp
@@ -30,7 +30,7 @@ namespace AZ
             if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
             {
                 serializeContext->Class<ExposureControlConfig>()
-                    ->Version(3)
+                    ->Version(4)
                     ->Field("compensateValue", &ExposureControlConfig::m_manualCompensationValue)
                     ->Field("exposureControlType", &ExposureControlConfig::m_exposureControlType)
                     ->Field("autoExposureMin", &ExposureControlConfig::m_autoExposureMin)
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h
index 80e8ad268f..1b18ab7671 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h
@@ -34,6 +34,7 @@ namespace AZ
                 constexpr uint32_t StreamCountMax = 12;
                 constexpr uint32_t StreamChannelCountMax = 16;
                 constexpr uint32_t DrawListTagCountMax = 64;
+                constexpr uint32_t DrawFilterTagCountMax = 32;
                 constexpr uint32_t MultiSampleCustomLocationsCountMax = 16;
                 constexpr uint32_t MultiSampleCustomLocationGridSize = 16;
                 constexpr uint32_t SubpassCountMax = 10;
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawFilterTagRegistry.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawFilterTagRegistry.h
new file mode 100644
index 0000000000..04668b1994
--- /dev/null
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawFilterTagRegistry.h
@@ -0,0 +1,23 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <Atom/RHI/DrawItem.h>
+#include <Atom/RHI/TagRegistry.h>
+
+namespace AZ
+{
+    namespace RHI
+    {
+        using DrawFilterTagRegistry = TagRegistry<DrawFilterTag, Limits::Pipeline::DrawFilterTagCountMax>;
+    }
+}
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h
index 65ca1d3a97..23fa2e691c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h
@@ -11,6 +11,7 @@
 */
 #pragma once
 
+#include <Atom/RHI.Reflect/Handle.h>
 #include <Atom/RHI.Reflect/Limits.h>
 #include <Atom/RHI/StreamBufferView.h>
 #include <Atom/RHI/IndexBufferView.h>
@@ -152,36 +153,53 @@ namespace AZ
         };
 
         using DrawItemSortKey = int64_t;
-
-        struct DrawItemKeyPair
+                
+        // A filter associate to a DrawItem which can be used to filter the DrawItem when submitting to command list
+        using DrawFilterTag = Handle<uint8_t>;
+        using DrawFilterMask = uint32_t; // AZStd::bitset's impelmentation is too expensive.
+        constexpr uint32_t DrawFilterMaskDefaultValue = uint32_t(-1);  // Default all bit to 1.
+        static_assert(sizeof(DrawFilterMask) * 8 >= Limits::Pipeline::DrawFilterTagCountMax, "DrawFilterMask doesn't have enough bits for maximum tag count");
+     
+        struct DrawItemProperties
         {
-            DrawItemKeyPair() = default;
+            DrawItemProperties() = default;
 
-            DrawItemKeyPair(const DrawItem* item, DrawItemSortKey sortKey)
+            DrawItemProperties(const DrawItem* item, DrawItemSortKey sortKey = 0, DrawFilterMask filterMask = DrawFilterMaskDefaultValue)
                 : m_item{item}
                 , m_sortKey{sortKey}
-            {}
+                , m_drawFilterMask{filterMask}
+            {
+            }
 
-            bool operator == (const DrawItemKeyPair& rhs) const
+            bool operator==(const DrawItemProperties& rhs) const
             {
                 return m_item == rhs.m_item &&
                     m_sortKey == rhs.m_sortKey &&
-                    m_depth == rhs.m_depth;
+                    m_depth == rhs.m_depth &&
+                    m_drawFilterMask == rhs.m_drawFilterMask
+                    ;
             }
 
-            bool operator != (const DrawItemKeyPair& rhs) const
+            bool operator!=(const DrawItemProperties& rhs) const
             {
                 return !(*this == rhs);
             }
 
-            bool operator < (const DrawItemKeyPair& rhs) const
+            bool operator<(const DrawItemProperties& rhs) const
             {
                 return m_sortKey < rhs.m_sortKey;
             }
 
+            //! A pointer to the draw item
             const DrawItem* m_item = nullptr;
+            //! A sorting key of this draw item which is used for sorting draw items in DrawList
+            // Check RHI::SortDrawList() function for detail
             DrawItemSortKey m_sortKey = 0;
+            //! A depth value this draw item which is used for sorting draw items in DrawList
+            //! Check RHI::SortDrawList() function for detail
             float m_depth = 0.0f;
+            //! A filter mask which helps decide whether to submit this draw item to a Scope's command list or not
+            DrawFilterMask m_drawFilterMask = DrawFilterMaskDefaultValue;
         };
 
     }
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h
index 71c1cc026c..e232b1cf07 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h
@@ -39,8 +39,8 @@ namespace AZ
         using DrawListTag = Handle<uint8_t>;
         using DrawListMask = AZStd::bitset<RHI::Limits::Pipeline::DrawListTagCountMax>;
 
-        using DrawList = AZStd::vector<RHI::DrawItemKeyPair>;
-        using DrawListView = AZStd::array_view<RHI::DrawItemKeyPair>;
+        using DrawList = AZStd::vector<RHI::DrawItemProperties>;
+        using DrawListView = AZStd::array_view<RHI::DrawItemProperties>;
 
         /// Contains a table of draw lists, indexed by the tag.
         using DrawListsByTag = AZStd::array<DrawList, RHI::Limits::Pipeline::DrawListTagCountMax>;
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h
index 00514ef3ef..c8f792ac49 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h
@@ -53,7 +53,7 @@ namespace AZ
 
             /// Adds an individual draw item to the draw list associated with the provided tag. This will
             /// no-op if the tag is not present in the internal draw list mask.
-            void AddDrawItem(DrawListTag drawListTag, DrawItemKeyPair drawItemKeyPair);
+            void AddDrawItem(DrawListTag drawListTag, DrawItemProperties drawItemProperties);
 
             /// Coalesces the draw lists in preparation for access via GetList. This should
             /// be called from a single thread as a sync point between the append / consume phases.
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h
index 471066a6e2..7c6e9899d8 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h
@@ -12,83 +12,12 @@
 #pragma once
 
 #include <Atom/RHI/DrawList.h>
-#include <AzCore/Name/Name.h>
-#include <AzCore/std/smart_ptr/intrusive_base.h>
-#include <AzCore/std/parallel/shared_mutex.h>
+#include <Atom/RHI/TagRegistry.h>
 
 namespace AZ
 {
     namespace RHI
     {
-        /**
-         * Allocates and registers draw list tags by name, allowing the user to acquire and find tags from names.
-         * The class is designed to map user-friendly tag names defined through content or higher level code to
-         * low-level tags, which are simple handles.
-         *
-         * Some notes about usage and design:
-         *   - DrawListTag values represent indexes into a bitmask, which allows for fast comparison when filtering
-         *     draw items into draw lists (see View::HasDrawListTag()).
-         *   - Tags are reference counted, which means multiple calls to 'Acquire' with the same name will increment 
-         *     the internal reference count on the tag. This allows shared ownership between systems, if necessary.
-         *   - FindTag is provided to search for a tag reference without taking ownership.
-         *   - Names are case sensitive.
-         */
-        class DrawListTagRegistry final
-            : public AZStd::intrusive_base
-        {
-        public:
-            AZ_CLASS_ALLOCATOR(DrawListTagRegistry, AZ::SystemAllocator, 0);
-            AZ_DISABLE_COPY_MOVE(DrawListTagRegistry);
-
-            static Ptr<DrawListTagRegistry> Create();
-
-            /**
-             * Resets the registry back to an empty state. All references are released.
-             */
-            void Reset();
-
-            /**
-             * Acquires a draw list tag from the provided name (case sensitive). If the tag already existed, it is ref-counted.
-             * Returns a valid tag on success; returns a null tag if the registry is at full capacity. You must
-             * call ReleaseTag() if successful.
-             */
-            DrawListTag AcquireTag(const Name& drawListName);
-
-            /**
-             * Releases a reference to a tag. Tags are ref-counted, so it's necessary to maintain ownership of the
-             * tag and release when its no longer needed.
-             */
-            void ReleaseTag(DrawListTag drawListTag);
-
-            /**
-             * Finds the tag associated with the provided name (case sensitive). If a tag exists with that name, the tag
-             * is returned. The reference count is NOT incremented on success; ownership is not passed to the user. If
-             * the tag does not exist, a null tag is returned.
-             */
-            DrawListTag FindTag(const Name& drawListName) const;
-
-            /**
-             * Returns the name of the given DrawListTag, or empty string if the tag is not registered.
-             */
-            Name GetName(DrawListTag tag) const;
-
-            /**
-             * Returns the number of allocated tags in the registry.
-             */
-            size_t GetAllocatedTagCount() const;
-
-        private:
-            DrawListTagRegistry() = default;
-
-            struct Entry
-            {
-                Name m_name;
-                size_t m_refCount = 0;
-            };
-
-            mutable AZStd::shared_mutex m_mutex;
-            AZStd::array<Entry, Limits::Pipeline::DrawListTagCountMax> m_entriesByTag;
-            size_t m_allocatedTagCount = 0;
-        };
+        using DrawListTagRegistry = TagRegistry<DrawListTag, Limits::Pipeline::DrawListTagCountMax>;
     }
 }
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h
index 124cbe2c1b..988c3a73dd 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h
@@ -21,45 +21,48 @@ namespace AZ
 
     namespace RHI
     {
-        /**
-         * DrawPacket is a packed data structure (one contiguous allocation) containing a collection of
-         * DrawItems and their associated array data. Each draw item in the packet is associated
-         * with a DrawListTag. All draw items in the packet share the same set of shader resource
-         * groups, index buffer, and draw arguments.
-         *
-         * Some notes about design and usage:
-         *   - Draw packets should be used to 'broadcast' variations of the same 'object' to multiple passes.
-         *     For example: 'Shadow', 'Depth', 'Forward'.
-         *
-         *   - Draw packets can be re-used between different views, scenes, or passes. The embedded shader resource groups
-         *     should represent only the local data necessary to describe the 'object', not the full context including
-         *     scene / view / pass specific state. They serve as a 'template'.
-         *
-         *   - The packet is self-contained and does not reference external memory. Use DrawPacketBuilder to construct
-         *     an instance and either store in an RHI::Ptr or call 'delete' to release.
-         */
+        //!
+        //! DrawPacket is a packed data structure (one contiguous allocation) containing a collection of
+        //! DrawItems and their associated array data. Each draw item in the packet is associated
+        //! with a DrawListTag. All draw items in the packet share the same set of shader resource
+        //! groups, index buffer, one DrawFilterMask, and draw arguments.
+        //! 
+        //! Some notes about design and usage:
+        //!   - Draw packets should be used to 'broadcast' variations of the same 'object' to multiple passes.
+        //!     For example: 'Shadow', 'Depth', 'Forward'.
+        //! 
+        //!   - Draw packets can be re-used between different views, scenes, or passes. The embedded shader resource groups
+        //!     should represent only the local data necessary to describe the 'object', not the full context including
+        //!     scene / view / pass specific state. They serve as a 'template'.
+        //! 
+        //!   - The packet is self-contained and does not reference external memory. Use DrawPacketBuilder to construct
+        //!     an instance and either store in an RHI::Ptr or call 'delete' to release.
+        //! 
         class DrawPacket final : public AZStd::intrusive_base
         {
             friend class DrawPacketBuilder;
         public:
-            using DrawItemVisitor = AZStd::function<void(DrawListTag, DrawItemKeyPair)>;
+            using DrawItemVisitor = AZStd::function<void(DrawListTag, DrawItemProperties)>;
 
-            /// Draw packets cannot be move constructed or copied, as they contain an additional memory payload.
+            //! Draw packets cannot be move constructed or copied, as they contain an additional memory payload.
             AZ_DISABLE_COPY_MOVE(DrawPacket);
 
-            /// Returns the mask representing all the draw lists affected by the packet.
+            //! Returns the mask representing all the draw lists affected by the packet.
             DrawListMask GetDrawListMask() const;
 
-            /// Returns the number of draw items stored in the packet.
+            //! Returns the number of draw items stored in the packet.
             size_t GetDrawItemCount() const;
 
-            /// Returns the draw item / sort key associated with the provided index.
-            DrawItemKeyPair GetDrawItem(size_t index) const;
+            //! Returns the draw item and its properties associated with the provided index.
+            DrawItemProperties GetDrawItem(size_t index) const;
 
-            /// Returns the draw list tag associated with the provided index.
+            //! Returns the draw list tag associated with the provided index.
             DrawListTag GetDrawListTag(size_t index) const;
 
-            /// Overloaded operator delete for freeing a draw packet.
+            //! Returns the draw filter mask which applied to all the draw items.
+            DrawFilterMask GetDrawFilterMask() const;
+
+            //! Overloaded operator delete for freeing a draw packet.
             void operator delete(void* p, size_t size);
 
         private:
@@ -72,6 +75,9 @@ namespace AZ
             // The bit-mask of all active filter tags.
             DrawListMask m_drawListMask = 0;
 
+            // The draw filter applies to each draw item
+            DrawFilterMask m_drawFilterMask = DrawFilterMaskDefaultValue;
+
             // The index buffer view used when the draw call is indexed.
             IndexBufferView m_indexBufferView;
 
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h
index 9a091980bc..15303158f9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h
@@ -29,23 +29,26 @@ namespace AZ
             {
                 DrawRequest() = default;
 
-                /// The filter tag used to direct the draw item.
+                //! The filter tag used to direct the draw item.
                 DrawListTag m_listTag;
 
-                /// The stencil ref value used for this draw item.
+                //! The stencil ref value used for this draw item.
                 uint8_t m_stencilRef = 0;
 
-                /// The array of stream buffers to bind for this draw item.
+                //! The array of stream buffers to bind for this draw item.
                 AZStd::array_view<StreamBufferView> m_streamBufferViews;
 
-                /// Shader resource group unique for this draw request
+                //! Shader resource group unique for this draw request
                 const ShaderResourceGroup* m_uniqueShaderResourceGroup = nullptr;
 
-                /// The pipeline state assigned to this draw item.
+                //! The pipeline state assigned to this draw item.
                 const PipelineState* m_pipelineState = nullptr;
 
-                /// The sort key assigned to this draw item.
+                //! The sort key assigned to this draw item.
                 DrawItemSortKey m_sortKey = 0;
+
+                //! The filter associated to this draw item. 
+                DrawFilterMask m_drawFilterMask = DrawFilterMaskDefaultValue;
             };
 
             // NOTE: This is configurable; just used to control the amount of memory held by the builder.
@@ -69,6 +72,8 @@ namespace AZ
 
             void AddShaderResourceGroup(const ShaderResourceGroup* shaderResourceGroup);
 
+            void SetDrawFilterMask(DrawFilterMask filterMask);
+
             void AddDrawItem(const DrawRequest& request);
 
             const DrawPacket* End();
@@ -79,6 +84,7 @@ namespace AZ
             IAllocatorAllocate* m_allocator = nullptr;
             DrawArguments m_drawArguments;
             DrawListMask m_drawListMask = 0;
+            DrawFilterMask m_drawFilterMask = DrawFilterMaskDefaultValue;
             size_t m_streamBufferViewCount = 0;
             IndexBufferView m_indexBufferView;
             AZStd::fixed_vector<DrawRequest, DrawItemCountMax> m_drawRequests;
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h
index e7aea89993..784f9344b4 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h
@@ -15,13 +15,13 @@
 #include <AzCore/Name/Name.h>
 #include <AzCore/EBus/EBus.h>
 #include <Atom/RHI.Reflect/FrameSchedulerEnums.h>
+#include <Atom/RHI/DrawListTagRegistry.h>
 
 namespace AZ
 {
     namespace RHI
     {
         class Device;
-        class DrawListTagRegistry;
         class FrameGraphBuilder;
         class PipelineState;
         class PipelineStateCache;
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/TagRegistry.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/TagRegistry.h
new file mode 100644
index 0000000000..429a49657b
--- /dev/null
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/TagRegistry.h
@@ -0,0 +1,188 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <AzCore/Name/Name.h>
+#include <AzCore/std/smart_ptr/intrusive_base.h>
+#include <AzCore/std/parallel/shared_mutex.h>
+
+namespace AZ
+{
+    namespace RHI
+    {
+        //! 
+        //! Allocates and registers tags by name, allowing the user to acquire and find tags from names.
+        //! The class is designed to map user-friendly tag names defined through content or higher level code to
+        //! low-level tags, which are simple handles.
+        //! 
+        //! Some notes about usage and design:
+        //!   - TagType need to be a Handle<Integer> type.
+        //!   - Tags are reference counted, which means multiple calls to 'Acquire' with the same name will increment 
+        //!     the internal reference count on the tag. This allows shared ownership between systems, if necessary.
+        //!   - FindTag is provided to search for a tag reference without taking ownership.
+        //!   - Names are case sensitive.
+        //!
+        template<typename TagType, size_t MaxTagCount>
+        class TagRegistry final
+            : public AZStd::intrusive_base
+        {
+        public:
+            AZ_CLASS_ALLOCATOR(TagRegistry, AZ::SystemAllocator, 0);
+            AZ_DISABLE_COPY_MOVE(TagRegistry);
+
+            static Ptr<TagRegistry> Create();
+
+            //! Resets the registry back to an empty state. All references are released.
+            void Reset();
+
+            //! Acquires a tag from the provided name (case sensitive). If the tag already existed, it is ref-counted.
+            //! Returns a valid tag on success; returns a null tag if the registry is at full capacity. You must
+            //! call ReleaseTag() if successful.
+            TagType AcquireTag(const Name& tagName);
+
+            //! Releases a reference to a tag. Tags are ref-counted, so it's necessary to maintain ownership of the
+            //! tag and release when its no longer needed.
+            void ReleaseTag(TagType tagName);
+
+           //! Finds the tag associated with the provided name (case sensitive). If a tag exists with that name, the tag
+           //! is returned. The reference count is NOT incremented on success; ownership is not passed to the user. If
+           //! the tag does not exist, a null tag is returned.
+            TagType FindTag(const Name& tagName) const;
+
+            //! Returns the name of the given tag, or empty string if the tag is not registered.
+            Name GetName(TagType tag) const;
+
+            //! Returns the number of allocated tags in the registry.
+            size_t GetAllocatedTagCount() const;
+
+        private:
+            TagRegistry() = default;
+
+            struct Entry
+            {
+                Name m_name;
+                size_t m_refCount = 0;
+            };
+
+            mutable AZStd::shared_mutex m_mutex;
+            AZStd::array<Entry, MaxTagCount> m_entriesByTag;
+            size_t m_allocatedTagCount = 0;
+        };
+
+        template<typename TagType, size_t MaxTagCount>
+        Ptr<TagRegistry<TagType, MaxTagCount>> TagRegistry<TagType, MaxTagCount>::Create()
+        {
+            return aznew TagRegistry<TagType, MaxTagCount>();
+        }
+
+        template<typename TagType, size_t MaxTagCount>
+        void TagRegistry<TagType, MaxTagCount>::Reset()
+        {
+            AZStd::unique_lock<AZStd::shared_mutex> lock(m_mutex);
+            m_entriesByTag.fill({});
+            m_allocatedTagCount = 0;
+        }
+
+        template<typename TagType, size_t MaxTagCount>
+        TagType TagRegistry<TagType, MaxTagCount>::AcquireTag(const Name& tagName)
+        {
+            if (tagName.IsEmpty())
+            {
+                return {};
+            }
+
+            TagType tag;
+            Entry* foundEmptyEntry = nullptr;
+
+            AZStd::unique_lock<AZStd::shared_mutex> lock(m_mutex);
+            for (size_t i = 0; i < m_entriesByTag.size(); ++i)
+            {
+                Entry& entry = m_entriesByTag[i];
+
+                // Found an empty entry. Cache off the tag and pointer, but keep searching to find if
+                // another entry holds the same name.
+                if (entry.m_refCount == 0 && !foundEmptyEntry)
+                {
+                    foundEmptyEntry = &entry;
+                    tag = TagType(i);
+                }
+                else if (entry.m_name == tagName)
+                {
+                    entry.m_refCount++;
+                    return TagType(i);
+                }
+            }
+
+            // No other entry holds the name, so allocate the empty entry.
+            if (foundEmptyEntry)
+            {
+                foundEmptyEntry->m_refCount = 1;
+                foundEmptyEntry->m_name = tagName;
+                ++m_allocatedTagCount;
+            }
+
+            return tag;
+        }
+
+        template<typename TagType, size_t MaxTagCount>
+        void TagRegistry<TagType, MaxTagCount>::ReleaseTag(TagType tag)
+        {
+            if (tag.IsValid())
+            {
+                AZStd::unique_lock<AZStd::shared_mutex> lock(m_mutex);
+                Entry& entry = m_entriesByTag[tag.GetIndex()];
+                const size_t refCount = --entry.m_refCount;
+                AZ_Assert(
+                    refCount != static_cast<size_t>(-1), "Attempted to forfeit a tag that is not valid. Tag{%d},Name{'%s'}", tag,
+                    entry.m_name.GetCStr());
+                if (refCount == 0)
+                {
+                    entry.m_name = Name();
+                    --m_allocatedTagCount;
+                }
+            }
+        }
+
+        template<typename TagType, size_t MaxTagCount>
+        TagType TagRegistry<TagType, MaxTagCount>::FindTag(const Name& tagName) const
+        {
+            AZStd::shared_lock<AZStd::shared_mutex> lock(m_mutex);
+            for (size_t i = 0; i < m_entriesByTag.size(); ++i)
+            {
+                if (m_entriesByTag[i].m_name == tagName)
+                {
+                    return TagType(i);
+                }
+            }
+            return {};
+        }
+
+        template<typename TagType, size_t MaxTagCount>
+        Name TagRegistry<TagType, MaxTagCount>::GetName(TagType tag) const
+        {
+            if (tag.GetIndex() < m_entriesByTag.size())
+            {
+                return m_entriesByTag[tag.GetIndex()].m_name;
+            }
+            else
+            {
+                return Name();
+            }
+        }
+
+        template<typename TagType, size_t MaxTagCount>
+        size_t TagRegistry<TagType, MaxTagCount>::GetAllocatedTagCount() const
+        {
+            return m_allocatedTagCount;
+        }
+    }
+}
diff --git a/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp
index 518ec59ac5..c50255224f 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp
@@ -35,8 +35,7 @@ namespace AZ
             switch (sortType)
             {
             case DrawListSortType::KeyThenDepth:
-                AZStd::sort(drawList.begin(), drawList.end(),
-                    [](const DrawItemKeyPair& a, const DrawItemKeyPair& b)
+                AZStd::sort(drawList.begin(), drawList.end(), [](const DrawItemProperties& a, const DrawItemProperties& b)
                     {
                         if (a.m_sortKey != b.m_sortKey)
                         {
@@ -48,8 +47,7 @@ namespace AZ
                 break;
 
             case DrawListSortType::KeyThenReverseDepth:
-                AZStd::sort(drawList.begin(), drawList.end(),
-                    [](const DrawItemKeyPair& a, const DrawItemKeyPair& b)
+                AZStd::sort(drawList.begin(), drawList.end(), [](const DrawItemProperties& a, const DrawItemProperties& b)
                     {
                         if (a.m_sortKey != b.m_sortKey)
                         {
@@ -61,8 +59,7 @@ namespace AZ
                 break;
 
             case DrawListSortType::DepthThenKey:
-                AZStd::sort(drawList.begin(), drawList.end(),
-                    [](const DrawItemKeyPair& a, const DrawItemKeyPair& b)
+                AZStd::sort(drawList.begin(), drawList.end(), [](const DrawItemProperties& a, const DrawItemProperties& b)
                     {
                         if (a.m_depth != b.m_depth)
                         {
@@ -74,8 +71,7 @@ namespace AZ
                 break;
 
             case DrawListSortType::ReverseDepthThenKey:
-                AZStd::sort(drawList.begin(), drawList.end(),
-                    [](const DrawItemKeyPair& a, const DrawItemKeyPair& b)
+                AZStd::sort(drawList.begin(), drawList.end(), [](const DrawItemProperties& a, const DrawItemProperties& b)
                     {
                         if (a.m_depth != b.m_depth)
                         {
diff --git a/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp
index dbd06c6969..8cec5ba39b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp
@@ -63,14 +63,14 @@ namespace AZ
 
                 if (m_drawListMask[drawListTag.GetIndex()])
                 {
-                    DrawItemKeyPair drawItem = drawPacket->GetDrawItem(i);
+                    DrawItemProperties drawItem = drawPacket->GetDrawItem(i);
                     drawItem.m_depth = depth;
                     threadListsByTag[drawListTag.GetIndex()].push_back(drawItem);
                 }
             }
         }
 
-        void DrawListContext::AddDrawItem(DrawListTag drawListTag, DrawItemKeyPair drawItemKeyPair)
+        void DrawListContext::AddDrawItem(DrawListTag drawListTag, DrawItemProperties drawItemProperties)
         {
             if (Validation::IsEnabled())
             {
@@ -84,7 +84,7 @@ namespace AZ
             if (m_drawListMask[drawListTag.GetIndex()])
             {
                 DrawListsByTag& drawListsByTag = m_threadListsByTag.GetStorage();
-                drawListsByTag[drawListTag.GetIndex()].push_back(drawItemKeyPair);
+                drawListsByTag[drawListTag.GetIndex()].push_back(drawItemProperties);
             }
         }
 
diff --git a/Gems/Atom/RHI/Code/Source/RHI/DrawListTagRegistry.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawListTagRegistry.cpp
deleted file mode 100644
index 14d517962a..0000000000
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawListTagRegistry.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <Atom/RHI/DrawListTagRegistry.h>
-
-namespace AZ
-{
-    namespace RHI
-    {
-        Ptr<DrawListTagRegistry> DrawListTagRegistry::Create()
-        {
-            return aznew DrawListTagRegistry;
-        }
-
-        void DrawListTagRegistry::Reset()
-        {
-            AZStd::unique_lock<AZStd::shared_mutex> lock(m_mutex);
-            m_entriesByTag.fill({});
-            m_allocatedTagCount = 0;
-        }
-
-        DrawListTag DrawListTagRegistry::AcquireTag(const Name& drawListName)
-        {
-            if (drawListName.IsEmpty())
-            {
-                return {};
-            }
-
-            DrawListTag drawListTag;
-            Entry* foundEmptyEntry = nullptr;
-
-            AZStd::unique_lock<AZStd::shared_mutex> lock(m_mutex);
-            for (size_t i = 0; i < m_entriesByTag.size(); ++i)
-            {
-                Entry& entry = m_entriesByTag[i];
-
-                // Found an empty entry. Cache off the tag and pointer, but keep searching to find if
-                // another entry holds the same name.
-                if (entry.m_refCount == 0 && !foundEmptyEntry)
-                {
-                    foundEmptyEntry = &entry;
-                    drawListTag = DrawListTag(i);
-                }
-                else if (entry.m_name == drawListName)
-                {
-                    entry.m_refCount++;
-                    return DrawListTag(i);
-                }
-            }
-
-            // No other entry holds the name, so allocate the empty entry.
-            if (foundEmptyEntry)
-            {
-                foundEmptyEntry->m_refCount = 1;
-                foundEmptyEntry->m_name = drawListName;
-                ++m_allocatedTagCount;
-            }
-
-            return drawListTag;
-        }
-
-        void DrawListTagRegistry::ReleaseTag(DrawListTag drawListTag)
-        {
-            if (drawListTag.IsValid())
-            {
-                AZStd::unique_lock<AZStd::shared_mutex> lock(m_mutex);
-                Entry& entry = m_entriesByTag[drawListTag.GetIndex()];
-                const size_t refCount = --entry.m_refCount;
-                AZ_Assert(refCount != static_cast<size_t>(-1), "Attempted to forfeit a tag that is not valid. Tag{%d},Name{'%s'}", drawListTag, entry.m_name.GetCStr());
-                if (refCount == 0)
-                {
-                    entry.m_name = Name();
-                    --m_allocatedTagCount;
-                }
-            }
-        }
-
-        DrawListTag DrawListTagRegistry::FindTag(const Name& drawListName) const
-        {
-            AZStd::shared_lock<AZStd::shared_mutex> lock(m_mutex);
-            for (size_t i = 0; i < m_entriesByTag.size(); ++i)
-            {
-                if (m_entriesByTag[i].m_name == drawListName)
-                {
-                    return DrawListTag(i);
-                }
-            }
-            return {};
-        }
-
-        Name DrawListTagRegistry::GetName(DrawListTag tag) const
-        {
-            if (tag.GetIndex() < m_entriesByTag.size())
-            {
-                return m_entriesByTag[tag.GetIndex()].m_name;
-            }
-            else
-            {
-                return Name();
-            }
-        }
-
-        size_t DrawListTagRegistry::GetAllocatedTagCount() const
-        {
-            return m_allocatedTagCount;
-        }
-    }
-}
diff --git a/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp
index fdc925c341..85580fdc84 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp
@@ -24,10 +24,10 @@ namespace AZ
             return m_drawItemCount;
         }
 
-        DrawItemKeyPair DrawPacket::GetDrawItem(size_t index) const
+        DrawItemProperties DrawPacket::GetDrawItem(size_t index) const
         {
             AZ_Assert(index < GetDrawItemCount(), "Out of bounds array access!");
-            return DrawItemKeyPair(&m_drawItems[index], m_drawItemSortKeys[index]);
+            return DrawItemProperties(&m_drawItems[index], m_drawItemSortKeys[index], m_drawFilterMask);
         }
 
         DrawListTag DrawPacket::GetDrawListTag(size_t index) const
@@ -36,6 +36,11 @@ namespace AZ
             return m_drawListTags[index];
         }
 
+        DrawFilterMask DrawPacket::GetDrawFilterMask() const
+        {
+            return m_drawFilterMask;
+        }
+
         DrawListMask DrawPacket::GetDrawListMask() const
         {
             return m_drawListMask;
diff --git a/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp
index 203818b166..45732e66a7 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp
@@ -82,6 +82,11 @@ namespace AZ
             }
         }
 
+        void DrawPacketBuilder::SetDrawFilterMask(DrawFilterMask filterMask)
+        {
+            m_drawFilterMask = filterMask;
+        }
+
         void DrawPacketBuilder::AddDrawItem(const DrawRequest& request)
         {
             if (request.m_listTag.IsValid())
@@ -165,6 +170,7 @@ namespace AZ
             drawPacket->m_allocator = m_allocator;
             drawPacket->m_indexBufferView =  m_indexBufferView;
             drawPacket->m_drawListMask = m_drawListMask;
+            drawPacket->m_drawFilterMask = m_drawFilterMask;
 
             if (shaderResourceGroupsOffset.IsValid())
             {
@@ -288,6 +294,7 @@ namespace AZ
             m_rootConstants = {};
             m_scissors.clear();
             m_viewports.clear();
+            m_drawFilterMask = DrawFilterMaskDefaultValue;
         }
     }
 }
diff --git a/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp b/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
index 067090e909..f92d2621b1 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
@@ -60,7 +60,7 @@ namespace AZ
                 AZ_Assert(false, "RHISystem", "Unable to initialize RHI! \n");
                 return;
             }
-            
+
             m_drawListTagRegistry = RHI::DrawListTagRegistry::Create();
             m_pipelineStateCache = RHI::PipelineStateCache::Create(*m_device);
 
@@ -199,7 +199,6 @@ namespace AZ
             m_frameScheduler.Shutdown();
 
             m_platformLimitsDescriptor = nullptr;
-            m_drawListTagRegistry = nullptr;
             m_pipelineStateCache = nullptr;
             m_device->PreShutdown();
             AZ_Assert(m_device->use_count()==1, "The ref count for Device is %i but it should be 1 here to ensure all the resources are released", m_device->use_count());
diff --git a/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp b/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp
index 75a9081100..7fc393cd0c 100644
--- a/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp
@@ -80,11 +80,11 @@ namespace UnitTest
             m_indexBufferView = RHI::IndexBufferView(*m_bufferEmpty, random.GetRandom(), random.GetRandom(), RHI::IndexFormat::Uint16);
         }
 
-        void ValidateDrawItem(const DrawItemData& drawItemData, RHI::DrawItemKeyPair itemKeyPair) const
+        void ValidateDrawItem(const DrawItemData& drawItemData, RHI::DrawItemProperties itemProperties) const
         {
-            const RHI::DrawItem* drawItem = itemKeyPair.m_item;
+            const RHI::DrawItem* drawItem = itemProperties.m_item;
 
-            EXPECT_EQ(itemKeyPair.m_sortKey, drawItemData.m_sortKey);
+            EXPECT_EQ(itemProperties.m_sortKey, drawItemData.m_sortKey);
             EXPECT_EQ(drawItem->m_stencilRef, drawItemData.m_stencilRef);
             EXPECT_EQ(drawItem->m_pipelineState, drawItemData.m_pipelineState);
 
diff --git a/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake b/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake
index 79239e2c09..d39c3cb6df 100644
--- a/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake
+++ b/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake
@@ -36,6 +36,7 @@ set(FILES
     Include/Atom/RHI/CopyItem.h
     Include/Atom/RHI/ConstantsData.h
     Include/Atom/RHI/DispatchItem.h
+    Include/Atom/RHI/DrawFilterTagRegistry.h
     Include/Atom/RHI/DrawItem.h
     Include/Atom/RHI/DrawList.h
     Include/Atom/RHI/DrawListTagRegistry.h
@@ -48,7 +49,6 @@ set(FILES
     Source/RHI/ConstantsData.cpp
     Source/RHI/DrawList.cpp
     Source/RHI/DrawListContext.cpp
-    Source/RHI/DrawListTagRegistry.cpp
     Source/RHI/DrawPacket.cpp
     Source/RHI/DrawPacketBuilder.cpp
     Include/Atom/RHI/Device.h
@@ -201,4 +201,5 @@ set(FILES
     Include/Atom/RHI/CpuProfiler.h
     Include/Atom/RHI/CpuProfilerImpl.h
     Source/RHI/CpuProfilerImpl.cpp
+    Include/Atom/RHI/TagRegistry.h
 )
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
index 7b39e56274..96b9f171c8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
@@ -285,11 +285,6 @@ namespace AZ
                 // This is not 100% correct, but in most cases it will give us the correct result.
                 info.depthClampEnable = rasterState.m_depthClipEnable ? VK_FALSE : VK_TRUE;
             }
-            else if (!rasterState.m_depthClipEnable)
-            {
-                AZ_Error("Vulkan", false, "Depth clipping is being used but it's not supported on this device");
-                return RHI::ResultCode::InvalidArgument;
-            }
 
             switch (rasterState.m_fillMode)
             {
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
index 3393f6af5c..e4b9b91e81 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
@@ -156,6 +156,13 @@ namespace AZ
             //! Get the shader which is associated with this DynamicDrawContext
             const Data::Instance<Shader>& GetShader() const;
 
+            //! Set the sort key for the next draw.
+            //! Note: The sort key will be increased by 1 whenever the a draw function is called.
+            void SetSortKey(RHI::DrawItemSortKey key);
+
+            //! Get the current sort key.
+            RHI::DrawItemSortKey GetSortKey() const;
+
         private:
             DynamicDrawContext() = default;
 
@@ -214,6 +221,10 @@ namespace AZ
             Scene* m_scene = nullptr;
             RHI::DrawListTag m_drawListTag;
 
+            // All draw items use this filter when submit them to views
+            // It's set to RenderPipeline's draw filter mask if the DynamicDrawContext was created for a render pipeline.
+            RHI::DrawFilterMask m_drawFilter = RHI::DrawFilterMaskDefaultValue;
+
             // Cached draw data
             AZStd::vector<RHI::StreamBufferView> m_cachedStreamBufferViews;
             AZStd::vector<RHI::IndexBufferView> m_cachedIndexBufferViews;
@@ -224,6 +235,7 @@ namespace AZ
             struct DrawItemInfo
             {
                 RHI::DrawItem m_drawItem;
+                RHI::DrawItemSortKey m_sortKey;
                 uint32_t m_vertexBufferViewIndex = InvalidIndex;
                 uint32_t m_indexBufferViewIndex = InvalidIndex;
             };
@@ -239,6 +251,8 @@ namespace AZ
             // This variable is used to see if the context is initialized.
             // You can only add draw calls when the context is initialized.
             bool m_initialized = false;
+
+            RHI::DrawItemSortKey m_sortKey = 0;
         };
 
         AZ_DEFINE_ENUM_BITWISE_OPERATORS(AZ::RPI::DynamicDrawContext::DrawStateOptions);
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h
index cd7f9d1bb6..50b13277af 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h
@@ -56,9 +56,11 @@ namespace AZ
             //! Draw calls which are made to this DynamicDrawContext will only be submitted for this scene.
             //! The created DynamicDrawContext is managed by dynamic draw system.
             virtual RHI::Ptr<DynamicDrawContext> CreateDynamicDrawContext(Scene* scene) = 0;
-
-            //! Create a DynamicDrawContext for specified pass
-            virtual RHI::Ptr<DynamicDrawContext> CreateDynamicDrawContext(Pass* pass = nullptr) = 0;
+                                    
+            //! Create a DynamicDrawContext for specified render pipeline
+            //! Draw calls submitted through the context created by this function are only submitted
+            //! to the supplied render pipeline (viewport)
+            virtual RHI::Ptr<DynamicDrawContext> CreateDynamicDrawContext(RenderPipeline* pipeline) = 0;
 
             //! Get a DynamicBuffer from DynamicDrawSystem.
             //! The returned buffer will be invalidated every time the RPISystem's RenderTick is called
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h
index 07cbed7e72..21c0078374 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h
@@ -36,7 +36,7 @@ namespace AZ
 
             // DynamicDrawInterface overrides...
             RHI::Ptr<DynamicDrawContext> CreateDynamicDrawContext(Scene* scene) override;
-            RHI::Ptr<DynamicDrawContext> CreateDynamicDrawContext(Pass* pass) override;
+            RHI::Ptr<DynamicDrawContext> CreateDynamicDrawContext(RenderPipeline* pipeline) override;
             RHI::Ptr<DynamicBuffer> GetDynamicBuffer(uint32_t size, uint32_t alignment = 1) override;
             void DrawGeometry(Data::Instance<Material> material, const GeometryData& geometry, ScenePtr scene) override;
             void AddDrawPacket(Scene* scene, AZStd::unique_ptr<const RHI::DrawPacket> drawPacket) override;
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h
index b81aa84c20..5595c1d2ac 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h
@@ -184,6 +184,12 @@ namespace AZ
             //! Get current render mode
             RenderMode GetRenderMode() const;
 
+            //! Get draw filter tag
+            RHI::DrawFilterTag GetDrawFilterTag() const;
+
+            //! Get draw filter mask
+            RHI::DrawFilterMask GetDrawFilterMask() const;
+
         private:
             RenderPipeline() = default;
 
@@ -211,6 +217,8 @@ namespace AZ
             // if the view already exists in map, its DrawListMask will be combined to the existing one's
             void CollectPersistentViews(AZStd::map<ViewPtr, RHI::DrawListMask>& outViewMasks) const;
 
+            void SetDrawFilterTag(RHI::DrawFilterTag);
+
             // End of functions accessed by Scene class
             //////////////////////////////////////////////////
 
@@ -250,6 +258,13 @@ namespace AZ
 
             // Original settings from RenderPipelineDescriptor, used to revert active render settings to original settings from RenderPipelineDescriptor
             PipelineRenderSettings m_originalRenderSettings;
+
+            // A tag to filter draw items submitted by passes of this render pipeline.
+            // This tag is allocated when it's added to a scene. It's set to invalid when it's removed to the scene.
+            RHI::DrawFilterTag m_drawFilterTag;
+            // A mask to filter draw items submitted by passes of this render pipeline.
+            // This mask is created from the value of m_drawFilterTag.
+            RHI::DrawFilterMask m_drawFilterMask = 0; 
         };
 
     } // namespace RPI
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h
index aac6f4fb97..ee54b16fea 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h
@@ -14,6 +14,7 @@
 
 #include <Atom/RHI/DrawList.h>
 #include <Atom/RHI/PipelineStateDescriptor.h>
+#include <Atom/RHI/DrawFilterTagRegistry.h>
 #include <Atom/RHI.Reflect/FrameSchedulerEnums.h>
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h>
 #include <Atom/RPI.Reflect/System/SceneDescriptor.h>
@@ -34,7 +35,7 @@
 #include <AzCore/Script/ScriptTimePoint.h>
 
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 namespace AZ
 {
@@ -234,6 +235,9 @@ namespace AZ
 
             // reference of dynamic draw system (from RPISystem)
             DynamicDrawSystem* m_dynamicDrawSystem = nullptr;
+
+            // Registry which allocates draw filter tag for RenderPipeline
+            RHI::Ptr<RHI::DrawFilterTagRegistry> m_drawFilterTagRegistry;
         };
 
         // --- Template functions ---
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
index 8721e08028..d6146d3760 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
@@ -75,7 +75,7 @@ namespace AZ
             void AddDrawPacket(const RHI::DrawPacket* drawPacket, Vector3 worldPosition);
 
             //! Add a draw item to this view with its associated draw list tag
-            void AddDrawItem(RHI::DrawListTag drawListTag, const RHI::DrawItemKeyPair& drawItemKeyPair);
+            void AddDrawItem(RHI::DrawListTag drawListTag, const RHI::DrawItemProperties& drawItemProperties);
 
             //! Sets the worldToView matrix and recalculates the other matrices.
             void SetWorldToViewMatrix(const AZ::Matrix4x4& worldToView);
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
index 5117c3d9dd..b7ba7d4a32 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
@@ -17,6 +17,7 @@
 #include <Atom/RPI.Public/DynamicDraw/DynamicBuffer.h>
 #include <Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h>
 #include <Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h>
+#include <Atom/RPI.Public/RenderPipeline.h>
 
 #include <Atom/RPI.Public/View.h>
 
@@ -446,6 +447,7 @@ namespace AZ
                 drawItem.m_viewports = &m_viewport;
             }
 
+            drawItemInfo.m_sortKey = m_sortKey++;
             m_cachedDrawItems.emplace_back(drawItemInfo);
         }
                 
@@ -526,6 +528,7 @@ namespace AZ
                 drawItem.m_viewports = &m_viewport;
             }
 
+            drawItemInfo.m_sortKey = m_sortKey++;
             m_cachedDrawItems.emplace_back(drawItemInfo);
         }
 
@@ -576,6 +579,16 @@ namespace AZ
             return m_shader;
         }
 
+        void DynamicDrawContext::SetSortKey(RHI::DrawItemSortKey key)
+        {
+            m_sortKey = key;
+        }
+
+        RHI::DrawItemSortKey DynamicDrawContext::GetSortKey() const
+        {
+            return m_sortKey;
+        }
+
         void DynamicDrawContext::SubmitDrawData(ViewPtr view)
         {
             if (!m_initialized)
@@ -587,8 +600,7 @@ namespace AZ
             {
                 return;
             }
-
-            uint64_t sortKey = 0; // use the draw order as sort key. 
+ 
             for (auto& drawItemInfo : m_cachedDrawItems)
             {
                 if (drawItemInfo.m_indexBufferViewIndex != InvalidIndex)
@@ -601,16 +613,17 @@ namespace AZ
                     drawItemInfo.m_drawItem.m_streamBufferViews = &m_cachedStreamBufferViews[drawItemInfo.m_vertexBufferViewIndex];
                 }
 
-                RHI::DrawItemKeyPair drawItemKeyPair;
-                drawItemKeyPair.m_sortKey = sortKey;
-                drawItemKeyPair.m_item = &drawItemInfo.m_drawItem;
-                view->AddDrawItem(m_drawListTag, drawItemKeyPair);
-                sortKey++;
+                RHI::DrawItemProperties drawItemProperties;
+                drawItemProperties.m_sortKey = drawItemInfo.m_sortKey;
+                drawItemProperties.m_item = &drawItemInfo.m_drawItem;
+                drawItemProperties.m_drawFilterMask = m_drawFilter;
+                view->AddDrawItem(m_drawListTag, drawItemProperties);
             }
         }
 
         void DynamicDrawContext::FrameEnd()
         {
+            m_sortKey = 0;
             m_cachedDrawItems.clear();
             m_cachedStreamBufferViews.clear();
             m_cachedIndexBufferViews.clear();
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp
index d7c459cbde..35b5fb205c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp
@@ -59,6 +59,11 @@ namespace AZ
 
         RHI::Ptr<DynamicDrawContext> DynamicDrawSystem::CreateDynamicDrawContext(Scene* scene)
         {
+            if (!scene)
+            {
+                AZ_Error("RPI", false, "Failed to create a DynamicDrawContext: the input scene is invalid");
+                return nullptr;
+            }
             RHI::Ptr<DynamicDrawContext> drawContext = aznew DynamicDrawContext();
             drawContext->m_scene = scene;
 
@@ -67,11 +72,17 @@ namespace AZ
             return drawContext;
         }
 
-        // [GFX TODO][ATOM-13185] Add support for creating DynamicDrawContext for Pass
-        RHI::Ptr<DynamicDrawContext> DynamicDrawSystem::CreateDynamicDrawContext([[maybe_unused]] Pass* pass)
+        RHI::Ptr<DynamicDrawContext> DynamicDrawSystem::CreateDynamicDrawContext(RenderPipeline* pipeline)
         {
-            AZ_Error("RPI", false, "Unimplemented function");
-            return nullptr;
+            if (!pipeline || !pipeline->GetScene())
+            {
+                AZ_Error("RPI", false, "Failed to create a DynamicDrawContext: the input RenderPipeline is invalid or wasn't added to a Scene");
+                return nullptr;
+            }
+
+            auto context = CreateDynamicDrawContext(pipeline->GetScene());
+            context->m_drawFilter = pipeline->GetDrawFilterMask();
+            return context;
         }
 
         // [GFX TODO][ATOM-13184] Add support of draw geometry with material for DynamicDrawSystemInterface
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp
index 84d1499602..baf1d22da5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp
@@ -195,9 +195,12 @@ namespace AZ
                 SetSrgsForDraw(commandList);
             }
 
-            for (const RHI::DrawItemKeyPair& drawItemKeyPair : drawListViewPartition)
+            for (const RHI::DrawItemProperties& drawItemProperties : drawListViewPartition)
             {
-                commandList->Submit(*drawItemKeyPair.m_item);
+                if (drawItemProperties.m_drawFilterMask & m_pipeline->GetDrawFilterMask())
+                {
+                    commandList->Submit(*drawItemProperties.m_item);
+                }
             }
         }
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
index 20b6674fb9..cc0cefd082 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
@@ -300,6 +300,9 @@ namespace AZ
             m_scene = nullptr;
             m_rootPass->SetEnabled(false);
             m_rootPass->QueueForRemoval();
+
+            m_drawFilterTag.Reset();
+            m_drawFilterMask = 0;
         }
 
         void RenderPipeline::OnPassModified()
@@ -506,5 +509,28 @@ namespace AZ
         {
             return m_renderMode != RenderMode::NoRender;
         }
+
+        RHI::DrawFilterTag RenderPipeline::GetDrawFilterTag() const
+        {
+            return m_drawFilterTag;
+        }
+
+        RHI::DrawFilterMask RenderPipeline::GetDrawFilterMask() const
+        {
+            return m_drawFilterMask;
+        }
+
+        void RenderPipeline::SetDrawFilterTag(RHI::DrawFilterTag tag)
+        {
+            m_drawFilterTag = tag;
+            if (m_drawFilterTag.IsValid())
+            {
+                m_drawFilterMask = 1 << tag.GetIndex();
+            }
+            else
+            {
+                m_drawFilterMask = 0;
+            }
+        }
     }
 }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
index 00054881a1..a66471e038 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
@@ -28,6 +28,8 @@
 #include <AzCore/Jobs/JobFunction.h>
 #include <AzCore/Jobs/JobEmpty.h>
 
+#include <AzFramework/Entity/EntityContext.h>
+
 namespace AZ
 {
     namespace RPI
@@ -71,12 +73,15 @@ namespace AZ
         Scene* Scene::GetSceneForEntityContextId(AzFramework::EntityContextId entityContextId)
         {
             // Find the scene for this entity context.
-            AzFramework::Scene* scene = nullptr;
-            AzFramework::SceneSystemRequestBus::BroadcastResult(scene, &AzFramework::SceneSystemRequestBus::Events::GetSceneFromEntityContextId, entityContextId);
+            AZStd::shared_ptr<AzFramework::Scene> scene = AzFramework::EntityContext::FindContainingScene(entityContextId);
             if (scene)
             {
                 // Get the RPI::Scene subsystem from the AZFramework Scene.
-                return scene->GetSubsystem<RPI::Scene>();
+                RPI::ScenePtr* scenePtr = scene->FindSubsystem<RPI::ScenePtr>();
+                if (scenePtr)
+                {
+                    return scenePtr->get();
+                }
             }
             return nullptr;
         }
@@ -87,6 +92,7 @@ namespace AZ
             m_id = Uuid::CreateRandom();
             m_cullingScene = aznew CullingScene();
             SceneRequestBus::Handler::BusConnect(m_id);
+            m_drawFilterTagRegistry = RHI::DrawFilterTagRegistry::Create();
         }
 
         Scene::~Scene()
@@ -269,6 +275,8 @@ namespace AZ
                 return;
             }
 
+            pipeline->SetDrawFilterTag(m_drawFilterTagRegistry->AcquireTag(pipelineId));
+
             m_pipelines.push_back(pipeline);
 
             // Set this pipeline as default if the default pipeline was empty. This pipeline should be the first pipeline be added to the scene
@@ -303,6 +311,8 @@ namespace AZ
                         m_defaultPipeline = nullptr;
                     }
 
+                    m_drawFilterTagRegistry->ReleaseTag(pipelineToRemove->GetDrawFilterTag());
+
                     pipelineToRemove->OnRemovedFromScene(this);
                     m_pipelines.erase(it);
                     
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
index 9dbc5463af..e3f41cbda9 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
@@ -90,9 +90,9 @@ namespace AZ
             AddDrawPacket(drawPacket, depth);
         }
 
-        void View::AddDrawItem(RHI::DrawListTag drawListTag, const RHI::DrawItemKeyPair& drawItemKeyPair)
+        void View::AddDrawItem(RHI::DrawListTag drawListTag, const RHI::DrawItemProperties& drawItemProperties)
         {
-            m_drawListContext.AddDrawItem(drawListTag, drawItemKeyPair);
+            m_drawListContext.AddDrawItem(drawListTag, drawItemProperties);
         }
 
         void View::SetWorldToViewMatrix(const AZ::Matrix4x4& worldToView)
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
index e1e87086e7..b5d3f815fe 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
@@ -33,6 +33,7 @@ namespace AZ
                 nativeWindow,
                 &AzFramework::WindowRequestBus::Events::GetClientAreaSize);
             AzFramework::WindowNotificationBus::Handler::BusConnect(nativeWindow);
+            AzFramework::ViewportRequestBus::Handler::BusConnect(id);
 
             m_onProjectionMatrixChangedHandler = ViewportContext::MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix)
             {
@@ -48,6 +49,9 @@ namespace AZ
 
         ViewportContext::~ViewportContext()
         {
+            AzFramework::WindowNotificationBus::Handler::BusDisconnect();
+            AzFramework::ViewportRequestBus::Handler::BusDisconnect();
+
             if (m_currentPipeline)
             {
                 m_currentPipeline->RemoveFromRenderTick();
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
index fb4750ce93..4cd6ad8182 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
@@ -33,6 +33,7 @@ ly_add_target(
             AZ::AzQtComponents
             3rdParty::Qt::Core
             3rdParty::Qt::Gui
+            3rdParty::Qt::Network
             3rdParty::Qt::Widgets
             3rdParty::Python
             Gem::Atom_RPI.Edit
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalServer.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalServer.h
new file mode 100644
index 0000000000..4482566113
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalServer.h
@@ -0,0 +1,56 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/functional.h>
+#include <QByteArray>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QString>
+#endif
+
+namespace AtomToolsFramework
+{
+    //! A named local server that will manage connections and forward recieved data
+    class LocalServer : public QObject
+    {
+        Q_OBJECT
+    public:
+        LocalServer();
+        ~LocalServer();
+
+        //! Start a named local server
+        bool Connect(const QString& serverName);
+
+        //! Stop the server
+        void Disconnect();
+
+        //! Get server status
+        bool IsConnected() const;
+
+        using ReadHandler = AZStd::function<void(const QByteArray&)>;
+
+        //! Set a handler that recieved data will be forwarded to
+        void SetReadHandler(ReadHandler handler);
+
+    private:
+        void AddConnection(QLocalSocket* connection);
+        void ReadFromConnection(QLocalSocket* connection);
+        void DeleteConnection(QLocalSocket* connection);
+
+        QString m_serverName;
+        QLocalServer m_server;
+        ReadHandler m_readHandler;
+    };
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalSocket.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalSocket.h
new file mode 100644
index 0000000000..4eb4d533ed
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalSocket.h
@@ -0,0 +1,45 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QLocalSocket>
+#endif
+
+namespace AtomToolsFramework
+{
+    //! LocalSocket enables interprocess communication by establ;ishing a connection and sending data to a LocalServer
+    class LocalSocket : public QObject
+    {
+        Q_OBJECT
+    public:
+        LocalSocket();
+        ~LocalSocket();
+
+        //! Attempt to connect to a named local server
+        bool Connect(const QString& serverName);
+
+        //! Sever connection from server
+        void Disconnect();
+
+        //! Get the sockets connection status
+        bool IsConnected() const;
+
+        //! Send a stream of data to the connected local server
+        bool Send(const QByteArray& buffer);
+
+    private:
+        QString m_serverName;
+        QLocalSocket m_socket;
+    };
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h
index f481bbc397..b17a25a675 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h
@@ -49,6 +49,7 @@ namespace AtomToolsFramework
         AZ::Name m_id;
         AZStd::string m_nameId;
         AZStd::string m_displayName;
+        AZStd::string m_groupName;
         AZStd::string m_description;
         AZStd::any m_defaultValue;
         AZStd::any m_parentValue;
@@ -62,6 +63,7 @@ namespace AtomToolsFramework
         AZStd::vector<AZStd::string> m_vectorLabels;
         bool m_visible = true;
         bool m_readOnly = false;
+        bool m_showThumbnail = false;
     };
 
     //! Wraps an AZStd::any value and configuration so that it can be displayed and edited in a ReflectedPropertyEditor.
@@ -108,6 +110,8 @@ namespace AtomToolsFramework
     private:
         // Functions used to configure edit data attributes.
         AZStd::string GetDisplayName() const;
+        AZStd::string GetGroupName() const;
+        AZStd::string GetAssetPickerTitle() const;
         AZStd::string GetDescription() const;
         AZStd::vector<AZ::Edit::EnumConstant<uint32_t>> GetEnumValues() const;
 
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
index dd71bbc431..5dbbf04f1b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
@@ -82,7 +82,7 @@ namespace AtomToolsFramework
         AZ::RPI::ConstViewportContextPtr GetViewportContext() const;
         //! Creates an AZ::RPI::ScenePtr for the given scene and assigns it to the current ViewportContext.
         //! If useDefaultRenderPipeline is specified, this will initialize the scene with a rendering pipeline.
-        void SetScene(AzFramework::Scene* scene, bool useDefaultRenderPipeline = true);
+        void SetScene(const AZStd::shared_ptr<AzFramework::Scene>& scene, bool useDefaultRenderPipeline = true);
         //! Gets the default camera that's been automatically registered to our ViewportContext.
         AZ::RPI::ViewPtr GetDefaultCamera();
         AZ::RPI::ConstViewPtr GetDefaultCamera() const;
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalServer.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalServer.cpp
new file mode 100644
index 0000000000..6f26b00c4f
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalServer.cpp
@@ -0,0 +1,108 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AtomToolsFramework/Communication/LocalServer.h>
+#include <AzCore/Debug/Trace.h>
+#include <QString>
+
+namespace AtomToolsFramework
+{
+    LocalServer::LocalServer()
+    {
+        AZ_TracePrintf("AtomToolsFramework::LocalServer", "Creating local server\n");
+        m_server.setSocketOptions(QLocalServer::WorldAccessOption);
+
+        QObject::connect(&m_server, &QLocalServer::newConnection, this, [this]() { AddConnection(m_server.nextPendingConnection()); });
+    }
+
+    LocalServer::~LocalServer()
+    {
+        Disconnect();
+    }
+
+    bool LocalServer::Connect(const QString& serverName)
+    {
+        Disconnect();
+
+        m_serverName = serverName;
+
+        AZ_TracePrintf("AtomToolsFramework::LocalServer", "Starting: %s\n", m_serverName.toUtf8().constData());
+        if (m_server.listen(m_serverName))
+        {
+            AZ_TracePrintf("AtomToolsFramework::LocalServer", "Started: %s\n", m_serverName.toUtf8().constData());
+            return true;
+        }
+
+        if (m_server.serverError() == QAbstractSocket::AddressInUseError)
+        {
+            AZ_TracePrintf("AtomToolsFramework::LocalServer", "Restarting: %s\n", m_serverName.toUtf8().constData());
+            Disconnect();
+
+            AZ_TracePrintf("AtomToolsFramework::LocalServer", "Starting: %s\n", m_serverName.toUtf8().constData());
+            if (m_server.listen(m_serverName))
+            {
+                return true;
+            }
+        }
+
+        AZ_TracePrintf("AtomToolsFramework::LocalServer", "Starting failed: %s\n", m_serverName.toUtf8().constData());
+        Disconnect();
+        return false;
+    }
+
+    void LocalServer::Disconnect()
+    {
+        AZ_TracePrintf("AtomToolsFramework::LocalServer", "Disconnecting: %s\n", m_serverName.toUtf8().constData());
+        QLocalServer::removeServer(m_serverName);
+    }
+
+    bool LocalServer::IsConnected() const
+    {
+        return m_server.isListening();
+    }
+
+    void LocalServer::SetReadHandler(LocalServer::ReadHandler handler)
+    {
+        m_readHandler = handler;
+    }
+
+    void LocalServer::AddConnection(QLocalSocket* connection)
+    {
+        AZ_TracePrintf("AtomToolsFramework::LocalServer", "Connection added: %s\n", m_serverName.toUtf8().constData());
+        QObject::connect(connection, &QLocalSocket::readyRead, this, [this, connection]() { ReadFromConnection(connection); });
+        QObject::connect(connection, &QLocalSocket::disconnected, this, [this, connection]() { DeleteConnection(connection); });
+    }
+
+    void LocalServer::ReadFromConnection(QLocalSocket* connection)
+    {
+        if (connection)
+        {
+            AZ_TracePrintf("AtomToolsFramework::LocalServer", "Data received: %s\n", m_serverName.toUtf8().constData());
+            QByteArray buffer = connection->readAll();
+            if (m_readHandler)
+            {
+                m_readHandler(buffer);
+            }
+        }
+    }
+
+    void LocalServer::DeleteConnection(QLocalSocket* connection)
+    {
+        if (connection)
+        {
+            AZ_TracePrintf("AtomToolsFramework::LocalServer", "Deleting connection: %s\n", m_serverName.toUtf8().constData());
+            connection->deleteLater();
+        }
+    }
+} // namespace AtomToolsFramework
+
+#include <AtomToolsFramework/Communication/moc_LocalServer.cpp>
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalSocket.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalSocket.cpp
new file mode 100644
index 0000000000..020998bf1a
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalSocket.cpp
@@ -0,0 +1,86 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AtomToolsFramework/Communication/LocalSocket.h>
+#include <AzCore/Debug/Trace.h>
+#include <QByteArray>
+#include <QString>
+
+namespace AtomToolsFramework
+{
+    LocalSocket::LocalSocket()
+    {
+    }
+
+    LocalSocket::~LocalSocket()
+    {
+        Disconnect();
+    }
+
+    bool LocalSocket::Connect(const QString& serverName)
+    {
+        Disconnect();
+
+        m_serverName = serverName;
+
+        AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Connecting to: %s\n", m_serverName.toUtf8().constData());
+        m_socket.connectToServer(m_serverName);
+
+        if (IsConnected())
+        {
+            AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Waiting for connection to: %s\n", m_serverName.toUtf8().constData());
+            if (m_socket.waitForConnected())
+            {
+                AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Connected to: %s\n", m_serverName.toUtf8().constData());
+                return true;
+            }
+        }
+
+        AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Connecting failed: %s\n", m_serverName.toUtf8().constData());
+        Disconnect();
+        return false;
+    }
+
+    void LocalSocket::Disconnect()
+    {
+        if (IsConnected())
+        {
+            AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Disconnecting from: %s\n", m_serverName.toUtf8().constData());
+            m_socket.disconnectFromServer();
+            m_socket.waitForDisconnected();
+
+            AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Closing socket\n");
+            m_socket.close();
+        }
+    }
+
+    bool LocalSocket::IsConnected() const
+    {
+        return m_socket.isOpen();
+    }
+
+    bool LocalSocket::Send(const QByteArray& buffer)
+    {
+        if (IsConnected())
+        {
+            AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Sending data to: %s\n", m_serverName.toUtf8().constData());
+            m_socket.write(buffer);
+
+            AZ_TracePrintf("AtomToolsFramework::LocalSocket", "Waiting for write to: %s\n", m_serverName.toUtf8().constData());
+            m_socket.waitForBytesWritten();
+            return true;
+        }
+        return false;
+    }
+} // namespace AtomToolsFramework
+
+#include <AtomToolsFramework/Communication/moc_LocalSocket.cpp>
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp
index 1ff475b2ef..8afd1dc8d5 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp
@@ -135,11 +135,13 @@ namespace AtomToolsFramework
             m_editData.m_elementId = AZ::Edit::UIHandlers::Default;
 
             AddEditDataAttributeMemberFunction(AZ::Edit::Attributes::NameLabelOverride, &DynamicProperty::GetDisplayName);
+            AddEditDataAttributeMemberFunction(AZ::Edit::Attributes::AssetPickerTitle, &DynamicProperty::GetAssetPickerTitle);
             AddEditDataAttributeMemberFunction(AZ::Edit::Attributes::DescriptionTextOverride, &DynamicProperty::GetDescription);
             AddEditDataAttributeMemberFunction(AZ::Edit::Attributes::ReadOnly, &DynamicProperty::IsReadOnly);
             AddEditDataAttributeMemberFunction(AZ::Edit::Attributes::EnumValues, &DynamicProperty::GetEnumValues);
             AddEditDataAttributeMemberFunction(AZ::Edit::Attributes::ChangeNotify, &DynamicProperty::OnDataChanged);
             AddEditDataAttribute(AZ::Edit::Attributes::ShowProductAssetFileName, false);
+            AddEditDataAttribute(AZ_CRC_CE("Thumbnail"), m_config.m_showThumbnail);
 
             switch (m_config.m_dataType)
             {
@@ -197,12 +199,19 @@ namespace AtomToolsFramework
         return !m_config.m_displayName.empty() ? m_config.m_displayName : m_config.m_nameId;
     }
 
+    AZStd::string DynamicProperty::GetGroupName() const
+    {
+        return m_config.m_groupName;
+    }
+
+    AZStd::string DynamicProperty::GetAssetPickerTitle() const
+    {
+        return GetGroupName().empty() ? GetDisplayName() : GetGroupName() + " " + GetDisplayName();
+    }
+
     AZStd::string DynamicProperty::GetDescription() const
     {
-        return AZStd::string::format("%s%s(Script Name = '%s')",
-            m_config.m_description.c_str(),
-            m_config.m_description.empty() ? "" : "\n",
-            m_config.m_id.GetCStr());
+        return m_config.m_description;
     }
 
     AZ::Crc32 DynamicProperty::GetVisibility() const
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
index 952e241143..41a627bef7 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
@@ -91,6 +91,13 @@ namespace AtomToolsFramework
         propertyConfig.m_vectorLabels = propertyDefinition.m_vectorLabels;
         propertyConfig.m_visible = propertyDefinition.m_visibility != AZ::RPI::MaterialPropertyVisibility::Hidden;
         propertyConfig.m_readOnly = propertyDefinition.m_visibility == AZ::RPI::MaterialPropertyVisibility::Disabled;
+
+        // Update the description for material properties to include script name assuming id is set beforehand
+        propertyConfig.m_description = AZStd::string::format(
+            "%s%s(Script Name = '%s')",
+            propertyConfig.m_description.c_str(),
+            propertyConfig.m_description.empty() ? "" : "\n",
+            propertyConfig.m_id.GetCStr());
     }
 
     void ConvertToPropertyConfig(AtomToolsFramework::DynamicPropertyConfig& propertyConfig, const AZ::RPI::MaterialPropertyDynamicMetadata& propertyMetaData)
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
index 0f1e5718db..483b4bc55b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
@@ -118,7 +118,7 @@ namespace AtomToolsFramework
         return m_viewportContext;
     }
 
-    void RenderViewportWidget::SetScene(AzFramework::Scene* scene, bool useDefaultRenderPipeline)
+    void RenderViewportWidget::SetScene(const AZStd::shared_ptr<AzFramework::Scene>& scene, bool useDefaultRenderPipeline)
     {
         if (scene == nullptr)
         {
@@ -128,7 +128,7 @@ namespace AtomToolsFramework
         AZ::RPI::ScenePtr atomScene;
         auto initializeScene = [&](AZ::Render::Bootstrap::Request* bootstrapRequests)
         {
-            atomScene = bootstrapRequests->GetOrCreateAtomSceneFromAzScene(scene);
+            atomScene = bootstrapRequests->GetOrCreateAtomSceneFromAzScene(scene.get());
             if (useDefaultRenderPipeline)
             {
                 // atomScene may already have a default render pipeline installed.
@@ -416,9 +416,7 @@ namespace AtomToolsFramework
         }
         AzFramework::ScreenPoint position = AzFramework::WorldToScreen(
             worldPosition,
-            currentView->GetViewToWorldMatrix(),
-            currentView->GetViewToClipMatrix(),
-            AZ::Vector2{aznumeric_cast<float>(width()), aznumeric_cast<float>(height())}
+            GetCameraState()
         );
         return {position.m_x, position.m_y};
     }
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
index e8539711f7..d8ceccc724 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
@@ -10,6 +10,8 @@
 #
 
 set(FILES
+    Include/AtomToolsFramework/Communication/LocalServer.h
+    Include/AtomToolsFramework/Communication/LocalSocket.h
     Include/AtomToolsFramework/Debug/TraceRecorder.h
     Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h
     Include/AtomToolsFramework/DynamicProperty/DynamicPropertyGroup.h
@@ -22,6 +24,8 @@ set(FILES
     Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
     Include/AtomToolsFramework/Util/Util.h
     Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+    Source/Communication/LocalServer.cpp
+    Source/Communication/LocalSocket.cpp
     Source/Debug/TraceRecorder.cpp
     Source/DynamicProperty/DynamicProperty.cpp
     Source/DynamicProperty/DynamicPropertyGroup.cpp
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
index 40d6a8f30a..134f605200 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
@@ -93,6 +93,7 @@ ly_add_target(
 ly_add_target(
     NAME MaterialEditor EXECUTABLE
     NAMESPACE Gem
+    AUTOMOC
     FILES_CMAKE
         materialeditor_files.cmake
         Source/Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h
index 84406d8402..0727547b13 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h
@@ -11,6 +11,7 @@
 */
 #pragma once
 
+#include <ACES/Aces.h>
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <Atom/Feature/Utils/LightingPreset.h>
@@ -66,6 +67,9 @@ namespace MaterialEditor
 
         //! Notify when field of view changes
         virtual void OnFieldOfViewChanged([[maybe_unused]] float fieldOfView) {}
+
+        //! Notify when tone mapping changes
+        virtual void OnDisplayMapperOperationTypeChanged([[maybe_unused]] AZ::Render::DisplayMapperOperationType operationType) {}
     };
 
     using MaterialViewportNotificationBus = AZ::EBus<MaterialViewportNotifications>;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
index ea6be4f21a..0c9b6e945d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
@@ -11,6 +11,7 @@
 */
 #pragma once
 
+#include <ACES/Aces.h>
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/std/containers/set.h>
 #include <AzCore/std/string/string.h>
@@ -147,6 +148,12 @@ namespace MaterialEditor
 
         //! Get field of view
         virtual float GetFieldOfView() const = 0;
+
+        //! Set tone mapping type
+        virtual void SetDisplayMapperOperationType(AZ::Render::DisplayMapperOperationType operationType) = 0;
+
+        //! Get tone mapping type
+        virtual AZ::Render::DisplayMapperOperationType GetDisplayMapperOperationType() const = 0;
     };
 
     using MaterialViewportRequestBus = AZ::EBus<MaterialViewportRequests>;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
index 2e59cb16f9..288530a4e4 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
@@ -762,6 +762,8 @@ namespace MaterialEditor
         // in the hierarchy are applied
         m_materialTypeSourceData.EnumerateProperties([this, &parentPropertyValues](const AZStd::string& groupNameId, const AZStd::string& propertyNameId, const auto& propertyDefinition) {
             AtomToolsFramework::DynamicPropertyConfig propertyConfig;
+
+            // Assign id before conversion so it can be used in dynamic description
             propertyConfig.m_id = MaterialPropertyId(groupNameId, propertyNameId).GetCStr();
 
             const auto& propertyIndex = m_materialAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(propertyConfig.m_id);
@@ -771,8 +773,10 @@ namespace MaterialEditor
             if (propertyIndexInBounds)
             {
                 AtomToolsFramework::ConvertToPropertyConfig(propertyConfig, propertyDefinition);
+                propertyConfig.m_showThumbnail = true;
                 propertyConfig.m_originalValue = AtomToolsFramework::ConvertToEditableType(m_materialAsset->GetPropertyValues()[propertyIndex.GetIndex()]);
                 propertyConfig.m_parentValue = AtomToolsFramework::ConvertToEditableType(parentPropertyValues[propertyIndex.GetIndex()]);
+                propertyConfig.m_groupName = m_materialTypeSourceData.FindGroup(groupNameId)->m_displayName;
                 m_properties[propertyConfig.m_id] = AtomToolsFramework::DynamicProperty(propertyConfig);
             }
             return true;
@@ -789,7 +793,9 @@ namespace MaterialEditor
         propertyConfig.m_id = "details.materialType";
         propertyConfig.m_nameId = "materialType";
         propertyConfig.m_displayName = "Material Type";
-        propertyConfig.m_description = propertyConfig.m_displayName;
+        propertyConfig.m_groupName = "Details";
+        propertyConfig.m_description = "The material type defines the layout, properties, default values, shader connections, and other "
+                                       "data needed to create and edit a derived material.";
         propertyConfig.m_defaultValue = AZStd::any(materialTypeAsset);
         propertyConfig.m_originalValue = propertyConfig.m_defaultValue;
         propertyConfig.m_parentValue = propertyConfig.m_defaultValue;
@@ -802,11 +808,14 @@ namespace MaterialEditor
         propertyConfig.m_id = "details.parentMaterial";
         propertyConfig.m_nameId = "parentMaterial";
         propertyConfig.m_displayName = "Parent Material";
-        propertyConfig.m_description = propertyConfig.m_displayName;
+        propertyConfig.m_groupName = "Details";
+        propertyConfig.m_description =
+            "The parent material provides an initial configuration whose properties are inherited and overriden by a derived material.";
         propertyConfig.m_defaultValue = AZStd::any(parentMaterialAsset);
         propertyConfig.m_originalValue = propertyConfig.m_defaultValue;
         propertyConfig.m_parentValue = propertyConfig.m_defaultValue;
         propertyConfig.m_readOnly = true;
+        propertyConfig.m_showThumbnail = true;
 
         m_properties[propertyConfig.m_id] = AtomToolsFramework::DynamicProperty(propertyConfig);
 
@@ -822,6 +831,7 @@ namespace MaterialEditor
             propertyConfig.m_id = MaterialPropertyId(UvGroupName, shaderInput).GetCStr();
             propertyConfig.m_nameId = shaderInput;
             propertyConfig.m_displayName = shaderInput;
+            propertyConfig.m_groupName = "UV Names";
             propertyConfig.m_description = shaderInput;
             propertyConfig.m_defaultValue = uvName;
             propertyConfig.m_originalValue = uvName;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp
index a7aecf0b1f..b1a795b9f9 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp
@@ -13,7 +13,6 @@
 #include <Atom/Document/MaterialDocumentModule.h>
 #include <Document/MaterialDocumentSystemComponent.h>
 
-#include <AzFramework/TargetManagement/TargetManagementComponent.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h>
 #include <AzToolsFramework/Asset/AssetSystemComponent.h>
 
@@ -32,7 +31,6 @@ namespace MaterialEditor
         return AZ::ComponentTypeList{
             azrtti_typeid<AzToolsFramework::AssetSystem::AssetSystemComponent>(),
             azrtti_typeid<MaterialDocumentSystemComponent>(),
-            azrtti_typeid<AzFramework::TargetManagementComponent>(),
         };
     }
 }
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp
index 2fd1aac211..dbb1d18e49 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp
@@ -109,7 +109,6 @@ namespace MaterialEditor
 
     void MaterialDocumentSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
     {
-        required.push_back(AZ_CRC("TargetManagerService", 0x6d5708bc));
         required.push_back(AZ_CRC("AssetProcessorToolsConnection", 0x734669bc));
         required.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
         required.push_back(AZ_CRC("PropertyManagerService", 0x63a3d7ad));
@@ -135,31 +134,16 @@ namespace MaterialEditor
         m_documentMap.clear();
         MaterialDocumentSystemRequestBus::Handler::BusConnect();
         MaterialDocumentNotificationBus::Handler::BusConnect();
-        AzFramework::TmMsgBus::Handler::BusConnect(AZ_CRC("OpenInMaterialEditor", 0x9f92aac8));
     }
 
     void MaterialDocumentSystemComponent::Deactivate()
     {
         AZ::TickBus::Handler::BusDisconnect();
-        AzFramework::TmMsgBus::Handler::BusDisconnect();
         MaterialDocumentNotificationBus::Handler::BusDisconnect();
         MaterialDocumentSystemRequestBus::Handler::BusDisconnect();
         m_documentMap.clear();
     }
 
-    void MaterialDocumentSystemComponent::OnReceivedMsg(AzFramework::TmMsgPtr msg)
-    {
-        if (msg->GetId() == AZ_CRC("OpenInMaterialEditor", 0x9f92aac8))
-        {
-            const char* documentPath = reinterpret_cast<const char*>(msg->GetCustomBlob());
-            MaterialDocumentSystemRequestBus::Broadcast(&MaterialDocumentSystemRequestBus::Events::OpenDocument, documentPath);
-        }
-        else
-        {
-            AZ_Assert(false, "We received a message of an unrecognized class type!");
-        }
-    }
-
     AZ::Uuid MaterialDocumentSystemComponent::CreateDocument()
     {
         auto document = AZStd::make_unique<MaterialDocument>();
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h
index b6c541421d..4b0ee424a7 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h
@@ -16,7 +16,6 @@
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/Asset/AssetCommon.h>
-#include <AzFramework/TargetManagement/TargetManagementAPI.h>
 
 #include <Atom/Document/MaterialDocumentNotificationBus.h>
 #include <Atom/Document/MaterialDocumentSystemRequestBus.h>
@@ -35,7 +34,6 @@ namespace MaterialEditor
     class MaterialDocumentSystemComponent
         : public AZ::Component
         , private AZ::TickBus::Handler
-        , private AzFramework::TmMsgBus::Handler
         , private MaterialDocumentNotificationBus::Handler
         , private MaterialDocumentSystemRequestBus::Handler
     {
@@ -72,11 +70,6 @@ namespace MaterialEditor
         void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
         ////////////////////////////////////////////////////////////////////////
 
-        //////////////////////////////////////////////////////////////////////////
-        // AzFramework::TmMsgBus::Handler overrides...
-        void OnReceivedMsg(AzFramework::TmMsgPtr msg) override;
-        //////////////////////////////////////////////////////////////////////////
-
         ////////////////////////////////////////////////////////////////////////
         // MaterialDocumentSystemRequestBus::Handler overrides...
         AZ::Uuid CreateDocument() override;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
index 66be1c23bb..ea82210814 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
@@ -90,6 +90,14 @@ namespace MaterialEditor
         });
     }
 
+    MaterialEditorApplication::~MaterialEditorApplication()
+    {
+        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
+        AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
+        MaterialEditorWindowNotificationBus::Handler::BusDisconnect();
+        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+    }
+
     void MaterialEditorApplication::CreateReflectionManager()
     {
         Application::CreateReflectionManager();
@@ -299,12 +307,12 @@ namespace MaterialEditor
         return false;
     }
 
-    void MaterialEditorApplication::ProcessCommandLine()
+    void MaterialEditorApplication::ProcessCommandLine(const AZ::CommandLine& commandLine)
     {
         const AZStd::string timeoputSwitchName = "timeout";
-        if (m_commandLine.HasSwitch(timeoputSwitchName))
+        if (commandLine.HasSwitch(timeoputSwitchName))
         {
-            const AZStd::string& timeoutValue = m_commandLine.GetSwitchValue(timeoputSwitchName, 0);
+            const AZStd::string& timeoutValue = commandLine.GetSwitchValue(timeoputSwitchName, 0);
             const uint32_t timeoutInMs = atoi(timeoutValue.c_str());
             AZ_Printf("MaterialEditor", "Timeout scheduled, shutting down in %u ms", timeoutInMs);
             QTimer::singleShot(timeoutInMs, [this] {
@@ -315,10 +323,10 @@ namespace MaterialEditor
 
         // Process command line options for running one or more python scripts on startup
         const AZStd::string runPythonScriptSwitchName = "runpython";
-        size_t runPythonScriptCount = m_commandLine.GetNumSwitchValues(runPythonScriptSwitchName);
+        size_t runPythonScriptCount = commandLine.GetNumSwitchValues(runPythonScriptSwitchName);
         for (size_t runPythonScriptIndex = 0; runPythonScriptIndex < runPythonScriptCount; ++runPythonScriptIndex)
         {
-            const AZStd::string runPythonScriptPath = m_commandLine.GetSwitchValue(runPythonScriptSwitchName, runPythonScriptIndex);
+            const AZStd::string runPythonScriptPath = commandLine.GetSwitchValue(runPythonScriptSwitchName, runPythonScriptIndex);
             AZStd::vector<AZStd::string_view> runPythonArgs;
 
             AZ_Printf("MaterialEditor", "Launching script: %s", runPythonScriptPath.c_str());
@@ -329,17 +337,17 @@ namespace MaterialEditor
         }
 
         // Process command line options for opening one or more material documents on startup
-        size_t openDocumentCount = m_commandLine.GetNumMiscValues();
+        size_t openDocumentCount = commandLine.GetNumMiscValues();
         for (size_t openDocumentIndex = 0; openDocumentIndex < openDocumentCount; ++openDocumentIndex)
         {
-            const AZStd::string openDocumentPath = m_commandLine.GetMiscValue(openDocumentIndex);
+            const AZStd::string openDocumentPath = commandLine.GetMiscValue(openDocumentIndex);
 
             AZ_Printf("MaterialEditor", "Opening document: %s", openDocumentPath.c_str());
             MaterialDocumentSystemRequestBus::Broadcast(&MaterialDocumentSystemRequestBus::Events::OpenDocument, openDocumentPath);
         }
 
         const AZStd::string exitAfterCommandsSwitchName = "exitaftercommands";
-        if (m_commandLine.HasSwitch(exitAfterCommandsSwitchName))
+        if (commandLine.HasSwitch(exitAfterCommandsSwitchName))
         {
             ExitMainLoop();
         }
@@ -409,9 +417,50 @@ namespace MaterialEditor
 
     bool MaterialEditorApplication::LaunchDiscoveryService()
     {
-        const QStringList arguments = { "-fail_silently" };
+        // Determine if this is the first launch of the tool by attempting to connect to a running server
+        if (m_socket.Connect(QApplication::applicationName()))
+        {
+            // If the server was located, the application is already running.
+            // Forward commandline options to other application instance.
+            QByteArray buffer;
+            buffer.append("ProcessCommandLine:");
+            for (int argi = 1; argi < m_argC; ++argi)
+            {
+                buffer.append(QString(m_argV[argi]).append("\n").toUtf8());
+            }
+            m_socket.Send(buffer);
+            m_socket.Disconnect();
+            return false;
+        }
 
-        return AtomToolsFramework::LaunchTool("GridHub", AZ_TRAIT_MATERIALEDITOR_EXT, arguments);
+        // Setup server to handle basic commands
+        m_server.SetReadHandler([this](const QByteArray& buffer) {
+            // Handle commmand line params from connected socket
+            if (buffer.startsWith("ProcessCommandLine:"))
+            {
+                // Remove header and parse commands
+                AZStd::string params(buffer.data(), buffer.size());
+                params = params.substr(strlen("ProcessCommandLine:"));
+
+                AZStd::vector<AZStd::string> tokens;
+                AZ::StringFunc::Tokenize(params, tokens, "\n");
+
+                if (!tokens.empty())
+                {
+                    AZ::CommandLine commandLine;
+                    commandLine.Parse(tokens);
+                    ProcessCommandLine(commandLine);
+                }
+            }
+        });
+
+        // Launch local server
+        if (!m_server.Connect(QApplication::applicationName()))
+        {
+            return false;
+        }
+
+        return true;
     }
 
     void MaterialEditorApplication::StartInternal()
@@ -421,10 +470,14 @@ namespace MaterialEditor
             return;
         }
 
-        //[GFX TODO][ATOM-415] Try to factor out some of this stuff with AtomSampleViewerApplication
-
         WriteStartupLog();
 
+        if (!LaunchDiscoveryService())
+        {
+            ExitMainLoop();
+            return;
+        }
+
         AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusConnect();
         AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotificationBus::Broadcast(&AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotifications::OnDatabaseInitialized);
 
@@ -434,8 +487,6 @@ namespace MaterialEditor
 
         LoadSettings();
 
-        LaunchDiscoveryService();
-
         MaterialEditorWindowNotificationBus::Handler::BusConnect();
 
         MaterialEditor::MaterialEditorWindowFactoryRequestBus::Broadcast(
@@ -450,7 +501,7 @@ namespace MaterialEditor
         }
 
         // Delay execution of commands and scripts post initialization
-        QTimer::singleShot(0, [this]() { ProcessCommandLine(); });
+        QTimer::singleShot(0, [this]() { ProcessCommandLine(m_commandLine); });
     }
 
     bool MaterialEditorApplication::GetAssetDatabaseLocation(AZStd::string& result)
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
index 63ccbf3cec..2c66fd7c16 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
@@ -12,22 +12,20 @@
 
 #pragma once
 
-
+#include <Atom/Document/MaterialDocumentSystemRequestBus.h>
+#include <Atom/Window/MaterialEditorWindowNotificationBus.h>
+#include <AtomToolsFramework/Communication/LocalServer.h>
+#include <AtomToolsFramework/Communication/LocalSocket.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/TickBus.h>
-#include <AzCore/UserSettings/UserSettingsProvider.h>
 #include <AzCore/Debug/TraceMessageBus.h>
-
+#include <AzCore/UserSettings/UserSettingsProvider.h>
 #include <AzFramework/Application/Application.h>
 #include <AzFramework/Asset/AssetSystemBus.h>
 #include <AzFramework/Logging/LogFile.h>
-
 #include <AzToolsFramework/API/AssetDatabaseBus.h>
 #include <AzToolsFramework/API/EditorPythonConsoleBus.h>
 
-#include <Atom/Document/MaterialDocumentSystemRequestBus.h>
-#include <Atom/Window/MaterialEditorWindowNotificationBus.h>
-
 #include <QApplication>
 #include <QTimer>
 
@@ -51,7 +49,7 @@ namespace MaterialEditor
         using Base = AzFramework::Application;
 
         MaterialEditorApplication(int* argc, char*** argv);
-        virtual ~MaterialEditorApplication() = default;
+        virtual ~MaterialEditorApplication();
 
         //////////////////////////////////////////////////////////////////////////
         // AzFramework::Application
@@ -110,7 +108,7 @@ namespace MaterialEditor
 
         void CompileCriticalAssets();
 
-        void ProcessCommandLine();
+        void ProcessCommandLine(const AZ::CommandLine& commandLine);
         void WriteStartupLog();
 
         void LoadSettings();
@@ -138,5 +136,8 @@ namespace MaterialEditor
         bool m_activatedLocalUserSettings = false;
 
         QTimer m_timer;
+
+        AtomToolsFramework::LocalSocket m_socket;
+        AtomToolsFramework::LocalServer m_server;
     };
 } // namespace MaterialEditor
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
index d6f2092d27..abaf50804f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
@@ -508,6 +508,17 @@ namespace MaterialEditor
         return m_fieldOfView;
     }
 
+    void MaterialViewportComponent::SetDisplayMapperOperationType(AZ::Render::DisplayMapperOperationType operationType)
+    {
+        m_displayMapperOperationType = operationType;
+        MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnDisplayMapperOperationTypeChanged, operationType);
+    }
+
+    AZ::Render::DisplayMapperOperationType MaterialViewportComponent::GetDisplayMapperOperationType() const
+    {
+        return m_displayMapperOperationType;
+    }
+
     void MaterialViewportComponent::OnCatalogLoaded([[maybe_unused]] const char* catalogFile)
     {
         AZ::TickBus::QueueFunction([this]() {
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
index 036974e123..8332cb862c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
@@ -12,6 +12,8 @@
 
 #pragma once
 
+#include <ACES/Aces.h>
+
 #include <AzCore/Component/Component.h>
 #include <AzFramework/Asset/AssetCatalogBus.h>
 
@@ -85,6 +87,8 @@ namespace MaterialEditor
         bool GetAlternateSkyboxEnabled() const override;
         void SetFieldOfView(float fieldOfView) override;
         float GetFieldOfView() const override;
+        void SetDisplayMapperOperationType(AZ::Render::DisplayMapperOperationType operationType) override;
+        AZ::Render::DisplayMapperOperationType GetDisplayMapperOperationType() const override;
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
@@ -111,5 +115,6 @@ namespace MaterialEditor
         bool m_gridEnabled = true;
         bool m_alternateSkyboxEnabled = false;
         float m_fieldOfView = 90.0f;
+        AZ::Render::DisplayMapperOperationType m_displayMapperOperationType = AZ::Render::DisplayMapperOperationType::Aces;
     };
 }
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
index e1bfaa3872..5939a40db6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
@@ -33,6 +33,7 @@
 #include <Atom/Feature/PostProcessing/PostProcessingConstants.h>
 #include <Atom/Feature/PostProcess/PostProcessFeatureProcessorInterface.h>
 #include <Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessorInterface.h>
+#include <Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h>
 #include <Atom/Component/DebugCamera/NoClipControllerComponent.h>
 
 #include <Atom/Document/MaterialDocumentRequestBus.h>
@@ -88,10 +89,12 @@ namespace MaterialEditor
         m_scene->SetShaderResourceGroupCallback(callback);
 
         // Bind m_defaultScene to the GameEntityContext's AzFramework::Scene
-        AZStd::vector<AzFramework::Scene*> scenes;
-        AzFramework::SceneSystemRequestBus::BroadcastResult(scenes, &AzFramework::SceneSystemRequests::GetAllScenes);
-        AZ_Assert(scenes.size() > 0, "Error: Scenes missing during system component initialization"); // This should never happen unless scene creation has changed.
-        scenes.at(0)->SetSubsystem(m_scene.get());
+        auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+        AZ_Assert(sceneSystem, "MaterialViewportRenderer was unable to get the scene system during construction.");
+        AZStd::shared_ptr<AzFramework::Scene> mainScene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
+        // This should never happen unless scene creation has changed.
+        AZ_Assert(mainScene, "Main scenes missing during system component initialization");
+        mainScene->SetSubsystem(m_scene);
 
         // Create a render pipeline from the specified asset for the window context and add the pipeline to the scene
         AZ::Data::Asset<AZ::RPI::AnyAsset> pipelineAsset = AZ::RPI::AssetUtils::LoadAssetByProductPath<AZ::RPI::AnyAsset>(m_defaultPipelineAssetPath.c_str(), AZ::RPI::AssetUtils::TraceLevel::Error);
@@ -145,9 +148,11 @@ namespace MaterialEditor
         m_postProcessEntity->Activate();
 
         // Init directional light processor
-
         m_directionalLightFeatureProcessor = m_scene->GetFeatureProcessor<AZ::Render::DirectionalLightFeatureProcessorInterface>();
 
+        // Init display mapper processor
+        m_displayMapperFeatureProcessor = m_scene->GetFeatureProcessor<Render::DisplayMapperFeatureProcessorInterface>();
+
         // Init Skybox
 
         m_skyboxFeatureProcessor = m_scene->GetFeatureProcessor<AZ::Render::SkyBoxFeatureProcessorInterface>();
@@ -275,6 +280,13 @@ namespace MaterialEditor
         }
         m_lightHandles.clear();
 
+        auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+        AZ_Assert(sceneSystem, "MaterialViewportRenderer was unable to get the scene system during destruction.");
+        AZStd::shared_ptr<AzFramework::Scene> mainScene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
+        // This should never happen unless scene creation has changed.
+        AZ_Assert(mainScene, "Main scenes missing during system component destruction");
+        mainScene->UnsetSubsystem(m_scene);
+
         m_swapChainPass = nullptr;
         AZ::RPI::RPISystemInterface::Get()->UnregisterScene(m_scene);
         m_scene = nullptr;
@@ -414,6 +426,13 @@ namespace MaterialEditor
         MaterialEditorViewportInputControllerRequestBus::Broadcast(&MaterialEditorViewportInputControllerRequestBus::Handler::SetFieldOfView, fieldOfView);
     }
 
+    void MaterialViewportRenderer::OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType)
+    {
+        AZ::Render::DisplayMapperConfigurationDescriptor desc;
+        desc.m_operationType = operationType;
+        m_displayMapperFeatureProcessor->RegisterDisplayMapperConfiguration(desc);
+    }
+
     void MaterialViewportRenderer::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
     {
         if (m_modelAssetId == asset.GetId())
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h
index e014d9eada..744a887396 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h
@@ -27,6 +27,11 @@
 
 namespace AZ
 {
+    namespace Render
+    {
+        class DisplayMapperFeatureProcessorInterface;
+    }
+
     class Entity;
     class Component;
 
@@ -71,6 +76,7 @@ namespace MaterialEditor
         void OnGridEnabledChanged(bool enable) override;
         void OnAlternateSkyboxEnabledChanged(bool enable) override;
         void OnFieldOfViewChanged(float fieldOfView) override;
+        void OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType) override;
 
         // AZ::Data::AssetBus::Handler interface overrides...
         void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
@@ -92,6 +98,7 @@ namespace MaterialEditor
         AZ::RPI::RenderPipelinePtr m_renderPipeline;
         AZ::RPI::ScenePtr m_scene;
         AZ::Render::DirectionalLightFeatureProcessorInterface* m_directionalLightFeatureProcessor = nullptr;
+        AZ::Render::DisplayMapperFeatureProcessorInterface* m_displayMapperFeatureProcessor = nullptr;
 
         AZ::Entity* m_cameraEntity = nullptr;
         AZ::Component* m_cameraComponent = nullptr;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp
index 0dec1c6d23..3c4134b7e0 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp
@@ -110,30 +110,19 @@ namespace MaterialEditor
     {
         using namespace AzToolsFramework::AssetBrowser;
 
-        // Material Browser uses the following filters:
-        // 1. [All source files (no products) that contain products matching the assetType specified by searchWidget (default is materials and textures)]
-        // 2. [All folders (including empty folders)]
-        // 3. [All Sources and folders matching the search text typed in search widget]
-        // Final filter = ((1 OR 2) AND 3)
-
         QSharedPointer<EntryTypeFilter> sourceFilter(new EntryTypeFilter);
         sourceFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Source);
 
-        QSharedPointer<CompositeFilter> assetTypeFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::AND));
-        assetTypeFilter->AddFilter(sourceFilter);
-        assetTypeFilter->AddFilter(m_ui->m_searchWidget->GetTypesFilter());
-
         QSharedPointer<EntryTypeFilter> folderFilter(new EntryTypeFilter);
         folderFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Folder);
 
         QSharedPointer<CompositeFilter> sourceOrFolderFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::OR));
-        sourceOrFolderFilter->AddFilter(assetTypeFilter);
+        sourceOrFolderFilter->AddFilter(sourceFilter);
         sourceOrFolderFilter->AddFilter(folderFilter);
 
         QSharedPointer<CompositeFilter> finalFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::AND));
         finalFilter->AddFilter(sourceOrFolderFilter);
-        finalFilter->AddFilter(m_ui->m_searchWidget->GetStringFilter());
-        finalFilter->SetFilterPropagation(AssetBrowserEntryFilter::PropagateDirection::Down);
+        finalFilter->AddFilter(m_ui->m_searchWidget->GetFilter());
 
         return finalFilter;
     }
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp
index dad4a34b1e..2af73bf436 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp
@@ -38,7 +38,7 @@ namespace MaterialEditor
         m_toggleGrid->setCheckable(true);
         connect(m_toggleGrid, &QAction::triggered, [this]() {
             MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Events::SetGridEnabled, m_toggleGrid->isChecked());
-        });
+            });
         bool enableGrid = false;
         MaterialViewportRequestBus::BroadcastResult(enableGrid, &MaterialViewportRequestBus::Events::GetGridEnabled);
         m_toggleGrid->setChecked(enableGrid);
@@ -49,31 +49,39 @@ namespace MaterialEditor
         connect(m_toggleShadowCatcher, &QAction::triggered, [this]() {
             MaterialViewportRequestBus::Broadcast(
                 &MaterialViewportRequestBus::Events::SetShadowCatcherEnabled, m_toggleShadowCatcher->isChecked());
-        });
+            });
         bool enableShadowCatcher = false;
         MaterialViewportRequestBus::BroadcastResult(enableShadowCatcher, &MaterialViewportRequestBus::Events::GetShadowCatcherEnabled);
         m_toggleShadowCatcher->setChecked(enableShadowCatcher);
 
         // Add mapping selection button
-        //[GFX TODO][ATOM-3992]
+        
         QToolButton* toneMappingButton = new QToolButton(this);
         QMenu* toneMappingMenu = new QMenu(toneMappingButton);
-        toneMappingMenu->addAction("None", [this]() {
-            MaterialEditorSettingsRequestBus::Broadcast(&MaterialEditorSettingsRequests::SetStringProperty, "toneMapping", "None");
-        });
-        toneMappingMenu->addAction("Gamma2.2", [this]() {
-            MaterialEditorSettingsRequestBus::Broadcast(&MaterialEditorSettingsRequests::SetStringProperty, "toneMapping", "Gamma2.2");
-        });
-        toneMappingMenu->addAction("ACES", [this]() {
-            MaterialEditorSettingsRequestBus::Broadcast(&MaterialEditorSettingsRequests::SetStringProperty, "toneMapping", "ACES");
-        });
+
+        m_operationNames =
+        {
+            { AZ::Render::DisplayMapperOperationType::Reinhard, "Reinhard" },
+            { AZ::Render::DisplayMapperOperationType::GammaSRGB, "GammaSRGB" },
+            { AZ::Render::DisplayMapperOperationType::Passthrough, "Passthrough" },
+            { AZ::Render::DisplayMapperOperationType::AcesLut, "AcesLut" },
+            { AZ::Render::DisplayMapperOperationType::Aces, "Aces" }
+        };
+        for (auto operationNamePair : m_operationNames)
+        {
+            m_operationActions[operationNamePair.first] = toneMappingMenu->addAction(operationNamePair.second, [operationNamePair]() {
+                MaterialViewportRequestBus::Broadcast(
+                    &MaterialViewportRequestBus::Events::SetDisplayMapperOperationType,
+                    operationNamePair.first);
+                });
+            m_operationActions[operationNamePair.first]->setCheckable(true);
+        }
+        m_operationActions[AZ::Render::DisplayMapperOperationType::Aces]->setChecked(true);
         toneMappingButton->setMenu(toneMappingMenu);
         toneMappingButton->setText("Tone Mapping");
         toneMappingButton->setIcon(QIcon(":/Icons/toneMapping.svg"));
         toneMappingButton->setPopupMode(QToolButton::InstantPopup);
-
-        // hiding button until DisplayMapper supports changing settings at run time
-        toneMappingButton->setVisible(false);
+        toneMappingButton->setVisible(true);
         addWidget(toneMappingButton);
 
         // Add model combo box
@@ -99,6 +107,14 @@ namespace MaterialEditor
         m_toggleGrid->setChecked(enable);
     }
 
+    void MaterialEditorToolBar::OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType)
+    {
+        for (auto operationActionPair : m_operationActions)
+        {
+            operationActionPair.second->setChecked(operationActionPair.first == operationType);
+        }
+    }
+
     void MaterialEditorToolBar::OnShadowCatcherEnabledChanged(bool enable)
     {
         m_toggleShadowCatcher->setChecked(enable);
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h
index 147608bc23..25077c1868 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h
@@ -33,8 +33,12 @@ namespace MaterialEditor
         // MaterialViewportNotificationBus::Handler overrides...
         void OnShadowCatcherEnabledChanged([[maybe_unused]] bool enable) override;
         void OnGridEnabledChanged([[maybe_unused]] bool enable) override;
+        void OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType) override;
 
         QAction* m_toggleGrid = {};
         QAction* m_toggleShadowCatcher = {};
+
+        AZStd::unordered_map<AZ::Render::DisplayMapperOperationType, QString> m_operationNames;
+        AZStd::unordered_map<AZ::Render::DisplayMapperOperationType, QAction*> m_operationActions;
     };
 } // namespace MaterialEditor
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp
index 8efed36197..fd50ace918 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp
@@ -36,6 +36,7 @@ namespace MaterialEditor
                 ->Field("enableShadowCatcher", &GeneralViewportSettings::m_enableShadowCatcher)
                 ->Field("enableAlternateSkybox", &GeneralViewportSettings::m_enableAlternateSkybox)
                 ->Field("fieldOfView", &GeneralViewportSettings::m_fieldOfView)
+                ->Field("displayMapperOperationType", &GeneralViewportSettings::m_displayMapperOperationType)
                 ;
 
             if (auto editContext = serializeContext->GetEditContext())
@@ -50,6 +51,12 @@ namespace MaterialEditor
                     ->DataElement(AZ::Edit::UIHandlers::Slider, &GeneralViewportSettings::m_fieldOfView, "Field Of View", "")
                         ->Attribute(AZ::Edit::Attributes::Min, 60.0f)
                         ->Attribute(AZ::Edit::Attributes::Max, 120.0f)
+                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeneralViewportSettings::m_displayMapperOperationType, "Display Mapper Type", "")
+                    ->EnumAttribute(AZ::Render::DisplayMapperOperationType::Aces, "Aces")
+                    ->EnumAttribute(AZ::Render::DisplayMapperOperationType::AcesLut, "AcesLut")
+                    ->EnumAttribute(AZ::Render::DisplayMapperOperationType::Passthrough, "Passthrough")
+                    ->EnumAttribute(AZ::Render::DisplayMapperOperationType::GammaSRGB, "GammaSRGB")
+                    ->EnumAttribute(AZ::Render::DisplayMapperOperationType::Reinhard, "Reinhard")
                     ;
             }
         }
@@ -66,6 +73,7 @@ namespace MaterialEditor
                 ->Property("enableShadowCatcher", BehaviorValueProperty(&GeneralViewportSettings::m_enableShadowCatcher))
                 ->Property("enableAlternateSkybox", BehaviorValueProperty(&GeneralViewportSettings::m_enableAlternateSkybox))
                 ->Property("fieldOfView", BehaviorValueProperty(&GeneralViewportSettings::m_fieldOfView))
+                ->Property("displayMapperOperationType", BehaviorValueProperty(&GeneralViewportSettings::m_displayMapperOperationType))
                 ;
         }
     }
@@ -298,6 +306,7 @@ namespace MaterialEditor
         MaterialViewportRequestBus::BroadcastResult(
             m_generalSettings.m_enableAlternateSkybox, &MaterialViewportRequestBus::Events::GetAlternateSkyboxEnabled);
         MaterialViewportRequestBus::BroadcastResult(m_generalSettings.m_fieldOfView, &MaterialViewportRequestBus::Handler::GetFieldOfView);
+        MaterialViewportRequestBus::BroadcastResult(m_generalSettings.m_displayMapperOperationType, &MaterialViewportRequestBus::Handler::GetDisplayMapperOperationType);
 
         AtomToolsFramework::InspectorRequestBus::Handler::BusDisconnect();
         AtomToolsFramework::InspectorWidget::Reset();
@@ -343,6 +352,12 @@ namespace MaterialEditor
         RefreshGroup("general");
     }
 
+    void ViewportSettingsInspector::OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType)
+    {
+        m_generalSettings.m_displayMapperOperationType = operationType;
+        RefreshGroup("general");
+    }
+
     void ViewportSettingsInspector::BeforePropertyModified(AzToolsFramework::InstanceDataNode* pNode)
     {
         AZ_UNUSED(pNode);
@@ -370,6 +385,7 @@ namespace MaterialEditor
         MaterialViewportRequestBus::Broadcast(
             &MaterialViewportRequestBus::Events::SetAlternateSkyboxEnabled, m_generalSettings.m_enableAlternateSkybox);
         MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Handler::SetFieldOfView, m_generalSettings.m_fieldOfView);
+        MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Handler::SetDisplayMapperOperationType, m_generalSettings.m_displayMapperOperationType);
     }
 
     AZStd::string ViewportSettingsInspector::GetDefaultUniqueSaveFilePath(const AZStd::string& baseName) const
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h
index 08e22a380c..c61acb2e4c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h
@@ -13,6 +13,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <ACES/Aces.h>
 #include <Atom/Viewport/MaterialViewportNotificationBus.h>
 #include <Atom/Feature/Utils/LightingPreset.h>
 #include <Atom/Feature/Utils/ModelPreset.h>
@@ -32,6 +33,7 @@ namespace MaterialEditor
         bool m_enableShadowCatcher = true;
         bool m_enableAlternateSkybox = false;
         float m_fieldOfView = 90.0f;
+        AZ::Render::DisplayMapperOperationType m_displayMapperOperationType = AZ::Render::DisplayMapperOperationType::Aces;
     };
 
     //! Provides controls for viewing and editing a material document settings.
@@ -74,6 +76,7 @@ namespace MaterialEditor
         void OnGridEnabledChanged(bool enable) override;
         void OnAlternateSkyboxEnabledChanged(bool enable) override;
         void OnFieldOfViewChanged(float fieldOfView) override;
+        void OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType) override;
 
         // AzToolsFramework::IPropertyEditorNotify overrides...
         void BeforePropertyModified(AzToolsFramework::InstanceDataNode* pNode) override;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
index 92d76c4373..8c55adba46 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
@@ -1,30 +1,31 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#if !defined(Q_MOC_RUN)
+#include <MaterialEditorApplication.h>
 
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzQtComponents/Components/StyleManager.h>
-#include <AzQtComponents/Utilities/QtPluginPaths.h>
 #include <AzQtComponents/Components/GlobalEventFilter.h>
-#include <AzQtComponents/Components/StyledDockWidget.h>
 #include <AzQtComponents/Components/O3DEStylesheet.h>
-#include <AzQtComponents/Utilities/QtPluginPaths.h>
-#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
+#include <AzQtComponents/Components/StyleManager.h>
+#include <AzQtComponents/Components/StyledDockWidget.h>
 #include <AzQtComponents/Components/WindowDecorationWrapper.h>
+#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
+#include <AzQtComponents/Utilities/QtPluginPaths.h>
 
-#include <QtWidgets/QApplication>
 #include <QtGui/private/qhighdpiscaling_p.h>
-
-#include <Source/MaterialEditorApplication.h>
+#include <QtWidgets/QApplication>
+#endif
 
 int main(int argc, char** argv)
 {
@@ -45,15 +46,16 @@ int main(int argc, char** argv)
     AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::SystemDpiAware);
 
     MaterialEditor::MaterialEditorApplication app(&argc, &argv);
+
+    auto globalEventFilter = new AzQtComponents::GlobalEventFilter(&app);
+    app.installEventFilter(globalEventFilter);
+
     AZ::IO::FixedMaxPath engineRootPath;
     if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
     {
         settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
     }
 
-    auto globalEventFilter = new AzQtComponents::GlobalEventFilter(&app);
-    app.installEventFilter(globalEventFilter);
-
     AzQtComponents::StyleManager styleManager(&app);
     styleManager.initialize(&app, engineRootPath);
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake b/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake
index 36fe22de7c..587f01cc7c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake
@@ -10,6 +10,7 @@
 #
 
 set(GEM_DEPENDENCIES
+    Gem::Atom_RHI_Null.Private
     Gem::Atom_RHI_DX12.Private
     Gem::Atom_RHI_Vulkan.Private
     Gem::Atom_RHI.Private
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp
index f2fd70c0e6..50b2cbb53a 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp
@@ -13,7 +13,6 @@
 #include <Atom/Document/ShaderManagementConsoleDocumentModule.h>
 #include <Document/ShaderManagementConsoleDocumentSystemComponent.h>
 
-#include <AzFramework/TargetManagement/TargetManagementComponent.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h>
 #include <AzToolsFramework/Asset/AssetSystemComponent.h>
 
@@ -32,7 +31,6 @@ namespace ShaderManagementConsole
         return AZ::ComponentTypeList{
             azrtti_typeid<AzToolsFramework::AssetSystem::AssetSystemComponent>(),
             azrtti_typeid<ShaderManagementConsoleDocumentSystemComponent>(),
-            azrtti_typeid<AzFramework::TargetManagementComponent>(),
         };
     }
 }
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp
index f0d72c61c3..31dabe2bac 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp
@@ -105,7 +105,6 @@ namespace ShaderManagementConsole
 
     void ShaderManagementConsoleDocumentSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
     {
-        required.push_back(AZ_CRC("TargetManagerService", 0x6d5708bc));
         required.push_back(AZ_CRC("AssetProcessorToolsConnection", 0x734669bc));
         required.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
         required.push_back(AZ_CRC("PropertyManagerService", 0x63a3d7ad));
@@ -130,13 +129,11 @@ namespace ShaderManagementConsole
     {
         m_documentMap.clear();
         ShaderManagementConsoleDocumentSystemRequestBus::Handler::BusConnect();
-        AzFramework::TmMsgBus::Handler::BusConnect(AZ_CRC("OpenInShaderManagementConsole", 0x9f92aac8));
     }
 
     void ShaderManagementConsoleDocumentSystemComponent::Deactivate()
     {
         ShaderManagementConsoleDocumentSystemRequestBus::Handler::BusDisconnect();
-        AzFramework::TmMsgBus::Handler::BusDisconnect();
         m_documentMap.clear();
     }
 
@@ -159,19 +156,6 @@ namespace ShaderManagementConsole
         return m_documentMap.erase(documentId) != 0;
     }
 
-    void ShaderManagementConsoleDocumentSystemComponent::OnReceivedMsg(AzFramework::TmMsgPtr msg)
-    {
-        if (msg->GetId() == AZ_CRC("OpenInShaderManagementConsole", 0x9f92aac8))
-        {
-            const char* documentPath = reinterpret_cast<const char*>(msg->GetCustomBlob());
-            ShaderManagementConsoleDocumentSystemRequestBus::Broadcast(&ShaderManagementConsoleDocumentSystemRequestBus::Events::OpenDocument, documentPath);
-        }
-        else
-        {
-            AZ_Assert(false, "We received a message of an unrecognized class type!");
-        }
-    }
-
     AZ::Uuid ShaderManagementConsoleDocumentSystemComponent::OpenDocument(AZStd::string_view path)
     {
         return OpenDocumentImpl(path, true);
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h
index 60c205aa72..2bd7306b8b 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h
@@ -14,7 +14,6 @@
 
 #include <AzCore/Component/Component.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzFramework/TargetManagement/TargetManagementAPI.h>
 
 #include <Atom/Document/ShaderManagementConsoleDocumentSystemRequestBus.h>
 #include <Atom/RPI.Public/WindowContext.h>
@@ -30,7 +29,6 @@ namespace ShaderManagementConsole
     //! ShaderManagementConsoleDocumentSystemComponent is the central component of the Shader Management Console Core gem
     class ShaderManagementConsoleDocumentSystemComponent
         : public AZ::Component
-        , private AzFramework::TmMsgBus::Handler
         , private ShaderManagementConsoleDocumentSystemRequestBus::Handler
     {
     public:
@@ -55,11 +53,6 @@ namespace ShaderManagementConsole
         void Deactivate() override;
         ////////////////////////////////////////////////////////////////////////
 
-        //////////////////////////////////////////////////////////////////////////
-        // TmMsgBus::Handler overrides...
-        void OnReceivedMsg(AzFramework::TmMsgPtr msg) override;
-        //////////////////////////////////////////////////////////////////////////
-
         ////////////////////////////////////////////////////////////////////////
         // ShaderManagementConsoleDocumentSystemRequestBus::Handler overrides...
         AZ::Uuid CreateDocument() override;
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp
index ace0aba506..33ca66b048 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp
@@ -28,6 +28,7 @@
 #include <AzToolsFramework/Thumbnails/SourceControlThumbnail.h>
 #include <AtomToolsFramework/Util/Util.h>
 
+#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
 #include <Atom/Document/ShaderManagementConsoleDocumentSystemRequestBus.h>
 
 #include <Source/Window/ShaderManagementConsoleBrowserInteractions.h>
@@ -81,7 +82,14 @@ namespace ShaderManagementConsole
     {
         menu->addAction("Open", [entry]()
         {
-            QDesktopServices::openUrl(QUrl::fromLocalFile(entry->GetFullPath().c_str()));
+            if (AzFramework::StringFunc::Path::IsExtension(entry->GetFullPath().c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
+            {
+                ShaderManagementConsoleDocumentSystemRequestBus::Broadcast(&ShaderManagementConsoleDocumentSystemRequestBus::Events::OpenDocument, entry->GetFullPath().c_str());
+            }
+            else
+            {
+                QDesktopServices::openUrl(QUrl::fromLocalFile(entry->GetFullPath().c_str()));
+            }
         });
 
         menu->addAction("Duplicate...", [entry, caller]()
@@ -100,20 +108,27 @@ namespace ShaderManagementConsole
             }
         });
 
-        menu->addAction("Run Python on Asset...", [entry]()
-            {
-                const QString script = QFileDialog::getOpenFileName(nullptr, "Run Script", QString(), QString("*.py"));
-                if (!script.isEmpty())
-                {
-                    AZStd::vector<AZStd::string_view> pythonArgs { entry->GetFullPath() };
-                    AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, script.toUtf8().constData(), pythonArgs);
-                }
-            });
-
         menu->addAction(AzQtComponents::fileBrowserActionName(), [entry]()
+        {
+            AzQtComponents::ShowFileOnDesktop(entry->GetFullPath().c_str());
+        });
+
+        menu->addSeparator();
+        menu->addAction("Generate Shader Variant List", [entry]() {
+            const QString script = "@engroot@/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py";
+            AZStd::vector<AZStd::string_view> pythonArgs{ entry->GetFullPath() };
+            AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, script.toUtf8().constData(), pythonArgs);
+        });
+
+        menu->addAction("Run Python on Asset...", [entry]()
+        {
+            const QString script = QFileDialog::getOpenFileName(nullptr, "Run Script", QString(), QString("*.py"));
+            if (!script.isEmpty())
             {
-                AzQtComponents::ShowFileOnDesktop(entry->GetFullPath().c_str());
-            });
+                AZStd::vector<AZStd::string_view> pythonArgs { entry->GetFullPath() };
+                AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, script.toUtf8().constData(), pythonArgs);
+            }
+        });
 
         AddPerforceMenuActions(caller, menu, entry);
     }
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
index 01a11e7835..6ab297bfc5 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
@@ -368,6 +368,7 @@ namespace ShaderManagementConsole
         // The document tab contains a table view.
         auto tableView = new QTableView(m_centralWidget);
         tableView->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
 
         auto model = new QStandardItemModel();
         tableView->setModel(model);
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
index 58088536f9..46a5902f70 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
@@ -15,4 +15,5 @@ set(FILES
     Source/ShaderManagementConsoleApplication.h
     Include/Atom/Document/ShaderManagementConsoleDocumentModule.h
     Source/Document/ShaderManagementConsoleDocumentModule.cpp
+    ../Scripts/GenerateShaderVariantListForMaterials.py
 )
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake
index 36fe22de7c..587f01cc7c 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake
@@ -10,6 +10,7 @@
 #
 
 set(GEM_DEPENDENCIES
+    Gem::Atom_RHI_Null.Private
     Gem::Atom_RHI_DX12.Private
     Gem::Atom_RHI_Vulkan.Private
     Gem::Atom_RHI.Private
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py b/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
index 0576789145..9faee7bf84 100755
--- a/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
@@ -24,15 +24,6 @@ from PySide2 import QtWidgets
 
 PROJECT_SHADER_VARIANTS_FOLDER = "ShaderVariants"
 
-def prompt_message_box(text, informativeText = None, qButtons = QtWidgets.QMessageBox.Yes|QtWidgets.QMessageBox.No|QtWidgets.QMessageBox.Cancel):
-    msgBox =  QtWidgets.QMessageBox()
-    msgBox.setText(text)
-    if informativeText:
-        msgBox.setInformativeText(informativeText)
-    msgBox.setStandardButtons(qButtons)
-    
-    return msgBox.exec()
-
 def clean_existing_shadervariantlist_files(filePaths):
     for file in filePaths:
         if os.path.exists(file):
@@ -66,21 +57,32 @@ def main():
         shaderAssetInfo.relativePath
     )
     
-    response = prompt_message_box(
-        "Generating .shadervariantlist File",
-        "This process may take a while. Would you like to save the generated .shadervariantlist file in the project folder? " \
-            "Otherwise, it will be saved in the same location as the .shader file."
+    msgBox = QtWidgets.QMessageBox(
+        QtWidgets.QMessageBox.Question,
+        "Choose Save Location for .shadervariantlist File",
+        "Save .shadervariantlist file in Project folder or in the same folder as shader file?"
     )
+    projectButton = msgBox.addButton("Project Folder", QtWidgets.QMessageBox.AcceptRole)
+    msgBox.addButton("Same Folder as Shader", QtWidgets.QMessageBox.AcceptRole)
+    cancelButton = msgBox.addButton("Cancel", QtWidgets.QMessageBox.RejectRole)
+    msgBox.exec()
+    
     is_save_in_project_folder = False
-    if response == QtWidgets.QMessageBox.Yes:
+    if msgBox.clickedButton() == projectButton:
         is_save_in_project_folder = True
-    elif response == QtWidgets.QMessageBox.Cancel:
+    elif msgBox.clickedButton() == cancelButton:
         return
     
     # This loop collects all uniquely-identified shader items used by the materials based on its shader variant id. 
+    shader_file = os.path.basename(filename)
     shaderVariantIds = []
     shaderVariantListShaderOptionGroups = []
-    for materialAssetId in materialAssetIds:
+    progressDialog = QtWidgets.QProgressDialog(f"Generating .shadervariantlist file for:\n{shader_file}", "Cancel", 0, len(materialAssetIds))
+    progressDialog.setMaximumWidth(400)
+    progressDialog.setMaximumHeight(100)
+    progressDialog.setModal(True)
+    progressDialog.setWindowTitle("Generating Shader Variant List")
+    for i, materialAssetId in enumerate(materialAssetIds):
         materialInstanceShaderItems = azlmbr.shadermanagementconsole.ShaderManagementConsoleRequestBus(azlmbr.bus.Broadcast, 'GetMaterialInstanceShaderItems', materialAssetId)
         
         for shaderItem in materialInstanceShaderItems:
@@ -102,8 +104,14 @@ def main():
                     shaderVariantIds.append(shaderVariantId)
                     shaderVariantListShaderOptionGroups.append(shaderItem.GetShaderOptionGroup())
                     
+        progressDialog.setValue(i)
+        if progressDialog.wasCanceled():
+            return
+            
+    progressDialog.close()
+                    
     # Generate the shader variant list data by collecting shader option name-value pairs.s
-    shaderVariantList = azlmbr.shader.ShaderVariantListSourceData ()
+    shaderVariantList = azlmbr.shader.ShaderVariantListSourceData()
     shaderVariantList.shaderFilePath = shaderAssetInfo.relativePath
     shaderVariants = []
     stableId = 1
@@ -144,17 +152,26 @@ def main():
         shaderVariantListFilePath = projectShaderVariantListFilePath
     else:
         shaderVariantListFilePath = defaultShaderVariantListFilePath
-        
-    print(f"Saving .shadervariantlist file into: {shaderVariantListFilePath}")
+    
+    shaderVariantListFilePath = shaderVariantListFilePath.replace("\\", "/")
     azlmbr.shader.SaveShaderVariantListSourceData(shaderVariantListFilePath, shaderVariantList)
     
     # Open the document in shader management console
-    azlmbr.shadermanagementconsole.ShaderManagementConsoleDocumentSystemRequestBus(
+    result = azlmbr.shadermanagementconsole.ShaderManagementConsoleDocumentSystemRequestBus(
         azlmbr.bus.Broadcast,
         'OpenDocument',
         shaderVariantListFilePath
     )
     
+    if not result.IsNull():
+        msgBox = QtWidgets.QMessageBox(
+            QtWidgets.QMessageBox.Information,
+            "Shader Variant List File Successfully Generated",
+            f".shadervariantlist file was saved in:\n{shaderVariantListFilePath}",
+            QtWidgets.QMessageBox.Ok
+        )
+        msgBox.exec()
+    
     print("==== End shader variant script ============================================================")
 
 if __name__ == "__main__":
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
index 1998642a02..f04e156afd 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
@@ -146,15 +146,6 @@ namespace AZ
         {
             static const AZ::Uuid legacyRenderComponentUuids[] = {
                 AZ::Uuid("{FC315B86-3280-4D03-B4F0-5553D7D08432}"), // EditorMeshComponent
-                AZ::Uuid("{4B85E77D-91F9-40C5-8FCB-B494000A9E69}"), // EditorLensFlareComponent
-                AZ::Uuid("{7C18B273-5BA3-4E0F-857D-1F30BD6B0733}"), // EditorLightComponent
-                AZ::Uuid("{00818135-138D-42AD-8657-FF3FD38D9E7A}"), // EditorPointLightComponent
-                AZ::Uuid("{1DE624B1-876F-4E0A-96A6-7B248FA2076F}"), // EditorAreaLightComponent
-                AZ::Uuid("{41928E34-B558-4559-82CF-8B5795A38CB4}"), // EditorProjectorLightComponent
-                AZ::Uuid("{BA3890BD-D2E7-4DB6-95CD-7E7D5525567A}"), // EditorDecalComponent
-                AZ::Uuid("{8DBD6035-583E-409F-AFD9-F36829A0655D}"), // EditorEnvProbeComponent
-                AZ::Uuid("{9C86E09D-0727-476E-A4A1-25989CDBF9C6}"), // EditorHighQualityShadowComponent
-                AZ::Uuid("{045C0C58-C13E-49B0-A471-D4AC5D3FC6BD}"), // EditorGeometryCacheComponent
             };
 
             const AZStd::string deprecatedString = "  (DEPRECATED By Atom)";
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
index 77f15284f1..bee6d31275 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
@@ -1263,7 +1263,12 @@ namespace AZ::AtomBridge
         const char* text, 
         bool center)
     {
-        AzFramework::FontDrawInterface* fontDrawInterface = AZ::Interface<AzFramework::FontQueryInterface>::Get()->GetDefaultFontDrawInterface();
+        auto fontQueryInterface = AZ::Interface<AzFramework::FontQueryInterface>::Get();
+        if (!fontQueryInterface)
+        {
+            return;
+        }
+        AzFramework::FontDrawInterface* fontDrawInterface = fontQueryInterface->GetDefaultFontDrawInterface();
         if (!fontDrawInterface || !text || size == 0.0f)
         {
             return;
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
index c8382210d3..0f73828186 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
@@ -48,8 +48,8 @@ namespace AZ
                         "AssetCollectionAsyncLoaderTest", "The AssetCollectionAsyncLoaderTest component allows you to test the API provided by AssetCollectionAsyncLoader")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Test")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Comment.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Comment.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Comment.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Comment.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZStd::vector<AZ::Crc32>({ AZ_CRC("Level", 0x9aeacc13), AZ_CRC("Game", 0x232b318c), AZ_CRC("Layer", 0xe4db211a) }))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(AZ::Edit::UIHandlers::LineEdit, &AssetCollectionAsyncLoaderTestComponent::m_pathToAssetListJson, "", "Path To Asset List")
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
index 41f74a9670..54e3a6ce59 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
@@ -99,8 +99,8 @@ void FlyCameraInputComponent::Reflect(AZ::ReflectContext* reflection)
             editContext->Class<FlyCameraInputComponent>("Fly Camera Input", "The Fly Camera Input allows you to control the camera")
                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute("Category", "Gameplay")
-                ->Attribute("Icon", "Editor/Icons/Components/CameraRig.svg")
-                ->Attribute("ViewportIcon", "Editor/Icons/Components/Viewport/CameraRig.png")
+                ->Attribute("Icon", "Icons/Components/CameraRig.svg")
+                ->Attribute("ViewportIcon", "Icons/Components/Viewport/CameraRig.png")
                 ->Attribute("AutoExpand", true)
                 ->Attribute("AppearsInAddComponentMenu", AZ_CRC("Game", 0x232b318c))
                 ->DataElement(0, &FlyCameraInputComponent::m_moveSpeed, "Move Speed", "Speed at which the camera moves")
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
index 2969e35a51..fbefc84aad 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
@@ -24,7 +24,7 @@
 #include <map>
 
 #include <AzFramework/Font/FontInterface.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 #include <Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h>
 
@@ -40,7 +40,6 @@ namespace AZ
     class AtomFont
         : public ICryFont
         , public AzFramework::FontQueryInterface
-        , public AzFramework::SceneSystemNotificationBus::Handler
     {
         friend class FFont;
 
@@ -92,8 +91,7 @@ namespace AZ
         AzFramework::FontDrawInterface* GetFontDrawInterface(AzFramework::FontId fontId) const override;
         AzFramework::FontDrawInterface* GetDefaultFontDrawInterface() const override;
 
-        // SceneSystemNotificationBus handlers
-        void SceneAboutToBeRemoved(AzFramework::Scene& scene) override;
+        void SceneAboutToBeRemoved(AzFramework::Scene& scene);
 
 
         // Atom DynamicDraw interface management
@@ -137,6 +135,8 @@ namespace AZ
         XmlNodeRef LoadFontFamilyXml(const char* fontFamilyName, string& outputDirectory, string& outputFullPath);
 
     private:
+        AzFramework::ISceneSystem::SceneEvent::Handler m_sceneEventHandler;
+
         FontMap m_fonts;
         FontFamilyMap m_fontFamilies; //!< Map font family names to weak ptrs so we can construct shared_ptrs but not keep a ref ourselves.
         FontFamilyReverseLookupMap m_fontFamilyReverseLookup; //<! FontFamily pointer reverse-lookup for quick removal
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
index 636583fe98..3c76a9c788 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
@@ -353,6 +353,18 @@ AZ::AtomFont::AtomFont(ISystem* system)
         "Reload all fonts");
 #endif
     AZ::Interface<AzFramework::FontQueryInterface>::Register(this);
+
+    m_sceneEventHandler = AzFramework::ISceneSystem::SceneEvent::Handler(
+        [this](AzFramework::ISceneSystem::EventType eventType, const AZStd::shared_ptr<AzFramework::Scene>& scene)
+        {
+            if (eventType == AzFramework::ISceneSystem::EventType::ScenePendingRemoval)
+            {
+                SceneAboutToBeRemoved(*scene);
+            }
+        });
+    auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+    AZ_Assert(sceneSystem, "Font created before the scene system is available.");
+    sceneSystem->ConnectToEvents(m_sceneEventHandler);
 }
 
 AZ::AtomFont::~AtomFont()
@@ -851,12 +863,14 @@ XmlNodeRef AZ::AtomFont::LoadFontFamilyXml(const char* fontFamilyName, string& o
 
 void AZ::AtomFont::SceneAboutToBeRemoved(AzFramework::Scene& scene)
 {
-    AZ::RPI::Scene* rpiScene = scene.GetSubsystem<AZ::RPI::Scene>();
-
-    AZStd::lock_guard<AZStd::shared_mutex> lock(m_sceneToDynamicDrawMutex);
-    if ( auto it = m_sceneToDynamicDrawMap.find(rpiScene); it != m_sceneToDynamicDrawMap.end())
+    AZ::RPI::ScenePtr* rpiScene = scene.FindSubsystem<AZ::RPI::ScenePtr>();
+    if (rpiScene)
     {
-        m_sceneToDynamicDrawMap.erase(it);
+        AZStd::lock_guard<AZStd::shared_mutex> lock(m_sceneToDynamicDrawMutex);
+        if (auto it = m_sceneToDynamicDrawMap.find(rpiScene->get()); it != m_sceneToDynamicDrawMap.end())
+        {
+            m_sceneToDynamicDrawMap.erase(it);
+        }
     }
 }
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
index b1275b5b3b..dec52234bb 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
@@ -65,27 +65,38 @@ namespace AZ
 
         void AtomFontSystemComponent::Activate()
         {
-            AZ::CryFontCreationRequestBus::Handler::BusConnect();
+            CrySystemEventBus::Handler::BusConnect();
         }
 
         void AtomFontSystemComponent::Deactivate()
         {
-            AZ::CryFontCreationRequestBus::Handler::BusDisconnect();
+            CrySystemEventBus::Handler::BusDisconnect();
         }
 
-        bool AtomFontSystemComponent::CreateCryFont(SSystemGlobalEnvironment& env, [[maybe_unused]] const SSystemInitParams& initParams)
+        void LoadFont(ICryFont& cryFont, const AZStd::string& fontName)
+        {
+            IFFont* font = cryFont.NewFont(fontName.c_str());
+            AZ_Assert(font, "Could not instantiate font: %s", fontName.c_str());
+
+            const AZStd::string fontPath = "Fonts/" + fontName + ".font";
+            if (!font->Load(fontPath.c_str()))
+            {
+                AZ_Error("AtomFont", false, "Could not load font: %s", fontPath.c_str());
+            }
+        }
+
+        void AtomFontSystemComponent::OnCrySystemInitialized(ISystem& system, const SSystemInitParams&)
         {
-            ISystem* system = env.pSystem;
 #if !defined(AZ_MONOLITHIC_BUILD)
             // When module is linked dynamically, we must set our gEnv pointer.
             // When module is linked statically, we'll share the application's gEnv pointer.
-            gEnv = system->GetGlobalEnvironment();
+            gEnv = system.GetGlobalEnvironment();
 #endif
 
-            if (env.IsDedicated())
+            if (gEnv->IsDedicated())
             {
         #if defined(USE_NULLFONT)
-                env.pCryFont = new AtomNullFont();
+                gEnv->pCryFont = new AtomNullFont();
         #else
                 // The NULL font implementation must be present for all platforms
                 // supporting running as a pure dedicated server.
@@ -96,12 +107,17 @@ namespace AZ
             else
             {
         #if defined(USE_NULLFONT) && defined(USE_NULLFONT_ALWAYS)
-                env.pCryFont = new AtomNullFont();
+                gEnv->pCryFont = new AtomNullFont();
         #else
-                env.pCryFont = new AtomFont(system);
+                gEnv->pCryFont = new AtomFont(&system);
         #endif
             }
-            return env.pCryFont != 0;
+
+            if (gEnv->pCryFont)
+            {
+                LoadFont(*gEnv->pCryFont, "default");
+                LoadFont(*gEnv->pCryFont, "default-ui");
+            }
         }
 
         void AtomFontSystemComponent::OnCrySystemShutdown([[maybe_unused]] ISystem& system)
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h
index 23ce20c307..05e30661f2 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h
@@ -13,7 +13,6 @@
 
 #include <AzCore/Component/Component.h>
 
-#include <CryCommon/CryFontBus.h>
 #include <CryCommon/CrySystemBus.h>
 
 namespace AZ
@@ -22,7 +21,6 @@ namespace AZ
     {
         class AtomFontSystemComponent
             : public AZ::Component
-            , private AZ::CryFontCreationRequestBus::Handler
             , private CrySystemEventBus::Handler
         {
         public:
@@ -43,12 +41,12 @@ namespace AZ
             ////////////////////////////////////////////////////////////////////////
 
             ////////////////////////////////////////////////////////////////////////
-            // CryFontCreationBus
-            bool CreateCryFont(SSystemGlobalEnvironment& env, const SSystemInitParams& initParams) override;
+            // CrySystemEventBus
+            void OnCrySystemInitialized(ISystem& system, const SSystemInitParams& initParams);
             ////////////////////////////////////////////////////////////////////////
 
             ////////////////////////////////////////////////////////////////////////
-            // CryFontCreationBus
+            // CrySystemEventBus
             void OnCrySystemShutdown(ISystem& system) override;
             ////////////////////////////////////////////////////////////////////////
         };
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
new file mode 100644
index 0000000000..138d619d97
--- /dev/null
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
@@ -0,0 +1,355 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#include "AttachmentComponent.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/Component/Entity.h>
+#include <MathConversion.h>
+#include <LmbrCentral/Rendering/MeshAsset.h>
+#include <LmbrCentral/Animation/AttachmentComponentBus.h>
+#include <LmbrCentral/Animation/SkeletalHierarchyRequestBus.h>
+
+namespace AZ
+{
+    namespace Render
+    {
+        /// Behavior Context handler for AttachmentComponentNotificationBus
+        class BehaviorAttachmentComponentNotificationBusHandler : public LmbrCentral::AttachmentComponentNotificationBus::Handler,
+                                                                  public AZ::BehaviorEBusHandler
+        {
+        public:
+            AZ_EBUS_BEHAVIOR_BINDER(
+                BehaviorAttachmentComponentNotificationBusHandler, "{636B95A0-5C7D-4EE7-8645-955665315451}", AZ::SystemAllocator,
+                OnAttached, OnDetached);
+
+            void OnAttached(AZ::EntityId id) override
+            {
+                Call(FN_OnAttached, id);
+            }
+
+            void OnDetached(AZ::EntityId id) override
+            {
+                Call(FN_OnDetached, id);
+            }
+        };
+
+        void AttachmentConfiguration::Reflect(AZ::ReflectContext* context)
+        {
+            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
+            if (serializeContext)
+            {
+                serializeContext->Class<AttachmentConfiguration>()
+                    ->Version(1)
+                    ->Field("Target ID", &AttachmentConfiguration::m_targetId)
+                    ->Field("Target Bone Name", &AttachmentConfiguration::m_targetBoneName)
+                    ->Field("Target Offset", &AttachmentConfiguration::m_targetOffset)
+                    ->Field("Attached Initially", &AttachmentConfiguration::m_attachedInitially)
+                    ->Field("Scale Source", &AttachmentConfiguration::m_scaleSource);
+            }
+            AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
+            if (behaviorContext)
+            {
+                behaviorContext->EBus<LmbrCentral::AttachmentComponentRequestBus>("AttachmentComponentRequestBus")
+                    ->Event("Attach", &LmbrCentral::AttachmentComponentRequestBus::Events::Attach)
+                    ->Event("Detach", &LmbrCentral::AttachmentComponentRequestBus::Events::Detach)
+                    ->Event("SetAttachmentOffset", &LmbrCentral::AttachmentComponentRequestBus::Events::SetAttachmentOffset);
+
+                behaviorContext->EBus<LmbrCentral::AttachmentComponentNotificationBus>("AttachmentComponentNotificationBus")
+                    ->Handler<BehaviorAttachmentComponentNotificationBusHandler>();
+            }
+        }
+
+        void AttachmentComponent::Reflect(AZ::ReflectContext* context)
+        {
+            AttachmentConfiguration::Reflect(context);
+
+            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
+            if (serializeContext)
+            {
+                serializeContext->Class<AttachmentComponent, AZ::Component>()->Version(1)->Field(
+                    "Configuration", &AttachmentComponent::m_initialConfiguration);
+            }
+        }
+
+        //=========================================================================
+        // BoneFollower
+        //=========================================================================
+
+        void BoneFollower::Activate(AZ::Entity* owner, const AttachmentConfiguration& configuration, bool targetCanAnimate)
+        {
+            AZ_Assert(owner, "owner is required");
+            AZ_Assert(!m_ownerId.IsValid(), "BoneFollower is already Activated");
+
+            m_ownerId = owner->GetId();
+            m_targetCanAnimate = targetCanAnimate;
+            m_isUpdatingOwnerTransform = false;
+            m_scaleSource = configuration.m_scaleSource;
+
+            m_cachedOwnerTransform = AZ::Transform::CreateIdentity();
+            EBUS_EVENT_ID_RESULT(m_cachedOwnerTransform, m_ownerId, AZ::TransformBus, GetWorldTM);
+
+            if (configuration.m_attachedInitially)
+            {
+                Attach(configuration.m_targetId, configuration.m_targetBoneName.c_str(), configuration.m_targetOffset);
+            }
+
+            LmbrCentral::AttachmentComponentRequestBus::Handler::BusConnect(m_ownerId);
+        }
+
+        void BoneFollower::Deactivate()
+        {
+            AZ_Assert(m_ownerId.IsValid(), "BoneFollower was never Activated");
+
+            LmbrCentral::AttachmentComponentRequestBus::Handler::BusDisconnect();
+            Detach();
+            m_ownerId.SetInvalid();
+        }
+
+        AZ::EntityId BoneFollower::GetTargetEntityId()
+        {
+            return m_targetId;
+        }
+
+        AZ::Transform BoneFollower::GetOffset()
+        {
+            return m_targetOffset;
+        }
+
+        void BoneFollower::Attach(AZ::EntityId targetId, const char* targetBoneName, const AZ::Transform& offset)
+        {
+            AZ_Assert(m_ownerId.IsValid(), "BoneFollower must be Activated to use.")
+
+                // safe to try and detach, even if we weren't attached
+                Detach();
+
+            if (!targetId.IsValid())
+            {
+                return;
+            }
+
+            if (targetId == m_ownerId)
+            {
+                AZ_Error("Attachment Component", false, "AttachmentComponent cannot target itself");
+                return;
+            }
+
+            // Note: the target entity may not be activated yet. That's ok.
+            // When mesh is ready we are notified via MeshComponentEvents::OnModelReady
+            // When transform is ready we are notified via TransformNotificationBus::OnTransformChanged
+
+            m_targetId = targetId;
+            m_targetBoneName = targetBoneName;
+            m_targetOffset = offset;
+
+            BindTargetBone();
+
+            m_targetBoneTransform = AZ::Transform::Identity();
+
+            m_isTargetEntityTransformKnown = false; // target's transform may not be available yet
+
+            AZ::TransformBus::EventResult(
+                m_cachedOwnerTransform, m_ownerId, &AZ::TransformBus::Events::GetWorldTM); // owner query will always succeed
+
+            MeshComponentNotificationBus::Handler::BusConnect(m_targetId); // fires OnModelReady if asset is already ready
+            AZ::TransformNotificationBus::Handler::BusConnect(m_targetId);
+            if (m_targetCanAnimate)
+            {
+                // Only register for per-frame updates when target can animate
+                AZ::TickBus::Handler::BusConnect();
+            }
+
+            // update owner's transform
+            UpdateOwnerTransformIfNecessary();
+
+            // alert others that we've attached
+            LmbrCentral::AttachmentComponentNotificationBus::Event(m_targetId, &LmbrCentral::AttachmentComponentNotificationBus::Events::OnAttached, m_ownerId);
+        }
+
+        void BoneFollower::Detach()
+        {
+            AZ_Assert(m_ownerId.IsValid(), "BoneFollower must be Activated to use.");
+
+            if (m_targetId.IsValid())
+            {
+                // alert others that we're detaching
+                EBUS_EVENT_ID(m_targetId, LmbrCentral::AttachmentComponentNotificationBus, OnDetached, m_ownerId);
+
+                MeshComponentNotificationBus::Handler::BusDisconnect();
+                AZ::TransformNotificationBus::Handler::BusDisconnect(m_targetId);
+                AZ::TickBus::Handler::BusDisconnect();
+
+                m_targetId.SetInvalid();
+            }
+        }
+
+        const char* BoneFollower::GetJointName()
+        {
+            return m_targetBoneName.c_str();
+        }
+
+        void BoneFollower::SetAttachmentOffset(const AZ::Transform& offset)
+        {
+            AZ_Assert(m_ownerId.IsValid(), "BoneFollower must be Activated to use.");
+
+            if (m_targetId.IsValid())
+            {
+                m_targetOffset = offset;
+                UpdateOwnerTransformIfNecessary();
+            }
+        }
+
+        void BoneFollower::OnModelReady([[maybe_unused]] const AZ::Data::Asset<AZ::RPI::ModelAsset>& modelAsset, [[maybe_unused]] const AZ::Data::Instance<AZ::RPI::Model>& model)
+        {
+            // reset character values
+            BindTargetBone();
+            m_targetBoneTransform = QueryBoneTransform();
+
+            // move owner if necessary
+            UpdateOwnerTransformIfNecessary();
+        }
+
+        void BoneFollower::BindTargetBone()
+        {
+            m_targetBoneId = -1;
+            LmbrCentral::SkeletalHierarchyRequestBus::EventResult(
+                m_targetBoneId, m_targetId, &LmbrCentral::SkeletalHierarchyRequests::GetJointIndexByName, m_targetBoneName.c_str());
+        }
+
+        void BoneFollower::UpdateOwnerTransformIfNecessary()
+        {
+            // Can't update until target entity's transform is known
+            if (!m_isTargetEntityTransformKnown)
+            {
+                if (AZ::TransformBus::GetNumOfEventHandlers(m_targetId) == 0)
+                {
+                    return;
+                }
+
+                AZ::TransformBus::EventResult(m_targetEntityTransform, m_targetId, &AZ::TransformBus::Events::GetWorldTM);
+                m_isTargetEntityTransformKnown = true;
+            }
+
+            AZ::Transform finalTransform;
+            if (m_scaleSource == AttachmentConfiguration::ScaleSource::WorldScale)
+            {
+                // apply offset in world-space
+                finalTransform = m_targetEntityTransform * m_targetBoneTransform;
+                finalTransform.SetScale(AZ::Vector3::CreateOne());
+                finalTransform *= m_targetOffset;
+            }
+            else if (m_scaleSource == AttachmentConfiguration::ScaleSource::TargetEntityScale)
+            {
+                // apply offset in target-entity-space (ignoring bone scale)
+                AZ::Transform boneNoScale = m_targetBoneTransform;
+                boneNoScale.SetScale(AZ::Vector3::CreateOne());
+
+                finalTransform = m_targetEntityTransform * boneNoScale * m_targetOffset;
+            }
+            else // AttachmentConfiguration::ScaleSource::TargetEntityScale
+            {
+                // apply offset in target-bone-space
+                finalTransform = m_targetEntityTransform * m_targetBoneTransform * m_targetOffset;
+            }
+
+            if (m_cachedOwnerTransform != finalTransform)
+            {
+                AZ_Warning(
+                    "Attachment Component", !m_isUpdatingOwnerTransform,
+                    "AttachmentComponent detected a cycle when updating transform, do not target child entities.");
+                if (!m_isUpdatingOwnerTransform)
+                {
+                    m_cachedOwnerTransform = finalTransform;
+                    m_isUpdatingOwnerTransform = true;
+                    EBUS_EVENT_ID(m_ownerId, AZ::TransformBus, SetWorldTM, finalTransform);
+                    m_isUpdatingOwnerTransform = false;
+                }
+            }
+        }
+
+        AZ::Transform BoneFollower::QueryBoneTransform() const
+        {
+            AZ::Transform boneTransform = AZ::Transform::CreateIdentity();
+
+            if (m_targetBoneId >= 0)
+            {
+                LmbrCentral::SkeletalHierarchyRequestBus::EventResult(
+                    boneTransform, m_targetId, &LmbrCentral::SkeletalHierarchyRequests::GetJointTransformCharacterRelative, m_targetBoneId);
+            }
+
+            return boneTransform;
+        }
+
+        // fires when target's transform changes
+        void BoneFollower::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
+        {
+            m_targetEntityTransform = world;
+            m_isTargetEntityTransformKnown = true;
+            UpdateOwnerTransformIfNecessary();
+        }
+
+        void BoneFollower::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
+        {
+            m_targetBoneTransform = QueryBoneTransform();
+            UpdateOwnerTransformIfNecessary();
+        }
+
+        int BoneFollower::GetTickOrder()
+        {
+            return AZ::TICK_ATTACHMENT;
+        }
+
+        void BoneFollower::Reattach(bool detachFirst)
+        {
+#ifdef AZ_ENABLE_TRACING
+            AZ::Entity* ownerEntity = nullptr;
+            AZ::Entity* targetEntity = nullptr;
+            AZ::ComponentApplicationBus::BroadcastResult(ownerEntity, &AZ::ComponentApplicationBus::Events::FindEntity, m_ownerId);
+            AZ::ComponentApplicationBus::BroadcastResult(targetEntity, &AZ::ComponentApplicationBus::Events::FindEntity, m_targetId);
+            AZ_TracePrintf(
+                "BoneFollower", "Reattaching entity '%s' to entity '%s'", ownerEntity ? ownerEntity->GetName().c_str() : "",
+                targetEntity ? targetEntity->GetName().c_str() : "");
+#endif
+
+            if (m_targetId.IsValid() && detachFirst)
+            {
+                LmbrCentral::AttachmentComponentNotificationBus::Event(m_targetId, &LmbrCentral::AttachmentComponentNotificationBus::Events::OnDetached, m_ownerId);
+            }
+
+            if (m_targetId != m_ownerId)
+            {
+                LmbrCentral::AttachmentComponentNotificationBus::Event(m_targetId, &LmbrCentral::AttachmentComponentNotificationBus::Events::OnAttached, m_ownerId);
+            }
+        }
+
+        //=========================================================================
+        // AttachmentComponent
+        //=========================================================================
+
+        void AttachmentComponent::Activate()
+        {
+#ifdef AZ_ENABLE_TRACING
+            bool isStaticTransform = false;
+            AZ::TransformBus::EventResult(isStaticTransform, GetEntityId(), &AZ::TransformBus::Events::IsStaticTransform);
+            AZ_Warning(
+                "Attachment Component", !isStaticTransform, "Attachment needs to move, but entity '%s' %s has a static transform.",
+                GetEntity()->GetName().c_str(), GetEntityId().ToString().c_str());
+#endif
+
+            m_boneFollower.Activate(GetEntity(), m_initialConfiguration, true);
+        }
+
+        void AttachmentComponent::Deactivate()
+        {
+            m_boneFollower.Deactivate();
+        }
+    } // namespace Render
+} // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h
new file mode 100644
index 0000000000..ac03663f22
--- /dev/null
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h
@@ -0,0 +1,189 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <LmbrCentral/Animation/AttachmentComponentBus.h>
+#include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>
+#include <AzCore/Component/Component.h>
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/Math/Transform.h>
+
+struct ISkeletonPose;
+
+namespace AZ
+{
+    namespace Render
+    {
+        /*!
+         * Configuration data for AttachmentComponent.
+         */
+        struct AttachmentConfiguration
+        {
+            AZ_TYPE_INFO(AttachmentConfiguration, "{74B5DC69-DE44-4640-836A-55339E116795}");
+
+            virtual ~AttachmentConfiguration() = default;
+
+            static void Reflect(AZ::ReflectContext* context);
+
+            //! Attach to this entity.
+            AZ::EntityId m_targetId;
+
+            //! Attach to this bone on target entity.
+            AZStd::string m_targetBoneName;
+
+            //! Offset from target.
+            AZ::Transform m_targetOffset = AZ::Transform::Identity();
+
+            //! Whether to attach to target upon activation.
+            //! If false, the entity remains detached until Attach() is called.
+            bool m_attachedInitially = true;
+
+            //! Source from which to retrieve scale information.
+            enum class ScaleSource : AZ::u8
+            {
+                WorldScale,         // Scaled in world space.
+                TargetEntityScale,  // Adopt scaling of attachment target entity.
+                TargetBoneScale,    // Adopt scaling of attachment target entity/joint.
+            };
+            ScaleSource m_scaleSource = ScaleSource::WorldScale;
+        };
+
+        /*
+         * Common functionality for game and editor attachment components.
+         * The BoneFollower tracks movement of the target's bone and
+         * updates the owning entity's TransformComponent to follow.
+         * This class should be a member within the attachment component
+         * and be activated/deactivated along with the component.
+         * \ref AttachmentComponent
+         */
+        class BoneFollower
+            : public LmbrCentral::AttachmentComponentRequestBus::Handler
+            , public AZ::TransformNotificationBus::Handler
+            , public AZ::Render::MeshComponentNotificationBus::Handler
+            , public AZ::Data::AssetBus::Handler
+            , public AZ::TickBus::Handler
+        {
+        public:
+            void Activate(AZ::Entity* owner, const AttachmentConfiguration& initialConfiguration, bool targetCanAnimate);
+            void Deactivate();
+
+            ////////////////////////////////////////////////////////////////////////
+            // AttachmentComponentRequests
+            void Reattach(bool detachFirst);
+            void Attach(AZ::EntityId targetId, const char* targetBoneName, const AZ::Transform& offset) override;
+            void Detach() override;
+            void SetAttachmentOffset(const AZ::Transform& offset) override;
+            const char* GetJointName() override;
+            AZ::EntityId GetTargetEntityId() override;
+            AZ::Transform GetOffset() override;
+            ////////////////////////////////////////////////////////////////////////
+
+        private:
+
+            ////////////////////////////////////////////////////////////////////////
+            // AZ::TickBus
+            //! Check target bone transform every frame.
+            void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
+            //! Make sure target bone transform updates after animation update.
+            int GetTickOrder() override;
+            ////////////////////////////////////////////////////////////////////////
+
+            ////////////////////////////////////////////////////////////////////////
+            // AZ::TransformNotificationBus
+            //! When target's transform changes
+            void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
+            ////////////////////////////////////////////////////////////////////////
+
+            ////////////////////////////////////////////////////////////////////////
+            // MeshComponentEvents
+            //! When target's mesh changes
+            void OnModelReady(const AZ::Data::Asset<AZ::RPI::ModelAsset>& modelAsset, const AZ::Data::Instance<AZ::RPI::Model>& model) override;
+            ////////////////////////////////////////////////////////////////////////
+
+            void BindTargetBone();
+
+            AZ::Transform QueryBoneTransform() const;
+
+            void UpdateOwnerTransformIfNecessary();
+
+            //! Entity which which is being attached.
+            AZ::EntityId    m_ownerId;
+
+            //! Whether to query bone position per-frame (false while in editor)
+            bool            m_targetCanAnimate = false;
+
+            AZ::EntityId    m_targetId;
+            AZStd::string   m_targetBoneName;
+            AZ::Transform   m_targetOffset; //!< local transform
+            AZ::Transform   m_targetBoneTransform; //!< local transform of bone
+            AZ::Transform   m_targetEntityTransform; //!< world transform of target
+            bool            m_isTargetEntityTransformKnown = false;
+
+            //! Cached value, so we don't update owner's position unnecessarily.
+            AZ::Transform   m_cachedOwnerTransform;
+            bool            m_isUpdatingOwnerTransform = false; //!< detect infinite loops when updating owner's transform
+
+            // Cached character values to avoid repeated lookup.
+            // These are set by calling ResetCharacter()
+            int             m_targetBoneId; //!< negative when bone not found
+
+            AttachmentConfiguration::ScaleSource m_scaleSource;
+        };
+
+        /*!
+         * The AttachmentComponent lets an entity stick to a particular bone on
+         * a target entity. This is achieved by tracking movement of the target's
+         * bone and updating the entity's TransformComponent accordingly.
+         */
+        class AttachmentComponent
+            : public AZ::Component
+        {
+        public:
+            AZ_COMPONENT(AttachmentComponent, "{2D17A64A-7AC5-4C02-AC36-C5E8141FFDDF}");
+
+            friend class EditorAttachmentComponent;
+
+            static void Reflect(AZ::ReflectContext* context);
+
+            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+            {
+                provided.push_back(AZ_CRC("AttachmentService", 0x5aaa7b63));
+            }
+
+            static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+            {
+                incompatible.push_back(AZ_CRC("AttachmentService", 0x5aaa7b63));
+            }
+
+            static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+            {
+                required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
+            }
+
+            ~AttachmentComponent() override = default;
+
+        private:
+            ////////////////////////////////////////////////////////////////////////
+            // AZ::Component
+            void Activate() override;
+            void Deactivate() override;
+            ////////////////////////////////////////////////////////////////////////
+
+            //! Initial configuration for m_attachment
+            AttachmentConfiguration m_initialConfiguration;
+
+            //! Implements actual attachment functionality
+            BoneFollower m_boneFollower;
+        };
+    } // namespace Render
+} // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
new file mode 100644
index 0000000000..3b50c0a48c
--- /dev/null
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
@@ -0,0 +1,242 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include "EditorAttachmentComponent.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Math/Quaternion.h>
+#include <AzCore/Math/Transform.h>
+#include <LmbrCentral/Animation/SkeletalHierarchyRequestBus.h>
+
+namespace AZ
+{
+    namespace Render
+    {
+        void EditorAttachmentComponent::Reflect(AZ::ReflectContext* context)
+        {
+            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
+            if (serializeContext)
+            {
+                serializeContext->Class<EditorAttachmentComponent, EditorComponentBase>()
+                    ->Version(1)
+                    ->Field("Target ID", &EditorAttachmentComponent::m_targetId)
+                    ->Field("Target Bone Name", &EditorAttachmentComponent::m_targetBoneName)
+                    ->Field("Position Offset", &EditorAttachmentComponent::m_positionOffset)
+                    ->Field("Rotation Offset", &EditorAttachmentComponent::m_rotationOffset)
+                    ->Field("Scale Offset", &EditorAttachmentComponent::m_scaleOffset)
+                    ->Field("Attached Initially", &EditorAttachmentComponent::m_attachedInitially)
+                    ->Field("Scale Source", &EditorAttachmentComponent::m_scaleSource);
+
+                AZ::EditContext* editContext = serializeContext->GetEditContext();
+                if (editContext)
+                {
+                    editContext
+                        ->Class<EditorAttachmentComponent>(
+                            "Attachment", "The Attachment component lets an entity attach to a bone on the skeleton of another entity")
+                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ->Attribute(AZ::Edit::Attributes::Category, "Animation")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Attachment.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Attachment.png")
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                        ->Attribute(
+                            AZ::Edit::Attributes::HelpPageURL,
+                            "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-attachment.html")
+                        ->DataElement(0, &EditorAttachmentComponent::m_targetId, "Target entity", "Attach to this entity.")
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetIdChanged)
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::ComboBox, &EditorAttachmentComponent::m_targetBoneName, "Joint name",
+                            "Attach to this joint on target entity.")
+                        ->Attribute(AZ::Edit::Attributes::StringList, &EditorAttachmentComponent::GetTargetBoneOptions)
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetBoneChanged)
+                        ->DataElement(
+                            0, &EditorAttachmentComponent::m_positionOffset, "Position offset", "Local position offset from target bone")
+                        ->Attribute(AZ::Edit::Attributes::Suffix, "m")
+                        ->Attribute(AZ::Edit::Attributes::Step, 0.01f)
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
+                        ->DataElement(
+                            0, &EditorAttachmentComponent::m_rotationOffset, "Rotation offset", "Local rotation offset from target bone")
+                        ->Attribute(AZ::Edit::Attributes::Suffix, "deg")
+                        ->Attribute(AZ::Edit::Attributes::Step, 0.01f)
+                        ->Attribute(AZ::Edit::Attributes::Min, -AZ::RadToDeg(AZ::Constants::TwoPi))
+                        ->Attribute(AZ::Edit::Attributes::Max, AZ::RadToDeg(AZ::Constants::TwoPi))
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
+                        ->DataElement(0, &EditorAttachmentComponent::m_scaleOffset, "Scale offset", "Local scale offset from target entity")
+                        ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
+                        ->Attribute(AZ::Edit::Attributes::Min, 0.001f)
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
+                        ->DataElement(
+                            0, &EditorAttachmentComponent::m_attachedInitially, "Attached initially",
+                            "Whether to attach to target upon activation.")
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnAttachedInitiallyChanged)
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::ComboBox, &EditorAttachmentComponent::m_scaleSource, "Scaling",
+                            "How object scale should be determined. "
+                            "Use world scale = Attached object is scaled in world space, Use target entity scale = Attached object adopts "
+                            "scale of target entity., Use target bone scale = Attached object adopts scale of target entity/joint.")
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnScaleSourceChanged)
+                        ->EnumAttribute(AttachmentConfiguration::ScaleSource::WorldScale, "Use world scale")
+                        ->EnumAttribute(AttachmentConfiguration::ScaleSource::TargetEntityScale, "Use target entity scale")
+                        ->EnumAttribute(AttachmentConfiguration::ScaleSource::TargetBoneScale, "Use target bone scale");
+                }
+            }
+        }
+
+        void EditorAttachmentComponent::Activate()
+        {
+            Base::Activate();
+            m_boneFollower.Activate(GetEntity(), CreateAttachmentConfiguration(),
+                                    false); // Entity's don't animate in Editor
+        }
+
+        void EditorAttachmentComponent::Deactivate()
+        {
+            m_boneFollower.Deactivate();
+            Base::Deactivate();
+        }
+
+        void EditorAttachmentComponent::BuildGameEntity(AZ::Entity* gameEntity)
+        {
+            AttachmentComponent* component = gameEntity->CreateComponent<AttachmentComponent>();
+            if (component)
+            {
+                component->m_initialConfiguration = CreateAttachmentConfiguration();
+            }
+        }
+
+        AttachmentConfiguration EditorAttachmentComponent::CreateAttachmentConfiguration() const
+        {
+            AttachmentConfiguration configuration;
+            configuration.m_targetId = m_targetId;
+            configuration.m_targetBoneName = m_targetBoneName;
+            configuration.m_targetOffset = GetTargetOffset();
+            configuration.m_attachedInitially = m_attachedInitially;
+            configuration.m_scaleSource = m_scaleSource;
+            return configuration;
+        }
+
+        AZ::Transform EditorAttachmentComponent::GetTargetOffset() const
+        {
+            AZ::Transform offset = AZ::ConvertEulerDegreesToTransform(m_rotationOffset);
+            offset.SetTranslation(m_positionOffset);
+            offset.MultiplyByScale(m_scaleOffset);
+            return offset;
+        }
+
+        AZStd::vector<AZStd::string> EditorAttachmentComponent::GetTargetBoneOptions() const
+        {
+            AZStd::vector<AZStd::string> names;
+
+            // insert blank entry, so user may choose to bind to NO bone.
+            names.push_back("");
+
+            // track whether currently-set bone is found
+            bool currentTargetBoneFound = false;
+
+            // Get character and iterate over bones
+            AZ::u32 jointCount = 0;
+            LmbrCentral::SkeletalHierarchyRequestBus::EventResult(jointCount, m_targetId, &LmbrCentral::SkeletalHierarchyRequests::GetJointCount);
+            for (AZ::u32 jointIndex = 0; jointIndex < jointCount; ++jointIndex)
+            {
+                const char* name = nullptr;
+                LmbrCentral::SkeletalHierarchyRequestBus::EventResult(name, m_targetId, &LmbrCentral::SkeletalHierarchyRequests::GetJointNameByIndex, jointIndex);
+                if (name)
+                {
+                    names.push_back(name);
+
+                    if (!currentTargetBoneFound)
+                    {
+                        currentTargetBoneFound = (m_targetBoneName == names.back());
+                    }
+                }
+            }
+
+            // If we never found currently-set bone name,
+            // stick it at top of list, just in case user wants to keep it anyway
+            if (!currentTargetBoneFound && !m_targetBoneName.empty())
+            {
+                names.insert(names.begin(), m_targetBoneName);
+            }
+
+            return names;
+        }
+
+        AZ::u32 EditorAttachmentComponent::OnTargetIdChanged()
+        {
+            // Warn about bad setups (it won't crash, but it's nice to handle this early)
+            if (m_targetId == GetEntityId())
+            {
+                AZ_Warning(GetEntity()->GetName().c_str(), false, "AttachmentComponent cannot target self.") m_targetId.SetInvalid();
+            }
+
+            // Warn about children attaching to a parent
+            AZ::EntityId parentOfTarget;
+            AZ::TransformBus::EventResult(parentOfTarget, m_targetId, &AZ::TransformBus::Events::GetParentId);
+            while (parentOfTarget.IsValid())
+            {
+                if (parentOfTarget == GetEntityId())
+                {
+                    AZ_Warning(
+                        GetEntity()->GetName().c_str(), parentOfTarget != GetEntityId(), "AttachmentComponent cannot target child entity");
+                    m_targetId.SetInvalid();
+                    break;
+                }
+
+                AZ::EntityId currentParentId = parentOfTarget;
+                parentOfTarget.SetInvalid();
+                AZ::TransformBus::EventResult(parentOfTarget, currentParentId, &AZ::TransformBus::Events::GetParentId);
+            }
+
+            AttachOrDetachAsNecessary();
+
+            return AZ::Edit::PropertyRefreshLevels::AttributesAndValues; // refresh bone options
+        }
+
+        AZ::u32 EditorAttachmentComponent::OnTargetBoneChanged()
+        {
+            AttachOrDetachAsNecessary();
+            return AZ::Edit::PropertyRefreshLevels::None;
+        }
+
+        AZ::u32 EditorAttachmentComponent::OnTargetOffsetChanged()
+        {
+            EBUS_EVENT_ID(GetEntityId(), LmbrCentral::AttachmentComponentRequestBus, SetAttachmentOffset, GetTargetOffset());
+            return AZ::Edit::PropertyRefreshLevels::None;
+        }
+
+        AZ::u32 EditorAttachmentComponent::OnAttachedInitiallyChanged()
+        {
+            AttachOrDetachAsNecessary();
+            return AZ::Edit::PropertyRefreshLevels::None;
+        }
+
+        AZ::u32 EditorAttachmentComponent::OnScaleSourceChanged()
+        {
+            m_boneFollower.Deactivate();
+            m_boneFollower.Activate(GetEntity(), CreateAttachmentConfiguration(), false);
+            return AZ::Edit::PropertyRefreshLevels::None;
+        }
+
+        void EditorAttachmentComponent::AttachOrDetachAsNecessary()
+        {
+            if (m_attachedInitially && m_targetId.IsValid())
+            {
+                EBUS_EVENT_ID(
+                    GetEntityId(), LmbrCentral::AttachmentComponentRequestBus, Attach, m_targetId, m_targetBoneName.c_str(), GetTargetOffset());
+            }
+            else
+            {
+                EBUS_EVENT_ID(GetEntityId(), LmbrCentral::AttachmentComponentRequestBus, Detach);
+            }
+        }
+    } // namespace Render
+ } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
new file mode 100644
index 0000000000..cac8a71a94
--- /dev/null
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
@@ -0,0 +1,104 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
+#include "AttachmentComponent.h"
+
+namespace AZ
+{
+    namespace Render
+    {
+        /*!
+         * In-editor attachment component.
+         * \ref AttachmentComponent
+         */
+        class EditorAttachmentComponent
+            : public AzToolsFramework::Components::EditorComponentBase
+        {
+        private:
+            using Base = AzToolsFramework::Components::EditorComponentBase;
+        public:
+            AZ_COMPONENT(EditorAttachmentComponent, "{DA6072FD-E696-47D8-81D9-1F77D3464200}", Base);
+            static void Reflect(AZ::ReflectContext* context);
+
+            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+            {
+                AttachmentComponent::GetProvidedServices(provided);
+            }
+
+            static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+            {
+                AttachmentComponent::GetIncompatibleServices(incompatible);
+            }
+
+            static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+            {
+                AttachmentComponent::GetRequiredServices(required);
+            }
+
+            ~EditorAttachmentComponent() override = default;
+            void BuildGameEntity(AZ::Entity* gameEntity) override;
+
+        protected:
+
+            //////////////////////////////////////////////////////////////////////////
+            // AZ::Component interface implementation
+            void Activate() override;
+            void Deactivate() override;
+            //////////////////////////////////////////////////////////////////////////
+
+            AZ::u32 OnTargetIdChanged();
+            AZ::u32 OnTargetBoneChanged();
+            AZ::u32 OnTargetOffsetChanged();
+            AZ::u32 OnAttachedInitiallyChanged();
+            AZ::u32 OnScaleSourceChanged();
+
+            //! Invoked when an attachment property changes
+            void AttachOrDetachAsNecessary();
+
+            //! For populating ComboBox
+            AZStd::vector<AZStd::string> GetTargetBoneOptions() const;
+
+            //! Create runtime configuration from editor configuration
+            AttachmentConfiguration CreateAttachmentConfiguration() const;
+
+            //! Create AZ::Transform from position and rotation
+            AZ::Transform GetTargetOffset() const;
+
+            //! Attach to this entity.
+            AZ::EntityId m_targetId;
+
+            //! Attach to this bone on target entity.
+            AZStd::string m_targetBoneName;
+
+            //! Offset from target bone's position.
+            AZ::Vector3 m_positionOffset = AZ::Vector3::CreateZero();
+
+            //! Offset from target bone's rotation.
+            AZ::Vector3 m_rotationOffset = AZ::Vector3::CreateZero();
+
+            //! Offset from target entity's scale.
+            AZ::Vector3 m_scaleOffset = AZ::Vector3::CreateOne();
+
+            //! Observe scale information from the specified source.       
+            AttachmentConfiguration::ScaleSource m_scaleSource = AttachmentConfiguration::ScaleSource::WorldScale;
+
+            //! Whether to attach to target upon activation.
+            //! If false, the entity remains detached until Attach() is called.
+            bool m_attachedInitially = true;
+
+            //! Implements actual attachment functionality
+            AZ::Render::BoneFollower m_boneFollower;
+        };
+    } // namespace Render
+} // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
index 54babd3bc1..7805a92cd1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
@@ -103,12 +103,15 @@ namespace AZ::Render
     void DiskLightDelegate::SetEnableShutters(bool enabled)
     {
         Base::SetEnableShutters(enabled);
-        GetFeatureProcessor()->SetConstrainToConeLight(GetLightHandle(), true);
+        if (GetLightHandle().IsValid())
+        {
+            GetFeatureProcessor()->SetConstrainToConeLight(GetLightHandle(), true);
+        }
     }
 
     void DiskLightDelegate::SetShutterAngles(float innerAngleDegrees, float outerAngleDegrees)
     {
-        if (GetShuttersEnabled())
+        if (GetShuttersEnabled() && GetLightHandle().IsValid())
         {
             GetFeatureProcessor()->SetConeAngles(GetLightHandle(), DegToRad(innerAngleDegrees), DegToRad(outerAngleDegrees));
         }
@@ -117,12 +120,16 @@ namespace AZ::Render
     void DiskLightDelegate::SetEnableShadow(bool enabled)
     {
         Base::SetEnableShadow(enabled);
-        GetFeatureProcessor()->SetShadowsEnabled(GetLightHandle(), enabled);
+        
+        if (GetLightHandle().IsValid())
+        {
+            GetFeatureProcessor()->SetShadowsEnabled(GetLightHandle(), enabled);
+        }
     }
 
     void DiskLightDelegate::SetShadowmapMaxSize(ShadowmapSize size)
     {
-        if (GetShadowsEnabled())
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
         {
             GetFeatureProcessor()->SetShadowmapMaxResolution(GetLightHandle(), size);
         }
@@ -130,7 +137,7 @@ namespace AZ::Render
 
     void DiskLightDelegate::SetShadowFilterMethod(ShadowFilterMethod method)
     {
-        if (GetShadowsEnabled())
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
         {
             GetFeatureProcessor()->SetShadowFilterMethod(GetLightHandle(), method);
         }
@@ -138,7 +145,7 @@ namespace AZ::Render
 
     void DiskLightDelegate::SetSofteningBoundaryWidthAngle(float widthInDegrees)
     {
-        if (GetShadowsEnabled())
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
         {
             GetFeatureProcessor()->SetSofteningBoundaryWidthAngle(GetLightHandle(), DegToRad(widthInDegrees));
         }
@@ -146,7 +153,7 @@ namespace AZ::Render
 
     void DiskLightDelegate::SetPredictionSampleCount(uint32_t count)
     {
-        if (GetShadowsEnabled())
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
         {
             GetFeatureProcessor()->SetPredictionSampleCount(GetLightHandle(), count);
         }
@@ -154,7 +161,7 @@ namespace AZ::Render
 
     void DiskLightDelegate::SetFilteringSampleCount(uint32_t count)
     {
-        if (GetShadowsEnabled())
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
         {
             GetFeatureProcessor()->SetFilteringSampleCount(GetLightHandle(), count);
         }
@@ -162,7 +169,7 @@ namespace AZ::Render
 
     void DiskLightDelegate::SetPcfMethod(PcfMethod method)
     {
-        if (GetShadowsEnabled())
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
         {
             GetFeatureProcessor()->SetPcfMethod(GetLightHandle(), method);
         }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
index 6a07a8a737..8c5f6d6836 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
@@ -49,8 +49,8 @@ namespace AZ
                         "Light", "A light which emits from a point or goemetric shape.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                             ->Attribute(Edit::Attributes::Category, "Atom")
-                            ->Attribute(Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(Edit::Attributes::AutoExpand, true)
                             ->Attribute(Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-light.html")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
index c484db5e1e..35c5522c4e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
@@ -44,8 +44,8 @@ namespace AZ
                         "Directional Light", "A directional light to cast a shadow of meshes onto meshes.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO][ATOM-1998] create icons.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO][ATOM-1998] create icons.
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO][ATOM-1998] create icons.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO][ATOM-1998] create icons.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-1998] create page
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp
index a2a24c3055..073b74d4bc 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp
@@ -23,7 +23,10 @@ namespace AZ
             : LightDelegateBase<SimplePointLightFeatureProcessorInterface>(entityId, isVisible)
         {
             InitBase(entityId);
-            GetFeatureProcessor()->SetPosition(GetLightHandle(), GetTransform().GetTranslation());
+            if (GetLightHandle().IsValid())
+            {
+                GetFeatureProcessor()->SetPosition(GetLightHandle(), GetTransform().GetTranslation());
+            }
         }
         float SimplePointLightDelegate::CalculateAttenuationRadius(float lightThreshold) const
         {
@@ -39,7 +42,10 @@ namespace AZ
         
         void SimplePointLightDelegate::HandleShapeChanged()
         {
-            GetFeatureProcessor()->SetPosition(GetLightHandle(), GetTransform().GetTranslation());
+            if (GetLightHandle().IsValid())
+            {
+                GetFeatureProcessor()->SetPosition(GetLightHandle(), GetTransform().GetTranslation());
+            }
         }
 
         void SimplePointLightDelegate::DrawDebugDisplay(const Transform& transform, const Color& color, AzFramework::DebugDisplayRequests& debugDisplay, bool isSelected) const
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp
index 705a71571a..5ce8f6d563 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp
@@ -24,8 +24,11 @@ namespace AZ::Render
     
     void SimpleSpotLightDelegate::HandleShapeChanged()
     {
-        GetFeatureProcessor()->SetPosition(GetLightHandle(), GetTransform().GetTranslation());
-        GetFeatureProcessor()->SetDirection(GetLightHandle(), GetTransform().GetBasisZ());
+        if (GetLightHandle().IsValid())
+        {
+            GetFeatureProcessor()->SetPosition(GetLightHandle(), GetTransform().GetTranslation());
+            GetFeatureProcessor()->SetDirection(GetLightHandle(), GetTransform().GetBasisZ());
+        }
     }
 
     float SimpleSpotLightDelegate::CalculateAttenuationRadius(float lightThreshold) const
@@ -42,7 +45,10 @@ namespace AZ::Render
     
     void SimpleSpotLightDelegate::SetShutterAngles(float innerAngleDegrees, float outerAngleDegrees)
     {
-        GetFeatureProcessor()->SetConeAngles(GetLightHandle(), DegToRad(innerAngleDegrees), DegToRad(outerAngleDegrees));
+        if (GetLightHandle().IsValid())
+        {
+            GetFeatureProcessor()->SetConeAngles(GetLightHandle(), DegToRad(innerAngleDegrees), DegToRad(outerAngleDegrees));
+        }
     }
     
     void SimpleSpotLightDelegate::DrawDebugDisplay(const Transform& transform, const Color& /*color*/, AzFramework::DebugDisplayRequests& debugDisplay, bool isSelected) const
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
index 9badeaac86..73190377ca 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
@@ -39,8 +39,8 @@ namespace AZ
                         "Decal (Atom)", "The Decal component allows an entity to project a texture or material onto a mesh")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-decal.html")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
index eb38e02a2e..8a0bd86965 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
@@ -25,7 +25,7 @@
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/EntityContext.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 #include <AzCore/RTTI/BehaviorContext.h>
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
index 7400809daa..ae22ec06c9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
@@ -43,8 +43,8 @@ namespace AZ
                         "Diffuse Probe Grid", "The DiffuseProbeGrid component generates a grid of diffuse light probes for global illumination")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<RPI::ModelAsset>::Uuid())
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
index 6934995600..f500bdd6e2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
@@ -34,8 +34,8 @@ namespace AZ
                         "Grid", "Adds grid to the scene")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-grid.html")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
index 0be8f7050e..ec69964236 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
@@ -34,8 +34,8 @@ namespace AZ
                         "Global Skylight (IBL)", "Adds image based illumination to the scene")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-imagebasedlight.html")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
index b6ae2dedba..e307bfcd07 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
@@ -137,8 +137,8 @@ namespace AZ
                         "Material", "The material component specifies the material to use for this entity")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-material.html")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
index 38e41a74b4..03533e142f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
@@ -203,6 +203,7 @@ namespace AZ
                     propertyConfig.m_id = AZ::RPI::MaterialPropertyId(groupNameId, shaderInputStr).GetCStr();
                     propertyConfig.m_nameId = shaderInputStr;
                     propertyConfig.m_displayName = shaderInputStr;
+                    propertyConfig.m_groupName = groupDisplayName;
                     propertyConfig.m_description = shaderInputStr;
                     propertyConfig.m_defaultValue = uvName;
                     propertyConfig.m_originalValue = uvName;
@@ -244,10 +245,15 @@ namespace AZ
                         for (const auto& propertyDefinition : propertyListItr->second)
                         {
                             AtomToolsFramework::DynamicPropertyConfig propertyConfig;
-                            AtomToolsFramework::ConvertToPropertyConfig(propertyConfig, propertyDefinition);
 
+                            // Assign id before conversion so it can be used in dynamic description
                             propertyConfig.m_id = AZ::RPI::MaterialPropertyId(groupNameId, propertyDefinition.m_nameId).GetFullName();
+
+                            AtomToolsFramework::ConvertToPropertyConfig(propertyConfig, propertyDefinition);
+
+                            propertyConfig.m_groupName = groupDisplayName;
                             const auto& propertyIndex = m_editData.m_materialAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(propertyConfig.m_id);
+                            propertyConfig.m_showThumbnail = true;
                             propertyConfig.m_defaultValue = AtomToolsFramework::ConvertToEditableType(m_editData.m_materialTypeAsset->GetDefaultPropertyValues()[propertyIndex.GetIndex()]);
                             propertyConfig.m_parentValue = AtomToolsFramework::ConvertToEditableType(m_editData.m_materialTypeAsset->GetDefaultPropertyValues()[propertyIndex.GetIndex()]);
                             propertyConfig.m_originalValue = AtomToolsFramework::ConvertToEditableType(m_editData.m_materialAsset->GetPropertyValues()[propertyIndex.GetIndex()]);
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
index 94dfb39419..c32f124456 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
@@ -93,7 +93,6 @@ namespace AZ
 
         void EditorMaterialSystemComponent::Activate()
         {
-            AzFramework::TargetManagerClient::Bus::Handler::BusConnect();
             EditorMaterialSystemComponentRequestBus::Handler::BusConnect();
             AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusConnect();
             AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
@@ -105,7 +104,6 @@ namespace AZ
 
         void EditorMaterialSystemComponent::Deactivate()
         {
-            AzFramework::TargetManagerClient::Bus::Handler::BusDisconnect();
             EditorMaterialSystemComponentRequestBus::Handler::BusDisconnect();
             AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusDisconnect();
             AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
@@ -123,36 +121,11 @@ namespace AZ
 
         void EditorMaterialSystemComponent::OpenInMaterialEditor(const AZStd::string& sourcePath)
         {
-            if (m_materialEditorTarget.IsValid())
-            {
-                AzFramework::TmMsg openDocumentMsg(AZ_CRC("OpenInMaterialEditor", 0x9f92aac8));
-                openDocumentMsg.AddCustomBlob(sourcePath.c_str(), sourcePath.size() + 1);
-                AzFramework::TargetManager::Bus::Broadcast(&AzFramework::TargetManager::SendTmMessage, m_materialEditorTarget, openDocumentMsg);
-            }
-            else
-            {
-                AZ_TracePrintf("MaterialComponent", "Launching Material Editor");
-
-                QStringList arguments;
-                    arguments.append(sourcePath.c_str());
-                AtomToolsFramework::LaunchTool("MaterialEditor", ".exe", arguments);
-            }
-        }
-
-        void EditorMaterialSystemComponent::TargetJoinedNetwork(AzFramework::TargetInfo info)
-        {
-            if (AZ::StringFunc::Equal(info.GetDisplayName(), "MaterialEditor"))
-            {
-                m_materialEditorTarget = info;
-            }
-        }
+            AZ_TracePrintf("MaterialComponent", "Launching Material Editor");
 
-        void EditorMaterialSystemComponent::TargetLeftNetwork(AzFramework::TargetInfo info)
-        {
-            if (AZ::StringFunc::Equal(info.GetDisplayName(), "MaterialEditor"))
-            {
-                m_materialEditorTarget = {};
-            }
+            QStringList arguments;
+            arguments.append(sourcePath.c_str());
+            AtomToolsFramework::LaunchTool("MaterialEditor", ".exe", arguments);
         }
 
         void EditorMaterialSystemComponent::OnApplicationAboutToStop()
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h
index 09ad1c1b9c..cb1aac9163 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h
@@ -14,7 +14,6 @@
 #include <AzCore/Component/Component.h>
 
 #include <AzFramework/Application/Application.h>
-#include <AzFramework/TargetManagement/TargetManagementAPI.h>
 
 #include <AzToolsFramework/Thumbnails/Thumbnail.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
@@ -32,7 +31,6 @@ namespace AZ
         class EditorMaterialSystemComponent
             : public AZ::Component
             , private EditorMaterialSystemComponentRequestBus::Handler
-            , private AzFramework::TargetManagerClient::Bus::Handler
             , private AzFramework::ApplicationLifecycleEvents::Bus::Handler
             , public AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
             , public AzToolsFramework::EditorMenuNotificationBus::Handler
@@ -57,10 +55,6 @@ namespace AZ
             //! EditorMaterialSystemComponentRequestBus::Handler overrides...
             void OpenInMaterialEditor(const AZStd::string& sourcePath) override;
 
-            //! AzFramework::TargetManagerClient::Bus::Handler overrides...
-            void TargetJoinedNetwork(AzFramework::TargetInfo info) override;
-            void TargetLeftNetwork(AzFramework::TargetInfo info) override;
-            
             // AzFramework::ApplicationLifecycleEvents overrides...
             void OnApplicationAboutToStop() override;
 
@@ -74,9 +68,6 @@ namespace AZ
             void SetupThumbnails();
             void TeardownThumbnails();
 
-            // Material Editor target for interprocess communication with MaterialEditor
-            AzFramework::TargetInfo m_materialEditorTarget;
-
             QAction* m_openMaterialEditorAction = nullptr;
 
             AZStd::unique_ptr<MaterialBrowserInteractions> m_materialBrowserInteractions;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
index 21f592db4a..b0b9a39780 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
@@ -21,13 +21,13 @@ namespace AZ
     {
         namespace Thumbnails
         {
-            const int MaterialThumbnailSize = 200;
+            static constexpr const int MaterialThumbnailSize = 512; // 512 is the default size in render to texture pass
 
             //////////////////////////////////////////////////////////////////////////
             // MaterialThumbnail
             //////////////////////////////////////////////////////////////////////////
-            MaterialThumbnail::MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-                : Thumbnail(key, thumbnailSize)
+            MaterialThumbnail::MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+                : Thumbnail(key)
             {
                 m_assetId = GetAssetId(key, RPI::MaterialAsset::RTTI_Type());
                 if (!m_assetId.IsValid())
@@ -47,7 +47,7 @@ namespace AZ
                     RPI::MaterialAsset::RTTI_Type(),
                     &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail,
                     m_key,
-                    m_thumbnailSize);
+                    MaterialThumbnailSize);
                 // wait for response from thumbnail renderer
                 m_renderWait.acquire();
             }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
index 249426dfe8..612e44fb98 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
@@ -36,7 +36,7 @@ namespace AZ
             {
                 Q_OBJECT
             public:
-                MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+                MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
                 ~MaterialThumbnail() override;
 
                 //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
index c9aa3a6d5e..f2ad9a13e6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
@@ -44,8 +44,8 @@ namespace AZ
                         "Mesh", "The mesh component is the primary method of adding visual geometry to entities")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-mesh.html")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
index ecd60be009..7bf8bf88e5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
@@ -27,7 +27,7 @@
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/EntityContext.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 #include <AzCore/RTTI/BehaviorContext.h>
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
index 315eb2a892..fed46f4608 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
@@ -22,13 +22,13 @@ namespace AZ
     {
         namespace Thumbnails
         {
-            const int MeshThumbnailSize = 200;
+            static constexpr const int MeshThumbnailSize = 512; // 512 is the default size in render to texture pass
 
             //////////////////////////////////////////////////////////////////////////
             // MeshThumbnail
             //////////////////////////////////////////////////////////////////////////
-            MeshThumbnail::MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-                : Thumbnail(key, thumbnailSize)
+            MeshThumbnail::MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+                : Thumbnail(key)
             {
                 m_assetId = GetAssetId(key, RPI::ModelAsset::RTTI_Type());
                 if (!m_assetId.IsValid())
@@ -48,7 +48,7 @@ namespace AZ
                     RPI::ModelAsset::RTTI_Type(),
                     &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail,
                     m_key,
-                    m_thumbnailSize);
+                    MeshThumbnailSize);
                 // wait for response from thumbnail renderer
                 m_renderWait.acquire();
             }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
index 68c7825aaa..75b6c8cf68 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
@@ -35,7 +35,7 @@ namespace AZ
             {
                 Q_OBJECT
             public:
-                MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+                MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
                 ~MeshThumbnail() override;
 
                 //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp
index b33dd7f165..2ef4e1e229 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp
@@ -39,6 +39,7 @@
 #include <SkyBox/PhysicalSkyComponent.h>
 #include <Scripting/EntityReferenceComponent.h>
 #include <SurfaceData/SurfaceDataMeshComponent.h>
+#include <Animation/AttachmentComponent.h>
 
 #ifdef ATOMLYINTEGRATION_FEATURE_COMMON_EDITOR
 #include <EditorCommonFeaturesSystemComponent.h>
@@ -69,6 +70,7 @@
 #include <SkyBox/EditorPhysicalSkyComponent.h>
 #include <Scripting/EditorEntityReferenceComponent.h>
 #include <SurfaceData/EditorSurfaceDataMeshComponent.h>
+#include <Animation/EditorAttachmentComponent.h>
 #endif
 
 namespace AZ
@@ -111,6 +113,7 @@ namespace AZ
                         DiffuseProbeGridComponent::CreateDescriptor(),
                         DeferredFogComponent::CreateDescriptor(),
                         SurfaceData::SurfaceDataMeshComponent::CreateDescriptor(),
+                        AttachmentComponent::CreateDescriptor(),
 
 #ifdef ATOMLYINTEGRATION_FEATURE_COMMON_EDITOR
                         EditorAreaLightComponent::CreateDescriptor(),
@@ -141,6 +144,7 @@ namespace AZ
                         EditorDiffuseProbeGridComponent::CreateDescriptor(),
                         EditorDeferredFogComponent::CreateDescriptor(),
                         SurfaceData::EditorSurfaceDataMeshComponent::CreateDescriptor(),
+                        EditorAttachmentComponent::CreateDescriptor(),
 #endif
                     });
             }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
index a7b9f56f89..2e57b8ff7a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "Bloom", "Controls the Bloom")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
index e1d4edc7c0..ae70a8394a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "DepthOfField", "Controls the Depth of Field.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.y 
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.y 
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
index 585ff0bd00..80aad79218 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "Display Mapper", "The display mapper applying on the look modification process.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO][ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO][ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO][ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO][ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZStd::vector<AZ::Crc32>({ AZ_CRC("Level", 0x9aeacc13), AZ_CRC("Game", 0x232b318c) }))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-2672][PostFX] need to create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
index a26ea597ec..e3370db194 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "PostFX Layer", "This component enables the entity to specify post process settings")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
index a1135ff0ad..b38f51e7ba 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "Exposure Control", "Exposure component control exposure value for rendered scene.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
index 2089dfb01b..876a696df1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "PostFX Gradient Weight Modifier", "Modifies PostFX override factor based on a gradient signal sampled from an entity")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
index b80ffbab6f..5f6336b0d8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "Look Modification", "The look modification process.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO ATOM-2672][PostFX] need to create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
index 6541feb042..fc364e9cc0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "Radius Weight Modifier", "Modifies PostFX override factor based on proximity of an influencer against this entity's bounding sphere")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
index 0b704e8687..c5f888a9e7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "PostFX Shape Weight Modifier", "Modifies PostFX override factor based on proximity of an influencer against this entity's bounding sphere")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
index 88657c342a..e89bde0732 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "SSAO", "Controls SSAO.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                             ->Attribute(Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                             ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                             ->Attribute(Edit::Attributes::AutoExpand, true)
                             ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
index 976b8f4267..9d34553eba 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
@@ -49,8 +49,8 @@ namespace AZ
                         "Reflection Probe", "The ReflectionProbe component captures an IBL specular reflection at a specific position in the level")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
@@ -172,13 +172,19 @@ namespace AZ
             AZ::Vector3 position = AZ::Vector3::CreateZero();
             AZ::TransformBus::EventResult(position, GetEntityId(), &AZ::TransformBus::Events::GetWorldTranslation);
 
+            AZ::Vector3 scale = AZ::Vector3::CreateOne();
+            AZ::TransformBus::EventResult(scale, GetEntityId(), &AZ::TransformBus::Events::GetLocalScale);
+
             // draw AABB at probe position using the inner dimensions
             Color color(0.0f, 0.0f, 1.0f, 1.0f);
             debugDisplay.SetColor(color);
 
             ReflectionProbeComponentConfig& configuration = m_controller.m_configuration;
-            AZ::Vector3 innerMin(position.GetX() - configuration.m_innerWidth / 2, position.GetY() - configuration.m_innerLength / 2, position.GetZ() - configuration.m_innerHeight / 2);
-            AZ::Vector3 innerMax(position.GetX() + configuration.m_innerWidth / 2, position.GetY() + configuration.m_innerLength / 2, position.GetZ() + configuration.m_innerHeight / 2);
+            AZ::Vector3 innerExtents(configuration.m_innerWidth, configuration.m_innerLength, configuration.m_innerHeight);
+            innerExtents *= scale;
+
+            AZ::Vector3 innerMin(position.GetX() - innerExtents.GetX() / 2, position.GetY() - innerExtents.GetY() / 2, position.GetZ() - innerExtents.GetZ() / 2);
+            AZ::Vector3 innerMax(position.GetX() + innerExtents.GetX() / 2, position.GetY() + innerExtents.GetY() / 2, position.GetZ() + innerExtents.GetZ() / 2);
             debugDisplay.DrawWireBox(innerMin, innerMax);
         }
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
index 8edac1f109..dc9cb93917 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
@@ -25,7 +25,7 @@
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/EntityContext.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 #include <AzCore/RTTI/BehaviorContext.h>
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
index bbc1f790d4..92c2cfe700 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "Deferred Fog", "Controls the Deferred Fog")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO][ATOM-13427] Create Wiki for Deferred Fog
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
index ea4c38ddc8..cdb3c80986 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
@@ -31,8 +31,8 @@ namespace AZ
                         "Entity Reference", "Contains a reference list to other entities")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp
index 815a2c276a..695868fb05 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp
@@ -14,7 +14,7 @@
 #include <SkinnedMesh/SkinnedMeshDebugDisplay.h>
 #include <Atom/Feature/SkinnedMesh/SkinnedMeshStatsBus.h>
 #include <Atom/RPI.Public/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
index 9cd026ffcf..0c1b605c3a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "HDRi Skybox", "SkyBox component render the background of your scene with cubemap")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
index 07ba738522..8f9b98c15c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
@@ -32,8 +32,8 @@ namespace AZ
                         "Physical Sky", "Physical Sky render the background of your scene with physical simulation")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "editor/icons/components/viewport/component_placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp
index 6dff92c170..06d54a20b3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp
@@ -82,8 +82,9 @@ namespace AZ
                 return m_data;
             }
 
-            void CommonThumbnailRenderer::RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, [[maybe_unused]] int thumbnailSize)
+            void CommonThumbnailRenderer::RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize)
             {
+                m_data->m_thumbnailSize = thumbnailSize;
                 m_data->m_thumbnailQueue.push(thumbnailKey);
                 if (m_currentStep == Step::None)
                 {
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h
index 8a7bace6aa..a915e20591 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h
@@ -42,7 +42,7 @@ namespace AZ
                 RPI::ScenePtr m_scene;
                 AZStd::string m_sceneName = "Material Thumbnail Scene";
                 AZStd::string m_pipelineName = "Material Thumbnail Pipeline";
-                AzFramework::Scene* m_frameworkScene = nullptr;
+                AZStd::shared_ptr<AzFramework::Scene> m_frameworkScene;
                 RPI::RenderPipelinePtr m_renderPipeline;
                 AZStd::unique_ptr<AzFramework::EntityContext> m_entityContext;
                 AZStd::vector<AZStd::string> m_passHierarchy;
@@ -52,6 +52,7 @@ namespace AZ
 
                 double m_simulateTime = 0.0f;
                 float m_deltaTime = 0.0f;
+                int m_thumbnailSize = 512;
 
                 //! Incoming thumbnail requests are appended to this queue and processed one at a time in OnTick function.
                 AZStd::queue<AzToolsFramework::Thumbnailer::SharedThumbnailKey> m_thumbnailQueue;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
index f3c74629c2..16baf16886 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
@@ -37,6 +37,15 @@ namespace AZ
 
             void CaptureStep::Start()
             {
+                if (!m_context->GetData()->m_materialAsset ||
+                    !m_context->GetData()->m_modelAsset)
+                {
+                    AzToolsFramework::Thumbnailer::ThumbnailerRendererNotificationBus::Event(
+                        m_context->GetData()->m_thumbnailKeyRendered,
+                        &AzToolsFramework::Thumbnailer::ThumbnailerRendererNotifications::ThumbnailFailedToRender);
+                    m_context->SetStep(Step::FindThumbnailToRender);
+                    return;
+                }
                 Render::MaterialComponentRequestBus::Event(
                     m_context->GetData()->m_modelEntity->GetId(),
                     &Render::MaterialComponentRequestBus::Events::SetDefaultMaterialOverride,
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp
index 2a447ce3ec..322c765f1b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp
@@ -100,24 +100,15 @@ namespace AZ
                 data->m_scene->SetShaderResourceGroupCallback(callback);
 
                 // Bind m_defaultScene to the GameEntityContext's AzFramework::Scene
-                Outcome<AzFramework::Scene*, AZStd::string> createSceneOutcome;
-                AzFramework::SceneSystemRequestBus::BroadcastResult(
-                    createSceneOutcome,
-                    &AzFramework::SceneSystemRequests::CreateScene,
-                    data->m_sceneName);
+                auto* sceneSystem = AzFramework::SceneSystemInterface::Get();
+                AZ_Assert(sceneSystem, "Thumbnail system failed to get scene system implementation.");
+                Outcome<AZStd::shared_ptr<AzFramework::Scene>, AZStd::string> createSceneOutcome =
+                    sceneSystem->CreateScene(data->m_sceneName);
                 AZ_Assert(createSceneOutcome, createSceneOutcome.GetError().c_str()); // This should never happen unless scene creation has changed.
-                createSceneOutcome.GetValue()->SetSubsystem(data->m_scene.get());
-                data->m_frameworkScene = createSceneOutcome.GetValue();
-                data->m_frameworkScene->SetSubsystem(data->m_scene.get());
-
-                bool success = false;
-                AzFramework::SceneSystemRequestBus::BroadcastResult(
-                    success,
-                    &AzFramework::SceneSystemRequests::SetSceneForEntityContextId,
-                    data->m_entityContext->GetContextId(),
-                    data->m_frameworkScene);
-                AZ_Assert(success, "Unable to set entity context on AzFramework::Scene: %s", data->m_sceneName.c_str());
+                data->m_frameworkScene = createSceneOutcome.TakeValue();
+                data->m_frameworkScene->SetSubsystem(data->m_scene);
 
+                data->m_frameworkScene->SetSubsystem(data->m_entityContext.get());
                 // Create a render pipeline from the specified asset for the window context and add the pipeline to the scene
                 RPI::RenderPipelineDescriptor pipelineDesc;
                 pipelineDesc.m_mainViewTagName = "MainCamera";
@@ -198,6 +189,7 @@ namespace AZ
                     m_context->GetData()->DefaultModelPath,
                     RPI::ModelAsset::RTTI_Type(),
                     false);
+                AZ_Error("ThumbnailRenderer", defaultModelAssetId.IsValid(), "Default model asset is invalid. Verify the asset %s exists.", m_context->GetData()->DefaultModelPath);
                 if (m_context->GetData()->m_assetsToLoad.emplace(defaultModelAssetId).second)
                 {
                     data->m_defaultModelAsset.Create(defaultModelAssetId);
@@ -212,6 +204,7 @@ namespace AZ
                     m_context->GetData()->DefaultMaterialPath,
                     RPI::MaterialAsset::RTTI_Type(),
                     false);
+                AZ_Error("ThumbnailRenderer", defaultMaterialAssetId.IsValid(), "Default material asset is invalid. Verify the asset %s exists.", m_context->GetData()->DefaultMaterialPath);
                 if (m_context->GetData()->m_assetsToLoad.emplace(defaultMaterialAssetId).second)
                 {
                     data->m_defaultMaterialAsset.Create(defaultMaterialAssetId);
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
index 03ab03336d..bad7c2fe38 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
@@ -14,7 +14,7 @@
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <Atom/RPI.Public/Scene.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <Thumbnails/Rendering/ThumbnailRendererContext.h>
 #include <Thumbnails/Rendering/ThumbnailRendererData.h>
 #include <Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.h>
@@ -49,11 +49,13 @@ namespace AZ
                 m_context->GetData()->m_scene->Deactivate();
                 m_context->GetData()->m_scene->RemoveRenderPipeline(m_context->GetData()->m_renderPipeline->GetId());
                 RPI::RPISystemInterface::Get()->UnregisterScene(m_context->GetData()->m_scene);
-                bool sceneRemovedSuccessfully = false;
-                AzFramework::SceneSystemRequestBus::BroadcastResult(
-                    sceneRemovedSuccessfully,
-                    &AzFramework::SceneSystemRequests::RemoveScene,
-                    m_context->GetData()->m_sceneName);
+
+                auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+                AZ_Assert(sceneSystem, "Thumbnail system failed to get scene system implementation.");
+                [[maybe_unused]] bool sceneRemovedSuccessfully = sceneSystem->RemoveScene(m_context->GetData()->m_sceneName);
+                AZ_Assert(
+                    sceneRemovedSuccessfully, "Thumbnail system was unable to remove scene '%s' from the scene system.",
+                    m_context->GetData()->m_sceneName.c_str());
                 m_context->GetData()->m_scene = nullptr;
                 m_context->GetData()->m_renderPipeline = nullptr;
             }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake
index ff8f33e06e..e58f72a121 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake
@@ -11,6 +11,8 @@
 
 set(FILES
     Source/Module.cpp
+    Source/Animation/EditorAttachmentComponent.h
+    Source/Animation/EditorAttachmentComponent.cpp
     Include/AtomLyIntegration/CommonFeatures/Material/EditorMaterialSystemComponentRequestBus.h
     Include/AtomLyIntegration/CommonFeatures/ReflectionProbe/EditorReflectionProbeBus.h
     Source/EditorCommonFeaturesSystemComponent.h
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake
index b26ebc60a6..e13d1d37d6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake
@@ -10,6 +10,8 @@
 #
 
 set(FILES
+    Source/Animation/AttachmentComponent.h
+    Source/Animation/AttachmentComponent.cpp
     Source/CoreLights/AreaLightComponent.h
     Source/CoreLights/AreaLightComponent.cpp
     Source/CoreLights/AreaLightComponentConfig.cpp
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
index b31091681e..1002fcbde1 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
@@ -18,7 +18,7 @@
 
 #include <Integration/Rendering/RenderActorInstance.h>
 
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
+#include <LmbrCentral/Animation/SkeletalHierarchyRequestBus.h>
 
 #include <AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h>
 #include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>
diff --git a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp
index 49ed813ed8..8ae7c30c6a 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp
@@ -126,7 +126,12 @@ namespace AZ
         SetFilter(inputFilter);
 
         // Bind our custom log handler.
-        AZ::Interface<AZ::ILogger>::Get()->BindLogHandler(m_logHandler);
+        AZ::ILogger* loggerInstance = AZ::Interface<AZ::ILogger>::Get();
+        AZ_Assert(loggerInstance, "Failed to get ILogger instance. Log handler not bound.")
+        if (loggerInstance)
+        {
+            loggerInstance->BindLogHandler(m_logHandler);
+        }
 
         // Connect to receive render tick events.
         auto atomViewportRequests = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
diff --git a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
index 34e7af688c..8493b78171 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
@@ -99,7 +99,7 @@ namespace AZ
 #endif
         }
 
-        void ImguiAtomSystemComponent::OnViewportSizeChanged(AzFramework::WindowSize size)
+        void ImguiAtomSystemComponent::OnViewportSizeChanged([[maybe_unused]] AzFramework::WindowSize size)
         {
 #if defined(IMGUI_ENABLED)
             ImGui::ImGuiManagerBus::Broadcast([this, size](ImGui::ImGuiManagerBus::Events* imgui)
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py
index 7fc7d49a40..8ffbee78d5 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py
@@ -29,7 +29,10 @@ import collections
 from collections import abc
 # import subprocess
 import logging as _logging
-import pathlib
+try:
+    import pathlib
+except:
+    import pathlib2 as pathlib
 from pathlib import *
 import shelve
 # import socket
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py
index eb4974bd55..9fd031b106 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py
@@ -17,8 +17,14 @@
 
 
 import logging as _logging
+
+try:
+    import pathlib
+except:
+    import pathlib2 as pathlib
+
 from pathlib import Path
-import pathlib
+
 from box import Box
 import os
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py
index 5d495d2dcd..4a1a7164d8 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py
@@ -62,15 +62,15 @@ _LOGGER.debug('Invoking:: {0}.'.format({_MODULENAME}))
 # To Do: move the callback key like 'NewSceneOpened' here (instead of None)
 # ^ this would provide ability to loop through and replace key with CB object
 
-_G_callbacks = Box(box_dots=True)  # global scope container
-_G_masterkey = 'DCCsi_callbacks'
-_G_callbacks[_G_masterkey] = True  # required master key
+_G_CALLBACKS = Box(box_dots=True)  # global scope container
+_G_PRIMEKEY = 'DCCsi_callbacks'
+_G_CALLBACKS[_G_PRIMEKEY] = True  # required prime key
 
 
 # -------------------------------------------------------------------------
-def init_callbacks(_callbacks=_G_callbacks):
+def init_callbacks(_callbacks=_G_CALLBACKS):
     # store as a dict (Box is a fancy dict)
-    _callbacks[_G_masterkey] = True  # required master key
+    _callbacks[_G_PRIMEKEY] = True  # required prime key
     
     # signature dict['callback key'] = ('CallBack'(type), func, callbackObj)
     _callbacks['on_new_file'] = ['NewSceneOpened', set_defaults, None]
@@ -96,24 +96,24 @@ def uninstall_callbacks():
     """Bulk uninstalls hte globally defined set of callbacks:
     _G_callbacks"""
 
-    global _G_callbacks
+    global _G_CALLBACKS
 
     _LOGGER.debug('uninstall_callbacks() fired')
 
-    for key, value in _G_callbacks:
+    for key, value in _G_CALLBACKS:
         if value[2] is not None:  # have a cb
             value[2].uninstall()  # so uninstall it
         else:
             _LOGGER.warning('No callback in: key {0}, value:{1}'
                             ''.format(key, value))
-    _G_callbacks = None
+    _G_CALLBACKS = None
     _LOGGER.info('DCCSI CALLBACKS UNINSTALLED ... EXITING')
-    return _G_callbacks
+    return _G_CALLBACKS
 # -------------------------------------------------------------------------
 
 
 # -------------------------------------------------------------------------
-def install_callbacks(_callbacks=_G_callbacks):
+def install_callbacks(_callbacks=_G_CALLBACKS):
     """Bulk installs the globally defined set of callbacks:
     _G_callbacks"""
     
@@ -126,15 +126,15 @@ def install_callbacks(_callbacks=_G_callbacks):
         _callbacks.pop('box_dots')
 
     # don't pass anything but carefully considered dict
-    if _G_masterkey in _callbacks:
-        _masterkey = _callbacks.pop(_G_masterkey)
+    if _G_PRIMEKEY in _callbacks:
+        _primekey = _callbacks.pop(_G_PRIMEKEY)
     else:
-        _LOGGER.error('No master key, use a correct dictionary')
+        _LOGGER.error('No prime key, use a correct dictionary')
         #To Do: implement error handling and return codes
         return _callbacks[None]
 
-    for key, value in _G_callbacks.items():
-        # we popped the master key should the rest should be safe
+    for key, value in _G_CALLBACKS.items():
+        # we popped the prime key should the rest should be safe
         if value[0] != 'nodeMessageType':
             # set callback up
             _cb = azEvCbH.EventCallbackHandler(value[0],
@@ -195,10 +195,10 @@ def update_workspace(foo=None):
 # -------------------------------------------------------------------------
 
 # install and init callbacks on an import obj
-_G_callbacks = install_callbacks(_G_callbacks)
+_G_CALLBACKS = install_callbacks(_G_CALLBACKS)
 
 # ==========================================================================
 # Module Tests
 #==========================================================================
 if __name__ == '__main__':
-    _G_callbacks = install_callbacks(_G_callbacks)
+    _G_CALLBACKS = install_callbacks(_G_CALLBACKS)
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py
index 809cb97494..c615311f3c 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py
@@ -262,9 +262,9 @@ def post_startup():
 
     # callbacks, To Do: these should also be moved to the bootstrapping config
     # Defered startup after the Ui is running.
-    _G_callbacks = Box(box_dots=True)  # this just ensures a global scope container
+    _G_CALLBACKS = Box(box_dots=True)  # this just ensures a global scope container
     if _G_LOAD_CALLBACKS:
-        from set_callbacks import _G_callbacks
+        from set_callbacks import _G_CALLBACKS
         # ^ need to hold on to this as the install repopulate set
 
     # this ensures the fixPaths callback is loaded
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
index 5936b24632..cc090d922f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
@@ -74,7 +74,9 @@ Now your local maya install is all set up with pip so you can install additional
 
 Now you will want to run the following file to finish setup...
 We have a requirements.txt file with the extension packages we use in the DCCsi.
-You'll need the repo/branch path of your Lumberyard(O3DE) install.
-And you'll need to know where the DCCsi, we will install package dependancies there.
+You'll need the repo/branch path of your O3DE (aka Lumberyard) install.
+And you'll need to know where the DCCsi is located, we will install package dependancies there.
 
-C:\Program Files\Autodesk\Maya2020\bin>mayapy -m pip install -r C:\Depot\Lumberyard\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\SDK\Maya\requirements.txt -t C:\Depot\Lumberyard\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\2.x\2.7.x\site-packages
+Note: you may need to update the paths below to match your local o3de engine install!
+
+C:\Program Files\Autodesk\Maya2020\bin>mayapy -m pip install -r C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\SDK\Maya\requirements.txt -t C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\2.x\2.7.x\site-packages
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt
index 2d087be121..8fd084dac8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt
@@ -4,12 +4,14 @@
 #
 #    pip-compile --generate-hashes requirements.txt
 #
-typing==3.7.4.3 \
-    --hash=sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 \
-    --hash=sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5
-    # via
-    #   -r requirements.txt
-    #   dynaconf
+cachetools==3.1.1 \
+    --hash=sha256:428266a1c0d36dc5aca63a2d7c5942e88c2c898d72139fca0e97fdd2380517ae \
+    --hash=sha256:8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
+    # via -r requirements.txt
+certifi==2020.6.20 \
+    --hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \
+    --hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41
+    # via -r requirements.txt
 click==7.1.2 \
     --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
     --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
@@ -20,6 +22,14 @@ dynaconf==3.1.4 \
     --hash=sha256:b2f472d83052f809c5925565b8a2ba76a103d5dc1dbb9748b693ed67212781b9 \
     --hash=sha256:e6f383b84150b70fc439c8b2757581a38a58d07962aa14517292dcce1a77e160
     # via -r requirements.txt
+hashids==1.3.1 \
+    --hash=sha256:6c3dc775e65efc2ce2c157a65acb776d634cb814598f406469abef00ae3f635c \
+    --hash=sha256:8bddd1acba501bfc9306e7e5a99a1667f4f2cacdc20cbd70bcc5ddfa5147c94c
+    # via -r requirements.txt
+pathlib2==2.3.5 \
+    --hash=sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db \
+    --hash=sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868
+    # via -r requirements.txt
 pathlib==1.0.1 \
     --hash=sha256:6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f
     # via -r requirements.txt
@@ -27,7 +37,38 @@ python-box==3.4.6 \
     --hash=sha256:694a7555e3ff9fbbce734bbaef3aad92b8e4ed0659d3ed04d56b6a0a0eff26a9 \
     --hash=sha256:a71d3dc9dbaa34c8597d3517c89a8041bd62fa875f23c0f3dad55e1958e3ce10
     # via -r requirements.txt
+scandir==1.10.0 \
+    --hash=sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e \
+    --hash=sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022 \
+    --hash=sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f \
+    --hash=sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f \
+    --hash=sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae \
+    --hash=sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173 \
+    --hash=sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4 \
+    --hash=sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32 \
+    --hash=sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188 \
+    --hash=sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d \
+    --hash=sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac
+    # via
+    #   -r requirements.txt
+    #   pathlib2
+six==1.15.0 \
+    --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
+    --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced
+    # via
+    #   -r requirements.txt
+    #   pathlib2
+typing==3.7.4.3 \
+    --hash=sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 \
+    --hash=sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5
+    # via
+    #   -r requirements.txt
+    #   dynaconf
 unipath==1.1 \
     --hash=sha256:09839adcc72e8a24d4f76d63656f30b5a1f721fc40c9bcd79d8c67bdd8b47dae \
     --hash=sha256:e6257e508d8abbfb6ddd8ec357e33589f1f48b1599127f23b017124d90b0fff7
     # via -r requirements.txt
+wincertstore==0.2 \
+    --hash=sha256:22d5eebb52df88a8d4014d5cf6d1b6c3a5d469e6c3b2e2854f3a003e48872356 \
+    --hash=sha256:780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a
+    # via -r requirements.txt
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
index 57b97ad1cb..69e4543a59 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
@@ -36,11 +36,10 @@ _TYPE_TAG = 'module'
 
 _PACKAGENAME = _TOOL_TAG
 
-__all__ = ['initialize_logger', 
-           'config_utils', 'render',
+__all__ = ['config_utils', 'render',
            'constants', 'return_stub', 'synthetic_env',
            'env_base', 'env_bool', 'test', 'dev',
-           'lumberyard', 'marmoset'] #'blender', 'maya', 'substance', 'houdini']
+           'lumberyard', 'marmoset']  # 'blender', 'maya', 'substance', 'houdini']
 # -------------------------------------------------------------------------
 
 
@@ -68,7 +67,10 @@ _DCCSI_DEV_MODE = env_bool.env_bool(constants.ENVAR_DCCSI_DEV_MODE, False)
 # for py2.7 (Maya) we provide this, so we must assume some bootstrapping
 # has occured, see DccScriptingInterface\\config.py (_DCCSI_PYTHON_LIB_PATH)
 
-import pathlib
+try:
+    import pathlib
+except:
+    import pathlib2 as pathlib
 from pathlib import Path
 if _G_DEBUG:
     print('DCCsi debug breadcrumb, pathlib is: {}'.format(pathlib))
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
index dbc75212d4..9c920a871d 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
@@ -80,9 +80,9 @@ def return_stub_dir(stub_file='dccsi_stub'):
 
 
 # -------------------------------------------------------------------------
-def get_stub_check_path(in_path=os.getcwd(), check_stub='engineroot.txt'):
+def get_stub_check_path(in_path=os.getcwd(), check_stub='engine.json'):
     '''
-    Returns the branch root directory of the dev\\'engineroot.txt'
+    Returns the branch root directory of the dev\\'engine.json'
     (... or you can pass it another known stub)
 
     so we can safely build relative filepaths within that branch.
@@ -158,7 +158,6 @@ def bootstrap_dccsi_py_libs(dccsi_dirpath=return_stub_dir()):
     """Builds and adds local site dir libs based on py version"""
 
     from azpy.constants import STR_DCCSI_PYTHON_LIB_PATH  # a path string constructor
-    #_DCCSI_PYTHON_LIB_PATH = "E:\\P4\\jromnoa_spectra_atom_2\\dev\\Tools\\Python\\3.7.5\\windows\\Lib\\site-packages"
     _DCCSI_PYTHON_LIB_PATH = STR_DCCSI_PYTHON_LIB_PATH.format(dccsi_dirpath,
                                                               sys.version_info[0],
                                                               sys.version_info[1])
@@ -193,9 +192,9 @@ if __name__ == '__main__':
     _config = get_dccsi_config()
     _LOGGER.info('DCCSI_CONFIG_PATH: {}'.format(_config))
 
-    _LOGGER.info('LY_DEV: {}'.format(get_stub_check_path('engineroot.txt')))
+    _LOGGER.info('LY_DEV: {}'.format(get_stub_check_path('engine.json')))
 
-    _LOGGER.info('LY_PROJECT: {}'.format(get_current_project(get_stub_check_path('engineroot.txt'))))
+    _LOGGER.info('LY_PROJECT: {}'.format(get_current_project(get_stub_check_path('bootstrap.cfg'))))
 
     _LOGGER.info('DCCSI_PYTHON_LIB_PATH: {}'.format(bootstrap_dccsi_py_libs(return_stub_dir('dccsi_stub'))))
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
index 5ca0bc4a95..792f0faee6 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
@@ -92,7 +92,7 @@ TAG_DIR_LY_BUILD = str('build')
 TAG_QT_PLUGIN_PATH = str('QT_PLUGIN_PATH')
 
 # filesystem markers, stub file names.
-STUB_LY_DEV = str('engineroot.txt')
+STUB_LY_DEV = str('engine.json')
 STUB_LY_ROOT_PROJECT = str('ly_project_stub')
 STUB_LY_ROOT_DCCSI = str('dccsi_stub')
 STUB_LY_DCCSI_AZPY = str('dccsi_azpy_stub')
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py
index 9798f3f268..3d34aceb40 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py
@@ -36,7 +36,7 @@ _LOGGER.info('local_host: {}'.format(_LOCAL_HOST))
 
 # -------------------------------------------------------------------------
 def start_wing_to_maya(local_host=_LOCAL_HOST,
-                       comman_port=6000,
+                       command_port=6000,
                        logger=_LOGGER,
                        *args, **kwargs):
     """
@@ -58,7 +58,7 @@ def start_wing_to_maya(local_host=_LOCAL_HOST,
     except NameError:
         port = None
 
-    port_name = str('{0}:{1}'.format(local_host, comman_port))
+    port_name = str('{0}:{1}'.format(local_host, command_port))
 
     # should only be getting the port passed in
     _LOGGER.info('Attempting to open port:: {0}'.format(port_name))
@@ -145,10 +145,10 @@ def start_wing_to_maya_menu():
     port = object()  # init a dummy object
 
     # default name ... name is first arg, or a kwarg
-    portName, kwargs = setSynthArgKwarg(port, argPosIndex=0, argTag='portName',
-                                        inArgs=args, inKwargs=kwargs,
-                                        defaultValue="127.0.0.1:6000")
+    portName, kwargs = set_synth_arg_kwarg(port, arg_pos_index=0, arg_tag='portName',
+                                        in_args=args, in_kwargs=kwargs,
+                                        default_value="127.0.0.1:6000")
 
-    port = start_wing_to_maya(local_host=_LOCAL_HOST, comman_port=6000)
+    port = start_wing_to_maya(local_host=_LOCAL_HOST, command_port=6000)
     return
 # -------------------------------------------------------------------------
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py
index 7d165916c5..b30fef72c8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py
@@ -15,30 +15,118 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """azpy.shared.ui.__init__"""
 
 import os
-import logging
-import logging.config
+from pathlib import Path
+import logging as _logging
 
-#  global space debug flag
-_G_DEBUG = os.getenv('DCCSI_GDEBUG', False)
+from azpy.env_bool import env_bool
+from azpy.constants import ENVAR_DCCSI_GDEBUG
+from azpy.constants import ENVAR_DCCSI_DEV_MODE
 
-#  global space debug flag
-_DCCSI_DEV_MODE = os.getenv('DCCSI_DEV_MODE', False)
+#  global space
+_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
+_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
 
-if _DCCSI_DEV_MODE:
-    _PACKAGENAME = __name__
-    if _PACKAGENAME is '__main__':
-        _PACKAGENAME = 'noodely'
-
-_PKG_PARENT_PATH = str('azpy.shared')
-_PKG_PATH = str('{0}.{1}'.format(_PKG_PARENT_PATH, _PACKAGENAME))
-_LOGGER = logging.getLogger(_PACKAGENAME)
-_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PKG_PATH}))
+_PACKAGENAME = __name__
+if _PACKAGENAME is '__main__':
+    _PACKAGENAME = 'azpy.shared.noodely'
 
+import azpy
+_LOGGER = azpy.initialize_logger(_PACKAGENAME)
+_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
 # -------------------------------------------------------------------------
 #
-__all__ = ['config', 'find_arg', 'master', 'node', 'synth',
-           'synth_arg_kwarg', 'test_foo']
+__all__ = ['find_arg',
+           'helpers',
+           'node',
+           'synth',
+           'synth_arg_kwarg',
+           'test_foo']
 #
 # -------------------------------------------------------------------------
 
-del _LOGGER
+
+# -- Project Globals ------------------------------------------------------
+while 1:
+    # But if we want to change the prject root, we can set a new one here.
+    def set_G_DEFAULT_PROJECT_DIR(value):
+        global _G_DEFAULT_PROJECT_DIR
+        """Sets and returns the _G_DEFAULT_PROJECT_DIR"""
+        _G_DEFAULT_PROJECT_DIR = Path(value).resolve()
+        return Path(_G_DEFAULT_PROJECT_DIR)
+    
+    def get_G_DEFAULT_PROJECT_DIR():
+        global _G_DEFAULT_PROJECT_DIR
+        """Returns the _G_DEFAULT_PROJECT_DIR"""
+        return Path(_G_DEFAULT_PROJECT_DIR)
+    
+    # if we are initializing everythin properly, we can assume the project
+    # variables are properly set
+    global _G_DEFAULT_PROJECT_DIR
+    _G_DEFAULT_PROJECT_DIR = Path(os.getcwd()).resolve()
+    
+    break
+# -------------------------------------------------------------------------
+
+# -------------------------------------------------------------------------
+while 1:
+    global _G_PRIME_ROOT_NODE
+    _G_PRIME_ROOT_NODE = None  # <-- needs to be set up!
+    # But if we want to change the prject root, we can set a new one here.
+    
+    def set_G_PRIME_ROOT_NODE(node):
+        """Sets and returns the _G_PRIME_ROOT_NODE"""
+        global _G_PRIME_ROOT_NODE
+        if not isinstance(node, ProjectRootNode):
+            message = '_G_PRIME_ROOT_NODE: {}\r'.format(type(node))
+            message += 'A project root node needs to be properly set\r'
+            raise TypeError(message)
+        _G_PRIME_ROOT_NODE = node
+        return _G_PRIME_ROOT_NODE
+    
+    def get_G_PRIME_ROOT_NODE():
+        """Returns the _G_PRIME_ROOT_NODE"""
+        global _G_PRIME_ROOT_NODE
+        return _G_PRIME_ROOT_NODE
+    
+    break
+# -------------------------------------------------------------------------
+
+
+###########################################################################
+# tests(), code block for testing module
+# -------------------------------------------------------------------------
+def tests():
+    _G_DEFAULT_PROJECT_DIR = set_G_DEFAULT_PROJECT_DIR(os.getcwd())
+    _LOGGER.info(_G_DEFAULT_PROJECT_DIR)
+    _LOGGER.info(_G_DEFAULT_PROJECT_DIR.parent)
+    _LOGGER.info(_G_DEFAULT_PROJECT_DIR.parts)
+
+    # NOT implemented yet
+    # _G_PRIME_ROOT_NODE
+
+    return
+# -------------------------------------------------------------------------
+
+
+# -------------------------------------------------------------------------
+if _DCCSI_DEV_MODE:
+    # If in dev mode this will test imports of __all__
+    from azpy import test_imports
+    _LOGGER.debug('Testing Imports from {0}'.format(_PACKAGENAME))
+    test_imports(__all__,
+                 _pkg=_PACKAGENAME,
+                 _logger=_LOGGER)
+# -------------------------------------------------------------------------
+
+
+###########################################################################
+# --call block-------------------------------------------------------------
+if __name__ == "__main__":
+    _LOGGER.info("# {0} #".format('-' * 72))
+    _LOGGER.info('~ noodely.prime ... Running script as __main__')
+    _LOGGER.info("# {0} #".format('-' * 72))
+
+    # run simple tests
+    tests()
+    
+del _LOGGER
\ No newline at end of file
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py
index 517064e57a..1ed217bc73 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py
@@ -23,8 +23,8 @@ __author__ = 'HogJonny'
 # -------------------------------------------------------------------------
 
 
-def find_arg(argPosIndex=None, argTag=None, removeKwarg=None,
-             inArgs=None, inKwargs=None, defaultValue=None):
+def find_arg(arg_pos_index=None, arg_tag=None, remove_kwarg=None,
+             in_args=None, in_kwargs=None, default_value=None):
     """
     # finds and returns an arg...
     # if a positional index is given argPosIndex=0, it checks args first
@@ -41,31 +41,33 @@ def find_arg(argPosIndex=None, argTag=None, removeKwarg=None,
     #
     #    foundArg, args, kwargs = find_arg(0, 'name',)
     """
-    if argPosIndex != None:
-        if not isinstance(argPosIndex, int):
+
+    found_arg = None
+
+    if arg_pos_index != None:
+        if not isinstance(arg_pos_index, int):
             raise TypeError('argPosIndex: accepts a index integer!\r'
-                            'got: {0}'.format(argPosIndex))
+                            'got: {0}'.format(arg_pos_index))
 
         # positional args ... check the position
-        if len(inArgs) > 0:
+        if len(in_args) > 0:
             try:
-                foundArg = inArgs[argPosIndex]
+                found_arg = in_args[arg_pos_index]
             except:
                 pass
 
     # check kwargs ... a set kwarg will ALWAYS take precident over
     # positional arg!!!
-    try:
-        foundArg
-    except:
-        foundArg = inKwargs.get(argTag, defaultValue)  # defaults to None
+    if in_kwargs:
+        found_arg = in_kwargs.get(arg_tag, default_value)  # defaults to None
 
-    if removeKwarg:
-        if argTag in inKwargs:
-            del inKwargs[argTag]
+    if remove_kwarg:
+        if in_kwargs:
+            if arg_tag in in_kwargs:
+                del in_kwargs[arg_tag]
 
     # if we didn't find the arg/kwarg, the defualt return will be None
-    return foundArg, inKwargs
+    return found_arg, in_kwargs
 # -------------------------------------------------------------------------
 
 
@@ -86,14 +88,14 @@ if __name__ == "__main__":
     class TestNode(Foo):
         def __init__(self, *args, **kwargs):
             super().__init__()
-            self._name, kwargs = find_arg(argTag='foo', removeKwarg=True,
-                                          inArgs=args, inKwargs=kwargs)
-            self._name, kwargs = find_arg(argPosIndex=0, argTag='name',
-                                          removeKwarg=True,
-                                          inArgs=args, inKwargs=kwargs)  # <-- first positional OR kwarg
-            self._parent, kwargs = find_arg(argPosIndex=1, argTag='parent',
-                                            removeKwarg=True,
-                                            inArgs=args, inKwargs=kwargs)  # <-- second positional OR kwarg
+            self._name, kwargs = find_arg(arg_tag='foo', remove_kwarg=True,
+                                          in_args=args, in_kwargs=kwargs)
+            self._name, kwargs = find_arg(arg_pos_index=0, arg_tag='name',
+                                          remove_kwarg=True,
+                                          in_args=args, in_kwargs=kwargs)  # <-- first positional OR kwarg
+            self._parent, kwargs = find_arg(arg_pos_index=1, arg_tag='parent',
+                                            remove_kwarg=True,
+                                            in_args=args, in_kwargs=kwargs)  # <-- second positional OR kwarg
 
             self._kwargsDict = {}
 
@@ -117,7 +119,7 @@ if __name__ == "__main__":
 
     testNode2 = TestNode(name='fooey', parent=testNode)
 
-    testNode3 = TestNode('kablooey', testNode2, goober='dufus')
+    testNode3 = TestNode('kablooey', testNode2, gomer='pile')
 
     print ('testNode2, name: {0}, parent: {1}'.format(testNode2._name, testNode2._parent))
     print (testNode3)
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/master.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/master.py
deleted file mode 100644
index d85ea48854..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/master.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-# -------------------------------------------------------------------------
-
-# -------------------------------------------------------------------------
-# -------------------------------------------------------------------------
-# master.py
-# Allows for project based setup to be used with noodly
-# version: 0.1
-# author: Gallowj
-# -------------------------------------------------------------------------
-# -------------------------------------------------------------------------
-import os
-
-from unipath import Path
-
-_G_DEFAULT_PROJECT_DIR = os.getcwd()
-_G_MASTER_ROOT_NODE = None
-
-
-@property
-def _G_DEFAULT_PROJECT_DIR(value):
-    _G_DEFAULT_PROJECT_DIR = value
-    return _G_DEFAULT_PROJECT_DIR
-
-
-def set_PROJECT_DIR(value):
-    """Sets and returns _G_DEFAULT_PROJECT_DIR"""
-    global _G_DEFAULT_PROJECT_DIR
-    _G_DEFAULT_PROJECT_DIR = Path(value).expand()
-    return Path(_G_DEFAULT_PROJECT_DIR)
-
-
-@property
-def _G_MASTER_ROOT_NODE(value):
-    _G_MASTER_ROOT_NODE = value
-    return _G_MASTER_ROOT_NODE
-
-
-def set_MASTER_ROOT_NODE(value):
-    """Sets and returns _G_MASTER_ROOT_NODE"""
-    global _G_MASTER_ROOT_NODE
-    if not isinstance(inNode, ProjectRootNode):
-        raise TypeError('self._projectRootNode is: {0}\r'
-                        'A _projectRootNode, needs to be properly set\r'
-                        'So that we can acces:\r'
-                        '\tself._projectRootNode._sourceRoot\r'
-                        '\tself._projectRootNode._overrideRoot\r'
-                        'Use self.assignProjectRootNode(<projectRootNode>)\r'
-                        ''.format(type(inNode)))
-
-    _G_MASTER_ROOT_NODE = inNode
-    return _G_MASTER_ROOT_NODE
-
-
-###########################################################################
-# tests(), code block for testing module
-# -------------------------------------------------------------------------
-def tests():
-    set_PROJECT_DIR(os.getcwd())
-    print(_G_DEFAULT_PROJECT_DIR)
-    print(_G_DEFAULT_PROJECT_DIR.parent)
-    print(_G_DEFAULT_PROJECT_DIR.components())
-
-    # NOT implemented yet
-    # set_PROJECT_DIR
-
-    return
-
-
-###########################################################################
-# --call block-------------------------------------------------------------
-if __name__ == "__main__":
-    print ("# ----------------------------------------------------------------------- #")
-    print ('~ noodly.master ... Running script as __main__')
-    print ("# ----------------------------------------------------------------------- #\r")
-
-    # run simple tests
-    tests()
-
-    #_G_DEFAULT_PROJECT_DIR = Path(os.getcwd())
-    print(_G_DEFAULT_PROJECT_DIR.components())
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py
index 4eca3b315d..950b8fcbec 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py
@@ -16,7 +16,7 @@ from __future__ import division
 # -------------------------------------------------------------------------
 # -------------------------------------------------------------------------
 # node.py
-# simple base Node Class, for tool creation.
+# simple base Node Class, useful in tool creation.
 # version: 0.1
 # author: Gallowj
 # -------------------------------------------------------------------------
@@ -25,16 +25,8 @@ from __future__ import division
 Module docstring:
 A Simple Node Base Class Module, for creating basic nodes within a hierarchy.
 """
-
 __author__ = 'HogJonny'
 
-_G_DEBUG = True        # global state for debugging
-_G_SETTINGS = None     # global Settings storage
-_G_LOG = None          # global LOGger storage
-
-_G_MASTER_NODE = None  # We intend to init a master node, unless provided
-
-# -------------------------------------------------------------------------
 # built-ins
 import os
 import copy
@@ -48,11 +40,32 @@ import cachetools
 from sched import scheduler
 
 # local imports
-from LyPy.si_shared.noodly.helpers import display_cached_value
-from LyPy.si_shared.noodly.find_arg import find_arg
-from LyPy.si_shared.noodly.synth import synthesize
+from azpy.shared.noodely.helpers import display_cached_value
+from azpy.shared.noodely.find_arg import find_arg
+from azpy.shared.noodely.synth import synthesize
+
+import azpy
+from azpy.env_bool import env_bool
+from azpy.constants import ENVAR_DCCSI_GDEBUG
+from azpy.constants import ENVAR_DCCSI_DEV_MODE
+
+#  global space
+# To Do: update to dynaconf dynamic env and settings?
+_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
+_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
+
+_MODULENAME = 'azpy.shared.noodely.node'
+
+_log_level = int(20)
+if _G_DEBUG:
+    _log_level = int(10)
+_LOGGER = azpy.initialize_logger(_MODULENAME,
+                                 log_to_file=False,
+                                 default_log_level=_log_level)
+_LOGGER.debug('Starting:: {}.'.format({_MODULENAME}))
 # -------------------------------------------------------------------------
 
+
 # -------------------------------------------------------------------------
 # quick test code (remove later)
 from hashids import Hashids
@@ -79,8 +92,6 @@ if os.path.supports_unicode_filenames:
 ###########################################################################
 # HELPER method functions
 # -------------------------------------------------------------------------
-
-
 def return_node_from_hashid(hashid):
     if not isinstance(hashid, str):
         raise TypeError("{0},{1}: Accepts hashids as str types!\r"
@@ -95,6 +106,7 @@ def return_node_from_hashid(hashid):
 # -------------------------------------------------------------------------
 
 
+# -------------------------------------------------------------------------
 class Node(object):
     """Class constructor: makes a node."""
 
@@ -131,9 +143,9 @@ class Node(object):
 
         # -- secret keyword -----------------------------------------------
         self._temp_node = False
-        temp_node, kwargs = find_arg(argPosIndex=None, argTag='temp_node',
-                                     removeKwarg=True, inArgs=args,
-                                     inKwargs=kwargs)  # <-- kwarg only
+        temp_node, kwargs = find_arg(arg_pos_index=None, arg_tag='temp_node',
+                                     remove_kwarg=True, in_args=args,
+                                     in_kwargs=kwargs)  # <-- kwarg only
         self._temp_node = temp_node
         if self._temp_node:
             self._kwargs_dict['temp_node'] = self._temp_node
@@ -141,9 +153,9 @@ class Node(object):
 
         # -- store message header -----------------------------------------
         # setup the .message_header <-- kwarg only
-        message_header, kwargs = find_arg(argPosIndex=None, argTag='message_header',
-                                          removeKwarg=True, inArgs=args, inKwargs=kwargs,
-                                          defaultValue=('{0}(), Message'
+        message_header, kwargs = find_arg(arg_pos_index=None, arg_tag='message_header',
+                                          remove_kwarg=True, in_args=args, in_kwargs=kwargs,
+                                          default_value=('{0}(), Message'
                                                         .format(self._node_type)))
         self._message_header = message_header
         # -----------------------------------------------------------------
@@ -165,7 +177,7 @@ class Node(object):
         # -- store the node name ------------------------------------------
         self._node_name = node_name
         if (self._node_class_index == 0 and self._node_name == None):
-            self._node_name = 'MASTER'
+            self._node_name = 'PRIME'
         elif (self._node_class_index > 0 and self._node_name == None):
             # set a default node_name if none, based on the unihashid
             if not self._name_is_uni_hashid:
@@ -325,7 +337,7 @@ class Node(object):
     @property
     def cls_node_dict(self):
         return Node._cls_node_dict
-    # ----------------------------------------------------------------------
+    # ---------------------------------------------------------------------
 
     # --method-set---------------------------------------------------------
     def cls_node_count_up(self):
@@ -584,10 +596,10 @@ def tests():
     print(default_node.hierarchy())
 
     # retreive a node from it's known hashid
-    master_node = return_node_from_hashid('kxYLm0XQeXJ7jWaP')
-    print(master_node.uni_hashid)  # verify hasid
+    prime_node = return_node_from_hashid('kxYLm0XQeXJ7jWaP')
+    print(prime_node.uni_hashid)  # verify hasid
     # should return the same node as default_node
-    print(master_node.node_name)  # should be 'MASTER'
+    print(prime_node.node_name)  # should be 'PRIME'
     return
 # -------------------------------------------------------------------------
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py
index f969e16fbe..5dee58b1c5 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py
@@ -27,12 +27,6 @@ A simple path objecy based Node Class, for creating path hierarchies.
 """
 __author__ = 'HogJonny'
 
-_G_DEBUG = True        # global state for debugging
-_G_SETTINGS = None     # global Settings storage
-_G_LOG = None          # global LOGger storage
-
-_G_MASTER_NODE = None  # We intend to init a master node
-
 # -------------------------------------------------------------------------
 # built-ins
 import os
@@ -44,10 +38,31 @@ import logging
 from unipath import Path, AbstractPath
 
 # local ly imports
-from LyPy.si_shared.noodly.helpers import istext
-from LyPy.si_shared.noodly.find_arg import find_arg
-from LyPy.si_shared.noodly.synth import synthesize
-from LyPy.si_shared.noodly.node import Node
+from azpy.shared.noodely.helpers import istext
+from azpy.shared.noodely.find_arg import find_arg
+from azpy.shared.noodely.synth import synthesize
+from azpy.shared.noodely.node import Node
+
+import azpy
+from azpy.env_bool import env_bool
+from azpy.constants import ENVAR_DCCSI_GDEBUG
+from azpy.constants import ENVAR_DCCSI_DEV_MODE
+
+# -------------------------------------------------------------------------
+#  global space
+# To Do: update to dynaconf dynamic env and settings?
+_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
+_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
+
+_MODULENAME = 'azpy.shared.noodely.pathnode'
+
+_log_level = int(20)
+if _G_DEBUG:
+    _log_level = int(10)
+_LOGGER = azpy.initialize_logger(_MODULENAME,
+                                 log_to_file=False,
+                                 default_log_level=_log_level)
+_LOGGER.debug('Starting:: {}.'.format({_MODULENAME}))
 # -------------------------------------------------------------------------
 
 
@@ -63,20 +78,12 @@ if os.path.supports_unicode_filenames:
 
 
 # -------------------------------------------------------------------------
-#  set up logger
-_G_LOGGER = logging.getLogger(__name__)
-# -------------------------------------------------------------------------
-
-
 class PathNode(Node):
     """doc string"""
 
     # share the debug state
     _DEBUG = _G_DEBUG
 
-    # logger
-    _LOGGER = _G_LOGGER
-
     # class header
     _message_header = 'noodly, PathNode(): Message'
 
@@ -117,22 +124,22 @@ class PathNode(Node):
 
         # -- secret keyword -----------------------------------------------
         self._temp_node = False
-        temp_node, kwargs = find_arg(argPosIndex=None, argTag='temp_node',
-                                     removeKwarg=True, inArgs=args,
-                                     inKwargs=kwargs)  # <-- kwarg only
+        temp_node, kwargs = find_arg(arg_pos_index=None, arg_tag='temp_node',
+                                     remove_kwarg=True, in_args=args,
+                                     in_kwargs=kwargs)  # <-- kwarg only
 
         self._temp_node = temp_node
         if self._temp_node:
             self.k_wargs_dict['temp_node'] = self._temp_node
 
         # -- Node class args/kwargs ---------------------------------------
-        node_name, kwargs = find_arg(argPosIndex=2, argTag='node_name',
-                                     removeKwarg=True, inArgs=args,
-                                     inKwargs=kwargs)  # <-- third arg, kwarg
+        node_name, kwargs = find_arg(arg_pos_index=2, arg_tag='node_name',
+                                     remove_kwarg=True, in_args=args,
+                                     in_kwargs=kwargs)  # <-- third arg, kwarg
 
-        parent_node, kwargs = find_arg(argPosIndex=3, argTag='parent_node',
-                                       removeKwarg=True, inArgs=args,
-                                       inKwargs=kwargs)  # <-- fourth arg, kwarg
+        parent_node, kwargs = find_arg(arg_pos_index=3, arg_tag='parent_node',
+                                       remove_kwarg=True, in_args=args,
+                                       in_kwargs=kwargs)  # <-- fourth arg, kwarg
 
         self._root_path = root_path
 
@@ -344,12 +351,12 @@ class PathNode(Node):
 # -------------------------------------------------------------------------
 def tests():
     from node import Node
-    default_node = Node()  # result: Node(node_name='MASTER')
+    default_node = Node()  # result: Node(node_name='PRIME')
     print(default_node)
 
     first_child = PathNode(path=None, node_name='first_child', parent_node=default_node)
     print(first_child)
-    # result: PathNode(temp_node=True, parent_node=Node(node_name='MASTER')).siblingNodeFromHashid('WNPZoKBVpXV16QLz')
+    # result: PathNode(temp_node=True, parent_node=Node(node_name='PRIME')).siblingNodeFromHashid('WNPZoKBVpXV16QLz')
     # first_child.nodeType
     # first_child.parent_node
     # first_child.node_name
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py
index 3618ad67de..0f71439dae 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py
@@ -22,9 +22,9 @@ from synth import synthesize
 # -------------------------------------------------------------------------
 
 
-def setSynthArgKwarg(inst, argPosIndex=None, argTag=None, defaultValue=None,
-                     inArgs=None, inKwargs=None, removeKwarg=True,
-                     setAnyway=True):
+def set_synth_arg_kwarg(inst, arg_pos_index=None, arg_tag=None, default_value=None,
+                     in_args=None, in_kwargs=None, remove_kwarg=True,
+                     set_anyway=True):
     """
     Uses find_arg and sets a property on a object.
 
@@ -34,44 +34,44 @@ def setSynthArgKwarg(inst, argPosIndex=None, argTag=None, defaultValue=None,
     If the arg/property doesn't exist we synthesize it
     """
 
-    foundArg = None
-    argValueDict = {}
+    found_arg = None
+    arg_value_dict = {}
 
     # find the argument, or set to default value
-    foundArg, inKwargs = find_arg(argPosIndex, argTag, removeKwarg,
-                                  inArgs, inKwargs,
-                                  defaultValue)
+    found_arg, in_kwargs = find_arg(arg_pos_index, arg_tag, remove_kwarg,
+                                  in_args, in_kwargs,
+                                  default_value)
 
-    if foundArg:
-        argTag = foundArg
+    if found_arg:
+        arg_tag = found_arg
 
     # single arg first
     # make sure the object doesn't arealdy have this property
     try:
-        hasattr(inst, argTag)  # check if property exists
-        if setAnyway:
+        hasattr(inst, arg_tag)  # check if property exists
+        if set_anyway:
             try:
-                setattr(inst, argTag, defaultValue)  # try to set
+                setattr(inst, arg_tag, default_value)  # try to set
             except Exception as e:
                 raise e
     except:
         pass
 
     # make it a synthetic property
-    if argTag:
+    if arg_tag:
         try:
-            argValue = synthesize(inst, argTag, defaultValue)
-            argValueDict[argTag] = argValue
+            arg_value = synthesize(inst, arg_tag, default_value)
+            arg_value_dict[arg_tag] = arg_value
         except Exception as e:
             raise e
 
     # multiple and/or remaining kwards next
-    if inKwargs:
-        if len(inKwargs) > 0:
-            for k, v in inKwargs.items():
+    if in_kwargs:
+        if len(in_kwargs) > 0:
+            for k, v in in_kwargs.items():
                 try:
                     hasattr(inst, k)  # check if property exists
-                    if setAnyway:
+                    if set_anyway:
                         try:
                             setattr(inst, k, v)  # try to set
                         except Exception as e:
@@ -81,12 +81,12 @@ def setSynthArgKwarg(inst, argPosIndex=None, argTag=None, defaultValue=None,
 
                 if k:
                     try:
-                        argValue = synthesize(inst, k, v)
-                        argValueDict[k] = argValue
+                        arg_value = synthesize(inst, k, v)
+                        arg_value_dict[k] = arg_value
                     except Exception as e:
                         raise e
 
-    return argValueDict
+    return arg_value_dict
 # --------------------------------------------------------------------------
 
 
@@ -98,28 +98,28 @@ if __name__ == '__main__':
     from test_foo import Foo
 
     # define a arg/property tag we know doesn't exist
-    synthArgTag = 'syntheticArg'
+    synth_arg_tag = 'synthetic_arg'
 
     # create a test object
     print('~ creating the test foo object...')
-    myFoo = Foo()
+    my_foo = Foo()
 
     print('~ Starting - single synthetic arg test...')
     # find and set existing, or create and set
-    argValueDict = setSynthArgKwarg(myFoo,
-                                    argTag=synthArgTag,
-                                    defaultValue='kablooey')
+    arg_value_dict = set_synth_arg_kwarg(my_foo,
+                                    arg_tag=synth_arg_tag,
+                                    default_value='kablooey')
 
     # what was returned
     print('~ single value returned...')
-    for k, v in argValueDict.items():
+    for k, v in arg_value_dict.items():
         print("Arg '{0}':'{1}'".format(k, v))
 
     # attempt to access the new synthetic property directly
     print('~ direct property access test...')
     try:
-        myFoo.syntheticArg
-        print('myFoo.{0}: {1}'.format(synthArgTag, myFoo.syntheticArg))
+        my_foo.synthetic_arg
+        print('myFoo.{0}: {1}'.format(synth_arg_tag, my_foo.synthetic_arg))
     except Exception as e:
         raise e
 
@@ -128,31 +128,31 @@ if __name__ == '__main__':
     newKwargs = {'fooey': 'chop suey', 'success': True}
 
     # find and set existing, or create and set
-    argValueDict = setSynthArgKwarg(myFoo,
-                                    inKwargs=newKwargs,
-                                    defaultValue='kablooey')
+    arg_value_dict = set_synth_arg_kwarg(my_foo,
+                                    in_kwargs=newKwargs,
+                                    default_value='kablooey')
 
     # what was returned
     print('~ multiple values returned...')
-    for k, v in argValueDict.items():
+    for k, v in arg_value_dict.items():
         print("Arg '{0}':'{1}'".format(k, v))
 
     print('~ multiple direct property access test...')
     try:
-        myFoo.fooey
-        print('myFoo.{0}: {1}'.format('fooey', myFoo.fooey))
+        my_foo.fooey
+        print('myFoo.{0}: {1}'.format('fooey', my_foo.fooey))
     except Exception as e:
         raise e
 
     try:
-        myFoo.success
-        print('myFoo.{0}: {1}'.format('success', myFoo.success))
+        my_foo.success
+        print('myFoo.{0}: {1}'.format('success', my_foo.success))
     except Exception as e:
         raise e
 
     print('~ Starting - known failure test...')
     try:
-        myFoo.knownBad
+        my_foo.knownBad
     except Exception as e:
         print(e)
         print('Test failed as expected!!!')
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py
index ca652503d2..d1c535fe14 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py
@@ -25,13 +25,13 @@ class Foo(object):
     This is a Class, it creates a Foo object... which does nothing really
     """
 
-    __propertyTag = 'fooProperty'
+    __property_tag = 'fooProperty'
 
     # ------------------------------------------------------------------
     def __init__(self, name='Foo', value='defaultValue', *args, **kwargs):
         '''Class __init__'''
         synthesize(self, 'name', name)
-        synthesize(self, Foo.__propertyTag, value)
+        synthesize(self, Foo.__property_tag, value)
 
         synthesize(self, 'test', 'testValue')
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py
index cded8fec09..1ca3221508 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py
@@ -20,7 +20,10 @@ import os
 # from io import StringIO  # for handling unicode strings
 
 #  azpy
-from azpy import initialize_logger
+import azpy
+from azpy.env_bool import env_bool
+from azpy.constants import ENVAR_DCCSI_GDEBUG
+from azpy.constants import ENVAR_DCCSI_DEV_MODE
 
 # 3rd Party
 from unipath import Path
@@ -28,22 +31,22 @@ import PySide2.QtCore as QtCore
 import PySide2.QtWidgets as QtWidgets
 import PySide2.QtGui as QtGui
 # -------------------------------------------------------------------------
-#  global space debug flag
-_G_DEBUG = os.getenv('DCCSI_GDEBUG', False)
-
-#  global space debug flag
-_DCCSI_DEV_MODE = os.getenv('DCCSI_DEV_MODE', False)
+#  global space
+# To Do: update to dynaconf dynamic env and settings?
+_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
+_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
 
 _MODULE_PATH = Path(__file__)
 
-_ORG_TAG = 'Amazon_Lumberyard'
-_APP_TAG = 'DCCsi'
-_TOOL_TAG = 'azpy.shared.ui.custom_treemodel'
-_TYPE_TAG = 'test'
+_MODULENAME = 'azpy.shared.ui.custom_treemodel'
 
-_MODULENAME = __name__
-if _MODULENAME is '__main__':
-    _MODULENAME = _TOOL_TAG
+_log_level = int(20)
+if _G_DEBUG:
+    _log_level = int(10)
+_LOGGER = azpy.initialize_logger(_MODULENAME,
+                                 log_to_file=False,
+                                 default_log_level=_log_level)
+_LOGGER.debug('Starting:: {}.'.format({_MODULENAME}))
 
 _UI_FILE = Path(_MODULE_PATH.parent, 'resources', 'example.ui')
 # -------------------------------------------------------------------------
@@ -75,15 +78,15 @@ class CustomFileTreeModel(QtCore.QAbstractItemModel):
         # TODO: need to make sure we are getting path objects
 
         # build the root node
-        self._root_node = self.buildRootNode('root', None, self._rootFilePath)
+        self._root_node = self.build_rootnode('root', None, self._root_filepath)
 
-        # master selection
-        self._masterSelection = masterSelection
+        # prime selection
+        self._prime_selection = prime_selection
 
-        # build the master selection node
-        self._masterNode = self.buildMasterNode('master', None, self._masterSelection, self._rootNode.path())
+        # build the prime selection node
+        self._primenode = self.build_primenode('prime', None, self._prime_selection, self._rootnode.path())
 
         # want to store off a couple lists in the model, for retreival later
-        self._nodeList = None
-        self._depNodesList = None
+        self._nodelist = None
+        self._dep_nodelist = None
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py
index 39f151cd2e..b261d4b0e1 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py
@@ -68,7 +68,7 @@ class HelpMenu():
     INPUTS:
     main_window = the class instance of the QMainWindow
     tool_label = the menu label for the tool's help item
-    tool_help_page = the http:// path to the specific bpTool help page
+    tool_help_page = the http:// path to the tool specific help page
 
     Here's an example
     # self.help_menu = azpy.shared.ui.help_menu.setup(self, 'Help...', 'https://some.site.com/azpy')
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
index 6186026852..86e4b68488 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
@@ -667,7 +667,7 @@ if __name__ == '__main__':
         try:
             import azpy.test.entry_test
             print('SUCCESS: import azpy.test.entry_test')
-            azpy.test.entry_test.main(verbose=True, connectDebugger=True)            
+            azpy.test.entry_test.main(verbose=True, connect_debugger=True)            
         except ImportError as e:
             print('ERROR: {0}'.format(e))
             raise e  
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py
index 67dc3b60ad..46a852736e 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py
@@ -25,6 +25,7 @@ from pathlib import Path
 
 # -------------------------------------------------------------------------
 _BOOT_CHECK = False  # set true to test breakpoint in this module directly
+
 import azpy
 from azpy.env_bool import env_bool
 from azpy.constants import ENVAR_DCCSI_GDEBUG
@@ -48,13 +49,13 @@ _LOGGER.debug('Starting:: {}.'.format({_MODULENAME}))
 
 
 # -------------------------------------------------------------------------
-def main(verbose=_G_DEBUG, connectDebugger=True):
+def main(verbose=_G_DEBUG, connect_debugger=True):
     _LOGGER.info('{}'.format('-' * 74))
     _LOGGER.info('entry_test.main()')
     _LOGGER.info('Root test import successful:')
     _LOGGER.info('~   {}'.format(__file__))
 
-    if connectDebugger:
+    if connect_debugger:
         status = connect_wing()
         _LOGGER.info(status)
 # -------------------------------------------------------------------------
@@ -137,4 +138,4 @@ def connect_wing():
 # -------------------------------------------------------------------------
 if __name__ == '__main__':
     _G_DEBUG = True
-    main(verbose=_G_DEBUG, connectDebugger=_G_DEBUG)
+    main(verbose=_G_DEBUG, connect_debugger=_G_DEBUG)
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
index 0068b4c766..c62571b2f5 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
@@ -26,7 +26,6 @@ import re
 # our framework for dcc tools need to run in apps like Maya that may still be
 # on py27 so we need to import and use after some boostrapping
 
-
 # -------------------------------------------------------------------+------
 #os.environ['PYTHONINSPECT'] = 'True'
 _MODULE_PATH = os.path.abspath(__file__)
@@ -78,6 +77,10 @@ _DCCSI_PYTHON_LIB_PATH = azpy.config_utils.bootstrap_dccsi_py_libs(_DCCSIG_PATH)
 
 # Now we should be able to just carry on with pth lib and dynaconf
 from dynaconf import Dynaconf
+try:
+    import pathlib
+except:
+    import pathlib2 as pathlib
 from pathlib import Path
 
 _DCCSIG_PATH = Path(_DCCSIG_PATH).resolve()
@@ -218,7 +221,7 @@ os.environ["DYNACONF_DCCSI_DEV_MODE"] = str(_DCCSI_DEV_MODE)
 
 # search up to get \dev
 _LY_DEV = azpy.config_utils.get_stub_check_path(in_path=_DCCSIG_PATH,
-                                                check_stub='engineroot.txt')
+                                                check_stub='engine.json')
 os.environ["DYNACONF_LY_DEV"] = str(_LY_DEV.resolve())
 _LY_PROJECT = azpy.config_utils.get_current_project(_LY_DEV)
 os.environ["DYNACONF_LY_PROJECT"] = _LY_PROJECT
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt
index 05d47ea70c..2f7626addb 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt
@@ -4,34 +4,39 @@
 #
 #    pip-compile --generate-hashes requirements.txt
 #
-typing==3.7.4.3 \
-    --hash=sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 \
-    --hash=sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5
-    # via
-    #   -r requirements.txt
-    #   dynaconf
+cachetools==4.2.1 \
+    --hash=sha256:1d9d5f567be80f7c07d765e21b814326d78c61eb0c3a637dffc0e5d1796cb2e2 \
+    --hash=sha256:f469e29e7aa4cff64d8de4aad95ce76de8ea1125a16c68e0d93f65c3c3dc92e9
+    # via -r requirements.txt
+certifi==2020.12.5 \
+    --hash=sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c \
+    --hash=sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830
+    # via -r requirements.txt
 click==7.1.2 \
     --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
     --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
     # via
     #   -r requirements.txt
-    #   pip-tools
 dynaconf==3.1.4 \
     --hash=sha256:b2f472d83052f809c5925565b8a2ba76a103d5dc1dbb9748b693ed67212781b9 \
     --hash=sha256:e6f383b84150b70fc439c8b2757581a38a58d07962aa14517292dcce1a77e160
     # via -r requirements.txt
+hashids==1.3.1 \
+    --hash=sha256:6c3dc775e65efc2ce2c157a65acb776d634cb814598f406469abef00ae3f635c \
+    --hash=sha256:8bddd1acba501bfc9306e7e5a99a1667f4f2cacdc20cbd70bcc5ddfa5147c94c
+    # via -r requirements.txt
 pathlib==1.0.1 \
     --hash=sha256:6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f
     # via -r requirements.txt
-python-box==3.4.6 \
-    --hash=sha256:694a7555e3ff9fbbce734bbaef3aad92b8e4ed0659d3ed04d56b6a0a0eff26a9 \
-    --hash=sha256:a71d3dc9dbaa34c8597d3517c89a8041bd62fa875f23c0f3dad55e1958e3ce10
+python-box==5.3.0 \
+    --hash=sha256:4ed4ef5d34de505a65c01e3f1911de8cdb29484fcae0c035141dce535c6c194a \
+    --hash=sha256:f2a531f9f5bbef078c175fad6abb31e9b59d40d121ea79993197e6bb221c6be6
     # via -r requirements.txt
 unipath==1.1 \
     --hash=sha256:09839adcc72e8a24d4f76d63656f30b5a1f721fc40c9bcd79d8c67bdd8b47dae \
     --hash=sha256:e6257e508d8abbfb6ddd8ec357e33589f1f48b1599127f23b017124d90b0fff7
     # via -r requirements.txt
-
-# WARNING: The following packages were not pinned, but pip requires them to be
-# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
-# pip
+wincertstore==0.2 \
+    --hash=sha256:22d5eebb52df88a8d4014d5cf6d1b6c3a5d469e6c3b2e2854f3a003e48872356 \
+    --hash=sha256:780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a
+    # via -r requirements.txt
\ No newline at end of file
diff --git a/Gems/AudioEngineWwise/Tools/WwiseATLGen/generate_atl_data.wcmdline b/Gems/AudioEngineWwise/Tools/WwiseATLGen/generate_atl_data.wcmdline
index b4444e5d98..9e4f33ad7a 100644
--- a/Gems/AudioEngineWwise/Tools/WwiseATLGen/generate_atl_data.wcmdline
+++ b/Gems/AudioEngineWwise/Tools/WwiseATLGen/generate_atl_data.wcmdline
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CmdLine Description="Generate ATL Data">"$(WwiseProjectPath)\..\..\..\Tools\Python\python3.cmd" "$(WwiseProjectPath)\..\..\..\Gems\AudioEngineWwise\Tools\WwiseATLGen\wwise_atl_gen_tool.py" --autoLoad --atlName generated_controls.xml --atlPath "$(WwiseProjectPath)\..\..\libs\gameaudio\wwise" --bankPath "$(WwiseProjectPath)\..\wwise"</CmdLine>
+<CmdLine Description="Generate ATL Data">"$(WwiseProjectPath)\..\..\..\python\python.cmd" "$(WwiseProjectPath)\..\..\..\Gems\AudioEngineWwise\Tools\WwiseATLGen\wwise_atl_gen_tool.py" --autoLoad --atlName generated_controls.xml --atlPath "$(WwiseProjectPath)\..\..\libs\gameaudio\wwise" --bankPath "$(WwiseProjectPath)\..\wwise"</CmdLine>
diff --git a/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/ly_copy_output_and_generate_metadata.wcmdline b/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/ly_copy_output_and_generate_metadata.wcmdline
index afbc73b00c..5d2394fae2 100644
--- a/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/ly_copy_output_and_generate_metadata.wcmdline
+++ b/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/ly_copy_output_and_generate_metadata.wcmdline
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CmdLine Description="Copy Streamed Files and Generate Dependency Info">"$(WwiseExePath)\CopyStreamedFiles.exe" -info "$(InfoFilePath)" -outputpath "$(SoundBankPath)" -banks "$(SoundBankListAsTextFile)" -languages "$(LanguageList)"
-"$(WwiseProjectPath)\..\..\..\Tools\Python\python3.cmd" "$(WwiseProjectPath)\..\..\..\Gems\AudioEngineWwise\Tools\WwiseAuthoringScripts\bank_info_parser.py" "$(InfoFilePath)" "$(SoundBankPath)"</CmdLine>
+"$(WwiseProjectPath)\..\..\..\python.cmd" "$(WwiseProjectPath)\..\..\..\Gems\AudioEngineWwise\Tools\WwiseAuthoringScripts\bank_info_parser.py" "$(InfoFilePath)" "$(SoundBankPath)"</CmdLine>
diff --git a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
index ce74e71d48..d2a0b78ac3 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
@@ -147,7 +147,7 @@ namespace AudioControls
 
         QWidgetAction* pWidgetAction = new QWidgetAction(this);
 
-        m_unassignedFilterButton = new QFilterButton(QIcon(":/Editor/Icons/Unassigned.svg"), "", this);
+        m_unassignedFilterButton = new QFilterButton(QIcon(":/Icons/Unassigned.svg"), "", this);
         m_unassignedFilterButton->SetText("Unassigned");
         m_unassignedFilterButton->SetChecked(m_showUnassignedControls);
         pWidgetAction->setDefaultWidget(m_unassignedFilterButton);
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUI.qrc b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUI.qrc
index 5c5bc8927a..ad3bbec034 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUI.qrc
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUI.qrc
@@ -1,5 +1,5 @@
 <RCC>
-  <qresource prefix="/Editor/Icons">
+  <qresource prefix="/Icons">
     <file alias="Bank_Icon.png">Icons/Bank_Icon.png</file>
     <file alias="Config_Blue_Icon.png">Icons/Config_Blue_Icon.png</file>
     <file alias="Config_Green_Icon.png">Icons/Config_Green_Icon.png</file>
diff --git a/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h b/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h
index 3afaa445da..700370b8d3 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h
@@ -26,26 +26,26 @@ namespace AudioControls
         switch (type)
         {
         case AudioControls::eACET_TRIGGER:
-            iconFile = ":/Editor/Icons/Trigger_Icon.svg";
+            iconFile = ":/Icons/Trigger_Icon.svg";
             break;
         case AudioControls::eACET_RTPC:
-            iconFile = ":/Editor/Icons/RTPC_Icon.svg";
+            iconFile = ":/Icons/RTPC_Icon.svg";
             break;
         case AudioControls::eACET_SWITCH:
-            iconFile = ":/Editor/Icons/Switch_Icon.svg";
+            iconFile = ":/Icons/Switch_Icon.svg";
             break;
         case AudioControls::eACET_SWITCH_STATE:
-            iconFile = ":/Editor/Icons/Property_Icon.svg";
+            iconFile = ":/Icons/Property_Icon.svg";
             break;
         case AudioControls::eACET_ENVIRONMENT:
-            iconFile = ":/Editor/Icons/Environment_Icon.svg";
+            iconFile = ":/Icons/Environment_Icon.svg";
             break;
         case AudioControls::eACET_PRELOAD:
-            iconFile = ":/Editor/Icons/Preload_Icon.svg";
+            iconFile = ":/Icons/Preload_Icon.svg";
             break;
         default:
             // should make a "default"/empty icon...
-            iconFile = ":/Editor/Icons/RTPC_Icon.svg";
+            iconFile = ":/Icons/RTPC_Icon.svg";
         }
 
         QIcon icon(iconFile);
@@ -56,16 +56,16 @@ namespace AudioControls
     //-------------------------------------------------------------------------------------------//
     inline QIcon GetFolderIcon()
     {
-        QIcon icon = QIcon(":/Editor/Icons/Folder_Icon.svg");
-        icon.addFile(":/Editor/Icons/Folder_Icon_Selected.svg", QSize(), QIcon::Selected);
+        QIcon icon = QIcon(":/Icons/Folder_Icon.svg");
+        icon.addFile(":/Icons/Folder_Icon_Selected.svg", QSize(), QIcon::Selected);
         return icon;
     }
 
     //-------------------------------------------------------------------------------------------//
     inline QIcon GetSoundBankIcon()
     {
-        QIcon icon = QIcon(":/Editor/Icons/Preload_Icon.svg");
-        icon.addFile(":/Editor/Icons/Preload_Icon.svg", QSize(), QIcon::Selected);
+        QIcon icon = QIcon(":/Icons/Preload_Icon.svg");
+        icon.addFile(":/Icons/Preload_Icon.svg", QSize(), QIcon::Selected);
         return icon;
     }
 
@@ -78,22 +78,22 @@ namespace AudioControls
         switch (group)
         {
         case 0:
-            path = ":/Editor/Icons/folder purple.svg";
+            path = ":/Icons/folder purple.svg";
             break;
         case 1:
-            path = ":/Editor/Icons/folder blue.svg";
+            path = ":/Icons/folder blue.svg";
             break;
         case 2:
-            path = ":/Editor/Icons/folder green.svg";
+            path = ":/Icons/folder green.svg";
             break;
         case 3:
-            path = ":/Editor/Icons/folder red.svg";
+            path = ":/Icons/folder red.svg";
             break;
         case 4:
-            path = ":/Editor/Icons/folder yellow.svg";
+            path = ":/Icons/folder yellow.svg";
             break;
         default:
-            path = "Editor/Icons/folder red.svg";
+            path = "Icons/folder red.svg";
             break;
         }
 
diff --git a/Gems/Blast/Code/CMakeLists.txt b/Gems/Blast/Code/CMakeLists.txt
index aabb6646aa..6c90357364 100644
--- a/Gems/Blast/Code/CMakeLists.txt
+++ b/Gems/Blast/Code/CMakeLists.txt
@@ -43,6 +43,7 @@ ly_add_target(
 ly_add_target(
     NAME Blast ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
+    OUTPUT_NAME Blast.Gem
     FILES_CMAKE
         blast_shared_files.cmake
     INCLUDE_DIRECTORIES
@@ -89,8 +90,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
 
     ly_add_target(
         NAME Blast.Editor GEM_MODULE
-
         NAMESPACE Gem
+        OUTPUT_NAME Blast.Editor.Gem
         AUTOMOC
         FILES_CMAKE
             blast_editor_shared_files.cmake
@@ -119,6 +120,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     ly_add_target(
         NAME Blast.Tests MODULE
         NAMESPACE Gem
+        OUTPUT_NAME Blast.Tests.Gem
         FILES_CMAKE
             blast_tests_files.cmake
         INCLUDE_DIRECTORIES
@@ -142,6 +144,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         ly_add_target(
             NAME Blast.Editor.Tests MODULE
             NAMESPACE Gem
+            OUTPUT_NAME Blast.Editor.Tests.Gem
             FILES_CMAKE
                 blast_editor_tests_files.cmake
             INCLUDE_DIRECTORIES
diff --git a/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp b/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp
index 9e0aacbfda..f1d41efb52 100644
--- a/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp
+++ b/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp
@@ -104,7 +104,7 @@ namespace Blast
 
     const char* BlastAssetHandler::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/Box.png";
+        return "Icons/Components/Box.png";
     }
 
     void BlastAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
diff --git a/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp b/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
index 9da8aa6463..fc6967b96e 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
@@ -39,8 +39,8 @@ namespace Blast
                       "Blast Family", "Used to add a Blast family for destruction that will spawn Blast actors")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Destruction")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Box.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Box.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(
                         AZ::Edit::Attributes::HelpPageURL,
diff --git a/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp b/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
index 51789f68da..f8fd97dc52 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
@@ -61,8 +61,8 @@ namespace Blast
                       "Blast Family Mesh Data", "Used to keep track of mesh assets for a Blast family")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Destruction")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Box.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Box.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(
                         AZ::Edit::Attributes::HelpPageURL,
diff --git a/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp b/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp
index 1b12d7554b..8fdaa49046 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp
@@ -55,8 +55,8 @@ namespace Blast
                       "Blast Slice Storage Component", "Used process blast slice data")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Physics")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Box.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Box.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
@@ -339,7 +339,7 @@ namespace Blast
 
     const char* EditorBlastSliceAssetHandler::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/Box.png";
+        return "Icons/Components/Box.png";
     }
 
     void EditorBlastSliceAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
diff --git a/Gems/Blast/Code/Source/Family/ActorRenderManager.h b/Gems/Blast/Code/Source/Family/ActorRenderManager.h
index 9512fba92d..3908ed5ecd 100644
--- a/Gems/Blast/Code/Source/Family/ActorRenderManager.h
+++ b/Gems/Blast/Code/Source/Family/ActorRenderManager.h
@@ -15,11 +15,6 @@
 #include <AzCore/std/containers/vector.h>
 #include <Azcore/Math/Vector3.h>
 
-namespace LmbrCentral
-{
-    class MeshComponentRequests;
-}
-
 namespace Blast
 {
     class BlastMeshData;
diff --git a/Gems/CMakeLists.txt b/Gems/CMakeLists.txt
index 782ecda744..3b630cfd2f 100644
--- a/Gems/CMakeLists.txt
+++ b/Gems/CMakeLists.txt
@@ -37,7 +37,6 @@ add_subdirectory(MessagePopup)
 add_subdirectory(PhysX)
 add_subdirectory(PhysXDebug)
 add_subdirectory(ScriptEvents)
-add_subdirectory(Visibility)
 add_subdirectory(AssetValidation)
 add_subdirectory(VirtualGamepad)
 add_subdirectory(SaveData)
@@ -52,7 +51,6 @@ add_subdirectory(ScriptCanvas)
 add_subdirectory(ScriptedEntityTweener)
 add_subdirectory(StartingPointMovement)
 add_subdirectory(StartingPointInput)
-add_subdirectory(ScriptCanvasDiagnosticLibrary)
 add_subdirectory(ScriptCanvasPhysics)
 add_subdirectory(StartingPointCamera)
 add_subdirectory(Presence)
diff --git a/Gems/CrashReporting/Code/CMakeLists.txt b/Gems/CrashReporting/Code/CMakeLists.txt
index dbb78849fb..d52600ea9b 100644
--- a/Gems/CrashReporting/Code/CMakeLists.txt
+++ b/Gems/CrashReporting/Code/CMakeLists.txt
@@ -30,9 +30,7 @@ ly_add_target(
             Include
     BUILD_DEPENDENCIES
         PRIVATE
-            AZ::AzCore
             AZ::CrashHandler
-            AZ::CrashSupport
 )
 
 ly_add_target(
@@ -46,10 +44,5 @@ ly_add_target(
             Include
     BUILD_DEPENDENCIES
         PRIVATE
-            #3rdParty::Crashpad
-            #3rdParty::Crashpad::Handler
-            AZ::AzCore
             AZ::CrashUploaderSupport
-            #AZ::CrashHandler
-            AZ::CrashSupport
 )
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
index 1f41b85b61..2330f54bbc 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
@@ -37,7 +37,7 @@ namespace DebugDraw
                     "DebugDraw Line", "Draws debug line on the screen from this entity's location to specified end entity's location.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/DebugDrawLine.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawLine.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawLineComponent::m_element, "Line element settings", "Settings for the line element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawLineComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
index b1ef7daf51..18b0d491a3 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
@@ -37,7 +37,7 @@ namespace DebugDraw
                     "DebugDraw Obb", "Draws debug obb on the screen from this entity's location to specified end entity's location.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/DebugDrawObb.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawObb.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawObbComponent::m_element, "Obb element settings", "Settings for the obb element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawObbComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
index d819c6b5d0..db29e03837 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
@@ -37,7 +37,7 @@ namespace DebugDraw
                     "DebugDraw Ray", "Draws debug ray on the screen from this entity's location to specified end entity's location.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/DebugDrawRay.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawRay.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawRayComponent::m_element, "Ray element settings", "Settings for the ray element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawRayComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
index 753f6e2e72..5b741e85a8 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
@@ -37,7 +37,7 @@ namespace DebugDraw
                     "DebugDraw Sphere", "Draws debug ray on the screen from this entity's location to specified end entity's location.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/DebugDrawSphere.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawSphere.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawSphereComponent::m_element, "Sphere element settings", "Settings for the sphere element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawSphereComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
index a3d842f52b..d340317a24 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
@@ -37,7 +37,7 @@ namespace DebugDraw
                     "DebugDraw Text", "Draws debug text on the screen at this entity's location.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/DebugDrawText.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawText.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawTextComponent::m_element, "Text element settings", "Settings for the text element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawTextComponent::OnPropertyUpdate)
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h
index a856e1257a..5db5305e05 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h
@@ -12,7 +12,6 @@
 *
 */
 
-#include <RC/ResourceCompilerScene/Common/ExportContextGlobal.h>
 #include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
 #include <SceneAPI/SceneCore/Events/ExportEventContext.h>
 #include <SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h>
@@ -21,6 +20,16 @@
 
 namespace AZ
 {
+    namespace RC
+    {
+        enum class Phase
+        {
+            Construction,   // The target is created.
+            Filling,        // Data is added to the target.
+            Finalizing      // Work on the target has completed.
+        };
+    }
+
     namespace SceneAPI
     {
         namespace Events
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp
index 6bc7044cab..ff8c0db660 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp
@@ -414,9 +414,17 @@ namespace EMotionFX
                 }
             }
 
+            // Add missing keyframes at the end of the animation to match all keytracks' duration.
+            motionData->FixMissingEndKeyframes();
+
             // Let's prepare the motion data in the type we want.
             // This can later be extended with other types of motion data like least square fit curves etc.
             motionData->UpdateDuration();
+            if (!motionData->VerifyIntegrity())
+            {
+                AZ_Error(SceneUtil::ErrorWindow, false, "Data integrity issue in '%s'.", motionGroup.GetName().c_str());
+                return SceneEvents::ProcessingResult::Failure;
+            }
 
             // Get the sample rate we have setup or that we have used.
             // Also make sure we don't sample at higher rate than we want.
@@ -435,6 +443,11 @@ namespace EMotionFX
             }
             AZ_TracePrintf("EMotionFX", "Motion sample rate = %f", sampleRate);
             motionData->RemoveRedundantKeyframes(samplingRule ? !samplingRule->GetKeepDuration() : false); // Clear any tracks of non-animated parts.
+            if (!motionData->VerifyIntegrity())
+            {
+                AZ_Error(SceneUtil::ErrorWindow, false, "Data integrity issue after removing redundant keyframes for '%s'.", motionGroup.GetName().c_str());
+                return SceneEvents::ProcessingResult::Failure;
+            }
 
             // Create the desired type of motion data, based on what is selected in the motion sampling rule.
             MotionData* finalMotionData = nullptr;
@@ -473,11 +486,16 @@ namespace EMotionFX
                 InitAndOptimizeMotionData(finalMotionData, motionData, sampleRate, samplingRule.get(), rootJoints);
             }
 
+            if (!finalMotionData->VerifyIntegrity())
+            {
+                AZ_Error(SceneUtil::ErrorWindow, false, "Data integrity issue in the final animation for '%s'.", motionGroup.GetName().c_str());
+                return SceneEvents::ProcessingResult::Failure;
+            }
+
             // Delete the data that we created out of the Scene API as it is no longer needed as we already extracted all the data from it
             // into our finalMotionData.
             delete motionData;
             context.m_motion.SetMotionData(finalMotionData);
-
             return SceneEvents::ProcessingResult::Success;
         }
     } // namespace Pipeline
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
index cfacdf9f09..ec1b00bda4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
@@ -360,7 +360,7 @@ namespace EMotionFX
             ApplyMorphSetup();
             UpdateSkinningMatrices();
             UpdateAttachments();
-       }
+        }
 
         // update the bounds when needed
         if (GetBoundsUpdateEnabled() && mBoundsUpdateType != BOUNDS_MESH_BASED)
@@ -418,7 +418,8 @@ namespace EMotionFX
         }
 
         // Update the bounds when we are set to use mesh based bounds.
-        if (GetBoundsUpdateEnabled() == BOUNDS_MESH_BASED)
+        if (GetBoundsUpdateEnabled() &&
+            GetBoundsUpdateType() == BOUNDS_MESH_BASED)
         {
             mBoundsUpdatePassedTime += timePassedInSeconds;
             if (mBoundsUpdatePassedTime >= mBoundsUpdateFrequency)
@@ -449,7 +450,8 @@ namespace EMotionFX
         }
 
         // Update the bounds when we are set to use mesh based bounds.
-        if (GetBoundsUpdateEnabled() == BOUNDS_MESH_BASED)
+        if (GetBoundsUpdateEnabled() &&
+            GetBoundsUpdateType() == BOUNDS_MESH_BASED)
         {
             mBoundsUpdatePassedTime += timePassedInSeconds;
             if (mBoundsUpdatePassedTime >= mBoundsUpdateFrequency)
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp
index 73cbad195a..27cf34961f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp
@@ -10,7 +10,8 @@
 *
 */
 
-// include the required headers
+#include <AzCore/Jobs/JobFunction.h>
+#include <AzCore/Jobs/JobCompletion.h>
 #include "EMotionFXConfig.h"
 #include "DualQuatSkinDeformer.h"
 #include "Mesh.h"
@@ -23,138 +24,143 @@
 #include <EMotionFX/Source/Allocators.h>
 #include <MCore/Source/LogManager.h>
 
-
 namespace EMotionFX
 {
     AZ_CLASS_ALLOCATOR_IMPL(DualQuatSkinDeformer, DeformerAllocator, 0)
 
-    // constructor
     DualQuatSkinDeformer::DualQuatSkinDeformer(Mesh* mesh)
         : MeshDeformer(mesh)
     {
-        mBones.SetMemoryCategory(EMFX_MEMCATEGORY_GEOMETRY_DEFORMERS);
     }
 
-
-    // destructor
     DualQuatSkinDeformer::~DualQuatSkinDeformer()
     {
-        mBones.Clear();
     }
 
+    AZ::Outcome<size_t> DualQuatSkinDeformer::FindLocalBoneIndex(uint32 nodeIndex) const
+    {
+        const size_t numBones = m_bones.size();
+        for (size_t i = 0; i < numBones; ++i)
+        {
+            if (m_bones[i].mNodeNr == nodeIndex)
+            {
+                return AZ::Success(i);
+            }
+        }
+
+        return AZ::Failure();
+    }
 
-    // creation
     DualQuatSkinDeformer* DualQuatSkinDeformer::Create(Mesh* mesh)
     {
         return aznew DualQuatSkinDeformer(mesh);
     }
 
-
-    // get the type id
     uint32 DualQuatSkinDeformer::GetType() const
     {
         return TYPE_ID;
     }
 
-
-    // get the subtype id
     uint32 DualQuatSkinDeformer::GetSubType() const
     {
         return SUBTYPE_ID;
     }
 
-
-    // clone this class
     MeshDeformer* DualQuatSkinDeformer::Clone(Mesh* mesh)
     {
         // create the new cloned deformer
         DualQuatSkinDeformer* result = aznew DualQuatSkinDeformer(mesh);
 
         // copy the bone info (for precalc/optimization reasons)
-        result->mBones = mBones;
+        result->m_bones = m_bones;
 
         // return the result
         return result;
     }
 
-
     // the main method where all calculations are done
-    void DualQuatSkinDeformer::Update(ActorInstance* actorInstance, Node* node, float timeDelta)
+    void DualQuatSkinDeformer::Update(ActorInstance* actorInstance, [[maybe_unused]] Node* node, [[maybe_unused]] float timeDelta)
     {
-        AZ_UNUSED(node);
-        MCORE_UNUSED(timeDelta);
-
         const Actor* actor = actorInstance->GetActor();
         const Pose* pose = actorInstance->GetTransformData()->GetCurrentPose();
+        const uint32 numVertices = mMesh->GetNumVertices();
 
-        AZ::Vector3  newPos, newNormal, newTangent, newBitangent;
-        AZ::Vector3  vtxPos, normal, tangent, bitangent;
-        AZ::Vector3* positions   = static_cast<AZ::Vector3*>(mMesh->FindVertexData(Mesh::ATTRIB_POSITIONS));
-        AZ::Vector3* normals     = static_cast<AZ::Vector3*>(mMesh->FindVertexData(Mesh::ATTRIB_NORMALS));
-        AZ::Vector4* tangents    = static_cast<AZ::Vector4*>(mMesh->FindVertexData(Mesh::ATTRIB_TANGENTS));
-        AZ::Vector3* bitangents  = static_cast<AZ::Vector3*>(mMesh->FindVertexData(Mesh::ATTRIB_BITANGENTS));
-        AZ::u32*     orgVerts    = static_cast<AZ::u32*>(mMesh->FindVertexData(Mesh::ATTRIB_ORGVTXNUMBERS));
-
-        // precalc the skinning matrices
-        const uint32 numBones = mBones.GetLength();
-        for (uint32 i = 0; i < numBones; i++)
+        // pre-calculate the skinning matrices
+        for (BoneInfo& boneInfo : m_bones)
         {
-            const uint32 nodeIndex = mBones[i].mNodeNr;
-            Transform skinTransform = actor->GetInverseBindPoseTransform(nodeIndex);
-            skinTransform.Multiply(pose->GetModelSpaceTransform(nodeIndex));
-            mBones[i].mDualQuat.FromRotationTranslation(skinTransform.mRotation, skinTransform.mPosition);
+            const uint32 nodeIndex = boneInfo.mNodeNr;
+            const Transform skinTransform = actor->GetInverseBindPoseTransform(nodeIndex) * pose->GetModelSpaceTransform(nodeIndex);
+            boneInfo.mDualQuat.FromRotationTranslation(skinTransform.mRotation, skinTransform.mPosition);
         }
 
-        // find the skinning layer
-        SkinningInfoVertexAttributeLayer* layer = (SkinningInfoVertexAttributeLayer*)mMesh->FindSharedVertexAttributeLayer(SkinningInfoVertexAttributeLayer::TYPE_ID);
-        MCORE_ASSERT(layer);
+        AZ::JobCompletion jobCompletion;
+
+        // Split up the skinned vertices into batches.
+        const AZ::u32 numBatches = aznumeric_caster(ceilf(aznumeric_cast<float>(numVertices) / aznumeric_cast<float>(s_numVerticesPerBatch)));
+        for (AZ::u32 batchIndex = 0; batchIndex < numBatches; ++batchIndex)
+        {
+            const AZ::u32 startVertex = batchIndex * s_numVerticesPerBatch;
+            const AZ::u32 endVertex = AZStd::min(startVertex + s_numVerticesPerBatch, numVertices);
+
+            // Create a job for every batch and skin them simultaneously.
+            AZ::JobContext* jobContext = nullptr;
+            AZ::Job* job = AZ::CreateJobFunction([this, startVertex, endVertex]()
+                {
+                    SkinRange(mMesh, startVertex, endVertex, m_bones);
+                }, /*isAutoDelete=*/true, jobContext);
+
+            job->SetDependent(&jobCompletion);
+            job->Start();
+        }
+
+        jobCompletion.StartAndWaitForCompletion();
+    }
+
+    void DualQuatSkinDeformer::SkinRange(Mesh* mesh, AZ::u32 startVertex, AZ::u32 endVertex, const AZStd::vector<BoneInfo>& boneInfos)
+    {
+        SkinningInfoVertexAttributeLayer* layer = (SkinningInfoVertexAttributeLayer*)mesh->FindSharedVertexAttributeLayer(SkinningInfoVertexAttributeLayer::TYPE_ID);
+        AZ_Assert(layer, "Cannot find skinning layer.");
+
+        AZ::Vector3 newTangent;
+        AZ::Vector3 vtxPos, normal, tangent, bitangent;
+        AZ::u32 orgVertex;
+        float weight;
+
+        AZ::Vector3* positions = static_cast<AZ::Vector3*>(mesh->FindVertexData(Mesh::ATTRIB_POSITIONS));
+        AZ::Vector3* normals = static_cast<AZ::Vector3*>(mesh->FindVertexData(Mesh::ATTRIB_NORMALS));
+        AZ::Vector4* tangents = static_cast<AZ::Vector4*>(mesh->FindVertexData(Mesh::ATTRIB_TANGENTS));
+        AZ::Vector3* bitangents = static_cast<AZ::Vector3*>(mesh->FindVertexData(Mesh::ATTRIB_BITANGENTS));
+        AZ::u32* orgVerts = static_cast<AZ::u32*>(mesh->FindVertexData(Mesh::ATTRIB_ORGVTXNUMBERS));
 
         // if there are tangents and bitangents to skin
         if (tangents && bitangents)
         {
-            const uint32 numVertices = mMesh->GetNumVertices();
-            uint32 v = 0;
-            uint32 orgVertex;
-
-            SkinInfluence*  influence;
-            BoneInfo*       boneInfo;
-            float           weight;
-            for (v = 0; v < numVertices; ++v)
+            for (AZ::u32 v = startVertex; v < endVertex; ++v)
             {
-                // get the original vertex number
-                orgVertex = *(orgVerts++);
-
-                // reset the skinned position
-                newPos = AZ::Vector3::CreateZero();
-                newNormal = AZ::Vector3::CreateZero();
-                newTangent = AZ::Vector3::CreateZero();
-                newBitangent = AZ::Vector3::CreateZero();
-
-                const float tangentW = tangents->GetW();
-                vtxPos.Set  (positions->GetX(),  positions->GetY(),   positions->GetZ());
-                normal.Set  (normals->GetX(),    normals->GetY(),     normals->GetZ());
-                tangent.Set (tangents->GetX(),   tangents->GetY(),    tangents->GetZ());
-                bitangent.Set(bitangents->GetX(), bitangents->GetY(), bitangents->GetZ());
+                orgVertex = orgVerts[v];
+                vtxPos = positions[v];
+                normal = normals[v];
+                const float tangentW = tangents[v].GetW();
+                tangent.Set(tangents[v].GetX(), tangents[v].GetY(), tangents[v].GetZ());
+                bitangent = bitangents[v];
 
                 // process the skin influences for this vertex
                 const size_t numInfluences = layer->GetNumInfluences(orgVertex);
                 if (numInfluences > 0)
                 {
                     // get the pivot quat, used for the dot product check
-                    const MCore::DualQuaternion& pivotQuat = mBones[ layer->GetInfluence(orgVertex, 0)->GetBoneNr() ].mDualQuat;
+                    const MCore::DualQuaternion& pivotQuat = boneInfos[ layer->GetInfluence(orgVertex, 0)->GetBoneNr() ].mDualQuat;
 
                     // our skinning dual quaternion
                     MCore::DualQuaternion skinQuat(AZ::Quaternion(0, 0, 0, 0), AZ::Quaternion(0, 0, 0, 0));
 
                     for (size_t i = 0; i < numInfluences; ++i)
                     {
-                        // get the influence
-                        influence   = layer->GetInfluence(orgVertex, i);
-                        boneInfo    = &mBones[ influence->GetBoneNr() ];
-                        weight      = influence->GetWeight();
+                        SkinInfluence* influence = layer->GetInfluence(orgVertex, i);
+                        weight = influence->GetWeight();
 
                         // check if we need to invert the dual quat
-                        MCore::DualQuaternion& influenceQuat = mBones[ influence->GetBoneNr() ].mDualQuat;
+                        MCore::DualQuaternion influenceQuat = boneInfos[ influence->GetBoneNr() ].mDualQuat;
                         if (influenceQuat.mReal.Dot(pivotQuat.mReal) < 0.0f)
                         {
                             influenceQuat *= -1.0f;
@@ -168,74 +174,50 @@ namespace EMotionFX
                     skinQuat.Normalize();
 
                     // perform skinning
-                    newPos      = skinQuat.TransformPoint(vtxPos);
-                    newNormal   = skinQuat.TransformVector(normal);
-                    newTangent  = skinQuat.TransformVector(tangent);
-                    newBitangent = skinQuat.TransformVector(bitangent);
+                    positions[v] = skinQuat.TransformPoint(vtxPos);
+                    normals[v] = skinQuat.TransformVector(normal);
+                    newTangent = skinQuat.TransformVector(tangent);
+                    tangents[v].Set(newTangent.GetX(), newTangent.GetY(), newTangent.GetZ(), tangentW);
+                    bitangents[v] = skinQuat.TransformVector(bitangent);
                 }
                 else
                 {
-                    // perform the skinning
-                    newPos      = vtxPos;
-                    newNormal   = normal;
-                    newTangent  = tangent;
-                    newBitangent = bitangent;
+                    // no skinning influences, just copy the values
+                    positions[v] = vtxPos;
+                    normals[v] = normal;
+                    newTangent = tangent;
+                    tangents[v].Set(newTangent.GetX(), newTangent.GetY(), newTangent.GetZ(), tangentW);
+                    bitangents[v] = bitangent;
                 }
-
-                // output the skinned values
-                positions->Set  (newPos.GetX(),      newPos.GetY(),       newPos.GetZ());
-                positions++;
-                normals->Set    (newNormal.GetX(),   newNormal.GetY(),    newNormal.GetZ());
-                normals++;
-                tangents->Set   (newTangent.GetX(),  newTangent.GetY(),   newTangent.GetZ(), tangentW);
-                tangents++;
-                bitangents->Set (newBitangent.GetX(), newBitangent.GetY(), newBitangent.GetZ());
-                bitangents++;
             }
         }
         else if (tangents && !bitangents) // tangents but no bitangents
         {
-            const uint32 numVertices = mMesh->GetNumVertices();
-            uint32 v = 0;
-            uint32 orgVertex;
-
-            SkinInfluence*  influence;
-            BoneInfo*       boneInfo;
-            float           weight;
-            for (v = 0; v < numVertices; ++v)
+            for (AZ::u32 v = startVertex; v < endVertex; ++v)
             {
-                // get the original vertex number
-                orgVertex = *(orgVerts++);
-
-                // reset the skinned position
-                newPos = AZ::Vector3::CreateZero();
-                newNormal = AZ::Vector3::CreateZero();
-                newTangent = AZ::Vector3::CreateZero();
-
-                const float tangentW = tangents->GetW();
-                vtxPos.Set  (positions->GetX(),  positions->GetY(),   positions->GetZ());
-                normal.Set  (normals->GetX(),    normals->GetY(),     normals->GetZ());
-                tangent.Set (tangents->GetX(),  tangents->GetY(),   tangents->GetZ());
+                orgVertex = orgVerts[v];
+                vtxPos = positions[v];
+                normal = normals[v];
+                const float tangentW = tangents[v].GetW();
+                tangent.Set(tangents[v].GetX(), tangents[v].GetY(), tangents[v].GetZ());
 
                 // process the skin influences for this vertex
                 const size_t numInfluences = layer->GetNumInfluences(orgVertex);
                 if (numInfluences > 0)
                 {
                     // get the pivot quat, used for the dot product check
-                    const MCore::DualQuaternion& pivotQuat = mBones[ layer->GetInfluence(orgVertex, 0)->GetBoneNr() ].mDualQuat;
+                    const MCore::DualQuaternion& pivotQuat = boneInfos[ layer->GetInfluence(orgVertex, 0)->GetBoneNr() ].mDualQuat;
 
                     // our skinning dual quaternion
                     MCore::DualQuaternion skinQuat(AZ::Quaternion(0, 0, 0, 0), AZ::Quaternion(0, 0, 0, 0));
 
                     for (size_t i = 0; i < numInfluences; ++i)
                     {
-                        // get the influence
-                        influence   = layer->GetInfluence(orgVertex, i);
-                        boneInfo    = &mBones[ influence->GetBoneNr() ];
-                        weight      = influence->GetWeight();
+                        SkinInfluence* influence = layer->GetInfluence(orgVertex, i);
+                        weight = influence->GetWeight();
 
                         // check if we need to invert the dual quat
-                        MCore::DualQuaternion& influenceQuat = mBones[ influence->GetBoneNr() ].mDualQuat;
+                        MCore::DualQuaternion influenceQuat = boneInfos[ influence->GetBoneNr() ].mDualQuat;
                         if (influenceQuat.mReal.Dot(pivotQuat.mReal) < 0.0f)
                         {
                             influenceQuat *= -1.0f;
@@ -249,68 +231,46 @@ namespace EMotionFX
                     skinQuat.Normalize();
 
                     // perform skinning
-                    newPos      = skinQuat.TransformPoint(vtxPos);
-                    newNormal   = skinQuat.TransformVector(normal);
-                    newTangent  = skinQuat.TransformVector(tangent);
+                    positions[v] = skinQuat.TransformPoint(vtxPos);
+                    normals[v] = skinQuat.TransformVector(normal);
+                    newTangent = skinQuat.TransformVector(tangent);
+                    tangents[v].Set(newTangent.GetX(), newTangent.GetY(), newTangent.GetZ(), tangentW);
                 }
                 else
                 {
-                    // perform the skinning
-                    newPos      = vtxPos;
-                    newNormal   = normal;
-                    newTangent  = tangent;
+                    // no skinning influences, just copy the values
+                    positions[v] = vtxPos;
+                    normals[v] = normal;
+                    newTangent = tangent;
+                    tangents[v].Set(newTangent.GetX(), newTangent.GetY(), newTangent.GetZ(), tangentW);
                 }
-
-                // output the skinned values
-                positions->Set  (newPos.GetX(),      newPos.GetY(),       newPos.GetZ());
-                positions++;
-                normals->Set    (newNormal.GetX(),   newNormal.GetY(),    newNormal.GetZ());
-                normals++;
-                tangents->Set   (newTangent.GetX(),  newTangent.GetY(),   newTangent.GetZ(), tangentW);
-                tangents++;
             }
         }
         else // there are no tangents and bitangents to skin
         {
-            const uint32 numVertices = mMesh->GetNumVertices();
-            uint32 v = 0;
-            uint32 orgVertex;
-
-            SkinInfluence*  influence;
-            BoneInfo*       boneInfo;
-            float           weight;
-
-            for (v = 0; v < numVertices; ++v)
+            for (AZ::u32 v = startVertex; v < endVertex; ++v)
             {
-                // get the original vertex number
-                orgVertex = *(orgVerts++);
-
-                // reset the skinned position
-                newPos = AZ::Vector3::CreateZero();
-                newNormal = AZ::Vector3::CreateZero();
-
-                vtxPos.Set(positions->GetX(), positions->GetY(), positions->GetZ());
-                normal.Set(normals->GetX(), normals->GetY(), normals->GetZ());
+                orgVertex = orgVerts[v];
+                vtxPos = positions[v];
+                normal = normals[v];
 
                 // process the skin influences for this vertex
                 const size_t numInfluences = layer->GetNumInfluences(orgVertex);
                 if (numInfluences > 0)
                 {
                     // get the pivot quat, used for the dot product check
-                    const MCore::DualQuaternion& pivotQuat = mBones[ layer->GetInfluence(orgVertex, 0)->GetBoneNr() ].mDualQuat;
+                    const MCore::DualQuaternion& pivotQuat = boneInfos[ layer->GetInfluence(orgVertex, 0)->GetBoneNr() ].mDualQuat;
 
                     // our skinning dual quaternion
                     MCore::DualQuaternion skinQuat(AZ::Quaternion(0, 0, 0, 0), AZ::Quaternion(0, 0, 0, 0));
 
                     for (size_t i = 0; i < numInfluences; ++i)
                     {
-                        // get the influence
-                        influence   = layer->GetInfluence(orgVertex, i);
-                        boneInfo    = &mBones[ influence->GetBoneNr() ];
-                        weight      = influence->GetWeight();
+                        SkinInfluence* influence = layer->GetInfluence(orgVertex, i);
+                        weight = influence->GetWeight();
 
                         // check if we need to invert the dual quat
-                        MCore::DualQuaternion& influenceQuat = mBones[ influence->GetBoneNr() ].mDualQuat;
+                        MCore::DualQuaternion influenceQuat = boneInfos[ influence->GetBoneNr() ].mDualQuat;
                         if (influenceQuat.mReal.Dot(pivotQuat.mReal) < 0.0f)
                         {
                             influenceQuat *= -1.0f;
@@ -324,26 +284,19 @@ namespace EMotionFX
                     skinQuat.Normalize();
 
                     // perform skinning
-                    newPos      = skinQuat.TransformPoint(vtxPos);
-                    newNormal   = skinQuat.TransformVector(normal);
+                    positions[v] = skinQuat.TransformPoint(vtxPos);
+                    normals[v] = skinQuat.TransformVector(normal);
                 }
                 else
                 {
-                    // perform the skinning
-                    newPos      = vtxPos;
-                    newNormal   = normal;
+                    // no skinning influences, just copy the values
+                    positions[v] = vtxPos;
+                    normals[v] = normal;
                 }
-
-                // output the skinned values
-                positions->Set(newPos.GetX(), newPos.GetY(), newPos.GetZ());
-                positions++;
-                normals->Set(newNormal.GetX(), newNormal.GetY(), newNormal.GetZ());
-                normals++;
             }
         }
     }
 
-
     // initialize the mesh deformer
     void DualQuatSkinDeformer::Reinitialize(Actor* actor, Node* node, uint32 lodLevel)
     {
@@ -352,7 +305,7 @@ namespace EMotionFX
         MCORE_UNUSED(lodLevel);
 
         // clear the bone information array, but don't free the currently allocated/reserved memory
-        mBones.Clear(false);
+        m_bones.clear();
 
         // if there is no mesh
         if (mMesh == nullptr)
@@ -360,13 +313,9 @@ namespace EMotionFX
             return;
         }
 
-        // get the attribute number
         SkinningInfoVertexAttributeLayer* skinningLayer = (SkinningInfoVertexAttributeLayer*)mMesh->FindSharedVertexAttributeLayer(SkinningInfoVertexAttributeLayer::TYPE_ID);
         MCORE_ASSERT(skinningLayer);
 
-        // reserve space for the bone array
-        //mBones.Reserve( actor->GetNumNodes() );
-
         // find out what bones this mesh uses
         const uint32 numOrgVerts = mMesh->GetNumOrgVertices();
         for (uint32 i = 0; i < numOrgVerts; i++)
@@ -379,26 +328,21 @@ namespace EMotionFX
             {
                 SkinInfluence* influence = skinningLayer->GetInfluence(i, a);
 
-                // get the bone index in the array
-                uint32 boneIndex = FindLocalBoneIndex(influence->GetNodeNr());
-
-                // if the bone is not found in our array
-                if (boneIndex == MCORE_INVALIDINDEX32)
+                AZ::Outcome<size_t> boneIndexOutcome = FindLocalBoneIndex(influence->GetNodeNr());
+                if (boneIndexOutcome.IsSuccess())
+                {
+                    influence->SetBoneNr(boneIndexOutcome.GetValue());
+                }
+                else
                 {
                     // add the bone to the array of bones in this deformer
-                    mBones.AddEmptyExact();
-                    BoneInfo& lastBone = mBones.GetLast();
+                    BoneInfo lastBone;
                     lastBone.mNodeNr = influence->GetNodeNr();
                     lastBone.mDualQuat.Identity();
-                    boneIndex = mBones.GetLength() - 1;
+                    m_bones.emplace_back(lastBone);
+                    influence->SetBoneNr(static_cast<AZ::u16>(m_bones.size() - 1));
                 }
-
-                // set the bone number in the influence
-                influence->SetBoneNr(static_cast<uint16>(boneIndex));
             }
         }
-
-        // get rid of all items in the used bones array
-        //  mBones.Shrink();
     }
 } // namespace EMotionFX
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h
index fc80256524..ec00f1186f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h
@@ -12,13 +12,13 @@
 
 #pragma once
 
-// include the required headers
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/Outcome/Outcome.h>
 #include "EMotionFXConfig.h"
 #include <MCore/Source/DualQuaternion.h>
 #include "Mesh.h"
 #include "MeshDeformer.h"
 
-
 namespace EMotionFX
 {
     // forward declarations
@@ -101,37 +101,47 @@ namespace EMotionFX
          * This is the number of different bones that the skinning information of the mesh where this deformer works on uses.
          * @result The number of bones.
          */
-        MCORE_INLINE uint32 GetNumLocalBones() const                        { return mBones.GetLength(); }
+        MCORE_INLINE uint32 GetNumLocalBones() const                        { return static_cast<uint32>(m_bones.size()); }
 
         /**
          * Get the node number of a given local bone.
          * @param index The local bone number, which must be in range of [0..GetNumLocalBones()-1].
          * @result The node number, which is in range of [0..Actor::GetNumNodes()-1], depending on the actor where this deformer works on.
          */
-        MCORE_INLINE uint32 GetLocalBone(uint32 index) const                { return mBones[index].mNodeNr; }
+        MCORE_INLINE uint32 GetLocalBone(uint32 index) const                { return m_bones[index].mNodeNr; }
 
         /**
          * Pre-allocate space for a given number of local bones.
          * This does not alter the value returned by GetNumLocalBones().
          * @param numBones The number of bones to pre-allocate space for.
          */
-        MCORE_INLINE void ReserveLocalBones(uint32 numBones)                { mBones.Reserve(numBones); }
-
+        MCORE_INLINE void ReserveLocalBones(uint32 numBones)                { m_bones.reserve(numBones); }
 
     protected:
         /**
-         * Structure used for precalculating the skinning matrices.
+         * Structure used for pre-calculating the skinning matrices.
          */
         struct EMFX_API BoneInfo
         {
             uint32                  mNodeNr;        /**< The node number. */
-            MCore::DualQuaternion   mDualQuat;      /**< The dual quat of the precalculated matrix that contains the "globalMatrix * inverse(bindPoseMatrix)". */
+            MCore::DualQuaternion   mDualQuat;      /**< The dual quat of the pre-calculated matrix that contains the "globalMatrix * inverse(bindPoseMatrix)". */
 
             MCORE_INLINE BoneInfo()
                 : mNodeNr(MCORE_INVALIDINDEX32) {}
         };
+        AZStd::vector<BoneInfo> m_bones; /**< The array of bone information used for pre-calculation. */
+
+        /**
+         * Skin a part of the mesh.
+         * @param mesh The mesh to be skinned.
+         * @param startVertex The start vertex index to start skinning.
+         * @param endVertex The end vertex index for the range to be skinned.
+         * @param boneInfos The pre-calculated skinning matrices shared across the skinning process.
+         */
+        static void SkinRange(Mesh* mesh, AZ::u32 startVertex, AZ::u32 endVertex, const AZStd::vector<BoneInfo>& boneInfos);
 
-        MCore::Array<BoneInfo>  mBones; /**< The array of bone information used for precalculation. */
+        //! Number of vertices per batch/job used for multi-threaded software skinning.
+        static constexpr AZ::u32 s_numVerticesPerBatch = 10000;
 
         /**
          * Default constructor.
@@ -149,18 +159,6 @@ namespace EMotionFX
          * @param nodeIndex The node number to search for.
          * @result The index inside the mBones member array, which uses the given node.
          */
-        MCORE_INLINE uint32 FindLocalBoneIndex(uint32 nodeIndex) const
-        {
-            const uint32 numBones = mBones.GetLength();
-            for (uint32 i = 0; i < numBones; ++i)
-            {
-                if (mBones[i].mNodeNr == nodeIndex)
-                {
-                    return i;
-                }
-            }
-
-            return MCORE_INVALIDINDEX32;
-        }
+        AZ::Outcome<size_t> FindLocalBoneIndex(uint32 nodeIndex) const;
     };
 } // namespace EMotionFX
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp
index f5503ad6a5..cc4e206e08 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp
@@ -775,7 +775,7 @@ namespace EMotionFX
         } // for all submotions
 
         motion->UpdateDuration();
-
+        AZ_Assert(motion->GetMotionData()->VerifyIntegrity(), "Data integrity issue in animation '%s'.", motion->GetName());
         return true;
     }
 
@@ -1572,7 +1572,7 @@ namespace EMotionFX
         } // for all submotions
 
         motion->UpdateDuration();
-
+        AZ_Assert(motion->GetMotionData()->VerifyIntegrity(), "Data integrity issue in animation '%s'.", motion->GetName());
         return true;
     }
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp
index 834f4f6ef4..8c5083e8e9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp
@@ -461,16 +461,17 @@ namespace EMotionFX
     {
         AZ_Assert(motionLinkData, "Expecting valid motionLinkData pointer.");
 
+        const Pose* bindPose = actorInstance->GetTransformData()->GetBindPose();
+        const AZStd::vector<AZ::u32>& jointLinks = motionLinkData->GetJointDataLinks();
+
         // Special case handling on translation of root nodes.
         // Scale the translation amount based on the height difference between the bind pose height of the
         // retarget root node and the bind pose of that node stored in the motion.
         // All other nodes get their translation data displaced based on the position difference between the
         // parent relative space positions in the actor instance's bind pose and the motion bind pose.
-        const Pose* bindPose = actorInstance->GetTransformData()->GetBindPose();
         const Actor* actor = actorInstance->GetActor();
         const AZ::u32 retargetRootIndex = actor->GetRetargetRootNodeIndex();
         const Node* joint = actor->GetSkeleton()->GetNode(jointIndex);
-        const AZStd::vector<AZ::u32>& jointLinks = motionLinkData->GetJointDataLinks();
         bool needsDisplacement = true;
         if ((retargetRootIndex == jointIndex || joint->GetIsRootNode()) && retargetRootIndex != InvalidIndex32)
         {
@@ -487,20 +488,23 @@ namespace EMotionFX
             }
         }
 
-        const Transform& bindPoseTransform = bindPose->GetLocalSpaceTransform(jointIndex);
         const AZ::u16 jointDataIndex = jointLinks[jointIndex];
-        const Transform& motionBindPose = m_staticJointData[jointDataIndex].m_bindTransform;
-        if (needsDisplacement)
+        if (jointDataIndex != InvalidIndex16)
         {
-            const AZ::Vector3 displacement = bindPoseTransform.mPosition - motionBindPose.mPosition;
-            inOutTransform.mPosition += displacement;
-        }
+            const Transform& bindPoseTransform = bindPose->GetLocalSpaceTransform(jointIndex);
+            const Transform& motionBindPose = m_staticJointData[jointDataIndex].m_bindTransform;
+            if (needsDisplacement)
+            {
+                const AZ::Vector3 displacement = bindPoseTransform.mPosition - motionBindPose.mPosition;
+                inOutTransform.mPosition += displacement;
+            }
 
-        EMFX_SCALECODE
-        (
-            const AZ::Vector3 scaleOffset = bindPoseTransform.mScale - motionBindPose.mScale;
-            inOutTransform.mScale += scaleOffset;
-        )
+            EMFX_SCALECODE
+            (
+                const AZ::Vector3 scaleOffset = bindPoseTransform.mScale - motionBindPose.mScale;
+                inOutTransform.mScale += scaleOffset;
+            )
+        }
     }
 
     // Based on a given time value, find the two keyframes to interpolate between, and calculate the t value, which is the interpolation weight between 0 and 1.
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
index d9a6572ae4..53af107913 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
@@ -195,6 +195,7 @@ namespace EMotionFX
         virtual bool IsMorphAnimated(size_t morphDataIndex) const = 0;
         virtual bool IsFloatAnimated(size_t floatDataIndex) const = 0;
         virtual void UpdateDuration() {}
+        virtual bool VerifyIntegrity() const { return true; }
 
         void Resize(size_t numJoints, size_t numMorphs, size_t numFloats);
         void Clear();
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
index 8a58300b88..0a746ed917 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
@@ -375,10 +375,48 @@ namespace EMotionFX
         return true;
     }
 
-    void NonUniformMotionData::UpdateDuration()
+    template<class KeyTrackType>
+    void NonUniformMotionData::FixMissingEndKeyframes(KeyTrackType& keytrack, float endTimeToMatch)
     {
-        AZ_Assert(VerifyIntegrity(), "Data integrity issue!");
+        if (keytrack.m_times.empty() || keytrack.m_values.empty())
+        {
+            return;
+        }
+
+        if (!AZ::IsClose(keytrack.m_times.back(), endTimeToMatch, AZ::Constants::FloatEpsilon))
+        {
+            keytrack.m_times.emplace_back(endTimeToMatch);
+            keytrack.m_values.emplace_back(keytrack.m_values.back());
+        }
+    }
+
+    void NonUniformMotionData::FixMissingEndKeyframes()
+    {
+        UpdateDuration();
+
+        for (JointData& jointData : m_jointData)
+        {
+            FixMissingEndKeyframes(jointData.m_positionTrack, m_duration);
+            FixMissingEndKeyframes(jointData.m_rotationTrack, m_duration);
 
+#ifndef EMFX_SCALE_DISABLED
+            FixMissingEndKeyframes(jointData.m_scaleTrack, m_duration);
+#endif
+        }
+
+        for (FloatData& morphData : m_morphData)
+        {
+            FixMissingEndKeyframes(morphData.m_track, m_duration);
+        }
+
+        for (FloatData& floatData : m_floatData)
+        {
+            FixMissingEndKeyframes(floatData.m_track, m_duration);
+        }
+    }
+
+    void NonUniformMotionData::UpdateDuration()
+    {
         for (const JointData& jointData : m_jointData)
         {
             if (!jointData.m_positionTrack.m_times.empty())
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
index 15b082caba..bd710c3453 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
@@ -82,7 +82,15 @@ namespace EMotionFX
         void ClearMorphSamples(size_t morphDataIndex) override;
         void ClearFloatSamples(size_t floatDataIndex) override;
 
-        bool VerifyIntegrity() const;
+        bool VerifyIntegrity() const override;
+
+        //! Animation tracks in the DCC tool formats are often stored individually, each having its own duration.
+        //! For the motion data, it is required to have tracks with the same duration and e.g. a position track
+        //! has to match the duration of a morph track. This will be automatically fixed by adding missing
+        //! keyframes at the end of the tracks to match the animation's global duration. The value of these
+        //! are the same as the last one of the given track so that they freeze at that value.
+        void FixMissingEndKeyframes();
+
         void ScaleData(float scaleFactor) override;
         void UpdateDuration() override;
 
@@ -155,6 +163,9 @@ namespace EMotionFX
         void RemoveMorphSampleData(size_t morphDataIndex) override;
         void RemoveFloatSampleData(size_t floatDataIndex) override;
 
+        template<class KeyTrackType>
+        void FixMissingEndKeyframes(KeyTrackType& keytrack, float endTimeToMatch);
+
     private:
         AZStd::vector<JointData> m_jointData;
         AZStd::vector<FloatData> m_morphData;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp
index cbe13308d9..d715fabd1c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp
@@ -220,7 +220,7 @@ namespace EMotionFX
             //mPool->mFreeList.Reserve( numInstances * 2 );
             if (mPool->mFreeList.GetMaxLength() < mPool->mNumInstances)
             {
-                mPool->mFreeList.Reserve(mPool->mNumInstances);
+                mPool->mFreeList.Reserve(mPool->mNumInstances + mPool->mFreeList.GetMaxLength() / 2);
             }
 
             mPool->mFreeList.ResizeFast(startIndex + numInstances);
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
index 85fc9c8d56..e33a5f3f51 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
@@ -78,8 +78,6 @@ namespace EMStudio
         virtual void OnBeforeRemovePlugin(uint32 classID) { MCORE_UNUSED(classID); }
         virtual void OnMainWindowClosed() {}
 
-        virtual void RegisterKeyboardShortcuts() {}
-
         struct RenderInfo
         {
             MCORE_MEMORYOBJECTCATEGORY(EMStudioPlugin::RenderInfo, MCore::MCORE_DEFAULT_ALIGNMENT, MEMCATEGORY_EMSTUDIOSDK)
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp
index b8093d2115..d6fdb9128b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp
@@ -116,14 +116,6 @@ namespace EMStudio
     }
 
 
-    void KeyboardShortcutsWindow::hideEvent(QHideEvent* event)
-    {
-        MCORE_UNUSED(event);
-        //if (mShortcutReceiverDialog)
-        //  mShortcutReceiverDialog->reject();
-    }
-
-
     // reconstruct the whole interface
     void KeyboardShortcutsWindow::ReInit()
     {
@@ -138,11 +130,11 @@ namespace EMStudio
 
         // add the groups to the left list widget
         MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
-        const uint32 numGroups = shortcutManager->GetNumGroups();
+        const size_t numGroups = shortcutManager->GetNumGroups();
         for (uint32 i = 0; i < numGroups; ++i)
         {
             MysticQt::KeyboardShortcutManager::Group* group = shortcutManager->GetGroup(i);
-            mListWidget->addItem(group->GetName());
+            mListWidget->addItem(FromStdString(group->GetName()));
         }
 
         mTableWidget->blockSignals(false);
@@ -183,10 +175,10 @@ namespace EMStudio
         // get access to the shortcut group and some data
         MysticQt::KeyboardShortcutManager*          shortcutManager = GetMainWindow()->GetShortcutManager();
         MysticQt::KeyboardShortcutManager::Group*   group           = shortcutManager->GetGroup(mSelectedGroup);
-        const uint32                                numActions      = group->GetNumActions();
+        const size_t                                numActions      = group->GetNumActions();
 
         // set the row count
-        mTableWidget->setRowCount(numActions);
+        mTableWidget->setRowCount(aznumeric_caster(numActions));
 
         // fill the table with the media root folders
         for (uint32 i = 0; i < numActions; ++i)
@@ -195,11 +187,11 @@ namespace EMStudio
             MysticQt::KeyboardShortcutManager::Action* action = group->GetAction(i);
 
             // add the item to the table and set the row height
-            QTableWidgetItem* item = new QTableWidgetItem(action->mName.c_str());
+            QTableWidgetItem* item = new QTableWidgetItem(action->m_qaction->text());
             item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
             mTableWidget->setItem(i, 0, item);
 
-            const QString keyText = ConstructStringFromShortcut(action->mKey, action->mCtrl, action->mAlt);
+            const QString keyText = ConstructStringFromShortcut(action->m_qaction->shortcut());
 
             item = new QTableWidgetItem(keyText);
             item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
@@ -255,18 +247,14 @@ namespace EMStudio
             // handle conflicts
             if (shortcutWindow.mConflictDetected)
             {
-                shortcutWindow.mConflictAction->mKey    = -1;
-                shortcutWindow.mConflictAction->mCtrl   = false;
-                shortcutWindow.mConflictAction->mAlt    = false;
+                shortcutWindow.mConflictAction->m_qaction->setShortcut({});
             }
 
             // adjust the shortcut action
-            action->mKey    = shortcutWindow.mKey;
-            action->mAlt    = shortcutWindow.mAlt;
-            action->mCtrl   = shortcutWindow.mCtrl;
+            action->m_qaction->setShortcut(shortcutWindow.mKey);
 
             // save the new shortcuts
-            QSettings settings(AZStd::string(GetManager()->GetAppDataFolder() + "EMStudioKeyboardShortcuts.cfg").c_str(), QSettings::IniFormat, this);
+            QSettings settings(FromStdString(AZStd::string(GetManager()->GetAppDataFolder() + "EMStudioKeyboardShortcuts.cfg")), QSettings::IniFormat, this);
             shortcutManager->Save(&settings);
 
             // reinit the window
@@ -277,31 +265,14 @@ namespace EMStudio
 
 
     // construct a text version of a shortcut
-    QString KeyboardShortcutsWindow::ConstructStringFromShortcut(int key, bool ctrl, bool alt)
+    QString KeyboardShortcutsWindow::ConstructStringFromShortcut(QKeySequence key)
     {
-        if (key == -1)
+        if (key.isEmpty())
         {
             return "not set";
         }
 
-        QString keyText;
-
-        if (ctrl)
-        {
-            #if AZ_TRAIT_OS_PLATFORM_APPLE
-                keyText += "COMMAND + ";
-            #else
-                keyText += "CTRL + ";
-            #endif  
-        }
-        if (alt)
-        {
-            keyText += "ALT + ";
-        }
-
-        keyText += QKeySequence(key).toString(QKeySequence::NativeText);
-
-        return keyText;
+        return key.toString(QKeySequence::NativeText);
     }
 
 
@@ -313,9 +284,7 @@ namespace EMStudio
             return;
         }
 
-        mContextMenuAction->mKey    = mContextMenuAction->mDefaultKey;
-        mContextMenuAction->mCtrl   = mContextMenuAction->mDefaultCtrl;
-        mContextMenuAction->mAlt    = mContextMenuAction->mDefaultAlt;
+        mContextMenuAction->m_qaction->setShortcut(mContextMenuAction->m_defaultKeySequence);
 
         ReInit();
     }
@@ -378,19 +347,14 @@ namespace EMStudio
         setWindowTitle(" ");
         layout->addWidget(new QLabel("Press the new shortcut on the keyboard:"));
 
-        // find the initial shortcut
-        //MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
-
         mOrgAction          = action;
         mOrgGroup           = group;
 
         mConflictAction     = nullptr;
         mConflictDetected   = false;
-        mKey                = action->mKey;
-        mCtrl               = action->mCtrl;
-        mAlt                = action->mAlt;
+        mKey                = action->m_qaction->shortcut();
 
-        QString keyText = KeyboardShortcutsWindow::ConstructStringFromShortcut(mKey, mCtrl, mAlt);
+        QString keyText = KeyboardShortcutsWindow::ConstructStringFromShortcut(mKey);
 
         mLabel = new QLabel(keyText);
         mLabel->setAlignment(Qt::AlignHCenter);
@@ -431,9 +395,7 @@ namespace EMStudio
     // reset the shortcut to its default value
     void ShortcutReceiverDialog::ResetToDefault()
     {
-        mKey    = mOrgAction->mDefaultKey;
-        mCtrl   = mOrgAction->mDefaultCtrl;
-        mAlt    = mOrgAction->mDefaultAlt;
+        mKey    = mOrgAction->m_defaultKeySequence;
 
         UpdateInterface();
     }
@@ -444,10 +406,8 @@ namespace EMStudio
     {
         MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
 
-        QString keyText = KeyboardShortcutsWindow::ConstructStringFromShortcut(mKey, mCtrl, mAlt);
-
         // check if the currently assigned shortcut is already taken by another shortcut
-        mConflictAction = shortcutManager->FindShortcut(mKey, mCtrl, mAlt, mOrgGroup);
+        mConflictAction = shortcutManager->FindShortcut(mKey, mOrgGroup);
         if (mConflictAction == nullptr || mConflictAction == mOrgAction)
         {
             mOKButton->setToolTip("");
@@ -465,39 +425,25 @@ namespace EMStudio
 
             if (mConflictAction)
             {
-                AZStd::string tempString;
-
-                tempString = AZStd::string::format("Assigning new shortcut will unassign '%s' automatically.", mConflictAction->mName.c_str());
-                mOKButton->setToolTip(tempString.c_str());
+                mOKButton->setToolTip(QString("Assigning new shortcut will unassign '%1' automatically.").arg(mConflictAction->m_qaction->text()));
 
                 MysticQt::KeyboardShortcutManager::Group* conflictGroup = shortcutManager->FindGroupForShortcut(mConflictAction);
                 if (conflictGroup)
                 {
-                    tempString = AZStd::string::format("Conflicts with: %s -> %s", conflictGroup->GetName(), mConflictAction->mName.c_str());
+                    mConflictKeyLabel->setText(QString("Conflicts with: %1 -> %2").arg(FromStdString(conflictGroup->GetName())).arg(mConflictAction->m_qaction->text()));
                 }
                 else
                 {
-                    tempString = AZStd::string::format("Conflicts with: %s", mConflictAction->mName.c_str());
+                    mConflictKeyLabel->setText(QString("Conflicts with: %1").arg(mConflictAction->m_qaction->text()));
                 }
-
-                mConflictKeyLabel->setText(tempString.c_str());
             }
         }
 
         // adjust the label text to the new shortcut
+        const QString keyText = KeyboardShortcutsWindow::ConstructStringFromShortcut(mKey);
         mLabel->setText(keyText);
     }
 
-
-    // close dialog as soon as it lost focus
-    void ShortcutReceiverDialog::focusOutEvent(QFocusEvent* event)
-    {
-        MCORE_UNUSED(event);
-        //  if (event->reason() == Qt::ActiveWindowFocusReason)
-        //      reject();
-    }
-
-
     // called when the user pressed a new shortcut
     void ShortcutReceiverDialog::keyPressEvent(QKeyEvent* event)
     {
@@ -513,18 +459,12 @@ namespace EMStudio
 
         if (event->key() == Qt::Key_Escape)
         {
-            //mKey      = mOrgAction->mKey;
-            //mCtrl     = mOrgAction->mCtrl;
-            //mAlt      = mOrgAction->mAlt;
-
             // close the dialog when pressing ESC
             reject();
         }
         else
         {
-            mKey    = event->key();
-            mCtrl   = event->modifiers() & Qt::ControlModifier;
-            mAlt    = event->modifiers() & Qt::AltModifier;
+            mKey = event->key() | event->modifiers();
         }
 
         UpdateInterface();
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h
index 024479cc90..f6d4f43642 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h
@@ -41,12 +41,9 @@ namespace EMStudio
         virtual ~ShortcutReceiverDialog() {}
 
         void keyPressEvent(QKeyEvent* event) override;
-        void focusOutEvent(QFocusEvent* event) override;
         void UpdateInterface();
 
-        int                                         mKey;
-        bool                                        mCtrl;
-        bool                                        mAlt;
+        QKeySequence                                mKey;
         bool                                        mConflictDetected;
         MysticQt::KeyboardShortcutManager::Action*  mConflictAction;
 
@@ -74,7 +71,7 @@ namespace EMStudio
         void Init();
         void ReInit();
 
-        static QString ConstructStringFromShortcut(int key, bool ctrl, bool alt);
+        static QString ConstructStringFromShortcut(QKeySequence key);
         MysticQt::KeyboardShortcutManager::Group* GetCurrentGroup() const;
 
         void setVisible(bool visible) override;
@@ -95,6 +92,5 @@ namespace EMStudio
         ShortcutReceiverDialog*                     mShortcutReceiverDialog;
 
         void contextMenuEvent(QContextMenuEvent* event) override;
-        void hideEvent(QHideEvent* event) override;
     };
 } // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp
index 496b6b8e94..950b63ff26 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp
@@ -66,6 +66,7 @@
 #include <EMotionFX/Source/Importer/Importer.h>
 #include <EMotionFX/Source/MotionManager.h>
 #include <EMotionFX/Source/MotionSet.h>
+#include <qnamespace.h>
 AZ_PUSH_DISABLE_WARNING(4267, "-Wconversion")
 #include <ISystem.h>
 AZ_POP_DISABLE_WARNING
@@ -508,14 +509,33 @@ namespace EMStudio
         mShortcutManager = new MysticQt::KeyboardShortcutManager();
 
         // load the old shortcuts
-        QSettings shortcutSettings(AZStd::string(GetManager()->GetAppDataFolder() + "EMStudioKeyboardShortcuts.cfg").c_str(), QSettings::IniFormat, this);
-        mShortcutManager->Load(&shortcutSettings);
+        LoadKeyboardShortcuts();
 
         // add the application mode group
-        const char* layoutGroupName = "Layouts";
-        mShortcutManager->RegisterKeyboardShortcut("AnimGraph", layoutGroupName, Qt::Key_1, false, true, false);
-        mShortcutManager->RegisterKeyboardShortcut("Animation", layoutGroupName, Qt::Key_2, false, true, false);
-        mShortcutManager->RegisterKeyboardShortcut("Character", layoutGroupName, Qt::Key_3, false, true, false);
+        constexpr AZStd::string_view layoutGroupName = "Layouts";
+        QAction* animGraphLayoutAction = new QAction(
+            "AnimGraph",
+            this);
+        animGraphLayoutAction->setShortcut(Qt::Key_1 | Qt::AltModifier);
+        mShortcutManager->RegisterKeyboardShortcut(animGraphLayoutAction, layoutGroupName, false);
+        connect(animGraphLayoutAction, &QAction::triggered, [this]{ mApplicationMode->setCurrentIndex(0); });
+        addAction(animGraphLayoutAction);
+
+        QAction* animationLayoutAction = new QAction(
+            "Animation",
+            this);
+        animationLayoutAction->setShortcut(Qt::Key_2 | Qt::AltModifier);
+        mShortcutManager->RegisterKeyboardShortcut(animationLayoutAction, layoutGroupName, false);
+        connect(animationLayoutAction, &QAction::triggered, [this]{ mApplicationMode->setCurrentIndex(1); });
+        addAction(animationLayoutAction);
+
+        QAction* characterLayoutAction = new QAction(
+            "Character",
+            this);
+        characterLayoutAction->setShortcut(Qt::Key_1 | Qt::AltModifier);
+        mShortcutManager->RegisterKeyboardShortcut(characterLayoutAction, layoutGroupName, false);
+        connect(characterLayoutAction, &QAction::triggered, [this]{ mApplicationMode->setCurrentIndex(2); });
+        addAction(characterLayoutAction);
 
         EMotionFX::ActorEditorRequestBus::Handler::BusConnect();
 
@@ -1267,6 +1287,12 @@ namespace EMStudio
         mRecentActors.AddRecentFile(fileName.toUtf8().data());
     }
 
+    void MainWindow::LoadKeyboardShortcuts()
+    {
+        QSettings shortcutSettings(AZStd::string(GetManager()->GetAppDataFolder() + "EMStudioKeyboardShortcuts.cfg").c_str(), QSettings::IniFormat, this);
+        mShortcutManager->Load(&shortcutSettings);
+    }
+
     void MainWindow::LoadActor(const char* fileName, bool replaceCurrentScene)
     {
         // create the final command
@@ -2577,41 +2603,6 @@ namespace EMStudio
         QTimer::singleShot(0, this, &MainWindow::RaiseFloatingWidgets);
     }
 
-    void MainWindow::keyPressEvent(QKeyEvent* event)
-    {
-        const char* layoutGroupName = "Layouts";
-        const uint32 numLayouts = GetMainWindow()->GetNumLayouts();
-        for (uint32 i = 0; i < numLayouts; ++i)
-        {
-            if (mShortcutManager->Check(event, GetLayoutName(i), layoutGroupName))
-            {
-                mApplicationMode->setCurrentIndex(i);
-                event->accept();
-                return;
-            }
-        }
-
-        event->ignore();
-    }
-
-
-    void MainWindow::keyReleaseEvent(QKeyEvent* event)
-    {
-        const char* layoutGroupName = "Layouts";
-        const uint32 numLayouts = GetNumLayouts();
-        for (uint32 i = 0; i < numLayouts; ++i)
-        {
-            if (mShortcutManager->Check(event, layoutGroupName, GetLayoutName(i)))
-            {
-                event->accept();
-                return;
-            }
-        }
-
-        event->ignore();
-    }
-
-
     // get the name of the currently active layout
     const char* MainWindow::GetCurrentLayoutName() const
     {
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h
index 15edaef144..850715b23f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h
@@ -152,9 +152,6 @@ namespace EMStudio
         FileManager*        GetFileManager() const                              { return mFileManager; }
         PreferencesWindow*  GetPreferencesWindow() const                        { return mPreferencesWindow; }
 
-        void keyPressEvent(QKeyEvent* event) override;
-        void keyReleaseEvent(QKeyEvent* event) override;
-
         uint32 GetNumLayouts() const                                            { return mLayoutNames.GetLength(); }
         const char* GetLayoutName(uint32 index) const                           { return mLayoutNames[index].c_str(); }
         const char* GetCurrentLayoutName() const;
@@ -168,6 +165,8 @@ namespace EMStudio
 
         void AddRecentActorFile(const QString& fileName);
 
+        void LoadKeyboardShortcuts();
+
     public slots:
         void OnAutosaveTimeOut();
         void LoadLayoutAfterShow();
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp
index 214ed68367..ffe29ed691 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp
@@ -136,7 +136,6 @@ namespace EMStudio
         mActivePlugins.push_back(newPlugin);
 
         newPlugin->Init();
-        newPlugin->RegisterKeyboardShortcuts();
 
         return newPlugin;
     }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp
index 47b88b1fa2..8e4c1bce37 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp
@@ -1020,17 +1020,6 @@ namespace EMStudio
     }
 
 
-    // register keyboard shortcuts used for the render plugin
-    void RenderPlugin::RegisterKeyboardShortcuts()
-    {
-        MysticQt::KeyboardShortcutManager* shortcutManger = GetMainWindow()->GetShortcutManager();
-
-        shortcutManger->RegisterKeyboardShortcut("Show Selected", "Render Window", Qt::Key_S, false, false, true);
-        shortcutManger->RegisterKeyboardShortcut("Show Entire Scene", "Render Window", Qt::Key_A, false, false, true);
-        shortcutManger->RegisterKeyboardShortcut("Toggle Selection Box Rendering", "Render Window", Qt::Key_J, false, false, true);
-    }
-
-
     // find the trajectory path for a given actor instance
     MCommon::RenderUtil::TrajectoryTracePath* RenderPlugin::FindTracePath(EMotionFX::ActorInstance* actorInstance)
     {
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h
index 43f237b89e..7dab0a5f95 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h
@@ -124,9 +124,6 @@ namespace EMStudio
         void ViewCloseup(bool selectedInstancesOnly = true, RenderWidget* renderWidget = nullptr, float flightTime = DEFAULT_FLIGHT_TIME);
         void SetSkipFollowCalcs(bool skipFollowCalcs);
 
-        // keyboard shortcuts
-        void RegisterKeyboardShortcuts() override;
-
         // manipulators
         void ReInitTransformationManipulators();
         MCommon::TransformationManipulator* GetActiveManipulator(MCommon::Camera* camera, int32 mousePosX, int32 mousePosY);
@@ -177,6 +174,11 @@ namespace EMStudio
         void SaveRenderOptions();
         void LoadRenderOptions();
 
+        inline static constexpr AZStd::string_view s_renderWindowShortcutGroupName = "Render Window";
+        inline static constexpr AZStd::string_view s_showSelectedShortcutName = "Show Selected";
+        inline static constexpr AZStd::string_view s_showEntireSceneShortcutName = "Show Entire Scene";
+        inline static constexpr AZStd::string_view s_toggleSelectionBoxRenderingShortcutName = "Toggle Selection Box Rendering";
+
     public slots:
         void SetManipulatorMode(RenderOptions::ManipulatorMode mode);
         void SetSelectionMode() { SetManipulatorMode(RenderOptions::ManipulatorMode::SELECT); }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp
index f6c44980fe..9abb05ea2c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp
@@ -16,7 +16,9 @@
 #include "../PreferencesWindow.h"
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <EMotionFX/CommandSystem/Source/SelectionList.h>
+#include <EMotionFX/CommandSystem/Source/ActorInstanceCommands.h>
 #include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
+#include <MysticQt/Source/KeyboardShortcutManager.h>
 
 #include <QToolBar>
 
@@ -156,8 +158,17 @@ namespace EMStudio
             cameraMenu->addSeparator();
 
             cameraMenu->addAction("Reset Camera",      [this]() { this->OnResetCamera(); });
-            cameraMenu->addAction("Show Selected",     this, &RenderViewWidget::OnShowSelected);
-            cameraMenu->addAction("Show Entire Scene", this, &RenderViewWidget::OnShowEntireScene);
+
+            QAction* showSelectedAction = cameraMenu->addAction("Show Selected", this, &RenderViewWidget::OnShowSelected);
+            showSelectedAction->setShortcut(Qt::Key_S);
+            GetMainWindow()->GetShortcutManager()->RegisterKeyboardShortcut(showSelectedAction, RenderPlugin::s_renderWindowShortcutGroupName, true);
+            addAction(showSelectedAction);
+
+            QAction* showEntireSceneAction = cameraMenu->addAction("Show Entire Scene", this, &RenderViewWidget::OnShowEntireScene);
+            showEntireSceneAction->setShortcut(Qt::Key_A);
+            GetMainWindow()->GetShortcutManager()->RegisterKeyboardShortcut(showEntireSceneAction, RenderPlugin::s_renderWindowShortcutGroupName, true);
+            addAction(showEntireSceneAction);
+
             cameraMenu->addSeparator();
 
             mFollowCharacterAction = cameraMenu->addAction(tr("Follow Character"));
@@ -181,8 +192,30 @@ namespace EMStudio
         connect(m_manipulatorModes[RenderOptions::ROTATE], &QAction::triggered, mPlugin, &RenderPlugin::SetRotationMode);
         connect(m_manipulatorModes[RenderOptions::SCALE], &QAction::triggered, mPlugin, &RenderPlugin::SetScaleMode);
 
+        QAction* toggleSelectionBoxRendering = new QAction(
+            "Toggle Selection Box Rendering",
+            this
+        );
+        toggleSelectionBoxRendering->setShortcut(Qt::Key_J);
+        GetMainWindow()->GetShortcutManager()->RegisterKeyboardShortcut(toggleSelectionBoxRendering, RenderPlugin::s_renderWindowShortcutGroupName, true);
+        connect(toggleSelectionBoxRendering, &QAction::triggered, this, [this]
+        {
+            mPlugin->GetRenderOptions()->SetRenderSelectionBox(mPlugin->GetRenderOptions()->GetRenderSelectionBox() ^ true);
+        });
+        addAction(toggleSelectionBoxRendering);
+
+        QAction* deleteSelectedActorInstance = new QAction(
+            "Delete Selected Actor Instance",
+            this
+        );
+        deleteSelectedActorInstance->setShortcut(Qt::Key_Delete);
+        connect(deleteSelectedActorInstance, &QAction::triggered, []{ CommandSystem::RemoveSelectedActorInstances(); });
+        addAction(deleteSelectedActorInstance);
+
         Reset();
         UpdateInterface();
+
+        GetMainWindow()->LoadKeyboardShortcuts();
     }
 
     void RenderViewWidget::SetManipulatorMode(RenderOptions::ManipulatorMode mode)
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h
index 33b648f9c9..3ef48d0749 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h
@@ -43,6 +43,8 @@ namespace EMStudio
         RenderViewWidget(RenderPlugin* parentPlugin, QWidget* parentWidget);
         virtual ~RenderViewWidget();
 
+        void CreateActions();
+
         enum ERenderFlag
         {
             RENDER_SOLID                    = 0,
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp
index 6218194fc6..5ca912ef71 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp
@@ -25,7 +25,6 @@
 #include "../EMStudioManager.h"
 #include "../MainWindow.h"
 #include <MCore/Source/AzCoreConversions.h>
-#include <MysticQt/Source/KeyboardShortcutManager.h>
 
 
 namespace EMStudio
@@ -76,7 +75,6 @@ namespace EMStudio
         delete mAxisFakeCamera;
     }
 
-
     // start view closeup flight
     void RenderWidget::ViewCloseup(const MCore::AABB& aabb, float flightTime, uint32 viewCloseupWaiting)
     {
@@ -726,72 +724,6 @@ namespace EMStudio
     }
 
 
-    // called when a key got pressed
-    void RenderWidget::OnKeyPressEvent(QWidget* renderWidget, QKeyEvent* event)
-    {
-        MCORE_UNUSED(renderWidget);
-        MysticQt::KeyboardShortcutManager* shortcutManger = GetMainWindow()->GetShortcutManager();
-
-        if (shortcutManger->Check(event, "Show Selected", "Render Window"))
-        {
-            mPlugin->ViewCloseup(true, this);
-            event->accept();
-            return;
-        }
-
-        if (shortcutManger->Check(event, "Show Entire Scene", "Render Window"))
-        {
-            mPlugin->ViewCloseup(false, this);
-            event->accept();
-            return;
-        }
-
-        if (shortcutManger->Check(event, "Toggle Selection Box Rendering", "Render Window"))
-        {
-            mPlugin->GetRenderOptions()->SetRenderSelectionBox(mPlugin->GetRenderOptions()->GetRenderSelectionBox() ^ true);
-            event->accept();
-            return;
-        }
-
-        if (event->key() == Qt::Key_Delete)
-        {
-            CommandSystem::RemoveSelectedActorInstances();
-            event->accept();
-            return;
-        }
-
-        event->ignore();
-    }
-
-
-    // called when a key got released
-    void RenderWidget::OnKeyReleaseEvent(QWidget* renderWidget, QKeyEvent* event)
-    {
-        MCORE_UNUSED(renderWidget);
-        MysticQt::KeyboardShortcutManager* shortcutManger = GetMainWindow()->GetShortcutManager();
-
-        if (shortcutManger->Check(event, "Show Selected", "Render Window"))
-        {
-            event->accept();
-            return;
-        }
-
-        if (shortcutManger->Check(event, "Show Entire Scene", "Render Window"))
-        {
-            event->accept();
-            return;
-        }
-
-        if (event->key() == Qt::Key_Delete)
-        {
-            event->accept();
-            return;
-        }
-
-        event->ignore();
-    }
-
-
     // handles context menu events
     void RenderWidget::OnContextMenuEvent(QWidget* renderWidget, bool shiftPressed, bool altPressed, int32 localMouseX, int32 localMouseY, QPoint globalMousePos)
     {
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h
index f376f10f84..99c1c38f70 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h
@@ -96,6 +96,8 @@ namespace EMStudio
         RenderWidget(RenderPlugin* renderPlugin, RenderViewWidget* viewWidget);
         virtual ~RenderWidget();
 
+        void CreateActions();
+
         // main render callback
         virtual void Render() = 0;
         virtual void Update() = 0;
@@ -132,8 +134,6 @@ namespace EMStudio
         void OnMousePressEvent(QWidget* renderWidget, QMouseEvent* event);
         void OnMouseReleaseEvent(QWidget* renderWidget, QMouseEvent* event);
         void OnWheelEvent(QWidget* renderWidget, QWheelEvent* event);
-        void OnKeyPressEvent(QWidget* renderWidget, QKeyEvent* event);
-        void OnKeyReleaseEvent(QWidget* renderWidget, QKeyEvent* event);
         void OnContextMenuEvent(QWidget* renderWidget, bool shiftPressed, bool altPressed, int32 localMouseX, int32 localMouseY, QPoint globalMousePos);
 
     protected:
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp
index 4824821a61..28a4fb9c92 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp
@@ -21,6 +21,7 @@
 #include <EMotionFX/Source/Motion.h>
 #include <EMotionFX/Source/EMotionFXManager.h>
 #include <EMotionFX/CommandSystem/Source/CommandManager.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 
 #include <QSettings>
 #include <QGridLayout>
@@ -398,33 +399,49 @@ namespace EMStudio
         const size_t numDirtyFiles = dirtyFileNames.size();
         mTableWidget->setRowCount(static_cast<int>(numDirtyFiles));
 
-        AZStd::string extension, typeString, filenameText, path, filenameOnly;
         for (size_t i = 0; i < numDirtyFiles; ++i)
         {
             SaveDirtyFilesCallback::ObjectPointer object = mObjects[i];
 
+            QString labelText;
             if (dirtyFileNames[i].empty())
             {
-                filenameText = "<not saved yet>";
+                labelText = "<not saved yet>";
             }
             else
             {
-                AzFramework::StringFunc::Path::GetFullPath(dirtyFileNames[i].c_str(), path);
-                AzFramework::StringFunc::Path::GetFullFileName(dirtyFileNames[i].c_str(), filenameOnly);
-
-                filenameText = AZStd::string::format("<qt>%s<b>%s</b></qt>", path.c_str(), filenameOnly.c_str());
+                const AZStd::string& productFilename = dirtyFileNames[i];
+
+                // Get the asset source name from the product filename.
+                bool sourceAssetFound = false;
+                AZStd::string sourceAssetFilename;
+                AzToolsFramework::AssetSystemRequestBus::BroadcastResult(sourceAssetFound,
+                    &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath,
+                    productFilename,
+                    sourceAssetFilename);
+
+                const AZStd::string usedFilename = sourceAssetFound ? sourceAssetFilename : dirtyFileNames[i];
+
+                // Separate the path from the filename, so that we can display the filename in bold.
+                AZStd::string fullPath;
+                AzFramework::StringFunc::Path::GetFullPath(usedFilename.c_str(), fullPath);
+                AzFramework::StringFunc::RelativePath::Normalize(fullPath); // Add trailing slash in case it is missing
+                AZStd::string fullFilename;
+                AzFramework::StringFunc::Path::GetFullFileName(usedFilename.c_str(), fullFilename);
+                labelText = QString("<qt>%1<b>%2</b></qt>").arg(fullPath.c_str(), fullFilename.c_str());
             }
 
             // create the checkbox
             QCheckBox* checkbox = new QCheckBox("");
-            checkbox->setStyleSheet("background: transparent; padding-left: 3px; max-width: 13px;");
+            checkbox->setStyleSheet("background: transparent;");
             checkbox->setChecked(true);
 
             // create the filename table item
             QLabel* filenameLabel = new QLabel();
-            filenameLabel->setToolTip(filenameText.c_str());
-            filenameLabel->setText(filenameText.c_str());
+            filenameLabel->setToolTip(labelText);
+            filenameLabel->setText(labelText);
 
+            QString typeString;
             if (object.mMotion)
             {
                 typeString = "Motion";
@@ -445,12 +462,8 @@ namespace EMStudio
             {
                 typeString = "Workspace";
             }
-            else
-            {
-                typeString = "";
-            }
 
-            QTableWidgetItem* itemType = new QTableWidgetItem(typeString.c_str());
+            QTableWidgetItem* itemType = new QTableWidgetItem(typeString);
             const int row = static_cast<int>(i);
             itemType->setData(Qt::UserRole, row);
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
index 107869de33..c81d7c61ae 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
@@ -72,8 +72,6 @@ namespace EMStudio
         void mousePressEvent(QMouseEvent* event)                { RenderWidget::OnMousePressEvent(this, event); }
         void mouseReleaseEvent(QMouseEvent* event)              { RenderWidget::OnMouseReleaseEvent(this, event); }
         void wheelEvent(QWheelEvent* event)                     { RenderWidget::OnWheelEvent(this, event); }
-        void keyPressEvent(QKeyEvent* event)                    { RenderWidget::OnKeyPressEvent(this, event); }
-        void keyReleaseEvent(QKeyEvent* event)                  { RenderWidget::OnKeyReleaseEvent(this, event); }
 
         void focusInEvent(QFocusEvent* event);
         void focusOutEvent(QFocusEvent* event);
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp
index 9cbd654393..f76f684ea5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp
@@ -99,7 +99,7 @@ namespace EMStudio
         }
         if (!m_pasteItems.empty())
         {
-            m_pasteOperation = PasteOperation::Copy;
+            SetPasteOperation(PasteOperation::Copy);
         }
     }
 
@@ -126,7 +126,7 @@ namespace EMStudio
         }
         if (!m_pasteItems.empty())
         {
-            m_pasteOperation = PasteOperation::Cut;
+            SetPasteOperation(PasteOperation::Cut);
         }
     }
 
@@ -168,8 +168,8 @@ namespace EMStudio
             }
         }
 
-        m_pasteOperation = PasteOperation::None;
         m_pasteItems.clear();
+        SetPasteOperation(PasteOperation::None);
     }
     
     void AnimGraphActionManager::SetEntryState()
@@ -443,6 +443,18 @@ namespace EMStudio
         }
     }
 
+    void AnimGraphActionManager::NavigateToParent()
+    {
+        const QModelIndex parentFocus = m_plugin->GetAnimGraphModel().GetParentFocus();
+        if (parentFocus.isValid())
+        {
+            QModelIndex newParentFocus = parentFocus.model()->parent(parentFocus);
+            if (newParentFocus.isValid())
+            {
+                m_plugin->GetAnimGraphModel().Focus(newParentFocus);
+            }
+        }
+    }
 
     void AnimGraphActionManager::OpenReferencedAnimGraph(EMotionFX::AnimGraphReferenceNode* referenceNode)
     {
@@ -678,4 +690,10 @@ namespace EMStudio
             GetCommandManager()->ExecuteCommandGroup(commandGroup, outResult);
         }
     }
+
+    void AnimGraphActionManager::SetPasteOperation(PasteOperation newOperation)
+    {
+        m_pasteOperation = newOperation;
+        emit PasteStateChanged();
+    }
 } // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h
index 30b520d2a5..9182272875 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h
@@ -72,6 +72,9 @@ namespace EMStudio
             Bottom
         };
 
+    signals:
+        void PasteStateChanged();
+
     public slots:
         void Copy();
         void Cut();
@@ -95,6 +98,7 @@ namespace EMStudio
         void DeleteSelectedNodes();
 
         void NavigateToNode();
+        void NavigateToParent();
 
         void OpenReferencedAnimGraph(EMotionFX::AnimGraphReferenceNode* referenceNode);
 
@@ -126,5 +130,7 @@ namespace EMStudio
         AnimGraphPlugin* m_plugin;
         AZStd::vector<QPersistentModelIndex> m_pasteItems;
         PasteOperation m_pasteOperation;
+
+        void SetPasteOperation(PasteOperation newOperation);
     };
 } // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
index 2669153dfd..d9b77ccf89 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
@@ -461,10 +461,7 @@ namespace EMStudio
     {
         m_actionFilter = actionFilter;
 
-        if (mViewWidget)
-        {
-            mViewWidget->UpdateSelection();
-        }
+        emit ActionFilterChanged();
     }
 
     const AnimGraphActionFilter& AnimGraphPlugin::GetActionFilter() const
@@ -1408,33 +1405,6 @@ namespace EMStudio
     }
 
 
-    // register keyboard shortcuts used for the render plugin
-    void AnimGraphPlugin::RegisterKeyboardShortcuts()
-    {
-        MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
-
-        shortcutManager->RegisterKeyboardShortcut("Fit Entire Graph", "Anim Graph Window", Qt::Key_A, false, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Zoom On Selected Nodes", "Anim Graph Window", Qt::Key_Z, false, false, true);
-
-        shortcutManager->RegisterKeyboardShortcut("Open Parent Node", "Anim Graph Window", Qt::Key_Up, false, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Open Selected Node", "Anim Graph Window", Qt::Key_Down, false, false, true);
-        shortcutManager->RegisterKeyboardShortcut("History Back", "Anim Graph Window", Qt::Key_Left, false, false, true);
-        shortcutManager->RegisterKeyboardShortcut("History Forward", "Anim Graph Window", Qt::Key_Right, false, false, true);
-
-        shortcutManager->RegisterKeyboardShortcut("Align Left", "Anim Graph Window", Qt::Key_L, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Align Right", "Anim Graph Window", Qt::Key_R, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Align Top", "Anim Graph Window", Qt::Key_T, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Align Bottom", "Anim Graph Window", Qt::Key_B, true, false, true);
-
-        shortcutManager->RegisterKeyboardShortcut("Cut", "Anim Graph Window", Qt::Key_X, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Copy", "Anim Graph Window", Qt::Key_C, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Paste", "Anim Graph Window", Qt::Key_V, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Select All", "Anim Graph Window", Qt::Key_A, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Unselect All", "Anim Graph Window", Qt::Key_D, true, false, true);
-        shortcutManager->RegisterKeyboardShortcut("Delete Selected Nodes", "Anim Graph Window", Qt::Key_Delete, false, false, true);
-    }
-
-
     // double clicked a node history item in the timeview plugin
     void AnimGraphPlugin::OnDoubleClickedRecorderNodeHistoryItem(EMotionFX::Recorder::ActorInstanceData* actorInstanceData, EMotionFX::Recorder::NodeHistoryItem* historyItem)
     {
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
index c1e2004aae..cb8e015429 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
@@ -49,7 +49,6 @@ namespace EMotionFX
     class AnimGraphObjectFactory;
 }
 
-
 namespace EMStudio
 {
     // forward declarations
@@ -151,8 +150,6 @@ namespace EMStudio
         void LoadOptions();
         void SaveOptions();
 
-        void RegisterKeyboardShortcuts() override;
-
         bool CheckIfCanCreateObject(EMotionFX::AnimGraphObject* parentObject, const EMotionFX::AnimGraphObject* object, EMotionFX::AnimGraphObject::ECategory category) const;
 
         void ProcessFrame(float timePassedInSeconds) override;
@@ -171,6 +168,27 @@ namespace EMStudio
         /// Is the given anim graph running on any selected actor instance?
         bool IsAnimGraphActive(EMotionFX::AnimGraph* animGraph) const;
 
+        inline static constexpr AZStd::string_view s_animGraphWindowShortcutGroupName = "Anim Graph Window";
+        inline static constexpr AZStd::string_view s_fitEntireGraphShortcutName = "Fit Entire Graph";
+        inline static constexpr AZStd::string_view s_zoomOnSelectedNodesShortcutName = "Zoom On Selected Nodes";
+        inline static constexpr AZStd::string_view s_openParentNodeShortcutName = "Open Parent Node";
+        inline static constexpr AZStd::string_view s_openSelectedNodeShortcutName = "Open Selected Node";
+        inline static constexpr AZStd::string_view s_historyBackShortcutName = "History Back";
+        inline static constexpr AZStd::string_view s_historyForwardShortcutName = "History Forward";
+        inline static constexpr AZStd::string_view s_alignLeftShortcutName = "Align Left";
+        inline static constexpr AZStd::string_view s_alignRightShortcutName = "Align Right";
+        inline static constexpr AZStd::string_view s_alignTopShortcutName = "Align Top";
+        inline static constexpr AZStd::string_view s_alignBottomShortcutName = "Align Bottom";
+        inline static constexpr AZStd::string_view s_cutShortcutName = "Cut";
+        inline static constexpr AZStd::string_view s_copyShortcutName = "Copy";
+        inline static constexpr AZStd::string_view s_pasteShortcutName = "Paste";
+        inline static constexpr AZStd::string_view s_selectAllShortcutName = "Select All";
+        inline static constexpr AZStd::string_view s_unselectAllShortcutName = "Unselect All";
+        inline static constexpr AZStd::string_view s_deleteSelectedNodesShortcutName = "Delete Selected Nodes";
+
+    signals:
+        void ActionFilterChanged();
+
     public slots:
         void OnFileOpen();
         void OnFileSave();
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp
index 4203271b58..eccabd37b5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp
@@ -26,6 +26,7 @@
 #include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.h>
 #include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.h>
 #include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.h>
+#include <MysticQt/Source/KeyboardShortcutManager.h>
 #include <Editor/AnimGraphEditorBus.h>
 #include <QKeyEvent>
 #include <QPushButton>
@@ -40,74 +41,298 @@ namespace EMStudio
         : QWidget(parentWidget)
         , m_parentPlugin(plugin)
     {
-        for (uint32 i = 0; i < NUM_OPTIONS; ++i)
+        EMotionFX::ActorEditorRequestBus::Handler::BusConnect();
+    }
+
+    void BlendGraphViewWidget::CreateActions()
+    {
+        MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
+
+        m_actions[SELECTION_ALIGNLEFT] = new QAction(
+            QIcon(":/EMotionFX/AlignLeft.svg"),
+            FromStdString(AnimGraphPlugin::s_alignLeftShortcutName),
+            this);
+        m_actions[SELECTION_ALIGNLEFT]->setShortcut(Qt::Key_L | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNLEFT], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[SELECTION_ALIGNLEFT], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignLeft);
+
+        m_actions[SELECTION_ALIGNRIGHT] = new QAction(
+            QIcon(":/EMotionFX/AlignRight.svg"),
+            FromStdString(AnimGraphPlugin::s_alignRightShortcutName),
+            this);
+        m_actions[SELECTION_ALIGNRIGHT]->setShortcut(Qt::Key_R | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNRIGHT], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[SELECTION_ALIGNRIGHT], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignRight);
+
+        m_actions[SELECTION_ALIGNTOP] = new QAction(
+            QIcon(":/EMotionFX/AlignTop.svg"),
+            FromStdString(AnimGraphPlugin::s_alignTopShortcutName),
+            this);
+        m_actions[SELECTION_ALIGNTOP]->setShortcut(Qt::Key_T | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNTOP], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[SELECTION_ALIGNTOP], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignTop);
+
+        m_actions[SELECTION_ALIGNBOTTOM] = new QAction(
+            QIcon(":/EMotionFX/AlignBottom.svg"),
+            FromStdString(AnimGraphPlugin::s_alignBottomShortcutName),
+            this);
+        m_actions[SELECTION_ALIGNBOTTOM]->setShortcut(Qt::Key_B | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNBOTTOM], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[SELECTION_ALIGNBOTTOM], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignBottom);
+
+        m_actions[SELECTION_SELECTALL] = new QAction(
+            FromStdString(AnimGraphPlugin::s_selectAllShortcutName),
+            this
+        );
+        m_actions[SELECTION_SELECTALL]->setShortcut(Qt::Key_A | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_SELECTALL], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[SELECTION_SELECTALL], &QAction::triggered, [this]
+        {
+            NodeGraph* activeGraph = m_parentPlugin->GetGraphWidget()->GetActiveGraph();
+            if (activeGraph)
+            {
+                activeGraph->SelectAllNodes();
+            }
+        });
+
+        m_actions[SELECTION_UNSELECTALL] = new QAction(
+            FromStdString(AnimGraphPlugin::s_unselectAllShortcutName),
+            this
+        );
+        m_actions[SELECTION_UNSELECTALL]->setShortcut(Qt::Key_D | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_UNSELECTALL], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[SELECTION_UNSELECTALL], &QAction::triggered, [this]
+        {
+            NodeGraph* activeGraph = m_parentPlugin->GetGraphWidget()->GetActiveGraph();
+            if (activeGraph)
+            {
+                activeGraph->UnselectAllNodes();
+            }
+        });
+
+        m_actions[FILE_NEW] = new QAction(
+            QIcon(":/EMotionFX/Plus.svg"),
+            tr("Create a new anim graph"),
+            this);
+        m_actions[FILE_NEW]->setObjectName("EMFX.BlendGraphViewWidget.NewButton");
+        connect(m_actions[FILE_NEW], &QAction::triggered, this, &BlendGraphViewWidget::OnCreateAnimGraph);
+
+        m_actions[FILE_OPEN] = new QAction(
+            tr("Open..."),
+            this);
+        connect(m_actions[FILE_OPEN], &QAction::triggered, m_parentPlugin, &AnimGraphPlugin::OnFileOpen);
+
+        m_actions[FILE_SAVE] = new QAction(
+            tr("Save"),
+            this);
+        connect(m_actions[FILE_SAVE], &QAction::triggered, m_parentPlugin, &AnimGraphPlugin::OnFileSave);
+
+        m_actions[FILE_SAVEAS] = new QAction(
+            tr("Save as..."),
+            this);
+        connect(m_actions[FILE_SAVEAS], &QAction::triggered, m_parentPlugin, &AnimGraphPlugin::OnFileSaveAs);
+
+        m_actions[NAVIGATION_FORWARD] = new QAction(
+            QIcon(":/EMotionFX/Forward.svg"),
+            FromStdString(AnimGraphPlugin::s_historyForwardShortcutName),
+            this);
+        m_actions[NAVIGATION_FORWARD]->setShortcut(Qt::Key_Right);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[NAVIGATION_FORWARD], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[NAVIGATION_FORWARD], &QAction::triggered, [this]
+        {
+            m_parentPlugin->GetNavigationHistory()->StepForward();
+            UpdateNavigation();
+        });
+
+        m_actions[NAVIGATION_BACK] = new QAction(
+            QIcon(":/EMotionFX/Backward.svg"),
+            FromStdString(AnimGraphPlugin::s_historyBackShortcutName),
+            this);
+        m_actions[NAVIGATION_BACK]->setShortcut(Qt::Key_Left);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[NAVIGATION_BACK], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[NAVIGATION_BACK], &QAction::triggered, [this]
+        {
+            m_parentPlugin->GetNavigationHistory()->StepBackward();
+            UpdateNavigation();
+        });
+
+        m_actions[NAVIGATION_NAVPANETOGGLE] = new QAction(
+            QIcon(":/EMotionFX/List.svg"),
+            tr("Show/hide navigation pane"),
+            this);
+        connect(m_actions[NAVIGATION_NAVPANETOGGLE], &QAction::triggered, this, &BlendGraphViewWidget::ToggleNavigationPane);
+
+        m_actions[NAVIGATION_OPEN_SELECTED] = new QAction(
+            FromStdString(AnimGraphPlugin::s_openSelectedNodeShortcutName),
+            this);
+        m_actions[NAVIGATION_OPEN_SELECTED]->setShortcut(Qt::Key_Down);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[NAVIGATION_OPEN_SELECTED], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[NAVIGATION_OPEN_SELECTED], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::NavigateToNode);
+
+        m_actions[NAVIGATION_TO_PARENT] = new QAction(
+            FromStdString(AnimGraphPlugin::s_openParentNodeShortcutName),
+            this);
+        m_actions[NAVIGATION_TO_PARENT]->setShortcut(Qt::Key_Up);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[NAVIGATION_TO_PARENT], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[NAVIGATION_TO_PARENT], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::NavigateToParent);
+
+        m_actions[NAVIGATION_FRAME_ALL] = new QAction(
+            QIcon(":/EMotionFX/ZoomSelected.svg"),
+            FromStdString(AnimGraphPlugin::s_fitEntireGraphShortcutName),
+            this);
+        m_actions[NAVIGATION_FRAME_ALL]->setShortcut(Qt::Key_A);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[NAVIGATION_FRAME_ALL], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[NAVIGATION_FRAME_ALL], &QAction::triggered, this, &BlendGraphViewWidget::ZoomToAll);
+
+        m_actions[NAVIGATION_ZOOMSELECTION] = new QAction(
+            QIcon(":/EMotionFX/ZoomSelected.svg"),
+            FromStdString(AnimGraphPlugin::s_zoomOnSelectedNodesShortcutName),
+            this);
+        m_actions[NAVIGATION_ZOOMSELECTION]->setShortcut(Qt::Key_Z);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[NAVIGATION_ZOOMSELECTION], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[NAVIGATION_ZOOMSELECTION], &QAction::triggered, this, &BlendGraphViewWidget::ZoomSelected);
+
+        m_actions[ACTIVATE_ANIMGRAPH] = new QAction(
+            QIcon(":/EMotionFX/PlayForward.svg"),
+            tr("Activate Animgraph/State"),
+            this);
+        connect(m_actions[ACTIVATE_ANIMGRAPH], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::ActivateAnimGraph);
+
+        m_actions[VISUALIZATION_PLAYSPEEDS] = new QAction(
+            tr("Display Play Speeds"),
+            this);
+        m_actions[VISUALIZATION_PLAYSPEEDS]->setCheckable(true);
+        connect(m_actions[VISUALIZATION_PLAYSPEEDS], &QAction::triggered, this, &BlendGraphViewWidget::OnDisplayPlaySpeeds);
+
+        m_actions[VISUALIZATION_GLOBALWEIGHTS] = new QAction(
+            tr("Display Global Weights"),
+            this);
+        m_actions[VISUALIZATION_GLOBALWEIGHTS]->setCheckable(true);
+        connect(m_actions[VISUALIZATION_GLOBALWEIGHTS], &QAction::triggered, this, &BlendGraphViewWidget::OnDisplayGlobalWeights);
+
+        m_actions[VISUALIZATION_SYNCSTATUS] = new QAction(
+            tr("Display Sync Status"),
+            this);
+        m_actions[VISUALIZATION_SYNCSTATUS]->setCheckable(true);
+        connect(m_actions[VISUALIZATION_SYNCSTATUS], &QAction::triggered, this, &BlendGraphViewWidget::OnDisplaySyncStatus);
+
+        m_actions[VISUALIZATION_PLAYPOSITIONS] = new QAction(
+            tr("Display Play Positions"),
+            this);
+        m_actions[VISUALIZATION_PLAYPOSITIONS]->setCheckable(true);
+        connect(m_actions[VISUALIZATION_PLAYPOSITIONS], &QAction::triggered, this, &BlendGraphViewWidget::OnDisplayPlayPositions);
+
+        m_actions[EDIT_CUT] = new QAction(
+            FromStdString(AnimGraphPlugin::s_cutShortcutName),
+            this
+        );
+        m_actions[EDIT_CUT]->setShortcut(Qt::Key_X | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[EDIT_CUT], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[EDIT_CUT], &QAction::triggered, this, [this]
+        {
+            m_parentPlugin->GetActionManager().Cut();
+        });
+
+        m_actions[EDIT_COPY] = new QAction(
+            FromStdString(AnimGraphPlugin::s_copyShortcutName),
+            this
+        );
+        m_actions[EDIT_COPY]->setShortcut(Qt::Key_C | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[EDIT_COPY], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[EDIT_COPY], &QAction::triggered, this, [this]
+        {
+            m_parentPlugin->GetActionManager().Copy();
+        });
+
+        m_actions[EDIT_PASTE] = new QAction(
+            FromStdString(AnimGraphPlugin::s_pasteShortcutName),
+            this
+        );
+        m_actions[EDIT_PASTE]->setShortcut(Qt::Key_V | Qt::ControlModifier);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[EDIT_PASTE], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[EDIT_PASTE], &QAction::triggered, this, [this]
+        {
+            const BlendGraphWidget* graphWidget = m_parentPlugin->GetGraphWidget();
+            const NodeGraph* activeGraph = graphWidget->GetActiveGraph();
+            if (!activeGraph)
+            {
+                return;
+            }
+            const QPoint pastePosition = graphWidget->underMouse()
+                ? graphWidget->SnapLocalToGrid(graphWidget->LocalToGlobal(graphWidget->mapFromGlobal(QCursor::pos())))
+                : graphWidget->SnapLocalToGrid(graphWidget->LocalToGlobal(graphWidget->rect().center()));
+            m_parentPlugin->GetActionManager().Paste(activeGraph->GetModelIndex(), pastePosition);
+        });
+
+        m_actions[EDIT_DELETE] = new QAction(
+            FromStdString(AnimGraphPlugin::s_deleteSelectedNodesShortcutName),
+            this
+        );
+        m_actions[EDIT_DELETE]->setShortcut(Qt::Key_Delete);
+        shortcutManager->RegisterKeyboardShortcut(m_actions[EDIT_DELETE], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
+        connect(m_actions[EDIT_DELETE], &QAction::triggered, this, [this]
         {
-            m_actions[i] = nullptr;
+            m_parentPlugin->GetGraphWidget()->DeleteSelectedItems();
+        });
+
+        for (QAction* action : m_actions)
+        {
+            addAction(action);
         }
 
-        EMotionFX::ActorEditorRequestBus::Handler::BusConnect();
+        GetMainWindow()->LoadKeyboardShortcuts();
     }
 
     QToolBar* BlendGraphViewWidget::CreateTopToolBar()
     {
         QToolBar* toolBar = new QToolBar(this);
         toolBar->setObjectName("EMFX.BlendGraphViewWidget.TopToolBar");
-        // Create new anim graph
-        {
-            QAction* action = toolBar->addAction(QIcon(":/EMotionFX/Plus.svg"),
-                tr("Create a new anim graph"),
-                this, &BlendGraphViewWidget::OnCreateAnimGraph);
-            action->setObjectName("EMFX.BlendGraphViewWidget.NewButton");
-            
-            //action->setShortcut(QKeySequence::New);
-            m_actions[FILE_NEW] = action;
-        }
+
+        toolBar->addAction(m_actions[FILE_NEW]);
 
         // Open anim graph
         {
-            QAction* action = toolBar->addAction(
+            m_openMenu = new QMenu(this);
+            connect(m_openMenu, &QMenu::aboutToShow, this, &BlendGraphViewWidget::BuildOpenMenu);
+
+            QAction* action = new QAction(
                 QIcon(":/EMotionFX/Open.svg"),
-                tr("Open anim graph asset"));
-            m_actions[FILE_OPEN] = action;
+                tr("Open"));
+            action->setMenu(m_openMenu);
 
-            QToolButton* toolButton = qobject_cast<QToolButton*>(toolBar->widgetForAction(action));
-            AZ_Assert(toolButton, "The action widget must be a tool button.");
-            toolButton->setPopupMode(QToolButton::InstantPopup);
+            QToolButton* button = new QToolButton();
+            button->setDefaultAction(action);
+            button->setPopupMode(QToolButton::InstantPopup);
 
-            m_openMenu = new QMenu(toolBar);
-            action->setMenu(m_openMenu);
-            BuildOpenMenu();
-            connect(m_openMenu, &QMenu::aboutToShow, this, &BlendGraphViewWidget::BuildOpenMenu);
+            toolBar->addWidget(button);
         }
 
+
         // Save anim graph
         {
-            QAction* saveMenuAction = toolBar->addAction(
+            QMenu* contextMenu = new QMenu(toolBar);
+            contextMenu->addAction(m_actions[FILE_SAVE]);
+            contextMenu->addAction(m_actions[FILE_SAVEAS]);
+
+            QAction* saveMenuAction = new QAction(
                 QIcon(":/EMotionFX/Save.svg"),
                 tr("Save anim graph"));
+            saveMenuAction->setMenu(contextMenu);
 
-            QToolButton* toolButton = qobject_cast<QToolButton*>(toolBar->widgetForAction(saveMenuAction));
-            AZ_Assert(toolButton, "The action widget must be a tool button.");
-            toolButton->setPopupMode(QToolButton::InstantPopup);
-
-            QMenu* contextMenu = new QMenu(toolBar);
-
-            m_actions[FILE_SAVE] = contextMenu->addAction(tr("Save"), m_parentPlugin, &AnimGraphPlugin::OnFileSave);
-            m_actions[FILE_SAVEAS] = contextMenu->addAction(tr("Save as..."), m_parentPlugin, &AnimGraphPlugin::OnFileSaveAs);
+            QToolButton* button = new QToolButton();
+            button->setDefaultAction(saveMenuAction);
+            button->setPopupMode(QToolButton::InstantPopup);
 
-            saveMenuAction->setMenu(contextMenu);
+            toolBar->addWidget(button);
         }
 
         toolBar->addSeparator();
 
-        m_actions[ACTIVATE_ANIMGRAPH] = toolBar->addAction(QIcon(":/EMotionFX/PlayForward.svg"),
-            tr("Activate Animgraph/State"),
-            &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::ActivateAnimGraph);
+        toolBar->addAction(m_actions[ACTIVATE_ANIMGRAPH]);
+
         toolBar->addSeparator();
 
-        m_actions[SELECTION_ZOOMSELECTION] = toolBar->addAction(QIcon(":/EMotionFX/ZoomSelected.svg"),
-            tr("Zoom Selection"),
-            this, &BlendGraphViewWidget::ZoomSelected);
+        toolBar->addAction(m_actions[NAVIGATION_ZOOMSELECTION]);
 
         // Visualization options
         {
@@ -121,15 +346,10 @@ namespace EMStudio
 
             QMenu* contextMenu = new QMenu(toolBar);
 
-            m_actions[VISUALIZATION_PLAYSPEEDS] = contextMenu->addAction(tr("Display Play Speeds"), this, &BlendGraphViewWidget::OnDisplayPlaySpeeds);
-            m_actions[VISUALIZATION_GLOBALWEIGHTS] = contextMenu->addAction(tr("Display Global Weights"), this, &BlendGraphViewWidget::OnDisplayGlobalWeights);
-            m_actions[VISUALIZATION_SYNCSTATUS] = contextMenu->addAction(tr("Display Sync Status"), this, &BlendGraphViewWidget::OnDisplaySyncStatus);
-            m_actions[VISUALIZATION_PLAYPOSITIONS] = contextMenu->addAction(tr("Display Play Positions"), this, &BlendGraphViewWidget::OnDisplayPlayPositions);
-
-            m_actions[VISUALIZATION_PLAYSPEEDS]->setCheckable(true);
-            m_actions[VISUALIZATION_GLOBALWEIGHTS]->setCheckable(true);
-            m_actions[VISUALIZATION_SYNCSTATUS]->setCheckable(true);
-            m_actions[VISUALIZATION_PLAYPOSITIONS]->setCheckable(true);
+            contextMenu->addAction(m_actions[VISUALIZATION_PLAYSPEEDS]);
+            contextMenu->addAction(m_actions[VISUALIZATION_GLOBALWEIGHTS]);
+            contextMenu->addAction(m_actions[VISUALIZATION_SYNCSTATUS]);
+            contextMenu->addAction(m_actions[VISUALIZATION_PLAYPOSITIONS]);
 
             menuAction->setMenu(contextMenu);
         }
@@ -137,21 +357,10 @@ namespace EMStudio
         toolBar->addSeparator();
 
         // Alignment Options
-        m_actions[SELECTION_ALIGNLEFT] = toolBar->addAction(QIcon(":/EMotionFX/AlignLeft.svg"),
-            tr("Align left"),
-            &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignLeft);
-
-        m_actions[SELECTION_ALIGNRIGHT] = toolBar->addAction(QIcon(":/EMotionFX/AlignRight.svg"),
-            tr("Align right"),
-            &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignRight);
-
-        m_actions[SELECTION_ALIGNTOP] = toolBar->addAction(QIcon(":/EMotionFX/AlignTop.svg"),
-            tr("Align top"),
-            &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignTop);
-
-        m_actions[SELECTION_ALIGNBOTTOM] = toolBar->addAction(QIcon(":/EMotionFX/AlignBottom.svg"),
-            tr("Align bottom"),
-            &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignBottom);
+        toolBar->addAction(m_actions[SELECTION_ALIGNLEFT]);
+        toolBar->addAction(m_actions[SELECTION_ALIGNRIGHT]);
+        toolBar->addAction(m_actions[SELECTION_ALIGNTOP]);
+        toolBar->addAction(m_actions[SELECTION_ALIGNBOTTOM]);
 
         return toolBar;
     }
@@ -160,27 +369,15 @@ namespace EMStudio
     {
         QToolBar* toolBar = new QToolBar(this);
 
-        m_actions[NAVIGATION_BACK] = toolBar->addAction(QIcon(":/EMotionFX/Backward.svg"),
-            tr("Back"),
-            this, [=] {
-                m_parentPlugin->GetNavigationHistory()->StepBackward();
-                UpdateNavigation();
-            });
+        toolBar->addAction(m_actions[NAVIGATION_BACK]);
 
-        m_actions[NAVIGATION_FORWARD] = toolBar->addAction(QIcon(":/EMotionFX/Forward.svg"),
-            tr("Forward"),
-            this, [=] {
-                m_parentPlugin->GetNavigationHistory()->StepForward();
-                UpdateNavigation();
-            });
+        toolBar->addAction(m_actions[NAVIGATION_FORWARD]);
 
         mNavigationLink = new NavigationLinkWidget(m_parentPlugin, this);
         mNavigationLink->setMinimumHeight(28);
         toolBar->addWidget(mNavigationLink);
 
-        m_actions[NAVIGATION_NAVPANETOGGLE] = toolBar->addAction(QIcon(":/EMotionFX/List.svg"),
-            tr("Show/hide navigation pane"),
-            this, &BlendGraphViewWidget::ToggleNavigationPane);
+        toolBar->addAction(m_actions[NAVIGATION_NAVPANETOGGLE]);
 
         return toolBar;
     }
@@ -188,8 +385,11 @@ namespace EMStudio
     void BlendGraphViewWidget::Init(BlendGraphWidget* blendGraphWidget)
     {
         connect(&m_parentPlugin->GetAnimGraphModel(), &AnimGraphModel::FocusChanged, this, &BlendGraphViewWidget::OnFocusChanged);
-        connect(&m_parentPlugin->GetAnimGraphModel().GetSelectionModel(), &QItemSelectionModel::selectionChanged, this, &BlendGraphViewWidget::UpdateSelection);
+        connect(&m_parentPlugin->GetAnimGraphModel().GetSelectionModel(), &QItemSelectionModel::selectionChanged, this, &BlendGraphViewWidget::UpdateEnabledActions);
         connect(m_parentPlugin->GetNavigationHistory(), &NavigationHistory::ChangedSteppingLimits, this, &BlendGraphViewWidget::UpdateNavigation);
+        connect(m_parentPlugin->GetGraphWidget(), &NodeGraphWidget::ActiveGraphChanged, this, &BlendGraphViewWidget::UpdateEnabledActions);
+        connect(m_parentPlugin, &AnimGraphPlugin::ActionFilterChanged, this, &BlendGraphViewWidget::UpdateEnabledActions);
+        connect(&m_parentPlugin->GetActionManager(), &AnimGraphActionManager::PasteStateChanged, this, &BlendGraphViewWidget::UpdateEnabledActions);
 
         // create the vertical layout with the menu and the graph widget as entries
         QVBoxLayout* verticalLayout = new QVBoxLayout(this);
@@ -198,6 +398,7 @@ namespace EMStudio
         verticalLayout->setMargin(2);
 
         // Create toolbars
+        CreateActions();
         verticalLayout->addWidget(CreateTopToolBar());
         verticalLayout->addWidget(CreateNavigationToolBar());
 
@@ -217,7 +418,7 @@ namespace EMStudio
 
         UpdateNavigation();
         UpdateAnimGraphOptions();
-        UpdateSelection();
+        UpdateEnabledActions();
     }
 
     BlendGraphViewWidget::~BlendGraphViewWidget()
@@ -252,47 +453,35 @@ namespace EMStudio
         }
     }
 
-    void BlendGraphViewWidget::UpdateSelection()
+    void BlendGraphViewWidget::UpdateEnabledActions()
     {
         // do we have any selection?
         const bool anySelection = m_parentPlugin->GetAnimGraphModel().GetSelectionModel().hasSelection();
-        SetOptionEnabled(SELECTION_ZOOMSELECTION, anySelection);
-
-        QModelIndex firstSelectedNode;
-        bool atLeastTwoNodes = false;
-        const QModelIndexList selectedIndexes = m_parentPlugin->GetAnimGraphModel().GetSelectionModel().selectedRows();
-        for (const QModelIndex& selected : selectedIndexes)
-        {
-            const AnimGraphModel::ModelItemType itemType = selected.data(AnimGraphModel::ROLE_MODEL_ITEM_TYPE).value<AnimGraphModel::ModelItemType>();
-            if (itemType == AnimGraphModel::ModelItemType::NODE)
-            {
-                if (firstSelectedNode.isValid())
-                {
-                    atLeastTwoNodes = true;
-                    break;
-                }
-                else
-                {
-                    firstSelectedNode = selected;
-                }
-            }
-        }
+        SetOptionEnabled(NAVIGATION_ZOOMSELECTION, anySelection);
 
-        if (m_parentPlugin->GetActionFilter().m_editNodes &&
-            atLeastTwoNodes)
-        {
-            SetOptionEnabled(SELECTION_ALIGNLEFT, true);
-            SetOptionEnabled(SELECTION_ALIGNRIGHT, true);
-            SetOptionEnabled(SELECTION_ALIGNTOP, true);
-            SetOptionEnabled(SELECTION_ALIGNBOTTOM, true);
-        }
-        else
+        const auto isNodeSelected = [](const QModelIndex& index)
         {
-            SetOptionEnabled(SELECTION_ALIGNLEFT, false);
-            SetOptionEnabled(SELECTION_ALIGNRIGHT, false);
-            SetOptionEnabled(SELECTION_ALIGNTOP, false);
-            SetOptionEnabled(SELECTION_ALIGNBOTTOM, false);
-        }
+            return index.isValid()
+                && index.data(AnimGraphModel::ROLE_MODEL_ITEM_TYPE).value<AnimGraphModel::ModelItemType>() == AnimGraphModel::ModelItemType::NODE;
+        };
+        const QModelIndexList selectedIndexes = m_parentPlugin->GetAnimGraphModel().GetSelectionModel().selectedRows();
+        const auto firstSelectedNode = AZStd::find_if(selectedIndexes.begin(), selectedIndexes.end(), isNodeSelected);
+        const auto secondSelectedNode = AZStd::find_if(firstSelectedNode, selectedIndexes.end(), isNodeSelected);
+        const bool atLeastTwoNodes = secondSelectedNode != selectedIndexes.end();
+
+        const bool enableAlignActions = m_parentPlugin->GetActionFilter().m_editNodes && atLeastTwoNodes;
+        SetOptionEnabled(SELECTION_ALIGNLEFT, enableAlignActions);
+        SetOptionEnabled(SELECTION_ALIGNRIGHT, enableAlignActions);
+        SetOptionEnabled(SELECTION_ALIGNTOP, enableAlignActions);
+        SetOptionEnabled(SELECTION_ALIGNBOTTOM, enableAlignActions);
+
+        const bool isEditable = m_parentPlugin->GetGraphWidget()->GetActiveGraph() && !m_parentPlugin->GetGraphWidget()->GetActiveGraph()->IsInReferencedGraph();
+        const AnimGraphActionFilter& actionFilter = m_parentPlugin->GetActionFilter();
+
+        SetOptionEnabled(EDIT_CUT, actionFilter.m_copyAndPaste && anySelection && isEditable);
+        SetOptionEnabled(EDIT_COPY, actionFilter.m_copyAndPaste && anySelection);
+        SetOptionEnabled(EDIT_PASTE, actionFilter.m_copyAndPaste && isEditable && m_parentPlugin->GetActionManager().GetIsReadyForPaste());
+        SetOptionEnabled(EDIT_DELETE, actionFilter.m_copyAndPaste && anySelection && isEditable);
     }
 
     AnimGraphNodeWidget* BlendGraphViewWidget::GetWidgetForNode(const EMotionFX::AnimGraphNode* node)
@@ -375,19 +564,17 @@ namespace EMStudio
 
     void BlendGraphViewWidget::SetOptionFlag(EOptionFlag option, bool isEnabled)
     {
-        const uint32 optionIndex = (uint32)option;
-        if (m_actions[optionIndex])
+        if (m_actions[option])
         {
-            m_actions[optionIndex]->setChecked(isEnabled);
+            m_actions[option]->setChecked(isEnabled);
         }
     }
 
     void BlendGraphViewWidget::SetOptionEnabled(EOptionFlag option, bool isEnabled)
     {
-        const uint32 optionIndex = (uint32)option;
-        if (m_actions[optionIndex])
+        if (m_actions[option])
         {
-            m_actions[optionIndex]->setEnabled(isEnabled);
+            m_actions[option]->setEnabled(isEnabled);
         }
     }
 
@@ -395,8 +582,7 @@ namespace EMStudio
     {
         m_openMenu->clear();
 
-        m_actions[FILE_OPEN] = m_openMenu->addAction(tr("Open..."));
-        connect(m_actions[FILE_OPEN], &QAction::triggered, m_parentPlugin, &AnimGraphPlugin::OnFileOpen);
+        m_openMenu->addAction(m_actions[FILE_OPEN]);
 
         const uint32 numAnimGraphs = EMotionFX::GetAnimGraphManager().GetNumAnimGraphs();
         if (numAnimGraphs > 0)
@@ -521,6 +707,19 @@ namespace EMStudio
         }
     }
 
+    void BlendGraphViewWidget::ZoomToAll()
+    {
+        BlendGraphWidget* blendGraphWidget = m_parentPlugin->GetGraphWidget();
+        if (blendGraphWidget)
+        {
+            NodeGraph* nodeGraph = blendGraphWidget->GetActiveGraph();
+            if (nodeGraph)
+            {
+                nodeGraph->FitGraphOnScreen(geometry().width(), geometry().height(), blendGraphWidget->GetMousePos());
+            }
+        }
+    }
+
     void BlendGraphViewWidget::OnActivateState()
     {
         // Transition to the selected state.
@@ -546,7 +745,6 @@ namespace EMStudio
         }
     }
 
-
     void BlendGraphViewWidget::NavigateToRoot()
     {
         const QModelIndex nodeModelIndex = m_parentPlugin->GetGraphWidget()->GetActiveGraph()->GetModelIndex();
@@ -556,20 +754,6 @@ namespace EMStudio
         }
     }
 
-
-    void BlendGraphViewWidget::NavigateToParent()
-    {
-        const QModelIndex parentFocus = m_parentPlugin->GetAnimGraphModel().GetParentFocus();
-        if (parentFocus.isValid())
-        {
-            QModelIndex newParentFocus = parentFocus.model()->parent(parentFocus);
-            if (newParentFocus.isValid())
-            {
-                m_parentPlugin->GetAnimGraphModel().Focus(newParentFocus);
-            }
-        }
-    }
-
     void BlendGraphViewWidget::ToggleNavigationPane()
     {
         QList<int> sizes = m_viewportSplitter->sizes();
@@ -588,16 +772,6 @@ namespace EMStudio
         m_viewportSplitter->setSizes(sizes);
     }
 
-    void BlendGraphViewWidget::NavigateToNode()
-    {
-        const QModelIndexList currentModelIndexes = m_parentPlugin->GetAnimGraphModel().GetSelectionModel().selectedRows();
-        if (!currentModelIndexes.empty())
-        {
-            const QModelIndex currentModelIndex = currentModelIndexes.front();
-            m_parentPlugin->GetAnimGraphModel().Focus(currentModelIndex);
-        }
-    }
-
     // toggle playspeed viz
     void BlendGraphViewWidget::OnDisplayPlaySpeeds()
     {
@@ -638,36 +812,4 @@ namespace EMStudio
         EMotionFX::AnimGraphEditorNotificationBus::Broadcast(&EMotionFX::AnimGraphEditorNotificationBus::Events::OnShow);
     }
 
-    void BlendGraphViewWidget::keyPressEvent(QKeyEvent* event)
-    {
-        switch (event->key())
-        {
-        case Qt::Key_Backspace:
-        {
-            m_parentPlugin->GetNavigationHistory()->StepBackward();
-            event->accept();
-            break;
-        }
-
-        default:
-            event->ignore();
-        }
-    }
-
-
-    // on key release
-    void BlendGraphViewWidget::keyReleaseEvent(QKeyEvent* event)
-    {
-        switch (event->key())
-        {
-        case Qt::Key_Backspace:
-        {
-            event->accept();
-            break;
-        }
-
-        default:
-            event->ignore();
-        }
-    }
 } // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h
index dbc200856a..196fadb115 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h
@@ -53,25 +53,32 @@ namespace EMStudio
     public:
         enum EOptionFlag
         {
-            SELECTION_ALIGNLEFT                 = 0,
-            SELECTION_ALIGNRIGHT                = 1,
-            SELECTION_ALIGNTOP                  = 2,
-            SELECTION_ALIGNBOTTOM               = 3,
-            FILE_NEW                            = 4,
-            FILE_OPENFILE                       = 5,
-            FILE_OPEN                           = 6,
-            FILE_SAVE                           = 7,
-            FILE_SAVEAS                         = 8,
-            NAVIGATION_FORWARD                  = 9,
-            NAVIGATION_BACK                     = 10,
-            NAVIGATION_NAVPANETOGGLE            = 11,
-            SELECTION_ZOOMSELECTION             = 12,
-            ACTIVATE_ANIMGRAPH                  = 13,
-            WINDOWS_NODEGROUPWINDOW             = 14,
-            VISUALIZATION_PLAYSPEEDS            = 15,
-            VISUALIZATION_GLOBALWEIGHTS         = 16,
-            VISUALIZATION_SYNCSTATUS            = 17,
-            VISUALIZATION_PLAYPOSITIONS         = 18,
+            SELECTION_ALIGNLEFT,
+            SELECTION_ALIGNRIGHT,
+            SELECTION_ALIGNTOP,
+            SELECTION_ALIGNBOTTOM,
+            SELECTION_SELECTALL,
+            SELECTION_UNSELECTALL,
+            FILE_NEW,
+            FILE_OPEN,
+            FILE_SAVE,
+            FILE_SAVEAS,
+            NAVIGATION_FORWARD,
+            NAVIGATION_BACK,
+            NAVIGATION_NAVPANETOGGLE,
+            NAVIGATION_OPEN_SELECTED,
+            NAVIGATION_TO_PARENT,
+            NAVIGATION_FRAME_ALL,
+            NAVIGATION_ZOOMSELECTION,
+            ACTIVATE_ANIMGRAPH,
+            VISUALIZATION_PLAYSPEEDS,
+            VISUALIZATION_GLOBALWEIGHTS,
+            VISUALIZATION_SYNCSTATUS,
+            VISUALIZATION_PLAYPOSITIONS,
+            EDIT_CUT,
+            EDIT_COPY,
+            EDIT_PASTE,
+            EDIT_DELETE,
 
             NUM_OPTIONS //automatically gets the next number assigned
         };
@@ -85,13 +92,12 @@ namespace EMStudio
 
         void Init(BlendGraphWidget* blendGraphWidget);
         void UpdateAnimGraphOptions();
-        void UpdateSelection();
+        void UpdateEnabledActions();
 
         // If there is a specific widget to handle this node returns that.
         // Else, returns nullptr.
         AnimGraphNodeWidget* GetWidgetForNode(const EMotionFX::AnimGraphNode* node);
 
-        // Get Actions (used for testing purposes)
         QAction* GetAction(EOptionFlag option) const { return m_actions[option]; }
 
     public slots:
@@ -100,11 +106,10 @@ namespace EMStudio
         void OnCreateAnimGraph();
 
         void NavigateToRoot();
-        void NavigateToNode();
-        void NavigateToParent();
         void ToggleNavigationPane();
 
         void ZoomSelected();
+        void ZoomToAll();
 
         void OnActivateState();
 
@@ -122,17 +127,15 @@ namespace EMStudio
 
         void showEvent(QShowEvent* showEvent);
 
-        void keyReleaseEvent(QKeyEvent* event) override;
-        void keyPressEvent(QKeyEvent* event) override;
-
     private:
+        void CreateActions();
         QToolBar* CreateTopToolBar();
         QToolBar* CreateNavigationToolBar();
 
         QMenuBar* m_menu = nullptr;
         QMenu* m_openMenu = nullptr;
         QHBoxLayout* m_toolbarLayout = nullptr;
-        QAction* m_actions[NUM_OPTIONS];
+        AZStd::array<QAction*, NUM_OPTIONS> m_actions{};
         AnimGraphPlugin* m_parentPlugin = nullptr;
         NavigationLinkWidget* mNavigationLink = nullptr;
         QStackedWidget m_viewportStack;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp
index 7cd5a2d849..623f9f94a9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp
@@ -71,12 +71,6 @@ namespace EMStudio
     }
 
 
-    // destructor
-    BlendGraphWidget::~BlendGraphWidget()
-    {
-    }
-
-
     // when dropping stuff in our window
     void BlendGraphWidget::dropEvent(QDropEvent* event)
     {
@@ -1555,254 +1549,6 @@ namespace EMStudio
     }
 
 
-    // on keypress
-    void BlendGraphWidget::keyPressEvent(QKeyEvent* event)
-    {
-        MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
-        const AnimGraphActionFilter& actionFilter = mPlugin->GetActionFilter();
-
-        if (shortcutManager->Check(event, "Open Parent Node", "Anim Graph Window"))
-        {
-            const QModelIndex parentFocus = mPlugin->GetAnimGraphModel().GetParentFocus();
-            if (parentFocus.isValid())
-            {
-                QModelIndex newParentFocus = parentFocus.model()->parent(parentFocus);
-                if (newParentFocus.isValid())
-                {
-                    mPlugin->GetAnimGraphModel().Focus(newParentFocus);
-                }
-            }
-            event->accept();
-            return;
-        }
-
-        if (shortcutManager->Check(event, "Open Selected Node", "Anim Graph Window"))
-        {
-            mPlugin->GetActionManager().NavigateToNode();
-            event->accept();
-            return;
-        }
-
-        if (shortcutManager->Check(event, "History Back", "Anim Graph Window"))
-        {
-            mPlugin->GetNavigationHistory()->StepBackward();
-            event->accept();
-            return;
-        }
-
-        if (shortcutManager->Check(event, "History Forward", "Anim Graph Window"))
-        {
-            mPlugin->GetNavigationHistory()->StepForward();
-            event->accept();
-            return;
-        }
-
-        if (mActiveGraph &&
-            !mActiveGraph->IsInReferencedGraph())
-        {
-            if (actionFilter.m_editNodes)
-            {
-                if (shortcutManager->Check(event, "Align Left", "Anim Graph Window"))
-                {
-                    mPlugin->GetActionManager().AlignLeft();
-                    event->accept();
-                    return;
-                }
-
-                if (shortcutManager->Check(event, "Align Right", "Anim Graph Window"))
-                {
-                    mPlugin->GetActionManager().AlignRight();
-                    event->accept();
-                    return;
-                }
-
-                if (shortcutManager->Check(event, "Align Top", "Anim Graph Window"))
-                {
-                    mPlugin->GetActionManager().AlignTop();
-                    event->accept();
-                    return;
-                }
-
-                if (shortcutManager->Check(event, "Align Bottom", "Anim Graph Window"))
-                {
-                    mPlugin->GetActionManager().AlignBottom();
-                    event->accept();
-                    return;
-                }
-            }
-
-            if (actionFilter.m_copyAndPaste &&
-                shortcutManager->Check(event, "Cut", "Anim Graph Window"))
-            {
-                mPlugin->GetActionManager().Cut();
-                event->accept();
-                return;
-            }
-        }
-
-        if (actionFilter.m_copyAndPaste)
-        {
-            if (shortcutManager->Check(event, "Copy", "Anim Graph Window"))
-            {
-                mPlugin->GetActionManager().Copy();
-                event->accept();
-                return;
-            }
-
-            if (shortcutManager->Check(event, "Paste", "Anim Graph Window"))
-            {
-                if (mActiveGraph && !mActiveGraph->IsInReferencedGraph())
-                {
-                    if (mPlugin->GetActionManager().GetIsReadyForPaste())
-                    {
-                        QModelIndex modelIndex = GetActiveGraph()->GetModelIndex();
-                        if (modelIndex.isValid())
-                        {
-                            if (rect().contains(mapFromGlobal(QCursor::pos())) == false)
-                            {
-                                mPlugin->GetActionManager().Paste(modelIndex, GetMousePos());
-                                event->accept();
-                            }
-                        }
-                    }
-                }
-                return;
-            }
-        }
-
-        if (shortcutManager->Check(event, "Select All", "Anim Graph Window"))
-        {
-            if (mActiveGraph)
-            {
-                mActiveGraph->SelectAllNodes();
-                event->accept();
-            }
-            return;
-        }
-
-        if (shortcutManager->Check(event, "Unselect All", "Anim Graph Window"))
-        {
-            if (mActiveGraph)
-            {
-                mActiveGraph->UnselectAllNodes();
-                event->accept();
-            }
-            return;
-        }
-
-        if (mActiveGraph &&
-            actionFilter.m_delete &&
-            !mActiveGraph->IsInReferencedGraph() &&
-            shortcutManager->Check(event, "Delete Selected Nodes", "Anim Graph Window"))
-        {
-            DeleteSelectedItems();
-            event->accept();
-            return;
-        }
-
-        return NodeGraphWidget::keyPressEvent(event);
-    }
-
-
-    // on key release
-    void BlendGraphWidget::keyReleaseEvent(QKeyEvent* event)
-    {
-        MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
-        const AnimGraphActionFilter& actionFilter = mPlugin->GetActionFilter();
-
-        if (shortcutManager->Check(event, "Open Parent Node", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-        if (shortcutManager->Check(event, "Open Selected Node", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-        if (shortcutManager->Check(event, "History Back", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-        if (shortcutManager->Check(event, "History Forward", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-
-        if (mActiveGraph && !mActiveGraph->IsInReferencedGraph())
-        {
-            if (actionFilter.m_editNodes)
-            {
-                if (shortcutManager->Check(event, "Align Left", "Anim Graph Window"))
-                {
-                    event->accept();
-                    return;
-                }
-                if (shortcutManager->Check(event, "Align Right", "Anim Graph Window"))
-                {
-                    event->accept();
-                    return;
-                }
-                if (shortcutManager->Check(event, "Align Top", "Anim Graph Window"))
-                {
-                    event->accept();
-                    return;
-                }
-                if (shortcutManager->Check(event, "Align Bottom", "Anim Graph Window"))
-                {
-                    event->accept();
-                    return;
-                }
-            }
-
-            if (actionFilter.m_copyAndPaste &&
-                shortcutManager->Check(event, "Cut", "Anim Graph Window"))
-            {
-                event->accept();
-                return;
-            }
-        }
-
-        if (actionFilter.m_copyAndPaste)
-        {
-            if (shortcutManager->Check(event, "Copy", "Anim Graph Window"))
-            {
-                event->accept();
-                return;
-            }
-            if (mActiveGraph && !mActiveGraph->IsInReferencedGraph() && shortcutManager->Check(event, "Paste", "Anim Graph Window"))
-            {
-                event->accept();
-                return;
-            }
-        }
-
-        if (shortcutManager->Check(event, "Select All", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-        if (shortcutManager->Check(event, "Unselect All", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-
-        if (mActiveGraph &&
-            actionFilter.m_delete &&
-            !mActiveGraph->IsInReferencedGraph() &&
-            shortcutManager->Check(event, "Delete Selected Nodes", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-
-        return NodeGraphWidget::keyReleaseEvent(event);
-    }
-
-
     void BlendGraphWidget::OnRowsInserted(const QModelIndex& parent, int first, int last)
     {
         // Here we could be receiving connections, transitions or nodes being inserted into
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h
index f5c5d4a5ea..7453e4cc53 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h
@@ -45,7 +45,6 @@ namespace EMStudio
 
     public:
         BlendGraphWidget(AnimGraphPlugin* plugin, QWidget* parent);
-        ~BlendGraphWidget();
 
         // overloaded
         bool CheckIfIsCreateConnectionValid(uint32 portNr, GraphNode* portNode, NodePort* port, bool isInputPort) override;
@@ -120,8 +119,6 @@ namespace EMStudio
         void OnSelectionModelChanged(const QItemSelection& selected, const QItemSelection& deselected);
 
     private:
-        void keyReleaseEvent(QKeyEvent* event) override;
-        void keyPressEvent(QKeyEvent* event) override;
 
         EMotionFX::AnimGraphStateTransition* FindTransitionForConnection(NodeConnection* connection) const;
         EMotionFX::BlendTreeConnection* FindBlendTreeConnection(NodeConnection* connection) const;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp
index 8866ec678e..80603c37bf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp
@@ -183,17 +183,11 @@ namespace EMStudio
             if (graphNode == nullptr)
             {
                 QMenu* menu = new QMenu(parentWidget);
-                if (actionFilter.m_copyAndPaste && actionManager.GetIsReadyForPaste())
-                {
-                    const QModelIndex modelIndex = nodeGraph->GetModelIndex();
-                    if (modelIndex.isValid())
-                    {
-                        localMousePos = SnapLocalToGrid(LocalToGlobal(localMousePos));
 
-                        QAction* pasteAction = menu->addAction("Paste");
-                        connect(pasteAction, &QAction::triggered, [&actionManager, modelIndex, localMousePos]() { actionManager.Paste(modelIndex, localMousePos); });
-                        menu->addSeparator();
-                    }
+                if (actionFilter.m_copyAndPaste && actionManager.GetIsReadyForPaste() && nodeGraph->GetModelIndex().isValid())
+                {
+                    menu->addAction(viewWidget->GetAction(BlendGraphViewWidget::EDIT_PASTE));
+                    menu->addSeparator();
                 }
 
                 if (actionFilter.m_createNodes)
@@ -324,8 +318,7 @@ namespace EMStudio
             // we can only go to the selected node in case the selected node has a visual graph (state machine / blend tree)
             if (animGraphNode->GetHasVisualGraph())
             {
-                QAction* goToNodeAction = menu->addAction("Open Selected Node");
-                connect(goToNodeAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::NavigateToNode);
+                menu->addAction(viewWidget->GetAction(BlendGraphViewWidget::NAVIGATION_OPEN_SELECTED));
                 menu->addSeparator();
             }
 
@@ -360,20 +353,17 @@ namespace EMStudio
                     if (!inReferenceGraph)
                     {
                         // cut and copy actions
-                        QAction* cutAction = menu->addAction("Cut");
-                        connect(cutAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::Cut);
+                        menu->addAction(viewWidget->GetAction(BlendGraphViewWidget::EDIT_CUT));
                     }
 
-                    QAction* ccopyAction = menu->addAction("Copy");
-                    connect(ccopyAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::Copy);
+                    menu->addAction(viewWidget->GetAction(BlendGraphViewWidget::EDIT_COPY));
                     menu->addSeparator();
                 }
 
                 if (actionFilter.m_delete &&
                     !inReferenceGraph)
                 {
-                    QAction* removeNodeAction = menu->addAction("Delete Node");
-                    connect(removeNodeAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::DeleteSelectedNodes);
+                    menu->addAction(viewWidget->GetAction(BlendGraphViewWidget::EDIT_DELETE));
                     menu->addSeparator();
                 }
             }
@@ -403,22 +393,14 @@ namespace EMStudio
             if (actionFilter.m_editNodes &&
                 !inReferenceGraph)
             {
-                QAction* alignLeftAction = menu.addAction("Align Left");
-                QAction* alignRightAction = menu.addAction("Align Right");
-                QAction* alignTopAction = menu.addAction("Align Top");
-                QAction* alignBottomAction = menu.addAction("Align Bottom");
-
-
-                connect(alignLeftAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::AlignLeft);
-                connect(alignRightAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::AlignRight);
-                connect(alignTopAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::AlignTop);
-                connect(alignBottomAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::AlignBottom);
-
+                menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::SELECTION_ALIGNLEFT));
+                menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::SELECTION_ALIGNRIGHT));
+                menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::SELECTION_ALIGNTOP));
+                menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::SELECTION_ALIGNBOTTOM));
                 menu.addSeparator();
             }
 
-            QAction* zoomSelectionAction = menu.addAction("Zoom Selection");
-            connect(zoomSelectionAction, &QAction::triggered, viewWidget, &BlendGraphViewWidget::ZoomSelected);
+            menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::NAVIGATION_ZOOMSELECTION));
 
             menu.addSeparator();
 
@@ -494,12 +476,10 @@ namespace EMStudio
 
                     if (!inReferenceGraph)
                     {
-                        QAction* cutAction = menu.addAction("Cut");
-                        connect(cutAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::Cut);
+                        menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::EDIT_CUT));
                     }
 
-                    QAction* ccopyAction = menu.addAction("Copy");
-                    connect(ccopyAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::Copy);
+                    menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::EDIT_COPY));
                 }
 
                 menu.addSeparator();
@@ -507,8 +487,7 @@ namespace EMStudio
                 if (actionFilter.m_delete &&
                     !inReferenceGraph)
                 {
-                    QAction* removeNodesAction = menu.addAction("Delete Nodes");
-                    connect(removeNodesAction, &QAction::triggered, &actionManager, &AnimGraphActionManager::DeleteSelectedNodes);
+                    menu.addAction(viewWidget->GetAction(BlendGraphViewWidget::EDIT_DELETE));
 
                     menu.addSeparator();
                 }
@@ -526,4 +505,4 @@ namespace EMStudio
             }
         }
     }
-}
+} // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp
index eae890c69d..f102cc5d96 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp
@@ -28,7 +28,6 @@
 #include <EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h>
 #include <EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h>
 #include <EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.h>
-#include <MysticQt/Source/KeyboardShortcutManager.h>
 #include <QMouseEvent>
 #include <QPainter>
 
@@ -155,6 +154,11 @@ namespace EMStudio
     // set the active graph
     void NodeGraphWidget::SetActiveGraph(NodeGraph* graph)
     {
+        if (mActiveGraph == graph)
+        {
+            return;
+        }
+
         if (mActiveGraph)
         {
             mActiveGraph->StopCreateConnection();
@@ -165,6 +169,8 @@ namespace EMStudio
 
         mActiveGraph = graph;
         mMoveNode = nullptr;
+
+        emit ActiveGraphChanged();
     }
 
 
@@ -322,7 +328,7 @@ namespace EMStudio
 
 
     // convert to a global position
-    QPoint NodeGraphWidget::LocalToGlobal(const QPoint& inPoint)
+    QPoint NodeGraphWidget::LocalToGlobal(const QPoint& inPoint) const
     {
         if (mActiveGraph)
         {
@@ -334,7 +340,7 @@ namespace EMStudio
 
 
     // convert to a local position
-    QPoint NodeGraphWidget::GlobalToLocal(const QPoint& inPoint)
+    QPoint NodeGraphWidget::GlobalToLocal(const QPoint& inPoint) const
     {
         if (mActiveGraph)
         {
@@ -345,7 +351,7 @@ namespace EMStudio
     }
 
 
-    QPoint NodeGraphWidget::SnapLocalToGrid(const QPoint& inPoint, uint32 cellSize)
+    QPoint NodeGraphWidget::SnapLocalToGrid(const QPoint& inPoint, uint32 cellSize) const
     {
         MCORE_UNUSED(cellSize);
 
@@ -1491,45 +1497,9 @@ namespace EMStudio
         }
         }
 
-        MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
-
-        if (shortcutManager->Check(event, "Fit Entire Graph", "Anim Graph Window"))
-        {
-            // zoom to fit the entire graph in view
-            if (mActiveGraph)
-            {
-                mActiveGraph->FitGraphOnScreen(geometry().width(), geometry().height(), GetMousePos());
-            }
-
-            event->accept();
-            return;
-        }
-
-        if (shortcutManager->Check(event, "Zoom On Selected Nodes", "Anim Graph Window"))
-        {
-            if (mActiveGraph)
-            {
-                // try zooming on the selection rect
-                QRect selectionRect = mActiveGraph->CalcRectFromSelection(true);
-                if (selectionRect.isEmpty() == false)
-                {
-                    mActiveGraph->ZoomOnRect(selectionRect, geometry().width(), geometry().height());
-                    //update();
-                }
-                else // zoom on the full scene
-                {
-                    mActiveGraph->FitGraphOnScreen(geometry().width(), geometry().height(), GetMousePos());
-                }
-            }
-
-            event->accept();
-            return;
-        }
-
         event->ignore();
     }
 
-
     // on key release
     void NodeGraphWidget::keyReleaseEvent(QKeyEvent* event)
     {
@@ -1552,20 +1522,6 @@ namespace EMStudio
         }
         }
 
-        MysticQt::KeyboardShortcutManager* shortcutManager = GetMainWindow()->GetShortcutManager();
-
-        if (shortcutManager->Check(event, "Fit Entire Graph", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-
-        if (shortcutManager->Check(event, "Zoom On Selected Nodes", "Anim Graph Window"))
-        {
-            event->accept();
-            return;
-        }
-
         event->ignore();
     }
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h
index 68e9f72209..9b8d8c6ace 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h
@@ -65,9 +65,9 @@ namespace EMStudio
 
         uint32 CalcNumSelectedNodes() const;
 
-        QPoint LocalToGlobal(const QPoint& inPoint);
-        QPoint GlobalToLocal(const QPoint& inPoint);
-        QPoint SnapLocalToGrid(const QPoint& inPoint, uint32 cellSize = 10);
+        QPoint LocalToGlobal(const QPoint& inPoint) const;
+        QPoint GlobalToLocal(const QPoint& inPoint) const;
+        QPoint SnapLocalToGrid(const QPoint& inPoint, uint32 cellSize = 10) const;
 
         void CalcSelectRect(QRect& outRect);
 
@@ -106,6 +106,9 @@ namespace EMStudio
         const QString& GetTitleBarText() const { return m_titleBarText; }
         void SetTitleBarText(const QString& text) { m_titleBarText = text; }
 
+    signals:
+        void ActiveGraphChanged();
+
     protected:
         //virtual void paintEvent(QPaintEvent* event);
         void mouseMoveEvent(QMouseEvent* event) override;
@@ -160,4 +163,4 @@ namespace EMStudio
         float                       m_borderOverwriteWidth;
         QString                     m_titleBarText;
     };
-}   // namespace EMStudio
+} // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp
index 202feb3d18..0d44330b34 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp
+++ b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp
@@ -12,6 +12,8 @@
 
 // include required headers
 #include "KeyboardShortcutManager.h"
+#include <AzCore/std/algorithm.h>
+#include <AzCore/std/string/string_view.h>
 
 #include <MCore/Source/LogManager.h>
 #include <MCore/Source/IDGenerator.h>
@@ -19,52 +21,27 @@
 #include <QtCore/QSettings>
 #include <QtGui/QKeyEvent>
 
-
 namespace MysticQt
 {
-    // find action by name
-    KeyboardShortcutManager::Action* KeyboardShortcutManager::Group::FindActionByName(const char* actionName, bool local) const
+    void KeyboardShortcutManager::Group::RemoveAction(QAction* qaction, bool local)
     {
-        const uint32 numActions = mActions.GetLength();
-        for (uint32 i = 0; i < numActions; ++i)
+        m_actions.erase(AZStd::find_if(begin(m_actions), end(m_actions), [&qaction, local](const AZStd::unique_ptr<Action>& action)
         {
-            if (mActions[i]->mLocal == local && mActions[i]->mName == actionName)
-            {
-                return mActions[i];
-            }
-        }
-
-        return nullptr;
+            return action->m_local == local && action->m_qaction == qaction;
+        }));
     }
 
-    // constructor
-    KeyboardShortcutManager::KeyboardShortcutManager()
+    KeyboardShortcutManager::Action* KeyboardShortcutManager::Group::FindActionByName(const QString& actionName, bool local) const
     {
-    }
-
-
-    // destructor
-    KeyboardShortcutManager::~KeyboardShortcutManager()
-    {
-        Clear();
-    }
-
-
-    // get rid of all groups including their actions
-    void KeyboardShortcutManager::Clear()
-    {
-        // get rid of the groups
-        const uint32 numGroups = mGroups.GetLength();
-        for (uint32 i = 0; i < numGroups; ++i)
+        const auto found = AZStd::find_if(begin(m_actions), end(m_actions), [&actionName, local](const AZStd::unique_ptr<Action>& action)
         {
-            delete mGroups[i];
-        }
+            return action->m_local == local && action->m_qaction->text() == actionName;
+        });
 
-        mGroups.Clear();
+        return found != end(m_actions) ? found->get() : nullptr;
     }
 
-
-    void KeyboardShortcutManager::RegisterKeyboardShortcut(const char* actionName, const char* groupName, int defaultKey, bool defaultCtrl, bool defaultAlt, bool local)
+    void KeyboardShortcutManager::RegisterKeyboardShortcut(QAction* qaction, AZStd::string_view groupName, bool local)
     {
         // find the group with the given name
         Group* group = FindGroupByName(groupName);
@@ -72,188 +49,112 @@ namespace MysticQt
         // if there is no group with the given name, create it
         if (group == nullptr)
         {
-            group = new Group(groupName);
-            mGroups.Add(group);
+            m_groups.emplace_back(AZStd::make_unique<Group>(groupName));
+            group = m_groups.back().get();
         }
 
         // check if the action is already there to avoid adding it twice
-        Action* action = group->FindActionByName(actionName, local);
+        Action* action = group->FindActionByName(qaction->text(), local);
         if (action)
         {
-            action->mDefaultKey = defaultKey;
-            action->mDefaultCtrl = defaultCtrl;
-            action->mDefaultAlt = defaultAlt;
+            action->m_defaultKeySequence = qaction->shortcut();
             return;
         }
 
         // create the new action and add it to the group
-        action = new Action(actionName, defaultKey, defaultCtrl, defaultAlt, local);
-        group->AddAction(action);
-    }
-
+        group->AddAction(AZStd::make_unique<Action>(qaction, local));
 
-    // find the action with the given name in the given group
-    KeyboardShortcutManager::Action* KeyboardShortcutManager::FindAction(const char* actionName, const char* groupName)
-    {
-        const uint32 numGroups = mGroups.GetLength();
-
-        // first search global shortcuts
-        for (uint32 i = 0; i < numGroups; ++i)
+        QAction::connect(qaction, &QAction::destroyed, this, [this, groupName = AZStd::string(groupName), local](QObject* qaction)
         {
-            if (mGroups[i]->GetNameString() == groupName)
-            {
-                Action* action = mGroups[i]->FindActionByName(actionName, false);
-                if (action)
-                {
-                    return action;
-                }
-            }
-        }
-
-        // then local shortcuts
-        for (uint32 i = 0; i < numGroups; ++i)
-        {
-            if (mGroups[i]->GetNameString() == groupName)
-            {
-                Action* action = mGroups[i]->FindActionByName(actionName, true);
-                if (action)
-                {
-                    return action;
-                }
-            }
-        }
-
-        // failure, not found
-        return nullptr;
+            UnregisterKeyboardShortcut(static_cast<QAction*>(qaction), groupName, local);
+        });
     }
 
-
-    // find a group by name
-    KeyboardShortcutManager::Group* KeyboardShortcutManager::FindGroupByName(const char* groupName) const
+    void KeyboardShortcutManager::UnregisterKeyboardShortcut(QAction* qaction, AZStd::string_view groupName, bool local)
     {
-        // iterate through the groups and find the one with the given name
-        const uint32 numGroups = mGroups.GetLength();
-        for (uint32 i = 0; i < numGroups; ++i)
+        Group* group = FindGroupByName(groupName);
+
+        if (!group)
         {
-            if (mGroups[i]->GetNameString() == groupName)
-            {
-                return mGroups[i];
-            }
+            return;
         }
 
-        // failure, a group with the given name hasn't been found
-        return nullptr;
+        group->RemoveAction(qaction, local);
     }
 
 
-    bool KeyboardShortcutManager::Check(QKeyEvent* event, const char* actionName, const char* groupName)
+    // find the action with the given name in the given group
+    KeyboardShortcutManager::Action* KeyboardShortcutManager::FindAction(const QString& actionName, AZStd::string_view groupName) const
     {
-        // find the corresponding action for the given strings
-        Action* action = FindAction(actionName, groupName);
-        if (action == nullptr)
+        const Group* group = FindGroupByName(groupName);
+        if (!group)
         {
-            //MCore::LogError("Action named '%s' in group '%s' not registered. Please register the shortcut before using it.", actionName, groupName);
-            return false;
+            return nullptr;
         }
 
-        const bool ctrlPressed  = event->modifiers() & Qt::ControlModifier;
-        //const bool shiftPressed   = event->modifiers() & Qt::ShiftModifier;
-        const bool altPressed   = event->modifiers() & Qt::AltModifier;
-
-        Group* group = FindGroupByName(groupName);
-        Action* conflictAction = FindShortcut(event->key(), ctrlPressed, altPressed, group);
-
-        // check if they are equal, if yes this means they match
-        if (action == conflictAction)
+        Action* action = group->FindActionByName(actionName, false);
+        if (action)
         {
-            return true;
+            return action;
         }
+        return group->FindActionByName(actionName, true);
+    }
 
-        // check if the action and the key event are the same shortcut
-        /*if (event->key() == action->mKey &&
-            ctrlPressed  == action->mCtrl &&
-            altPressed   == action->mAlt)
-            return true;*/
 
-        return false;
+    // find a group by name
+    KeyboardShortcutManager::Group* KeyboardShortcutManager::FindGroupByName(AZStd::string_view groupName) const
+    {
+        const auto found = AZStd::find_if(begin(m_groups), end(m_groups), [&groupName](const AZStd::unique_ptr<Group>& group)
+        {
+            return group->GetName() == groupName;
+        });
+        return found != end(m_groups) ? found->get() : nullptr;
     }
 
 
     // find the correspondng group for the given action
-    KeyboardShortcutManager::Group* KeyboardShortcutManager::FindGroupForShortcut(Action* action)
+    KeyboardShortcutManager::Group* KeyboardShortcutManager::FindGroupForShortcut(Action* action) const
     {
-        // get the number of available groups
-        const uint32 numGroups = mGroups.GetLength();
-
-        // first check the global shortcuts
-        for (uint32 i = 0; i < numGroups; ++i)
+        const auto foundGroup = AZStd::find_if(begin(m_groups), end(m_groups), [action](const AZStd::unique_ptr<Group>& group)
         {
-            Group* group = mGroups[i];
-
-            // iterate through the actions and save them
-            const uint32 numActions = group->GetNumActions();
-            for (uint32 j = 0; j < numActions; ++j)
+            const auto foundAction = AZStd::find_if(begin(group->GetActions()), end(group->GetActions()), [action](const AZStd::unique_ptr<Action>& actionInGroup)
             {
-                if (group->GetAction(j) == action)
-                {
-                    return group;
-                }
-            }
-        }
-
-        // failure, not found
-        return nullptr;
+                return action == actionInGroup.get();
+            });
+            return foundAction != end(group->GetActions()) ? foundAction->get() : nullptr;
+        });
+        return foundGroup != end(m_groups) ? foundGroup->get() : nullptr;
     }
 
 
-    KeyboardShortcutManager::Action* KeyboardShortcutManager::FindShortcut(int key, bool ctrl, bool alt, Group* group)
+    KeyboardShortcutManager::Action* KeyboardShortcutManager::FindShortcut(QKeySequence keySequence, Group* group) const
     {
-        // get the number of available groups
-        const uint32 numGroups = mGroups.GetLength();
-
-        // first check the global shortcuts
-        for (uint32 i = 0; i < numGroups; ++i)
+        const auto findMatchingAction = [keySequence] (const Group* group, const bool local)
         {
-            Group* currentGroup = mGroups[i];
-
-            // iterate through the actions and save them
-            const uint32 numActions = currentGroup->GetNumActions();
-            for (uint32 j = 0; j < numActions; ++j)
+            return AZStd::find_if(begin(group->GetActions()), end(group->GetActions()), [keySequence, local] (const AZStd::unique_ptr<Action>& action)
             {
-                // get the shortcut action
-                KeyboardShortcutManager::Action* action = currentGroup->GetAction(j);
-                if (action->mLocal)
+                if (action->m_local != local)
                 {
-                    continue;
+                    return false;
                 }
 
-                // check if the action and shortcut are the same
-                if (key     == action->mKey &&
-                    ctrl    == action->mCtrl &&
-                    alt     == action->mAlt)
-                {
-                    return action;
-                }
-            }
-        }
+                return action->m_qaction->shortcut().matches(keySequence) == QKeySequence::ExactMatch;
+            });
+        };
 
-        // iterate through the actions and save them
-        const uint32 numActions = group->GetNumActions();
-        for (uint32 j = 0; j < numActions; ++j)
+        // first check the global shortcuts
+        const auto globalAction = findMatchingAction(group, false);
+        if (globalAction != end(group->GetActions()))
         {
-            // get the shortcut action
-            KeyboardShortcutManager::Action* action = group->GetAction(j);
+            return globalAction->get();
+        }
 
-            // check if the action and shortcut are the same
-            if (key     == action->mKey &&
-                ctrl    == action->mCtrl &&
-                alt     == action->mAlt)
-            {
-                return action;
-            }
+        const auto localAction = findMatchingAction(group, true);
+        if (localAction != end(group->GetActions()))
+        {
+            return localAction->get();
         }
 
-        // failure, shortcut not found
         return nullptr;
     }
 
@@ -264,24 +165,16 @@ namespace MysticQt
         settings->clear();
 
         // iterate through the groups and save all actions for them
-        const uint32 numGroups = mGroups.GetLength();
-        for (uint32 i = 0; i < numGroups; ++i)
+        for (const AZStd::unique_ptr<Group>& group : m_groups)
         {
-            Group* group = mGroups[i];
-            settings->beginGroup(group->GetName());
+            settings->beginGroup(QString::fromUtf8(group->GetName().data(), group->GetName().size()));
 
             // iterate through the actions and save them
-            const uint32 numActions = group->GetNumActions();
-            for (uint32 j = 0; j < numActions; ++j)
+            for (const AZStd::unique_ptr<Action>& action : group->GetActions())
             {
-                // get the shortcut action
-                KeyboardShortcutManager::Action* action = group->GetAction(j);
-
-                settings->beginGroup(action->mName.c_str());
-                settings->setValue("Key",   action->mKey);
-                settings->setValue("Ctrl",  action->mCtrl);
-                settings->setValue("Alt",   action->mAlt);
-                settings->setValue("Local", action->mLocal);
+                settings->beginGroup(action->m_qaction->text());
+                settings->setValue("Key", action->m_qaction->shortcut());
+                settings->setValue("Local", action->m_local);
                 settings->endGroup();
             }
 
@@ -292,33 +185,49 @@ namespace MysticQt
 
     void KeyboardShortcutManager::Load(QSettings* settings)
     {
-        // clear the shortcut manager before loading
-        Clear();
-
         // iterate through the groups and load all actions
-        QStringList groupNames = settings->childGroups();
-        const uint32 numGroups = groupNames.count();
-        for (uint32 i = 0; i < numGroups; ++i)
+        const QStringList groupNames = settings->childGroups();
+        for (const QString& groupName : groupNames)
         {
-            QString groupName = groupNames[i];
-            settings->beginGroup(groupNames[i]);
-            QStringList actionNames = settings->childGroups();
+            Group* group = FindGroupByName(FromQtString(groupName));
+            if (!group)
+            {
+                continue;
+            }
+
+            settings->beginGroup(groupName);
+            const QStringList actionNames = settings->childGroups();
 
             // iterate through the actions and save them
-            const uint32 numActions = actionNames.count();
-            for (uint32 j = 0; j < numActions; ++j)
+            for (const QString& actionName : actionNames)
             {
-                QString actionName = actionNames[j];
                 settings->beginGroup(actionName);
-                int     key         =  settings->value("Key", "").toInt();
-                bool    ctrlPressed =  settings->value("Ctrl", false).toBool();
-                bool    altPressed  =  settings->value("Alt", false).toBool();
-                bool    local       =  settings->value("Local", false).toBool();
-                RegisterKeyboardShortcut(FromQtString(actionName).c_str(), FromQtString(groupName).c_str(), key, ctrlPressed, altPressed, local);
+                const bool local = settings->value("Local", false).toBool();
+
+                Action* action = group->FindActionByName(actionName, local);
+                if (!action)
+                {
+                    continue;
+                }
+
+                const QVariant keyValue = settings->value("Key", "");
+                if (keyValue.canConvert<QKeySequence>())
+                {
+                    const QKeySequence key = keyValue.value<QKeySequence>();
+                    action->m_qaction->setShortcut(key);
+                }
+                else if (keyValue.canConvert<int>())
+                {
+                    const int key = keyValue.value<int>();
+                    const bool ctrlModifier = settings->value("Ctrl", false).value<bool>();
+                    const bool altModifier = settings->value("Alt", false).value<bool>();
+                    action->m_qaction->setShortcut(key | (ctrlModifier ? Qt::ControlModifier : 0) | (altModifier ? Qt::AltModifier : 0));
+                }
+
                 settings->endGroup();
             }
 
             settings->endGroup();
         }
     }
-}   // namespace MysticQt
+} // namespace MysticQt
diff --git a/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h
index 9bd1b58812..ce989767e0 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h
@@ -10,12 +10,14 @@
 *
 */
 
-#ifndef __MYSTICQT_KEYBOARDSHORTCUTMANAGER_H
-#define __MYSTICQT_KEYBOARDSHORTCUTMANAGER_H
+#pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <QKeySequence>
+#include <QAction>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/std/string/string.h>
-#include <MCore/Source/Array.h>
+#include <AzCore/std/containers/vector.h>
 #include <MCore/Source/StandardHeaders.h>
 #include "MysticQtConfig.h"
 #endif
@@ -26,86 +28,58 @@ class QSettings;
 namespace MysticQt
 {
     class MYSTICQT_API KeyboardShortcutManager
+        : public QObject
     {
-        MCORE_MEMORYOBJECTCATEGORY(KeyboardShortcutManager, MCore::MCORE_DEFAULT_ALIGNMENT, MEMCATEGORY_MYSTICQT);
-
     public:
-        KeyboardShortcutManager();
-        virtual ~KeyboardShortcutManager();
-
         struct Action
         {
-            MCORE_MEMORYOBJECTCATEGORY(KeyboardShortcutManager::Action, MCore::MCORE_DEFAULT_ALIGNMENT, MEMCATEGORY_MYSTICQT);
-
-            AZStd::string       mName;
-            int                 mKey;
-            bool                mCtrl;
-            bool                mAlt;
-            bool                mLocal;
-
-            int                 mDefaultKey;
-            bool                mDefaultCtrl;
-            bool                mDefaultAlt;
-
-            Action(const char* name, int defaultKey, bool defaultCtrl, bool defaultAlt, bool local)
+            QAction*            m_qaction;
+            QKeySequence        m_defaultKeySequence;
+            bool                m_local;
+
+            Action(QAction* qaction, bool local)
+                : m_qaction(qaction)
+                , m_defaultKeySequence(qaction->shortcut())
+                , m_local(local)
             {
-                mName           = name;
-                mLocal          = local;
-
-                mKey            = defaultKey;
-                mCtrl           = defaultCtrl;
-                mAlt            = defaultAlt;
-
-                mDefaultKey     = defaultKey;
-                mDefaultCtrl    = defaultCtrl;
-                mDefaultAlt     = defaultAlt;
             }
         };
 
         class Group
         {
-            MCORE_MEMORYOBJECTCATEGORY(KeyboardShortcutManager::Group, MCore::MCORE_DEFAULT_ALIGNMENT, MEMCATEGORY_MYSTICQT);
         public:
-            Group(const char* groupName)                            { mName = groupName; }
-            virtual ~Group()
+            Group(AZStd::string_view groupName)
+                : m_name(groupName)
             {
-                const uint32 numActions = mActions.GetLength();
-                for (uint32 i = 0; i < numActions; ++i)
-                {
-                    delete mActions[i];
-                }
-                mActions.Clear();
             }
-            void AddAction(Action* action)                          { mActions.Add(action); }
-            uint32 GetNumActions() const                            { return mActions.GetLength(); }
-            Action* GetAction(uint32 index)                         { return mActions[index]; }
-            const char* GetName() const                             { return mName.c_str(); }
-            const AZStd::string& GetNameString() const              { return mName; }
-            Action* FindActionByName(const char* actionName, bool local) const;
+
+            void AddAction(AZStd::unique_ptr<Action> action)        { m_actions.emplace_back(AZStd::move(action)); }
+            void RemoveAction(QAction* action, bool local);
+            size_t GetNumActions() const                            { return m_actions.size(); }
+            Action* GetAction(size_t index)                         { return m_actions[index].get(); }
+            const AZStd::vector<AZStd::unique_ptr<Action>>& GetActions() const { return m_actions; }
+            const AZStd::string& GetName() const                    { return m_name; }
+            Action* FindActionByName(const QString& actionName, bool local) const;
 
         private:
-            AZStd::string           mName;
-            MCore::Array<Action*>   mActions;
+            AZStd::string m_name;
+            AZStd::vector<AZStd::unique_ptr<Action>> m_actions;
         };
 
-        void RegisterKeyboardShortcut(const char* actionName, const char* groupName, int defaultKey, bool defaultCtrl, bool defaultAlt, bool local);
-        bool Check(QKeyEvent* event, const char* actionName, const char* groupName);
-        Action* FindShortcut(int key, bool ctrl, bool alt, Group* group);
-        Action* FindAction(const char* actionName, const char* groupName);
-        Group* FindGroupForShortcut(Action* action);
-        uint32 GetNumGroups() const             { return mGroups.GetLength(); }
-        Group* GetGroup(uint32 index) const     { return mGroups[index]; }
-        void Clear();
+        void RegisterKeyboardShortcut(QAction* qaction, AZStd::string_view groupName, bool local);
+        void UnregisterKeyboardShortcut(QAction* qaction, AZStd::string_view groupName, bool local);
+        Action* FindShortcut(QKeySequence keySequence, Group* group) const;
+        Action* FindAction(const QString& actionName, AZStd::string_view groupName) const;
+        Group* FindGroupForShortcut(Action* action) const;
+        size_t GetNumGroups() const             { return m_groups.size(); }
+        Group* GetGroup(size_t index) const     { return m_groups[index].get(); }
 
         void Save(QSettings* settings);
         void Load(QSettings* settings);
 
     private:
-        MCore::Array<Group*> mGroups;
+        AZStd::vector<AZStd::unique_ptr<Group>> m_groups;
 
-        Group* FindGroupByName(const char* groupName) const;
+        Group* FindGroupByName(AZStd::string_view groupName) const;
     };
 } // namespace MysticQt
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h
index 54d2fddb54..90df0bf418 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h
@@ -39,14 +39,19 @@ enum
 // convert from a QString into an AZStd::string
 MCORE_INLINE AZStd::string FromQtString(const QString& s)
 {
-    return s.toUtf8().data();
+    return {s.toUtf8().data(), static_cast<size_t>(s.size())};
 }
 
 
 // convert from a QString into an AZStd::string
 MCORE_INLINE void FromQtString(const QString& s, AZStd::string* result)
 {
-    *result = s.toUtf8().data();
+    *result = AZStd::string{s.toUtf8().data(), static_cast<size_t>(s.size())};
+}
+
+inline QString FromStdString(AZStd::string_view s)
+{
+    return QString::fromUtf8(s.data(), static_cast<int>(s.size()));
 }
 
 // forward declare a MysticQt class
diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
index 94feb36e80..982b62fbcf 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
@@ -24,7 +24,6 @@
 #include <AzFramework/Visibility/BoundsBus.h>
 
 #include <LmbrCentral/Animation/AttachmentComponentBus.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
 
 #include <Integration/Components/ActorComponent.h>
 #include <Integration/Rendering/RenderBackendManager.h>
@@ -414,9 +413,6 @@ namespace EMotionFX
 
             CheckAttachToEntity();
 
-            // Send general mesh creation notification to interested parties.
-            LmbrCentral::MeshComponentNotificationBus::Event(entityId, &LmbrCentral::MeshComponentNotifications::OnMeshCreated, m_configuration.m_actorAsset);
-
             Physics::RagdollConfiguration ragdollConfiguration;
             [[maybe_unused]] bool ragdollConfigValid = GetRagdollConfiguration(ragdollConfiguration);
             AZ_Assert(ragdollConfigValid, "Ragdoll Configuration is not valid");
@@ -460,11 +456,6 @@ namespace EMotionFX
 
                 m_attachmentTargetActor = nullptr;
 
-                // Send general mesh destruction notification to interested parties.
-                LmbrCentral::MeshComponentNotificationBus::Event(
-                    GetEntityId(), 
-                    &LmbrCentral::MeshComponentNotifications::OnMeshDestroyed);
-
                 ActorComponentNotificationBus::Event(
                     GetEntityId(),
                     &ActorComponentNotificationBus::Events::OnActorInstanceDestroyed,
diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
index 6958710b1a..eee9896dee 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
@@ -22,7 +22,7 @@
 #include <Integration/Components/AnimAudioComponent.h>
 
 #include <LmbrCentral/Audio/AudioProxyComponentBus.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>     // for SkeletalHierarchyRequestBus
+#include <LmbrCentral/Animation/SkeletalHierarchyRequestBus.h>
 
 #include <MathConversion.h>
 
diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphNetSyncComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphNetSyncComponent.cpp
index 49f6ab0a08..904f500018 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphNetSyncComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphNetSyncComponent.cpp
@@ -125,7 +125,7 @@ namespace EMotionFX
                             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::Category, "Networking")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AnimGraphNetSync.svg")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AnimGraphNetSync.svg")
                             ->DataElement( AZ::Edit::UIHandlers::Default, &AnimGraphNetSyncComponent::m_syncParameters, "Sync parameters",
                                 "Synchronize parameters of the anim graph on the entity" )
                             ->DataElement( AZ::Edit::UIHandlers::Default, &AnimGraphNetSyncComponent::m_syncActiveNodes, "Sync active nodes",
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
index 3aa281c4c2..f45fe43f4e 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
@@ -26,8 +26,6 @@
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-
 #include <Integration/Editor/Components/EditorActorComponent.h>
 #include <Integration/AnimGraphComponentBus.h>
 #include <Integration/Rendering/RenderBackendManager.h>
@@ -255,11 +253,6 @@ namespace EMotionFX
         {
             if (m_actorInstance)
             {
-                // Send general mesh destruction notification to interested parties.
-                LmbrCentral::MeshComponentNotificationBus::Event(
-                    GetEntityId(),
-                    &LmbrCentral::MeshComponentNotifications::OnMeshDestroyed);
-
                 ActorComponentNotificationBus::Event(
                     GetEntityId(),
                     &ActorComponentNotificationBus::Events::OnActorInstanceDestroyed,
@@ -650,7 +643,6 @@ namespace EMotionFX
             }
 
             distance = std::numeric_limits<float>::max();
-            bool isHit = false;
 
             // Get the MCore::Ray used by Mesh::Intersects
             // Convert the input source position and direction to a line segment by using the frustum depth as line length.
@@ -659,12 +651,13 @@ namespace EMotionFX
             const AZ::Vector3 dest = src + dir * frustumDepth;
             const MCore::Ray ray(src, dest);
 
-            // Update the mesh deformers so the intersection test will hit the actor if it is being
-            // animated by a motion component that is previewing the animation in the editor
+            // Update the mesh deformers (apply software skinning and morphing) so the intersection test will hit the actor
+            // if it is being animated by a motion component that is previewing the animation in the editor.
             m_actorInstance->UpdateMeshDeformers(0.0f, true);
 
             const TransformData* transformData = m_actorInstance->GetTransformData();
             const Pose* currentPose = transformData->GetCurrentPose();
+            bool isHit = false;
 
             // Iterate through the meshes in the actor, looking for the closest hit
             const AZ::u32 lodLevel = m_actorInstance->GetLODLevel();
@@ -848,11 +841,6 @@ namespace EMotionFX
 
             if (m_actorInstance)
             {
-                // Send general mesh destruction notification to interested parties.
-                LmbrCentral::MeshComponentNotificationBus::Event(
-                    GetEntityId(),
-                    &LmbrCentral::MeshComponentNotifications::OnMeshDestroyed);
-
                 ActorComponentNotificationBus::Event(
                     GetEntityId(),
                     &ActorComponentNotificationBus::Events::OnActorInstanceDestroyed,
@@ -941,9 +929,6 @@ namespace EMotionFX
             {
                 LmbrCentral::AttachmentComponentRequestBus::Event(attachment, &LmbrCentral::AttachmentComponentRequestBus::Events::Reattach, true);
             }
-
-            // Send general mesh creation notification to interested parties.
-            LmbrCentral::MeshComponentNotificationBus::Event(GetEntityId(), &LmbrCentral::MeshComponentNotifications::OnMeshCreated, m_actorAsset);
         }
     } //namespace Integration
 } // namespace EMotionFX
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp
index 82073a16cc..bb8e93d29c 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp
@@ -51,7 +51,7 @@ namespace EMotionFX
                     editContext->Class<EditorAnimAudioComponent>("Audio Animation", "Adds ability to execute audio triggers when animation events occur.")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioAnimation.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioAnimation.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(AZ::Edit::UIHandlers::Default, &EditorAnimAudioComponent::m_editorTriggerEvents, "Trigger Map", "Maps the animation events to executable audio triggers.");
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
index 0c370c9f6e..a5f95f65f4 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
@@ -47,8 +47,8 @@ namespace EMotionFX
                         "Simple LOD Distance", "The Simple LOD distance component alters the actor skeleton LOD level based on camera distance.")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Animation")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/SimpleLODDistance.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Mannequin.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/SimpleLODDistance.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Mannequin.png")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(0, &EditorSimpleLODComponent::m_configuration, "LOD Configuration", "");
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
index 1d09b3e255..4b463958af 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
@@ -47,9 +47,9 @@ namespace EMotionFX
                         "Simple Motion", "The Simple Motion component assigns a single motion to the associated Actor in lieu of an Anim Graph component")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Animation")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/SimpleMotion.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/SimpleMotion.svg")
                         ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, azrtti_typeid<MotionAsset>())
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Mannequin.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Mannequin.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(0, &EditorSimpleMotionComponent::m_previewInEditor, "Preview In Editor", "Plays motion in Editor")
diff --git a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp
index a7f9ae228f..c7b2363ad4 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp
@@ -22,6 +22,7 @@
 #include <EMotionStudio/EMStudioSDK/Source/EMStudioManager.h>
 #include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h>
 #include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h>
+#include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h>
 
 #include <EMotionFX/Source/AnimGraphBindPoseNode.h>
 
@@ -64,8 +65,10 @@ namespace EMotionFX {
         m_blendGraphWidget->OnContextMenuEvent(m_blendGraphWidget, localPoint, m_blendGraphWidget->LocalToGlobal(localPoint), m_animGraphPlugin, m_blendGraphWidget->GetActiveGraph()->GetSelectedAnimGraphNodes(), true, false, m_animGraphPlugin->GetActionFilter());
 
         // Find Action for deleting node
-        QAction* deleteAction = GetNamedAction(m_blendGraphWidget, "Delete Node");
-        ASSERT_TRUE(deleteAction) << "Could not find the 'Delete Node' action in the context menu";
+        QAction* deleteAction = GetNamedAction(m_animGraphPlugin->GetViewWidget(), FromStdString(EMStudio::AnimGraphPlugin::s_deleteSelectedNodesShortcutName));
+        ASSERT_TRUE(deleteAction) << "Could not find the '" <<
+            std::string(EMStudio::AnimGraphPlugin::s_deleteSelectedNodesShortcutName.data(), EMStudio::AnimGraphPlugin::s_deleteSelectedNodesShortcutName.size()) 
+            << "' action in the context menu";
 
         // Trigger delete
         const size_t nodeCount = activeAnimGraph->GetNumNodes();
diff --git a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp
index 819c24baa7..98fec0fe13 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp
@@ -18,6 +18,7 @@
 #include <EMotionFX/Source/AnimGraphMotionNode.h>
 #include <EMotionFX/Source/AnimGraphStateMachine.h>
 #include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h>
+#include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h>
 #include <QApplication>
 #include <QtTest>
 #include "qtestsystem.h"
@@ -80,9 +81,8 @@ namespace EMotionFX
         ASSERT_TRUE(modelIndex.isValid()) << "Anim graph transition has an invalid model index.";
         animGraphModel.GetSelectionModel().select(QItemSelection(modelIndex, modelIndex), QItemSelectionModel::Current | QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 
-        // Delete key pressed.
-        EMStudio::BlendGraphWidget* blendGraphWidget = animGraphPlugin->GetGraphWidget();
-        QTest::keyClick((QWidget*)blendGraphWidget, Qt::Key_Delete);
+        EMStudio::BlendGraphViewWidget* blendGraphViewWidget = animGraphPlugin->GetViewWidget();
+        blendGraphViewWidget->GetAction(EMStudio::BlendGraphViewWidget::EDIT_DELETE)->trigger();
 
         // Check if the transition get deleted.
         ASSERT_EQ(0, m_animGraph->GetRootStateMachine()->GetNumTransitions()) << " Anim Graph transition should be removed";
diff --git a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
index 53f5be5bc4..4e1a3dc06e 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
@@ -154,7 +154,7 @@ namespace RedirectOutput
 
         RedirectOutputType.tp_new = PyType_GenericNew;
         if (PyType_Ready(&RedirectOutputType) < 0)
-        { 
+        {
             return 0;
         }
 
@@ -189,7 +189,7 @@ namespace RedirectOutput
     void ResetRedirection(const char* funcname, PyObject*& saved, PyObject*& current)
     {
         if (current)
-        { 
+        {
             PySys_SetObject(funcname, saved);
         }
         Py_XDECREF(current);
@@ -204,7 +204,7 @@ namespace RedirectOutput
 
         s_RedirectModule = module;
 
-        SetRedirection("stdout", g_redirect_stdout_saved, g_redirect_stdout, [](const char* msg) 
+        SetRedirection("stdout", g_redirect_stdout_saved, g_redirect_stdout, [](const char* msg)
         {
             EditorPythonConsoleNotificationBus::Broadcast(&EditorPythonConsoleNotificationBus::Events::OnTraceMessage, msg);
         });
@@ -363,8 +363,7 @@ namespace EditorPythonBindings
 
         auto resolveScriptPath = [&pythonPathStack](AZStd::string_view path)
         {
-            AZ::IO::Path editorScriptsPath(path);
-            editorScriptsPath /= "Editor/Scripts";
+            auto editorScriptsPath = AZ::IO::Path(path) / "Editor" / "Scripts";
             if (AZ::IO::SystemFile::Exists(editorScriptsPath.c_str()))
             {
                 pythonPathStack.emplace_back(AZStd::move(editorScriptsPath.LexicallyNormal().Native()));
@@ -372,7 +371,7 @@ namespace EditorPythonBindings
         };
 
         // The discovery order will be:
-        //   1 - engine
+        //   1 - engine-root/EngineAsets
         //   2 - gems
         //   3 - project
         //   4 - user(dev)
@@ -381,7 +380,7 @@ namespace EditorPythonBindings
         AZ::IO::FixedMaxPath engineRoot;
         if (settingsRegistry->Get(engineRoot.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder); !engineRoot.empty())
         {
-            resolveScriptPath(engineRoot.Native());
+            resolveScriptPath((engineRoot / "Assets").Native());
         }
 
         // 2 - gems
@@ -470,7 +469,7 @@ namespace EditorPythonBindings
         }
     }
 
- 
+
 
     bool PythonSystemComponent::StartPythonInterpreter(const PythonPathStack& pythonPathStack)
     {
@@ -502,7 +501,7 @@ namespace EditorPythonBindings
             // ignore system location for sites site-packages
             Py_IsolatedFlag = 1; // -I - Also sets Py_NoUserSiteDirectory.  If removed PyNoUserSiteDirectory should be set.
             Py_IgnoreEnvironmentFlag = 1; // -E
-             
+
             const bool initializeSignalHandlers = true;
             pybind11::initialize_interpreter(initializeSignalHandlers);
 
@@ -555,7 +554,7 @@ namespace EditorPythonBindings
         }
         return false;
     }
-    
+
     bool PythonSystemComponent::StopPythonInterpreter()
     {
         if (Py_IsInitialized())
@@ -704,7 +703,7 @@ namespace EditorPythonBindings
             // Acquire GIL before calling Python code
             AZStd::lock_guard<decltype(m_lock)> lock(m_lock);
             pybind11::gil_scoped_acquire acquire;
-        
+
             // Create standard "argc" / "argv" command-line parameters to pass in to the Python script via sys.argv.
             // argc = number of parameters.  This will always be at least 1, since the first parameter is the script name.
             // argv = the list of parameters, in wchar format.
diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
index ac49d7da7a..8b8960fb45 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
@@ -128,7 +128,7 @@ namespace GraphCanvas
 
     const char* TranslationAssetHandler::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/Names.svg";
+        return "Icons/Components/Names.svg";
     }
 
     AZ::Uuid TranslationAssetHandler::GetComponentTypeId() const
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
index 770e1190be..7b15d6680d 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
@@ -21,7 +21,6 @@
 #include <AzCore/std/sort.h>
 #include <AzCore/std/string/conversions.h>
 #include <LmbrCentral/Rendering/MaterialOwnerBus.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
 #include <LmbrCentral/Rendering/RenderNodeBus.h>
 #include <IRenderAuxGeom.h>
 #include <IViewSystem.h>
@@ -518,18 +517,6 @@ namespace ImGui
                 ImGui::EndChild(); // End the "Meshes in Scene" Child
             }
         }
-
-        // Check to make sure the Tick Bus Connection status matches the debug enabled flag
-        if (m_meshDebugEnabled && !AZ::TickBus::Handler::BusIsConnected())
-        {
-            // Connect to the Tick Bus
-            AZ::TickBus::Handler::BusConnect();
-        }
-        else if (!m_meshDebugEnabled && AZ::TickBus::Handler::BusIsConnected())
-        {
-            // Disconnect from the Tick Bus
-            AZ::TickBus::Handler::BusDisconnect();
-        }
     }
 
     // Mesh Mouse Over Helper function
@@ -597,81 +584,6 @@ namespace ImGui
         instanceOptions.m_mousedOverForDraw |= ImGui::IsItemHovered();
     }
 
-    void ImGuiLYAssetExplorer::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
-    {
-        // Search through all entities for Asset Components
-        OnTick_FindAssets();
-
-        // Check for all relevant pointers here. ( Actually requires checking all of these for different edge cases! :(
-        if (gEnv && gEnv->pRenderer && gEnv->pSystem && 
-            gEnv->pSystem->GetIViewSystem() && gEnv->pSystem->GetIViewSystem()->GetActiveView() &&
-            gEnv->pSystem->GetIViewSystem()->GetActiveView()->GetCurrentParams())
-        {
-            // Get the Camera View Position from the view system.
-            const Vec3& cameraPosVec3 = gEnv->pSystem->GetIViewSystem()->GetActiveView()->GetCurrentParams()->position;
-            const AZ::Vector3 cameraPos(cameraPosVec3.x, cameraPosVec3.y, cameraPosVec3.z);
-
-            // Loop through all Meshes to draw the appropriate ones!
-            for (const MeshInstanceDisplayList& meshInstanceList : m_meshInstanceDisplayList)
-            {
-                // bunch of different ways to filter results. First check for Mesh and Instance Name Filters...
-                bool displayMesh = true;
-                if (m_meshNameFilter)
-                {
-                    displayMesh &= meshInstanceList.m_passesFilter;
-                }
-                if (m_entityNameFilter)
-                {
-                    displayMesh &= meshInstanceList.m_childrenPassFilter;
-                }
-
-                // ..Mouse Overs and Selection Filters should override other filters, so do it after.. Mouse Over THEN Selection Filter for precedence. 
-                if (m_anyMousedOverForDraw)
-                {
-                    displayMesh = meshInstanceList.m_mousedOverForDraw || meshInstanceList.m_childMousedOverForDraw;
-                }
-                else if (m_selectionFilter)
-                {
-                    displayMesh = meshInstanceList.m_selectedForDraw;
-                    for (const auto& meshInstance : meshInstanceList.m_instanceOptionMap)
-                    {
-                        displayMesh |= meshInstance.second.m_selectedForDraw;
-                    }
-                }
-
-                if (displayMesh)
-                {
-                    for (const auto& meshInstance : meshInstanceList.m_instanceOptionMap)
-                    {
-                        AZ::Data::Asset<AZ::Data::AssetData> meshAsset;
-                        LmbrCentral::MeshComponentRequestBus::EventResult(meshAsset, meshInstance.first, &LmbrCentral::MeshComponentRequests::GetMeshAsset);
-                        // See if we pass name filter first.. 
-                        bool displayEntity = true;
-                        if (m_entityNameFilter)
-                        {
-                            displayEntity = meshInstance.second.m_passesFilter;
-                        }
-
-                        // ..Mouse Overs and Selection Filters should override other filters, so do it after.. Mouse Over THEN Selection Filter for precedence. 
-                        if (m_anyMousedOverForDraw)
-                        {
-                            displayEntity = meshInstance.second.m_mousedOverForDraw || meshInstanceList.m_mousedOverForDraw;
-                        }
-                        else if (m_selectionFilter)
-                        {
-                            displayEntity = meshInstance.second.m_selectedForDraw | meshInstanceList.m_selectedForDraw;
-                        }
-
-                        if (displayEntity)
-                        {
-                            OnTick_DrawEntity(meshInstance.first, meshAsset.GetId(), gEnv->pRenderer, cameraPos);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     MeshInstanceDisplayList& ImGuiLYAssetExplorer::FindOrCreateMeshInstanceList(const char* meshName)
     {
         // Walk the list and see if an entry for this mesh exists already. If we find one, return it!
@@ -696,250 +608,6 @@ namespace ImGui
         m_meshInstanceDisplayList.push_back(meshList);
         return m_meshInstanceDisplayList.back();
     }
-
-    // Scan the scene for Meshes!
-    void ImGuiLYAssetExplorer::OnTick_FindAssets()
-    {
-        // Retrieve Id map from game entity context (editor->runtime).
-        AzFramework::EntityContextId gameContextId = AzFramework::EntityContextId::CreateNull();
-        AzFramework::GameEntityContextRequestBus::BroadcastResult(gameContextId, &AzFramework::GameEntityContextRequests::GetGameEntityContextId);
-
-        // Get the Root Slice Component
-        AZ::SliceComponent* rootSliceComponent;
-        AzFramework::SliceEntityOwnershipServiceRequestBus::EventResult(rootSliceComponent, gameContextId,
-            &AzFramework::SliceEntityOwnershipServiceRequests::GetRootSlice);
-
-        if (rootSliceComponent)
-        {
-            // Get an unordered_set of all EntityIds in the slice
-            AZ::SliceComponent::EntityIdSet entityIds;
-            rootSliceComponent->GetEntityIds(entityIds);
-
-            // Loop through Mesh Map and "un-verify" them
-            for (MeshInstanceDisplayList& meshInstanceList : m_meshInstanceDisplayList)
-            {
-                for (auto& meshInstance : meshInstanceList.m_instanceOptionMap)
-                {
-                    meshInstance.second.m_verifiedThisFrame = false;
-                }
-            }
-
-            for (auto it = entityIds.begin(); it != entityIds.end(); it++)
-            {
-                AZ::Data::Asset<AZ::Data::AssetData> meshAsset;
-                LmbrCentral::MeshComponentRequestBus::EventResult(meshAsset, *it, &LmbrCentral::MeshComponentRequests::GetMeshAsset);
-
-                if (meshAsset.IsReady())
-                {
-                    // Get the Asset Info so we can get the mesh path
-                    AZ::Data::AssetInfo assetInfo;
-                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, meshAsset.GetId());
-
-                    AZStd::string meshPath = assetInfo.m_relativePath;
-                    AZStd::to_lower(meshPath.begin(), meshPath.end());
-                    // Save off this mesh instance into the instance map
-                    MeshInstanceDisplayList& displayList = FindOrCreateMeshInstanceList(meshPath.c_str());
-                    if (!displayList.m_instanceOptionMap.count(*it))
-                    {
-                        // Get the Entity Name, for easy searching later
-                        AZStd::string entityName;
-                        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationBus::Events::GetEntityName, *it);
-
-                        // Init the instance entry and options
-                        MeshInstanceOptions& meshOptions = displayList.m_instanceOptionMap[*it];
-                        meshOptions.m_verifiedThisFrame = true;
-                        meshOptions.m_passesFilter = true;
-                        meshOptions.m_selectedForDraw = false;
-                        meshOptions.m_mousedOverForDraw = false;
-                        meshOptions.m_instanceLabel = AZStd::string::format("%s%s", (*it).ToString().c_str(), entityName.c_str());
-                        AZStd::to_lower(meshOptions.m_instanceLabel.begin(), meshOptions.m_instanceLabel.end());
-                    }
-                    else
-                    {
-                        displayList.m_instanceOptionMap[*it].m_verifiedThisFrame = true;
-                    }
-                }
-            }
-
-            // Loop through Mesh Map again and remove any "un-verify"-ed entries!
-            for (auto meshInstanceListIter = m_meshInstanceDisplayList.begin(); meshInstanceListIter != m_meshInstanceDisplayList.end();)
-            {
-                for (auto meshInstanceIter = (*meshInstanceListIter).m_instanceOptionMap.begin(); meshInstanceIter != (*meshInstanceListIter).m_instanceOptionMap.end();)
-                {
-                    if (!(*meshInstanceIter).second.m_verifiedThisFrame)
-                    {
-                        // erase this instance from the map and set the iterator correctly.
-                        meshInstanceIter = (*meshInstanceListIter).m_instanceOptionMap.erase(meshInstanceIter);
-                    }
-                    else
-                    {
-                        // increment the iterator
-                        meshInstanceIter++;
-                    }
-                }
-
-                // Remove the Mesh Entry if there are no instances remaining
-                if ((*meshInstanceListIter).m_instanceOptionMap.empty())
-                {
-                    meshInstanceListIter = m_meshInstanceDisplayList.erase(meshInstanceListIter);
-                }
-                else
-                {
-                    // increment the iterator
-                    meshInstanceListIter++;
-                }
-            }
-        }
-    }
-
-    // We know we want to draw this Entity/Mesh ( depending on distance from Cam ).. so draw!
-    void ImGuiLYAssetExplorer::OnTick_DrawEntity(const AZ::EntityId& entity, const AZ::Data::AssetId& assetId, IRenderer* renderer, const AZ::Vector3& cameraPos)
-    {
-        // Get the Entity Position so we can see how far from the camera we are.
-        AZ::Vector3 worldPos = AZ::Vector3::CreateZero();
-        AZ::TransformBus::EventResult(worldPos, entity, &AZ::TransformBus::Events::GetWorldTranslation);
-         
-        // Get Our Distance From The Camera! ( Used just for draw alpha value )
-        float distFromCamera = m_distanceFilter_far + 1.0f; // Default to just outside camera view ( i.e. Don't draw )
-        if (m_anyMousedOverForDraw || m_selectionFilter || !m_distanceFilter)
-        {
-            // If we have either the Selection Filter or Mouse Over state on or the distance filter is off, and we made it this far, we are the lucky selected one! Draw ourselves by setting dist to 0.0f
-            distFromCamera = 0.0;
-        }
-        else if (m_distanceFilter)
-        {
-            // Distance filter is on and we aren't selected, so actually find the distance from the camera
-            distFromCamera = worldPos.GetDistance(cameraPos);
-        }
-
-        // Only draw things within view distance ( cheese it to zero above to force drawing far things )
-        if (distFromCamera <= m_distanceFilter_far)
-        {
-            // Find an interpolated Alpha.. 1.0f while inside near radius, interp 1.0 -> 0.0 while heading toward far radius
-            float alpha = (distFromCamera <= m_distanceFilter_near) ? 1.0f : (1.0f - ((distFromCamera - m_distanceFilter_near) / (m_distanceFilter_far - m_distanceFilter_near)));
-
-            // The string to hold label text we will build.
-            AZStd::string entityLabel;
-            
-            // Grab the Asset Info to get the mesh path name.
-            AZ::Data::AssetInfo assetInfo;
-            AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, assetId);
-
-            // Start the label with either the EntName and Mesh, or just Mesh
-            if (m_inWorld_label_entityName)
-            {
-                AZ::ComponentApplicationBus::BroadcastResult(entityLabel, &AZ::ComponentApplicationBus::Events::GetEntityName, entity);
-                entityLabel = AZStd::string::format("Entity: %s %s\nMesh:    %s", entity.ToString().c_str(), entityLabel.c_str(), assetInfo.m_relativePath.c_str());
-            }
-            else
-            {
-                entityLabel = AZStd::string::format("Mesh:    %s", assetInfo.m_relativePath.c_str());
-            }
-            
-            // See if we should add the Material!
-            if (m_inWorld_label_materialName)
-            {
-                _smart_ptr<IMaterial> material;
-                LmbrCentral::MaterialOwnerRequestBus::EventResult(material, entity, &LmbrCentral::MaterialOwnerRequests::GetMaterial);
-                if (material)
-                {
-                    entityLabel.append(AZStd::string::format("\nMaterial: %s", material->GetName()));
-                }
-            }
-            
-            // Get The Render Node for mesh debug draw and Lod Info
-            IRenderNode* renderNode = nullptr;
-            LmbrCentral::RenderNodeRequestBus::EventResult(renderNode, entity, &LmbrCentral::RenderNodeRequests::GetRenderNode);
-
-            if (renderNode != nullptr && renderNode->GetEntityStatObj())
-            {
-                // Debug Draw Mesh
-                if (m_inWorld_debugDrawMesh)
-                {
-                    SGeometryDebugDrawInfo dd;
-                    dd.color.Set(0.0f, 0.0f, 255.0f, 0.5f * alpha);
-                    dd.lineColor.Set(255.0f, 0.0f, 0.0f, 0.75f * alpha);
-                    renderNode->GetEntityStatObj()->DebugDraw(dd, 0.2f);
-                }
-                // Draw Total Lods info
-                if (m_inWorld_label_totalLods)
-                {
-                    entityLabel.append(AZStd::string::format("\nTotal Lods: %d", renderNode->GetEntityStatObj()->GetLoadedLodsNum()));
-                }
-                // Draw Misc Lod Info
-                if (m_inWorld_label_miscLod)
-                {
-                    entityLabel.append(AZStd::string::format("\nFirst Lod Distance: %f", renderNode->GetFirstLodDistance()));
-                    float distances[SMeshLodInfo::s_nMaxLodCount];
-                    renderNode->GetLodDistances(gEnv->p3DEngine->GetFrameLodInfo(), distances);
-                    for (int i = 0; i < SMeshLodInfo::s_nMaxLodCount; i++)
-                    {
-                        entityLabel.append(AZStd::string::format("\n  frameLod: %d - %f", i, distances[i]));
-                    }
-                }
-            }
-
-            // Draw the label in the world
-            if (m_inWorld_drawLabel)
-            {
-                SDrawTextInfo ti;
-                ti.xscale = ti.yscale = m_inWorld_labelTextSize * alpha;
-                ti.flags = eDrawText_FixedSize | eDrawText_Center | eDrawText_800x600;
-                if (m_inWorld_label_framed)
-                {
-                    ti.flags |= eDrawText_Framed;
-                }
-                if (m_inWorld_label_monoSpace)
-                {
-                    ti.flags |= eDrawText_Monospace;
-                }
-
-                {
-                    ti.color[0] = m_inWorld_label_textColor.Value.x;
-                    ti.color[1] = m_inWorld_label_textColor.Value.y;
-                    ti.color[2] = m_inWorld_label_textColor.Value.z;
-                    ti.color[3] = alpha;
-                }
-                Vec3 labelPos(worldPos.GetX(), worldPos.GetY(), worldPos.GetZ() - m_inWorld_originSphereRadius);
-                renderer->DrawTextQueued(labelPos, ti, entityLabel.c_str());
-            }
-
-            // Draw the sphere and/or AABB in the world
-            if (m_inWorld_drawOriginSphere || m_inWorld_drawAABB)
-            {
-                IRenderAuxGeom* pAuxGeom = renderer->GetIRenderAuxGeom();
-                if (pAuxGeom)
-                {
-                    const ColorF sphereColor(m_inWorld_label_textColor.Value.x, m_inWorld_label_textColor.Value.y, m_inWorld_label_textColor.Value.z, alpha);
-                    Vec3 spherePos(worldPos.GetX(), worldPos.GetY(), worldPos.GetZ());
-
-                    // draw a sample sphere
-                    SAuxGeomRenderFlags oldFlags = pAuxGeom->GetRenderFlags();
-                    SAuxGeomRenderFlags flags = oldFlags;
-                    flags.SetDepthWriteFlag(e_DepthWriteOff);
-                    flags.SetDepthTestFlag(e_DepthTestOff);
-                    flags.SetDrawInFrontMode(e_DrawInFrontOn);
-                    flags.SetFillMode(e_FillModeSolid);
-                    flags.SetCullMode(e_CullModeNone);
-                    pAuxGeom->SetRenderFlags(flags);
-
-                    if ( m_inWorld_drawOriginSphere)
-                    {
-                        pAuxGeom->DrawSphere(spherePos, m_inWorld_originSphereRadius, sphereColor, false);
-                    }
-
-                    if (m_inWorld_drawAABB && renderNode)
-                    {
-                        pAuxGeom->DrawAABB(renderNode->GetBBox(), false, sphereColor, EBoundingBoxDrawStyle::eBBD_Extremes_Color_Encoded);
-                    }
-
-                    // Restore rendering state
-                    pAuxGeom->SetRenderFlags(oldFlags);
-                }
-            }
-        }
-    }
-
-} // namespace ImGui
+ } // namespace ImGui
 
 #endif // IMGUI_ENABLED
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h
index 29584c84d3..b5f8ea576c 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h
@@ -43,7 +43,6 @@ namespace ImGui
 
     class ImGuiLYAssetExplorer
         : public ImGuiAssetExplorerRequestBus::Handler
-        , public AZ::TickBus::Handler
 
     {
     public:
@@ -61,10 +60,6 @@ namespace ImGui
         void SetEnabled(bool enabled) override { m_enabled = enabled; m_meshDebugEnabled = enabled; }
         // -- ImGuiAssetExplorerRequestBus::Handler Interface ----------------------
 
-        // -- AZ::TickBus::Handler Interface ---------------------------------------
-        void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-        // -- AZ::TickBus::Handler Interface ---------------------------------------
-
         // Toggle the menu on and off
         void ToggleEnabled() { m_enabled = !m_enabled; }
 
@@ -117,9 +112,6 @@ namespace ImGui
         void ImGuiUpdate_DrawMeshMouseOver(MeshInstanceDisplayList& meshDisplayList);
         void ImGuiUpdate_DrawEntityInstanceMouseOver(MeshInstanceDisplayList& meshDisplayList, AZ::EntityId& entityInstance, AZStd::string& entityName, MeshInstanceOptions& instanceOptions);
 
-        // Helper functions for the OnTick callback
-        void OnTick_DrawEntity(const AZ::EntityId& entity, const AZ::Data::AssetId& assetId, IRenderer* renderer, const AZ::Vector3& cameraPos);
-        void OnTick_FindAssets();
     };
 }
 #endif // IMGUI_ENABLED
diff --git a/Gems/ImageProcessing/Code/Tests/ImageProcessing_Test.cpp b/Gems/ImageProcessing/Code/Tests/ImageProcessing_Test.cpp
index d60dc20ef9..78094bf90f 100644
--- a/Gems/ImageProcessing/Code/Tests/ImageProcessing_Test.cpp
+++ b/Gems/ImageProcessing/Code/Tests/ImageProcessing_Test.cpp
@@ -47,11 +47,11 @@
 #include <array>
 #include <utility>
 
-//Enable generate image files for result of some tests. 
+//Enable generate image files for result of some tests.
 //This is slow and only useful for debugging. This should be disabled for unit test
 //#define DEBUG_OUTPUT_IMAGES
 
-//There are some test functions in this test which are DISABLED. They were mainly for programming tests. 
+//There are some test functions in this test which are DISABLED. They were mainly for programming tests.
 //It's only recommended to enable them for programming test purpose.
 
 #include <AzCore/UnitTest/UnitTest.h>
@@ -72,7 +72,7 @@ protected:
     AZStd::unique_ptr<QCoreApplication> m_coreApplication; // required by engine root and IsExtensionSupported
     AZStd::unique_ptr<AZ::SerializeContext> m_context;
     AZStd::string m_engineRoot;
-    
+
     void SetUp() override
     {
         BuilderSettingManager::CreateInstance();
@@ -81,13 +81,13 @@ protected:
         m_context = AZStd::make_unique<AZ::SerializeContext>();
         BuilderPluginComponent::Reflect(m_context.get());
         AZ::DataPatch::Reflect(m_context.get());
-        
+
         // Startup default local FileIO (hits OSAllocator) if not already setup.
         if (AZ::IO::FileIOBase::GetInstance() == nullptr)
         {
             AZ::IO::FileIOBase::SetInstance(aznew AZ::IO::LocalFileIO());
         }
-        
+
         // Adding this handler to allow utility functions access the serialize context
         AZ::ComponentApplicationBus::Handler::BusConnect();
         AZ::Interface<AZ::ComponentApplicationRequests>::Register(this);
@@ -146,7 +146,7 @@ protected:
     {
         return m_context.get();
     }
-    
+
     //enum names for Images with specific identification
     enum ImageFeature
     {
@@ -203,7 +203,7 @@ public:
         //create the directory if it's not exist
         const AZStd::string outputDir = AZ::Test::GetEngineRootPath() + "/Gems/ImageProcessing/Code/Tests/TestAssets/Output/";
         QDir dir(outputDir.c_str());
-        if (!dir.exists()) 
+        if (!dir.exists())
         {
             dir.mkpath(".");
         }
@@ -217,7 +217,7 @@ public:
 
         IImageObjectPtr finalImage = imageToProcess.Get();
 
-        //for each mipmap 
+        //for each mipmap
         for (uint32 mip = 0; mip < finalImage->GetMipCount() && mip < maxMipCnt; mip++)
         {
             uint8* imageBuf;
@@ -241,7 +241,7 @@ public:
     {
         bool isImageLoaded = true;
         bool isDifferent = false;
-        
+
         if (image1 == nullptr)
         {
             isImageLoaded = false;
@@ -258,7 +258,7 @@ public:
         {
             return (!image1 && !image2) ? false: true;
         }
-        
+
         // Mip
         int mip1 = image1->GetMipCount();
         int mip2 = image2->GetMipCount();
@@ -275,7 +275,7 @@ public:
         // Flag
         AZ::u32 flag1 = image1->GetImageFlags();
         AZ::u32 flag2 = image2->GetImageFlags();
-        
+
         isDifferent |= (flag1 != flag2);
 
         // Size
@@ -288,9 +288,9 @@ public:
         // Error
         float error = GetErrorBetweenImages(image1, image2);
 
-        static float EPSILON = 0.000001f; 
+        static float EPSILON = 0.000001f;
         isDifferent |= abs(error) >= EPSILON;
-        
+
         output += QString(",%1/%2,%3,%4/%5,%6/%7,").arg(QString::number(mip1,'f',1), QString::number(mip2,'f',1), QString::number(mipDiff),
             QString(ImageProcessingEditor::EditorHelper::s_PixelFormatString[format1]),
             QString(ImageProcessingEditor::EditorHelper::s_PixelFormatString[format2]),
@@ -309,8 +309,8 @@ public:
     static bool CompareDDSImage(const QString& imagePath1, const QString& imagePath2, QString& output)
     {
         IImageObjectPtr image1, alphaImage1, image2, alphaImage2;
-        
-        
+
+
         image1 = IImageObjectPtr(LoadImageFromDdsFile(imagePath1.toUtf8().constData()));
         if (image1 && image1->HasImageFlags(EIF_AttachedAlpha))
         {
@@ -343,7 +343,7 @@ public:
             return false;
         }
         bool isDifferent = false;
-       
+
         isDifferent = GetComparisonResult(image1, image2, output);
 
 
@@ -388,7 +388,7 @@ TEST_F(ImageProcessingTest, TestPixelFormats)
     ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("G16R16") == ePixelFormat_R16G16);
     ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("G16R16F") == ePixelFormat_R16G16F);
 
-    //some legacy format need to be mapping to new format. 
+    //some legacy format need to be mapping to new format.
     ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("DXT1") == ePixelFormat_BC1);
     ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("DXT5") == ePixelFormat_BC3);
 
@@ -563,7 +563,7 @@ TEST_F(ImageProcessingTest, PresetSettingEqualityOperatorOverload_WithDifferingD
 
 //this test is to test image data won't be lost between uncompressed formats (for low to high precision or same precision)
 TEST_F(ImageProcessingTest, TestConvertFormatUncompressed)
-{    
+{
     //source image
     IImageObjectPtr srcImage(LoadImageFromFile(m_imagFileNameMap[Image_200X200_RGB8_Jpg]));
     ImageToProcess imageToProcess(srcImage);
@@ -575,7 +575,7 @@ TEST_F(ImageProcessingTest, TestConvertFormatUncompressed)
     //we will convert to target format then convert back to RGBX8 so they can compare to easy other
     imageToProcess.ConvertFormatUncompressed(ePixelFormat_R8G8B8A8);
     dstImage1 = imageToProcess.Get();
-    
+
     imageToProcess.Set(srcImage);
     imageToProcess.ConvertFormatUncompressed(ePixelFormat_R16G16B16A16);
     ASSERT_FALSE(srcImage->CompareImage(imageToProcess.Get())); //this is different than source image
@@ -658,9 +658,9 @@ TEST_F(ImageProcessingTest, DISABLED_TestConvertPVRTC)
     //load builder presets
     AZStd::string buiderSetting = m_engineRoot + "/Gems/ImageProcessing/Code/Source/ImageBuilderDefaultPresets.settings";
     auto outcome = BuilderSettingManager::Instance()->LoadBuilderSettings(buiderSetting, m_context.get());
-    
+
     AZStd::vector<AZStd::string> outPaths;
-    AZStd::string inputFile = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/normalSmoothness_ddna.tif";     
+    AZStd::string inputFile = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/normalSmoothness_ddna.tif";
     const AZStd::string outputFolder = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/temp/";
     ImageConvertProcess* process = CreateImageConvertProcess(inputFile, outputFolder, "ios", m_context.get());
     if (process != nullptr)
@@ -684,7 +684,7 @@ TEST_F(ImageProcessingTest, DISABLED_TestConvertPVRTC)
     }
 
     //ASSERT_TRUE(ConvertImageFile(inputFile, outputFolder, outPaths, "ios", m_context.get()));
-    
+
 }
 
 TEST_F(ImageProcessingTest, DISABLED_TestConvertFormat)
@@ -695,10 +695,10 @@ TEST_F(ImageProcessingTest, DISABLED_TestConvertFormat)
     //images to be tested
     static const int imageCount = 5;
     ImageFeature images[imageCount] = {
-        Image_20X16_RGBA8_Png, 
-        Image_32X32_16bit_F_Tif, 
-        Image_32X32_32bit_F_Tif , 
-        Image_512x512_Normal_Tga , 
+        Image_20X16_RGBA8_Png,
+        Image_32X32_16bit_F_Tif,
+        Image_32X32_32bit_F_Tif ,
+        Image_512x512_Normal_Tga ,
         Image_128x128_Transparent_Tga };
 
     for (int imageIdx = 0; imageIdx < imageCount; imageIdx++)
@@ -768,12 +768,12 @@ TEST_F(ImageProcessingTest, DISABLED_TestImageFilter)
 
     //create dst image with same size and mipmaps
     dstImage = IImageObjectPtr(
-        IImageObject::CreateImage(srcImage->GetWidth(0), srcImage->GetHeight(0), 3, 
+        IImageObject::CreateImage(srcImage->GetWidth(0), srcImage->GetHeight(0), 3,
             ePixelFormat_R32G32B32A32F));
 
     //for each filters
     const std::array<std::pair<MipGenType, AZStd::string>, 7> allFilters =
-    { 
+    {
         {
             {MipGenType::point, "point"},
             {MipGenType::box, "box" },
@@ -781,7 +781,7 @@ TEST_F(ImageProcessingTest, DISABLED_TestImageFilter)
             { MipGenType::quadratic, "Quadratic" },
             { MipGenType::blackmanHarris, "blackmanHarris" },
             { MipGenType::kaiserSinc, "kaiserSinc" }
-        } 
+        }
     };
 
     for (std::pair<MipGenType, AZStd::string> filter : allFilters)
@@ -803,7 +803,7 @@ TEST_F(ImageProcessingTest, TestColorSpaceConversion)
     imageToProcess.GammaToLinearRGBA32F(true);
     SaveImageToFile(imageToProcess.Get(), "GammaTolinear_DeGamma", 1);
     imageToProcess.LinearToGamma();
-    SaveImageToFile(imageToProcess.Get(), "LinearToGamma_DeGamma", 1);     
+    SaveImageToFile(imageToProcess.Get(), "LinearToGamma_DeGamma", 1);
 }
 
 //This function can be used to modify some value in the builder setting and keep all presets uuid then save back to setting file
@@ -831,7 +831,7 @@ TEST_F(ImageProcessingTest, VerifyRestrictedPlatform)
 }
 
 TEST_F(ImageProcessingTest, DISABLED_TestCubemap)
-{    
+{
     //load builder presets
     AZStd::string buiderSetting = m_engineRoot + "/Gems/ImageProcessing/Code/Source/ImageBuilderDefaultPresets.settings";
     auto outcome = BuilderSettingManager::Instance()->LoadBuilderSettings(buiderSetting, m_context.get());
@@ -840,7 +840,7 @@ TEST_F(ImageProcessingTest, DISABLED_TestCubemap)
     AZStd::string inputFile;
     AZStd::vector<AZStd::string> outPaths;
 
-    inputFile = m_engineRoot + "/Engine/EngineAssets/Shading/defaultProbe_cm.tif";
+    inputFile = m_engineRoot + "/Assets/Engine/EngineAssets/Shading/defaultProbe_cm.tif";
 
     IImageObjectPtr srcImage(LoadImageFromFile(inputFile));
     ImageToProcess imageToProcess(srcImage);
@@ -881,7 +881,7 @@ TEST_F(ImageProcessingTest, DISABLED_TestCubemap)
 
 //test image conversion for builder
 TEST_F(ImageProcessingTest, DISABLED_TestBuilderImageConvertor)
-{  
+{
     AZStd::string oldCacheFolder = "E:/Javelin_old_tex_cache/textures";
     AZStd::string srcFolder = "E:/Javelin_NWLYDev/dev/Assets/Textures";
 
@@ -892,12 +892,12 @@ TEST_F(ImageProcessingTest, DISABLED_TestBuilderImageConvertor)
     const AZStd::string outputFolder = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/temp/";
     AZStd::string inputFile;
     AZStd::vector<AZStd::string> outPaths;
-    
+
     inputFile = srcFolder + "/terrain/cry/detail/grass_with_stones_displ.tif";
     inputFile = m_imagFileNameMap[Image_128x128_Transparent_Tga];
     AZStd::string oldFile = oldCacheFolder + "/terrain/cry/detail/grass_with_stones_displ.dds";
     ImageConvertProcess* process = CreateImageConvertProcess(inputFile, outputFolder, "pc", m_context.get());
-    
+
     if (process != nullptr)
     {
         //the process can be stopped if the job is cancelled or the worker is shutting down
@@ -915,7 +915,7 @@ TEST_F(ImageProcessingTest, DISABLED_TestBuilderImageConvertor)
         SaveImageToFile(process->GetOutputAlphaImage(), "alpha", 10);
 
         process->GetAppendOutputFilePaths(outPaths);
-                
+
         QString output;
         //CompareDDSImage(outPaths[0].c_str(), oldFile.c_str(), output);
         delete process;
@@ -956,9 +956,9 @@ TEST_F(ImageProcessingTest, DISABLED_TestLoadDdsImage)
     IImageObjectPtr originImage, alphaImage;
     AZStd::string inputFolder = m_engineRoot + "/Cache/AutomatedTesting/pc/automatedtesting/engineassets/texturemsg/";
     AZStd::string inputFile;
-    
+
     inputFile = "E:/Javelin_NWLYDev/dev/Cache/Assets/pc/assets/textures/blend_maps/moss/jav_moss_ddn.dds";
- 
+
     IImageObjectPtr newImage = IImageObjectPtr(LoadImageFromDdsFile(inputFile));
     if (newImage->HasImageFlags(EIF_AttachedAlpha))
     {
@@ -1030,7 +1030,7 @@ TEST_F(ImageProcessingTest, EditorTextureSettingTest)
 {
     AZStd::string buiderSetting = m_engineRoot + "/Gems/ImageProcessing/Code/Source/ImageBuilderDefaultPresets.settings";
     auto outcome = BuilderSettingManager::Instance()->LoadBuilderSettings(buiderSetting, m_context.get());
-    
+
     auto TestFunc = [](const AZStd::string& textureFilepath, bool isCubemap) {
 
         ImageProcessingEditor::EditorTextureSetting setting(textureFilepath);
@@ -1113,7 +1113,7 @@ TEST_F(ImageProcessingTest, EditorTextureSettingTest)
             ASSERT_TRUE(resolutions.size() >= reducedResolutions.size());
         }
     };
-    
+
     // For cubemap texture
     AZStd::string textureFilePath = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/noon_cm.tif";
     TestFunc(textureFilePath, true);
@@ -1235,7 +1235,7 @@ TEST_F(ImageProcessingSerializationTest, TextureSettingReflect_SerializingLegacy
     // Load legacy texture settings
     TextureSettings legacyTextureSetting;
     AZStd::string textureFilepath = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/1024x1024_24bit.tif";
-    auto legacyLoadOutcome = TextureSettings::LoadLegacyTextureSettingFromFile(textureFilepath, 
+    auto legacyLoadOutcome = TextureSettings::LoadLegacyTextureSettingFromFile(textureFilepath,
         textureFilepath + TextureSettings::legacyExtensionName, legacyTextureSetting, m_context.get());
 
     // Ensure we loaded and parsed the texture settings correctly.
@@ -1262,7 +1262,7 @@ TEST_F(ImageProcessingSerializationTest, TextureSettingReflect_SerializingModern
     // Load legacy texture settings
     TextureSettings legacyTextureSetting;
     AZStd::string textureFilepath = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/1024x1024_24bit.tif";
-    auto legacyLoadOutcome = TextureSettings::LoadLegacyTextureSettingFromFile(textureFilepath, 
+    auto legacyLoadOutcome = TextureSettings::LoadLegacyTextureSettingFromFile(textureFilepath,
         textureFilepath+TextureSettings::legacyExtensionName, legacyTextureSetting, m_context.get());
 
     // Let's make modifications to the loaded texture setting
@@ -1281,7 +1281,7 @@ TEST_F(ImageProcessingSerializationTest, TextureSettingReflect_SerializingModern
     // Load the modified settings back to memory, using AZ::Serialization
     TextureSettings modernTextureSetting;
     auto modernLoadOutcome = TextureSettings::LoadTextureSetting(modernMetafilePath, modernTextureSetting, m_context.get());
-    
+
     // Ensure what we just serialized-in is identical to what we serialized-out.
     // The comparison operator also compares overrides.
     EXPECT_TRUE(modernLoadOutcome.IsSuccess());
@@ -1295,7 +1295,7 @@ TEST_F(ImageProcessingSerializationTest, TextureSettingReflect_SerializingModern
 {
     AZStd::string filepath = "test.xml";
 
-    // Fill-in structure with test data  
+    // Fill-in structure with test data
     TextureSettings fakeTextureSettings;
     fakeTextureSettings.m_preset = AZ::Uuid::CreateRandom();
     fakeTextureSettings.m_sizeReduceLevel = 0;
@@ -1321,10 +1321,10 @@ TEST_F(ImageProcessingSerializationTest, TextureSettingReflect_SerializingModern
 }
 
 TEST_F(ImageProcessingSerializationTest, DISABLED_BuilderSettingsReflect_SerializingDataInAndOut_WritesAndParsesFileAccurately)
-{    
+{
     AZStd::string buildSettingsFilepath = m_engineRoot + "/Gems/ImageProcessing/Code/Tests/TestAssets/tempPresets.settings";
     AZStd::string rcFilePath = m_engineRoot + "/Code/Tools/RC/Config/rc/rc.ini";
-    
+
     auto loadOutcome = BuilderSettingManager::Instance()->LoadBuilderSettingsFromRC(rcFilePath);
     ASSERT_TRUE(loadOutcome.IsSuccess());
 
@@ -1336,7 +1336,7 @@ TEST_F(ImageProcessingSerializationTest, DISABLED_BuilderSettingsReflect_Seriali
     auto writeOutcome = BuilderSettingManager::Instance()->WriteBuilderSettings(buildSettingsFilepath, m_context.get());
     ASSERT_TRUE(writeOutcome.IsSuccess());
 
-    //Re-load Builder Settings    
+    //Re-load Builder Settings
     auto reloadOutcome = BuilderSettingManager::Instance()->LoadBuilderSettings(buildSettingsFilepath, m_context.get());
     ASSERT_TRUE(reloadOutcome.IsSuccess());
 
diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
index 99101bb1c7..e80e2f6a9d 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
@@ -53,8 +53,8 @@ namespace LmbrCentral
                 editContext->Class<EditorNavigationAreaComponent>("Navigation Area", "Navigation Area configuration")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "AI")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/NavigationArea.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/NavigationArea.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationArea.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationArea.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-nav-area.html")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
index 344315371d..6ac5d85d49 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
@@ -38,8 +38,8 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::Category, "AI")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/NavigationSeed.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/NavigationSeed.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationSeed.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationSeed.png")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-nav-seed.html")
                     ->DataElement(AZ::Edit::UIHandlers::ComboBox, &EditorNavigationSeedComponent::m_agentType, "Agent Type", "Describes the type of the Entity for navigation purposes.")
diff --git a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
index 9c52242052..64fa9fc7e7 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
@@ -127,8 +127,8 @@ namespace LmbrCentral
                     "Navigation", "The Navigation component provides basic pathfinding and pathfollowing services to an entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "AI")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Navigation.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Navigation.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Navigation.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Navigation.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-navigation.html")
diff --git a/Gems/LmbrCentral/Code/Source/Animation/AttachmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Animation/AttachmentComponent.cpp
deleted file mode 100644
index 537585f48c..0000000000
--- a/Gems/LmbrCentral/Code/Source/Animation/AttachmentComponent.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "LmbrCentral_precompiled.h"
-#include "AttachmentComponent.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Component/Entity.h>
-#include <MathConversion.h>
-#include <LmbrCentral/Rendering/MeshAsset.h>
-#include <LmbrCentral/Animation/AttachmentComponentBus.h>
-
-namespace LmbrCentral
-{
-    /// Behavior Context handler for AttachmentComponentNotificationBus
-    class BehaviorAttachmentComponentNotificationBusHandler : public AttachmentComponentNotificationBus::Handler, public AZ::BehaviorEBusHandler
-    {
-    public:
-        AZ_EBUS_BEHAVIOR_BINDER(BehaviorAttachmentComponentNotificationBusHandler, "{636B95A0-5C7D-4EE7-8645-955665315451}", AZ::SystemAllocator
-            , OnAttached, OnDetached);
-
-        void OnAttached(AZ::EntityId id) override
-        {
-            Call(FN_OnAttached, id);
-        }
-        
-        void OnDetached(AZ::EntityId id) override
-        {
-            Call(FN_OnDetached, id);
-        }
-    };
-
-    void AttachmentConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
-        {
-            serializeContext->Class<AttachmentConfiguration>()
-                ->Version(1)
-                ->Field("Target ID", &AttachmentConfiguration::m_targetId)
-                ->Field("Target Bone Name", &AttachmentConfiguration::m_targetBoneName)
-                ->Field("Target Offset", &AttachmentConfiguration::m_targetOffset)
-                ->Field("Attached Initially", &AttachmentConfiguration::m_attachedInitially)
-                ->Field("Scale Source", &AttachmentConfiguration::m_scaleSource)
-            ;
-        }
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->EBus<AttachmentComponentRequestBus>("AttachmentComponentRequestBus")
-                ->Event("Attach", &AttachmentComponentRequestBus::Events::Attach)
-                ->Event("Detach", &AttachmentComponentRequestBus::Events::Detach)
-                ->Event("SetAttachmentOffset", &AttachmentComponentRequestBus::Events::SetAttachmentOffset);
-
-            behaviorContext->EBus<AttachmentComponentNotificationBus>("AttachmentComponentNotificationBus")
-                ->Handler<BehaviorAttachmentComponentNotificationBusHandler>();
-        }
-    }
-
-    void AttachmentComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AttachmentConfiguration::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
-        {
-            serializeContext->Class<AttachmentComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("Configuration", &AttachmentComponent::m_initialConfiguration)
-            ;
-        }
-    }
-
-    //=========================================================================
-    // BoneFollower
-    //=========================================================================
-
-    void BoneFollower::Activate(AZ::Entity* owner, const AttachmentConfiguration& configuration, bool targetCanAnimate)
-    {
-        AZ_Assert(owner, "owner is required");
-        AZ_Assert(!m_ownerId.IsValid(), "BoneFollower is already Activated");
-
-        m_ownerId = owner->GetId();
-        m_targetCanAnimate = targetCanAnimate;
-        m_isUpdatingOwnerTransform = false;
-        m_scaleSource = configuration.m_scaleSource;
-
-        m_cachedOwnerTransform = AZ::Transform::CreateIdentity();
-        EBUS_EVENT_ID_RESULT(m_cachedOwnerTransform, m_ownerId, AZ::TransformBus, GetWorldTM);
-
-        if (configuration.m_attachedInitially)
-        {
-            Attach(configuration.m_targetId, configuration.m_targetBoneName.c_str(), configuration.m_targetOffset);
-        }
-
-        AttachmentComponentRequestBus::Handler::BusConnect(m_ownerId);
-    }
-
-    void BoneFollower::Deactivate()
-    {
-        AZ_Assert(m_ownerId.IsValid(), "BoneFollower was never Activated");
-
-        AttachmentComponentRequestBus::Handler::BusDisconnect();
-        Detach();
-        m_ownerId.SetInvalid();
-    }
-
-    AZ::EntityId BoneFollower::GetTargetEntityId()
-    {
-        return m_targetId;
-    }
-
-    AZ::Transform BoneFollower::GetOffset()
-    {
-        return m_targetOffset;
-    }
-
-    void BoneFollower::Attach(AZ::EntityId targetId, const char* targetBoneName, const AZ::Transform& offset)
-    {
-        AZ_Assert(m_ownerId.IsValid(), "BoneFollower must be Activated to use.")
-
-        // safe to try and detach, even if we weren't attached
-        Detach();
-
-        if (!targetId.IsValid())
-        {
-            return;
-        }
-
-        if (targetId == m_ownerId)
-        {
-            AZ_Error("Attachment Component", false, "AttachmentComponent cannot target itself");
-            return;
-        }
-
-        // Note: the target entity may not be activated yet. That's ok.
-        // When mesh is ready we are notified via MeshComponentEvents::OnMeshCreated
-        // When transform is ready we are notified via TransformNotificationBus::OnTransformChanged
-
-        m_targetId = targetId;
-        m_targetBoneName = targetBoneName;
-        m_targetOffset = offset;
-
-        BindTargetBone();
-
-        m_targetBoneTransform = AZ::Transform::Identity();
-
-        m_isTargetEntityTransformKnown = false; // target's transform may not be available yet
-
-        AZ::TransformBus::EventResult(m_cachedOwnerTransform, m_ownerId, &AZ::TransformBus::Events::GetWorldTM); // owner query will always succeed
-
-        MeshComponentNotificationBus::Handler::BusConnect(m_targetId); // fires OnMeshCreated if asset is already ready
-        AZ::TransformNotificationBus::Handler::BusConnect(m_targetId);
-        if (m_targetCanAnimate)
-        {
-            // Only register for per-frame updates when target can animate
-            AZ::TickBus::Handler::BusConnect();
-        }
-
-        // update owner's transform
-        UpdateOwnerTransformIfNecessary();
-
-        // alert others that we've attached
-        AttachmentComponentNotificationBus::Event(m_targetId, &AttachmentComponentNotificationBus::Events::OnAttached, m_ownerId);
-    }
-
-    void BoneFollower::Detach()
-    {
-        AZ_Assert(m_ownerId.IsValid(), "BoneFollower must be Activated to use.");
-
-        if (m_targetId.IsValid())
-        {
-            // alert others that we're detaching
-            EBUS_EVENT_ID(m_targetId, AttachmentComponentNotificationBus, OnDetached, m_ownerId);
-
-            MeshComponentNotificationBus::Handler::BusDisconnect();
-            AZ::TransformNotificationBus::Handler::BusDisconnect(m_targetId);
-            AZ::TickBus::Handler::BusDisconnect();
-
-            m_targetId.SetInvalid();
-        }
-    }
-
-    const char* BoneFollower::GetJointName()
-    {
-        return m_targetBoneName.c_str();
-    }
-
-    void BoneFollower::SetAttachmentOffset(const AZ::Transform& offset)
-    {
-        AZ_Assert(m_ownerId.IsValid(), "BoneFollower must be Activated to use.");
-
-        if (m_targetId.IsValid())
-        {
-            m_targetOffset = offset;
-            UpdateOwnerTransformIfNecessary();
-        }
-    }
-
-    void BoneFollower::OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-    {
-        (void)asset;
-
-        // reset character values
-        BindTargetBone();
-        m_targetBoneTransform = QueryBoneTransform();
-
-        // move owner if necessary
-        UpdateOwnerTransformIfNecessary();
-    }
-
-    void BoneFollower::BindTargetBone()
-    {
-        m_targetBoneId = -1;
-        SkeletalHierarchyRequestBus::EventResult(m_targetBoneId, m_targetId, &SkeletalHierarchyRequests::GetJointIndexByName, m_targetBoneName.c_str());
-    }
-
-    void BoneFollower::UpdateOwnerTransformIfNecessary()
-    {
-        // Can't update until target entity's transform is known
-        if (!m_isTargetEntityTransformKnown)
-        {
-            if (AZ::TransformBus::GetNumOfEventHandlers(m_targetId) == 0)
-            {
-                return;
-            }
-
-            AZ::TransformBus::EventResult(m_targetEntityTransform, m_targetId, &AZ::TransformBus::Events::GetWorldTM);
-            m_isTargetEntityTransformKnown = true;
-        }
-
-        AZ::Transform finalTransform;
-        if (m_scaleSource == AttachmentConfiguration::ScaleSource::WorldScale)
-        {
-            // apply offset in world-space
-            finalTransform = m_targetEntityTransform * m_targetBoneTransform;
-            finalTransform.SetScale(AZ::Vector3::CreateOne());
-            finalTransform *= m_targetOffset;
-        }
-        else if (m_scaleSource == AttachmentConfiguration::ScaleSource::TargetEntityScale)
-        {
-            // apply offset in target-entity-space (ignoring bone scale)
-            AZ::Transform boneNoScale = m_targetBoneTransform;
-            boneNoScale.SetScale(AZ::Vector3::CreateOne());
-
-            finalTransform = m_targetEntityTransform * boneNoScale * m_targetOffset;
-        }
-        else // AttachmentConfiguration::ScaleSource::TargetEntityScale
-        {
-            // apply offset in target-bone-space
-            finalTransform = m_targetEntityTransform * m_targetBoneTransform * m_targetOffset;
-        }
-            
-        if (m_cachedOwnerTransform != finalTransform)
-        {
-            AZ_Warning("Attachment Component", !m_isUpdatingOwnerTransform, "AttachmentComponent detected a cycle when updating transform, do not target child entities.");
-            if (!m_isUpdatingOwnerTransform)
-            {
-                m_cachedOwnerTransform = finalTransform;
-                m_isUpdatingOwnerTransform = true;
-                EBUS_EVENT_ID(m_ownerId, AZ::TransformBus, SetWorldTM, finalTransform);
-                m_isUpdatingOwnerTransform = false;
-            }
-        }
-    }
-
-    AZ::Transform BoneFollower::QueryBoneTransform() const
-    {
-        AZ::Transform boneTransform = AZ::Transform::CreateIdentity();
-
-        if (m_targetBoneId >= 0)
-        {
-            SkeletalHierarchyRequestBus::EventResult(boneTransform, m_targetId, &SkeletalHierarchyRequests::GetJointTransformCharacterRelative, m_targetBoneId);
-        }
-
-        return boneTransform;
-    }
-
-    // fires when target's transform changes
-    void BoneFollower::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_targetEntityTransform = world;
-        m_isTargetEntityTransformKnown = true;
-        UpdateOwnerTransformIfNecessary();
-    }
-
-    void BoneFollower::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
-    {
-        m_targetBoneTransform = QueryBoneTransform();
-        UpdateOwnerTransformIfNecessary();
-    }
-
-    int BoneFollower::GetTickOrder()
-    {
-        return AZ::TICK_ATTACHMENT;
-    }
-
-    void BoneFollower::Reattach(bool detachFirst)
-    {
-#ifdef AZ_ENABLE_TRACING
-        AZ::Entity* ownerEntity = nullptr;
-        AZ::Entity* targetEntity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(ownerEntity, &AZ::ComponentApplicationBus::Events::FindEntity, m_ownerId);
-        AZ::ComponentApplicationBus::BroadcastResult(targetEntity, &AZ::ComponentApplicationBus::Events::FindEntity, m_targetId);
-        AZ_TracePrintf("BoneFollower", "Reattaching entity '%s' to entity '%s'", ownerEntity ? ownerEntity->GetName().c_str() : "", 
-                                                                                 targetEntity ? targetEntity->GetName().c_str() : "");
-#endif
-
-        if (m_targetId.IsValid() && detachFirst)
-        {
-            AttachmentComponentNotificationBus::Event(m_targetId, &AttachmentComponentNotificationBus::Events::OnDetached, m_ownerId);
-        }
-
-        if (m_targetId != m_ownerId)
-        {
-            AttachmentComponentNotificationBus::Event(m_targetId, &AttachmentComponentNotificationBus::Events::OnAttached, m_ownerId);
-        }
-    }
-
-    //=========================================================================
-    // AttachmentComponent
-    //=========================================================================
-
-    void AttachmentComponent::Activate()
-    {
-#ifdef AZ_ENABLE_TRACING
-        bool isStaticTransform = false;
-        AZ::TransformBus::EventResult(isStaticTransform, GetEntityId(), &AZ::TransformBus::Events::IsStaticTransform);
-        AZ_Warning("Attachment Component", !isStaticTransform,
-            "Attachment needs to move, but entity '%s' %s has a static transform.", GetEntity()->GetName().c_str(), GetEntityId().ToString().c_str());
-#endif
-
-        m_boneFollower.Activate(GetEntity(), m_initialConfiguration, true);
-    }
-
-
-    void AttachmentComponent::Deactivate()
-    {
-        m_boneFollower.Deactivate();
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Animation/AttachmentComponent.h b/Gems/LmbrCentral/Code/Source/Animation/AttachmentComponent.h
deleted file mode 100644
index f2ef428ac2..0000000000
--- a/Gems/LmbrCentral/Code/Source/Animation/AttachmentComponent.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <LmbrCentral/Animation/AttachmentComponentBus.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/Math/Transform.h>
-
-struct ISkeletonPose;
-
-namespace LmbrCentral
-{
-    /*!
-     * Configuration data for AttachmentComponent.
-     */
-    struct AttachmentConfiguration
-    {
-        AZ_TYPE_INFO(AttachmentConfiguration, "{74B5DC69-DE44-4640-836A-55339E116795}");
-
-        virtual ~AttachmentConfiguration() = default;
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        //! Attach to this entity.
-        AZ::EntityId m_targetId;
-
-        //! Attach to this bone on target entity.
-        AZStd::string m_targetBoneName;
-
-        //! Offset from target.
-        AZ::Transform m_targetOffset = AZ::Transform::Identity();
-
-        //! Whether to attach to target upon activation.
-        //! If false, the entity remains detached until Attach() is called.
-        bool m_attachedInitially = true;
-
-        //! Source from which to retrieve scale information.
-        enum class ScaleSource : AZ::u8
-        {
-            WorldScale,         // Scaled in world space.
-            TargetEntityScale,  // Adopt scaling of attachment target entity.
-            TargetBoneScale,    // Adopt scaling of attachment target entity/joint.
-        };
-        ScaleSource m_scaleSource = ScaleSource::WorldScale;
-    };
-
-    /*
-     * Common functionality for game and editor attachment components.
-     * The BoneFollower tracks movement of the target's bone and
-     * updates the owning entity's TransformComponent to follow.
-     * This class should be a member within the attachment component
-     * and be activated/deactivated along with the component.
-     * \ref AttachmentComponent
-     */
-    class BoneFollower
-        : public AttachmentComponentRequestBus::Handler
-        , public AZ::TransformNotificationBus::Handler
-        , public MeshComponentNotificationBus::Handler
-        , public AZ::Data::AssetBus::Handler
-        , public AZ::TickBus::Handler
-    {
-    public:
-        void Activate(AZ::Entity* owner, const AttachmentConfiguration& initialConfiguration, bool targetCanAnimate);
-        void Deactivate();
-
-        ////////////////////////////////////////////////////////////////////////
-        // AttachmentComponentRequests
-        void Reattach(bool detachFirst);
-        void Attach(AZ::EntityId targetId, const char* targetBoneName, const AZ::Transform& offset) override;
-        void Detach() override;
-        void SetAttachmentOffset(const AZ::Transform& offset) override;
-        const char* GetJointName() override;
-        AZ::EntityId GetTargetEntityId() override;
-        AZ::Transform GetOffset() override;
-        ////////////////////////////////////////////////////////////////////////
-
-    private:
-
-        ////////////////////////////////////////////////////////////////////////
-        // AZ::TickBus
-        //! Check target bone transform every frame.
-        void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-        //! Make sure target bone transform updates after animation update.
-        int GetTickOrder() override;
-        ////////////////////////////////////////////////////////////////////////
-
-        ////////////////////////////////////////////////////////////////////////
-        // AZ::TransformNotificationBus
-        //! When target's transform changes
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-        ////////////////////////////////////////////////////////////////////////
-
-        ////////////////////////////////////////////////////////////////////////
-        // MeshComponentEvents
-        //! When target's mesh changes
-        void OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-        ////////////////////////////////////////////////////////////////////////
-
-        void BindTargetBone();
-
-        AZ::Transform QueryBoneTransform() const;
-
-        void UpdateOwnerTransformIfNecessary();
-
-        //! Entity which which is being attached.
-        AZ::EntityId    m_ownerId;
-
-        //! Whether to query bone position per-frame (false while in editor)
-        bool            m_targetCanAnimate = false;
-
-        AZ::EntityId    m_targetId;
-        AZStd::string   m_targetBoneName;
-        AZ::Transform   m_targetOffset; //!< local transform
-        AZ::Transform   m_targetBoneTransform; //!< local transform of bone
-        AZ::Transform   m_targetEntityTransform; //!< world transform of target
-        bool            m_isTargetEntityTransformKnown = false;
-
-        //! Cached value, so we don't update owner's position unnecessarily.
-        AZ::Transform   m_cachedOwnerTransform;
-        bool            m_isUpdatingOwnerTransform = false; //!< detect infinite loops when updating owner's transform
-
-        // Cached character values to avoid repeated lookup.
-        // These are set by calling ResetCharacter()
-        int             m_targetBoneId; //!< negative when bone not found
-
-        AttachmentConfiguration::ScaleSource m_scaleSource;
-    };
-
-    /*!
-     * The AttachmentComponent lets an entity stick to a particular bone on
-     * a target entity. This is achieved by tracking movement of the target's
-     * bone and updating the entity's TransformComponent accordingly.
-     */
-    class AttachmentComponent
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(AttachmentComponent, "{2D17A64A-7AC5-4C02-AC36-C5E8141FFDDF}");
-
-        friend class EditorAttachmentComponent;
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("AttachmentService", 0x5aaa7b63));
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("AttachmentService", 0x5aaa7b63));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-        }
-
-        ~AttachmentComponent() override = default;
-
-    private:
-        ////////////////////////////////////////////////////////////////////////
-        // AZ::Component
-        void Activate() override;
-        void Deactivate() override;
-        ////////////////////////////////////////////////////////////////////////
-
-        //! Initial configuration for m_attachment
-        AttachmentConfiguration m_initialConfiguration;
-
-        //! Implements actual attachment functionality
-        BoneFollower m_boneFollower;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Animation/EditorAttachmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Animation/EditorAttachmentComponent.cpp
deleted file mode 100644
index 337da51159..0000000000
--- a/Gems/LmbrCentral/Code/Source/Animation/EditorAttachmentComponent.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-#include "EditorAttachmentComponent.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Math/Transform.h>
-
-namespace LmbrCentral
-{
-    void EditorAttachmentComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorAttachmentComponent, EditorComponentBase>()
-                ->Version(1)
-                ->Field("Target ID", &EditorAttachmentComponent::m_targetId)
-                ->Field("Target Bone Name", &EditorAttachmentComponent::m_targetBoneName)
-                ->Field("Position Offset", &EditorAttachmentComponent::m_positionOffset)
-                ->Field("Rotation Offset", &EditorAttachmentComponent::m_rotationOffset)
-                ->Field("Scale Offset", &EditorAttachmentComponent::m_scaleOffset)
-                ->Field("Attached Initially", &EditorAttachmentComponent::m_attachedInitially)
-                ->Field("Scale Source", &EditorAttachmentComponent::m_scaleSource)
-            ;
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorAttachmentComponent>(
-                    "Attachment", "The Attachment component lets an entity attach to a bone on the skeleton of another entity")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Animation")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Attachment.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Attachment.png")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-attachment.html")
-                    ->DataElement(0, &EditorAttachmentComponent::m_targetId,
-                    "Target entity", "Attach to this entity.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetIdChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &EditorAttachmentComponent::m_targetBoneName,
-                    "Joint name", "Attach to this joint on target entity.")
-                        ->Attribute(AZ::Edit::Attributes::StringList, &EditorAttachmentComponent::GetTargetBoneOptions)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetBoneChanged)
-                    ->DataElement(0, &EditorAttachmentComponent::m_positionOffset,
-                    "Position offset", "Local position offset from target bone")
-                        ->Attribute(AZ::Edit::Attributes::Suffix, "m")
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.01f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
-                    ->DataElement(0, &EditorAttachmentComponent::m_rotationOffset,
-                    "Rotation offset", "Local rotation offset from target bone")
-                        ->Attribute(AZ::Edit::Attributes::Suffix, "deg")
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.01f)
-                        ->Attribute(AZ::Edit::Attributes::Min, -AZ::RadToDeg(AZ::Constants::TwoPi))
-                        ->Attribute(AZ::Edit::Attributes::Max, AZ::RadToDeg(AZ::Constants::TwoPi))
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
-                    ->DataElement(0, &EditorAttachmentComponent::m_scaleOffset,
-                        "Scale offset", "Local scale offset from target entity")
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.001f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
-                    ->DataElement(0, &EditorAttachmentComponent::m_attachedInitially,
-                        "Attached initially", "Whether to attach to target upon activation.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnAttachedInitiallyChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &EditorAttachmentComponent::m_scaleSource,
-                        "Scaling", "How object scale should be determined. "
-                        "Use world scale = Attached object is scaled in world space, Use target entity scale = Attached object adopts scale of target entity., Use target bone scale = Attached object adopts scale of target entity/joint.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnScaleSourceChanged)
-                        ->EnumAttribute(AttachmentConfiguration::ScaleSource::WorldScale, "Use world scale")
-                        ->EnumAttribute(AttachmentConfiguration::ScaleSource::TargetEntityScale, "Use target entity scale")
-                        ->EnumAttribute(AttachmentConfiguration::ScaleSource::TargetBoneScale, "Use target bone scale")
-                    ;
-            }
-        }
-    }
-
-    void EditorAttachmentComponent::Activate()
-    {
-        Base::Activate();
-        m_boneFollower.Activate(GetEntity(),
-            CreateAttachmentConfiguration(),
-            false);                     // Entity's don't animate in Editor
-    }
-
-    void EditorAttachmentComponent::Deactivate()
-    {
-        m_boneFollower.Deactivate();
-        Base::Deactivate();
-    }
-
-    void EditorAttachmentComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        AttachmentComponent* component = gameEntity->CreateComponent<AttachmentComponent>();
-        if (component)
-        {
-            component->m_initialConfiguration = CreateAttachmentConfiguration();
-        }
-    }
-
-    AttachmentConfiguration EditorAttachmentComponent::CreateAttachmentConfiguration() const
-    {
-        AttachmentConfiguration configuration;
-        configuration.m_targetId = m_targetId;
-        configuration.m_targetBoneName = m_targetBoneName;
-        configuration.m_targetOffset = GetTargetOffset();
-        configuration.m_attachedInitially = m_attachedInitially;
-        configuration.m_scaleSource = m_scaleSource;
-        return configuration;
-    }
-
-    AZ::Transform EditorAttachmentComponent::GetTargetOffset() const
-    {
-        AZ::Transform offset = AZ::ConvertEulerDegreesToTransform(m_rotationOffset);
-        offset.SetTranslation(m_positionOffset);
-        offset.MultiplyByScale(m_scaleOffset);
-        return offset;
-    }
-
-    AZStd::vector<AZStd::string> EditorAttachmentComponent::GetTargetBoneOptions() const
-    {
-        AZStd::vector<AZStd::string> names;
-
-        // insert blank entry, so user may choose to bind to NO bone.
-        names.push_back("");
-
-        // track whether currently-set bone is found
-        bool currentTargetBoneFound = false;
-
-        // Get character and iterate over bones
-        AZ::u32 jointCount = 0;
-        SkeletalHierarchyRequestBus::EventResult(jointCount, m_targetId, &SkeletalHierarchyRequests::GetJointCount);
-        for (AZ::u32 jointIndex = 0; jointIndex < jointCount; ++jointIndex)
-        {
-            const char* name = nullptr;
-            SkeletalHierarchyRequestBus::EventResult(name, m_targetId, &SkeletalHierarchyRequests::GetJointNameByIndex, jointIndex);
-            if (name)
-            {
-                names.push_back(name);
-
-                if (!currentTargetBoneFound)
-                {
-                    currentTargetBoneFound = (m_targetBoneName == names.back());
-                }
-            }
-        }
-
-        // If we never found currently-set bone name,
-        // stick it at top of list, just in case user wants to keep it anyway
-        if (!currentTargetBoneFound && !m_targetBoneName.empty())
-        {
-            names.insert(names.begin(), m_targetBoneName);
-        }
-
-        return names;
-    }
-
-    AZ::u32 EditorAttachmentComponent::OnTargetIdChanged()
-    {
-        // Warn about bad setups (it won't crash, but it's nice to handle this early)
-        if (m_targetId == GetEntityId())
-        {
-            AZ_Warning(GetEntity()->GetName().c_str(), false, "AttachmentComponent cannot target self.")
-            m_targetId.SetInvalid();
-        }
-
-        // Warn about children attaching to a parent
-        AZ::EntityId parentOfTarget;
-        AZ::TransformBus::EventResult(parentOfTarget, m_targetId, &AZ::TransformBus::Events::GetParentId);
-        while (parentOfTarget.IsValid())
-        {
-            if (parentOfTarget == GetEntityId())
-            {
-                AZ_Warning(GetEntity()->GetName().c_str(), parentOfTarget != GetEntityId(), "AttachmentComponent cannot target child entity");
-                m_targetId.SetInvalid();
-                break;
-            }
-
-            AZ::EntityId currentParentId = parentOfTarget;
-            parentOfTarget.SetInvalid();
-            AZ::TransformBus::EventResult(parentOfTarget, currentParentId, &AZ::TransformBus::Events::GetParentId);
-        }
-
-        AttachOrDetachAsNecessary();
-
-        return AZ::Edit::PropertyRefreshLevels::AttributesAndValues; // refresh bone options
-    }
-
-    AZ::u32 EditorAttachmentComponent::OnTargetBoneChanged()
-    {
-        AttachOrDetachAsNecessary();
-        return AZ::Edit::PropertyRefreshLevels::None;
-    }
-
-    AZ::u32 EditorAttachmentComponent::OnTargetOffsetChanged()
-    {
-        EBUS_EVENT_ID(GetEntityId(), AttachmentComponentRequestBus, SetAttachmentOffset, GetTargetOffset());
-        return AZ::Edit::PropertyRefreshLevels::None;
-    }
-
-    AZ::u32 EditorAttachmentComponent::OnAttachedInitiallyChanged()
-    {
-        AttachOrDetachAsNecessary();
-        return AZ::Edit::PropertyRefreshLevels::None;
-    }
-
-    AZ::u32 EditorAttachmentComponent::OnScaleSourceChanged()
-    {
-        m_boneFollower.Deactivate();
-        m_boneFollower.Activate(GetEntity(),
-            CreateAttachmentConfiguration(),
-            false);
-        return AZ::Edit::PropertyRefreshLevels::None;
-    }
-
-    void EditorAttachmentComponent::AttachOrDetachAsNecessary()
-    {
-        if (m_attachedInitially && m_targetId.IsValid())
-        {
-            EBUS_EVENT_ID(GetEntityId(), AttachmentComponentRequestBus, Attach, m_targetId, m_targetBoneName.c_str(), GetTargetOffset());
-        }
-        else
-        {
-            EBUS_EVENT_ID(GetEntityId(), AttachmentComponentRequestBus, Detach);
-        }
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Animation/EditorAttachmentComponent.h b/Gems/LmbrCentral/Code/Source/Animation/EditorAttachmentComponent.h
deleted file mode 100644
index 808ffd393e..0000000000
--- a/Gems/LmbrCentral/Code/Source/Animation/EditorAttachmentComponent.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include "AttachmentComponent.h"
-
-namespace LmbrCentral
-{
-    /*!
-     * In-editor attachment component.
-     * \ref AttachmentComponent
-     */
-    class EditorAttachmentComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-    {
-    private:
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-    public:
-        AZ_COMPONENT(EditorAttachmentComponent, "{DA6072FD-E696-47D8-81D9-1F77D3464200}", Base);
-        static void Reflect(AZ::ReflectContext* context);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            AttachmentComponent::GetProvidedServices(provided);
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            AttachmentComponent::GetIncompatibleServices(incompatible);
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            AttachmentComponent::GetRequiredServices(required);
-        }
-
-        ~EditorAttachmentComponent() override = default;
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-    protected:
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        AZ::u32 OnTargetIdChanged();
-        AZ::u32 OnTargetBoneChanged();
-        AZ::u32 OnTargetOffsetChanged();
-        AZ::u32 OnAttachedInitiallyChanged();
-        AZ::u32 OnScaleSourceChanged();
-
-        //! Invoked when an attachment property changes
-        void AttachOrDetachAsNecessary();
-
-        //! For populating ComboBox
-        AZStd::vector<AZStd::string> GetTargetBoneOptions() const;
-
-        //! Create runtime configuration from editor configuration
-        AttachmentConfiguration CreateAttachmentConfiguration() const;
-
-        //! Create AZ::Transform from position and rotation
-        AZ::Transform GetTargetOffset() const;
-
-        //! Attach to this entity.
-        AZ::EntityId m_targetId;
-
-        //! Attach to this bone on target entity.
-        AZStd::string m_targetBoneName;
-
-        //! Offset from target bone's position.
-        AZ::Vector3 m_positionOffset = AZ::Vector3::CreateZero();
-
-        //! Offset from target bone's rotation.
-        AZ::Vector3 m_rotationOffset = AZ::Vector3::CreateZero();
-
-        //! Offset from target entity's scale.
-        AZ::Vector3 m_scaleOffset = AZ::Vector3::CreateOne();
-
-        //! Observe scale information from the specified source.       
-        AttachmentConfiguration::ScaleSource m_scaleSource = AttachmentConfiguration::ScaleSource::WorldScale;
-
-        //! Whether to attach to target upon activation.
-        //! If false, the entity remains detached until Attach() is called.
-        bool m_attachedInitially = true;
-
-        //! Implements actual attachment functionality
-        LmbrCentral::BoneFollower m_boneFollower;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
index 5d5f970c43..33887d6d78 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
@@ -40,7 +40,7 @@ namespace LmbrCentral
                 editContext->Class<AudioProxyComponent>("Audio Proxy", "The Audio Proxy component is a required dependency when you add other audio components to an entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioProxy.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioProxy.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-proxy.html")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
index 15c48e08e3..9a014c0bdf 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
@@ -41,8 +41,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioAreaEnvironmentComponent>("Audio Area Environment", "The Audio Area Environment component enables entities that are moving around and throughout a shape to have environment effects applied to any sounds that they trigger")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioAreaEnvironment.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioAreaEnvironment.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioAreaEnvironment.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioAreaEnvironment.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-area-environment.html")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp
index d098be9aa5..effad46cdc 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp
@@ -34,8 +34,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioEnvironmentComponent>("Audio Environment", "The Audio Environment component provides access to features of the Audio Translation Layer (ATL) environments to apply environmental effects such as reverb or echo")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioEnvironment.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioEnvironment.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioEnvironment.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioEnvironment.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-environment.html")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
index 3020f8feac..79f20295e1 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
@@ -37,8 +37,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioListenerComponent>("Audio Listener", "The Audio Listener component allows a virtual microphone to be placed in the environment")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioListener.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioListener.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioListener.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioListener.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-listener.html")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
index 057c2ae80b..bdf92e0d2c 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
@@ -39,8 +39,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioMultiPositionComponent>("Multi-Position Audio", "The Multi-Position Audio component provides the ability to broadcast sounds through multiple positions")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioMultiPosition.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioMultiPosition.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioMultiPosition.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioMultiPosition.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         // Followup: Need Help URL
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
index b4d241cd05..4953bd6cc2 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
@@ -40,12 +40,12 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioPreloadComponent>("Audio Preload", "The Audio Preload component is used to load and unload soundbanks contained in Audio Translation Layer (ATL) preloads")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioPreload.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioPreload.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
 
                         // Icon todo:
-                        //->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioPreload.png")
+                        //->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioPreload.png")
 
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-preload.html")
 
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
index fed6c18489..c29c9c2089 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
@@ -35,8 +35,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioRtpcComponent>("Audio Rtpc", "The Audio Rtpc component provides basic Real-Time Parameter Control (RTPC) functionality allowing you to tweak sounds in real time")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioRtpc.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioRtpc.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioRtpc.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioRtpc.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-rtpc.html")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
index 6be3eb9a4a..fd88e24865 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
@@ -35,8 +35,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioSwitchComponent>("Audio Switch", "The Audio Switch component provides basic Audio Translation Layer (ATL) switch functionality to specify the state of an entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioSwitch.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioSwitch.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioSwitch.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioSwitch.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-switch.html")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
index c619e6e988..ec1f076420 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
@@ -44,8 +44,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioTriggerComponent>("Audio Trigger", "The Audio Trigger component provides Audio Translation Layer (ATL) triggers for play/stop functionality and on-demand execution")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AudioTrigger.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AudioTrigger.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioTrigger.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioTrigger.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-audio-trigger.html")
diff --git a/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp b/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp
index 068294ac56..dc4fb90b48 100644
--- a/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp
@@ -34,8 +34,8 @@ namespace LmbrCentral
                     "Comment", "The Comment component allows you to add long-form text comments for component entities")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Editor")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Comment.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Comment.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Comment.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Comment.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZStd::vector<AZ::Crc32>({ AZ_CRC("Level", 0x9aeacc13), AZ_CRC("Game", 0x232b318c), AZ_CRC("Layer", 0xe4db211a) }))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-comment.html")
diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
index 0f6b084201..ceac768e79 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
@@ -21,7 +21,6 @@
 #include <AzFramework/Metrics/MetricsPlainTextNameRegistration.h>
 
 // Component descriptors
-#include "Animation/AttachmentComponent.h"
 #include "Audio/AudioAreaEnvironmentComponent.h"
 #include "Audio/AudioEnvironmentComponent.h"
 #include "Audio/AudioListenerComponent.h"
@@ -33,13 +32,6 @@
 #include "Audio/AudioSystemComponent.h"
 #include "Audio/AudioTriggerComponent.h"
 #include "Bundling/BundlingSystemComponent.h"
-#include "Rendering/DecalComponent.h"
-#include "Rendering/StereoRendererComponent.h"
-#include "Rendering/LensFlareComponent.h"
-#include "Rendering/LightComponent.h"
-#include "Rendering/HighQualityShadowComponent.h"
-#include "Rendering/MeshComponent.h"
-#include "Rendering/GeomCacheComponent.h"
 #include "Ai/NavigationComponent.h"
 #include "Scripting/TagComponent.h"
 #include "Scripting/SimpleStateComponent.h"
@@ -77,14 +69,9 @@
 #include <AzCore/Slice/SliceAsset.h>
 #include <AzCore/Script/ScriptAsset.h>
 #include <LmbrCentral/Rendering/MaterialAsset.h>
-#include <LmbrCentral/Rendering/LensFlareAsset.h>
 #include <LmbrCentral/Rendering/MeshAsset.h>
 #include <LmbrCentral/Rendering/MaterialHandle.h>
 
-// Asset handlers
-#include <Rendering/LensFlareAssetHandler.h>
-#include <Rendering/MeshAssetHandler.h>
-
 // Scriptable Ebus Registration
 #include "Events/ReflectScriptableEvents.h"
 
@@ -202,7 +189,6 @@ namespace LmbrCentral
         : AZ::Module()
     {
         m_descriptors.insert(m_descriptors.end(), {
-            AttachmentComponent::CreateDescriptor(),
             AudioAreaEnvironmentComponent::CreateDescriptor(),
             AudioEnvironmentComponent::CreateDescriptor(),
             AudioListenerComponent::CreateDescriptor(),
@@ -214,14 +200,9 @@ namespace LmbrCentral
             AudioSystemComponent::CreateDescriptor(),
             AudioTriggerComponent::CreateDescriptor(),
             BundlingSystemComponent::CreateDescriptor(),
-            DecalComponent::CreateDescriptor(),
-            LensFlareComponent::CreateDescriptor(),
-            LightComponent::CreateDescriptor(),
             LmbrCentralAllocatorComponent::CreateDescriptor(),
             LmbrCentralAssetBuilderAllocatorComponent::CreateDescriptor(),
             LmbrCentralSystemComponent::CreateDescriptor(),
-            HighQualityShadowComponent::CreateDescriptor(),
-            MeshComponent::CreateDescriptor(),
             NavigationComponent::CreateDescriptor(),
             SimpleStateComponent::CreateDescriptor(),
             SpawnerComponent::CreateDescriptor(),
@@ -237,11 +218,9 @@ namespace LmbrCentral
             CompoundShapeComponent::CreateDescriptor(),
             SplineComponent::CreateDescriptor(),
             PolygonPrismShapeComponent::CreateDescriptor(),
-            StereoRendererComponent::CreateDescriptor(),
             NavigationSystemComponent::CreateDescriptor(),
             GeometrySystemComponent::CreateDescriptor(),
             RandomTimedSpawnerComponent::CreateDescriptor(),
-            GeometryCacheComponent::CreateDescriptor(),
             SphereShapeDebugDisplayComponent::CreateDescriptor(),
             DiskShapeDebugDisplayComponent::CreateDescriptor(),
             BoxShapeDebugDisplayComponent::CreateDescriptor(),
@@ -275,7 +254,6 @@ namespace LmbrCentral
                    azrtti_typeid<LmbrCentralAllocatorComponent>(),
                    azrtti_typeid<LmbrCentralAssetBuilderAllocatorComponent>(),
                    azrtti_typeid<LmbrCentralSystemComponent>(),
-                   azrtti_typeid<StereoRendererComponent>(),
                    azrtti_typeid<NavigationSystemComponent>(),
                    azrtti_typeid<GeometrySystemComponent>(),
                    azrtti_typeid<AudioSystemComponent>(),
@@ -344,13 +322,6 @@ namespace LmbrCentral
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b))
                 ;
             }
-
-            MaterialHandle::Reflect(serializeContext);
-        }
-
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            MaterialHandle::Reflect(behaviorContext);
         }
 
         ReflectScriptableEvents::Reflect(context);
@@ -394,24 +365,11 @@ namespace LmbrCentral
         // Register asset handlers. Requires "AssetDatabaseService"
         AZ_Assert(AZ::Data::AssetManager::IsReady(), "Asset manager isn't ready!");
 
-        auto lensFlareAssetHandler = aznew LensFlareAssetHandler;
-        lensFlareAssetHandler->Register(); // registers self with AssetManager
-        m_assetHandlers.emplace_back(lensFlareAssetHandler);
-
-        auto meshAssetHandler = aznew MeshAssetHandler();
-        meshAssetHandler->Register(); // registers self with AssetManager
-        m_assetHandlers.emplace_back(meshAssetHandler);
-
-        auto geomCacheAssetHandler = aznew GeomCacheAssetHandler();
-        geomCacheAssetHandler->Register(); // registers self with AssetManager
-        m_assetHandlers.emplace_back(geomCacheAssetHandler);
-
         // Add asset types and extensions to AssetCatalog. Uses "AssetCatalogService".
         auto assetCatalog = AZ::Data::AssetCatalogRequestBus::FindFirstHandler();
         if (assetCatalog)
         {
             assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid());
-            assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<LensFlareAsset>::Uuid());
             assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<MaterialAsset>::Uuid());
             assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<DccMaterialAsset>::Uuid());
             assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<MeshAsset>::Uuid());
@@ -542,8 +500,6 @@ namespace LmbrCentral
         gEnv = system.GetGlobalEnvironment();
 #endif
 
-        REGISTER_INT(s_meshAssetHandler_AsyncCvar, 1, 0, "Enables asynchronous loading of legacy mesh formats");
-
         // Enable catalog now that application's asset root is set.
         if (system.GetGlobalEnvironment()->IsEditor())
         {
@@ -560,11 +516,6 @@ namespace LmbrCentral
 
     void LmbrCentralSystemComponent::OnCrySystemShutdown([[maybe_unused]] ISystem& system)
     {
-        if (gEnv->pConsole)
-        {
-            gEnv->pConsole->UnregisterVariable(s_meshAssetHandler_AsyncCvar, true);
-        }
-
         EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, StopMonitoringAssets);
 
 #if !defined(AZ_MONOLITHIC_BUILD)
diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
index b20ce12f35..8536733b01 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
@@ -16,7 +16,6 @@
 
 #include "Ai/EditorNavigationAreaComponent.h"
 #include "Ai/EditorNavigationSeedComponent.h"
-#include "Animation/EditorAttachmentComponent.h"
 #include "Audio/EditorAudioAreaEnvironmentComponent.h"
 #include "Audio/EditorAudioEnvironmentComponent.h"
 #include "Audio/EditorAudioListenerComponent.h"
@@ -25,16 +24,6 @@
 #include "Audio/EditorAudioRtpcComponent.h"
 #include "Audio/EditorAudioSwitchComponent.h"
 #include "Audio/EditorAudioTriggerComponent.h"
-#include "Rendering/EditorDecalComponent.h"
-#include "Rendering/EditorLensFlareComponent.h"
-#include "Rendering/EditorLightComponent.h"
-#include "Rendering/EditorPointLightComponent.h"
-#include "Rendering/EditorAreaLightComponent.h"
-#include "Rendering/EditorProjectorLightComponent.h"
-#include "Rendering/EditorEnvProbeComponent.h"
-#include "Rendering/EditorHighQualityShadowComponent.h"
-#include "Rendering/EditorMeshComponent.h"
-#include "Rendering/EditorGeomCacheComponent.h"
 #include "Scripting/EditorLookAtComponent.h"
 #include "Scripting/EditorRandomTimedSpawnerComponent.h"
 #include "Scripting/EditorSpawnerComponent.h"
@@ -70,7 +59,6 @@ namespace LmbrCentral
         : LmbrCentralModule()
     {
         m_descriptors.insert(m_descriptors.end(), {
-            EditorAttachmentComponent::CreateDescriptor(),
             EditorAudioAreaEnvironmentComponent::CreateDescriptor(),
             EditorAudioEnvironmentComponent::CreateDescriptor(),
             EditorAudioListenerComponent::CreateDescriptor(),
@@ -79,15 +67,6 @@ namespace LmbrCentral
             EditorAudioRtpcComponent::CreateDescriptor(),
             EditorAudioSwitchComponent::CreateDescriptor(),
             EditorAudioTriggerComponent::CreateDescriptor(),
-            EditorDecalComponent::CreateDescriptor(),
-            EditorLensFlareComponent::CreateDescriptor(),
-            EditorLightComponent::CreateDescriptor(),
-            EditorPointLightComponent::CreateDescriptor(),
-            EditorAreaLightComponent::CreateDescriptor(),
-            EditorProjectorLightComponent::CreateDescriptor(),
-            EditorEnvProbeComponent::CreateDescriptor(),
-            EditorHighQualityShadowComponent::CreateDescriptor(),
-            EditorMeshComponent::CreateDescriptor(),
             EditorTagComponent::CreateDescriptor(),
             EditorSphereShapeComponent::CreateDescriptor(),
             EditorDiskShapeComponent::CreateDescriptor(),
@@ -104,7 +83,6 @@ namespace LmbrCentral
             EditorNavigationAreaComponent::CreateDescriptor(),
             EditorNavigationSeedComponent::CreateDescriptor(),
             EditorRandomTimedSpawnerComponent::CreateDescriptor(),
-            EditorGeometryCacheComponent::CreateDescriptor(),
             EditorSpawnerComponent::CreateDescriptor(),            
             CopyDependencyBuilder::CopyDependencyBuilderComponent::CreateDescriptor(),
             DependencyBuilder::DependencyBuilderComponent::CreateDescriptor(),
@@ -125,8 +103,6 @@ namespace LmbrCentral
             typeIds.emplace_back(descriptor->GetUuid());
         }
         EBUS_EVENT(AzFramework::MetricsPlainTextNameRegistrationBus, RegisterForNameSending, typeIds);
-
-        EditorMeshBus::Handler::BusConnect();
     }
 
     LmbrCentralEditorModule::~LmbrCentralEditorModule()
@@ -141,11 +117,6 @@ namespace LmbrCentral
 
         return requiredComponents;
     }
-
-    bool LmbrCentralEditorModule::AddMeshComponentWithAssetId(const AZ::EntityId& targetEntity, const AZ::Uuid& meshAssetId)
-    {
-        return AddMeshComponentWithMesh(targetEntity, meshAssetId);
-    }
 } // namespace LmbrCentral
 
 AZ_DECLARE_MODULE_CLASS(Gem_LmbrCentralEditor, LmbrCentral::LmbrCentralEditorModule)
diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h
index f180c21d8d..7a9dbd01ba 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h
@@ -13,13 +13,6 @@
 
 #include "LmbrCentral.h"
 
-#include <LmbrCentral/Rendering/EditorMeshBus.h>
-
-namespace Water
-{
-    class WaterVolumeConverter;
-}
-
 namespace LmbrCentral
 {
     /**
@@ -31,7 +24,6 @@ namespace LmbrCentral
      */
     class LmbrCentralEditorModule
         : public LmbrCentralModule
-        , public EditorMeshBus::Handler
     {
     public:
         AZ_RTTI(LmbrCentralEditorModule, "{1BF648D7-3703-4B52-A688-67C253A059F2}", LmbrCentralModule);
@@ -39,7 +31,5 @@ namespace LmbrCentral
         LmbrCentralEditorModule();
         ~LmbrCentralEditorModule();
         AZ::ComponentTypeList GetRequiredSystemComponents() const override;
-
-        bool AddMeshComponentWithAssetId(const AZ::EntityId& targetEntity, const AZ::Uuid& meshAssetId) override;
     };
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/DecalComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/DecalComponent.cpp
deleted file mode 100644
index 1892b930b7..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/DecalComponent.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "LmbrCentral_precompiled.h"
-#include "DecalComponent.h"
-#include <LmbrCentral/Rendering/Utils/MaterialOwnerRequestBusHandlerImpl.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <MathConversion.h>
-#include <I3DEngine.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace LmbrCentral
-{
-    void DecalConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<DecalConfiguration>()->
-                Version(2, &VersionConverter)->
-                Field("Visible", &DecalConfiguration::m_visible)->
-                Field("ProjectionType", &DecalConfiguration::m_projectionType)->
-                Field("Material", &DecalConfiguration::m_material)->
-                Field("SortPriority", &DecalConfiguration::m_sortPriority)->
-                Field("Depth", &DecalConfiguration::m_depth)->
-                Field("Offset", &DecalConfiguration::m_position)->
-                Field("Opacity", &DecalConfiguration::m_opacity)->
-                Field("Angle Attenuation", &DecalConfiguration::m_angleAttenuation)->
-                Field("Deferred", &DecalConfiguration::m_deferred)->
-                Field("DeferredString", &DecalConfiguration::m_deferredString)->
-                Field("Max View Distance", &DecalConfiguration::m_maxViewDist)->
-                Field("View Distance Multiplier", &DecalConfiguration::m_viewDistanceMultiplier)->
-                Field("Min Spec", &DecalConfiguration::m_minSpec)
-            ;
-        }
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->EBus<DecalComponentRequestBus>("DecalComponentRequestBus")
-                ->Event("SetVisibility", &DecalComponentRequestBus::Events::SetVisibility)
-                ->Event("Show", &DecalComponentRequestBus::Events::Show)
-                ->Event("Hide", &DecalComponentRequestBus::Events::Hide)
-                ;
-        }
-    }
-
-    // Private Static
-    bool DecalConfiguration::VersionConverter([[maybe_unused]] AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement)
-    {
-        // conversion from version 1:
-        // - Remove Normal
-        if (classElement.GetVersion() <= 1)
-        {
-            classElement.RemoveElementByName(AZ_CRC_CE("Normal"));
-        }
-
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void DecalComponent::Reflect(AZ::ReflectContext* context)
-    {
-        DecalConfiguration::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<DecalComponent, AZ::Component>()->
-                Version(1)->
-                Field("DecalConfiguration", &DecalComponent::m_configuration);
-            ;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    DecalComponent::DecalComponent()
-        : m_decalRenderNode(nullptr)
-    {
-        m_materialBusHandler = aznew MaterialOwnerRequestBusHandlerImpl;
-    }
-
-    DecalComponent::~DecalComponent()
-    {
-        delete m_materialBusHandler;
-    }
-
-
-    void DecalComponent::Activate()
-    {
-    }
-
-    void DecalComponent::Deactivate()
-    {
-    }
-
-    void DecalComponent::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, const AZ::Transform& world)
-    {
-        SDecalProperties decalProperties = m_configuration.GetDecalProperties(world);
-        if (m_decalRenderNode)
-        {
-            m_decalRenderNode->SetDecalProperties(decalProperties);
-            m_decalRenderNode->SetMatrix(AZTransformToLYTransform(world));
-        }
-    }
-
-    void DecalComponent::Show()
-    {
-        if (!m_decalRenderNode)
-        {
-            return;
-        }
-
-        m_decalRenderNode->Hide(false);
-    }
-
-    void DecalComponent::Hide()
-    {
-        if (!m_decalRenderNode)
-        {
-            return;
-        }
-
-        m_decalRenderNode->Hide(true);
-    }
-
-    void DecalComponent::SetVisibility(bool show)
-    {
-        if (show)
-        {
-            Show();
-        }
-        else
-        {
-            Hide();
-        }
-    }
-
-    IRenderNode* DecalComponent::GetRenderNode()
-    {
-        return m_decalRenderNode;
-    }
-
-    float DecalComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return s_renderNodeRequestBusOrder;
-    }
-
-
-    bool DecalComponent::IsMaterialOwnerReady()
-    {
-        return m_materialBusHandler->IsMaterialOwnerReady();
-    }
-
-    void DecalComponent::SetMaterial(_smart_ptr<IMaterial> material)
-    {
-        m_materialBusHandler->SetMaterial(material);
-    }
-
-    _smart_ptr<IMaterial> DecalComponent::GetMaterial()
-    {
-        return m_materialBusHandler->GetMaterial();
-    }
-
-    void DecalComponent::SetMaterialHandle(const MaterialHandle& materialHandle)
-    {
-        m_materialBusHandler->SetMaterialHandle(materialHandle);
-    }
-
-    MaterialHandle DecalComponent::GetMaterialHandle()
-    {
-        return m_materialBusHandler->GetMaterialHandle();
-    }
-
-    void DecalComponent::SetMaterialParamVector4(const AZStd::string& name, const AZ::Vector4& value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamVector4(name, value, materialId);
-    }
-
-    void DecalComponent::SetMaterialParamVector3(const AZStd::string& name, const AZ::Vector3& value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamVector3(name, value, materialId);
-    }
-
-    void DecalComponent::SetMaterialParamColor(const AZStd::string& name, const AZ::Color& value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamColor(name, value, materialId);
-    }
-
-    void DecalComponent::SetMaterialParamFloat(const AZStd::string& name, float value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamFloat(name, value, materialId);
-    }
-
-    AZ::Vector4 DecalComponent::GetMaterialParamVector4(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamVector4(name, materialId);
-    }
-
-    AZ::Vector3 DecalComponent::GetMaterialParamVector3(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamVector3(name, materialId);
-    }
-
-    AZ::Color DecalComponent::GetMaterialParamColor(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamColor(name, materialId);
-    }
-
-    float DecalComponent::GetMaterialParamFloat(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamFloat(name, materialId);
-    }
-
-
-    const float DecalComponent::s_renderNodeRequestBusOrder = 900.f;
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/DecalComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/DecalComponent.h
deleted file mode 100644
index 177e2075f8..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/DecalComponent.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Component/TransformBus.h>
-
-#include <MathConversion.h>
-
-#include <IEntityRenderState.h>
-
-#include <LmbrCentral/Rendering/DecalComponentBus.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <LmbrCentral/Rendering/MaterialAsset.h>
-#include <LmbrCentral/Rendering/MaterialOwnerBus.h>
-
-namespace LmbrCentral
-{
-    class MaterialOwnerRequestBusHandlerImpl;
-
-    /*!
-    * Contains properties used to create decals, these properties are later propagated to the
-    * 3D engine decal system.
-    */
-    class DecalConfiguration
-    {
-    public:
-        AZ_TYPE_INFO(DecalConfiguration, "{47082F75-428F-4353-AC82-FAE8AB017F3B}");
-
-        virtual ~DecalConfiguration() {}
-
-        virtual AZ::u32 MajorPropertyChanged() { return AZ_CRC("RefreshNone", 0x98a5045b); }
-        virtual AZ::u32 MinorPropertyChanged() { return AZ_CRC("RefreshNone", 0x98a5045b); }
-
-        SDecalProperties::EProjectionType   m_projectionType = SDecalProperties::EProjectionType::ePlanar;
-        AZ::Vector3                         m_position = AZ::Vector3::CreateZero();
-        AZ::Transform                       m_explicitRightUpFront = AZ::Transform::CreateIdentity();
-        AZ::u32                             m_sortPriority = 16;
-        float                               m_depth = 1.f;
-        float                               m_viewDistanceMultiplier = 1.f;
-        bool                                m_visible = true;
-        bool                                m_deferred = false;
-        AZStd::string                       m_deferredString = "";
-        float                               m_opacity = 1.0f;
-        float                               m_angleAttenuation = 1.0f;
-        float                               m_maxViewDist = 8000.0f;
-        EngineSpec                          m_minSpec = EngineSpec::Low;
-
-        //! User-specified material override.
-        AzFramework::SimpleAssetReference<MaterialAsset> m_material;
-
-        AZ::EntityId m_editorEntityId; // Editor-only, not reflected.
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        SDecalProperties GetDecalProperties(const AZ::Transform& transform)
-        {
-            SDecalProperties decalProperties;
-            decalProperties.m_projectionType = m_projectionType;
-            decalProperties.m_radius = 1.f;
-
-            if (m_projectionType != SDecalProperties::ePlanar)
-            {
-                decalProperties.m_radius = decalProperties.m_normal.GetLength();
-            }
-
-            Matrix34 wtm = AZTransformToLYTransform(transform);
-            Matrix33 rotation(wtm);
-            decalProperties.m_explicitRightUpFront = rotation;
-            decalProperties.m_pos = wtm.TransformPoint(AZVec3ToLYVec3(m_position));
-            decalProperties.m_normal = Vec3(0, 0, 1);
-            decalProperties.m_pMaterialName = m_material.GetAssetPath().c_str();
-            decalProperties.m_sortPrio = m_sortPriority;
-            decalProperties.m_deferred = m_deferred;
-            decalProperties.m_opacity = m_opacity;
-            decalProperties.m_angleAttenuation = m_angleAttenuation;
-            decalProperties.m_depth = m_depth;
-            decalProperties.m_maxViewDist = m_maxViewDist;
-            decalProperties.m_minSpec = m_minSpec;
-
-            return decalProperties;
-        }
-
-    private:
-
-        static bool VersionConverter(AZ::SerializeContext& context,
-            AZ::SerializeContext::DataElementNode& classElement);
-    };
-
-    /*!
-    * Spawns decals as setup during edit time.
-    */
-    class DecalComponent
-        : public AZ::Component
-        , public DecalComponentRequestBus::Handler
-        , public RenderNodeRequestBus::Handler
-        , public AZ::TransformNotificationBus::Handler
-        , public MaterialOwnerRequestBus::Handler
-    {
-    public:
-
-        AZ_COMPONENT(DecalComponent, "{1C2CEAA8-786F-4684-8202-CA7D940D627B}");
-
-        DecalComponent();
-        ~DecalComponent() override;
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component implementation.
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // DecalComponentRequests implementation.
-        void Show() override;
-        void Hide() override;
-        void SetVisibility(bool visible) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // RenderNodeRequests implementation
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-        static const float s_renderNodeRequestBusOrder;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::TransformNotificationBus implementation.
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // MaterialOwnerRequestBus interface implementation
-        bool IsMaterialOwnerReady() override;
-        void SetMaterial(_smart_ptr<IMaterial>) override;
-        _smart_ptr<IMaterial> GetMaterial() override;
-        void SetMaterialHandle(const MaterialHandle& materialHandle) override;
-        MaterialHandle GetMaterialHandle() override;
-        void SetMaterialParamVector4( const AZStd::string& /*name*/, const AZ::Vector4& /*value*/, int /*materialId = 1*/) override;
-        void SetMaterialParamVector3( const AZStd::string& /*name*/, const AZ::Vector3& /*value*/, int /*materialId = 1*/) override;
-        void SetMaterialParamColor(   const AZStd::string& /*name*/, const AZ::Color& /*value*/, int /*materialId = 1*/) override;
-        void SetMaterialParamFloat(   const AZStd::string& /*name*/, float /*value*/, int /*materialId = 1*/) override;
-        AZ::Vector4 GetMaterialParamVector4( const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-        AZ::Vector3 GetMaterialParamVector3( const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-        AZ::Color   GetMaterialParamColor(   const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-        float       GetMaterialParamFloat(   const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-        ///////////////////////////////////
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("DecalService", 0xfb7f71ae));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-        }
-
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& /*dependent*/)
-        {
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void SetConfiguration(const DecalConfiguration& configuration)
-        {
-            m_configuration = configuration;
-        }
-
-    protected:
-
-        IDecalRenderNode* m_decalRenderNode;
-        DecalConfiguration m_configuration;
-        MaterialOwnerRequestBusHandlerImpl* m_materialBusHandler;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorAreaLightComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorAreaLightComponent.cpp
deleted file mode 100644
index 41d8b58194..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorAreaLightComponent.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include "EditorAreaLightComponent.h"
-
-namespace LmbrCentral
-{
-    void EditorAreaLightComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorAreaLightComponent, EditorLightComponent>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorAreaLightComponent>(
-                    "Area Light", "The Area Light component allows an entity to light a defined area")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AreaLight.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AreaLight.png")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-area-light.html")
-                        ->Attribute(AZ::Edit::Attributes::ExportIfAllPlatformTags, AZStd::vector<AZ::Crc32>{AZ_CRC("renderer", 0xf199a19c)}) // Only export on platforms that render
-                        ->Attribute(AZ::Edit::Attributes::RuntimeExportCallback, &EditorLightComponent::ExportLightComponent)
-                    ;
-            }
-        }
-
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->Class<EditorAreaLightComponent>()->RequestBus("EditorAreaLightComponentBus");
-        }
-    }
-
-    void EditorAreaLightComponent::Init()
-    {
-        SetLightType(EditorLightConfiguration::LightType::Area);
-        EditorLightComponent::Init();
-    }
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorAreaLightComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorAreaLightComponent.h
deleted file mode 100644
index ec9bb594d5..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorAreaLightComponent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include "EditorLightComponent.h"
-
-namespace LmbrCentral
-{
-    /*!
-     * In-editor point light component.
-     * Handles previewing and activating lights in the editor.
-     */
-    class EditorAreaLightComponent
-        : public EditorLightComponent
-    {
-    public:
-        AZ_COMPONENT(EditorAreaLightComponent, "{1DE624B1-876F-4E0A-96A6-7B248FA2076F}", EditorLightComponent);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void Init() override;
-        
-    protected: 
-        const char* GetLightTypeText() const override
-        {
-            return "Area Light";
-        }
-    };
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorDecalComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorDecalComponent.cpp
deleted file mode 100644
index 3d79c4d2ae..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorDecalComponent.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-#include "EditorDecalComponent.h"
-#include <IEditor.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Math/IntersectSegment.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Asset/AssetManagerBus.h>
-
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <IEditor.h>
-#include <I3DEngine.h>
-
-namespace LmbrCentral
-{
-    void EditorDecalComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        EditorDecalConfiguration::Reflect(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorDecalComponent, EditorComponentBase>()->
-                Version(1)->
-                Field("EditorDecalConfiguration", &EditorDecalComponent::m_configuration)
-            ;
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorDecalComponent>(
-                    "Decal", "The Decal component allows an entity to project a texture or material onto a mesh")->
-                    ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                    Attribute(AZ::Edit::Attributes::Category, "Rendering")->
-                    Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Decal.svg")->
-                    Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<LmbrCentral::MaterialAsset>::Uuid())->
-                    Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Decal.png")->
-                    Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))->
-                    Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-                    Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-decal.html")->
-                    DataElement(0, &EditorDecalComponent::m_configuration, "Settings", "Decal configuration")->
-                    Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-                ;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void EditorDecalConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorDecalConfiguration, DecalConfiguration>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-
-            if (editContext)
-            {
-                editContext->Class<DecalConfiguration>(
-                    "Render Settings", "Rendering options for the decal.")->
-                    ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                    Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-                    Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Decal Settings")->
-                    Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(0, &DecalConfiguration::m_position, "Offset", "")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &DecalConfiguration::m_visible, "Visible", "")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-
-                    DataElement(AZ::Edit::UIHandlers::ComboBox, &DecalConfiguration::m_projectionType, "Projection type", "")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MajorPropertyChanged)->
-                    EnumAttribute(SDecalProperties::EProjectionType::ePlanar, "Planar")->
-                    EnumAttribute(SDecalProperties::EProjectionType::eProjectOnTerrain, "On Terrain")->
-                    EnumAttribute(SDecalProperties::EProjectionType::eProjectOnTerrainAndStaticObjects, "On Terrain and Static Objects")->
-
-                    DataElement(AZ::Edit::UIHandlers::Default, &DecalConfiguration::m_deferredString, "Deferred", "")->
-                    Attribute(AZ::Edit::Attributes::ReadOnly, true)->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MajorPropertyChanged)->
-
-                    DataElement(AZ::Edit::UIHandlers::SpinBox, &DecalConfiguration::m_sortPriority, "Sort priority", "Higher priority renders decals on top.")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-                    Attribute(AZ::Edit::Attributes::Min, 0)->
-                    Attribute(AZ::Edit::Attributes::Max, 255)->
-                    Attribute(AZ::Edit::Attributes::Step, 1)->
-
-                    DataElement(AZ::Edit::UIHandlers::SpinBox, &DecalConfiguration::m_depth, "Depth", "")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-                    Attribute(AZ::Edit::Attributes::Min, 0.0001f)->
-                    Attribute(AZ::Edit::Attributes::Max, 10.f)->
-                    Attribute(AZ::Edit::Attributes::Step, 1.f / 255.f)->
-
-                    DataElement(0, &DecalConfiguration::m_material, "Material", "")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MajorPropertyChanged)->
-
-                    DataElement(AZ::Edit::UIHandlers::Slider, &DecalConfiguration::m_opacity, "Opacity", "Additional opacity setting on top of the distance from the decal to the surface")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-                    Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                    Attribute(AZ::Edit::Attributes::Max, 1.f)->
-                    Attribute(AZ::Edit::Attributes::Visibility, &DecalConfiguration::m_deferred)->
-
-                    DataElement(AZ::Edit::UIHandlers::Slider, &DecalConfiguration::m_angleAttenuation, "Angle Attenuation", "amount of angle attenuation computation taken into account")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-                    Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                    Attribute(AZ::Edit::Attributes::Max, 1.f)->
-                    Attribute(AZ::Edit::Attributes::Visibility, &DecalConfiguration::m_deferred)->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Options")->
-
-                    DataElement(AZ::Edit::UIHandlers::Default, &DecalConfiguration::m_maxViewDist, "Max view distance", "The furthest distance this decal can be seen from")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-                    Attribute(AZ::Edit::Attributes::Suffix, " m")->
-                    Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                    Attribute(AZ::Edit::Attributes::Max, 8000.0f)->
-                    Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-
-                    DataElement(AZ::Edit::UIHandlers::SpinBox, &DecalConfiguration::m_viewDistanceMultiplier, "View distance multiplier", "")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-                    Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                    Attribute(AZ::Edit::Attributes::Max, IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX)->
-
-                    DataElement(AZ::Edit::UIHandlers::ComboBox, &DecalConfiguration::m_minSpec, "Minimum spec", "Min spec for light to be active.")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &DecalConfiguration::MinorPropertyChanged)->
-                    EnumAttribute(EngineSpec::Never, "Never")->
-                    EnumAttribute(EngineSpec::VeryHigh, "Very high")->
-                    EnumAttribute(EngineSpec::High, "High")->
-                    EnumAttribute(EngineSpec::Medium, "Medium")->
-                    EnumAttribute(EngineSpec::Low, "Low")
-                ;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    AZ::u32 EditorDecalConfiguration::MajorPropertyChanged()
-    {
-        if (m_editorEntityId.IsValid())
-        {
-            EBUS_EVENT_ID(m_editorEntityId, DecalComponentEditorRequests::Bus, RefreshDecal);
-        }
-
-        return AZ::Edit::PropertyRefreshLevels::EntireTree;
-    }
-
-    AZ::u32 EditorDecalConfiguration::MinorPropertyChanged()
-    {
-        if (m_editorEntityId.IsValid())
-        {
-            EBUS_EVENT_ID(m_editorEntityId, DecalComponentEditorRequests::Bus, RefreshDecal);
-        }
-
-        return AZ::Edit::PropertyRefreshLevels::None;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    EditorDecalComponent::EditorDecalComponent()
-        : m_materialLayersMask(0)
-    {
-    }
-
-    EditorDecalComponent::~EditorDecalComponent()
-    {
-    }
-
-    void EditorDecalComponent::Activate()
-    {
-        Base::Activate();
-    }
-
-    void EditorDecalComponent::Deactivate()
-    {
-        Base::Deactivate();
-    }
-
-    void EditorDecalComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        DecalComponent* decalComponent = gameEntity->CreateComponent<DecalComponent>();
-
-        if (decalComponent)
-        {
-            decalComponent->SetConfiguration(m_configuration);
-        }
-    }
-
-    void EditorDecalComponent::OnEditorSpecChange()
-    {
-        RefreshDecal();
-    }
-
-    void EditorDecalComponent::RefreshDecal()
-    {
-        if (!m_decalRenderNode)
-        {
-            return;
-        }
-
-        if (m_configuration.m_projectionType == SDecalProperties::EProjectionType::eProjectOnTerrainAndStaticObjects)
-        {
-            m_configuration.m_deferred = true;
-            m_configuration.m_deferredString = "Yes";
-        }
-        else
-        {
-            m_configuration.m_deferred = false;
-            m_configuration.m_deferredString = "No";
-        }
-
-        m_renderFlags = 0;
-
-        if (IsSelected())
-        {
-            m_renderFlags |= ERF_SELECTED;
-        }
-
-        // take the entity's visibility into account
-        bool visible = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-            visible, GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
-
-        const int configSpec = gEnv->pSystem->GetConfigSpec(true);
-        if (!visible || !m_configuration.m_visible || static_cast<AZ::u32>(configSpec) < static_cast<AZ::u32>(m_configuration.m_minSpec))
-        {
-            m_renderFlags |= ERF_HIDDEN;
-        }
-
-        //Set default material
-        if (m_configuration.m_material.GetAssetPath().empty())
-        {
-            m_configuration.m_material.SetAssetPath("engineassets/materials/decals/default.mtl");
-        }
-
-        AZ::Transform transform = AZ::Transform::CreateIdentity();
-        EBUS_EVENT_ID_RESULT(transform, GetEntityId(), AZ::TransformBus, GetWorldTM);
-
-        SDecalProperties decalProperties = m_configuration.GetDecalProperties(transform);
-        m_decalRenderNode->SetDecalProperties(decalProperties);
-
-        m_renderFlags |= ERF_COMPONENT_ENTITY;
-        m_decalRenderNode->SetRndFlags(m_renderFlags);
-        m_decalRenderNode->SetMatrix(AZTransformToLYTransform(transform));
-        m_decalRenderNode->SetMinSpec(static_cast<int>(decalProperties.m_minSpec));
-        m_decalRenderNode->SetMaterialLayers(m_materialLayersMask);
-        m_decalRenderNode->SetViewDistanceMultiplier(m_configuration.m_viewDistanceMultiplier);
-    }
-
-    void EditorDecalComponent::SetPrimaryAsset(const AZ::Data::AssetId& id)
-    {
-        AZStd::string assetPath;
-        EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, id);
-        m_configuration.m_material.SetAssetPath(assetPath.c_str());
-        RefreshDecal();
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, AddDirtyEntity, GetEntityId());
-    }
-
-    void EditorDecalComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        // Displays a small grid over the area where the decal will be applied.
-        if (!IsSelected())
-        {
-            return;
-        }
-
-        AZ::Transform transform = AZ::Transform::CreateIdentity();
-        EBUS_EVENT_ID_RESULT(transform, GetEntityId(), AZ::TransformBus, GetWorldTM);
-
-        AZ::Vector3 x1 = transform.TransformPoint(AZ::Vector3(-1, 0, 0));
-        AZ::Vector3 x2 = transform.TransformPoint(AZ::Vector3(1, 0, 0));
-        AZ::Vector3 y1 = transform.TransformPoint(AZ::Vector3(0, -1, 0));
-        AZ::Vector3 y2 = transform.TransformPoint(AZ::Vector3(0, 1, 0));
-        AZ::Vector3 p = transform.TransformPoint(AZ::Vector3(0, 0, 0));
-        AZ::Vector3 n = transform.TransformPoint(AZ::Vector3(0, 0, 1));
-
-        debugDisplay.SetColor(AZ::Vector4(1, 0, 0, 1));
-
-        debugDisplay.DrawLine(p, n);
-        debugDisplay.DrawLine(x1, x2);
-        debugDisplay.DrawLine(y1, y2);
-
-        AZ::Vector3 p0 = transform.TransformPoint(AZ::Vector3(-1, -1, 0));
-        AZ::Vector3 p1 = transform.TransformPoint(AZ::Vector3(-1, 1, 0));
-        AZ::Vector3 p2 = transform.TransformPoint(AZ::Vector3(1, 1, 0));
-        AZ::Vector3 p3 = transform.TransformPoint(AZ::Vector3(1, -1, 0));
-
-        debugDisplay.DrawLine(p0, p1);
-        debugDisplay.DrawLine(p1, p2);
-        debugDisplay.DrawLine(p2, p3);
-        debugDisplay.DrawLine(p3, p0);
-        debugDisplay.DrawLine(p0, p2);
-        debugDisplay.DrawLine(p1, p3);
-    }
-
-    void EditorDecalComponent::OnEntityVisibilityChanged(bool /*visibility*/)
-    {
-        RefreshDecal();
-    }
-
-    IRenderNode* EditorDecalComponent::GetRenderNode()
-    {
-        return m_decalRenderNode;
-    }
-
-    float EditorDecalComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return DecalComponent::s_renderNodeRequestBusOrder;
-    }
-
-    void EditorDecalComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& /*world*/)
-    {
-        RefreshDecal();
-    }
-
-    void EditorDecalComponent::SetMaterial(_smart_ptr<IMaterial> material)
-    {
-        if (material)
-        {
-            m_configuration.m_material.SetAssetPath(material->GetName());
-        }
-        else
-        {
-            m_configuration.m_material.SetAssetPath("");
-        }
-
-        RefreshDecal();
-
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_AttributesAndValues);
-    }
-
-    _smart_ptr<IMaterial> EditorDecalComponent::GetMaterial()
-    {
-        return m_decalRenderNode->GetMaterial();
-    }
-
-    AZ::Aabb EditorDecalComponent::GetEditorSelectionBoundsViewport(const AzFramework::ViewportInfo& /*viewportInfo*/)
-    {
-        return GetWorldBounds();
-    }
-
-    AZ::Aabb EditorDecalComponent::GetWorldBounds()
-    {
-        AZ::Transform transform = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-
-        return GetLocalBounds().GetTransformedAabb(transform);
-    }
-
-    AZ::Aabb EditorDecalComponent::GetLocalBounds()
-    {
-        AZ::Aabb bbox = AZ::Aabb::CreateNull();
-
-        bbox.AddPoint(AZ::Vector3(-1, -1, 0));
-        bbox.AddPoint(AZ::Vector3(-1, 1, 0));
-        bbox.AddPoint(AZ::Vector3(1, 1, 0));
-        bbox.AddPoint(AZ::Vector3(1, -1, 0));
-
-        return bbox;
-    }
-
-    bool EditorDecalComponent::EditorSelectionIntersectRayViewport(const AzFramework::ViewportInfo& /*viewportInfo*/, const AZ::Vector3& src, const AZ::Vector3& dir, float& distance)
-    {
-        AZ::Transform transform = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-
-        AZ::Vector3 p0 = transform.TransformPoint(AZ::Vector3(-1, -1, 0));
-        AZ::Vector3 p1 = transform.TransformPoint(AZ::Vector3(-1, 1, 0));
-        AZ::Vector3 p2 = transform.TransformPoint(AZ::Vector3(1, 1, 0));
-        AZ::Vector3 p3 = transform.TransformPoint(AZ::Vector3(1, -1, 0));
-        float t{ 0.0f };
-
-        bool hitResult = AZ::Intersect::IntersectRayQuad(src, dir, p0, p1, p2, p3, t) != 0;
-        distance = t;
-
-        return hitResult;
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorDecalComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorDecalComponent.h
deleted file mode 100644
index f4b25f4a9a..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorDecalComponent.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzFramework/Visibility/BoundsBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-#include "DecalComponent.h"
-
-namespace LmbrCentral
-{
-    /*!
-     * Extends DecalConfiguration structure to add editor functionality
-     * such as property handlers and visibility filters, as well as
-     * reflection for editing.
-     */
-    class EditorDecalConfiguration
-        : public DecalConfiguration
-    {
-    public:
-
-        AZ_TYPE_INFO(EditorDecalConfiguration, "{559556BE-F41E-43C0-9EE6-7048D84D7952}");
-
-        ~EditorDecalConfiguration() override {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZ::u32 MajorPropertyChanged() override;
-        AZ::u32 MinorPropertyChanged() override;
-    };
-
-    /*!
-     * In-editor decal component.
-     * Handles placement of decals in editor.
-     */
-    class EditorDecalComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , private DecalComponentEditorRequests::Bus::Handler
-        , private MaterialOwnerRequestBus::Handler
-        , private RenderNodeRequestBus::Handler
-        , private AZ::TransformNotificationBus::Handler
-        , private AzFramework::EntityDebugDisplayEventBus::Handler
-        , private AzToolsFramework::EditorVisibilityNotificationBus::Handler
-        , private AzToolsFramework::EditorEvents::Bus::Handler
-        , private AzToolsFramework::EditorComponentSelectionRequestsBus::Handler
-        , public AzFramework::BoundsRequestBus::Handler
-    {
-    private:
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-
-    public:
-        AZ_COMPONENT(EditorDecalComponent, "{BA3890BD-D2E7-4DB6-95CD-7E7D5525567A}", AzToolsFramework::Components::EditorComponentBase);
-
-        EditorDecalComponent();
-        ~EditorDecalComponent() override;
-
-        // AZ::Component interface implementation
-        void Activate() override;
-        void Deactivate() override;
-
-        // AzFramework::EntityDebugDisplayEventBus
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        // AzToolsFramework::EditorVisibilityNotificationBus interface implementation
-        void OnEntityVisibilityChanged(bool visibility) override;
-
-        // DecalComponentEditorRequests::Bus::Handler interface implementation
-        void RefreshDecal() override;
-
-        // MaterialOwnerRequestBus interface implementation
-        void SetMaterial(_smart_ptr<IMaterial>) override;
-        _smart_ptr<IMaterial> GetMaterial() override;
-
-        // RenderNodeRequestBus::Handler interface implementation
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-
-        // TransformNotificationBus::Handler interface implementation
-        void OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& /*world*/) override;
-
-        // EditorComponentSelectionRequestsBus::Handler interface implementation
-        AZ::Aabb GetEditorSelectionBoundsViewport(const AzFramework::ViewportInfo&) override;
-        bool SupportsEditorRayIntersect() override { return true; };
-        bool EditorSelectionIntersectRayViewport(
-            const AzFramework::ViewportInfo& viewportInfo, const AZ::Vector3& src, const AZ::Vector3& dir,
-            float& distance) override;
-
-        // BoundsRequestBus overrides ...
-        AZ::Aabb GetWorldBounds() override;
-        AZ::Aabb GetLocalBounds() override;
-
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        //! Called when you want to change the game asset through code (like when creating components based on assets).
-        void SetPrimaryAsset(const AZ::Data::AssetId& assetId) override;
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            DecalComponent::GetProvidedServices(provided);
-        }
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-        {
-            DecalComponent::GetDependentServices(dependent);
-            dependent.push_back(AZ_CRC_CE("EditorVisibilityService"));
-        }
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            DecalComponent::GetRequiredServices(required);
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-
-    protected:
-
-        EditorDecalConfiguration m_configuration;
-
-        IDecalRenderNode* m_decalRenderNode;
-        uint32 m_renderFlags;
-
-        uint8 m_materialLayersMask;
-
-    private:
-        // AzToolsFramework::EditorEvents interface implementation
-        void OnEditorSpecChange() override;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorEnvProbeComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorEnvProbeComponent.cpp
deleted file mode 100644
index 3ee3d7a9b7..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorEnvProbeComponent.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-#include "EditorEnvProbeComponent.h"
-
-namespace LmbrCentral
-{
-    void EditorEnvProbeComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorEnvProbeComponent, EditorLightComponent>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorEnvProbeComponent>(
-                    "Environment Probe", "The Environment Probe component is used to achieve the right visual quality for a space and help determine proper reflections, ambient diffuse values, particle diffuse values, and shadow colors")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/EnvironmentProbe.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/EnvironmentProbe.png")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-environment-probe.html")
-                        ->Attribute(AZ::Edit::Attributes::RuntimeExportCallback, &EditorLightComponent::ExportLightComponent)
-                    ;
-            }
-        }
-
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->Class<EditorEnvProbeComponent>()->RequestBus("EditorProbeLightComponentBus");
-        }
-    }
-
-    void EditorEnvProbeComponent::Init()
-    {
-        SetLightType(EditorLightConfiguration::LightType::Probe);
-        EditorLightComponent::Init();
-    }
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorEnvProbeComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorEnvProbeComponent.h
deleted file mode 100644
index 5336546caa..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorEnvProbeComponent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include "EditorLightComponent.h"
-
-namespace LmbrCentral
-{
-    /*!
-     * In-editor point light component.
-     * Handles previewing and activating lights in the editor.
-     */
-    class EditorEnvProbeComponent
-        : public EditorLightComponent
-    {
-    public:
-        AZ_COMPONENT(EditorEnvProbeComponent, "{8DBD6035-583E-409F-AFD9-F36829A0655D}", EditorLightComponent);
-
-        static void Reflect(AZ::ReflectContext* context);
-        
-        void Init() override;
-
-    protected:
-        const char* GetLightTypeText() const override
-        {
-            return "Environment Probe";
-        }
-    };
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorGeomCacheComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorGeomCacheComponent.cpp
deleted file mode 100644
index 657f6c2b51..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorGeomCacheComponent.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-#include "EditorGeomCacheComponent.h"
-
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-
-namespace LmbrCentral
-{
-    void EditorGeometryCacheCommon::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorGeometryCacheCommon, GeometryCacheCommon>()
-                ->Version(1)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorGeometryCacheCommon>("Editor Geom Cache Common Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ;
-
-                editContext->Class<GeometryCacheCommon>("Geom Cache Common Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_visible, "Visible", "Should the GeomCache be rendered.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnRenderOptionsChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeometryCacheCommon::m_minSpec, "Min Spec", "The minimum graphics spec where this GeomCache will be rendered.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnRenderOptionsChanged)
-                    ->EnumAttribute(EngineSpec::Never, "Never")
-                    ->EnumAttribute(EngineSpec::VeryHigh, "Very high")
-                    ->EnumAttribute(EngineSpec::High, "High")
-                    ->EnumAttribute(EngineSpec::Medium, "Medium")
-                    ->EnumAttribute(EngineSpec::Low, "Low")
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_geomCacheAsset, "Geom Cache", "The Alembic Geometry Cache asset.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnGeomCacheAssetChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_materialOverrideAsset, "Material Override", "Optional material override asset.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnMaterialOverrideChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_loop, "Loop", "Should the animation loop.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnLoopChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_playOnStart, "Play on Start", "Should the alembic animation play when the component activates.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnPlayOnStartChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_startTime, "Start Time", "The time point that the animation should start at.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnStartTimeChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_streamInDistance, "Stream In Distance", "How close does the viewer need to be for the GeomCache to begin streaming into memory.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnStreamInDistanceChanged)
-
-                    ->ClassElement(AZ::Edit::ClassElements::Group, "Stand-in Settings")
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, false)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_firstFrameStandin, "First Frame Stand-in", "The entity that should stand in for this GeomCache before playback begins.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnFirstFrameStandinChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_lastFrameStandin, "Last Frame Stand-in", "The entity that should stand in for this GeomCache after playback has ended.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnLastFrameStandinChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_standin, "Stand-in", "The entity that should stand in for this GeomCache when the viewer is past the Stand-in Distance.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnStandinChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_standinDistance, "Stand-in Distance", "How close does the viewer need to be before the GeomCache replaces the Stand-in.")
-
-                    ->ClassElement(AZ::Edit::ClassElements::Group, "Options")
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, false)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_maxViewDistance, "Max View Distance", "That maximum distance that this GeomCache can be viewed from.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnMaxViewDistanceChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_viewDistanceMultiplier, "View Distance Multiplier", "Multiplied to the Max View Distance to get the final max view distance.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnViewDistanceMultiplierChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Slider, &GeometryCacheCommon::m_lodDistanceRatio, "LOD Distance Ratio", "Controls LOD ratio over distance.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnLODDistanceRatioChanged)
-                    ->Attribute(AZ::Edit::Attributes::Min, 0)
-                    ->Attribute(AZ::Edit::Attributes::Max, 255)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_castShadows, "Cast Shadows", "Should the GeomCache cast shadows.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnRenderOptionsChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &GeometryCacheCommon::m_useVisAreas, "Use Vis Areas", "Should the GeomCache be affected by VisAreas.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &GeometryCacheCommon::OnRenderOptionsChanged)
-                    ;
-            }
-        }
-    }
-
-    void EditorGeometryCacheCommon::Activate()
-    {
-        GeometryCacheCommon::Activate();
-        EditorGeometryCacheComponentRequestBus::Handler::BusConnect(m_entityId);
-
-        //Store the serialized results here so that we can properly react to stand-in changes after level load
-        m_prevFirstFrameStandin = m_firstFrameStandin;
-        m_prevLastFrameStandin = m_lastFrameStandin;
-        m_prevStandin = m_standin;
-    }
-
-    void EditorGeometryCacheCommon::Deactivate()
-    {
-        EditorGeometryCacheComponentRequestBus::Handler::BusDisconnect(m_entityId);
-        GeometryCacheCommon::Deactivate();
-    }
-
-    void EditorGeometryCacheCommon::SetMinSpec(EngineSpec minSpec)
-    {
-        m_minSpec = minSpec;
-        OnRenderOptionsChanged();
-    }
-
-    void EditorGeometryCacheCommon::SetPlayOnStart(bool playOnStart)
-    {
-        m_playOnStart = playOnStart;
-        OnPlayOnStartChanged();
-    }
-
-    void EditorGeometryCacheCommon::SetMaxViewDistance(float maxViewDistance)
-    {
-        m_maxViewDistance = maxViewDistance;
-        OnMaxViewDistanceChanged();
-    }
-
-    void EditorGeometryCacheCommon::SetViewDistanceMultiplier(float viewDistanceMultiplier)
-    {
-        m_viewDistanceMultiplier = viewDistanceMultiplier;
-        OnViewDistanceMultiplierChanged();
-    }
-
-    void EditorGeometryCacheCommon::SetLODDistanceRatio(AZ::u32 lodDistanceRatio)
-    {
-        m_lodDistanceRatio = lodDistanceRatio;
-        OnLODDistanceRatioChanged();
-    }
-
-    void EditorGeometryCacheCommon::SetCastShadows(bool castShadows)
-    {
-        m_castShadows = castShadows;
-        OnRenderOptionsChanged();
-    }
-
-    void EditorGeometryCacheCommon::SetUseVisAreas(bool useVisAreas)
-    {
-        m_useVisAreas = useVisAreas;
-        OnRenderOptionsChanged();
-    }
-    
-    void EditorGeometryCacheCommon::OnFirstFrameStandinChanged()
-    {
-        //We only need to remove the prev stand-in from the geom cache's hierarchy if it's not used anywhere else
-        bool removePrevFirstFrameStandinTransform = false;
-        if (m_prevFirstFrameStandin != m_prevStandin && m_prevFirstFrameStandin != m_prevLastFrameStandin)
-        {
-            removePrevFirstFrameStandinTransform = true;
-        }
-        HandleStandinChanged(m_prevFirstFrameStandin, m_firstFrameStandin, removePrevFirstFrameStandinTransform);
-
-        m_prevFirstFrameStandin = m_firstFrameStandin;
-    }
-
-    void EditorGeometryCacheCommon::OnLastFrameStandinChanged()
-    {
-        //We only need to remove the prev stand-in from the geom cache's hierarchy if it's not used anywhere else
-        bool removePrevLastFrameStandinTransform = false;
-        if (m_prevLastFrameStandin != m_prevStandin && m_prevLastFrameStandin != m_prevFirstFrameStandin)
-        {
-            removePrevLastFrameStandinTransform = true;
-        }
-        HandleStandinChanged(m_prevLastFrameStandin, m_lastFrameStandin, removePrevLastFrameStandinTransform);
-
-        m_prevLastFrameStandin = m_lastFrameStandin;
-    }
-
-    void EditorGeometryCacheCommon::OnStandinChanged()
-    {
-        //We only need to remove the prev stand-in from the geom cache's hierarchy if it's not used anywhere else
-        bool removePrevStandinTransform = false;
-        if (m_prevStandin != m_prevLastFrameStandin && m_prevStandin != m_prevFirstFrameStandin)
-        {
-            removePrevStandinTransform = true;
-        }
-        HandleStandinChanged(m_prevStandin, m_standin, removePrevStandinTransform);
-        m_prevStandin = m_standin;
-    }
-
-    void EditorGeometryCacheCommon::HandleStandinChanged(const AZ::EntityId& prevStandinId, const AZ::EntityId& newStandinId, bool evictPrevStandinTransform)
-    {
-        //Undo modifications we've made to the stand-in entity
-        if (prevStandinId.IsValid() && evictPrevStandinTransform)
-        {
-            //If this stand-in isn't currently active it may be set to invisible. If it's not going to be a stand-in anymore we want it to be visible
-            MeshComponentRequestBus::Event(prevStandinId, &MeshComponentRequestBus::Events::SetVisibility, true);
-            //If it's not going to be a stand-in anymore it also doesn't need to be parented. User can re-parent if needed
-            AZ::TransformBus::Event(prevStandinId, &AZ::TransformBus::Events::SetParent, AZ::EntityId()); 
-        }
-        
-        //Parent new stand-in to geometry cache transform
-        AZ::TransformBus::Event(newStandinId, &AZ::TransformBus::Events::SetParent, m_entityId);
-
-        //Standin will be made visible if necessary in GeomCacheCommon::OnTick
-        MeshComponentRequestBus::Event(m_standin, &MeshComponentRequestBus::Events::SetVisibility, false);
-        MeshComponentRequestBus::Event(m_firstFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, false);
-        MeshComponentRequestBus::Event(m_lastFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, false);
-
-        //Force stand-in logic to refresh
-        m_currentStandinType = StandinType::None;
-    }
-
-    void EditorGeometryCacheCommon::SetMaterial(_smart_ptr<IMaterial> material)
-    {
-        GeometryCacheCommon::SetMaterial(material);
-
-        AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(
-            &AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay,
-            AzToolsFramework::Refresh_AttributesAndValues);
-    }
-
-    void EditorGeometryCacheComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides)
-    {
-        provides.push_back(AZ_CRC("GeomCacheService", 0x3d2bc48c));
-    }
-
-    void EditorGeometryCacheComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires)
-    {
-        requires.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-    }
-
-    void EditorGeometryCacheComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorGeometryCacheComponent, AzToolsFramework::Components::EditorComponentBase>()
-                ->Version(1)
-                ->Field("Common", &EditorGeometryCacheComponent::m_common)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorGeometryCacheComponent>("Geometry Cache", "Controls playback of baked vertex animations.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/GeometryCache.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/GeometryCache.png")
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                    ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/geom-cache-component")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorGeometryCacheComponent::m_common, "Common", "No Description")
-                    ;
-            }
-        }
-
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->Class<EditorGeometryCacheComponent>()
-                ->RequestBus("GeometryCacheComponentRequestBus")
-                ->RequestBus("GeometryCacheComponentNotificationBus")
-                ;
-        }
-
-        EditorGeometryCacheCommon::Reflect(context);
-    }
-
-    void EditorGeometryCacheComponent::Init()
-    {
-        m_common.Init(GetEntityId());
-    }
-
-    void EditorGeometryCacheComponent::Activate()
-    {
-        m_common.Activate();
-
-        AzToolsFramework::Components::EditorComponentBase::Activate();
-
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(GetEntityId());
-        AZ::TransformNotificationBus::Handler::BusConnect(GetEntityId());
-
-        //Get initial world transform for debug rendering
-        m_currentWorldTransform = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(m_currentWorldTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-    }
-
-    void EditorGeometryCacheComponent::Deactivate()
-    {
-        AzToolsFramework::Components::EditorComponentBase::Deactivate();
-
-        AZ::TransformNotificationBus::Handler::BusDisconnect(GetEntityId());
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect(GetEntityId());
-
-        m_common.Deactivate();
-    }
-
-    void EditorGeometryCacheComponent::SetPrimaryAsset(const AZ::Data::AssetId& assetId)
-    {
-        m_common.SetGeomCacheAsset(assetId);
-    }
-
-    void EditorGeometryCacheComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        gameEntity->CreateComponent<GeometryCacheComponent>(&m_common);
-    }
-
-    void EditorGeometryCacheComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        // Don't draw extra visualization unless selected.
-        if (!IsSelected())
-        {
-            return;
-        }
-
-        debugDisplay.PushMatrix(m_currentWorldTransform);
-
-        debugDisplay.SetColor(AZ::Vector4(1.0f, 1.0f, 1.0f, 1.0f));
-
-        debugDisplay.DrawWireSphere(AZ::Vector3::CreateZero(), m_common.GetStandInDistance());
-        debugDisplay.DrawWireSphere(AZ::Vector3::CreateZero(), m_common.GetStreamInDistance());
-
-        debugDisplay.PopMatrix();
-    }
-
-    void EditorGeometryCacheComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_currentWorldTransform = world;
-    }
-
-} //namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorGeomCacheComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorGeomCacheComponent.h
deleted file mode 100644
index 9fd64750a2..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorGeomCacheComponent.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-
-#include "GeomCacheComponent.h"
-
-namespace LmbrCentral
-{
-    /**
-     * Editor extensions for the GeometryCacheCommon
-     *
-     * Some parameters of the GeometryCache we only care
-     * about being able to edit on a bus at edit time. Mostly
-     * for legacy conversion. Also this class handles the 
-     * PlayOnStart parameter differently.
-     */
-    class EditorGeometryCacheCommon
-        : public GeometryCacheCommon
-        , public EditorGeometryCacheComponentRequestBus::Handler
-    {
-    public:
-        AZ_TYPE_INFO_LEGACY(EditorGeometryCacheCommon, "{ACE31D8E-F7BC-48B9-950E-AE191E50A80F}", GeometryCacheCommon);
-        AZ_CLASS_ALLOCATOR(EditorGeometryCacheCommon, AZ::SystemAllocator, 0);
-
-        static void Reflect(AZ::ReflectContext* context);
-        
-        void Activate() override;
-        void Deactivate() override;
-
-        void SetMinSpec(EngineSpec minSpec) override;
-        EngineSpec GetMinSpec() override { return m_minSpec; }
-
-        void SetPlayOnStart(bool playOnStart) override;
-        bool GetPlayOnStart() override { return m_playOnStart; }
-
-        void SetMaxViewDistance(float maxViewDistance) override;
-        float GetMaxViewDistance() override { return m_maxViewDistance; }
-
-        void SetViewDistanceMultiplier(float viewDistanceMultiplier) override;
-        float GetViewDistanceMultiplier() override { return m_viewDistanceMultiplier; }
-
-        void SetLODDistanceRatio(AZ::u32 lodDistanceRatio) override;
-        AZ::u32 GetLODDistanceRatio() override { return m_lodDistanceRatio; }
-
-        void SetCastShadows(bool castShadows) override;
-        bool GetCastShadows() override { return m_castShadows; }
-
-        void SetUseVisAreas(bool useVisAreas) override;
-        bool GetUseVisAreas() override { return m_useVisAreas; }
-        void SetMaterial(_smart_ptr<IMaterial> material) override;
-    private:
-
-        //We want the playOnStart param to reflect playing immediately in the editor
-        void OnPlayOnStartChanged() override 
-        {
-            m_playing = m_playOnStart; 
-            m_currentTime = m_startTime; 
-
-            //As in GeomCacheCommon::Activate we reset m_currentTime to m_startTime so
-            //that animations begin at the requested time.
-        }
-
-        void OnFirstFrameStandinChanged() override;
-        void OnLastFrameStandinChanged() override;
-        void OnStandinChanged() override;
-
-        void HandleStandinChanged(const AZ::EntityId& prevStandinId, const AZ::EntityId& newStandinId, bool evictPrevStandinTransform); //Handles the common logic for OnStandinXChanged events
-
-        AZ::EntityId m_prevFirstFrameStandin;
-        AZ::EntityId m_prevLastFrameStandin;
-        AZ::EntityId m_prevStandin;
-
-    };
-
-    /**
-     * The Edit-time implementation of the GeometryCache component
-     */
-    class EditorGeometryCacheComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , public AzFramework::EntityDebugDisplayEventBus::Handler
-        , public AZ::TransformNotificationBus::Handler
-    {
-    public:
-        friend class GeomCacheConverter; 
-
-        AZ_COMPONENT(EditorGeometryCacheComponent, "{045C0C58-C13E-49B0-A471-D4AC5D3FC6BD}", AzToolsFramework::Components::EditorComponentBase);
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires);
-        static void Reflect(AZ::ReflectContext* context);
-        
-        ~EditorGeometryCacheComponent() = default;
-
-        // EditorComponentBase
-        void Init() override;
-        void Activate() override;
-        void Deactivate() override;
-
-        void SetPrimaryAsset(const AZ::Data::AssetId& assetId) override;
-
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-    private:
-        // AzFramework::EntityDebugDisplayEventBus
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        // AZ::TransformNotificationBus
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        //Reflected members
-        EditorGeometryCacheCommon m_common;
-
-        //Unreflected members
-        AZ::Transform m_currentWorldTransform;
-    };
-
-} //namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorHighQualityShadowComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorHighQualityShadowComponent.cpp
deleted file mode 100644
index f56318d965..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorHighQualityShadowComponent.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include "EditorHighQualityShadowComponent.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-
-
-
-namespace LmbrCentral
-{
-    void EditorHighQualityShadowConfig::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorHighQualityShadowConfig, HighQualityShadowConfig>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-
-            if (editContext)
-            {
-                editContext->Class<HighQualityShadowConfig>(
-                    "Shadow Map Settings", "Settings for the entity's shadow map")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &HighQualityShadowConfig::m_enabled, "Enabled", "Enable the shadow map")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &HighQualityShadowConfig::EditorRefresh)
-                    ->DataElement(AZ::Edit::UIHandlers::SpinBox, &HighQualityShadowConfig::m_constBias, "Const Bias", "Constant bias")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                        ->Attribute(AZ::Edit::Attributes::Max, 1.f)
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.001f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &HighQualityShadowConfig::EditorRefresh)
-                    ->DataElement(AZ::Edit::UIHandlers::SpinBox, &HighQualityShadowConfig::m_slopeBias, "Slope Bias", "Slope bias")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                        ->Attribute(AZ::Edit::Attributes::Max, 1.f)
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.01f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &HighQualityShadowConfig::EditorRefresh)
-                    ->DataElement(AZ::Edit::UIHandlers::SpinBox, &HighQualityShadowConfig::m_jitter, "Jitter", "Jitter")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                        ->Attribute(AZ::Edit::Attributes::Max, 1.f)
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.01f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &HighQualityShadowConfig::EditorRefresh)
-                    ->DataElement(AZ::Edit::UIHandlers::Vector3, &HighQualityShadowConfig::m_bboxScale, "Bounding Box Scale", "Scale applied to the shadow frustum")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &HighQualityShadowConfig::EditorRefresh)
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &HighQualityShadowConfig::m_shadowMapSize, "Shadow Map Size", "Shadow map size")
-                        ->Attribute(AZ::Edit::Attributes::EnumValues, AZStd::vector<AZ::Edit::EnumConstant<int> > { 
-                            AZ::Edit::EnumConstant<int>(256, "256"),
-                            AZ::Edit::EnumConstant<int>(512, "512"),
-                            AZ::Edit::EnumConstant<int>(1024, "1024"),
-                            AZ::Edit::EnumConstant<int>(2048, "2048"),
-                            AZ::Edit::EnumConstant<int>(8192, "8192")
-                            })
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &HighQualityShadowConfig::EditorRefresh)
-                    ;
-            }
-        }
-    }
-
-    void EditorHighQualityShadowConfig::EditorRefresh()
-    {
-        if (m_entityId.IsValid())
-        {
-            EditorHighQualityShadowComponentRequestBus::Event(m_entityId, &EditorHighQualityShadowComponentRequests::RefreshProperties);
-        }
-    }
-
-    void EditorHighQualityShadowComponent::Reflect(AZ::ReflectContext* context)
-    {
-        EditorHighQualityShadowConfig::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorHighQualityShadowComponent, EditorComponentBase>()
-                ->Version(1)
-                ->Field("EditorHighQualityShadowConfig", &EditorHighQualityShadowComponent::m_config);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-
-            if (editContext)
-            {
-                editContext->Class<EditorHighQualityShadowComponent>("High Quality Shadow", "Assigns a unique shadow map to the entity to provide higher quality shadows. Has performance and memory impact so use sparingly.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Shadow.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Shadow.png")
-                        ->Attribute(AZ::Edit::Attributes::PreferNoViewportIcon, true)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-high-quality-shadow.html")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorHighQualityShadowComponent::m_config, "Shadow Map Settings", "Settings for the entity's unique shadow map")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ;
-            }
-        }
-    }
-
-    void EditorHighQualityShadowComponent::Activate()
-    {
-        m_config.m_entityId = GetEntityId();
-        EditorHighQualityShadowComponentRequestBus::Handler::BusConnect(GetEntityId());
-        MeshComponentNotificationBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void EditorHighQualityShadowComponent::Deactivate()
-    {
-        HighQualityShadowComponentUtils::RemoveShadow(GetEntityId());
-        EditorHighQualityShadowComponentRequestBus::Handler::BusDisconnect();
-        MeshComponentNotificationBus::Handler::BusDisconnect(GetEntityId());
-    }
-
-    void EditorHighQualityShadowComponent::RefreshProperties()
-    {
-        HighQualityShadowComponentUtils::ApplyShadowSettings(GetEntityId(), m_config);
-    }
-
-    void EditorHighQualityShadowComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        if (HighQualityShadowComponent* runtimeComponent = gameEntity->CreateComponent<HighQualityShadowComponent>())
-        {
-            runtimeComponent->m_config = m_config;
-        }
-    }
-
-    void EditorHighQualityShadowComponent::OnMeshCreated([[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-    {
-        HighQualityShadowComponentUtils::ApplyShadowSettings(GetEntityId(), m_config);
-    }
-
-    void EditorHighQualityShadowComponent::OnMeshDestroyed()
-    {
-        HighQualityShadowComponentUtils::RemoveShadow(GetEntityId());
-    }
-
-
-} // namespace LmbrCentral
-
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorHighQualityShadowComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorHighQualityShadowComponent.h
deleted file mode 100644
index 82ba0f1514..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorHighQualityShadowComponent.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include "HighQualityShadowComponent.h"
-
-namespace LmbrCentral
-{
-    /**
-     * Extends HighQualityShadowConfig structure for editor functionality.
-     */
-    class EditorHighQualityShadowConfig
-        : public HighQualityShadowConfig
-    {
-    public:
-        AZ_TYPE_INFO(EditorHighQualityShadowConfig, "{4A7D67C6-E689-427A-B126-A71A4BF8A2C7}");
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZ::EntityId m_entityId; // Editor-only, not reflected.
-
-        void EditorRefresh() override;
-    };
-
-    /*!
-     * In-editor high quality shadow component.
-     */
-    class EditorHighQualityShadowComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , public EditorHighQualityShadowComponentRequestBus::Handler
-        , public MeshComponentNotificationBus::Handler
-    {
-    public:
-
-        AZ_COMPONENT(EditorHighQualityShadowComponent, "{9C86E09D-0727-476E-A4A1-25989CDBF9C6}", AzToolsFramework::Components::EditorComponentBase);
-
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // MeshComponentNotificationBus interface implementation
-        void OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-        void OnMeshDestroyed() override;
-        ///////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // EditorHighQualityShadowComponentRequestBus interface implementation
-        void RefreshProperties() override;
-        ///////////////////////////////////
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("HighQualityShadowService", 0x43dea981));
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("HighQualityShadowService", 0x43dea981));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            // HighQualityShadowComponent is only applicable to Entities that cast and/or receive shadows.
-            required.push_back(AZ_CRC("MeshService", 0x71d8a455));
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-
-    protected:
-
-        EditorHighQualityShadowConfig m_config;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorLensFlareComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorLensFlareComponent.cpp
deleted file mode 100644
index fc0bfb83f0..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorLensFlareComponent.cpp
+++ /dev/null
@@ -1,564 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Asset/AssetManagerBus.h>
-
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <CryCommon/IFlares.h>
-
-#include <LmbrCentral/Rendering/EditorLightComponentBus.h>
-
-#include "EditorLensFlareComponent.h"
-#include "LightComponent.h"
-
-namespace LmbrCentral
-{
-    void EditorLensFlareComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        EditorLensFlareConfiguration::Reflect(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorLensFlareComponent, EditorComponentBase>()->
-                Version(1)->
-                Field("Visible", &EditorLensFlareComponent::m_visible)->
-                Field("LensFlareLibrary", &EditorLensFlareComponent::m_asset)->
-                Field("SelectedLensFlare", &EditorLensFlareComponent::m_selectedLensFlareName)->
-                Field("EditorLensFlareConfiguration", &EditorLensFlareComponent::m_configuration)
-                ;
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorLensFlareComponent>(
-                    "Lens Flare", "The Lens Flare component allows the placement of a lens flare on an entity")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/LensFlare.svg")
-                        ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<LmbrCentral::LensFlareAsset>::Uuid())
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/LensFlare.png")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-lens-flare.html")
-
-                    ->DataElement(0, &EditorLensFlareComponent::m_configuration, "Settings", "Lens flare configuration")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-
-                    ->DataElement(AZ::Edit::UIHandlers::CheckBox, &EditorLensFlareComponent::m_visible, "Visible", "The current visibility status of this lens flare")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorLensFlareComponent::OnVisibleChanged)
-
-                    ->DataElement(0, &EditorLensFlareComponent::m_asset, "Library", "The selected library of lens flares.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorLensFlareComponent::OnAssetChanged)
-
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &EditorLensFlareComponent::m_selectedLensFlareName, "Lens flare", "The selected lens flare in this library.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorLensFlareComponent::OnLensFlareSelected)
-                        ->Attribute(AZ::Edit::Attributes::StringList, &EditorLensFlareComponent::GetLensFlarePaths)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ;
-            }
-        }
-    }
-
-    void EditorLensFlareConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorLensFlareConfiguration, LensFlareConfiguration>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<LensFlareConfiguration>(
-                    "Configuration", "Lens Flare configuration")->
-
-                    ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-                        Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Flare Settings")->
-
-                    DataElement(AZ::Edit::UIHandlers::ComboBox, &LensFlareConfiguration::m_minSpec, "Minimum spec", "Min spec for light to be active.")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        EnumAttribute(EngineSpec::Never, "Never")->
-                        EnumAttribute(EngineSpec::VeryHigh, "Very high")->
-                        EnumAttribute(EngineSpec::High, "High")->
-                        EnumAttribute(EngineSpec::Medium, "Medium")->
-                        EnumAttribute(EngineSpec::Low, "Low")->
-
-                    DataElement(0, &LensFlareConfiguration::m_lensFlareFrustumAngle, "FOV", "The lens flare FOV angle")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 1.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 360.f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " degrees")->
-
-                    DataElement(AZ::Edit::UIHandlers::Default, &LensFlareConfiguration::m_size, "Size", "The size of the lens flare")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-
-                    DataElement(0, &LensFlareConfiguration::m_attachToSun, "Attach to sun", "Attach this flare to the sun")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::AttachToSunChanged)->
-
-                    DataElement(0, &LensFlareConfiguration::m_useVisAreas, "Use VisAreas", "Lens Flares is affected by VisAreas")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-
-                    DataElement(0, &LensFlareConfiguration::m_indoorOnly, "Indoor only", "Indoor only")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-
-                    DataElement(0, &LensFlareConfiguration::m_onInitially, "On initially", "The lens flare is initially turned on.")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-
-                    DataElement(0, &LensFlareConfiguration::m_viewDistMultiplier, "View distance multiplier", "Adjusts max view distance. If 1.0 then default is used. 1.1 would be 10% further than default.")->
-                    Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        // Will be visible if attach to sun is false.
-                        Attribute(AZ::Edit::Attributes::Visibility, &LensFlareConfiguration::ShouldViewDistanceMultiplier)->
-                        Attribute(AZ::Edit::Attributes::Suffix, "x")->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Color Settings")->
-
-                    DataElement(AZ::Edit::UIHandlers::Color, &LensFlareConfiguration::m_tint, "Tint", "Lens flare color tint")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-
-                    DataElement(AZ::Edit::UIHandlers::Color, &LensFlareConfiguration::m_tintAlpha, "Tint [alpha]", "Lens flare alpha tint")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0)->
-                        Attribute(AZ::Edit::Attributes::Max, 255)->
-                        Attribute(AZ::Edit::Attributes::Step, 1)->
-
-                    DataElement(0, &LensFlareConfiguration::m_brightness, "Brightness", "Lens flare brightness")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, "x")->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Animation")->
-
-                    DataElement(0, &LensFlareConfiguration::m_syncAnimWithLight, "Sync with light", "When checked uses the animation settings of a provided light")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::SyncAnimationChanged)->
-
-                    DataElement(0, &LensFlareConfiguration::m_lightEntity, "Light", "Entity that has a light component to sync with")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LensFlareConfiguration::m_syncAnimWithLight)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-
-                    DataElement(0, &LensFlareConfiguration::m_animIndex, "Style", "Light animation curve ID (\"style\") as it corresponds to values in Light.cfx")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Max, 255)->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LensFlareConfiguration::ShouldShowAnimationSettings)->
-
-                    DataElement(0, &LensFlareConfiguration::m_animSpeed, "Speed", "Multiple of the base animation rate")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LensFlareConfiguration::ShouldShowAnimationSettings)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Max, 4.f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, "x")->
-
-                    DataElement(0, &LensFlareConfiguration::m_animPhase, "Phase", "Animation start offset from 0 to 1.  0.1 would be 10% into the animation")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LensFlareConfiguration::ShouldShowAnimationSettings)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LensFlareConfiguration::PropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Max, 1.f)
-                    ;
-            }
-        }
-    }
-
-    AZ::u32 EditorLensFlareConfiguration::PropertyChanged()
-    {
-        if (m_editorEntityId.IsValid())
-        {
-            if (m_syncAnimWithLight && m_lightEntity.IsValid())
-            {
-                //Get the config of the light we want to sync with
-                LmbrCentral::LightConfiguration lightConfig;
-
-                EBUS_EVENT_ID_RESULT(lightConfig, m_lightEntity, EditorLightComponentRequestBus, GetConfiguration);
-
-                m_syncAnimIndex = lightConfig.m_animIndex;
-                m_syncAnimSpeed = lightConfig.m_animSpeed;
-                m_syncAnimPhase = lightConfig.m_animPhase;
-            }
-
-            EBUS_EVENT_ID(m_editorEntityId, EditorLensFlareComponentRequestBus, RefreshLensFlare);
-        }
-
-        return AZ::Edit::PropertyRefreshLevels::None;
-    }
-
-    AZ::u32 EditorLensFlareConfiguration::SyncAnimationChanged()
-    {
-        if (m_syncAnimWithLight)
-        {
-            LightSettingsNotificationsBus::Handler::BusConnect(m_editorEntityId);
-        }
-        else
-        {
-            LightSettingsNotificationsBus::Handler::BusDisconnect();
-        }
-
-        PropertyChanged();
-
-        return AZ_CRC("RefreshEntireTree", 0xefbc823c);
-    }
-
-    AZ::u32 EditorLensFlareConfiguration::AttachToSunChanged()
-    {
-        // if attached to the sun , then use VIEW_DISTANCE_MULTIPLIER_MAX value
-        // else use the value set by user.
-        if (m_attachToSun)
-        {
-            m_viewDistMultiplierUser = m_viewDistMultiplier;
-            m_viewDistMultiplier = static_cast<float>(IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX);
-        }
-        else
-        {
-            // We restore the cache user set value when it is not attached to the sun.
-            m_viewDistMultiplier = m_viewDistMultiplierUser;
-        }
-
-        PropertyChanged();
-
-        return AZ_CRC("RefreshEntireTree", 0xefbc823c);
-    }
-    void EditorLensFlareConfiguration::AnimationSettingsChanged()
-    {
-        PropertyChanged();
-    }
-
-    void EditorLensFlareComponent::Init()
-    {
-        Base::Init();
-
-        //Set this in Init because it will never change and doesn't need to be reset if the component re-activates
-        m_configuration.m_material.SetAssetPath("EngineAssets/Materials/lens_optics");
-    }
-
-    void EditorLensFlareComponent::Activate()
-    {
-        Base::Activate();
-
-        //Trigger asset loading so the the editor could show right content for the dropdown.
-        //Don't call OnAssetChanged because we don't need to clear any serialized data
-        //nor do we need to check for bus connection.
-        if (m_asset.GetId().IsValid())
-        {
-            //load LensFlare asset
-            AZ::Data::AssetBus::Handler::BusConnect(m_asset.GetId());
-            m_asset.QueueLoad();
-        }
-
-        m_selectedLensFlareLibrary = GetLibraryNameFromAsset();
-        m_selectedLensFlareName = GetFlareNameFromPath(m_configuration.m_lensFlare);
-
-        const AZ::EntityId entityId = GetEntityId();
-        m_configuration.m_editorEntityId = entityId;
-
-        m_light.SetEntity(entityId);
-        RefreshLensFlare();
-
-        //Check to see if we need to start connected to the LightSettingsNotificationBus
-        m_configuration.SyncAnimationChanged();
-        // We call this one in order to cache the user set value.
-        m_configuration.m_viewDistMultiplierUser = m_configuration.m_viewDistMultiplier;
-
-        m_configuration.AttachToSunChanged();
-
-        EditorLensFlareComponentRequestBus::Handler::BusConnect(entityId);
-        RenderNodeRequestBus::Handler::BusConnect(entityId);
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusConnect(entityId);
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(entityId);
-        AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
-    }
-
-    void EditorLensFlareComponent::Deactivate()
-    {
-        //Check to see if we need to disconnect from the LightSettingsNotificationBus
-        m_configuration.SyncAnimationChanged();
-
-        AZ::Data::AssetBus::Handler::BusDisconnect();
-        EditorLensFlareComponentRequestBus::Handler::BusDisconnect();
-        RenderNodeRequestBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusDisconnect();
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-
-        m_light.DestroyRenderLight();
-        m_light.SetEntity(AZ::EntityId());
-
-        m_configuration.m_editorEntityId.SetInvalid();
-
-        m_selectedLensFlareLibrary.clear();
-
-        Base::Deactivate();
-    }
-
-    void EditorLensFlareComponent::OnEntityVisibilityChanged(bool /*visibility*/)
-    {
-        RefreshLensFlare();
-    }
-
-    void EditorLensFlareComponent::OnEditorSpecChange()
-    {
-        RefreshLensFlare();
-    }
-
-    void EditorLensFlareComponent::RefreshLensFlare()
-    {
-        m_light.UpdateRenderLight(GetEditorLensFlareConfiguration());
-    }
-
-    EditorLensFlareConfiguration EditorLensFlareComponent::GetEditorLensFlareConfiguration() const
-    {
-        EditorLensFlareConfiguration configuration = m_configuration;
-
-        // take the entity's visibility into account
-        bool visible = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-            visible, GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
-
-        configuration.m_visible = visible && configuration.m_visible;
-        configuration.m_asset = m_asset;
-
-        return configuration;
-    }
-
-    void EditorLensFlareComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        LensFlareComponent* lensFlareComponent = gameEntity->CreateComponent<LensFlareComponent>();
-
-        if (lensFlareComponent)
-        {
-            lensFlareComponent->m_configuration = m_configuration;
-            lensFlareComponent->m_configuration.m_asset = m_asset;
-        }
-    }
-
-    void EditorLensFlareComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        // Don't draw extra visualization unless selected.
-        if (!IsSelected())
-        {
-            return;
-        }
-
-        AZ::Transform transform = AZ::Transform::CreateIdentity();
-        EBUS_EVENT_ID_RESULT(transform, GetEntityId(), AZ::TransformBus, GetWorldTM);
-
-        debugDisplay.PushMatrix(transform);
-
-        {
-            const AZ::Vector3& color = m_configuration.m_tint;
-            debugDisplay.SetColor(AZ::Vector4(color.GetX(), color.GetY(), color.GetZ(), 1.f));
-            debugDisplay.DrawWireSphere(AZ::Vector3::CreateZero(), 1.0f);
-        }
-
-        debugDisplay.PopMatrix();
-    }
-
-    AZ::u32 EditorLensFlareComponent::OnLensFlareSelected()
-    {
-        m_configuration.m_lensFlare = GetSelectedLensFlareFullName();
-
-        //If the flare we've selected is valid we need to parse a couple of parameters from it to make sure
-        //that we display the flare as it's seen in the lens flare editor
-        if (!m_configuration.m_lensFlare.empty())
-        {
-            int lensOpticsID = 0;
-            if (gEnv->pOpticsManager->Load(m_configuration.m_lensFlare.c_str(), lensOpticsID))
-            {
-                IOpticsElementBase* flare = gEnv->pOpticsManager->GetOptics(lensOpticsID);
-
-                AZStd::vector<FuncVariableGroup> varGroups = flare->GetEditorParamGroups();
-
-                for (size_t i = 0; i < varGroups.size(); ++i)
-                {
-                    if (strcmp(varGroups[i].GetName(), "Common") == 0)
-                    {
-                        IFuncVariable* var = varGroups[i].FindVariable("Size");
-                        if (var)
-                        {
-                            m_configuration.m_size = var->GetFloat();
-                        }
-
-                        var = varGroups[i].FindVariable("Tint");
-                        if (var)
-                        {
-                            ColorF color = var->GetColorF();
-                            m_configuration.m_tint = AZ::Vector3(color.r, color.g, color.b);
-                            m_configuration.m_tintAlpha = static_cast<AZ::u32>(color.a * 255.0f);
-                        }
-
-                        var = varGroups[i].FindVariable("Brightness");
-                        if (var)
-                        {
-                            m_configuration.m_brightness = var->GetFloat();
-                        }
-
-                    }
-                }
-            }
-        }
-
-        m_configuration.PropertyChanged(); // Update the render light
-
-        return AZ::Edit::PropertyRefreshLevels::AttributesAndValues;
-    }
-
-    void EditorLensFlareComponent::OnVisibleChanged()
-    {
-        m_configuration.m_visible = m_visible;
-
-        m_configuration.PropertyChanged();
-    }
-
-    void EditorLensFlareComponent::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        if (asset.GetId() == m_asset.GetId())
-        {
-            // Grab the lens flare list list from the Asset and refresh
-            const AZStd::vector<AZStd::string>& paths = static_cast<LensFlareAsset*>(asset.Get())->GetPaths();
-
-            if (!paths.empty())
-            {
-                //Store the name of the library retrieved from the filepath
-                m_selectedLensFlareLibrary = GetLibraryNameFromAsset();
-
-                // No selected lens flare, so automatically select the first one to ensure we see something right away.
-                if (m_selectedLensFlareName.empty())
-                {
-                    m_selectedLensFlareName = GetFlareNameFromPath(paths[0]);
-                    OnLensFlareSelected();
-                }
-            }
-
-            EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_AttributesAndValues);
-        }
-    }
-
-    AZStd::vector<AZStd::string> EditorLensFlareComponent::GetLensFlarePaths() const
-    {
-        if (m_asset.IsReady())
-        {
-            AZStd::vector<AZStd::string> paths = m_asset.Get()->GetPaths();
-
-            //Remove the library name from the path as it's redundant to display it
-            for (size_t i = 0; i < paths.size(); i++)
-            {
-                paths[i] = GetFlareNameFromPath(paths[i]);
-            }
-
-            return paths;
-        }
-        else
-        {
-            return AZStd::vector<AZStd::string>();
-        }
-    }
-
-    IRenderNode* EditorLensFlareComponent::GetRenderNode()
-    {
-        return m_light.GetRenderNode();
-    }
-
-    float EditorLensFlareComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return LensFlareComponent::s_renderNodeRequestBusOrder;
-    }
-
-    void EditorLensFlareComponent::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        m_asset = asset;
-
-        // Force the optics manager to reload the library. Otherwise, it will keep returning the old version of the lens flare
-        // each time Load() is called.
-        int unusedOutIndex = 0;
-        const bool forceReload = true;
-        gEnv->pOpticsManager->Load(GetSelectedLensFlareFullName().c_str(), unusedOutIndex, forceReload);
-
-        RefreshLensFlare();
-    }
-
-    void EditorLensFlareComponent::OnAssetChanged()
-    {
-        m_selectedLensFlareLibrary.clear();
-        m_selectedLensFlareName.clear(); //Clear this so that when the asset is ready we will always pull a new flare from the new library
-
-        if (AZ::Data::AssetBus::Handler::BusIsConnected())
-        {
-            AZ::Data::AssetBus::Handler::BusDisconnect();
-        }
-
-        if (m_asset.GetId().IsValid())
-        {
-            //load LensFlare asset
-            AZ::Data::AssetBus::Handler::BusConnect(m_asset.GetId());
-            m_asset.QueueLoad();
-            m_asset.BlockUntilLoadComplete();
-        }
-
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_AttributesAndValues);
-    }
-
-    void EditorLensFlareComponent::SetPrimaryAsset(const AZ::Data::AssetId& id)
-    {
-        m_asset.Create(id, true);
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, AddDirtyEntity, GetEntityId());
-        OnAssetChanged();
-    }
-
-    AZStd::string EditorLensFlareComponent::GetFlareNameFromPath(const AZStd::string& path) const
-    {
-        //Trim the library name from the beginning of the path to get the flare's name
-        if (!m_selectedLensFlareLibrary.empty() && m_selectedLensFlareLibrary.size() < path.size())
-        {
-            return path.substr(m_selectedLensFlareLibrary.size() + 1);
-        }
-
-        return AZStd::string();
-    }
-
-    AZStd::string EditorLensFlareComponent::GetLibraryNameFromAsset() const
-    {
-        AZStd::string filePath;
-        EBUS_EVENT_RESULT(filePath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, m_asset.GetId());
-        if (!filePath.empty())
-        {
-            filePath = filePath.substr(filePath.find_last_of('/') + 1);
-            return filePath.substr(0, filePath.find_last_of('.'));
-        }
-
-        return AZStd::string();
-    }
-
-    AZStd::string EditorLensFlareComponent::GetSelectedLensFlareFullName() const
-    {
-        return m_selectedLensFlareLibrary + "." + m_selectedLensFlareName;
-    }
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorLensFlareComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorLensFlareComponent.h
deleted file mode 100644
index 116e2e3392..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorLensFlareComponent.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-
-#include <LmbrCentral/Rendering/LensFlareAsset.h>
-#include <LmbrCentral/Rendering/LightComponentBus.h>
-
-#include "LensFlareComponent.h"
-
-namespace LmbrCentral
-{
-    /**
-     * Extends LightConfiguration structure to add editor functionality
-     * such as property handlers and visibility filters, as well as
-     * reflection for editing.
-     */
-    class EditorLensFlareConfiguration
-        : public LensFlareConfiguration
-        , private LightSettingsNotificationsBus::Handler
-    {
-    public:
-        AZ_TYPE_INFO(EditorLightConfiguration, "{B7E8C0BF-A7B6-4414-90FF-6E21B32E5E16}");
-
-        ~EditorLensFlareConfiguration() override {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        // Overrides from LensFlareConfiguration
-        AZ::u32 PropertyChanged() override;
-        AZ::u32 SyncAnimationChanged() override;
-        AZ::u32 AttachToSunChanged() override;
-    
-        // Overrides from LightSettingsNotificationBus
-        void AnimationSettingsChanged() override;
-
-        AZ::EntityId m_editorEntityId; // Not reflected.
-    };
-
-    /*!
-     * In-editor light component.
-     * Handles previewing and activating lights in the editor.
-     */
-    class EditorLensFlareComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , private AzToolsFramework::EditorVisibilityNotificationBus::Handler
-        , private AzToolsFramework::EditorEvents::Bus::Handler
-        , private AzFramework::EntityDebugDisplayEventBus::Handler
-        , private EditorLensFlareComponentRequestBus::Handler
-        , private RenderNodeRequestBus::Handler
-        , private AZ::Data::AssetBus::Handler
-    {
-    private:
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-    public:
-        AZ_COMPONENT(EditorLensFlareComponent, "{4B85E77D-91F9-40C5-8FCB-B494000A9E69}", AzToolsFramework::Components::EditorComponentBase);
-
-        EditorLensFlareComponent() {}
-        ~EditorLensFlareComponent() override {}
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Init() override;
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // AzToolsFramework::EditorVisibilityNotificationBus interface implementation
-        void OnEntityVisibilityChanged(bool visibility) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // LensFlareComponentEditorRequestBus::Handler interface implementation
-        virtual void RefreshLensFlare() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // RenderNodeRequestBus::Handler interface implementation
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // AssetEventHandler
-        void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //! Called when you want to change the game asset through code (like when creating components based on assets).
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        //! Called when you want to change the game asset through code (like when creating components based on assets).
-        void SetPrimaryAsset(const AZ::Data::AssetId& assetId) override;
-
-        //! Invoked in the editor when the user assigns a new lens flare.
-        void OnAssetChanged();
-
-        //! Invoked in the editor when the user selects a lens flare from the combo box.
-        AZ::u32 OnLensFlareSelected();
-
-        //! Invoked in the editor when the user changes the visibility setting from the check box
-        void OnVisibleChanged();
-
-        //! Used to populate the lens flare combo box.
-        AZStd::vector<AZStd::string> GetLensFlarePaths() const;
-
-        //! Get a copy of configuration appropriate for use with the lens flare
-        EditorLensFlareConfiguration GetEditorLensFlareConfiguration() const;
-
-        //////////////////////////////////////////////////////////////////////////
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            LensFlareComponent::GetProvidedServices(provided);
-        }
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-        {
-            LensFlareComponent::GetDependentServices(dependent);
-            dependent.push_back(AZ_CRC("EditorVisibilityService", 0x90888caf));
-        }
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            LensFlareComponent::GetRequiredServices(required);
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-        //////////////////////////////////////////////////////////////////////////
-
-    private:
-        //////////////////////////////////////////////////////////////////////////
-        // AzToolsFramework::EditorEvents::Bus::Handler interface implementation
-        void OnEditorSpecChange() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        // AzFramework::EntityDebugDisplayEventBus
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        AZStd::string GetSelectedLensFlareFullName() const;
-        AZStd::string GetFlareNameFromPath(const AZStd::string& path) const;
-        AZStd::string GetLibraryNameFromAsset() const;
-
-        EditorLensFlareConfiguration m_configuration;
-        LightInstance m_light;
-        AZStd::string m_selectedLensFlareName;
-        AZStd::string m_selectedLensFlareLibrary;
-        AZ::Data::Asset<LensFlareAsset> m_asset;
-        bool m_visible = true;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorLightComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorLightComponent.cpp
deleted file mode 100644
index e9ac845a88..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorLightComponent.cpp
+++ /dev/null
@@ -1,2102 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Asset/AssetManager.h>
-
-#include <CryCommon/MathConversion.h>
-
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <Cry_Math.h>
-#include <I3DEngine.h>
-#include <IStatObj.h>
-#include <IEditor.h>
-#include <Util/PathUtil.h>
-
-#include "EditorLightComponent.h"
-#include "EditorAreaLightComponent.h"
-#include "EditorPointLightComponent.h"
-#include "EditorEnvProbeComponent.h"
-#include "EditorProjectorLightComponent.h"
-
-
-namespace LmbrCentral
-{
-    // private statics
-    IEditor* EditorLightComponent::m_editor = nullptr;
-    IMaterialManager* EditorLightComponent::m_materialManager = nullptr;
-
-    const char* EditorLightComponent::BUTTON_GENERATE = "Generate";
-    const char* EditorLightComponent::BUTTON_ADDBOUNCE = "Add Bounce";
-
-    // class converter. Convert EditorLightComponent to one of four above components
-    namespace ClassConverters
-    {
-        static bool ConvertEditorLightComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
-        {
-            // extract light type
-            bool isFound = false;
-            LightConfiguration::LightType lightType;
-
-            int lightConfigIndex = classElement.FindElement(AZ_CRC("EditorLightConfiguration", 0xe4cf6af9));
-            if (lightConfigIndex != -1)
-            {
-                AZ::SerializeContext::DataElementNode configElement = classElement.GetSubElement(lightConfigIndex);
-                int baseClassIndex = configElement.FindElement(AZ_CRC("BaseClass1", 0xd4925735));
-                if (baseClassIndex != -1)
-                {
-                    AZ::SerializeContext::DataElementNode baseConfig = configElement.GetSubElement(baseClassIndex);
-
-                    int lightTypeIndex = baseConfig.FindElement(AZ_CRC("LightType", 0x9884ece8));
-                    if (lightTypeIndex != -1)
-                    {
-                        AZ::SerializeContext::DataElementNode lightTypeNode = baseConfig.GetSubElement(lightTypeIndex);
-                        lightTypeNode.GetData< LightConfiguration::LightType>(lightType);
-                        isFound = true;
-                    }
-                }
-            }
-
-            if (!isFound)
-            {
-                return false;
-            }
-
-            //save all the sub elements for old EditorLightComponent
-            typedef AZStd::vector<AZ::SerializeContext::DataElementNode> NodeArray;
-            NodeArray subElements;
-            for (int i = 0; i < classElement.GetNumSubElements(); i++)
-            {
-                subElements.push_back(classElement.GetSubElement(i));
-            }
-
-            // Convert to specific editor light component.
-            bool result = true;
-            switch (lightType)
-            {
-                case LightConfiguration::LightType::Point:
-                    result = classElement.Convert<EditorPointLightComponent>(context);
-                    break;
-                case LightConfiguration::LightType::Area:
-                    result = classElement.Convert<EditorAreaLightComponent>(context);
-                    break;
-                case LightConfiguration::LightType::Projector:
-                    result = classElement.Convert<EditorProjectorLightComponent>(context);
-                    break;
-                case LightConfiguration::LightType::Probe:
-                    result = classElement.Convert<EditorEnvProbeComponent>(context);
-                    break;
-                default:
-                    result = false;
-                    break;
-            }
-
-            if (result)
-            {
-                //add base class for the new specific light component
-                int baseClass = classElement.AddElement<EditorLightComponent>(context, "BaseClass1");
-                AZ::SerializeContext::DataElementNode& baseClassNode = classElement.GetSubElement(baseClass);
-
-                //then add all the sub elements to this base class. it's because we didn't introduce any other new element to specific light components.
-                for (int i = 0; i < subElements.size(); i++)
-                {
-                    baseClassNode.AddElement(subElements[i]);
-                }
-            }
-
-            return result;
-        }
-    }
-
-    AZ::ExportedComponent EditorLightComponent::ExportLightComponent(AZ::Component* thisComponent, const AZ::PlatformTagSet& /*platformTags*/)
-    {
-        EditorLightComponent* editorLightComponent = static_cast<EditorLightComponent*>(thisComponent);
-
-        LightComponent* lightComponent = aznew LightComponent();
-        lightComponent->m_configuration = editorLightComponent->m_configuration;
-
-        return AZ::ExportedComponent(lightComponent, true);
-    }
-
-    void EditorLightComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        EditorLightConfiguration::Reflect(context);
-
-        if (serializeContext)
-        {
-            //any data using old UUID of EditorLightComponent will be send to converter
-            serializeContext->ClassDeprecate("EditorLightComponent", "{33BB1CD4-6A33-46AA-87ED-8BBB40D94B0D}", &ClassConverters::ConvertEditorLightComponent);
-
-            serializeContext->Class<EditorLightComponent, EditorComponentBase>()
-                ->Version(2, &EditorLightComponent::VersionConverter)
-                ->Field("EditorLightConfiguration", &EditorLightComponent::m_configuration)
-                ->Field("CubemapRegen", &EditorLightComponent::m_cubemapRegen)
-                ->Field("CubemapClear", &EditorLightComponent::m_cubemapClear)
-                ->Field("ViewCubemap", &EditorLightComponent::m_viewCubemap)
-                ->Field("UseCustomizedCubemap", &EditorLightComponent::m_useCustomizedCubemap)
-            ;
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorLightComponent>(
-                    "Light", "Attach lighting to an entity.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &EditorLightComponent::GetLightTypeText)
-                    ->DataElement(0, &EditorLightComponent::m_configuration, "Settings", "Light configuration")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-
-                    ->ClassElement(AZ::Edit::ClassElements::Group, "Cubemap generation")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &EditorLightComponent::IsProbe)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-
-                    ->DataElement(AZ::Edit::UIHandlers::CheckBox, &EditorLightComponent::m_useCustomizedCubemap, "Use customized cubemap", "Check to enable usage of customized cubemap")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &EditorLightComponent::IsProbe)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorLightComponent::OnCustomizedCubemapChanged)
-
-                    ->DataElement("Button", &EditorLightComponent::m_cubemapRegen, "Cubemap", "Generate the associated cubemap")
-                        ->Attribute(AZ::Edit::Attributes::ButtonText, &EditorLightComponent::GetGenerateCubemapButtonName)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorLightComponent::GenerateCubemap)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &EditorLightComponent::CanGenerateCubemap)
-
-                    ->DataElement("Button", &EditorLightComponent::m_cubemapClear, "Cubemap", "Clear the associated cubemap.")
-                        ->Attribute(AZ::Edit::Attributes::ButtonText, "Reset")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorLightComponent::ClearCubemap)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &EditorLightComponent::CanGenerateCubemap)
-
-                    ->DataElement(0, &EditorLightComponent::m_viewCubemap, "View cubemap", "Preview the cubemap in scene")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorLightComponent::OnViewCubemapChanged)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &EditorLightComponent::IsProbe)
-                ;
-            }
-        }
-
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            // In the editor we reflect a separate EBus per light type (e.g. Point, Area, Projector). At run-time, we only use a single
-            // "LightComponentBus" which is the intersection of the separate buses reflected here.
-
-            // Point Light EBus reflection and VirtualProperties
-            behaviorContext->EBus<EditorLightComponentRequestBus>("EditorPointLightComponentBus")
-                ->Event("GetVisible", &EditorLightComponentRequestBus::Events::GetVisible)
-                ->Event("SetVisible", &EditorLightComponentRequestBus::Events::SetVisible)
-                ->VirtualProperty("Visible", "GetVisible", "SetVisible")
-                ->Event("GetColor", &EditorLightComponentRequestBus::Events::GetColor)
-                ->Event("SetColor", &EditorLightComponentRequestBus::Events::SetColor)
-                ->VirtualProperty("Color", "GetColor", "SetColor")
-                ->Event("GetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::GetDiffuseMultiplier)
-                ->Event("SetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::SetDiffuseMultiplier)
-                ->VirtualProperty("DiffuseMultiplier", "GetDiffuseMultiplier", "SetDiffuseMultiplier")
-                ->Event("GetSpecularMultiplier", &EditorLightComponentRequestBus::Events::GetSpecularMultiplier)
-                ->Event("SetSpecularMultiplier", &EditorLightComponentRequestBus::Events::SetSpecularMultiplier)
-                ->VirtualProperty("SpecularMultiplier", "GetSpecularMultiplier", "SetSpecularMultiplier")
-                ->Event("GetAmbient", &EditorLightComponentRequestBus::Events::GetAmbient)
-                ->Event("SetAmbient", &EditorLightComponentRequestBus::Events::SetAmbient)
-                ->VirtualProperty("Ambient", "GetAmbient", "SetAmbient")
-                ->Event("GetPointMaxDistance", &EditorLightComponentRequestBus::Events::GetPointMaxDistance)
-                ->Event("SetPointMaxDistance", &EditorLightComponentRequestBus::Events::SetPointMaxDistance)
-                ->VirtualProperty("PointMaxDistance", "GetPointMaxDistance", "SetPointMaxDistance")
-                ->Event("GetPointAttenuationBulbSize", &EditorLightComponentRequestBus::Events::GetPointAttenuationBulbSize)
-                ->Event("SetPointAttenuationBulbSize", &EditorLightComponentRequestBus::Events::SetPointAttenuationBulbSize)
-                ->VirtualProperty("PointAttenuationBulbSize", "GetPointAttenuationBulbSize", "SetPointAttenuationBulbSize")
-                ;
-
-            // Area Light EBus reflection and VirtualProperties
-            behaviorContext->EBus<EditorLightComponentRequestBus>("EditorAreaLightComponentBus")
-                ->Event("GetVisible", &EditorLightComponentRequestBus::Events::GetVisible)
-                ->Event("SetVisible", &EditorLightComponentRequestBus::Events::SetVisible)
-                ->VirtualProperty("Visible", "GetVisible", "SetVisible")
-                ->Event("GetColor", &EditorLightComponentRequestBus::Events::GetColor)
-                ->Event("SetColor", &EditorLightComponentRequestBus::Events::SetColor)
-                ->VirtualProperty("Color", "GetColor", "SetColor")
-                ->Event("GetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::GetDiffuseMultiplier)
-                ->Event("SetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::SetDiffuseMultiplier)
-                ->VirtualProperty("DiffuseMultiplier", "GetDiffuseMultiplier", "SetDiffuseMultiplier")
-                ->Event("GetSpecularMultiplier", &EditorLightComponentRequestBus::Events::GetSpecularMultiplier)
-                ->Event("SetSpecularMultiplier", &EditorLightComponentRequestBus::Events::SetSpecularMultiplier)
-                ->VirtualProperty("SpecularMultiplier", "GetSpecularMultiplier", "SetSpecularMultiplier")
-                ->Event("GetAmbient", &EditorLightComponentRequestBus::Events::GetAmbient)
-                ->Event("SetAmbient", &EditorLightComponentRequestBus::Events::SetAmbient)
-                ->VirtualProperty("Ambient", "GetAmbient", "SetAmbient")
-                ->Event("GetAreaMaxDistance", &EditorLightComponentRequestBus::Events::GetAreaMaxDistance)
-                ->Event("SetAreaMaxDistance", &EditorLightComponentRequestBus::Events::SetAreaMaxDistance)
-                ->VirtualProperty("AreaMaxDistance", "GetAreaMaxDistance", "SetAreaMaxDistance")
-                ->Event("GetAreaWidth", &EditorLightComponentRequestBus::Events::GetAreaWidth)
-                ->Event("SetAreaWidth", &EditorLightComponentRequestBus::Events::SetAreaWidth)
-                ->VirtualProperty("AreaWidth", "GetAreaWidth", "SetAreaWidth")
-                ->Event("GetAreaHeight", &EditorLightComponentRequestBus::Events::GetAreaHeight)
-                ->Event("SetAreaHeight", &EditorLightComponentRequestBus::Events::SetAreaHeight)
-                ->VirtualProperty("AreaHeight", "GetAreaHeight", "SetAreaHeight")
-                ->Event("GetAreaFOV", &EditorLightComponentRequestBus::Events::GetAreaFOV)
-                ->Event("SetAreaFOV", &EditorLightComponentRequestBus::Events::SetAreaFOV)
-                ->VirtualProperty("AreaFOV", "GetAreaFOV", "SetAreaFOV")
-                ;
-
-            // Projector Light Ebus reflection and VirtualProperties
-            behaviorContext->EBus<EditorLightComponentRequestBus>("EditorProjectorLightComponentBus")
-                ->Event("GetVisible", &EditorLightComponentRequestBus::Events::GetVisible)
-                ->Event("SetVisible", &EditorLightComponentRequestBus::Events::SetVisible)
-                ->VirtualProperty("Visible", "GetVisible", "SetVisible")
-                ->Event("GetColor", &EditorLightComponentRequestBus::Events::GetColor)
-                ->Event("SetColor", &EditorLightComponentRequestBus::Events::SetColor)
-                ->VirtualProperty("Color", "GetColor", "SetColor")
-                ->Event("GetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::GetDiffuseMultiplier)
-                ->Event("SetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::SetDiffuseMultiplier)
-                ->VirtualProperty("DiffuseMultiplier", "GetDiffuseMultiplier", "SetDiffuseMultiplier")
-                ->Event("GetSpecularMultiplier", &EditorLightComponentRequestBus::Events::GetSpecularMultiplier)
-                ->Event("SetSpecularMultiplier", &EditorLightComponentRequestBus::Events::SetSpecularMultiplier)
-                ->VirtualProperty("SpecularMultiplier", "GetSpecularMultiplier", "SetSpecularMultiplier")
-                ->Event("GetAmbient", &EditorLightComponentRequestBus::Events::GetAmbient)
-                ->Event("SetAmbient", &EditorLightComponentRequestBus::Events::SetAmbient)
-                ->VirtualProperty("Ambient", "GetAmbient", "SetAmbient")
-                ->Event("GetProjectorMaxDistance", &EditorLightComponentRequestBus::Events::GetProjectorMaxDistance)
-                ->Event("SetProjectorMaxDistance", &EditorLightComponentRequestBus::Events::SetProjectorMaxDistance)
-                ->VirtualProperty("ProjectorMaxDistance", "GetProjectorMaxDistance", "SetProjectorMaxDistance")
-                ->Event("GetProjectorAttenuationBulbSize", &EditorLightComponentRequestBus::Events::GetProjectorAttenuationBulbSize)
-                ->Event("SetProjectorAttenuationBulbSize", &EditorLightComponentRequestBus::Events::SetProjectorAttenuationBulbSize)
-                ->VirtualProperty("ProjectorAttenuationBulbSize", "GetProjectorAttenuationBulbSize", "SetProjectorAttenuationBulbSize")
-                ->Event("GetProjectorFOV", &EditorLightComponentRequestBus::Events::GetProjectorFOV)
-                ->Event("SetProjectorFOV", &EditorLightComponentRequestBus::Events::SetProjectorFOV)
-                ->VirtualProperty("ProjectorFOV", "GetProjectorFOV", "SetProjectorFOV")
-                ->Event("GetProjectorNearPlane", &EditorLightComponentRequestBus::Events::GetProjectorNearPlane)
-                ->Event("SetProjectorNearPlane", &EditorLightComponentRequestBus::Events::SetProjectorNearPlane)
-                ->VirtualProperty("ProjectorNearPlane", "GetProjectorNearPlane", "SetProjectorNearPlane")
-                ;
-
-            // Environment Probe Light Ebus reflection and VirtualProperties
-            behaviorContext->EBus<EditorLightComponentRequestBus>("EditorProbeLightComponentBus")
-                ->Event("GetVisible", &EditorLightComponentRequestBus::Events::GetVisible)
-                ->Event("SetVisible", &EditorLightComponentRequestBus::Events::SetVisible)
-                ->VirtualProperty("Visible", "GetVisible", "SetVisible")
-                ->Event("GetColor", &EditorLightComponentRequestBus::Events::GetColor)
-                ->Event("SetColor", &EditorLightComponentRequestBus::Events::SetColor)
-                ->VirtualProperty("Color", "GetColor", "SetColor")
-                ->Event("GetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::GetDiffuseMultiplier)
-                ->Event("SetDiffuseMultiplier", &EditorLightComponentRequestBus::Events::SetDiffuseMultiplier)
-                ->VirtualProperty("DiffuseMultiplier", "GetDiffuseMultiplier", "SetDiffuseMultiplier")
-                ->Event("GetSpecularMultiplier", &EditorLightComponentRequestBus::Events::GetSpecularMultiplier)
-                ->Event("SetSpecularMultiplier", &EditorLightComponentRequestBus::Events::SetSpecularMultiplier)
-                ->VirtualProperty("SpecularMultiplier", "GetSpecularMultiplier", "SetSpecularMultiplier")
-                ->Event("GetProbeAreaDimensions", &EditorLightComponentRequestBus::Events::GetProbeAreaDimensions)
-                ->Event("SetProbeAreaDimensions", &EditorLightComponentRequestBus::Events::SetProbeAreaDimensions)
-                ->VirtualProperty("ProbeAreaDimensions", "GetProbeAreaDimensions", "SetProbeAreaDimensions")
-                ->Event("GetProbeSortPriority", &EditorLightComponentRequestBus::Events::GetProbeSortPriority)
-                ->Event("SetProbeSortPriority", &EditorLightComponentRequestBus::Events::SetProbeSortPriority)
-                ->VirtualProperty("ProbeSortPriority", "GetProbeSortPriority", "SetProbeSortPriority")
-                ->Event("GetProbeBoxProjected", &EditorLightComponentRequestBus::Events::GetProbeBoxProjected)
-                ->Event("SetProbeBoxProjected", &EditorLightComponentRequestBus::Events::SetProbeBoxProjected)
-                ->VirtualProperty("ProbeBoxProjected", "GetProbeBoxProjected", "SetProbeBoxProjected")
-                ->Event("GetProbeBoxHeight", &EditorLightComponentRequestBus::Events::GetProbeBoxHeight)
-                ->Event("SetProbeBoxHeight", &EditorLightComponentRequestBus::Events::SetProbeBoxHeight)
-                ->VirtualProperty("ProbeBoxHeight", "GetProbeBoxHeight", "SetProbeBoxHeight")
-                ->Event("GetProbeBoxLength", &EditorLightComponentRequestBus::Events::GetProbeBoxLength)
-                ->Event("SetProbeBoxLength", &EditorLightComponentRequestBus::Events::SetProbeBoxLength)
-                ->VirtualProperty("ProbeBoxLength", "GetProbeBoxLength", "SetProbeBoxLength")
-                ->Event("GetProbeBoxWidth", &EditorLightComponentRequestBus::Events::GetProbeBoxWidth)
-                ->Event("SetProbeBoxWidth", &EditorLightComponentRequestBus::Events::SetProbeBoxWidth)
-                ->VirtualProperty("ProbeBoxWidth", "GetProbeBoxWidth", "SetProbeBoxWidth")
-                ->Event("GetProbeAttenuationFalloff", &EditorLightComponentRequestBus::Events::GetProbeAttenuationFalloff)
-                ->Event("SetProbeAttenuationFalloff", &EditorLightComponentRequestBus::Events::SetProbeAttenuationFalloff)
-                ->VirtualProperty("ProbeAttenuationFalloff", "GetProbeAttenuationFalloff", "SetProbeAttenuationFalloff")
-                ->Event("GetProbeFade", &EditorLightComponentRequestBus::Events::GetProbeFade)
-                ->Event("SetProbeFade", &EditorLightComponentRequestBus::Events::SetProbeFade)
-                ->VirtualProperty("ProbeFade", "GetProbeFade", "SetProbeFade")
-                ;
-        }
-    }
-
-    bool EditorLightComponent::VersionConverter([[maybe_unused]] AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
-    {
-        if (classElement.GetVersion() <= 1)
-        {
-            if (!classElement.RemoveElementByName(AZ_CRC("cubemapAsset", 0xc10ac43b)))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-    void EditorLightConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorLightConfiguration, LightConfiguration>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<LightConfiguration>(
-                    "Configuration", "Light configuration")->
-
-                    ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                      Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-                      Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "General Settings")->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(AZ::Edit::UIHandlers::CheckBox, &LightConfiguration::m_visible, "Visible", "The current visibility status of this flare")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MajorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_onInitially, "On initially", "The light is initially turned on.")->
-
-                    DataElement(AZ::Edit::UIHandlers::Color, &LightConfiguration::m_color, "Color", "Light color")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_diffuseMultiplier, "Diffuse multiplier", "Diffuse color multiplier")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, "x")->
-
-                    DataElement(0, &LightConfiguration::m_specMultiplier, "Specular multiplier", "Specular multiplier")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, "x")->
-
-                    DataElement(0, &LightConfiguration::m_ambient, "Ambient", "Ambient light")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetAmbientLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    // Point Light Settings
-                    ClassElement(AZ::Edit::ClassElements::Group, "Point Light Settings")->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(0, &LightConfiguration::m_pointMaxDistance, "Max distance", "Point light radius")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetPointLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-                        Attribute(AZ::Edit::Attributes::Min, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-
-                    DataElement(0, &LightConfiguration::m_pointAttenuationBulbSize, "Attenuation bulb size", "Radius of area inside falloff.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetPointLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-
-                    // Area Light Settings
-                    ClassElement(AZ::Edit::ClassElements::Group, "Area Light Settings")->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(0, &LightConfiguration::m_areaWidth, "Area width", "Area light width.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetAreaSettingVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-
-                    DataElement(0, &LightConfiguration::m_areaHeight, "Area height", "Area light height.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetAreaSettingVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-
-                    DataElement(0, &LightConfiguration::m_areaMaxDistance, "Max distance", "Area light max distance.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetAreaSettingVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " _")->
-
-                    DataElement(0, &LightConfiguration::m_areaFOV, "FOV", "Area light field of view.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetAreaSettingVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.0f)->
-                        Attribute(AZ::Edit::Attributes::Max, 90.0f)->
-                        Attribute(AZ::Edit::Attributes::Step, 1.0f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " degrees")->
-
-                    // Projector settings.
-                    ClassElement(AZ::Edit::ClassElements::Group, "Projector Light Settings")->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(0, &LightConfiguration::m_projectorRange, "Max distance", "Projector light range")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProjectorLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-
-                    DataElement(0, &LightConfiguration::m_projectorAttenuationBulbSize, "Attenuation bulb size", "Radius of area inside falloff.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProjectorLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-
-                    DataElement(AZ::Edit::UIHandlers::Slider, &LightConfiguration::m_projectorFOV, "FOV", "Projector light FOV")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProjectorLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 1.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 180.0f)->      //Projector will start shrinking if FOV goes above 180 degrees
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " degrees")->
-
-                    DataElement(0, &LightConfiguration::m_projectorNearPlane, "Near plane", "Projector light near plane")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProjectorLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 100.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 1.f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-
-                    DataElement(0, &LightConfiguration::m_projectorTexture, "Texture", "Projector light texture")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProjectorLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MajorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_material, "Material", "Projector light material")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProjectorLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MajorPropertyChanged)->
-
-                    //environment probe settings
-                    ClassElement(AZ::Edit::ClassElements::Group, "Environment Probe Settings")->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(0, &LightConfiguration::m_probeArea, "Area dimensions", "Probe area")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(AZ::Edit::UIHandlers::CheckBox, &LightConfiguration::m_isBoxProjected, "Box projected", "Check to enable box projection during runtime")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_boxHeight, "Box height", "Height of box projection area")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_boxWidth, "Box width", "Width of box projection area")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_boxLength, "Box length", "Length of box projection area")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_attenFalloffMax, "Attenuation falloff", "Attenuation falloff value.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 1.0f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.02f)->
-
-                    DataElement(0, &LightConfiguration::m_probeSortPriority, "Sort priority", "Sort priority")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(AZ::Edit::UIHandlers::ComboBox, &LightConfiguration::m_probeCubemapResolution, "Resolution", "Cubemap resolution")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MajorPropertyChanged)->
-                        EnumAttribute(ResolutionSetting::ResDefault, "Default (256)")->
-                        EnumAttribute(ResolutionSetting::Res32, "32")->
-                        EnumAttribute(ResolutionSetting::Res64, "64")->
-                        EnumAttribute(ResolutionSetting::Res128, "128")->
-                        EnumAttribute(ResolutionSetting::Res256, "256")->
-                        EnumAttribute(ResolutionSetting::Res512, "512")->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Cubemap Generation")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(AZ::Edit::UIHandlers::Default, &LightConfiguration::m_probeCubemap, "Cubemap asset", "Cubemap file path")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetProbeLightVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::OnCubemapAssetChanged)->
-                        Attribute(AZ::Edit::Attributes::ReadOnly,&LightConfiguration::CanGenerateCubemap)->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Animation")->
-
-                    DataElement(0, &LightConfiguration::m_animIndex, "Style", "Light animation curve ID (\"style\") as it corresponds to values in Light.cfx")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::OnAnimationSettingChanged)->
-                        Attribute(AZ::Edit::Attributes::Max, 255)->
-
-                    DataElement(0, &LightConfiguration::m_animSpeed, "Speed", "Multiple of the base animation rate")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::OnAnimationSettingChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Max, 4.f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, "x")->
-
-                    DataElement(0, &LightConfiguration::m_animPhase, "Phase", "Animation start offset from 0 to 1.  0.1 would be 10% into the animation")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::OnAnimationSettingChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-                        Attribute(AZ::Edit::Attributes::Max, 1.f)->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Options")->
-
-                    DataElement(0, &LightConfiguration::m_viewDistMultiplier, "View distance multiplier", "Adjusts max view distance. If 1.0 then default is used. 1.1 would be 10% further than default.")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Suffix, "x")->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-
-                    DataElement(AZ::Edit::UIHandlers::ComboBox, &LightConfiguration::m_minSpec, "Minimum spec", "Min spec for light to be active.")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        EnumAttribute(EngineSpec::Never, "Never")->
-                        EnumAttribute(EngineSpec::VeryHigh, "Very high")->
-                        EnumAttribute(EngineSpec::High, "High")->
-                        EnumAttribute(EngineSpec::Medium, "Medium")->
-                        EnumAttribute(EngineSpec::Low, "Low")->
-
-                    DataElement(AZ::Edit::UIHandlers::ComboBox, &LightConfiguration::m_voxelGIMode, "Voxel GI mode", "Mode for light interaction with voxel GI.")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MajorPropertyChanged)->
-                        EnumAttribute(IRenderNode::VM_None, "None")->
-                        EnumAttribute(IRenderNode::VM_Static, "Static")->
-                        EnumAttribute(IRenderNode::VM_Dynamic, "Dynamic")->
-
-                    DataElement(0, &LightConfiguration::m_useVisAreas, "Use VisAreas", "Light is affected by VisAreas")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_volumetricFog, "Volumetric fog", "Affects volumetric fog")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_volumetricFogOnly, "Volumetric fog only", "Only affects volumetric fog")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_indoorOnly, "Indoor only", "Indoor only")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    DataElement(0, &LightConfiguration::m_affectsThisAreaOnly, "Affects this area only", "Light only affects this area")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Advanced")->
-
-                    DataElement(0, &LightConfiguration::m_deferred, "Deferred", "Deferred light")->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_Hide", 0x32ab90f7))->         // Deprecated on non mobile platforms - hidden until we have a platform to use this
-
-                    ClassElement(AZ::Edit::ClassElements::Group, "Shadow Settings")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSpecVisibility)->
-                        Attribute(AZ::Edit::Attributes::AutoExpand, true)->
-
-                    DataElement(AZ::Edit::UIHandlers::ComboBox, &LightConfiguration::m_castShadowsSpec, "Cast shadow spec", "Min spec for shadow casting.")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSpecVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MajorPropertyChanged)->
-                        EnumAttribute(EngineSpec::Never, "Never")->
-                        EnumAttribute(EngineSpec::VeryHigh, "Very high")->
-                        EnumAttribute(EngineSpec::High, "High")->
-                        EnumAttribute(EngineSpec::Medium, "Medium")->
-                        EnumAttribute(EngineSpec::Low, "Low")->
-
-                    DataElement(0, &LightConfiguration::m_castTerrainShadows, "Terrain Shadows", "Include the terrain in the shadow casters for this light")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSettingsVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-
-
-                    DataElement(0, &LightConfiguration::m_shadowBias, "Shadow bias", "Shadow bias")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSettingsVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 100.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.5f)->
-
-                    DataElement(0, &LightConfiguration::m_shadowSlopeBias, "Shadow slope bias", "Shadow slope bias")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSettingsVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 100.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.5f)->
-
-                    DataElement(0, &LightConfiguration::m_shadowResScale, "Shadow resolution scale", "Shadow res scale")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSettingsVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 10.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)->
-
-                    DataElement(0, &LightConfiguration::m_shadowUpdateMinRadius, "Shadow update radius", "Shadow update min radius")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSettingsVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 100.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.5f)->
-                        Attribute(AZ::Edit::Attributes::Suffix, " m")->
-
-                    DataElement(0, &LightConfiguration::m_shadowUpdateRatio, "Shadow update ratio", "Shadow update ratio")->
-                        Attribute(AZ::Edit::Attributes::Visibility, &LightConfiguration::GetShadowSettingsVisibility)->
-                        Attribute(AZ::Edit::Attributes::ChangeNotify, &LightConfiguration::MinorPropertyChanged)->
-                        Attribute(AZ::Edit::Attributes::Min, 0.f)->
-                        Attribute(AZ::Edit::Attributes::Max, 10.f)->
-                        Attribute(AZ::Edit::Attributes::Step, 0.1f)
-                ;
-            }
-        }
-    }
-
-    AZ::Crc32 EditorLightConfiguration::GetAmbientLightVisibility() const
-    {
-        return m_lightType != LightType::Probe ?
-                AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::GetPointLightVisibility() const
-    {
-        return m_lightType == LightType::Point ?
-            AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::GetProjectorLightVisibility() const
-    {
-        return m_lightType == LightType::Projector ?
-            AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::GetProbeLightVisibility() const
-    {
-        return m_lightType == LightType::Probe ?
-            AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::GetShadowSpecVisibility() const
-    {
-        return m_lightType != LightType::Probe ?
-            AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::GetShadowSettingsVisibility() const
-    {
-        return m_castShadowsSpec != EngineSpec::Never ?
-            AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::GetAreaSettingVisibility() const
-    {
-        return m_lightType == LightType::Area ?
-            AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::MajorPropertyChanged()
-    {
-        if (m_editorEntityId.IsValid())
-        {
-            EditorLightComponentRequestBus::Event(m_editorEntityId, &EditorLightComponentRequests::RefreshLight);
-        }
-
-        return AZ::Edit::PropertyRefreshLevels::EntireTree;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::MinorPropertyChanged()
-    {
-        if (m_editorEntityId.IsValid())
-        {
-            EditorLightComponentRequestBus::Event(m_editorEntityId, &EditorLightComponentRequests::RefreshLight);
-        }
-
-        return AZ::Edit::PropertyRefreshLevels::None;
-    }
-
-    AZ::Crc32 EditorLightConfiguration::OnAnimationSettingChanged()
-    {
-        if (m_editorEntityId.IsValid())
-        {
-            EditorLightComponentRequestBus::Event(m_editorEntityId, &EditorLightComponentRequests::RefreshLight);
-            LightSettingsNotificationsBus::Broadcast(&LightSettingsNotifications::AnimationSettingsChanged);
-        }
-
-        return AZ_CRC("RefreshNone", 0x98a5045b);
-    }
-
-    AZ::Crc32 EditorLightConfiguration::OnCubemapAssetChanged()
-    {
-        if (!m_component)
-        {
-            AZ_Error("Lighting", false, "Lighting configuration has a null component, unable to change CubemapAsset");
-            return 0;
-        }
-
-        return m_component->OnCubemapAssetChanged();
-    }
-
-    bool EditorLightConfiguration::CanGenerateCubemap() const
-    {
-        if (!m_component)
-        {
-            AZ_Error("Lighting", false, "Lighting configuration has a null component, unable to generate Cubemap");
-            return false;
-        }
-
-        return m_component->CanGenerateCubemap();
-    }
-
-    EditorLightComponent::EditorLightComponent()
-        : m_useCustomizedCubemap(false)
-        , m_viewCubemap(false)
-        , m_cubemapRegen(false)
-        , m_cubemapClear(false)
-    {
-        m_configuration.m_projectorTexture.SetAssetPath("engineassets/textures/defaults/spot_default.dds");
-        m_configuration.SetComponent(nullptr);
-    }
-
-    EditorLightComponent::~EditorLightComponent()
-    {
-    }
-
-    void EditorLightComponent::Init()
-    {
-        Base::Init();
-    }
-
-    void EditorLightComponent::Activate()
-    {
-        Base::Activate();
-
-        m_configuration.SetComponent(this);
-        m_configuration.m_editorEntityId = GetEntityId();
-
-        m_light.SetEntity(GetEntityId());
-        RefreshLight();
-
-        if (m_configuration.m_lightType == LightConfiguration::LightType::Probe)
-        {
-            m_cubemapPreview.Setup(m_configuration.m_probeCubemap.GetAssetPath().c_str());
-
-            AZ::Transform transform = AZ::Transform::Identity();
-            AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformInterface::GetWorldTM);
-            m_cubemapPreview.SetTransform(AZTransformToLYTransform(transform));
-
-            OnViewCubemapChanged(); // Check to see if it should be displayed now.
-        }
-
-        EditorCameraCorrectionRequestBus::Handler::BusConnect(GetEntityId());
-        EditorLightComponentRequestBus::Handler::BusConnect(GetEntityId());
-        RenderNodeRequestBus::Handler::BusConnect(GetEntityId());
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(GetEntityId());
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusConnect(GetEntityId());
-        AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
-        AZ::TransformNotificationBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void EditorLightComponent::Deactivate()
-    {
-        EditorCameraCorrectionRequestBus::Handler::BusDisconnect();
-        EditorLightComponentRequestBus::Handler::BusDisconnect();
-        RenderNodeRequestBus::Handler::BusDisconnect();
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-
-        if (gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->FreeRenderNodeState(&m_cubemapPreview);
-        }
-
-        m_light.DestroyRenderLight();
-        m_light.SetEntity(AZ::EntityId());
-
-        m_configuration.m_editorEntityId.SetInvalid();
-
-        Base::Deactivate();
-    }
-
-    void EditorLightComponent::OnEntityVisibilityChanged(bool /*visibility*/)
-    {
-        RefreshLight();
-    }
-
-    void EditorLightComponent::OnEditorSpecChange()
-    {
-        RefreshLight();
-    }
-
-    void EditorLightComponent::RefreshLight()
-    {
-        EditorLightConfiguration configuration = m_configuration;
-
-        // take the entity's visibility into account
-        bool visible = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-            visible, GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
-
-        configuration.m_visible = visible && configuration.m_visible;
-
-        m_light.UpdateRenderLight(configuration);
-    }
-
-    IRenderNode* EditorLightComponent::GetRenderNode()
-    {
-        return m_light.GetRenderNode();
-    }
-
-    float EditorLightComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return LightComponent::s_renderNodeRequestBusOrder;
-    }
-
-    bool EditorLightComponent::IsProbe() const
-    {
-        return (m_configuration.m_lightType == LightConfiguration::LightType::Probe);
-    }
-
-    bool EditorLightComponent::HasCubemap() const
-    {
-        return !m_configuration.m_probeCubemap.GetAssetPath().empty();
-    }
-
-    const char* EditorLightComponent::GetCubemapAssetName() const
-    {
-        return m_configuration.m_probeCubemap.GetAssetPath().c_str();
-    }
-
-
-    bool EditorLightComponent::CanGenerateCubemap() const
-    {
-        return (m_configuration.m_lightType == LightConfiguration::LightType::Probe) && (!m_useCustomizedCubemap);
-    }
-
-    const char* EditorLightComponent::GetGenerateCubemapButtonName() const
-    {
-        if (HasCubemap())
-        {
-            return BUTTON_ADDBOUNCE;
-        }
-        else
-        {
-            return BUTTON_GENERATE;
-        }
-    }
-
-    void EditorLightComponent::GenerateCubemap()
-    {
-        if (CanGenerateCubemap())
-        {
-            EBUS_EVENT(AzToolsFramework::EditorRequests::Bus,
-                GenerateCubemapWithIDForEntity,
-                GetEntityId(),
-                GetCubemapId(),
-                nullptr,
-                false,
-                true);
-        }
-    }
-
-    void EditorLightComponent::ClearCubemap()
-    {
-        SetCubemap("");
-    }
-
-    void EditorLightComponent::OnViewCubemapChanged()
-    {
-        if (!gEnv->p3DEngine)
-        {
-            return;
-        }
-
-        if (m_viewCubemap)
-        {
-            gEnv->p3DEngine->RegisterEntity(&m_cubemapPreview);
-        }
-        else
-        {
-            gEnv->p3DEngine->FreeRenderNodeState(&m_cubemapPreview);
-        }
-    }
-
-    void EditorLightComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        LightComponent* lightComponent = gameEntity->CreateComponent<LightComponent>();
-
-        if (lightComponent)
-        {
-            lightComponent->m_configuration = m_configuration;
-        }
-    }
-
-    void EditorLightComponent::SetCubemap(const AZStd::string& cubemap)
-    {
-        if (cubemap != m_configuration.m_probeCubemap.GetAssetPath())
-        {
-            AzToolsFramework::ScopedUndoBatch undo("Cubemap Assignment");
-
-            m_configuration.m_probeCubemap.SetAssetPath(cubemap.c_str());
-            m_cubemapPreview.UpdateTexture(m_configuration.m_probeCubemap.GetAssetPath().c_str());
-
-            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-                &AzToolsFramework::ToolsApplicationRequests::AddDirtyEntity, GetEntityId());
-        }
-
-        if (m_configuration.m_probeCubemap.GetAssetPath().empty())
-        {
-            // Since the cubemap was simply cleared, there is no need to wait for an asset to be processed.
-            // Instead, refresh the light now so the output will be cleared immediately.
-
-            if (IsSelected())
-            {
-                AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(
-                    &AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay, AzToolsFramework::Refresh_AttributesAndValues);
-
-            }
-
-            if (EditorLightConfiguration::LightType::Probe == m_configuration.m_lightType)
-            {
-                RefreshLight();
-            }
-        }
-        else
-        {
-            // Get the notice when the dds is generated by AP. We will only refresh the m_cubemapAsset and the PropertyDisplay when the dds is generated.
-            AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-        }
-    }
-
-    void EditorLightComponent::SetProjectorTexture(const AZStd::string& projectorTexture)
-    {
-        if (projectorTexture != m_configuration.m_projectorTexture.GetAssetPath())
-        {
-            m_configuration.m_projectorTexture.SetAssetPath(projectorTexture.c_str());
-            RefreshLight();
-        }
-    }
-
-    void EditorLightComponent::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
-    {
-        AZ::Data::AssetId cmAssetId;
-        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
-            cmAssetId, &AZ::Data::AssetCatalogRequests::GetAssetIdByPath,
-            m_configuration.m_probeCubemap.GetAssetPath().c_str(),
-            m_configuration.m_probeCubemap.GetAssetType(), true);
-
-        if (cmAssetId == assetId)
-        {
-            AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
-            //refresh the tree since we don't need to wait for the asset imported
-            if (IsSelected())
-            {
-                AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(
-                    &AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay, AzToolsFramework::Refresh_AttributesAndValues);
-            }
-
-            // We wait to refresh the light until after the new asset has finished loading to avoid showing old data; for example, when you
-            // Generate, Clear, and then Generate again.
-            if (EditorLightConfiguration::LightType::Probe == m_configuration.m_lightType)
-            {
-                RefreshLight();
-            }
-        }
-    }
-
-    void EditorLightComponent::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
-    {
-        OnCatalogAssetAdded(assetId);
-    }
-
-    AZ::Crc32 EditorLightComponent::OnCubemapAssetChanged()
-    {
-        //in case user select a "_diff" texture file. remove it and generate specular file name
-        static const char* diffExt = "_diff";
-        static const int diffStrSize = 5; //string len of "_diff"
-
-        const char* specularCubemap = 0;
-        string specularName(m_configuration.m_probeCubemap.GetAssetPath().c_str());
-
-        int strIndex = specularName.find(diffExt);
-        if (strIndex >= 0)
-        {
-            specularName = specularName.substr(0, strIndex) + specularName.substr(strIndex + diffStrSize, specularName.length());
-            specularCubemap = specularName.c_str();
-            m_configuration.m_probeCubemap.SetAssetPath(specularName);
-        }
-
-        m_cubemapPreview.UpdateTexture(m_configuration.m_probeCubemap.GetAssetPath().c_str());
-
-        RefreshLight();
-
-        return AZ::Edit::PropertyRefreshLevels::ValuesOnly;
-    }
-
-    void EditorLightConfiguration::SetComponent(EditorLightComponent* component)
-    {
-        m_component = component;
-    }
-
-    AZ::Crc32 EditorLightComponent::OnCustomizedCubemapChanged()
-    {
-        //clean assets
-        m_configuration.m_probeCubemap.SetAssetPath("");
-        m_cubemapPreview.UpdateTexture(m_configuration.m_probeCubemap.GetAssetPath().c_str());
-
-        RefreshLight();
-
-        return AZ::Edit::PropertyRefreshLevels::EntireTree;
-    }
-
-    AZ::u32 EditorLightComponent::GetCubemapResolution()
-    {
-        return static_cast<AZ::u32>(m_configuration.m_probeCubemapResolution);
-    }
-    void EditorLightComponent::SetCubemapResolution(AZ::u32 newResolution)
-    {
-        AZ_Assert(newResolution > 0, "Invalid resolution");
-
-        LightConfiguration::ResolutionSetting cubemapResolution = static_cast<LightConfiguration::ResolutionSetting>(newResolution);
-        if (m_configuration.m_probeCubemapResolution != cubemapResolution)
-        {
-            m_configuration.m_probeCubemapResolution = cubemapResolution;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-
-    bool EditorLightComponent::UseCustomizedCubemap() const
-    {
-        return m_useCustomizedCubemap;
-    }
-
-    const LightConfiguration& EditorLightComponent::GetConfiguration() const
-    {
-        return m_configuration;
-    }
-
-    ////////////////////////////////////////////////////////////
-    // Modifiers
-    void EditorLightComponent::SetVisible(bool isVisible)
-    {
-        if (m_configuration.m_visible != isVisible)
-        {
-            m_configuration.m_visible = isVisible;
-            m_configuration.MajorPropertyChanged();
-        }
-    }
-
-    bool EditorLightComponent::GetVisible()
-    {
-        return m_configuration.m_visible;
-    }
-
-    void EditorLightComponent::SetOnInitially(bool onInitially)
-    {
-        if (m_configuration.m_onInitially != onInitially)
-        {
-            m_configuration.m_onInitially = onInitially;
-            m_configuration.MajorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetOnInitially()
-    {
-        return m_configuration.m_onInitially;
-    }
-
-    void EditorLightComponent::SetColor(const AZ::Color& newColor)
-    {
-        if (m_configuration.m_color != newColor)
-        {
-            m_configuration.m_color = newColor;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-
-    const AZ::Color EditorLightComponent::GetColor()
-    {
-        return m_configuration.m_color;
-    }
-
-    void EditorLightComponent::SetDiffuseMultiplier(float newMultiplier)
-    {
-        if (newMultiplier != m_configuration.m_diffuseMultiplier)
-        {
-            m_configuration.m_diffuseMultiplier = newMultiplier;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetDiffuseMultiplier()
-    {
-        return m_configuration.m_diffuseMultiplier;
-    }
-
-    void EditorLightComponent::SetSpecularMultiplier(float newMultiplier)
-    {
-        if (newMultiplier != m_configuration.m_specMultiplier)
-        {
-            m_configuration.m_specMultiplier = newMultiplier;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetSpecularMultiplier()
-    {
-        return m_configuration.m_specMultiplier;
-    }
-
-    void EditorLightComponent::SetAmbient(bool isAmbient)
-    {
-        if (isAmbient != m_configuration.m_ambient)
-        {
-            m_configuration.m_ambient = isAmbient;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetAmbient()
-    {
-        return m_configuration.m_ambient;
-    }
-
-    void EditorLightComponent::SetPointMaxDistance(float newMaxDistance)
-    {
-        if (newMaxDistance != m_configuration.m_pointMaxDistance)
-        {
-            m_configuration.m_pointMaxDistance = newMaxDistance;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetPointMaxDistance()
-    {
-        return m_configuration.m_pointMaxDistance;
-    }
-
-    void EditorLightComponent::SetPointAttenuationBulbSize(float newAttenuationBulbSize)
-    {
-        if (newAttenuationBulbSize != m_configuration.m_pointAttenuationBulbSize)
-        {
-            m_configuration.m_pointAttenuationBulbSize = newAttenuationBulbSize;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetPointAttenuationBulbSize()
-    {
-        return m_configuration.m_pointAttenuationBulbSize;
-    }
-
-    void EditorLightComponent::SetAreaMaxDistance(float newMaxDistance)
-    {
-        if (newMaxDistance != m_configuration.m_areaMaxDistance)
-        {
-            m_configuration.m_areaMaxDistance = newMaxDistance;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetAreaMaxDistance()
-    {
-        return m_configuration.m_areaMaxDistance;
-    }
-
-    void EditorLightComponent::SetAreaWidth(float newWidth)
-    {
-        if (newWidth != m_configuration.m_areaWidth)
-        {
-            m_configuration.m_areaWidth = newWidth;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetAreaWidth()
-    {
-        return m_configuration.m_areaWidth;
-    }
-
-    void EditorLightComponent::SetAreaHeight(float newHeight)
-    {
-        if (newHeight != m_configuration.m_areaHeight)
-        {
-            m_configuration.m_areaHeight = newHeight;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetAreaHeight()
-    {
-        return m_configuration.m_areaHeight;
-    }
-
-    void EditorLightComponent::SetAreaFOV(float newFOV)
-    {
-        if (newFOV != m_configuration.m_areaFOV)
-        {
-            m_configuration.m_areaFOV = newFOV;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetAreaFOV()
-    {
-        return m_configuration.m_areaFOV;
-    }
-
-    void EditorLightComponent::SetProjectorMaxDistance(float newMaxDistance)
-    {
-        if (newMaxDistance != m_configuration.m_projectorRange)
-        {
-            m_configuration.m_projectorRange = newMaxDistance;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetProjectorMaxDistance()
-    {
-        return m_configuration.m_projectorRange;
-    }
-
-    void EditorLightComponent::SetProjectorAttenuationBulbSize(float newAttenuationBulbSize)
-    {
-        if (newAttenuationBulbSize != m_configuration.m_projectorAttenuationBulbSize)
-        {
-            m_configuration.m_projectorAttenuationBulbSize = newAttenuationBulbSize;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetProjectorAttenuationBulbSize()
-    {
-        return m_configuration.m_projectorAttenuationBulbSize;
-    }
-
-    void EditorLightComponent::SetProjectorFOV(float newFOV)
-    {
-        if (newFOV != m_configuration.m_projectorFOV)
-        {
-            m_configuration.m_projectorFOV = newFOV;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetProjectorFOV()
-    {
-        return m_configuration.m_projectorFOV;
-    }
-
-    void EditorLightComponent::SetProjectorNearPlane(float newNearPlane)
-    {
-        if (newNearPlane != m_configuration.m_projectorNearPlane)
-        {
-            m_configuration.m_projectorNearPlane = newNearPlane;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetProjectorNearPlane()
-    {
-        return m_configuration.m_projectorNearPlane;
-    }
-
-    void EditorLightComponent::SetProbeAreaDimensions(const AZ::Vector3& newDimensions)
-    {
-        if (newDimensions != m_configuration.m_probeArea)
-        {
-            m_configuration.m_probeArea = newDimensions;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    const AZ::Vector3 EditorLightComponent::GetProbeAreaDimensions()
-    {
-        return m_configuration.m_probeArea;
-    }
-
-    void EditorLightComponent::SetProbeBoxProjected(bool isProbeBoxProjected)
-    {
-        if (isProbeBoxProjected != m_configuration.m_isBoxProjected)
-        {
-            m_configuration.m_isBoxProjected = isProbeBoxProjected;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetProbeBoxProjected()
-    {
-        return m_configuration.m_isBoxProjected;
-    }
-
-    void EditorLightComponent::SetProbeBoxHeight(float newHeight)
-    {
-        if (newHeight != m_configuration.m_boxHeight)
-        {
-            m_configuration.m_boxHeight = newHeight;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetProbeBoxHeight()
-    {
-        return m_configuration.m_boxHeight;
-    }
-
-    void EditorLightComponent::SetProbeBoxLength(float newLength)
-    {
-        if (newLength != m_configuration.m_boxLength)
-        {
-            m_configuration.m_boxLength = newLength;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-
-    float EditorLightComponent::GetProbeBoxLength()
-    {
-        return m_configuration.m_boxLength;
-    }
-
-    void EditorLightComponent::SetProbeBoxWidth(float newWidth)
-    {
-        if (newWidth != m_configuration.m_boxWidth)
-        {
-            m_configuration.m_boxWidth = newWidth;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-
-    float EditorLightComponent::GetProbeBoxWidth()
-    {
-        return m_configuration.m_boxWidth;
-    }
-
-    void EditorLightComponent::SetProbeAttenuationFalloff(float newAttenuationFalloff)
-    {
-        if (newAttenuationFalloff != m_configuration.m_attenFalloffMax)
-        {
-            m_configuration.m_attenFalloffMax = newAttenuationFalloff;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-
-    float EditorLightComponent::GetProbeAttenuationFalloff()
-    {
-        return m_configuration.m_attenFalloffMax;
-    }
-
-    void EditorLightComponent::SetProbeFade(float fade)
-    {
-        AZ_Warning("Lighting", 0.0f <= fade && fade <= 1.0f, "SetProbeFade value %f out of range. Clamping to [0,1]", fade);
-        fade = AZ::GetClamp(fade, 0.0f, 1.0f);
-
-        if (fade != m_configuration.m_probeFade)
-        {
-            m_configuration.m_probeFade = fade;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-
-    float EditorLightComponent::GetProbeFade()
-    {
-        return m_configuration.m_probeFade;
-    }
-
-    void EditorLightComponent::SetIndoorOnly(bool newIndoorOnly)
-    {
-        if (m_configuration.m_indoorOnly != newIndoorOnly)
-        {
-            m_configuration.m_indoorOnly = newIndoorOnly;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetIndoorOnly()
-    {
-        return m_configuration.m_indoorOnly;
-    }
-
-    void EditorLightComponent::SetCastShadowSpec(AZ::u32 newCastShadowSpec)
-    {
-        EngineSpec shadowSpec = static_cast<EngineSpec>(newCastShadowSpec);
-        if (m_configuration.m_castShadowsSpec != shadowSpec)
-        {
-            m_configuration.m_castShadowsSpec = shadowSpec;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    AZ::u32 EditorLightComponent::GetCastShadowSpec()
-    {
-        return static_cast<AZ::u32>(m_configuration.m_castShadowsSpec);
-    }
-
-    void EditorLightComponent::SetViewDistanceMultiplier(float newMultiplier)
-    {
-        if (m_configuration.m_viewDistMultiplier != newMultiplier)
-        {
-            m_configuration.m_viewDistMultiplier = newMultiplier;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetViewDistanceMultiplier()
-    {
-        return m_configuration.m_viewDistMultiplier;
-    }
-
-    void EditorLightComponent::SetProbeArea(const AZ::Vector3& newProbeArea)
-    {
-        if (m_configuration.m_probeArea != newProbeArea)
-        {
-            m_configuration.m_probeArea = newProbeArea;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    AZ::Vector3 EditorLightComponent::GetProbeArea()
-    {
-        return m_configuration.m_probeArea;
-    }
-
-    void EditorLightComponent::SetProbeSortPriority(AZ::u32 newProbeSortPriority)
-    {
-        if (m_configuration.m_probeSortPriority != newProbeSortPriority)
-        {
-            m_configuration.m_probeSortPriority = newProbeSortPriority;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    AZ::u32 EditorLightComponent::GetProbeSortPriority()
-    {
-        return m_configuration.m_probeSortPriority;
-    }
-
-    void EditorLightComponent::SetVolumetricFog(bool newVolumetricFog)
-    {
-        if (m_configuration.m_volumetricFog != newVolumetricFog)
-        {
-            m_configuration.m_volumetricFog = newVolumetricFog;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetVolumetricFog()
-    {
-        return m_configuration.m_volumetricFog;
-    }
-
-    void EditorLightComponent::SetVolumetricFogOnly(bool newVolumetricFogOnly)
-    {
-        if (m_configuration.m_volumetricFogOnly != newVolumetricFogOnly)
-        {
-            m_configuration.m_volumetricFogOnly = newVolumetricFogOnly;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetVolumetricFogOnly()
-    {
-        return m_configuration.m_volumetricFogOnly;
-    }
-
-    void EditorLightComponent::SetAttenuationFalloffMax(float newAttenFalloffMax)
-    {
-        if (m_configuration.m_attenFalloffMax != newAttenFalloffMax)
-        {
-            m_configuration.m_attenFalloffMax = newAttenFalloffMax;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetAttenuationFalloffMax()
-    {
-        return m_configuration.m_attenFalloffMax;
-    }
-
-    void EditorLightComponent::SetUseVisAreas(bool useVisAreas)
-    {
-        if (m_configuration.m_useVisAreas != useVisAreas)
-        {
-            m_configuration.m_useVisAreas = useVisAreas;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetUseVisAreas()
-    {
-        return m_configuration.m_useVisAreas;
-    }
-
-    void EditorLightComponent::SetAffectsThisAreaOnly(bool affectsThisAreaOnly)
-    {
-        if (m_configuration.m_affectsThisAreaOnly != affectsThisAreaOnly)
-        {
-            m_configuration.m_affectsThisAreaOnly = affectsThisAreaOnly;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetAffectsThisAreaOnly()
-    {
-        return m_configuration.m_affectsThisAreaOnly;
-    }
-
-    void EditorLightComponent::SetBoxHeight(float newBoxHeight)
-    {
-        if (m_configuration.m_boxHeight != newBoxHeight)
-        {
-            m_configuration.m_boxHeight = newBoxHeight;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetBoxHeight()
-    {
-        return m_configuration.m_boxHeight;
-    }
-
-    void EditorLightComponent::SetBoxWidth(float newBoxWidth)
-    {
-        if (m_configuration.m_boxWidth != newBoxWidth)
-        {
-            m_configuration.m_boxWidth = newBoxWidth;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetBoxWidth()
-    {
-        return m_configuration.m_boxWidth;
-    }
-
-    void EditorLightComponent::SetBoxLength(float newBoxLength)
-    {
-        if (m_configuration.m_boxLength != newBoxLength)
-        {
-            m_configuration.m_boxLength = newBoxLength;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetBoxLength()
-    {
-        return m_configuration.m_boxLength;
-    }
-
-    void EditorLightComponent::SetBoxProjected(bool newBoxProjected)
-    {
-        if (m_configuration.m_isBoxProjected != newBoxProjected)
-        {
-            m_configuration.m_isBoxProjected = newBoxProjected;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    bool EditorLightComponent::GetBoxProjected()
-    {
-        return m_configuration.m_isBoxProjected;
-    }
-    ///////////////////////////////////////////////////////////////////
-
-    void EditorLightComponent::SetShadowBias(float shadowBias)
-    {
-        if (m_configuration.m_shadowBias != shadowBias)
-        {
-            m_configuration.m_shadowBias = shadowBias;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetShadowBias()
-    {
-        return m_configuration.m_shadowBias;
-    }
-
-    void EditorLightComponent::SetShadowSlopeBias(float shadowSlopeBias)
-    {
-        if (m_configuration.m_shadowSlopeBias != shadowSlopeBias)
-        {
-            m_configuration.m_shadowSlopeBias = shadowSlopeBias;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetShadowSlopeBias()
-    {
-        return m_configuration.m_shadowSlopeBias;
-    }
-
-    void EditorLightComponent::SetShadowResScale(float shadowResScale)
-    {
-        if (m_configuration.m_shadowResScale != shadowResScale)
-        {
-            m_configuration.m_shadowResScale = shadowResScale;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetShadowResScale()
-    {
-        return m_configuration.m_shadowResScale;
-    }
-
-    void EditorLightComponent::SetShadowUpdateMinRadius(float shadowUpdateMinRadius)
-    {
-        if (m_configuration.m_shadowUpdateMinRadius != shadowUpdateMinRadius)
-        {
-            m_configuration.m_shadowUpdateMinRadius = shadowUpdateMinRadius;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetShadowUpdateMinRadius()
-    {
-        return m_configuration.m_shadowUpdateMinRadius;
-    }
-
-    void EditorLightComponent::SetShadowUpdateRatio(float shadowUpdateRatio)
-    {
-        if (m_configuration.m_shadowUpdateRatio != shadowUpdateRatio)
-        {
-            m_configuration.m_shadowUpdateRatio = shadowUpdateRatio;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetShadowUpdateRatio()
-    {
-        return m_configuration.m_shadowUpdateRatio;
-    }
-
-    // Animation parameters
-    void EditorLightComponent::SetAnimIndex(AZ::u32 animIndex)
-    {
-        if (m_configuration.m_animIndex != animIndex)
-        {
-            m_configuration.m_animIndex = animIndex;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    AZ::u32 EditorLightComponent::GetAnimIndex()
-    {
-        return m_configuration.m_animIndex;
-    }
-
-    void EditorLightComponent::SetAnimSpeed(float animSpeed)
-    {
-        if (m_configuration.m_animSpeed != animSpeed)
-        {
-            m_configuration.m_animSpeed = animSpeed;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetAnimSpeed()
-    {
-        return m_configuration.m_animSpeed;
-    }
-
-    void EditorLightComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_cubemapPreview.SetTransform(AZTransformToLYTransform(world));
-    }
-
-    void EditorLightComponent::SetAnimPhase(float animPhase)
-    {
-        if (m_configuration.m_animPhase != animPhase)
-        {
-            m_configuration.m_animPhase = animPhase;
-            m_configuration.MinorPropertyChanged();
-        }
-    }
-    float EditorLightComponent::GetAnimPhase()
-    {
-        return m_configuration.m_animPhase;
-    }
-
-    const char* EditorLightComponent::GetLightTypeText() const
-    {
-        return "Deprecated Light";
-    }
-
-    void EditorLightComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        // Don't draw extra visualization unless selected.
-        if (!IsSelected())
-        {
-            return;
-        }
-
-        AZ::Transform transform = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformInterface::GetWorldTM);
-
-        transform.ExtractScale();
-        debugDisplay.PushMatrix(transform);
-        const AZ::Color& color = m_configuration.m_color;
-        debugDisplay.SetColor(AZ::Vector4(color.GetR(), color.GetG(), color.GetB(), 1.f));
-
-        switch (m_configuration.m_lightType)
-        {
-        case EditorLightConfiguration::LightType::Point:
-        {
-            debugDisplay.DrawWireSphere(AZ::Vector3::CreateZero(), m_configuration.m_pointMaxDistance);
-            debugDisplay.DrawWireSphere(AZ::Vector3::CreateZero(), m_configuration.m_pointAttenuationBulbSize);
-            break;
-        }
-        case EditorLightConfiguration::LightType::Area:
-        {
-            debugDisplay.SetColor(AZ::Vector4(color.GetR(), color.GetG(), color.GetB(), 0.5f));
-
-            // Some initial calculations for drawing
-            AZ::Matrix3x3 rotYMatrix = AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(m_configuration.m_areaFOV));
-            AZ::Matrix3x3 rotXMatrix = AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(45));
-            AZ::Vector3 AngleRefPoint = AZ::Vector3(m_configuration.m_areaMaxDistance, 0, 0);
-            AngleRefPoint *= rotYMatrix;
-            const float roundedRectangleOffset = AngleRefPoint.GetZ();
-            AngleRefPoint *= rotXMatrix;
-
-            // draw box around light
-            AZ::Vector3 points[4];
-            points[0] = AZ::Vector3(0, -m_configuration.m_areaWidth * 0.5f, -m_configuration.m_areaHeight * 0.5f);
-            points[1] = AZ::Vector3(0,  m_configuration.m_areaWidth * 0.5f, -m_configuration.m_areaHeight * 0.5f);
-            points[2] = AZ::Vector3(0,  m_configuration.m_areaWidth * 0.5f,  m_configuration.m_areaHeight * 0.5f);
-            points[3] = AZ::Vector3(0, -m_configuration.m_areaWidth * 0.5f,  m_configuration.m_areaHeight * 0.5f);
-            debugDisplay.DrawPolyLine(points, 4, true);
-
-            // draw lines from corners of light
-            debugDisplay.DrawLine(points[0], points[0] + AZ::Vector3(AngleRefPoint.GetX(), -AngleRefPoint.GetY(), -AngleRefPoint.GetZ()));
-            debugDisplay.DrawLine(points[1], points[1] + AZ::Vector3(AngleRefPoint.GetX(),  AngleRefPoint.GetY(), -AngleRefPoint.GetZ()));
-            debugDisplay.DrawLine(points[2], points[2] + AZ::Vector3(AngleRefPoint.GetX(),  AngleRefPoint.GetY(),  AngleRefPoint.GetZ()));
-            debugDisplay.DrawLine(points[3], points[3] + AZ::Vector3(AngleRefPoint.GetX(), -AngleRefPoint.GetY(),  AngleRefPoint.GetZ()));
-
-            // draw curves to the corners of the max distance box
-            const float sqrthalf = sqrt(0.5f);
-            debugDisplay.DrawArc(points[0], m_configuration.m_areaMaxDistance, 0, m_configuration.m_areaFOV,  1.0f, AZ::Vector3(0,  sqrthalf, -sqrthalf));
-            debugDisplay.DrawArc(points[1], m_configuration.m_areaMaxDistance, -m_configuration.m_areaFOV, m_configuration.m_areaFOV, 1.0f, AZ::Vector3(0, -sqrthalf, -sqrthalf));
-            debugDisplay.DrawArc(points[2], m_configuration.m_areaMaxDistance, 0, m_configuration.m_areaFOV,  1.0f, AZ::Vector3(0, -sqrthalf,  sqrthalf));
-            debugDisplay.DrawArc(points[3], m_configuration.m_areaMaxDistance, -m_configuration.m_areaFOV, m_configuration.m_areaFOV, 1.0f, AZ::Vector3(0,  sqrthalf,  sqrthalf));
-
-            // Draw middle rounded rect
-            debugDisplay.DrawLine(
-                AZ::Vector3(AngleRefPoint.GetX(), points[0].GetY(), points[0].GetZ() - roundedRectangleOffset),
-                AZ::Vector3(AngleRefPoint.GetX(), points[1].GetY(), points[1].GetZ() - roundedRectangleOffset)
-            );
-            debugDisplay.DrawLine(
-                AZ::Vector3(AngleRefPoint.GetX(), points[1].GetY() + roundedRectangleOffset, points[1].GetZ()),
-                AZ::Vector3(AngleRefPoint.GetX(), points[2].GetY() + roundedRectangleOffset, points[2].GetZ())
-            );
-            debugDisplay.DrawLine(
-                AZ::Vector3(AngleRefPoint.GetX(), points[2].GetY(), points[2].GetZ() + roundedRectangleOffset),
-                AZ::Vector3(AngleRefPoint.GetX(), points[3].GetY(), points[3].GetZ() + roundedRectangleOffset)
-            );
-            debugDisplay.DrawLine(
-                AZ::Vector3(AngleRefPoint.GetX(), points[3].GetY() - roundedRectangleOffset, points[3].GetZ()),
-                AZ::Vector3(AngleRefPoint.GetX(), points[0].GetY() - roundedRectangleOffset, points[0].GetZ())
-            );
-
-            debugDisplay.DrawArc(AZ::Vector3(AngleRefPoint.GetX(), points[0].GetY(), points[0].GetZ()), roundedRectangleOffset, 270.0f, 90.0f, 2.0f, AZ::Vector3(1.0f, 0.0f, 0.0f));
-            debugDisplay.DrawArc(AZ::Vector3(AngleRefPoint.GetX(), points[1].GetY(), points[1].GetZ()), roundedRectangleOffset,   0.0f, 90.0f, 2.0f, AZ::Vector3(1.0f, 0.0f, 0.0f));
-            debugDisplay.DrawArc(AZ::Vector3(AngleRefPoint.GetX(), points[2].GetY(), points[2].GetZ()), roundedRectangleOffset,  90.0f, 90.0f, 2.0f, AZ::Vector3(1.0f, 0.0f, 0.0f));
-            debugDisplay.DrawArc(AZ::Vector3(AngleRefPoint.GetX(), points[3].GetY(), points[3].GetZ()), roundedRectangleOffset, 180.0f, 90.0f, 2.0f, AZ::Vector3(1.0f, 0.0f, 0.0f));
-
-            // draw box at max distance in front of light
-            points[0] = AZ::Vector3(m_configuration.m_areaMaxDistance, -m_configuration.m_areaWidth * 0.5f, -m_configuration.m_areaHeight * 0.5f);
-            points[1] = AZ::Vector3(m_configuration.m_areaMaxDistance,  m_configuration.m_areaWidth * 0.5f, -m_configuration.m_areaHeight * 0.5f);
-            points[2] = AZ::Vector3(m_configuration.m_areaMaxDistance,  m_configuration.m_areaWidth * 0.5f,  m_configuration.m_areaHeight * 0.5f);
-            points[3] = AZ::Vector3(m_configuration.m_areaMaxDistance, -m_configuration.m_areaWidth * 0.5f,  m_configuration.m_areaHeight * 0.5f);
-            debugDisplay.DrawPolyLine(points, 4, true);
-
-            break;
-        }
-        case EditorLightConfiguration::LightType::Projector:
-        {
-            debugDisplay.SetColor(AZ::Vector4(color.GetR(), color.GetG(), color.GetB(), 0.5f));
-
-            const float range = m_configuration.m_projectorRange;
-            const float attenuation = m_configuration.m_projectorAttenuationBulbSize;
-            const float nearPlane = m_configuration.m_projectorNearPlane;
-
-            DrawProjectionGizmo(debugDisplay, range);
-            DrawProjectionGizmo(debugDisplay, attenuation);
-            DrawPlaneGizmo(debugDisplay, nearPlane);
-
-            break;
-        }
-        case EditorLightConfiguration::LightType::Probe:
-        {
-            AZ::Vector3 halfAreaSize = m_configuration.m_probeArea/2;
-            debugDisplay.SetColor(1, 1, 0, 0.8f);
-            debugDisplay.DrawWireBox( -halfAreaSize, halfAreaSize);
-            if (m_configuration.m_isBoxProjected)
-            {
-                AZ::Vector3 halfBoxSize = AZ::Vector3(m_configuration.m_boxWidth, m_configuration.m_boxLength, m_configuration.m_boxHeight) / 2;
-                debugDisplay.SetColor(0, 1, 0, 0.8f);
-                debugDisplay.DrawWireBox(-halfBoxSize, halfBoxSize);
-            }
-
-            // Note that rendering the cubemap preview is handled by m_cubemapPreview
-
-            break;
-        }
-        }
-
-        debugDisplay.PopMatrix();
-    }
-
-    void EditorLightComponent::DrawProjectionGizmo(
-        AzFramework::DebugDisplayRequests& debugDisplay, const float radius) const
-    {
-        //Don't draw if the radius isn't going to result in anything visible
-        if (radius <= 0)
-        {
-            return;
-        }
-
-        const int numPoints = 16;     // per one arc
-        const int numArcs = 6;
-
-        AZ::Vector3 points[numPoints * numArcs];
-        {
-            // Generate 4 arcs on intersection of sphere with pyramid.
-            const float fov = DEG2RAD(m_configuration.m_projectorFOV);
-
-            const AZ::Vector3 lightAxis(radius, 0.0f, 0.0f);
-            const float tanA = tan_tpl(fov * 0.5f);
-            const float fovProj = asin_tpl(1.0f / sqrtf(2.0f + 1.0f / (tanA * tanA))) * 2.0f;
-
-            const float halfFov = 0.5f * fov;
-            const float halfFovProj = fovProj * 0.5f;
-            const float anglePerSegmentOfFovProj = 1.0f / (numPoints - 1) * fovProj;
-
-            const AZ::Quaternion yRot = AZ::Quaternion::CreateRotationY(halfFov);
-            AZ::Vector3* arcPoints = points;
-            for (int i = 0; i < numPoints; ++i)
-            {
-                float angle = i * anglePerSegmentOfFovProj - halfFovProj;
-                arcPoints[i] = (yRot * AZ::Quaternion::CreateRotationZ(angle)).TransformVector(lightAxis);
-            }
-
-            const AZ::Quaternion zRot = AZ::Quaternion::CreateRotationZ(halfFov);
-            arcPoints += numPoints;
-            for (int i = 0; i < numPoints; ++i)
-            {
-                float angle = (numPoints - i - 1) * anglePerSegmentOfFovProj - halfFovProj;
-                arcPoints[i] = (zRot * AZ::Quaternion::CreateRotationY(angle)).TransformVector(lightAxis);
-            }
-
-            const AZ::Quaternion nyRot = AZ::Quaternion::CreateRotationY(-halfFov);
-            arcPoints += numPoints;
-            for (int i = 0; i < numPoints; ++i)
-            {
-                float angle = (numPoints - i - 1) * anglePerSegmentOfFovProj - halfFovProj;
-                arcPoints[i] = (nyRot * AZ::Quaternion::CreateRotationZ(angle)).TransformVector(lightAxis);
-            }
-
-            const AZ::Quaternion nzRot = AZ::Quaternion::CreateRotationZ(-halfFov);
-            arcPoints += numPoints;
-            for (int i = 0; i < numPoints; ++i)
-            {
-                float angle = i * anglePerSegmentOfFovProj - halfFovProj;
-                arcPoints[i] = (nzRot * AZ::Quaternion::CreateRotationY(angle)).TransformVector(lightAxis);
-            }
-
-            arcPoints += numPoints;
-            const float anglePerSegmentOfFov = 1.0f / (numPoints - 1) * fov;
-            for (int i = 0; i < numPoints; ++i)
-            {
-                float angle = i * anglePerSegmentOfFov - halfFov;
-                arcPoints[i] = AZ::Quaternion::CreateRotationY(angle).TransformVector(lightAxis);
-            }
-
-            arcPoints += numPoints;
-            for (int i = 0; i < numPoints; ++i)
-            {
-                float angle = i * anglePerSegmentOfFov - halfFov;
-                arcPoints[i] = AZ::Quaternion::CreateRotationZ(angle).TransformVector(lightAxis);
-            }
-        }
-
-        // Draw pyramid and sphere intersection.
-        debugDisplay.DrawPolyLine(points, numPoints * 4, false);
-
-        // Draw cross.
-        debugDisplay.DrawPolyLine(points + numPoints * 4, numPoints, false);
-        debugDisplay.DrawPolyLine(points + numPoints * 5, numPoints, false);
-        debugDisplay.DrawLine(AZ::Vector3::CreateZero(), points[numPoints * 0]);
-        debugDisplay.DrawLine(AZ::Vector3::CreateZero(), points[numPoints * 1]);
-        debugDisplay.DrawLine(AZ::Vector3::CreateZero(), points[numPoints * 2]);
-        debugDisplay.DrawLine(AZ::Vector3::CreateZero(), points[numPoints * 3]);
-    }
-
-    void EditorLightComponent::DrawPlaneGizmo(AzFramework::DebugDisplayRequests& debugDisplay, const float depth) const
-    {
-        //Don't draw if depth isn't going to result in anything visible
-        if (depth <= 0)
-        {
-            return;
-        }
-
-        const uint32_t numPoints = 8; //8 Points - 4 corners and 4 half widths
-
-        AZ::Vector3 points[numPoints];
-
-        const float fov = DEG2RAD(m_configuration.m_projectorFOV);
-        const float halfWidth = tanf(0.5f * fov) * depth;       //Calculate the half width of the frustum at this depth
-
-        //Add corners
-        points[0] = AZ::Vector3(depth, +halfWidth, +halfWidth); //Top-Left
-        points[1] = AZ::Vector3(depth, -halfWidth, +halfWidth); //Top-Right
-        points[2] = AZ::Vector3(depth, -halfWidth, -halfWidth); //Bottom-Right
-        points[3] = AZ::Vector3(depth, +halfWidth, -halfWidth); //Bottom-Left
-
-        //Add points halfway between corners
-        points[4] = AZ::Vector3(depth, 0, +halfWidth);  //Top-Middle
-        points[5] = AZ::Vector3(depth, -halfWidth, 0);  //Right-Middle
-        points[6] = AZ::Vector3(depth, 0, -halfWidth);  //Bottom-Middle
-        points[7] = AZ::Vector3(depth, +halfWidth, 0);  //Left-Middle
-
-
-        //Draw Square
-        debugDisplay.DrawLine(points[0], points[1]); //TL to TR
-        debugDisplay.DrawLine(points[1], points[2]); //TR to BR
-        debugDisplay.DrawLine(points[2], points[3]); //BR to BL
-        debugDisplay.DrawLine(points[3], points[0]); //BL to TL
-
-        const AZ::Vector3 depthVec(depth, 0, 0);
-
-        // Draw Cross
-        debugDisplay.DrawLine(depthVec, points[4]);
-        debugDisplay.DrawLine(depthVec, points[5]);
-        debugDisplay.DrawLine(depthVec, points[6]);
-        debugDisplay.DrawLine(depthVec, points[7]);
-    }
-
-    EditorLightComponent::CubemapPreview::CubemapPreview()
-        : m_renderTransform(Matrix34::CreateIdentity())
-        , m_statObj(nullptr)
-    {
-        m_dwRndFlags |= ERF_RENDER_ALWAYS;
-    }
-
-    void EditorLightComponent::CubemapPreview::Setup(const char* textureName)
-    {
-        if (!m_editor)
-        {
-            AzToolsFramework::EditorRequestBus::BroadcastResult(m_editor, &AzToolsFramework::EditorRequests::GetEditor);
-        }
-
-        if (!m_editor->Get3DEngine())
-        {
-            return;
-        }
-
-        if (!m_materialManager)
-        {
-            m_materialManager = m_editor->Get3DEngine()->GetMaterialManager();
-        }
-
-        _smart_ptr<IMaterial> material = m_materialManager->LoadMaterial("Editor/Objects/envcube", false, true);
-        QString matName = Path::GetFileName(textureName);
-        if (material)
-        {
-            SShaderItem& si = material->GetShaderItem();
-
-            // We need to clone the material in order for multiple Environment Probes to not stomp each other's preview materials.
-            material = m_materialManager->CreateMaterial(matName.toUtf8().data(), material->GetFlags() | MTL_FLAG_NON_REMOVABLE);
-            if (material)
-            {
-                SInputShaderResources   isr = si.m_pShaderResources;
-                // The following operation will create a texture slot entry and copy the name to it.
-                isr.m_TexturesResourcesMap[EFTT_ENV].m_Name = textureName;
-
-                SShaderItem siDst = m_editor->GetRenderer()->EF_LoadShaderItem(si.m_pShader->GetName(), true, 0, &isr, si.m_pShader->GetGenerationMask());
-                material->AssignShaderItem(siDst);
-            }
-        }
-
-        m_statObj = m_editor->Get3DEngine()->LoadStatObjAutoRef("Editor/Objects/envcube.cgf", nullptr, nullptr, false);
-        if (m_statObj)
-        {
-            // We need to clone the object in order for multiple Environment Probes to not stomp each other's preview materials.
-            m_statObj = m_statObj->Clone(false, false, false);
-
-            m_statObj->SetMaterial(material);
-        }
-    }
-
-    void EditorLightComponent::CubemapPreview::UpdateTexture(const char* textureName)
-    {
-        if (m_statObj)
-        {
-            _smart_ptr<IMaterial> material = m_statObj->GetMaterial();
-
-            if (material)
-            {
-                SShaderItem& si = material->GetShaderItem();
-
-                SInputShaderResources isr = si.m_pShaderResources;
-                // The following operation will create a texture slot entry and copy the name to it.
-                isr.m_TexturesResourcesMap[EFTT_ENV].m_Name = textureName;
-
-                SShaderItem siDst = m_editor->GetRenderer()->EF_LoadShaderItem(si.m_pShader->GetName(), true, 0, &isr, si.m_pShader->GetGenerationMask());
-                material->AssignShaderItem(siDst);
-            }
-        }
-    }
-
-    void EditorLightComponent::CubemapPreview::SetTransform(const Matrix34& transform)
-    {
-        m_renderTransform = transform;
-    }
-
-    void EditorLightComponent::CubemapPreview::Render([[maybe_unused]] const struct SRendParams& inRenderParams, const struct SRenderingPassInfo& passInfo)
-    {
-        if (m_statObj)
-        {
-            SRendParams rp;
-            rp.AmbientColor = ColorF(1.0f, 1.0f, 1.0f, 1);
-            rp.fAlpha = 1;
-            rp.pMatrix = &m_renderTransform;
-            rp.pMaterial = m_statObj->GetMaterial();
-
-            m_statObj->Render(rp, passInfo);
-        }
-    }
-
-    EERType EditorLightComponent::CubemapPreview::GetRenderNodeType()
-    {
-        return eERType_RenderComponent;
-    }
-
-    const char* EditorLightComponent::CubemapPreview::GetName() const
-    {
-        return "CubemapPreview";
-    }
-
-    const char* EditorLightComponent::CubemapPreview::GetEntityClassName() const
-    {
-        return "CubemapPreview";
-    }
-
-    Vec3 EditorLightComponent::CubemapPreview::GetPos([[maybe_unused]] bool bWorldOnly) const
-    {
-        return m_renderTransform.GetTranslation();
-    }
-
-    const AABB EditorLightComponent::CubemapPreview::GetBBox() const
-    {
-        AABB transformedAABB;
-        transformedAABB.Reset();
-        if (m_statObj)
-        {
-            transformedAABB.SetTransformedAABB(QuatT(m_renderTransform), m_statObj->GetAABB());
-        }
-        return transformedAABB;
-    }
-
-    _smart_ptr<IMaterial> EditorLightComponent::CubemapPreview::GetMaterial([[maybe_unused]] Vec3* pHitPos)
-    {
-        return m_statObj ? m_statObj->GetMaterial() : nullptr;
-    }
-
-    _smart_ptr<IMaterial> EditorLightComponent::CubemapPreview::GetMaterialOverride()
-    {
-        return m_statObj ? m_statObj->GetMaterial() : nullptr;
-    }
-
-    IStatObj* EditorLightComponent::CubemapPreview::GetEntityStatObj(unsigned int nPartId, [[maybe_unused]] unsigned int nSubPartId, Matrix34A* pMatrix, [[maybe_unused]] bool bReturnOnlyVisible)
-    {
-        if (0 == nPartId)
-        {
-            if (pMatrix)
-            {
-                *pMatrix = m_renderTransform;
-            }
-
-            return m_statObj;
-        }
-
-        return nullptr;
-    }
-
-    float EditorLightComponent::CubemapPreview::GetMaxViewDist()
-    {
-        return FLT_MAX;
-    }
-
-    void EditorLightComponent::CubemapPreview::GetMemoryUsage(class ICrySizer* pSizer) const
-    {
-        pSizer->AddObjectSize(this);
-    }
-
-
-
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorLightComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorLightComponent.h
deleted file mode 100644
index 3b1de2c528..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorLightComponent.h
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Component/ComponentExport.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-#include <LmbrCentral/Rendering/EditorLightComponentBus.h>
-#include <LmbrCentral/Rendering/EditorCameraCorrectionBus.h>
-
-#include "LightComponent.h"
-
-#include <IStatObj.h>
-
-namespace LmbrCentral
-{
-    class EditorLightComponent;
-
-    /**
-     * Extends LightConfiguration structure to add editor functionality
-     * such as property handlers and visibility filters, as well as
-     * reflection for editing.
-     */
-
-    class EditorLightConfiguration
-        : public LightConfiguration
-    {
-    public:
-        AZ_TYPE_INFO(EditorLightConfiguration, "{1D3B114F-8FB2-47BD-9C21-E089F4F37861}");
-
-        ~EditorLightConfiguration() override {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZ::Crc32 GetAmbientLightVisibility() const override;
-        AZ::Crc32 GetPointLightVisibility() const override;
-        AZ::Crc32 GetProjectorLightVisibility() const override;
-        AZ::Crc32 GetProbeLightVisibility() const override;
-        AZ::Crc32 GetShadowSpecVisibility() const override;
-        AZ::Crc32 GetShadowSettingsVisibility() const override;
-        AZ::Crc32 GetAreaSettingVisibility() const override;
-
-        AZ::Crc32 MinorPropertyChanged() override;
-        AZ::Crc32 MajorPropertyChanged() override;
-        AZ::Crc32 OnAnimationSettingChanged() override;
-        AZ::Crc32 OnCubemapAssetChanged() override;
-        bool CanGenerateCubemap() const override;
-
-        void SetComponent(EditorLightComponent* component);
-        EditorLightComponent* m_component;
-    };
-
-    /*!
-     * In-editor light component.
-     * Handles previewing and activating lights in the editor.
-     */
-    class EditorLightComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , private AzToolsFramework::EditorVisibilityNotificationBus::Handler
-        , private AzToolsFramework::EditorEvents::Bus::Handler
-        , private AzFramework::EntityDebugDisplayEventBus::Handler
-        , private EditorLightComponentRequestBus::Handler
-        , private RenderNodeRequestBus::Handler
-        , private AzFramework::AssetCatalogEventBus::Handler
-        , private AZ::TransformNotificationBus::Handler
-        , private EditorCameraCorrectionRequestBus::Handler
-    {
-    private:
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-    public:
-        
-        friend EditorLightConfiguration;
-        //old guid "{33BB1CD4-6A33-46AA-87ED-8BBB40D94B0D}" before splitting editor light component
-        AZ_COMPONENT(EditorLightComponent, "{7C18B273-5BA3-4E0F-857D-1F30BD6B0733}", AzToolsFramework::Components::EditorComponentBase); 
- 
-        EditorLightComponent();
-        ~EditorLightComponent() override;
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Init() override;
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // AzToolsFramework::EditorVisibilityNotificationBus interface implementation
-        void OnEntityVisibilityChanged(bool visibility) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        // AzFramework::EntityDebugDisplayEventBus
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        //////////////////////////////////////////////////////////////////////////
-        // EditorLightComponentRequestBus::Handler interface implementation
-        void SetCubemap(const AZStd::string& cubemap) override;
-        void SetProjectorTexture(const AZStd::string& projectorTexture) override;
-
-        AZ::u32 GetCubemapResolution() override;
-        void SetCubemapResolution(AZ::u32 resolution) override;
-        bool UseCustomizedCubemap() const override;
-        void RefreshLight() override;
-        const LightConfiguration& GetConfiguration() const override;
-        AZ::Crc32 OnCubemapAssetChanged();
-        AZ::Crc32 OnCustomizedCubemapChanged();
-
-        // EditorCameraCorrectionRequestBus interface implementation
-        // Light is aligned along the the x-axis so add a transform correction to align along the y-axis.
-        AZ::Matrix3x3 GetTransformCorrection() override { return AZ::Matrix3x3::CreateRotationZ(-AZ::Constants::HalfPi); }
-
-        ///////////////////////////////////////////
-        // EditorLightComponentRequestBus Modifiers
-        void SetVisible(bool isVisible) override;
-        bool GetVisible() override;
-
-        void SetOnInitially(bool onInitially) override;
-        bool GetOnInitially() override;
-
-        void SetColor(const AZ::Color& newColor) override;
-        const AZ::Color GetColor() override;
-
-        void SetDiffuseMultiplier(float newMultiplier) override;
-        float GetDiffuseMultiplier() override;
-
-        void SetSpecularMultiplier(float newMultiplier) override;
-        float GetSpecularMultiplier() override;
-
-        void SetAmbient(bool isAmbient) override;
-        bool GetAmbient() override;
-
-        void SetPointMaxDistance(float newMaxDistance) override;
-        float GetPointMaxDistance() override;
-
-        void SetPointAttenuationBulbSize(float newAttenuationBulbSize) override;
-        float GetPointAttenuationBulbSize() override;
-
-        void SetAreaMaxDistance(float newMaxDistance) override;
-        float GetAreaMaxDistance() override;
-
-        void SetAreaWidth(float newWidth) override;
-        float GetAreaWidth() override;
-
-        void SetAreaHeight(float newHeight) override;
-        float GetAreaHeight() override;
-
-        void SetAreaFOV(float newFOV) override;
-        float GetAreaFOV() override;
-
-        void SetProjectorMaxDistance(float newMaxDistance) override;
-        float GetProjectorMaxDistance() override;
-
-        void SetProjectorAttenuationBulbSize(float newAttenuationBulbSize) override;
-        float GetProjectorAttenuationBulbSize() override;
-
-        void SetProjectorFOV(float newFOV) override;
-        float GetProjectorFOV() override;
-
-        void SetProjectorNearPlane(float newNearPlane) override;
-        float GetProjectorNearPlane() override;
-
-        // Environment Probe Settings
-        void SetProbeAreaDimensions(const AZ::Vector3& newDimensions) override;
-        const AZ::Vector3 GetProbeAreaDimensions() override;
-
-        void SetProbeSortPriority(AZ::u32 newPriority) override;
-        AZ::u32 GetProbeSortPriority() override;
-
-        void SetProbeBoxProjected(bool isProbeBoxProjected) override;
-        bool GetProbeBoxProjected() override;
-
-        void SetProbeBoxHeight(float newHeight) override;
-        float GetProbeBoxHeight() override;
-
-        void SetProbeBoxLength(float newLength) override;
-        float GetProbeBoxLength() override;
-
-        void SetProbeBoxWidth(float newWidth) override;
-        float GetProbeBoxWidth() override;
-
-        void SetProbeAttenuationFalloff(float newAttenuationFalloff) override;
-        float GetProbeAttenuationFalloff() override;
-
-        void SetProbeFade(float fade) override;
-        float GetProbeFade() override;
-
-        void SetIndoorOnly(bool indoorOnly) override;
-        bool GetIndoorOnly() override;
-
-        void SetCastShadowSpec(AZ::u32 castShadowSpec) override;
-        AZ::u32 GetCastShadowSpec() override;
-
-        void SetViewDistanceMultiplier(float viewDistanceMultiplier) override;
-        float GetViewDistanceMultiplier() override;
-
-        void SetProbeArea(const AZ::Vector3& probeArea) override;
-        AZ::Vector3 GetProbeArea() override;
-
-        void SetVolumetricFogOnly(bool volumetricFogOnly) override;
-        bool GetVolumetricFogOnly() override;
-
-        void SetVolumetricFog(bool volumetricFog) override;
-        bool GetVolumetricFog() override;
-
-        void SetAttenuationFalloffMax(float attenFalloffMax);
-        float GetAttenuationFalloffMax();
-
-        void SetUseVisAreas(bool useVisAreas) override;
-        bool GetUseVisAreas() override;
-
-        void SetAffectsThisAreaOnly(bool affectsThisAreaOnly) override;
-        bool GetAffectsThisAreaOnly() override;
-
-        void SetBoxHeight(float boxHeight) override;
-        float GetBoxHeight() override;
-
-        void SetBoxWidth(float boxWidth) override;
-        float GetBoxWidth() override;
-
-        void SetBoxLength(float boxLength) override;
-        float GetBoxLength() override;
-
-        void SetBoxProjected(bool boxProjected) override;
-        bool GetBoxProjected() override;
-
-        void SetShadowBias(float shadowBias) override;
-        float GetShadowBias() override;
-
-        void SetShadowSlopeBias(float shadowSlopeBias) override;
-        float GetShadowSlopeBias() override;
-
-        void SetShadowResScale(float shadowResScale) override;
-        float GetShadowResScale() override;
-
-        void SetShadowUpdateMinRadius(float shadowUpdateMinRadius) override;
-        float GetShadowUpdateMinRadius() override;
-
-        void SetShadowUpdateRatio(float shadowUpdateRatio) override;
-        float GetShadowUpdateRatio() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        // Animation parameters
-        void SetAnimIndex(AZ::u32 animIndex) override;
-        AZ::u32 GetAnimIndex() override;
-
-        void SetAnimSpeed(float animSpeed) override;
-        float GetAnimSpeed() override;
-
-        void SetAnimPhase(float animPhase) override;
-        float GetAnimPhase() override;
-
-        //////////////////////////////////////////////////////////////////////////
-        // RenderNodeRequestBus::Handler interface implementation
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // TransformNotificationBus::Handler interface implementation
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        //////////////////////////////////////////////////////////////////////////
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            LightComponent::GetProvidedServices(provided);
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            LightComponent::GetRequiredServices(required);
-        }
-
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-        {
-            LightComponent::GetDependentServices(dependent);
-            dependent.push_back(AZ_CRC("EditorVisibilityService", 0x90888caf));
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            LightComponent::GetIncompatibleServices(incompatible);
-        }
-
-        static AZ::ExportedComponent ExportLightComponent(AZ::Component* thisComponent, const AZ::PlatformTagSet& /*platformTags*/);
-
-        static void Reflect(AZ::ReflectContext* context);
-        //////////////////////////////////////////////////////////////////////////
-
-    protected:
-        void SetLightType(EditorLightConfiguration::LightType lightType)
-        {
-            m_configuration.m_lightType = lightType;
-        }
-
-        AZ::Uuid GetCubemapId()
-        {
-            return m_configuration.m_cubemapId;
-        }
-
-        virtual const char* GetLightTypeText() const;
-
-    private:
-
-        static bool VersionConverter(AZ::SerializeContext& context,
-            AZ::SerializeContext::DataElementNode& classElement);
-
-        //! Handles rendering of the preview cubemap by creating a simple cubemapped sphere.
-        class CubemapPreview : public IRenderNode
-        {
-        public:
-            CubemapPreview();
-            void Setup(const char* textureName);
-            void UpdateTexture(const char* textureName);
-            void SetTransform(const Matrix34& transform);
-
-        private:
-            //////////////////////////////////////////////////////////////////////////
-            // IRenderNode interface implementation
-            void Render(const struct SRendParams& inRenderParams, const struct SRenderingPassInfo& passInfo) override;
-            EERType GetRenderNodeType() override;
-            const char* GetName() const override;
-            const char* GetEntityClassName() const override;
-            Vec3 GetPos(bool bWorldOnly = true) const override;
-            const AABB GetBBox() const override;
-            void SetBBox([[maybe_unused]] const AABB& WSBBox) override {}
-            void OffsetPosition([[maybe_unused]] const Vec3& delta) override {}
-            void SetMaterial(_smart_ptr<IMaterial> pMat) override {}
-            _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = nullptr) override;
-            _smart_ptr<IMaterial> GetMaterialOverride() override;
-            IStatObj* GetEntityStatObj(unsigned int nPartId = 0, unsigned int nSubPartId = 0, Matrix34A* pMatrix = nullptr, bool bReturnOnlyVisible = false);
-            float GetMaxViewDist() override;
-            void GetMemoryUsage(class ICrySizer* pSizer) const override;
-            //////////////////////////////////////////////////////////////////////////
-        private:
-            Matrix34 m_renderTransform;
-            _smart_ptr<IStatObj> m_statObj;
-        };
-
-        //if an cubemap asset is added or changed
-        void OnCatalogAssetAdded(const AZ::Data::AssetId& assetId) override;
-        void OnCatalogAssetChanged(const AZ::Data::AssetId& assetId) override;
-
-        void OnEditorSpecChange() override;
-
-        //! Returns whether the light is an environment probe
-        bool IsProbe() const;
-
-        //! Returns whether the light has a cubemap assigned
-        bool HasCubemap() const;
-
-        //! Triggers regeneration of the environment probe's cubemap (the current cubemap output will be baked into the new cubemap as well).
-        void GenerateCubemap();
-
-        //! Removes the associated cubemap, returning the environment probe to its default state
-        void ClearCubemap();
-
-        void OnViewCubemapChanged();
-
-        //! Returns true if it's an environment probe and not using customized cubemap
-        bool CanGenerateCubemap() const;
-
-        //! Returns the name to use for the Generate Cubemap button.
-        const char* GetGenerateCubemapButtonName() const;
-        
-        const char* GetCubemapAssetName() const;
-
-        void DrawProjectionGizmo(AzFramework::DebugDisplayRequests& dc, const float radius) const;
-        void DrawPlaneGizmo(AzFramework::DebugDisplayRequests& dc, const float depth) const;
-
-        EditorLightConfiguration m_configuration;
-        bool m_viewCubemap;
-        bool m_useCustomizedCubemap;
-        bool m_cubemapRegen;
-        bool m_cubemapClear;
-
-        CubemapPreview m_cubemapPreview;
-
-        LightInstance m_light;
-
-        //Statics that can be used by every light
-        static IEditor*             m_editor;
-        static IMaterialManager*    m_materialManager;
-        static const char* BUTTON_GENERATE;
-        static const char* BUTTON_ADDBOUNCE;
-    };
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorMeshComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorMeshComponent.cpp
deleted file mode 100644
index 141b3b880c..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorMeshComponent.cpp
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include "EditorMeshComponent.h"
-#include <AzFramework/Viewport/ViewportColors.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/std/string/string_view.h>
-
-#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
-
-#include <MathConversion.h>
-
-#include <INavigationSystem.h> // For updating nav tiles on creation of editor physics.
-#include <IPhysics.h> // For basic physicalization at edit-time for object snapping.
-#include <IEditor.h>
-#include <Settings.h>
-#include <I3DEngine.h>
-
-#include <AzCore/Interface/Interface.h>
-#include <AzFramework/Render/GeometryIntersectionBus.h>
-#include <AzCore/Console/IConsole.h>
-
-namespace LmbrCentral
-{
-    AZ_CVAR(bool, cl_editorMeshIntersectionDebug, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Enable editor mesh intersection debugging");
-
-    void EditorMeshComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorMeshComponent, EditorComponentBase>()
-                ->Version(1)
-                ->Field("Static Mesh Render Node", &EditorMeshComponent::m_mesh)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorMeshComponent>("Mesh", "The Mesh component is the primary method of adding visual geometry to entities")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/StaticMesh.svg")
-                        ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<LmbrCentral::MeshAsset>::Uuid())
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/StaticMesh.png")
-                        ->Attribute(AZ::Edit::Attributes::DynamicIconOverride, &EditorMeshComponent::GetMeshViewportIconPath)
-                        ->Attribute(AZ::Edit::Attributes::PreferNoViewportIcon, true)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-static-mesh.html")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorMeshComponent::m_mesh)
-                    ;
-
-                editContext->Class<MeshComponentRenderNode::MeshRenderOptions>(
-                    "Render Options", "Rendering options for the mesh.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-
-                    ->ClassElement(AZ::Edit::ClassElements::Group, "Options")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, false)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Slider, &MeshComponentRenderNode::MeshRenderOptions::m_opacity, "Opacity", "Opacity value")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                        ->Attribute(AZ::Edit::Attributes::Max, 1.f)
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_maxViewDist, "Max view distance", "Maximum view distance in meters.")
-                        ->Attribute(AZ::Edit::Attributes::Suffix, " m")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                        ->Attribute(AZ::Edit::Attributes::Max, &MeshComponentRenderNode::GetDefaultMaxViewDist)
-                        ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_viewDistMultiplier, "View distance multiplier", "Adjusts max view distance. If 1.0 then default is used. 1.1 would be 10% further than default.")
-                        ->Attribute(AZ::Edit::Attributes::Suffix, "x")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Slider, &MeshComponentRenderNode::MeshRenderOptions::m_lodRatio, "LOD distance ratio", "Controls LOD ratio over distance.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                        ->Attribute(AZ::Edit::Attributes::Min, 0)
-                        ->Attribute(AZ::Edit::Attributes::Max, 255)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_castShadows, "Cast shadows", "Casts shadows.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_lodBoundingBoxBased, "LOD based on Bounding Boxes", "LOD based on Bounding Boxes.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_useVisAreas, "Use VisAreas", "Allow VisAreas to control this component's visibility.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-
-                    ->ClassElement(AZ::Edit::ClassElements::Group, "Advanced")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, false)
-
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_rainOccluder, "Rain occluder", "Occludes dynamic raindrops.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &MeshComponentRenderNode::MeshRenderOptions::StaticPropertyVisibility)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_affectDynamicWater, "Affect dynamic water", "Will generate ripples in dynamic water.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &MeshComponentRenderNode::MeshRenderOptions::StaticPropertyVisibility)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_receiveWind, "Receive wind", "Receives wind.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMajorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_acceptDecals, "Accept decals", "Can receive decals.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_affectNavmesh, "Affect navmesh", "Will affect navmesh generation.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &MeshComponentRenderNode::MeshRenderOptions::StaticPropertyVisibility)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_visibilityOccluder, "Visibility occluder", "Is appropriate for occluding visibility of other objects.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &MeshComponentRenderNode::MeshRenderOptions::StaticPropertyVisibility)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_dynamicMesh, "Deformable mesh", "Enables vertex deformation on mesh.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMajorChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::MeshRenderOptions::m_affectGI, "Affects GI", "Affects the global illumination results.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::MeshRenderOptions::OnMinorChanged)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &MeshComponentRenderNode::MeshRenderOptions::StaticPropertyVisibility)
-                        ;
-
-                editContext->Class<MeshComponentRenderNode>(
-                    "Mesh Rendering", "Attach geometry to the entity.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::m_visible, "Visible", "Is currently visible.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::RefreshRenderState)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::m_meshAsset, "Mesh asset", "Mesh asset reference")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::OnAssetPropertyChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::m_material, "Material override", "Optionally specify an override material.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::OnAssetPropertyChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentRenderNode::m_renderOptions, "Render options", "Render/draw options.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &MeshComponentRenderNode::RefreshRenderState)
-                        ;
-            }
-        }
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->Class<EditorMeshComponent>()->RequestBus("MeshComponentRequestBus");
-        }
-    }
-
-    void EditorMeshComponent::Activate()
-    {
-        EditorComponentBase::Activate();
-
-        m_mesh.AttachToEntity(m_entity->GetId());
-        bool isStatic = false;
-        AZ::TransformBus::EventResult(isStatic, m_entity->GetId(), &AZ::TransformBus::Events::IsStaticTransform);
-        m_mesh.SetTransformStaticState(isStatic);
-
-        bool visible = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-            visible, GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
-        m_mesh.UpdateAuxiliaryRenderFlags(!visible, ERF_HIDDEN);
-
-        // Note we are purposely connecting to buses before calling m_mesh.CreateMesh().
-        // m_mesh.CreateMesh() can result in events (eg: OnMeshCreated) that we want receive.
-        MaterialOwnerRequestBus::Handler::BusConnect(m_entity->GetId());
-        AzFramework::BoundsRequestBus::Handler::BusConnect(m_entity->GetId());
-        MeshComponentRequestBus::Handler::BusConnect(m_entity->GetId());
-        MeshComponentNotificationBus::Handler::BusConnect(m_entity->GetId());
-        LegacyMeshComponentRequestBus::Handler::BusConnect(m_entity->GetId());
-        RenderNodeRequestBus::Handler::BusConnect(m_entity->GetId());
-        AZ::TransformNotificationBus::Handler::BusConnect(m_entity->GetId());
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusConnect(GetEntityId());
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(GetEntityId());
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(GetEntityId());
-        AzToolsFramework::EditorComponentSelectionNotificationsBus::Handler::BusConnect(GetEntityId());
-        AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-        AzFramework::EntityIdContextQueryBus::EventResult(m_contextId, GetEntityId(), &AzFramework::EntityIdContextQueries::GetOwningContextId);
-        AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusConnect({ GetEntityId(), m_contextId });
-
-        m_mesh.m_renderOptions.m_changeCallback =
-            [this]()
-            {
-                m_mesh.RefreshRenderState();
-                AffectNavmesh();
-            };
-
-        m_mesh.CreateMesh();
-    }
-
-    void EditorMeshComponent::Deactivate()
-    {
-        AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
-        AZ::Data::AssetBus::Handler::BusDisconnect();
-        MaterialOwnerRequestBus::Handler::BusDisconnect();
-        AzFramework::BoundsRequestBus::Handler::BusDisconnect();
-        MeshComponentRequestBus::Handler::BusDisconnect();
-        MeshComponentNotificationBus::Handler::BusDisconnect();
-        LegacyMeshComponentRequestBus::Handler::BusDisconnect();
-        RenderNodeRequestBus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusDisconnect();
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorComponentSelectionNotificationsBus::Handler::BusDisconnect();
-
-        AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusDisconnect();
-
-        m_mesh.m_renderOptions.m_changeCallback = nullptr;
-
-        m_mesh.DestroyMesh();
-        m_mesh.AttachToEntity(AZ::EntityId());
-
-        EditorComponentBase::Deactivate();
-    }
-
-
-    void EditorMeshComponent::OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-    {
-        AZ::Data::AssetBus::Handler::BusDisconnect();
-        AZ::Data::AssetBus::Handler::BusConnect(asset.GetId());
-
-        using namespace AzFramework::RenderGeometry;
-        IntersectionNotificationBus::Event(m_contextId, &IntersectionNotifications::OnGeometryChanged, GetEntityId());
-    }
-
-    void EditorMeshComponent::OnMeshDestroyed()
-    {
-        using namespace AzFramework::RenderGeometry;
-        IntersectionNotificationBus::Event(m_contextId, &IntersectionNotifications::OnGeometryChanged, GetEntityId());
-    }
-
-    IRenderNode* EditorMeshComponent::GetRenderNode()
-    {
-        return &m_mesh;
-    }
-
-    float EditorMeshComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return s_renderNodeRequestBusOrder;
-    }
-
-    void EditorMeshComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        AZ_UNUSED(world);
-
-        using namespace AzFramework::RenderGeometry;
-        IntersectionNotificationBus::Event(m_contextId, &IntersectionNotifications::OnGeometryChanged, GetEntityId());
-    }
-
-    void EditorMeshComponent::OnStaticChanged(bool isStatic)
-    {
-        m_mesh.SetTransformStaticState(isStatic);
-        if (m_mesh.m_renderOptions.m_changeCallback)
-        {
-            m_mesh.m_renderOptions.m_changeCallback();
-        }
-        AffectNavmesh();
-    }
-
-    AZ::Aabb EditorMeshComponent::GetWorldBounds()
-    {
-        return m_mesh.CalculateWorldAABB();
-    }
-
-    AZ::Aabb EditorMeshComponent::GetLocalBounds()
-    {
-        return m_mesh.CalculateLocalAABB();
-    }
-
-    AzFramework::RenderGeometry::RayResult EditorMeshComponent::RenderGeometryIntersect(const AzFramework::RenderGeometry::RayRequest& ray)
-    {
-        AzFramework::RenderGeometry::RayResult result;
-        if (!GetVisibility() && ray.m_onlyVisible)
-        {
-            return result;
-        }
-
-        if (IStatObj* geometry = GetStatObj())
-        {
-            const AZ::Vector3 rayDirection = (ray.m_endWorldPosition - ray.m_startWorldPosition);
-            const AZ::Transform& transform = GetTransform()->GetWorldTM();
-            const AZ::Transform inverseTransform = transform.GetInverse();
-
-            const AZ::Vector3 rayStartLocal = inverseTransform.TransformPoint(ray.m_startWorldPosition);
-            const AZ::Vector3 rayDistNormLocal  = inverseTransform.TransformVector(rayDirection).GetNormalized();
-
-            SRayHitInfo hi;
-            hi.inReferencePoint = AZVec3ToLYVec3(rayStartLocal);
-            hi.inRay = Ray(hi.inReferencePoint, AZVec3ToLYVec3(rayDistNormLocal));
-            hi.bInFirstHit = true;
-            hi.bGetVertColorAndTC = true;
-
-            if (geometry->RayIntersection(hi))
-            {
-                AZ::Matrix3x4 invTransformMatrix = AZ::Matrix3x4::CreateFromTransform(inverseTransform);
-                invTransformMatrix.Transpose();
-
-                result.m_uv = LYVec2ToAZVec2(hi.vHitTC);
-                result.m_worldPosition = transform.TransformPoint(LYVec3ToAZVec3(hi.vHitPos));
-                result.m_worldNormal = invTransformMatrix.Multiply3x3(LYVec3ToAZVec3(hi.vHitNormal)).GetNormalized();
-                result.m_distance = (result.m_worldPosition - ray.m_startWorldPosition).GetLength();
-                result.m_entityAndComponent = { GetEntityId(), GetId() };
-                if (cl_editorMeshIntersectionDebug)
-                {
-                    m_debugPos = result.m_worldPosition;
-                    m_debugNormal = result.m_worldNormal;
-                }
-            }
-        }
-
-        return result;
-    }
-
-    void EditorMeshComponent::SetMeshAsset(const AZ::Data::AssetId& id)
-    {
-        m_mesh.SetMeshAsset(id);
-        AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
-            &AzToolsFramework::ToolsApplicationRequests::AddDirtyEntity,
-            GetEntityId());
-    }
-
-    void EditorMeshComponent::SetMaterial(_smart_ptr<IMaterial> material)
-    {
-        m_mesh.SetMaterial(material);
-
-        AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(
-            &AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay,
-            AzToolsFramework::Refresh_AttributesAndValues);
-    }
-
-    _smart_ptr<IMaterial> EditorMeshComponent::GetMaterial()
-    {
-        return m_mesh.GetMaterial();
-    }
-
-    void EditorMeshComponent::SetPrimaryAsset(const AZ::Data::AssetId& assetId)
-    {
-        SetMeshAsset(assetId);
-    }
-
-    void EditorMeshComponent::OnEntityVisibilityChanged(bool visibility)
-    {
-        m_mesh.UpdateAuxiliaryRenderFlags(!visibility, ERF_HIDDEN);
-        m_mesh.RefreshRenderState();
-    }
-
-    static void DecideColor(
-        const bool selected, const bool mouseHovered, const bool visible,
-        ColorB& triangleColor, ColorB& lineColor)
-    {
-        const ColorB translucentPurple = ColorB(250, 0, 250, 30);
-
-        // default both colors to hidden
-        triangleColor = ColorB(AZ::u32(0));
-        lineColor = ColorB(AZ::u32(0));
-
-        if (selected)
-        {
-            if (!visible)
-            {
-                lineColor = Col_Black;
-
-                if (mouseHovered)
-                {
-                    triangleColor = translucentPurple;
-                }
-            }
-        }
-        else
-        {
-            if (mouseHovered)
-            {
-                triangleColor = translucentPurple;
-                lineColor = AZColorToLYColorF(AzFramework::ViewportColors::HoverColor);
-            }
-        }
-    }
-
-    void EditorMeshComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        const bool mouseHovered = m_accentType == AzToolsFramework::EntityAccentType::Hover;
-
-        IEditor* editor = nullptr;
-        AzToolsFramework::EditorRequests::Bus::BroadcastResult(editor, &AzToolsFramework::EditorRequests::GetEditor);
-
-        const bool highlightGeometryOnMouseHover = editor->GetEditorSettings()->viewports.bHighlightMouseOverGeometry;
-        // if the mesh component is not visible, when selected we still draw the wireframe to indicate the shapes extent and position
-        const bool highlightGeometryWhenSelected = editor->GetEditorSettings()->viewports.bHighlightSelectedGeometry || !GetVisibility();
-
-        if ((!IsSelected() && mouseHovered && highlightGeometryOnMouseHover) || (IsSelected() && highlightGeometryWhenSelected))
-        {
-            AZ::Transform transform = AZ::Transform::CreateIdentity();
-            AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-
-            ColorB triangleColor, lineColor;
-            DecideColor(IsSelected(), mouseHovered, GetVisibility(), triangleColor, lineColor);
-
-            SGeometryDebugDrawInfo dd;
-            dd.tm = AZTransformToLYTransform(transform);
-            dd.bExtrude = true;
-            dd.color = triangleColor;
-            dd.lineColor = lineColor;
-
-            if (IStatObj* geometry = GetStatObj())
-            {
-                geometry->DebugDraw(dd);
-            }
-        }
-
-        if (cl_editorMeshIntersectionDebug)
-        {
-            debugDisplay.DrawArrow(m_debugPos, m_debugPos + (0.1f * m_debugNormal), 0.1f);
-            debugDisplay.DrawBall(m_debugPos, 0.03f);
-            debugDisplay.DrawWireBox(GetWorldBounds().GetMin(), GetWorldBounds().GetMax());
-        }
-    }
-
-    void EditorMeshComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        if (auto meshComponent = gameEntity->CreateComponent<MeshComponent>())
-        {
-            m_mesh.CopyPropertiesTo(meshComponent->m_meshRenderNode);
-            // ensure we do not copy across the edit time entity id
-            meshComponent->m_meshRenderNode.m_renderOptions.m_attachedToEntityId = AZ::EntityId();
-        }
-    }
-
-
-    IStatObj* EditorMeshComponent::GetStatObj()
-    {
-        return m_mesh.GetEntityStatObj();
-    }
-
-    bool EditorMeshComponent::GetVisibility()
-    {
-        return m_mesh.GetVisible();
-    }
-
-    void EditorMeshComponent::SetVisibility(bool visible)
-    {
-        m_mesh.SetVisible(visible);
-    }
-
-    void EditorMeshComponent::AffectNavmesh()
-    {
-        // Refresh the nav tile when the flag changes.
-        INavigationSystem* pNavigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (pNavigationSystem)
-        {
-            pNavigationSystem->WorldChanged(AZAabbToLyAABB(GetWorldBounds()));
-        }
-    }
-
-    AZStd::string_view staticViewportIcon = "Editor/Icons/Components/Viewport/StaticMesh.png";
-    AZStd::string_view dynamicViewportIcon = "Editor/Icons/Components/Viewport/DynamicMesh.png";
-    AZStd::string EditorMeshComponent::GetMeshViewportIconPath() const
-    {
-        if (m_mesh.m_renderOptions.IsStatic())
-        {
-            return staticViewportIcon;
-        }
-
-        return dynamicViewportIcon;
-    }
-
-    void EditorMeshComponent::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> /*asset*/)
-    {
-        using namespace AzFramework::RenderGeometry;
-        IntersectionNotificationBus::Event(m_contextId, &IntersectionNotifications::OnGeometryChanged, GetEntityId());
-    }
-
-    void EditorMeshComponent::OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& /*assetInfo*/)
-    {
-        if (m_mesh.m_meshAsset.GetId() != assetId)
-        {
-            return;
-        }
-        // If this editor mesh component is loaded and active in the level, it's referencing an asset that was just removed.
-        // Clearing this asset reference will help visualize this change. Note that this won't clear all references to this
-        // asset automatically, any levels that aren't loaded won't have the reference removed.
-
-        // Set the mesh asset to invalid on the main thread.
-        AZ::TickBus::QueueFunction([this, assetId]()
-        {
-            // Emit a warning so users know this has occurred, it may not be intentional because the asset was removed before
-            // the references were cleared. Do this on the main thread.
-            AZ_Warning("EditorMeshComponent", false, "asset with ID %s referenced by entity named '%s' with ID %s was removed, this reference will be cleared on the associated component.",
-                assetId.ToString<AZStd::string>().c_str(),
-                GetEntity() ? GetEntity()->GetName().c_str() : "Invalid entity",
-                GetEntityId().ToString().c_str());
-
-            m_mesh.DestroyMesh();
-            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
-                &AzToolsFramework::ToolsApplicationRequests::AddDirtyEntity,
-                GetEntityId());
-            AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(
-                &AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay,
-                AzToolsFramework::Refresh_AttributesAndValues);
-        });
-    }
-
-    AZ::Aabb EditorMeshComponent::GetEditorSelectionBoundsViewport(
-        const AzFramework::ViewportInfo& /*viewportInfo*/)
-    {
-        return GetWorldBounds();
-    }
-
-    bool EditorMeshComponent::EditorSelectionIntersectRayViewport(
-        const AzFramework::ViewportInfo& /*viewportInfo*/,
-        const AZ::Vector3& src, const AZ::Vector3& dir, float& distance)
-    {
-        if (IStatObj* geometry = GetStatObj())
-        {
-            AZ::Transform transform = AZ::Transform::CreateIdentity();
-            AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-            auto legacyTransform = AZTransformToLYTransform(transform);
-            const auto legacySrc = AZVec3ToLYVec3(src);
-            const auto legacyDir = AZVec3ToLYVec3(dir);
-
-            const Matrix34 inverseTM = legacyTransform.GetInverted();
-            const Vec3 raySrcLocal = inverseTM.TransformPoint(legacySrc);
-            const Vec3 rayDirLocal = inverseTM.TransformVector(legacyDir).GetNormalized();
-
-            SRayHitInfo hi;
-            hi.inReferencePoint = raySrcLocal;
-            hi.inRay = Ray(raySrcLocal, rayDirLocal);
-            if (geometry->RayIntersection(hi))
-            {
-                const Vec3 worldHitPos = legacyTransform.TransformPoint(hi.vHitPos);
-                distance = legacySrc.GetDistance(worldHitPos);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    void EditorMeshComponent::OnAccentTypeChanged(AzToolsFramework::EntityAccentType accent)
-    {
-        m_accentType = accent;
-    }
-
-    bool AddMeshComponentWithMesh(const AZ::EntityId& targetEntity, const AZ::Uuid& meshAssetId)
-    {
-        // Error handling for failures should be done at the call site, this function can be invoked from Python.
-        if (!targetEntity.IsValid())
-        {
-            return false;
-        }
-        AZ::ComponentTypeList componentsToAdd;
-        componentsToAdd.push_back(AZ::AzTypeInfo<LmbrCentral::EditorMeshComponent>::Uuid());
-
-        AZStd::vector<AZ::EntityId> entityList;
-        entityList.push_back(targetEntity);
-
-        AzToolsFramework::EntityCompositionRequests::AddComponentsOutcome outcome =
-            AZ::Failure(AZStd::string("Failed to call AddComponentsToEntities on EntityCompositionRequestBus"));
-        AzToolsFramework::EntityCompositionRequestBus::BroadcastResult(outcome, &AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, entityList, componentsToAdd);
-
-        if (!outcome.IsSuccess())
-        {
-            return false;
-        }
-
-        AZ::Data::AssetId meshAsset(meshAssetId);
-
-        // If necessary, the call site can verify if the mesh was actually set.
-        LmbrCentral::MeshComponentRequestBus::Event(
-            targetEntity,
-            &LmbrCentral::MeshComponentRequestBus::Events::SetMeshAsset,
-            meshAsset);
-        return true;
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorMeshComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorMeshComponent.h
deleted file mode 100644
index 7617673e3b..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorMeshComponent.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/TransformBus.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzFramework/Visibility/BoundsBus.h>
-
-#include <AzFramework/Render/GeometryIntersectionBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <LmbrCentral/Rendering/RenderBoundsBus.h>
-
-#include "MeshComponent.h"
-
-
-struct IPhysicalEntity;
-
-namespace LmbrCentral
-{
-    /**
-     * In-editor mesh component.
-     * Conducts some additional listening and operations to ensure immediate
-     * effects when changing fields in the editor.
-     */
-    class EditorMeshComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , public AZ::Data::AssetBus::Handler
-        , private AzFramework::AssetCatalogEventBus::Handler
-        , public AzFramework::BoundsRequestBus::Handler
-        , private AzFramework::RenderGeometry::IntersectionRequestBus::Handler
-        , private MeshComponentRequestBus::Handler
-        , private MaterialOwnerRequestBus::Handler
-        , private MeshComponentNotificationBus::Handler
-        , private RenderNodeRequestBus::Handler
-        , private AZ::TransformNotificationBus::Handler
-        , private AzToolsFramework::EntitySelectionEvents::Bus::Handler
-        , private AzToolsFramework::EditorVisibilityNotificationBus::Handler
-        , private AzFramework::EntityDebugDisplayEventBus::Handler
-        , private LegacyMeshComponentRequestBus::Handler
-        , private AzToolsFramework::EditorComponentSelectionRequestsBus::Handler
-        , private AzToolsFramework::EditorComponentSelectionNotificationsBus::Handler
-    {
-    public:
-        AZ_COMPONENT(EditorMeshComponent, "{FC315B86-3280-4D03-B4F0-5553D7D08432}", AzToolsFramework::Components::EditorComponentBase)
-
-        ~EditorMeshComponent() = default;
-
-        const float s_renderNodeRequestBusOrder = 100.f;
-
-        // AZ::Component overrides ...
-        void Activate() override;
-        void Deactivate() override;
-
-        // BoundsRequestBus and MeshComponentRequestBus overrides ...
-        AZ::Aabb GetWorldBounds() override;
-        AZ::Aabb GetLocalBounds() override;
-
-        // IntersectionRequestBus overrides ...
-        AzFramework::RenderGeometry::RayResult RenderGeometryIntersect(const AzFramework::RenderGeometry::RayRequest& ray) override;
-
-        // MeshComponentRequestBus overrides ...
-        void SetMeshAsset(const AZ::Data::AssetId& id) override;
-        AZ::Data::Asset<AZ::Data::AssetData> GetMeshAsset() override { return m_mesh.GetMeshAsset(); }
-        void SetVisibility(bool visible) override;
-        bool GetVisibility() override;
-
-        // MaterialOwnerRequestBus overrides ...
-        void SetMaterial(_smart_ptr<IMaterial>) override;
-        _smart_ptr<IMaterial> GetMaterial() override;
-
-        // MeshComponentNotificationBus overrides ...
-        void OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-        void OnMeshDestroyed() override;
-
-        // RenderNodeRequestBus overrides ...
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-
-        // TransformNotificationBus overrides ...
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-        void OnStaticChanged(bool isStatic) override;
-
-        // EditorVisibilityNotificationBus overrides ...
-        void OnEntityVisibilityChanged(bool visibility) override;
-
-        // AzFramework::EntityDebugDisplayEventBus overrides ....
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        //! Called when you want to change the game asset through code (like when creating components based on assets).
-        void SetPrimaryAsset(const AZ::Data::AssetId& assetId) override;
-
-        // LegacyMeshComponentRequests overrides ...
-        IStatObj* GetStatObj() override;
-
-        // EditorComponentBase overrides ...
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        // AZ::Data::AssetBus overrides ...
-        void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-
-        // AzFramework::AssetCatalogEventBus overrides ...
-        void OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo) override;
-
-        // EditorComponentSelectionRequestsBus overrides ...
-        AZ::Aabb GetEditorSelectionBoundsViewport(
-            const AzFramework::ViewportInfo& viewportInfo) override;
-        bool EditorSelectionIntersectRayViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            const AZ::Vector3& src, const AZ::Vector3& dir, float& distance) override;
-        bool SupportsEditorRayIntersect() override { return true; }
-
-        // EditorComponentSelectionNotificationsBus overrides ...
-        void OnAccentTypeChanged(AzToolsFramework::EntityAccentType accent) override;
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("MeshService", 0x71d8a455));
-            provided.push_back(AZ_CRC("LegacyMeshService", 0xb462a299));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-        }
-
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-        {
-            dependent.push_back(AZ_CRC("EditorVisibilityService", 0x90888caf));
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("MeshService", 0x71d8a455));
-            incompatible.push_back(AZ_CRC("LegacyMeshService", 0xb462a299));
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-
-    protected:
-
-        // Decides if this mesh affects the navmesh or not.
-        void AffectNavmesh();
-
-        AZStd::string GetMeshViewportIconPath() const;
-
-        AzToolsFramework::EntityAccentType m_accentType = AzToolsFramework::EntityAccentType::None; ///< State of the entity selection in the viewport.
-        MeshComponentRenderNode m_mesh; ///< IRender node implementation.
-
-        AzFramework::EntityContextId m_contextId;
-        AZ::Vector3 m_debugPos = AZ::Vector3(0);
-        AZ::Vector3 m_debugNormal = AZ::Vector3(0);
-    };
-
-    // Helper function useful for automation.
-    bool AddMeshComponentWithMesh(const AZ::EntityId& targetEntity, const AZ::Uuid& meshAssetId);
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorPointLightComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorPointLightComponent.cpp
deleted file mode 100644
index cf3baf59ae..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorPointLightComponent.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include "EditorPointLightComponent.h"
-
-namespace LmbrCentral
-{
-    void EditorPointLightComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorPointLightComponent, EditorLightComponent>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorPointLightComponent>(
-                    "Point Light", "The Point Light component allows an entity to create a point of light")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PointLight.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/PointLight.png")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-point-light.html")
-                        ->Attribute(AZ::Edit::Attributes::ExportIfAllPlatformTags, AZStd::vector<AZ::Crc32>{AZ_CRC("renderer", 0xf199a19c)}) // Only export on platforms that render
-                        ->Attribute(AZ::Edit::Attributes::RuntimeExportCallback, &EditorLightComponent::ExportLightComponent)
-                    ;
-            }
-        }
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->Class<EditorPointLightComponent>()->RequestBus("EditorPointLightComponentBus");
-        }
-    }
-
-    void EditorPointLightComponent::Init()
-    {
-        SetLightType(EditorLightConfiguration::LightType::Point);
-        EditorLightComponent::Init();
-    }
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorPointLightComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorPointLightComponent.h
deleted file mode 100644
index 4438c6f2f1..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorPointLightComponent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include "EditorLightComponent.h"
-
-namespace LmbrCentral
-{
-    /*!
-     * In-editor point light component.
-     * Handles previewing and activating lights in the editor.
-     */
-    class EditorPointLightComponent
-        : public EditorLightComponent
-    {
-    public:
-        AZ_COMPONENT(EditorPointLightComponent, "{00818135-138D-42AD-8657-FF3FD38D9E7A}", AzToolsFramework::Components::EditorComponentBase);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void Init() override;
-
-    protected:
-        const char* GetLightTypeText() const override
-        {
-            return "Point Light";
-        }
-    };
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorProjectorLightComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorProjectorLightComponent.cpp
deleted file mode 100644
index 7ad85bb4be..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorProjectorLightComponent.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-#include "EditorProjectorLightComponent.h"
-
-namespace LmbrCentral
-{
-    void EditorProjectorLightComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<EditorProjectorLightComponent, EditorLightComponent>()->
-                Version(1);
-
-            AZ::EditContext* editContext = serializeContext->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<EditorProjectorLightComponent>(
-                    "Projector Light", "The Projector Light component allows an entity to project a light")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ProjectorLight.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ProjectorLight.png")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-projector-light.html")
-                        ->Attribute(AZ::Edit::Attributes::ExportIfAllPlatformTags, AZStd::vector<AZ::Crc32>{AZ_CRC("renderer", 0xf199a19c)}) // Only export on platforms that render
-                        ->Attribute(AZ::Edit::Attributes::RuntimeExportCallback, &EditorLightComponent::ExportLightComponent)
-                    ;
-            }
-        }
-
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->Class<EditorProjectorLightComponent>()->RequestBus("EditorProjectorLightComponentBus");
-        }
-    }
-
-    void EditorProjectorLightComponent::Init()
-    {
-        SetLightType(EditorLightConfiguration::LightType::Projector);
-        EditorLightComponent::Init();
-    }
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorProjectorLightComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorProjectorLightComponent.h
deleted file mode 100644
index 5526c5917e..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/EditorProjectorLightComponent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include "EditorLightComponent.h"
-
-namespace LmbrCentral
-{
-    /*!
-     * In-editor point light component.
-     * Handles previewing and activating lights in the editor.
-     */
-    class EditorProjectorLightComponent
-        : public EditorLightComponent
-    {
-    public:
-        AZ_COMPONENT(EditorProjectorLightComponent, "{41928E34-B558-4559-82CF-8B5795A38CB4}", EditorLightComponent);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void Init() override;
-
-    protected:
-        const char* GetLightTypeText() const override
-        {
-            return "Projector Light";
-        }
-    };
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/GeomCacheComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/GeomCacheComponent.cpp
deleted file mode 100644
index 8739030a56..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/GeomCacheComponent.cpp
+++ /dev/null
@@ -1,817 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include "GeomCacheComponent.h"
-
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Asset/AssetManagerBus.h>
-
-#include "MathConversion.h"
-
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-
-namespace LmbrCentral
-{
-    //BehaviorContext GeometryCacheComponentNotificationBus Forwarder
-    class BehaviorGeometryCacheComponentNotificationBusHandler
-        : public GeometryCacheComponentNotificationBus::Handler
-        , public AZ::BehaviorEBusHandler
-    {
-    public:
-        AZ_EBUS_BEHAVIOR_BINDER(BehaviorGeometryCacheComponentNotificationBusHandler, "{8E0B4617-DD82-47D8-AA2F-3DF3E6677B4B}", AZ::SystemAllocator,
-            OnPlaybackStart,
-            OnPlaybackPause,
-            OnPlaybackStop,
-            OnStandinChanged);
-
-        void OnPlaybackStart() override
-        {
-            Call(FN_OnPlaybackStart);
-        }
-
-        void OnPlaybackPause() override
-        {
-            Call(FN_OnPlaybackPause);
-        }
-
-        void OnPlaybackStop() override
-        {
-            Call(FN_OnPlaybackStop);
-        }
-
-        void OnStandinChanged(StandinType standinType) override
-        {
-            Call(FN_OnStandinChanged, standinType);
-        }
-    };
-
-    void GeometryCacheCommon::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<GeometryCacheCommon>()
-                ->Version(1)
-                ->Field("Visible", &GeometryCacheCommon::m_visible)
-                ->Field("MinSpec", &GeometryCacheCommon::m_minSpec)
-                ->Field("GeomCacheAsset", &GeometryCacheCommon::m_geomCacheAsset)
-                ->Field("MaterialOverrideAsset", &GeometryCacheCommon::m_materialOverrideAsset)
-                ->Field("Loop", &GeometryCacheCommon::m_loop)
-                ->Field("PlayOnStart", &GeometryCacheCommon::m_playOnStart)
-                ->Field("StartTime", &GeometryCacheCommon::m_startTime)
-                ->Field("StreamInDistance", &GeometryCacheCommon::m_streamInDistance)
-                ->Field("FirstFrameStandin", &GeometryCacheCommon::m_firstFrameStandin)
-                ->Field("LastFrameStandin", &GeometryCacheCommon::m_lastFrameStandin)
-                ->Field("Standin", &GeometryCacheCommon::m_standin)
-                ->Field("StandinDistance", &GeometryCacheCommon::m_standinDistance)
-                ->Field("MaxViewDistance", &GeometryCacheCommon::m_maxViewDistance)
-                ->Field("ViewDistanceMultiplier", &GeometryCacheCommon::m_viewDistanceMultiplier)
-                ->Field("LODDistanceRatio", &GeometryCacheCommon::m_lodDistanceRatio)
-                ->Field("CastShadows", &GeometryCacheCommon::m_castShadows)
-                ->Field("UseVisArea", &GeometryCacheCommon::m_useVisAreas)
-                ;
-        }
-
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<GeometryCacheComponentRequestBus>("GeometryCacheComponentRequestBus")
-                ->Event("Play", &GeometryCacheComponentRequestBus::Events::Play)
-                ->Event("Pause", &GeometryCacheComponentRequestBus::Events::Pause)
-                ->Event("Stop", &GeometryCacheComponentRequestBus::Events::Stop)
-
-                ->Event("GetTimeRemaining", &GeometryCacheComponentRequestBus::Events::GetTimeRemaining)
-
-                ->Event("SetVisible", &GeometryCacheComponentRequestBus::Events::SetVisible)
-                ->Event("GetVisible", &GeometryCacheComponentRequestBus::Events::GetVisible)
-                ->VirtualProperty("Visible", "GetVisible", "SetVisible")
-
-                ->Event("SetLoop", &GeometryCacheComponentRequestBus::Events::SetLoop)
-                ->Event("GetLoop", &GeometryCacheComponentRequestBus::Events::GetLoop)
-                ->VirtualProperty("Loop", "GetLoop", "SetLoop")
-
-                ->Event("SetStartTime", &GeometryCacheComponentRequestBus::Events::SetStartTime)
-                ->Event("GetStartTime", &GeometryCacheComponentRequestBus::Events::GetStartTime)
-                ->VirtualProperty("StartTime", "GetStartTime", "SetStartTime")
-
-                ->Event("SetFirstFrameStandIn", &GeometryCacheComponentRequestBus::Events::SetFirstFrameStandIn)
-                ->Event("GetFirstFrameStandIn", &GeometryCacheComponentRequestBus::Events::GetFirstFrameStandIn)
-                ->VirtualProperty("FirstFrameStandIn", "GetFirstFrameStandIn", "SetFirstFrameStandIn")
-
-                ->Event("SetLastFrameStandIn", &GeometryCacheComponentRequestBus::Events::SetLastFrameStandIn)
-                ->Event("GetLastFrameStandIn", &GeometryCacheComponentRequestBus::Events::GetLastFrameStandIn)
-                ->VirtualProperty("LastFrameStandIn", "GetLastFrameStandIn", "SetLastFrameStandIn")
-
-                ->Event("SetStandIn", &GeometryCacheComponentRequestBus::Events::SetStandIn)
-                ->Event("GetStandIn", &GeometryCacheComponentRequestBus::Events::GetStandIn)
-                ->VirtualProperty("StandIn", "GetStandIn", "SetStandIn")
-
-                ->Event("SetStandInDistance", &GeometryCacheComponentRequestBus::Events::SetStandInDistance)
-                ->Event("GetStandInDistance", &GeometryCacheComponentRequestBus::Events::GetStandInDistance)
-                ->VirtualProperty("StandInDistance", "GetStandInDistance", "SetStandInDistance")
-
-                ->Event("SetStreamInDistance", &GeometryCacheComponentRequestBus::Events::SetStreamInDistance)
-                ->Event("GetStreamInDistance", &GeometryCacheComponentRequestBus::Events::GetStreamInDistance)
-                ->VirtualProperty("StreamInDistance", "GetStreamInDistance", "SetStreamInDistance")
-
-                ;
-
-            behaviorContext->EBus<GeometryCacheComponentNotificationBus>("GeometryCacheComponentNotificationBus")
-                ->Handler<BehaviorGeometryCacheComponentNotificationBusHandler>()
-                ;
-
-            behaviorContext->Class<GeometryCacheComponent>()
-                ->RequestBus("GeometryCacheComponentRequestBus")
-                ->NotificationBus("GeometryCacheComponentNotificationBus")
-                ;
-        }
-    }
-
-    GeometryCacheCommon::~GeometryCacheCommon()
-    {
-        if (m_geomCacheRenderNode)
-        {
-            delete m_geomCacheRenderNode;
-            m_geomCacheRenderNode = nullptr;
-        }
-    }
-
-    void GeometryCacheCommon::Init(const AZ::EntityId& entityId)
-    {
-        m_entityId = entityId;
-
-        if (gEnv && gEnv->p3DEngine && !m_geomCacheRenderNode)
-        {
-            m_geomCacheRenderNode = static_cast<IGeomCacheRenderNode*>(gEnv->p3DEngine->CreateRenderNode(eERType_GeomCache));
-        }
-    }
-
-    void GeometryCacheCommon::Activate()
-    {    
-        m_isRegisteredWithRenderer = false;
-
-        m_currentTime = m_startTime; //We default to m_startTime here instead of 0.0 so that animations actually start at m_startTime
-        
-        //If there is no set asset use the defaultgeomcache asset that is expected to exist in EngineAssets
-        if (!m_geomCacheAsset.GetId().IsValid())
-        {
-            AZ::Data::AssetId defaultGeomCacheAssetId;
-            const char* defaultGeomCacheAssetName = "engineassets/geomcaches/defaultgeomcache.cax";
-            AZ::Data::AssetCatalogRequestBus::BroadcastResult(defaultGeomCacheAssetId, &AZ::Data::AssetCatalogRequests::GetAssetIdByPath, defaultGeomCacheAssetName, AZ::Data::s_invalidAssetType, false);
-
-            if (defaultGeomCacheAssetId.IsValid())
-            {
-                m_geomCacheAsset.Create(defaultGeomCacheAssetId);
-            }
-            else
-            {
-                AZ_Warning("GeometryCache", false, "Default Geometry Cache was not found");
-            }
-        }
-        
-        CreateGeomCache();
-
-        //Hide all referenced entities by default
-        //If a standin *should* be shown that will be determined on the first tick
-        HideAllStandins();
-        m_currentStandinType = StandinType::None;
-        ShowCurrentStandin();   
-
-        GeometryCacheComponentRequestBus::Handler::BusConnect(m_entityId);
-        AZ::TransformNotificationBus::Handler::BusConnect(m_entityId);
-        AZ::TickBus::Handler::BusConnect();
-        MaterialOwnerRequestBus::Handler::BusConnect(m_entityId);
-
-        //Get initial transform and update the render node with it
-        AZ::Transform world = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(world, m_entityId, &AZ::TransformBus::Events::GetWorldTM);
-
-        OnTransformChanged(AZ::Transform::CreateIdentity(), world);
-
-        m_playing = false;
-        if (m_playOnStart)
-        {
-            Play();
-        }
-    }
-
-    void GeometryCacheCommon::Deactivate()
-    {
-        HideAllStandins();
-
-        GeometryCacheComponentRequestBus::Handler::BusDisconnect(m_entityId);
-        AZ::TransformNotificationBus::Handler::BusDisconnect(m_entityId);
-        AZ::TickBus::Handler::BusDisconnect();
-        MaterialOwnerRequestBus::Handler::BusDisconnect(m_entityId);
-
-        DestroyGeomCache();
-    }
-
-    void GeometryCacheCommon::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_currentWorldPos = world.GetTranslation();
-
-        if (m_geomCacheRenderNode)
-        {
-            Matrix34 cryMat = AZTransformToLYTransform(world);
-            m_geomCacheRenderNode->SetMatrix(cryMat);
-
-            //Re-register to update position
-            RegisterRenderNode();
-        }
-    }
-
-    void GeometryCacheCommon::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
-    {
-        if (m_geomCacheRenderNode && m_playing)
-        {
-            float playbackTime = m_currentTime;
-
-            m_currentTime += deltaTime;
-            playbackTime = m_currentTime;
-
-            m_geomCacheRenderNode->SetPlaybackTime(playbackTime);
-        }
-
-        //Don't care about handling stand-in visibility if the whole
-        //GeomCache shouldn't be visible
-        if (m_hidden)
-        {
-            return;
-        }
-
-        bool standinInUse = false;
-
-        //Distance based stand-in
-        //This has the highest priority
-        const Vec3 cameraPos = gEnv->p3DEngine->GetRenderingCamera().GetPosition();
-        float distance = (LYVec3ToAZVec3(cameraPos) - m_currentWorldPos).GetLength();
-        if (distance > m_standinDistance)
-        {
-            standinInUse = true;
-
-            if (m_standin.IsValid() && m_currentStandinType != StandinType::Distance)
-            {
-                HideCurrentStandin();
-                m_currentStandinType = StandinType::Distance;
-                ShowCurrentStandin();
-            }
-        }
-        else
-        {
-            //Stand-in for first frame
-            if (m_currentTime == m_startTime)
-            {
-                standinInUse = true;
-
-                if (m_firstFrameStandin.IsValid() && m_currentStandinType != StandinType::FirstFrame)
-                {
-                    HideCurrentStandin();
-                    m_currentStandinType = StandinType::FirstFrame;
-                    ShowCurrentStandin();
-                }
-            }
-            //Stand-in for last frame
-            else if (!m_loop && m_geomCache && m_currentTime >= m_geomCache->GetDuration())
-            {
-                standinInUse = true;
-
-                if (m_lastFrameStandin.IsValid() && m_currentStandinType != StandinType::LastFrame)
-                {
-                    HideCurrentStandin();
-                    m_currentStandinType = StandinType::LastFrame;
-                    ShowCurrentStandin();
-                }
-            }
-        }
-
-        //If none of the other stand-ins are being rendered, remove any existing ones
-        //and go back to just rendering the geom cache
-        if (!standinInUse && m_currentStandinType != StandinType::None)
-        {
-            HideCurrentStandin();
-            m_currentStandinType = StandinType::None;
-            ShowCurrentStandin();
-        }
-    }
-
-    void GeometryCacheCommon::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        if (asset == m_geomCacheAsset)
-        {
-            m_geomCacheAsset = asset;
-            m_geomCache = m_geomCacheAsset.Get()->m_geomCache;
-
-            if (m_geomCache != nullptr)
-            {
-                m_geomCacheRenderNode->SetGeomCache(m_geomCache);
-
-                //Allow this geom cache to clean up after we've properly set it on the render node
-                m_geomCache->SetProcessedByRenderNode(true);
-
-                if (m_materialOverride)
-                {
-                    m_geomCacheRenderNode->SetMaterial(m_materialOverride);
-                }
-
-                if (gEnv && gEnv->p3DEngine)
-                {
-                    gEnv->p3DEngine->RegisterEntity(m_geomCacheRenderNode);
-                    m_isRegisteredWithRenderer = true;
-                }
-
-                //Apply latest transform to the render node
-                AZ::Transform world = AZ::Transform::CreateIdentity();
-                AZ::TransformBus::EventResult(world, m_entityId, &AZ::TransformBus::Events::GetWorldTM);
-
-                OnTransformChanged(AZ::Transform::CreateIdentity(), world);
-            }
-        }
-    }
-
-    void GeometryCacheCommon::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        if (asset == m_geomCacheAsset)
-        {
-            // We need to make sure m_geomCacheAsset is assigned with the new asset.
-            // Since the new asset passed in has zero refCount. The assigning will clear the refCount of the old m_geomCacheAsset
-            // and set the refCount of the new asset to 1, otherwise it will be unloaded.
-            m_geomCacheAsset = asset;
-            m_geomCache = m_geomCacheAsset.Get()->m_geomCache;
-        }
-    }
-
-    void GeometryCacheCommon::SetMaterial(_smart_ptr<IMaterial> material)
-    {
-        m_materialOverride = material;
-        
-        if (material)
-        {
-            m_materialOverrideAsset.SetAssetPath(material->GetName());
-        }
-        else
-        {
-            m_materialOverrideAsset.SetAssetPath("");
-        }
-
-        DestroyGeomCache();
-        CreateGeomCache();
-    }
-
-    _smart_ptr<IMaterial> GeometryCacheCommon::GetMaterial()
-    {
-        if (m_materialOverride)
-        {
-            return m_materialOverride;
-        }
-
-        if (m_geomCache == nullptr)
-        {
-            return nullptr;
-        }
-
-        return m_geomCache->GetMaterial();
-    }
-
-    void GeometryCacheCommon::Play()
-    {
-        if (!m_playing)
-        {
-            m_playing = true;
-            GeometryCacheComponentNotificationBus::Broadcast(&GeometryCacheComponentNotificationBus::Events::OnPlaybackStart);
-        }
-    }
-
-    void GeometryCacheCommon::Pause()
-    {
-        if (m_playing)
-        {
-            m_playing = false;
-            GeometryCacheComponentNotificationBus::Broadcast(&GeometryCacheComponentNotificationBus::Events::OnPlaybackPause);
-        }
-    }
-
-    void GeometryCacheCommon::Stop()
-    {
-        if (m_playing)
-        {
-            m_playing = false;
-            m_currentTime = 0;
-            if (m_geomCacheRenderNode)
-            {
-                m_geomCacheRenderNode->StopStreaming();
-            }
-            GeometryCacheComponentNotificationBus::Broadcast(&GeometryCacheComponentNotificationBus::Events::OnPlaybackStop);
-        }
-    }
-
-    float GeometryCacheCommon::GetTimeRemaining()
-    {
-        if (m_playing)
-        {
-            return m_geomCache->GetDuration() - m_currentTime;
-        }
-        else
-        {
-            return -1.0f;
-        }
-    }
-
-    void GeometryCacheCommon::SetGeomCacheAsset(const AZ::Data::AssetId& id)
-    {
-        DestroyGeomCache();
-        m_geomCacheAsset.Create(id);
-        CreateGeomCache();
-    }
-
-    void GeometryCacheCommon::SetVisible(bool visible)
-    {
-        m_visible = visible;
-        OnRenderOptionsChanged();
-    }
-
-    void GeometryCacheCommon::SetLoop(bool loop)
-    {
-        m_loop = loop;
-        OnLoopChanged();
-    }
-
-    void GeometryCacheCommon::SetStartTime(float startTime)
-    {
-        m_startTime = startTime;
-        OnStartTimeChanged();
-    }
-
-    void GeometryCacheCommon::SetFirstFrameStandIn(AZ::EntityId entityId)
-    {
-        if (!entityId.IsValid())
-        {
-            return;
-        }
-
-        if (m_currentStandinType == StandinType::FirstFrame)
-        {
-            HideCurrentStandin();
-        }
-
-        m_firstFrameStandin = entityId;
-
-        if (m_currentStandinType == StandinType::FirstFrame)
-        {
-            ShowCurrentStandin();
-        }
-    }
-
-    void GeometryCacheCommon::SetLastFrameStandIn(AZ::EntityId entityId)
-    {
-        if (!entityId.IsValid())
-        {
-            return;
-        }
-
-        if (m_currentStandinType == StandinType::LastFrame)
-        {
-            HideCurrentStandin();
-        }
-
-        m_lastFrameStandin = entityId;
-
-        if (m_currentStandinType == StandinType::LastFrame)
-        {
-            ShowCurrentStandin();
-        }
-    }
-
-    void GeometryCacheCommon::SetStandIn(AZ::EntityId entityId)
-    {
-        if (!entityId.IsValid())
-        {
-            return;
-        }
-
-        if (m_currentStandinType == StandinType::Distance)
-        {
-            HideCurrentStandin();
-        }
-
-        m_standin = entityId;
-
-        if (m_currentStandinType == StandinType::Distance)
-        {
-            ShowCurrentStandin();
-        }
-    }
-
-    void GeometryCacheCommon::SetStandInDistance(float standInDistance)
-    {
-        m_standinDistance = standInDistance;
-    }
-
-    void GeometryCacheCommon::SetStreamInDistance(float streamInDistance)
-    {
-        m_streamInDistance = streamInDistance;
-        OnStreamInDistanceChanged();
-    }
-
-    void GeometryCacheCommon::OnRenderOptionsChanged()
-    {
-        AZ::u32 rendFlags = 0;
-
-        //We want to hide the GeomCache if we're rendering a stand-in
-        if (m_renderingStandin)
-        {
-            rendFlags |= ERF_HIDDEN;
-        }
-        //But if the GeomCache is marked as invisible (or the min spec is too high), neither 
-        //the GeomCache or any stand-ins should render
-        const int configSpec = gEnv->pSystem->GetConfigSpec(true);
-
-        m_hidden = !m_visible || (static_cast<AZ::u32>(configSpec) < static_cast<AZ::u32>(m_minSpec));
-        if (m_hidden)
-        {
-            rendFlags |= ERF_HIDDEN;
-            HideAllStandins();
-        }
-
-        if (!m_useVisAreas)
-        {
-            rendFlags |= ERF_OUTDOORONLY;
-        }
-
-        if (m_castShadows)
-        {
-            rendFlags |= ERF_HAS_CASTSHADOWMAPS;
-            rendFlags |= ERF_CASTSHADOWMAPS;
-        }
-
-        rendFlags |= ERF_COMPONENT_ENTITY;
-        m_geomCacheRenderNode->SetRndFlags(rendFlags);
-
-        //Re-register to update flags
-        RegisterRenderNode();
-    }
-
-    void GeometryCacheCommon::OnGeomCacheAssetChanged()
-    {
-        DestroyGeomCache();
-        CreateGeomCache();
-    }
-
-    void GeometryCacheCommon::OnMaterialOverrideChanged()
-    {
-        LoadMaterialOverride();
-        if (m_materialOverride)
-        {
-            m_geomCacheRenderNode->SetMaterial(m_materialOverride);
-        }
-
-        //On Activate this will be false and that's expected.
-        //However when the asset actually loads, the material should be applied.
-        //This is just for whenever the material override *changes*
-        //but not necessarily for material application on startup.
-        RegisterRenderNode();
-    }
-
-    void GeometryCacheCommon::OnStartTimeChanged()
-    {
-        if (m_geomCache)
-        {
-            if (m_startTime > m_geomCache->GetDuration())
-            {
-                m_startTime = m_geomCache->GetDuration();
-            }
-        }
-
-        //If the start time has changed, restart the animation
-        m_currentTime = m_startTime;
-    }
-
-    void GeometryCacheCommon::OnLoopChanged()
-    {
-        m_geomCacheRenderNode->SetLooping(m_loop);
-    }
-
-    void GeometryCacheCommon::OnMaxViewDistanceChanged()
-    {
-        m_geomCacheRenderNode->SetBaseMaxViewDistance(m_maxViewDistance);
-
-        RegisterRenderNode();
-    }
-
-    void GeometryCacheCommon::OnViewDistanceMultiplierChanged()
-    {
-        m_geomCacheRenderNode->SetViewDistanceMultiplier(m_viewDistanceMultiplier);
-
-        RegisterRenderNode();
-    }
-
-    void GeometryCacheCommon::OnLODDistanceRatioChanged()
-    {
-        m_geomCacheRenderNode->SetLodRatio(m_lodDistanceRatio);
-
-        RegisterRenderNode();
-    }
-
-    void GeometryCacheCommon::OnStreamInDistanceChanged()
-    {
-        m_geomCacheRenderNode->SetStreamInDistance(m_streamInDistance);
-    }
-
-    void GeometryCacheCommon::LoadMaterialOverride()
-    {
-        const AZStd::string& materialOverridePath = m_materialOverrideAsset.GetAssetPath();
-        if (!materialOverridePath.empty())
-        {
-            m_materialOverride = gEnv->p3DEngine->GetMaterialManager()->LoadMaterial(materialOverridePath.c_str());
-
-            AZ_Warning("GeomCacheComponent", m_materialOverride != gEnv->p3DEngine->GetMaterialManager()->GetDefaultMaterial(),
-                "Failed to load override material \"%s\".",
-                materialOverridePath.c_str());
-        }
-        else
-        {
-            m_materialOverride = nullptr;
-        }
-    }
-
-    void GeometryCacheCommon::RegisterRenderNode()
-    {
-        if(m_isRegisteredWithRenderer && gEnv && gEnv->p3DEngine)
-        {
-            gEnv->p3DEngine->RegisterEntity(m_geomCacheRenderNode);
-        }
-    }
-
-    void GeometryCacheCommon::CreateGeomCache()
-    {
-        if (gEnv && gEnv->p3DEngine && !m_geomCacheRenderNode)
-        {
-            m_geomCacheRenderNode = static_cast<IGeomCacheRenderNode*>(gEnv->p3DEngine->CreateRenderNode(eERType_GeomCache));
-        }
-
-        if (m_geomCacheAsset.GetId().IsValid())
-        {
-            if (!AZ::Data::AssetBus::Handler::BusIsConnected())
-            {
-                AZ::Data::AssetBus::Handler::BusConnect(m_geomCacheAsset.GetId());
-            }
-
-            m_geomCacheAsset.QueueLoad();
-        }
-
-        //Apply starting params to the render node
-        ApplyAllRenderNodeParams();
-    }
-
-    void GeometryCacheCommon::DestroyGeomCache()
-    {
-        if (m_isRegisteredWithRenderer && m_geomCacheRenderNode)
-        {
-            m_geomCacheRenderNode->StopStreaming();
-            m_isRegisteredWithRenderer = false;
-
-            gEnv->p3DEngine->FreeRenderNodeState(m_geomCacheRenderNode);
-        }
-
-        m_geomCache = nullptr;
-        m_materialOverride = nullptr;
-
-        m_geomCacheAsset.Release();
-
-        AZ::Data::AssetBus::Handler::BusDisconnect();
-    }
-
-    void GeometryCacheCommon::ApplyAllRenderNodeParams()
-    {
-        OnRenderOptionsChanged();
-        OnMaterialOverrideChanged();
-        OnLoopChanged();
-        OnMaxViewDistanceChanged();
-        OnViewDistanceMultiplierChanged();
-        OnLODDistanceRatioChanged();
-        OnStreamInDistanceChanged();
-    }
-
-    void GeometryCacheCommon::ShowCurrentStandin()
-    {
-        switch (m_currentStandinType)
-        {
-        case StandinType::FirstFrame:
-        {
-            MeshComponentRequestBus::Event(m_firstFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, true);
-            break;
-        }
-        case StandinType::LastFrame:
-        {
-            MeshComponentRequestBus::Event(m_lastFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, true);
-            break;
-        }
-        case StandinType::Distance:
-        {
-            MeshComponentRequestBus::Event(m_standin, &MeshComponentRequestBus::Events::SetVisibility, true);
-            break;
-        }
-        case StandinType::None:
-        {
-            //Show the geom cache by removing the ERF_HIDDEN flag
-            m_renderingStandin = false;
-            OnRenderOptionsChanged();
-            break;
-        }
-        }
-
-        GeometryCacheComponentNotificationBus::Broadcast(&GeometryCacheComponentNotificationBus::Events::OnStandinChanged, m_currentStandinType);
-    }
-
-    void GeometryCacheCommon::HideCurrentStandin()
-    {
-        switch (m_currentStandinType)
-        {
-        case StandinType::FirstFrame:
-        {
-            MeshComponentRequestBus::Event(m_firstFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, false);
-            break;
-        }
-        case StandinType::LastFrame:
-        {
-            MeshComponentRequestBus::Event(m_lastFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, false);
-            break;
-        }
-        case StandinType::Distance:
-        {
-            MeshComponentRequestBus::Event(m_standin, &MeshComponentRequestBus::Events::SetVisibility, false);
-            break;
-        }
-        case StandinType::None:
-        {
-            //Hide the geom cache by adding the ERF_HIDDEN flag
-            m_renderingStandin = true;
-            OnRenderOptionsChanged();
-            break;
-        }
-        }
-    }
-
-    void GeometryCacheCommon::HideAllStandins()
-    {
-        if (m_firstFrameStandin.IsValid())
-        {
-            MeshComponentRequestBus::Event(m_firstFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, false);
-        }
-        if (m_lastFrameStandin.IsValid())
-        {
-            MeshComponentRequestBus::Event(m_lastFrameStandin, &MeshComponentRequestBus::Events::SetVisibility, false);
-        }
-        if (m_standin.IsValid())
-        {
-            MeshComponentRequestBus::Event(m_standin, &MeshComponentRequestBus::Events::SetVisibility, false);
-        }
-    }
-
-    void GeometryCacheComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides)
-    {
-        provides.push_back(AZ_CRC("GeomCacheService", 0x3d2bc48c));
-    }
-
-    void GeometryCacheComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires)
-    {
-        requires.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-    }
-
-    void GeometryCacheComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<GeometryCacheComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("Common", &GeometryCacheComponent::m_common)
-                ;
-        }
-
-        GeometryCacheCommon::Reflect(context);
-    }
-
-    void GeometryCacheComponent::Init()
-    {
-        m_common.Init(GetEntityId());
-    }
-
-    void GeometryCacheComponent::Activate()
-    {
-        m_common.Activate();
-    }
-
-    void GeometryCacheComponent::Deactivate()
-    {
-        m_common.Deactivate();
-    }
-} //namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/GeomCacheComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/GeomCacheComponent.h
deleted file mode 100644
index 3f011c6e62..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/GeomCacheComponent.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Component/TickBus.h>
-
-#include <AzCore/Slice/SliceAsset.h>
-
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Math/Vector3.h>
-
-#include <LmbrCentral/Rendering/MeshAsset.h>
-#include <LmbrCentral/Rendering/MaterialAsset.h>
-#include <LmbrCentral/Rendering/MaterialOwnerBus.h>
-
-#include <LmbrCentral/Rendering/GeomCacheComponentBus.h>
-
-#include <LmbrCentral/Scripting/SpawnerComponentBus.h>
-
-#include <IEntityRenderState.h>
-
-namespace LmbrCentral
-{
-    enum class StandinType : AZ::u32
-    {
-        None,
-        FirstFrame,
-        LastFrame,
-        Distance
-    };
-
-    /**
-     * A Common structure for the GeometryCache and EditorGeometryCache.
-     *
-     * This is where most of the GeometryCache logic lives and it's made
-     * available to the GeometryCacheComponent and the EditorGeometryCacheComponent.
-     */
-    class GeometryCacheCommon
-        : public AZ::TransformNotificationBus::Handler
-        , public AZ::Data::AssetBus::Handler
-        , public AZ::TickBus::Handler
-        , public MaterialOwnerRequestBus::Handler
-        , public GeometryCacheComponentRequestBus::Handler
-    {
-        friend class EditorGeometryCacheCommon; //So that we can reflect private members
-
-    public:
-        AZ_TYPE_INFO(GeometryCacheCommon, "{4534C4C4-50CC-4256-83F0-85B0274A5E26}");
-        AZ_CLASS_ALLOCATOR(GeometryCacheCommon, AZ::SystemAllocator, 0);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        virtual ~GeometryCacheCommon();
-
-        //Startup helpers
-        void Init(const AZ::EntityId& entityId);
-        virtual void Activate();
-        virtual void Deactivate();
-
-        // AZ::TransformNotificationBus interface implementation
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // AZ::TickBus
-        void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-
-        // AZ::Data::AssetBus
-        void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-
-        // MaterialOwnerRequestBus
-        void SetMaterial(_smart_ptr<IMaterial> material) override;
-        _smart_ptr<IMaterial> GetMaterial() override;
-
-        // GeometryCacheComponentRequestBus
-        void Play() override;
-        void Pause() override;
-        void Stop() override;
-
-        float GetTimeRemaining() override;
-
-        StandinType GetCurrentStandinType() override { return m_currentStandinType; }
-
-        void SetGeomCacheAsset(const AZ::Data::AssetId& id);
-        AZ::Data::Asset<AZ::Data::AssetData> GetGeomCacheAsset() { return m_geomCacheAsset; }
-
-        void SetVisible(bool visible) override;
-        bool GetVisible() override { return m_visible; }
-
-        void SetLoop(bool loop) override;
-        bool GetLoop() override { return m_loop; }
-
-        void SetStartTime(float startTime) override;
-        float GetStartTime() override { return m_startTime; }
-
-        void SetFirstFrameStandIn(AZ::EntityId entityId) override;
-        AZ::EntityId GetFirstFrameStandIn() override { return m_firstFrameStandin; }
-
-        void SetLastFrameStandIn(AZ::EntityId entityId) override;
-        AZ::EntityId GetLastFrameStandIn() override { return m_lastFrameStandin; }
-
-        void SetStandIn(AZ::EntityId entityId) override;
-        AZ::EntityId GetStandIn() override { return m_standin; }
-
-        void SetStandInDistance(float standInDistance) override;
-        float GetStandInDistance() override { return m_standinDistance; }
-
-        void SetStreamInDistance(float streamInDistance) override;
-        float GetStreamInDistance() override { return m_streamInDistance; }
-
-        IGeomCacheRenderNode* GetGeomCacheRenderNode() override { return m_geomCacheRenderNode; }
-
-        void ClearGeomCacheRenderNode() { m_geomCacheRenderNode = nullptr; }
-
-    protected:
-        //Reflected Members
-        bool m_visible = true;
-        bool m_loop = false;
-        bool m_playOnStart = false;
-        bool m_castShadows = true;
-        bool m_useVisAreas = true;
-        float m_startTime = 0.0f;
-        EngineSpec m_minSpec = EngineSpec::Low;
-        float m_standinDistance = 100.0f;
-        float m_streamInDistance = 150.0f;
-        float m_maxViewDistance = 8000.0f;
-        float m_viewDistanceMultiplier = 1.0f;
-        AZ::u32 m_lodDistanceRatio = 100;
-        AZ::EntityId m_firstFrameStandin;
-        AZ::EntityId m_lastFrameStandin;
-        AZ::EntityId m_standin;
-        AZ::Data::Asset<GeomCacheAsset> m_geomCacheAsset;
-        AzFramework::SimpleAssetReference<MaterialAsset> m_materialOverrideAsset;
-
-        //Unreflected members
-        bool m_hidden; //< This is different from visible because this can also be controlled by the min spec being too high.
-        bool m_isRegisteredWithRenderer = false; //< We keep track of this because if some params are change we want to re-register but only if already registered.
-        bool m_renderingStandin = false;
-        bool m_playing;
-        float m_currentTime;
-        StandinType m_currentStandinType;
-        _smart_ptr<IMaterial> m_materialOverride;
-        IGeomCacheRenderNode* m_geomCacheRenderNode = nullptr;
-        _smart_ptr<IGeomCache> m_geomCache;
-        AZ::EntityId m_entityId;
-        AZ::Vector3 m_currentWorldPos;
-        AZStd::vector<AZ::EntityId> m_currentStandinEntities;
-
-        //Helper methods
-        void OnRenderOptionsChanged();
-        void OnGeomCacheAssetChanged();
-        void OnMaterialOverrideChanged();
-        void OnStartTimeChanged();
-        virtual void OnPlayOnStartChanged() {} //Only matters at edit time
-        void OnLoopChanged();
-        void OnMaxViewDistanceChanged();
-        void OnViewDistanceMultiplierChanged();
-        void OnLODDistanceRatioChanged();
-        void OnStreamInDistanceChanged();
-        virtual void OnFirstFrameStandinChanged() {}
-        virtual void OnLastFrameStandinChanged() {}
-        virtual void OnStandinChanged() {}
-
-        void LoadMaterialOverride();
-
-        void RegisterRenderNode();
-
-        void CreateGeomCache();
-        void DestroyGeomCache();
-
-        void ApplyAllRenderNodeParams();
-
-        void ShowCurrentStandin();
-        void HideCurrentStandin();
-        void HideAllStandins();
-
-        AZ::EntityId m_prevFirstFrameStandin;
-        AZ::EntityId m_prevLastFrameStandin;
-        AZ::EntityId m_prevStandin;
-    };
-
-    /**
-     * A Component for handling Alembic geometry cache animations. 
-     *
-     * Most of the logic lives in GeometryCacheCommon.
-     */
-    class GeometryCacheComponent
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(GeometryCacheComponent, "{B2974790-5A3B-4641-868F-6148C67830EE}", AZ::Component);
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires);
-        static void Reflect(AZ::ReflectContext* context);
-
-        GeometryCacheComponent() {};
-        explicit GeometryCacheComponent(GeometryCacheCommon* common)
-        {
-            m_common = *common;
-            m_common.ClearGeomCacheRenderNode(); //We don't want to copy the render node from the given common structure
-        }
-        ~GeometryCacheComponent() = default;
-
-        void Init() override;
-        void Activate() override;
-        void Deactivate() override;
-
-    private:
-        //Reflected members
-        GeometryCacheCommon m_common;
-    };
-} //namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/HighQualityShadowComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/HighQualityShadowComponent.cpp
deleted file mode 100644
index c537c2f8f6..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/HighQualityShadowComponent.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "LmbrCentral_precompiled.h"
-#include "HighQualityShadowComponent.h"
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <I3DEngine.h>
-
-
-namespace LmbrCentral
-{
-    //////////////////////////////////////////////////////////////////////////
-
-    HighQualityShadowConfig::HighQualityShadowConfig()
-        : m_enabled(true)
-        , m_constBias(0.001f)
-        , m_slopeBias(0.01f)
-        , m_jitter(0.01f)
-        , m_bboxScale(1,1,1)
-        , m_shadowMapSize(1024)
-    {
-
-    }
-
-    void HighQualityShadowConfig::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<HighQualityShadowConfig>()
-                ->Version(1)
-                ->Field("Enabled", &HighQualityShadowConfig::m_enabled)
-                ->Field("ConstBias", &HighQualityShadowConfig::m_constBias)
-                ->Field("SlopeBias", &HighQualityShadowConfig::m_slopeBias)
-                ->Field("Jitter", &HighQualityShadowConfig::m_jitter)
-                ->Field("BBoxScale", &HighQualityShadowConfig::m_bboxScale)
-                ->Field("ShadowMapSize", &HighQualityShadowConfig::m_shadowMapSize)
-                ;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void HighQualityShadowComponent::Reflect(AZ::ReflectContext* context)
-    {
-        HighQualityShadowConfig::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
-        {
-            serializeContext->Class<HighQualityShadowComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("HighQualityShadowConfig", &HighQualityShadowComponent::m_config);
-        }
-
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<HighQualityShadowComponentRequestBus>("HighQualityShadowComponentRequestBus")
-                ->Event("SetEnabled", &HighQualityShadowComponentRequestBus::Events::SetEnabled, { { {"Enabled", ""} } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, "Enables or disables the High Quality Shadow")
-                ->Event("GetEnabled", &HighQualityShadowComponentRequestBus::Events::GetEnabled)
-                ->Attribute(AZ::Script::Attributes::ToolTip, "Returns whether the High Quality Shadow is enabled")
-                ->VirtualProperty("Enabled", "GetEnabled", "SetEnabled");
-        }
-    }
-
-
-
-    void HighQualityShadowComponent::Activate()
-    {
-        HighQualityShadowComponentRequestBus::Handler::BusConnect(GetEntityId());
-        MeshComponentNotificationBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void HighQualityShadowComponent::Deactivate()
-    {
-        HighQualityShadowComponentUtils::RemoveShadow(GetEntityId());
-        HighQualityShadowComponentRequestBus::Handler::BusDisconnect();
-        MeshComponentNotificationBus::Handler::BusDisconnect(GetEntityId());
-    }
-
-    bool HighQualityShadowComponent::GetEnabled()
-    {
-        return m_config.m_enabled;
-    }
-
-    void HighQualityShadowComponent::SetEnabled(bool enabled)
-    {
-        m_config.m_enabled = enabled;
-        HighQualityShadowComponentUtils::ApplyShadowSettings(GetEntityId(), m_config);
-    }
-
-    void HighQualityShadowComponentUtils::ApplyShadowSettings(AZ::EntityId entityId, const HighQualityShadowConfig& config)
-    {
-        int numRenderNodesApplied = 0;
-
-        AZ::EBusAggregateResults<IRenderNode*> renderNodes;
-        LmbrCentral::RenderNodeRequestBus::EventResult(renderNodes, entityId, &LmbrCentral::RenderNodeRequests::GetRenderNode);
-        for(IRenderNode* renderNode : renderNodes.values)
-        {
-            if (renderNode)
-            {
-                const EERType type = renderNode->GetRenderNodeType();
-
-                const bool typeIsSupported =
-                    type == eERType_StaticMeshRenderComponent  || // Mesh Component uses this
-                    type == eERType_DynamicMeshRenderComponent || // Mesh Component uses this
-                    type == eERType_SkinnedMeshRenderComponent || // Skinned Mesh Component uses this; probably isn't necessary since this is deprecated, but is included for completion's sake
-                    type == eERType_RenderComponent;              // Actor Component uses this
-
-                if (typeIsSupported)
-                {
-                    ++numRenderNodesApplied;
-
-                    if (config.m_enabled && renderNode->IsReady()) // Note that if the mesh isn't ready yet, OnMeshCreated will be called when it is ready, which will call ApplyShadowSettings again
-                    {
-                        const Vec3 bboxScaleVec3(config.m_bboxScale.GetX(), config.m_bboxScale.GetY(), config.m_bboxScale.GetZ());
-                        gEnv->p3DEngine->AddPerObjectShadow(renderNode, config.m_constBias, config.m_slopeBias, config.m_jitter, bboxScaleVec3, config.m_shadowMapSize);
-                    }
-                    else
-                    {
-                        gEnv->p3DEngine->RemovePerObjectShadow(renderNode);
-                    }
-                }
-
-            }
-        }
-
-        // This should never fail because "MeshService" components are mutually exclusive. It is possible that numRenderNodesApplied be 0, 
-        // because some mesh-based components, like ActorComponent, may return a null IRenderNode when they aren't initialized yet.
-        AZ_Assert(numRenderNodesApplied <= 1, "Expected exactly one mesh-based component. Found %d", numRenderNodesApplied);
-    }
-
-    void HighQualityShadowComponentUtils::RemoveShadow(AZ::EntityId entityId)
-    {
-        AZ::EBusAggregateResults<IRenderNode*> renderNodes;
-        LmbrCentral::RenderNodeRequestBus::EventResult(renderNodes, entityId, &LmbrCentral::RenderNodeRequests::GetRenderNode);
-        for (IRenderNode* renderNode : renderNodes.values)
-        {
-            if (renderNode)
-            {
-                gEnv->p3DEngine->RemovePerObjectShadow(renderNode);
-            }
-        }
-    }
-
-    void HighQualityShadowComponent::OnMeshCreated([[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-    {
-        HighQualityShadowComponentUtils::ApplyShadowSettings(GetEntityId(), m_config);
-    }
-
-    void HighQualityShadowComponent::OnMeshDestroyed()
-    {
-        HighQualityShadowComponentUtils::RemoveShadow(GetEntityId());
-    }
-
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/HighQualityShadowComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/HighQualityShadowComponent.h
deleted file mode 100644
index c51899bab2..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/HighQualityShadowComponent.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Math/Vector3.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-#include <LmbrCentral/Rendering/HighQualityShadowComponentBus.h>
-
-namespace LmbrCentral
-{
-    /*!
-     * Stores configuration settings for per-entity shadows
-     */
-    class HighQualityShadowConfig
-    {
-    public:
-        AZ_TYPE_INFO(HighQualityShadowConfig, "{3B3CD21A-E61B-401A-8F54-B76FB6278B11}");
-
-        HighQualityShadowConfig();
-        virtual ~HighQualityShadowConfig() {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        bool m_enabled;
-        float m_constBias;
-        float m_slopeBias;
-        float m_jitter;
-        AZ::Vector3 m_bboxScale;
-        int m_shadowMapSize;
-
-        // Property event-handlers implemented in editor component.
-        virtual void EditorRefresh() { }
-    };
-
-    /*!
-     * Provides a entity-specific shadow map to achieving higher quality shadows on a specific entity. 
-     * Has performance and memory impact so use sparingly. 
-     * Corresponds to legacy PerEntityShadows feature.
-     */
-    class HighQualityShadowComponent
-        : public AZ::Component
-        , public HighQualityShadowComponentRequestBus::Handler
-        , public MeshComponentNotificationBus::Handler
-    {
-    public:
-        friend class EditorHighQualityShadowComponent;
-
-        AZ_COMPONENT(HighQualityShadowComponent, "{B692F9D9-4850-4D6E-9A32-760901455E40}");
-        
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // HighQualityShadowComponentRequestBus interface implementation
-        void SetEnabled(bool enabled) override;
-        bool GetEnabled() override;
-        ///////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // MeshComponentNotificationBus interface implementation
-        void OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-        void OnMeshDestroyed() override;
-        ///////////////////////////////////
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("HighQualityShadowService", 0x43dea981));
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("HighQualityShadowService", 0x43dea981));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            // HighQualityShadowComponent is only applicable to Entities that cast and/or receive shadows.
-            required.push_back(AZ_CRC("MeshService", 0x71d8a455));
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-
-    protected:
-
-        HighQualityShadowConfig m_config;
-    };
-
-    namespace HighQualityShadowComponentUtils
-    {
-        void ApplyShadowSettings(AZ::EntityId entityId, const HighQualityShadowConfig& config);
-        void RemoveShadow(AZ::EntityId entityId);
-    }
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareAssetHandler.cpp b/Gems/LmbrCentral/Code/Source/Rendering/LensFlareAssetHandler.cpp
deleted file mode 100644
index 718eabead7..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareAssetHandler.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/IO/GenericStreams.h>
-#include <AzFramework/Asset/SimpleAsset.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzCore/XML/rapidxml.h>
-
-#include <AzFramework/Archive/IArchive.h>
-
-#include <LmbrCentral/Rendering/LensFlareAsset.h>
-#include "LensFlareAssetHandler.h"
-
-#include <ISystem.h>
-
-#define LENS_FLARE_EXT "xml"
-
-namespace LmbrCentral
-{
-    LensFlareAssetHandler::~LensFlareAssetHandler()
-    {
-        Unregister();
-    }
-
-    AZ::Data::AssetPtr LensFlareAssetHandler::CreateAsset(const AZ::Data::AssetId& id, const AZ::Data::AssetType& type)
-    {
-        (void)type;
-        AZ_Assert(type == AZ::AzTypeInfo<LensFlareAsset>::Uuid(), "Invalid asset type! We handle only 'LensFlareAsset'");
-
-        if (!CanHandleAsset(id))
-        {
-            return nullptr;
-        }
-
-        return aznew LensFlareAsset;
-    }
-
-    AZ::Data::AssetHandler::LoadResult LensFlareAssetHandler::LoadAssetData(
-        const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-        AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-        const AZ::Data::AssetFilterCB& assetLoadFilterCB)
-    {
-        (void)assetLoadFilterCB;
-
-        // Load from preloaded stream.
-        AZ_Assert(asset.GetType() == AZ::AzTypeInfo<LensFlareAsset>::Uuid(), "Invalid asset type! We handle only 'LensFlareAsset'");
-        if (stream)
-        {
-            LensFlareAsset* data = asset.GetAs<LensFlareAsset>();
-
-            const size_t sizeBytes = static_cast<size_t>(stream->GetLength());
-            char* buffer = new char[sizeBytes];
-            stream->Read(sizeBytes, buffer);
-
-            bool loaded = LoadFromBuffer(data, buffer, sizeBytes);
-
-            delete[] buffer;
-
-            return loaded ? AZ::Data::AssetHandler::LoadResult::LoadComplete : AZ::Data::AssetHandler::LoadResult::Error;
-        }
-
-        return AZ::Data::AssetHandler::LoadResult::Error;
-    }
-
-    void LensFlareAssetHandler::DestroyAsset(AZ::Data::AssetPtr ptr)
-    {
-        delete ptr;
-    }
-
-    void LensFlareAssetHandler::GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes)
-    {
-        assetTypes.push_back(AZ::AzTypeInfo<LensFlareAsset>::Uuid());
-    }
-
-    void LensFlareAssetHandler::Register()
-    {
-        AZ_Assert(AZ::Data::AssetManager::IsReady(), "Asset manager isn't ready!");
-        AZ::Data::AssetManager::Instance().RegisterHandler(this, AZ::AzTypeInfo<LensFlareAsset>::Uuid());
-
-        AZ::AssetTypeInfoBus::Handler::BusConnect(AZ::AzTypeInfo<LensFlareAsset>::Uuid());
-    }
-
-    void LensFlareAssetHandler::Unregister()
-    {
-        AZ::AssetTypeInfoBus::Handler::BusDisconnect();
-
-        if (AZ::Data::AssetManager::IsReady())
-        {
-            AZ::Data::AssetManager::Instance().UnregisterHandler(this);
-        }
-    }
-
-    AZ::Data::AssetType LensFlareAssetHandler::GetAssetType() const
-    {
-        return AZ::AzTypeInfo<LensFlareAsset>::Uuid();
-    }
-
-    const char* LensFlareAssetHandler::GetAssetTypeDisplayName() const
-    {
-        return "Lens Flare";
-    }
-
-    const char* LensFlareAssetHandler::GetBrowserIcon() const
-    {
-        return "Editor/Icons/Components/LensFlare.svg";
-    }
-
-    AZ::Uuid LensFlareAssetHandler::GetComponentTypeId() const
-    {
-        return AZ::Uuid("{4B85E77D-91F9-40C5-8FCB-B494000A9E69}");
-    }
-
-    void LensFlareAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
-    {
-        extensions.push_back(LENS_FLARE_EXT);
-    }
-
-    bool LensFlareAssetHandler::CanHandleAsset(const AZ::Data::AssetId& id) const
-    {
-        // Look up the asset path to ensure it's actually a lens flare library.
-        AZStd::string assetPath;
-        EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, id);
-
-        bool isLensFlareLibrary = false;
-        if (!assetPath.empty() && strstr(assetPath.c_str(), "." LENS_FLARE_EXT))
-        {
-            //check whether the file includes "LensFlareLibrary" string
-            AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-            AZ_Assert(fileIO, "FileIO is not initialized.");
-            AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
-            const AZ::IO::Result result = fileIO->Open(assetPath.c_str(), AZ::IO::OpenMode::ModeRead, fileHandle);
-            if (result)
-            {
-                AZ::u64 fileSize = 0;
-                if (fileIO->Size(fileHandle, fileSize) && fileSize)
-                {
-                    AZStd::vector<char> memoryBuffer;
-                    memoryBuffer.resize_no_construct(fileSize);
-                    if (fileIO->Read(fileHandle, memoryBuffer.begin(), fileSize, true))
-                    {
-                        //compare string instead of parse the entire xml because it's faster. 
-                        isLensFlareLibrary = (nullptr != strstr(memoryBuffer.begin(), "LensFlareLibrary"));
-                    }
-                }
-
-                fileIO->Close(fileHandle);
-            }
-        }
-        return isLensFlareLibrary;
-    }
-
-    bool LensFlareAssetHandler::LoadFromBuffer(LensFlareAsset* data, char* buffer, [[maybe_unused]] size_t bufferSize)
-    {
-        using namespace AZ::rapidxml;
-
-        xml_document<char> xmlDoc;
-        xmlDoc.parse<parse_no_data_nodes>(buffer);
-
-        xml_node<char>* root = xmlDoc.first_node();
-        if (root)
-        {
-            //get the name of this lens flare library
-            xml_attribute<char>* nameAttribute = root->first_attribute("Name");
-            if (nameAttribute)
-            {
-                const char* libName = nameAttribute->value();
-                if (libName && libName[0])
-                {
-                    xml_node<char>* flareNode = root->first_node("FlareItem");
-                    while (flareNode)
-                    {
-                        //for each of FlareItem add their path, combined with lib name, to LensFlareAsset data. 
-                        xml_attribute<char>* flareNameAttribute = flareNode->first_attribute("Name");
-                        if (flareNameAttribute)
-                        {
-                            const char* effectName = flareNameAttribute->value();
-                            if (effectName && effectName[0])
-                            {
-                                AZStd::string flarePath = AZStd::string::format("%s.%s", libName, effectName);
-                                data->AddPath(std::move(flarePath));
-                            }
-                        }
-
-                        flareNode = flareNode->next_sibling("FlareItem");
-                    }
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-} // namespace LmbrCentral
-
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareAssetHandler.h b/Gems/LmbrCentral/Code/Source/Rendering/LensFlareAssetHandler.h
deleted file mode 100644
index acbfb97e84..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareAssetHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Asset/AssetTypeInfoBus.h>
-
-namespace LmbrCentral
-{
-    class LensFlareAssetHandler
-        : public AZ::Data::AssetHandler
-        , public AZ::AssetTypeInfoBus::Handler
-    {
-    public:
-
-        AZ_CLASS_ALLOCATOR(LensFlareAssetHandler, AZ::SystemAllocator, 0);
-
-        ~LensFlareAssetHandler() override;
-
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        // AZ::Data::AssetHandler
-        AZ::Data::AssetPtr CreateAsset(const AZ::Data::AssetId& id, const AZ::Data::AssetType& type) override;
-        AZ::Data::AssetHandler::LoadResult LoadAssetData(
-            const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-            AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-            const AZ::Data::AssetFilterCB& assetLoadFilterCB) override;
-        void DestroyAsset(AZ::Data::AssetPtr ptr) override;
-        void GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes) override;
-        bool CanHandleAsset(const AZ::Data::AssetId& id) const override;
-        //////////////////////////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        // AZ::AssetTypeInfoBus::Handler
-        AZ::Data::AssetType GetAssetType() const override;
-        const char* GetAssetTypeDisplayName() const override;
-        const char* GetBrowserIcon() const override;
-        AZ::Uuid GetComponentTypeId() const override;
-        void GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions) override;
-        //////////////////////////////////////////////////////////////////////////////////////////////
-
-        void Register();
-        void Unregister();
-
-    private:
-        static bool LoadFromBuffer(LensFlareAsset* data, char* buffer, size_t bufferSize);
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/LensFlareComponent.cpp
deleted file mode 100644
index 49b433f3e8..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareComponent.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-#include "LensFlareComponent.h"
-
-namespace LmbrCentral
-{
-    //////////////////////////////////////////////////////////////////////////
-    // BehaviorContext LensFlareComponentNotificationBus forwarder
-    class BehaviorLensFlareComponentNotificationBusHandler : public LensFlareComponentNotificationBus::Handler, public AZ::BehaviorEBusHandler
-    {
-    public:
-        AZ_EBUS_BEHAVIOR_BINDER(BehaviorLensFlareComponentNotificationBusHandler, "{285A6AB7-82CF-472F-8C3B-1659A59213FF}", AZ::SystemAllocator,
-            LensFlareTurnedOn, LensFlareTurnedOff);
-
-        void LensFlareTurnedOn()
-        {
-            Call(FN_LensFlareTurnedOn);
-        }
-
-        void LensFlareTurnedOff()
-        {
-            Call(FN_LensFlareTurnedOff);
-        }
-    };
-
-    // Class to encapsulate LensFlareComponentRequests::State values.
-    class BehaviorLensFlareComponentState
-    {
-    public:
-        AZ_TYPE_INFO(BehaviorLensFlareComponentState, "{1A63ED6B-C2D2-4D3C-AC27-5FDBF22B5B38}");
-        AZ_CLASS_ALLOCATOR(BehaviorLensFlareComponentState, AZ::SystemAllocator, 0);
-    };
-
-    void LensFlareComponent::Reflect(AZ::ReflectContext* context)
-    {
-        LensFlareConfiguration::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<LensFlareComponent, AZ::Component>()->
-                Version(1)->
-                Field("LensFlareConfiguration", &LensFlareComponent::m_configuration);
-        }
-
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->Class<BehaviorLensFlareComponentState>("LensFlareComponentState")
-                ->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::Value)
-                ->Constant("Off", BehaviorConstant(LensFlareComponentRequests::State::Off))
-                ->Constant("On", BehaviorConstant(LensFlareComponentRequests::State::On))
-                ;
-
-            behaviorContext->EBus<LensFlareComponentRequestBus>("LensFlareComponentRequestBus")
-                ->Event("SetLensFlareState", &LensFlareComponentRequestBus::Events::SetLensFlareState)
-                ->Event("TurnOnLensFlare", &LensFlareComponentRequestBus::Events::TurnOnLensFlare)
-                ->Event("TurnOffLensFlare", &LensFlareComponentRequestBus::Events::TurnOffLensFlare)
-                ->Event("ToggleLensFlare", &LensFlareComponentRequestBus::Events::ToggleLensFlare)
-                ;
-
-            behaviorContext->EBus<LensFlareComponentNotificationBus>("LensFlareComponentNotificationBus")
-                ->Handler<BehaviorLensFlareComponentNotificationBusHandler>();
-        }
-    }
-
-    void LensFlareConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<LensFlareConfiguration>()->
-                Version(4, &VersionConverter)->
-                Field("Visible", &LensFlareConfiguration::m_visible)->
-                Field("LensFlare", &LensFlareConfiguration::m_lensFlare)->
-                Field("Asset", &LensFlareConfiguration::m_asset)->
-
-                Field("MinimumSpec", &LensFlareConfiguration::m_minSpec)->
-                Field("LensFlareFrustumAngle", &LensFlareConfiguration::m_lensFlareFrustumAngle)->
-                Field("Size", &LensFlareConfiguration::m_size)->
-                Field("AttachToSun", &LensFlareConfiguration::m_attachToSun)->
-                Field("AffectsThisAreaOnly", &LensFlareConfiguration::m_affectsThisAreaOnly)->
-                Field("UseVisAreas", &LensFlareConfiguration::m_useVisAreas)->
-                Field("IndoorOnly", &LensFlareConfiguration::m_indoorOnly)->
-                Field("OnInitially", &LensFlareConfiguration::m_onInitially)->
-                Field("ViewDistanceMultiplier", &LensFlareConfiguration::m_viewDistMultiplier)->
-
-                Field("Tint", &LensFlareConfiguration::m_tint)->
-                Field("TintAlpha", &LensFlareConfiguration::m_tintAlpha)->
-                Field("Brightness", &LensFlareConfiguration::m_brightness)->
-
-                Field("SyncAnimWithLight", &LensFlareConfiguration::m_syncAnimWithLight)->
-                Field("LightEntity", &LensFlareConfiguration::m_lightEntity)->
-                Field("AnimIndex", &LensFlareConfiguration::m_animIndex)->
-                Field("AnimSpeed", &LensFlareConfiguration::m_animSpeed)->
-                Field("AnimPhase", &LensFlareConfiguration::m_animPhase)->
-
-                Field("SyncedAnimIndex", &LensFlareConfiguration::m_syncAnimIndex)->
-                Field("SyncedAnimSpeed", &LensFlareConfiguration::m_syncAnimSpeed)->
-                Field("SyncedAnimPhase", &LensFlareConfiguration::m_syncAnimPhase)
-                ;
-        }
-    }
-
-    bool LensFlareConfiguration::VersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
-    {
-        // conversion from version 2 to version 3:
-        // - Need to rename IgnoreVisAreas to UseVisAreas
-        // UseVisAreas is the Inverse of IgnoreVisAreas
-        if (classElement.GetVersion() <= 2)
-        {
-            int ignoreVisAreasIndex = classElement.FindElement(AZ_CRC("IgnoreVisAreas", 0x01823201));
-
-            if (ignoreVisAreasIndex < 0)
-            {
-                return false;
-            }
-
-            AZ::SerializeContext::DataElementNode& useVisAreasNode = classElement.GetSubElement(ignoreVisAreasIndex);
-            useVisAreasNode.SetName("UseVisAreas");
-
-            bool ignoreVisAreas = true;
-            if (!useVisAreasNode.GetData<bool>(ignoreVisAreas))
-            {
-                return false;
-            }
-
-            if (!useVisAreasNode.SetData<bool>(context, !ignoreVisAreas))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    void LensFlareComponent::TurnOnLensFlare()
-    {
-        bool success = m_light.TurnOn();
-        if (success)
-        {
-            LensFlareComponentNotificationBus::Event(GetEntityId(), &LensFlareComponentNotificationBus::Events::LensFlareTurnedOn);
-        }
-    }
-
-    void LensFlareComponent::TurnOffLensFlare()
-    {
-        bool success = m_light.TurnOff();
-        if (success)
-        {
-            LensFlareComponentNotificationBus::Event(GetEntityId(), &LensFlareComponentNotificationBus::Events::LensFlareTurnedOff);
-        }
-    }
-
-    void LensFlareComponent::ToggleLensFlare()
-    {
-        if (m_light.IsOn())
-        {
-            TurnOffLensFlare();
-        }
-        else
-        {
-            TurnOnLensFlare();
-        }
-    }
-
-    LensFlareConfiguration LensFlareComponent::GetLensFlareConfiguration()
-    {
-        return m_configuration;
-    }
-
-    void LensFlareComponent::SetLensFlareState(State state)
-    {
-        switch (state)
-        {
-        case LensFlareComponentRequests::State::On:
-        {
-            TurnOnLensFlare();
-        }
-        break;
-
-        case LensFlareComponentRequests::State::Off:
-        {
-            TurnOffLensFlare();
-        }
-        break;
-        }
-    }
-
-    IRenderNode* LensFlareComponent::GetRenderNode()
-    {
-        return m_light.GetRenderNode();
-    }
-
-    float LensFlareComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return s_renderNodeRequestBusOrder;
-    }
-
-    const float LensFlareComponent::s_renderNodeRequestBusOrder = 600.f;
-
-    void LensFlareComponent::Init() 
-    {
-        //Set this in Init because it will never change and doesn't need to be reset if the component re-activates
-        m_configuration.m_material.SetAssetPath("EngineAssets/Materials/lens_optics");
-    }
-
-    void LensFlareComponent::Activate()
-    {
-        const AZ::EntityId entityId = GetEntityId();
-
-        m_light.SetEntity(entityId);
-        m_light.CreateRenderLight(m_configuration);
-
-        LensFlareComponentRequestBus::Handler::BusConnect(entityId);
-        RenderNodeRequestBus::Handler::BusConnect(entityId);
-
-        if (m_configuration.m_onInitially)
-        {
-            TurnOnLensFlare();
-        }
-        else
-        {
-            TurnOffLensFlare();
-        }
-    }
-
-    void LensFlareComponent::Deactivate()
-    {
-        LensFlareComponentRequestBus::Handler::BusDisconnect();
-        RenderNodeRequestBus::Handler::BusDisconnect();
-
-        m_light.DestroyRenderLight();
-        m_light.SetEntity(AZ::EntityId());
-    }
-
-    LensFlareConfiguration::LensFlareConfiguration()
-        : m_minSpec(EngineSpec::Low)
-        , m_visible(true)
-        , m_onInitially(true)
-        , m_tint(1.f)
-        , m_brightness(1.f)
-        , m_viewDistMultiplier(1.f)
-        , m_affectsThisAreaOnly(1.f)
-        , m_useVisAreas(true)
-        , m_indoorOnly(false)
-        , m_animSpeed(1.f)
-        , m_animPhase(0.f)
-        , m_animIndex(0)
-        , m_lensFlareFrustumAngle(360.f)
-        , m_size(1.0f)
-        , m_attachToSun(false)
-        , m_syncAnimWithLight(false)
-    {
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/LensFlareComponent.h
deleted file mode 100644
index 885e436b2a..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LensFlareComponent.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/ComponentBus.h>
-#include <AzFramework/Asset/SimpleAsset.h>
-
-#include "LightInstance.h"
-#include <LmbrCentral/Rendering/LensFlareAsset.h>
-#include <LmbrCentral/Rendering/LensFlareComponentBus.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <LmbrCentral/Rendering/MaterialAsset.h>
-
-#include <IEntityRenderState.h>
-
-namespace LmbrCentral
-{
-    /*!
-     * Stores configuration settings for engine lens flares.
-     */
-    class LensFlareConfiguration
-    {
-    public:
-        AZ_TYPE_INFO(LensFlareConfiguration, "{1E28DADD-0BD4-4AD5-A94B-2665813BF346}");
-
-        LensFlareConfiguration();
-        virtual ~LensFlareConfiguration() {};
-
-        static void Reflect(AZ::ReflectContext* context);
-        static bool VersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
-
-        AZ::Data::Asset<LensFlareAsset> m_asset { AZ::Data::AssetLoadBehavior::PreLoad };                 //! Used at asset compile time to track the dependency. Not used at edit or runtime.
-
-        //! Settings common to all LY engine lights
-        EngineSpec m_minSpec;
-
-        //! Turned on by default?
-        bool m_onInitially;
-
-        //! Currently visible?
-        bool m_visible;
-
-        //! Lens flare size
-        float m_size;
-
-        AZ::Vector3 m_tint;
-        AZ::u32 m_tintAlpha;
-        float m_brightness;
-
-        float m_viewDistMultiplier;
-        float m_viewDistMultiplierUser; // Value set by user from UI.
-        bool m_affectsThisAreaOnly;
-        bool m_useVisAreas;
-        bool m_indoorOnly;
-        bool m_attachToSun;
-
-        bool m_syncAnimWithLight;
-        AZ::EntityId m_lightEntity;
-        float m_animSpeed;
-        float m_animPhase;
-        AZ::u32 m_animIndex;
-
-        AZStd::string m_lensFlare;
-        float m_lensFlareFrustumAngle;
-
-        // Animation settings from the light
-        float m_syncAnimSpeed;
-        float m_syncAnimPhase;
-        AZ::u32 m_syncAnimIndex;
-
-        // Settings not reflected in the editor
-        AzFramework::SimpleAssetReference<MaterialAsset> m_material;    //Same name as the material in the LightSettings
-
-        AZ_INLINE bool ShouldShowAnimationSettings() {
-            return !m_syncAnimWithLight;
-        }
-
-        AZ_INLINE bool ShouldViewDistanceMultiplier() {
-            return !m_attachToSun;
-        }
-        
-        // Property event-handlers implemented in editor component.
-        virtual AZ::u32 PropertyChanged() { return 0; }
-        virtual AZ::u32 SyncAnimationChanged() { return AZ_CRC("RefreshNone", 0x98a5045b); }
-        virtual AZ::u32 AttachToSunChanged() {return AZ_CRC("RefreshNone", 0x98a5045b); }
-    };
-
-
-    /*!
-     * In-game light component.
-     */
-    class LensFlareComponent
-        : public AZ::Component
-        , public LensFlareComponentRequestBus::Handler
-        , public RenderNodeRequestBus::Handler
-    {
-    public:
-        friend class EditorLensFlareComponent;
-
-        AZ_COMPONENT(LensFlareComponent, "{07593109-4A57-473F-B868-C2DCF9270186}");
-
-        LensFlareComponent() {}
-        ~LensFlareComponent() override {}
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Init() override;
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // LensFlareComponentRequestBus::Handler interface implementation
-        void TurnOnLensFlare() override;
-        void TurnOffLensFlare() override;
-        void SetLensFlareState(State state) override;
-        void ToggleLensFlare() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // RenderNodeRequestBus::Handler interface implementation
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-        static const float s_renderNodeRequestBusOrder;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("LensFlareService", 0xda3286e8));
-        }
-
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-        {
-            dependent.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-        //////////////////////////////////////////////////////////////////////////
-
-        LensFlareConfiguration GetLensFlareConfiguration();
-
-    protected:
-
-        LensFlareConfiguration m_configuration;
-        LightInstance m_light;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LightComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/LightComponent.cpp
deleted file mode 100644
index b52feac3fd..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LightComponent.cpp
+++ /dev/null
@@ -1,875 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/Entity.h>
-
-#include "LightInstance.h"
-#include "LightComponent.h"
-
-namespace LmbrCentral
-{
-    //////////////////////////////////////////////////////////////////////////
-    class BehaviorLightComponentNotificationBusHandler : public LightComponentNotificationBus::Handler, public AZ::BehaviorEBusHandler
-    {
-    public:
-        AZ_EBUS_BEHAVIOR_BINDER(BehaviorLightComponentNotificationBusHandler, "{969C5B17-10D1-41DB-8123-6664FA64B4E9}", AZ::SystemAllocator,
-            LightTurnedOn, LightTurnedOff);
-
-        // Sent when the light is turned on.
-        void LightTurnedOn() override
-        {
-            Call(FN_LightTurnedOn);
-        }
-
-        // Sent when the light is turned off.
-        void LightTurnedOff() override
-        {
-            Call(FN_LightTurnedOff);
-        }
-    };
-
-    void LightComponent::Reflect(AZ::ReflectContext* context)
-    {
-        LightConfiguration::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
-        {
-            serializeContext->Class<LightComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("LightConfiguration", &LightComponent::m_configuration);
-        }
-
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->Class<LightComponent>()->RequestBus("LightComponentRequestBus");
-            ;
-            auto probeFadeDefaultValue(behaviorContext->MakeDefaultValue(1.0f));
-
-            behaviorContext->EBus<LightComponentRequestBus>("Light", "LightComponentRequestBus")
-                ->Attribute(AZ::Script::Attributes::Category, "Rendering")
-                ->Event("SetState", &LightComponentRequestBus::Events::SetLightState, "SetLightState", { { { "State", "1=On, 0=Off" } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, "Set the light state")
-                ->Event("TurnOn", &LightComponentRequestBus::Events::TurnOnLight, "TurnOnLight")
-                ->Event("TurnOff", &LightComponentRequestBus::Events::TurnOffLight, "TurnOffLight")
-                ->Event("Toggle", &LightComponentRequestBus::Events::ToggleLight, "ToggleLight")
-                // General Settings Modifiers
-                ->Event("GetVisible", &LightComponentRequestBus::Events::GetVisible)
-                ->Event("SetVisible", &LightComponentRequestBus::Events::SetVisible, { { { "IsVisible", "" } } })
-                ->VirtualProperty("Visible", "GetVisible", "SetVisible")
-                ->Event("GetColor", &LightComponentRequestBus::Events::GetColor)
-                ->Event("SetColor", &LightComponentRequestBus::Events::SetColor, { { { "Color", "The color to set" } } })
-                ->VirtualProperty("Color", "GetColor", "SetColor")
-                ->Event("GetDiffuseMultiplier", &LightComponentRequestBus::Events::GetDiffuseMultiplier)
-                ->Event("SetDiffuseMultiplier", &LightComponentRequestBus::Events::SetDiffuseMultiplier, { { { "Multiplier", "The multiplier" } } })
-                ->VirtualProperty("DiffuseMultiplier", "GetDiffuseMultiplier", "SetDiffuseMultiplier")
-                ->Event("GetSpecularMultiplier", &LightComponentRequestBus::Events::GetSpecularMultiplier)
-                ->Event("SetSpecularMultiplier", &LightComponentRequestBus::Events::SetSpecularMultiplier, { { { "Multiplier", "The multiplier" } } })
-                ->VirtualProperty("SpecularMultiplier", "GetSpecularMultiplier", "SetSpecularMultiplier")
-                ->Event("GetAmbient", &LightComponentRequestBus::Events::GetAmbient)
-                ->Event("SetAmbient", &LightComponentRequestBus::Events::SetAmbient, { { { "IsAmbient", "" } } })
-                ->VirtualProperty("Ambient", "GetAmbient", "SetAmbient")
-                // Point Light Modifiers
-                ->Event("GetPointMaxDistance", &LightComponentRequestBus::Events::GetPointMaxDistance)
-                ->Event("SetPointMaxDistance", &LightComponentRequestBus::Events::SetPointMaxDistance, { { { "Distance", "The max point distance" } } })
-                ->VirtualProperty("PointMaxDistance", "GetPointMaxDistance", "SetPointMaxDistance")
-                ->Event("GetPointAttenuationBulbSize", &LightComponentRequestBus::Events::GetPointAttenuationBulbSize)
-                ->Event("SetPointAttenuationBulbSize", &LightComponentRequestBus::Events::SetPointAttenuationBulbSize, { { { "BulbSize", "The size of the bulb" } } })
-                ->VirtualProperty("PointAttenuationBulbSize", "GetPointAttenuationBulbSize", "SetPointAttenuationBulbSize")
-                // Area Light Modifiers
-                ->Event("GetAreaMaxDistance", &LightComponentRequestBus::Events::GetAreaMaxDistance)
-                ->Event("SetAreaMaxDistance", &LightComponentRequestBus::Events::SetAreaMaxDistance, { { { "Distance", "The max point distance" } } })
-                ->VirtualProperty("AreaMaxDistance", "GetAreaMaxDistance", "SetAreaMaxDistance")
-                ->Event("GetAreaWidth", &LightComponentRequestBus::Events::GetAreaWidth)
-                ->Event("SetAreaWidth", &LightComponentRequestBus::Events::SetAreaWidth, { { { "Width", "Area Width" } } })
-                ->VirtualProperty("AreaWidth", "GetAreaWidth", "SetAreaWidth")
-                ->Event("GetAreaHeight", &LightComponentRequestBus::Events::GetAreaHeight)
-                ->Event("SetAreaHeight", &LightComponentRequestBus::Events::SetAreaHeight, { { { "Height", "Area Height" } } })
-                ->VirtualProperty("AreaHeight", "GetAreaHeight", "SetAreaHeight")
-                ->Event("GetAreaFOV", &LightComponentRequestBus::Events::GetAreaFOV)
-                ->Event("SetAreaFOV", &LightComponentRequestBus::Events::SetAreaFOV, { { { "FOV", "Field of View" } } })
-                ->VirtualProperty("AreaFOV", "GetAreaFOV", "SetAreaFOV")
-                // Projector Light Modifiers
-                ->Event("GetProjectorMaxDistance", &LightComponentRequestBus::Events::GetProjectorMaxDistance)
-                ->Event("SetProjectorMaxDistance", &LightComponentRequestBus::Events::SetProjectorMaxDistance, { { { "Distance", "Projector distance" } } })
-                ->VirtualProperty("ProjectorMaxDistance", "GetProjectorMaxDistance", "SetProjectorMaxDistance")
-                ->Event("GetProjectorAttenuationBulbSize", &LightComponentRequestBus::Events::GetProjectorAttenuationBulbSize)
-                ->Event("SetProjectorAttenuationBulbSize", &LightComponentRequestBus::Events::SetProjectorAttenuationBulbSize, { { { "BulbSize", "The size of the bulb" } } })
-                ->VirtualProperty("ProjectorAttenuationBulbSize", "GetProjectorAttenuationBulbSize", "SetProjectorAttenuationBulbSize")
-                ->Event("GetProjectorFOV", &LightComponentRequestBus::Events::GetProjectorFOV)
-                ->Event("SetProjectorFOV", &LightComponentRequestBus::Events::SetProjectorFOV, { { { "FOV", "Field of View" } } })
-                ->VirtualProperty("ProjectorFOV", "GetProjectorFOV", "SetProjectorFOV")
-                ->Event("GetProjectorNearPlane", &LightComponentRequestBus::Events::GetProjectorNearPlane)
-                ->Event("SetProjectorNearPlane", &LightComponentRequestBus::Events::SetProjectorNearPlane, { { { "Plane", "Plane distance" } } })
-                ->VirtualProperty("ProjectorNearPlane", "GetProjectorNearPlane", "SetProjectorNearPlane")
-                // Environment Probe Light Modifiers
-                ->Event("GetProbeAreaDimensions", &LightComponentRequestBus::Events::GetProbeAreaDimensions)
-                ->Event("SetProbeAreaDimensions", &LightComponentRequestBus::Events::SetProbeAreaDimensions, { { { "Dimension", "The X,Y and Z extents" } } })
-                ->VirtualProperty("ProbeAreaDimensions", "GetProbeAreaDimensions", "SetProbeAreaDimensions")
-                ->Event("GetProbeSortPriority", &LightComponentRequestBus::Events::GetProbeSortPriority)
-                ->Event("SetProbeSortPriority", &LightComponentRequestBus::Events::SetProbeSortPriority, { { { "Priority", "" } } })
-                ->VirtualProperty("ProbeSortPriority", "GetProbeSortPriority", "SetProbeSortPriority")
-                ->Event("GetProbeBoxProjected", &LightComponentRequestBus::Events::GetProbeBoxProjected)
-                ->Event("SetProbeBoxProjected", &LightComponentRequestBus::Events::SetProbeBoxProjected, { { { "IsProjected", "TRUE will project the box, False otherwise." } } })
-                ->VirtualProperty("ProbeBoxProjected", "GetProbeBoxProjected", "SetProbeBoxProjected")
-                ->Event("GetProbeBoxHeight", &LightComponentRequestBus::Events::GetProbeBoxHeight)
-                ->Event("SetProbeBoxHeight", &LightComponentRequestBus::Events::SetProbeBoxHeight, { { { "Height", "Box Height" } } })
-                ->VirtualProperty("ProbeBoxHeight", "GetProbeBoxHeight", "SetProbeBoxHeight")
-                ->Event("GetProbeBoxLength", &LightComponentRequestBus::Events::GetProbeBoxLength)
-                ->Event("SetProbeBoxLength", &LightComponentRequestBus::Events::SetProbeBoxLength, { { { "Length", "Box Length" } } })
-                ->VirtualProperty("ProbeBoxLength", "GetProbeBoxLength", "SetProbeBoxLength")
-                ->Event("GetProbeBoxWidth", &LightComponentRequestBus::Events::GetProbeBoxWidth)
-                ->Event("SetProbeBoxWidth", &LightComponentRequestBus::Events::SetProbeBoxWidth, { { { "Width", "Box Width" } } })
-                ->VirtualProperty("ProbeBoxWidth", "GetProbeBoxWidth", "SetProbeBoxWidth")
-                ->Event("GetProbeAttenuationFalloff", &LightComponentRequestBus::Events::GetProbeAttenuationFalloff)
-                ->Event("SetProbeAttenuationFalloff", &LightComponentRequestBus::Events::SetProbeAttenuationFalloff, { { { "Falloff", "Smoothness of the falloff around the probe's bounds" } } })
-                ->VirtualProperty("ProbeAttenuationFalloff", "GetProbeAttenuationFalloff", "SetProbeAttenuationFalloff")
-                ->Event("GetProbeFade", &LightComponentRequestBus::Events::GetProbeFade)
-                ->Event("SetProbeFade", &LightComponentRequestBus::Events::SetProbeFade, { { { "Fade", "Multiplier for fading out a probe [0-1]", probeFadeDefaultValue } } })
-                ->VirtualProperty("ProbeFade", "GetProbeFade", "SetProbeFade")
-                ;
-
-            behaviorContext->EBus<LightComponentNotificationBus>("LightNotification", "LightComponentNotificationBus", "Notifications for the Light Components")
-                ->Attribute(AZ::Script::Attributes::Category, "Rendering")
-                ->Handler<BehaviorLightComponentNotificationBusHandler>();
-        }
-    }
-
-    void LightConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<LightConfiguration>()
-                ->Version(8, &VersionConverter)
-                ->Field("LightType", &LightConfiguration::m_lightType)
-                ->Field("Visible", &LightConfiguration::m_visible)
-                ->Field("OnInitially", &LightConfiguration::m_onInitially)
-                ->Field("Color", &LightConfiguration::m_color)
-                ->Field("DiffuseMultiplier", &LightConfiguration::m_diffuseMultiplier)
-                ->Field("SpecMultiplier", &LightConfiguration::m_specMultiplier)
-                ->Field("Ambient", &LightConfiguration::m_ambient)
-                ->Field("PointMaxDistance", &LightConfiguration::m_pointMaxDistance)
-                ->Field("PointAttenuationBulbSize", &LightConfiguration::m_pointAttenuationBulbSize)
-                ->Field("AreaWidth", &LightConfiguration::m_areaWidth)
-                ->Field("AreaHeight", &LightConfiguration::m_areaHeight)
-                ->Field("AreaMaxDistance", &LightConfiguration::m_areaMaxDistance)
-                ->Field("AreaFOV", &LightConfiguration::m_areaFOV)
-                ->Field("ProjectorDistance", &LightConfiguration::m_projectorRange)
-                ->Field("ProjectorAttenuationBulbSize", &LightConfiguration::m_projectorAttenuationBulbSize)
-                ->Field("ProjectorFOV", &LightConfiguration::m_projectorFOV)
-                ->Field("ProjectorNearPlane", &LightConfiguration::m_projectorNearPlane)
-                ->Field("ProjectorTexture", &LightConfiguration::m_projectorTexture)
-                ->Field("ProjectorMaterial", &LightConfiguration::m_material)
-                ->Field("Area X,Y,Z", &LightConfiguration::m_probeArea)
-                ->Field("SortPriority", &LightConfiguration::m_probeSortPriority)
-                ->Field("CubemapResolution", &LightConfiguration::m_probeCubemapResolution)
-                ->Field("CubemapTexture", &LightConfiguration::m_probeCubemap)
-                ->Field("BoxProject", &LightConfiguration::m_isBoxProjected)
-                ->Field("BoxHeight", &LightConfiguration::m_boxHeight)
-                ->Field("BoxLength", &LightConfiguration::m_boxLength)
-                ->Field("BoxWidth", &LightConfiguration::m_boxWidth)
-                ->Field("AttenuationFalloffMax", &LightConfiguration::m_attenFalloffMax)
-                ->Field("ViewDistanceMultiplier", &LightConfiguration::m_viewDistMultiplier)
-                ->Field("MinimumSpec", &LightConfiguration::m_minSpec)
-                ->Field("CastShadowsSpec", &LightConfiguration::m_castShadowsSpec)
-                ->Field("VoxelGIMode", &LightConfiguration::m_voxelGIMode)
-                ->Field("UseVisAreas", &LightConfiguration::m_useVisAreas)
-                ->Field("IndoorOnly", &LightConfiguration::m_indoorOnly)
-                ->Field("AffectsThisAreaOnly", &LightConfiguration::m_affectsThisAreaOnly)
-                ->Field("VolumetricFogOnly", &LightConfiguration::m_volumetricFogOnly)
-                ->Field("VolumetricFog", &LightConfiguration::m_volumetricFog)
-                ->Field("Deferred", &LightConfiguration::m_deferred)
-                ->Field("TerrainShadows", &LightConfiguration::m_castTerrainShadows)
-                ->Field("ShadowBias", &LightConfiguration::m_shadowBias)
-                ->Field("ShadowResScale", &LightConfiguration::m_shadowResScale)
-                ->Field("ShadowSlopeBias", &LightConfiguration::m_shadowSlopeBias)
-                ->Field("ShadowUpdateMinRadius", &LightConfiguration::m_shadowUpdateMinRadius)
-                ->Field("ShadowUpdateRatio", &LightConfiguration::m_shadowUpdateRatio)
-                ->Field("AnimIndex", &LightConfiguration::m_animIndex)
-                ->Field("AnimSpeed", &LightConfiguration::m_animSpeed)
-                ->Field("AnimPhase", &LightConfiguration::m_animPhase)
-                ->Field("CubemapId", &LightConfiguration::m_cubemapId);
-        }
-    }
-
-    // Private Static 
-    bool LightConfiguration::VersionConverter(AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement)
-    {
-        // conversion from version 1:
-        // - Need to rename OmniRadius to MaxDistance
-        // - remove ShadowBlurStrength
-        if (classElement.GetVersion() <= 1)
-        {
-            int radiusIndex = classElement.FindElement(AZ_CRC("OmniRadius", 0x3fbb253e));
-
-            if (radiusIndex < 0)
-            {
-                return false;
-            }
-
-            AZ::SerializeContext::DataElementNode& radius = classElement.GetSubElement(radiusIndex);
-            radius.SetName("MaxDistance");
-
-            classElement.RemoveElementByName(AZ_CRC("ShadowBlurStrength", 0x70ac8e34));
-        }
-
-        // conversion from version 2:
-        // - Replace AreaSize with AreaWidth and AreaHeights
-        if (classElement.GetVersion() <= 2)
-        {
-            int areaIndex = classElement.FindElement(AZ_CRC("AreaSize", 0x287b852c));
-
-            if (areaIndex < 0)
-            {
-                return false;
-            }
-
-            //Get the size
-            AZ::SerializeContext::DataElementNode& area = classElement.GetSubElement(areaIndex);
-            AZ::Vector3 size;
-
-            area.GetData<AZ::Vector3>(size);
-
-            //Create width and height
-            int areaWidthIndex = classElement.AddElement<float>(context, "AreaWidth");
-            int areaHeightIndex = classElement.AddElement<float>(context, "AreaHeight");
-
-            AZ::SerializeContext::DataElementNode& areaWidth = classElement.GetSubElement(areaWidthIndex);
-            AZ::SerializeContext::DataElementNode& areaHeight = classElement.GetSubElement(areaHeightIndex);
-
-            //Set width and height data to x and y from the old size
-            areaWidth.SetData<float>(context, size.GetX());
-            areaHeight.SetData<float>(context, size.GetY());
-            classElement.RemoveElement(areaIndex);
-        }
-
-        // conversion from version 3:
-        // - MaxDistance turned into PointMaxDistance and AreaMaxDistance
-        // - AttenuationBulbSize turned into PointAttenuationBulbSize and ProjectorAttenuationBulbSize
-        // - Apply old area size to new probe area
-        if (classElement.GetVersion() <= 3)
-        {
-            int maxDistanceIndex = classElement.FindElement(AZ_CRC("MaxDistance", 0xfc2921b8));
-            int attenBulbIndex = classElement.FindElement(AZ_CRC("AttenuationBulbSize", 0x3ca0f5c0));
-            int areaWidthIndex = classElement.FindElement(AZ_CRC("AreaWidth", 0x137a1a2b));
-            int areaHeightIndex = classElement.FindElement(AZ_CRC("AreaHeight", 0xf2bf4149));
-
-            if (maxDistanceIndex < 0 || attenBulbIndex < 0 || areaWidthIndex < 0 || areaHeightIndex < 0)
-            {
-                return false;
-            }
-
-            //Get some values
-            AZ::SerializeContext::DataElementNode& maxDistance = classElement.GetSubElement(maxDistanceIndex);
-            AZ::SerializeContext::DataElementNode& attenBulbSize = classElement.GetSubElement(attenBulbIndex);
-            AZ::SerializeContext::DataElementNode& areaWidth = classElement.GetSubElement(areaWidthIndex);
-            AZ::SerializeContext::DataElementNode& areaHeight = classElement.GetSubElement(attenBulbIndex);
-
-            float maxDistVal, attenBulbVal, areaWidthVal, areaHeightVal;
-
-            maxDistance.GetData<float>(maxDistVal);
-            attenBulbSize.GetData<float>(attenBulbVal);
-            areaWidth.GetData<float>(areaWidthVal);
-            areaHeight.GetData<float>(areaHeightVal);
-
-            //Create AreaMaxDistance, PointMaxDistance, PointAttenuationBulbSize and ProjectorAttenuationBulbSize
-            int areaMaxDistIndex = classElement.AddElement<float>(context, "AreaMaxDistance");
-            int pointMaxDistIndex = classElement.AddElement<float>(context, "PointMaxDistance");
-            int pointAttenBulbIndex = classElement.AddElement<float>(context, "PointAttenuationBulbSize");
-            int projectorAttenBulbIndex = classElement.AddElement<float>(context, "ProjectorAttenuationBulbSize");
-            int areaXYZIndex = classElement.AddElement<AZ::Vector3>(context, "Area X,Y,Z");
-
-            AZ::SerializeContext::DataElementNode& areaMaxDist = classElement.GetSubElement(areaMaxDistIndex);
-            AZ::SerializeContext::DataElementNode& pointMaxDist = classElement.GetSubElement(pointMaxDistIndex);
-            AZ::SerializeContext::DataElementNode& pointAttenBulb = classElement.GetSubElement(pointAttenBulbIndex);
-            AZ::SerializeContext::DataElementNode& projectorAttenBulb = classElement.GetSubElement(projectorAttenBulbIndex);
-            AZ::SerializeContext::DataElementNode& areaXYZ = classElement.GetSubElement(areaXYZIndex);
-
-            //Set width and height data to x and y from the old size
-            areaMaxDist.SetData<float>(context, maxDistVal);
-            pointMaxDist.SetData<float>(context, maxDistVal);
-            pointAttenBulb.SetData<float>(context, attenBulbVal);
-            projectorAttenBulb.SetData<float>(context, attenBulbVal);
-
-            //Set new area XYZ values based on existing area values
-            areaXYZ.SetData<AZ::Vector3>(context, AZ::Vector3(maxDistVal, areaWidthVal, areaHeightVal));
-
-            //Remove old MaxDistance and AttenuationBulbSize
-            classElement.RemoveElement(maxDistanceIndex);
-            classElement.RemoveElement(attenBulbIndex);
-        }
-
-        // conversion from version 4:
-        // m_color: AZ::Vector4 -> AZ::Color
-        if (classElement.GetVersion() <= 4)
-        {
-            int colorIndex = classElement.FindElement(AZ_CRC("Color", 0x665648e9));
-            if (colorIndex == -1)
-            {
-                return false;
-            }
-
-            AZ::SerializeContext::DataElementNode& color = classElement.GetSubElement(colorIndex);
-            AZ::Vector4 colorVec;
-            color.GetData<AZ::Vector4>(colorVec);
-            AZ::Color colorVal(colorVec.GetX(), colorVec.GetY(), colorVec.GetZ(), colorVec.GetW());
-            color.Convert<AZ::Color>(context);
-            color.SetData(context, colorVal);
-        }
-
-        // conversion from version 6 to version 7:
-        // - Need to rename IgnoreVisAreas to UseVisAreas
-        // UseVisAreas is the Inverse of IgnoreVisAreas
-        if (classElement.GetVersion() <= 6)
-        {
-            int ignoreVisAreasIndex = classElement.FindElement(AZ_CRC("IgnoreVisAreas", 0x01823201));
-
-            if (ignoreVisAreasIndex < 0)
-            {
-                return false;
-            }
-
-            AZ::SerializeContext::DataElementNode& useVisAreasNode = classElement.GetSubElement(ignoreVisAreasIndex);
-            useVisAreasNode.SetName("UseVisAreas");
-
-            bool ignoreVisAreas = true;
-            if (!useVisAreasNode.GetData<bool>(ignoreVisAreas))
-            {
-                return false;
-            }
-
-            if (!useVisAreasNode.SetData<bool>(context, !ignoreVisAreas))
-            {
-                return false;
-            }
-        }
-
-        if (classElement.GetVersion() <= 7)
-        {
-            AZ::SerializeContext::DataElementNode* cubemapTexture = classElement.FindSubElement(AZ_CRC("CubemapTexture", 0xbf6d8df4));
-
-            if (!cubemapTexture)
-            {
-                return false;
-            }
-
-            AZStd::string cubemapPath;
-
-            if (!cubemapTexture->GetData<AZStd::string>(cubemapPath))
-            {
-                return false;
-            }
-
-            AzFramework::SimpleAssetReference<TextureAsset> cubemapSimpleAsset;
-
-            cubemapSimpleAsset.SetAssetPath(cubemapPath.c_str());
-
-            if (!classElement.RemoveElementByName(AZ_CRC("CubemapTexture", 0xbf6d8df4)))
-            {
-                return false;
-            }
-
-            if (!classElement.AddElementWithData<AzFramework::SimpleAssetReference<TextureAsset>>(context, "CubemapTexture", cubemapSimpleAsset))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    bool LightComponent::TurnOnLight()
-    {
-        bool success = m_light.TurnOn();
-        if (success)
-        {
-            EBUS_EVENT_ID(GetEntityId(), LightComponentNotificationBus, LightTurnedOn);
-        }
-        return success;
-    }
-
-    bool LightComponent::TurnOffLight()
-    {
-        bool success = m_light.TurnOff();
-        if (success)
-        {
-            EBUS_EVENT_ID(GetEntityId(), LightComponentNotificationBus, LightTurnedOff);
-        }
-        return success;
-    }
-
-    ///////////////////////////////////////////////////////////////////////
-    // Modifiers
-    void LightComponent::SetVisible(bool isVisible)
-    {
-        if (isVisible != m_configuration.m_visible)
-        {
-            m_configuration.m_visible = isVisible;
-
-            if (m_configuration.m_visible)
-            {
-                if (!TurnOnLight())
-                {
-                    // unable to turn on light. This happens when trying to turn on a light was was previously not visible. Use UpdateRenderLight to
-                    // update the light's visibility (by recreating it) to turn it on.
-                    m_light.UpdateRenderLight(m_configuration);
-                }
-            }
-            else
-            {
-                TurnOffLight();
-            }
-        }
-    }
-
-    bool LightComponent::GetVisible()
-    {
-        return m_light.IsOn();
-    }
-
-    void LightComponent::SetColor(const AZ::Color& newColor)
-    {
-        if (m_configuration.m_color != newColor)
-        {
-            m_configuration.m_color = newColor;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-
-    const AZ::Color LightComponent::GetColor()
-    {
-        return m_configuration.m_color;
-    }
-
-    void LightComponent::SetDiffuseMultiplier(float newMultiplier)
-    {
-        if (m_configuration.m_diffuseMultiplier != newMultiplier)
-        {
-            m_configuration.m_diffuseMultiplier = newMultiplier;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetDiffuseMultiplier()
-    {
-        return m_configuration.m_diffuseMultiplier;
-    }
-
-    void LightComponent::SetSpecularMultiplier(float newMultiplier)
-    {
-        if (m_configuration.m_specMultiplier != newMultiplier)
-        {
-            m_configuration.m_specMultiplier = newMultiplier;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-
-    float LightComponent::GetSpecularMultiplier()
-    {
-        return m_configuration.m_specMultiplier;
-    }
-
-    void LightComponent::SetAmbient(bool isAmbient)
-    {
-        if (isAmbient != m_configuration.m_ambient)
-        {
-            m_configuration.m_ambient = isAmbient;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    bool LightComponent::GetAmbient()
-    {
-        return m_configuration.m_ambient;
-    }
-
-    void LightComponent::SetPointMaxDistance(float newMaxDistance)
-    {
-        if (newMaxDistance != m_configuration.m_pointMaxDistance)
-        {
-            m_configuration.m_pointMaxDistance = newMaxDistance;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetPointMaxDistance()
-    {
-        return m_configuration.m_pointMaxDistance;
-    }
-
-    void LightComponent::SetPointAttenuationBulbSize(float newAttenuationBulbSize)
-    {
-        if (newAttenuationBulbSize != m_configuration.m_pointAttenuationBulbSize)
-        {
-            m_configuration.m_pointAttenuationBulbSize = newAttenuationBulbSize;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetPointAttenuationBulbSize()
-    {
-        return m_configuration.m_pointAttenuationBulbSize;
-    }
-
-    void LightComponent::SetAreaMaxDistance(float newMaxDistance)
-    {
-        if (newMaxDistance != m_configuration.m_areaMaxDistance)
-        {
-            m_configuration.m_areaMaxDistance = newMaxDistance;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetAreaMaxDistance()
-    {
-        return m_configuration.m_areaMaxDistance;
-    }
-
-    void LightComponent::SetAreaWidth(float newWidth)
-    {
-        if (newWidth != m_configuration.m_areaWidth)
-        {
-            m_configuration.m_areaWidth = newWidth;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetAreaWidth()
-    {
-        return m_configuration.m_areaWidth;
-    }
-
-    void LightComponent::SetAreaHeight(float newHeight)
-    {
-        if (newHeight != m_configuration.m_areaHeight)
-        {
-            m_configuration.m_areaHeight = newHeight;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetAreaHeight()
-    {
-        return m_configuration.m_areaHeight;
-    }
-
-    void LightComponent::SetAreaFOV(float newFOV)
-    {
-        if (newFOV != m_configuration.m_areaFOV)
-        {
-            m_configuration.m_areaFOV = newFOV;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetAreaFOV()
-    {
-        return m_configuration.m_areaFOV;
-    }
-
-    void LightComponent::SetProjectorMaxDistance(float newMaxDistance)
-    {
-        if (newMaxDistance != m_configuration.m_projectorRange)
-        {
-            m_configuration.m_projectorRange = newMaxDistance;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetProjectorMaxDistance()
-    {
-        return m_configuration.m_projectorRange;
-    }
-
-    void LightComponent::SetProjectorAttenuationBulbSize(float newAttenuationBulbSize)
-    {
-        if (newAttenuationBulbSize != m_configuration.m_projectorAttenuationBulbSize)
-        {
-            m_configuration.m_projectorAttenuationBulbSize = newAttenuationBulbSize;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetProjectorAttenuationBulbSize()
-    {
-        return m_configuration.m_projectorAttenuationBulbSize;
-    }
-
-    void LightComponent::SetProjectorFOV(float newFOV)
-    {
-        if (newFOV != m_configuration.m_projectorFOV)
-        {
-            m_configuration.m_projectorFOV = newFOV;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetProjectorFOV()
-    {
-        return m_configuration.m_projectorFOV;
-    }
-
-    void LightComponent::SetProjectorNearPlane(float newNearPlane)
-    {
-        if (newNearPlane != m_configuration.m_projectorNearPlane)
-        {
-            m_configuration.m_projectorNearPlane = newNearPlane;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetProjectorNearPlane()
-    {
-        return m_configuration.m_projectorNearPlane;
-    }
-
-    void LightComponent::SetProbeAreaDimensions(const AZ::Vector3& newDimensions)
-    {
-        if (newDimensions != m_configuration.m_probeArea)
-        {
-            m_configuration.m_probeArea = newDimensions;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    const AZ::Vector3 LightComponent::GetProbeAreaDimensions()
-    {
-        return m_configuration.m_probeArea;
-    }
-
-    void LightComponent::SetProbeSortPriority(AZ::u32 newPriority)
-    {
-        if (newPriority != m_configuration.m_probeSortPriority)
-        {
-            m_configuration.m_probeSortPriority = newPriority;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    AZ::u32 LightComponent::GetProbeSortPriority()
-    {
-        return m_configuration.m_probeSortPriority;
-    }
-
-    void LightComponent::SetProbeBoxProjected(bool isProbeBoxProjected)
-    {
-        if (isProbeBoxProjected != m_configuration.m_isBoxProjected)
-        {
-            m_configuration.m_isBoxProjected = isProbeBoxProjected;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    bool LightComponent::GetProbeBoxProjected()
-    {
-        return m_configuration.m_isBoxProjected;
-    }
-
-    void LightComponent::SetProbeBoxHeight(float newHeight)
-    {
-        if (newHeight != m_configuration.m_boxHeight)
-        {
-            m_configuration.m_boxHeight = newHeight;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-    float LightComponent::GetProbeBoxHeight()
-    {
-        return m_configuration.m_boxHeight;
-    }
-
-    void LightComponent::SetProbeBoxLength(float newLength)
-    {
-        if (newLength != m_configuration.m_boxLength)
-        {
-            m_configuration.m_boxLength = newLength;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-
-    float LightComponent::GetProbeBoxLength()
-    {
-        return m_configuration.m_boxLength;
-    }
-
-    void LightComponent::SetProbeBoxWidth(float newWidth)
-    {
-        if (newWidth != m_configuration.m_boxWidth)
-        {
-            m_configuration.m_boxWidth = newWidth;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-
-    float LightComponent::GetProbeBoxWidth()
-    {
-        return m_configuration.m_boxWidth;
-    }
-
-    void LightComponent::SetProbeAttenuationFalloff(float newAttenuationFalloff)
-    {
-        if (newAttenuationFalloff != m_configuration.m_attenFalloffMax)
-        {
-            m_configuration.m_attenFalloffMax = newAttenuationFalloff;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-
-    float LightComponent::GetProbeAttenuationFalloff()
-    {
-        return m_configuration.m_attenFalloffMax;
-    }
-
-    void LightComponent::SetProbeFade(float fade)
-    {
-        AZ_Warning("Lighting", 0.0f <= fade && fade <= 1.0f, "SetProbeFade value %f out of range. Clamping to [0,1]", fade);
-        fade = AZ::GetClamp(fade, 0.0f, 1.0f);
-
-        if (fade != m_configuration.m_probeFade)
-        {
-            m_configuration.m_probeFade = fade;
-            m_light.UpdateRenderLight(m_configuration);
-        }
-    }
-
-    float LightComponent::GetProbeFade()
-    {
-        return m_configuration.m_probeFade;
-    }
-
-    ///////////////////////////////////////////////////////////
-    void LightComponent::ToggleLight()
-    {
-        if (m_light.IsOn())
-        {
-            TurnOffLight();
-        }
-        else
-        {
-            TurnOnLight();
-        }
-    }
-
-    void LightComponent::SetLightState(State state)
-    {
-        switch (state)
-        {
-        case LightComponentRequests::State::On:
-        {
-            TurnOnLight();
-        }
-        break;
-
-        case LightComponentRequests::State::Off:
-        {
-            TurnOffLight();
-        }
-        break;
-        }
-    }
-
-    IRenderNode* LightComponent::GetRenderNode()
-    {
-        return m_light.GetRenderNode();
-    }
-
-    float LightComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return s_renderNodeRequestBusOrder;
-    }
-
-    const float LightComponent::s_renderNodeRequestBusOrder = 500.f;
-
-    LightComponent::LightComponent()
-    {
-    }
-
-    LightComponent::~LightComponent()
-    {
-    }
-
-    void LightComponent::Init()
-    {
-    }
-
-    void LightComponent::Activate()
-    {
-        const AZ::EntityId entityId = GetEntityId();
-
-        m_light.SetEntity(entityId);
-        m_light.CreateRenderLight(m_configuration);
-
-        LightComponentRequestBus::Handler::BusConnect(entityId);
-        RenderNodeRequestBus::Handler::BusConnect(entityId);
-
-        if (m_configuration.m_onInitially)
-        {
-            m_light.TurnOn();
-        }
-        else
-        {
-            m_light.TurnOff();
-        }
-    }
-
-    void LightComponent::Deactivate()
-    {
-        LightComponentRequestBus::Handler::BusDisconnect();
-        RenderNodeRequestBus::Handler::BusDisconnect();
-        m_light.DestroyRenderLight();
-        m_light.SetEntity(AZ::EntityId());
-    }
-
-    LightConfiguration::LightConfiguration()
-        : m_lightType(LightType::Point)
-        , m_visible(true)
-        , m_onInitially(true)
-        , m_pointMaxDistance(2.f)
-        , m_pointAttenuationBulbSize(0.05f)
-        , m_areaMaxDistance(2.f)
-        , m_areaWidth(5.f)
-        , m_areaHeight(5.f)
-        , m_areaFOV(45.0f)
-        , m_projectorAttenuationBulbSize(0.05f)
-        , m_projectorRange(5.f)
-        , m_projectorFOV(90.f)
-        , m_projectorNearPlane(0)
-        , m_probeSortPriority(0)
-        , m_probeArea(20.0f, 20.0f, 20.0f)
-        , m_probeCubemapResolution(ResolutionSetting::ResDefault)
-        , m_isBoxProjected(false)
-        , m_boxWidth(20.0f)
-        , m_boxHeight(20.0f)
-        , m_boxLength(20.0f)
-        , m_attenFalloffMax(0.3f)
-        , m_probeFade(1.0f)
-        , m_minSpec(EngineSpec::Low)
-        , m_viewDistMultiplier(1.f)
-        , m_castShadowsSpec(EngineSpec::Never)
-        , m_voxelGIMode(IRenderNode::VM_None)
-        , m_color(1.f, 1.f, 1.f, 1.f)
-        , m_diffuseMultiplier(1.f)
-        , m_specMultiplier(1.f)
-        , m_affectsThisAreaOnly(true)
-        , m_useVisAreas(true)
-        , m_volumetricFog(true)
-        , m_volumetricFogOnly(false)
-        , m_indoorOnly(false)
-        , m_ambient(false)
-        , m_deferred(true)
-        , m_animIndex(0)
-        , m_animSpeed(1.f)
-        , m_animPhase(0.f)
-        , m_castTerrainShadows(false)
-        , m_shadowBias(1.f)
-        , m_shadowSlopeBias(1.f)
-        , m_shadowResScale(1.f)
-        , m_shadowUpdateMinRadius(10.f)
-        , m_shadowUpdateRatio(1.f)
-        , m_cubemapId(AZ::Uuid::Create())
-    {
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LightComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/LightComponent.h
deleted file mode 100644
index d562cf1701..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LightComponent.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/base.h>
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Color.h>
-#include <AzCore/Math/Uuid.h>
-#include <AzFramework/Asset/SimpleAsset.h>
-
-#include <LmbrCentral/Rendering/LightComponentBus.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <LmbrCentral/Rendering/MaterialAsset.h>
-
-#include "LightInstance.h"
-
-#include <IEntityRenderState.h>
-
-namespace LmbrCentral
-{
-    /*!
-     * Stores configuration settings for engine lights.
-     * - Common color and shader settings
-     * - Common shadow-casting settings
-     * - Settings unique to different light types
-     */
-    class LightConfiguration
-    {
-    public:
-
-        AZ_TYPE_INFO(LightConfiguration, "{F4CC7BB4-C541-480C-88FC-C5A8F37CC67F}");
-
-        // LY renderer supported light types.
-        enum class LightType : AZ::u32
-        {
-            Point = 0,  ///> Omni-directional point light
-            Area,       ///> Area/box light
-            Projector,  ///> Texture projector light
-            Probe,      ///> Environment probe
-        };
-
-        // Texture resolution settings.
-        enum class ResolutionSetting : AZ::u32
-        {
-            ResDefault = 256,
-            Res32 = 32,
-            Res64 = 64,
-            Res128 = 128,
-            Res256 = 256,
-            Res512 = 512,
-        };
-
-        LightConfiguration();
-        virtual ~LightConfiguration() {};
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        //! The type of render light (point/omni, projector, area, or environment probe).
-        LightType m_lightType;
-
-        //! Turned on by default?
-        bool m_onInitially;
-
-        //! Currently visible?
-        bool m_visible;
-
-        //! Point light settings
-        float m_pointMaxDistance;
-        float m_pointAttenuationBulbSize;
-
-        //! Settings for area lights
-        float m_areaWidth;
-        float m_areaHeight;
-        float m_areaMaxDistance;
-        float m_areaFOV;
-
-        //! Settings for projector lights
-        float m_projectorRange;
-        float m_projectorAttenuationBulbSize;
-        float m_projectorFOV;
-        float m_projectorNearPlane;
-        AzFramework::SimpleAssetReference<TextureAsset> m_projectorTexture;
-        AzFramework::SimpleAssetReference<MaterialAsset> m_material;
-
-        //! Settings for environment lights (probes)
-        AZ::Vector3 m_probeArea;
-        AZ::u32 m_probeSortPriority;
-        ResolutionSetting m_probeCubemapResolution;
-        AzFramework::SimpleAssetReference<TextureAsset> m_probeCubemap;
-        //parameter to enable box projection  
-        bool m_isBoxProjected;
-        float m_boxWidth;
-        float m_boxHeight;
-        float m_boxLength;
-        float m_attenFalloffMax;
-        float m_probeFade;
-
-        //! Settings common to all LY engine lights
-        EngineSpec m_minSpec;
-        float m_viewDistMultiplier;
-        EngineSpec m_castShadowsSpec;
-        IRenderNode::EVoxelGIMode m_voxelGIMode;
-        
-        AZ::Color m_color;
-        float m_diffuseMultiplier;
-        float m_specMultiplier;
-        bool m_affectsThisAreaOnly;
-        bool m_useVisAreas;
-        bool m_indoorOnly;
-        bool m_ambient;
-        bool m_deferred;
-        AZ::u32 m_animIndex;
-        float m_animSpeed;
-        float m_animPhase;
-        bool m_volumetricFog;
-        bool m_volumetricFogOnly;
-        bool m_castTerrainShadows;
-
-        //! Shadow settings
-        float m_shadowBias;
-        float m_shadowSlopeBias;
-        float m_shadowResScale;
-        float m_shadowUpdateMinRadius;
-        float m_shadowUpdateRatio;
-
-        // Need to keep a unique Id to use as cubemap name
-        AZ::Uuid m_cubemapId;
-
-        // \todo clip bounds - artists aren't using it. Includes fade dimensions.
-
-        AZ::EntityId m_editorEntityId; // Editor-only, not reflected.
-
-        // Property event-handlers implemented in editor component.
-        virtual AZ::Crc32 GetAmbientLightVisibility() const { return 0; }
-        virtual AZ::Crc32 GetPointLightVisibility() const { return 0; }
-        virtual AZ::Crc32 GetProjectorLightVisibility() const { return 0; }
-        virtual AZ::Crc32 GetProbeLightVisibility() const { return 0; }
-        virtual AZ::Crc32 GetShadowSpecVisibility() const { return 0; }
-        virtual AZ::Crc32 GetShadowSettingsVisibility() const { return 0; }
-        virtual AZ::Crc32 GetAreaSettingVisibility() const { return 0; }
-        virtual AZ::Crc32 MinorPropertyChanged() { return 0; }
-        virtual AZ::Crc32 MajorPropertyChanged() { return 0; }
-        virtual AZ::Crc32 OnAnimationSettingChanged() { return 0; }
-        virtual AZ::Crc32 OnCubemapAssetChanged() { return 0; }
-        virtual bool CanGenerateCubemap() const { return false; }
-
-    private:
-
-        static bool VersionConverter(AZ::SerializeContext& context,
-            AZ::SerializeContext::DataElementNode& classElement);
-    };
-
-    /*!
-     * In-game light component.
-     */
-    class LightComponent
-        : public AZ::Component
-        , public LightComponentRequestBus::Handler
-        , public RenderNodeRequestBus::Handler
-    {
-    public:
-
-        friend class EditorLightComponent;
-
-        AZ_COMPONENT(LightComponent, "{6B9AB512-CA8A-4D2B-B570-DF128EA7CE6A}");
-
-        LightComponent();
-        ~LightComponent() override;
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Init() override;
-        void Activate() override;
-        void Deactivate() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // LightComponentRequests::Bus::Handler interface implementation
-        void SetLightState(State state) override;
-        bool TurnOnLight() override;
-        bool TurnOffLight() override;
-        void ToggleLight() override;
-
-        ////////////////////////////////////
-        // Modifiers
-        void SetVisible(bool isVisible) override;
-        bool GetVisible() override;
-
-        void SetColor(const AZ::Color& newColor) override;
-        const AZ::Color GetColor() override;
-
-        void SetDiffuseMultiplier(float newMultiplier) override;
-        float GetDiffuseMultiplier() override;
-
-        void SetSpecularMultiplier(float newMultiplier) override;
-        float GetSpecularMultiplier() override;
-
-        void SetAmbient(bool isAmbient) override;
-        bool GetAmbient() override;
-
-        void SetPointMaxDistance(float newMaxDistance) override;
-        float GetPointMaxDistance() override;
-
-        void SetPointAttenuationBulbSize(float newAttenuationBulbSize) override;
-        float GetPointAttenuationBulbSize() override;
-
-        void SetAreaMaxDistance(float newMaxDistance) override;
-        float GetAreaMaxDistance() override;
-
-        void SetAreaWidth(float newWidth) override;
-        float GetAreaWidth() override;
-
-        void SetAreaHeight(float newHeight) override;
-        float GetAreaHeight() override;
-
-        void SetAreaFOV(float newFOV) override;
-        float GetAreaFOV() override;
-
-        void SetProjectorMaxDistance(float newMaxDistance) override;
-        float GetProjectorMaxDistance() override;
-
-        void SetProjectorAttenuationBulbSize(float newAttenuationBulbSize) override;
-        float GetProjectorAttenuationBulbSize() override;
-
-        void SetProjectorFOV(float newFOV) override;
-        float GetProjectorFOV() override;
-
-        void SetProjectorNearPlane(float newNearPlane) override;
-        float GetProjectorNearPlane() override;
-
-        // Environment Probe Settings
-        void SetProbeAreaDimensions(const AZ::Vector3& newDimensions) override;
-        const AZ::Vector3 GetProbeAreaDimensions() override;
-
-        void SetProbeSortPriority(AZ::u32 newPriority) override;
-        AZ::u32 GetProbeSortPriority() override;
-
-        void SetProbeBoxProjected(bool isProbeBoxProjected) override;
-        bool GetProbeBoxProjected() override;
-
-        void SetProbeBoxHeight(float newHeight) override;
-        float GetProbeBoxHeight() override;
-
-        void SetProbeBoxLength(float newLength) override;
-        float GetProbeBoxLength() override;
-
-        void SetProbeBoxWidth(float newWidth) override;
-        float GetProbeBoxWidth() override;
-
-        void SetProbeAttenuationFalloff(float newAttenuationFalloff) override;
-        float GetProbeAttenuationFalloff() override;
-
-        void SetProbeFade(float fade) override;
-        float GetProbeFade() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // RenderNodeRequestBus::Handler interface implementation
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-        static const float s_renderNodeRequestBusOrder;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("LightService", 0xfd7fa928));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-        }
-
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& /*dependent*/)
-        {
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("LightService", 0xfd7fa928));
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-        //////////////////////////////////////////////////////////////////////////
-
-    protected:
-
-        LightConfiguration m_configuration;
-        LightInstance m_light;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LightInstance.cpp b/Gems/LmbrCentral/Code/Source/Rendering/LightInstance.cpp
deleted file mode 100644
index 0c5da629ed..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LightInstance.cpp
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Math/Quaternion.h>
-#include <MathConversion.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/Entity.h>
-
-#include <I3DEngine.h>
-
-#include "LightInstance.h"
-#include "LightComponent.h"
-#include "LensFlareComponent.h"
-
-namespace
-{
-    const float kDefaultLightFrustumAngle = 45.f;
-    const uint8 kDefaultLensOpticsFrustumAngle = 255;
-
-    void UpdateLightFlag(bool enable, int mask, unsigned int& flags)
-    {
-        if (enable)
-        {
-            flags |= mask;
-        }
-        else
-        {
-            flags &= ~mask;
-        }
-    }
-
-    AZ::u32 CreateLightId(AZ::EntityId entityId)
-    {
-        // Renderer requires a non-zero value, but doesn't care what it actually means.
-        // This is used only for debug coloring and tie-breaking sorts.
-        // Use the timestamp half of our entity Id.
-        const AZ::u32 lowerEntityId = static_cast<AZ::u32>(static_cast<AZ::u64>(entityId) >> 32);
-        return lowerEntityId;
-    }
-
-    const char* GetEntityName(AZ::EntityId entityId)
-    {
-        AZ::Entity* entity = nullptr;
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, entityId);
-        return (entity ? entity->GetName().c_str() : "<unknown>");
-    }
-
-    void LightConfigToLightParams(const LmbrCentral::LightConfiguration& configuration, AZ::EntityId entityId, int configSpec, CDLight& lightParams)
-    {
-        // The light cannot be ambient if it is an environment probe
-        bool ambient = configuration.m_ambient;
-        if (configuration.m_lightType == LmbrCentral::LightConfiguration::LightType::Probe)
-        {
-            ambient = false;
-        }
-
-        lightParams.SetPosition(Vec3_Zero);
-        lightParams.m_fLightFrustumAngle = kDefaultLightFrustumAngle;
-        lightParams.m_Flags = 0;
-        lightParams.m_LensOpticsFrustumAngle = kDefaultLensOpticsFrustumAngle;
-        Vec3 color = AZColorToLYVec3(configuration.m_color);
-        color *= configuration.m_diffuseMultiplier;
-        lightParams.SetLightColor(ColorF(color.x, color.y, color.z, 1.f));
-        lightParams.SetSpecularMult(configuration.m_specMultiplier);
-
-        lightParams.m_nLightStyle = configuration.m_animIndex; // "light style" is really a light animation curve index
-        lightParams.SetAnimSpeed(configuration.m_animSpeed); // maps [0, 4] to [0, 255]
-        lightParams.m_nLightPhase = static_cast<AZ::u8>(configuration.m_animPhase * 255.f); // maps [0, 1] to [0, 255]
-
-        lightParams.m_nEntityId = CreateLightId(entityId);
-
-        UpdateLightFlag(!configuration.m_useVisAreas, DLF_IGNORES_VISAREAS, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_indoorOnly, DLF_INDOOR_ONLY, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_affectsThisAreaOnly, DLF_THIS_AREA_ONLY, lightParams.m_Flags);
-        UpdateLightFlag(ambient, DLF_AMBIENT, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_deferred, DLF_DEFERRED_LIGHT, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_volumetricFog, DLF_VOLUMETRIC_FOG, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_volumetricFogOnly, DLF_VOLUMETRIC_FOG_ONLY, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_castTerrainShadows, DLF_CAST_TERRAIN_SHADOWS, lightParams.m_Flags);
-
-        if (static_cast<AZ::u32>(configSpec) >= static_cast<AZ::u32>(configuration.m_castShadowsSpec))
-        {
-            lightParams.m_Flags |= DLF_CASTSHADOW_MAPS;
-        }
-
-        //Probe won't cast shadow. Enable this flag wrongly for probe could lead to wrong bbox. 
-        if (configuration.m_lightType == LmbrCentral::LightConfiguration::LightType::Probe)
-        {
-            lightParams.m_Flags &= ~DLF_CASTSHADOW_MAPS;
-        }
-
-        lightParams.m_fShadowBias = configuration.m_shadowBias;
-        lightParams.m_fShadowSlopeBias = configuration.m_shadowSlopeBias;
-        lightParams.m_fShadowResolutionScale = configuration.m_shadowResScale;
-        lightParams.m_fShadowUpdateMinRadius = configuration.m_shadowUpdateMinRadius;
-        lightParams.m_nShadowUpdateRatio = max((uint16)1, (uint16)(configuration.m_shadowUpdateRatio * (1 << DL_SHADOW_UPDATE_SHIFT)));
-
-        switch (configuration.m_lightType)
-        {
-        case LmbrCentral::LightConfiguration::LightType::Point:
-        {
-            lightParams.m_fRadius = configuration.m_pointMaxDistance;
-            lightParams.m_fAttenuationBulbSize = configuration.m_pointAttenuationBulbSize;
-            lightParams.m_Flags |= DLF_POINT;
-        }
-        break;
-
-        case LmbrCentral::LightConfiguration::LightType::Area:
-        {
-            lightParams.m_fRadius = configuration.m_areaMaxDistance;
-            lightParams.m_fAreaWidth = configuration.m_areaWidth;
-            lightParams.m_fAreaHeight = configuration.m_areaHeight;
-            lightParams.m_fLightFrustumAngle = configuration.m_areaFOV;
-            lightParams.m_Flags |= DLF_AREA_LIGHT;
-        }
-        break;
-
-        case LmbrCentral::LightConfiguration::LightType::Projector:
-        {
-            lightParams.m_fRadius = configuration.m_projectorRange;
-            lightParams.m_fLightFrustumAngle = configuration.m_projectorFOV * 0.5f;
-            lightParams.m_fProjectorNearPlane = configuration.m_projectorNearPlane;
-            lightParams.m_fAttenuationBulbSize = configuration.m_projectorAttenuationBulbSize;
-            lightParams.m_Flags |= DLF_PROJECT;
-
-            const char* texturePath = configuration.m_projectorTexture.GetAssetPath().c_str();
-            const int flags = FT_DONT_STREAM;
-
-            if (gEnv->pRenderer)
-            {
-                lightParams.m_pLightImage = gEnv->pRenderer->EF_LoadTexture(texturePath, flags);
-
-                if (!lightParams.m_pLightImage || !lightParams.m_pLightImage->IsTextureLoaded())
-                {
-                    GetISystem()->Warning(VALIDATOR_MODULE_RENDERER, VALIDATOR_WARNING, 0, texturePath,
-                        "Light projector texture not found: %s", texturePath);
-                    lightParams.m_pLightImage = gEnv->pRenderer->EF_LoadTexture("Textures/defaults/red.dds", flags);
-                }
-            }
-        }
-        break;
-
-        case LmbrCentral::LightConfiguration::LightType::Probe:
-        {
-            lightParams.m_ProbeExtents.x = configuration.m_probeArea.GetX() / 2.0f;
-            lightParams.m_ProbeExtents.y = configuration.m_probeArea.GetY() / 2.0f;
-            lightParams.m_ProbeExtents.z = configuration.m_probeArea.GetZ() / 2.0f;
-            lightParams.m_fRadius = lightParams.m_ProbeExtents.len();
-            lightParams.m_nSortPriority = configuration.m_probeSortPriority;
-            lightParams.m_fProbeAttenuation = configuration.m_probeFade;
-
-            //projection
-            if (configuration.m_isBoxProjected)
-            {
-                //enable box projection
-                lightParams.m_Flags |= DLF_BOX_PROJECTED_CM;
-            }
-            lightParams.m_fBoxHeight = configuration.m_boxHeight;
-            lightParams.m_fBoxLength = configuration.m_boxLength;
-            lightParams.m_fBoxWidth = configuration.m_boxWidth;
-            lightParams.SetFalloffMax(configuration.m_attenFalloffMax);
-
-            lightParams.ReleaseCubemaps();
-
-            const AZStd::string& specularMap = configuration.m_probeCubemap.GetAssetPath();
-
-            if (!specularMap.empty())
-            {
-                AZStd::string diffuseMap = specularMap;
-                AZStd::string::size_type dotPos = specularMap.find_last_of('.');
-                if (dotPos != AZStd::string::npos)
-                {
-                    diffuseMap.insert(dotPos, "_diff");
-                }
-
-                if (gEnv->pRenderer)
-                {
-                    lightParams.SetSpecularCubemap(gEnv->pRenderer->EF_LoadCubemapTexture(specularMap.c_str(), FT_DONT_STREAM));
-                    lightParams.SetDiffuseCubemap(gEnv->pRenderer->EF_LoadCubemapTexture(diffuseMap.c_str(), FT_DONT_STREAM));
-                }
-
-                if (lightParams.GetDiffuseCubemap() && lightParams.GetSpecularCubemap())
-                {
-                    lightParams.m_Flags |= DLF_DEFERRED_CUBEMAPS;
-                }
-                else
-                {
-                    if (!lightParams.GetSpecularCubemap())
-                    {
-                        AZ_Warning("Light", false,
-                            "Failed to load specular cubemap \"%s\" for light \"%s\".",
-                            specularMap.c_str(),
-                            GetEntityName(entityId));
-                    }
-
-                    if (!lightParams.GetDiffuseCubemap())
-                    {
-                        AZ_Warning("Light", false,
-                            "Failed to load diffuse cubemap \"%s\" for light \"%s\".",
-                            diffuseMap.c_str(),
-                            GetEntityName(entityId));
-                    }
-
-                    lightParams.m_Flags &= ~DLF_DEFERRED_CUBEMAPS;
-                    lightParams.m_Flags |= DLF_POINT;
-                    lightParams.ReleaseCubemaps();
-                }
-            }
-            else
-            {
-                // Disable the light
-                lightParams.m_Flags = DLF_FAKE;
-            }
-        }
-        break;
-        }
-    }
-
-    void LensFlareConfigToLightParams(const LmbrCentral::LensFlareConfiguration& configuration, [[maybe_unused]] AZ::EntityId entityId, int, CDLight& lightParams)
-    {
-        lightParams.m_Flags |= DLF_FAKE; // As long as deferred lights are separate components disable the actual deferred light
-
-        ColorF color = AZVec3ToLYVec3(configuration.m_tint);
-        color.a = configuration.m_tintAlpha / 255.0f;
-        lightParams.SetLightColor(ColorF(1.f, 1.f, 1.f, 1.f));  //Set the light color to white. We can tint the lens flare directly
-
-        if (configuration.m_syncAnimWithLight)
-        {
-            lightParams.m_nLightStyle = static_cast<AZ::u8>(configuration.m_syncAnimIndex); // This is really a light animation curve ID
-            lightParams.SetAnimSpeed(configuration.m_syncAnimSpeed); // maps [0, 4] to [0, 255]
-            lightParams.m_nLightPhase = static_cast<AZ::u8>(configuration.m_syncAnimPhase * 255.f); // maps [0, 1] to [0, 255]
-        }
-        else if (configuration.m_attachToSun)
-        {
-            gEnv->p3DEngine->SetSunAnimIndex(static_cast<AZ::u8>(configuration.m_animIndex)); // This is really a light animation curve ID
-            gEnv->p3DEngine->SetSunAnimSpeed(configuration.m_animSpeed); // maps [0, 4] to [0, 255]
-            gEnv->p3DEngine->SetSunAnimPhase(static_cast<AZ::u8>(configuration.m_animPhase * 255.f)); // maps [0, 1] to [0, 255]
-        }
-        else
-        {
-            lightParams.m_nLightStyle = static_cast<AZ::u8>(configuration.m_animIndex); // This is really a light animation curve ID
-            lightParams.SetAnimSpeed(configuration.m_animSpeed); // maps [0, 4] to [0, 255]
-            lightParams.m_nLightPhase = static_cast<AZ::u8>(configuration.m_animPhase * 255.f); // maps [0, 1] to [0, 255]
-        }
-
-        lightParams.m_LensOpticsFrustumAngle = static_cast<AZ::u8>(configuration.m_lensFlareFrustumAngle / 360.f * 255.f);
-
-        UpdateLightFlag(configuration.m_affectsThisAreaOnly, DLF_THIS_AREA_ONLY, lightParams.m_Flags);
-        UpdateLightFlag(!configuration.m_useVisAreas, DLF_IGNORES_VISAREAS, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_indoorOnly, DLF_INDOOR_ONLY, lightParams.m_Flags);
-        UpdateLightFlag(configuration.m_attachToSun, DLF_ATTACH_TO_SUN, lightParams.m_Flags);
-
-        if (!configuration.m_lensFlare.empty())
-        {
-            int lensOpticsID = 0;
-            if (gEnv->pOpticsManager->Load(configuration.m_lensFlare.c_str(), lensOpticsID))
-            {
-                IOpticsElementBase* flare = gEnv->pOpticsManager->GetOptics(lensOpticsID);
-                lightParams.SetLensOpticsElement(flare);
-                lightParams.SetOpticsParams({ configuration.m_brightness, configuration.m_size, { color.r, color.g, color.b, color.a }, true });
-            }
-            else
-            {
-                AZ_Warning("LensFlare", false, "Failed to load lens flare \"%s\" for entity \"%s\".", configuration.m_lensFlare.c_str(), GetEntityName(entityId));
-            }
-        }
-    }
-}
-
-namespace LmbrCentral
-{
-    LightInstance::LightInstance()
-        : m_renderLight(nullptr)
-    {
-    }
-
-    LightInstance::~LightInstance()
-    {
-        DestroyRenderLight();
-    }
-
-    void LightInstance::SetEntity(AZ::EntityId entityId)
-    {
-        if (m_entityId.IsValid())
-        {
-            AZ::TransformNotificationBus::Handler::BusDisconnect();
-        }
-
-        m_entityId = entityId;
-
-        if (m_entityId.IsValid())
-        {
-            AZ::TransformNotificationBus::Handler::BusConnect(m_entityId);
-        }
-    }
-
-    void LightInstance::OnTransformChanged(const AZ::Transform&, const AZ::Transform& world)
-    {
-        if (m_renderLight)
-        {
-            CDLight* lightProperties = &m_renderLight->GetLightProperties();
-            Matrix34 worldMatrix = AZTransformToLYTransform(world);
-            worldMatrix.OrthonormalizeFast(); // Lights do not support scale.
-            lightProperties->SetPosition(worldMatrix.GetTranslation());
-            lightProperties->SetMatrix(worldMatrix);
-            m_renderLight->SetMatrix(worldMatrix);
-        }
-    }
-
-    bool LightInstance::TurnOn()
-    {
-        if (!m_renderLight)
-        {
-            return false;
-        }
-
-        m_renderLight->SetRndFlags(ERF_HIDDEN, false);
-        return true;
-    }
-
-    bool LightInstance::TurnOff()
-    {
-        if (!m_renderLight)
-        {
-            return false;
-        }
-
-        m_renderLight->SetRndFlags(ERF_HIDDEN, true);
-        return true;
-    }
-
-    bool LightInstance::IsOn() const
-    {
-        if (!m_renderLight)
-        {
-            return false;
-        }
-
-        return 0 == (m_renderLight->GetRndFlags() & ERF_HIDDEN);
-    }
-
-    void LightInstance::CreateRenderLight(const LightConfiguration& configuration)
-    {
-        CreateRenderLightInternal(configuration, LightConfigToLightParams);
-
-#if defined(FEATURE_SVO_GI)
-        if (m_renderLight)
-        {
-            m_renderLight->SetDesiredVoxelGIMode(configuration.m_voxelGIMode);
-        }
-#endif
-    }
-
-    void LightInstance::CreateRenderLight(const LensFlareConfiguration& configuration)
-    {
-        CreateRenderLightInternal(configuration, LensFlareConfigToLightParams);
-    }
-
-    void LightInstance::UpdateRenderLight(const LightConfiguration& configuration)
-    {
-        // ERF_HIDDEN is used to turn on/off the light, so cache it here and set it back later
-        bool isHidden = m_renderLight ? (m_renderLight->GetRndFlags() & ERF_HIDDEN) == ERF_HIDDEN : false;
-        DestroyRenderLight();
-        CreateRenderLight(configuration);
-        if (m_renderLight)
-        {
-            m_renderLight->SetRndFlags(ERF_HIDDEN, isHidden);
-        }
-    }
-
-    void LightInstance::UpdateRenderLight(const LensFlareConfiguration& configuration)
-    {
-        // ERF_HIDDEN is used to turn on/off the light, so cache it here and set it back later
-        bool isHidden = m_renderLight ? (m_renderLight->GetRndFlags() & ERF_HIDDEN) == ERF_HIDDEN : false;
-        DestroyRenderLight();
-        CreateRenderLight(configuration);
-        if (m_renderLight)
-        {
-            m_renderLight->SetRndFlags(ERF_HIDDEN, isHidden);
-        }
-    }
-
-    void LightInstance::DestroyRenderLight()
-    {
-        if (m_renderLight)
-        {
-            m_renderLight->ReleaseNode();
-            m_renderLight = nullptr;
-        }
-    }
-
-    IRenderNode* LightInstance::GetRenderNode()
-    {
-        return m_renderLight;
-    }
-
-    template <typename ConfigurationType, typename ConfigToLightParamsFunc>
-    void LightInstance::CreateRenderLightInternal(const ConfigurationType& configuration, ConfigToLightParamsFunc configToLightParams)
-    {
-        if (m_renderLight || !configuration.m_visible || !gEnv->p3DEngine)
-        {
-            return;
-        }
-
-        ICVar* cvarSysSpecLight = gEnv->pConsole->GetCVar("e_LightQuality");
-        const int configSpec = cvarSysSpecLight ? cvarSysSpecLight->GetIVal() : gEnv->pSystem->GetConfigSpec(true);
-
-        if (static_cast<AZ::u32>(configSpec) < static_cast<AZ::u32>(configuration.m_minSpec))
-        {
-            // Light is disabled in the active system spec.
-            return;
-        }
-
-        CDLight lightParams;
-        configToLightParams(configuration, m_entityId, configSpec, lightParams);
-
-        m_renderLight = gEnv->p3DEngine->CreateLightSource();
-
-        if (!configuration.m_material.GetAssetPath().empty())
-        {
-            m_renderLight->SetMaterial(gEnv->p3DEngine->GetMaterialManager()->LoadMaterial(configuration.m_material.GetAssetPath().c_str()));
-        }
-
-        m_renderLight->SetLightProperties(lightParams);
-        m_renderLight->SetMinSpec(static_cast<int>(configuration.m_minSpec));
-        m_renderLight->SetViewDistanceMultiplier(configuration.m_viewDistMultiplier);
-
-        AZ::Transform parentTransform = AZ::Transform::CreateIdentity();
-        EBUS_EVENT_ID_RESULT(parentTransform, m_entityId, AZ::TransformBus, GetWorldTM);
-        OnTransformChanged(AZ::Transform::CreateIdentity(), parentTransform);
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/LightInstance.h b/Gems/LmbrCentral/Code/Source/Rendering/LightInstance.h
deleted file mode 100644
index 694aa3a227..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/LightInstance.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Component/EntityId.h>
-
-struct ILightSource;
-struct IRenderNode;
-class CDLight;
-
-namespace LmbrCentral
-{
-    class LightConfiguration;
-    class LensFlareConfiguration;
-
-    /*!
-     * Renderer specific implementation of a Renderer light
-     */
-    class LightInstance final
-        : private AZ::TransformNotificationBus::Handler
-    {
-    public:
-
-        AZ_TYPE_INFO(LightInstance, "{844D6585-6613-4E0D-BBA7-C37073B84F5F}");
-
-        LightInstance();
-        ~LightInstance();
-
-        void SetEntity(AZ::EntityId id);
-
-        void CreateRenderLight(const LightConfiguration& configuration);
-        void UpdateRenderLight(const LightConfiguration& configuration);
-
-        void CreateRenderLight(const LensFlareConfiguration& configuration);
-        void UpdateRenderLight(const LensFlareConfiguration& configuration);
-
-        void DestroyRenderLight();
-
-        IRenderNode* GetRenderNode();
-
-        bool IsOn() const;
-
-        bool TurnOn();
-        bool TurnOff();
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::TransformNotificationBus::Handler interface implementation
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-        //////////////////////////////////////////////////////////////////////////
-
-    private:
-        template <typename ConfigurationType, typename ConfigToLightParamsFunc>
-        void CreateRenderLightInternal(const ConfigurationType& configuration, ConfigToLightParamsFunc configToLightParams);
-
-        AZ::EntityId m_entityId;
-        ILightSource* m_renderLight;
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/MaterialHandle.cpp b/Gems/LmbrCentral/Code/Source/Rendering/MaterialHandle.cpp
deleted file mode 100644
index 6171951398..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/MaterialHandle.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-#include <LmbrCentral/Rendering/MaterialHandle.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Math/Color.h>
-#include <IRenderer.h>
-#include <ISystem.h>
-#include <I3DEngine.h>
-
-
-namespace LmbrCentral
-{
-    // Provides a set of reflected functions for operating on IMaterial through a MaterialHandle
-    // We keep these cpp-private instead of putting them in the header to align with the fact that
-    // MaterialHandle is not useful on the code side, and only exists to support reflection. If it
-    // were possible to reflect IMaterial directly, we'd still have this same set of functions here.
-    namespace MaterialHandleFunctions
-    {
-        void SetParamVector4(MaterialHandle* thisPtr, const AZStd::string& name, const AZ::Vector4& value)
-        {
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    Vec4 vec4(value.GetX(), value.GetY(), value.GetZ(), value.GetW());
-                    thisPtr->m_material->SetGetMaterialParamVec4(name.c_str(), vec4, false, true);
-                }
-                else
-                {
-                    AZ_Error("Material", false, "SetParamVector4 only accepts single Materials, not Material Groups");
-                }
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to SetParamVector4");
-            }
-        }
-
-        void SetParamVector3(MaterialHandle* thisPtr, const AZStd::string& name, const AZ::Vector3& value)
-        {
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    Vec3 vec3(value.GetX(), value.GetY(), value.GetZ());
-                    thisPtr->m_material->SetGetMaterialParamVec3(name.c_str(), vec3, false, true);
-                }
-                else
-                {
-                    AZ_Error("Material", false, "SetParamVector3 only accepts single Materials, not Material Groups");
-                }
-
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to SetParamVector3");
-            }
-        }
-
-        void SetParamColor(MaterialHandle* thisPtr, const AZStd::string& name, const AZ::Color& value)
-        {
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    // When value had garbage data is was not only making the material render black, it also corrupted something
-                    // on the GPU, making black boxes flicker over the sky.
-                    // It was garbage due to a bug in the Color object node where all fields have to be set to some value manually; the default is not 0.
-                    if ((value.GetR() < 0 || value.GetR() > 1) ||
-                        (value.GetG() < 0 || value.GetG() > 1) ||
-                        (value.GetB() < 0 || value.GetB() > 1) ||
-                        (value.GetA() < 0 || value.GetA() > 1))
-                    {
-                        return;
-                    }
-
-                    Vec4 vec4(value.GetR(), value.GetG(), value.GetB(), value.GetA());
-                    thisPtr->m_material->SetGetMaterialParamVec4(name.c_str(), vec4, false, true);
-                }
-                else
-                {
-                    AZ_Error("Material", false, "SetParamColor only accepts single Materials, not Material Groups");
-                }
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to SetParamColor");
-            }
-        }
-
-        void SetParamFloat(MaterialHandle* thisPtr, const AZStd::string& name, float value)
-        {
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    thisPtr->m_material->SetGetMaterialParamFloat(name.c_str(), value, false, true);
-                }
-                else
-                {
-                    AZ_Error("Material", false, "SetParamFloat only accepts single Materials, not Material Groups");
-                }
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to SetParamFloat");
-            }
-        }
-
-        AZ::Vector4 GetParamVector4(MaterialHandle* thisPtr, const AZStd::string& name)
-        {
-            AZ::Vector4 value = AZ::Vector4::CreateZero();
-
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    Vec4 vec4;
-                    if (thisPtr->m_material->SetGetMaterialParamVec4(name.c_str(), vec4, true, true))
-                    {
-                        value.Set(vec4.x, vec4.y, vec4.z, vec4.w);
-                    }
-                }
-                else
-                {
-                    AZ_Error("Material", false, "GetParamVector4 only accepts single Materials, not Material Groups");
-                }
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to GetParamVector4");
-            }
-
-            return value;
-        }
-
-        AZ::Vector3 GetParamVector3(MaterialHandle* thisPtr, const AZStd::string& name)
-        {
-            AZ::Vector3 value = AZ::Vector3::CreateZero();
-
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    Vec3 vec3;
-                    if (thisPtr->m_material->SetGetMaterialParamVec3(name.c_str(), vec3, true, true))
-                    {
-                        value.Set(vec3.x, vec3.y, vec3.z);
-                    }
-                }
-                else
-                {
-                    AZ_Error("Material", false, "GetParamVector3 only accepts single Materials, not Material Groups");
-                }
-
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to GetParamVector3");
-            }
-
-            return value;
-        }
-
-        AZ::Color GetParamColor(MaterialHandle* thisPtr, const AZStd::string& name)
-        {
-            AZ::Color value = AZ::Color::CreateZero();
-
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    Vec4 vec4;
-                    if (thisPtr->m_material->SetGetMaterialParamVec4(name.c_str(), vec4, true, true))
-                    {
-                        value.Set(vec4.x, vec4.y, vec4.z, vec4.w);
-                    }
-                }
-                else
-                {
-                    AZ_Error("Material", false, "GetParamColor only accepts single Materials, not Material Groups");
-                }
-
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to GetParamColor");
-            }
-
-            return value;
-        }
-
-        float GetParamFloat(MaterialHandle* thisPtr, const AZStd::string& name)
-        {
-            float value = 0.0f;
-
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsMaterialGroup())
-                {
-                    thisPtr->m_material->SetGetMaterialParamFloat(name.c_str(), value, true, true);
-                }
-                else
-                {
-                    AZ_Error("Material", false, "GetParamFloat only accepts single Materials, not Material Groups");
-                }
-
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to GetParamFloat");
-            }
-
-            return value;
-        }
-
-        MaterialHandle Clone(MaterialHandle* thisPtr)
-        {
-            MaterialHandle copy;
-
-            if (thisPtr && thisPtr->m_material)
-            {
-                if (!thisPtr->m_material->IsSubMaterial())
-                {
-                    copy.m_material = gEnv->p3DEngine->GetMaterialManager()->CloneMultiMaterial(thisPtr->m_material);
-                }
-                else
-                {
-                    AZ_Error("Material", false, "Clone does not support Sub-Materials");
-                }
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to Clone");
-            }
-
-            return copy;
-        }
-
-        MaterialHandle FindByName(const AZStd::string& name)
-        {
-            MaterialHandle found;
-            found.m_material = gEnv->p3DEngine->GetMaterialManager()->FindMaterial(name.c_str());
-            return found;
-        }
-
-        MaterialHandle LoadByName(const AZStd::string& name)
-        {
-            LmbrCentral::MaterialHandle handle;
-            handle.m_material = gEnv->p3DEngine->GetMaterialManager()->LoadMaterial(name.c_str(), false, false, IMaterialManager::ELoadingFlagsPreviewMode);
-
-            AZ_Error(nullptr, handle.m_material, "Material.LoadByName('%s') failed", name.c_str());
-
-            return handle;
-        }
-
-        _smart_ptr<IMaterial> GetSubMaterialHelper(_smart_ptr<IMaterial> materialGroup, int materialId)
-        {
-            if (materialGroup)
-            {
-                if (materialGroup->IsMaterialGroup())
-                {
-                    int subMtlCount = materialGroup->GetSubMtlCount();
-                    if (materialId >= 1 && materialId <= subMtlCount)
-                    {
-                        return materialGroup->GetSubMtl(materialId-1);
-                    }
-                    else
-                    {
-                        AZ_Error("Material", false, "Invalid Material ID %d passed to FindSubMaterial. %d Materials are available.", materialId, subMtlCount);
-                    }
-                }
-                else
-                {
-                    AZ_Error("Material", false, "FindSubMaterial does not support single Material");
-                }
-            }
-            else
-            {
-                AZ_Warning("Material", false, "Invalid Material passed to FindSubMaterial.");
-            }
-
-            return nullptr;
-        }
-
-
-
-        MaterialHandle FindSubMaterial(const AZStd::string& name, int id, bool shouldLoad)
-        {
-            MaterialHandle found;
-            _smart_ptr<IMaterial> materialGroup = gEnv->p3DEngine->GetMaterialManager()->FindMaterial(name.c_str());
-            if (materialGroup)
-            {
-                found.m_material = GetSubMaterialHelper(materialGroup, id);
-            }
-            else
-            {
-                if (shouldLoad)
-                {
-                    materialGroup = gEnv->p3DEngine->GetMaterialManager()->LoadMaterial(name.c_str(), false, false, IMaterialManager::ELoadingFlagsPreviewMode);
-                    if (materialGroup)
-                    {
-                        found.m_material = GetSubMaterialHelper(materialGroup, id);
-                    }
-                    else
-                    {
-                        AZ_Error("Material", false, "Load Material '%s' failed", name.c_str());
-                    }
-                }
-                else
-                {
-                    AZ_Warning("Material", false, "No Sub-Material is found since Material '%s' is not loaded", name.c_str());
-                }
-            }
-
-            return found;
-        }
-
-        AZStd::string ToString(MaterialHandle* thisPtr)
-        {
-            if (!thisPtr || !thisPtr->m_material)
-            {
-                return "Invalid";
-            }
-            else
-            {
-                return thisPtr->m_material->GetName();
-            }
-        }
-    }
-
-    void MaterialHandle::Reflect(AZ::SerializeContext* serializeContext)
-    {
-        // This is required in order to create a MaterialHandle variable in script canvas.
-        serializeContext->Class<MaterialHandle>()->Version(0);
-    }
-
-    void MaterialHandle::Reflect(AZ::BehaviorContext* behaviorContext)
-    {
-        const char* setMaterialParamTooltip = "Sets a Material param value";
-        const char* getMaterialParamTooltip = "Returns a Material param value";
-        AZ::BehaviorParameterOverrides setMaterialDetails = { "Material", "The Material to modify" };
-        AZ::BehaviorParameterOverrides getMaterialDetails = { "Material", "The Material to inspect" };
-        AZ::BehaviorParameterOverrides setParamNameDetails = { "ParamName", "The name of the Material param to set" };
-        AZ::BehaviorParameterOverrides getParamNameDetails = { "ParamName", "The name of the Material param to return" };
-        const AZStd::array<AZ::BehaviorParameterOverrides, 2> getMaterialParamArgs = { { getMaterialDetails,getParamNameDetails } };
-        const char* newValueTooltip = "The new value to apply";
-        
-        behaviorContext->Class<MaterialHandle>("Material")
-            ->Attribute(AZ::Script::Attributes::Category, "Rendering")
-            ->Method("ToString", &MaterialHandleFunctions::ToString)
-                ->Attribute(AZ::Script::Attributes::Operator, AZ::Script::Attributes::OperatorType::ToString)
-                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All) // Hide this node because it doesn't really make sense for the user (GetName would be better), but we need "ToString" in order to provide nice output in Material Variable nodes in script canvas.
-            ->Method("FindByName", &MaterialHandleFunctions::FindByName, { { { "Name", "Full path name of the Material" } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, "Find a Material by name. Returns Invalid if the Material is not already loaded.")
-            ->Method("LoadByName", &MaterialHandleFunctions::LoadByName, { { { "Name", "Full path name of the Material" } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, "Find a Material by name, loading the asset if needed. Returns Invalid if the Material could not be found or loaded.")
-            ->Method("Clone", &MaterialHandleFunctions::Clone, { { { "Material", "The Material to clone" } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, "Creates a copy of the given Material.")
-            ->Method("FindSubMaterial", &MaterialHandleFunctions::FindSubMaterial, 
-                { { { "Name", "Full path name of the Material Group to get a Sub-Material from" },
-                    { "MaterialID", "The ID of a Sub-Material to access. IDs start at 1.",  behaviorContext->MakeDefaultValue(1) },
-                    { "ShouldLoad", "Whether to load the Material Group or not if it's not loaded",  behaviorContext->MakeDefaultValue(true) } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, "Find a Sub-Material from a Material Group by specified Material ID. Returns Invalid if the Material Group could not be found or loaded or the Sub-Material could not be found.")
-            ->Method("SetParamVector4", &MaterialHandleFunctions::SetParamVector4, 
-                { { setMaterialDetails,setParamNameDetails,{ "Vector4", newValueTooltip } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-            ->Method("SetParamVector3", &MaterialHandleFunctions::SetParamVector3, 
-                { { setMaterialDetails,setParamNameDetails,{ "Vector3", newValueTooltip } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-            ->Method("SetParamColor", &MaterialHandleFunctions::SetParamColor, 
-                { { setMaterialDetails,setParamNameDetails,{ "Color", newValueTooltip } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-            ->Method("SetParamNumber", &MaterialHandleFunctions::SetParamFloat, // Using "ParamNumber" instead of "ParamFloat" because in Script Canvas all primitives are just "numbers"
-                { { setMaterialDetails,setParamNameDetails,{ "Number", newValueTooltip } } })
-                ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-            ->Method("GetParamVector4", &MaterialHandleFunctions::GetParamVector4, getMaterialParamArgs)
-                ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip)
-            ->Method("GetParamVector3", &MaterialHandleFunctions::GetParamVector3, getMaterialParamArgs)
-                ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip)
-            ->Method("GetParamColor", &MaterialHandleFunctions::GetParamColor, getMaterialParamArgs)
-                ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip)
-            ->Method("GetParamNumber", &MaterialHandleFunctions::GetParamFloat, getMaterialParamArgs) // Using "ParamNumber" instead of "ParamFloat" because in Script Canvas all primitives are just "numbers"
-                ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip)
-            ;
-    }
-}
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/MeshAssetHandler.cpp b/Gems/LmbrCentral/Code/Source/Rendering/MeshAssetHandler.cpp
deleted file mode 100644
index 3cbad8e507..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/MeshAssetHandler.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/IO/GenericStreams.h>
-#include <AzFramework/Asset/SimpleAsset.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzCore/std/parallel/binary_semaphore.h>
-
-#include <LmbrCentral/Rendering/MeshAsset.h>
-#include "MeshAssetHandler.h"
-
-#include <CryFile.h>
-#include <I3DEngine.h>
-
-namespace LmbrCentral
-{   
-    //////////////////////////////////////////////////////////////////////////
-    const AZStd::string MeshAssetHandlerHelper::s_assetAliasToken = "@assets@/";
-
-    // what mesh do we use as a placeholder when its currently busy compiling?
-    static const char* g_meshCompilingSubstituteAsset = "engineassets/objects/default.cgf";
-
-    MeshAssetHandlerHelper::MeshAssetHandlerHelper()
-        : m_asyncLoadCvar(nullptr)
-    {
-    }
-
-    void MeshAssetHandlerHelper::StripAssetAlias(const char*& assetPath)
-    {
-        const size_t assetAliasTokenLen = s_assetAliasToken.size() - 1;
-        if (0 == strncmp(assetPath, s_assetAliasToken.c_str(), assetAliasTokenLen))
-        {
-            assetPath += assetAliasTokenLen;
-        }
-    }
-
-    ICVar* MeshAssetHandlerHelper::GetAsyncLoadCVar()
-    {
-        if (!m_asyncLoadCvar)
-        {
-            m_asyncLoadCvar = gEnv->pConsole->GetCVar(s_meshAssetHandler_AsyncCvar);
-        }
-
-        return m_asyncLoadCvar;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Static Mesh Asset Handler
-    //////////////////////////////////////////////////////////////////////////
-
-    void AsyncStatObjLoadCallback(const AZ::Data::Asset<MeshAsset>& asset, _smart_ptr<IStatObj> statObj)
-    {
-        if (statObj)
-        {
-            asset.Get()->m_statObj = statObj;
-        }
-        else
-        {
-#if defined(AZ_ENABLE_TRACING)
-            AZStd::string assetDescription = asset.ToString<AZStd::string>();
-            AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetDescription, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, asset.GetId());
-            AZ_Error("MeshAssetHandler", false, "Failed to load mesh asset %s", assetDescription.c_str());
-#endif // AZ_ENABLE_TRACING
-        }
-    }
-
-    MeshAssetHandler::~MeshAssetHandler()
-    {
-        Unregister();
-    }
-
-    AZ::Data::AssetPtr MeshAssetHandler::CreateAsset([[maybe_unused]] const AZ::Data::AssetId& id, const AZ::Data::AssetType& type)
-    {
-        (void)type;
-
-        AZ_Assert(type == AZ::AzTypeInfo<MeshAsset>::Uuid(), "Invalid asset type! We handle only 'MeshAsset'");
-
-        return aznew MeshAsset();
-    }
-
-    AZ::Data::AssetId MeshAssetHandler::AssetMissingInCatalog([[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-    {
-        // if tracing is disabled, we are likely in a situation where we specifically don't want any diagnostic information or "errors" to appear
-        // so in that case, don't load anything, don't substitute anything, don't escalate anything, just let the empty blank asset return.
-#if defined(AZ_ENABLE_TRACING)
-        if (asset.GetId().IsValid())
-        {
-            // find out whether its still compiling or it will never be available because its source file is missing.
-            // this also escalates it, if found, to the top of the build queue:
-            AzFramework::AssetSystem::AssetStatus statusResult = AzFramework::AssetSystem::AssetStatus_Unknown;
-            AzFramework::AssetSystemRequestBus::BroadcastResult(statusResult, &AzFramework::AssetSystem::AssetSystemRequests::GetAssetStatusById, asset.GetId());
-
-            if ((statusResult == AzFramework::AssetSystem::AssetStatus_Compiling) || (statusResult == AzFramework::AssetSystem::AssetStatus_Queued))
-            {
-                // note that we can also check other codes and substitute other meshes if we want, here...
-                // its currently compiling and will finish soon.
-                // substitute a placeholder mesh:
-
-                if (!m_missingMeshAssetId.IsValid())
-                {
-                    // substitute the missing mesh assetId so that there's at least something to render that indicates a problem
-                    // in builds where there is no diagnostics or tracing, don't substitute anything, to prefer that there's no visual indication that
-                    // something is wrong in shipped games.
-                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(m_missingMeshAssetId, &AZ::Data::AssetCatalogRequests::GetAssetIdByPath, g_meshCompilingSubstituteAsset, azrtti_typeid<MeshAsset>(), false);
-                    AZ_Error("Mesh Asset Handler", m_missingMeshAssetId.IsValid(), "Attempted to substitute %s for a missing asset, but it is also missing!", g_meshCompilingSubstituteAsset);
-                }
-
-                if (m_missingMeshAssetId.IsValid())
-                {
-                    AZ_TracePrintf("MeshAssetHandler", "   - substituting with default asset ID %s\n", m_missingMeshAssetId.ToString<AZStd::string>().c_str());
-                    // substitute the missing mesh asset.
-                    return m_missingMeshAssetId;
-                }
-            }
-        }
-#endif // defined(AZ_ENABLE_TRACING)
-
-        // otherwise, if we get here, it means that either it was truly missing, in which case let an error occur, or the missing default substitute asset
-        // is also itself missing!
-        return AZ::Data::AssetId();
-    }
-
-
-
-    void MeshAssetHandler::GetCustomAssetStreamInfoForLoad(AZ::Data::AssetStreamInfo& streamInfo)
-    {
-        // The StatObj system only takes in a file name for loading, not a memory buffer.
-        // If we set our stream data length to 0, the asset system will skip any file I/O for reading the data, and will instead
-        // go directly into the AssetHandler for processing.
-        streamInfo.m_dataLen = 0;
-    }
-
-    AZ::Data::AssetHandler::LoadResult MeshAssetHandler::LoadAssetData(
-        const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-        AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-        const AZ::Data::AssetFilterCB& /*assetLoadFilterCB*/)
-    {
-        const char* assetPath = stream->GetFilename();
-
-        AZ_Assert(asset.GetType() == AZ::AzTypeInfo<MeshAsset>::Uuid(), "Invalid asset type! We only load 'MeshAsset'");
-        if (MeshAsset* meshAsset = asset.GetAs<MeshAsset>())
-        {
-            AZ_Assert(!meshAsset->m_statObj.get(), "Attempting to create static mesh without cleaning up the old one.");
-
-            // Strip the alias. StatObj instances are stored in a dictionary by their path,
-            // so to share instances with legacy cry entities, we need to use the same un-aliased format.
-            StripAssetAlias(assetPath);
-
-            // Temporary cvar guard while async loading of legacy mesh formats is stabilized.
-            ICVar* cvar = GetAsyncLoadCVar();
-            if (!cvar || cvar->GetIVal() == 0)
-            {
-                if (gEnv->mMainThreadId != CryGetCurrentThreadId())
-                {
-                    AZStd::binary_semaphore signaller;
-
-                    auto callback = [&asset, &signaller](IStatObj* obj)
-                    {
-                        AsyncStatObjLoadCallback(asset, obj);
-                        signaller.release();
-                    };
-
-                    gEnv->p3DEngine->LoadStatObjAsync(callback, assetPath);
-                    signaller.acquire();
-                }
-                else
-                {
-                    AsyncStatObjLoadCallback(asset, gEnv->p3DEngine->LoadStatObjAutoRef(assetPath));
-                }
-            }
-            else
-            {
-                _smart_ptr<IStatObj> statObj = gEnv->p3DEngine->LoadStatObjAutoRef(assetPath);
-
-                if (statObj)
-                {
-                    meshAsset->m_statObj = statObj;
-                }
-                else
-                {
-#if defined(AZ_ENABLE_TRACING)
-                    AZStd::string assetDescription = asset.GetId().ToString<AZStd::string>();
-                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetDescription, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, asset.GetId());
-                    AZ_Error("MeshAssetHandler", false, "Failed to load mesh asset \"%s\".", assetDescription.c_str());
-#endif // AZ_ENABLE_TRACING
-                }
-            }
-
-            return AZ::Data::AssetHandler::LoadResult::LoadComplete;
-        }
-        return AZ::Data::AssetHandler::LoadResult::Error;
-    }
-
-    void MeshAssetHandler::DestroyAsset(AZ::Data::AssetPtr ptr)
-    {
-        delete ptr;
-    }
-
-    void MeshAssetHandler::GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes)
-    {
-        assetTypes.push_back(AZ::AzTypeInfo<MeshAsset>::Uuid());
-    }
-
-    void MeshAssetHandler::Register()
-    {
-        AZ_Assert(AZ::Data::AssetManager::IsReady(), "Asset manager isn't ready!");
-        AZ::Data::AssetManager::Instance().RegisterHandler(this, AZ::AzTypeInfo<MeshAsset>::Uuid());
-
-        AZ::AssetTypeInfoBus::Handler::BusConnect(AZ::AzTypeInfo<MeshAsset>::Uuid());
-    }
-
-    void MeshAssetHandler::Unregister()
-    {
-        AZ::AssetTypeInfoBus::Handler::BusDisconnect(AZ::AzTypeInfo<MeshAsset>::Uuid());
-
-        if (AZ::Data::AssetManager::IsReady())
-        {
-            AZ::Data::AssetManager::Instance().UnregisterHandler(this);
-        }
-    }
-
-    AZ::Data::AssetType MeshAssetHandler::GetAssetType() const
-    {
-        return AZ::AzTypeInfo<MeshAsset>::Uuid();
-    }
-
-    const char* MeshAssetHandler::GetAssetTypeDisplayName() const
-    {
-        return "Static Mesh";
-    }
-
-    const char* MeshAssetHandler::GetGroup() const
-    {
-        return "Geometry";
-    }
-
-    const char* MeshAssetHandler::GetBrowserIcon() const
-    {
-        return "Editor/Icons/Components/StaticMesh.svg";
-    }
-
-    AZ::Uuid MeshAssetHandler::GetComponentTypeId() const
-    {
-        return AZ::Uuid("{FC315B86-3280-4D03-B4F0-5553D7D08432}");
-    }
-
-    void MeshAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
-    {
-        extensions.push_back(CRY_GEOMETRY_FILE_EXT);
-    }
-
-    GeomCacheAssetHandler::~GeomCacheAssetHandler()
-    {
-        Unregister();
-    }
-
-    AZ::Data::AssetPtr GeomCacheAssetHandler::CreateAsset([[maybe_unused]] const AZ::Data::AssetId& id, const AZ::Data::AssetType& type)
-    {
-        (void)type;
-
-        AZ_Assert(type == AZ::AzTypeInfo<GeomCacheAsset>::Uuid(), "Invalid asset type! We handle only 'GeomCacheAsset'");
-
-        return aznew GeomCacheAsset();
-    }
-
-    void GeomCacheAssetHandler::GetCustomAssetStreamInfoForLoad(AZ::Data::AssetStreamInfo& streamInfo)
-    {
-        // The GeomCache system only takes in a file name for loading, not a memory buffer.
-        // If we set our stream data length to 0, the asset system will skip any file I/O for reading the data, and will instead
-        // go directly into the AssetHandler for processing.
-        streamInfo.m_dataLen = 0;
-    }
-
-    AZ::Data::AssetHandler::LoadResult GeomCacheAssetHandler::LoadAssetData(
-        const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-        AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-        const AZ::Data::AssetFilterCB& /*assetLoadFilterCB*/)
-    {
-        const char* assetPath = stream->GetFilename();
-
-        AZ_Assert(asset.GetType() == AZ::AzTypeInfo<GeomCacheAsset>::Uuid(), "Invalid asset type! We only load 'GeomCacheAsset'");
-        if (GeomCacheAsset* geomCacheAsset = asset.GetAs<GeomCacheAsset>())
-        {
-            AZ_Assert(!geomCacheAsset->m_geomCache.get(), "Attempting to create geom cache without cleaning up the old one.");
-
-            // Strip the alias. GeomCache instances are stored in a dictionary by their path,
-            // so to share instances with legacy cry entities, we need to use the same un-aliased format.
-            StripAssetAlias(assetPath);
-
-            //Load GeomCaches synchronously, there is no Async support currently in the 3DEngine.
-            //Assets can stream asynchronously but this load step must be synchronous. 
-
-            _smart_ptr<IGeomCache> geomCache = gEnv->p3DEngine->LoadGeomCache(assetPath);
-
-            if (geomCache)
-            {
-                geomCache->SetProcessedByRenderNode(false);
-                geomCacheAsset->m_geomCache = geomCache;
-            }
-            else
-            {
-#if defined(AZ_ENABLE_TRACING)
-                AZStd::string assetDescription = asset.ToString<AZStd::string>();
-                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetDescription, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, asset.GetId());
-                AZ_Error("GeomCacheAssetHandler", false, "Failed to load geom cache asset %s", assetDescription.c_str());
-#endif // AZ_ENABLE_TRACING
-            }
-
-            return AZ::Data::AssetHandler::LoadResult::LoadComplete;
-        }
-        return AZ::Data::AssetHandler::LoadResult::Error;
-    }
-
-    void GeomCacheAssetHandler::DestroyAsset(AZ::Data::AssetPtr ptr)
-    {
-        delete ptr;
-    }
-
-    void GeomCacheAssetHandler::GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes)
-    {
-        assetTypes.push_back(AZ::AzTypeInfo<GeomCacheAsset>::Uuid());
-    }
-
-    void GeomCacheAssetHandler::Register()
-    {
-        AZ_Assert(AZ::Data::AssetManager::IsReady(), "Asset manager isn't ready!");
-        AZ::Data::AssetManager::Instance().RegisterHandler(this, AZ::AzTypeInfo<GeomCacheAsset>::Uuid());
-
-        AZ::AssetTypeInfoBus::Handler::BusConnect(AZ::AzTypeInfo<GeomCacheAsset>::Uuid());
-    }
-
-    void GeomCacheAssetHandler::Unregister()
-    {
-        AZ::AssetTypeInfoBus::Handler::BusDisconnect(AZ::AzTypeInfo<GeomCacheAsset>::Uuid());
-
-        if (AZ::Data::AssetManager::IsReady())
-        {
-            AZ::Data::AssetManager::Instance().UnregisterHandler(this);
-        }
-    }
-
-    AZ::Data::AssetType GeomCacheAssetHandler::GetAssetType() const
-    {
-        return AZ::AzTypeInfo<GeomCacheAsset>::Uuid();
-    }
-
-    const char* GeomCacheAssetHandler::GetAssetTypeDisplayName() const
-    {
-        return "Geom Cache";
-    }
-
-    const char* GeomCacheAssetHandler::GetGroup() const
-    {
-        return "Geometry";
-    }
-
-    AZ::Uuid GeomCacheAssetHandler::GetComponentTypeId() const
-    {
-        return AZ::Uuid("{045C0C58-C13E-49B0-A471-D4AC5D3FC6BD}");
-    }
-
-    void GeomCacheAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
-    {
-        extensions.push_back(CRY_GEOM_CACHE_FILE_EXT);
-    }
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/MeshAssetHandler.h b/Gems/LmbrCentral/Code/Source/Rendering/MeshAssetHandler.h
deleted file mode 100644
index f0ccdf7410..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/MeshAssetHandler.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/std/parallel/mutex.h>
-#include <AzCore/Asset/AssetTypeInfoBus.h>
-
-struct ICVar;
-
-namespace LmbrCentral
-{
-    static const char* s_meshAssetHandler_AsyncCvar = "az_Asset_EnableAsyncMeshLoading";
-
-    /**
-     * Base class for mesh asset handlers. Contains shared utilities and functionality.
-     */
-    class MeshAssetHandlerHelper
-    {
-    public:
-
-        MeshAssetHandlerHelper();
-
-    protected:
-
-        /**
-         * Removes the asset alias from a string
-         *
-         * StatObjs, CharacterInstances and GeometryCaches are stored in 
-         * dictionaries by their path which is not aliased like the new AZ systems.
-         * To look up mesh instances we need the un-aliased path. 
-         *
-         * This method assumes that the alias will be at the beginning of the string.
-         *
-         * @param assetPath The asset path string to remove the alias from
-         */
-        void StripAssetAlias(const char*& assetPath);
-
-        static const AZStd::string s_assetAliasToken; //< The token used to strip the asset alias in StripAssetAlias
-
-        ICVar* GetAsyncLoadCVar();
-        ICVar* m_asyncLoadCvar;
-    };
-
-    /**
-     * Handler for static mesh assets (cgf).
-     */
-    class MeshAssetHandler
-        : public AZ::Data::AssetHandler
-        , public AZ::AssetTypeInfoBus::Handler
-        , private MeshAssetHandlerHelper
-    {
-    public:
-
-        AZ_CLASS_ALLOCATOR(MeshAssetHandler, AZ::SystemAllocator, 0);
-
-        ~MeshAssetHandler() override;
-
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        // AZ::Data::AssetHandler
-        AZ::Data::AssetPtr CreateAsset(const AZ::Data::AssetId& id, const AZ::Data::AssetType& type) override;
-        void GetCustomAssetStreamInfoForLoad(AZ::Data::AssetStreamInfo& streamInfo) override;
-        AZ::Data::AssetHandler::LoadResult LoadAssetData(
-            const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-            AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-            const AZ::Data::AssetFilterCB& assetLoadFilterCB) override;
-        AZ::Data::AssetId AssetMissingInCatalog(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-        void DestroyAsset(AZ::Data::AssetPtr ptr) override;
-        void GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes) override;
-        //////////////////////////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        // AZ::AssetTypeInfoBus::Handler
-        AZ::Data::AssetType GetAssetType() const override;
-        const char* GetAssetTypeDisplayName() const override;
-        const char* GetGroup() const override;
-        const char* GetBrowserIcon() const override;
-        AZ::Uuid GetComponentTypeId() const override;
-        void GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions) override;
-        //////////////////////////////////////////////////////////////////////////////////////////////
-
-        void Register();
-        void Unregister();
-
-        AZ::Data::AssetId m_missingMeshAssetId;
-    };
-
-    /**
-     * Handler for Alembic Geometry Caches (cax)
-     */
-    class GeomCacheAssetHandler
-        : public AZ::Data::AssetHandler
-        , public AZ::AssetTypeInfoBus::Handler
-        , private MeshAssetHandlerHelper
-    {
-    public:
-
-        AZ_CLASS_ALLOCATOR(GeomCacheAssetHandler, AZ::SystemAllocator, 0);
-
-        ~GeomCacheAssetHandler() override;
-
-        // AZ::Data::AssetHandler
-        AZ::Data::AssetPtr CreateAsset(const AZ::Data::AssetId& id, const AZ::Data::AssetType& type) override;
-        void GetCustomAssetStreamInfoForLoad(AZ::Data::AssetStreamInfo& streamInfo) override;
-        AZ::Data::AssetHandler::LoadResult LoadAssetData(
-            const AZ::Data::Asset<AZ::Data::AssetData>& asset,
-            AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
-            const AZ::Data::AssetFilterCB& assetLoadFilterCB) override;
-        void DestroyAsset(AZ::Data::AssetPtr ptr) override;
-        void GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes) override;
-
-        // AZ::AssetTypeInfoBus::Handler
-        AZ::Data::AssetType GetAssetType() const override;
-        const char* GetAssetTypeDisplayName() const override;
-        const char* GetGroup() const override;
-        AZ::Uuid GetComponentTypeId() const override;
-        void GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions) override;
-
-        void Register();
-        void Unregister();
-    };
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/MeshComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/MeshComponent.cpp
deleted file mode 100644
index 4bef29fb52..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/MeshComponent.cpp
+++ /dev/null
@@ -1,1226 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "LmbrCentral_precompiled.h"
-#include "MeshComponent.h"
-#include <LmbrCentral/Rendering/Utils/MaterialOwnerRequestBusHandlerImpl.h>
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-#include <LmbrCentral/Rendering/GiRegistrationBus.h>
-#include <MathConversion.h>
-
-#include <I3DEngine.h>
-
-#include <AzFramework/Entity/EntityContextBus.h>
-#include <AzFramework/Render/GeometryIntersectionBus.h>
-#include <AzFramework/Visibility/EntityBoundsUnionBus.h>
-
-namespace LmbrCentral
-{
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Handler/binding code that is required for Behavior Context reflection of EBus Notifications.
-    class MaterialOwnerNotificationBusBehaviorHandler : public MaterialOwnerNotificationBus::Handler, public AZ::BehaviorEBusHandler
-    {
-    public:
-        AZ_EBUS_BEHAVIOR_BINDER(MaterialOwnerNotificationBusBehaviorHandler, "{77705C0E-5ADE-496C-85FF-9278565E278E}", AZ::SystemAllocator
-            , OnMaterialOwnerReady);
-
-        void OnMaterialOwnerReady() override
-        {
-            Call(FN_OnMaterialOwnerReady);
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-
-    AZ::BehaviorParameterOverrides CreateMaterialIdDetails(AZ::BehaviorContext* behaviorContext)
-    {
-        return{ "MaterialID", "The ID of a Material slot to access, if the Owner has multiple Materials. IDs start at 1.", behaviorContext->MakeDefaultValue(1) };
-    }
-
-    AZStd::array<AZ::BehaviorParameterOverrides, 2> GetMaterialParamArgs(AZ::BehaviorContext* behaviorContext)
-    {
-        AZ::BehaviorParameterOverrides getParamNameDetails = { "ParamName", "The name of the Material param to return" };
-        return{ { getParamNameDetails, CreateMaterialIdDetails(behaviorContext) } };
-    }
-
-    void MeshComponent::Reflect(AZ::ReflectContext* context)
-    {
-        MeshComponentRenderNode::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<MeshComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("Static Mesh Render Node", &MeshComponent::m_meshRenderNode);
-        }
-
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<MeshComponentRequestBus>("MeshComponentRequestBus")
-                ->Event("SetVisibility", &MeshComponentRequestBus::Events::SetVisibility)
-                ->Event("GetVisibility", &MeshComponentRequestBus::Events::GetVisibility)
-                ->VirtualProperty("Visibility", "GetVisibility", "SetVisibility");
-
-            const char* setMaterialParamTooltip = "Sets a Material param value for the given Entity. The Material will be cloned once before any changes are applied, so other instances are not affected.";
-            const char* getMaterialParamTooltip = "Returns a Material param value for the given Entity";
-            AZ::BehaviorParameterOverrides setParamNameDetails = { "ParamName", "The name of the Material param to set" };
-            const char* newValueTooltip = "The new value to apply";
-
-            behaviorContext->EBus<MaterialOwnerRequestBus>("MaterialOwnerRequestBus", nullptr, "Includes functions for Components that have a Material such as Mesh Component, Decal Component, etc.")
-                    ->Attribute(AZ::Script::Attributes::Category, "Rendering")
-                ->Event("IsMaterialOwnerReady", &MaterialOwnerRequestBus::Events::IsMaterialOwnerReady)
-                    ->Attribute(AZ::Script::Attributes::ToolTip, "Indicates whether the Material Owner is fully initialized, and is ready for Material requests")
-                ->Event("SetMaterial", &MaterialOwnerRequestBus::Events::SetMaterialHandle)
-                    ->Attribute(AZ::Script::Attributes::ToolTip, "Sets an Entity's Material")
-                ->Event("GetMaterial", &MaterialOwnerRequestBus::Events::GetMaterialHandle)
-                    ->Attribute(AZ::Script::Attributes::ToolTip, "Returns an Entity's current Material")
-                ->Event("SetParamVector4", &MaterialOwnerRequestBus::Events::SetMaterialParamVector4, { { setParamNameDetails, { "Vector4", newValueTooltip }, CreateMaterialIdDetails(behaviorContext) } })
-                    ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-                ->Event("SetParamVector3", &MaterialOwnerRequestBus::Events::SetMaterialParamVector3, { { setParamNameDetails, { "Vector3", newValueTooltip }, CreateMaterialIdDetails(behaviorContext) } })
-                    ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-                ->Event("SetParamColor", &MaterialOwnerRequestBus::Events::SetMaterialParamColor,     { { setParamNameDetails, { "Color"  , newValueTooltip }, CreateMaterialIdDetails(behaviorContext) } })
-                    ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-                ->Event("SetParamNumber", &MaterialOwnerRequestBus::Events::SetMaterialParamFloat,    { { setParamNameDetails, { "Number" , newValueTooltip }, CreateMaterialIdDetails(behaviorContext) } }) // Using ParamNumber instead of ParamFloat because in Script Canvas all primitives are just "numbers"
-                    ->Attribute(AZ::Script::Attributes::ToolTip, setMaterialParamTooltip)
-                ->Event("GetParamVector4", &MaterialOwnerRequestBus::Events::GetMaterialParamVector4, GetMaterialParamArgs(behaviorContext))
-                    ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip)
-                ->Event("GetParamVector3", &MaterialOwnerRequestBus::Events::GetMaterialParamVector3, GetMaterialParamArgs(behaviorContext))
-                    ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip)
-                ->Event("GetParamColor", &MaterialOwnerRequestBus::Events::GetMaterialParamColor, GetMaterialParamArgs(behaviorContext))
-                    ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip)
-                ->Event("GetParamNumber", &MaterialOwnerRequestBus::Events::GetMaterialParamFloat, GetMaterialParamArgs(behaviorContext)) // Using ParamNumber instead of ParamFloat because in Script Canvas all primitives are just "numbers"
-                    ->Attribute(AZ::Script::Attributes::ToolTip, getMaterialParamTooltip);
-
-            behaviorContext->EBus<MaterialOwnerNotificationBus>("MaterialOwnerNotificationBus", nullptr, "Provides notifications from Components that have a Material such as Mesh Component, Decal Component, etc.")
-                ->Attribute(AZ::Script::Attributes::Category, "Rendering")
-                ->Handler<MaterialOwnerNotificationBusBehaviorHandler>()
-                ;
-
-            behaviorContext->Class<MeshComponent>()->RequestBus("MeshComponentRequestBus");
-        }
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void MeshComponentRenderNode::MeshRenderOptions::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<MeshComponentRenderNode::MeshRenderOptions>()
-                ->Version(5, &VersionConverter)
-                ->Field("Opacity", &MeshComponentRenderNode::MeshRenderOptions::m_opacity)
-                ->Field("MaxViewDistance", &MeshComponentRenderNode::MeshRenderOptions::m_maxViewDist)
-                ->Field("ViewDistanceMultiplier", &MeshComponentRenderNode::MeshRenderOptions::m_viewDistMultiplier)
-                ->Field("LODRatio", &MeshComponentRenderNode::MeshRenderOptions::m_lodRatio)
-                ->Field("CastShadows", &MeshComponentRenderNode::MeshRenderOptions::m_castShadows)
-                ->Field("LODBBoxBased", &MeshComponentRenderNode::MeshRenderOptions::m_lodBoundingBoxBased)
-                ->Field("UseVisAreas", &MeshComponentRenderNode::MeshRenderOptions::m_useVisAreas)
-                ->Field("RainOccluder", &MeshComponentRenderNode::MeshRenderOptions::m_rainOccluder)
-                ->Field("AffectDynamicWater", &MeshComponentRenderNode::MeshRenderOptions::m_affectDynamicWater)
-                ->Field("ReceiveWind", &MeshComponentRenderNode::MeshRenderOptions::m_receiveWind)
-                ->Field("AcceptDecals", &MeshComponentRenderNode::MeshRenderOptions::m_acceptDecals)
-                ->Field("AffectNavmesh", &MeshComponentRenderNode::MeshRenderOptions::m_affectNavmesh)
-                ->Field("VisibilityOccluder", &MeshComponentRenderNode::MeshRenderOptions::m_visibilityOccluder)
-                ->Field("DynamicMesh", &MeshComponentRenderNode::MeshRenderOptions::m_dynamicMesh)
-                ->Field("AffectsGI", &MeshComponentRenderNode::MeshRenderOptions::m_affectGI)
-                ;
-        }
-    }
-
-    bool MeshComponentRenderNode::MeshRenderOptions::VersionConverter(AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement)
-    {
-        // conversion from version 1:
-        // - Remove Bloom (m_allowBloom)
-        // - Remove MotionBlur (m_allowMotionBlur)
-        // - Remove DepthTest (m_depthTest)
-        if (classElement.GetVersion() <= 1)
-        {
-            classElement.RemoveElementByName(AZ_CRC("Bloom", 0xc6cd7d1b));
-            classElement.RemoveElementByName(AZ_CRC("MotionBlur", 0x917cdb53));
-            classElement.RemoveElementByName(AZ_CRC("DepthTest", 0x532f68b9));
-        }
-
-        // conversion from version 2:
-        // - Remove IndoorOnly (m_indoorOnly)
-        if (classElement.GetVersion() <= 2)
-        {
-            classElement.RemoveElementByName(AZ_CRC("IndoorOnly", 0xc8ab6ddb));
-        }
-
-        if (classElement.GetVersion() <= 3)
-        {
-            classElement.RemoveElementByName(AZ_CRC("CastLightmapShadows", 0x10ce0bf8));
-            int index = classElement.FindElement(AZ_CRC("CastDynamicShadows", 0x55c75b43));
-            AZ::SerializeContext::DataElementNode& shadowNode = classElement.GetSubElement(index);
-            shadowNode.SetName("CastShadows");
-        }
-
-        // conversion from version 4:
-        // - Set "CastShadows" to false if "Opacity" is less than 1.0f, in order to not break old assets.
-        //   The new system ignores opacity for shadow casting and relies only on the "CastShadows" flag.
-        if (classElement.GetVersion() <= 4)
-        {
-            float opacity;
-            int opacityElementIndex = classElement.FindElement(AZ_CRC("Opacity", 0x43fd6d66));
-            AZ::SerializeContext::DataElementNode& opacityNode = classElement.GetSubElement(opacityElementIndex);
-            opacityNode.GetData(opacity);
-
-            if (opacity < 1.0f)
-            {
-                int castShadowsElementIndex = classElement.FindElement(AZ_CRC("CastShadows", 0xbe687463));
-                AZ::SerializeContext::DataElementNode& castShadowsNode = classElement.GetSubElement(castShadowsElementIndex);
-                castShadowsNode.SetData(context, false);
-            }
-        }
-       
-        return true;
-    }
-
-    bool MeshComponentRenderNode::MeshRenderOptions::IsStatic() const
-    {
-        return (m_hasStaticTransform && !m_dynamicMesh && !m_receiveWind);
-    }
-
-    bool MeshComponentRenderNode::MeshRenderOptions::AffectsGi() const
-    {
-        return m_affectGI && IsStatic();
-    }
-
-    AZ::Crc32 MeshComponentRenderNode::MeshRenderOptions::StaticPropertyVisibility() const
-    {
-        return IsStatic() ? AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
-    }
-
-    void MeshComponentRenderNode::Reflect(AZ::ReflectContext* context)
-    {
-        MeshRenderOptions::Reflect(context);
-
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-        if (serializeContext)
-        {
-            serializeContext->Class<MeshComponentRenderNode>()
-                ->Version(1)
-                ->Field("Visible", &MeshComponentRenderNode::m_visible)
-                ->Field("Static Mesh", &MeshComponentRenderNode::m_meshAsset)
-                ->Field("Material Override", &MeshComponentRenderNode::m_material)
-                ->Field("Render Options", &MeshComponentRenderNode::m_renderOptions)
-                ;
-        }
-    }
-
-    float MeshComponentRenderNode::GetDefaultMaxViewDist()
-    {
-        if (gEnv && gEnv->p3DEngine)
-        {
-            return gEnv->p3DEngine->GetMaxViewDistance(false);
-        }
-
-        // In the editor and the game, the dynamic lookup above should *always* hit.
-        // This case essentially means no renderer (not even the null renderer) is present.
-        return FLT_MAX;
-    }
-
-    MeshComponentRenderNode::MeshRenderOptions::MeshRenderOptions()
-        : m_opacity(1.f)
-        , m_viewDistMultiplier(1.f)
-        , m_lodRatio(100)
-        , m_useVisAreas(true)
-        , m_castShadows(true)
-        , m_lodBoundingBoxBased(false)
-        , m_rainOccluder(true)
-        , m_affectNavmesh(true)
-        , m_affectDynamicWater(false)
-        , m_acceptDecals(true)
-        , m_receiveWind(false)
-        , m_visibilityOccluder(false)
-        , m_dynamicMesh(false)
-        , m_hasStaticTransform(false)
-        , m_affectGI(true)
-    {
-        m_maxViewDist = GetDefaultMaxViewDist();
-    }
-
-    MeshComponentRenderNode::MeshComponentRenderNode()
-        : m_statObj(nullptr)
-        , m_materialOverride(nullptr)
-        , m_auxiliaryRenderFlags(0)
-        , m_auxiliaryRenderFlagsHistory(0)
-        , m_lodDistance(0.f)
-        , m_lodDistanceScaled(FLT_MAX / (SMeshLodInfo::s_nMaxLodCount + 1))  // defualt overflow prevention - it is scaled by (SMeshLodInfo::s_nMaxLodCount + 1)
-        , m_lodDistanceScaleValue(1.0f)  
-        , m_isRegisteredWithRenderer(false)
-        , m_objectMoved(false)
-        , m_meshAsset(AZ::Data::AssetLoadBehavior::QueueLoad)
-        , m_visible(true)
-    {
-        m_localBoundingBox.Reset();
-        m_worldBoundingBox.Reset();
-        m_worldTransform = AZ::Transform::CreateIdentity();
-        m_renderTransform = Matrix34::CreateIdentity();
-    }
-
-    MeshComponentRenderNode::~MeshComponentRenderNode()
-    {
-        DestroyMesh();
-    }
-
-    void MeshComponentRenderNode::CopyPropertiesTo(MeshComponentRenderNode& rhs) const
-    {
-        rhs.m_visible = m_visible;
-        rhs.m_materialOverride = m_materialOverride;
-        rhs.m_meshAsset = m_meshAsset;
-        rhs.m_material = m_material;
-        rhs.m_renderOptions = m_renderOptions;
-    }
-
-    void MeshComponentRenderNode::AttachToEntity(AZ::EntityId id)
-    {
-        if (AZ::TransformNotificationBus::Handler::BusIsConnectedId(m_renderOptions.m_attachedToEntityId))
-        {
-            AZ::TransformNotificationBus::Handler::BusDisconnect(m_renderOptions.m_attachedToEntityId);
-        }
-
-        if (m_modificationHelper.IsConnected())
-        {
-            m_modificationHelper.Disconnect();
-        }
-
-        if (id.IsValid())
-        {
-            if (!AZ::TransformNotificationBus::Handler::BusIsConnectedId(id))
-            {
-                AZ::TransformNotificationBus::Handler::BusConnect(id);
-            }
-
-            auto transformHandler = AZ::TransformBus::FindFirstHandler(id);
-
-            UpdateWorldTransform(transformHandler->GetWorldTM());
-
-            AZ::Interface<AzFramework::IEntityBoundsUnion>::Get()->RefreshEntityLocalBoundsUnion(GetEntityId());
-
-            m_modificationHelper.Connect(id);
-        }
-
-        m_renderOptions.m_attachedToEntityId = id;
-    }
-
-    void MeshComponentRenderNode::OnAssetPropertyChanged()
-    {
-        if (HasMesh())
-        {
-            DestroyMesh();
-        }
-
-        AZ::Data::AssetBus::Handler::BusDisconnect();
-
-        CreateMesh();
-        AzFramework::RenderGeometry::IntersectionNotificationBus::Event(m_contextId,
-            &AzFramework::RenderGeometry::IntersectionNotifications::OnGeometryChanged, GetEntityId());
-    }
-
-    void MeshComponentRenderNode::RefreshRenderState()
-    {
-        if (gEnv->IsEditor())
-        {
-            UpdateLocalBoundingBox();
-
-            AZ::Transform parentTransform = AZ::Transform::CreateIdentity();
-            EBUS_EVENT_ID_RESULT(parentTransform, m_renderOptions.m_attachedToEntityId, AZ::TransformBus, GetWorldTM);
-            OnTransformChanged(AZ::Transform::CreateIdentity(), parentTransform);
-
-            if (HasMesh())
-            {
-                // Re-register with the renderer, as some render settings/flags require it.
-                // Note that this is editor-only behavior (hence the guard above).
-                if (m_isRegisteredWithRenderer)
-                {
-                    RegisterWithRenderer(false);
-                    RegisterWithRenderer(true);
-                }
-            }
-        }
-    }
-
-    void MeshComponentRenderNode::SetTransformStaticState(bool isStatic)
-    {
-        m_renderOptions.m_hasStaticTransform = isStatic;
-    }
-
-    const AZ::Transform& MeshComponentRenderNode::GetTransform() const
-    {
-        return m_worldTransform;
-    }
-
-    void MeshComponentRenderNode::SetAuxiliaryRenderFlags(uint32 flags)
-    {
-        m_auxiliaryRenderFlags = flags;
-        m_auxiliaryRenderFlagsHistory |= flags;
-    }
-
-    void MeshComponentRenderNode::UpdateAuxiliaryRenderFlags(bool on, uint32 mask)
-    {
-        if (on)
-        {
-            m_auxiliaryRenderFlags |= mask;
-        }
-        else
-        {
-            m_auxiliaryRenderFlags &= ~mask;
-        }
-
-        m_auxiliaryRenderFlagsHistory |= mask;
-    }
-
-    bool MeshComponentRenderNode::IsReady() const
-    {
-        return HasMesh();
-    }
-
-    void MeshComponentRenderNode::CreateMesh()
-    {
-        if (m_meshAsset.GetId().IsValid())
-        {
-            if (!AZ::Data::AssetBus::Handler::BusIsConnected())
-            {
-                AZ::Data::AssetBus::Handler::BusConnect(m_meshAsset.GetId());
-            }
-
-            m_meshAsset.QueueLoad();
-        }
-    }
-
-    void MeshComponentRenderNode::DestroyMesh()
-    {
-        AZ::Data::AssetBus::Handler::BusDisconnect();
-
-        RegisterWithRenderer(false);
-        m_statObj = nullptr;
-
-        EBUS_EVENT_ID(m_renderOptions.m_attachedToEntityId, MeshComponentNotificationBus, OnMeshDestroyed);
-
-        m_meshAsset.Release();
-    }
-
-    bool MeshComponentRenderNode::HasMesh() const
-    {
-        return m_statObj != nullptr;
-    }
-
-    void MeshComponentRenderNode::SetMeshAsset(const AZ::Data::AssetId& id)
-    {
-        AZ::Data::Asset<MeshAsset> asset = AZ::Data::AssetManager::Instance().FindOrCreateAsset<MeshAsset>(id, m_meshAsset.GetAutoLoadBehavior());
-
-        if (asset)
-        {
-            m_meshAsset = asset;
-            OnAssetPropertyChanged();
-        }
-    }
-
-    void MeshComponentRenderNode::GetMemoryUsage(class ICrySizer* pSizer) const
-    {
-        pSizer->AddObjectSize(this);
-    }
-
-    float MeshComponentRenderNode::GetUniformScale()
-    {
-        AZ::Vector3 scales = m_worldTransform.GetScale();
-        AZ_Assert((scales.GetX() == scales.GetY()) && (scales.GetY() == scales.GetZ()), "Scales are not uniform");
-        return scales.GetX();
-    }
-
-    float MeshComponentRenderNode::GetColumnScale(int column)
-    {
-        return m_worldTransform.GetScale().GetElement(column);
-    }
-
-    void MeshComponentRenderNode::OnTransformChanged(const AZ::Transform&, const AZ::Transform& parentWorld)
-    {
-        // The entity to which we're attached has moved.
-        UpdateWorldTransform(parentWorld);
-        AzFramework::RenderGeometry::IntersectionNotificationBus::Event(m_contextId,
-            &AzFramework::RenderGeometry::IntersectionNotifications::OnGeometryChanged, GetEntityId());
-    }
-
-    void MeshComponentRenderNode::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        if (asset == m_meshAsset)
-        {
-            m_meshAsset = asset;
-            BuildRenderMesh();
-
-            if (HasMesh())
-            {
-                const AZStd::string& materialOverridePath = m_material.GetAssetPath();
-                if (!materialOverridePath.empty())
-                {
-                    m_materialOverride = gEnv->p3DEngine->GetMaterialManager()->LoadMaterial(materialOverridePath.c_str());
-
-                    AZ_Warning("MeshComponent", m_materialOverride != gEnv->p3DEngine->GetMaterialManager()->GetDefaultMaterial(),
-                        "Failed to load override Material \"%s\".",
-                        materialOverridePath.c_str());
-                }
-                else
-                {
-                    m_materialOverride = nullptr;
-                }
-
-                UpdateLocalBoundingBox();
-                UpdateLodDistance(gEnv->p3DEngine->GetFrameLodInfo());
-                RegisterWithRenderer(true);
-
-                // Inform listeners that the mesh has been changed
-                LmbrCentral::MeshComponentNotificationBus::Event(m_renderOptions.m_attachedToEntityId, &LmbrCentral::MeshComponentNotifications::OnMeshCreated, asset);
-                AzFramework::RenderGeometry::IntersectionNotificationBus::Event(m_contextId, &AzFramework::RenderGeometry::IntersectionNotifications::OnGeometryChanged, GetEntityId());
-            }
-        }
-    }
-
-    void MeshComponentRenderNode::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset)
-    {
-        // note that this also corrects the assetId if it is incorrect - do not remove the following line
-        // even if you call OnAssetReady
-        OnAssetReady(asset);
-    }
-
-    void MeshComponentRenderNode::UpdateWorldTransform(const AZ::Transform& entityTransform)
-    {
-        m_worldTransform = entityTransform;
-
-        m_renderTransform = AZTransformToLYTransform(m_worldTransform);
-
-        UpdateWorldBoundingBox();
-        if (m_isRegisteredWithRenderer && m_renderOptions.AffectsGi())
-        {
-            GiRegistrationBus::Broadcast(&GiRegistration::UpsertToGi,
-                m_renderOptions.m_attachedToEntityId,
-                m_worldTransform,
-                CalculateWorldAABB(),
-                m_meshAsset,
-                GetMaterial());
-        }
-
-        m_objectMoved = true;
-    }
-
-    void MeshComponentRenderNode::UpdateLocalBoundingBox()
-    {
-        m_localBoundingBox.Reset();
-
-        if (HasMesh())
-        {
-            m_localBoundingBox.Add(m_statObj->GetAABB());
-        }
-
-        AZ::Interface<AzFramework::IEntityBoundsUnion>::Get()->RefreshEntityLocalBoundsUnion(GetEntityId());
-
-        UpdateWorldBoundingBox();
-    }
-
-    void MeshComponentRenderNode::UpdateWorldBoundingBox()
-    {
-        m_worldBoundingBox.SetTransformedAABB(m_renderTransform, m_localBoundingBox);
-
-        if (m_isRegisteredWithRenderer)
-        {
-            // Re-register with the renderer to update culling info
-            gEnv->p3DEngine->RegisterEntity(this);
-        }
-    }
-
-    void MeshComponentRenderNode::SetVisible(bool isVisible)
-    {
-        if (m_visible != isVisible)
-        {
-            m_visible = isVisible;
-            RegisterWithRenderer(false);
-            RegisterWithRenderer(true);
-        }
-    }
-
-    bool MeshComponentRenderNode::GetVisible()
-    {
-        return m_visible;
-    }
-
-    void MeshComponentRenderNode::RegisterWithRenderer(bool registerWithRenderer)
-    {
-        if (gEnv && gEnv->p3DEngine)
-        {
-            if (registerWithRenderer)
-            {
-                if (!m_isRegisteredWithRenderer)
-                {
-                    ApplyRenderOptions();
-
-                    gEnv->p3DEngine->RegisterEntity(this);
-
-                    if (m_renderOptions.AffectsGi())
-                    {
-                        GiRegistrationBus::Broadcast(&GiRegistration::UpsertToGi,
-                            m_renderOptions.m_attachedToEntityId,
-                            m_worldTransform,
-                            CalculateWorldAABB(),
-                            m_meshAsset,
-                            GetMaterial());
-                    }
-
-                    m_isRegisteredWithRenderer = true;
-                }
-            }
-            else
-            {
-                if (m_isRegisteredWithRenderer)
-                {
-                    gEnv->p3DEngine->FreeRenderNodeState(this);
-
-                    GiRegistrationBus::Broadcast(&GiRegistration::RemoveFromGi,
-                        m_renderOptions.m_attachedToEntityId);
-
-                    m_isRegisteredWithRenderer = false;
-                }
-            }
-        }
-    }
-
-    namespace MeshInternal
-    {
-        void UpdateRenderFlag(bool enable, int mask, unsigned int& flags)
-        {
-            if (enable)
-            {
-                flags |= mask;
-            }
-            else
-            {
-                flags &= ~mask;
-            }
-        }
-    }
-
-    void MeshComponentRenderNode::ApplyRenderOptions()
-    {
-        using MeshInternal::UpdateRenderFlag;
-        unsigned int flags = GetRndFlags();
-        flags |= ERF_COMPONENT_ENTITY;
-
-        // Turn off any flag which has ever been set via auxiliary render flags
-        UpdateRenderFlag(false, m_auxiliaryRenderFlagsHistory, flags);
-
-        // Update flags according to current render settings
-        UpdateRenderFlag(m_renderOptions.m_useVisAreas == false, ERF_OUTDOORONLY, flags);
-        UpdateRenderFlag(m_renderOptions.m_castShadows, ERF_CASTSHADOWMAPS | ERF_HAS_CASTSHADOWMAPS, flags);
-        UpdateRenderFlag(m_renderOptions.m_rainOccluder && m_renderOptions.IsStatic(), ERF_RAIN_OCCLUDER, flags);
-        UpdateRenderFlag(m_visible == false, ERF_HIDDEN, flags);
-        UpdateRenderFlag(m_renderOptions.m_receiveWind, ERF_RECVWIND, flags);
-        UpdateRenderFlag(m_renderOptions.m_visibilityOccluder  && m_renderOptions.IsStatic(), ERF_GOOD_OCCLUDER, flags);
-        //Dynamic meshes shouldn't affect the navmeshes. If that decision is changed we should change this line to no longer require
-        //static and note that the flag is tied to the negation of the navemesh boolean. 
-        //Also see the editormeshcomponent.cpp AffectNavemesh function. 
-        UpdateRenderFlag(!(m_renderOptions.m_affectNavmesh && m_renderOptions.IsStatic()), ERF_EXCLUDE_FROM_TRIANGULATION, flags);
-        UpdateRenderFlag(false == m_renderOptions.m_affectDynamicWater && m_renderOptions.IsStatic(), ERF_NODYNWATER, flags);
-        UpdateRenderFlag(false == m_renderOptions.m_acceptDecals, ERF_NO_DECALNODE_DECALS, flags);
-
-        UpdateRenderFlag(m_renderOptions.m_lodBoundingBoxBased, ERF_LOD_BBOX_BASED, flags);
-
-        // Apply current auxiliary render flags
-        UpdateRenderFlag(true, m_auxiliaryRenderFlags, flags);
-
-        m_fWSMaxViewDist = m_renderOptions.m_maxViewDist;
-
-        SetViewDistanceMultiplier(m_renderOptions.m_viewDistMultiplier);
-
-        SetLodRatio(static_cast<int>(m_renderOptions.m_lodRatio));
-
-        SetRndFlags(flags);
-    }
-
-    CLodValue MeshComponentRenderNode::ComputeLOD( int wantedLod, const SRenderingPassInfo& passInfo)
-    {
-        // Default values as per the CVar - default fade going between 2 and 8 meters with dissolve enabled
-        float   dissolveDistMin = 2.0f;
-        float   dissolveDistMax = 8.0f;
-        int     dissolveEnabled = 1;
-
-        if (gEnv && gEnv->pConsole)
-        {
-            static ICVar* dissolveDistMinCvar = gEnv->pConsole->GetCVar("e_DissolveDistMin");
-            static ICVar* dissolveDistMaxCvar = gEnv->pConsole->GetCVar("e_DissolveDistMax");
-            static ICVar* dissolveEnabledCvar = gEnv->pConsole->GetCVar("e_Dissolve");
-
-            dissolveDistMin = dissolveDistMinCvar->GetFVal();
-            dissolveDistMax = dissolveDistMaxCvar->GetFVal();
-            dissolveEnabled = dissolveEnabledCvar->GetIVal() ;
-        }
-
-        const Vec3  cameraPos = passInfo.GetCamera().GetPosition();
-        const float entityDistance = sqrt_tpl(Distance::Point_AABBSq(cameraPos, GetBBox())) * passInfo.GetZoomFactor();
-
-        wantedLod = CLAMP(wantedLod, m_statObj->GetMinUsableLod(), SMeshLodInfo::s_nMaxLodCount);
-        int         currentLod = m_statObj->FindNearesLoadedLOD(wantedLod, true);
-
-        if (dissolveEnabled && passInfo.IsGeneralPass())
-        {
-            float   invDissolveDist = 1.0f / CLAMP(0.1f * m_fWSMaxViewDist, dissolveDistMin, dissolveDistMax );
-            int     nextLod = m_statObj->FindNearesLoadedLOD(currentLod + 1, true);
-            
-            // If the user chose to base LOD switch on bounding boxes, then we do not use the geometric mean computed at init.
-            if (GetRndFlags() & ERF_LOD_BBOX_BASED)
-            {
-                const float lodRatio = GetLodRatioNormalized();
-                if (lodRatio > 0.0f)
-                {
-                    // We do not use a geometric mean  per object but a global value for all objects.
-                    static ICVar* lodBoundingBoxDistanceMultiplier = gEnv->pConsole->GetCVar("e_LodBoundingBoxDistanceMultiplier");
-
-                    m_lodDistanceScaled = lodBoundingBoxDistanceMultiplier->GetFVal() * m_lodDistanceScaleValue;
-                }
-            }
-            else
-            {
-                m_lodDistanceScaled = m_lodDistance * m_lodDistanceScaleValue;
-            }
-
-            float   lodDistance = m_lodDistanceScaled * (currentLod + 1);
-            uint8   dissolveRatio255 = (uint8)SATURATEB((1.0f + (entityDistance - lodDistance) * invDissolveDist) * 255.f);
-
-            if (dissolveRatio255 == 255)
-            {
-                return CLodValue(nextLod, 0, -1);
-            }
-            return CLodValue(currentLod, dissolveRatio255, nextLod);
-        }
-
-        return CLodValue(currentLod);
-    }
-
-    AZ::Aabb MeshComponentRenderNode::CalculateWorldAABB() const
-    {
-        AZ::Aabb aabb = AZ::Aabb::CreateNull();
-        if (!m_worldBoundingBox.IsReset())
-        {
-            aabb.AddPoint(LYVec3ToAZVec3(m_worldBoundingBox.min));
-            aabb.AddPoint(LYVec3ToAZVec3(m_worldBoundingBox.max));
-        }
-        return aabb;
-    }
-
-    AZ::Aabb MeshComponentRenderNode::CalculateLocalAABB() const
-    {
-        AZ::Aabb aabb = AZ::Aabb::CreateNull();
-        if (!m_localBoundingBox.IsReset())
-        {
-            aabb.AddPoint(LYVec3ToAZVec3(m_localBoundingBox.min));
-            aabb.AddPoint(LYVec3ToAZVec3(m_localBoundingBox.max));
-        }
-        return aabb;
-    }
-
-    /*IRenderNode*/ void MeshComponentRenderNode::Render(const struct SRendParams& inRenderParams, const struct SRenderingPassInfo& passInfo)
-    {
-        if (!HasMesh())
-        {
-            return;
-        }
-
-        if (!m_modificationHelper.GetMeshModified())
-        {
-            IStatObj* obj = GetEntityStatObj();
-            int subObjectCount = obj->GetSubObjectCount();
-
-            AZStd::function<IStatObj*(size_t)> getSubObject;
-            if (subObjectCount == 0)
-            {
-                getSubObject = [obj](size_t index)
-                {
-                    if (index > 0)
-                    {
-                        AZ_Warning("MeshComponentRenderNode", false, "Mesh indices out of range");
-                        return static_cast<IStatObj*>(nullptr);
-                    }
-                    return obj;
-                };
-            }
-            else
-            {
-                getSubObject = [obj, subObjectCount](size_t index)
-                {
-                    if (index >= subObjectCount)
-                    {
-                        AZ_Warning("MeshComponentRenderNode", false, "Mesh indices out of range");
-                        return static_cast<IStatObj*>(nullptr);
-                    }
-                    return obj->GetSubObject(index)->pStatObj;
-                };
-            }
-
-            for (const LmbrCentral::MeshModificationRequestHelper::MeshLODPrimIndex& meshIndices : m_modificationHelper.MeshesToEdit())
-            {
-                if (meshIndices.lodIndex != 0)
-                {
-                    continue;
-                }
-
-                IStatObj* subObject = getSubObject(meshIndices.primitiveIndex);
-                if (!subObject)
-                {
-                    continue;
-                }
-
-                MeshModificationNotificationBus::Event(
-                    GetEntityId(),
-                    &MeshModificationNotificationBus::Events::ModifyMesh,
-                    meshIndices.lodIndex,
-                    meshIndices.primitiveIndex,
-                    subObject->GetRenderMesh());
-            }
-
-            m_modificationHelper.SetMeshModified(true);
-        }
-
-        SRendParams rParams(inRenderParams);
-
-        // Assign a unique pInstance pointer, otherwise effects involving SRenderObjData will not work for this object.  CEntityObject::Render does this for legacy entities.
-        rParams.pInstance = this;
-
-        rParams.fAlpha = m_renderOptions.m_opacity;
-
-        _smart_ptr<IMaterial> previousMaterial = rParams.pMaterial;
-        const int previousObjectFlags = rParams.dwFObjFlags;
-
-        if (m_materialOverride)
-        {
-            rParams.pMaterial = m_materialOverride;
-        }
-
-        if (m_objectMoved)
-        {
-            rParams.dwFObjFlags |= FOB_DYNAMIC_OBJECT;
-            m_objectMoved = false;
-        }
-
-        rParams.pMatrix = &m_renderTransform;
-        rParams.bForceDrawStatic = !m_renderOptions.m_dynamicMesh;
-        if (rParams.pMatrix->IsValid())
-        {
-            rParams.lodValue = ComputeLOD(inRenderParams.lodValue.LodA(), passInfo);
-            m_statObj->Render(rParams, passInfo);
-        }
-
-        rParams.pMaterial = previousMaterial;
-        rParams.dwFObjFlags = previousObjectFlags;
-    }
-
-    /*IRenderNode*/ bool MeshComponentRenderNode::GetLodDistances(const SFrameLodInfo& frameLodInfo, float* distances) const
-    {
-        const float lodRatio = GetLodRatioNormalized();
-        if (lodRatio > 0.0f)
-        {
-            const float distMultiplier = 1.f / (lodRatio * frameLodInfo.fTargetSize);
-
-            for (int lodIndex = 0; lodIndex < SMeshLodInfo::s_nMaxLodCount; ++lodIndex)
-            {
-                distances[lodIndex] = m_lodDistance * (lodIndex + 1) * distMultiplier;
-            }
-        }
-        else
-        {
-            for (int lodIndex = 0; lodIndex < SMeshLodInfo::s_nMaxLodCount; ++lodIndex)
-            {
-                distances[lodIndex] = FLT_MAX;
-            }
-        }
-        return true;
-    }
-
-    void MeshComponentRenderNode::UpdateLodDistance(const SFrameLodInfo& frameLodInfo)
-    {
-        SMeshLodInfo lodInfo;
-
-        if (HasMesh())
-        {
-            m_statObj->ComputeGeometricMean(lodInfo);
-        }
-
-        m_lodDistance = sqrt(lodInfo.fGeometricMean);
-
-        // The following computation need to stay in accordance with the 'GetLodDistances' formula.
-        const float lodRatio = GetLodRatioNormalized();
-        if (lodRatio > 0.0f)
-        {
-            m_lodDistanceScaled = m_lodDistance / (lodRatio * frameLodInfo.fTargetSize);
-            m_lodDistanceScaleValue = 1.0f / (lodRatio * frameLodInfo.fTargetSize);
-        }
-    }
-
-    /*IRenderNode*/ EERType MeshComponentRenderNode::GetRenderNodeType()
-    {
-        return m_renderOptions.IsStatic() ? eERType_StaticMeshRenderComponent : eERType_DynamicMeshRenderComponent;
-    }
-
-    /*IRenderNode*/ bool MeshComponentRenderNode::CanExecuteRenderAsJob()
-    {
-        return !m_renderOptions.m_dynamicMesh 
-            && !m_renderOptions.m_receiveWind 
-            && m_modificationHelper.MeshesToEdit().empty();
-    }
-
-    /*IRenderNode*/ const char* MeshComponentRenderNode::GetName() const
-    {
-        return "MeshComponentRenderNode";
-    }
-
-    /*IRenderNode*/ const char* MeshComponentRenderNode::GetEntityClassName() const
-    {
-        return "MeshComponentRenderNode";
-    }
-
-    /*IRenderNode*/ Vec3 MeshComponentRenderNode::GetPos([[maybe_unused]] bool bWorldOnly /*= true*/) const
-    {
-        return m_renderTransform.GetTranslation();
-    }
-
-    /*IRenderNode*/ const AABB MeshComponentRenderNode::GetBBox() const
-    {
-        return m_worldBoundingBox;
-    }
-
-    /*IRenderNode*/ void MeshComponentRenderNode::SetBBox(const AABB& WSBBox)
-    {
-        m_worldBoundingBox = WSBBox;
-    }
-
-    /*IRenderNode*/ void MeshComponentRenderNode::OffsetPosition(const Vec3& delta)
-    {
-        // Recalculate local transform
-        AZ::Transform localTransform = AZ::Transform::CreateIdentity();
-        EBUS_EVENT_ID_RESULT(localTransform, m_renderOptions.m_attachedToEntityId, AZ::TransformBus, GetLocalTM);
-
-        localTransform.SetTranslation(localTransform.GetTranslation() + LYVec3ToAZVec3(delta));
-        EBUS_EVENT_ID(m_renderOptions.m_attachedToEntityId, AZ::TransformBus, SetLocalTM, localTransform);
-
-        m_objectMoved = true;
-    }
-
-    /*IRenderNode*/ void MeshComponentRenderNode::SetMaterial(_smart_ptr<IMaterial> pMat)
-    {
-        m_materialOverride = pMat;
-
-        if (pMat)
-        {
-            m_material.SetAssetPath(pMat->GetName());
-        }
-        else
-        {
-            // If no material is provided, we intend to reset to the original material so we treat
-            // it as an asset reset to recreate the mesh.
-            m_material.SetAssetPath("");
-            OnAssetPropertyChanged();
-        }
-    }
-
-    /*IRenderNode*/ _smart_ptr<IMaterial> MeshComponentRenderNode::GetMaterial([[maybe_unused]] Vec3* pHitPos /*= nullptr*/)
-    {
-        if (m_materialOverride)
-        {
-            return m_materialOverride;
-        }
-
-        if (HasMesh())
-        {
-            return m_statObj->GetMaterial();
-        }
-
-        return nullptr;
-    }
-
-    /*IRenderNode*/ _smart_ptr<IMaterial> MeshComponentRenderNode::GetMaterialOverride()
-    {
-        return m_materialOverride;
-    }
-
-    /*IRenderNode*/ float MeshComponentRenderNode::GetMaxViewDist()
-    {
-        return(m_renderOptions.m_maxViewDist * 0.75f * GetViewDistanceMultiplier());
-    }
-
-    /*IRenderNode*/ IStatObj* MeshComponentRenderNode::GetEntityStatObj(unsigned int nPartId, [[maybe_unused]] unsigned int nSubPartId, Matrix34A* pMatrix, [[maybe_unused]] bool bReturnOnlyVisible)
-    {
-        if (0 == nPartId)
-        {
-            if (pMatrix)
-            {
-                *pMatrix = m_renderTransform;
-            }
-
-            return m_statObj;
-        }
-
-        return nullptr;
-    }
-
-    /*IRenderNode*/ _smart_ptr<IMaterial> MeshComponentRenderNode::GetEntitySlotMaterial(unsigned int nPartId, [[maybe_unused]] bool bReturnOnlyVisible, [[maybe_unused]] bool* pbDrawNear)
-    {
-        if (0 == nPartId)
-        {
-            return m_materialOverride;
-        }
-
-        return nullptr;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // MeshComponent
-    const float MeshComponent::s_renderNodeRequestBusOrder = 100.f;
-
-    MeshComponent::MeshComponent()
-    {
-        m_materialBusHandler = aznew MaterialOwnerRequestBusHandlerImpl();
-    }
-
-    MeshComponent::~MeshComponent()
-    {
-        delete m_materialBusHandler;
-    }
-
-    void MeshComponent::Activate()
-    {
-        m_meshRenderNode.AttachToEntity(m_entity->GetId());
-        m_materialBusHandler->Activate(&m_meshRenderNode, m_entity->GetId());
-        bool isStatic = false;
-        AZ::TransformBus::EventResult(isStatic, m_entity->GetId(), &AZ::TransformBus::Events::IsStaticTransform);
-        m_meshRenderNode.SetTransformStaticState(isStatic);
-        // Note we are purposely connecting to buses before calling m_mesh.CreateMesh().
-        // m_mesh.CreateMesh() can result in events (eg: OnMeshCreated) that we want receive.
-        MaterialOwnerRequestBus::Handler::BusConnect(m_entity->GetId());
-        MeshComponentRequestBus::Handler::BusConnect(m_entity->GetId());
-        AzFramework::BoundsRequestBus::Handler::BusConnect(m_entity->GetId());
-        RenderNodeRequestBus::Handler::BusConnect(m_entity->GetId());
-        AzFramework::EntityContextId contextId;
-        AzFramework::EntityIdContextQueryBus::EventResult(contextId, GetEntityId(), &AzFramework::EntityIdContextQueries::GetOwningContextId);
-        AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusConnect({ GetEntityId(), contextId });
-        m_meshRenderNode.SetContextId(contextId);
-        m_meshRenderNode.CreateMesh();
-        LegacyMeshComponentRequestBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void MeshComponent::Deactivate()
-    {
-        AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusDisconnect();
-
-        MeshComponentRequestBus::Handler::BusDisconnect();
-        AzFramework::BoundsRequestBus::Handler::BusDisconnect();
-        MaterialOwnerRequestBus::Handler::BusDisconnect();
-        LegacyMeshComponentRequestBus::Handler::BusDisconnect();
-        RenderNodeRequestBus::Handler::BusDisconnect();
-
-        m_meshRenderNode.DestroyMesh();
-        m_meshRenderNode.AttachToEntity(AZ::EntityId());
-        m_materialBusHandler->Deactivate();
-    }
-
-    AZ::Aabb MeshComponent::GetWorldBounds()
-    {
-        return m_meshRenderNode.CalculateWorldAABB();
-    }
-
-    AZ::Aabb MeshComponent::GetLocalBounds()
-    {
-        return m_meshRenderNode.CalculateLocalAABB();
-    }
-
-    void MeshComponent::SetMeshAsset(const AZ::Data::AssetId& id)
-    {
-        m_meshRenderNode.SetMeshAsset(id);
-    }
-
-    bool MeshComponent::IsMaterialOwnerReady()
-    {
-        return m_materialBusHandler->IsMaterialOwnerReady();
-    }
-
-    void MeshComponent::SetMaterial(_smart_ptr<IMaterial> material)
-    {
-        m_materialBusHandler->SetMaterial(material);
-    }
-
-    _smart_ptr<IMaterial> MeshComponent::GetMaterial()
-    {
-        return m_materialBusHandler->GetMaterial();
-    }
-
-    void MeshComponent::SetMaterialHandle(const MaterialHandle& materialHandle)
-    {
-        m_materialBusHandler->SetMaterialHandle(materialHandle);
-    }
-
-    MaterialHandle MeshComponent::GetMaterialHandle()
-    {
-        return m_materialBusHandler->GetMaterialHandle();
-    }
-
-    void MeshComponent::SetMaterialParamVector4(const AZStd::string& name, const AZ::Vector4& value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamVector4(name, value, materialId);
-    }
-
-    void MeshComponent::SetMaterialParamVector3(const AZStd::string& name, const AZ::Vector3& value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamVector3(name, value, materialId);
-    }
-
-    void MeshComponent::SetMaterialParamColor(const AZStd::string& name, const AZ::Color& value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamColor(name, value, materialId);
-    }
-
-    void MeshComponent::SetMaterialParamFloat(const AZStd::string& name, float value, int materialId)
-    {
-        m_materialBusHandler->SetMaterialParamFloat(name, value, materialId);
-    }
-
-    AZ::Vector4 MeshComponent::GetMaterialParamVector4(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamVector4(name, materialId);
-    }
-
-    AZ::Vector3 MeshComponent::GetMaterialParamVector3(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamVector3(name, materialId);
-    }
-
-    AZ::Color MeshComponent::GetMaterialParamColor(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamColor(name, materialId);
-    }
-
-    float MeshComponent::GetMaterialParamFloat(const AZStd::string& name, int materialId)
-    {
-        return m_materialBusHandler->GetMaterialParamFloat(name, materialId);
-    }
-
-    IRenderNode* MeshComponent::GetRenderNode()
-    {
-        return &m_meshRenderNode;
-    }
-
-    float MeshComponent::GetRenderNodeRequestBusOrder() const
-    {
-        return s_renderNodeRequestBusOrder;
-    }
-
-    IStatObj* MeshComponent::GetStatObj()
-    {
-        return m_meshRenderNode.GetEntityStatObj();
-    }
-
-    AzFramework::RenderGeometry::RayResult MeshComponent::RenderGeometryIntersect(const AzFramework::RenderGeometry::RayRequest& ray)
-    {
-        AzFramework::RenderGeometry::RayResult result;
-        if (!GetVisibility() && ray.m_onlyVisible)
-        {
-            return result;
-        }
-
-        if (IStatObj* geometry = GetStatObj())
-        {
-            const AZ::Vector3 rayDirection = (ray.m_endWorldPosition - ray.m_startWorldPosition);
-            const AZ::Transform& transform = m_meshRenderNode.GetTransform();
-            const AZ::Transform inverseTransform = transform.GetInverse();
-
-            const AZ::Vector3 rayStartLocal = inverseTransform.TransformPoint(ray.m_startWorldPosition);
-            const AZ::Vector3 rayDistNormLocal = inverseTransform.TransformVector(rayDirection).GetNormalized();
-
-            SRayHitInfo hi;
-            hi.inReferencePoint = AZVec3ToLYVec3(rayStartLocal);
-            hi.inRay = Ray(hi.inReferencePoint, AZVec3ToLYVec3(rayDistNormLocal));
-            hi.bInFirstHit = true;
-            hi.bGetVertColorAndTC = true;
-            if (geometry->RayIntersection(hi))
-            {
-                AZ::Matrix3x4 invTransformMatrix = AZ::Matrix3x4::CreateFromTransform(inverseTransform);
-                invTransformMatrix.Transpose();
-
-                result.m_uv = LYVec2ToAZVec2(hi.vHitTC);
-                result.m_worldPosition = transform.TransformPoint(LYVec3ToAZVec3(hi.vHitPos));
-                result.m_worldNormal = invTransformMatrix.Multiply3x3(LYVec3ToAZVec3(hi.vHitNormal)).GetNormalized();
-                result.m_distance = (result.m_worldPosition - ray.m_startWorldPosition).GetLength();
-                result.m_entityAndComponent = { GetEntityId(), GetId() };
-            }
-        }
-        return result;
-    }
-
-    bool MeshComponent::GetVisibility()
-    {
-        return m_meshRenderNode.GetVisible();
-    }
-
-    void MeshComponent::SetVisibility(bool isVisible)
-    {
-        m_meshRenderNode.SetVisible(isVisible);
-    }
-
-    void MeshComponentRenderNode::BuildRenderMesh()
-    {
-        m_statObj = nullptr; // Release smart pointer
-
-        MeshAsset* data = m_meshAsset.Get();
-        if (!data || !data->m_statObj)
-        {
-            return;
-        }
-
-        // Populate m_statObj. If the mesh doesn't require to be unique, we reuse the render mesh from the asset. If the
-        // mesh requires to be unique, we create a copy of the asset's render mesh since it will be modified.
-
-        bool hasClothData = !data->m_statObj->GetClothData().empty();
-        const int subObjectCount = data->m_statObj->GetSubObjectCount();
-        for (int i = 0; i < subObjectCount && !hasClothData; ++i)
-        {
-            IStatObj::SSubObject* subObject = data->m_statObj->GetSubObject(i);
-            if (subObject &&
-                subObject->pStatObj &&
-                !subObject->pStatObj->GetClothData().empty())
-            {
-                hasClothData = true;
-            }
-        }
-
-        bool useUniqueMesh = hasClothData;
-
-        if (useUniqueMesh)
-        {
-            // Create a copy since each mesh can be deforming differently and we need to send different meshes to render
-            m_statObj = data->m_statObj->Clone( /*bCloneGeometry*/ true, /*bCloneChildren*/ true, /*bMeshesOnly*/ false);
-        }
-        else
-        {
-            // Reuse the same render mesh
-            m_statObj = data->m_statObj;
-        }
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/MeshComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/MeshComponent.h
deleted file mode 100644
index f7a7f5d861..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/MeshComponent.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Component/TransformBus.h>
-
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-#include <IEntityRenderState.h>
-
-#include <LmbrCentral/Rendering/MaterialOwnerBus.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-#include <LmbrCentral/Rendering/MeshModificationBus.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <LmbrCentral/Rendering/MaterialAsset.h>
-#include <LmbrCentral/Rendering/MeshAsset.h>
-#include <LmbrCentral/Rendering/RenderBoundsBus.h>
-
-#include <AzFramework/Entity/EntityContext.h>
-#include <AzFramework/Render/GeometryIntersectionBus.h>
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzFramework/Visibility/BoundsBus.h>
-
-namespace LmbrCentral
-{
-    class MaterialOwnerRequestBusHandlerImpl;
-
-    /*!
-    * RenderNode implementation responsible for integrating with the renderer.
-    * The node owns render flags, the mesh instance, and the render transform.
-    */
-    class MeshComponentRenderNode
-        : public IRenderNode
-        , public AZ::TransformNotificationBus::Handler
-        , public AZ::Data::AssetBus::Handler
-    {
-        friend class EditorMeshComponent;
-    public:
-        using MaterialPtr = _smart_ptr < IMaterial > ;
-        using MeshPtr = _smart_ptr < IStatObj > ;
-
-        AZ_TYPE_INFO(MeshComponentRenderNode, "{46FF2BC4-BEF9-4CC4-9456-36C127C310D7}");
-
-        MeshComponentRenderNode();
-        ~MeshComponentRenderNode() override;
-
-        void CopyPropertiesTo(MeshComponentRenderNode& rhs) const;
-
-        //! Notifies render node which entity owns it, for subscribing to transform
-        //! bus, etc.
-        void AttachToEntity(AZ::EntityId id);
-
-        //! Returns true after all required assets are loaded
-        bool IsReady() const override;
-
-        //! Instantiate mesh instance.
-        void CreateMesh();
-
-        //! Destroy mesh instance.
-        void DestroyMesh();
-
-        //! Returns true if the node has geometry assigned.
-        bool HasMesh() const;
-
-        //! Assign a new mesh asset
-        void SetMeshAsset(const AZ::Data::AssetId& id);
-
-        //! Get the mesh asset
-        AZ::Data::Asset<AZ::Data::AssetData> GetMeshAsset() { return m_meshAsset; }
-
-        //! Invoked in the editor when the user assigns a new asset.
-        void OnAssetPropertyChanged();
-
-        //! Render the mesh
-        void RenderMesh(const struct SRendParams& inRenderParams, const struct SRenderingPassInfo& passInfo);
-
-        //! Updates the render node's world transform based on the entity's.
-        void UpdateWorldTransform(const AZ::Transform& entityTransform);
-
-        //! Computes world-space AABB.
-        AZ::Aabb CalculateWorldAABB() const;
-
-        //! Computes local-space AABB.
-        AZ::Aabb CalculateLocalAABB() const;
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Data::AssetBus::Handler
-        void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::TransformNotificationBus::Handler interface implementation
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // IRenderNode interface implementation
-        void Render(const struct SRendParams& inRenderParams, const struct SRenderingPassInfo& passInfo) override;
-        bool GetLodDistances(const SFrameLodInfo& frameLodInfo, float* distances) const override;
-        float GetFirstLodDistance() const override { return m_lodDistance; }
-        EERType GetRenderNodeType() override;
-        bool CanExecuteRenderAsJob() override;
-        const char* GetName() const override;
-        const char* GetEntityClassName() const override;
-        Vec3 GetPos(bool bWorldOnly = true) const override;
-        const AABB GetBBox() const override;
-        void SetBBox(const AABB& WSBBox) override;
-        void OffsetPosition(const Vec3& delta) override;
-        void SetMaterial(_smart_ptr<IMaterial> pMat) override;
-        _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = nullptr) override;
-        _smart_ptr<IMaterial> GetMaterialOverride() override;
-        IStatObj* GetEntityStatObj(unsigned int nPartId = 0, unsigned int nSubPartId = 0, Matrix34A* pMatrix = nullptr, bool bReturnOnlyVisible = false) override;
-        _smart_ptr<IMaterial> GetEntitySlotMaterial(unsigned int nPartId, bool bReturnOnlyVisible = false, bool* pbDrawNear = nullptr) override;
-        float GetMaxViewDist() override;
-        void GetMemoryUsage(class ICrySizer* pSizer) const override;
-        AZ::EntityId GetEntityId() override { return m_renderOptions.m_attachedToEntityId; }
-        float GetUniformScale() override;
-        float GetColumnScale(int column) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //! Invoked in the editor when a property requiring render state refresh
-        //! has changed.
-        void RefreshRenderState();
-
-        //! Set/get auxiliary render flags.
-        void SetAuxiliaryRenderFlags(uint32 flags);
-        uint32 GetAuxiliaryRenderFlags() const { return m_auxiliaryRenderFlags; }
-        void UpdateAuxiliaryRenderFlags(bool on, uint32 mask);
-
-        void SetVisible(bool isVisible);
-        bool GetVisible();
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        static float GetDefaultMaxViewDist();
-        static AZ::Uuid GetRenderOptionsUuid() { return AZ::AzTypeInfo<MeshRenderOptions>::Uuid(); }
-
-        //! Registers or unregisters our render node with the render.
-        void RegisterWithRenderer(bool registerWithRenderer);
-        bool IsRegisteredWithRenderer() const { return m_isRegisteredWithRenderer; }
-
-        //! This function caches off the static flag stat of the transform;
-        void SetTransformStaticState(bool isStatic);
-        const AZ::Transform& GetTransform() const;
-
-        void SetContextId(AzFramework::EntityContextId contextId) { m_contextId = contextId; }
-
-    protected:
-
-        //! Calculates base LOD distance based on mesh characteristics.
-        //! We do this each time the mesh resource changes.
-        void UpdateLodDistance(const SFrameLodInfo& frameLodInfo);
-
-        //! Computes desired LOD level for the assigned mesh instance.
-        CLodValue ComputeLOD(int wantedLod, const SRenderingPassInfo& passInfo);
-
-        //! Computes the entity-relative (local space) bounding box for
-        //! the assigned mesh.
-        virtual void UpdateLocalBoundingBox();
-
-        //! Updates the world-space bounding box and world space transform
-        //! for the assigned mesh.
-        void UpdateWorldBoundingBox();
-
-        //! Applies configured render options to the render node.
-        void ApplyRenderOptions();
-
-        //! Populates the render mesh from the mesh asset
-        void BuildRenderMesh();
-
-        class MeshRenderOptions
-        {
-        public:
-
-            AZ_TYPE_INFO(MeshRenderOptions, "{EFF77BEB-CB99-44A3-8F15-111B0200F50D}")
-
-            MeshRenderOptions();
-
-            float m_opacity; //!< Alpha/opacity value for rendering.
-            float m_maxViewDist; //!< Maximum draw distance.
-            float m_viewDistMultiplier; //!< Adjusts max view distance. If 1.0 then default max view distance is used.
-            AZ::u32 m_lodRatio; //!< Controls LOD distance ratio.
-            bool m_useVisAreas; //!< Allow VisAreas to control this component's visibility.
-            bool m_castShadows; //!< Casts shadows.
-            bool m_lodBoundingBoxBased; //!< LOD based on Bounding Boxes.
-            bool m_rainOccluder; //!< Occludes raindrops.
-            bool m_affectNavmesh; //!< Cuts out of the navmesh.
-            bool m_affectDynamicWater; //!< Affects dynamic water (ripples).
-            bool m_acceptDecals; //!< Accepts decals.
-            bool m_receiveWind; //!< Receives wind.
-            bool m_visibilityOccluder; //!< Appropriate for visibility occluding.
-            bool m_dynamicMesh; // Mesh can change or deform independent of transform
-            bool m_hasStaticTransform;
-            bool m_affectGI; //!< Mesh affects Global Illumination.
-
-            //! The Id of the entity we're associated with, for bus subscription.
-            //Moved from render mesh to this struct for serialization/reflection utility
-            AZ::EntityId m_attachedToEntityId;
-
-            AZStd::function<void()> m_changeCallback;
-
-            // Minor property changes don't require refreshing/rebuilding the property tree since no other properties
-            // are shown/hidden as a result of a change.
-            AZ::u32 OnMinorChanged()
-            {
-                if (m_changeCallback)
-                {
-                    m_changeCallback();
-                }
-                return AZ::Edit::PropertyRefreshLevels::None;
-            }
-
-            AZ::u32 OnMajorChanged()
-            {
-                if (m_changeCallback)
-                {
-                    m_changeCallback();
-                }
-                return AZ::Edit::PropertyRefreshLevels::EntireTree;
-            }
-
-            //Returns true if the transform is static and the mesh is not deformable.
-            bool IsStatic() const;
-            bool AffectsGi() const;
-            AZ::Crc32 StaticPropertyVisibility() const;
-            static void Reflect(AZ::ReflectContext* context);
-
-        private:
-            static bool VersionConverter(AZ::SerializeContext& context,
-                AZ::SerializeContext::DataElementNode& classElement);
-        };
-
-        //! Should be visible.
-        bool m_visible;
-
-        //! User-specified material override.
-        AzFramework::SimpleAssetReference<MaterialAsset> m_material;
-
-        //! Render flags/options.
-        MeshRenderOptions m_renderOptions;
-
-        //! Currently-assigned material. Null if no material is manually assigned.
-        MaterialPtr m_materialOverride;
-
-        //! World and render transforms.
-        //! These are equivalent, but for different math libraries.
-        AZ::Transform m_worldTransform;
-        Matrix34 m_renderTransform;
-
-        //! Local and world bounding boxes.
-        AABB m_localBoundingBox;
-        AABB m_worldBoundingBox;
-
-        //! Additional render flags -- for special editor behavior, etc.
-        uint32 m_auxiliaryRenderFlags;
-
-        //! Remember which flags have ever been toggled externally so that we can shut them off
-        uint32 m_auxiliaryRenderFlagsHistory;
-
-        //! Reference to current asset
-        AZ::Data::Asset<MeshAsset> m_meshAsset;
-        MeshPtr m_statObj;
-
-        //! Computed LOD distance.
-        float m_lodDistance;
-
-        //! Computed first LOD distance (the following are multiplies of the index)
-        float m_lodDistanceScaled;
-
-        //! Scale we need to multiply the distance by.
-        float m_lodDistanceScaleValue;
-
-        //! Identifies whether we've already registered our node with the renderer.
-        bool m_isRegisteredWithRenderer;
-
-        //! Tracks if the object was moved so we can notify the renderer.
-        bool m_objectMoved;
-
-        // Helper to store indices for meshes to be modified by other components.
-        MeshModificationRequestHelper m_modificationHelper;
-
-        // EntityContext of the component
-        AzFramework::EntityContextId m_contextId;
-    };
-
-
-
-    class MeshComponent
-        : public AZ::Component
-        , public MeshComponentRequestBus::Handler
-        , public MaterialOwnerRequestBus::Handler
-        , public RenderNodeRequestBus::Handler
-        , public LegacyMeshComponentRequestBus::Handler
-        , public AzFramework::BoundsRequestBus::Handler
-        , public AzFramework::RenderGeometry::IntersectionRequestBus::Handler
-    {
-    public:
-        friend class EditorMeshComponent;
-
-        AZ_COMPONENT(MeshComponent, "{2F4BAD46-C857-4DCB-A454-C412DE67852A}");
-
-        MeshComponent();
-        ~MeshComponent() override;
-
-        AZ_DISABLE_COPY_MOVE(MeshComponent);
-
-        // AZ::Component overrides ...
-        void Activate() override;
-        void Deactivate() override;
-
-        // BoundsRequestBus and MeshComponentRequestBus overrides ...
-        AZ::Aabb GetWorldBounds() override;
-        AZ::Aabb GetLocalBounds() override;
-
-        // MeshComponentRequestBus overrides ...
-        void SetMeshAsset(const AZ::Data::AssetId& id) override;
-        AZ::Data::Asset<AZ::Data::AssetData> GetMeshAsset() override { return m_meshRenderNode.GetMeshAsset(); }
-        void SetVisibility(bool newVisibility) override;
-        bool GetVisibility() override;
-
-        // MaterialOwnerRequestBus overrides ...
-        bool IsMaterialOwnerReady() override;
-        void SetMaterial(_smart_ptr<IMaterial>) override;
-        _smart_ptr<IMaterial> GetMaterial() override;
-        void SetMaterialHandle(const MaterialHandle& materialHandle) override;
-        MaterialHandle GetMaterialHandle() override;
-        void SetMaterialParamVector4(const AZStd::string& /*name*/, const AZ::Vector4& /*value*/, int /*materialId = 1*/) override;
-        void SetMaterialParamVector3(const AZStd::string& /*name*/, const AZ::Vector3& /*value*/, int /*materialId = 1*/) override;
-        void SetMaterialParamColor(const AZStd::string& /*name*/, const AZ::Color& /*value*/, int /*materialId = 1*/) override;
-        void SetMaterialParamFloat(const AZStd::string& /*name*/, float /*value*/, int /*materialId = 1*/) override;
-        AZ::Vector4 GetMaterialParamVector4(const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-        AZ::Vector3 GetMaterialParamVector3(const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-        AZ::Color   GetMaterialParamColor(const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-        float       GetMaterialParamFloat(const AZStd::string& /*name*/, int /*materialId = 1*/) override;
-
-        // RenderNodeRequestBus overrides ...
-        IRenderNode* GetRenderNode() override;
-        float GetRenderNodeRequestBusOrder() const override;
-        static const float s_renderNodeRequestBusOrder;
-
-        // MeshComponentRequestBus overrides ...
-        IStatObj* GetStatObj() override;
-
-        // IntersectionRequestBus overrides ...
-        AzFramework::RenderGeometry::RayResult RenderGeometryIntersect(const AzFramework::RenderGeometry::RayRequest& ray) override;
-
-    protected:
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("MeshService", 0x71d8a455));
-            provided.push_back(AZ_CRC("LegacyMeshService", 0xb462a299));
-        }
-
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("MeshService", 0x71d8a455));
-            incompatible.push_back(AZ_CRC("LegacyMeshService", 0xb462a299));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void RequireSendingRenderMeshForEditing(size_t lodIndex, size_t primitiveIndex);
-        void NoRenderMeshesForEditing();
-
-        //////////////////////////////////////////////////////////////////////////
-        // Reflected Data
-        MeshComponentRenderNode m_meshRenderNode;
-        MaterialOwnerRequestBusHandlerImpl* m_materialBusHandler;
-    };
-
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/StereoRendererComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/StereoRendererComponent.cpp
deleted file mode 100644
index 44b78e5578..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/StereoRendererComponent.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-#include <StereoRendererBus.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include "StereoRendererComponent.h"
-
-
-namespace LmbrCentral
-{
-    void StereoRendererComponent::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
-        {
-            serializeContext->Class<StereoRendererComponent, AZ::Component>()
-                ->Version(1);
-        }
-
-        AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
-        if (behaviorContext)
-        {
-            behaviorContext->EBus<AZ::StereoRendererRequestBus>("StereoRendererRequestBus")
-                ->Event("IsRenderingToHMD", &AZ::StereoRendererRequestBus::Events::IsRenderingToHMD);
-        }
-    }
-}
diff --git a/Gems/LmbrCentral/Code/Source/Rendering/StereoRendererComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/StereoRendererComponent.h
deleted file mode 100644
index 262c3cc5da..0000000000
--- a/Gems/LmbrCentral/Code/Source/Rendering/StereoRendererComponent.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-
-/*
-This class exposes functionality from the renderer to lua
-*/
-
-namespace LmbrCentral
-{
-    class StereoRendererComponent :
-        public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(StereoRendererComponent, "{BBFE0965-5564-4739-8219-AFE8209A5E57}");
-
-        StereoRendererComponent() {};
-        ~StereoRendererComponent() override {};
-
-        void Activate() override {};
-        void Deactivate() override {};
-
-        static void Reflect(AZ::ReflectContext* context);
-    };
-}
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
index ab22514cf8..107b94d119 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
@@ -36,8 +36,8 @@ namespace LmbrCentral
 
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/LookAt.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/LookAt.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/LookAt.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/LookAt.png")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
 
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
index 9781b58a33..42999bb2b3 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
@@ -60,8 +60,8 @@ namespace LmbrCentral
                 editContext->Class<EditorRandomTimedSpawnerComponent>("Random Timed Spawner", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/RandomTimedSpawner.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/RandomTimedSpawner.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/RandomTimedSpawner.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/RandomTimedSpawner.png")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/random-timed-spawner-component")
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
index 02395fe2a1..24e32c324a 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
@@ -41,8 +41,8 @@ namespace LmbrCentral
                 editContext->Class<EditorSpawnerComponent>("Spawner", "The Spawner component allows an entity to spawn a design-time or run-time dynamic slice (*.dynamicslice) at the entity's location with an optional offset")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Spawner.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Spawner.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Spawner.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spawner.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-spawner.html")
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
index 7ebdfb2e80..63bc235cff 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
@@ -39,8 +39,8 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-tag.html")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorTagComponent::m_tags, "Tags", "The tags that will be on this entity by default")
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
index 855e97eeeb..95a7a8d71b 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
@@ -207,8 +207,8 @@ namespace LmbrCentral
                         ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/SimpleState.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/SimpleState.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/SimpleState.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/SimpleState.png")
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-simple-state.html")
                     ->DataElement(AZ::Edit::UIHandlers::ComboBox, &SimpleStateComponent::m_initialStateName, "Initial state", "The initial active state")
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ_CRC("RefreshAttributesAndValues", 0xcbc2147c))
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
index 381f2545ed..c0b49b8e55 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
@@ -48,8 +48,8 @@ namespace LmbrCentral
                     "Box Shape", "The Box Shape component creates a box around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Box_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Box_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box_Shape.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
index 9254702321..93fdfae29f 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
@@ -42,8 +42,8 @@ namespace LmbrCentral
                 editContext->Class<EditorCapsuleShapeComponent>("Capsule Shape", "The Capsule Shape component creates a capsule around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Capsule_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Capsule_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Capsule_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Capsule_Shape.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
index ce32dd5e15..c61f54ab08 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
@@ -37,8 +37,8 @@ namespace LmbrCentral
                     "Compound Shape", "The Compound Shape component allows two or more shapes to be combined to create more complex shapes")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Compound_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Sphere.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Compound_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Sphere.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
index 87c51bb072..89de8410f5 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
@@ -42,8 +42,8 @@ namespace LmbrCentral
                     "Cylinder Shape", "The Cylinder Shape component creates a cylinder around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Cylinder_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Cylinder_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Cylinder_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Cylinder_Shape.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
index 606a26ec52..3d6181cde6 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
@@ -35,8 +35,8 @@ namespace LmbrCentral
                     "Disk Shape", "The Disk Shape component creates a disk around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Disk_Shape.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Disk_Shape.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Disk_Shape.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Disk_Shape.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
index 11fc04b1db..78b2d8a49b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
@@ -165,8 +165,8 @@ namespace LmbrCentral
                     "Polygon Prism Shape", "Provides polygon prism shape")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PolygonPrism.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/PolygonPrism.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PolygonPrism.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PolygonPrism.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/polygon-prism-component")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
index e4732494bd..ef8743b2be 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
@@ -35,8 +35,8 @@ namespace LmbrCentral
                     "Quad Shape", "The Quad Shape component creates a quad around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Quad_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Quad_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
index e96d7976df..0d9885191d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
@@ -46,8 +46,8 @@ namespace LmbrCentral
                     "Sphere Shape", "The Sphere Shape component creates a sphere around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Sphere_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Sphere_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Sphere_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Sphere_Shape.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
index 71ed89a180..144713c8ec 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
@@ -63,8 +63,8 @@ namespace LmbrCentral
                     "Spline", "Defines a sequence of points that can be interpolated.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Spline.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Spline.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Spline.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spline.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/spline-component")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
index 937238b1b2..c8c03e2811 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
@@ -43,8 +43,8 @@ namespace LmbrCentral
                     "Tube Shape", "The Tube Shape component creates a spline around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tube_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tube_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tube_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tube_Shape.png")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-shapes.html")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp
index 89c5028e93..95d4366a13 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp
@@ -399,29 +399,24 @@ namespace LmbrCentral
         const ShapeDrawParams& shapeDrawParams, const PolygonPrismMesh& polygonPrismMesh,
         AzFramework::DebugDisplayRequests& debugDisplay)
     {
-        auto geomRenderer = gEnv->pRenderer->GetIRenderAuxGeom();
-
-        const SAuxGeomRenderFlags oldFlags = geomRenderer->GetRenderFlags();
-        SAuxGeomRenderFlags newFlags = oldFlags;
-
-        // ensure render state is configured correctly - we want to read the depth
-        // buffer but do not want to write to it (ensure objects inside the volume are not obscured)
-        newFlags.SetAlphaBlendMode(e_AlphaBlended);
-        newFlags.SetDepthWriteFlag(e_DepthWriteOff);
-        newFlags.SetDepthTestFlag(e_DepthTestOn);
-
-        geomRenderer->SetRenderFlags(newFlags);
-
         if (shapeDrawParams.m_filled)
         {
             if (!polygonPrismMesh.m_triangles.empty())
             {
+                auto rendererState = debugDisplay.GetState();
+
+                // ensure render state is configured correctly - we want to read the depth
+                // buffer but do not want to write to it (ensure objects inside the volume are not obscured)
+                debugDisplay.DepthWriteOff();
+                debugDisplay.DepthTestOn();
+
                 debugDisplay.DrawTriangles(polygonPrismMesh.m_triangles, shapeDrawParams.m_shapeColor);
+
+                // restore the previous renderer state
+                debugDisplay.SetState(rendererState);
             }
         }
 
-        geomRenderer->SetRenderFlags(oldFlags);
-
         if (!polygonPrismMesh.m_lines.empty())
         {
             debugDisplay.DrawLines(polygonPrismMesh.m_lines, shapeDrawParams.m_wireColor);
diff --git a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
index cd1268f3f8..907bd66cb8 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
@@ -51,7 +51,7 @@ namespace LmbrCentral
 
     const char* MaterialAssetTypeInfo::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/Decal.svg";
+        return "Icons/Components/Decal.svg";
     }
 
     AZ::Uuid MaterialAssetTypeInfo::GetComponentTypeId() const
@@ -93,6 +93,6 @@ namespace LmbrCentral
 
     const char* DccMaterialAssetTypeInfo::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/Decal.svg";
+        return "Icons/Components/Decal.svg";
     }
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp
index 4091ace2f4..ef559c586d 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp
@@ -48,6 +48,6 @@ namespace LmbrCentral
     }
     const char* TextureAssetTypeInfo::GetBrowserIcon() const
     {
-        return "Editor/Icons/PropertyEditor/image_icon.svg";
+        return "Icons/PropertyEditor/image_icon.svg";
     }
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp
index c4feb8facb..a2f32763ab 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp
@@ -50,6 +50,6 @@ namespace LmbrCentral
 
     const char * EntityIconAssetTypeInfo::GetBrowserIcon() const
     {
-        return "Editor/Icons/PropertyEditor/image_icon.svg";
+        return "Icons/PropertyEditor/image_icon.svg";
     }
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp
index ddf8125c84..7ed525aaa2 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp
@@ -49,6 +49,6 @@ namespace LmbrCentral
 
     const char * UICanvasAssetTypeInfo::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/UiCanvasAssetRef.svg";
+        return "Icons/Components/UiCanvasAssetRef.svg";
     }
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Tests/EditorLensFlareComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorLensFlareComponentTests.cpp
deleted file mode 100644
index 5c1fc214fa..0000000000
--- a/Gems/LmbrCentral/Code/Tests/EditorLensFlareComponentTests.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-#include "Source/Rendering/EditorLensFlareComponent.h"
-
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/std/parallel/binary_semaphore.h>
-#include <AzCore/UnitTest/Mocks/MockFileIOBase.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzFramework/Components/TransformComponent.h>
-#include <AzTest/AzTest.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
-
-#include <Mocks/ISystemMock.h>
-#include <Mocks/IConsoleMock.h>
-
-using ::testing::NiceMock;
-
-namespace UnitTest
-{
-    // Provides public access to protected/private members to allow for testing.
-    class Test_EditorLensFlareComponent :
-        public LmbrCentral::EditorLensFlareComponent
-    {
-    public:
-        AZ_COMPONENT(Test_EditorLensFlareComponent, "{2FB6C076-BB92-47A3-93C1-6ED7E622D7E0}", LmbrCentral::EditorLensFlareComponent);
-
-        Test_EditorLensFlareComponent() : EditorLensFlareComponent()
-        {
-
-        }
-
-        ~Test_EditorLensFlareComponent() override
-        {
-
-        }
-
-        static void Reflect(AZ::ReflectContext* context)
-        {
-            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-
-            if (serializeContext)
-            {
-                serializeContext->Class<Test_EditorLensFlareComponent, EditorLensFlareComponent>()->
-                    Version(1);
-            }
-        }
-
-        LmbrCentral::EditorLensFlareConfiguration Public_GetEditorLensFlareConfiguration() const
-        {
-            return GetEditorLensFlareConfiguration();
-        }
-    };
-
-    class MockLensFlareHandlerAndCatalog
-        : public AZ::Data::AssetHandler
-        , public AZ::Data::AssetCatalog
-    {
-    public:
-        AZ_CLASS_ALLOCATOR(MockLensFlareHandlerAndCatalog, AZ::SystemAllocator, 0);
-
-        AZ::Data::AssetPtr CreateAsset([[maybe_unused]] const AZ::Data::AssetId& id, const AZ::Data::AssetType& /*type*/) override
-        {
-            return aznew LmbrCentral::LensFlareAsset();
-        }
-
-        AZ::Data::AssetHandler::LoadResult LoadAssetData(
-            const AZ::Data::Asset<AZ::Data::AssetData>& /*asset*/,
-            AZStd::shared_ptr<AZ::Data::AssetDataStream> /*stream*/,
-            const AZ::Data::AssetFilterCB& /*assetLoadFilterCB*/) override
-        {
-            return AZ::Data::AssetHandler::LoadResult::LoadComplete;
-        }
-
-        void DestroyAsset(AZ::Data::AssetPtr ptr) override
-        {
-            delete ptr;
-        }
-
-        void GetHandledAssetTypes(AZStd::vector<AZ::Data::AssetType>& assetTypes) override
-        {
-            assetTypes.push_back(AZ::AzTypeInfo<LmbrCentral::LensFlareAsset>::Uuid());
-        }
-
-        AZ::Data::AssetStreamInfo GetStreamInfoForLoad(const AZ::Data::AssetId& assetId, const AZ::Data::AssetType& /*type*/) override
-        {
-            AZ::Data::AssetStreamInfo info;
-            // Set valid stream info. This ensures the asset load doesn't result in an
-            // error on another thread that can occur during shutdown.
-            info.m_streamName = AZStd::string::format("MockLensFlareHandlerAndCatalog%s", assetId.ToString<AZStd::string>().c_str());
-            info.m_dataOffset = 0;
-            info.m_streamFlags = AZ::IO::OpenMode::ModeRead;
-            return info;
-        }
-    };
-
-    class EditorLensFlareComponentTests
-        : public ::testing::Test
-        , public UnitTest::TraceBusRedirector
-        , public AZ::Data::AssetBus::MultiHandler
-    {
-    protected:
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Data::AssetBus::MultiHandler
-
-        void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override
-        {
-            EXPECT_EQ(asset.GetId(), m_waitForAssetIdLoad);
-            m_waitForAssetIdLoad.SetInvalid();
-            AZ::Data::AssetBus::MultiHandler::BusDisconnect();
-        }
-
-        void OnAssetCanceled(AZ::Data::AssetId assetId) override
-        {
-            // With the right timing, it's possible for the asset to get canceled if the test ends
-            // before the load actually starts.  Make sure that if this case happens, we still clear out
-            // the pending asset Id and disconnect from the bus.
-            EXPECT_EQ(assetId, m_waitForAssetIdLoad);
-            m_waitForAssetIdLoad.SetInvalid();
-            AZ::Data::AssetBus::MultiHandler::BusDisconnect();
-        }
-
-        void OnAssetError([[maybe_unused]] AZ::Data::Asset<AZ::Data::AssetData> asset) override
-        {
-            // No asset errors should happen during this test.
-            EXPECT_TRUE(false);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        void SetUp() override
-        {
-            m_app.Start(m_descriptor);
-
-            // Mock up the File I/O system
-            m_priorFileIO = AZ::IO::FileIOBase::GetInstance();
-            // for FileIO, you must set the instance to null before changing it.
-            // this is a way to tell the singleton system that you mean to replace a singleton and its
-            // not a mistake.
-            AZ::IO::FileIOBase::SetInstance(nullptr);
-            AZ::IO::FileIOBase::SetInstance(&m_fileIOMock);
-            AZ::IO::MockFileIOBase::InstallDefaultReturns(m_fileIOMock);
-
-            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
-
-            m_EditorLensFlareComponentDescriptor = LmbrCentral::EditorLensFlareComponent::CreateDescriptor();
-            m_testEditorLensFlareComponentDescriptor = Test_EditorLensFlareComponent::CreateDescriptor();
-            m_lensFlareComponentDescriptor = LmbrCentral::LensFlareComponent::CreateDescriptor();
-
-            m_testEditorLensFlareComponentDescriptor->Reflect(m_app.GetSerializeContext());
-            m_lensFlareComponentDescriptor->Reflect(m_app.GetSerializeContext());
-            AZ::Debug::TraceMessageBus::Handler::BusConnect();
-
-            AZ::Data::AssetManager::Instance().RegisterHandler(&m_lensFlareHandlerAndCatalog, AZ::AzTypeInfo<LmbrCentral::LensFlareAsset>::Uuid());
-            AZ::Data::AssetManager::Instance().RegisterCatalog(&m_lensFlareHandlerAndCatalog, AZ::AzTypeInfo<LmbrCentral::LensFlareAsset>::Uuid());
-
-            EXPECT_CALL(m_system, GetConfigSpec(::testing::_))
-                .WillRepeatedly(::testing::Return(CONFIG_AUTO_SPEC));
-
-            // Setup Mocks on a stub environment
-            m_stubEnv.pConsole = &m_console;
-            m_stubEnv.pSystem = &m_system;
-            m_priorEnv = gEnv;
-            gEnv = &m_stubEnv;
-        }
-        void TearDown() override
-        {
-            gEnv = m_priorEnv;
-
-            if (m_waitForAssetIdLoad.IsValid())
-            {
-                const int assetLoadSleepMS = 20;
-                int totalWaitTimeMS = 5000;
-                while (m_waitForAssetIdLoad.IsValid() && totalWaitTimeMS > 0)
-                {
-                    AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(assetLoadSleepMS));
-                    AZ::SystemTickBus::Broadcast(&AZ::SystemTickBus::Events::OnSystemTick);
-                    if (m_waitForAssetIdLoad.IsValid())
-                    {
-                        totalWaitTimeMS -= assetLoadSleepMS;
-                    }
-                }
-                EXPECT_GT(totalWaitTimeMS, 0);
-                EXPECT_FALSE(m_waitForAssetIdLoad.IsValid());
-                AZ::Data::AssetBus::MultiHandler::BusDisconnect();
-            }
-
-            AZ::Data::AssetManager::Instance().UnregisterHandler(&m_lensFlareHandlerAndCatalog);
-            AZ::Data::AssetManager::Instance().UnregisterCatalog(&m_lensFlareHandlerAndCatalog);
-
-            m_EditorLensFlareComponentDescriptor->ReleaseDescriptor();
-            m_testEditorLensFlareComponentDescriptor->ReleaseDescriptor();
-            m_lensFlareComponentDescriptor->ReleaseDescriptor();
-
-            AZ::IO::FileIOBase::SetInstance(nullptr);
-            AZ::IO::FileIOBase::SetInstance(m_priorFileIO);
-
-            m_app.Stop();
-
-            // Disconnect last, ToolsApplication::Stop() can result in messages that we are using 
-            // TraceMessageBus to handle.
-            AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
-        }
-
-        void SetupLensFlareEntity(AZ::Entity& entity)
-        {
-            entity.CreateComponent<AzFramework::TransformComponent>();
-            entity.CreateComponent<Test_EditorLensFlareComponent>();
-
-            entity.Init();
-            entity.Activate();
-        }
-
-        AzToolsFramework::ToolsApplication m_app;
-        AZ::ComponentApplication::Descriptor m_descriptor;
-
-        MockLensFlareHandlerAndCatalog m_lensFlareHandlerAndCatalog;
-
-        AZ::ComponentDescriptor* m_EditorLensFlareComponentDescriptor = nullptr;
-        AZ::ComponentDescriptor* m_testEditorLensFlareComponentDescriptor = nullptr;
-        AZ::ComponentDescriptor* m_lensFlareComponentDescriptor = nullptr;
-
-        // If this is set to a valid asset ID, teardown won't finish until
-        // this asset has been loaded. If this takes too long, teardown will error out.
-        AZ::Data::AssetId m_waitForAssetIdLoad;
-
-        SSystemGlobalEnvironment m_stubEnv;
-        NiceMock<SystemMock> m_system;
-        NiceMock<ConsoleMock> m_console;
-        SSystemGlobalEnvironment* m_priorEnv = nullptr;
-        AZ::IO::FileIOBase* m_priorFileIO = nullptr;
-        ::testing::NiceMock<AZ::IO::MockFileIOBase> m_fileIOMock;
-    };
-
-    TEST_F(EditorLensFlareComponentTests, EditorLensFlareComponent_AddEditorLensFlareComponent_ComponentExists)
-    {
-        AZ::Entity entity;
-        SetupLensFlareEntity(entity);
-
-        Test_EditorLensFlareComponent* lensFlareComponent =
-            entity.FindComponent<Test_EditorLensFlareComponent>();
-        EXPECT_TRUE(lensFlareComponent != nullptr);
-    }
-
-    TEST_F(EditorLensFlareComponentTests, EditorLensFlareComponent_SetAssetId_GetAssetIdMatchesSet)
-    {
-        AZ::Entity entity;
-        SetupLensFlareEntity(entity);
-
-        // Use an arbitrary, non-default asset ID to verify the set & get work.
-        AZ::Data::AssetId assetIdToSet(AZ::Uuid("{377939BD-57BB-4476-B7B5-35A162B1335E}"), 5);
-        AZ::Data::AssetInfo assetInfo;
-        assetInfo.m_assetType = azrtti_typeid<LmbrCentral::LensFlareAsset>();
-        assetInfo.m_assetId = assetIdToSet;
-        AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequestBus::Events::RegisterAsset, assetIdToSet, assetInfo);
-
-        // m_waitForAssetIdLoad is cleared when the asset load finishes, so keep a local copy of the asset ID.
-        m_waitForAssetIdLoad = assetIdToSet;
-        AZ::Data::AssetBus::MultiHandler::BusConnect(m_waitForAssetIdLoad);
-
-        Test_EditorLensFlareComponent* lensFlareComponent =
-            entity.FindComponent<Test_EditorLensFlareComponent>();
-        lensFlareComponent->SetPrimaryAsset(assetIdToSet);
-
-        LmbrCentral::EditorLensFlareConfiguration lensFlareConfiguration =
-            lensFlareComponent->Public_GetEditorLensFlareConfiguration();
-        EXPECT_EQ(lensFlareConfiguration.m_asset.GetId(), assetIdToSet);
-    }
-
-    TEST_F(EditorLensFlareComponentTests, EditorLensFlareComponent_SetAssetIdBuildGameEntity_GameEntityHasAssetId)
-    {
-        AZ::Entity entity;
-        SetupLensFlareEntity(entity);
-
-        // Use an arbitrary, non-default asset ID to verify the set & get work.
-        AZ::Data::AssetId assetIdToSet(AZ::Uuid("{BC7C7A76-C5F2-44E2-8E32-3CE03C3C5ADE}"), 6);
-        AZ::Data::AssetInfo assetInfo;
-        assetInfo.m_assetType = azrtti_typeid<LmbrCentral::LensFlareAsset>();
-        assetInfo.m_assetId = assetIdToSet;
-        AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequestBus::Events::RegisterAsset, assetIdToSet, assetInfo);
-        // m_waitForAssetIdLoad is cleared when the asset load finishes, so keep a local copy of the asset ID.
-        m_waitForAssetIdLoad = assetIdToSet;
-        AZ::Data::AssetBus::MultiHandler::BusConnect(m_waitForAssetIdLoad);
-
-        Test_EditorLensFlareComponent* lensFlareComponent =
-            entity.FindComponent<Test_EditorLensFlareComponent>();
-        lensFlareComponent->SetPrimaryAsset(assetIdToSet);
-
-        AZ::Entity gameEntity;
-        lensFlareComponent->BuildGameEntity(&gameEntity);
-        LmbrCentral::LensFlareComponent* gameComponent =
-            gameEntity.FindComponent<LmbrCentral::LensFlareComponent>();
-        EXPECT_TRUE(gameComponent != nullptr);
-        EXPECT_EQ(gameComponent->GetLensFlareConfiguration().m_asset.GetId(), assetIdToSet);
-
-    }
-} // namespace UnitTest
diff --git a/Gems/LmbrCentral/Code/Tests/EditorMeshComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorMeshComponentTests.cpp
deleted file mode 100644
index 8586955254..0000000000
--- a/Gems/LmbrCentral/Code/Tests/EditorMeshComponentTests.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
-
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzTest/AzTest.h>
-#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
-#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <Rendering/MeshAssetHandler.h>
-
-
-#include "Source/Rendering/EditorMeshComponent.h"
-
-namespace UnitTest
-{
-    // base physical entity which can be derived from to detect other specific use-cases
-    struct PhysicalEntityPlaceHolder
-        : public IPhysicalEntity
-    {
-        pe_type GetType() const override { return PE_NONE; } 
-        int AddRef() override { return 0; }
-        int Release() override { return 0; }
-        int SetParams([[maybe_unused]] const pe_params* params, [[maybe_unused]] int bThreadSafe = 0) override { return 0; }
-        int GetParams([[maybe_unused]] pe_params* params) const override { return 0; } 
-        int GetStatus([[maybe_unused]] pe_status* status) const override { return 0; } 
-        int Action(const pe_action*, [[maybe_unused]] int bThreadSafe = 0) override { return 0; } 
-        int AddGeometry([[maybe_unused]] phys_geometry* pgeom, [[maybe_unused]] pe_geomparams* params, [[maybe_unused]] int id = -1, [[maybe_unused]] int bThreadSafe = 0) override { return 0; }
-        void RemoveGeometry([[maybe_unused]] int id, [[maybe_unused]] int bThreadSafe = 0) override {}
-        PhysicsForeignData GetForeignData([[maybe_unused]] int itype = 0) const override { return PhysicsForeignData{}; }
-        int GetiForeignData() const override { return 0; }
-        int GetStateSnapshot([[maybe_unused]] class CStream& stm, [[maybe_unused]] float time_back = 0, [[maybe_unused]] int flags = 0) override { return 0; }
-        int GetStateSnapshot([[maybe_unused]] TSerialize ser, [[maybe_unused]] float time_back = 0, [[maybe_unused]] int flags = 0) override { return 0; }
-        int SetStateFromSnapshot([[maybe_unused]] class CStream& stm, [[maybe_unused]] int flags = 0) override { return 0; }
-        int PostSetStateFromSnapshot() override { return 0; }
-        unsigned int GetStateChecksum() override { return 0; }
-        void SetNetworkAuthority([[maybe_unused]] int authoritive = -1, [[maybe_unused]] int paused = -1) override {}
-        int SetStateFromSnapshot([[maybe_unused]] TSerialize ser, [[maybe_unused]] int flags = 0) override { return 0; }
-        int SetStateFromTypedSnapshot([[maybe_unused]] TSerialize ser, [[maybe_unused]] int type, [[maybe_unused]] int flags = 0) override { return 0; }
-        int GetStateSnapshotTxt([[maybe_unused]] char* txtbuf, [[maybe_unused]] int szbuf, [[maybe_unused]] float time_back = 0) override { return 0; }
-        void SetStateFromSnapshotTxt([[maybe_unused]] const char* txtbuf, [[maybe_unused]] int szbuf) override {}
-        int DoStep([[maybe_unused]] float time_interval) override { return 0; }
-        int DoStep([[maybe_unused]] float time_interval, [[maybe_unused]] int iCaller) override { return 0; }
-        void StartStep([[maybe_unused]] float time_interval) override {}
-        void StepBack([[maybe_unused]] float time_interval) override {}
-        void GetMemoryStatistics([[maybe_unused]] ICrySizer* pSizer) const override {}
-    };
-
-    // special test fake to validate incoming pe_params
-    struct PhysicalEntitySetParamsCheck
-        : public PhysicalEntityPlaceHolder
-    {
-        int SetParams(const pe_params* params, [[maybe_unused]] int bThreadSafe = 0) override
-        {
-            if (params->type == pe_params_pos::type_id)
-            {
-                pe_params_pos* params_pos = (pe_params_pos*)params;
-
-                Vec3 s;
-                if (Matrix34* m34 = params_pos->pMtx3x4)
-                {
-                    s.Set(m34->GetColumn(0).len(), m34->GetColumn(1).len(), m34->GetColumn(2).len());
-                    Matrix33 m33(m34->GetColumn(0) / s.x, m34->GetColumn(1) / s.y, m34->GetColumn(2) / s.z);
-                    // ensure passed in params_pos->pMtx3x4 is orthonormal
-                    // ref - see Cry_Quat.h - explicit ILINE Quat_tpl<F>(const Matrix33_tpl<F>&m)
-                    m_isOrthonormal = m33.IsOrthonormalRH(0.1f);
-                }
-            }
-
-            return 0;
-        }
-
-        bool m_isOrthonormal = false;
-    };
-
-    class TestEditorMeshComponent
-        : public LmbrCentral::EditorMeshComponent
-    {
-    public:
-        AZ_EDITOR_COMPONENT(TestEditorMeshComponent, "{6C6B593A-1946-4239-AE16-E8B96D9835E5}", LmbrCentral::EditorMeshComponent)
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        TestEditorMeshComponent() = default;
-
-    };
-
-    void TestEditorMeshComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<TestEditorMeshComponent>()
-                ->Version(0);
-        }
-    }
-
-    class EditorMeshComponentTestFixture
-        : public ToolsApplicationFixture
-    {
-        AZStd::unique_ptr<AZ::ComponentDescriptor> m_testMeshComponentDescriptor;
-
-    public:
-        void SetUpEditorFixtureImpl() override
-        {
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            m_testMeshComponentDescriptor =
-                AZStd::unique_ptr<AZ::ComponentDescriptor>(TestEditorMeshComponent::CreateDescriptor());
-            m_testMeshComponentDescriptor->Reflect(serializeContext);
-        }
-
-        void TearDownEditorFixtureImpl() override
-        {
-            m_testMeshComponentDescriptor.reset();
-        }
-    };
-
-    struct MeshAssetHandlerFixture
-        : ScopedAllocatorSetupFixture
-    {
-    protected:
-        void SetUp() override
-        {
-            AZ::AllocatorInstance<AZ::PoolAllocator>::Create();
-            AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Create();
-
-            AZ::Data::AssetManager::Create(AZ::Data::AssetManager::Descriptor());
-            AZ::Data::AssetManager::Instance().SetAssetInfoUpgradingEnabled(false);
-
-            m_handler.Register();
-        }
-
-        void TearDown() override
-        {
-            m_handler.Unregister();
-            AZ::Data::AssetManager::Destroy();
-
-            AZ::AllocatorInstance<AZ::PoolAllocator>::Destroy();
-            AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Destroy();
-        }
-
-        LmbrCentral::MeshAssetHandler m_handler;
-    };
-
-    struct MockAssetSystemRequestHandler
-        : AzFramework::AssetSystemRequestBus::Handler
-    {
-        MockAssetSystemRequestHandler()
-        {
-            BusConnect();
-        }
-
-        ~MockAssetSystemRequestHandler()
-        {
-            BusDisconnect();
-        }
-
-        AzFramework::AssetSystem::AssetStatus GetAssetStatusById([[maybe_unused]] const AZ::Data::AssetId& assetId) override
-        {
-            m_statusRequest = true;
-
-            return AzFramework::AssetSystem::AssetStatus_Queued;
-        }
-
-        MOCK_METHOD1(CompileAssetSync, AzFramework::AssetSystem::AssetStatus (const AZStd::string&));
-        MOCK_METHOD1(CompileAssetSync_FlushIO, AzFramework::AssetSystem::AssetStatus (const AZStd::string&));
-        MOCK_METHOD1(CompileAssetSyncById, AzFramework::AssetSystem::AssetStatus (const AZ::Data::AssetId&));
-        MOCK_METHOD1(CompileAssetSyncById_FlushIO, AzFramework::AssetSystem::AssetStatus (const AZ::Data::AssetId&));
-        MOCK_METHOD4(ConfigureSocketConnection, bool (const AZStd::string&, const AZStd::string&, const AZStd::string&, const AZStd::string&));
-        MOCK_METHOD1(Connect, bool (const char*));
-        MOCK_METHOD2(ConnectWithTimeout, bool (const char*, AZStd::chrono::duration<float>));
-        MOCK_METHOD0(Disconnect, bool ());
-        MOCK_METHOD1(EscalateAssetBySearchTerm, bool (AZStd::string_view));
-        MOCK_METHOD1(EscalateAssetByUuid, bool (const AZ::Uuid&));
-        MOCK_METHOD0(GetAssetProcessorPingTimeMilliseconds, float ());
-        MOCK_METHOD1(GetAssetStatus, AzFramework::AssetSystem::AssetStatus (const AZStd::string&));
-        MOCK_METHOD1(GetAssetStatus_FlushIO, AzFramework::AssetSystem::AssetStatus (const AZStd::string&));
-        MOCK_METHOD2(GetAssetStatusSearchType, AzFramework::AssetSystem::AssetStatus(const AZStd::string&, int));
-        MOCK_METHOD2(GetAssetStatusSearchType_FlushIO, AzFramework::AssetSystem::AssetStatus(const AZStd::string&, int));
-        MOCK_METHOD1(GetAssetStatusById_FlushIO, AzFramework::AssetSystem::AssetStatus (const AZ::Data::AssetId&));
-        MOCK_METHOD3(GetUnresolvedProductReferences, void (AZ::Data::AssetId, AZ::u32&, AZ::u32&));
-        MOCK_METHOD0(SaveCatalog, bool ());
-        MOCK_METHOD1(SetAssetProcessorIP, void (const AZStd::string&));
-        MOCK_METHOD1(SetAssetProcessorPort, void (AZ::u16));
-        MOCK_METHOD1(SetBranchToken, void (const AZStd::string&));
-        MOCK_METHOD1(SetProjectName, void (const AZStd::string&));
-        MOCK_METHOD0(ShowAssetProcessor, void ());
-        MOCK_METHOD1(ShowInAssetProcessor, void (const AZStd::string&));
-        MOCK_METHOD1(WaitUntilAssetProcessorReady, bool(AZStd::chrono::duration<float>));
-        MOCK_METHOD1(WaitUntilAssetProcessorConnected, bool(AZStd::chrono::duration<float>));
-        MOCK_METHOD1(WaitUntilAssetProcessorDisconnected, bool(AZStd::chrono::duration<float>));
-        MOCK_METHOD0(AssetProcessorIsReady, bool());
-        MOCK_METHOD0(ConnectedWithAssetProcessor, bool());
-        MOCK_METHOD0(DisconnectedWithAssetProcessor, bool());
-        MOCK_METHOD0(NegotiationWithAssetProcessorFailed, bool());
-        MOCK_METHOD0(StartDisconnectingAssetProcessor, void());
-        MOCK_METHOD1(EstablishAssetProcessorConnection, bool(const AzFramework::AssetSystem::ConnectionSettings&));
-        MOCK_METHOD3(AppendAssetToPrioritySet, bool (const AZStd::string&, const AZ::Uuid&, uint32_t));
-        MOCK_METHOD3(AppendAssetsToPrioritySet, bool (const AZStd::string&, const AZStd::vector<AZ::Uuid>&, uint32_t));
-        MOCK_METHOD2(RemoveAssetFromPrioritySet, bool (const AZStd::string&, const AZ::Uuid&));
-        MOCK_METHOD2(RemoveAssetsFromPrioritySet, bool (const AZStd::string&, const AZStd::vector<AZ::Uuid>&));
-        bool m_statusRequest = false;
-    };
-
-    struct MockCatalog
-        : AZ::Data::AssetCatalogRequestBus::Handler
-    {
-        MockCatalog()
-        {
-            BusConnect();
-        }
-
-        ~MockCatalog()
-        {
-            BusDisconnect();
-        }
-
-        AZ::Data::AssetId GetAssetIdByPath(const char*, const AZ::Data::AssetType&, bool) override
-        {
-            m_generatedId = AZ::Data::AssetId(AZ::Uuid::CreateRandom(), 1234);
-
-            return m_generatedId;
-        }
-
-        MOCK_METHOD1(GetAssetInfoById, AZ::Data::AssetInfo (const AZ::Data::AssetId&));
-        MOCK_METHOD1(AddAssetType, void (const AZ::Data::AssetType&));
-        MOCK_METHOD1(AddDeltaCatalog, bool (AZStd::shared_ptr<AzFramework::AssetRegistry>));
-        MOCK_METHOD1(AddExtension, void (const char*));
-        MOCK_METHOD0(ClearCatalog, void ());
-        MOCK_METHOD5(CreateBundleManifest, bool (const AZStd::string&, const AZStd::vector<AZStd::string>&, const AZStd::string&, int, const AZStd::vector<AZStd::string>&));
-        MOCK_METHOD2(CreateDeltaCatalog, bool (const AZStd::vector<AZStd::string>&, const AZStd::string&));
-        MOCK_METHOD0(DisableCatalog, void ());
-        MOCK_METHOD1(EnableCatalogForAsset, void (const AZ::Data::AssetType&));
-        MOCK_METHOD3(EnumerateAssets, void (BeginAssetEnumerationCB, AssetEnumerationCB, EndAssetEnumerationCB));
-        MOCK_METHOD1(GenerateAssetIdTEMP, AZ::Data::AssetId (const char*));
-        MOCK_METHOD1(GetAllProductDependencies, AZ::Outcome<AZStd::vector<AZ::Data::ProductDependency>, AZStd::string> (const AZ::Data::AssetId&));
-        MOCK_METHOD3(GetAllProductDependenciesFilter, AZ::Outcome<AZStd::vector<AZ::Data::ProductDependency>, AZStd::string> (const AZ::Data::AssetId&, const AZStd::unordered_set<AZ::Data::AssetId>&, const AZStd::vector<AZStd::string>&));
-        MOCK_METHOD1(GetAssetPathById, AZStd::string (const AZ::Data::AssetId&));
-        MOCK_METHOD1(GetDirectProductDependencies, AZ::Outcome<AZStd::vector<AZ::Data::ProductDependency>, AZStd::string> (const AZ::Data::AssetId&));
-        MOCK_METHOD1(GetHandledAssetTypes, void (AZStd::vector<AZ::Data::AssetType>&));
-        MOCK_METHOD0(GetRegisteredAssetPaths, AZStd::vector<AZStd::string> ());
-        MOCK_METHOD2(InsertDeltaCatalog, bool (AZStd::shared_ptr<AzFramework::AssetRegistry>, size_t));
-        MOCK_METHOD2(InsertDeltaCatalogBefore, bool (AZStd::shared_ptr<AzFramework::AssetRegistry>, AZStd::shared_ptr<AzFramework::AssetRegistry>));
-        MOCK_METHOD1(LoadCatalog, bool (const char*));
-        MOCK_METHOD2(RegisterAsset, void (const AZ::Data::AssetId&, AZ::Data::AssetInfo&));
-        MOCK_METHOD1(RemoveDeltaCatalog, bool (AZStd::shared_ptr<AzFramework::AssetRegistry>));
-        MOCK_METHOD1(SaveCatalog, bool (const char*));
-        MOCK_METHOD0(StartMonitoringAssets, void ());
-        MOCK_METHOD0(StopMonitoringAssets, void ());
-        MOCK_METHOD1(UnregisterAsset, void (const AZ::Data::AssetId&));
-
-        AZ::Data::AssetId m_generatedId{};
-    };
-
-    struct MockAssetData
-        : LmbrCentral::MeshAsset
-    {
-        MockAssetData(AZ::Data::AssetId assetId)
-        {
-            m_assetId = assetId;
-        }
-    };
-
-    TEST_F(MeshAssetHandlerFixture, LoadAsset_StillInQueue_LoadsSubstituteAsset)
-    {
-        MockAssetSystemRequestHandler assetSystem;
-        MockCatalog catalog;
-        AZ::Data::AssetId assetId(AZ::Uuid::CreateRandom(), 0);
-
-        AZ::Data::Asset<AZ::Data::AssetData> asset(aznew MockAssetData(assetId), AZ::Data::AssetLoadBehavior::Default);
-        auto substituteAssetId = m_handler.AssetMissingInCatalog(asset);
-
-        ASSERT_TRUE(assetSystem.m_statusRequest);
-        ASSERT_TRUE(catalog.m_generatedId.IsValid());
-        ASSERT_EQ(substituteAssetId, catalog.m_generatedId);
-    }
-
-
-
-} // namespace UnitTest
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
new file mode 100644
index 0000000000..b24ac2709b
--- /dev/null
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
@@ -0,0 +1,54 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Math/Transform.h>
+
+namespace LmbrCentral
+{
+    /*!
+     * SkeletonHierarchyRequestBus
+     * Messages serviced by components to provide information about skeletal hierarchies.
+     */
+    class SkeletalHierarchyRequests
+        : public AZ::ComponentBus
+    {
+    public:
+
+        /**
+         * \return Number of joints in the skeleton joint hierarchy.
+         */
+        virtual AZ::u32 GetJointCount() { return 0; }
+
+        /**
+        * \param jointIndex Index of joint whose name should be returned.
+        * \return Name of the joint at the specified index. Null if joint index is not valid.
+        */
+        virtual const char* GetJointNameByIndex(AZ::u32 /*jointIndex*/) { return nullptr; }
+
+        /**
+        * \param jointName Name of joint whose index should be returned.
+        * \return Index of the joint with the specified name. -1 if the joint was not found.
+        */
+        virtual AZ::s32 GetJointIndexByName(const char* /*jointName*/) { return 0; }
+
+        /**
+        * \param jointIndex Index of joint whose local-space transform should be returned.
+        * \return Joint's character-space transform. Identify if joint index was not valid.
+        */
+        virtual AZ::Transform GetJointTransformCharacterRelative(AZ::u32 /*jointIndex*/) { return AZ::Transform::CreateIdentity(); }
+    };
+
+    using SkeletalHierarchyRequestBus = AZ::EBus<SkeletalHierarchyRequests>;
+
+} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorMeshBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorMeshBus.h
deleted file mode 100644
index 19cad8cd29..0000000000
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorMeshBus.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-namespace LmbrCentral
-{
-    class EditorMeshBusRequests :
-        public AZ::EBusTraits
-    {
-    public:
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-        virtual bool AddMeshComponentWithAssetId(const AZ::EntityId& targetEntity, const AZ::Uuid& meshAssetId) = 0;
-    };
-    using EditorMeshBus = AZ::EBus<EditorMeshBusRequests>;
-}
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/GeomCacheComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/GeomCacheComponentBus.h
deleted file mode 100644
index 4418856e7e..0000000000
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/GeomCacheComponentBus.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-#include <I3DEngine.h>
-
-namespace LmbrCentral
-{
-    //Forward decl
-    enum class StandinType : AZ::u32;
-
-    class EditorGeometryCacheComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-        // EBus Traits overrides (Configuring this EBus)
-        // Using Defaults
-
-        virtual ~EditorGeometryCacheComponentRequests() {}
-
-        /**
-         * Sets the minimum spec for the Geometry Cache
-         *
-         * The geom cache will not render when the current graphics spec is 
-         * below this minimum spec. 
-         */
-        virtual void SetMinSpec(EngineSpec minSpec) = 0;
-        //! Gets the minimum spec for the Geom Cache
-        virtual EngineSpec GetMinSpec() = 0;
-
-        /**
-         * Sets whether or not the Geom Cache's animation will play on start
-         *
-         * When set to true the Geometry Cache will play in the editor. In game
-         * mode the Geom Cache will begin playing immediately. 
-         */
-        virtual void SetPlayOnStart(bool playOnStart) = 0;
-        //! Gets whether or not the Geom Cache's animation will play on start
-        virtual bool GetPlayOnStart() = 0;
-
-        /**
-         * Sets the max view distance that this Geom Cache will be visible from
-         *
-         * The actual max view distance is calculated from 
-         * maxViewDistance * viewDistanceMultiplier. 
-         */
-        virtual void SetMaxViewDistance(float maxViewDistance) = 0;
-        /**
-         * Gets the max view distance that the Geom Cache will be visible from
-         *
-         * This is the max view distance without the view distance multiplier
-         */
-        virtual float GetMaxViewDistance() = 0;
-
-        /**
-         * Sets the view distance multiplier 
-         *
-         * The view distance multiplier is multiplied into the max view distance
-         * to determine how far you can be from the Geom Cache before it stops
-         * being rendered.
-         *
-         * A value of 1.0 will leave the max view distance as the actual max view distance.
-         */
-        virtual void SetViewDistanceMultiplier(float viewDistanceMultiplier) = 0;
-        //! Gets the view distance multiplier
-        virtual float GetViewDistanceMultiplier() = 0;
-
-        /**
-         * Sets the LOD Distance Ratio
-         *
-         * The LOD Distance ratio affects how LODs are chosen. A lower value means
-         * less detailed LODs are used at shorter view distances.
-         */
-        virtual void SetLODDistanceRatio(AZ::u32 lodDistanceRatio) = 0;
-        //! Gets the LOD Distance Ratio
-        virtual AZ::u32 GetLODDistanceRatio() = 0;
-
-        //! Sets whether or not the Geometry Cache will cast shadows
-        virtual void SetCastShadows(bool castShadows) = 0;
-        //! Gets whether or not the Geometry Cache casts shadows
-        virtual bool GetCastShadows() = 0;
-
-        //! Sets whether or not the Geometry Cache will be affected by VisAreas and Portals
-        virtual void SetUseVisAreas(bool useVisAreas) = 0;
-        //! Gets whether or not the Geometry Cache is affected by VisAreas and Portals
-        virtual bool GetUseVisAreas() = 0;
-    };
-
-    using EditorGeometryCacheComponentRequestBus = AZ::EBus<EditorGeometryCacheComponentRequests>;
-
-    class GeometryCacheComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-        // EBus Traits overrides (Configuring this EBus)
-        // Using Defaults
-
-        virtual ~GeometryCacheComponentRequests() {}
-
-        /**
-         * Begins Geometry Cache animation playback
-         * 
-         * If the animation is already playing, this does nothing.
-         * This may be the case if PlayOnStart was set during edit mode.
-         */
-        virtual void Play() = 0;
-        //! Pauses Geometry Cache animation playback
-        virtual void Pause() = 0;
-        /**
-         * Stops Geometry Cache animation playback
-         *
-         * This will reset the playback time to 0. This means
-         * that when Play is called again that the animation 
-         * will start from StartTime.
-         */
-        virtual void Stop() = 0;
-
-        /**
-         * Gets how much time remains in the animation
-         *
-         * Returns -1.0 if the animation is paused or stopped.
-         *
-         * @return How much time in seconds is left in the animation
-         */
-        virtual float GetTimeRemaining() = 0;
-
-        /**
-         * Gets the type of the stand-in that's currently in use
-         *
-         * If no stand-in is in use this will return 
-         * StandinType::None.
-         *
-         * @return The type of stand-in currently in use
-         */
-        virtual StandinType GetCurrentStandinType() = 0;
-
-        /**
-         * Sets the geom cache asset to be rendered
-         */
-        virtual void SetGeomCacheAsset(const AZ::Data::AssetId& id) = 0;
-
-        /**
-         * Gets the geom cache asset in use by this component
-         */
-        virtual AZ::Data::Asset<AZ::Data::AssetData> GetGeomCacheAsset() = 0;
-
-        /**
-         * Sets whether or not the Geometry Cache will be processed for rendering
-         *
-         * If Visibility is turned off, all Stand-ins for this 
-         * Geometry Cache will also be turned off.
-         *
-         * This does not mean that the Geometry Cache is visible in the current
-         * frame or the next frame. This just means that it will be 
-         * submitted to the visibility system for rendering. It can still
-         * be culled.
-         *
-         * @param visible Pass True for the Geometry Cache to render
-         */
-        virtual void SetVisible(bool visible) = 0;
-        /**
-         * Gets whether or not the Geometry Cache will be processed for rendering
-         *
-         * If this returns false then all related Stand-ins should also
-         * not be visible.
-         *
-         * @return True if the Geometry Cache should be rendered.
-         */
-        virtual bool GetVisible() = 0;
-
-        /**
-         * Sets whether or not the Geometry Cache animation should loop
-         *
-         * The Last Frame Stand-in will never be visible as long as this remains
-         * true. 
-         *
-         * @param loop Pass true if you want the Geometry Cache animation to loop
-         */
-        virtual void SetLoop(bool loop) = 0;
-        /**
-         * Gets whether or not the Geometry Cache animation is set to loop
-         *
-         * @return True if the Geometry Cache animation will loop
-         */
-        virtual bool GetLoop() = 0;
-
-        /**
-         * Sets the time point that the Geometry Cache animation should start at
-         *
-         * Changing the start time of the animation will restart the animation. 
-         * 
-         * @param startTime The starting time point in seconds.
-         */
-        virtual void SetStartTime(float startTime) = 0;
-        /**
-         * Gets the current start time point for the Geometry Cache animation
-         *
-         * @return The Geometry Cache's animation start time in seconds.
-         */
-        virtual float GetStartTime() = 0;
-
-        /**
-        * Sets the distance threshold that controls Geometry Cache streaming
-        *
-        * When the distance between the center of the Geometry Cache and the
-        * current camera is greater than this value the Geometry Cache's animation
-        * will begin to stream into memory.
-        *
-        * @param streamInDistance The distance threshold for Geometry Cache streaming
-        */
-        virtual void SetStreamInDistance(float streamInDistance) = 0;
-        /**
-        * Gets the distance threshold that controls when the Geometry Cache will stream to memory
-        *
-        * @return The distance threshold for Geometry Cache streaming
-        */
-        virtual float GetStreamInDistance() = 0;
-
-        /**
-         * Sets the entity to be used for the First Frame Stand-in
-         *
-         * It's assumed that the entityId points to an entity that has
-         * a MeshComponent attached. The stand-in is controlled by the
-         * visibility parameter of the MeshComponent.
-         *
-         * The given entity will not be transformed or moved at all. The
-         * only change that will be made to it will be when it's made
-         * visible/invisible as a stand-in.
-         *
-         * Invalid entity ids will be ignored.
-         *
-         * This stand-in will be used until the Geometry Cache animation 
-         * starts playing.
-         *
-         * @param entityId The ID of the Entity to use as the First Frame Stand-in
-         */
-        virtual void SetFirstFrameStandIn(AZ::EntityId entityId) = 0;
-        /**
-         * Gets the entity that is used as the First Frame Stand-in
-         *
-         * @return The entity with a mesh component that's used as the First Frame Stand-in
-         */
-        virtual AZ::EntityId GetFirstFrameStandIn() = 0;
-
-        /**
-         * Sets the entity to be used for the Last Frame Stand-in
-         *
-         * It's assumed that the entityId points to an entity that has
-         * a MeshComponent attached. The stand-in is controlled by the
-         * visibility parameter of the MeshComponent.
-         *
-         * The given entity will not be transformed or moved at all. The
-         * only change that will be made to it will be when it's made
-         * visible/invisible as a stand-in.
-         *
-         * Invalid entity ids will be ignored.
-         *
-         * This stand-in will never be used if the Loop parameter is set to true.
-         *
-         * @param entityId The ID of the Entity to use as the Last Frame Stand-in
-         */
-        virtual void SetLastFrameStandIn(AZ::EntityId entityId) = 0;
-        /**
-         * Gets the entity that is used as the Last Frame Stand-in
-         *
-         * @return The entity with a mesh component that's used as the Last Frame Stand-in
-         */
-        virtual AZ::EntityId GetLastFrameStandIn() = 0;
-
-        /**
-         * Sets the entity to be used for the distance-based Stand-in
-         *
-         * It's assumed that the entityId points to an entity that has
-         * a MeshComponent attached. The stand-in is controlled by the
-         * visibility parameter of the MeshComponent.
-         *
-         * The given entity will not be transformed or moved at all. The
-         * only change that will be made to it will be when it's made
-         * visible/invisible as a stand-in.
-         *
-         * Invalid entity ids will be ignored.
-         *
-         * This Stand-in will be used as long as the distance between the 
-         * Geometry Cache's center and the current camera's position is larger
-         * than the Stand-in Distance parameter.
-         *
-         * @param entityId The ID of the Entity to use as the distance-based Stand-in
-         */
-        virtual void SetStandIn(AZ::EntityId entityId) = 0;
-        /**
-         * Gets the entity that is used as the distance-based Stand-in
-         *
-         * @return The entity with a mesh component that's used as the distance-based Stand-in
-         */
-        virtual AZ::EntityId GetStandIn() = 0;
-
-        /**
-         * Sets the distance threshold that controls the visibility of the stand-in
-         *
-         * The stand-in will be used when the distance between the center of the
-         * Geometry Cache and the current camera is greater than this value.
-         * 
-         * @param standInDistance The distance threshold for the stand-in
-         */
-        virtual void SetStandInDistance(float standInDistance) = 0;
-        /**
-         * Gets the distance threshold that controls the visibility of the stand-in
-         *
-         * @return The distance threshold for the stand-in
-         */
-        virtual float GetStandInDistance() = 0;
-
-        /**
-         * Gets the Geometry Cache's render node
-         *
-         * This method is only exposed to C++.
-         *
-         * @return A pointer to the geometry cache's internal render node
-         */
-        virtual IGeomCacheRenderNode* GetGeomCacheRenderNode() = 0;
-    };
-
-    using GeometryCacheComponentRequestBus = AZ::EBus<GeometryCacheComponentRequests>;
-
-    class GeometryCacheComponentNotifications
-        : public AZ::EBusTraits
-    {
-    public:
-        // EBus Traits overrides (Configuring this EBus)
-        // Using Defaults
-
-        virtual ~GeometryCacheComponentNotifications() {}
-
-        //! Event that triggers when Geometry Cache playback starts
-        virtual void OnPlaybackStart() = 0;
-        //! Event that triggers when Geometry Cache playback pauses
-        virtual void OnPlaybackPause() = 0;
-        //! Event that triggers when Geometry Cache playback stops
-        virtual void OnPlaybackStop() = 0;
-        
-        /**
-         * Event that triggers when the Geometry Cache changes which stand-in is in use
-         *
-         * This does fire if a stand-in is turned off and the Geometry Cache becomes 
-         * active instead.
-         *
-         * @param standinType The new stand-in type that will be used
-         */
-        virtual void OnStandinChanged(StandinType standinType) = 0;
-    };
-
-    using GeometryCacheComponentNotificationBus = AZ::EBus<GeometryCacheComponentNotifications>;
-
-} //namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/HighQualityShadowComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/HighQualityShadowComponentBus.h
deleted file mode 100644
index e738f9b0b2..0000000000
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/HighQualityShadowComponentBus.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-namespace LmbrCentral
-{
-    /*!
-     * Messages serviced by the unique shadow component.
-     */
-    class HighQualityShadowComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-
-        virtual void SetEnabled(bool enabled) = 0;
-        virtual bool GetEnabled() = 0;
-    };
-
-    using HighQualityShadowComponentRequestBus = AZ::EBus<HighQualityShadowComponentRequests>;
-    
-    /*!
-     * Messages serviced by the unique shadow editor component.
-     */
-    class EditorHighQualityShadowComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-
-        virtual void RefreshProperties() = 0;
-    };
-
-    using EditorHighQualityShadowComponentRequestBus = AZ::EBus<EditorHighQualityShadowComponentRequests>;
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LensFlareComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LensFlareComponentBus.h
deleted file mode 100644
index 988e26831a..0000000000
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LensFlareComponentBus.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-namespace LmbrCentral
-{
-    /*!
-     * LensFlareComponentRequestsBus
-     * Messages serviced by the Lens Flare component.
-     */
-    class LensFlareComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-        enum class State
-        {
-            Off,
-            On,
-        };
-
-        virtual ~LensFlareComponentRequests() {}
-
-        //! Control lens flare state.
-        virtual void SetLensFlareState(State state) { (void)state; }
-
-        //! Turns lens flare on
-        virtual void TurnOnLensFlare() {}
-
-        //! Turns lens flare off
-        virtual void TurnOffLensFlare() {}
-
-        //! Toggles lens flare state.
-        virtual void ToggleLensFlare() {}
-    };
-
-    using LensFlareComponentRequestBus = AZ::EBus<LensFlareComponentRequests>;
-
-
-    /*!
-     * LensFlareEditorRequestBus
-     * Editor/UI messages serviced by the Lens Flare component.
-     */
-    class EditorLensFlareComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-        virtual ~EditorLensFlareComponentRequests() {}
-
-        //! Recreates the lens flare.
-        virtual void RefreshLensFlare() = 0;
-    };
-
-    using EditorLensFlareComponentRequestBus = AZ::EBus<EditorLensFlareComponentRequests>;
-
-    /*!
-     * LensFlareComponentEventBus
-     * Events dispatched by the Lens Flare component.
-     */
-    class LensFlareComponentNotifications
-        : public AZ::ComponentBus
-    {
-    public:
-        virtual ~LensFlareComponentNotifications() {}
-
-        //! Lens flare has been turned on
-        virtual void LensFlareTurnedOn() {}
-
-        //! Lens flare has been turned off
-        virtual void LensFlareTurnedOff() {}
-    };
-
-    using LensFlareComponentNotificationBus = AZ::EBus<LensFlareComponentNotifications>;
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshComponentBus.h
deleted file mode 100644
index 2f64bb084a..0000000000
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshComponentBus.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Aabb.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Asset/AssetCommon.h>
-
-struct IStatObj;
-struct SRenderingPassInfo;
-struct SRendParams;
-
-namespace LmbrCentral
-{
-    /*!
-     * MeshComponentRequestBus
-     * Messages serviced by the mesh component.
-     */
-    class MeshComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-
-        /**
-        * Returns the axis aligned bounding box in world coordinates
-        */
-        virtual AZ::Aabb GetWorldBounds() = 0;
-
-        /**
-        * Returns the axis aligned bounding box in model coordinates
-        */
-        virtual AZ::Aabb GetLocalBounds() = 0;
-
-        /**
-        * Sets the mesh asset for this component
-        */
-        virtual void SetMeshAsset(const AZ::Data::AssetId& id) = 0;
-
-        /**
-        * Returns the asset used by the mesh
-        */
-        virtual AZ::Data::Asset<AZ::Data::AssetData> GetMeshAsset() = 0;
-
-        /**
-        * Returns true if the mesh is currently visible
-        */
-        virtual bool GetVisibility() { return true; }
-
-        /**
-        * Sets the current visibility of the mesh
-        */
-        virtual void SetVisibility([[maybe_unused]] bool isVisible) {}
-    };
-
-    using MeshComponentRequestBus = AZ::EBus<MeshComponentRequests>;
-
-    /*!
-     * SkeletonHierarchyRequestBus
-     * Messages serviced by components to provide information about skeletal hierarchies.
-     */
-    class SkeletalHierarchyRequests
-        : public AZ::ComponentBus
-    {
-    public:
-
-        /**
-         * \return Number of joints in the skeleton joint hierarchy.
-         */
-        virtual AZ::u32 GetJointCount() { return 0; }
-
-        /**
-        * \param jointIndex Index of joint whose name should be returned.
-        * \return Name of the joint at the specified index. Null if joint index is not valid.
-        */
-        virtual const char* GetJointNameByIndex(AZ::u32 /*jointIndex*/) { return nullptr; }
-
-        /**
-        * \param jointName Name of joint whose index should be returned.
-        * \return Index of the joint with the specified name. -1 if the joint was not found.
-        */
-        virtual AZ::s32 GetJointIndexByName(const char* /*jointName*/) { return 0; }
-
-        /**
-        * \param jointIndex Index of joint whose local-space transform should be returned.
-        * \return Joint's character-space transform. Identify if joint index was not valid.
-        */
-        virtual AZ::Transform GetJointTransformCharacterRelative(AZ::u32 /*jointIndex*/) { return AZ::Transform::CreateIdentity(); }
-    };
-
-    using SkeletalHierarchyRequestBus = AZ::EBus<SkeletalHierarchyRequests>;
-
-    /*!
-    * LegacyMeshComponentRequestBus
-    * Messages serviced by the mesh component.
-    */
-    class LegacyMeshComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-        virtual IStatObj* GetStatObj() = 0;
-    };
-
-    using LegacyMeshComponentRequestBus = AZ::EBus<LegacyMeshComponentRequests>;
-
-    /*!
-     * MeshComponentNotificationBus
-     * Events dispatched by the mesh component.
-     */
-    class MeshComponentNotifications
-        : public AZ::ComponentBus
-    {
-    public:
-
-        /**
-         * Notifies listeners the mesh instance has been created.
-         * \param asset - The asset the mesh instance is based on.
-         */
-        virtual void OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset) { (void)asset; }
-
-        /**
-         * Notifies listeners that the mesh instance has been destroyed.
-        */
-        virtual void OnMeshDestroyed() {}
-
-        virtual void OnBoundsReset() {};
-
-        /*
-         * Notifies listeners prior to making the render call 
-         */
-        virtual void OnMeshPreRender([[maybe_unused]] const struct SRendParams& inOutRenderParams, [[maybe_unused]] const SRenderingPassInfo& passInfo) {};
-
-        /**
-         * When connecting to this bus if the asset is ready you will immediately get an OnMeshCreated event
-        **/
-        template<class Bus>
-        struct ConnectionPolicy
-            : public AZ::EBusConnectionPolicy<Bus>
-        {
-            static void Connect(typename Bus::BusPtr& busPtr, typename Bus::Context& context, typename Bus::HandlerNode& handler, typename Bus::Context::ConnectLockGuard& connectLock, const typename Bus::BusIdType& id = 0)
-            {
-                AZ::EBusConnectionPolicy<Bus>::Connect(busPtr, context, handler, connectLock, id);
-
-                AZ::Data::Asset<AZ::Data::AssetData> asset;
-                EBUS_EVENT_ID_RESULT(asset, id, MeshComponentRequestBus, GetMeshAsset);
-                if (asset.GetStatus() == AZ::Data::AssetData::AssetStatus::Ready)
-                {
-                    handler->OnMeshCreated(asset);
-                }
-            }
-        };
-    };
-
-    using MeshComponentNotificationBus = AZ::EBus<MeshComponentNotifications>;
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/Utils/MaterialOwnerRequestBusHandlerImpl.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/Utils/MaterialOwnerRequestBusHandlerImpl.h
index 2779f68eb4..6fc0e85553 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/Utils/MaterialOwnerRequestBusHandlerImpl.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/Utils/MaterialOwnerRequestBusHandlerImpl.h
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <LmbrCentral/Rendering/MaterialOwnerBus.h>
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/Math/Color.h>
 
@@ -28,8 +27,7 @@ namespace LmbrCentral
     //! This does not actually inherit the MaterialOwnerRequestBus::Handler interface because it is
     //! not intended to subscribe to that bus, but it does provide implementations for all the same functions.
     class MaterialOwnerRequestBusHandlerImpl
-        : public MeshComponentNotificationBus::Handler
-        , public AZ::TickBus::Handler
+        : public AZ::TickBus::Handler
         , public MaterialOwnerRequestBus::Handler        
     {
         using MaterialPtr = _smart_ptr < IMaterial >;
@@ -57,14 +55,7 @@ namespace LmbrCentral
 
             if (m_renderNode)
             {
-                if (!m_renderNode->IsReady())
-                {
-                    // Some material owners, in particular MeshComponents, may not be ready upon activation because the
-                    // actual mesh data and default material haven't been loaded yet. Until the RenderNode is ready,
-                    // it's material probably isn't valid.
-                    MeshComponentNotificationBus::Handler::BusConnect(entityId);
-                }
-                else
+                if (m_renderNode->IsReady())
                 {
                     // For some material owner types (like DecalComponent), the material is ready immediately. But we can't
                     // send the event yet because components are still being Activated, so we delay until the first tick.
@@ -81,7 +72,6 @@ namespace LmbrCentral
         void Deactivate()
         {
             m_notificationBus = nullptr;
-            MeshComponentNotificationBus::Handler::BusDisconnect();
             MaterialOwnerRequestBus::Handler::BusDisconnect();
             AZ::TickBus::Handler::BusDisconnect();
         }
@@ -300,16 +290,6 @@ namespace LmbrCentral
         }
         //////////////////////////////////////////////////////////////////////////
 
-        //////////////////////////////////////////////////////////////////////////
-        // MeshComponentNotificationBus interface implementation
-        void OnMeshCreated([[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset) override
-        {
-            AZ_Assert(IsMaterialOwnerReady(), "Got OnMeshCreated but the RenderNode still isn't ready");
-            SendReadyEvent();
-            MeshComponentNotificationBus::Handler::BusDisconnect();
-        }
-        //////////////////////////////////////////////////////////////////////////
-
         //////////////////////////////////////////////////////////////////////////
         // TickBus interface implementation
         void OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time) override
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
index ab245a07f4..be62919093 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
@@ -12,14 +12,11 @@
 set(FILES
     include/LmbrCentral/Rendering/EditorCameraCorrectionBus.h
     include/LmbrCentral/Rendering/EditorLightComponentBus.h
-    include/LmbrCentral/Rendering/EditorMeshBus.h
     include/LmbrCentral/Shape/EditorPolygonPrismShapeComponentBus.h
     include/LmbrCentral/Shape/EditorSplineComponentBus.h
     include/LmbrCentral/Shape/EditorTubeShapeComponentBus.h
     include/LmbrCentral/Component/EditorWrappedComponentBase.h
     include/LmbrCentral/Component/EditorWrappedComponentBase.inl
-    Source/Animation/EditorAttachmentComponent.h
-    Source/Animation/EditorAttachmentComponent.cpp
     Source/Audio/EditorAudioAreaEnvironmentComponent.h
     Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
     Source/Audio/EditorAudioEnvironmentComponent.h
@@ -40,26 +37,6 @@ set(FILES
     Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.cpp
     Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.h
     Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.cpp
-    Source/Rendering/EditorDecalComponent.h
-    Source/Rendering/EditorDecalComponent.cpp
-    Source/Rendering/EditorLensFlareComponent.h
-    Source/Rendering/EditorLensFlareComponent.cpp
-    Source/Rendering/EditorLightComponent.h
-    Source/Rendering/EditorLightComponent.cpp
-    Source/Rendering/EditorPointLightComponent.h
-    Source/Rendering/EditorPointLightComponent.cpp
-    Source/Rendering/EditorAreaLightComponent.h
-    Source/Rendering/EditorAreaLightComponent.cpp
-    Source/Rendering/EditorProjectorLightComponent.h
-    Source/Rendering/EditorProjectorLightComponent.cpp
-    Source/Rendering/EditorEnvProbeComponent.h
-    Source/Rendering/EditorEnvProbeComponent.cpp
-    Source/Rendering/EditorMeshComponent.h
-    Source/Rendering/EditorMeshComponent.cpp
-    Source/Rendering/EditorHighQualityShadowComponent.h
-    Source/Rendering/EditorHighQualityShadowComponent.cpp
-    Source/Rendering/EditorGeomCacheComponent.h
-    Source/Rendering/EditorGeomCacheComponent.cpp
     Source/Scripting/EditorLookAtComponent.h
     Source/Scripting/EditorLookAtComponent.cpp
     Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
index 648840c7c8..b78ff769c2 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
@@ -14,13 +14,11 @@ set(FILES
     Tests/LmbrCentralReflectionTest.h
     Tests/LmbrCentralReflectionTest.cpp
     Tests/EditorBoxShapeComponentTests.cpp
-    Tests/EditorLensFlareComponentTests.cpp
     Tests/EditorSphereShapeComponentTests.cpp
     Tests/EditorCapsuleShapeComponentTests.cpp
     Tests/EditorCompoundShapeComponentTests.cpp
     Tests/EditorCylinderShapeComponentTests.cpp
     Tests/EditorPolygonPrismShapeComponentTests.cpp
-    Tests/EditorMeshComponentTests.cpp
     Tests/SpawnerComponentTest.cpp
     Tests/Builders/CopyDependencyBuilderTest.cpp
     Tests/Builders/SliceBuilderTests.cpp
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
index d0df6c7dd0..df6bafd499 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
@@ -17,6 +17,7 @@ set(FILES
     include/LmbrCentral/Ai/NavigationSystemBus.h
     include/LmbrCentral/Ai/NavigationSeedBus.h
     include/LmbrCentral/Animation/AttachmentComponentBus.h
+    include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
     include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h
     include/LmbrCentral/Audio/AudioListenerComponentBus.h
     include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h
@@ -35,18 +36,13 @@ set(FILES
     include/LmbrCentral/Physics/ForceVolumeRequestBus.h
     include/LmbrCentral/Physics/WaterNotificationBus.h
     include/LmbrCentral/Rendering/DecalComponentBus.h
-    include/LmbrCentral/Rendering/LensFlareAsset.h
-    include/LmbrCentral/Rendering/LensFlareComponentBus.h
     include/LmbrCentral/Rendering/LightComponentBus.h
     include/LmbrCentral/Rendering/MaterialAsset.h
     include/LmbrCentral/Rendering/MaterialHandle.h
     include/LmbrCentral/Rendering/MaterialOwnerBus.h
     include/LmbrCentral/Rendering/MeshAsset.h
-    include/LmbrCentral/Rendering/MeshComponentBus.h
     include/LmbrCentral/Rendering/MeshModificationBus.h
     include/LmbrCentral/Rendering/RenderNodeBus.h
-    include/LmbrCentral/Rendering/HighQualityShadowComponentBus.h
-    include/LmbrCentral/Rendering/GeomCacheComponentBus.h
     include/LmbrCentral/Rendering/GiRegistrationBus.h
     include/LmbrCentral/Rendering/RenderBoundsBus.h
     include/LmbrCentral/Rendering/Utils/MaterialOwnerRequestBusHandlerImpl.h
@@ -73,8 +69,6 @@ set(FILES
     include/LmbrCentral/Terrain/TerrainSystemRequestBus.h
     Source/Ai/NavigationSystemComponent.h
     Source/Ai/NavigationSystemComponent.cpp
-    Source/Animation/AttachmentComponent.h
-    Source/Animation/AttachmentComponent.cpp
     Source/Audio/AudioAreaEnvironmentComponent.h
     Source/Audio/AudioAreaEnvironmentComponent.cpp
     Source/Audio/AudioEnvironmentComponent.h
@@ -103,27 +97,6 @@ set(FILES
     Source/Events/ReflectScriptableEvents.cpp
     Source/Geometry/GeometrySystemComponent.h
     Source/Geometry/GeometrySystemComponent.cpp
-    Source/Rendering/DecalComponent.h
-    Source/Rendering/DecalComponent.cpp
-    Source/Rendering/LensFlareAssetHandler.h
-    Source/Rendering/LensFlareAssetHandler.cpp
-    Source/Rendering/LensFlareComponent.h
-    Source/Rendering/LensFlareComponent.cpp
-    Source/Rendering/LightComponent.h
-    Source/Rendering/LightComponent.cpp
-    Source/Rendering/LightInstance.h
-    Source/Rendering/LightInstance.cpp
-    Source/Rendering/MaterialHandle.cpp
-    Source/Rendering/MeshAssetHandler.h
-    Source/Rendering/MeshAssetHandler.cpp
-    Source/Rendering/MeshComponent.h
-    Source/Rendering/MeshComponent.cpp
-    Source/Rendering/StereoRendererComponent.h
-    Source/Rendering/StereoRendererComponent.cpp
-    Source/Rendering/HighQualityShadowComponent.h
-    Source/Rendering/HighQualityShadowComponent.cpp
-    Source/Rendering/GeomCacheComponent.h
-    Source/Rendering/GeomCacheComponent.cpp
     Source/Rendering/EntityDebugDisplayComponent.h
     Source/Rendering/EntityDebugDisplayComponent.cpp
     Source/Scripting/LookAtComponent.h
diff --git a/Gems/LyShine/Assets/Textures/Basic/Button_Sliced_Normal.tif b/Gems/LyShine/Assets/Textures/Basic/Button_Sliced_Normal.tif
deleted file mode 100644
index c51e06aa9a..0000000000
--- a/Gems/LyShine/Assets/Textures/Basic/Button_Sliced_Normal.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e6a98954dd2b2da87309cf522959efc601444080cf99b850ad64f2b7c5e8668
-size 38228
diff --git a/Gems/LyShine/Assets/Textures/Basic/button_sliced_normal.sprite b/Gems/LyShine/Assets/Textures/Basic/button_sliced_normal.sprite
deleted file mode 100644
index 3f6cfe0345..0000000000
--- a/Gems/LyShine/Assets/Textures/Basic/button_sliced_normal.sprite
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f91c1587e5d611d253528c82c93b83e460f7ea71412d2489ff368eca4d8798db
-size 122
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
index a65e220cbd..225f4e0b1a 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
@@ -16,7 +16,6 @@
 #include "UiEditorDLLBus.h"
 #include "UiAnimViewSequenceManager.h"
 #include "UiAnimViewUndo.h"
-#include "Material/MaterialManager.h"
 #include "AnimationContext.h"
 #include "GameEngine.h"
 #include <LyShine/Bus/UiCanvasBus.h>
diff --git a/Gems/LyShine/Code/Editor/ComponentHelpers.cpp b/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
index 9a04864141..6c20b7784d 100644
--- a/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
@@ -30,7 +30,7 @@ namespace Internal
 {
     AZStd::string GetComponentIconPath(const AZ::SerializeContext::ClassData& componentClassData)
     {
-        AZStd::string iconPath = "Editor/Icons/Components/Component_Placeholder.svg";
+        AZStd::string iconPath = "Icons/Components/Component_Placeholder.svg";
 
         auto editorElementData = componentClassData.m_editData->FindElementData(AZ::Edit::ClassElements::EditorData);
         if (auto iconAttribute = editorElementData->FindAttribute(AZ::Edit::Attributes::Icon))
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
index 3789b5a130..61f6e0f3dc 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
@@ -49,7 +49,7 @@ PropertyDirectoryCtrl::PropertyDirectoryCtrl(QWidget* parent)
 
         refreshButton->setFocusPolicy(Qt::StrongFocus);
 
-        refreshButton->setIcon(QIcon("Editor/Icons/PropertyEditor/reset_icon.png"));
+        refreshButton->setIcon(QIcon("Icons/PropertyEditor/reset_icon.png"));
 
         // The icon size needs to be smaller than the fixed size to make sure it visually aligns properly.
         QSize iconSize = QSize(fixedSize.width() - 2, fixedSize.height() - 2);
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
index 700793a250..20721d4624 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
@@ -65,7 +65,7 @@ PropertySpriteCtrl::PropertySpriteCtrl(QWidget* parent)
 
         slicerButton->setFocusPolicy(Qt::StrongFocus);
 
-        slicerButton->setIcon(QIcon("Editor/Icons/PropertyEditor/open_in.png"));
+        slicerButton->setIcon(QIcon("Icons/PropertyEditor/open_in.png"));
 
         // The icon size needs to be smaller than the fixed size to make sure it visually aligns properly.
         QSize iconSize = QSize(fixedSize.width() - 2, fixedSize.height() - 2);
diff --git a/Gems/LyShine/Code/Editor/ViewportAnchor.cpp b/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
index 7f9b841d7f..d61066f4d9 100644
--- a/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
@@ -14,10 +14,10 @@
 #include "EditorCommon.h"
 
 ViewportAnchor::ViewportAnchor()
-    : m_anchorWhole(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif"))
-    , m_anchorLeft(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif"))
-    , m_anchorLeftTop(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif"))
-    , m_dottedLine(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif"))
+    : m_anchorWhole(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif"))
+    , m_anchorLeft(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif"))
+    , m_anchorLeftTop(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif"))
+    , m_dottedLine(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif"))
 {
 }
 
diff --git a/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
index 82a7847459..ccc35de305 100644
--- a/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
@@ -15,7 +15,7 @@
 #include "EditorCommon.h"
 
 ViewportCanvasBackground::ViewportCanvasBackground()
-    : m_canvasBackground(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif"))
+    : m_canvasBackground(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif"))
 {
 }
 
diff --git a/Gems/LyShine/Code/Editor/ViewportHighlight.cpp b/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
index 254cef8a5a..c050d55049 100644
--- a/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
@@ -14,8 +14,8 @@
 #include "EditorCommon.h"
 
 ViewportHighlight::ViewportHighlight()
-    : m_highlightIconSelected(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif"))
-    , m_highlightIconUnselected(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif"))
+    : m_highlightIconSelected(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif"))
+    , m_highlightIconUnselected(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif"))
 {
 }
 
diff --git a/Gems/LyShine/Code/Editor/ViewportIcon.cpp b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
index 1e137fe91b..81ed5dbcb5 100644
--- a/Gems/LyShine/Code/Editor/ViewportIcon.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
@@ -344,7 +344,7 @@ void ViewportIcon::DrawDistanceLineWithTransform(Draw2dHelper& draw2d, AZ::Vecto
     DrawDistanceLine(draw2d, start2, end2, value, suffix);
 }
 
-void ViewportIcon::DrawElementRectOutline([[maybe_unused]] Draw2dHelper& draw2d, AZ::EntityId entityId, AZ::Color color)
+void ViewportIcon::DrawElementRectOutline(Draw2dHelper& draw2d, AZ::EntityId entityId, AZ::Color color)
 {
     // get the transformed rect for the element
     UiTransformInterface::RectPoints points;
@@ -380,109 +380,5 @@ void ViewportIcon::DrawElementRectOutline([[maybe_unused]] Draw2dHelper& draw2d,
     rightVec.NormalizeSafe();
     downVec.NormalizeSafe();
 
-    // calculate the transformed width and height of the rect
-    // (in case it is smaller than the texture height)
-    AZ::Vector2 widthVec = points.TopRight() - points.TopLeft();
-    AZ::Vector2 heightVec = points.BottomLeft() - points.TopLeft();
-    float rectWidth = widthVec.GetLength();
-    float rectHeight = heightVec.GetLength();
-
-    // the outline "width" will be based on the texture height
-    float textureHeight = GetTextureSize().GetY();
-    if (textureHeight <= 0)
-    {
-        return; // should never happen - avoiding possible divide by zero later
-    }
-
-    // the outline is centered on the element rect so half the outline is outside
-    // the rect and half is inside the rect
-    float outerOffset = -textureHeight * 0.5f;
-    float innerOffset = textureHeight * 0.5f;
-    float outerV = 0.0f;
-    float innerV = 1.0f;
-
-    // if the rect is small there may not be space for the half of the outline that
-    // is inside the rect. If this is the case reduce the innerOffset so the inner
-    // points are coincident. Adjust the UVs according to keep a 1-1 texel to pixel ratio.
-    float minDimension = min(rectWidth, rectHeight);
-    if (innerOffset > minDimension * 0.5f)
-    {
-        float oldInnerOffset = innerOffset;
-        innerOffset = minDimension * 0.5f;
-        // note oldInnerOffset can't be zero because of early return if textureHeight is zero
-        innerV = 0.5f + 0.5f * innerOffset / oldInnerOffset;
-    }
-
-    // fill out the 8 verts to define the 2 rectangles - outer and inner
-    // The vertices are in the order of outer rect then inner rect. e.g.:
-    //  0        1
-    //     4  5
-    //     6  7
-    //  2        3
-    //
-    const int32 NUM_VERTS = 8;
-    AZ::Vector2 verts2d[NUM_VERTS] = {
-        // four verts of outer rect
-        points.pt[0] + rightVec * outerOffset + downVec * outerOffset,
-        points.pt[1] - rightVec * outerOffset + downVec * outerOffset,
-        points.pt[3] + rightVec * outerOffset - downVec * outerOffset,
-        points.pt[2] - rightVec * outerOffset - downVec * outerOffset,
-        // four verts of inner rect
-        points.pt[0] + rightVec * innerOffset + downVec * innerOffset,
-        points.pt[1] - rightVec * innerOffset + downVec * innerOffset,
-        points.pt[3] + rightVec * innerOffset - downVec * innerOffset,
-        points.pt[2] - rightVec * innerOffset - downVec * innerOffset,
-    };
-
-    // and define the UV coordinates for these 8 verts
-    AZ::Vector2 uvs[NUM_VERTS] = {
-        AZ::Vector2(0.0f, outerV), AZ::Vector2(1.0f, outerV), AZ::Vector2(1.0f, outerV), AZ::Vector2(0.0f, outerV),
-        AZ::Vector2(0.0f, innerV), AZ::Vector2(1.0f, innerV), AZ::Vector2(1.0f, innerV), AZ::Vector2(0.0f, innerV),
-    };
-
-    // Now create the 8 verts in the right vertex format for DrawDynVB
-    SVF_P3F_C4B_T2F vertices[NUM_VERTS];
-    const float z = 1.0f;   // depth test disabled, if writing Z this will write at far plane
-    uint32 packedColor = (color.GetA8() << 24) | (color.GetR8() << 16) | (color.GetG8() << 8) | color.GetB8();
-    for (int i = 0; i < NUM_VERTS; ++i)
-    {
-        vertices[i].xyz = Vec3(verts2d[i].GetX(), verts2d[i].GetY(), z);
-        vertices[i].color.dcolor = packedColor;
-        vertices[i].st = Vec2(uvs[i].GetX(), uvs[i].GetY());
-    }
-
-    // The indicies are for four quads (one for each side of the rect).
-    // The quads are drawn using a triangle list (simpler than a tri-strip)
-    // We draw each quad in the same order that the image component draws quads to
-    // maximize chances of things lining up so each quad is drawn as two triangles:
-    // top-left, top-right, bottom-left / bottom-left, top-right, bottom-right
-    // e.g. for a quad like this:
-    //
-    // 0   1
-    //  |/|
-    // 2   3
-    //
-    // The two triangles would be 0,1,2 and 2,1,3
-    //
-    const int32 NUM_INDICES = 24;
-    uint16 indicies[NUM_INDICES] =
-    {
-        0, 1, 4,    4, 1, 5,    // top quad
-        6, 7, 2,    2, 7, 3,    // bottom quad
-        0, 4, 2,    2, 4, 6,    // left quad
-        5, 1, 7,    1, 7, 3,    // right quad
-    };
-
-#ifdef LYSHINE_ATOM_TODO
-    IRenderer* renderer = gEnv->pRenderer;
-    renderer->SetTexture(m_texture->GetTextureID());
-
-    renderer->SetState(GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA | GS_NODEPTHTEST);
-    renderer->SetColorOp(eCO_MODULATE, eCO_MODULATE, DEF_TEXARG0, DEF_TEXARG0);
-
-    // This will end up using DrawIndexedPrimitive to render the quad
-    renderer->DrawDynVB(vertices, indicies, NUM_VERTS, NUM_INDICES, prtTriangleList);
-#else
-    // LYSHINE_ATOM_TODO - add option in Draw2d to draw indexed primitive for this textured element outline
-#endif
+    draw2d.DrawRectOutlineTextured(m_image, points, rightVec, downVec, color);
 }
diff --git a/Gems/LyShine/Code/Editor/ViewportInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
index a5370ef7c3..60b7f4f35b 100644
--- a/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
@@ -167,8 +167,8 @@ ViewportInteraction::ViewportInteraction(EditorWindow* editorWindow)
     : QObject()
     , m_editorWindow(editorWindow)
     , m_activeElementId()
-    , m_anchorWhole(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif"))
-    , m_pivotIcon(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif"))
+    , m_anchorWhole(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif"))
+    , m_pivotIcon(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif"))
     , m_interactionMode(PersistentGetInteractionMode())
     , m_interactionType(InteractionType::NONE)
     , m_coordinateSystem(PersistentGetCoordinateSystem())
@@ -186,13 +186,13 @@ ViewportInteraction::ViewportInteraction(EditorWindow* editorWindow)
     , m_startAnchors(UiTransform2dInterface::Anchors())
     , m_grabbedAnchors(ViewportHelpers::SelectedAnchors())
     , m_grabbedGizmoParts(ViewportHelpers::GizmoParts())
-    , m_lineTriangleX(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif"))
-    , m_lineTriangleY(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif"))
-    , m_circle(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif"))
-    , m_lineSquareX(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif"))
-    , m_lineSquareY(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif"))
-    , m_centerSquare(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif"))
-    , m_dottedLine(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif"))
+    , m_lineTriangleX(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif"))
+    , m_lineTriangleY(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif"))
+    , m_circle(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif"))
+    , m_lineSquareX(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif"))
+    , m_lineSquareY(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif"))
+    , m_centerSquare(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif"))
+    , m_dottedLine(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif"))
     , m_dragInteraction(nullptr)
     , m_expanderWatcher(new ViewportInteractionExpanderWatcher(this))
 {
diff --git a/Gems/LyShine/Code/Editor/ViewportPivot.cpp b/Gems/LyShine/Code/Editor/ViewportPivot.cpp
index 0c3660159a..694cf91515 100644
--- a/Gems/LyShine/Code/Editor/ViewportPivot.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportPivot.cpp
@@ -15,7 +15,7 @@
 #include "ViewportPivot.h"
 
 ViewportPivot::ViewportPivot()
-    : m_pivot(new ViewportIcon("Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif"))
+    : m_pivot(new ViewportIcon("Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif"))
 {
 }
 
diff --git a/Gems/LyShine/Code/Editor/ViewportWidget.cpp b/Gems/LyShine/Code/Editor/ViewportWidget.cpp
index 9956a39647..753e207288 100644
--- a/Gems/LyShine/Code/Editor/ViewportWidget.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportWidget.cpp
@@ -570,7 +570,8 @@ void ViewportWidget::mousePressEvent(QMouseEvent* ev)
             if (ev->button() == Qt::LeftButton)
             {
                 // Send event to this canvas
-                const AZ::Vector2 viewportPosition(aznumeric_cast<float>(ev->x()), aznumeric_cast<float>(ev->y()));
+                QPointF scaledPos = WidgetToViewport(ev->localPos());
+                const AZ::Vector2 viewportPosition(aznumeric_cast<float>(scaledPos.x()), aznumeric_cast<float>(scaledPos.y()));
                 const AzFramework::InputChannel::Snapshot inputSnapshot(AzFramework::InputDeviceMouse::Button::Left,
                                                                         AzFramework::InputDeviceMouse::Id,
                                                                         AzFramework::InputChannel::State::Began);
@@ -604,7 +605,8 @@ void ViewportWidget::mouseMoveEvent(QMouseEvent* ev)
         AZ::EntityId canvasEntityId = m_editorWindow->GetPreviewModeCanvas();
         if (canvasEntityId.IsValid())
         {
-            const AZ::Vector2 viewportPosition(aznumeric_cast<float>(ev->x()), aznumeric_cast<float>(ev->y()));
+            QPointF scaledPos = WidgetToViewport(ev->localPos());
+            const AZ::Vector2 viewportPosition(aznumeric_cast<float>(scaledPos.x()), aznumeric_cast<float>(scaledPos.y()));
             const AzFramework::InputChannelId& channelId = (ev->buttons() & Qt::LeftButton) ?
                                                             AzFramework::InputDeviceMouse::Button::Left :
                                                             AzFramework::InputDeviceMouse::SystemCursorPosition;
@@ -640,7 +642,8 @@ void ViewportWidget::mouseReleaseEvent(QMouseEvent* ev)
             if (ev->button() == Qt::LeftButton)
             {
                 // Send event to this canvas
-                const AZ::Vector2 viewportPosition(aznumeric_cast<float>(ev->x()), aznumeric_cast<float>(ev->y()));
+                QPointF scaledPos = WidgetToViewport(ev->localPos());
+                const AZ::Vector2 viewportPosition(aznumeric_cast<float>(scaledPos.x()), aznumeric_cast<float>(scaledPos.y()));
                 const AzFramework::InputChannel::Snapshot inputSnapshot(AzFramework::InputDeviceMouse::Button::Left,
                                                                         AzFramework::InputDeviceMouse::Id,
                                                                         AzFramework::InputChannel::State::Ended);
@@ -904,6 +907,10 @@ QPointF ViewportWidget::WidgetToViewport(const QPointF & point) const
 
 void ViewportWidget::RenderEditMode(float deltaTime)
 {
+    // sort keys for different layers
+    static const int64_t backgroundKey = -0x1000;
+    static const int64_t topLayerKey = 0x1000000;
+
     if (m_fontTextureHasChanged)
     {
         // A font texture has changed since we last rendered. Force a render graph update for each loaded canvas
@@ -924,6 +931,7 @@ void ViewportWidget::RenderEditMode(float deltaTime)
     AZ::Vector2 canvasSize;
     EBUS_EVENT_ID_RESULT(canvasSize, canvasEntityId, UiCanvasBus, GetCanvasSize);
 
+    m_draw2d->SetSortKey(backgroundKey);
     m_viewportBackground->Draw(draw2d,
         canvasSize,
         m_viewportInteraction->GetCanvasToViewportScale(),
@@ -948,6 +956,7 @@ void ViewportWidget::RenderEditMode(float deltaTime)
     // Render this canvas
     EBUS_EVENT_ID(canvasEntityId, UiEditorCanvasBus, RenderCanvasInEditorViewport, false, viewportSize);
 
+    m_draw2d->SetSortKey(topLayerKey);
     // Draw borders around selected and unselected UI elements in the viewport
     // depending on the flags in m_drawElementBordersFlags
     HierarchyItemRawPtrList selectedItems = SelectionHelpers::GetSelectedHierarchyItems(m_editorWindow->GetHierarchy(), selection);
diff --git a/Gems/LyShine/Code/Include/LyShine/Draw2d.h b/Gems/LyShine/Code/Include/LyShine/Draw2d.h
index ec636c3e3b..df61542e25 100644
--- a/Gems/LyShine/Code/Include/LyShine/Draw2d.h
+++ b/Gems/LyShine/Code/Include/LyShine/Draw2d.h
@@ -13,6 +13,7 @@
 
 #include <LyShine/IDraw2d.h>
 #include <LyShine/ILyShine.h>
+#include <LyShine/Bus/UiTransformBus.h>
 
 #include <Atom/Bootstrap/BootstrapNotificationBus.h>
 #include <Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h>
@@ -128,6 +129,19 @@ public: // member functions
     void DrawText(const char* textString, AZ::Vector2 position, float pointSize,
         float opacity = 1.0f, TextOptions* textOptions = nullptr);
 
+    //! Draw a rectangular outline with a texture
+    //
+    //! \param image        The texture to be used for drawing the outline
+    //! \param points       The rect's vertices (top left, top right, bottom right, bottom left)
+    //! \param rightVec     Right vector. Specified because the rect's width/height could be 0 
+    //! \param downVec      Down vector. Specified because the rect's width/height could be 0
+    //! \param color        The color of the outline
+    void DrawRectOutlineTextured(AZ::Data::Instance<AZ::RPI::Image> image,
+        UiTransformInterface::RectPoints points,
+        AZ::Vector2 rightVec,
+        AZ::Vector2 downVec,
+        AZ::Color color);
+
     //! Get the width and height (in pixels) that would be used to draw the given text string.
     //
     //! Pass the same parameter values that would be used to draw the string
@@ -158,6 +172,9 @@ public: // member functions
     //! Return whether future primitives will be deferred or rendered right away
     bool GetDeferPrimitives();
 
+    //! Set sort key offset for following draws.
+    void SetSortKey(int64_t key);
+
 private:
 
     AZ_DISABLE_COPY_MOVE(CDraw2d);
@@ -243,6 +260,24 @@ protected: // types and constants
         std::string         m_string;
     };
 
+    class DeferredRectOutline
+        : public DeferredPrimitive
+    {
+    public:
+        ~DeferredRectOutline() override {};
+        void Draw(AZ::RHI::Ptr<AZ::RPI::DynamicDrawContext> dynamicDraw,
+            const Draw2dShaderData& shaderData,
+            AZ::RPI::ViewportContextPtr viewportContext) const override;
+
+        AZ::Data::Instance<AZ::RPI::Image> m_image;
+
+        static constexpr int32 NUM_VERTS = 8;
+        AZ::Vector2 m_verts2d[NUM_VERTS];
+        AZ::Vector2 m_uvs[NUM_VERTS];
+
+        AZ::Color m_color;
+    };
+
 protected: // member functions
 
     //! Rotate an array of points around the z-axis at the pivot point.
@@ -261,6 +296,9 @@ protected: // member functions
     //! Draw or defer a line
     void DrawOrDeferLine(const DeferredLine* line);
 
+    //! Draw or defer a rect outline
+    void DrawOrDeferRectOutline(const DeferredRectOutline* outlineRect);
+
     //! Get specified viewport context or default viewport context if not specified
     AZ::RPI::ViewportContextPtr GetViewportContext() const;
 
@@ -394,6 +432,21 @@ public: // member functions
         }
     }
 
+    //! Draw a rect outline with a texture
+    //
+    //! See IDraw2d:DrawRectOutlineTextured for parameter descriptions
+    void DrawRectOutlineTextured(AZ::Data::Instance<AZ::RPI::Image> image,
+        UiTransformInterface::RectPoints points,
+        AZ::Vector2 rightVec,
+        AZ::Vector2 downVec,
+        AZ::Color color)
+    {
+        if (m_draw2d)
+        {
+            m_draw2d->DrawRectOutlineTextured(image, points, rightVec, downVec, color);
+        }
+    }
+
     //! Draw a text string. Only supports ASCII text.
     //
     //! See IDraw2d:DrawText for parameter descriptions
diff --git a/Gems/LyShine/Code/Source/Draw2d.cpp b/Gems/LyShine/Code/Source/Draw2d.cpp
index cd15475039..308761ff4e 100644
--- a/Gems/LyShine/Code/Source/Draw2d.cpp
+++ b/Gems/LyShine/Code/Source/Draw2d.cpp
@@ -305,6 +305,89 @@ void CDraw2d::DrawText(const char* textString, AZ::Vector2 position, float point
         actualTextOptions->baseState);
 }
 
+void CDraw2d::DrawRectOutlineTextured(AZ::Data::Instance<AZ::RPI::Image> image,
+    UiTransformInterface::RectPoints points,
+    AZ::Vector2 rightVec,
+    AZ::Vector2 downVec,
+    AZ::Color color)
+{
+    // since the rect can be transformed we have to add the offsets by multiplying them
+    // by unit vectors parallel with the edges of the rect. However, the rect could be
+    // zero width and/or height so we can't use "points" to compute these unit vectors.
+    // So we instead get two transformed unit vectors and then normalize them
+    rightVec.NormalizeSafe();
+    downVec.NormalizeSafe();
+
+    // calculate the transformed width and height of the rect
+    // (in case it is smaller than the texture height)
+    AZ::Vector2 widthVec = points.TopRight() - points.TopLeft();
+    AZ::Vector2 heightVec = points.BottomLeft() - points.TopLeft();
+    float rectWidth = widthVec.GetLength();
+    float rectHeight = heightVec.GetLength();
+
+    // the outline thickness will be based on the texture height
+    float textureHeight = image ? aznumeric_cast<float>(image->GetDescriptor().m_size.m_height) : 0.0f;
+    if (textureHeight <= 0.0f)
+    {
+        AZ_Assert(false, "Attempting to draw a textured rect outline with an image of zero height.");
+        return; // avoiding possible divide by zero later
+    }
+
+    // the outline is centered on the element rect so half the outline is outside
+    // the rect and half is inside the rect
+    float outerOffset = -textureHeight * 0.5f;
+    float innerOffset = textureHeight * 0.5f;
+    float outerV = 0.0f;
+    float innerV = 1.0f;
+
+    // if the rect is small there may not be space for the half of the outline that
+    // is inside the rect. If this is the case reduce the innerOffset so the inner
+    // points are coincident. Adjust the UVs according to keep a 1-1 texel to pixel ratio.
+    float minDimension = min(rectWidth, rectHeight);
+    if (innerOffset > minDimension * 0.5f)
+    {
+        float oldInnerOffset = innerOffset;
+        innerOffset = minDimension * 0.5f;
+        // note oldInnerOffset can't be zero because of early return if textureHeight is zero
+        innerV = 0.5f + 0.5f * innerOffset / oldInnerOffset;
+    }
+
+    DeferredRectOutline rectOutline;
+
+    // fill out the 8 verts to define the 2 rectangles - outer and inner
+    // The vertices are in the order of outer rect then inner rect. e.g.:
+    //  0        1
+    //     4  5
+    //     6  7
+    //  2        3
+    //
+    // four verts of outer rect
+    rectOutline.m_verts2d[0] = points.pt[0] + rightVec * outerOffset + downVec * outerOffset;
+    rectOutline.m_verts2d[1] = points.pt[1] - rightVec * outerOffset + downVec * outerOffset;
+    rectOutline.m_verts2d[2] = points.pt[3] + rightVec * outerOffset - downVec * outerOffset;
+    rectOutline.m_verts2d[3] = points.pt[2] - rightVec * outerOffset - downVec * outerOffset;
+    // four verts of inner rect
+    rectOutline.m_verts2d[4] = points.pt[0] + rightVec * innerOffset + downVec * innerOffset;
+    rectOutline.m_verts2d[5] = points.pt[1] - rightVec * innerOffset + downVec * innerOffset;
+    rectOutline.m_verts2d[6] = points.pt[3] + rightVec * innerOffset - downVec * innerOffset;
+    rectOutline.m_verts2d[7] = points.pt[2] - rightVec * innerOffset - downVec * innerOffset;
+
+    // and define the UV coordinates for these 8 verts
+    rectOutline.m_uvs[0] = AZ::Vector2(0.0f, outerV);
+    rectOutline.m_uvs[1] = AZ::Vector2(1.0f, outerV);
+    rectOutline.m_uvs[2] = AZ::Vector2(1.0f, outerV);
+    rectOutline.m_uvs[3] = AZ::Vector2(0.0f, outerV);
+    rectOutline.m_uvs[4] = AZ::Vector2(0.0f, innerV);
+    rectOutline.m_uvs[5] = AZ::Vector2(1.0f, innerV);
+    rectOutline.m_uvs[6] = AZ::Vector2(1.0f, innerV);
+    rectOutline.m_uvs[7] = AZ::Vector2(0.0f, innerV);
+
+    rectOutline.m_image = image;
+    rectOutline.m_color = color;
+
+    DrawOrDeferRectOutline(&rectOutline);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // TBD should the size include the offset of the drop shadow (if any)?
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -383,6 +466,11 @@ bool CDraw2d::GetDeferPrimitives()
     return m_deferCalls;
 }
 
+void CDraw2d::SetSortKey(int64_t key)
+{
+    m_dynamicDraw->SetSortKey(key);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC STATIC FUNCTIONS
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -592,6 +680,20 @@ void CDraw2d::DrawOrDeferLine(const DeferredLine* line)
     }
 }
 
+void CDraw2d::DrawOrDeferRectOutline(const DeferredRectOutline* rectOutline)
+{
+    if (m_deferCalls)
+    {
+        DeferredRectOutline* newRectOutline = new DeferredRectOutline;
+        *newRectOutline = *rectOutline;
+        m_deferredPrimitives.push_back(newRectOutline);
+    }
+    else
+    {
+        rectOutline->Draw(m_dynamicDraw, m_shaderData, GetViewportContext());
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 AZ::RPI::ViewportContextPtr CDraw2d::GetViewportContext() const
 {
@@ -604,7 +706,6 @@ AZ::RPI::ViewportContextPtr CDraw2d::GetViewportContext() const
 
     // Return the user specified viewport context
     return m_viewportContext;
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -729,6 +830,80 @@ void CDraw2d::DeferredLine::Draw(AZ::RHI::Ptr<AZ::RPI::DynamicDrawContext> dynam
     dynamicDraw->DrawLinear(vertices, NUM_VERTS, drawSrg);
 }
 
+void CDraw2d::DeferredRectOutline::Draw(AZ::RHI::Ptr<AZ::RPI::DynamicDrawContext> dynamicDraw,
+    const Draw2dShaderData& shaderData,
+    AZ::RPI::ViewportContextPtr viewportContext) const
+{
+    // Create the 8 verts in the right vertex format for the dynamic draw context
+    SVF_P3F_C4B_T2F vertices[NUM_VERTS];
+    const float z = 1.0f;   // depth test disabled, if writing Z this will write at far plane
+    uint32 packedColor = (m_color.GetA8() << 24) | (m_color.GetR8() << 16) | (m_color.GetG8() << 8) | m_color.GetB8();
+    for (int i = 0; i < NUM_VERTS; ++i)
+    {
+        vertices[i].xyz = Vec3(m_verts2d[i].GetX(), m_verts2d[i].GetY(), z);
+        vertices[i].color.dcolor = packedColor;
+        vertices[i].st = Vec2(m_uvs[i].GetX(), m_uvs[i].GetY());
+    }
+
+    // The indices are for four quads (one for each side of the rect).
+    // The quads are drawn using a triangle list (simpler than a tri-strip)
+    // We draw each quad in the same order that the image component draws quads to
+    // maximize chances of things lining up so each quad is drawn as two triangles:
+    // top-left, top-right, bottom-left / bottom-left, top-right, bottom-right
+    // e.g. for a quad like this:
+    //
+    // 0   1
+    //  |/|
+    // 2   3
+    //
+    // The two triangles would be 0,1,2 and 2,1,3
+    //
+    static constexpr int32 NUM_INDICES = 24;
+    uint16 indices[NUM_INDICES] =
+    {
+        0, 1, 4,    4, 1, 5,    // top quad
+        6, 7, 2,    2, 7, 3,    // bottom quad
+        0, 4, 2,    2, 4, 6,    // left quad
+        5, 1, 7,    1, 7, 3,    // right quad
+    };
+
+    // Set up per draw SRG
+    AZ::Data::Instance<AZ::RPI::ShaderResourceGroup> drawSrg = dynamicDraw->NewDrawSrg();
+
+    // Set texture
+    const AZ::RHI::ImageView* imageView = m_image ? m_image->GetImageView() : nullptr;
+    if (!imageView)
+    {
+        // Default to white texture
+        auto image = AZ::RPI::ImageSystemInterface::Get()->GetSystemImage(AZ::RPI::SystemImage::White);
+        imageView = image->GetImageView();
+    }
+
+    if (imageView)
+    {
+        drawSrg->SetImageView(shaderData.m_imageInputIndex, imageView, 0);
+    }
+
+    // Set projection matrix
+    auto windowContext = viewportContext->GetWindowContext();
+    const AZ::RHI::Viewport& viewport = windowContext->GetViewport();
+    const float viewX = viewport.m_minX;
+    const float viewY = viewport.m_minY;
+    const float viewWidth = viewport.m_maxX - viewport.m_minX;
+    const float viewHeight = viewport.m_maxY - viewport.m_minY;
+    const float zf = viewport.m_minZ;
+    const float zn = viewport.m_maxZ;
+    AZ::Matrix4x4 modelViewProjMat;
+    AZ::MakeOrthographicMatrixRH(modelViewProjMat, viewX, viewX + viewWidth, viewY + viewHeight, viewY, zn, zf);
+    drawSrg->SetConstant(shaderData.m_viewProjInputIndex, modelViewProjMat);
+
+    drawSrg->Compile();
+
+    // Add the primitive to the dynamic draw context for drawing
+    dynamicDraw->SetPrimitiveType(AZ::RHI::PrimitiveTopology::TriangleList);
+    dynamicDraw->DrawIndexed(vertices, NUM_VERTS, indices, NUM_INDICES, AZ::RHI::IndexFormat::Uint16, drawSrg);
+
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // CDraw2d::DeferredText
diff --git a/Gems/LyShine/Code/Source/LyShine.cpp b/Gems/LyShine/Code/Source/LyShine.cpp
index 286e756ffa..3ea451b7c5 100644
--- a/Gems/LyShine/Code/Source/LyShine.cpp
+++ b/Gems/LyShine/Code/Source/LyShine.cpp
@@ -72,6 +72,8 @@
 #include <AzFramework/Input/Devices/Touch/InputDeviceTouch.h>
 #include <AzFramework/Metrics/MetricsPlainTextNameRegistration.h>
 
+#include <Atom/RHI/RHIUtils.h>
+
 #include "Animation/UiAnimationSystem.h"
 #include "World/UiCanvasAssetRefComponent.h"
 #include "World/UiCanvasProxyRefComponent.h"
@@ -425,11 +427,8 @@ void CLyShine::Render()
 {
     FRAME_PROFILER(__FUNCTION__, gEnv->pSystem, PROFILE_UI);
 
-    // LYSHINE_ATOM_TODO - convert to use Atom interface to check for null renderer
-    if (!gEnv || !gEnv->pRenderer || gEnv->pRenderer->GetRenderType() == ERenderType::eRT_Null)
+    if (AZ::RHI::IsNullRenderer())
     {
-        // if the renderer is not initialized or it is the null renderer (e.g. running as a server)
-        // then do nothing
         return;
     }
 
diff --git a/Gems/LyShine/Code/Source/LyShineDebug.cpp b/Gems/LyShine/Code/Source/LyShineDebug.cpp
index 5ea01c5c1e..76b4030106 100644
--- a/Gems/LyShine/Code/Source/LyShineDebug.cpp
+++ b/Gems/LyShine/Code/Source/LyShineDebug.cpp
@@ -115,11 +115,13 @@ static int Create2DTexture(int width, int height, byte* data, ETEX_Format format
 #endif
 #endif
 
+#if !defined(_RELEASE)
 static AZ::Vector2 GetTextureSize(AZ::Data::Instance<AZ::RPI::Image> image)
 {
     AZ::RHI::Size size = image->GetDescriptor().m_size;
     return AZ::Vector2(size.m_width, size.m_height);
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #if !defined(_RELEASE)
diff --git a/Gems/LyShine/Code/Source/UiCanvasComponent.cpp b/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
index 2af773734c..8578e6b8eb 100644
--- a/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
@@ -257,13 +257,13 @@ namespace
     UiRenderer* GetUiRendererForGame()
     {
         CLyShine* lyShine = static_cast<CLyShine*>(gEnv->pLyShine);
-        return lyShine->GetUiRenderer();
+        return lyShine ? lyShine->GetUiRenderer() : nullptr;
     }
 
     UiRenderer* GetUiRendererForEditor()
     {
         CLyShine* lyShine = static_cast<CLyShine*>(gEnv->pLyShine);
-        return lyShine->GetUiRendererForEditor();
+        return lyShine ? lyShine->GetUiRendererForEditor() : nullptr;
     }
 
     bool IsValidInteractable(const AZ::EntityId& entityId)
@@ -4255,8 +4255,8 @@ UiCanvasComponent* UiCanvasComponent::FixupPostLoad(AZ::Entity* canvasEntity, AZ
     // Initialize the target canvas size and uniform scale
     // This should be done before calling InGamePostActivate so that the
     // canvas space rects of the elements are accurate
-    AZ_Assert(gEnv->pRenderer, "Attempting to access IRenderer before it has been initialized");
-    if (gEnv->pRenderer)
+    UiRenderer* uiRenderer = forEditor ? GetUiRendererForEditor() : GetUiRendererForGame();
+    if (uiRenderer) // can be null in automated testing
     {
         AZ::Vector2 targetCanvasSize;
         if (canvasSize)
@@ -4265,8 +4265,7 @@ UiCanvasComponent* UiCanvasComponent::FixupPostLoad(AZ::Entity* canvasEntity, AZ
         }
         else
         {
-            targetCanvasSize.SetX(static_cast<float>(gEnv->pRenderer->GetOverlayWidth()));
-            targetCanvasSize.SetY(static_cast<float>(gEnv->pRenderer->GetOverlayHeight()));
+            targetCanvasSize = uiRenderer->GetViewportSize();
         }
         canvasComponent->SetTargetCanvasSizeAndUniformScale(!forEditor, targetCanvasSize);
     }
diff --git a/Gems/LyShine/Code/Source/UiCanvasManager.cpp b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
index 6575a1d2f0..958dba0ab8 100644
--- a/Gems/LyShine/Code/Source/UiCanvasManager.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
@@ -612,10 +612,12 @@ void UiCanvasManager::RenderLoadedCanvases()
         m_fontTextureHasChanged = false;
     }
 
+#ifdef LYSHINE_ATOM_TODO // render target conversion to Atom
     // clear the stencil buffer before rendering the loaded canvases - required for masking
     // NOTE: We want to use ClearTargetsImmediately instead of ClearTargetsLater since we will not be setting the render target
     ColorF viewportBackgroundColor(0, 0, 0, 0); // if clearing color we want to set alpha to zero also
     gEnv->pRenderer->ClearTargetsImmediately(FRT_CLEAR_STENCIL, viewportBackgroundColor);
+#endif
 
     for (auto canvas : m_loadedCanvases)
     {
diff --git a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
index a6ad0347be..facffa0e54 100644
--- a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
@@ -165,8 +165,8 @@ void UiFlipbookAnimationComponent::Reflect(AZ::ReflectContext* context)
 
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Flipbook.png")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Flipbook.png")
+                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Flipbook.png")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Flipbook.png")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("UI"))
                 ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
             ;
diff --git a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
index a2fdfa201f..e54f61fbfa 100644
--- a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
@@ -764,9 +764,6 @@ void UiParticleEmitterComponent::InGamePostActivate()
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 void UiParticleEmitterComponent::Render(LyShine::IRenderGraph* renderGraph)
 {
-    const char* profileMarker = "UI_PARTICLESYS";
-    gEnv->pRenderer->PushProfileMarker(profileMarker);
-
     AZ::Matrix4x4 transform = AZ::Matrix4x4::CreateIdentity();
 
     AZ::Vector2 emitterOffset = AZ::Vector2::CreateZero();
@@ -840,8 +837,6 @@ void UiParticleEmitterComponent::Render(LyShine::IRenderGraph* renderGraph)
     m_cachedPrimitive.m_numVertices = totalVerticesInserted;
     m_cachedPrimitive.m_numIndices = totalParticlesInserted * indicesPerParticle;
     renderGraph->AddPrimitive(&m_cachedPrimitive, texture, isClampTextureMode, isTextureSRGB, isTexturePremultipliedAlpha, m_blendMode);
-
-    gEnv->pRenderer->PopProfileMarker(profileMarker);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
index 6c2833da4f..24d080312d 100644
--- a/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
@@ -82,8 +82,8 @@ void UiSpawnerComponent::Reflect(AZ::ReflectContext* context)
 
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Spawner.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Spawner.png")
+                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Spawner.svg")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spawner.png")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("UI", 0x27ff46b0))
                 ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
 
diff --git a/Gems/LyShine/Code/Source/UiTextComponent.cpp b/Gems/LyShine/Code/Source/UiTextComponent.cpp
index b1092ab92f..937f323b01 100644
--- a/Gems/LyShine/Code/Source/UiTextComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTextComponent.cpp
@@ -1911,9 +1911,6 @@ void UiTextComponent::Render(LyShine::IRenderGraph* renderGraph)
 
     for (RenderCacheBatch* batch : m_renderCache.m_batches)
     {
-        const char* profileMarker = "UI_TEXT";
-        gEnv->pRenderer->PushProfileMarker(profileMarker);
-
         AZ::FFont* font = static_cast<AZ::FFont*>(batch->m_font); // LYSHINE_ATOM_TODO - find a different solution from downcasting FFont to IFont
         AZ::Data::Instance<AZ::RPI::Image> fontImage = font->GetFontImage();
         if (fontImage)
@@ -1944,8 +1941,6 @@ void UiTextComponent::Render(LyShine::IRenderGraph* renderGraph)
                     isClampTextureMode, isTextureSRGB, isTexturePremultipliedAlpha, blendMode);
             }
         }
-
-        gEnv->pRenderer->PopProfileMarker(profileMarker);
     }
 }
 
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
index 2f3ddb3097..9d436f8a57 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
@@ -170,8 +170,8 @@ void UiCanvasAssetRefComponent::Reflect(AZ::ReflectContext* context)
 
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/UiCanvasAssetRef.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/UiCanvasRef.png")
+                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasAssetRef.svg")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasRef.png")
                 ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-ui-canvas-asset-ref.html")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
 
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
index 6247f7413e..0888666aad 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
@@ -347,8 +347,8 @@ void UiCanvasOnMeshComponent::Reflect(AZ::ReflectContext* context)
 
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/UiCanvasOnMesh.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/UiCanvasOnMesh.png")
+                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasOnMesh.svg")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasOnMesh.png")
                 ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-ui-canvas-on-mesh.html")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
 
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
index 78e8e16dfc..9d88b2b066 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
@@ -75,8 +75,8 @@ void UiCanvasProxyRefComponent::Reflect(AZ::ReflectContext* context)
 
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/UiCanvasProxyRef.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/UiCanvasRef.png")
+                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasProxyRef.svg")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasRef.png")
                 ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-ui-canvas-proxy-ref.html")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
 
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleFrame.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleFrame.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleFrame.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleGradient.png.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleGradient.png.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleGradient.png.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/Circle_Shadow.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/Circle_Shadow.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/Circle_Shadow.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTest.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTest.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTest.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTestPow2.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTestPow2.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTestPow2.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ParticleGlow.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ParticleGlow.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ParticleGlow.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/button.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/button.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/button.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonPressed.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonPressed.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonPressed.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonSlider.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonSlider.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonSlider.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkbox_spritesheet.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkbox_spritesheet.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkbox_spritesheet.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkered3.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkered3.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkered3.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/empty_icon.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/empty_icon.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/empty_icon.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/fixed_image.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/fixed_image.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/fixed_image.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/flipbook_walking.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/flipbook_walking.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/flipbook_walking.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/mask.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/mask.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/mask.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outline.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outline.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outline.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outlineRounded.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outlineRounded.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outlineRounded.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/panelBkgd.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/panelBkgd.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/panelBkgd.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02_big.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02_big.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02_big.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical_big.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical_big.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical_big.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03_big.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03_big.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03_big.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_1.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_1.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_1.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_10.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_10.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_10.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_2.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_2.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_2.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_3.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_3.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_3.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_4.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_4.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_4.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_5.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_5.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_5.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_6.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_6.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_6.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_7.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_7.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_7.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_8.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_8.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_8.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_9.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_9.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_9.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_map.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_map.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_map.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/selected.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/selected.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/selected.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInside2.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInside2.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInside2.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInsideSquare.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInsideSquare.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInsideSquare.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp b/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp
index 80750efe7f..cb33ccac98 100644
--- a/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp
+++ b/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp
@@ -97,7 +97,8 @@ namespace LyShineExamples
         if (!texture)
         {
             // if there is no texture we will just use a white texture
-            texture = gEnv->pRenderer->EF_GetTextureByID(gEnv->pRenderer->GetWhiteTextureId());
+            // TODO:  Get a default atom texture here when possible
+            //texture = gEnv->pRenderer->EF_GetTextureByID(gEnv->pRenderer->GetWhiteTextureId());
         }
 
         if (m_isRenderCacheDirty)
diff --git a/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp b/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp
index 261b6c0ec3..2f147a7ddf 100644
--- a/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp
+++ b/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp
@@ -47,8 +47,8 @@ namespace Maestro
                     "SequenceAgent", "Maps Director Component Animations to Behavior Properties on this Entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Cinematics")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/SequenceAgent.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/SequenceAgent.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/SequenceAgent.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/SequenceAgent.png")
                     ->Attribute(AZ::Edit::Attributes::AddableByUser, false)     // SequenceAgents are only added by TrackView
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
             }
diff --git a/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp
index 43bfc9c24e..9ac50e003f 100644
--- a/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp
+++ b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp
@@ -110,8 +110,8 @@ namespace Maestro
                     "Sequence", "Plays Cinematic Animations")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Cinematics")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Sequence.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Sequence.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Sequence.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Sequence.png")
                       //->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, false)     // SequenceAgents are only added by TrackView
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt
index cd0cfca40d..4eeee15c47 100644
--- a/Gems/Multiplayer/Code/CMakeLists.txt
+++ b/Gems/Multiplayer/Code/CMakeLists.txt
@@ -59,6 +59,7 @@ ly_add_target(
 )
 
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
+
     ly_add_target(
         NAME Multiplayer.Tools MODULE
         NAMESPACE Gem
@@ -76,6 +77,50 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::AzToolsFramework
                 Gem::Multiplayer.Static
     )
+    
+    ly_add_target(
+        NAME Multiplayer.Editor.Static STATIC
+        NAMESPACE Gem
+        FILES_CMAKE
+            multiplayer_editor_files.cmake
+        COMPILE_DEFINITIONS
+            PUBLIC
+                MULTIPLAYER_EDITOR
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                .
+                Source
+                ${pal_source_dir}
+            PUBLIC
+                Include
+        BUILD_DEPENDENCIES
+            PUBLIC
+                Legacy::CryCommon
+                Legacy::Editor.Headers
+                AZ::AzCore
+                AZ::AzFramework
+                AZ::AzNetworking
+                AZ::AzToolsFramework
+                Gem::Multiplayer.Static
+    )
+
+    ly_add_target(
+        NAME Multiplayer.Editor GEM_MODULE
+        NAMESPACE Gem
+        FILES_CMAKE
+            multiplayer_editor_shared_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                .
+                Source
+                ${pal_source_dir}
+            PUBLIC
+                Include
+        BUILD_DEPENDENCIES
+            PRIVATE
+                Gem::Multiplayer.Editor.Static
+    )
+
 endif()
 
 if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
diff --git a/Gems/Multiplayer/Code/Include/IMultiplayer.h b/Gems/Multiplayer/Code/Include/IMultiplayer.h
index 67776e15be..47d0d5a05e 100644
--- a/Gems/Multiplayer/Code/Include/IMultiplayer.h
+++ b/Gems/Multiplayer/Code/Include/IMultiplayer.h
@@ -74,6 +74,10 @@ namespace Multiplayer
         //! @param handler The SessionShutdownEvent handler to add
         virtual void AddSessionShutdownHandler(SessionShutdownEvent::Handler& handler) = 0;
 
+        //! Sends a packet telling if entity update messages can be sent
+        //! @param readyForEntityUpdates Ready for entity updates or not
+        virtual void SendReadyForEntityUpdates(bool readyForEntityUpdates) = 0;
+
         //! Returns the gem name associated with the provided component index.
         //! @param  netComponentId the componentId to return the gem name of
         //! @return the name of the gem that contains the requested component
diff --git a/Gems/Multiplayer/Code/Include/MultiplayerTypes.h b/Gems/Multiplayer/Code/Include/MultiplayerTypes.h
index ca3734e4f0..5c690958b5 100644
--- a/Gems/Multiplayer/Code/Include/MultiplayerTypes.h
+++ b/Gems/Multiplayer/Code/Include/MultiplayerTypes.h
@@ -73,6 +73,12 @@ namespace Multiplayer
         True
     };
 
+    enum class AutoActivate : uint8_t
+    {
+        DoNotActivate,
+        Activate
+    };
+
     // This is just a placeholder
     // The level/prefab cooking will devise the actual solution for identifying a dynamically spawnable entity within a prefab
     struct PrefabEntityId
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml b/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml
index 95204a3c3f..5de466899c 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml
+++ b/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml
@@ -14,6 +14,10 @@
         <Member Type="Multiplayer::HostId" Name="hostId" Init="Multiplayer::InvalidHostId" />
         <Member Type="Multiplayer::LongNetworkString" Name="map" />
     </Packet>
+  
+    <Packet Name="ReadyForEntityUpdates" Desc="Client confirming it is ready to receive entity updates">
+      <Member Type="bool" Name="readyForEntityUpdates" />
+    </Packet>
 
     <Packet Name="SyncConsole" Desc="Packet for synchornizing cvars between hosts">
         <Member Type="Multiplayer::LongNetworkString" Name="commandSet" Container="Vector" Count="32" />
diff --git a/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
index d3303cb121..bb1dac5a4e 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
@@ -41,8 +41,8 @@ namespace Multiplayer
                     "Network Binding", "The Network Binding component marks an entity as able to be replicated across the network")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Multiplayer")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/NetBind.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/NetBind.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NetBind.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NetBind.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
             }
         }
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
index b63ffee9a3..76a809b351 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
@@ -33,10 +33,10 @@ namespace Multiplayer
         AzNetworking::IConnection* GetConnection() const override;
         EntityReplicationManager& GetReplicationManager() override;
         void Update(AZ::TimeMs serverGameTimeMs) override;
+        bool CanSendUpdates() const override;
+        void SetCanSendUpdates(bool canSendUpdates) override;
         //! @}
 
-        bool CanSendUpdates();
-
     private:
         EntityReplicationManager m_entityReplicationManager;
         AzNetworking::IConnection* m_connection = nullptr;
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
index 1ee5711341..6d4a332b6e 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
@@ -12,8 +12,13 @@
 
 namespace Multiplayer
 {
-    inline bool ClientToServerConnectionData::CanSendUpdates()
+    inline bool ClientToServerConnectionData::CanSendUpdates() const
     {
         return m_canSendUpdates;
     }
+
+    inline void ClientToServerConnectionData::SetCanSendUpdates(bool canSendUpdates)
+    {
+        m_canSendUpdates = canSendUpdates;
+    }
 }
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/IConnectionData.h b/Gems/Multiplayer/Code/Source/ConnectionData/IConnectionData.h
index ebff75fd9b..a7ceffd289 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/IConnectionData.h
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/IConnectionData.h
@@ -44,5 +44,13 @@ namespace Multiplayer
         //! Creates and manages sending updates to the remote endpoint.
         //! @param serverGameTimeMs current server game time in milliseconds
         virtual void Update(AZ::TimeMs serverGameTimeMs) = 0;
+
+        //! Returns whether update messages can be sent to the connection.
+        //! @return true if update messages can be sent
+        virtual bool CanSendUpdates() const = 0;
+
+        //! Sets the state of connection whether update messages can be sent or not.
+        //! @param canSendUpdates the state value
+        virtual void SetCanSendUpdates(bool canSendUpdates) = 0;
     };
 }
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
index 02b045e63f..7ea62b15fd 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
@@ -34,10 +34,10 @@ namespace Multiplayer
         AzNetworking::IConnection* GetConnection() const override;
         EntityReplicationManager& GetReplicationManager() override;
         void Update(AZ::TimeMs serverGameTimeMs) override;
+        bool CanSendUpdates() const override;
+        void SetCanSendUpdates(bool canSendUpdates) override;
         //! @}
 
-        bool CanSendUpdates();
-
         NetworkEntityHandle GetPrimaryPlayerEntity();
         const NetworkEntityHandle& GetPrimaryPlayerEntity() const;
 
@@ -51,7 +51,7 @@ namespace Multiplayer
         EntityStopEvent::Handler m_controlledEntityRemovedHandler;
         EntityMigrationEvent::Handler m_controlledEntityMigrationHandler;
         AzNetworking::IConnection* m_connection = nullptr;
-        bool m_canSendUpdates = true;
+        bool m_canSendUpdates = false;
     };
 }
 
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
index 07bfb51536..0a4215a363 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
@@ -12,11 +12,17 @@
 
 namespace Multiplayer
 {
-    inline bool ServerToClientConnectionData::CanSendUpdates()
+    inline bool ServerToClientConnectionData::CanSendUpdates() const
     {
         return m_canSendUpdates;
     }
 
+    inline void ServerToClientConnectionData::SetCanSendUpdates(bool canSendUpdates)
+    {
+        m_canSendUpdates = canSendUpdates;
+    }
+
+
     inline NetworkEntityHandle ServerToClientConnectionData::GetPrimaryPlayerEntity()
     {
         return m_controlledEntity;
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorDispatcher.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorDispatcher.cpp
new file mode 100644
index 0000000000..470aa61cd0
--- /dev/null
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorDispatcher.cpp
@@ -0,0 +1,21 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <Source/Editor/MultiplayerEditorDispatcher.h>
+
+namespace Multiplayer
+{
+    MultiplayerEditorDispatcher::MultiplayerEditorDispatcher()
+    {
+        ;
+    }
+}
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorDispatcher.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorDispatcher.h
new file mode 100644
index 0000000000..c1058dc8a0
--- /dev/null
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorDispatcher.h
@@ -0,0 +1,36 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <IEditor.h>
+
+#include <AzCore/Component/Component.h>
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/Console/ILogger.h>
+
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+
+
+namespace Multiplayer
+{
+    //! MultiplayerEditorDispatcher is responsible for dispatching delta from the Editor to an Editor launched local server
+    class MultiplayerEditorDispatcher final
+    {
+    public:
+        MultiplayerEditorDispatcher();
+        ~MultiplayerEditorDispatcher() = default;
+
+    private:
+    };
+}
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
new file mode 100644
index 0000000000..aec3e7870f
--- /dev/null
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
@@ -0,0 +1,154 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <Source/Editor/MultiplayerEditorSystemComponent.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/Console/ILogger.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Utils/Utils.h>
+
+namespace Multiplayer
+{
+    using namespace AzNetworking;
+
+    AZ_CVAR(bool, editorsv_enabled, false, nullptr, AZ::ConsoleFunctorFlags::DontReplicate,
+        "Whether Editor launching a local server to connect to is supported");
+    AZ_CVAR(AZ::CVarFixedString, editorsv_process, "", nullptr, AZ::ConsoleFunctorFlags::DontReplicate,
+        "The server executable that should be run. Empty to use the current project's ServerLauncher");
+
+    void MultiplayerEditorSystemComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<MultiplayerEditorSystemComponent, AZ::Component>()
+                ->Version(1);
+        }
+    }
+
+    void MultiplayerEditorSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+    {
+        required.push_back(AZ_CRC_CE("MultiplayerService"));
+    }
+
+    void MultiplayerEditorSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    {
+        provided.push_back(AZ_CRC_CE("MultiplayerEditorService"));
+    }
+
+    void MultiplayerEditorSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("MultiplayerEditorService"));
+    }
+
+    MultiplayerEditorSystemComponent::MultiplayerEditorSystemComponent()
+    {
+        ;
+    }
+
+    void MultiplayerEditorSystemComponent::Activate()
+    {
+        AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
+    }
+
+    void MultiplayerEditorSystemComponent::Deactivate()
+    {
+        AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
+    }
+
+    void MultiplayerEditorSystemComponent::NotifyRegisterViews()
+    {
+        AZ_Assert(m_editor == nullptr, "NotifyRegisterViews occurred twice!");
+        m_editor = nullptr;
+        AzToolsFramework::EditorRequests::Bus::BroadcastResult(m_editor, &AzToolsFramework::EditorRequests::GetEditor);
+        m_editor->RegisterNotifyListener(this);
+    }
+
+    void MultiplayerEditorSystemComponent::OnEditorNotifyEvent(EEditorNotifyEvent event)
+    {
+        switch (event)
+        {
+        case eNotify_OnBeginGameMode:
+        {       
+            AZ::TickBus::Handler::BusConnect();
+
+            if (editorsv_enabled)
+            {
+                // Assemble the server's path
+                AZ::CVarFixedString serverProcess = editorsv_process;
+                if (serverProcess.empty())
+                {
+                    // If enabled but no process name is supplied, try this project's ServerLauncher
+                    serverProcess = AZ::Utils::GetProjectName() + ".ServerLauncher";
+                }
+
+                AZ::IO::FixedMaxPathString serverPath = AZ::Utils::GetExecutableDirectory();
+                if (!serverProcess.contains(AZ_TRAIT_OS_PATH_SEPARATOR))
+                {
+                    // If only the process name is specified, append that as well
+                    serverPath.append(AZ_TRAIT_OS_PATH_SEPARATOR + serverProcess);
+                }
+                else
+                {
+                    // If any path was already specified, then simply assign
+                    serverPath = serverProcess;
+                }
+
+                if (!serverProcess.ends_with(AZ_TRAIT_OS_EXECUTABLE_EXTENSION))
+                {
+                    // Add this platform's exe extension if it's not specified
+                    serverPath.append(AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+                }
+
+                // Start the configured server if it's available
+                AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
+                processLaunchInfo.m_commandlineParameters =
+                    AZStd::string::format("\"%s\"", serverPath.c_str());
+                processLaunchInfo.m_showWindow = true;
+                processLaunchInfo.m_processPriority = AzFramework::ProcessPriority::PROCESSPRIORITY_NORMAL;
+
+                m_serverProcess = AzFramework::ProcessWatcher::LaunchProcess(
+                    processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_NONE);
+            }
+            break;
+        }
+        case eNotify_OnQuit:
+            AZ_Warning("Multiplayer Editor", m_editor != nullptr, "Multiplayer Editor received On Quit without an Editor pointer.");
+            if (m_editor)
+            {
+                m_editor->UnregisterNotifyListener(this);
+                m_editor = nullptr;
+            }
+            [[fallthrough]];
+        case eNotify_OnEndGameMode:
+            AZ::TickBus::Handler::BusDisconnect();
+            // Kill the configured server if it's active
+            if (m_serverProcess)
+            {
+                m_serverProcess->TerminateProcess(0);
+                m_serverProcess = nullptr;
+            }
+            break;
+        }
+    }
+
+    void MultiplayerEditorSystemComponent::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
+    {
+
+    }
+
+    int MultiplayerEditorSystemComponent::GetTickOrder()
+    {
+        // Tick immediately after the network system component
+        return AZ::TICK_PLACEMENT + 1;
+    }
+}
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
new file mode 100644
index 0000000000..8c18a2e57a
--- /dev/null
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
@@ -0,0 +1,75 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <IEditor.h>
+
+#include <AzCore/Component/Component.h>
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/Console/ILogger.h>
+
+#include <AzFramework/Process/ProcessWatcher.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+
+
+namespace AzNetworking
+{
+    class INetworkInterface;
+}
+
+namespace Multiplayer
+{
+    //! Multiplayer system component wraps the bridging logic between the game and transport layer.
+    class MultiplayerEditorSystemComponent final
+        : public AZ::Component
+        , private AZ::TickBus::Handler
+        , private AzToolsFramework::EditorEvents::Bus::Handler
+        , private IEditorNotifyListener
+    {
+    public:
+        AZ_COMPONENT(MultiplayerEditorSystemComponent, "{9F335CC0-5574-4AD3-A2D8-2FAEF356946C}");
+
+        static void Reflect(AZ::ReflectContext* context);
+        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+
+        MultiplayerEditorSystemComponent();
+        ~MultiplayerEditorSystemComponent() override = default;
+
+        //! AZ::Component overrides.
+        //! @{
+        void Activate() override;
+        void Deactivate() override;
+        //! @}
+
+        //! EditorEvents::Bus::Handler overrides.
+        //! @{
+        void NotifyRegisterViews() override;
+        //! @}
+
+    private:
+
+        //! AZ::TickBus::Handler overrides.
+        //! @{
+        void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
+        int GetTickOrder() override;
+        //! @}
+        //! 
+        void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
+        IEditor* m_editor = nullptr;
+        AzFramework::ProcessWatcher* m_serverProcess = nullptr;
+    };
+}
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerEditorGem.cpp b/Gems/Multiplayer/Code/Source/MultiplayerEditorGem.cpp
new file mode 100644
index 0000000000..97c5e4d105
--- /dev/null
+++ b/Gems/Multiplayer/Code/Source/MultiplayerEditorGem.cpp
@@ -0,0 +1,46 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <Source/Multiplayer_precompiled.h>
+#include <Source/MultiplayerGem.h>
+#include <Source/MultiplayerSystemComponent.h>
+#include <Source/MultiplayerEditorGem.h>
+#include <AzNetworking/Framework/NetworkingSystemComponent.h>
+
+#include <Source/Editor/MultiplayerEditorSystemComponent.h>
+
+namespace Multiplayer
+{
+    AZ_CLASS_ALLOCATOR_IMPL(MultiplayerEditorModule, AZ::SystemAllocator, 0)
+
+    MultiplayerEditorModule::MultiplayerEditorModule()
+        : MultiplayerModule()
+    {
+        // Append Editor specific descriptors
+        m_descriptors.insert(
+            m_descriptors.end(),
+            {
+                MultiplayerEditorSystemComponent::CreateDescriptor(),
+            });
+    }
+
+    MultiplayerEditorModule::~MultiplayerEditorModule() = default;
+
+    AZ::ComponentTypeList MultiplayerEditorModule::GetRequiredSystemComponents() const
+    {
+        AZ::ComponentTypeList requiredComponents = MultiplayerModule::GetRequiredSystemComponents();
+        requiredComponents.push_back(azrtti_typeid<MultiplayerEditorSystemComponent>());
+        return requiredComponents;
+    }
+} // namespace Multiplayer
+
+AZ_DECLARE_MODULE_CLASS(Gem_MultiplayerEditor, Multiplayer::MultiplayerEditorModule)
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerEditorGem.h b/Gems/Multiplayer/Code/Source/MultiplayerEditorGem.h
new file mode 100644
index 0000000000..706a87691e
--- /dev/null
+++ b/Gems/Multiplayer/Code/Source/MultiplayerEditorGem.h
@@ -0,0 +1,30 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#include "MultiplayerGem.h"
+
+namespace Multiplayer
+{
+    class MultiplayerEditorModule: public MultiplayerModule
+    {
+    public:
+        AZ_CLASS_ALLOCATOR_DECL
+        AZ_RTTI(MultiplayerEditorModule, "{50273605-2BBF-4D43-A42D-ED140B92B4D4}", MultiplayerModule);
+
+        MultiplayerEditorModule();
+        ~MultiplayerEditorModule();
+
+        AZ::ComponentTypeList GetRequiredSystemComponents() const override;
+    };
+} // namespace Multiplayer
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
index 596a1b40fa..cafdbf2a09 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
@@ -45,4 +45,6 @@ namespace Multiplayer
     }
 }
 
+#if !defined(MULTIPLAYER_EDITOR)
 AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer, Multiplayer::MultiplayerModule);
+#endif
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
index 2756bb649a..03c661ab03 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
@@ -384,6 +384,19 @@ namespace Multiplayer
         return false;
     }
 
+    bool MultiplayerSystemComponent::HandleRequest( AzNetworking::IConnection* connection,
+        [[maybe_unused]] const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::ReadyForEntityUpdates& packet)
+    {
+        IConnectionData* connectionData = reinterpret_cast<IConnectionData*>(connection->GetUserData());
+        if (connectionData)
+        {
+            connectionData->SetCanSendUpdates(packet.GetReadyForEntityUpdates());
+            return true;
+        }
+
+        return false;
+    }
+
     ConnectResult MultiplayerSystemComponent::ValidateConnect
     (
         [[maybe_unused]] const IpAddress& remoteAddress,
@@ -506,6 +519,15 @@ namespace Multiplayer
         handler.Connect(m_shutdownEvent);
     }
 
+    void MultiplayerSystemComponent::SendReadyForEntityUpdates(bool readyForEntityUpdates)
+    {
+        IConnectionSet& connectionSet = m_networkInterface->GetConnectionSet();
+        connectionSet.VisitConnections([readyForEntityUpdates](IConnection& connection)
+        {
+            connection.SendReliablePacket(MultiplayerPackets::ReadyForEntityUpdates(readyForEntityUpdates));
+        });
+    }
+
     const char* MultiplayerSystemComponent::GetComponentGemName(NetComponentId netComponentId) const
     {
         return GetMultiplayerComponentRegistry()->GetComponentGemName(netComponentId);
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
index f8d56e0408..f25e530b61 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
@@ -71,6 +71,7 @@ namespace Multiplayer
         bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::ClientMigration& packet);
         bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::NotifyClientMigration& packet);
         bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::EntityMigration& packet);
+        bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::ReadyForEntityUpdates& packet);
 
         //! IConnectionListener interface
         //! @{
@@ -88,6 +89,7 @@ namespace Multiplayer
         void AddConnectionAcquiredHandler(ConnectionAcquiredEvent::Handler& handler) override;
         void AddSessionInitHandler(SessionInitEvent::Handler& handler) override;
         void AddSessionShutdownHandler(SessionShutdownEvent::Handler& handler) override;
+        void SendReadyForEntityUpdates(bool readyForEntityUpdates) override;
         const char* GetComponentGemName(NetComponentId netComponentId) const override;
         const char* GetComponentName(NetComponentId netComponentId) const override;
         const char* GetComponentPropertyName(NetComponentId netComponentId, PropertyIndex propertyIndex) const override;
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerTypes.h b/Gems/Multiplayer/Code/Source/MultiplayerTypes.h
index ca3734e4f0..5c690958b5 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerTypes.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerTypes.h
@@ -73,6 +73,12 @@ namespace Multiplayer
         True
     };
 
+    enum class AutoActivate : uint8_t
+    {
+        DoNotActivate,
+        Activate
+    };
+
     // This is just a placeholder
     // The level/prefab cooking will devise the actual solution for identifying a dynamically spawnable entity within a prefab
     struct PrefabEntityId
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
index 938e3b2c23..74bdcd5cf0 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
@@ -543,11 +543,8 @@ namespace Multiplayer
         // Create an entity if we don't have one
         if (createEntity)
         {
-            // @pereslav
-            //replicatorEntity = GetNetworkEntityManager()->CreateSingleEntityImmediateInternal(prefabEntityId, EntitySpawnType::Replicate, AutoActivate::DoNotActivate, netEntityId, localNetworkRole, AZ::Transform::Identity());
             INetworkEntityManager::EntityList entityList = GetNetworkEntityManager()->CreateEntitiesImmediate(
-                prefabEntityId, netEntityId, localNetworkRole,
-                AZ::Transform::Identity());
+                prefabEntityId, netEntityId, localNetworkRole, AutoActivate::DoNotActivate, AZ::Transform::Identity());
 
             if (entityList.size() == 1)
             {
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/INetworkEntityManager.h b/Gems/Multiplayer/Code/Source/NetworkEntity/INetworkEntityManager.h
index da6d9a4cbe..891a4606ea 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/INetworkEntityManager.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/INetworkEntityManager.h
@@ -60,7 +60,8 @@ namespace Multiplayer
         //! Creates new entities of the given archetype
         //! @param prefabEntryId the name of the spawnable to spawn
         virtual EntityList CreateEntitiesImmediate(
-            const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole, const AZ::Transform& transform) = 0;
+            const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole, AutoActivate autoActivate,
+            const AZ::Transform& transform) = 0;
 
         //! Returns an ConstEntityPtr for the provided entityId.
         //! @param netEntityId the netEntityId to get an ConstEntityPtr for
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
index ca1b40ca9b..d1701bbb89 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
@@ -11,19 +11,19 @@
  */
 
 #include <Source/NetworkEntity/NetworkEntityManager.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Include/IMultiplayer.h>
-#include <AzCore/Interface/Interface.h>
+
+#include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>
+#include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Slice/SliceMetadataInfoComponent.h>
+#include <AzFramework/Components/TransformComponent.h>
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/GameEntityContextBus.h>
-#include <AzFramework/Components/TransformComponent.h>
 #include <Include/IMultiplayer.h>
 #include <Pipeline/NetworkSpawnableHolderComponent.h>
-#include <AzCore/Asset/AssetManager.h>
+#include <Source/Components/NetBindComponent.h>
 
 namespace Multiplayer
 {
@@ -361,7 +361,7 @@ namespace Multiplayer
 
     INetworkEntityManager::EntityList NetworkEntityManager::CreateEntitiesImmediate(
         const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole,
-        const AZ::Transform& transform)
+        AutoActivate autoActivate, const AZ::Transform& transform)
     {
         INetworkEntityManager::EntityList returnList;
 
@@ -407,6 +407,11 @@ namespace Multiplayer
                     transformComponent->SetWorldTM(transform);
                 }
 
+                if (autoActivate == AutoActivate::DoNotActivate)
+                {
+                    clone->SetRuntimeActiveByDefault(false);
+                }
+
                 AzFramework::GameEntityContextRequestBus::Broadcast(
                     &AzFramework::GameEntityContextRequestBus::Events::AddGameEntity, clone);
 
@@ -462,7 +467,9 @@ namespace Multiplayer
 
         m_rootSpawnableAsset = netSpawnableAsset;
 
-        const auto agentType = AZ::Interface<IMultiplayer>::Get()->GetAgentType();
+        auto* multiplayer = AZ::Interface<IMultiplayer>::Get();
+
+        const auto agentType = multiplayer->GetAgentType();
         const bool spawnImmediately =
             (agentType == MultiplayerAgentType::ClientServer || agentType == MultiplayerAgentType::DedicatedServer);
 
@@ -470,6 +477,12 @@ namespace Multiplayer
         {
             CreateEntitiesImmediate(*netSpawnable, NetEntityRole::Authority);
         }
+        else
+        {
+            // If we don't spawn net entities immediately (i.e. it is a client),
+            // tell the server/host it can start sending updates that will instantiate entities.
+            multiplayer->SendReadyForEntityUpdates(true);
+        }
     }
 
     void NetworkEntityManager::OnRootSpawnableReleased([[maybe_unused]] uint32_t generation)
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h
index 46f59f3762..142730188b 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h
@@ -50,7 +50,7 @@ namespace Multiplayer
 
         EntityList CreateEntitiesImmediate(
             const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole,
-            const AZ::Transform& transform) override;
+            AutoActivate autoActivate, const AZ::Transform& transform) override;
 
         uint32_t GetEntityCount() const override;
         NetworkEntityHandle AddEntityToEntityMap(NetEntityId netEntityId, AZ::Entity* entity) override;
diff --git a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h
index ea927a1453..edb2f4ae73 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h
@@ -29,7 +29,7 @@ namespace Multiplayer
     {
     public:
         AZ_CLASS_ALLOCATOR(NetworkPrefabProcessor, AZ::SystemAllocator, 0);
-        AZ_RTTI(NetworkPrefabProcessor, "{AF6C36DA-CBB9-4DF4-AE2D-7BC6CCE65176}", PrefabProcessor);
+        AZ_RTTI(Multiplayer::NetworkPrefabProcessor, "{AF6C36DA-CBB9-4DF4-AE2D-7BC6CCE65176}", PrefabProcessor);
 
         ~NetworkPrefabProcessor() override = default;
 
diff --git a/Gems/Multiplayer/Code/multiplayer_editor_files.cmake b/Gems/Multiplayer/Code/multiplayer_editor_files.cmake
new file mode 100644
index 0000000000..ce3e3227e0
--- /dev/null
+++ b/Gems/Multiplayer/Code/multiplayer_editor_files.cmake
@@ -0,0 +1,15 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    Source/Editor/MultiplayerEditorDispatcher.cpp
+    Source/Editor/MultiplayerEditorDispatcher.h
+)
diff --git a/Gems/Multiplayer/Code/multiplayer_editor_shared_files.cmake b/Gems/Multiplayer/Code/multiplayer_editor_shared_files.cmake
new file mode 100644
index 0000000000..2d5611d4b6
--- /dev/null
+++ b/Gems/Multiplayer/Code/multiplayer_editor_shared_files.cmake
@@ -0,0 +1,19 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    Source/MultiplayerGem.cpp
+    Source/MultiplayerGem.h
+    Source/MultiplayerEditorGem.cpp
+    Source/MultiplayerEditorGem.h
+    Source/Editor/MultiplayerEditorSystemComponent.cpp
+    Source/Editor/MultiplayerEditorSystemComponent.h
+)
diff --git a/Gems/Multiplayer/Registry/prefab.tools.setreg b/Gems/Multiplayer/Registry/prefab.tools.setreg
index 4f20f88df9..7f25cf9a43 100644
--- a/Gems/Multiplayer/Registry/prefab.tools.setreg
+++ b/Gems/Multiplayer/Registry/prefab.tools.setreg
@@ -9,14 +9,17 @@
                 {
                     "Stack":
                     {
+                        "PlayInEditor":
+                        [
+                            { "$type": "AzToolsFramework::Prefab::PrefabConversionUtils::EditorInfoRemover" },
+                            { "$type": "Multiplayer::NetworkPrefabProcessor" },
+                            { "$type": "AzToolsFramework::Prefab::PrefabConversionUtils::PrefabCatchmentProcessor" }
+                        ],
                         "GameObjectCreation":
                         [
                             { "$type": "AzToolsFramework::Prefab::PrefabConversionUtils::EditorInfoRemover" },
-                            { "$type": "{AF6C36DA-CBB9-4DF4-AE2D-7BC6CCE65176}" },
-                            { 
-                                "$type": "AzToolsFramework::Prefab::PrefabConversionUtils::PrefabCatchmentProcessor",
-                                "SerializationFormat": "Text" // Options are "Binary" (default) or "Text". Prefer "Binary" for performance.
-                            }
+                            { "$type": "Multiplayer::NetworkPrefabProcessor" },
+                            { "$type": "AzToolsFramework::Prefab::PrefabConversionUtils::PrefabCatchmentProcessor" }
                         ]
                     }
                 }
diff --git a/Gems/NvCloth/Code/CMakeLists.txt b/Gems/NvCloth/Code/CMakeLists.txt
index 983e7ff8f8..d83190a05c 100644
--- a/Gems/NvCloth/Code/CMakeLists.txt
+++ b/Gems/NvCloth/Code/CMakeLists.txt
@@ -43,6 +43,7 @@ ly_add_target(
 ly_add_target(
     NAME NvCloth ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
+    OUTPUT_NAME NvCloth.Gem
     FILES_CMAKE
         nvcloth_shared_files.cmake
     INCLUDE_DIRECTORIES
@@ -83,8 +84,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
 
     ly_add_target(
         NAME NvCloth.Editor GEM_MODULE
-
         NAMESPACE Gem
+        OUTPUT_NAME NvCloth.Editor.Gem
         FILES_CMAKE
             nvcloth_editor_shared_files.cmake
         INCLUDE_DIRECTORIES
@@ -109,6 +110,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     ly_add_target(
         NAME NvCloth.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
         NAMESPACE Gem
+        OUTPUT_NAME NvCloth.Tests.Gem
         FILES_CMAKE
             nvcloth_tests_files.cmake
         INCLUDE_DIRECTORIES
@@ -134,6 +136,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         ly_add_target(
             NAME NvCloth.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
             NAMESPACE Gem
+            OUTPUT_NAME NvCloth.Editor.Tests.Gem
             FILES_CMAKE
                 nvcloth_editor_tests_files.cmake
             INCLUDE_DIRECTORIES
diff --git a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
index 8d9731c9e6..4705a9f2c2 100644
--- a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+++ b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
@@ -49,8 +49,8 @@ namespace NvCloth
                     "Cloth", "The mesh node behaves like a piece of cloth.")
                      ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Cloth.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Cloth.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Cloth.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Cloth.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-cloth.html")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index e6f8fc7188..ec98b0970f 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -52,6 +52,7 @@ ly_add_target(
 ly_add_target(
     NAME PhysX ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
+    OUTPUT_NAME PhysX.Gem
     FILES_CMAKE
         ${physx_shared_files}
     COMPILE_DEFINITIONS
@@ -107,7 +108,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::SceneData
                 Legacy::CryCommon
                 Legacy::CryCommonTools
-                Legacy::Cry3DEngine.CGF.Static
                 Gem::LmbrCentral
                 Gem::PhysX.NumericalMethods
                 Gem::PhysX.Static
@@ -118,8 +118,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
 
     ly_add_target(
         NAME PhysX.Editor GEM_MODULE
-
         NAMESPACE Gem
+        OUTPUT_NAME PhysX.Editor.Gem
         AUTOMOC
         FILES_CMAKE
             physx_editor_shared_files.cmake
@@ -147,6 +147,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     ly_add_target(
         NAME PhysX.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
         NAMESPACE Gem
+        OUTPUT_NAME PhysX.Tests.Gem
         FILES_CMAKE
             physx_tests_files.cmake
         INCLUDE_DIRECTORIES
@@ -166,7 +167,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     ly_add_googlebenchmark(
         NAME Gem::PhysX.Benchmarks
         TARGET Gem::PhysX.Tests
-        TIMEOUT 2400 #40mins
+        TIMEOUT 1500 #25mins
     )
 
     list(APPEND testTargets PhysX.Tests)
@@ -175,6 +176,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         ly_add_target(
             NAME PhysX.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
             NAMESPACE Gem
+            OUTPUT_NAME PhysX.Editor.Tests.Gem
             FILES_CMAKE
                 physx_editor_tests_files.cmake
             INCLUDE_DIRECTORIES
diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
index cab4612402..9aece90d90 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
@@ -223,7 +223,7 @@ namespace PhysX
         AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
             buttonId, AzToolsFramework::ViewportUi::DefaultViewportId,
             &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton, clusterId,
-            AZStd::string::format("Editor/Icons/PhysX/%s.svg", iconName));
+            AZStd::string::format("Icons/PhysX/%s.svg", iconName));
 
         return buttonId;
     }
diff --git a/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
index 516b958adb..05ac4b1363 100644
--- a/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
+++ b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
@@ -48,11 +48,6 @@ namespace PhysX
                 AzToolsFramework::EditorRequests::Bus::BroadcastResult(editor, &AzToolsFramework::EditorRequests::GetEditor);
 
                 ISurfaceTypeEnumerator* surfaceTypeEnumerator = nullptr;
-                if (editor)
-                {
-                    surfaceTypeEnumerator = editor->Get3DEngine()->GetMaterialManager()->GetSurfaceTypeManager()->GetEnumerator();
-                }
-
                 if (surfaceTypeEnumerator)
                 {
                     // Enumerate through CryEngine surface types and create a Physics API material for each of them
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
index eb4235766c..2dc8fc97ec 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
@@ -189,8 +189,8 @@ namespace PhysX
                     "PhysX Collider", "PhysX shape collider")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXCollider.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/PhysXCollider.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCollider.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCollider.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/component/physx/collider")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
@@ -345,7 +345,6 @@ namespace PhysX
         AzToolsFramework::BoxManipulatorRequestBus::Handler::BusConnect(
             AZ::EntityComponentIdPair(GetEntityId(), GetId()));
         ColliderShapeRequestBus::Handler::BusConnect(GetEntityId());
-        LmbrCentral::MeshComponentNotificationBus::Handler::BusConnect(GetEntityId());
         AZ::Render::MeshComponentNotificationBus::Handler::BusConnect(GetEntityId());
         EditorColliderComponentRequestBus::Handler::BusConnect(AZ::EntityComponentIdPair(GetEntityId(), GetId()));
         m_nonUniformScaleChangedHandler = AZ::NonUniformScaleChangedEvent::Handler(
@@ -394,7 +393,6 @@ namespace PhysX
         m_nonUniformScaleChangedHandler.Disconnect();
         EditorColliderComponentRequestBus::Handler::BusDisconnect();
         AZ::Render::MeshComponentNotificationBus::Handler::BusDisconnect();
-        LmbrCentral::MeshComponentNotificationBus::Handler::BusDisconnect();
         ColliderShapeRequestBus::Handler::BusDisconnect();
         AzToolsFramework::BoxManipulatorRequestBus::Handler::BusDisconnect();
         AZ::TransformNotificationBus::Handler::BusDisconnect();
@@ -1179,17 +1177,7 @@ namespace PhysX
         AZ::Render::MeshComponentRequestBus::EventResult(atomMeshAsset, GetEntityId(),
             &AZ::Render::MeshComponentRequestBus::Events::GetModelAsset);
 
-        if (atomMeshAsset.GetId().IsValid())
-        {
-            return atomMeshAsset;
-        }
-
-        // Try legacy render MeshComponent
-        AZ::Data::Asset<AZ::Data::AssetData> legacyMeshAsset;
-        LmbrCentral::MeshComponentRequestBus::EventResult(legacyMeshAsset,
-            GetEntityId(), &LmbrCentral::MeshComponentRequests::GetMeshAsset);
-
-        return legacyMeshAsset;
+        return atomMeshAsset;
     }
 
     void EditorColliderComponent::SetCollisionMeshFromRender()
@@ -1264,14 +1252,6 @@ namespace PhysX
                 renderMeshAsset.GetHint().c_str());
         }
     }
-    
-    void EditorColliderComponent::OnMeshCreated([[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-    {
-        if (ShouldUpdateCollisionMeshFromRender())
-        {
-            SetCollisionMeshFromRender();
-        }
-    }
 
     void EditorColliderComponent::OnModelReady([[maybe_unused]] const AZ::Data::Asset<AZ::RPI::ModelAsset>& modelAsset,
         [[maybe_unused]] const AZ::Data::Instance<AZ::RPI::Model>& model)
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.h b/Gems/PhysX/Code/Source/EditorColliderComponent.h
index f179525802..e78be1b959 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.h
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.h
@@ -32,8 +32,6 @@
 #include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>
 #include <AzToolsFramework/UI/PropertyEditor/ComponentEditor.hxx>
 
-#include <LmbrCentral/Rendering/MeshComponentBus.h>
-
 #include <PhysX/ColliderShapeBus.h>
 #include <PhysX/EditorColliderComponentRequestBus.h>
 #include <PhysX/MeshAsset.h>
@@ -105,7 +103,6 @@ namespace PhysX
         , private PhysX::MeshColliderComponentRequestsBus::Handler
         , private AZ::TransformNotificationBus::Handler
         , private PhysX::ColliderShapeRequestBus::Handler
-        , private LmbrCentral::MeshComponentNotificationBus::Handler
         , private AZ::Render::MeshComponentNotificationBus::Handler
         , private PhysX::EditorColliderComponentRequestBus::Handler
         , private Physics::WorldBodyRequestBus::Handler
@@ -175,9 +172,6 @@ namespace PhysX
         AZ::Transform GetCurrentTransform() override;
         AZ::Vector3 GetBoxScale() override;
 
-        // LmbrCentral::MeshComponentNotificationBus
-        void OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-
         // AZ::Render::MeshComponentNotificationBus
         void OnModelReady(const AZ::Data::Asset<AZ::RPI::ModelAsset>& modelAsset,
             const AZ::Data::Instance<AZ::RPI::Model>& model) override;
diff --git a/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
index b4b730538d..770200cda0 100644
--- a/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
@@ -173,8 +173,8 @@ namespace PhysX
                     "PhysX Force Region", "The force region component is used to apply a physical force on objects within the region")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ForceRegion.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ForceRegion.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/ForceRegion.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/ForceRegion.png")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/console/lumberyard/physx/force-region")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
index 5445f7fc69..fb663dd9a4 100644
--- a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
@@ -307,8 +307,8 @@ namespace PhysX
                     "PhysX Rigid Body", "The entity behaves as a movable rigid object in PhysX.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXRigidBody.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/PhysXRigidBody.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXRigidBody.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXRigidBody.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/console/lumberyard/components/physx/rigid-body")
diff --git a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
index c77e1ad1b2..aa1c945fa3 100644
--- a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
@@ -83,8 +83,8 @@ namespace PhysX
                     "PhysX Shape Collider", "Creates geometry in the PhysX simulation based on an attached shape component")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXCollider.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/PhysXCollider.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCollider.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCollider.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorShapeColliderComponent::m_colliderConfig,
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
index 9a85274910..e1c730b203 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
@@ -101,8 +101,8 @@ namespace PhysX
                     "PhysX Character Controller", "PhysX Character Controller")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXCharacter.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/PhysXCharacter.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCharacter.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCharacter.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorCharacterControllerComponent::m_configuration,
                         "Configuration", "Configuration for the character controller")
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
index c9dcbe4757..03ff0e0aea 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
@@ -49,8 +49,8 @@ namespace PhysX
                     "PhysX Character Gameplay", "PhysX Character Gameplay")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXCharacter.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/PhysXCharacter.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCharacter.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCharacter.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorCharacterGameplayComponent::m_gameplayConfig,
                         "Gameplay Configuration", "Gameplay Configuration")
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
index d120e3d6b0..85060445fc 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
@@ -91,8 +91,8 @@ namespace PhysX
                     "PhysX Ragdoll", "Provides simulation of characters in PhysX.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXRagdoll.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/PhysXRagdoll.svg")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXRagdoll.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXRagdoll.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_positionIterations, "Position Iteration Count",
diff --git a/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
index e7c8d87998..173c35140d 100644
--- a/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
@@ -81,7 +81,7 @@ namespace PhysX
 
         const char* HeightFieldAssetHandler::GetBrowserIcon() const
         {
-            return "Editor/Icons/Components/ColliderMesh.svg";
+            return "Icons/Components/ColliderMesh.svg";
         }
 
         const char* HeightFieldAssetHandler::GetGroup() const
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
index 3315e56935..3987936b8c 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
@@ -77,7 +77,7 @@ namespace PhysX
 
         const char* MeshAssetHandler::GetBrowserIcon() const
         {
-            return "Editor/Icons/Components/ColliderMesh.svg";
+            return "Icons/Components/ColliderMesh.svg";
         }
 
         const char* MeshAssetHandler::GetGroup() const
diff --git a/Gems/PhysXDebug/Code/CMakeLists.txt b/Gems/PhysXDebug/Code/CMakeLists.txt
index a3730e5bcf..f198f6f26e 100644
--- a/Gems/PhysXDebug/Code/CMakeLists.txt
+++ b/Gems/PhysXDebug/Code/CMakeLists.txt
@@ -25,6 +25,7 @@ endif()
 ly_add_target(
     NAME PhysXDebug ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
+    OUTPUT_NAME PhysXDebug.Gem
     FILES_CMAKE
         ${physx_files}
     INCLUDE_DIRECTORIES
@@ -47,8 +48,8 @@ ly_add_target(
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
         NAME PhysXDebug.Editor GEM_MODULE
-
         NAMESPACE Gem
+        OUTPUT_NAME PhysXDebug.Editor.Gem
         FILES_CMAKE
             ${physx_editor_files}
         COMPILE_DEFINITIONS
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp
index 8be67fe89b..592a8e2a75 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp
@@ -290,7 +290,7 @@ namespace AZ::SceneGenerationComponents
 
                 const bool hasBlendShapes = HasAnyBlendShapeChild(graph, nodeIndex);
 
-                auto [optimizedMesh, optimizedUVs, optimizedTangents, optimizedBitangents, optimizedVertexColors, optimizedSkinWeights] = OptimizeMesh(mesh, uvDatas, tangentDatas, bitangentDatas, colorDatas, skinWeightDatas, meshGroup, hasBlendShapes);
+                auto [optimizedMesh, optimizedUVs, optimizedTangents, optimizedBitangents, optimizedVertexColors, optimizedSkinWeights] = OptimizeMesh(mesh, mesh, uvDatas, tangentDatas, bitangentDatas, colorDatas, skinWeightDatas, meshGroup, hasBlendShapes);
 
                 const NodeIndex optimizedMeshNodeIndex = graph.AddChild(graph.GetNodeParent(nodeIndex), name.c_str(), AZStd::move(optimizedMesh));
 
@@ -322,7 +322,7 @@ namespace AZ::SceneGenerationComponents
                 for (const NodeIndex& blendShapeNodeIndex : nodeIndexes(Containers::MakeDerivedFilterView<IBlendShapeData>(childNodes(nodeIndex))))
                 {
                     const IBlendShapeData* blendShapeNode = static_cast<IBlendShapeData*>(graph.GetNodeContent(blendShapeNodeIndex).get());
-                    auto [optimizedBlendShape, _1, _2, _3 , _4, _5] = OptimizeMesh(blendShapeNode, {}, {}, {}, {}, {}, meshGroup, hasBlendShapes);
+                    auto [optimizedBlendShape, _1, _2, _3 , _4, _5] = OptimizeMesh(blendShapeNode, mesh, {}, {}, {}, {}, {}, meshGroup, hasBlendShapes);
 
                     const AZStd::string optimizedName {graph.GetNodeName(blendShapeNodeIndex).GetName(), graph.GetNodeName(blendShapeNodeIndex).GetNameLength()};
                     const NodeIndex optimizedNodeIndex = graph.AddChild(optimizedMeshNodeIndex, optimizedName.c_str(), AZStd::move(optimizedBlendShape));
@@ -383,6 +383,7 @@ namespace AZ::SceneGenerationComponents
         AZStd::unique_ptr<AZ::SceneAPI::DataTypes::ISkinWeightData>
     > MeshOptimizerComponent::OptimizeMesh(
         const MeshDataType* meshData,
+        const IMeshData* baseMesh,
         const AZStd::vector<AZStd::reference_wrapper<const IMeshVertexUVData>>& uvs,
         const AZStd::vector<AZStd::reference_wrapper<const IMeshVertexTangentData>>& tangents,
         const AZStd::vector<AZStd::reference_wrapper<const IMeshVertexBitangentData>>& bitangents,
@@ -441,7 +442,7 @@ namespace AZ::SceneGenerationComponents
         const AZ::u32 faceCount = meshData->GetFaceCount();
         for (AZ::u32 faceIndex = 0; faceIndex < faceCount; ++faceIndex)
         {
-            meshBuilder.BeginPolygon(GetFaceMaterialId(meshData, faceIndex));
+            meshBuilder.BeginPolygon(baseMesh->GetFaceMaterialId(faceIndex));
             for (const AZ::u32 vertexIndex : meshData->GetFaceInfo(faceIndex).vertexIndex)
             {
                 const int orgVertexNumber = meshData->GetUsedPointIndexForControlPoint(meshData->GetControlPointIndex(vertexIndex));
@@ -584,15 +585,6 @@ namespace AZ::SceneGenerationComponents
         );
     }
 
-    unsigned int MeshOptimizerComponent::GetFaceMaterialId([[maybe_unused]] const AZ::SceneAPI::DataTypes::IBlendShapeData* meshData, [[maybe_unused]] unsigned int index)
-    {
-        return 0;
-    }
-    unsigned int MeshOptimizerComponent::GetFaceMaterialId(const AZ::SceneAPI::DataTypes::IMeshData* meshData, unsigned int index)
-    {
-        return meshData->GetFaceMaterialId(index);
-    }
-
     void MeshOptimizerComponent::AddFace(AZ::SceneData::GraphData::BlendShapeData* blendShape, unsigned int index1, unsigned int index2, unsigned int index3, [[maybe_unused]] unsigned int faceMaterialId)
     {
         blendShape->AddFace({index1, index2, index3});
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h
index ee8fa5afe5..e499f30e2e 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h
@@ -66,6 +66,7 @@ namespace AZ::SceneGenerationComponents
             AZStd::unique_ptr<AZ::SceneAPI::DataTypes::ISkinWeightData>
         > OptimizeMesh(
             const MeshDataType* meshData,
+            const SceneAPI::DataTypes::IMeshData* baseMesh,
             const AZStd::vector<AZStd::reference_wrapper<const AZ::SceneAPI::DataTypes::IMeshVertexUVData>>& uvs,
             const AZStd::vector<AZStd::reference_wrapper<const AZ::SceneAPI::DataTypes::IMeshVertexTangentData>>& tangents,
             const AZStd::vector<AZStd::reference_wrapper<const AZ::SceneAPI::DataTypes::IMeshVertexBitangentData>>& bitangents,
@@ -74,9 +75,6 @@ namespace AZ::SceneGenerationComponents
             const AZ::SceneAPI::DataTypes::IMeshGroup& meshGroup,
             bool hasBlendShapes);
 
-        static unsigned int GetFaceMaterialId(const AZ::SceneAPI::DataTypes::IBlendShapeData* meshData, unsigned int index);
-        static unsigned int GetFaceMaterialId(const AZ::SceneAPI::DataTypes::IMeshData* meshData, unsigned int index);
-
         static void AddFace(AZ::SceneData::GraphData::BlendShapeData* blendShape, unsigned int index1, unsigned int index2, unsigned int index3, unsigned int faceMaterialId);
         static void AddFace(AZ::SceneData::GraphData::MeshData* mesh, unsigned int index1, unsigned int index2, unsigned int index3, unsigned int faceMaterialId);
     };
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h
index a39edae4a0..a74654e9a8 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h
@@ -15,7 +15,6 @@
 #include <SceneAPI/SceneCore/Components/GenerationComponent.h>
 #include <SceneAPI/SceneCore/Containers/Scene.h>
 
-#include <RC/ResourceCompilerScene/Common/ExportContextGlobal.h>
 #include <AzCore/RTTI/RTTI.h>
 
 
diff --git a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
index fa562a2986..bf12e91ef9 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
@@ -98,7 +98,7 @@ namespace SceneBuilder
             descriptor.m_jobKey = "Scene compilation";
             descriptor.SetPlatformIdentifier(enabledPlatform.m_identifier.c_str());
             descriptor.m_failOnError = true;
-            descriptor.m_priority = 11; // more important than static mesh files, since these may control logic (actors and motions specifically)
+            descriptor.m_priority = 11; // these may control logic (actors and motions specifically)
             descriptor.m_additionalFingerprintInfo = GetFingerprint();
 
             AZ::SceneAPI::SceneBuilderDependencyBus::Broadcast(&AZ::SceneAPI::SceneBuilderDependencyRequests::ReportJobDependencies,
@@ -107,11 +107,17 @@ namespace SceneBuilder
             response.m_createJobOutputs.push_back(descriptor);
         }
 
-        // Adding corresponding material file as a source file dependency
+        // Adding corresponding _wrinklemask folder as a source file dependency
+        // This enables morph target assets to get references to the wrinkle masks
+        // in the MorphTargetExporter, so they can be automatically applied at runtime
         AssetBuilderSDK::SourceFileDependency sourceFileDependencyInfo;
         AZStd::string relPath = request.m_sourceFile.c_str();
-        AzFramework::StringFunc::Path::ReplaceExtension(relPath, "mtl");
+        AzFramework::StringFunc::Path::StripExtension(relPath);
+        relPath += "_wrinklemasks";
+        AzFramework::StringFunc::Path::AppendSeparator(relPath);
+        relPath += "*_wrinklemask.*";
         sourceFileDependencyInfo.m_sourceFileDependencyPath = relPath;
+        sourceFileDependencyInfo.m_sourceDependencyType = AssetBuilderSDK::SourceFileDependency::SourceFileDependencyType::Wildcards;
         response.m_sourceFileDependencyList.push_back(sourceFileDependencyInfo);
 
         response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
index ba82f58889..8a06848709 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
@@ -99,8 +99,8 @@ namespace ScriptCanvasEditor
                 editContext->Class<EditorScriptCanvasComponent>("Script Canvas", "The Script Canvas component allows you to add a Script Canvas asset to a component, and have it execute on the specified entity.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/ScriptCanvas.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/ScriptCanvas.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/ScriptCanvas/Viewport/ScriptCanvas.png")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, ScriptCanvasAssetHandler::GetAssetTypeStatic())
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
diff --git a/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp
index f135437134..12df5e38a9 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp
@@ -25,7 +25,7 @@ namespace ScriptCanvasEditor
 {
     AZStd::string IconComponent::LookupClassIcon(const AZ::Uuid& classId)
     {
-        AZStd::string iconPath  = "Editor/Icons/ScriptCanvas/Placeholder.png";
+        AZStd::string iconPath  = "Icons/ScriptCanvas/Placeholder.png";
 
         AZ::SerializeContext* serializeContext = nullptr;
         AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
index ded24e3250..fa09601042 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
@@ -52,7 +52,7 @@ namespace ScriptCanvasEditor
                 "Script Canvas Files (*.scriptcanvas)",
                 "Script Canvas",
                 "Script Canvas",
-                "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png",
+                "Icons/ScriptCanvas/Viewport/ScriptCanvas.png",
                 AZ::Color(0.321f, 0.302f, 0.164f, 1.0f),
                 true
             )
diff --git a/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp
index 4b855dcf44..122ae19b51 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp
@@ -100,7 +100,7 @@ namespace ScriptCanvasEditor
                 }
                 else
                 {
-                    QString defaultIcon = QStringLiteral("Editor/Icons/ScriptCanvas/Libraries/All.png");
+                    QString defaultIcon = QStringLiteral("Icons/ScriptCanvas/Libraries/All.png");
                     return QVariant(QIcon(defaultIcon));
                 }
 
diff --git a/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp
index a8c21fa4fa..665c81fa57 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp
@@ -23,7 +23,7 @@ namespace ScriptCanvasEditor
 
     UnitTestBrowserFilterModel::UnitTestBrowserFilterModel(QObject* parent)
         : AssetBrowserFilterModel(parent)
-        , m_iconRunning("Editor/Icons/AssetBrowser/in_progress.gif")
+        , m_iconRunning("Icons/AssetBrowser/in_progress.gif")
         , m_iconFailedToCompile     (":/ScriptCanvasEditorResources/Resources/warning_symbol.png")
         , m_iconFailedToCompileOld  (":/ScriptCanvasEditorResources/Resources/warning_symbol_grey.png")
         , m_iconPassed              (":/ScriptCanvasEditorResources/Resources/valid_icon.png")
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
index 08ebd6ec2b..7d6f53806f 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
@@ -35,7 +35,7 @@ namespace ScriptCanvasEditor
                 {
                     editContext->Class<Editor>("Editor", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/All.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/All.png")
                         ;
                 }
             }
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
index 48ca0085f0..6cae3ecc1a 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
@@ -50,7 +50,7 @@ namespace ScriptCanvasEditor
         {
             editContext->Class<ScriptCanvasAssetNode>("ScriptCanvas Asset", "Script Canvas Asset Node which contains a reference to another ScriptCanvas graph")
                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                 ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::List)
                 ;
         }
diff --git a/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
index 7052ab488f..7d9cb176a3 100644
--- a/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
@@ -320,7 +320,7 @@ namespace ScriptCanvasEditor
     {
         if (AZStd::wildcard_match("*.scriptcanvas", fullSourceFileName))
         {
-            return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/ScriptCanvas_16.png");
+            return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/ScriptCanvas_16.png");
         }
 
         // not one of our types.
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
index 6028b284fa..73b6551e85 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
@@ -556,14 +556,6 @@ namespace
                     categoryPath.append(displayName.c_str());
                 }
 
-                for (auto property : behaviorClass->m_properties)
-                {
-                    if (property.second->m_setter)
-                    {
-                        RegisterMethod(nodePaletteModel, behaviorContext, categoryPath, behaviorClass, property.first, *property.second->m_setter, behaviorClass->IsMethodOverloaded(property.first));
-                    }
-                }
-
                 for (auto methodIter : behaviorClass->m_methods)
                 {
                     if (!IsExplicitOverload(*methodIter.second))
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
index ee4d6d9371..3bfa83b9e7 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
@@ -448,7 +448,7 @@ namespace ScriptCanvasEditor
         GraphCanvas::AssetEditorAutomationRequestBus::Handler::BusConnect(ScriptCanvasEditor::AssetEditorId);
 
         AZStd::array<char, AZ::IO::MaxPathLength> unresolvedPath;
-        AZ::IO::FileIOBase::GetInstance()->ResolvePath("@assets@/editor/translation/scriptcanvas_en_us.qm", unresolvedPath.data(), unresolvedPath.size());
+        AZ::IO::FileIOBase::GetInstance()->ResolvePath("@assets@/translation/scriptcanvas_en_us.qm", unresolvedPath.data(), unresolvedPath.size());
 
         QString translationFilePath(unresolvedPath.data());
         if ( m_translator.load(QLocale::Language::English, translationFilePath) )
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
index 516fa838c8..10bcadc35a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
@@ -59,7 +59,7 @@ namespace ScriptCanvas
 
     const char* SubgraphInterfaceAssetHandler::GetBrowserIcon() const
     {
-        return "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png";
+        return "Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png";
     }
 
     AZ::Uuid SubgraphInterfaceAssetHandler::GetComponentTypeId() const
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
index 48a0b7374b..5fd9f41023 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
@@ -46,7 +46,7 @@ namespace ScriptCanvasEditor
                 "Script Canvas Function Files (*.scriptcanvas_fn)",
                 "Script Canvas Function",
                 "Script Canvas Function",
-                "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png",
+                "Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png",
                 AZ::Color(0.192f, 0.149f, 0.392f, 1.0f),
                 true
                 )
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
index 0bc0daecde..de799c329f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
@@ -45,7 +45,7 @@ namespace ScriptCanvas
                 "Script Canvas Files (*.scriptcanvas_compiled)",
                 "Script Canvas Runtime",
                 "Script Canvas Runtime",
-                "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png",
+                "Icons/ScriptCanvas/Viewport/ScriptCanvas.png",
                 AZ::Color(1.0f,0.0f,0.0f,1.0f),
                 false
             )
@@ -169,7 +169,7 @@ namespace ScriptCanvas
                 "Script Canvas Compiled Function Interfaces (*.scriptcanvas_fn_compiled)",
                 "Script Canvas Function Interface",
                 "Script Canvas Function Interface",
-                "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png",
+                "Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png",
                 AZ::Color(1.0f,0.0f,0.0f,1.0f),
                 false
             )
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
index 2106c26db5..f06f0fe185 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
@@ -58,7 +58,7 @@ namespace ScriptCanvas
 
     const char* RuntimeAssetHandler::GetBrowserIcon() const
     {
-        return "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png";
+        return "Icons/ScriptCanvas/Viewport/ScriptCanvas.png";
     }
 
     AZ::Uuid RuntimeAssetHandler::GetComponentTypeId() const
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
index 27498a2aec..71681ed73b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
@@ -186,21 +186,16 @@ void {{attribute_QualifiedName}}::Reflect(AZ::ReflectContext* context)
                             ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
 
 {% if attribute_Category is defined %}
-            ->Attribute(AZ::Edit::Attributes::Category, "{{ attribute_Category }}")
+                            ->Attribute(AZ::Edit::Attributes::Category, "{{ attribute_Category }}")
 {%- endif %}
-
 {% if attribute_Icon is defined %}
-            ->Attribute(AZ::Edit::Attributes::Icon, "{{ attribute_Icon }}")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "{{ attribute_Icon }}")
 {%- endif %}
-
 {% if attribute_Deprecated is defined %}
-            ->Attribute(AZ::Edit::Attributes::Deprecated, "{{ attribute_Deprecated }}")
+                            ->Attribute(AZ::Edit::Attributes::Deprecated, "{{ attribute_Deprecated }}")
 {%- endif %}
-
 {% set uihandler = 'AZ::Edit::UIHandlers::Default' %}
-
-{% for Property in Class.iter('Property') %}
-{% for item in Property.iter('PropertyData') %}
+{% for item in Class.iter('Property') %}
 {% if item.attrib['UIHandler'] is defined %}
     {% set uihandler = item.attrib['UIHandler'] %}
 {% endif %}
@@ -208,12 +203,11 @@ void {{attribute_QualifiedName}}::Reflect(AZ::ReflectContext* context)
 {% if item.attrib['Description'] is defined %}
     {% set description = item.attrib['Description'] %}
 {% endif %}
-        // {{ item.attrib['Name'] }}
-                ->DataElement({{ uihandler }}, &{{ attribute_Name }}::{{ Property.attrib['Name'] }}, "{{ item.attrib['Name'] }}", "{{ description }}")
-{% for EditAttribute in Property.iter('EditAttribute') %}
-                            ->Attribute({{ EditAttribute.attrib['Key'] }}, {{ EditAttribute.attrib['Value'] }})
-{% endfor %}
-{% endfor %}
+                            // {{ item.attrib['Name'] }}
+                            ->DataElement({{ uihandler }}, &{{ attribute_Name }}::{{ item.attrib['Name'] }}, "{{ item.attrib['Name'] }}", "{{ description }}")
+{%          for EditAttribute in item.iter('EditAttribute') %}
+                                ->Attribute({{ EditAttribute.attrib['Key'] }}, {{ EditAttribute.attrib['Value'] }})
+{%          endfor %}
 {% endfor %}
                             ;
             }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h
index 49ce1cdaa0..bfc85c8256 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h
@@ -40,7 +40,7 @@
 * Example:
 *   NodeDefinition(HelloWorld, "Hello World", "My HelloWorld Node.")
 *   NodeDefinition(HelloWorld, "Hello World", "My HelloWorld Node.",
-*                  NodeTags::Icon("Editor/Icons/ScriptCanvas/HelloWorld.png")
+*                  NodeTags::Icon("Icons/ScriptCanvas/HelloWorld.png")
 *                  NodeTags::Version(3, VersionConverter))
 *
 * ----------------------------------------------------------------------------------------------------------- */
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
index 518174d0f8..f0cea19645 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
@@ -510,7 +510,7 @@ namespace ScriptCanvas
             AZ_Assert(lua_isuserdata(lua, 1), "CallExecutionOut: Error in compiled lua file, 1st argument to SetExecutionOut is not userdata (Nodeable)");
             AZ_Assert(lua_isnumber(lua, 2), "CallExecutionOut: Error in compiled lua file, 2nd argument to SetExecutionOut is not a number");
             Nodeable* nodeable = AZ::ScriptValue<Nodeable*>::StackRead(lua, 1); 
-            size_t index = aznumeric_caster(lua_tointeger(lua, -2));
+            size_t index = aznumeric_caster(lua_tointeger(lua, 2));
             nodeable->CallOut(index, nullptr, nullptr, argsCount - 2);
             // Lua: results...
             return lua_gettop(lua);
@@ -697,7 +697,7 @@ namespace ScriptCanvas
             AZ_Assert(lua_islightuserdata(lua, 2), "Error in compiled lua file, 2nd argument to UnpackDependencyArgs is not userdata (AZStd::vector<AZ::Data::Asset<RuntimeAsset>>*), but a :%s", lua_typename(lua, 2));
             auto dependentAssets = reinterpret_cast<AZStd::vector<AZ::Data::Asset<RuntimeAsset>>*>(lua_touserdata(lua, 2));
             AZ_Assert(lua_isinteger(lua, 3), "Error in compiled Lua file, 3rd argument to UnpackDependencyArgs is not a number");
-            const size_t dependentAssetsIndex = lua_tointeger(lua, 3);
+            const size_t dependentAssetsIndex = aznumeric_caster(lua_tointeger(lua, 3));
 
             return DependencyConstructionPack{ executionState, dependentAssets, dependentAssetsIndex, (*dependentAssets)[dependentAssetsIndex].Get()->m_runtimeData };
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
index 3bc105d1dd..5e11b17c54 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
@@ -234,7 +234,7 @@ namespace ScriptCanvas
             AZStd::set<const GraphVariable*, GraphVariable::Comparator> sortedVariables;
             for (const auto& variablePair : sourceVariables)
             {
-                if (variablePair.second.GetScope() == VariableFlags::Scope::Graph)
+                if (variablePair.second.GetScope() != VariableFlags::Scope::FunctionReadOnly)
                 {
                     sortedVariables.insert(&variablePair.second);
                 }
@@ -244,14 +244,19 @@ namespace ScriptCanvas
                     // #functions2 slot<->variable consider getting all variables from the UX variable manager, or from the ACM and looking them up in the variable manager for ordering
                     m_sourceVariableByDatum.insert(AZStd::make_pair(datum, &variablePair.second));
                 }
+                
             }
 
             for (auto& sourceVariable : sortedVariables)
             {
                 auto datum = sourceVariable->GetDatum();
                 AZ_Assert(datum != nullptr, "the datum must be valid");
+
                 // #functions2 slot<->variable check to verify if it is a member variable
-                auto variable = AddMemberVariable(*datum, sourceVariable->GetVariableName(), sourceVariable->GetVariableId());
+                auto variable = sourceVariable->GetScope() == VariableFlags::Scope::Graph
+                    ? AddMemberVariable(*datum, sourceVariable->GetVariableName(), sourceVariable->GetVariableId())
+                    : AddVariable(*datum, sourceVariable->GetVariableName(), sourceVariable->GetVariableId());
+
                 variable->m_isExposedToConstruction = sourceVariable->IsComponentProperty();
                 // also, all nodeables with !empty editor data have to be exposed
                 // \todo future optimizations will involve checking equality against a default constructed object   
@@ -1205,7 +1210,13 @@ namespace ScriptCanvas
             }
 
             auto& variableNamesInStart = ModStaticVariablesNames(startNode);
-            variableNamesInStart.insert(variableNamesInStart.end(), m_staticVariableNames.begin(), m_staticVariableNames.end());
+            for (auto& staticVariable : m_staticVariableNames)
+            {
+                if (AZStd::find(variableNamesInStart.begin(), variableNamesInStart.end(), staticVariable) == variableNamesInStart.end())
+                {
+                    variableNamesInStart.push_back(staticVariable);
+                }
+            }
         }
 
         void AbstractCodeModel::CreateUserFunctionDefinition(const Node& node, const Slot& entrySlot)
@@ -1598,7 +1609,7 @@ namespace ScriptCanvas
         const AZStd::pair<VariableConstPtr, AZStd::string>* AbstractCodeModel::FindStaticVariable(VariableConstPtr variable) const
         {
             auto iter = AZStd::find_if
-            (m_staticVariableNames.begin()
+                ( m_staticVariableNames.begin()
                 , m_staticVariableNames.end()
                 , [&](const auto& candidate) { return candidate.first == variable; });
 
@@ -2701,15 +2712,20 @@ namespace ScriptCanvas
                 AZStd::string name = AddTranslationVariableName(AZStd::string::format("s_%sCloneSource", staticVariable->m_name.c_str()));
                 staticVariableNames.push_back({ staticVariable, name });
 
-                if (!staticVariable->m_isMember)
+                if (!staticVariable->m_isMember && !staticVariable->m_isFromFunctionDefinitionSlot)
                 {
                     if (staticVariable->m_source)
                     {
-                        ModStaticVariablesNames(staticVariable->m_source).push_back({ staticVariable, name });
-                    }
-                    else
-                    {
-                        AddError(nullptr, aznew Internal::ParseError(AZ::EntityId(), "Missing source for local variable that requires static initializer"));
+                        auto& localStatics = ModStaticVariablesNames(staticVariable->m_source);
+                        auto iter = AZStd::find_if
+                            ( localStatics.begin()
+                            , localStatics.end()
+                            , [&](const auto& candidate) { return candidate.first == staticVariable; });
+
+                        if (iter == localStatics.end())
+                        {
+                            localStatics.push_back({ staticVariable, name });
+                        }
                     }
                 }
             }
@@ -3257,13 +3273,12 @@ namespace ScriptCanvas
                                 return;
                             }
 
-                            execution->SetNodeable(iter->second->m_nodeable);
+                            child->SetNodeable(iter->second->m_nodeable);
 
                             for (auto& childOutSlot : childOutSlots)
                             {
                                 AZ_Assert(childOutSlot, "null slot in child out slot list");
                                 ExecutionTreePtr internalOut = OpenScope(child, node, childOutSlot);
-                                internalOut->SetNodeable(execution->GetNodeable());
 
                                 const size_t outIndex = node->GetOutIndex(*childOutSlot);
                                 if (outIndex == std::numeric_limits<size_t>::max())
@@ -4393,6 +4408,7 @@ namespace ScriptCanvas
 
                     // Scope and name are initialized later
                     variable->m_sourceSlotId = slot->GetId();
+                    variable->m_isFromFunctionDefinitionSlot = true;
                     variablesBySlots.insert({ slot, variable });
                     m_variables.push_back(variable);
                 }
@@ -4998,6 +5014,24 @@ namespace ScriptCanvas
 
             m_variableUse.localVariables.insert(usage.localVariables.begin(), usage.localVariables.end());
             m_variableUse.memberVariables.insert(usage.memberVariables.begin(), usage.memberVariables.end());
+
+            for (auto variable : m_variableUse.localVariables)
+            {
+                if (const AZStd::pair<VariableConstPtr, AZStd::string>* pair = FindStaticVariable(variable))
+                {
+                    auto& localStatics = ModStaticVariablesNames(execution);
+                    auto iter = AZStd::find_if
+                        (localStatics.begin()
+                        , localStatics.end()
+                        , [&](const auto& candidate) { return candidate.first == variable; });
+
+                    if (iter == localStatics.end())
+                    {
+                        localStatics.push_back(*pair);
+                    }
+                }
+            }
+
             m_variableUseByExecution.emplace(execution, listener.MoveUsedVariables());
             return (!usage.usesExternallyInitializedVariables) && usesOnlyLocalVariables && listener.IsPure();
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h
index c2605dce45..ab047fb580 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h
@@ -269,6 +269,7 @@ namespace ScriptCanvas
             bool m_isUnused = false; // used for multiple return situations, and to prevent compile errors
             bool m_isExposedToConstruction = false;
             bool m_isDebugOnly = false;
+            bool m_isFromFunctionDefinitionSlot = false;
 
             Variable() = default;
             Variable(Datum&& datum);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
index f1cebde204..3d0d75b313 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
@@ -262,9 +262,6 @@ namespace ScriptCanvas
 
             void SetSymbol(Symbol val);
 
-        protected:
-            VariableConstPtr m_nodeable;
-
         private:
             // the (possible) slot(s) through which execution exited, along with associated output
             AZStd::vector<ExecutionChild> m_children;
@@ -316,6 +313,8 @@ namespace ScriptCanvas
 
             Symbol m_symbol = Symbol::FunctionCall;
 
+            VariableConstPtr m_nodeable;
+
             size_t FindIndexOfChild(ExecutionTreeConstPtr child) const;
         };
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml
index e7b8476ddd..35f2cee0b6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml
@@ -6,7 +6,7 @@
          PreferredClassName="BaseTimer"
            Uuid="{64814C82-DAE5-9B04-B375-5E47D51ECD26}"
            Base="ScriptCanvas::Nodeable"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Utilities"
            Version="0"
            EntryPoint="true"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml
index 695bb76927..d1e8c72b9c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="BaseTimerNode"
            Uuid="{BAD6C904-6078-49E8-B461-CA4410B785A4}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Utilities"
            Version="0"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp
index b1ba26fd29..1e6466ae2f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp
@@ -35,7 +35,7 @@ namespace ScriptCanvas
                     editContext->Class<Comparison>("Comparisons", "Provides mathematical equality operations")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
                         Attribute(AZ::Edit::Attributes::Category, "Math/Comparisons")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/Logic.png")->
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/Logic.png")->
                         Attribute(AZ::Edit::Attributes::CategoryStyle, ".comparison")->
                         Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "ComparisonNodeTitlePalette")
                         ;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
index 0e63d07c5b..132fa8de36 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
@@ -40,7 +40,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<EqualTo>("Equal To (==)", "Checks if Value A and Value B are equal to each other")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
index e7e23415a3..a72ad55236 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Greater>("Greater Than (>)", "Checks if Value A is greater than Value B")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
index 2c08e10712..6151196937 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
@@ -40,7 +40,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<GreaterEqual>("Greater Than or Equal To (>=)", "Checks if Value A is greater than or equal to Value B")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
index fcbacec9f6..a99b578c91 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Less>("Less Than (<)", "Checks if Value A is less than Value B")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
index fff59862b8..aac159d1d4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<LessEqual>("Less Than or Equal To (<=)", "Checks if Value A is less than or equal to Value B")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
index 19bbffb901..95c6b97007 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<NotEqualTo>("Not Equal To (!=)", "Checks if Value A is not equal to Value B")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml
index 66903964ba..4dba14b36c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml
@@ -5,7 +5,7 @@
         PreferredClassName="AZ Event Handler"
         Uuid="{38B808C5-152C-4643-A08C-463EBED55E19}"
         Base="ScriptCanvas::Node"
-        Icon="Editor/Icons/ScriptCanvas/AzEvent.png"
+        Icon="Icons/ScriptCanvas/AzEvent.png"
         Version="0"
         EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
         GraphEntryPoint="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
index 01984d01f1..19c0260d7e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
@@ -70,7 +70,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<Core>("Core", "")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/Core.png")->
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/Core.png")->
                         Attribute(AZ::Edit::Attributes::CategoryStyle, ".time")->
                         Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "TimeNodeTitlePalette")
                         ;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml
index b3179ed2e4..94f06b1a4e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Event Handler"
            Uuid="{33E12915-EFCA-4AA7-A188-D694DAD58980}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Bus.png"
+           Icon="Icons/ScriptCanvas/Bus.png"
            Version="5"
            VersionConverter="ScriptCanvas::VersionConverters::EBusEventHandlerVersionConverter"
            EventHandler="SerializeContextOnWriteEndHandler&lt;EBusEventHandler&gt;"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
index 09e2143e12..abb0f6ddc1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
@@ -77,7 +77,7 @@ namespace ScriptCanvas
                         editContext->Class<Error>("Error", "")
                             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                                 ->Attribute(AZ::Edit::Attributes::Category, "Utilities/Debug")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Error.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Error.png")
                                 ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                             ;
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
index 01646cd8ba..859fbfb27b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
@@ -68,7 +68,7 @@ namespace ScriptCanvas
                         editContext->Class<ErrorHandler>("Error Handler", "")
                             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                                 ->Attribute(AZ::Edit::Attributes::Category, "Utilities/Debug")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/ErrorHandler.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/ErrorHandler.png")
                             ;
                     }
                 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml
index ac841f6685..85642a25b8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Extract Properties"
            Uuid="{D4C9DA8E-838B-41C6-B870-C75294C323DC}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Utilities"
            Version="1"
            VersionConverter="VersionConverter"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml
index e1a660f1a9..2413edc3f5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="For Each"
            Uuid="{31823035-A3FF-4B8D-A3A6-819519478B7C}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Containers"
            Version="2"
            VersionConverter="ScriptCanvas::VersionConverters::ForEachVersionConverter"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml
index 6276522331..d7e999d447 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
            PreferredClassName="Function Call Node"
            Uuid="{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Bus.png"
+           Icon="Icons/ScriptCanvas/Bus.png"
            Version="Version::Current"
            VersionConverter="ScriptCanvas::VersionConverters::FunctionNodeVersionConverter"
            DynamicSlotOrdering="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml
index 8baf5b3088..2197b9c668 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
            PreferredClassName="Function Definition"
            Uuid="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}"
            Base="ScriptCanvas::Nodes::Core::Internal::Nodeling"
-           Icon="Editor/Icons/ScriptCanvas/Start.png"
+           Icon="Icons/ScriptCanvas/Start.png"
            Category="Core"
            Version="1"
            EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml
index 2b00445496..c4afc1b4fd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Get Variable"
            Uuid="{8225BE35-4C45-4A32-94D9-3DE114F6F5AF}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Version="0"
            GeneratePropertyFriend="True"
            Description="Node for referencing a property within the graph">
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
index 0e0467fdcc..836c3facab 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
@@ -276,7 +276,7 @@ namespace ScriptCanvas
 
                 if (IsMethodOverloaded() && BehaviorContextUtils::FindExplicitOverload(method, bcClass, className, methodName, &prettyClassName))
                 {
-                    MethodConfiguration config(*method, method->IsMember() ? MethodType::Member : MethodType::Free);
+                    MethodConfiguration config(*method, MethodType::Member);
                     config.m_class = bcClass;
                     config.m_namespaces = &m_namespaces;
                     config.m_className = &className;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml
index c4e628d89f..e3c871b6fc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
          PreferredClassName="Nodeling"
          Uuid="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}"
          Base="ScriptCanvas::Node"
-         Icon="Editor/Icons/ScriptCanvas/Start.png"
+         Icon="Icons/ScriptCanvas/Start.png"
          Category="Core"
          Version="1"
          GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml
index 50874f161c..485518fe41 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Receive Script Event"
            Uuid="{76CF9938-4A7E-4CDA-8DF3-77C10239D99C}"
            Base="ScriptCanvas::Nodes::Core::Internal::ScriptEventBase"
-           Icon="Editor/Icons/ScriptCanvas/Bus.png"
+           Icon="Icons/ScriptCanvas/Bus.png"
            Version="4"
            VersionConverter="ScriptCanvas::VersionConverters::ReceiveScriptEventVersionConverter"
            EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml
index d9db8d3c91..dbe9c28c54 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Repeater"
            Uuid="{0A38EDCA-0571-48F0-9199-F6168C1EAAF0}"
            Base="ScriptCanvas::Nodes::Internal::BaseTimerNode"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Deprecated="This node is deprecated"
            DeprecationUUID="{AB587027-2270-4CA6-242F-6069C6D9BBB6}"
            Category="Utilities"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml
index 2bf9f2cf40..14634ff959 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml
@@ -6,7 +6,7 @@
            PreferredClassName="Repeater"
            Uuid="{4FBB5021-F3C8-E743-BF2E-BC6E5D57D48E}"
            Base="Nodeables::Time::BaseTimer"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Nodeables"
            GeneratePropertyFriend="True"
            Namespace="ScriptCanvas"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml
index 18064698b2..5141ac9b89 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Send Script Event"
            Uuid="{64A97CC3-2BEA-4B47-809B-6C7DA34FD00F}"
            Base="ScriptCanvas::Nodes::Core::Internal::ScriptEventBase"
-           Icon="Editor/Icons/ScriptCanvas/Bus.png"
+           Icon="Icons/ScriptCanvas/Bus.png"
            Version="4"
            DynamicSlotOrdering="True"
            EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml
index 7581022cde..a513118cfe 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Set Variable"
            Uuid="{5EFD2942-AFF9-4137-939C-023AEAA72EB0}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Version="1"
            GeneratePropertyFriend="True"
            Description="Node for setting a property within the graph">
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml
index db30b4c1cf..033383fbb1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="On Graph Start"
            Uuid="{F200B22A-5903-483A-BF63-5241BC03632B}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Start.png"
+           Icon="Icons/ScriptCanvas/Start.png"
            Category="Timing"
            Version="2"
            GraphEntryPoint="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
index c215fc8d94..045509e7a2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
@@ -40,7 +40,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<String>("String", "Holds a string value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/String.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/String.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
index d4f90ebc4e..9afa0e88ba 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
@@ -61,7 +61,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<Entity>("Entity", "")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/Entity.png")
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/Entity.png")
                         ;
                 }
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
index ac424e1300..dcacc0d656 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<EntityID>("EntityID", "Stores a reference to an entity")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/EntityID.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/EntityID.png")
                                 ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
index eed758470f..c5ac3a6fab 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
@@ -42,7 +42,7 @@ namespace ScriptCanvas
                             // And is unmodifiable(essentially an external constant). As such, we hide it from the node palette.
                             editContext->Class<EntityRef>("EntityID", "Stores a reference to an entity")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/EntityRef.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/EntityRef.png")
                                 ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::List)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
index 52d985cfb5..ce96f254d0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
@@ -40,7 +40,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<And>("And", "An execution flow gate that signals True if both Boolean A and Boolean B are True, otherwise signals False")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
index ef7d3ff0c7..2b9a80435e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Boolean>("Boolean", "A boolean value (true/false)")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Boolean.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Boolean.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml
index 49671fc439..53d8623fe8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="If"
            Uuid="{F19CC10A-02FD-4E75-ADAA-9CFBD8A4E2F8}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Print.png"
+           Icon="Icons/ScriptCanvas/Print.png"
            Version="0"
            GeneratePropertyFriend="True"
            Description="An execution flow gate that continues True if the Condition is True, otherwise continues False">
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml
index e019b69ea8..a9c6369fc1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Is Null"
            Uuid="{760CE936-7059-42A3-A177-530A662E4ECF}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/IsNull.png"
+           Icon="Icons/ScriptCanvas/IsNull.png"
            Version="0"
            GeneratePropertyFriend="True"
            Description="Evaluates reference types for null.">
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
index 8f7f70d103..bc263c92fa 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
@@ -34,7 +34,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<Logic>("Logic", "")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/Logic.png")->
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/Logic.png")->
                         Attribute(AZ::Edit::Attributes::CategoryStyle, ".logic")->
                         Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "LogicNodeTitlePalette")
                         ;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
index b72c036d87..117956f311 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Not>("Not", "An execution flow gate that continues True if the Boolean is False, otherwise continues False if the Boolean is True")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml
index a1b6d21906..63bb463d89 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
            PreferredClassName="Once"
            Uuid="{0E37D3CA-2862-4667-BFDB-7393DD48241B}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Print.png"
+           Icon="Icons/ScriptCanvas/Print.png"
            Version="0"
            GeneratePropertyFriend="True"
            Description="An execution flow gate that will only activate once. The gate will reopen if it receives a Reset pulse.">
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
index 20ceed2946..5eb2681585 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
@@ -38,7 +38,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Or>("Or", "An execution flow gate that continues True if either Boolean A or Boolean B are True, otherwise continues False")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
index 2016117d6e..28b957fbfc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<AABB>("AABB", "An axis-aligned bounding box value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/AABB.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/AABB.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
index df8b0e755c..6d950a0d5c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<CRC>("CRC", "A CRC value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/CRC.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/CRC.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
index 02f0c3ba93..d1e1e539c7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Color>("Color", "A four channel color value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Color.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Color.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
index 6ea59162fb..e8ba617822 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
@@ -43,7 +43,7 @@ namespace ScriptCanvas
                                     ->Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "DeprecatedNodeTitlePalette")
                                     ->Attribute(AZ::Script::Attributes::Deprecated, true)
                                     ->Attribute(AZ::Edit::Attributes::Category, "Math/Number/Deprecated")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
index cf542ba90d..be32f73b5d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
@@ -32,7 +32,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<Math>("Math", "")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/Math.png")->
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/Math.png")->
                         Attribute(AZ::Edit::Attributes::CategoryStyle, ".math")->
                         Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "MathNodeTitlePalette")
                         ;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
index 5a1d7f2818..852443c953 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
@@ -42,7 +42,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Matrix3x3>("Matrix3x3", "A 3x3 matrix value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Matrix3x3.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Matrix3x3.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
index 476c022c55..ae2cbba6e9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Matrix4x4>("Matrix4x4", "A 4x4 matrix value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Matrix4x4.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Matrix4x4.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
index 14fb97dd4d..2cb4690217 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
@@ -42,7 +42,7 @@ namespace ScriptCanvas
                                     ->Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "DeprecatedNodeTitlePalette")
                                     ->Attribute(AZ::Script::Attributes::Deprecated, true)
                                     ->Attribute(AZ::Edit::Attributes::Category, "Math/Number/Deprecated")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
index bd3a7f390e..e706002d1d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Number>("Number", "A numeric value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Number.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Number.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
index 2755d40fbd..1de4ee2bcb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<OBB>("OBB", "An oriented bounding box value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/OBB.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/OBB.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
index 72c24a11f4..a3fbc589ad 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Plane>("Plane", "A plane value according to the equation: Ax + By + Cz + D = 0")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Plane.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Plane.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
index 8e977dcbb2..cfa30b996a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Quaternion>("Quaternion", "imaginary(X, Y, Z), real W")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Quaternion.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Quaternion.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
index b744e5a309..37d31ce083 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
@@ -42,7 +42,7 @@ namespace ScriptCanvas
                                     ->Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "DeprecatedNodeTitlePalette")
                                     ->Attribute(AZ::Script::Attributes::Deprecated, true)
                                     ->Attribute(AZ::Edit::Attributes::Category, "Math/Number/Deprecated")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
index 5ebfe5536f..cf469153ec 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
@@ -44,7 +44,7 @@ namespace ScriptCanvas
                                     ->Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "DeprecatedNodeTitlePalette")
                                     ->Attribute(AZ::Script::Attributes::Deprecated, true)
                                     ->Attribute(AZ::Edit::Attributes::Category, "Math/Number/Deprecated")
-                                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Add.png")
+                                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Add.png")
                                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                                 ;
                         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
index cdbda85846..3d27aa88dd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
@@ -39,7 +39,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Transform>("Transform", "A 3D transform value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Transform.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Transform.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
index 3b0682fc46..f527dae2ad 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
@@ -41,7 +41,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Vector2>("Vector2", "A 2D vector value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Vector.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Vector.png")
                                 ;
                         }
                     }
@@ -70,7 +70,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Vector3>("Vector3", "A 3D vector value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Vector.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Vector.png")
                                 ;
                         }
                     }
@@ -99,7 +99,7 @@ namespace ScriptCanvas
                         {
                             editContext->Class<Vector4>("Vector4", "A 4D vector value")
                                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Vector.png")
+                                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Vector.png")
                                 ;
                         }
                     }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
index 6b4d93b4e8..4cc1ddfab0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
@@ -33,7 +33,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<Operators>("Operators", "")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/Operators.png")->
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/Operators.png")->
                         Attribute(AZ::Edit::Attributes::CategoryStyle, ".operators")->
                         Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "OperatorsNodeTitlePalette")
                         ;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp
index 03a2564b5e..4eb7f15f85 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp
@@ -34,7 +34,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<String>("String", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/String.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/String.png")
                         ->Attribute(AZ::Edit::Attributes::CategoryStyle, ".string")
                         ->Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "StringNodeTitlePalette")
                         ;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml
index 0c813e05dc..0a6f032982 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml
@@ -5,7 +5,7 @@
            QualifiedName="ScriptCanvas::Nodeables::Time::DurationNodeable"
            PreferredClassName="Duration"
            Base="ScriptCanvas::Nodeable"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Nodeables"
            GeneratePropertyFriend="True"
            Namespace="ScriptCanvas"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml
index 4e51642483..16d0fb7f1a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml
@@ -5,7 +5,7 @@
            QualifiedName="Nodeables::Time::HeartBeatNodeable"
            PreferredClassName="HeartBeat"
            Base="Nodeables::Time::BaseTimer"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Timing"
            GeneratePropertyFriend="True"
            Namespace="ScriptCanvas"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
index 393c1afa4b..145f07a0eb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
@@ -36,7 +36,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<Time>("Timing", "Time related operations.")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/Math.png")->
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/Math.png")->
                         Attribute(AZ::Edit::Attributes::CategoryStyle, ".time")->
                         Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "TimeNodeTitlePalette")
                         ;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml
index 41cefb8f63..88ef302372 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml
@@ -5,7 +5,7 @@
            QualifiedName="Nodeables::Time::TimeDelayNodeable"
            PreferredClassName="Time Delay"
            Base="Nodeables::Time::BaseTimer"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Nodeables"
            GeneratePropertyFriend="True"
            Namespace="ScriptCanvas"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml
index 00f0227b89..c51517f988 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml
@@ -5,7 +5,7 @@
            QualifiedName="Nodeables::Time::TimerNodeable"
            PreferredClassName="Timer"
            Base="ScriptCanvas::Nodeable"
-           Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+           Icon="Icons/ScriptCanvas/Placeholder.png"
            Category="Timing"
            GeneratePropertyFriend="True"
            Namespace="ScriptCanvas"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml
index c71fe1f045..86ac29804e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Add Failure"
            Uuid="{1C4971A7-DE76-4E8E-9381-F579A57B2A78}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/AddFailure.png"
+           Icon="Icons/ScriptCanvas/AddFailure.png"
            Version="0"
            GeneratePropertyFriend="True"
            Description="adds a failure directly to the unit testing framework"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml
index f860f22b8a..a87a267166 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Add Success"
            Uuid="{0D5B9544-C36B-490F-899A-E260D8351620}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/AddSuccess.png"
+           Icon="Icons/ScriptCanvas/AddSuccess.png"
            Version="0"
            GeneratePropertyFriend="True"
            DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml
index 1a7f38e5bc..bc0e5712f4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Checkpoint"
            Uuid="{E65449D2-45A9-402B-ADF7-4E4F27A99245}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Checkpoint.png"
+           Icon="Icons/ScriptCanvas/Checkpoint.png"
            Version="0"
            GeneratePropertyFriend="True"
            DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml
index c416b6666a..011ba782a9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect Equal"
            Uuid="{856DB72A-48CB-4142-A032-1253D3AB8BEC}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectEqual.png"
+           Icon="Icons/ScriptCanvas/ExpectEqual.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml
index 682533f548..9ada5237f2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect False"
            Uuid="{3838E12C-CEAB-4CED-9958-B6C0399FCD92}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectFalse.png"
+           Icon="Icons/ScriptCanvas/ExpectFalse.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectBooleanVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml
index dec211eb9f..eb9f4299d1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect Greater Than"
            Uuid="{8DD464A5-C09D-4017-82B7-B1EA672BA9EA}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectGreaterThan.png"
+           Icon="Icons/ScriptCanvas/ExpectGreaterThan.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml
index 64ae8e2906..7fcf4c2a51 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect Greater Than Equal"
            Uuid="{8EB4E313-1479-4428-AE0C-75F233C5F5EB}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectGreaterThanEqual.png"
+           Icon="Icons/ScriptCanvas/ExpectGreaterThanEqual.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml
index 70ab6d97fd..af2fcd98ce 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect Less Than"
            Uuid="{693FD406-8735-4DBB-B0A8-39E7DA467559}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectLessThan.png"
+           Icon="Icons/ScriptCanvas/ExpectLessThan.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml
index 7272ac145d..1fb7b1e46d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect Less Than Equal"
            Uuid="{52D4803F-6273-4A4E-96CC-F2892CFE433B}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectLessThanEqual.png"
+           Icon="Icons/ScriptCanvas/ExpectLessThanEqual.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml
index 5c45133976..821e7b4695 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect Not Equal"
            Uuid="{66334794-0F98-4BFC-9DB0-8AB6A4052D09}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectNotEqual.png"
+           Icon="Icons/ScriptCanvas/ExpectNotEqual.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectComparisonVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml
index 972d600923..64efcd6bfa 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Expect True"
            Uuid="{88F9BE2D-F591-45AD-9682-FBB67C39C504}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/ExpectTrue.png"
+           Icon="Icons/ScriptCanvas/ExpectTrue.png"
            Version="1"
            VersionConverter="ScriptCanvas::UnitTesting::ExpectBooleanVersioner"
            GeneratePropertyFriend="True"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml
index b0510a0f94..a2e904d8d3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Mark Complete"
            Uuid="{DC0BCFE9-3066-4232-AA68-AAFB206C917F}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/MarkComplete.png"
+           Icon="Icons/ScriptCanvas/MarkComplete.png"
            Version="0"
            GeneratePropertyFriend="True"
            DeprecationUUID="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp
index 9cac7bd021..7425efc5b1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp
@@ -376,7 +376,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<EventSender>("Unit Testing", "")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                            Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/UnitTesting.png")->
+                            Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/UnitTesting.png")->
                             Attribute(AZ::Edit::Attributes::CategoryStyle, ".method")->
                             Attribute(AZ::Edit::Attributes::Category, "Utilities/Unit Testing")->
                             Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "TestingNodeTitlePalette")
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp
index 4e243f4500..489f111ab2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp
@@ -37,7 +37,7 @@ namespace ScriptCanvas
                 {
                     editContext->Class<UnitTesting>("Unit Testing", "")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Libraries/UnitTesting.png")->
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Libraries/UnitTesting.png")->
                         Attribute(AZ::Edit::Attributes::CategoryStyle, ".method")->
                         Attribute(AZ::Edit::Attributes::Category, "Utilities/Unit Testing")->
                         Attribute(ScriptCanvas::Attributes::Node::TitlePaletteOverride, "TestingNodeTitlePalette")
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
index ee55fff259..128ef95b63 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
@@ -582,7 +582,7 @@ namespace ScriptCanvas
 
         void GraphToLua::TranslateExecutionTreeFunctionCall(Grammar::ExecutionTreeConstPtr execution)
         {
-            TranslateNodeableOuts(execution);
+            TranslateNodeableOuts(execution->GetNodeable(), execution);
             WriteDebugInfoIn(execution, "TranslateExecutionTreeFunctionCall begin");
             m_dotLua.WriteIndent();
             WriteLocalOutputInitialization(execution);
@@ -955,7 +955,7 @@ namespace ScriptCanvas
                 for (auto& out : nodeAndParse->m_latents)
                 {
                     m_dotLua.WriteNewLine();
-                    TranslateNodeableOut(out.second);
+                    TranslateNodeableOut(nodeAndParse->m_nodeable, out.second);
                 }
 
                 if (!nodeAndParse->m_latents.empty())
@@ -1017,7 +1017,7 @@ namespace ScriptCanvas
             m_dotLua.WriteNewLine();
         }
 
-        void GraphToLua::TranslateNodeableOut(Grammar::ExecutionTreeConstPtr execution)
+        void GraphToLua::TranslateNodeableOut(Grammar::VariableConstPtr host, Grammar::ExecutionTreeConstPtr execution)
         {
             auto outCallIndexOptional = execution->GetOutCallIndex();
             if (!outCallIndexOptional)
@@ -1037,7 +1037,7 @@ namespace ScriptCanvas
 
             m_dotLua.WriteLineIndented("%s(self.%s, %zu, -- %s"
                 , setExecutionOutName
-                , execution->GetNodeable()->m_name.data()
+                , host->m_name.data()
                 , outIndex
                 , execution->GetName().data());
 
@@ -1048,14 +1048,14 @@ namespace ScriptCanvas
             m_dotLua.Outdent();
         }
 
-        void GraphToLua::TranslateNodeableOuts(Grammar::ExecutionTreeConstPtr execution)
+        void GraphToLua::TranslateNodeableOuts(Grammar::VariableConstPtr host, Grammar::ExecutionTreeConstPtr execution)
         {
             const auto outs = execution->GetInternalOuts();
             
             for (const auto& out : outs)
             {
                 m_dotLua.WriteNewLine();
-                TranslateNodeableOut(out);
+                TranslateNodeableOut(host, out);
             }
 
             if (!outs.empty())
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
index ab80627944..3d4379d98d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
@@ -111,8 +111,8 @@ namespace ScriptCanvas
             void TranslateFunctionBlock(Grammar::ExecutionTreeConstPtr execution, FunctionBlockConfig functionBlockConfig, IsNamed lex);
             void TranslateFunctionDefinition(Grammar::ExecutionTreeConstPtr execution, IsNamed lex);
             void TranslateInheritance();
-            void TranslateNodeableOut(Grammar::ExecutionTreeConstPtr execution);
-            void TranslateNodeableOuts(Grammar::ExecutionTreeConstPtr execution);
+            void TranslateNodeableOut(Grammar::VariableConstPtr host, Grammar::ExecutionTreeConstPtr execution);
+            void TranslateNodeableOuts(Grammar::VariableConstPtr host, Grammar::ExecutionTreeConstPtr execution);
             void TranslateNodeableParse();
             void TranslateStaticInitialization();
             void TranslateVariableInitialization(AZStd::string_view leftValue);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp
index e0dd016140..8063a35896 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp
@@ -26,6 +26,39 @@
 
 #include "GraphToLua.h"
 
+namespace GraphToLuaUtilityCpp
+{
+    AZStd::string EqualSigns(size_t numEqualSignsRequired)
+    {
+        AZStd::string equalSigns = "";
+        while (numEqualSignsRequired--)
+        {
+            equalSigns += "=";
+        }
+
+        return equalSigns;
+    }
+
+    AZStd::string MakeLongBracketString(const AZStd::string& formattedString)
+    {
+        size_t numEqualSignsRequired = 0;
+
+        for (;;)
+        {
+            auto candidate = AZStd::string::format("]%s]", EqualSigns(numEqualSignsRequired).c_str());
+
+            if (formattedString.find(candidate) == AZStd::string::npos)
+            {
+                break;
+            }
+
+            ++numEqualSignsRequired;
+        }
+
+        return EqualSigns(numEqualSignsRequired);
+    }
+}
+
 namespace ScriptCanvas
 {
     namespace Translation
@@ -352,7 +385,11 @@ namespace ScriptCanvas
             }
 
             case Data::eType::String:
-                return AZStd::string::format("\"%s\"", datum.GetAs<Data::StringType>()->data());
+            {
+                const AZStd::string& formattedString = *datum.GetAs<Data::StringType>();
+                const AZStd::string bracketString = GraphToLuaUtilityCpp::MakeLongBracketString(formattedString);
+                return AZStd::string::format("[%s[%s]%s]", bracketString.c_str(), formattedString.c_str(), bracketString.c_str());
+            }
 
             case Data::eType::EntityID:
                 return EntityIdValueToString(*datum.GetAs<Data::EntityIDType>(), config);
diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp
index 4b5d247834..37a53a6c80 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp
@@ -34,7 +34,7 @@ namespace ScriptCanvasDeveloper
                 {
                     editContext->Class<Developer>("Developer", "Library of Developer only nodes")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/ScriptCanvas.png")
+                        Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/ScriptCanvas.png")
                         ;
                 }
             }
diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp
index 751c17a34a..0d559c3cf9 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp
@@ -47,7 +47,7 @@ namespace ScriptCanvasDeveloper
     //////////////////
 
     TestListModel::TestListModel()
-        : m_runningIcon("Editor/Icons/AssetBrowser/in_progress.gif")
+        : m_runningIcon("Icons/AssetBrowser/in_progress.gif")
         , m_passedIcon(":/ScriptCanvasEditorResources/Resources/valid_icon.png")
         , m_failedIcon(":/ScriptCanvasEditorResources/Resources/error_icon.png")
     {
diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp
index a7d672ffe6..e1f2ee84e2 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp
@@ -16,6 +16,7 @@
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/string/conversions.h>
+#include <AzCore/Utils/Utils.h>
 
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
 #include <ScriptCanvas/Bus/ScriptCanvasBus.h>
@@ -60,21 +61,22 @@ namespace ScriptCanvasDeveloperEditor
 
         void GenerateTSFile()
         {
-            AZStd::string tsFileName("@devroot@/editor/translation/scriptcanvas_en_us.ts");
+            auto translationScriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) /
+                "Assets" / "Editor" / "Translation" / "scriptcanvas_en_us.ts";
 
-            XMLDocPtr tsDoc(XMLDoc::LoadFromDisk(tsFileName));
+            XMLDocPtr tsDoc(XMLDoc::LoadFromDisk(translationScriptPath.c_str()));
 
             if (tsDoc == nullptr)
             {
                 tsDoc = XMLDoc::Alloc("ScriptCanvas");
             }
-            
+
             DumpBehaviorContextMethods(tsDoc);
             DumpBehaviorContextEbuses(tsDoc);
 
-            tsDoc->WriteToDisk(tsFileName);
+            tsDoc->WriteToDisk(translationScriptPath.c_str());
         }
-        
+
         void DumpBehaviorContextMethods(const XMLDocPtr& doc)
         {
             AZ::SerializeContext* serializeContext{};
@@ -141,7 +143,7 @@ namespace ScriptCanvasDeveloperEditor
                     {
                         nodeCategoryName = attribute->Get(nullptr);
                     }
-                    
+
                     AddMessageNode(doc, classIter.first, methodPair.first, toolTip, nodeCategoryName, methodPair.second);
                 }
             }
@@ -159,7 +161,7 @@ namespace ScriptCanvasDeveloperEditor
             {
                 return;
             }
-            
+
             // We will skip buses that are ONLY registered on classes that derive from EditorComponentBase,
             // because they don't have a runtime implementation. Buses such as the TransformComponent which
             // is implemented by both an EditorComponentBase derived class and a Component derived class
@@ -259,7 +261,7 @@ namespace ScriptCanvasDeveloperEditor
                         StartContext(doc, "EBus", ebusIter.first, ebusIter.second->m_toolTip, categoryName);
                         addContext = true;
                     }
-                    
+
                     AZStd::string toolTip;
                     if (auto toolTipAttribute = azrtti_cast<AZ::AttributeData<const char*>*>(AZ::FindAttribute(AZ::Script::Attributes::ToolTip, eventIter.second.m_attributes)))
                     {
@@ -276,7 +278,7 @@ namespace ScriptCanvasDeveloperEditor
                 }
             }
         }
-        
+
         void DumpBehaviorContextEBusHandlers(const XMLDocPtr& doc, AZ::BehaviorEBus* ebus, const AZStd::string& categoryName)
         {
             if (!ebus)
@@ -400,10 +402,10 @@ namespace ScriptCanvasDeveloperEditor
                     const AZStd::string name = event.m_metadataParameters[AZ::eBehaviorBusForwarderEventIndices::Result].m_name.empty() ? event.m_parameters[AZ::eBehaviorBusForwarderEventIndices::Result].m_name : event.m_parameters[AZ::eBehaviorBusForwarderEventIndices::Result].m_name;
 
                     AddParameterElements(doc, baseID, 0, event.m_parameters[AZ::eBehaviorBusForwarderEventIndices::Result].m_typeId, name, event.m_metadataParameters[AZ::eBehaviorBusForwarderEventIndices::Result].m_toolTip, "");
-                
+
                     AZ_TracePrintf("ScriptCanvas", "EBusHandler Index: 0 CategoryName: %s Ebus: %s Event: %s Name: %s", categoryName.c_str(), classorbusName.c_str(), eventormethodName.c_str(), name.c_str());
                 }
-          
+
                 size_t outputIndex = 0;
                 for (size_t i = AZ::eBehaviorBusForwarderEventIndices::ParameterFirst; i < event.m_parameters.size(); ++i)
                 {
@@ -427,7 +429,7 @@ namespace ScriptCanvasDeveloperEditor
                 {
                     AddResultElements(doc, baseID, result->m_typeId, result->m_name, "");
                 }
-            
+
                 size_t start = method->HasBusId() ? 1 : 0;
                 for (size_t i = start; i < method->GetNumArguments(); ++i)
                 {
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/CMakeLists.txt b/Gems/ScriptCanvasDiagnosticLibrary/CMakeLists.txt
deleted file mode 100644
index 20a680bce9..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-add_subdirectory(Code)
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/CMakeLists.txt b/Gems/ScriptCanvasDiagnosticLibrary/Code/CMakeLists.txt
deleted file mode 100644
index 4593768464..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_target(
-    NAME ScriptCanvasDiagnosticLibrary.Static STATIC
-    NAMESPACE Gem
-    FILES_CMAKE
-        scriptcanvasdiagnosticlibrary_common_files.cmake
-        scriptcanvasdiagnosticlibrary_autogen_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Source
-            .
-        PUBLIC
-            Include
-    BUILD_DEPENDENCIES
-        PUBLIC
-            AZ::AzCore
-            Gem::ScriptCanvas
-            Legacy::CryCommon
-    AUTOGEN_RULES
-        *.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Header.jinja,$path/$fileprefix.generated.h
-        *.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp
-        *.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h
-        *.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp
-)
-
-ly_add_target(
-    NAME ScriptCanvasDiagnosticLibrary ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
-    NAMESPACE Gem
-    FILES_CMAKE
-        scriptcanvasdiagnosticlibrary_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Source
-        PUBLIC
-            Include
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Gem::ScriptCanvasDiagnosticLibrary.Static
-)
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Include/ScriptCanvasDiagnosticLibrary/DebugDrawBus.h b/Gems/ScriptCanvasDiagnosticLibrary/Code/Include/ScriptCanvasDiagnosticLibrary/DebugDrawBus.h
deleted file mode 100644
index d32e0ea1d5..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Include/ScriptCanvasDiagnosticLibrary/DebugDrawBus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Component/EntityId.h>
-
-struct IRenderer;
-
-namespace ScriptCanvasDiagnostics
-{
-    class DebugDrawRequests : public AZ::EBusTraits
-    {
-    public:
-
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        using BusIdType = void*;
-
-        virtual void OnDebugDraw(IRenderer*) = 0;
-    };
-
-    using DebugDrawBus = AZ::EBus<DebugDrawRequests>;
-
-    class SystemRequests : public AZ::EBusTraits
-    {
-    public:
-
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-        virtual bool IsEditor() = 0;
-    };
-
-    using SystemRequestBus = AZ::EBus<SystemRequests>;
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Include/ScriptCanvasDiagnosticLibrary/ScriptCanvasDiagnosticLibraryGem.h b/Gems/ScriptCanvasDiagnosticLibrary/Code/Include/ScriptCanvasDiagnosticLibrary/ScriptCanvasDiagnosticLibraryGem.h
deleted file mode 100644
index f86446228e..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Include/ScriptCanvasDiagnosticLibrary/ScriptCanvasDiagnosticLibraryGem.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Module/Module.h>
-#include <AzCore/Module/Environment.h>
-
-namespace ScriptCanvasDiagnostics
-{
-    class Module
-        : public AZ::Module
-    {
-    public:
-        AZ_RTTI(Module, "{4855DE9C-9804-4CE5-BA32-B0123356F48E}", AZ::Module);
-
-        Module();
-
-        AZ::ComponentTypeList GetRequiredSystemComponents() const override;
-    };
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/Debug.h b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/Debug.h
deleted file mode 100644
index 75ba9ebcca..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/Debug.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <ScriptCanvas/Libraries/Libraries.h>
-
-namespace ScriptCanvas
-{
-    namespace Libraries
-    {
-        struct Debug : public Library::LibraryDefinition
-        {
-            AZ_RTTI(Debug, "{3E28E41D-F4C9-4542-A08F-2B1F5DAA9509}", Library::LibraryDefinition);
-
-            static void Reflect(AZ::ReflectContext*);
-            static void InitNodeRegistry(NodeRegistry& nodeRegistry);
-            static AZStd::vector<AZ::ComponentDescriptor*> GetComponentDescriptors();
-        };
-    }
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DebugLibraryDefinition.cpp b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DebugLibraryDefinition.cpp
deleted file mode 100644
index 26eac9cbf8..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DebugLibraryDefinition.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
-#include "DebugLibraryDefinition.h"
-#include "DrawText.h"
-#include "DrawTextNodeable.h"
-#include <ScriptCanvas/Libraries/Libraries.h>
-
-namespace ScriptCanvas
-{
-    namespace Libraries
-    {
-        void Debug::Reflect(AZ::ReflectContext* reflection)
-        {
-            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection);
-            if (serializeContext)
-            {
-                serializeContext->Class<Debug, Library::LibraryDefinition>()
-                    ->Version(1)
-                    ;
-
-                AZ::EditContext* editContext = serializeContext->GetEditContext();
-                if (editContext)
-                {
-                    editContext->Class<Debug>("Debug", "")->
-                        ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                        Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Debug.png")
-                        ;
-                }
-            }
-        }
-
-        void Debug::InitNodeRegistry(NodeRegistry& nodeRegistry)
-        {
-            Library::AddNodeToRegistry<Debug, Nodes::Debug::DrawTextNode>(nodeRegistry);
-            //Library::AddNodeToRegistry<Debug, Nodes::DrawTextNodeableNode>(nodeRegistry);
-        }
-
-        AZStd::vector<AZ::ComponentDescriptor*> Debug::GetComponentDescriptors()
-        {
-            return AZStd::vector<AZ::ComponentDescriptor*>({
-                Nodes::Debug::DrawTextNode::CreateDescriptor(),
-               // Nodes::DrawTextNodeableNode::CreateDescriptor(),
-            });
-        }
-    }
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DebugLibraryDefinition.h b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DebugLibraryDefinition.h
deleted file mode 100644
index 75ba9ebcca..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DebugLibraryDefinition.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <ScriptCanvas/Libraries/Libraries.h>
-
-namespace ScriptCanvas
-{
-    namespace Libraries
-    {
-        struct Debug : public Library::LibraryDefinition
-        {
-            AZ_RTTI(Debug, "{3E28E41D-F4C9-4542-A08F-2B1F5DAA9509}", Library::LibraryDefinition);
-
-            static void Reflect(AZ::ReflectContext*);
-            static void InitNodeRegistry(NodeRegistry& nodeRegistry);
-            static AZStd::vector<AZ::ComponentDescriptor*> GetComponentDescriptors();
-        };
-    }
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.ScriptCanvasGrammar.xml b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.ScriptCanvasGrammar.xml
deleted file mode 100644
index dd21d22ca7..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.ScriptCanvasGrammar.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScriptCanvas Include="Source/DrawText.h" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Class Name="DrawTextNode"
-	       QualifiedName="ScriptCanvas::Nodes::Debug::DrawTextNode"
-	       PreferredClassName="Draw Text"
-           Uuid="{AA209CEC-3813-4DC2-85A9-DE8B7A905CD6}"
-           Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/DrawText.png"
-		   Category="Utilities/Debug"
-		   Version="1"
-           Deprecated="True"
-           GeneratePropertyFriend="True"
-           Description="Displays text on the viewport.">
-        <In Name="Show" Description="Shows the debug text on the viewport"/>
-        <In Name="Hide" Description="Removed the debug text from the viewport"/>
-        <Out Name="Out" Description=""/>
-        <Property Name="Text"
-                  Description="The text to display on screen."
-                  Type="AZStd::string"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Position"
-                  Description="Position of the text on-screen in normalized coordinates [0-1]."
-                  Type="AZ::Vector2"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Color"
-                  Description="Color of the text."
-                  Type="AZ::Color"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Duration"
-                  Description="If greater than zero, the text will disappear after this duration (in seconds)."
-                  Type="float"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Scale"
-                  Description="Scales the font size of the text."
-                  Type="float"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Centered"
-                  Description="Centers the text around the specfied coordinates."
-                  Type="bool"
-                  IsInput="True"
-                  IsOutput="False" />
-        <Property Name="Editor Only"
-                  Description="Only displays this text if the game is being run in-editor, not on launchers."
-                  Type="bool"
-                  IsInput="True"
-                  IsOutput="False" />
-    </Class>
-</ScriptCanvas>
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.cpp b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.cpp
deleted file mode 100644
index 6e04ad5850..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
-#include "DrawText.h"
-
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <ScriptCanvas/Core/GraphBus.h>
-
-#include <CryCommon/platform.h>
-#include <CryCommon/Cry_Math.h>
-#include <CryCommon/Cry_Color.h>
-
-#include <CryCommon/IRenderer.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Debug
-        {
-            void DrawTextNode::OnInputSignal(const SlotId& slotId)
-            {
-                if (slotId == GetSlotId("Show"))
-                {
-                    ScriptCanvasDiagnostics::DebugDrawBus::Handler::BusConnect(this);
-
-                    m_duration = DrawTextNodeProperty::GetDuration(this);
-                    if (m_duration > 0.f && !AZ::TickBus::Handler::BusIsConnected())
-                    {
-                        AZ::TickBus::Handler::BusConnect();
-                    }
-                }
-                else if (slotId == GetSlotId("Hide"))
-                {
-                    AZ::TickBus::Handler::BusDisconnect();
-                    ScriptCanvasDiagnostics::DebugDrawBus::Handler::BusDisconnect();
-                }
-
-                SignalOutput(GetSlotId("Out"));
-
-            }
-
-            void DrawTextNode::OnInputChanged(const Datum&, const SlotId& slotId)
-            {
-                ScriptCanvas::SlotId textSlotId = DrawTextNodeProperty::GetTextSlotId(this);
-                if (slotId == textSlotId)
-                {
-                    m_text = DrawTextNodeProperty::GetText(this);
-                }
-            }
-
-            void DrawTextNode::OnTick(float deltaTime, AZ::ScriptTimePoint)
-            {
-                m_duration -= deltaTime;
-                if (m_duration <= 0.f)
-                {
-                    ScriptCanvasDiagnostics::DebugDrawBus::Handler::BusDisconnect();
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-            }
-
-            void DrawTextNode::OnDebugDraw(IRenderer* renderer)
-            {
-                if (!renderer)
-                {
-                    return;
-                }
-
-                if (m_text.empty())
-                {
-                    m_text = DrawTextNodeProperty::GetText(this);
-                }
-
-                if (m_text.empty())
-                {
-                    return;
-                }
-
-                bool editorOnly = DrawTextNodeProperty::GetEditorOnly(this);
-
-                bool isEditor = false;
-                ScriptCanvasDiagnostics::SystemRequestBus::BroadcastResult(isEditor, &ScriptCanvasDiagnostics::SystemRequests::IsEditor);
-
-                if (editorOnly && !isEditor)
-                {
-                    return;
-                }
-
-                AZ::Vector2 position = DrawTextNodeProperty::GetPosition(this);
-
-                // Get correct coordinates
-                float x = position.GetX();
-                float y = position.GetY();
-
-                if (x < 1.f || y < 1.f)
-                {
-                    int screenX, screenY, screenWidth, screenHeight;
-                    renderer->GetViewport(&screenX, &screenY, &screenWidth, &screenHeight);
-                    if (x < 1.f)
-                    {
-                        x *= (float)screenWidth;
-                    }
-                    if (y < 1.f)
-                    {
-                        y *= (float)screenHeight;
-                    }
-                }
-
-                SDrawTextInfo ti;
-                ti.xscale = ti.yscale = DrawTextNodeProperty::GetScale(this);
-                ti.flags = eDrawText_2D | eDrawText_FixedSize;
-
-                const AZ::Color& color = DrawTextNodeProperty::GetColor(this);
-                ti.color[0] = color.GetR();
-                ti.color[1] = color.GetG();
-                ti.color[2] = color.GetB();
-                ti.color[3] = color.GetA();
-
-                ti.flags |= DrawTextNodeProperty::GetCentered(this) ? eDrawText_Center | eDrawText_CenterV : 0;
-
-                renderer->DrawTextQueued(Vec3(x, y, 0.5f), ti, m_text.c_str());
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.h b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.h
deleted file mode 100644
index 43684bef5b..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawText.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/TickBus.h>
-
-#include <ScriptCanvas/Core/Node.h>
-
-#include <Source/DrawText.generated.h>
-
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Color.h>
-
-#include <ScriptCanvasDiagnosticLibrary/DebugDrawBus.h>
-
-struct IRenderer;
-
-namespace AZ
-{
-    class Color;
-    class Vector2;
-}
-
-namespace ScriptCanvas
-{
-    namespace Nodes
-    {
-        namespace Debug
-        {
-            //! Uses the DebugDrawBus to display on-screen debug text
-            class DrawTextNode
-                : public Node
-                , ScriptCanvasDiagnostics::DebugDrawBus::Handler
-                , AZ::TickBus::Handler
-            {
-
-            public:
-
-                SCRIPTCANVAS_NODE(DrawTextNode);
-
-                // DebugDrawBus...
-                void OnDebugDraw(IRenderer*) override;
-                //
-
-            protected:
-
-                void OnInputSignal(const SlotId& slotId) override;
-                void OnInputChanged(const Datum& input, const SlotId& slotID) override;
-
-                void OnTick(float deltaTime, AZ::ScriptTimePoint) override;
-
-            private:
-
-                AZStd::string m_text;
-                float m_duration;
-
-            };
-        }
-    }
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawTextNodeable.cpp b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawTextNodeable.cpp
deleted file mode 100644
index 17a5f3ea79..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawTextNodeable.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
-#include "DrawTextNodeable.h"
-
-#if 0
-
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <ScriptCanvas/Core/GraphBus.h>
-#include <ScriptCanvas/Utils/SerializationUtils.h>
-
-#include <CryCommon/platform.h>
-#include <CryCommon/Cry_Math.h>
-#include <CryCommon/Cry_Color.h>
-
-#include <CryCommon/IRenderer.h>
-
-namespace ScriptCanvas
-{
-    namespace Nodeables
-    {
-        namespace Debug
-        {
-            DrawTextNodeable::DrawTextNodeable()
-            {
-                ScriptCanvasDiagnostics::SystemRequestBus::BroadcastResult(m_isEditor, &ScriptCanvasDiagnostics::SystemRequests::IsEditor);
-            }
-
-            DrawTextNodeable::~DrawTextNodeable()
-            {
-                Hide();
-            }
-
-            void DrawTextNodeable::OnDeactivate()
-            {
-                Hide();
-            }
-
-            void DrawTextNodeable::Show(AZStd::string text, AZ::Vector2 position, AZ::Color color, float duration, float scale, Data::BooleanType centered, Data::BooleanType editorOnly)
-            {
-                if (text.empty())
-                {
-                    return;
-                }
-
-                if (editorOnly && !m_isEditor)
-                {
-                    return;
-                }
-
-                ScriptCanvasDiagnostics::DebugDrawBus::Handler::BusConnect(this);
-
-                m_text = text;
-                m_position = position;
-                m_color = color;
-                m_duration = duration;
-                m_scale = scale;
-                m_centered = centered;
-                m_editorOnly = editorOnly;
-
-                if (m_duration > 0.f && !AZ::TickBus::Handler::BusIsConnected())
-                {
-                    AZ::TickBus::Handler::BusConnect();
-                }
-            }
-
-            void DrawTextNodeable::Hide()
-            {
-                AZ::TickBus::Handler::BusDisconnect();
-                ScriptCanvasDiagnostics::DebugDrawBus::Handler::BusDisconnect();
-            }
-
-            void DrawTextNodeable::OnTick(float deltaTime, AZ::ScriptTimePoint)
-            {
-                m_duration -= deltaTime;
-                if (m_duration <= 0.f)
-                {
-                    ScriptCanvasDiagnostics::DebugDrawBus::Handler::BusDisconnect();
-                    AZ::TickBus::Handler::BusDisconnect();
-                }
-            }
-
-            void DrawTextNodeable::OnDebugDraw(IRenderer* renderer)
-            {
-                if (!renderer)
-                {
-                    return;
-                }
-
-                // Get correct coordinates
-                float x = m_position.GetX();
-                float y = m_position.GetY();
-
-                if (x < 1.f || y < 1.f)
-                {
-                    int screenX, screenY, screenWidth, screenHeight;
-                    renderer->GetViewport(&screenX, &screenY, &screenWidth, &screenHeight);
-                    if (x < 1.f)
-                    {
-                        x *= (float)screenWidth;
-                    }
-                    if (y < 1.f)
-                    {
-                        y *= (float)screenHeight;
-                    }
-                }
-
-                SDrawTextInfo ti;
-                ti.xscale = ti.yscale = m_scale;
-                ti.flags = eDrawText_2D | eDrawText_FixedSize;
-
-                ti.color[0] = m_color.GetR();
-                ti.color[1] = m_color.GetG();
-                ti.color[2] = m_color.GetB();
-                ti.color[3] = m_color.GetA();
-
-                ti.flags |= m_centered ? eDrawText_Center | eDrawText_CenterV : 0;
-
-                renderer->DrawTextQueued(Vec3(x, y, 0.5f), ti, m_text.c_str());
-            }
-        }
-    }
-}
-
-#include <Source/DrawTextNodeable.generated.cpp>
-
-
-#endif
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawTextNodeable.h b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawTextNodeable.h
deleted file mode 100644
index 48d9e8f74b..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/DrawTextNodeable.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/TickBus.h>
-
-#include <ScriptCanvas/Core/Nodeable.h>
-#include <ScriptCanvas/Core/NodeableNode.h>
-#include <ScriptCanvas/CodeGen/NodeableCodegen.h>
-
-#include <ScriptCanvasDiagnosticLibrary/DebugDrawBus.h>
-#if 0
-#include <Source/DrawTextNodeable.generated.h>
-
-struct IRenderer;
-
-namespace AZ
-{
-    class Color;
-    class Vector2;
-}
-
-namespace ScriptCanvas
-{
-    namespace Nodeables
-    {
-        namespace Debug
-        {
-            class DrawTextNodeable
-                : public ScriptCanvas::Nodeable
-                , public ScriptCanvasDiagnostics::DebugDrawBus::Handler
-                , public AZ::TickBus::Handler
-            {
-                NodeDefinition(DrawTextNodeable, "Draw Text", "Displays text on the viewport.",
-                    NodeTags::Icon("Editor/Icons/ScriptCanvas/DrawTextNode.png"),
-                    NodeTags::Category("Utilities/Debug"),
-                    NodeTags::Version(0)
-                );
-
-            public:
-                DrawTextNodeable();
-                virtual ~DrawTextNodeable();
-
-                // TickBus
-                void OnTick(float deltaTime, AZ::ScriptTimePoint) override;
-
-                // DebugDrawBus
-                void OnDebugDraw(IRenderer*) override;
-
-                InputMethod("Show", "Shows the debug text on the viewport")
-                void Show(AZStd::string text, AZ::Vector2 position, AZ::Color color, float duration, float scale, Data::BooleanType centered, Data::BooleanType editorOnly);
-                DataInput(AZStd::string, "Text", "", "The text to display on screen.", SlotTags::DisplayGroup("Show"));
-                DataInput(AZ::Vector2, "Position", AZ::Vector2(20.f, 20.f), "Position of the text on-screen in normalized coordinates [0-1].", SlotTags::DisplayGroup("Show"));
-                DataInput(AZ::Color, "Color", AZ::Color(1.f, 1.f, 1.f, 1.f), "Color of the text.", SlotTags::DisplayGroup("Show"));
-                DataInput(float, "Duration", 0.f, "If greater than zero, the text will disappear after this duration (in seconds).", SlotTags::DisplayGroup("Show"));
-                DataInput(float, "Scale", 1.f, "Scales the font size of the text.", SlotTags::DisplayGroup("Show"));
-                DataInput(Data::BooleanType, "Centered", false, "Centers the text around the specfied coordinates.", SlotTags::DisplayGroup("Show"));
-                DataInput(Data::BooleanType, "Editor Only", false, "Only displays this text if the game is being run in-editor, not on launchers.", SlotTags::DisplayGroup("Show"));
-
-                InputMethod("Hide", "Removed the debug text from the viewport")
-                void Hide();
-
-            protected:
-                void OnDeactivate() override;
-
-            private:
-                AZStd::string m_text;
-                AZ::Vector2 m_position;
-                AZ::Color m_color;
-                float m_duration;
-                float m_scale;
-                bool m_centered;
-                bool m_editorOnly;
-
-                bool m_isEditor = false;
-
-            };
-        }
-    }
-}
-#endif 
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticLibraryGem.cpp b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticLibraryGem.cpp
deleted file mode 100644
index 6c13e99077..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticLibraryGem.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
-
-#include <ScriptCanvasDiagnosticLibrary/ScriptCanvasDiagnosticLibraryGem.h>
-#include <ScriptCanvasDiagnosticSystemComponent.h>
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include "DebugLibraryDefinition.h"
-
-namespace ScriptCanvasDiagnostics
-{
-    Module::Module()
-        : AZ::Module()
-    {
-        m_descriptors.insert(m_descriptors.end(), {
-            ScriptCanvasDiagnostics::SystemComponent::CreateDescriptor(),
-        });
-
-        AZStd::vector<AZ::ComponentDescriptor*> componentDescriptors(ScriptCanvas::Libraries::Debug::GetComponentDescriptors());
-        m_descriptors.insert(m_descriptors.end(), componentDescriptors.begin(), componentDescriptors.end());
-    }
-
-    AZ::ComponentTypeList Module::GetRequiredSystemComponents() const
-    {
-        return AZ::ComponentTypeList({ ScriptCanvasDiagnostics::SystemComponent::RTTI_Type() });
-    }
-}
-
-// DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
-// The first parameter should be GemName_GemIdLower
-// The second should be the fully qualified name of the class above
-AZ_DECLARE_MODULE_CLASS(Gem_ScriptCanvasDiagnosticLibrary, ScriptCanvasDiagnostics::Module)
-
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticSystemComponent.cpp b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticSystemComponent.cpp
deleted file mode 100644
index c1323e1450..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticSystemComponent.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
-
-#include "ScriptCanvasDiagnosticSystemComponent.h"
-
-#include <AzCore/Serialization/EditContext.h>
-#include <ScriptCanvasDiagnosticLibrary/DebugDrawBus.h>
-#include "DebugLibraryDefinition.h"
-
-namespace ScriptCanvasDiagnostics
-{
-    void SystemComponent::Init()
-    {
-        AZ::EnvironmentVariable<ScriptCanvas::NodeRegistry> nodeRegistryVariable = AZ::Environment::FindVariable<ScriptCanvas::NodeRegistry>(ScriptCanvas::s_nodeRegistryName);
-        if (nodeRegistryVariable)
-        {
-            ScriptCanvas::NodeRegistry& nodeRegistry = nodeRegistryVariable.Get();
-            ScriptCanvas::Libraries::Debug::InitNodeRegistry(nodeRegistry);
-        }
-    }
-
-    SystemComponent::~SystemComponent()
-    {
-    }
-
-    void SystemComponent::Activate()
-    {
-        SystemRequestBus::Handler::BusConnect();
-        CrySystemEventBus::Handler::BusConnect();
-    }
-
-    void SystemComponent::Deactivate()
-    {
-        CrySystemEventBus::Handler::BusDisconnect();
-        SystemRequestBus::Handler::BusDisconnect();
-    }
-
-    void SystemComponent::OnDebugDraw()
-    {
-        DebugDrawBus::Broadcast(&DebugDrawRequests::OnDebugDraw, m_system->GetIRenderer());
-    }
-
-    void SystemComponent::OnCrySystemShutdown([[maybe_unused]] ISystem& system)
-    {
-        m_system->GetIRenderer()->RemoveRenderDebugListener(this);
-    }
-
-    void SystemComponent::OnCrySystemInitialized(ISystem& system, [[maybe_unused]] const SSystemInitParams& systemInitParams)
-    {
-        m_system = &system;
-        AZ_Assert(m_system->GetIRenderer(), "ScriptCanvasDiagnostics requires IRenderer");
-
-        m_system->GetIRenderer()->AddRenderDebugListener(this);
-    }
-
-    bool SystemComponent::IsEditor()
-    {
-        return m_system && m_system->GetGlobalEnvironment() && m_system->GetGlobalEnvironment()->IsEditor();
-    }
-
-    void SystemComponent::Reflect(AZ::ReflectContext* context)
-    {
-        ScriptCanvas::Libraries::Debug::Reflect(context);
-        if (auto serialize = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serialize->Class<SystemComponent, AZ::Component>()
-                ->Version(0)
-                ;
-
-            if (AZ::EditContext* ec = serialize->GetEditContext())
-            {
-                ec->Class<SystemComponent>("Script Canvas Diagnostic", "Script Canvas Diagnostic System Component")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b))
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ;
-            }
-        }
-    }
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticSystemComponent.h b/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticSystemComponent.h
deleted file mode 100644
index 86b1f91978..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/Source/ScriptCanvasDiagnosticSystemComponent.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-
-#include <CryCommon/IRenderer.h>
-#include <CrySystemBus.h>
-
-#include <ScriptCanvasDiagnosticLibrary/DebugDrawBus.h>
-
-
-struct ISystem;
-
-namespace ScriptCanvasDiagnostics
-{
-    class SystemComponent
-        : public AZ::Component
-        , public IRenderDebugListener
-        , private CrySystemEventBus::Handler
-        , private SystemRequestBus::Handler
-    {
-    public:
-        AZ_COMPONENT(SystemComponent, "{6A90B0E7-EB47-48B5-910D-4881E429AC9D}");
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        SystemComponent() = default;
-        ~SystemComponent() override;
-        void Init() override;
-
-        void Activate() override;
-        void Deactivate() override;
-
-        // IRenderDebugListener
-        void OnDebugDraw() override;
-
-        // SystemRequestBus
-        bool IsEditor() override;
-
-    private:
-
-        ISystem * m_system;
-
-        // CrySystemEventBus
-        void OnCrySystemInitialized(ISystem& system, const SSystemInitParams& systemInitParams) override;
-        void OnCrySystemShutdown(ISystem& system) override;
-
-    };
-}
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_autogen_files.cmake b/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_autogen_files.cmake
deleted file mode 100644
index 90cda4aa60..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_autogen_files.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    ${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja
-    ${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja
-    ${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja
-    ${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
-    ${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja
-    ${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja
-)
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_common_files.cmake b/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_common_files.cmake
deleted file mode 100644
index af3d823a02..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_common_files.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Source/precompiled.cpp
-    Source/precompiled.h
-    Include/ScriptCanvasDiagnosticLibrary/ScriptCanvasDiagnosticLibraryGem.h
-    Include/ScriptCanvasDiagnosticLibrary/DebugDrawBus.h
-    Source/ScriptCanvasDiagnosticSystemComponent.h
-    Source/ScriptCanvasDiagnosticSystemComponent.cpp
-    Source/DebugLibraryDefinition.h
-    Source/DebugLibraryDefinition.cpp
-    Source/DrawText.h
-    Source/DrawText.cpp
-    Source/DrawText.ScriptCanvasGrammar.xml
-)
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_shared_files.cmake b/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_shared_files.cmake
deleted file mode 100644
index 9f251cd671..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/Code/scriptcanvasdiagnosticlibrary_shared_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Source/ScriptCanvasDiagnosticLibraryGem.cpp
-)
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/gem.json b/Gems/ScriptCanvasDiagnosticLibrary/gem.json
deleted file mode 100644
index bbcef8940f..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/gem.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "gem_name": "ScriptCanvasDiagnosticLibrary",
-    "GemFormatVersion": 3,
-    "Uuid": "d969b997bb7f4342ba0b3eedc378025d",
-    "Name": "ScriptCanvasDiagnosticLibrary",
-    "DisplayName": "Script Canvas Diagnostic Library",
-    "Version": "0.1.0",
-    "LinkType": "Dynamic",
-    "Summary": "The Script Canvas Diagnostic Library comes with a library of diagnostic nodes for use in Script Canvas such as logging, debug text, etc.",
-    "Tags": ["Scripting", "Game"],
-    "IconPath": "preview.png",
-    "Dependencies" : [
-            {
-              "Uuid": "869a0d0ec11a45c299917d45c81555e6",
-              "VersionConstraints": [ ">=0.1.0" ],
-              "_comment": "ScriptCanvasGem"
-            },
-            {
-            "Uuid" : "ff06785f7145416b9d46fde39098cb0c",
-            "VersionConstraints" : [">=0.1.0"],
-            "_comment" : "LmbrCentral"
-        }
-    ]
-}
-
diff --git a/Gems/ScriptCanvasDiagnosticLibrary/preview.png b/Gems/ScriptCanvasDiagnosticLibrary/preview.png
deleted file mode 100644
index 0e448c0d14..0000000000
--- a/Gems/ScriptCanvasDiagnosticLibrary/preview.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fdc5300d82075d21dd7085290e0ccd0926141f50598ec93a40171c84c10ae1f6
-size 2180
diff --git a/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_FunctionLocalStaticsUnique.scriptcanvas b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_FunctionLocalStaticsUnique.scriptcanvas
new file mode 100644
index 0000000000..25c990db9c
--- /dev/null
+++ b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_FunctionLocalStaticsUnique.scriptcanvas
@@ -0,0 +1,2771 @@
+<ObjectStream version="3">
+	<Class name="ScriptCanvasData" version="4" type="{1072E894-0C67-4091-8B64-F7DB324AD13C}">
+		<Class name="AZStd::unique_ptr" field="m_scriptCanvas" type="{8FFB6D85-994F-5262-BA1C-D0082A7F65C5}">
+			<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+				<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+					<Class name="AZ::u64" field="id" value="46953173856417" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+				</Class>
+				<Class name="AZStd::string" field="Name" value="AddOnePerFramePrintSize" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+					<Class name="Graph" field="element" version="8" type="{4D755CA9-AB92-462C-B24F-0B3376F19967}">
+						<Class name="Graph" field="BaseClass1" version="17" type="{C3267D77-EEDC-490E-9E42-F1D1F473E184}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="16435361764607139534" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="GraphData" field="m_graphData" version="4" type="{ADCB5EB5-8D3F-42ED-8F65-EAB58A82C381}">
+								<Class name="AZStd::unordered_set" field="m_nodes" type="{27BF7BD3-6E17-5619-9363-3FC3D9A5369D}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46957468823713" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Expect Equal)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="MethodOverloaded" field="element" version="6" type="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}">
+												<Class name="Method" field="BaseClass1" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="14420456748684200052" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{CDA18289-B870-4DA5-BE2A-D508B106AB61}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="EntityID: 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="left of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{574F10B2-0BAF-4F9F-83EA-57816DCA2591}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="right of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1ACFD288-6FEF-4635-B8F3-D1B87EF3F8F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="additional notes for the test report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{A558F5E1-7A8F-466E-A3ED-42EC7BA889B4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{3E4CCA4C-061E-4DB3-A484-6D1DC2C664A5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="EntityId" field="m_data" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+																		<Class name="AZ::u64" field="id" value="4276206253" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::string" field="methodName" value="Expect Equal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="className" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+													<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::string" field="prettyClassName" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::vector" field="orderedInputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{CDA18289-B870-4DA5-BE2A-D508B106AB61}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{574F10B2-0BAF-4F9F-83EA-57816DCA2591}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1ACFD288-6FEF-4635-B8F3-D1B87EF3F8F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::vector" field="outputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46961763791009" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Mark Complete)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Method" field="element" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="1598203463603374611" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{A35A442C-FC89-415E-AD8A-4D3F78E587A1}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="EntityID: 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{F80ABAEF-FD36-4A1F-909D-4135667B78C6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="additional notes for the test report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{D977AF2B-D564-4B4F-93AD-B7CF910E9057}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{7BBA0B6E-413F-46DC-988A-91398532AA0D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="EntityId" field="m_data" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+																	<Class name="AZ::u64" field="id" value="4276206253" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+													</Class>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="AZStd::string" field="methodName" value="Mark Complete" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												<Class name="AZStd::string" field="className" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+												<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::string" field="prettyClassName" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46966058758305" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="FunctionCallNode" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionCallNode" field="element" version="6" type="{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="16273960053331382228" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Add Element at End : In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2459315212" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2459315212" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2732307328" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="AZ::Uuid" field="m_sourceId" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												<Class name="Asset" field="m_asset" value="id={555C71C8-7415-57AD-8D2C-9B69AB0B8691}:dfe6dc72,type={E22967AC-7673-4778-9125-AF49D82CAF9F},hint={scriptcanvas/unittests/ly_sc_unittest_functionlocalstaticsuniquefunction.scriptcanvas_fn_compiled},loadBehavior=2" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
+												<Class name="Map" field="m_slotExecutionMap" version="1" type="{BAA81EAF-E35A-4F19-B73A-699B91DB113C}">
+													<Class name="AZStd::vector" field="ins" type="{733E7AAD-19AD-5FAE-A634-B3B6EB0D3ED3}">
+														<Class name="In" field="element" version="1" type="{4AAAEB0B-6367-46E5-B05D-E76EF884E16F}">
+															<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="AZStd::vector" field="_inputs" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+															<Class name="AZStd::vector" field="_outs" type="{5970B601-529F-5E37-99F2-942F34360771}">
+																<Class name="Out" field="element" version="1" type="{DD3D2547-868C-40DF-A37C-F60BE06FFFBA}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="AZStd::string" field="_name" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="_outputs" type="{275A1212-6B40-5045-BA6D-39FF976D6634}">
+																		<Class name="Output" field="element" type="{61EA2FF0-3112-40DF-BA45-CF4BE680DC52}">
+																			<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																				<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																			<Class name="VariableId" field="_interfaceSourceId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																				<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																	<Class name="Return" field="_returnValues" version="1" type="{8CD09346-BF99-4B34-91EA-C553549F7639}">
+																		<Class name="AZStd::vector" field="_values" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+																	</Class>
+																	<Class name="AZ::Uuid" field="_interfaceSourceId" value="{CC3EBD7B-203D-44CD-8B4F-ECAE6CC026D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="_parsedName" value="AddElementatEndIn_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZ::Uuid" field="_interfaceSourceId" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{5970B601-529F-5E37-99F2-942F34360771}"/>
+												</Class>
+												<Class name="SubgraphInterface" field="m_slotExecutionMapSourceInterface" version="7" type="{52B27A11-8294-4A6F-BFCF-6C1582649DB2}">
+													<Class name="bool" field="areAllChildrenPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="hasOnGraphStart" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="isActiveDefaultObject" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="AZStd::vector" field="ins" type="{16DA1AFC-705E-559D-8CF0-2E939187BB4B}">
+														<Class name="In" field="element" version="1" type="{DFDA32F7-41D2-45BB-8ADF-876679053836}">
+															<Class name="AZStd::string" field="displayName" value="Add Element at End : In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="parsedName" value="AddElementatEndIn_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::vector" field="inputs" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+															<Class name="AZStd::vector" field="outs" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}">
+																<Class name="Out" field="element" version="1" type="{6175D897-C06D-48B5-8775-388B232D429D}">
+																	<Class name="AZStd::string" field="displayName" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="NewOutput" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="outputs" type="{5457916A-40A0-5DF0-9742-1DEECFEE5C48}">
+																		<Class name="Output" field="element" type="{344D66C7-EE5E-45B1-809F-4108DDB65F20}">
+																			<Class name="AZStd::string" field="displayName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="parsedName" value="size_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="Type" field="type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																				<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																				<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																			<Class name="VariableId" field="sourceID" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																				<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::vector" field="returnValues" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+																	<Class name="AZ::Uuid" field="sourceID" value="{CC3EBD7B-203D-44CD-8B4F-ECAE6CC026D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="bool" field="isPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="AZ::Uuid" field="sourceID" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}"/>
+													<Class name="AZStd::vector" field="outKeys" type="{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}">
+														<Class name="Crc32" field="element" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+															<Class name="unsigned int" field="Value" value="778341494" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="namespacePath" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="ScriptCanvas" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="UnitTests" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="LY_SC_UnitTest_FunctionLocalStaticsUniqueFunction_VM" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="unsigned int" field="executionCharacteristics" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="bool" field="requiresConstructionParameters" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="requiresConstructionParametersForDependencies" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46970353725601" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="FunctionCallNode" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionCallNode" field="element" version="6" type="{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="16273960053331382228" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Add Element at End : In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2459315212" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2459315212" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2732307328" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="AZ::Uuid" field="m_sourceId" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												<Class name="Asset" field="m_asset" value="id={555C71C8-7415-57AD-8D2C-9B69AB0B8691}:dfe6dc72,type={E22967AC-7673-4778-9125-AF49D82CAF9F},hint={scriptcanvas/unittests/ly_sc_unittest_functionlocalstaticsuniquefunction.scriptcanvas_fn_compiled},loadBehavior=2" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
+												<Class name="Map" field="m_slotExecutionMap" version="1" type="{BAA81EAF-E35A-4F19-B73A-699B91DB113C}">
+													<Class name="AZStd::vector" field="ins" type="{733E7AAD-19AD-5FAE-A634-B3B6EB0D3ED3}">
+														<Class name="In" field="element" version="1" type="{4AAAEB0B-6367-46E5-B05D-E76EF884E16F}">
+															<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="AZStd::vector" field="_inputs" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+															<Class name="AZStd::vector" field="_outs" type="{5970B601-529F-5E37-99F2-942F34360771}">
+																<Class name="Out" field="element" version="1" type="{DD3D2547-868C-40DF-A37C-F60BE06FFFBA}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="AZStd::string" field="_name" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="_outputs" type="{275A1212-6B40-5045-BA6D-39FF976D6634}">
+																		<Class name="Output" field="element" type="{61EA2FF0-3112-40DF-BA45-CF4BE680DC52}">
+																			<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																				<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																			<Class name="VariableId" field="_interfaceSourceId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																				<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																	<Class name="Return" field="_returnValues" version="1" type="{8CD09346-BF99-4B34-91EA-C553549F7639}">
+																		<Class name="AZStd::vector" field="_values" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+																	</Class>
+																	<Class name="AZ::Uuid" field="_interfaceSourceId" value="{CC3EBD7B-203D-44CD-8B4F-ECAE6CC026D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="_parsedName" value="AddElementatEndIn_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZ::Uuid" field="_interfaceSourceId" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{5970B601-529F-5E37-99F2-942F34360771}"/>
+												</Class>
+												<Class name="SubgraphInterface" field="m_slotExecutionMapSourceInterface" version="7" type="{52B27A11-8294-4A6F-BFCF-6C1582649DB2}">
+													<Class name="bool" field="areAllChildrenPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="hasOnGraphStart" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="isActiveDefaultObject" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="AZStd::vector" field="ins" type="{16DA1AFC-705E-559D-8CF0-2E939187BB4B}">
+														<Class name="In" field="element" version="1" type="{DFDA32F7-41D2-45BB-8ADF-876679053836}">
+															<Class name="AZStd::string" field="displayName" value="Add Element at End : In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="parsedName" value="AddElementatEndIn_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::vector" field="inputs" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+															<Class name="AZStd::vector" field="outs" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}">
+																<Class name="Out" field="element" version="1" type="{6175D897-C06D-48B5-8775-388B232D429D}">
+																	<Class name="AZStd::string" field="displayName" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="NewOutput" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="outputs" type="{5457916A-40A0-5DF0-9742-1DEECFEE5C48}">
+																		<Class name="Output" field="element" type="{344D66C7-EE5E-45B1-809F-4108DDB65F20}">
+																			<Class name="AZStd::string" field="displayName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="parsedName" value="size_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="Type" field="type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																				<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																				<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																			<Class name="VariableId" field="sourceID" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																				<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::vector" field="returnValues" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+																	<Class name="AZ::Uuid" field="sourceID" value="{CC3EBD7B-203D-44CD-8B4F-ECAE6CC026D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="bool" field="isPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="AZ::Uuid" field="sourceID" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}"/>
+													<Class name="AZStd::vector" field="outKeys" type="{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}">
+														<Class name="Crc32" field="element" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+															<Class name="unsigned int" field="Value" value="778341494" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="namespacePath" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="ScriptCanvas" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="UnitTests" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="LY_SC_UnitTest_FunctionLocalStaticsUniqueFunction_VM" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="unsigned int" field="executionCharacteristics" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="bool" field="requiresConstructionParameters" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="requiresConstructionParametersForDependencies" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46974648692897" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Start)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Start" field="element" version="2" type="{F200B22A-5903-483A-BF63-5241BC03632B}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="12103787471183040405" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{A9E4CEC2-16CD-4EA5-AFC0-BCE3A6B9A17B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="Signaled when the entity that owns this graph is fully activated." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46978943660193" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="FunctionCallNode" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionCallNode" field="element" version="6" type="{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="16273960053331382228" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Add Element at End : In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2459315212" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2459315212" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2732307328" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="AZ::Uuid" field="m_sourceId" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												<Class name="Asset" field="m_asset" value="id={555C71C8-7415-57AD-8D2C-9B69AB0B8691}:dfe6dc72,type={E22967AC-7673-4778-9125-AF49D82CAF9F},hint={scriptcanvas/unittests/ly_sc_unittest_functionlocalstaticsuniquefunction.scriptcanvas_fn_compiled},loadBehavior=2" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
+												<Class name="Map" field="m_slotExecutionMap" version="1" type="{BAA81EAF-E35A-4F19-B73A-699B91DB113C}">
+													<Class name="AZStd::vector" field="ins" type="{733E7AAD-19AD-5FAE-A634-B3B6EB0D3ED3}">
+														<Class name="In" field="element" version="1" type="{4AAAEB0B-6367-46E5-B05D-E76EF884E16F}">
+															<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="AZStd::vector" field="_inputs" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+															<Class name="AZStd::vector" field="_outs" type="{5970B601-529F-5E37-99F2-942F34360771}">
+																<Class name="Out" field="element" version="1" type="{DD3D2547-868C-40DF-A37C-F60BE06FFFBA}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="AZStd::string" field="_name" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="_outputs" type="{275A1212-6B40-5045-BA6D-39FF976D6634}">
+																		<Class name="Output" field="element" type="{61EA2FF0-3112-40DF-BA45-CF4BE680DC52}">
+																			<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																				<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																			<Class name="VariableId" field="_interfaceSourceId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																				<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																	<Class name="Return" field="_returnValues" version="1" type="{8CD09346-BF99-4B34-91EA-C553549F7639}">
+																		<Class name="AZStd::vector" field="_values" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+																	</Class>
+																	<Class name="AZ::Uuid" field="_interfaceSourceId" value="{CC3EBD7B-203D-44CD-8B4F-ECAE6CC026D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="_parsedName" value="AddElementatEndIn_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZ::Uuid" field="_interfaceSourceId" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{5970B601-529F-5E37-99F2-942F34360771}"/>
+												</Class>
+												<Class name="SubgraphInterface" field="m_slotExecutionMapSourceInterface" version="7" type="{52B27A11-8294-4A6F-BFCF-6C1582649DB2}">
+													<Class name="bool" field="areAllChildrenPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="hasOnGraphStart" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="isActiveDefaultObject" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="AZStd::vector" field="ins" type="{16DA1AFC-705E-559D-8CF0-2E939187BB4B}">
+														<Class name="In" field="element" version="1" type="{DFDA32F7-41D2-45BB-8ADF-876679053836}">
+															<Class name="AZStd::string" field="displayName" value="Add Element at End : In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="parsedName" value="AddElementatEndIn_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::vector" field="inputs" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+															<Class name="AZStd::vector" field="outs" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}">
+																<Class name="Out" field="element" version="1" type="{6175D897-C06D-48B5-8775-388B232D429D}">
+																	<Class name="AZStd::string" field="displayName" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="NewOutput" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="outputs" type="{5457916A-40A0-5DF0-9742-1DEECFEE5C48}">
+																		<Class name="Output" field="element" type="{344D66C7-EE5E-45B1-809F-4108DDB65F20}">
+																			<Class name="AZStd::string" field="displayName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="parsedName" value="size_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="Type" field="type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																				<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																				<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																			<Class name="VariableId" field="sourceID" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																				<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																			</Class>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::vector" field="returnValues" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+																	<Class name="AZ::Uuid" field="sourceID" value="{CC3EBD7B-203D-44CD-8B4F-ECAE6CC026D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="bool" field="isPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="AZ::Uuid" field="sourceID" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}"/>
+													<Class name="AZStd::vector" field="outKeys" type="{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}">
+														<Class name="Crc32" field="element" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+															<Class name="unsigned int" field="Value" value="778341494" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="namespacePath" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="ScriptCanvas" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="UnitTests" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="LY_SC_UnitTest_FunctionLocalStaticsUniqueFunction_VM" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="unsigned int" field="executionCharacteristics" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="bool" field="requiresConstructionParameters" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="requiresConstructionParametersForDependencies" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46983238627489" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Expect Equal)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="MethodOverloaded" field="element" version="6" type="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}">
+												<Class name="Method" field="BaseClass1" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="14420456748684200052" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{CDA18289-B870-4DA5-BE2A-D508B106AB61}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="EntityID: 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="left of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{574F10B2-0BAF-4F9F-83EA-57816DCA2591}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="right of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1ACFD288-6FEF-4635-B8F3-D1B87EF3F8F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="additional notes for the test report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{A558F5E1-7A8F-466E-A3ED-42EC7BA889B4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{3E4CCA4C-061E-4DB3-A484-6D1DC2C664A5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="EntityId" field="m_data" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+																		<Class name="AZ::u64" field="id" value="4276206253" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::string" field="methodName" value="Expect Equal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="className" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+													<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::string" field="prettyClassName" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::vector" field="orderedInputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{CDA18289-B870-4DA5-BE2A-D508B106AB61}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{574F10B2-0BAF-4F9F-83EA-57816DCA2591}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1ACFD288-6FEF-4635-B8F3-D1B87EF3F8F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::vector" field="outputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46987533594785" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Expect Equal)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="MethodOverloaded" field="element" version="6" type="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}">
+												<Class name="Method" field="BaseClass1" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="14420456748684200052" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{CDA18289-B870-4DA5-BE2A-D508B106AB61}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="EntityID: 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="left of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{574F10B2-0BAF-4F9F-83EA-57816DCA2591}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="right of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1ACFD288-6FEF-4635-B8F3-D1B87EF3F8F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="additional notes for the test report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{A558F5E1-7A8F-466E-A3ED-42EC7BA889B4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{3E4CCA4C-061E-4DB3-A484-6D1DC2C664A5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="EntityId" field="m_data" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+																		<Class name="AZ::u64" field="id" value="4276206253" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::string" field="methodName" value="Expect Equal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="className" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+													<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::string" field="prettyClassName" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::vector" field="orderedInputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{CDA18289-B870-4DA5-BE2A-D508B106AB61}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{574F10B2-0BAF-4F9F-83EA-57816DCA2591}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1ACFD288-6FEF-4635-B8F3-D1B87EF3F8F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::vector" field="outputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::vector" field="m_connections" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46991828562081" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Expect Equal: Out), destEndpoint=(Mark Complete: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="685403441493653386" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46987533594785" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3E4CCA4C-061E-4DB3-A484-6D1DC2C664A5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46961763791009" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{D977AF2B-D564-4B4F-93AD-B7CF910E9057}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="46996123529377" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(On Graph Start: Out), destEndpoint=(Function Call Node: Add Element at End : In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="14413058359447369361" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46974648692897" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A9E4CEC2-16CD-4EA5-AFC0-BCE3A6B9A17B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46966058758305" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47000418496673" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: New Output), destEndpoint=(Expect Equal: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="6639750366315825606" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46966058758305" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46957468823713" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A558F5E1-7A8F-466E-A3ED-42EC7BA889B4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47004713463969" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: size), destEndpoint=(Expect Equal: Candidate)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="13833441556240906359" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46966058758305" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46957468823713" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47009008431265" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Expect Equal: Out), destEndpoint=(Function Call Node: Add Element at End : In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="16085974265879468943" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46957468823713" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3E4CCA4C-061E-4DB3-A484-6D1DC2C664A5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46970353725601" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47013303398561" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: New Output), destEndpoint=(Expect Equal: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="16889447850636488952" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46970353725601" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46983238627489" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A558F5E1-7A8F-466E-A3ED-42EC7BA889B4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47017598365857" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: size), destEndpoint=(Expect Equal: Candidate)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="5865030377377627296" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46970353725601" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46983238627489" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47021893333153" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Expect Equal: Out), destEndpoint=(Function Call Node: Add Element at End : In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="475175948777163272" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46983238627489" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3E4CCA4C-061E-4DB3-A484-6D1DC2C664A5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46978943660193" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{ECD44F95-E35E-4A19-A728-9D2BC963D447}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47026188300449" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: New Output), destEndpoint=(Expect Equal: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="1308816388377798592" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46978943660193" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{7B417C9B-FFD1-47DE-A111-4AD812288579}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46987533594785" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A558F5E1-7A8F-466E-A3ED-42EC7BA889B4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="47030483267745" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: size), destEndpoint=(Expect Equal: Candidate)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="1070076354281552240" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46978943660193" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{53917E2B-57E7-4718-97B0-6868D92F9377}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="46987533594785" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{F23DB937-DF8F-49F9-BEE2-945A3278C9D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::unordered_map" field="m_dependentAssets" type="{1BC78FA9-1D82-5F17-BD28-C35D1F4FA737}"/>
+								<Class name="AZStd::vector" field="m_scriptEventAssets" type="{479100D9-6931-5E23-8494-5A28EF2FCD8A}"/>
+							</Class>
+							<Class name="unsigned char" field="executionMode" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+							<Class name="AZ::Uuid" field="m_assetType" value="{3E2AC8CD-713F-453E-967F-29517F331784}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							<Class name="bool" field="isFunctionGraph" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+							<Class name="SlotId" field="versionData" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+								<Class name="AZ::Uuid" field="m_id" value="{01000000-0100-0000-FD7F-000090F1F4D3}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							</Class>
+						</Class>
+						<Class name="unsigned int" field="m_variableCounter" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+						<Class name="bool" field="m_saveFormatConverted" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+						<Class name="AZStd::unordered_map" field="GraphCanvasData" type="{0005D26C-B35A-5C30-B60C-5716482946CB}">
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46966058758305" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{238237C4-0CA2-4843-91D7-667ADA17FE27}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="580.0000000 200.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46970353725601" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{17D842A7-585A-4BBF-905C-7A0B2B40D695}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="580.0000000 400.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46961763791009" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{5FEC3036-8767-4142-85A5-21780F8283D9}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1380.0000000 620.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46978943660193" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{1F98C418-FA70-4090-842E-25BF2A52D053}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="620.0000000 620.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46957468823713" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{7381F1D4-B1F8-4503-9983-C0D71CF9A02F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1080.0000000 180.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46987533594785" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{1A3DFEAA-B704-4311-BD2C-4CBFEDE4A511}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1080.0000000 620.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46974648692897" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{E22720F7-E37E-4B60-8FA4-087F9A5D7C73}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="TimeNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="400.0000000 180.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46953173856417" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{5F84B500-8C45-40D1-8EFC-A5306B241444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="SceneComponentSaveData" field="value2" version="3" type="{5F84B500-8C45-40D1-8EFC-A5306B241444}">
+												<Class name="AZStd::vector" field="Constructs" type="{60BF495A-9BEF-5429-836B-37ADEA39CEA0}"/>
+												<Class name="ViewParams" field="ViewParams" version="1" type="{D016BF86-DFBB-4AF0-AD26-27F6AB737740}">
+													<Class name="double" field="Scale" value="0.7349587" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+													<Class name="float" field="AnchorX" value="93.8828278" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+													<Class name="float" field="AnchorY" value="57.1460686" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+												</Class>
+												<Class name="unsigned int" field="BookmarkCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="46983238627489" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{17FC6060-12DA-4CE1-BBD7-86A9219AF964}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1080.0000000 400.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="AZStd::unordered_map" field="CRCCacheMap" type="{2376BDB0-D7B6-586B-A603-42BE703EB2C9}"/>
+						<Class name="GraphStatisticsHelper" field="StatisticsHelper" version="1" type="{7D5B7A65-F749-493E-BA5C-6B8724791F03}">
+							<Class name="AZStd::unordered_map" field="InstanceCounter" type="{9EC84E0A-F296-5212-8B69-4DE48E695D61}">
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4505839232593619602" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4199610336680704683" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="7721683751185626951" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4053150093067829293" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="6840657073857873079" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="int" field="GraphCanvasSaveVersion" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+					</Class>
+					<Class name="EditorGraphVariableManagerComponent" field="element" type="{86B7CC96-9830-4BD1-85C3-0C0BD0BFBEE7}">
+						<Class name="GraphVariableManagerComponent" field="BaseClass1" version="3" type="{825DC28D-667D-43D0-AF11-73681351DD2F}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="8814037518971372214" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="VariableData" field="m_variableData" version="3" type="{4F80659A-CD11-424E-BF04-AF02ABAC06B0}">
+								<Class name="AZStd::unordered_map" field="m_nameVariableMap" type="{6C3A5734-6C27-5033-B033-D5CAD11DE55A}"/>
+							</Class>
+							<Class name="AZStd::unordered_map" field="CopiedVariableRemapping" type="{723F81A5-0980-50C7-8B1F-BE646339362B}"/>
+						</Class>
+					</Class>
+				</Class>
+				<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_FunctionLocalStaticsUniqueFunction.scriptcanvas b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_FunctionLocalStaticsUniqueFunction.scriptcanvas
new file mode 100644
index 0000000000..95dd804bd5
--- /dev/null
+++ b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_FunctionLocalStaticsUniqueFunction.scriptcanvas
@@ -0,0 +1,2155 @@
+<ObjectStream version="3">
+	<Class name="ScriptCanvasData" version="4" type="{1072E894-0C67-4091-8B64-F7DB324AD13C}">
+		<Class name="AZStd::unique_ptr" field="m_scriptCanvas" type="{8FFB6D85-994F-5262-BA1C-D0082A7F65C5}">
+			<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+				<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+					<Class name="AZ::u64" field="id" value="36524993261729" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+				</Class>
+				<Class name="AZStd::string" field="Name" value="AddOnePerFramePrintSizeFunctionLocal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+					<Class name="Graph" field="element" version="8" type="{4D755CA9-AB92-462C-B24F-0B3376F19967}">
+						<Class name="Graph" field="BaseClass1" version="17" type="{C3267D77-EEDC-490E-9E42-F1D1F473E184}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="16435361764607139534" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="GraphData" field="m_graphData" version="4" type="{ADCB5EB5-8D3F-42ED-8F65-EAB58A82C381}">
+								<Class name="AZStd::unordered_set" field="m_nodes" type="{27BF7BD3-6E17-5619-9363-3FC3D9A5369D}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36529288229025" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="12551407348249053667" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{D8869FDC-A0BE-4606-A9B4-A7CA14E499ED}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{8E820DB3-2CAA-4F31-AEBF-2A0068041653}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="Add Element at End : In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{5CF3A4B3-580F-45AE-B67A-A09584E54B1D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36533583196321" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(OperatorAdd)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="OperatorAdd" field="element" type="{C1B42FEC-0545-4511-9FAC-11E0387FEDF0}">
+												<Class name="OperatorArithmetic" field="BaseClass1" version="1" type="{FE0589B0-F835-4CD5-BBD3-86510CBB985B}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="2096797376493077705" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{30A6A3F1-9C70-4AB8-8C19-1228DA69912E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{4F70BAB5-D839-4B2A-8F52-8614E04CD10B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1A81210A-3A19-44A7-AA77-FDE856DC130F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="MathOperatorContract" field="element" version="1" type="{17B1AEA6-B36B-4EE5-83E9-4563CAC79889}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="AZStd::string" field="OperatorType" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::unordered_set" field="NativeTypes" type="{2A8293DA-3587-5E58-8D7A-FA303290D99F}">
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="6" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="9" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="11" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="15" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="14" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="10" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="8" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="12" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="An operand to use in performing the specified Operation" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1114760223" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1114760223" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1A63A754-7487-4223-8107-E36F23AFAF3C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{95521590-7992-4A65-B39B-0DE1C8FAB585}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="MathOperatorContract" field="element" version="1" type="{17B1AEA6-B36B-4EE5-83E9-4563CAC79889}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="AZStd::string" field="OperatorType" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::unordered_set" field="NativeTypes" type="{2A8293DA-3587-5E58-8D7A-FA303290D99F}">
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="6" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="9" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="11" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="15" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="14" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="10" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="8" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="12" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="An operand to use in performing the specified Operation" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1114760223" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1114760223" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{18756835-209E-42B2-8B91-71448A22DF12}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="MathOperatorContract" field="element" version="1" type="{17B1AEA6-B36B-4EE5-83E9-4563CAC79889}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="AZStd::string" field="OperatorType" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::unordered_set" field="NativeTypes" type="{2A8293DA-3587-5E58-8D7A-FA303290D99F}">
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="6" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="9" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="11" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="15" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="14" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="10" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="8" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																				<Class name="Type" field="element" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																					<Class name="unsigned int" field="m_type" value="12" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																					<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Result" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The result of the specified operation" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1114760223" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1114760223" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1A63A754-7487-4223-8107-E36F23AFAF3C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36537878163617" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Add Element at End)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="MethodOverloaded" field="element" version="6" type="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}">
+												<Class name="Method" field="BaseClass1" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="10889692983256828528" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{5FE14FCB-34F9-4151-8987-0D859D33B44B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The container into which to add an element to" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{276D3EE1-0B5B-404B-87FD-37471FE17971}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{66791936-EB99-439D-B246-CAE05B56DAC6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The value to be added" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{39CA54E3-5C20-4336-BD3A-DDD6C2701E95}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{3578650E-64A2-4DC1-8870-46BAA5D259DC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{E2298FD9-2495-473E-B87C-975C248D3795}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::intrusive_ptr" field="m_data" type="{2349F1C2-6C74-54C9-8B7E-CBE24DDE8850}">
+																		<Class name="BehaviorContextObject" field="element" type="{B735214D-5182-4536-B748-61EC83C1F007}">
+																			<Class name="unsigned int" field="m_flags" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="any" field="m_object" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="7.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::string" field="methodName" value="Add Element at End" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="className" value="AZStd::vector&lt;double, allocator&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+													<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::string" field="prettyClassName" value="Array&lt;String&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::vector" field="orderedInputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{5FE14FCB-34F9-4151-8987-0D859D33B44B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{66791936-EB99-439D-B246-CAE05B56DAC6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::vector" field="outputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{E2298FD9-2495-473E-B87C-975C248D3795}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36542173130913" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Print)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Print" field="element" type="{E1940FB4-83FE-4594-9AFF-375FF7603338}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="11984021430440582292" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{561A1859-4566-47D8-A86A-06183B363AB7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{BD770B46-0CED-4B88-B7A6-D0D5833F2F68}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1620CC3E-2BEA-46CA-ABA2-D5962807204F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value_1" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value_1} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{45E2C508-F755-444D-86C5-26F55CA6A28A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::intrusive_ptr" field="m_data" type="{2349F1C2-6C74-54C9-8B7E-CBE24DDE8850}">
+																		<Class name="BehaviorContextObject" field="element" type="{B735214D-5182-4536-B748-61EC83C1F007}">
+																			<Class name="unsigned int" field="m_flags" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="any" field="m_object" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value_1" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value="{Value}, {Value_1}, " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}">
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{BD770B46-0CED-4B88-B7A6-D0D5833F2F68}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="3" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{1620CC3E-2BEA-46CA-ABA2-D5962807204F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value=", " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value=", " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}">
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{BD770B46-0CED-4B88-B7A6-D0D5833F2F68}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value_1" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{1620CC3E-2BEA-46CA-ABA2-D5962807204F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36546468098209" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="17154868467269028543" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{A752856A-8FB1-4FC3-96B4-8A461553EE39}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{072B7A1E-9DDA-4776-93DD-10FAA03A7444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{7BFB6E36-AD69-42CA-B463-094DC376F72E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="452080683" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="2343239484" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="New Output" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{CC3EBD7B-203D-44CD-8B4F-ECAE6CC026D8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36550763065505" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Get Size)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="MethodOverloaded" field="element" version="6" type="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}">
+												<Class name="Method" field="BaseClass1" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="6831548421790995427" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{06E6582D-43D5-4251-AEEA-7740C159B458}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The container to get the size of" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{276D3EE1-0B5B-404B-87FD-37471FE17971}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{EFD52EBA-476E-45D2-9824-3D35D23A2C26}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{457CDD99-B1B8-4E95-A441-F377C810C4FD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{3B0BB2D9-891C-4D94-8FB7-44177B6D9F5C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Result: Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::intrusive_ptr" field="m_data" type="{2349F1C2-6C74-54C9-8B7E-CBE24DDE8850}">
+																		<Class name="BehaviorContextObject" field="element" type="{B735214D-5182-4536-B748-61EC83C1F007}">
+																			<Class name="unsigned int" field="m_flags" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="any" field="m_object" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Container" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::string" field="methodName" value="Get Size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="className" value="AZStd::vector&lt;double, allocator&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+													<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::string" field="prettyClassName" value="Array&lt;String&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::vector" field="orderedInputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{06E6582D-43D5-4251-AEEA-7740C159B458}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::vector" field="outputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3B0BB2D9-891C-4D94-8FB7-44177B6D9F5C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::vector" field="m_connections" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36555058032801" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Add Element at End: Container), destEndpoint=(Print: Value)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="7934861041472209016" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36537878163617" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{E2298FD9-2495-473E-B87C-975C248D3795}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36542173130913" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{BD770B46-0CED-4B88-B7A6-D0D5833F2F68}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36559353000097" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Add Element at End: Out), destEndpoint=(Add (+): In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="14687218898276714781" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36537878163617" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3578650E-64A2-4DC1-8870-46BAA5D259DC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36533583196321" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{30A6A3F1-9C70-4AB8-8C19-1228DA69912E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36563647967393" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Add (+): Out), destEndpoint=(Get Size: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="12916578447735907427" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36533583196321" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{4F70BAB5-D839-4B2A-8F52-8614E04CD10B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36550763065505" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{EFD52EBA-476E-45D2-9824-3D35D23A2C26}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36567942934689" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Get Size: Out), destEndpoint=(Print: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="3006005389772815607" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36550763065505" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{457CDD99-B1B8-4E95-A441-F377C810C4FD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36542173130913" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{561A1859-4566-47D8-A86A-06183B363AB7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36572237901985" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Get Size: Result: Number), destEndpoint=(Print: Value_1)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="235806468703333456" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36550763065505" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3B0BB2D9-891C-4D94-8FB7-44177B6D9F5C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36542173130913" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1620CC3E-2BEA-46CA-ABA2-D5962807204F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36576532869281" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Add Element at End : In:  ), destEndpoint=(Add Element at End: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="13636562730250948671" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36529288229025" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{8E820DB3-2CAA-4F31-AEBF-2A0068041653}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36537878163617" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{39CA54E3-5C20-4336-BD3A-DDD6C2701E95}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36580827836577" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Get Size: Result: Number), destEndpoint=(New Output: size)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="18149484641113835444" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36550763065505" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3B0BB2D9-891C-4D94-8FB7-44177B6D9F5C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36546468098209" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{7BFB6E36-AD69-42CA-B463-094DC376F72E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="36585122803873" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Print: Out), destEndpoint=(New Output:  )" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="9114647256272455557" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36542173130913" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{45E2C508-F755-444D-86C5-26F55CA6A28A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="36546468098209" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A752856A-8FB1-4FC3-96B4-8A461553EE39}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::unordered_map" field="m_dependentAssets" type="{1BC78FA9-1D82-5F17-BD28-C35D1F4FA737}"/>
+								<Class name="AZStd::vector" field="m_scriptEventAssets" type="{479100D9-6931-5E23-8494-5A28EF2FCD8A}"/>
+							</Class>
+							<Class name="unsigned char" field="executionMode" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+							<Class name="AZ::Uuid" field="m_assetType" value="{3E2AC8CD-713F-453E-967F-29517F331784}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							<Class name="bool" field="isFunctionGraph" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+							<Class name="SlotId" field="versionData" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+								<Class name="AZ::Uuid" field="m_id" value="{01000000-0100-0000-FD7F-00000037F81F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							</Class>
+						</Class>
+						<Class name="unsigned int" field="m_variableCounter" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+						<Class name="bool" field="m_saveFormatConverted" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+						<Class name="AZStd::unordered_map" field="GraphCanvasData" type="{0005D26C-B35A-5C30-B60C-5716482946CB}">
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="36546468098209" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{EFE0B88C-D091-4899-9594-88C051672880}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1460.0000000 380.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="36537878163617" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{187EE8BF-7173-4032-864D-95C96778F77E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="80.0000000 80.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="36542173130913" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{FF182669-0A47-48F4-969D-D1BE12E67257}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1020.0000000 420.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="36550763065505" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{DBC0BE99-B3A2-4E5C-9342-5BC193CFE34A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="540.0000000 460.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="36533583196321" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{0C311D72-B59C-454C-BA99-3CF430ED8391}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MathNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="-120.0000000 460.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="36524993261729" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{5F84B500-8C45-40D1-8EFC-A5306B241444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="SceneComponentSaveData" field="value2" version="3" type="{5F84B500-8C45-40D1-8EFC-A5306B241444}">
+												<Class name="AZStd::vector" field="Constructs" type="{60BF495A-9BEF-5429-836B-37ADEA39CEA0}"/>
+												<Class name="ViewParams" field="ViewParams" version="1" type="{D016BF86-DFBB-4AF0-AD26-27F6AB737740}">
+													<Class name="double" field="Scale" value="0.5102611" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+													<Class name="float" field="AnchorX" value="-619.2907715" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+													<Class name="float" field="AnchorY" value="-113.6672974" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+												</Class>
+												<Class name="unsigned int" field="BookmarkCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="36529288229025" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="-420.0000000 -60.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{70794150-812A-4188-987E-358E1B875F96}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="AZStd::unordered_map" field="CRCCacheMap" type="{2376BDB0-D7B6-586B-A603-42BE703EB2C9}"/>
+						<Class name="GraphStatisticsHelper" field="StatisticsHelper" version="1" type="{7D5B7A65-F749-493E-BA5C-6B8724791F03}">
+							<Class name="AZStd::unordered_map" field="InstanceCounter" type="{9EC84E0A-F296-5212-8B69-4DE48E695D61}">
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="8509774054286391993" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="2781147101807596453" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="7011818094993955847" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="10684225535275896474" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="1244476766431948410" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="int" field="GraphCanvasSaveVersion" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+					</Class>
+					<Class name="EditorGraphVariableManagerComponent" field="element" type="{86B7CC96-9830-4BD1-85C3-0C0BD0BFBEE7}">
+						<Class name="GraphVariableManagerComponent" field="BaseClass1" version="3" type="{825DC28D-667D-43D0-AF11-73681351DD2F}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="8814037518971372214" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="VariableData" field="m_variableData" version="3" type="{4F80659A-CD11-424E-BF04-AF02ABAC06B0}">
+								<Class name="AZStd::unordered_map" field="m_nameVariableMap" type="{6C3A5734-6C27-5033-B033-D5CAD11DE55A}">
+									<Class name="AZStd::pair" field="element" type="{E64D2110-EB38-5AE1-9B1D-3C06A10C7D6A}">
+										<Class name="VariableId" field="value1" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+											<Class name="AZ::Uuid" field="m_id" value="{276D3EE1-0B5B-404B-87FD-37471FE17971}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+										</Class>
+										<Class name="GraphVariable" field="value2" version="4" type="{5BDC128B-8355-479C-8FA8-4BFFAB6915A8}">
+											<Class name="Datum" field="Datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+												<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+													<Class name="unsigned int" field="m_type" value="4" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="AZ::Uuid" field="m_azType" value="{F31F64EA-E384-5536-ACD6-8F01849730FC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+													<Class name="AZStd::intrusive_ptr" field="m_data" type="{2349F1C2-6C74-54C9-8B7E-CBE24DDE8850}">
+														<Class name="BehaviorContextObject" field="element" type="{B735214D-5182-4536-B748-61EC83C1F007}">
+															<Class name="unsigned int" field="m_flags" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															<Class name="any" field="m_object" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="AZStd::vector" field="m_data" type="{F31F64EA-E384-5536-ACD6-8F01849730FC}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+												<Class name="AZStd::string" field="m_datumLabel" value="Array&lt;Number&gt;" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+											<Class name="Crc32" field="InputControlVisibility" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+												<Class name="unsigned int" field="Value" value="2755429085" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+											<Class name="AZStd::string" field="ExposureCategory" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="int" field="SortPriority" value="-1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+											<Class name="ReplicaNetworkProperties" field="ReplicaNetProps" version="1" type="{4F055551-DD75-4877-93CE-E80C844FC155}">
+												<Class name="bool" field="m_isSynchronized" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+											<Class name="VariableId" field="VariableId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+												<Class name="AZ::Uuid" field="m_id" value="{276D3EE1-0B5B-404B-87FD-37471FE17971}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+											<Class name="AZStd::string" field="VariableName" value="Variable 3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="unsigned char" field="Scope" value="1" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+											<Class name="unsigned char" field="InitialValueSource" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+										</Class>
+									</Class>
+									<Class name="AZStd::pair" field="element" type="{E64D2110-EB38-5AE1-9B1D-3C06A10C7D6A}">
+										<Class name="VariableId" field="value1" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+											<Class name="AZ::Uuid" field="m_id" value="{1A63A754-7487-4223-8107-E36F23AFAF3C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+										</Class>
+										<Class name="GraphVariable" field="value2" version="4" type="{5BDC128B-8355-479C-8FA8-4BFFAB6915A8}">
+											<Class name="Datum" field="Datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+												<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+													<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+													<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+												</Class>
+												<Class name="AZStd::string" field="m_datumLabel" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+											<Class name="Crc32" field="InputControlVisibility" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+												<Class name="unsigned int" field="Value" value="2755429085" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+											<Class name="AZStd::string" field="ExposureCategory" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="int" field="SortPriority" value="-1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+											<Class name="ReplicaNetworkProperties" field="ReplicaNetProps" version="1" type="{4F055551-DD75-4877-93CE-E80C844FC155}">
+												<Class name="bool" field="m_isSynchronized" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+											<Class name="VariableId" field="VariableId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+												<Class name="AZ::Uuid" field="m_id" value="{1A63A754-7487-4223-8107-E36F23AFAF3C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+											<Class name="AZStd::string" field="VariableName" value="Variable 4" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="unsigned char" field="Scope" value="1" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+											<Class name="unsigned char" field="InitialValueSource" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+										</Class>
+									</Class>
+									<Class name="AZStd::pair" field="element" type="{E64D2110-EB38-5AE1-9B1D-3C06A10C7D6A}">
+										<Class name="VariableId" field="value1" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+											<Class name="AZ::Uuid" field="m_id" value="{0FDDE0EC-B1AC-4236-831D-F3217568F08F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+										</Class>
+										<Class name="GraphVariable" field="value2" version="4" type="{5BDC128B-8355-479C-8FA8-4BFFAB6915A8}">
+											<Class name="Datum" field="Datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+												<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+													<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+													<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+												</Class>
+												<Class name="AZStd::string" field="m_datumLabel" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+											<Class name="Crc32" field="InputControlVisibility" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+												<Class name="unsigned int" field="Value" value="2755429085" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+											<Class name="AZStd::string" field="ExposureCategory" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="int" field="SortPriority" value="-1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+											<Class name="ReplicaNetworkProperties" field="ReplicaNetProps" version="1" type="{4F055551-DD75-4877-93CE-E80C844FC155}">
+												<Class name="bool" field="m_isSynchronized" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+											<Class name="VariableId" field="VariableId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+												<Class name="AZ::Uuid" field="m_id" value="{0FDDE0EC-B1AC-4236-831D-F3217568F08F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+											<Class name="AZStd::string" field="VariableName" value="size" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="unsigned char" field="Scope" value="2" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+											<Class name="unsigned char" field="InitialValueSource" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::unordered_map" field="CopiedVariableRemapping" type="{723F81A5-0980-50C7-8B1F-BE646339362B}"/>
+						</Class>
+					</Class>
+				</Class>
+				<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_IsOneFunction.scriptcanvas b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_IsOneFunction.scriptcanvas
new file mode 100644
index 0000000000..72cc8fa4a0
--- /dev/null
+++ b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_IsOneFunction.scriptcanvas
@@ -0,0 +1,1677 @@
+<ObjectStream version="3">
+	<Class name="ScriptCanvasData" version="4" type="{1072E894-0C67-4091-8B64-F7DB324AD13C}">
+		<Class name="AZStd::unique_ptr" field="m_scriptCanvas" type="{8FFB6D85-994F-5262-BA1C-D0082A7F65C5}">
+			<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+				<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+					<Class name="AZ::u64" field="id" value="7334423199973" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+				</Class>
+				<Class name="AZStd::string" field="Name" value="LY_SC_UnitTest_IsZeroFunction" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+					<Class name="Graph" field="element" version="8" type="{4D755CA9-AB92-462C-B24F-0B3376F19967}">
+						<Class name="Graph" field="BaseClass1" version="17" type="{C3267D77-EEDC-490E-9E42-F1D1F473E184}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="11272452614447405463" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="GraphData" field="m_graphData" version="4" type="{ADCB5EB5-8D3F-42ED-8F65-EAB58A82C381}">
+								<Class name="AZStd::unordered_set" field="m_nodes" type="{27BF7BD3-6E17-5619-9363-3FC3D9A5369D}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7338718167269" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="13940460933427889908" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{D8F8145C-CF4A-4937-A215-5F799D95DF97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{BCC71E68-A438-4621-80C3-EB0BAC016A40}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{07377CE7-1027-4BB7-95EC-09E72CF1A084}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7343013134565" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="17371485502320280176" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{5C5E8634-F6CE-4A8E-A620-498E516ECA2A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{F3EFFD1A-2614-4ABC-95C3-70C795AC1B30}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{017C8942-5701-44D8-A737-8EA18552E1C0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7347308101861" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Print)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Print" field="element" type="{E1940FB4-83FE-4594-9AFF-375FF7603338}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="1090546246199758171" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="bool" field="m_data" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value="In Function True: {Value}" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}">
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="In Function True: " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}">
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(EqualTo)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="EqualTo" field="element" type="{02A3A3E6-9D80-432B-8AF5-F3AF24CF6959}">
+												<Class name="EqualityExpression" field="BaseClass1" type="{78D20EB6-BA07-4071-B646-7C2D68A0A4A6}">
+													<Class name="BooleanExpression" field="BaseClass1" type="{36C69825-CFF8-4F70-8F3B-1A9227E8BEEA}">
+														<Class name="BinaryOperator" field="BaseClass1" type="{5BD0E8C7-9B0A-42F5-9EB0-199E6EC8FA99}">
+															<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+																<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+																	<Class name="AZ::u64" field="Id" value="10892072486447941986" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																</Class>
+																<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{1D797ECA-9A5F-4E2D-BA91-7CF0D3644ED4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="Result" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{9D51F77C-6A24-4FCD-9D0F-DAB0048931F0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="Signal to perform the evaluation when desired." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{A3D30613-0A91-46B5-BAC3-655A22C08FAC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="Signaled if the result of the operation is true." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{124BD3C0-DF57-4FC9-A345-637A116AC1A8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="Signaled if the result of the operation is false." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{3E48519D-3FA3-4807-87BF-0EF9452237E2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="Value A" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="3545012108" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{B71B091B-1DA4-49E7-870B-7E648AAC5FE5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="Value B" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="3545012108" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+																	<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																		<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																			<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																		</Class>
+																		<Class name="AZStd::string" field="m_datumLabel" value="Value A" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	</Class>
+																	<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																		<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																			<Class name="double" field="m_data" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																		</Class>
+																		<Class name="AZStd::string" field="m_datumLabel" value="Value B" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	</Class>
+																</Class>
+																<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7355898036453" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="4778543193105032534" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{45D7348B-D743-4B18-800A-885955F3DA89}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{62BC9B1C-5890-4B3D-9A4C-C29F2360077D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{3FBD6FFE-3376-4A91-9C9A-F266521B34C6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="452080683" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="2343239484" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="Is Equal to 1" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{7DA9A117-E49B-46C2-BED4-F9F5BC6BD9E5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7360193003749" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Print)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Print" field="element" type="{E1940FB4-83FE-4594-9AFF-375FF7603338}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="1090546246199758171" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="bool" field="m_data" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value="In Functions False: {Value}" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}">
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="In Functions False: " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}">
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::vector" field="m_connections" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7364487971045" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Is Equal to 0:  ), destEndpoint=(Equal To (==): In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="13613892843389619079" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7355898036453" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{62BC9B1C-5890-4B3D-9A4C-C29F2360077D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{9D51F77C-6A24-4FCD-9D0F-DAB0048931F0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7368782938341" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Is Equal to 0: Value), destEndpoint=(Equal To (==): Value A)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="7920625701362617973" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7355898036453" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3FBD6FFE-3376-4A91-9C9A-F266521B34C6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3E48519D-3FA3-4807-87BF-0EF9452237E2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7373077905637" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): True), destEndpoint=(Print: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="7840551042612259224" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A3D30613-0A91-46B5-BAC3-655A22C08FAC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7347308101861" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7377372872933" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): False), destEndpoint=(Print: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="8525823719174861735" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{124BD3C0-DF57-4FC9-A345-637A116AC1A8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7360193003749" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7381667840229" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): Result), destEndpoint=(Print: Value)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="16701878847168166017" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1D797ECA-9A5F-4E2D-BA91-7CF0D3644ED4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7347308101861" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7385962807525" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): Result), destEndpoint=(Print: Value)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="4282214504303842192" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1D797ECA-9A5F-4E2D-BA91-7CF0D3644ED4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7360193003749" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7390257774821" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Print: Out), destEndpoint=(Print : Out:  )" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="1706253599102218136" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7347308101861" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7338718167269" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{D8F8145C-CF4A-4937-A215-5F799D95DF97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="7394552742117" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Print: Out), destEndpoint=(Print : Out:  )" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="14360685366172895450" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7360193003749" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="7343013134565" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{5C5E8634-F6CE-4A8E-A620-498E516ECA2A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::unordered_map" field="m_dependentAssets" type="{1BC78FA9-1D82-5F17-BD28-C35D1F4FA737}"/>
+								<Class name="AZStd::vector" field="m_scriptEventAssets" type="{479100D9-6931-5E23-8494-5A28EF2FCD8A}"/>
+							</Class>
+							<Class name="unsigned char" field="executionMode" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+							<Class name="AZ::Uuid" field="m_assetType" value="{3E2AC8CD-713F-453E-967F-29517F331784}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							<Class name="bool" field="isFunctionGraph" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+							<Class name="SlotId" field="versionData" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+								<Class name="AZ::Uuid" field="m_id" value="{01000000-0100-0000-FD7F-000050DB3AA0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							</Class>
+						</Class>
+						<Class name="unsigned int" field="m_variableCounter" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+						<Class name="bool" field="m_saveFormatConverted" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+						<Class name="AZStd::unordered_map" field="GraphCanvasData" type="{0005D26C-B35A-5C30-B60C-5716482946CB}">
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="7343013134565" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{1C921028-F4D7-4D2F-91A0-9A909EF04387}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1020.0000000 340.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="7334423199973" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{5F84B500-8C45-40D1-8EFC-A5306B241444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="SceneComponentSaveData" field="value2" version="3" type="{5F84B500-8C45-40D1-8EFC-A5306B241444}">
+												<Class name="AZStd::vector" field="Constructs" type="{60BF495A-9BEF-5429-836B-37ADEA39CEA0}"/>
+												<Class name="ViewParams" field="ViewParams" version="1" type="{D016BF86-DFBB-4AF0-AD26-27F6AB737740}">
+													<Class name="double" field="Scale" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+													<Class name="float" field="AnchorX" value="-1.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+													<Class name="float" field="AnchorY" value="-128.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+												</Class>
+												<Class name="unsigned int" field="BookmarkCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="7338718167269" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{2D7FDDEC-C492-469F-BD14-E94725E6C2EA}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="980.0000000 0.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="7351603069157" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{C557514B-501B-42E6-8AE1-F2D64641B0FE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MathNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="320.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="7360193003749" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="720.0000000 340.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{8DB01DDF-13A3-4574-B163-49565111322D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="7355898036453" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{10AC54C4-C293-47C4-86AA-5EC03594D80D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="140.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="7347308101861" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{79DFFF86-F059-48EB-B6BC-18B76D33EB5C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="680.0000000 0.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="AZStd::unordered_map" field="CRCCacheMap" type="{2376BDB0-D7B6-586B-A603-42BE703EB2C9}"/>
+						<Class name="GraphStatisticsHelper" field="StatisticsHelper" version="1" type="{7D5B7A65-F749-493E-BA5C-6B8724791F03}">
+							<Class name="AZStd::unordered_map" field="InstanceCounter" type="{9EC84E0A-F296-5212-8B69-4DE48E695D61}">
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="10684225535275896474" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="7011818094993955847" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="3117476785392655547" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="int" field="GraphCanvasSaveVersion" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+					</Class>
+					<Class name="EditorGraphVariableManagerComponent" field="element" type="{86B7CC96-9830-4BD1-85C3-0C0BD0BFBEE7}">
+						<Class name="GraphVariableManagerComponent" field="BaseClass1" version="3" type="{825DC28D-667D-43D0-AF11-73681351DD2F}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="13229830129540693674" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="VariableData" field="m_variableData" version="3" type="{4F80659A-CD11-424E-BF04-AF02ABAC06B0}">
+								<Class name="AZStd::unordered_map" field="m_nameVariableMap" type="{6C3A5734-6C27-5033-B033-D5CAD11DE55A}">
+									<Class name="AZStd::pair" field="element" type="{E64D2110-EB38-5AE1-9B1D-3C06A10C7D6A}">
+										<Class name="VariableId" field="value1" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+											<Class name="AZ::Uuid" field="m_id" value="{2195BC05-1098-4A0E-9FCA-A40B123BA4CF}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+										</Class>
+										<Class name="GraphVariable" field="value2" version="4" type="{5BDC128B-8355-479C-8FA8-4BFFAB6915A8}">
+											<Class name="Datum" field="Datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+												<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+													<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+													<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+												</Class>
+												<Class name="AZStd::string" field="m_datumLabel" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+											<Class name="Crc32" field="InputControlVisibility" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+												<Class name="unsigned int" field="Value" value="2755429085" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+											<Class name="AZStd::string" field="ExposureCategory" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="int" field="SortPriority" value="-1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+											<Class name="ReplicaNetworkProperties" field="ReplicaNetProps" version="1" type="{4F055551-DD75-4877-93CE-E80C844FC155}">
+												<Class name="bool" field="m_isSynchronized" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+											<Class name="VariableId" field="VariableId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+												<Class name="AZ::Uuid" field="m_id" value="{2195BC05-1098-4A0E-9FCA-A40B123BA4CF}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+											<Class name="AZStd::string" field="VariableName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="unsigned char" field="Scope" value="2" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+											<Class name="unsigned char" field="InitialValueSource" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::unordered_map" field="CopiedVariableRemapping" type="{723F81A5-0980-50C7-8B1F-BE646339362B}"/>
+						</Class>
+					</Class>
+				</Class>
+				<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_IsZeroFunction.scriptcanvas b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_IsZeroFunction.scriptcanvas
new file mode 100644
index 0000000000..081a45c63a
--- /dev/null
+++ b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_IsZeroFunction.scriptcanvas
@@ -0,0 +1,1677 @@
+<ObjectStream version="3">
+	<Class name="ScriptCanvasData" version="4" type="{1072E894-0C67-4091-8B64-F7DB324AD13C}">
+		<Class name="AZStd::unique_ptr" field="m_scriptCanvas" type="{8FFB6D85-994F-5262-BA1C-D0082A7F65C5}">
+			<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+				<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+					<Class name="AZ::u64" field="id" value="4584910872033" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+				</Class>
+				<Class name="AZStd::string" field="Name" value="IsEqualToFunction" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+					<Class name="Graph" field="element" version="8" type="{4D755CA9-AB92-462C-B24F-0B3376F19967}">
+						<Class name="Graph" field="BaseClass1" version="17" type="{C3267D77-EEDC-490E-9E42-F1D1F473E184}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="11272452614447405463" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="GraphData" field="m_graphData" version="4" type="{ADCB5EB5-8D3F-42ED-8F65-EAB58A82C381}">
+								<Class name="AZStd::unordered_set" field="m_nodes" type="{27BF7BD3-6E17-5619-9363-3FC3D9A5369D}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4589205839329" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Print)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Print" field="element" type="{E1940FB4-83FE-4594-9AFF-375FF7603338}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="1090546246199758171" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="bool" field="m_data" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value="In Functions False: {Value}" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}">
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="In Functions False: " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}">
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4593500806625" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="4778543193105032534" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{45D7348B-D743-4B18-800A-885955F3DA89}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{62BC9B1C-5890-4B3D-9A4C-C29F2360077D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{3FBD6FFE-3376-4A91-9C9A-F266521B34C6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="452080683" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="2343239484" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="Is Equal to 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{7DA9A117-E49B-46C2-BED4-F9F5BC6BD9E5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(EqualTo)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="EqualTo" field="element" type="{02A3A3E6-9D80-432B-8AF5-F3AF24CF6959}">
+												<Class name="EqualityExpression" field="BaseClass1" type="{78D20EB6-BA07-4071-B646-7C2D68A0A4A6}">
+													<Class name="BooleanExpression" field="BaseClass1" type="{36C69825-CFF8-4F70-8F3B-1A9227E8BEEA}">
+														<Class name="BinaryOperator" field="BaseClass1" type="{5BD0E8C7-9B0A-42F5-9EB0-199E6EC8FA99}">
+															<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+																<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+																	<Class name="AZ::u64" field="Id" value="10892072486447941986" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																</Class>
+																<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{1D797ECA-9A5F-4E2D-BA91-7CF0D3644ED4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="Result" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{9D51F77C-6A24-4FCD-9D0F-DAB0048931F0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="Signal to perform the evaluation when desired." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{A3D30613-0A91-46B5-BAC3-655A22C08FAC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="Signaled if the result of the operation is true." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{124BD3C0-DF57-4FC9-A345-637A116AC1A8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="Signaled if the result of the operation is false." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{3E48519D-3FA3-4807-87BF-0EF9452237E2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="Value A" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="3545012108" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																	<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																		<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																			<Class name="AZ::Uuid" field="m_id" value="{B71B091B-1DA4-49E7-870B-7E648AAC5FE5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																			<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																				<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																					<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																				</Class>
+																			</Class>
+																		</Class>
+																		<Class name="AZStd::string" field="slotName" value="Value B" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																			<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																			<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		</Class>
+																		<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																			<Class name="unsigned int" field="Value" value="3545012108" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																		</Class>
+																		<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																			<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+																	<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																		<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																			<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																		</Class>
+																		<Class name="AZStd::string" field="m_datumLabel" value="Value A" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	</Class>
+																	<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																		<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																			<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																		</Class>
+																		<Class name="AZStd::string" field="m_datumLabel" value="Value B" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	</Class>
+																</Class>
+																<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4602090741217" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Print)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Print" field="element" type="{E1940FB4-83FE-4594-9AFF-375FF7603338}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="1090546246199758171" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="bool" field="m_data" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value="In Function True: {Value}" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}">
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="In Function True: " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}">
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4606385708513" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="17371485502320280176" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{5C5E8634-F6CE-4A8E-A620-498E516ECA2A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{F3EFFD1A-2614-4ABC-95C3-70C795AC1B30}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{017C8942-5701-44D8-A737-8EA18552E1C0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4610680675809" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(FunctionDefinitionNode)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionDefinitionNode" field="element" version="1" type="{4EE28D9F-67FB-4E61-B777-5DC5B059710F}">
+												<Class name="Nodeling" field="BaseClass1" version="1" type="{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="13940460933427889908" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{D8F8145C-CF4A-4937-A215-5F799D95DF97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisallowReentrantExecutionContract" field="element" type="{8B476D16-D11C-4274-BE61-FA9B34BF54A3}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{BCC71E68-A438-4621-80C3-EB0BAC016A40}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="DisplayGroupConnectedSlotLimitContract" field="element" type="{71E55CC5-6212-48C2-973E-1AC9E20A4481}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																			<Class name="unsigned int" field="limit" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZStd::string" field="displayGroup" value="NodelingSlotDisplayGroup" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																			<Class name="AZStd::string" field="errorMessage" value="Execution nodes can only be connected to either the Input or Output, and not both at the same time." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value=" " type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="3992535411" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_displayName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZ::Uuid" field="m_identifier" value="{07377CE7-1027-4BB7-95EC-09E72CF1A084}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="bool" field="m_isExecutionEntry" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::vector" field="m_connections" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4614975643105" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Is Equal to 0:  ), destEndpoint=(Equal To (==): In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="13613892843389619079" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4593500806625" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{62BC9B1C-5890-4B3D-9A4C-C29F2360077D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{9D51F77C-6A24-4FCD-9D0F-DAB0048931F0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4619270610401" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Is Equal to 0: Value), destEndpoint=(Equal To (==): Value A)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="7920625701362617973" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4593500806625" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3FBD6FFE-3376-4A91-9C9A-F266521B34C6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3E48519D-3FA3-4807-87BF-0EF9452237E2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4623565577697" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): True), destEndpoint=(Print: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="7840551042612259224" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A3D30613-0A91-46B5-BAC3-655A22C08FAC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4602090741217" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4627860544993" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): False), destEndpoint=(Print: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="8525823719174861735" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{124BD3C0-DF57-4FC9-A345-637A116AC1A8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4589205839329" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{33F8E2FF-363F-4C6A-98A5-09C1AEA7BC63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4632155512289" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): Result), destEndpoint=(Print: Value)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="16701878847168166017" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1D797ECA-9A5F-4E2D-BA91-7CF0D3644ED4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4602090741217" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4636450479585" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Equal To (==): Result), destEndpoint=(Print: Value)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="4282214504303842192" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1D797ECA-9A5F-4E2D-BA91-7CF0D3644ED4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4589205839329" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{4BFD8E55-59F3-410B-B8FA-E7ED2D64E769}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4640745446881" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Print: Out), destEndpoint=(Print : Out:  )" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="1706253599102218136" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4602090741217" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4610680675809" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{D8F8145C-CF4A-4937-A215-5F799D95DF97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="4645040414177" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Print: Out), destEndpoint=(Print : Out:  )" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="14360685366172895450" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4589205839329" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{2E0CEE71-7C2D-43A1-8CC3-B0CE1B416DE0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="4606385708513" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{5C5E8634-F6CE-4A8E-A620-498E516ECA2A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::unordered_map" field="m_dependentAssets" type="{1BC78FA9-1D82-5F17-BD28-C35D1F4FA737}"/>
+								<Class name="AZStd::vector" field="m_scriptEventAssets" type="{479100D9-6931-5E23-8494-5A28EF2FCD8A}"/>
+							</Class>
+							<Class name="unsigned char" field="executionMode" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+							<Class name="AZ::Uuid" field="m_assetType" value="{3E2AC8CD-713F-453E-967F-29517F331784}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							<Class name="bool" field="isFunctionGraph" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+							<Class name="SlotId" field="versionData" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+								<Class name="AZ::Uuid" field="m_id" value="{01000000-0100-0000-FD7F-0000E079C694}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							</Class>
+						</Class>
+						<Class name="unsigned int" field="m_variableCounter" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+						<Class name="bool" field="m_saveFormatConverted" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+						<Class name="AZStd::unordered_map" field="GraphCanvasData" type="{0005D26C-B35A-5C30-B60C-5716482946CB}">
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="4602090741217" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="680.0000000 0.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{79DFFF86-F059-48EB-B6BC-18B76D33EB5C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="4593500806625" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="140.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{10AC54C4-C293-47C4-86AA-5EC03594D80D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="4589205839329" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{8DB01DDF-13A3-4574-B163-49565111322D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="720.0000000 340.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="4597795773921" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="320.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MathNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{C557514B-501B-42E6-8AE1-F2D64641B0FE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="4610680675809" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="980.0000000 0.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{2D7FDDEC-C492-469F-BD14-E94725E6C2EA}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="4584910872033" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{5F84B500-8C45-40D1-8EFC-A5306B241444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="SceneComponentSaveData" field="value2" version="3" type="{5F84B500-8C45-40D1-8EFC-A5306B241444}">
+												<Class name="AZStd::vector" field="Constructs" type="{60BF495A-9BEF-5429-836B-37ADEA39CEA0}"/>
+												<Class name="ViewParams" field="ViewParams" version="1" type="{D016BF86-DFBB-4AF0-AD26-27F6AB737740}">
+													<Class name="double" field="Scale" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+													<Class name="float" field="AnchorX" value="-70.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+													<Class name="float" field="AnchorY" value="-92.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+												</Class>
+												<Class name="unsigned int" field="BookmarkCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="4606385708513" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1020.0000000 340.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".nodeling" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="NodelingTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{1C921028-F4D7-4D2F-91A0-9A909EF04387}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="AZStd::unordered_map" field="CRCCacheMap" type="{2376BDB0-D7B6-586B-A603-42BE703EB2C9}"/>
+						<Class name="GraphStatisticsHelper" field="StatisticsHelper" version="1" type="{7D5B7A65-F749-493E-BA5C-6B8724791F03}">
+							<Class name="AZStd::unordered_map" field="InstanceCounter" type="{9EC84E0A-F296-5212-8B69-4DE48E695D61}">
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="7011818094993955847" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="10684225535275896474" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="3117476785392655547" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="int" field="GraphCanvasSaveVersion" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+					</Class>
+					<Class name="EditorGraphVariableManagerComponent" field="element" type="{86B7CC96-9830-4BD1-85C3-0C0BD0BFBEE7}">
+						<Class name="GraphVariableManagerComponent" field="BaseClass1" version="3" type="{825DC28D-667D-43D0-AF11-73681351DD2F}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="13229830129540693674" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="VariableData" field="m_variableData" version="3" type="{4F80659A-CD11-424E-BF04-AF02ABAC06B0}">
+								<Class name="AZStd::unordered_map" field="m_nameVariableMap" type="{6C3A5734-6C27-5033-B033-D5CAD11DE55A}">
+									<Class name="AZStd::pair" field="element" type="{E64D2110-EB38-5AE1-9B1D-3C06A10C7D6A}">
+										<Class name="VariableId" field="value1" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+											<Class name="AZ::Uuid" field="m_id" value="{2195BC05-1098-4A0E-9FCA-A40B123BA4CF}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+										</Class>
+										<Class name="GraphVariable" field="value2" version="4" type="{5BDC128B-8355-479C-8FA8-4BFFAB6915A8}">
+											<Class name="Datum" field="Datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+												<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+													<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+													<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+												</Class>
+												<Class name="AZStd::string" field="m_datumLabel" value="Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+											<Class name="Crc32" field="InputControlVisibility" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+												<Class name="unsigned int" field="Value" value="2755429085" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+											<Class name="AZStd::string" field="ExposureCategory" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="int" field="SortPriority" value="-1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+											<Class name="ReplicaNetworkProperties" field="ReplicaNetProps" version="1" type="{4F055551-DD75-4877-93CE-E80C844FC155}">
+												<Class name="bool" field="m_isSynchronized" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+											<Class name="VariableId" field="VariableId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+												<Class name="AZ::Uuid" field="m_id" value="{2195BC05-1098-4A0E-9FCA-A40B123BA4CF}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+											<Class name="AZStd::string" field="VariableName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="unsigned char" field="Scope" value="2" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+											<Class name="unsigned char" field="InitialValueSource" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::unordered_map" field="CopiedVariableRemapping" type="{723F81A5-0980-50C7-8B1F-BE646339362B}"/>
+						</Class>
+					</Class>
+				</Class>
+				<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_StringSanitization.scriptcanvas b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_StringSanitization.scriptcanvas
new file mode 100644
index 0000000000..c5bef2768b
--- /dev/null
+++ b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_StringSanitization.scriptcanvas
@@ -0,0 +1,1461 @@
+<ObjectStream version="3">
+	<Class name="ScriptCanvasData" version="4" type="{1072E894-0C67-4091-8B64-F7DB324AD13C}">
+		<Class name="AZStd::unique_ptr" field="m_scriptCanvas" type="{8FFB6D85-994F-5262-BA1C-D0082A7F65C5}">
+			<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+				<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+					<Class name="AZ::u64" field="id" value="12354726570129" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+				</Class>
+				<Class name="AZStd::string" field="Name" value="LY_SC_UnitTest_StringSanitization" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+					<Class name="Graph" field="element" version="8" type="{4D755CA9-AB92-462C-B24F-0B3376F19967}">
+						<Class name="Graph" field="BaseClass1" version="17" type="{C3267D77-EEDC-490E-9E42-F1D1F473E184}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="15802369769268761052" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="GraphData" field="m_graphData" version="4" type="{ADCB5EB5-8D3F-42ED-8F65-EAB58A82C381}">
+								<Class name="AZStd::unordered_set" field="m_nodes" type="{27BF7BD3-6E17-5619-9363-3FC3D9A5369D}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12359021537425" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Start)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Start" field="element" version="2" type="{F200B22A-5903-483A-BF63-5241BC03632B}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="7242070952992549413" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{3A1D0283-A78C-4B90-B84E-24B3A6D76178}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="Signaled when the entity that owns this graph is fully activated." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12363316504721" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Format)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Format" field="element" type="{B16259BA-9CF6-4143-B09B-5A0F3B4585E6}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="15004591359969743609" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{15DEA7F6-8138-44BD-821A-9E09043C1A54}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{28F8E16A-43CE-4A73-AAE8-12F83D0DC182}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{6AD1ABC4-853C-4119-B8F1-6E7109272DAC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="3" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Value which replaces instances of {Value} in the resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{E1CC6BDE-8BA3-4BDD-B966-66358AB97816}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{38EA7EAF-BE7D-4F85-9802-2871F1CD52A1}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="String" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="The resulting string." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="1015031923" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value='"""\"&apos;&apos;&apos;\\\"""%%%%{Value}"""\"&apos;&apos;&apos;\\\"""%%%%' type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}">
+														<Class name="AZStd::pair" field="element" type="{F7CB29A1-551D-5BAD-9B38-B2279A75B957}">
+															<Class name="AZ::u64" field="value1" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{6AD1ABC4-853C-4119-B8F1-6E7109272DAC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value='"""\"&apos;&apos;&apos;\\\"""%%%%' type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value='"""\"&apos;&apos;&apos;\\\"""%%%%' type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}">
+														<Class name="AZStd::pair" field="element" type="{A17FF4ED-B460-5612-99F4-90D2832CF8F5}">
+															<Class name="AZStd::string" field="value1" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="SlotId" field="value2" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{6AD1ABC4-853C-4119-B8F1-6E7109272DAC}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+														</Class>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12367611472017" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Print)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Print" field="element" type="{E1940FB4-83FE-4594-9AFF-375FF7603338}">
+												<Class name="StringFormatted" field="BaseClass1" version="1" type="{0B1577E0-339D-4573-93D1-6C311AD12A13}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="3539910433248362917" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{78D3AD1F-5A3C-4D6D-93FD-4F1289989C00}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="Input signal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{25EB0227-0C38-44F0-B94E-5C138BD59EFB}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="AZStd::string" field="m_format" value="]]]=]]==]]]===]]]]====]]=====]]======]]" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="int" field="m_numericPrecision" value="4" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::map" field="m_arrayBindingMap" type="{B3879B66-F836-5380-B4C8-4D519373E77E}"/>
+													<Class name="AZStd::vector" field="m_unresolvedString" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="]]]=]]==]]]===]]]]====]]=====]]======]]" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="AZStd::map" field="m_formatSlotMap" type="{8E9FB38C-2A95-5DC6-B051-90FF0BA8567F}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12371906439313" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Mark Complete)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Method" field="element" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="5146440622871067566" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{31A90BAA-7510-4595-9507-C1BD9103CCCF}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="EntityID: 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{8EF5BB20-1C4C-42C1-A0C7-2151D0AB3BDE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="additional notes for the test report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{B4504B01-E3D4-4416-9561-C709239277BB}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{7E97C9DA-07A9-4ED4-80F0-0BE56AF7D03C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="EntityId" field="m_data" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+																	<Class name="AZ::u64" field="id" value="4276206253" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+													</Class>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="AZStd::string" field="methodName" value="Mark Complete" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												<Class name="AZStd::string" field="className" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+												<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::string" field="prettyClassName" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12376201406609" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Expect Equal)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="MethodOverloaded" field="element" version="6" type="{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}">
+												<Class name="Method" field="BaseClass1" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+													<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+														<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+															<Class name="AZ::u64" field="Id" value="11366363384879948079" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+														</Class>
+														<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{FC0BF779-170B-4C4F-AB60-3D7751858A7D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="EntityID: 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{57AD1F7F-57DB-4FC0-A6F7-216C0B61E952}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="left of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{1672A7C1-68D0-4CF0-A164-52C8EF59CA54}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="OverloadContract" field="element" type="{45622160-13C5-46E3-94D9-AE2EAFE6AC64}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="right of ==" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{98E0C3C8-5BEA-4C26-ADE3-1EB038138548}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="additional notes for the test report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{11095CDA-CCFB-4DA0-A388-CFF53E78794A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+															<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+																<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																	<Class name="AZ::Uuid" field="m_id" value="{91CC6708-DABC-4C84-8922-FB64221EC69E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																	<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																		<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																			<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																		</Class>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																	<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																	<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																</Class>
+																<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																	<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																</Class>
+																<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																	<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															</Class>
+														</Class>
+														<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="EntityId" field="m_data" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+																		<Class name="AZ::u64" field="id" value="4276206253" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Candidate" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::string" field="m_data" value='"""\"&apos;&apos;&apos;\\\"""%%%%Hello"""\"&apos;&apos;&apos;\\\"""%%%%' type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Reference" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																	<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																	<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																	<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																</Class>
+																<Class name="AZStd::string" field="m_datumLabel" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+														</Class>
+														<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													</Class>
+													<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+													<Class name="AZStd::string" field="methodName" value="Expect Equal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="className" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+													<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+														<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+															<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::string" field="prettyClassName" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::vector" field="orderedInputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{FC0BF779-170B-4C4F-AB60-3D7751858A7D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{57AD1F7F-57DB-4FC0-A6F7-216C0B61E952}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{1672A7C1-68D0-4CF0-A164-52C8EF59CA54}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{98E0C3C8-5BEA-4C26-ADE3-1EB038138548}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::vector" field="outputSlotIds" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::vector" field="m_connections" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12380496373905" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(On Graph Start: Out), destEndpoint=(Build String: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="15986016479001353655" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12359021537425" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{3A1D0283-A78C-4B90-B84E-24B3A6D76178}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12363316504721" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{15DEA7F6-8138-44BD-821A-9E09043C1A54}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12384791341201" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Build String: Out), destEndpoint=(Print: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="15932153669720143727" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12363316504721" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{28F8E16A-43CE-4A73-AAE8-12F83D0DC182}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12367611472017" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{78D3AD1F-5A3C-4D6D-93FD-4F1289989C00}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12389086308497" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Print: Out), destEndpoint=(Expect Equal: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="4061681365829311212" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12367611472017" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{25EB0227-0C38-44F0-B94E-5C138BD59EFB}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12376201406609" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{11095CDA-CCFB-4DA0-A388-CFF53E78794A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12393381275793" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Build String: String), destEndpoint=(Expect Equal: Candidate)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="5703482879812716455" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12363316504721" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{38EA7EAF-BE7D-4F85-9802-2871F1CD52A1}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12376201406609" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{57AD1F7F-57DB-4FC0-A6F7-216C0B61E952}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="12397676243089" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Expect Equal: Out), destEndpoint=(Mark Complete: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="17328479901628010532" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12376201406609" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{91CC6708-DABC-4C84-8922-FB64221EC69E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="12371906439313" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{B4504B01-E3D4-4416-9561-C709239277BB}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::unordered_map" field="m_dependentAssets" type="{1BC78FA9-1D82-5F17-BD28-C35D1F4FA737}"/>
+								<Class name="AZStd::vector" field="m_scriptEventAssets" type="{479100D9-6931-5E23-8494-5A28EF2FCD8A}"/>
+							</Class>
+							<Class name="unsigned char" field="executionMode" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+							<Class name="AZ::Uuid" field="m_assetType" value="{3E2AC8CD-713F-453E-967F-29517F331784}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							<Class name="bool" field="isFunctionGraph" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+							<Class name="SlotId" field="versionData" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+								<Class name="AZ::Uuid" field="m_id" value="{01000000-0100-0000-2FBA-3E2A50023525}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							</Class>
+						</Class>
+						<Class name="unsigned int" field="m_variableCounter" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+						<Class name="bool" field="m_saveFormatConverted" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+						<Class name="AZStd::unordered_map" field="GraphCanvasData" type="{0005D26C-B35A-5C30-B60C-5716482946CB}">
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="12376201406609" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{A1D2F555-FAB2-471E-A2D4-851C45507342}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="720.0000000 480.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="12363316504721" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="100.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{55FE24C3-61A4-41DC-BA8E-ED8C07E19ECE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="12371906439313" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1160.0000000 440.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{CEB10AC8-0E62-4693-AFCC-8E52531E0F27}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="12367611472017" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{9E910177-D74A-4972-9A37-FCE286D869AB}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="StringNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="600.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="12359021537425" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="-100.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="TimeNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{398A4C8D-CA85-4E23-BE11-3E2C26DCFC83}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="12354726570129" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{5F84B500-8C45-40D1-8EFC-A5306B241444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="SceneComponentSaveData" field="value2" version="3" type="{5F84B500-8C45-40D1-8EFC-A5306B241444}">
+												<Class name="AZStd::vector" field="Constructs" type="{60BF495A-9BEF-5429-836B-37ADEA39CEA0}"/>
+												<Class name="ViewParams" field="ViewParams" version="1" type="{D016BF86-DFBB-4AF0-AD26-27F6AB737740}">
+													<Class name="double" field="Scale" value="1.5664829" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+													<Class name="float" field="AnchorX" value="235.5595398" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+													<Class name="float" field="AnchorY" value="121.2908249" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+												</Class>
+												<Class name="unsigned int" field="BookmarkCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="AZStd::unordered_map" field="CRCCacheMap" type="{2376BDB0-D7B6-586B-A603-42BE703EB2C9}"/>
+						<Class name="GraphStatisticsHelper" field="StatisticsHelper" version="1" type="{7D5B7A65-F749-493E-BA5C-6B8724791F03}">
+							<Class name="AZStd::unordered_map" field="InstanceCounter" type="{9EC84E0A-F296-5212-8B69-4DE48E695D61}">
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4053150093067829293" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4846425829683551338" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="6840657073857873079" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="10684225535275896474" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4199610336680704683" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="int" field="GraphCanvasSaveVersion" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+					</Class>
+					<Class name="EditorGraphVariableManagerComponent" field="element" type="{86B7CC96-9830-4BD1-85C3-0C0BD0BFBEE7}">
+						<Class name="GraphVariableManagerComponent" field="BaseClass1" version="3" type="{825DC28D-667D-43D0-AF11-73681351DD2F}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="72352056369386975" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="VariableData" field="m_variableData" version="3" type="{4F80659A-CD11-424E-BF04-AF02ABAC06B0}">
+								<Class name="AZStd::unordered_map" field="m_nameVariableMap" type="{6C3A5734-6C27-5033-B033-D5CAD11DE55A}">
+									<Class name="AZStd::pair" field="element" type="{E64D2110-EB38-5AE1-9B1D-3C06A10C7D6A}">
+										<Class name="VariableId" field="value1" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+											<Class name="AZ::Uuid" field="m_id" value="{E1CC6BDE-8BA3-4BDD-B966-66358AB97816}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+										</Class>
+										<Class name="GraphVariable" field="value2" version="4" type="{5BDC128B-8355-479C-8FA8-4BFFAB6915A8}">
+											<Class name="Datum" field="Datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+												<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+													<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												</Class>
+												<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+													<Class name="AZStd::string" field="m_data" value="Hello" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												</Class>
+												<Class name="AZStd::string" field="m_datumLabel" value="Hello" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+											<Class name="Crc32" field="InputControlVisibility" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+												<Class name="unsigned int" field="Value" value="2755429085" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+											<Class name="AZStd::string" field="ExposureCategory" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="int" field="SortPriority" value="-1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+											<Class name="ReplicaNetworkProperties" field="ReplicaNetProps" version="1" type="{4F055551-DD75-4877-93CE-E80C844FC155}">
+												<Class name="bool" field="m_isSynchronized" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+											<Class name="VariableId" field="VariableId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+												<Class name="AZ::Uuid" field="m_id" value="{E1CC6BDE-8BA3-4BDD-B966-66358AB97816}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+											<Class name="AZStd::string" field="VariableName" value="Hello" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="unsigned char" field="Scope" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+											<Class name="unsigned char" field="InitialValueSource" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::unordered_map" field="CopiedVariableRemapping" type="{723F81A5-0980-50C7-8B1F-BE646339362B}"/>
+						</Class>
+					</Class>
+				</Class>
+				<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_UserBranchSanityCheck.scriptcanvas b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_UserBranchSanityCheck.scriptcanvas
new file mode 100644
index 0000000000..d8d26dbdbb
--- /dev/null
+++ b/Gems/ScriptCanvasTesting/Assets/ScriptCanvas/UnitTests/LY_SC_UnitTest_UserBranchSanityCheck.scriptcanvas
@@ -0,0 +1,1248 @@
+<ObjectStream version="3">
+	<Class name="ScriptCanvasData" version="4" type="{1072E894-0C67-4091-8B64-F7DB324AD13C}">
+		<Class name="AZStd::unique_ptr" field="m_scriptCanvas" type="{8FFB6D85-994F-5262-BA1C-D0082A7F65C5}">
+			<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+				<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+					<Class name="AZ::u64" field="id" value="11148354158821" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+				</Class>
+				<Class name="AZStd::string" field="Name" value="LY_SC_UnitTest_UserBranchSanityCheck" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+					<Class name="Graph" field="element" version="8" type="{4D755CA9-AB92-462C-B24F-0B3376F19967}">
+						<Class name="Graph" field="BaseClass1" version="17" type="{C3267D77-EEDC-490E-9E42-F1D1F473E184}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="10409069444039114457" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="GraphData" field="m_graphData" version="4" type="{ADCB5EB5-8D3F-42ED-8F65-EAB58A82C381}">
+								<Class name="AZStd::unordered_set" field="m_nodes" type="{27BF7BD3-6E17-5619-9363-3FC3D9A5369D}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="11152649126117" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Mark Complete)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Method" field="element" version="5" type="{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="14019768888511661167" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{47D25662-04FF-46C8-93AF-1884D1BE004A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="EntityID: 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{A9B89895-DF95-4BD6-B25F-D9347D8481CD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="additional notes for the test report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{C15FFF5B-D2F3-4163-9D6C-F794C2C0FD02}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="In" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{5A3EA962-8FD6-4C47-B2BD-C7B0E9B29F15}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="EntityId" field="m_data" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+																	<Class name="AZ::u64" field="id" value="4276206253" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="AZStd::string" field="m_data" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="Report" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+													</Class>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="int" field="methodType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												<Class name="AZStd::string" field="methodName" value="Mark Complete" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												<Class name="AZStd::string" field="className" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												<Class name="AZStd::vector" field="namespaces" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}"/>
+												<Class name="AZStd::vector" field="resultSlotIDs" type="{D0B13803-101B-54D8-914C-0DA49FDFA268}">
+													<Class name="SlotId" field="element" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="AZStd::string" field="prettyClassName" value="Unit Testing" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="11156944093413" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="SC-Node(Start)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Start" field="element" version="2" type="{F200B22A-5903-483A-BF63-5241BC03632B}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="5092228561330169545" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{568C93C9-04D2-49FB-8D93-E044892351CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Out" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="Signaled when the entity that owns this graph is fully activated." type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}"/>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="11161239060709" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="FunctionCallNode" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionCallNode" field="element" version="6" type="{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="15452656825033611682" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{FC89DF24-CC8A-4344-BA29-DBE33A298295}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Is Equal to 1" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2538009995" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{816A68C3-F885-4268-8F5B-D2D459B028BE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2538009995" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{BA99CEA5-3CAA-4FFA-860E-4D3B75BB2C77}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2538009995" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{A671A66F-4C10-4C2F-BC0F-40912F68724E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="2538009995" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+													</Class>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="AZ::Uuid" field="m_sourceId" value="{9C648BF3-FD7F-0000-8C46-2ECA30FC71AD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												<Class name="Asset" field="m_asset" value="id={0D0A8CAF-9DAD-56D0-A022-59CBD55B2852}:dfe6dc72,type={E22967AC-7673-4778-9125-AF49D82CAF9F},hint={scriptcanvas/unittests/ly_sc_unittest_isonefunction.scriptcanvas_fn_compiled},loadBehavior=2" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
+												<Class name="Map" field="m_slotExecutionMap" version="1" type="{BAA81EAF-E35A-4F19-B73A-699B91DB113C}">
+													<Class name="AZStd::vector" field="ins" type="{733E7AAD-19AD-5FAE-A634-B3B6EB0D3ED3}">
+														<Class name="In" field="element" version="1" type="{4AAAEB0B-6367-46E5-B05D-E76EF884E16F}">
+															<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{FC89DF24-CC8A-4344-BA29-DBE33A298295}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="AZStd::vector" field="_inputs" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}">
+																<Class name="Input" field="element" type="{4E52A04D-C9FC-477F-8065-35F96A972CD6}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{816A68C3-F885-4268-8F5B-D2D459B028BE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="VariableId" field="_interfaceSourceId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																		<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::vector" field="_outs" type="{5970B601-529F-5E37-99F2-942F34360771}">
+																<Class name="Out" field="element" version="1" type="{DD3D2547-868C-40DF-A37C-F60BE06FFFBA}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{BA99CEA5-3CAA-4FFA-860E-4D3B75BB2C77}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="AZStd::string" field="_name" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="_outputs" type="{275A1212-6B40-5045-BA6D-39FF976D6634}"/>
+																	<Class name="Return" field="_returnValues" version="1" type="{8CD09346-BF99-4B34-91EA-C553549F7639}">
+																		<Class name="AZStd::vector" field="_values" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+																	</Class>
+																	<Class name="AZ::Uuid" field="_interfaceSourceId" value="{07377CE7-1027-4BB7-95EC-09E72CF1A084}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Out" field="element" version="1" type="{DD3D2547-868C-40DF-A37C-F60BE06FFFBA}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{A671A66F-4C10-4C2F-BC0F-40912F68724E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="AZStd::string" field="_name" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="_outputs" type="{275A1212-6B40-5045-BA6D-39FF976D6634}"/>
+																	<Class name="Return" field="_returnValues" version="1" type="{8CD09346-BF99-4B34-91EA-C553549F7639}">
+																		<Class name="AZStd::vector" field="_values" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+																	</Class>
+																	<Class name="AZ::Uuid" field="_interfaceSourceId" value="{017C8942-5701-44D8-A737-8EA18552E1C0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="_parsedName" value="IsEqualto1_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZ::Uuid" field="_interfaceSourceId" value="{7DA9A117-E49B-46C2-BED4-F9F5BC6BD9E5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{5970B601-529F-5E37-99F2-942F34360771}"/>
+												</Class>
+												<Class name="SubgraphInterface" field="m_slotExecutionMapSourceInterface" version="7" type="{52B27A11-8294-4A6F-BFCF-6C1582649DB2}">
+													<Class name="bool" field="areAllChildrenPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="hasOnGraphStart" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="isActiveDefaultObject" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="AZStd::vector" field="ins" type="{16DA1AFC-705E-559D-8CF0-2E939187BB4B}">
+														<Class name="In" field="element" version="1" type="{DFDA32F7-41D2-45BB-8ADF-876679053836}">
+															<Class name="AZStd::string" field="displayName" value="Is Equal to 1" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="parsedName" value="IsEqualto1_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::vector" field="inputs" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}">
+																<Class name="Input" field="element" type="{627448C3-D018-422E-B133-A1169BB44306}">
+																	<Class name="AZStd::string" field="displayName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="Value_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="Datum" field="datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																		<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																			<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																		</Class>
+																		<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	</Class>
+																	<Class name="VariableId" field="sourceID" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																		<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::vector" field="outs" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}">
+																<Class name="Out" field="element" version="1" type="{6175D897-C06D-48B5-8775-388B232D429D}">
+																	<Class name="AZStd::string" field="displayName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="outputs" type="{5457916A-40A0-5DF0-9742-1DEECFEE5C48}"/>
+																	<Class name="AZStd::vector" field="returnValues" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+																	<Class name="AZ::Uuid" field="sourceID" value="{07377CE7-1027-4BB7-95EC-09E72CF1A084}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Out" field="element" version="1" type="{6175D897-C06D-48B5-8775-388B232D429D}">
+																	<Class name="AZStd::string" field="displayName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="outputs" type="{5457916A-40A0-5DF0-9742-1DEECFEE5C48}"/>
+																	<Class name="AZStd::vector" field="returnValues" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+																	<Class name="AZ::Uuid" field="sourceID" value="{017C8942-5701-44D8-A737-8EA18552E1C0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="bool" field="isPure" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="AZ::Uuid" field="sourceID" value="{7DA9A117-E49B-46C2-BED4-F9F5BC6BD9E5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}"/>
+													<Class name="AZStd::vector" field="outKeys" type="{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}">
+														<Class name="Crc32" field="element" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+															<Class name="unsigned int" field="Value" value="4261170317" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+														</Class>
+														<Class name="Crc32" field="element" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+															<Class name="unsigned int" field="Value" value="734881840" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="namespacePath" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="scriptcanvas" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="unittests" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="ly_sc_unittest_isonefunction_VM" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="unsigned int" field="executionCharacteristics" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="bool" field="requiresConstructionParameters" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="requiresConstructionParametersForDependencies" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="11165534028005" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="FunctionCallNode" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="FunctionCallNode" field="element" version="6" type="{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}">
+												<Class name="Node" field="BaseClass1" version="14" type="{52B454AE-FA7E-4FE9-87D3-A1CAB235C691}">
+													<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+														<Class name="AZ::u64" field="Id" value="14784556468833030954" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="AZStd::list" field="Slots" type="{E01B3091-9B44-571A-A87B-7D0E2768D774}">
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{CDF46D57-EA31-48F9-BB5D-BF4669DFFAA0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Is Equal to 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="3762406685" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{9CD13D64-0F8B-4C48-A59B-F7BED9E900E9}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="ExclusivePureDataContract" field="element" type="{E48A0B26-B6B7-4AF3-9341-9E5C5C1F0DE8}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="3762406685" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{80D8B5F1-01FA-4FF9-84EB-578DB17FF92B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="3762406685" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+														<Class name="Slot" field="element" version="21" type="{FBFE0F02-4C26-475F-A28B-18D3A533C13C}">
+															<Class name="bool" field="IsOverload" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="bool" field="isVisibile" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="SlotId" field="id" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{4D2453D6-EE05-42FB-9D4F-DF7D3EB21A63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="DynamicTypeOverride" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="AZStd::vector" field="contracts" type="{C87136AF-3259-590C-9519-D1C4C75F1C86}">
+																<Class name="AZStd::unique_ptr" field="element" type="{75F9EC0D-D8D6-5410-BD79-960E22076B03}">
+																	<Class name="SlotTypeContract" field="element" type="{084B4F2A-AB34-4931-9269-E3614FC1CDFA}">
+																		<Class name="Contract" field="BaseClass1" type="{93846E60-BD7E-438A-B970-5C4AA591CF93}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="slotName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="toolTip" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="Type" field="DisplayDataType" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="Crc32" field="DisplayGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="3762406685" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="SlotDescriptor" field="Descriptor" version="1" type="{FBF1C3A7-AA74-420F-BBE4-29F78D6EA262}">
+																<Class name="int" field="ConnectionType" value="2" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																<Class name="int" field="SlotType" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															</Class>
+															<Class name="bool" field="IsLatent" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Crc32" field="DynamicGroup" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+																<Class name="unsigned int" field="Value" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+															</Class>
+															<Class name="int" field="DataType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="bool" field="IsReference" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="VariableId" field="VariableReference" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="bool" field="IsUserAdded" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::list" field="Datums" type="{36259B04-FAAB-5E8A-B7BF-A5E2EA5A9B3A}">
+														<Class name="Datum" field="element" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+															<Class name="bool" field="m_isUntypedStorage" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+															<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+															</Class>
+															<Class name="AZStd::string" field="m_datumLabel" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														</Class>
+													</Class>
+													<Class name="int" field="NodeDisabledFlag" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+												</Class>
+												<Class name="AZ::Uuid" field="m_sourceId" value="{E0649912-FE7F-0000-8C46-2ECA30FC71AD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+												<Class name="Asset" field="m_asset" value="id={E302C9BE-B05A-50E1-BAB0-30F2A87098C6}:dfe6dc72,type={E22967AC-7673-4778-9125-AF49D82CAF9F},hint={scriptcanvas/unittests/ly_sc_unittest_iszerofunction.scriptcanvas_fn_compiled},loadBehavior=2" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
+												<Class name="Map" field="m_slotExecutionMap" version="1" type="{BAA81EAF-E35A-4F19-B73A-699B91DB113C}">
+													<Class name="AZStd::vector" field="ins" type="{733E7AAD-19AD-5FAE-A634-B3B6EB0D3ED3}">
+														<Class name="In" field="element" version="1" type="{4AAAEB0B-6367-46E5-B05D-E76EF884E16F}">
+															<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																<Class name="AZ::Uuid" field="m_id" value="{CDF46D57-EA31-48F9-BB5D-BF4669DFFAA0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+															</Class>
+															<Class name="AZStd::vector" field="_inputs" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}">
+																<Class name="Input" field="element" type="{4E52A04D-C9FC-477F-8065-35F96A972CD6}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{9CD13D64-0F8B-4C48-A59B-F7BED9E900E9}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="VariableId" field="_interfaceSourceId" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																		<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::vector" field="_outs" type="{5970B601-529F-5E37-99F2-942F34360771}">
+																<Class name="Out" field="element" version="1" type="{DD3D2547-868C-40DF-A37C-F60BE06FFFBA}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{80D8B5F1-01FA-4FF9-84EB-578DB17FF92B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="AZStd::string" field="_name" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="_outputs" type="{275A1212-6B40-5045-BA6D-39FF976D6634}"/>
+																	<Class name="Return" field="_returnValues" version="1" type="{8CD09346-BF99-4B34-91EA-C553549F7639}">
+																		<Class name="AZStd::vector" field="_values" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+																	</Class>
+																	<Class name="AZ::Uuid" field="_interfaceSourceId" value="{07377CE7-1027-4BB7-95EC-09E72CF1A084}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Out" field="element" version="1" type="{DD3D2547-868C-40DF-A37C-F60BE06FFFBA}">
+																	<Class name="SlotId" field="_slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+																		<Class name="AZ::Uuid" field="m_id" value="{4D2453D6-EE05-42FB-9D4F-DF7D3EB21A63}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																	<Class name="AZStd::string" field="_name" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="_outputs" type="{275A1212-6B40-5045-BA6D-39FF976D6634}"/>
+																	<Class name="Return" field="_returnValues" version="1" type="{8CD09346-BF99-4B34-91EA-C553549F7639}">
+																		<Class name="AZStd::vector" field="_values" type="{ED971363-ECC9-5B7D-A9E7-C70BEF283BC0}"/>
+																	</Class>
+																	<Class name="AZ::Uuid" field="_interfaceSourceId" value="{017C8942-5701-44D8-A737-8EA18552E1C0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="AZStd::string" field="_parsedName" value="IsEqualto0_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZ::Uuid" field="_interfaceSourceId" value="{7DA9A117-E49B-46C2-BED4-F9F5BC6BD9E5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{5970B601-529F-5E37-99F2-942F34360771}"/>
+												</Class>
+												<Class name="SubgraphInterface" field="m_slotExecutionMapSourceInterface" version="7" type="{52B27A11-8294-4A6F-BFCF-6C1582649DB2}">
+													<Class name="bool" field="areAllChildrenPure" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="hasOnGraphStart" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="isActiveDefaultObject" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="AZStd::vector" field="ins" type="{16DA1AFC-705E-559D-8CF0-2E939187BB4B}">
+														<Class name="In" field="element" version="1" type="{DFDA32F7-41D2-45BB-8ADF-876679053836}">
+															<Class name="AZStd::string" field="displayName" value="Is Equal to 0" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::string" field="parsedName" value="IsEqualto0_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+															<Class name="AZStd::vector" field="inputs" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}">
+																<Class name="Input" field="element" type="{627448C3-D018-422E-B133-A1169BB44306}">
+																	<Class name="AZStd::string" field="displayName" value="Value" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="Value_scvm" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="Datum" field="datum" version="6" type="{8B836FC0-98A8-4A81-8651-35C7CA125451}">
+																		<Class name="bool" field="m_isUntypedStorage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+																		<Class name="Type" field="m_type" version="2" type="{0EADF8F5-8AB8-42E9-9C50-F5C78255C817}">
+																			<Class name="unsigned int" field="m_type" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+																			<Class name="AZ::Uuid" field="m_azType" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																		</Class>
+																		<Class name="int" field="m_originality" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+																		<Class name="any" field="m_datumStorage" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+																			<Class name="double" field="m_data" value="0.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+																		</Class>
+																		<Class name="AZStd::string" field="m_datumLabel" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	</Class>
+																	<Class name="VariableId" field="sourceID" type="{CA57A57B-E510-4C09-B952-1F43742166AE}">
+																		<Class name="AZ::Uuid" field="m_id" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																	</Class>
+																</Class>
+															</Class>
+															<Class name="AZStd::vector" field="outs" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}">
+																<Class name="Out" field="element" version="1" type="{6175D897-C06D-48B5-8775-388B232D429D}">
+																	<Class name="AZStd::string" field="displayName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="True" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="outputs" type="{5457916A-40A0-5DF0-9742-1DEECFEE5C48}"/>
+																	<Class name="AZStd::vector" field="returnValues" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+																	<Class name="AZ::Uuid" field="sourceID" value="{07377CE7-1027-4BB7-95EC-09E72CF1A084}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+																<Class name="Out" field="element" version="1" type="{6175D897-C06D-48B5-8775-388B232D429D}">
+																	<Class name="AZStd::string" field="displayName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::string" field="parsedName" value="False" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																	<Class name="AZStd::vector" field="outputs" type="{5457916A-40A0-5DF0-9742-1DEECFEE5C48}"/>
+																	<Class name="AZStd::vector" field="returnValues" type="{A7E036E1-781C-5FF3-B5E2-5F7CCA518624}"/>
+																	<Class name="AZ::Uuid" field="sourceID" value="{017C8942-5701-44D8-A737-8EA18552E1C0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+																</Class>
+															</Class>
+															<Class name="bool" field="isPure" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+															<Class name="AZ::Uuid" field="sourceID" value="{7DA9A117-E49B-46C2-BED4-F9F5BC6BD9E5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="latents" type="{CA41DC3D-DBB4-5EA5-A9AA-91EC2056766E}"/>
+													<Class name="AZStd::vector" field="outKeys" type="{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}">
+														<Class name="Crc32" field="element" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+															<Class name="unsigned int" field="Value" value="4261170317" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+														</Class>
+														<Class name="Crc32" field="element" type="{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}">
+															<Class name="unsigned int" field="Value" value="734881840" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+														</Class>
+													</Class>
+													<Class name="AZStd::vector" field="namespacePath" type="{99DAD0BC-740E-5E82-826B-8FC7968CC02C}">
+														<Class name="AZStd::string" field="element" value="ScriptCanvas" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="UnitTests" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="element" value="LY_SC_UnitTest_IsZeroFunction_VM" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													</Class>
+													<Class name="unsigned int" field="executionCharacteristics" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+													<Class name="bool" field="requiresConstructionParameters" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+													<Class name="bool" field="requiresConstructionParametersForDependencies" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::vector" field="m_connections" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="11169828995301" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(On Graph Start: Out), destEndpoint=(Function Call Node: Is Equal to 0)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="12880878295112518352" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="11156944093413" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{568C93C9-04D2-49FB-8D93-E044892351CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="11165534028005" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{CDF46D57-EA31-48F9-BB5D-BF4669DFFAA0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="11174123962597" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: True), destEndpoint=(Function Call Node: Is Equal to 1)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="3053062920809627937" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="11165534028005" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{80D8B5F1-01FA-4FF9-84EB-578DB17FF92B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="11161239060709" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{FC89DF24-CC8A-4344-BA29-DBE33A298295}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+									<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
+										<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+											<Class name="AZ::u64" field="id" value="11178418929893" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+										</Class>
+										<Class name="AZStd::string" field="Name" value="srcEndpoint=(Function Call Node: False), destEndpoint=(Mark Complete: In)" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::vector" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
+											<Class name="Connection" field="element" type="{64CA5016-E803-4AC4-9A36-BDA2C890C6EB}">
+												<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+													<Class name="AZ::u64" field="Id" value="13598630265666477575" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+												</Class>
+												<Class name="Endpoint" field="sourceEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="11161239060709" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{A671A66F-4C10-4C2F-BC0F-40912F68724E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+												<Class name="Endpoint" field="targetEndpoint" version="1" type="{91D4ADAC-56FE-4D82-B9AF-6975D21435C8}">
+													<Class name="EntityId" field="nodeId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+														<Class name="AZ::u64" field="id" value="11152649126117" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+													</Class>
+													<Class name="SlotId" field="slotId" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+														<Class name="AZ::Uuid" field="m_id" value="{C15FFF5B-D2F3-4163-9D6C-F794C2C0FD02}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+													</Class>
+												</Class>
+											</Class>
+										</Class>
+										<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+										<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+									</Class>
+								</Class>
+								<Class name="AZStd::unordered_map" field="m_dependentAssets" type="{1BC78FA9-1D82-5F17-BD28-C35D1F4FA737}"/>
+								<Class name="AZStd::vector" field="m_scriptEventAssets" type="{479100D9-6931-5E23-8494-5A28EF2FCD8A}"/>
+							</Class>
+							<Class name="unsigned char" field="executionMode" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+							<Class name="AZ::Uuid" field="m_assetType" value="{3E2AC8CD-713F-453E-967F-29517F331784}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							<Class name="bool" field="isFunctionGraph" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+							<Class name="SlotId" field="versionData" version="2" type="{14C629F6-467B-46FE-8B63-48FDFCA42175}">
+								<Class name="AZ::Uuid" field="m_id" value="{01000000-0100-0000-DA04-0000D02D6FB3}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+							</Class>
+						</Class>
+						<Class name="unsigned int" field="m_variableCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+						<Class name="bool" field="m_saveFormatConverted" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+						<Class name="AZStd::unordered_map" field="GraphCanvasData" type="{0005D26C-B35A-5C30-B60C-5716482946CB}">
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="11161239060709" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{7965A90B-459A-499C-B577-6135F57217F5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="660.0000000 180.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="11165534028005" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{9FEA9B39-EF2F-43F1-9EC6-B6D1D18DD38E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="340.0000000 180.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="11152649126117" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{7A0A8635-D65D-4B2C-BA05-B1FF6542D818}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="MethodNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value=".method" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="1020.0000000 220.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="11148354158821" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{5F84B500-8C45-40D1-8EFC-A5306B241444}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="SceneComponentSaveData" field="value2" version="3" type="{5F84B500-8C45-40D1-8EFC-A5306B241444}">
+												<Class name="AZStd::vector" field="Constructs" type="{60BF495A-9BEF-5429-836B-37ADEA39CEA0}"/>
+												<Class name="ViewParams" field="ViewParams" version="1" type="{D016BF86-DFBB-4AF0-AD26-27F6AB737740}">
+													<Class name="double" field="Scale" value="1.0000000" type="{110C4B14-11A8-4E9D-8638-5051013A56AC}"/>
+													<Class name="float" field="AnchorX" value="-31.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+													<Class name="float" field="AnchorY" value="-130.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+												</Class>
+												<Class name="unsigned int" field="BookmarkCounter" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+							<Class name="AZStd::pair" field="element" type="{22EBF919-A826-58E5-8EF6-15CA70D620BB}">
+								<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
+									<Class name="AZ::u64" field="id" value="11156944093413" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+								</Class>
+								<Class name="EntitySaveDataContainer" field="value2" version="2" type="{DCCDA882-AF72-49C3-9AAD-BA601322BFBC}">
+									<Class name="AZStd::unordered_map" field="ComponentData" type="{318313BB-1036-5630-AFC4-FCBD54818E6D}">
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="NodeSaveData" field="value2" version="1" type="{24CB38BB-1705-4EC5-8F63-B574571B4DCD}">
+												<Class name="bool" field="HideUnusedSlots" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeometrySaveData" field="value2" version="1" type="{7CC444B1-F9B3-41B5-841B-0C4F2179F111}">
+												<Class name="Vector2" field="Position" value="120.0000000 140.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="StylingComponentSaveData" field="value2" version="1" type="{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="SubStyle" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{328FF15C-C302-458F-A43D-E1794DE0904E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="GeneralNodeTitleComponentSaveData" field="value2" version="1" type="{328FF15C-C302-458F-A43D-E1794DE0904E}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZStd::string" field="PaletteOverride" value="TimeNodeTitlePalette" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											</Class>
+										</Class>
+										<Class name="AZStd::pair" field="element" type="{CE78FEBD-1B9D-5A3E-9B95-BD8DD8CCCD4B}">
+											<Class name="AZ::Uuid" field="value1" value="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											<Class name="PersistentIdComponentSaveData" field="value2" version="1" type="{B1F49A35-8408-40DA-B79E-F1E3B64322CE}">
+												<Class name="ComponentSaveData" field="BaseClass1" version="1" type="{359ACEC7-D0FA-4FC0-8B59-3755BB1A9836}"/>
+												<Class name="AZ::Uuid" field="PersistentId" value="{48C80809-1232-4B7A-8A4D-238696A5F492}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+											</Class>
+										</Class>
+									</Class>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="AZStd::unordered_map" field="CRCCacheMap" type="{2376BDB0-D7B6-586B-A603-42BE703EB2C9}"/>
+						<Class name="GraphStatisticsHelper" field="StatisticsHelper" version="1" type="{7D5B7A65-F749-493E-BA5C-6B8724791F03}">
+							<Class name="AZStd::unordered_map" field="InstanceCounter" type="{9EC84E0A-F296-5212-8B69-4DE48E695D61}">
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="6840657073857873079" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="4199610336680704683" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="7721683751185626951" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+								<Class name="AZStd::pair" field="element" type="{0CE5EF6F-834D-519F-B2EC-C2763B8BB99C}">
+									<Class name="AZ::u64" field="value1" value="790578704591500384" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+									<Class name="int" field="value2" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+								</Class>
+							</Class>
+						</Class>
+						<Class name="int" field="GraphCanvasSaveVersion" value="1" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
+					</Class>
+					<Class name="EditorGraphVariableManagerComponent" field="element" type="{86B7CC96-9830-4BD1-85C3-0C0BD0BFBEE7}">
+						<Class name="GraphVariableManagerComponent" field="BaseClass1" version="3" type="{825DC28D-667D-43D0-AF11-73681351DD2F}">
+							<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
+								<Class name="AZ::u64" field="Id" value="5145984927981759269" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
+							</Class>
+							<Class name="VariableData" field="m_variableData" version="3" type="{4F80659A-CD11-424E-BF04-AF02ABAC06B0}">
+								<Class name="AZStd::unordered_map" field="m_nameVariableMap" type="{6C3A5734-6C27-5033-B033-D5CAD11DE55A}"/>
+							</Class>
+							<Class name="AZStd::unordered_map" field="CopiedVariableRemapping" type="{723F81A5-0980-50C7-8B1F-BE646339362B}"/>
+						</Class>
+					</Class>
+				</Class>
+				<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
index cb3c9cdccb..7f026edf58 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
@@ -122,6 +122,8 @@ namespace ScriptCanvasTests
             ::Nodes::InputTypeExampleNode::Reflect(m_behaviorContext);
             ::Nodes::BranchInputTypeExampleNode::Reflect(m_serializeContext);
             ::Nodes::BranchInputTypeExampleNode::Reflect(m_behaviorContext);
+            ::Nodes::PropertyExampleNode::Reflect(m_serializeContext);
+            ::Nodes::PropertyExampleNode::Reflect(m_behaviorContext);
 
             TestNodeableObject::Reflect(m_serializeContext);
             TestNodeableObject::Reflect(m_behaviorContext);
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
index d8627c1190..b9b954b17a 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
@@ -72,7 +72,7 @@ namespace TestNodes
             {
                 editContext->Class<TestResult>("TestResult", "Development node, will be replaced by a Log node")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/TestResult.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/TestResult.png")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &TestResult::m_string, "String", "")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ;
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp
index 6a9f7fd6c3..5d8574fb10 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp
@@ -44,6 +44,7 @@ namespace ScriptCanvasTesting
         ScriptCanvas::Library::AddNodeToRegistry<NodeableTestingLibrary, ::Nodes::ReturnTypeExampleNode>(nodeRegistry);
         ScriptCanvas::Library::AddNodeToRegistry<NodeableTestingLibrary, ::Nodes::InputTypeExampleNode>(nodeRegistry);
         ScriptCanvas::Library::AddNodeToRegistry<NodeableTestingLibrary, ::Nodes::BranchInputTypeExampleNode>(nodeRegistry);
+        ScriptCanvas::Library::AddNodeToRegistry<NodeableTestingLibrary, ::Nodes::PropertyExampleNode>(nodeRegistry);
     }
 
     AZStd::vector<AZ::ComponentDescriptor*> NodeableTestingLibrary::GetComponentDescriptors()
@@ -53,7 +54,8 @@ namespace ScriptCanvasTesting
             ::Nodes::BranchMethodSharedDataSlotExampleNode::CreateDescriptor(),
             ::Nodes::ReturnTypeExampleNode::CreateDescriptor(),
             ::Nodes::InputTypeExampleNode::CreateDescriptor(),
-            ::Nodes::BranchInputTypeExampleNode::CreateDescriptor()
+            ::Nodes::BranchInputTypeExampleNode::CreateDescriptor(),
+            ::Nodes::PropertyExampleNode::CreateDescriptor()
             });
     }
 }
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.ScriptCanvasNodeable.xml b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.ScriptCanvasNodeable.xml
index c933c45b58..96a10e1ed5 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.ScriptCanvasNodeable.xml
@@ -4,7 +4,7 @@
          QualifiedName="ScriptCanvasTesting::Nodeables::InputMethodSharedDataSlotExample"
          PreferredClassName="InputMethodSharedDataSlotExample"
          Base="ScriptCanvas::Nodeable"
-         Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+         Icon="Icons/ScriptCanvas/Placeholder.png"
          Category="Tests"
          GeneratePropertyFriend="True"
          Namespace="None"
@@ -29,7 +29,7 @@
          QualifiedName="ScriptCanvasTesting::Nodeables::BranchMethodSharedDataSlotExample"
          PreferredClassName="BranchMethodSharedDataSlotExample"
          Base="ScriptCanvas::Nodeable"
-         Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+         Icon="Icons/ScriptCanvas/Placeholder.png"
          Category="Tests"
          GeneratePropertyFriend="True"
          Description="Branch Test">
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml
index 03f0af5e79..0be3c8c81a 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml
@@ -4,7 +4,7 @@
             QualifiedName="ScriptCanvasTesting::Nodeables::ReturnTypeExample"
             PreferredClassName="Return Type Example"
             Base="ScriptCanvas::Nodeable"
-            Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+            Icon="Icons/ScriptCanvas/Placeholder.png"
             Category="Tests"
             GeneratePropertyFriend="True"
             Namespace="None"
@@ -23,7 +23,7 @@
             QualifiedName="ScriptCanvasTesting::Nodeables::BranchInputTypeExample"
             PreferredClassName="Branch Input Type Example"
             Base="ScriptCanvas::Nodeable"
-            Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+            Icon="Icons/ScriptCanvas/Placeholder.png"
             Category="Tests"
             GeneratePropertyFriend="True"
             Namespace="None"
@@ -32,7 +32,7 @@
       <Return Name="Result" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;" />
     </Input>
     <Input Name="Branches On Input Type" Description="" DisplayGroup="Branches On Input Type">
-      <Parameter Name="Input Type" Type="AZStd::string" Input="True"/>
+      <Parameter Name="Input Type" Type="AZStd::string"/>
       <Branch Name="By Value" Description="" DisplayGroup="Branches On Input Type">
         <Return Name="Value Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;&amp;" DisplayGroup="Branches On Input Type"/>
       </Branch>
@@ -45,19 +45,33 @@
             QualifiedName="ScriptCanvasTesting::Nodeables::InputTypeExample"
             PreferredClassName="Input Type Example"
             Base="ScriptCanvas::Nodeable"
-            Icon="Editor/Icons/ScriptCanvas/Placeholder.png"
+            Icon="Icons/ScriptCanvas/Placeholder.png"
             Category="Tests"
             GeneratePropertyFriend="True"
             Namespace="None"
             Description="Example of passing as input by value, pointer and reference.">
     <Input Name="Clear By Value" Description="">
-      <Parameter Name="Value Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;" Input="True"/>
+      <Parameter Name="Value Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;"/>
     </Input>
     <Input Name="Clear By Pointer" Description="">
-      <Parameter Name="Pointer Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;*" Input="True"/>
+      <Parameter Name="Pointer Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;*"/>
     </Input>
     <Input Name="Clear By Reference" Description="">
-      <Parameter Name="Reference Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;&amp;" Input="True"/>
+      <Parameter Name="Reference Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;&amp;"/>
     </Input>
   </Class>
+  <Class Name="PropertyExample"
+            QualifiedName="ScriptCanvasTesting::Nodeables::PropertyExample"
+            PreferredClassName="Property Example"
+            Base="ScriptCanvas::Nodeable"
+            Icon="Icons/ScriptCanvas/Placeholder.png"
+            Category="Tests"
+            GeneratePropertyFriend="True"
+            Namespace="None"
+            Description="Example of using properties.">
+    <Input Name="In" Description=""/>
+    <Property Name="Numbers" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;"/>
+    <Property Name="Slang" Type="ScriptCanvas::Data::StringType"/>
+    <Property Name="Position" Type="ScriptCanvas::Data::Vector3Type"/>
+  </Class>
 </ScriptCanvas>
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp
index 154508d5f1..35fa1136f9 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp
@@ -66,5 +66,15 @@ namespace ScriptCanvasTesting
         {
             input.clear();
         }
+
+        void PropertyExample::In()
+        {
+            for (auto& num : Numbers)
+            {
+                AZ_TracePrintf("ScriptCanvas", "%f", num);
+            }
+
+            AZ_TracePrintf("ScriptCanvas", "Slang: %s", Slang.c_str());
+        }
     }
 }
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h
index 7bcfed8bb4..8c19e1916c 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h
@@ -48,5 +48,11 @@ namespace ScriptCanvasTesting
         {
             SCRIPTCANVAS_NODE(InputTypeExample);
         };
+
+        class PropertyExample
+            : public ScriptCanvas::Nodeable
+        {
+            SCRIPTCANVAS_NODE(PropertyExample);
+        };
     }
 }
diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
index 3e02e90ae9..a46bb3323b 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
@@ -90,6 +90,11 @@ public:
     }
 };
 
+TEST_F(ScriptCanvasTestFixture, StringSanitization)
+{
+    RunUnitTestGraph("LY_SC_UnitTest_StringSanitization");
+}
+
 TEST_F(ScriptCanvasTestFixture, InterpretedHelloWorld)
 {
     RunUnitTestGraph("LY_SC_UnitTest_HelloWorld");
@@ -100,6 +105,11 @@ TEST_F(ScriptCanvasTestFixture, InterpretedReadEnumConstant)
     RunUnitTestGraph("LY_SC_UnitTest_ReadEnumConstant");
 }
 
+TEST_F(ScriptCanvasTestFixture, UserBranchSanityCheck)
+{
+    RunUnitTestGraph("LY_SC_UnitTest_UserBranchSanityCheck");
+}
+
 TEST_F(ScriptCanvasTestFixture, InterpretedEventHandlerNoDisconnect)
 {
     GlobalHandler handler;
@@ -130,6 +140,11 @@ TEST_F(ScriptCanvasTestFixture, InterpretedEventHandlerDisconnect)
     RunUnitTestGraph("LY_SC_UnitTest_EventHandlerDisconnect", runSpec);
 }
 
+TEST_F(ScriptCanvasTestFixture, FunctionLocalStaticsUnique)
+{
+    RunUnitTestGraph("LY_SC_UnitTest_FunctionLocalStaticsUnique");
+}
+
 TEST_F(ScriptCanvasTestFixture, FunctionContainerInputTest)
 {
     RunUnitTestGraph("LY_SC_UnitTest_FunctionContainerInputTest");
diff --git a/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.ScriptCanvasNodeable.xml b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.ScriptCanvasNodeable.xml
index d0b472d2d5..19a7a92a1c 100644
--- a/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.ScriptCanvasNodeable.xml
+++ b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.ScriptCanvasNodeable.xml
@@ -6,7 +6,7 @@
            QualifiedName="StartingPointInput::InputHandlerNodeable"
            PreferredClassName="Input Handler"
            Base="ScriptCanvas::Nodeable"
-           Icon="Editor/Icons/ScriptCanvas/Bus.png"
+           Icon="Icons/ScriptCanvas/Bus.png"
            EditAttributes="AZ::Edit::Attributes::Category@Gameplay/Input"
            GraphEntryPoint="True"
            GeneratePropertyFriend="True"
diff --git a/Gems/StartingPointInput/Code/Source/InputNode.ScriptCanvasGrammar.xml b/Gems/StartingPointInput/Code/Source/InputNode.ScriptCanvasGrammar.xml
index 82c3eefcb3..9d6c555c97 100644
--- a/Gems/StartingPointInput/Code/Source/InputNode.ScriptCanvasGrammar.xml
+++ b/Gems/StartingPointInput/Code/Source/InputNode.ScriptCanvasGrammar.xml
@@ -6,7 +6,7 @@
 	       PreferredClassName="Input Handler"
            Uuid="{0B0AC61B-4BBA-42BF-BDCD-DAF2D3CA41A8}"
            Base="ScriptCanvas::Node"
-           Icon="Editor/Icons/ScriptCanvas/Bus.png"
+           Icon="Icons/ScriptCanvas/Bus.png"
            EditAttributes="AZ::Edit::Attributes::Category@Gameplay/Input"
            GraphEntryPoint="True"
            GeneratePropertyFriend="True"
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check_Background.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check_Background.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check_Background.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Cross.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Cross.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Cross.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Off.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Off.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Off.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_On.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_On.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_On.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Disabled.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Disabled.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Hover.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Hover.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Hover.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Disabled.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Disabled.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Hover.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Hover.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Hover.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Sliced.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Sliced.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Sliced.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Stretch.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Stretch.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Stretch.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Manipulator.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Manipulator.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Manipulator.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Sliced.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Sliced.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Sliced.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Stretch.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Stretch.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Stretch.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.exportsettings b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.exportsettings
deleted file mode 100644
index 1415bea891..0000000000
--- a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Arrow.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Arrow.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Arrow.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowL.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowL.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowL.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowR.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowR.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowR.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowU.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowU.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowU.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Button.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Button.tif.assetinfo
new file mode 100644
index 0000000000..95b548a2eb
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Button.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Menu.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Menu.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Menu.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Disabled.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Hover.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Hover.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Hover.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Dot.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Dot.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Dot.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/button_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_disabled.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/button_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_normal.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_disabled.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_hover.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_hover.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_hover.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_normal.tif.assetinfo
new file mode 100644
index 0000000000..2eb5be8e93
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_normal.tif.assetinfo
@@ -0,0 +1,101 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::OverridingPlatform·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+								<Class name="AZStd::string" field="m_data" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+							</Class>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::OverridingPlatform·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
+								<Class name="AZStd::string" field="m_data" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+							</Class>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_check.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_check.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_check.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_handle.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_handle.tif.assetinfo
new file mode 100644
index 0000000000..95b548a2eb
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_handle.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_horiz_track.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_horiz_track.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_horiz_track.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_vert_track.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_vert_track.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_vert_track.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_disabled.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_disabled.tif.assetinfo
new file mode 100644
index 0000000000..95b548a2eb
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_disabled.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_normal.tif.assetinfo
new file mode 100644
index 0000000000..61b2832ff3
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_disabled.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_disabled.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_hover.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_hover.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_hover.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_normal.tif.assetinfo
new file mode 100644
index 0000000000..c6f6ca1e9c
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_normal.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/tooltip_sliced.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/tooltip_sliced.tif.assetinfo
new file mode 100644
index 0000000000..dd1d22706e
--- /dev/null
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/tooltip_sliced.tif.assetinfo
@@ -0,0 +1,69 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{83003128-F63E-422B-AEC2-68F0A947225F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
+		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
+					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
index 8271028ef9..ef2b52f05d 100644
--- a/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
+++ b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
@@ -274,7 +274,8 @@ namespace UnitTest
         EXPECT_TRUE(instanceSpawner1 == instanceSpawner2);
     }
 
-    TEST_F(DynamicSliceInstanceSpawnerTests, DifferentSpawnersAreNotEqual)
+    // [SPEC-6600] This test intermittently fails on automated builds, so disabling temporarily until root cause identified
+    TEST_F(DynamicSliceInstanceSpawnerTests, DISABLED_DifferentSpawnersAreNotEqual)
     {
         // Two spawners with different data should *not* be data-equivalent.
 
@@ -310,7 +311,8 @@ namespace UnitTest
         Vegetation::DescriptorNotificationBus::Handler::BusDisconnect();
     }
 
-    TEST_F(DynamicSliceInstanceSpawnerTests, CreateAndDestroyInstance)
+    // [SPEC-6600] This test intermittently fails on automated builds, so disabling temporarily until root cause identified
+    TEST_F(DynamicSliceInstanceSpawnerTests, DISABLED_CreateAndDestroyInstance)
     {
         // The spawner should successfully create and destroy an instance without errors.
 
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/OccluderArea_white.png b/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/OccluderArea_white.png
deleted file mode 100644
index 5554bfc38e..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/OccluderArea_white.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46757cf327aa9ed60ded1f3025140bc065569634f69e5aaba0b83086fa7642e0
-size 786
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/Portal_white.png b/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/Portal_white.png
deleted file mode 100644
index fc72adc85e..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/Portal_white.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44150d202f318598e939bf29a543b6edaa0d2cf7455989a2d0da916ba7c83384
-size 833
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/VisArea_white.png b/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/VisArea_white.png
deleted file mode 100644
index 48a7af896a..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/Disabled/VisArea_white.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44570118c315725d13affcc87b0eb4fb01f01cf67f9da0a4e066a347e096a36f
-size 757
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/OccluderArea.svg b/Gems/Visibility/Assets/Editor/Icons/Components/OccluderArea.svg
deleted file mode 100644
index aa8840a798..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/OccluderArea.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / OccluderArea</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M12,22.5 C6.20101013,22.5 1.5,17.7989899 1.5,12 C1.5,6.20101013 6.20101013,1.5 12,1.5 C17.7989899,1.5 22.5,6.20101013 22.5,12 C22.5,17.7989899 17.7989899,22.5 12,22.5 Z M12,14 C13.1045695,14 14,13.1045695 14,12 C14,10.8954305 13.1045695,10 12,10 C10.8954305,10 10,10.8954305 10,12 C10,13.1045695 10.8954305,14 12,14 Z M18.3868414,14 C19.4914109,14 20.3868414,13.1045695 20.3868414,12 C20.3868414,10.8954305 19.4914109,10 18.3868414,10 C17.2822719,10 16.3868414,10.8954305 16.3868414,12 C16.3868414,13.1045695 17.2822719,14 18.3868414,14 Z M15.1019653,17.9303924 C15.8830139,18.711441 17.1493438,18.711441 17.9303924,17.9303924 C18.711441,17.1493438 18.711441,15.8830139 17.9303924,15.1019653 C17.1493438,14.3209167 15.8830139,14.3209167 15.1019653,15.1019653 C14.3209167,15.8830139 14.3209167,17.1493438 15.1019653,17.9303924 Z M10,18.3868414 C10,19.4914109 10.8954305,20.3868414 12,20.3868414 C13.1045695,20.3868414 14,19.4914109 14,18.3868414 C14,17.2822719 13.1045695,16.3868414 12,16.3868414 C10.8954305,16.3868414 10,17.2822719 10,18.3868414 Z M6.0696076,15.1019653 C5.28855901,15.8830139 5.28855901,17.1493438 6.0696076,17.9303924 C6.85065618,18.711441 8.11698614,18.711441 8.89803472,17.9303924 C9.67908331,17.1493438 9.67908331,15.8830139 8.89803472,15.1019653 C8.11698614,14.3209167 6.85065618,14.3209167 6.0696076,15.1019653 Z M5.61315864,10 C4.50858914,10 3.61315864,10.8954305 3.61315864,12 C3.61315864,13.1045695 4.50858914,14 5.61315864,14 C6.71772814,14 7.61315864,13.1045695 7.61315864,12 C7.61315864,10.8954305 6.71772814,10 5.61315864,10 Z M8.89803472,6.0696076 C8.11698614,5.28855901 6.85065618,5.28855901 6.0696076,6.0696076 C5.28855901,6.85065618 5.28855901,8.11698614 6.0696076,8.89803472 C6.85065618,9.67908331 8.11698614,9.67908331 8.89803472,8.89803472 C9.67908331,8.11698614 9.67908331,6.85065618 8.89803472,6.0696076 Z M14,5.61315864 C14,4.50858914 13.1045695,3.61315864 12,3.61315864 C10.8954305,3.61315864 10,4.50858914 10,5.61315864 C10,6.71772814 10.8954305,7.61315864 12,7.61315864 C13.1045695,7.61315864 14,6.71772814 14,5.61315864 Z M17.9303924,8.89803472 C18.711441,8.11698614 18.711441,6.85065618 17.9303924,6.0696076 C17.1493438,5.28855901 15.8830139,5.28855901 15.1019653,6.0696076 C14.3209167,6.85065618 14.3209167,8.11698614 15.1019653,8.89803472 C15.8830139,9.67908331 17.1493438,9.67908331 17.9303924,8.89803472 Z" id="path-1"></path>
-    </defs>
-    <g id="icon-/-Rendering-/-OccluderArea" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Shape" fill="#B29EDF" fill-rule="nonzero" xlink:href="#path-1"></use>
-    </g>
-</svg>
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/Portal.svg b/Gems/Visibility/Assets/Editor/Icons/Components/Portal.svg
deleted file mode 100644
index 967a891222..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/Portal.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Portal</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M14.517566,6.64449841 C14.4862224,5.82082247 15.6751896,5.9793848 16.5161788,6.39348521 C17.3571681,6.80758562 18.6334298,7.44931482 19.9151842,8.76676198 C21.1969385,10.0842091 22,11.7883198 22,14.2740524 C22,16.7597851 20.5934573,18.7231154 18.642653,20.1339802 C16.6918487,21.544845 13.3232817,21.8346593 10.5903969,21.2554889 C7.85751214,20.6763185 6.98083219,19.4599445 5.82740123,18.6475608 C7.80862675,19.6319576 8.73776498,20.1539293 10.5903969,20.4505821 C12.4430289,20.7472349 14.8244045,20.4505821 16.3833038,19.6319576 C17.9422031,18.8133331 19.5050422,17.0119722 19.5050422,14.2740524 C19.5050422,13.1815784 19.2962704,12.3059389 18.642653,11.3434625 C17.8223782,10.1355767 16.9805858,9.83082202 16.2283235,9.40135632 C15.459699,8.96254944 14.8961383,8.938379 14.7128347,8.5 C14.5037649,8 14.5489097,7.46817436 14.517566,6.64449841 Z M11.1203684,18.0713788 C11.151712,18.8950547 9.96274479,18.7364924 9.12175555,18.322392 C8.28076632,17.9082916 7.00450455,17.2665624 5.72275024,15.9491152 C4.44099593,14.6316681 3.63793439,12.9275574 3.63793439,10.4418248 C3.63793439,7.95609214 5.04447713,5.99276183 6.99528141,4.58189699 C8.94608569,3.17103215 12.3146526,2.88121794 15.0475374,3.46038831 C17.7804223,4.03955868 18.6571022,5.25593271 19.8105332,6.06831644 C17.8293076,5.08391964 16.9001694,4.56194794 15.0475374,4.26529513 C13.1949055,3.96864232 10.8135299,4.26529513 9.25463061,5.08391964 C7.69573131,5.90254414 6.13289218,7.70390502 6.13289218,10.4418248 C6.13289218,11.5342988 6.34166399,12.4099383 6.99528141,13.3724147 C7.81555623,14.5803005 8.65734858,14.8850552 9.40961086,15.3145209 C10.1782354,15.7533278 10.7417961,15.7774982 10.9250997,16.2158772 C11.1341694,16.7158772 11.0890247,17.2477028 11.1203684,18.0713788 Z" id="path-1"></path>
-    </defs>
-    <g id="icon-/-Rendering-/-Portal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Combined-Shape" fill="#B29EDF" fill-rule="nonzero" xlink:href="#path-1"></use>
-    </g>
-</svg>
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/OccluderArea.png b/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/OccluderArea.png
deleted file mode 100644
index 3e98e852dd..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/OccluderArea.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7288c80d906ec59271ccd4db168d318f4c5b4fd65fca6077acbf4aaeb76b9e24
-size 4081
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/Portal.png b/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/Portal.png
deleted file mode 100644
index b7198e5803..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/Portal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:486816ea8e6cb090f8d78e26d9ed6a73aca8e5d6c5fb6bcb3cb2fff8277053db
-size 4687
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/VisArea.png b/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/VisArea.png
deleted file mode 100644
index e2d0c7f803..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/Viewport/VisArea.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aca391fc79c7b5400465bcdaa3a1c21a0fbb3dd042420b6511ecf568048ee6ec
-size 4558
diff --git a/Gems/Visibility/Assets/Editor/Icons/Components/VisArea.svg b/Gems/Visibility/Assets/Editor/Icons/Components/VisArea.svg
deleted file mode 100644
index 389f4cf35d..0000000000
--- a/Gems/Visibility/Assets/Editor/Icons/Components/VisArea.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / VisArea</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M12.8297892,22.115864 L12.8297892,20.0124936 C14.103246,20.0124936 15.3311908,19.7112171 16.43691,19.1414855 L17.4003209,21.0112467 C15.9983797,21.7336092 14.4403828,22.115864 12.8297892,22.115864 Z M18.860139,19.6325541 L17.4703431,18.053746 C18.4119229,17.2248906 19.1457469,16.1831791 19.6046973,15.0161068 L21.5621511,15.7858742 C20.9804267,17.2651506 20.0515045,18.5838168 18.860139,19.6325541 Z M22.031453,13.5797044 L19.9449645,13.3137474 C19.9843719,13.0045883 20.0056358,12.6917971 20.0083786,12.3853481 C20.0086874,11.3699357 19.8460795,10.4483615 19.5235313,9.57435394 L21.4968148,8.84612341 C21.9059719,9.95481503 22.1121329,11.123225 22.1117081,12.3949496 C22.1081938,12.7931346 22.0813141,13.1885334 22.031453,13.5797044 Z M20.39174,6.69848997 L18.6516615,7.88013888 C17.9470794,6.84258187 17.0033925,5.98401691 15.9037572,5.38177023 L16.9141212,3.53695809 C18.3064516,4.29950756 19.5001229,5.38550793 20.39174,6.69848997 Z M14.6364032,2.63367544 L14.1082344,4.66965311 C13.5053261,4.51324796 12.8822768,4.42845324 12.263034,4.41861054 C11.5170364,4.41762756 10.9040515,4.4856197 10.2975241,4.62909554 L9.8133284,2.58221453 C10.5830076,2.40014467 11.3592205,2.31404732 12.2809488,2.31537089 C13.082804,2.32797496 13.8720485,2.43538824 14.6364032,2.63367544 Z M7.57411663,3.40663596 L8.53255422,5.27895129 C7.41666002,5.85017715 6.44989295,6.68220981 5.71670117,7.69978909 L4.01016911,6.4701893 C4.93790195,5.18261115 6.16088944,4.13006648 7.57411663,3.40663596 Z M2.83910547,8.60208351 L4.7925298,9.38201986 C4.44476094,10.2530398 4.25466333,11.1832634 4.2353434,12.1229817 C4.23368987,12.5846086 4.24837874,12.8885633 4.28375497,13.2016972 L2.19368033,13.4378229 C2.14863195,13.0390756 2.13005497,12.6546647 2.13219847,12.0977636 C2.15690623,10.8866588 2.39800703,9.70685624 2.83910547,8.60208351 Z M2.73614577,15.2315548 L4.71138512,14.5086462 C5.14252836,15.6866805 5.85152947,16.7450008 6.77339853,17.5957427 L5.34691803,19.1414855 C4.1804236,18.0649923 3.28272837,16.7250098 2.73614577,15.2315548 Z M6.84342079,20.8813639 L7.85977016,19.0398424 C8.950253,19.641688 10.1699339,19.9778835 11.440246,20.0133111 L11.3816083,22.115864 C9.77371271,22.0710217 8.22595333,21.6443938 6.84342079,20.8813639 Z M12.1218708,5.93906802 L14.6218708,10.939068 L9.62187084,10.939068 L12.1218708,5.93906802 Z M13.4312199,12.25 L17.9312199,12.25 L17.9312199,16.75 L13.4312199,16.75 L13.4312199,12.25 Z M9.21724378,17 C7.8365319,17 6.71724378,15.8807119 6.71724378,14.5 C6.71724378,13.1192881 7.8365319,12 9.21724378,12 C10.5979557,12 11.7172438,13.1192881 11.7172438,14.5 C11.7172438,15.8807119 10.5979557,17 9.21724378,17 Z" id="path-1"></path>
-    </defs>
-    <g id="icon-/-Rendering-/-VisArea" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Combined-Shape" fill="#B29EDF" fill-rule="nonzero" xlink:href="#path-1"></use>
-    </g>
-</svg>
diff --git a/Gems/Visibility/CMakeLists.txt b/Gems/Visibility/CMakeLists.txt
deleted file mode 100644
index 20a680bce9..0000000000
--- a/Gems/Visibility/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-add_subdirectory(Code)
diff --git a/Gems/Visibility/Code/CMakeLists.txt b/Gems/Visibility/Code/CMakeLists.txt
deleted file mode 100644
index c8650eea79..0000000000
--- a/Gems/Visibility/Code/CMakeLists.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_target(
-    NAME Visibility.Static STATIC
-    NAMESPACE Gem
-    FILES_CMAKE
-        visibility_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Source
-        PUBLIC
-            Include
-    BUILD_DEPENDENCIES
-        PUBLIC
-            Legacy::CryCommon
-)
-
-ly_add_target(
-    NAME Visibility ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
-    NAMESPACE Gem
-    FILES_CMAKE
-        visibility_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Source
-        PUBLIC
-            Include
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Gem::Visibility.Static
-)
-
-if(PAL_TRAIT_BUILD_HOST_TOOLS)
-
-    ly_add_target(
-        NAME Visibility.Editor.Static STATIC
-        NAMESPACE Gem
-        FILES_CMAKE
-            visibility_editor_files.cmake
-        COMPILE_DEFINITIONS
-            PUBLIC
-                VISIBILITY_EDITOR
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Source
-            PUBLIC
-                Include
-        BUILD_DEPENDENCIES
-            PUBLIC
-                Legacy::Editor.Headers
-                Legacy::EditorCore
-                AZ::AzToolsFramework
-                Gem::Visibility.Static
-    )
-
-    ly_add_target(
-        NAME Visibility.Editor GEM_MODULE
-
-        NAMESPACE Gem
-        FILES_CMAKE
-            visibility_editor_shared_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Source
-            PUBLIC
-                Include
-        BUILD_DEPENDENCIES
-            PRIVATE
-                Gem::Visibility.Editor.Static
-    )
-endif()
-
-################################################################################
-# Tests
-################################################################################
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    if(PAL_TRAIT_BUILD_HOST_TOOLS)
-        ly_add_target(
-            NAME Visibility.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-            NAMESPACE Gem
-            FILES_CMAKE
-                visibility_editor_tests_files.cmake
-            INCLUDE_DIRECTORIES
-                PRIVATE
-                    Tests
-                    Source
-            BUILD_DEPENDENCIES
-                PRIVATE
-                    AZ::AzTest
-                    Gem::Visibility.Editor.Static
-        )
-        ly_add_googletest(
-            NAME Gem::Visibility.Editor.Tests
-        )
-    endif()
-endif()
diff --git a/Gems/Visibility/Code/Include/EditorOccluderAreaComponentBus.h b/Gems/Visibility/Code/Include/EditorOccluderAreaComponentBus.h
deleted file mode 100644
index f2714691cb..0000000000
--- a/Gems/Visibility/Code/Include/EditorOccluderAreaComponentBus.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-#include "OccluderAreaComponentBus.h"
-
-namespace Visibility
-{
-    /// Request bus for the EditorOccluderComponent.
-    class EditorOccluderAreaRequests
-        : public OccluderAreaRequests
-        , public AZ::FixedVertices<AZ::Vector3>
-    {
-    public:
-        virtual void SetDisplayFilled(bool displayFilled) = 0;
-        virtual void SetCullDistRatio(float cullDistRatio) = 0;
-        virtual void SetUseInIndoors(bool inDoors) = 0;
-        virtual void SetDoubleSide(bool doubleSided) = 0;
-        virtual void UpdateOccluderAreaObject() = 0;
-
-    protected:
-        ~EditorOccluderAreaRequests() = default;
-    };
-
-    /// Type to inherit to implement EditorOccluderAreaComponentRequests
-    using EditorOccluderAreaRequestBus = AZ::EBus<EditorOccluderAreaRequests, AZ::ComponentBus>;
-
-    /// Editor notification bus for EditorOccluderAreaComponent.
-    class EditorOccluderAreaNotifications
-        : public AZ::ComponentBus
-    {
-    public:
-        virtual void OnVerticesChangedInspector() {}
-
-    protected:
-        ~EditorOccluderAreaNotifications() = default;
-    };
-
-    /// Type to inherit to implement EditorOccluderAreaNotifications.
-    using EditorOccluderAreaNotificationBus = AZ::EBus<EditorOccluderAreaNotifications>;
-
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Include/EditorPortalComponentBus.h b/Gems/Visibility/Code/Include/EditorPortalComponentBus.h
deleted file mode 100644
index c4ab43d8a0..0000000000
--- a/Gems/Visibility/Code/Include/EditorPortalComponentBus.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-#include "PortalComponentBus.h"
-
-namespace Visibility
-{
-    /// Request bus for the EditorPortalComponent.
-    class EditorPortalRequests
-        : public PortalRequests
-        , public AZ::FixedVertices<AZ::Vector3>
-    {
-    public:
-        virtual void SetHeight(float height) = 0;
-        virtual void SetDisplayFilled(bool filled) = 0;
-        virtual void SetAffectedBySun(bool affectedBySun) = 0;
-        virtual void SetViewDistRatio(float viewDistRatio) = 0;
-        virtual void SetSkyOnly(bool skyOnly) = 0;
-        virtual void SetOceanIsVisible(bool oceanVisible) = 0;
-        virtual void SetUseDeepness(bool useDeepness) = 0;
-        virtual void SetDoubleSide(bool doubleSided) = 0;
-        virtual void SetLightBlending(bool lightBending) = 0;
-        virtual void SetLightBlendValue(float lightBendAmount) = 0;
-        virtual void UpdatePortalObject() = 0;
-
-    protected:
-        ~EditorPortalRequests() = default;
-    };
-
-    /// Type to inherit to implement EditorPortalComponentRequests
-    using EditorPortalRequestBus = AZ::EBus<EditorPortalRequests, AZ::ComponentBus>;
-
-    /// Editor notification bus for EditorPortalComponent.
-    class EditorPortalNotifications
-        : public AZ::ComponentBus
-    {
-    public:
-        virtual void OnVerticesChangedInspector() {}
-
-    protected:
-        ~EditorPortalNotifications() = default;
-    };
-
-    /// Type to inherit to implement EditorPortalNotifications.
-    using EditorPortalNotificationBus = AZ::EBus<EditorPortalNotifications>;
-
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Include/EditorVisAreaComponentBus.h b/Gems/Visibility/Code/Include/EditorVisAreaComponentBus.h
deleted file mode 100644
index 6803ea77a6..0000000000
--- a/Gems/Visibility/Code/Include/EditorVisAreaComponentBus.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-#include "VisAreaComponentBus.h"
-
-namespace Visibility
-{
-    /// Request bus for the EditorVisAreaComponent.
-    class EditorVisAreaComponentRequests
-        : public VisAreaComponentRequests
-        , public AZ::VariableVertices<AZ::Vector3>
-    {
-    public:
-        virtual void SetHeight(float height) = 0;
-        virtual void SetDisplayFilled(bool filled) = 0;
-        virtual void SetAffectedBySun(bool affectedBySun) = 0;
-        virtual void SetViewDistRatio(float viewDistRatio) = 0;
-        virtual void SetOceanIsVisible(bool oceanVisible) = 0;
-        virtual void UpdateVisAreaObject() = 0;
-    };
-
-    /// Type to inherit to implement EditorVisAreaComponentRequests.
-    using EditorVisAreaComponentRequestBus = AZ::EBus<EditorVisAreaComponentRequests, AZ::ComponentBus>;
-
-    /// Notification bus for the EditorVisAreaComponent.
-    class EditorVisAreaComponentNotifications
-        : public AZ::ComponentBus
-        , public AZ::VertexContainerNotificationInterface<AZ::Vector3>
-    {
-    public:
-        /// Called when a new vertex is added to the vis area.
-        void OnVertexAdded(size_t /*index*/) override {}
-
-        /// Called when a vertex is removed from the vis area.
-        void OnVertexRemoved(size_t /*index*/) override {}
-
-        /// Called when a vertex is updated.
-        void OnVertexUpdated(size_t /*index*/) override {}
-
-        /// Called when all vertices on the vis area are set.
-        void OnVerticesSet(const AZStd::vector<AZ::Vector3>& /*vertices*/) override {}
-
-        /// Called when all vertices are removed from the vis area.
-        void OnVerticesCleared() override {}
-
-    protected:
-        ~EditorVisAreaComponentNotifications() = default;
-    };
-
-    /// Type to inherit to implement EditorVisAreaComponentNotifications.
-    using EditorVisAreaComponentNotificationBus = AZ::EBus<EditorVisAreaComponentNotifications>;
-
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Include/OccluderAreaComponentBus.h b/Gems/Visibility/Code/Include/OccluderAreaComponentBus.h
deleted file mode 100644
index 21b66c14c1..0000000000
--- a/Gems/Visibility/Code/Include/OccluderAreaComponentBus.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/VertexContainerInterface.h>
-
-namespace Visibility
-{
-    /// Request bus for the OccluderAreaComponent.
-    class OccluderAreaRequests
-    {
-    public:
-        virtual bool GetDisplayFilled() = 0;
-        virtual float GetCullDistRatio() = 0;
-        virtual bool GetUseInIndoors() = 0;
-        virtual bool GetDoubleSide() = 0;
-
-    protected:
-        ~OccluderAreaRequests() = default;
-    };
-
-    /// Type to inherit to implement OccluderAreaRequests.
-    using OccluderAreaRequestBus = AZ::EBus<OccluderAreaRequests, AZ::ComponentBus>;
-
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Include/PortalComponentBus.h b/Gems/Visibility/Code/Include/PortalComponentBus.h
deleted file mode 100644
index 7de4cb4e80..0000000000
--- a/Gems/Visibility/Code/Include/PortalComponentBus.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/VertexContainerInterface.h>
-
-namespace Visibility
-{
-    // Request bus for the PortalComponent.
-    class PortalRequests
-    {
-    public:
-        virtual float GetHeight() = 0;
-        virtual bool GetDisplayFilled() = 0;
-        virtual bool GetAffectedBySun() = 0;
-        virtual float GetViewDistRatio() = 0;
-        virtual bool GetSkyOnly() = 0;
-        virtual bool GetOceanIsVisible() = 0;
-        virtual bool GetUseDeepness() = 0;
-        virtual bool GetDoubleSide() = 0;
-        virtual bool GetLightBlending() = 0;
-        virtual float GetLightBlendValue() = 0;
-
-    protected:
-        ~PortalRequests() = default;
-    };
-
-    /// Type to inherit to implement PortalRequests.
-    using PortalRequestBus = AZ::EBus<PortalRequests, AZ::ComponentBus>;
-
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Include/VisAreaComponentBus.h b/Gems/Visibility/Code/Include/VisAreaComponentBus.h
deleted file mode 100644
index 632e68ffc5..0000000000
--- a/Gems/Visibility/Code/Include/VisAreaComponentBus.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/VertexContainerInterface.h>
-
-namespace Visibility
-{
-    /// Request bus for the VisAreaComponent.
-    class VisAreaComponentRequests
-    {
-    public:
-        virtual float GetHeight() = 0;
-        virtual bool GetDisplayFilled() = 0;
-        virtual bool GetAffectedBySun() = 0;
-        virtual float GetViewDistRatio() = 0;
-        virtual bool GetOceanIsVisible() = 0;
-
-    protected:
-        ~VisAreaComponentRequests() = default;
-    };
-
-    /// Type to inherit to implement VisAreaComponentRequests.
-    using VisAreaComponentRequestBus = AZ::EBus<VisAreaComponentRequests, AZ::ComponentBus>;
-
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorOccluderAreaComponent.cpp b/Gems/Visibility/Code/Source/EditorOccluderAreaComponent.cpp
deleted file mode 100644
index 0521836e48..0000000000
--- a/Gems/Visibility/Code/Source/EditorOccluderAreaComponent.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Visibility_precompiled.h"
-#include "EditorOccluderAreaComponent.h"
-#include "EditorOccluderAreaComponentMode.h"
-
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Math/IntersectSegment.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzToolsFramework/Viewport/VertexContainerDisplay.h>
-#include <Editor/Objects/BaseObject.h>
-#include <Objects/EntityObject.h>
-
-// Include files needed for writing DisplayEntity functions that access the DisplayContext directly.
-#include <EditorCoreAPI.h>
-
-#include "MathConversion.h"
-
-namespace Visibility
-{
-    void EditorOccluderAreaComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides)
-    {
-        provides.push_back(AZ_CRC("EditorOccluderAreaService", 0xf943e16a));
-        provides.push_back(AZ_CRC("OccluderAreaService", 0x2fefad66));
-        provides.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
-    }
-
-    void EditorOccluderAreaComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires)
-    {
-        requires.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-    }
-
-    void EditorOccluderAreaComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-    {
-        dependent.push_back(AZ_CRC("QuadShapeService", 0xe449b0fc));
-    }
-
-    void EditorOccluderAreaComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-    {
-        incompatible.push_back(AZ_CRC("EditorOccluderAreaService", 0xf943e16a));
-        incompatible.push_back(AZ_CRC("OccluderAreaService", 0x2fefad66));
-        incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
-    }
-
-    void EditorOccluderAreaConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorOccluderAreaConfiguration, OccluderAreaConfiguration>()
-                ->Version(1);
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorOccluderAreaConfiguration>("OccluderArea Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
-
-                editContext->Class<OccluderAreaConfiguration>("OccluderArea Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &OccluderAreaConfiguration::m_displayFilled, "DisplayFilled", "Display the Occlude Area as a filled quad.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &OccluderAreaConfiguration::OnChange)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &OccluderAreaConfiguration::m_cullDistRatio, "CullDistRatio", "The range of the culling effect.")
-                        ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &OccluderAreaConfiguration::OnChange)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &OccluderAreaConfiguration::m_useInIndoors, "UseInIndoors", "Should this occluder work inside VisAreas.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &OccluderAreaConfiguration::OnChange)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &OccluderAreaConfiguration::m_doubleSide, "DoubleSide", "Should this occlude from both sides.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &OccluderAreaConfiguration::OnChange)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &OccluderAreaConfiguration::m_vertices, "Vertices", "Points that make up the OccluderArea.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &OccluderAreaConfiguration::OnVerticesChange)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ;
-            }
-        }
-    }
-
-    void EditorOccluderAreaComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorOccluderAreaComponent, AzToolsFramework::Components::EditorComponentBase>()
-                ->Version(2)
-                ->Field("m_config", &EditorOccluderAreaComponent::m_config)
-                ->Field("ComponentMode", &EditorOccluderAreaComponent::m_componentModeDelegate)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorOccluderAreaComponent>("OccluderArea", "An area that blocks objects behind it from rendering.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/OccluderArea.png")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/OccluderArea.svg")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/occluder-area-component")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorOccluderAreaComponent::m_config, "m_config", "No Description")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorOccluderAreaComponent::m_componentModeDelegate, "Component Mode", "OccluderArea Component Mode")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ;
-            }
-        }
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<EditorOccluderAreaRequestBus>("EditorOccluderAreaRequestBus")
-                ->Event("SetDisplayFilled", &EditorOccluderAreaRequestBus::Events::SetDisplayFilled)
-                ->Event("GetDisplayFilled", &EditorOccluderAreaRequestBus::Events::GetDisplayFilled)
-                ->VirtualProperty("DisplayFilled", "GetDisplayFilled", "SetDisplayFilled")
-
-                ->Event("SetCullDistRatio", &EditorOccluderAreaRequestBus::Events::SetCullDistRatio)
-                ->Event("GetCullDistRatio", &EditorOccluderAreaRequestBus::Events::GetCullDistRatio)
-                ->VirtualProperty("CullDistRatio", "GetCullDistRatio", "SetCullDistRatio")
-
-                ->Event("SetUseInIndoors", &EditorOccluderAreaRequestBus::Events::SetUseInIndoors)
-                ->Event("GetUseInIndoors", &EditorOccluderAreaRequestBus::Events::GetUseInIndoors)
-                ->VirtualProperty("UseInIndoors", "GetUseInIndoors", "SetUseInIndoors")
-
-                ->Event("SetDoubleSide", &EditorOccluderAreaRequestBus::Events::SetDoubleSide)
-                ->Event("GetDoubleSide", &EditorOccluderAreaRequestBus::Events::GetDoubleSide)
-                ->VirtualProperty("DoubleSide", "GetDoubleSide", "SetDoubleSide")
-                ;
-
-            behaviorContext->Class<EditorOccluderAreaComponent>()->RequestBus("EditorOccluderAreaRequestBus");
-        }
-
-        EditorOccluderAreaConfiguration::Reflect(context);
-    }
-
-    void EditorOccluderAreaConfiguration::OnChange()
-    {
-        EditorOccluderAreaRequestBus::Event(m_entityId, &EditorOccluderAreaRequests::UpdateOccluderAreaObject);
-    }
-
-    void EditorOccluderAreaConfiguration::OnVerticesChange()
-    {
-        EditorOccluderAreaRequestBus::Event(
-            m_entityId, &EditorOccluderAreaRequests::UpdateOccluderAreaObject);
-        EditorOccluderAreaNotificationBus::Event(
-            m_entityId, &EditorOccluderAreaNotifications::OnVerticesChangedInspector);
-    }
-
-    void EditorOccluderAreaConfiguration::SetEntityId(const AZ::EntityId entityId)
-    {
-        m_entityId = entityId;
-    }
-
-    EditorOccluderAreaComponent::~EditorOccluderAreaComponent()
-    {
-        if (m_area)
-        {
-            GetIEditor()->Get3DEngine()->DeleteVisArea(m_area);
-            m_area = nullptr;
-        }
-    }
-
-    void EditorOccluderAreaComponent::Activate()
-    {
-        Base::Activate();
-
-        const AZ::EntityId entityId = GetEntityId();
-        m_config.SetEntityId(entityId);
-
-        // NOTE: We create the vis-area here at activate, but destroy it in the destructor.
-        // We have to do this, otherwise the vis-area is not saved into the level.
-        // Unfortunately, at this time we cannot create the vis-areas at game runtime.
-        // This means that dynamic slices cannot effectively contain vis areas until we fix
-        // the core rendering system to allow that.
-        const auto visGUID = static_cast<AZ::u64>(entityId);
-        if(!m_area && GetIEditor())
-        {
-            m_area = GetIEditor()->Get3DEngine()->CreateVisArea(visGUID);
-        }
-
-        m_componentModeDelegate.ConnectWithSingleComponentMode<
-            EditorOccluderAreaComponent, EditorOccluderAreaComponentMode>(
-                AZ::EntityComponentIdPair(entityId, GetId()), this);
-
-        EditorOccluderAreaRequestBus::Handler::BusConnect(entityId);
-        AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::BusConnect(entityId);
-        AZ::TransformNotificationBus::Handler::BusConnect(entityId);
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(entityId);
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(entityId);
-        AzFramework::BoundsRequestBus::Handler::BusConnect(entityId);
-
-        UpdateOccluderAreaObject();
-    }
-
-    void EditorOccluderAreaComponent::Deactivate()
-    {
-        m_componentModeDelegate.Disconnect();
-
-        AzFramework::BoundsRequestBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusDisconnect();
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-        AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::BusDisconnect();
-        EditorOccluderAreaRequestBus::Handler::BusDisconnect();
-
-        Base::Deactivate();
-    }
-
-    /// Update the object runtime after changes to the Configuration.
-    /// Called by the default RequestBus SetXXX implementations,
-    /// and used to initially set up the object the first time the
-    /// Configuration are set.
-    void EditorOccluderAreaComponent::UpdateOccluderAreaObject()
-    {
-        if (m_area)
-        {
-            AZStd::array<Vec3, 4> verts;
-
-            const Matrix34& wtm = AZTransformToLYTransform(GetWorldTM());
-            for (size_t i = 0; i < m_config.m_vertices.size(); ++i)
-            {
-                verts[i] = wtm.TransformPoint(AZVec3ToLYVec3(m_config.m_vertices[i]));
-            }
-
-            SVisAreaInfo info;
-            info.fHeight = 0;
-            info.vAmbientColor = Vec3(0, 0, 0);
-            info.bAffectedByOutLights = false;
-            info.bSkyOnly = false;
-            info.fViewDistRatio = m_config.m_cullDistRatio;
-            info.bDoubleSide = m_config.m_doubleSide;
-            info.bUseDeepness = false;
-            info.bUseInIndoors = m_config.m_useInIndoors;
-            info.bOceanIsVisible = false;
-            info.fPortalBlending = -1.0f;
-
-            const AZStd::string name = AZStd::string("OcclArea_") + GetEntity()->GetName();
-            GetIEditor()->Get3DEngine()->UpdateVisArea(m_area, &verts[0], verts.size(), name.c_str(), info, false);
-
-            AZ::Interface<AzFramework::IEntityBoundsUnion>::Get()->RefreshEntityLocalBoundsUnion(GetEntityId());
-        }
-    }
-
-    void EditorOccluderAreaComponent::SetDisplayFilled(const bool value)
-    {
-        m_config.m_displayFilled = value;
-        UpdateOccluderAreaObject();
-    }
-
-    bool EditorOccluderAreaComponent::GetDisplayFilled()
-    {
-        return m_config.m_displayFilled;
-    }
-
-    void EditorOccluderAreaComponent::SetCullDistRatio(const float value)
-    {
-        m_config.m_cullDistRatio = value;
-        UpdateOccluderAreaObject();
-    }
-
-    float EditorOccluderAreaComponent::GetCullDistRatio()
-    {
-        return m_config.m_cullDistRatio;
-    }
-
-    void EditorOccluderAreaComponent::SetUseInIndoors(const bool value)
-    {
-        m_config.m_useInIndoors = value;
-        UpdateOccluderAreaObject();
-    }
-
-    bool EditorOccluderAreaComponent::GetUseInIndoors()
-    {
-        return m_config.m_useInIndoors;
-    }
-
-    void EditorOccluderAreaComponent::SetDoubleSide(const bool value)
-    {
-        m_config.m_doubleSide = value;
-        UpdateOccluderAreaObject();
-    }
-
-    bool EditorOccluderAreaComponent::GetDoubleSide()
-    {
-        return m_config.m_doubleSide;
-    }
-
-    bool EditorOccluderAreaComponent::GetVertex(const size_t index, AZ::Vector3& vertex) const
-    {
-        if (index < m_config.m_vertices.size())
-        {
-            vertex = m_config.m_vertices[index];
-            return true;
-        }
-
-        return false;
-    }
-
-    bool EditorOccluderAreaComponent::UpdateVertex(const size_t index, const AZ::Vector3& vertex)
-    {
-        if (index < m_config.m_vertices.size())
-        {
-            m_config.m_vertices[index] = vertex;
-            return true;
-        }
-
-        return false;
-    }
-
-    void EditorOccluderAreaComponent::OnTransformChanged(const AZ::Transform& /*local*/, [[maybe_unused]] const AZ::Transform& world)
-    {
-        UpdateOccluderAreaObject();
-    }
-
-    void EditorOccluderAreaComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        const AZ::Transform worldFromLocal = GetWorldTM();
-        const AZ::Vector4 color(0.5f, 0.25f, 0.0f, 1.0f);
-        const AZ::Vector4 selectedColor(1.0f, 0.5f, 0.0f, 1.0f);
-        const float previousLineWidth = debugDisplay.GetLineWidth();
-
-        debugDisplay.DepthWriteOff();
-        debugDisplay.PushMatrix(worldFromLocal);
-        debugDisplay.SetColor(IsSelected() ? selectedColor : color);
-        debugDisplay.SetLineWidth(5.0f);
-        debugDisplay.SetAlpha(0.8f);
-
-        for (size_t i = 2; i < 4; i++)
-        {
-            // draw the plane
-            if (m_config.m_displayFilled)
-            {
-                debugDisplay.SetAlpha(0.3f);
-                debugDisplay.CullOff();
-                debugDisplay.DrawTri(m_config.m_vertices[0], m_config.m_vertices[i - 1], m_config.m_vertices[i]);
-                debugDisplay.CullOn();
-                debugDisplay.SetAlpha(0.8f);
-            }
-
-            debugDisplay.DrawLine(m_config.m_vertices[i - 2], m_config.m_vertices[i - 1]);
-            debugDisplay.DrawLine(m_config.m_vertices[i - 1], m_config.m_vertices[i]);
-        }
-
-        // draw the closing line
-        debugDisplay.DrawLine(m_config.m_vertices[3], m_config.m_vertices[0]);
-
-        if (m_componentModeDelegate.AddedToComponentMode())
-        {
-            AzToolsFramework::VertexContainerDisplay::DisplayVertexContainerIndices(
-                debugDisplay, AzToolsFramework::FixedVerticesArray<AZ::Vector3, 4>(m_config.m_vertices),
-                GetWorldTM(), AZ::Vector3::CreateOne(), IsSelected());
-        }
-
-        debugDisplay.DepthWriteOn();
-        debugDisplay.SetLineWidth(previousLineWidth);
-        debugDisplay.PopMatrix();
-    }
-
-    void EditorOccluderAreaComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        gameEntity->CreateComponent<OccluderAreaComponent>(m_config);
-    }
-
-    AZ::Aabb EditorOccluderAreaComponent::GetEditorSelectionBoundsViewport(
-        const AzFramework::ViewportInfo& /*viewportInfo*/)
-    {
-        return GetWorldBounds();
-    }
-
-    bool EditorOccluderAreaComponent::EditorSelectionIntersectRayViewport(
-        const AzFramework::ViewportInfo& /*viewportInfo*/, const AZ::Vector3& src,
-        const AZ::Vector3& dir, float& distance)
-    {
-        const float rayLength = 1000.0f;
-        AZ::Vector3 scaledDir = dir * rayLength;
-        AZ::Vector3 end = src + scaledDir;
-        float t;
-        float intermediateT = std::numeric_limits<float>::max();
-        bool didHit = false;
-
-        // Transform verts to world space for tris test
-        AZStd::array<AZ::Vector3, 4> verts;
-        const AZ::Transform& wtm = GetWorldTM();
-        for (size_t i = 0; i < m_config.m_vertices.size(); ++i)
-        {
-            verts[i] = wtm.TransformPoint(m_config.m_vertices[i]);
-        }
-
-        AZ::Vector3 normal;
-        for (AZ::u8 i = 2; i < 4; ++i)
-        {
-            if (AZ::Intersect::IntersectSegmentTriangleCCW(src, end, verts[0], verts[i - 1], verts[i], normal, t) > 0)
-            {
-                intermediateT = AZStd::GetMin(t, intermediateT);
-                didHit = true;
-            }
-            //Else if here as we shouldn't successfully ccw and cw intersect at the same time
-            else if (AZ::Intersect::IntersectSegmentTriangle(src, end, verts[0], verts[i - 1], verts[i], normal, t) > 0)
-            {
-                intermediateT = AZStd::GetMin(t, intermediateT);
-                didHit = true;
-            }
-        }
-
-        if (didHit)
-        {
-            distance = intermediateT * rayLength;
-        }
-        return didHit;
-    }
-
-    AZ::Aabb EditorOccluderAreaComponent::GetWorldBounds()
-    {
-        return GetLocalBounds().GetTransformedAabb(GetWorldTM());
-    }
-
-    AZ::Aabb EditorOccluderAreaComponent::GetLocalBounds()
-    {
-        AZ::Aabb bbox = AZ::Aabb::CreateNull();
-        for (const auto& vertex : m_config.m_vertices)
-        {
-            bbox.AddPoint(vertex);
-        }
-        return bbox;
-    }
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorOccluderAreaComponent.h b/Gems/Visibility/Code/Source/EditorOccluderAreaComponent.h
deleted file mode 100644
index 0ac6528bc7..0000000000
--- a/Gems/Visibility/Code/Source/EditorOccluderAreaComponent.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#pragma once
-
-#include "OccluderAreaComponent.h"
-#include "EditorOccluderAreaComponentBus.h"
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzFramework/Visibility/BoundsBus.h>
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/ComponentMode/ComponentModeDelegate.h>
-#include <AzToolsFramework/Manipulators/EditorVertexSelection.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-
-namespace Visibility
-{
-    class EditorOccluderAreaComponent;
-
-    class EditorOccluderAreaConfiguration
-        : public OccluderAreaConfiguration
-    {
-    public:
-        AZ_TYPE_INFO_LEGACY(EditorOccluderAreaConfiguration, "{032F466F-25CB-5460-AC2F-B04236C87878}", OccluderAreaConfiguration);
-        AZ_CLASS_ALLOCATOR(EditorOccluderAreaConfiguration, AZ::SystemAllocator, 0);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void OnChange() override;
-        void OnVerticesChange() override;
-
-        void SetEntityId(AZ::EntityId entityId);
-
-    private:
-        AZ::EntityId m_entityId;
-    };
-
-    class EditorOccluderAreaComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , private EditorOccluderAreaRequestBus::Handler
-        , private AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler
-        , private AzFramework::EntityDebugDisplayEventBus::Handler
-        , private AzToolsFramework::EditorComponentSelectionRequestsBus::Handler
-        , private AZ::TransformNotificationBus::Handler
-        , public AzFramework::BoundsRequestBus::Handler
-    {
-        friend class EditorOccluderAreaConfiguration;
-
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-
-    public:
-        AZ_COMPONENT(EditorOccluderAreaComponent, "{1A209C7C-6C06-5AE6-AD60-22CD8D0DAEE3}", AzToolsFramework::Components::EditorComponentBase);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires);
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        EditorOccluderAreaComponent() = default;
-        EditorOccluderAreaComponent(const EditorOccluderAreaComponent&) = delete;
-        EditorOccluderAreaComponent& operator=(const EditorOccluderAreaComponent&) = delete;
-        ~EditorOccluderAreaComponent();
-
-        // AZ::Component overrides ...
-        void Activate() override;
-        void Deactivate() override;
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        // TransformNotificationBus overrides ...
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // EditorComponentSelectionRequestsBus overrides ...
-        AZ::Aabb GetEditorSelectionBoundsViewport(
-            const AzFramework::ViewportInfo& viewportInfo) override;
-        bool EditorSelectionIntersectRayViewport(
-            const AzFramework::ViewportInfo& viewportInfo, const AZ::Vector3& src,
-            const AZ::Vector3& dir, float& distance) override;
-        bool SupportsEditorRayIntersect() override { return true; }
-
-        // BoundsRequestBus overrides ...
-        AZ::Aabb GetWorldBounds() override;
-        AZ::Aabb GetLocalBounds() override;
-
-        /// EditorOccluderAreaRequestBus overrides ...
-        void SetDisplayFilled(bool value) override;
-        bool GetDisplayFilled() override;
-        void SetCullDistRatio(float value) override;
-        float GetCullDistRatio() override;
-        void SetUseInIndoors(bool value) override;
-        bool GetUseInIndoors() override;
-        void SetDoubleSide(bool value) override;
-        bool GetDoubleSide() override;
-        bool GetVertex(size_t index, AZ::Vector3& vertex) const override;
-        bool UpdateVertex(size_t index, const AZ::Vector3& vertex) override;
-        size_t Size() const override { return m_config.m_vertices.size(); }
-        void UpdateOccluderAreaObject() override;
-
-    private:
-        friend EditorOccluderAreaConfiguration;
-
-        // AzFramework::EntityDebugDisplayEventBus overrides ...
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        // Reflected members
-        EditorOccluderAreaConfiguration m_config;
-
-        using ComponentModeDelegate = AzToolsFramework::ComponentModeFramework::ComponentModeDelegate;
-        ComponentModeDelegate m_componentModeDelegate; ///< Responsible for detecting ComponentMode activation
-                                                       ///< and creating a concrete ComponentMode.
-
-        // Unreflected members
-        IVisArea* m_area = nullptr;
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorOccluderAreaComponentMode.cpp b/Gems/Visibility/Code/Source/EditorOccluderAreaComponentMode.cpp
deleted file mode 100644
index 0ab51d362a..0000000000
--- a/Gems/Visibility/Code/Source/EditorOccluderAreaComponentMode.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include "Visibility_precompiled.h"
-#include "EditorOccluderAreaComponentMode.h"
-
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
-
-namespace Visibility
-{
-    AZ_CLASS_ALLOCATOR_IMPL(EditorOccluderAreaComponentMode, AZ::SystemAllocator, 0)
-
-    EditorOccluderAreaComponentMode::EditorOccluderAreaComponentMode(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType)
-        : EditorBaseComponentMode(entityComponentIdPair, componentType)
-    {
-        CreateManipulators();
-        
-        AZ::TransformNotificationBus::Handler::BusConnect(entityComponentIdPair.GetEntityId());
-        EditorOccluderAreaNotificationBus::Handler::BusConnect(entityComponentIdPair.GetEntityId());
-    }
-
-    EditorOccluderAreaComponentMode::~EditorOccluderAreaComponentMode()
-    {
-        EditorOccluderAreaNotificationBus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-        
-        m_vertexSelection.Destroy();
-    }
-
-    void EditorOccluderAreaComponentMode::CreateManipulators()
-    {
-        using namespace AzToolsFramework;
-
-        m_vertexSelection.Create(
-            AZ::EntityComponentIdPair(GetEntityId(), GetComponentId()), g_mainManipulatorManagerId,
-            AZStd::make_unique<NullHoverSelection>(),
-            TranslationManipulators::Dimensions::Three,
-            ConfigureTranslationManipulatorAppearance3d);
-
-        m_vertexSelection.SetVertexPositionsUpdatedCallback([this]()
-        {
-            EditorOccluderAreaRequestBus::Event(
-                GetEntityId(), &EditorOccluderAreaRequests::UpdateOccluderAreaObject);
-        });
-    }
-
-    void EditorOccluderAreaComponentMode::OnTransformChanged(
-        const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_vertexSelection.RefreshSpace(world);
-    }
-
-    void EditorOccluderAreaComponentMode::OnVerticesChangedInspector()
-    {
-        m_vertexSelection.RefreshLocal();
-    }
-
-    void EditorOccluderAreaComponentMode::Refresh()
-    {
-        // destroy and recreate manipulators when container is modified (vertices are added or removed)
-        m_vertexSelection.Destroy();
-        CreateManipulators();
-    }
-
-    AZStd::vector<AzToolsFramework::ActionOverride> EditorOccluderAreaComponentMode::PopulateActionsImpl()
-    {
-        return m_vertexSelection.ActionOverrides();
-    }
-
-    bool EditorOccluderAreaComponentMode::HandleMouseInteraction(
-        const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction)
-    {
-        return m_vertexSelection.HandleMouse(mouseInteraction);
-    }
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorOccluderAreaComponentMode.h b/Gems/Visibility/Code/Source/EditorOccluderAreaComponentMode.h
deleted file mode 100644
index babef3bccc..0000000000
--- a/Gems/Visibility/Code/Source/EditorOccluderAreaComponentMode.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzToolsFramework/ComponentMode/EditorBaseComponentMode.h>
-#include <AzToolsFramework/Manipulators/EditorVertexSelection.h>
-
-#include "EditorOccluderAreaComponentBus.h"
-
-namespace Visibility
-{
-    class EditorOccluderAreaComponentMode
-        : public AzToolsFramework::ComponentModeFramework::EditorBaseComponentMode
-        , private AZ::TransformNotificationBus::Handler
-        , private EditorOccluderAreaNotificationBus::Handler
-    {
-    public:
-        AZ_CLASS_ALLOCATOR_DECL
-
-        EditorOccluderAreaComponentMode(
-            const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType);
-        ~EditorOccluderAreaComponentMode();
-
-    private:
-        // EditorBaseComponentMode
-        void Refresh() override;
-        AZStd::vector<AzToolsFramework::ActionOverride> PopulateActionsImpl() override;
-        bool HandleMouseInteraction(
-            const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
-
-        // Manipulator handling
-        void CreateManipulators();
-
-        // TransformNotificationBus
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // OccluderAreaNotificationBus
-        void OnVerticesChangedInspector() override;
-
-        AzToolsFramework::EditorVertexSelectionFixed<AZ::Vector3> m_vertexSelection; ///< Handles all manipulator interactions with vertices.
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorPortalComponent.cpp b/Gems/Visibility/Code/Source/EditorPortalComponent.cpp
deleted file mode 100644
index 18f3f2fdb0..0000000000
--- a/Gems/Visibility/Code/Source/EditorPortalComponent.cpp
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include "Visibility_precompiled.h"
-#include "EditorPortalComponent.h"
-#include "EditorPortalComponentMode.h"
-
-#include <AzCore/RTTI/BehaviorContext.h>
-
-// Include files needed for writing DisplayEntity functions that access the DisplayContext directly.
-#include <EditorCoreAPI.h>
-
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Math/IntersectSegment.h>
-#include <AzToolsFramework/Viewport/VertexContainerDisplay.h>
-#include <Editor/Objects/BaseObject.h>
-#include <MathConversion.h>
-
-namespace Visibility
-{
-    void EditorPortalComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-    {
-        provided.push_back(AZ_CRC("EditorPortalService", 0x6ead38f6));
-        provided.push_back(AZ_CRC("PortalService", 0x06076210));
-        provided.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
-    }
-
-    void EditorPortalComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-    {
-        required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-    }
-
-    void EditorPortalComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-    {
-        dependent.push_back(AZ_CRC("QuadShapeService", 0xe449b0fc));
-    }
-
-    void EditorPortalComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-    {
-        incompatible.push_back(AZ_CRC("SphereShapeService", 0x90c8dc80));
-        incompatible.push_back(AZ_CRC("SplineShapeService", 0x4d4b94a2));
-        incompatible.push_back(AZ_CRC("PolygonPrismShapeService", 0x1cbc4ed4));
-        incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
-    }
-
-    void EditorPortalConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorPortalConfiguration, PortalConfiguration>()
-                ->Version(1);
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorPortalConfiguration>("Portal Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
-
-                editContext->Class<PortalConfiguration>("Portal Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_height, "Height", "How tall the Portal is.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_displayFilled, "DisplayFilled", "Display the Portal as a filled volume.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_affectedBySun, "AffectedBySun", "Allows sunlight to affect objects inside the Portal.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_viewDistRatio, "ViewDistRatio", "Specifies how far the Portal is rendered.")
-                    ->Attribute(AZ::Edit::Attributes::Max, 100.000000)
-                    ->Attribute(AZ::Edit::Attributes::Min, 0.000000)
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_skyOnly, "SkyOnly", "Only the Sky Box will render when looking outside the Portal.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_oceanIsVisible, "OceanIsVisible", "Ocean will be visible when looking outside the Portal.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_useDeepness, "UseDeepness", "Portal will be treated as an object with volume rather than a plane.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_doubleSide, "DoubleSide", "Cameras will be able to look through the portal from both sides.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_lightBlending, "LightBlending", "Light from neighboring VisAreas will blend into the Portal.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_lightBlendValue, "LightBlendValue", "How much to blend lights from neighboring VisAreas.")
-                    ->Attribute(AZ::Edit::Attributes::Max, 1.000000)
-                    ->Attribute(AZ::Edit::Attributes::Min, 0.000000)
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnChange)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &PortalConfiguration::m_vertices, "Vertices", "Points that make up the floor of the Portal.")
-                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &PortalConfiguration::OnVerticesChange)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                ;
-            }
-        }
-    }
-
-    void EditorPortalComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorPortalComponent, AzToolsFramework::Components::EditorComponentBase>()
-                ->Version(2)
-                ->Field("m_config", &EditorPortalComponent::m_config)
-                ->Field("ComponentMode", &EditorPortalComponent::m_componentModeDelegate)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorPortalComponent>("Portal", "An area that describes a visibility portal between VisAreas.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Portal.png")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Portal.svg")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/portal-component")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorPortalComponent::m_config, "m_config", "No Description")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorPortalComponent::m_componentModeDelegate, "Component Mode", "Portal Component Mode")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ;
-            }
-        }
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<EditorPortalRequestBus>("EditorPortalRequestBus")
-                ->Event("SetHeight", &EditorPortalRequestBus::Events::SetHeight)
-                ->Event("GetHeight", &EditorPortalRequestBus::Events::GetHeight)
-                ->VirtualProperty("Height", "GetHeight", "SetHeight")
-
-                ->Event("SetDisplayFilled", &EditorPortalRequestBus::Events::SetDisplayFilled)
-                ->Event("GetDisplayFilled", &EditorPortalRequestBus::Events::GetDisplayFilled)
-                ->VirtualProperty("DisplayFilled", "GetDisplayFilled", "SetDisplayFilled")
-
-                ->Event("SetAffectedBySun", &EditorPortalRequestBus::Events::SetAffectedBySun)
-                ->Event("GetAffectedBySun", &EditorPortalRequestBus::Events::GetAffectedBySun)
-                ->VirtualProperty("AffectedBySun", "GetAffectedBySun", "SetAffectedBySun")
-
-                ->Event("SetViewDistRatio", &EditorPortalRequestBus::Events::SetViewDistRatio)
-                ->Event("GetViewDistRatio", &EditorPortalRequestBus::Events::GetViewDistRatio)
-                ->VirtualProperty("ViewDistRatio", "GetViewDistRatio", "SetViewDistRatio")
-
-                ->Event("SetSkyOnly", &EditorPortalRequestBus::Events::SetSkyOnly)
-                ->Event("GetSkyOnly", &EditorPortalRequestBus::Events::GetSkyOnly)
-                ->VirtualProperty("SkyOnly", "GetSkyOnly", "SetSkyOnly")
-
-                ->Event("SetOceanIsVisible", &EditorPortalRequestBus::Events::SetOceanIsVisible)
-                ->Event("GetOceanIsVisible", &EditorPortalRequestBus::Events::GetOceanIsVisible)
-                ->VirtualProperty("OceanIsVisible", "GetOceanIsVisible", "SetOceanIsVisible")
-
-                ->Event("SetUseDeepness", &EditorPortalRequestBus::Events::SetUseDeepness)
-                ->Event("GetUseDeepness", &EditorPortalRequestBus::Events::GetUseDeepness)
-                ->VirtualProperty("UseDeepness", "GetUseDeepness", "SetUseDeepness")
-
-                ->Event("SetDoubleSide", &EditorPortalRequestBus::Events::SetDoubleSide)
-                ->Event("GetDoubleSide", &EditorPortalRequestBus::Events::GetDoubleSide)
-                ->VirtualProperty("DoubleSide", "GetDoubleSide", "SetDoubleSide")
-
-                ->Event("SetLightBlending", &EditorPortalRequestBus::Events::SetLightBlending)
-                ->Event("GetLightBlending", &EditorPortalRequestBus::Events::GetLightBlending)
-                ->VirtualProperty("LightBlending", "GetLightBlending", "SetLightBlending")
-
-                ->Event("SetLightBlendValue", &EditorPortalRequestBus::Events::SetLightBlendValue)
-                ->Event("GetLightBlendValue", &EditorPortalRequestBus::Events::GetLightBlendValue)
-                ->VirtualProperty("LightBlendValue", "GetLightBlendValue", "SetLightBlendValue")
-                ;
-
-            behaviorContext->Class<EditorPortalComponent>()->RequestBus("EditorPortalRequestBus");
-        }
-
-        EditorPortalConfiguration::Reflect(context);
-    }
-
-    void EditorPortalConfiguration::OnChange()
-    {
-        EditorPortalRequestBus::Event(m_entityId, &EditorPortalRequests::UpdatePortalObject);
-    }
-
-    void EditorPortalConfiguration::OnVerticesChange()
-    {
-        EditorPortalRequestBus::Event(m_entityId, &EditorPortalRequests::UpdatePortalObject);
-        EditorPortalNotificationBus::Event(m_entityId, &EditorPortalNotifications::OnVerticesChangedInspector);
-    }
-
-    void EditorPortalConfiguration::SetEntityId(const AZ::EntityId entityId)
-    {
-        m_entityId = entityId;
-    }
-
-    EditorPortalComponent::~EditorPortalComponent()
-    {
-        if (m_area)
-        {
-            // reset the listener vis area in the unlucky case that we are deleting the
-            // vis area where the listener is currently in
-            // Audio: do we still need this?
-            GetIEditor()->Get3DEngine()->DeleteVisArea(m_area);
-            m_area = nullptr;
-        }
-    }
-
-    void EditorPortalComponent::Activate()
-    {
-        Base::Activate();
-
-        const AZ::EntityId entityId = GetEntityId();
-        m_config.SetEntityId(entityId);
-
-        // NOTE: We create the vis-area here at activated, but destroy it in the destructor.
-        // We have to do this, otherwise the vis-area is not saved into the level.
-        // Unfortunately, at this time we cannot create the vis-areas at game runtime.
-        // This means that dynamic slices cannot effectively contain vis-areas until we fix the core rendering system to allow that.
-
-        const auto visGUID = static_cast<AZ::u64>(entityId);
-        if(!m_area && GetIEditor())
-        {
-            m_area = GetIEditor()->Get3DEngine()->CreateVisArea(visGUID);
-        }
-
-        m_AZCachedWorldTransform = AZ::Transform::CreateIdentity();
-        m_cryCachedWorldTransform = Matrix34::CreateIdentity();
-
-        m_componentModeDelegate.ConnectWithSingleComponentMode<
-            EditorPortalComponent, EditorPortalComponentMode>(
-                AZ::EntityComponentIdPair(entityId, GetId()), this);
-
-        EditorPortalRequestBus::Handler::BusConnect(entityId);
-        AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::BusConnect(entityId);
-        AZ::TransformNotificationBus::Handler::BusConnect(entityId);
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(entityId);
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(entityId);
-        AzFramework::BoundsRequestBus::Handler::BusConnect(entityId);
-
-        //Call OnTransformChanged manually to cache current transform since it won't be called
-        //automatically for us when the level starts up.
-        AZ::Transform worldTM;
-        AZ::TransformBus::EventResult(worldTM, entityId, &AZ::TransformBus::Events::GetWorldTM);
-
-        //Use an identity transform for localTM because the
-        //OnTransformChanged impl for this class doesn't need it
-        OnTransformChanged(AZ::Transform::CreateIdentity(), worldTM);
-    }
-
-    void EditorPortalComponent::Deactivate()
-    {
-        m_componentModeDelegate.Disconnect();
-
-        AzFramework::BoundsRequestBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusDisconnect(GetEntityId());
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect(GetEntityId());
-        AZ::TransformNotificationBus::Handler::BusDisconnect(GetEntityId());
-        AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::BusDisconnect();
-        EditorPortalRequestBus::Handler::BusDisconnect();
-
-        Base::Deactivate();
-    }
-
-    void EditorPortalComponent::SetHeight(const float height)
-    {
-        m_config.m_height = height;
-        UpdatePortalObject();
-    }
-
-    float EditorPortalComponent::GetHeight()
-    {
-        return m_config.m_height;
-    }
-
-    void EditorPortalComponent::SetDisplayFilled(const bool filled)
-    {
-        m_config.m_displayFilled = filled;
-        UpdatePortalObject();
-    }
-
-    bool EditorPortalComponent::GetDisplayFilled()
-    {
-        return m_config.m_displayFilled;
-    }
-
-    void EditorPortalComponent::SetAffectedBySun(const bool affectedBySun)
-    {
-        m_config.m_affectedBySun = affectedBySun;
-        UpdatePortalObject();
-    }
-
-    bool EditorPortalComponent::GetAffectedBySun()
-    {
-        return m_config.m_affectedBySun;
-    }
-
-    void EditorPortalComponent::SetViewDistRatio(const float viewDistRatio)
-    {
-        m_config.m_viewDistRatio = viewDistRatio;
-        UpdatePortalObject();
-    }
-
-    float EditorPortalComponent::GetViewDistRatio()
-    {
-        return m_config.m_viewDistRatio;
-    }
-
-    void EditorPortalComponent::SetSkyOnly(const bool skyOnly)
-    {
-        m_config.m_skyOnly = skyOnly;
-        UpdatePortalObject();
-    }
-
-    bool EditorPortalComponent::GetSkyOnly()
-    {
-        return m_config.m_skyOnly;
-    }
-
-    void EditorPortalComponent::SetOceanIsVisible(const bool oceanVisible)
-    {
-        m_config.m_oceanIsVisible = oceanVisible;
-        UpdatePortalObject();
-    }
-
-    bool EditorPortalComponent::GetOceanIsVisible()
-    {
-        return m_config.m_oceanIsVisible;
-    }
-
-    void EditorPortalComponent::SetUseDeepness(const bool useDeepness)
-    {
-        m_config.m_useDeepness = useDeepness;
-        UpdatePortalObject();
-    }
-
-    bool EditorPortalComponent::GetUseDeepness()
-    {
-        return m_config.m_useDeepness;
-    }
-
-    void EditorPortalComponent::SetDoubleSide(const bool doubleSided)
-    {
-        m_config.m_doubleSide = doubleSided;
-        UpdatePortalObject();
-    }
-
-    bool EditorPortalComponent::GetDoubleSide()
-    {
-        return m_config.m_doubleSide;
-    }
-
-    void EditorPortalComponent::SetLightBlending(const bool lightBending)
-    {
-        m_config.m_lightBlending = lightBending;
-        UpdatePortalObject();
-    }
-
-    bool EditorPortalComponent::GetLightBlending()
-    {
-        return m_config.m_lightBlending;
-    }
-
-    void EditorPortalComponent::SetLightBlendValue(const float lightBendAmount)
-    {
-        m_config.m_lightBlendValue = lightBendAmount;
-        UpdatePortalObject();
-    }
-
-    float EditorPortalComponent::GetLightBlendValue()
-    {
-        return m_config.m_lightBlendValue;
-    }
-
-    bool EditorPortalComponent::GetVertex(const size_t index, AZ::Vector3& vertex) const
-    {
-        if (index < m_config.m_vertices.size())
-        {
-            vertex = m_config.m_vertices[index];
-            return true;
-        }
-
-        return false;
-    }
-
-    bool EditorPortalComponent::UpdateVertex(const size_t index, const AZ::Vector3& vertex)
-    {
-        if (index < m_config.m_vertices.size())
-        {
-            m_config.m_vertices[index] = vertex;
-            return true;
-        }
-
-        return false;
-    }
-
-    /// Update the object runtime after changes to the Configuration.
-    /// Called by the default RequestBus SetXXX implementations,
-    /// and used to initially set up the object the first time the
-    /// Configuration are set.
-    void EditorPortalComponent::UpdatePortalObject()
-    {
-        if (m_area)
-        {
-            SVisAreaInfo info;
-            info.vAmbientColor = Vec3(ZERO);
-            info.bAffectedByOutLights = m_config.m_affectedBySun;
-            info.bSkyOnly = m_config.m_skyOnly;
-            info.fViewDistRatio = m_config.m_viewDistRatio;
-            info.bDoubleSide = m_config.m_doubleSide;
-            info.bUseDeepness = m_config.m_useDeepness;
-            info.bUseInIndoors = true; //Does not apply to Portals (Portals are only in VisAreas)
-            info.bOceanIsVisible = m_config.m_oceanIsVisible;
-            info.fPortalBlending = -1.0f;
-
-            if (m_config.m_lightBlending)
-            {
-                info.fPortalBlending = m_config.m_lightBlendValue;
-            }
-
-            AZStd::string name = AZStd::string("Portal_") + GetEntity()->GetName();
-
-            // Calculate scaled height
-            // Height exists separate from plane points but we still want to scale it with the transform
-            info.fHeight = m_config.m_height;
-
-            /*
-               We have to derive at least 3 points and pass them to the vis area system
-               For now that means getting the 4 points of the bottom face of the box.
-
-               If we want to send *all* points of a shape the vis system we need to make sure
-               that Height is 0; otherwise it'll extend the AABB of the area upwards.
-             */
-
-            //Convert to Cry vectors and apply the transform to the given points
-            AZStd::fixed_vector<Vec3, 4> verts(4);
-            for (AZ::u32 i = 0; i < verts.size(); ++i)
-            {
-                verts[i] = AZVec3ToLYVec3(m_config.m_vertices[i]);
-                verts[i] = m_cryCachedWorldTransform.TransformPoint(verts[i]);
-            }
-
-            GetIEditor()->Get3DEngine()->UpdateVisArea(m_area, &verts[0], verts.size(), name.c_str(), info, true);
-
-            AZ::Interface<AzFramework::IEntityBoundsUnion>::Get()->RefreshEntityLocalBoundsUnion(GetEntityId());
-        }
-    }
-
-    void EditorPortalComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        //Cache the transform so that we don't have to retrieve it every time UpdatePortalObject is called
-        m_AZCachedWorldTransform = world;
-        m_cryCachedWorldTransform = AZTransformToLYTransform(m_AZCachedWorldTransform);
-
-        UpdatePortalObject();
-    }
-
-    struct PortalQuadVertices
-    {
-        AZ::Vector3 floorLeftFront;
-        AZ::Vector3 floorRightFront;
-        AZ::Vector3 floorLeftBack;
-        AZ::Vector3 floorRightBack;
-
-        AZ::Vector3 quadUpperLeftFront;
-        AZ::Vector3 quadUpperRightFront;
-        AZ::Vector3 quadUpperLeftBack;
-        AZ::Vector3 quadUpperRightBack;
-
-        AZ::Vector3 portalUpperLeftFront;
-        AZ::Vector3 portalUpperRightFront;
-        AZ::Vector3 portalUpperLeftBack;
-        AZ::Vector3 portalUpperRightBack;
-    };
-
-    PortalQuadVertices EditorPortalComponent::CalculatePortalQuadVertices(VertTranslation vertTranslation)
-    {
-        PortalQuadVertices pqv;
-
-        //Untransformed quad corners
-        const AZ::Vector3 lowerLeftFront = m_config.m_vertices[0];
-        const AZ::Vector3 lowerRightFront = m_config.m_vertices[1];
-        const AZ::Vector3 lowerLeftBack = m_config.m_vertices[3];
-        const AZ::Vector3 lowerRightBack = m_config.m_vertices[2];
-
-        //Need to calculate the height of the quad after transformation
-        const AZ::u32 quadPointCount = 4;
-        AZ::Vector3 transformedQuadPoints[quadPointCount];
-
-        transformedQuadPoints[0] = m_AZCachedWorldTransform.TransformPoint(lowerLeftFront);
-        transformedQuadPoints[1] = m_AZCachedWorldTransform.TransformPoint(lowerRightFront);
-        transformedQuadPoints[2] = m_AZCachedWorldTransform.TransformPoint(lowerLeftBack);
-        transformedQuadPoints[3] = m_AZCachedWorldTransform.TransformPoint(lowerRightBack);
-
-        const AZ::Vector3 translation = m_AZCachedWorldTransform.GetTranslation();
-
-        float minHeight = FLT_MAX;
-        float maxHeight = FLT_MIN;
-
-        for (auto& transformedQuadPoint : transformedQuadPoints)
-        {
-            // remove translation from quad points so we can use them with the DisplayContext's usage of the transform
-            if (vertTranslation == VertTranslation::Remove)
-            {
-                transformedQuadPoint -= translation;
-            }
-
-            const float height = transformedQuadPoint.GetZ();
-            if (height < minHeight)
-            {
-                minHeight = height;
-            }
-            if (height > maxHeight)
-            {
-                maxHeight = height;
-            }
-        }
-
-        pqv.floorLeftFront = AZ::Vector3(transformedQuadPoints[0].GetX(), transformedQuadPoints[0].GetY(), minHeight);
-        pqv.floorRightFront = AZ::Vector3(transformedQuadPoints[1].GetX(), transformedQuadPoints[1].GetY(), minHeight);
-        pqv.floorLeftBack = AZ::Vector3(transformedQuadPoints[2].GetX(), transformedQuadPoints[2].GetY(), minHeight);
-        pqv.floorRightBack = AZ::Vector3(transformedQuadPoints[3].GetX(), transformedQuadPoints[3].GetY(), minHeight);
-
-        pqv.quadUpperLeftFront = AZ::Vector3(transformedQuadPoints[0].GetX(), transformedQuadPoints[0].GetY(), maxHeight);
-        pqv.quadUpperRightFront = AZ::Vector3(transformedQuadPoints[1].GetX(), transformedQuadPoints[1].GetY(), maxHeight);
-        pqv.quadUpperLeftBack = AZ::Vector3(transformedQuadPoints[2].GetX(), transformedQuadPoints[2].GetY(), maxHeight);
-        pqv.quadUpperRightBack = AZ::Vector3(transformedQuadPoints[3].GetX(), transformedQuadPoints[3].GetY(), maxHeight);
-
-        pqv.portalUpperLeftFront = AZ::Vector3(transformedQuadPoints[0].GetX(), transformedQuadPoints[0].GetY(), maxHeight + m_config.m_height);
-        pqv.portalUpperRightFront = AZ::Vector3(transformedQuadPoints[1].GetX(), transformedQuadPoints[1].GetY(), maxHeight + m_config.m_height);
-        pqv.portalUpperLeftBack = AZ::Vector3(transformedQuadPoints[2].GetX(), transformedQuadPoints[2].GetY(), maxHeight + m_config.m_height);
-        pqv.portalUpperRightBack = AZ::Vector3(transformedQuadPoints[3].GetX(), transformedQuadPoints[3].GetY(), maxHeight + m_config.m_height);
-
-        return pqv;
-    }
-
-    void EditorPortalComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        /*
-           IMPORTANT NOTE: This method may seem very complicated but it is an accurate visualization of
-           how portals actually work. The legacy visualization used with the legacy portal entity is
-           very misleading!
-
-           Portals always exist as a quad but if the quad becomes non-planar, from rotation or in the legacy
-           system from a point being pulled up or down, the volume changes in a non-obvious way. Instead of portal
-           existing as the shape defined by 4 points and extruded upwards, the portal actually remains planar.
-           Any height difference that you add by making the shape non-planar is just applied to the height of the volume.
-
-           If this is confusing, please actually look at the visualization created by this method. Make sure
-           that you rotate the portal in many weird contorted ways and examine how the visualization reacts.
-           The portal volume is always going to be a box rotated on only X and Y axes that stretches up along the Z axis.
-
-           Important note on the complexity of this method:
-           We cannot directly visualize the OBB of the portal with an AABB that we then transform. The OBB that's mentioned
-           here is best imagined as the top plane being all points of the quad pulled up to the height of the highest quad's vert
-           and the bottom plane being all points of the quad pulled down to the height of the lowest quad's vert. Trying to
-           create an AABB from these points won't produce the correct visualization under complex rotations as the Min and Max
-           of the AABB will either only encompass part of the bounding volume or be too large.
-         */
-
-        const PortalQuadVertices pqv = CalculatePortalQuadVertices(VertTranslation::Remove);
-
-        //Draw the outline of the OBB of the Portal's quad
-        AZ::Color color(0.000f, 1.0f, 0.000f, 1.0f);
-        debugDisplay.SetColor(AZ::Vector4(color.GetR(), color.GetG(), color.GetB(), 1.f));
-
-        //Remove all rotation from the transform
-        const AZ::Quaternion rotation = AZ::Quaternion::CreateIdentity();
-
-        AZ::Transform worldTMOnlyZRot = m_AZCachedWorldTransform;
-        worldTMOnlyZRot.SetRotation(rotation);
-
-        debugDisplay.PushMatrix(worldTMOnlyZRot);
-
-        //Draw the outline of the OBB of the portal quad
-
-        //Bottom
-        debugDisplay.DrawLine(pqv.floorLeftFront, pqv.floorRightFront);
-        debugDisplay.DrawLine(pqv.floorRightFront, pqv.floorRightBack);
-        debugDisplay.DrawLine(pqv.floorRightBack, pqv.floorLeftBack);
-        debugDisplay.DrawLine(pqv.floorLeftBack, pqv.floorLeftFront);
-        //Top
-        debugDisplay.DrawLine(pqv.quadUpperLeftFront, pqv.quadUpperRightFront);
-        debugDisplay.DrawLine(pqv.quadUpperRightFront, pqv.quadUpperRightBack);
-        debugDisplay.DrawLine(pqv.quadUpperRightBack, pqv.quadUpperLeftBack);
-        debugDisplay.DrawLine(pqv.quadUpperLeftBack, pqv.quadUpperLeftFront);
-        //Left
-        debugDisplay.DrawLine(pqv.floorLeftFront, pqv.quadUpperLeftFront);
-        debugDisplay.DrawLine(pqv.quadUpperLeftFront, pqv.quadUpperLeftBack);
-        debugDisplay.DrawLine(pqv.quadUpperLeftBack, pqv.floorLeftBack);
-        debugDisplay.DrawLine(pqv.floorLeftBack, pqv.floorLeftFront);
-        //Right
-        debugDisplay.DrawLine(pqv.floorRightFront, pqv.quadUpperRightFront);
-        debugDisplay.DrawLine(pqv.quadUpperRightFront, pqv.quadUpperRightBack);
-        debugDisplay.DrawLine(pqv.quadUpperRightBack, pqv.floorRightBack);
-        debugDisplay.DrawLine(pqv.floorRightBack, pqv.floorRightFront);
-        //Front
-        debugDisplay.DrawLine(pqv.floorLeftFront, pqv.floorRightFront);
-        debugDisplay.DrawLine(pqv.floorRightFront, pqv.quadUpperRightFront);
-        debugDisplay.DrawLine(pqv.quadUpperRightFront, pqv.quadUpperLeftFront);
-        debugDisplay.DrawLine(pqv.quadUpperLeftFront, pqv.floorLeftFront);
-        //Back
-        debugDisplay.DrawLine(pqv.floorLeftBack, pqv.floorRightBack);
-        debugDisplay.DrawLine(pqv.floorRightBack, pqv.quadUpperRightBack);
-        debugDisplay.DrawLine(pqv.quadUpperRightBack, pqv.quadUpperLeftBack);
-        debugDisplay.DrawLine(pqv.quadUpperLeftBack, pqv.floorLeftBack);
-
-        //Now draw the entire portal volume (Previous OBB + extra height)
-        if (m_config.m_displayFilled)
-        {
-            //Draw whole portal with less alpha
-            debugDisplay.SetColor(AZ::Vector4(color.GetR(), color.GetG(), color.GetB(), 0.1f));
-
-            //Draw both winding orders for quads so they appear solid from all angles
-            //Not drawing boxes because the corners of the quad may not be hit if the bounds are rotated oddly
-
-            //Bottom
-            debugDisplay.DrawQuad(pqv.floorLeftFront, pqv.floorRightFront, pqv.floorRightBack, pqv.floorLeftBack);
-            debugDisplay.DrawQuad(pqv.floorLeftFront, pqv.floorLeftBack, pqv.floorRightBack, pqv.floorRightFront);
-            //Top
-            debugDisplay.DrawQuad(pqv.portalUpperLeftFront, pqv.portalUpperRightFront, pqv.portalUpperRightBack, pqv.portalUpperLeftBack);
-            debugDisplay.DrawQuad(pqv.portalUpperLeftFront, pqv.portalUpperLeftBack, pqv.portalUpperRightBack, pqv.portalUpperRightFront);
-            //Left
-            debugDisplay.DrawQuad(pqv.floorLeftFront, pqv.portalUpperLeftFront, pqv.portalUpperLeftBack, pqv.floorLeftBack);
-            debugDisplay.DrawQuad(pqv.floorLeftFront, pqv.floorLeftBack, pqv.portalUpperLeftBack, pqv.portalUpperLeftFront);
-            //Right
-            debugDisplay.DrawQuad(pqv.floorRightFront, pqv.portalUpperRightFront, pqv.portalUpperRightBack, pqv.floorRightBack);
-            debugDisplay.DrawQuad(pqv.floorRightFront, pqv.floorRightBack, pqv.portalUpperRightBack, pqv.portalUpperRightFront);
-            //Front
-            debugDisplay.DrawQuad(pqv.floorLeftFront, pqv.floorRightFront, pqv.portalUpperRightFront, pqv.portalUpperLeftFront);
-            debugDisplay.DrawQuad(pqv.floorLeftFront, pqv.portalUpperLeftFront, pqv.portalUpperRightFront, pqv.floorRightFront);
-            //Back
-            debugDisplay.DrawQuad(pqv.floorLeftBack, pqv.floorRightBack, pqv.portalUpperRightBack, pqv.portalUpperLeftBack);
-            debugDisplay.DrawQuad(pqv.floorLeftBack, pqv.portalUpperLeftBack, pqv.portalUpperRightBack, pqv.floorRightBack);
-        }
-        else
-        {
-            //Bottom
-            debugDisplay.DrawLine(pqv.floorLeftFront, pqv.floorRightFront);
-            debugDisplay.DrawLine(pqv.floorRightFront, pqv.floorRightBack);
-            debugDisplay.DrawLine(pqv.floorRightBack, pqv.floorLeftBack);
-            debugDisplay.DrawLine(pqv.floorLeftBack, pqv.floorLeftFront);
-            //Top
-            debugDisplay.DrawLine(pqv.portalUpperLeftFront, pqv.portalUpperRightFront);
-            debugDisplay.DrawLine(pqv.portalUpperRightFront, pqv.portalUpperRightBack);
-            debugDisplay.DrawLine(pqv.portalUpperRightBack, pqv.portalUpperLeftBack);
-            debugDisplay.DrawLine(pqv.portalUpperLeftBack, pqv.portalUpperLeftFront);
-            //Left
-            debugDisplay.DrawLine(pqv.floorLeftFront, pqv.portalUpperLeftFront);
-            debugDisplay.DrawLine(pqv.portalUpperLeftFront, pqv.portalUpperLeftBack);
-            debugDisplay.DrawLine(pqv.portalUpperLeftBack, pqv.floorLeftBack);
-            debugDisplay.DrawLine(pqv.floorLeftBack, pqv.floorLeftFront);
-            //Right
-            debugDisplay.DrawLine(pqv.floorRightFront, pqv.portalUpperRightFront);
-            debugDisplay.DrawLine(pqv.portalUpperRightFront, pqv.portalUpperRightBack);
-            debugDisplay.DrawLine(pqv.portalUpperRightBack, pqv.floorRightBack);
-            debugDisplay.DrawLine(pqv.floorRightBack, pqv.floorRightFront);
-            //Front
-            debugDisplay.DrawLine(pqv.floorLeftFront, pqv.floorRightFront);
-            debugDisplay.DrawLine(pqv.floorRightFront, pqv.portalUpperRightFront);
-            debugDisplay.DrawLine(pqv.portalUpperRightFront, pqv.portalUpperLeftFront);
-            debugDisplay.DrawLine(pqv.portalUpperLeftFront, pqv.floorLeftFront);
-            //Back
-            debugDisplay.DrawLine(pqv.floorLeftBack, pqv.floorRightBack);
-            debugDisplay.DrawLine(pqv.floorRightBack, pqv.portalUpperRightBack);
-            debugDisplay.DrawLine(pqv.portalUpperRightBack, pqv.portalUpperLeftBack);
-            debugDisplay.DrawLine(pqv.portalUpperLeftBack, pqv.floorLeftBack);
-        }
-
-        if (m_componentModeDelegate.AddedToComponentMode())
-        {
-            AzToolsFramework::VertexContainerDisplay::DisplayVertexContainerIndices(
-                debugDisplay, AzToolsFramework::FixedVerticesArray<AZ::Vector3, 4>(m_config.m_vertices),
-                GetWorldTM(), AZ::Vector3::CreateOne(), IsSelected());
-        }
-
-        debugDisplay.PopMatrix();
-    }
-
-    void EditorPortalComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        gameEntity->CreateComponent<PortalComponent>(m_config);
-    }
-
-    AZ::Aabb EditorPortalComponent::GetEditorSelectionBoundsViewport(const AzFramework::ViewportInfo& /*viewportInfo*/)
-    {
-        const PortalQuadVertices pqv = CalculatePortalQuadVertices(VertTranslation::Keep);
-
-        AZ::Aabb bbox = AZ::Aabb::CreateNull();
-        bbox.AddPoint(pqv.floorLeftFront);
-        bbox.AddPoint(pqv.floorRightFront);
-        bbox.AddPoint(pqv.floorLeftBack);
-        bbox.AddPoint(pqv.floorRightBack);
-        bbox.AddPoint(pqv.portalUpperLeftFront);
-        return bbox;
-    }
-
-    bool EditorPortalComponent::EditorSelectionIntersectRayViewport(
-        const AzFramework::ViewportInfo& /*viewportInfo*/, const AZ::Vector3& src,
-        const AZ::Vector3& dir, float& distance)
-    {
-        float t;
-        float intermediateT = FLT_MAX;
-
-        const PortalQuadVertices pqv = CalculatePortalQuadVertices(VertTranslation::Keep);
-
-        //Count each quad for intersection hits, two hits implies we are intersecting the prism from outside of it (or from too far)
-        AZ::u8 hits = 0;
-
-        //Bottom
-        if (AZ::Intersect::IntersectRayQuad(src, dir, pqv.floorLeftFront, pqv.floorRightFront, pqv.floorRightBack, pqv.floorLeftBack, t))
-        { 
-            ++hits; 
-            intermediateT = AZStd::GetMin(t, intermediateT);
-        }
-        //Top
-        if (AZ::Intersect::IntersectRayQuad(src, dir, pqv.portalUpperLeftFront, pqv.portalUpperRightFront, pqv.portalUpperRightBack, pqv.portalUpperLeftBack, t))
-        { 
-            ++hits; 
-            intermediateT = AZStd::GetMin(t, intermediateT);
-        }
-
-        //Left
-        if (AZ::Intersect::IntersectRayQuad(src, dir, pqv.floorLeftFront, pqv.portalUpperLeftFront, pqv.portalUpperLeftBack, pqv.floorLeftBack, t))
-        { 
-            ++hits;
-            intermediateT = AZStd::GetMin(t, intermediateT);
-        }
-        //Right
-        if (AZ::Intersect::IntersectRayQuad(src, dir, pqv.floorRightFront, pqv.portalUpperRightFront, pqv.portalUpperRightBack, pqv.floorRightBack, t))
-        { 
-            ++hits;
-            intermediateT = AZStd::GetMin(t, intermediateT);
-        }
-        //Front
-        if (AZ::Intersect::IntersectRayQuad(src, dir, pqv.floorLeftFront, pqv.floorRightFront, pqv.portalUpperRightFront, pqv.portalUpperLeftFront, t))
-        { 
-            ++hits;
-            intermediateT = AZStd::GetMin(t, intermediateT);
-        }
-        //Back
-        if (AZ::Intersect::IntersectRayQuad(src, dir, pqv.floorLeftBack, pqv.floorRightBack, pqv.portalUpperRightBack, pqv.portalUpperLeftBack, t)) 
-        { 
-            ++hits;
-            intermediateT = AZStd::GetMin(t, intermediateT);
-        }
-
-        if (hits > 0)
-        {
-            distance = intermediateT;
-        }
-        return hits >= 2;
-    }
-
-    AZ::Aabb EditorPortalComponent::GetWorldBounds()
-    {
-        return GetLocalBounds().GetTransformedAabb(m_AZCachedWorldTransform);
-    }
-
-    AZ::Aabb EditorPortalComponent::GetLocalBounds()
-    {
-        AZ::Aabb bbox = AZ::Aabb::CreateNull();
-        for (const auto& vertex : m_config.m_vertices)
-        {
-            bbox.AddPoint(vertex);
-        }
-        return bbox;
-    }
-} //namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorPortalComponent.h b/Gems/Visibility/Code/Source/EditorPortalComponent.h
deleted file mode 100644
index a8e00b9698..0000000000
--- a/Gems/Visibility/Code/Source/EditorPortalComponent.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzFramework/Visibility/BoundsBus.h>
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/ComponentMode/ComponentModeDelegate.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-
-#include "PortalComponent.h"
-#include "EditorPortalComponentBus.h"
-
-namespace Visibility
-{
-    class EditorPortalComponent;
-    struct PortalQuadVertices;
-
-    class EditorPortalConfiguration
-        : public PortalConfiguration
-    {
-    public:
-        AZ_TYPE_INFO_LEGACY(EditorPortalConfiguration, "{C9F99449-7A77-50C4-9ED3-D69B923BFDBD}", PortalConfiguration);
-        AZ_CLASS_ALLOCATOR(EditorPortalConfiguration, AZ::SystemAllocator,0);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void OnChange() override;
-        void OnVerticesChange() override;
-
-        void SetEntityId(AZ::EntityId entityId);
-
-    private:
-        AZ::EntityId m_entityId;
-    };
-
-    class EditorPortalComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , private EditorPortalRequestBus::Handler
-        , private AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler
-        , private AzFramework::EntityDebugDisplayEventBus::Handler
-        , private AzToolsFramework::EditorComponentSelectionRequestsBus::Handler
-        , public AZ::TransformNotificationBus::Handler
-        , public AzFramework::BoundsRequestBus::Handler
-    {
-        friend class EditorPortalConfiguration;
-
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-
-    public:
-        AZ_COMPONENT(EditorPortalComponent, "{64525CDD-7DD4-5CEF-B545-559127DC834E}", AzToolsFramework::Components::EditorComponentBase);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        EditorPortalComponent() = default;
-        EditorPortalComponent(const EditorPortalComponent&) = delete;
-        EditorPortalComponent& operator=(const EditorPortalComponent&) = delete;
-        ~EditorPortalComponent() override;
-
-        // EditorComponentBase overrides ...
-        void Activate() override;
-        void Deactivate() override;
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        // TransformNotificationBus overrides ...
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // EditorComponentSelectionRequestsBus overrides ...
-        AZ::Aabb GetEditorSelectionBoundsViewport(
-            const AzFramework::ViewportInfo& viewportInfo) override;
-        bool EditorSelectionIntersectRayViewport(
-            const AzFramework::ViewportInfo& viewportInfo, const AZ::Vector3& src,
-            const AZ::Vector3& dir, float& distance) override;
-        bool SupportsEditorRayIntersect() override { return true; }
-
-        // PortalRequestBus overrides ...
-        void SetHeight(float height) override;
-        float GetHeight() override;
-        void SetDisplayFilled(bool filled) override;
-        bool GetDisplayFilled() override;
-        void SetAffectedBySun(bool affectedBySun) override;
-        bool GetAffectedBySun() override;
-        void SetViewDistRatio(float viewDistRatio) override;
-        float GetViewDistRatio() override;
-        void SetSkyOnly(bool skyOnly) override;
-        bool GetSkyOnly() override;
-        void SetOceanIsVisible(bool oceanVisible) override;
-        bool GetOceanIsVisible() override;
-        void SetUseDeepness(bool useDeepness) override;
-        bool GetUseDeepness() override;
-        void SetDoubleSide(bool doubleSided) override;
-        bool GetDoubleSide() override;
-        void SetLightBlending(bool lightBending) override;
-        bool GetLightBlending() override;
-        void SetLightBlendValue(float lightBendAmount) override;
-        float GetLightBlendValue() override;
-        bool GetVertex(size_t index, AZ::Vector3& vertex) const override;
-        bool UpdateVertex(size_t index, const AZ::Vector3& vertex) override;
-        size_t Size() const override { return m_config.m_vertices.size(); }
-        void UpdatePortalObject() override;
-
-        // EntityDebugDisplayBus overrides ...
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        // BoundsRequestBus overrides ...
-        AZ::Aabb GetWorldBounds() override;
-        AZ::Aabb GetLocalBounds() override;
-
-    private:
-        enum class VertTranslation
-        {
-            Keep,
-            Remove
-        };
-
-        PortalQuadVertices CalculatePortalQuadVertices(VertTranslation vertTranslation);
-
-        // Reflected members
-        EditorPortalConfiguration m_config;
-
-        using ComponentModeDelegate = AzToolsFramework::ComponentModeFramework::ComponentModeDelegate;
-        ComponentModeDelegate m_componentModeDelegate; ///< Responsible for detecting ComponentMode activation
-                                                       ///< and creating a concrete ComponentMode.
-
-        AZ::Transform m_AZCachedWorldTransform;
-        Matrix44 m_cryCachedWorldTransform;
-        IVisArea* m_area = nullptr;
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorPortalComponentMode.cpp b/Gems/Visibility/Code/Source/EditorPortalComponentMode.cpp
deleted file mode 100644
index 5d9b089c65..0000000000
--- a/Gems/Visibility/Code/Source/EditorPortalComponentMode.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include "Visibility_precompiled.h"
-#include "EditorPortalComponentMode.h"
-
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
-
-namespace Visibility
-{
-    AZ_CLASS_ALLOCATOR_IMPL(EditorPortalComponentMode, AZ::SystemAllocator, 0)
-
-    EditorPortalComponentMode::EditorPortalComponentMode(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType)
-        : EditorBaseComponentMode(entityComponentIdPair, componentType)
-    {
-        CreateManipulators();
-
-        AZ::TransformNotificationBus::Handler::BusConnect(entityComponentIdPair.GetEntityId());
-        EditorPortalNotificationBus::Handler::BusConnect(entityComponentIdPair.GetEntityId());
-    }
-
-    EditorPortalComponentMode::~EditorPortalComponentMode()
-    {
-        EditorPortalNotificationBus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-
-        m_vertexSelection.Destroy();
-    }
-
-    void EditorPortalComponentMode::CreateManipulators()
-    {
-        using namespace AzToolsFramework;
-
-        m_vertexSelection.Create(
-            AZ::EntityComponentIdPair(GetEntityId(), GetComponentId()), g_mainManipulatorManagerId,
-            AZStd::make_unique<NullHoverSelection>(),
-            TranslationManipulators::Dimensions::Three,
-            ConfigureTranslationManipulatorAppearance3d);
-
-        m_vertexSelection.SetVertexPositionsUpdatedCallback([this]()
-        {
-            EditorPortalRequestBus::Event(
-                GetEntityId(), &EditorPortalRequests::UpdatePortalObject);
-        });
-    }
-
-    void EditorPortalComponentMode::OnTransformChanged(
-        const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_vertexSelection.RefreshSpace(world);
-    }
-
-    void EditorPortalComponentMode::OnVerticesChangedInspector()
-    {
-        m_vertexSelection.RefreshLocal();
-    }
-
-    void EditorPortalComponentMode::Refresh()
-    {
-        // destroy and recreate manipulators when container is modified (vertices are added or removed)
-        m_vertexSelection.Destroy();
-        CreateManipulators();
-    }
-
-    AZStd::vector<AzToolsFramework::ActionOverride> EditorPortalComponentMode::PopulateActionsImpl()
-    {
-        return m_vertexSelection.ActionOverrides();
-    }
-
-    bool EditorPortalComponentMode::HandleMouseInteraction(
-        const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction)
-    {
-        return m_vertexSelection.HandleMouse(mouseInteraction);
-    }
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorPortalComponentMode.h b/Gems/Visibility/Code/Source/EditorPortalComponentMode.h
deleted file mode 100644
index 633c3a1ba8..0000000000
--- a/Gems/Visibility/Code/Source/EditorPortalComponentMode.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzToolsFramework/ComponentMode/EditorBaseComponentMode.h>
-#include <AzToolsFramework/Manipulators/EditorVertexSelection.h>
-
-#include "EditorPortalComponentBus.h"
-
-namespace Visibility
-{
-    class EditorPortalComponentMode
-        : public AzToolsFramework::ComponentModeFramework::EditorBaseComponentMode
-        , private AZ::TransformNotificationBus::Handler
-        , private EditorPortalNotificationBus::Handler
-    {
-    public:
-        AZ_CLASS_ALLOCATOR_DECL
-
-        EditorPortalComponentMode(
-            const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType);
-        ~EditorPortalComponentMode();
-
-    private:
-        // EditorBaseComponentMode
-        void Refresh() override;
-        AZStd::vector<AzToolsFramework::ActionOverride> PopulateActionsImpl() override;
-        bool HandleMouseInteraction(
-            const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
-
-        // Manipulator handling
-        void CreateManipulators();
-
-        // TransformNotificationBus
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // EditorPortalNotificationBus
-        void OnVerticesChangedInspector() override;
-
-        AzToolsFramework::EditorVertexSelectionFixed<AZ::Vector3> m_vertexSelection; ///< Handles all manipulator interactions with vertices.
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorVisAreaComponent.cpp b/Gems/Visibility/Code/Source/EditorVisAreaComponent.cpp
deleted file mode 100644
index ddd18e2da8..0000000000
--- a/Gems/Visibility/Code/Source/EditorVisAreaComponent.cpp
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Visibility_precompiled.h"
-#include "EditorVisAreaComponent.h"
-#include "EditorVisAreaComponentMode.h"
-
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Math/IntersectSegment.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzToolsFramework/Viewport/VertexContainerDisplay.h>
-#include <Editor/Objects/BaseObject.h>
-
-// Include files needed for writing DisplayEntity functions that access the DisplayContext directly.
-#include <EditorCoreAPI.h>
-
-#include "MathConversion.h"
-
-namespace Visibility
-{
-    /*static*/ AZ::Color EditorVisAreaComponent::s_visAreaColor = AZ::Color(1.0f, 0.5f, 0.0f, 1.0f);
-
-    void EditorVisAreaComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-    {
-        provided.push_back(AZ_CRC("EditorVisAreaService", 0x4507d2ae));
-        provided.push_back(AZ_CRC("VisAreaService", 0x0c063fb9));
-        provided.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
-        provided.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
-    }
-
-    void EditorVisAreaComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires)
-    {
-        requires.push_back(AZ_CRC("TransformService", 0x8ee22c50));
-    }
-
-    void EditorVisAreaComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-    {
-        incompatible.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
-        incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
-    }
-
-    void EditorVisAreaConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorVisAreaConfiguration, VisAreaConfiguration>()
-                ->Version(1);
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorVisAreaConfiguration>("VisArea Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
-
-                editContext->Class<VisAreaConfiguration>("VisArea Configuration", "")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &VisAreaConfiguration::m_height, "Height", "How tall the VisArea is.")
-                        ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &VisAreaConfiguration::ChangeHeight)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &VisAreaConfiguration::m_displayFilled, "DisplayFilled", "Display the VisArea as a filled volume.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &VisAreaConfiguration::ChangeDisplayFilled)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &VisAreaConfiguration::m_affectedBySun, "AffectedBySun", "Allows sunlight to affect objects inside the VisArea.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &VisAreaConfiguration::ChangeAffectedBySun)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &VisAreaConfiguration::m_viewDistRatio, "ViewDistRatio", "Specifies how far the VisArea is rendered.")
-                        ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-                        ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &VisAreaConfiguration::ChangeViewDistRatio)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &VisAreaConfiguration::m_oceanIsVisible, "OceanIsVisible", "Ocean will be visible when looking outside the VisArea.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &VisAreaConfiguration::ChangeOceanIsVisible)
-                    // note: This will not work as expected. See Activate where we set the callbacks on the vertex container directly
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &VisAreaConfiguration::m_vertexContainer, "Vertices", "Points that make up the floor of the VisArea.")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &VisAreaConfiguration::ChangeVertexContainer)
-                        ;
-            }
-        }
-    }
-
-    void EditorVisAreaComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorVisAreaComponent, AzToolsFramework::Components::EditorComponentBase>()
-                ->Version(2)
-                ->Field("m_config", &EditorVisAreaComponent::m_config)
-                ->Field("ComponentMode", &EditorVisAreaComponent::m_componentModeDelegate)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorVisAreaComponent>("VisArea", "An area where only objects inside the area will be visible.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Category, "Rendering")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/VisArea.png")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/VisArea.svg")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/vis-area-component")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorVisAreaComponent::m_config, "m_config", "No Description")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorVisAreaComponent::m_componentModeDelegate, "Component Mode", "VisArea Component Mode")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ;
-            }
-        }
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<EditorVisAreaComponentRequestBus>("EditorVisAreaComponentRequestBus")
-                ->Event("SetHeight", &EditorVisAreaComponentRequestBus::Events::SetHeight)
-                ->Event("GetHeight", &EditorVisAreaComponentRequestBus::Events::GetHeight)
-                ->VirtualProperty("Height", "GetHeight", "SetHeight")
-
-                ->Event("SetDisplayFilled", &EditorVisAreaComponentRequestBus::Events::SetDisplayFilled)
-                ->Event("GetDisplayFilled", &EditorVisAreaComponentRequestBus::Events::GetDisplayFilled)
-                ->VirtualProperty("DisplayFilled", "GetDisplayFilled", "SetDisplayFilled")
-
-                ->Event("SetAffectedBySun", &EditorVisAreaComponentRequestBus::Events::SetAffectedBySun)
-                ->Event("GetAffectedBySun", &EditorVisAreaComponentRequestBus::Events::GetAffectedBySun)
-                ->VirtualProperty("AffectedBySun", "GetAffectedBySun", "SetAffectedBySun")
-
-                ->Event("SetViewDistRatio", &EditorVisAreaComponentRequestBus::Events::SetViewDistRatio)
-                ->Event("GetViewDistRatio", &EditorVisAreaComponentRequestBus::Events::GetViewDistRatio)
-                ->VirtualProperty("ViewDistRatio", "GetViewDistRatio", "SetViewDistRatio")
-
-                ->Event("SetOceanIsVisible", &EditorVisAreaComponentRequestBus::Events::SetOceanIsVisible)
-                ->Event("GetOceanIsVisible", &EditorVisAreaComponentRequestBus::Events::GetOceanIsVisible)
-                ->VirtualProperty("OceanIsVisible", "GetOceanIsVisible", "SetOceanIsVisible")
-                ;
-
-            behaviorContext->Class<EditorVisAreaComponent>()->RequestBus("EditorVisAreaComponentRequestBus");
-        }
-
-        EditorVisAreaConfiguration::Reflect(context);
-    }
-
-    void EditorVisAreaConfiguration::ChangeHeight()
-    {
-        EditorVisAreaComponentRequestBus::Event(
-            m_entityId, &EditorVisAreaComponentRequests::UpdateVisAreaObject);
-    }
-
-    void EditorVisAreaConfiguration::ChangeDisplayFilled()
-    {
-        EditorVisAreaComponentRequestBus::Event(
-            m_entityId, &EditorVisAreaComponentRequests::UpdateVisAreaObject);
-    }
-
-    void EditorVisAreaConfiguration::ChangeAffectedBySun()
-    {
-        EditorVisAreaComponentRequestBus::Event(
-            m_entityId, &EditorVisAreaComponentRequests::UpdateVisAreaObject);
-    }
-
-    void EditorVisAreaConfiguration::ChangeViewDistRatio()
-    {
-        EditorVisAreaComponentRequestBus::Event(
-            m_entityId, &EditorVisAreaComponentRequests::UpdateVisAreaObject);
-    }
-
-    void EditorVisAreaConfiguration::ChangeOceanIsVisible()
-    {
-        EditorVisAreaComponentRequestBus::Event(
-            m_entityId, &EditorVisAreaComponentRequests::UpdateVisAreaObject);
-    }
-
-    void EditorVisAreaConfiguration::ChangeVertexContainer()
-    {
-        EditorVisAreaComponentRequestBus::Event(
-            m_entityId, &EditorVisAreaComponentRequests::UpdateVisAreaObject);
-    }
-
-    void EditorVisAreaConfiguration::SetEntityId(const AZ::EntityId entityId)
-    {
-        m_entityId = entityId;
-    }
-
-    EditorVisAreaComponent::~EditorVisAreaComponent()
-    {
-        if (m_area)
-        {
-            // Reset the listener vis area in the unlucky case that we are deleting the
-            // vis area where the listener is currently in
-            GetIEditor()->Get3DEngine()->DeleteVisArea(m_area);
-            m_area = nullptr;
-        }
-    }
-
-    void EditorVisAreaComponent::Activate()
-    {
-        Base::Activate();
-
-        const AZ::EntityId entityId = GetEntityId();
-
-        // NOTE: We create the vis-area here at activated, but destroy it in the destructor.
-        // We have to do this, otherwise the vis-area is not saved into the level.
-        // Unfortunately, at this time we cannot create the vis-areas at game runtime.
-        // This means that dynamic slices cannot effectively contain vis areas until we fix the core rendering system to allow that.
-
-        const auto visGUID = AZ::u64(entityId);
-        if(!m_area && GetIEditor())
-        {
-            m_area = GetIEditor()->Get3DEngine()->CreateVisArea(visGUID);
-        }
-
-        m_componentModeDelegate.ConnectWithSingleComponentMode<
-            EditorVisAreaComponent, EditorVisAreaComponentMode>(
-                AZ::EntityComponentIdPair(entityId, GetId()), this);
-
-        // give default values to the vertices if needed
-        if (m_config.m_vertexContainer.Size() == 0)
-        {
-            m_config.m_vertexContainer.AddVertex(AZ::Vector3(-1.0f, -1.0f, 0.0f));
-            m_config.m_vertexContainer.AddVertex(AZ::Vector3(+1.0f, -1.0f, 0.0f));
-            m_config.m_vertexContainer.AddVertex(AZ::Vector3(+1.0f, +1.0f, 0.0f));
-            m_config.m_vertexContainer.AddVertex(AZ::Vector3(-1.0f, +1.0f, 0.0f));
-        }
-
-        const auto vertexAdded = [this](size_t vertIndex)
-        {
-            EditorVisAreaComponentNotificationBus::Event(
-                GetEntityId(), &EditorVisAreaComponentNotifications::OnVertexAdded, vertIndex);
-
-            UpdateVisAreaObject();
-        };
-
-        const auto vertexRemoved = [this](size_t vertIndex)
-        {
-            EditorVisAreaComponentNotificationBus::Event(
-                GetEntityId(), &EditorVisAreaComponentNotifications::OnVertexRemoved, vertIndex);
-
-            UpdateVisAreaObject();
-        };
-
-        const auto vertexChanged = [this](size_t vertIndex)
-        {
-            EditorVisAreaComponentNotificationBus::Event(
-                GetEntityId(), &EditorVisAreaComponentNotifications::OnVertexUpdated, vertIndex);
-
-            UpdateVisAreaObject();
-        };
-
-        const auto verticesSet = [this]()
-        {
-            EditorVisAreaComponentNotificationBus::Event(
-                GetEntityId(), &EditorVisAreaComponentNotifications::OnVerticesSet,
-                m_config.m_vertexContainer.GetVertices());
-
-            UpdateVisAreaObject();
-        };
-
-        const auto verticesCleared = [this]()
-        {
-            EditorVisAreaComponentNotificationBus::Event(
-                GetEntityId(), &EditorVisAreaComponentNotifications::OnVerticesCleared);
-
-            UpdateVisAreaObject();
-        };
-
-        m_config.m_vertexContainer.SetCallbacks(
-            vertexAdded, vertexRemoved, vertexChanged,
-            verticesSet, verticesCleared);
-
-        m_config.SetEntityId(entityId);
-
-        AZ::TransformBus::EventResult(
-            m_currentWorldTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-
-        // make the initial vis area with the data we just parsed
-        UpdateVisAreaObject();
-
-        EditorVisAreaComponentRequestBus::Handler::BusConnect(entityId);
-        AZ::VariableVerticesRequestBus<AZ::Vector3>::Handler::BusConnect(entityId);
-        AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::BusConnect(entityId);
-        AZ::TransformNotificationBus::Handler::BusConnect(entityId);
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(entityId);
-        AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(entityId);
-        AzFramework::BoundsRequestBus::Handler::BusConnect(entityId);
-    }
-
-    void EditorVisAreaComponent::Deactivate()
-    {
-        m_componentModeDelegate.Disconnect();
-
-        AzFramework::BoundsRequestBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusDisconnect();
-        AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-        AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::BusDisconnect();
-        AZ::VariableVerticesRequestBus<AZ::Vector3>::Handler::BusDisconnect();
-        EditorVisAreaComponentRequestBus::Handler::BusDisconnect();
-
-        Base::Deactivate();
-    }
-
-    void EditorVisAreaComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_currentWorldTransform = world;
-        UpdateVisAreaObject();
-    }
-
-    /// Apply the component's settings to the underlying vis area
-    void EditorVisAreaComponent::UpdateVisAreaObject()
-    {
-        if (m_area)
-        {
-            std::vector<Vec3> points;
-
-            const AZStd::vector<AZ::Vector3>& vertices = m_config.m_vertexContainer.GetVertices();
-            const size_t vertexCount = vertices.size();
-
-            if (vertexCount > 3)
-            {
-                const Matrix34& wtm = AZTransformToLYTransform(GetWorldTM());
-                points.resize(vertexCount);
-                for (size_t i = 0; i < vertexCount; i++)
-                {
-                    points[i] = wtm.TransformPoint(AZVec3ToLYVec3(vertices[i]));
-                }
-
-                SVisAreaInfo info;
-                info.fHeight = GetHeight();
-                info.bAffectedByOutLights = m_config.m_affectedBySun;
-                info.fViewDistRatio = m_config.m_viewDistRatio;
-                info.bOceanIsVisible = m_config.m_oceanIsVisible;
-
-                //Unconfigurable; these values are used by other area types
-                //We set them just so that debugging later it's clear that these
-                //aren't being used because this is a VisArea.
-                info.fPortalBlending = -1;
-                info.bDoubleSide = true;
-                info.bUseDeepness = false;
-                info.bUseInIndoors = false;
-
-                const AZStd::string name = AZStd::string("vis-area_") + GetEntity()->GetName();
-
-                GetIEditor()->Get3DEngine()->UpdateVisArea(m_area, &points[0], points.size(), name.c_str(), info, true);
-
-                AZ::Interface<AzFramework::IEntityBoundsUnion>::Get()->RefreshEntityLocalBoundsUnion(GetEntityId());
-            }
-        }
-    }
-
-    void EditorVisAreaComponent::SetHeight(const float value)
-    {
-        m_config.m_height = value;
-        UpdateVisAreaObject();
-    }
-
-    float EditorVisAreaComponent::GetHeight()
-    {
-        return m_config.m_height;
-    }
-
-    void EditorVisAreaComponent::SetDisplayFilled(const bool value)
-    {
-        m_config.m_displayFilled = value;
-        UpdateVisAreaObject();
-    }
-
-    bool EditorVisAreaComponent::GetDisplayFilled()
-    {
-        return m_config.m_displayFilled;
-    }
-
-    void EditorVisAreaComponent::SetAffectedBySun(const bool value)
-    {
-        m_config.m_affectedBySun = value;
-        UpdateVisAreaObject();
-    }
-
-    bool EditorVisAreaComponent::GetAffectedBySun()
-    {
-        return m_config.m_affectedBySun;
-    }
-
-    void EditorVisAreaComponent::SetViewDistRatio(const float value)
-    {
-        m_config.m_viewDistRatio = value;
-        UpdateVisAreaObject();
-    }
-
-    float EditorVisAreaComponent::GetViewDistRatio()
-    {
-        return m_config.m_viewDistRatio;
-    }
-
-    void EditorVisAreaComponent::SetOceanIsVisible(const bool value)
-    {
-        m_config.m_oceanIsVisible = value;
-        UpdateVisAreaObject();
-    }
-
-    bool EditorVisAreaComponent::GetOceanIsVisible()
-    {
-        return m_config.m_oceanIsVisible;
-    }
-
-    bool EditorVisAreaComponent::GetVertex(size_t index, AZ::Vector3& vertex) const
-    {
-        return m_config.m_vertexContainer.GetVertex(index, vertex);
-    }
-
-    void EditorVisAreaComponent::AddVertex(const AZ::Vector3& vertex)
-    {
-        m_config.m_vertexContainer.AddVertex(vertex);
-        UpdateVisAreaObject();
-    }
-
-    bool EditorVisAreaComponent::UpdateVertex(size_t index, const AZ::Vector3& vertex)
-    {
-        if (m_config.m_vertexContainer.UpdateVertex(index, vertex))
-        {
-            UpdateVisAreaObject();
-            return true;
-        }
-
-        return false;
-    }
-
-    bool EditorVisAreaComponent::InsertVertex(size_t index, const AZ::Vector3& vertex)
-    {
-        if (m_config.m_vertexContainer.InsertVertex(index, vertex))
-        {
-            UpdateVisAreaObject();
-            return true;
-        }
-
-        return false;
-    }
-
-    bool EditorVisAreaComponent::RemoveVertex(size_t index)
-    {
-        if (m_config.m_vertexContainer.RemoveVertex(index))
-        {
-            UpdateVisAreaObject();
-            return true;
-        }
-
-        return false;
-    }
-
-    void EditorVisAreaComponent::SetVertices(const AZStd::vector<AZ::Vector3>& vertices)
-    {
-        m_config.m_vertexContainer.SetVertices(vertices);
-        UpdateVisAreaObject();
-    }
-
-    void EditorVisAreaComponent::ClearVertices()
-    {
-        m_config.m_vertexContainer.Clear();
-        UpdateVisAreaObject();
-    }
-
-    size_t EditorVisAreaComponent::Size() const
-    {
-        return m_config.m_vertexContainer.Size();
-    }
-
-    bool EditorVisAreaComponent::Empty() const
-    {
-        return m_config.m_vertexContainer.Empty();
-    }
-
-    void EditorVisAreaComponent::DisplayEntityViewport(
-        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
-    {
-        /*
-            The VisArea and Portal share a common strangeness with how they are displayed.
-            The Legacy visualization is actually incorrect! It's important to know that
-            the vis volumes essentially act as a points on an XY plane with a known Z
-            position and a height. The volumes that actually affect rendition are planar
-            quads with a height. The height is calculated by the largest height value on
-            a local point + the given height value on the component.
-
-            Also note that this visualization does not display the floors or ceilings of the vis area
-            volumes. There is currently no way with the display context to easily draw a filled polygon.
-            We could try to draw some triangles but it would take up a great deal of rendering
-            time and could potentially slow down the editor more than we want if there are a lot
-            of volumes.
-        */
-
-        const AZStd::vector<AZ::Vector3>& vertices = m_config.m_vertexContainer.GetVertices();
-        const size_t vertexCount = vertices.size();
-
-        //We do not want to push a transform with scale or rotation as the
-        //vis area is always snapped to the XY plane with a height.
-        //Scale will be applied during flattening
-        AZ::Transform translation = AZ::Transform::CreateIdentity();
-        translation.SetTranslation(m_currentWorldTransform.GetTranslation());
-
-        debugDisplay.PushMatrix(translation);
-        debugDisplay.SetColor(s_visAreaColor.GetAsVector4());
-
-        AZStd::vector<AZ::Vector3> transformedPoints;
-        transformedPoints.resize(vertexCount);
-
-        //Min and max Z value (in local space)
-        float minZ = FLT_MAX;
-        float maxZ = FLT_MIN;
-
-        //Apply rotation and scale before removing translation.
-        //We want translation to apply with the matrix to make things easier
-        //but we need to calculate a difference in Z after rotation and scaling.
-        //During the next loop we'll flatten all these points down to a common XY plane
-        for (size_t i = 0; i < vertexCount; ++i)
-        {
-            AZ::Vector3 transformedPoint = m_currentWorldTransform.TransformPoint(vertices[i]);
-
-            //Back into local space
-            transformedPoints[i] = transformedPoint - m_currentWorldTransform.GetTranslation();
-
-            const float transformedZ = transformedPoints[i].GetZ();
-
-            minZ = AZ::GetMin(transformedZ, minZ);
-            maxZ = AZ::GetMax(transformedZ, maxZ);
-        }
-
-        //The height of the vis area + the max local height
-        const float actualHeight = m_config.m_height + maxZ;
-
-        //Draw walls for every line segment
-        size_t transformedPointCount = transformedPoints.size();
-        for (size_t i = 0; i < transformedPointCount; ++i)
-        {
-            AZ::Vector3 lowerLeft   = AZ::Vector3();
-            AZ::Vector3 lowerRight  = AZ::Vector3();
-            AZ::Vector3 upperRight  = AZ::Vector3();
-            AZ::Vector3 upperLeft   = AZ::Vector3();
-
-            lowerLeft = transformedPoints[i];
-            lowerRight = transformedPoints[(i + 1) % transformedPointCount];
-            //The mod with transformedPointCount ensures that for the last vert it will connect back with vert 0
-            //If vert count is 10, the last vert will be i = 9 and we want that to create a surface with vert 0
-
-            //Make all lower points planar
-            lowerLeft.SetZ(minZ);
-            lowerRight.SetZ(minZ);
-
-            upperRight = AZ::Vector3(lowerRight.GetX(), lowerRight.GetY(), actualHeight);
-            upperLeft = AZ::Vector3(lowerLeft.GetX(), lowerLeft.GetY(), actualHeight);
-
-            if (m_config.m_displayFilled)
-            {
-                debugDisplay.SetAlpha(0.3f);
-                //Draw filled quad with two winding orders to make it double sided
-                debugDisplay.DrawQuad(lowerLeft, lowerRight, upperRight, upperLeft);
-                debugDisplay.DrawQuad(lowerLeft, upperLeft, upperRight, lowerRight);
-            }
-
-            debugDisplay.SetAlpha(1.0f);
-            debugDisplay.DrawLine(lowerLeft, lowerRight);
-            debugDisplay.DrawLine(lowerRight, upperRight);
-            debugDisplay.DrawLine(upperRight, upperLeft);
-            debugDisplay.DrawLine(upperLeft, lowerLeft);
-        }
-
-        if (m_componentModeDelegate.AddedToComponentMode())
-        {
-            AzToolsFramework::VertexContainerDisplay::DisplayVertexContainerIndices(
-                debugDisplay, AzToolsFramework::VariableVerticesVertexContainer<AZ::Vector3>(m_config.m_vertexContainer),
-                GetWorldTM(), AZ::Vector3::CreateOne(), IsSelected());
-        }
-
-        debugDisplay.PopMatrix();
-    }
-
-    void EditorVisAreaComponent::BuildGameEntity(AZ::Entity* gameEntity)
-    {
-        gameEntity->CreateComponent<VisAreaComponent>(m_config);
-    }
-
-    AZ::Aabb EditorVisAreaComponent::GetEditorSelectionBoundsViewport(
-        const AzFramework::ViewportInfo& /*viewportInfo*/)
-    {
-        return GetWorldBounds();
-    }
-
-    bool EditorVisAreaComponent::EditorSelectionIntersectRayViewport(
-        const AzFramework::ViewportInfo& viewportInfo, const AZ::Vector3& src,
-        const AZ::Vector3& dir, float& distance)
-    {
-        AZ::Aabb bbox = GetEditorSelectionBoundsViewport(viewportInfo);
-        float end;
-        float t;
-
-        const bool intersection = AZ::Intersect::IntersectRayAABB2(
-            src, dir.GetReciprocal(),
-            bbox, t, end) > 0;
-
-        if (intersection)
-        {
-            distance = t;
-        }
-
-        return intersection;
-    }
-
-    AZ::Aabb EditorVisAreaComponent::GetWorldBounds()
-    {
-        return GetLocalBounds().GetTransformedAabb(GetWorldTM());
-    }
-
-    AZ::Aabb EditorVisAreaComponent::GetLocalBounds()
-    {
-        AZ::Aabb bbox = AZ::Aabb::CreateNull();
-        for (const auto& vertex : m_config.m_vertexContainer.GetVertices())
-        {
-            bbox.AddPoint(vertex);
-        }
-        bbox.AddPoint(bbox.GetMax() + AZ::Vector3::CreateAxisZ(m_config.m_height));
-        return bbox;
-    }
-} //namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorVisAreaComponent.h b/Gems/Visibility/Code/Source/EditorVisAreaComponent.h
deleted file mode 100644
index 45c87e13cc..0000000000
--- a/Gems/Visibility/Code/Source/EditorVisAreaComponent.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <AzCore/Math/Color.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzFramework/Visibility/BoundsBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/ComponentMode/ComponentModeDelegate.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/Manipulators/EditorVertexSelection.h>
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-
-#include "EditorVisAreaComponentBus.h"
-#include "VisAreaComponent.h"
-
-namespace Visibility
-{
-    class EditorVisAreaComponent;
-
-    class EditorVisAreaConfiguration
-        : public VisAreaConfiguration
-    {
-    public:
-        AZ_TYPE_INFO_LEGACY(EditorVisAreaConfiguration, "{C329E65C-1F34-5C80-9A7A-4B568105256B}", VisAreaConfiguration);
-        AZ_CLASS_ALLOCATOR(EditorVisAreaConfiguration, AZ::SystemAllocator,0);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        void ChangeHeight() override;
-        void ChangeDisplayFilled() override;
-        void ChangeAffectedBySun() override;
-        void ChangeViewDistRatio() override;
-        void ChangeOceanIsVisible() override;
-        void ChangeVertexContainer() override;
-
-        void SetEntityId(AZ::EntityId entityId);
-
-    private:
-        AZ::EntityId m_entityId;
-    };
-
-    class EditorVisAreaComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , private EditorVisAreaComponentRequestBus::Handler
-        , private AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler
-        , private AZ::VariableVerticesRequestBus<AZ::Vector3>::Handler
-        , private AzFramework::EntityDebugDisplayEventBus::Handler
-        , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
-        , private AzToolsFramework::EditorComponentSelectionRequestsBus::Handler
-        , private AZ::TransformNotificationBus::Handler
-        , public AzFramework::BoundsRequestBus::Handler
-    {
-        friend class EditorVisAreaConfiguration; //So that the config can set m_vertices when the vertex container changes
-
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-
-    public:
-        AZ_COMPONENT(EditorVisAreaComponent, "{F4EC32D8-D4DD-54F7-97A8-D195497D5F2C}", AzToolsFramework::Components::EditorComponentBase);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires);
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        EditorVisAreaComponent() = default;
-        EditorVisAreaComponent(const EditorVisAreaComponent&) = delete;
-        EditorVisAreaComponent& operator=(const EditorVisAreaComponent&) = delete;
-        virtual ~EditorVisAreaComponent();
-
-        // AZ::Component overrides ...
-        void Activate() override;
-        void Deactivate() override;
-        void BuildGameEntity(AZ::Entity* gameEntity) override;
-
-        // TransformNotificationBus overrides ...
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // EditorComponentSelectionRequestsBus overrides ...
-        AZ::Aabb GetEditorSelectionBoundsViewport(
-            const AzFramework::ViewportInfo& viewportInfo) override;
-        bool EditorSelectionIntersectRayViewport(
-            const AzFramework::ViewportInfo& viewportInfo, const AZ::Vector3& src,
-            const AZ::Vector3& dir, float& distance) override;
-        bool SupportsEditorRayIntersect() override { return true; }
-
-        // VisAreaComponentRequestBus overrides ...
-        void SetHeight(float height) override;
-        float GetHeight() override;
-        void SetDisplayFilled(bool filled) override;
-        bool GetDisplayFilled() override;
-        void SetAffectedBySun(bool affectedBySun) override;
-        bool GetAffectedBySun() override;
-        void SetViewDistRatio(float viewDistRatio) override;
-        float GetViewDistRatio() override;
-        void SetOceanIsVisible(bool oceanVisible) override;
-        bool GetOceanIsVisible() override;
-        bool GetVertex(size_t index, AZ::Vector3& vertex) const override;
-        void AddVertex(const AZ::Vector3& vertex) override;
-        bool UpdateVertex(size_t index, const AZ::Vector3& vertex) override;
-        bool InsertVertex(size_t index, const AZ::Vector3& vertex) override;
-        bool RemoveVertex(size_t index) override;
-        void SetVertices(const AZStd::vector<AZ::Vector3>& vertices) override;
-        void ClearVertices() override;
-        size_t Size() const override;
-        bool Empty() const override;
-        void UpdateVisAreaObject() override;
-
-        // AzFramework::EntityDebugDisplayEventBus overrides ...
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-
-        // BoundsRequestBus overrides ...
-        AZ::Aabb GetWorldBounds() override;
-        AZ::Aabb GetLocalBounds() override;
-
-    private:
-        // Reflected members
-        EditorVisAreaConfiguration m_config;
-
-        using ComponentModeDelegate = AzToolsFramework::ComponentModeFramework::ComponentModeDelegate;
-        ComponentModeDelegate m_componentModeDelegate; ///< Responsible for detecting ComponentMode activation
-                                                       ///< and creating a concrete ComponentMode.
-
-        // Unreflected members
-        AZ::Transform m_currentWorldTransform;
-        IVisArea* m_area = nullptr;
-
-        static AZ::Color s_visAreaColor; ///< The orange color that all vis-areas draw with.
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorVisAreaComponentMode.cpp b/Gems/Visibility/Code/Source/EditorVisAreaComponentMode.cpp
deleted file mode 100644
index d479e51345..0000000000
--- a/Gems/Visibility/Code/Source/EditorVisAreaComponentMode.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include "Visibility_precompiled.h"
-#include "EditorVisAreaComponentMode.h"
-
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
-#include <AzToolsFramework/Manipulators/LineHoverSelection.h>
-
-namespace Visibility
-{
-    AZ_CLASS_ALLOCATOR_IMPL(EditorVisAreaComponentMode, AZ::SystemAllocator, 0)
-
-    EditorVisAreaComponentMode::EditorVisAreaComponentMode(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType)
-        : EditorBaseComponentMode(entityComponentIdPair, componentType)
-    {
-        CreateManipulators();
-
-        AZ::TransformNotificationBus::Handler::BusConnect(entityComponentIdPair.GetEntityId());
-        EditorVisAreaComponentNotificationBus::Handler::BusConnect(entityComponentIdPair.GetEntityId());
-    }
-
-    EditorVisAreaComponentMode::~EditorVisAreaComponentMode()
-    {
-        EditorVisAreaComponentNotificationBus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-
-        m_vertexSelection.Destroy();
-    }
-
-    void EditorVisAreaComponentMode::CreateManipulators()
-    {
-        using namespace AzToolsFramework;
-
-        m_vertexSelection.Create(
-            GetEntityComponentIdPair(), g_mainManipulatorManagerId,
-            AZStd::make_unique<LineSegmentHoverSelection<AZ::Vector3>>(GetEntityComponentIdPair(), g_mainManipulatorManagerId),
-            TranslationManipulators::Dimensions::Three,
-            ConfigureTranslationManipulatorAppearance3d);
-
-        m_vertexSelection.SetVertexPositionsUpdatedCallback([this]()
-        {
-            EditorVisAreaComponentRequestBus::Event(
-                GetEntityId(), &EditorVisAreaComponentRequests::UpdateVisAreaObject);
-        });
-    }
-
-    void EditorVisAreaComponentMode::OnTransformChanged(
-        const AZ::Transform& /*local*/, const AZ::Transform& world)
-    {
-        m_vertexSelection.RefreshSpace(world);
-    }
-
-    void EditorVisAreaComponentMode::OnVertexAdded(size_t index)
-    {
-        Refresh();
-
-        AZ::Vector3 vertex;
-        bool found = false;
-        AZ::FixedVerticesRequestBus<AZ::Vector3>::EventResult(
-            found, GetEntityId(), &AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::GetVertex,
-            index, vertex);
-
-        if (found)
-        {
-            m_vertexSelection.CreateTranslationManipulator(
-                GetEntityComponentIdPair(), AzToolsFramework::g_mainManipulatorManagerId,
-                vertex, index);
-        }
-    }
-
-    void EditorVisAreaComponentMode::OnVertexRemoved(size_t /*index*/)
-    {
-        Refresh();
-    }
-
-    void EditorVisAreaComponentMode::OnVerticesSet(const AZStd::vector<AZ::Vector3>& /*vertices*/)
-    {
-        Refresh();
-    }
-
-    void EditorVisAreaComponentMode::OnVerticesCleared()
-    {
-        Refresh();
-    }
-
-    void EditorVisAreaComponentMode::Refresh()
-    {
-        // destroy and recreate manipulators when container is modified (vertices are added or removed)
-        m_vertexSelection.Destroy();
-        CreateManipulators();
-    }
-
-    AZStd::vector<AzToolsFramework::ActionOverride> EditorVisAreaComponentMode::PopulateActionsImpl()
-    {
-        return m_vertexSelection.ActionOverrides();
-    }
-
-    bool EditorVisAreaComponentMode::HandleMouseInteraction(
-        const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction)
-    {
-        return m_vertexSelection.HandleMouse(mouseInteraction);
-    }
-
-    AZStd::string EditorVisAreaComponentMode::GetComponentModeName() const
-    {
-        return "Vis Area Edit Mode";
-    }
-
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/EditorVisAreaComponentMode.h b/Gems/Visibility/Code/Source/EditorVisAreaComponentMode.h
deleted file mode 100644
index e33aed32f0..0000000000
--- a/Gems/Visibility/Code/Source/EditorVisAreaComponentMode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzToolsFramework/ComponentMode/EditorBaseComponentMode.h>
-#include <AzToolsFramework/Manipulators/EditorVertexSelection.h>
-
-#include "EditorVisAreaComponentBus.h"
-
-namespace Visibility
-{
-    /// The ComponentMode for editing the Vis Area Component.
-    class EditorVisAreaComponentMode
-        : public AzToolsFramework::ComponentModeFramework::EditorBaseComponentMode
-        , private AZ::TransformNotificationBus::Handler
-        , private EditorVisAreaComponentNotificationBus::Handler
-    {
-    public:
-        AZ_CLASS_ALLOCATOR_DECL
-
-        EditorVisAreaComponentMode(
-            const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType);
-        ~EditorVisAreaComponentMode();
-
-    private:
-        // EditorBaseComponentMode
-        void Refresh() override;
-        AZStd::vector<AzToolsFramework::ActionOverride> PopulateActionsImpl() override;
-        bool HandleMouseInteraction(
-            const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
-        AZStd::string GetComponentModeName() const override;
-
-        // Manipulator handling
-        void CreateManipulators();
-
-        // TransformNotificationBus
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // EditorVisAreaComponentNotificationBus
-        void OnVertexAdded(size_t index) override;
-        void OnVertexRemoved(size_t index) override;
-        void OnVerticesSet(const AZStd::vector<AZ::Vector3>& vertices) override;
-        void OnVerticesCleared() override;
-
-        AzToolsFramework::EditorVertexSelectionVariable<AZ::Vector3> m_vertexSelection; ///< Handles all manipulator interactions with vertices (inserting and translating).
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/OccluderAreaComponent.cpp b/Gems/Visibility/Code/Source/OccluderAreaComponent.cpp
deleted file mode 100644
index 947bc3a38b..0000000000
--- a/Gems/Visibility/Code/Source/OccluderAreaComponent.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include "Visibility_precompiled.h"
-#include "OccluderAreaComponent.h"
-
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <MathConversion.h>
-
-namespace Visibility
-{
-    void OccluderAreaComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides)
-    {
-        provides.push_back(AZ_CRC("OccluderAreaService"));
-    }
-    void OccluderAreaComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires)
-    {
-        requires.push_back(AZ_CRC("TransformService"));
-    }
-
-    void OccluderAreaConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<OccluderAreaConfiguration>()
-                ->Version(1)
-                ->Field("DisplayFilled", &OccluderAreaConfiguration::m_displayFilled)
-                ->Field("CullDistRatio", &OccluderAreaConfiguration::m_cullDistRatio)
-                ->Field("UseInIndoors", &OccluderAreaConfiguration::m_useInIndoors)
-                ->Field("DoubleSide", &OccluderAreaConfiguration::m_doubleSide)
-                ->Field("vertices", &OccluderAreaConfiguration::m_vertices)
-                ;
-        }
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<OccluderAreaRequestBus>("OccluderAreaRequestBus")
-                ->Event("GetDisplayFilled", &OccluderAreaRequestBus::Events::GetDisplayFilled)
-                ->VirtualProperty("DisplayFilled", "GetDisplayFilled", nullptr)
-
-                ->Event("GetCullDistRatio", &OccluderAreaRequestBus::Events::GetCullDistRatio)
-                ->VirtualProperty("CullDistRatio", "GetCullDistRatio", nullptr)
-
-                ->Event("GetUseInIndoors", &OccluderAreaRequestBus::Events::GetUseInIndoors)
-                ->VirtualProperty("UseInIndoors", "GetUseInIndoors", nullptr)
-
-                ->Event("GetDoubleSide", &OccluderAreaRequestBus::Events::GetDoubleSide)
-                ->VirtualProperty("DoubleSide", "GetDoubleSide", nullptr)
-                ;
-
-            behaviorContext->Class<OccluderAreaComponent>()->RequestBus("OccluderAreaRequestBus");
-        }
-    }
-
-    void OccluderAreaComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<OccluderAreaComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("m_config", &OccluderAreaComponent::m_config)
-                ;
-        }
-
-        OccluderAreaConfiguration::Reflect(context);
-    }
-
-    OccluderAreaComponent::OccluderAreaComponent(const OccluderAreaConfiguration& params)
-        : m_config(params)
-    {
-    }
-
-    void OccluderAreaComponent::Activate()
-    {
-        OccluderAreaRequestBus::Handler::BusConnect(GetEntityId());
-        AZ::TransformNotificationBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void OccluderAreaComponent::Deactivate()
-    {
-        AZ::TransformNotificationBus::Handler::BusDisconnect(GetEntityId());
-        OccluderAreaRequestBus::Handler::BusDisconnect(GetEntityId());
-    }
-
-    bool OccluderAreaComponent::GetDisplayFilled()
-    {
-        return m_config.m_displayFilled;
-    }
-
-    float OccluderAreaComponent::GetCullDistRatio()
-    {
-        return m_config.m_cullDistRatio;
-    }
-
-    bool OccluderAreaComponent::GetUseInIndoors()
-    {
-        return m_config.m_useInIndoors;
-    }
-
-    bool OccluderAreaComponent::GetDoubleSide()
-    {
-        return m_config.m_doubleSide;
-    }
-
-} //namespace Visibility
diff --git a/Gems/Visibility/Code/Source/OccluderAreaComponent.h b/Gems/Visibility/Code/Source/OccluderAreaComponent.h
deleted file mode 100644
index 80d98af4df..0000000000
--- a/Gems/Visibility/Code/Source/OccluderAreaComponent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/TransformBus.h>
-
-#include "OccluderAreaComponentBus.h"
-
-namespace Visibility
-{
-    class OccluderAreaConfiguration
-    {
-    public:
-        AZ_TYPE_INFO(OccluderAreaConfiguration, "{F024EC7E-717F-576C-8C22-09CAFEFEAF29}");
-        AZ_CLASS_ALLOCATOR(OccluderAreaConfiguration, AZ::SystemAllocator, 0);
-
-        virtual ~OccluderAreaConfiguration() = default;
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        bool m_displayFilled = true;
-        float m_cullDistRatio = 100.0f;
-        bool m_useInIndoors = false;
-        bool m_doubleSide = true;
-
-        AZStd::array<AZ::Vector3, 4> m_vertices =
-        AZStd::array<AZ::Vector3, 4> { {
-            AZ::Vector3(-1.0f, -1.0f, 0.0f),
-            AZ::Vector3( 1.0f, -1.0f, 0.0f),
-            AZ::Vector3( 1.0f,  1.0f, 0.0f),
-            AZ::Vector3(-1.0f,  1.0f, 0.0f)
-        } };
-
-        virtual void OnChange() {}
-        virtual void OnVerticesChange() {}
-    };
-
-    class OccluderAreaComponent
-        : public AZ::Component
-        , private OccluderAreaRequestBus::Handler
-        , public AZ::TransformNotificationBus::Handler
-    {
-    public:
-        AZ_COMPONENT(OccluderAreaComponent, "{B3C90C5F-0F9B-5D4F-ABAE-6D16CB45CB5A}", AZ::Component);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires);
-        static void Reflect(AZ::ReflectContext* context);
-
-        OccluderAreaComponent() = default;
-        explicit OccluderAreaComponent(const OccluderAreaConfiguration& params);
-
-        // AZ::Component
-        void Activate() override;
-        void Deactivate() override;
-
-        // OccluderAreaRequestBus
-        bool GetDisplayFilled() override;
-        float GetCullDistRatio() override;
-        bool GetUseInIndoors() override;
-        bool GetDoubleSide() override;
-
-    protected:
-        // Reflected Data
-        OccluderAreaConfiguration m_config;
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/PortalComponent.cpp b/Gems/Visibility/Code/Source/PortalComponent.cpp
deleted file mode 100644
index 9f1f618607..0000000000
--- a/Gems/Visibility/Code/Source/PortalComponent.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Visibility_precompiled.h"
-#include "PortalComponent.h"
-
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <MathConversion.h>
-
-namespace Visibility
-{
-    void PortalComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides)
-    {
-        provides.push_back(AZ::Crc32("PortalService"));
-    }
-
-    void PortalComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires)
-    {
-        requires.push_back(AZ::Crc32("TransformService"));
-    }
-
-    void PortalConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<PortalConfiguration>()
-                ->Version(1)
-                ->Field("Height", &PortalConfiguration::m_height)
-                ->Field("DisplayFilled", &PortalConfiguration::m_displayFilled)
-                ->Field("AffectedBySun", &PortalConfiguration::m_affectedBySun)
-                ->Field("ViewDistRatio", &PortalConfiguration::m_viewDistRatio)
-                ->Field("SkyOnly", &PortalConfiguration::m_skyOnly)
-                ->Field("OceanIsVisible", &PortalConfiguration::m_oceanIsVisible)
-                ->Field("UseDeepness", &PortalConfiguration::m_useDeepness)
-                ->Field("DoubleSide", &PortalConfiguration::m_doubleSide)
-                ->Field("LightBlending", &PortalConfiguration::m_lightBlending)
-                ->Field("LightBlendValue", &PortalConfiguration::m_lightBlendValue)
-                ->Field("vertices", &PortalConfiguration::m_vertices)
-                ;
-        }
-
-        if (auto* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<PortalRequestBus>("PortalRequestBus")
-                ->Event("GetHeight", &PortalRequestBus::Events::GetHeight)
-                ->VirtualProperty("Height", "GetHeight", nullptr)
-
-                ->Event("GetDisplayFilled", &PortalRequestBus::Events::GetDisplayFilled)
-                ->VirtualProperty("DisplayFilled", "GetDisplayFilled", nullptr)
-
-                ->Event("GetAffectedBySun", &PortalRequestBus::Events::GetAffectedBySun)
-                ->VirtualProperty("AffectedBySun", "GetAffectedBySun", nullptr)
-
-                ->Event("GetViewDistRatio", &PortalRequestBus::Events::GetViewDistRatio)
-                ->VirtualProperty("ViewDistRatio", "GetViewDistRatio", nullptr)
-
-                ->Event("GetSkyOnly", &PortalRequestBus::Events::GetSkyOnly)
-                ->VirtualProperty("SkyOnly", "GetSkyOnly", nullptr)
-
-                ->Event("GetOceanIsVisible", &PortalRequestBus::Events::GetOceanIsVisible)
-                ->VirtualProperty("OceanIsVisible", "GetOceanIsVisible", nullptr)
-
-                ->Event("GetUseDeepness", &PortalRequestBus::Events::GetUseDeepness)
-                ->VirtualProperty("UseDeepness", "GetUseDeepness", nullptr)
-
-                ->Event("GetDoubleSide", &PortalRequestBus::Events::GetDoubleSide)
-                ->VirtualProperty("DoubleSide", "GetDoubleSide", nullptr)
-
-                ->Event("GetLightBlending", &PortalRequestBus::Events::GetLightBlending)
-                ->VirtualProperty("LightBlending", "GetLightBlending", nullptr)
-
-                ->Event("GetLightBlendValue", &PortalRequestBus::Events::GetLightBlendValue)
-                ->VirtualProperty("LightBlendValue", "GetLightBlendValue", nullptr)
-                ;
-
-            behaviorContext->Class<PortalComponent>()->RequestBus("PortalRequestBus");
-        }
-    }
-
-    bool PortalConfiguration::VersionConverter(
-        [[maybe_unused]] AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
-    {
-        // conversion from version 1:
-        // - Remove IgnoreSkyColor
-        // - Remove IgnoreGI
-        if (classElement.GetVersion() <= 1)
-        {
-            classElement.RemoveElementByName(AZ_CRC("IgnoreSkyColor"));
-            classElement.RemoveElementByName(AZ_CRC("IgnoreGI"));
-        }
-
-        return true;
-    }
-
-    void PortalComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<PortalComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("m_config", &PortalComponent::m_config)
-                ;
-        }
-
-        PortalConfiguration::Reflect(context);
-    }
-
-    PortalComponent::PortalComponent(const PortalConfiguration& params)
-        : m_config(params)
-    {
-    }
-
-    void PortalComponent::Activate()
-    {
-        PortalRequestBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void PortalComponent::Deactivate()
-    {
-        PortalRequestBus::Handler::BusDisconnect(GetEntityId());
-    }
-
-    float PortalComponent::GetHeight()
-    {
-        return m_config.m_height;
-    }
-
-    bool PortalComponent::GetDisplayFilled()
-    {
-        return m_config.m_displayFilled;
-    }
-
-    bool PortalComponent::GetAffectedBySun()
-    {
-        return m_config.m_affectedBySun;
-    }
-
-    float PortalComponent::GetViewDistRatio()
-    {
-        return m_config.m_viewDistRatio;
-    }
-
-    bool PortalComponent::GetSkyOnly()
-    {
-        return m_config.m_skyOnly;
-    }
-
-    bool PortalComponent::GetOceanIsVisible()
-    {
-        return m_config.m_oceanIsVisible;
-    }
-
-    bool PortalComponent::GetUseDeepness()
-    {
-        return m_config.m_useDeepness;
-    }
-
-    bool PortalComponent::GetDoubleSide()
-    {
-        return m_config.m_doubleSide;
-    }
-
-    bool PortalComponent::GetLightBlending()
-    {
-        return m_config.m_lightBlending;
-    }
-
-    float PortalComponent::GetLightBlendValue()
-    {
-        return m_config.m_lightBlendValue;
-    }
-
-} //namespace Visibility
diff --git a/Gems/Visibility/Code/Source/PortalComponent.h b/Gems/Visibility/Code/Source/PortalComponent.h
deleted file mode 100644
index fd6ce4ab77..0000000000
--- a/Gems/Visibility/Code/Source/PortalComponent.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Component/Component.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include "PortalComponentBus.h"
-
-namespace Visibility
-{
-    class PortalConfiguration
-    {
-    public:
-        AZ_TYPE_INFO(PortalConfiguration, "{B9BDF017-DF8B-5DBE-8A92-5F62B7AECC1C}");
-        AZ_CLASS_ALLOCATOR(PortalConfiguration, AZ::SystemAllocator,0);
-        
-        virtual ~PortalConfiguration() = default;
-
-        static void Reflect(AZ::ReflectContext* context);
-        static bool VersionConverter(
-            AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
-
-        float m_height = 1.0f;
-        bool m_displayFilled = false;
-        bool m_affectedBySun = false;
-        float m_viewDistRatio = 100.0f;
-        bool m_skyOnly = false;
-        bool m_oceanIsVisible = false;
-        bool m_useDeepness = true;
-        bool m_doubleSide = true;
-        bool m_lightBlending = true;
-        float m_lightBlendValue = 0.5f;
-
-        AZStd::array<AZ::Vector3, 4> m_vertices =
-        AZStd::array<AZ::Vector3, 4> { {
-            AZ::Vector3(-1.0f, -1.0f, 0.0f),
-            AZ::Vector3( 1.0f, -1.0f, 0.0f),
-            AZ::Vector3( 1.0f,  1.0f, 0.0f),
-            AZ::Vector3(-1.0f,  1.0f, 0.0f)
-        } };
-
-        virtual void OnChange() {}
-        virtual void OnVerticesChange() {}
-    };
-
-    class PortalComponent
-        : public AZ::Component
-        , private PortalRequestBus::Handler
-    {
-    public:
-        AZ_COMPONENT(PortalComponent, "{89F1DD88-4445-5A9D-9223-6D4D8D44E6AC}", AZ::Component);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires);
-        static void Reflect(AZ::ReflectContext* context);    
-
-        PortalComponent() = default;
-        explicit PortalComponent(const PortalConfiguration& params);
-
-        // AZ::Component
-        void Activate() override;
-        void Deactivate() override;
-
-        // PortalRequestBus
-        float GetHeight() override;
-        bool GetDisplayFilled() override;
-        bool GetAffectedBySun() override;
-        float GetViewDistRatio() override;
-        bool GetSkyOnly() override;
-        bool GetOceanIsVisible() override;
-        bool GetUseDeepness() override;
-        bool GetDoubleSide() override;
-        bool GetLightBlending() override;
-        float GetLightBlendValue() override;
-
-    protected:
-        // Reflected Data
-        PortalConfiguration m_config;
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/VisAreaComponent.cpp b/Gems/Visibility/Code/Source/VisAreaComponent.cpp
deleted file mode 100644
index 7db60f1688..0000000000
--- a/Gems/Visibility/Code/Source/VisAreaComponent.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Visibility_precompiled.h"
-#include "VisAreaComponent.h"
-
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <MathConversion.h>
-
-namespace Visibility
-{
-    void VisAreaComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides)
-    {
-        provides.push_back(AZ::Crc32("VisAreaService"));
-    }
-
-    void VisAreaComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires)
-    {
-        requires.push_back(AZ::Crc32("TransformService"));
-    }
-
-    void VisAreaConfiguration::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<VisAreaConfiguration>()
-                ->Version(2, &VersionConverter)
-                ->Field("m_Height", &VisAreaConfiguration::m_height)
-                ->Field("m_DisplayFilled", &VisAreaConfiguration::m_displayFilled)
-                ->Field("m_AffectedBySun", &VisAreaConfiguration::m_affectedBySun)
-                ->Field("m_ViewDistRatio", &VisAreaConfiguration::m_viewDistRatio)
-                ->Field("m_OceanIsVisible", &VisAreaConfiguration::m_oceanIsVisible)
-                ->Field("m_vertexContainer", &VisAreaConfiguration::m_vertexContainer)
-                ;
-        }
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<VisAreaComponentRequestBus>("VisAreaComponentRequestBus")
-                ->Event("GetHeight", &VisAreaComponentRequestBus::Events::GetHeight)
-                ->VirtualProperty("Height", "GetHeight", nullptr)
-
-                ->Event("GetDisplayFilled", &VisAreaComponentRequestBus::Events::GetDisplayFilled)
-                ->VirtualProperty("DisplayFilled", "GetDisplayFilled", nullptr)
-
-                ->Event("GetAffectedBySun", &VisAreaComponentRequestBus::Events::GetAffectedBySun)
-                ->VirtualProperty("AffectedBySun", "GetAffectedBySun", nullptr)
-
-                ->Event("GetViewDistRatio", &VisAreaComponentRequestBus::Events::GetViewDistRatio)
-                ->VirtualProperty("ViewDistRatio", "GetViewDistRatio", nullptr)
-
-                ->Event("GetOceanIsVisible", &VisAreaComponentRequestBus::Events::GetOceanIsVisible)
-                ->VirtualProperty("OceanIsVisible", "GetOceanIsVisible", nullptr)
-                ;
-
-            behaviorContext->Class<VisAreaComponent>()->RequestBus("VisAreaComponentRequestBus");
-        }
-    }
-
-    bool VisAreaConfiguration::VersionConverter([[maybe_unused]] AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
-    {
-        // conversion from version 1:
-        // - Remove IgnoreSkyColor
-        // - Remove IgnoreGI
-        // - Remove SkyOnly
-        if (classElement.GetVersion() <= 1)
-        {
-            classElement.RemoveElementByName(AZ_CRC("IgnoreSkyColor"));
-            classElement.RemoveElementByName(AZ_CRC("IgnoreGI"));
-            classElement.RemoveElementByName(AZ_CRC("SkyOnly"));
-        }
-
-        return true;
-    }
-
-    void VisAreaComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<VisAreaComponent, AZ::Component>()
-                ->Version(1)
-                ->Field("m_config", &VisAreaComponent::m_config)
-                ;
-        }
-
-        VisAreaConfiguration::Reflect(context);
-    }
-
-    VisAreaComponent::VisAreaComponent(const VisAreaConfiguration& params)
-        : m_config(params)
-    {
-    }
-    
-    void VisAreaComponent::Activate()
-    {
-        VisAreaComponentRequestBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void VisAreaComponent::Deactivate()
-    {
-        VisAreaComponentRequestBus::Handler::BusDisconnect(GetEntityId());
-    }
-
-    float VisAreaComponent::GetHeight()
-    {
-        return m_config.m_height;
-    }
-
-    bool VisAreaComponent::GetDisplayFilled()
-    {
-        return m_config.m_displayFilled;
-    }
-
-    bool VisAreaComponent::GetAffectedBySun()
-    {
-        return m_config.m_affectedBySun;
-    }
-
-    float VisAreaComponent::GetViewDistRatio()
-    {
-        return m_config.m_viewDistRatio;
-    }
-
-    bool VisAreaComponent::GetOceanIsVisible()
-    {
-        return m_config.m_oceanIsVisible;
-    }
-} //namespace Visibility
diff --git a/Gems/Visibility/Code/Source/VisAreaComponent.h b/Gems/Visibility/Code/Source/VisAreaComponent.h
deleted file mode 100644
index f2efe7167d..0000000000
--- a/Gems/Visibility/Code/Source/VisAreaComponent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/VertexContainer.h>
-
-#include "VisAreaComponentBus.h"
-
-namespace Visibility
-{
-    class VisAreaConfiguration
-    {
-    public:
-        AZ_TYPE_INFO(VisAreaConfiguration, "{160D9FC2-936F-59BB-827C-DEF89671E4DC}");
-        AZ_CLASS_ALLOCATOR(VisAreaConfiguration, AZ::SystemAllocator,0);
-
-        virtual ~VisAreaConfiguration() = default;
-
-        static void Reflect(AZ::ReflectContext* context);
-        static bool VersionConverter(
-            AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
-
-        float m_height = 5.0f;
-        bool m_displayFilled = false;
-        bool m_affectedBySun = false;
-        float m_viewDistRatio = 100.0f;
-        bool m_oceanIsVisible = false;
-        AZ::VertexContainer<AZ::Vector3> m_vertexContainer;
-
-        virtual void ChangeHeight() {}
-        virtual void ChangeDisplayFilled() {}
-        virtual void ChangeAffectedBySun() {}
-        virtual void ChangeViewDistRatio() {}
-        virtual void ChangeOceanIsVisible() {}
-        virtual void ChangeVertexContainer() {}
-    };
-
-    class VisAreaComponent
-        : public AZ::Component
-        , private VisAreaComponentRequestBus::Handler
-    {
-    public:
-        AZ_COMPONENT(VisAreaComponent, "{ACAB60F8-100E-5EAF-BE2B-D60F79312404}", AZ::Component);
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provides);
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& requires);
-        static void Reflect(AZ::ReflectContext* context);
-
-        VisAreaComponent() = default;
-        explicit VisAreaComponent(const VisAreaConfiguration& params);
-
-        // AZ::Component
-        void Activate() override;
-        void Deactivate() override;
-
-        // VisAreaComponentRequestBus
-        float GetHeight() override;
-        bool GetDisplayFilled() override;
-        bool GetAffectedBySun() override;
-        float GetViewDistRatio() override;
-        bool GetOceanIsVisible() override;
-
-    private:
-        VisAreaConfiguration m_config; ///< Reflected configuration.
-    };
-} // namespace Visibility
diff --git a/Gems/Visibility/Code/Source/VisibilityGem.cpp b/Gems/Visibility/Code/Source/VisibilityGem.cpp
deleted file mode 100644
index 37d31a56f6..0000000000
--- a/Gems/Visibility/Code/Source/VisibilityGem.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Visibility_precompiled.h"
-
-#include "VisibilityGem.h"
-
-#include "OccluderAreaComponent.h"
-#include "PortalComponent.h"
-#include "VisAreaComponent.h"
-
-#ifdef VISIBILITY_EDITOR
-#include "EditorOccluderAreaComponent.h"
-#include "EditorPortalComponent.h"
-#include "EditorVisAreaComponent.h"
-#endif //VISIBILITY_EDITOR
-
-VisibilityGem::VisibilityGem()
-{
-    m_descriptors.push_back(Visibility::OccluderAreaComponent::CreateDescriptor());
-    m_descriptors.push_back(Visibility::PortalComponent::CreateDescriptor());
-    m_descriptors.push_back(Visibility::VisAreaComponent::CreateDescriptor());
-
-#ifdef VISIBILITY_EDITOR
-    m_descriptors.push_back(Visibility::EditorOccluderAreaComponent::CreateDescriptor());
-    m_descriptors.push_back(Visibility::EditorPortalComponent::CreateDescriptor());
-    m_descriptors.push_back(Visibility::EditorVisAreaComponent::CreateDescriptor());
-#endif //VISIBILITY_EDITOR
-}
-
-AZ_DECLARE_MODULE_CLASS(Gem_Visibility, VisibilityGem)
diff --git a/Gems/Visibility/Code/Source/VisibilityGem.h b/Gems/Visibility/Code/Source/VisibilityGem.h
deleted file mode 100644
index 1abc1b8901..0000000000
--- a/Gems/Visibility/Code/Source/VisibilityGem.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <IGem.h>
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-
-
-class VisibilityGem
-    : public AZ::Module
-{
-public:
-    AZ_RTTI(VisibilityGem, "{5138F2B6-EDFB-490E-AB3E-B82E43263A20}");
-    
-    VisibilityGem();
-};
diff --git a/Gems/Visibility/Code/Source/Visibility_precompiled.cpp b/Gems/Visibility/Code/Source/Visibility_precompiled.cpp
deleted file mode 100644
index 6d32d0ea69..0000000000
--- a/Gems/Visibility/Code/Source/Visibility_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Visibility_precompiled.h"
diff --git a/Gems/Visibility/Code/Source/Visibility_precompiled.h b/Gems/Visibility/Code/Source/Visibility_precompiled.h
deleted file mode 100644
index 2a1bc2e083..0000000000
--- a/Gems/Visibility/Code/Source/Visibility_precompiled.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <platform.h>
-#include <CryName.h>
-#include <I3DEngine.h>
-#include <ISerialize.h>
-#include <IGem.h>
diff --git a/Gems/Visibility/Code/Tests/VisibilityTest.cpp b/Gems/Visibility/Code/Tests/VisibilityTest.cpp
deleted file mode 100644
index 406cef86a4..0000000000
--- a/Gems/Visibility/Code/Tests/VisibilityTest.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Visibility_precompiled.h"
-
-#include <AzTest/AzTest.h>
-#include <Mocks/ITimerMock.h>
-#include <Mocks/ICryPakMock.h>
-#include <Mocks/IConsoleMock.h>
-#include <Mocks/ISystemMock.h>
-
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Math/Random.h>
-#include <AzCore/Memory/Memory.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Script/ScriptContext.h>
-#include <AzCore/std/chrono/clocks.h>
-
-#include <AzFramework/Components/TransformComponent.h>
-
-#include <VisibilityGem.h>
-#include <OccluderAreaComponent.h>
-#include <PortalComponent.h>
-#include <VisAreaComponent.h>
-
-class VisibilityTest
-    : public ::testing::Test
-{
-protected:
-
-    void SetUp() override
-    {
-        AZ::ComponentApplication::Descriptor appDesc;
-        appDesc.m_memoryBlocksByteSize = 10 * 1024 * 1024;
-        appDesc.m_recordingMode = AZ::Debug::AllocationRecords::RECORD_FULL;
-
-        AZ::ComponentApplication::StartupParameters appStartup;
-        appStartup.m_createStaticModulesCallback =
-            [](AZStd::vector<AZ::Module*>& modules)
-        {
-            modules.emplace_back(new VisibilityGem);
-        };
-
-        m_systemEntity = m_application.Create(appDesc, appStartup);
-        m_systemEntity->Init();
-        m_systemEntity->Activate();
-
-        m_application.RegisterComponentDescriptor(AzFramework::TransformComponent::CreateDescriptor());
-        m_application.RegisterComponentDescriptor(Visibility::OccluderAreaComponent::CreateDescriptor());
-        m_application.RegisterComponentDescriptor(Visibility::PortalComponent::CreateDescriptor());
-        m_application.RegisterComponentDescriptor(Visibility::VisAreaComponent::CreateDescriptor());
-    }
-
-    void TearDown() override
-    {
-        m_application.Destroy();
-    }
-
-    AZ::ComponentApplication m_application;
-    AZ::Entity* m_systemEntity;
-};
-
-#include <EditorOccluderAreaComponent.h>
-#include <EditorPortalComponent.h>
-#include <EditorVisAreaComponent.h>
-
-TEST_F(VisibilityTest, Occluder_TestIntersect)
-{
-    AZ::Entity* testEntity = aznew AZ::Entity();
-    ASSERT_TRUE(testEntity != nullptr);
-
-    testEntity->CreateComponent<AzFramework::TransformComponent>();
-    testEntity->CreateComponent<Visibility::EditorOccluderAreaComponent>();
-
-    Visibility::EditorOccluderAreaComponent* oaComp = testEntity->FindComponent<Visibility::EditorOccluderAreaComponent>();
-    ASSERT_TRUE(oaComp != nullptr);
-    testEntity->Init();
-    testEntity->Activate();
-
-    // Test CCW tri intersection test
-    const AZ::Vector3 src(0, 0, 10);
-    const AZ::Vector3 dir(0, 0, -1);
-    float distance;
-
-    // Visibility Components do not make use of the ViewportInfo to determine
-    // camera position etc.
-    AzFramework::ViewportInfo viewportInfo{};
-
-    bool didHit = oaComp->EditorSelectionIntersectRayViewport(viewportInfo, src, dir, distance);
-    ASSERT_TRUE(didHit);
-    ASSERT_NEAR(distance, 10, 0.1f); // Occluder is a flat plane
-
-    // Test CW tri intersection test
-    const AZ::Vector3 srcNeg(0, 0, -10);
-    const AZ::Vector3 dirNeg(0, 0, 1);
-
-    didHit = oaComp->EditorSelectionIntersectRayViewport(viewportInfo, srcNeg, dirNeg, distance);
-    ASSERT_TRUE(didHit);
-    ASSERT_NEAR(distance, 10, 0.1f); // Occluder is a flat plane
-
-    // Test intersect failure
-    const AZ::Vector3 badDir(100, 100, -1);
-    didHit = oaComp->EditorSelectionIntersectRayViewport(viewportInfo, src, badDir, distance);
-    ASSERT_FALSE(didHit);
-}
-
-TEST_F(VisibilityTest, Portal_TestIntersect)
-{
-    AZ::Entity* testEntity = aznew AZ::Entity();
-    ASSERT_TRUE(testEntity != nullptr);
-
-    testEntity->CreateComponent<AzFramework::TransformComponent>();
-    testEntity->CreateComponent<Visibility::EditorPortalComponent>();
-
-    Visibility::EditorPortalComponent* pComp = testEntity->FindComponent<Visibility::EditorPortalComponent>();
-    ASSERT_TRUE(pComp != nullptr);
-    testEntity->Init();
-    testEntity->Activate();
-
-    const AZ::Vector3 src(0, 0, 10);
-    const AZ::Vector3 dir(0, 0, -1);
-    float distance;
-
-    // Visibility Components do not make use of the ViewportInfo to determine
-    // camera position etc.
-    AzFramework::ViewportInfo viewportInfo{};
-
-    // Test intersect
-    bool didHit = pComp->EditorSelectionIntersectRayViewport(viewportInfo, src, dir, distance);
-    ASSERT_TRUE(didHit);
-    ASSERT_NEAR(distance, 9, 0.1f); // Portal has a default height of 1
-
-    // Test casting a ray from inside the geom
-    const AZ::Vector3 internalSrc(0, 0, 0.5f);
-    didHit = pComp->EditorSelectionIntersectRayViewport(viewportInfo, internalSrc, dir, distance);
-    ASSERT_FALSE(didHit);
-
-    // Test intersect failure
-    const AZ::Vector3 badDir(100, 100, -1);
-    didHit = pComp->EditorSelectionIntersectRayViewport(viewportInfo, src, badDir, distance);
-    ASSERT_FALSE(didHit);
-}
-
-TEST_F(VisibilityTest, VisArea_TestIntersect)
-{
-    AZ::Entity* testEntity = aznew AZ::Entity();
-    ASSERT_TRUE(testEntity != nullptr);
-
-    testEntity->CreateComponent<AzFramework::TransformComponent>();
-    testEntity->CreateComponent<Visibility::EditorVisAreaComponent>();
-    testEntity->Init();
-    testEntity->Activate();
-
-    Visibility::EditorVisAreaComponent* vaComp = testEntity->FindComponent<Visibility::EditorVisAreaComponent>();
-    ASSERT_TRUE(vaComp != nullptr);
-
-    const AZ::Vector3 src(0, 0, 10);
-    const AZ::Vector3 dir(0, 0, -1);
-    float distance;
-
-    // Visibility Components do not make use of the ViewportInfo to determine
-    // camera position etc.
-    AzFramework::ViewportInfo viewportInfo{};
-
-    bool didHit = vaComp->EditorSelectionIntersectRayViewport(viewportInfo, src, dir, distance);
-    ASSERT_TRUE(didHit);
-    ASSERT_NEAR(distance, 5, 0.1f); // VisArea has a default height of 5
-
-    const AZ::Vector3 badDir(100, 100, -1);
-    didHit = vaComp->EditorSelectionIntersectRayViewport(viewportInfo, src, badDir, distance);
-    ASSERT_FALSE(didHit);
-}
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
diff --git a/Gems/Visibility/Code/visibility_editor_files.cmake b/Gems/Visibility/Code/visibility_editor_files.cmake
deleted file mode 100644
index 9d17b92e27..0000000000
--- a/Gems/Visibility/Code/visibility_editor_files.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Include/EditorOccluderAreaComponentBus.h
-    Include/EditorPortalComponentBus.h
-    Include/EditorVisAreaComponentBus.h
-    Source/EditorOccluderAreaComponentMode.h
-    Source/EditorOccluderAreaComponentMode.cpp
-    Source/EditorPortalComponentMode.h
-    Source/EditorPortalComponentMode.cpp
-    Source/EditorVisAreaComponentMode.h
-    Source/EditorVisAreaComponentMode.cpp
-)
diff --git a/Gems/Visibility/Code/visibility_editor_shared_files.cmake b/Gems/Visibility/Code/visibility_editor_shared_files.cmake
deleted file mode 100644
index 1714fc1402..0000000000
--- a/Gems/Visibility/Code/visibility_editor_shared_files.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Source/VisibilityGem.h
-    Source/VisibilityGem.cpp
-    Source/EditorOccluderAreaComponent.h
-    Source/EditorOccluderAreaComponent.cpp
-    Source/EditorPortalComponent.h
-    Source/EditorPortalComponent.cpp
-    Source/EditorVisAreaComponent.h
-    Source/EditorVisAreaComponent.cpp
-)
diff --git a/Gems/Visibility/Code/visibility_editor_tests_files.cmake b/Gems/Visibility/Code/visibility_editor_tests_files.cmake
deleted file mode 100644
index 52867e64af..0000000000
--- a/Gems/Visibility/Code/visibility_editor_tests_files.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Tests/VisibilityTest.cpp
-    Source/VisibilityGem.h
-    Source/VisibilityGem.cpp
-    Source/EditorOccluderAreaComponent.h
-    Source/EditorOccluderAreaComponent.cpp
-    Source/EditorPortalComponent.h
-    Source/EditorPortalComponent.cpp
-    Source/EditorVisAreaComponent.h
-    Source/EditorVisAreaComponent.cpp
-)
diff --git a/Gems/Visibility/Code/visibility_files.cmake b/Gems/Visibility/Code/visibility_files.cmake
deleted file mode 100644
index e58ac4fbba..0000000000
--- a/Gems/Visibility/Code/visibility_files.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Source/Visibility_precompiled.cpp
-    Source/Visibility_precompiled.h
-    Include/OccluderAreaComponentBus.h
-    Include/PortalComponentBus.h
-    Include/VisAreaComponentBus.h
-    Source/OccluderAreaComponent.h
-    Source/OccluderAreaComponent.cpp
-    Source/PortalComponent.h
-    Source/PortalComponent.cpp
-    Source/VisAreaComponent.h
-    Source/VisAreaComponent.cpp
-)
diff --git a/Gems/Visibility/Code/visibility_shared_files.cmake b/Gems/Visibility/Code/visibility_shared_files.cmake
deleted file mode 100644
index a37350ade6..0000000000
--- a/Gems/Visibility/Code/visibility_shared_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Source/VisibilityGem.h
-    Source/VisibilityGem.cpp
-)
diff --git a/Gems/Visibility/gem.json b/Gems/Visibility/gem.json
deleted file mode 100644
index 3e8eca471b..0000000000
--- a/Gems/Visibility/gem.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "gem_name": "Visibility",
-    "GemFormatVersion": 3,
-    "Uuid": "3b4ab3f54c2749328934c5b864355a61",
-    "Name": "Visibility",
-    "DisplayName": "Visibility",
-    "Version": "0.1.0",
-    "LinkType": "Dynamic",
-    "Summary": "Provides components for defining visible regions of a scene",
-    "Tags": ["Untagged"],
-    "IconPath": "preview.png",
-    "EditorModule": true
-}
diff --git a/Gems/Visibility/preview.png b/Gems/Visibility/preview.png
deleted file mode 100644
index f60ab5eebd..0000000000
--- a/Gems/Visibility/preview.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f1a3e838ba075704ee974a1289487d4007e7b7385eb855b8b2a09534b6cecd1
-size 1949
diff --git a/Gems/WhiteBox/Assets/materials/DefaultPBR.material b/Gems/WhiteBox/Assets/materials/DefaultPBR.material
new file mode 100644
index 0000000000..f0990f148c
--- /dev/null
+++ b/Gems/WhiteBox/Assets/materials/DefaultPBR.material
@@ -0,0 +1,4 @@
+{
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "parentMaterial": "Materials/Presets/PBR/default_grid.material"
+}
diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
index 1885e90c7f..7677ee69f4 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
@@ -465,7 +465,7 @@ namespace WhiteBox
         AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
             buttonId, AzToolsFramework::ViewportUi::DefaultViewportId,
             &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton, clusterId,
-            AZStd::string::format("Editor/Icons/WhiteBox/%s.svg", iconName));
+            AZStd::string::format("Icons/WhiteBox/%s.svg", iconName));
 
         return buttonId;
     }
diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp
index 6b2ba9ae4b..013b05fc3c 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp
@@ -53,7 +53,7 @@ namespace UnitTest
 
     void EditorWhiteBoxPhysicsTestEnvironment::AddGemsAndComponents()
     {
-        AddDynamicModulePaths({"PhysX.Editor"});
+        AddDynamicModulePaths({"PhysX.Editor.Gem"});
         AddComponentDescriptors(
             {AzToolsFramework::EditorEntityContextComponent::CreateDescriptor(),
              WhiteBox::EditorWhiteBoxComponent::CreateDescriptor(), WhiteBox::WhiteBoxComponent::CreateDescriptor(),
diff --git a/README.md b/README.md
index caed4b515c..333ca795e8 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ It is highly recommended you check that you have a [credential manager installed
 ### Clone the repository 
 
 ```shell
-> git clone https://github.com/aws/o3de.git
+> git clone https://github.com/aws-lumberyard/o3de.git
 Cloning into 'o3de'...
 
 # initial prompt for credentials to download the repository code
diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg
new file mode 100644
index 0000000000..087a0f5d96
--- /dev/null
+++ b/Registry/AssetProcessorPlatformConfig.setreg
@@ -0,0 +1,610 @@
+{
+    // ---- Enable/Disable platforms for the entire project. AssetProcessor will automatically add the current platform by default. 
+
+    // PLATFORM DEFINITIONS
+    // [Platform (unique identifier)]
+    // tags=(comma-seperated-tags)
+    //
+    // note:  the 'identifier' of a platform is the word(s) following the "Platform" keyword (so [Platform pc] means identifier
+    //        is 'pc' for example.  This is used to name its assets folder in the cache and should be used in your bootstrap.cfg
+    //        or your main.cpp to choose what assets to load for that particular platform.
+    //        Its primary use is to enable additional non-host platforms (Ios, android...) that are not the current platform.
+    // note:  'tags' is a comma-seperated list of tags to tag the platform with that builders can inspect to decide what to do.
+
+    // while builders can accept any tags you add in order to make decisions, common tags are
+    // tools - this platform can host the tools and editor and such
+    // renderer - this platform runs the client engine and renders on a GPU.  If missing we could be on a server-only platform
+    // mobile - a mobile platform such as a set top box or phone with limited resources
+    // console - a console platform
+    // server - a server platform of some kind, usually headless, no renderer.
+
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platform pc": {
+                    "tags": "tools,renderer,dx12,vulkan,null"
+                },
+                "Platform es3": {
+                    "tags": "android,mobile,renderer,vulkan"
+                },
+                "Platform ios": {
+                    "tags": "mobile,renderer,metal"
+                },
+                "Platform osx_gl": {
+                    "tags": "tools,renderer,metal,null"
+                },
+                // this is an example of a headless platform that has no renderer.   
+                // To use this you would still need to make sure 'assetplatform' in your startup params in your main() chooses this 'server' platform as your server 'assets' flavor
+                "Platform server": {
+                    "tags": "server,dx12,vulkan"
+                },
+                // this section allows you to turn on various platforms in addition to the host platform you're running on
+                // 'enabled' is AUTOMATICALLY TRUE for the current platform that you are running on, so it is not necessary to force it to true for that platform
+                // To enable any additional platform, just uncomment the appropriate line below.
+                "Platforms": {
+                    //"pc": "enabled",
+                    //"es3": "enabled",
+                    //"ios": "enabled",
+                    //"osx_gl": "enabled",
+                    //"server": "enabled"
+                },
+                // ---- The number of worker jobs, 0 means use the number of Logical Cores
+                "Jobs": {
+                    "minJobs": 1,
+                    "maxJobs": 0
+                },
+                // cacheServerAddress is the location of the asset server cache.
+                // Currently for a network share server this would be the absolute file path to the network share folder.
+                "Server": {
+                    //"cacheServerAddress": ""
+                },
+
+                // ---- add any metadata file type here that needs to be monitored by the AssetProcessor.
+                // Modifying these meta file will cause the source asset to re-compile again.
+                // They are specified in the following format
+                // metadata extension=original extension to replace
+                // if the metadata extension does not replace the original, then the original can be blank
+                // so for example if your normal file is blah.tif and your metafile for that file is blah.tif.exportsettings
+                // then your declaration would be exportsettings=   ; ie, it would be blank
+                // however if your metafile REPLACES the extension (for example, if you have the file blah.i_caf and its metafile is blah.exportsettings)
+                // then you specify the original extension here to narrow the scope.
+                // If a relative path to a specific file is provided instead of an extension, a change to the file will change all files
+                // with the associated extension (e.g. Animations/SkeletonList.xml=i_caf will cause all i_caf files to recompile when 
+                // Animations/SkeletonList.xml within the current game project changes)
+
+                "MetaDataTypes": {
+                    "animsettings": "i_caf",
+                    "Animations/SkeletonList.xml": "i_caf",
+                    "cbc": "abc",
+                    "fbx.assetinfo": "fbx"
+                },
+
+                // ---- add any folders to scan here.  The priority order is the order they appear here
+                // available macros are 
+                // @ROOT@ - the location of asset root
+                // @PROJECTROOT@ - the location of the project root, for example 'Q:\MyProjects\RPGSample' 
+                // note that they are sorted by their 'order' value, and the lower the order the more important an asset is
+                // lower order numbers override higher ones.
+                // If specified, output will be prepended to every path found in that recognizer's watch folder.
+                // Note that you can also make the scan folder platform specific by using the keywords include and exclude.
+                // Both include and exclude can contain either platform tags, platform identifiers or both.
+                // if no include is specified, all currently enabled platforms are included by default.
+                // If includes ARE specified, it will be filtered down by the list of currently enabled platforms. 
+                // "ScanFolder (unique identifier)": {
+                //  "include": "(comma seperated platform tags or identifiers)",
+                //  "exclude": "(comma seperated platform tags or identifiers)"
+                // }
+                // For example if you want to include a scan folder only for platforms that have the platform tags tools and renderer 
+                // but omit it for platform osx_gl, you will have a scanfolder rule like
+                // "ScanFolder (unique identifier)": {
+                // "watch": "@ROOT@/foo",
+                // "include": "tools, renderer",
+                // "exclude": "osx_gl"
+                // }
+
+                "ScanFolder Game": {
+                    "watch": "@PROJECTROOT@",
+                    "display": "@PROJECTNAME@",
+                    "recursive": 1,
+                    "order": 0
+                },
+                // gems will be auto-added from 100 onwards
+                "ScanFolder Root": {
+                    "watch": "@ROOT@",
+                    "recursive": 0,
+                    "order": 10000
+                },
+                "ScanFolder Assets/Runtime": {
+                    "watch": "@ENGINEROOT@/Assets/Engine",
+                    "recursive": 1,
+                    "order": 20000
+                },
+                "ScanFolder Assets/Tools": {
+                    "watch": "@ENGINEROOT@/Assets/Editor",
+                    "recursive": 1,
+                    "order": 30000,
+                    "include": "tools,renderer"
+                },
+
+                // Excludes files that match the pattern or glob 
+                // if you use a pattern, remember to escape your backslashes (\\)
+                "Exclude _LevelBackups": {
+                    "pattern": ".*\\\\/Levels\\\\/.*\\\\/_savebackup\\\\/.*"
+                },
+                "Exclude _LevelAutoBackups": {
+                    "pattern": ".*\\\\/Levels\\\\/.*\\\\/_autobackup\\\\/.*"
+                },
+                "Exclude HoldFiles": {
+                    "pattern": ".*\\\\/Levels\\\\/.*_hold\\\\/.*"
+                },
+                // note that $ has meaning to regex, so we escape it.
+                "Exclude TempFiles": {
+                    "pattern": ".*\\\\/\\\\$tmp[0-9]*_.*"
+                },
+                "Exclude AlembicCompressionTemplates": {
+                    "pattern": ".*\\\\/Presets\\\\/GeomCache\\\\/.*"
+                },
+                "Exclude TmpAnimationCompression": {
+                    "pattern": ".*\\\\/Editor\\\\/Tmp\\\\/AnimationCompression\\\\/.*"
+                },
+                "Exclude EventLog": {
+                    "pattern": ".*\\\\/Editor\\\\/.*eventlog\\\\.xml"
+                },
+                "Exclude GameGemsCode": {
+                    "pattern": ".*\\\\/Gem\\\\/Code\\\\/.*"
+                },
+                "Exclude GameGemsResources": {
+                    "pattern": ".*\\\\/Gem\\\\/Resources\\\\/.*"
+                },
+                "Exclude Private Certs": {
+                    "pattern": ".*\\DynamicContent\\\\/Certificates\\\\/Private\\\\/.*"
+                },
+                "Exclude CMakeLists": {
+                    "pattern": ".*\\\\/CMakeLists.txt"
+                },
+                "Exclude CMakeFiles": {
+                    "pattern": ".*\\\\/.*\\\\.cmake"
+                },
+                "Exclude User": {
+                    "pattern": ".*/[Uu]ser/.*"
+                },
+                "Exclude Build": {
+                    "pattern": ".*/[Bb]uild/.*"
+                },
+                "Exclude UserSettings": {
+                    "pattern": ".*/UserSettings.xml"
+                },
+
+                // ------------------------------------------------------------------------------
+                // Large Worlds Test
+                // ------------------------------------------------------------------------------
+                "Exclude Work In Progress Folders": {
+                    "pattern": ".*\\\\/WIP\\\\/.*"
+                },
+                "Exclude Content Source Folders": {
+                    "pattern": ".*\\\\/CONTENT_SOURCE\\\\/.*"
+                },
+                "Exclude Art Source Folders": {
+                    "pattern": ".*\\\\/ArtSource\\\\/.*"
+                },
+                //------------------------------------------------------------------------------
+                // RC params mapping examples
+                //------------------------------------------------------------------------------
+
+                // note that productAssetType is a means of setting the output asset Type (as in AZ::Data::AssetType) of a simple job
+                // and is the recommended way to specify that a certain kind of file (such as '*.myextension') becomes registered as the
+                // actual UUID of that type in the engine itself.
+
+                // Use a regex for matching files, same params for all platforms
+                // "RC TGAs": {
+                //  "pattern": ".+\\\\.tga$",
+                //  "params": "/tga /texture"
+                //}
+
+                // Use a glob, have special params for es3 platform
+                // "RC TIFFs": {
+                //  "glob": "*.tif",
+                //  "params": "/texture",
+                //  "es3": "/pvrt"
+                //}
+
+                // You can also modify a version to compile all matching files again
+                // By default the version is empty
+                // "RC tif": {
+                //  "glob": "*.tif",
+                //  "params": "\\someparams",
+                //  "version": 1.0
+                //}
+                // This will make the AssetProcessor compile all the .tif files again
+
+                // you can also optionally supply a priority.
+                // this is used to sort jobs when no other external circumstance sorts them
+                // for example, copy jobs will be higher in priority than other jobs that are not copy jobs
+                // however if they're both copy jobs or both not, and no other circumstances apply, then priority will be used.
+                // default priority is zero if not specified
+
+                // you can specify an option to skip processing for a file type based on the platform.
+                // for example, if you dont want to process tif files for ios, you can make tif files
+                // process on any platform except for ios:
+                // "RC tif": {
+                //  "glob": "*.tif",
+                //  "params": "\\someparams",
+                //  "ios": "skip"
+                //}
+
+                // you can specify an option to output product dependencies for a copy job.
+                // please note that you only need to set this option when cry code is required to parse the asset.
+                // otherwise product dependencies will be output automatically by the CopyDependencyBuilder.
+                // for example, if you want to output the product dependencies for font assets:
+                // "RC font": {
+                //  "glob": "*.font",
+                //  "params": "copy",
+                //  "outputProductDependencies": true
+                //}
+
+                // you can also specify an option to make all jobs critical that matches some pattern/glob.
+                // for example, if you want to make all png files critical than set critical to true.
+                // Note that by default all copy jobs are critical.
+                // Critical jobs are processed before non critical jobs and also prevent the runtime or editor from starting until they are all complete.
+                // "RC png": {
+                //  "glob": "*.png",
+                //  "params": "\\someparams",
+                //  "critical": true
+                //}
+
+                // you can also specify an option to make all the job store in the asset server cache location if you are running AP in server mode. 
+                // For example, if you want to store all png jobs in the asset server cache location including their logs, you can set checkServer = true.
+                // The client(i.e if you are running AP in non-server mode) will also check for this flag to know which jobs to fetch from the asset server cache location.
+                // if unsucessful, it will process the job locally as usual.
+                // "RC png": {
+                //  "glob": "*.png",
+                //  "params": "\\someparams",
+                //  "critical": true,
+                //  "checkServer": true
+                //}
+
+                // note that the FULL PATH to the file will be used as the match, not the relative path
+                // so ensure start your patterns with .* or as appropriate.
+                // Also, any rules which match will apply - so if you have two rules which both apply to PNG files for example
+                // but you only want one, you might want to use exclusion patterns:
+                 
+                //Example: process everything EXCEPT the ones in the libs/ui folder with these params
+                // "RC png-normal": {
+                //  "pattern": "(?!.*libs\\\\/ui\\\\/).*\\.png",
+                //  "params": "/imagecompressor=CTSquish /streaming=0",
+                //  "lockSource": true
+                //}
+
+                //Example:  Process everything in the libs/ui folder with linear color space
+                // "RC png-ui": {
+                //  "pattern": "(.*libs\\\\/ui\\\\/).*\\.png",
+                //  "params": "/imagecompressor=CTSquish /streaming=0 /colorspace=linear,linear",
+                //  "lockSource": true
+                //}
+
+                // More example Regexes:
+                // "pattern": "(?!(.*libs\\\\/ui\\\\/)|(.*editor\\\\/).*\\\\.png"
+                // This pattern will not match anything with editor/ or libs/ui/ in it
+                // "pattern": "((.*libs\\\\/ui\\\\/)|(.*editor\\\\/).*\\\\.png"
+                // This pattern will only match anything with editor/ or libs/ui/ in it
+
+                // Give every [Section Name] its own unique Name or else they will overwrite each other!
+                "RC i_caf": {
+                    "glob": "*.i_caf",
+                    "params": "/cafAlignTracks=1 /animConfigFolder=Animations /skipdba=1 /refresh=1",
+                    // force server to send the 'pc' platform to RC.EXE so it compiles the same as PC.
+                    "server": "/cafAlignTracks=1 /animConfigFolder=Animations /skipdba=1 /refresh=1 /p=pc",
+                    "priority": 5,
+                    "productAssetType": "{6023CFF8-FCBA-4528-A8BF-6E0E10B9AB9C}"
+                },
+                "RC caf": {
+                    "glob": "*.caf",
+                    "params": "copy",
+                    "productAssetType": "{6023CFF8-FCBA-4528-A8BF-6E0E10B9AB9C}"
+                },
+                "RC mp4": {
+                    "glob": "*.mp4",
+                    "params": "copy",
+                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
+                },
+                "RC mkv": {
+                    "glob": "*.mkv",
+                    "params": "copy",
+                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
+                },
+                "RC webm": {
+                    "glob": "*.webm",
+                    "params": "copy",
+                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
+                },
+                "RC mov": {
+                    "glob": "*.mov",
+                    "params": "copy",
+                    "productAssetType": "{DDFEE0B2-9E5A-412C-8C77-AB100E24C1DF}"
+                },
+                "RC bk2": {
+                    "glob": "*.bk2",
+                    "params": "copy",
+                    "productAssetType": "{BF4879B9-B893-41D2-80E9-24A7BDCD2B50}"
+                },
+                "RC img": {
+                    "glob": "*.img",
+                    "params": "copy"
+                },
+                "RC dba": {
+                    "glob": "*.dba",
+                    "params": "copy",
+                    "productAssetType": "{511562BE-65A5-4538-A5F1-AC685366243E}",
+                    "version": 2
+                },
+                "RC cgf": {
+                    "glob": "*.cgf",
+                    "params": "/VertexPositionFormat=exporter /VertexIndexFormat=u32",
+                    // on server, feed rc.exe the param /p=pc to force it to compile assets for server platform in pc format.
+                    "server": "/VertexPositionFormat=exporter /VertexIndexFormat=u32 /p=pc",
+                    "lockSource": true,
+                    "priority": 10
+                    // allow CGF files to compile first, so untextured models appear before their textures for faster startup
+                    // other available params: /SplitLODs=1
+                },
+                "RC surfaceTagNameList": {
+                    "glob": "*.surfaceTagNameList",
+                    "params": "copy",
+                    "productAssetType": "{A471B2A9-85FC-4993-842D-1881CBC03A2B}"
+                },
+                "RC gradImageSettings": {
+                    "glob": "*.gradimagesettings",
+                    "params": "copy",
+                    "productAssetType": "{B36FEB5C-41B6-4B58-A212-21EF5AEF523C}"
+                },
+                "RC fbx": {
+                    "glob": "*.fbx",
+                    // Priority set to 9 so its "before" things like materials but after things like actors and motions (which build using a proper AssetBuilderSDK builder and thus are not in this file)
+                    "priority": 9,
+                    "version": 5
+                },
+                "RC chr": {
+                    "glob": "*.chr",
+                    "params": "copy",
+                    "productAssetType": "{60161B46-21F0-4396-A4F0-F2CCF0664CDE}",
+                    "version": 2
+                },
+                "RC skin": {
+                    "glob": "*.skin",
+                    "params": "copy"
+                },
+                "RC cfi": {
+                    "glob": "*.cfi",
+                    "params": "copy"
+                },
+                "RC cfx": {
+                    "glob": "*.cfx",
+                    "params": "copy"
+                },
+                "RC cfr": {
+                    "glob": "*.cfr",
+                    "params": "copy"
+                },
+                // Warning: If you change the VertexIndexFormat, make sure you update the vtx_idx typedef in Code\CryEngine\CryCommon\ProjectDefines.h
+                "RC abc": {
+                    "glob": "*.abc",
+                    "params": "/SkipFilesWithoutBuildConfig=0 /VertexIndexFormat=u32",
+                    "console": "/SkipFilesWithoutBuildConfig=0 /VertexIndexFormat=u32",
+                    "mobile": "/SkipFilesWithoutBuildConfig=0 /VertexIndexFormat=u16",
+                    "version": 3,
+                    "server": "skip"
+                },
+                "RC png-entityicon": {
+                    "pattern": "(.*EntityIcons\\\\/).*\\\\.png",
+                    "productAssetType": "{3436C30E-E2C5-4C3B-A7B9-66C94A28701B}",
+                    "params": "skip",
+                    "tools": "copy"
+                },
+                "RC usm": {
+                    "glob": "*.usm",
+                    "params": "copy",
+                    "server": "skip"
+                },
+                "RC animevents": {
+                    "glob": "*.animevents",
+                    "params": "copy",
+                    "productAssetType": "{C1D209C1-F81A-4586-A34E-1615995F9F3F}",
+                    "version": 2
+                },
+                "RC adb": {
+                    "glob": "*.adb",
+                    "params": "copy",
+                    "productAssetType": "{50908273-CA36-4668-9828-15DD5092F973}"
+                },
+                "RC bspace": {
+                    "glob": "*.bspace",
+                    "params": "copy"
+                },
+                "RC cdf": {
+                    "glob": "*.cdf",
+                    "params": "copy",
+                    "productAssetType": "{DF036C63-9AE6-4AC3-A6AC-8A1D76126C01}"
+                },
+                // note - this used to be skinnedMeshAsset but its now Character Definition File specific.
+                // .skin has its own type.
+
+                "RC chrparams": {
+                    "glob": "*.chrparams",
+                    "params": "copy",
+                    "productAssetType": "{4BBB785A-6824-4803-A607-F9323E7BEEF1}",
+                    "version": 2
+                },
+                "RC comb": {
+                    "glob": "*.comb",
+                    "params": "copy"
+                },
+                "RC dlg": {
+                    "glob": "*.dlg",
+                    "params": "copy"
+                },
+                "RC csv": {
+                    "glob": "*.csv",
+                    "params": "copy"
+                },
+                "RC json": {
+                    "glob": "*.json",
+                    "params": "copy"
+                },
+                "RC lmg": {
+                    "glob": "*.lmg",
+                    "params": "copy"
+                },
+                "RC smtl": {
+                    "glob": "*.smtl",
+                    "params": "copy"
+                },
+                "RC sub": {
+                    "glob": "*.sub",
+                    "params": "copy",
+                    "productAssetType": "{71F9D30E-13F7-40D6-A3C9-E5358004B31F}",
+                    "version": 2
+                },
+                "RC sbsar": {
+                    "glob": "*.sbsar",
+                    "params": "copy"
+                },
+                "RC loc.agsxml": {
+                    "glob": "*.loc.agsxml",
+                    "params": "copy",
+                    "version": 1
+                },
+                "RC node": {
+                    "glob": "*.node",
+                    "params": "copy"
+                },
+                "RC veg": {
+                    "glob": "*.veg",
+                    "params": "copy"
+                },
+                "RC dat": {
+                    "glob": "*.dat",
+                    "params": "copy"
+                },
+                "RC lut": {
+                    "glob": "*.lut",
+                    "params": "copy"
+                },
+                "RC txt": {
+                    "pattern": "^(?!.*PreloadLibs.txt).*\\\\.txt",
+                    "params": "copy"
+                },
+                "RC cal": {
+                    "glob": "*.cal",
+                    "params": "copy"
+                },
+                "RC grp": {
+                    "glob": "*.grp",
+                    "params": "copy",
+                    "productAssetType": "{7629EDD3-A361-49A2-B271-252127097D81}",
+                    "version": 2
+                },
+                "RC xls": {
+                    "glob": "*.xls",
+                    "params": "copy"
+                },
+                "RC ini": {
+                    "glob": "*.ini",
+                    "params": "copy"
+                },
+                "RC ttf": {
+                    "glob": "*.ttf",
+                    "params": "copy"
+                },
+                "RC otf": {
+                    "glob": "*.otf",
+                    "params": "copy"
+                },
+                "RC ext": {
+                    "glob": "*.ext",
+                    "params": "copy"
+                },
+                // Copy all pak files except level.pak, level.pak has its own builder.
+                "RC pak": {
+                    "pattern": "^((?!\\\\/level\\\\.pak).)*\\\\.pak$",
+                    "params": "copy"
+                },
+                "RC ctc": {
+                    "glob": "*.ctc",
+                    "params": "copy"
+                },
+                "RC uiprefab": {
+                    "glob": "*.uiprefab",
+                    "params": "copy",
+                    "server": "skip"
+                },
+                "RC sprite": {
+                    "glob": "*.sprite",
+                    "params": "copy",
+                    "server": "skip"
+                },
+                "RC bin": {
+                    "glob": "*.bin",
+                    "params": "copy"
+                },
+                "RC inputbindings": {
+                    "glob": "*.inputbindings",
+                    "params": "copy",
+                    "productAssetType": "{25971C7A-26E2-4D08-A146-2EFCC1C36B0C}"
+                },
+                "RC physmaterial": {
+                    "glob": "*.physmaterial",
+                    "params": "copy",
+                    "productAssetType": "{9E366D8C-33BB-4825-9A1F-FA3ADBE11D0F}"
+                },
+                "RC ocm": {
+                    "glob": "*.ocm",
+                    "params": "copy"
+                },
+                // Feature tests use the raw .tif files for the golden image comparison
+                "RC goldenimages": {
+                    "pattern": ".*GoldenImages\\\\/.*\\\\.tif",
+                    "params": "copy",
+                    "server": "skip"
+                },
+                // Copy over certificates for use with FileDataSource
+                "RC CertificatePEM": {
+                    "glob": "*.pem",
+                    "params": "copy"
+                },
+                // Copy over certificates for use with Dynamic Content
+                "RC CertificateDER": {
+                    "glob": "*.der",
+                    "params": "copy"
+                },
+                "RC PhysXMeshAsset": {
+                    "glob": "*.pxmesh",
+                    "params": "copy",
+                    "productAssetType": "{7A2871B9-5EAB-4DE0-A901-B0D2C6920DDB}"
+                },
+                // Copy over cooked PhysX heightfield
+                "RC PhysX HeightField": {
+                    "glob": "*.pxheightfield",
+                    "params": "copy",
+                    "productAssetType": "{B61189FE-B2D7-4AF1-8951-CB5C0F7834FC}"
+                },
+                "RC filetag": {
+                    "glob": "*.filetag",
+                    "params": "copy",
+                    "productAssetType": "{F3BE5CAB-85B7-44B7-9495-863863F6B267}"
+                },
+                // Precompiled shader srg
+                "RC azsrg": {
+                    "glob": "*.azsrg",
+                    "params": "copy",
+                    "productAssetType": "{F8C9F4AE-3F6A-45AD-B4FB-0CA415FCC2E1}"
+                },
+                // Precompiled shader variant
+                "RC azshadervariant": {
+                    "glob": "*.azshadervariant",
+                    "params": "copy",
+                    "productAssetType": "{9F4D654B-4439-4C61-8DCD-F1C7C5560768}"
+                }
+            }
+        }
+    }
+}
diff --git a/Engine/Registry/Platform/Windows/streamer.editor.setreg b/Registry/Platform/Windows/streamer.editor.setreg
similarity index 100%
rename from Engine/Registry/Platform/Windows/streamer.editor.setreg
rename to Registry/Platform/Windows/streamer.editor.setreg
diff --git a/Registry/Platform/Windows/streamer.game.setreg b/Registry/Platform/Windows/streamer.game.setreg
new file mode 100644
index 0000000000..7788227fb5
--- /dev/null
+++ b/Registry/Platform/Windows/streamer.game.setreg
@@ -0,0 +1,89 @@
+{
+    "Amazon":
+    {
+        "AzCore":
+        {
+            "Streamer":
+            {
+                "UseAllHardware": false,
+                "Profiles":
+                {
+                    "Generic":
+                    {
+                        "Stack":
+                        [
+                            {
+                                "$type": "AZ::IO::WindowsStorageDriveConfig",
+                                // The maximum number of file handles that are cached. Only a small number are needed when running from 
+                                // archives, but it's recommended that a larger number are kept open when reading from loose files.
+                                "MaxFileHandles": 32,
+                                // The maximum number of files to keep meta data, such as the file size, to cache. Only a small number are 
+                                // needed when running from archives, but it's recommended that a larger number are kept open when reading 
+                                // from loose files.
+                                "MaxMetaDataCache": 32,
+                                // The number of additional slots that will be reported as available. This makes sure that there are always
+                                // a few requests pending to avoid starvation. An over-commit that is too large can negatively impact the 
+                                // scheduler's ability to re-order requests for optimal read order. A negative value will under-commit and
+                                // will avoid saturating the IO controller which can be needed if the drive is used by other applications.
+                                "Overcommit": 8,
+                                // Globally enable file sharing. This allows files to used outside AZ::IO::Streamer, including other 
+                                // applications while in use by AZ::IO::Streamer. File sharing can negatively impact performance and is 
+                                // recommended for development only. 
+                                "EnableFileSharing": false,
+                                // Use unbuffered reads for the fastest possible read speeds by bypassing the Windows file cache. This 
+                                // results in a faster read the first time a file is read, but subsequent reads will possibly be slower as
+                                // those could have been serviced from the faster OS cache. During development or for games that reread 
+                                // files frequently it's recommended to set this option to false, but generally it's best to be turned on.
+                                "EnableUnbufferedReads": true,
+                                // If true, only information that's explicitly requested or issues are reported. If false, status information
+                                // such as when drives are created and destroyed is reported as well.
+                                "MinimalReporting": false
+                            },
+                            {
+                                "$type": "AZ::IO::ReadSplitterConfig",
+                                "BufferSizeMib": 6,
+                                "SplitSize": "MaxTransfer",
+                                "AdjustOffset": true,
+                                "SplitAlignedRequests": false
+                            },
+                            {
+                                "$type": "AZ::IO::BlockCacheConfig",
+                                "CacheSizeMib": 10,
+                                "BlockSize": "MaxTransfer"
+                            },
+                            {
+                                "$type": "AZ::IO::DedicatedCacheConfig",
+                                "CacheSizeMib": 2,
+                                "BlockSize": "MemoryAlignment",
+                                "WriteOnlyEpilog": true
+                            },
+                            {
+                                "$type": "AZ::IO::FullFileDecompressorConfig",
+                                "MaxNumReads": 2,
+                                "MaxNumJobs": 2
+                            }
+                        ]
+                    },
+                    "DevMode":
+                    {
+                        "Stack":
+                        [
+                            {
+                                "$type": "AZ::IO::WindowsStorageDriveConfig",
+                                "MaxFileHandles": 1024,
+                                "MaxMetaDataCache": 1024,
+                                "Overcommit": 8,
+                                "EnableFileSharing": true,
+                                "EnableUnbufferedReads": false
+                            },
+                            {
+                                "$type": "AzFramework::RemoteStorageDriveConfig",
+                                "MaxFileHandles": 1024 
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Registry/Platform/Windows/streamer.test.setreg b/Registry/Platform/Windows/streamer.test.setreg
new file mode 100644
index 0000000000..13e4fa2d57
--- /dev/null
+++ b/Registry/Platform/Windows/streamer.test.setreg
@@ -0,0 +1,57 @@
+{
+    "Amazon":
+    {
+        "AzCore":
+        {
+            "Streamer":
+            {
+                "ReportHardware": false,
+                "Profiles":
+                {
+                    "Generic":
+                    {
+                        "Stack":
+                        [
+                            {
+                                "$type": "AZ::IO::StorageDriveConfig",
+                                "MaxFileHandles": 1024
+                            },
+                            {
+                                "$type": "AZ::IO::WindowsStorageDriveConfig",
+                                "MaxFileHandles": 1024,
+                                "MaxMetaDataCache": 1024,
+                                "Overcommit": 8,
+                                "EnableFileSharing": true,
+                                "EnableUnbufferedReads": true,
+                                "MinimalReporting": true
+                            },
+                            {
+                                "$type": "AZ::IO::ReadSplitterConfig",
+                                "BufferSizeMib": 10,
+                                "SplitSize": "MaxTransfer",
+                                "AdjustOffset": true,
+                                "SplitAlignedRequests": false
+                            },
+                            {
+                                "$type": "AZ::IO::BlockCacheConfig",
+                                "CacheSizeMib": 10,
+                                "BlockSize": "MaxTransfer"
+                            },
+                            {
+                                "$type": "AZ::IO::DedicatedCacheConfig",
+                                "CacheSizeMib": 10,
+                                "BlockSize": "MemoryAlignment",
+                                "WriteOnlyEpilog": true
+                            },
+                            {
+                                "$type": "AZ::IO::FullFileDecompressorConfig",
+                                "MaxNumReads": 4,
+                                "MaxNumJobs": 4
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Registry/application_options.setreg b/Registry/application_options.setreg
new file mode 100644
index 0000000000..06ccdc9b41
--- /dev/null
+++ b/Registry/application_options.setreg
@@ -0,0 +1,17 @@
+{
+    "O3DE" : {
+        "AzCore": {
+            "Application": {
+                "ValidCommandOptions": [
+                    "project-path",
+                    "engine-path",
+                    "project-cache-path",
+                    "regset",
+                    "regremove",
+                    "regdump",
+                    "regdumpall"
+                ]
+            }
+        }
+    }
+}
diff --git a/Engine/Registry/bootstrap.setreg b/Registry/bootstrap.setreg
similarity index 100%
rename from Engine/Registry/bootstrap.setreg
rename to Registry/bootstrap.setreg
diff --git a/Engine/Registry/prefab.tools.setreg b/Registry/prefab.tools.setreg
similarity index 100%
rename from Engine/Registry/prefab.tools.setreg
rename to Registry/prefab.tools.setreg
diff --git a/Engine/Registry/setregbuilder.assetprocessor.setreg b/Registry/setregbuilder.assetprocessor.setreg
similarity index 100%
rename from Engine/Registry/setregbuilder.assetprocessor.setreg
rename to Registry/setregbuilder.assetprocessor.setreg
diff --git a/Engine/Registry/streamer.editor.setreg b/Registry/streamer.editor.setreg
similarity index 100%
rename from Engine/Registry/streamer.editor.setreg
rename to Registry/streamer.editor.setreg
diff --git a/Engine/Registry/streamer.game.setreg b/Registry/streamer.game.setreg
similarity index 100%
rename from Engine/Registry/streamer.game.setreg
rename to Registry/streamer.game.setreg
diff --git a/Engine/Registry/streamer.setreg b/Registry/streamer.setreg
similarity index 100%
rename from Engine/Registry/streamer.setreg
rename to Registry/streamer.setreg
diff --git a/Engine/Registry/streamer.test.setreg b/Registry/streamer.test.setreg
similarity index 100%
rename from Engine/Registry/streamer.test.setreg
rename to Registry/streamer.test.setreg
diff --git a/Tools/Crashpad/LICENSE b/Tools/Crashpad/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/Tools/Crashpad/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libbase.a b/Tools/Crashpad/bin/mac/Debug_x64/libbase.a
deleted file mode 100644
index 0701c2a9ec..0000000000
--- a/Tools/Crashpad/bin/mac/Debug_x64/libbase.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb76d30a6782e42737778d75d67192eff8770745a327c7f0bcb172478bbee693
-size 3334464
diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_client.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_client.a
deleted file mode 100644
index a392638ff7..0000000000
--- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_client.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60ae111931f84ebfd0fb477f894c16193f2b661448610ef28dadb6e25669f6b6
-size 2307704
diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_handler_lib.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_handler_lib.a
deleted file mode 100644
index 3918508de5..0000000000
--- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_handler_lib.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b77a7b85064278b9550fb4926ede40486401023fa0aa3791e26c5b54c89ed065
-size 3076056
diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_minidump.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_minidump.a
deleted file mode 100644
index b0e539f27c..0000000000
--- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_minidump.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d84217997c2c29c46e2df33883a9e869ba3a65f22dd014b858dee25cc75f199
-size 11129296
diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_snapshot.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_snapshot.a
deleted file mode 100644
index 71345a07be..0000000000
--- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_snapshot.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b43625a00c5e82b21ffbd3f76b15a02b556497a11dea64a70bae065dc6db383a
-size 9991040
diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_tool_support.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_tool_support.a
deleted file mode 100644
index df88fd5acd..0000000000
--- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_tool_support.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36d6797b5180e458a04f39ebc7ccc4e9a077f94161aa6a1aa500a6dd2532f677
-size 76256
diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_util.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_util.a
deleted file mode 100644
index 473b5db188..0000000000
--- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_util.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a976d5ae4e58c41b1203c37c0538ce9b690bfd2c7bd41602c29bb628a4bed12
-size 10371432
diff --git a/Tools/Crashpad/bin/mac/Release_x64/libbase.a b/Tools/Crashpad/bin/mac/Release_x64/libbase.a
deleted file mode 100644
index 20c4c11d77..0000000000
--- a/Tools/Crashpad/bin/mac/Release_x64/libbase.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d7a99dd8cf3b1cadb7e638ede71bf143e787189352800cebe18b6148748497d
-size 2312800
diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_client.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_client.a
deleted file mode 100644
index 4c94113647..0000000000
--- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_client.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7721d60e9c15dc07c63b0c457047f359dcd21de08ca1a1c858cb20799be83d6d
-size 1802480
diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_handler_lib.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_handler_lib.a
deleted file mode 100644
index 7e74206a91..0000000000
--- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_handler_lib.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:307a8ac4a2bfc08ff98e10063b503ce7f7dbc8c45bfa3eeb1459f28fced0a69a
-size 2532480
diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_minidump.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_minidump.a
deleted file mode 100644
index 0bbd3bf9a6..0000000000
--- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_minidump.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f8e32c3fabea8c59f5afc7df2643ad70539aa3db10c2dae97cf3e9281507bf8
-size 8205936
diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_snapshot.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_snapshot.a
deleted file mode 100644
index b5c5430938..0000000000
--- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_snapshot.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36ed8253faf1600d136923bf86ef52a812490e43c9caadee61ae28f2ecf1995b
-size 7803856
diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_tool_support.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_tool_support.a
deleted file mode 100644
index beb086069a..0000000000
--- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_tool_support.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3123a5553a578b8494cc9453ab039a3198cfa564f3b8b9ccef4a8a593caffa1c
-size 77256
diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_util.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_util.a
deleted file mode 100644
index 67aa51650b..0000000000
--- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_util.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7fd642b088929e74140930107ce9a4f06099eaa8e78dc9c024b98db3201f9fe
-size 7588096
diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.cc.pdb
deleted file mode 100644
index 5ab13ea0e2..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6507de8507e07f3a3a3c216392951dd04cb8303d3c851cee3b6f8ef2615ccbb0
-size 536576
diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.lib b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.lib
deleted file mode 100644
index e64fd3652b..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faf9b73e55eb744a6a672444affcf29338552623bd24400fb858b17242b3ab90
-size 2987702
diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.cc.pdb
deleted file mode 100644
index b87712773f..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0877dd0586810f9f376a712ad9240ee73a35358fa32c7eb74e16f020772f9b51
-size 790528
diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.lib
deleted file mode 100644
index 56fe8cbfe6..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad8c021cd42687428b312cac1ad233f6101708e49437ef817959c303f5e69f37
-size 3481946
diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.cc.pdb
deleted file mode 100644
index e4fba84562..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:631d2c813cd5f3b258555013db4dc90d57a692df60d3dad5398fce14fd2e69a7
-size 1265664
diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.lib
deleted file mode 100644
index f10144feb1..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b1e018c8571ab9e1b06c9e3a5750038a9589c2442563678815ae37a47512c80
-size 10799690
diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.cc.pdb
deleted file mode 100644
index 0ef01d8df6..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49e77aeba8ff229ed1df999af9ef55fd3beaffe57b3f498036be4445809f5c6f
-size 512000
diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.lib b/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.lib
deleted file mode 100644
index e4b8713573..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d58e0c4a46398a0feaf922c2325b57650f7b80947075ed024f5317c0101e0ebf
-size 2604980
diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.cc.pdb
deleted file mode 100644
index 63ff75fff6..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb5c38028547b3834b92fcd5f5381b893bd9e5e9f7b3946ae3616f8d5209fbbd
-size 733184
diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.lib
deleted file mode 100644
index a81d7ee8a2..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2157bd0d5f2408074879ba68027bf78ad4585b97eac469281a8c2159f10c0fa
-size 3024914
diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.cc.pdb
deleted file mode 100644
index 2cbb95208b..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e477cfcc3433eb2311e4b4349ad9690f61a658298d0a82acb68f53bec086b56c
-size 1191936
diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.lib
deleted file mode 100644
index 0b1cbcd4b0..0000000000
--- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e7f0c899275be00dc64474d0880f9bbd67989f2df9cd69bd1fc6b6ef36f194b
-size 9327612
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.cc.pdb
deleted file mode 100644
index 01af8cfd30..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5eeba748c1c424bf1d354a51b1e804aa37874bb6113a28a80138e1a88df9eef
-size 610304
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.lib
deleted file mode 100644
index 14460afd47..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5a31ccb663c6becbcc2d479a659f51891465c8664a5d70cf6ebf9a881eaabb0
-size 2279968
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.cc.pdb
deleted file mode 100644
index b641cd41b1..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76458fdb9688fd8ec6d01cd127e480c0807a599df4442d83e3d0d5700203b169
-size 995328
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.lib
deleted file mode 100644
index 7115fc716c..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e5b56aa6a11ecb0f0bf20ed52600c2783bb51192609e058942f6ecddb6f29a7
-size 3872018
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.cc.pdb
deleted file mode 100644
index d3f8dd301a..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:158bec9dec5eb5b9e0bda8a3c6eb20413726ec5e2c32254acc1b7e5d63e884fb
-size 77824
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.lib
deleted file mode 100644
index db959bc6b0..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f749466487567392cb530d5b6adf104f607f3c665781fe5d28ad402366da453
-size 10570
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.cc.pdb
deleted file mode 100644
index 241f04444d..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:811d32c5432a78abe224ebbfa8f05c3cd970264147fde83d31af286bc0bd7ad1
-size 1478656
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.lib
deleted file mode 100644
index c8573fa0e7..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:997162e154b9cb76cbad70f8e6ce40060309ba6b481d146405fd41bc4ef433a2
-size 3713948
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.cc.pdb
deleted file mode 100644
index 4f463b3ca9..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f8e52266f2bf35d924559f5b84cbef8f5418ea393edd4a538b3c515c2f5b5f0
-size 2068480
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.lib
deleted file mode 100644
index bf6e3be321..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d998572e0831aba01ab666f2db70ad728f6fc3ee681ccb5b843d4b5d5c42b46
-size 17842252
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.cc.pdb
deleted file mode 100644
index ac2289b38f..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6ffe73a6ab9b9255588c674715d20aabdf0e8af1e6cc27fb0308aed059eea4d
-size 1961984
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.lib
deleted file mode 100644
index af8fd630a8..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fb734f4bc60eaa336af62ab42567fec79dbb0223ed96af6dec6ea3cc3226ea6
-size 15449366
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.cc.pdb
deleted file mode 100644
index f05e897ed8..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5baba8a9eb72453324f8175ab5f2dd25ee981a6177b66982b010a55af87263ef
-size 446464
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.lib
deleted file mode 100644
index e40a81202a..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8f330beadc180fe3f29061d743e0025c3725bf5051adcca55f199cdffbaa1f8
-size 330198
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.cc.pdb
deleted file mode 100644
index 0675bb8c21..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97c7247ce76fabf3857e9a8dcc2d913d8dbc67bd5df8e3578050d447837f571f
-size 1601536
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.lib
deleted file mode 100644
index fb6afc5fdb..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bafac5994b2d7a5ecd062cc64f28c09be45a0cd805bcd3c4c4204d278d61bca
-size 11807818
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.cc.pdb
deleted file mode 100644
index 5ef03ecd9b..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5af26522ab427c4ec2ea9dbe0c41eca46bb31475b8b87ab47c513e56839ba763
-size 86016
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.lib
deleted file mode 100644
index 2c42ac90b0..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd974c961c1a1443414bc21cfa10440ed1367c7cfa15fd9608ca431631917a65
-size 22644
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.c.pdb
deleted file mode 100644
index 58c4ab5305..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.c.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76c990a27c549c0428095bdbe97060a40d33c3a897587ddd06e2ee8db15d4770
-size 102400
diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.lib
deleted file mode 100644
index 0b3dab07d7..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78cbbb2b947e55fb13b3f97366d759d22e828ccf2588f2a412b924fcbd2524d8
-size 350630
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.cc.pdb
deleted file mode 100644
index 897a49ed6a..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:146c69b75db404f36b7d980559d3c055cd87349d7ec7505c6813b85dd139f93d
-size 577536
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.lib
deleted file mode 100644
index 425894ece4..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3771477293933cf29951aa4a6de64018e051a9edfde878a7cc00af0531ecf0f9
-size 1733068
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.cc.pdb
deleted file mode 100644
index b78b277aaf..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ba035d4d229d0ec21aa1aa3ce56771e0b190437ea6e4cf3e5f5670cc5eadb06
-size 946176
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.lib
deleted file mode 100644
index bb9a8a29f2..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83ad7341f5e86ce67bdc317f9c5e317bb86167cfef95edd1f2ff334df0c9dec2
-size 3152942
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.cc.pdb
deleted file mode 100644
index e78ef129f5..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf7040092ebad18ba2460b4688fe44420d78c7c22dccb6fc929ec90f07d7fc77
-size 77824
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.lib
deleted file mode 100644
index 8b156f977e..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd56d961d1bc5674e98a3bd17ecca53f96bfd2d9f65c3f37c580fbe9e49ee3fb
-size 9974
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.cc.pdb
deleted file mode 100644
index 38425e2b20..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a63732692819a559de517c7b7c8fcf974a3120055f2fd14b0a1429a543ff6b3b
-size 1413120
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.lib
deleted file mode 100644
index 664dfbec5b..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e76377c0ee89df91327dcc7f62813cb4391d9856fdb2583962b0e18e3cc348c
-size 2894530
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.cc.pdb
deleted file mode 100644
index 309cdfd390..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db9d3ade234934995bea6e0f9ca047e0356593cffa0c7a044829452c955c71fa
-size 1904640
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.lib
deleted file mode 100644
index 89770393fe..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43a46db4050f95aa4f18587115573bee354241950a91349327ac183ebdca6e99
-size 13470898
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.cc.pdb
deleted file mode 100644
index 5617dec7c2..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b34cc8a085cce244ebd8eec546b6fe8c65d8b7f60f4d329588d403aa17411d7f
-size 1789952
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.lib
deleted file mode 100644
index d32ffb8486..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1c4293d8e391406f2eb7c35d54e39ae1aaf10c96e17739741c2eb554c5ef9de
-size 11151442
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.cc.pdb
deleted file mode 100644
index 4bd52125c0..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3acf84a1adf173c3dac27ba68265b5e264d81733063c062a95661bdf75b890b
-size 421888
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.lib
deleted file mode 100644
index a670e739f4..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:700e7c1ec69bcbb12109e689d46dabb9c83ff6f311be54142eb143dd4ffe1b0a
-size 246684
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.cc.pdb
deleted file mode 100644
index f4a24c9ab9..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:887b5d2083179234e07ad7478a0f0533134ab929aaad204a54a3dc4ce27d153f
-size 1511424
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.lib
deleted file mode 100644
index d3f1017c19..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d342aa57bea9070e5ca768418f8b3fd0a36f735c8c5160a636ad4912a64505c0
-size 9416408
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.cc.pdb
deleted file mode 100644
index 5976aa378d..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d154da0553fd94ec3e5059503a41db03f1d68fffed12fc76ab4902ec75f6298e
-size 86016
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.lib
deleted file mode 100644
index cf8a5cb625..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f8b36cf3305d9d10e97ebac28d53cf3f6c8cf117d8fc8bac3312c65c8e48d77
-size 29408
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.c.pdb
deleted file mode 100644
index 9d6836d135..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.c.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97f469e3a535f77fc242040bb80d36f8883182868bb070c33fec041722605259
-size 102400
diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.lib
deleted file mode 100644
index b755b2ce8c..0000000000
--- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5f1d98d742d61d430c0bbc73eeb4ab9dc7afb6adaa8bdde7570fe28a3a4aac8
-size 388862
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base.lib
deleted file mode 100644
index 5f9059e1d7..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:626086670063e2d25c747e4532fba8b070122b63cfd119da97ff96b13a6c3d6e
-size 2094438
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base_cc.pdb
deleted file mode 100644
index 88de799261..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:270034ee51a53ef434d0383765f951910319b7045867d10e66fb7bc5e5a8f380
-size 831488
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client.lib
deleted file mode 100644
index fe4eaddad1..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:302ef869aad53a2ea5681ee1c5a96e198e5d521165bd6a9027d09ffd7df38fa5
-size 3914060
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client_cc.pdb
deleted file mode 100644
index f93a003b98..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45020f9f0b490f1c001e6cc8bf1c45a29d678611c4655f85074fe23fa6c5ddd1
-size 1175552
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat.lib
deleted file mode 100644
index 3f4d33f8b9..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:004901f966fc28e9ae6aecc8086302592cb43208ec31a7c074f699533d84c2db
-size 8978
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat_cc.pdb
deleted file mode 100644
index 03f989686b..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3aa1cba7cd1564df06777f4dcb4057f8bd2fcbc176ec8a494b17f7277e44a4d
-size 77824
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context.lib
deleted file mode 100644
index 5652923545..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36acc956e8ecf13ed164d4c416bcc92f0f31db5f30f3d1e7beb33e398a41443b
-size 63796
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context_cc.pdb
deleted file mode 100644
index 35c42abfea..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f97ecc158d23e273367171dc032ce3ed7feeec7b7221ccf10e36d304ee467b7e
-size 454656
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler.lib
deleted file mode 100644
index c9f32e4272..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5ed7b8a7193e75ff9588e6c7d06e2a3c0afda514a620dd275c1338ba6acd161
-size 3054554
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler_cc.pdb
deleted file mode 100644
index 1328fd6d03..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65903b1d9275b9268bdf7af1e4c2f2de46cd8dcc83eae4bfa64c2f5b38edbc57
-size 2887680
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump.lib
deleted file mode 100644
index 3796a0478e..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0e78280364d17a23a8feb819d71fb830f67ca40b7c932467263740cb2917ead
-size 13044588
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump_cc.pdb
deleted file mode 100644
index 4c58046197..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5885d9f72f86181199e6b2f1e7fb96419982209fe7e2c8f7b06b7c77c332c836
-size 2289664
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot.lib
deleted file mode 100644
index f8b4588ed5..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fb181c40f80438d0b50f79b093a3503c853a43db8e92f7d5ddfd5bb13793b16
-size 12965800
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot_cc.pdb
deleted file mode 100644
index 992891a75f..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27ab636cdc02fe86b73c40961c289d810f4f31be9c59c61e7c5300f0e9168fe9
-size 2355200
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support.lib
deleted file mode 100644
index 330ad9beee..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f00b8108a7849e92d4711a0106b94931eced1859fb0281a423ad5179cacdf399
-size 240574
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support_cc.pdb
deleted file mode 100644
index ff5ecf71a6..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:026ca665e79cf98df13477abe84201dd1bdba7a0068b3b411b89eaf9cc8c1711
-size 446464
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util.lib
deleted file mode 100644
index 78b3281e6c..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3a6cd014d7a1096ab492ea62061c8eac341ffe97a856710b2dd65e183fe9248
-size 11636150
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util_cc.pdb
deleted file mode 100644
index 1f51fdbfd5..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4c2b7e7ca514f1f5e768e4c7f5ec341f04b5f1e5fe82a8885476d1e1ed833f4
-size 2363392
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.cc.pdb
deleted file mode 100644
index 5ef03ecd9b..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5af26522ab427c4ec2ea9dbe0c41eca46bb31475b8b87ab47c513e56839ba763
-size 86016
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.lib
deleted file mode 100644
index 2c42ac90b0..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd974c961c1a1443414bc21cfa10440ed1367c7cfa15fd9608ca431631917a65
-size 22644
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.c.pdb
deleted file mode 100644
index 58c4ab5305..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.c.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76c990a27c549c0428095bdbe97060a40d33c3a897587ddd06e2ee8db15d4770
-size 102400
diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.lib
deleted file mode 100644
index 0b3dab07d7..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78cbbb2b947e55fb13b3f97366d759d22e828ccf2588f2a412b924fcbd2524d8
-size 350630
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/base.lib
deleted file mode 100644
index ab843e4478..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07139d47140d27876fff382036637bab1e22ae8c65b5ceaf37f92fcd347587a7
-size 1124438
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/base_cc.pdb
deleted file mode 100644
index 366ca528e2..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b09045400a4ee55542916a915c111072a4f8b27be77378cb52f1597fd87d8150
-size 806912
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client.lib
deleted file mode 100644
index 027348705d..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4cbb4e87fe52a5b85739cb2cc562cc9da718b8a2d62df74428d40ccdf62cce2
-size 1696870
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client_cc.pdb
deleted file mode 100644
index 5a66efa3bf..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae28bf771c2788a34bf642ab95ba102e5d6c7b8e22b23742a93b8092b5c5e687
-size 1085440
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat.lib
deleted file mode 100644
index 7cf7f10d4c..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b0803ce1fe7b23397997d6cc160803e44c7c172616223004ee5f17a5ae41d165
-size 8734
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat_cc.pdb
deleted file mode 100644
index bee40682a0..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69f1497cdf145f98a04d05cc4bae8f7c60e98de3faafab46c9dacc95d4557fb5
-size 77824
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context.lib
deleted file mode 100644
index 8699928d13..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8a96c249ee9af8ddd9d9f66b93cd7ec5edb45dc5e0e012645917490a80897e3
-size 49100
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context_cc.pdb
deleted file mode 100644
index c92e68adbd..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fd31008151c0e7cb2dc6f3547d391ba69aeb4741b8b5b5e76abd83b6415e100
-size 430080
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler.lib
deleted file mode 100644
index e2d8a48531..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c9099859046bf4dafcf6455c39accfefe5ca389d8bfdc86fe2209c5e4b8804f
-size 1157858
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler_cc.pdb
deleted file mode 100644
index 49e5c1d8b1..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca7cc3c846da2017736d813e56e32071d9e720319dc8fd636372923a3c25d223
-size 2527232
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump.lib
deleted file mode 100644
index 4ef4c8ae40..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3430726856c3b68f422614166ed64e7249b2246363c27fd2d63e63f668c2e47d
-size 5155320
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump_cc.pdb
deleted file mode 100644
index 4a2457000f..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae7f896e3613565161bc41b90dc45aed9539c82261d9b5c2ed9c5a3a0b8f31b9
-size 2052096
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot.lib
deleted file mode 100644
index 698f891924..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c1ca49c6246323d9d4f854f4e8767735fdd51b0cc3faa7ce3d5a985e65db1a5
-size 4598666
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot_cc.pdb
deleted file mode 100644
index 01de39bbf7..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9eac108b65d4b45ffc08d11f457274c25e9c7aba978b79cdcccd0894a07f679c
-size 2134016
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support.lib
deleted file mode 100644
index 64786f1069..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:232322c240867a6a781784c754ac69a5e5452ff7bf6ac582ace35e9b1f68aada
-size 95970
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support_cc.pdb
deleted file mode 100644
index ec48eeab69..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a2b9b1d36c94c189d9c5ea821a2b819b01c4db449fa6b6a574e19efc2600978
-size 413696
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util.lib
deleted file mode 100644
index 4c346532a8..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6bf62815ecf6591fda46ba72b3636df660d5ceaa6571d55dec0f4b306d69cb1
-size 5704098
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util_cc.pdb
deleted file mode 100644
index bd5f778e18..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util_cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e30478f7aa319924d5b2578ec038cd58f93d9be726e918dc6693964b9550532
-size 2256896
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.cc.pdb
deleted file mode 100644
index 5976aa378d..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.cc.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d154da0553fd94ec3e5059503a41db03f1d68fffed12fc76ab4902ec75f6298e
-size 86016
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.lib
deleted file mode 100644
index cf8a5cb625..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f8b36cf3305d9d10e97ebac28d53cf3f6c8cf117d8fc8bac3312c65c8e48d77
-size 29408
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.c.pdb
deleted file mode 100644
index 9d6836d135..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.c.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97f469e3a535f77fc242040bb80d36f8883182868bb070c33fec041722605259
-size 102400
diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.lib
deleted file mode 100644
index b755b2ce8c..0000000000
--- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5f1d98d742d61d430c0bbc73eeb4ab9dc7afb6adaa8bdde7570fe28a3a4aac8
-size 388862
diff --git a/Tools/Crashpad/building/README.txt b/Tools/Crashpad/building/README.txt
deleted file mode 100644
index 05e6de2629..0000000000
--- a/Tools/Crashpad/building/README.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-Base instructions for building crashpad live at https://chromium.googlesource.com/crashpad/crashpad/+/HEAD/doc/developing.md
-
-This document is intended to cover changes from the base instructions for building Lumberyard's crashpad libraries.
-
-depot_tools runs its own copy of the git client which is not granted a Cylance exclusion so you may run into issues and need to do manual git pulls (I did).
-
-Lumberyard currently builds a 2013 and 2015 version of Crashpad.  Crashpad stopped supporting 2013 in December 2016 so it is necessary to checkout an earlier version for this build.  To get the correct build:
-
-Crashpad clone - git fetch crashpad
-Crashpad sync to "good" december version for 2013 - git checkout 556c4e
-
-Crashpad has its own set of 3rdParty libraries which are handled by depot_tools - in the case of mini_chromium it is necessary to sync to the same checkout as above when building for 2013.
-
-Clone mini_chromium to 2013 version:
-delete third_party/mini_chromium/mini_chromium/build/common 
-git clone https://chromium.googlesource.com/chromium/mini_chromium
-Sync to good (pre december) Cl - (from within mini_chromium dir) git checkout ca7f42a
-
-Make sure to copy over third_party/mini_chromium/mini_chromium.gyp
-make .gypi changes from mini_chromium/mini_chromium/build and crashpad/build
-
-RuntimeLibraries and ITERATOR_DEBUG settings need to match with Lumberyard Settings:
-
-Added to build\crashpad.gypi
-
-    'configurations': {
-        'Debug': {
-            'msvs_settings': {
-                'VCCLCompilerTool' : {
-                    'RuntimeLibrary': '3' /MDd
-                }
-            }
-        },
-        'Debug_x64': {
-            'msvs_settings': {
-                'VCCLCompilerTool' : {
-                    'RuntimeLibrary': '3' /MDd
-                }
-            }
-        },
-        'Release': {
-            'msvs_settings': {
-                'VCCLCompilerTool' : {
-                    'RuntimeLibrary': '2' /MD
-                }
-            },
-            'defines': [
-              '_ITERATOR_DEBUG_LEVEL=0'
-            ]
-        },
-        'Release_x64': {
-            'msvs_settings': {
-                'VCCLCompilerTool' : {
-                    'RuntimeLibrary': '2' /MD
-                }
-            },
-            'defines': [
-              '_ITERATOR_DEBUG_LEVEL=0'
-          
-    }
-    
-mini_chromium base settings live in third_party/mini_chromium/mini_chromium/build/common.gypi - switch RuntimeLibrary in debug from 1 to 3 there
-
-The ninja build system doesn't seem to have a great way to force a full rebuild (Their stated goal is to build as little as possible as quickly as possible), so when from time to time you find you need to force a full rebuild:
-Cleaning (from crashpad/crashpad):
-del /s /q *.obj
-del /s /q *.lib
-
-I made minor modifications to the crash report uploader so a confirmation dialog could be displayed to the user.  The file is checked in perforce as dev/Tools/Crashpad/handler/src/crash_report_upload_thread.cc which should be copied over the existing copy from git which lives in crashpad\handler or the changes can be merged in if necessary.  The new block is in ProcessPendingReport and currently looks like:
-
-// Amazon - Handle giving the user the option of whether or not to send the report.
-#if defined(OS_WIN)
-  std::wstring sendDialogMessage{ L"Lumberyard has encountered a fatal error.  We're sorry for the inconvenience.\n\nA Lumberyard Editor crash debugging file has been created at:\n" };
-  sendDialogMessage += report.file_path.value();
-  sendDialogMessage += L"\n\nIf you are willing to submit this file to Amazon it will help us improve the Lumberyard experience.  We will treat this report as confidential.\n\nWould you like to send the error report?";
-
-  int msgboxID = MessageBox(
-      NULL,
-      sendDialogMessage.data(),
-      L"Send Error Report",
-      (MB_ICONEXCLAMATION | MB_YESNO | MB_SYSTEMMODAL)
-      );
-
-  if (msgboxID == IDNO)
-  {
-      database_->SkipReportUpload(report.uuid,
-          Metrics::CrashSkippedReason::kUploadsDisabled);
-      database_->DeleteReport(report.uuid);
-      return;
-  }
-#endif
-
-Currently we build the Debug_x64 and Release_x64 variant for both 2015 and 2013.
-Build output goes to out\<buildtypefromabove>\obj\
-
-The libraries we use are:
-
-crashpad_client.lib from client (Also include crashpad_client.cc.pdb)
-base.lib from third_party\mini_chromium\mini_chromium\base (and base.cc.pdb)
-crashpad_util.lib from util (and crashpad_util.cc.pdb)
-
-All sit together in dev\Tools\Crashpad\bin\windows\vs2015\Debug_x64 (Or whichever is the corresponding compiler/build target you're making)
-
-Each have some include headers that need to go into dev\Tools\Crashpad\include - there are about 15 or so total and hopefully don't need changing from the time of this writing, but if you build with a newer version of Crashpad for 2015 than I did (which was around April 1 2017) you may need to make some updates.  
-
-The 2013 headers have their own directory at Crashpad\include\vs2013.
-
-Then the handler exe is crashpad_handler.exe which goes in dev\tools\Crashpad\handler.  We only need one of those, I used the Release_x64 variant for 2015.
-
-Use the python in (root)/dev/python to do building.
\ No newline at end of file
diff --git a/Tools/Crashpad/handler/crashpad_handler.exe b/Tools/Crashpad/handler/crashpad_handler.exe
deleted file mode 100644
index 958cfa0bf7..0000000000
--- a/Tools/Crashpad/handler/crashpad_handler.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b4e80690178401311f2bb1ba98da4ba668682a10561a3399f085557a18af79a
-size 1029632
diff --git a/Tools/Crashpad/handler/src/crash_report_upload_thread.cc b/Tools/Crashpad/handler/src/crash_report_upload_thread.cc
deleted file mode 100644
index ccb1512e24..0000000000
--- a/Tools/Crashpad/handler/src/crash_report_upload_thread.cc
+++ /dev/null
@@ -1,406 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "handler/crash_report_upload_thread.h"
-
-#include <errno.h>
-#include <time.h>
-
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "base/logging.h"
-#include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
-#include "build/build_config.h"
-#include "client/settings.h"
-#include "handler/minidump_to_upload_parameters.h"
-#include "snapshot/minidump/process_snapshot_minidump.h"
-#include "snapshot/module_snapshot.h"
-#include "util/file/file_reader.h"
-#include "util/misc/metrics.h"
-#include "util/misc/uuid.h"
-#include "util/net/http_body.h"
-#include "util/net/http_multipart_builder.h"
-#include "util/net/http_transport.h"
-#include "util/net/url.h"
-#include "util/stdlib/map_insert.h"
-
-#if defined(OS_MACOSX)
-#include "handler/mac/file_limit_annotation.h"
-#endif  // OS_MACOSX
-
-// Amazon - Handle giving the user the option of whether or not to send the report.
-namespace O3de
-{
-	bool CheckConfirmation(const crashpad::CrashReportDatabase::Report& report);
-	bool AddAttachments(crashpad::HTTPMultipartBuilder& multipartBuilder);
-	bool UpdateHttpTransport(std::unique_ptr<crashpad::HTTPTransport>& httpTransport, const std::string& baseURL);
-}
-
-namespace crashpad {
-
-namespace {
-
-// Calls CrashReportDatabase::RecordUploadAttempt() with |successful| set to
-// false upon destruction unless disarmed by calling Fire() or Disarm(). Fire()
-// triggers an immediate call. Armed upon construction.
-class CallRecordUploadAttempt {
- public:
-  CallRecordUploadAttempt(CrashReportDatabase* database,
-                          const CrashReportDatabase::Report* report)
-      : database_(database),
-        report_(report) {
-  }
-
-  ~CallRecordUploadAttempt() {
-    Fire();
-  }
-
-  void Fire() {
-    if (report_) {
-      database_->RecordUploadAttempt(report_, false, std::string());
-    }
-
-    Disarm();
-  }
-
-  void Disarm() {
-    report_ = nullptr;
-  }
-
- private:
-  CrashReportDatabase* database_;  // weak
-  const CrashReportDatabase::Report* report_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(CallRecordUploadAttempt);
-};
-
-}  // namespace
-
-CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database,
-                                                 const std::string& url,
-                                                 const Options& options)
-    : options_(options),
-      url_(url),
-      // When watching for pending reports, check every 15 minutes, even in the
-      // absence of a signal from the handler thread. This allows for failed
-      // uploads to be retried periodically, and for pending reports written by
-      // other processes to be recognized.
-      thread_(options.watch_pending_reports ? 15 * 60.0
-                                            : WorkerThread::kIndefiniteWait,
-              this),
-      known_pending_report_uuids_(),
-      database_(database) {}
-
-CrashReportUploadThread::~CrashReportUploadThread() {
-}
-
-void CrashReportUploadThread::Start() {
-  thread_.Start(
-      options_.watch_pending_reports ? 0.0 : WorkerThread::kIndefiniteWait);
-}
-
-void CrashReportUploadThread::Stop() {
-  thread_.Stop();
-}
-
-void CrashReportUploadThread::ReportPending(const UUID& report_uuid) {
-  known_pending_report_uuids_.PushBack(report_uuid);
-  thread_.DoWorkNow();
-}
-
-void CrashReportUploadThread::ProcessPendingReports() {
-  std::vector<UUID> known_report_uuids = known_pending_report_uuids_.Drain();
-  for (const UUID& report_uuid : known_report_uuids) {
-    CrashReportDatabase::Report report;
-    if (database_->LookUpCrashReport(report_uuid, &report) !=
-        CrashReportDatabase::kNoError) {
-      continue;
-    }
-
-    ProcessPendingReport(report);
-
-    // Respect Stop() being called after at least one attempt to process a
-    // report.
-    if (!thread_.is_running()) {
-      return;
-    }
-  }
-
-  // Known pending reports are always processed (above). The rest of this
-  // function is concerned with scanning for pending reports not already known
-  // to this thread.
-  if (!options_.watch_pending_reports) {
-    return;
-  }
-
-  std::vector<CrashReportDatabase::Report> reports;
-  if (database_->GetPendingReports(&reports) != CrashReportDatabase::kNoError) {
-    // The database is sick. It might be prudent to stop trying to poke it from
-    // this thread by abandoning the thread altogether. On the other hand, if
-    // the problem is transient, it might be possible to talk to it again on the
-    // next pass. For now, take the latter approach.
-    return;
-  }
-
-  for (const CrashReportDatabase::Report& report : reports) {
-    if (std::find(known_report_uuids.begin(),
-                  known_report_uuids.end(),
-                  report.uuid) != known_report_uuids.end()) {
-      // An attempt to process the report already occurred above. The report is
-      // still pending, so upload must have failed. Don’t retry it immediately,
-      // it can wait until at least the next pass through this method.
-      continue;
-    }
-
-    ProcessPendingReport(report);
-
-    // Respect Stop() being called after at least one attempt to process a
-    // report.
-    if (!thread_.is_running()) {
-      return;
-    }
-  }
-}
-
-void CrashReportUploadThread::ProcessPendingReport(
-    const CrashReportDatabase::Report& report) {
-#if defined(OS_MACOSX)
-  RecordFileLimitAnnotation();
-#endif  // OS_MACOSX
-
-  Settings* const settings = database_->GetSettings();
-
-  bool uploads_enabled;
-  if (url_.empty() ||
-      (!report.upload_explicitly_requested &&
-       (!settings->GetUploadsEnabled(&uploads_enabled) || !uploads_enabled))) {
-    // Don’t attempt an upload if there’s no URL to upload to. Allow upload if
-    // it has been explicitly requested by the user, otherwise, respect the
-    // upload-enabled state stored in the database’s settings.
-    database_->SkipReportUpload(report.uuid,
-                                Metrics::CrashSkippedReason::kUploadsDisabled);
-    return;
-  }
-
-  // Amazon - Handle giving the user the option of whether or not to send the report.
-  if (!O3DE::CheckConfirmation(report))
-  {
-	database_->SkipReportUpload(report.uuid,
-		Metrics::CrashSkippedReason::kUploadsDisabled);
-	database_->DeleteReport(report.uuid);
-	return;
-  }
-
-  // This currently implements very simplistic rate-limiting, compatible with
-  // the Breakpad client, where the strategy is to permit one upload attempt per
-  // hour, and retire reports that would exceed this limit or for which the
-  // upload fails on the first attempt.
-  //
-  // If upload was requested explicitly (i.e. by user action), we do not
-  // throttle the upload.
-  //
-  // TODO(mark): Provide a proper rate-limiting strategy and allow for failed
-  // upload attempts to be retried.
-  if (!report.upload_explicitly_requested && options_.rate_limit) {
-    time_t last_upload_attempt_time;
-    if (settings->GetLastUploadAttemptTime(&last_upload_attempt_time)) {
-      time_t now = time(nullptr);
-      if (now >= last_upload_attempt_time) {
-        // If the most recent upload attempt occurred within the past hour,
-        // don’t attempt to upload the new report. If it happened longer ago,
-        // attempt to upload the report.
-        constexpr int kUploadAttemptIntervalSeconds = 60 * 60;  // 1 hour
-        if (now - last_upload_attempt_time < kUploadAttemptIntervalSeconds) {
-          database_->SkipReportUpload(
-              report.uuid, Metrics::CrashSkippedReason::kUploadThrottled);
-          return;
-        }
-      } else {
-        // The most recent upload attempt purportedly occurred in the future. If
-        // it “happened” at least one day in the future, assume that the last
-        // upload attempt time is bogus, and attempt to upload the report. If
-        // the most recent upload time is in the future but within one day,
-        // accept it and don’t attempt to upload the report.
-        constexpr int kBackwardsClockTolerance = 60 * 60 * 24;  // 1 day
-        if (last_upload_attempt_time - now < kBackwardsClockTolerance) {
-          database_->SkipReportUpload(
-              report.uuid, Metrics::CrashSkippedReason::kUnexpectedTime);
-          return;
-        }
-      }
-    }
-  }
-
-  const CrashReportDatabase::Report* upload_report;
-  CrashReportDatabase::OperationStatus status =
-      database_->GetReportForUploading(report.uuid, &upload_report);
-  switch (status) {
-    case CrashReportDatabase::kNoError:
-      break;
-
-    case CrashReportDatabase::kBusyError:
-    case CrashReportDatabase::kReportNotFound:
-      // Someone else may have gotten to it first. If they’re working on it now,
-      // this will be kBusyError. If they’ve already finished with it, it’ll be
-      // kReportNotFound.
-      return;
-
-    case CrashReportDatabase::kFileSystemError:
-    case CrashReportDatabase::kDatabaseError:
-      // In these cases, SkipReportUpload() might not work either, but it’s best
-      // to at least try to get the report out of the way.
-      database_->SkipReportUpload(report.uuid,
-                                  Metrics::CrashSkippedReason::kDatabaseError);
-      return;
-
-    case CrashReportDatabase::kCannotRequestUpload:
-      NOTREACHED();
-      return;
-  }
-
-  CallRecordUploadAttempt call_record_upload_attempt(database_, upload_report);
-
-  std::string response_body;
-  UploadResult upload_result = UploadReport(upload_report, &response_body);
-  switch (upload_result) {
-    case UploadResult::kSuccess:
-      call_record_upload_attempt.Disarm();
-      database_->RecordUploadAttempt(upload_report, true, response_body);
-      break;
-    case UploadResult::kPermanentFailure:
-    case UploadResult::kRetry:
-      call_record_upload_attempt.Fire();
-
-      // TODO(mark): Deal with retries properly: don’t call SkipReportUplaod()
-      // if the result was kRetry and the report hasn’t already been retried
-      // too many times.
-      database_->SkipReportUpload(report.uuid,
-                                  Metrics::CrashSkippedReason::kUploadFailed);
-      break;
-  }
-}
-
-CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
-    const CrashReportDatabase::Report* report,
-    std::string* response_body) {
-  std::map<std::string, std::string> parameters;
-
-  FileReader minidump_file_reader;
-  if (!minidump_file_reader.Open(report->file_path)) {
-    // If the minidump file can’t be opened, all hope is lost.
-    return UploadResult::kPermanentFailure;
-  }
-
-  FileOffset start_offset = minidump_file_reader.SeekGet();
-  if (start_offset < 0) {
-    return UploadResult::kPermanentFailure;
-  }
-
-  // Ignore any errors that might occur when attempting to interpret the
-  // minidump file. This may result in its being uploaded with few or no
-  // parameters, but as long as there’s a dump file, the server can decide what
-  // to do with it.
-  ProcessSnapshotMinidump minidump_process_snapshot;
-  if (minidump_process_snapshot.Initialize(&minidump_file_reader)) {
-    parameters =
-        BreakpadHTTPFormParametersFromMinidump(&minidump_process_snapshot);
-  }
-
-  if (!minidump_file_reader.SeekSet(start_offset)) {
-    return UploadResult::kPermanentFailure;
-  }
-
-  HTTPMultipartBuilder http_multipart_builder;
-  http_multipart_builder.SetGzipEnabled(options_.upload_gzip);
-
-  static constexpr char kMinidumpKey[] = "upload_file_minidump";
-
-  for (const auto& kv : parameters) {
-    if (kv.first == kMinidumpKey) {
-      LOG(WARNING) << "reserved key " << kv.first << ", discarding value "
-                   << kv.second;
-    } else {
-      http_multipart_builder.SetFormData(kv.first, kv.second);
-    }
-  }
-
-  http_multipart_builder.SetFileAttachment(
-      kMinidumpKey,
-#if defined(OS_WIN)
-      base::UTF16ToUTF8(report->file_path.BaseName().value()),
-#else
-      report->file_path.BaseName().value(),
-#endif
-      &minidump_file_reader,
-      "application/octet-stream");
-
-  // Amazon
-  O3de::AddAttachments(http_multipart_builder);
-
-  std::unique_ptr<HTTPTransport> http_transport(HTTPTransport::Create());
-  HTTPHeaders content_headers;
-
-  http_multipart_builder.PopulateContentHeaders(&content_headers);
-
-  for (const auto& content_header : content_headers) {
-    http_transport->SetHeader(content_header.first, content_header.second);
-  }
-  http_transport->SetBodyStream(http_multipart_builder.GetBodyStream());
-  // TODO(mark): The timeout should be configurable by the client.
-  http_transport->SetTimeout(60.0);  // 1 minute.
-
-  std::string url = url_;
-  if (options_.identify_client_via_url) {
-    // Add parameters to the URL which identify the client to the server.
-    static constexpr struct {
-      const char* key;
-      const char* url_field_name;
-    } kURLParameterMappings[] = {
-        {"prod", "product"},
-        {"ver", "version"},
-        {"guid", "guid"},
-    };
-
-    for (const auto& parameter_mapping : kURLParameterMappings) {
-      const auto it = parameters.find(parameter_mapping.key);
-      if (it != parameters.end()) {
-        url.append(
-            base::StringPrintf("%c%s=%s",
-                               url.find('?') == std::string::npos ? '?' : '&',
-                               parameter_mapping.url_field_name,
-                               URLEncode(it->second).c_str()));
-      }
-    }
-  }
-  http_transport->SetURL(url);
-
-  // Amazon
-  O3de::UpdateHttpTransport(http_transport, url);
-
-  if (!http_transport->ExecuteSynchronously(response_body)) {
-    return UploadResult::kRetry;
-  }
-
-  return UploadResult::kSuccess;
-}
-
-void CrashReportUploadThread::DoWork(const WorkerThread* thread) {
-  ProcessPendingReports();
-}
-
-}  // namespace crashpad
diff --git a/Tools/Crashpad/include/client/annotation.h b/Tools/Crashpad/include/client/annotation.h
deleted file mode 100644
index c7d92d80c5..0000000000
--- a/Tools/Crashpad/include/client/annotation.h
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_ANNOTATION_H_
-#define CRASHPAD_CLIENT_ANNOTATION_H_
-
-#include <algorithm>
-#include <atomic>
-
-#include <stdint.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/numerics/safe_conversions.h"
-#include "base/strings/string_piece.h"
-#include "build/build_config.h"
-
-namespace crashpad {
-
-class AnnotationList;
-
-//! \brief Base class for an annotation, which records a name-value pair of
-//!     arbitrary data when set.
-//!
-//! After an annotation is declared, its `value_ptr_` will not be captured in a
-//! crash report until a call to \a SetSize() specifies how much data from the
-//! value should be recorded.
-//!
-//! Annotations should be declared with static storage duration.
-//!
-//! An example declaration and usage:
-//!
-//! \code
-//!   // foo.cc:
-//!
-//!   namespace {
-//!   char g_buffer[1024];
-//!   crashpad::Annotation g_buffer_annotation(
-//!       crashpad::Annotation::Type::kString, "buffer_head", g_buffer);
-//!   }  // namespace
-//!
-//!   void OnBufferProduced(size_t n) {
-//!     // Capture the head of the buffer, in case we crash when parsing it.
-//!     g_buffer_annotation.SetSize(std::min(64, n));
-//!
-//!     // Start parsing the header.
-//!     Frobinate(g_buffer, n);
-//!   }
-//! \endcode
-//!
-//! Annotation objects are not inherently thread-safe. To manipulate them
-//! from multiple threads, external synchronization must be used.
-//!
-//! Annotation objects should never be destroyed. Once they are Set(), they
-//! are permanently referenced by a global object.
-class Annotation {
- public:
-  //! \brief The maximum length of an annotation’s name, in bytes.
-  static constexpr size_t kNameMaxLength = 64;
-
-  //! \brief The maximum size of an annotation’s value, in bytes.
-  static constexpr size_t kValueMaxSize = 2048;
-
-  //! \brief The type used for \a SetSize().
-  using ValueSizeType = uint32_t;
-
-  //! \brief The type of data stored in the annotation.
-  enum class Type : uint16_t {
-    //! \brief An invalid annotation. Reserved for internal use.
-    kInvalid = 0,
-
-    //! \brief A `NUL`-terminated C-string.
-    kString = 1,
-
-    //! \brief Clients may declare their own custom types by using values
-    //!     greater than this.
-    kUserDefinedStart = 0x8000,
-  };
-
-  //! \brief Creates a user-defined Annotation::Type.
-  //!
-  //! This exists to remove the casting overhead of `enum class`.
-  //!
-  //! \param[in] value A value used to create a user-defined type.
-  //!
-  //! \returns The value added to Type::kUserDefinedStart and casted.
-  constexpr static Type UserDefinedType(uint16_t value) {
-    using UnderlyingType = std::underlying_type<Type>::type;
-    // MSVS 2015 doesn't have full C++14 support and complains about local
-    // variables defined in a constexpr function, which is valid. Avoid them
-    // and the also-problematic DCHECK until all the infrastructure is updated:
-    // https://crbug.com/crashpad/201.
-#if !defined(OS_WIN) || (defined(_MSC_VER) && _MSC_VER >= 1910)
-    const UnderlyingType start =
-        static_cast<UnderlyingType>(Type::kUserDefinedStart);
-    const UnderlyingType user_type = start + value;
-    DCHECK(user_type > start) << "User-defined Type is 0 or overflows";
-    return static_cast<Type>(user_type);
-#else
-    return static_cast<Type>(
-        static_cast<UnderlyingType>(Type::kUserDefinedStart) + value);
-#endif
-  }
-
-  //! \brief Constructs a new annotation.
-  //!
-  //! Upon construction, the annotation will not be included in any crash
-  //! reports until \sa SetSize() is called with a value greater than `0`.
-  //!
-  //! \param[in] type The data type of the value of the annotation.
-  //! \param[in] name A `NUL`-terminated C-string name for the annotation. Names
-  //!     do not have to be unique, though not all crash processors may handle
-  //!     Annotations with the same name. Names should be constexpr data with
-  //!     static storage duration.
-  //! \param[in] value_ptr A pointer to the value for the annotation. The
-  //!     pointer may not be changed once associated with an annotation, but
-  //!     the data may be mutated.
-  constexpr Annotation(Type type, const char name[], void* const value_ptr)
-      : link_node_(nullptr),
-        name_(name),
-        value_ptr_(value_ptr),
-        size_(0),
-        type_(type) {}
-
-  //! \brief Specifies the number of bytes in \a value_ptr_ to include when
-  //!     generating a crash report.
-  //!
-  //! A size of `0` indicates that no value should be recorded and is the
-  //! equivalent of calling \sa Clear().
-  //!
-  //! This method does not mutate the data referenced by the annotation, it
-  //! merely updates the annotation system's bookkeeping.
-  //!
-  //! Subclasses of this base class that provide additional Set methods to
-  //! mutate the value of the annotation must call always call this method.
-  //!
-  //! \param[in] size The number of bytes.
-  void SetSize(ValueSizeType size);
-
-  //! \brief Marks the annotation as cleared, indicating the \a value_ptr_
-  //!     should not be included in a crash report.
-  //!
-  //! This method does not mutate the data referenced by the annotation, it
-  //! merely updates the annotation system's bookkeeping.
-  void Clear();
-
-  //! \brief Tests whether the annotation has been set.
-  bool is_set() const { return size_ > 0; }
-
-  Type type() const { return type_; }
-  ValueSizeType size() const { return size_; }
-  const char* name() const { return name_; }
-  const void* value() const { return value_ptr_; }
-
- protected:
-  friend class AnnotationList;
-
-  std::atomic<Annotation*>& link_node() { return link_node_; }
-
- private:
-  //! \brief Linked list next-node pointer. Accessed only by \sa AnnotationList.
-  //!
-  //! This will be null until the first call to \sa SetSize(), after which the
-  //! presence of the pointer will prevent the node from being added to the
-  //! list again.
-  std::atomic<Annotation*> link_node_;
-
-  const char* const name_;
-  void* const value_ptr_;
-  ValueSizeType size_;
-  const Type type_;
-
-  DISALLOW_COPY_AND_ASSIGN(Annotation);
-};
-
-//! \brief An \sa Annotation that stores a `NUL`-terminated C-string value.
-//!
-//! The storage for the value is allocated by the annotation and the template
-//! parameter \a MaxSize controls the maxmium length for the value.
-//!
-//! It is expected that the string value be valid UTF-8, although this is not
-//! validated.
-template <Annotation::ValueSizeType MaxSize>
-class StringAnnotation : public Annotation {
- public:
-  //! \brief A constructor tag that enables braced initialization in C arrays.
-  //!
-  //! \sa StringAnnotation()
-  enum class Tag { kArray };
-
-  //! \brief Constructs a new StringAnnotation with the given \a name.
-  //!
-  //! \param[in] name The Annotation name.
-  constexpr explicit StringAnnotation(const char name[])
-      : Annotation(Type::kString, name, value_), value_() {}
-
-  //! \brief Constructs a new StringAnnotation with the given \a name.
-  //!
-  //! This constructor takes the ArrayInitializerTag for use when
-  //! initializing a C array of annotations. The main constructor is
-  //! explicit and cannot be brace-initialized. As an example:
-  //!
-  //! \code
-  //!   static crashpad::StringAnnotation<32> annotations[] = {
-  //!     {"name-1", crashpad::StringAnnotation<32>::Tag::kArray},
-  //!     {"name-2", crashpad::StringAnnotation<32>::Tag::kArray},
-  //!     {"name-3", crashpad::StringAnnotation<32>::Tag::kArray},
-  //!   };
-  //! \endcode
-  //!
-  //! \param[in] name The Annotation name.
-  //! \param[in] tag A constructor tag.
-  constexpr StringAnnotation(const char name[], Tag tag)
-      : StringAnnotation(name) {}
-
-  //! \brief Sets the Annotation's string value.
-  //!
-  //! \param[in] value The `NUL`-terminated C-string value.
-  void Set(const char* value) {
-    strncpy(value_, value, MaxSize);
-    SetSize(
-        std::min(MaxSize, base::saturated_cast<ValueSizeType>(strlen(value))));
-  }
-
-  //! \brief Sets the Annotation's string value.
-  //!
-  //! \param[in] string The string value.
-  void Set(base::StringPiece string) {
-    Annotation::ValueSizeType size =
-        std::min(MaxSize, base::saturated_cast<ValueSizeType>(string.size()));
-    memcpy(value_, string.data(), size);
-    // Check for no embedded `NUL` characters.
-    DCHECK(!memchr(value_, '\0', size)) << "embedded NUL";
-    SetSize(size);
-  }
-
-  const base::StringPiece value() const {
-    return base::StringPiece(value_, size());
-  }
-
- private:
-  // This value is not `NUL`-terminated, since the size is stored by the base
-  // annotation.
-  char value_[MaxSize];
-
-  DISALLOW_COPY_AND_ASSIGN(StringAnnotation);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_ANNOTATION_H_
diff --git a/Tools/Crashpad/include/client/annotation_list.h b/Tools/Crashpad/include/client/annotation_list.h
deleted file mode 100644
index 9485c46c4a..0000000000
--- a/Tools/Crashpad/include/client/annotation_list.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_ANNOTATION_LIST_H_
-#define CRASHPAD_CLIENT_ANNOTATION_LIST_H_
-
-#include "base/macros.h"
-#include "client/annotation.h"
-
-namespace crashpad {
-
-//! \brief A list that contains all the currently set annotations.
-//!
-//! An instance of this class must be registered on the \a CrashpadInfo
-//! structure in order to use the annotations system. Once a list object has
-//! been registered on the CrashpadInfo, a different instance should not
-//! be used instead.
-class AnnotationList {
- public:
-  AnnotationList();
-  ~AnnotationList();
-
-  //! \brief Returns the instance of the list that has been registered on the
-  //!     CrashapdInfo structure.
-  static AnnotationList* Get();
-
-  //! \brief Returns the instace of the list, creating and registering
-  //!     it if one is not already set on the CrashapdInfo structure.
-  static AnnotationList* Register();
-
-  //! \brief Adds \a annotation to the global list. This method does not need
-  //!     to be called by clients directly. The Annotation object will do so
-  //!     automatically.
-  //!
-  //! Once an annotation is added to the list, it is not removed. This is
-  //! because the AnnotationList avoids the use of locks/mutexes, in case it is
-  //! being manipulated in a compromised context. Instead, an Annotation keeps
-  //! track of when it has been cleared, which excludes it from a crash report.
-  //! This design also avoids linear scans of the list when repeatedly setting
-  //! and/or clearing the value.
-  void Add(Annotation* annotation);
-
-  //! \brief An InputIterator for the AnnotationList.
-  class Iterator {
-   public:
-    ~Iterator();
-
-    Annotation* operator*() const;
-    Iterator& operator++();
-    bool operator==(const Iterator& other) const;
-    bool operator!=(const Iterator& other) const { return !(*this == other); }
-
-   private:
-    friend class AnnotationList;
-    Iterator(Annotation* head, const Annotation* tail);
-
-    Annotation* curr_;
-    const Annotation* const tail_;
-
-    // Copy and assign are required.
-  };
-
-  //! \brief Returns an iterator to the first element of the annotation list.
-  Iterator begin();
-
-  //! \brief Returns an iterator past the last element of the annotation list.
-  Iterator end();
-
- private:
-  // To make it easier for the handler to locate the dummy tail node, store the
-  // pointer. Placed first for packing.
-  const Annotation* const tail_pointer_;
-
-  // Dummy linked-list head and tail elements of \a Annotation::Type::kInvalid.
-  Annotation head_;
-  Annotation tail_;
-
-  DISALLOW_COPY_AND_ASSIGN(AnnotationList);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_ANNOTATION_LIST_H_
diff --git a/Tools/Crashpad/include/client/capture_context_mac.h b/Tools/Crashpad/include/client/capture_context_mac.h
deleted file mode 100644
index 74e440edb1..0000000000
--- a/Tools/Crashpad/include/client/capture_context_mac.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_CAPTURE_CONTEXT_MAC_H_
-#define CRASHPAD_CLIENT_CAPTURE_CONTEXT_MAC_H_
-
-#include <mach/mach.h>
-
-#include "build/build_config.h"
-
-namespace crashpad {
-
-#if defined(ARCH_CPU_X86_FAMILY)
-using NativeCPUContext = x86_thread_state;
-#endif
-
-//! \brief Saves the CPU context.
-//!
-//! The CPU context will be captured as accurately and completely as possible,
-//! containing an atomic snapshot at the point of this function’s return. This
-//! function does not modify any registers.
-//!
-//! \param[out] cpu_context The structure to store the context in.
-//!
-//! \note On x86_64, the value for `%%rdi` will be populated with the address of
-//!     this function’s argument, as mandated by the ABI. If the value of
-//!     `%%rdi` prior to calling this function is needed, it must be obtained
-//!     separately prior to calling this function. For example:
-//!     \code
-//!       uint64_t rdi;
-//!       asm("movq %%rdi, %0" : "=m"(rdi));
-//!     \endcode
-void CaptureContext(NativeCPUContext* cpu_context);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_CAPTURE_CONTEXT_MAC_H_
diff --git a/Tools/Crashpad/include/client/crash_report_database.h b/Tools/Crashpad/include/client/crash_report_database.h
deleted file mode 100644
index 6211789923..0000000000
--- a/Tools/Crashpad/include/client/crash_report_database.h
+++ /dev/null
@@ -1,367 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_
-#define CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_
-
-#include <time.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "util/file/file_io.h"
-#include "util/misc/metrics.h"
-#include "util/misc/uuid.h"
-
-namespace crashpad {
-
-class Settings;
-
-//! \brief An interface for managing a collection of crash report files and
-//!     metadata associated with the crash reports.
-//!
-//! All Report objects that are returned by this class are logically const.
-//! They are snapshots of the database at the time the query was run, and the
-//! data returned is liable to change after the query is executed.
-//!
-//! The lifecycle of a crash report has three stages:
-//!
-//!   1. New: A crash report is created with PrepareNewCrashReport(), the
-//!      the client then writes the report, and then calls
-//!      FinishedWritingCrashReport() to make the report Pending.
-//!   2. Pending: The report has been written but has not been locally
-//!      processed, or it was has been brought back from 'Completed' state by
-//!      user request.
-//!   3. Completed: The report has been locally processed, either by uploading
-//!      it to a collection server and calling RecordUploadAttempt(), or by
-//!      calling SkipReportUpload().
-class CrashReportDatabase {
- public:
-  //! \brief A crash report record.
-  //!
-  //! This represents the metadata for a crash report, as well as the location
-  //! of the report itself. A CrashReportDatabase maintains at least this
-  //! information.
-  struct Report {
-    Report();
-
-    //! A unique identifier by which this report will always be known to the
-    //! database.
-    UUID uuid;
-
-    //! The current location of the crash report on the client’s filesystem.
-    //! The location of a crash report may change over time, so the UUID should
-    //! be used as the canonical identifier.
-    base::FilePath file_path;
-
-    //! An identifier issued to this crash report by a collection server.
-    std::string id;
-
-    //! The time at which the report was generated.
-    time_t creation_time;
-
-    //! Whether this crash report was successfully uploaded to a collection
-    //! server.
-    bool uploaded;
-
-    //! The last timestamp at which an attempt was made to submit this crash
-    //! report to a collection server. If this is zero, then the report has
-    //! never been uploaded. If #uploaded is true, then this timestamp is the
-    //! time at which the report was uploaded, and no other attempts to upload
-    //! this report will be made.
-    time_t last_upload_attempt_time;
-
-    //! The number of times an attempt was made to submit this report to
-    //! a collection server. If this is more than zero, then
-    //! #last_upload_attempt_time will be set to the timestamp of the most
-    //! recent attempt.
-    int upload_attempts;
-
-    //! Whether this crash report was explicitly requested by user to be
-    //! uploaded. This can be true only if report is in the 'pending' state.
-    bool upload_explicitly_requested;
-  };
-
-  //! \brief A crash report that is in the process of being written.
-  //!
-  //! An instance of this struct should be created via PrepareNewCrashReport()
-  //! and destroyed with FinishedWritingCrashReport().
-  struct NewReport {
-    //! The file handle to which the report should be written.
-    FileHandle handle;
-
-    //! A unique identifier by which this report will always be known to the
-    //! database.
-    UUID uuid;
-
-    //! The path to the crash report being written.
-    base::FilePath path;
-  };
-
-  //! \brief A scoper to cleanly handle the interface requirement imposed by
-  //!     PrepareNewCrashReport().
-  //!
-  //! Calls ErrorWritingCrashReport() upon destruction unless disarmed by
-  //! calling Disarm(). Armed upon construction.
-  class CallErrorWritingCrashReport {
-   public:
-    //! \brief Arms the object to call ErrorWritingCrashReport() on \a database
-    //!     with an argument of \a new_report on destruction.
-    CallErrorWritingCrashReport(CrashReportDatabase* database,
-                                NewReport* new_report);
-
-    //! \brief Calls ErrorWritingCrashReport() if the object is armed.
-    ~CallErrorWritingCrashReport();
-
-    //! \brief Disarms the object so that CallErrorWritingCrashReport() will not
-    //!     be called upon destruction.
-    void Disarm();
-
-   private:
-    CrashReportDatabase* database_;  // weak
-    NewReport* new_report_;  // weak
-
-    DISALLOW_COPY_AND_ASSIGN(CallErrorWritingCrashReport);
-  };
-
-  //! \brief The result code for operations performed on a database.
-  enum OperationStatus {
-    //! \brief No error occurred.
-    kNoError = 0,
-
-    //! \brief The report that was requested could not be located.
-    //!
-    //! This may occur when the report is present in the database but not in a
-    //! state appropriate for the requested operation, for example, if
-    //! GetReportForUploading() is called to obtain report that’s already in the
-    //! completed state.
-    kReportNotFound,
-
-    //! \brief An error occured while performing a file operation on a crash
-    //!     report.
-    //!
-    //! A database is responsible for managing both the metadata about a report
-    //! and the actual crash report itself. This error is returned when an
-    //! error occurred when managing the report file. Additional information
-    //! will be logged.
-    kFileSystemError,
-
-    //! \brief An error occured while recording metadata for a crash report or
-    //!     database-wide settings.
-    //!
-    //! A database is responsible for managing both the metadata about a report
-    //! and the actual crash report itself. This error is returned when an
-    //! error occurred when managing the metadata about a crash report or
-    //! database-wide settings. Additional information will be logged.
-    kDatabaseError,
-
-    //! \brief The operation could not be completed because a concurrent
-    //!     operation affecting the report is occurring.
-    kBusyError,
-
-    //! \brief The report cannot be uploaded by user request as it has already
-    //!     been uploaded.
-    kCannotRequestUpload,
-  };
-
-  virtual ~CrashReportDatabase() {}
-
-  //! \brief Opens a database of crash reports, possibly creating it.
-  //!
-  //! \param[in] path A path to the database to be created or opened. If the
-  //!     database does not yet exist, it will be created if possible. Note that
-  //!     for databases implemented as directory structures, existence refers
-  //!     solely to the outermost directory.
-  //!
-  //! \return A database object on success, `nullptr` on failure with an error
-  //!     logged.
-  //!
-  //! \sa InitializeWithoutCreating
-  static std::unique_ptr<CrashReportDatabase> Initialize(
-      const base::FilePath& path);
-
-  //! \brief Opens an existing database of crash reports.
-  //!
-  //! \param[in] path A path to the database to be opened. If the database does
-  //!     not yet exist, it will not be created. Note that for databases
-  //!     implemented as directory structures, existence refers solely to the
-  //!     outermost directory. On such databases, as long as the outermost
-  //!     directory is present, this method will create the inner structure.
-  //!
-  //! \return A database object on success, `nullptr` on failure with an error
-  //!     logged.
-  //!
-  //! \sa Initialize
-  static std::unique_ptr<CrashReportDatabase> InitializeWithoutCreating(
-      const base::FilePath& path);
-
-  //! \brief Returns the Settings object for this database.
-  //!
-  //! \return A weak pointer to the Settings object, which is owned by the
-  //!     database.
-  virtual Settings* GetSettings() = 0;
-
-  //! \brief Creates a record of a new crash report.
-  //!
-  //! Callers can then write the crash report using the file handle provided.
-  //! The caller does not own the new crash report record or its file handle,
-  //! both of which must be explicitly disposed of by calling
-  //! FinishedWritingCrashReport() or ErrorWritingCrashReport().
-  //!
-  //! To arrange to call ErrorWritingCrashReport() during any early return, use
-  //! CallErrorWritingCrashReport.
-  //!
-  //! \param[out] report A NewReport object containing a file handle to which
-  //!     the crash report data should be written. Only valid if this returns
-  //!     #kNoError. The caller must not delete the NewReport object or close
-  //!     the file handle within.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus PrepareNewCrashReport(NewReport** report) = 0;
-
-  //! \brief Informs the database that a crash report has been written.
-  //!
-  //! After calling this method, the database is permitted to move and rename
-  //! the file at NewReport::path.
-  //!
-  //! \param[in] report A NewReport obtained with PrepareNewCrashReport(). The
-  //!     NewReport object and file handle within will be invalidated as part of
-  //!     this call.
-  //! \param[out] uuid The UUID of this crash report.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus FinishedWritingCrashReport(NewReport* report,
-                                                     UUID* uuid) = 0;
-
-  //! \brief Informs the database that an error occurred while attempting to
-  //!     write a crash report, and that any resources associated with it should
-  //!     be cleaned up.
-  //!
-  //! After calling this method, the database is permitted to remove the file at
-  //! NewReport::path.
-  //!
-  //! \param[in] report A NewReport obtained with PrepareNewCrashReport(). The
-  //!     NewReport object and file handle within will be invalidated as part of
-  //!     this call.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus ErrorWritingCrashReport(NewReport* report) = 0;
-
-  //! \brief Returns the crash report record for the unique identifier.
-  //!
-  //! \param[in] uuid The crash report record unique identifier.
-  //! \param[out] report A crash report record. Only valid if this returns
-  //!     #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus LookUpCrashReport(const UUID& uuid,
-                                            Report* report) = 0;
-
-  //! \brief Returns a list of crash report records that have not been uploaded.
-  //!
-  //! \param[out] reports A list of crash report record objects. This must be
-  //!     empty on entry. Only valid if this returns #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus GetPendingReports(std::vector<Report>* reports) = 0;
-
-  //! \brief Returns a list of crash report records that have been completed,
-  //!     either by being uploaded or by skipping upload.
-  //!
-  //! \param[out] reports A list of crash report record objects. This must be
-  //!     empty on entry. Only valid if this returns #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus GetCompletedReports(std::vector<Report>* reports) = 0;
-
-  //! \brief Obtains a report object for uploading to a collection server.
-  //!
-  //! The file at Report::file_path should be uploaded by the caller, and then
-  //! the returned Report object must be disposed of via a call to
-  //! RecordUploadAttempt().
-  //!
-  //! A subsequent call to this method with the same \a uuid is illegal until
-  //! RecordUploadAttempt() has been called.
-  //!
-  //! \param[in] uuid The unique identifier for the crash report record.
-  //! \param[out] report A crash report record for the report to be uploaded.
-  //!     The caller does not own this object. Only valid if this returns
-  //!     #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus GetReportForUploading(const UUID& uuid,
-                                                const Report** report) = 0;
-
-  //! \brief Adjusts a crash report record’s metadata to account for an upload
-  //!     attempt, and updates the last upload attempt time as returned by
-  //!     Settings::GetLastUploadAttemptTime().
-  //!
-  //! After calling this method, the database is permitted to move and rename
-  //! the file at Report::file_path.
-  //!
-  //! \param[in] report The report object obtained from
-  //!     GetReportForUploading(). This object is invalidated after this call.
-  //! \param[in] successful Whether the upload attempt was successful.
-  //! \param[in] id The identifier assigned to this crash report by the
-  //!     collection server. Must be empty if \a successful is `false`; may be
-  //!     empty if it is `true`.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus RecordUploadAttempt(const Report* report,
-                                              bool successful,
-                                              const std::string& id) = 0;
-
-  //! \brief Moves a report from the pending state to the completed state, but
-  //!     without the report being uploaded.
-  //!
-  //! This can be used if the user has disabled crash report collection, but
-  //! crash generation is still enabled in the product.
-  //!
-  //! \param[in] uuid The unique identifier for the crash report record.
-  //! \param[in] reason The reason the report upload is being skipped for
-  //!     metrics tracking purposes.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus SkipReportUpload(
-      const UUID& uuid,
-      Metrics::CrashSkippedReason reason) = 0;
-
-  //! \brief Deletes a crash report file and its associated metadata.
-  //!
-  //! \param[in] uuid The UUID of the report to delete.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus DeleteReport(const UUID& uuid) = 0;
-
-  //! \brief Marks a crash report as explicitly requested to be uploaded by the
-  //!     user and moves it to 'pending' state.
-  //!
-  //! \param[in] uuid The unique identifier for the crash report record.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus RequestUpload(const UUID& uuid) = 0;
-
- protected:
-  CrashReportDatabase() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CrashReportDatabase);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_
diff --git a/Tools/Crashpad/include/client/crashpad_client.h b/Tools/Crashpad/include/client/crashpad_client.h
deleted file mode 100644
index c452cdbb68..0000000000
--- a/Tools/Crashpad/include/client/crashpad_client.h
+++ /dev/null
@@ -1,297 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
-#define CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include <stdint.h>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-#include "base/mac/scoped_mach_port.h"
-#elif defined(OS_WIN)
-#include <windows.h>
-#include "util/win/scoped_handle.h"
-#endif
-
-namespace crashpad {
-
-//! \brief The primary interface for an application to have Crashpad monitor
-//!     it for crashes.
-class CrashpadClient {
- public:
-  CrashpadClient();
-  ~CrashpadClient();
-
-  //! \brief Starts a Crashpad handler process, performing any necessary
-  //!     handshake to configure it.
-  //!
-  //! This method directs crashes to the Crashpad handler. On macOS, this is
-  //! applicable to this process and all subsequent child processes. On Windows,
-  //! child processes must also register by using SetHandlerIPCPipe().
-  //!
-  //! On macOS, this method starts a Crashpad handler and obtains a Mach send
-  //! right corresponding to a receive right held by the handler process. The
-  //! handler process runs an exception server on this port. This method sets
-  //! the task’s exception port for `EXC_CRASH`, `EXC_RESOURCE`, and `EXC_GUARD`
-  //! exceptions to the Mach send right obtained. The handler will be installed
-  //! with behavior `EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES` and thread
-  //! state flavor `MACHINE_THREAD_STATE`. Exception ports are inherited, so a
-  //! Crashpad handler started here will remain the handler for any child
-  //! processes created after StartHandler() is called. These child processes do
-  //! not need to call StartHandler() or be aware of Crashpad in any way. The
-  //! Crashpad handler will receive crashes from child processes that have
-  //! inherited it as their exception handler even after the process that called
-  //! StartHandler() exits.
-  //!
-  //! On Windows, if \a asynchronous_start is `true`, this function will not
-  //! directly call `CreateProcess()`, making it suitable for use in a
-  //! `DllMain()`. In that case, the handler is started from a background
-  //! thread, deferring the handler's startup. Nevertheless, regardless of the
-  //! value of \a asynchronous_start, after calling this method, the global
-  //! unhandled exception filter is set up, and all crashes will be handled by
-  //! Crashpad. Optionally, use WaitForHandlerStart() to join with the
-  //! background thread and retrieve the status of handler startup.
-  //!
-  //! \param[in] handler The path to a Crashpad handler executable.
-  //! \param[in] database The path to a Crashpad database. The handler will be
-  //!     started with this path as its `--database` argument.
-  //! \param[in] metrics_dir The path to an already existing directory where
-  //!     metrics files can be stored. The handler will be started with this
-  //!     path as its `--metrics-dir` argument.
-  //! \param[in] url The URL of an upload server. The handler will be started
-  //!     with this URL as its `--url` argument.
-  //! \param[in] annotations Process annotations to set in each crash report.
-  //!     The handler will be started with an `--annotation` argument for each
-  //!     element in this map.
-  //! \param[in] arguments Additional arguments to pass to the Crashpad handler.
-  //!     Arguments passed in other parameters and arguments required to perform
-  //!     the handshake are the responsibility of this method, and must not be
-  //!     specified in this parameter.
-  //! \param[in] restartable If `true`, the handler will be restarted if it
-  //!     dies, if this behavior is supported. This option is not available on
-  //!     all platforms, and does not function on all OS versions. If it is
-  //!     not supported, it will be ignored.
-  //! \param[out] asynchronous_start If `true`, the handler will be started from
-  //!     a background thread. Optionally, WaitForHandlerStart() can be used at
-  //!     a suitable time to retreive the result of background startup. This
-  //!     option is only used on Windows.
-  //! \param[in] attachments Vector that stores file paths that should be
-  //!     captured with each report at the time of the crash.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool StartHandler(const base::FilePath& handler,
-                    const base::FilePath& database,
-                    const base::FilePath& metrics_dir,
-                    const std::string& url,
-                    const std::map<std::string, std::string>& annotations,
-                    const std::vector<std::string>& arguments,
-                    bool restartable,
-                    bool asynchronous_start,
-                    const std::vector<base::FilePath>& attachments = {});
-
-#if defined(OS_MACOSX) || DOXYGEN
-  //! \brief Sets the process’ crash handler to a Mach service registered with
-  //!     the bootstrap server.
-  //!
-  //! This method is only defined on macOS.
-  //!
-  //! See StartHandler() for more detail on how the port and handler are
-  //! configured.
-  //!
-  //! \param[in] service_name The service name of a Crashpad exception handler
-  //!     service previously registered with the bootstrap server.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool SetHandlerMachService(const std::string& service_name);
-
-  //! \brief Sets the process’ crash handler to a Mach port.
-  //!
-  //! This method is only defined on macOS.
-  //!
-  //! See StartHandler() for more detail on how the port and handler are
-  //! configured.
-  //!
-  //! \param[in] exception_port An `exception_port_t` corresponding to a
-  //!     Crashpad exception handler service.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool SetHandlerMachPort(base::mac::ScopedMachSendRight exception_port);
-
-  //! \brief Retrieves a send right to the process’ crash handler Mach port.
-  //!
-  //! This method is only defined on macOS.
-  //!
-  //! This method can be used to obtain the crash handler Mach port when a
-  //! Crashpad client process wishes to provide a send right to this port to
-  //! another process. The IPC mechanism used to convey the right is under the
-  //! application’s control. If the other process wishes to become a client of
-  //! the same crash handler, it can provide the transferred right to
-  //! SetHandlerMachPort().
-  //!
-  //! See StartHandler() for more detail on how the port and handler are
-  //! configured.
-  //!
-  //! \return The Mach port set by SetHandlerMachPort(), possibly indirectly by
-  //!     a call to another method such as StartHandler() or
-  //!     SetHandlerMachService(). This method must only be called after a
-  //!     successful call to one of those methods. `MACH_PORT_NULL` on failure
-  //!     with a message logged.
-  base::mac::ScopedMachSendRight GetHandlerMachPort() const;
-#endif
-
-#if defined(OS_WIN) || DOXYGEN
-  //! \brief Sets the IPC pipe of a presumably-running Crashpad handler process
-  //!     which was started with StartHandler() or by other compatible means
-  //!     and does an IPC message exchange to register this process with the
-  //!     handler. Crashes will be serviced once this method returns.
-  //!
-  //! This method is only defined on Windows.
-  //!
-  //! This method sets the unhandled exception handler to a local
-  //! function that when reached will "signal and wait" for the crash handler
-  //! process to create the dump.
-  //!
-  //! \param[in] ipc_pipe The full name of the crash handler IPC pipe. This is
-  //!     a string of the form `&quot;\\.\pipe\NAME&quot;`.
-  //!
-  //! \return `true` on success and `false` on failure.
-  bool SetHandlerIPCPipe(const std::wstring& ipc_pipe);
-
-  //! \brief Retrieves the IPC pipe name used to register with the Crashpad
-  //!     handler.
-  //!
-  //! This method is only defined on Windows.
-  //!
-  //! This method retrieves the IPC pipe name set by SetHandlerIPCPipe(), or a
-  //! suitable IPC pipe name chosen by StartHandler(). It must only be called
-  //! after a successful call to one of those methods. It is intended to be used
-  //! to obtain the IPC pipe name so that it may be passed to other processes,
-  //! so that they may register with an existing Crashpad handler by calling
-  //! SetHandlerIPCPipe().
-  //!
-  //! \return The full name of the crash handler IPC pipe, a string of the form
-  //!     `&quot;\\.\pipe\NAME&quot;`.
-  std::wstring GetHandlerIPCPipe() const;
-
-  //! \brief When `asynchronous_start` is used with StartHandler(), this method
-  //!     can be used to block until the handler launch has been completed to
-  //!     retrieve status information.
-  //!
-  //! This method should not be used unless `asynchronous_start` was `true`.
-  //!
-  //! \param[in] timeout_ms The number of milliseconds to wait for a result from
-  //!     the background launch, or `0xffffffff` to block indefinitely.
-  //!
-  //! \return `true` if the hander startup succeeded, `false` otherwise, and an
-  //!     error message will have been logged.
-  bool WaitForHandlerStart(unsigned int timeout_ms);
-
-  //! \brief Requests that the handler capture a dump even though there hasn't
-  //!     been a crash.
-  //!
-  //! \param[in] context A `CONTEXT`, generally captured by CaptureContext() or
-  //!     similar.
-  static void DumpWithoutCrash(const CONTEXT& context);
-
-  //! \brief Requests that the handler capture a dump using the given \a
-  //!     exception_pointers to get the `EXCEPTION_RECORD` and `CONTEXT`.
-  //!
-  //! This function is not necessary in general usage as an unhandled exception
-  //! filter is installed by StartHandler() or SetHandlerIPCPipe().
-  //!
-  //! \param[in] exception_pointers An `EXCEPTION_POINTERS`, as would generally
-  //!     passed to an unhandled exception filter.
-  static void DumpAndCrash(EXCEPTION_POINTERS* exception_pointers);
-
-  //! \brief Requests that the handler capture a dump of a different process.
-  //!
-  //! The target process must be an already-registered Crashpad client. An
-  //! exception will be triggered in the target process, and the regular dump
-  //! mechanism used. This function will block until the exception in the target
-  //! process has been handled by the Crashpad handler.
-  //!
-  //! This function is unavailable when running on Windows XP and will return
-  //! `false`.
-  //!
-  //! \param[in] process A `HANDLE` identifying the process to be dumped.
-  //! \param[in] blame_thread If non-null, a `HANDLE` valid in the caller's
-  //!     process, referring to a thread in the target process. If this is
-  //!     supplied, instead of the exception referring to the location where the
-  //!     exception was injected, an exception record will be fabricated that
-  //!     refers to the current location of the given thread.
-  //! \param[in] exception_code If \a blame_thread is non-null, this will be
-  //!     used as the exception code in the exception record.
-  //!
-  //! \return `true` if the exception was triggered successfully.
-  bool DumpAndCrashTargetProcess(HANDLE process,
-                                 HANDLE blame_thread,
-                                 DWORD exception_code) const;
-
-  enum : uint32_t {
-    //! \brief The exception code (roughly "Client called") used when
-    //!     DumpAndCrashTargetProcess() triggers an exception in a target
-    //!     process.
-    //!
-    //! \note This value does not have any bits of the top nibble set, to avoid
-    //!     confusion with real exception codes which tend to have those bits
-    //!     set.
-    kTriggeredExceptionCode = 0xcca11ed,
-  };
-#endif
-
-#if defined(OS_MACOSX) || DOXYGEN
-  //! \brief Configures the process to direct its crashes to the default handler
-  //!     for the operating system.
-  //!
-  //! On macOS, this sets the task’s exception port as in SetHandlerMachPort(),
-  //! but the exception handler used is obtained from
-  //! SystemCrashReporterHandler(). If the system’s crash reporter handler
-  //! cannot be determined or set, the task’s exception ports for crash-type
-  //! exceptions are cleared.
-  //!
-  //! Use of this function is strongly discouraged.
-  //!
-  //! \warning After a call to this function, Crashpad will no longer monitor
-  //!     the process for crashes until a subsequent call to
-  //!     SetHandlerMachPort().
-  //!
-  //! \note This is provided as a static function to allow it to be used in
-  //!     situations where a CrashpadClient object is not otherwise available.
-  //!     This may be useful when a child process inherits its parent’s Crashpad
-  //!     handler, but wants to sever this tie.
-  static void UseSystemDefaultHandler();
-#endif
-
- private:
-#if defined(OS_MACOSX)
-  base::mac::ScopedMachSendRight exception_port_;
-#elif defined(OS_WIN)
-  std::wstring ipc_pipe_;
-  ScopedKernelHANDLE handler_start_thread_;
-#endif  // OS_MACOSX
-
-  DISALLOW_COPY_AND_ASSIGN(CrashpadClient);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
diff --git a/Tools/Crashpad/include/client/crashpad_info.h b/Tools/Crashpad/include/client/crashpad_info.h
deleted file mode 100644
index 5db9a6cdff..0000000000
--- a/Tools/Crashpad/include/client/crashpad_info.h
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_CRASHPAD_INFO_H_
-#define CRASHPAD_CLIENT_CRASHPAD_INFO_H_
-
-#include <stdint.h>
-
-#include "base/macros.h"
-#include "build/build_config.h"
-#include "client/annotation_list.h"
-#include "client/simple_address_range_bag.h"
-#include "client/simple_string_dictionary.h"
-#include "util/misc/tri_state.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#endif  // OS_WIN
-
-namespace crashpad {
-
-namespace internal {
-
-//! \brief A linked list of blocks representing custom streams in the minidump,
-//!     with addresses (and size) stored as uint64_t to simplify reading from
-//!     the handler process.
-struct UserDataMinidumpStreamListEntry {
-  //! \brief The address of the next entry in the linked list.
-  uint64_t next;
-
-  //! \brief The base address of the memory block in the target process' address
-  //!     space that represents the user data stream.
-  uint64_t base_address;
-
-  //! \brief The size of memory block in the target process' address space that
-  //!     represents the user data stream.
-  uint64_t size;
-
-  //! \brief The stream type identifier.
-  uint32_t stream_type;
-};
-
-}  // namespace internal
-
-//! \brief A structure that can be used by a Crashpad-enabled program to
-//!     provide information to the Crashpad crash handler.
-//!
-//! It is possible for one CrashpadInfo structure to appear in each loaded code
-//! module in a process, but from the perspective of the user of the client
-//! interface, there is only one global CrashpadInfo structure, located in the
-//! module that contains the client interface code.
-struct CrashpadInfo {
- public:
-  //! \brief Returns the global CrashpadInfo structure.
-  static CrashpadInfo* GetCrashpadInfo();
-
-  CrashpadInfo();
-
-  //! \brief Sets the bag of extra memory ranges to be included in the snapshot.
-  //!
-  //! Extra memory ranges may exist in \a address_range_bag at the time that
-  //! this method is called, or they may be added, removed, or modified in \a
-  //! address_range_bag after this method is called.
-  //!
-  //! TODO(scottmg) This is currently only supported on Windows.
-  //!
-  //! \param[in] address_range_bag A bag of address ranges. The CrashpadInfo
-  //!     object does not take ownership of the SimpleAddressRangeBag object.
-  //!     It is the caller’s responsibility to ensure that this pointer remains
-  //!     valid while it is in effect for a CrashpadInfo object.
-  void set_extra_memory_ranges(SimpleAddressRangeBag* address_range_bag) {
-    extra_memory_ranges_ = address_range_bag;
-  }
-
-  //! \brief Sets the simple annotations dictionary.
-  //!
-  //! Simple annotations set on a CrashpadInfo structure are interpreted by
-  //! Crashpad as module-level annotations.
-  //!
-  //! Annotations may exist in \a simple_annotations at the time that this
-  //! method is called, or they may be added, removed, or modified in \a
-  //! simple_annotations after this method is called.
-  //!
-  //! \param[in] simple_annotations A dictionary that maps string keys to string
-  //!     values. The CrashpadInfo object does not take ownership of the
-  //!     SimpleStringDictionary object. It is the caller’s responsibility to
-  //!     ensure that this pointer remains valid while it is in effect for a
-  //!     CrashpadInfo object.
-  //!
-  //! \sa simple_annotations()
-  void set_simple_annotations(SimpleStringDictionary* simple_annotations) {
-    simple_annotations_ = simple_annotations;
-  }
-
-  //! \return The simple annotations dictionary.
-  //!
-  //! \sa set_simple_annotations()
-  SimpleStringDictionary* simple_annotations() const {
-    return simple_annotations_;
-  }
-
-  //! \brief Sets the annotations list.
-  //!
-  //! Unlike the \a simple_annotations structure, the \a annotations can
-  //! typed data and it is not limited to a dictionary form. Annotations are
-  //! interpreted by Crashpad as module-level annotations.
-  //!
-  //! Annotations may exist in \a list at the time that this method is called,
-  //! or they may be added, removed, or modified in \a list after this method is
-  //! called.
-  //!
-  //! \param[in] list A list of set Annotation objects that maintain arbitrary,
-  //!     typed key-value state. The CrashpadInfo object does not take ownership
-  //!     of the AnnotationsList object. It is the caller’s responsibility to
-  //!     ensure that this pointer remains valid while it is in effect for a
-  //!     CrashpadInfo object.
-  //!
-  //! \sa annotations_list()
-  //! \sa AnnotationList::Register()
-  void set_annotations_list(AnnotationList* list) { annotations_list_ = list; }
-
-  //! \return The annotations list.
-  //!
-  //! \sa set_annotations_list()
-  //! \sa AnnotationList::Get()
-  //! \sa AnnotationList::Register()
-  AnnotationList* annotations_list() const { return annotations_list_; }
-
-  //! \brief Enables or disables Crashpad handler processing.
-  //!
-  //! When handling an exception, the Crashpad handler will scan all modules in
-  //! a process. The first one that has a CrashpadInfo structure populated with
-  //! a value other than #kUnset for this field will dictate whether the handler
-  //! is functional or not. If all modules with a CrashpadInfo structure specify
-  //! #kUnset, the handler will be enabled. If disabled, the Crashpad handler
-  //! will still run and receive exceptions, but will not take any action on an
-  //! exception on its own behalf, except for the action necessary to determine
-  //! that it has been disabled.
-  //!
-  //! The Crashpad handler should not normally be disabled. More commonly, it
-  //! is appropriate to disable crash report upload by calling
-  //! Settings::SetUploadsEnabled().
-  void set_crashpad_handler_behavior(TriState crashpad_handler_behavior) {
-    crashpad_handler_behavior_ = crashpad_handler_behavior;
-  }
-
-  //! \brief Enables or disables Crashpad forwarding of exceptions to the
-  //!     system’s crash reporter.
-  //!
-  //! When handling an exception, the Crashpad handler will scan all modules in
-  //! a process. The first one that has a CrashpadInfo structure populated with
-  //! a value other than #kUnset for this field will dictate whether the
-  //! exception is forwarded to the system’s crash reporter. If all modules with
-  //! a CrashpadInfo structure specify #kUnset, forwarding will be enabled.
-  //! Unless disabled, forwarding may still occur if the Crashpad handler is
-  //! disabled by SetCrashpadHandlerState(). Even when forwarding is enabled,
-  //! the Crashpad handler may choose not to forward all exceptions to the
-  //! system’s crash reporter in cases where it has reason to believe that the
-  //! system’s crash reporter would not normally have handled the exception in
-  //! Crashpad’s absence.
-  void set_system_crash_reporter_forwarding(
-      TriState system_crash_reporter_forwarding) {
-    system_crash_reporter_forwarding_ = system_crash_reporter_forwarding;
-  }
-
-  //! \brief Enables or disables Crashpad capturing indirectly referenced memory
-  //!     in the minidump.
-  //!
-  //! When handling an exception, the Crashpad handler will scan all modules in
-  //! a process. The first one that has a CrashpadInfo structure populated with
-  //! a value other than #kUnset for this field will dictate whether the extra
-  //! memory is captured.
-  //!
-  //! This causes Crashpad to include pages of data referenced by locals or
-  //! other stack memory. Turning this on can increase the size of the minidump
-  //! significantly.
-  //!
-  //! \param[in] gather_indirectly_referenced_memory Whether extra memory should
-  //!     be gathered.
-  //! \param[in] limit The amount of memory in bytes after which no more
-  //!     indirectly gathered memory should be captured. This value is only used
-  //!     when \a gather_indirectly_referenced_memory is TriState::kEnabled.
-  void set_gather_indirectly_referenced_memory(
-      TriState gather_indirectly_referenced_memory,
-      uint32_t limit) {
-    gather_indirectly_referenced_memory_ = gather_indirectly_referenced_memory;
-    indirectly_referenced_memory_cap_ = limit;
-  }
-
-  //! \brief Adds a custom stream to the minidump.
-  //!
-  //! The memory block referenced by \a data and \a size will added to the
-  //! minidump as separate stream with type \a stream_type. The memory referred
-  //! to by \a data and \a size is owned by the caller and must remain valid
-  //! while it is in effect for the CrashpadInfo object.
-  //!
-  //! Note that streams will appear in the minidump in the reverse order to
-  //! which they are added.
-  //!
-  //! TODO(scottmg) This is currently only supported on Windows.
-  //!
-  //! \param[in] stream_type The stream type identifier to use. This should be
-  //!     normally be larger than `MINIDUMP_STREAM_TYPE::LastReservedStream`
-  //!     which is `0xffff`.
-  //! \param[in] data The base pointer of the stream data.
-  //! \param[in] size The size of the stream data.
-  void AddUserDataMinidumpStream(uint32_t stream_type,
-                                 const void* data,
-                                 size_t size);
-
-  enum : uint32_t {
-    kSignature = 'CPad',
-  };
-
- private:
-  // The compiler won’t necessarily see anyone using these fields, but it
-  // shouldn’t warn about that. These fields aren’t intended for use by the
-  // process they’re found in, they’re supposed to be read by the crash
-  // reporting process.
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
-
-  // Fields present in version 1, subject to a check of the size_ field:
-  uint32_t signature_;  // kSignature
-  uint32_t size_;  // The size of the entire CrashpadInfo structure.
-  uint32_t version_;  // kCrashpadInfoVersion
-  uint32_t indirectly_referenced_memory_cap_;
-  uint32_t padding_0_;
-  TriState crashpad_handler_behavior_;
-  TriState system_crash_reporter_forwarding_;
-  TriState gather_indirectly_referenced_memory_;
-  uint8_t padding_1_;
-  SimpleAddressRangeBag* extra_memory_ranges_;  // weak
-  SimpleStringDictionary* simple_annotations_;  // weak
-  internal::UserDataMinidumpStreamListEntry* user_data_minidump_stream_head_;
-  AnnotationList* annotations_list_;  // weak
-
-  // It’s generally safe to add new fields without changing
-  // kCrashpadInfoVersion, because readers should check size_ and ignore fields
-  // that aren’t present, as well as unknown fields.
-  //
-  // Adding fields? Consider snapshot/crashpad_info_size_test_module.cc too.
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-  DISALLOW_COPY_AND_ASSIGN(CrashpadInfo);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_CRASHPAD_INFO_H_
diff --git a/Tools/Crashpad/include/client/prune_crash_reports.h b/Tools/Crashpad/include/client/prune_crash_reports.h
deleted file mode 100644
index 6dac5f3002..0000000000
--- a/Tools/Crashpad/include/client/prune_crash_reports.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_
-#define CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_
-
-#include <sys/types.h>
-#include <time.h>
-
-#include <memory>
-
-#include "base/macros.h"
-#include "client/crash_report_database.h"
-
-namespace crashpad {
-
-class PruneCondition;
-
-//! \brief Deletes crash reports from \a database that match \a condition.
-//!
-//! This function can be used to remove old or large reports from the database.
-//! The \a condition will be evaluated against each report in the \a database,
-//! sorted in descending order by CrashReportDatabase::Report::creation_time.
-//! This guarantee allows conditions to be stateful.
-//!
-//! \param[in] database The database from which crash reports will be deleted.
-//! \param[in] condition The condition against which all reports in the database
-//!     will be evaluated.
-void PruneCrashReportDatabase(CrashReportDatabase* database,
-                              PruneCondition* condition);
-
-std::unique_ptr<PruneCondition> GetDefaultDatabasePruneCondition();
-
-//! \brief An abstract base class for evaluating crash reports for deletion.
-//!
-//! When passed to PruneCrashReportDatabase(), each crash report in the
-//! database will be evaluated according to ShouldPruneReport(). The reports
-//! are evaluated serially in descending sort order by
-//! CrashReportDatabase::Report::creation_time.
-class PruneCondition {
- public:
-  //! \brief Returns a sensible default condition for removing obsolete crash
-  //!     reports.
-  //!
-  //! The default is to keep reports for one year or a maximum database size
-  //! of 128 MB.
-  //!
-  //! \return A PruneCondition for use with PruneCrashReportDatabase().
-  static std::unique_ptr<PruneCondition> GetDefault();
-
-  virtual ~PruneCondition() {}
-
-  //! \brief Evaluates a crash report for deletion.
-  //!
-  //! \param[in] report The crash report to evaluate.
-  //!
-  //! \return `true` if the crash report should be deleted, `false` if it
-  //!     should be kept.
-  virtual bool ShouldPruneReport(const CrashReportDatabase::Report& report) = 0;
-};
-
-//! \brief A PruneCondition that deletes reports older than the specified number
-//!     days.
-class AgePruneCondition final : public PruneCondition {
- public:
-  //! \brief Creates a PruneCondition based on Report::creation_time.
-  //!
-  //! \param[in] max_age_in_days Reports created more than this many days ago
-  //!     will be deleted.
-  explicit AgePruneCondition(int max_age_in_days);
-  ~AgePruneCondition();
-
-  bool ShouldPruneReport(const CrashReportDatabase::Report& report) override;
-
- private:
-  const time_t oldest_report_time_;
-
-  DISALLOW_COPY_AND_ASSIGN(AgePruneCondition);
-};
-
-//! \brief A PruneCondition that deletes older reports to keep the total
-//!     Crashpad database size under the specified limit.
-class DatabaseSizePruneCondition final : public PruneCondition {
- public:
-  //! \brief Creates a PruneCondition that will keep newer reports, until the
-  //!     sum of the size of all reports is not smaller than \a max_size_in_kb.
-  //!     After the limit is reached, older reports will be pruned.
-  //!
-  //! \param[in] max_size_in_kb The maximum number of kilobytes that all crash
-  //!     reports should consume.
-  explicit DatabaseSizePruneCondition(size_t max_size_in_kb);
-  ~DatabaseSizePruneCondition();
-
-  bool ShouldPruneReport(const CrashReportDatabase::Report& report) override;
-
- private:
-  const size_t max_size_in_kb_;
-  size_t measured_size_in_kb_;
-
-  DISALLOW_COPY_AND_ASSIGN(DatabaseSizePruneCondition);
-};
-
-//! \brief A PruneCondition that conjoins two other PruneConditions.
-class BinaryPruneCondition final : public PruneCondition {
- public:
-  enum Operator {
-    AND,
-    OR,
-  };
-
-  //! \brief Evaluates two sub-conditions according to the specified logical
-  //!     operator.
-  //!
-  //! This implements left-to-right evaluation. For Operator::AND, this means
-  //! if the \a lhs is `false`, the \a rhs will not be consulted. Similarly,
-  //! with Operator::OR, if the \a lhs is `true`, the \a rhs will not be
-  //! consulted.
-  //!
-  //! \param[in] op The logical operator to apply on \a lhs and \a rhs.
-  //! \param[in] lhs The left-hand side of \a op. This class takes ownership.
-  //! \param[in] rhs The right-hand side of \a op. This class takes ownership.
-  BinaryPruneCondition(Operator op, PruneCondition* lhs, PruneCondition* rhs);
-  ~BinaryPruneCondition();
-
-  bool ShouldPruneReport(const CrashReportDatabase::Report& report) override;
-
- private:
-  const Operator op_;
-  std::unique_ptr<PruneCondition> lhs_;
-  std::unique_ptr<PruneCondition> rhs_;
-
-  DISALLOW_COPY_AND_ASSIGN(BinaryPruneCondition);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_
diff --git a/Tools/Crashpad/include/client/settings.h b/Tools/Crashpad/include/client/settings.h
deleted file mode 100644
index b64f74fbaf..0000000000
--- a/Tools/Crashpad/include/client/settings.h
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_SETTINGS_H_
-#define CRASHPAD_CLIENT_SETTINGS_H_
-
-#include <time.h>
-
-#include <string>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "base/scoped_generic.h"
-#include "util/file/file_io.h"
-#include "util/misc/initialization_state.h"
-#include "util/misc/uuid.h"
-
-namespace crashpad {
-
-namespace internal {
-
-struct ScopedLockedFileHandleTraits {
-  static FileHandle InvalidValue() { return kInvalidFileHandle; }
-  static void Free(FileHandle handle);
-};
-
-}  // namespace internal
-
-//! \brief An interface for accessing and modifying the settings of a
-//!     CrashReportDatabase.
-//!
-//! This class must not be instantiated directly, but rather an instance of it
-//! should be retrieved via CrashReportDatabase::GetSettings().
-class Settings {
- public:
-  explicit Settings(const base::FilePath& file_path);
-  ~Settings();
-
-  bool Initialize();
-
-  //! \brief Retrieves the immutable identifier for this client, which is used
-  //!     on a server to locate all crash reports from a specific Crashpad
-  //!     database.
-  //!
-  //! This is automatically initialized when the database is created.
-  //!
-  //! \param[out] client_id The unique client identifier.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool GetClientID(UUID* client_id);
-
-  //! \brief Retrieves the user’s preference for submitting crash reports to a
-  //!     collection server.
-  //!
-  //! The default value is `false`.
-  //!
-  //! \param[out] enabled Whether crash reports should be uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool GetUploadsEnabled(bool* enabled);
-
-  //! \brief Sets the user’s preference for submitting crash reports to a
-  //!     collection server.
-  //!
-  //! \param[in] enabled Whether crash reports should be uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool SetUploadsEnabled(bool enabled);
-
-  //! \brief Retrieves the last time at which a report was attempted to be
-  //!     uploaded.
-  //!
-  //! The default value is `0` if it has never been set before.
-  //!
-  //! \param[out] time The last time at which a report was uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool GetLastUploadAttemptTime(time_t* time);
-
-  //! \brief Sets the last time at which a report was attempted to be uploaded.
-  //!
-  //! This is only meant to be used internally by the CrashReportDatabase.
-  //!
-  //! \param[in] time The last time at which a report was uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool SetLastUploadAttemptTime(time_t time);
-
- private:
-  struct Data;
-
-  // This must be constructed with MakeScopedLockedFileHandle(). It both unlocks
-  // and closes the file on destruction.
-  using ScopedLockedFileHandle =
-      base::ScopedGeneric<FileHandle, internal::ScopedLockedFileHandleTraits>;
-  static ScopedLockedFileHandle MakeScopedLockedFileHandle(FileHandle file,
-                                                           FileLocking locking);
-
-  // Opens the settings file for reading. On error, logs a message and returns
-  // the invalid handle.
-  ScopedLockedFileHandle OpenForReading();
-
-  // Opens the settings file for reading and writing. On error, logs a message
-  // and returns the invalid handle. |mode| determines how the file will be
-  // opened. |mode| must not be FileWriteMode::kTruncateOrCreate.
-  //
-  // If |log_open_error| is false, nothing will be logged for an error
-  // encountered when attempting to open the file, but this method will still
-  // return false. This is intended to be used to suppress error messages when
-  // attempting to create a new settings file when multiple attempts are made.
-  ScopedLockedFileHandle OpenForReadingAndWriting(FileWriteMode mode,
-                                                  bool log_open_error);
-
-  // Opens the settings file and reads the data. If that fails, an error will
-  // be logged and the settings will be recovered and re-initialized. If that
-  // also fails, returns false with additional log data from recovery.
-  bool OpenAndReadSettings(Data* out_data);
-
-  // Opens the settings file for writing and reads the data. If reading fails,
-  // recovery is attempted. Returns the opened file handle on success, or the
-  // invalid file handle on failure, with an error logged.
-  ScopedLockedFileHandle OpenForWritingAndReadSettings(Data* out_data);
-
-  // Reads the settings from |handle|. Logs an error and returns false on
-  // failure. This does not perform recovery.
-  //
-  // |handle| must be the result of OpenForReading() or
-  // OpenForReadingAndWriting().
-  //
-  // If |log_read_error| is false, nothing will be logged for a read error, but
-  // this method will still return false. This is intended to be used to
-  // suppress error messages when attempting to read a newly created settings
-  // file.
-  bool ReadSettings(FileHandle handle, Data* out_data, bool log_read_error);
-
-  // Writes the settings to |handle|. Logs an error and returns false on
-  // failure. This does not perform recovery.
-  //
-  // |handle| must be the result of OpenForReadingAndWriting().
-  bool WriteSettings(FileHandle handle, const Data& data);
-
-  // Recovers the settings file by re-initializing the data. If |handle| is the
-  // invalid handle, this will open the file; if it is not, then it must be the
-  // result of OpenForReadingAndWriting(). If the invalid handle is passed, the
-  // caller must not be holding the handle. The new settings data are stored in
-  // |out_data|. Returns true on success and false on failure, with an error
-  // logged.
-  bool RecoverSettings(FileHandle handle, Data* out_data);
-
-  // Initializes a settings file and writes the data to |handle|. Returns true
-  // on success and false on failure, with an error logged.
-  //
-  // |handle| must be the result of OpenForReadingAndWriting().
-  bool InitializeSettings(FileHandle handle);
-
-  const base::FilePath& file_path() const { return file_path_; }
-
-  base::FilePath file_path_;
-
-  InitializationState initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(Settings);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_SETTINGS_H_
diff --git a/Tools/Crashpad/include/client/simple_address_range_bag.h b/Tools/Crashpad/include/client/simple_address_range_bag.h
deleted file mode 100644
index c69fa5afd8..0000000000
--- a/Tools/Crashpad/include/client/simple_address_range_bag.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_SIMPLE_ADDRESS_RANGE_BAG_H_
-#define CRASHPAD_CLIENT_SIMPLE_ADDRESS_RANGE_BAG_H_
-
-#include <stdint.h>
-
-#include <type_traits>
-
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/numerics/safe_conversions.h"
-#include "util/misc/from_pointer_cast.h"
-#include "util/numeric/checked_range.h"
-
-namespace crashpad {
-
-//! \brief A bag implementation using a fixed amount of storage, so that it does
-//!     not perform any dynamic allocations for its operations.
-//!
-//! The actual bag storage (TSimpleAddressRangeBag::Entry) is POD, so that it
-//! can be transmitted over various IPC mechanisms.
-template <size_t NumEntries = 64>
-class TSimpleAddressRangeBag {
- public:
-  //! Constant and publicly accessible version of the template parameter.
-  static const size_t num_entries = NumEntries;
-
-  //! \brief A single entry in the bag.
-  struct Entry {
-    //! \brief The base address of the range.
-    uint64_t base;
-
-    //! \brief The size of the range in bytes.
-    uint64_t size;
-
-    //! \brief Returns the validity of the entry.
-    //!
-    //! If #base and #size are both zero, the entry is considered inactive, and
-    //! this method returns `false`. Otherwise, returns `true`.
-    bool is_active() const {
-      return base != 0 || size != 0;
-    }
-  };
-
-  //! \brief An iterator to traverse all of the active entries in a
-  //!     TSimpleAddressRangeBag.
-  class Iterator {
-   public:
-    explicit Iterator(const TSimpleAddressRangeBag& bag)
-        : bag_(bag),
-          current_(0) {
-    }
-
-    //! \brief Returns the next entry in the bag, or `nullptr` if at the end of
-    //!     the collection.
-    const Entry* Next() {
-      while (current_ < bag_.num_entries) {
-        const Entry* entry = &bag_.entries_[current_++];
-        if (entry->is_active()) {
-          return entry;
-        }
-      }
-      return nullptr;
-    }
-
-   private:
-    const TSimpleAddressRangeBag& bag_;
-    size_t current_;
-
-    DISALLOW_COPY_AND_ASSIGN(Iterator);
-  };
-
-  TSimpleAddressRangeBag()
-      : entries_() {
-  }
-
-  TSimpleAddressRangeBag(const TSimpleAddressRangeBag& other) {
-    *this = other;
-  }
-
-  TSimpleAddressRangeBag& operator=(const TSimpleAddressRangeBag& other) {
-    memcpy(entries_, other.entries_, sizeof(entries_));
-    return *this;
-  }
-
-  //! \brief Returns the number of active entries. The upper limit for this is
-  //!     \a NumEntries.
-  size_t GetCount() const {
-    size_t count = 0;
-    for (size_t i = 0; i < num_entries; ++i) {
-      if (entries_[i].is_active()) {
-        ++count;
-      }
-    }
-    return count;
-  }
-
-  //! \brief Inserts the given range into the bag. Duplicates and overlapping
-  //! ranges are supported and allowed, but not coalesced.
-  //!
-  //! \param[in] range The range to be inserted. The range must have either a
-  //!     non-zero base address or size.
-  //!
-  //! \return `true` if there was space to insert the range into the bag,
-  //!     otherwise `false` with an error logged.
-  bool Insert(CheckedRange<uint64_t> range) {
-    DCHECK(range.base() != 0 || range.size() != 0);
-
-    for (size_t i = 0; i < num_entries; ++i) {
-      if (!entries_[i].is_active()) {
-        entries_[i].base = range.base();
-        entries_[i].size = range.size();
-        return true;
-      }
-    }
-
-    LOG(ERROR) << "no space available to insert range";
-    return false;
-  }
-
-  //! \brief Inserts the given range into the bag. Duplicates and overlapping
-  //! ranges are supported and allowed, but not coalesced.
-  //!
-  //! \param[in] base The base of the range to be inserted. May not be null.
-  //! \param[in] size The size of the range to be inserted. May not be zero.
-  //!
-  //! \return `true` if there was space to insert the range into the bag,
-  //!     otherwise `false` with an error logged.
-  bool Insert(void* base, size_t size) {
-    DCHECK(base != nullptr);
-    DCHECK_NE(0u, size);
-    return Insert(CheckedRange<uint64_t>(FromPointerCast<uint64_t>(base),
-                                         base::checked_cast<uint64_t>(size)));
-  }
-
-  //! \brief Removes the given range from the bag.
-  //!
-  //! \param[in] range The range to be removed. The range must have either a
-  //!     non-zero base address or size.
-  //!
-  //! \return `true` if the range was found and removed, otherwise `false` with
-  //!     an error logged.
-  bool Remove(CheckedRange<uint64_t> range) {
-    DCHECK(range.base() != 0 || range.size() != 0);
-
-    for (size_t i = 0; i < num_entries; ++i) {
-      if (entries_[i].base == range.base() &&
-          entries_[i].size == range.size()) {
-        entries_[i].base = entries_[i].size = 0;
-        return true;
-      }
-    }
-
-    LOG(ERROR) << "did not find range to remove";
-    return false;
-  }
-
-  //! \brief Removes the given range from the bag.
-  //!
-  //! \param[in] base The base of the range to be removed. May not be null.
-  //! \param[in] size The size of the range to be removed. May not be zero.
-  //!
-  //! \return `true` if the range was found and removed, otherwise `false` with
-  //! an error logged.
-  bool Remove(void* base, size_t size) {
-    DCHECK(base != nullptr);
-    DCHECK_NE(0u, size);
-    return Remove(CheckedRange<uint64_t>(FromPointerCast<uint64_t>(base),
-                                         base::checked_cast<uint64_t>(size)));
-  }
-
-
- private:
-  Entry entries_[NumEntries];
-};
-
-//! \brief A TSimpleAddressRangeBag with default template parameters.
-using SimpleAddressRangeBag = TSimpleAddressRangeBag<64>;
-
-static_assert(std::is_standard_layout<SimpleAddressRangeBag>::value,
-              "SimpleAddressRangeBag must be standard layout");
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_SIMPLE_ADDRESS_RANGE_BAG_H_
diff --git a/Tools/Crashpad/include/client/simple_string_dictionary.h b/Tools/Crashpad/include/client/simple_string_dictionary.h
deleted file mode 100644
index 0e97736163..0000000000
--- a/Tools/Crashpad/include/client/simple_string_dictionary.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_
-#define CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_
-
-#include <string.h>
-#include <sys/types.h>
-
-#include <algorithm>
-#include <type_traits>
-
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/strings/string_piece.h"
-#include "util/misc/implicit_cast.h"
-
-namespace crashpad {
-
-//! \brief A map/dictionary collection implementation using a fixed amount of
-//!     storage, so that it does not perform any dynamic allocations for its
-//!     operations.
-//!
-//! The actual map storage (TSimpleStringDictionary::Entry) is guaranteed to be
-//! POD, so that it can be transmitted over various IPC mechanisms.
-//!
-//! The template parameters control the amount of storage used for the key,
-//! value, and map. The \a KeySize and \a ValueSize are measured in bytes, not
-//! glyphs, and include space for a trailing `NUL` byte. This gives space for
-//! `KeySize - 1` and `ValueSize - 1` characters in an entry. \a NumEntries is
-//! the total number of entries that will fit in the map.
-template <size_t KeySize = 256, size_t ValueSize = 256, size_t NumEntries = 64>
-class TSimpleStringDictionary {
- public:
-  //! \brief Constant and publicly accessible versions of the template
-  //!     parameters.
-  //! \{
-  static const size_t key_size = KeySize;
-  static const size_t value_size = ValueSize;
-  static const size_t num_entries = NumEntries;
-  //! \}
-
-  //! \brief A single entry in the map.
-  struct Entry {
-    //! \brief The entry’s key.
-    //!
-    //! This string is always `NUL`-terminated. If this is a 0-length
-    //! `NUL`-terminated string, the entry is inactive.
-    char key[KeySize];
-
-    //! \brief The entry’s value.
-    //!
-    //! This string is always `NUL`-terminated.
-    char value[ValueSize];
-
-    //! \brief Returns the validity of the entry.
-    //!
-    //! If #key is an empty string, the entry is considered inactive, and this
-    //! method returns `false`. Otherwise, returns `true`.
-    bool is_active() const {
-      return key[0] != '\0';
-    }
-  };
-
-  //! \brief An iterator to traverse all of the active entries in a
-  //!     TSimpleStringDictionary.
-  class Iterator {
-   public:
-    explicit Iterator(const TSimpleStringDictionary& map)
-        : map_(map),
-          current_(0) {
-    }
-
-    //! \brief Returns the next entry in the map, or `nullptr` if at the end of
-    //!     the collection.
-    const Entry* Next() {
-      while (current_ < map_.num_entries) {
-        const Entry* entry = &map_.entries_[current_++];
-        if (entry->is_active()) {
-          return entry;
-        }
-      }
-      return nullptr;
-    }
-
-   private:
-    const TSimpleStringDictionary& map_;
-    size_t current_;
-
-    DISALLOW_COPY_AND_ASSIGN(Iterator);
-  };
-
-  TSimpleStringDictionary()
-      : entries_() {
-  }
-
-  TSimpleStringDictionary(const TSimpleStringDictionary& other) {
-    *this = other;
-  }
-
-  TSimpleStringDictionary& operator=(const TSimpleStringDictionary& other) {
-    memcpy(entries_, other.entries_, sizeof(entries_));
-    return *this;
-  }
-
-  //! \brief Returns the number of active key/value pairs. The upper limit for
-  //!     this is \a NumEntries.
-  size_t GetCount() const {
-    size_t count = 0;
-    for (size_t i = 0; i < num_entries; ++i) {
-      if (entries_[i].is_active()) {
-        ++count;
-      }
-    }
-    return count;
-  }
-
-  //! \brief Given \a key, returns its corresponding value.
-  //!
-  //! \param[in] key The key to look up. This must not be `nullptr`, nor an
-  //!     empty string. It must not contain embedded `NUL`s.
-  //!
-  //! \return The corresponding value for \a key, or if \a key is not found,
-  //!     `nullptr`.
-  const char* GetValueForKey(base::StringPiece key) const {
-    DCHECK(key.data());
-    DCHECK(key.size());
-    DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos);
-    if (!key.data() || !key.size()) {
-      return nullptr;
-    }
-
-    const Entry* entry = GetConstEntryForKey(key);
-    if (!entry) {
-      return nullptr;
-    }
-
-    return entry->value;
-  }
-
-  //! \brief Stores \a value into \a key, replacing the existing value if \a key
-  //!     is already present.
-  //!
-  //! If \a key is not yet in the map and the map is already full (containing
-  //! \a NumEntries active entries), this operation silently fails.
-  //!
-  //! \param[in] key The key to store. This must not be `nullptr`, nor an empty
-  //!     string. It must not contain embedded `NUL`s.
-  //! \param[in] value The value to store. If `nullptr`, \a key is removed from
-  //!     the map. Must not contain embedded `NUL`s.
-  void SetKeyValue(base::StringPiece key, base::StringPiece value) {
-    if (!value.data()) {
-      RemoveKey(key);
-      return;
-    }
-
-    DCHECK(key.data());
-    DCHECK(key.size());
-    DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos);
-    if (!key.data() || !key.size()) {
-      return;
-    }
-
-    // |key| must not be an empty string.
-    DCHECK_NE(key[0], '\0');
-    if (key[0] == '\0') {
-      return;
-    }
-
-    // |value| must not contain embedded NULs.
-    DCHECK_EQ(value.find('\0', 0), base::StringPiece::npos);
-
-    Entry* entry = GetEntryForKey(key);
-
-    // If it does not yet exist, attempt to insert it.
-    if (!entry) {
-      for (size_t i = 0; i < num_entries; ++i) {
-        if (!entries_[i].is_active()) {
-          entry = &entries_[i];
-          SetFromStringPiece(key, entry->key, key_size);
-          break;
-        }
-      }
-    }
-
-    // If the map is out of space, |entry| will be nullptr.
-    if (!entry) {
-      return;
-    }
-
-#ifndef NDEBUG
-    // Sanity check that the key only appears once.
-    int count = 0;
-    for (size_t i = 0; i < num_entries; ++i) {
-      if (EntryKeyEquals(key, entries_[i])) {
-        ++count;
-      }
-    }
-    DCHECK_EQ(count, 1);
-#endif
-
-    SetFromStringPiece(value, entry->value, value_size);
-  }
-
-  //! \brief Removes \a key from the map.
-  //!
-  //! If \a key is not found, this is a no-op.
-  //!
-  //! \param[in] key The key of the entry to remove. This must not be `nullptr`,
-  //!     nor an empty string. It must not contain embedded `NUL`s.
-  void RemoveKey(base::StringPiece key) {
-    DCHECK(key.data());
-    DCHECK(key.size());
-    DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos);
-    if (!key.data() || !key.size()) {
-      return;
-    }
-
-    Entry* entry = GetEntryForKey(key);
-    if (entry) {
-      entry->key[0] = '\0';
-      entry->value[0] = '\0';
-    }
-
-    DCHECK_EQ(GetEntryForKey(key), implicit_cast<Entry*>(nullptr));
-  }
-
- private:
-  static void SetFromStringPiece(base::StringPiece src,
-                                 char* dst,
-                                 size_t dst_size) {
-    size_t copy_len = std::min(dst_size - 1, src.size());
-    src.copy(dst, copy_len);
-    dst[copy_len] = '\0';
-  }
-
-  static bool EntryKeyEquals(base::StringPiece key, const Entry& entry) {
-    if (key.size() >= KeySize)
-      return false;
-
-    // Test for a NUL terminator and early out if it's absent.
-    if (entry.key[key.size()] != '\0')
-      return false;
-
-    // As there's a NUL terminator at the right position in the entries
-    // string, strncmp can do the rest.
-    return strncmp(key.data(), entry.key, key.size()) == 0;
-  }
-
-  const Entry* GetConstEntryForKey(base::StringPiece key) const {
-    for (size_t i = 0; i < num_entries; ++i) {
-      if (EntryKeyEquals(key, entries_[i])) {
-        return &entries_[i];
-      }
-    }
-    return nullptr;
-  }
-
-  Entry* GetEntryForKey(base::StringPiece key) {
-    return const_cast<Entry*>(GetConstEntryForKey(key));
-  }
-
-  Entry entries_[NumEntries];
-};
-
-//! \brief A TSimpleStringDictionary with default template parameters.
-//!
-//! For historical reasons this specialized version is available with the same
-//! size factors as a previous implementation.
-using SimpleStringDictionary = TSimpleStringDictionary<256, 256, 64>;
-
-static_assert(std::is_standard_layout<SimpleStringDictionary>::value,
-              "SimpleStringDictionary must be standard layout");
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_
diff --git a/Tools/Crashpad/include/client/simulate_crash.h b/Tools/Crashpad/include/client/simulate_crash.h
deleted file mode 100644
index 299fe97cf5..0000000000
--- a/Tools/Crashpad/include/client/simulate_crash.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_SIMULATE_CRASH_H_
-#define CRASHPAD_CLIENT_SIMULATE_CRASH_H_
-
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-#include "client/simulate_crash_mac.h"
-#elif defined(OS_WIN)
-#include "client/simulate_crash_win.h"
-#endif
-
-#endif  // CRASHPAD_CLIENT_SIMULATE_CRASH_H_
diff --git a/Tools/Crashpad/include/client/simulate_crash_mac.h b/Tools/Crashpad/include/client/simulate_crash_mac.h
deleted file mode 100644
index e14db3c9b4..0000000000
--- a/Tools/Crashpad/include/client/simulate_crash_mac.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_SIMULATE_CRASH_MAC_H_
-#define CRASHPAD_CLIENT_SIMULATE_CRASH_MAC_H_
-
-#include <mach/mach.h>
-
-#include "client/capture_context_mac.h"
-
-//! \file
-
-namespace crashpad {
-
-//! \brief Simulates a exception without crashing.
-//!
-//! This function searches for an `EXC_CRASH` handler in the same manner that
-//! the kernel does, and sends it an exception message to that handler in the
-//! format that the handler expects, considering the behavior and thread state
-//! flavor that are registered for it. The exception sent to the handler will be
-//! ::kMachExceptionSimulated, not `EXC_CRASH`.
-//!
-//! Typically, the CRASHPAD_SIMULATE_CRASH() macro will be used in preference to
-//! this function, because it combines the context-capture operation with the
-//! raising of a simulated exception.
-//!
-//! This function returns normally after the exception message is processed. If
-//! no valid handler was found, or no handler processed the exception
-//! successfully, a warning will be logged, but these conditions are not
-//! considered fatal.
-//!
-//! \param[in] cpu_context The thread state to pass to the exception handler as
-//!     the exception context, provided that it is compatible with the thread
-//!     state flavor that the exception handler accepts. If it is not
-//!     compatible, the correct thread state for the handler will be obtained by
-//!     calling `thread_get_state()`.
-void SimulateCrash(const NativeCPUContext& cpu_context);
-
-}  // namespace crashpad
-
-//! \brief Captures the CPU context and simulates an exception without crashing.
-#define CRASHPAD_SIMULATE_CRASH()           \
-  do {                                      \
-    crashpad::NativeCPUContext cpu_context; \
-    crashpad::CaptureContext(&cpu_context); \
-    crashpad::SimulateCrash(cpu_context);   \
-  } while (false)
-
-#endif  // CRASHPAD_CLIENT_SIMULATE_CRASH_MAC_H_
diff --git a/Tools/Crashpad/include/client/simulate_crash_win.h b/Tools/Crashpad/include/client/simulate_crash_win.h
deleted file mode 100644
index a20f3dad62..0000000000
--- a/Tools/Crashpad/include/client/simulate_crash_win.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_SIMULATE_CRASH_WIN_H_
-#define CRASHPAD_CLIENT_SIMULATE_CRASH_WIN_H_
-
-#include <windows.h>
-
-#include "client/crashpad_client.h"
-#include "util/win/capture_context.h"
-
-//! \file
-
-//! \brief Captures the CPU context and captures a dump without an exception.
-#define CRASHPAD_SIMULATE_CRASH()                        \
-  do {                                                   \
-    CONTEXT context;                                     \
-    crashpad::CaptureContext(&context);                  \
-    crashpad::CrashpadClient::DumpWithoutCrash(context); \
-  } while (false)
-
-#endif  // CRASHPAD_CLIENT_SIMULATE_CRASH_WIN_H_
diff --git a/Tools/Crashpad/include/compat/android/dlfcn_internal.h b/Tools/Crashpad/include/compat/android/dlfcn_internal.h
deleted file mode 100644
index ed4083dbc8..0000000000
--- a/Tools/Crashpad/include/compat/android/dlfcn_internal.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_DLFCN_INTERNAL_H_
-#define CRASHPAD_COMPAT_ANDROID_DLFCN_INTERNAL_H_
-
-namespace crashpad {
-namespace internal {
-
-//! \brief Provide a wrapper for `dlsym`.
-//!
-//! dlsym on Android KitKat (4.4.*) raises SIGFPE when searching for a
-//! non-existent symbol. This wrapper avoids crashing in this circumstance.
-//! https://code.google.com/p/android/issues/detail?id=61799
-//!
-//! The parameters and return value for this function are the same as for
-//! `dlsym`, but a return value for `dlerror` may not be set in the event of an
-//! error.
-void* Dlsym(void* handle, const char* symbol);
-
-}  // namespace internal
-}  // namespace crashpad
-
-#endif  // CRASHPAD_COMPAT_ANDROID_DLFCN_INTERNAL_H_
diff --git a/Tools/Crashpad/include/compat/android/elf.h b/Tools/Crashpad/include/compat/android/elf.h
deleted file mode 100644
index 9fa923875b..0000000000
--- a/Tools/Crashpad/include/compat/android/elf.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_ELF_H_
-#define CRASHPAD_COMPAT_ANDROID_ELF_H_
-
-#include_next <elf.h>
-
-#include <android/api-level.h>
-
-#if !defined(ELF32_ST_VISIBILITY)
-#define ELF32_ST_VISIBILITY(other) ((other) & 0x3)
-#endif
-
-#if !defined(ELF64_ST_VISIBILITY)
-#define ELF64_ST_VISIBILITY(other) ELF32_ST_VISIBILITY(other)
-#endif
-
-// Android 5.0.0 (API 21) NDK
-
-#if !defined(STT_COMMON)
-#define STT_COMMON 5
-#endif
-
-#if !defined(STT_TLS)
-#define STT_TLS 6
-#endif
-
-// ELF note header types are normally provided by <linux/elf.h>. While unified
-// headers include <linux/elf.h> in <elf.h>, traditional headers do not, prior
-// to API 21. <elf.h> and <linux/elf.h> can't both be included in the same
-// translation unit due to collisions, so we provide these types here.
-#if __ANDROID_API__ < 21 && !defined(__ANDROID_API_N__)
-typedef struct {
-  Elf32_Word n_namesz;
-  Elf32_Word n_descsz;
-  Elf32_Word n_type;
-} Elf32_Nhdr;
-
-typedef struct {
-  Elf64_Word n_namesz;
-  Elf64_Word n_descsz;
-  Elf64_Word n_type;
-} Elf64_Nhdr;
-#endif  // __ANDROID_API__ < 21 && !defined(NT_PRSTATUS)
-
-#endif  // CRASHPAD_COMPAT_ANDROID_ELF_H_
diff --git a/Tools/Crashpad/include/compat/android/linux/elf.h b/Tools/Crashpad/include/compat/android/linux/elf.h
deleted file mode 100644
index e65d15327c..0000000000
--- a/Tools/Crashpad/include/compat/android/linux/elf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_LINUX_ELF_H_
-#define CRASHPAD_COMPAT_ANDROID_LINUX_ELF_H_
-
-#include_next <linux/elf.h>
-
-// Android 5.0.0 (API 21) NDK
-
-#if defined(__i386__) || defined(__x86_64__)
-#if !defined(NT_386_TLS)
-#define NT_386_TLS 0x200
-#endif
-#endif  // __i386__ || __x86_64__
-
-#if defined(__ARMEL__) || defined(__aarch64__)
-#if !defined(NT_ARM_VFP)
-#define NT_ARM_VFP 0x400
-#endif
-
-#if !defined(NT_ARM_TLS)
-#define NT_ARM_TLS 0x401
-#endif
-#endif  // __ARMEL__ || __aarch64__
-
-#endif  // CRASHPAD_COMPAT_ANDROID_LINUX_ELF_H_
diff --git a/Tools/Crashpad/include/compat/android/linux/prctl.h b/Tools/Crashpad/include/compat/android/linux/prctl.h
deleted file mode 100644
index 046f900f0a..0000000000
--- a/Tools/Crashpad/include/compat/android/linux/prctl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_LINUX_PRCTL_H_
-#define CRASHPAD_COMPAT_ANDROID_LINUX_PRCTL_H_
-
-#include_next <linux/prctl.h>
-
-// Android 5.0.0 (API 21) NDK
-#if !defined(PR_SET_PTRACER)
-#define PR_SET_PTRACER 0x59616d61
-#endif
-
-#endif  // CRASHPAD_COMPAT_ANDROID_LINUX_PRCTL_H_
diff --git a/Tools/Crashpad/include/compat/android/linux/ptrace.h b/Tools/Crashpad/include/compat/android/linux/ptrace.h
deleted file mode 100644
index 7db46aa3f1..0000000000
--- a/Tools/Crashpad/include/compat/android/linux/ptrace.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_LINUX_PTRACE_H_
-#define CRASHPAD_COMPAT_ANDROID_LINUX_PTRACE_H_
-
-#include_next <linux/ptrace.h>
-
-// Android 5.0.0 (API 21) NDK
-#if !defined(PTRACE_GETREGSET)
-#define PTRACE_GETREGSET 0x4204
-#endif
-
-#endif  // CRASHPAD_COMPAT_ANDROID_LINUX_PTRACE_H_
diff --git a/Tools/Crashpad/include/compat/android/sched.h b/Tools/Crashpad/include/compat/android/sched.h
deleted file mode 100644
index c4a027ae48..0000000000
--- a/Tools/Crashpad/include/compat/android/sched.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_SCHED_H_
-#define CRASHPAD_COMPAT_ANDROID_SCHED_H_
-
-#include_next <sched.h>
-
-// Android 5.0.0 (API 21) NDK
-
-#if !defined(SCHED_BATCH)
-#define SCHED_BATCH 3
-#endif
-
-#if !defined(SCHED_IDLE)
-#define SCHED_IDLE 5
-#endif
-
-#endif  // CRASHPAD_COMPAT_ANDROID_SCHED_H_
diff --git a/Tools/Crashpad/include/compat/android/sys/epoll.h b/Tools/Crashpad/include/compat/android/sys/epoll.h
deleted file mode 100644
index 387813e6a5..0000000000
--- a/Tools/Crashpad/include/compat/android/sys/epoll.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_SYS_EPOLL_H_
-#define CRASHPAD_COMPAT_ANDROID_SYS_EPOLL_H_
-
-#include_next <sys/epoll.h>
-
-#include <android/api-level.h>
-#include <fcntl.h>
-
-// This is missing from traditional headers before API 21.
-#if !defined(EPOLLRDHUP)
-#define EPOLLRDHUP 0x00002000
-#endif
-
-// EPOLL_CLOEXEC is undefined in traditional headers before API 21 and removed
-// from unified headers at API levels < 21 as a means to indicate that
-// epoll_create1 is missing from the C library, but the raw system call should
-// still be available.
-#if !defined(EPOLL_CLOEXEC)
-#define EPOLL_CLOEXEC O_CLOEXEC
-#endif
-
-#if __ANDROID_API__ < 21
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int epoll_create1(int flags);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // __ANDROID_API__ < 21
-
-#endif  // CRASHPAD_COMPAT_ANDROID_SYS_EPOLL_H_
diff --git a/Tools/Crashpad/include/compat/android/sys/mman.h b/Tools/Crashpad/include/compat/android/sys/mman.h
deleted file mode 100644
index 5e7cd69f18..0000000000
--- a/Tools/Crashpad/include/compat/android/sys/mman.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_SYS_MMAN_H_
-#define CRASHPAD_COMPAT_ANDROID_SYS_MMAN_H_
-
-#include_next <sys/mman.h>
-
-#include <android/api-level.h>
-#include <sys/cdefs.h>
-
-// There’s no mmap() wrapper compatible with a 64-bit off_t for 32-bit code
-// until API 21 (Android 5.0/“Lollipop”). A custom mmap() wrapper is provided
-// here. Note that this scenario is only possible with NDK unified headers.
-//
-// https://android.googlesource.com/platform/bionic/+/0bfcbaf4d069e005d6e959d97f8d11c77722b70d/docs/32-bit-abi.md#is-32_bit-1
-
-#if defined(__USE_FILE_OFFSET64) && __ANDROID_API__ < 21
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void* mmap(void* addr, size_t size, int prot, int flags, int fd, off_t offset);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // defined(__USE_FILE_OFFSET64) && __ANDROID_API__ < 21
-
-#endif  // CRASHPAD_COMPAT_ANDROID_SYS_MMAN_H_
diff --git a/Tools/Crashpad/include/compat/android/sys/syscall.h b/Tools/Crashpad/include/compat/android/sys/syscall.h
deleted file mode 100644
index facce20f79..0000000000
--- a/Tools/Crashpad/include/compat/android/sys/syscall.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_SYS_SYSCALL_H_
-#define CRASHPAD_COMPAT_ANDROID_SYS_SYSCALL_H_
-
-#include_next <sys/syscall.h>
-
-// Android 5.0.0 (API 21) NDK
-
-#if !defined(SYS_epoll_create1)
-#define SYS_epoll_create1 __NR_epoll_create1
-#endif
-
-#if !defined(SYS_gettid)
-#define SYS_gettid __NR_gettid
-#endif
-
-#if !defined(SYS_timer_create)
-#define SYS_timer_create __NR_timer_create
-#endif
-
-#if !defined(SYS_timer_getoverrun)
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#endif
-
-#if !defined(SYS_timer_settime)
-#define SYS_timer_settime __NR_timer_settime
-#endif
-
-#endif  // CRASHPAD_COMPAT_ANDROID_SYS_SYSCALL_H_
diff --git a/Tools/Crashpad/include/compat/android/sys/user.h b/Tools/Crashpad/include/compat/android/sys/user.h
deleted file mode 100644
index 4352a20677..0000000000
--- a/Tools/Crashpad/include/compat/android/sys/user.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_ANDROID_SYS_USER_H_
-#define CRASHPAD_COMPAT_ANDROID_SYS_USER_H_
-
-// This is needed for traditional headers.
-#include <sys/types.h>
-
-#include_next <sys/user.h>
-
-#endif  // CRASHPAD_COMPAT_ANDROID_SYS_USER_H_
diff --git a/Tools/Crashpad/include/compat/linux/signal.h b/Tools/Crashpad/include/compat/linux/signal.h
deleted file mode 100644
index 62b9c08636..0000000000
--- a/Tools/Crashpad/include/compat/linux/signal.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_LINUX_SIGNAL_H_
-#define CRASHPAD_COMPAT_LINUX_SIGNAL_H_
-
-#include_next <signal.h>
-
-// Missing from glibc and bionic-x86_64
-#if defined(__x86_64__) || defined(__i386__)
-#if !defined(X86_FXSR_MAGIC)
-#define X86_FXSR_MAGIC 0x0000
-#endif
-#endif  // __x86_64__ || __i386__
-
-#endif  // CRASHPAD_COMPAT_LINUX_SIGNAL_H_
diff --git a/Tools/Crashpad/include/compat/linux/sys/ptrace.h b/Tools/Crashpad/include/compat/linux/sys/ptrace.h
deleted file mode 100644
index e68125b5b1..0000000000
--- a/Tools/Crashpad/include/compat/linux/sys/ptrace.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_LINUX_SYS_PTRACE_H_
-#define CRASHPAD_COMPAT_LINUX_SYS_PTRACE_H_
-
-#include_next <sys/ptrace.h>
-
-#include <sys/cdefs.h>
-
-// https://sourceware.org/bugzilla/show_bug.cgi?id=22433
-#if !defined(PTRACE_GET_THREAD_AREA) && \
-    defined(__GLIBC__) && (defined(__i386__) || defined(__x86_64__))
-static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
-    static_cast<__ptrace_request>(25);
-#define PTRACE_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
-#endif  // !PTRACE_GET_THREAD_AREA && __GLIBC__ && (__i386__ || __x86_64__)
-
-#endif  // CRASHPAD_COMPAT_LINUX_SYS_PTRACE_H_
diff --git a/Tools/Crashpad/include/compat/mac/AvailabilityMacros.h b/Tools/Crashpad/include/compat/mac/AvailabilityMacros.h
deleted file mode 100644
index f105f944e3..0000000000
--- a/Tools/Crashpad/include/compat/mac/AvailabilityMacros.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_MAC_AVAILABILITYMACROS_H_
-#define CRASHPAD_COMPAT_MAC_AVAILABILITYMACROS_H_
-
-#include_next <AvailabilityMacros.h>
-
-// 10.7 SDK
-
-#ifndef MAC_OS_X_VERSION_10_7
-#define MAC_OS_X_VERSION_10_7 1070
-#endif
-
-// 10.8 SDK
-
-#ifndef MAC_OS_X_VERSION_10_8
-#define MAC_OS_X_VERSION_10_8 1080
-#endif
-
-// 10.9 SDK
-
-#ifndef MAC_OS_X_VERSION_10_9
-#define MAC_OS_X_VERSION_10_9 1090
-#endif
-
-// 10.10 SDK
-
-#ifndef MAC_OS_X_VERSION_10_10
-#define MAC_OS_X_VERSION_10_10 101000
-#endif
-
-// 10.11 SDK
-
-#ifndef MAC_OS_X_VERSION_10_11
-#define MAC_OS_X_VERSION_10_11 101100
-#endif
-
-// 10.12 SDK
-
-#ifndef MAC_OS_X_VERSION_10_12
-#define MAC_OS_X_VERSION_10_12 101200
-#endif
-
-// 10.13 SDK
-
-#ifndef MAC_OS_X_VERSION_10_13
-#define MAC_OS_X_VERSION_10_13 101300
-#endif
-
-#endif  // CRASHPAD_COMPAT_MAC_AVAILABILITYMACROS_H_
diff --git a/Tools/Crashpad/include/compat/mac/kern/exc_resource.h b/Tools/Crashpad/include/compat/mac/kern/exc_resource.h
deleted file mode 100644
index ca8943d37d..0000000000
--- a/Tools/Crashpad/include/compat/mac/kern/exc_resource.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_MAC_KERN_EXC_RESOURCE_H_
-#define CRASHPAD_COMPAT_MAC_KERN_EXC_RESOURCE_H_
-
-#if __has_include_next(<kern/exc_resource.h>)
-#include_next <kern/exc_resource.h>
-#endif
-
-// 10.9 SDK
-
-#ifndef EXC_RESOURCE_DECODE_RESOURCE_TYPE
-#define EXC_RESOURCE_DECODE_RESOURCE_TYPE(code) (((code) >> 61) & 0x7ull)
-#endif
-
-#ifndef EXC_RESOURCE_DECODE_FLAVOR
-#define EXC_RESOURCE_DECODE_FLAVOR(code) (((code) >> 58) & 0x7ull)
-#endif
-
-#ifndef RESOURCE_TYPE_CPU
-#define RESOURCE_TYPE_CPU 1
-#endif
-
-#ifndef RESOURCE_TYPE_WAKEUPS
-#define RESOURCE_TYPE_WAKEUPS 2
-#endif
-
-#ifndef RESOURCE_TYPE_MEMORY
-#define RESOURCE_TYPE_MEMORY 3
-#endif
-
-#ifndef FLAVOR_CPU_MONITOR
-#define FLAVOR_CPU_MONITOR 1
-#endif
-
-#ifndef FLAVOR_WAKEUPS_MONITOR
-#define FLAVOR_WAKEUPS_MONITOR 1
-#endif
-
-#ifndef FLAVOR_HIGH_WATERMARK
-#define FLAVOR_HIGH_WATERMARK 1
-#endif
-
-// 10.10 SDK
-
-#ifndef FLAVOR_CPU_MONITOR_FATAL
-#define FLAVOR_CPU_MONITOR_FATAL 2
-#endif
-
-// 10.12 SDK
-
-#ifndef RESOURCE_TYPE_IO
-#define RESOURCE_TYPE_IO 4
-#endif
-
-#ifndef FLAVOR_IO_PHYSICAL_WRITES
-#define FLAVOR_IO_PHYSICAL_WRITES 1
-#endif
-
-#ifndef FLAVOR_IO_LOGICAL_WRITES
-#define FLAVOR_IO_LOGICAL_WRITES 2
-#endif
-
-#endif  // CRASHPAD_COMPAT_MAC_KERN_EXC_RESOURCE_H_
diff --git a/Tools/Crashpad/include/compat/mac/mach-o/loader.h b/Tools/Crashpad/include/compat/mac/mach-o/loader.h
deleted file mode 100644
index 95a735747f..0000000000
--- a/Tools/Crashpad/include/compat/mac/mach-o/loader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_MAC_MACH_O_LOADER_H_
-#define CRASHPAD_COMPAT_MAC_MACH_O_LOADER_H_
-
-#include_next <mach-o/loader.h>
-
-// 10.7 SDK
-
-#ifndef S_THREAD_LOCAL_ZEROFILL
-#define S_THREAD_LOCAL_ZEROFILL 0x12
-#endif
-
-// 10.8 SDK
-
-#ifndef LC_SOURCE_VERSION
-#define LC_SOURCE_VERSION 0x2a
-#endif
-
-#endif  // CRASHPAD_COMPAT_MAC_MACH_O_LOADER_H_
diff --git a/Tools/Crashpad/include/compat/mac/mach/i386/thread_state.h b/Tools/Crashpad/include/compat/mac/mach/i386/thread_state.h
deleted file mode 100644
index de744d64de..0000000000
--- a/Tools/Crashpad/include/compat/mac/mach/i386/thread_state.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_MAC_MACH_I386_THREAD_STATE_H_
-#define CRASHPAD_COMPAT_MAC_MACH_I386_THREAD_STATE_H_
-
-#include_next <mach/i386/thread_state.h>
-
-// 10.13 SDK
-//
-// This was defined as 244 in the 10.7 through 10.12 SDKs, and 144 previously.
-#if I386_THREAD_STATE_MAX < 614
-#undef I386_THREAD_STATE_MAX
-#define I386_THREAD_STATE_MAX (614)
-#endif
-
-#endif  // CRASHPAD_COMPAT_MAC_MACH_I386_THREAD_STATE_H_
diff --git a/Tools/Crashpad/include/compat/mac/mach/mach.h b/Tools/Crashpad/include/compat/mac/mach/mach.h
deleted file mode 100644
index 55f5fdd2e2..0000000000
--- a/Tools/Crashpad/include/compat/mac/mach/mach.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_MAC_MACH_MACH_H_
-#define CRASHPAD_COMPAT_MAC_MACH_MACH_H_
-
-#include_next <mach/mach.h>
-
-// <mach/exception_types.h>
-
-// 10.8 SDK
-
-#ifndef EXC_RESOURCE
-#define EXC_RESOURCE 11
-#endif
-
-#ifndef EXC_MASK_RESOURCE
-#define EXC_MASK_RESOURCE (1 << EXC_RESOURCE)
-#endif
-
-// 10.9 SDK
-
-#ifndef EXC_GUARD
-#define EXC_GUARD 12
-#endif
-
-#ifndef EXC_MASK_GUARD
-#define EXC_MASK_GUARD (1 << EXC_GUARD)
-#endif
-
-// 10.11 SDK
-
-#ifndef EXC_CORPSE_NOTIFY
-#define EXC_CORPSE_NOTIFY 13
-#endif
-
-#ifndef EXC_MASK_CORPSE_NOTIFY
-#define EXC_MASK_CORPSE_NOTIFY (1 << EXC_CORPSE_NOTIFY)
-#endif
-
-// Don’t expose EXC_MASK_ALL at all, because its definition varies with SDK, and
-// older kernels will reject values that they don’t understand. Instead, use
-// crashpad::ExcMaskAll(), which computes the correct value of EXC_MASK_ALL for
-// the running system.
-#undef EXC_MASK_ALL
-
-#if defined(__i386__) || defined(__x86_64__)
-
-// <mach/i386/exception.h>
-
-// 10.11 SDK
-
-#if EXC_TYPES_COUNT > 14  // Definition varies with SDK
-#error Update this file for new exception types
-#elif EXC_TYPES_COUNT != 14
-#undef EXC_TYPES_COUNT
-#define EXC_TYPES_COUNT 14
-#endif
-
-// <mach/i386/thread_status.h>
-
-// 10.6 SDK
-//
-// Earlier versions of this SDK didn’t have AVX definitions. They didn’t appear
-// until the version of the 10.6 SDK that shipped with Xcode 4.2, although
-// versions of this SDK appeared with Xcode releases as early as Xcode 3.2.
-// Similarly, the kernel didn’t handle AVX state until Mac OS X 10.6.8
-// (xnu-1504.15.3) and presumably the hardware-specific versions of Mac OS X
-// 10.6.7 intended to run on processors with AVX.
-
-#ifndef x86_AVX_STATE32
-#define x86_AVX_STATE32 16
-#endif
-
-#ifndef x86_AVX_STATE64
-#define x86_AVX_STATE64 17
-#endif
-
-// 10.8 SDK
-
-#ifndef x86_AVX_STATE
-#define x86_AVX_STATE 18
-#endif
-
-// 10.13 SDK
-
-#ifndef x86_AVX512_STATE32
-#define x86_AVX512_STATE32 19
-#endif
-
-#ifndef x86_AVX512_STATE64
-#define x86_AVX512_STATE64 20
-#endif
-
-#ifndef x86_AVX512_STATE
-#define x86_AVX512_STATE 21
-#endif
-
-#endif  // defined(__i386__) || defined(__x86_64__)
-
-// <mach/thread_status.h>
-
-// 10.8 SDK
-
-#ifndef THREAD_STATE_FLAVOR_LIST_10_9
-#define THREAD_STATE_FLAVOR_LIST_10_9 129
-#endif
-
-#endif  // CRASHPAD_COMPAT_MAC_MACH_MACH_H_
diff --git a/Tools/Crashpad/include/compat/mac/sys/resource.h b/Tools/Crashpad/include/compat/mac/sys/resource.h
deleted file mode 100644
index 0697e169b5..0000000000
--- a/Tools/Crashpad/include/compat/mac/sys/resource.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_MAC_SYS_RESOURCE_H_
-#define CRASHPAD_COMPAT_MAC_SYS_RESOURCE_H_
-
-#include_next <sys/resource.h>
-
-// 10.9 SDK
-
-#ifndef WAKEMON_MAKE_FATAL
-#define WAKEMON_MAKE_FATAL 0x10
-#endif
-
-#endif  // CRASHPAD_COMPAT_MAC_SYS_RESOURCE_H_
diff --git a/Tools/Crashpad/include/compat/non_mac/mach/mach.h b/Tools/Crashpad/include/compat/non_mac/mach/mach.h
deleted file mode 100644
index f33bb10f38..0000000000
--- a/Tools/Crashpad/include/compat/non_mac/mach/mach.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_NON_MAC_MACH_MACH_H_
-#define CRASHPAD_COMPAT_NON_MAC_MACH_MACH_H_
-
-//! \file
-
-// <mach/exception_types.h>
-
-//! \anchor EXC_x
-//! \name EXC_*
-//!
-//! \brief Mach exception type definitions.
-//! \{
-#define EXC_BAD_ACCESS 1
-#define EXC_BAD_INSTRUCTION 2
-#define EXC_ARITHMETIC 3
-#define EXC_EMULATION 4
-#define EXC_SOFTWARE 5
-#define EXC_BREAKPOINT 6
-#define EXC_SYSCALL 7
-#define EXC_MACH_SYSCALL 8
-#define EXC_RPC_ALERT 9
-#define EXC_CRASH 10
-#define EXC_RESOURCE 11
-#define EXC_GUARD 12
-#define EXC_CORPSE_NOTIFY 13
-
-#define EXC_TYPES_COUNT 14
-//! \}
-
-#endif  // CRASHPAD_COMPAT_NON_MAC_MACH_MACH_H_
diff --git a/Tools/Crashpad/include/compat/non_win/dbghelp.h b/Tools/Crashpad/include/compat/non_win/dbghelp.h
deleted file mode 100644
index 5ce88b886b..0000000000
--- a/Tools/Crashpad/include/compat/non_win/dbghelp.h
+++ /dev/null
@@ -1,1106 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_
-#define CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_
-
-#include <stdint.h>
-
-#include "base/strings/string16.h"
-#include "compat/non_win/timezoneapi.h"
-#include "compat/non_win/verrsrc.h"
-#include "compat/non_win/winnt.h"
-
-//! \file
-
-//! \brief The magic number for a minidump file, stored in
-//!     MINIDUMP_HEADER::Signature.
-//!
-//! A hex dump of a little-endian minidump file will begin with the string
-//! “MDMP”.
-#define MINIDUMP_SIGNATURE ('PMDM')  // 0x4d444d50
-
-//! \brief The version of a minidump file, stored in MINIDUMP_HEADER::Version.
-#define MINIDUMP_VERSION (42899)
-
-//! \brief An offset within a minidump file, relative to the start of its
-//!     MINIDUMP_HEADER.
-//!
-//! RVA stands for “relative virtual address”. Within a minidump file, RVAs are
-//! used as pointers to link structures together.
-//!
-//! \sa MINIDUMP_LOCATION_DESCRIPTOR
-typedef uint32_t RVA;
-
-//! \brief A pointer to a structure or union within a minidump file.
-struct __attribute__((packed, aligned(4))) MINIDUMP_LOCATION_DESCRIPTOR {
-  //! \brief The size of the referenced structure or union, in bytes.
-  uint32_t DataSize;
-
-  //! \brief The relative virtual address of the structure or union within the
-  //!     minidump file.
-  RVA Rva;
-};
-
-//! \brief A pointer to a snapshot of a region of memory contained within a
-//!     minidump file.
-//!
-//! \sa MINIDUMP_MEMORY_LIST
-struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_DESCRIPTOR {
-  //! \brief The base address of the memory region in the address space of the
-  //!     process that the minidump file contains a snapshot of.
-  uint64_t StartOfMemoryRange;
-
-  //! \brief The contents of the memory region.
-  MINIDUMP_LOCATION_DESCRIPTOR Memory;
-};
-
-//! \brief The top-level structure identifying a minidump file.
-//!
-//! This structure contains a pointer to the stream directory, a second-level
-//! structure which in turn contains pointers to third-level structures
-//! (“streams”) containing the data within the minidump file. This structure
-//! also contains the minidump file’s magic numbers, and other bookkeeping data.
-//!
-//! This structure must be present at the beginning of a minidump file (at ::RVA
-//! 0).
-struct __attribute__((packed, aligned(4))) MINIDUMP_HEADER {
-  //! \brief The minidump file format magic number, ::MINIDUMP_SIGNATURE.
-  uint32_t Signature;
-
-  //! \brief The minidump file format version number, ::MINIDUMP_VERSION.
-  uint32_t Version;
-
-  //! \brief The number of MINIDUMP_DIRECTORY elements present in the directory
-  //!     referenced by #StreamDirectoryRva.
-  uint32_t NumberOfStreams;
-
-  //! \brief A pointer to an array of MINIDUMP_DIRECTORY structures that
-  //!     identify all of the streams within this minidump file. The array has
-  //!     #NumberOfStreams elements present.
-  RVA StreamDirectoryRva;
-
-  //! \brief The minidump file’s checksum. This can be `0`, and in practice, `0`
-  //!     is the only value that has ever been seen in this field.
-  uint32_t CheckSum;
-
-  //! \brief The time that the minidump file was generated, in `time_t` format,
-  //!     the number of seconds since the POSIX epoch.
-  uint32_t TimeDateStamp;
-
-  //! \brief A bitfield containing members of ::MINIDUMP_TYPE, describing the
-  //!     types of data carried within this minidump file.
-  uint64_t Flags;
-};
-
-//! \brief A pointer to a stream within a minidump file.
-//!
-//! Each stream present in a minidump file will have a corresponding
-//! MINIDUMP_DIRECTORY entry in the stream directory referenced by
-//! MINIDUMP_HEADER::StreamDirectoryRva.
-struct __attribute__((packed, aligned(4))) MINIDUMP_DIRECTORY {
-  //! \brief The type of stream referenced, a value of ::MINIDUMP_STREAM_TYPE.
-  uint32_t StreamType;
-
-  //! \brief A pointer to the stream data within the minidump file.
-  MINIDUMP_LOCATION_DESCRIPTOR Location;
-};
-
-//! \brief A variable-length UTF-16-encoded string carried within a minidump
-//!     file.
-//!
-//! The UTF-16 string is stored as UTF-16LE or UTF-16BE according to the byte
-//! ordering of the minidump file itself.
-//!
-//! \sa crashpad::MinidumpUTF8String
-struct __attribute__((packed, aligned(4))) MINIDUMP_STRING {
-  //! \brief The length of the #Buffer field in bytes, not including the `NUL`
-  //!     terminator.
-  //!
-  //! \note This field is interpreted as a byte count, not a count of UTF-16
-  //!     code units or Unicode code points.
-  uint32_t Length;
-
-  //! \brief The string, encoded in UTF-16, and terminated with a UTF-16 `NUL`
-  //!     code unit (two `NUL` bytes).
-  base::char16 Buffer[0];
-};
-
-//! \brief Minidump stream type values for MINIDUMP_DIRECTORY::StreamType. Each
-//!     stream structure has a corresponding stream type value to identify it.
-//!
-//! \sa crashpad::MinidumpStreamType
-enum MINIDUMP_STREAM_TYPE {
-  //! \brief The stream type for MINIDUMP_THREAD_LIST.
-  ThreadListStream = 3,
-
-  //! \brief The stream type for MINIDUMP_MODULE_LIST.
-  ModuleListStream = 4,
-
-  //! \brief The stream type for MINIDUMP_MEMORY_LIST.
-  MemoryListStream = 5,
-
-  //! \brief The stream type for MINIDUMP_EXCEPTION_STREAM.
-  ExceptionStream = 6,
-
-  //! \brief The stream type for MINIDUMP_SYSTEM_INFO.
-  SystemInfoStream = 7,
-
-  //! \brief The stream contains information about active `HANDLE`s.
-  HandleDataStream = 12,
-
-  //! \brief The stream type for MINIDUMP_UNLOADED_MODULE_LIST.
-  UnloadedModuleListStream = 14,
-
-  //! \brief The stream type for MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2,
-  //!     MINIDUMP_MISC_INFO_3, MINIDUMP_MISC_INFO_4, and MINIDUMP_MISC_INFO_5.
-  //!
-  //! More recent versions of this stream are supersets of earlier versions.
-  //!
-  //! The exact version of the stream that is present is implied by the stream’s
-  //! size. Furthermore, this stream contains a field,
-  //! MINIDUMP_MISC_INFO::Flags1, that indicates which data is present and
-  //! valid.
-  MiscInfoStream = 15,
-
-  //! \brief The stream type for MINIDUMP_MEMORY_INFO_LIST.
-  MemoryInfoListStream = 16,
-
-  //! \brief Values greater than this value will not be used by the system
-  //!     and can be used for custom user data streams.
-  LastReservedStream = 0xffff,
-};
-
-//! \brief Information about the CPU (or CPUs) that ran the process that the
-//!     minidump file contains a snapshot of.
-//!
-//! This union only appears as MINIDUMP_SYSTEM_INFO::Cpu. Its interpretation is
-//! controlled by MINIDUMP_SYSTEM_INFO::ProcessorArchitecture.
-union __attribute__((packed, aligned(4))) CPU_INFORMATION {
-  //! \brief Information about 32-bit x86 CPUs, or x86_64 CPUs when running
-  //!     32-bit x86 processes.
-  struct __attribute__((packed, aligned(4))) {
-    //! \brief The CPU’s vendor identification string as encoded in `cpuid 0`
-    //!     `ebx`, `edx`, and `ecx`, represented as it appears in these
-    //!     registers.
-    //!
-    //! For Intel CPUs, `[0]` will encode “Genu”, `[1]` will encode “ineI”, and
-    //! `[2]` will encode “ntel”, for a vendor ID string “GenuineIntel”.
-    //!
-    //! \note The Windows documentation incorrectly states that these fields are
-    //!     to be interpreted as `cpuid 0` `eax`, `ebx`, and `ecx`.
-    uint32_t VendorId[3];
-
-    //! \brief Family, model, and stepping ID values as encoded in `cpuid 1`
-    //!     `eax`.
-    uint32_t VersionInformation;
-
-    //! \brief A bitfield containing supported CPU capabilities as encoded in
-    //!     `cpuid 1` `edx`.
-    uint32_t FeatureInformation;
-
-    //! \brief A bitfield containing supported CPU capabalities as encoded in
-    //!     `cpuid 0x80000001` `edx`.
-    //!
-    //! This field is only valid if #VendorId identifies the CPU vendor as
-    //! “AuthenticAMD”.
-    uint32_t AMDExtendedCpuFeatures;
-  } X86CpuInfo;
-
-  //! \brief Information about non-x86 CPUs, and x86_64 CPUs when not running
-  //!     32-bit x86 processes.
-  struct __attribute__((packed, aligned(4))) {
-    //! \brief Bitfields containing supported CPU capabilities as identified by
-    //!     bits corresponding to \ref PF_x "PF_*" values passed to
-    //!     `IsProcessorFeaturePresent()`.
-    uint64_t ProcessorFeatures[2];
-  } OtherCpuInfo;
-};
-
-//! \brief Information about the system that hosted the process that the
-//!     minidump file contains a snapshot of.
-struct __attribute__((packed, aligned(4))) MINIDUMP_SYSTEM_INFO {
-  // The next 4 fields are from the SYSTEM_INFO structure returned by
-  // GetSystemInfo().
-
-  //! \brief The system’s CPU architecture. This may be a \ref
-  //!     PROCESSOR_ARCHITECTURE_x "PROCESSOR_ARCHITECTURE_*" value, or a member
-  //!     of crashpad::MinidumpCPUArchitecture.
-  //!
-  //! In some cases, a system may be able to run processes of multiple specific
-  //! architecture types. For example, systems based on 64-bit architectures
-  //! such as x86_64 are often able to run 32-bit code of another architecture
-  //! in the same family, such as 32-bit x86. On these systems, this field will
-  //! identify the architecture of the process that the minidump file contains a
-  //! snapshot of.
-  uint16_t ProcessorArchitecture;
-
-  //! \brief General CPU version information.
-  //!
-  //! The precise interpretation of this field is specific to each CPU
-  //! architecture. For x86-family CPUs (including x86_64 and 32-bit x86), this
-  //! field contains the CPU family ID value from `cpuid 1` `eax`, adjusted to
-  //! take the extended family ID into account.
-  uint16_t ProcessorLevel;
-
-  //! \brief Specific CPU version information.
-  //!
-  //! The precise interpretation of this field is specific to each CPU
-  //! architecture. For x86-family CPUs (including x86_64 and 32-bit x86), this
-  //! field contains values obtained from `cpuid 1` `eax`: the high byte
-  //! contains the CPU model ID value adjusted to take the extended model ID
-  //! into account, and the low byte contains the CPU stepping ID value.
-  uint16_t ProcessorRevision;
-
-  //! \brief The total number of CPUs present in the system.
-  uint8_t NumberOfProcessors;
-
-  // The next 7 fields are from the OSVERSIONINFOEX structure returned by
-  // GetVersionEx().
-
-  //! \brief The system’s operating system type, which distinguishes between
-  //!     “desktop” or “workstation” systems and “server” systems. This may be a
-  //!     \ref VER_NT_x "VER_NT_*" value, or a member of
-  //!     crashpad::MinidumpOSType.
-  uint8_t ProductType;
-
-  //! \brief The system’s operating system version number’s first (major)
-  //!     component.
-  //!
-  //!  - For Windows 7 (NT 6.1) SP1, version 6.1.7601, this would be `6`.
-  //!  - For macOS 10.12.1, this would be `10`.
-  uint32_t MajorVersion;
-
-  //! \brief The system’s operating system version number’s second (minor)
-  //!     component.
-  //!
-  //!  - For Windows 7 (NT 6.1) SP1, version 6.1.7601, this would be `1`.
-  //!  - For macOS 10.12.1, this would be `12`.
-  uint32_t MinorVersion;
-
-  //! \brief The system’s operating system version number’s third (build or
-  //!     patch) component.
-  //!
-  //!  - For Windows 7 (NT 6.1) SP1, version 6.1.7601, this would be `7601`.
-  //!  - For macOS 10.12.1, this would be `1`.
-  uint32_t BuildNumber;
-
-  //! \brief The system’s operating system family. This may be a \ref
-  //!     VER_PLATFORM_x "VER_PLATFORM_*" value, or a member of
-  //!     crashpad::MinidumpOS.
-  uint32_t PlatformId;
-
-  //! \brief ::RVA of a MINIDUMP_STRING containing operating system-specific
-  //!     version information.
-  //!
-  //! This field further identifies an operating system version beyond its
-  //! version number fields. Historically, “CSD” stands for “corrective service
-  //! diskette.”
-  //!
-  //!  - On Windows, this is the name of the installed operating system service
-  //!    pack, such as “Service Pack 1”. If no service pack is installed, this
-  //!    field references an empty string.
-  //!  - On macOS, this is the operating system build number from `sw_vers
-  //!    -buildVersion`. For macOS 10.12.1 on most hardware types, this would
-  //!    be `16B2657`.
-  //!  - On Linux and other Unix-like systems, this is the kernel version from
-  //!    `uname -srvm`, possibly with additional information appended. On
-  //!    Android, the `ro.build.fingerprint` system property is appended.
-  RVA CSDVersionRva;
-
-  //! \brief A bitfield identifying products installed on the system. This is
-  //!     composed of \ref VER_SUITE_x "VER_SUITE_*" values.
-  //!
-  //! This field is Windows-specific, and has no meaning on other operating
-  //! systems.
-  uint16_t SuiteMask;
-
-  uint16_t Reserved2;
-
-  //! \brief Information about the system’s CPUs.
-  //!
-  //! This field is a union. Which of its members should be expressed is
-  //! controlled by the #ProcessorArchitecture field. If it is set to
-  //! crashpad::kMinidumpCPUArchitectureX86, the CPU_INFORMATION::X86CpuInfo
-  //! field is expressed. Otherwise, the CPU_INFORMATION::OtherCpuInfo field is
-  //! expressed.
-  //!
-  //! \note Older Breakpad implementations produce minidump files that express
-  //!     CPU_INFORMATION::X86CpuInfo when #ProcessorArchitecture is set to
-  //!     crashpad::kMinidumpCPUArchitectureAMD64. Minidump files produced by
-  //!     `dbghelp.dll` on Windows express CPU_INFORMATION::OtherCpuInfo in this
-  //!     case.
-  CPU_INFORMATION Cpu;
-};
-
-//! \brief Information about a specific thread within the process.
-//!
-//! \sa MINIDUMP_THREAD_LIST
-struct __attribute__((packed, aligned(4))) MINIDUMP_THREAD {
-  //! \brief The thread’s ID. This may be referenced by
-  //!     MINIDUMP_EXCEPTION_STREAM::ThreadId.
-  uint32_t ThreadId;
-
-  //! \brief The thread’s suspend count.
-  //!
-  //! This field will be `0` if the thread is schedulable (not suspended).
-  uint32_t SuspendCount;
-
-  //! \brief The thread’s priority class.
-  //!
-  //! On Windows, this is a `*_PRIORITY_CLASS` value. `NORMAL_PRIORITY_CLASS`
-  //! has value `0x20`; higher priority classes have higher values.
-  uint32_t PriorityClass;
-
-  //! \brief The thread’s priority level.
-  //!
-  //! On Windows, this is a `THREAD_PRIORITY_*` value. `THREAD_PRIORITY_NORMAL`
-  //! has value `0`; higher priorities have higher values, and lower priorities
-  //! have lower (negative) values.
-  uint32_t Priority;
-
-  //! \brief The address of the thread’s thread environment block in the address
-  //!     space of the process that the minidump file contains a snapshot of.
-  //!
-  //! The thread environment block contains thread-local data.
-  //!
-  //! A MINIDUMP_MEMORY_DESCRIPTOR may be present in the MINIDUMP_MEMORY_LIST
-  //! stream containing the thread-local data pointed to by this field.
-  uint64_t Teb;
-
-  //! \brief A snapshot of the thread’s stack.
-  //!
-  //! A MINIDUMP_MEMORY_DESCRIPTOR may be present in the MINIDUMP_MEMORY_LIST
-  //! stream containing a pointer to the same memory range referenced by this
-  //! field.
-  MINIDUMP_MEMORY_DESCRIPTOR Stack;
-
-  //! \brief A pointer to a CPU-specific CONTEXT structure containing the
-  //!     thread’s context at the time the snapshot was taken.
-  //!
-  //! If the minidump file was generated as a result of an exception taken on
-  //! this thread, this field may identify a different context than the
-  //! exception context. For these minidump files, a MINIDUMP_EXCEPTION_STREAM
-  //! stream will be present, and the context contained within that stream will
-  //! be the exception context.
-  //!
-  //! The interpretation of the context structure is dependent on the CPU
-  //! architecture identified by MINIDUMP_SYSTEM_INFO::ProcessorArchitecture.
-  //! For crashpad::kMinidumpCPUArchitectureX86, this will be
-  //! crashpad::MinidumpContextX86. For crashpad::kMinidumpCPUArchitectureAMD64,
-  //! this will be crashpad::MinidumpContextAMD64.
-  MINIDUMP_LOCATION_DESCRIPTOR ThreadContext;
-};
-
-//! \brief Information about all threads within the process.
-struct __attribute__((packed, aligned(4))) MINIDUMP_THREAD_LIST {
-  //! \brief The number of threads present in the #Threads array.
-  uint32_t NumberOfThreads;
-
-  //! \brief Structures identifying each thread within the process.
-  MINIDUMP_THREAD Threads[0];
-};
-
-//! \brief Information about an exception that occurred in the process.
-struct __attribute__((packed, aligned(4))) MINIDUMP_EXCEPTION {
-  //! \brief The top-level exception code identifying the exception, in
-  //!     operating system-specific values.
-  //!
-  //! For macOS minidumps, this will be an \ref EXC_x "EXC_*" exception type,
-  //! such as `EXC_BAD_ACCESS`. `EXC_CRASH` will not appear here for exceptions
-  //! processed as `EXC_CRASH` when generated from another preceding exception:
-  //! the original exception code will appear instead. The exception type as it
-  //! was received will appear at index 0 of #ExceptionInformation.
-  //!
-  //! For Windows minidumps, this will be an `EXCEPTION_*` exception type, such
-  //! as `EXCEPTION_ACCESS_VIOLATION`.
-  //!
-  //! \note This field is named ExceptionCode, but what is known as the
-  //!     “exception code” on macOS/Mach is actually stored in the
-  //!     #ExceptionFlags field of a minidump file.
-  //!
-  //! \todo Document the possible values by OS. There may be OS-specific enums
-  //!     in minidump_extensions.h.
-  uint32_t ExceptionCode;
-
-  //! \brief Additional exception flags that further identify the exception, in
-  //!     operating system-specific values.
-  //!
-  //! For macOS minidumps, this will be the value of the exception code at index
-  //! 0 as received by a Mach exception handler, except:
-  //!  * For exception type `EXC_CRASH` generated from another preceding
-  //!    exception, the original exception code will appear here, not the code
-  //!    as received by the Mach exception handler.
-  //!  * For exception types `EXC_RESOURCE` and `EXC_GUARD`, the high 32 bits of
-  //!    the code received by the Mach exception handler will appear here.
-  //!
-  //! In all cases for macOS minidumps, the code as it was received by the Mach
-  //! exception handler will appear at index 1 of #ExceptionInformation.
-  //!
-  //! For Windows minidumps, this will either be `0` if the exception is
-  //! continuable, or `EXCEPTION_NONCONTINUABLE` to indicate a noncontinuable
-  //! exception.
-  //!
-  //! \todo Document the possible values by OS. There may be OS-specific enums
-  //!     in minidump_extensions.h.
-  uint32_t ExceptionFlags;
-
-  //! \brief An address, in the address space of the process that this minidump
-  //!     file contains a snapshot of, of another MINIDUMP_EXCEPTION. This field
-  //!     is used for nested exceptions.
-  uint64_t ExceptionRecord;
-
-  //! \brief The address that caused the exception.
-  //!
-  //! This may be the address that caused a fault on data access, or it may be
-  //! the instruction pointer that contained an offending instruction.
-  uint64_t ExceptionAddress;
-
-  //! \brief The number of valid elements in #ExceptionInformation.
-  uint32_t NumberParameters;
-
-  uint32_t __unusedAlignment;
-
-  //! \brief Additional information about the exception, specific to the
-  //!     operating system and possibly the #ExceptionCode.
-  //!
-  //! For macOS minidumps, this will contain the exception type as received by a
-  //! Mach exception handler and the values of the `codes[0]` and `codes[1]`
-  //! (exception code and subcode) parameters supplied to the Mach exception
-  //! handler. Unlike #ExceptionCode and #ExceptionFlags, the values received by
-  //! a Mach exception handler are used directly here even for the `EXC_CRASH`,
-  //! `EXC_RESOURCE`, and `EXC_GUARD` exception types.
-
-  //! For Windows, these are additional arguments (if any) as provided to
-  //! `RaiseException()`.
-  uint64_t ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
-};
-
-//! \brief Information about the exception that triggered a minidump file’s
-//!     generation.
-struct __attribute__((packed, aligned(4))) MINIDUMP_EXCEPTION_STREAM {
-  //! \brief The ID of the thread that caused the exception.
-  //!
-  //! \sa MINIDUMP_THREAD::ThreadId
-  uint32_t ThreadId;
-
-  uint32_t __alignment;
-
-  //! \brief Information about the exception.
-  MINIDUMP_EXCEPTION ExceptionRecord;
-
-  //! \brief A pointer to a CPU-specific CONTEXT structure containing the
-  //!     thread’s context at the time the exception was caused.
-  //!
-  //! The interpretation of the context structure is dependent on the CPU
-  //! architecture identified by MINIDUMP_SYSTEM_INFO::ProcessorArchitecture.
-  //! For crashpad::kMinidumpCPUArchitectureX86, this will be
-  //! crashpad::MinidumpContextX86. For crashpad::kMinidumpCPUArchitectureAMD64,
-  //! this will be crashpad::MinidumpContextAMD64.
-  MINIDUMP_LOCATION_DESCRIPTOR ThreadContext;
-};
-
-//! \brief Information about a specific module loaded within the process at the
-//!     time the snapshot was taken.
-//!
-//! A module may be the main executable, a shared library, or a loadable module.
-//!
-//! \sa MINIDUMP_MODULE_LIST
-struct __attribute__((packed, aligned(4))) MINIDUMP_MODULE {
-  //! \brief The base address of the loaded module in the address space of the
-  //!     process that the minidump file contains a snapshot of.
-  uint64_t BaseOfImage;
-
-  //! \brief The size of the loaded module.
-  uint32_t SizeOfImage;
-
-  //! \brief The loaded module’s checksum, or `0` if unknown.
-  //!
-  //! On Windows, this field comes from the `CheckSum` field of the module’s
-  //! `IMAGE_OPTIONAL_HEADER` structure, if present. It reflects the checksum at
-  //! the time the module was linked.
-  uint32_t CheckSum;
-
-  //! \brief The module’s timestamp, in `time_t` units, seconds since the POSIX
-  //!     epoch, or `0` if unknown.
-  //!
-  //! On Windows, this field comes from the `TimeDateStamp` field of the
-  //! module’s `IMAGE_FILE_HEADER` structure. It reflects the timestamp at the
-  //! time the module was linked.
-  uint32_t TimeDateStamp;
-
-  //! \brief ::RVA of a MINIDUMP_STRING containing the module’s path or file
-  //!     name.
-  RVA ModuleNameRva;
-
-  //! \brief The module’s version information.
-  VS_FIXEDFILEINFO VersionInfo;
-
-  //! \brief A pointer to the module’s CodeView record, typically a link to its
-  //!     debugging information in crashpad::CodeViewRecordPDB70 format.
-  //!
-  //! The specific format of the CodeView record is indicated by its signature,
-  //! the first 32-bit value in the structure. For links to debugging
-  //! information in contemporary usage, this is normally a
-  //! crashpad::CodeViewRecordPDB70 structure, but may be a
-  //! crashpad::CodeViewRecordPDB20 structure instead. These structures identify
-  //! a link to debugging data within a `.pdb` (Program Database) file. See <a
-  //! href="http://www.debuginfo.com/articles/debuginfomatch.html#pdbfiles">Matching
-  //! Debug Information</a>, PDB Files.
-  //!
-  //! On Windows, it is also possible for the CodeView record to contain
-  //! debugging information itself, as opposed to a link to a `.pdb` file. See
-  //! <a
-  //! href="http://pierrelib.pagesperso-orange.fr/exec_formats/MS_Symbol_Type_v1.0.pdf#page=71">Microsoft
-  //! Symbol and Type Information</a>, section 7.2, “Debug Information Format”
-  //! for a list of debug information formats, and <i>Undocumented Windows 2000
-  //! Secrets</i>, Windows 2000 Debugging Support/Microsoft Symbol File
-  //! Internals/CodeView Subsections for an in-depth description of the CodeView
-  //! 4.1 format. Signatures seen in the wild include “NB09” (0x3930424e) for
-  //! CodeView 4.1 and “NB11” (0x3131424e) for CodeView 5.0. This form of
-  //! debugging information within the module, as opposed to a link to an
-  //! external `.pdb` file, is chosen by building with `/Z7` in Visual Studio
-  //! 6.0 (1998) and earlier. This embedded form of debugging information is now
-  //! considered obsolete.
-  //!
-  //! On Windows, the CodeView record is taken from a module’s
-  //! IMAGE_DEBUG_DIRECTORY entry whose Type field has the value
-  //! IMAGE_DEBUG_TYPE_CODEVIEW (`2`), if any. Records in
-  //! crashpad::CodeViewRecordPDB70 format are generated by Visual Studio .NET
-  //! (2002) (version 7.0) and later.
-  //!
-  //! When the CodeView record is not present, the fields of this
-  //! MINIDUMP_LOCATION_DESCRIPTOR will be `0`.
-  MINIDUMP_LOCATION_DESCRIPTOR CvRecord;
-
-  //! \brief A pointer to the module’s miscellaneous debugging record, a
-  //!     structure of type IMAGE_DEBUG_MISC.
-  //!
-  //! This field is Windows-specific, and has no meaning on other operating
-  //! systems. It is largely obsolete on Windows, where it was used to link to
-  //! debugging information stored in a `.dbg` file. `.dbg` files have been
-  //! superseded by `.pdb` files.
-  //!
-  //! On Windows, the miscellaneous debugging record is taken from module’s
-  //! IMAGE_DEBUG_DIRECTORY entry whose Type field has the value
-  //! IMAGE_DEBUG_TYPE_MISC (`4`), if any.
-  //!
-  //! When the miscellaneous debugging record is not present, the fields of this
-  //! MINIDUMP_LOCATION_DESCRIPTOR will be `0`.
-  //!
-  //! \sa #CvRecord
-  MINIDUMP_LOCATION_DESCRIPTOR MiscRecord;
-
-  uint64_t Reserved0;
-  uint64_t Reserved1;
-};
-
-//! \brief Information about all modules loaded within the process at the time
-//!     the snapshot was taken.
-struct __attribute__((packed, aligned(4))) MINIDUMP_MODULE_LIST {
-  //! \brief The number of modules present in the #Modules array.
-  uint32_t NumberOfModules;
-
-  //! \brief Structures identifying each module present in the minidump file.
-  MINIDUMP_MODULE Modules[0];
-};
-
-//! \brief Information about memory regions within the process.
-//!
-//! Typically, a minidump file will not contain a snapshot of a process’ entire
-//! memory image. For minidump files identified as ::MiniDumpNormal in
-//! MINIDUMP_HEADER::Flags, memory regions are limited to those referenced by
-//! MINIDUMP_THREAD::Stack fields, and a small number of others possibly related
-//! to the exception that triggered the snapshot to be taken.
-struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_LIST {
-  //! \brief The number of memory regions present in the #MemoryRanges array.
-  uint32_t NumberOfMemoryRanges;
-
-  //! \brief Structures identifying each memory region present in the minidump
-  //!     file.
-  MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges[0];
-};
-
-//! \brief Contains the state of an individual system handle at the time the
-//!     snapshot was taken. This structure is Windows-specific.
-//!
-//! \sa MINIDUMP_HANDLE_DESCRIPTOR_2
-struct __attribute__((packed, aligned(4))) MINIDUMP_HANDLE_DESCRIPTOR {
-  //! \brief The Windows `HANDLE` value.
-  uint64_t Handle;
-
-  //! \brief An RVA to a MINIDUMP_STRING structure that specifies the object
-  //!     type of the handle. This member can be zero.
-  RVA TypeNameRva;
-
-  //! \brief An RVA to a MINIDUMP_STRING structure that specifies the object
-  //!     name of the handle. This member can be zero.
-  RVA ObjectNameRva;
-
-  //! \brief The attributes for the handle, this corresponds to `OBJ_INHERIT`,
-  //!     `OBJ_CASE_INSENSITIVE`, etc.
-  uint32_t Attributes;
-
-  //! \brief The `ACCESS_MASK` for the handle.
-  uint32_t GrantedAccess;
-
-  //! \brief This is the number of open handles to the object that this handle
-  //!     refers to.
-  uint32_t HandleCount;
-
-  //! \brief This is the number kernel references to the object that this
-  //!     handle refers to.
-  uint32_t PointerCount;
-};
-
-//! \brief Contains the state of an individual system handle at the time the
-//!     snapshot was taken. This structure is Windows-specific.
-//!
-//! \sa MINIDUMP_HANDLE_DESCRIPTOR
-struct __attribute__((packed, aligned(4))) MINIDUMP_HANDLE_DESCRIPTOR_2
-    : public MINIDUMP_HANDLE_DESCRIPTOR {
-  //! \brief An RVA to a MINIDUMP_HANDLE_OBJECT_INFORMATION structure that
-  //!     specifies object-specific information. This member can be zero if
-  //!     there is no extra information.
-  RVA ObjectInfoRva;
-
-  //! \brief Must be zero.
-  uint32_t Reserved0;
-};
-
-//! \brief Represents the header for a handle data stream.
-//!
-//! A list of MINIDUMP_HANDLE_DESCRIPTOR or MINIDUMP_HANDLE_DESCRIPTOR_2
-//! structures will immediately follow in the stream.
-struct __attribute((packed, aligned(4))) MINIDUMP_HANDLE_DATA_STREAM {
-  //! \brief The size of the header information for the stream, in bytes. This
-  //!     value is `sizeof(MINIDUMP_HANDLE_DATA_STREAM)`.
-  uint32_t SizeOfHeader;
-
-  //! \brief The size of a descriptor in the stream, in bytes. This value is
-  //!     `sizeof(MINIDUMP_HANDLE_DESCRIPTOR)` or
-  //!     `sizeof(MINIDUMP_HANDLE_DESCRIPTOR_2)`.
-  uint32_t SizeOfDescriptor;
-
-  //! \brief The number of descriptors in the stream.
-  uint32_t NumberOfDescriptors;
-
-  //! \brief Must be zero.
-  uint32_t Reserved;
-};
-
-//! \brief Information about a specific module that was recorded as being
-//!     unloaded at the time the snapshot was taken.
-//!
-//! An unloaded module may be a shared library or a loadable module.
-//!
-//! \sa MINIDUMP_UNLOADED_MODULE_LIST
-struct __attribute__((packed, aligned(4))) MINIDUMP_UNLOADED_MODULE {
-  //! \brief The base address where the module was loaded in the address space
-  //!     of the process that the minidump file contains a snapshot of.
-  uint64_t BaseOfImage;
-
-  //! \brief The size of the unloaded module.
-  uint32_t SizeOfImage;
-
-  //! \brief The module’s checksum, or `0` if unknown.
-  //!
-  //! On Windows, this field comes from the `CheckSum` field of the module’s
-  //! `IMAGE_OPTIONAL_HEADER` structure, if present. It reflects the checksum at
-  //! the time the module was linked.
-  uint32_t CheckSum;
-
-  //! \brief The module’s timestamp, in `time_t` units, seconds since the POSIX
-  //!     epoch, or `0` if unknown.
-  //!
-  //! On Windows, this field comes from the `TimeDateStamp` field of the
-  //! module’s `IMAGE_FILE_HEADER` structure. It reflects the timestamp at the
-  //! time the module was linked.
-  uint32_t TimeDateStamp;
-
-  //! \brief ::RVA of a MINIDUMP_STRING containing the module’s path or file
-  //!     name.
-  RVA ModuleNameRva;
-};
-
-//! \brief Information about all modules recorded as unloaded when the snapshot
-//!     was taken.
-//!
-//! A list of MINIDUMP_UNLOADED_MODULE structures will immediately follow in the
-//! stream.
-struct __attribute__((packed, aligned(4))) MINIDUMP_UNLOADED_MODULE_LIST {
-  //! \brief The size of the header information for the stream, in bytes. This
-  //!     value is `sizeof(MINIDUMP_UNLOADED_MODULE_LIST)`.
-  uint32_t SizeOfHeader;
-
-  //! \brief The size of a descriptor in the stream, in bytes. This value is
-  //!     `sizeof(MINIDUMP_UNLOADED_MODULE)`.
-  uint32_t SizeOfEntry;
-
-  //! \brief The number of entries in the stream.
-  uint32_t NumberOfEntries;
-};
-
-//! \brief Information about XSAVE-managed state stored within CPU-specific
-//!     context structures.
-struct __attribute__((packed, aligned(4))) XSTATE_CONFIG_FEATURE_MSC_INFO {
-  //! \brief The size of this structure, in bytes. This value is
-  //!     `sizeof(XSTATE_CONFIG_FEATURE_MSC_INFO)`.
-  uint32_t SizeOfInfo;
-
-  //! \brief The size of a CPU-specific context structure carrying all XSAVE
-  //!     state components described by this structure.
-  //!
-  //! Equivalent to the value returned by `InitializeContext()` in \a
-  //! ContextLength.
-  uint32_t ContextSize;
-
-  //! \brief The XSAVE state-component bitmap, XSAVE_BV.
-  //!
-  //! See Intel Software Developer’s Manual, Volume 1: Basic Architecture
-  //! (253665-060), 13.4.2 “XSAVE Header”.
-  uint64_t EnabledFeatures;
-
-  //! \brief The location of each state component within a CPU-specific context
-  //!     structure.
-  //!
-  //! This array is indexed by bit position numbers used in #EnabledFeatures.
-  XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES];
-};
-
-//! \anchor MINIDUMP_MISCx
-//! \name MINIDUMP_MISC*
-//!
-//! \brief Field validity flag values for MINIDUMP_MISC_INFO::Flags1.
-//! \{
-
-//! \brief MINIDUMP_MISC_INFO::ProcessId is valid.
-#define MINIDUMP_MISC1_PROCESS_ID 0x00000001
-
-//! \brief The time-related fields in MINIDUMP_MISC_INFO are valid.
-//!
-//! The following fields are valid:
-//!  - MINIDUMP_MISC_INFO::ProcessCreateTime
-//!  - MINIDUMP_MISC_INFO::ProcessUserTime
-//!  - MINIDUMP_MISC_INFO::ProcessKernelTime
-#define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002
-
-//! \brief The CPU-related fields in MINIDUMP_MISC_INFO_2 are valid.
-//!
-//! The following fields are valid:
-//!  - MINIDUMP_MISC_INFO_2::ProcessorMaxMhz
-//!  - MINIDUMP_MISC_INFO_2::ProcessorCurrentMhz
-//!  - MINIDUMP_MISC_INFO_2::ProcessorMhzLimit
-//!  - MINIDUMP_MISC_INFO_2::ProcessorMaxIdleState
-//!  - MINIDUMP_MISC_INFO_2::ProcessorCurrentIdleState
-//!
-//! \note This macro should likely have been named
-//!     MINIDUMP_MISC2_PROCESSOR_POWER_INFO.
-#define MINIDUMP_MISC1_PROCESSOR_POWER_INFO 0x00000004
-
-//! \brief MINIDUMP_MISC_INFO_3::ProcessIntegrityLevel is valid.
-#define MINIDUMP_MISC3_PROCESS_INTEGRITY 0x00000010
-
-//! \brief MINIDUMP_MISC_INFO_3::ProcessExecuteFlags is valid.
-#define MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS 0x00000020
-
-//! \brief The time zone-related fields in MINIDUMP_MISC_INFO_3 are valid.
-//!
-//! The following fields are valid:
-//!  - MINIDUMP_MISC_INFO_3::TimeZoneId
-//!  - MINIDUMP_MISC_INFO_3::TimeZone
-#define MINIDUMP_MISC3_TIMEZONE 0x00000040
-
-//! \brief MINIDUMP_MISC_INFO_3::ProtectedProcess is valid.
-#define MINIDUMP_MISC3_PROTECTED_PROCESS 0x00000080
-
-//! \brief The build string-related fields in MINIDUMP_MISC_INFO_4 are valid.
-//!
-//! The following fields are valid:
-//!  - MINIDUMP_MISC_INFO_4::BuildString
-//!  - MINIDUMP_MISC_INFO_4::DbgBldStr
-#define MINIDUMP_MISC4_BUILDSTRING 0x00000100
-
-//! \brief MINIDUMP_MISC_INFO_5::ProcessCookie is valid.
-#define MINIDUMP_MISC5_PROCESS_COOKIE 0x00000200
-
-//! \}
-
-//! \brief Information about the process that the minidump file contains a
-//!     snapshot of, as well as the system that hosted that process.
-//!
-//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*"
-//! \sa MINIDUMP_MISC_INFO_2
-//! \sa MINIDUMP_MISC_INFO_3
-//! \sa MINIDUMP_MISC_INFO_4
-//! \sa MINIDUMP_MISC_INFO_5
-//! \sa MINIDUMP_MISC_INFO_N
-struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO {
-  //! \brief The size of the structure.
-  //!
-  //! This field can be used to distinguish between different versions of this
-  //! structure: MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3,
-  //! and MINIDUMP_MISC_INFO_4.
-  //!
-  //! \sa Flags1
-  uint32_t SizeOfInfo;
-
-  //! \brief A bit field of \ref MINIDUMP_MISCx "MINIDUMP_MISC*" values
-  //!     indicating which fields of this structure contain valid data.
-  uint32_t Flags1;
-
-  //! \brief The process ID of the process.
-  uint32_t ProcessId;
-
-  //! \brief The time that the process started, in `time_t` units, seconds since
-  //!     the POSIX epoch.
-  uint32_t ProcessCreateTime;
-
-  //! \brief The amount of user-mode CPU time used by the process, in seconds,
-  //!     at the time of the snapshot.
-  uint32_t ProcessUserTime;
-
-  //! \brief The amount of system-mode (kernel) CPU time used by the process, in
-  //!     seconds, at the time of the snapshot.
-  uint32_t ProcessKernelTime;
-};
-
-//! \brief Information about the process that the minidump file contains a
-//!     snapshot of, as well as the system that hosted that process.
-//!
-//! This structure variant is used on Windows Vista (NT 6.0) and later.
-//!
-//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*"
-//! \sa MINIDUMP_MISC_INFO
-//! \sa MINIDUMP_MISC_INFO_3
-//! \sa MINIDUMP_MISC_INFO_4
-//! \sa MINIDUMP_MISC_INFO_5
-//! \sa MINIDUMP_MISC_INFO_N
-struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_2
-    : public MINIDUMP_MISC_INFO {
-  //! \brief The maximum clock rate of the system’s CPU or CPUs, in MHz.
-  uint32_t ProcessorMaxMhz;
-
-  //! \brief The clock rate of the system’s CPU or CPUs, in MHz, at the time of
-  //!     the snapshot.
-  uint32_t ProcessorCurrentMhz;
-
-  //! \brief The maximum clock rate of the system’s CPU or CPUs, in MHz, reduced
-  //!     by any thermal limitations, at the time of the snapshot.
-  uint32_t ProcessorMhzLimit;
-
-  //! \brief The maximum idle state of the system’s CPU or CPUs.
-  uint32_t ProcessorMaxIdleState;
-
-  //! \brief The idle state of the system’s CPU or CPUs at the time of the
-  //!     snapshot.
-  uint32_t ProcessorCurrentIdleState;
-};
-
-//! \brief Information about the process that the minidump file contains a
-//!     snapshot of, as well as the system that hosted that process.
-//!
-//! This structure variant is used on Windows 7 (NT 6.1) and later.
-//!
-//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*"
-//! \sa MINIDUMP_MISC_INFO
-//! \sa MINIDUMP_MISC_INFO_2
-//! \sa MINIDUMP_MISC_INFO_4
-//! \sa MINIDUMP_MISC_INFO_5
-//! \sa MINIDUMP_MISC_INFO_N
-struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_3
-    : public MINIDUMP_MISC_INFO_2 {
-  //! \brief The process’ integrity level.
-  //!
-  //! Windows typically uses `SECURITY_MANDATORY_MEDIUM_RID` (0x2000) for
-  //! processes belonging to normal authenticated users and
-  //! `SECURITY_MANDATORY_HIGH_RID` (0x3000) for elevated processes.
-  //!
-  //! This field is Windows-specific, and has no meaning on other operating
-  //! systems.
-  uint32_t ProcessIntegrityLevel;
-
-  //! \brief The process’ execute flags.
-  //!
-  //! On Windows, this appears to be returned by `NtQueryInformationProcess()`
-  //! with an argument of `ProcessExecuteFlags` (34).
-  //!
-  //! This field is Windows-specific, and has no meaning on other operating
-  //! systems.
-  uint32_t ProcessExecuteFlags;
-
-  //! \brief Whether the process is protected.
-  //!
-  //! This field is Windows-specific, and has no meaning on other operating
-  //! systems.
-  uint32_t ProtectedProcess;
-
-  //! \brief Whether daylight saving time was being observed in the system’s
-  //!     location at the time of the snapshot.
-  //!
-  //! This field can contain the following values:
-  //!  - `0` if the location does not observe daylight saving time at all. The
-  //!    TIME_ZONE_INFORMATION::StandardName field of #TimeZoneId contains the
-  //!    time zone name.
-  //!  - `1` if the location observes daylight saving time, but standard time
-  //!    was in effect at the time of the snapshot. The
-  //!    TIME_ZONE_INFORMATION::StandardName field of #TimeZoneId contains the
-  //!    time zone name.
-  //!  - `2` if the location observes daylight saving time, and it was in effect
-  //!    at the time of the snapshot. The TIME_ZONE_INFORMATION::DaylightName
-  //!    field of #TimeZoneId contains the time zone name.
-  //!
-  //! \sa #TimeZone
-  uint32_t TimeZoneId;
-
-  //! \brief Information about the time zone at the system’s location.
-  //!
-  //! \sa #TimeZoneId
-  TIME_ZONE_INFORMATION TimeZone;
-};
-
-//! \brief Information about the process that the minidump file contains a
-//!     snapshot of, as well as the system that hosted that process.
-//!
-//! This structure variant is used on Windows 8 (NT 6.2) and later.
-//!
-//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*"
-//! \sa MINIDUMP_MISC_INFO
-//! \sa MINIDUMP_MISC_INFO_2
-//! \sa MINIDUMP_MISC_INFO_3
-//! \sa MINIDUMP_MISC_INFO_5
-//! \sa MINIDUMP_MISC_INFO_N
-struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_4
-    : public MINIDUMP_MISC_INFO_3 {
-  //! \brief The operating system’s “build string”, a string identifying a
-  //!     specific build of the operating system.
-  //!
-  //! This string is UTF-16-encoded and terminated by a UTF-16 `NUL` code unit.
-  //!
-  //! On Windows 8.1 (NT 6.3), this is “6.3.9600.17031
-  //! (winblue_gdr.140221-1952)”.
-  base::char16 BuildString[260];
-
-  //! \brief The minidump producer’s “build string”, a string identifying the
-  //!     module that produced a minidump file.
-  //!
-  //! This string is UTF-16-encoded and terminated by a UTF-16 `NUL` code unit.
-  //!
-  //! On Windows 8.1 (NT 6.3), this may be “dbghelp.i386,6.3.9600.16520” or
-  //! “dbghelp.amd64,6.3.9600.16520” depending on CPU architecture.
-  base::char16 DbgBldStr[40];
-};
-
-//! \brief Information about the process that the minidump file contains a
-//!     snapshot of, as well as the system that hosted that process.
-//!
-//! This structure variant is used on Windows 10 and later.
-//!
-//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*"
-//! \sa MINIDUMP_MISC_INFO
-//! \sa MINIDUMP_MISC_INFO_2
-//! \sa MINIDUMP_MISC_INFO_3
-//! \sa MINIDUMP_MISC_INFO_4
-//! \sa MINIDUMP_MISC_INFO_N
-struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_5
-    : public MINIDUMP_MISC_INFO_4 {
-  //! \brief Information about XSAVE-managed state stored within CPU-specific
-  //!     context structures.
-  //!
-  //! This information can be used to locate state components within
-  //! CPU-specific context structures.
-  XSTATE_CONFIG_FEATURE_MSC_INFO XStateData;
-
-  uint32_t ProcessCookie;
-};
-
-//! \brief The latest known version of the MINIDUMP_MISC_INFO structure.
-typedef MINIDUMP_MISC_INFO_5 MINIDUMP_MISC_INFO_N;
-
-//! \brief Describes a region of memory.
-struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_INFO {
-  //! \brief The base address of the region of pages.
-  uint64_t BaseAddress;
-
-  //! \brief The base address of a range of pages in this region. The page is
-  //!     contained within this memory region.
-  uint64_t AllocationBase;
-
-  //! \brief The memory protection when the region was initially allocated. This
-  //!     member can be one of the memory protection options (such as
-  //!     \ref PAGE_x "PAGE_EXECUTE", \ref PAGE_x "PAGE_NOACCESS", etc.), along
-  //!     with \ref PAGE_x "PAGE_GUARD" or \ref PAGE_x "PAGE_NOCACHE", as
-  //!     needed.
-  uint32_t AllocationProtect;
-
-  uint32_t __alignment1;
-
-  //! \brief The size of the region beginning at the base address in which all
-  //!     pages have identical attributes, in bytes.
-  uint64_t RegionSize;
-
-  //! \brief The state of the pages in the region. This can be one of
-  //!     \ref MEM_x "MEM_COMMIT", \ref MEM_x "MEM_FREE", or \ref MEM_x
-  //!     "MEM_RESERVE".
-  uint32_t State;
-
-  //! \brief The access protection of the pages in the region. This member is
-  //!     one of the values listed for the #AllocationProtect member.
-  uint32_t Protect;
-
-  //! \brief The type of pages in the region. This can be one of \ref MEM_x
-  //!     "MEM_IMAGE", \ref MEM_x "MEM_MAPPED", or \ref MEM_x "MEM_PRIVATE".
-  uint32_t Type;
-
-  uint32_t __alignment2;
-};
-
-//! \brief Contains a list of memory regions.
-struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_INFO_LIST {
-  //! \brief The size of the header data for the stream, in bytes. This is
-  //!     generally sizeof(MINIDUMP_MEMORY_INFO_LIST).
-  uint32_t SizeOfHeader;
-
-  //! \brief The size of each entry following the header, in bytes. This is
-  //!     generally sizeof(MINIDUMP_MEMORY_INFO).
-  uint32_t SizeOfEntry;
-
-  //! \brief The number of entries in the stream. These are generally
-  //!     MINIDUMP_MEMORY_INFO structures. The entries follow the header.
-  uint64_t NumberOfEntries;
-};
-
-//! \brief Minidump file type values for MINIDUMP_HEADER::Flags. These bits
-//!     describe the types of data carried within a minidump file.
-enum MINIDUMP_TYPE {
-  //! \brief A minidump file without any additional data.
-  //!
-  //! This type of minidump file contains:
-  //!  - A MINIDUMP_SYSTEM_INFO stream.
-  //!  - A MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3, or
-  //!    MINIDUMP_MISC_INFO_4 stream, depending on which fields are present.
-  //!  - A MINIDUMP_THREAD_LIST stream. All threads are present, along with a
-  //!    snapshot of each thread’s stack memory sufficient to obtain backtraces.
-  //!  - If the minidump file was generated as a result of an exception, a
-  //!    MINIDUMP_EXCEPTION_STREAM describing the exception.
-  //!  - A MINIDUMP_MODULE_LIST stream. All loaded modules are present.
-  //!  - Typically, a MINIDUMP_MEMORY_LIST stream containing duplicate pointers
-  //!    to the stack memory regions also referenced by the MINIDUMP_THREAD_LIST
-  //!    stream. This type of minidump file also includes a
-  //!    MINIDUMP_MEMORY_DESCRIPTOR containing the 256 bytes centered around
-  //!    the exception address or the instruction pointer.
-  MiniDumpNormal = 0x00000000,
-};
-
-#endif  // CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_
diff --git a/Tools/Crashpad/include/compat/non_win/minwinbase.h b/Tools/Crashpad/include/compat/non_win/minwinbase.h
deleted file mode 100644
index 2761b1cccd..0000000000
--- a/Tools/Crashpad/include/compat/non_win/minwinbase.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_NON_WIN_MINWINBASE_H_
-#define CRASHPAD_COMPAT_NON_WIN_MINWINBASE_H_
-
-#include <stdint.h>
-
-//! \brief Represents a date and time.
-struct SYSTEMTIME {
-  //! \brief The year, represented fully.
-  //!
-  //! The year 2014 would be represented in this field as `2014`.
-  uint16_t wYear;
-
-  //! \brief The month of the year, `1` for January and `12` for December.
-  uint16_t wMonth;
-
-  //! \brief The day of the week, `0` for Sunday and `6` for Saturday.
-  uint16_t wDayOfWeek;
-
-  //! \brief The day of the month, `1` through `31`.
-  uint16_t wDay;
-
-  //! \brief The hour of the day, `0` through `23`.
-  uint16_t wHour;
-
-  //! \brief The minute of the hour, `0` through `59`.
-  uint16_t wMinute;
-
-  //! \brief The second of the minute, `0` through `60`.
-  uint16_t wSecond;
-
-  //! \brief The millisecond of the second, `0` through `999`.
-  uint16_t wMilliseconds;
-};
-
-#endif  // CRASHPAD_COMPAT_NON_WIN_MINWINBASE_H_
diff --git a/Tools/Crashpad/include/compat/non_win/timezoneapi.h b/Tools/Crashpad/include/compat/non_win/timezoneapi.h
deleted file mode 100644
index 59efae286d..0000000000
--- a/Tools/Crashpad/include/compat/non_win/timezoneapi.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_NON_WIN_TIMEZONEAPI_H_
-#define CRASHPAD_COMPAT_NON_WIN_TIMEZONEAPI_H_
-
-#include <stdint.h>
-
-#include "base/strings/string16.h"
-#include "compat/non_win/minwinbase.h"
-
-//! \brief Information about a time zone and its daylight saving rules.
-struct TIME_ZONE_INFORMATION {
-  //! \brief The number of minutes west of UTC.
-  int32_t Bias;
-
-  //! \brief The UTF-16-encoded name of the time zone when observing standard
-  //!     time.
-  base::char16 StandardName[32];
-
-  //! \brief The date and time to switch from daylight saving time to standard
-  //!     time.
-  //!
-  //! This can be a specific time, or with SYSTEMTIME::wYear set to `0`, it can
-  //! reflect an annual recurring transition. In that case, SYSTEMTIME::wDay in
-  //! the range `1` to `5` is interpreted as the given occurrence of
-  //! SYSTEMTIME::wDayOfWeek within the month, `1` being the first occurrence
-  //! and `5` being the last (even if there are fewer than 5).
-  SYSTEMTIME StandardDate;
-
-  //! \brief The bias relative to #Bias to be applied when observing standard
-  //!     time.
-  int32_t StandardBias;
-
-  //! \brief The UTF-16-encoded name of the time zone when observing daylight
-  //!     saving time.
-  base::char16 DaylightName[32];
-
-  //! \brief The date and time to switch from standard time to daylight saving
-  //!     time.
-  //!
-  //! This field is specified in the same manner as #StandardDate.
-  SYSTEMTIME DaylightDate;
-
-  //! \brief The bias relative to #Bias to be applied when observing daylight
-  //!     saving time.
-  int32_t DaylightBias;
-};
-
-#endif  // CRASHPAD_COMPAT_NON_WIN_TIMEZONEAPI_H_
diff --git a/Tools/Crashpad/include/compat/non_win/verrsrc.h b/Tools/Crashpad/include/compat/non_win/verrsrc.h
deleted file mode 100644
index 70f5344240..0000000000
--- a/Tools/Crashpad/include/compat/non_win/verrsrc.h
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_NON_WIN_VERRSRC_H_
-#define CRASHPAD_COMPAT_NON_WIN_VERRSRC_H_
-
-#include <stdint.h>
-
-//! \file
-
-//! \brief The magic number for a VS_FIXEDFILEINFO structure, stored in
-//!     VS_FIXEDFILEINFO::dwSignature.
-#define VS_FFI_SIGNATURE 0xfeef04bd
-
-//! \brief The version of a VS_FIXEDFILEINFO structure, stored in
-//!     VS_FIXEDFILEINFO::dwStrucVersion.
-#define VS_FFI_STRUCVERSION 0x00010000
-
-//! \anchor VS_FF_x
-//! \name VS_FF_*
-//!
-//! \brief File attribute values for VS_FIXEDFILEINFO::dwFileFlags and
-//!     VS_FIXEDFILEINFO::dwFileFlagsMask.
-//! \{
-#define VS_FF_DEBUG 0x00000001
-#define VS_FF_PRERELEASE 0x00000002
-#define VS_FF_PATCHED 0x00000004
-#define VS_FF_PRIVATEBUILD 0x00000008
-#define VS_FF_INFOINFERRED 0x00000010
-#define VS_FF_SPECIALBUILD 0x00000020
-//! \}
-
-//! \anchor VOS_x
-//! \name VOS_*
-//!
-//! \brief Operating system values for VS_FIXEDFILEINFO::dwFileOS.
-//! \{
-#define VOS_UNKNOWN 0x00000000
-#define VOS_DOS 0x00010000
-#define VOS_OS216 0x00020000
-#define VOS_OS232 0x00030000
-#define VOS_NT 0x00040000
-#define VOS_WINCE 0x00050000
-#define VOS__BASE 0x00000000
-#define VOS__WINDOWS16 0x00000001
-#define VOS__PM16 0x00000002
-#define VOS__PM32 0x00000003
-#define VOS__WINDOWS32 0x00000004
-#define VOS_DOS_WINDOWS16 0x00010001
-#define VOS_DOS_WINDOWS32 0x00010004
-#define VOS_OS216_PM16 0x00020002
-#define VOS_OS232_PM32 0x00030003
-#define VOS_NT_WINDOWS32 0x00040004
-//! \}
-
-//! \anchor VFT_x
-//! \name VFT_*
-//!
-//! \brief File type values for VS_FIXEDFILEINFO::dwFileType.
-//! \{
-#define VFT_UNKNOWN 0x00000000
-#define VFT_APP 0x00000001
-#define VFT_DLL 0x00000002
-#define VFT_DRV 0x00000003
-#define VFT_FONT 0x00000004
-#define VFT_VXD 0x00000005
-#define VFT_STATIC_LIB 0x00000007
-//! \}
-
-//! \anchor VFT2_x
-//! \name VFT2_*
-//!
-//! \brief File subtype values for VS_FIXEDFILEINFO::dwFileSubtype.
-//! \{
-#define VFT2_UNKNOWN 0x00000000
-#define VFT2_DRV_PRINTER 0x00000001
-#define VFT2_DRV_KEYBOARD 0x00000002
-#define VFT2_DRV_LANGUAGE 0x00000003
-#define VFT2_DRV_DISPLAY 0x00000004
-#define VFT2_DRV_MOUSE 0x00000005
-#define VFT2_DRV_NETWORK 0x00000006
-#define VFT2_DRV_SYSTEM 0x00000007
-#define VFT2_DRV_INSTALLABLE 0x00000008
-#define VFT2_DRV_SOUND 0x00000009
-#define VFT2_DRV_COMM 0x0000000A
-#define VFT2_DRV_INPUTMETHOD 0x0000000B
-#define VFT2_DRV_VERSIONED_PRINTER 0x0000000C
-#define VFT2_FONT_RASTER 0x00000001
-#define VFT2_FONT_VECTOR 0x00000002
-#define VFT2_FONT_TRUETYPE 0x00000003
-//! \}
-
-//! \brief Version information for a file.
-//!
-//! On Windows, this information is derived from a file’s version information
-//! resource, and is obtained by calling `VerQueryValue()` with an `lpSubBlock`
-//! argument of `"\"` (a single backslash).
-struct VS_FIXEDFILEINFO {
-  //! \brief The structure’s magic number, ::VS_FFI_SIGNATURE.
-  uint32_t dwSignature;
-
-  //! \brief The structure’s version, ::VS_FFI_STRUCVERSION.
-  uint32_t dwStrucVersion;
-
-  //! \brief The more-significant portion of the file’s version number.
-  //!
-  //! This field contains the first two components of a four-component version
-  //! number. For a file whose version is 1.2.3.4, this field would be
-  //! `0x00010002`.
-  //!
-  //! \sa dwFileVersionLS
-  uint32_t dwFileVersionMS;
-
-  //! \brief The less-significant portion of the file’s version number.
-  //!
-  //! This field contains the last two components of a four-component version
-  //! number. For a file whose version is 1.2.3.4, this field would be
-  //! `0x00030004`.
-  //!
-  //! \sa dwFileVersionMS
-  uint32_t dwFileVersionLS;
-
-  //! \brief The more-significant portion of the product’s version number.
-  //!
-  //! This field contains the first two components of a four-component version
-  //! number. For a product whose version is 1.2.3.4, this field would be
-  //! `0x00010002`.
-  //!
-  //! \sa dwProductVersionLS
-  uint32_t dwProductVersionMS;
-
-  //! \brief The less-significant portion of the product’s version number.
-  //!
-  //! This field contains the last two components of a four-component version
-  //! number. For a product whose version is 1.2.3.4, this field would be
-  //! `0x00030004`.
-  //!
-  //! \sa dwProductVersionMS
-  uint32_t dwProductVersionLS;
-
-  //! \brief A bitmask of \ref VS_FF_x "VS_FF_*" values indicating which bits in
-  //!     #dwFileFlags are valid.
-  uint32_t dwFileFlagsMask;
-
-  //! \brief A bitmask of \ref VS_FF_x "VS_FF_*" values identifying attributes
-  //!     of the file. Only bits present in #dwFileFlagsMask are valid.
-  uint32_t dwFileFlags;
-
-  //! \brief The file’s intended operating system, a value of \ref VOS_x
-  //!     "VOS_*".
-  uint32_t dwFileOS;
-
-  //! \brief The file’s type, a value of \ref VFT_x "VFT_*".
-  uint32_t dwFileType;
-
-  //! \brief The file’s subtype, a value of \ref VFT2_x "VFT2_*" corresponding
-  //!     to its #dwFileType, if the file type has subtypes.
-  uint32_t dwFileSubtype;
-
-  //! \brief The more-significant portion of the file’s creation date.
-  //!
-  //! The intended encoding of this field is unknown. This field is unused and
-  //! always has the value `0`.
-  uint32_t dwFileDateMS;
-
-  //! \brief The less-significant portion of the file’s creation date.
-  //!
-  //! The intended encoding of this field is unknown. This field is unused and
-  //! always has the value `0`.
-  uint32_t dwFileDateLS;
-};
-
-#endif  // CRASHPAD_COMPAT_NON_WIN_VERRSRC_H_
diff --git a/Tools/Crashpad/include/compat/non_win/windows.h b/Tools/Crashpad/include/compat/non_win/windows.h
deleted file mode 100644
index 4577451493..0000000000
--- a/Tools/Crashpad/include/compat/non_win/windows.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// dbghelp.h on Windows requires inclusion of windows.h before it. To avoid
-// cluttering all inclusions of dbghelp.h with #ifdefs, always include windows.h
-// and have an empty one on non-Windows platforms.
diff --git a/Tools/Crashpad/include/compat/non_win/winnt.h b/Tools/Crashpad/include/compat/non_win/winnt.h
deleted file mode 100644
index f2ed6ace07..0000000000
--- a/Tools/Crashpad/include/compat/non_win/winnt.h
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_NON_WIN_WINNT_H_
-#define CRASHPAD_COMPAT_NON_WIN_WINNT_H_
-
-#include <stdint.h>
-
-//! \file
-
-//! \anchor VER_SUITE_x
-//! \name VER_SUITE_*
-//!
-//! \brief Installable product values for MINIDUMP_SYSTEM_INFO::SuiteMask.
-//! \{
-#define VER_SUITE_SMALLBUSINESS 0x0001
-#define VER_SUITE_ENTERPRISE 0x0002
-#define VER_SUITE_BACKOFFICE 0x0004
-#define VER_SUITE_COMMUNICATIONS 0x0008
-#define VER_SUITE_TERMINAL 0x0010
-#define VER_SUITE_SMALLBUSINESS_RESTRICTED 0x0020
-#define VER_SUITE_EMBEDDEDNT 0x0040
-#define VER_SUITE_DATACENTER 0x0080
-#define VER_SUITE_SINGLEUSERTS 0x0100
-#define VER_SUITE_PERSONAL 0x0200
-#define VER_SUITE_BLADE 0x0400
-#define VER_SUITE_EMBEDDED_RESTRICTED 0x0800
-#define VER_SUITE_SECURITY_APPLIANCE 0x1000
-#define VER_SUITE_STORAGE_SERVER 0x2000
-#define VER_SUITE_COMPUTE_SERVER 0x4000
-#define VER_SUITE_WH_SERVER 0x8000
-//! \}
-
-//! \brief The maximum number of exception parameters present in the
-//!     MINIDUMP_EXCEPTION::ExceptionInformation array.
-#define EXCEPTION_MAXIMUM_PARAMETERS 15
-
-//! \anchor PROCESSOR_ARCHITECTURE_x
-//! \name PROCESSOR_ARCHITECTURE_*
-//!
-//! \brief CPU type values for MINIDUMP_SYSTEM_INFO::ProcessorArchitecture.
-//!
-//! \sa crashpad::MinidumpCPUArchitecture
-//! \{
-#define PROCESSOR_ARCHITECTURE_INTEL 0
-#define PROCESSOR_ARCHITECTURE_MIPS 1
-#define PROCESSOR_ARCHITECTURE_ALPHA 2
-#define PROCESSOR_ARCHITECTURE_PPC 3
-#define PROCESSOR_ARCHITECTURE_SHX 4
-#define PROCESSOR_ARCHITECTURE_ARM 5
-#define PROCESSOR_ARCHITECTURE_IA64 6
-#define PROCESSOR_ARCHITECTURE_ALPHA64 7
-#define PROCESSOR_ARCHITECTURE_MSIL 8
-#define PROCESSOR_ARCHITECTURE_AMD64 9
-#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10
-#define PROCESSOR_ARCHITECTURE_NEUTRAL 11
-#define PROCESSOR_ARCHITECTURE_ARM64 12
-#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13
-#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xffff
-//! \}
-
-//! \anchor PF_x
-//! \name PF_*
-//!
-//! \brief CPU feature values for \ref CPU_INFORMATION::ProcessorFeatures
-//!     "CPU_INFORMATION::OtherCpuInfo::ProcessorFeatures".
-//!
-//! \{
-#define PF_FLOATING_POINT_PRECISION_ERRATA 0
-#define PF_FLOATING_POINT_EMULATED 1
-#define PF_COMPARE_EXCHANGE_DOUBLE 2
-#define PF_MMX_INSTRUCTIONS_AVAILABLE 3
-#define PF_PPC_MOVEMEM_64BIT_OK 4
-#define PF_ALPHA_BYTE_INSTRUCTIONS 5
-#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6
-#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7
-#define PF_RDTSC_INSTRUCTION_AVAILABLE 8
-#define PF_PAE_ENABLED 9
-#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
-#define PF_SSE_DAZ_MODE_AVAILABLE 11
-#define PF_NX_ENABLED 12
-#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13
-#define PF_COMPARE_EXCHANGE128 14
-#define PF_COMPARE64_EXCHANGE128 15
-#define PF_CHANNELS_ENABLED 16
-#define PF_XSAVE_ENABLED 17
-#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18
-#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19
-#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20
-#define PF_VIRT_FIRMWARE_ENABLED 21
-#define PF_RDWRFSGSBASE_AVAILABLE 22
-#define PF_FASTFAIL_AVAILABLE 23
-#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24
-#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25
-#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26
-#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27
-#define PF_RDRAND_INSTRUCTION_AVAILABLE 28
-#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29
-#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30
-#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31
-#define PF_RDTSCP_INSTRUCTION_AVAILABLE 32
-//! \}
-
-//! \anchor PAGE_x
-//! \name PAGE_*
-//!
-//! \brief Memory protection constants for MINIDUMP_MEMORY_INFO::Protect and
-//!     MINIDUMP_MEMORY_INFO::AllocationProtect.
-//! \{
-#define PAGE_NOACCESS 0x1
-#define PAGE_READONLY 0x2
-#define PAGE_READWRITE 0x4
-#define PAGE_WRITECOPY 0x8
-#define PAGE_EXECUTE 0x10
-#define PAGE_EXECUTE_READ 0x20
-#define PAGE_EXECUTE_READWRITE 0x40
-#define PAGE_EXECUTE_WRITECOPY 0x80
-#define PAGE_GUARD 0x100
-#define PAGE_NOCACHE 0x200
-#define PAGE_WRITECOMBINE 0x400
-//! \}
-
-//! \anchor MEM_x
-//! \name MEM_*
-//!
-//! \brief Memory state and type constants for MINIDUMP_MEMORY_INFO::State and
-//!     MINIDUMP_MEMORY_INFO::Type.
-//! \{
-#define MEM_COMMIT 0x1000
-#define MEM_RESERVE 0x2000
-#define MEM_DECOMMIT 0x4000
-#define MEM_RELEASE 0x8000
-#define MEM_FREE 0x10000
-#define MEM_PRIVATE 0x20000
-#define MEM_MAPPED 0x40000
-#define MEM_RESET 0x80000
-//! \}
-
-//! \brief The maximum number of distinct identifiable features that could
-//!     possibly be carried in an XSAVE area.
-//!
-//! This corresponds to the number of bits in the XSAVE state-component bitmap,
-//! XSAVE_BV. See Intel Software Developer’s Manual, Volume 1: Basic
-//! Architecture (253665-060), 13.4.2 “XSAVE Header”.
-#define MAXIMUM_XSTATE_FEATURES (64)
-
-//! \brief The location of a single state component within an XSAVE area.
-struct XSTATE_FEATURE {
-  //! \brief The location of a state component within a CPU-specific context
-  //!     structure.
-  //!
-  //! This is equivalent to the difference (`ptrdiff_t`) between the return
-  //! value of `LocateXStateFeature()` and its \a Context argument.
-  uint32_t Offset;
-
-  //! \brief The size of a state component with a CPU-specific context
-  //!     structure.
-  //!
-  //! This is equivalent to the size returned by `LocateXStateFeature()` in \a
-  //!     Length.
-  uint32_t Size;
-};
-
-//! \anchor IMAGE_DEBUG_MISC_x
-//! \name IMAGE_DEBUG_MISC_*
-//!
-//! Data type values for IMAGE_DEBUG_MISC::DataType.
-//! \{
-
-//! \brief A pointer to a `.dbg` file.
-//!
-//! IMAGE_DEBUG_MISC::Data will contain the path or file name of the `.dbg` file
-//! associated with the module.
-#define IMAGE_DEBUG_MISC_EXENAME 1
-
-//! \}
-
-//! \brief Miscellaneous debugging record.
-//!
-//! This structure is referenced by MINIDUMP_MODULE::MiscRecord. It is obsolete,
-//! superseded by the CodeView record.
-struct IMAGE_DEBUG_MISC {
-  //! \brief The type of data carried in the #Data field.
-  //!
-  //! This is a value of \ref IMAGE_DEBUG_MISC_x "IMAGE_DEBUG_MISC_*".
-  uint32_t DataType;
-
-  //! \brief The length of this structure in bytes, including the entire #Data
-  //!     field and its `NUL` terminator.
-  //!
-  //! \note The Windows documentation states that this field is rounded up to
-  //!     nearest nearest 4-byte multiple.
-  uint32_t Length;
-
-  //! \brief The encoding of the #Data field.
-  //!
-  //! If this field is `0`, #Data contains narrow or multibyte character data.
-  //! If this field is `1`, #Data is UTF-16-encoded.
-  //!
-  //! On Windows, with this field set to `0`, #Data will be encoded in the code
-  //! page of the system that linked the module. On other operating systems,
-  //! UTF-8 may be used.
-  uint8_t Unicode;
-
-  uint8_t Reserved[3];
-
-  //! \brief The data carried within this structure.
-  //!
-  //! For string data, this field will be `NUL`-terminated. If #Unicode is `1`,
-  //! this field is UTF-16-encoded, and will be terminated by a UTF-16 `NUL`
-  //! code unit (two `NUL` bytes).
-  uint8_t Data[1];
-};
-
-//! \anchor VER_NT_x
-//! \name VER_NT_*
-//!
-//! \brief Operating system type values for MINIDUMP_SYSTEM_INFO::ProductType.
-//!
-//! \sa crashpad::MinidumpOSType
-//! \{
-#define VER_NT_WORKSTATION 1
-#define VER_NT_DOMAIN_CONTROLLER 2
-#define VER_NT_SERVER 3
-//! \}
-
-//! \anchor VER_PLATFORM_x
-//! \name VER_PLATFORM_*
-//!
-//! \brief Operating system family values for MINIDUMP_SYSTEM_INFO::PlatformId.
-//!
-//! \sa crashpad::MinidumpOS
-//! \{
-#define VER_PLATFORM_WIN32s 0
-#define VER_PLATFORM_WIN32_WINDOWS 1
-#define VER_PLATFORM_WIN32_NT 2
-//! \}
-
-#endif  // CRASHPAD_COMPAT_NON_WIN_WINNT_H_
diff --git a/Tools/Crashpad/include/compat/win/getopt.h b/Tools/Crashpad/include/compat/win/getopt.h
deleted file mode 100644
index 45fcbccc39..0000000000
--- a/Tools/Crashpad/include/compat/win/getopt.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_GETOPT_H_
-#define CRASHPAD_COMPAT_WIN_GETOPT_H_
-
-#include "third_party/getopt/getopt.h"
-
-#endif  // CRASHPAD_COMPAT_WIN_GETOPT_H_
diff --git a/Tools/Crashpad/include/compat/win/strings.h b/Tools/Crashpad/include/compat/win/strings.h
deleted file mode 100644
index 50360b16d7..0000000000
--- a/Tools/Crashpad/include/compat/win/strings.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_STRINGS_H_
-#define CRASHPAD_COMPAT_WIN_STRINGS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int strcasecmp(const char* s1, const char* s2);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // CRASHPAD_COMPAT_WIN_STRINGS_H_
diff --git a/Tools/Crashpad/include/compat/win/sys/time.h b/Tools/Crashpad/include/compat/win/sys/time.h
deleted file mode 100644
index 71ddcdc21f..0000000000
--- a/Tools/Crashpad/include/compat/win/sys/time.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_SYS_TIME_H_
-#define CRASHPAD_COMPAT_WIN_SYS_TIME_H_
-
-#include <winsock2.h>
-
-#endif  // CRASHPAD_COMPAT_WIN_SYS_TIME_H_
diff --git a/Tools/Crashpad/include/compat/win/sys/types.h b/Tools/Crashpad/include/compat/win/sys/types.h
deleted file mode 100644
index e8fae88f4a..0000000000
--- a/Tools/Crashpad/include/compat/win/sys/types.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_SYS_TYPES_H_
-#define CRASHPAD_COMPAT_WIN_SYS_TYPES_H_
-
-// This is intended to be roughly equivalent to #include_next.
-#include <../ucrt/sys/types.h>
-
-#include <stdint.h>
-
-#endif  // CRASHPAD_COMPAT_WIN_SYS_TYPES_H_
diff --git a/Tools/Crashpad/include/compat/win/time.h b/Tools/Crashpad/include/compat/win/time.h
deleted file mode 100644
index 37048daf71..0000000000
--- a/Tools/Crashpad/include/compat/win/time.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_TIME_H_
-#define CRASHPAD_COMPAT_WIN_TIME_H_
-
-// This is intended to be roughly equivalent to #include_next.
-#include <../ucrt/time.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct tm* gmtime_r(const time_t* timep, struct tm* result);
-
-struct tm* localtime_r(const time_t* timep, struct tm* result);
-
-const char* strptime(const char* buf, const char* format, struct tm* tm);
-
-time_t timegm(struct tm* tm);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // CRASHPAD_COMPAT_WIN_TIME_H_
diff --git a/Tools/Crashpad/include/compat/win/winbase.h b/Tools/Crashpad/include/compat/win/winbase.h
deleted file mode 100644
index ffd850bf28..0000000000
--- a/Tools/Crashpad/include/compat/win/winbase.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_WINBASE_H_
-#define CRASHPAD_COMPAT_WIN_WINBASE_H_
-
-// include_next <winbase.h>
-#include <../um/winbase.h>
-
-// 10.0.15063.0 SDK
-
-#ifndef SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
-#define SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x2)
-#endif
-
-#endif  // CRASHPAD_COMPAT_WIN_WINBASE_H_
diff --git a/Tools/Crashpad/include/compat/win/winnt.h b/Tools/Crashpad/include/compat/win/winnt.h
deleted file mode 100644
index 34ea80f91c..0000000000
--- a/Tools/Crashpad/include/compat/win/winnt.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_WINNT_H_
-#define CRASHPAD_COMPAT_WIN_WINNT_H_
-
-// include_next <winnt.h>
-#include <../um/winnt.h>
-
-// https://msdn.microsoft.com/library/aa373184.aspx: "Note that this structure
-// definition was accidentally omitted from WinNT.h."
-struct PROCESSOR_POWER_INFORMATION {
-  ULONG Number;
-  ULONG MaxMhz;
-  ULONG CurrentMhz;
-  ULONG MhzLimit;
-  ULONG MaxIdleState;
-  ULONG CurrentIdleState;
-};
-
-// 10.0.10240.0 SDK
-
-#ifndef PROCESSOR_ARCHITECTURE_ARM64
-#define PROCESSOR_ARCHITECTURE_ARM64 12
-#endif
-
-#ifndef PF_ARM_V8_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29
-#endif
-
-#ifndef PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30
-#endif
-
-#ifndef PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31
-#endif
-
-#ifndef PF_RDTSCP_INSTRUCTION_AVAILABLE
-#define PF_RDTSCP_INSTRUCTION_AVAILABLE 32
-#endif
-
-// 10.0.14393.0 SDK
-
-#ifndef PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64
-#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13
-#endif
-
-#endif  // CRASHPAD_COMPAT_WIN_WINNT_H_
diff --git a/Tools/Crashpad/include/compat/win/winternl.h b/Tools/Crashpad/include/compat/win/winternl.h
deleted file mode 100644
index ee4f53c654..0000000000
--- a/Tools/Crashpad/include/compat/win/winternl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_COMPAT_WIN_WINTERNL_H_
-#define CRASHPAD_COMPAT_WIN_WINTERNL_H_
-
-// include_next <winternl.h>
-#include <../um/winternl.h>
-
-// 10.0.16299.0 SDK
-
-typedef struct _CLIENT_ID CLIENT_ID;
-
-#endif  // CRASHPAD_COMPAT_WIN_WINTERNL_H_
diff --git a/Tools/Crashpad/include/handler/crash_report_upload_thread.h b/Tools/Crashpad/include/handler/crash_report_upload_thread.h
deleted file mode 100644
index cdd1502b7e..0000000000
--- a/Tools/Crashpad/include/handler/crash_report_upload_thread.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_
-#define CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_
-
-#include <memory>
-#include <string>
-
-#include "base/macros.h"
-#include "client/crash_report_database.h"
-#include "util/misc/uuid.h"
-#include "util/stdlib/thread_safe_vector.h"
-#include "util/thread/worker_thread.h"
-
-namespace crashpad {
-
-//! \brief A thread that processes pending crash reports in a
-//!     CrashReportDatabase by uploading them or marking them as completed
-//!     without upload, as desired.
-//!
-//! A producer of crash reports should notify an object of this class that a new
-//! report has been added to the database by calling ReportPending().
-//!
-//! Independently of being triggered by ReportPending(), objects of this class
-//! can periodically examine the database for pending reports. This allows
-//! failed upload attempts for reports left in the pending state to be retried.
-//! It also catches reports that are added without a ReportPending() signal
-//! being caught. This may happen if crash reports are added to the database by
-//! other processes.
-class CrashReportUploadThread : public WorkerThread::Delegate {
- public:
-   //! \brief Options to be passed to the CrashReportUploadThread constructor.
-   struct Options {
-    //! Whether client identifying parameters like product name or version
-    //! should be added to the URL.
-    bool identify_client_via_url;
-
-    //! Whether uploads should be throttled to a (currently hardcoded) rate.
-    bool rate_limit;
-
-    //! Whether uploads should use `gzip` compression.
-    bool upload_gzip;
-
-    //! Whether to periodically check for new pending reports not already known
-    //! to exist. When `false`, only an initial upload attempt will be made for
-    //! reports known to exist by having been added by the ReportPending()
-    //! method. No scans for new pending reports will be conducted.
-    bool watch_pending_reports;
-  };
-
-  //! \brief Constructs a new object.
-  //!
-  //! \param[in] database The database to upload crash reports from.
-  //! \param[in] url The URL of the server to upload crash reports to.
-  //! \param[in] options Options for the report uploads.
-  CrashReportUploadThread(CrashReportDatabase* database,
-                          const std::string& url,
-                          const Options& options);
-  ~CrashReportUploadThread();
-
-  //! \brief Starts a dedicated upload thread, which executes ThreadMain().
-  //!
-  //! This method may only be be called on a newly-constructed object or after
-  //! a call to Stop().
-  void Start();
-
-  //! \brief Stops the upload thread.
-  //!
-  //! The upload thread will terminate after completing whatever task it is
-  //! performing. If it is not performing any task, it will terminate
-  //! immediately. This method blocks while waiting for the upload thread to
-  //! terminate.
-  //!
-  //! This method must only be called after Start(). If Start() has been called,
-  //! this method must be called before destroying an object of this class.
-  //!
-  //! This method may be called from any thread other than the upload thread.
-  //! It is expected to only be called from the same thread that called Start().
-  void Stop();
-
-  //! \brief Informs the upload thread that a new pending report has been added
-  //!     to the database.
-  //!
-  //! \param[in] report_uuid The unique identifier of the newly added pending
-  //!     report.
-  //!
-  //! This method may be called from any thread.
-  void ReportPending(const UUID& report_uuid);
-
- private:
-  //! \brief The result code from UploadReport().
-  enum class UploadResult {
-    //! \brief The crash report was uploaded successfully.
-    kSuccess,
-
-    //! \brief The crash report upload failed in such a way that recovery is
-    //!     impossible.
-    //!
-    //! No further upload attempts should be made for the report.
-    kPermanentFailure,
-
-    //! \brief The crash report upload failed, but it might succeed again if
-    //!     retried in the future.
-    //!
-    //! If the report has not already been retried too many times, the caller
-    //! may arrange to call UploadReport() for the report again in the future,
-    //! after a suitable delay.
-    kRetry,
-  };
-
-  //! \brief Calls ProcessPendingReport() on pending reports.
-  //!
-  //! Assuming Stop() has not been called, this will process reports that the
-  //! object has been made aware of in ReportPending(). Additionally, if the
-  //! object was constructed with \a watch_pending_reports, it will also scan
-  //! the crash report database for other pending reports, and process those as
-  //! well.
-  void ProcessPendingReports();
-
-  //! \brief Processes a single pending report from the database.
-  //!
-  //! \param[in] report The crash report to process.
-  //!
-  //! If report upload is enabled, this method attempts to upload \a report by
-  //! calling UplaodReport(). If the upload is successful, the report will be
-  //! marked as “completed” in the database. If the upload fails and more
-  //! retries are desired, the report’s upload-attempt count and
-  //! last-upload-attempt time will be updated in the database and it will
-  //! remain in the “pending” state. If the upload fails and no more retries are
-  //! desired, or report upload is disabled, it will be marked as “completed” in
-  //! the database without ever having been uploaded.
-  void ProcessPendingReport(const CrashReportDatabase::Report& report);
-
-  //! \brief Attempts to upload a crash report.
-  //!
-  //! \param[in] report The report to upload. The caller is responsible for
-  //!     calling CrashReportDatabase::GetReportForUploading() before calling
-  //!     this method, and for calling
-  //!     CrashReportDatabase::RecordUploadAttempt() after calling this method.
-  //! \param[out] response_body If the upload attempt is successful, this will
-  //!     be set to the response body sent by the server. Breakpad-type servers
-  //!     provide the crash ID assigned by the server in the response body.
-  //!
-  //! \return A member of UploadResult indicating the result of the upload
-  //!    attempt.
-  UploadResult UploadReport(const CrashReportDatabase::Report* report,
-                            std::string* response_body);
-
-  // WorkerThread::Delegate:
-  //! \brief Calls ProcessPendingReports() in response to ReportPending() having
-  //!     been called on any thread, as well as periodically on a timer.
-  void DoWork(const WorkerThread* thread) override;
-
-  const Options options_;
-  const std::string url_;
-  WorkerThread thread_;
-  ThreadSafeVector<UUID> known_pending_report_uuids_;
-  CrashReportDatabase* database_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(CrashReportUploadThread);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_
diff --git a/Tools/Crashpad/include/handler/fuchsia/crash_report_exception_handler.h b/Tools/Crashpad/include/handler/fuchsia/crash_report_exception_handler.h
deleted file mode 100644
index c987a5dc22..0000000000
--- a/Tools/Crashpad/include/handler/fuchsia/crash_report_exception_handler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_FUCHSIA_CRASH_REPORT_EXCEPTION_HANDLER_H_
-#define CRASHPAD_HANDLER_FUCHSIA_CRASH_REPORT_EXCEPTION_HANDLER_H_
-
-#include <map>
-#include <string>
-
-#include "base/macros.h"
-#include "client/crash_report_database.h"
-#include "handler/crash_report_upload_thread.h"
-#include "handler/user_stream_data_source.h"
-
-namespace crashpad {
-
-//! \brief An exception handler that writes crash reports for exception messages
-//!     to a CrashReportDatabase. This class is not yet implemented.
-class CrashReportExceptionHandler {
- public:
-  //! \brief Creates a new object that will store crash reports in \a database.
-  //!
-  //! \param[in] database The database to store crash reports in. Weak.
-  //! \param[in] upload_thread The upload thread to notify when a new crash
-  //!     report is written into \a database.
-  //! \param[in] process_annotations A map of annotations to insert as
-  //!     process-level annotations into each crash report that is written. Do
-  //!     not confuse this with module-level annotations, which are under the
-  //!     control of the crashing process, and are used to implement Chrome's
-  //!     "crash keys." Process-level annotations are those that are beyond the
-  //!     control of the crashing process, which must reliably be set even if
-  //!     the process crashes before it’s able to establish its own annotations.
-  //!     To interoperate with Breakpad servers, the recommended practice is to
-  //!     specify values for the `"prod"` and `"ver"` keys as process
-  //!     annotations.
-  //! \param[in] user_stream_data_sources Data sources to be used to extend
-  //!     crash reports. For each crash report that is written, the data sources
-  //!     are called in turn. These data sources may contribute additional
-  //!     minidump streams. `nullptr` if not required.
-  CrashReportExceptionHandler(
-      CrashReportDatabase* database,
-      CrashReportUploadThread* upload_thread,
-      const std::map<std::string, std::string>* process_annotations,
-      const UserStreamDataSources* user_stream_data_sources);
-
-  ~CrashReportExceptionHandler();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CrashReportExceptionHandler);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_FUCHSIA_CRASH_REPORT_EXCEPTION_HANDLER_H_
diff --git a/Tools/Crashpad/include/handler/fuchsia/exception_handler_server.h b/Tools/Crashpad/include/handler/fuchsia/exception_handler_server.h
deleted file mode 100644
index b998ba9cf0..0000000000
--- a/Tools/Crashpad/include/handler/fuchsia/exception_handler_server.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_FUCHSIA_EXCEPTION_HANDLER_SERVER_H_
-#define CRASHPAD_HANDLER_FUCHSIA_EXCEPTION_HANDLER_SERVER_H_
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-class CrashReportExceptionHandler;
-
-//! \brief Runs the main exception-handling server in Crashpad's handler
-//!     process. This class is not yet implemented.
-class ExceptionHandlerServer {
- public:
-  //! \brief Constructs an ExceptionHandlerServer object.
-  ExceptionHandlerServer();
-  ~ExceptionHandlerServer();
-
-  //! \brief Runs the exception-handling server.
-  //!
-  //! \param[in] handler The handler to which the exceptions are delegated when
-  //!     they are caught in Run(). Ownership is not transferred.
-  void Run(CrashReportExceptionHandler* handler);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_FUCHSIA_EXCEPTION_HANDLER_SERVER_H_
diff --git a/Tools/Crashpad/include/handler/handler_main.h b/Tools/Crashpad/include/handler/handler_main.h
deleted file mode 100644
index af01dbe735..0000000000
--- a/Tools/Crashpad/include/handler/handler_main.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_HANDLER_MAIN_H_
-#define CRASHPAD_HANDLER_HANDLER_MAIN_H_
-
-#include "handler/user_stream_data_source.h"
-
-namespace crashpad {
-
-//! \brief The `main()` of the `crashpad_handler` binary.
-//!
-//! This is exposed so that `crashpad_handler` can be embedded into another
-//! binary, but called and used as if it were a standalone executable.
-//!
-//! \param[in] argc \a argc as passed to `main()`.
-//! \param[in] argv \a argv as passed to `main()`.
-//! \param[in] user_stream_sources An optional vector containing the
-//!     extensibility data sources to call on crash. Each time a minidump is
-//!     created, the sources are called in turn. Any streams returned are added
-//!     to the minidump.
-int HandlerMain(int argc,
-                char* argv[],
-                const UserStreamDataSources* user_stream_sources);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_HANDLER_MAIN_H_
diff --git a/Tools/Crashpad/include/handler/linux/exception_handler_server.h b/Tools/Crashpad/include/handler/linux/exception_handler_server.h
deleted file mode 100644
index fcafb887a1..0000000000
--- a/Tools/Crashpad/include/handler/linux/exception_handler_server.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_LINUX_EXCEPTION_HANDLER_SERVER_H_
-#define CRASHPAD_HANDLER_LINUX_EXCEPTION_HANDLER_SERVER_H_
-
-#include <stdint.h>
-#include <sys/socket.h>
-
-#include <memory>
-#include <unordered_map>
-
-#include "base/macros.h"
-#include "util/file/file_io.h"
-#include "util/linux/exception_handler_protocol.h"
-#include "util/misc/address_types.h"
-#include "util/misc/initialization_state_dcheck.h"
-
-namespace crashpad {
-
-//! \brief Abstract base class for deciding how the handler should `ptrace` a
-//!     client.
-class PtraceStrategyDecider {
- public:
-  virtual ~PtraceStrategyDecider() = default;
-
-  //! \brief The possible return values for ChooseStrategy().
-  enum class Strategy {
-    //! \brief An error occurred,  with a message logged.
-    kError,
-
-    //! \brief Ptrace cannot be used.
-    kNoPtrace,
-
-    //! \brief The handler should `ptrace`-attach the client directly.
-    kDirectPtrace,
-
-    //! \brief The client should `fork` a PtraceBroker for the handler.
-    kForkBroker,
-  };
-
-  //! \brief Chooses an appropriate `ptrace` strategy.
-  //!
-  //! \param[in] sock A socket conncted to a ExceptionHandlerClient.
-  //! \param[in] client_credentials The credentials for the connected client.
-  //! \return the chosen #Strategy.
-  virtual Strategy ChooseStrategy(int sock,
-                                  const ucred& client_credentials) = 0;
-
- protected:
-  PtraceStrategyDecider() = default;
-};
-
-//! \brief Runs the main exception-handling server in Crashpad’s handler
-//!     process.
-class ExceptionHandlerServer {
- public:
-  class Delegate {
-   public:
-    //! \brief Called on receipt of a crash dump request from a client.
-    //!
-    //! \param[in] client_process_id The process ID of the crashing client.
-    //! \param[in] exception_information_address The address in the client's
-    //!     address space of an ExceptionInformation struct.
-    //! \return `true` on success. `false` on failure with a message logged.
-    virtual bool HandleException(pid_t client_process_id,
-                                 VMAddress exception_information_address) = 0;
-
-    //! \brief Called on the receipt of a crash dump request from a client for a
-    //!     crash that should be mediated by a PtraceBroker.
-    //!
-    //! \param[in] client_process_id The process ID of the crashing client.
-    //! \param[in] exception_information_address The address in the client's
-    //!     address space of an ExceptionInformation struct.
-    //! \param[in] broker_sock A socket connected to the PtraceBroker.
-    //! \return `true` on success. `false` on failure with a message logged.
-    virtual bool HandleExceptionWithBroker(
-        pid_t client_process_id,
-        VMAddress exception_information_address,
-        int broker_sock) = 0;
-
-   protected:
-    ~Delegate() {}
-  };
-
-  ExceptionHandlerServer();
-  ~ExceptionHandlerServer();
-
-  //! \brief Sets the handler's PtraceStrategyDecider.
-  //!
-  //! If this method is not called, a default PtraceStrategyDecider will be
-  //! used.
-  void SetPtraceStrategyDecider(std::unique_ptr<PtraceStrategyDecider> decider);
-
-  //! \brief Initializes this object.
-  //!
-  //! This method must be successfully called before Run().
-  //!
-  //! \param[in] sock A socket on which to receive client requests.
-  //! \return `true` on success. `false` on failure with a message logged.
-  bool InitializeWithClient(ScopedFileHandle sock);
-
-  //! \brief Runs the exception-handling server.
-  //!
-  //! This method must only be called once on an ExceptionHandlerServer object.
-  //! This method returns when there are no more client connections or Stop()
-  //! has been called.
-  //!
-  //! \param[in] delegate An object to send exceptions to.
-  void Run(Delegate* delegate);
-
-  //! \brief Stops a running exception-handling server.
-  //!
-  //! Stop() may be called at any time, and may be called from a signal handler.
-  //! If Stop() is called before Run() it will cause Run() to return as soon as
-  //! it is called. It is harmless to call Stop() after Run() has already
-  //! returned, or to call Stop() after it has already been called.
-  void Stop();
-
- private:
-  struct Event;
-
-  void HandleEvent(Event* event, uint32_t event_type);
-  bool InstallClientSocket(ScopedFileHandle socket);
-  bool UninstallClientSocket(Event* event);
-  bool ReceiveClientMessage(Event* event);
-  bool HandleCrashDumpRequest(const msghdr& msg,
-                              const ClientInformation& client_info,
-                              int client_sock);
-
-  std::unordered_map<int, std::unique_ptr<Event>> clients_;
-  std::unique_ptr<Event> shutdown_event_;
-  std::unique_ptr<PtraceStrategyDecider> strategy_decider_;
-  Delegate* delegate_;
-  ScopedFileHandle pollfd_;
-  bool keep_running_;
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_LINUX_EXCEPTION_HANDLER_SERVER_H_
diff --git a/Tools/Crashpad/include/handler/mac/crash_report_exception_handler.h b/Tools/Crashpad/include/handler/mac/crash_report_exception_handler.h
deleted file mode 100644
index cc314f1fc9..0000000000
--- a/Tools/Crashpad/include/handler/mac/crash_report_exception_handler.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_MAC_CRASH_REPORT_EXCEPTION_HANDLER_H_
-#define CRASHPAD_HANDLER_MAC_CRASH_REPORT_EXCEPTION_HANDLER_H_
-
-#include <mach/mach.h>
-
-#include <map>
-#include <string>
-
-#include "base/macros.h"
-#include "client/crash_report_database.h"
-#include "handler/crash_report_upload_thread.h"
-#include "handler/user_stream_data_source.h"
-#include "util/mach/exc_server_variants.h"
-
-namespace crashpad {
-
-//! \brief An exception handler that writes crash reports for exception messages
-//!     to a CrashReportDatabase.
-class CrashReportExceptionHandler : public UniversalMachExcServer::Interface {
- public:
-  //! \brief Creates a new object that will store crash reports in \a database.
-  //!
-  //! \param[in] database The database to store crash reports in. Weak.
-  //! \param[in] upload_thread The upload thread to notify when a new crash
-  //!     report is written into \a database.
-  //! \param[in] process_annotations A map of annotations to insert as
-  //!     process-level annotations into each crash report that is written. Do
-  //!     not confuse this with module-level annotations, which are under the
-  //!     control of the crashing process, and are used to implement Chrome’s
-  //!     “crash keys.” Process-level annotations are those that are beyond the
-  //!     control of the crashing process, which must reliably be set even if
-  //!     the process crashes before it’s able to establish its own annotations.
-  //!     To interoperate with Breakpad servers, the recommended practice is to
-  //!     specify values for the `"prod"` and `"ver"` keys as process
-  //!     annotations.
-  //! \param[in] user_stream_data_sources Data sources to be used to extend
-  //!     crash reports. For each crash report that is written, the data sources
-  //!     are called in turn. These data sources may contribute additional
-  //!     minidump streams. `nullptr` if not required.
-  CrashReportExceptionHandler(
-      CrashReportDatabase* database,
-      CrashReportUploadThread* upload_thread,
-      const std::map<std::string, std::string>* process_annotations,
-      const UserStreamDataSources* user_stream_data_sources);
-
-  ~CrashReportExceptionHandler();
-
-  // UniversalMachExcServer::Interface:
-
-  //! \brief Processes an exception message by writing a crash report to this
-  //!     object’s CrashReportDatabase.
-  kern_return_t CatchMachException(
-      exception_behavior_t behavior,
-      exception_handler_t exception_port,
-      thread_t thread,
-      task_t task,
-      exception_type_t exception,
-      const mach_exception_data_type_t* code,
-      mach_msg_type_number_t code_count,
-      thread_state_flavor_t* flavor,
-      ConstThreadState old_state,
-      mach_msg_type_number_t old_state_count,
-      thread_state_t new_state,
-      mach_msg_type_number_t* new_state_count,
-      const mach_msg_trailer_t* trailer,
-      bool* destroy_complex_request) override;
-
- private:
-  CrashReportDatabase* database_;  // weak
-  CrashReportUploadThread* upload_thread_;  // weak
-  const std::map<std::string, std::string>* process_annotations_;  // weak
-  const UserStreamDataSources* user_stream_data_sources_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(CrashReportExceptionHandler);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_MAC_CRASH_REPORT_EXCEPTION_HANDLER_H_
diff --git a/Tools/Crashpad/include/handler/mac/exception_handler_server.h b/Tools/Crashpad/include/handler/mac/exception_handler_server.h
deleted file mode 100644
index 272cf76244..0000000000
--- a/Tools/Crashpad/include/handler/mac/exception_handler_server.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_
-#define CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_
-
-#include <mach/mach.h>
-
-#include "base/mac/scoped_mach_port.h"
-#include "base/macros.h"
-#include "util/mach/exc_server_variants.h"
-
-namespace crashpad {
-
-//! \brief Runs the main exception-handling server in Crashpad’s handler
-//!     process.
-class ExceptionHandlerServer {
- public:
-  //! \brief Constructs an ExceptionHandlerServer object.
-  //!
-  //! \param[in] receive_port The port that exception messages and no-senders
-  //!     notifications will be received on.
-  //! \param[in] launchd If `true`, the exception handler is being run from
-  //!     launchd. \a receive_port is not monitored for no-senders
-  //!     notifications, and instead, Stop() must be called to provide a “quit”
-  //!     signal.
-  ExceptionHandlerServer(base::mac::ScopedMachReceiveRight receive_port,
-                         bool launchd);
-  ~ExceptionHandlerServer();
-
-  //! \brief Runs the exception-handling server.
-  //!
-  //! \param[in] exception_interface An object to send exception messages to.
-  //!
-  //! This method monitors the receive port for exception messages and, if
-  //! not being run by launchd, no-senders notifications. It continues running
-  //! until it has no more clients, indicated by the receipt of a no-senders
-  //! notification, or until Stop() is called. When not being run by launchd, it
-  //! is important to assure that a send right exists in a client (or has been
-  //! queued by `mach_msg()` to be sent to a client) prior to calling this
-  //! method, or it will detect that it is sender-less and return immediately.
-  //!
-  //! All exception messages will be passed to \a exception_interface.
-  //!
-  //! This method must only be called once on an ExceptionHandlerServer object.
-  //!
-  //! If an unexpected condition that prevents this method from functioning is
-  //! encountered, it will log a message and terminate execution. Receipt of an
-  //! invalid message on the receive port will cause a message to be logged, but
-  //! this method will continue running normally.
-  void Run(UniversalMachExcServer::Interface* exception_interface);
-
-  //! \brief Stops a running exception-handling server.
-  //!
-  //! Stop() may be called at any time, and may be called from a signal handler.
-  //! If Stop() is called before Run() it will cause Run() to return as soon as
-  //! it is called. It is harmless to call Stop() after Run() has already
-  //! returned, or to call Stop() after it has already been called.
-  void Stop();
-
- private:
-  base::mac::ScopedMachReceiveRight receive_port_;
-  base::mac::ScopedMachReceiveRight notify_port_;
-  bool launchd_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_
diff --git a/Tools/Crashpad/include/handler/mac/file_limit_annotation.h b/Tools/Crashpad/include/handler/mac/file_limit_annotation.h
deleted file mode 100644
index 1131986e63..0000000000
--- a/Tools/Crashpad/include/handler/mac/file_limit_annotation.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_MAC_FILE_LIMIT_ANNOTATION_H_
-#define CRASHPAD_HANDLER_MAC_FILE_LIMIT_ANNOTATION_H_
-
-namespace crashpad {
-
-//! \brief Records a `"file-limits"` simple annotation for the process.
-//!
-//! This annotation will be used to confirm the theory that certain crashes are
-//! caused by systems at or near their file descriptor table size limits.
-//!
-//! The format of the annotation is four comma-separated values: the system-wide
-//! `kern.num_files` and `kern.maxfiles` values from `sysctl()`, and the
-//! process-specific current and maximum file descriptor limits from
-//! `getrlimit(RLIMIT_NOFILE, …)`.
-//!
-//! See https://crashpad.chromium.org/bug/180.
-//!
-//! TODO(mark): Remove this annotation after sufficient data has been collected
-//! for analysis.
-void RecordFileLimitAnnotation();
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_MAC_FILE_LIMIT_ANNOTATION_H_
diff --git a/Tools/Crashpad/include/handler/minidump_to_upload_parameters.h b/Tools/Crashpad/include/handler/minidump_to_upload_parameters.h
deleted file mode 100644
index 41056f7033..0000000000
--- a/Tools/Crashpad/include/handler/minidump_to_upload_parameters.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef HANDLER_MINIDUMP_TO_UPLOAD_PARAMETERS_H_
-#define HANDLER_MINIDUMP_TO_UPLOAD_PARAMETERS_H_
-
-#include <map>
-#include <string>
-
-#include "snapshot/process_snapshot.h"
-
-namespace crashpad {
-
-//! \brief Given a ProcessSnapshot, returns a map of key-value pairs to use as
-//!     HTTP form parameters for upload to a Breakpad crash report colleciton
-//!     server.
-//!
-//! The map is built by combining the process simple annotations map with
-//! each module’s simple annotations map and annotation objects.
-//!
-//! In the case of duplicate simple map keys or annotation names, the map will
-//! retain the first value found for any key, and will log a warning about
-//! discarded values. The precedence rules for annotation names are: the two
-//! reserved keys discussed below, process simple annotations, module simple
-//! annotations, and module annotation objects.
-//!
-//! For annotation objects, only ones of that are Annotation::Type::kString are
-//! included.
-//!
-//! Each module’s annotations vector is also examined and built into a single
-//! string value, with distinct elements separated by newlines, and stored at
-//! the key named “list_annotations”, which supersedes any other key found by
-//! that name.
-//!
-//! The client ID stored in the minidump is converted to a string and stored at
-//! the key named “guid”, which supersedes any other key found by that name.
-//!
-//! In the event of an error reading the minidump file, a message will be
-//! logged.
-//!
-//! \param[in] process_snapshot The process snapshot from which annotations
-//!     will be extracted.
-//!
-//! \returns A string map of the annotations.
-std::map<std::string, std::string> BreakpadHTTPFormParametersFromMinidump(
-    const ProcessSnapshot* process_snapshot);
-
-}  // namespace crashpad
-
-#endif  // HANDLER_MINIDUMP_TO_UPLOAD_PARAMETERS_H_
diff --git a/Tools/Crashpad/include/handler/prune_crash_reports_thread.h b/Tools/Crashpad/include/handler/prune_crash_reports_thread.h
deleted file mode 100644
index 72b69fc640..0000000000
--- a/Tools/Crashpad/include/handler/prune_crash_reports_thread.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_
-#define CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_
-
-#include <memory>
-
-#include "base/macros.h"
-#include "util/thread/worker_thread.h"
-
-namespace crashpad {
-
-class CrashReportDatabase;
-class PruneCondition;
-
-//! \brief A thread that periodically prunes crash reports from the database
-//!     using the specified condition.
-//!
-//! After the thread is started, the database is pruned using the condition
-//! every 24 hours. Upon calling Start(), the thread waits 10 minutes before
-//! performing the initial prune operation.
-class PruneCrashReportThread : public WorkerThread::Delegate {
- public:
-  //! \brief Constructs a new object.
-  //!
-  //! \param[in] database The database to prune crash reports from.
-  //! \param[in] condition The condition used to evaluate crash reports for
-  //!     pruning.
-  PruneCrashReportThread(CrashReportDatabase* database,
-                         std::unique_ptr<PruneCondition> condition);
-  ~PruneCrashReportThread();
-
-  //! \brief Starts a dedicated pruning thread.
-  //!
-  //! The thread waits before running the initial prune, so as to not interfere
-  //! with any startup-related IO performed by the client.
-  //!
-  //! This method may only be be called on a newly-constructed object or after
-  //! a call to Stop().
-  void Start();
-
-  //! \brief Stops the pruning thread.
-  //!
-  //! This method must only be called after Start(). If Start() has been called,
-  //! this method must be called before destroying an object of this class.
-  //!
-  //! This method may be called from any thread other than the pruning thread.
-  //! It is expected to only be called from the same thread that called Start().
-  void Stop();
-
- private:
-  // WorkerThread::Delegate:
-  void DoWork(const WorkerThread* thread) override;
-
-  WorkerThread thread_;
-  std::unique_ptr<PruneCondition> condition_;
-  CrashReportDatabase* database_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(PruneCrashReportThread);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_
diff --git a/Tools/Crashpad/include/handler/user_stream_data_source.h b/Tools/Crashpad/include/handler/user_stream_data_source.h
deleted file mode 100644
index 11bb9c3d47..0000000000
--- a/Tools/Crashpad/include/handler/user_stream_data_source.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_USER_STREAM_DATA_SOURCE_H_
-#define CRASHPAD_HANDLER_USER_STREAM_DATA_SOURCE_H_
-
-#include <memory>
-#include <vector>
-
-namespace crashpad {
-
-class MinidumpFileWriter;
-class MinidumpUserExtensionStreamDataSource;
-class ProcessSnapshot;
-
-//! \brief Extensibility interface for embedders who wish to add custom streams
-//!     to minidumps.
-class UserStreamDataSource {
- public:
-  virtual ~UserStreamDataSource() {}
-
-  //! \brief Produce the contents for an extension stream for a crashed program.
-  //!
-  //! Called after \a process_snapshot has been initialized for the crashed
-  //! process to (optionally) produce the contents of a user extension stream
-  //! that will be attached to the minidump.
-  //!
-  //! \param[in] process_snapshot An initialized snapshot for the crashed
-  //!     process.
-  //!
-  //! \return A new data source for the stream to add to the minidump or
-  //!      `nullptr` on failure or to opt out of adding a stream.
-  virtual std::unique_ptr<MinidumpUserExtensionStreamDataSource>
-  ProduceStreamData(ProcessSnapshot* process_snapshot) = 0;
-};
-
-using UserStreamDataSources =
-    std::vector<std::unique_ptr<UserStreamDataSource>>;
-
-//! \brief Adds user extension streams to a minidump.
-//!
-//! Dispatches to each source in \a user_stream_data_sources and adds returned
-//! extension streams to \a minidump_file_writer.
-//!
-//! \param[in] user_stream_data_sources A pointer to the data sources, or
-//!     `nullptr`.
-//! \param[in] process_snapshot An initialized snapshot to the crashing process.
-//! \param[in] minidump_file_writer Any extension streams will be added to this
-//!     minidump.
-void AddUserExtensionStreams(
-    const UserStreamDataSources* user_stream_data_sources,
-    ProcessSnapshot* process_snapshot,
-    MinidumpFileWriter* minidump_file_writer);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_USER_STREAM_DATA_SOURCE_H_
diff --git a/Tools/Crashpad/include/handler/win/crash_report_exception_handler.h b/Tools/Crashpad/include/handler/win/crash_report_exception_handler.h
deleted file mode 100644
index e1fb725d0d..0000000000
--- a/Tools/Crashpad/include/handler/win/crash_report_exception_handler.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_HANDLER_WIN_CRASH_REPORT_EXCEPTION_HANDLER_H_
-#define CRASHPAD_HANDLER_WIN_CRASH_REPORT_EXCEPTION_HANDLER_H_
-
-#include <windows.h>
-
-#include <map>
-#include <string>
-
-#include "base/macros.h"
-#include "handler/user_stream_data_source.h"
-#include "util/win/exception_handler_server.h"
-
-namespace crashpad {
-
-class CrashReportDatabase;
-class CrashReportUploadThread;
-
-//! \brief An exception handler that writes crash reports for exception messages
-//!     to a CrashReportDatabase.
-class CrashReportExceptionHandler : public ExceptionHandlerServer::Delegate {
- public:
-  //! \brief Creates a new object that will store crash reports in \a database.
-  //!
-  //! \param[in] database The database to store crash reports in. Weak.
-  //! \param[in] upload_thread The upload thread to notify when a new crash
-  //!     report is written into \a database.
-  //! \param[in] process_annotations A map of annotations to insert as
-  //!     process-level annotations into each crash report that is written. Do
-  //!     not confuse this with module-level annotations, which are under the
-  //!     control of the crashing process, and are used to implement Chrome's
-  //!     "crash keys." Process-level annotations are those that are beyond the
-  //!     control of the crashing process, which must reliably be set even if
-  //!     the process crashes before it's able to establish its own annotations.
-  //!     To interoperate with Breakpad servers, the recommended practice is to
-  //!     specify values for the `"prod"` and `"ver"` keys as process
-  //!     annotations.
-  //! \param[in] user_stream_data_sources Data sources to be used to extend
-  //!     crash reports. For each crash report that is written, the data sources
-  //!     are called in turn. These data sources may contribute additional
-  //!     minidump streams. `nullptr` if not required.
-  CrashReportExceptionHandler(
-      CrashReportDatabase* database,
-      CrashReportUploadThread* upload_thread,
-      const std::map<std::string, std::string>* process_annotations,
-      const UserStreamDataSources* user_stream_data_sources);
-
-  ~CrashReportExceptionHandler();
-
-  // ExceptionHandlerServer::Delegate:
-
-  //! \brief Processes an exception message by writing a crash report to this
-  //!     object's CrashReportDatabase.
-  void ExceptionHandlerServerStarted() override;
-  unsigned int ExceptionHandlerServerException(
-      HANDLE process,
-      WinVMAddress exception_information_address,
-      WinVMAddress debug_critical_section_address) override;
-
- private:
-  CrashReportDatabase* database_;  // weak
-  CrashReportUploadThread* upload_thread_;  // weak
-  const std::map<std::string, std::string>* process_annotations_;  // weak
-  const UserStreamDataSources* user_stream_data_sources_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(CrashReportExceptionHandler);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_HANDLER_WIN_CRASH_REPORT_EXCEPTION_HANDLER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_annotation_writer.h b/Tools/Crashpad/include/minidump/minidump_annotation_writer.h
deleted file mode 100644
index fc30dbc3a4..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_annotation_writer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_ANNOTATION_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_ANNOTATION_WRITER_H_
-
-#include <memory>
-#include <vector>
-
-#include "minidump/minidump_byte_array_writer.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_string_writer.h"
-#include "minidump/minidump_writable.h"
-#include "snapshot/annotation_snapshot.h"
-
-namespace crashpad {
-
-//! \brief The writer for a MinidumpAnnotation object in a minidump file.
-//!
-//! Because MinidumpAnnotation objects only appear as elements
-//! of MinidumpAnnotationList objects, this class does not write any
-//! data on its own. It makes its MinidumpAnnotation data available to its
-//! MinidumpAnnotationList parent, which writes it as part of a
-//! MinidumpAnnotationList.
-class MinidumpAnnotationWriter final : public internal::MinidumpWritable {
- public:
-  MinidumpAnnotationWriter();
-  ~MinidumpAnnotationWriter();
-
-  //! \brief Initializes the annotation writer with data from an
-  //!     AnnotationSnapshot.
-  void InitializeFromSnapshot(const AnnotationSnapshot& snapshot);
-
-  //! \brief Initializes the annotation writer with data values.
-  void InitializeWithData(const std::string& name,
-                          uint16_t type,
-                          const std::vector<uint8_t>& data);
-
-  //! \brief Returns the MinidumpAnnotation referencing this object’s data.
-  const MinidumpAnnotation* minidump_annotation() const { return &annotation_; }
-
- protected:
-  // MinidumpWritable:
-
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<internal::MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  MinidumpAnnotation annotation_;
-  internal::MinidumpUTF8StringWriter name_;
-  MinidumpByteArrayWriter value_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpAnnotationWriter);
-};
-
-//! \brief The writer for a MinidumpAnnotationList object in a minidump file,
-//!     containing a list of MinidumpAnnotation objects.
-class MinidumpAnnotationListWriter final : public internal::MinidumpWritable {
- public:
-  MinidumpAnnotationListWriter();
-  ~MinidumpAnnotationListWriter();
-
-  //! \brief Initializes the annotation list writer with a list of
-  //!      AnnotationSnapshot objects.
-  void InitializeFromList(const std::vector<AnnotationSnapshot>& list);
-
-  //! \brief Adds a single MinidumpAnnotationWriter to the list to be written.
-  void AddObject(std::unique_ptr<MinidumpAnnotationWriter> annotation_writer);
-
-  //! \brief Determines whether the object is useful.
-  //!
-  //! A useful object is one that carries data that makes a meaningful
-  //! contribution to a minidump file. An object carrying entries would be
-  //! considered useful.
-  //!
-  //! \return `true` if the object is useful, `false` otherwise.
-  bool IsUseful() const;
-
- protected:
-  // MinidumpWritable:
-
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<internal::MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  std::unique_ptr<MinidumpAnnotationList> minidump_list_;
-  std::vector<std::unique_ptr<MinidumpAnnotationWriter>> objects_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpAnnotationListWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_ANNOTATION_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_byte_array_writer.h b/Tools/Crashpad/include/minidump/minidump_byte_array_writer.h
deleted file mode 100644
index c399f0358d..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_byte_array_writer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_BYTE_ARRAY_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_BYTE_ARRAY_WRITER_H_
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-//! \brief Writes a variable-length byte array for a minidump into a
-//!     \sa MinidumpByteArray.
-class MinidumpByteArrayWriter final : public internal::MinidumpWritable {
- public:
-  MinidumpByteArrayWriter();
-  ~MinidumpByteArrayWriter() override;
-
-  //! \brief Sets the data to be written.
-  //!
-  //! \note Valid in #kStateMutable.
-  void set_data(const std::vector<uint8_t>& data) { data_ = data; }
-
-  //! \brief Sets the data to be written.
-  //!
-  //! \note Valid in #kStateMutable.
-  void set_data(const uint8_t* data, size_t size);
-
-  //! \brief Gets the data to be written.
-  //!
-  //! \note Valid in any state.
-  const std::vector<uint8_t>& data() const { return data_; }
-
- protected:
-  // MinidumpWritable:
-
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  std::unique_ptr<MinidumpByteArray> minidump_array_;
-  std::vector<uint8_t> data_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpByteArrayWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_BYTE_ARRAY_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_context.h b/Tools/Crashpad/include/minidump/minidump_context.h
deleted file mode 100644
index 1226b654aa..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_context.h
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
-
-#include <stdint.h>
-
-#include "base/compiler_specific.h"
-#include "snapshot/cpu_context.h"
-#include "util/numeric/int128.h"
-
-namespace crashpad {
-
-//! \brief Architecture-independent flags for `context_flags` fields in Minidump
-//!    context structures.
-//
-// https://zachsaw.blogspot.com/2010/11/wow64-bug-getthreadcontext-may-return.html#c5639760895973344002
-enum MinidumpContextFlags : uint32_t {
-  //! \brief The thread was executing a trap handler in kernel mode
-  //!     (`CONTEXT_EXCEPTION_ACTIVE`).
-  //!
-  //! If this bit is set, it indicates that the context is from a thread that
-  //! was executing a trap handler in the kernel. This bit is only valid when
-  //! ::kMinidumpContextExceptionReporting is also set. This bit is only used on
-  //! Windows.
-  kMinidumpContextExceptionActive = 0x08000000,
-
-  //! \brief The thread was executing a system call in kernel mode
-  //!     (`CONTEXT_SERVICE_ACTIVE`).
-  //!
-  //! If this bit is set, it indicates that the context is from a thread that
-  //! was executing a system call in the kernel. This bit is only valid when
-  //! ::kMinidumpContextExceptionReporting is also set. This bit is only used on
-  //! Windows.
-  kMinidumpContextServiceActive = 0x10000000,
-
-  //! \brief Kernel-mode state reporting is desired
-  //!     (`CONTEXT_EXCEPTION_REQUEST`).
-  //!
-  //! This bit is not used in context structures containing snapshots of thread
-  //! CPU context. It used when calling `GetThreadContext()` on Windows to
-  //! specify that kernel-mode state reporting
-  //! (::kMinidumpContextExceptionReporting) is desired in the returned context
-  //! structure.
-  kMinidumpContextExceptionRequest = 0x40000000,
-
-  //! \brief Kernel-mode state reporting is provided
-  //!     (`CONTEXT_EXCEPTION_REPORTING`).
-  //!
-  //! If this bit is set, it indicates that the bits indicating how the thread
-  //! had entered kernel mode (::kMinidumpContextExceptionActive and
-  //! ::kMinidumpContextServiceActive) are valid. This bit is only used on
-  //! Windows.
-  kMinidumpContextExceptionReporting = 0x80000000,
-};
-
-//! \brief 32-bit x86-specifc flags for MinidumpContextX86::context_flags.
-enum MinidumpContextX86Flags : uint32_t {
-  //! \brief Identifies the context structure as 32-bit x86. This is the same as
-  //!     `CONTEXT_i386` and `CONTEXT_i486` on Windows for this architecture.
-  kMinidumpContextX86 = 0x00010000,
-
-  //! \brief Indicates the validity of control registers (`CONTEXT_CONTROL`).
-  //!
-  //! The `ebp`, `eip`, `cs`, `eflags`, `esp`, and `ss` fields are valid.
-  kMinidumpContextX86Control = kMinidumpContextX86 | 0x00000001,
-
-  //! \brief Indicates the validity of non-control integer registers
-  //!     (`CONTEXT_INTEGER`).
-  //!
-  //! The `edi`, `esi`, `ebx`, `edx`, `ecx, and `eax` fields are valid.
-  kMinidumpContextX86Integer = kMinidumpContextX86 | 0x00000002,
-
-  //! \brief Indicates the validity of non-control segment registers
-  //!     (`CONTEXT_SEGMENTS`).
-  //!
-  //! The `gs`, `fs`, `es`, and `ds` fields are valid.
-  kMinidumpContextX86Segment = kMinidumpContextX86 | 0x00000004,
-
-  //! \brief Indicates the validity of floating-point state
-  //!     (`CONTEXT_FLOATING_POINT`).
-  //!
-  //! The `fsave` field is valid. The `float_save` field is included in this
-  //! definition, but its members have no practical use asdie from `fsave`.
-  kMinidumpContextX86FloatingPoint = kMinidumpContextX86 | 0x00000008,
-
-  //! \brief Indicates the validity of debug registers
-  //!     (`CONTEXT_DEBUG_REGISTERS`).
-  //!
-  //! The `dr0` through `dr3`, `dr6`, and `dr7` fields are valid.
-  kMinidumpContextX86Debug = kMinidumpContextX86 | 0x00000010,
-
-  //! \brief Indicates the validity of extended registers in `fxsave` format
-  //!     (`CONTEXT_EXTENDED_REGISTERS`).
-  //!
-  //! The `extended_registers` field is valid and contains `fxsave` data.
-  kMinidumpContextX86Extended = kMinidumpContextX86 | 0x00000020,
-
-  //! \brief Indicates the validity of `xsave` data (`CONTEXT_XSTATE`).
-  //!
-  //! The context contains `xsave` data. This is used with an extended context
-  //! structure not currently defined here.
-  kMinidumpContextX86Xstate = kMinidumpContextX86 | 0x00000040,
-
-  //! \brief Indicates the validity of control, integer, and segment registers.
-  //!     (`CONTEXT_FULL`).
-  kMinidumpContextX86Full = kMinidumpContextX86Control |
-                            kMinidumpContextX86Integer |
-                            kMinidumpContextX86Segment,
-
-  //! \brief Indicates the validity of all registers except `xsave` data.
-  //!     (`CONTEXT_ALL`).
-  kMinidumpContextX86All = kMinidumpContextX86Full |
-                           kMinidumpContextX86FloatingPoint |
-                           kMinidumpContextX86Debug |
-                           kMinidumpContextX86Extended,
-};
-
-//! \brief A 32-bit x86 CPU context (register state) carried in a minidump file.
-//!
-//! This is analogous to the `CONTEXT` structure on Windows when targeting
-//! 32-bit x86, and the `WOW64_CONTEXT` structure when targeting an x86-family
-//! CPU, either 32- or 64-bit. This structure is used instead of `CONTEXT` or
-//! `WOW64_CONTEXT` to make it available when targeting other architectures.
-//!
-//! \note This structure doesn’t carry `dr4` or `dr5`, which are obsolete and
-//!     normally alias `dr6` and `dr7`, respectively. See Intel Software
-//!     Developer’s Manual, Volume 3B: System Programming, Part 2 (253669-052),
-//!     17.2.2 “Debug Registers DR4 and DR5”.
-struct MinidumpContextX86 {
-  //! \brief A bitfield composed of values of #MinidumpContextFlags and
-  //!     #MinidumpContextX86Flags.
-  //!
-  //! This field identifies the context structure as a 32-bit x86 CPU context,
-  //! and indicates which other fields in the structure are valid.
-  uint32_t context_flags;
-
-  uint32_t dr0;
-  uint32_t dr1;
-  uint32_t dr2;
-  uint32_t dr3;
-  uint32_t dr6;
-  uint32_t dr7;
-
-  // CPUContextX86::Fsave has identical layout to what the x86 CONTEXT structure
-  // places here.
-  CPUContextX86::Fsave fsave;
-  union {
-    uint32_t spare_0;  // As in the native x86 CONTEXT structure since Windows 8
-    uint32_t cr0_npx_state;  // As in WOW64_CONTEXT and older SDKs’ x86 CONTEXT
-  } float_save;
-
-  uint32_t gs;
-  uint32_t fs;
-  uint32_t es;
-  uint32_t ds;
-
-  uint32_t edi;
-  uint32_t esi;
-  uint32_t ebx;
-  uint32_t edx;
-  uint32_t ecx;
-  uint32_t eax;
-
-  uint32_t ebp;
-  uint32_t eip;
-  uint32_t cs;
-  uint32_t eflags;
-  uint32_t esp;
-  uint32_t ss;
-
-  // CPUContextX86::Fxsave has identical layout to what the x86 CONTEXT
-  // structure places here.
-  CPUContextX86::Fxsave fxsave;
-};
-
-//! \brief x86_64-specific flags for MinidumpContextAMD64::context_flags.
-enum MinidumpContextAMD64Flags : uint32_t {
-  //! \brief Identifies the context structure as x86_64. This is the same as
-  //!     `CONTEXT_AMD64` on Windows for this architecture.
-  kMinidumpContextAMD64 = 0x00100000,
-
-  //! \brief Indicates the validity of control registers (`CONTEXT_CONTROL`).
-  //!
-  //! The `cs`, `ss`, `eflags`, `rsp`, and `rip` fields are valid.
-  kMinidumpContextAMD64Control = kMinidumpContextAMD64 | 0x00000001,
-
-  //! \brief Indicates the validity of non-control integer registers
-  //!     (`CONTEXT_INTEGER`).
-  //!
-  //! The `rax`, `rcx`, `rdx`, `rbx`, `rbp`, `rsi`, `rdi`, and `r8` through
-  //! `r15` fields are valid.
-  kMinidumpContextAMD64Integer = kMinidumpContextAMD64 | 0x00000002,
-
-  //! \brief Indicates the validity of non-control segment registers
-  //!     (`CONTEXT_SEGMENTS`).
-  //!
-  //! The `ds`, `es`, `fs`, and `gs` fields are valid.
-  kMinidumpContextAMD64Segment = kMinidumpContextAMD64 | 0x00000004,
-
-  //! \brief Indicates the validity of floating-point state
-  //!     (`CONTEXT_FLOATING_POINT`).
-  //!
-  //! The `xmm0` through `xmm15` fields are valid.
-  kMinidumpContextAMD64FloatingPoint = kMinidumpContextAMD64 | 0x00000008,
-
-  //! \brief Indicates the validity of debug registers
-  //!     (`CONTEXT_DEBUG_REGISTERS`).
-  //!
-  //! The `dr0` through `dr3`, `dr6`, and `dr7` fields are valid.
-  kMinidumpContextAMD64Debug = kMinidumpContextAMD64 | 0x00000010,
-
-  //! \brief Indicates the validity of `xsave` data (`CONTEXT_XSTATE`).
-  //!
-  //! The context contains `xsave` data. This is used with an extended context
-  //! structure not currently defined here.
-  kMinidumpContextAMD64Xstate = kMinidumpContextAMD64 | 0x00000040,
-
-  //! \brief Indicates the validity of control, integer, and floating-point
-  //!     registers (`CONTEXT_FULL`).
-  kMinidumpContextAMD64Full = kMinidumpContextAMD64Control |
-                              kMinidumpContextAMD64Integer |
-                              kMinidumpContextAMD64FloatingPoint,
-
-  //! \brief Indicates the validity of all registers except `xsave` data
-  //!     (`CONTEXT_ALL`).
-  kMinidumpContextAMD64All = kMinidumpContextAMD64Full |
-                             kMinidumpContextAMD64Segment |
-                             kMinidumpContextAMD64Debug,
-};
-
-//! \brief An x86_64 (AMD64) CPU context (register state) carried in a minidump
-//!     file.
-//!
-//! This is analogous to the `CONTEXT` structure on Windows when targeting
-//! x86_64. This structure is used instead of `CONTEXT` to make it available
-//! when targeting other architectures.
-//!
-//! \note This structure doesn’t carry `dr4` or `dr5`, which are obsolete and
-//!     normally alias `dr6` and `dr7`, respectively. See Intel Software
-//!     Developer’s Manual, Volume 3B: System Programming, Part 2 (253669-052),
-//!     17.2.2 “Debug Registers DR4 and DR5”.
-struct alignas(16) MinidumpContextAMD64 {
-  //! \brief Register parameter home address.
-  //!
-  //! On Windows, this field may contain the “home” address (on-stack, in the
-  //! shadow area) of a parameter passed by register. This field is present for
-  //! convenience but is not necessarily populated, even if a corresponding
-  //! parameter was passed by register.
-  //!
-  //! \{
-  uint64_t p1_home;
-  uint64_t p2_home;
-  uint64_t p3_home;
-  uint64_t p4_home;
-  uint64_t p5_home;
-  uint64_t p6_home;
-  //! \}
-
-  //! \brief A bitfield composed of values of #MinidumpContextFlags and
-  //!     #MinidumpContextAMD64Flags.
-  //!
-  //! This field identifies the context structure as an x86_64 CPU context, and
-  //! indicates which other fields in the structure are valid.
-  uint32_t context_flags;
-
-  uint32_t mx_csr;
-
-  uint16_t cs;
-  uint16_t ds;
-  uint16_t es;
-  uint16_t fs;
-  uint16_t gs;
-  uint16_t ss;
-
-  uint32_t eflags;
-
-  uint64_t dr0;
-  uint64_t dr1;
-  uint64_t dr2;
-  uint64_t dr3;
-  uint64_t dr6;
-  uint64_t dr7;
-
-  uint64_t rax;
-  uint64_t rcx;
-  uint64_t rdx;
-  uint64_t rbx;
-  uint64_t rsp;
-  uint64_t rbp;
-  uint64_t rsi;
-  uint64_t rdi;
-  uint64_t r8;
-  uint64_t r9;
-  uint64_t r10;
-  uint64_t r11;
-  uint64_t r12;
-  uint64_t r13;
-  uint64_t r14;
-  uint64_t r15;
-
-  uint64_t rip;
-
-  // CPUContextX86_64::Fxsave has identical layout to what the x86_64 CONTEXT
-  // structure places here.
-  CPUContextX86_64::Fxsave fxsave;
-
-  uint128_struct vector_register[26];
-  uint64_t vector_control;
-
-  //! \brief Model-specific debug extension register.
-  //!
-  //! See Intel Software Developer’s Manual, Volume 3B: System Programming, Part
-  //! 2 (253669-051), 17.4 “Last Branch, Interrupt, and Exception Recording
-  //! Overview”, and AMD Architecture Programmer’s Manual, Volume 2: System
-  //! Programming (24593-3.24), 13.1.6 “Control-Transfer Breakpoint Features”.
-  //!
-  //! \{
-  uint64_t debug_control;
-  uint64_t last_branch_to_rip;
-  uint64_t last_branch_from_rip;
-  uint64_t last_exception_to_rip;
-  uint64_t last_exception_from_rip;
-  //! \}
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_context_writer.h b/Tools/Crashpad/include/minidump/minidump_context_writer.h
deleted file mode 100644
index 25d717e585..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_context_writer.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
-
-#include <sys/types.h>
-
-#include <memory>
-
-#include "base/macros.h"
-#include "minidump/minidump_context.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-struct CPUContext;
-struct CPUContextX86;
-struct CPUContextX86_64;
-
-//! \brief The base class for writers of CPU context structures in minidump
-//!     files.
-class MinidumpContextWriter : public internal::MinidumpWritable {
- public:
-  ~MinidumpContextWriter() override;
-
-  //! \brief Creates a MinidumpContextWriter based on \a context_snapshot.
-  //!
-  //! \param[in] context_snapshot The context snapshot to use as source data.
-  //!
-  //! \return A MinidumpContextWriter subclass, such as MinidumpContextWriterX86
-  //!     or MinidumpContextWriterAMD64, appropriate to the CPU type of \a
-  //!     context_snapshot. The returned object is initialized using the source
-  //!     data in \a context_snapshot. If \a context_snapshot is an unknown CPU
-  //!     type’s context, logs a message and returns `nullptr`.
-  static std::unique_ptr<MinidumpContextWriter> CreateFromSnapshot(
-      const CPUContext* context_snapshot);
-
- protected:
-  MinidumpContextWriter() : MinidumpWritable() {}
-
-  //! \brief Returns the size of the context structure that this object will
-  //!     write.
-  //!
-  //! \note This method will only be called in #kStateFrozen or a subsequent
-  //!     state.
-  virtual size_t ContextSize() const = 0;
-
-  // MinidumpWritable:
-  size_t SizeOfObject() final;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MinidumpContextWriter);
-};
-
-//! \brief The writer for a MinidumpContextX86 structure in a minidump file.
-class MinidumpContextX86Writer final : public MinidumpContextWriter {
- public:
-  MinidumpContextX86Writer();
-  ~MinidumpContextX86Writer() override;
-
-  //! \brief Initializes the MinidumpContextX86 based on \a context_snapshot.
-  //!
-  //! \param[in] context_snapshot The context snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutation of context() may be done before
-  //!     calling this method, and it is not normally necessary to alter
-  //!     context() after calling this method.
-  void InitializeFromSnapshot(const CPUContextX86* context_snapshot);
-
-  //! \brief Returns a pointer to the context structure that this object will
-  //!     write.
-  //!
-  //! \attention This returns a non-`const` pointer to this object’s private
-  //!     data so that a caller can populate the context structure directly.
-  //!     This is done because providing setter interfaces to each field in the
-  //!     context structure would be unwieldy and cumbersome. Care must be taken
-  //!     to populate the context structure correctly. The context structure
-  //!     must only be modified while this object is in the #kStateMutable
-  //!     state.
-  MinidumpContextX86* context() { return &context_; }
-
- protected:
-  // MinidumpWritable:
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpContextWriter:
-  size_t ContextSize() const override;
-
- private:
-  MinidumpContextX86 context_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpContextX86Writer);
-};
-
-//! \brief The writer for a MinidumpContextAMD64 structure in a minidump file.
-class MinidumpContextAMD64Writer final : public MinidumpContextWriter {
- public:
-  MinidumpContextAMD64Writer();
-  ~MinidumpContextAMD64Writer() override;
-
-  // Ensure proper alignment of heap-allocated objects. This should not be
-  // necessary in C++17.
-  static void* operator new(size_t size);
-  static void operator delete(void* ptr);
-
-  // Prevent unaligned heap-allocated arrays. Provisions could be made to allow
-  // these if necessary, but there is currently no use for them.
-  static void* operator new[](size_t size) = delete;
-  static void operator delete[](void* ptr) = delete;
-
-  //! \brief Initializes the MinidumpContextAMD64 based on \a context_snapshot.
-  //!
-  //! \param[in] context_snapshot The context snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutation of context() may be done before
-  //!     calling this method, and it is not normally necessary to alter
-  //!     context() after calling this method.
-  void InitializeFromSnapshot(const CPUContextX86_64* context_snapshot);
-
-  //! \brief Returns a pointer to the context structure that this object will
-  //!     write.
-  //!
-  //! \attention This returns a non-`const` pointer to this object’s private
-  //!     data so that a caller can populate the context structure directly.
-  //!     This is done because providing setter interfaces to each field in the
-  //!     context structure would be unwieldy and cumbersome. Care must be taken
-  //!     to populate the context structure correctly. The context structure
-  //!     must only be modified while this object is in the #kStateMutable
-  //!     state.
-  MinidumpContextAMD64* context() { return &context_; }
-
- protected:
-  // MinidumpWritable:
-  size_t Alignment() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpContextWriter:
-  size_t ContextSize() const override;
-
- private:
-  MinidumpContextAMD64 context_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpContextAMD64Writer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_crashpad_info_writer.h b/Tools/Crashpad/include/minidump/minidump_crashpad_info_writer.h
deleted file mode 100644
index 4624b24d23..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_crashpad_info_writer.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_
-
-#include <sys/types.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_stream_writer.h"
-#include "util/misc/uuid.h"
-
-namespace crashpad {
-
-class MinidumpModuleCrashpadInfoListWriter;
-class MinidumpSimpleStringDictionaryWriter;
-class ProcessSnapshot;
-
-//! \brief The writer for a MinidumpCrashpadInfo stream in a minidump file.
-class MinidumpCrashpadInfoWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpCrashpadInfoWriter();
-  ~MinidumpCrashpadInfoWriter() override;
-
-  //! \brief Initializes MinidumpCrashpadInfo based on \a process_snapshot.
-  //!
-  //! This method may add additional structures to the minidump file as children
-  //! of the MinidumpCrashpadInfo stream. To do so, it may obtain other
-  //! snapshot information from \a process_snapshot, such as a list of
-  //! ModuleSnapshot objects used to initialize
-  //! MinidumpCrashpadInfo::module_list. Only data that is considered useful
-  //! will be included. For module information, usefulness is determined by
-  //! MinidumpModuleCrashpadInfoListWriter::IsUseful().
-  //!
-  //! \param[in] process_snapshot The process snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ProcessSnapshot* process_snapshot);
-
-  //! \brief Sets MinidumpCrashpadInfo::report_id.
-  void SetReportID(const UUID& report_id);
-
-  //! \brief Sets MinidumpCrashpadInfo::client_id.
-  void SetClientID(const UUID& client_id);
-
-  //! \brief Arranges for MinidumpCrashpadInfo::simple_annotations to point to
-  //!     the MinidumpSimpleStringDictionaryWriter object to be written by \a
-  //!     simple_annotations.
-  //!
-  //! This object takes ownership of \a simple_annotations and becomes its
-  //! parent in the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetSimpleAnnotations(
-      std::unique_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations);
-
-  //! \brief Arranges for MinidumpCrashpadInfo::module_list to point to the
-  //!     MinidumpModuleCrashpadInfoList object to be written by \a
-  //!     module_list.
-  //!
-  //! This object takes ownership of \a module_list and becomes its parent in
-  //! the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetModuleList(
-      std::unique_ptr<MinidumpModuleCrashpadInfoListWriter> module_list);
-
-  //! \brief Determines whether the object is useful.
-  //!
-  //! A useful object is one that carries data that makes a meaningful
-  //! contribution to a minidump file. An object carrying children would be
-  //! considered useful.
-  //!
-  //! \return `true` if the object is useful, `false` otherwise.
-  bool IsUseful() const;
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  MinidumpCrashpadInfo crashpad_info_;
-  std::unique_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations_;
-  std::unique_ptr<MinidumpModuleCrashpadInfoListWriter> module_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpCrashpadInfoWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_exception_writer.h b/Tools/Crashpad/include/minidump/minidump_exception_writer.h
deleted file mode 100644
index cc8c6bef04..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_exception_writer.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_EXCEPTION_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_EXCEPTION_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_thread_id_map.h"
-
-namespace crashpad {
-
-class ExceptionSnapshot;
-class MinidumpContextWriter;
-class MinidumpMemoryListWriter;
-
-//! \brief The writer for a MINIDUMP_EXCEPTION_STREAM stream in a minidump file.
-class MinidumpExceptionWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpExceptionWriter();
-  ~MinidumpExceptionWriter() override;
-
-  //! \brief Initializes the MINIDUMP_EXCEPTION_STREAM based on \a
-  //!     exception_snapshot.
-  //!
-  //! \param[in] exception_snapshot The exception snapshot to use as source
-  //!     data.
-  //! \param[in] thread_id_map A MinidumpThreadIDMap to be consulted to
-  //!     determine the 32-bit minidump thread ID to use for the thread
-  //!     identified by \a exception_snapshot.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ExceptionSnapshot* exception_snapshot,
-                              const MinidumpThreadIDMap& thread_id_map);
-
-  //! \brief Arranges for MINIDUMP_EXCEPTION_STREAM::ThreadContext to point to
-  //!     the CPU context to be written by \a context.
-  //!
-  //! A context is required in all MINIDUMP_EXCEPTION_STREAM objects.
-  //!
-  //! This object takes ownership of \a context and becomes its parent in the
-  //! overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetContext(std::unique_ptr<MinidumpContextWriter> context);
-
-  //! \brief Sets MINIDUMP_EXCEPTION_STREAM::ThreadId.
-  void SetThreadID(uint32_t thread_id) { exception_.ThreadId = thread_id; }
-
-  //! \brief Sets MINIDUMP_EXCEPTION::ExceptionCode.
-  void SetExceptionCode(uint32_t exception_code) {
-    exception_.ExceptionRecord.ExceptionCode = exception_code;
-  }
-
-  //! \brief Sets MINIDUMP_EXCEPTION::ExceptionFlags.
-  void SetExceptionFlags(uint32_t exception_flags) {
-    exception_.ExceptionRecord.ExceptionFlags = exception_flags;
-  }
-
-  //! \brief Sets MINIDUMP_EXCEPTION::ExceptionRecord.
-  void SetExceptionRecord(uint64_t exception_record) {
-    exception_.ExceptionRecord.ExceptionRecord = exception_record;
-  }
-
-  //! \brief Sets MINIDUMP_EXCEPTION::ExceptionAddress.
-  void SetExceptionAddress(uint64_t exception_address) {
-    exception_.ExceptionRecord.ExceptionAddress = exception_address;
-  }
-
-  //! \brief Sets MINIDUMP_EXCEPTION::ExceptionInformation and
-  //!     MINIDUMP_EXCEPTION::NumberParameters.
-  //!
-  //! MINIDUMP_EXCEPTION::NumberParameters is set to the number of elements in
-  //! \a exception_information. The elements of
-  //! MINIDUMP_EXCEPTION::ExceptionInformation are set to the elements of \a
-  //! exception_information. Unused elements in
-  //! MINIDUMP_EXCEPTION::ExceptionInformation are set to `0`.
-  //!
-  //! \a exception_information must have no more than
-  //! #EXCEPTION_MAXIMUM_PARAMETERS elements.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetExceptionInformation(
-      const std::vector<uint64_t>& exception_information);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  MINIDUMP_EXCEPTION_STREAM exception_;
-  std::unique_ptr<MinidumpContextWriter> context_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpExceptionWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_EXCEPTION_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_extensions.h b/Tools/Crashpad/include/minidump/minidump_extensions.h
deleted file mode 100644
index 4ddab3bfee..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_extensions.h
+++ /dev/null
@@ -1,497 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <winnt.h>
-
-#include "base/compiler_specific.h"
-#include "build/build_config.h"
-#include "util/misc/pdb_structures.h"
-#include "util/misc/uuid.h"
-
-// C4200 is "nonstandard extension used : zero-sized array in struct/union".
-// We would like to globally disable this warning, but unfortunately, the
-// compiler is buggy and only supports disabling it with a pragma, so we can't
-// disable it with other silly warnings in build/common.gypi. See:
-//   https://connect.microsoft.com/VisualStudio/feedback/details/1114440
-MSVC_PUSH_DISABLE_WARNING(4200);
-
-#if defined(COMPILER_MSVC)
-#define PACKED
-#pragma pack(push, 1)
-#else
-#define PACKED __attribute__((packed))
-#endif  // COMPILER_MSVC
-
-namespace crashpad {
-
-//! \brief Minidump stream type values for MINIDUMP_DIRECTORY::StreamType. Each
-//!     stream structure has a corresponding stream type value to identify it.
-//!
-//! \sa MINIDUMP_STREAM_TYPE
-enum MinidumpStreamType : uint32_t {
-  //! \brief The stream type for MINIDUMP_THREAD_LIST.
-  //!
-  //! \sa ThreadListStream
-  kMinidumpStreamTypeThreadList = ThreadListStream,
-
-  //! \brief The stream type for MINIDUMP_MODULE_LIST.
-  //!
-  //! \sa ModuleListStream
-  kMinidumpStreamTypeModuleList = ModuleListStream,
-
-  //! \brief The stream type for MINIDUMP_MEMORY_LIST.
-  //!
-  //! \sa MemoryListStream
-  kMinidumpStreamTypeMemoryList = MemoryListStream,
-
-  //! \brief The stream type for MINIDUMP_EXCEPTION_STREAM.
-  //!
-  //! \sa ExceptionStream
-  kMinidumpStreamTypeException = ExceptionStream,
-
-  //! \brief The stream type for MINIDUMP_SYSTEM_INFO.
-  //!
-  //! \sa SystemInfoStream
-  kMinidumpStreamTypeSystemInfo = SystemInfoStream,
-
-  //! \brief The stream type for MINIDUMP_HANDLE_DATA_STREAM.
-  //!
-  //! \sa HandleDataStream
-  kMinidumpStreamTypeHandleData = HandleDataStream,
-
-  //! \brief The stream type for MINIDUMP_UNLOADED_MODULE_LIST.
-  //!
-  //! \sa UnloadedModuleListStream
-  kMinidumpStreamTypeUnloadedModuleList = UnloadedModuleListStream,
-
-  //! \brief The stream type for MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2,
-  //!     MINIDUMP_MISC_INFO_3, and MINIDUMP_MISC_INFO_4.
-  //!
-  //! \sa MiscInfoStream
-  kMinidumpStreamTypeMiscInfo = MiscInfoStream,
-
-  //! \brief The stream type for MINIDUMP_MEMORY_INFO_LIST.
-  //!
-  //! \sa MemoryInfoListStream
-  kMinidumpStreamTypeMemoryInfoList = MemoryInfoListStream,
-
-  // 0x4350 = "CP"
-
-  //! \brief The stream type for MinidumpCrashpadInfo.
-  kMinidumpStreamTypeCrashpadInfo = 0x43500001,
-};
-
-//! \brief A variable-length UTF-8-encoded string carried within a minidump
-//!     file.
-//!
-//! \sa MINIDUMP_STRING
-struct ALIGNAS(4) PACKED MinidumpUTF8String {
-  // The field names do not conform to typical style, they match the names used
-  // in MINIDUMP_STRING. This makes it easier to operate on MINIDUMP_STRING (for
-  // UTF-16 strings) and MinidumpUTF8String using templates.
-
-  //! \brief The length of the #Buffer field in bytes, not including the `NUL`
-  //!     terminator.
-  //!
-  //! \note This field is interpreted as a byte count, not a count of Unicode
-  //!     code points.
-  uint32_t Length;
-
-  //! \brief The string, encoded in UTF-8, and terminated with a `NUL` byte.
-  uint8_t Buffer[0];
-};
-
-//! \brief A variable-length array of bytes carried within a minidump file.
-//!     The data have no intrinsic type and should be interpreted according
-//!     to their referencing context.
-struct ALIGNAS(4) PACKED MinidumpByteArray {
-  //! \brief The length of the #data field.
-  uint32_t length;
-
-  //! \brief The bytes of data.
-  uint8_t data[0];
-};
-
-//! \brief CPU type values for MINIDUMP_SYSTEM_INFO::ProcessorArchitecture.
-//!
-//! \sa \ref PROCESSOR_ARCHITECTURE_x "PROCESSOR_ARCHITECTURE_*"
-enum MinidumpCPUArchitecture : uint16_t {
-  //! \brief 32-bit x86.
-  //!
-  //! These systems identify their CPUs generically as “x86” or “ia32”, or with
-  //! more specific names such as “i386”, “i486”, “i586”, and “i686”.
-  kMinidumpCPUArchitectureX86 = PROCESSOR_ARCHITECTURE_INTEL,
-
-  kMinidumpCPUArchitectureMIPS = PROCESSOR_ARCHITECTURE_MIPS,
-  kMinidumpCPUArchitectureAlpha = PROCESSOR_ARCHITECTURE_ALPHA,
-
-  //! \brief 32-bit PowerPC.
-  //!
-  //! These systems identify their CPUs generically as “ppc”, or with more
-  //! specific names such as “ppc6xx”, “ppc7xx”, and “ppc74xx”.
-  kMinidumpCPUArchitecturePPC = PROCESSOR_ARCHITECTURE_PPC,
-
-  kMinidumpCPUArchitectureSHx = PROCESSOR_ARCHITECTURE_SHX,
-
-  //! \brief 32-bit ARM.
-  //!
-  //! These systems identify their CPUs generically as “arm”, or with more
-  //! specific names such as “armv6” and “armv7”.
-  kMinidumpCPUArchitectureARM = PROCESSOR_ARCHITECTURE_ARM,
-
-  kMinidumpCPUArchitectureIA64 = PROCESSOR_ARCHITECTURE_IA64,
-  kMinidumpCPUArchitectureAlpha64 = PROCESSOR_ARCHITECTURE_ALPHA64,
-  kMinidumpCPUArchitectureMSIL = PROCESSOR_ARCHITECTURE_MSIL,
-
-  //! \brief 64-bit x86.
-  //!
-  //! These systems identify their CPUs as “x86_64”, “amd64”, or “x64”.
-  kMinidumpCPUArchitectureAMD64 = PROCESSOR_ARCHITECTURE_AMD64,
-
-  //! \brief A 32-bit x86 process running on IA-64 (Itanium).
-  //!
-  //! \note This value is not used in minidump files for 32-bit x86 processes
-  //!     running on a 64-bit-capable x86 CPU and operating system. In that
-  //!     configuration, #kMinidumpCPUArchitectureX86 is used instead.
-  kMinidumpCPUArchitectureX86Win64 = PROCESSOR_ARCHITECTURE_IA32_ON_WIN64,
-
-  kMinidumpCPUArchitectureNeutral = PROCESSOR_ARCHITECTURE_NEUTRAL,
-
-  //! \brief 64-bit ARM.
-  //!
-  //! These systems identify their CPUs generically as “arm64” or “aarch64”, or
-  //! with more specific names such as “armv8”.
-  //!
-  //! \sa #kMinidumpCPUArchitectureARM64Breakpad
-  kMinidumpCPUArchitectureARM64 = PROCESSOR_ARCHITECTURE_ARM64,
-
-  kMinidumpCPUArchitectureARM32Win64 = PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64,
-  kMinidumpCPUArchitectureSPARC = 0x8001,
-
-  //! \brief 64-bit PowerPC.
-  //!
-  //! These systems identify their CPUs generically as “ppc64”, or with more
-  //! specific names such as “ppc970”.
-  kMinidumpCPUArchitecturePPC64 = 0x8002,
-
-  //! \brief Used by Breakpad for 64-bit ARM.
-  //!
-  //! \deprecated Use #kMinidumpCPUArchitectureARM64 instead.
-  kMinidumpCPUArchitectureARM64Breakpad = 0x8003,
-
-  //! \brief Unknown CPU architecture.
-  kMinidumpCPUArchitectureUnknown = PROCESSOR_ARCHITECTURE_UNKNOWN,
-};
-
-//! \brief Operating system type values for MINIDUMP_SYSTEM_INFO::ProductType.
-//!
-//! \sa \ref VER_NT_x "VER_NT_*"
-enum MinidumpOSType : uint8_t {
-  //! \brief A “desktop” or “workstation” system.
-  kMinidumpOSTypeWorkstation = VER_NT_WORKSTATION,
-
-  //! \brief A “domain controller” system. Windows-specific.
-  kMinidumpOSTypeDomainController = VER_NT_DOMAIN_CONTROLLER,
-
-  //! \brief A “server” system.
-  kMinidumpOSTypeServer = VER_NT_SERVER,
-};
-
-//! \brief Operating system family values for MINIDUMP_SYSTEM_INFO::PlatformId.
-//!
-//! \sa \ref VER_PLATFORM_x "VER_PLATFORM_*"
-enum MinidumpOS : uint32_t {
-  //! \brief Windows 3.1.
-  kMinidumpOSWin32s = VER_PLATFORM_WIN32s,
-
-  //! \brief Windows 95, Windows 98, and Windows Me.
-  kMinidumpOSWin32Windows = VER_PLATFORM_WIN32_WINDOWS,
-
-  //! \brief Windows NT, Windows 2000, and later.
-  kMinidumpOSWin32NT = VER_PLATFORM_WIN32_NT,
-
-  kMinidumpOSUnix = 0x8000,
-
-  //! \brief macOS, Darwin for traditional systems.
-  kMinidumpOSMacOSX = 0x8101,
-
-  //! \brief iOS, Darwin for mobile devices.
-  kMinidumpOSiOS = 0x8102,
-
-  //! \brief Linux, not including Android.
-  kMinidumpOSLinux = 0x8201,
-
-  kMinidumpOSSolaris = 0x8202,
-
-  //! \brief Android.
-  kMinidumpOSAndroid = 0x8203,
-
-  kMinidumpOSLegacy = 0x8204,
-
-  //! \brief Native Client (NaCl).
-  kMinidumpOSNaCl = 0x8205,
-
-  //! \brief Unknown operating system.
-  kMinidumpOSUnknown = 0xffffffff,
-};
-
-
-//! \brief A list of ::RVA pointers.
-struct ALIGNAS(4) PACKED MinidumpRVAList {
-  //! \brief The number of children present in the #children array.
-  uint32_t count;
-
-  //! \brief Pointers to other structures in the minidump file.
-  RVA children[0];
-};
-
-//! \brief A key-value pair.
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry {
-  //! \brief ::RVA of a MinidumpUTF8String containing the key of a key-value
-  //!     pair.
-  RVA key;
-
-  //! \brief ::RVA of a MinidumpUTF8String containing the value of a key-value
-  //!     pair.
-  RVA value;
-};
-
-//! \brief A list of key-value pairs.
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary {
-  //! \brief The number of key-value pairs present.
-  uint32_t count;
-
-  //! \brief A list of MinidumpSimpleStringDictionaryEntry entries.
-  MinidumpSimpleStringDictionaryEntry entries[0];
-};
-
-//! \brief A typed annotation object.
-struct ALIGNAS(4) PACKED MinidumpAnnotation {
-  //! \brief ::RVA of a MinidumpUTF8String containing the name of the
-  //!     annotation.
-  RVA name;
-
-  //! \brief The type of data stored in the \a value of the annotation. This
-  //!     may correspond to an \a Annotation::Type or it may be user-defined.
-  uint16_t type;
-
-  //! \brief This field is always `0`.
-  uint16_t reserved;
-
-  //! \brief ::RVA of a MinidumpByteArray to the data for the annotation.
-  RVA value;
-};
-
-//! \brief A list of annotation objects.
-struct ALIGNAS(4) PACKED MinidumpAnnotationList {
-  //! \brief The number of annotation objects present.
-  uint32_t count;
-
-  //! \brief A list of MinidumpAnnotation objects.
-  MinidumpAnnotation objects[0];
-};
-
-//! \brief Additional Crashpad-specific information about a module carried
-//!     within a minidump file.
-//!
-//! This structure augments the information provided by MINIDUMP_MODULE. The
-//! minidump file must contain a module list stream
-//! (::kMinidumpStreamTypeModuleList) in order for this structure to appear.
-//!
-//! This structure is versioned. When changing this structure, leave the
-//! existing structure intact so that earlier parsers will be able to understand
-//! the fields they are aware of, and make additions at the end of the
-//! structure. Revise #kVersion and document each field’s validity based on
-//! #version, so that newer parsers will be able to determine whether the added
-//! fields are valid or not.
-//!
-//! \sa MinidumpModuleCrashpadInfoList
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo {
-  //! \brief The structure’s currently-defined version number.
-  //!
-  //! \sa version
-  static constexpr uint32_t kVersion = 1;
-
-  //! \brief The structure’s version number.
-  //!
-  //! Readers can use this field to determine which other fields in the
-  //! structure are valid. Upon encountering a value greater than #kVersion, a
-  //! reader should assume that the structure’s layout is compatible with the
-  //! structure defined as having value #kVersion.
-  //!
-  //! Writers may produce values less than #kVersion in this field if there is
-  //! no need for any fields present in later versions.
-  uint32_t version;
-
-  //! \brief A MinidumpRVAList pointing to MinidumpUTF8String objects. The
-  //!     module controls the data that appears here.
-  //!
-  //! These strings correspond to ModuleSnapshot::AnnotationsVector() and do not
-  //! duplicate anything in #simple_annotations or #annotation_objects.
-  //!
-  //! This field is present when #version is at least `1`.
-  MINIDUMP_LOCATION_DESCRIPTOR list_annotations;
-
-  //! \brief A MinidumpSimpleStringDictionary pointing to strings interpreted as
-  //!     key-value pairs. The module controls the data that appears here.
-  //!
-  //! These key-value pairs correspond to
-  //! ModuleSnapshot::AnnotationsSimpleMap() and do not duplicate anything in
-  //! #list_annotations or #annotation_objects.
-  //!
-  //! This field is present when #version is at least `1`.
-  MINIDUMP_LOCATION_DESCRIPTOR simple_annotations;
-
-  //! \brief A MinidumpAnnotationList object containing the annotation objects
-  //!     stored within the module. The module controls the data that appears
-  //!     here.
-  //!
-  //! These key-value pairs correspond to ModuleSnapshot::AnnotationObjects()
-  //! and do not duplicate anything in #list_annotations or #simple_annotations.
-  //!
-  //! This field may be present when #version is at least `1`.
-  MINIDUMP_LOCATION_DESCRIPTOR annotation_objects;
-};
-
-//! \brief A link between a MINIDUMP_MODULE structure and additional
-//!     Crashpad-specific information about a module carried within a minidump
-//!     file.
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink {
-  //! \brief A link to a MINIDUMP_MODULE structure in the module list stream.
-  //!
-  //! This field is an index into MINIDUMP_MODULE_LIST::Modules. This field’s
-  //! value must be in the range of MINIDUMP_MODULE_LIST::NumberOfEntries.
-  uint32_t minidump_module_list_index;
-
-  //! \brief A link to a MinidumpModuleCrashpadInfo structure.
-  //!
-  //! MinidumpModuleCrashpadInfo structures are accessed indirectly through
-  //! MINIDUMP_LOCATION_DESCRIPTOR pointers to allow for future growth of the
-  //! MinidumpModuleCrashpadInfo structure.
-  MINIDUMP_LOCATION_DESCRIPTOR location;
-};
-
-//! \brief Additional Crashpad-specific information about modules carried within
-//!     a minidump file.
-//!
-//! This structure augments the information provided by
-//! MINIDUMP_MODULE_LIST. The minidump file must contain a module list stream
-//! (::kMinidumpStreamTypeModuleList) in order for this structure to appear.
-//!
-//! MinidumpModuleCrashpadInfoList::count may be less than the value of
-//! MINIDUMP_MODULE_LIST::NumberOfModules because not every MINIDUMP_MODULE
-//! structure carried within the minidump file will necessarily have
-//! Crashpad-specific information provided by a MinidumpModuleCrashpadInfo
-//! structure.
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList {
-  //! \brief The number of children present in the #modules array.
-  uint32_t count;
-
-  //! \brief Crashpad-specific information about modules, along with links to
-  //!     MINIDUMP_MODULE structures that contain module information
-  //!     traditionally carried within minidump files.
-  MinidumpModuleCrashpadInfoLink modules[0];
-};
-
-//! \brief Additional Crashpad-specific information carried within a minidump
-//!     file.
-//!
-//! This structure is versioned. When changing this structure, leave the
-//! existing structure intact so that earlier parsers will be able to understand
-//! the fields they are aware of, and make additions at the end of the
-//! structure. Revise #kVersion and document each field’s validity based on
-//! #version, so that newer parsers will be able to determine whether the added
-//! fields are valid or not.
-struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
-  // UUID has a constructor, which makes it non-POD, which makes this structure
-  // non-POD. In order for the default constructor to zero-initialize other
-  // members, an explicit constructor must be provided.
-  MinidumpCrashpadInfo()
-      : version(),
-        report_id(),
-        client_id(),
-        simple_annotations(),
-        module_list() {
-  }
-
-  //! \brief The structure’s currently-defined version number.
-  //!
-  //! \sa version
-  static constexpr uint32_t kVersion = 1;
-
-  //! \brief The structure’s version number.
-  //!
-  //! Readers can use this field to determine which other fields in the
-  //! structure are valid. Upon encountering a value greater than #kVersion, a
-  //! reader should assume that the structure’s layout is compatible with the
-  //! structure defined as having value #kVersion.
-  //!
-  //! Writers may produce values less than #kVersion in this field if there is
-  //! no need for any fields present in later versions.
-  uint32_t version;
-
-  //! \brief A %UUID identifying an individual crash report.
-  //!
-  //! This provides a stable identifier for a crash even as the report is
-  //! converted to different formats, provided that all formats support storing
-  //! a crash report ID.
-  //!
-  //! If no identifier is available, this field will contain zeroes.
-  //!
-  //! This field is present when #version is at least `1`.
-  UUID report_id;
-
-  //! \brief A %UUID identifying the client that crashed.
-  //!
-  //! Client identification is within the scope of the application, but it is
-  //! expected that the identifier will be unique for an instance of Crashpad
-  //! monitoring an application or set of applications for a user. The
-  //! identifier shall remain stable over time.
-  //!
-  //! If no identifier is available, this field will contain zeroes.
-  //!
-  //! This field is present when #version is at least `1`.
-  UUID client_id;
-
-  //! \brief A MinidumpSimpleStringDictionary pointing to strings interpreted as
-  //!     key-value pairs.
-  //!
-  //! These key-value pairs correspond to
-  //! ProcessSnapshot::AnnotationsSimpleMap().
-  //!
-  //! This field is present when #version is at least `1`.
-  MINIDUMP_LOCATION_DESCRIPTOR simple_annotations;
-
-  //! \brief A pointer to a MinidumpModuleCrashpadInfoList structure.
-  //!
-  //! This field is present when #version is at least `1`.
-  MINIDUMP_LOCATION_DESCRIPTOR module_list;
-};
-
-#if defined(COMPILER_MSVC)
-#pragma pack(pop)
-#endif  // COMPILER_MSVC
-#undef PACKED
-
-MSVC_POP_WARNING();  // C4200
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_file_writer.h b/Tools/Crashpad/include/minidump/minidump_file_writer.h
deleted file mode 100644
index ce2f1d75a5..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_file_writer.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_FILE_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_FILE_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <set>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_writable.h"
-#include "util/file/file_io.h"
-
-namespace crashpad {
-
-class ProcessSnapshot;
-class MinidumpUserExtensionStreamDataSource;
-
-//! \brief The root-level object in a minidump file.
-//!
-//! This object writes a MINIDUMP_HEADER and list of MINIDUMP_DIRECTORY entries
-//! to a minidump file.
-class MinidumpFileWriter final : public internal::MinidumpWritable {
- public:
-  MinidumpFileWriter();
-  ~MinidumpFileWriter() override;
-
-  //! \brief Initializes the MinidumpFileWriter and populates it with
-  //!     appropriate child streams based on \a process_snapshot.
-  //!
-  //! This method will add additional streams to the minidump file as children
-  //! of the MinidumpFileWriter object and as pointees of the top-level
-  //! MINIDUMP_DIRECTORY. To do so, it will obtain other snapshot information
-  //! from \a process_snapshot, such as a SystemSnapshot, lists of
-  //! ThreadSnapshot and ModuleSnapshot objects, and, if available, an
-  //! ExceptionSnapshot.
-  //!
-  //! The streams are added in the order that they are expected to be most
-  //! useful to minidump readers, to improve data locality and minimize seeking.
-  //! The streams are added in this order:
-  //!  - kMinidumpStreamTypeSystemInfo
-  //!  - kMinidumpStreamTypeMiscInfo
-  //!  - kMinidumpStreamTypeThreadList
-  //!  - kMinidumpStreamTypeException (if present)
-  //!  - kMinidumpStreamTypeModuleList
-  //!  - kMinidumpStreamTypeUnloadedModuleList (if present)
-  //!  - kMinidumpStreamTypeCrashpadInfo (if present)
-  //!  - kMinidumpStreamTypeMemoryInfoList (if present)
-  //!  - kMinidumpStreamTypeHandleData (if present)
-  //!  - User streams (if present)
-  //!  - kMinidumpStreamTypeMemoryList
-  //!
-  //! \param[in] process_snapshot The process snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ProcessSnapshot* process_snapshot);
-
-  //! \brief Sets MINIDUMP_HEADER::Timestamp.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetTimestamp(time_t timestamp);
-
-  //! \brief Adds a stream to the minidump file and arranges for a
-  //!     MINIDUMP_DIRECTORY entry to point to it.
-  //!
-  //! This object takes ownership of \a stream and becomes its parent in the
-  //! overall tree of internal::MinidumpWritable objects.
-  //!
-  //! At most one object of each stream type (as obtained from
-  //! internal::MinidumpStreamWriter::StreamType()) may be added to a
-  //! MinidumpFileWriter object. If an attempt is made to add a stream whose
-  //! type matches an existing stream’s type, this method discards the new
-  //! stream.
-  //!
-  //! \note Valid in #kStateMutable.
-  //!
-  //! \return `true` on success. `false` on failure, as occurs when an attempt
-  //!     is made to add a stream whose type matches an existing stream’s type,
-  //!     with a message logged.
-  bool AddStream(std::unique_ptr<internal::MinidumpStreamWriter> stream);
-
-  //! \brief Adds a user extension stream to the minidump file and arranges for
-  //!     a MINIDUMP_DIRECTORY entry to point to it.
-  //!
-  //! This object takes ownership of \a user_extension_stream_data.
-  //!
-  //! At most one object of each stream type (as obtained from
-  //! internal::MinidumpStreamWriter::StreamType()) may be added to a
-  //! MinidumpFileWriter object. If an attempt is made to add a stream whose
-  //! type matches an existing stream’s type, this method discards the new
-  //! stream.
-  //!
-  //! \param[in] user_extension_stream_data The stream data to add to the
-  //!    minidump file. Note that the buffer this object points to must be valid
-  //!    through WriteEverything().
-  //!
-  //! \note Valid in #kStateMutable.
-  //!
-  //! \return `true` on success. `false` on failure, as occurs when an attempt
-  //!     is made to add a stream whose type matches an existing stream’s type,
-  //!     with a message logged.
-  bool AddUserExtensionStream(
-      std::unique_ptr<MinidumpUserExtensionStreamDataSource>
-          user_extension_stream_data);
-
-  // MinidumpWritable:
-
-  //! \copydoc internal::MinidumpWritable::WriteEverything()
-  //!
-  //! This method does not initially write the final value for
-  //! MINIDUMP_HEADER::Signature. After all child objects have been written, it
-  //! rewinds to the beginning of the file and writes the correct value for this
-  //! field. This prevents incompletely-written minidump files from being
-  //! mistaken for valid ones.
-  bool WriteEverything(FileWriterInterface* file_writer) override;
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WillWriteAtOffsetImpl(FileOffset offset) override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  MINIDUMP_HEADER header_;
-  std::vector<std::unique_ptr<internal::MinidumpStreamWriter>> streams_;
-
-  // Protects against multiple streams with the same ID being added.
-  std::set<MinidumpStreamType> stream_types_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpFileWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_handle_writer.h b/Tools/Crashpad/include/minidump/minidump_handle_writer.h
deleted file mode 100644
index f8eaeef941..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_handle_writer.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_HANDLE_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_HANDLE_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <sys/types.h>
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_string_writer.h"
-#include "minidump/minidump_writable.h"
-#include "snapshot/handle_snapshot.h"
-
-namespace crashpad {
-
-//! \brief The writer for a MINIDUMP_HANDLE_DATA_STREAM stream in a minidump
-//!     and its contained MINIDUMP_HANDLE_DESCRIPTOR s.
-//!
-//! As we currently do not track any data beyond what MINIDUMP_HANDLE_DESCRIPTOR
-//! supports, we only write that type of record rather than the newer
-//! MINIDUMP_HANDLE_DESCRIPTOR_2.
-//!
-//! Note that this writer writes both the header (MINIDUMP_HANDLE_DATA_STREAM)
-//! and the list of objects (MINIDUMP_HANDLE_DESCRIPTOR), which is different
-//! from some of the other list writers.
-class MinidumpHandleDataWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpHandleDataWriter();
-  ~MinidumpHandleDataWriter() override;
-
-  //! \brief Adds a MINIDUMP_HANDLE_DESCRIPTOR for each handle in \a
-  //!     handle_snapshot to the MINIDUMP_HANDLE_DATA_STREAM.
-  //!
-  //! \param[in] handle_snapshots The handle snapshots to use as source data.
-  //!
-  //! \note Valid in #kStateMutable.
-  void InitializeFromSnapshot(
-      const std::vector<HandleSnapshot>& handle_snapshots);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  MINIDUMP_HANDLE_DATA_STREAM handle_data_stream_base_;
-  std::vector<MINIDUMP_HANDLE_DESCRIPTOR> handle_descriptors_;
-  std::map<std::string, internal::MinidumpUTF16StringWriter*> strings_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpHandleDataWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_HANDLE_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_memory_info_writer.h b/Tools/Crashpad/include/minidump/minidump_memory_info_writer.h
deleted file mode 100644
index ec66019703..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_memory_info_writer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_INFO_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_INFO_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-class MemoryMapRegionSnapshot;
-class MinidumpContextWriter;
-class MinidumpMemoryListWriter;
-class MinidumpMemoryWriter;
-
-//! \brief The writer for a MINIDUMP_MEMORY_INFO_LIST stream in a minidump file,
-//!     containing a list of MINIDUMP_MEMORY_INFO objects.
-class MinidumpMemoryInfoListWriter final
-    : public internal::MinidumpStreamWriter {
- public:
-  MinidumpMemoryInfoListWriter();
-  ~MinidumpMemoryInfoListWriter() override;
-
-  //! \brief Initializes a MINIDUMP_MEMORY_INFO_LIST based on \a memory_map.
-  //!
-  //! \param[in] memory_map The vector of memory map region snapshots to use as
-  //!     source data.
-  //!
-  //! \note Valid in #kStateMutable.
-  void InitializeFromSnapshot(
-      const std::vector<const MemoryMapRegionSnapshot*>& memory_map);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<internal::MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  MINIDUMP_MEMORY_INFO_LIST memory_info_list_base_;
-  std::vector<MINIDUMP_MEMORY_INFO> items_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpMemoryInfoListWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_INFO_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_memory_writer.h b/Tools/Crashpad/include/minidump/minidump_memory_writer.h
deleted file mode 100644
index 955209076c..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_memory_writer.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_writable.h"
-#include "snapshot/memory_snapshot.h"
-#include "util/file/file_io.h"
-
-namespace crashpad {
-
-//! \brief The base class for writers of memory ranges pointed to by
-//!     MINIDUMP_MEMORY_DESCRIPTOR objects in a minidump file.
-class SnapshotMinidumpMemoryWriter : public internal::MinidumpWritable,
-                                     public MemorySnapshot::Delegate {
- public:
-  explicit SnapshotMinidumpMemoryWriter(const MemorySnapshot* memory_snapshot);
-  ~SnapshotMinidumpMemoryWriter() override;
-
-  //! \brief Returns a MINIDUMP_MEMORY_DESCRIPTOR referencing the data that this
-  //!     object writes.
-  //!
-  //! This method is expected to be called by a MinidumpMemoryListWriter in
-  //! order to obtain a MINIDUMP_MEMORY_DESCRIPTOR to include in its list.
-  //!
-  //! \note Valid in #kStateWritable.
-  const MINIDUMP_MEMORY_DESCRIPTOR* MinidumpMemoryDescriptor() const;
-
-  //! \brief Registers a memory descriptor as one that should point to the
-  //!     object on which this method is called.
-  //!
-  //! This method is expected to be called by objects of other classes, when
-  //! those other classes have their own memory descriptors that need to point
-  //! to memory ranges within a minidump file. MinidumpThreadWriter is one such
-  //! class. This method is public for this reason, otherwise it would suffice
-  //! to be private.
-  //!
-  //! \note Valid in #kStateFrozen or any preceding state.
-  void RegisterMemoryDescriptor(MINIDUMP_MEMORY_DESCRIPTOR* memory_descriptor);
-
- private:
-  // MemorySnapshot::Delegate:
-  bool MemorySnapshotDelegateRead(void* data, size_t size) override;
-
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() final;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  //! \brief Returns the object’s desired byte-boundary alignment.
-  //!
-  //! Memory regions are aligned to a 16-byte boundary. The actual alignment
-  //! requirements of any data within the memory region are unknown, and may be
-  //! more or less strict than this depending on the platform.
-  //!
-  //! \return `16`.
-  //!
-  //! \note Valid in #kStateFrozen or any subsequent state.
-  size_t Alignment() override;
-
-  bool WillWriteAtOffsetImpl(FileOffset offset) override;
-
-  //! \brief Returns the object’s desired write phase.
-  //!
-  //! Memory regions are written at the end of minidump files, because it is
-  //! expected that unlike most other data in a minidump file, the contents of
-  //! memory regions will be accessed sparsely.
-  //!
-  //! \return #kPhaseLate.
-  //!
-  //! \note Valid in any state.
-  Phase WritePhase() final;
-
-  //! \brief Gets the underlying memory snapshot that the memory writer will
-  //!     write to the minidump.
-  const MemorySnapshot& UnderlyingSnapshot() const { return *memory_snapshot_; }
-
-  MINIDUMP_MEMORY_DESCRIPTOR memory_descriptor_;
-
-  // weak
-  std::vector<MINIDUMP_MEMORY_DESCRIPTOR*> registered_memory_descriptors_;
-  const MemorySnapshot* memory_snapshot_;
-  FileWriterInterface* file_writer_;
-
-  DISALLOW_COPY_AND_ASSIGN(SnapshotMinidumpMemoryWriter);
-};
-
-//! \brief The writer for a MINIDUMP_MEMORY_LIST stream in a minidump file,
-//!     containing a list of MINIDUMP_MEMORY_DESCRIPTOR objects.
-class MinidumpMemoryListWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpMemoryListWriter();
-  ~MinidumpMemoryListWriter() override;
-
-  //! \brief Adds a concrete initialized SnapshotMinidumpMemoryWriter for each
-  //!     memory snapshot in \a memory_snapshots to the MINIDUMP_MEMORY_LIST.
-  //!
-  //! Memory snapshots are added in the fashion of AddMemory().
-  //!
-  //! \param[in] memory_snapshots The memory snapshots to use as source data.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddFromSnapshot(
-      const std::vector<const MemorySnapshot*>& memory_snapshots);
-
-  //! \brief Adds a SnapshotMinidumpMemoryWriter to the MINIDUMP_MEMORY_LIST.
-  //!
-  //! This object takes ownership of \a memory_writer and becomes its parent in
-  //! the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddMemory(std::unique_ptr<SnapshotMinidumpMemoryWriter> memory_writer);
-
-  //! \brief Adds a SnapshotMinidumpMemoryWriter that’s a child of another
-  //!     internal::MinidumpWritable object to the MINIDUMP_MEMORY_LIST.
-  //!
-  //! \a memory_writer does not become a child of this object, but the
-  //! MINIDUMP_MEMORY_LIST will still contain a MINIDUMP_MEMORY_DESCRIPTOR for
-  //! it. \a memory_writer must be a child of another object in the
-  //! internal::MinidumpWritable tree.
-  //!
-  //! This method exists to be called by objects that have their own
-  //! SnapshotMinidumpMemoryWriter children but wish for them to also appear in
-  //! the minidump file’s MINIDUMP_MEMORY_LIST. MinidumpThreadWriter, which has
-  //! a SnapshotMinidumpMemoryWriter for thread stack memory, is an example.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddExtraMemory(SnapshotMinidumpMemoryWriter* memory_writer);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  std::vector<SnapshotMinidumpMemoryWriter*> memory_writers_;  // weak
-  std::vector<std::unique_ptr<SnapshotMinidumpMemoryWriter>> children_;
-  MINIDUMP_MEMORY_LIST memory_list_base_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpMemoryListWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_misc_info_writer.h b/Tools/Crashpad/include/minidump/minidump_misc_info_writer.h
deleted file mode 100644
index ee90b0eac0..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_misc_info_writer.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MISC_INFO_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_MISC_INFO_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <time.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-class ProcessSnapshot;
-
-namespace internal {
-
-//! \brief Returns the string to set in MINIDUMP_MISC_INFO_4::DbgBldStr.
-//!
-//! dbghelp produces strings like `"dbghelp.i386,6.3.9600.16520"` and
-//! `"dbghelp.amd64,6.3.9600.16520"`. This function mimics that format, and adds
-//! the OS that wrote the minidump along with any relevant platform-specific
-//! data describing the compilation environment.
-//!
-//! This function is an implementation detail of
-//! MinidumpMiscInfoWriter::InitializeFromSnapshot() and is only exposed for
-//! testing purposes.
-std::string MinidumpMiscInfoDebugBuildString();
-
-}  // namespace internal
-
-//! \brief The writer for a stream in the MINIDUMP_MISC_INFO family in a
-//!     minidump file.
-//!
-//! The actual stream written will be a MINIDUMP_MISC_INFO,
-//! MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3, MINIDUMP_MISC_INFO_4, or
-//! MINIDUMP_MISC_INFO_5 stream. Later versions of MINIDUMP_MISC_INFO are
-//! supersets of earlier versions. The earliest version that supports all of the
-//! information that an object of this class contains will be used.
-class MinidumpMiscInfoWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpMiscInfoWriter();
-  ~MinidumpMiscInfoWriter() override;
-
-  //! \brief Initializes MINIDUMP_MISC_INFO_N based on \a process_snapshot.
-  //!
-  //! \param[in] process_snapshot The process snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ProcessSnapshot* process_snapshot);
-
-  //! \brief Sets the field referenced by #MINIDUMP_MISC1_PROCESS_ID.
-  void SetProcessID(uint32_t process_id);
-
-  //! \brief Sets the fields referenced by #MINIDUMP_MISC1_PROCESS_TIMES.
-  void SetProcessTimes(time_t process_create_time,
-                       uint32_t process_user_time,
-                       uint32_t process_kernel_time);
-
-  //! \brief Sets the fields referenced by #MINIDUMP_MISC1_PROCESSOR_POWER_INFO.
-  void SetProcessorPowerInfo(uint32_t processor_max_mhz,
-                             uint32_t processor_current_mhz,
-                             uint32_t processor_mhz_limit,
-                             uint32_t processor_max_idle_state,
-                             uint32_t processor_current_idle_state);
-
-  //! \brief Sets the field referenced by #MINIDUMP_MISC3_PROCESS_INTEGRITY.
-  void SetProcessIntegrityLevel(uint32_t process_integrity_level);
-
-  //! \brief Sets the field referenced by #MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS.
-  void SetProcessExecuteFlags(uint32_t process_execute_flags);
-
-  //! \brief Sets the field referenced by #MINIDUMP_MISC3_PROTECTED_PROCESS.
-  void SetProtectedProcess(uint32_t protected_process);
-
-  //! \brief Sets the fields referenced by #MINIDUMP_MISC3_TIMEZONE.
-  void SetTimeZone(uint32_t time_zone_id,
-                   int32_t bias,
-                   const std::string& standard_name,
-                   const SYSTEMTIME& standard_date,
-                   int32_t standard_bias,
-                   const std::string& daylight_name,
-                   const SYSTEMTIME& daylight_date,
-                   int32_t daylight_bias);
-
-  //! \brief Sets the fields referenced by #MINIDUMP_MISC4_BUILDSTRING.
-  void SetBuildString(const std::string& build_string,
-                      const std::string& debug_build_string);
-
-  // TODO(mark): Provide a better interface than this. Don’t force callers to
-  // build their own XSTATE_CONFIG_FEATURE_MSC_INFO structure.
-  //
-  //! \brief Sets MINIDUMP_MISC_INFO_5::XStateData.
-  void SetXStateData(const XSTATE_CONFIG_FEATURE_MSC_INFO& xstate_data);
-
-  //! \brief Sets the field referenced by #MINIDUMP_MISC5_PROCESS_COOKIE.
-  void SetProcessCookie(uint32_t process_cookie);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-  MinidumpStreamType StreamType() const override;
-
- private:
-  //! \brief Returns the size of the object to be written based on
-  //!     MINIDUMP_MISC_INFO_N::Flags1.
-  //!
-  //! The smallest defined structure type in the MINIDUMP_MISC_INFO family that
-  //! can hold all of the data that has been populated will be used.
-  size_t CalculateSizeOfObjectFromFlags() const;
-
-  MINIDUMP_MISC_INFO_N misc_info_;
-  bool has_xstate_data_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpMiscInfoWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_MISC_INFO_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_module_crashpad_info_writer.h b/Tools/Crashpad/include/minidump/minidump_module_crashpad_info_writer.h
deleted file mode 100644
index 850db04038..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_module_crashpad_info_writer.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_string_writer.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-class MinidumpAnnotationListWriter;
-class MinidumpSimpleStringDictionaryWriter;
-class ModuleSnapshot;
-
-//! \brief The writer for a MinidumpModuleCrashpadInfo object in a minidump
-//!     file.
-class MinidumpModuleCrashpadInfoWriter final
-    : public internal::MinidumpWritable {
- public:
-  MinidumpModuleCrashpadInfoWriter();
-  ~MinidumpModuleCrashpadInfoWriter() override;
-
-  //! \brief Initializes MinidumpModuleCrashpadInfo based on \a module_snapshot.
-  //!
-  //! Only data in \a module_snapshot that is considered useful will be
-  //! included. For simple annotations, usefulness is determined by
-  //! MinidumpSimpleStringDictionaryWriter::IsUseful().
-  //!
-  //! \param[in] module_snapshot The module snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ModuleSnapshot* module_snapshot);
-
-  //! \brief Arranges for MinidumpModuleCrashpadInfo::list_annotations to point
-  //!     to the internal::MinidumpUTF8StringListWriter object to be written by
-  //!     \a list_annotations.
-  //!
-  //! This object takes ownership of \a simple_annotations and becomes its
-  //! parent in the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetListAnnotations(
-      std::unique_ptr<MinidumpUTF8StringListWriter> list_annotations);
-
-  //! \brief Arranges for MinidumpModuleCrashpadInfo::simple_annotations to
-  //!     point to the MinidumpSimpleStringDictionaryWriter object to be written
-  //!     by \a simple_annotations.
-  //!
-  //! This object takes ownership of \a simple_annotations and becomes its
-  //! parent in the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetSimpleAnnotations(
-      std::unique_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations);
-
-  //! \brief Arranges for MinidumpModuleCrashpadInfo::annotation_objects to
-  //!     point to the MinidumpAnnotationListWriter object to be written by
-  //!     \a annotation_objects.
-  //!
-  //! This object takes ownership of \a annotation_objects and becomes its
-  //! parent in the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetAnnotationObjects(
-      std::unique_ptr<MinidumpAnnotationListWriter> annotation_objects);
-
-  //! \brief Determines whether the object is useful.
-  //!
-  //! A useful object is one that carries data that makes a meaningful
-  //! contribution to a minidump file. An object carrying list annotations or
-  //! simple annotations would be considered useful.
-  //!
-  //! \return `true` if the object is useful, `false` otherwise.
-  bool IsUseful() const;
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  MinidumpModuleCrashpadInfo module_;
-  std::unique_ptr<MinidumpUTF8StringListWriter> list_annotations_;
-  std::unique_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations_;
-  std::unique_ptr<MinidumpAnnotationListWriter> annotation_objects_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCrashpadInfoWriter);
-};
-
-//! \brief The writer for a MinidumpModuleCrashpadInfoList object in a minidump
-//!     file, containing a list of MinidumpModuleCrashpadInfo objects.
-class MinidumpModuleCrashpadInfoListWriter final
-    : public internal::MinidumpWritable {
- public:
-  MinidumpModuleCrashpadInfoListWriter();
-  ~MinidumpModuleCrashpadInfoListWriter() override;
-
-  //! \brief Adds an initialized MinidumpModuleCrashpadInfo for modules in \a
-  //!     module_snapshots to the MinidumpModuleCrashpadInfoList.
-  //!
-  //! Only modules in \a module_snapshots that would produce a useful
-  //! MinidumpModuleCrashpadInfo structure are included. Usefulness is
-  //! determined by MinidumpModuleCrashpadInfoWriter::IsUseful().
-  //!
-  //! \param[in] module_snapshots The module snapshots to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. AddModule() may not be called before this
-  //!     method, and it is not normally necessary to call AddModule() after
-  //!     this method.
-  void InitializeFromSnapshot(
-      const std::vector<const ModuleSnapshot*>& module_snapshots);
-
-  //! \brief Adds a MinidumpModuleCrashpadInfo to the
-  //!     MinidumpModuleCrashpadInfoList.
-  //!
-  //! \param[in] module_crashpad_info Extended Crashpad-specific information
-  //!     about the module. This object takes ownership of \a
-  //!     module_crashpad_info and becomes its parent in the overall tree of
-  //!     internal::MinidumpWritable objects.
-  //! \param[in] minidump_module_list_index The index of the MINIDUMP_MODULE in
-  //!     the minidump file’s MINIDUMP_MODULE_LIST stream that corresponds to \a
-  //!     module_crashpad_info.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddModule(
-      std::unique_ptr<MinidumpModuleCrashpadInfoWriter> module_crashpad_info,
-      size_t minidump_module_list_index);
-
-  //! \brief Determines whether the object is useful.
-  //!
-  //! A useful object is one that carries data that makes a meaningful
-  //! contribution to a minidump file. An object carrying children would be
-  //! considered useful.
-  //!
-  //! \return `true` if the object is useful, `false` otherwise.
-  bool IsUseful() const;
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  std::vector<std::unique_ptr<MinidumpModuleCrashpadInfoWriter>>
-      module_crashpad_infos_;
-  std::vector<MinidumpModuleCrashpadInfoLink> module_crashpad_info_links_;
-  MinidumpModuleCrashpadInfoList module_crashpad_info_list_base_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCrashpadInfoListWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_module_writer.h b/Tools/Crashpad/include/minidump/minidump_module_writer.h
deleted file mode 100644
index 555c41157f..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_module_writer.h
+++ /dev/null
@@ -1,352 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MODULE_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_MODULE_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <time.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "base/strings/string16.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-class ModuleSnapshot;
-
-namespace internal {
-class MinidumpUTF16StringWriter;
-}  // namespace internal
-
-//! \brief The base class for writers of CodeView records referenced by
-//!     MINIDUMP_MODULE::CvRecord in minidump files.
-class MinidumpModuleCodeViewRecordWriter : public internal::MinidumpWritable {
- public:
-  ~MinidumpModuleCodeViewRecordWriter() override;
-
- protected:
-  MinidumpModuleCodeViewRecordWriter() : MinidumpWritable() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordWriter);
-};
-
-namespace internal {
-
-//! \brief The base class for writers of CodeView records that serve as links to
-//!     `.pdb` (program database) files.
-template <typename CodeViewRecordType>
-class MinidumpModuleCodeViewRecordPDBLinkWriter
-    : public MinidumpModuleCodeViewRecordWriter {
- public:
-  //! \brief Sets the name of the `.pdb` file being linked to.
-  void SetPDBName(const std::string& pdb_name) { pdb_name_ = pdb_name; }
-
- protected:
-  MinidumpModuleCodeViewRecordPDBLinkWriter();
-  ~MinidumpModuleCodeViewRecordPDBLinkWriter() override;
-
-  // MinidumpWritable:
-  size_t SizeOfObject() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  //! \brief Returns a pointer to the raw CodeView record’s data.
-  //!
-  //! Subclasses can use this to set fields in their codeview records other than
-  //! the `pdb_name` field.
-  CodeViewRecordType* codeview_record() { return &codeview_record_; }
-
- private:
-  CodeViewRecordType codeview_record_;
-  std::string pdb_name_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordPDBLinkWriter);
-};
-
-}  // namespace internal
-
-//! \brief The writer for a CodeViewRecordPDB20 object in a minidump file.
-//!
-//! Most users will want MinidumpModuleCodeViewRecordPDB70Writer instead.
-class MinidumpModuleCodeViewRecordPDB20Writer final
-    : public internal::MinidumpModuleCodeViewRecordPDBLinkWriter<
-          CodeViewRecordPDB20> {
- public:
-  MinidumpModuleCodeViewRecordPDB20Writer()
-      : internal::MinidumpModuleCodeViewRecordPDBLinkWriter<
-            CodeViewRecordPDB20>() {}
-
-  ~MinidumpModuleCodeViewRecordPDB20Writer() override;
-
-  //! \brief Sets CodeViewRecordPDB20::timestamp and CodeViewRecordPDB20::age.
-  void SetTimestampAndAge(time_t timestamp, uint32_t age);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordPDB20Writer);
-};
-
-//! \brief The writer for a CodeViewRecordPDB70 object in a minidump file.
-class MinidumpModuleCodeViewRecordPDB70Writer final
-    : public internal::MinidumpModuleCodeViewRecordPDBLinkWriter<
-          CodeViewRecordPDB70> {
- public:
-  MinidumpModuleCodeViewRecordPDB70Writer()
-      : internal::MinidumpModuleCodeViewRecordPDBLinkWriter<
-            CodeViewRecordPDB70>() {}
-
-  ~MinidumpModuleCodeViewRecordPDB70Writer() override;
-
-  //! \brief Initializes the CodeViewRecordPDB70 based on \a module_snapshot.
-  //!
-  //! \param[in] module_snapshot The module snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ModuleSnapshot* module_snapshot);
-
-  //! \brief Sets CodeViewRecordPDB70::uuid and CodeViewRecordPDB70::age.
-  void SetUUIDAndAge(const UUID& uuid, uint32_t age) {
-    codeview_record()->uuid = uuid;
-    codeview_record()->age = age;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordPDB70Writer);
-};
-
-//! \brief The writer for an IMAGE_DEBUG_MISC object in a minidump file.
-//!
-//! Most users will want MinidumpModuleCodeViewRecordPDB70Writer instead.
-class MinidumpModuleMiscDebugRecordWriter final
-    : public internal::MinidumpWritable {
- public:
-  MinidumpModuleMiscDebugRecordWriter();
-  ~MinidumpModuleMiscDebugRecordWriter() override;
-
-  //! \brief Sets IMAGE_DEBUG_MISC::DataType.
-  void SetDataType(uint32_t data_type) {
-    image_debug_misc_.DataType = data_type;
-  }
-
-  //! \brief Sets IMAGE_DEBUG_MISC::Data, IMAGE_DEBUG_MISC::Length, and
-  //!     IMAGE_DEBUG_MISC::Unicode.
-  //!
-  //! If \a utf16 is `true`, \a data will be treated as UTF-8 data and will be
-  //! converted to UTF-16, and IMAGE_DEBUG_MISC::Unicode will be set to `1`.
-  //! Otherwise, \a data will be used as-is and IMAGE_DEBUG_MISC::Unicode will
-  //! be set to `0`.
-  void SetData(const std::string& data, bool utf16);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  IMAGE_DEBUG_MISC image_debug_misc_;
-  std::string data_;
-  base::string16 data_utf16_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleMiscDebugRecordWriter);
-};
-
-//! \brief The writer for a MINIDUMP_MODULE object in a minidump file.
-//!
-//! Because MINIDUMP_MODULE objects only appear as elements of
-//! MINIDUMP_MODULE_LIST objects, this class does not write any data on its own.
-//! It makes its MINIDUMP_MODULE data available to its MinidumpModuleListWriter
-//! parent, which writes it as part of a MINIDUMP_MODULE_LIST.
-class MinidumpModuleWriter final : public internal::MinidumpWritable {
- public:
-  MinidumpModuleWriter();
-  ~MinidumpModuleWriter() override;
-
-  //! \brief Initializes the MINIDUMP_MODULE based on \a module_snapshot.
-  //!
-  //! \param[in] module_snapshot The module snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ModuleSnapshot* module_snapshot);
-
-  //! \brief Returns a MINIDUMP_MODULE referencing this object’s data.
-  //!
-  //! This method is expected to be called by a MinidumpModuleListWriter in
-  //! order to obtain a MINIDUMP_MODULE to include in its list.
-  //!
-  //! \note Valid in #kStateWritable.
-  const MINIDUMP_MODULE* MinidumpModule() const;
-
-  //! \brief Arranges for MINIDUMP_MODULE::ModuleNameRva to point to a
-  //!     MINIDUMP_STRING containing \a name.
-  //!
-  //! A name is required in all MINIDUMP_MODULE objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetName(const std::string& name);
-
-  //! \brief Arranges for MINIDUMP_MODULE::CvRecord to point to a CodeView
-  //!     record to be written by \a codeview_record.
-  //!
-  //! This object takes ownership of \a codeview_record and becomes its parent
-  //! in the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetCodeViewRecord(
-      std::unique_ptr<MinidumpModuleCodeViewRecordWriter> codeview_record);
-
-  //! \brief Arranges for MINIDUMP_MODULE::MiscRecord to point to an
-  //!     IMAGE_DEBUG_MISC object to be written by \a misc_debug_record.
-  //!
-  //! This object takes ownership of \a misc_debug_record and becomes its parent
-  //! in the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetMiscDebugRecord(
-      std::unique_ptr<MinidumpModuleMiscDebugRecordWriter> misc_debug_record);
-
-  //! \brief Sets IMAGE_DEBUG_MISC::BaseOfImage.
-  void SetImageBaseAddress(uint64_t image_base_address) {
-    module_.BaseOfImage = image_base_address;
-  }
-
-  //! \brief Sets IMAGE_DEBUG_MISC::SizeOfImage.
-  void SetImageSize(uint32_t image_size) { module_.SizeOfImage = image_size; }
-
-  //! \brief Sets IMAGE_DEBUG_MISC::CheckSum.
-  void SetChecksum(uint32_t checksum) { module_.CheckSum = checksum; }
-
-  //! \brief Sets IMAGE_DEBUG_MISC::TimeDateStamp.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetTimestamp(time_t timestamp);
-
-  //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileVersionMS
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwFileVersionMS" and \ref
-  //!     VS_FIXEDFILEINFO::dwFileVersionLS
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwFileVersionLS".
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetFileVersion(uint16_t version_0,
-                      uint16_t version_1,
-                      uint16_t version_2,
-                      uint16_t version_3);
-
-  //! \brief Sets \ref VS_FIXEDFILEINFO::dwProductVersionMS
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwProductVersionMS" and \ref
-  //!     VS_FIXEDFILEINFO::dwProductVersionLS
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwProductVersionLS".
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetProductVersion(uint16_t version_0,
-                         uint16_t version_1,
-                         uint16_t version_2,
-                         uint16_t version_3);
-
-  //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileFlags
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwFileFlags" and \ref
-  //!     VS_FIXEDFILEINFO::dwFileFlagsMask
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwFileFlagsMask".
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetFileFlagsAndMask(uint32_t file_flags, uint32_t file_flags_mask);
-
-  //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileOS
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwFileOS".
-  void SetFileOS(uint32_t file_os) { module_.VersionInfo.dwFileOS = file_os; }
-
-  //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileType
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwFileType" and \ref
-  //!     VS_FIXEDFILEINFO::dwFileSubtype
-  //!     "IMAGE_DEBUG_MISC::VersionInfo::dwFileSubtype".
-  void SetFileTypeAndSubtype(uint32_t file_type, uint32_t file_subtype) {
-    module_.VersionInfo.dwFileType = file_type;
-    module_.VersionInfo.dwFileSubtype = file_subtype;
-  }
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  MINIDUMP_MODULE module_;
-  std::unique_ptr<internal::MinidumpUTF16StringWriter> name_;
-  std::unique_ptr<MinidumpModuleCodeViewRecordWriter> codeview_record_;
-  std::unique_ptr<MinidumpModuleMiscDebugRecordWriter> misc_debug_record_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleWriter);
-};
-
-//! \brief The writer for a MINIDUMP_MODULE_LIST stream in a minidump file,
-//!     containing a list of MINIDUMP_MODULE objects.
-class MinidumpModuleListWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpModuleListWriter();
-  ~MinidumpModuleListWriter() override;
-
-  //! \brief Adds an initialized MINIDUMP_MODULE for each module in \a
-  //!     module_snapshots to the MINIDUMP_MODULE_LIST.
-  //!
-  //! \param[in] module_snapshots The module snapshots to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. AddModule() may not be called before this
-  //!     method, and it is not normally necessary to call AddModule() after
-  //!     this method.
-  void InitializeFromSnapshot(
-      const std::vector<const ModuleSnapshot*>& module_snapshots);
-
-  //! \brief Adds a MinidumpModuleWriter to the MINIDUMP_MODULE_LIST.
-  //!
-  //! This object takes ownership of \a module and becomes its parent in the
-  //! overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddModule(std::unique_ptr<MinidumpModuleWriter> module);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  std::vector<std::unique_ptr<MinidumpModuleWriter>> modules_;
-  MINIDUMP_MODULE_LIST module_list_base_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleListWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_MODULE_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_rva_list_writer.h b/Tools/Crashpad/include/minidump/minidump_rva_list_writer.h
deleted file mode 100644
index af584f13cc..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_rva_list_writer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_
-#define CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-namespace internal {
-
-//! \brief The writer for a MinidumpRVAList object in a minidump file,
-//!     containing a list of ::RVA pointers.
-class MinidumpRVAListWriter : public MinidumpWritable {
- protected:
-  MinidumpRVAListWriter();
-  ~MinidumpRVAListWriter() override;
-
-  //! \brief Adds an ::RVA referencing an MinidumpWritable to the
-  //!     MinidumpRVAList.
-  //!
-  //! This object takes ownership of \a child and becomes its parent in the
-  //! overall tree of MinidumpWritable objects.
-  //!
-  //! To provide type-correctness, subclasses are expected to provide a public
-  //! method that accepts a `scoped_ptr`-wrapped argument of the proper
-  //! MinidumpWritable subclass, and call this method with that argument.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddChild(std::unique_ptr<MinidumpWritable> child);
-
-  //! \brief Returns `true` if no child objects have been added by AddChild(),
-  //!     and `false` if child objects are present.
-  bool IsEmpty() const { return children_.empty(); }
-
-  //! \brief Returns an object’s ::RVA objects referencing its children.
-  //!
-  //! \note The returned vector will be empty until the object advances to
-  //!     #kStateFrozen or beyond.
-  const std::vector<RVA>& child_rvas() const { return child_rvas_; }
-
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  std::unique_ptr<MinidumpRVAList> rva_list_base_;
-  std::vector<std::unique_ptr<MinidumpWritable>> children_;
-  std::vector<RVA> child_rvas_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpRVAListWriter);
-};
-
-}  // namespace internal
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_simple_string_dictionary_writer.h b/Tools/Crashpad/include/minidump/minidump_simple_string_dictionary_writer.h
deleted file mode 100644
index f2662bccff..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_simple_string_dictionary_writer.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_
-
-#include <sys/types.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_string_writer.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-//! \brief The writer for a MinidumpSimpleStringDictionaryEntry object in a
-//!     minidump file.
-//!
-//! Because MinidumpSimpleStringDictionaryEntry objects only appear as elements
-//! of MinidumpSimpleStringDictionary objects, this class does not write any
-//! data on its own. It makes its MinidumpSimpleStringDictionaryEntry data
-//! available to its MinidumpSimpleStringDictionaryWriter parent, which writes
-//! it as part of a MinidumpSimpleStringDictionary.
-class MinidumpSimpleStringDictionaryEntryWriter final
-    : public internal::MinidumpWritable {
- public:
-  MinidumpSimpleStringDictionaryEntryWriter();
-  ~MinidumpSimpleStringDictionaryEntryWriter() override;
-
-  //! \brief Returns a MinidumpSimpleStringDictionaryEntry referencing this
-  //!     object’s data.
-  //!
-  //! This method is expected to be called by a
-  //! MinidumpSimpleStringDictionaryWriter in order to obtain a
-  //! MinidumpSimpleStringDictionaryEntry to include in its list.
-  //!
-  //! \note Valid in #kStateWritable.
-  const MinidumpSimpleStringDictionaryEntry*
-  GetMinidumpSimpleStringDictionaryEntry() const;
-
-  //! \brief Sets the strings to be written as the entry object’s key and value.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetKeyValue(const std::string& key, const std::string& value);
-
-  //! \brief Retrieves the key to be written.
-  //!
-  //! \note Valid in any state.
-  const std::string& Key() const { return key_.UTF8(); }
-
- protected:
-  // MinidumpWritable:
-
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  struct MinidumpSimpleStringDictionaryEntry entry_;
-  internal::MinidumpUTF8StringWriter key_;
-  internal::MinidumpUTF8StringWriter value_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpSimpleStringDictionaryEntryWriter);
-};
-
-//! \brief The writer for a MinidumpSimpleStringDictionary object in a minidump
-//!     file, containing a list of MinidumpSimpleStringDictionaryEntry objects.
-//!
-//! Because this class writes a representatin of a dictionary, the order of
-//! entries is insignificant. Entries may be written in any order.
-class MinidumpSimpleStringDictionaryWriter final
-    : public internal::MinidumpWritable {
- public:
-  MinidumpSimpleStringDictionaryWriter();
-  ~MinidumpSimpleStringDictionaryWriter() override;
-
-  //! \brief Adds an initialized MinidumpSimpleStringDictionaryEntryWriter for
-  //!     each key-value pair in \a map to the MinidumpSimpleStringDictionary.
-  //!
-  //! \param[in] map The map to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromMap(const std::map<std::string, std::string>& map);
-
-  //! \brief Adds a MinidumpSimpleStringDictionaryEntryWriter to the
-  //!     MinidumpSimpleStringDictionary.
-  //!
-  //! This object takes ownership of \a entry and becomes its parent in the
-  //! overall tree of internal::MinidumpWritable objects.
-  //!
-  //! If the key contained in \a entry duplicates the key of an entry already
-  //! present in the MinidumpSimpleStringDictionary, the new \a entry will
-  //! replace the previous one.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddEntry(
-      std::unique_ptr<MinidumpSimpleStringDictionaryEntryWriter> entry);
-
-  //! \brief Determines whether the object is useful.
-  //!
-  //! A useful object is one that carries data that makes a meaningful
-  //! contribution to a minidump file. An object carrying entries would be
-  //! considered useful.
-  //!
-  //! \return `true` if the object is useful, `false` otherwise.
-  bool IsUseful() const;
-
- protected:
-  // MinidumpWritable:
-
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  // This object owns the MinidumpSimpleStringDictionaryEntryWriter objects.
-  std::map<std::string, MinidumpSimpleStringDictionaryEntryWriter*> entries_;
-
-  std::unique_ptr<MinidumpSimpleStringDictionary>
-      simple_string_dictionary_base_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpSimpleStringDictionaryWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_stream_writer.h b/Tools/Crashpad/include/minidump/minidump_stream_writer.h
deleted file mode 100644
index 894889ae8d..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_stream_writer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_STREAM_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_STREAM_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-namespace internal {
-
-//! \brief The base class for all second-level objects (“streams”) in a minidump
-//!     file.
-//!
-//! Instances of subclasses of this class are children of the root-level
-//! MinidumpFileWriter object.
-class MinidumpStreamWriter : public MinidumpWritable {
- public:
-  ~MinidumpStreamWriter() override;
-
-  //! \brief Returns an object’s stream type.
-  //!
-  //! \note Valid in any state.
-  virtual MinidumpStreamType StreamType() const = 0;
-
-  //! \brief Returns a MINIDUMP_DIRECTORY entry that serves as a pointer to this
-  //!     stream.
-  //!
-  //! This method is provided for MinidumpFileWriter, which calls it in order to
-  //! obtain the directory entry for a stream.
-  //!
-  //! \note Valid only in #kStateWritable.
-  const MINIDUMP_DIRECTORY* DirectoryListEntry() const;
-
- protected:
-  MinidumpStreamWriter();
-
-  // MinidumpWritable:
-  bool Freeze() override;
-
- private:
-  MINIDUMP_DIRECTORY directory_list_entry_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpStreamWriter);
-};
-
-}  // namespace internal
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_STREAM_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_string_writer.h b/Tools/Crashpad/include/minidump/minidump_string_writer.h
deleted file mode 100644
index 97215da445..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_string_writer.h
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "base/strings/string16.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_rva_list_writer.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-namespace internal {
-
-//! \cond
-
-struct MinidumpStringWriterUTF16Traits {
-  using StringType = base::string16;
-  using MinidumpStringType = MINIDUMP_STRING;
-};
-
-struct MinidumpStringWriterUTF8Traits {
-  using StringType = std::string;
-  using MinidumpStringType = MinidumpUTF8String;
-};
-
-//! \endcond
-
-//! \brief Writes a variable-length string to a minidump file in accordance with
-//!     the string type’s characteristics.
-//!
-//! MinidumpStringWriter objects should not be instantiated directly. To write
-//! strings to minidump file, use the MinidumpUTF16StringWriter and
-//! MinidumpUTF8StringWriter subclasses instead.
-template <typename Traits>
-class MinidumpStringWriter : public MinidumpWritable {
- public:
-  MinidumpStringWriter();
-  ~MinidumpStringWriter() override;
-
- protected:
-  using MinidumpStringType = typename Traits::MinidumpStringType;
-  using StringType = typename Traits::StringType;
-
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  //! \brief Sets the string to be written.
-  //!
-  //! \note Valid in #kStateMutable.
-  void set_string(const StringType& string) { string_.assign(string); }
-
-  //! \brief Retrieves the string to be written.
-  //!
-  //! \note Valid in any state.
-  const StringType& string() const { return string_; }
-
- private:
-  std::unique_ptr<MinidumpStringType> string_base_;
-  StringType string_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpStringWriter);
-};
-
-//! \brief Writes a variable-length UTF-16-encoded MINIDUMP_STRING to a minidump
-//!     file.
-//!
-//! MinidumpUTF16StringWriter objects should not be instantiated directly
-//! outside of the MinidumpWritable family of classes.
-class MinidumpUTF16StringWriter final
-    : public MinidumpStringWriter<MinidumpStringWriterUTF16Traits> {
- public:
-  MinidumpUTF16StringWriter() : MinidumpStringWriter() {}
-  ~MinidumpUTF16StringWriter() override;
-
-  //! \brief Converts a UTF-8 string to UTF-16 and sets it as the string to be
-  //!     written.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetUTF8(const std::string& string_utf8);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MinidumpUTF16StringWriter);
-};
-
-//! \brief Writes a variable-length UTF-8-encoded MinidumpUTF8String to a
-//!     minidump file.
-//!
-//! MinidumpUTF8StringWriter objects should not be instantiated directly outside
-//! of the MinidumpWritable family of classes.
-class MinidumpUTF8StringWriter final
-    : public MinidumpStringWriter<MinidumpStringWriterUTF8Traits> {
- public:
-  MinidumpUTF8StringWriter() : MinidumpStringWriter() {}
-  ~MinidumpUTF8StringWriter() override;
-
-  //! \brief Sets the string to be written.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetUTF8(const std::string& string_utf8) { set_string(string_utf8); }
-
-  //! \brief Retrieves the string to be written.
-  //!
-  //! \note Valid in any state.
-  const std::string& UTF8() const { return string(); }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MinidumpUTF8StringWriter);
-};
-
-//! \brief The writer for a MinidumpRVAList object in a minidump file,
-//!     containing a list of \a MinidumpStringWriterType objects.
-template <typename MinidumpStringWriterType>
-class MinidumpStringListWriter final : public MinidumpRVAListWriter {
- public:
-  MinidumpStringListWriter();
-  ~MinidumpStringListWriter() override;
-
-  //! \brief Adds a new \a Traits::MinidumpStringWriterType for each element in
-  //!     \a vector to the MinidumpRVAList.
-  //!
-  //! \param[in] vector The vector to use as source data. Each string in the
-  //!     vector is treated as a UTF-8 string, and a new string writer will be
-  //!     created for each one and made a child of the MinidumpStringListWriter.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromVector(const std::vector<std::string>& vector);
-
-  //! \brief Creates a new \a Traits::MinidumpStringWriterType object and adds
-  //!     it to the MinidumpRVAList.
-  //!
-  //! This object creates a new string writer with string value \a string_utf8,
-  //! takes ownership of it, and becomes its parent in the overall tree of
-  //! MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddStringUTF8(const std::string& string_utf8);
-
-  //! \brief Determines whether the object is useful.
-  //!
-  //! A useful object is one that carries data that makes a meaningful
-  //! contribution to a minidump file. An object carrying entries would be
-  //! considered useful.
-  //!
-  //! \return `true` if the object is useful, `false` otherwise.
-  bool IsUseful() const;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MinidumpStringListWriter);
-};
-
-}  // namespace internal
-
-using MinidumpUTF16StringListWriter = internal::MinidumpStringListWriter<
-    internal::MinidumpUTF16StringWriter>;
-using MinidumpUTF8StringListWriter = internal::MinidumpStringListWriter<
-    internal::MinidumpUTF8StringWriter>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_system_info_writer.h b/Tools/Crashpad/include/minidump/minidump_system_info_writer.h
deleted file mode 100644
index 866530c304..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_system_info_writer.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_SYSTEM_INFO_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_SYSTEM_INFO_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-class SystemSnapshot;
-
-namespace internal {
-class MinidumpUTF16StringWriter;
-}  // namespace internal
-
-//! \brief The writer for a MINIDUMP_SYSTEM_INFO stream in a minidump file.
-class MinidumpSystemInfoWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpSystemInfoWriter();
-  ~MinidumpSystemInfoWriter() override;
-
-  //! \brief Initializes MINIDUMP_SYSTEM_INFO based on \a system_snapshot.
-  //!
-  //! \param[in] system_snapshot The system snapshot to use as source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const SystemSnapshot* system_snapshot);
-
-  //! \brief Sets MINIDUMP_SYSTEM_INFO::ProcessorArchitecture.
-  void SetCPUArchitecture(MinidumpCPUArchitecture processor_architecture) {
-    system_info_.ProcessorArchitecture = processor_architecture;
-  }
-
-  //! \brief Sets MINIDUMP_SYSTEM_INFO::ProcessorLevel and
-  //!     MINIDUMP_SYSTEM_INFO::ProcessorRevision.
-  void SetCPULevelAndRevision(uint16_t processor_level,
-                              uint16_t processor_revision) {
-    system_info_.ProcessorLevel = processor_level;
-    system_info_.ProcessorRevision = processor_revision;
-  }
-
-  //! \brief Sets MINIDUMP_SYSTEM_INFO::NumberOfProcessors.
-  void SetCPUCount(uint8_t number_of_processors) {
-    system_info_.NumberOfProcessors = number_of_processors;
-  }
-
-  //! \brief Sets MINIDUMP_SYSTEM_INFO::PlatformId.
-  void SetOS(MinidumpOS platform_id) { system_info_.PlatformId = platform_id; }
-
-  //! \brief Sets MINIDUMP_SYSTEM_INFO::ProductType.
-  void SetOSType(MinidumpOSType product_type) {
-    system_info_.ProductType = product_type;
-  }
-
-  //! \brief Sets MINIDUMP_SYSTEM_INFO::MajorVersion,
-  //!     MINIDUMP_SYSTEM_INFO::MinorVersion, and
-  //!     MINIDUMP_SYSTEM_INFO::BuildNumber.
-  void SetOSVersion(uint32_t major_version,
-                    uint32_t minor_version,
-                    uint32_t build_number) {
-    system_info_.MajorVersion = major_version;
-    system_info_.MinorVersion = minor_version;
-    system_info_.BuildNumber = build_number;
-  }
-
-  //! \brief Arranges for MINIDUMP_SYSTEM_INFO::CSDVersionRva to point to a
-  //!     MINIDUMP_STRING containing the supplied string.
-  //!
-  //! This method must be called prior to Freeze(). A CSD version is required
-  //! in all MINIDUMP_SYSTEM_INFO streams. An empty string is an acceptable
-  //! value.
-  void SetCSDVersion(const std::string& csd_version);
-
-  //! \brief Sets MINIDUMP_SYSTEM_INFO::SuiteMask.
-  void SetSuiteMask(uint16_t suite_mask) {
-    system_info_.SuiteMask = suite_mask;
-  }
-
-  //! \brief Sets \ref CPU_INFORMATION::VendorId
-  //!     "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::VendorId".
-  //!
-  //! This is only valid if SetCPUArchitecture() has been used to set the CPU
-  //! architecture to #kMinidumpCPUArchitectureX86 or
-  //! #kMinidumpCPUArchitectureX86Win64.
-  //!
-  //! \param[in] ebx The first 4 bytes of the CPU vendor string, the value
-  //!     reported in `cpuid 0` `ebx`.
-  //! \param[in] edx The middle 4 bytes of the CPU vendor string, the value
-  //!     reported in `cpuid 0` `edx`.
-  //! \param[in] ecx The last 4 bytes of the CPU vendor string, the value
-  //!     reported by `cpuid 0` `ecx`.
-  //!
-  //! \note Do not call this method if SetCPUArchitecture() has been used to set
-  //!     the CPU architecture to #kMinidumpCPUArchitectureAMD64.
-  //!
-  //! \sa SetCPUX86VendorString()
-  void SetCPUX86Vendor(uint32_t ebx, uint32_t edx, uint32_t ecx);
-
-  //! \brief Sets \ref CPU_INFORMATION::VendorId
-  //!     "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::VendorId".
-  //!
-  //! This is only valid if SetCPUArchitecture() has been used to set the CPU
-  //! architecture to #kMinidumpCPUArchitectureX86 or
-  //! #kMinidumpCPUArchitectureX86Win64.
-  //!
-  //! \param[in] vendor The entire CPU vendor string, which must be exactly 12
-  //!     bytes long.
-  //!
-  //! \note Do not call this method if SetCPUArchitecture() has been used to set
-  //!     the CPU architecture to #kMinidumpCPUArchitectureAMD64.
-  //!
-  //! \sa SetCPUX86Vendor()
-  void SetCPUX86VendorString(const std::string& vendor);
-
-  //! \brief Sets \ref CPU_INFORMATION::VersionInformation
-  //!     "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::VersionInformation" and
-  //!     \ref CPU_INFORMATION::FeatureInformation
-  //!     "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::FeatureInformation".
-  //!
-  //! This is only valid if SetCPUArchitecture() has been used to set the CPU
-  //! architecture to #kMinidumpCPUArchitectureX86 or
-  //! #kMinidumpCPUArchitectureX86Win64.
-  //!
-  //! \note Do not call this method if SetCPUArchitecture() has been used to set
-  //!     the CPU architecture to #kMinidumpCPUArchitectureAMD64.
-  void SetCPUX86VersionAndFeatures(uint32_t version, uint32_t features);
-
-  //! \brief Sets \ref CPU_INFORMATION::AMDExtendedCpuFeatures
-  //!     "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::AMDExtendedCPUFeatures".
-  //!
-  //! This is only valid if SetCPUArchitecture() has been used to set the CPU
-  //! architecture to #kMinidumpCPUArchitectureX86 or
-  //! #kMinidumpCPUArchitectureX86Win64, and if SetCPUX86Vendor() or
-  //! SetCPUX86VendorString() has been used to set the CPU vendor to
-  //! “AuthenticAMD”.
-  //!
-  //! \note Do not call this method if SetCPUArchitecture() has been used to set
-  //!     the CPU architecture to #kMinidumpCPUArchitectureAMD64.
-  void SetCPUX86AMDExtendedFeatures(uint32_t extended_features);
-
-  //! \brief Sets \ref CPU_INFORMATION::ProcessorFeatures
-  //!     "MINIDUMP_SYSTEM_INFO::Cpu::OtherCpuInfo::ProcessorFeatures".
-  //!
-  //! This is only valid if SetCPUArchitecture() has been used to set the CPU
-  //! architecture to an architecture other than #kMinidumpCPUArchitectureX86
-  //! or #kMinidumpCPUArchitectureX86Win64.
-  //!
-  //! \note This method may be called if SetCPUArchitecture() has been used to
-  //!     set the CPU architecture to #kMinidumpCPUArchitectureAMD64.
-  void SetCPUOtherFeatures(uint64_t features_0, uint64_t features_1);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  MINIDUMP_SYSTEM_INFO system_info_;
-  std::unique_ptr<internal::MinidumpUTF16StringWriter> csd_version_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpSystemInfoWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_SYSTEM_INFO_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_thread_id_map.h b/Tools/Crashpad/include/minidump/minidump_thread_id_map.h
deleted file mode 100644
index 33b105fba1..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_thread_id_map.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_THREAD_ID_MAP_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_THREAD_ID_MAP_H_
-
-#include <stdint.h>
-
-#include <map>
-#include <vector>
-
-namespace crashpad {
-
-class ThreadSnapshot;
-
-//! \brief A map that connects 64-bit snapshot thread IDs to 32-bit minidump
-//!     thread IDs.
-//!
-//! 64-bit snapshot thread IDs are obtained from ThreadSnapshot::ThreadID().
-//! 32-bit minidump thread IDs are stored in MINIDUMP_THREAD::ThreadId.
-//!
-//! A ThreadIDMap ensures that there are no collisions among the set of 32-bit
-//! minidump thread IDs.
-using MinidumpThreadIDMap = std::map<uint64_t, uint32_t>;
-
-//! \brief Builds a MinidumpThreadIDMap for a group of ThreadSnapshot objects.
-//!
-//! \param[in] thread_snapshots The thread snapshots to use as source data.
-//! \param[out] thread_id_map A MinidumpThreadIDMap to be built by this method.
-//!     This map must be empty when this function is called.
-//!
-//! The map ensures that for any unique 64-bit thread ID found in a
-//! ThreadSnapshot, the 32-bit thread ID used in a minidump file will also be
-//! unique.
-void BuildMinidumpThreadIDMap(
-    const std::vector<const ThreadSnapshot*>& thread_snapshots,
-    MinidumpThreadIDMap* thread_id_map);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_THREAD_ID_MAP_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_thread_writer.h b/Tools/Crashpad/include/minidump/minidump_thread_writer.h
deleted file mode 100644
index 82092e2b61..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_thread_writer.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_THREAD_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_THREAD_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_thread_id_map.h"
-#include "minidump/minidump_writable.h"
-
-namespace crashpad {
-
-class MinidumpContextWriter;
-class MinidumpMemoryListWriter;
-class SnapshotMinidumpMemoryWriter;
-class ThreadSnapshot;
-
-//! \brief The writer for a MINIDUMP_THREAD object in a minidump file.
-//!
-//! Because MINIDUMP_THREAD objects only appear as elements of
-//! MINIDUMP_THREAD_LIST objects, this class does not write any data on its own.
-//! It makes its MINIDUMP_THREAD data available to its MinidumpThreadListWriter
-//! parent, which writes it as part of a MINIDUMP_THREAD_LIST.
-class MinidumpThreadWriter final : public internal::MinidumpWritable {
- public:
-  MinidumpThreadWriter();
-  ~MinidumpThreadWriter() override;
-
-  //! \brief Initializes the MINIDUMP_THREAD based on \a thread_snapshot.
-  //!
-  //! \param[in] thread_snapshot The thread snapshot to use as source data.
-  //! \param[in] thread_id_map A MinidumpThreadIDMap to be consulted to
-  //!     determine the 32-bit minidump thread ID to use for \a thread_snapshot.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(const ThreadSnapshot* thread_snapshot,
-                              const MinidumpThreadIDMap* thread_id_map);
-
-  //! \brief Returns a MINIDUMP_THREAD referencing this object’s data.
-  //!
-  //! This method is expected to be called by a MinidumpThreadListWriter in
-  //! order to obtain a MINIDUMP_THREAD to include in its list.
-  //!
-  //! \note Valid in #kStateWritable.
-  const MINIDUMP_THREAD* MinidumpThread() const;
-
-  //! \brief Returns a SnapshotMinidumpMemoryWriter that will write the memory
-  //!     region corresponding to this object’s stack.
-  //!
-  //! If the thread does not have a stack, or its stack could not be determined,
-  //! this will return `nullptr`.
-  //!
-  //! This method is provided so that MinidumpThreadListWriter can obtain thread
-  //! stack memory regions for the purposes of adding them to a
-  //! MinidumpMemoryListWriter (configured by calling
-  //! MinidumpThreadListWriter::SetMemoryListWriter()) by calling
-  //! MinidumpMemoryListWriter::AddExtraMemory().
-  //!
-  //! \note Valid in any state.
-  SnapshotMinidumpMemoryWriter* Stack() const { return stack_.get(); }
-
-  //! \brief Arranges for MINIDUMP_THREAD::Stack to point to the MINIDUMP_MEMORY
-  //!     object to be written by \a stack.
-  //!
-  //! This object takes ownership of \a stack and becomes its parent in the
-  //! overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetStack(std::unique_ptr<SnapshotMinidumpMemoryWriter> stack);
-
-  //! \brief Arranges for MINIDUMP_THREAD::ThreadContext to point to the CPU
-  //!     context to be written by \a context.
-  //!
-  //! A context is required in all MINIDUMP_THREAD objects.
-  //!
-  //! This object takes ownership of \a context and becomes its parent in the
-  //! overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetContext(std::unique_ptr<MinidumpContextWriter> context);
-
-  //! \brief Sets MINIDUMP_THREAD::ThreadId.
-  void SetThreadID(uint32_t thread_id) { thread_.ThreadId = thread_id; }
-
-  //! \brief Sets MINIDUMP_THREAD::SuspendCount.
-  void SetSuspendCount(uint32_t suspend_count) {
-    thread_.SuspendCount = suspend_count;
-  }
-
-  //! \brief Sets MINIDUMP_THREAD::PriorityClass.
-  void SetPriorityClass(uint32_t priority_class) {
-    thread_.PriorityClass = priority_class;
-  }
-
-  //! \brief Sets MINIDUMP_THREAD::Priority.
-  void SetPriority(uint32_t priority) { thread_.Priority = priority; }
-
-  //! \brief Sets MINIDUMP_THREAD::Teb.
-  void SetTEB(uint64_t teb) { thread_.Teb = teb; }
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  MINIDUMP_THREAD thread_;
-  std::unique_ptr<SnapshotMinidumpMemoryWriter> stack_;
-  std::unique_ptr<MinidumpContextWriter> context_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpThreadWriter);
-};
-
-//! \brief The writer for a MINIDUMP_THREAD_LIST stream in a minidump file,
-//!     containing a list of MINIDUMP_THREAD objects.
-class MinidumpThreadListWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpThreadListWriter();
-  ~MinidumpThreadListWriter() override;
-
-  //! \brief Adds an initialized MINIDUMP_THREAD for each thread in \a
-  //!     thread_snapshots to the MINIDUMP_THREAD_LIST.
-  //!
-  //! \param[in] thread_snapshots The thread snapshots to use as source data.
-  //! \param[out] thread_id_map A MinidumpThreadIDMap to be built by this
-  //!     method. This map must be empty when this method is called.
-  //!
-  //! \note Valid in #kStateMutable. AddThread() may not be called before this
-  //!     method, and it is not normally necessary to call AddThread() after
-  //!     this method.
-  void InitializeFromSnapshot(
-      const std::vector<const ThreadSnapshot*>& thread_snapshots,
-      MinidumpThreadIDMap* thread_id_map);
-
-  //! \brief Sets the MinidumpMemoryListWriter that each thread’s stack memory
-  //!     region should be added to as extra memory.
-  //!
-  //! Each MINIDUMP_THREAD object can contain a reference to a
-  //! SnapshotMinidumpMemoryWriter object that contains a snapshot of its stac
-  //! memory. In the overall tree of internal::MinidumpWritable objects, these
-  //! SnapshotMinidumpMemoryWriter objects are considered children of their
-  //! MINIDUMP_THREAD, and are referenced by a MINIDUMP_MEMORY_DESCRIPTOR
-  //! contained in the MINIDUMP_THREAD. It is also possible for the same memory
-  //! regions to have MINIDUMP_MEMORY_DESCRIPTOR objects present in a
-  //! MINIDUMP_MEMORY_LIST stream. This is accomplished by calling this method,
-  //! which informs a MinidumpThreadListWriter that it should call
-  //! MinidumpMemoryListWriter::AddExtraMemory() for each extant thread stack
-  //! while the thread is being added in AddThread(). When this is done, the
-  //! MinidumpMemoryListWriter will contain a MINIDUMP_MEMORY_DESCRIPTOR
-  //! pointing to the thread’s stack memory in its MINIDUMP_MEMORY_LIST. Note
-  //! that the actual contents of the memory is only written once, as a child of
-  //! the MinidumpThreadWriter. The MINIDUMP_MEMORY_DESCRIPTOR objects in both
-  //! the MINIDUMP_THREAD and MINIDUMP_MEMORY_LIST will point to the same copy
-  //! of the memory’s contents.
-  //!
-  //! \note This method must be called before AddThread() is called. Threads
-  //!     added by AddThread() prior to this method being called will not have
-  //!     their stacks added to \a memory_list_writer as extra memory.
-  //! \note Valid in #kStateMutable.
-  void SetMemoryListWriter(MinidumpMemoryListWriter* memory_list_writer);
-
-  //! \brief Adds a MinidumpThreadWriter to the MINIDUMP_THREAD_LIST.
-  //!
-  //! This object takes ownership of \a thread and becomes its parent in the
-  //! overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddThread(std::unique_ptr<MinidumpThreadWriter> thread);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  std::vector<std::unique_ptr<MinidumpThreadWriter>> threads_;
-  MinidumpMemoryListWriter* memory_list_writer_;  // weak
-  MINIDUMP_THREAD_LIST thread_list_base_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpThreadListWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_THREAD_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_unloaded_module_writer.h b/Tools/Crashpad/include/minidump/minidump_unloaded_module_writer.h
deleted file mode 100644
index 97651dbac8..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_unloaded_module_writer.h
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_UNLOADED_MODULE_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_UNLOADED_MODULE_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_string_writer.h"
-#include "minidump/minidump_writable.h"
-#include "snapshot/unloaded_module_snapshot.h"
-
-namespace crashpad {
-
-//! \brief The writer for a MINIDUMP_UNLOADED_MODULE object in a minidump file.
-//!
-//! Because MINIDUMP_UNLOADED_MODULE objects only appear as elements of
-//! MINIDUMP_UNLOADED_MODULE_LIST objects, this class does not write any data on
-//! its own. It makes its MINIDUMP_UNLOADED_MODULE data available to its
-//! MinidumpUnloadedModuleListWriter parent, which writes it as part of a
-//! MINIDUMP_UNLOADED_MODULE_LIST.
-class MinidumpUnloadedModuleWriter final : public internal::MinidumpWritable {
- public:
-  MinidumpUnloadedModuleWriter();
-  ~MinidumpUnloadedModuleWriter() override;
-
-  //! \brief Initializes the MINIDUMP_UNLOADED_MODULE based on \a
-  //! unloaded_module_snapshot.
-  //!
-  //! \param[in] unloaded_module_snapshot The unloaded module snapshot to use as
-  //!     source data.
-  //!
-  //! \note Valid in #kStateMutable. No mutator methods may be called before
-  //!     this method, and it is not normally necessary to call any mutator
-  //!     methods after this method.
-  void InitializeFromSnapshot(
-      const UnloadedModuleSnapshot& unloaded_module_snapshot);
-
-  //! \brief Returns a MINIDUMP_UNLOADED_MODULE referencing this object’s data.
-  //!
-  //! This method is expected to be called by a MinidumpUnloadedModuleListWriter
-  //! in order to obtain a MINIDUMP_UNLOADED_MODULE to include in its list.
-  //!
-  //! \note Valid in #kStateWritable.
-  const MINIDUMP_UNLOADED_MODULE* MinidumpUnloadedModule() const;
-
-  //! \brief Arranges for MINIDUMP_UNLOADED_MODULE::ModuleNameRva to point to a
-  //!     MINIDUMP_STRING containing \a name.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetName(const std::string& name);
-
-  //! \brief Sets MINIDUMP_UNLOADED_MODULE::BaseOfImage.
-  void SetImageBaseAddress(uint64_t image_base_address) {
-    unloaded_module_.BaseOfImage = image_base_address;
-  }
-
-  //! \brief Sets MINIDUMP_UNLOADED_MODULE::SizeOfImage.
-  void SetImageSize(uint32_t image_size) {
-    unloaded_module_.SizeOfImage = image_size;
-  }
-
-  //! \brief Sets MINIDUMP_UNLOADED_MODULE::CheckSum.
-  void SetChecksum(uint32_t checksum) { unloaded_module_.CheckSum = checksum; }
-
-  //! \brief Sets MINIDUMP_UNLOADED_MODULE::TimeDateStamp.
-  //!
-  //! \note Valid in #kStateMutable.
-  void SetTimestamp(time_t timestamp);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
- private:
-  MINIDUMP_UNLOADED_MODULE unloaded_module_;
-  std::unique_ptr<internal::MinidumpUTF16StringWriter> name_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpUnloadedModuleWriter);
-};
-
-//! \brief The writer for a MINIDUMP_UNLOADED_MODULE_LIST stream in a minidump
-//!     file, containing a list of MINIDUMP_UNLOADED_MODULE objects.
-class MinidumpUnloadedModuleListWriter final
-    : public internal::MinidumpStreamWriter {
- public:
-  MinidumpUnloadedModuleListWriter();
-  ~MinidumpUnloadedModuleListWriter() override;
-
-  //! \brief Adds an initialized MINIDUMP_UNLOADED_MODULE for each unloaded
-  //!     module in \a unloaded_module_snapshots to the
-  //!     MINIDUMP_UNLOADED_MODULE_LIST.
-  //!
-  //! \param[in] unloaded_module_snapshots The unloaded module snapshots to use
-  //!     as source data.
-  //!
-  //! \note Valid in #kStateMutable. AddUnloadedModule() may not be called
-  //!     before this this method, and it is not normally necessary to call
-  //!     AddUnloadedModule() after this method.
-  void InitializeFromSnapshot(
-      const std::vector<UnloadedModuleSnapshot>& unloaded_module_snapshots);
-
-  //! \brief Adds a MinidumpUnloadedModuleWriter to the
-  //!     MINIDUMP_UNLOADED_MODULE_LIST.
-  //!
-  //! This object takes ownership of \a unloaded_module and becomes its parent
-  //! in the overall tree of internal::MinidumpWritable objects.
-  //!
-  //! \note Valid in #kStateMutable.
-  void AddUnloadedModule(
-      std::unique_ptr<MinidumpUnloadedModuleWriter> unloaded_module);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  std::vector<std::unique_ptr<MinidumpUnloadedModuleWriter>> unloaded_modules_;
-  MINIDUMP_UNLOADED_MODULE_LIST unloaded_module_list_base_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpUnloadedModuleListWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_UNLOADED_MODULE_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_user_extension_stream_data_source.h b/Tools/Crashpad/include/minidump/minidump_user_extension_stream_data_source.h
deleted file mode 100644
index 3eb0c8743a..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_user_extension_stream_data_source.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_USER_EXTENSION_STREAM_DATA_SOURCE_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_USER_EXTENSION_STREAM_DATA_SOURCE_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include "base/macros.h"
-
-#include "minidump/minidump_extensions.h"
-
-namespace crashpad {
-
-//! \brief Describes a user extension data stream in a minidump.
-class MinidumpUserExtensionStreamDataSource {
- public:
-  //! \brief An interface implemented by readers of
-  //!     MinidumpUserExtensionStreamDataSource.
-  class Delegate {
-   public:
-    //! \brief Called by  MinidumpUserExtensionStreamDataSource::Read() to
-    //!     provide data requested by a call to that method.
-    //!
-    //! \param[in] data A pointer to the data that was read. The callee does not
-    //!     take ownership of this data. This data is only valid for the
-    //!     duration of the call to this method. This parameter may be `nullptr`
-    //!     if \a size is `0`.
-    //! \param[in] size The size of the data that was read.
-    //!
-    //! \return `true` on success, `false` on failure.
-    //!     MinidumpUserExtensionStreamDataSource::ReadStreamData() will use
-    //!     this as its own return value.
-    virtual bool ExtensionStreamDataSourceRead(const void* data,
-                                               size_t size) = 0;
-
-   protected:
-    ~Delegate() {}
-  };
-
-  //! \brief Constructs a MinidumpUserExtensionStreamDataSource.
-  //!
-  //! \param[in] stream_type The type of the user extension stream.
-  explicit MinidumpUserExtensionStreamDataSource(uint32_t stream_type);
-  virtual ~MinidumpUserExtensionStreamDataSource();
-
-  MinidumpStreamType stream_type() const { return stream_type_; }
-
-  //! \brief The size of this data stream.
-  virtual size_t StreamDataSize() = 0;
-
-  //! \brief Calls Delegate::UserStreamDataSourceRead(), providing it with
-  //!     the stream data.
-  //!
-  //! Implementations do not necessarily compute the stream data prior to
-  //! this method being called. The stream data may be computed or loaded
-  //! lazily and may be discarded after being passed to the delegate.
-  //!
-  //! \return `false` on failure, otherwise, the return value of
-  //!     Delegate::ExtensionStreamDataSourceRead(), which should be `true` on
-  //!     success and `false` on failure.
-  virtual bool ReadStreamData(Delegate* delegate) = 0;
-
- private:
-  MinidumpStreamType stream_type_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpUserExtensionStreamDataSource);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_USER_EXTENSION_STREAM_DATA_SOURCE_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_user_stream_writer.h b/Tools/Crashpad/include/minidump/minidump_user_stream_writer.h
deleted file mode 100644
index c1bad0ac92..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_user_stream_writer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_USER_STREAM_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_USER_STREAM_WRITER_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "minidump/minidump_extensions.h"
-#include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_writable.h"
-#include "minidump/minidump_user_extension_stream_data_source.h"
-#include "snapshot/module_snapshot.h"
-
-namespace crashpad {
-
-//! \brief The writer for a MINIDUMP_USER_STREAM in a minidump file.
-class MinidumpUserStreamWriter final : public internal::MinidumpStreamWriter {
- public:
-  MinidumpUserStreamWriter();
-  ~MinidumpUserStreamWriter() override;
-
-  //! \brief Initializes a MINIDUMP_USER_STREAM based on \a stream.
-  //!
-  //! \param[in] stream The memory and stream type to use as source data.
-  //!
-  //! \note Valid in #kStateMutable.
-  void InitializeFromSnapshot(const UserMinidumpStream* stream);
-
-  //! \brief Initializes a MINIDUMP_USER_STREAM based on \a data_source.
-  //!
-  //! \param[in] data_source The content and type of the stream.
-  //!
-  //! \note Valid in #kStateMutable.
-  void InitializeFromUserExtensionStream(
-      std::unique_ptr<MinidumpUserExtensionStreamDataSource> data_source);
-
- protected:
-  // MinidumpWritable:
-  bool Freeze() override;
-  size_t SizeOfObject() override;
-  std::vector<internal::MinidumpWritable*> Children() override;
-  bool WriteObject(FileWriterInterface* file_writer) override;
-
-  // MinidumpStreamWriter:
-  MinidumpStreamType StreamType() const override;
-
- private:
-  class ContentsWriter;
-  class SnapshotContentsWriter;
-  class ExtensionStreamContentsWriter;
-
-  std::unique_ptr<ContentsWriter> contents_writer_;
-
-  MinidumpStreamType stream_type_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpUserStreamWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_USER_STREAM_WRITER_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_writable.h b/Tools/Crashpad/include/minidump/minidump_writable.h
deleted file mode 100644
index b2ebf04e7d..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_writable.h
+++ /dev/null
@@ -1,280 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_WRITABLE_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_WRITABLE_H_
-
-#include <windows.h>
-#include <dbghelp.h>
-#include <sys/types.h>
-
-#include <limits>
-#include <vector>
-
-#include "base/macros.h"
-#include "util/file/file_io.h"
-
-namespace crashpad {
-
-class FileWriterInterface;
-
-namespace internal {
-
-//! \brief The base class for all content that might be written to a minidump
-//!     file.
-class MinidumpWritable {
- public:
-  virtual ~MinidumpWritable();
-
-  //! \brief Writes an object and all of its children to a minidump file.
-  //!
-  //! Use this on the root object of a tree of MinidumpWritable objects,
-  //! typically on a MinidumpFileWriter object.
-  //!
-  //! \param[in] file_writer The file writer to receive the minidump file’s
-  //!     content.
-  //!
-  //! \return `true` on success. `false` on failure, with an appropriate message
-  //!     logged.
-  //!
-  //! \note Valid in #kStateMutable, and transitions the object and the entire
-  //!     tree beneath it through all states to #kStateWritten.
-  //!
-  //! \note This method should rarely be overridden.
-  virtual bool WriteEverything(FileWriterInterface* file_writer);
-
-  //! \brief Registers a file offset pointer as one that should point to the
-  //!     object on which this method is called.
-  //!
-  //! Once the file offset at which an object will be written is known (when it
-  //! enters #kStateWritable), registered RVA pointers will be updated.
-  //!
-  //! \param[in] rva A pointer to storage for the file offset that should
-  //!     contain this object’s writable file offset, once it is known.
-  //!
-  //! \note Valid in #kStateFrozen or any preceding state.
-  //
-  // This is public instead of protected because objects of derived classes need
-  // to be able to register their own pointers with distinct objects.
-  void RegisterRVA(RVA* rva);
-
-  //! \brief Registers a location descriptor as one that should point to the
-  //!     object on which this method is called.
-  //!
-  //! Once an object’s size and the file offset at it will be written is known
-  //! (when it enters #kStateFrozen), the relevant data in registered location
-  //! descriptors will be updated.
-  //!
-  //! \param[in] location_descriptor A pointer to a location descriptor that
-  //!     should contain this object’s writable size and file offset, once they
-  //!     are known.
-  //!
-  //! \note Valid in #kStateFrozen or any preceding state.
-  //
-  // This is public instead of protected because objects of derived classes need
-  // to be able to register their own pointers with distinct objects.
-  void RegisterLocationDescriptor(
-      MINIDUMP_LOCATION_DESCRIPTOR* location_descriptor);
-
- protected:
-  //! \brief Identifies the state of an object.
-  //!
-  //! Objects will normally transition through each of these states as they are
-  //! created, populated with data, and then written to a minidump file.
-  enum State {
-    //! \brief The object’s properties can be modified.
-    kStateMutable = 0,
-
-    //! \brief The object is “frozen”.
-    //!
-    //! Its properties cannot be modified. Pointers to file offsets of other
-    //! structures may not yet be valid.
-    kStateFrozen,
-
-    //! \brief The object is writable.
-    //!
-    //! The file offset at which it will be written is known. Pointers to file
-    //! offsets of other structures are valid when all objects in a tree are in
-    //! this state.
-    kStateWritable,
-
-    //! \brief The object has been written to a minidump file.
-    kStateWritten,
-  };
-
-  //! \brief Identifies the phase during which an object will be written to a
-  //!     minidump file.
-  enum Phase {
-    //! \brief Objects that are written to a minidump file “early”.
-    //!
-    //! The normal sequence is for an object to write itself and then write all
-    //! of its children.
-    kPhaseEarly = 0,
-
-    //! \brief Objects that are written to a minidump file “late”.
-    //!
-    //! Some objects, such as those capturing memory region snapshots, are
-    //! written to minidump files after all other objects. This “late” phase
-    //! identifies such objects. This is useful to improve spatial locality in
-    //! minidump files in accordance with expected access patterns: unlike most
-    //! other data, memory snapshots are large and do not usually need to be
-    //! consulted in their entirety in order to process a minidump file.
-    kPhaseLate,
-  };
-
-  //! \brief A size value used to signal failure by methods that return
-  //!     `size_t`.
-  static constexpr size_t kInvalidSize = std::numeric_limits<size_t>::max();
-
-  MinidumpWritable();
-
-  //! \brief The state of the object.
-  State state() const { return state_; }
-
-  //! \brief Transitions the object from #kStateMutable to #kStateFrozen.
-  //!
-  //! The default implementation marks the object as frozen and recursively
-  //! calls Freeze() on all of its children. Subclasses may override this method
-  //! to perform processing that should only be done once callers have finished
-  //! populating an object with data. Typically, a subclass implementation would
-  //! call RegisterRVA() or RegisterLocationDescriptor() on other objects as
-  //! appropriate, because at the time Freeze() runs, the in-memory locations of
-  //! RVAs and location descriptors are known and will not change for the
-  //! remaining duration of an object’s lifetime.
-  //!
-  //! \return `true` on success. `false` on failure, with an appropriate message
-  //!     logged.
-  virtual bool Freeze();
-
-  //! \brief Returns the amount of space that this object will consume when
-  //!     written to a minidump file, in bytes, not including any leading or
-  //!     trailing padding necessary to maintain proper alignment.
-  //!
-  //! \note Valid in #kStateFrozen or any subsequent state.
-  virtual size_t SizeOfObject() = 0;
-
-  //! \brief Returns the object’s desired byte-boundary alignment.
-  //!
-  //! The default implementation returns `4`. Subclasses may override this as
-  //! needed.
-  //!
-  //! \note Valid in #kStateFrozen or any subsequent state.
-  virtual size_t Alignment();
-
-  //! \brief Returns the object’s children.
-  //!
-  //! \note Valid in #kStateFrozen or any subsequent state.
-  virtual std::vector<MinidumpWritable*> Children();
-
-  //! \brief Returns the object’s desired write phase.
-  //!
-  //! The default implementation returns #kPhaseEarly. Subclasses may override
-  //! this method to alter their write phase.
-  //!
-  //! \note Valid in any state.
-  virtual Phase WritePhase();
-
-  //! \brief Prepares the object to be written at a known file offset,
-  //!     transitioning it from #kStateFrozen to #kStateWritable.
-  //!
-  //! This method is responsible for determining the final file offset of the
-  //! object, which may be increased from \a offset to meet alignment
-  //! requirements. It calls WillWriteAtOffsetImpl() for the benefit of
-  //! subclasses. It populates all RVAs and location descriptors registered with
-  //! it via RegisterRVA() and RegisterLocationDescriptor(). It also recurses
-  //! into all known children.
-  //!
-  //! \param[in] phase The phase during which the object will be written. If
-  //!     this does not match Phase(), processing is suppressed, although
-  //!     recursive processing will still occur on all children. This addresses
-  //!     the case where parents and children do not write in the same phase.
-  //! \param[in] offset The file offset at which the object will be written. The
-  //!     offset may need to be adjusted for alignment.
-  //! \param[out] write_sequence This object will append itself to this list,
-  //!     such that on return from a recursive tree of WillWriteAtOffset()
-  //!     calls, elements of the vector will be organized in the sequence that
-  //!     the objects will be written to the minidump file.
-  //!
-  //! \return The file size consumed by this object and all children, including
-  //!     any padding inserted to meet alignment requirements. On failure,
-  //!     #kInvalidSize, with an appropriate message logged.
-  //!
-  //! \note This method cannot be overridden. Subclasses that need to perform
-  //!     processing when an object transitions to #kStateWritable should
-  //!     implement WillWriteAtOffsetImpl(), which is called by this method.
-  size_t WillWriteAtOffset(Phase phase,
-                           FileOffset* offset,
-                           std::vector<MinidumpWritable*>* write_sequence);
-
-  //! \brief Called once an object’s writable file offset is determined, as it
-  //!     transitions into #kStateWritable.
-  //!
-  //! Subclasses can override this method if they need to provide additional
-  //! processing once their writable file offset is known. Typically, this will
-  //! be done by subclasses that handle certain RVAs themselves instead of using
-  //! the RegisterRVA() interface.
-  //!
-  //! \param[in] offset The file offset at which the object will be written. The
-  //!     value passed to this method will already have been adjusted to meet
-  //!     alignment requirements.
-  //!
-  //! \return `true` on success. `false` on error, indicating that the minidump
-  //!     file should not be written.
-  //!
-  //! \note Valid in #kStateFrozen. The object will transition to
-  //!     #kStateWritable after this method returns.
-  virtual bool WillWriteAtOffsetImpl(FileOffset offset);
-
-  //! \brief Writes the object, transitioning it from #kStateWritable to
-  //!     #kStateWritten.
-  //!
-  //! Writes any padding necessary to meet alignment requirements, and then
-  //! calls WriteObject() to write the object’s content.
-  //!
-  //! \param[in] file_writer The file writer to receive the object’s content.
-  //!
-  //! \return `true` on success. `false` on error with an appropriate message
-  //!     logged.
-  //!
-  //! \note This method cannot be overridden. Subclasses must override
-  //!     WriteObject().
-  bool WritePaddingAndObject(FileWriterInterface* file_writer);
-
-  //! \brief Writes the object’s content.
-  //!
-  //! \param[in] file_writer The file writer to receive the object’s content.
-  //!
-  //! \return `true` on success. `false` on error, indicating that the content
-  //!     could not be written to the minidump file.
-  //!
-  //! \note Valid in #kStateWritable. The object will transition to
-  //!     #kStateWritten after this method returns.
-  virtual bool WriteObject(FileWriterInterface* file_writer) = 0;
-
- private:
-  std::vector<RVA*> registered_rvas_;  // weak
-
-  // weak
-  std::vector<MINIDUMP_LOCATION_DESCRIPTOR*> registered_location_descriptors_;
-
-  size_t leading_pad_bytes_;
-  State state_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpWritable);
-};
-
-}  // namespace internal
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_WRITABLE_H_
diff --git a/Tools/Crashpad/include/minidump/minidump_writer_util.h b/Tools/Crashpad/include/minidump/minidump_writer_util.h
deleted file mode 100644
index 7ebe3f3aa1..0000000000
--- a/Tools/Crashpad/include/minidump/minidump_writer_util.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <time.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "base/strings/string16.h"
-
-namespace crashpad {
-namespace internal {
-
-//! \brief A collection of utility functions used by the MinidumpWritable family
-//!     of classes.
-class MinidumpWriterUtil final {
- public:
-  //! \brief Assigns a `time_t` value, logging a warning if the result overflows
-  //!     the destination buffer and will be truncated.
-  //!
-  //! \param[out] destination A pointer to the variable to be assigned to.
-  //! \param[in] source The value to assign.
-  //!
-  //! The minidump format uses `uint32_t` for many timestamp values, but
-  //! `time_t` may be wider than this. These year 2038 bugs are a limitation of
-  //! the minidump format. An out-of-range error will be noted with a warning,
-  //! but is not considered fatal. \a source will be truncated and assigned to
-  //! \a destination in this case.
-  //!
-  //! For `time_t` values with nonfatal overflow semantics, this function is
-  //! used in preference to AssignIfInRange(), which fails without performing an
-  //! assignment when an out-of-range condition is detected.
-  static void AssignTimeT(uint32_t* destination, time_t source);
-
-  //! \brief Converts a UTF-8 string to UTF-16 and returns it. If the string
-  //!     cannot be converted losslessly, indicating that the input is not
-  //!     well-formed UTF-8, a warning is logged.
-  //!
-  //! \param[in] utf8 The UTF-8-encoded string to convert.
-  //!
-  //! \return The \a utf8 string, converted to UTF-16 encoding. If the
-  //!     conversion is lossy, U+FFFD “replacement characters” will be
-  //!     introduced.
-  static base::string16 ConvertUTF8ToUTF16(const std::string& utf8);
-
-  //! \brief Converts a UTF-8 string to UTF-16 and places it into a buffer of
-  //!     fixed size, taking care to `NUL`-terminate the buffer and not to
-  //!     overflow it. If the string will be truncated or if it cannot be
-  //!     converted losslessly, a warning is logged.
-  //!
-  //! Any unused portion of the \a destination buffer that is not written to by
-  //! the converted string will be overwritten with `NUL` UTF-16 code units,
-  //! thus, this function always writes \a destination_size `char16` units.
-  //!
-  //! If the conversion is lossy, U+FFFD “replacement characters” will be
-  //! introduced.
-  //!
-  //! \param[out] destination A pointer to the destination buffer, where the
-  //!     UTF-16-encoded string will be written.
-  //! \param[in] destination_size The size of \a destination in `char16` units,
-  //!     including space used by a `NUL` terminator.
-  //! \param[in] source The UTF-8-encoded input string.
-  static void AssignUTF8ToUTF16(base::char16* destination,
-                                size_t destination_size,
-                                const std::string& source);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(MinidumpWriterUtil);
-};
-
-}  // namespace internal
-}  // namespace crashpad
-
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_
diff --git a/Tools/Crashpad/include/third_party/getopt/LICENSE b/Tools/Crashpad/include/third_party/getopt/LICENSE
deleted file mode 100644
index 4444b1201e..0000000000
--- a/Tools/Crashpad/include/third_party/getopt/LICENSE
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (C) 1997 Gregory Pietsch
-
-[These files] are hereby placed in the public domain without restrictions. Just
-give the author credit, don't claim you wrote it or prevent anyone else from
-using it.
diff --git a/Tools/Crashpad/include/third_party/getopt/getopt.h b/Tools/Crashpad/include/third_party/getopt/getopt.h
deleted file mode 100644
index 27ab0dd4e5..0000000000
--- a/Tools/Crashpad/include/third_party/getopt/getopt.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright (C) 1997 Gregory Pietsch
-
-[These files] are hereby placed in the public domain without restrictions. Just
-give the author credit, don't claim you wrote it or prevent anyone else from
-using it.
-*/
-
-#ifndef GETOPT_H
-#define GETOPT_H
-
-/* include files needed by this include file */
-
-/* macros defined by this include file */
-#define no_argument       0
-#define required_argument 1
-#define optional_argument 2
-
-/* types defined by this include file */
-
-namespace crashpad {
-
-/* GETOPT_LONG_OPTION_T: The type of long option */
-typedef struct GETOPT_LONG_OPTION_T
-{
-  const char *name;             /* the name of the long option */
-  int has_arg;                  /* one of the above macros */
-  int *flag;                    /* determines if getopt_long() returns a
-                                 * value for a long option; if it is
-                                 * non-NULL, 0 is returned as a function
-                                 * value and the value of val is stored in
-                                 * the area pointed to by flag.  Otherwise,
-                                 * val is returned. */
-  int val;                      /* determines the value to return if flag is
-                                 * NULL. */
-} GETOPT_LONG_OPTION_T;
-
-typedef GETOPT_LONG_OPTION_T option;
-
-/* externally-defined variables */
-extern char *optarg;
-extern int optind;
-extern int opterr;
-extern int optopt;
-
-/* function prototypes */
-int getopt(int argc, char** argv, char* optstring);
-int getopt_long(int argc,
-                char** argv,
-                const char* shortopts,
-                const GETOPT_LONG_OPTION_T* longopts,
-                int* longind);
-int getopt_long_only(int argc,
-                     char** argv,
-                     const char* shortopts,
-                     const GETOPT_LONG_OPTION_T* longopts,
-                     int* longind);
-
-}  // namespace crashpad
-
-#endif /* GETOPT_H */
-
-/* END OF FILE getopt.h */
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops.h
deleted file mode 100644
index 2a08de32e4..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// For atomic operations on reference counts, see atomic_refcount.h.
-// For atomic operations on sequence numbers, see atomic_sequence_num.h.
-
-// The routines exported by this module are subtle.  If you use them, even if
-// you get the code right, it will depend on careful reasoning about atomicity
-// and memory ordering; it will be less readable, and harder to maintain.  If
-// you plan to use these routines, you should have a good reason, such as solid
-// evidence that performance would otherwise suffer, or there being no
-// alternative.  You should assume only properties explicitly guaranteed by the
-// specifications in this file.  You are almost certainly _not_ writing code
-// just for the x86; if you assume x86 semantics, x86 hardware bugs and
-// implementations on other archtectures will cause your code to break.  If you
-// do not know what you are doing, avoid these routines, and use a Mutex.
-//
-// It is incorrect to make direct assignments to/from an atomic variable.
-// You should use one of the Load or Store routines.  The NoBarrier
-// versions are provided when no barriers are needed:
-//   NoBarrier_Store()
-//   NoBarrier_Load()
-// Although there are currently no compiler enforcement, you are encouraged
-// to use these.
-//
-
-#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_H_
-#define MINI_CHROMIUM_BASE_ATOMICOPS_H_
-
-#include <stdint.h>
-
-// Small C++ header which defines implementation specific macros used to
-// identify the STL implementation.
-// - libc++: captures __config for _LIBCPP_VERSION
-// - libstdc++: captures bits/c++config.h for __GLIBCXX__
-#include <cstddef>
-
-#include "build/build_config.h"
-
-#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
-// windows.h #defines this (only on x64). This causes problems because the
-// public API also uses MemoryBarrier at the public name for this fence. So, on
-// X64, undef it, and call its documented
-// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx)
-// implementation directly.
-#undef MemoryBarrier
-#endif
-
-namespace base {
-namespace subtle {
-
-typedef int32_t Atomic32;
-#ifdef ARCH_CPU_64_BITS
-// We need to be able to go between Atomic64 and AtomicWord implicitly.  This
-// means Atomic64 and AtomicWord should be the same type on 64-bit.
-#if defined(__ILP32__) || defined(OS_NACL)
-// NaCl's intptr_t is not actually 64-bits on 64-bit!
-// http://code.google.com/p/nativeclient/issues/detail?id=1162
-typedef int64_t Atomic64;
-#else
-typedef intptr_t Atomic64;
-#endif
-#endif
-
-// Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
-// Atomic64 routines below, depending on your architecture.
-typedef intptr_t AtomicWord;
-
-// Atomically execute:
-//      result = *ptr;
-//      if (*ptr == old_value)
-//        *ptr = new_value;
-//      return result;
-//
-// I.e., replace "*ptr" with "new_value" if "*ptr" used to be "old_value".
-// Always return the old value of "*ptr"
-//
-// This routine implies no memory barriers.
-Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                  Atomic32 old_value,
-                                  Atomic32 new_value);
-
-// Atomically store new_value into *ptr, returning the previous value held in
-// *ptr.  This routine implies no memory barriers.
-Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, Atomic32 new_value);
-
-// Atomically increment *ptr by "increment".  Returns the new value of
-// *ptr with the increment applied.  This routine implies no memory barriers.
-Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
-
-Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                 Atomic32 increment);
-
-// These following lower-level operations are typically useful only to people
-// implementing higher-level synchronization operations like spinlocks,
-// mutexes, and condition-variables.  They combine CompareAndSwap(), a load, or
-// a store with appropriate memory-ordering instructions.  "Acquire" operations
-// ensure that no later memory access can be reordered ahead of the operation.
-// "Release" operations ensure that no previous memory access can be reordered
-// after the operation.  "Barrier" operations have both "Acquire" and "Release"
-// semantics.   A MemoryBarrier() has "Barrier" semantics, but does no memory
-// access.
-Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                Atomic32 old_value,
-                                Atomic32 new_value);
-Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                Atomic32 old_value,
-                                Atomic32 new_value);
-
-void MemoryBarrier();
-void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value);
-void Acquire_Store(volatile Atomic32* ptr, Atomic32 value);
-void Release_Store(volatile Atomic32* ptr, Atomic32 value);
-
-Atomic32 NoBarrier_Load(volatile const Atomic32* ptr);
-Atomic32 Acquire_Load(volatile const Atomic32* ptr);
-Atomic32 Release_Load(volatile const Atomic32* ptr);
-
-// 64-bit atomic operations (only available on 64-bit processors).
-#ifdef ARCH_CPU_64_BITS
-Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                  Atomic64 old_value,
-                                  Atomic64 new_value);
-Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, Atomic64 new_value);
-Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
-Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
-
-Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                Atomic64 old_value,
-                                Atomic64 new_value);
-Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                Atomic64 old_value,
-                                Atomic64 new_value);
-void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value);
-void Acquire_Store(volatile Atomic64* ptr, Atomic64 value);
-void Release_Store(volatile Atomic64* ptr, Atomic64 value);
-Atomic64 NoBarrier_Load(volatile const Atomic64* ptr);
-Atomic64 Acquire_Load(volatile const Atomic64* ptr);
-Atomic64 Release_Load(volatile const Atomic64* ptr);
-#endif  // ARCH_CPU_64_BITS
-
-}  // namespace subtle
-}  // namespace base
-
-// The following x86 CPU features are used in atomicops_internals_x86_gcc.h, but
-// this file is duplicated inside of Chrome: protobuf and tcmalloc rely on the
-// struct being present at link time. Some parts of Chrome can currently use the
-// portable interface whereas others still use GCC one. The include guards are
-// the same as in atomicops_internals_x86_gcc.cc.
-#if defined(__i386__) || defined(__x86_64__)
-// This struct is not part of the public API of this module; clients may not
-// use it.  (However, it's exported via BASE_EXPORT because clients implicitly
-// do use it at link time by inlining these functions.)
-// Features of this x86.  Values may not be correct before main() is run,
-// but are set conservatively.
-struct AtomicOps_x86CPUFeatureStruct {
-  bool has_amd_lock_mb_bug; // Processor has AMD memory-barrier bug; do lfence
-                            // after acquire compare-and-swap.
-  // The following fields are unused by Chrome's base implementation but are
-  // still used by copies of the same code in other parts of the code base. This
-  // causes an ODR violation, and the other code is likely reading invalid
-  // memory.
-  // TODO(jfb) Delete these fields once the rest of the Chrome code base doesn't
-  //           depend on them.
-  bool has_sse2;            // Processor has SSE2.
-  bool has_cmpxchg16b;      // Processor supports cmpxchg16b instruction.
-};
-extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures;
-#endif
-
-// Try to use a portable implementation based on C++11 atomics.
-//
-// Some toolchains support C++11 language features without supporting library
-// features (recent compiler, older STL). Whitelist libstdc++ and libc++ that we
-// know will have <atomic> when compiling C++11.
-#if ((__cplusplus >= 201103L) &&                            \
-     ((defined(__GLIBCXX__) && (__GLIBCXX__ > 20110216)) || \
-      (defined(_LIBCPP_VERSION) && (_LIBCPP_STD_VER >= 11))))
-#  include "base/atomicops_internals_portable.h"
-#else  // Otherwise use a platform specific implementation.
-#  if (defined(OS_WIN) && defined(COMPILER_MSVC) && \
-         defined(ARCH_CPU_X86_FAMILY))
-#    include "base/atomicops_internals_x86_msvc.h"
-#  elif defined(OS_MACOSX)
-#    include "base/atomicops_internals_mac.h"
-#  else
-#    error "Atomic operations are not supported on your platform"
-#  endif
-#endif   // Portable / non-portable includes.
-
-// On some platforms we need additional declarations to make
-// AtomicWord compatible with our other Atomic* types.
-#if defined(OS_MACOSX) || defined(OS_OPENBSD)
-#include "base/atomicops_internals_atomicword_compat.h"
-#endif
-
-#endif  // MINI_CHROMIUM_BASE_ATOMICOPS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h
deleted file mode 100644
index d5b8caaf61..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file is an internal atomic implementation, use base/atomicops.h instead.
-
-#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_
-#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_
-
-// AtomicWord is a synonym for intptr_t, and Atomic32 is a synonym for int32,
-// which in turn means int. On some LP32 platforms, intptr_t is an int, but
-// on others, it's a long. When AtomicWord and Atomic32 are based on different
-// fundamental types, their pointers are incompatible.
-//
-// This file defines function overloads to allow both AtomicWord and Atomic32
-// data to be used with this interface.
-//
-// On LP64 platforms, AtomicWord and Atomic64 are both always long,
-// so this problem doesn't occur.
-
-#if !defined(ARCH_CPU_64_BITS)
-
-namespace base {
-namespace subtle {
-
-inline AtomicWord NoBarrier_CompareAndSwap(volatile AtomicWord* ptr,
-                                           AtomicWord old_value,
-                                           AtomicWord new_value) {
-  return NoBarrier_CompareAndSwap(
-      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
-}
-
-inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr,
-                                           AtomicWord new_value) {
-  return NoBarrier_AtomicExchange(
-      reinterpret_cast<volatile Atomic32*>(ptr), new_value);
-}
-
-inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr,
-                                            AtomicWord increment) {
-  return NoBarrier_AtomicIncrement(
-      reinterpret_cast<volatile Atomic32*>(ptr), increment);
-}
-
-inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr,
-                                          AtomicWord increment) {
-  return Barrier_AtomicIncrement(
-      reinterpret_cast<volatile Atomic32*>(ptr), increment);
-}
-
-inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
-                                         AtomicWord old_value,
-                                         AtomicWord new_value) {
-  return base::subtle::Acquire_CompareAndSwap(
-      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
-}
-
-inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr,
-                                         AtomicWord old_value,
-                                         AtomicWord new_value) {
-  return base::subtle::Release_CompareAndSwap(
-      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile AtomicWord *ptr, AtomicWord value) {
-  NoBarrier_Store(
-      reinterpret_cast<volatile Atomic32*>(ptr), value);
-}
-
-inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return base::subtle::Acquire_Store(
-      reinterpret_cast<volatile Atomic32*>(ptr), value);
-}
-
-inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return base::subtle::Release_Store(
-      reinterpret_cast<volatile Atomic32*>(ptr), value);
-}
-
-inline AtomicWord NoBarrier_Load(volatile const AtomicWord *ptr) {
-  return NoBarrier_Load(
-      reinterpret_cast<volatile const Atomic32*>(ptr));
-}
-
-inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) {
-  return base::subtle::Acquire_Load(
-      reinterpret_cast<volatile const Atomic32*>(ptr));
-}
-
-inline AtomicWord Release_Load(volatile const AtomicWord* ptr) {
-  return base::subtle::Release_Load(
-      reinterpret_cast<volatile const Atomic32*>(ptr));
-}
-
-}   // namespace base::subtle
-}   // namespace base
-
-#endif  // !defined(ARCH_CPU_64_BITS)
-
-#endif  // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_mac.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_mac.h
deleted file mode 100644
index dff655fdb5..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_mac.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file is an internal atomic implementation, use base/atomicops.h instead.
-
-#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_MAC_H_
-#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_MAC_H_
-
-#include <libkern/OSAtomic.h>
-
-namespace base {
-namespace subtle {
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  Atomic32 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap32(old_value, new_value,
-                                 const_cast<Atomic32*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  Atomic32 old_value;
-  do {
-    old_value = *ptr;
-  } while (!OSAtomicCompareAndSwap32(old_value, new_value,
-                                     const_cast<Atomic32*>(ptr)));
-  return old_value;
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  return OSAtomicAdd32(increment, const_cast<Atomic32*>(ptr));
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  return OSAtomicAdd32Barrier(increment, const_cast<Atomic32*>(ptr));
-}
-
-inline void MemoryBarrier() {
-  OSMemoryBarrier();
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  Atomic32 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap32Barrier(old_value, new_value,
-                                        const_cast<Atomic32*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  return Acquire_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  MemoryBarrier();
-  *ptr = value;
-}
-
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
-  return *ptr;
-}
-
-inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  Atomic32 value = *ptr;
-  MemoryBarrier();
-  return value;
-}
-
-inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-#ifdef __LP64__
-
-// 64-bit implementation on 64-bit platform
-
-inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                         Atomic64 old_value,
-                                         Atomic64 new_value) {
-  Atomic64 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap64(old_value, new_value,
-                                 reinterpret_cast<volatile int64_t*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
-                                         Atomic64 new_value) {
-  Atomic64 old_value;
-  do {
-    old_value = *ptr;
-  } while (!OSAtomicCompareAndSwap64(old_value, new_value,
-                                     reinterpret_cast<volatile int64_t*>(ptr)));
-  return old_value;
-}
-
-inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
-                                          Atomic64 increment) {
-  return OSAtomicAdd64(increment, reinterpret_cast<volatile int64_t*>(ptr));
-}
-
-inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
-                                        Atomic64 increment) {
-  return OSAtomicAdd64Barrier(increment,
-                              reinterpret_cast<volatile int64_t*>(ptr));
-}
-
-inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  Atomic64 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap64Barrier(
-        old_value, new_value, reinterpret_cast<volatile int64_t*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  // The lib kern interface does not distinguish between
-  // Acquire and Release memory barriers; they are equivalent.
-  return Acquire_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
-  MemoryBarrier();
-  *ptr = value;
-}
-
-inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
-  return *ptr;
-}
-
-inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
-  Atomic64 value = *ptr;
-  MemoryBarrier();
-  return value;
-}
-
-inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-#endif  // defined(__LP64__)
-
-}   // namespace base::subtle
-}   // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_MAC_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h
deleted file mode 100644
index db610523c1..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file is an internal atomic implementation, use atomicops.h instead.
-//
-// This implementation uses C++11 atomics' member functions. The code base is
-// currently written assuming atomicity revolves around accesses instead of
-// C++11's memory locations. The burden is on the programmer to ensure that all
-// memory locations accessed atomically are never accessed non-atomically (tsan
-// should help with this).
-//
-// TODO(jfb) Modify the atomicops.h API and user code to declare atomic
-//           locations as truly atomic. See the static_assert below.
-//
-// Of note in this implementation:
-//  * All NoBarrier variants are implemented as relaxed.
-//  * All Barrier variants are implemented as sequentially-consistent.
-//  * Compare exchange's failure ordering is always the same as the success one
-//    (except for release, which fails as relaxed): using a weaker ordering is
-//    only valid under certain uses of compare exchange.
-//  * Acquire store doesn't exist in the C11 memory model, it is instead
-//    implemented as a relaxed store followed by a sequentially consistent
-//    fence.
-//  * Release load doesn't exist in the C11 memory model, it is instead
-//    implemented as sequentially consistent fence followed by a relaxed load.
-//  * Atomic increment is expected to return the post-incremented value, whereas
-//    C11 fetch add returns the previous value. The implementation therefore
-//    needs to increment twice (which the compiler should be able to detect and
-//    optimize).
-
-#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_PORTABLE_H_
-#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_PORTABLE_H_
-
-#include <atomic>
-
-namespace base {
-namespace subtle {
-
-// This implementation is transitional and maintains the original API for
-// atomicops.h. This requires casting memory locations to the atomic types, and
-// assumes that the API and the C++11 implementation are layout-compatible,
-// which isn't true for all implementations or hardware platforms. The static
-// assertion should detect this issue, were it to fire then this header
-// shouldn't be used.
-//
-// TODO(jfb) If this header manages to stay committed then the API should be
-//           modified, and all call sites updated.
-typedef volatile std::atomic<Atomic32>* AtomicLocation32;
-static_assert(sizeof(*(AtomicLocation32) nullptr) == sizeof(Atomic32),
-              "incompatible 32-bit atomic layout");
-
-inline void MemoryBarrier() {
-#if defined(__GLIBCXX__)
-  // Work around libstdc++ bug 51038 where atomic_thread_fence was declared but
-  // not defined, leading to the linker complaining about undefined references.
-  __atomic_thread_fence(std::memory_order_seq_cst);
-#else
-  std::atomic_thread_fence(std::memory_order_seq_cst);
-#endif
-}
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  ((AtomicLocation32)ptr)
-      ->compare_exchange_strong(old_value,
-                                new_value,
-                                std::memory_order_relaxed,
-                                std::memory_order_relaxed);
-  return old_value;
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  return ((AtomicLocation32)ptr)
-      ->exchange(new_value, std::memory_order_relaxed);
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  return increment +
-         ((AtomicLocation32)ptr)
-             ->fetch_add(increment, std::memory_order_relaxed);
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  return increment + ((AtomicLocation32)ptr)->fetch_add(increment);
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  ((AtomicLocation32)ptr)
-      ->compare_exchange_strong(old_value,
-                                new_value,
-                                std::memory_order_acquire,
-                                std::memory_order_acquire);
-  return old_value;
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  ((AtomicLocation32)ptr)
-      ->compare_exchange_strong(old_value,
-                                new_value,
-                                std::memory_order_release,
-                                std::memory_order_relaxed);
-  return old_value;
-}
-
-inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
-  ((AtomicLocation32)ptr)->store(value, std::memory_order_relaxed);
-}
-
-inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
-  ((AtomicLocation32)ptr)->store(value, std::memory_order_relaxed);
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  ((AtomicLocation32)ptr)->store(value, std::memory_order_release);
-}
-
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
-  return ((AtomicLocation32)ptr)->load(std::memory_order_relaxed);
-}
-
-inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  return ((AtomicLocation32)ptr)->load(std::memory_order_acquire);
-}
-
-inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
-  MemoryBarrier();
-  return ((AtomicLocation32)ptr)->load(std::memory_order_relaxed);
-}
-
-#if defined(ARCH_CPU_64_BITS)
-
-typedef volatile std::atomic<Atomic64>* AtomicLocation64;
-static_assert(sizeof(*(AtomicLocation64) nullptr) == sizeof(Atomic64),
-              "incompatible 64-bit atomic layout");
-
-inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                         Atomic64 old_value,
-                                         Atomic64 new_value) {
-  ((AtomicLocation64)ptr)
-      ->compare_exchange_strong(old_value,
-                                new_value,
-                                std::memory_order_relaxed,
-                                std::memory_order_relaxed);
-  return old_value;
-}
-
-inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
-                                         Atomic64 new_value) {
-  return ((AtomicLocation64)ptr)
-      ->exchange(new_value, std::memory_order_relaxed);
-}
-
-inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
-                                          Atomic64 increment) {
-  return increment +
-         ((AtomicLocation64)ptr)
-             ->fetch_add(increment, std::memory_order_relaxed);
-}
-
-inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
-                                        Atomic64 increment) {
-  return increment + ((AtomicLocation64)ptr)->fetch_add(increment);
-}
-
-inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  ((AtomicLocation64)ptr)
-      ->compare_exchange_strong(old_value,
-                                new_value,
-                                std::memory_order_acquire,
-                                std::memory_order_acquire);
-  return old_value;
-}
-
-inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  ((AtomicLocation64)ptr)
-      ->compare_exchange_strong(old_value,
-                                new_value,
-                                std::memory_order_release,
-                                std::memory_order_relaxed);
-  return old_value;
-}
-
-inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
-  ((AtomicLocation64)ptr)->store(value, std::memory_order_relaxed);
-}
-
-inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
-  ((AtomicLocation64)ptr)->store(value, std::memory_order_relaxed);
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
-  ((AtomicLocation64)ptr)->store(value, std::memory_order_release);
-}
-
-inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
-  return ((AtomicLocation64)ptr)->load(std::memory_order_relaxed);
-}
-
-inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
-  return ((AtomicLocation64)ptr)->load(std::memory_order_acquire);
-}
-
-inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
-  MemoryBarrier();
-  return ((AtomicLocation64)ptr)->load(std::memory_order_relaxed);
-}
-
-#endif  // defined(ARCH_CPU_64_BITS)
-}
-}  // namespace base::subtle
-
-#endif  // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_PORTABLE_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_x86_msvc.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_x86_msvc.h
deleted file mode 100644
index 353158d07b..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_x86_msvc.h
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file is an internal atomic implementation, use base/atomicops.h instead.
-
-#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_
-#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_
-
-#include <windows.h>
-
-#include <intrin.h>
-
-#if defined(ARCH_CPU_64_BITS)
-// windows.h #defines this (only on x64). This causes problems because the
-// public API also uses MemoryBarrier at the public name for this fence. So, on
-// X64, undef it, and call its documented
-// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx)
-// implementation directly.
-#undef MemoryBarrier
-#endif
-
-namespace base {
-namespace subtle {
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  LONG result = _InterlockedCompareExchange(
-      reinterpret_cast<volatile LONG*>(ptr),
-      static_cast<LONG>(new_value),
-      static_cast<LONG>(old_value));
-  return static_cast<Atomic32>(result);
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  LONG result = _InterlockedExchange(
-      reinterpret_cast<volatile LONG*>(ptr),
-      static_cast<LONG>(new_value));
-  return static_cast<Atomic32>(result);
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  return _InterlockedExchangeAdd(
-      reinterpret_cast<volatile LONG*>(ptr),
-      static_cast<LONG>(increment)) + increment;
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  return Barrier_AtomicIncrement(ptr, increment);
-}
-
-inline void MemoryBarrier() {
-#if defined(ARCH_CPU_64_BITS)
-  // See #undef and note at the top of this file.
-  __faststorefence();
-#else
-  // We use MemoryBarrier from WinNT.h
-  ::MemoryBarrier();
-#endif
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
-  NoBarrier_AtomicExchange(ptr, value);
-              // acts as a barrier in this implementation
-}
-
-inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value; // works w/o barrier for current Intel chips as of June 2005
-  // See comments in Atomic64 version of Release_Store() below.
-}
-
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
-  return *ptr;
-}
-
-inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  Atomic32 value = *ptr;
-  return value;
-}
-
-inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-#if defined(_WIN64)
-
-// 64-bit low-level operations on 64-bit platform.
-
-static_assert(sizeof(Atomic64) == sizeof(PVOID), "atomic word is atomic");
-
-inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                         Atomic64 old_value,
-                                         Atomic64 new_value) {
-  PVOID result = InterlockedCompareExchangePointer(
-    reinterpret_cast<volatile PVOID*>(ptr),
-    reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
-  return reinterpret_cast<Atomic64>(result);
-}
-
-inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
-                                         Atomic64 new_value) {
-  PVOID result = InterlockedExchangePointer(
-    reinterpret_cast<volatile PVOID*>(ptr),
-    reinterpret_cast<PVOID>(new_value));
-  return reinterpret_cast<Atomic64>(result);
-}
-
-inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
-                                        Atomic64 increment) {
-  return InterlockedExchangeAdd64(
-      reinterpret_cast<volatile LONGLONG*>(ptr),
-      static_cast<LONGLONG>(increment)) + increment;
-}
-
-inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
-                                          Atomic64 increment) {
-  return Barrier_AtomicIncrement(ptr, increment);
-}
-
-inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
-  NoBarrier_AtomicExchange(ptr, value);
-              // acts as a barrier in this implementation
-}
-
-inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value; // works w/o barrier for current Intel chips as of June 2005
-
-  // When new chips come out, check:
-  //  IA-32 Intel Architecture Software Developer's Manual, Volume 3:
-  //  System Programming Guide, Chatper 7: Multiple-processor management,
-  //  Section 7.2, Memory Ordering.
-  // Last seen at:
-  //   http://developer.intel.com/design/pentium4/manuals/index_new.htm
-}
-
-inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
-  return *ptr;
-}
-
-inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
-  Atomic64 value = *ptr;
-  return value;
-}
-
-inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-
-#endif  // defined(_WIN64)
-
-}  // namespace base::subtle
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/auto_reset.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/auto_reset.h
deleted file mode 100644
index 03b4015d55..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/auto_reset.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_AUTO_RESET_H_
-#define MINI_CHROMIUM_BASE_AUTO_RESET_H_
-
-#include "base/macros.h"
-
-namespace base {
-
-template<typename T>
-class AutoReset {
- public:
-  AutoReset(T* scoped_variable, T new_value)
-      : scoped_variable_(scoped_variable),
-        original_value_(*scoped_variable) {
-    *scoped_variable_ = new_value;
-  }
-
-  ~AutoReset() { *scoped_variable_ = original_value_; }
-
- private:
-  T* scoped_variable_;
-  T original_value_;
-
-  DISALLOW_COPY_AND_ASSIGN(AutoReset);
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_AUTO_RESET_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/bit_cast.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/bit_cast.h
deleted file mode 100644
index a93ba63ef8..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/bit_cast.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_BIT_CAST_H_
-#define MINI_CHROMIUM_BASE_BIT_CAST_H_
-
-#include <string.h>
-#include <type_traits>
-
-#include "base/compiler_specific.h"
-#include "build/build_config.h"
-
-// bit_cast<Dest,Source> is a template function that implements the equivalent
-// of "*reinterpret_cast<Dest*>(&source)".  We need this in very low-level
-// functions like the protobuf library and fast math support.
-//
-//   float f = 3.14159265358979;
-//   int i = bit_cast<int32_t>(f);
-//   // i = 0x40490fdb
-//
-// The classical address-casting method is:
-//
-//   // WRONG
-//   float f = 3.14159265358979;            // WRONG
-//   int i = * reinterpret_cast<int*>(&f);  // WRONG
-//
-// The address-casting method actually produces undefined behavior according to
-// the ISO C++98 specification, section 3.10 ("basic.lval"), paragraph 15.
-// (This did not substantially change in C++11.)  Roughly, this section says: if
-// an object in memory has one type, and a program accesses it with a different
-// type, then the result is undefined behavior for most values of "different
-// type".
-//
-// This is true for any cast syntax, either *(int*)&f or
-// *reinterpret_cast<int*>(&f).  And it is particularly true for conversions
-// between integral lvalues and floating-point lvalues.
-//
-// The purpose of this paragraph is to allow optimizing compilers to assume that
-// expressions with different types refer to different memory.  Compilers are
-// known to take advantage of this.  So a non-conforming program quietly
-// produces wildly incorrect output.
-//
-// The problem is not the use of reinterpret_cast.  The problem is type punning:
-// holding an object in memory of one type and reading its bits back using a
-// different type.
-//
-// The C++ standard is more subtle and complex than this, but that is the basic
-// idea.
-//
-// Anyways ...
-//
-// bit_cast<> calls memcpy() which is blessed by the standard, especially by the
-// example in section 3.9 .  Also, of course, bit_cast<> wraps up the nasty
-// logic in one place.
-//
-// Fortunately memcpy() is very fast.  In optimized mode, compilers replace
-// calls to memcpy() with inline object code when the size argument is a
-// compile-time constant.  On a 32-bit system, memcpy(d,s,4) compiles to one
-// load and one store, and memcpy(d,s,8) compiles to two loads and two stores.
-
-template <class Dest, class Source>
-inline Dest bit_cast(const Source& source) {
-  static_assert(sizeof(Dest) == sizeof(Source),
-                "bit_cast requires source and destination to be the same size");
-
-#if (__GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) || \
-     defined(_LIBCPP_VERSION))
-  // GCC 5.1 contains the first libstdc++ with is_trivially_copyable.
-  // Assume libc++ Just Works: is_trivially_copyable added on May 13th 2011.
-  static_assert(std::is_trivially_copyable<Dest>::value,
-                "non-trivially-copyable bit_cast is undefined");
-  static_assert(std::is_trivially_copyable<Source>::value,
-                "non-trivially-copyable bit_cast is undefined");
-#elif HAS_FEATURE(is_trivially_copyable)
-  // The compiler supports an equivalent intrinsic.
-  static_assert(__is_trivially_copyable(Dest),
-                "non-trivially-copyable bit_cast is undefined");
-  static_assert(__is_trivially_copyable(Source),
-                "non-trivially-copyable bit_cast is undefined");
-#elif COMPILER_GCC
-  // Fallback to compiler intrinsic on GCC and clang (which pretends to be
-  // GCC). This isn't quite the same as is_trivially_copyable but it'll do for
-  // our purpose.
-  static_assert(__has_trivial_copy(Dest),
-                "non-trivially-copyable bit_cast is undefined");
-  static_assert(__has_trivial_copy(Source),
-                "non-trivially-copyable bit_cast is undefined");
-#else
-  // Do nothing, let the bots handle it.
-#endif
-
-  Dest dest;
-  memcpy(&dest, &source, sizeof(dest));
-  return dest;
-}
-
-#endif  // MINI_CHROMIUM_BASE_BIT_CAST_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/compiler_specific.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/compiler_specific.h
deleted file mode 100644
index 73c02ea5fd..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/compiler_specific.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_
-#define MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_
-
-#include "build/build_config.h"
-
-#if defined(COMPILER_MSVC)
-
-// MSVC_SUPPRESS_WARNING disables warning |n| for the remainder of the line and
-// for the next line of the source file.
-#define MSVC_SUPPRESS_WARNING(n) __pragma(warning(suppress:n))
-
-// MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled.
-// The warning remains disabled until popped by MSVC_POP_WARNING.
-#define MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \
-                                     __pragma(warning(disable:n))
-
-// Pop effects of innermost MSVC_PUSH_* macro.
-#define MSVC_POP_WARNING() __pragma(warning(pop))
-
-#else  // Not MSVC
-
-#define MSVC_SUPPRESS_WARNING(n)
-#define MSVC_PUSH_DISABLE_WARNING(n)
-#define MSVC_POP_WARNING()
-
-#endif  // COMPILER_MSVC
-
-// Annotate a variable indicating it's ok if the variable is not used.
-// (Typically used to silence a compiler warning when the assignment
-// is important for some other reason.)
-// Use like:
-//   int x = ...;
-//   ALLOW_UNUSED_LOCAL(x);
-#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
-
-// Annotate a typedef or function indicating it's ok if it's not used.
-// Use like:
-//   typedef Foo Bar ALLOW_UNUSED_TYPE;
-#if defined(COMPILER_GCC)
-#define ALLOW_UNUSED_TYPE __attribute__((unused))
-#else
-#define ALLOW_UNUSED_TYPE
-#endif
-
-// Specify memory alignment for structs, classes, etc.
-// Use like:
-//   class ALIGNAS(16) MyClass { ... }
-//   ALIGNAS(16) int array[4];
-#if defined(COMPILER_MSVC)
-#define ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-#elif defined(COMPILER_GCC)
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-#endif
-
-// Return the byte alignment of the given type (available at compile time).  Use
-// sizeof(type) prior to checking __alignof to workaround Visual C++ bug:
-// http://goo.gl/isH0C
-// Use like:
-//   ALIGNOF(int32_t)  // this would be 4
-#if defined(COMPILER_MSVC)
-#define ALIGNOF(type) (sizeof(type) - sizeof(type) + __alignof(type))
-#elif defined(COMPILER_GCC)
-#define ALIGNOF(type) __alignof__(type)
-#endif
-
-#if defined(COMPILER_MSVC)
-#define WARN_UNUSED_RESULT
-#else
-#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#endif
-
-#if defined(COMPILER_MSVC)
-#define PRINTF_FORMAT(format_param, dots_param)
-#else
-#define PRINTF_FORMAT(format_param, dots_param) \
-    __attribute__((format(printf, format_param, dots_param)))
-#endif
-
-// Compiler feature-detection.
-// clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension
-#if defined(__has_feature)
-#define HAS_FEATURE(FEATURE) __has_feature(FEATURE)
-#else
-#define HAS_FEATURE(FEATURE) 0
-#endif
-
-#endif  // MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_path.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_path.h
deleted file mode 100644
index 0ac91bf873..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_path.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// FilePath is a container for pathnames stored in a platform's native string
-// type, providing containers for manipulation in according with the
-// platform's conventions for pathnames.  It supports the following path
-// types:
-//
-//                   POSIX            Windows
-//                   ---------------  ----------------------------------
-// Fundamental type  char[]           wchar_t[]
-// Encoding          unspecified*     UTF-16
-// Separator         /                \, tolerant of /
-// Drive letters     no               case-insensitive A-Z followed by :
-// Alternate root    // (surprise!)   \\, for UNC paths
-//
-// * The encoding need not be specified on POSIX systems, although some
-//   POSIX-compliant systems do specify an encoding.  Mac OS X uses UTF-8.
-//   Chrome OS also uses UTF-8.
-//   Linux does not specify an encoding, but in practice, the locale's
-//   character set may be used.
-//
-// For more arcane bits of path trivia, see below.
-//
-// FilePath objects are intended to be used anywhere paths are.  An
-// application may pass FilePath objects around internally, masking the
-// underlying differences between systems, only differing in implementation
-// where interfacing directly with the system.  For example, a single
-// OpenFile(const FilePath &) function may be made available, allowing all
-// callers to operate without regard to the underlying implementation.  On
-// POSIX-like platforms, OpenFile might wrap fopen, and on Windows, it might
-// wrap _wfopen_s, perhaps both by calling file_path.value().c_str().  This
-// allows each platform to pass pathnames around without requiring conversions
-// between encodings, which has an impact on performance, but more imporantly,
-// has an impact on correctness on platforms that do not have well-defined
-// encodings for pathnames.
-//
-// Several methods are available to perform common operations on a FilePath
-// object, such as determining the parent directory (DirName), isolating the
-// final path component (BaseName), and appending a relative pathname string
-// to an existing FilePath object (Append).  These methods are highly
-// recommended over attempting to split and concatenate strings directly.
-// These methods are based purely on string manipulation and knowledge of
-// platform-specific pathname conventions, and do not consult the filesystem
-// at all, making them safe to use without fear of blocking on I/O operations.
-// These methods do not function as mutators but instead return distinct
-// instances of FilePath objects, and are therefore safe to use on const
-// objects.  The objects themselves are safe to share between threads.
-//
-// To aid in initialization of FilePath objects from string literals, a
-// FILE_PATH_LITERAL macro is provided, which accounts for the difference
-// between char[]-based pathnames on POSIX systems and wchar_t[]-based
-// pathnames on Windows.
-//
-// Paths can't contain NULs as a precaution agaist premature truncation.
-//
-// Because a FilePath object should not be instantiated at the global scope,
-// instead, use a FilePath::CharType[] and initialize it with
-// FILE_PATH_LITERAL.  At runtime, a FilePath object can be created from the
-// character array.  Example:
-//
-// | const FilePath::CharType kLogFileName[] = FILE_PATH_LITERAL("log.txt");
-// |
-// | void Function() {
-// |   FilePath log_file_path(kLogFileName);
-// |   [...]
-// | }
-//
-// WARNING: FilePaths should ALWAYS be displayed with LTR directionality, even
-// when the UI language is RTL. This means you always need to pass filepaths
-// through base::i18n::WrapPathWithLTRFormatting() before displaying it in the
-// RTL UI.
-//
-// This is a very common source of bugs, please try to keep this in mind.
-//
-// ARCANE BITS OF PATH TRIVIA
-//
-//  - A double leading slash is actually part of the POSIX standard.  Systems
-//    are allowed to treat // as an alternate root, as Windows does for UNC
-//    (network share) paths.  Most POSIX systems don't do anything special
-//    with two leading slashes, but FilePath handles this case properly
-//    in case it ever comes across such a system.  FilePath needs this support
-//    for Windows UNC paths, anyway.
-//    References:
-//    The Open Group Base Specifications Issue 7, sections 3.266 ("Pathname")
-//    and 4.12 ("Pathname Resolution"), available at:
-//    http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_266
-//    http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_12
-//
-//  - Windows treats c:\\ the same way it treats \\.  This was intended to
-//    allow older applications that require drive letters to support UNC paths
-//    like \\server\share\path, by permitting c:\\server\share\path as an
-//    equivalent.  Since the OS treats these paths specially, FilePath needs
-//    to do the same.  Since Windows can use either / or \ as the separator,
-//    FilePath treats c://, c:\\, //, and \\ all equivalently.
-//    Reference:
-//    The Old New Thing, "Why is a drive letter permitted in front of UNC
-//    paths (sometimes)?", available at:
-//    http://blogs.msdn.com/oldnewthing/archive/2005/11/22/495740.aspx
-
-#ifndef MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_
-#define MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_
-
-#include <stddef.h>
-
-#include <iosfwd>
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "build/build_config.h"
-
-// Windows-style drive letter support and pathname separator characters can be
-// enabled and disabled independently, to aid testing.  These #defines are
-// here so that the same setting can be used in both the implementation and
-// in the unit test.
-#if defined(OS_WIN)
-#define FILE_PATH_USES_DRIVE_LETTERS
-#define FILE_PATH_USES_WIN_SEPARATORS
-#endif  // OS_WIN
-
-namespace base {
-
-// An abstraction to isolate users from the differences between native
-// pathnames on different platforms.
-class FilePath {
- public:
-#if defined(OS_POSIX)
-  // On most platforms, native pathnames are char arrays, and the encoding
-  // may or may not be specified.  On Mac OS X, native pathnames are encoded
-  // in UTF-8.
-  typedef std::string StringType;
-#elif defined(OS_WIN)
-  // On Windows, for Unicode-aware applications, native pathnames are wchar_t
-  // arrays encoded in UTF-16.
-  typedef std::wstring StringType;
-#endif  // OS_WIN
-
-  typedef StringType::value_type CharType;
-
-  // Null-terminated array of separators used to separate components in
-  // hierarchical paths.  Each character in this array is a valid separator,
-  // but kSeparators[0] is treated as the canonical separator and will be used
-  // when composing pathnames.
-  static const CharType kSeparators[];
-
-  // A special path component meaning "this directory."
-  static const CharType kCurrentDirectory[];
-
-  // A special path component meaning "the parent directory."
-  static const CharType kParentDirectory[];
-
-  // The character used to identify a file extension.
-  static const CharType kExtensionSeparator;
-
-  FilePath();
-  FilePath(const FilePath& that);
-  explicit FilePath(const StringType& path);
-  ~FilePath();
-  FilePath& operator=(const FilePath& that);
-
-  bool operator==(const FilePath& that) const;
-
-  bool operator!=(const FilePath& that) const;
-
-  // Required for some STL containers and operations
-  bool operator<(const FilePath& that) const {
-    return path_ < that.path_;
-  }
-
-  const StringType& value() const { return path_; }
-
-  bool empty() const { return path_.empty(); }
-
-  void clear() { path_.clear(); }
-
-  // Returns true if |character| is in kSeparators.
-  static bool IsSeparator(CharType character);
-
-  // Returns a FilePath corresponding to the directory containing the path
-  // named by this object, stripping away the file component.  If this object
-  // only contains one component, returns a FilePath identifying
-  // kCurrentDirectory.  If this object already refers to the root directory,
-  // returns a FilePath identifying the root directory.
-  FilePath DirName() const WARN_UNUSED_RESULT;
-
-  // Returns a FilePath corresponding to the last path component of this
-  // object, either a file or a directory.  If this object already refers to
-  // the root directory, returns a FilePath identifying the root directory;
-  // this is the only situation in which BaseName will return an absolute path.
-  FilePath BaseName() const WARN_UNUSED_RESULT;
-
-  // Returns the path's file extension. This does not have a special case for
-  // common double extensions, so FinalExtension() of "foo.tar.gz" is simply
-  // ".gz". If there is no extension, "" will be returned.
-  StringType FinalExtension() const WARN_UNUSED_RESULT;
-
-  // Returns a FilePath with FinalExtension() removed.
-  FilePath RemoveFinalExtension() const WARN_UNUSED_RESULT;
-
-  // Returns a FilePath by appending a separator and the supplied path
-  // component to this object's path.  Append takes care to avoid adding
-  // excessive separators if this object's path already ends with a separator.
-  // If this object's path is kCurrentDirectory, a new FilePath corresponding
-  // only to |component| is returned.  |component| must be a relative path;
-  // it is an error to pass an absolute path.
-  FilePath Append(const StringType& component) const WARN_UNUSED_RESULT;
-  FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT;
-
-  // Returns true if this FilePath contains an absolute path.  On Windows, an
-  // absolute path begins with either a drive letter specification followed by
-  // a separator character, or with two separator characters.  On POSIX
-  // platforms, an absolute path begins with a separator character.
-  bool IsAbsolute() const;
-
- private:
-  // Remove trailing separators from this object.  If the path is absolute, it
-  // will never be stripped any more than to refer to the absolute root
-  // directory, so "////" will become "/", not "".  A leading pair of
-  // separators is never stripped, to support alternate roots.  This is used to
-  // support UNC paths on Windows.
-  void StripTrailingSeparatorsInternal();
-
-  StringType path_;
-};
-
-}  // namespace base
-
-// This is required by googletest to print a readable output on test failures.
-extern void PrintTo(const base::FilePath& path, std::ostream* out);
-
-// Macros for string literal initialization of FilePath::CharType[], and for
-// using a FilePath::CharType[] in a printf-style format string.
-#if defined(OS_POSIX)
-#define FILE_PATH_LITERAL(x) x
-#define PRFilePath "s"
-#define PRFilePathLiteral "%s"
-#elif defined(OS_WIN)
-#define FILE_PATH_LITERAL(x) L ## x
-#define PRFilePath "ls"
-#define PRFilePathLiteral L"%ls"
-#endif  // OS_WIN
-
-#endif  // MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_util.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_util.h
deleted file mode 100644
index 312525176b..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_util.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_
-#define MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_
-
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-
-#include <sys/types.h>
-
-namespace base {
-
-bool ReadFromFD(int fd, char* buffer, size_t bytes);
-
-}  // namespace base
-
-#endif  // OS_POSIX
-
-#endif  // MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h
deleted file mode 100644
index 462f561386..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_FILES_SCOPED_FILE_H_
-#define MINI_CHROMIUM_BASE_FILES_SCOPED_FILE_H_
-
-#include <stdio.h>
-
-#include <memory>
-
-#include "base/scoped_generic.h"
-#include "build/build_config.h"
-
-namespace base {
-
-namespace internal {
-
-#if defined(OS_POSIX)
-struct ScopedFDCloseTraits {
-  static int InvalidValue() {
-    return -1;
-  }
-  static void Free(int fd);
-};
-#endif  // OS_POSIX
-
-struct ScopedFILECloser {
-  void operator()(FILE* file) const;
-};
-
-}  // namespace internal
-
-#if defined(OS_POSIX)
-typedef ScopedGeneric<int, internal::ScopedFDCloseTraits> ScopedFD;
-#endif  // OS_POSIX
-typedef std::unique_ptr<FILE, internal::ScopedFILECloser> ScopedFILE;
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_FILES_SCOPED_FILE_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/format_macros.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/format_macros.h
deleted file mode 100644
index 4d90c593a6..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/format_macros.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_FORMAT_MACROS_H_
-#define BASE_FORMAT_MACROS_H_
-
-// This file defines the format macros for some integer types.
-
-// To print a 64-bit value in a portable way:
-//   int64_t value;
-//   printf("xyz:%" PRId64, value);
-// The "d" in the macro corresponds to %d; you can also use PRIu64 etc.
-//
-// For wide strings, prepend "Wide" to the macro:
-//   int64_t value;
-//   StringPrintf(L"xyz: %" WidePRId64, value);
-//
-// To print a size_t value in a portable way:
-//   size_t size;
-//   printf("xyz: %" PRIuS, size);
-// The "u" in the macro corresponds to %u, and S is for "size".
-
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-
-#if (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64)
-#error "inttypes.h has already been included before this header file, but "
-#error "without __STDC_FORMAT_MACROS defined."
-#endif
-
-#if !defined(__STDC_FORMAT_MACROS)
-#define __STDC_FORMAT_MACROS
-#endif
-
-#include <inttypes.h>
-
-// GCC will concatenate wide and narrow strings correctly, so nothing needs to
-// be done here.
-#define WidePRId64 PRId64
-#define WidePRIu64 PRIu64
-#define WidePRIx64 PRIx64
-
-#if !defined(PRIuS)
-#define PRIuS "zu"
-#endif
-
-// The size of NSInteger and NSUInteger varies between 32-bit and 64-bit
-// architectures and Apple does not provides standard format macros and
-// recommends casting. This has many drawbacks, so instead define macros
-// for formatting those types.
-#if defined(OS_MACOSX)
-#if defined(ARCH_CPU_64_BITS)
-#if !defined(PRIdNS)
-#define PRIdNS "ld"
-#endif
-#if !defined(PRIuNS)
-#define PRIuNS "lu"
-#endif
-#if !defined(PRIxNS)
-#define PRIxNS "lx"
-#endif
-#else  // defined(ARCH_CPU_64_BITS)
-#if !defined(PRIdNS)
-#define PRIdNS "d"
-#endif
-#if !defined(PRIuNS)
-#define PRIuNS "u"
-#endif
-#if !defined(PRIxNS)
-#define PRIxNS "x"
-#endif
-#endif
-#endif  // defined(OS_MACOSX)
-
-#else  // OS_WIN
-
-#if !defined(PRId64)
-#define PRId64 "I64d"
-#endif
-
-#if !defined(PRIu64)
-#define PRIu64 "I64u"
-#endif
-
-#if !defined(PRIx64)
-#define PRIx64 "I64x"
-#endif
-
-#define WidePRId64 L"I64d"
-#define WidePRIu64 L"I64u"
-#define WidePRIx64 L"I64x"
-
-#if !defined(PRIuS)
-#define PRIuS "Iu"
-#endif
-
-#endif
-
-#endif  // BASE_FORMAT_MACROS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/logging.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/logging.h
deleted file mode 100644
index 37bf23be86..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/logging.h
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_LOGGING_H_
-#define MINI_CHROMIUM_BASE_LOGGING_H_
-
-#include <assert.h>
-#include <errno.h>
-
-#include <limits>
-#include <sstream>
-#include <string>
-
-#include "base/macros.h"
-#include "build/build_config.h"
-
-namespace logging {
-
-typedef int LogSeverity;
-const LogSeverity LOG_VERBOSE = -1;
-const LogSeverity LOG_INFO = 0;
-const LogSeverity LOG_WARNING = 1;
-const LogSeverity LOG_ERROR = 2;
-const LogSeverity LOG_ERROR_REPORT = 3;
-const LogSeverity LOG_FATAL = 4;
-const LogSeverity LOG_NUM_SEVERITIES = 5;
-
-#if defined(NDEBUG)
-const LogSeverity LOG_DFATAL = LOG_ERROR;
-#else
-const LogSeverity LOG_DFATAL = LOG_FATAL;
-#endif
-
-typedef bool (*LogMessageHandlerFunction)(LogSeverity severity,
-                                          const char* file_poath,
-                                          int line,
-                                          size_t message_start,
-                                          const std::string& string);
-
-void SetLogMessageHandler(LogMessageHandlerFunction log_message_handler);
-LogMessageHandlerFunction GetLogMessageHandler();
-
-static inline int GetMinLogLevel() {
-  return LOG_INFO;
-}
-
-static inline int GetVlogLevel(const char*) {
-  return std::numeric_limits<int>::max();
-}
-
-#if defined(OS_WIN)
-// This is just ::GetLastError, but out-of-line to avoid including windows.h in
-// such a widely used place.
-unsigned long GetLastSystemErrorCode();
-std::string SystemErrorCodeToString(unsigned long error_code);
-#elif defined(OS_POSIX)
-static inline int GetLastSystemErrorCode() {
-  return errno;
-}
-#endif
-
-template<typename t1, typename t2>
-std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
-  std::ostringstream ss;
-  ss << names << " (" << v1 << " vs. " << v2 << ")";
-  std::string* msg = new std::string(ss.str());
-  return msg;
-}
-
-#define DEFINE_CHECK_OP_IMPL(name, op) \
-    template <typename t1, typename t2> \
-    inline std::string* Check ## name ## Impl(const t1& v1, const t2& v2, \
-                                              const char* names) { \
-      if (v1 op v2) { \
-        return NULL; \
-      } else { \
-        return MakeCheckOpString(v1, v2, names); \
-      } \
-    } \
-    inline std::string* Check ## name ## Impl(int v1, int v2, \
-                                              const char* names) { \
-      if (v1 op v2) { \
-        return NULL; \
-      } else { \
-        return MakeCheckOpString(v1, v2, names); \
-      } \
-    }
-
-DEFINE_CHECK_OP_IMPL(EQ, ==)
-DEFINE_CHECK_OP_IMPL(NE, !=)
-DEFINE_CHECK_OP_IMPL(LE, <=)
-DEFINE_CHECK_OP_IMPL(LT, <)
-DEFINE_CHECK_OP_IMPL(GE, >=)
-DEFINE_CHECK_OP_IMPL(GT, >)
-
-#undef DEFINE_CHECK_OP_IMPL
-
-class LogMessage {
- public:
-  LogMessage(const char* function,
-             const char* file_path,
-             int line,
-             LogSeverity severity);
-  LogMessage(const char* function,
-             const char* file_path,
-             int line,
-             std::string* result);
-  ~LogMessage();
-
-  std::ostream& stream() { return stream_; }
-
- private:
-  void Init(const char* function);
-
-  std::ostringstream stream_;
-  const char* file_path_;
-  size_t message_start_;
-  const int line_;
-  LogSeverity severity_;
-
-  DISALLOW_COPY_AND_ASSIGN(LogMessage);
-};
-
-class LogMessageVoidify {
- public:
-  LogMessageVoidify() {}
-
-  void operator&(const std::ostream&) const {}
-};
-
-#if defined(OS_WIN)
-class Win32ErrorLogMessage : public LogMessage {
- public:
-  Win32ErrorLogMessage(const char* function,
-                       const char* file_path,
-                       int line,
-                       LogSeverity severity,
-                       unsigned long err);
-  ~Win32ErrorLogMessage();
-
- private:
-  unsigned long err_;
-
-  DISALLOW_COPY_AND_ASSIGN(Win32ErrorLogMessage);
-};
-#elif defined(OS_POSIX)
-class ErrnoLogMessage : public LogMessage {
- public:
-  ErrnoLogMessage(const char* function,
-                  const char* file_path,
-                  int line,
-                  LogSeverity severity,
-                  int err);
-  ~ErrnoLogMessage();
-
- private:
-  int err_;
-
-  DISALLOW_COPY_AND_ASSIGN(ErrnoLogMessage);
-};
-#endif
-
-}  // namespace logging
-
-#if defined(COMPILER_MSVC)
-#define FUNCTION_SIGNATURE __FUNCSIG__
-#else
-#define FUNCTION_SIGNATURE __PRETTY_FUNCTION__
-#endif
-
-#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...) \
-    logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                       logging::LOG_INFO, ## __VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...) \
-    logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                       logging::LOG_WARNING, ## __VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...) \
-    logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                       logging::LOG_ERROR, ## __VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_ERROR_REPORT(ClassName, ...) \
-    logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                       logging::LOG_ERROR_REPORT, ## __VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...) \
-    logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                       logging::LOG_FATAL, ## __VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...) \
-    logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                       logging::LOG_DFATAL, ## __VA_ARGS__)
-
-#define COMPACT_GOOGLE_LOG_INFO \
-    COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
-#define COMPACT_GOOGLE_LOG_WARNING \
-    COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage)
-#define COMPACT_GOOGLE_LOG_ERROR \
-    COMPACT_GOOGLE_LOG_EX_ERROR(LogMessage)
-#define COMPACT_GOOGLE_LOG_ERROR_REPORT \
-    COMPACT_GOOGLE_LOG_EX_ERROR_REPORT(LogMessage)
-#define COMPACT_GOOGLE_LOG_FATAL \
-    COMPACT_GOOGLE_LOG_EX_FATAL(LogMessage)
-#define COMPACT_GOOGLE_LOG_DFATAL \
-    COMPACT_GOOGLE_LOG_EX_DFATAL(LogMessage)
-
-#if defined(OS_WIN)
-
-// wingdi.h defines ERROR 0. We don't want to include windows.h here, and we
-// want to allow "LOG(ERROR)", which will expand to LOG_0.
-
-// This will not cause a warning if the RHS text is identical to that in
-// wingdi.h (which it is).
-#define ERROR 0
-
-#define COMPACT_GOOGLE_LOG_EX_0(ClassName, ...) \
-  COMPACT_GOOGLE_LOG_EX_ERROR(ClassName , ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR
-namespace logging {
-const LogSeverity LOG_0 = LOG_ERROR;
-}  // namespace logging
-
-#endif  // OS_WIN
-
-#define LAZY_STREAM(stream, condition) \
-    !(condition) ? (void) 0 : ::logging::LogMessageVoidify() & (stream)
-
-#define LOG_IS_ON(severity) \
-    ((::logging::LOG_ ## severity) >= ::logging::GetMinLogLevel())
-#define VLOG_IS_ON(verbose_level) \
-    ((verbose_level) <= ::logging::GetVlogLevel(__FILE__))
-
-#define LOG_STREAM(severity) COMPACT_GOOGLE_LOG_ ## severity.stream()
-#define VLOG_STREAM(verbose_level) \
-    logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                        -verbose_level).stream()
-
-#if defined(OS_WIN)
-#define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \
-    Win32ErrorLogMessage, ::logging::GetLastSystemErrorCode()).stream()
-#define VPLOG_STREAM(verbose_level)                                       \
-    logging::Win32ErrorLogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                                  -verbose_level,                         \
-                                  ::logging::GetLastSystemErrorCode()).stream()
-#elif defined(OS_POSIX)
-#define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \
-    ErrnoLogMessage, ::logging::GetLastSystemErrorCode()).stream()
-#define VPLOG_STREAM(verbose_level) \
-    logging::ErrnoLogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                             -verbose_level, \
-                             ::logging::GetLastSystemErrorCode()).stream()
-#endif
-
-#define LOG(severity) LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity))
-#define LOG_IF(severity, condition) \
-    LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity) && (condition))
-#define LOG_ASSERT(condition) \
-    LOG_IF(FATAL, !(condition)) << "Assertion failed: " # condition ". "
-
-#define VLOG(verbose_level) \
-    LAZY_STREAM(VLOG_STREAM(verbose_level), VLOG_IS_ON(verbose_level))
-#define VLOG_IF(verbose_level, condition) \
-    LAZY_STREAM(VLOG_STREAM(verbose_level), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define PLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity))
-#define PLOG_IF(severity, condition) \
-    LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity) && (condition))
-
-#define VPLOG(verbose_level) \
-    LAZY_STREAM(VPLOG_STREAM(verbose_level), VLOG_IS_ON(verbose_level))
-#define VPLOG_IF(verbose_level, condition) \
-    LAZY_STREAM(VPLOG_STREAM(verbose_level), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define CHECK(condition) \
-    LAZY_STREAM(LOG_STREAM(FATAL), !(condition)) \
-    << "Check failed: " # condition << ". "
-#define PCHECK(condition) \
-    LAZY_STREAM(PLOG_STREAM(FATAL), !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#define CHECK_OP(name, op, val1, val2) \
-    if (std::string* _result = \
-          logging::Check ## name ## Impl((val1), (val2), \
-                                         # val1 " " # op " " # val2)) \
-      logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                          _result).stream()
-
-#define CHECK_EQ(val1, val2) CHECK_OP(EQ, ==, val1, val2)
-#define CHECK_NE(val1, val2) CHECK_OP(NE, !=, val1, val2)
-#define CHECK_LE(val1, val2) CHECK_OP(LE, <=, val1, val2)
-#define CHECK_LT(val1, val2) CHECK_OP(LT, <, val1, val2)
-#define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
-#define CHECK_GT(val1, val2) CHECK_OP(GT, >, val1, val2)
-
-#if defined(NDEBUG)
-#define DLOG_IS_ON(severity) 0
-#define DVLOG_IS_ON(verbose_level) 0
-#define DCHECK_IS_ON() 0
-#else
-#define DLOG_IS_ON(severity) LOG_IS_ON(severity)
-#define DVLOG_IS_ON(verbose_level) VLOG_IS_ON(verbose_level)
-#define DCHECK_IS_ON() 1
-#endif
-
-#define DLOG(severity) LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity))
-#define DLOG_IF(severity, condition) \
-    LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity) && (condition))
-#define DLOG_ASSERT(condition) \
-    DLOG_IF(FATAL, !(condition)) << "Assertion failed: " # condition ". "
-
-#define DVLOG(verbose_level) \
-    LAZY_STREAM(VLOG_STREAM(verbose_level), DVLOG_IS_ON(verbose_level))
-#define DVLOG_IF(verbose_level, condition) \
-    LAZY_STREAM(VLOG_STREAM(verbose_level), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define DPLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity))
-#define DPLOG_IF(severity, condition) \
-    LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity) && (condition))
-
-#define DVPLOG(verbose_level) \
-    LAZY_STREAM(VPLOG_STREAM(verbose_level), DVLOG_IS_ON(verbose_level))
-#define DVPLOG_IF(verbose_level, condition) \
-    LAZY_STREAM(VPLOG_STREAM(verbose_level), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define DCHECK(condition) \
-    LAZY_STREAM(LOG_STREAM(FATAL), DCHECK_IS_ON() ? !(condition) : false) \
-    << "Check failed: " # condition << ". "
-#define DPCHECK(condition) \
-    LAZY_STREAM(PLOG_STREAM(FATAL), DCHECK_IS_ON() ? !(condition) : false) \
-    << "Check failed: " # condition << ". "
-
-#define DCHECK_OP(name, op, val1, val2) \
-    if (DCHECK_IS_ON()) \
-      if (std::string* _result = \
-          logging::Check ## name ## Impl((val1), (val2), \
-                                         # val1 " " # op " " # val2)) \
-        logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                            _result).stream()
-
-#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
-#define DCHECK_NE(val1, val2) DCHECK_OP(NE, !=, val1, val2)
-#define DCHECK_LE(val1, val2) DCHECK_OP(LE, <=, val1, val2)
-#define DCHECK_LT(val1, val2) DCHECK_OP(LT, <, val1, val2)
-#define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2)
-#define DCHECK_GT(val1, val2) DCHECK_OP(GT, >, val1, val2)
-
-#define NOTREACHED() DCHECK(false)
-
-#undef assert
-#define assert(condition) DLOG_ASSERT(condition)
-
-#endif  // MINI_CHROMIUM_BASE_LOGGING_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h
deleted file mode 100644
index 9291ac7c1c..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
-#define MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
-
-#include <ApplicationServices/ApplicationServices.h>
-
-#include "base/logging.h"
-
-#if defined(__OBJC__)
-#import <Foundation/Foundation.h>
-#else  // defined(__OBJC__)
-#include <CoreFoundation/CoreFoundation.h>
-#endif  // defined(__OBJC__)
-
-#if !defined(__OBJC__)
-#define OBJC_CPP_CLASS_DECL(x) class x;
-#else  // defined(__OBJC__)
-#define OBJC_CPP_CLASS_DECL(x)
-#endif  // defined(__OBJC__)
-
-// Convert toll-free bridged CFTypes to NSTypes and vice-versa. This does not
-// autorelease |cf_val|. This is useful for the case where there is a CFType in
-// a call that expects an NSType and the compiler is complaining about const
-// casting problems.
-// The calls are used like this:
-// NSString *foo = CFToNSCast(CFSTR("Hello"));
-// CFStringRef foo2 = NSToCFCast(@"Hello");
-// The macro magic below is to enforce safe casting. It could possibly have
-// been done using template function specialization, but template function
-// specialization doesn't always work intuitively,
-// (http://www.gotw.ca/publications/mill17.htm) so the trusty combination
-// of macros and function overloading is used instead.
-
-#define CF_TO_NS_CAST_DECL(TypeCF, TypeNS) \
-OBJC_CPP_CLASS_DECL(TypeNS) \
-\
-namespace base { \
-namespace mac { \
-TypeNS* CFToNSCast(TypeCF##Ref cf_val); \
-TypeCF##Ref NSToCFCast(TypeNS* ns_val); \
-} \
-}
-#define CF_TO_NS_MUTABLE_CAST_DECL(name) \
-CF_TO_NS_CAST_DECL(CF##name, NS##name) \
-OBJC_CPP_CLASS_DECL(NSMutable##name) \
-\
-namespace base { \
-namespace mac { \
-NSMutable##name* CFToNSCast(CFMutable##name##Ref cf_val); \
-CFMutable##name##Ref NSToCFCast(NSMutable##name* ns_val); \
-} \
-}
-
-// List of toll-free bridged types taken from:
-// http://www.cocoadev.com/index.pl?TollFreeBridged
-
-CF_TO_NS_MUTABLE_CAST_DECL(Array);
-CF_TO_NS_MUTABLE_CAST_DECL(AttributedString);
-CF_TO_NS_CAST_DECL(CFCalendar, NSCalendar);
-CF_TO_NS_MUTABLE_CAST_DECL(CharacterSet);
-CF_TO_NS_MUTABLE_CAST_DECL(Data);
-CF_TO_NS_CAST_DECL(CFDate, NSDate);
-CF_TO_NS_MUTABLE_CAST_DECL(Dictionary);
-CF_TO_NS_CAST_DECL(CFError, NSError);
-CF_TO_NS_CAST_DECL(CFLocale, NSLocale);
-CF_TO_NS_CAST_DECL(CFNumber, NSNumber);
-CF_TO_NS_CAST_DECL(CFRunLoopTimer, NSTimer);
-CF_TO_NS_CAST_DECL(CFTimeZone, NSTimeZone);
-CF_TO_NS_MUTABLE_CAST_DECL(Set);
-CF_TO_NS_CAST_DECL(CFReadStream, NSInputStream);
-CF_TO_NS_CAST_DECL(CFWriteStream, NSOutputStream);
-CF_TO_NS_MUTABLE_CAST_DECL(String);
-CF_TO_NS_CAST_DECL(CFURL, NSURL);
-
-#undef CF_TO_NS_CAST_DECL
-#undef CF_TO_NS_MUTABLE_CAST_DECL
-#undef OBJC_CPP_CLASS_DECL
-
-namespace base {
-namespace mac {
-
-// CFCast<>() and CFCastStrict<>() cast a basic CFTypeRef to a more
-// specific CoreFoundation type. The compatibility of the passed
-// object is found by comparing its opaque type against the
-// requested type identifier. If the supplied object is not
-// compatible with the requested return type, CFCast<>() returns
-// NULL and CFCastStrict<>() will DCHECK. Providing a NULL pointer
-// to either variant results in NULL being returned without
-// triggering any DCHECK.
-//
-// Example usage:
-// CFNumberRef some_number = base::mac::CFCast<CFNumberRef>(
-//     CFArrayGetValueAtIndex(array, index));
-//
-// CFTypeRef hello = CFSTR("hello world");
-// CFStringRef some_string = base::mac::CFCastStrict<CFStringRef>(hello);
-
-template<typename T>
-T CFCast(const CFTypeRef& cf_val);
-
-template<typename T>
-T CFCastStrict(const CFTypeRef& cf_val);
-
-#define CF_CAST_DECL(TypeCF) \
-template<> TypeCF##Ref \
-CFCast<TypeCF##Ref>(const CFTypeRef& cf_val);\
-\
-template<> TypeCF##Ref \
-CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val);
-
-CF_CAST_DECL(CFArray);
-CF_CAST_DECL(CFBag);
-CF_CAST_DECL(CFBoolean);
-CF_CAST_DECL(CFData);
-CF_CAST_DECL(CFDate);
-CF_CAST_DECL(CFDictionary);
-CF_CAST_DECL(CFNull);
-CF_CAST_DECL(CFNumber);
-CF_CAST_DECL(CFSet);
-CF_CAST_DECL(CFString);
-CF_CAST_DECL(CFURL);
-CF_CAST_DECL(CFUUID);
-
-CF_CAST_DECL(CGColor);
-
-CF_CAST_DECL(CTFont);
-CF_CAST_DECL(CTRun);
-
-CF_CAST_DECL(SecACL);
-CF_CAST_DECL(SecTrustedApplication);
-
-#undef CF_CAST_DECL
-
-#if defined(__OBJC__)
-
-// ObjCCast<>() and ObjCCastStrict<>() cast a basic id to a more
-// specific (NSObject-derived) type. The compatibility of the passed
-// object is found by checking if it's a kind of the requested type
-// identifier. If the supplied object is not compatible with the
-// requested return type, ObjCCast<>() returns nil and
-// ObjCCastStrict<>() will DCHECK. Providing a nil pointer to either
-// variant results in nil being returned without triggering any DCHECK.
-//
-// The strict variant is useful when retrieving a value from a
-// collection which only has values of a specific type, e.g. an
-// NSArray of NSStrings. The non-strict variant is useful when
-// retrieving values from data that you can't fully control. For
-// example, a plist read from disk may be beyond your exclusive
-// control, so you'd only want to check that the values you retrieve
-// from it are of the expected types, but not crash if they're not.
-//
-// Example usage:
-// NSString* version = base::mac::ObjCCast<NSString>(
-//     [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
-//
-// NSString* str = base::mac::ObjCCastStrict<NSString>(
-//     [ns_arr_of_ns_strs objectAtIndex:0]);
-template<typename T>
-T* ObjCCast(id objc_val) {
-  if ([objc_val isKindOfClass:[T class]]) {
-    return reinterpret_cast<T*>(objc_val);
-  }
-  return nil;
-}
-
-template<typename T>
-T* ObjCCastStrict(id objc_val) {
-  T* rv = ObjCCast<T>(objc_val);
-  DCHECK(objc_val == nil || rv);
-  return rv;
-}
-
-#endif  // defined(__OBJC__)
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h
deleted file mode 100644
index e5bd1f6381..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
-#define MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
-
-#include <mach/mach.h>
-
-#include "base/logging.h"
-#include "base/macros.h"
-
-// Use the MACH_LOG family of macros along with a mach_error_t (kern_return_t)
-// containing a Mach error. The error value will be decoded so that logged
-// messages explain the error.
-//
-// Use the BOOTSTRAP_LOG family of macros specifically for errors that occur
-// while interoperating with the bootstrap subsystem. These errors will first
-// be looked up as bootstrap error messages. If no match is found, they will
-// be treated as generic Mach errors, as in MACH_LOG.
-//
-// Examples:
-//
-//   kern_return_t kr = mach_timebase_info(&info);
-//   if (kr != KERN_SUCCESS) {
-//     MACH_LOG(ERROR, kr) << "mach_timebase_info";
-//   }
-//
-//   kr = vm_deallocate(task, address, size);
-//   MACH_DCHECK(kr == KERN_SUCCESS, kr) << "vm_deallocate";
-
-namespace logging {
-
-class MachLogMessage : public logging::LogMessage {
- public:
-  MachLogMessage(const char* function,
-                 const char* file_path,
-                 int line,
-                 LogSeverity severity,
-                 mach_error_t mach_err);
-  ~MachLogMessage();
-
- private:
-  mach_error_t mach_err_;
-
-  DISALLOW_COPY_AND_ASSIGN(MachLogMessage);
-};
-
-}  // namespace logging
-
-#define MACH_LOG_STREAM(severity, mach_err) \
-    COMPACT_GOOGLE_LOG_EX_ ## severity(MachLogMessage, mach_err).stream()
-#define MACH_VLOG_STREAM(verbose_level, mach_err) \
-    logging::MachLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
-                            -verbose_level, mach_err).stream()
-
-#define MACH_LOG(severity, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), LOG_IS_ON(severity))
-#define MACH_LOG_IF(severity, condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
-                LOG_IS_ON(severity) && (condition))
-
-#define MACH_VLOG(verbose_level, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                VLOG_IS_ON(verbose_level))
-#define MACH_VLOG_IF(verbose_level, condition, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define MACH_CHECK(condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#define MACH_DLOG(severity, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), DLOG_IS_ON(severity))
-#define MACH_DLOG_IF(severity, condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
-                DLOG_IS_ON(severity) && (condition))
-
-#define MACH_DVLOG(verbose_level, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                DVLOG_IS_ON(verbose_level))
-#define MACH_DVLOG_IF(verbose_level, condition, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define MACH_DCHECK(condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), \
-                DCHECK_IS_ON && !(condition)) \
-    << "Check failed: " # condition << ". "
-
-namespace logging {
-
-class BootstrapLogMessage : public logging::LogMessage {
- public:
-  BootstrapLogMessage(const char* function,
-                      const char* file_path,
-                      int line,
-                      LogSeverity severity,
-                      kern_return_t bootstrap_err);
-  ~BootstrapLogMessage();
-
- private:
-  kern_return_t bootstrap_err_;
-
-  DISALLOW_COPY_AND_ASSIGN(BootstrapLogMessage);
-};
-
-}  // namespace logging
-
-#define BOOTSTRAP_LOG_STREAM(severity, bootstrap_err) \
-    COMPACT_GOOGLE_LOG_EX_ ## severity(BootstrapLogMessage, \
-                                       bootstrap_err).stream()
-#define BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \
-    logging::BootstrapLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
-                            -verbose_level, bootstrap_err).stream()
-
-#define BOOTSTRAP_LOG(severity, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, \
-                                     bootstrap_err), LOG_IS_ON(severity))
-#define BOOTSTRAP_LOG_IF(severity, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                LOG_IS_ON(severity) && (condition))
-
-#define BOOTSTRAP_VLOG(verbose_level, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                VLOG_IS_ON(verbose_level))
-#define BOOTSTRAP_VLOG_IF(verbose_level, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define BOOTSTRAP_CHECK(condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#define BOOTSTRAP_DLOG(severity, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                DLOG_IS_ON(severity))
-#define BOOTSTRAP_DLOG_IF(severity, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                DLOG_IS_ON(severity) && (condition))
-
-#define BOOTSTRAP_DVLOG(verbose_level, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                DVLOG_IS_ON(verbose_level))
-#define BOOTSTRAP_DVLOG_IF(verbose_level, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define BOOTSTRAP_DCHECK(condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), \
-                DCHECK_IS_ON && !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#endif  // MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h
deleted file mode 100644
index 7ea09219ff..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include "base/mac/scoped_typeref.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename CFT>
-struct ScopedCFTypeRefTraits {
-  static CFT InvalidValue() { return nullptr; }
-  static CFT Retain(CFT object) {
-    CFRetain(object);
-    return object;
-  }
-  static void Release(CFT object) { CFRelease(object); }
-};
-
-}  // namespace internal
-
-template <typename CFT>
-using ScopedCFTypeRef =
-    ScopedTypeRef<CFT, internal::ScopedCFTypeRefTraits<CFT>>;
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
deleted file mode 100644
index e653110a96..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_IOOBJECT_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_IOOBJECT_H_
-
-#include <IOKit/IOKitLib.h>
-
-#include "base/mac/scoped_typeref.h"
-
-namespace base {
-namespace mac {
-
-namespace internal {
-
-template <typename IOT>
-struct ScopedIOObjectTraits {
-  static IOT InvalidValue() { return IO_OBJECT_NULL; }
-  static IOT Retain(IOT iot) {
-    IOObjectRetain(iot);
-    return iot;
-  }
-  static void Release(IOT iot) { IOObjectRelease(iot); }
-};
-
-}  // namespce internal
-
-template <typename IOT>
-using ScopedIOObject = ScopedTypeRef<IOT, internal::ScopedIOObjectTraits<IOT>>;
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_IOOBJECT_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h
deleted file mode 100644
index 8f8e759fc2..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_LAUNCH_DATA_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_LAUNCH_DATA_H_
-
-#include <launch.h>
-
-#include "base/scoped_generic.h"
-
-namespace base {
-namespace mac {
-
-namespace internal {
-
-struct ScopedLaunchDataTraits {
-  static launch_data_t InvalidValue() { return nullptr; }
-
-  static void Free(launch_data_t ldt) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    launch_data_free(ldt);
-#pragma clang diagnostic pop
-  }
-};
-
-}  // namespace internal
-
-using ScopedLaunchData =
-    ScopedGeneric<launch_data_t, internal::ScopedLaunchDataTraits>;
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_LAUNCH_DATA_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h
deleted file mode 100644
index f7275edb68..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
-
-#include <mach/mach.h>
-
-#include "base/scoped_generic.h"
-
-namespace base {
-namespace mac {
-
-namespace internal {
-
-struct SendRightTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-struct ReceiveRightTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-struct PortSetTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-}  // namespace internal
-
-using ScopedMachSendRight =
-    ScopedGeneric<mach_port_t, internal::SendRightTraits>;
-using ScopedMachReceiveRight =
-    ScopedGeneric<mach_port_t, internal::ReceiveRightTraits>;
-using ScopedMachPortSet = ScopedGeneric<mach_port_t, internal::PortSetTraits>;
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h
deleted file mode 100644
index 89087c733e..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
-
-#include <mach/mach.h>
-
-#include <algorithm>
-
-#include "base/logging.h"
-#include "base/macros.h"
-
-// Use ScopedMachVM to supervise ownership of pages in the current process
-// through the Mach VM subsystem. Pages allocated with vm_allocate can be
-// released when exiting a scope with ScopedMachVM.
-//
-// The Mach VM subsystem operates on a page-by-page basis, and a single VM
-// allocation managed by a ScopedMachVM object may span multiple pages. As far
-// as Mach is concerned, allocated pages may be deallocated individually. This
-// is in contrast to higher-level allocators such as malloc, where the base
-// address of an allocation implies the size of an allocated block.
-// Consequently, it is not sufficient to just pass the base address of an
-// allocation to ScopedMachVM, it also needs to know the size of the
-// allocation. To avoid any confusion, both the base address and size must
-// be page-aligned.
-//
-// When dealing with Mach VM, base addresses will naturally be page-aligned,
-// but user-specified sizes may not be. If there's a concern that a size is
-// not page-aligned, use the mach_vm_round_page macro to correct it.
-//
-// Example:
-//
-//   vm_address_t address = 0;
-//   vm_size_t size = 12345;  // This requested size is not page-aligned.
-//   kern_return_t kr =
-//       vm_allocate(mach_task_self(), &address, size, VM_FLAGS_ANYWHERE);
-//   if (kr != KERN_SUCCESS) {
-//     return false;
-//   }
-//   ScopedMachVM vm_owner(address, mach_vm_round_page(size));
-
-namespace base {
-namespace mac {
-
-class ScopedMachVM {
- public:
-  explicit ScopedMachVM(vm_address_t address = 0, vm_size_t size = 0)
-      : address_(address),
-        size_(size) {
-    DCHECK(address % PAGE_SIZE == 0);
-    DCHECK(size % PAGE_SIZE == 0);
-  }
-
-  ~ScopedMachVM() {
-    if (size_) {
-      vm_deallocate(mach_task_self(), address_, size_);
-    }
-  }
-
-  void reset(vm_address_t address = 0, vm_size_t size = 0);
-
-  vm_address_t address() const {
-    return address_;
-  }
-
-  vm_size_t size() const {
-    return size_;
-  }
-
-  void swap(ScopedMachVM& that) {
-    std::swap(address_, that.address_);
-    std::swap(size_, that.size_);
-  }
-
-  void release() {
-    address_ = 0;
-    size_ = 0;
-  }
-
- private:
-  vm_address_t address_;
-  vm_size_t size_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedMachVM);
-};
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h
deleted file mode 100644
index c8d9def5d5..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
-
-#include "base/macros.h"
-
-#if defined(OS_MACOSX)
-#if defined(__OBJC__)
-@class NSAutoreleasePool;
-#else  // __OBJC__
-class NSAutoreleasePool;
-#endif  // __OBJC__
-#endif  // OS_MACOSX
-
-namespace base {
-namespace mac {
-
-// On the Mac, ScopedNSAutoreleasePool allocates an NSAutoreleasePool when
-// instantiated and sends it a -drain message when destroyed.  This allows an
-// autorelease pool to be maintained in ordinary C++ code without bringing in
-// any direct Objective-C dependency.
-//
-// On other platforms, ScopedNSAutoreleasePool is an empty object with no
-// effects.  This allows it to be used directly in cross-platform code without
-// ugly #ifdefs.
-class ScopedNSAutoreleasePool {
- public:
-#if !defined(OS_MACOSX)
-  ScopedNSAutoreleasePool() {}
-  void Recycle() { }
-#else  // OS_MACOSX
-  ScopedNSAutoreleasePool();
-  ~ScopedNSAutoreleasePool();
-
-  // Clear out the pool in case its position on the stack causes it to be
-  // alive for long periods of time (such as the entire length of the app).
-  // Only use then when you're certain the items currently in the pool are
-  // no longer needed.
-  void Recycle();
- private:
-  NSAutoreleasePool* autorelease_pool_;
-#endif  // OS_MACOSX
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScopedNSAutoreleasePool);
-};
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h
deleted file mode 100644
index 2e157a4a28..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
-
-#import <Foundation/Foundation.h>
-
-#include <type_traits>
-
-#include "base/compiler_specific.h"
-#include "base/mac/scoped_typeref.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename NST>
-struct ScopedNSProtocolTraits {
-  static NST InvalidValue() { return nil; }
-  static NST Retain(NST nst) { return [nst retain]; }
-  static void Release(NST nst) { [nst release]; }
-};
-
-}  // namespace internal
-
-template <typename NST>
-class scoped_nsprotocol
-    : public ScopedTypeRef<NST, internal::ScopedNSProtocolTraits<NST>> {
- public:
-  using ScopedTypeRef<NST,
-                      internal::ScopedNSProtocolTraits<NST>>::ScopedTypeRef;
-
-  NST autorelease() { return [this->release() autorelease]; }
-};
-
-template <class C>
-void swap(scoped_nsprotocol<C>& p1, scoped_nsprotocol<C>& p2) {
-  p1.swap(p2);
-}
-
-template <class C>
-bool operator==(C p1, const scoped_nsprotocol<C>& p2) {
-  return p1 == p2.get();
-}
-
-template <class C>
-bool operator!=(C p1, const scoped_nsprotocol<C>& p2) {
-  return p1 != p2.get();
-}
-
-template <typename NST>
-class scoped_nsobject : public scoped_nsprotocol<NST*> {
- public:
-  using scoped_nsprotocol<NST*>::scoped_nsprotocol;
-
-  static_assert(std::is_same<NST, NSAutoreleasePool>::value == false,
-                "Use ScopedNSAutoreleasePool instead");
-};
-
-template<>
-class scoped_nsobject<id> : public scoped_nsprotocol<id> {
- public:
-  using scoped_nsprotocol<id>::scoped_nsprotocol;
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h
deleted file mode 100644
index 9f00b1a216..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
-
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "base/memory/scoped_policy.h"
-
-namespace base {
-
-template <typename T>
-struct ScopedTypeRefTraits;
-
-template <typename T, typename Traits = ScopedTypeRefTraits<T>>
-class ScopedTypeRef {
- public:
-  typedef T element_type;
-
-  ScopedTypeRef(
-      T object = Traits::InvalidValue(),
-      base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
-      : object_(object) {
-    if (object_ && policy == base::scoped_policy::RETAIN)
-      object_ = Traits::Retain(object_);
-  }
-
-  ScopedTypeRef(const ScopedTypeRef<T, Traits>& that) : object_(that.object_) {
-    if (object_)
-      object_ = Traits::Retain(object_);
-  }
-
-  ~ScopedTypeRef() {
-    if (object_)
-      Traits::Release(object_);
-  }
-
-  ScopedTypeRef& operator=(const ScopedTypeRef<T, Traits>& that) {
-    reset(that.get(), base::scoped_policy::RETAIN);
-    return *this;
-  }
-
-  T* InitializeInto() WARN_UNUSED_RESULT {
-    DCHECK(!object_);
-    return &object_;
-  }
-
-  void reset(T object = Traits::InvalidValue(),
-             base::scoped_policy::OwnershipPolicy policy =
-                 base::scoped_policy::ASSUME) {
-    if (object && policy == base::scoped_policy::RETAIN)
-      object = Traits::Retain(object);
-    if (object_)
-      Traits::Release(object_);
-    object_ = object;
-  }
-
-  bool operator==(T that) const { return object_ == that; }
-
-  bool operator!=(T that) const { return object_ != that; }
-
-  operator T() const { return object_; }
-
-  T get() const { return object_; }
-
-  void swap(ScopedTypeRef& that) {
-    T temp = that.object_;
-    that.object_ = object_;
-    object_ = temp;
-  }
-
-  T release() WARN_UNUSED_RESULT {
-    T temp = object_;
-    object_ = Traits::InvalidValue();
-    return temp;
-  }
-
- private:
-  T object_;
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/macros.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/macros.h
deleted file mode 100644
index 5d96783daa..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/macros.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MACROS_H_
-#define MINI_CHROMIUM_BASE_MACROS_H_
-
-#include <string.h>
-#include <sys/types.h>
-
-#include "base/compiler_specific.h"
-
-#if __cplusplus >= 201103L
-
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-    TypeName(const TypeName&) = delete; \
-    void operator=(const TypeName&) = delete
-
-#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-    TypeName() = delete; \
-    DISALLOW_COPY_AND_ASSIGN(TypeName)
-
-#else
-
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-    TypeName(const TypeName&); \
-    void operator=(const TypeName&)
-
-#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-    TypeName(); \
-    DISALLOW_COPY_AND_ASSIGN(TypeName)
-
-#endif
-
-template<typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-template <typename T, size_t N>
-char (&ArraySizeHelper(const T (&array)[N]))[N];
-
-#define arraysize(array) (sizeof(ArraySizeHelper(array)))
-
-template <typename Dest, typename Source>
-inline Dest bit_cast(const Source& source) {
-  static_assert(sizeof(Dest) == sizeof(Source), "sizes must be equal");
-
-  Dest dest;
-  memcpy(&dest, &source, sizeof(dest));
-  return dest;
-}
-
-template<typename T>
-inline void ignore_result(const T&) {
-}
-
-#endif  // MINI_CHROMIUM_BASE_MACROS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h
deleted file mode 100644
index be59d91b4f..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_H_
-#define MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_H_
-
-#include <stddef.h>
-
-#include <limits>
-#include <ostream>
-#include <type_traits>
-
-#include "base/logging.h"
-#include "base/numerics/safe_conversions_impl.h"
-
-namespace base {
-
-// The following are helper constexpr template functions and classes for safely
-// performing a range of conversions, assignments, and tests:
-//
-//  checked_cast<> - Analogous to static_cast<> for numeric types, except
-//      that it CHECKs that the specified numeric conversion will not overflow
-//      or underflow. NaN source will always trigger a CHECK.
-//      The default CHECK triggers a crash, but the handler can be overriden.
-//  saturated_cast<> - Analogous to static_cast<> for numeric types, except
-//      that it returns a saturated result when the specified numeric conversion
-//      would otherwise overflow or underflow. An NaN source returns 0 by
-//      default, but can be overridden to return a different result.
-//  strict_cast<> - Analogous to static_cast<> for numeric types, except that
-//      it will cause a compile failure if the destination type is not large
-//      enough to contain any value in the source type. It performs no runtime
-//      checking and thus introduces no runtime overhead.
-//  IsValueInRangeForNumericType<>() - A convenience function that returns true
-//      if the type supplied to the template parameter can represent the value
-//      passed as an argument to the function.
-//  IsValueNegative<>() - A convenience function that will accept any arithmetic
-//      type as an argument and will return whether the value is less than zero.
-//      Unsigned types always return false.
-//  StrictNumeric<> - A wrapper type that performs assignments and copies via
-//      the strict_cast<> template, and can perform valid arithmetic comparisons
-//      across any range of arithmetic types. StrictNumeric is the return type
-//      for values extracted from a CheckedNumeric class instance. The raw
-//      arithmetic value is extracted via static_cast to the underlying type.
-//  MakeStrictNum() - Creates a new StrictNumeric from the underlying type of
-//      the supplied arithmetic or StrictNumeric type.
-
-// Convenience function that returns true if the supplied value is in range
-// for the destination type.
-template <typename Dst, typename Src>
-constexpr bool IsValueInRangeForNumericType(Src value) {
-  return internal::DstRangeRelationToSrcRange<Dst>(value) ==
-         internal::RANGE_VALID;
-}
-
-// Convenience function for determining if a numeric value is negative without
-// throwing compiler warnings on: unsigned(value) < 0.
-template <typename T,
-          typename std::enable_if<std::is_signed<T>::value>::type* = nullptr>
-constexpr bool IsValueNegative(T value) {
-  static_assert(std::is_arithmetic<T>::value, "Argument must be numeric.");
-  return value < 0;
-}
-
-template <typename T,
-          typename std::enable_if<!std::is_signed<T>::value>::type* = nullptr>
-constexpr bool IsValueNegative(T) {
-  static_assert(std::is_arithmetic<T>::value, "Argument must be numeric.");
-  return false;
-}
-
-// Forces a crash. Used for numeric boundary errors.
-struct CheckOnFailure {
-  template <typename T>
-  static T HandleFailure() {
-    CHECK(false);
-    return T();
-  }
-};
-
-// checked_cast<> is analogous to static_cast<> for numeric types,
-// except that it CHECKs that the specified numeric conversion will not
-// overflow or underflow. NaN source will always trigger a CHECK.
-template <typename Dst,
-          class CheckHandler = CheckOnFailure,
-          typename Src>
-constexpr Dst checked_cast(Src value) {
-  // This throws a compile-time error on evaluating the constexpr if it can be
-  // determined at compile-time as failing, otherwise it will CHECK at runtime.
-  using SrcType = typename internal::UnderlyingType<Src>::type;
-  return IsValueInRangeForNumericType<Dst, SrcType>(value)
-             ? static_cast<Dst>(static_cast<SrcType>(value))
-             : CheckHandler::template HandleFailure<Dst>();
-}
-
-// HandleNaN will return 0 in this case.
-struct SaturatedCastNaNBehaviorReturnZero {
-  template <typename T>
-  static constexpr T HandleFailure() {
-    return T();
-  }
-};
-
-namespace internal {
-// These wrappers are used for C++11 constexpr support by avoiding both the
-// declaration of local variables and invalid evaluation resulting from the
-// lack of "constexpr if" support in the saturated_cast template function.
-// TODO(jschuh): Convert to single function with a switch once we support C++14.
-template <
-    typename Dst,
-    class NaNHandler,
-    typename Src,
-    typename std::enable_if<std::is_integral<Dst>::value>::type* = nullptr>
-constexpr Dst saturated_cast_impl(const Src value,
-                                  const RangeConstraint constraint) {
-  return constraint == RANGE_VALID
-             ? static_cast<Dst>(value)
-             : (constraint == RANGE_UNDERFLOW
-                    ? std::numeric_limits<Dst>::lowest()
-                    : (constraint == RANGE_OVERFLOW
-                           ? std::numeric_limits<Dst>::max()
-                           : NaNHandler::template HandleFailure<Dst>()));
-}
-
-template <typename Dst,
-          class NaNHandler,
-          typename Src,
-          typename std::enable_if<std::is_floating_point<Dst>::value>::type* =
-              nullptr>
-constexpr Dst saturated_cast_impl(const Src value,
-                                  const RangeConstraint constraint) {
-  return constraint == RANGE_VALID
-             ? static_cast<Dst>(value)
-             : (constraint == RANGE_UNDERFLOW
-                    ? -std::numeric_limits<Dst>::infinity()
-                    : (constraint == RANGE_OVERFLOW
-                           ? std::numeric_limits<Dst>::infinity()
-                           : std::numeric_limits<Dst>::quiet_NaN()));
-}
-
-// saturated_cast<> is analogous to static_cast<> for numeric types, except
-// that the specified numeric conversion will saturate rather than overflow or
-// underflow. NaN assignment to an integral will defer the behavior to a
-// specified class. By default, it will return 0.
-template <typename Dst,
-          class NaNHandler = SaturatedCastNaNBehaviorReturnZero,
-          typename Src>
-constexpr Dst saturated_cast(Src value) {
-  using SrcType = typename UnderlyingType<Src>::type;
-  return internal::saturated_cast_impl<Dst, NaNHandler>(
-      value, internal::DstRangeRelationToSrcRange<Dst, SrcType>(value));
-}
-
-// strict_cast<> is analogous to static_cast<> for numeric types, except that
-// it will cause a compile failure if the destination type is not large enough
-// to contain any value in the source type. It performs no runtime checking.
-template <typename Dst, typename Src>
-constexpr Dst strict_cast(Src value) {
-  using SrcType = typename UnderlyingType<Src>::type;
-  static_assert(UnderlyingType<Src>::is_numeric, "Argument must be numeric.");
-  static_assert(std::is_arithmetic<Dst>::value, "Result must be numeric.");
-
-  // If you got here from a compiler error, it's because you tried to assign
-  // from a source type to a destination type that has insufficient range.
-  // The solution may be to change the destination type you're assigning to,
-  // and use one large enough to represent the source.
-  // Alternatively, you may be better served with the checked_cast<> or
-  // saturated_cast<> template functions for your particular use case.
-  static_assert(StaticDstRangeRelationToSrcRange<Dst, SrcType>::value ==
-                    NUMERIC_RANGE_CONTAINED,
-                "The source type is out of range for the destination type. "
-                "Please see strict_cast<> comments for more information.");
-
-  return static_cast<Dst>(static_cast<SrcType>(value));
-}
-
-// Some wrappers to statically check that a type is in range.
-template <typename Dst, typename Src, class Enable = void>
-struct IsNumericRangeContained {
-  static const bool value = false;
-};
-
-template <typename Dst, typename Src>
-struct IsNumericRangeContained<
-    Dst,
-    Src,
-    typename std::enable_if<ArithmeticOrUnderlyingEnum<Dst>::value &&
-                            ArithmeticOrUnderlyingEnum<Src>::value>::type> {
-  static const bool value = StaticDstRangeRelationToSrcRange<Dst, Src>::value ==
-                            NUMERIC_RANGE_CONTAINED;
-};
-
-// StrictNumeric implements compile time range checking between numeric types by
-// wrapping assignment operations in a strict_cast. This class is intended to be
-// used for function arguments and return types, to ensure the destination type
-// can always contain the source type. This is essentially the same as enforcing
-// -Wconversion in gcc and C4302 warnings on MSVC, but it can be applied
-// incrementally at API boundaries, making it easier to convert code so that it
-// compiles cleanly with truncation warnings enabled.
-// This template should introduce no runtime overhead, but it also provides no
-// runtime checking of any of the associated mathematical operations. Use
-// CheckedNumeric for runtime range checks of the actual value being assigned.
-template <typename T>
-class StrictNumeric {
- public:
-  using type = T;
-
-  constexpr StrictNumeric() : value_(0) {}
-
-  // Copy constructor.
-  template <typename Src>
-  constexpr StrictNumeric(const StrictNumeric<Src>& rhs)
-      : value_(strict_cast<T>(rhs.value_)) {}
-
-  // This is not an explicit constructor because we implicitly upgrade regular
-  // numerics to StrictNumerics to make them easier to use.
-  template <typename Src>
-  constexpr StrictNumeric(Src value)  // NOLINT(runtime/explicit)
-      : value_(strict_cast<T>(value)) {}
-
-  // If you got here from a compiler error, it's because you tried to assign
-  // from a source type to a destination type that has insufficient range.
-  // The solution may be to change the destination type you're assigning to,
-  // and use one large enough to represent the source.
-  // If you're assigning from a CheckedNumeric<> class, you may be able to use
-  // the AssignIfValid() member function, specify a narrower destination type to
-  // the member value functions (e.g. val.template ValueOrDie<Dst>()), use one
-  // of the value helper functions (e.g. ValueOrDieForType<Dst>(val)).
-  // If you've encountered an _ambiguous overload_ you can use a static_cast<>
-  // to explicitly cast the result to the destination type.
-  // If none of that works, you may be better served with the checked_cast<> or
-  // saturated_cast<> template functions for your particular use case.
-  template <typename Dst,
-            typename std::enable_if<
-                IsNumericRangeContained<Dst, T>::value>::type* = nullptr>
-  constexpr operator Dst() const {
-    return static_cast<typename ArithmeticOrUnderlyingEnum<Dst>::type>(value_);
-  }
-
- private:
-  const T value_;
-};
-
-// Convience wrapper returns a StrictNumeric from the provided arithmetic type.
-template <typename T>
-constexpr StrictNumeric<typename UnderlyingType<T>::type> MakeStrictNum(
-    const T value) {
-  return value;
-}
-
-// Overload the ostream output operator to make logging work nicely.
-template <typename T>
-std::ostream& operator<<(std::ostream& os, const StrictNumeric<T>& value) {
-  os << static_cast<T>(value);
-  return os;
-}
-
-#define STRICT_COMPARISON_OP(NAME, OP)                               \
-  template <typename L, typename R,                                  \
-            typename std::enable_if<                                 \
-                internal::IsStrictOp<L, R>::value>::type* = nullptr> \
-  constexpr bool operator OP(const L lhs, const R rhs) {             \
-    return SafeCompare<NAME, typename UnderlyingType<L>::type,       \
-                       typename UnderlyingType<R>::type>(lhs, rhs);  \
-  }
-
-STRICT_COMPARISON_OP(IsLess, <);
-STRICT_COMPARISON_OP(IsLessOrEqual, <=);
-STRICT_COMPARISON_OP(IsGreater, >);
-STRICT_COMPARISON_OP(IsGreaterOrEqual, >=);
-STRICT_COMPARISON_OP(IsEqual, ==);
-STRICT_COMPARISON_OP(IsNotEqual, !=);
-
-#undef STRICT_COMPARISON_OP
-};
-
-using internal::strict_cast;
-using internal::saturated_cast;
-using internal::StrictNumeric;
-using internal::MakeStrictNum;
-
-// Explicitly make a shorter size_t alias for convenience.
-using SizeT = StrictNumeric<size_t>;
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h
deleted file mode 100644
index 230a655e74..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h
+++ /dev/null
@@ -1,616 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
-#define MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
-
-#include <stdint.h>
-
-#include <limits>
-#include <type_traits>
-
-namespace base {
-namespace internal {
-
-// The std library doesn't provide a binary max_exponent for integers, however
-// we can compute an analog using std::numeric_limits<>::digits.
-template <typename NumericType>
-struct MaxExponent {
-  static const int value = std::is_floating_point<NumericType>::value
-                               ? std::numeric_limits<NumericType>::max_exponent
-                               : std::numeric_limits<NumericType>::digits + 1;
-};
-
-// The number of bits (including the sign) in an integer. Eliminates sizeof
-// hacks.
-template <typename NumericType>
-struct IntegerBitsPlusSign {
-  static const int value = std::numeric_limits<NumericType>::digits +
-                           std::is_signed<NumericType>::value;
-};
-
-enum IntegerRepresentation {
-  INTEGER_REPRESENTATION_UNSIGNED,
-  INTEGER_REPRESENTATION_SIGNED
-};
-
-// A range for a given nunmeric Src type is contained for a given numeric Dst
-// type if both numeric_limits<Src>::max() <= numeric_limits<Dst>::max() and
-// numeric_limits<Src>::lowest() >= numeric_limits<Dst>::lowest() are true.
-// We implement this as template specializations rather than simple static
-// comparisons to ensure type correctness in our comparisons.
-enum NumericRangeRepresentation {
-  NUMERIC_RANGE_NOT_CONTAINED,
-  NUMERIC_RANGE_CONTAINED
-};
-
-// Helper templates to statically determine if our destination type can contain
-// maximum and minimum values represented by the source type.
-
-template <typename Dst,
-          typename Src,
-          IntegerRepresentation DstSign = std::is_signed<Dst>::value
-                                              ? INTEGER_REPRESENTATION_SIGNED
-                                              : INTEGER_REPRESENTATION_UNSIGNED,
-          IntegerRepresentation SrcSign = std::is_signed<Src>::value
-                                              ? INTEGER_REPRESENTATION_SIGNED
-                                              : INTEGER_REPRESENTATION_UNSIGNED>
-struct StaticDstRangeRelationToSrcRange;
-
-// Same sign: Dst is guaranteed to contain Src only if its range is equal or
-// larger.
-template <typename Dst, typename Src, IntegerRepresentation Sign>
-struct StaticDstRangeRelationToSrcRange<Dst, Src, Sign, Sign> {
-  static const NumericRangeRepresentation value =
-      MaxExponent<Dst>::value >= MaxExponent<Src>::value
-          ? NUMERIC_RANGE_CONTAINED
-          : NUMERIC_RANGE_NOT_CONTAINED;
-};
-
-// Unsigned to signed: Dst is guaranteed to contain source only if its range is
-// larger.
-template <typename Dst, typename Src>
-struct StaticDstRangeRelationToSrcRange<Dst,
-                                        Src,
-                                        INTEGER_REPRESENTATION_SIGNED,
-                                        INTEGER_REPRESENTATION_UNSIGNED> {
-  static const NumericRangeRepresentation value =
-      MaxExponent<Dst>::value > MaxExponent<Src>::value
-          ? NUMERIC_RANGE_CONTAINED
-          : NUMERIC_RANGE_NOT_CONTAINED;
-};
-
-// Signed to unsigned: Dst cannot be statically determined to contain Src.
-template <typename Dst, typename Src>
-struct StaticDstRangeRelationToSrcRange<Dst,
-                                        Src,
-                                        INTEGER_REPRESENTATION_UNSIGNED,
-                                        INTEGER_REPRESENTATION_SIGNED> {
-  static const NumericRangeRepresentation value = NUMERIC_RANGE_NOT_CONTAINED;
-};
-
-enum RangeConstraint {
-  RANGE_VALID = 0x0,  // Value can be represented by the destination type.
-  RANGE_UNDERFLOW = 0x1,  // Value would overflow.
-  RANGE_OVERFLOW = 0x2,  // Value would underflow.
-  RANGE_INVALID = RANGE_UNDERFLOW | RANGE_OVERFLOW  // Invalid (i.e. NaN).
-};
-
-// Helper function for coercing an int back to a RangeContraint.
-constexpr RangeConstraint GetRangeConstraint(int integer_range_constraint) {
-  // TODO(jschuh): Once we get full C++14 support we want this
-  // assert(integer_range_constraint >= RANGE_VALID &&
-  //        integer_range_constraint <= RANGE_INVALID)
-  return static_cast<RangeConstraint>(integer_range_constraint);
-}
-
-// This function creates a RangeConstraint from an upper and lower bound
-// check by taking advantage of the fact that only NaN can be out of range in
-// both directions at once.
-constexpr inline RangeConstraint GetRangeConstraint(bool is_in_upper_bound,
-                                                    bool is_in_lower_bound) {
-  return GetRangeConstraint((is_in_upper_bound ? 0 : RANGE_OVERFLOW) |
-                            (is_in_lower_bound ? 0 : RANGE_UNDERFLOW));
-}
-
-// The following helper template addresses a corner case in range checks for
-// conversion from a floating-point type to an integral type of smaller range
-// but larger precision (e.g. float -> unsigned). The problem is as follows:
-//   1. Integral maximum is always one less than a power of two, so it must be
-//      truncated to fit the mantissa of the floating point. The direction of
-//      rounding is implementation defined, but by default it's always IEEE
-//      floats, which round to nearest and thus result in a value of larger
-//      magnitude than the integral value.
-//      Example: float f = UINT_MAX; // f is 4294967296f but UINT_MAX
-//                                   // is 4294967295u.
-//   2. If the floating point value is equal to the promoted integral maximum
-//      value, a range check will erroneously pass.
-//      Example: (4294967296f <= 4294967295u) // This is true due to a precision
-//                                            // loss in rounding up to float.
-//   3. When the floating point value is then converted to an integral, the
-//      resulting value is out of range for the target integral type and
-//      thus is implementation defined.
-//      Example: unsigned u = (float)INT_MAX; // u will typically overflow to 0.
-// To fix this bug we manually truncate the maximum value when the destination
-// type is an integral of larger precision than the source floating-point type,
-// such that the resulting maximum is represented exactly as a floating point.
-template <typename Dst, typename Src>
-struct NarrowingRange {
-  using SrcLimits = typename std::numeric_limits<Src>;
-  using DstLimits = typename std::numeric_limits<Dst>;
-  // The following logic avoids warnings where the max function is
-  // instantiated with invalid values for a bit shift (even though
-  // such a function can never be called).
-  static const int shift = (MaxExponent<Src>::value > MaxExponent<Dst>::value &&
-                            SrcLimits::digits < DstLimits::digits &&
-                            SrcLimits::is_iec559 &&
-                            DstLimits::is_integer)
-                               ? (DstLimits::digits - SrcLimits::digits)
-                               : 0;
-
-  static constexpr Dst max() {
-    // We use UINTMAX_C below to avoid compiler warnings about shifting floating
-    // points. Since it's a compile time calculation, it shouldn't have any
-    // performance impact.
-    return DstLimits::max() - static_cast<Dst>((UINTMAX_C(1) << shift) - 1);
-  }
-
-  static constexpr Dst lowest() { return DstLimits::lowest(); }
-};
-
-template <typename Dst,
-          typename Src,
-          IntegerRepresentation DstSign = std::is_signed<Dst>::value
-                                              ? INTEGER_REPRESENTATION_SIGNED
-                                              : INTEGER_REPRESENTATION_UNSIGNED,
-          IntegerRepresentation SrcSign = std::is_signed<Src>::value
-                                              ? INTEGER_REPRESENTATION_SIGNED
-                                              : INTEGER_REPRESENTATION_UNSIGNED,
-          NumericRangeRepresentation DstRange =
-              StaticDstRangeRelationToSrcRange<Dst, Src>::value>
-struct DstRangeRelationToSrcRangeImpl;
-
-// The following templates are for ranges that must be verified at runtime. We
-// split it into checks based on signedness to avoid confusing casts and
-// compiler warnings on signed an unsigned comparisons.
-
-// Dst range is statically determined to contain Src: Nothing to check.
-template <typename Dst,
-          typename Src,
-          IntegerRepresentation DstSign,
-          IntegerRepresentation SrcSign>
-struct DstRangeRelationToSrcRangeImpl<Dst,
-                                      Src,
-                                      DstSign,
-                                      SrcSign,
-                                      NUMERIC_RANGE_CONTAINED> {
-  static constexpr RangeConstraint Check(Src value) { return RANGE_VALID; }
-};
-
-// Signed to signed narrowing: Both the upper and lower boundaries may be
-// exceeded.
-template <typename Dst, typename Src>
-struct DstRangeRelationToSrcRangeImpl<Dst,
-                                      Src,
-                                      INTEGER_REPRESENTATION_SIGNED,
-                                      INTEGER_REPRESENTATION_SIGNED,
-                                      NUMERIC_RANGE_NOT_CONTAINED> {
-  static constexpr RangeConstraint Check(Src value) {
-    return GetRangeConstraint((value <= NarrowingRange<Dst, Src>::max()),
-                              (value >= NarrowingRange<Dst, Src>::lowest()));
-  }
-};
-
-// Unsigned to unsigned narrowing: Only the upper boundary can be exceeded.
-template <typename Dst, typename Src>
-struct DstRangeRelationToSrcRangeImpl<Dst,
-                                      Src,
-                                      INTEGER_REPRESENTATION_UNSIGNED,
-                                      INTEGER_REPRESENTATION_UNSIGNED,
-                                      NUMERIC_RANGE_NOT_CONTAINED> {
-  static constexpr RangeConstraint Check(Src value) {
-    return GetRangeConstraint(value <= NarrowingRange<Dst, Src>::max(), true);
-  }
-};
-
-// Unsigned to signed: The upper boundary may be exceeded.
-template <typename Dst, typename Src>
-struct DstRangeRelationToSrcRangeImpl<Dst,
-                                      Src,
-                                      INTEGER_REPRESENTATION_SIGNED,
-                                      INTEGER_REPRESENTATION_UNSIGNED,
-                                      NUMERIC_RANGE_NOT_CONTAINED> {
-  static constexpr RangeConstraint Check(Src value) {
-    return IntegerBitsPlusSign<Dst>::value > IntegerBitsPlusSign<Src>::value
-               ? RANGE_VALID
-               : GetRangeConstraint(
-                     value <= static_cast<Src>(NarrowingRange<Dst, Src>::max()),
-                     true);
-  }
-};
-
-// Signed to unsigned: The upper boundary may be exceeded for a narrower Dst,
-// and any negative value exceeds the lower boundary.
-template <typename Dst, typename Src>
-struct DstRangeRelationToSrcRangeImpl<Dst,
-                                      Src,
-                                      INTEGER_REPRESENTATION_UNSIGNED,
-                                      INTEGER_REPRESENTATION_SIGNED,
-                                      NUMERIC_RANGE_NOT_CONTAINED> {
-  static constexpr RangeConstraint Check(Src value) {
-    return (MaxExponent<Dst>::value >= MaxExponent<Src>::value)
-               ? GetRangeConstraint(true, value >= static_cast<Src>(0))
-               : GetRangeConstraint(
-                     value <= static_cast<Src>(NarrowingRange<Dst, Src>::max()),
-                     value >= static_cast<Src>(0));
-  }
-};
-
-template <typename Dst, typename Src>
-constexpr RangeConstraint DstRangeRelationToSrcRange(Src value) {
-  static_assert(std::is_arithmetic<Src>::value, "Argument must be numeric.");
-  static_assert(std::is_arithmetic<Dst>::value, "Result must be numeric.");
-  return DstRangeRelationToSrcRangeImpl<Dst, Src>::Check(value);
-}
-
-// Integer promotion templates used by the portable checked integer arithmetic.
-template <size_t Size, bool IsSigned>
-struct IntegerForDigitsAndSign;
-
-#define INTEGER_FOR_DIGITS_AND_SIGN(I)                          \
-  template <>                                                   \
-  struct IntegerForDigitsAndSign<IntegerBitsPlusSign<I>::value, \
-                                 std::is_signed<I>::value> {    \
-    using type = I;                                             \
-  }
-
-INTEGER_FOR_DIGITS_AND_SIGN(int8_t);
-INTEGER_FOR_DIGITS_AND_SIGN(uint8_t);
-INTEGER_FOR_DIGITS_AND_SIGN(int16_t);
-INTEGER_FOR_DIGITS_AND_SIGN(uint16_t);
-INTEGER_FOR_DIGITS_AND_SIGN(int32_t);
-INTEGER_FOR_DIGITS_AND_SIGN(uint32_t);
-INTEGER_FOR_DIGITS_AND_SIGN(int64_t);
-INTEGER_FOR_DIGITS_AND_SIGN(uint64_t);
-#undef INTEGER_FOR_DIGITS_AND_SIGN
-
-// WARNING: We have no IntegerForSizeAndSign<16, *>. If we ever add one to
-// support 128-bit math, then the ArithmeticPromotion template below will need
-// to be updated (or more likely replaced with a decltype expression).
-static_assert(IntegerBitsPlusSign<intmax_t>::value == 64,
-              "Max integer size not supported for this toolchain.");
-
-template <typename Integer, bool IsSigned = std::is_signed<Integer>::value>
-struct TwiceWiderInteger {
-  using type =
-      typename IntegerForDigitsAndSign<IntegerBitsPlusSign<Integer>::value * 2,
-                                       IsSigned>::type;
-};
-
-template <typename Integer>
-struct PositionOfSignBit {
-  static const size_t value = IntegerBitsPlusSign<Integer>::value - 1;
-};
-
-enum ArithmeticPromotionCategory {
-  LEFT_PROMOTION,  // Use the type of the left-hand argument.
-  RIGHT_PROMOTION  // Use the type of the right-hand argument.
-};
-
-// Determines the type that can represent the largest positive value.
-template <typename Lhs,
-          typename Rhs,
-          ArithmeticPromotionCategory Promotion =
-              (MaxExponent<Lhs>::value > MaxExponent<Rhs>::value)
-                  ? LEFT_PROMOTION
-                  : RIGHT_PROMOTION>
-struct MaxExponentPromotion;
-
-template <typename Lhs, typename Rhs>
-struct MaxExponentPromotion<Lhs, Rhs, LEFT_PROMOTION> {
-  using type = Lhs;
-};
-
-template <typename Lhs, typename Rhs>
-struct MaxExponentPromotion<Lhs, Rhs, RIGHT_PROMOTION> {
-  using type = Rhs;
-};
-
-// Determines the type that can represent the lowest arithmetic value.
-template <typename Lhs,
-          typename Rhs,
-          ArithmeticPromotionCategory Promotion =
-              std::is_signed<Lhs>::value
-                  ? (std::is_signed<Rhs>::value
-                         ? (MaxExponent<Lhs>::value > MaxExponent<Rhs>::value
-                                ? LEFT_PROMOTION
-                                : RIGHT_PROMOTION)
-                         : LEFT_PROMOTION)
-                  : (std::is_signed<Rhs>::value
-                         ? RIGHT_PROMOTION
-                         : (MaxExponent<Lhs>::value < MaxExponent<Rhs>::value
-                                ? LEFT_PROMOTION
-                                : RIGHT_PROMOTION))>
-struct LowestValuePromotion;
-
-template <typename Lhs, typename Rhs>
-struct LowestValuePromotion<Lhs, Rhs, LEFT_PROMOTION> {
-  using type = Lhs;
-};
-
-template <typename Lhs, typename Rhs>
-struct LowestValuePromotion<Lhs, Rhs, RIGHT_PROMOTION> {
-  using type = Rhs;
-};
-
-// Determines the type that is best able to represent an arithmetic result.
-template <
-    typename Lhs,
-    typename Rhs = Lhs,
-    bool is_intmax_type =
-        std::is_integral<typename MaxExponentPromotion<Lhs, Rhs>::type>::value&&
-            IntegerBitsPlusSign<typename MaxExponentPromotion<Lhs, Rhs>::type>::
-                value == IntegerBitsPlusSign<intmax_t>::value,
-    bool is_max_exponent =
-        StaticDstRangeRelationToSrcRange<
-            typename MaxExponentPromotion<Lhs, Rhs>::type,
-            Lhs>::value ==
-        NUMERIC_RANGE_CONTAINED&& StaticDstRangeRelationToSrcRange<
-            typename MaxExponentPromotion<Lhs, Rhs>::type,
-            Rhs>::value == NUMERIC_RANGE_CONTAINED>
-struct BigEnoughPromotion;
-
-// The side with the max exponent is big enough.
-template <typename Lhs, typename Rhs, bool is_intmax_type>
-struct BigEnoughPromotion<Lhs, Rhs, is_intmax_type, true> {
-  using type = typename MaxExponentPromotion<Lhs, Rhs>::type;
-  static const bool is_contained = true;
-};
-
-// We can use a twice wider type to fit.
-template <typename Lhs, typename Rhs>
-struct BigEnoughPromotion<Lhs, Rhs, false, false> {
-  using type =
-      typename TwiceWiderInteger<typename MaxExponentPromotion<Lhs, Rhs>::type,
-                                 std::is_signed<Lhs>::value ||
-                                     std::is_signed<Rhs>::value>::type;
-  static const bool is_contained = true;
-};
-
-// No type is large enough.
-template <typename Lhs, typename Rhs>
-struct BigEnoughPromotion<Lhs, Rhs, true, false> {
-  using type = typename MaxExponentPromotion<Lhs, Rhs>::type;
-  static const bool is_contained = false;
-};
-
-// We can statically check if operations on the provided types can wrap, so we
-// can skip the checked operations if they're not needed. So, for an integer we
-// care if the destination type preserves the sign and is twice the width of
-// the source.
-template <typename T, typename Lhs, typename Rhs>
-struct IsIntegerArithmeticSafe {
-  static const bool value =
-      !std::is_floating_point<T>::value &&
-      StaticDstRangeRelationToSrcRange<T, Lhs>::value ==
-          NUMERIC_RANGE_CONTAINED &&
-      IntegerBitsPlusSign<T>::value >= (2 * IntegerBitsPlusSign<Lhs>::value) &&
-      StaticDstRangeRelationToSrcRange<T, Rhs>::value !=
-          NUMERIC_RANGE_CONTAINED &&
-      IntegerBitsPlusSign<T>::value >= (2 * IntegerBitsPlusSign<Rhs>::value);
-};
-
-// This hacks around libstdc++ 4.6 missing stuff in type_traits.
-#if defined(__GLIBCXX__)
-#define PRIV_GLIBCXX_4_7_0 20120322
-#define PRIV_GLIBCXX_4_5_4 20120702
-#define PRIV_GLIBCXX_4_6_4 20121127
-#if (__GLIBCXX__ < PRIV_GLIBCXX_4_7_0 || __GLIBCXX__ == PRIV_GLIBCXX_4_5_4 || \
-     __GLIBCXX__ == PRIV_GLIBCXX_4_6_4)
-#define PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX
-#undef PRIV_GLIBCXX_4_7_0
-#undef PRIV_GLIBCXX_4_5_4
-#undef PRIV_GLIBCXX_4_6_4
-#endif
-#endif
-
-// Extracts the underlying type from an enum.
-template <typename T, bool is_enum = std::is_enum<T>::value>
-struct ArithmeticOrUnderlyingEnum;
-
-template <typename T>
-struct ArithmeticOrUnderlyingEnum<T, true> {
-#if defined(PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX)
-  using type = __underlying_type(T);
-#else
-  using type = typename std::underlying_type<T>::type;
-#endif
-  static const bool value = std::is_arithmetic<type>::value;
-};
-
-#if defined(PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX)
-#undef PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX
-#endif
-
-template <typename T>
-struct ArithmeticOrUnderlyingEnum<T, false> {
-  using type = T;
-  static const bool value = std::is_arithmetic<type>::value;
-};
-
-// The following are helper templates used in the CheckedNumeric class.
-template <typename T>
-class CheckedNumeric;
-
-template <typename T>
-class StrictNumeric;
-
-// Used to treat CheckedNumeric and arithmetic underlying types the same.
-template <typename T>
-struct UnderlyingType {
-  using type = typename ArithmeticOrUnderlyingEnum<T>::type;
-  static const bool is_numeric = std::is_arithmetic<type>::value;
-  static const bool is_checked = false;
-  static const bool is_strict = false;
-};
-
-template <typename T>
-struct UnderlyingType<CheckedNumeric<T>> {
-  using type = T;
-  static const bool is_numeric = true;
-  static const bool is_checked = true;
-  static const bool is_strict = false;
-};
-
-template <typename T>
-struct UnderlyingType<StrictNumeric<T>> {
-  using type = T;
-  static const bool is_numeric = true;
-  static const bool is_checked = false;
-  static const bool is_strict = true;
-};
-
-template <typename L, typename R>
-struct IsCheckedOp {
-  static const bool value =
-      UnderlyingType<L>::is_numeric && UnderlyingType<R>::is_numeric &&
-      (UnderlyingType<L>::is_checked || UnderlyingType<R>::is_checked);
-};
-
-template <typename L, typename R>
-struct IsStrictOp {
-  static const bool value =
-      UnderlyingType<L>::is_numeric && UnderlyingType<R>::is_numeric &&
-      (UnderlyingType<L>::is_strict || UnderlyingType<R>::is_strict);
-};
-
-template <typename L, typename R>
-constexpr bool IsLessImpl(const L lhs,
-                          const R rhs,
-                          const RangeConstraint l_range,
-                          const RangeConstraint r_range) {
-  return l_range == RANGE_UNDERFLOW || r_range == RANGE_OVERFLOW ||
-         (l_range == r_range &&
-          static_cast<decltype(lhs + rhs)>(lhs) <
-              static_cast<decltype(lhs + rhs)>(rhs));
-}
-
-template <typename L, typename R>
-struct IsLess {
-  static_assert(std::is_arithmetic<L>::value && std::is_arithmetic<R>::value,
-                "Types must be numeric.");
-  static constexpr bool Test(const L lhs, const R rhs) {
-    return IsLessImpl(lhs, rhs, DstRangeRelationToSrcRange<R>(lhs),
-                      DstRangeRelationToSrcRange<L>(rhs));
-  }
-};
-
-template <typename L, typename R>
-constexpr bool IsLessOrEqualImpl(const L lhs,
-                                 const R rhs,
-                                 const RangeConstraint l_range,
-                                 const RangeConstraint r_range) {
-  return l_range == RANGE_UNDERFLOW || r_range == RANGE_OVERFLOW ||
-         (l_range == r_range &&
-          static_cast<decltype(lhs + rhs)>(lhs) <=
-              static_cast<decltype(lhs + rhs)>(rhs));
-}
-
-template <typename L, typename R>
-struct IsLessOrEqual {
-  static_assert(std::is_arithmetic<L>::value && std::is_arithmetic<R>::value,
-                "Types must be numeric.");
-  static constexpr bool Test(const L lhs, const R rhs) {
-    return IsLessOrEqualImpl(lhs, rhs, DstRangeRelationToSrcRange<R>(lhs),
-                             DstRangeRelationToSrcRange<L>(rhs));
-  }
-};
-
-template <typename L, typename R>
-constexpr bool IsGreaterImpl(const L lhs,
-                             const R rhs,
-                             const RangeConstraint l_range,
-                             const RangeConstraint r_range) {
-  return l_range == RANGE_OVERFLOW || r_range == RANGE_UNDERFLOW ||
-         (l_range == r_range &&
-          static_cast<decltype(lhs + rhs)>(lhs) >
-              static_cast<decltype(lhs + rhs)>(rhs));
-}
-
-template <typename L, typename R>
-struct IsGreater {
-  static_assert(std::is_arithmetic<L>::value && std::is_arithmetic<R>::value,
-                "Types must be numeric.");
-  static constexpr bool Test(const L lhs, const R rhs) {
-    return IsGreaterImpl(lhs, rhs, DstRangeRelationToSrcRange<R>(lhs),
-                         DstRangeRelationToSrcRange<L>(rhs));
-  }
-};
-
-template <typename L, typename R>
-constexpr bool IsGreaterOrEqualImpl(const L lhs,
-                                    const R rhs,
-                                    const RangeConstraint l_range,
-                                    const RangeConstraint r_range) {
-  return l_range == RANGE_OVERFLOW || r_range == RANGE_UNDERFLOW ||
-         (l_range == r_range &&
-          static_cast<decltype(lhs + rhs)>(lhs) >=
-              static_cast<decltype(lhs + rhs)>(rhs));
-}
-
-template <typename L, typename R>
-struct IsGreaterOrEqual {
-  static_assert(std::is_arithmetic<L>::value && std::is_arithmetic<R>::value,
-                "Types must be numeric.");
-  static constexpr bool Test(const L lhs, const R rhs) {
-    return IsGreaterOrEqualImpl(lhs, rhs, DstRangeRelationToSrcRange<R>(lhs),
-                                DstRangeRelationToSrcRange<L>(rhs));
-  }
-};
-
-template <typename L, typename R>
-struct IsEqual {
-  static_assert(std::is_arithmetic<L>::value && std::is_arithmetic<R>::value,
-                "Types must be numeric.");
-  static constexpr bool Test(const L lhs, const R rhs) {
-    return DstRangeRelationToSrcRange<R>(lhs) ==
-               DstRangeRelationToSrcRange<L>(rhs) &&
-           static_cast<decltype(lhs + rhs)>(lhs) ==
-               static_cast<decltype(lhs + rhs)>(rhs);
-  }
-};
-
-template <typename L, typename R>
-struct IsNotEqual {
-  static_assert(std::is_arithmetic<L>::value && std::is_arithmetic<R>::value,
-                "Types must be numeric.");
-  static constexpr bool Test(const L lhs, const R rhs) {
-    return DstRangeRelationToSrcRange<R>(lhs) !=
-               DstRangeRelationToSrcRange<L>(rhs) ||
-           static_cast<decltype(lhs + rhs)>(lhs) !=
-               static_cast<decltype(lhs + rhs)>(rhs);
-  }
-};
-
-// These perform the actual math operations on the CheckedNumerics.
-// Binary arithmetic operations.
-template <template <typename, typename> class C, typename L, typename R>
-constexpr bool SafeCompare(const L lhs, const R rhs) {
-  static_assert(std::is_arithmetic<L>::value && std::is_arithmetic<R>::value,
-                "Types must be numeric.");
-  using Promotion = BigEnoughPromotion<L, R>;
-  using BigType = typename Promotion::type;
-  return Promotion::is_contained
-             // Force to a larger type for speed if both are contained.
-             ? C<BigType, BigType>::Test(
-                   static_cast<BigType>(static_cast<L>(lhs)),
-                   static_cast<BigType>(static_cast<R>(rhs)))
-             // Let the template functions figure it out for mixed types.
-             : C<L, R>::Test(lhs, rhs);
-};
-
-}  // namespace internal
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_math.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_math.h
deleted file mode 100644
index a81c8f3c4f..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_math.h
+++ /dev/null
@@ -1,509 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_NUMERICS_SAFE_MATH_H_
-#define MINI_CHROMIUM_BASE_NUMERICS_SAFE_MATH_H_
-
-#include <stddef.h>
-
-#include <limits>
-#include <type_traits>
-
-#include "base/numerics/safe_math_impl.h"
-
-namespace base {
-namespace internal {
-
-// CheckedNumeric<> implements all the logic and operators for detecting integer
-// boundary conditions such as overflow, underflow, and invalid conversions.
-// The CheckedNumeric type implicitly converts from floating point and integer
-// data types, and contains overloads for basic arithmetic operations (i.e.: +,
-// -, *, / for all types and %, <<, >>, &, |, ^ for integers). Type promotions
-// are a slightly modified version of the standard C arithmetic rules with the
-// two differences being that there is no default promotion to int and bitwise
-// logical operations always return an unsigned of the wider type.
-//
-// You may also use one of the variadic convenience functions, which accept
-// standard arithmetic or CheckedNumeric types, perform arithmetic operations,
-// and return a CheckedNumeric result. The supported functions are:
-//  CheckAdd() - Addition.
-//  CheckSub() - Subtraction.
-//  CheckMul() - Multiplication.
-//  CheckDiv() - Division.
-//  CheckMod() - Modulous (integer only).
-//  CheckLsh() - Left integer shift (integer only).
-//  CheckRsh() - Right integer shift (integer only).
-//  CheckAnd() - Bitwise AND (integer only with unsigned result).
-//  CheckOr()  - Bitwise OR (integer only with unsigned result).
-//  CheckXor() - Bitwise XOR (integer only with unsigned result).
-//  CheckMax() - Maximum of supplied arguments.
-//  CheckMin() - Minimum of supplied arguments.
-//
-// The unary negation, increment, and decrement operators are supported, along
-// with the following unary arithmetic methods, which return a new
-// CheckedNumeric as a result of the operation:
-//  Abs() - Absolute value.
-//  UnsignedAbs() - Absolute value as an equal-width unsigned underlying type
-//          (valid for only integral types).
-//  Max() - Returns whichever is greater of the current instance or argument.
-//          The underlying return type is whichever has the greatest magnitude.
-//  Min() - Returns whichever is lowest of the current instance or argument.
-//          The underlying return type is whichever has can represent the lowest
-//          number in the smallest width (e.g. int8_t over unsigned, int over
-//          int8_t, and float over int).
-//
-// The following methods convert from CheckedNumeric to standard numeric values:
-//  AssignIfValid() - Assigns the underlying value to the supplied destination
-//          pointer if the value is currently valid and within the range
-//          supported by the destination type. Returns true on success.
-//  ****************************************************************************
-//  *  WARNING: All of the following functions return a StrictNumeric, which   *
-//  *  is valid for comparison and assignment operations, but will trigger a   *
-//  *  compile failure on attempts to assign to a type of insufficient range.  *
-//  ****************************************************************************
-//  IsValid() - Returns true if the underlying numeric value is valid (i.e. has
-//          has not wrapped and is not the result of an invalid conversion).
-//  ValueOrDie() - Returns the underlying value. If the state is not valid this
-//          call will crash on a CHECK.
-//  ValueOrDefault() - Returns the current value, or the supplied default if the
-//          state is not valid (will not trigger a CHECK).
-//
-// The following wrapper functions can be used to avoid the template
-// disambiguator syntax when converting a destination type.
-//   IsValidForType<>() in place of: a.template IsValid<Dst>()
-//   ValueOrDieForType<>() in place of: a.template ValueOrDie()
-//   ValueOrDefaultForType<>() in place of: a.template ValueOrDefault(default)
-//
-// The following are general utility methods that are useful for converting
-// between arithmetic types and CheckedNumeric types:
-//  CheckedNumeric::Cast<Dst>() - Instance method returning a CheckedNumeric
-//          derived from casting the current instance to a CheckedNumeric of
-//          the supplied destination type.
-//  MakeCheckedNum() - Creates a new CheckedNumeric from the underlying type of
-//          the supplied arithmetic, CheckedNumeric, or StrictNumeric type.
-//
-// Comparison operations are explicitly not supported because they could result
-// in a crash on an unexpected CHECK condition. You should use patterns like the
-// following for comparisons:
-//   CheckedNumeric<size_t> checked_size = untrusted_input_value;
-//   checked_size += HEADER LENGTH;
-//   if (checked_size.IsValid() && checked_size.ValueOrDie() < buffer_size)
-//     Do stuff...
-
-template <typename T>
-class CheckedNumeric {
-  static_assert(std::is_arithmetic<T>::value,
-                "CheckedNumeric<T>: T must be a numeric type.");
-
- public:
-  using type = T;
-
-  constexpr CheckedNumeric() {}
-
-  // Copy constructor.
-  template <typename Src>
-  constexpr CheckedNumeric(const CheckedNumeric<Src>& rhs)
-      : state_(rhs.state_.value(), rhs.IsValid()) {}
-
-  template <typename Src>
-  friend class CheckedNumeric;
-
-  // This is not an explicit constructor because we implicitly upgrade regular
-  // numerics to CheckedNumerics to make them easier to use.
-  template <typename Src>
-  constexpr CheckedNumeric(Src value)  // NOLINT(runtime/explicit)
-      : state_(value) {
-    static_assert(std::is_arithmetic<Src>::value, "Argument must be numeric.");
-  }
-
-  // This is not an explicit constructor because we want a seamless conversion
-  // from StrictNumeric types.
-  template <typename Src>
-  constexpr CheckedNumeric(
-      StrictNumeric<Src> value)  // NOLINT(runtime/explicit)
-      : state_(static_cast<Src>(value)) {}
-
-  // IsValid() - The public API to test if a CheckedNumeric is currently valid.
-  // A range checked destination type can be supplied using the Dst template
-  // parameter.
-  template <typename Dst = T>
-  constexpr bool IsValid() const {
-    return state_.is_valid() &&
-           IsValueInRangeForNumericType<Dst>(state_.value());
-  }
-
-  // AssignIfValid(Dst) - Assigns the underlying value if it is currently valid
-  // and is within the range supported by the destination type. Returns true if
-  // successful and false otherwise.
-  template <typename Dst>
-  constexpr bool AssignIfValid(Dst* result) const {
-    return IsValid<Dst>() ? ((*result = static_cast<Dst>(state_.value())), true)
-                          : false;
-  }
-
-  // ValueOrDie() - The primary accessor for the underlying value. If the
-  // current state is not valid it will CHECK and crash.
-  // A range checked destination type can be supplied using the Dst template
-  // parameter, which will trigger a CHECK if the value is not in bounds for
-  // the destination.
-  // The CHECK behavior can be overridden by supplying a handler as a
-  // template parameter, for test code, etc. However, the handler cannot access
-  // the underlying value, and it is not available through other means.
-  template <typename Dst = T, class CheckHandler = CheckOnFailure>
-  constexpr StrictNumeric<Dst> ValueOrDie() const {
-    return IsValid<Dst>() ? static_cast<Dst>(state_.value())
-                          : CheckHandler::template HandleFailure<Dst>();
-  }
-
-  // ValueOrDefault(T default_value) - A convenience method that returns the
-  // current value if the state is valid, and the supplied default_value for
-  // any other state.
-  // A range checked destination type can be supplied using the Dst template
-  // parameter. WARNING: This function may fail to compile or CHECK at runtime
-  // if the supplied default_value is not within range of the destination type.
-  template <typename Dst = T, typename Src>
-  constexpr StrictNumeric<Dst> ValueOrDefault(const Src default_value) const {
-    return IsValid<Dst>() ? static_cast<Dst>(state_.value())
-                          : checked_cast<Dst>(default_value);
-  }
-
-  // Returns a checked numeric of the specified type, cast from the current
-  // CheckedNumeric. If the current state is invalid or the destination cannot
-  // represent the result then the returned CheckedNumeric will be invalid.
-  template <typename Dst>
-  constexpr CheckedNumeric<typename UnderlyingType<Dst>::type> Cast() const {
-    return *this;
-  }
-
-  // This friend method is available solely for providing more detailed logging
-  // in the the tests. Do not implement it in production code, because the
-  // underlying values may change at any time.
-  template <typename U>
-  friend U GetNumericValueForTest(const CheckedNumeric<U>& src);
-
-  // Prototypes for the supported arithmetic operator overloads.
-  template <typename Src>
-  CheckedNumeric& operator+=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator-=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator*=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator/=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator%=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator<<=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator>>=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator&=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator|=(const Src rhs);
-  template <typename Src>
-  CheckedNumeric& operator^=(const Src rhs);
-
-  CheckedNumeric operator-() const {
-    // Negation is always valid for floating point.
-    T value = 0;
-    bool is_valid = (std::is_floating_point<T>::value || IsValid()) &&
-                    CheckedNeg(state_.value(), &value);
-    return CheckedNumeric<T>(value, is_valid);
-  }
-
-  CheckedNumeric operator~() const {
-    static_assert(!std::is_signed<T>::value, "Type must be unsigned.");
-    T value = 0;
-    bool is_valid = IsValid() && CheckedInv(state_.value(), &value);
-    return CheckedNumeric<T>(value, is_valid);
-  }
-
-  CheckedNumeric Abs() const {
-    // Absolute value is always valid for floating point.
-    T value = 0;
-    bool is_valid = (std::is_floating_point<T>::value || IsValid()) &&
-                    CheckedAbs(state_.value(), &value);
-    return CheckedNumeric<T>(value, is_valid);
-  }
-
-  template <typename U>
-  constexpr CheckedNumeric<typename MathWrapper<CheckedMaxOp, T, U>::type> Max(
-      const U rhs) const {
-    using R = typename UnderlyingType<U>::type;
-    using result_type = typename MathWrapper<CheckedMaxOp, T, U>::type;
-    // TODO(jschuh): This can be converted to the MathOp version and remain
-    // constexpr once we have C++14 support.
-    return CheckedNumeric<result_type>(
-        static_cast<result_type>(
-            IsGreater<T, R>::Test(state_.value(), Wrapper<U>::value(rhs))
-                ? state_.value()
-                : Wrapper<U>::value(rhs)),
-        state_.is_valid() && Wrapper<U>::is_valid(rhs));
-  }
-
-  template <typename U>
-  constexpr CheckedNumeric<typename MathWrapper<CheckedMinOp, T, U>::type> Min(
-      const U rhs) const {
-    using R = typename UnderlyingType<U>::type;
-    using result_type = typename MathWrapper<CheckedMinOp, T, U>::type;
-    // TODO(jschuh): This can be converted to the MathOp version and remain
-    // constexpr once we have C++14 support.
-    return CheckedNumeric<result_type>(
-        static_cast<result_type>(
-            IsLess<T, R>::Test(state_.value(), Wrapper<U>::value(rhs))
-                ? state_.value()
-                : Wrapper<U>::value(rhs)),
-        state_.is_valid() && Wrapper<U>::is_valid(rhs));
-  }
-
-  // This function is available only for integral types. It returns an unsigned
-  // integer of the same width as the source type, containing the absolute value
-  // of the source, and properly handling signed min.
-  constexpr CheckedNumeric<typename UnsignedOrFloatForSize<T>::type>
-  UnsignedAbs() const {
-    return CheckedNumeric<typename UnsignedOrFloatForSize<T>::type>(
-        SafeUnsignedAbs(state_.value()), state_.is_valid());
-  }
-
-  CheckedNumeric& operator++() {
-    *this += 1;
-    return *this;
-  }
-
-  CheckedNumeric operator++(int) {
-    CheckedNumeric value = *this;
-    *this += 1;
-    return value;
-  }
-
-  CheckedNumeric& operator--() {
-    *this -= 1;
-    return *this;
-  }
-
-  CheckedNumeric operator--(int) {
-    CheckedNumeric value = *this;
-    *this -= 1;
-    return value;
-  }
-
-  // These perform the actual math operations on the CheckedNumerics.
-  // Binary arithmetic operations.
-  template <template <typename, typename, typename> class M,
-            typename L,
-            typename R>
-  static CheckedNumeric MathOp(const L lhs, const R rhs) {
-    using Math = typename MathWrapper<M, L, R>::math;
-    T result = 0;
-    bool is_valid =
-        Wrapper<L>::is_valid(lhs) && Wrapper<R>::is_valid(rhs) &&
-        Math::Do(Wrapper<L>::value(lhs), Wrapper<R>::value(rhs), &result);
-    return CheckedNumeric<T>(result, is_valid);
-  };
-
-  // Assignment arithmetic operations.
-  template <template <typename, typename, typename> class M, typename R>
-  CheckedNumeric& MathOp(const R rhs) {
-    using Math = typename MathWrapper<M, T, R>::math;
-    T result = 0;  // Using T as the destination saves a range check.
-    bool is_valid = state_.is_valid() && Wrapper<R>::is_valid(rhs) &&
-                    Math::Do(state_.value(), Wrapper<R>::value(rhs), &result);
-    *this = CheckedNumeric<T>(result, is_valid);
-    return *this;
-  };
-
- private:
-  CheckedNumericState<T> state_;
-
-  template <typename Src>
-  constexpr CheckedNumeric(Src value, bool is_valid)
-      : state_(value, is_valid) {}
-
-  // These wrappers allow us to handle state the same way for both
-  // CheckedNumeric and POD arithmetic types.
-  template <typename Src>
-  struct Wrapper {
-    static constexpr bool is_valid(Src) { return true; }
-    static constexpr Src value(Src value) { return value; }
-  };
-
-  template <typename Src>
-  struct Wrapper<CheckedNumeric<Src>> {
-    static constexpr bool is_valid(const CheckedNumeric<Src> v) {
-      return v.IsValid();
-    }
-    static constexpr Src value(const CheckedNumeric<Src> v) {
-      return v.state_.value();
-    }
-  };
-
-  template <typename Src>
-  struct Wrapper<StrictNumeric<Src>> {
-    static constexpr bool is_valid(const StrictNumeric<Src>) { return true; }
-    static constexpr Src value(const StrictNumeric<Src> v) {
-      return static_cast<Src>(v);
-    }
-  };
-};
-
-// Convenience functions to avoid the ugly template disambiguator syntax.
-template <typename Dst, typename Src>
-constexpr bool IsValidForType(const CheckedNumeric<Src> value) {
-  return value.template IsValid<Dst>();
-}
-
-template <typename Dst, typename Src>
-constexpr StrictNumeric<Dst> ValueOrDieForType(
-    const CheckedNumeric<Src> value) {
-  return value.template ValueOrDie<Dst>();
-}
-
-template <typename Dst, typename Src, typename Default>
-constexpr StrictNumeric<Dst> ValueOrDefaultForType(
-    const CheckedNumeric<Src> value,
-    const Default default_value) {
-  return value.template ValueOrDefault<Dst>(default_value);
-}
-
-// These variadic templates work out the return types.
-// TODO(jschuh): Rip all this out once we have C++14 non-trailing auto support.
-template <template <typename, typename, typename> class M,
-          typename L,
-          typename R,
-          typename... Args>
-struct ResultType;
-
-template <template <typename, typename, typename> class M,
-          typename L,
-          typename R>
-struct ResultType<M, L, R> {
-  using type = typename MathWrapper<M, L, R>::type;
-};
-
-template <template <typename, typename, typename> class M,
-          typename L,
-          typename R,
-          typename... Args>
-struct ResultType {
-  using type =
-      typename ResultType<M, typename ResultType<M, L, R>::type, Args...>::type;
-};
-
-// Convience wrapper to return a new CheckedNumeric from the provided arithmetic
-// or CheckedNumericType.
-template <typename T>
-constexpr CheckedNumeric<typename UnderlyingType<T>::type> MakeCheckedNum(
-    const T value) {
-  return value;
-}
-
-// These implement the variadic wrapper for the math operations.
-template <template <typename, typename, typename> class M,
-          typename L,
-          typename R>
-CheckedNumeric<typename MathWrapper<M, L, R>::type> ChkMathOp(const L lhs,
-                                                              const R rhs) {
-  using Math = typename MathWrapper<M, L, R>::math;
-  return CheckedNumeric<typename Math::result_type>::template MathOp<M>(lhs,
-                                                                        rhs);
-}
-
-// General purpose wrapper template for arithmetic operations.
-template <template <typename, typename, typename> class M,
-          typename L,
-          typename R,
-          typename... Args>
-CheckedNumeric<typename ResultType<M, L, R, Args...>::type>
-ChkMathOp(const L lhs, const R rhs, const Args... args) {
-  auto tmp = ChkMathOp<M>(lhs, rhs);
-  return tmp.IsValid() ? ChkMathOp<M>(tmp, args...)
-                       : decltype(ChkMathOp<M>(tmp, args...))(tmp);
-};
-
-// The following macros are just boilerplate for the standard arithmetic
-// operator overloads and variadic function templates. A macro isn't the nicest
-// solution, but it beats rewriting these over and over again.
-#define BASE_NUMERIC_ARITHMETIC_VARIADIC(NAME)                                \
-  template <typename L, typename R, typename... Args>                         \
-  CheckedNumeric<typename ResultType<Checked##NAME##Op, L, R, Args...>::type> \
-      Check##NAME(const L lhs, const R rhs, const Args... args) {             \
-    return ChkMathOp<Checked##NAME##Op, L, R, Args...>(lhs, rhs, args...);    \
-  }
-
-#define BASE_NUMERIC_ARITHMETIC_OPERATORS(NAME, OP, COMPOUND_OP)               \
-  /* Binary arithmetic operator for all CheckedNumeric operations. */          \
-  template <typename L, typename R,                                            \
-            typename std::enable_if<IsCheckedOp<L, R>::value>::type* =         \
-                nullptr>                                                       \
-  CheckedNumeric<typename MathWrapper<Checked##NAME##Op, L, R>::type>          \
-  operator OP(const L lhs, const R rhs) {                                      \
-    return decltype(lhs OP rhs)::template MathOp<Checked##NAME##Op>(lhs, rhs); \
-  }                                                                            \
-  /* Assignment arithmetic operator implementation from CheckedNumeric. */     \
-  template <typename L>                                                        \
-  template <typename R>                                                        \
-  CheckedNumeric<L>& CheckedNumeric<L>::operator COMPOUND_OP(const R rhs) {    \
-    return MathOp<Checked##NAME##Op>(rhs);                                     \
-  }                                                                            \
-  /* Variadic arithmetic functions that return CheckedNumeric. */              \
-  BASE_NUMERIC_ARITHMETIC_VARIADIC(NAME)
-
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Add, +, +=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Sub, -, -=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Mul, *, *=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Div, /, /=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Mod, %, %=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Lsh, <<, <<=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Rsh, >>, >>=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(And, &, &=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Or, |, |=)
-BASE_NUMERIC_ARITHMETIC_OPERATORS(Xor, ^, ^=)
-BASE_NUMERIC_ARITHMETIC_VARIADIC(Max)
-BASE_NUMERIC_ARITHMETIC_VARIADIC(Min)
-
-#undef BASE_NUMERIC_ARITHMETIC_VARIADIC
-#undef BASE_NUMERIC_ARITHMETIC_OPERATORS
-
-// These are some extra StrictNumeric operators to support simple pointer
-// arithmetic with our result types. Since wrapping on a pointer is always
-// bad, we trigger the CHECK condition here.
-template <typename L, typename R>
-L* operator+(L* lhs, const StrictNumeric<R> rhs) {
-  uintptr_t result = CheckAdd(reinterpret_cast<uintptr_t>(lhs),
-                              CheckMul(sizeof(L), static_cast<R>(rhs)))
-                         .template ValueOrDie<uintptr_t>();
-  return reinterpret_cast<L*>(result);
-}
-
-template <typename L, typename R>
-L* operator-(L* lhs, const StrictNumeric<R> rhs) {
-  uintptr_t result = CheckSub(reinterpret_cast<uintptr_t>(lhs),
-                              CheckMul(sizeof(L), static_cast<R>(rhs)))
-                         .template ValueOrDie<uintptr_t>();
-  return reinterpret_cast<L*>(result);
-}
-
-}  // namespace internal
-
-using internal::CheckedNumeric;
-using internal::IsValidForType;
-using internal::ValueOrDieForType;
-using internal::ValueOrDefaultForType;
-using internal::MakeCheckedNum;
-using internal::CheckMax;
-using internal::CheckMin;
-using internal::CheckAdd;
-using internal::CheckSub;
-using internal::CheckMul;
-using internal::CheckDiv;
-using internal::CheckMod;
-using internal::CheckLsh;
-using internal::CheckRsh;
-using internal::CheckAnd;
-using internal::CheckOr;
-using internal::CheckXor;
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_NUMERICS_SAFE_MATH_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_impl.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_impl.h
deleted file mode 100644
index 76f581a371..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_impl.h
+++ /dev/null
@@ -1,739 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_NUMERICS_SAFE_MATH_IMPL_H_
-#define MINI_CHROMIUM_BASE_NUMERICS_SAFE_MATH_IMPL_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <climits>
-#include <cmath>
-#include <cstdlib>
-#include <limits>
-#include <type_traits>
-
-#include "base/numerics/safe_conversions.h"
-
-namespace base {
-namespace internal {
-
-// Everything from here up to the floating point operations is portable C++,
-// but it may not be fast. This code could be split based on
-// platform/architecture and replaced with potentially faster implementations.
-
-// This is used for UnsignedAbs, where we need to support floating-point
-// template instantiations even though we don't actually support the operations.
-// However, there is no corresponding implementation of e.g. SafeUnsignedAbs,
-// so the float versions will not compile.
-template <typename Numeric,
-          bool IsInteger = std::is_integral<Numeric>::value,
-          bool IsFloat = std::is_floating_point<Numeric>::value>
-struct UnsignedOrFloatForSize;
-
-template <typename Numeric>
-struct UnsignedOrFloatForSize<Numeric, true, false> {
-  using type = typename std::make_unsigned<Numeric>::type;
-};
-
-template <typename Numeric>
-struct UnsignedOrFloatForSize<Numeric, false, true> {
-  using type = Numeric;
-};
-
-// Helper templates for integer manipulations.
-
-template <typename T>
-constexpr bool HasSignBit(T x) {
-  // Cast to unsigned since right shift on signed is undefined.
-  return !!(static_cast<typename std::make_unsigned<T>::type>(x) >>
-            PositionOfSignBit<T>::value);
-}
-
-// This wrapper undoes the standard integer promotions.
-template <typename T>
-constexpr T BinaryComplement(T x) {
-  return static_cast<T>(~x);
-}
-
-// Probe for builtin math overflow support on Clang and version check on GCC.
-#if defined(__has_builtin)
-#define USE_OVERFLOW_BUILTINS (__has_builtin(__builtin_add_overflow))
-#elif defined(__GNUC__)
-#define USE_OVERFLOW_BUILTINS (__GNUC__ >= 5)
-#else
-#define USE_OVERFLOW_BUILTINS (0)
-#endif
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
-bool CheckedAddImpl(T x, T y, T* result) {
-  // Since the value of x+y is undefined if we have a signed type, we compute
-  // it using the unsigned type of the same size.
-  using UnsignedDst = typename std::make_unsigned<T>::type;
-  UnsignedDst ux = static_cast<UnsignedDst>(x);
-  UnsignedDst uy = static_cast<UnsignedDst>(y);
-  UnsignedDst uresult = static_cast<UnsignedDst>(ux + uy);
-  *result = static_cast<T>(uresult);
-  // Addition is valid if the sign of (x + y) is equal to either that of x or
-  // that of y.
-  return (std::is_signed<T>::value)
-             ? HasSignBit(BinaryComplement(
-                   static_cast<UnsignedDst>((uresult ^ ux) & (uresult ^ uy))))
-             : (BinaryComplement(x) >=
-                y);  // Unsigned is either valid or underflow.
-}
-
-template <typename T, typename U, class Enable = void>
-struct CheckedAddOp {};
-
-template <typename T, typename U>
-struct CheckedAddOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = typename MaxExponentPromotion<T, U>::type;
-  template <typename V>
-  static bool Do(T x, U y, V* result) {
-#if USE_OVERFLOW_BUILTINS
-    return !__builtin_add_overflow(x, y, result);
-#else
-    using Promotion = typename BigEnoughPromotion<T, U>::type;
-    Promotion presult;
-    // Fail if either operand is out of range for the promoted type.
-    // TODO(jschuh): This could be made to work for a broader range of values.
-    bool is_valid = IsValueInRangeForNumericType<Promotion>(x) &&
-                    IsValueInRangeForNumericType<Promotion>(y);
-
-    if (IsIntegerArithmeticSafe<Promotion, T, U>::value) {
-      presult = static_cast<Promotion>(x) + static_cast<Promotion>(y);
-    } else {
-      is_valid &= CheckedAddImpl(static_cast<Promotion>(x),
-                                 static_cast<Promotion>(y), &presult);
-    }
-    *result = static_cast<V>(presult);
-    return is_valid && IsValueInRangeForNumericType<V>(presult);
-#endif
-  }
-};
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
-bool CheckedSubImpl(T x, T y, T* result) {
-  // Since the value of x+y is undefined if we have a signed type, we compute
-  // it using the unsigned type of the same size.
-  using UnsignedDst = typename std::make_unsigned<T>::type;
-  UnsignedDst ux = static_cast<UnsignedDst>(x);
-  UnsignedDst uy = static_cast<UnsignedDst>(y);
-  UnsignedDst uresult = static_cast<UnsignedDst>(ux - uy);
-  *result = static_cast<T>(uresult);
-  // Subtraction is valid if either x and y have same sign, or (x-y) and x have
-  // the same sign.
-  return (std::is_signed<T>::value)
-             ? HasSignBit(BinaryComplement(
-                   static_cast<UnsignedDst>((uresult ^ ux) & (ux ^ uy))))
-             : (x >= y);
-}
-
-template <typename T, typename U, class Enable = void>
-struct CheckedSubOp {};
-
-template <typename T, typename U>
-struct CheckedSubOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = typename MaxExponentPromotion<T, U>::type;
-  template <typename V>
-  static bool Do(T x, U y, V* result) {
-#if USE_OVERFLOW_BUILTINS
-    return !__builtin_sub_overflow(x, y, result);
-#else
-    using Promotion = typename BigEnoughPromotion<T, U>::type;
-    Promotion presult;
-    // Fail if either operand is out of range for the promoted type.
-    // TODO(jschuh): This could be made to work for a broader range of values.
-    bool is_valid = IsValueInRangeForNumericType<Promotion>(x) &&
-                    IsValueInRangeForNumericType<Promotion>(y);
-
-    if (IsIntegerArithmeticSafe<Promotion, T, U>::value) {
-      presult = static_cast<Promotion>(x) - static_cast<Promotion>(y);
-    } else {
-      is_valid &= CheckedSubImpl(static_cast<Promotion>(x),
-                                 static_cast<Promotion>(y), &presult);
-    }
-    *result = static_cast<V>(presult);
-    return is_valid && IsValueInRangeForNumericType<V>(presult);
-#endif
-  }
-};
-
-// Integer multiplication is a bit complicated. In the fast case we just
-// we just promote to a twice wider type, and range check the result. In the
-// slow case we need to manually check that the result won't be truncated by
-// checking with division against the appropriate bound.
-template <typename T,
-          typename std::enable_if<
-              std::is_integral<T>::value &&
-              ((IntegerBitsPlusSign<T>::value * 2) <=
-               IntegerBitsPlusSign<intmax_t>::value)>::type* = nullptr>
-bool CheckedMulImpl(T x, T y, T* result) {
-  using IntermediateType = typename TwiceWiderInteger<T>::type;
-  IntermediateType tmp =
-      static_cast<IntermediateType>(x) * static_cast<IntermediateType>(y);
-  *result = static_cast<T>(tmp);
-  return DstRangeRelationToSrcRange<T>(tmp) == RANGE_VALID;
-}
-
-template <typename T,
-          typename std::enable_if<
-              std::is_integral<T>::value && std::is_signed<T>::value &&
-              ((IntegerBitsPlusSign<T>::value * 2) >
-               IntegerBitsPlusSign<intmax_t>::value)>::type* = nullptr>
-bool CheckedMulImpl(T x, T y, T* result) {
-  if (x && y) {
-    if (x > 0) {
-      if (y > 0) {
-        if (x > std::numeric_limits<T>::max() / y)
-          return false;
-      } else {
-        if (y < std::numeric_limits<T>::lowest() / x)
-          return false;
-      }
-    } else {
-      if (y > 0) {
-        if (x < std::numeric_limits<T>::lowest() / y)
-          return false;
-      } else {
-        if (y < std::numeric_limits<T>::max() / x)
-          return false;
-      }
-    }
-  }
-  *result = x * y;
-  return true;
-}
-
-template <typename T,
-          typename std::enable_if<
-              std::is_integral<T>::value && !std::is_signed<T>::value &&
-              ((IntegerBitsPlusSign<T>::value * 2) >
-               IntegerBitsPlusSign<uintmax_t>::value)>::type* = nullptr>
-bool CheckedMulImpl(T x, T y, T* result) {
-  *result = x * y;
-  return (y == 0 || x <= std::numeric_limits<T>::max() / y);
-}
-
-template <typename T, typename U, class Enable = void>
-struct CheckedMulOp {};
-
-template <typename T, typename U>
-struct CheckedMulOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = typename MaxExponentPromotion<T, U>::type;
-  template <typename V>
-  static bool Do(T x, U y, V* result) {
-#if USE_OVERFLOW_BUILTINS
-#if defined(__clang__)
-    // TODO(jschuh): Get the Clang runtime library issues sorted out so we can
-    // support full-width, mixed-sign multiply builtins.
-    // https://crbug.com/613003
-    static const bool kUseMaxInt =
-        // Narrower type than uintptr_t is always safe.
-        std::numeric_limits<__typeof__(x * y)>::digits <
-            std::numeric_limits<intptr_t>::digits ||
-        // Safe for intptr_t and uintptr_t if the sign matches.
-        (IntegerBitsPlusSign<__typeof__(x * y)>::value ==
-             IntegerBitsPlusSign<intptr_t>::value &&
-         std::is_signed<T>::value == std::is_signed<U>::value);
-#else
-    static const bool kUseMaxInt = true;
-#endif
-    if (kUseMaxInt)
-      return !__builtin_mul_overflow(x, y, result);
-#endif
-    using Promotion = typename BigEnoughPromotion<T, U>::type;
-    Promotion presult;
-    // Fail if either operand is out of range for the promoted type.
-    // TODO(jschuh): This could be made to work for a broader range of values.
-    bool is_valid = IsValueInRangeForNumericType<Promotion>(x) &&
-                    IsValueInRangeForNumericType<Promotion>(y);
-
-    if (IsIntegerArithmeticSafe<Promotion, T, U>::value) {
-      presult = static_cast<Promotion>(x) * static_cast<Promotion>(y);
-    } else {
-      is_valid &= CheckedMulImpl(static_cast<Promotion>(x),
-                                 static_cast<Promotion>(y), &presult);
-    }
-    *result = static_cast<V>(presult);
-    return is_valid && IsValueInRangeForNumericType<V>(presult);
-  }
-};
-
-// Avoid poluting the namespace once we're done with the macro.
-#undef USE_OVERFLOW_BUILTINS
-
-// Division just requires a check for a zero denominator or an invalid negation
-// on signed min/-1.
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
-bool CheckedDivImpl(T x, T y, T* result) {
-  if (y && (!std::is_signed<T>::value ||
-            x != std::numeric_limits<T>::lowest() || y != static_cast<T>(-1))) {
-    *result = x / y;
-    return true;
-  }
-  return false;
-}
-
-template <typename T, typename U, class Enable = void>
-struct CheckedDivOp {};
-
-template <typename T, typename U>
-struct CheckedDivOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = typename MaxExponentPromotion<T, U>::type;
-  template <typename V>
-  static bool Do(T x, U y, V* result) {
-    using Promotion = typename BigEnoughPromotion<T, U>::type;
-    Promotion presult;
-    // Fail if either operand is out of range for the promoted type.
-    // TODO(jschuh): This could be made to work for a broader range of values.
-    bool is_valid = IsValueInRangeForNumericType<Promotion>(x) &&
-                    IsValueInRangeForNumericType<Promotion>(y);
-    is_valid &= CheckedDivImpl(static_cast<Promotion>(x),
-                               static_cast<Promotion>(y), &presult);
-    *result = static_cast<V>(presult);
-    return is_valid && IsValueInRangeForNumericType<V>(presult);
-  }
-};
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
-bool CheckedModImpl(T x, T y, T* result) {
-  if (y > 0) {
-    *result = static_cast<T>(x % y);
-    return true;
-  }
-  return false;
-}
-
-template <typename T, typename U, class Enable = void>
-struct CheckedModOp {};
-
-template <typename T, typename U>
-struct CheckedModOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = typename MaxExponentPromotion<T, U>::type;
-  template <typename V>
-  static bool Do(T x, U y, V* result) {
-    using Promotion = typename BigEnoughPromotion<T, U>::type;
-    Promotion presult;
-    bool is_valid = CheckedModImpl(static_cast<Promotion>(x),
-                                   static_cast<Promotion>(y), &presult);
-    *result = static_cast<V>(presult);
-    return is_valid && IsValueInRangeForNumericType<V>(presult);
-  }
-};
-
-template <typename T, typename U, class Enable = void>
-struct CheckedLshOp {};
-
-// Left shift. Shifts less than 0 or greater than or equal to the number
-// of bits in the promoted type are undefined. Shifts of negative values
-// are undefined. Otherwise it is defined when the result fits.
-template <typename T, typename U>
-struct CheckedLshOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = T;
-  template <typename V>
-  static bool Do(T x, U shift, V* result) {
-    using ShiftType = typename std::make_unsigned<T>::type;
-    static const ShiftType kBitWidth = IntegerBitsPlusSign<T>::value;
-    const ShiftType real_shift = static_cast<ShiftType>(shift);
-    // Signed shift is not legal on negative values.
-    if (!IsValueNegative(x) && real_shift < kBitWidth) {
-      // Just use a multiplication because it's easy.
-      // TODO(jschuh): This could probably be made more efficient.
-      if (!std::is_signed<T>::value || real_shift != kBitWidth - 1)
-        return CheckedMulOp<T, T>::Do(x, static_cast<T>(1) << shift, result);
-      return !x;  // Special case zero for a full width signed shift.
-    }
-    return false;
-  }
-};
-
-template <typename T, typename U, class Enable = void>
-struct CheckedRshOp {};
-
-// Right shift. Shifts less than 0 or greater than or equal to the number
-// of bits in the promoted type are undefined. Otherwise, it is always defined,
-// but a right shift of a negative value is implementation-dependent.
-template <typename T, typename U>
-struct CheckedRshOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = T;
-  template <typename V = result_type>
-  static bool Do(T x, U shift, V* result) {
-    // Use the type conversion push negative values out of range.
-    using ShiftType = typename std::make_unsigned<T>::type;
-    if (static_cast<ShiftType>(shift) < IntegerBitsPlusSign<T>::value) {
-      T tmp = x >> shift;
-      *result = static_cast<V>(tmp);
-      return IsValueInRangeForNumericType<V>(tmp);
-    }
-    return false;
-  }
-};
-
-template <typename T, typename U, class Enable = void>
-struct CheckedAndOp {};
-
-// For simplicity we support only unsigned integer results.
-template <typename T, typename U>
-struct CheckedAndOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = typename std::make_unsigned<
-      typename MaxExponentPromotion<T, U>::type>::type;
-  template <typename V = result_type>
-  static bool Do(T x, U y, V* result) {
-    result_type tmp = static_cast<result_type>(x) & static_cast<result_type>(y);
-    *result = static_cast<V>(tmp);
-    return IsValueInRangeForNumericType<V>(tmp);
-  }
-};
-
-template <typename T, typename U, class Enable = void>
-struct CheckedOrOp {};
-
-// For simplicity we support only unsigned integers.
-template <typename T, typename U>
-struct CheckedOrOp<T,
-                   U,
-                   typename std::enable_if<std::is_integral<T>::value &&
-                                           std::is_integral<U>::value>::type> {
-  using result_type = typename std::make_unsigned<
-      typename MaxExponentPromotion<T, U>::type>::type;
-  template <typename V = result_type>
-  static bool Do(T x, U y, V* result) {
-    result_type tmp = static_cast<result_type>(x) | static_cast<result_type>(y);
-    *result = static_cast<V>(tmp);
-    return IsValueInRangeForNumericType<V>(tmp);
-  }
-};
-
-template <typename T, typename U, class Enable = void>
-struct CheckedXorOp {};
-
-// For simplicity we support only unsigned integers.
-template <typename T, typename U>
-struct CheckedXorOp<T,
-                    U,
-                    typename std::enable_if<std::is_integral<T>::value &&
-                                            std::is_integral<U>::value>::type> {
-  using result_type = typename std::make_unsigned<
-      typename MaxExponentPromotion<T, U>::type>::type;
-  template <typename V = result_type>
-  static bool Do(T x, U y, V* result) {
-    result_type tmp = static_cast<result_type>(x) ^ static_cast<result_type>(y);
-    *result = static_cast<V>(tmp);
-    return IsValueInRangeForNumericType<V>(tmp);
-  }
-};
-
-// Max doesn't really need to be implemented this way because it can't fail,
-// but it makes the code much cleaner to use the MathOp wrappers.
-template <typename T, typename U, class Enable = void>
-struct CheckedMaxOp {};
-
-template <typename T, typename U>
-struct CheckedMaxOp<
-    T,
-    U,
-    typename std::enable_if<std::is_arithmetic<T>::value &&
-                            std::is_arithmetic<U>::value>::type> {
-  using result_type = typename MaxExponentPromotion<T, U>::type;
-  template <typename V = result_type>
-  static bool Do(T x, U y, V* result) {
-    *result = IsGreater<T, U>::Test(x, y) ? static_cast<result_type>(x)
-                                          : static_cast<result_type>(y);
-    return true;
-  }
-};
-
-// Min doesn't really need to be implemented this way because it can't fail,
-// but it makes the code much cleaner to use the MathOp wrappers.
-template <typename T, typename U, class Enable = void>
-struct CheckedMinOp {};
-
-template <typename T, typename U>
-struct CheckedMinOp<
-    T,
-    U,
-    typename std::enable_if<std::is_arithmetic<T>::value &&
-                            std::is_arithmetic<U>::value>::type> {
-  using result_type = typename LowestValuePromotion<T, U>::type;
-  template <typename V = result_type>
-  static bool Do(T x, U y, V* result) {
-    *result = IsLess<T, U>::Test(x, y) ? static_cast<result_type>(x)
-                                       : static_cast<result_type>(y);
-    return true;
-  }
-};
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value &&
-                                  std::is_signed<T>::value>::type* = nullptr>
-bool CheckedNeg(T value, T* result) {
-  // The negation of signed min is min, so catch that one.
-  if (value != std::numeric_limits<T>::lowest()) {
-    *result = static_cast<T>(-value);
-    return true;
-  }
-  return false;
-}
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value &&
-                                  !std::is_signed<T>::value>::type* = nullptr>
-bool CheckedNeg(T value, T* result) {
-  if (!value) {
-    *result = static_cast<T>(0);
-    return true;
-  }
-  return false;
-}
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value &&
-                                  !std::is_signed<T>::value>::type* = nullptr>
-bool CheckedInv(T value, T* result) {
-  *result = ~value;
-  return true;
-}
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value &&
-                                  std::is_signed<T>::value>::type* = nullptr>
-bool CheckedAbs(T value, T* result) {
-  if (value != std::numeric_limits<T>::lowest()) {
-    *result = std::abs(value);
-    return true;
-  }
-  return false;
-}
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value &&
-                                  !std::is_signed<T>::value>::type* = nullptr>
-bool CheckedAbs(T value, T* result) {
-  // T is unsigned, so |value| must already be positive.
-  *result = value;
-  return true;
-}
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value &&
-                                  std::is_signed<T>::value>::type* = nullptr>
-constexpr typename std::make_unsigned<T>::type SafeUnsignedAbs(T value) {
-  using UnsignedT = typename std::make_unsigned<T>::type;
-  return value == std::numeric_limits<T>::lowest()
-             ? static_cast<UnsignedT>(std::numeric_limits<T>::max()) + 1
-             : static_cast<UnsignedT>(std::abs(value));
-}
-
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value &&
-                                  !std::is_signed<T>::value>::type* = nullptr>
-constexpr T SafeUnsignedAbs(T value) {
-  // T is unsigned, so |value| must already be positive.
-  return static_cast<T>(value);
-}
-
-// This is just boilerplate that wraps the standard floating point arithmetic.
-// A macro isn't the nicest solution, but it beats rewriting these repeatedly.
-#define BASE_FLOAT_ARITHMETIC_OPS(NAME, OP)                                    \
-  template <typename T, typename U>                                            \
-  struct Checked##NAME##Op<                                                    \
-      T, U, typename std::enable_if<std::is_floating_point<T>::value ||        \
-                                    std::is_floating_point<U>::value>::type> { \
-    using result_type = typename MaxExponentPromotion<T, U>::type;             \
-    template <typename V>                                                      \
-    static bool Do(T x, U y, V* result) {                                      \
-      using Promotion = typename MaxExponentPromotion<T, U>::type;             \
-      Promotion presult = x OP y;                                              \
-      *result = static_cast<V>(presult);                                       \
-      return IsValueInRangeForNumericType<V>(presult);                         \
-    }                                                                          \
-  };
-
-BASE_FLOAT_ARITHMETIC_OPS(Add, +)
-BASE_FLOAT_ARITHMETIC_OPS(Sub, -)
-BASE_FLOAT_ARITHMETIC_OPS(Mul, *)
-BASE_FLOAT_ARITHMETIC_OPS(Div, /)
-
-#undef BASE_FLOAT_ARITHMETIC_OPS
-
-template <
-    typename T,
-    typename std::enable_if<std::is_floating_point<T>::value>::type* = nullptr>
-bool CheckedNeg(T value, T* result) {
-  *result = static_cast<T>(-value);
-  return true;
-}
-
-template <
-    typename T,
-    typename std::enable_if<std::is_floating_point<T>::value>::type* = nullptr>
-bool CheckedAbs(T value, T* result) {
-  *result = static_cast<T>(std::abs(value));
-  return true;
-}
-
-// Floats carry around their validity state with them, but integers do not. So,
-// we wrap the underlying value in a specialization in order to hide that detail
-// and expose an interface via accessors.
-enum NumericRepresentation {
-  NUMERIC_INTEGER,
-  NUMERIC_FLOATING,
-  NUMERIC_UNKNOWN
-};
-
-template <typename NumericType>
-struct GetNumericRepresentation {
-  static const NumericRepresentation value =
-      std::is_integral<NumericType>::value
-          ? NUMERIC_INTEGER
-          : (std::is_floating_point<NumericType>::value ? NUMERIC_FLOATING
-                                                        : NUMERIC_UNKNOWN);
-};
-
-template <typename T, NumericRepresentation type =
-                          GetNumericRepresentation<T>::value>
-class CheckedNumericState {};
-
-// Integrals require quite a bit of additional housekeeping to manage state.
-template <typename T>
-class CheckedNumericState<T, NUMERIC_INTEGER> {
- private:
-  // is_valid_ precedes value_ because member intializers in the constructors
-  // are evaluated in field order, and is_valid_ must be read when initializing
-  // value_.
-  bool is_valid_;
-  T value_;
-
-  // Ensures that a type conversion does not trigger undefined behavior.
-  template <typename Src>
-  static constexpr T WellDefinedConversionOrZero(const Src value,
-                                                 const bool is_valid) {
-    using SrcType = typename internal::UnderlyingType<Src>::type;
-    return (std::is_integral<SrcType>::value || is_valid)
-               ? static_cast<T>(value)
-               : static_cast<T>(0);
-  }
-
- public:
-  template <typename Src, NumericRepresentation type>
-  friend class CheckedNumericState;
-
-  constexpr CheckedNumericState() : is_valid_(true), value_(0) {}
-
-  template <typename Src>
-  constexpr CheckedNumericState(Src value, bool is_valid)
-      : is_valid_(is_valid && IsValueInRangeForNumericType<T>(value)),
-        value_(WellDefinedConversionOrZero(value, is_valid_)) {
-    static_assert(std::is_arithmetic<Src>::value, "Argument must be numeric.");
-  }
-
-  // Copy constructor.
-  template <typename Src>
-  constexpr CheckedNumericState(const CheckedNumericState<Src>& rhs)
-      : is_valid_(rhs.IsValid()),
-        value_(WellDefinedConversionOrZero(rhs.value(), is_valid_)) {}
-
-  template <typename Src>
-  constexpr explicit CheckedNumericState(Src value)
-      : is_valid_(IsValueInRangeForNumericType<T>(value)),
-        value_(WellDefinedConversionOrZero(value, is_valid_)) {}
-
-  constexpr bool is_valid() const { return is_valid_; }
-  constexpr T value() const { return value_; }
-};
-
-// Floating points maintain their own validity, but need translation wrappers.
-template <typename T>
-class CheckedNumericState<T, NUMERIC_FLOATING> {
- private:
-  T value_;
-
-  // Ensures that a type conversion does not trigger undefined behavior.
-  template <typename Src>
-  static constexpr T WellDefinedConversionOrNaN(const Src value,
-                                                const bool is_valid) {
-    using SrcType = typename internal::UnderlyingType<Src>::type;
-    return (StaticDstRangeRelationToSrcRange<T, SrcType>::value ==
-                NUMERIC_RANGE_CONTAINED ||
-            is_valid)
-               ? static_cast<T>(value)
-               : std::numeric_limits<T>::quiet_NaN();
-  }
-
- public:
-  template <typename Src, NumericRepresentation type>
-  friend class CheckedNumericState;
-
-  constexpr CheckedNumericState() : value_(0.0) {}
-
-  template <typename Src>
-  constexpr CheckedNumericState(Src value, bool is_valid)
-      : value_(WellDefinedConversionOrNaN(value, is_valid)) {}
-
-  template <typename Src>
-  constexpr explicit CheckedNumericState(Src value)
-      : value_(WellDefinedConversionOrNaN(
-            value,
-            IsValueInRangeForNumericType<T>(value))) {}
-
-  // Copy constructor.
-  template <typename Src>
-  constexpr CheckedNumericState(const CheckedNumericState<Src>& rhs)
-      : value_(WellDefinedConversionOrNaN(
-            rhs.value(),
-            rhs.is_valid() && IsValueInRangeForNumericType<T>(rhs.value()))) {}
-
-  constexpr bool is_valid() const {
-    // Written this way because std::isfinite is not reliably constexpr.
-    // TODO(jschuh): Fix this if the libraries ever get fixed.
-    return value_ <= std::numeric_limits<T>::max() &&
-           value_ >= std::numeric_limits<T>::lowest();
-  }
-  constexpr T value() const { return value_; }
-};
-
-template <template <typename, typename, typename> class M,
-          typename L,
-          typename R>
-struct MathWrapper {
-  using math = M<typename UnderlyingType<L>::type,
-                 typename UnderlyingType<R>::type,
-                 void>;
-  using type = typename math::result_type;
-};
-
-}  // namespace internal
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_NUMERICS_SAFE_MATH_IMPL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/rand_util.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/rand_util.h
deleted file mode 100644
index 21ece1bec6..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/rand_util.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_RAND_UTIL_H_
-#define MINI_CHROMIUM_BASE_RAND_UTIL_H_
-
-#include <stdint.h>
-
-#include <string>
-
-namespace base {
-
-uint64_t RandUint64();
-
-int RandInt(int min, int max);
-
-uint64_t RandGenerator(uint64_t range);
-
-double RandDouble();
-
-void RandBytes(void* output, size_t output_length);
-std::string RandBytesAsString(size_t length);
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_RAND_UTIL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/scoped_clear_errno.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/scoped_clear_errno.h
deleted file mode 100644
index 19caf79b71..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/scoped_clear_errno.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_SCOPED_CLEAR_ERRNO_H_
-#define MINI_CHROMIUM_BASE_SCOPED_CLEAR_ERRNO_H_
-
-#include <errno.h>
-
-#include "base/macros.h"
-
-namespace base {
-
-// Simple scoper that saves the current value of errno, resets it to 0, and on
-// destruction puts the old value back.
-class ScopedClearErrno {
- public:
-  ScopedClearErrno() : old_errno_(errno) {
-    errno = 0;
-  }
-  ~ScopedClearErrno() {
-    if (errno == 0)
-      errno = old_errno_;
-  }
-
- private:
-  const int old_errno_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedClearErrno);
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_SCOPED_CLEAR_ERRNO_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/scoped_generic.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/scoped_generic.h
deleted file mode 100644
index 0427e92c5b..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/scoped_generic.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_SCOPED_GENERIC_H_
-#define MINI_CHROMIUM_BASE_SCOPED_GENERIC_H_
-
-#include <stdlib.h>
-
-#include <algorithm>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-
-namespace base {
-
-template<typename T, typename Traits>
-class ScopedGeneric {
- private:
-  struct Data : public Traits {
-    explicit Data(const T& in) : generic(in) {}
-    Data(const T& in, const Traits& other) : Traits(other), generic(in) {}
-    T generic;
-  };
-
- public:
-  typedef T element_type;
-  typedef Traits traits_type;
-
-  ScopedGeneric() : data_(traits_type::InvalidValue()) {}
-
-  explicit ScopedGeneric(const element_type& value) : data_(value) {}
-
-  ScopedGeneric(const element_type& value, const traits_type& traits)
-      : data_(value, traits) {
-  }
-
-  ScopedGeneric(ScopedGeneric<T, Traits>&& rvalue)
-      : data_(rvalue.release(), rvalue.get_traits()) {
-  }
-
-  ~ScopedGeneric() {
-    FreeIfNecessary();
-  }
-
-  ScopedGeneric& operator=(ScopedGeneric<T, Traits>&& rvalue) {
-    reset(rvalue.release());
-    return *this;
-  }
-
-  void reset(const element_type& value = traits_type::InvalidValue()) {
-    if (data_.generic != traits_type::InvalidValue() && data_.generic == value)
-      abort();
-    FreeIfNecessary();
-    data_.generic = value;
-  }
-
-  void swap(ScopedGeneric& other) {
-    using std::swap;
-    swap(static_cast<Traits&>(data_), static_cast<Traits&>(other.data_));
-    swap(data_.generic, other.data_.generic);
-  }
-
-  element_type release() WARN_UNUSED_RESULT {
-    element_type old_generic = data_.generic;
-    data_.generic = traits_type::InvalidValue();
-    return old_generic;
-  }
-
-  const element_type& get() const { return data_.generic; }
-
-  bool is_valid() const { return data_.generic != traits_type::InvalidValue(); }
-
-  bool operator==(const element_type& value) const {
-    return data_.generic == value;
-  }
-  bool operator!=(const element_type& value) const {
-    return data_.generic != value;
-  }
-
-  Traits& get_traits() { return data_; }
-  const Traits& get_traits() const { return data_; }
-
- private:
-  void FreeIfNecessary() {
-    if (data_.generic != traits_type::InvalidValue()) {
-      data_.Free(data_.generic);
-      data_.generic = traits_type::InvalidValue();
-    }
-  }
-
-  template <typename T2, typename Traits2> bool operator==(
-      const ScopedGeneric<T2, Traits2>& p2) const;
-  template <typename T2, typename Traits2> bool operator!=(
-      const ScopedGeneric<T2, Traits2>& p2) const;
-
-  Data data_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedGeneric);
-};
-
-template<class T, class Traits>
-void swap(const ScopedGeneric<T, Traits>& a,
-          const ScopedGeneric<T, Traits>& b) {
-  a.swap(b);
-}
-
-template<class T, class Traits>
-bool operator==(const T& value, const ScopedGeneric<T, Traits>& scoped) {
-  return value == scoped.get();
-}
-
-template<class T, class Traits>
-bool operator!=(const T& value, const ScopedGeneric<T, Traits>& scoped) {
-  return value != scoped.get();
-}
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_SCOPED_GENERIC_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string16.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string16.h
deleted file mode 100644
index 2eccd2afe2..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string16.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING16_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING16_H_
-
-#include <stdint.h>
-#include <stdio.h>
-
-#include <string>
-
-#include "build/build_config.h"
-
-namespace base {
-
-#if defined(WCHAR_T_IS_UTF16)
-typedef wchar_t char16;
-#elif defined(WCHAR_T_IS_UTF32)
-typedef uint16_t char16;
-#endif  // WCHAR_T_IS_UTF32
-
-int c16memcmp(const char16* s1, const char16* s2, size_t n);
-size_t c16len(const char16* s);
-const char16* c16memchr(const char16* s, char16 c, size_t n);
-char16* c16memmove(char16* s1, const char16* s2, size_t n);
-char16* c16memcpy(char16* s1, const char16* s2, size_t n);
-char16* c16memset(char16* s, char16 c, size_t n);
-
-#if defined(WCHAR_T_IS_UTF16)
-
-typedef std::wstring string16;
-typedef std::char_traits<wchar_t> string16_char_traits;
-
-#elif defined(WCHAR_T_IS_UTF32)
-
-struct string16_char_traits {
-  typedef char16 char_type;
-  typedef int int_type;
-
-  static_assert(sizeof(int_type) > sizeof(char_type), "unexpected type width");
-
-  typedef std::streamoff off_type;
-  typedef mbstate_t state_type;
-  typedef std::fpos<state_type> pos_type;
-
-  static void assign(char_type& c1, const char_type& c2) {
-    c1 = c2;
-  }
-
-  static bool eq(const char_type& c1, const char_type& c2) {
-    return c1 == c2;
-  }
-  static bool lt(const char_type& c1, const char_type& c2) {
-    return c1 < c2;
-  }
-
-  static int compare(const char_type* s1, const char_type* s2, size_t n) {
-    return c16memcmp(s1, s2, n);
-  }
-
-  static size_t length(const char_type* s) {
-    return c16len(s);
-  }
-
-  static const char_type* find(const char_type* s, size_t n,
-                               const char_type& a) {
-    return c16memchr(s, a, n);
-  }
-
-  static char_type* move(char_type* s1, const char_type* s2, size_t n) {
-    return c16memmove(s1, s2, n);
-  }
-
-  static char_type* copy(char_type* s1, const char_type* s2, size_t n) {
-    return c16memcpy(s1, s2, n);
-  }
-
-  static char_type* assign(char_type* s, size_t n, char_type a) {
-    return c16memset(s, a, n);
-  }
-
-  static int_type not_eof(const int_type& c) {
-    return eq_int_type(c, eof()) ? 0 : c;
-  }
-
-  static char_type to_char_type(const int_type& c) {
-    return char_type(c);
-  }
-
-  static int_type to_int_type(const char_type& c) {
-    return int_type(c);
-  }
-
-  static bool eq_int_type(const int_type& c1, const int_type& c2) {
-    return c1 == c2;
-  }
-
-  static int_type eof() {
-    return static_cast<int_type>(EOF);
-  }
-};
-
-typedef std::basic_string<char16, base::string16_char_traits> string16;
-
-extern std::ostream& operator<<(std::ostream& out, const string16& str);
-
-#endif  // WCHAR_T_IS_UTF32
-
-}  // namespace base
-
-#if defined(WCHAR_T_IS_UTF32)
-extern template class std::basic_string<base::char16,
-                                        base::string16_char_traits>;
-#endif  // WCHAR_T_IS_UTF32
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING16_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.h
deleted file mode 100644
index 8f9911f920..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_NUMBER_CONVERSIONS_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING_NUMBER_CONVERSIONS_H_
-
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include "base/strings/string_piece.h"
-
-namespace base {
-
-bool StringToInt(const StringPiece& input, int* output);
-bool StringToUint(const StringPiece& input, unsigned int* output);
-bool StringToInt64(const StringPiece& input, int64_t* output);
-bool StringToUint64(const StringPiece& input, uint64_t* output);
-bool StringToSizeT(const StringPiece& input, size_t* output);
-
-bool HexStringToInt(const StringPiece& input, int* output);
-bool HexStringToBytes(const std::string& input, std::vector<uint8_t>* output);
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_NUMBER_CONVERSIONS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
deleted file mode 100644
index b0e45eea6c..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
-
-#include <algorithm>
-#include <iterator>
-#include <ostream>
-#include <string>
-
-#include "base/strings/string16.h"
-
-namespace base {
-
-template<typename StringType>
-class BasicStringPiece {
- public:
-  typedef typename StringType::traits_type traits_type;
-  typedef typename StringType::value_type value_type;
-  typedef typename StringType::size_type size_type;
-  typedef typename StringType::difference_type difference_type;
-  typedef const value_type& reference;
-  typedef const value_type& const_reference;
-  typedef const value_type* pointer;
-  typedef const value_type* const_pointer;
-  typedef const value_type* const_iterator;
-  typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-  static const size_type npos;
-
-  BasicStringPiece()
-      : pointer_(NULL),
-        length_(0) {
-  }
-
-  BasicStringPiece(const value_type* string)
-      : pointer_(string),
-        length_((string == NULL) ? 0 : traits_type::length(string)) {
-  }
-
-  BasicStringPiece(const StringType& string)
-      : pointer_(string.data()),
-        length_(string.size()) {
-  }
-
-  BasicStringPiece(const value_type* offset, size_type length)
-      : pointer_(offset),
-        length_(length) {
-  }
-
-  BasicStringPiece(const typename StringType::const_iterator& begin,
-                   const typename StringType::const_iterator& end)
-      : pointer_((end > begin) ? &(*begin) : NULL),
-        length_((end > begin) ? static_cast<size_type>(end - begin) : 0) {
-  }
-
-  value_type operator[](size_type index) const { return pointer_[index]; }
-
-  const value_type* data() const { return pointer_; }
-
-  const_iterator begin() const { return pointer_; }
-  const_iterator end() const { return pointer_ + length_; }
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator(pointer_ + length_);
-  }
-  const_reverse_iterator rend() const {
-    return const_reverse_iterator(pointer_);
-  }
-
-  bool empty() const { return length_ == 0; }
-  size_type size() const { return length_; }
-  size_type length() const { return length_; }
-  size_type max_size() const { return length_; }
-  size_type capacity() const { return length_; }
-
-  static int wordmemcmp(const value_type* p,
-                        const value_type* p2,
-                        size_type N) {
-    return StringType::traits_type::compare(p, p2, N);
-  }
-
-  void clear() {
-    pointer_ = NULL;
-    length_ = 0;
-  }
-
-  int compare(const BasicStringPiece<StringType>& that) const {
-    int result = traits_type::compare(pointer_,
-                                      that.pointer_,
-                                      std::min(length_, that.length_));
-    if (result == 0) {
-      if (length_ < that.length_) {
-        result = -1;
-      } else if (length_ > that.length_) {
-        result = 1;
-      }
-    }
-    return result;
-  }
-
-  BasicStringPiece<StringType> substr(size_type position = 0,
-                                      size_type count = npos) const {
-    position = std::min(position, size());
-    count = std::min(count, size() - position);
-    return BasicStringPiece<StringType>(data() + position, count);
-  }
-
-  size_type copy(value_type* dest,
-                 size_type count,
-                 size_type position = 0) const {
-    size_type ret = std::min(size() - position, count);
-    traits_type::copy(dest, data() + position, ret);
-    return ret;
-  }
-
-  size_type find(const BasicStringPiece<StringType>& str, size_type pos) const {
-    if (pos >= size()) {
-      return npos;
-    }
-    const_iterator result = std::search(begin() + pos,
-                                        end(),
-                                        str.begin(),
-                                        str.end());
-    size_type xpos = static_cast<size_type>(result - begin());
-    return xpos + str.size() <= size() ? xpos : npos;
-  }
-
-  size_type find(value_type c, size_type pos) const {
-    if (pos >= size()) {
-      return npos;
-    }
-    const_iterator result = std::find(begin() + pos, end(), c);
-    return result != end() ? static_cast<size_type>(result - begin()) : npos;
-  }
-
-  void set(const value_type* string) {
-    pointer_ = string;
-    length_ = string ? traits_type::length(string) : 0;
-  }
-
-  StringType as_string() const {
-    return empty() ? StringType() : StringType(data(), size());
-  }
-
- private:
-  const value_type* pointer_;
-  size_type length_;
-};
-
-template <typename StringType>
-const typename BasicStringPiece<StringType>::size_type
-    BasicStringPiece<StringType>::npos = StringType::npos;
-
-template<typename StringType>
-std::ostream& operator<<(std::ostream& ostream,
-                         const BasicStringPiece<StringType>& string_piece) {
-  ostream.write(string_piece.data(), string_piece.size());
-  return ostream;
-}
-
-typedef BasicStringPiece<std::string> StringPiece;
-typedef BasicStringPiece<string16> StringPiece16;
-
-inline bool operator==(const StringPiece& x, const StringPiece& y) {
-  if (x.size() != y.size())
-    return false;
-
-  return StringPiece::wordmemcmp(x.data(), y.data(), x.size()) == 0;
-}
-
-inline bool operator==(const StringPiece16& x, const StringPiece16& y) {
-  if (x.size() != y.size())
-    return false;
-
-  return StringPiece16::wordmemcmp(x.data(), y.data(), x.size()) == 0;
-}
-
-// This hash function is copied from base/strings/string16.h. We don't use the
-// ones already defined for string and string16 directly because it would
-// require the string constructors to be called, which we don't want.
-#define HASH_STRING_PIECE(StringPieceType, string_piece)         \
-  std::size_t result = 0;                                        \
-  for (StringPieceType::const_iterator i = string_piece.begin(); \
-       i != string_piece.end(); ++i)                             \
-    result = (result * 131) + *i;                                \
-  return result;
-
-struct StringPieceHash {
-  std::size_t operator()(const StringPiece& sp) const {
-    HASH_STRING_PIECE(StringPiece, sp);
-  }
-};
-struct StringPiece16Hash {
-  std::size_t operator()(const StringPiece16& sp16) const {
-    HASH_STRING_PIECE(StringPiece16, sp16);
-  }
-};
-
-}  // namespace base;
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
deleted file mode 100644
index 51ebba39e5..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
-
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-
-namespace base {
-
-int vsnprintf(char* buffer, size_t size, const char* format, va_list arguments)
-    PRINTF_FORMAT(3, 0);
-
-}  // namespace base
-
-#if defined(OS_WIN)
-#include "base/strings/string_util_win.h"
-#elif defined(OS_POSIX)
-#include "base/strings/string_util_posix.h"
-#endif
-
-template <class string_type>
-inline typename string_type::value_type* WriteInto(string_type* str,
-                                                   size_t length_with_null) {
-  DCHECK_NE(0u, length_with_null);
-  str->reserve(length_with_null);
-  str->resize(length_with_null - 1);
-
-  if (length_with_null <= 1)
-    return NULL;
-
-  return &((*str)[0]);
-}
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
deleted file mode 100644
index 445f06b039..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_POSIX_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_POSIX_H_
-
-#include "base/strings/string_util.h"
-
-#include <stdio.h>
-
-namespace base {
-
-inline int vsnprintf(char* buffer,
-                     size_t size,
-                     const char* format, va_list arguments) {
-  return ::vsnprintf(buffer, size, format, arguments);
-}
-
-// Chromium code style is to not use malloc'd strings; this is only for use
-// for interaction with APIs that require it.
-inline char* strdup(const char* str) {
-  return ::strdup(str);
-}
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_POSIX_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.h
deleted file mode 100644
index 447892b478..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_STRINGS_STRING_UTIL_WIN_H_
-#define BASE_STRINGS_STRING_UTIL_WIN_H_
-
-#include <string.h>
-
-namespace base {
-
-// Chromium code style is to not use malloc'd strings; this is only for use
-// for interaction with APIs that require it.
-inline char* strdup(const char* str) {
-  return _strdup(str);
-}
-
-}  // namespace base
-
-#endif  // BASE_STRINGS_STRING_UTIL_WIN_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.h
deleted file mode 100644
index 1b1e60be22..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRINGPRINTF_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRINGPRINTF_H_
-
-#include <stdarg.h>
-
-#include <string>
-
-#include "base/compiler_specific.h"
-
-namespace base {
-
-std::string StringPrintf(const char* format, ...)
-    PRINTF_FORMAT(1, 2);
-void StringAppendV(std::string* dst, const char* format, va_list ap)
-    PRINTF_FORMAT(2, 0);
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRINGPRINTF_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h
deleted file mode 100644
index 3759989975..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_SYS_STRING_CONVERSIONS_H_
-#define MINI_CHROMIUM_BASE_STRINGS_SYS_STRING_CONVERSIONS_H_
-
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include <string>
-
-#if defined(__OBJC__)
-#import <Foundation/Foundation.h>
-#else
-class NSString;
-#endif
-
-namespace base {
-
-std::string SysCFStringRefToUTF8(CFStringRef ref);
-std::string SysNSStringToUTF8(NSString* nsstring);
-CFStringRef SysUTF8ToCFStringRef(const std::string& utf8);
-NSString* SysUTF8ToNSString(const std::string& utf8);
-
-}  // namespace base
-
-#endif  // defined(OS_MACOSX)
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_SYS_STRING_CONVERSIONS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
deleted file mode 100644
index 72f86aef51..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
-#define MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
-
-#include "base/strings/string16.h"
-
-namespace base {
-
-inline bool IsValidCodepoint(uint32_t code_point) {
-  return code_point < 0xD800u ||
-         (code_point >= 0xE000u && code_point <= 0x10FFFFu);
-}
-
-bool ReadUnicodeCharacter(const char* src,
-                          int32_t src_len,
-                          int32_t* char_index,
-                          uint32_t* code_point_out);
-
-bool ReadUnicodeCharacter(const char16* src,
-                          int32_t src_len,
-                          int32_t* char_index,
-                          uint32_t* code_point);
-
-size_t WriteUnicodeCharacter(uint32_t code_point, std::string* output);
-
-size_t WriteUnicodeCharacter(uint32_t code_point, string16* output);
-
-template<typename CHAR>
-void PrepareForUTF8Output(const CHAR* src, size_t src_len, std::string* output);
-
-template<typename STRING>
-void PrepareForUTF16Or32Output(const char* src, size_t src_len, STRING* output);
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
deleted file mode 100644
index c2ca67482c..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSIONS_H_
-#define MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSIONS_H_
-
-#include <string>
-
-#include "base/strings/string16.h"
-#include "base/strings/string_piece.h"
-
-namespace base {
-
-bool UTF8ToUTF16(const char* src, size_t src_len, string16* output);
-string16 UTF8ToUTF16(const StringPiece& utf8);
-bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output);
-std::string UTF16ToUTF8(const StringPiece16& utf16);
-
-}  // namespace
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSIONS_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h
deleted file mode 100644
index d60c133aff..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_SYS_BYTEORDER_H_
-#define MINI_CHROMIUM_BASE_SYS_BYTEORDER_H_
-
-#include "base/macros.h"
-
-#if defined(OS_MACOSX)
-#include <libkern/OSByteOrder.h>
-#elif defined(OS_WIN)
-#include <stdlib.h>
-#else
-#include <byteswap.h>
-#endif
-
-namespace base {
-
-inline uint16_t ByteSwap(uint16_t x) {
-#if defined(OS_MACOSX)
-  return OSSwapInt16(x);
-#elif defined(OS_WIN)
-  return _byteswap_ushort(x);
-#else
-  return bswap_16(x);
-#endif
-}
-
-inline uint32_t ByteSwap(uint32_t x) {
-#if defined(OS_MACOSX)
-  return OSSwapInt32(x);
-#elif defined(OS_WIN)
-  return _byteswap_ulong(x);
-#else
-  return bswap_32(x);
-#endif
-}
-
-inline uint64_t ByteSwap(uint64_t x) {
-#if defined(OS_MACOSX)
-  return OSSwapInt64(x);
-#elif defined(OS_WIN)
-  return _byteswap_uint64(x);
-#else
-  return bswap_64(x);
-#endif
-}
-
-inline uint16_t NetToHost16(uint16_t x) {
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-  return ByteSwap(x);
-#else
-  return x;
-#endif
-}
-
-inline uint32_t NetToHost32(uint32_t x) {
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-  return ByteSwap(x);
-#else
-  return x;
-#endif
-}
-
-inline uint64_t NetToHost64(uint64_t x) {
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-  return ByteSwap(x);
-#else
-  return x;
-#endif
-}
-
-inline uint16_t HostToNet16(uint16_t x) {
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-  return ByteSwap(x);
-#else
-  return x;
-#endif
-}
-
-inline uint32_t HostToNet32(uint32_t x) {
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-  return ByteSwap(x);
-#else
-  return x;
-#endif
-}
-
-inline uint64_t HostToNet64(uint64_t x) {
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-  return ByteSwap(x);
-#else
-  return x;
-#endif
-}
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_SYS_BYTEORDER_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/template_util.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/template_util.h
deleted file mode 100644
index 618a081966..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/template_util.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_TEMPLATE_UTIL_H_
-#define MINI_CHROMIUM_BASE_TEMPLATE_UTIL_H_
-
-#include <stddef.h>
-
-#include "build/build_config.h"
-
-namespace base {
-
-// template definitions from tr1
-
-template<class T, T v>
-struct integral_constant {
-  static const T value = v;
-  typedef T value_type;
-  typedef integral_constant<T, v> type;
-};
-
-template <class T, T v> const T integral_constant<T, v>::value;
-
-typedef integral_constant<bool, true> true_type;
-typedef integral_constant<bool, false> false_type;
-
-template <class T> struct is_pointer : false_type {};
-template <class T> struct is_pointer<T*> : true_type {};
-
-// Member function pointer detection. This is built-in to C++ 11's stdlib, and
-// we can remove this when we switch to it.
-template<typename T>
-struct is_member_function_pointer : false_type {};
-
-template <typename R, typename Z, typename... A>
-struct is_member_function_pointer<R(Z::*)(A...)> : true_type {};
-template <typename R, typename Z, typename... A>
-struct is_member_function_pointer<R(Z::*)(A...) const> : true_type {};
-
-
-template <class T, class U> struct is_same : public false_type {};
-template <class T> struct is_same<T,T> : true_type {};
-
-template<class> struct is_array : public false_type {};
-template<class T, size_t n> struct is_array<T[n]> : public true_type {};
-template<class T> struct is_array<T[]> : public true_type {};
-
-template <class T> struct is_non_const_reference : false_type {};
-template <class T> struct is_non_const_reference<T&> : true_type {};
-template <class T> struct is_non_const_reference<const T&> : false_type {};
-
-template <class T> struct is_const : false_type {};
-template <class T> struct is_const<const T> : true_type {};
-
-template <class T> struct is_void : false_type {};
-template <> struct is_void<void> : true_type {};
-
-namespace internal {
-
-// Types YesType and NoType are guaranteed such that sizeof(YesType) <
-// sizeof(NoType).
-typedef char YesType;
-
-struct NoType {
-  YesType dummy[2];
-};
-
-// This class is an implementation detail for is_convertible, and you
-// don't need to know how it works to use is_convertible. For those
-// who care: we declare two different functions, one whose argument is
-// of type To and one with a variadic argument list. We give them
-// return types of different size, so we can use sizeof to trick the
-// compiler into telling us which function it would have chosen if we
-// had called it with an argument of type From.  See Alexandrescu's
-// _Modern C++ Design_ for more details on this sort of trick.
-
-struct ConvertHelper {
-  template <typename To>
-  static YesType Test(To);
-
-  template <typename To>
-  static NoType Test(...);
-
-  template <typename From>
-  static From& Create();
-};
-
-// Used to determine if a type is a struct/union/class. Inspired by Boost's
-// is_class type_trait implementation.
-struct IsClassHelper {
-  template <typename C>
-  static YesType Test(void(C::*)(void));
-
-  template <typename C>
-  static NoType Test(...);
-};
-
-}  // namespace internal
-
-// Inherits from true_type if From is convertible to To, false_type otherwise.
-//
-// Note that if the type is convertible, this will be a true_type REGARDLESS
-// of whether or not the conversion would emit a warning.
-template <typename From, typename To>
-struct is_convertible
-    : integral_constant<bool,
-                        sizeof(internal::ConvertHelper::Test<To>(
-                                   internal::ConvertHelper::Create<From>())) ==
-                        sizeof(internal::YesType)> {
-};
-
-template <typename T>
-struct is_class
-    : integral_constant<bool,
-                        sizeof(internal::IsClassHelper::Test<T>(0)) ==
-                            sizeof(internal::YesType)> {
-};
-
-template<bool B, class T = void>
-struct enable_if {};
-
-template<class T>
-struct enable_if<true, T> { typedef T type; };
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_TEMPLATE_UTIL_H_
diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/build/build_config.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/build/build_config.h
deleted file mode 100644
index eca51a5cc7..0000000000
--- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/build/build_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
-#define MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
-
-#if defined(__APPLE__)
-#define OS_MACOSX 1
-#elif defined(__ANDROID__)
-#define OS_ANDROID 1
-#elif defined(__linux__)
-#define OS_LINUX 1
-#elif defined(_WIN32)
-#define OS_WIN 1
-#else
-#error Please add support for your platform in build/build_config.h
-#endif
-
-#if defined(OS_MACOSX)
-#include <TargetConditionals.h>
-#if defined(TARGET_OS_IOS)
-#if TARGET_OS_IOS
-#define OS_IOS 1
-#endif
-#elif defined(TARGET_OS_IPHONE)
-#if TARGET_OS_IPHONE
-#define OS_IOS 1
-#endif
-#endif
-#endif
-
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_ANDROID)
-#define OS_POSIX 1
-#endif
-
-// Compiler detection.
-#if defined(__GNUC__)
-#define COMPILER_GCC 1
-#elif defined(_MSC_VER)
-#define COMPILER_MSVC 1
-#else
-#error Please add support for your compiler in build/build_config.h
-#endif
-
-#if defined(_M_X64) || defined(__x86_64__)
-#define ARCH_CPU_X86_FAMILY 1
-#define ARCH_CPU_X86_64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(_M_IX86) || defined(__i386__)
-#define ARCH_CPU_X86_FAMILY 1
-#define ARCH_CPU_X86 1
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__ARMEL__)
-#define ARCH_CPU_ARM_FAMILY 1
-#define ARCH_CPU_ARMEL 1
-#define ARCH_CPU_32_BITS 1
-#elif defined(__aarch64__)
-#define ARCH_CPU_ARM_FAMILY 1
-#define ARCH_CPU_ARM64 1
-#define ARCH_CPU_64_BITS 1
-#else
-#error Please add support for your architecture in build/build_config.h
-#endif
-
-#if !defined(ARCH_CPU_LITTLE_ENDIAN) && !defined(ARCH_CPU_BIG_ENDIAN)
-#if defined(__LITTLE_ENDIAN__) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__BIG_ENDIAN__) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#define ARCH_CPU_BIG_ENDIAN 1
-#else
-#error Please add support for your architecture in build/build_config.h
-#endif
-#endif
-
-#if defined(OS_POSIX) && defined(COMPILER_GCC) && \
-    defined(__WCHAR_MAX__) && \
-    (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
-#define WCHAR_T_IS_UTF32
-#elif defined(OS_WIN)
-#define WCHAR_T_IS_UTF16
-#else
-#error Please add support for your compiler in build/build_config.h
-#endif
-
-#endif  // MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
diff --git a/Tools/Crashpad/include/tools/tool_support.h b/Tools/Crashpad/include/tools/tool_support.h
deleted file mode 100644
index 48f412f35f..0000000000
--- a/Tools/Crashpad/include/tools/tool_support.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_TOOLS_TOOL_SUPPORT_H_
-#define CRASHPAD_TOOLS_TOOL_SUPPORT_H_
-
-#include <string>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "base/strings/string_piece.h"
-#include "build/build_config.h"
-
-namespace crashpad {
-
-//! \brief Common functions used by command line tools.
-class ToolSupport {
- public:
-  //! \brief Handles `--version`.
-  //!
-  //! \param[in] me The tool’s name, the basename of `argv[0]`.
-  static void Version(const base::FilePath& me);
-
-  //! \brief Prints the footer for `--help`.
-  //!
-  //! \param[in] me The tool’s name, the basename of `argv[0]`.
-  static void UsageTail(const base::FilePath& me);
-
-  //! \brief Suggests using `--help` when a command line tool can’t make sense
-  //!     of its arguments.
-  //!
-  //! \param[in] me The tool’s name, the basename of `argv[0]`.
-  //! \param[in] hint A hint to display before the suggestion to try `--help`.
-  //!     Optional, may be `nullptr`, in which case no hint will be presented.
-  static void UsageHint(const base::FilePath& me, const char* hint);
-
-#if defined(OS_POSIX) || DOXYGEN
-  //! \copydoc Version
-  static void Version(const std::string& me);
-
-  //! \copydoc UsageTail
-  static void UsageTail(const std::string& me);
-
-  //! \copydoc UsageHint
-  static void UsageHint(const std::string& me, const char* hint);
-#endif  // OS_POSIX
-
-#if defined(OS_WIN) || DOXYGEN
-  //! \brief Converts \a argv `wchar_t` UTF-16 to UTF-8, and passes onwards to a
-  //!     UTF-8 entry point.
-  //!
-  //! \return The return value of \a entry.
-  static int Wmain(int argc, wchar_t* argv[], int (*entry)(int, char*[]));
-#endif  // OS_WIN
-
-  //! \brief Converts a command line argument to the string type suitable for
-  //!     base::FilePath.
-  //!
-  //! On POSIX, this is a no-op. On Windows, assumes that Wmain() was used, and
-  //! the input argument was converted from UTF-16 in a `wchar_t*` to UTF-8 in a
-  //! `char*`. This undoes that transformation.
-  //!
-  //! \sa Wmain()
-  //! \sa FilePathToCommandLineArgument()
-  static base::FilePath::StringType CommandLineArgumentToFilePathStringType(
-      const base::StringPiece& arg);
-
-  //! \brief Converts a base::FilePath to a command line argument.
-  //!
-  //! On POSIX, this is a no-op. On Windows, this undoes the transformation done
-  //! by CommandLineArgumentToFilePathStringType() in the same manner as
-  //! Wmain().
-  static std::string FilePathToCommandLineArgument(
-      const base::FilePath& file_path);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ToolSupport);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_TOOLS_TOOL_SUPPORT_H_
diff --git a/Tools/Crashpad/include/util/file/delimited_file_reader.h b/Tools/Crashpad/include/util/file/delimited_file_reader.h
deleted file mode 100644
index 93fd738062..0000000000
--- a/Tools/Crashpad/include/util/file/delimited_file_reader.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_DELIMITED_FILE_READER_H_
-#define CRASHPAD_UTIL_FILE_DELIMITED_FILE_READER_H_
-
-#include <stdint.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "util/file/file_reader.h"
-
-namespace crashpad {
-
-//! \brief Reads a file one field or line at a time.
-//!
-//! The file is interpreted as a series of fields separated by delimiter
-//! characters. When the delimiter character is the newline character
-//! (<code>'\\n'</code>), the file is interpreted as a series of lines.
-//!
-//! It is safe to mix GetDelim() and GetLine() calls, if appropriate for the
-//! format being interpreted.
-//!
-//! This is a replacement for the standard library’s `getdelim()` and
-//! `getline()` functions, adapted to work with FileReaderInterface objects
-//! instead of `FILE*` streams.
-class DelimitedFileReader {
- public:
-  //! \brief The result of a GetDelim() or GetLine() call.
-  enum class Result {
-    //! \brief An error occurred, and a message was logged.
-    kError = -1,
-
-    //! \brief A field or line was read from the file.
-    kSuccess,
-
-    //! \brief The end of the file was encountered.
-    kEndOfFile,
-  };
-
-  explicit DelimitedFileReader(FileReaderInterface* file_reader);
-  ~DelimitedFileReader();
-
-  //! \brief Reads a single field from the file.
-  //!
-  //! \param[in] delimiter The delimiter character that terminates the field.
-  //!     It is safe to call this method multiple times while changing the value
-  //!     of this parameter, if appropriate for the format being interpreted.
-  //! \param[out] field The field read from the file. This parameter will
-  //!     include the field’s terminating delimiter character unless the field
-  //!     was at the end of the file and was read without such a character.
-  //!     This parameter will not be empty.
-  //!
-  //! \return a #Result value. \a field is only valid when Result::kSuccess is
-  //!     returned.
-  Result GetDelim(char delimiter, std::string* field);
-
-  //! \brief Reads a single line from the file.
-  //!
-  //! \param[out] line The line read from the file. This parameter will include
-  //!     the line terminating delimiter character unless the line was at the
-  //!     end of the file and was read without such a character. This parameter
-  //!     will not be empty.
-  //!
-  //! \return a #Result value. \a line is only valid when Result::kSuccess is
-  //!     returned.
-  Result GetLine(std::string* line);
-
- private:
-  char buf_[4096];
-  FileReaderInterface* file_reader_;  // weak
-  uint16_t buf_pos_;  // Index into buf_ of the start of the next field.
-  uint16_t buf_len_;  // The size of buf_ that’s been filled.
-  bool eof_;  // Caches the EOF signal when detected following a partial field.
-
-  DISALLOW_COPY_AND_ASSIGN(DelimitedFileReader);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_DELIMITED_FILE_READER_H_
diff --git a/Tools/Crashpad/include/util/file/directory_reader.h b/Tools/Crashpad/include/util/file/directory_reader.h
deleted file mode 100644
index d3976929c9..0000000000
--- a/Tools/Crashpad/include/util/file/directory_reader.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_DIRECTORY_READER_H_
-#define CRASHPAD_UTIL_FILE_DIRECTORY_READER_H_
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-#include "util/posix/scoped_dir.h"
-#elif defined(OS_WIN)
-#include <windows.h>
-
-#include "util/win/scoped_handle.h"
-#endif  // OS_POSIX
-
-namespace crashpad {
-
-//! \brief Iterates over the file and directory names in a directory.
-//!
-//! The names enumerated are relative to the specified directory and do not
-//! include ".", "..", or files and directories in subdirectories.
-class DirectoryReader {
- public:
-  //! \brief The result of a call to NextFile().
-  enum class Result {
-    //! \brief An error occurred and a message was logged.
-    kError = -1,
-
-    //! \brief A file was found.
-    kSuccess,
-
-    //! \brief No more files were found.
-    kNoMoreFiles,
-  };
-
-  DirectoryReader();
-  ~DirectoryReader();
-
-  //! \brief Opens the directory specified by \a path for reading.
-  //!
-  //! \param[in] path The path to the directory to read.
-  //! \return `true` on success. `false` on failure with a message logged.
-  bool Open(const base::FilePath& path);
-
-  //! \brief Advances the reader to the next file in the directory.
-  //!
-  //! \param[out] filename The filename of the next file.
-  //! \return a #Result value. \a filename is only valid when Result::kSuccess
-  //!     is returned. If Result::kError is returned, a message will be
-  //!     logged.
-  Result NextFile(base::FilePath* filename);
-
-#if defined(OS_POSIX) || DOXYGEN
-  //! \brief Returns the file descriptor associated with this reader, logging a
-  //!     message and returning -1 on error.
-  int DirectoryFD();
-#endif
-
- private:
-#if defined(OS_POSIX)
-  ScopedDIR dir_;
-#elif defined(OS_WIN)
-  WIN32_FIND_DATA find_data_;
-  ScopedSearchHANDLE handle_;
-  bool first_entry_;
-#endif  // OS_POSIX
-
-  DISALLOW_COPY_AND_ASSIGN(DirectoryReader);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_DIRECTORY_READER_H_
diff --git a/Tools/Crashpad/include/util/file/file_io.h b/Tools/Crashpad/include/util/file/file_io.h
deleted file mode 100644
index 87c40702a8..0000000000
--- a/Tools/Crashpad/include/util/file/file_io.h
+++ /dev/null
@@ -1,473 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_FILE_IO_H_
-#define CRASHPAD_UTIL_FILE_FILE_IO_H_
-
-#include <sys/types.h>
-
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-#include "base/files/scoped_file.h"
-#elif defined(OS_WIN)
-#include <windows.h>
-#include "util/win/scoped_handle.h"
-#endif
-
-namespace base {
-class FilePath;
-}  // namespace base
-
-namespace crashpad {
-
-#if defined(OS_POSIX) || DOXYGEN
-
-//! \brief Platform-specific alias for a low-level file handle.
-using FileHandle = int;
-
-//! \brief Platform-specific alias for a position in an open file.
-using FileOffset = off_t;
-
-//! \brief Scoped wrapper of a FileHandle.
-using ScopedFileHandle = base::ScopedFD;
-
-//! \brief A value that can never be a valid FileHandle.
-const FileHandle kInvalidFileHandle = -1;
-
-using FileOperationResult = ssize_t;
-
-#elif defined(OS_WIN)
-
-using FileHandle = HANDLE;
-using FileOffset = LONGLONG;
-using ScopedFileHandle = ScopedFileHANDLE;
-using FileOperationResult = LONG_PTR;
-
-const FileHandle kInvalidFileHandle = INVALID_HANDLE_VALUE;
-
-#endif
-
-//! \brief Determines the mode that LoggingOpenFileForWrite() uses.
-enum class FileWriteMode {
-  //! \brief Opens the file if it exists, or fails if it does not.
-  kReuseOrFail,
-
-  //! \brief Opens the file if it exists, or creates a new file.
-  kReuseOrCreate,
-
-  //! \brief Creates a new file. If the file already exists, it will be
-  //!     overwritten.
-  kTruncateOrCreate,
-
-  //! \brief Creates a new file. If the file already exists, the open will fail.
-  kCreateOrFail,
-};
-
-//! \brief Determines the permissions bits for files created on POSIX systems.
-enum class FilePermissions : bool {
-  //! \brief Equivalent to `0600`.
-  kOwnerOnly,
-
-  //! \brief Equivalent to `0644`.
-  kWorldReadable,
-};
-
-//! \brief Determines the locking mode that LoggingLockFile() uses.
-enum class FileLocking : bool {
-  //! \brief Equivalent to `flock()` with `LOCK_SH`.
-  kShared,
-
-  //! \brief Equivalent to `flock()` with `LOCK_EX`.
-  kExclusive,
-};
-
-//! \brief Determines the FileHandle that StdioFileHandle() returns.
-enum class StdioStream {
-  //! \brief Standard input, or `stdin`.
-  kStandardInput,
-
-  //! \brief Standard output, or `stdout`.
-  kStandardOutput,
-
-  //! \brief Standard error, or `stderr`.
-  kStandardError,
-};
-
-namespace internal {
-
-//! \brief The name of the native read function used by ReadFile().
-//!
-//! This value may be useful for logging.
-//!
-//! \sa kNativeWriteFunctionName
-extern const char kNativeReadFunctionName[];
-
-//! \brief The name of the native write function used by WriteFile().
-//!
-//! This value may be useful for logging.
-//!
-//! \sa kNativeReadFunctionName
-extern const char kNativeWriteFunctionName[];
-
-//! \brief The internal implementation of ReadFileExactly() and its wrappers.
-//!
-//! The logic is exposed so that it may be reused by FileReaderInterface, and
-//! so that it may be tested without requiring large files to be read. It is not
-//! intended to be used more generally. Use ReadFileExactly(),
-//! LoggingReadFileExactly(), CheckedReadFileExactly(), or
-//! FileReaderInterface::ReadExactly() instead.
-class ReadExactlyInternal {
- public:
-  //! \brief Calls Read(), retrying following a short read, ensuring that
-  //!     exactly \a size bytes are read.
-  //!
-  //! \return `true` on success. `false` if the underlying Read() fails or if
-  //!     fewer than \a size bytes were read. When returning `false`, if \a
-  //!     can_log is `true`, logs a message.
-  bool ReadExactly(void* buffer, size_t size, bool can_log);
-
- protected:
-  ReadExactlyInternal() {}
-  ~ReadExactlyInternal() {}
-
- private:
-  //! \brief Wraps a read operation, such as ReadFile().
-  //!
-  //! \return The number of bytes read and placed into \a buffer, or `-1` on
-  //!     error. When returning `-1`, if \a can_log is `true`, logs a message.
-  virtual FileOperationResult Read(void* buffer, size_t size, bool can_log) = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(ReadExactlyInternal);
-};
-
-//! \brief The internal implementation of WriteFile() and its wrappers.
-//!
-//! The logic is exposed so that it may be tested without requiring large files
-//! to be written. It is not intended to be used more generally. Use
-//! WriteFile(), LoggingWriteFile(), CheckedWriteFile(), or
-//! FileWriterInterface::Write() instead.
-class WriteAllInternal {
- public:
-  //! \brief Calls Write(), retrying following a short write, ensuring that
-  //!     exactly \a size bytes are written.
-  //!
-  //! \return `true` on success. `false` if the underlying Write() fails or if
-  //!     fewer than \a size bytes were written.
-  bool WriteAll(const void* buffer, size_t size);
-
- protected:
-  WriteAllInternal() {}
-  ~WriteAllInternal() {}
-
- private:
-  //! \brief Wraps a write operation, such as NativeWriteFile().
-  //!
-  //! \return The number of bytes written from \a buffer, or `-1` on error.
-  virtual FileOperationResult Write(const void* buffer, size_t size) = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(WriteAllInternal);
-};
-
-//! \brief Writes to a file, retrying when interrupted on POSIX.
-//!
-//! Fewer than \a size bytes may be written to \a file. This can happen if the
-//! underlying write operation returns before writing the entire buffer, or if
-//! the buffer is too large to write in a single operation, possibly due to a
-//! limitation of a data type used to express the number of bytes written.
-//!
-//! This function adapts native write operations for uniform use by WriteFile().
-//! This function should only be called by WriteFile(). Other code should call
-//! WriteFile() or another function that wraps WriteFile().
-//!
-//! \param[in] file The file to write to.
-//! \param[in] buffer A buffer containing data to be written.
-//! \param[in] size The number of bytes from \a buffer to write.
-//!
-//! \return The number of bytes actually written from \a buffer to \a file on
-//!     success. `-1` on error, with `errno` or `GetLastError()` set
-//!     appropriately.
-FileOperationResult NativeWriteFile(FileHandle file,
-                                    const void* buffer,
-                                    size_t size);
-
-}  // namespace internal
-
-//! \brief Reads from a file, retrying when interrupted before reading any data
-//!     on POSIX.
-//!
-//! This function reads into \a buffer. Fewer than \a size bytes may be read.
-//! On Windows, reading from sockets is not currently supported.
-//!
-//! \return The number of bytes read and placed into \a buffer, or `-1` on
-//!     error, with `errno` or `GetLastError()` set appropriately. On error, a
-//!     portion of \a file may have been read into \a buffer.
-//!
-//! \sa WriteFile
-//! \sa ReadFileExactly
-//! \sa LoggingReadFileExactly
-//! \sa CheckedReadFileExactly
-//! \sa CheckedReadFileAtEOF
-FileOperationResult ReadFile(FileHandle file, void* buffer, size_t size);
-
-//! \brief Writes to a file, retrying when interrupted on POSIX or following a
-//!     short write.
-//!
-//! This function writes to \a file, stopping only when \a size bytes have been
-//! written.
-//!
-//! \return `true` on success. `false` on error, with `errno` or
-//!     `GetLastError()` set appropriately. On error, a portion of \a buffer may
-//!     have been written to \a file.
-//!
-//! \sa ReadFile
-//! \sa LoggingWriteFile
-//! \sa CheckedWriteFile
-bool WriteFile(FileHandle file, const void* buffer, size_t size);
-
-//! \brief Wraps ReadFile(), retrying following a short read, ensuring that
-//!     exactly \a size bytes are read.
-//!
-//! \return `true` on success. If the underlying ReadFile() fails, or if fewer
-//!     than \a size bytes were read, this function logs a message and
-//!     returns `false`.
-//!
-//! \sa LoggingWriteFile
-//! \sa ReadFile
-//! \sa LoggingReadFileExactly
-//! \sa CheckedReadFileExactly
-//! \sa CheckedReadFileAtEOF
-bool ReadFileExactly(FileHandle file, void* buffer, size_t size);
-
-//! \brief Wraps ReadFile(), retrying following a short read, ensuring that
-//!     exactly \a size bytes are read.
-//!
-//! \return `true` on success. If the underlying ReadFile() fails, or if fewer
-//!     than \a size bytes were read, this function logs a message and
-//!     returns `false`.
-//!
-//! \sa LoggingWriteFile
-//! \sa ReadFile
-//! \sa ReadFileExactly
-//! \sa CheckedReadFileExactly
-//! \sa CheckedReadFileAtEOF
-bool LoggingReadFileExactly(FileHandle file, void* buffer, size_t size);
-
-//! \brief Wraps WriteFile(), ensuring that exactly \a size bytes are written.
-//!
-//! \return `true` on success. If the underlying WriteFile() fails, or if fewer
-//!     than \a size bytes were written, this function logs a message and
-//!     returns `false`.
-//!
-//! \sa LoggingReadFileExactly
-//! \sa WriteFile
-//! \sa CheckedWriteFile
-bool LoggingWriteFile(FileHandle file, const void* buffer, size_t size);
-
-//! \brief Wraps ReadFile(), ensuring that exactly \a size bytes are read.
-//!
-//! If the underlying ReadFile() fails, or if fewer than \a size bytes were
-//! read, this function causes execution to terminate without returning.
-//!
-//! \sa CheckedWriteFile
-//! \sa ReadFile
-//! \sa LoggingReadFileExactly
-//! \sa CheckedReadFileAtEOF
-void CheckedReadFileExactly(FileHandle file, void* buffer, size_t size);
-
-//! \brief Wraps WriteFile(), ensuring that exactly \a size bytes are written.
-//!
-//! if the underlying WriteFile() fails, or if fewer than \a size bytes were
-//! written, this function causes execution to terminate without returning.
-//!
-//! \sa CheckedReadFileExactly
-//! \sa WriteFile
-//! \sa LoggingWriteFile
-void CheckedWriteFile(FileHandle file, const void* buffer, size_t size);
-
-//! \brief Wraps ReadFile(), ensuring that it indicates end-of-file.
-//!
-//! Attempts to read a single byte from \a file, expecting no data to be read.
-//! If the underlying ReadFile() fails, or if a byte actually is read, this
-//! function causes execution to terminate without returning.
-//!
-//! \sa CheckedReadFileExactly
-//! \sa ReadFile
-void CheckedReadFileAtEOF(FileHandle file);
-
-//! \brief Wraps `open()` or `CreateFile()`, opening an existing file for
-//!     reading.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa OpenFileForWrite
-//! \sa OpenFileForReadAndWrite
-//! \sa LoggingOpenFileForRead
-FileHandle OpenFileForRead(const base::FilePath& path);
-
-//! \brief Wraps `open()` or `CreateFile()`, creating a file for output.
-//!
-//! \a mode determines the style (truncate, reuse, etc.) that is used to open
-//! the file. On POSIX, \a permissions determines the value that is passed as
-//! `mode` to `open()`. On Windows, the file is always opened in binary mode
-//! (that is, no CRLF translation). On Windows, the file is opened for sharing,
-//! see LoggingLockFile() and LoggingUnlockFile() to control concurrent access.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa OpenFileForRead
-//! \sa OpenFileForReadAndWrite
-//! \sa LoggingOpenFileForWrite
-FileHandle OpenFileForWrite(const base::FilePath& path,
-                            FileWriteMode mode,
-                            FilePermissions permissions);
-
-//! \brief Wraps `open()` or `CreateFile()`, creating a file for both input and
-//!     output.
-//!
-//! \a mode determines the style (truncate, reuse, etc.) that is used to open
-//! the file. On POSIX, \a permissions determines the value that is passed as
-//! `mode` to `open()`. On Windows, the file is always opened in binary mode
-//! (that is, no CRLF translation). On Windows, the file is opened for sharing,
-//! see LoggingLockFile() and LoggingUnlockFile() to control concurrent access.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa OpenFileForRead
-//! \sa OpenFileForWrite
-//! \sa LoggingOpenFileForReadAndWrite
-FileHandle OpenFileForReadAndWrite(const base::FilePath& path,
-                                   FileWriteMode mode,
-                                   FilePermissions permissions);
-
-//! \brief Wraps OpenFileForRead(), logging an error if the operation fails.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa LoggingOpenFileForWrite
-//! \sa LoggingOpenFileForReadAndWrite
-FileHandle LoggingOpenFileForRead(const base::FilePath& path);
-
-//! \brief Wraps OpenFileForWrite(), logging an error if the operation fails.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa LoggingOpenFileForRead
-//! \sa LoggingOpenFileForReadAndWrite
-FileHandle LoggingOpenFileForWrite(const base::FilePath& path,
-                                   FileWriteMode mode,
-                                   FilePermissions permissions);
-
-//! \brief Wraps OpenFileForReadAndWrite(), logging an error if the operation
-//!     fails.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa LoggingOpenFileForRead
-//! \sa LoggingOpenFileForWrite
-FileHandle LoggingOpenFileForReadAndWrite(const base::FilePath& path,
-                                          FileWriteMode mode,
-                                          FilePermissions permissions);
-
-//! \brief Locks the given \a file using `flock()` on POSIX or `LockFileEx()` on
-//!     Windows.
-//!
-//! It is an error to attempt to lock a file in a different mode when it is
-//! already locked. This call will block until the lock is acquired. The
-//! entire file is locked.
-//!
-//! If \a locking is FileLocking::kShared, \a file must have been opened for
-//! reading, and if it's FileLocking::kExclusive, \a file must have been opened
-//! for writing.
-//!
-//! \param[in] file The open file handle to be locked.
-//! \param[in] locking Controls whether the lock is a shared reader lock, or an
-//!     exclusive writer lock.
-//!
-//! \return `true` on success, or `false` and a message will be logged.
-bool LoggingLockFile(FileHandle file, FileLocking locking);
-
-//! \brief Unlocks a file previously locked with LoggingLockFile().
-//!
-//! It is an error to attempt to unlock a file that was not previously locked.
-//! A previously-locked file should be unlocked before closing the file handle,
-//! otherwise on some OSs the lock may not be released immediately.
-//!
-//! \param[in] file The open locked file handle to be unlocked.
-//!
-//! \return `true` on success, or `false` and a message will be logged.
-bool LoggingUnlockFile(FileHandle file);
-
-//! \brief Wraps `lseek()` or `SetFilePointerEx()`. Logs an error if the
-//!     operation fails.
-//!
-//! Repositions the offset of the open \a file to the specified \a offset,
-//! relative to \a whence. \a whence must be one of `SEEK_SET`, `SEEK_CUR`, or
-//! `SEEK_END`, and is interpreted in the usual way.
-//!
-//! \return The resulting offset in bytes from the beginning of the file, or
-//!     `-1` on failure.
-FileOffset LoggingSeekFile(FileHandle file, FileOffset offset, int whence);
-
-//! \brief Truncates the given \a file to zero bytes in length.
-//!
-//! \return `true` on success, or `false`, and a message will be logged.
-bool LoggingTruncateFile(FileHandle file);
-
-//! \brief Wraps `close()` or `CloseHandle()`, logging an error if the operation
-//!     fails.
-//!
-//! \return On success, `true` is returned. On failure, an error is logged and
-//!     `false` is returned.
-bool LoggingCloseFile(FileHandle file);
-
-//! \brief Wraps `close()` or `CloseHandle()`, ensuring that it succeeds.
-//!
-//! If the underlying function fails, this function causes execution to
-//! terminate without returning.
-void CheckedCloseFile(FileHandle file);
-
-//! \brief Determines the size of a file.
-//!
-//! \param[in] file The handle to the file for which the size should be
-//!     retrieved.
-//!
-//! \return The size of the file. If an error occurs when attempting to
-//!     determine its size, returns `-1` with an error logged.
-FileOffset LoggingFileSizeByHandle(FileHandle file);
-
-//! \brief Returns a FileHandle corresponding to the requested standard I/O
-//!     stream.
-//!
-//! The returned FileHandle should not be closed on POSIX, where it is
-//! important to maintain valid file descriptors occupying the slots reserved
-//! for these streams. If a need to close such a stream arises on POSIX,
-//! `dup2()` should instead be used to replace the existing file descriptor with
-//! one opened to `/dev/null`. See CloseStdinAndStdout().
-//!
-//! \param[in] stdio_stream The requested standard I/O stream.
-//!
-//! \return A corresponding FileHandle on success. kInvalidFileHandle on error,
-//!     with a message logged.
-FileHandle StdioFileHandle(StdioStream stdio_stream);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_FILE_IO_H_
diff --git a/Tools/Crashpad/include/util/file/file_reader.h b/Tools/Crashpad/include/util/file/file_reader.h
deleted file mode 100644
index d44be1c142..0000000000
--- a/Tools/Crashpad/include/util/file/file_reader.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_FILE_READER_H_
-#define CRASHPAD_UTIL_FILE_FILE_READER_H_
-
-#include <sys/types.h>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "util/file/file_io.h"
-#include "util/file/file_seeker.h"
-
-namespace crashpad {
-
-//! \brief An interface to read to files and other file-like objects with
-//!     semantics matching the underlying platform (POSIX or Windows).
-class FileReaderInterface : public virtual FileSeekerInterface {
- public:
-  virtual ~FileReaderInterface() {}
-
-  //! \brief Wraps ReadFile(), or provides an implementation with identical
-  //!     semantics.
-  //!
-  //! \return The number of bytes actually read if the operation succeeded,
-  //!     which may be `0` or any positive value less than or equal to \a size.
-  //!     `-1` if the operation failed, with an error message logged.
-  virtual FileOperationResult Read(void* data, size_t size) = 0;
-
-  //! \brief Wraps Read(), ensuring that the read succeeded and exactly \a size
-  //!     bytes were read.
-  //!
-  //! Semantically, this behaves as LoggingReadFileExactly().
-  //!
-  //! \return `true` if the operation succeeded, `false` if it failed, with an
-  //!     error message logged. Short reads are treated as failures.
-  bool ReadExactly(void* data, size_t size);
-};
-
-//! \brief A file reader backed by a FileHandle.
-//!
-//! FileReader requires users to provide a FilePath to open, but this class
-//! accepts an already-open FileHandle instead. Like FileReader, this class may
-//! read from a filesystem-based file, but unlike FileReader, this class is not
-//! responsible for opening or closing the file. Users of this class must ensure
-//! that the file handle is closed appropriately elsewhere. Objects of this
-//! class may be used to read from file handles not associated with
-//! filesystem-based files, although special attention should be paid to the
-//! Seek() method, which may not function on file handles that do not refer to
-//! disk-based files.
-//!
-//! This class is expected to be used when other code is responsible for
-//! opening files and already provides file handles.
-class WeakFileHandleFileReader : public FileReaderInterface {
- public:
-  explicit WeakFileHandleFileReader(FileHandle file_handle);
-  ~WeakFileHandleFileReader() override;
-
-  // FileReaderInterface:
-  FileOperationResult Read(void* data, size_t size) override;
-
-  // FileSeekerInterface:
-
-  //! \copydoc FileReaderInterface::Seek()
-  //!
-  //! \note This method is only guaranteed to function on file handles referring
-  //!     to disk-based files.
-  FileOffset Seek(FileOffset offset, int whence) override;
-
- private:
-  void set_file_handle(FileHandle file_handle) { file_handle_ = file_handle; }
-
-  FileHandle file_handle_;  // weak
-
-  // FileReader uses this class as its internal implementation, and it needs to
-  // be able to call set_file_handle(). FileReader cannot initialize a
-  // WeakFileHandleFileReader with a correct file descriptor at the time of
-  // construction because no file descriptor will be available until
-  // FileReader::Open() is called.
-  friend class FileReader;
-
-  DISALLOW_COPY_AND_ASSIGN(WeakFileHandleFileReader);
-};
-
-//! \brief A file reader implementation that wraps traditional system file
-//!     operations on files accessed through the filesystem.
-class FileReader : public FileReaderInterface {
- public:
-  FileReader();
-  ~FileReader() override;
-
-  // FileReaderInterface:
-
-  //! \brief Wraps LoggingOpenFileForRead().
-  //!
-  //! \return `true` if the operation succeeded, `false` if it failed, with an
-  //!     error message logged.
-  //!
-  //! \note After a successful call, this method cannot be called again until
-  //!     after Close().
-  bool Open(const base::FilePath& path);
-
-  //! \brief Wraps CheckedCloseHandle().
-  //!
-  //! \note It is only valid to call this method on an object that has had a
-  //!     successful Open() that has not yet been matched by a subsequent call
-  //!     to this method.
-  void Close();
-
-  // FileReaderInterface:
-
-  //! \copydoc FileReaderInterface::Read()
-  //!
-  //! \note It is only valid to call this method between a successful Open() and
-  //!     a Close().
-  FileOperationResult Read(void* data, size_t size) override;
-
-  // FileSeekerInterface:
-
-  //! \copydoc FileReaderInterface::Seek()
-  //!
-  //! \note It is only valid to call this method between a successful Open() and
-  //!     a Close().
-  FileOffset Seek(FileOffset offset, int whence) override;
-
- private:
-  ScopedFileHandle file_;
-  WeakFileHandleFileReader weak_file_handle_file_reader_;
-
-  DISALLOW_COPY_AND_ASSIGN(FileReader);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_FILE_READER_H_
diff --git a/Tools/Crashpad/include/util/file/file_seeker.h b/Tools/Crashpad/include/util/file/file_seeker.h
deleted file mode 100644
index a7cff90807..0000000000
--- a/Tools/Crashpad/include/util/file/file_seeker.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_FILE_SEEKER_H_
-#define CRASHPAD_UTIL_FILE_FILE_SEEKER_H_
-
-#include "util/file/file_io.h"
-
-namespace crashpad {
-
-//! \brief An interface to seek in files and other file-like objects with
-//!     semantics matching the underlying platform (POSIX or Windows).
-class FileSeekerInterface {
- public:
-  //! \brief Wraps LoggingSeekFile() or provides an alternate implementation
-  //!     with identical semantics.
-  //!
-  //! \return The return value of LoggingSeekFile(). `-1` on failure,
-  //!     with an error message logged.
-  virtual FileOffset Seek(FileOffset offset, int whence) = 0;
-
-  //! \brief Wraps Seek(), using `SEEK_CUR` to obtain the file’s current
-  //!     position.
-  //!
-  //! \return The file’s current position on success. `-1` on failure, with an
-  //!     error message logged.
-  FileOffset SeekGet();
-
-  //! \brief Wraps Seek(), using `SEEK_SET`, ensuring that the seek succeeded
-  //!     and the file is positioned as desired.
-  //!
-  //! \return `true` if the operation succeeded, `false` if it failed, with an
-  //!     error message logged. A failure to reposition the file as desired is
-  //!     treated as a failure.
-  bool SeekSet(FileOffset offset);
-
- protected:
-  ~FileSeekerInterface() {}
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_FILE_SEEKER_H_
diff --git a/Tools/Crashpad/include/util/file/file_writer.h b/Tools/Crashpad/include/util/file/file_writer.h
deleted file mode 100644
index ed261ec544..0000000000
--- a/Tools/Crashpad/include/util/file/file_writer.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_FILE_WRITER_H_
-#define CRASHPAD_UTIL_FILE_FILE_WRITER_H_
-
-#include <sys/types.h>
-
-#include <vector>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "util/file/file_io.h"
-#include "util/file/file_seeker.h"
-
-namespace crashpad {
-
-//! \brief A version of `iovec` with a `const` #iov_base field.
-//!
-//! This structure is intended to be used for write operations.
-//
-// Type compatibility with iovec is tested with static assertions in the
-// implementation file.
-struct WritableIoVec {
-  //! \brief The base address of a memory region for output.
-  const void* iov_base;
-
-  //! \brief The size of the memory pointed to by #iov_base.
-  size_t iov_len;
-};
-
-//! \brief An interface to write to files and other file-like objects with
-//!     semantics matching the underlying platform (POSIX or Windows).
-class FileWriterInterface : public virtual FileSeekerInterface {
- public:
-  virtual ~FileWriterInterface() {}
-
-  //! \brief Wraps LoggingWriteFile(), or provides an implementation with
-  //!     identical semantics.
-  //!
-  //! \return `true` if the operation succeeded, `false` if it failed, with an
-  //!     error message logged.
-  virtual bool Write(const void* data, size_t size) = 0;
-
-  //! \brief Wraps `writev()` on POSIX or provides an alternate implementation
-  //!     with identical semantics. This method will write entire buffers,
-  //!     continuing after a short write or after being interrupted. On
-  //!     non-POSIX this is a simple wrapper around Write().
-  //!
-  //! \return `true` if the operation succeeded, `false` if it failed, with an
-  //!     error message logged.
-  //!
-  //! \note The contents of \a iovecs are undefined when this method returns.
-  virtual bool WriteIoVec(std::vector<WritableIoVec>* iovecs) = 0;
-};
-
-//! \brief A file writer backed by a FileHandle.
-//!
-//! FileWriter requires users to provide a FilePath to open, but this class
-//! accepts an already-open FileHandle instead. Like FileWriter, this class may
-//! write to a filesystem-based file, but unlike FileWriter, this class is not
-//! responsible for creating or closing the file. Users of this class must
-//! ensure that the file handle is closed appropriately elsewhere. Objects of
-//! this class may be used to write to file handles not associated with
-//! filesystem-based files, although special attention should be paid to the
-//! Seek() method, which may not function on file handles that do not refer to
-//! disk-based files.
-//!
-//! This class is expected to be used when other code is responsible for
-//! creating files and already provides file handles.
-class WeakFileHandleFileWriter : public FileWriterInterface {
- public:
-  explicit WeakFileHandleFileWriter(FileHandle file_handle);
-  ~WeakFileHandleFileWriter() override;
-
-  // FileWriterInterface:
-  bool Write(const void* data, size_t size) override;
-  bool WriteIoVec(std::vector<WritableIoVec>* iovecs) override;
-
-  // FileSeekerInterface:
-
-  //! \copydoc FileWriterInterface::Seek()
-  //!
-  //! \note This method is only guaranteed to function on file handles referring
-  //!     to disk-based files.
-  FileOffset Seek(FileOffset offset, int whence) override;
-
- private:
-  void set_file_handle(FileHandle file_handle) { file_handle_ = file_handle; }
-
-  FileHandle file_handle_;  // weak
-
-  // FileWriter uses this class as its internal implementation, and it needs to
-  // be able to call set_file_handle(). FileWriter cannot initialize a
-  // WeakFileHandleFileWriter with a correct file descriptor at the time of
-  // construction because no file descriptor will be available until
-  // FileWriter::Open() is called.
-  friend class FileWriter;
-
-  DISALLOW_COPY_AND_ASSIGN(WeakFileHandleFileWriter);
-};
-
-//! \brief A file writer implementation that wraps traditional system file
-//!     operations on files accessed through the filesystem.
-class FileWriter : public FileWriterInterface {
- public:
-  FileWriter();
-  ~FileWriter() override;
-
-  // FileWriterInterface:
-
-  //! \brief Wraps LoggingOpenFileForWrite().
-  //!
-  //! \return `true` if the operation succeeded, `false` if it failed, with an
-  //!     error message logged.
-  //!
-  //! \note After a successful call, this method cannot be called again until
-  //!     after Close().
-  bool Open(const base::FilePath& path,
-            FileWriteMode write_mode,
-            FilePermissions permissions);
-
-  //! \brief Wraps CheckedCloseHandle().
-  //!
-  //! \note It is only valid to call this method on an object that has had a
-  //!     successful Open() that has not yet been matched by a subsequent call
-  //!     to this method.
-  void Close();
-
-  // FileWriterInterface:
-
-  //! \copydoc FileWriterInterface::Write()
-  //!
-  //! \note It is only valid to call this method between a successful Open() and
-  //!     a Close().
-  bool Write(const void* data, size_t size) override;
-
-  //! \copydoc FileWriterInterface::WriteIoVec()
-  //!
-  //! \note It is only valid to call this method between a successful Open() and
-  //!     a Close().
-  bool WriteIoVec(std::vector<WritableIoVec>* iovecs) override;
-
-  // FileSeekerInterface:
-
-  //! \copydoc FileWriterInterface::Seek()
-  //!
-  //! \note It is only valid to call this method between a successful Open() and
-  //!     a Close().
-  FileOffset Seek(FileOffset offset, int whence) override;
-
- private:
-  ScopedFileHandle file_;
-  WeakFileHandleFileWriter weak_file_handle_file_writer_;
-
-  DISALLOW_COPY_AND_ASSIGN(FileWriter);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_FILE_WRITER_H_
diff --git a/Tools/Crashpad/include/util/file/filesystem.h b/Tools/Crashpad/include/util/file/filesystem.h
deleted file mode 100644
index 27a4d1de6f..0000000000
--- a/Tools/Crashpad/include/util/file/filesystem.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_FILESYSTEM_H_
-#define CRASHPAD_UTIL_FILE_FILESYSTEM_H_
-
-#include <time.h>
-
-#include "base/files/file_path.h"
-#include "util/file/file_io.h"
-
-namespace crashpad {
-
-//! \brief Determines the modification time for a file, directory, or symbolic
-//!     link, logging a message on failure.
-//!
-//! \param[in] path The file to get the modification time for.
-//! \param[out] mtime The modification time as seconds since the POSIX Epoch.
-//! \return `true` on success. `false` on failure with a message logged.
-bool FileModificationTime(const base::FilePath& path, timespec* mtime);
-
-//! \brief Creates a directory, logging a message on failure.
-//!
-//! \param[in] path The path to the directory to create.
-//! \param[in] permissions The permissions to use if the directory is created.
-//! \param[in] may_reuse If `true`, this function will return `true` if a
-//!     directory or symbolic link to a directory with path \a path already
-//!     exists. If the directory already exists, it's permissions may differ
-//!     from \a permissions.
-//! \return `true` if the directory is successfully created or it already
-//!     existed and \a may_reuse is `true`. Otherwise, `false`.
-bool LoggingCreateDirectory(const base::FilePath& path,
-                            FilePermissions permissions,
-                            bool may_reuse);
-
-//! \brief Moves a file, symbolic link, or directory, logging a message on
-//!     failure.
-//!
-//! \a source must exist and refer to a file, symbolic link, or directory.
-//!
-//! \a source and \a dest must be on the same filesystem.
-//!
-//! If \a dest exists, it may be overwritten:
-//!
-//! If \a dest exists and refers to a file or to a live or dangling symbolic
-//! link to a file, it will be overwritten if \a source also refers to a file or
-//! to a live or dangling symbolic link to a file or directory.
-//!
-//! On POSIX, if \a dest refers to a directory, it will be overwritten only if
-//! it is empty and \a source also refers to a directory.
-//!
-//! On Windows, if \a dest refers to a directory or to a live or dangling
-//! symbolic link to a directory, it will not be overwritten.
-//!
-//! \param[in] source The path to the file to be moved.
-//! \param[in] dest The new path for the file.
-//! \return `true` on success. `false` on failure with a message logged.
-bool MoveFileOrDirectory(const base::FilePath& source,
-                         const base::FilePath& dest);
-
-//! \brief Determines if a path refers to a regular file, logging a message on
-//!     failure.
-//!
-//! On POSIX, this function returns `true` if \a path refers to a file that is
-//! not a symbolic link, directory, or other kind of special file.
-//!
-//! On Windows, this function returns `true` if \a path refers to a file that
-//! is not a symbolic link or directory.
-//!
-//! \param[in] path The path to the file to check.
-//! \return `true` if the file exists and is a regular file. Otherwise `false`.
-bool IsRegularFile(const base::FilePath& path);
-
-//! \brief Determines if a path refers to a directory, logging a message on
-//!     failure.
-//!
-//! \param[in] path The path to check.
-//! \param[in] allow_symlinks Whether to allow the final component in the path
-//!     to be a symbolic link to a directory.
-//! \return `true` if the path exists and is a directory. Otherwise `false`.
-bool IsDirectory(const base::FilePath& path, bool allow_symlinks);
-
-//! \brief Removes a file or a symbolic link to a file or directory, logging a
-//!     message on failure.
-//!
-//! \param[in] path The path to the file to remove.
-//! \return `true` on success. `false` on failure with a message logged.
-bool LoggingRemoveFile(const base::FilePath& path);
-
-//! \brief Non-recurseively removes an empty directory, logging a message on
-//!     failure.
-//!
-//! This function will not remove symbolic links to directories.
-//!
-//! \param[in] path The to the directory to remove.
-//! \return `true` if the directory was removed. Otherwise, `false`.
-bool LoggingRemoveDirectory(const base::FilePath& path);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_FILESYSTEM_H_
diff --git a/Tools/Crashpad/include/util/file/scoped_remove_file.h b/Tools/Crashpad/include/util/file/scoped_remove_file.h
deleted file mode 100644
index de4af0d445..0000000000
--- a/Tools/Crashpad/include/util/file/scoped_remove_file.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_SCOPED_REMOVE_FILE_H_
-#define CRASHPAD_UTIL_FILE_SCOPED_REMOVE_FILE_H_
-
-#include "base/files/file_path.h"
-#include "base/scoped_generic.h"
-
-namespace crashpad {
-
-struct ScopedRemoveFileTraits {
-  static base::FilePath InvalidValue() { return base::FilePath(); }
-  static void Free(const base::FilePath& path);
-};
-
-using ScopedRemoveFile =
-    base::ScopedGeneric<base::FilePath, ScopedRemoveFileTraits>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_SCOPED_REMOVE_FILE_H_
diff --git a/Tools/Crashpad/include/util/file/string_file.h b/Tools/Crashpad/include/util/file/string_file.h
deleted file mode 100644
index 313310e678..0000000000
--- a/Tools/Crashpad/include/util/file/string_file.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_STRING_FILE_H_
-#define CRASHPAD_UTIL_FILE_STRING_FILE_H_
-
-#include <sys/types.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "base/numerics/safe_math.h"
-#include "util/file/file_io.h"
-#include "util/file/file_reader.h"
-#include "util/file/file_writer.h"
-
-namespace crashpad {
-
-//! \brief A file reader and writer backed by a virtual file, as opposed to a
-//!     file on disk or other operating system file descriptor-based file.
-//!
-//! The virtual file is a buffer in memory. This class is convenient for use
-//! with other code that normally expects to read or write files, when it is
-//! impractical or inconvenient to read or write a file. It is expected that
-//! tests, in particular, will benefit from using this class.
-class StringFile : public FileReaderInterface, public FileWriterInterface {
- public:
-  StringFile();
-  ~StringFile() override;
-
-  //! \brief Returns a string containing the virtual file’s contents.
-  const std::string& string() const { return string_; }
-
-  //! \brief Sets the virtual file’s contents to \a string, and resets its file
-  //!     position to `0`.
-  void SetString(const std::string& string);
-
-  //! \brief Resets the virtual file’s contents to be empty, and resets its file
-  //!     position to `0`.
-  void Reset();
-
-  // FileReaderInterface:
-  FileOperationResult Read(void* data, size_t size) override;
-
-  // FileWriterInterface:
-  bool Write(const void* data, size_t size) override;
-  bool WriteIoVec(std::vector<WritableIoVec>* iovecs) override;
-
-  // FileSeekerInterface:
-  FileOffset Seek(FileOffset offset, int whence) override;
-
- private:
-  //! \brief The virtual file’s contents.
-  std::string string_;
-
-  //! \brief The file offset of the virtual file.
-  //!
-  //! \note This is stored in a `size_t` to match the characteristics of
-  //!     #string_, the `std::string` used to store the virtual file’s contents.
-  //!     This type will have different characteristics than the `off_t` used to
-  //!     report file offsets. The implementation must take care when converting
-  //!     between these distinct types.
-  base::CheckedNumeric<size_t> offset_;
-
-  DISALLOW_COPY_AND_ASSIGN(StringFile);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_STRING_FILE_H_
diff --git a/Tools/Crashpad/include/util/linux/address_types.h b/Tools/Crashpad/include/util/linux/address_types.h
deleted file mode 100644
index fb17500d9b..0000000000
--- a/Tools/Crashpad/include/util/linux/address_types.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_ADDRESS_TYPES_H_
-#define CRASHPAD_UTIL_LINUX_ADDRESS_TYPES_H_
-
-#include <stdint.h>
-
-namespace crashpad {
-
-//! \brief Type used to represent an address in a process, potentially across
-//!     bitness.
-using LinuxVMAddress = uint64_t;
-
-//! \brief Type used to represent the size of a memory range (with a
-//!     LinuxVMAddress), potentially across bitness.
-using LinuxVMSize = uint64_t;
-
-//! \brief Type used to represent an offset from a LinuxVMAddress, potentially
-//!     across bitness.
-using LinuxVMOffset = int64_t;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_ADDRESS_TYPES_H_
diff --git a/Tools/Crashpad/include/util/linux/auxiliary_vector.h b/Tools/Crashpad/include/util/linux/auxiliary_vector.h
deleted file mode 100644
index 65d0e3cf74..0000000000
--- a/Tools/Crashpad/include/util/linux/auxiliary_vector.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_AUXILIARY_VECTOR_H_
-#define CRASHPAD_UTIL_LINUX_AUXILIARY_VECTOR_H_
-
-#include <sys/types.h>
-
-#include <map>
-
-#include "base/logging.h"
-#include "base/macros.h"
-#include "util/misc/reinterpret_bytes.h"
-
-namespace crashpad {
-
-//! \brief Read the auxiliary vector for a target process.
-class AuxiliaryVector {
- public:
-  AuxiliaryVector();
-  ~AuxiliaryVector();
-
-  //! \brief Initializes this object with the auxiliary vector for the process
-  //!     with process ID \a pid.
-  //!
-  //! This method must be called successfully prior to calling any other method
-  //! in this class.
-  //!
-  //! \param[in] pid The process ID of a target process.
-  //! \param[in] is_64_bit Whether the target process is 64-bit.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool Initialize(pid_t pid, bool is_64_bit);
-
-  //! \brief Retrieve a value from the vector.
-  //!
-  //! \param[in] type Specifies which value should be retrieved. The possible
-  //!     values for this parameter are defined by `<linux/auxvec.h>`.
-  //! \param[out] value The value, casted to an appropriate type, if found.
-  //! \return `true` if the value is found.
-  template <typename V>
-  bool GetValue(uint64_t type, V* value) const {
-    auto iter = values_.find(type);
-    if (iter == values_.end()) {
-      LOG(ERROR) << "value not found";
-      return false;
-    }
-    return ReinterpretBytes(iter->second, value);
-  }
-
- protected:
-  std::map<uint64_t, uint64_t> values_;
-
- private:
-  template <typename ULong>
-  bool Read(pid_t pid);
-
-  DISALLOW_COPY_AND_ASSIGN(AuxiliaryVector);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_AUXILIARY_VECTOR_H_
diff --git a/Tools/Crashpad/include/util/linux/checked_linux_address_range.h b/Tools/Crashpad/include/util/linux/checked_linux_address_range.h
deleted file mode 100644
index 6bf86ec5a9..0000000000
--- a/Tools/Crashpad/include/util/linux/checked_linux_address_range.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_CHECKED_LINUX_ADDRESS_RANGE_H_
-#define CRASHPAD_UTIL_LINUX_CHECKED_LINUX_ADDRESS_RANGE_H_
-
-#include "util/linux/address_types.h"
-#include "util/numeric/checked_address_range.h"
-
-namespace crashpad {
-
-//! \brief Ensures that a range, composed of a base and a size, does not
-//!     overflow the pointer type of the process it describes a range in.
-//!
-//! This class checks bases of type #LinuxVMAddress and sizes of type
-//! #LinuxVMSize against a process whose pointer type is either 32 or 64
-//! bits wide.
-//!
-//! Aside from varying the overall range on the basis of a process’ pointer type
-//! width, this class functions very similarly to CheckedRange.
-using CheckedLinuxAddressRange =
-    internal::CheckedAddressRangeGeneric<LinuxVMAddress, LinuxVMSize>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_CHECKED_LINUX_ADDRESS_RANGE_H_
diff --git a/Tools/Crashpad/include/util/linux/direct_ptrace_connection.h b/Tools/Crashpad/include/util/linux/direct_ptrace_connection.h
deleted file mode 100644
index f1d7ab5fb8..0000000000
--- a/Tools/Crashpad/include/util/linux/direct_ptrace_connection.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_DIRECT_PTRACE_CONNECTION_H_
-#define CRASHPAD_UTIL_LINUX_DIRECT_PTRACE_CONNECTION_H_
-
-#include <sys/types.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "util/linux/ptrace_connection.h"
-#include "util/linux/ptracer.h"
-#include "util/linux/scoped_ptrace_attach.h"
-#include "util/misc/initialization_state_dcheck.h"
-
-namespace crashpad {
-
-//! \brief Manages a direct `ptrace` connection to a process.
-//!
-//! This class is used when the current process has `ptrace` capabilities for
-//! the target process.
-class DirectPtraceConnection : public PtraceConnection {
- public:
-  DirectPtraceConnection();
-  ~DirectPtraceConnection();
-
-  //! \brief Initializes this connection for the process whose process ID is
-  //!     \a pid.
-  //!
-  //! The main thread of the process is automatically attached by this call.
-  //!
-  //! \param[in] pid The process ID of the process to connect to.
-  //! \return `true` on success. `false` on failure with a message logged.
-  bool Initialize(pid_t pid);
-
-  // PtraceConnection:
-
-  pid_t GetProcessID() override;
-  bool Attach(pid_t tid) override;
-  bool Is64Bit() override;
-  bool GetThreadInfo(pid_t tid, ThreadInfo* info) override;
-
- private:
-  std::vector<std::unique_ptr<ScopedPtraceAttach>> attachments_;
-  pid_t pid_;
-  Ptracer ptracer_;
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(DirectPtraceConnection);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_DIRECT_PTRACE_CONNECTION_H_
diff --git a/Tools/Crashpad/include/util/linux/exception_handler_client.h b/Tools/Crashpad/include/util/linux/exception_handler_client.h
deleted file mode 100644
index a60b06562c..0000000000
--- a/Tools/Crashpad/include/util/linux/exception_handler_client.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_EXCEPTION_HANDLER_CLIENT_H_
-#define CRASHPAD_UTIL_LINUX_EXCEPTION_HANDLER_CLIENT_H_
-
-#include <sys/types.h>
-
-#include "base/macros.h"
-#include "util/linux/exception_handler_protocol.h"
-
-namespace crashpad {
-
-//! A client for an ExceptionHandlerServer
-class ExceptionHandlerClient {
- public:
-  //! \brief Constructs this object.
-  //!
-  //! \param[in] sock A socket connected to an ExceptionHandlerServer.
-  explicit ExceptionHandlerClient(int sock);
-
-  ~ExceptionHandlerClient();
-
-  //! \brief Request a crash dump from the ExceptionHandlerServer.
-  //!
-  //! This method blocks until the crash dump is complete.
-  //!
-  //! \param[in] info Information about this client.
-  //! \return 0 on success or an error code on failure.
-  int RequestCrashDump(const ClientInformation& info);
-
-  //! \brief Uses `prctl(PR_SET_PTRACER, ...)` to set the process with
-  //!     process ID \a pid as the ptracer for this process.
-  //!
-  //! \param[in] pid The process ID of the process to be set as this process'
-  //!     ptracer.
-  //! \return 0 on success or an error code on failure.
-  int SetPtracer(pid_t pid);
-
-  //! \brief Enables or disables SetPtracer().
-  //! \param[in] can_set_ptracer Whether SetPtracer should be enabled.
-  void SetCanSetPtracer(bool can_set_ptracer);
-
- private:
-  int SendCrashDumpRequest(const ClientInformation& info);
-  int WaitForCrashDumpComplete();
-
-  int server_sock_;
-  pid_t ptracer_;
-  bool can_set_ptracer_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerClient);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_EXCEPTION_HANDLER_CLIENT_H_
diff --git a/Tools/Crashpad/include/util/linux/exception_handler_protocol.h b/Tools/Crashpad/include/util/linux/exception_handler_protocol.h
deleted file mode 100644
index 3f71abf796..0000000000
--- a/Tools/Crashpad/include/util/linux/exception_handler_protocol.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_EXCEPTION_HANDLER_PROTOCOL_H_
-#define CRASHPAD_UTIL_LINUX_EXCEPTION_HANDLER_PROTOCOL_H_
-
-#include <errno.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include "util/file/file_io.h"
-#include "util/misc/address_types.h"
-
-namespace crashpad {
-
-#pragma pack(push, 1)
-
-//! \brief The type used for error reporting.
-using Errno = int32_t;
-static_assert(sizeof(Errno) >= sizeof(errno), "Errno type is too small");
-
-//! \brief A boolean status suitable for communication between processes.
-enum Bool : char { kBoolFalse, kBoolTrue };
-
-//! \brief Information about a client registered with an ExceptionHandlerServer.
-struct ClientInformation {
-  //! \brief The address in the client's address space of an
-  //!     ExceptionInformation struct.
-  VMAddress exception_information_address;
-};
-
-//! \brief The message passed from client to server.
-struct ClientToServerMessage {
-  static constexpr int32_t kVersion = 1;
-
-  //! \brief Indicates what message version is being used.
-  int32_t version = kVersion;
-
-  enum Type : uint32_t {
-    //! \brief Used to request a crash dump for the sending client.
-    kCrashDumpRequest
-  } type;
-
-  union {
-    //! \brief Valid for type == kCrashDumpRequest
-    ClientInformation client_info;
-  };
-};
-
-//! \brief The message passed from server to client.
-struct ServerToClientMessage {
-  enum Type : uint32_t {
-    //! \brief Indicates that the client should fork a PtraceBroker process.
-    kTypeForkBroker,
-
-    //! \brief Inidicates that the client should set allow the handler to trace
-    //!     it using PR_SET_PTRACER.
-    kTypeSetPtracer,
-
-    //! \brief Indicates that the handler has completed a requested crash dump.
-    kTypeCrashDumpComplete,
-
-    //! \brief Indicicates that the handler was unable to produce a crash dump.
-    kTypeCrashDumpFailed
-  } type;
-
-  //! \brief The handler's process ID. Valid for kTypeSetPtracer.
-  pid_t pid;
-};
-
-#pragma pack(pop)
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_EXCEPTION_HANDLER_PROTOCOL_H_
diff --git a/Tools/Crashpad/include/util/linux/exception_information.h b/Tools/Crashpad/include/util/linux/exception_information.h
deleted file mode 100644
index d7dbe529e4..0000000000
--- a/Tools/Crashpad/include/util/linux/exception_information.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_EXCEPTION_INFORMATION_H_
-#define CRASHPAD_UTIL_LINUX_EXCEPTION_INFORMATION_H_
-
-#include <sys/types.h>
-
-#include "util/linux/address_types.h"
-
-namespace crashpad {
-
-#pragma pack(push, 1)
-
-//! \brief Structure read out of the client process by the crash handler when an
-//!     exception occurs.
-struct ExceptionInformation {
-  //! \brief The address of the `siginfo_t` passed to the signal handler in the
-  //!     crashed process.
-  LinuxVMAddress siginfo_address;
-
-  //! \brief The address of the `ucontext_t` passed to the signal handler in the
-  //!     crashed process.
-  LinuxVMAddress context_address;
-
-  //! \brief The thread ID of the thread which received the signal.
-  pid_t thread_id;
-};
-
-#pragma pack(pop)
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_EXCEPTION_INFORMATION_H_
diff --git a/Tools/Crashpad/include/util/linux/memory_map.h b/Tools/Crashpad/include/util/linux/memory_map.h
deleted file mode 100644
index 6e5b40c8de..0000000000
--- a/Tools/Crashpad/include/util/linux/memory_map.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_MEMORY_MAP_H_
-#define CRASHPAD_UTIL_LINUX_MEMORY_MAP_H_
-
-#include <sys/types.h>
-
-#include <string>
-#include <vector>
-
-#include "util/linux/address_types.h"
-#include "util/linux/checked_linux_address_range.h"
-#include "util/misc/initialization_state_dcheck.h"
-
-namespace crashpad {
-
-//! \brief Accesses information about mapped memory in another process.
-//!
-//! The target process must be stopped to guarantee correct mappings. If the
-//! target process is not stopped, mappings may be invalid after the return from
-//! Initialize(), and even mappings existing at the time Initialize() was called
-//! may not be found.
-class MemoryMap {
- public:
-  //! \brief Information about a mapped region of memory.
-  struct Mapping {
-    Mapping();
-    bool Equals(const Mapping& other) const;
-
-    std::string name;
-    CheckedLinuxAddressRange range;
-    off_t offset;
-    dev_t device;
-    ino_t inode;
-    bool readable;
-    bool writable;
-    bool executable;
-    bool shareable;
-  };
-
-  MemoryMap();
-  ~MemoryMap();
-
-  //! \brief Initializes this object with information about the mapped memory
-  //!     regions in the process whose ID is \a pid.
-  //!
-  //! This method must be called successfully prior to calling any other method
-  //! in this class. This method may only be called once.
-  //!
-  //! \param[in] pid The process ID to obtain information for.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool Initialize(pid_t pid);
-
-  //! \return The Mapping containing \a address or `nullptr` if no match is
-  //!     found. The caller does not take ownership of this object. It is scoped
-  //!     to the lifetime of the MemoryMap object that it was obtained from.
-  const Mapping* FindMapping(LinuxVMAddress address) const;
-
-  //! \return The Mapping with the lowest base address whose name is \a name or
-  //!     `nullptr` if no match is found. The caller does not take ownership of
-  //!     this object. It is scoped to the lifetime of the MemoryMap object that
-  //!     it was obtained from.
-  const Mapping* FindMappingWithName(const std::string& name) const;
-
-  //! \brief Find the first Mapping in a series of mappings for the same file.
-  //!
-  //! Executables and libaries are typically loaded into several mappings with
-  //! varying permissions for different segments. This method searches for the
-  //! mapping with the highest address at or below \a mapping, which maps the
-  //! same file as \a mapping from file offset 0.
-  //!
-  //! If \a mapping is not found, `nullptr` is returned. If \a mapping is found
-  //! but does not map a file, \a mapping is returned.
-  //!
-  //! \param[in] mapping A Mapping whose series to find the start of.
-  //! \return The first Mapping in the series or `nullptr` on failure with a
-  //!     message logged.
-  const Mapping* FindFileMmapStart(const Mapping& mapping) const;
-
- private:
-  std::vector<Mapping> mappings_;
-  InitializationStateDcheck initialized_;
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_MEMORY_MAP_H_
diff --git a/Tools/Crashpad/include/util/linux/proc_stat_reader.h b/Tools/Crashpad/include/util/linux/proc_stat_reader.h
deleted file mode 100644
index 4cad97c59f..0000000000
--- a/Tools/Crashpad/include/util/linux/proc_stat_reader.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_PROC_STAT_READER_H_
-#define CRASHPAD_UTIL_LINUX_PROC_STAT_READER_H_
-
-#include <stddef.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "util/misc/initialization_state_dcheck.h"
-
-namespace crashpad {
-
-//! \brief Reads the /proc/[pid]/stat file for a thread.
-class ProcStatReader {
- public:
-  ProcStatReader();
-  ~ProcStatReader();
-
-  //! \brief Initializes the reader.
-  //!
-  //! This method must be successfully called before calling any other.
-  //!
-  //! \param[in] tid The thread ID to read the stat file for.
-  bool Initialize(pid_t tid);
-
-  //! \brief Determines the time the thread has spent executing in user mode.
-  //!
-  //! \param[out] user_time The time spent executing in user mode.
-  //!
-  //! \return `true` on success, with \a user_time set. Otherwise, `false` with
-  //!     a message logged.
-  bool UserCPUTime(timeval* user_time) const;
-
-  //! \brief Determines the time the thread has spent executing in system mode.
-  //!
-  //! \param[out] system_time The time spent executing in system mode.
-  //!
-  //! \return `true` on success, with \a system_time set. Otherwise, `false`
-  //!     with a message logged.
-  bool SystemCPUTime(timeval* system_time) const;
-
-  //! \brief Determines the target thread’s start time.
-  //!
-  //! \param[out] start_time The time that the thread started.
-  //!
-  //! \return `true` on success, with \a start_time set. Otherwise, `false` with
-  //!     a message logged.
-  bool StartTime(timeval* start_time) const;
-
- private:
-  bool ReadFile(pid_t tid);
-  bool FindColumn(int index, const char** column) const;
-  bool ReadTimeAtIndex(int index, timeval* time_val) const;
-
-  std::string contents_;
-  size_t third_column_position_;
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProcStatReader);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_PROC_STAT_READER_H_
diff --git a/Tools/Crashpad/include/util/linux/ptrace_broker.h b/Tools/Crashpad/include/util/linux/ptrace_broker.h
deleted file mode 100644
index 96cbee5894..0000000000
--- a/Tools/Crashpad/include/util/linux/ptrace_broker.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_PTRACE_BROKER_H_
-#define CRASHPAD_UTIL_LINUX_PTRACE_BROKER_H_
-
-#include <errno.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include "base/macros.h"
-#include "util/linux/exception_handler_protocol.h"
-#include "util/linux/ptrace_connection.h"
-#include "util/linux/ptracer.h"
-#include "util/linux/scoped_ptrace_attach.h"
-#include "util/linux/thread_info.h"
-#include "util/misc/address_types.h"
-
-namespace crashpad {
-
-//! \brief Implements a PtraceConnection over a socket.
-//!
-//! This class is the server half of the connection. The broker should be run
-//! in a process with `ptrace` capabilities for the target process and may run
-//! in a compromised context.
-class PtraceBroker {
- public:
-#pragma pack(push, 1)
-  //! \brief A request sent to a PtraceBroker from a PtraceClient.
-  struct Request {
-    static constexpr uint16_t kVersion = 1;
-
-    //! \brief The version number for this Request.
-    uint16_t version = kVersion;
-
-    //! \brief The type of request to serve.
-    enum Type : uint16_t {
-      //! \brief `ptrace`-attach the specified thread ID. Responds with
-      //!     kBoolTrue on success, otherwise kBoolFalse, followed by an Errno.
-      kTypeAttach,
-
-      //! \brief Responds with kBoolTrue if the target process is 64-bit.
-      //!     Otherwise, kBoolFalse.
-      kTypeIs64Bit,
-
-      //! \brief Responds with a GetThreadInfoResponse containing a ThreadInfo
-      //!     for the specified thread ID. If an error occurs,
-      //!     GetThreadInfoResponse::success is set to kBoolFalse and is
-      //!     followed by an Errno.
-      kTypeGetThreadInfo,
-
-      //! \brief Reads memory from the attached process. The data is returned in
-      //!     a series of messages. Each message begins with a VMSize indicating
-      //!     the number of bytes being returned in this message, followed by
-      //!     the requested bytes. The broker continues to send messages until
-      //!     either all of the requested memory has been sent or an error
-      //!     occurs, in which case it sends a message containing a VMSize equal
-      //!     to zero, followed by an Errno.
-      kTypeReadMemory,
-
-      //! \brief Causes the broker to return from Run(), detaching all attached
-      //!     threads. Does not respond.
-      kTypeExit
-    } type;
-
-    //! \brief The thread ID associated with this request. Valid for kTypeAttach,
-    //!     kTypeGetThreadInfo, and kTypeReadMemory.
-    pid_t tid;
-
-    //! \brief Specifies the memory region to read for a kTypeReadMemory request.
-    struct {
-      //! \brief The base address of the memory region.
-      VMAddress base;
-
-      //! \brief The size of the memory region.
-      VMSize size;
-    } iov;
-  };
-
-  //! \brief The response sent for a Request with type kTypeGetThreadInfo.
-  struct GetThreadInfoResponse {
-    //! \brief Information about the specified thread. Only valid if #success
-    //!     is kBoolTrue.
-    ThreadInfo info;
-
-    //! \brief Specifies the success or failure of this call.
-    Bool success;
-  };
-#pragma pack(pop)
-
-  //! \brief Constructs this object.
-  //!
-  //! \param[in] sock A socket on which to read requests from a connected
-  //!     PtraceClient. Does not take ownership of the socket.
-  //! \param[in] is_64_bit Whether this broker should be configured to trace a
-  //!     64-bit process.
-  PtraceBroker(int sock, bool is_64_bit);
-
-  ~PtraceBroker();
-
-  //! \brief Begin serving requests on the configured socket.
-  //!
-  //! This method returns when a PtraceBrokerRequest with type kTypeExit is
-  //! received or an error is encountered on the socket.
-  //!
-  //! This method calls `sbrk`, which may break other memory management tools,
-  //! such as `malloc`.
-  //!
-  //! \return 0 if Run() exited due to an exit request. Otherwise an error code.
-  int Run();
-
- private:
-  int RunImpl();
-  int SendMemory(pid_t pid, VMAddress address, VMSize size);
-  bool AllocateAttachments();
-  void ReleaseAttachments();
-
-  Ptracer ptracer_;
-  ScopedPtraceAttach* attachments_;
-  size_t attach_count_;
-  size_t attach_capacity_;
-  int sock_;
-
-  DISALLOW_COPY_AND_ASSIGN(PtraceBroker);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_PTRACE_BROKER_H_
diff --git a/Tools/Crashpad/include/util/linux/ptrace_client.h b/Tools/Crashpad/include/util/linux/ptrace_client.h
deleted file mode 100644
index 397c891f78..0000000000
--- a/Tools/Crashpad/include/util/linux/ptrace_client.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_PTRACE_CLIENT_H_
-#define CRASHPAD_UTIL_LINUX_PTRACE_CLIENT_H_
-
-#include <sys/types.h>
-
-#include "base/macros.h"
-#include "util/linux/ptrace_connection.h"
-#include "util/misc/address_types.h"
-#include "util/misc/initialization_state_dcheck.h"
-
-namespace crashpad {
-
-//! \brief Implements a PtraceConnection over a socket.
-//!
-//! This class forms the client half of the connection and is typically used
-//! when the current process does not have `ptrace` capabilities on the target
-//! process. It should be created with a socket connected to a PtraceBroker.
-class PtraceClient : public PtraceConnection {
- public:
-  PtraceClient();
-  ~PtraceClient();
-
-  //! \brief Initializes this object.
-  //!
-  //! This method must be successfully called before any other method in this
-  //! class.
-  //!
-  //! \param[in] sock A socket connected to a PtraceBroker. Does not take
-  //!     ownership of the socket.
-  //! \param[in] pid The process ID of the process to form a PtraceConnection
-  //!     with.
-  //! \return `true` on success. `false` on failure with a message logged.
-  bool Initialize(int sock, pid_t pid);
-
-  //! \brief Copies memory from the target process into a caller-provided buffer
-  //!     in the current process.
-  //!
-  //! TODO(jperaza): In order for this to be usable, PtraceConnection will need
-  //! to surface it, possibly by inheriting from ProcessMemory, or providing a
-  //! method to return a ProcessMemory*.
-  //!
-  //! \param[in] address The address, in the target process' address space, of
-  //!     the memory region to copy.
-  //! \param[in] size The size, in bytes, of the memory region to copy.
-  //!     \a buffer must be at least this size.
-  //! \param[out] buffer The buffer into which the contents of the other
-  //!     process' memory will be copied.
-  //!
-  //! \return `true` on success, with \a buffer filled appropriately. `false` on
-  //!     failure, with a message logged.
-  bool Read(VMAddress address, size_t size, void* buffer);
-
-  // PtraceConnection:
-
-  pid_t GetProcessID() override;
-  bool Attach(pid_t tid) override;
-  bool Is64Bit() override;
-  bool GetThreadInfo(pid_t tid, ThreadInfo* info) override;
-
- private:
-  int sock_;
-  pid_t pid_;
-  bool is_64_bit_;
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(PtraceClient);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_PTRACE_CLIENT_H_
diff --git a/Tools/Crashpad/include/util/linux/ptrace_connection.h b/Tools/Crashpad/include/util/linux/ptrace_connection.h
deleted file mode 100644
index d09cd20de5..0000000000
--- a/Tools/Crashpad/include/util/linux/ptrace_connection.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_PTRACE_CONNECTION_H_
-#define CRASHPAD_UTIL_LINUX_PTRACE_CONNECTION_H_
-
-#include <sys/types.h>
-
-#include "util/linux/thread_info.h"
-
-namespace crashpad {
-
-//! \brief Provides an interface for making `ptrace` requests against a process
-//!     and its threads.
-class PtraceConnection {
- public:
-  virtual ~PtraceConnection() {}
-
-  //! \brief Returns the process ID of the connected process.
-  virtual pid_t GetProcessID() = 0;
-
-  //! \brief Adds a new thread to this connection.
-  //!
-  //! \param[in] tid The thread ID of the thread to attach.
-  //! \return `true` on success. `false` on failure with a message logged.
-  virtual bool Attach(pid_t tid) = 0;
-
-  //! \brief Returns `true` if connected to a 64-bit process.
-  virtual bool Is64Bit() = 0;
-
-  //! \brief Retrieves a ThreadInfo for a target thread.
-  //!
-  //! \param[in] tid The thread ID of the target thread.
-  //! \param[out] info Information about the thread.
-  //! \return `true` on success. `false` on failure with a message logged.
-  virtual bool GetThreadInfo(pid_t tid, ThreadInfo* info) = 0;
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_PTRACE_CONNECTION_H_
diff --git a/Tools/Crashpad/include/util/linux/ptracer.h b/Tools/Crashpad/include/util/linux/ptracer.h
deleted file mode 100644
index daa7a01f98..0000000000
--- a/Tools/Crashpad/include/util/linux/ptracer.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_PTRACER_H_
-#define CRASHPAD_UTIL_LINUX_PTRACER_H_
-
-#include <sys/types.h>
-
-#include "base/macros.h"
-#include "util/linux/address_types.h"
-#include "util/linux/thread_info.h"
-#include "util/misc/initialization_state_dcheck.h"
-
-namespace crashpad {
-
-//! \brief Provides an architecturally agnostic interface for collecting
-//!     information with `ptrace`.
-//!
-//! A ptracer is configured for a particular bitness. It is an error to make any
-//! calls via this object against a thread whose bitness does not match the
-//! bitness this object was initialized with.
-class Ptracer {
- public:
-  //! \brief Constructs this object with a pre-determined bitness.
-  //!
-  //! \param[in] is_64_bit `true` if this object is to be configured for 64-bit.
-  //! \param[in] can_log Whether methods in this class can log error messages.
-  Ptracer(bool is_64_bit, bool can_log);
-
-  //! \brief Constructs this object without a pre-determined bitness.
-  //!
-  //! Initialize() must be successfully called before making any other calls on
-  //! this object.
-  //!
-  //! \param[in] can_log Whether methods in this class can log error messages.
-  explicit Ptracer(bool can_log);
-
-  ~Ptracer();
-
-  //! \brief Initializes this object to the bitness of the process whose process
-  //!     ID is \a pid.
-  //!
-  //! \param[in] pid The process ID of the process to initialize with.
-  //! \return `true` on success. `false` on failure with a message logged, if
-  //!     enabled.
-  bool Initialize(pid_t pid);
-
-  //! \brief Return `true` if this object is configured for 64-bit.
-  bool Is64Bit();
-
-  //! \brief Uses `ptrace` to collect information about the thread with thread
-  //!     ID \a tid.
-  //!
-  //! The target thread should be attached before calling this method.
-  //! \see ScopedPtraceAttach
-  //!
-  //! \param[in] tid The thread ID of the thread to collect information for.
-  //! \param[out] info A ThreadInfo for the thread.
-  //! \return `true` on success. `false` on failure with a message logged, if
-  //!     enabled.
-  bool GetThreadInfo(pid_t tid, ThreadInfo* info);
-
-  //! \brief Uses `ptrace` to read memory from the process with process ID \a
-  //!     pid.
-  //!
-  //! The target process should already be attached before calling this method.
-  //! \see ScopedPtraceAttach
-  //!
-  //! \param[in] pid The process ID whose memory to read.
-  //! \param[in] address The base address of the region to read.
-  //! \param[in] size The size of the memory region to read.
-  //! \param[out] buffer The buffer to fill with the data read.
-  //! \return `true` on success. `false` on failure with a message logged, if
-  //!     enabled.
-  bool ReadMemory(pid_t pid, LinuxVMAddress address, size_t size, char* buffer);
-
- private:
-  bool is_64_bit_;
-  bool can_log_;
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(Ptracer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_PTRACER_H_
diff --git a/Tools/Crashpad/include/util/linux/scoped_ptrace_attach.h b/Tools/Crashpad/include/util/linux/scoped_ptrace_attach.h
deleted file mode 100644
index a3d9d6987f..0000000000
--- a/Tools/Crashpad/include/util/linux/scoped_ptrace_attach.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_SCOPED_PTRACE_ATTACH_H_
-#define CRASHPAD_UTIL_LINUX_SCOPED_PTRACE_ATTACH_H_
-
-#include <sys/types.h>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Maintains a `ptrace()` attachment to a process.
-//!
-//! On destruction, the process will be detached.
-class ScopedPtraceAttach {
- public:
-  ScopedPtraceAttach();
-  ~ScopedPtraceAttach();
-
-  //! \brief Detaches from the process by calling `ptrace()`.
-  //!
-  //! \return `true` on success. `false` on failure, with a message logged.
-  bool Reset();
-
-  //! \brief Detaches from any previously attached process, attaches to the
-  //!      process with process ID \a pid, and blocks until the target process
-  //!      has stopped by calling `waitpid()`.
-  //!
-  //! \return `true` on success. `false` on failure, with a message logged.
-  bool ResetAttach(pid_t pid);
-
- private:
-  pid_t pid_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedPtraceAttach);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_SCOPED_PTRACE_ATTACH_H_
diff --git a/Tools/Crashpad/include/util/linux/thread_info.h b/Tools/Crashpad/include/util/linux/thread_info.h
deleted file mode 100644
index 4208be67f4..0000000000
--- a/Tools/Crashpad/include/util/linux/thread_info.h
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_THREAD_INFO_H_
-#define CRASHPAD_UTIL_LINUX_THREAD_INFO_H_
-
-#include <stdint.h>
-#include <sys/user.h>
-
-#include <type_traits>
-
-#include "build/build_config.h"
-#include "util/linux/address_types.h"
-#include "util/numeric/int128.h"
-
-#if defined(OS_ANDROID)
-#include <android/api-level.h>
-#endif
-
-namespace crashpad {
-
-//! \brief The set of general purpose registers for an architecture family.
-union ThreadContext {
-  ThreadContext();
-  ~ThreadContext();
-
-  //! \brief The general purpose registers used by the 32-bit variant of the
-  //!     architecture.
-  struct t32_t {
-#if defined(ARCH_CPU_X86_FAMILY)
-    // Reflects user_regs_struct in sys/user.h.
-    uint32_t ebx;
-    uint32_t ecx;
-    uint32_t edx;
-    uint32_t esi;
-    uint32_t edi;
-    uint32_t ebp;
-    uint32_t eax;
-    uint32_t xds;
-    uint32_t xes;
-    uint32_t xfs;
-    uint32_t xgs;
-    uint32_t orig_eax;
-    uint32_t eip;
-    uint32_t xcs;
-    uint32_t eflags;
-    uint32_t esp;
-    uint32_t xss;
-#elif defined(ARCH_CPU_ARM_FAMILY)
-    // Reflects user_regs in sys/user.h.
-    uint32_t regs[11];
-    uint32_t fp;
-    uint32_t ip;
-    uint32_t sp;
-    uint32_t lr;
-    uint32_t pc;
-    uint32_t cpsr;
-    uint32_t orig_r0;
-#else
-#error Port.
-#endif  // ARCH_CPU_X86_FAMILY
-  } t32;
-
-  //! \brief The general purpose registers used by the 64-bit variant of the
-  //!     architecture.
-  struct t64_t {
-#if defined(ARCH_CPU_X86_FAMILY)
-    // Reflects user_regs_struct in sys/user.h.
-    uint64_t r15;
-    uint64_t r14;
-    uint64_t r13;
-    uint64_t r12;
-    uint64_t rbp;
-    uint64_t rbx;
-    uint64_t r11;
-    uint64_t r10;
-    uint64_t r9;
-    uint64_t r8;
-    uint64_t rax;
-    uint64_t rcx;
-    uint64_t rdx;
-    uint64_t rsi;
-    uint64_t rdi;
-    uint64_t orig_rax;
-    uint64_t rip;
-    uint64_t cs;
-    uint64_t eflags;
-    uint64_t rsp;
-    uint64_t ss;
-    uint64_t fs_base;
-    uint64_t gs_base;
-    uint64_t ds;
-    uint64_t es;
-    uint64_t fs;
-    uint64_t gs;
-#elif defined(ARCH_CPU_ARM_FAMILY)
-    // Reflects user_regs_struct in sys/user.h.
-    uint64_t regs[31];
-    uint64_t sp;
-    uint64_t pc;
-    uint64_t pstate;
-#else
-#error Port.
-#endif  // ARCH_CPU_X86_FAMILY
-  } t64;
-
-#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64)
-  using NativeThreadContext = user_regs_struct;
-#elif defined(ARCH_CPU_ARMEL)
-  using NativeThreadContext = user_regs;
-#else
-#error Port.
-#endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
-
-#if defined(ARCH_CPU_32_BITS)
-  static_assert(sizeof(t32_t) == sizeof(NativeThreadContext), "Size mismatch");
-#else  // ARCH_CPU_64_BITS
-  static_assert(sizeof(t64_t) == sizeof(NativeThreadContext), "Size mismatch");
-#endif  // ARCH_CPU_32_BITS
-};
-static_assert(std::is_standard_layout<ThreadContext>::value,
-              "Not standard layout");
-
-//! \brief The floating point registers used for an architecture family.
-union FloatContext {
-  FloatContext();
-  ~FloatContext();
-
-  //! \brief The floating point registers used by the 32-bit variant of the
-  //!     architecture.
-  struct f32_t {
-#if defined(ARCH_CPU_X86_FAMILY)
-    // Reflects user_fpxregs_struct in sys/user.h
-    struct fxsave {
-      uint16_t cwd;
-      uint16_t swd;
-      uint16_t twd;
-      uint16_t fop;
-      uint32_t fip;
-      uint32_t fcs;
-      uint32_t foo;
-      uint32_t fos;
-      uint32_t mxcsr;
-      uint32_t reserved;
-      uint32_t st_space[32];
-      uint32_t xmm_space[32];
-      uint32_t padding[56];
-    } fxsave;
-#elif defined(ARCH_CPU_ARM_FAMILY)
-    // Reflects user_fpregs in sys/user.h.
-    struct fpregs {
-      struct fp_reg {
-        uint32_t sign1 : 1;
-        uint32_t unused : 15;
-        uint32_t sign2 : 1;
-        uint32_t exponent : 14;
-        uint32_t j : 1;
-        uint32_t mantissa1 : 31;
-        uint32_t mantisss0 : 32;
-      } fpregs[8];
-      uint32_t fpsr : 32;
-      uint32_t fpcr : 32;
-      uint8_t type[8];
-      uint32_t init_flag;
-    } fpregs;
-
-    // Reflects user_vfp in sys/user.h.
-    struct vfp {
-      uint64_t fpregs[32];
-      uint32_t fpscr;
-    } vfp;
-
-    bool have_fpregs;
-    bool have_vfp;
-#else
-#error Port.
-#endif  // ARCH_CPU_X86_FAMILY
-  } f32;
-
-  //! \brief The floating point registers used by the 64-bit variant of the
-  //!     architecture.
-  struct f64_t {
-#if defined(ARCH_CPU_X86_FAMILY)
-    // Refelects user_fpregs_struct in sys/user.h
-    struct fxsave {
-      uint16_t cwd;
-      uint16_t swd;
-      uint16_t ftw;
-      uint16_t fop;
-      uint64_t rip;
-      uint64_t rdp;
-      uint32_t mxcsr;
-      uint32_t mxcr_mask;
-      uint32_t st_space[32];
-      uint32_t xmm_space[64];
-      uint32_t padding[24];
-    } fxsave;
-#elif defined(ARCH_CPU_ARM_FAMILY)
-    uint128_struct vregs[32];
-    uint32_t fpsr;
-    uint32_t fpcr;
-    uint8_t padding[8];
-#else
-#error Port.
-#endif  // ARCH_CPU_X86_FAMILY
-  } f64;
-
-#if defined(ARCH_CPU_X86)
-// __ANDROID_API_N__ is a proxy for determining whether unified headers are in
-// use. It’s only defined by unified headers. Unified headers call this
-// structure user_fpxregs_struct regardless of API level.
-#if defined(OS_ANDROID) && __ANDROID_API__ <= 19 && !defined(__ANDROID_API_N__)
-  using NativeFpxregs = user_fxsr_struct;
-#else
-  using NativeFpxregs = user_fpxregs_struct;
-#endif  // OS_ANDROID
-  static_assert(sizeof(f32_t::fxsave) == sizeof(NativeFpxregs),
-                "Size mismatch");
-#elif defined(ARCH_CPU_X86_64)
-  static_assert(sizeof(f64_t::fxsave) == sizeof(user_fpregs_struct),
-                "Size mismatch");
-#elif defined(ARCH_CPU_ARMEL)
-  static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
-  static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
-#elif defined(ARCH_CPU_ARM64)
-  static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
-#else
-#error Port.
-#endif  // ARCH_CPU_X86
-};
-static_assert(std::is_standard_layout<FloatContext>::value,
-              "Not standard layout");
-
-//! \brief A collection of `ptrace`-able information about a thread.
-struct ThreadInfo {
-  ThreadInfo();
-  ~ThreadInfo();
-
-  //! \brief The general purpose registers for the thread.
-  ThreadContext thread_context;
-
-  //! \brief The floating point registers for the thread.
-  FloatContext float_context;
-
-  //! \brief The thread-local storage address for the thread.
-  LinuxVMAddress thread_specific_data_address;
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_THREAD_INFO_H_
diff --git a/Tools/Crashpad/include/util/linux/traits.h b/Tools/Crashpad/include/util/linux/traits.h
deleted file mode 100644
index ca9576814f..0000000000
--- a/Tools/Crashpad/include/util/linux/traits.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_LINUX_TRAITS_H_
-#define CRASHPAD_UTIL_LINUX_TRAITS_H_
-
-#include <stdint.h>
-
-namespace crashpad {
-
-struct Traits32 {
-  using Nothing = char[0];
-  using Address = uint32_t;
-  using Long = int32_t;
-  using ULong = uint32_t;
-  using Clock = Long;
-  using Size = uint32_t;
-  using ULong_32Only = ULong;
-  using ULong_64Only = Nothing;
-  using UInteger32_64Only = Nothing;
-};
-
-struct Traits64 {
-  using Nothing = char[0];
-  using Address = uint64_t;
-  using Long = int64_t;
-  using ULong = uint64_t;
-  using Clock = Long;
-  using Size = uint64_t;
-  using ULong_32Only = Nothing;
-  using ULong_64Only = ULong;
-  using UInteger32_64Only = uint32_t;
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_LINUX_TRAITS_H_
diff --git a/Tools/Crashpad/include/util/mac/checked_mach_address_range.h b/Tools/Crashpad/include/util/mac/checked_mach_address_range.h
deleted file mode 100644
index e64e3d1ec7..0000000000
--- a/Tools/Crashpad/include/util/mac/checked_mach_address_range.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MAC_CHECKED_MACH_ADDRESS_RANGE_H_
-#define CRASHPAD_UTIL_MAC_CHECKED_MACH_ADDRESS_RANGE_H_
-
-#include <mach/mach.h>
-
-#include "util/numeric/checked_address_range.h"
-
-namespace crashpad {
-
-//! \brief Ensures that a range, composed of a base and a size, does not
-//!     overflow the pointer type of the process it describes a range in.
-//!
-//! This class checks bases of type `mach_vm_address_t` and sizes of type
-//! `mach_vm_address_t` against a process whose pointer type is either 32 or 64
-//! bits wide.
-//!
-//! Aside from varying the overall range on the basis of a process’ pointer type
-//! width, this class functions very similarly to CheckedRange.
-using CheckedMachAddressRange =
-    internal::CheckedAddressRangeGeneric<mach_vm_address_t, mach_vm_size_t>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MAC_CHECKED_MACH_ADDRESS_RANGE_H_
diff --git a/Tools/Crashpad/include/util/mac/launchd.h b/Tools/Crashpad/include/util/mac/launchd.h
deleted file mode 100644
index 21b43f8d00..0000000000
--- a/Tools/Crashpad/include/util/mac/launchd.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MAC_LAUNCHD_H_
-#define CRASHPAD_UTIL_MAC_LAUNCHD_H_
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <launch.h>
-#include <sys/types.h>
-
-namespace crashpad {
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-//! \{
-//! \brief Wraps the `<launch.h>` function of the same name.
-//!
-//! The OS X 10.10 SDK deprecates `<launch.h>`, although the functionality it
-//! provides is still useful. These wrappers allow the deprecated functions to
-//! be called without triggering deprecated-declaration warnings.
-
-inline launch_data_t LaunchDataAlloc(launch_data_type_t type) {
-  return launch_data_alloc(type);
-}
-
-inline launch_data_type_t LaunchDataGetType(const launch_data_t data) {
-  return launch_data_get_type(data);
-}
-
-inline void LaunchDataFree(launch_data_t data) {
-  return launch_data_free(data);
-}
-
-inline bool LaunchDataDictInsert(launch_data_t dict,
-                                 const launch_data_t value,
-                                 const char* key) {
-  return launch_data_dict_insert(dict, value, key);
-}
-
-inline launch_data_t LaunchDataDictLookup(const launch_data_t dict,
-                                          const char* key) {
-  return launch_data_dict_lookup(dict, key);
-}
-
-inline size_t LaunchDataDictGetCount(launch_data_t dict) {
-  return launch_data_dict_get_count(dict);
-}
-
-inline bool LaunchDataArraySetIndex(launch_data_t array,
-                                    const launch_data_t value,
-                                    size_t index) {
-  return launch_data_array_set_index(array, value, index);
-}
-
-inline launch_data_t LaunchDataArrayGetIndex(launch_data_t array,
-                                             size_t index) {
-  return launch_data_array_get_index(array, index);
-}
-
-inline size_t LaunchDataArrayGetCount(launch_data_t array) {
-  return launch_data_array_get_count(array);
-}
-
-inline launch_data_t LaunchDataNewInteger(long long integer) {
-  return launch_data_new_integer(integer);
-}
-
-inline launch_data_t LaunchDataNewBool(bool boolean) {
-  return launch_data_new_bool(boolean);
-}
-
-inline launch_data_t LaunchDataNewReal(double real) {
-  return launch_data_new_real(real);
-}
-
-inline launch_data_t LaunchDataNewString(const char* string) {
-  return launch_data_new_string(string);
-}
-
-inline launch_data_t LaunchDataNewOpaque(const void* opaque, size_t size) {
-  return launch_data_new_opaque(opaque, size);
-}
-
-inline long long LaunchDataGetInteger(const launch_data_t data) {
-  return launch_data_get_integer(data);
-}
-
-inline bool LaunchDataGetBool(const launch_data_t data) {
-  return launch_data_get_bool(data);
-}
-
-inline double LaunchDataGetReal(const launch_data_t data) {
-  return launch_data_get_real(data);
-}
-
-inline const char* LaunchDataGetString(const launch_data_t data) {
-  return launch_data_get_string(data);
-}
-
-inline void* LaunchDataGetOpaque(const launch_data_t data) {
-  return launch_data_get_opaque(data);
-}
-
-inline size_t LaunchDataGetOpaqueSize(const launch_data_t data) {
-  return launch_data_get_opaque_size(data);
-}
-
-inline int LaunchDataGetErrno(const launch_data_t data) {
-  return launch_data_get_errno(data);
-}
-
-inline launch_data_t LaunchMsg(const launch_data_t data) {
-  return launch_msg(data);
-}
-
-//! \}
-
-#pragma clang diagnostic pop
-
-//! \brief Converts a Core Foundation-type property list to a launchd-type
-//!     `launch_data_t`.
-//!
-//! \param[in] property_cf The Core Foundation-type property list to convert.
-//!
-//! \return The converted launchd-type `launch_data_t`. The caller takes
-//!     ownership of the returned value. On error, returns `nullptr`.
-//!
-//! \note This function handles all `CFPropertyListRef` types except for
-//!     `CFDateRef`, because there’s no `launch_data_type_t` analogue. Not all
-//!     types supported in a launchd-type `launch_data_t` have
-//!     `CFPropertyListRef` analogues.
-launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MAC_LAUNCHD_H_
diff --git a/Tools/Crashpad/include/util/mac/mac_util.h b/Tools/Crashpad/include/util/mac/mac_util.h
deleted file mode 100644
index d8b71598aa..0000000000
--- a/Tools/Crashpad/include/util/mac/mac_util.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MAC_MAC_UTIL_H_
-#define CRASHPAD_UTIL_MAC_MAC_UTIL_H_
-
-#include <string>
-
-namespace crashpad {
-
-//! \brief Returns the version of the running operating system.
-//!
-//! \return The minor version of the operating system, such as `12` for macOS
-//!     10.12.1.
-//!
-//! \note This is similar to the base::mac::IsOS*() family of functions, but
-//!     is provided for situations where the caller needs to obtain version
-//!     information beyond what is provided by Chromium’s base, or for when the
-//!     caller needs the actual minor version value.
-int MacOSXMinorVersion();
-
-//! \brief Returns the version of the running operating system.
-//!
-//! All parameters are required. No parameter may be `nullptr`.
-//!
-//! \param[out] major The major version of the operating system, such as `10`
-//!     for macOS 10.12.1.
-//! \param[out] minor The major version of the operating system, such as `12`
-//!     for macOS 10.12.1.
-//! \param[out] bugfix The bugfix version of the operating system, such as `1`
-//!     for macOS 10.12.1.
-//! \param[out] build The operating system’s build string, such as `"16B2657"`
-//!     for macOS 10.12.1.
-//! \param[out] server `true` for a macOS Server installation, `false` otherwise
-//!     (for a desktop/laptop, client, or workstation system).
-//! \param[out] version_string A string representing the full operating system
-//!     version, such as `"macOS 10.12.1 (16B2657)"`.
-//!
-//! \return `true` on success, `false` on failure, with an error message logged.
-//!     A failure is considered to have occurred if any element could not be
-//!     determined. When this happens, their values will be untouched, but other
-//!     values that could be determined will still be set properly.
-bool MacOSXVersion(int* major,
-                   int* minor,
-                   int* bugfix,
-                   std::string* build,
-                   bool* server,
-                   std::string* version_string);
-
-//! \brief Returns the model name and board ID of the running system.
-//!
-//! \param[out] model The system’s model name. A mid-2012 15" MacBook Pro would
-//!     report “MacBookPro10,1”.
-//! \param[out] board_id The system’s board ID. A mid-2012 15" MacBook Pro would
-//!     report “Mac-C3EC7CD22292981F”.
-//!
-//! If a value cannot be determined, its string is cleared.
-void MacModelAndBoard(std::string* model, std::string* board_id);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MAC_MAC_UTIL_H_
diff --git a/Tools/Crashpad/include/util/mac/service_management.h b/Tools/Crashpad/include/util/mac/service_management.h
deleted file mode 100644
index 16cb45aaed..0000000000
--- a/Tools/Crashpad/include/util/mac/service_management.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MAC_SERVICE_MANAGEMENT_H_
-#define CRASHPAD_UTIL_MAC_SERVICE_MANAGEMENT_H_
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <unistd.h>
-
-#include <string>
-
-namespace crashpad {
-
-//! \brief Submits a job to the user launchd domain as in `SMJobSubmit()`.
-//!
-//! \param[in] job_cf A dictionary describing a job.
-//!
-//! \return `true` if the job was submitted successfully, otherwise `false`.
-//!
-//! \note This function is provided because `SMJobSubmit()` is deprecated in OS
-//!     X 10.10. It may or may not be implemented using `SMJobSubmit()` from
-//!     `ServiceManagement.framework`.
-bool ServiceManagementSubmitJob(CFDictionaryRef job_cf);
-
-//! \brief Removes a job from the user launchd domain as in `SMJobRemove()`.
-//!
-//! \param[in] label The label for the job to remove.
-//! \param[in] wait `true` if this function should block, waiting for the job to
-//!     be removed. `false` if the job may be removed asynchronously.
-//!
-//! \return `true` if the job was removed successfully or if an asynchronous
-//!     attempt to remove the job was started successfully, otherwise `false`.
-//!
-//! \note This function is provided because `SMJobRemove()` is deprecated in OS
-//!     X 10.10. On OS X 10.10, observed in DP8 14A361c, it also blocks for far
-//!     too long (`_block_until_job_exits()` contains a one-second `sleep()`,
-//!     filed as radar 18398683) and does not signal failure via its return
-//!     value when asked to remove a nonexistent job (filed as radar 18268941).
-bool ServiceManagementRemoveJob(const std::string& label, bool wait);
-
-//! \brief Determines whether a specified job is loaded in the user launchd
-//!     domain.
-//!
-//! \param[in] label The label for the job to look up.
-//!
-//! \return `true` if the job is loaded, otherwise `false`.
-//!
-//! \note A loaded job is not necessarily presently running, nor has it
-//!     necessarily ever run in the past.
-//! \note This function is provided because `SMJobCopyDictionary()` is
-//!     deprecated in OS X 10.10. It may or may not be implemented using
-//!     `SMJobCopyDictionary()` from `ServiceManagement.framework`.
-bool ServiceManagementIsJobLoaded(const std::string& label);
-
-//! \brief Determines whether a specified job is running in the user launchd
-//!     domain.
-//!
-//! \param[in] label The label for the job to look up.
-//!
-//! \return The job’s process ID if running, otherwise `0`.
-//!
-//! \note This function is provided because `SMJobCopyDictionary()` is
-//!     deprecated in OS X 10.10. It may or may not be implemented using
-//!     `SMJobCopyDictionary()` from `ServiceManagement.framework`.
-pid_t ServiceManagementIsJobRunning(const std::string& label);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MAC_SERVICE_MANAGEMENT
diff --git a/Tools/Crashpad/include/util/mac/xattr.h b/Tools/Crashpad/include/util/mac/xattr.h
deleted file mode 100644
index ebe13df507..0000000000
--- a/Tools/Crashpad/include/util/mac/xattr.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MAC_XATTR_H_
-#define CRASHPAD_UTIL_MAC_XATTR_H_
-
-#include <time.h>
-
-#include <string>
-
-#include "base/files/file_path.h"
-#include "base/strings/string_piece.h"
-
-namespace crashpad {
-
-//! \brief The result code for a ReadXattr operation.
-enum class XattrStatus {
-  //! \brief No error occured. No message is logged.
-  kOK = 0,
-
-  //! \brief The attribute does not exist. No message is logged.
-  kNoAttribute,
-
-  //! \brief An error occurred and an error message was logged.
-  kOtherError,
-};
-
-//! \brief Reads an extended attribute on a file.
-//!
-//! \param[in] file The path to the file.
-//! \param[in] name The name of the extended attribute to read.
-//! \param[out] value The value of the attribute.
-//!
-//! \return XattrStatus
-XattrStatus ReadXattr(const base::FilePath& file,
-                      const base::StringPiece& name,
-                      std::string* value);
-
-//! \brief Writes an extended attribute on a file.
-//!
-//! \param[in] file The path to the file.
-//! \param[in] name The name of the extended attribute to write.
-//! \param[in] value The value of the attribute.
-//!
-//! \return `true` if the write was successful. `false` on error, with a message
-//!     logged.
-bool WriteXattr(const base::FilePath& file,
-                const base::StringPiece& name,
-                const std::string& value);
-
-//! \copydoc ReadXattr
-//!
-//! Only the values `"0"` and `"1"`, for `false` and `true` respectively, are
-//! valid conversions.
-XattrStatus ReadXattrBool(const base::FilePath& file,
-                          const base::StringPiece& name,
-                          bool* value);
-
-//! \copydoc WriteXattr
-bool WriteXattrBool(const base::FilePath& file,
-                    const base::StringPiece& name,
-                    bool value);
-
-//! \copydoc ReadXattr
-XattrStatus ReadXattrInt(const base::FilePath& file,
-                         const base::StringPiece& name,
-                         int* value);
-
-//! \copydoc WriteXattr
-bool WriteXattrInt(const base::FilePath& file,
-                   const base::StringPiece& name,
-                   int value);
-
-//! \copydoc ReadXattr
-XattrStatus ReadXattrTimeT(const base::FilePath& file,
-                           const base::StringPiece& name,
-                           time_t* value);
-
-//! \copydoc WriteXattr
-bool WriteXattrTimeT(const base::FilePath& file,
-                     const base::StringPiece& name,
-                     time_t value);
-
-//! \brief Removes an extended attribute from a file.
-//!
-//! \param[in] file The path to the file.
-//! \param[in] name The name of the extended attribute to remove.
-//!
-//! \return XattrStatus
-XattrStatus RemoveXattr(const base::FilePath& file,
-                        const base::StringPiece& name);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MAC_XATTR_H_
diff --git a/Tools/Crashpad/include/util/mach/child_port_handshake.h b/Tools/Crashpad/include/util/mach/child_port_handshake.h
deleted file mode 100644
index 429164a9b5..0000000000
--- a/Tools/Crashpad/include/util/mach/child_port_handshake.h
+++ /dev/null
@@ -1,330 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_CHILD_PORT_HANDSHAKE_H_
-#define CRASHPAD_UTIL_MACH_CHILD_PORT_HANDSHAKE_H_
-
-#include <mach/mach.h>
-
-#include <string>
-
-#include "base/files/scoped_file.h"
-#include "base/macros.h"
-#include "util/mach/child_port_types.h"
-
-namespace crashpad {
-
-namespace test {
-namespace {
-class ChildPortHandshakeTest;
-}  // namespace
-}  // namespace test
-
-//! \brief Implements a handshake protocol that allows processes to exchange
-//!     port rights.
-//!
-//! Ordinarily, there is no way for parent and child processes to exchange port
-//! rights, outside of the rights that children inherit from their parents.
-//! These include task-special ports and exception ports, but all of these have
-//! system-defined uses, and cannot reliably be replaced: in a multi-threaded
-//! parent, it is impossible to temporarily change an inheritable port while
-//! maintaining a guarantee that another thread will not attempt to use it, and
-//! in children, it difficult to guarantee that nothing will attempt to use an
-//! inheritable port before it can be replaced with the correct one. This latter
-//! concern is becoming increasingly more pronounced as system libraries perform
-//! more operations that rely on an inherited port in module initializers.
-//!
-//! The protocol implemented by this class involves a server that runs in one
-//! process. The server is published with the bootstrap server, which the other
-//! process has access to because the bootstrap port is one of the inherited
-//! task-special ports. The two processes also share a pipe, which the server
-//! can write to and the client can read from. The server will write a random
-//! token to this pipe, along with the name under which its service has been
-//! registered with the bootstrap server. The client can then obtain a send
-//! right to this service with `bootstrap_look_up()`, and send a check-in
-//! message containing the token value and the port right of its choice by
-//! calling `child_port_check_in()`.
-//!
-//! The inclusion of the token authenticates the client to the server. This is
-//! necessary because the service is published with the bootstrap server, which
-//! opens up access to it to more than the intended client. Because the token is
-//! passed to the client by a shared pipe, it constitutes a shared secret not
-//! known by other processes that may have incidental access to the server. The
-//! ChildPortHandshake server considers its randomly-generated token valid until
-//! a client checks in with it. This mechanism is used instead of examining the
-//! request message’s audit trailer to verify the sender’s process ID because in
-//! some process architectures, it may be impossible to verify the client’s
-//! process ID.
-//!
-//! The shared pipe serves another purpose: the server monitors it for an
-//! end-of-file (no readers) condition. Once detected, it will stop its blocking
-//! wait for a client to check in. This mechanism was also chosen for its
-//! ability to function properly in diverse process architectures.
-//!
-//! This class can be used to allow a child process to provide its parent with a
-//! send right to its task port, in cases where it is desirable for the parent
-//! to have such access. It can also be used to allow a parent process to
-//! transfer a receive right to a child process that implements the server for
-//! that right, or for a child process to establish its own server and provide
-//! its parent with a send right to that server, for cases where a service is
-//! provided and it is undesirable or impossible to provide it via the bootstrap
-//! or launchd interfaces.
-//!
-//! Example parent process, running a client that sends a receive right to its
-//! child:
-//! \code
-//!   ChildPortHandshake child_port_handshake;
-//!   base::ScopedFD server_write_fd = child_port_handshake.ServerWriteFD();
-//!   std::string server_write_fd_string =
-//!       base::StringPrintf("%d", server_write_fd.get());
-//!
-//!   pid_t pid = fork();
-//!   if (pid == 0) {
-//!     // Child
-//!
-//!     // Close all file descriptors above STDERR_FILENO except for
-//!     // server_write_fd. Let the child know what file descriptor to use for
-//!     // server_write_fd by passing it as argv[1]. Example code for the child
-//!     // process is below.
-//!     CloseMultipleNowOrOnExec(STDERR_FILENO + 1, server_write_fd.get());
-//!     execlp("./child", "child", server_write_fd_string.c_str(), nullptr);
-//!   }
-//!
-//!   // Parent
-//!
-//!   // Close the child’s end of the pipe.
-//!   server_write_fd.reset();
-//!
-//!   // Make a new Mach receive right.
-//!   base::mac::ScopedMachReceiveRight
-//!       receive_right(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
-//!
-//!   // Make a send right corresponding to the receive right.
-//!   mach_port_t send_right;
-//!   mach_msg_type_name_t send_right_type;
-//!   mach_port_extract_right(mach_task_self(),
-//!                           receive_right.get(),
-//!                           MACH_MSG_TYPE_MAKE_SEND,
-//!                           &send_right,
-//!                           &send_right_type);
-//!   base::mac::ScopedMachSendRight send_right_owner(send_right);
-//!
-//!   // Send the receive right to the child process, retaining the send right
-//!   // for use in the parent process.
-//!   if (child_port_handshake.RunClient(receive_right.get(),
-//!                                      MACH_MSG_TYPE_MOVE_RECEIVE)) {
-//!     ignore_result(receive_right.release());
-//!   }
-//! \endcode
-//!
-//! Example child process, running a server that receives a receive right from
-//! its parent:
-//! \code
-//!   int main(int argc, char* argv[]) {
-//!     // The parent passed server_write_fd in argv[1].
-//!     base::ScopedFD server_write_fd(atoi(argv[1]));
-//!
-//!     // Obtain a receive right from the parent process.
-//!     base::mac::ScopedMachReceiveRight receive_right(
-//!         ChildPortHandshake::RunServerForFD(
-//!             std::move(server_write_fd),
-//!             ChildPortHandshake::PortRightType::kReceiveRight));
-//!   }
-//! \endcode
-class ChildPortHandshake {
- public:
-  //! \brief Controls whether a receive or send right is expected to be
-  //!     obtained from the client by the server’s call to RunServer().
-  enum class PortRightType {
-    //! \brief The server expects to receive a receive right.
-    kReceiveRight = 0,
-
-    //! \brief The server expects to receive a send or send-once right.
-    kSendRight,
-  };
-
-  ChildPortHandshake();
-  ~ChildPortHandshake();
-
-  //! \brief Obtains the “read” side of the pipe, to be used by the client.
-  //!
-  //! This file descriptor must be passed to RunClientForFD().
-  //!
-  //! \return The file descriptor that the client should read from.
-  base::ScopedFD ClientReadFD();
-
-  //! \brief Obtains the “write” side of the pipe, to be used by the server.
-  //!
-  //! This file descriptor must be passed to RunServerForFD().
-  //!
-  //! \return The file descriptor that the server should write to.
-  base::ScopedFD ServerWriteFD();
-
-  //! \brief Runs the server.
-  //!
-  //! This method closes the “read” side of the pipe in-process, so that the
-  //! client process holds the only file descriptor that can read from the pipe.
-  //! It then calls RunServerForFD() using the “write” side of the pipe. If
-  //! ClientReadFD() has already been called in the server process, the caller
-  //! must ensure that the file descriptor returned by ClientReadFD() is closed
-  //! prior to calling this method.
-  mach_port_t RunServer(PortRightType port_right_type);
-
-  //! \brief Runs the client.
-  //!
-  //! This method closes the “write” side of the pipe in-process, so that the
-  //! server process holds the only file descriptor that can write to the pipe.
-  //! It then calls RunClientForFD() using the “read” side of the pipe. If
-  //! ServerWriteFD() has already been called in the client process, the caller
-  //! must ensure that the file descriptor returned by ServerWriteFD() is closed
-  //! prior to calling this method.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool RunClient(mach_port_t port, mach_msg_type_name_t right_type);
-
-  //! \brief Runs the server.
-  //!
-  //! If a ChildPortHandshake object is available, don’t call this static
-  //! function. Instead, call RunServer(), which wraps this function. When using
-  //! this function, the caller is responsible for ensuring that the client
-  //! “read” side of the pipe is closed in the server process prior to calling
-  //! this function.
-  //!
-  //! This function performs these tasks:
-  //!  - Creates a random token and sends it via the pipe.
-  //!  - Checks its service in with the bootstrap server, and sends the name
-  //!    of its bootstrap service mapping via the pipe.
-  //!  - Simultaneously receives messages on its Mach server and monitors the
-  //!    pipe for end-of-file. This is a blocking operation.
-  //!  - When a Mach message is received, calls HandleChildPortCheckIn() to
-  //!    interpret and validate it, and if the message is valid, returns the
-  //!    port right extracted from the message. If the message is not valid,
-  //!    this method will continue waiting for a valid message. Valid messages
-  //!    are properly formatted and have the correct token. The right carried in
-  //!    a valid message will be returned. If a message is not valid, this
-  //!    method will continue waiting for pipe EOF or a valid message.
-  //!  - When notified of pipe EOF, returns `MACH_PORT_NULL`.
-  //!  - Regardless of return value, destroys the server’s receive right and
-  //!    closes the pipe.
-  //!
-  //! \param[in] server_write_fd The write side of the pipe shared with the
-  //!     client process. This function takes ownership of this file descriptor,
-  //!     and will close it prior to returning.
-  //! \param[in] port_right_type The port right type expected to be received
-  //!     from the client. If the port right received from the client does not
-  //!     match the expected type, the received port right will be destroyed,
-  //!     and `MACH_PORT_NULL` will be returned.
-  //!
-  //! \return On success, the port right provided by the client. The caller
-  //!     takes ownership of this right. On failure, `MACH_PORT_NULL`,
-  //!     indicating that the client did not check in properly before
-  //!     terminating, where termination is detected by detecting that the read
-  //!     side of the shared pipe has closed. On failure, a message indicating
-  //!     the nature of the failure will be logged.
-  static mach_port_t RunServerForFD(base::ScopedFD server_write_fd,
-                                    PortRightType port_right_type);
-
-  //! \brief Runs the client.
-  //!
-  //! If a ChildPortHandshake object is available, don’t call this static
-  //! function. Instead, call RunClient(), which wraps this function. When using
-  //! this function, the caller is responsible for ensuring that the server
-  //! “write” side of the pipe is closed in the client process prior to calling
-  //! this function.
-  //!
-  //! This function performs these tasks:
-  //!  - Reads the token from the pipe.
-  //!  - Reads the bootstrap service name from the pipe.
-  //!  - Obtains a send right to the server by calling `bootstrap_look_up()`.
-  //!  - Sends a check-in message to the server by calling
-  //!    `child_port_check_in()`, providing the token and the user-supplied port
-  //!    right.
-  //!  - Deallocates the send right to the server, and closes the pipe.
-  //!
-  //! There is no return value because `child_port_check_in()` is a MIG
-  //! `simpleroutine`, and the server does not send a reply. This allows
-  //! check-in to occur without blocking to wait for a reply.
-  //!
-  //! \param[in] client_read_fd The “read” side of the pipe shared with the
-  //!     server process. This function takes ownership of this file descriptor,
-  //!     and will close it prior to returning.
-  //! \param[in] port The port right that will be passed to the server by
-  //!     `child_port_check_in()`.
-  //! \param[in] right_type The right type to furnish the server with. If \a
-  //!     port is a send right, this can be `MACH_MSG_TYPE_COPY_SEND` or
-  //!     `MACH_MSG_TYPE_MOVE_SEND`. If \a port is a send-once right, this can
-  //!     be `MACH_MSG_TYPE_MOVE_SEND_ONCE`. If \a port is a receive right, this
-  //!     can be `MACH_MSG_TYPE_MAKE_SEND`, `MACH_MSG_TYPE_MAKE_SEND_ONCE`, or
-  //!     `MACH_MSG_TYPE_MOVE_RECEIVE`.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged. On
-  //!     failure, the port right corresponding to a \a right_type of
-  //!     `MACH_MSG_TYPE_MOVE_*` is not consumed, and the caller must dispose of
-  //!     the right if necessary.
-  static bool RunClientForFD(base::ScopedFD client_read_fd,
-                             mach_port_t port,
-                             mach_msg_type_name_t right_type);
-
- private:
-  //! \brief Runs the read-from-pipe portion of the client’s side of the
-  //!     handshake. This is an implementation detail of RunClient and is only
-  //!     exposed for testing purposes.
-  //!
-  //! When using this function and RunClientInternal_SendCheckIn(), the caller
-  //! is responsible for closing \a pipe_read at an appropriate time, normally
-  //! after calling RunClientInternal_SendCheckIn().
-  //!
-  //! \param[in] pipe_read The “read” side of the pipe shared with the server
-  //!     process.
-  //! \param[out] token The token value read from \a pipe_read.
-  //! \param[out] service_name The service name as registered with the bootstrap
-  //!     server, read from \a pipe_read.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  static bool RunClientInternal_ReadPipe(int pipe_read,
-                                         child_port_token_t* token,
-                                         std::string* service_name);
-
-  //! \brief Runs the check-in portion of the client’s side of the handshake.
-  //!     This is an implementation detail of RunClient and is only exposed for
-  //!     testing purposes.
-  //!
-  //! When using this RunClientInternal_ReadPipe() and this function, the caller
-  //! is responsible for closing the “read” side of the pipe at an appropriate
-  //! time, normally after calling this function.
-  //!
-  //! \param[in] service_name The service name as registered with the bootstrap
-  //!     server, to be looked up with `bootstrap_look_up()`.
-  //! \param[in] token The token value to provide during check-in.
-  //! \param[in] port The port that will be passed to the server by
-  //!     `child_port_check_in()`.
-  //! \param[in] right_type The right type to furnish the server with.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  static bool RunClientInternal_SendCheckIn(const std::string& service_name,
-                                            child_port_token_t token,
-                                            mach_port_t port,
-                                            mach_msg_type_name_t right_type);
-
-  base::ScopedFD client_read_fd_;
-  base::ScopedFD server_write_fd_;
-
-  friend class test::ChildPortHandshakeTest;
-
-  DISALLOW_COPY_AND_ASSIGN(ChildPortHandshake);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_CHILD_PORT_HANDSHAKE_H_
diff --git a/Tools/Crashpad/include/util/mach/child_port_server.h b/Tools/Crashpad/include/util/mach/child_port_server.h
deleted file mode 100644
index 47d72e4da9..0000000000
--- a/Tools/Crashpad/include/util/mach/child_port_server.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_CHILD_PORT_SERVER_H_
-#define CRASHPAD_UTIL_MACH_CHILD_PORT_SERVER_H_
-
-#include <mach/mach.h>
-
-#include <set>
-
-#include "base/macros.h"
-#include "util/mach/child_port_types.h"
-#include "util/mach/mach_message_server.h"
-
-namespace crashpad {
-
-//! \brief A server interface for the `child_port` Mach subsystem.
-class ChildPortServer : public MachMessageServer::Interface {
- public:
-  //! \brief An interface that the request message that is a part of the
-  //!     `child_port` Mach subsystem can be dispatched to.
-  class Interface {
-   public:
-    //! \brief Handles check-ins sent by `child_port_check_in()`.
-    //!
-    //! This behaves equivalently to a `handle_child_port_check_in()` function
-    //! used with `child_port_server()`.
-    //!
-    //! \param[in] server
-    //! \param[in] token
-    //! \param[in] port
-    //! \param[in] right_type
-    //! \param[in] trailer The trailer received with the request message.
-    //! \param[out] destroy_request `true` if the request message is to be
-    //!     destroyed even when this method returns success. See
-    //!     MachMessageServer::Interface.
-    virtual kern_return_t HandleChildPortCheckIn(
-        child_port_server_t server,
-        const child_port_token_t token,
-        mach_port_t port,
-        mach_msg_type_name_t right_type,
-        const mach_msg_trailer_t* trailer,
-        bool* destroy_request) = 0;
-
-   protected:
-    ~Interface() {}
-  };
-
-  //! \brief Constructs an object of this class.
-  //!
-  //! \param[in] interface The interface to dispatch requests to. Weak.
-  explicit ChildPortServer(Interface* interface);
-
-  // MachMessageServer::Interface:
-  bool MachMessageServerFunction(const mach_msg_header_t* in_header,
-                                 mach_msg_header_t* out_header,
-                                 bool* destroy_complex_request) override;
-  std::set<mach_msg_id_t> MachMessageServerRequestIDs() override;
-  mach_msg_size_t MachMessageServerRequestSize() override;
-  mach_msg_size_t MachMessageServerReplySize() override;
-
- private:
-  Interface* interface_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(ChildPortServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_CHILD_PORT_SERVER_H_
diff --git a/Tools/Crashpad/include/util/mach/child_port_types.h b/Tools/Crashpad/include/util/mach/child_port_types.h
deleted file mode 100644
index d0760a73f4..0000000000
--- a/Tools/Crashpad/include/util/mach/child_port_types.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_CHILD_PORT_TYPES_H_
-#define CRASHPAD_UTIL_MACH_CHILD_PORT_TYPES_H_
-
-#include <mach/mach.h>
-#include <stdint.h>
-
-// This file is #included by C (non-C++) files, and must remain strictly C.
-
-typedef mach_port_t child_port_server_t;
-typedef uint64_t child_port_token_t;
-
-#endif  // CRASHPAD_UTIL_MACH_CHILD_PORT_TYPES_H_
diff --git a/Tools/Crashpad/include/util/mach/composite_mach_message_server.h b/Tools/Crashpad/include/util/mach/composite_mach_message_server.h
deleted file mode 100644
index 785af4dc61..0000000000
--- a/Tools/Crashpad/include/util/mach/composite_mach_message_server.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_COMPOSITE_MACH_MESSAGE_SERVER_H_
-#define CRASHPAD_UTIL_MACH_COMPOSITE_MACH_MESSAGE_SERVER_H_
-
-#include <mach/mach.h>
-
-#include <map>
-#include <set>
-
-#include "base/macros.h"
-#include "util/mach/mach_message_server.h"
-
-namespace crashpad {
-
-//! \brief Adapts multiple MachMessageServer::Interface implementations for
-//!     simultaneous use in a single MachMessageServer::Run() call.
-//!
-//! This class implements a MachMessageServer::Interface that contains other
-//! MachMessageServer::Interface objects.
-//!
-//! In some situations, it may be desirable for a Mach message server to handle
-//! messages from distinct MIG subsystems with distinct
-//! MachMessageServer::Interface implementations. This may happen if a single
-//! receive right is shared for multiple subsystems, or if distinct receive
-//! rights are combined in a Mach port set. In these cases, this class performs
-//! a first-level demultiplexing to forward request messages to the proper
-//! subsystem-level demultiplexers.
-class CompositeMachMessageServer : public MachMessageServer::Interface {
- public:
-  CompositeMachMessageServer();
-  ~CompositeMachMessageServer();
-
-  //! \brief Adds a handler that messages can be dispatched to based on request
-  //!     message ID.
-  //!
-  //! \param[in] handler A MachMessageServer handler. Ownership of this object
-  //!     is not taken. Cycles must not be created between objects. It is
-  //!     invalid to add an object as its own handler.
-  //!
-  //! If \a handler claims to support any request ID that this object is already
-  //! able to handle, execution will be terminated.
-  void AddHandler(MachMessageServer::Interface* handler);
-
-  // MachMessageServer::Interface:
-
-  //! \copydoc MachMessageServer::Interface::MachMessageServerFunction()
-  //!
-  //! This implementation forwards the message to an appropriate handler added
-  //! by AddHandler() on the basis of the \a in request message’s message ID. If
-  //! no appropriate handler exists, the \a out reply message is treated as a
-  //! `mig_reply_error_t`, its return code is set to `MIG_BAD_ID`, and `false`
-  //! is returned.
-  bool MachMessageServerFunction(const mach_msg_header_t* in,
-                                 mach_msg_header_t* out,
-                                 bool* destroy_complex_request) override;
-
-  //! \copydoc MachMessageServer::Interface::MachMessageServerRequestIDs()
-  //!
-  //! This implementation returns the set of all request message Mach message
-  //! IDs of all handlers added by AddHandler().
-  std::set<mach_msg_id_t> MachMessageServerRequestIDs() override;
-
-  //! \copydoc MachMessageServer::Interface::MachMessageServerRequestSize()
-  //!
-  //! This implementation returns the maximum request message size of all
-  //! handlers added by AddHandler(). If no handlers are present, returns the
-  //! size of `mach_msg_header_t`, the minimum size of a MIG request message
-  //! that can be received for demultiplexing purposes.
-  mach_msg_size_t MachMessageServerRequestSize() override;
-
-  //! \copydoc MachMessageServer::Interface::MachMessageServerReplySize()
-  //!
-  //! This implementation returns the maximum reply message size of all handlers
-  //! added by AddHandler(). If no handlers are present, returns the size of
-  //! `mig_reply_error_t`, the minimum size of a MIG reply message.
-  mach_msg_size_t MachMessageServerReplySize() override;
-
- private:
-  using HandlerMap = std::map<mach_msg_id_t, MachMessageServer::Interface*>;
-
-  HandlerMap handler_map_;  // weak
-  mach_msg_size_t request_size_;
-  mach_msg_size_t reply_size_;
-
-  DISALLOW_COPY_AND_ASSIGN(CompositeMachMessageServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_COMPOSITE_MACH_MESSAGE_SERVER_H_
diff --git a/Tools/Crashpad/include/util/mach/exc_client_variants.h b/Tools/Crashpad/include/util/mach/exc_client_variants.h
deleted file mode 100644
index 8f52ed5323..0000000000
--- a/Tools/Crashpad/include/util/mach/exc_client_variants.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_EXC_CLIENT_VARIANTS_H_
-#define CRASHPAD_UTIL_MACH_EXC_CLIENT_VARIANTS_H_
-
-#include <mach/mach.h>
-
-#include "util/mach/mach_extensions.h"
-
-namespace crashpad {
-
-//! \brief Calls the appropriate `*exception_raise*()` function for the
-//!     specified \a behavior.
-//!
-//! The function called will be `exception_raise()` for `EXCEPTION_DEFAULT`,
-//! `exception_raise_state()` for `EXCEPTION_STATE`, or
-//! `exception_raise_state_identity()` for `EXCEPTION_STATE_IDENTITY`. If
-//! `MACH_EXCEPTION_CODES` is also set, the function called will instead be
-//! `mach_exception_raise()`, `mach_exception_raise_state()` or
-//! `mach_exception_raise_state_identity()`, respectively.
-//!
-//! This function does not fetch the existing thread state for \a behavior
-//! values that require a thread state. The caller must provide the existing
-//! thread state in the \a flavor, \a old_state, and \a old_state_count
-//! parameters for \a behavior values that require a thread state. Thread states
-//! may be obtained by calling `thread_get_state()` if needed. Similarly, this
-//! function does not do anything with the new thread state returned for these
-//! \a behavior values. Callers that wish to make use of the new thread state
-//! may do so by using the returned \a flavor, \a new_state, and \a
-//! new_state_count values. Thread states may be set by calling
-//! `thread_set_state()` if needed.
-//!
-//! \a thread and \a task are only used when \a behavior indicates that the
-//! exception message will carry identity information, when it has the value
-//! `EXCEPTION_DEFAULT` or `EXCEPTION_STATE_IDENTITY`, possibly with
-//! `MACH_EXCEPTION_CODES` also set. In other cases, these parameters are unused
-//! and may be set to `THREAD_NULL` and `TASK_NULL`, respectively.
-//!
-//! \a flavor, \a old_state, \a old_state_count, \a new_state, and \a
-//! new_state_count are only used when \a behavior indicates that the exception
-//! message will carry thread state information, when it has the value
-//! `EXCEPTION_STATE` or `EXCEPTION_STATE_IDENTITY`, possibly with
-//! `MACH_EXCEPTION_CODES` also set. In other cases, these parameters are unused
-//! and may be set to `0` (\a old_state_count) or `nullptr` (the remaining
-//! parameters).
-//!
-//! Except as noted, the parameters and return value are equivalent to those of
-//! the `*exception_raise*()` family of functions.
-//!
-//! \param[in] behavior The exception behavior, which dictates which function
-//!     will be called. It is an error to call this function with an invalid
-//!     value for \a behavior.
-//! \param[in] exception_port
-//! \param[in] thread
-//! \param[in] task
-//! \param[in] exception
-//! \param[in] code If \a behavior indicates a behavior without
-//!     `MACH_EXCEPTION_CODES`, the elements of \a code will be truncated in
-//!     order to be passed to the appropriate exception handler.
-//! \param[in] code_count
-//! \param[in,out] flavor
-//! \param[in] old_state
-//! \param[in] old_state_count
-//! \param[out] new_state
-//! \param[out] new_state_count
-//!
-//! \return The return value of the function called.
-kern_return_t UniversalExceptionRaise(exception_behavior_t behavior,
-                                      exception_handler_t exception_port,
-                                      thread_t thread,
-                                      task_t task,
-                                      exception_type_t exception,
-                                      const mach_exception_data_type_t* code,
-                                      mach_msg_type_number_t code_count,
-                                      thread_state_flavor_t* flavor,
-                                      ConstThreadState old_state,
-                                      mach_msg_type_number_t old_state_count,
-                                      thread_state_t new_state,
-                                      mach_msg_type_number_t* new_state_count);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_EXC_CLIENT_VARIANTS_H_
diff --git a/Tools/Crashpad/include/util/mach/exc_server_variants.h b/Tools/Crashpad/include/util/mach/exc_server_variants.h
deleted file mode 100644
index c7b35d4184..0000000000
--- a/Tools/Crashpad/include/util/mach/exc_server_variants.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_EXC_SERVER_VARIANTS_H_
-#define CRASHPAD_UTIL_MACH_EXC_SERVER_VARIANTS_H_
-
-#include <mach/mach.h>
-
-#include <memory>
-#include <set>
-
-#include "base/macros.h"
-#include "util/mach/mach_extensions.h"
-#include "util/mach/mach_message_server.h"
-
-namespace crashpad {
-
-namespace internal {
-class UniversalMachExcServerImpl;
-}  // namespace internal
-
-//! \brief A server interface for the `exc` and `mach_exc` Mach subsystems,
-//!     unified to handle exceptions delivered to either subsystem, and
-//!     simplified to have only a single interface method needing
-//!     implementation.
-//!
-//! The `<mach/exc.defs>` and `<mach/mach_exc.defs>` interfaces are identical,
-//! except that the latter allows for 64-bit exception codes, and is requested
-//! by setting the MACH_EXCEPTION_CODES behavior bit associated with an
-//! exception port.
-//!
-//! UniversalMachExcServer operates by translating messages received in the
-//! `exc` subsystem to a variant that is compatible with the `mach_exc`
-//! subsystem. This involves changing the format of \a code, the exception code
-//! field, from `exception_data_type_t` to `mach_exception_data_type_t`.
-class UniversalMachExcServer final : public MachMessageServer::Interface {
- public:
-  //! \brief An interface that the different request messages that are a part of
-  //!     the `exc` and `mach_exc` Mach subsystems can be dispatched to.
-  class Interface {
-   public:
-    //! \brief Handles exceptions raised by `exception_raise()`,
-    //!     `exception_raise_state()`, `exception_raise_state_identity()`,
-    //!     `mach_exception_raise()`, `mach_exception_raise_state()`, and
-    //!     `mach_exception_raise_state_identity()`.
-    //!
-    //! For convenience in implementation, these different “behaviors” of
-    //! exception messages are all mapped to a single interface method. The
-    //! exception’s original “behavior” is specified in the \a behavior
-    //! parameter. Only parameters that were supplied in the request message
-    //! are populated, other parameters are set to reasonable default values.
-    //!
-    //! This behaves equivalently to a `catch_exception_raise_state_identity()`
-    //! function used with `exc_server()`, or a
-    //! `catch_mach_exception_raise_state_identity()` function used with
-    //! `mach_exc_server()`. Except as noted, the parameters and return value
-    //! are equivalent to those of these other functions.
-    //!
-    //! \param[in] behavior `EXCEPTION_DEFAULT`, `EXCEPTION_STATE`,
-    //!     or `EXCEPTION_STATE_IDENTITY`, possibly with `MACH_EXCEPTION_CODES`
-    //!     ORed in. This identifies which exception request message was
-    //!     processed and thus which other parameters are valid.
-    //! \param[in] exception_port
-    //! \param[in] thread
-    //! \param[in] task
-    //! \param[in] exception
-    //! \param[in] code
-    //! \param[in] code_count
-    //! \param[in,out] flavor
-    //! \param[in] old_state
-    //! \param[in] old_state_count
-    //! \param[out] new_state
-    //! \param[out] new_state_count
-    //! \param[in] trailer The trailer received with the request message.
-    //! \param[out] destroy_complex_request `true` if the request message is to
-    //!     be destroyed even when this method returns success. See
-    //!     MachMessageServer::Interface.
-    //!
-    //! \return A code indicating whether the exception was handled. See
-    //!     ExcServerSuccessfulReturnValue() for success codes. On failure,
-    //!     a code such as `KERN_FAILURE`.
-    virtual kern_return_t CatchMachException(
-        exception_behavior_t behavior,
-        exception_handler_t exception_port,
-        thread_t thread,
-        task_t task,
-        exception_type_t exception,
-        const mach_exception_data_type_t* code,
-        mach_msg_type_number_t code_count,
-        thread_state_flavor_t* flavor,
-        ConstThreadState old_state,
-        mach_msg_type_number_t old_state_count,
-        thread_state_t new_state,
-        mach_msg_type_number_t* new_state_count,
-        const mach_msg_trailer_t* trailer,
-        bool* destroy_complex_request) = 0;
-
-   protected:
-    ~Interface() {}
-  };
-
-  //! \brief Constructs an object of this class.
-  //!
-  //! \param[in] interface The interface to dispatch requests to. Weak.
-  explicit UniversalMachExcServer(Interface* interface);
-
-  ~UniversalMachExcServer();
-
-  // MachMessageServer::Interface:
-  bool MachMessageServerFunction(const mach_msg_header_t* in_header,
-                                 mach_msg_header_t* out_header,
-                                 bool* destroy_complex_request) override;
-  std::set<mach_msg_id_t> MachMessageServerRequestIDs() override;
-  mach_msg_size_t MachMessageServerRequestSize() override;
-  mach_msg_size_t MachMessageServerReplySize() override;
-
- private:
-  std::unique_ptr<internal::UniversalMachExcServerImpl> impl_;
-
-  DISALLOW_COPY_AND_ASSIGN(UniversalMachExcServer);
-};
-
-//! \brief Computes an approriate successful return value for an exception
-//!     handler function.
-//!
-//! For exception handlers that respond to state-carrying behaviors, when the
-//! handler is called by the kernel (as it is normally), the kernel will attempt
-//! to set a new thread state when the exception handler returns successfully.
-//! Other code that mimics the kernel’s exception-delivery semantics may
-//! implement the same or similar behavior. In some situations, it is
-//! undesirable to set a new thread state. If the exception handler were to
-//! return unsuccessfully, however, the kernel would continue searching for an
-//! exception handler at a wider (task or host) scope. This may also be
-//! undesirable.
-//!
-//! If such exception handlers return `MACH_RCV_PORT_DIED`, the kernel will not
-//! set a new thread state and will also not search for another exception
-//! handler. See 10.9.4 `xnu-2422.110.17/osfmk/kern/exception.c`.
-//! `exception_deliver()` will only set a new thread state if the handler’s
-//! return code was `MACH_MSG_SUCCESS` (a synonym for `KERN_SUCCESS`), and
-//! subsequently, `exception_triage()` will not search for a new handler if the
-//! handler’s return code was `KERN_SUCCESS` or `MACH_RCV_PORT_DIED`.
-//!
-//! This function allows exception handlers to compute an appropriate return
-//! code to influence their caller (the kernel) in the desired way with respect
-//! to setting a new thread state while suppressing the caller’s subsequent
-//! search for other exception handlers. An exception handler should return the
-//! value returned by this function.
-//!
-//! This function is useful even for `EXC_CRASH` handlers, where returning
-//! `KERN_SUCCESS` and allowing the kernel to set a new thread state has been
-//! observed to cause a perceptible and unnecessary waste of time. The victim
-//! task in an `EXC_CRASH` handler is already being terminated and is no longer
-//! schedulable, so there is no point in setting the states of any of its
-//! threads.
-//!
-//! On OS X 10.11, the `MACH_RCV_PORT_DIED` mechanism cannot be used with an
-//! `EXC_CRASH` handler without triggering an undesirable `EXC_CORPSE_NOTIFY`
-//! exception. In that case, `KERN_SUCCESS` is always returned. Because this
-//! function may return `KERN_SUCCESS` for a state-carrying exception, it is
-//! important to ensure that the state returned by a state-carrying exception
-//! handler is valid, because it will be passed to `thread_set_status()`.
-//! ExcServerCopyState() may be used to achieve this.
-//!
-//! \param[in] exception The exception type passed to the exception handler.
-//!     This may be taken directly from the \a exception parameter of
-//!     internal::SimplifiedExcServer::Interface::CatchException(), for example.
-//! \param[in] behavior The behavior of the exception handler as invoked. This
-//!     may be taken directly from the \a behavior parameter of
-//!     internal::SimplifiedExcServer::Interface::CatchException(), for example.
-//! \param[in] set_thread_state `true` if the handler would like its caller to
-//!     set the new thread state using the \a flavor, \a new_state, and \a
-//!     new_state_count out parameters. This can only happen when \a behavior is
-//!     a state-carrying behavior.
-//!
-//! \return `KERN_SUCCESS` or `MACH_RCV_PORT_DIED`. `KERN_SUCCESS` is used when
-//!     \a behavior is not a state-carrying behavior, or when it is a
-//!     state-carrying behavior and \a set_thread_state is `true`, or for
-//!     `EXC_CRASH` exceptions on OS X 10.11 and later. Otherwise,
-//!     `MACH_RCV_PORT_DIED` is used.
-kern_return_t ExcServerSuccessfulReturnValue(exception_type_t exception,
-                                             exception_behavior_t behavior,
-                                             bool set_thread_state);
-
-//! \brief Copies the old state to the new state for state-carrying exceptions.
-//!
-//! When the kernel sends a state-carrying exception request and the response is
-//! successful (`MACH_MSG_SUCCESS`, a synonym for `KERN_SUCCESS`), it will set
-//! a new thread state based on \a new_state and \a new_state_count. To ease
-//! initialization of the new state, this function copies \a old_state and
-//! \a old_state_count. This is only done if \a behavior indicates a
-//! state-carrying exception.
-//!
-//! \param[in] behavior The behavior of the exception handler as invoked. This
-//!     may be taken directly from the \a behavior parameter of
-//!     internal::SimplifiedExcServer::Interface::CatchException(), for example.
-//! \param[in] old_state The original state value. This may be taken directly
-//!     from the \a old_state parameter of
-//!     internal::SimplifiedExcServer::Interface::CatchException(), for example.
-//! \param[in] old_state_count The number of significant `natural_t` words in \a
-//!     old_state. This may be taken directly from the \a old_state_count
-//!     parameter of internal::SimplifiedExcServer::Interface::CatchException(),
-//!     for example.
-//! \param[out] new_state The state value to be set. This may be taken directly
-//!     from the \a new_state parameter of
-//!     internal::SimplifiedExcServer::Interface::CatchException(), for example.
-//!     This parameter is untouched if \a behavior is not state-carrying.
-//! \param[in,out] new_state_count On entry, the number of `natural_t` words
-//!     available to be written to in \a new_state. On return, the number of
-//!     significant `natural_t` words in \a new_state. This may be taken
-//!     directly from the \a new_state_count parameter of
-//!     internal::SimplifiedExcServer::Interface::CatchException(), for example.
-//!     This parameter is untouched if \a behavior is not state-carrying. If \a
-//!     \a behavior is state-carrying, this parameter should be at least as
-//!     large as \a old_state_count.
-void ExcServerCopyState(exception_behavior_t behavior,
-                        ConstThreadState old_state,
-                        mach_msg_type_number_t old_state_count,
-                        thread_state_t new_state,
-                        mach_msg_type_number_t* new_state_count);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_EXC_SERVER_VARIANTS_H_
diff --git a/Tools/Crashpad/include/util/mach/exception_behaviors.h b/Tools/Crashpad/include/util/mach/exception_behaviors.h
deleted file mode 100644
index 14b5448a2b..0000000000
--- a/Tools/Crashpad/include/util/mach/exception_behaviors.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_EXCEPTION_BEHAVIORS_H_
-#define CRASHPAD_UTIL_MACH_EXCEPTION_BEHAVIORS_H_
-
-#include <mach/mach.h>
-
-namespace crashpad {
-
-//! \brief Determines whether \a behavior indicates an exception behavior that
-//!     carries thread state information.
-//!
-//! When this function returns `true`, an exception message of \a behavior will
-//! carry thread state information. Its \a flavor, \a old_state, \a
-//! old_state_count, \a new_state, and \a new_state_count fields will be valid.
-//! When this function returns `false`, these fields will not be valid.
-//!
-//! Exception behaviors that carry thread state information are
-//! `EXCEPTION_STATE` and `EXCEPTION_STATE_IDENTITY`. `MACH_EXCEPTION_CODES` may
-//! also be set. These behaviors correspond to `exception_raise_state()`,
-//! `exception_raise_state_identity()`, `mach_exception_raise_state()`, and
-//! `mach_exception_raise_state_identity()`.
-//!
-//! \param[in] behavior An exception behavior value.
-//!
-//! \return `true` if \a behavior is `EXCEPTION_STATE` or
-//!     `EXCEPTION_STATE_IDENTITY`, possibly with `MACH_EXCEPTION_CODES` also
-//!      set.
-bool ExceptionBehaviorHasState(exception_behavior_t behavior);
-
-//! \brief Determines whether \a behavior indicates an exception behavior that
-//!     carries thread and task identities.
-//!
-//! When this function returns `true`, an exception message of \a behavior will
-//! carry thread and task identities in the form of send rights to the thread
-//! and task ports. Its \a thread and \a task fields will be valid. When this
-//! function returns `false`, these fields will not be valid.
-//!
-//! Exception behaviors that carry thread and task identity information are
-//! `EXCEPTION_DEFAULT` and `EXCEPTION_STATE_IDENTITY`. `MACH_EXCEPTION_CODES`
-//! may also be set. These behaviors correspond to `exception_raise()`,
-//! `exception_raise_state_identity()`, `mach_exception_raise()`, and
-//! `mach_exception_raise_state_identity()`.
-//!
-//! \param[in] behavior An exception behavior value.
-//!
-//! \return `true` if \a behavior is `EXCEPTION_DEFAULT` or
-//!     `EXCEPTION_STATE_IDENTITY`, possibly with `MACH_EXCEPTION_CODES` also
-//!      set.
-bool ExceptionBehaviorHasIdentity(exception_behavior_t behavior);
-
-//! \brief Determines whether \a behavior indicates an exception behavior that
-//!     carries 64-bit exception codes (“Mach exception codes”).
-//!
-//! When this function returns `true`, an exception message of \a behavior will
-//! carry 64-bit exception codes of type `mach_exception_code_t` in its \a code
-//! field. When this function returns `false`, the exception message will carry
-//! 32-bit exception codes of type `exception_data_type_t` in its \a code field.
-//!
-//! Exception behaviors that carry 64-bit exception codes are those that have
-//! `MACH_EXCEPTION_CODES` set. These behaviors correspond to
-//! `mach_exception_raise()`, `mach_exception_raise_state()`, and
-//! `mach_exception_raise_state_identity()`.
-//!
-//! \param[in] behavior An exception behavior value.
-//!
-//! \return `true` if `MACH_EXCEPTION_CODES` is set in \a behavior.
-bool ExceptionBehaviorHasMachExceptionCodes(exception_behavior_t behavior);
-
-//! \brief Returns the basic behavior value of \a behavior, its value without
-//!     `MACH_EXCEPTION_CODES` set.
-//!
-//! \param[in] behavior An exception behavior value.
-//!
-//! \return `EXCEPTION_DEFAULT`, `EXCEPTION_STATE`, or
-//!     `EXCEPTION_STATE_IDENTITY`, assuming \a behavior was a correct exception
-//!     behavior value.
-exception_behavior_t ExceptionBehaviorBasic(exception_behavior_t behavior);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_EXCEPTION_BEHAVIORS_H_
diff --git a/Tools/Crashpad/include/util/mach/exception_ports.h b/Tools/Crashpad/include/util/mach/exception_ports.h
deleted file mode 100644
index b2473d98a0..0000000000
--- a/Tools/Crashpad/include/util/mach/exception_ports.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_EXCEPTION_PORTS_H_
-#define CRASHPAD_UTIL_MACH_EXCEPTION_PORTS_H_
-
-#include <mach/mach.h>
-
-#include <vector>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief A better interface to `*_get_exception_ports()` and
-//!     `*_set_exception_ports()`.
-//!
-//! The same generic interface can be used to operate on host, task, and thread
-//! exception ports. The “get” interface is superior to the system’s native
-//! interface because it keeps related data about a single exception handler
-//! together in one struct, rather than separating it into four parallel arrays.
-class ExceptionPorts {
- public:
-  //! \brief Various entities which can have their own exception ports set.
-  enum TargetType {
-    //! \brief The host exception target.
-    //!
-    //! `host_get_exception_ports()` and `host_set_exception_ports()` will be
-    //! used. If no target port is explicitly provided, `mach_host_self()` will
-    //! be used as the target port. `mach_host_self()` is the only target port
-    //! for this type that is expected to function properly.
-    //!
-    //! \note Operations on this target type are not expected to succeed as
-    //!     non-root, because `mach_host_self()` doesn’t return the privileged
-    //!     `host_priv` port to non-root users, and this is the target port
-    //!     that’s required for `host_get_exception_ports()` and
-    //!     `host_set_exception_ports()`.
-    kTargetTypeHost = 0,
-
-    //! \brief A task exception target.
-    //!
-    //! `task_get_exception_ports()` and `task_set_exception_ports()` will be
-    //! used. If no target port is explicitly provided, `mach_task_self()` will
-    //! be used as the target port.
-    kTargetTypeTask,
-
-    //! \brief A thread exception target.
-    //!
-    //! `thread_get_exception_ports()` and `thread_set_exception_ports()` will
-    //! be used. If no target port is explicitly provided, `mach_thread_self()`
-    //! will be used as the target port.
-    kTargetTypeThread,
-  };
-
-  //! \brief Information about a registered exception handler.
-  struct ExceptionHandler {
-    //! \brief A mask specifying the exception types to direct to \a port,
-    //!     containing `EXC_MASK_*` values.
-    exception_mask_t mask;
-
-    //! \brief A send right to a Mach port that will handle exceptions of the
-    //!     types indicated in \a mask.
-    exception_handler_t port;
-
-    //! \brief The “behavior” that the exception handler at \a port implements:
-    //!     `EXCEPTION_DEFAULT`, `EXCEPTION_STATE`, or
-    //!     `EXCEPTION_STATE_IDENTITY`, possibly combined with
-    //!     `MACH_EXCEPTION_CODES`.
-    exception_behavior_t behavior;
-
-    //! \brief The thread state flavor that the exception handler at \a port
-    //!     will receive and possibly modify. This member has no effect for \a
-    //!     \a behavior values that indicate a “default” behavior.
-    thread_state_flavor_t flavor;
-  };
-
-  //! \brief Wraps `std::vector<ExceptionHandler>`, providing proper cleanup of
-  //!     the send rights contained in each element’s ExceptionHandler::port.
-  //!
-  //! Upon destruction or clear(), an object of this class will deallocate all
-  //! send rights it contains. Otherwise, it is an interface-compatible drop-in
-  //! replacement for `std::vector<ExceptionHandler>`. Note that non-`const`
-  //! mutators are not provided to avoid accidental Mach right leaks.
-  class ExceptionHandlerVector {
-   public:
-    using VectorType = std::vector<ExceptionHandler>;
-
-    ExceptionHandlerVector();
-    ~ExceptionHandlerVector();
-
-    VectorType::const_iterator begin() const { return vector_.begin(); }
-    VectorType::const_iterator end() const { return vector_.end(); }
-    VectorType::size_type size() const { return vector_.size(); }
-    bool empty() const { return vector_.empty(); }
-    VectorType::const_reference operator[](VectorType::size_type index) const {
-      return vector_[index];
-    }
-    void push_back(VectorType::value_type& value) { vector_.push_back(value); }
-    void clear();
-
-   private:
-    void Deallocate();
-
-    VectorType vector_;
-
-    DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerVector);
-  };
-
-  //! \brief Constructs an interface object to get or set exception ports on a
-  //!     host, task, or thread port.
-  //!
-  //! \param[in] target_type The type of target on which the exception ports are
-  //!     to be get or set: #kTargetTypeHost, #kTargetTypeTask, or or
-  //!     #kTargetTypeThread. The correct functions for
-  //!     `*_get_exception_ports()` and `*_set_exception_ports()` will be used.
-  //! \param[in] target_port The target on which to call
-  //!     `*_get_exception_ports()` or `*_set_exception_ports()`. The target
-  //!     port must be a send right to a port of the type specified in \a
-  //!     target_type. In this case, ownership of \a target_port is not given to
-  //!     the new ExceptionPorts object. \a target_port may also be
-  //!     `HOST_NULL`, `TASK_NULL`, or `THREAD_NULL`, in which case
-  //!     `mach_host_self()`, `mach_task_self()`, or `mach_thread_self()` will
-  //!     be used as the target port depending on the value of \a target_type.
-  //!     In this case, ownership of the target port will be managed
-  //!     appropriately for \a target_type.
-  ExceptionPorts(TargetType target_type, mach_port_t target_port);
-
-  ~ExceptionPorts();
-
-  //! \brief Calls `*_get_exception_ports()` on the target.
-  //!
-  //! \param[in] mask The exception mask, containing the `EXC_MASK_*` values to
-  //!     be looked up and returned in \a handlers.
-  //! \param[out] handlers The exception handlers registered for \a target_port
-  //!     to handle exceptions indicated in \a mask. If no execption port is
-  //!     registered for a bit in \a mask, \a handlers will not contain an entry
-  //!     corresponding to that bit. This is a departure from the
-  //!     `*_get_exception_ports()` functions, which may return a handler whose
-  //!     port is set to `EXCEPTION_PORT_NULL` in this case. On failure, this
-  //!     argument is untouched.
-  //!
-  //! \return `true` if `*_get_exception_ports()` returned `KERN_SUCCESS`, with
-  //!     \a handlers set appropriately. `false` otherwise, with an appropriate
-  //!     message logged.
-  bool GetExceptionPorts(exception_mask_t mask,
-                         ExceptionHandlerVector* handlers) const;
-
-  //! \brief Calls `*_set_exception_ports()` on the target.
-  //!
-  //! \param[in] mask A mask specifying the exception types to direct to \a
-  //!     port, containing `EXC_MASK_*` values.
-  //! \param[in] port A send right to a Mach port that will handle exceptions
-  //!     sustained by \a target_port of the types indicated in \a mask. The
-  //!     send right is copied, not consumed, by this call.
-  //! \param[in] behavior The “behavior” that the exception handler at \a port
-  //!     implements: `EXCEPTION_DEFAULT`, `EXCEPTION_STATE`, or
-  //!     `EXCEPTION_STATE_IDENTITY`, possibly combined with
-  //!     `MACH_EXCEPTION_CODES`.
-  //! \param[in] flavor The thread state flavor that the exception handler at \a
-  //!     port expects to receive and possibly modify. This argument has no
-  //!     effect for \a behavior values that indicate a “default” behavior.
-  //!
-  //! \return `true` if `*_set_exception_ports()` returned `KERN_SUCCESS`.
-  //!     `false` otherwise, with an appropriate message logged.
-  bool SetExceptionPort(exception_mask_t mask,
-                        exception_handler_t port,
-                        exception_behavior_t behavior,
-                        thread_state_flavor_t flavor) const;
-
-  //! \brief Returns a string identifying the target type.
-  //!
-  //! \return `"host"`, `"task"`, or `"thread"`, as appropriate.
-  const char* TargetTypeName() const;
-
- private:
-  using GetExceptionPortsType = kern_return_t(*)(mach_port_t,
-                                                 exception_mask_t,
-                                                 exception_mask_array_t,
-                                                 mach_msg_type_number_t*,
-                                                 exception_handler_array_t,
-                                                 exception_behavior_array_t,
-                                                 exception_flavor_array_t);
-
-  using SetExceptionPortsType = kern_return_t(*)(mach_port_t,
-                                                 exception_mask_t,
-                                                 exception_handler_t,
-                                                 exception_behavior_t,
-                                                 thread_state_flavor_t);
-
-  GetExceptionPortsType get_exception_ports_;
-  SetExceptionPortsType set_exception_ports_;
-  const char* target_name_;
-  mach_port_t target_port_;
-
-  // If true, target_port_ will be deallocated in the destructor. This will
-  // always be false when the user provides a non-null target_port to the
-  // constructor. It will also be false when target_type is kTargetTypeTask,
-  // even with a TASK_NULL target_port, because it is incorrect to deallocate
-  // the result of mach_task_self().
-  bool dealloc_target_port_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExceptionPorts);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_EXCEPTION_PORTS_H_
diff --git a/Tools/Crashpad/include/util/mach/exception_types.h b/Tools/Crashpad/include/util/mach/exception_types.h
deleted file mode 100644
index 5082ed194f..0000000000
--- a/Tools/Crashpad/include/util/mach/exception_types.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_EXCEPTION_TYPES_H_
-#define CRASHPAD_UTIL_MACH_EXCEPTION_TYPES_H_
-
-#include <inttypes.h>
-#include <mach/mach.h>
-#include <sys/types.h>
-
-namespace crashpad {
-
-//! \brief Recovers the original exception, first exception code, and signal
-//!     from the encoded form of the first exception code delivered with
-//!     `EXC_CRASH` exceptions.
-//!
-//! `EXC_CRASH` exceptions are generated when the kernel has committed to
-//! terminating a process as a result of a core-generating POSIX signal and, for
-//! hardware exceptions, an earlier Mach exception. Information about this
-//! earlier exception and signal is made available to the `EXC_CRASH` handler
-//! via its `code[0]` parameter. This function recovers the original exception,
-//! the value of `code[0]` from the original exception, and the value of the
-//! signal responsible for process termination.
-//!
-//! \param[in] code_0 The first exception code (`code[0]`) passed to a Mach
-//!     exception handler in an `EXC_CRASH` exception. It is invalid to call
-//!     this function with an exception code from any exception other than
-//!     `EXC_CRASH`.
-//! \param[out] original_code_0 The first exception code (`code[0]`) passed to
-//!     the Mach exception handler for a hardware exception that resulted in the
-//!     generation of a POSIX signal that caused process termination. If the
-//!     signal that caused termination was not sent as a result of a hardware
-//!     exception, this will be `0`. Callers that do not need this value may
-//!     pass `nullptr`.
-//! \param[out] signal The POSIX signal that caused process termination. Callers
-//!     that do not need this value may pass `nullptr`.
-//!
-//! \return The original exception for a hardware exception that resulted in the
-//!     generation of a POSIX signal that caused process termination. If the
-//!     signal that caused termination was not sent as a result of a hardware
-//!     exception, this will be `0`.
-exception_type_t ExcCrashRecoverOriginalException(
-    mach_exception_code_t code_0,
-    mach_exception_code_t* original_code_0,
-    int* signal);
-
-//! \brief Determines whether a given exception type could plausibly be carried
-//!     within an `EXC_CRASH` exception.
-//!
-//! \param[in] exception The exception type to test.
-//!
-//! \return `true` if an `EXC_CRASH` exception could plausibly carry \a
-//!     exception.
-//!
-//! An `EXC_CRASH` exception can wrap exceptions that originate as hardware
-//! faults, as well as exceptions that originate from certain software sources
-//! such as POSIX signals. It cannot wrap another `EXC_CRASH` exception, nor can
-//! it wrap `EXC_RESOURCE`, `EXC_GUARD`, or `EXC_CORPSE_NOTIFY` exceptions. It
-//! also cannot wrap Crashpad-specific #kMachExceptionSimulated exceptions.
-bool ExcCrashCouldContainException(exception_type_t exception);
-
-//! \brief Returns the exception code to report via a configured metrics system.
-//!
-//! \param[in] exception The exception type as received by a Mach exception
-//!     handler.
-//! \param[in] code_0 The first exception code (`code[0]`) as received by a
-//!     Mach exception handler.
-//!
-//! \return An exception code that maps useful information from \a exception and
-//!     \a code_0 to the more limited data type available for metrics reporting.
-//!
-//! For classic Mach exceptions (including hardware faults reported as Mach
-//! exceptions), the mapping is `(exception << 16) | code_0`.
-//!
-//! For `EXC_CRASH` exceptions that originate as Mach exceptions described
-//! above, the mapping above is used, with the original exception’s values. For
-//! `EXC_CRASH` exceptions that originate as POSIX signals without an underlying
-//! Mach exception, the mapping is `(EXC_CRASH << 16) | code_0`.
-//!
-//! `EXC_RESOURCE` and `EXC_GUARD` exceptions both contain exception-specific
-//! “type” values and type-specific “flavor” values. In these cases, the mapping
-//! is `(exception << 16) | (type << 8) | flavor`. For `EXC_GUARD`, the “flavor”
-//! value is rewritten to be more space-efficient by replacing the
-//! kernel-supplied bitmask having exactly one bit set with the index of the set
-//! bit.
-//!
-//! `EXC_CORPSE_NOTIFY` exceptions are reported as classic Mach exceptions with
-//! the \a code_0 field set to `0`.
-//!
-//! If \a exception is #kMachExceptionSimulated, that value is returned as-is.
-//!
-//! Overflow conditions in any field are handled via saturation.
-int32_t ExceptionCodeForMetrics(exception_type_t exception,
-                                mach_exception_code_t code_0);
-
-//! \brief Determines whether an exception is a non-fatal `EXC_RESOURCE`.
-//!
-//! \param[in] exception The exception type as received by a Mach exception
-//!     handler.
-//! \param[in] code_0 The first exception code (`code[0]`) as received by a
-//!     Mach exception handler.
-//! \param[in] pid The process ID that the exception occurred in. In some cases,
-//!     process may need to be queried to determine whether an `EXC_RESOURCE`
-//!     exception is fatal.
-//!
-//! \return `true` if the exception is a non-fatal `EXC_RESOURCE`. `false`
-//!     otherwise. If the exception is `EXC_RESOURCE` of a recognized type but
-//!     it is not possible to determine whether it is fatal, returns `true`
-//!     under the assumption that all known `EXC_RESOURCE` exceptions are
-//!     non-fatal by default. If the exception is not `EXC_RESOURCE` or is an
-//!     unknown `EXC_RESOURCE` type, returns `false`.
-bool IsExceptionNonfatalResource(exception_type_t exception,
-                                 mach_exception_code_t code_0,
-                                 pid_t pid);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_EXCEPTION_TYPES_H_
diff --git a/Tools/Crashpad/include/util/mach/mach_extensions.h b/Tools/Crashpad/include/util/mach/mach_extensions.h
deleted file mode 100644
index 25e401c230..0000000000
--- a/Tools/Crashpad/include/util/mach/mach_extensions.h
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_MACH_EXTENSIONS_H_
-#define CRASHPAD_UTIL_MACH_MACH_EXTENSIONS_H_
-
-#include <mach/mach.h>
-
-#include <string>
-
-#include "base/mac/scoped_mach_port.h"
-
-namespace crashpad {
-
-//! \brief `MACH_PORT_NULL` with the correct type for a Mach port,
-//!     `mach_port_t`.
-//!
-//! For situations where implicit conversions between signed and unsigned types
-//! are not performed, use kMachPortNull instead of an explicit `implicit_cast`
-//! of `MACH_PORT_NULL` to `mach_port_t`. This is useful for logging and testing
-//! assertions.
-constexpr mach_port_t kMachPortNull = MACH_PORT_NULL;
-
-//! \brief `MACH_EXCEPTION_CODES` with the correct type for a Mach exception
-//!     behavior, `exception_behavior_t`.
-//!
-//! Signedness problems can occur when ORing `MACH_EXCEPTION_CODES` as a signed
-//! integer, because a signed integer overflow results. This constant can be
-//! used instead of `MACH_EXCEPTION_CODES` in such cases.
-constexpr exception_behavior_t kMachExceptionCodes = MACH_EXCEPTION_CODES;
-
-// Because exception_mask_t is an int and has one bit for each defined
-// exception_type_t, it’s reasonable to assume that there cannot be any
-// officially-defined exception_type_t values higher than 31.
-// kMachExceptionSimulated uses a value well outside this range because it does
-// not require a corresponding mask value. Simulated exceptions are delivered to
-// the exception handler registered for EXC_CRASH exceptions using
-// EXC_MASK_CRASH.
-
-//! \brief An exception type to use for simulated exceptions.
-constexpr exception_type_t kMachExceptionSimulated = 'CPsx';
-
-//! \brief A const version of `thread_state_t`.
-//!
-//! This is useful as the \a old_state parameter to exception handler functions.
-//! Normally, these parameters are of type `thread_state_t`, but this allows
-//! modification of the state, which is conceptually `const`.
-using ConstThreadState = const natural_t*;
-
-//! \brief Like `mach_thread_self()`, but without the obligation to release the
-//!     send right.
-//!
-//! `mach_thread_self()` returns a send right to the current thread port,
-//! incrementing its reference count. This burdens the caller with maintaining
-//! this send right, and calling `mach_port_deallocate()` when it is no longer
-//! needed. This is burdensome, and is at odds with the normal operation of
-//! `mach_task_self()`, which does not increment the task port’s reference count
-//! whose result must not be deallocated.
-//!
-//! Callers can use this function in preference to `mach_thread_self()`. This
-//! function returns an extant reference to the current thread’s port without
-//! incrementing its reference count.
-//!
-//! \return The value of `mach_thread_self()` without incrementing its reference
-//!     count. The returned port must not be deallocated by
-//!     `mach_port_deallocate()`. The returned value is valid as long as the
-//!     thread continues to exist as a `pthread_t`.
-thread_t MachThreadSelf();
-
-//! \brief Creates a new Mach port in the current task.
-//!
-//! This function wraps the `mach_port_allocate()` providing a simpler
-//! interface.
-//!
-//! \param[in] right The type of right to create.
-//!
-//! \return The new Mach port. On failure, `MACH_PORT_NULL` with a message
-//!     logged.
-mach_port_t NewMachPort(mach_port_right_t right);
-
-//! \brief The value for `EXC_MASK_ALL` appropriate for the operating system at
-//!     run time.
-//!
-//! The SDK’s definition of `EXC_MASK_ALL` has changed over time, with later
-//! versions containing more bits set than earlier versions. However, older
-//! kernels will reject exception masks that contain bits set that they don’t
-//! recognize. Calling this function will return a value for `EXC_MASK_ALL`
-//! appropriate for the system at run time.
-//!
-//! \note `EXC_MASK_ALL` does not include the value of `EXC_MASK_CRASH` or
-//!     `EXC_MASK_CORPSE_NOTIFY`. Consumers that want `EXC_MASK_ALL` along with
-//!     `EXC_MASK_CRASH` may use ExcMaskAll() `| EXC_MASK_CRASH`. Consumers may
-//!     use ExcMaskValid() for `EXC_MASK_ALL` along with `EXC_MASK_CRASH`,
-//!     `EXC_MASK_CORPSE_NOTIFY`, and any values that come into existence in the
-//!     future.
-exception_mask_t ExcMaskAll();
-
-//! \brief An exception mask containing every possible exception understood by
-//!     the operating system at run time.
-//!
-//! `EXC_MASK_ALL`, and thus ExcMaskAll(), never includes the value of
-//! `EXC_MASK_CRASH` or `EXC_MASK_CORPSE_NOTIFY`. For situations where an
-//! exception mask corresponding to every possible exception understood by the
-//! running kernel is desired, use this function instead.
-//!
-//! Should new exception types be introduced in the future, this function will
-//! be updated to include their bits in the returned mask value when run time
-//! support is present.
-exception_mask_t ExcMaskValid();
-
-//! \brief Makes a `boostrap_check_in()` call to the process’ bootstrap server.
-//!
-//! This function is provided to make it easier to call `bootstrap_check_in()`
-//! while avoiding accidental leaks of the returned receive right.
-//!
-//! \param[in] service_name The service name to check in.
-//!
-//! \return On success, a receive right to the service port. On failure,
-//!     `MACH_PORT_NULL` with a message logged.
-base::mac::ScopedMachReceiveRight BootstrapCheckIn(
-    const std::string& service_name);
-
-//! \brief Makes a `boostrap_look_up()` call to the process’ bootstrap server.
-//!
-//! This function is provided to make it easier to call `bootstrap_look_up()`
-//! while avoiding accidental leaks of the returned send right.
-//!
-//! \param[in] service_name The service name to look up.
-//!
-//! \return On success, a send right to the service port. On failure,
-//!     `MACH_PORT_NULL` with a message logged.
-base::mac::ScopedMachSendRight BootstrapLookUp(const std::string& service_name);
-
-//! \brief Obtains the system’s default Mach exception handler for crash-type
-//!     exceptions.
-//!
-//! This is obtained by looking up `"com.apple.ReportCrash"` with the bootstrap
-//! server. The service name comes from the first launch agent loaded by
-//! `launchd` with a `MachServices` entry having `ExceptionServer` set. This
-//! launch agent is normally loaded from
-//! `/System/Library/LaunchAgents/com.apple.ReportCrash.plist`.
-//!
-//! \return On success, a send right to an `exception_handler_t` corresponding
-//!     to the system’s default crash reporter. On failure, `MACH_PORT_NULL`,
-//!     with a message logged.
-base::mac::ScopedMachSendRight SystemCrashReporterHandler();
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_MACH_EXTENSIONS_H_
diff --git a/Tools/Crashpad/include/util/mach/mach_message.h b/Tools/Crashpad/include/util/mach/mach_message.h
deleted file mode 100644
index e0fc6f6f72..0000000000
--- a/Tools/Crashpad/include/util/mach/mach_message.h
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_MACH_MESSAGE_H_
-#define CRASHPAD_UTIL_MACH_MACH_MESSAGE_H_
-
-#include <mach/mach.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-namespace crashpad {
-
-//! \brief A Mach message option specifying that an audit trailer should be
-//!     delivered during a receive operation.
-//!
-//! This constant is provided because the macros normally used to request this
-//! behavior are cumbersome.
-constexpr mach_msg_option_t kMachMessageReceiveAuditTrailer =
-    MACH_RCV_TRAILER_TYPE(MACH_MSG_TRAILER_FORMAT_0) |
-    MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AUDIT);
-
-//! \brief Special constants used as `mach_msg_timeout_t` values.
-enum : mach_msg_timeout_t {
-  //! \brief When passed to MachMessageDeadlineFromTimeout(), that function will
-  //!     return #kMachMessageDeadlineNonblocking.
-  kMachMessageTimeoutNonblocking = 0,
-
-  //! \brief When passed to MachMessageDeadlineFromTimeout(), that function will
-  //!     return #kMachMessageDeadlineWaitIndefinitely.
-  kMachMessageTimeoutWaitIndefinitely = 0xffffffff,
-};
-
-//! \brief The time before which a MachMessageWithDeadline() call should
-//!     complete.
-//!
-//! A value of this type may be one of the special constants
-//! #kMachMessageDeadlineNonblocking or #kMachMessageDeadlineWaitIndefinitely.
-//! Any other values should be produced by calling
-//! MachMessageDeadlineFromTimeout().
-//!
-//! Internally, these are currently specified on the same time base as
-//! ClockMonotonicNanoseconds(), although this is an implementation detail.
-using MachMessageDeadline = uint64_t;
-
-//! \brief Special constants used as \ref crashpad::MachMessageDeadline
-//!     "MachMessageDeadline" values.
-enum : MachMessageDeadline {
-  //! \brief MachMessageWithDeadline() should not block at all in its operation.
-  kMachMessageDeadlineNonblocking = 0,
-
-  //! \brief MachMessageWithDeadline() should wait indefinitely for the
-  //!     requested operation to complete.
-  kMachMessageDeadlineWaitIndefinitely = 0xffffffffffffffff,
-};
-
-//! \brief Computes the deadline for a specified timeout value.
-//!
-//! While deadlines exist on an absolute time scale, timeouts are relative. This
-//! function calculates the deadline as \a timeout_ms milliseconds after it
-//! executes.
-//!
-//! If \a timeout_ms is #kMachMessageDeadlineNonblocking, this function will
-//! return #kMachMessageDeadlineNonblocking. If \a timeout_ms is
-//! #kMachMessageTimeoutWaitIndefinitely, this function will return
-//! #kMachMessageDeadlineWaitIndefinitely.
-MachMessageDeadline MachMessageDeadlineFromTimeout(
-    mach_msg_timeout_t timeout_ms);
-
-//! \brief Runs `mach_msg()` with a deadline, as opposed to a timeout.
-//!
-//! This function is similar to `mach_msg()`, with the following differences:
-//!  - The `timeout` parameter has been replaced by \a deadline. The deadline
-//!    applies uniformly to a call that is requested to both send and receive
-//!    a message.
-//!  - The `MACH_SEND_TIMEOUT` and `MACH_RCV_TIMEOUT` bits in \a options are
-//!    not used. Timeouts are specified by the \a deadline argument.
-//!  - The `send_size` parameter has been removed. Its value is implied by
-//!    \a message when \a options contains `MACH_SEND_MSG`.
-//!  - The \a run_even_if_expired parameter has been added.
-//!
-//! Like the `mach_msg()` wrapper in `libsyscall`, this function will retry
-//! operations when experiencing `MACH_SEND_INTERRUPTED` and
-//! `MACH_RCV_INTERRUPTED`, unless \a options contains `MACH_SEND_INTERRUPT` or
-//! `MACH_RCV_INTERRUPT`. Unlike `mach_msg()`, which restarts the call with the
-//! full timeout when this occurs, this function continues enforcing the
-//! user-specified \a deadline.
-//!
-//! Except as noted, the parameters and return value are identical to those of
-//! `mach_msg()`.
-//!
-//! \param[in,out] message
-//! \param[in] options
-//! \param[in] receive_size
-//! \param[in] receive_port
-//! \param[in] deadline The time by which this call should complete. If the
-//!     deadline is exceeded, this call will return `MACH_SEND_TIMED_OUT` or
-//!     `MACH_RCV_TIMED_OUT`.
-//! \param[in] notify_port
-//! \param[in] run_even_if_expired If `true`, a deadline that is expired when
-//!     this function is called will be treated as though a deadline of
-//!     #kMachMessageDeadlineNonblocking had been specified. When `false`, an
-//!     expired deadline will result in a `MACH_SEND_TIMED_OUT` or
-//!     `MACH_RCV_TIMED_OUT` return value, even if the deadline is already
-//!     expired when the function is called.
-//!
-//! \return The return value of `mach_msg()`
-mach_msg_return_t MachMessageWithDeadline(mach_msg_header_t* message,
-                                          mach_msg_option_t options,
-                                          mach_msg_size_t receive_size,
-                                          mach_port_name_t receive_port,
-                                          MachMessageDeadline deadline,
-                                          mach_port_name_t notify_port,
-                                          bool run_even_if_expired);
-
-//! \brief Initializes a reply message for a MIG server routine based on its
-//!     corresponding request.
-//!
-//! If a request is handled by a server routine, it may be necessary to revise
-//! some of the fields set by this function, such as `msgh_size` and any fields
-//! defined in a routine’s reply structure type.
-//!
-//! \param[in] in_header The request message to base the reply on.
-//! \param[out] out_header The reply message to initialize. \a out_header will
-//!     be treated as a `mig_reply_error_t*` and all of its fields will be set
-//!     except for `RetCode`, which must be set by SetMIGReplyError(). This
-//!     argument is accepted as a `mach_msg_header_t*` instead of a
-//!     `mig_reply_error_t*` because that is the type that callers are expected
-//!     to possess in the C API.
-void PrepareMIGReplyFromRequest(const mach_msg_header_t* in_header,
-                                mach_msg_header_t* out_header);
-
-//! \brief Sets the error code in a reply message for a MIG server routine.
-//!
-//! \param[in,out] out_header The reply message to operate on. \a out_header
-//!     will be treated as a `mig_reply_error_t*` and its `RetCode` field will
-//!     be set. This argument is accepted as a `mach_msg_header_t*` instead of a
-//!     `mig_reply_error_t*` because that is the type that callers are expected
-//!     to possess in the C API.
-//! \param[in] error The error code to store in \a out_header.
-//!
-//! \sa PrepareMIGReplyFromRequest()
-void SetMIGReplyError(mach_msg_header_t* out_header, kern_return_t error);
-
-//! \brief Returns a Mach message trailer for a message that has been received.
-//!
-//! This function must only be called on Mach messages that have been received
-//! via the Mach messaging interface, such as `mach_msg()`. Messages constructed
-//! for sending do not contain trailers.
-//!
-//! \param[in] header A pointer to a received Mach message.
-//!
-//! \return A pointer to the trailer following the received Mach message’s body.
-//!     The contents of the trailer depend on the options provided to
-//!     `mach_msg()` or a similar function when the message was received.
-const mach_msg_trailer_t* MachMessageTrailerFromHeader(
-    const mach_msg_header_t* header);
-
-//! \brief Returns the process ID of a Mach message’s sender from its audit
-//!     trailer.
-//!
-//! For the audit trailer to be present, the message must have been received
-//! with #kMachMessageReceiveAuditTrailer or its macro equivalent specified in
-//! the receive options.
-//!
-//! If the kernel is the message’s sender, a process ID of `0` will be returned.
-//!
-//! \param[in] trailer The trailer received with a Mach message.
-//!
-//! \return The process ID of the message’s sender, or `-1` on failure with a
-//!     message logged. It is considered a failure for \a trailer to not contain
-//!     audit information.
-pid_t AuditPIDFromMachMessageTrailer(const mach_msg_trailer_t* trailer);
-
-//! \brief Destroys or deallocates a Mach port received in a Mach message.
-//!
-//! This function disposes of port rights received in a Mach message. Receive
-//! rights will be destroyed with `mach_port_mod_refs()`. Send and send-once
-//! rights will be deallocated with `mach_port_deallocate()`.
-//!
-//! \param[in] port The port to destroy or deallocate.
-//! \param[in] port_right_type The right type held for \a port:
-//!     `MACH_MSG_TYPE_PORT_RECEIVE`, `MACH_MSG_TYPE_PORT_SEND`, or
-//!     `MACH_MSG_TYPE_PORT_SEND_ONCE`.
-//!
-//! \return `true` on success, or `false` on failure with a message logged.
-bool MachMessageDestroyReceivedPort(mach_port_t port,
-                                    mach_msg_type_name_t port_right_type);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_MACH_MESSAGE_H_
diff --git a/Tools/Crashpad/include/util/mach/mach_message_server.h b/Tools/Crashpad/include/util/mach/mach_message_server.h
deleted file mode 100644
index 5e96c4cef3..0000000000
--- a/Tools/Crashpad/include/util/mach/mach_message_server.h
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_MACH_MESSAGE_SERVER_H_
-#define CRASHPAD_UTIL_MACH_MACH_MESSAGE_SERVER_H_
-
-#include <mach/mach.h>
-
-#include <set>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Runs a Mach message server to handle a Mach RPC request for MIG
-//!     servers.
-//!
-//! The principal entry point to this interface is the static Run() method.
-class MachMessageServer {
- public:
-  //! \brief A Mach RPC callback interface, called by Run().
-  class Interface {
-   public:
-    //! \brief Handles a Mach RPC request.
-    //!
-    //! This method is a stand-in for a MIG-generated Mach RPC server “demux”
-    //! function such as `exc_server()` and `mach_exc_server()`. Implementations
-    //! may call such a function directly. This method is expected to behave
-    //! exactly as these functions behave.
-    //!
-    //! \param[in] in The request message, received as a Mach message. Note that
-    //!     this interface uses a `const` parameter for this purpose, whereas
-    //!     MIG-generated “demux” functions do not.
-    //! \param[out] out The reply message. The caller allocates storage, and the
-    //!     callee is expected to populate the reply message appropriately.
-    //!     After returning, the caller will send this reply as a Mach message
-    //!     via the message’s reply port.
-    //! \param[out] destroy_complex_request `true` if a complex request message
-    //!     is to be destroyed even when handled successfully, `false`
-    //!     otherwise. The traditional behavior is `false`. In this case, the
-    //!     caller only destroys the request message in \a in when the reply
-    //!     message in \a out is not complex and when it indicates a return code
-    //!     other than `KERN_SUCCESS` or `MIG_NO_REPLY`. The assumption is that
-    //!     the rights or out-of-line data carried in a complex message may be
-    //!     retained by the server in this situation, and that it is the
-    //!     responsibility of the server to release these resources as needed.
-    //!     However, in many cases, these resources are not needed beyond the
-    //!     duration of a request-reply transaction, and in such cases, it is
-    //!     less error-prone to always have the caller,
-    //!     MachMessageServer::Run(), destroy complex request messages. To
-    //!     choose this behavior, this parameter should be set to `true`.
-    //!
-    //! \return `true` on success and `false` on failure, although the caller
-    //!     ignores the return value. However, the return code to be included in
-    //!     the reply message should be set as `mig_reply_error_t::RetCode`. The
-    //!     non-`void` return value is used for increased compatibility with
-    //!     MIG-generated functions.
-    virtual bool MachMessageServerFunction(const mach_msg_header_t* in,
-                                           mach_msg_header_t* out,
-                                           bool* destroy_complex_request) = 0;
-
-    //! \return The set of request message Mach message IDs that
-    //!     MachMessageServerFunction() is able to handle.
-    virtual std::set<mach_msg_id_t> MachMessageServerRequestIDs() = 0;
-
-    //! \return The expected or maximum size, in bytes, of a request message to
-    //!     be received as the \a in parameter of MachMessageServerFunction().
-    virtual mach_msg_size_t MachMessageServerRequestSize() = 0;
-
-    //! \return The maximum size, in bytes, of a reply message to be sent via
-    //!     the \a out parameter of MachMessageServerFunction(). This value does
-    //!     not need to include the size of any trailer to be sent with the
-    //!     message.
-    virtual mach_msg_size_t MachMessageServerReplySize() = 0;
-
-   protected:
-    ~Interface() {}
-  };
-
-  //! \brief Informs Run() whether to handle a single request-reply transaction
-  //!     or to run in a loop.
-  enum Persistent {
-    //! \brief Handle a single request-reply transaction and then return.
-    kOneShot = false,
-
-    //! \brief Run in a loop, potentially handling multiple request-reply
-    //!     transactions.
-    kPersistent,
-  };
-
-  //! \brief Determines how to handle the reception of messages larger than the
-  //!     size of the buffer allocated to store them.
-  enum ReceiveLarge {
-    //! \brief Return `MACH_RCV_TOO_LARGE` upon receipt of a large message.
-    //!
-    //! This mimics the default behavior of `mach_msg_server()` when `options`
-    //! does not contain `MACH_RCV_LARGE`.
-    kReceiveLargeError = 0,
-
-    //! \brief Ignore large messages, and attempt to receive the next queued
-    //!     message upon encountering one.
-    //!
-    //! When a large message is encountered, a warning will be logged.
-    //!
-    //! `mach_msg()` will be called to receive the next message after a large
-    //! one even when accompanied by a #Persistent value of #kOneShot.
-    kReceiveLargeIgnore,
-
-    //! \brief Allocate an appropriately-sized buffer upon encountering a large
-    //!     message. The buffer will be used to receive the message. This
-    //!
-    //! This mimics the behavior of `mach_msg_server()` when `options` contains
-    //! `MACH_RCV_LARGE`.
-    kReceiveLargeResize,
-  };
-
-  //! \brief Runs a Mach message server to handle a Mach RPC request for MIG
-  //!     servers.
-  //!
-  //! This function listens for a request message and passes it to a callback
-  //! interface. A reponse is collected from that interface, and is sent back as
-  //! a reply.
-  //!
-  //! This function is similar to `mach_msg_server()` and
-  //! `mach_msg_server_once()`.
-  //!
-  //! \param[in] interface The MachMessageServerInterface that is responsible
-  //!     for handling the message. Interface::MachMessageServerRequestSize() is
-  //!     used as the receive size for the request message, and
-  //!     Interface::MachMessageServerReplySize() is used as the
-  //!     maximum size of the reply message. If \a options contains
-  //!     `MACH_RCV_LARGE`, this function will retry a receive operation that
-  //!     returns `MACH_RCV_TOO_LARGE` with an appropriately-sized buffer.
-  //!     MachMessageServerInterface::MachMessageServerFunction() is called to
-  //!     handle the request and populate the reply.
-  //! \param[in] receive_port The port on which to receive the request message.
-  //! \param[in] options Options suitable for mach_msg. For the defaults, use
-  //!     `MACH_MSG_OPTION_NONE`. `MACH_RCV_LARGE` when specified here is
-  //!     ignored. Set \a receive_large to #kReceiveLargeResize instead.
-  //! \param[in] persistent Chooses between one-shot and persistent operation.
-  //! \param[in] receive_large Determines the behavior upon encountering a
-  //!     message larger than the receive buffer’s size.
-  //! \param[in] timeout_ms The maximum duration that this entire function will
-  //!     run, in milliseconds. This may be #kMachMessageTimeoutNonblocking or
-  //!     #kMachMessageTimeoutWaitIndefinitely. When \a persistent is
-  //!     #kPersistent, the timeout applies to the overall duration of this
-  //!     function, not to any individual `mach_msg()` call.
-  //!
-  //! \return On success, `MACH_MSG_SUCCESS` (when \a persistent is #kOneShot)
-  //!     or `MACH_RCV_TIMED_OUT` (when \a persistent is #kOneShot and \a
-  //!     timeout_ms is not #kMachMessageTimeoutWaitIndefinitely). This function
-  //!     has no successful return value when \a persistent is #kPersistent and
-  //!     \a timeout_ms is #kMachMessageTimeoutWaitIndefinitely. On failure,
-  //!     returns a value identifying the nature of the error. A request
-  //!     received with a reply port that is (or becomes) a dead name before the
-  //!     reply is sent will result in `MACH_SEND_INVALID_DEST` as a return
-  //!     value, which may or may not be considered an error from the caller’s
-  //!     perspective.
-  static mach_msg_return_t Run(Interface* interface,
-                               mach_port_t receive_port,
-                               mach_msg_options_t options,
-                               Persistent persistent,
-                               ReceiveLarge receive_large,
-                               mach_msg_timeout_t timeout_ms);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(MachMessageServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_MACH_MESSAGE_SERVER_H_
diff --git a/Tools/Crashpad/include/util/mach/notify_server.h b/Tools/Crashpad/include/util/mach/notify_server.h
deleted file mode 100644
index ad0a888262..0000000000
--- a/Tools/Crashpad/include/util/mach/notify_server.h
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_NOTIFY_SERVER_H_
-#define CRASHPAD_UTIL_MACH_NOTIFY_SERVER_H_
-
-#include <mach/mach.h>
-
-#include <set>
-
-#include "base/macros.h"
-#include "util/mach/mach_message_server.h"
-
-namespace crashpad {
-
-//! \brief A server interface for the `notify` Mach subsystem.
-//!
-//! The <a
-//! href="https://lists.apple.com/archives/darwin-development/2001/Sep/msg00451.html">mach
-//! port notifications</a> thread on the <a
-//! href="https://lists.apple.com/archives/darwin-development/">darwin-development</a>
-//! mailing list (now known as <a
-//! href="https://lists.apple.com/mailman/listinfo/darwin-dev">darwin-dev</a>)
-//! is good background for the various notification types.
-class NotifyServer : public MachMessageServer::Interface {
- public:
-  //! \brief An interface that the different request messages that are a part of
-  //!     the `notify` Mach subsystem can be dispatched to.
-  //!
-  //! Default implementations of all methods are available in the
-  //! DefaultInterface class.
-  class Interface {
-   public:
-    //! \brief Handles port-deleted notifications sent by
-    //!     `mach_notify_port_deleted()`.
-    //!
-    //! A port-deleted notification is generated when a port with a dead-name
-    //! notification request is destroyed and the port name becomes available
-    //! for reuse.
-    //!
-    //! This behaves equivalently to a `do_mach_notify_port_deleted()` function
-    //! used with `notify_server()`.
-    //!
-    //! \param[in] notify The Mach port that the notification was sent to.
-    //! \param[in] name The name that formerly referenced the deleted port. When
-    //!     this method is called, \a name no longer corresponds to the port
-    //!     that has been deleted, and may be reused for another purpose.
-    //! \param[in] trailer The trailer received with the notification message.
-    virtual kern_return_t DoMachNotifyPortDeleted(
-        notify_port_t notify,
-        mach_port_name_t name,
-        const mach_msg_trailer_t* trailer) = 0;
-
-    //! \brief Handles port-destroyed notifications sent by
-    //!     `mach_notify_port_destroyed()`.
-    //!
-    //! A port-destroyed notification is generated when a receive right with a
-    //! port-destroyed notification request is destroyed. Rather than destroying
-    //! the receive right, it is transferred via this notification’s \a rights
-    //! parameter.
-    //!
-    //! This behaves equivalently to a `do_mach_notify_port_destroyed()`
-    //! function used with `notify_server()`.
-    //!
-    //! \param[in] notify The Mach port that the notification was sent to.
-    //! \param[in] rights A receive right for the port that would have been
-    //!     destroyed. The callee takes ownership of this port, however, if the
-    //!     callee does not wish to take ownership, it may set \a
-    //!     destroy_request to `true`.
-    //! \param[in] trailer The trailer received with the notification message.
-    //! \param[out] destroy_request `true` if the request message is to be
-    //!     destroyed even when this method returns success. See
-    //!     MachMessageServer::Interface.
-    virtual kern_return_t DoMachNotifyPortDestroyed(
-        notify_port_t notify,
-        mach_port_t rights,
-        const mach_msg_trailer_t* trailer,
-        bool* destroy_request) = 0;
-
-    //! \brief Handles no-senders notifications sent by
-    //!     `mach_notify_no_senders()`.
-    //!
-    //! A no-senders notification is generated when a receive right with a
-    //! no-senders notification request loses its last corresponding send right.
-    //!
-    //! This behaves equivalently to a `do_mach_notify_no_senders()` function
-    //! used with `notify_server()`.
-    //!
-    //! \param[in] notify The Mach port that the notification was sent to.
-    //! \param[in] mscount The value of the sender-less port’s make-send count
-    //!     at the time the notification was generated.
-    //! \param[in] trailer The trailer received with the notification message.
-    virtual kern_return_t DoMachNotifyNoSenders(
-        notify_port_t notify,
-        mach_port_mscount_t mscount,
-        const mach_msg_trailer_t* trailer) = 0;
-
-    //! \brief Handles send-once notifications sent by
-    //!     `mach_notify_send_once()`.
-    //!
-    //! A send-once notification is generated when a send-once right is
-    //! destroyed without being used.
-    //!
-    //! This behaves equivalently to a `do_mach_notify_send_once()` function
-    //! used with `notify_server()`.
-    //!
-    //! \param[in] notify The Mach port that the notification was sent to.
-    //! \param[in] trailer The trailer received with the notification message.
-    //!
-    //! \note Unlike the other notifications in the `notify` subsystem,
-    //!     send-once notifications are not generated as a result of a
-    //!     notification request, but are generated any time a send-once right
-    //!     is destroyed rather than being used. The notification is sent via
-    //!     the send-once right to its receiver. These notifications are more
-    //!     useful for clients, not servers. Send-once notifications are
-    //!     normally handled by MIG-generated client routines, which make
-    //!     send-once rights for their reply ports and interpret send-once
-    //!     notifications as a signal that there will be no reply. Although not
-    //!     expected to be primarily useful for servers, this method is provided
-    //!     because send-once notifications are defined as a part of the
-    //!     `notify` subsystem.
-    virtual kern_return_t DoMachNotifySendOnce(
-        notify_port_t notify,
-        const mach_msg_trailer_t* trailer) = 0;
-
-    //! \brief Handles dead-name notifications sent by
-    //!     `mach_notify_dead_name()`.
-    //!
-    //! A dead-name notification is generated when a port with a dead-name
-    //! notification request is destroyed and the right becomes a dead name.
-    //!
-    //! This behaves equivalently to a `do_mach_notify_dead_name()` function
-    //! used with `notify_server()`.
-    //!
-    //! \param[in] notify The Mach port that the notification was sent to.
-    //! \param[in] name The dead name. Although this is transferred as a
-    //!     `mach_port_name_t` and not a `mach_port_t`, the callee assumes an
-    //!     additional reference to this port when this method is called. See
-    //!     the note below.
-    //! \param[in] trailer The trailer received with the notification message.
-    //!
-    //! \note When a dead-name notification is generated, the user reference
-    //!     count of the dead name is incremented. A send right with one
-    //!     reference that becomes a dead name will have one dead-name
-    //!     reference, and the dead-name notification will add another dead-name
-    //!     reference, for a total of 2. DoMachNotifyDeadName() implementations
-    //!     must take care to deallocate this extra reference. There is no \a
-    //!     destroy_request parameter to simplify this operation because
-    //!     dead-name notifications carry a port name only (\a name is of type
-    //!     `mach_port_name_t`) without transferring port rights, and are thus
-    //!     not complex Mach messages.
-    virtual kern_return_t DoMachNotifyDeadName(
-        notify_port_t notify,
-        mach_port_name_t name,
-        const mach_msg_trailer_t* trailer) = 0;
-
-   protected:
-    ~Interface() {}
-  };
-
-  //! \brief A concrete implementation of Interface that provides a default
-  //!     behavior for all `notify` routines.
-  //!
-  //! The Mach `notify` subsystem contains a collection of unrelated routines,
-  //! and a single server would rarely need to implement all of them. To make it
-  //! easier to use NotifyServer, a server can inherit from DefaultInterface
-  //! instead of Interface. Unless overridden, each routine in DefaultInterface
-  //! returns `MIG_BAD_ID` to indicate to the caller that the `notify` message
-  //! was unexpected and not processed.
-  class DefaultInterface : public Interface {
-   public:
-    // Interface:
-
-    kern_return_t DoMachNotifyPortDeleted(
-        notify_port_t notify,
-        mach_port_name_t name,
-        const mach_msg_trailer_t* trailer) override;
-
-    kern_return_t DoMachNotifyPortDestroyed(
-        notify_port_t notify,
-        mach_port_t rights,
-        const mach_msg_trailer_t* trailer,
-        bool* destroy_request) override;
-
-    kern_return_t DoMachNotifyNoSenders(
-        notify_port_t notify,
-        mach_port_mscount_t mscount,
-        const mach_msg_trailer_t* trailer) override;
-
-    kern_return_t DoMachNotifySendOnce(
-        notify_port_t notify,
-        const mach_msg_trailer_t* trailer) override;
-
-    kern_return_t DoMachNotifyDeadName(
-        notify_port_t notify,
-        mach_port_name_t name,
-        const mach_msg_trailer_t* trailer) override;
-
-   protected:
-    DefaultInterface() : Interface() {}
-    ~DefaultInterface() {}
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(DefaultInterface);
-  };
-
-  //! \brief Constructs an object of this class.
-  //!
-  //! \param[in] interface The interface to dispatch requests to. Weak.
-  explicit NotifyServer(Interface* interface);
-
-  // MachMessageServer::Interface:
-
-  bool MachMessageServerFunction(const mach_msg_header_t* in_header,
-                                 mach_msg_header_t* out_header,
-                                 bool* destroy_complex_request) override;
-
-  std::set<mach_msg_id_t> MachMessageServerRequestIDs() override;
-
-  mach_msg_size_t MachMessageServerRequestSize() override;
-  mach_msg_size_t MachMessageServerReplySize() override;
-
- private:
-  Interface* interface_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(NotifyServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_NOTIFY_SERVER_H_
diff --git a/Tools/Crashpad/include/util/mach/scoped_task_suspend.h b/Tools/Crashpad/include/util/mach/scoped_task_suspend.h
deleted file mode 100644
index 389ea5f62c..0000000000
--- a/Tools/Crashpad/include/util/mach/scoped_task_suspend.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_SCOPED_TASK_SUSPEND_H_
-#define CRASHPAD_UTIL_MACH_SCOPED_TASK_SUSPEND_H_
-
-#include <mach/mach.h>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Manages the suspension of another task.
-//!
-//! While an object of this class exists, the other task will be suspended. Once
-//! the object is destroyed, the other task will become eligible for resumption.
-//! Note that suspensions are counted, and the task will not actually resume
-//! unless its suspend count drops to 0.
-//!
-//! Callers should not attempt to suspend the current task (`mach_task_self()`).
-class ScopedTaskSuspend {
- public:
-  explicit ScopedTaskSuspend(task_t task);
-  ~ScopedTaskSuspend();
-
- private:
-  task_t task_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedTaskSuspend);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_SCOPED_TASK_SUSPEND_H_
diff --git a/Tools/Crashpad/include/util/mach/symbolic_constants_mach.h b/Tools/Crashpad/include/util/mach/symbolic_constants_mach.h
deleted file mode 100644
index be522fa875..0000000000
--- a/Tools/Crashpad/include/util/mach/symbolic_constants_mach.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_SYMBOLIC_CONSTANTS_MACH_H_
-#define CRASHPAD_UTIL_MACH_SYMBOLIC_CONSTANTS_MACH_H_
-
-#include <mach/mach.h>
-
-#include <string>
-
-#include "base/strings/string_piece.h"
-#include "util/misc/symbolic_constants_common.h"
-
-namespace crashpad {
-
-//! \brief Converts a Mach exception value to a textual representation.
-//!
-//! \param[in] exception The Mach exception value to convert.
-//! \param[in] options Options affecting the conversion. ::kUseOr is ignored.
-//!     For ::kUnknownIsNumeric, the format is `"%d"`.
-//!
-//! \return The converted string.
-std::string ExceptionToString(exception_type_t exception,
-                              SymbolicConstantToStringOptions options);
-
-//! \brief Converts a string to its corresponding Mach exception value.
-//!
-//! \param[in] string The string to convert.
-//! \param[in] options Options affecting the conversion. ::kAllowOr is ignored.
-//! \param[out] exception The converted Mach exception value.
-//!
-//! \return `true` on success, `false` if \a string could not be converted as
-//!     requested.
-bool StringToException(const base::StringPiece& string,
-                       StringToSymbolicConstantOptions options,
-                       exception_type_t* exception);
-
-//! \brief Converts a Mach exception mask value to a textual representation.
-//!
-//! \param[in] exception_mask The Mach exception mask value to convert.
-//! \param[in] options Options affecting the conversion. ::kUseOr is honored.
-//!     For ::kUnknownIsNumeric, the format is `"%#x"`.
-//!
-//! \return The converted string.
-std::string ExceptionMaskToString(exception_mask_t exception_mask,
-                                  SymbolicConstantToStringOptions options);
-
-//! \brief Converts a string to its corresponding Mach exception mask value.
-//!
-//! \param[in] string The string to convert.
-//! \param[in] options Options affecting the conversion. ::kAllowOr is honored.
-//! \param[out] exception_mask The converted Mach exception mask value.
-//!
-//! \return `true` on success, `false` if \a string could not be converted as
-//!     requested.
-bool StringToExceptionMask(const base::StringPiece& string,
-                           StringToSymbolicConstantOptions options,
-                           exception_mask_t* exception_mask);
-
-//! \brief Converts a Mach exception behavior value to a textual representation.
-//!
-//! \param[in] behavior The Mach exception behavior value to convert.
-//! \param[in] options Options affecting the conversion. ::kUseOr is ignored.
-//!     `MACH_EXCEPTION_CODES` can always be ORed in, but no other values can be
-//!     ORed with each other. For ::kUnknownIsNumeric, the format is `"%#x"`.
-//!
-//! \return The converted string.
-std::string ExceptionBehaviorToString(exception_behavior_t behavior,
-                                      SymbolicConstantToStringOptions options);
-
-//! \brief Converts a string to its corresponding Mach exception behavior value.
-//!
-//! \param[in] string The string to convert.
-//! \param[in] options Options affecting the conversion. ::kAllowOr is ignored.
-//!     `MACH_EXCEPTION_CODES` can always be ORed in, but no other values can be
-//!     ORed with each other.
-//! \param[out] behavior The converted Mach exception behavior value.
-//!
-//! \return `true` on success, `false` if \a string could not be converted as
-//!     requested.
-bool StringToExceptionBehavior(const base::StringPiece& string,
-                               StringToSymbolicConstantOptions options,
-                               exception_behavior_t* behavior);
-
-//! \brief Converts a thread state flavor value to a textual representation.
-//!
-//! \param[in] flavor The thread state flavor value to convert.
-//! \param[in] options Options affecting the conversion. ::kUseOr is ignored.
-//!     For ::kUnknownIsNumeric, the format is `"%d"`.
-//!
-//! \return The converted string.
-std::string ThreadStateFlavorToString(thread_state_flavor_t flavor,
-                                      SymbolicConstantToStringOptions options);
-
-//! \brief Converts a string to its corresponding thread state flavor value.
-//!
-//! \param[in] string The string to convert.
-//! \param[in] options Options affecting the conversion. ::kAllowOr is ignored.
-//! \param[out] flavor The converted thread state flavor value.
-//!
-//! \return `true` on success, `false` if \a string could not be converted as
-//!     requested.
-bool StringToThreadStateFlavor(const base::StringPiece& string,
-                               StringToSymbolicConstantOptions options,
-                               thread_state_flavor_t* flavor);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_SYMBOLIC_CONSTANTS_MACH_H_
diff --git a/Tools/Crashpad/include/util/mach/task_for_pid.h b/Tools/Crashpad/include/util/mach/task_for_pid.h
deleted file mode 100644
index 2b81fbebdd..0000000000
--- a/Tools/Crashpad/include/util/mach/task_for_pid.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_TASK_FOR_PID_H_
-#define CRASHPAD_UTIL_MACH_TASK_FOR_PID_H_
-
-#include <mach/mach.h>
-#include <sys/types.h>
-
-namespace crashpad {
-
-//! \brief Wraps `task_for_pid()`.
-//!
-//! This function exists to support `task_for_pid()` access checks in a setuid
-//! environment. Normally, `task_for_pid()` can only return an arbitrary task’s
-//! port when running as root or when taskgated(8) approves. When not running as
-//! root, a series of access checks are perfomed to ensure that the running
-//! process has permission to obtain the other process’ task port.
-//!
-//! It is possible to make an executable setuid root to give it broader
-//! `task_for_pid()` access by bypassing taskgated(8) checks, but this also has
-//! the effect of bypassing the access checks, allowing any process’ task port
-//! to be obtained. In most situations, these access checks are desirable to
-//! prevent security and privacy breaches.
-//!
-//! When running as setuid root, this function wraps `task_for_pid()`,
-//! reimplementing those access checks. A process whose effective user ID is 0
-//! and whose real user ID is nonzero is understood to be running setuid root.
-//! In this case, the requested task’s real, effective, and saved set-user IDs
-//! must all equal the running process’ real user ID, the requested task must
-//! not have changed privileges, and the requested task’s set of all group IDs
-//! (including its real, effective, and saved set-group IDs and supplementary
-//! group list) must be a subset of the running process’ set of all group IDs.
-//! These access checks mimic those that the kernel performs.
-//!
-//! When not running as setuid root, `task_for_pid()` is called directly,
-//! without imposing any additional checks beyond what the kernel does.
-//!
-//! \param[in] pid The process ID of the task whose task port is desired.
-//!
-//! \return A send right to the task port if it could be obtained, or
-//!     `TASK_NULL` otherwise, with an error message logged. If a send right is
-//!     returned, the caller takes ownership of it.
-task_t TaskForPID(pid_t pid);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_TASK_FOR_PID_H_
diff --git a/Tools/Crashpad/include/util/mach/task_memory.h b/Tools/Crashpad/include/util/mach/task_memory.h
deleted file mode 100644
index c8caf85cd5..0000000000
--- a/Tools/Crashpad/include/util/mach/task_memory.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MACH_TASK_MEMORY_H_
-#define CRASHPAD_UTIL_MACH_TASK_MEMORY_H_
-
-#include <mach/mach.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <string>
-
-#include "base/mac/scoped_mach_vm.h"
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Accesses the memory of another Mach task.
-class TaskMemory {
- public:
-  //! \brief A memory region mapped from another Mach task.
-  //!
-  //! The mapping is maintained until this object is destroyed.
-  class MappedMemory {
-   public:
-    ~MappedMemory();
-
-    //! \brief Returns a pointer to the data requested by the user.
-    //!
-    //! This is the value of the \a vm_address + \a user_offset parameters
-    //! passed to the constructor, casted to `const void*`.
-    const void* data() const { return data_; }
-
-    //! \brief Reads a `NUL`-terminated C string from the mapped region.
-    //!
-    //! This method will read contiguous memory until a `NUL` terminator is
-    //! found.
-    //!
-    //! \param[in] offset The offset into data() of the string to be read.
-    //! \param[out] string The string, whose contents begin at data() and
-    //!     continue up to a `NUL` terminator.
-    //!
-    //! \return `true` on success, with \a string set appropriately. If \a
-    //!     offset is greater than or equal to the \a user_size constructor
-    //!     parameter, or if no `NUL` terminator was found in data() after \a
-    //!     offset, returns `false` with an appropriate warning logged.
-    bool ReadCString(size_t offset, std::string* string) const;
-
-   private:
-    //! \brief Creates an object that owns a memory region mapped from another
-    //!     Mach task.
-    //!
-    //! \param[in] vm_address The address in this process’ address space where
-    //!     the mapping begins. This must be page-aligned.
-    //! \param[in] vm_size The total size of the mapping that begins at \a
-    //!     vm_address. This must be page-aligned.
-    //! \param[in] user_offset The offset into the mapped region where the data
-    //!     requested by the user begins. This accounts for the fact that a
-    //!     mapping must be page-aligned but the user data may not be. This
-    //!     parameter must be equal to or less than \a vm_size.
-    //! \param[in] user_size The size of the data requested by the user. This
-    //!     parameter can be used to compute the end address of user data, which
-    //!     must be within the mapped region.
-    MappedMemory(vm_address_t vm_address,
-                 size_t vm_size,
-                 size_t user_offset,
-                 size_t user_size);
-
-    base::mac::ScopedMachVM vm_;
-    const void* data_;
-    size_t user_size_;
-
-    // The outer class needs to be able to call this class’ private constructor.
-    friend class TaskMemory;
-
-    DISALLOW_COPY_AND_ASSIGN(MappedMemory);
-  };
-
-  //! \param[in] task A send right to the target task’s task port. This object
-  //!     does not take ownership of the send right.
-  explicit TaskMemory(task_t task);
-
-  ~TaskMemory() {}
-
-  //! \brief Copies memory from the target task into a caller-provided buffer in
-  //!     the current task.
-  //!
-  //! \param[in] address The address, in the target task’s address space, of the
-  //!     memory region to copy.
-  //! \param[in] size The size, in bytes, of the memory region to copy. \a
-  //!     buffer must be at least this size.
-  //! \param[out] buffer The buffer into which the contents of the other task’s
-  //!     memory will be copied.
-  //!
-  //! \return `true` on success, with \a buffer filled appropriately. `false` on
-  //!     failure, with a warning logged. Failures can occur, for example, when
-  //!     encountering unmapped or unreadable pages.
-  //!
-  //! \sa ReadMapped()
-  bool Read(mach_vm_address_t address, size_t size, void* buffer);
-
-  //! \brief Maps memory from the target task into the current task.
-  //!
-  //! This interface is an alternative to Read() that does not require the
-  //! caller to provide a buffer to fill. This avoids copying memory, which can
-  //! offer a performance improvement.
-  //!
-  //! \param[in] address The address, in the target task’s address space, of the
-  //!     memory region to map.
-  //! \param[in] size The size, in bytes, of the memory region to map.
-  //!
-  //! \return On success, a MappedMemory object that provides access to the data
-  //!     requested. On faliure, `nullptr`, with a warning logged. Failures can
-  //!     occur, for example, when encountering unmapped or unreadable pages.
-  std::unique_ptr<MappedMemory> ReadMapped(mach_vm_address_t address,
-                                           size_t size);
-
-  //! \brief Reads a `NUL`-terminated C string from the target task into a
-  //!     string in the current task.
-  //!
-  //! The length of the string need not be known ahead of time. This method will
-  //! read contiguous memory until a `NUL` terminator is found.
-  //!
-  //! \param[in] address The address, in the target task’s address space, of the
-  //!     string to copy.
-  //! \param[out] string The string read from the other task.
-  //!
-  //! \return `true` on success, with \a string set appropriately. `false` on
-  //!     failure, with a warning logged. Failures can occur, for example, when
-  //!     encountering unmapped or unreadable pages.
-  //!
-  //! \sa MappedMemory::ReadCString()
-  bool ReadCString(mach_vm_address_t address, std::string* string);
-
-  //! \brief Reads a `NUL`-terminated C string from the target task into a
-  //!     string in the current task.
-  //!
-  //! \param[in] address The address, in the target task’s address space, of the
-  //!     string to copy.
-  //! \param[in] size The maximum number of bytes to read. The string is
-  //!     required to be `NUL`-terminated within this many bytes.
-  //! \param[out] string The string read from the other task.
-  //!
-  //! \return `true` on success, with \a string set appropriately. `false` on
-  //!     failure, with a warning logged. Failures can occur, for example, when
-  //!     a `NUL` terminator is not found within \a size bytes, or when
-  //!     encountering unmapped or unreadable pages.
-  //!
-  //! \sa MappedMemory::ReadCString()
-  bool ReadCStringSizeLimited(mach_vm_address_t address,
-                              mach_vm_size_t size,
-                              std::string* string);
-
- private:
-  // The common internal implementation shared by the ReadCString*() methods.
-  bool ReadCStringInternal(mach_vm_address_t address,
-                           bool has_size,
-                           mach_vm_size_t size,
-                           std::string* string);
-
-  task_t task_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(TaskMemory);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MACH_TASK_MEMORY_H_
diff --git a/Tools/Crashpad/include/util/misc/address_sanitizer.h b/Tools/Crashpad/include/util/misc/address_sanitizer.h
deleted file mode 100644
index 75c72399aa..0000000000
--- a/Tools/Crashpad/include/util/misc/address_sanitizer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_ADDRESS_SANITIZER_H_
-#define CRASHPAD_UTIL_MISC_ADDRESS_SANITIZER_H_
-
-#include "base/compiler_specific.h"
-#include "build/build_config.h"
-
-#if !defined(ADDRESS_SANITIZER)
-#if HAS_FEATURE(address_sanitizer) || \
-    (defined(COMPILER_GCC) && defined(__SANITIZE_ADDRESS__))
-#define ADDRESS_SANITIZER 1
-#endif
-#endif  // !defined(ADDRESS_SANITIZER)
-
-#endif  // CRASHPAD_UTIL_MISC_ADDRESS_SANITIZER_H_
diff --git a/Tools/Crashpad/include/util/misc/address_types.h b/Tools/Crashpad/include/util/misc/address_types.h
deleted file mode 100644
index bfce35fcff..0000000000
--- a/Tools/Crashpad/include/util/misc/address_types.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_ADDRESS_TYPES_H_
-#define CRASHPAD_UTIL_MISC_ADDRESS_TYPES_H_
-
-#include <stdint.h>
-
-#include <type_traits>
-
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-#include <mach/mach_types.h>
-#elif defined(OS_WIN)
-#include "util/win/address_types.h"
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
-#include "util/linux/address_types.h"
-#else
-#error "Unhandled OS type"
-#endif
-
-namespace crashpad {
-
-#if DOXYGEN
-
-//! \brief Type used to represent an address in a process, potentially across
-//!     bitness.
-using VMAddress = uint64_t;
-
-//! \brief Type used to represent the size of a memory range (with a
-//!     VMAddress), potentially across bitness.
-using VMSize = uint64_t;
-
-#elif defined(OS_MACOSX)
-
-using VMAddress = mach_vm_address_t;
-using VMSize = mach_vm_size_t;
-
-#elif defined(OS_WIN)
-
-using VMAddress = WinVMAddress;
-using VMSize = WinVMSize;
-
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
-
-using VMAddress = LinuxVMAddress;
-using VMSize = LinuxVMSize;
-
-#endif
-
-//! \brief Type used to represent an offset from a VMAddress, potentially
-//!     across bitness.
-using VMOffset = std::make_signed<VMSize>::type;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_ADDRESS_TYPES_H_
diff --git a/Tools/Crashpad/include/util/misc/arraysize_unsafe.h b/Tools/Crashpad/include/util/misc/arraysize_unsafe.h
deleted file mode 100644
index e53c70b8c8..0000000000
--- a/Tools/Crashpad/include/util/misc/arraysize_unsafe.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_ARRAYSIZE_UNSAFE_H_
-#define CRASHPAD_UTIL_MISC_ARRAYSIZE_UNSAFE_H_
-
-//! \file
-
-//! \brief Not the safest way of computing an array’s size…
-//!
-//! `#%include "base/macros.h"` and use its `arraysize()` instead. This macro
-//! should only be used in rare situations where `arraysize()` does not
-//! function.
-#define ARRAYSIZE_UNSAFE(array) (sizeof(array) / sizeof(array[0]))
-
-#endif  // CRASHPAD_UTIL_MISC_ARRAYSIZE_UNSAFE_H_
diff --git a/Tools/Crashpad/include/util/misc/as_underlying_type.h b/Tools/Crashpad/include/util/misc/as_underlying_type.h
deleted file mode 100644
index ba673ae5c2..0000000000
--- a/Tools/Crashpad/include/util/misc/as_underlying_type.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_AS_UNDERLYING_TYPE_H_
-#define CRASHPAD_UTIL_MISC_AS_UNDERLYING_TYPE_H_
-
-#include <type_traits>
-
-namespace crashpad {
-
-//! \brief Casts a value to its underlying type.
-//!
-//! \param[in] from The value to be casted.
-//! \return \a from casted to its underlying type.
-template <typename From>
-constexpr typename std::underlying_type<From>::type AsUnderlyingType(
-    From from) {
-  return static_cast<typename std::underlying_type<From>::type>(from);
-}
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_AS_UNDERLYING_TYPE_H_
diff --git a/Tools/Crashpad/include/util/misc/clock.h b/Tools/Crashpad/include/util/misc/clock.h
deleted file mode 100644
index a07e12a6ee..0000000000
--- a/Tools/Crashpad/include/util/misc/clock.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_CLOCK_H_
-#define CRASHPAD_UTIL_MISC_CLOCK_H_
-
-#include <stdint.h>
-
-#include "build/build_config.h"
-
-namespace crashpad {
-
-//! \brief Returns the value of the system’s monotonic clock.
-//!
-//! The monotonic clock is a tick counter whose epoch is unspecified. It is a
-//! monotonically-increasing clock that cannot be set, and never jumps backwards
-//! on a running system. The monotonic clock may stop while the system is
-//! sleeping, and it may be reset when the system starts up. This clock is
-//! suitable for computing durations of events. Subject to the underlying
-//! clock’s resolution, successive calls to this function will result in a
-//! series of increasing values.
-//!
-//! \return The value of the system’s monotonic clock, in nanoseconds.
-uint64_t ClockMonotonicNanoseconds();
-
-#if !defined(OS_WIN)  // Not implemented on Windows yet.
-
-//! \brief Sleeps for the specified duration.
-//!
-//! \param[in] nanoseconds The number of nanoseconds to sleep. The actual sleep
-//!     may be slightly longer due to latencies and timer resolution.
-//!
-//! This function is resilient against the underlying `nanosleep()` system call
-//! being interrupted by a signal.
-void SleepNanoseconds(uint64_t nanoseconds);
-
-#endif
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_CLOCK_H_
diff --git a/Tools/Crashpad/include/util/misc/from_pointer_cast.h b/Tools/Crashpad/include/util/misc/from_pointer_cast.h
deleted file mode 100644
index f1b3734960..0000000000
--- a/Tools/Crashpad/include/util/misc/from_pointer_cast.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_FROM_POINTER_CAST_H_
-#define CRASHPAD_UTIL_MISC_FROM_POINTER_CAST_H_
-
-#include <stdint.h>
-
-#include <cstddef>
-#include <type_traits>
-
-#include "base/numerics/safe_conversions.h"
-
-namespace crashpad {
-
-#if DOXYGEN
-
-//! \brief Casts from a pointer type to an integer.
-//!
-//! Compared to `reinterpret_cast<>()`, FromPointerCast<>() defines whether a
-//! pointer type is sign-extended or zero-extended. Casts to signed integral
-//! types are sign-extended. Casts to unsigned integral types are zero-extended.
-//!
-//! Use FromPointerCast<>() instead of `reinterpret_cast<>()` when casting a
-//! pointer to an integral type that may not be the same width as a pointer.
-//! There is no need to prefer FromPointerCast<>() when casting to an integral
-//! type that’s definitely the same width as a pointer, such as `uintptr_t` and
-//! `intptr_t`.
-template <typename To, typename From>
-FromPointerCast(From from) {
-  return reinterpret_cast<To>(from);
-}
-
-#else  // DOXYGEN
-
-// Cast std::nullptr_t to any type.
-//
-// In C++14, the nullptr_t check could use std::is_null_pointer<From>::value
-// instead of the is_same<remove_cv<From>::type, nullptr_t>::type construct.
-template <typename To, typename From>
-typename std::enable_if<
-    std::is_same<typename std::remove_cv<From>::type, std::nullptr_t>::value,
-    To>::type
-FromPointerCast(From) {
-  return To();
-}
-
-// Cast a pointer to any other pointer type.
-template <typename To, typename From>
-typename std::enable_if<std::is_pointer<From>::value &&
-                            std::is_pointer<To>::value,
-                        To>::type
-FromPointerCast(From from) {
-  return reinterpret_cast<To>(from);
-}
-
-// Cast a pointer to an integral type. Sign-extend when casting to a signed
-// type, zero-extend when casting to an unsigned type.
-template <typename To, typename From>
-typename std::enable_if<std::is_pointer<From>::value &&
-                            std::is_integral<To>::value,
-                        To>::type
-FromPointerCast(From from) {
-  const auto intermediate =
-      reinterpret_cast<typename std::conditional<std::is_signed<To>::value,
-                                                 intptr_t,
-                                                 uintptr_t>::type>(from);
-
-  if (sizeof(To) >= sizeof(From)) {
-    // If the destination integral type is at least as wide as the source
-    // pointer type, use static_cast<>() and just return it.
-    return static_cast<To>(intermediate);
-  }
-
-  // If the destination integral type is narrower than the source pointer type,
-  // use checked_cast<>().
-  return base::checked_cast<To>(intermediate);
-}
-
-#endif  // DOXYGEN
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_FROM_POINTER_CAST_H_
diff --git a/Tools/Crashpad/include/util/misc/implicit_cast.h b/Tools/Crashpad/include/util/misc/implicit_cast.h
deleted file mode 100644
index 6f8a1a301d..0000000000
--- a/Tools/Crashpad/include/util/misc/implicit_cast.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_IMPLICIT_CAST_H_
-#define CRASHPAD_UTIL_MISC_IMPLICIT_CAST_H_
-
-namespace crashpad {
-
-// Use implicit_cast as a safe version of static_cast or const_cast
-// for upcasting in the type hierarchy (i.e. casting a pointer to Foo
-// to a pointer to SuperclassOfFoo or casting a pointer to Foo to
-// a const pointer to Foo).
-// When you use implicit_cast, the compiler checks that the cast is safe.
-// Such explicit implicit_casts are necessary in surprisingly many
-// situations where C++ demands an exact type match instead of an
-// argument type convertible to a target type.
-//
-// The From type can be inferred, so the preferred syntax for using
-// implicit_cast is the same as for static_cast etc.:
-//
-//   implicit_cast<ToType>(expr)
-//
-// implicit_cast would have been part of the C++ standard library,
-// but the proposal was submitted too late.  It will probably make
-// its way into the language in the future.
-template<typename To, typename From>
-inline To implicit_cast(From const &f) {
-  return f;
-}
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_IMPLICIT_CAST_H_
diff --git a/Tools/Crashpad/include/util/misc/initialization_state.h b/Tools/Crashpad/include/util/misc/initialization_state.h
deleted file mode 100644
index 85f9b2894d..0000000000
--- a/Tools/Crashpad/include/util/misc/initialization_state.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_H_
-#define CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_H_
-
-#include <stdint.h>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Tracks whether data are initialized.
-//!
-//! Objects of this type track whether the data they’re guarding are
-//! initialized. The three possible states are uninitialized (the initial
-//! state), initializing, and valid. As the guarded data are initialized, an
-//! InitializationState object will normally transition through these three
-//! states. A fourth state corresponds to the destruction of objects of this
-//! type, making it less likely that a use-after-free of an InitializationState
-//! object will appear in the valid state.
-//!
-//! If the only purpose for tracking the initialization state of guarded data is
-//! to DCHECK when the object is in an unexpected state, use
-//! InitializationStateDcheck instead.
-class InitializationState {
- public:
-  //! \brief The object’s state.
-  enum State : uint8_t {
-    //! \brief The object has not yet been initialized.
-    kStateUninitialized = 0,
-
-    //! \brief The object is being initialized.
-    //!
-    //! This state protects against attempted reinitializaton of
-    //! partially-initialized objects whose initial initialization attempt
-    //! failed. This state is to be used while objects are initializing, but are
-    //! not yet fully initialized.
-    kStateInvalid,
-
-    //! \brief The object has been initialized.
-    kStateValid,
-
-    //! \brief The object has been destroyed.
-    kStateDestroyed,
-  };
-
-  InitializationState() : state_(kStateUninitialized) {}
-  ~InitializationState() { state_ = kStateDestroyed; }
-
-  //! \brief Returns `true` if the object’s state is #kStateUninitialized and it
-  //!     is safe to begin initializing it.
-  bool is_uninitialized() const { return state_ == kStateUninitialized; }
-
-  //! \brief Sets the object’s state to #kStateInvalid, marking initialization
-  //!     as being in process.
-  void set_invalid() { state_ = kStateInvalid; }
-
-  //! \brief Sets the object’s state to #kStateValid, marking it initialized.
-  void set_valid() { state_ = kStateValid; }
-
-  //! \brief Returns `true` if the the object’s state is #kStateValid and it has
-  //!     been fully initialized and may be used.
-  bool is_valid() const { return state_ == kStateValid; }
-
- protected:
-  //! \brief Returns the object’s state.
-  //!
-  //! Consumers of this class should use an is_state_*() method instead.
-  State state() const { return state_; }
-
-  //! \brief Sets the object’s state.
-  //!
-  //! Consumers of this class should use a set_state_*() method instead.
-  void set_state(State state) { state_ = state; }
-
- private:
-  // state_ is volatile to ensure that it’ll be set by the destructor when it
-  // runs. Otherwise, optimizations might prevent it from ever being set to
-  // kStateDestroyed, limiting this class’ ability to catch use-after-free
-  // errors.
-  volatile State state_;
-
-  DISALLOW_COPY_AND_ASSIGN(InitializationState);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_H_
diff --git a/Tools/Crashpad/include/util/misc/initialization_state_dcheck.h b/Tools/Crashpad/include/util/misc/initialization_state_dcheck.h
deleted file mode 100644
index 7b6df9863b..0000000000
--- a/Tools/Crashpad/include/util/misc/initialization_state_dcheck.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_DCHECK_H_
-#define CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_DCHECK_H_
-
-//! \file
-
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "build/build_config.h"
-#include "util/misc/initialization_state.h"
-
-namespace crashpad {
-
-#if DCHECK_IS_ON() || DOXYGEN
-
-//! \brief Tracks whether data are initialized, triggering a DCHECK assertion
-//!     on an invalid data access.
-//!
-//! Put an InitializationStateDcheck member into a class to help DCHECK that
-//! it’s in the right states at the right times. This is useful for classes with
-//! Initialize() methods. The chief advantage of InitializationStateDcheck over
-//! having a member variable to track state is that when the only use of the
-//! variable is to DCHECK, it wastes space (in memory and executable code) in
-//! non-DCHECK builds unless the code is also peppered with ugly `#%ifdef`s.
-//!
-//! This implementation concentrates the ugly `#%ifdef`s in one location.
-//!
-//! Usage:
-//!
-//! \code
-//!   class Class {
-//!    public:
-//!     Class() : initialized_() {}
-//!
-//!     void Initialize() {
-//!       INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
-//!       // Perform initialization.
-//!       INITIALIZATION_STATE_SET_VALID(initialized_);
-//!     }
-//!
-//!     void DoSomething() {
-//!       INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-//!       // Do something.
-//!     }
-//!
-//!    private:
-//!     InitializationStateDcheck initialized_;
-//!   };
-//! \endcode
-class InitializationStateDcheck : public InitializationState {
- public:
-  InitializationStateDcheck() : InitializationState() {}
-
-  //! \brief Returns the object’s state.
-  //!
-  //! Consumers of this class should not call this method. Use the
-  //! INITIALIZATION_STATE_SET_INITIALIZING(), INITIALIZATION_STATE_SET_VALID(),
-  //! and INITIALIZATION_STATE_DCHECK_VALID() macros instead.
-  //
-  // The superclass’ state() accessor is protected, but it needs to be exposed
-  // to consumers of this class for the macros below to work properly. The
-  // macros prefer access to the unerlying state value over a simple boolean
-  // because with access to the state value, DCHECK_EQ can be used, which, when
-  // tripped, prints both the expected and observed values. This can aid
-  // troubleshooting.
-  State state() const { return InitializationState::state(); }
-
-  //! \brief Marks an uninitialized object as initializing.
-  //!
-  //! If the object is in the #kStateUninitialized state, changes its state to
-  //! #kStateInvalid (initializing) and returns the previous
-  //! (#kStateUninitialized) state. Otherwise, returns the object’s current
-  //! state.
-  //!
-  //! Consumers of this class should not call this method. Use the
-  //! INITIALIZATION_STATE_SET_INITIALIZING() macro instead.
-  State SetInitializing();
-
-  //! \brief Marks an initializing object as valid.
-  //!
-  //! If the object is in the #kStateInvalid (initializing) state, changes its
-  //! state to #kStateValid and returns the previous (#kStateInvalid) state.
-  //! Otherwise, returns the object’s current state.
-  //!
-  //! Consumers of this class should not call this method. Use the
-  //! INITIALIZATION_STATE_SET_VALID() macro instead.
-  State SetValid();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(InitializationStateDcheck);
-};
-
-// Using macros enables the non-DCHECK no-op implementation below to be more
-// compact and less intrusive. These are macros instead of methods that call
-// DCHECK to enable the DCHECK failure message to point to the correct file and
-// line number, and to allow additional messages to be streamed on failure with
-// the << operator.
-
-//! \brief Checks that a crashpad::InitializationStateDcheck object is in the
-//!     crashpad::InitializationState::kStateUninitialized state, and changes
-//!     its state to initializing
-//!     (crashpad::InitializationState::kStateInvalid).
-//!
-//! If the object is not in the correct state, a DCHECK assertion is triggered
-//! and the object’s state remains unchanged.
-//!
-//! \param[in] initialization_state_dcheck A crashpad::InitializationStateDcheck
-//!     object.
-//!
-//! \sa crashpad::InitializationStateDcheck
-#define INITIALIZATION_STATE_SET_INITIALIZING(initialization_state_dcheck) \
-  DCHECK_EQ((initialization_state_dcheck).SetInitializing(),               \
-            (initialization_state_dcheck).kStateUninitialized)
-
-//! \brief Checks that a crashpad::InitializationStateDcheck object is in the
-//!     initializing (crashpad::InitializationState::kStateInvalid) state, and
-//!     changes its state to crashpad::InitializationState::kStateValid.
-//!
-//! If the object is not in the correct state, a DCHECK assertion is triggered
-//! and the object’s state remains unchanged.
-//!
-//! \param[in] initialization_state_dcheck A crashpad::InitializationStateDcheck
-//!     object.
-//!
-//! \sa crashpad::InitializationStateDcheck
-#define INITIALIZATION_STATE_SET_VALID(initialization_state_dcheck) \
-  DCHECK_EQ((initialization_state_dcheck).SetValid(),               \
-            (initialization_state_dcheck).kStateInvalid)
-
-//! \brief Checks that a crashpad::InitializationStateDcheck object is in the
-//!     crashpad::InitializationState::kStateValid state.
-//!
-//! If the object is not in the correct state, a DCHECK assertion is triggered.
-//!
-//! \param[in] initialization_state_dcheck A crashpad::InitializationStateDcheck
-//!     object.
-//!
-//! \sa crashpad::InitializationStateDcheck
-#define INITIALIZATION_STATE_DCHECK_VALID(initialization_state_dcheck) \
-  DCHECK_EQ((initialization_state_dcheck).state(),                     \
-            (initialization_state_dcheck).kStateValid)
-
-#else
-
-#if defined(COMPILER_MSVC)
-// bool[0] (below) is not accepted by MSVC.
-struct InitializationStateDcheck {
-};
-#else
-// Since this is to be used as a DCHECK (for debugging), it should be
-// non-intrusive in non-DCHECK (non-debug, release) builds. An empty struct
-// would still have a nonzero size (rationale:
-// http://www.stroustrup.com/bs_faq2.html#sizeof-empty). Zero-length arrays are
-// technically invalid according to the standard, but clang and g++ accept them
-// without complaint even with warnings turned up. They take up no space at all,
-// and they can be “initialized” with the same () syntax used to initialize
-// objects of the DCHECK_IS_ON() InitializationStateDcheck class above.
-using InitializationStateDcheck = bool[0];
-#endif  // COMPILER_MSVC
-
-// Avoid triggering warnings by repurposing these macros when DCHECKs are
-// disabled.
-#define INITIALIZATION_STATE_SET_INITIALIZING(initialization_state_dcheck) \
-  ALLOW_UNUSED_LOCAL(initialization_state_dcheck)
-#define INITIALIZATION_STATE_SET_VALID(initialization_state_dcheck) \
-  ALLOW_UNUSED_LOCAL(initialization_state_dcheck)
-#define INITIALIZATION_STATE_DCHECK_VALID(initialization_state_dcheck) \
-  ALLOW_UNUSED_LOCAL(initialization_state_dcheck)
-
-#endif
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_DCHECK_H_
diff --git a/Tools/Crashpad/include/util/misc/lexing.h b/Tools/Crashpad/include/util/misc/lexing.h
deleted file mode 100644
index ba37e0ca5f..0000000000
--- a/Tools/Crashpad/include/util/misc/lexing.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_LEXING_H_
-#define CRASHPAD_UTIL_MISC_LEXING_H_
-
-namespace crashpad {
-
-//! \brief Match a pattern at the start of a char string.
-//!
-//! \param[in,out] input A pointer to the char string to match against. \a input
-//!     is advanced past the matched pattern if it is found.
-//! \param[in] pattern The pattern to match at the start of \a input.
-//! \return `true` if the pattern is matched exactly and \a input is advanced,
-//!     otherwise `false`.
-bool AdvancePastPrefix(const char** input, const char* pattern);
-
-//! \brief Convert a prefix of a char string to a numeric value.
-//!
-//! Valid values are positive or negative decimal numbers, matching the regular
-//! expression "-?\d+", and within the limits of T.
-//!
-//! \param[in,out] input A pointer to the char string to match against. \a input
-//!     is advanced past the number if one is found.
-//! \param[out] value The converted number, if one is found.
-//! \return `true` if a number is found at the start of \a input and \a input is
-//!     advanced, otherwise `false`.
-template <typename T>
-bool AdvancePastNumber(const char** input, T* value);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_LEXING_H
diff --git a/Tools/Crashpad/include/util/misc/metrics.h b/Tools/Crashpad/include/util/misc/metrics.h
deleted file mode 100644
index dd257a11b6..0000000000
--- a/Tools/Crashpad/include/util/misc/metrics.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_METRICS_H_
-#define CRASHPAD_UTIL_MISC_METRICS_H_
-
-#include <inttypes.h>
-
-#include "base/macros.h"
-#include "util/file/file_io.h"
-
-namespace crashpad {
-
-//! \brief Container class to hold shared UMA metrics integration points.
-//!
-//! Each static function in this class will call a `UMA_*` from
-//! `base/metrics/histogram_macros.h`. When building Crashpad standalone,
-//! (against mini_chromium), these macros do nothing. When built against
-//! Chromium's base, they allow integration with its metrics system.
-class Metrics {
- public:
-  //! \brief Values for CrashReportPending().
-  //!
-  //! \note These are used as metrics enumeration values, so new values should
-  //!     always be added at the end, before PendingReportReason::kMaxValue.
-  enum class PendingReportReason : int32_t {
-    //! \brief A report was newly created and is ready for upload.
-    kNewlyCreated = 0,
-
-    //! \brief The user manually requested the report be uploaded.
-    kUserInitiated = 1,
-
-    //! \brief The number of values in this enumeration; not a valid value.
-    kMaxValue
-  };
-
-  //! \brief Reports when a crash upload has entered the pending state.
-  static void CrashReportPending(PendingReportReason reason);
-
-  //! \brief Reports the size of a crash report file in bytes. Should be called
-  //!     when a new report is written to disk.
-  static void CrashReportSize(FileHandle file);
-
-  //! \brief Reports on a crash upload attempt, and if it succeeded.
-  static void CrashUploadAttempted(bool successful);
-
-  //! \brief Values for CrashUploadSkipped().
-  //!
-  //! \note These are used as metrics enumeration values, so new values should
-  //!     always be added at the end, before CrashSkippedReason::kMaxValue.
-  enum class CrashSkippedReason : int32_t {
-    //! \brief Crash uploading is disabled.
-    kUploadsDisabled = 0,
-
-    //! \brief There was another upload too recently, so this one was throttled.
-    kUploadThrottled = 1,
-
-    //! \brief The report had an unexpected timestamp.
-    kUnexpectedTime = 2,
-
-    //! \brief The database reported an error, likely due to a filesystem
-    //!     problem.
-    kDatabaseError = 3,
-
-    //! \brief The upload of the crash failed during communication with the
-    //!     server.
-    kUploadFailed = 4,
-
-    //! \brief The upload of the crash failed during communication with the
-    //!     server.
-    kUserRefused = 5,
-
-    //! \brief The number of values in this enumeration; not a valid value.
-    kMaxValue
-  };
-
-  //! \brief Reports when a report is moved to the completed state in the
-  //!     database, without the report being uploadad.
-  static void CrashUploadSkipped(CrashSkippedReason reason);
-
-  //! \brief The result of capturing an exception.
-  //!
-  //! \note These are used as metrics enumeration values, so new values should
-  //!     always be added at the end, before CaptureResult::kMaxValue.
-  enum class CaptureResult : int32_t {
-    //! \brief The exception capture succeeded normally.
-    kSuccess = 0,
-
-    //! \brief Unexpected exception behavior.
-    //!
-    //! This value is only used on macOS.
-    kUnexpectedExceptionBehavior = 1,
-
-    //! \brief Failed due to attempt to suspend self.
-    //!
-    //! This value is only used on macOS.
-    kFailedDueToSuspendSelf = 2,
-
-    //! \brief The process snapshot could not be captured.
-    kSnapshotFailed = 3,
-
-    //! \brief The exception could not be initialized.
-    kExceptionInitializationFailed = 4,
-
-    //! \brief The attempt to prepare a new crash report in the crash database
-    //!     failed.
-    kPrepareNewCrashReportFailed = 5,
-
-    //! \brief Writing the minidump to disk failed.
-    kMinidumpWriteFailed = 6,
-
-    //! \brief There was a database error in attempt to complete the report.
-    kFinishedWritingCrashReportFailed = 7,
-
-    //! \brief The number of values in this enumeration; not a valid value.
-    kMaxValue
-  };
-
-  //! \brief Reports on the outcome of capturing a report in the exception
-  //!     handler. Should be called on all capture completion paths.
-  static void ExceptionCaptureResult(CaptureResult result);
-
-  //! \brief The exception code for an exception was retrieved.
-  //!
-  //! These values are OS-specific, and correspond to
-  //! MINIDUMP_EXCEPTION::ExceptionCode.
-  static void ExceptionCode(uint32_t exception_code);
-
-  //! \brief The exception handler server started capturing an exception.
-  static void ExceptionEncountered();
-
-  //! \brief An important event in a handler process’ lifetime.
-  //!
-  //! \note These are used as metrics enumeration values, so new values should
-  //!     always be added at the end, before LifetimeMilestone::kMaxValue.
-  enum class LifetimeMilestone : int32_t {
-    //! \brief The handler process started.
-    kStarted = 0,
-
-    //! \brief The handler process exited normally and cleanly.
-    kExitedNormally,
-
-    //! \brief The handler process exited early, but was successful in
-    //!     performing some non-default action on user request.
-    kExitedEarly,
-
-    //! \brief The handler process exited with a failure code.
-    kFailed,
-
-    //! \brief The handler process was forcibly terminated.
-    kTerminated,
-
-    //! \brief The handler process crashed.
-    kCrashed,
-
-    //! \brief The number of values in this enumeration; not a valid value.
-    kMaxValue
-  };
-
-  //! \brief Records a handler start/exit/crash event.
-  static void HandlerLifetimeMilestone(LifetimeMilestone milestone);
-
-  //! \brief The handler process crashed with the given exception code.
-  //!
-  //! This is currently only reported on Windows.
-  static void HandlerCrashed(uint32_t exception_code);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(Metrics);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_METRICS_H_
diff --git a/Tools/Crashpad/include/util/misc/paths.h b/Tools/Crashpad/include/util/misc/paths.h
deleted file mode 100644
index 30bbec5098..0000000000
--- a/Tools/Crashpad/include/util/misc/paths.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_PATHS_H_
-#define CRASHPAD_UTIL_PATHS_H_
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Functions to obtain paths.
-class Paths {
- public:
-  //! \brief Obtains the pathname of the currently-running executable.
-  //!
-  //! \param[out] path The pathname of the currently-running executable.
-  //!
-  //! \return `true` on success. `false` on failure, with a message logged.
-  //!
-  //! \note In test code, use test::TestPaths::Executable() instead.
-  static bool Executable(base::FilePath* path);
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(Paths);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_TEST_PATHS_H_
diff --git a/Tools/Crashpad/include/util/misc/pdb_structures.h b/Tools/Crashpad/include/util/misc/pdb_structures.h
deleted file mode 100644
index 218a763286..0000000000
--- a/Tools/Crashpad/include/util/misc/pdb_structures.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_PDB_STRUCTURES_H_
-#define CRASHPAD_UTIL_MISC_PDB_STRUCTURES_H_
-
-#include <stdint.h>
-
-#include "util/misc/uuid.h"
-
-namespace crashpad {
-
-//! \brief A CodeView record linking to a `.pdb` 2.0 file.
-//!
-//! This format provides an indirect link to debugging data by referencing an
-//! external `.pdb` file by its name, timestamp, and age. This structure may be
-//! pointed to by MINIDUMP_MODULE::CvRecord. It has been superseded by
-//! CodeViewRecordPDB70.
-//!
-//! For more information about this structure and format, see <a
-//! href="http://www.debuginfo.com/articles/debuginfomatch.html#pdbfiles">Matching
-//! Debug Information</a>, PDB Files, and <a
-//! href="http://undocumented.rawol.com/sbs-w2k-1-windows-2000-debugging-support.pdf#page=63">Undocumented
-//! Windows 2000 Secrets</a>, Windows 2000 Debugging Support/Microsoft Symbol
-//! File Internals/CodeView Subsections.
-//!
-//! \sa IMAGE_DEBUG_MISC
-struct CodeViewRecordPDB20 {
-  //! \brief The magic number identifying this structure version, stored in
-  //!     #signature.
-  //!
-  //! In a hex dump, this will appear as “NB10” when produced by a little-endian
-  //! machine.
-  static const uint32_t kSignature = '01BN';
-
-  //! \brief The magic number identifying this structure version, the value of
-  //!     #kSignature.
-  uint32_t signature;
-
-  //! \brief The offset to CodeView data.
-  //!
-  //! In this structure, this field always has the value `0` because no CodeView
-  //! data is present, there is only a link to CodeView data stored in an
-  //! external file.
-  uint32_t offset;
-
-  //! \brief The time that the `.pdb` file was created, in `time_t` format, the
-  //!     number of seconds since the POSIX epoch.
-  uint32_t timestamp;
-
-  //! \brief The revision of the `.pdb` file.
-  //!
-  //! A `.pdb` file’s age indicates incremental changes to it. When a `.pdb`
-  //! file is created, it has age `1`, and subsequent updates increase this
-  //! value.
-  uint32_t age;
-
-  //! \brief The path or file name of the `.pdb` file associated with the
-  //!     module.
-  //!
-  //! This is a NUL-terminated string. On Windows, it will be encoded in the
-  //! code page of the system that linked the module. On other operating
-  //! systems, UTF-8 may be used.
-  uint8_t pdb_name[1];
-};
-
-//! \brief A CodeView record linking to a `.pdb` 7.0 file.
-//!
-//! This format provides an indirect link to debugging data by referencing an
-//! external `.pdb` file by its name, %UUID, and age. This structure may be
-//! pointed to by MINIDUMP_MODULE::CvRecord.
-//!
-//! For more information about this structure and format, see <a
-//! href="http://www.debuginfo.com/articles/debuginfomatch.html#pdbfiles">Matching
-//! Debug Information</a>, PDB Files.
-//!
-//! \sa CodeViewRecordPDB20
-//! \sa IMAGE_DEBUG_MISC
-struct CodeViewRecordPDB70 {
-  // UUID has a constructor, which makes it non-POD, which makes this structure
-  // non-POD. In order for the default constructor to zero-initialize other
-  // members, an explicit constructor must be provided.
-  CodeViewRecordPDB70()
-      : signature(),
-        uuid(),
-        age(),
-        pdb_name() {
-  }
-
-  //! \brief The magic number identifying this structure version, stored in
-  //!     #signature.
-  //!
-  //! In a hex dump, this will appear as “RSDS” when produced by a little-endian
-  //! machine.
-  static const uint32_t kSignature = 'SDSR';
-
-  //! \brief The magic number identifying this structure version, the value of
-  //!     #kSignature.
-  uint32_t signature;
-
-  //! \brief The `.pdb` file’s unique identifier.
-  UUID uuid;
-
-  //! \brief The revision of the `.pdb` file.
-  //!
-  //! A `.pdb` file’s age indicates incremental changes to it. When a `.pdb`
-  //! file is created, it has age `1`, and subsequent updates increase this
-  //! value.
-  uint32_t age;
-
-  //! \brief The path or file name of the `.pdb` file associated with the
-  //!     module.
-  //!
-  //! This is a NUL-terminated string. On Windows, it will be encoded in the
-  //! code page of the system that linked the module. On other operating
-  //! systems, UTF-8 may be used.
-  uint8_t pdb_name[1];
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_PDB_STRUCTURES_H_
diff --git a/Tools/Crashpad/include/util/misc/random_string.h b/Tools/Crashpad/include/util/misc/random_string.h
deleted file mode 100644
index 93b3a7fa46..0000000000
--- a/Tools/Crashpad/include/util/misc/random_string.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_RANDOM_STRING_H_
-#define CRASHPAD_UTIL_MISC_RANDOM_STRING_H_
-
-#include <string>
-
-namespace crashpad {
-
-//! \brief Returns a random string.
-//!
-//! The string consists of 16 uppercase characters chosen at random. The
-//! returned string has over 75 bits of randomness (26<sup>16</sup> &gt;
-//! 2<sup>75</sup>).
-std::string RandomString();
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_RANDOM_STRING_H_
diff --git a/Tools/Crashpad/include/util/misc/reinterpret_bytes.h b/Tools/Crashpad/include/util/misc/reinterpret_bytes.h
deleted file mode 100644
index d6c8c78b60..0000000000
--- a/Tools/Crashpad/include/util/misc/reinterpret_bytes.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_REINTERPRET_BYTES_H_
-#define CRASHPAD_UTIL_MISC_REINTERPRET_BYTES_H_
-
-#include <stddef.h>
-
-namespace crashpad {
-
-namespace internal {
-
-bool ReinterpretBytesImpl(const char* from,
-                          size_t from_size,
-                          char* to,
-                          size_t to_size);
-
-}  // namespace internal
-
-//! \brief Copies the bytes of \a from to \a to.
-//!
-//! This function is similar to `bit_cast`, except that it can operate on
-//! differently sized types.
-//!
-//! \return `true` if the copy is possible without information loss, otherwise
-//!     `false` with a message logged.
-template <typename From, typename To>
-bool ReinterpretBytes(const From& from, To* to) {
-  return internal::ReinterpretBytesImpl(reinterpret_cast<const char*>(&from),
-                                        sizeof(From),
-                                        reinterpret_cast<char*>(to),
-                                        sizeof(To));
-}
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_REINTERPRET_BYTES_H_
diff --git a/Tools/Crashpad/include/util/misc/scoped_forbid_return.h b/Tools/Crashpad/include/util/misc/scoped_forbid_return.h
deleted file mode 100644
index 4f1e214f79..0000000000
--- a/Tools/Crashpad/include/util/misc/scoped_forbid_return.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_SCOPED_FORBID_RETURN_H_
-#define CRASHPAD_UTIL_MISC_SCOPED_FORBID_RETURN_H_
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Asserts that a scope must not be exited while unsafe.
-//!
-//! An object of this class has two states: armed and disarmed. A disarmed
-//! object is a harmless no-op. An armed object will abort execution upon
-//! destruction. Newly-constructed objects are armed by default.
-//!
-//! These objects may be used to assert that a scope not be exited while it is
-//! unsafe to do so. If it ever becomes safe to leave such a scope, an object
-//! can be disarmed.
-class ScopedForbidReturn {
- public:
-  ScopedForbidReturn() : armed_(true) {}
-  ~ScopedForbidReturn();
-
-  //! \brief Arms the object so that it will abort execution when destroyed.
-  //!
-  //! The most recent call to Arm() or Disarm() sets the state of the object.
-  void Arm() { armed_ = true; }
-
-  //! \brief Arms the object so that it will abort execution when destroyed.
-  //!
-  //! The most recent call to Arm() or Disarm() sets the state of the object.
-  void Disarm() { armed_ = false; }
-
- private:
-  bool armed_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedForbidReturn);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_SCOPED_FORBID_RETURN_H_
diff --git a/Tools/Crashpad/include/util/misc/symbolic_constants_common.h b/Tools/Crashpad/include/util/misc/symbolic_constants_common.h
deleted file mode 100644
index ea2495aa00..0000000000
--- a/Tools/Crashpad/include/util/misc/symbolic_constants_common.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_SYMBOLIC_CONSTANTS_COMMON_H_
-#define CRASHPAD_UTIL_MISC_SYMBOLIC_CONSTANTS_COMMON_H_
-
-//! \file
-//!
-//! \anchor symbolic_constant_terminology
-//! Symbolic constant terminology
-//! =============================
-//! <dl>
-//!   <dt>Family</dt>
-//!   <dd>A group of related symbolic constants. Typically, within a single
-//!       family, one function will be used to transform a numeric value to a
-//!       string equivalent, and another will perform the inverse operation.
-//!       Families include POSIX signals and Mach exception masks.</dd>
-//!   <dt>Full name</dt>
-//!   <dd>The normal symbolic name used for a constant. For example, in the
-//!       family of POSIX signals, the strings `"SIGHUP"` and `"SIGSEGV"` are
-//!       full names.</dd>
-//!   <dt>Short name</dt>
-//!   <dd>An abbreviated form of symbolic name used for a constant. Short names
-//!       vary between families, but are commonly constructed by removing a
-//!       common prefix from full names. For example, in the family of POSIX
-//!       signals, the prefix is `SIG`, and short names include `"HUP"` and
-//!       `"SEGV"`.</dd>
-//!   <dt>Numeric string</dt>
-//!   <dd>A string that does not contain a full or short name, but contains a
-//!       numeric value that can be interpreted as a symbolic constant. For
-//!       example, in the family of POSIX signals, `SIGKILL` generally has value
-//!       `9`, so the numeric string `"9"` would be interpreted equivalently to
-//!       `"SIGKILL"`.</dd>
-//! </dl>
-
-namespace crashpad {
-
-//! \brief Options for various `*ToString` functions in `symbolic_constants_*`
-//!     files.
-//!
-//! \sa \ref symbolic_constant_terminology "Symbolic constant terminology"
-enum SymbolicConstantToStringOptionBits {
-  //! \brief Return the full name for a given constant.
-  //!
-  //! \attention API consumers should provide this value when desired, but
-  //!     should provide only one of kUseFullName and ::kUseShortName. Because
-  //!     kUseFullName is valueless, implementers should check for the absence
-  //!     of ::kUseShortName instead.
-  kUseFullName = 0 << 0,
-
-  //! \brief Return the short name for a given constant.
-  kUseShortName = 1 << 0,
-
-  //! \brief If no symbolic name is known for a given constant, return an empty
-  //!     string.
-  //!
-  //! \attention API consumers should provide this value when desired, but
-  //!     should provide only one of kUnknownIsEmpty and ::kUnknownIsNumeric.
-  //!     Because kUnknownIsEmpty is valueless, implementers should check for
-  //!     the absence of ::kUnknownIsNumeric instead.
-  kUnknownIsEmpty = 0 << 1,
-
-  //! \brief If no symbolic name is known for a given constant, return a numeric
-  //!     string.
-  //!
-  //! The numeric format used will vary by family, but will be appropriate to
-  //! the family. Families whose values are typically constructed as bitfields
-  //! will generally use a hexadecimal format, and other families will generally
-  //! use a signed or unsigned decimal format.
-  kUnknownIsNumeric = 1 << 1,
-
-  //! \brief Use `|` to combine values in a bitfield.
-  //!
-  //! For families whose values may be constructed as bitfields, allow
-  //! conversion to strings containing multiple individual components treated as
-  //! being combined by a bitwise “or” operation. An example family of constants
-  //! that behaves this way is the suite of Mach exception masks. For constants
-  //! that are not constructed as bitfields, or constants that are only
-  //! partially constructed as bitfields, this option has no effect.
-  kUseOr = 1 << 2,
-};
-
-//! \brief A bitfield containing values of #SymbolicConstantToStringOptionBits.
-using SymbolicConstantToStringOptions = unsigned int;
-
-//! \brief Options for various `StringTo*` functions in `symbolic_constants_*`
-//!     files.
-//!
-//! Not every `StringTo*` function will implement each of these options. See
-//! function-specific documentation for details.
-//!
-//! \sa \ref symbolic_constant_terminology "Symbolic constant terminology"
-enum StringToSymbolicConstantOptionBits {
-  //! \brief Allow conversion from a string containing a symbolic constant by
-  //!     its full name.
-  kAllowFullName = 1 << 0,
-
-  //! \brief Allow conversion from a string containing a symbolic constant by
-  //!     its short name.
-  kAllowShortName = 1 << 1,
-
-  //! \brief Allow conversion from a numeric string.
-  kAllowNumber = 1 << 2,
-
-  //! \brief Allow `|` to combine values in a bitfield.
-  //!
-  //! For families whose values may be constructed as bitfields, allow
-  //! conversion of strings containing multiple individual components treated as
-  //! being combined by a bitwise “or” operation. An example family of constants
-  //! that behaves this way is the suite of Mach exception masks. For constants
-  //! that are not constructed as bitfields, or constants that are only
-  //! partially constructed as bitfields, this option has no effect.
-  kAllowOr = 1 << 3,
-};
-
-//! \brief A bitfield containing values of #StringToSymbolicConstantOptionBits.
-using StringToSymbolicConstantOptions = unsigned int;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_SYMBOLIC_CONSTANTS_COMMON_H_
diff --git a/Tools/Crashpad/include/util/misc/time.h b/Tools/Crashpad/include/util/misc/time.h
deleted file mode 100644
index aabe8e6496..0000000000
--- a/Tools/Crashpad/include/util/misc/time.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_TIME_H_
-#define CRASHPAD_UTIL_MISC_TIME_H_
-
-#include <stdint.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
-
-namespace crashpad {
-
-constexpr uint64_t kNanosecondsPerSecond = static_cast<uint64_t>(1E9);
-
-//! \brief Add `timespec` \a ts1 and \a ts2 and return the result in \a result.
-void AddTimespec(const timespec& ts1, const timespec& ts2, timespec* result);
-
-//! \brief Subtract `timespec` \a ts2 from \a ts1 and return the result in \a
-//!     result.
-void SubtractTimespec(const timespec& ts1,
-                      const timespec& ts2,
-                      timespec* result);
-
-//! \brief Convert the timespec \a ts to a timeval \a tv.
-//! \return `true` if the assignment is possible without truncation.
-bool TimespecToTimeval(const timespec& ts, timeval* tv);
-
-//! \brief Convert the timeval \a tv to a timespec \a ts.
-void TimevalToTimespec(const timeval& tv, timespec* ts);
-
-#if defined(OS_WIN) || DOXYGEN
-
-//! \brief Convert a `timespec` to a Windows `FILETIME`, converting from POSIX
-//!     epoch to Windows epoch.
-FILETIME TimespecToFiletimeEpoch(const timespec& ts);
-
-//! \brief Convert a Windows `FILETIME` to `timespec`, converting from Windows
-//!     epoch to POSIX epoch.
-timespec FiletimeToTimespecEpoch(const FILETIME& filetime);
-
-//! \brief Convert Windows `FILETIME` to `timeval`, converting from Windows
-//!     epoch to POSIX epoch.
-timeval FiletimeToTimevalEpoch(const FILETIME& filetime);
-
-//! \brief Convert Windows `FILETIME` to `timeval`, treating the values as
-//!     an interval of elapsed time.
-timeval FiletimeToTimevalInterval(const FILETIME& filetime);
-
-//! \brief Similar to POSIX `gettimeofday()`, gets the current system time in
-//!     UTC.
-void GetTimeOfDay(timeval* tv);
-
-#endif  // OS_WIN
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_TIME_H_
diff --git a/Tools/Crashpad/include/util/misc/tri_state.h b/Tools/Crashpad/include/util/misc/tri_state.h
deleted file mode 100644
index be55721488..0000000000
--- a/Tools/Crashpad/include/util/misc/tri_state.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_TRI_STATE_H_
-#define CRASHPAD_UTIL_MISC_TRI_STATE_H_
-
-#include <stdint.h>
-
-namespace crashpad {
-
-//! \brief A tri-state value that can be unset, on, or off.
-enum class TriState : uint8_t {
-  //! \brief The value has not explicitly been set.
-  //!
-  //! To allow a zero-initialized value to have this behavior, this must have
-  //! the value `0`.
-  kUnset = 0,
-
-  //! \brief The value has explicitly been set to on, or a behavior has
-  //!     explicitly been enabled.
-  kEnabled,
-
-  //! \brief The value has explicitly been set to off, or a behavior has
-  //!     explicitly been disabled.
-  kDisabled,
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_TRI_STATE_H_
diff --git a/Tools/Crashpad/include/util/misc/uuid.h b/Tools/Crashpad/include/util/misc/uuid.h
deleted file mode 100644
index 4e5884e25a..0000000000
--- a/Tools/Crashpad/include/util/misc/uuid.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_UUID_H_
-#define CRASHPAD_UTIL_MISC_UUID_H_
-
-#include <stdint.h>
-
-#include <string>
-
-#include "base/strings/string16.h"
-#include "base/strings/string_piece.h"
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <rpc.h>
-#endif
-
-namespace crashpad {
-
-//! \brief A universally unique identifier (%UUID).
-//!
-//! An alternate term for %UUID is “globally unique identifier” (GUID), used
-//! primarily by Microsoft.
-//!
-//! A %UUID is a unique 128-bit number specified by RFC 4122.
-//!
-//! This is a POD structure.
-struct UUID {
-  bool operator==(const UUID& that) const;
-  bool operator!=(const UUID& that) const { return !operator==(that); }
-
-  //! \brief Initializes the %UUID to zero.
-  void InitializeToZero();
-
-  //! \brief Initializes the %UUID from a sequence of bytes.
-  //!
-  //! \a bytes is taken as a %UUID laid out in big-endian format in memory. On
-  //! little-endian machines, appropriate byte-swapping will be performed to
-  //! initialize an object’s data members.
-  //!
-  //! \param[in] bytes A buffer of exactly 16 bytes that will be assigned to the
-  //!     %UUID.
-  void InitializeFromBytes(const uint8_t* bytes);
-
-  //! \brief Initializes the %UUID from a RFC 4122 §3 formatted string.
-  //!
-  //! \param[in] string A string of the form
-  //!     `"00112233-4455-6677-8899-aabbccddeeff"`.
-  //!
-  //! \return `true` if the string was formatted correctly and the object has
-  //!     been initialized with the data. `false` if the string could not be
-  //!     parsed, with the object state untouched.
-  bool InitializeFromString(const base::StringPiece& string);
-
-  //! \brief Initializes the %UUID using a standard system facility to generate
-  //!     the value.
-  //!
-  //! \return `true` if the %UUID was initialized correctly, `false` otherwise
-  //!     with a message logged.
-  bool InitializeWithNew();
-
-#if defined(OS_WIN) || DOXYGEN
-  //! \brief Initializes the %UUID from a system `UUID` or `GUID` structure.
-  //!
-  //! \param[in] system_uuid A system `UUID` or `GUID` structure.
-  void InitializeFromSystemUUID(const ::UUID* system_uuid);
-#endif  // OS_WIN
-
-  //! \brief Formats the %UUID per RFC 4122 §3.
-  //!
-  //! \return A string of the form `"00112233-4455-6677-8899-aabbccddeeff"`.
-  std::string ToString() const;
-
-#if defined(OS_WIN) || DOXYGEN
-  //! \brief The same as ToString, but returned as a string16.
-  base::string16 ToString16() const;
-#endif  // OS_WIN
-
-  // These fields are laid out according to RFC 4122 §4.1.2.
-  uint32_t data_1;
-  uint16_t data_2;
-  uint16_t data_3;
-  uint8_t data_4[2];
-  uint8_t data_5[6];
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_UUID_H_
diff --git a/Tools/Crashpad/include/util/misc/zlib.h b/Tools/Crashpad/include/util/misc/zlib.h
deleted file mode 100644
index 99a9c91f9f..0000000000
--- a/Tools/Crashpad/include/util/misc/zlib.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_ZLIB_H_
-#define CRASHPAD_UTIL_MISC_ZLIB_H_
-
-#include <string>
-
-namespace crashpad {
-
-//! \brief Obtain a \a window_bits parameter to pass to `deflateInit2()` or
-//!     `inflateInit2()` that specifies a `gzip` wrapper instead of the default
-//!     zlib wrapper.
-//!
-//! \param[in] window_bits A \a window_bits value that only specifies the base-2
-//!     logarithm of the deflate sliding window size.
-//!
-//! \return \a window_bits adjusted to specify a `gzip` wrapper, to be passed to
-//!     `deflateInit2()` or `inflateInit2()`.
-int ZlibWindowBitsWithGzipWrapper(int window_bits);
-
-//! \brief Formats a string for an error received from the zlib library.
-//!
-//! \param[in] zr A zlib result code, such as `Z_STREAM_ERROR`.
-//!
-//! \return A formatted string.
-std::string ZlibErrorString(int zr);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_ZLIB_H_
diff --git a/Tools/Crashpad/include/util/net/http_body.h b/Tools/Crashpad/include/util/net/http_body.h
deleted file mode 100644
index e053d9cd7e..0000000000
--- a/Tools/Crashpad/include/util/net/http_body.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NET_HTTP_BODY_H_
-#define CRASHPAD_UTIL_NET_HTTP_BODY_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <string>
-#include <vector>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "util/file/file_io.h"
-#include "util/file/file_reader.h"
-
-namespace crashpad {
-
-//! \brief An interface to a stream that can be used for an HTTP request body.
-class HTTPBodyStream {
- public:
-  virtual ~HTTPBodyStream() {}
-
-  //! \brief Copies up to \a max_len bytes into the user-supplied buffer.
-  //!
-  //! \param[out] buffer A user-supplied buffer into which this method will copy
-  //!      bytes from the stream.
-  //! \param[in] max_len The length (or size) of \a buffer. At most this many
-  //!     bytes will be copied.
-  //!
-  //! \return On success, a positive number indicating the number of bytes
-  //!     actually copied to \a buffer. On failure, a negative number. When
-  //!     the stream has no more data, returns `0`.
-  virtual FileOperationResult GetBytesBuffer(uint8_t* buffer,
-                                             size_t max_len) = 0;
-
- protected:
-  HTTPBodyStream() {}
-};
-
-//! \brief An implementation of HTTPBodyStream that turns a fixed string into
-//!     a stream.
-class StringHTTPBodyStream : public HTTPBodyStream {
- public:
-  //! \brief Creates a stream with the specified string.
-  //!
-  //! \param[in] string The string to turn into a stream.
-  explicit StringHTTPBodyStream(const std::string& string);
-
-  ~StringHTTPBodyStream() override;
-
-  // HTTPBodyStream:
-  FileOperationResult GetBytesBuffer(uint8_t* buffer, size_t max_len) override;
-
- private:
-  std::string string_;
-  size_t bytes_read_;
-
-  DISALLOW_COPY_AND_ASSIGN(StringHTTPBodyStream);
-};
-
-//! \brief An implementation of HTTPBodyStream that reads from a
-//!     FileReaderInterface and provides its contents for an HTTP body.
-class FileReaderHTTPBodyStream : public HTTPBodyStream {
- public:
-  //! \brief Creates a stream for reading from a FileReaderInterface.
-  //!
-  //! \param[in] reader A FileReaderInterface from which this HTTPBodyStream
-  //!     will read.
-  explicit FileReaderHTTPBodyStream(FileReaderInterface* reader);
-
-  ~FileReaderHTTPBodyStream() override;
-
-  // HTTPBodyStream:
-  FileOperationResult GetBytesBuffer(uint8_t* buffer, size_t max_len) override;
-
- private:
-  FileReaderInterface* reader_;  // weak
-  bool reached_eof_;
-
-  DISALLOW_COPY_AND_ASSIGN(FileReaderHTTPBodyStream);
-};
-
-//! \brief An implementation of HTTPBodyStream that combines an array of
-//!     several other HTTPBodyStream objects into a single, unified stream.
-class CompositeHTTPBodyStream : public HTTPBodyStream {
- public:
-  using PartsList = std::vector<HTTPBodyStream*>;
-
-  //! \brief Creates a stream from an array of other stream parts.
-  //!
-  //! \param[in] parts A vector of HTTPBodyStream objects, of which this object
-  //!     takes ownership, that will be represented as a single unified stream.
-  //!     Callers should not mutate the stream objects after passing them to
-  //!     an instance of this class.
-  explicit CompositeHTTPBodyStream(const PartsList& parts);
-
-  ~CompositeHTTPBodyStream() override;
-
-  // HTTPBodyStream:
-  FileOperationResult GetBytesBuffer(uint8_t* buffer, size_t max_len) override;
-
- private:
-  PartsList parts_;
-  PartsList::iterator current_part_;
-
-  DISALLOW_COPY_AND_ASSIGN(CompositeHTTPBodyStream);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NET_HTTP_BODY_H_
diff --git a/Tools/Crashpad/include/util/net/http_body_gzip.h b/Tools/Crashpad/include/util/net/http_body_gzip.h
deleted file mode 100644
index da3a5f24d9..0000000000
--- a/Tools/Crashpad/include/util/net/http_body_gzip.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NET_HTTP_BODY_GZIP_H_
-#define CRASHPAD_UTIL_NET_HTTP_BODY_GZIP_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-
-#include "base/macros.h"
-#include "util/file/file_io.h"
-#include "util/net/http_body.h"
-
-extern "C" {
-typedef struct z_stream_s z_stream;
-}  // extern "C"
-
-namespace crashpad {
-
-//! \brief An implementation of HTTPBodyStream that `gzip`-compresses another
-//!     HTTPBodyStream.
-class GzipHTTPBodyStream : public HTTPBodyStream {
- public:
-  explicit GzipHTTPBodyStream(std::unique_ptr<HTTPBodyStream> source);
-
-  ~GzipHTTPBodyStream() override;
-
-  // HTTPBodyStream:
-  FileOperationResult GetBytesBuffer(uint8_t* buffer, size_t max_len) override;
-
- private:
-  enum State : int {
-    kUninitialized,
-    kOperating,
-    kInputEOF,
-    kFinished,
-    kError,
-  };
-
-  // Calls deflateEnd() and transitions state_ to state. If deflateEnd() fails,
-  // logs a message and transitions state_ to State::kError.
-  void Done(State state);
-
-  uint8_t input_[4096];
-  std::unique_ptr<HTTPBodyStream> source_;
-  std::unique_ptr<z_stream> z_stream_;
-  State state_;
-
-  DISALLOW_COPY_AND_ASSIGN(GzipHTTPBodyStream);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NET_HTTP_BODY_GZIP_H_
diff --git a/Tools/Crashpad/include/util/net/http_body_test_util.h b/Tools/Crashpad/include/util/net/http_body_test_util.h
deleted file mode 100644
index 288fccaeb6..0000000000
--- a/Tools/Crashpad/include/util/net/http_body_test_util.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NET_HTTP_BODY_TEST_UTIL_H_
-#define CRASHPAD_UTIL_NET_HTTP_BODY_TEST_UTIL_H_
-
-#include <sys/types.h>
-
-#include <string>
-
-namespace crashpad {
-
-class HTTPBodyStream;
-
-namespace test {
-
-//! \brief Reads a HTTPBodyStream to a string. If an error occurs, adds a
-//!     test failure and returns an empty string.
-//!
-//! \param[in] stream The stream from which to read.
-//!
-//! \return The contents of the stream, or an empty string on failure.
-std::string ReadStreamToString(HTTPBodyStream* stream);
-
-//! \brief Reads a HTTPBodyStream to a string. If an error occurs, adds a
-//!     test failure and returns an empty string.
-//!
-//! \param[in] stream The stream from which to read.
-//! \param[in] buffer_size The size of the buffer to use when reading from the
-//!     stream.
-//!
-//! \return The contents of the stream, or an empty string on failure.
-std::string ReadStreamToString(HTTPBodyStream* stream, size_t buffer_size);
-
-}  // namespace test
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NET_HTTP_BODY_TEST_UTIL_H_
diff --git a/Tools/Crashpad/include/util/net/http_headers.h b/Tools/Crashpad/include/util/net/http_headers.h
deleted file mode 100644
index 50335063b3..0000000000
--- a/Tools/Crashpad/include/util/net/http_headers.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NET_HTTP_HEADERS_H_
-#define CRASHPAD_UTIL_NET_HTTP_HEADERS_H_
-
-#include <map>
-#include <string>
-
-namespace crashpad {
-
-//! \brief A map of HTTP header fields to their values.
-using HTTPHeaders = std::map<std::string, std::string>;
-
-//! \brief The header name `"Content-Type"`.
-constexpr char kContentType[] = "Content-Type";
-
-//! \brief The header name `"Content-Length"`.
-constexpr char kContentLength[] = "Content-Length";
-
-//! \brief The header name `"Content-Encoding"`.
-constexpr char kContentEncoding[] = "Content-Encoding";
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NET_HTTP_HEADERS_H_
diff --git a/Tools/Crashpad/include/util/net/http_multipart_builder.h b/Tools/Crashpad/include/util/net/http_multipart_builder.h
deleted file mode 100644
index c7c59a7739..0000000000
--- a/Tools/Crashpad/include/util/net/http_multipart_builder.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NET_HTTP_MULTIPART_BUILDER_H_
-#define CRASHPAD_UTIL_NET_HTTP_MULTIPART_BUILDER_H_
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "base/macros.h"
-#include "util/file/file_reader.h"
-#include "util/net/http_headers.h"
-
-namespace crashpad {
-
-class HTTPBodyStream;
-
-//! \brief This class is used to build a MIME multipart message, conforming to
-//!     RFC 2046, for use as a HTTP request body.
-class HTTPMultipartBuilder {
- public:
-  HTTPMultipartBuilder();
-  ~HTTPMultipartBuilder();
-
-  //! \brief Enables or disables `gzip` compression.
-  //!
-  //! \param[in] gzip_enabled Whether to enable or disable `gzip` compression.
-  //!
-  //! When `gzip` compression is enabled, the body stream returned by
-  //! GetBodyStream() will be `gzip`-compressed, and the content headers set by
-  //! PopulateContentHeaders() will contain `Content-Encoding: gzip`.
-  void SetGzipEnabled(bool gzip_enabled);
-
-  //! \brief Sets a `Content-Disposition: form-data` key-value pair.
-  //!
-  //! \param[in] key The key of the form data, specified as the `name` in the
-  //!     multipart message. Any data previously set on this class with this
-  //!     key will be overwritten.
-  //! \param[in] value The value to set at the \a key.
-  void SetFormData(const std::string& key, const std::string& value);
-
-  //! \brief Specifies the contents read from \a reader to be uploaded as
-  //!     multipart data, available at `name` of \a upload_file_name.
-  //!
-  //! \param[in] key The key of the form data, specified as the `name` in the
-  //!     multipart message. Any data previously set on this class with this
-  //!     key will be overwritten.
-  //! \param[in] upload_file_name The `filename` to specify for this multipart
-  //!     data attachment.
-  //! \param[in] reader A FileReaderInterface from which to read the content to
-  //!     upload.
-  //! \param[in] content_type The `Content-Type` to specify for the attachment.
-  //!     If this is empty, `"application/octet-stream"` will be used.
-  void SetFileAttachment(const std::string& key,
-                         const std::string& upload_file_name,
-                         FileReaderInterface* reader,
-                         const std::string& content_type);
-
-  //! \brief Generates the HTTPBodyStream for the data currently supplied to
-  //!     the builder.
-  //!
-  //! \return A caller-owned HTTPBodyStream object.
-  std::unique_ptr<HTTPBodyStream> GetBodyStream();
-
-  //! \brief Adds the appropriate content headers to \a http_headers.
-  //!
-  //! Any headers that this method adds will replace existing headers by the
-  //! same name in \a http_headers.
-  void PopulateContentHeaders(HTTPHeaders* http_headers) const;
-
- private:
-  struct FileAttachment {
-    std::string filename;
-    std::string content_type;
-    FileReaderInterface* reader;
-  };
-
-  // Removes elements from both data maps at the specified |key|, to ensure
-  // uniqueness across the entire HTTP body.
-  void EraseKey(const std::string& key);
-
-  std::string boundary_;
-  std::map<std::string, std::string> form_data_;
-  std::map<std::string, FileAttachment> file_attachments_;
-  bool gzip_enabled_;
-
-  DISALLOW_COPY_AND_ASSIGN(HTTPMultipartBuilder);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NET_HTTP_MULTIPART_BUILDER_H_
diff --git a/Tools/Crashpad/include/util/net/http_transport.h b/Tools/Crashpad/include/util/net/http_transport.h
deleted file mode 100644
index f9948aa2e5..0000000000
--- a/Tools/Crashpad/include/util/net/http_transport.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NET_HTTP_TRANSPORT_H_
-#define CRASHPAD_UTIL_NET_HTTP_TRANSPORT_H_
-
-#include <memory>
-#include <string>
-
-#include "base/macros.h"
-#include "util/net/http_headers.h"
-
-namespace crashpad {
-
-class HTTPBodyStream;
-
-//! \brief HTTPTransport executes a HTTP request using the specified URL, HTTP
-//!     method, headers, and body. This class can only issue a synchronous
-//!     HTTP request.
-//!
-//! This class cannot be instantiated directly. A concrete subclass must be
-//! instantiated instead, which provides an implementation to execute the
-//! request that is appropriate for the host operating system.
-class HTTPTransport {
- public:
-  virtual ~HTTPTransport();
-
-  //! \brief Instantiates a concrete HTTPTransport class for the current
-  //!     operating system.
-  //!
-  //! \return A new caller-owned HTTPTransport object.
-  static std::unique_ptr<HTTPTransport> Create();
-
-  //! \brief Sets URL to which the request will be made.
-  //!
-  //! \param[in] url The request URL.
-  void SetURL(const std::string& url);
-
-  //! \brief Sets the HTTP method to execute. E.g., GET, POST, etc. The default
-  //!     method is `"POST"`.
-  //!
-  //! \param[in] http_method The HTTP method.
-  void SetMethod(const std::string& http_method);
-
-  //! \brief Sets a HTTP header-value pair.
-  //!
-  //! \param[in] header The HTTP header name. Any previous value set at this
-  //!     name will be overwritten.
-  //! \param[in] value The value to set for the header.
-  void SetHeader(const std::string& header, const std::string& value);
-
-  //! \brief Sets the stream object from which to generate the HTTP body.
-  //!
-  //! \param[in] stream A HTTPBodyStream, of which this class will take
-  //!     ownership.
-  void SetBodyStream(std::unique_ptr<HTTPBodyStream> stream);
-
-  //! \brief Sets the timeout for the HTTP request. The default is 15 seconds.
-  //!
-  //! \param[in] timeout The request timeout, in seconds.
-  void SetTimeout(double timeout);
-
-  //! \brief Performs the HTTP request with the configured parameters and waits
-  //!     for the execution to complete.
-  //!
-  //! \param[out] response_body On success, this will be set to the HTTP
-  //!     response body. This parameter is optional and may be set to `nullptr`
-  //!     if the response body is not required.
-  //!
-  //! \return Whether or not the request was successful, defined as returning
-  //!     a HTTP status 200 (OK) code.
-  virtual bool ExecuteSynchronously(std::string* response_body) = 0;
-
- protected:
-  HTTPTransport();
-
-  const std::string& url() const { return url_; }
-  const std::string& method() const { return method_; }
-  const HTTPHeaders& headers() const { return headers_; }
-  HTTPBodyStream* body_stream() const { return body_stream_.get(); }
-  double timeout() const { return timeout_; }
-
- private:
-  std::string url_;
-  std::string method_;
-  HTTPHeaders headers_;
-  std::unique_ptr<HTTPBodyStream> body_stream_;
-  double timeout_;
-
-  DISALLOW_COPY_AND_ASSIGN(HTTPTransport);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NET_HTTP_TRANSPORT_H_
diff --git a/Tools/Crashpad/include/util/net/url.h b/Tools/Crashpad/include/util/net/url.h
deleted file mode 100644
index 8817571fdf..0000000000
--- a/Tools/Crashpad/include/util/net/url.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NET_URL_H_
-#define CRASHPAD_UTIL_NET_URL_H_
-
-#include <string>
-
-namespace crashpad {
-
-//! \brief Performs percent-encoding (URL encoding) on the input string,
-//!     following RFC 3986 paragraph 2.
-//!
-//! \param[in] url The string to be encoded.
-//! \return The encoded string.
-std::string URLEncode(const std::string& url);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NET_URL_H_
diff --git a/Tools/Crashpad/include/util/numeric/checked_address_range.h b/Tools/Crashpad/include/util/numeric/checked_address_range.h
deleted file mode 100644
index 40c82390c7..0000000000
--- a/Tools/Crashpad/include/util/numeric/checked_address_range.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NUMERIC_CHECKED_ADDRESS_RANGE_H_
-#define CRASHPAD_UTIL_NUMERIC_CHECKED_ADDRESS_RANGE_H_
-
-#include <stdint.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "build/build_config.h"
-#include "util/numeric/checked_range.h"
-
-namespace crashpad {
-namespace internal {
-
-//! \brief Ensures that a range, composed of a base and a size, does not
-//!     overflow the pointer type of the process it describes a range in.
-//!
-//! This class checks bases of type `ValueType` and sizes of type `SizeType`
-//! against a process whose pointer type is either 32 or 64 bits wide.
-//!
-//! Aside from varying the overall range on the basis of a process’ pointer type
-//! width, this class functions very similarly to CheckedRange.
-//!
-//! \sa CheckedMachAddressRange
-template <class ValueType, class SizeType>
-class CheckedAddressRangeGeneric {
- public:
-  //! \brief Initializes a default range.
-  //!
-  //! The default range has base 0, size 0, and appears to be from a 32-bit
-  //! process.
-  CheckedAddressRangeGeneric();
-
-  //! \brief Initializes a range.
-  //!
-  //! See SetRange().
-  CheckedAddressRangeGeneric(bool is_64_bit, ValueType base, SizeType size);
-
-  //! \brief Sets a range’s fields.
-  //!
-  //! \param[in] is_64_bit `true` if \a base and \a size refer to addresses in a
-  //!     64-bit process; `false` if they refer to addresses in a 32-bit
-  //!     process.
-  //! \param[in] base The range’s base address.
-  //! \param[in] size The range’s size.
-  void SetRange(bool is_64_bit, ValueType base, SizeType size);
-
-  //! \brief The range’s base address.
-  ValueType Base() const;
-
-  //! \brief The range’s size.
-  SizeType Size() const;
-
-  //! \brief The range’s end address (its base address plus its size).
-  ValueType End() const;
-
-  //! \brief Returns the validity of the address range.
-  //!
-  //! \return `true` if the address range is valid, `false` otherwise.
-  //!
-  //! An address range is valid if its size can be converted to the address
-  //! range’s data type without data loss, and if its end (base plus size) can
-  //! be computed without overflowing its data type.
-  bool IsValid() const;
-
-  //! \brief Returns whether this range refers to a 64-bit process.
-  bool Is64Bit() const { return is_64_bit_; }
-
-  //! \brief Returns whether the address range contains another address.
-  //!
-  //! \param[in] value The (possibly) contained address.
-  //!
-  //! \return `true` if the address range contains \a value, `false` otherwise.
-  //!
-  //! An address range contains a value if the value is greater than or equal to
-  //! its base address, and less than its end address (base address plus size).
-  //!
-  //! This method must only be called if IsValid() would return `true`.
-  bool ContainsValue(const ValueType value) const;
-
-  //! \brief Returns whether the address range contains another address range.
-  //!
-  //! \param[in] that The (possibly) contained address range.
-  //!
-  //! \return `true` if `this` address range, the containing address range,
-  //!     contains \a that, the contained address range. `false` otherwise.
-  //!
-  //! An address range contains another address range when the contained address
-  //! range’s base is greater than or equal to the containing address range’s
-  //! base, and the contained address range’s end is less than or equal to the
-  //! containing address range’s end.
-  //!
-  //! This method should only be called on two CheckedAddressRangeGeneric
-  //! objects representing address ranges in the same process.
-  //!
-  //! This method must only be called if IsValid() would return `true` for both
-  //! CheckedAddressRangeGeneric objects involved.
-  bool ContainsRange(const CheckedAddressRangeGeneric& that) const;
-
-  //! \brief Returns a string describing the address range.
-  //!
-  //! The string will be formatted as `"0x123 + 0x45 (64)"`, where the
-  //! individual components are the address, size, and bitness.
-  std::string AsString() const;
-
- private:
-#if defined(COMPILER_MSVC)
-  // MSVC cannot handle a union containing CheckedRange (with constructor, etc.)
-  // currently.
-  CheckedRange<uint32_t> range_32_;
-  CheckedRange<uint64_t> range_64_;
-#else
-  // The field of the union that is expressed is determined by is_64_bit_.
-  union {
-    CheckedRange<uint32_t> range_32_;
-    CheckedRange<uint64_t> range_64_;
-  };
-#endif
-
-  // Determines which field of the union is expressed.
-  bool is_64_bit_;
-
-  // Whether the base and size were valid for their data type when set. This is
-  // always true when is_64_bit_ is true because the underlying data types are
-  // 64 bits wide and there is no possibility for range and size to overflow.
-  // When is_64_bit_ is false, range_ok_ will be false if SetRange() was passed
-  // a base or size that overflowed the underlying 32-bit data type. This field
-  // is necessary because the interface exposes the address and size types
-  // uniformly, but these types are too wide for the underlying pointer and size
-  // types in 32-bit processes.
-  bool range_ok_;
-};
-
-}  // namespace internal
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NUMERIC_CHECKED_ADDRESS_RANGE_H_
diff --git a/Tools/Crashpad/include/util/numeric/checked_range.h b/Tools/Crashpad/include/util/numeric/checked_range.h
deleted file mode 100644
index 09dfc22727..0000000000
--- a/Tools/Crashpad/include/util/numeric/checked_range.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NUMERIC_CHECKED_RANGE_H_
-#define CRASHPAD_UTIL_NUMERIC_CHECKED_RANGE_H_
-
-#include <limits>
-#include <tuple>
-
-#include "base/logging.h"
-#include "base/numerics/safe_conversions.h"
-#include "base/numerics/safe_math.h"
-#include "util/misc/implicit_cast.h"
-
-namespace crashpad {
-
-//! \brief Ensures that a range, composed of a base and size, does not overflow
-//!     its data type.
-template <typename ValueType, typename SizeType = ValueType>
-class CheckedRange {
- public:
-  CheckedRange(ValueType base, SizeType size) {
-    static_assert(!std::numeric_limits<SizeType>::is_signed,
-                  "SizeType must be unsigned");
-    SetRange(base, size);
-  }
-
-  //! \brief Sets the range’s base and size to \a base and \a size,
-  //!     respectively.
-  void SetRange(ValueType base, SizeType size) {
-    base_ = base;
-    size_ = size;
-  }
-
-  //! \brief The range’s base.
-  ValueType base() const { return base_; }
-
-  //! \brief The range’s size.
-  SizeType size() const { return size_; }
-
-  //! \brief The range’s end (its base plus its size).
-  ValueType end() const { return base_ + size_; }
-
-  //! \brief Returns the validity of the range.
-  //!
-  //! \return `true` if the range is valid, `false` otherwise.
-  //!
-  //! A range is valid if its size can be converted to the range’s data type
-  //! without data loss, and if its end (base plus size) can be computed without
-  //! overflowing its data type.
-  bool IsValid() const {
-    if (!base::IsValueInRangeForNumericType<ValueType, SizeType>(size_)) {
-      return false;
-    }
-    base::CheckedNumeric<ValueType> checked_end(base_);
-    checked_end += implicit_cast<ValueType>(size_);
-    return checked_end.IsValid();
-  }
-
-  //! \brief Returns whether the range contains another value.
-  //!
-  //! \param[in] value The (possibly) contained value.
-  //!
-  //! \return `true` if the range contains \a value, `false` otherwise.
-  //!
-  //! A range contains a value if the value is greater than or equal to its
-  //! base, and less than its end (base plus size).
-  //!
-  //! This method must only be called if IsValid() would return `true`.
-  bool ContainsValue(ValueType value) const {
-    DCHECK(IsValid());
-
-    return value >= base() && value < end();
-  }
-
-  //! \brief Returns whether the range contains another range.
-  //!
-  //! \param[in] that The (possibly) contained range.
-  //!
-  //! \return `true` if `this` range, the containing range, contains \a that,
-  //!     the contained range. `false` otherwise.
-  //!
-  //! A range contains another range when the contained range’s base is greater
-  //! than or equal to the containing range’s base, and the contained range’s
-  //! end is less than or equal to the containing range’s end.
-  //!
-  //! This method must only be called if IsValid() would return `true` for both
-  //! CheckedRange objects involved.
-  bool ContainsRange(const CheckedRange<ValueType, SizeType>& that) const {
-    DCHECK(IsValid());
-    DCHECK(that.IsValid());
-
-    return that.base() >= base() && that.end() <= end();
-  }
-
-  //! \brief Returns whether the range overlaps another range.
-  //!
-  //! \param[in] that The (possibly) overlapping range.
-  //!
-  //! \return `true` if `this` range, the first range, overlaps \a that,
-  //!     the provided range. `false` otherwise.
-  //!
-  //! Ranges are considered to be closed-open [base, end) for this test. Zero
-  //! length ranges are never considered to overlap another range.
-  //!
-  //! This method must only be called if IsValid() would return `true` for both
-  //! CheckedRange objects involved.
-  bool OverlapsRange(const CheckedRange<ValueType, SizeType>& that) const {
-    DCHECK(IsValid());
-    DCHECK(that.IsValid());
-
-    if (size() == 0 || that.size() == 0)
-      return false;
-
-    return base() < that.end() && that.base() < end();
-  }
-
-  bool operator<(const CheckedRange& other) const {
-    return std::tie(base_, size_) < std::tie(other.base_, other.size_);
-  }
-
- private:
-  ValueType base_;
-  SizeType size_;
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NUMERIC_CHECKED_RANGE_H_
diff --git a/Tools/Crashpad/include/util/numeric/checked_vm_address_range.h b/Tools/Crashpad/include/util/numeric/checked_vm_address_range.h
deleted file mode 100644
index e792dba939..0000000000
--- a/Tools/Crashpad/include/util/numeric/checked_vm_address_range.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NUMERIC_CHECKED_VM_ADDRESS_RANGE_H_
-#define CRASHPAD_UTIL_NUMERIC_CHECKED_VM_ADDRESS_RANGE_H_
-
-#include "util/misc/address_types.h"
-#include "util/numeric/checked_address_range.h"
-
-namespace crashpad {
-
-//! \brief Ensures that a range, composed of a base and a size, does not
-//!     overflow the pointer type of the process it describes a range in.
-//!
-//! This class checks bases of type #VMAddress and sizes of type #VMSize against
-//! a process whose pointer type is either 32 or 64 bits wide.
-//!
-//! Aside from varying the overall range on the basis of a process’ pointer type
-//! width, this class functions very similarly to CheckedRange.
-using CheckedVMAddressRange =
-    internal::CheckedAddressRangeGeneric<VMAddress, VMSize>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NUMERIC_CHECKED_VM_ADDRESS_RANGE_H_
diff --git a/Tools/Crashpad/include/util/numeric/in_range_cast.h b/Tools/Crashpad/include/util/numeric/in_range_cast.h
deleted file mode 100644
index 3dba10afa1..0000000000
--- a/Tools/Crashpad/include/util/numeric/in_range_cast.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NUMERIC_IN_RANGE_CAST_H_
-#define CRASHPAD_UTIL_NUMERIC_IN_RANGE_CAST_H_
-
-#include "base/logging.h"
-#include "base/numerics/safe_conversions.h"
-
-namespace crashpad {
-
-//! \brief Casts to a different type if it can be done without data loss,
-//!     logging a warning message and returing a default value otherwise.
-//!
-//! \param[in] source The value to convert and return.
-//! \param[in] default_value The default value to return, in the event that \a
-//!     source cannot be represented in the destination type.
-//!
-//! \return \a source if it can be represented in the destination type,
-//!     otherwise \a default_value.
-template <typename Destination, typename Source>
-Destination InRangeCast(Source source, Destination default_value) {
-  if (base::IsValueInRangeForNumericType<Destination>(source)) {
-    return static_cast<Destination>(source);
-  }
-
-  LOG(WARNING) << "value " << source << " out of range";
-  return static_cast<Destination>(default_value);
-}
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NUMERIC_IN_RANGE_CAST_H_
diff --git a/Tools/Crashpad/include/util/numeric/int128.h b/Tools/Crashpad/include/util/numeric/int128.h
deleted file mode 100644
index c57bed6d28..0000000000
--- a/Tools/Crashpad/include/util/numeric/int128.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NUMERIC_INT128_H_
-#define CRASHPAD_UTIL_NUMERIC_INT128_H_
-
-#include <stdint.h>
-
-#include "build/build_config.h"
-
-namespace crashpad {
-
-//! \brief Stores a 128-bit quantity.
-//!
-//! This structure is organized so that 128-bit quantities are laid out in
-//! memory according to the system’s natural byte order. If a system offers a
-//! native 128-bit type, it should be possible to bit_cast<> between that type
-//! and this one.
-//!
-//! This structure is designed to have the same layout, although not the same
-//! field names, as the Windows SDK’s `M128A` type from `<winnt.h>`. It is
-//! provided here instead of in `compat` because it is useful outside of the
-//! scope of data structures defined by the Windows SDK.
-struct uint128_struct {
-#if defined(ARCH_CPU_LITTLE_ENDIAN) || DOXYGEN
-  //! \brief The low 64 bits of the 128-bit quantity.
-  uint64_t lo;
-
-  //! \brief The high 64 bits of the 128-bit quantity.
-  uint64_t hi;
-#else
-  uint64_t hi;
-  uint64_t lo;
-#endif
-};
-
-static_assert(sizeof(uint128_struct) == 16, "uint128 must be 16 bytes");
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NUMERIC_INT128_H_
diff --git a/Tools/Crashpad/include/util/numeric/safe_assignment.h b/Tools/Crashpad/include/util/numeric/safe_assignment.h
deleted file mode 100644
index 358d983701..0000000000
--- a/Tools/Crashpad/include/util/numeric/safe_assignment.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_NUMERIC_SAFE_ASSIGNMENT_H_
-#define CRASHPAD_UTIL_NUMERIC_SAFE_ASSIGNMENT_H_
-
-#include "base/numerics/safe_conversions.h"
-
-namespace crashpad {
-
-//! \brief Performs an assignment if it can be done safely, and signals if it
-//!     cannot be done safely.
-//!
-//! \param[out] destination A pointer to the variable to be assigned to.
-//! \param[in] source The value to assign.
-//!
-//! \return `true` if \a source is in the range supported by the type of \a
-//!     *destination, with the assignment to \a *destination having been
-//!     performed. `false` if the assignment cannot be completed safely because
-//!     \a source is outside of this range.
-template <typename Destination, typename Source>
-bool AssignIfInRange(Destination* destination, Source source) {
-  if (!base::IsValueInRangeForNumericType<Destination>(source)) {
-    return false;
-  }
-
-  *destination = static_cast<Destination>(source);
-  return true;
-}
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_NUMERIC_SAFE_ASSIGNMENT_H_
diff --git a/Tools/Crashpad/include/util/posix/close_multiple.h b/Tools/Crashpad/include/util/posix/close_multiple.h
deleted file mode 100644
index baf72b2b6d..0000000000
--- a/Tools/Crashpad/include/util/posix/close_multiple.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_CLOSE_MULTIPLE_H_
-#define CRASHPAD_UTIL_POSIX_CLOSE_MULTIPLE_H_
-
-namespace crashpad {
-
-//! \brief Close multiple file descriptors or mark them close-on-exec.
-//!
-//! This is similar to the BSD/Solaris-style `closefrom()` routine, which closes
-//! all open file descriptors equal to or higher than its \a fd argument. This
-//! function must not be called while other threads are active. It is intended
-//! to be used in a child process created by `fork()`, prior to calling an
-//! `exec()`-family function. This guarantees that a (possibly untrustworthy)
-//! child process does not inherit file descriptors that it has no need for.
-//!
-//! Unlike the BSD function, this function may not close file descriptors
-//! immediately, but may instead mark them as close-on-exec. The actual behavior
-//! chosen is specific to the operating system. On macOS, file descriptors are
-//! marked close-on-exec instead of being closed outright in order to avoid
-//! raising `EXC_GUARD` exceptions for guarded file descriptors that are
-//! protected against `close()`.
-//!
-//! \param[in] fd The lowest file descriptor to close or set as close-on-exec.
-//! \param[in] preserve_fd A file descriptor to preserve and not close (or set
-//!     as close-on-exec), even if it is open and its value is greater than \a
-//!     fd. To not preserve any file descriptor, pass `-1` for this parameter.
-void CloseMultipleNowOrOnExec(int fd, int preserve_fd);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_CLOSE_MULTIPLE_H_
diff --git a/Tools/Crashpad/include/util/posix/close_stdio.h b/Tools/Crashpad/include/util/posix/close_stdio.h
deleted file mode 100644
index 9515923b52..0000000000
--- a/Tools/Crashpad/include/util/posix/close_stdio.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_CLOSE_STDIO_H_
-#define CRASHPAD_UTIL_POSIX_CLOSE_STDIO_H_
-
-namespace crashpad {
-
-//! \brief Closes `stdin` and `stdout` by opening `/dev/null` over them.
-//!
-//! It is normally inadvisable to `close()` the three standard input/output
-//! streams, because they occupy special file descriptors. Closing them outright
-//! could result in their file descriptors being reused. This causes problems
-//! for library code (including the standard library) that expects these file
-//! descriptors to have special meaning.
-//!
-//! This function discards the standard input and standard output streams by
-//! opening `/dev/null` and assigning it to their file descriptors, closing
-//! whatever had been at those file descriptors previously.
-//!
-//! `stderr`, the standard error stream, is not closed. It is often useful to
-//! retain the ability to send diagnostic messages to the standard error stream.
-//!
-//! \note This function can only maintain its guarantees in a single-threaded
-//!     process, or in situations where the caller has control of all threads in
-//!     the process.
-void CloseStdinAndStdout();
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_CLOSE_STDIO_H_
diff --git a/Tools/Crashpad/include/util/posix/double_fork_and_exec.h b/Tools/Crashpad/include/util/posix/double_fork_and_exec.h
deleted file mode 100644
index df340d07a7..0000000000
--- a/Tools/Crashpad/include/util/posix/double_fork_and_exec.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
-#define CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
-
-#include <string>
-#include <vector>
-
-namespace crashpad {
-
-//! \brief Executes a (grand-)child process.
-//!
-//! The grandchild process will be started through the
-//! double-`fork()`-and-`execv()` pattern. This allows the grandchild to fully
-//! disassociate from the parent. The grandchild will not be a member of the
-//! parent’s process group or session and will not have a controlling terminal,
-//! providing isolation from signals not intended for it. The grandchild’s
-//! parent process, in terms of the process tree hierarchy, will be the process
-//! with process ID 1, relieving any other process of the responsibility to reap
-//! it via `waitpid()`. Aside from the three file descriptors associated with
-//! the standard input/output streams and any file descriptor passed in \a
-//! preserve_fd, the grandchild will not inherit any file descriptors from the
-//! parent process.
-//!
-//! \param[in] argv The argument vector to start the grandchild process with.
-//!     `argv[0]` is used as the path to the executable.
-//! \param[in] preserve_fd A file descriptor to be inherited by the grandchild
-//!     process. This file descriptor is inherited in addition to the three file
-//!     descriptors associated with the standard input/output streams. Use `-1`
-//!     if no additional file descriptors are to be inherited.
-//! \param[in] use_path Whether to consult the `PATH` environment variable when
-//!     requested to start an executable at a non-absolute path. If `false`,
-//!     `execv()`, which does not consult `PATH`, will be used. If `true`,
-//!     `execvp()`, which does consult `PATH`, will be used.
-//! \param[in] child_function If not `nullptr`, this function will be called in
-//!     the intermediate child process, prior to the second `fork()`. Take note
-//!     that this function will run in the context of a forked process, and must
-//!     be safe for that purpose.
-//!
-//! \return `true` on success, and `false` on failure with a message logged.
-//!     Only failures that occur in the parent process that indicate a definite
-//!     failure to start the the grandchild are reported in the return value.
-//!     Failures in the intermediate child or grandchild processes cannot be
-//!     reported in the return value, and are addressed by logging a message and
-//!     terminating. The caller assumes the responsibility for detecting such
-//!     failures, for example, by observing a failure to perform a successful
-//!     handshake with the grandchild process.
-bool DoubleForkAndExec(const std::vector<std::string>& argv,
-                       int preserve_fd,
-                       bool use_path,
-                       void (*child_function)());
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
diff --git a/Tools/Crashpad/include/util/posix/drop_privileges.h b/Tools/Crashpad/include/util/posix/drop_privileges.h
deleted file mode 100644
index 91220e9785..0000000000
--- a/Tools/Crashpad/include/util/posix/drop_privileges.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_DROP_PRIVILEGES_H_
-#define CRASHPAD_UTIL_POSIX_DROP_PRIVILEGES_H_
-
-namespace crashpad {
-
-//! \brief Permanently drops privileges conferred by being a setuid or setgid
-//!     executable.
-//!
-//! The effective user ID and saved set-user ID are set to the real user ID,
-//! negating any effects of being a setuid executable. The effective group ID
-//! and saved set-group ID are set to the real group ID, negating any effects of
-//! being a setgid executable. Because the saved set-user ID and saved set-group
-//! ID are reset, there is no way to restore the prior privileges, and the drop
-//! is permanent.
-//!
-//! This function drops privileges correctly when running setuid root and in
-//! other circumstances, including when running setuid non-root. If the program
-//! is not a setuid or setgid executable, this function has no effect.
-//!
-//! No changes are made to the supplementary group list, which is normally not
-//! altered for setuid or setgid executables.
-void DropPrivileges();
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_DROP_PRIVILEGES_H_
diff --git a/Tools/Crashpad/include/util/posix/process_info.h b/Tools/Crashpad/include/util/posix/process_info.h
deleted file mode 100644
index 18a9cd93d0..0000000000
--- a/Tools/Crashpad/include/util/posix/process_info.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_PROCESS_INFO_H_
-#define CRASHPAD_UTIL_POSIX_PROCESS_INFO_H_
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <set>
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "build/build_config.h"
-#include "util/misc/initialization_state.h"
-#include "util/misc/initialization_state_dcheck.h"
-
-#if defined(OS_MACOSX)
-#include <mach/mach.h>
-#include <sys/sysctl.h>
-#endif
-
-#if defined(OS_LINUX) || defined(OS_ANDROID)
-#include "util/linux/ptrace_connection.h"
-#endif
-
-namespace crashpad {
-
-class ProcessInfo {
- public:
-  ProcessInfo();
-  ~ProcessInfo();
-
-#if defined(OS_LINUX) || defined(OS_ANDROID) || DOXYGEN
-  //! \brief Initializes this object with information about the process whose ID
-  //!     is \a pid using a PtraceConnection \a connection.
-  //!
-  //! This method must be called successfully prior to calling any other method
-  //! in this class. This method may only be called once.
-  //!
-  //! It is unspecified whether the information that an object of this class
-  //! returns is loaded at the time Initialize() is called or subsequently, and
-  //! whether this information is cached in the object or not.
-  //!
-  //! \param[in] connection A connection to the remote process.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool InitializeWithPtrace(PtraceConnection* connection);
-#endif  // OS_LINUX || OS_ANDROID || DOXYGEN
-
-#if defined(OS_MACOSX) || DOXYGEN
-  //! \brief Initializes this object with information about the process whose ID
-  //!     is \a pid.
-  //!
-  //! This method must be called successfully prior to calling any other method
-  //! in this class. This method may only be called once.
-  //!
-  //! It is unspecified whether the information that an object of this class
-  //! returns is loaded at the time Initialize() is called or subsequently, and
-  //! whether this information is cached in the object or not.
-  //!
-  //! \param[in] pid The process ID to obtain information for.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool InitializeWithPid(pid_t pid);
-
-  //! \brief Initializes this object with information about a process based on
-  //!     its Mach task.
-  //!
-  //! This method serves as a stand-in for InitializeWithPid() and may be called
-  //! in its place with the same restrictions and considerations.
-  //!
-  //! \param[in] task The Mach task to obtain information for.
-  //!
-  //! \return `true` on success, `false` on failure with an message logged.
-  bool InitializeWithTask(task_t task);
-#endif
-
-  //! \return The target task’s process ID.
-  pid_t ProcessID() const;
-
-  //! \return The target task’s parent process ID.
-  pid_t ParentProcessID() const;
-
-  //! \return The target process’ real user ID as would be returned to it by
-  //!     `getuid()`.
-  uid_t RealUserID() const;
-
-  //! \return The target process’ effective user ID as would be returned to it
-  //!     by `geteuid()`.
-  uid_t EffectiveUserID() const;
-
-  //! \return The target process’ saved set-user ID.
-  uid_t SavedUserID() const;
-
-  //! \return the target process’ real group ID as would be returned to it by
-  //!     `getgid()`.
-  gid_t RealGroupID() const;
-
-  //! \return the target process’ effective group ID as would be returned to it
-  //!     by `getegid()`.
-  gid_t EffectiveGroupID() const;
-
-  //! \return The target process’ saved set-group ID.
-  gid_t SavedGroupID() const;
-
-  //! \return the target process’ supplementary group list as would be returned
-  //!     to it by `getgroups()`.
-  std::set<gid_t> SupplementaryGroups() const;
-
-  //! \return All groups that the target process claims membership in, including
-  //!     RealGroupID(), EffectiveGroupID(), SavedGroupID(), and
-  //!     SupplementaryGroups().
-  std::set<gid_t> AllGroups() const;
-
-  //! \brief Determines whether the target process has changed privileges.
-  //!
-  //! A process is considered to have changed privileges if it has changed its
-  //! real, effective, or saved set-user or group IDs with the `setuid()`,
-  //! `seteuid()`, `setreuid()`, `setgid()`, `setegid()`, or `setregid()` system
-  //! calls since its most recent `execve()`, or if its privileges changed at
-  //! `execve()` as a result of executing a setuid or setgid executable.
-  bool DidChangePrivileges() const;
-
-  //! \brief Determines the target process’ bitness.
-  //!
-  //! \return `true` if the target task is a 64-bit process.
-  bool Is64Bit() const;
-
-  //! \brief Determines the target process’ start time.
-  //!
-  //! \param[out] start_time The time that the process started.
-  //!
-  //! \return `true` on success, with \a start_time set. Otherwise, `false` with
-  //!     a message logged.
-  bool StartTime(timeval* start_time) const;
-
-  //! \brief Obtains the arguments used to launch a process.
-  //!
-  //! Whether it is possible to obtain this information for a process with
-  //! different privileges than the running program is system-dependent.
-  //!
-  //! \param[out] argv The process’ arguments as passed to its `main()` function
-  //!     as the \a argv parameter, possibly modified by the process.
-  //!
-  //! \return `true` on success, with \a argv populated appropriately.
-  //!     Otherwise, `false` with a message logged.
-  //!
-  //! \note This function may spuriously return `false` when used to examine a
-  //!     process that it is calling `exec()`. If examining such a process, call
-  //!     this function in a retry loop with a small (100ns) delay to avoid an
-  //!     erroneous assumption that \a pid is not running.
-  bool Arguments(std::vector<std::string>* argv) const;
-
- private:
-#if defined(OS_MACOSX)
-  kinfo_proc kern_proc_info_;
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
-  // Some members are marked mutable so that they can be lazily initialized by
-  // const methods. These are always InitializationState-protected so that
-  // multiple successive calls will always produce the same return value and out
-  // parameters. This is necessary for intergration with the Snapshot interface.
-  // See https://crashpad.chromium.org/bug/9.
-  std::set<gid_t> supplementary_groups_;
-  mutable timeval start_time_;
-  pid_t pid_;
-  pid_t ppid_;
-  uid_t uid_;
-  uid_t euid_;
-  uid_t suid_;
-  gid_t gid_;
-  gid_t egid_;
-  gid_t sgid_;
-  bool is_64_bit_;
-  mutable InitializationState start_time_initialized_;
-#endif
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProcessInfo);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_PROCESS_INFO_H_
diff --git a/Tools/Crashpad/include/util/posix/scoped_dir.h b/Tools/Crashpad/include/util/posix/scoped_dir.h
deleted file mode 100644
index 3fcbdf9c9d..0000000000
--- a/Tools/Crashpad/include/util/posix/scoped_dir.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_SCOPED_DIR_H_
-#define CRASHPAD_UTIL_POSIX_SCOPED_DIR_H_
-
-#include <dirent.h>
-
-#include "base/scoped_generic.h"
-
-namespace crashpad {
-namespace internal {
-
-struct ScopedDIRCloseTraits {
-  static DIR* InvalidValue() { return nullptr; }
-  static void Free(DIR* dir);
-};
-
-}  // namespace internal
-
-//! \brief Maintains a directory opened by `opendir`.
-//!
-//! On destruction, the directory will be closed by calling `closedir`.
-using ScopedDIR = base::ScopedGeneric<DIR*, internal::ScopedDIRCloseTraits>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_SCOPED_DIR_H_
diff --git a/Tools/Crashpad/include/util/posix/scoped_mmap.h b/Tools/Crashpad/include/util/posix/scoped_mmap.h
deleted file mode 100644
index b0ff3dc0ae..0000000000
--- a/Tools/Crashpad/include/util/posix/scoped_mmap.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_SCOPED_MMAP_H_
-#define CRASHPAD_UTIL_POSIX_SCOPED_MMAP_H_
-
-#include "base/macros.h"
-
-#include <sys/mman.h>
-#include <sys/types.h>
-
-#include "util/misc/from_pointer_cast.h"
-
-namespace crashpad {
-
-//! \brief Maintains a memory-mapped region created by `mmap()`.
-//!
-//! On destruction, any memory-mapped region managed by an object of this class
-//! will be released by calling `munmap()`.
-class ScopedMmap {
- public:
-  ScopedMmap();
-  ~ScopedMmap();
-
-  //! \brief Releases the memory-mapped region by calling `munmap()`.
-  //!
-  //! \return `true` on success. `false` on failure, with a message logged.
-  bool Reset();
-
-  //! \brief Releases any existing memory-mapped region and sets the object to
-  //!     maintain an already-established mapping.
-  //!
-  //! If \a addr and \a len indicate a region that overlaps with the existing
-  //! memory-mapped region, only the portion of the existing memory-mapped
-  //! region that does not overlap the new region, if any, will be released.
-  //!
-  //! \param[in] addr The base address of the existing memory-mapped region to
-  //!     maintain.
-  //! \param[in] len The size of the existing memory-mapped region to maintain.
-  //!
-  //! \return `true` on success. `false` on failure, with a message logged.
-  bool ResetAddrLen(void* addr, size_t len);
-
-  //! \brief Releases any existing memory-mapped region and establishes a new
-  //!     one by calling `mmap()`.
-  //!
-  //! The parameters to this method are passed directly to `mmap()`.
-  //!
-  //! \return `true` on success. `false` on failure, with a message logged. A
-  //!     message will also be logged on failure to release any existing
-  //!     memory-mapped region, but this will not preclude `mmap()` from being
-  //!     called or a new mapping from being established, and if such a call to
-  //!     `mmap()` is successful, this method will return `true`.
-  bool ResetMmap(void* addr,
-                 size_t len,
-                 int prot,
-                 int flags,
-                 int fd,
-                 off_t offset);
-
-  //! \brief Sets the protection of the memory-mapped region by calling
-  //!     `mprotect()`.
-  //!
-  //! \a prot is passed directly to `mprotect()`.
-  //!
-  //! \return `true` on success. `false` on failure, with a message logged.
-  bool Mprotect(int prot);
-
-  //! \return Whether this object is managing a valid memory-mapped region.
-  bool is_valid() const { return addr_ != MAP_FAILED; }
-
-  //! \brief Returns the base address of the memory-mapped region.
-  void* addr() const { return addr_; }
-
-  //! \brief Returns the base address of the memory-mapped region, casted to
-  //!     a type of the caller’s choosing.
-  template <typename T>
-  T addr_as() const {
-    return FromPointerCast<T>(addr_);
-  }
-
-  //! \brief Returns the size of the memory-mapped region.
-  size_t len() const { return len_; }
-
- private:
-  void* addr_ = MAP_FAILED;
-  size_t len_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedMmap);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_SCOPED_MMAP_H_
diff --git a/Tools/Crashpad/include/util/posix/signals.h b/Tools/Crashpad/include/util/posix/signals.h
deleted file mode 100644
index ade093bfad..0000000000
--- a/Tools/Crashpad/include/util/posix/signals.h
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_SIGNALS_H_
-#define CRASHPAD_UTIL_POSIX_SIGNALS_H_
-
-#include <signal.h>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Utilities for handling POSIX signals.
-class Signals {
- public:
-  //! \brief The type used for `struct sigaction::sa_sigaction`.
-  using Handler = void (*)(int, siginfo_t*, void*);
-
-  //! \brief A group of `struct sigaction` structures corresponding to a set
-  //!     of signals’ previous actions, addressable by signal number.
-  //!
-  //! This type is used to store previous signal actions when new actions are
-  //! installed in batch by InstallCrashHandlers() or
-  //! InstallTerminateHandlers().
-  //!
-  //! This object is not initialized by any constructor. Its expected initial
-  //! state is to have its contents filled with zeroes. Because signal handlers
-  //! are stateless (there is no “context” parameter), any state must be
-  //! accessed via objects of static storage duration, and it is expected that
-  //! objects of this class will only ever exist with static storage duration,
-  //! which in the absence of a constructor will be zero-initialized as
-  //! expected. In the event that an object of this class must exist with a
-  //! different storage duration, such as automatic or dynamic storage duration,
-  //! it must be explicitly initialized. For example: `OldActions old_actions =
-  //! {};`.
-  class OldActions {
-   public:
-    // DISALLOW_COPY_AND_ASSIGN removes the default constructor, so explicitly
-    // opt for it. This should not result in any static initialization code even
-    // when an object of this class is given static storage duration.
-    OldActions() = default;
-
-    //! \brief Returns a `struct sigaction` structure corresponding to the
-    //!     given signal.
-    //!
-    //! \note This method is safe to call from a signal handler.
-    struct sigaction* ActionForSignal(int sig);
-
-   private:
-    // As a small storage optimization, don’t waste any space on a slot for
-    // signal 0, because there is no signal 0.
-    struct sigaction actions_[NSIG - 1];
-
-    DISALLOW_COPY_AND_ASSIGN(OldActions);
-  };
-
-  //! \brief Installs a new signal handler.
-  //!
-  //! \param[in] sig The signal number to handle.
-  //! \param[in] handler A signal-handling function to execute, used as the
-  //!     `struct sigaction::sa_sigaction` field when calling `sigaction()`.
-  //! \param[in] flags Flags to pass to `sigaction()` in the `struct
-  //!     sigaction::sa_flags` field. `SA_SIGINFO` will be specified implicitly.
-  //! \param[out] old_action The previous action for the signal, replaced by the
-  //!     new action. May be `nullptr` if not needed.
-  //!
-  //! \return `true` on success. `false` on failure with a message logged.
-  //!
-  //! \warning This function may not be called from a signal handler because of
-  //!     its use of logging. See RestoreHandlerAndReraiseSignalOnReturn()
-  //!     instead.
-  static bool InstallHandler(int sig,
-                             Handler handler,
-                             int flags,
-                             struct sigaction* old_action);
-
-  //! \brief Installs `SIG_DFL` for the signal \a sig.
-  //!
-  //! \param[in] sig The signal to set the default action for.
-  //!
-  //! \return `true` on success, `false` on failure with errno set. No message
-  //!     is logged.
-  static bool InstallDefaultHandler(int sig);
-
-  //! \brief Installs a new signal handler for all signals associated with
-  //!     crashes.
-  //!
-  //! Signals associated with crashes are those whose default dispositions
-  //! involve creating a core dump. The precise set of signals involved varies
-  //! between operating systems.
-  //!
-  //! A single signal may either be associated with a crash or with termination
-  //! (see InstallTerminateHandlers()), and perhaps neither, but never both.
-  //!
-  //! \param[in] handler A signal-handling function to execute, used as the
-  //!     `struct sigaction::sa_sigaction` field when calling `sigaction()`.
-  //! \param[in] flags Flags to pass to `sigaction()` in the `struct
-  //!     sigaction::sa_flags` field. `SA_SIGINFO` will be specified implicitly.
-  //! \param[out] old_actions The previous actions for the signals, replaced by
-  //!     the new action. May be `nullptr` if not needed. The same \a
-  //!     old_actions object may be used for calls to both this function and
-  //!     InstallTerminateHandlers().
-  //!
-  //! \return `true` on success. `false` on failure with a message logged.
-  //!
-  //! \warning This function may not be called from a signal handler because of
-  //!     its use of logging. See RestoreHandlerAndReraiseSignalOnReturn()
-  //!     instead.
-  static bool InstallCrashHandlers(Handler handler,
-                                   int flags,
-                                   OldActions* old_actions);
-
-  //! \brief Installs a new signal handler for all signals associated with
-  //!     termination.
-  //!
-  //! Signals associated with termination are those whose default dispositions
-  //! involve terminating the process without creating a core dump. The precise
-  //! set of signals involved varies between operating systems.
-  //!
-  //! A single signal may either be associated with termination or with a
-  //! crash (see InstalCrashHandlers()), and perhaps neither, but never both.
-  //!
-  //! \param[in] handler A signal-handling function to execute, used as the
-  //!     `struct sigaction::sa_sigaction` field when calling `sigaction()`.
-  //! \param[in] flags Flags to pass to `sigaction()` in the `struct
-  //!     sigaction::sa_flags` field. `SA_SIGINFO` will be specified implicitly.
-  //! \param[out] old_actions The previous actions for the signals, replaced by
-  //!     the new action. May be `nullptr` if not needed. The same \a
-  //!     old_actions object may be used for calls to both this function and
-  //!     InstallCrashHandlers().
-  //!
-  //! \return `true` on success. `false` on failure with a message logged.
-  //!
-  //! \warning This function may not be called from a signal handler because of
-  //!     its use of logging. See RestoreHandlerAndReraiseSignalOnReturn()
-  //!     instead.
-  static bool InstallTerminateHandlers(Handler handler,
-                                       int flags,
-                                       OldActions* old_actions);
-
-  //! \brief Determines whether a signal will be re-raised autonomously upon
-  //!     return from a signal handler.
-  //!
-  //! Certain signals, when generated synchronously in response to a hardware
-  //! fault, are unrecoverable. Upon return from the signal handler, the same
-  //! action that triggered the signal to be raised initially will be retried,
-  //! and unless the signal handler took action to mitigate this error, the same
-  //! signal will be re-raised. As an example, a CPU will not be able to read
-  //! unmapped memory (causing `SIGSEGV`), thus the signal will be re-raised
-  //! upon return from the signal handler unless the signal handler established
-  //! a memory mapping where required.
-  //!
-  //! It is important to distinguish between these synchronous signals generated
-  //! in response to a hardware fault and signals generated asynchronously or in
-  //! software. As an example, `SIGSEGV` will not re-raise autonomously if sent
-  //! by `kill()`.
-  //!
-  //! This function distinguishes between signals that can re-raise
-  //! autonomously, and for those that can, between instances of the signal that
-  //! were generated synchronously in response to a hardware fault and instances
-  //! that were generated by other means.
-  //!
-  //! \param[in] siginfo A pointer to a `siginfo_t` object received by a signal
-  //!     handler.
-  //!
-  //! \return `true` if the signal being handled will re-raise itself
-  //!     autonomously upon return from a signal handler. `false` if it will
-  //!     not. When this function returns `false`, a signal can still be
-  //!     re-raised upon return from a signal handler by calling `raise()` from
-  //!     within the signal handler.
-  //!
-  //! \note This function is safe to call from a signal handler.
-  static bool WillSignalReraiseAutonomously(const siginfo_t* siginfo);
-
-  //! \brief Restores a previous signal action and arranges to re-raise a signal
-  //!     on return from a signal handler.
-  //!
-  //! \param[in] siginfo A pointer to a `siginfo_t` object received by a signal
-  //!     handler.
-  //! \param[in] old_action The previous action for the signal, which will be
-  //!     re-established as the signal’s action. May be `nullptr`, which directs
-  //!     the default action for the signal to be used.
-  //!
-  //! If this function fails, it will immediately call `_exit()` and set an exit
-  //! status of `191`.
-  //!
-  //! \note This function may only be called from a signal handler.
-  static void RestoreHandlerAndReraiseSignalOnReturn(
-      const siginfo_t* siginfo,
-      const struct sigaction* old_action);
-
-  //! \brief Determines whether a signal is associated with a crash.
-  //!
-  //! Signals associated with crashes are those whose default dispositions
-  //! involve creating a core dump. The precise set of signals involved varies
-  //! between operating systems.
-  //!
-  //! \param[in] sig The signal to test.
-  //!
-  //! \return `true` if \a sig is associated with a crash. `false` otherwise.
-  //!
-  //! \note This function is safe to call from a signal handler.
-  static bool IsCrashSignal(int sig);
-
-  //! \brief Determines whether a signal is associated with termination.
-  //!
-  //! Signals associated with termination are those whose default dispositions
-  //! involve terminating the process without creating a core dump. The precise
-  //! set of signals involved varies between operating systems.
-  //!
-  //! \param[in] sig The signal to test.
-  //!
-  //! \return `true` if \a sig is associated with termination. `false`
-  //!     otherwise.
-  //!
-  //! \note This function is safe to call from a signal handler.
-  static bool IsTerminateSignal(int sig);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(Signals);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_SIGNALS_H_
diff --git a/Tools/Crashpad/include/util/posix/symbolic_constants_posix.h b/Tools/Crashpad/include/util/posix/symbolic_constants_posix.h
deleted file mode 100644
index 4fb4a358aa..0000000000
--- a/Tools/Crashpad/include/util/posix/symbolic_constants_posix.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_POSIX_SYMBOLIC_CONSTANTS_POSIX_H_
-#define CRASHPAD_UTIL_POSIX_SYMBOLIC_CONSTANTS_POSIX_H_
-
-#include <string>
-
-#include "base/strings/string_piece.h"
-#include "util/misc/symbolic_constants_common.h"
-
-namespace crashpad {
-
-//! \brief Converts a POSIX signal value to a textual representation.
-//!
-//! \param[in] signal The signal value to convert.
-//! \param[in] options Options affecting the conversion. ::kUseOr is ignored.
-//!     For ::kUnknownIsNumeric, the format is `"%d"`.
-//!
-//! \return The converted string.
-std::string SignalToString(int signal, SymbolicConstantToStringOptions options);
-
-//! \brief Converts a string to its corresponding POSIX signal value.
-//!
-//! \param[in] string The string to convert.
-//! \param[in] options Options affecting the conversion. ::kAllowOr is ignored.
-//! \param[out] signal The converted POSIX signal value.
-//!
-//! \return `true` on success, `false` if \a string could not be converted as
-//!     requested.
-bool StringToSignal(const base::StringPiece& string,
-                    StringToSymbolicConstantOptions options,
-                    int* signal);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_POSIX_SYMBOLIC_CONSTANTS_POSIX_H_
diff --git a/Tools/Crashpad/include/util/process/process_memory.h b/Tools/Crashpad/include/util/process/process_memory.h
deleted file mode 100644
index c046fc6e78..0000000000
--- a/Tools/Crashpad/include/util/process/process_memory.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_H_
-#define CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_H_
-
-#include <sys/types.h>
-
-#include <string>
-
-#include "util/misc/address_types.h"
-
-namespace crashpad {
-
-//! \brief Abstract base class for accessing the memory of another process.
-//!
-//! Implementations are platform-specific.
-class ProcessMemory {
- public:
-  //! \brief Copies memory from the target process into a caller-provided buffer
-  //!     in the current process.
-  //!
-  //! \param[in] address The address, in the target process' address space, of
-  //!     the memory region to copy.
-  //! \param[in] size The size, in bytes, of the memory region to copy.
-  //!     \a buffer must be at least this size.
-  //! \param[out] buffer The buffer into which the contents of the other
-  //!     process' memory will be copied.
-  //!
-  //! \return `true` on success, with \a buffer filled appropriately. `false` on
-  //!     failure, with a message logged.
-  virtual bool Read(VMAddress address, size_t size, void* buffer) const = 0;
-
-  //! \brief Reads a `NUL`-terminated C string from the target process into a
-  //!     string in the current process.
-  //!
-  //! The length of the string need not be known ahead of time. This method will
-  //! read contiguous memory until a `NUL` terminator is found.
-  //!
-  //! \param[in] address The address, in the target process’s address space, of
-  //!     the string to copy.
-  //! \param[out] string The string read from the other process.
-  //!
-  //! \return `true` on success, with \a string set appropriately. `false` on
-  //!     failure, with a message logged. Failures can occur, for example, when
-  //!     encountering unmapped or unreadable pages.
-  bool ReadCString(VMAddress address, std::string* string) const {
-    return ReadCStringInternal(address, false, 0, string);
-  }
-
-  //! \brief Reads a `NUL`-terminated C string from the target process into a
-  //!     string in the current process.
-  //!
-  //! \param[in] address The address, in the target process’s address space, of
-  //!     the string to copy.
-  //! \param[in] size The maximum number of bytes to read. The string is
-  //!     required to be `NUL`-terminated within this many bytes.
-  //! \param[out] string The string read from the other process.
-  //!
-  //! \return `true` on success, with \a string set appropriately. `false` on
-  //!     failure, with a message logged. Failures can occur, for example, when
-  //!     a `NUL` terminator is not found within \a size bytes, or when
-  //!     encountering unmapped or unreadable pages.
-  bool ReadCStringSizeLimited(VMAddress address,
-                              size_t size,
-                              std::string* string) const {
-    return ReadCStringInternal(address, true, size, string);
-  }
-
- protected:
-  ProcessMemory() = default;
-  ~ProcessMemory() = default;
-
- private:
-  //! \brief Reads a `NUL`-terminated C string from the target process into a
-  //!     string in the current process.
-  //!
-  //! \param[in] address The address, in the target process’s address space, of
-  //!     the string to copy.
-  //! \param[in] has_size If true, this method will read \a size bytes. If
-  //!     false, this method will ignore \a size and instead read contiguous
-  //!     memory until a `NUL` terminator is found.
-  //! \param[in] size If \a has_size is true, the maximum number of bytes to
-  //!     read. The string is required to be `NUL`-terminated within this many
-  //!     bytes. Ignored if \a has_size is false.
-  //! \param[out] string The string read from the other process.
-  //!
-  //! \return `true` on success, with \a string set appropriately. `false` on
-  //!     failure, with a message logged. Failures can occur, for example, when
-  //!     encountering unmapped or unreadable pages.
-  virtual bool ReadCStringInternal(VMAddress address,
-                                   bool has_size,
-                                   size_t size,
-                                   std::string* string) const = 0;
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_H_
diff --git a/Tools/Crashpad/include/util/process/process_memory_linux.h b/Tools/Crashpad/include/util/process/process_memory_linux.h
deleted file mode 100644
index e03e251f0f..0000000000
--- a/Tools/Crashpad/include/util/process/process_memory_linux.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_LINUX_H_
-#define CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_LINUX_H_
-
-#include <sys/types.h>
-
-#include <string>
-
-#include "base/files/scoped_file.h"
-#include "base/macros.h"
-#include "util/misc/address_types.h"
-#include "util/process/process_memory.h"
-
-namespace crashpad {
-
-//! \brief Accesses the memory of another Linux process.
-class ProcessMemoryLinux final : public ProcessMemory {
- public:
-  ProcessMemoryLinux();
-  ~ProcessMemoryLinux();
-
-  //! \brief Initializes this object to read the memory of a process whose ID
-  //!     is \a pid.
-  //!
-  //! This method must be called successfully prior to calling any other method
-  //! in this class.
-  //!
-  //! \param[in] pid The process ID of a target process.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool Initialize(pid_t pid);
-
-  bool Read(VMAddress address, size_t size, void* buffer) const override;
-
- private:
-  bool ReadCStringInternal(VMAddress address,
-                           bool has_size,
-                           size_t size,
-                           std::string* string) const override;
-
-  base::ScopedFD mem_fd_;
-  pid_t pid_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProcessMemoryLinux);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_LINUX_H_
diff --git a/Tools/Crashpad/include/util/process/process_memory_range.h b/Tools/Crashpad/include/util/process/process_memory_range.h
deleted file mode 100644
index 2b654ba1f3..0000000000
--- a/Tools/Crashpad/include/util/process/process_memory_range.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_RANGE_H_
-#define CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_RANGE_H_
-
-#include <sys/types.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "util/misc/address_types.h"
-#include "util/misc/initialization_state_dcheck.h"
-#include "util/numeric/checked_vm_address_range.h"
-#include "util/process/process_memory.h"
-
-namespace crashpad {
-
-//! \brief Provides range protected access to the memory of another process.
-class ProcessMemoryRange {
- public:
-  ProcessMemoryRange();
-  ~ProcessMemoryRange();
-
-  //! \brief Initializes this object.
-  //!
-  //! One of the Initialize methods must be successfully called on this object
-  //! before calling any other.
-  //!
-  //! \param[in] memory The memory reader to delegate to.
-  //! \param[in] is_64_bit Whether the target process is 64-bit.
-  //! \param[in] base The base address of the initial range.
-  //! \param[in] size The size of the initial range.
-  //! \return `true` on success. `false` on failure with a message logged.
-  bool Initialize(const ProcessMemory* memory,
-                  bool is_64_bit,
-                  VMAddress base,
-                  VMSize size);
-
-  //! \brief Initializes this object with the maximum range for the address
-  //!     space.
-  //!
-  //! One of the Initialize methods must be successfully called on this object
-  //! before calling any other.
-  //!
-  //! \param[in] memory The memory reader to delegate to.
-  //! \param[in] is_64_bit Whether the target process is 64-bit.
-  bool Initialize(const ProcessMemory* memory, bool is_64_bit);
-
-  //! \brief Initializes this object from an existing memory range.
-  //!
-  //! One of the Initialize methods must be successfully called on this object
-  //! before calling any other.
-  //!
-  //! \param[in] other The memory range object to initialize from.
-  //! \return `true` on success. `false` on failure with a message logged.
-  bool Initialize(const ProcessMemoryRange& other);
-
-  //! \brief Returns whether the range is part of a 64-bit address space.
-  bool Is64Bit() const { return range_.Is64Bit(); }
-
-  //! \brief Returns the base address of the range.
-  VMAddress Base() const { return range_.Base(); }
-
-  //! \brief Returns the size of the range.
-  VMSize Size() const { return range_.Size(); }
-
-  //! \brief Shrinks the range to the new base and size.
-  //!
-  //! The new range must be contained within the existing range for this object.
-  //!
-  //! \param[in] base The new base of the range.
-  //! \param[in] size The new size of the range.
-  //! \return `true` on success. `false` on failure with a message logged.
-  bool RestrictRange(VMAddress base, VMSize size);
-
-  //! \brief Copies memory from the target process into a caller-provided buffer
-  //!     in the current process.
-  //!
-  //! \param[in] address The address, in the target process' address space, of
-  //!     the memory region to copy.
-  //! \param[in] size The size, in bytes, of the memory region to copy.
-  //!     \a buffer must be at least this size.
-  //! \param[out] buffer The buffer into which the contents of the other
-  //!     process' memory will be copied.
-  //!
-  //! \return `true` on success, with \a buffer filled appropriately. `false` on
-  //!     failure, with a message logged.
-  bool Read(VMAddress address, size_t size, void* buffer) const;
-
-  //! \brief Reads a `NUL`-terminated C string from the target process into a
-  //!     string in the current process.
-  //!
-  //! \param[in] address The address, in the target process’s address space, of
-  //!     the string to copy.
-  //! \param[in] size The maximum number of bytes to read. The string is
-  //!     required to be `NUL`-terminated within this many bytes.
-  //! \param[out] string The string read from the other process.
-  //!
-  //! \return `true` on success, with \a string set appropriately. `false` on
-  //!     failure, with a message logged. Failures can occur, for example, when
-  //!     a `NUL` terminator is not found within \a size bytes, or when
-  //!     encountering unmapped or unreadable pages.
-  bool ReadCStringSizeLimited(VMAddress address,
-                              size_t size,
-                              std::string* string) const;
-
- private:
-  const ProcessMemory* memory_;  // weak
-  CheckedVMAddressRange range_;
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProcessMemoryRange);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_RANGE_H_
diff --git a/Tools/Crashpad/include/util/stdlib/aligned_allocator.h b/Tools/Crashpad/include/util/stdlib/aligned_allocator.h
deleted file mode 100644
index 97be27a271..0000000000
--- a/Tools/Crashpad/include/util/stdlib/aligned_allocator.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STDLIB_ALIGNED_ALLOCATOR_H_
-#define CRASHPAD_UTIL_STDLIB_ALIGNED_ALLOCATOR_H_
-
-#include <stddef.h>
-
-#include <limits>
-#include <memory>
-#include <new>
-#include <utility>
-#include <vector>
-
-namespace crashpad {
-
-//! \brief Allocates memory with the specified alignment constraint.
-//!
-//! This function wraps `posix_memalign()` or `_aligned_malloc()`. Memory
-//! allocated by this function must be released by AlignFree().
-void* AlignedAllocate(size_t alignment, size_t size);
-
-//! \brief Frees memory allocated by AlignedAllocate().
-//!
-//! This function wraps `free()` or `_aligned_free()`.
-void AlignedFree(void* pointer);
-
-//! \brief A standard allocator that aligns its allocations as requested,
-//!     suitable for use as an allocator in standard containers.
-//!
-//! This is similar to `std::allocator<T>`, with the addition of an alignment
-//! guarantee. \a Alignment must be a power of 2. If \a Alignment is not
-//! specified, the default alignment for type \a T is used.
-template <class T, size_t Alignment = alignof(T)>
-struct AlignedAllocator {
- public:
-  using value_type = T;
-  using pointer = T*;
-  using const_pointer = const T*;
-  using reference = T&;
-  using const_reference = const T&;
-  using size_type = size_t;
-  using difference_type = ptrdiff_t;
-
-  template <class U>
-  struct rebind {
-    using other = AlignedAllocator<U, Alignment>;
-  };
-
-  AlignedAllocator() noexcept {}
-  AlignedAllocator(const AlignedAllocator& other) noexcept {}
-
-  template <typename U>
-  AlignedAllocator(const AlignedAllocator<U, Alignment>& other) noexcept {}
-
-  ~AlignedAllocator() {}
-
-  pointer address(reference x) const noexcept { return &x; }
-  const_pointer address(const_reference x) const noexcept { return &x; }
-
-  pointer allocate(size_type n, std::allocator<void>::const_pointer hint = 0) {
-    return reinterpret_cast<pointer>(
-        AlignedAllocate(Alignment, sizeof(value_type) * n));
-  }
-
-  void deallocate(pointer p, size_type n) { AlignedFree(p); }
-
-  size_type max_size() const noexcept {
-    return std::numeric_limits<size_type>::max() / sizeof(value_type);
-  }
-
-  template <class U, class... Args>
-  void construct(U* p, Args&&... args) {
-    new (reinterpret_cast<void*>(p)) U(std::forward<Args>(args)...);
-  }
-
-  template <class U>
-  void destroy(U* p) {
-    p->~U();
-  }
-};
-
-template <class T1, class T2, size_t Alignment>
-bool operator==(const AlignedAllocator<T1, Alignment>& lhs,
-                const AlignedAllocator<T2, Alignment>& rhs) noexcept {
-  return true;
-}
-
-template <class T1, class T2, size_t Alignment>
-bool operator!=(const AlignedAllocator<T1, Alignment>& lhs,
-                const AlignedAllocator<T2, Alignment>& rhs) noexcept {
-  return false;
-}
-
-//! \brief A `std::vector` using AlignedAllocator.
-//!
-//! This is similar to `std::vector<T>`, with the addition of an alignment
-//! guarantee. \a Alignment must be a power of 2. If \a Alignment is not
-//! specified, the default alignment for type \a T is used.
-template <typename T, size_t Alignment = alignof(T)>
-using AlignedVector = std::vector<T, AlignedAllocator<T, Alignment>>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_STDLIB_ALIGNED_ALLOCATOR_H_
diff --git a/Tools/Crashpad/include/util/stdlib/map_insert.h b/Tools/Crashpad/include/util/stdlib/map_insert.h
deleted file mode 100644
index d2c3b84211..0000000000
--- a/Tools/Crashpad/include/util/stdlib/map_insert.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STDLIB_MAP_INSERT_H_
-#define CRASHPAD_UTIL_STDLIB_MAP_INSERT_H_
-
-#include <map>
-#include <utility>
-
-namespace crashpad {
-
-//! \brief Inserts a mapping from \a key to \a value into \a map, or replaces
-//!     an existing mapping so that \a key maps to \a value.
-//!
-//! This behaves similarly to `std::map<>::%insert_or_assign()` proposed for
-//! C++17, except that the \a old_value parameter is added.
-//!
-//! \param[in,out] map The map to operate on.
-//! \param[in] key The key that should be mapped to \a value.
-//! \param[in] value The value that \a key should map to.
-//! \param[out] old_value If \a key was previously present in \a map, this will
-//!     be set to its previous value. This parameter is optional and may be
-//!     `nullptr` if this information is not required.
-//!
-//! \return `false` if \a key was previously present in \a map. If \a old_value
-//!     is not `nullptr`, it will be set to the previous value. `true` if \a
-//!     key was not present in the map and was inserted.
-template <typename T>
-bool MapInsertOrReplace(T* map,
-                        const typename T::key_type& key,
-                        const typename T::mapped_type& value,
-                        typename T::mapped_type* old_value) {
-  const auto result = map->insert(std::make_pair(key, value));
-  if (!result.second) {
-    if (old_value) {
-      *old_value = result.first->second;
-    }
-    result.first->second = value;
-  }
-  return result.second;
-}
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_STDLIB_MAP_INSERT_H_
diff --git a/Tools/Crashpad/include/util/stdlib/objc.h b/Tools/Crashpad/include/util/stdlib/objc.h
deleted file mode 100644
index faaa453869..0000000000
--- a/Tools/Crashpad/include/util/stdlib/objc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STDLIB_OBJC_H_
-#define CRASHPAD_UTIL_STDLIB_OBJC_H_
-
-#include <AvailabilityMacros.h>
-#include <objc/objc.h>
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
-
-// In order for the @NO and @YES literals to work, NO and YES must be defined as
-// __objc_no and __objc_yes. See
-// https://clang.llvm.org/docs/ObjectiveCLiterals.html.
-//
-// NO and YES are defined properly for this purpose in the 10.8 SDK, but not in
-// earlier SDKs. Because this code is never expected to be compiled with a
-// compiler that does not understand the modern forms of these boolean
-// constants, but it may be built with an older SDK, replace the outdated SDK
-// definitions unconditionally.
-#undef NO
-#undef YES
-#define NO __objc_no
-#define YES __objc_yes
-
-#endif
-
-#endif  // CRASHPAD_UTIL_STDLIB_OBJC_H_
diff --git a/Tools/Crashpad/include/util/stdlib/string_number_conversion.h b/Tools/Crashpad/include/util/stdlib/string_number_conversion.h
deleted file mode 100644
index b7bdcce86e..0000000000
--- a/Tools/Crashpad/include/util/stdlib/string_number_conversion.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STDLIB_STRING_NUMBER_CONVERSION_H_
-#define CRASHPAD_UTIL_STDLIB_STRING_NUMBER_CONVERSION_H_
-
-#include "base/strings/string_piece.h"
-
-namespace crashpad {
-
-// Convert between strings and numbers.
-//
-// These functions will only set *number if a perfect conversion can be
-// performed. A perfect conversion contains no leading or trailing characters
-// (including whitespace) other than the number to convert, and does not
-// overflow the targeted data type. If a perfect conversion is possible, *number
-// is set and these functions return true. Otherwise, they return false.
-//
-// The interface in base/strings/string_number_conversions.h doesn’t allow
-// arbitrary bases based on whether the string begins with prefixes such as "0x"
-// as strtol does with base = 0. The functions here are implemented on the
-// strtol family with base = 0, and thus do accept such input.
-
-//! \{
-//! \brief Convert a string to a number.
-//!
-//! A conversion will only be performed if it can be done perfectly: if \a
-//! string contains no leading or trailing characters (including whitespace)
-//! other than the number to convert, and does not overflow the targeted data
-//! type.
-//!
-//! \param[in] string The string to convert to a number. As in `strtol()` with a
-//!     `base` parameter of `0`, the string is treated as decimal unless it
-//!     begins with a `"0x"` or `"0X"` prefix, in which case it is treated as
-//!     hexadecimal, or a `"0"` prefix, in which case it is treated as octal.
-//! \param[out] number The converted number. This will only be set if a perfect
-//!     conversion can be performed.
-//!
-//! \return `true` if a perfect conversion could be performed, with \a number
-//!     set appropriately. `false` if a perfect conversion was not possible.
-//!
-//! \note The interface in `base/strings/string_number_conversions.h` doesn’t
-//!     allow arbitrary bases based on whether the string begins with a prefix
-//!     indicating its base. The functions here are provided for situations
-//!     where such prefix recognition is desirable.
-bool StringToNumber(const base::StringPiece& string, int* number);
-bool StringToNumber(const base::StringPiece& string, unsigned int* number);
-bool StringToNumber(const base::StringPiece& string, int64_t* number);
-bool StringToNumber(const base::StringPiece& string, uint64_t* number);
-//! \}
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_STDLIB_STRING_NUMBER_CONVERSION_H_
diff --git a/Tools/Crashpad/include/util/stdlib/strlcpy.h b/Tools/Crashpad/include/util/stdlib/strlcpy.h
deleted file mode 100644
index 20e1a71822..0000000000
--- a/Tools/Crashpad/include/util/stdlib/strlcpy.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STDLIB_STRLCPY_H_
-#define CRASHPAD_UTIL_STDLIB_STRLCPY_H_
-
-#include <sys/types.h>
-
-#include "base/strings/string16.h"
-
-namespace crashpad {
-
-//! \brief Copy a `NUL`-terminated char16-based string to a fixed-size buffer.
-//!
-//! This function behaves identically to `strlcpy()`, but it operates on char16
-//! data instead of `char` data. It copies the `NUL`-terminated string in the
-//! buffer beginning at \a source to the buffer of size \a length at \a
-//! destination, ensuring that the destination buffer is `NUL`-terminated. No
-//! data will be written outside of the \a destination buffer, but if \a length
-//! is smaller than the length of the string at \a source, the string will be
-//! truncated.
-//!
-//! \param[out] destination A pointer to a buffer of at least size \a length
-//!     char16 units (not bytes). The string will be copied to this buffer,
-//!     possibly with truncation, and `NUL`-terminated. Nothing will be written
-//!     following the `NUL` terminator.
-//! \param[in] source A pointer to a `NUL`-terminated string of char16 data. The
-//!     `NUL` terminator must be a `NUL` value in a char16 unit, not just a
-//!     single `NUL` byte.
-//! \param[in] length The length of the \a destination buffer in char16 units,
-//!     not bytes. A maximum of \a `length - 1` char16 units from \a source will
-//!     be copied to \a destination.
-//!
-//! \return The length of the \a source string in char16 units, not including
-//!     its `NUL` terminator. When truncation occurs, the return value will be
-//!     equal to or greater than than the \a length parameter.
-size_t c16lcpy(base::char16* destination,
-               const base::char16* source,
-               size_t length);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_STDLIB_STRLCPY_H_
diff --git a/Tools/Crashpad/include/util/stdlib/strnlen.h b/Tools/Crashpad/include/util/stdlib/strnlen.h
deleted file mode 100644
index e85d8c7e45..0000000000
--- a/Tools/Crashpad/include/util/stdlib/strnlen.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STDLIB_STRNLEN_H_
-#define CRASHPAD_UTIL_STDLIB_STRNLEN_H_
-
-#include <string.h>
-#include <sys/types.h>
-
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-#include <AvailabilityMacros.h>
-#endif
-
-namespace crashpad {
-
-//! \brief Returns the length of a string, not to exceed a maximum.
-//!
-//! \param[in] string The string whose length is to be calculated.
-//! \param[in] max_length The maximum length to return.
-//!
-//! \return The length of \a string, determined as the index of the first `NUL`
-//!     byte found, not exceeding \a max_length.
-//!
-//! \note This function is provided because it was introduced in POSIX.1-2008,
-//!     and not all systems’ standard libraries provide an implementation.
-size_t strnlen(const char* string, size_t max_length);
-
-#if !defined(OS_MACOSX) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
-inline size_t strnlen(const char* string, size_t max_length) {
-  return ::strnlen(string, max_length);
-}
-#endif
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_STDLIB_STRNLEN_H_
diff --git a/Tools/Crashpad/include/util/stdlib/thread_safe_vector.h b/Tools/Crashpad/include/util/stdlib/thread_safe_vector.h
deleted file mode 100644
index f97024d0a8..0000000000
--- a/Tools/Crashpad/include/util/stdlib/thread_safe_vector.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STDLIB_THREAD_SAFE_VECTOR_H_
-#define CRASHPAD_UTIL_STDLIB_THREAD_SAFE_VECTOR_H_
-
-#include <utility>
-#include <vector>
-
-#include "base/macros.h"
-#include "base/synchronization/lock.h"
-
-namespace crashpad {
-
-//! \brief A wrapper for a `std::vector<>` that can be accessed safely from
-//!    multiple threads.
-//!
-//! This is not a drop-in replacement for `std::vector<>`. Only necessary
-//! operations are defined.
-template <typename T>
-class ThreadSafeVector {
- public:
-  ThreadSafeVector() : vector_(), lock_() {}
-  ~ThreadSafeVector() {}
-
-  //! \brief Wraps `std::vector<>::%push_back()`.
-  void PushBack(const T& element) {
-    base::AutoLock lock_owner(lock_);
-    vector_.push_back(element);
-  }
-
-  //! \brief Atomically clears the underlying vector and returns its previous
-  //!     contents.
-  std::vector<T> Drain() {
-    std::vector<T> contents;
-    {
-      base::AutoLock lock_owner(lock_);
-      std::swap(vector_, contents);
-    }
-    return contents;
-  }
-
- private:
-  std::vector<T> vector_;
-  base::Lock lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThreadSafeVector);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_STDLIB_THREAD_SAFE_VECTOR_H_
diff --git a/Tools/Crashpad/include/util/string/split_string.h b/Tools/Crashpad/include/util/string/split_string.h
deleted file mode 100644
index af4f953c7a..0000000000
--- a/Tools/Crashpad/include/util/string/split_string.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_STRING_SPLIT_STRING_H_
-#define CRASHPAD_UTIL_STRING_SPLIT_STRING_H_
-
-#include <string>
-#include <vector>
-
-namespace crashpad {
-
-//! \brief Splits a string into two parts at the first delimiter found.
-//!
-//! \param[in] string The string to split.
-//! \param[in] delimiter The delimiter to split at.
-//! \param[out] left The portion of \a string up to, but not including, the
-//!     first \a delimiter character.
-//! \param[out] right The portion of \a string after the first \a delimiter
-//!     character.
-//!
-//! \return `true` if \a string was split successfully. `false` if \a string
-//!     did not contain a \a delimiter character or began with a \a delimiter
-//!     character.
-bool SplitStringFirst(const std::string& string,
-                      char delimiter,
-                      std::string* left,
-                      std::string* right);
-
-//! \brief Splits a string into multiple parts on the given delimiter.
-//!
-//! \param[in] string The string to split.
-//! \param[in] delimiter The delimiter to split at.
-//!
-//! \return The individual parts of the string.
-std::vector<std::string> SplitString(const std::string& string, char delimiter);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_STRING_SPLIT_STRING_H_
diff --git a/Tools/Crashpad/include/util/synchronization/semaphore.h b/Tools/Crashpad/include/util/synchronization/semaphore.h
deleted file mode 100644
index 4947963994..0000000000
--- a/Tools/Crashpad/include/util/synchronization/semaphore.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_SYNCHRONIZATION_SEMAPHORE_H_
-#define CRASHPAD_UTIL_SYNCHRONIZATION_SEMAPHORE_H_
-
-#include <limits>
-
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-#include <dispatch/dispatch.h>
-#elif defined(OS_WIN)
-#include <windows.h>
-#else
-#include <semaphore.h>
-#endif
-
-namespace crashpad {
-
-//! \brief An anonymous in-process counting sempahore.
-class Semaphore {
- public:
-  //! \brief A TimedWait() argument that causes an indefinite wait.
-  static constexpr double kIndefiniteWait =
-      std::numeric_limits<double>::infinity();
-
-  //! \brief Initializes the semaphore.
-  //!
-  //! \param[in] value The initial value of the semaphore.
-  //!
-  //! If the semaphore cannot be created, execution is terminated.
-  explicit Semaphore(int value);
-
-  ~Semaphore();
-
-  //! \brief Performs the wait (or “procure”) operation on the semaphore.
-  //!
-  //! Atomically decrements the value of the semaphore by 1. If the new value is
-  //! negative, this function blocks and will not return until the semaphore’s
-  //! value is incremented to 0 by Signal().
-  //!
-  //! \sa TimedWait()
-  void Wait();
-
-  //! \brief Performs a timed wait (or “procure”) operation on the semaphore.
-  //!
-  //! \param[in] seconds The maximum number of seconds to wait for the operation
-  //!     to complete. If \a seconds is #kIndefiniteWait, this method behaves as
-  //!     Wait(), and will not time out.
-  //!
-  //! \return `false` if the wait timed out, `true` otherwise.
-  //!
-  //! This method is simlar to Wait(), except that the amount of time that it
-  //! blocks is limited.
-  bool TimedWait(double seconds);
-
-  //! \brief Performs the signal (or “post”) operation on the semaphore.
-  //!
-  //! Atomically increments the value of the semaphore by 1. If the new value is
-  //! 0, a caller blocked in Wait() will be awakened.
-  void Signal();
-
- private:
-#if defined(OS_MACOSX)
-  dispatch_semaphore_t semaphore_;
-#elif defined(OS_WIN)
-  HANDLE semaphore_;
-#else
-  sem_t semaphore_;
-#endif
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_SYNCHRONIZATION_SEMAPHORE_H_
diff --git a/Tools/Crashpad/include/util/thread/thread.h b/Tools/Crashpad/include/util/thread/thread.h
deleted file mode 100644
index 595d308e56..0000000000
--- a/Tools/Crashpad/include/util/thread/thread.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_THREAD_THREAD_H_
-#define CRASHPAD_UTIL_THREAD_THREAD_H_
-
-#include "base/macros.h"
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-#include <pthread.h>
-#elif defined(OS_WIN)
-#include <windows.h>
-#endif  // OS_POSIX
-
-namespace crashpad {
-
-//! \brief Basic thread abstraction. Users should derive from this
-//!     class and implement ThreadMain().
-class Thread {
- public:
-  Thread();
-  virtual ~Thread();
-
-  //! \brief Create a platform thread, and run ThreadMain() on that thread. Must
-  //!     be paired with a call to Join().
-  void Start();
-
-  //! \brief Block until ThreadMain() exits. This may be called from any thread.
-  //!     Must paired with a call to Start().
-  void Join();
-
- private:
-  //! \brief The thread entry point to be implemented by the subclass.
-  virtual void ThreadMain() = 0;
-
-  static
-#if defined(OS_POSIX)
-      void*
-#elif defined(OS_WIN)
-      DWORD WINAPI
-#endif  // OS_POSIX
-      ThreadEntryThunk(void* argument);
-
-#if defined(OS_POSIX)
-  pthread_t platform_thread_;
-#elif defined(OS_WIN)
-  HANDLE platform_thread_;
-#endif
-
-  DISALLOW_COPY_AND_ASSIGN(Thread);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_THREAD_THREAD_H_
diff --git a/Tools/Crashpad/include/util/thread/thread_log_messages.h b/Tools/Crashpad/include/util/thread/thread_log_messages.h
deleted file mode 100644
index e8eef358b6..0000000000
--- a/Tools/Crashpad/include/util/thread/thread_log_messages.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_THREAD_THREAD_LOG_MESSAGES_H_
-#define CRASHPAD_UTIL_THREAD_THREAD_LOG_MESSAGES_H_
-
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Captures log messages produced on the current thread during an
-//!     object’s lifetime.
-//!
-//! At most one object of this class type may exist on a single thread at a
-//! time. When using this class, no other part of the program may call
-//! `logging::SetLogMessageHandler()` at any time.
-class ThreadLogMessages {
- public:
-  ThreadLogMessages();
-  ~ThreadLogMessages();
-
-  //! \return The log messages collected on the thread that this object was
-  //!     created on since the time it was created.
-  const std::vector<std::string>& log_messages() const { return log_messages_; }
-
- private:
-  std::vector<std::string> log_messages_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThreadLogMessages);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_THREAD_THREAD_LOG_MESSAGES_H_
diff --git a/Tools/Crashpad/include/util/thread/worker_thread.h b/Tools/Crashpad/include/util/thread/worker_thread.h
deleted file mode 100644
index 97fb6ecde0..0000000000
--- a/Tools/Crashpad/include/util/thread/worker_thread.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_THREAD_WORKER_THREAD_H_
-#define CRASHPAD_UTIL_THREAD_WORKER_THREAD_H_
-
-#include <memory>
-
-#include "base/macros.h"
-#include "util/synchronization/semaphore.h"
-
-namespace crashpad {
-
-namespace internal {
-class WorkerThreadImpl;
-}  // namespace internal
-
-//! \brief A WorkerThread executes its Delegate's DoWork method repeatedly on a
-//!     dedicated thread at a set time interval.
-class WorkerThread {
- public:
-  //! \brief An interface for doing work on a WorkerThread.
-  class Delegate {
-   public:
-    //! \brief The work function executed by the WorkerThread every work
-    //!     interval.
-    virtual void DoWork(const WorkerThread* thread) = 0;
-
-   protected:
-    virtual ~Delegate() {}
-  };
-
-  //! \brief A delay or interval argument that causes an indefinite wait.
-  static constexpr double kIndefiniteWait = Semaphore::kIndefiniteWait;
-
-  //! \brief Creates a new WorkerThread that is not yet running.
-  //!
-  //! \param[in] work_interval The time interval in seconds at which the \a
-  //!     delegate runs. The interval counts from the completion of
-  //!     Delegate::DoWork() to the next invocation. This can be
-  //!     #kIndefiniteWait if work should only be done when DoWorkNow() is
-  //!     called.
-  //! \param[in] delegate The work delegate to invoke every interval.
-  WorkerThread(double work_interval, Delegate* delegate);
-  ~WorkerThread();
-
-  //! \brief Starts the worker thread.
-  //!
-  //! This may not be called if the thread is_running().
-  //!
-  //! \param[in] initial_work_delay The amount of time in seconds to wait
-  //!     before invoking the \a delegate for the first time. Pass `0` for
-  //!     no delay. This can be #kIndefiniteWait if work should not be done
-  //!     until DoWorkNow() is called.
-  void Start(double initial_work_delay);
-
-  //! \brief Stops the worker thread from running.
-  //!
-  //! This may only be called if the thread is_running().
-  //!
-  //! If the work function is currently executing, this will not interrupt it.
-  //! This method stops any future work from occurring. This method is safe
-  //! to call from any thread with the exception of the worker thread itself,
-  //! as this joins the thread.
-  void Stop();
-
-  //! \brief Interrupts a \a work_interval to execute the work function
-  //!     immediately. This invokes Delegate::DoWork() on the thread, without
-  //!     waiting for the current \a work_interval to expire. After the
-  //!     delegate is invoked, the WorkerThread will start waiting for a new
-  //!     \a work_interval.
-  void DoWorkNow();
-
-  //! \return `true` if the thread is running, `false` if it is not.
-  bool is_running() const { return running_; }
-
- private:
-  friend class internal::WorkerThreadImpl;
-
-  double work_interval_;
-  Delegate* delegate_;  // weak
-  std::unique_ptr<internal::WorkerThreadImpl> impl_;
-  bool running_;
-
-  DISALLOW_COPY_AND_ASSIGN(WorkerThread);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_THREAD_WORKER_THREAD_H_
diff --git a/Tools/Crashpad/include/util/win/address_types.h b/Tools/Crashpad/include/util/win/address_types.h
deleted file mode 100644
index f26a57eff5..0000000000
--- a/Tools/Crashpad/include/util/win/address_types.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_ADDRESS_TYPES_H_
-#define CRASHPAD_UTIL_WIN_ADDRESS_TYPES_H_
-
-#include <stdint.h>
-
-namespace crashpad {
-
-//! \brief Type used to represent an address in a process, potentially across
-//!     bitness.
-using WinVMAddress = uint64_t;
-
-//! \brief Type used to represent the size of a memory range (with a
-//!     WinVMAddress), potentially across bitness.
-using WinVMSize = uint64_t;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_ADDRESS_TYPES_H_
diff --git a/Tools/Crashpad/include/util/win/capture_context.h b/Tools/Crashpad/include/util/win/capture_context.h
deleted file mode 100644
index 2f501f8030..0000000000
--- a/Tools/Crashpad/include/util/win/capture_context.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_CAPTURE_CONTEXT_WIN_H_
-#define CRASHPAD_CLIENT_CAPTURE_CONTEXT_WIN_H_
-
-#include <windows.h>
-
-namespace crashpad {
-
-//! \brief Saves the CPU context.
-//!
-//! The CPU context will be captured as accurately and completely as possible,
-//! containing an atomic snapshot at the point of this function’s return. This
-//! function does not modify any registers.
-//!
-//! This function captures all integer registers as well as the floating-point
-//! and vector (SSE) state. It does not capture debug registers, which are
-//! inaccessible by user code.
-//!
-//! This function is a replacement for `RtlCaptureContext()`, which contains
-//! bugs and limitations. On 32-bit x86, `RtlCaptureContext()` requires that
-//! `ebp` be used as a frame pointer, and returns `ebp`, `esp`, and `eip` out of
-//! sync with the other registers. Both the 32-bit x86 and 64-bit x86_64
-//! versions of `RtlCaptureContext()` capture only the state of the integer
-//! registers, ignoring floating-point and vector state.
-//!
-//! \param[out] context The structure to store the context in.
-//!
-//! \note On x86_64, the value for `rcx` will be populated with the address of
-//!     this function’s argument, as mandated by the ABI.
-void CaptureContext(CONTEXT* context);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_CAPTURE_CONTEXT_WIN_H_
diff --git a/Tools/Crashpad/include/util/win/checked_win_address_range.h b/Tools/Crashpad/include/util/win/checked_win_address_range.h
deleted file mode 100644
index e86c7b7b0a..0000000000
--- a/Tools/Crashpad/include/util/win/checked_win_address_range.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_CHECKED_WIN_ADDRESS_RANGE_H_
-#define CRASHPAD_UTIL_WIN_CHECKED_WIN_ADDRESS_RANGE_H_
-
-#include "util/numeric/checked_address_range.h"
-#include "util/win/address_types.h"
-
-namespace crashpad {
-
-//! \brief Ensures that a range, composed of a base and a size, does not
-//!     overflow the pointer type of the process it describes a range in.
-//!
-//! This class checks bases of type WinVMAddress and sizes of type WinVMSize
-//! against a process whose pointer type is either 32 or 64 bits wide.
-//!
-//! Aside from varying the overall range on the basis of a process' pointer type
-//! width, this class functions very similarly to CheckedRange.
-using CheckedWinAddressRange =
-    internal::CheckedAddressRangeGeneric<WinVMAddress, WinVMSize>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_CHECKED_WIN_ADDRESS_RANGE_H_
diff --git a/Tools/Crashpad/include/util/win/command_line.h b/Tools/Crashpad/include/util/win/command_line.h
deleted file mode 100644
index c12d6539a4..0000000000
--- a/Tools/Crashpad/include/util/win/command_line.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_COMMAND_LINE_H_
-#define CRASHPAD_UTIL_WIN_COMMAND_LINE_H_
-
-#include <string>
-
-namespace crashpad {
-
-//! \brief Utility function for building escaped command lines.
-//!
-//! This builds a command line so that individual arguments can be reliably
-//! decoded by `CommandLineToArgvW()`.
-//!
-//! \a argument is appended to \a command_line. If necessary, it will be placed
-//! in quotation marks and escaped properly. If \a command_line is initially
-//! non-empty, a space will precede \a argument.
-//!
-//! \param[in] argument The argument to append to \a command_line.
-//! \param[in,out] command_line The command line being constructed.
-void AppendCommandLineArgument(const std::wstring& argument,
-                               std::wstring* command_line);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_COMMAND_LINE_H_
diff --git a/Tools/Crashpad/include/util/win/critical_section_with_debug_info.h b/Tools/Crashpad/include/util/win/critical_section_with_debug_info.h
deleted file mode 100644
index 1271685755..0000000000
--- a/Tools/Crashpad/include/util/win/critical_section_with_debug_info.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_CRITICAL_SECTION_WITH_DEBUG_INFO_H_
-#define CRASHPAD_UTIL_WIN_CRITICAL_SECTION_WITH_DEBUG_INFO_H_
-
-#include <windows.h>
-
-namespace crashpad {
-
-//! \brief Equivalent to `InitializeCritialSection()`, but attempts to allocate
-//!     with a valid `.DebugInfo` field on versions of Windows where it's
-//!     possible to do so.
-//!
-//! \return `true` on success, or `false` on failure with a message logged.
-//!     Success means that the critical section was successfully initialized,
-//!     but it does not necessarily have a valid `.DebugInfo` field.
-bool InitializeCriticalSectionWithDebugInfoIfPossible(
-    CRITICAL_SECTION* critical_section);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_CRITICAL_SECTION_WITH_DEBUG_INFO_H_
diff --git a/Tools/Crashpad/include/util/win/exception_handler_server.h b/Tools/Crashpad/include/util/win/exception_handler_server.h
deleted file mode 100644
index 994cdba47f..0000000000
--- a/Tools/Crashpad/include/util/win/exception_handler_server.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_EXCEPTION_HANDLER_SERVER_H_
-#define CRASHPAD_UTIL_WIN_EXCEPTION_HANDLER_SERVER_H_
-
-#include <set>
-#include <string>
-
-#include "base/macros.h"
-#include "base/synchronization/lock.h"
-#include "util/file/file_io.h"
-#include "util/win/address_types.h"
-#include "util/win/initial_client_data.h"
-#include "util/win/scoped_handle.h"
-
-namespace crashpad {
-
-namespace internal {
-class PipeServiceContext;
-class ClientData;
-}  // namespace internal
-
-//! \brief Runs the main exception-handling server in Crashpad's handler
-//!     process.
-class ExceptionHandlerServer {
- public:
-  class Delegate {
-   public:
-    //! \brief Called when the server has created the named pipe connection
-    //!     points and is ready to service requests.
-    virtual void ExceptionHandlerServerStarted() = 0;
-
-    //! \brief Called when the client has signalled that it has encountered an
-    //!     exception and so wants a crash dump to be taken.
-    //!
-    //! \param[in] process A handle to the client process. Ownership of the
-    //!     lifetime of this handle is not passed to the delegate.
-    //! \param[in] exception_information_address The address in the client's
-    //!     address space of an ExceptionInformation structure.
-    //! \param[in] debug_critical_section_address The address in the client's
-    //!     address space of a `CRITICAL_SECTION` allocated with a valid
-    //!     `.DebugInfo` field, or `0` if unavailable.
-    //! \return The exit code that should be used when terminating the client
-    //!     process.
-    virtual unsigned int ExceptionHandlerServerException(
-        HANDLE process,
-        WinVMAddress exception_information_address,
-        WinVMAddress debug_critical_section_address) = 0;
-
-   protected:
-    ~Delegate();
-  };
-
-  //! \brief Constructs the exception handling server.
-  //!
-  //! \param[in] persistent `true` if Run() should not return until Stop() is
-  //!     called. If `false`, Run() will return when all clients have exited,
-  //!     although Run() will always wait for the first client to connect.
-  explicit ExceptionHandlerServer(bool persistent);
-
-  ~ExceptionHandlerServer();
-
-  //! \brief Sets the pipe name to listen for client registrations on.
-  //!
-  //! This method, or InitializeWithInheritedDataForInitialClient(), must be
-  //! called before Run().
-  //!
-  //! \param[in] pipe_name The name of the pipe to listen on. Must be of the
-  //!     form "\\.\pipe\<some_name>".
-  void SetPipeName(const std::wstring& pipe_name);
-
-  //! \brief Sets the pipe to listen for client registrations on, providing
-  //!     the first precreated instance.
-  //!
-  //! This method, or SetPipeName(), must be called before Run(). All of these
-  //! parameters are generally created in a parent process that launches the
-  //! handler. For more details see the Windows implementation of
-  //! CrashpadClient.
-  //!
-  //! \sa CrashpadClient
-  //! \sa RegistrationRequest
-  //!
-  //! \param[in] initial_client_data The handles and addresses of data inherited
-  //!     from a parent process needed to initialize and register the first
-  //!     client. Ownership of these handles is taken.
-  //! \param[in] delegate The interface to which the exceptions are delegated
-  //!     when they are caught in Run(). Ownership is not transferred.
-  void InitializeWithInheritedDataForInitialClient(
-      const InitialClientData& initial_client_data,
-      Delegate* delegate);
-
-  //! \brief Runs the exception-handling server.
-  //!
-  //! \param[in] delegate The interface to which the exceptions are delegated
-  //!     when they are caught in Run(). Ownership is not transferred.
-  void Run(Delegate* delegate);
-
-  //! \brief Stops the exception-handling server. Returns immediately. The
-  //!     object must not be destroyed until Run() returns.
-  void Stop();
-
-  //! \brief The number of server-side pipe instances that the exception handler
-  //!     server creates to listen for connections from clients.
-  static const size_t kPipeInstances = 2;
-
- private:
-  static bool ServiceClientConnection(
-      const internal::PipeServiceContext& service_context);
-  static DWORD __stdcall PipeServiceProc(void* ctx);
-  static void __stdcall OnCrashDumpEvent(void* ctx, BOOLEAN);
-  static void __stdcall OnNonCrashDumpEvent(void* ctx, BOOLEAN);
-  static void __stdcall OnProcessEnd(void* ctx, BOOLEAN);
-
-  std::wstring pipe_name_;
-  ScopedKernelHANDLE port_;
-  ScopedFileHandle first_pipe_instance_;
-
-  base::Lock clients_lock_;
-  std::set<internal::ClientData*> clients_;
-
-  bool persistent_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_EXCEPTION_HANDLER_SERVER_H_
diff --git a/Tools/Crashpad/include/util/win/get_function.h b/Tools/Crashpad/include/util/win/get_function.h
deleted file mode 100644
index 50e5f1505c..0000000000
--- a/Tools/Crashpad/include/util/win/get_function.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_GET_FUNCTION_H_
-#define CRASHPAD_UTIL_WIN_GET_FUNCTION_H_
-
-#include <windows.h>
-
-//! \file
-
-namespace crashpad {
-namespace internal {
-
-//! \brief Returns a function pointer to a named function in a library.
-//!
-//! Do not call this directly, use the GET_FUNCTION() or GET_FUNCTION_REQUIRED()
-//! macros instead.
-//!
-//! This accesses \a library by calling `LoadLibrary()` and is subject to the
-//! same restrictions as that function. Notably, it can’t be used from a
-//! `DllMain()` entry point.
-//!
-//! \param[in] library The library to search in.
-//! \param[in] function The function to search for. If a leading `::` is
-//!     present, it will be stripped.
-//! \param[in] required If `true`, require the function to resolve by `DCHECK`.
-//!
-//! \return A pointer to the requested function on success. If \a required is
-//!     `true`, triggers a `DCHECK` assertion on failure, otherwise, `nullptr`
-//!     on failure.
-FARPROC GetFunctionInternal(
-    const wchar_t* library, const char* function, bool required);
-
-//! \copydoc GetFunctionInternal
-template <typename FunctionType>
-FunctionType* GetFunction(
-    const wchar_t* library, const char* function, bool required) {
-  return reinterpret_cast<FunctionType*>(
-      internal::GetFunctionInternal(library, function, required));
-}
-
-}  // namespace internal
-}  // namespace crashpad
-
-//! \brief Returns a function pointer to a named function in a library without
-//!     requiring that it be found.
-//!
-//! If the library or function cannot be found, this will return `nullptr`. This
-//! macro is intended to be used to access functions that may not be available
-//! at runtime.
-//!
-//! This macro returns a properly-typed function pointer. It is expected to be
-//! used in this way:
-//! \code
-//!     static const auto get_named_pipe_client_process_id =
-//!         GET_FUNCTION(L"kernel32.dll", ::GetNamedPipeClientProcessId);
-//!     if (get_named_pipe_client_process_id) {
-//!       BOOL rv = get_named_pipe_client_process_id(pipe, &client_process_id);
-//!     }
-//! \endcode
-//!
-//! This accesses \a library by calling `LoadLibrary()` and is subject to the
-//! same restrictions as that function. Notably, it can’t be used from a
-//! `DllMain()` entry point.
-//!
-//! \param[in] library The library to search in.
-//! \param[in] function The function to search for. A leading `::` is
-//!     recommended when a wrapper function of the same name is present.
-//!
-//! \return A pointer to the requested function on success, or `nullptr` on
-//!     failure.
-//!
-//! \sa GET_FUNCTION_REQUIRED
-#define GET_FUNCTION(library, function)                  \
-    crashpad::internal::GetFunction<decltype(function)>( \
-        library, #function, false)
-
-//! \brief Returns a function pointer to a named function in a library,
-//!     requiring that it be found.
-//!
-//! If the library or function cannot be found, this will trigger a `DCHECK`
-//! assertion. This macro is intended to be used to access functions that are
-//! always expected to be available at runtime but which are not present in any
-//! import library.
-//!
-//! This macro returns a properly-typed function pointer. It is expected to be
-//! used in this way:
-//! \code
-//!     static const auto nt_query_object =
-//!         GET_FUNCTION_REQUIRED(L"ntdll.dll", ::NtQueryObject);
-//!     NTSTATUS status =
-//!         nt_query_object(handle, type, &info, info_length, &return_length);
-//! \endcode
-//!
-//! This accesses \a library by calling `LoadLibrary()` and is subject to the
-//! same restrictions as that function. Notably, it can’t be used from a
-//! `DllMain()` entry point.
-//!
-//! \param[in] library The library to search in.
-//! \param[in] function The function to search for. A leading `::` is
-//!     recommended when a wrapper function of the same name is present.
-//!
-//! \return A pointer to the requested function.
-//!
-//! \sa GET_FUNCTION
-#define GET_FUNCTION_REQUIRED(library, function)         \
-    crashpad::internal::GetFunction<decltype(function)>( \
-        library, #function, true)
-
-#endif  // CRASHPAD_UTIL_WIN_GET_FUNCTION_H_
diff --git a/Tools/Crashpad/include/util/win/get_module_information.h b/Tools/Crashpad/include/util/win/get_module_information.h
deleted file mode 100644
index c7d1cf17a0..0000000000
--- a/Tools/Crashpad/include/util/win/get_module_information.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_GET_MODULE_INFORMATION_H_
-#define CRASHPAD_UTIL_WIN_GET_MODULE_INFORMATION_H_
-
-#include <windows.h>
-
-#define PSAPI_VERSION 1
-#include <psapi.h>
-
-namespace crashpad {
-
-//! \brief Proxy function for `GetModuleInformation()`.
-BOOL CrashpadGetModuleInformation(HANDLE process,
-                                  HMODULE module,
-                                  MODULEINFO* module_info,
-                                  DWORD cb);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_GET_MODULE_INFORMATION_H_
diff --git a/Tools/Crashpad/include/util/win/handle.h b/Tools/Crashpad/include/util/win/handle.h
deleted file mode 100644
index 951302e2fb..0000000000
--- a/Tools/Crashpad/include/util/win/handle.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_HANDLE_TO_INT_H_
-#define CRASHPAD_UTIL_WIN_HANDLE_TO_INT_H_
-
-#include <windows.h>
-
-namespace crashpad {
-
-//! \brief Converts a `HANDLE` to an `int`.
-//!
-//! `HANDLE` is a `typedef` for `void *`, but kernel `HANDLE` values aren’t
-//! pointers to anything. Only 32 bits of kernel `HANDLE`s are significant, even
-//! in 64-bit processes on 64-bit operating systems. See <a
-//! href="https://msdn.microsoft.com/library/aa384203.aspx">Interprocess
-//! Communication Between 32-bit and 64-bit Applications</a>.
-//!
-//! This function safely converts a kernel `HANDLE` to an `int` similarly to a
-//! cast operation. It checks that the operation can be performed safely, and
-//! aborts execution if it cannot.
-//!
-//! \param[in] handle The kernel `HANDLE` to convert.
-//!
-//! \return An equivalent `int`, truncated (if necessary) from \a handle. If
-//!     truncation would have resulted in an `int` that could not be converted
-//!     back to \a handle, aborts execution.
-//!
-//! \sa IntToHandle()
-int HandleToInt(HANDLE handle);
-
-//! \brief Converts an `int` to an `HANDLE`.
-//!
-//! `HANDLE` is a `typedef` for `void *`, but kernel `HANDLE` values aren’t
-//! pointers to anything. Only 32 bits of kernel `HANDLE`s are significant, even
-//! in 64-bit processes on 64-bit operating systems. See <a
-//! href="https://msdn.microsoft.com/library/aa384203.aspx">Interprocess
-//! Communication Between 32-bit and 64-bit Applications</a>.
-//!
-//! This function safely convert an `int` to a kernel `HANDLE` similarly to a
-//! cast operation.
-//!
-//! \param[in] handle_int The `int` to convert. This must have been produced by
-//!     HandleToInt(), possibly in a different process.
-//!
-//! \return An equivalent kernel `HANDLE`, sign-extended (if necessary) from \a
-//!     handle_int.
-//!
-//! \sa HandleToInt()
-HANDLE IntToHandle(int handle_int);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_HANDLE_TO_INT_H_
diff --git a/Tools/Crashpad/include/util/win/initial_client_data.h b/Tools/Crashpad/include/util/win/initial_client_data.h
deleted file mode 100644
index f686959e4b..0000000000
--- a/Tools/Crashpad/include/util/win/initial_client_data.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_INITIAL_CLIENT_DATA_H_
-#define CRASHPAD_UTIL_WIN_INITIAL_CLIENT_DATA_H_
-
-#include <windows.h>
-
-#include <string>
-
-#include "base/macros.h"
-#include "util/win/address_types.h"
-
-namespace crashpad {
-
-//! \brief A container for the data associated with the `--initial-client-data`
-//!     method for initializing the handler process on Windows.
-class InitialClientData {
- public:
-  //! \brief Constructs an unintialized instance to be used with
-  //!     InitializeFromString().
-  InitialClientData();
-
-  //! \brief Constructs an instance of InitialClientData. This object does not
-  //!     take ownership of any of the referenced HANDLEs.
-  //!
-  //! \param[in] request_crash_dump An event signalled from the client on crash.
-  //! \param[in] request_non_crash_dump An event signalled from the client when
-  //!     it would like a dump to be taken, but allowed to continue afterwards.
-  //! \param[in] non_crash_dump_completed An event signalled from the handler to
-  //!     tell the client that the non-crash dump has completed, and it can
-  //!     continue execution.
-  //! \param[in] first_pipe_instance The server end and first instance of a pipe
-  //!     that will be used for communication with all other clients after this
-  //!     initial one.
-  //! \param[in] client_process A process handle for the client being
-  //!     registered.
-  //! \param[in] crash_exception_information The address, in the client's
-  //!     address space, of an ExceptionInformation structure, used when
-  //!     handling a crash dump request.
-  //! \param[in] non_crash_exception_information The address, in the client's
-  //!     address space, of an ExceptionInformation structure, used when
-  //!     handling a non-crashing dump request.
-  //! \param[in] debug_critical_section_address The address, in the client
-  //!     process's address space, of a `CRITICAL_SECTION` allocated with a
-  //!     valid .DebugInfo field. This can be accomplished by using
-  //!     InitializeCriticalSectionWithDebugInfoIfPossible() or equivalent. This
-  //!     value can be `0`, however then limited lock data will be available in
-  //!     minidumps.
-  InitialClientData(HANDLE request_crash_dump,
-                    HANDLE request_non_crash_dump,
-                    HANDLE non_crash_dump_completed,
-                    HANDLE first_pipe_instance,
-                    HANDLE client_process,
-                    WinVMAddress crash_exception_information,
-                    WinVMAddress non_crash_exception_information,
-                    WinVMAddress debug_critical_section_address);
-
-  //! \brief Returns whether the object has been initialized successfully.
-  bool IsValid() const { return is_valid_; }
-
-  //! Initializes this object from a string representation presumed to have been
-  //!     created by StringRepresentation().
-  //!
-  //! \param[in] str The output of StringRepresentation().
-  //!
-  //! \return `true` on success, or `false` with a message logged on failure.
-  bool InitializeFromString(const std::string& str);
-
-  //! \brief Returns a string representation of the data of this object,
-  //!     suitable for passing on the command line.
-  std::string StringRepresentation() const;
-
-  HANDLE request_crash_dump() const { return request_crash_dump_; }
-  HANDLE request_non_crash_dump() const { return request_non_crash_dump_; }
-  HANDLE non_crash_dump_completed() const { return non_crash_dump_completed_; }
-  HANDLE first_pipe_instance() const { return first_pipe_instance_; }
-  HANDLE client_process() const { return client_process_; }
-  WinVMAddress crash_exception_information() const {
-    return crash_exception_information_;
-  }
-  WinVMAddress non_crash_exception_information() const {
-    return non_crash_exception_information_;
-  }
-  WinVMAddress debug_critical_section_address() const {
-    return debug_critical_section_address_;
-  }
-
- private:
-  WinVMAddress crash_exception_information_;
-  WinVMAddress non_crash_exception_information_;
-  WinVMAddress debug_critical_section_address_;
-  HANDLE request_crash_dump_;
-  HANDLE request_non_crash_dump_;
-  HANDLE non_crash_dump_completed_;
-  HANDLE first_pipe_instance_;
-  HANDLE client_process_;
-  bool is_valid_;
-
-  DISALLOW_COPY_AND_ASSIGN(InitialClientData);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_INITIAL_CLIENT_DATA_H_
diff --git a/Tools/Crashpad/include/util/win/module_version.h b/Tools/Crashpad/include/util/win/module_version.h
deleted file mode 100644
index afc2a508b7..0000000000
--- a/Tools/Crashpad/include/util/win/module_version.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_MODULE_VERSION_H_
-#define CRASHPAD_UTIL_WIN_MODULE_VERSION_H_
-
-#include <windows.h>
-
-#include "base/files/file_path.h"
-
-namespace crashpad {
-
-//! \brief Retrieve the type and version information from a given module (exe,
-//!     dll, etc.)
-//!
-//! This function calls `GetFileVersionInfo()`, which can implicitly call
-//! `LoadLibrary()` to load \a path into the calling process. Do not call this
-//! function on an untrusted module, because there is a risk of executing the
-//! module’s code.
-//!
-//! \param[in] path The path to the module to be inspected.
-//! \param[out] vs_fixedfileinfo The VS_FIXEDFILEINFO on success.
-//!     VS_FIXEDFILEINFO::dwFileFlags will have been masked with
-//!     VS_FIXEDFILEINFO::dwFileFlagsMask already.
-//!
-//! \return `true` on success, or `false` on failure with a message logged. If
-//!     the module has no `VERSIONINFO` resource, `false` will be returned
-//!     without any messages logged.
-bool GetModuleVersionAndType(const base::FilePath& path,
-                             VS_FIXEDFILEINFO* vs_fixedfileinfo);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_MODULE_VERSION_H_
diff --git a/Tools/Crashpad/include/util/win/nt_internals.h b/Tools/Crashpad/include/util/win/nt_internals.h
deleted file mode 100644
index a2a88b7744..0000000000
--- a/Tools/Crashpad/include/util/win/nt_internals.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <windows.h>
-#include <winternl.h>
-
-#include "util/win/process_structs.h"
-
-// Copied from ntstatus.h because um/winnt.h conflicts with general inclusion of
-// ntstatus.h.
-#define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
-#define STATUS_BUFFER_TOO_SMALL ((NTSTATUS)0xC0000023L)
-#define STATUS_PROCESS_IS_TERMINATING ((NTSTATUS)0xC000010AL)
-
-namespace crashpad {
-
-NTSTATUS NtClose(HANDLE handle);
-
-// http://processhacker.sourceforge.net/doc/ntpsapi_8h_source.html
-#define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002
-NTSTATUS
-NtCreateThreadEx(PHANDLE thread_handle,
-                 ACCESS_MASK desired_access,
-                 POBJECT_ATTRIBUTES object_attributes,
-                 HANDLE process_handle,
-                 PVOID start_routine,
-                 PVOID argument,
-                 ULONG create_flags,
-                 SIZE_T zero_bits,
-                 SIZE_T stack_size,
-                 SIZE_T maximum_stack_size,
-                 PVOID /*PPS_ATTRIBUTE_LIST*/ attribute_list);
-
-// winternal.h defines THREADINFOCLASS, but not all members.
-enum { ThreadBasicInformation = 0 };
-
-// winternal.h defines SYSTEM_INFORMATION_CLASS, but not all members.
-enum { SystemExtendedHandleInformation = 64 };
-
-NTSTATUS NtQuerySystemInformation(
-    SYSTEM_INFORMATION_CLASS system_information_class,
-    PVOID system_information,
-    ULONG system_information_length,
-    PULONG return_length);
-
-NTSTATUS NtQueryInformationThread(HANDLE thread_handle,
-                                  THREADINFOCLASS thread_information_class,
-                                  PVOID thread_information,
-                                  ULONG thread_information_length,
-                                  PULONG return_length);
-
-template <class Traits>
-NTSTATUS NtOpenThread(PHANDLE thread_handle,
-                      ACCESS_MASK desired_access,
-                      POBJECT_ATTRIBUTES object_attributes,
-                      const process_types::CLIENT_ID<Traits>* client_id);
-
-NTSTATUS NtQueryObject(HANDLE handle,
-                       OBJECT_INFORMATION_CLASS object_information_class,
-                       void* object_information,
-                       ULONG object_information_length,
-                       ULONG* return_length);
-
-NTSTATUS NtSuspendProcess(HANDLE handle);
-
-NTSTATUS NtResumeProcess(HANDLE handle);
-
-// From https://msdn.microsoft.com/library/cc678403.aspx.
-template <class Traits>
-struct RTL_UNLOAD_EVENT_TRACE {
-  typename Traits::Pointer BaseAddress;
-  typename Traits::UnsignedIntegral SizeOfImage;
-  ULONG Sequence;
-  ULONG TimeDateStamp;
-  ULONG CheckSum;
-  WCHAR ImageName[32];
-};
-
-void RtlGetUnloadEventTraceEx(ULONG** element_size,
-                              ULONG** element_count,
-                              void** event_trace);
-
-}  // namespace crashpad
diff --git a/Tools/Crashpad/include/util/win/ntstatus_logging.h b/Tools/Crashpad/include/util/win/ntstatus_logging.h
deleted file mode 100644
index 7eececc95b..0000000000
--- a/Tools/Crashpad/include/util/win/ntstatus_logging.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_
-#define CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_
-
-#include <windows.h>
-
-#include "base/logging.h"
-#include "base/macros.h"
-
-namespace logging {
-
-class NtstatusLogMessage : public logging::LogMessage {
- public:
-  NtstatusLogMessage(
-#if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
-      const char* function,
-#endif
-      const char* file_path,
-      int line,
-      LogSeverity severity,
-      DWORD ntstatus);
-  ~NtstatusLogMessage();
-
- private:
-  DWORD ntstatus_;
-
-  DISALLOW_COPY_AND_ASSIGN(NtstatusLogMessage);
-};
-
-}  // namespace logging
-
-#define NTSTATUS_LOG_STREAM(severity, ntstatus) \
-  COMPACT_GOOGLE_LOG_EX_##severity(NtstatusLogMessage, ntstatus).stream()
-
-#if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
-
-#define NTSTATUS_VLOG_STREAM(verbose_level, ntstatus)                    \
-  logging::NtstatusLogMessage(                                           \
-      __PRETTY_FUNCTION__, __FILE__, __LINE__, -verbose_level, ntstatus) \
-      .stream()
-
-#else
-
-#define NTSTATUS_VLOG_STREAM(verbose_level, ntstatus)                       \
-  logging::NtstatusLogMessage(__FILE__, __LINE__, -verbose_level, ntstatus) \
-      .stream()
-
-#endif  // MINI_CHROMIUM_BASE_LOGGING_H_
-
-#define NTSTATUS_LOG(severity, ntstatus) \
-  LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), LOG_IS_ON(severity))
-#define NTSTATUS_LOG_IF(severity, condition, ntstatus) \
-  LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), \
-              LOG_IS_ON(severity) && (condition))
-
-#define NTSTATUS_VLOG(verbose_level, ntstatus)               \
-  LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus), \
-              VLOG_IS_ON(verbose_level))
-#define NTSTATUS_VLOG_IF(verbose_level, condition, ntstatus) \
-  LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus), \
-              VLOG_IS_ON(verbose_level) && (condition))
-
-#define NTSTATUS_CHECK(condition, ntstatus)                       \
-  LAZY_STREAM(NTSTATUS_LOG_STREAM(FATAL, ntstatus), !(condition)) \
-      << "Check failed: " #condition << ". "
-
-#define NTSTATUS_DLOG(severity, ntstatus) \
-  LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), DLOG_IS_ON(severity))
-#define NTSTATUS_DLOG_IF(severity, condition, ntstatus) \
-  LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus),  \
-              DLOG_IS_ON(severity) && (condition))
-
-#define NTSTATUS_DVLOG(verbose_level, ntstatus)              \
-  LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus), \
-              DVLOG_IS_ON(verbose_level))
-#define NTSTATUS_DVLOG_IF(verbose_level, condition, ntstatus) \
-  LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus),  \
-              DVLOG_IS_ON(verbose_level) && (condition))
-
-#define NTSTATUS_DCHECK(condition, ntstatus)        \
-  LAZY_STREAM(NTSTATUS_LOG_STREAM(FATAL, ntstatus), \
-              DCHECK_IS_ON && !(condition))         \
-      << "Check failed: " #condition << ". "
-
-#endif  // CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_
diff --git a/Tools/Crashpad/include/util/win/process_info.h b/Tools/Crashpad/include/util/win/process_info.h
deleted file mode 100644
index 58921c56f1..0000000000
--- a/Tools/Crashpad/include/util/win/process_info.h
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_PROCESS_INFO_H_
-#define CRASHPAD_UTIL_WIN_PROCESS_INFO_H_
-
-#include <windows.h>
-#include <sys/types.h>
-
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "util/misc/initialization_state_dcheck.h"
-#include "util/numeric/checked_range.h"
-#include "util/stdlib/aligned_allocator.h"
-#include "util/win/address_types.h"
-
-namespace crashpad {
-
-//! \brief Gathers information about a process given its `HANDLE`. This consists
-//!     primarily of information stored in the Process Environment Block.
-class ProcessInfo {
- public:
-  //! \brief The return type of MemoryInfo(), for convenience.
-  using MemoryBasicInformation64Vector =
-      AlignedVector<MEMORY_BASIC_INFORMATION64>;
-
-  //! \brief Contains information about a module loaded into a process.
-  struct Module {
-    Module();
-    ~Module();
-
-    //! \brief The pathname used to load the module from disk.
-    std::wstring name;
-
-    //! \brief The base address of the loaded DLL.
-    WinVMAddress dll_base;
-
-    //! \brief The size of the module.
-    WinVMSize size;
-
-    //! \brief The module's timestamp.
-    time_t timestamp;
-  };
-
-  struct Handle {
-    Handle();
-    ~Handle();
-
-    //! \brief A string representation of the handle's type.
-    std::wstring type_name;
-
-    //! \brief The handle's value.
-    int handle;
-
-    //! \brief The attributes for the handle, e.g. `OBJ_INHERIT`,
-    //!     `OBJ_CASE_INSENSITIVE`, etc.
-    uint32_t attributes;
-
-    //! \brief The `ACCESS_MASK` for the handle in this process.
-    //!
-    //! See
-    //! https://blogs.msdn.microsoft.com/openspecification/2010/04/01/about-the-access_mask-structure/
-    //! for more information.
-    uint32_t granted_access;
-
-    //! \brief The number of kernel references to the object that this handle
-    //!     refers to.
-    uint32_t pointer_count;
-
-    //! \brief The number of open handles to the object that this handle refers
-    //!     to.
-    uint32_t handle_count;
-  };
-
-  ProcessInfo();
-  ~ProcessInfo();
-
-  //! \brief Initializes this object with information about the given
-  //!     \a process.
-  //!
-  //! This method must be called successfully prior to calling any other
-  //! method in this class. This method may only be called once.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool Initialize(HANDLE process);
-
-  //! \return `true` if the target process is a 64-bit process.
-  bool Is64Bit() const;
-
-  //! \return `true` if the target process is running on the Win32-on-Win64
-  //!     subsystem.
-  bool IsWow64() const;
-
-  //! \return The target process's process ID.
-  pid_t ProcessID() const;
-
-  //! \return The target process's parent process ID.
-  pid_t ParentProcessID() const;
-
-  //! \return The command line from the target process's Process Environment
-  //!     Block.
-  bool CommandLine(std::wstring* command_line) const;
-
-  //! \brief Gets the address and size of the process's Process Environment
-  //!     Block.
-  //!
-  //! \param[out] peb_address The address of the Process Environment Block.
-  //! \param[out] peb_size The size of the Process Environment Block.
-  void Peb(WinVMAddress* peb_address, WinVMSize* peb_size) const;
-
-  //! \brief Retrieves the modules loaded into the target process.
-  //!
-  //! The modules are enumerated in initialization order as detailed in the
-  //!     Process Environment Block. The main executable will always be the
-  //!     first element.
-  bool Modules(std::vector<Module>* modules) const;
-
-  //! \brief Retrieves information about all pages mapped into the process.
-  const MemoryBasicInformation64Vector& MemoryInfo() const;
-
-  //! \brief Given a range to be read from the target process, returns a vector
-  //!     of ranges, representing the readable portions of the original range.
-  //!
-  //! \param[in] range The range being identified.
-  //!
-  //! \return A vector of ranges corresponding to the portion of \a range that
-  //!     is readable based on the memory map.
-  std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRanges(
-      const CheckedRange<WinVMAddress, WinVMSize>& range) const;
-
-  //! \brief Given a range in the target process, determines if the entire range
-  //!     is readable.
-  //!
-  //! \param[in] range The range being inspected.
-  //!
-  //! \return `true` if the range is fully readable, otherwise `false` with a
-  //!     message logged.
-  bool LoggingRangeIsFullyReadable(
-      const CheckedRange<WinVMAddress, WinVMSize>& range) const;
-
-  //! \brief Retrieves information about open handles in the target process.
-  const std::vector<Handle>& Handles() const;
-
- private:
-  template <class Traits>
-  friend bool GetProcessBasicInformation(HANDLE process,
-                                         bool is_wow64,
-                                         ProcessInfo* process_info,
-                                         WinVMAddress* peb_address,
-                                         WinVMSize* peb_size);
-  template <class Traits>
-  friend bool ReadProcessData(HANDLE process,
-                              WinVMAddress peb_address_vmaddr,
-                              ProcessInfo* process_info);
-
-  friend bool ReadMemoryInfo(HANDLE process,
-                             bool is_64_bit,
-                             ProcessInfo* process_info);
-
-  // This function is best-effort under low memory conditions.
-  std::vector<Handle> BuildHandleVector(HANDLE process) const;
-
-  pid_t process_id_;
-  pid_t inherited_from_process_id_;
-  HANDLE process_;
-  std::wstring command_line_;
-  WinVMAddress peb_address_;
-  WinVMSize peb_size_;
-  std::vector<Module> modules_;
-
-  // memory_info_ is a MemoryBasicInformation64Vector instead of a
-  // std::vector<MEMORY_BASIC_INFORMATION64> because MEMORY_BASIC_INFORMATION64
-  // is declared with __declspec(align(16)), but std::vector<> does not maintain
-  // this alignment on 32-bit x86. clang-cl (but not MSVC cl) takes advantage of
-  // the presumed alignment and emits SSE instructions that require aligned
-  // storage. clang-cl should relax (unfortunately), but in the mean time, this
-  // provides aligned storage. See https://crbug.com/564691 and
-  // https://llvm.org/PR25779.
-  //
-  // TODO(mark): Remove this workaround when https://llvm.org/PR25779 is fixed
-  // and the fix is present in the clang-cl that compiles this code.
-  MemoryBasicInformation64Vector memory_info_;
-
-  // Handles() is logically const, but updates this member on first retrieval.
-  // See https://crashpad.chromium.org/bug/9.
-  mutable std::vector<Handle> handles_;
-
-  bool is_64_bit_;
-  bool is_wow64_;
-  InitializationStateDcheck initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProcessInfo);
-};
-
-//! \brief Given a memory map of a process, and a range to be read from the
-//!     target process, returns a vector of ranges, representing the readable
-//!     portions of the original range.
-//!
-//! This is a free function for testing, but prefer
-//! ProcessInfo::GetReadableRanges().
-std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap(
-    const CheckedRange<WinVMAddress, WinVMSize>& range,
-    const ProcessInfo::MemoryBasicInformation64Vector& memory_info);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_PROCESS_INFO_H_
diff --git a/Tools/Crashpad/include/util/win/process_structs.h b/Tools/Crashpad/include/util/win/process_structs.h
deleted file mode 100644
index d9b5b2fa6f..0000000000
--- a/Tools/Crashpad/include/util/win/process_structs.h
+++ /dev/null
@@ -1,515 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_PROCESS_STRUCTS_H_
-#define CRASHPAD_UTIL_WIN_PROCESS_STRUCTS_H_
-
-#include <windows.h>
-
-namespace crashpad {
-namespace process_types {
-
-namespace internal {
-
-struct Traits32 {
-  using Pad = DWORD;
-  using UnsignedIntegral = DWORD;
-  using Pointer = DWORD;
-};
-
-struct Traits64 {
-  using Pad = DWORD64;
-  using UnsignedIntegral = DWORD64;
-  using Pointer = DWORD64;
-};
-
-}  // namespace internal
-
-//! \{
-
-//! \brief Selected structures from winternl.h, ntddk.h, and `dt ntdll!xxx`,
-//!     customized to have both x86 and x64 sizes available.
-//!
-//! The structure and field names follow the Windows names for clarity. We do,
-//! however, use plain integral types rather than pointer types. This is both
-//! easier to define, and avoids accidentally treating them as pointers into the
-//! current address space.
-//!
-//! The templates below should be instantiated with either internal::Traits32
-//! for structures targeting x86, or internal::Traits64 for x64.
-
-// We set packing to 1 so that we can explicitly control the layout to make it
-// match the OS defined structures.
-#pragma pack(push, 1)
-
-template <class Traits>
-struct PROCESS_BASIC_INFORMATION {
-  union {
-    DWORD ExitStatus;
-    typename Traits::Pad padding_for_x64_0;
-  };
-  typename Traits::Pointer PebBaseAddress;
-  typename Traits::UnsignedIntegral AffinityMask;
-  union {
-    DWORD BasePriority;
-    typename Traits::Pad padding_for_x64_1;
-  };
-  typename Traits::UnsignedIntegral UniqueProcessId;
-  typename Traits::UnsignedIntegral InheritedFromUniqueProcessId;
-};
-
-template <class Traits>
-struct LIST_ENTRY {
-  typename Traits::Pointer Flink;
-  typename Traits::Pointer Blink;
-};
-
-template <class Traits>
-struct UNICODE_STRING {
-  union {
-    struct {
-      USHORT Length;
-      USHORT MaximumLength;
-    };
-    typename Traits::Pad padding_for_x64;
-  };
-  typename Traits::Pointer Buffer;
-};
-
-template <class Traits>
-struct PEB_LDR_DATA {
-  ULONG Length;
-  DWORD Initialized;
-  typename Traits::Pointer SsHandle;
-  LIST_ENTRY<Traits> InLoadOrderModuleList;
-  LIST_ENTRY<Traits> InMemoryOrderModuleList;
-  LIST_ENTRY<Traits> InInitializationOrderModuleList;
-};
-
-template <class Traits>
-struct LDR_DATA_TABLE_ENTRY {
-  LIST_ENTRY<Traits> InLoadOrderLinks;
-  LIST_ENTRY<Traits> InMemoryOrderLinks;
-  LIST_ENTRY<Traits> InInitializationOrderLinks;
-  typename Traits::Pointer DllBase;
-  typename Traits::Pointer EntryPoint;
-  union {
-    ULONG SizeOfImage;
-    typename Traits::Pad padding_for_x64;
-  };
-  UNICODE_STRING<Traits> FullDllName;
-  UNICODE_STRING<Traits> BaseDllName;
-  ULONG Flags;
-  USHORT ObsoleteLoadCount;
-  USHORT TlsIndex;
-  LIST_ENTRY<Traits> HashLinks;
-  ULONG TimeDateStamp;
-};
-
-template <class Traits>
-struct CURDIR {
-  UNICODE_STRING<Traits> DosPath;
-  typename Traits::Pointer Handle;
-};
-
-template <class Traits>
-struct STRING {
-  union {
-    struct {
-      USHORT Length;
-      USHORT MaximumLength;
-    };
-    typename Traits::Pad padding_for_x64;
-  };
-  typename Traits::Pointer Buffer;
-};
-
-template <class Traits>
-struct RTL_DRIVE_LETTER_CURDIR {
-  WORD Flags;
-  WORD Length;
-  DWORD TimeStamp;
-  STRING<Traits> DosPath;
-};
-
-template <class Traits>
-struct RTL_USER_PROCESS_PARAMETERS {
-  DWORD MaximumLength;
-  DWORD Length;
-  DWORD Flags;
-  DWORD DebugFlags;
-  typename Traits::Pointer ConsoleHandle;
-  union {
-    DWORD ConsoleFlags;
-    typename Traits::Pad padding_for_x64_0;
-  };
-  typename Traits::Pointer StandardInput;
-  typename Traits::Pointer StandardOutput;
-  typename Traits::Pointer StandardError;
-  CURDIR<Traits> CurrentDirectory;
-  UNICODE_STRING<Traits> DllPath;
-  UNICODE_STRING<Traits> ImagePathName;
-  UNICODE_STRING<Traits> CommandLine;
-  typename Traits::Pointer Environment;
-  DWORD StartingX;
-  DWORD StartingY;
-  DWORD CountX;
-  DWORD CountY;
-  DWORD CountCharsX;
-  DWORD CountCharsY;
-  DWORD FillAttribute;
-  DWORD WindowFlags;
-  union {
-    DWORD ShowWindowFlags;
-    typename Traits::Pad padding_for_x64_1;
-  };
-  UNICODE_STRING<Traits> WindowTitle;
-  UNICODE_STRING<Traits> DesktopInfo;
-  UNICODE_STRING<Traits> ShellInfo;
-  UNICODE_STRING<Traits> RuntimeData;
-  RTL_DRIVE_LETTER_CURDIR<Traits> CurrentDirectores[32];  // sic.
-  ULONG EnvironmentSize;
-};
-
-template <class T>
-struct GdiHandleBufferCountForBitness;
-
-template <>
-struct GdiHandleBufferCountForBitness<internal::Traits32> {
-  enum { value = 34 };
-};
-template <>
-struct GdiHandleBufferCountForBitness<internal::Traits64> {
-  enum { value = 60 };
-};
-
-template <class Traits>
-struct PEB {
-  union {
-    struct {
-      BYTE InheritedAddressSpace;
-      BYTE ReadImageFileExecOptions;
-      BYTE BeingDebugged;
-      BYTE BitField;
-    };
-    typename Traits::Pad padding_for_x64_0;
-  };
-  typename Traits::Pointer Mutant;
-  typename Traits::Pointer ImageBaseAddress;
-  typename Traits::Pointer Ldr;
-  typename Traits::Pointer ProcessParameters;
-  typename Traits::Pointer SubSystemData;
-  typename Traits::Pointer ProcessHeap;
-  typename Traits::Pointer FastPebLock;
-  typename Traits::Pointer AtlThunkSListPtr;
-  typename Traits::Pointer IFEOKey;
-  union {
-    DWORD CrossProcessFlags;
-    typename Traits::Pad padding_for_x64_1;
-  };
-  typename Traits::Pointer KernelCallbackTable;
-  DWORD SystemReserved;
-  DWORD AtlThunkSListPtr32;
-  typename Traits::Pointer ApiSetMap;
-  union {
-    DWORD TlsExpansionCounter;
-    typename Traits::Pad padding_for_x64_2;
-  };
-  typename Traits::Pointer TlsBitmap;
-  DWORD TlsBitmapBits[2];
-  typename Traits::Pointer ReadOnlySharedMemoryBase;
-  typename Traits::Pointer SparePvoid0;
-  typename Traits::Pointer ReadOnlyStaticServerData;
-  typename Traits::Pointer AnsiCodePageData;
-  typename Traits::Pointer OemCodePageData;
-  typename Traits::Pointer UnicodeCaseTableData;
-  DWORD NumberOfProcessors;
-  DWORD NtGlobalFlag;
-  DWORD alignment_for_x86;
-  LARGE_INTEGER CriticalSectionTimeout;
-  typename Traits::UnsignedIntegral HeapSegmentReserve;
-  typename Traits::UnsignedIntegral HeapSegmentCommit;
-  typename Traits::UnsignedIntegral HeapDeCommitTotalFreeThreshold;
-  typename Traits::UnsignedIntegral HeapDeCommitFreeBlockThreshold;
-  DWORD NumberOfHeaps;
-  DWORD MaximumNumberOfHeaps;
-  typename Traits::Pointer ProcessHeaps;
-  typename Traits::Pointer GdiSharedHandleTable;
-  typename Traits::Pointer ProcessStarterHelper;
-  DWORD GdiDCAttributeList;
-  typename Traits::Pointer LoaderLock;
-  DWORD OSMajorVersion;
-  DWORD OSMinorVersion;
-  WORD OSBuildNumber;
-  WORD OSCSDVersion;
-  DWORD OSPlatformId;
-  DWORD ImageSubsystem;
-  DWORD ImageSubsystemMajorVersion;
-  union {
-    DWORD ImageSubsystemMinorVersion;
-    typename Traits::Pad padding_for_x64_3;
-  };
-  typename Traits::UnsignedIntegral ActiveProcessAffinityMask;
-  DWORD GdiHandleBuffer[GdiHandleBufferCountForBitness<Traits>::value];
-  typename Traits::Pointer PostProcessInitRoutine;
-  typename Traits::Pointer TlsExpansionBitmap;
-  DWORD TlsExpansionBitmapBits[32];
-  union {
-    DWORD SessionId;
-    typename Traits::Pad padding_for_x64_4;
-  };
-  ULARGE_INTEGER AppCompatFlags;
-  ULARGE_INTEGER AppCompatFlagsUser;
-  typename Traits::Pointer pShimData;
-  typename Traits::Pointer AppCompatInfo;
-  UNICODE_STRING<Traits> CSDVersion;
-  typename Traits::Pointer ActivationContextData;
-  typename Traits::Pointer ProcessAssemblyStorageMap;
-  typename Traits::Pointer SystemDefaultActivationContextData;
-  typename Traits::Pointer SystemAssemblyStorageMap;
-  typename Traits::UnsignedIntegral MinimumStackCommit;
-  typename Traits::Pointer FlsCallback;
-  LIST_ENTRY<Traits> FlsListHead;
-  typename Traits::Pointer FlsBitmap;
-  DWORD FlsBitmapBits[4];
-  DWORD FlsHighIndex;
-};
-
-template <class Traits>
-struct NT_TIB {
-  union {
-    // See https://msdn.microsoft.com/library/dn424783.aspx.
-    typename Traits::Pointer Wow64Teb;
-    struct {
-      typename Traits::Pointer ExceptionList;
-      typename Traits::Pointer StackBase;
-      typename Traits::Pointer StackLimit;
-      typename Traits::Pointer SubSystemTib;
-      union {
-        typename Traits::Pointer FiberData;
-        BYTE Version[4];
-      };
-      typename Traits::Pointer ArbitraryUserPointer;
-      typename Traits::Pointer Self;
-    };
-  };
-};
-
-// See https://msdn.microsoft.com/library/gg750647.aspx.
-template <class Traits>
-struct CLIENT_ID {
-  typename Traits::Pointer UniqueProcess;
-  typename Traits::Pointer UniqueThread;
-};
-
-// This is a partial definition of the TEB, as we do not currently use many
-// fields of it. See https://nirsoft.net/kernel_struct/vista/TEB.html, and the
-// (arch-specific) definition of _TEB in winternl.h.
-template <class Traits>
-struct TEB {
-  NT_TIB<Traits> NtTib;
-  typename Traits::Pointer EnvironmentPointer;
-  CLIENT_ID<Traits> ClientId;
-  typename Traits::Pointer ActiveRpcHandle;
-  typename Traits::Pointer ThreadLocalStoragePointer;
-  typename Traits::Pointer ProcessEnvironmentBlock;
-  typename Traits::Pointer RemainderOfReserved2[399];
-  BYTE Reserved3[1952];
-  typename Traits::Pointer TlsSlots[64];
-  BYTE Reserved4[8];
-  typename Traits::Pointer Reserved5[26];
-  typename Traits::Pointer ReservedForOle;
-  typename Traits::Pointer Reserved6[4];
-  typename Traits::Pointer TlsExpansionSlots;
-};
-
-// See https://msdn.microsoft.com/library/gg750724.aspx.
-template <class Traits>
-struct SYSTEM_THREAD_INFORMATION {
-  union {
-    struct {
-      LARGE_INTEGER KernelTime;
-      LARGE_INTEGER UserTime;
-      LARGE_INTEGER CreateTime;
-      union {
-        ULONG WaitTime;
-        typename Traits::Pad padding_for_x64_0;
-      };
-      typename Traits::Pointer StartAddress;
-      CLIENT_ID<Traits> ClientId;
-      LONG Priority;
-      LONG BasePriority;
-      ULONG ContextSwitches;
-      ULONG ThreadState;
-      union {
-        ULONG WaitReason;
-        typename Traits::Pad padding_for_x64_1;
-      };
-    };
-    LARGE_INTEGER alignment_for_x86[8];
-  };
-};
-
-// There's an extra field in the x64 VM_COUNTERS (or maybe it's VM_COUNTERS_EX,
-// it's not clear), so we just make separate specializations for 32/64.
-template <class Traits>
-struct VM_COUNTERS {};
-
-template <>
-struct VM_COUNTERS<internal::Traits32> {
-  SIZE_T PeakVirtualSize;
-  SIZE_T VirtualSize;
-  ULONG PageFaultCount;
-  SIZE_T PeakWorkingSetSize;
-  SIZE_T WorkingSetSize;
-  SIZE_T QuotaPeakPagedPoolUsage;
-  SIZE_T QuotaPagedPoolUsage;
-  SIZE_T QuotaPeakNonPagedPoolUsage;
-  SIZE_T QuotaNonPagedPoolUsage;
-  SIZE_T PagefileUsage;
-  SIZE_T PeakPagefileUsage;
-};
-
-template <>
-struct VM_COUNTERS<internal::Traits64> {
-  SIZE_T PeakVirtualSize;
-  SIZE_T VirtualSize;
-  union {
-    ULONG PageFaultCount;
-    internal::Traits64::Pad padding_for_x64;
-  };
-  SIZE_T PeakWorkingSetSize;
-  SIZE_T WorkingSetSize;
-  SIZE_T QuotaPeakPagedPoolUsage;
-  SIZE_T QuotaPagedPoolUsage;
-  SIZE_T QuotaPeakNonPagedPoolUsage;
-  SIZE_T QuotaNonPagedPoolUsage;
-  SIZE_T PagefileUsage;
-  SIZE_T PeakPagefileUsage;
-  SIZE_T PrivateUsage;
-};
-
-// https://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/System%20Information/Structures/SYSTEM_PROCESS_INFORMATION.html
-template <class Traits>
-struct SYSTEM_PROCESS_INFORMATION {
-  ULONG NextEntryOffset;
-  ULONG NumberOfThreads;
-  LARGE_INTEGER WorkingSetPrivateSize;
-  ULONG HardFaultCount;
-  ULONG NumberOfThreadsHighWatermark;
-  ULONGLONG CycleTime;
-  LARGE_INTEGER CreateTime;
-  LARGE_INTEGER UserTime;
-  LARGE_INTEGER KernelTime;
-  UNICODE_STRING<Traits> ImageName;
-  union {
-    LONG BasePriority;
-    typename Traits::Pad padding_for_x64_0;
-  };
-  union {
-    DWORD UniqueProcessId;
-    typename Traits::Pad padding_for_x64_1;
-  };
-  union {
-    DWORD InheritedFromUniqueProcessId;
-    typename Traits::Pad padding_for_x64_2;
-  };
-  ULONG HandleCount;
-  ULONG SessionId;
-  typename Traits::Pointer UniqueProcessKey;
-  union {
-    VM_COUNTERS<Traits> VirtualMemoryCounters;
-    LARGE_INTEGER alignment_for_x86[6];
-  };
-  IO_COUNTERS IoCounters;
-  SYSTEM_THREAD_INFORMATION<Traits> Threads[1];
-};
-
-// https://undocumented.ntinternals.net/source/usermode/structures/THREAD_BASIC_INFORMATION.html
-template <class Traits>
-struct THREAD_BASIC_INFORMATION {
-  union {
-    LONG ExitStatus;
-    typename Traits::Pad padding_for_x64_0;
-  };
-  typename Traits::Pointer TebBaseAddress;
-  CLIENT_ID<Traits> ClientId;
-  typename Traits::Pointer AffinityMask;
-  ULONG Priority;
-  LONG BasePriority;
-};
-
-template <class Traits>
-struct EXCEPTION_POINTERS {
-  typename Traits::Pointer ExceptionRecord;
-  typename Traits::Pointer ContextRecord;
-};
-
-using EXCEPTION_POINTERS32 = EXCEPTION_POINTERS<internal::Traits32>;
-using EXCEPTION_POINTERS64 = EXCEPTION_POINTERS<internal::Traits64>;
-
-// This is defined in winnt.h, but not for cross-bitness.
-template <class Traits>
-struct RTL_CRITICAL_SECTION {
-  typename Traits::Pointer DebugInfo;
-  LONG LockCount;
-  LONG RecursionCount;
-  typename Traits::Pointer OwningThread;
-  typename Traits::Pointer LockSemaphore;
-  typename Traits::UnsignedIntegral SpinCount;
-};
-
-template <class Traits>
-struct RTL_CRITICAL_SECTION_DEBUG {
-  union {
-    struct {
-      WORD Type;
-      WORD CreatorBackTraceIndex;
-    };
-    typename Traits::Pad alignment_for_x64;
-  };
-  typename Traits::Pointer CriticalSection;
-  LIST_ENTRY<Traits> ProcessLocksList;
-  DWORD EntryCount;
-  DWORD ContentionCount;
-  DWORD Flags;
-  WORD CreatorBackTraceIndexHigh;
-  WORD SpareWORD;
-};
-
-struct SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX {
-  void* Object;
-  ULONG_PTR UniqueProcessId;
-  HANDLE HandleValue;
-  ULONG GrantedAccess;
-  USHORT CreatorBackTraceIndex;
-  USHORT ObjectTypeIndex;
-  ULONG HandleAttributes;
-  ULONG Reserved;
-};
-
-struct SYSTEM_HANDLE_INFORMATION_EX {
-  ULONG_PTR NumberOfHandles;
-  ULONG_PTR Reserved;
-  SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handles[1];
-};
-
-#pragma pack(pop)
-
-//! \}
-
-}  // namespace process_types
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_PROCESS_STRUCTS_H_
diff --git a/Tools/Crashpad/include/util/win/registration_protocol_win.h b/Tools/Crashpad/include/util/win/registration_protocol_win.h
deleted file mode 100644
index 5f04a466c9..0000000000
--- a/Tools/Crashpad/include/util/win/registration_protocol_win.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_REGISTRATION_PROTOCOL_WIN_H_
-#define CRASHPAD_UTIL_WIN_REGISTRATION_PROTOCOL_WIN_H_
-
-#include <windows.h>
-#include <stdint.h>
-
-#include "base/strings/string16.h"
-#include "util/win/address_types.h"
-
-namespace crashpad {
-
-#pragma pack(push, 1)
-
-//! \brief Structure read out of the client process by the crash handler when an
-//!     exception occurs.
-struct ExceptionInformation {
-  //! \brief The address of an EXCEPTION_POINTERS structure in the client
-  //!     process that describes the exception.
-  WinVMAddress exception_pointers;
-
-  //! \brief The thread on which the exception happened.
-  DWORD thread_id;
-};
-
-//! \brief A client registration request.
-struct RegistrationRequest {
-  //! \brief The expected value of `version`. This should be changed whenever
-  //!     the messages or ExceptionInformation are modified incompatibly.
-  enum { kMessageVersion = 1 };
-
-  //! \brief Version field to detect skew between client and server. Should be
-  //!     set to kMessageVersion.
-  int version;
-
-  //! \brief The PID of the client process.
-  DWORD client_process_id;
-
-  //! \brief The address, in the client process's address space, of an
-  //!     ExceptionInformation structure, used when handling a crash dump
-  //!     request.
-  WinVMAddress crash_exception_information;
-
-  //! \brief The address, in the client process's address space, of an
-  //!     ExceptionInformation structure, used when handling a non-crashing dump
-  //!     request.
-  WinVMAddress non_crash_exception_information;
-
-  //! \brief The address, in the client process's address space, of a
-  //!     `CRITICAL_SECTION` allocated with a valid .DebugInfo field. This can
-  //!     be accomplished by using
-  //!     InitializeCriticalSectionWithDebugInfoIfPossible() or equivalent. This
-  //!     value can be `0`, however then limited lock data will be available in
-  //!     minidumps.
-  WinVMAddress critical_section_address;
-};
-
-//! \brief A message only sent to the server by itself to trigger shutdown.
-struct ShutdownRequest {
-  //! \brief A randomly generated token used to validate the the shutdown
-  //!     request was not sent from another process.
-  uint64_t token;
-};
-
-//! \brief The message passed from client to server by
-//!     SendToCrashHandlerServer().
-struct ClientToServerMessage {
-  //! \brief Indicates which field of the union is in use.
-  enum Type : uint32_t {
-    //! \brief For RegistrationRequest.
-    kRegister,
-
-    //! \brief For ShutdownRequest.
-    kShutdown,
-
-    //! \brief An empty message sent by the initial client in asynchronous mode.
-    //!     No data is required, this just confirms that the server is ready to
-    //!     accept client registrations.
-    kPing,
-  } type;
-
-  union {
-    RegistrationRequest registration;
-    ShutdownRequest shutdown;
-  };
-};
-
-//! \brief A client registration response.
-struct RegistrationResponse {
-  //! \brief An event `HANDLE`, valid in the client process, that should be
-  //!     signaled to request a crash report. Clients should convert the value
-  //!     to a `HANDLE` by calling IntToHandle().
-  int request_crash_dump_event;
-
-  //! \brief An event `HANDLE`, valid in the client process, that should be
-  //!     signaled to request a non-crashing dump be taken. Clients should
-  //!     convert the value to a `HANDLE` by calling IntToHandle().
-  int request_non_crash_dump_event;
-
-  //! \brief An event `HANDLE`, valid in the client process, that will be
-  //!     signaled by the server when the non-crashing dump is complete. Clients
-  //!     should convert the value to a `HANDLE` by calling IntToHandle().
-  int non_crash_dump_completed_event;
-};
-
-//! \brief The response sent back to the client via SendToCrashHandlerServer().
-union ServerToClientMessage {
-  RegistrationResponse registration;
-};
-
-#pragma pack(pop)
-
-//! \brief Connect over the given \a pipe_name, passing \a message to the
-//!     server, storing the server's reply into \a response.
-//!
-//! Typically clients will not use this directly, instead using
-//! CrashpadClient::SetHandler().
-//!
-//! \sa CrashpadClient::SetHandler()
-bool SendToCrashHandlerServer(const base::string16& pipe_name,
-                              const ClientToServerMessage& message,
-                              ServerToClientMessage* response);
-
-//! \brief Wraps CreateNamedPipe() to create a single named pipe instance.
-//!
-//! \param[in] pipe_name The name to use for the pipe.
-//! \param[in] first_instance If `true`, the named pipe instance will be
-//!     created with `FILE_FLAG_FIRST_PIPE_INSTANCE`. This ensures that the the
-//!     pipe name is not already in use when created. The first instance will be
-//!     created with an untrusted integrity SACL so instances of this pipe can
-//!     be connected to by processes of any integrity level.
-HANDLE CreateNamedPipeInstance(const std::wstring& pipe_name,
-                               bool first_instance);
-
-//! \brief Returns the SECURITY_DESCRIPTOR blob that will be used for creating
-//!     the connection pipe in CreateNamedPipeInstance().
-//!
-//! This function is exposed for only for testing.
-//!
-//! \param[out] size The size of the returned blob. May be `nullptr` if not
-//!     required.
-//!
-//! \return A pointer to a self-relative `SECURITY_DESCRIPTOR`. Ownership is not
-//!     transferred to the caller.
-const void* GetSecurityDescriptorForNamedPipeInstance(size_t* size);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_REGISTRATION_PROTOCOL_WIN_H_
diff --git a/Tools/Crashpad/include/util/win/safe_terminate_process.h b/Tools/Crashpad/include/util/win/safe_terminate_process.h
deleted file mode 100644
index 7079eb2adc..0000000000
--- a/Tools/Crashpad/include/util/win/safe_terminate_process.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_SAFE_TERMINATE_PROCESS_H_
-#define CRASHPAD_UTIL_WIN_SAFE_TERMINATE_PROCESS_H_
-
-#include <windows.h>
-
-#include "build/build_config.h"
-
-namespace crashpad {
-
-//! \brief Calls `TerminateProcess()`.
-//!
-//! `TerminateProcess()` has been observed in the wild as being patched badly on
-//! 32-bit x86: it’s patched with code adhering to the `cdecl` (caller clean-up)
-//! convention, although it’s supposed to be `stdcall` (callee clean-up). The
-//! mix-up means that neither caller nor callee perform parameter clean-up from
-//! the stack, causing the stack pointer to have an unexpected value on return
-//! from the patched function. This typically results in a crash shortly
-//! thereafter. See <a href="https://crashpad.chromium.org/bug/179">Crashpad bug
-//! 179</a>.
-//!
-//! On 32-bit x86, this replacement function calls `TerminateProcess()` without
-//! making any assumptions about the stack pointer on its return. As such, it’s
-//! compatible with the badly patched `cdecl` version as well as the native
-//! `stdcall` version (and other less badly patched versions).
-//!
-//! Elsewhere, this function calls `TerminateProcess()` directly without any
-//! additional fanfare.
-//!
-//! Call this function instead of `TerminateProcess()` anywhere that
-//! `TerminateProcess()` would normally be called.
-bool SafeTerminateProcess(HANDLE process, UINT exit_code);
-
-#if !defined(ARCH_CPU_X86)
-inline bool SafeTerminateProcess(HANDLE process, UINT exit_code) {
-  return TerminateProcess(process, exit_code) != FALSE;
-}
-#endif  // !ARCH_CPU_X86
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_SAFE_TERMINATE_PROCESS_H_
diff --git a/Tools/Crashpad/include/util/win/scoped_handle.h b/Tools/Crashpad/include/util/win/scoped_handle.h
deleted file mode 100644
index 68be4f7b9f..0000000000
--- a/Tools/Crashpad/include/util/win/scoped_handle.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_SCOPED_HANDLE_H_
-#define CRASHPAD_UTIL_WIN_SCOPED_HANDLE_H_
-
-#include <windows.h>
-
-#include "base/scoped_generic.h"
-
-namespace crashpad {
-
-namespace internal {
-
-struct ScopedFileHANDLECloseTraits {
-  static HANDLE InvalidValue() {
-    return INVALID_HANDLE_VALUE;
-  }
-  static void Free(HANDLE handle);
-};
-
-struct ScopedKernelHANDLECloseTraits {
-  static HANDLE InvalidValue() {
-    return nullptr;
-  }
-  static void Free(HANDLE handle);
-};
-
-}  // namespace internal
-
-using ScopedFileHANDLE =
-    base::ScopedGeneric<HANDLE, internal::ScopedFileHANDLECloseTraits>;
-using ScopedKernelHANDLE =
-    base::ScopedGeneric<HANDLE, internal::ScopedKernelHANDLECloseTraits>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_SCOPED_HANDLE_H_
diff --git a/Tools/Crashpad/include/util/win/scoped_local_alloc.h b/Tools/Crashpad/include/util/win/scoped_local_alloc.h
deleted file mode 100644
index b46078523e..0000000000
--- a/Tools/Crashpad/include/util/win/scoped_local_alloc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_SCOPED_LOCAL_ALLOC_H_
-#define CRASHPAD_UTIL_WIN_SCOPED_LOCAL_ALLOC_H_
-
-#include <windows.h>
-
-#include "base/scoped_generic.h"
-
-namespace crashpad {
-
-namespace internal {
-
-struct LocalAllocTraits {
-  static HLOCAL InvalidValue() { return nullptr; }
-  static void Free(HLOCAL mem);
-};
-
-}  // namespace internal
-
-using ScopedLocalAlloc =
-    base::ScopedGeneric<HLOCAL, internal::LocalAllocTraits>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_SCOPED_LOCAL_ALLOC_H_
diff --git a/Tools/Crashpad/include/util/win/scoped_process_suspend.h b/Tools/Crashpad/include/util/win/scoped_process_suspend.h
deleted file mode 100644
index 913886e5bf..0000000000
--- a/Tools/Crashpad/include/util/win/scoped_process_suspend.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_SCOPED_PROCESS_SUSPEND_H_
-#define CRASHPAD_UTIL_WIN_SCOPED_PROCESS_SUSPEND_H_
-
-#include <windows.h>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Manages the suspension of another process.
-//!
-//! While an object of this class exists, the other process will be suspended.
-//! Once the object is destroyed, the other process will become eligible for
-//! resumption.
-//!
-//! If this process crashes while this object exists, there is no guarantee that
-//! the other process will be resumed.
-class ScopedProcessSuspend {
- public:
-  //! Does not take ownership of \a process.
-  explicit ScopedProcessSuspend(HANDLE process);
-  ~ScopedProcessSuspend();
-
-  //! \brief Informs the object that the suspended process may be terminating,
-  //!     and that this should not be treated as an error.
-  //!
-  //! Normally, attempting to resume a terminating process during destruction
-  //! results in an error message being logged for
-  //! `STATUS_PROCESS_IS_TERMINATING`. When it is known that a process may be
-  //! terminating, this method may be called to suppress that error message.
-  void TolerateTermination();
-
- private:
-  HANDLE process_;
-  bool tolerate_termination_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedProcessSuspend);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_SCOPED_PROCESS_SUSPEND_H_
diff --git a/Tools/Crashpad/include/util/win/scoped_set_event.h b/Tools/Crashpad/include/util/win/scoped_set_event.h
deleted file mode 100644
index 82a1b31486..0000000000
--- a/Tools/Crashpad/include/util/win/scoped_set_event.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_SCOPED_SET_EVENT_H_
-#define CRASHPAD_UTIL_WIN_SCOPED_SET_EVENT_H_
-
-#include <windows.h>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Calls `SetEvent()` on destruction at latest.
-//!
-//! Does not assume ownership of the event handle. Use ScopedKernelHANDLE for
-//! ownership.
-class ScopedSetEvent {
- public:
-  explicit ScopedSetEvent(HANDLE event);
-  ~ScopedSetEvent();
-
-  //! \brief Calls `SetEvent()` immediately.
-  //!
-  //! `SetEvent()` will not be called on destruction.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool Set();
-
- private:
-  HANDLE event_;  // weak
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedSetEvent);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_SCOPED_SET_EVENT_H_
diff --git a/Tools/Crashpad/include/util/win/session_end_watcher.h b/Tools/Crashpad/include/util/win/session_end_watcher.h
deleted file mode 100644
index b23d391d8c..0000000000
--- a/Tools/Crashpad/include/util/win/session_end_watcher.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_SESSION_END_WATCHER_H_
-#define CRASHPAD_UTIL_WIN_SESSION_END_WATCHER_H_
-
-#include <windows.h>
-
-#include "base/macros.h"
-#include "util/thread/thread.h"
-#include "util/win/scoped_handle.h"
-
-namespace crashpad {
-
-//! \brief Creates a hidden window and waits for a `WM_ENDSESSION` message,
-//!     indicating that the session is ending and the application should
-//!     terminate.
-//!
-//! A dedicated thread will be created to run the `GetMessage()`-based message
-//! loop required to monitor for this message.
-//!
-//! Users should subclass this class and receive notifications by implementing
-//! the SessionEndWatcherEvent() method.
-class SessionEndWatcher : public Thread {
- public:
-  SessionEndWatcher();
-
-  //! \note The destructor waits for the thread that runs the message loop to
-  //!     terminate.
-  ~SessionEndWatcher() override;
-
- protected:
-  // Exposed for testing.
-  HWND GetWindow() const { return window_; }
-
-  // Exposed for testing. Blocks until window_ has been created. May be called
-  // multiple times if necessary.
-  void WaitForStart();
-
-  // Exposed for testing. Blocks until the message loop ends. May be called
-  // multiple times if necessary.
-  void WaitForStop();
-
- private:
-  // Thread:
-  void ThreadMain() override;
-
-  static LRESULT CALLBACK WindowProc(HWND window,
-                                     UINT message,
-                                     WPARAM w_param,
-                                     LPARAM l_param);
-
-  //! \brief A `WM_ENDSESSION` message was received and it indicates that the
-  //!     user session will be ending imminently.
-  //!
-  //! This method is called on the thread that runs the message loop.
-  virtual void SessionEnding() = 0;
-
-  HWND window_;  // Conceptually strong, but ownership managed in ThreadMain()
-  ScopedKernelHANDLE started_;
-  ScopedKernelHANDLE stopped_;
-
-  DISALLOW_COPY_AND_ASSIGN(SessionEndWatcher);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_SESSION_END_WATCHER_H_
diff --git a/Tools/Crashpad/include/util/win/termination_codes.h b/Tools/Crashpad/include/util/win/termination_codes.h
deleted file mode 100644
index ce7fdba97a..0000000000
--- a/Tools/Crashpad/include/util/win/termination_codes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_TERMINATION_CODES_H_
-#define CRASHPAD_UTIL_WIN_TERMINATION_CODES_H_
-
-namespace crashpad {
-
-//! \brief Crashpad-specific codes that are used as arguments to
-//!     SafeTerminateProcess() or `TerminateProcess()` in unusual circumstances.
-enum TerminationCodes : unsigned int {
-  //! \brief The crash handler did not respond, and the client self-terminated.
-  kTerminationCodeCrashNoDump = 0xffff7001,
-
-  //! \brief The initial process snapshot failed, so the correct client
-  //!     termination code could not be retrieved.
-  kTerminationCodeSnapshotFailed = 0xffff7002,
-
-  //! \brief A dump was requested for a client that was never registered with
-  //!     the crash handler.
-  kTerminationCodeNotConnectedToHandler = 0xffff7003,
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_TERMINATION_CODES_H_
diff --git a/Tools/Crashpad/include/util/win/xp_compat.h b/Tools/Crashpad/include/util/win/xp_compat.h
deleted file mode 100644
index 1d4d4a0b46..0000000000
--- a/Tools/Crashpad/include/util/win/xp_compat.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_XP_COMPAT_H_
-#define CRASHPAD_UTIL_WIN_XP_COMPAT_H_
-
-#include <windows.h>
-
-namespace crashpad {
-
-enum {
-  //! \brief This is the XP-suitable value of `PROCESS_ALL_ACCESS`.
-  //!
-  //! Requesting `PROCESS_ALL_ACCESS` with the value defined when building
-  //! against a Vista+ SDK results in `ERROR_ACCESS_DENIED` when running on XP.
-  //! See https://msdn.microsoft.com/library/ms684880.aspx.
-  kXPProcessAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFF,
-
-  //! \brief This is the XP-suitable value of `THREAD_ALL_ACCESS`.
-  //!
-  //! Requesting `THREAD_ALL_ACCESS` with the value defined when building
-  //! against a Vista+ SDK results in `ERROR_ACCESS_DENIED` when running on XP.
-  //! See https://msdn.microsoft.com/library/ms686769.aspx.
-  kXPThreadAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3FF,
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_XP_COMPAT_H_
diff --git a/Tools/Crashpad/include/vs2013/client/crash_report_database.h b/Tools/Crashpad/include/vs2013/client/crash_report_database.h
deleted file mode 100644
index 3768cb2335..0000000000
--- a/Tools/Crashpad/include/vs2013/client/crash_report_database.h
+++ /dev/null
@@ -1,362 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_
-#define CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_
-
-#include <time.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "util/file/file_io.h"
-#include "util/misc/metrics.h"
-#include "util/misc/uuid.h"
-
-namespace crashpad {
-
-class Settings;
-
-//! \brief An interface for managing a collection of crash report files and
-//!     metadata associated with the crash reports.
-//!
-//! All Report objects that are returned by this class are logically const.
-//! They are snapshots of the database at the time the query was run, and the
-//! data returned is liable to change after the query is executed.
-//!
-//! The lifecycle of a crash report has three stages:
-//!
-//!   1. New: A crash report is created with PrepareNewCrashReport(), the
-//!      the client then writes the report, and then calls
-//!      FinishedWritingCrashReport() to make the report Pending.
-//!   2. Pending: The report has been written but has not been locally
-//!      processed, or it was has been brought back from 'Completed' state by
-//!      user request.
-//!   3. Completed: The report has been locally processed, either by uploading
-//!      it to a collection server and calling RecordUploadAttempt(), or by
-//!      calling SkipReportUpload().
-class CrashReportDatabase {
- public:
-  //! \brief A crash report record.
-  //!
-  //! This represents the metadata for a crash report, as well as the location
-  //! of the report itself. A CrashReportDatabase maintains at least this
-  //! information.
-  struct Report {
-    Report();
-
-    //! A unique identifier by which this report will always be known to the
-    //! database.
-    UUID uuid;
-
-    //! The current location of the crash report on the client’s filesystem.
-    //! The location of a crash report may change over time, so the UUID should
-    //! be used as the canonical identifier.
-    base::FilePath file_path;
-
-    //! An identifier issued to this crash report by a collection server.
-    std::string id;
-
-    //! The time at which the report was generated.
-    time_t creation_time;
-
-    //! Whether this crash report was successfully uploaded to a collection
-    //! server.
-    bool uploaded;
-
-    //! The last timestamp at which an attempt was made to submit this crash
-    //! report to a collection server. If this is zero, then the report has
-    //! never been uploaded. If #uploaded is true, then this timestamp is the
-    //! time at which the report was uploaded, and no other attempts to upload
-    //! this report will be made.
-    time_t last_upload_attempt_time;
-
-    //! The number of times an attempt was made to submit this report to
-    //! a collection server. If this is more than zero, then
-    //! #last_upload_attempt_time will be set to the timestamp of the most
-    //! recent attempt.
-    int upload_attempts;
-
-    //! Whether this crash report was explicitly requested by user to be
-    //! uploaded. This can be true only if report is in the 'pending' state.
-    bool upload_explicitly_requested;
-  };
-
-  //! \brief A crash report that is in the process of being written.
-  //!
-  //! An instance of this struct should be created via PrepareNewCrashReport()
-  //! and destroyed with FinishedWritingCrashReport().
-  struct NewReport {
-    //! The file handle to which the report should be written.
-    FileHandle handle;
-
-    //! A unique identifier by which this report will always be known to the
-    //! database.
-    UUID uuid;
-
-    //! The path to the crash report being written.
-    base::FilePath path;
-  };
-
-  //! \brief A scoper to cleanly handle the interface requirement imposed by
-  //!     PrepareNewCrashReport().
-  //!
-  //! Calls ErrorWritingCrashReport() upon destruction unless disarmed by
-  //! calling Disarm(). Armed upon construction.
-  class CallErrorWritingCrashReport {
-   public:
-    //! \brief Arms the object to call ErrorWritingCrashReport() on \a database
-    //!     with an argument of \a new_report on destruction.
-    CallErrorWritingCrashReport(CrashReportDatabase* database,
-                                NewReport* new_report);
-
-    //! \brief Calls ErrorWritingCrashReport() if the object is armed.
-    ~CallErrorWritingCrashReport();
-
-    //! \brief Disarms the object so that CallErrorWritingCrashReport() will not
-    //!     be called upon destruction.
-    void Disarm();
-
-   private:
-    CrashReportDatabase* database_;  // weak
-    NewReport* new_report_;  // weak
-
-    DISALLOW_COPY_AND_ASSIGN(CallErrorWritingCrashReport);
-  };
-
-  //! \brief The result code for operations performed on a database.
-  enum OperationStatus {
-    //! \brief No error occurred.
-    kNoError = 0,
-
-    //! \brief The report that was requested could not be located.
-    kReportNotFound,
-
-    //! \brief An error occured while performing a file operation on a crash
-    //!     report.
-    //!
-    //! A database is responsible for managing both the metadata about a report
-    //! and the actual crash report itself. This error is returned when an
-    //! error occurred when managing the report file. Additional information
-    //! will be logged.
-    kFileSystemError,
-
-    //! \brief An error occured while recording metadata for a crash report or
-    //!     database-wide settings.
-    //!
-    //! A database is responsible for managing both the metadata about a report
-    //! and the actual crash report itself. This error is returned when an
-    //! error occurred when managing the metadata about a crash report or
-    //! database-wide settings. Additional information will be logged.
-    kDatabaseError,
-
-    //! \brief The operation could not be completed because a concurrent
-    //!     operation affecting the report is occurring.
-    kBusyError,
-
-    //! \brief The report cannot be uploaded by user request as it has already
-    //!     been uploaded.
-    kCannotRequestUpload,
-  };
-
-  virtual ~CrashReportDatabase() {}
-
-  //! \brief Opens a database of crash reports, possibly creating it.
-  //!
-  //! \param[in] path A path to the database to be created or opened. If the
-  //!     database does not yet exist, it will be created if possible. Note that
-  //!     for databases implemented as directory structures, existence refers
-  //!     solely to the outermost directory.
-  //!
-  //! \return A database object on success, `nullptr` on failure with an error
-  //!     logged.
-  //!
-  //! \sa InitializeWithoutCreating
-  static std::unique_ptr<CrashReportDatabase> Initialize(
-      const base::FilePath& path);
-
-  //! \brief Opens an existing database of crash reports.
-  //!
-  //! \param[in] path A path to the database to be opened. If the database does
-  //!     not yet exist, it will not be created. Note that for databases
-  //!     implemented as directory structures, existence refers solely to the
-  //!     outermost directory. On such databases, as long as the outermost
-  //!     directory is present, this method will create the inner structure.
-  //!
-  //! \return A database object on success, `nullptr` on failure with an error
-  //!     logged.
-  //!
-  //! \sa Initialize
-  static std::unique_ptr<CrashReportDatabase> InitializeWithoutCreating(
-      const base::FilePath& path);
-
-  //! \brief Returns the Settings object for this database.
-  //!
-  //! \return A weak pointer to the Settings object, which is owned by the
-  //!     database.
-  virtual Settings* GetSettings() = 0;
-
-  //! \brief Creates a record of a new crash report.
-  //!
-  //! Callers can then write the crash report using the file handle provided.
-  //! The caller does not own the new crash report record or its file handle,
-  //! both of which must be explicitly disposed of by calling
-  //! FinishedWritingCrashReport() or ErrorWritingCrashReport().
-  //!
-  //! To arrange to call ErrorWritingCrashReport() during any early return, use
-  //! CallErrorWritingCrashReport.
-  //!
-  //! \param[out] report A NewReport object containing a file handle to which
-  //!     the crash report data should be written. Only valid if this returns
-  //!     #kNoError. The caller must not delete the NewReport object or close
-  //!     the file handle within.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus PrepareNewCrashReport(NewReport** report) = 0;
-
-  //! \brief Informs the database that a crash report has been written.
-  //!
-  //! After calling this method, the database is permitted to move and rename
-  //! the file at NewReport::path.
-  //!
-  //! \param[in] report A NewReport obtained with PrepareNewCrashReport(). The
-  //!     NewReport object and file handle within will be invalidated as part of
-  //!     this call.
-  //! \param[out] uuid The UUID of this crash report.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus FinishedWritingCrashReport(NewReport* report,
-                                                     UUID* uuid) = 0;
-
-  //! \brief Informs the database that an error occurred while attempting to
-  //!     write a crash report, and that any resources associated with it should
-  //!     be cleaned up.
-  //!
-  //! After calling this method, the database is permitted to remove the file at
-  //! NewReport::path.
-  //!
-  //! \param[in] report A NewReport obtained with PrepareNewCrashReport(). The
-  //!     NewReport object and file handle within will be invalidated as part of
-  //!     this call.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus ErrorWritingCrashReport(NewReport* report) = 0;
-
-  //! \brief Returns the crash report record for the unique identifier.
-  //!
-  //! \param[in] uuid The crash report record unique identifier.
-  //! \param[out] report A crash report record. Only valid if this returns
-  //!     #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus LookUpCrashReport(const UUID& uuid,
-                                            Report* report) = 0;
-
-  //! \brief Returns a list of crash report records that have not been uploaded.
-  //!
-  //! \param[out] reports A list of crash report record objects. This must be
-  //!     empty on entry. Only valid if this returns #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus GetPendingReports(std::vector<Report>* reports) = 0;
-
-  //! \brief Returns a list of crash report records that have been completed,
-  //!     either by being uploaded or by skipping upload.
-  //!
-  //! \param[out] reports A list of crash report record objects. This must be
-  //!     empty on entry. Only valid if this returns #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus GetCompletedReports(std::vector<Report>* reports) = 0;
-
-  //! \brief Obtains a report object for uploading to a collection server.
-  //!
-  //! The file at Report::file_path should be uploaded by the caller, and then
-  //! the returned Report object must be disposed of via a call to
-  //! RecordUploadAttempt().
-  //!
-  //! A subsequent call to this method with the same \a uuid is illegal until
-  //! RecordUploadAttempt() has been called.
-  //!
-  //! \param[in] uuid The unique identifier for the crash report record.
-  //! \param[out] report A crash report record for the report to be uploaded.
-  //!     The caller does not own this object. Only valid if this returns
-  //!     #kNoError.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus GetReportForUploading(const UUID& uuid,
-                                                const Report** report) = 0;
-
-  //! \brief Adjusts a crash report record’s metadata to account for an upload
-  //!     attempt, and updates the last upload attempt time as returned by
-  //!     Settings::GetLastUploadAttemptTime().
-  //!
-  //! After calling this method, the database is permitted to move and rename
-  //! the file at Report::file_path.
-  //!
-  //! \param[in] report The report object obtained from
-  //!     GetReportForUploading(). This object is invalidated after this call.
-  //! \param[in] successful Whether the upload attempt was successful.
-  //! \param[in] id The identifier assigned to this crash report by the
-  //!     collection server. Must be empty if \a successful is `false`; may be
-  //!     empty if it is `true`.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus RecordUploadAttempt(const Report* report,
-                                              bool successful,
-                                              const std::string& id) = 0;
-
-  //! \brief Moves a report from the pending state to the completed state, but
-  //!     without the report being uploaded.
-  //!
-  //! This can be used if the user has disabled crash report collection, but
-  //! crash generation is still enabled in the product.
-  //!
-  //! \param[in] uuid The unique identifier for the crash report record.
-  //! \param[in] reason The reason the report upload is being skipped for
-  //!     metrics tracking purposes.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus SkipReportUpload(
-      const UUID& uuid,
-      Metrics::CrashSkippedReason reason) = 0;
-
-  //! \brief Deletes a crash report file and its associated metadata.
-  //!
-  //! \param[in] uuid The UUID of the report to delete.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus DeleteReport(const UUID& uuid) = 0;
-
-  //! \brief Marks a crash report as explicitly requested to be uploaded by the
-  //!     user and moves it to 'pending' state.
-  //!
-  //! \param[in] uuid The unique identifier for the crash report record.
-  //!
-  //! \return The operation status code.
-  virtual OperationStatus RequestUpload(const UUID& uuid) = 0;
-
- protected:
-  CrashReportDatabase() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CrashReportDatabase);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_
diff --git a/Tools/Crashpad/include/vs2013/client/crashpad_client.h b/Tools/Crashpad/include/vs2013/client/crashpad_client.h
deleted file mode 100644
index 844512f160..0000000000
--- a/Tools/Crashpad/include/vs2013/client/crashpad_client.h
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
-#define CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include <stdint.h>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "build/build_config.h"
-
-#if defined(OS_MACOSX)
-#include "base/mac/scoped_mach_port.h"
-#elif defined(OS_WIN)
-#include <windows.h>
-#include "util/win/scoped_handle.h"
-#endif
-
-namespace crashpad {
-
-//! \brief The primary interface for an application to have Crashpad monitor
-//!     it for crashes.
-class CrashpadClient {
- public:
-  CrashpadClient();
-  ~CrashpadClient();
-
-  //! \brief Starts a Crashpad handler process, performing any necessary
-  //!     handshake to configure it.
-  //!
-  //! This method directs crashes to the Crashpad handler. On macOS, this is
-  //! applicable to this process and all subsequent child processes. On Windows,
-  //! child processes must also register by using SetHandlerIPCPipe().
-  //!
-  //! On macOS, this method starts a Crashpad handler and obtains a Mach send
-  //! right corresponding to a receive right held by the handler process. The
-  //! handler process runs an exception server on this port. This method sets
-  //! the task’s exception port for `EXC_CRASH`, `EXC_RESOURCE`, and `EXC_GUARD`
-  //! exceptions to the Mach send right obtained. The handler will be installed
-  //! with behavior `EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES` and thread
-  //! state flavor `MACHINE_THREAD_STATE`. Exception ports are inherited, so a
-  //! Crashpad handler started here will remain the handler for any child
-  //! processes created after StartHandler() is called. These child processes do
-  //! not need to call StartHandler() or be aware of Crashpad in any way. The
-  //! Crashpad handler will receive crashes from child processes that have
-  //! inherited it as their exception handler even after the process that called
-  //! StartHandler() exits.
-  //!
-  //! On Windows, if \a asynchronous_start is `true`, this function will not
-  //! directly call `CreateProcess()`, making it suitable for use in a
-  //! `DllMain()`. In that case, the handler is started from a background
-  //! thread, deferring the handler's startup. Nevertheless, regardless of the
-  //! value of \a asynchronous_start, after calling this method, the global
-  //! unhandled exception filter is set up, and all crashes will be handled by
-  //! Crashpad. Optionally, use WaitForHandlerStart() to join with the
-  //! background thread and retrieve the status of handler startup.
-  //!
-  //! \param[in] handler The path to a Crashpad handler executable.
-  //! \param[in] database The path to a Crashpad database. The handler will be
-  //!     started with this path as its `--database` argument.
-  //! \param[in] metrics_dir The path to an already existing directory where
-  //!     metrics files can be stored. The handler will be started with this
-  //!     path as its `--metrics-dir` argument.
-  //! \param[in] url The URL of an upload server. The handler will be started
-  //!     with this URL as its `--url` argument.
-  //! \param[in] annotations Process annotations to set in each crash report.
-  //!     The handler will be started with an `--annotation` argument for each
-  //!     element in this map.
-  //! \param[in] arguments Additional arguments to pass to the Crashpad handler.
-  //!     Arguments passed in other parameters and arguments required to perform
-  //!     the handshake are the responsibility of this method, and must not be
-  //!     specified in this parameter.
-  //! \param[in] restartable If `true`, the handler will be restarted if it
-  //!     dies, if this behavior is supported. This option is not available on
-  //!     all platforms, and does not function on all OS versions. If it is
-  //!     not supported, it will be ignored.
-  //! \param[out] asynchronous_start If `true`, the handler will be started from
-  //!     a background thread. Optionally, WaitForHandlerStart() can be used at
-  //!     a suitable time to retreive the result of background startup. This
-  //!     option is only used on Windows.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool StartHandler(const base::FilePath& handler,
-                    const base::FilePath& database,
-                    const base::FilePath& metrics_dir,
-                    const std::string& url,
-                    const std::map<std::string, std::string>& annotations,
-                    const std::vector<std::string>& arguments,
-                    bool restartable,
-                    bool asynchronous_start);
-
-#if defined(OS_MACOSX) || DOXYGEN
-  //! \brief Sets the process’ crash handler to a Mach service registered with
-  //!     the bootstrap server.
-  //!
-  //! This method is only defined on macOS.
-  //!
-  //! See StartHandler() for more detail on how the port and handler are
-  //! configured.
-  //!
-  //! \param[in] service_name The service name of a Crashpad exception handler
-  //!     service previously registered with the bootstrap server.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool SetHandlerMachService(const std::string& service_name);
-
-  //! \brief Sets the process’ crash handler to a Mach port.
-  //!
-  //! This method is only defined on macOS.
-  //!
-  //! See StartHandler() for more detail on how the port and handler are
-  //! configured.
-  //!
-  //! \param[in] exception_port An `exception_port_t` corresponding to a
-  //!     Crashpad exception handler service.
-  //!
-  //! \return `true` on success, `false` on failure with a message logged.
-  bool SetHandlerMachPort(base::mac::ScopedMachSendRight exception_port);
-#endif
-
-#if defined(OS_WIN) || DOXYGEN
-  //! \brief Sets the IPC pipe of a presumably-running Crashpad handler process
-  //!     which was started with StartHandler() or by other compatible means
-  //!     and does an IPC message exchange to register this process with the
-  //!     handler. Crashes will be serviced once this method returns.
-  //!
-  //! This method is only defined on Windows.
-  //!
-  //! This method sets the unhandled exception handler to a local
-  //! function that when reached will "signal and wait" for the crash handler
-  //! process to create the dump.
-  //!
-  //! \param[in] ipc_pipe The full name of the crash handler IPC pipe. This is
-  //!     a string of the form `&quot;\\.\pipe\NAME&quot;`.
-  //!
-  //! \return `true` on success and `false` on failure.
-  bool SetHandlerIPCPipe(const std::wstring& ipc_pipe);
-
-  //! \brief Retrieves the IPC pipe name used to register with the Crashpad
-  //!     handler.
-  //!
-  //! This method retrieves the IPC pipe name set by SetHandlerIPCPipe(), or a
-  //! suitable IPC pipe name chosen by StartHandler(). It is intended to be used
-  //! to obtain the IPC pipe name so that it may be passed to other processes,
-  //! so that they may register with an existing Crashpad handler by calling
-  //! SetHandlerIPCPipe().
-  //!
-  //! This method is only defined on Windows.
-  //!
-  //! \return The full name of the crash handler IPC pipe, a string of the form
-  //!     `&quot;\\.\pipe\NAME&quot;`.
-  std::wstring GetHandlerIPCPipe() const;
-
-  //! \brief When `asynchronous_start` is used with StartHandler(), this method
-  //!     can be used to block until the handler launch has been completed to
-  //!     retrieve status information.
-  //!
-  //! This method should not be used unless `asynchronous_start` was `true`.
-  //!
-  //! \return `true` if the hander startup succeeded, `false` otherwise, and an
-  //!     error message will have been logged.
-  bool WaitForHandlerStart();
-
-  //! \brief Requests that the handler capture a dump even though there hasn't
-  //!     been a crash.
-  //!
-  //! \param[in] context A `CONTEXT`, generally captured by CaptureContext() or
-  //!     similar.
-  static void DumpWithoutCrash(const CONTEXT& context);
-
-  //! \brief Requests that the handler capture a dump using the given \a
-  //!     exception_pointers to get the `EXCEPTION_RECORD` and `CONTEXT`.
-  //!
-  //! This function is not necessary in general usage as an unhandled exception
-  //! filter is installed by StartHandler() or SetHandlerIPCPipe().
-  //!
-  //! \param[in] exception_pointers An `EXCEPTION_POINTERS`, as would generally
-  //!     passed to an unhandled exception filter.
-  static void DumpAndCrash(EXCEPTION_POINTERS* exception_pointers);
-
-  //! \brief Requests that the handler capture a dump of a different process.
-  //!
-  //! The target process must be an already-registered Crashpad client. An
-  //! exception will be triggered in the target process, and the regular dump
-  //! mechanism used. This function will block until the exception in the target
-  //! process has been handled by the Crashpad handler.
-  //!
-  //! This function is unavailable when running on Windows XP and will return
-  //! `false`.
-  //!
-  //! \param[in] process A `HANDLE` identifying the process to be dumped.
-  //! \param[in] blame_thread If non-null, a `HANDLE` valid in the caller's
-  //!     process, referring to a thread in the target process. If this is
-  //!     supplied, instead of the exception referring to the location where the
-  //!     exception was injected, an exception record will be fabricated that
-  //!     refers to the current location of the given thread.
-  //! \param[in] exception_code If \a blame_thread is non-null, this will be
-  //!     used as the exception code in the exception record.
-  //!
-  //! \return `true` if the exception was triggered successfully.
-  bool DumpAndCrashTargetProcess(HANDLE process,
-                                 HANDLE blame_thread,
-                                 DWORD exception_code) const;
-
-  enum : uint32_t {
-    //! \brief The exception code (roughly "Client called") used when
-    //!     DumpAndCrashTargetProcess() triggers an exception in a target
-    //!     process.
-    //!
-    //! \note This value does not have any bits of the top nibble set, to avoid
-    //!     confusion with real exception codes which tend to have those bits
-    //!     set.
-    kTriggeredExceptionCode = 0xcca11ed,
-  };
-#endif
-
-#if defined(OS_MACOSX) || DOXYGEN
-  //! \brief Configures the process to direct its crashes to the default handler
-  //!     for the operating system.
-  //!
-  //! On macOS, this sets the task’s exception port as in SetHandlerMachPort(),
-  //! but the exception handler used is obtained from
-  //! SystemCrashReporterHandler(). If the system’s crash reporter handler
-  //! cannot be determined or set, the task’s exception ports for crash-type
-  //! exceptions are cleared.
-  //!
-  //! Use of this function is strongly discouraged.
-  //!
-  //! \warning After a call to this function, Crashpad will no longer monitor
-  //!     the process for crashes until a subsequent call to
-  //!     SetHandlerMachPort().
-  //!
-  //! \note This is provided as a static function to allow it to be used in
-  //!     situations where a CrashpadClient object is not otherwise available.
-  //!     This may be useful when a child process inherits its parent’s Crashpad
-  //!     handler, but wants to sever this tie.
-  static void UseSystemDefaultHandler();
-#endif
-
- private:
-#if defined(OS_WIN)
-  std::wstring ipc_pipe_;
-  ScopedKernelHANDLE handler_start_thread_;
-#endif
-
-  DISALLOW_COPY_AND_ASSIGN(CrashpadClient);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
diff --git a/Tools/Crashpad/include/vs2013/client/settings.h b/Tools/Crashpad/include/vs2013/client/settings.h
deleted file mode 100644
index b64f74fbaf..0000000000
--- a/Tools/Crashpad/include/vs2013/client/settings.h
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_CLIENT_SETTINGS_H_
-#define CRASHPAD_CLIENT_SETTINGS_H_
-
-#include <time.h>
-
-#include <string>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "base/scoped_generic.h"
-#include "util/file/file_io.h"
-#include "util/misc/initialization_state.h"
-#include "util/misc/uuid.h"
-
-namespace crashpad {
-
-namespace internal {
-
-struct ScopedLockedFileHandleTraits {
-  static FileHandle InvalidValue() { return kInvalidFileHandle; }
-  static void Free(FileHandle handle);
-};
-
-}  // namespace internal
-
-//! \brief An interface for accessing and modifying the settings of a
-//!     CrashReportDatabase.
-//!
-//! This class must not be instantiated directly, but rather an instance of it
-//! should be retrieved via CrashReportDatabase::GetSettings().
-class Settings {
- public:
-  explicit Settings(const base::FilePath& file_path);
-  ~Settings();
-
-  bool Initialize();
-
-  //! \brief Retrieves the immutable identifier for this client, which is used
-  //!     on a server to locate all crash reports from a specific Crashpad
-  //!     database.
-  //!
-  //! This is automatically initialized when the database is created.
-  //!
-  //! \param[out] client_id The unique client identifier.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool GetClientID(UUID* client_id);
-
-  //! \brief Retrieves the user’s preference for submitting crash reports to a
-  //!     collection server.
-  //!
-  //! The default value is `false`.
-  //!
-  //! \param[out] enabled Whether crash reports should be uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool GetUploadsEnabled(bool* enabled);
-
-  //! \brief Sets the user’s preference for submitting crash reports to a
-  //!     collection server.
-  //!
-  //! \param[in] enabled Whether crash reports should be uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool SetUploadsEnabled(bool enabled);
-
-  //! \brief Retrieves the last time at which a report was attempted to be
-  //!     uploaded.
-  //!
-  //! The default value is `0` if it has never been set before.
-  //!
-  //! \param[out] time The last time at which a report was uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool GetLastUploadAttemptTime(time_t* time);
-
-  //! \brief Sets the last time at which a report was attempted to be uploaded.
-  //!
-  //! This is only meant to be used internally by the CrashReportDatabase.
-  //!
-  //! \param[in] time The last time at which a report was uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool SetLastUploadAttemptTime(time_t time);
-
- private:
-  struct Data;
-
-  // This must be constructed with MakeScopedLockedFileHandle(). It both unlocks
-  // and closes the file on destruction.
-  using ScopedLockedFileHandle =
-      base::ScopedGeneric<FileHandle, internal::ScopedLockedFileHandleTraits>;
-  static ScopedLockedFileHandle MakeScopedLockedFileHandle(FileHandle file,
-                                                           FileLocking locking);
-
-  // Opens the settings file for reading. On error, logs a message and returns
-  // the invalid handle.
-  ScopedLockedFileHandle OpenForReading();
-
-  // Opens the settings file for reading and writing. On error, logs a message
-  // and returns the invalid handle. |mode| determines how the file will be
-  // opened. |mode| must not be FileWriteMode::kTruncateOrCreate.
-  //
-  // If |log_open_error| is false, nothing will be logged for an error
-  // encountered when attempting to open the file, but this method will still
-  // return false. This is intended to be used to suppress error messages when
-  // attempting to create a new settings file when multiple attempts are made.
-  ScopedLockedFileHandle OpenForReadingAndWriting(FileWriteMode mode,
-                                                  bool log_open_error);
-
-  // Opens the settings file and reads the data. If that fails, an error will
-  // be logged and the settings will be recovered and re-initialized. If that
-  // also fails, returns false with additional log data from recovery.
-  bool OpenAndReadSettings(Data* out_data);
-
-  // Opens the settings file for writing and reads the data. If reading fails,
-  // recovery is attempted. Returns the opened file handle on success, or the
-  // invalid file handle on failure, with an error logged.
-  ScopedLockedFileHandle OpenForWritingAndReadSettings(Data* out_data);
-
-  // Reads the settings from |handle|. Logs an error and returns false on
-  // failure. This does not perform recovery.
-  //
-  // |handle| must be the result of OpenForReading() or
-  // OpenForReadingAndWriting().
-  //
-  // If |log_read_error| is false, nothing will be logged for a read error, but
-  // this method will still return false. This is intended to be used to
-  // suppress error messages when attempting to read a newly created settings
-  // file.
-  bool ReadSettings(FileHandle handle, Data* out_data, bool log_read_error);
-
-  // Writes the settings to |handle|. Logs an error and returns false on
-  // failure. This does not perform recovery.
-  //
-  // |handle| must be the result of OpenForReadingAndWriting().
-  bool WriteSettings(FileHandle handle, const Data& data);
-
-  // Recovers the settings file by re-initializing the data. If |handle| is the
-  // invalid handle, this will open the file; if it is not, then it must be the
-  // result of OpenForReadingAndWriting(). If the invalid handle is passed, the
-  // caller must not be holding the handle. The new settings data are stored in
-  // |out_data|. Returns true on success and false on failure, with an error
-  // logged.
-  bool RecoverSettings(FileHandle handle, Data* out_data);
-
-  // Initializes a settings file and writes the data to |handle|. Returns true
-  // on success and false on failure, with an error logged.
-  //
-  // |handle| must be the result of OpenForReadingAndWriting().
-  bool InitializeSettings(FileHandle handle);
-
-  const base::FilePath& file_path() const { return file_path_; }
-
-  base::FilePath file_path_;
-
-  InitializationState initialized_;
-
-  DISALLOW_COPY_AND_ASSIGN(Settings);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_CLIENT_SETTINGS_H_
diff --git a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/compiler_specific.h b/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/compiler_specific.h
deleted file mode 100644
index 73c02ea5fd..0000000000
--- a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/compiler_specific.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_
-#define MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_
-
-#include "build/build_config.h"
-
-#if defined(COMPILER_MSVC)
-
-// MSVC_SUPPRESS_WARNING disables warning |n| for the remainder of the line and
-// for the next line of the source file.
-#define MSVC_SUPPRESS_WARNING(n) __pragma(warning(suppress:n))
-
-// MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled.
-// The warning remains disabled until popped by MSVC_POP_WARNING.
-#define MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \
-                                     __pragma(warning(disable:n))
-
-// Pop effects of innermost MSVC_PUSH_* macro.
-#define MSVC_POP_WARNING() __pragma(warning(pop))
-
-#else  // Not MSVC
-
-#define MSVC_SUPPRESS_WARNING(n)
-#define MSVC_PUSH_DISABLE_WARNING(n)
-#define MSVC_POP_WARNING()
-
-#endif  // COMPILER_MSVC
-
-// Annotate a variable indicating it's ok if the variable is not used.
-// (Typically used to silence a compiler warning when the assignment
-// is important for some other reason.)
-// Use like:
-//   int x = ...;
-//   ALLOW_UNUSED_LOCAL(x);
-#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
-
-// Annotate a typedef or function indicating it's ok if it's not used.
-// Use like:
-//   typedef Foo Bar ALLOW_UNUSED_TYPE;
-#if defined(COMPILER_GCC)
-#define ALLOW_UNUSED_TYPE __attribute__((unused))
-#else
-#define ALLOW_UNUSED_TYPE
-#endif
-
-// Specify memory alignment for structs, classes, etc.
-// Use like:
-//   class ALIGNAS(16) MyClass { ... }
-//   ALIGNAS(16) int array[4];
-#if defined(COMPILER_MSVC)
-#define ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-#elif defined(COMPILER_GCC)
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-#endif
-
-// Return the byte alignment of the given type (available at compile time).  Use
-// sizeof(type) prior to checking __alignof to workaround Visual C++ bug:
-// http://goo.gl/isH0C
-// Use like:
-//   ALIGNOF(int32_t)  // this would be 4
-#if defined(COMPILER_MSVC)
-#define ALIGNOF(type) (sizeof(type) - sizeof(type) + __alignof(type))
-#elif defined(COMPILER_GCC)
-#define ALIGNOF(type) __alignof__(type)
-#endif
-
-#if defined(COMPILER_MSVC)
-#define WARN_UNUSED_RESULT
-#else
-#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#endif
-
-#if defined(COMPILER_MSVC)
-#define PRINTF_FORMAT(format_param, dots_param)
-#else
-#define PRINTF_FORMAT(format_param, dots_param) \
-    __attribute__((format(printf, format_param, dots_param)))
-#endif
-
-// Compiler feature-detection.
-// clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension
-#if defined(__has_feature)
-#define HAS_FEATURE(FEATURE) __has_feature(FEATURE)
-#else
-#define HAS_FEATURE(FEATURE) 0
-#endif
-
-#endif  // MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_
diff --git a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/files/file_path.h b/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/files/file_path.h
deleted file mode 100644
index 0ac91bf873..0000000000
--- a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/files/file_path.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// FilePath is a container for pathnames stored in a platform's native string
-// type, providing containers for manipulation in according with the
-// platform's conventions for pathnames.  It supports the following path
-// types:
-//
-//                   POSIX            Windows
-//                   ---------------  ----------------------------------
-// Fundamental type  char[]           wchar_t[]
-// Encoding          unspecified*     UTF-16
-// Separator         /                \, tolerant of /
-// Drive letters     no               case-insensitive A-Z followed by :
-// Alternate root    // (surprise!)   \\, for UNC paths
-//
-// * The encoding need not be specified on POSIX systems, although some
-//   POSIX-compliant systems do specify an encoding.  Mac OS X uses UTF-8.
-//   Chrome OS also uses UTF-8.
-//   Linux does not specify an encoding, but in practice, the locale's
-//   character set may be used.
-//
-// For more arcane bits of path trivia, see below.
-//
-// FilePath objects are intended to be used anywhere paths are.  An
-// application may pass FilePath objects around internally, masking the
-// underlying differences between systems, only differing in implementation
-// where interfacing directly with the system.  For example, a single
-// OpenFile(const FilePath &) function may be made available, allowing all
-// callers to operate without regard to the underlying implementation.  On
-// POSIX-like platforms, OpenFile might wrap fopen, and on Windows, it might
-// wrap _wfopen_s, perhaps both by calling file_path.value().c_str().  This
-// allows each platform to pass pathnames around without requiring conversions
-// between encodings, which has an impact on performance, but more imporantly,
-// has an impact on correctness on platforms that do not have well-defined
-// encodings for pathnames.
-//
-// Several methods are available to perform common operations on a FilePath
-// object, such as determining the parent directory (DirName), isolating the
-// final path component (BaseName), and appending a relative pathname string
-// to an existing FilePath object (Append).  These methods are highly
-// recommended over attempting to split and concatenate strings directly.
-// These methods are based purely on string manipulation and knowledge of
-// platform-specific pathname conventions, and do not consult the filesystem
-// at all, making them safe to use without fear of blocking on I/O operations.
-// These methods do not function as mutators but instead return distinct
-// instances of FilePath objects, and are therefore safe to use on const
-// objects.  The objects themselves are safe to share between threads.
-//
-// To aid in initialization of FilePath objects from string literals, a
-// FILE_PATH_LITERAL macro is provided, which accounts for the difference
-// between char[]-based pathnames on POSIX systems and wchar_t[]-based
-// pathnames on Windows.
-//
-// Paths can't contain NULs as a precaution agaist premature truncation.
-//
-// Because a FilePath object should not be instantiated at the global scope,
-// instead, use a FilePath::CharType[] and initialize it with
-// FILE_PATH_LITERAL.  At runtime, a FilePath object can be created from the
-// character array.  Example:
-//
-// | const FilePath::CharType kLogFileName[] = FILE_PATH_LITERAL("log.txt");
-// |
-// | void Function() {
-// |   FilePath log_file_path(kLogFileName);
-// |   [...]
-// | }
-//
-// WARNING: FilePaths should ALWAYS be displayed with LTR directionality, even
-// when the UI language is RTL. This means you always need to pass filepaths
-// through base::i18n::WrapPathWithLTRFormatting() before displaying it in the
-// RTL UI.
-//
-// This is a very common source of bugs, please try to keep this in mind.
-//
-// ARCANE BITS OF PATH TRIVIA
-//
-//  - A double leading slash is actually part of the POSIX standard.  Systems
-//    are allowed to treat // as an alternate root, as Windows does for UNC
-//    (network share) paths.  Most POSIX systems don't do anything special
-//    with two leading slashes, but FilePath handles this case properly
-//    in case it ever comes across such a system.  FilePath needs this support
-//    for Windows UNC paths, anyway.
-//    References:
-//    The Open Group Base Specifications Issue 7, sections 3.266 ("Pathname")
-//    and 4.12 ("Pathname Resolution"), available at:
-//    http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_266
-//    http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_12
-//
-//  - Windows treats c:\\ the same way it treats \\.  This was intended to
-//    allow older applications that require drive letters to support UNC paths
-//    like \\server\share\path, by permitting c:\\server\share\path as an
-//    equivalent.  Since the OS treats these paths specially, FilePath needs
-//    to do the same.  Since Windows can use either / or \ as the separator,
-//    FilePath treats c://, c:\\, //, and \\ all equivalently.
-//    Reference:
-//    The Old New Thing, "Why is a drive letter permitted in front of UNC
-//    paths (sometimes)?", available at:
-//    http://blogs.msdn.com/oldnewthing/archive/2005/11/22/495740.aspx
-
-#ifndef MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_
-#define MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_
-
-#include <stddef.h>
-
-#include <iosfwd>
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "build/build_config.h"
-
-// Windows-style drive letter support and pathname separator characters can be
-// enabled and disabled independently, to aid testing.  These #defines are
-// here so that the same setting can be used in both the implementation and
-// in the unit test.
-#if defined(OS_WIN)
-#define FILE_PATH_USES_DRIVE_LETTERS
-#define FILE_PATH_USES_WIN_SEPARATORS
-#endif  // OS_WIN
-
-namespace base {
-
-// An abstraction to isolate users from the differences between native
-// pathnames on different platforms.
-class FilePath {
- public:
-#if defined(OS_POSIX)
-  // On most platforms, native pathnames are char arrays, and the encoding
-  // may or may not be specified.  On Mac OS X, native pathnames are encoded
-  // in UTF-8.
-  typedef std::string StringType;
-#elif defined(OS_WIN)
-  // On Windows, for Unicode-aware applications, native pathnames are wchar_t
-  // arrays encoded in UTF-16.
-  typedef std::wstring StringType;
-#endif  // OS_WIN
-
-  typedef StringType::value_type CharType;
-
-  // Null-terminated array of separators used to separate components in
-  // hierarchical paths.  Each character in this array is a valid separator,
-  // but kSeparators[0] is treated as the canonical separator and will be used
-  // when composing pathnames.
-  static const CharType kSeparators[];
-
-  // A special path component meaning "this directory."
-  static const CharType kCurrentDirectory[];
-
-  // A special path component meaning "the parent directory."
-  static const CharType kParentDirectory[];
-
-  // The character used to identify a file extension.
-  static const CharType kExtensionSeparator;
-
-  FilePath();
-  FilePath(const FilePath& that);
-  explicit FilePath(const StringType& path);
-  ~FilePath();
-  FilePath& operator=(const FilePath& that);
-
-  bool operator==(const FilePath& that) const;
-
-  bool operator!=(const FilePath& that) const;
-
-  // Required for some STL containers and operations
-  bool operator<(const FilePath& that) const {
-    return path_ < that.path_;
-  }
-
-  const StringType& value() const { return path_; }
-
-  bool empty() const { return path_.empty(); }
-
-  void clear() { path_.clear(); }
-
-  // Returns true if |character| is in kSeparators.
-  static bool IsSeparator(CharType character);
-
-  // Returns a FilePath corresponding to the directory containing the path
-  // named by this object, stripping away the file component.  If this object
-  // only contains one component, returns a FilePath identifying
-  // kCurrentDirectory.  If this object already refers to the root directory,
-  // returns a FilePath identifying the root directory.
-  FilePath DirName() const WARN_UNUSED_RESULT;
-
-  // Returns a FilePath corresponding to the last path component of this
-  // object, either a file or a directory.  If this object already refers to
-  // the root directory, returns a FilePath identifying the root directory;
-  // this is the only situation in which BaseName will return an absolute path.
-  FilePath BaseName() const WARN_UNUSED_RESULT;
-
-  // Returns the path's file extension. This does not have a special case for
-  // common double extensions, so FinalExtension() of "foo.tar.gz" is simply
-  // ".gz". If there is no extension, "" will be returned.
-  StringType FinalExtension() const WARN_UNUSED_RESULT;
-
-  // Returns a FilePath with FinalExtension() removed.
-  FilePath RemoveFinalExtension() const WARN_UNUSED_RESULT;
-
-  // Returns a FilePath by appending a separator and the supplied path
-  // component to this object's path.  Append takes care to avoid adding
-  // excessive separators if this object's path already ends with a separator.
-  // If this object's path is kCurrentDirectory, a new FilePath corresponding
-  // only to |component| is returned.  |component| must be a relative path;
-  // it is an error to pass an absolute path.
-  FilePath Append(const StringType& component) const WARN_UNUSED_RESULT;
-  FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT;
-
-  // Returns true if this FilePath contains an absolute path.  On Windows, an
-  // absolute path begins with either a drive letter specification followed by
-  // a separator character, or with two separator characters.  On POSIX
-  // platforms, an absolute path begins with a separator character.
-  bool IsAbsolute() const;
-
- private:
-  // Remove trailing separators from this object.  If the path is absolute, it
-  // will never be stripped any more than to refer to the absolute root
-  // directory, so "////" will become "/", not "".  A leading pair of
-  // separators is never stripped, to support alternate roots.  This is used to
-  // support UNC paths on Windows.
-  void StripTrailingSeparatorsInternal();
-
-  StringType path_;
-};
-
-}  // namespace base
-
-// This is required by googletest to print a readable output on test failures.
-extern void PrintTo(const base::FilePath& path, std::ostream* out);
-
-// Macros for string literal initialization of FilePath::CharType[], and for
-// using a FilePath::CharType[] in a printf-style format string.
-#if defined(OS_POSIX)
-#define FILE_PATH_LITERAL(x) x
-#define PRFilePath "s"
-#define PRFilePathLiteral "%s"
-#elif defined(OS_WIN)
-#define FILE_PATH_LITERAL(x) L ## x
-#define PRFilePath "ls"
-#define PRFilePathLiteral L"%ls"
-#endif  // OS_WIN
-
-#endif  // MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_
diff --git a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/macros.h b/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/macros.h
deleted file mode 100644
index 5d96783daa..0000000000
--- a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/macros.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MACROS_H_
-#define MINI_CHROMIUM_BASE_MACROS_H_
-
-#include <string.h>
-#include <sys/types.h>
-
-#include "base/compiler_specific.h"
-
-#if __cplusplus >= 201103L
-
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-    TypeName(const TypeName&) = delete; \
-    void operator=(const TypeName&) = delete
-
-#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-    TypeName() = delete; \
-    DISALLOW_COPY_AND_ASSIGN(TypeName)
-
-#else
-
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-    TypeName(const TypeName&); \
-    void operator=(const TypeName&)
-
-#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-    TypeName(); \
-    DISALLOW_COPY_AND_ASSIGN(TypeName)
-
-#endif
-
-template<typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-template <typename T, size_t N>
-char (&ArraySizeHelper(const T (&array)[N]))[N];
-
-#define arraysize(array) (sizeof(ArraySizeHelper(array)))
-
-template <typename Dest, typename Source>
-inline Dest bit_cast(const Source& source) {
-  static_assert(sizeof(Dest) == sizeof(Source), "sizes must be equal");
-
-  Dest dest;
-  memcpy(&dest, &source, sizeof(dest));
-  return dest;
-}
-
-template<typename T>
-inline void ignore_result(const T&) {
-}
-
-#endif  // MINI_CHROMIUM_BASE_MACROS_H_
diff --git a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/scoped_generic.h b/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/scoped_generic.h
deleted file mode 100644
index 0427e92c5b..0000000000
--- a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/scoped_generic.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_SCOPED_GENERIC_H_
-#define MINI_CHROMIUM_BASE_SCOPED_GENERIC_H_
-
-#include <stdlib.h>
-
-#include <algorithm>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-
-namespace base {
-
-template<typename T, typename Traits>
-class ScopedGeneric {
- private:
-  struct Data : public Traits {
-    explicit Data(const T& in) : generic(in) {}
-    Data(const T& in, const Traits& other) : Traits(other), generic(in) {}
-    T generic;
-  };
-
- public:
-  typedef T element_type;
-  typedef Traits traits_type;
-
-  ScopedGeneric() : data_(traits_type::InvalidValue()) {}
-
-  explicit ScopedGeneric(const element_type& value) : data_(value) {}
-
-  ScopedGeneric(const element_type& value, const traits_type& traits)
-      : data_(value, traits) {
-  }
-
-  ScopedGeneric(ScopedGeneric<T, Traits>&& rvalue)
-      : data_(rvalue.release(), rvalue.get_traits()) {
-  }
-
-  ~ScopedGeneric() {
-    FreeIfNecessary();
-  }
-
-  ScopedGeneric& operator=(ScopedGeneric<T, Traits>&& rvalue) {
-    reset(rvalue.release());
-    return *this;
-  }
-
-  void reset(const element_type& value = traits_type::InvalidValue()) {
-    if (data_.generic != traits_type::InvalidValue() && data_.generic == value)
-      abort();
-    FreeIfNecessary();
-    data_.generic = value;
-  }
-
-  void swap(ScopedGeneric& other) {
-    using std::swap;
-    swap(static_cast<Traits&>(data_), static_cast<Traits&>(other.data_));
-    swap(data_.generic, other.data_.generic);
-  }
-
-  element_type release() WARN_UNUSED_RESULT {
-    element_type old_generic = data_.generic;
-    data_.generic = traits_type::InvalidValue();
-    return old_generic;
-  }
-
-  const element_type& get() const { return data_.generic; }
-
-  bool is_valid() const { return data_.generic != traits_type::InvalidValue(); }
-
-  bool operator==(const element_type& value) const {
-    return data_.generic == value;
-  }
-  bool operator!=(const element_type& value) const {
-    return data_.generic != value;
-  }
-
-  Traits& get_traits() { return data_; }
-  const Traits& get_traits() const { return data_; }
-
- private:
-  void FreeIfNecessary() {
-    if (data_.generic != traits_type::InvalidValue()) {
-      data_.Free(data_.generic);
-      data_.generic = traits_type::InvalidValue();
-    }
-  }
-
-  template <typename T2, typename Traits2> bool operator==(
-      const ScopedGeneric<T2, Traits2>& p2) const;
-  template <typename T2, typename Traits2> bool operator!=(
-      const ScopedGeneric<T2, Traits2>& p2) const;
-
-  Data data_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedGeneric);
-};
-
-template<class T, class Traits>
-void swap(const ScopedGeneric<T, Traits>& a,
-          const ScopedGeneric<T, Traits>& b) {
-  a.swap(b);
-}
-
-template<class T, class Traits>
-bool operator==(const T& value, const ScopedGeneric<T, Traits>& scoped) {
-  return value == scoped.get();
-}
-
-template<class T, class Traits>
-bool operator!=(const T& value, const ScopedGeneric<T, Traits>& scoped) {
-  return value != scoped.get();
-}
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_SCOPED_GENERIC_H_
diff --git a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/strings/string16.h b/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/strings/string16.h
deleted file mode 100644
index 2eccd2afe2..0000000000
--- a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/strings/string16.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING16_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING16_H_
-
-#include <stdint.h>
-#include <stdio.h>
-
-#include <string>
-
-#include "build/build_config.h"
-
-namespace base {
-
-#if defined(WCHAR_T_IS_UTF16)
-typedef wchar_t char16;
-#elif defined(WCHAR_T_IS_UTF32)
-typedef uint16_t char16;
-#endif  // WCHAR_T_IS_UTF32
-
-int c16memcmp(const char16* s1, const char16* s2, size_t n);
-size_t c16len(const char16* s);
-const char16* c16memchr(const char16* s, char16 c, size_t n);
-char16* c16memmove(char16* s1, const char16* s2, size_t n);
-char16* c16memcpy(char16* s1, const char16* s2, size_t n);
-char16* c16memset(char16* s, char16 c, size_t n);
-
-#if defined(WCHAR_T_IS_UTF16)
-
-typedef std::wstring string16;
-typedef std::char_traits<wchar_t> string16_char_traits;
-
-#elif defined(WCHAR_T_IS_UTF32)
-
-struct string16_char_traits {
-  typedef char16 char_type;
-  typedef int int_type;
-
-  static_assert(sizeof(int_type) > sizeof(char_type), "unexpected type width");
-
-  typedef std::streamoff off_type;
-  typedef mbstate_t state_type;
-  typedef std::fpos<state_type> pos_type;
-
-  static void assign(char_type& c1, const char_type& c2) {
-    c1 = c2;
-  }
-
-  static bool eq(const char_type& c1, const char_type& c2) {
-    return c1 == c2;
-  }
-  static bool lt(const char_type& c1, const char_type& c2) {
-    return c1 < c2;
-  }
-
-  static int compare(const char_type* s1, const char_type* s2, size_t n) {
-    return c16memcmp(s1, s2, n);
-  }
-
-  static size_t length(const char_type* s) {
-    return c16len(s);
-  }
-
-  static const char_type* find(const char_type* s, size_t n,
-                               const char_type& a) {
-    return c16memchr(s, a, n);
-  }
-
-  static char_type* move(char_type* s1, const char_type* s2, size_t n) {
-    return c16memmove(s1, s2, n);
-  }
-
-  static char_type* copy(char_type* s1, const char_type* s2, size_t n) {
-    return c16memcpy(s1, s2, n);
-  }
-
-  static char_type* assign(char_type* s, size_t n, char_type a) {
-    return c16memset(s, a, n);
-  }
-
-  static int_type not_eof(const int_type& c) {
-    return eq_int_type(c, eof()) ? 0 : c;
-  }
-
-  static char_type to_char_type(const int_type& c) {
-    return char_type(c);
-  }
-
-  static int_type to_int_type(const char_type& c) {
-    return int_type(c);
-  }
-
-  static bool eq_int_type(const int_type& c1, const int_type& c2) {
-    return c1 == c2;
-  }
-
-  static int_type eof() {
-    return static_cast<int_type>(EOF);
-  }
-};
-
-typedef std::basic_string<char16, base::string16_char_traits> string16;
-
-extern std::ostream& operator<<(std::ostream& out, const string16& str);
-
-#endif  // WCHAR_T_IS_UTF32
-
-}  // namespace base
-
-#if defined(WCHAR_T_IS_UTF32)
-extern template class std::basic_string<base::char16,
-                                        base::string16_char_traits>;
-#endif  // WCHAR_T_IS_UTF32
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING16_H_
diff --git a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h b/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
deleted file mode 100644
index b0e45eea6c..0000000000
--- a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
-
-#include <algorithm>
-#include <iterator>
-#include <ostream>
-#include <string>
-
-#include "base/strings/string16.h"
-
-namespace base {
-
-template<typename StringType>
-class BasicStringPiece {
- public:
-  typedef typename StringType::traits_type traits_type;
-  typedef typename StringType::value_type value_type;
-  typedef typename StringType::size_type size_type;
-  typedef typename StringType::difference_type difference_type;
-  typedef const value_type& reference;
-  typedef const value_type& const_reference;
-  typedef const value_type* pointer;
-  typedef const value_type* const_pointer;
-  typedef const value_type* const_iterator;
-  typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-  static const size_type npos;
-
-  BasicStringPiece()
-      : pointer_(NULL),
-        length_(0) {
-  }
-
-  BasicStringPiece(const value_type* string)
-      : pointer_(string),
-        length_((string == NULL) ? 0 : traits_type::length(string)) {
-  }
-
-  BasicStringPiece(const StringType& string)
-      : pointer_(string.data()),
-        length_(string.size()) {
-  }
-
-  BasicStringPiece(const value_type* offset, size_type length)
-      : pointer_(offset),
-        length_(length) {
-  }
-
-  BasicStringPiece(const typename StringType::const_iterator& begin,
-                   const typename StringType::const_iterator& end)
-      : pointer_((end > begin) ? &(*begin) : NULL),
-        length_((end > begin) ? static_cast<size_type>(end - begin) : 0) {
-  }
-
-  value_type operator[](size_type index) const { return pointer_[index]; }
-
-  const value_type* data() const { return pointer_; }
-
-  const_iterator begin() const { return pointer_; }
-  const_iterator end() const { return pointer_ + length_; }
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator(pointer_ + length_);
-  }
-  const_reverse_iterator rend() const {
-    return const_reverse_iterator(pointer_);
-  }
-
-  bool empty() const { return length_ == 0; }
-  size_type size() const { return length_; }
-  size_type length() const { return length_; }
-  size_type max_size() const { return length_; }
-  size_type capacity() const { return length_; }
-
-  static int wordmemcmp(const value_type* p,
-                        const value_type* p2,
-                        size_type N) {
-    return StringType::traits_type::compare(p, p2, N);
-  }
-
-  void clear() {
-    pointer_ = NULL;
-    length_ = 0;
-  }
-
-  int compare(const BasicStringPiece<StringType>& that) const {
-    int result = traits_type::compare(pointer_,
-                                      that.pointer_,
-                                      std::min(length_, that.length_));
-    if (result == 0) {
-      if (length_ < that.length_) {
-        result = -1;
-      } else if (length_ > that.length_) {
-        result = 1;
-      }
-    }
-    return result;
-  }
-
-  BasicStringPiece<StringType> substr(size_type position = 0,
-                                      size_type count = npos) const {
-    position = std::min(position, size());
-    count = std::min(count, size() - position);
-    return BasicStringPiece<StringType>(data() + position, count);
-  }
-
-  size_type copy(value_type* dest,
-                 size_type count,
-                 size_type position = 0) const {
-    size_type ret = std::min(size() - position, count);
-    traits_type::copy(dest, data() + position, ret);
-    return ret;
-  }
-
-  size_type find(const BasicStringPiece<StringType>& str, size_type pos) const {
-    if (pos >= size()) {
-      return npos;
-    }
-    const_iterator result = std::search(begin() + pos,
-                                        end(),
-                                        str.begin(),
-                                        str.end());
-    size_type xpos = static_cast<size_type>(result - begin());
-    return xpos + str.size() <= size() ? xpos : npos;
-  }
-
-  size_type find(value_type c, size_type pos) const {
-    if (pos >= size()) {
-      return npos;
-    }
-    const_iterator result = std::find(begin() + pos, end(), c);
-    return result != end() ? static_cast<size_type>(result - begin()) : npos;
-  }
-
-  void set(const value_type* string) {
-    pointer_ = string;
-    length_ = string ? traits_type::length(string) : 0;
-  }
-
-  StringType as_string() const {
-    return empty() ? StringType() : StringType(data(), size());
-  }
-
- private:
-  const value_type* pointer_;
-  size_type length_;
-};
-
-template <typename StringType>
-const typename BasicStringPiece<StringType>::size_type
-    BasicStringPiece<StringType>::npos = StringType::npos;
-
-template<typename StringType>
-std::ostream& operator<<(std::ostream& ostream,
-                         const BasicStringPiece<StringType>& string_piece) {
-  ostream.write(string_piece.data(), string_piece.size());
-  return ostream;
-}
-
-typedef BasicStringPiece<std::string> StringPiece;
-typedef BasicStringPiece<string16> StringPiece16;
-
-inline bool operator==(const StringPiece& x, const StringPiece& y) {
-  if (x.size() != y.size())
-    return false;
-
-  return StringPiece::wordmemcmp(x.data(), y.data(), x.size()) == 0;
-}
-
-inline bool operator==(const StringPiece16& x, const StringPiece16& y) {
-  if (x.size() != y.size())
-    return false;
-
-  return StringPiece16::wordmemcmp(x.data(), y.data(), x.size()) == 0;
-}
-
-// This hash function is copied from base/strings/string16.h. We don't use the
-// ones already defined for string and string16 directly because it would
-// require the string constructors to be called, which we don't want.
-#define HASH_STRING_PIECE(StringPieceType, string_piece)         \
-  std::size_t result = 0;                                        \
-  for (StringPieceType::const_iterator i = string_piece.begin(); \
-       i != string_piece.end(); ++i)                             \
-    result = (result * 131) + *i;                                \
-  return result;
-
-struct StringPieceHash {
-  std::size_t operator()(const StringPiece& sp) const {
-    HASH_STRING_PIECE(StringPiece, sp);
-  }
-};
-struct StringPiece16Hash {
-  std::size_t operator()(const StringPiece16& sp16) const {
-    HASH_STRING_PIECE(StringPiece16, sp16);
-  }
-};
-
-}  // namespace base;
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
diff --git a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/build/build_config.h b/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/build/build_config.h
deleted file mode 100644
index eca51a5cc7..0000000000
--- a/Tools/Crashpad/include/vs2013/third_party/mini_chromium/mini_chromium/build/build_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
-#define MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
-
-#if defined(__APPLE__)
-#define OS_MACOSX 1
-#elif defined(__ANDROID__)
-#define OS_ANDROID 1
-#elif defined(__linux__)
-#define OS_LINUX 1
-#elif defined(_WIN32)
-#define OS_WIN 1
-#else
-#error Please add support for your platform in build/build_config.h
-#endif
-
-#if defined(OS_MACOSX)
-#include <TargetConditionals.h>
-#if defined(TARGET_OS_IOS)
-#if TARGET_OS_IOS
-#define OS_IOS 1
-#endif
-#elif defined(TARGET_OS_IPHONE)
-#if TARGET_OS_IPHONE
-#define OS_IOS 1
-#endif
-#endif
-#endif
-
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_ANDROID)
-#define OS_POSIX 1
-#endif
-
-// Compiler detection.
-#if defined(__GNUC__)
-#define COMPILER_GCC 1
-#elif defined(_MSC_VER)
-#define COMPILER_MSVC 1
-#else
-#error Please add support for your compiler in build/build_config.h
-#endif
-
-#if defined(_M_X64) || defined(__x86_64__)
-#define ARCH_CPU_X86_FAMILY 1
-#define ARCH_CPU_X86_64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(_M_IX86) || defined(__i386__)
-#define ARCH_CPU_X86_FAMILY 1
-#define ARCH_CPU_X86 1
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__ARMEL__)
-#define ARCH_CPU_ARM_FAMILY 1
-#define ARCH_CPU_ARMEL 1
-#define ARCH_CPU_32_BITS 1
-#elif defined(__aarch64__)
-#define ARCH_CPU_ARM_FAMILY 1
-#define ARCH_CPU_ARM64 1
-#define ARCH_CPU_64_BITS 1
-#else
-#error Please add support for your architecture in build/build_config.h
-#endif
-
-#if !defined(ARCH_CPU_LITTLE_ENDIAN) && !defined(ARCH_CPU_BIG_ENDIAN)
-#if defined(__LITTLE_ENDIAN__) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__BIG_ENDIAN__) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#define ARCH_CPU_BIG_ENDIAN 1
-#else
-#error Please add support for your architecture in build/build_config.h
-#endif
-#endif
-
-#if defined(OS_POSIX) && defined(COMPILER_GCC) && \
-    defined(__WCHAR_MAX__) && \
-    (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
-#define WCHAR_T_IS_UTF32
-#elif defined(OS_WIN)
-#define WCHAR_T_IS_UTF16
-#else
-#error Please add support for your compiler in build/build_config.h
-#endif
-
-#endif  // MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
diff --git a/Tools/Crashpad/include/vs2013/util/file/file_io.h b/Tools/Crashpad/include/vs2013/util/file/file_io.h
deleted file mode 100644
index ff20488da1..0000000000
--- a/Tools/Crashpad/include/vs2013/util/file/file_io.h
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_FILE_FILE_IO_H_
-#define CRASHPAD_UTIL_FILE_FILE_IO_H_
-
-#include <sys/types.h>
-
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-#include "base/files/scoped_file.h"
-#elif defined(OS_WIN)
-#include <windows.h>
-#include "util/win/scoped_handle.h"
-#endif
-
-//! \file
-
-#if defined(OS_POSIX) || DOXYGEN
-
-//! \brief A `PLOG()` macro usable for standard input/output error conditions.
-//!
-//! The `PLOG()` macro uses `errno` on POSIX and is appropriate to report
-//! errors from standard input/output functions. On Windows, `PLOG()` uses
-//! `GetLastError()`, and cannot be used to report errors from standard
-//! input/output functions. This macro uses `PLOG()` when appropriate for
-//! standard I/O functions, and `LOG()` otherwise.
-#define STDIO_PLOG(x) PLOG(x)
-
-#else
-
-#define STDIO_PLOG(x) LOG(x)
-#define fseeko(file, offset, whence) _fseeki64(file, offset, whence)
-#define ftello(file) _ftelli64(file)
-
-#endif
-
-namespace base {
-class FilePath;
-}  // namespace base
-
-namespace crashpad {
-
-#if defined(OS_POSIX) || DOXYGEN
-
-//! \brief Platform-specific alias for a low-level file handle.
-using FileHandle = int;
-
-//! \brief Platform-specific alias for a position in an open file.
-using FileOffset = off_t;
-
-//! \brief Scoped wrapper of a FileHandle.
-using ScopedFileHandle = base::ScopedFD;
-
-//! \brief A value that can never be a valid FileHandle.
-const FileHandle kInvalidFileHandle = -1;
-
-using FileOperationResult = ssize_t;
-
-#elif defined(OS_WIN)
-
-using FileHandle = HANDLE;
-using FileOffset = LONGLONG;
-using ScopedFileHandle = ScopedFileHANDLE;
-using FileOperationResult = LONG_PTR;
-
-const FileHandle kInvalidFileHandle = INVALID_HANDLE_VALUE;
-
-#endif
-
-//! \brief Determines the mode that LoggingOpenFileForWrite() uses.
-enum class FileWriteMode {
-  //! \brief Opens the file if it exists, or fails if it does not.
-  kReuseOrFail,
-
-  //! \brief Opens the file if it exists, or creates a new file.
-  kReuseOrCreate,
-
-  //! \brief Creates a new file. If the file already exists, it will be
-  //!     overwritten.
-  kTruncateOrCreate,
-
-  //! \brief Creates a new file. If the file already exists, the open will fail.
-  kCreateOrFail,
-};
-
-//! \brief Determines the permissions bits for files created on POSIX systems.
-enum class FilePermissions : bool {
-  //! \brief Equivalent to `0600`.
-  kOwnerOnly,
-
-  //! \brief Equivalent to `0644`.
-  kWorldReadable,
-};
-
-//! \brief Determines the locking mode that LoggingLockFile() uses.
-enum class FileLocking : bool {
-  //! \brief Equivalent to `flock()` with `LOCK_SH`.
-  kShared,
-
-  //! \brief Equivalent to `flock()` with `LOCK_EX`.
-  kExclusive,
-};
-
-//! \brief Reads from a file, retrying when interrupted on POSIX or following a
-//!     short read.
-//!
-//! This function reads into \a buffer, stopping only when \a size bytes have
-//! been read or when end-of-file has been reached. On Windows, reading from
-//! sockets is not currently supported.
-//!
-//! \return The number of bytes read and placed into \a buffer, or `-1` on
-//!     error, with `errno` or `GetLastError()` set appropriately. On error, a
-//!     portion of \a file may have been read into \a buffer.
-//!
-//! \sa WriteFile
-//! \sa LoggingReadFile
-//! \sa CheckedReadFile
-//! \sa CheckedReadFileAtEOF
-FileOperationResult ReadFile(FileHandle file, void* buffer, size_t size);
-
-//! \brief Writes to a file, retrying when interrupted or following a short
-//!     write on POSIX.
-//!
-//! This function writes to \a file, stopping only when \a size bytes have been
-//! written.
-//!
-//! \return The number of bytes written from \a buffer, or `-1` on error, with
-//!     `errno` or `GetLastError()` set appropriately. On error, a portion of
-//!     \a buffer may have been written to \a file.
-//!
-//! \sa ReadFile
-//! \sa LoggingWriteFile
-//! \sa CheckedWriteFile
-FileOperationResult WriteFile(FileHandle file, const void* buffer, size_t size);
-
-//! \brief Wraps ReadFile(), ensuring that exactly \a size bytes are read.
-//!
-//! \return `true` on success. If \a size is out of the range of possible
-//!     ReadFile() return values, if the underlying ReadFile() fails, or if
-//!     other than \a size bytes were read, this function logs a message and
-//!     returns `false`.
-//!
-//! \sa LoggingWriteFile
-//! \sa ReadFile
-//! \sa CheckedReadFile
-//! \sa CheckedReadFileAtEOF
-bool LoggingReadFile(FileHandle file, void* buffer, size_t size);
-
-//! \brief Wraps WriteFile(), ensuring that exactly \a size bytes are written.
-//!
-//! \return `true` on success. If \a size is out of the range of possible
-//!     WriteFile() return values, if the underlying WriteFile() fails, or if
-//!     other than \a size bytes were written, this function logs a message and
-//!     returns `false`.
-//!
-//! \sa LoggingReadFile
-//! \sa WriteFile
-//! \sa CheckedWriteFile
-bool LoggingWriteFile(FileHandle file, const void* buffer, size_t size);
-
-//! \brief Wraps ReadFile(), ensuring that exactly \a size bytes are read.
-//!
-//! If \a size is out of the range of possible ReadFile() return values, if the
-//! underlying ReadFile() fails, or if other than \a size bytes were read, this
-//! function causes execution to terminate without returning.
-//!
-//! \sa CheckedWriteFile
-//! \sa ReadFile
-//! \sa LoggingReadFile
-//! \sa CheckedReadFileAtEOF
-void CheckedReadFile(FileHandle file, void* buffer, size_t size);
-
-//! \brief Wraps WriteFile(), ensuring that exactly \a size bytes are written.
-//!
-//! If \a size is out of the range of possible WriteFile() return values, if the
-//! underlying WriteFile() fails, or if other than \a size bytes were written,
-//! this function causes execution to terminate without returning.
-//!
-//! \sa CheckedReadFile
-//! \sa WriteFile
-//! \sa LoggingWriteFile
-void CheckedWriteFile(FileHandle file, const void* buffer, size_t size);
-
-//! \brief Wraps ReadFile(), ensuring that it indicates end-of-file.
-//!
-//! Attempts to read a single byte from \a file, expecting no data to be read.
-//! If the underlying ReadFile() fails, or if a byte actually is read, this
-//! function causes execution to terminate without returning.
-//!
-//! \sa CheckedReadFile
-//! \sa ReadFile
-void CheckedReadFileAtEOF(FileHandle file);
-
-//! \brief Wraps `open()` or `CreateFile()`, opening an existing file for
-//!     reading.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa OpenFileForWrite
-//! \sa OpenFileForReadAndWrite
-//! \sa LoggingOpenFileForRead
-FileHandle OpenFileForRead(const base::FilePath& path);
-
-//! \brief Wraps `open()` or `CreateFile()`, creating a file for output.
-//!
-//! \a mode determines the style (truncate, reuse, etc.) that is used to open
-//! the file. On POSIX, \a permissions determines the value that is passed as
-//! `mode` to `open()`. On Windows, the file is always opened in binary mode
-//! (that is, no CRLF translation). On Windows, the file is opened for sharing,
-//! see LoggingLockFile() and LoggingUnlockFile() to control concurrent access.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa OpenFileForRead
-//! \sa OpenFileForReadAndWrite
-//! \sa LoggingOpenFileForWrite
-FileHandle OpenFileForWrite(const base::FilePath& path,
-                            FileWriteMode mode,
-                            FilePermissions permissions);
-
-//! \brief Wraps `open()` or `CreateFile()`, creating a file for both input and
-//!     output.
-//!
-//! \a mode determines the style (truncate, reuse, etc.) that is used to open
-//! the file. On POSIX, \a permissions determines the value that is passed as
-//! `mode` to `open()`. On Windows, the file is always opened in binary mode
-//! (that is, no CRLF translation). On Windows, the file is opened for sharing,
-//! see LoggingLockFile() and LoggingUnlockFile() to control concurrent access.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa OpenFileForRead
-//! \sa OpenFileForWrite
-//! \sa LoggingOpenFileForReadAndWrite
-FileHandle OpenFileForReadAndWrite(const base::FilePath& path,
-                                   FileWriteMode mode,
-                                   FilePermissions permissions);
-
-//! \brief Wraps OpenFileForRead(), logging an error if the operation fails.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa LoggingOpenFileForWrite
-//! \sa LoggingOpenFileForReadAndWrite
-FileHandle LoggingOpenFileForRead(const base::FilePath& path);
-
-//! \brief Wraps OpenFileForWrite(), logging an error if the operation fails.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa LoggingOpenFileForRead
-//! \sa LoggingOpenFileForReadAndWrite
-FileHandle LoggingOpenFileForWrite(const base::FilePath& path,
-                                   FileWriteMode mode,
-                                   FilePermissions permissions);
-
-//! \brief Wraps OpenFileForReadAndWrite(), logging an error if the operation
-//!     fails.
-//!
-//! \return The newly opened FileHandle, or an invalid FileHandle on failure.
-//!
-//! \sa ScopedFileHandle
-//! \sa LoggingOpenFileForRead
-//! \sa LoggingOpenFileForWrite
-FileHandle LoggingOpenFileForReadAndWrite(const base::FilePath& path,
-                                          FileWriteMode mode,
-                                          FilePermissions permissions);
-
-//! \brief Locks the given \a file using `flock()` on POSIX or `LockFileEx()` on
-//!     Windows.
-//!
-//! It is an error to attempt to lock a file in a different mode when it is
-//! already locked. This call will block until the lock is acquired. The
-//! entire file is locked.
-//!
-//! If \a locking is FileLocking::kShared, \a file must have been opened for
-//! reading, and if it's FileLocking::kExclusive, \a file must have been opened
-//! for writing.
-//!
-//! \param[in] file The open file handle to be locked.
-//! \param[in] locking Controls whether the lock is a shared reader lock, or an
-//!     exclusive writer lock.
-//!
-//! \return `true` on success, or `false` and a message will be logged.
-bool LoggingLockFile(FileHandle file, FileLocking locking);
-
-//! \brief Unlocks a file previously locked with LoggingLockFile().
-//!
-//! It is an error to attempt to unlock a file that was not previously locked.
-//! A previously-locked file should be unlocked before closing the file handle,
-//! otherwise on some OSs the lock may not be released immediately.
-//!
-//! \param[in] file The open locked file handle to be unlocked.
-//!
-//! \return `true` on success, or `false` and a message will be logged.
-bool LoggingUnlockFile(FileHandle file);
-
-//! \brief Wraps `lseek()` or `SetFilePointerEx()`. Logs an error if the
-//!     operation fails.
-//!
-//! Repositions the offset of the open \a file to the specified \a offset,
-//! relative to \a whence. \a whence must be one of `SEEK_SET`, `SEEK_CUR`, or
-//! `SEEK_END`, and is interpreted in the usual way.
-//!
-//! \return The resulting offset in bytes from the beginning of the file, or
-//!     `-1` on failure.
-FileOffset LoggingSeekFile(FileHandle file, FileOffset offset, int whence);
-
-//! \brief Truncates the given \a file to zero bytes in length.
-//!
-//! \return `true` on success, or `false`, and a message will be logged.
-bool LoggingTruncateFile(FileHandle file);
-
-//! \brief Wraps `close()` or `CloseHandle()`, logging an error if the operation
-//!     fails.
-//!
-//! \return On success, `true` is returned. On failure, an error is logged and
-//!     `false` is returned.
-bool LoggingCloseFile(FileHandle file);
-
-//! \brief Wraps `close()` or `CloseHandle()`, ensuring that it succeeds.
-//!
-//! If the underlying function fails, this function causes execution to
-//! terminate without returning.
-void CheckedCloseFile(FileHandle file);
-
-//! \brief Determines the size of a file.
-//!
-//! \param[in] file The handle to the file for which the size should be
-//!     retrived.
-//!
-//! \return The size of the file. If an error occurs when attempting to
-//!     determine its size, returns `-1` with an error logged.
-FileOffset LoggingFileSizeByHandle(FileHandle file);
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_FILE_FILE_IO_H_
diff --git a/Tools/Crashpad/include/vs2013/util/misc/initialization_state.h b/Tools/Crashpad/include/vs2013/util/misc/initialization_state.h
deleted file mode 100644
index 85f9b2894d..0000000000
--- a/Tools/Crashpad/include/vs2013/util/misc/initialization_state.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_H_
-#define CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_H_
-
-#include <stdint.h>
-
-#include "base/macros.h"
-
-namespace crashpad {
-
-//! \brief Tracks whether data are initialized.
-//!
-//! Objects of this type track whether the data they’re guarding are
-//! initialized. The three possible states are uninitialized (the initial
-//! state), initializing, and valid. As the guarded data are initialized, an
-//! InitializationState object will normally transition through these three
-//! states. A fourth state corresponds to the destruction of objects of this
-//! type, making it less likely that a use-after-free of an InitializationState
-//! object will appear in the valid state.
-//!
-//! If the only purpose for tracking the initialization state of guarded data is
-//! to DCHECK when the object is in an unexpected state, use
-//! InitializationStateDcheck instead.
-class InitializationState {
- public:
-  //! \brief The object’s state.
-  enum State : uint8_t {
-    //! \brief The object has not yet been initialized.
-    kStateUninitialized = 0,
-
-    //! \brief The object is being initialized.
-    //!
-    //! This state protects against attempted reinitializaton of
-    //! partially-initialized objects whose initial initialization attempt
-    //! failed. This state is to be used while objects are initializing, but are
-    //! not yet fully initialized.
-    kStateInvalid,
-
-    //! \brief The object has been initialized.
-    kStateValid,
-
-    //! \brief The object has been destroyed.
-    kStateDestroyed,
-  };
-
-  InitializationState() : state_(kStateUninitialized) {}
-  ~InitializationState() { state_ = kStateDestroyed; }
-
-  //! \brief Returns `true` if the object’s state is #kStateUninitialized and it
-  //!     is safe to begin initializing it.
-  bool is_uninitialized() const { return state_ == kStateUninitialized; }
-
-  //! \brief Sets the object’s state to #kStateInvalid, marking initialization
-  //!     as being in process.
-  void set_invalid() { state_ = kStateInvalid; }
-
-  //! \brief Sets the object’s state to #kStateValid, marking it initialized.
-  void set_valid() { state_ = kStateValid; }
-
-  //! \brief Returns `true` if the the object’s state is #kStateValid and it has
-  //!     been fully initialized and may be used.
-  bool is_valid() const { return state_ == kStateValid; }
-
- protected:
-  //! \brief Returns the object’s state.
-  //!
-  //! Consumers of this class should use an is_state_*() method instead.
-  State state() const { return state_; }
-
-  //! \brief Sets the object’s state.
-  //!
-  //! Consumers of this class should use a set_state_*() method instead.
-  void set_state(State state) { state_ = state; }
-
- private:
-  // state_ is volatile to ensure that it’ll be set by the destructor when it
-  // runs. Otherwise, optimizations might prevent it from ever being set to
-  // kStateDestroyed, limiting this class’ ability to catch use-after-free
-  // errors.
-  volatile State state_;
-
-  DISALLOW_COPY_AND_ASSIGN(InitializationState);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_INITIALIZATION_INITIALIZATION_STATE_H_
diff --git a/Tools/Crashpad/include/vs2013/util/misc/metrics.h b/Tools/Crashpad/include/vs2013/util/misc/metrics.h
deleted file mode 100644
index fd2e120063..0000000000
--- a/Tools/Crashpad/include/vs2013/util/misc/metrics.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_METRICS_H_
-#define CRASHPAD_UTIL_MISC_METRICS_H_
-
-#include <inttypes.h>
-
-#include "base/macros.h"
-#include "util/file/file_io.h"
-
-namespace crashpad {
-
-//! \brief Container class to hold shared UMA metrics integration points.
-//!
-//! Each static function in this class will call a `UMA_*` from
-//! `base/metrics/histogram_macros.h`. When building Crashpad standalone,
-//! (against mini_chromium), these macros do nothing. When built against
-//! Chromium's base, they allow integration with its metrics system.
-class Metrics {
- public:
-  //! \brief Values for CrashReportPending(). These are used as metrics
-  //!     enumeration values, so new values should always be added at the end.
-  enum class PendingReportReason : int32_t {
-    //! \brief A report was newly created and is ready for upload.
-    kNewlyCreated = 0,
-
-    //! \brief The user manually requested the report be uploaded.
-    kUserInitiated = 1,
-
-    //! \brief The number of values in this enumeration; not a valid value.
-    kMaxValue
-  };
-
-  //! \brief Reports when a crash upload has entered the pending state.
-  static void CrashReportPending(PendingReportReason reason);
-
-  //! \brief Reports the size of a crash report file in bytes. Should be called
-  //!     when a new report is written to disk.
-  static void CrashReportSize(FileHandle file);
-
-  //! \brief Reports on a crash upload attempt, and if it succeeded.
-  static void CrashUploadAttempted(bool successful);
-
-  //! \brief Values for CrashUploadSkipped(). These are used as metrics
-  //!     enumeration values, so new values should always be added at the end.
-  enum class CrashSkippedReason : int32_t {
-    //! \brief Crash uploading is disabled.
-    kUploadsDisabled = 0,
-
-    //! \brief There was another upload too recently, so this one was throttled.
-    kUploadThrottled = 1,
-
-    //! \brief The report had an unexpected timestamp.
-    kUnexpectedTime = 2,
-
-    //! \brief The database reported an error, likely due to a filesystem
-    //!     problem.
-    kDatabaseError = 3,
-
-    //! \brief The upload of the crash failed during communication with the
-    //!     server.
-    kUploadFailed = 4,
-
-    //! \brief The number of values in this enumeration; not a valid value.
-    kMaxValue
-  };
-
-  //! \brief Reports when a report is moved to the completed state in the
-  //!     database, without the report being uploadad.
-  static void CrashUploadSkipped(CrashSkippedReason reason);
-
-  //! \brief The result of capturing an exception. These are used as metrics
-  //!     enumeration values, so new values should always be added at the end.
-  enum class CaptureResult : int32_t {
-    //! \brief The exception capture succeeded normally.
-    kSuccess = 0,
-
-    //! \brief Unexpected exception behavior.
-    //!
-    //! This value is only used on macOS.
-    kUnexpectedExceptionBehavior = 1,
-
-    //! \brief Failed due to attempt to suspend self.
-    //!
-    //! This value is only used on macOS.
-    kFailedDueToSuspendSelf = 2,
-
-    //! \brief The process snapshot could not be captured.
-    kSnapshotFailed = 3,
-
-    //! \brief The exception could not be initialized.
-    kExceptionInitializationFailed = 4,
-
-    //! \brief The attempt to prepare a new crash report in the crash database
-    //!     failed.
-    kPrepareNewCrashReportFailed = 5,
-
-    //! \brief Writing the minidump to disk failed.
-    kMinidumpWriteFailed = 6,
-
-    //! \brief There was a database error in attempt to complete the report.
-    kFinishedWritingCrashReportFailed = 7,
-
-    //! \brief The number of values in this enumeration; not a valid value.
-    kMaxValue
-  };
-
-  //! \brief Reports on the outcome of capturing a report in the exception
-  //!     handler. Should be called on all capture completion paths.
-  static void ExceptionCaptureResult(CaptureResult result);
-
-  //! \brief The exception code for an exception was retrieved.
-  //!
-  //! These values are OS-specific, and correspond to
-  //! MINIDUMP_EXCEPTION::ExceptionCode.
-  static void ExceptionCode(uint32_t exception_code);
-
-  //! \brief The exception handler server started capturing an exception.
-  static void ExceptionEncountered();
-
-  //! \brief The handler process crashed with the given exception code.
-  //!
-  //! This is currently only reported on Windows.
-  static void HandlerCrashed(uint32_t exception_code);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(Metrics);
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_METRICS_H_
diff --git a/Tools/Crashpad/include/vs2013/util/misc/uuid.h b/Tools/Crashpad/include/vs2013/util/misc/uuid.h
deleted file mode 100644
index 4e5884e25a..0000000000
--- a/Tools/Crashpad/include/vs2013/util/misc/uuid.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_MISC_UUID_H_
-#define CRASHPAD_UTIL_MISC_UUID_H_
-
-#include <stdint.h>
-
-#include <string>
-
-#include "base/strings/string16.h"
-#include "base/strings/string_piece.h"
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <rpc.h>
-#endif
-
-namespace crashpad {
-
-//! \brief A universally unique identifier (%UUID).
-//!
-//! An alternate term for %UUID is “globally unique identifier” (GUID), used
-//! primarily by Microsoft.
-//!
-//! A %UUID is a unique 128-bit number specified by RFC 4122.
-//!
-//! This is a POD structure.
-struct UUID {
-  bool operator==(const UUID& that) const;
-  bool operator!=(const UUID& that) const { return !operator==(that); }
-
-  //! \brief Initializes the %UUID to zero.
-  void InitializeToZero();
-
-  //! \brief Initializes the %UUID from a sequence of bytes.
-  //!
-  //! \a bytes is taken as a %UUID laid out in big-endian format in memory. On
-  //! little-endian machines, appropriate byte-swapping will be performed to
-  //! initialize an object’s data members.
-  //!
-  //! \param[in] bytes A buffer of exactly 16 bytes that will be assigned to the
-  //!     %UUID.
-  void InitializeFromBytes(const uint8_t* bytes);
-
-  //! \brief Initializes the %UUID from a RFC 4122 §3 formatted string.
-  //!
-  //! \param[in] string A string of the form
-  //!     `"00112233-4455-6677-8899-aabbccddeeff"`.
-  //!
-  //! \return `true` if the string was formatted correctly and the object has
-  //!     been initialized with the data. `false` if the string could not be
-  //!     parsed, with the object state untouched.
-  bool InitializeFromString(const base::StringPiece& string);
-
-  //! \brief Initializes the %UUID using a standard system facility to generate
-  //!     the value.
-  //!
-  //! \return `true` if the %UUID was initialized correctly, `false` otherwise
-  //!     with a message logged.
-  bool InitializeWithNew();
-
-#if defined(OS_WIN) || DOXYGEN
-  //! \brief Initializes the %UUID from a system `UUID` or `GUID` structure.
-  //!
-  //! \param[in] system_uuid A system `UUID` or `GUID` structure.
-  void InitializeFromSystemUUID(const ::UUID* system_uuid);
-#endif  // OS_WIN
-
-  //! \brief Formats the %UUID per RFC 4122 §3.
-  //!
-  //! \return A string of the form `"00112233-4455-6677-8899-aabbccddeeff"`.
-  std::string ToString() const;
-
-#if defined(OS_WIN) || DOXYGEN
-  //! \brief The same as ToString, but returned as a string16.
-  base::string16 ToString16() const;
-#endif  // OS_WIN
-
-  // These fields are laid out according to RFC 4122 §4.1.2.
-  uint32_t data_1;
-  uint16_t data_2;
-  uint16_t data_3;
-  uint8_t data_4[2];
-  uint8_t data_5[6];
-};
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_MISC_UUID_H_
diff --git a/Tools/Crashpad/include/vs2013/util/win/scoped_handle.h b/Tools/Crashpad/include/vs2013/util/win/scoped_handle.h
deleted file mode 100644
index 68be4f7b9f..0000000000
--- a/Tools/Crashpad/include/vs2013/util/win/scoped_handle.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_UTIL_WIN_SCOPED_HANDLE_H_
-#define CRASHPAD_UTIL_WIN_SCOPED_HANDLE_H_
-
-#include <windows.h>
-
-#include "base/scoped_generic.h"
-
-namespace crashpad {
-
-namespace internal {
-
-struct ScopedFileHANDLECloseTraits {
-  static HANDLE InvalidValue() {
-    return INVALID_HANDLE_VALUE;
-  }
-  static void Free(HANDLE handle);
-};
-
-struct ScopedKernelHANDLECloseTraits {
-  static HANDLE InvalidValue() {
-    return nullptr;
-  }
-  static void Free(HANDLE handle);
-};
-
-}  // namespace internal
-
-using ScopedFileHANDLE =
-    base::ScopedGeneric<HANDLE, internal::ScopedFileHANDLECloseTraits>;
-using ScopedKernelHANDLE =
-    base::ScopedGeneric<HANDLE, internal::ScopedKernelHANDLECloseTraits>;
-
-}  // namespace crashpad
-
-#endif  // CRASHPAD_UTIL_WIN_SCOPED_HANDLE_H_
diff --git a/Tools/Crashpad/util/Debug/crashpad_database_util.exe b/Tools/Crashpad/util/Debug/crashpad_database_util.exe
deleted file mode 100644
index a4ea4b3a3f..0000000000
--- a/Tools/Crashpad/util/Debug/crashpad_database_util.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9fe28a772508e2a78a5f9c78345e301f2695803cd269e40452c925ecd8ba73b6
-size 398848
diff --git a/Tools/Crashpad/util/Release/crashpad_database_util.exe b/Tools/Crashpad/util/Release/crashpad_database_util.exe
deleted file mode 100644
index a7f9491cad..0000000000
--- a/Tools/Crashpad/util/Release/crashpad_database_util.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4715113f074eaa04554cdacea8e6ef4f908a88e89374add0801ca557003ce03
-size 228864
diff --git a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcompiler_47.dll b/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcompiler_47.dll
deleted file mode 100644
index 56e4132374..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcompiler_47.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1b50f7075e2ee47c8d184e38862a83b880a90fd2ff00da7bb1eb61e24e00f5d
-size 4467904
diff --git a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcsx_47.dll b/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcsx_47.dll
deleted file mode 100644
index c11489a00f..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcsx_47.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:414a8b92182fb5b76b41fd4dcd1af43cb804c30dde1d88a2ef9494d5c09f2ef3
-size 1910976
diff --git a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcsxd_47.dll b/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcsxd_47.dll
deleted file mode 100644
index 6f17965d50..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/d3dcsxd_47.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e93ab77a2ea0259eb0eaba86c6f849d2d52cec6d1e77d58eb9581b01eadabf1a
-size 1925312
diff --git a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/fxc.exe b/Tools/CrySCompileServer/Compiler/PCD3D11/v006/fxc.exe
deleted file mode 100644
index 85085e39b4..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCD3D11/v006/fxc.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af73d401254446d9e5b80b69ad5d042981314832a9bb76f3f179081cb3d40820
-size 151232
diff --git a/Tools/CrySCompileServer/Compiler/PCGL/V005/D3DCompiler_47.dll b/Tools/CrySCompileServer/Compiler/PCGL/V005/D3DCompiler_47.dll
deleted file mode 100644
index 2044c74b14..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCGL/V005/D3DCompiler_47.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e994847e01a6f1e4cbdc5a864616ac262f67ee4f14db194984661a8d927ab7f4
-size 4173928
diff --git a/Tools/CrySCompileServer/Compiler/PCGL/V005/HLSLcc.exe b/Tools/CrySCompileServer/Compiler/PCGL/V005/HLSLcc.exe
deleted file mode 100644
index 2ce1795a1b..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCGL/V005/HLSLcc.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54c224dac495c9914b20a51b6c5177e3be612d8567111ac61a4c693292f40cce
-size 348672
diff --git a/Tools/CrySCompileServer/Compiler/PCGL/V006/D3DCompiler_47.dll b/Tools/CrySCompileServer/Compiler/PCGL/V006/D3DCompiler_47.dll
deleted file mode 100644
index 2044c74b14..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCGL/V006/D3DCompiler_47.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e994847e01a6f1e4cbdc5a864616ac262f67ee4f14db194984661a8d927ab7f4
-size 4173928
diff --git a/Tools/CrySCompileServer/Compiler/PCGL/V006/HLSLcc.exe b/Tools/CrySCompileServer/Compiler/PCGL/V006/HLSLcc.exe
deleted file mode 100644
index 222c714f9a..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCGL/V006/HLSLcc.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a623de58e3d6578f9a2b8104b0d9fdfac75a2b4336bf7633fb11296b2f8faa3
-size 160768
diff --git a/Tools/CrySCompileServer/Compiler/PCGMETAL/HLSLcc/HLSLcc.exe b/Tools/CrySCompileServer/Compiler/PCGMETAL/HLSLcc/HLSLcc.exe
deleted file mode 100644
index a25b74cad8..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCGMETAL/HLSLcc/HLSLcc.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1997ae4f0b59060a5c0065cea72069e5f9e0b9d25e69cd203fb842713b2a8484
-size 203776
diff --git a/Tools/CrySCompileServer/Compiler/PCGMETAL/HLSLcc/HLSLcc_d.exe b/Tools/CrySCompileServer/Compiler/PCGMETAL/HLSLcc/HLSLcc_d.exe
deleted file mode 100644
index 63d5e7db47..0000000000
--- a/Tools/CrySCompileServer/Compiler/PCGMETAL/HLSLcc/HLSLcc_d.exe
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c11921fca6f631201865d7717a2d3ad8479c6f3df058a7932e7c4daa691bf36
-size 460800
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py
index 184dbb62f2..5f6db7ac05 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py
@@ -254,7 +254,7 @@ class AbstractResourceLocator(object):
         return os.path.join(self.engine_root(), 'bootstrap.cfg')
 
     def asset_processor_config_file(self):
-        return os.path.join(self.engine_root(), 'AssetProcessorPlatformConfig.setreg')
+        return os.path.join(self.engine_root(), 'Registry', 'AssetProcessorPlatformConfig.setreg')
 
     def autoexec_file(self):
         return os.path.join(
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
index 230e85e6bf..11cd1fc4ce 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
@@ -656,14 +656,14 @@ class AssetProcessor(object):
 
         :return: None
         """
-        for copy_dir in [self._workspace.project, 'Engine']:
+        for copy_dir in [self._workspace.project, 'Assets/Engine', 'Registry']:
             make_dir = os.path.join(self._temp_asset_root, copy_dir)
             if not os.path.isdir(make_dir):
                 os.makedirs(make_dir)
         for copyfile_name in ['bootstrap.cfg',
-                              'AssetProcessorPlatformConfig.setreg',
+                              'Registry/AssetProcessorPlatformConfig.setreg',
                               os.path.join(self._workspace.project, "project.json"),
-                              os.path.join('Engine', 'exclude.filetag')]:
+                              os.path.join('Assets', 'Engine', 'exclude.filetag')]:
             shutil.copyfile(os.path.join(self._workspace.paths.engine_root(), copyfile_name),
                             os.path.join(self._temp_asset_root, copyfile_name))
 
@@ -725,9 +725,11 @@ class AssetProcessor(object):
         test class rather than using the default logs folder which could contain any old data or be used by other
         runs of asset processor.
         """
-        if self._temp_log_root:
+        if self._temp_log_directory:
             logger.info(f'Cleaning up old log root at {self._temp_log_root}')
-            shutil.rmtree(self._temp_log_root, True)
+            # The finalizer will clean up the old temporary directory when the TemporaryDirectory() reference count
+            # hits 0
+            self._temp_log_directory = None
         self._temp_log_directory = tempfile.TemporaryDirectory()
         self._temp_log_root = self._temp_log_directory.name
         self._workspace.paths.set_ap_log_root(self._temp_log_root)
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
index 3763b7eac0..b27c67bc1b 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
@@ -87,7 +87,10 @@ def copy_assets_to_project(assets: List[str], source_directory: str, target_asse
     for asset in assets:
         full_name = os.path.join(source_directory, asset)
         destination_fullname = os.path.join(target_asset_dir, asset)
-        shutil.copyfile(full_name, destination_fullname)
+        if os.path.isdir(full_name):
+            shutil.copytree(full_name, destination_fullname)
+        else:
+            shutil.copyfile(full_name, destination_fullname)
         os.chmod(destination_fullname, 0o0777)
 
 
diff --git a/Tools/LyTestTools/tests/CMakeLists.txt b/Tools/LyTestTools/tests/CMakeLists.txt
index 924fbf334c..4367339272 100644
--- a/Tools/LyTestTools/tests/CMakeLists.txt
+++ b/Tools/LyTestTools/tests/CMakeLists.txt
@@ -32,7 +32,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT
             AssetProcessor
             AutomatedTesting.GameLauncher
             AutomatedTesting.Assets
-            Legacy::CryRenderNULL
             COMPONENT TestTools
     )
 
@@ -55,7 +54,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT
             AssetProcessor
             AutomatedTesting.GameLauncher
             AutomatedTesting.Assets
-            Legacy::CryRenderNULL
             COMPONENT TestTools
     )
 endif()
diff --git a/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py b/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
index 3d0054c4e8..e46fefa461 100755
--- a/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
+++ b/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
@@ -168,7 +168,7 @@ class TestAbstractResourceLocator(object):
     def test_AssetProcessorConfigFile_IsCalled_ReturnsAssetProcessorConfigFilePath(self):
         mock_abstract_resource_locator = abstract_resource_locator.AbstractResourceLocator(
             mock_build_directory, mock_project)
-        expected_path = os.path.join(mock_abstract_resource_locator.engine_root(), 'AssetProcessorPlatformConfig.setreg')
+        expected_path = os.path.join(mock_abstract_resource_locator.engine_root(), 'Registry', 'AssetProcessorPlatformConfig.setreg')
 
         assert mock_abstract_resource_locator.asset_processor_config_file() == expected_path
 
diff --git a/Tools/PakGenFromRCList/generate_file_lists.py b/Tools/PakGenFromRCList/generate_file_lists.py
deleted file mode 100755
index 91299ecee4..0000000000
--- a/Tools/PakGenFromRCList/generate_file_lists.py
+++ /dev/null
@@ -1,420 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-import os.path
-import sys
-import optparse
-import xml.etree.ElementTree as ET
-from fnmatch import fnmatch
-
-def filter_files(old_list):
-    new_list = set()
-    
-    for item in old_list:
-        # split rc output
-        if '=' in item:
-            item_split = item.split('=')
-            if not len(item_split) == 2:
-                continue
-
-            item = item_split[1]
-                
-            if not 'GameSDK' in item:
-                continue
-                
-            item_split = item.split('GameSDK')
-            if not len(item_split) == 2:
-                continue
-                
-            item = item_split[1][1:]
-            
-            item = item.replace('\\', '/')
-        
-        # get rid of double slashes
-        item = item.replace('//', '/')
-                
-        # transform any dds into wildcard
-        if '.dds' in item:
-            item_split = item.split('.dds')
-            item = item_split[0] + '.dds\n'
-        if '.$dds' in item:
-            item_split = item.split('.$dds')
-            item = item_split[0] + '.dds\n'
-            
-        # convert to lower case
-        item = item.lower()
-        new_list.add(item)
-            
-        if item.split('.')[-1].strip() in ['cgf', 'cga', 'skin']:
-            newFile = item.strip() + 'm\n'
-            new_list.add(newFile)
-                
-    return new_list
-
-def read_file_mapping_rule(includeRules, excludeRules, node, levelTag):
-    for ruleNode in node:
-        rule = { 'levelTag' : levelTag }
-        rule['path'] = ruleNode.attrib['Path']
-        if ruleNode.tag.lower() == 'include':
-            includeRules.append(rule)
-        elif ruleNode.tag.lower() == 'exclude':
-            excludeRules.append(rule)
-
-def read_file_mapping_rules(file_mapping_xml, masterSet, levelList, resultList):
-    fileMappingTree = ET.parse(file_mapping_xml)
-    fileMappingRoot = fileMappingTree.getroot()
-    
-    levelIncludeRules = []
-    levelExcludeRules = []
-    globalIncludeRules = []
-    globalExcludeRules = []
-    launchIncludeRules = []    
-    
-    for node in fileMappingRoot:
-        if node.tag.lower() == 'level': 
-            levelName = node.attrib['Name'].lower()
-            levelTag = levelList[levelName]
-            read_file_mapping_rule(levelIncludeRules, levelExcludeRules, node, levelTag)                   
-    
-    for node in fileMappingRoot:
-        if node.tag.lower() == 'global':
-            read_file_mapping_rule(globalIncludeRules, globalExcludeRules, node, 'global')
-
-    for node in fileMappingRoot:
-        if node.tag.lower() == 'launch':
-            read_file_mapping_rule(launchIncludeRules, [], node, 'launch')            
-            
-    return (levelIncludeRules, levelExcludeRules, globalIncludeRules, globalExcludeRules, launchIncludeRules)
-    
-def apply_file_mapping(masterSet, levels, resultList, fileMappingRules):
-    levelIncludeRules = fileMappingRules[0]
-    levelExcludeRules = fileMappingRules[1]
-    globalIncludeRules = fileMappingRules[2]
-    globalExcludeRules = fileMappingRules[3]
-    launchIncludeRules = fileMappingRules[4]
-    
-    allLevelSet = ''
-    for levelTag in levels:
-        allLevelSet += levelTag    
-    
-    masterSetList = list(masterSet)
-    for resource in masterSetList:
-        levelSet = ''
-        
-        bLaunchInclude = False
-        bGlobalInclude = False
-        bGlobalExclude = False
-        bLevelInclude = False
-        bLevelExclude = False 
-        
-        resourceStripped = resource.strip()
-
-        for includeRule in launchIncludeRules:                 
-            if fnmatch(resourceStripped, includeRule['path']):
-                bLaunchInclude = True
-                levelSet = 'Launch'
-                break
-        
-        if not bLaunchInclude:
-            for levelTag in levels:
-                bResourceInAutoList = resource in levels[levelTag]['resources']            
-                bForceInclude = False
-
-                for includeRule in levelIncludeRules:                
-                    if (includeRule['levelTag'] == levelTag) and fnmatch(resourceStripped, includeRule['path']):
-                        bLevelInclude = True
-                        bForceInclude = True
-                        break
-                if not bLevelInclude:
-                    for excludeRule in levelExcludeRules: 
-                        if (excludeRule['levelTag'] == levelTag) and fnmatch(resourceStripped, excludeRule['path']):
-                            bLevelExclude = True
-                            break
-
-                if bForceInclude or (bResourceInAutoList and not bLevelExclude):
-                    levelSet += levelTag
-                    
-            if not bLevelInclude:
-                for includeRule in globalIncludeRules:                 
-                    if fnmatch(resourceStripped, includeRule['path']):
-                        bGlobalInclude = True
-                        levelSet = allLevelSet
-                        break
-            
-            if not (bLevelInclude or bGlobalInclude):
-                for excludeRule in globalExcludeRules: 
-                    if fnmatch(resourceStripped, excludeRule['path']):
-                        bGlobalExclude = True
-                        break
-             
-        if levelSet != '' and not bGlobalExclude:
-            if not levelSet in resultList:
-                resultList[levelSet] = []                
-            resultList[levelSet].append(resource)
-            masterSet.remove(resource)
-        elif bLevelExclude or bGlobalExclude:
-            masterSet.remove(resource)  
-
-def merge_paks(target_game, levels, resultList, pakSizeThreshold, numFilesThreshold):
-    allLevelList = ''
-    for levelIndicator in levels:
-        allLevelList += levelIndicator    
-    
-    smallList = []
-    bigList = []
-    for result in resultList.keys():
-        if result == 'Launch' or result == 'EXTRA':
-            continue        
-        
-        fileList = resultList[result]
-        if len(fileList) <= numFilesThreshold:
-            totalSize = 0
-            for fileName in fileList:
-                fullPath = target_game + '\\' + fileName.replace('/', '\\').strip()
-                if fullPath[-4:] == '.dds':
-                    fullPath = fullPath[:-4] + '.$dds'
-                fileSize = os.path.getsize(fullPath) if os.path.exists(fullPath) else 0
-                totalSize += fileSize
-            
-            if totalSize <= pakSizeThreshold:
-                smallList.append(result)
-            else:
-                bigList.append(result)
-        else:
-            bigList.append(result)
-                
-    for small in smallList:
-        bestMatch = allLevelList
-        for big in bigList:
-            bigSet = set(big)
-            if all((c in bigSet) for c in small) and len(big) < len(bestMatch):
-                bestMatch = big
-        
-        print '  Merged %s.pak with %s.pak' % (small, bestMatch)
-        fileList = resultList[small]
-        resultList[bestMatch].extend(fileList)
-        del resultList[small]
-
-def merge_paks_fixed(levels, resultList, availableList):
-    allLevelList = ''
-    for levelIndicator in levels:
-        allLevelList += levelIndicator    
-    
-    invalidList = []
-    for result in resultList.keys():
-        if result == 'Launch' or result == 'EXTRA':
-            continue        
-        
-        if not result in availableList:
-            invalidList.append(result)
-            
-    for invalid in invalidList:
-        bestMatch = allLevelList
-        for available in availableList:
-            availableSet = set(available)
-            if all((c in availableSet) for c in invalid) and len(available) < len(bestMatch):
-                bestMatch = available
-        
-        print '  Merged %s.pak with %s.pak' % (invalid, bestMatch)
-        fileList = resultList[invalid]
-        if not bestMatch in resultList:
-            print '%s NOT FOUND IN RESULT LIST - ADDING IT NOW' % bestMatch
-            resultList[bestMatch] = fileList
-        else:
-            resultList[bestMatch].extend(fileList)
-        del resultList[invalid]
-
-def filter_file_lists(level, levels, levelIndicator, rcFiles):
-    for levelIndicator in levels:
-        level = levels[levelIndicator]
-        print '  Filtering %s' % level['name']
-        levels[levelIndicator]['resources'] = filter_files(levels[levelIndicator]['resources'])
-    
-    print '  Filtering RC log'
-    rcFiles = filter_files(rcFiles)    
-    return rcFiles
-    
-def load_level_files(level, levels, levelIndicator):
-    for levelIndicator in levels:
-        level = levels[levelIndicator]
-        print '  Loading %s (%s)' % (level['name'], level['filename'])
-        if os.path.exists(level['filename']):
-            with open(level['filename']) as f:
-                levels[levelIndicator]['resources'] = set(f.readlines())
-        else:
-            print 'LEVEL %s NOT FOUND' % level['filename']
-
-def create_extra_list(masterSet, resultList):
-    resultList['EXTRA'] = []
-    for resource in masterSet:
-        resultList['EXTRA'].append(resource)
-
-def write_result_lists(path_to, resultList):
-    totalPath = os.path.join(path_to, 'files_TOTAL.txt')
-    with open(totalPath, 'w') as totalFileHandle:
-        for result in resultList:
-            resultPath = os.path.join(path_to, 'files_%s_GFL.txt' % result)
-            print '  %s -> %s' % (result, resultPath)
-            with open(resultPath, 'w') as f:
-                f.writelines(resultList[result])
-            
-            for resource in resultList[result]:
-                totalFileHandle.write('%s - %s' % (result, resource))
-
-def read_chunk_xmls(input):
-    chunks = []
-    
-    try:
-        tree = ET.parse(input)
-        package = tree.getroot()
-        
-        for chunk in package:
-            for k, v in chunk.attrib.items():
-                if k == 'CryLevels':
-                    chunks.append(v)
-
-    except Exception as e:
-        print "Couldn't load chunk XML"
-        print e
-        
-    return chunks
-    
-def main():
-    parser = optparse.OptionParser('usage: %prog source_game target_game path_to path_rc_log level_mapping_xml file_mapping_xml install_chunks_source_xml')
-
-    (_, args) = parser.parse_args()
-    if len(args) < 6:
-        parser.error("incorrect number of arguments")
-        return 1
-
-    print 'Generate fileName lists from level requirements'
-
-    # Get arguments
-    source_game = args[0]
-    target_game = args[1]
-    path_to = args[2]
-    path_rc_log = args[3]
-    level_mapping_xml = args[4]
-    file_mapping_xml = args[5]
-    install_chunks_source_xml = args[6]
-    
-    patching = False
-    
-    if not os.path.exists(source_game):
-        print 'Input path not valid'
-        return 1
-        
-    if not os.path.exists(path_rc_log):
-        print 'RC log not found'
-        return 1
-        
-    if not os.path.exists(path_to):
-        print 'Output path doesn\'t exist, creating it now'
-        os.makedirs(path_to)
-        
-    print 'Cleaning output folder'
-    for fileName in os.listdir(path_to):
-        os.remove(path_to + '\\' + fileName)
-        
-    testResultPath = source_game + '\Levels'
-    
-    levelMappingTree = ET.parse(level_mapping_xml)
-    levelsRoot = levelMappingTree.getroot()
-    
-    levelList = {}    
-    for level in levelsRoot:
-        levelList[level.attrib['Name']] = level.attrib['tag']
-    
-    if not os.path.exists(testResultPath):
-        print 'No results in build, exiting'
-        return 1
-        
-    if len(levelList) == 0:
-        print 'Level list, exiting'
-        return 1
-        
-    print 'Levels containing resources list:'
-    
-    levels = {}
-    for level in levelList:    
-        levelIndicator = levelList[level]
-        if levelIndicator in levels:
-            print 'Duplicate found, no support for this. Exiting'
-            return 1
-            
-        levels[levelIndicator] = {'name': level, 'filename': os.path.join(testResultPath, level, 'auto_resourcelist_total.txt'), 'resources': set()}
-        print '  [%s] -> %s' % (levelIndicator, level)
-    
-    print ''
-    print 'Loading files in memory'    
-    load_level_files(level, levels, levelIndicator)
-        
-    print ''
-    print 'Loading RC log in memory'
-    with open(path_rc_log, 'r') as f:
-        rcFiles = f.readlines()
-    
-    print ''
-    print 'Filtering files'
-    rcFiles = filter_file_lists(level, levels, levelIndicator, rcFiles)    
-        
-    print ''
-    print 'Creating master set'
-    
-    masterSet = set()    
-    for levelIndicator in levels:
-        level = levels[levelIndicator]
-        masterSet |= level['resources']    
-    masterSet |= set(rcFiles)
-    
-    print 'Done, %s items' % len(masterSet)
-    
-    resultList = {}
-    
-    print ''
-    print 'Reading static rules...'
-    fileMappingRules = read_file_mapping_rules(file_mapping_xml, masterSet, levelList, resultList)  
-    
-    print 'Going through list to find matches per level...'
-    apply_file_mapping(masterSet, levels, resultList, fileMappingRules)
-
-    print 'Creating extra list...'    
-    create_extra_list(masterSet, resultList)
-
-    print 'Done, %s combinations' % len(resultList)
-
-    pakSizeThreshold = 20000000
-    numFilesThreshold = 500
-    
-    print ''
-    print 'Merging PAKs under threshold size of %d files and %d bytes' % (numFilesThreshold, pakSizeThreshold)
-    if patching:
-        print '  DISABLED'
-    else:
-        merge_paks(target_game, levels, resultList, pakSizeThreshold, numFilesThreshold)
-
-    
-    if patching:
-        print ''
-        print 'Merging PAKs using fixed set of chunks'
-        availableList = read_chunk_xmls(install_chunks_source_xml)
-        merge_paks_fixed(levels, resultList, availableList)
-
-    print ''
-    print 'Dumping results in %s' % path_to
-    write_result_lists(path_to, resultList)    
- 
-    print ''
-    print 'Done, %d PAKs' % len(resultList)
-    
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/Tools/PakGenFromRCList/generate_pak_files.py b/Tools/PakGenFromRCList/generate_pak_files.py
deleted file mode 100755
index 0544900edf..0000000000
--- a/Tools/PakGenFromRCList/generate_pak_files.py
+++ /dev/null
@@ -1,218 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-import os
-import os.path
-import glob
-import sys
-import optparse
-import subprocess
-import xml.etree.ElementTree as ET
-import xml.dom.minidom
-import glob
-
-def RunCmd(cmd, useShell=False, workingDir=None, silent=False, printOutput=True, stripTrailing=True):
-    if not silent:
-        print ''
-        print 'Running: %s' % ' '.join(cmd)
-
-    process = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=useShell, cwd=workingDir)
-    while True:
-        output = process.stdout.readline()
-        if output:
-            if printOutput:
-                if stripTrailing:
-                    print output[0:-2]    # Print output stripping trailing \n
-                else:
-                    print output
-        else:
-            break
-
-    process.stdout.close()
-
-    rc = process.wait()
-    assert rc != None
-
-    if not silent:
-        print 'Program finished with return code: %d \n' % rc
-    
-    return rc
-def createJob(rootFolder, outputPak, jobPath):
-    jobString = '''
-    <RCJobs>
-     <DefaultProperties
-        rootFolder="%s"
-        outputPak="%s"
-        gamedata="Difficulty\*.*;Entities\*.*;Fonts\*.*;Libs\*.*;Materials\*.*;Prefabs\*.*;Levels\*.*xml"
-        scripts="Scripts\*.*"
-        geomcache_list="GameRyse\Animations\cinematics\GeomCachesCine1.txt"
-     />
-     <PakJob>
-        <Job sourceroot="${rootFolder}" input="*.*" zip="${outputPak}" exclude="${gamedata};${scripts};Videos\*.*;Sounds\*.*;Music\*.*;*dds*;*.cax;Libs\UI\*.*;Localization\*.*;_levelpak\*.*;levels\*.*;Animations\Mannequin\*.*" zip_sizesplit="1" />
-        <Job sourceroot="${rootFolder}" input="*.dds" zip="${outputPak}" listformat="{1}.dds;{1}.$dds;{1}.dds.1;{1}.dds.1a;{1}.dds.2;{1}.dds.2a;{1}.dds.3;{1}.dds.3a;{1}.dds.4;{1}.dds.4a;{1}.dds.5;{1}.dds.5a;{1}.dds.6;{1}.dds.6a;{1}.dds.7;{1}.dds.7a;{1}.dds.8;{1}.dds.8a;{1}.dds.9;{1}.dds.9a" exclude="Libs\UI\*.*;Localization\*.*" zip_sizesplit="1" />
-        <Job sourceroot="${rootFolder}" input="*.dds" zip="${outputPak}" listformat="{1}.dds.0;{1}.dds.0a" exclude="Libs\UI\*.*;Localization\*.*" sourceminsize="4001" zip_sizesplit="1" />
-        <Job sourceroot="${rootFolder}" input="*.cax" zip="${outputPak}" zip_compression="0" exclude_listfile="${rootFolder}\..\..\Build\${geomcache_list}" zip_sizesplit="1" />
-        <Job sourceroot="${rootFolder}" input="Music\*.*" zip="${outputPak}" zip_compression="0" zip_sizesplit="1" />
-        <Job sourceroot="${rootFolder}" input="Sounds\*.*" zip="${outputPak}" zip_compression="0" zip_sizesplit="1" />
-        <Job sourceroot="${rootFolder}" input="Videos\*.*" exclude="Videos\Cinematics\Unlockable\*.*" zip="${outputPak}" zip_compression="0" zip_sizesplit="1" />
-        <!-- Part of the RC Build proccess
-        <Job sourceroot="${rootFolder}" input="Libs\UI\*.*" zip="${outputPak}" zip_compression="0" exclude="*.dat;Libs\UI\Menus\NewMenu\Screens\CollectiblesComics\*.*;Libs\UI\Menus\NewMenu\Screens\CollectiblesDogtags\*.*;Libs\UI\Menus\NewMenu\Screens\CollectiblesVistas\*.*" zip_sizesplit="1" /> 
-        -->        
-      </PakJob>
-
-      <Run Job="PakJob"/>
-    </RCJobs>
-    ''' % (rootFolder, outputPak)
-    
-    f = open(jobPath, 'w')
-    f.write(jobString)
-    f.close()
-    
-def generate_chunk_xmls(pakList, input, outputInstall, outputMakePkg):
-    try:
-        tree = ET.parse(input)
-        package = tree.getroot()
-        
-        launch_chunk_index = 100
-        chunk_index = 10000
-        
-        for result in pakList:
-            pattern, pak = result
-        
-            chunk = ET.Element('Chunk')            
-            if pattern != 'Launch':    
-                chunk.attrib['Id'] = str(chunk_index)
-                chunk_index += 1                
-                chunk.attrib['CryMarker'] = 'Level data'
-                chunk.attrib['CryLevels'] = pattern
-            else:
-                chunk.attrib['Id'] = str(launch_chunk_index)
-                launch_chunk_index += 1
-                chunk.attrib['CryMarker'] = 'Launch data'      
-            
-            file_group = ET.Element('FileGroup')
-            file_group.attrib['DestinationPath'] = '\\GameSDK'
-            file_group.attrib['SourcePath'] = 'GameSDK'
-            file_group.attrib['Include'] = pak
-
-            chunk.append(file_group)            
-
-            if pattern != 'Launch':
-                package.append(chunk)
-            else:
-                package.insert(0, chunk)
-                
-        # Insert update alignment chunk
-        chunk = ET.Element('Chunk')  
-        chunk.attrib['Id'] = "1073741823"
-        file_group = ET.Element('FileGroup')
-        file_group.attrib['DestinationPath'] = '\\'
-        file_group.attrib['SourcePath'] = '.\\'
-        file_group.attrib['Include'] = "Update.AlignmentChunk"
-        chunk.append(file_group)
-        package.append(chunk)        
-           
-        with open(outputInstall,'w+b') as out_handle:
-            out_handle.write(xml.dom.minidom.parseString(ET.tostring(package)).toprettyxml())
-            
-        for chunk in package:
-            for k, v in chunk.attrib.items():
-                if k[:3] == 'Cry':
-                    del chunk.attrib[k]
-
-        with open(outputMakePkg,'w+b') as out_handle:
-            out_handle.write(xml.dom.minidom.parseString(ET.tostring(package)).toprettyxml())
-            
-    except Exception as e:
-        print "Couldn't generate chunk XML"
-        print e    
-    
-def main():
-    parser = optparse.OptionParser('usage: %prog filelist_path game_path rc_path archive_path install_chunks_source_xml install_chunks_target_xml makepkg_chunks_target_xml')
-
-    (options, args) = parser.parse_args()
-    if len(args) < 7:
-        parser.error("incorrect number of arguments")
-        return 1
-
-    print 'Generate PAK files from file lists and game folder into archive path'
-
-    # Get arguments
-    path_from = args[0]
-    path_game = args[1]
-    path_rc = args[2]
-    path_to = args[3]
-    install_chunks_source_xml = args[4]
-    install_chunks_target_xml = args[5]
-    makepkg_chunks_target_xml = args[6]    
-    
-    rcExecutable = os.path.join(args[2], 'rc.exe')
-
-    if not os.path.exists(path_from):
-        print 'Input path not valid'
-        return 1
-        
-    if not os.path.exists(path_from):
-        print 'Input path not valid'
-        return 1
-        
-    if not os.path.exists(rcExecutable):
-        print 'RC path not valid'
-        return 1
-        
-    if not os.path.exists(path_to):
-        print 'Output path doesn\'t exist, creating it now'
-        os.makedirs(path_to)
-        
-    fileList = glob.glob(os.path.join(path_from, '*GFL.txt'))
-    
-    print ''
-    print 'Total number of files: %s' % len(fileList)
-    
-    print ''
-    print 'Creating PAK files and storing them in %s' % path_to
-    
-    pakList = []    
-    for file in fileList:
-        pattern = file[len(path_from) + 7: -8]
-        pak_path = os.path.join(path_to, '%s.pak' % pattern)
-        pak_glob_path = os.path.join(path_to, '%s-part*.pak' % pattern)
-        
-        print ' %s -> %s' % (pattern, pak_path)
-        
-        createJob(path_game, pak_path, '%s\job_temp.xml' % path_from)
-        
-        rcCmd = [rcExecutable, '/threads=8', '/logprefix=..\\%s_' % pattern, '/quiet', '/job=job_temp.xml', '/listfile=%s' % file]
-        
-        RunCmd(rcCmd, workingDir=path_from, silent=False, printOutput=True)
-        
-        if pattern.lower() != "extra":
-            patternPakList = glob.glob(pak_glob_path)
-            for patternPak in patternPakList:
-                pakList.append((pattern, os.path.basename(patternPak)))            
-            if os.path.exists(pak_path):
-                pakList.append((pattern, pattern + '.pak'))
-    
-    patching = False
-    
-    print ''
-    print 'Writing chunk XMLs %s and %s' % (install_chunks_target_xml, makepkg_chunks_target_xml)
-    
-    if patching:
-        print '  DISABLED'
-    else:
-        generate_chunk_xmls(pakList, install_chunks_source_xml, install_chunks_target_xml, makepkg_chunks_target_xml)
-        
-    print ''
-    print 'Done!'
-
-
-if __name__ == '__main__':
-    sys.exit(main())
\ No newline at end of file
diff --git a/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt b/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt
index c7352da3a0..bfc6546456 100644
--- a/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt
+++ b/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt
@@ -30,6 +30,5 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT
 #            AssetProcessor
 #            AutomatedTesting.GameLauncher
 #            AutomatedTesting.Assets
-#            Legacy::CryRenderNULL
 #    )
 endif()
\ No newline at end of file
diff --git a/bootstrap.cfg b/bootstrap.cfg
index aa7af07645..858e9093f5 100644
--- a/bootstrap.cfg
+++ b/bootstrap.cfg
@@ -7,6 +7,6 @@ project_path=AutomatedTesting
 ; The Engine specific settings can be overridden in order of least precedence to most
 ; 1. Override the settings in a "<gem-root>/Registry/*.setreg(patch)" file (Shared per Gem Settings)
 ; 2. Override the settings in a "<project-root>/Registry/*.setreg(patch)" file (Shared per Project Settings)
-; 3. Override the settings in a "<project-root>/Registry/*.setreg(patch)" file (User per Project Settings)
+; 3. Override the settings in a "<project-root>/user/Registry/*.setreg(patch)" file (User per Project Settings)
 ; 4. Override the settings in a "~/.o3de/Registry/*.setreg(patch)" file (User Global Settings) 
 ; Where "~" is %USERPROFILE% on Windows and $HOME on Unix like platforms
diff --git a/cmake/3rdParty/FindCrashpad.cmake b/cmake/3rdParty/FindCrashpad.cmake
deleted file mode 100644
index 95922cdca9..0000000000
--- a/cmake/3rdParty/FindCrashpad.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_external_target(
-    NAME Crashpad
-    VERSION ""
-    3RDPARTY_ROOT_DIRECTORY ${LY_ROOT_FOLDER}/Tools/Crashpad
-    INCLUDE_DIRECTORIES
-        include
-        include/third_party/mini_chromium/mini_chromium/
-)
-
-ly_add_external_target(
-    NAME Handler
-    PACKAGE Crashpad
-    VERSION ""
-    3RDPARTY_ROOT_DIRECTORY ${LY_ROOT_FOLDER}/Tools/Crashpad
-    INCLUDE_DIRECTORIES
-        include
-        include/third_party/mini_chromium/mini_chromium
-        include/third_party/getopt
-)
diff --git a/cmake/3rdParty/Finddyad.cmake b/cmake/3rdParty/Finddyad.cmake
deleted file mode 100644
index 179ce45bce..0000000000
--- a/cmake/3rdParty/Finddyad.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_external_target(
-    NAME dyad
-    VERSION 0.2.0-17-amazon
-    INCLUDE_DIRECTORIES src
-)
diff --git a/cmake/3rdParty/Findlibav.cmake b/cmake/3rdParty/Findlibav.cmake
deleted file mode 100644
index f14a4cfe50..0000000000
--- a/cmake/3rdParty/Findlibav.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-ly_add_external_target(
-    NAME libav
-    VERSION 11.7
-    INCLUDE_DIRECTORIES 
-        usr/include
-)
diff --git a/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
index bd2fd969eb..fbe24d382d 100644
--- a/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
+++ b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
@@ -11,7 +11,6 @@
 
 set(FILES
     BuiltInPackages_linux.cmake
-    dyad_linux.cmake
     FbxSdk_linux.cmake
     Wwise_linux.cmake
 )
diff --git a/cmake/3rdParty/Platform/Linux/dyad_linux.cmake b/cmake/3rdParty/Platform/Linux/dyad_linux.cmake
deleted file mode 100644
index ae9e3d99d7..0000000000
--- a/cmake/3rdParty/Platform/Linux/dyad_linux.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DYAD_LIBS ${BASE_PATH}/lib/linux_$<IF:$<CONFIG:Debug>,debug,release>/libdyad.a)
\ No newline at end of file
diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
index 249cc7f2c2..e8c1361b3f 100644
--- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
@@ -56,3 +56,4 @@ ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows   TARGETS lib
 ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows          TARGETS OpenMesh        PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
 ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows          TARGETS civetweb        PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)
 ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-windows        TARGETS OpenSSL         PACKAGE_HASH 9af1c50343f89146b4053101a7aeb20513319a3fe2f007e356d7ce25f9241040)
+ly_associate_package(PACKAGE_NAME Crashpad-0.8.0-rev1-windows        TARGETS Crashpad        PACKAGE_HASH d162aa3070147bc0130a44caab02c5fe58606910252caf7f90472bd48d4e31e2)
diff --git a/cmake/3rdParty/Platform/Windows/Crashpad_windows.cmake b/cmake/3rdParty/Platform/Windows/Crashpad_windows.cmake
deleted file mode 100644
index ec1ce8db02..0000000000
--- a/cmake/3rdParty/Platform/Windows/Crashpad_windows.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(libpath ${BASE_PATH}/bin/windows/vs2019/$<IF:$<CONFIG:debug>,Debug,Release>_x64)
-
-set(CRASHPAD_LIBS 
-    ${libpath}/base.lib
-    ${libpath}/crashpad_client.lib
-    ${libpath}/crashpad_context.lib
-    ${libpath}/crashpad_util.lib
-    winhttp
-    version
-    powrprof
-)
-
-set(CRASHPAD_INCLUDE_DIRECTORIES
-    include/compat/win
-)
-
-set(CRASHPAD_HANDLER_LIBS
-    ${libpath}/crashpad_tool_support.lib
-    ${libpath}/crashpad_compat.lib
-    ${libpath}/third_party/getopt.lib
-    ${libpath}/crashpad_minidump.lib
-    ${libpath}/crashpad_snapshot.lib
-    ${libpath}/crashpad_handler.lib
-    ${libpath}/third_party/zlib.lib
-)
diff --git a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
index 9ae74b7e6a..64d58e912f 100644
--- a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
+++ b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
@@ -11,9 +11,6 @@
 
 set(FILES
     BuiltInPackages_windows.cmake
-    Crashpad_windows.cmake
-    dyad_windows.cmake
     FbxSdk_windows.cmake
-    libav_windows.cmake
     Wwise_windows.cmake
 )
diff --git a/cmake/3rdParty/Platform/Windows/dyad_windows.cmake b/cmake/3rdParty/Platform/Windows/dyad_windows.cmake
deleted file mode 100644
index 8f008ba54e..0000000000
--- a/cmake/3rdParty/Platform/Windows/dyad_windows.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(DYAD_LIBS ${BASE_PATH}/lib/x64_v140_$<IF:$<CONFIG:Debug>,Debug,Release>/libdyad.lib)
diff --git a/cmake/3rdParty/Platform/Windows/libav_windows.cmake b/cmake/3rdParty/Platform/Windows/libav_windows.cmake
deleted file mode 100644
index f41cde4089..0000000000
--- a/cmake/3rdParty/Platform/Windows/libav_windows.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(LIBAV_LIB_PATH ${BASE_PATH}/usr/bin/)
-set(LIBAV_LIBS 
-    avcodec
-    avdevice
-    avfilter
-    avformat
-    avresample
-    avutil
-    swscale
-)
-
-list(TRANSFORM LIBAV_LIBS PREPEND ${LIBAV_LIB_PATH}${CMAKE_STATIC_LIBRARY_PREFIX})
-list(TRANSFORM LIBAV_LIBS APPEND "${CMAKE_STATIC_LIBRARY_SUFFIX}")
-
-
-set(LIBAV_SHARED 
-    avcodec-56
-    avdevice-55
-    avfilter-5
-    avformat-56
-    avresample-2
-    avutil-54
-    libogg-0
-    libopus-0
-    libvo-aacenc-0
-    libvorbis-0
-    libvorbisenc-2
-    swscale-3
-    zlib1
-)
-
-list(TRANSFORM LIBAV_SHARED PREPEND ${LIBAV_LIB_PATH}${CMAKE_SHARED_LIBRARY_PREFIX})
-list(TRANSFORM LIBAV_SHARED APPEND "${CMAKE_SHARED_LIBRARY_SUFFIX}")
-list(JOIN LIBAV_SHARED ";" LIBAV_SHARED_STRING)
-set(LIBAV_RUNTIME_DEPENDENCIES ${LIBAV_SHARED_STRING})
diff --git a/cmake/3rdParty/cmake_files.cmake b/cmake/3rdParty/cmake_files.cmake
index d37fcba840..80e1ae426a 100644
--- a/cmake/3rdParty/cmake_files.cmake
+++ b/cmake/3rdParty/cmake_files.cmake
@@ -12,9 +12,7 @@
 set(FILES
     BuiltInPackages.cmake
     FindClang.cmake
-    Finddyad.cmake
     FindFbxSdk.cmake
-    Findlibav.cmake
     FindOpenGLInterface.cmake
     FindRadTelemetry.cmake
     FindVkValidation.cmake
diff --git a/cmake/CPack.cmake b/cmake/CPack.cmake
deleted file mode 100644
index 687021587b..0000000000
--- a/cmake/CPack.cmake
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-if(NOT PAL_TRAIT_BUILD_CPACK_SUPPORTED)
-    return()
-endif()
-
-set(LY_QTIFW_PATH "" CACHE PATH "Path to the Qt Installer Framework install path")
-
-if(LY_QTIFW_PATH)
-    file(TO_CMAKE_PATH ${LY_QTIFW_PATH} CPACK_IFW_ROOT)
-elseif(DEFINED ENV{QTIFWDIR})
-    file(TO_CMAKE_PATH $ENV{QTIFWDIR} CPACK_IFW_ROOT)
-endif()
-
-if(CPACK_IFW_ROOT)
-    if(NOT EXISTS ${CPACK_IFW_ROOT})
-        message(FATAL_ERROR "Invalid path supplied for LY_QTIFW_PATH argument or QTIFWDIR environment variable")
-    endif()
-else()
-    # early out as no path to QtIFW has been supplied effectively disabling support
-    return()
-endif()
-
-set(CPACK_GENERATOR "IFW")
-
-set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
-set(CPACK_PACKAGE_VERSION "${LY_VERSION_STRING}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installation Tool")
-
-string(TOLOWER ${PROJECT_NAME} _project_name_lower)
-set(CPACK_PACKAGE_FILE_NAME "${_project_name_lower}_installer")
-
-set(DEFAULT_LICENSE_NAME "Apache-2.0")
-set(DEFAULT_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
-
-set(CPACK_RESOURCE_FILE_LICENSE ${DEFAULT_LICENSE_FILE})
-
-set(CPACK_IFW_PACKAGE_TITLE "${PROJECT_NAME} Installer")
-set(CPACK_IFW_PACKAGE_PUBLISHER "${PROJECT_NAME}")
-
-set(CPACK_IFW_TARGET_DIRECTORY "@ApplicationsDir@/${PROJECT_NAME}/${LY_VERSION_STRING}")
-set(CPACK_IFW_PACKAGE_START_MENU_DIRECTORY "${PROJECT_NAME}")
-
-# IMPORTANT: required to be included AFTER setting all property overrides
-include(CPack REQUIRED)
-include(CPackIFW REQUIRED)
-
-function(ly_configure_cpack_component ly_configure_cpack_component_NAME)
-
-    set(options REQUIRED)
-    set(oneValueArgs DISPLAY_NAME DESCRIPTION LICENSE_NAME LICENSE_FILE)
-    set(multiValueArgs)
-
-    cmake_parse_arguments(ly_configure_cpack_component "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    # default to optional
-    set(component_type DISABLED)
-    set(ifw_component_type)
-
-    if(ly_configure_cpack_component_REQUIRED)
-        set(component_type REQUIRED)
-        set(ifw_component_type FORCED_INSTALLATION)
-    endif()
-
-    set(license_name ${DEFAULT_LICENSE_NAME})
-    set(license_file ${DEFAULT_LICENSE_FILE})
-
-    if(ly_configure_cpack_component_LICENSE_NAME AND ly_configure_cpack_component_LICENSE_FILE)
-        set(license_name ${ly_configure_cpack_component_LICENSE_NAME})
-        set(license_file ${ly_configure_cpack_component_LICENSE_FILE})
-    elseif(ly_configure_cpack_component_LICENSE_NAME OR ly_configure_cpack_component_LICENSE_FILE)
-        message(FATAL_ERROR "Invalid argument configuration. Both LICENSE_NAME and LICENSE_FILE must be set for ly_configure_cpack_component")
-    endif()
-
-    cpack_add_component(
-        ${ly_configure_cpack_component_NAME} ${component_type}
-        DISPLAY_NAME ${ly_configure_cpack_component_DISPLAY_NAME}
-        DESCRIPTION ${ly_configure_cpack_component_DESCRIPTION}
-    )
-
-    cpack_ifw_configure_component(
-        ${ly_configure_cpack_component_NAME} ${ifw_component_type}
-        LICENSES
-            ${license_name}
-            ${license_file}
-    )
-endfunction()
-
-# configure ALL components here
-ly_configure_cpack_component(
-    ${LY_DEFAULT_INSTALL_COMPONENT} REQUIRED
-    DISPLAY_NAME "${PROJECT_NAME} Core"
-    DESCRIPTION "${PROJECT_NAME} Headers, Libraries and Tools"
-)
diff --git a/cmake/EngineFinder.cmake b/cmake/EngineFinder.cmake
index 1fdcef2b56..9ff8ce4d66 100644
--- a/cmake/EngineFinder.cmake
+++ b/cmake/EngineFinder.cmake
@@ -45,6 +45,8 @@ if(EXISTS ${manifest_path})
         if(${json_error})
             message(FATAL_ERROR "Unable to read engines[${engine_path_index}] '${manifest_path}', error: ${json_error}")
         endif()
-        list(APPEND CMAKE_MODULE_PATH "${engine_path}/cmake")
+        if(engine_path)
+            list(APPEND CMAKE_MODULE_PATH "${engine_path}/cmake")
+        endif()
     endforeach()
 endif()
diff --git a/cmake/LYTestWrappers.cmake b/cmake/LYTestWrappers.cmake
index 6bd809ec41..2a65929cf6 100644
--- a/cmake/LYTestWrappers.cmake
+++ b/cmake/LYTestWrappers.cmake
@@ -24,8 +24,8 @@ ly_set(LY_PYTEST_EXECUTABLE ${LY_PYTHON_CMD} -B -m pytest -v --tb=short --show-c
 ly_set(LY_TEST_GLOBAL_KNOWN_SUITE_NAMES "smoke" "main" "periodic" "benchmark" "sandbox")
 ly_set(LY_TEST_GLOBAL_KNOWN_REQUIREMENTS "gpu")
 
-# Set default to 20 minutes
-ly_set(LY_TEST_DEFAULT_TIMEOUT 1200)
+# Set default test aborts to 25 minutes, avoids hitting the CI pipeline inactivity timeout usually set to 30 minutes
+ly_set(LY_TEST_DEFAULT_TIMEOUT 1500)
 
 # Add the CMake Test targets for each suite if testing is supported
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
@@ -115,6 +115,8 @@ function(ly_add_test)
     # Set default test module timeout
     if(NOT ly_add_test_TIMEOUT)
         set(ly_add_test_TIMEOUT ${LY_TEST_DEFAULT_TIMEOUT})
+    elseif(ly_add_test_TIMEOUT GREATER LY_TEST_DEFAULT_TIMEOUT)
+        message(WARNING "TIMEOUT for test ${ly_add_test_NAME} set at ${ly_add_test_TIMEOUT} seconds which is longer than the default of ${LY_TEST_DEFAULT_TIMEOUT}. Allowing a single module to run exceedingly long creates problems in a CI pipeline.")
     endif()
 
     if(NOT ly_add_test_TEST_COMMAND)
@@ -353,7 +355,6 @@ function(ly_add_editor_python_test)
         RUNTIME_DEPENDENCIES
             ${ly_add_editor_python_test_RUNTIME_DEPENDENCIES}
             Gem::EditorPythonBindings.Editor
-            Legacy::CryRenderNULL
             Legacy::Editor
         TEST_SUITE ${ly_add_editor_python_test_TEST_SUITE}
         LABELS FRAMEWORK_pytest
diff --git a/cmake/LYWrappers.cmake b/cmake/LYWrappers.cmake
index a860bcfd20..f6a36afc89 100644
--- a/cmake/LYWrappers.cmake
+++ b/cmake/LYWrappers.cmake
@@ -157,13 +157,8 @@ function(ly_add_target)
     elseif(ly_add_target_HEADERONLY)
         add_library(${ly_add_target_NAME}
             ${linking_options}
+            ${ALLFILES} ${ly_add_target_GENERATED_FILES}
         )
-        # Create a custom target to see it in the IDE
-        # Once this is solved: https://gitlab.kitware.com/cmake/cmake/merge_requests/3113, we can just add the files to the library above
-        add_custom_target(${ly_add_target_NAME}_HEADERS
-            SOURCES ${ALLFILES} ${ly_add_target_GENERATED_FILES}
-        )
-        set(project_NAME ${ly_add_target_NAME}_HEADERS)
     elseif(ly_add_target_UNKNOWN)
         add_library(${ly_add_target_NAME}
             ${linking_options}
diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
new file mode 100644
index 0000000000..25fddb90d0
--- /dev/null
+++ b/cmake/Packaging.cmake
@@ -0,0 +1,70 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+if(NOT PAL_TRAIT_BUILD_CPACK_SUPPORTED)
+    return()
+endif()
+
+set(CPACK_GENERATOR "ZIP")
+
+set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
+set(CPACK_PACKAGE_VERSION "${LY_VERSION_STRING}")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installation Tool")
+
+string(TOLOWER ${PROJECT_NAME} _project_name_lower)
+set(CPACK_PACKAGE_FILE_NAME "${_project_name_lower}_installer")
+
+set(DEFAULT_LICENSE_NAME "Apache-2.0")
+set(DEFAULT_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
+
+set(CPACK_RESOURCE_FILE_LICENSE ${DEFAULT_LICENSE_FILE})
+
+# IMPORTANT: required to be included AFTER setting all property overrides
+include(CPack REQUIRED)
+
+function(ly_configure_cpack_component ly_configure_cpack_component_NAME)
+
+    set(options REQUIRED)
+    set(oneValueArgs DISPLAY_NAME DESCRIPTION LICENSE_NAME LICENSE_FILE)
+    set(multiValueArgs)
+
+    cmake_parse_arguments(ly_configure_cpack_component "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    # default to optional
+    set(component_type DISABLED)
+
+    if(ly_configure_cpack_component_REQUIRED)
+        set(component_type REQUIRED)
+    endif()
+
+    set(license_name ${DEFAULT_LICENSE_NAME})
+    set(license_file ${DEFAULT_LICENSE_FILE})
+
+    if(ly_configure_cpack_component_LICENSE_NAME AND ly_configure_cpack_component_LICENSE_FILE)
+        set(license_name ${ly_configure_cpack_component_LICENSE_NAME})
+        set(license_file ${ly_configure_cpack_component_LICENSE_FILE})
+    elseif(ly_configure_cpack_component_LICENSE_NAME OR ly_configure_cpack_component_LICENSE_FILE)
+        message(FATAL_ERROR "Invalid argument configuration. Both LICENSE_NAME and LICENSE_FILE must be set for ly_configure_cpack_component")
+    endif()
+
+    cpack_add_component(
+        ${ly_configure_cpack_component_NAME} ${component_type}
+        DISPLAY_NAME ${ly_configure_cpack_component_DISPLAY_NAME}
+        DESCRIPTION ${ly_configure_cpack_component_DESCRIPTION}
+    )
+endfunction()
+
+# configure ALL components here
+ly_configure_cpack_component(
+    ${LY_DEFAULT_INSTALL_COMPONENT} REQUIRED
+    DISPLAY_NAME "${PROJECT_NAME} Core"
+    DESCRIPTION "${PROJECT_NAME} Headers, Libraries and Tools"
+)
diff --git a/cmake/Platform/Android/PAL_android.cmake b/cmake/Platform/Android/PAL_android.cmake
index bd76076467..bb4ac5f32b 100644
--- a/cmake/Platform/Android/PAL_android.cmake
+++ b/cmake/Platform/Android/PAL_android.cmake
@@ -39,7 +39,7 @@ set(LY_ASSET_DEPLOY_ASSET_TYPE "es3" CACHE STRING "Set the asset type for deploy
 
 # Set the python cmd tool
 if(PAL_HOST_PLATFORM_NAME_LOWERCASE STREQUAL "windows")
-    ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.cmd)
+    ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.cmd)
 else()
-    ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.sh)
+    ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)
 endif()
diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index b1a6da012b..8fe2fe2c1c 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -159,15 +159,15 @@ function(ly_generate_target_config_file NAME)
         elseif(target_type STREQUAL MODULE_LIBRARY)
             string(APPEND target_location "\"\${LY_ROOT_FOLDER}/${library_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_library_output_subdirectory}/$<TARGET_FILE_NAME:${NAME}>\"")
         elseif(target_type STREQUAL SHARED_LIBRARY)
-            string(APPEND target_location "\"\${LY_ROOT_FOLDER}/${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/$<TARGET_LINKER_FILE_NAME:${NAME}>\"")           
+            string(APPEND target_location "\"\${LY_ROOT_FOLDER}/${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/$<TARGET_LINKER_FILE_NAME:${NAME}>\"")
             string(APPEND target_file_contents "ly_add_dependencies(${NAME} \"\${LY_ROOT_FOLDER}/${library_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_library_output_subdirectory}/$<TARGET_FILE_NAME:${NAME}>\")\n")
         else() # STATIC_LIBRARY, OBJECT_LIBRARY, INTERFACE_LIBRARY
             string(APPEND target_location "\"\${LY_ROOT_FOLDER}/${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/$<TARGET_LINKER_FILE_NAME:${NAME}>\"")
         endif()
 
-        string(APPEND target_file_contents 
+        string(APPEND target_file_contents
 "set(target_location ${target_location})
-set_target_properties(${NAME} 
+set_target_properties(${NAME}
     PROPERTIES
         $<$<CONFIG:profile>:IMPORTED_LOCATION \"\${target_location}\">
         IMPORTED_LOCATION_$<UPPER_CASE:$<CONFIG>> \"\${target_location}\"
@@ -286,7 +286,7 @@ endfunction()
 function(ly_setup_others)
 
     # List of directories we want to install relative to engine root
-    set(DIRECTORIES_TO_INSTALL Tools/LyTestTools Tools/RemoteConsole scripts)
+    set(DIRECTORIES_TO_INSTALL Tools/LyTestTools Tools/RemoteConsole)
     foreach(dir ${DIRECTORIES_TO_INSTALL})
 
         get_filename_component(install_path ${dir} DIRECTORY)
@@ -301,6 +301,24 @@ function(ly_setup_others)
 
     endforeach()
 
+    # Scripts
+    file(GLOB o3de_scripts "${CMAKE_SOURCE_DIR}/scripts/o3de.*")
+    install(FILES
+        ${o3de_scripts}
+        DESTINATION ./scripts
+        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+    )
+
+    install(DIRECTORY
+        ${CMAKE_SOURCE_DIR}/scripts/bundler
+        ${CMAKE_SOURCE_DIR}/scripts/project_manager
+        DESTINATION ./scripts
+        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+        PATTERN "__pycache__" EXCLUDE
+        PATTERN "CMakeLists.txt" EXCLUDE
+        PATTERN "tests" EXCLUDE
+    )
+
     install(DIRECTORY "${CMAKE_SOURCE_DIR}/python"
         DESTINATION .
         COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
@@ -311,31 +329,54 @@ function(ly_setup_others)
     # Registry
     install(DIRECTORY
         ${CMAKE_CURRENT_BINARY_DIR}/bin/$<CONFIG>/Registry
-        DESTINATION ./bin/$<CONFIG>
+        DESTINATION ./bin/${PAL_PLATFORM_NAME}/$<CONFIG>
         COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
     install(DIRECTORY
-        # This one will change soon, Engine/Registry files will be relocated to Registry
-        ${CMAKE_SOURCE_DIR}/Engine/Registry
-        DESTINATION ./Engine
+        ${CMAKE_SOURCE_DIR}/Registry
+        DESTINATION .
         COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
-    install(FILES
-        ${CMAKE_SOURCE_DIR}/AssetProcessorPlatformConfig.setreg
-        DESTINATION ./Registry
+
+    # Engine Source Assets
+    install(DIRECTORY
+        ${CMAKE_SOURCE_DIR}/Assets
+        DESTINATION .
         COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
-    # Qt Binaries
-    set(QT_BIN_DIRS bearer iconengines imageformats platforms styles translations)
-    foreach(qt_dir ${QT_BIN_DIRS})
-        install(DIRECTORY
-            ${CMAKE_CURRENT_BINARY_DIR}/bin/$<CONFIG>/${qt_dir}
-            DESTINATION ./bin/$<CONFIG>
-            COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
-        )
+    # Gem Source Assets and Registry
+    # Find all gem directories relative to the CMake Source Dir
+    file(
+        GLOB_RECURSE
+        gems_assets_path
+        LIST_DIRECTORIES TRUE
+        RELATIVE "${CMAKE_SOURCE_DIR}/"
+        "Gems/*"
+    )
+    list(FILTER gems_assets_path INCLUDE REGEX "/(Assets|Registry)$")
+
+    foreach (gem_assets_path ${gems_assets_path})
+        set(gem_abs_assets_path ${CMAKE_SOURCE_DIR}/${gem_assets_path}/)
+        if (EXISTS ${gem_abs_assets_path})
+            # The trailing slash is IMPORTANT here as that is needed to prevent
+            # the "Assets" folder from being copied underneath the <gem-root>/Assets folder
+            install(DIRECTORY ${gem_abs_assets_path}
+                DESTINATION ${gem_assets_path}
+                COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+            )
+        endif()
     endforeach()
 
+    # Qt Binaries
+    set(QT_DIRS bearer iconengines imageformats platforms styles translations)
+    list(TRANSFORM QT_DIRS PREPEND "${CMAKE_CURRENT_BINARY_DIR}/bin/$<CONFIG>/" OUTPUT_VARIABLE QT_BIN_DIRS)
+    install(DIRECTORY
+        ${QT_BIN_DIRS}
+        DESTINATION ./bin/${PAL_PLATFORM_NAME}/$<CONFIG>
+        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+    )
+
     # Templates
     install(DIRECTORY
         ${CMAKE_SOURCE_DIR}/Templates
diff --git a/cmake/Platform/Linux/PAL_linux.cmake b/cmake/Platform/Linux/PAL_linux.cmake
index 1d9f02a461..40b73adcec 100644
--- a/cmake/Platform/Linux/PAL_linux.cmake
+++ b/cmake/Platform/Linux/PAL_linux.cmake
@@ -38,4 +38,4 @@ endif()
 set(LY_ASSET_DEPLOY_ASSET_TYPE "pc" CACHE STRING "Set the asset type for deployment.")
 
 # Set the python cmd tool
-ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.sh)
+ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)
diff --git a/cmake/Platform/Mac/PAL_mac.cmake b/cmake/Platform/Mac/PAL_mac.cmake
index 10df4849dd..f6cf034312 100644
--- a/cmake/Platform/Mac/PAL_mac.cmake
+++ b/cmake/Platform/Mac/PAL_mac.cmake
@@ -38,4 +38,4 @@ endif()
 set(LY_ASSET_DEPLOY_ASSET_TYPE "osx_gl" CACHE STRING "Set the asset type for deployment.")
 
 # Set the python cmd tool
-ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.sh)
+ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)
diff --git a/cmake/Platform/Windows/PAL_windows.cmake b/cmake/Platform/Windows/PAL_windows.cmake
index 7493a95bd6..ddcc3a27c7 100644
--- a/cmake/Platform/Windows/PAL_windows.cmake
+++ b/cmake/Platform/Windows/PAL_windows.cmake
@@ -41,4 +41,4 @@ endif()
 set(LY_ASSET_DEPLOY_ASSET_TYPE "pc" CACHE STRING "Set the asset type for deployment.")
 
 # Set the python cmd tool
-ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.cmd)
+ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.cmd)
diff --git a/cmake/Platform/iOS/PAL_ios.cmake b/cmake/Platform/iOS/PAL_ios.cmake
index a910f6c1be..a6828a1bc7 100644
--- a/cmake/Platform/iOS/PAL_ios.cmake
+++ b/cmake/Platform/iOS/PAL_ios.cmake
@@ -38,5 +38,5 @@ endif()
 set(LY_ASSET_DEPLOY_ASSET_TYPE "ios" CACHE STRING "Set the asset type for deployment.")
 
 # Set the python cmd tool
-ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.sh)
+ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)
 
diff --git a/cmake/Tools/common.py b/cmake/Tools/common.py
index 563408f942..b271c59766 100755
--- a/cmake/Tools/common.py
+++ b/cmake/Tools/common.py
@@ -162,7 +162,7 @@ def validate_ap_config_asset_type_enabled(engine_root, bootstrap_asset_type):
     :return:    True if the asset type was enabled, false if not
     """
     
-    ap_config_file = os.path.join(engine_root, 'AssetProcessorPlatformConfig.setreg')
+    ap_config_file = os.path.join(engine_root, 'Registry', 'AssetProcessorPlatformConfig.setreg')
     if not os.path.isfile(ap_config_file):
         raise LmbrCmdError("Missing required asset processor configuration file at '{}'".format(engine_root),
                            ERROR_CODE_FILE_NOT_FOUND)
diff --git a/cmake/Tools/layout_tool.py b/cmake/Tools/layout_tool.py
index f219ab0622..82d10f412f 100755
--- a/cmake/Tools/layout_tool.py
+++ b/cmake/Tools/layout_tool.py
@@ -312,14 +312,15 @@ def create_link(src:pathlib.Path, tgt:pathlib.Path, copy):
     tgt = pathlib.Path(tgt)
     if copy:
         # Remove the exist target
-        if tgt.is_symlink():
-            tgt.unlink()
-        else:
-            def remove_readonly(func, path, _):
-                "Clear the readonly bit and reattempt the removal"
-                os.chmod(path, stat.S_IWRITE)
-                func(path)
-            shutil.rmtree(tgt, onerror=remove_readonly)
+        if tgt.exists():
+            if tgt.is_symlink():
+                tgt.unlink()
+            else:
+                def remove_readonly(func, path, _):
+                    "Clear the readonly bit and reattempt the removal"
+                    os.chmod(path, stat.S_IWRITE)
+                    func(path)
+                shutil.rmtree(tgt, onerror=remove_readonly)
 
         logging.debug(f'Copying from {src} to {tgt}')
         shutil.copytree(str(src), str(tgt), symlinks=False)
diff --git a/cmake/cmake_files.cmake b/cmake/cmake_files.cmake
index 5045a42cbe..e423eb0dbc 100644
--- a/cmake/cmake_files.cmake
+++ b/cmake/cmake_files.cmake
@@ -14,7 +14,6 @@ set(FILES
     3rdPartyPackages.cmake
     CommandExecution.cmake
     Configurations.cmake
-    CPack.cmake
     Dependencies.cmake
     Deployment.cmake
     EngineFinder.cmake
@@ -27,6 +26,7 @@ set(FILES
     LYPython.cmake
     LYWrappers.cmake
     Monolithic.cmake
+    Packaging.cmake
     PAL.cmake
     PALTools.cmake
     Projects.cmake
diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index bb9bd4ff48..bc770e42f7 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -184,36 +184,22 @@ def GetEnvStringList(Map envVarMap) {
     return strList
 }
 
-def SetLfsCredentials(cmd, lbl = '') {
-    if (env.IS_UNIX) {
-        sh label: lbl,
-           script: cmd
-    } else {
-        bat label: lbl,
-            script: cmd
-    }
-}
-
 def CheckoutBootstrapScripts(String branchName) {
-    checkout([$class: "GitSCM",
-            branches: [[name: "*/${branchName}"]],
-            doGenerateSubmoduleConfigurations: false,
-            extensions: [
-              [
-                $class: "SparseCheckoutPaths",
-                sparseCheckoutPaths: [
-                  [ $class: "SparseCheckoutPath", path: "scripts/build/Jenkins/" ],
-                  [ $class: "SparseCheckoutPath", path: "scripts/build/bootstrap/" ],
-                  [ $class: "SparseCheckoutPath", path: "scripts/build/Platform" ]
-                ]
-              ],
-              [
-                $class: "CloneOption", depth: 1, noTags: false, reference: "", shallow: true
-              ]
-            ],
-            submoduleCfg: [],
-            userRemoteConfigs: scm.userRemoteConfigs
-          ])
+    checkout([$class: 'GitSCM',
+        branches: [[name: "*/${branchName}"]],
+        doGenerateSubmoduleConfigurations: false,
+        extensions: [
+            [$class: 'PruneStaleBranch'],
+            [$class: 'SparseCheckoutPaths', sparseCheckoutPaths: [
+                [ $class: 'SparseCheckoutPath', path: 'scripts/build/Jenkins/' ],
+                [ $class: 'SparseCheckoutPath', path: 'scripts/build/bootstrap/' ],
+                [ $class: 'SparseCheckoutPath', path: 'scripts/build/Platform' ]
+            ]],
+            [$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true]
+        ],
+        submoduleCfg: [],
+        userRemoteConfigs: scm.userRemoteConfigs
+    ])
 }
 
 def CheckoutRepo(boolean disableSubmodules = false) {
@@ -247,6 +233,7 @@ def CheckoutRepo(boolean disableSubmodules = false) {
             $class: 'GitSCM',
             branches: scm.branches,
             extensions: [
+                [$class: 'PruneStaleBranch'],
                 [$class: 'SubmoduleOption', disableSubmodules: disableSubmodules, recursiveSubmodules: true],
                 [$class: 'CheckoutOption', timeout: 60]
             ],
@@ -256,7 +243,7 @@ def CheckoutRepo(boolean disableSubmodules = false) {
 
     // Run lfs in a separate step. Jenkins is unable to load the credentials for the custom LFS endpoint
     withCredentials([usernamePassword(credentialsId: "${env.GITHUB_USER}", passwordVariable: 'accesstoken', usernameVariable: 'username')]) {
-        SetLfsCredentials("git config -f .lfsconfig lfs.url https://${username}:${accesstoken}@${env.LFS_URL}", 'Set credentials')
+        palSh("git config -f .lfsconfig lfs.url https://${username}:${accesstoken}@${env.LFS_URL}", 'Set credentials', false)
     }
     palSh('git lfs install', 'Git LFS Install')
     palSh('git lfs pull', 'Git LFS Pull')
@@ -324,34 +311,28 @@ def PreBuildCommonSteps(Map pipelineConfig, String repositoryName, String projec
         }
 
         if(env.CLEAN_OUTPUT_DIRECTORY?.toBoolean() || env.CLEAN_ASSETS?.toBoolean()) {
-            def command = "${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type clean"
-            if (env.IS_UNIX) {
-                sh label: "Running ${platform} clean",
-                   script: "${pipelineConfig.PYTHON_DIR}/python.sh -u ${command}"
-            } else {
-                bat label: "Running ${platform} clean",
-                    script: "${pipelineConfig.PYTHON_DIR}/python.cmd -u ${command}".replace('/','\\')
-            }
+            def command = "${pipelineConfig.PYTHON_DIR}/python"
+            if(env.IS_UNIX) command += '.sh'
+            else command += '.cmd'
+            command += " -u ${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type clean"
+            palSh(command, "Running ${platform} clean")
         }
     }
 }
 
-def Build(Map options, String platform, String type, String workspace) {
+def Build(Map pipelineConfig, String platform, String type, String workspace) {
     timeout(time: env.TIMEOUT, unit: 'MINUTES', activity: true) {
-        def command = "${options.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}"
+        def command = "${pipelineConfig.PYTHON_DIR}/python"
+        if(env.IS_UNIX) command += '.sh'
+        else command += '.cmd'
+        command += " -u ${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}"
         dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
-            if (env.IS_UNIX) {
-                sh label: "Running ${platform} ${type}",
-                   script: "${options.PYTHON_DIR}/python.sh -u ${command}"
-            } else {
-                bat label: "Running ${platform} ${type}",
-                    script: "${options.PYTHON_DIR}/python.cmd -u ${command}".replace('/','\\')
-            }
+            palSh(command, "Running ${platform} ${type}")
         }
     }
 }
 
-def TestMetrics(Map options, String workspace, String branchName, String repoName, String buildJobName, String outputDirectory, String configuration) {
+def TestMetrics(Map pipelineConfig, String workspace, String branchName, String repoName, String buildJobName, String outputDirectory, String configuration) {
     catchError(buildResult: null, stageResult: null) {
         def cmakeBuildDir = [workspace, ENGINE_REPOSITORY_NAME, outputDirectory].join('/')
         dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
@@ -362,7 +343,7 @@ def TestMetrics(Map options, String workspace, String branchName, String repoNam
                 userRemoteConfigs: [[url: "${env.MARS_REPO}", name: 'mars', credentialsId: "${env.GITHUB_USER}"]]
             ]
             withCredentials([usernamePassword(credentialsId: "${env.SERVICE_USER}", passwordVariable: 'apitoken', usernameVariable: 'username')]) {
-                def command = "${options.PYTHON_DIR}/python.cmd -u mars/scripts/python/ctest_test_metric_scraper.py " +
+                def command = "${pipelineConfig.PYTHON_DIR}/python.cmd -u mars/scripts/python/ctest_test_metric_scraper.py " +
                               '-e jenkins.creds.user %username% -e jenkins.creds.pass %apitoken% ' +
                               "-e jenkins.base_url ${env.JENKINS_URL} " +
                               "${cmakeBuildDir} ${branchName} %BUILD_NUMBER% AR ${configuration} ${repoName} "
@@ -393,7 +374,7 @@ def PostBuildCommonSteps(String workspace, boolean mount = true) {
 
 def CreateSetupStage(Map pipelineConfig, String repositoryName, String projectName, String pipelineName, String branchName, String platformName, String jobName, Map environmentVars) {
     return {
-        stage("Setup") {
+        stage('Setup') {
             PreBuildCommonSteps(pipelineConfig, repositoryName, projectName, pipelineName, branchName, platformName, jobName,  environmentVars['WORKSPACE'], environmentVars['MOUNT_VOLUME'])
         }
     }
@@ -417,7 +398,7 @@ def CreateTestMetricsStage(Map pipelineConfig, String branchName, Map environmen
 
 def CreateTeardownStage(Map environmentVars) {
     return {
-        stage("Teardown") {
+        stage('Teardown') {
             PostBuildCommonSteps(environmentVars['WORKSPACE'], environmentVars['MOUNT_VOLUME'])
         }
     }
@@ -504,9 +485,8 @@ try {
                             envVars['IS_UNIX'] = 1
                         }
                         withEnv(GetEnvStringList(envVars)) {
+                            def build_job_name = build_job.key
                             try {
-                                def build_job_name = build_job.key
-
                                 CreateSetupStage(pipelineConfig, repositoryName, projectName, pipelineName, branchName, platform.key, build_job.key, envVars).call()
 
                                 if(build_job.value.steps) { //this is a pipe with many steps so create all the build stages
@@ -517,12 +497,6 @@ try {
                                 } else {
                                     CreateBuildStage(pipelineConfig,  platform.key, build_job.key, envVars).call()
                                 }
-
-                                if (env.MARS_REPO && platform.value.build_types[build_job_name].PARAMETERS.containsKey('TEST_METRICS') && platform.value.build_types[build_job_name].PARAMETERS.TEST_METRICS == 'True') {
-                                    def output_directory = platform.value.build_types[build_job_name].PARAMETERS.OUTPUT_DIRECTORY
-                                    def configuration = platform.value.build_types[build_job_name].PARAMETERS.CONFIGURATION
-                                    CreateTestMetricsStage(pipelineConfig, branchName, envVars, build_job_name, output_directory, configuration).call()
-                                }
                             }
                             catch(Exception e) {
                                 //  https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Result.java
@@ -537,6 +511,11 @@ try {
                                 }
                             }
                             finally {
+                                if (env.MARS_REPO && platform.value.build_types[build_job_name].PARAMETERS.containsKey('TEST_METRICS') && platform.value.build_types[build_job_name].PARAMETERS.TEST_METRICS == 'True') {
+                                    def output_directory = platform.value.build_types[build_job_name].PARAMETERS.OUTPUT_DIRECTORY
+                                    def configuration = platform.value.build_types[build_job_name].PARAMETERS.CONFIGURATION
+                                    CreateTestMetricsStage(pipelineConfig, branchName, envVars, build_job_name, output_directory, configuration).call()
+                                }
                                 CreateTeardownStage(envVars).call()
                             }
                         }
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index 1eb0a73ee0..bd10c9e59a 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -110,7 +110,6 @@
   },
   "profile_vs2019": {
     "TAGS": [
-      "project",
       "daily-pipeline-metrics",
       "weekly-build-metrics"
     ],
@@ -301,5 +300,46 @@
         "CMAKE_TARGET": "INSTALL",
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
+  },
+  "project_enginesource_profile_vs2019": {
+    "TAGS": [
+      "project"
+    ],
+    "PIPELINE_ENV": {
+      "EXECUTE_FROM_PROJECT": "1"
+    },
+    "COMMAND": "build_windows.cmd",
+    "PARAMETERS": {
+      "CONFIGURATION": "profile",
+      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DCMAKE_MODULE_PATH=!WORKSPACE!/o3de/cmake",
+      "CMAKE_LY_PROJECTS": "",
+      "CMAKE_TARGET": "ALL_BUILD",
+      "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
+    }
+  },
+  "project_engineinstall_profile_vs2019": {
+    "TAGS": [],
+    "PIPELINE_ENV": {
+      "EXECUTE_FROM_PROJECT": "1"
+    },
+    "COMMAND": "build_windows.cmd",
+    "PARAMETERS": {
+      "CONFIGURATION": "profile",
+      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DCMAKE_MODULE_PATH=!WORKSPACE!/o3de/build/windows_vs2019/install/cmake",
+      "CMAKE_LY_PROJECTS": "",
+      "CMAKE_TARGET": "ALL_BUILD",
+      "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
+    }
+  },
+  "project_engineinstall_profile_vs2019_pipe": {
+    "TAGS": [
+      "project"
+    ],
+    "steps": [
+      "install_profile_vs2019",
+      "project_engineinstall_profile_vs2019"
+    ]
   }
 }
diff --git a/scripts/build/bootstrap/incremental_build_util.py b/scripts/build/bootstrap/incremental_build_util.py
index 28bb70955e..a331cf3bb8 100755
--- a/scripts/build/bootstrap/incremental_build_util.py
+++ b/scripts/build/bootstrap/incremental_build_util.py
@@ -303,7 +303,14 @@ def attach_volume(volume, volume_id, instance_id, timeout=DEFAULT_TIMEOUT):
         if (time.clock() - timeout_init) > timeout:
             print 'ERROR: Timeout reached trying to mount EBS'
             exit(1)
-
+    volume.create_tags(
+        Tags=[
+            {
+                'Key': 'AttachDate',
+                'Value': str(datetime.datetime.today().date())
+            },
+        ]
+    )
     print 'Volume {} has been attached to instance {}'.format(volume_id, instance_id)
 
 
diff --git a/scripts/build/build_node/Platform/Mac/install-xcode.sh b/scripts/build/build_node/Platform/Mac/install-xcode.sh
index c55ebc38d3..3f744c0e57 100755
--- a/scripts/build/build_node/Platform/Mac/install-xcode.sh
+++ b/scripts/build/build_node/Platform/Mac/install-xcode.sh
@@ -43,4 +43,7 @@ sudo installer -pkg /Applications/Xcode.app/Contents/Resources/Packages/MobileDe
 sudo installer -pkg /Applications/Xcode.app/Contents/Resources/Packages/MobileDeviceDevelopment.pkg -target /
 
 echo "Enabling developer mode"
-sudo /usr/sbin/DevToolsSecurity --enable
\ No newline at end of file
+sudo /usr/sbin/DevToolsSecurity --enable
+
+echo "Installing cmake"
+brew install cmake
diff --git a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
index 15cd92a7e2..4e3695d35d 100644
--- a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
+++ b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
@@ -25,4 +25,7 @@ git config --global "credential.helper" "!aws codecommit credential-helper $@"
 git config --global "credential.UseHttpPath" "true"
 
 # Install Java (for Jenkins)
-choco install corretto8jdk -y --ia INSTALLDIR="c:\jdk8" # Custom directory to handle cases where whitespace in the path is not quote wrapped
\ No newline at end of file
+choco install corretto8jdk -y --ia INSTALLDIR="c:\jdk8" # Custom directory to handle cases where whitespace in the path is not quote wrapped
+
+# Install CMake
+choco install cmake -y --installargs 'ADD_CMAKE_TO_PATH=System'
diff --git a/scripts/build/ci_build.py b/scripts/build/ci_build.py
index 5d5df46361..3e7ae597e9 100755
--- a/scripts/build/ci_build.py
+++ b/scripts/build/ci_build.py
@@ -38,12 +38,13 @@ def parse_args():
 
 def build(build_config_filename, build_platform, build_type):
     # Read build_config and locate build_type
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    cwd_dir = os.path.abspath(os.path.join(current_dir, '../..')) # engine's root
-    config_dir = os.path.abspath(os.path.join(current_dir, 'Platform', build_platform))
+    cwd_dir = os.getcwd()
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    engine_dir = os.path.abspath(os.path.join(script_dir, '../..')) 
+    config_dir = os.path.abspath(os.path.join(script_dir, 'Platform', build_platform))
     build_config_abspath = os.path.join(config_dir, build_config_filename)
     if not os.path.exists(build_config_abspath):
-        config_dir = os.path.abspath(os.path.join(cwd_dir, 'restricted', build_platform, os.path.relpath(current_dir, cwd_dir)))
+        config_dir = os.path.abspath(os.path.join(engine_dir, 'restricted', build_platform, os.path.relpath(script_dir, engine_dir)))
         build_config_abspath = os.path.join(config_dir, build_config_filename)
         if not os.path.exists(build_config_abspath):
             print('[ci_build] File: {} not found'.format(build_config_abspath))
@@ -66,9 +67,9 @@ def build(build_config_filename, build_platform, build_type):
     # Parameters are optional, so we could have none
 
     # build_cmd is relative to the folder where this file is
-    build_cmd_path = os.path.join(current_dir, 'Platform/{}/{}'.format(build_platform, build_cmd))
+    build_cmd_path = os.path.join(script_dir, 'Platform/{}/{}'.format(build_platform, build_cmd))
     if not os.path.exists(build_cmd_path):
-        config_dir = os.path.abspath(os.path.join(cwd_dir, 'restricted', build_platform, os.path.relpath(current_dir, cwd_dir)))
+        config_dir = os.path.abspath(os.path.join(engine_dir, 'restricted', build_platform, os.path.relpath(script_dir, engine_dir)))
         build_cmd_path = os.path.join(config_dir, build_cmd)
         if not os.path.exists(build_cmd_path):
             print('[ci_build] File: {} not found'.format(build_cmd_path))
@@ -76,8 +77,10 @@ def build(build_config_filename, build_platform, build_type):
 
     print('[ci_build] Executing \"{}\"'.format(build_cmd_path))
     print('  cwd = {}'.format(cwd_dir))
+    print('  engine_dir = {}'.format(engine_dir))
     print('  paramaters:')
     env_params = os.environ.copy()
+    env_params['ENGINE_DIR'] = engine_dir
     for v in build_params:
         if v[:6] == "FORCE:":
             env_params[v[6:]] = build_params[v] 
diff --git a/scripts/build/lambda/delete_github_branch_ebs.py b/scripts/build/lambda/delete_github_branch_ebs.py
index 8163cee762..d933f23bfb 100644
--- a/scripts/build/lambda/delete_github_branch_ebs.py
+++ b/scripts/build/lambda/delete_github_branch_ebs.py
@@ -80,6 +80,10 @@ def create_response(status, success=0, failure=0, repository_name=None, branch_n
             'statusCode': 401,
             'body': 'Unauthorized',
             'isBase64Encoded': 'false'
+        },
+        'unsupported': {
+            'statusCode': 204,
+            'isBase64Encoded': 'false'
         }
     }
     return response[status]
@@ -90,17 +94,24 @@ def lambda_handler(event, context):
     if event.get('resource', '') == '/delete-github-branch-ebs':
         headers = event['headers']
         payload = event['body']
-        if headers['X-GitHub-Event'] == 'delete':
-            # Validate github webhook request here since request body cannot be passed to API Gateway lambda authorizer.
-            if verify_signature(headers, payload):
-                # Convert payload from string type to json to get repository name and branch name
-                payload = json.loads(payload)
-                repository_name = payload['repository']['full_name']
+        # Validate github webhook request here since request body cannot be passed to API Gateway lambda authorizer.
+        if verify_signature(headers, payload):
+            # Convert payload from string type to json to get repository name and branch name
+            payload = json.loads(payload)
+            repository_name = payload['repository']['full_name']
+            if headers['X-GitHub-Event'] == 'delete':
+                # On Github branch/tag delete event
                 branch_name = payload['ref']
-                (success, failure) = delete_volumes(repository_name, branch_name)
-                if not failure:
-                    return create_response('success', success, failure, repository_name, branch_name)
-                else:
-                    return create_response('failure', success, failure, repository_name, branch_name)
+            elif headers['X-GitHub-Event'] == 'pull_request' and payload['action'] == 'closed':
+                # On Github pull request closed event
+                pull_request_number = payload['number']
+                branch_name = f'PR-{pull_request_number}'
+            else:
+                return create_response('unsupported')
+            (success, failure) = delete_volumes(repository_name, branch_name)
+            if not failure:
+                return create_response('success', success, failure, repository_name, branch_name)
             else:
-                return create_response('unauthorized')
+                return create_response('failure', success, failure, repository_name, branch_name)
+        else:
+            return create_response('unauthorized')
diff --git a/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json b/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json
index 97deb11ea6..a9ed45daca 100644
--- a/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json
+++ b/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json
@@ -10,7 +10,6 @@
         "etc2comp/2017_04_24-az.2/**": "#include",
         "expat/2.1.0-pkg.3/**": "#include",
         "FbxSdk/2016.1.2-az.1/**": "#include",
-        "libav/11.7/**": "#include",
         "OpenSSL/1.1.1b-noasm-az/**": "#include",
         "Qt/5.15.1.2-az/**": "#include",
         "RadTelemetry/3.5.0.17/**": "#include",
diff --git a/scripts/build/package/Platform/Windows/package_filelists/atom.json b/scripts/build/package/Platform/Windows/package_filelists/atom.json
index a416e0f0c6..885eff8504 100644
--- a/scripts/build/package/Platform/Windows/package_filelists/atom.json
+++ b/scripts/build/package/Platform/Windows/package_filelists/atom.json
@@ -151,7 +151,6 @@
             "3dsmax/**": "#include",
             "7za.exe": "#include",
             "7za_legal_notice.txt": "#include",
-            "Crashpad/**": "#include",
             "CrySCompileServer/**": "#include",
             "PakShaders/**": "#include",
             "Python/**": "#include",
diff --git a/scripts/build/package/package_filelists/symbols.json b/scripts/build/package/package_filelists/symbols.json
index b5668db8c9..3f30f6ec1f 100644
--- a/scripts/build/package/package_filelists/symbols.json
+++ b/scripts/build/package/package_filelists/symbols.json
@@ -1,6 +1,5 @@
 {
     "@lyengine": {
-        "**/*.pdb": "#include",
-        "Tools/Crashpad/**": "#exclude"
+        "**/*.pdb": "#include"
     }
 }
\ No newline at end of file
diff --git a/scripts/build/tools/delete_inactive_ebs.py b/scripts/build/tools/delete_inactive_ebs.py
new file mode 100644
index 0000000000..c3fde95863
--- /dev/null
+++ b/scripts/build/tools/delete_inactive_ebs.py
@@ -0,0 +1,99 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+import boto3
+from datetime import datetime, timedelta
+import logging
+log = logging.getLogger(__name__)
+log.setLevel(logging.INFO)
+
+ATTACH_DATE_TAG_NAME = 'AttachDate'
+INACTIVE_DAY_THRESHOLD = 5
+
+
+def get_tag_values(tag_name):
+    """
+    Call Resource Group Tagging API to get all values of a certain tag
+    :param tag_name: Tag name
+    :return: List of all values of the tag
+    """
+    client = boto3.client('resourcegroupstaggingapi')
+    tag_values = []
+    try:
+        response = client.get_tag_values(
+            Key=tag_name
+        )
+        tag_values += response['TagValues']
+        while response and response.get('PaginationToken', ''):
+            response = client.get_tag_values(
+                PaginationToken=response['PaginationToken'],
+                Key=tag_name
+            )
+            tag_values += response['TagValues']
+        return tag_values
+    except Exception as e:
+        log.error(f'Failed to get tag values for {tag_name}.')
+        log.error(e)
+        return []
+
+
+def delete_volumes(inactive_dates):
+    """
+    Find and delete all EBS volumes that have AttachDate tag value in inactive_dates
+    :param inactive_dates: List of String that considered as inactive dates, for example, ["2021-04-27", "2021-04-26"]
+    :return: Number of EBS volumes that are deleted successfully, number of EBS volumes that are not deleted.
+    """
+    success = 0
+    failure = 0
+    ec2_client = boto3.resource('ec2')
+    response = ec2_client.volumes.filter(Filters=[
+        {
+            'Name': f'tag:{ATTACH_DATE_TAG_NAME}',
+            'Values': inactive_dates
+        },
+        {
+            'Name': 'status',
+            'Values': ['available']
+        },
+    ])
+    log.info(f'Deleting inactive EBS volumes that haven\'t been used for {INACTIVE_DAY_THRESHOLD} days...')
+    for volume in response:
+        if volume.attachments:
+            # Double check if volume has an attachment in case the volume is being used.
+            continue
+        try:
+            log.info(f'Deleting volume {volume.volume_id}')
+            volume.delete()
+            success += 1
+        except Exception as e:
+            log.error(f'Failed to delete volume {volume.volume_id}.')
+            log.error(e)
+            failure += 1
+    return success, failure
+
+
+def main():
+    tag_values = get_tag_values(ATTACH_DATE_TAG_NAME)
+    date_today = datetime.today().date()
+    # Exclude dates of last {INACTIVE_DAY_THRESHOLD} days from tag values, the rest values are considered as inactive dates.
+    dates_to_exclude = []
+    for i in range(INACTIVE_DAY_THRESHOLD):
+        dates_to_exclude.append(str(date_today - timedelta(i)))
+    inactive_dates = set(tag_values).difference(dates_to_exclude)
+    if inactive_dates:
+        success, failure = delete_volumes(list(inactive_dates))
+        log.info(f'{success} EBS volumes are deleted successfully.')
+        if failure:
+            log.info(f'{failure} EBS volumes are not deleted due to errors. See logs for more information.')
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/bundler/get_shader_list.py b/scripts/bundler/get_shader_list.py
index d8e05cb35e..2a275cce96 100644
--- a/scripts/bundler/get_shader_list.py
+++ b/scripts/bundler/get_shader_list.py
@@ -55,7 +55,7 @@ def get_shader_list(project_path, asset_platform, shader_type, shader_platform,
 
 parser = argparse.ArgumentParser(description='Gets the shader list for a specific platform from the current shader compiler server')
 
-parser.add_argument('-g', 'project-path', type=pathlib.Path, required=True, help="Path to the project")
+parser.add_argument('-g', '--project-path', type=pathlib.Path, required=True, help="Path to the project")
 parser.add_argument('asset-platform', type=str, help="The asset cache sub folder to use for shader generation")
 parser.add_argument('shader-type', type=str, help="The shader type to use")
 parser.add_argument('-p', '--shader_platform', type=str, required=False, default='', help="The target platform to generate shaders for.")
diff --git a/scripts/commit_validation/commit_validation/commit_validation.py b/scripts/commit_validation/commit_validation/commit_validation.py
index f3706a0edc..95e75decae 100755
--- a/scripts/commit_validation/commit_validation/commit_validation.py
+++ b/scripts/commit_validation/commit_validation/commit_validation.py
@@ -186,7 +186,6 @@ EXCLUDED_VALIDATION_PATTERNS = [
     'python/runtime',
     'restricted/*/Tools/*RemoteControl',
     'Tools/3dsmax',
-    'Tools/Crashpad',
     '*/user/Cache/*',
     '*/user/log/*',
 ]
diff --git a/scripts/scrubbing/validator.py b/scripts/scrubbing/validator.py
index e442e443c8..ac7c45554f 100755
--- a/scripts/scrubbing/validator.py
+++ b/scripts/scrubbing/validator.py
@@ -312,7 +312,7 @@ class Validator(object):
         # Once we split the repos we will have to worry about multiple root points etc. but that is a problem for future us.
         # All the packaging safelist stuff goes away once repo is split for platforms
         this_path = Path(__file__).resolve()
-        root_folder = this_path.parents[5]
+        root_folder = this_path.parents[2]
         relative_folder = os.path.relpath(this_path.parent, root_folder)
         canary_file = os.path.join(root_folder, 'restricted', platform, relative_folder, platform.lower() + '_canary.txt')
         try:
diff --git a/shadercachegen.cfg b/shadercachegen.cfg
deleted file mode 100644
index f4debfac89..0000000000
--- a/shadercachegen.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
--- This file is only loaded when running shadercachegen.exe 
--- and allows you to apply special settings for that process
-
-r_ShadersAsyncCompiling = 3
-r_ShadersRemoteCompiler = 1
-r_ShadersAllowCompilation = 1
-r_ShadersAsyncActivation = 3
-r_ShadersAsyncMaxThreads = 16
-r_MultiThreaded = 0
-
-log_Verbosity = 3
-e_profile_level_loading = 0
-r_ShadersUseInstanceLookUpTable = 1
-r_ShadersSubmitRequestline = 0
-
--- Use the Asset Processor to route requests to compile shaders. This enables the Asset Processor
--- to forward the request to the real shader compiler server. Your device is no
--- longer required to be on the same network as the shader compiler server, as long as the device can contact the Asset Processor:
-r_AssetProcessorShaderCompiler=1
-
--- If you run your device locally on the same computer as the shader compiler server, you can use 127.0.0.1.
--- To connect to a shader compiler server that runs on another computer, change localhost to the IP address of that computer (61453 is the default port):
-r_ShaderCompilerServer=127.0.0.1
---r_ShaderCompilerPort = 61453
-
--- Export .fxb files (pre-parsed cfx/cfi files) when compiling shaders
-r_shadersExport = 1
diff --git a/system_BuildShaderPak_DX11.cfg b/system_BuildShaderPak_DX11.cfg
deleted file mode 100644
index 3eb5ead707..0000000000
--- a/system_BuildShaderPak_DX11.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-sys_no_crash_dialog=1
-d3d9_NullRefDevice=1
-log_IncludeTime=3
-log_Verbosity=3
-log_FileVerbosity=3
-e_profile_level_loading=0
-r_driver=DX11
-sys_game_folder=GameSDK
-r_ShadersAsyncCompiling=3
-r_ShadersAsyncMaxThreads=16
-r_ShadersRemoteCompiler=1
-r_ShaderCompilerServer=127.0.0.1
-r_ShadersUserFolder=1
-r_ShadersUseInstanceLookUpTable=1
-r_multithreaded=0
-r_ShadersSubmitRequestline=0
-r_ShadersDX10=0
-r_ShadersDX11=1
-r_ShadersOrbis=0
- 
--- For the OpenGL renderer support (preview in 3.6.5)
---r_driver=GL
---r_ShadersGL4=1
\ No newline at end of file
diff --git a/system_BuildShaderPak_GL4.cfg b/system_BuildShaderPak_GL4.cfg
deleted file mode 100644
index a3fd32e4ef..0000000000
--- a/system_BuildShaderPak_GL4.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-sys_no_crash_dialog=1
-d3d9_NullRefDevice=1
-log_IncludeTime=3
-log_Verbosity=3
-log_FileVerbosity=3
-e_profile_level_loading=0
-r_driver=DX11
-sys_game_folder=GameSDK
-r_ShadersAsyncCompiling=3
-r_ShadersAsyncMaxThreads=16
-r_ShadersRemoteCompiler=1
-r_ShaderCompilerServer=127.0.0.1
-r_ShadersUserFolder=1
-r_ShadersUseInstanceLookUpTable=1
-r_multithreaded=0
-r_ShadersSubmitRequestline=0
-r_ShadersDX10=0
-r_ShadersDX11=0
-r_ShadersOrbis=0
- 
--- For the OpenGL renderer support (preview in 3.6.5)
-r_driver=GL
-r_ShadersGL4=1
\ No newline at end of file